diff -Nru firefox-84.0.2+build1/accessible/android/DocAccessibleWrap.cpp firefox-85.0+build1/accessible/android/DocAccessibleWrap.cpp
--- firefox-84.0.2+build1/accessible/android/DocAccessibleWrap.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/android/DocAccessibleWrap.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -102,7 +102,7 @@
 
   nsLayoutUtils::GetFramesForArea(
       RelativeTo{presShell->GetRootFrame()}, scrollPort, frames,
-      nsLayoutUtils::FrameForPointOption::OnlyVisible);
+      {nsLayoutUtils::FrameForPointOption::OnlyVisible});
   AccessibleHashtable inViewAccs;
   for (size_t i = 0; i < frames.Length(); i++) {
     nsIContent* content = frames.ElementAt(i)->GetContent();
diff -Nru firefox-84.0.2+build1/accessible/android/RootAccessibleWrap.cpp firefox-85.0+build1/accessible/android/RootAccessibleWrap.cpp
--- firefox-84.0.2+build1/accessible/android/RootAccessibleWrap.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/android/RootAccessibleWrap.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 #include "Accessible-inl.h"
 #include "AccessibleOrProxy.h"
 #include "DocAccessibleParent.h"
+#include "DocAccessible-inl.h"
 #include "ProxyAccessibleWrap.h"
 #include "SessionAccessibility.h"
 #include "mozilla/PresShell.h"
diff -Nru firefox-84.0.2+build1/accessible/aom/AccessibleNode.cpp firefox-85.0+build1/accessible/aom/AccessibleNode.cpp
--- firefox-84.0.2+build1/accessible/aom/AccessibleNode.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/aom/AccessibleNode.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMStringList.h"
 #include "mozilla/StaticPrefs_accessibility.h"
+#include "nsContentUtils.h"
 #include "nsIPersistentProperties2.h"
 #include "nsISimpleEnumerator.h"
 
@@ -15,6 +16,9 @@
 #include "nsAccessibilityService.h"
 #include "DocAccessible.h"
 
+#include "mozilla/dom/Document.h"  // for inline nsINode::GetParentObject
+#include "mozilla/dom/ToJSValue.h"
+
 using namespace mozilla;
 using namespace mozilla::a11y;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/accessible/aom/AccessibleNode.h firefox-85.0+build1/accessible/aom/AccessibleNode.h
--- firefox-84.0.2+build1/accessible/aom/AccessibleNode.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/aom/AccessibleNode.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,14 +10,16 @@
 #include "nsDataHashtable.h"
 #include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/Nullable.h"
 
 class nsINode;
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace a11y {
 class Accessible;
 }
diff -Nru firefox-84.0.2+build1/accessible/atk/Platform.cpp firefox-85.0+build1/accessible/atk/Platform.cpp
--- firefox-84.0.2+build1/accessible/atk/Platform.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/atk/Platform.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsIAccessibleEvent.h"
 #include "nsIGSettingsService.h"
 #include "nsMai.h"
+#include "nsServiceManagerUtils.h"
 #include "AtkSocketAccessible.h"
 #include "prenv.h"
 #include "prlink.h"
diff -Nru firefox-84.0.2+build1/accessible/base/AccEvent.cpp firefox-85.0+build1/accessible/base/AccEvent.cpp
--- firefox-84.0.2+build1/accessible/base/AccEvent.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/AccEvent.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/UserActivation.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/accessible/base/AccIterator.cpp firefox-85.0+build1/accessible/base/AccIterator.cpp
--- firefox-84.0.2+build1/accessible/base/AccIterator.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/AccIterator.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -9,6 +9,7 @@
 #  include "XULTreeAccessible.h"
 #endif
 
+#include "mozilla/dom/DocumentOrShadowRoot.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/accessible/base/ARIAMap.cpp firefox-85.0+build1/accessible/base/ARIAMap.cpp
--- firefox-84.0.2+build1/accessible/base/ARIAMap.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/ARIAMap.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -43,7 +43,11 @@
     kUseMapRole,
     eNoValue,
     eNoAction,
+#if defined(XP_MACOSX)
+    eAssertiveLiveAttr,
+#else
     eNoLiveAttr,
+#endif
     eAlert,
     kNoReqStates
   },
@@ -1462,6 +1466,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 // AttrIterator class
 
+AttrIterator::AttrIterator(nsIContent* aContent)
+    : mElement(dom::Element::FromNode(aContent)), mAttrIdx(0) {
+  mAttrCount = mElement ? mElement->GetAttrCount() : 0;
+}
+
 bool AttrIterator::Next(nsAString& aAttrName, nsAString& aAttrValue) {
   while (mAttrIdx < mAttrCount) {
     const nsAttrName* attr = mElement->GetAttrNameAt(mAttrIdx);
diff -Nru firefox-84.0.2+build1/accessible/base/ARIAMap.h firefox-85.0+build1/accessible/base/ARIAMap.h
--- firefox-84.0.2+build1/accessible/base/ARIAMap.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/ARIAMap.h	2021-01-18 19:58:08.000000000 +0000
@@ -14,10 +14,13 @@
 
 #include "nsAtom.h"
 #include "nsIContent.h"
-#include "mozilla/dom/Element.h"
 
 class nsINode;
 
+namespace mozilla::dom {
+class Element;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Value constants
 
@@ -71,7 +74,12 @@
 /**
  * Used to define if role exposes default value of aria-live attribute.
  */
-enum ELiveAttrRule { eNoLiveAttr, eOffLiveAttr, ePoliteLiveAttr };
+enum ELiveAttrRule {
+  eNoLiveAttr,
+  eOffLiveAttr,
+  ePoliteLiveAttr,
+  eAssertiveLiveAttr
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Role constants
@@ -276,10 +284,7 @@
  */
 class AttrIterator {
  public:
-  explicit AttrIterator(nsIContent* aContent)
-      : mElement(dom::Element::FromNode(aContent)), mAttrIdx(0) {
-    mAttrCount = mElement ? mElement->GetAttrCount() : 0;
-  }
+  explicit AttrIterator(nsIContent* aContent);
 
   bool Next(nsAString& aAttrName, nsAString& aAttrValue);
 
diff -Nru firefox-84.0.2+build1/accessible/base/DocManager.cpp firefox-85.0+build1/accessible/base/DocManager.cpp
--- firefox-84.0.2+build1/accessible/base/DocManager.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/DocManager.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -62,6 +62,19 @@
   return CreateDocOrRootAccessible(aDocument);
 }
 
+DocAccessible* DocManager::GetDocAccessible(const PresShell* aPresShell) {
+  if (!aPresShell) {
+    return nullptr;
+  }
+
+  DocAccessible* doc = aPresShell->GetDocAccessible();
+  if (doc) {
+    return doc;
+  }
+
+  return GetDocAccessible(aPresShell->GetDocument());
+}
+
 Accessible* DocManager::FindAccessibleInCache(nsINode* aNode) const {
   for (auto iter = mDocAccessibleCache.ConstIter(); !iter.Done(); iter.Next()) {
     DocAccessible* docAccessible = iter.UserData();
@@ -541,3 +554,9 @@
   sRemoteDocuments->AppendElement(aDoc);
   ProxyCreated(aDoc, Interfaces::DOCUMENT | Interfaces::HYPERTEXT);
 }
+
+DocAccessible* mozilla::a11y::GetExistingDocAccessible(
+    const dom::Document* aDocument) {
+  PresShell* presShell = aDocument->GetPresShell();
+  return presShell ? presShell->GetDocAccessible() : nullptr;
+}
diff -Nru firefox-84.0.2+build1/accessible/base/DocManager.h firefox-85.0+build1/accessible/base/DocManager.h
--- firefox-84.0.2+build1/accessible/base/DocManager.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/DocManager.h	2021-01-18 19:58:08.000000000 +0000
@@ -6,15 +6,20 @@
 #define mozilla_a11_DocManager_h_
 
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/dom/Document.h"
 #include "nsIDOMEventListener.h"
 #include "nsRefPtrHashtable.h"
 #include "nsIWebProgressListener.h"
 #include "nsWeakReference.h"
 #include "mozilla/StaticPtr.h"
+#include "nsINode.h"
+
+namespace mozilla::dom {
+class Document;
+}
 
 namespace mozilla {
+class PresShell;
+
 namespace a11y {
 
 class Accessible;
@@ -41,18 +46,7 @@
   /**
    * Return document accessible for the given presshell.
    */
-  DocAccessible* GetDocAccessible(const PresShell* aPresShell) {
-    if (!aPresShell) {
-      return nullptr;
-    }
-
-    DocAccessible* doc = aPresShell->GetDocAccessible();
-    if (doc) {
-      return doc;
-    }
-
-    return GetDocAccessible(aPresShell->GetDocument());
-  }
+  DocAccessible* GetDocAccessible(const PresShell* aPresShell);
 
   /**
    * Search through all document accessibles for an accessible with the given
@@ -187,10 +181,7 @@
  * Note this returns the doc accessible for the primary pres shell if there is
  * more than one.
  */
-inline DocAccessible* GetExistingDocAccessible(const dom::Document* aDocument) {
-  PresShell* presShell = aDocument->GetPresShell();
-  return presShell ? presShell->GetDocAccessible() : nullptr;
-}
+DocAccessible* GetExistingDocAccessible(const dom::Document* aDocument);
 
 }  // namespace a11y
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/accessible/base/NotificationController.cpp firefox-85.0+build1/accessible/base/NotificationController.cpp
--- firefox-84.0.2+build1/accessible/base/NotificationController.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/NotificationController.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include "DocAccessible-inl.h"
 #include "DocAccessibleChild.h"
+#include "GeckoProfiler.h"
 #include "nsEventShell.h"
 #include "TextLeafAccessible.h"
 #include "TextUpdater.h"
diff -Nru firefox-84.0.2+build1/accessible/base/nsAccessibilityService.cpp firefox-85.0+build1/accessible/base/nsAccessibilityService.cpp
--- firefox-84.0.2+build1/accessible/base/nsAccessibilityService.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/nsAccessibilityService.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -27,6 +27,7 @@
 #include "nsDOMTokenList.h"
 #include "nsEventShell.h"
 #include "nsIFrameInlines.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTextFormatter.h"
 #include "OuterDocAccessible.h"
 #include "Role.h"
diff -Nru firefox-84.0.2+build1/accessible/base/nsAccessibilityService.h firefox-85.0+build1/accessible/base/nsAccessibilityService.h
--- firefox-84.0.2+build1/accessible/base/nsAccessibilityService.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/nsAccessibilityService.h	2021-01-18 19:58:08.000000000 +0000
@@ -13,9 +13,11 @@
 #include "mozilla/a11y/SelectionManager.h"
 #include "mozilla/Preferences.h"
 
+#include "nsIContent.h"
 #include "nsIObserver.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIEventListenerService.h"
+#include "nsXULAppAPI.h"
 #include "xpcAccessibilityService.h"
 
 class nsImageFrame;
@@ -498,6 +500,8 @@
     "text value change",                // EVENT_TEXT_VALUE_CHANGE
     "scrolling",                        // EVENT_SCROLLING
     "announcement",                     // EVENT_ANNOUNCEMENT
+    "live region added",                // EVENT_LIVE_REGION_ADDED
+    "live region removed",              // EVENT_LIVE_REGION_REMOVED
 };
 
 #endif
diff -Nru firefox-84.0.2+build1/accessible/base/nsAccUtils.cpp firefox-85.0+build1/accessible/base/nsAccUtils.cpp
--- firefox-84.0.2+build1/accessible/base/nsAccUtils.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/nsAccUtils.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -18,6 +18,7 @@
 
 #include "nsIDOMXULContainerElement.h"
 #include "nsIPersistentProperties2.h"
+#include "nsISimpleEnumerator.h"
 #include "mozilla/a11y/PDocAccessibleChild.h"
 #include "mozilla/dom/Element.h"
 #include "nsAccessibilityService.h"
@@ -361,6 +362,9 @@
     case ePoliteLiveAttr:
       aValue = u"polite"_ns;
       return true;
+    case eAssertiveLiveAttr:
+      aValue = u"assertive"_ns;
+      return true;
   }
 
   return false;
diff -Nru firefox-84.0.2+build1/accessible/base/nsCoreUtils.cpp firefox-85.0+build1/accessible/base/nsCoreUtils.cpp
--- firefox-84.0.2+build1/accessible/base/nsCoreUtils.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/nsCoreUtils.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -383,6 +383,10 @@
   return StringBeginsWith(path, neterror) || StringBeginsWith(path, certerror);
 }
 
+PresShell* nsCoreUtils::GetPresShellFor(nsINode* aNode) {
+  return aNode->OwnerDoc()->GetPresShell();
+}
+
 bool nsCoreUtils::GetID(nsIContent* aContent, nsAString& aID) {
   return aContent->IsElement() &&
          aContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::id, aID);
@@ -538,6 +542,12 @@
                                     ScrollFlags::ScrollOverflowHidden);
 }
 
+bool nsCoreUtils::IsHTMLTableHeader(nsIContent* aContent) {
+  return aContent->NodeInfo()->Equals(nsGkAtoms::th) ||
+         (aContent->IsElement() &&
+          aContent->AsElement()->HasAttr(kNameSpaceID_None, nsGkAtoms::scope));
+}
+
 bool nsCoreUtils::IsWhitespaceString(const nsAString& aString) {
   nsAString::const_char_iterator iterBegin, iterEnd;
 
diff -Nru firefox-84.0.2+build1/accessible/base/nsCoreUtils.h firefox-85.0+build1/accessible/base/nsCoreUtils.h
--- firefox-84.0.2+build1/accessible/base/nsCoreUtils.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/nsCoreUtils.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,10 +7,8 @@
 #define nsCoreUtils_h_
 
 #include "mozilla/EventForwards.h"
-#include "mozilla/dom/Element.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIContent.h"
-#include "mozilla/dom/Document.h"  // for GetPresShell()
 #include "mozilla/FlushType.h"
 #include "mozilla/PresShellForwards.h"
 
@@ -26,8 +24,9 @@
 namespace mozilla {
 class PresShell;
 namespace dom {
+class Document;
 class XULTreeElement;
-}
+}  // namespace dom
 }  // namespace mozilla
 
 /**
@@ -219,9 +218,7 @@
   /**
    * Return presShell for the document containing the given DOM node.
    */
-  static PresShell* GetPresShellFor(nsINode* aNode) {
-    return aNode->OwnerDoc()->GetPresShell();
-  }
+  static PresShell* GetPresShellFor(nsINode* aNode);
 
   /**
    * Get the ID for an element, in some types of XML this may not be the ID
@@ -298,11 +295,7 @@
   /**
    * Return true if the given node is table header element.
    */
-  static bool IsHTMLTableHeader(nsIContent* aContent) {
-    return aContent->NodeInfo()->Equals(nsGkAtoms::th) ||
-           (aContent->IsElement() && aContent->AsElement()->HasAttr(
-                                         kNameSpaceID_None, nsGkAtoms::scope));
-  }
+  static bool IsHTMLTableHeader(nsIContent* aContent);
 
   /**
    * Returns true if the given string is empty or contains whitespace symbols
diff -Nru firefox-84.0.2+build1/accessible/base/Platform.h firefox-85.0+build1/accessible/base/Platform.h
--- firefox-84.0.2+build1/accessible/base/Platform.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/base/Platform.h	2021-01-18 19:58:07.000000000 +0000
@@ -19,6 +19,10 @@
 #  include "mozilla/a11y/Role.h"
 #endif
 
+#if defined(XP_WIN)
+#  include "Units.h"
+#endif
+
 namespace mozilla {
 namespace a11y {
 
diff -Nru firefox-84.0.2+build1/accessible/generic/Accessible.cpp firefox-85.0+build1/accessible/generic/Accessible.cpp
--- firefox-84.0.2+build1/accessible/generic/Accessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/Accessible.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -709,8 +709,7 @@
     }
   }
 
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
-  if (fm) {
+  if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
     dom::AutoHandlingUserInputStatePusher inputStatePusher(true);
     // XXXbz: Can we actually have a non-element content here?
     RefPtr<dom::Element> element = dom::Element::FromNodeOrNull(focusContent);
@@ -2130,6 +2129,10 @@
 
 nsINode* Accessible::GetNode() const { return mContent; }
 
+dom::Element* Accessible::Elm() const {
+  return dom::Element::FromNodeOrNull(mContent);
+}
+
 void Accessible::Language(nsAString& aLanguage) {
   aLanguage.Truncate();
 
diff -Nru firefox-84.0.2+build1/accessible/generic/Accessible.h firefox-85.0+build1/accessible/generic/Accessible.h
--- firefox-84.0.2+build1/accessible/generic/Accessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/Accessible.h	2021-01-18 19:58:08.000000000 +0000
@@ -11,8 +11,6 @@
 #include "mozilla/a11y/Role.h"
 #include "mozilla/a11y/States.h"
 
-#include "mozilla/dom/Element.h"
-
 #include "mozilla/UniquePtr.h"
 
 #include "nsIContent.h"
@@ -25,6 +23,10 @@
 class nsIFrame;
 class nsIPersistentProperties;
 
+namespace mozilla::dom {
+class Element;
+}
+
 namespace mozilla {
 namespace a11y {
 
@@ -161,7 +163,7 @@
   virtual nsINode* GetNode() const;
 
   nsIContent* GetContent() const { return mContent; }
-  dom::Element* Elm() const { return dom::Element::FromNodeOrNull(mContent); }
+  dom::Element* Elm() const;
 
   /**
    * Return node type information of DOM node associated with the accessible.
@@ -519,7 +521,7 @@
   /**
    * Focus the accessible.
    */
-  virtual void TakeFocus() const;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual void TakeFocus() const;
 
   /**
    * Scroll the accessible into view.
diff -Nru firefox-84.0.2+build1/accessible/generic/Accessible-inl.h firefox-85.0+build1/accessible/generic/Accessible-inl.h
--- firefox-84.0.2+build1/accessible/generic/Accessible-inl.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/Accessible-inl.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "DocAccessible.h"
 #include "ARIAMap.h"
 #include "nsCoreUtils.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/PresShell.h"
 
 #ifdef A11Y_LOG
diff -Nru firefox-84.0.2+build1/accessible/generic/ARIAGridAccessible.cpp firefox-85.0+build1/accessible/generic/ARIAGridAccessible.cpp
--- firefox-84.0.2+build1/accessible/generic/ARIAGridAccessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/ARIAGridAccessible.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -11,6 +11,7 @@
 #include "Role.h"
 #include "States.h"
 
+#include "mozilla/dom/Element.h"
 #include "nsIPersistentProperties2.h"
 #include "nsComponentManagerUtils.h"
 
diff -Nru firefox-84.0.2+build1/accessible/generic/DocAccessible.cpp firefox-85.0+build1/accessible/generic/DocAccessible.cpp
--- firefox-84.0.2+build1/accessible/generic/DocAccessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/DocAccessible.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -338,6 +338,14 @@
   CopyUTF8toUTF16(theURL, aURL);
 }
 
+void DocAccessible::Title(nsString& aTitle) const {
+  mDocumentNode->GetTitle(aTitle);
+}
+
+void DocAccessible::MimeType(nsAString& aType) const {
+  mDocumentNode->GetContentType(aType);
+}
+
 void DocAccessible::DocType(nsAString& aType) const {
   dom::DocumentType* docType = mDocumentNode->GetDoctype();
   if (docType) docType->GetPublicId(aType);
@@ -449,6 +457,8 @@
   return root;
 }
 
+nsINode* DocAccessible::GetNode() const { return mDocumentNode; }
+
 // DocAccessible protected member
 nsRect DocAccessible::RelativeBounds(nsIFrame** aRelativeFrame) const {
   *aRelativeFrame = GetFrame();
@@ -1177,6 +1187,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Public members
 
+nsPresContext* DocAccessible::PresContext() const {
+  return mPresShell->GetPresContext();
+}
+
 void* DocAccessible::GetNativeWindow() const {
   if (!mPresShell) {
     return nullptr;
@@ -1911,6 +1925,8 @@
 
 bool InsertIterator::Next() {
   if (mNodesIdx > 0) {
+    // If we already processed the first node in the mNodes list,
+    // check if we can just use the walker to get its next sibling.
     Accessible* nextChild = mWalker.Next();
     if (nextChild) {
       mChildBefore = mChild;
@@ -1920,16 +1936,6 @@
   }
 
   while (mNodesIdx < mNodes->Length()) {
-    // Ignore nodes that are not contained by the container anymore.
-
-    // The container might be changed, for example, because of the subsequent
-    // overlapping content insertion (i.e. other content was inserted between
-    // this inserted content and its container or the content was reinserted
-    // into different container of unrelated part of tree). To avoid a double
-    // processing of the content insertion ignore this insertion notification.
-    // Note, the inserted content might be not in tree at all at this point
-    // what means there's no container. Ignore the insertion too.
-    nsIContent* prevNode = mNodes->SafeElementAt(mNodesIdx - 1);
     nsIContent* node = mNodes->ElementAt(mNodesIdx++);
     // Check to see if we already processed this node with this iterator.
     // this can happen if we get two redundant insertions in the case of a
@@ -1940,6 +1946,14 @@
 
     Accessible* container = Document()->AccessibleOrTrueContainer(
         node->GetFlattenedTreeParentNode(), true);
+    // Ignore nodes that are not contained by the container anymore.
+    // The container might be changed, for example, because of the subsequent
+    // overlapping content insertion (i.e. other content was inserted between
+    // this inserted content and its container or the content was reinserted
+    // into different container of unrelated part of tree). To avoid a double
+    // processing of the content insertion ignore this insertion notification.
+    // Note, the inserted content might be not in tree at all at this point
+    // what means there's no container. Ignore the insertion too.
     if (container != Context()) {
       continue;
     }
@@ -1959,8 +1973,9 @@
                       "container", container, "node", node);
 #endif
 
-    // If inserted nodes are siblings then just move the walker next.
-    if (mChild && prevNode && prevNode->GetNextSibling() == node) {
+    nsIContent* prevNode = mChild ? mChild->GetContent() : nullptr;
+    if (prevNode && prevNode->GetNextSibling() == node) {
+      // If inserted nodes are siblings then just move the walker next.
       Accessible* nextChild = mWalker.Scope(node);
       if (nextChild) {
         mChildBefore = mChild;
@@ -1968,6 +1983,8 @@
         return true;
       }
     } else {
+      // Otherwise use a new walker to find this node in the container's
+      // subtree, and retrieve its preceding sibling.
       TreeWalker finder(container);
       if (finder.Seek(node)) {
         mChild = mWalker.Scope(node);
@@ -2676,3 +2693,8 @@
   // No other ARIA roles are valid on body elements.
   SetRoleMapEntry(nullptr);
 }
+
+Accessible* DocAccessible::GetAccessible(nsINode* aNode) const {
+  return aNode == mDocumentNode ? const_cast<DocAccessible*>(this)
+                                : mNodeToAccessibleMap.Get(aNode);
+}
diff -Nru firefox-84.0.2+build1/accessible/generic/DocAccessible.h firefox-85.0+build1/accessible/generic/DocAccessible.h
--- firefox-84.0.2+build1/accessible/generic/DocAccessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/DocAccessible.h	2021-01-18 19:58:07.000000000 +0000
@@ -13,11 +13,11 @@
 
 #include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIDocumentObserver.h"
 #include "nsIObserver.h"
 #include "nsITimer.h"
+#include "nsWeakReference.h"
 
 class nsAccessiblePivot;
 
@@ -65,7 +65,7 @@
   virtual void Init();
   virtual void Shutdown() override;
   virtual nsIFrame* GetFrame() const override;
-  virtual nsINode* GetNode() const override { return mDocumentNode; }
+  virtual nsINode* GetNode() const override;
   Document* DocumentNode() const { return mDocumentNode; }
 
   virtual mozilla::a11y::ENameValueFlag Name(nsString& aName) const override;
@@ -99,15 +99,12 @@
   /**
    * Return DOM document title.
    */
-  void Title(nsString& aTitle) const { mDocumentNode->GetTitle(aTitle); }
+  void Title(nsString& aTitle) const;
 
   /**
    * Return DOM document mime type.
    */
-  void MimeType(nsAString& aType) const {
-    mDocumentNode->GetContentType(aType);
-  }
-
+  void MimeType(nsAString& aType) const;
   /**
    * Return DOM document type.
    */
@@ -134,20 +131,14 @@
   /**
    * Return the presentation shell's context.
    */
-  nsPresContext* PresContext() const { return mPresShell->GetPresContext(); }
+  nsPresContext* PresContext() const;
 
   /**
    * Return true if associated DOM document was loaded and isn't unloading.
    */
-  bool IsContentLoaded() const {
-    // eDOMLoaded flag check is used for error pages as workaround to make this
-    // method return correct result since error pages do not receive 'pageshow'
-    // event and as consequence Document::IsShowing() returns false.
-    return mDocumentNode && mDocumentNode->IsVisible() &&
-           (mDocumentNode->IsShowing() || HasLoadState(eDOMLoaded));
-  }
+  bool IsContentLoaded() const;
 
-  bool IsHidden() const { return mDocumentNode->Hidden(); }
+  bool IsHidden() const;
 
   /**
    * Document load states.
@@ -239,10 +230,7 @@
    *
    * @return the accessible object
    */
-  Accessible* GetAccessible(nsINode* aNode) const {
-    return aNode == mDocumentNode ? const_cast<DocAccessible*>(this)
-                                  : mNodeToAccessibleMap.Get(aNode);
-  }
+  Accessible* GetAccessible(nsINode* aNode) const;
 
   /**
    * Return an accessible for the given node even if the node is not in
diff -Nru firefox-84.0.2+build1/accessible/generic/DocAccessible-inl.h firefox-85.0+build1/accessible/generic/DocAccessible-inl.h
--- firefox-84.0.2+build1/accessible/generic/DocAccessible-inl.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/DocAccessible-inl.h	2021-01-18 19:58:07.000000000 +0000
@@ -41,6 +41,16 @@
   return mVirtualCursor;
 }
 
+inline bool DocAccessible::IsContentLoaded() const {
+  // eDOMLoaded flag check is used for error pages as workaround to make this
+  // method return correct result since error pages do not receive 'pageshow'
+  // event and as consequence Document::IsShowing() returns false.
+  return mDocumentNode && mDocumentNode->IsVisible() &&
+         (mDocumentNode->IsShowing() || HasLoadState(eDOMLoaded));
+}
+
+inline bool DocAccessible::IsHidden() const { return mDocumentNode->Hidden(); }
+
 inline void DocAccessible::FireDelayedEvent(AccEvent* aEvent) {
 #ifdef A11Y_LOG
   if (logging::IsEnabled(logging::eDocLoad)) logging::DocLoadEventFired(aEvent);
diff -Nru firefox-84.0.2+build1/accessible/generic/HyperTextAccessible.h firefox-85.0+build1/accessible/generic/HyperTextAccessible.h
--- firefox-84.0.2+build1/accessible/generic/HyperTextAccessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/generic/HyperTextAccessible.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIAccessibleText.h"
 #include "nsIAccessibleTypes.h"
 #include "nsIFrame.h"  // only for nsSelectionAmount
+#include "nsISelectionController.h"
 #include "nsDirection.h"
 #include "WordMovementType.h"
 
diff -Nru firefox-84.0.2+build1/accessible/interfaces/nsIAccessibleEvent.idl firefox-85.0+build1/accessible/interfaces/nsIAccessibleEvent.idl
--- firefox-84.0.2+build1/accessible/interfaces/nsIAccessibleEvent.idl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/interfaces/nsIAccessibleEvent.idl	2021-01-18 19:58:07.000000000 +0000
@@ -429,9 +429,19 @@
   const unsigned long EVENT_ANNOUNCEMENT = 0x0059;
 
   /**
+   * A live region has been introduced. Mac only.
+   */
+  const unsigned long EVENT_LIVE_REGION_ADDED = 0x005A;
+
+  /**
+   * A live region has been removed (aria-live attribute changed). Mac Only.
+   */
+  const unsigned long EVENT_LIVE_REGION_REMOVED = 0x005B;
+
+  /**
    * Help make sure event map does not get out-of-line.
    */
-  const unsigned long EVENT_LAST_ENTRY = 0x005A;
+  const unsigned long EVENT_LAST_ENTRY = 0x005C;
 
   /**
    * The type of event, based on the enumerated event values
diff -Nru firefox-84.0.2+build1/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl firefox-85.0+build1/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl
--- firefox-84.0.2+build1/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,8 @@
 
 include protocol PDocAccessible;
 
+include "mozilla/GfxMessageUtils.h";
+
 using mozilla::a11y::EWhichRange from "mozilla/a11y/IPCTypes.h";
 using nsIntRect from "nsRect.h";
 
diff -Nru firefox-84.0.2+build1/accessible/ipc/IPCTypes.h firefox-85.0+build1/accessible/ipc/IPCTypes.h
--- firefox-84.0.2+build1/accessible/ipc/IPCTypes.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/ipc/IPCTypes.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/Role.h"
+#  include "ipc/EnumSerializer.h"
 
 namespace IPC {
 
diff -Nru firefox-84.0.2+build1/accessible/ipc/win/PDocAccessible.ipdl firefox-85.0+build1/accessible/ipc/win/PDocAccessible.ipdl
--- firefox-84.0.2+build1/accessible/ipc/win/PDocAccessible.ipdl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/ipc/win/PDocAccessible.ipdl	2021-01-18 19:58:07.000000000 +0000
@@ -7,10 +7,12 @@
 include protocol PFileDescriptorSet;
 include protocol PBrowser;
 
+include "mozilla/GfxMessageUtils.h";
+
 using mozilla::a11y::role from "mozilla/a11y/IPCTypes.h";
 using mozilla::a11y::IAccessibleHolder from "mozilla/a11y/IPCTypes.h";
 using mozilla::a11y::IDispatchHolder from "mozilla/a11y/IPCTypes.h";
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
 using mozilla::LayoutDeviceIntRect from "Units.h";
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/accessible/mac/AccessibleWrap.mm firefox-85.0+build1/accessible/mac/AccessibleWrap.mm
--- firefox-84.0.2+build1/accessible/mac/AccessibleWrap.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/AccessibleWrap.mm	2021-01-18 19:58:08.000000000 +0000
@@ -5,7 +5,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 "DocAccessible.h"
+#include "DocAccessibleWrap.h"
 #include "nsObjCExceptions.h"
 #include "nsCocoaUtils.h"
 
@@ -30,7 +30,37 @@
 using namespace mozilla::a11y;
 
 AccessibleWrap::AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc)
-    : Accessible(aContent, aDoc), mNativeObject(nil), mNativeInited(false) {}
+    : Accessible(aContent, aDoc), mNativeObject(nil), mNativeInited(false) {
+  if (aContent && aContent->IsElement() && aDoc) {
+    // Check if this accessible is a live region and queue it
+    // it for dispatching an event after it has been inserted.
+    DocAccessibleWrap* doc = static_cast<DocAccessibleWrap*>(aDoc);
+    static const dom::Element::AttrValuesArray sLiveRegionValues[] = {
+        nsGkAtoms::OFF, nsGkAtoms::polite, nsGkAtoms::assertive, nullptr};
+    int32_t attrValue = aContent->AsElement()->FindAttrValueIn(
+        kNameSpaceID_None, nsGkAtoms::aria_live, sLiveRegionValues,
+        eIgnoreCase);
+    if (attrValue == 0) {
+      // aria-live is "off", do nothing.
+    } else if (attrValue > 0) {
+      // aria-live attribute is polite or assertive. It's live!
+      doc->QueueNewLiveRegion(this);
+    } else if (const nsRoleMapEntry* roleMap =
+                   aria::GetRoleMap(aContent->AsElement())) {
+      // aria role defines it as a live region. It's live!
+      if (roleMap->liveAttRule == ePoliteLiveAttr ||
+          roleMap->liveAttRule == eAssertiveLiveAttr) {
+        doc->QueueNewLiveRegion(this);
+      }
+    } else if (nsStaticAtom* value = GetAccService()->MarkupAttribute(
+                   aContent, nsGkAtoms::live)) {
+      // HTML element defines it as a live region. It's live!
+      if (value == nsGkAtoms::polite || value == nsGkAtoms::assertive) {
+        doc->QueueNewLiveRegion(this);
+      }
+    }
+  }
+}
 
 AccessibleWrap::~AccessibleWrap() {}
 
@@ -120,11 +150,17 @@
   nsresult rv = Accessible::HandleAccEvent(aEvent);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  uint32_t eventType = aEvent->GetEventType();
+
+  if (eventType == nsIAccessibleEvent::EVENT_SHOW) {
+    DocAccessibleWrap* doc = static_cast<DocAccessibleWrap*>(Document());
+    doc->ProcessNewLiveRegions();
+  }
+
   if (IPCAccessibilityActive()) {
     return NS_OK;
   }
 
-  uint32_t eventType = aEvent->GetEventType();
   Accessible* eventTarget = nullptr;
 
   switch (eventType) {
@@ -222,6 +258,9 @@
     case nsIAccessibleEvent::EVENT_SELECTION:
     case nsIAccessibleEvent::EVENT_SELECTION_ADD:
     case nsIAccessibleEvent::EVENT_SELECTION_REMOVE:
+    case nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED:
+    case nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED:
+    case nsIAccessibleEvent::EVENT_NAME_CHANGE:
       [nativeAcc handleAccessibleEvent:eventType];
       break;
 
@@ -294,6 +333,10 @@
       return [mozOptionAccessible class];
     }
 
+    case roles::RICH_OPTION: {
+      return [mozSelectableChildAccessible class];
+    }
+
     case roles::COMBOBOX_LIST:
     case roles::MENUBAR:
     case roles::MENUPOPUP: {
diff -Nru firefox-84.0.2+build1/accessible/mac/DocAccessibleWrap.h firefox-85.0+build1/accessible/mac/DocAccessibleWrap.h
--- firefox-84.0.2+build1/accessible/mac/DocAccessibleWrap.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/DocAccessibleWrap.h	2021-01-18 19:58:08.000000000 +0000
@@ -20,9 +20,23 @@
  public:
   DocAccessibleWrap(dom::Document* aDocument, PresShell* aPresShell);
 
+  virtual ~DocAccessibleWrap();
+
   virtual void Shutdown() override;
 
-  virtual ~DocAccessibleWrap();
+  virtual void AttributeChanged(dom::Element* aElement, int32_t aNameSpaceID,
+                                nsAtom* aAttribute, int32_t aModType,
+                                const nsAttrValue* aOldValue) override;
+
+  void QueueNewLiveRegion(Accessible* aAccessible);
+
+  void ProcessNewLiveRegions();
+
+ protected:
+  virtual void DoInitialUpdate() override;
+
+ private:
+  nsTHashtable<nsVoidPtrHashKey> mNewLiveRegions;
 };
 
 }  // namespace a11y
diff -Nru firefox-84.0.2+build1/accessible/mac/DocAccessibleWrap.mm firefox-85.0+build1/accessible/mac/DocAccessibleWrap.mm
--- firefox-84.0.2+build1/accessible/mac/DocAccessibleWrap.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/DocAccessibleWrap.mm	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DocAccessibleWrap.h"
+#include "DocAccessible-inl.h"
 
 #import "mozAccessible.h"
 #import "MOXTextMarkerDelegate.h"
@@ -23,3 +24,81 @@
 }
 
 DocAccessibleWrap::~DocAccessibleWrap() {}
+
+void DocAccessibleWrap::AttributeChanged(dom::Element* aElement,
+                                         int32_t aNameSpaceID,
+                                         nsAtom* aAttribute, int32_t aModType,
+                                         const nsAttrValue* aOldValue) {
+  DocAccessible::AttributeChanged(aElement, aNameSpaceID, aAttribute, aModType,
+                                  aOldValue);
+  if (aAttribute == nsGkAtoms::aria_live) {
+    Accessible* accessible =
+        mContent != aElement ? GetAccessible(aElement) : this;
+    if (!accessible) {
+      return;
+    }
+
+    static const dom::Element::AttrValuesArray sLiveRegionValues[] = {
+        nsGkAtoms::OFF, nsGkAtoms::polite, nsGkAtoms::assertive, nullptr};
+    int32_t attrValue =
+        aElement->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::aria_live,
+                                  sLiveRegionValues, eIgnoreCase);
+    if (attrValue > 0) {
+      if (!aOldValue || aOldValue->IsEmptyString() ||
+          aOldValue->Equals(nsGkAtoms::OFF, eIgnoreCase)) {
+        // This element just got an active aria-live attribute value
+        FireDelayedEvent(nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED,
+                         accessible);
+      }
+    } else {
+      if (aOldValue && (aOldValue->Equals(nsGkAtoms::polite, eIgnoreCase) ||
+                        aOldValue->Equals(nsGkAtoms::assertive, eIgnoreCase))) {
+        // This element lost an active live region
+        FireDelayedEvent(nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED,
+                         accessible);
+      } else if (attrValue == 0) {
+        // aria-live="off", check if its a role-based live region that
+        // needs to be removed.
+        if (const nsRoleMapEntry* roleMap = accessible->ARIARoleMap()) {
+          // aria role defines it as a live region. It's live!
+          if (roleMap->liveAttRule == ePoliteLiveAttr ||
+              roleMap->liveAttRule == eAssertiveLiveAttr) {
+            FireDelayedEvent(nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED,
+                             accessible);
+          }
+        } else if (nsStaticAtom* value = GetAccService()->MarkupAttribute(
+                       aElement, nsGkAtoms::live)) {
+          // HTML element defines it as a live region. It's live!
+          if (value == nsGkAtoms::polite || value == nsGkAtoms::assertive) {
+            FireDelayedEvent(nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED,
+                             accessible);
+          }
+        }
+      }
+    }
+  }
+}
+
+void DocAccessibleWrap::QueueNewLiveRegion(Accessible* aAccessible) {
+  if (!aAccessible) {
+    return;
+  }
+
+  mNewLiveRegions.PutEntry(aAccessible->UniqueID());
+}
+
+void DocAccessibleWrap::ProcessNewLiveRegions() {
+  for (auto iter = mNewLiveRegions.Iter(); !iter.Done(); iter.Next()) {
+    if (Accessible* liveRegion =
+            GetAccessibleByUniqueID(const_cast<void*>(iter.Get()->GetKey()))) {
+      FireDelayedEvent(nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED, liveRegion);
+    }
+  }
+
+  mNewLiveRegions.Clear();
+}
+
+void DocAccessibleWrap::DoInitialUpdate() {
+  DocAccessible::DoInitialUpdate();
+  ProcessNewLiveRegions();
+}
diff -Nru firefox-84.0.2+build1/accessible/mac/GeckoTextMarker.h firefox-85.0+build1/accessible/mac/GeckoTextMarker.h
--- firefox-84.0.2+build1/accessible/mac/GeckoTextMarker.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/GeckoTextMarker.h	2021-01-18 19:58:08.000000000 +0000
@@ -59,8 +59,6 @@
   }
 
  private:
-  uint32_t CharacterCount(const AccessibleOrProxy& aContainer);
-
   bool IsEditableRoot();
 };
 
@@ -70,6 +68,8 @@
                        const GeckoTextMarker& aEnd)
       : mStart(aStart), mEnd(aEnd) {}
 
+  GeckoTextMarkerRange() {}
+
   GeckoTextMarkerRange(AccessibleOrProxy aDoc,
                        AXTextMarkerRangeRef aTextMarkerRange);
 
@@ -101,6 +101,13 @@
    */
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void Select() const;
 
+  /**
+   * Crops the range if it overlaps the given accessible element boundaries.
+   * Return true if successfully cropped. false if the range does not intersect
+   * with the container.
+   */
+  bool Crop(const AccessibleOrProxy& aContainer);
+
   GeckoTextMarker mStart;
   GeckoTextMarker mEnd;
 };
diff -Nru firefox-84.0.2+build1/accessible/mac/GeckoTextMarker.mm firefox-85.0+build1/accessible/mac/GeckoTextMarker.mm
--- firefox-84.0.2+build1/accessible/mac/GeckoTextMarker.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/GeckoTextMarker.mm	2021-01-18 19:58:08.000000000 +0000
@@ -277,7 +277,7 @@
   return false;
 }
 
-uint32_t GeckoTextMarker::CharacterCount(const AccessibleOrProxy& aContainer) {
+static uint32_t CharacterCount(const AccessibleOrProxy& aContainer) {
   if (aContainer.IsProxy()) {
     return aContainer.AsProxy()->CharacterCount();
   }
@@ -335,7 +335,8 @@
 
 GeckoTextMarkerRange::GeckoTextMarkerRange(
     AccessibleOrProxy aDoc, AXTextMarkerRangeRef aTextMarkerRange) {
-  if (CFGetTypeID(aTextMarkerRange) != AXTextMarkerRangeGetTypeID()) {
+  if (!aTextMarkerRange ||
+      CFGetTypeID(aTextMarkerRange) != AXTextMarkerRangeGetTypeID()) {
     return;
   }
 
@@ -352,16 +353,26 @@
 
 GeckoTextMarkerRange::GeckoTextMarkerRange(
     const AccessibleOrProxy& aAccessible) {
-  mStart = GeckoTextMarker(aAccessible.Parent(), 0);
-  mEnd = GeckoTextMarker(aAccessible.Parent(), 0);
-  if (mStart.mContainer.IsProxy()) {
-    DocAccessibleParent* ipcDoc = mStart.mContainer.AsProxy()->Document();
-    Unused << ipcDoc->GetPlatformExtension()->SendRangeOfChild(
-        mStart.mContainer.AsProxy()->ID(), aAccessible.AsProxy()->ID(),
-        &mStart.mOffset, &mEnd.mOffset);
-  } else if (auto htWrap = mStart.ContainerAsHyperTextWrap()) {
-    htWrap->RangeOfChild(aAccessible.AsAccessible(), &mStart.mOffset,
-                         &mEnd.mOffset);
+  if ((aAccessible.IsAccessible() &&
+       aAccessible.AsAccessible()->IsHyperText()) ||
+      (aAccessible.IsProxy() && aAccessible.AsProxy()->mIsHyperText)) {
+    // The accessible is a hypertext. Initialize range to its inner text range.
+    mStart = GeckoTextMarker(aAccessible, 0);
+    mEnd = GeckoTextMarker(aAccessible, (CharacterCount(aAccessible)));
+  } else {
+    // The accessible is not a hypertext (maybe a text leaf?). Initialize range
+    // to its offsets in its container.
+    mStart = GeckoTextMarker(aAccessible.Parent(), 0);
+    mEnd = GeckoTextMarker(aAccessible.Parent(), 0);
+    if (mStart.mContainer.IsProxy()) {
+      DocAccessibleParent* ipcDoc = mStart.mContainer.AsProxy()->Document();
+      Unused << ipcDoc->GetPlatformExtension()->SendRangeOfChild(
+          mStart.mContainer.AsProxy()->ID(), aAccessible.AsProxy()->ID(),
+          &mStart.mOffset, &mEnd.mOffset);
+    } else if (auto htWrap = mStart.ContainerAsHyperTextWrap()) {
+      htWrap->RangeOfChild(aAccessible.AsAccessible(), &mStart.mOffset,
+                           &mEnd.mOffset);
+    }
   }
 }
 
@@ -441,5 +452,29 @@
     htWrap->SelectRange(mStart.mOffset, end, mEnd.mOffset);
   }
 }
+
+bool GeckoTextMarkerRange::Crop(const AccessibleOrProxy& aContainer) {
+  GeckoTextMarker containerStart(aContainer, 0);
+  GeckoTextMarker containerEnd(aContainer, CharacterCount(aContainer));
+
+  if (mEnd < containerStart || containerEnd < mStart) {
+    // The range ends before the container, or starts after it.
+    return false;
+  }
+
+  if (mStart < containerStart) {
+    // If range start is before container start, adjust range start to
+    // start of container.
+    mStart = containerStart;
+  }
+
+  if (containerEnd < mEnd) {
+    // If range end is after container end, adjust range end to end of
+    // container.
+    mEnd = containerEnd;
+  }
+
+  return true;
+}
 }
 }
diff -Nru firefox-84.0.2+build1/accessible/mac/HyperTextAccessibleWrap.mm firefox-85.0+build1/accessible/mac/HyperTextAccessibleWrap.mm
--- firefox-84.0.2+build1/accessible/mac/HyperTextAccessibleWrap.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/HyperTextAccessibleWrap.mm	2021-01-18 19:58:07.000000000 +0000
@@ -22,14 +22,12 @@
 class HyperTextIterator {
  public:
   HyperTextIterator(HyperTextAccessible* aStartContainer, int32_t aStartOffset,
-                    HyperTextAccessible* aEndContainer, int32_t aEndOffset,
-                    bool aSkipBullet = false)
+                    HyperTextAccessible* aEndContainer, int32_t aEndOffset)
       : mCurrentContainer(aStartContainer),
         mCurrentStartOffset(aStartOffset),
         mCurrentEndOffset(aStartOffset),
         mEndContainer(aEndContainer),
-        mEndOffset(aEndOffset),
-        mSkipBullet(aSkipBullet) {}
+        mEndOffset(aEndOffset) {}
 
   bool Next();
 
@@ -56,8 +54,6 @@
 
   HyperTextAccessible* mEndContainer;
   int32_t mEndOffset;
-
-  bool mSkipBullet;
 };
 
 bool HyperTextIterator::NormalizeForward() {
@@ -83,6 +79,12 @@
       mCurrentContainer = mCurrentContainer->Parent()->AsHyperText();
       mCurrentStartOffset = endOffset;
 
+      if (mCurrentContainer == mEndContainer &&
+          mCurrentStartOffset >= mEndOffset) {
+        // Reached end boundary.
+        return false;
+      }
+
       // Call NormalizeForward recursively to get top-most link if at the end of
       // one, or innermost link if at the beginning.
       NormalizeForward();
@@ -94,14 +96,27 @@
 
     // If there is a link at this offset, mutate into it.
     if (link && link->IsHyperText()) {
+      if (mCurrentStartOffset > 0 &&
+          mCurrentContainer->LinkIndexAtOffset(mCurrentStartOffset) ==
+              mCurrentContainer->LinkIndexAtOffset(mCurrentStartOffset - 1)) {
+        MOZ_ASSERT_UNREACHABLE("Same link for previous offset");
+        return false;
+      }
+
       mCurrentContainer = link->AsHyperText();
-      if (mSkipBullet && link->IsHTMLListItem()) {
+      if (link->IsHTMLListItem()) {
         Accessible* bullet = link->AsHTMLListItem()->Bullet();
         mCurrentStartOffset = bullet ? nsAccUtils::TextLength(bullet) : 0;
       } else {
         mCurrentStartOffset = 0;
       }
 
+      if (mCurrentContainer == mEndContainer &&
+          mCurrentStartOffset >= mEndOffset) {
+        // Reached end boundary.
+        return false;
+      }
+
       // Call NormalizeForward recursively to get top-most embedding ancestor
       // if at the end of one, or innermost link if at the beginning.
       NormalizeForward();
@@ -153,7 +168,7 @@
       return true;
     }
 
-    if (mSkipBullet && mCurrentContainer->IsHTMLListItem() &&
+    if (mCurrentContainer->IsHTMLListItem() &&
         mCurrentContainer->AsHTMLListItem()->Bullet() == link) {
       mCurrentStartOffset = 0;
       NormalizeBackward();
@@ -219,6 +234,16 @@
                                            int32_t aStartOffset,
                                            HyperTextAccessible* aEndContainer,
                                            int32_t aEndOffset) {
+  if (IsHTMLListItem()) {
+    Accessible* maybeBullet = GetChildAtOffset(aStartOffset - 1);
+    if (maybeBullet) {
+      Accessible* bullet = AsHTMLListItem()->Bullet();
+      if (maybeBullet == bullet) {
+        TextSubstring(0, nsAccUtils::TextLength(bullet), aText);
+      }
+    }
+  }
+
   HyperTextIterator iter(this, aStartOffset, aEndContainer, aEndOffset);
   while (iter.Next()) {
     nsAutoString text;
@@ -246,7 +271,7 @@
     int32_t aStartOffset, HyperTextAccessible* aEndContainer,
     int32_t aEndOffset) {
   int32_t length = 0;
-  HyperTextIterator iter(this, aStartOffset, aEndContainer, aEndOffset, true);
+  HyperTextIterator iter(this, aStartOffset, aEndContainer, aEndOffset);
   while (iter.Next()) {
     length += iter.SegmentLength();
   }
@@ -258,7 +283,7 @@
                                             HyperTextAccessible** aContainer,
                                             int32_t* aOffset) {
   int32_t index = aIndex;
-  HyperTextIterator iter(this, 0, this, CharacterCount(), true);
+  HyperTextIterator iter(this, 0, this, CharacterCount());
   while (iter.Next()) {
     int32_t segmentLength = iter.SegmentLength();
     if (index <= segmentLength) {
@@ -518,7 +543,9 @@
 Accessible* HyperTextAccessibleWrap::LeafAtOffset(int32_t aOffset) {
   HyperTextAccessible* text = this;
   Accessible* child = nullptr;
-  int32_t innerOffset = aOffset;
+  // The offset needed should "attach" the previous accessible if
+  // in between two accessibles.
+  int32_t innerOffset = aOffset > 0 ? aOffset - 1 : aOffset;
   do {
     int32_t childIdx = text->GetChildIndexAtOffset(innerOffset);
     if (childIdx == -1) {
@@ -550,7 +577,7 @@
     EWordMovementType aWordMovementType) {
   // Layout can remain trapped in an editable. We normalize out of
   // it if we are in its last offset.
-  HyperTextIterator iter(this, aOffset, this, CharacterCount(), true);
+  HyperTextIterator iter(this, aOffset, this, CharacterCount());
   if (aDirection == eDirNext) {
     iter.NormalizeForward();
   } else {
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXAccessibleBase.h firefox-85.0+build1/accessible/mac/MOXAccessibleBase.h
--- firefox-84.0.2+build1/accessible/mac/MOXAccessibleBase.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXAccessibleBase.h	2021-01-18 19:58:08.000000000 +0000
@@ -123,6 +123,8 @@
 // override
 - (id<MOXTextMarkerSupport>)moxTextMarkerDelegate;
 
+- (BOOL)moxIsLiveRegion;
+
 #pragma mark -
 
 - (NSString*)description;
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXAccessibleBase.mm firefox-85.0+build1/accessible/mac/MOXAccessibleBase.mm
--- firefox-84.0.2+build1/accessible/mac/MOXAccessibleBase.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXAccessibleBase.mm	2021-01-18 19:58:08.000000000 +0000
@@ -511,6 +511,10 @@
   return nil;
 }
 
+- (BOOL)moxIsLiveRegion {
+  return NO;
+}
+
 #pragma mark -
 
 // objc-style description (from NSObject); not to be confused with the
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXAccessibleProtocol.h firefox-85.0+build1/accessible/mac/MOXAccessibleProtocol.h
--- firefox-84.0.2+build1/accessible/mac/MOXAccessibleProtocol.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXAccessibleProtocol.h	2021-01-18 19:58:08.000000000 +0000
@@ -57,6 +57,9 @@
 // Return text delegate if it exists.
 - (id<MOXTextMarkerSupport> _Nullable)moxTextMarkerDelegate;
 
+// Return true if this accessible is a live region
+- (BOOL)moxIsLiveRegion;
+
 @optional
 
 #pragma mark - AttributeGetters
@@ -281,6 +284,21 @@
 // AXEditableAncestor
 - (id _Nullable)moxEditableAncestor;
 
+// AXHighestEditableAncestor
+- (id _Nullable)moxHighestEditableAncestor;
+
+// AXFocusableAncestor
+- (id _Nullable)moxFocusableAncestor;
+
+// AXARIAAtomic
+- (NSNumber* _Nullable)moxARIAAtomic;
+
+// AXARIALive
+- (NSString* _Nullable)moxARIALive;
+
+// AXARIARelevant
+- (NSString* _Nullable)moxARIARelevant;
+
 // AXMozDebugDescription
 - (NSString* _Nullable)moxMozDebugDescription;
 
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXSearchInfo.mm firefox-85.0+build1/accessible/mac/MOXSearchInfo.mm
--- firefox-84.0.2+build1/accessible/mac/MOXSearchInfo.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXSearchInfo.mm	2021-01-18 19:58:07.000000000 +0000
@@ -120,32 +120,24 @@
       RotorRule rule =
           mImmediateDescendantsOnly ? RotorRule(geckoRootAcc) : RotorRule();
 
-      if (mSearchForward) {
-        if ([mStartElem isKindOfClass:[MOXWebAreaAccessible class]]) {
-          if (id rootGroup =
-                  [static_cast<MOXWebAreaAccessible*>(mStartElem) rootGroup]) {
-            // Moving forward from web area, rootgroup; if it exists, is next.
-            [matches addObject:rootGroup];
-            if (mResultLimit == 1) {
-              // Found one match, continue in search keys for block.
-              continue;
-            }
+      if ([mStartElem isKindOfClass:[MOXWebAreaAccessible class]]) {
+        if (id rootGroup =
+                [static_cast<MOXWebAreaAccessible*>(mStartElem) rootGroup]) {
+          // Moving forward from web area, rootgroup; if it exists, is next.
+          [matches addObject:rootGroup];
+          if (mResultLimit == 1) {
+            // Found one match, continue in search keys for block.
+            continue;
           }
-        } else if (mImmediateDescendantsOnly && mStartElem != mRoot &&
-                   [mStartElem isKindOfClass:[MOXRootGroup class]]) {
-          // Moving forward from root group. If we don't match descendants,
-          // there is no match. Continue.
-          continue;
-        }
-      } else if (!mSearchForward &&
-                 [mStartElem isKindOfClass:[MOXRootGroup class]]) {
-        // Moving backward from root group. Web area is next.
-        [matches addObject:[mStartElem moxParent]];
-        if (mResultLimit == 1) {
-          // Found one match, continue in search keys for block.
-          continue;
         }
       }
+
+      if (mImmediateDescendantsOnly && mStartElem != mRoot &&
+          [mStartElem isKindOfClass:[MOXRootGroup class]]) {
+        // Moving forward from root group. If we don't match descendants,
+        // there is no match. Continue.
+        continue;
+      }
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
 
@@ -323,10 +315,16 @@
     }
 
     if ([key isEqualToString:@"AXTextFieldSearchKey"]) {
-      RotorMacRoleRule rule =
-          mImmediateDescendantsOnly
-              ? RotorMacRoleRule(@"AXTextField", geckoRootAcc)
-              : RotorMacRoleRule(@"AXTextField");
+      RotorTextEntryRule rule = mImmediateDescendantsOnly
+                                    ? RotorTextEntryRule(geckoRootAcc)
+                                    : RotorTextEntryRule();
+      [matches addObjectsFromArray:[self getMatchesForRule:rule]];
+    }
+
+    if ([key isEqualToString:@"AXLiveRegionSearchKey"]) {
+      RotorLiveRegionRule rule = mImmediateDescendantsOnly
+                                     ? RotorLiveRegionRule(geckoRootAcc)
+                                     : RotorLiveRegionRule();
       [matches addObjectsFromArray:[self getMatchesForRule:rule]];
     }
   }
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXTextMarkerDelegate.h firefox-85.0+build1/accessible/mac/MOXTextMarkerDelegate.h
--- firefox-84.0.2+build1/accessible/mac/MOXTextMarkerDelegate.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXTextMarkerDelegate.h	2021-01-18 19:58:07.000000000 +0000
@@ -8,6 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #import "MOXAccessibleProtocol.h"
+#import "GeckoTextMarker.h"
 
 #include "AccessibleOrProxy.h"
 
@@ -31,6 +32,8 @@
 
 - (void)invalidateSelection;
 
+- (mozilla::a11y::GeckoTextMarkerRange)selection;
+
 // override
 - (id)moxStartTextMarker;
 
diff -Nru firefox-84.0.2+build1/accessible/mac/MOXTextMarkerDelegate.mm firefox-85.0+build1/accessible/mac/MOXTextMarkerDelegate.mm
--- firefox-84.0.2+build1/accessible/mac/MOXTextMarkerDelegate.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/MOXTextMarkerDelegate.mm	2021-01-18 19:58:07.000000000 +0000
@@ -75,6 +75,10 @@
   mSelection = nil;
 }
 
+- (mozilla::a11y::GeckoTextMarkerRange)selection {
+  return mozilla::a11y::GeckoTextMarkerRange(mGeckoDocAccessible, mSelection);
+}
+
 - (id)moxStartTextMarker {
   GeckoTextMarker geckoTextPoint(mGeckoDocAccessible, 0);
   return geckoTextPoint.CreateAXTextMarker();
@@ -287,7 +291,12 @@
     return nil;
   }
 
-  return GetNativeFromGeckoAccessible(geckoTextMarker.Leaf());
+  AccessibleOrProxy leaf = geckoTextMarker.Leaf();
+  if (leaf.IsNull()) {
+    return nil;
+  }
+
+  return GetNativeFromGeckoAccessible(leaf);
 }
 
 - (id)moxTextMarkerRangeForUIElement:(id)element {
diff -Nru firefox-84.0.2+build1/accessible/mac/mozAccessible.h firefox-85.0+build1/accessible/mac/mozAccessible.h
--- firefox-84.0.2+build1/accessible/mac/mozAccessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozAccessible.h	2021-01-18 19:58:08.000000000 +0000
@@ -59,6 +59,8 @@
   uint64_t mCachedState;
 
   nsStaticAtom* mARIARole;
+
+  bool mIsLiveRegion;
 }
 
 // inits with the given wrap or proxy accessible
@@ -109,6 +111,9 @@
 // Handle a role change
 - (void)handleRoleChanged:(mozilla::a11y::role)newRole;
 
+// Get ARIA role
+- (nsStaticAtom*)ARIARole;
+
 #pragma mark - mozAccessible protocol / widget
 
 // override
@@ -133,6 +138,8 @@
 
 - (id<MOXTextMarkerSupport>)moxTextMarkerDelegate;
 
+- (BOOL)moxIsLiveRegion;
+
 // Attribute getters
 
 // override
@@ -184,6 +191,15 @@
 - (NSString*)moxARIACurrent;
 
 // override
+- (NSNumber*)moxARIAAtomic;
+
+// override
+- (NSString*)moxARIALive;
+
+// override
+- (NSString*)moxARIARelevant;
+
+// override
 - (id)moxTitleUIElement;
 
 // override
@@ -195,6 +211,12 @@
 // override
 - (id)moxEditableAncestor;
 
+// override
+- (id)moxHighestEditableAncestor;
+
+// override
+- (id)moxFocusableAncestor;
+
 #ifndef RELEASE_OR_BETA
 // override
 - (NSString*)moxMozDebugDescription;
diff -Nru firefox-84.0.2+build1/accessible/mac/mozAccessible.mm firefox-85.0+build1/accessible/mac/mozAccessible.mm
--- firefox-84.0.2+build1/accessible/mac/mozAccessible.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozAccessible.mm	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #import "mozAccessible.h"
+#include "MOXAccessibleBase.h"
 
 #import "MacUtils.h"
 #import "mozView.h"
@@ -40,7 +41,7 @@
 @interface mozAccessible ()
 - (BOOL)providesLabelNotTitle;
 
-- (nsStaticAtom*)ARIARole;
+- (void)maybePostLiveRegionChanged;
 @end
 
 @implementation mozAccessible
@@ -207,6 +208,12 @@
     return [self stateWithMask:states::FOCUSABLE] == 0;
   }
 
+  if (selector == @selector(moxARIALive) ||
+      selector == @selector(moxARIAAtomic) ||
+      selector == @selector(moxARIARelevant)) {
+    return ![self moxIsLiveRegion];
+  }
+
   return [super moxBlockSelector:selector];
 }
 
@@ -260,6 +267,10 @@
       getOrCreateForDoc:mGeckoAccessible.AsProxy()->Document()];
 }
 
+- (BOOL)moxIsLiveRegion {
+  return mIsLiveRegion;
+}
+
 - (id)moxHitTest:(NSPoint)point {
   MOZ_ASSERT(!mGeckoAccessible.IsNull());
 
@@ -538,6 +549,13 @@
 };
 
 - (NSString*)moxRoleDescription {
+  if (NSString* ariaRoleDescription =
+          utils::GetAccAttr(self, "roledescription")) {
+    if ([ariaRoleDescription length]) {
+      return ariaRoleDescription;
+    }
+  }
+
   if (mRole == roles::FIGURE) return utils::LocalizedString(u"figure"_ns);
 
   if (mRole == roles::HEADING) return utils::LocalizedString(u"heading"_ns);
@@ -709,6 +727,23 @@
   return utils::GetAccAttr(self, "current");
 }
 
+- (NSNumber*)moxARIAAtomic {
+  return @(utils::GetAccAttr(self, "atomic") != nil);
+}
+
+- (NSString*)moxARIALive {
+  return utils::GetAccAttr(self, "live");
+}
+
+- (NSString*)moxARIARelevant {
+  if (NSString* relevant = utils::GetAccAttr(self, "container-relevant")) {
+    return relevant;
+  }
+
+  // Default aria-relevant value
+  return @"additions text";
+}
+
 - (id)moxTitleUIElement {
   MOZ_ASSERT(!mGeckoAccessible.IsNull());
 
@@ -795,6 +830,33 @@
   return nil;
 }
 
+- (id)moxHighestEditableAncestor {
+  id highestAncestor = [self moxEditableAncestor];
+  while ([highestAncestor conformsToProtocol:@protocol(MOXAccessible)]) {
+    id ancestorParent = [highestAncestor moxUnignoredParent];
+    if (![ancestorParent conformsToProtocol:@protocol(MOXAccessible)]) {
+      break;
+    }
+
+    id higherAncestor = [ancestorParent moxEditableAncestor];
+
+    if (!higherAncestor) {
+      break;
+    }
+
+    highestAncestor = higherAncestor;
+  }
+
+  return highestAncestor;
+}
+
+- (id)moxFocusableAncestor {
+  // XXX: Checking focusable state up the chain can be expensive. For now,
+  // we can just return AXEditableAncestor since the main use case for this
+  // is rich text editing with links.
+  return [self moxEditableAncestor];
+}
+
 #ifndef RELEASE_OR_BETA
 - (NSString*)moxMozDebugDescription {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
@@ -911,11 +973,20 @@
   return NO;
 }
 
+- (void)maybePostLiveRegionChanged {
+  for (id element = self; [element conformsToProtocol:@protocol(MOXAccessible)];
+       element = [element moxUnignoredParent]) {
+    if ([element moxIsLiveRegion]) {
+      [element moxPostNotification:@"AXLiveRegionChanged"];
+      return;
+    }
+  }
+}
+
 - (void)handleAccessibleTextChangeEvent:(NSString*)change
                                inserted:(BOOL)isInserted
                             inContainer:(const AccessibleOrProxy&)container
                                      at:(int32_t)start {
-  // XXX: Eventually live region handling will go here.
 }
 
 - (void)handleAccessibleEvent:(uint32_t)eventType {
@@ -963,6 +1034,17 @@
                  withUserInfo:userInfo];
       break;
     }
+    case nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED:
+      mIsLiveRegion = true;
+      [self moxPostNotification:@"AXLiveRegionCreated"];
+      break;
+    case nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED:
+      mIsLiveRegion = false;
+      break;
+    case nsIAccessibleEvent::EVENT_REORDER:
+    case nsIAccessibleEvent::EVENT_NAME_CHANGE:
+      [self maybePostLiveRegionChanged];
+      break;
   }
 }
 
diff -Nru firefox-84.0.2+build1/accessible/mac/mozActionElements.h firefox-85.0+build1/accessible/mac/mozActionElements.h
--- firefox-84.0.2+build1/accessible/mac/mozActionElements.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozActionElements.h	2021-01-18 19:58:08.000000000 +0000
@@ -34,9 +34,6 @@
 // override
 - (void)stateChanged:(uint64_t)state isEnabled:(BOOL)enabled;
 
-// override
-- (BOOL)moxIgnoreWithParent:(mozAccessible*)parent;
-
 @end
 
 @interface mozCheckboxAccessible : mozButtonAccessible
@@ -44,6 +41,9 @@
 // override
 - (id)moxValue;
 
+// override
+- (void)stateChanged:(uint64_t)state isEnabled:(BOOL)enabled;
+
 @end
 
 // Accessible for a radio button
diff -Nru firefox-84.0.2+build1/accessible/mac/mozActionElements.mm firefox-85.0+build1/accessible/mac/mozActionElements.mm
--- firefox-84.0.2+build1/accessible/mac/mozActionElements.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozActionElements.mm	2021-01-18 19:58:08.000000000 +0000
@@ -77,23 +77,6 @@
   }
 }
 
-- (BOOL)moxIgnoreWithParent:(mozAccessible*)parent {
-  if (Accessible* acc = mGeckoAccessible.AsAccessible()) {
-    if (acc->IsContent() &&
-        acc->GetContent()->IsXULElement(nsGkAtoms::menulist)) {
-      // The way select elements work is that content has a COMBOBOX accessible,
-      // when it is clicked it expands a COMBOBOX in our top-level main XUL
-      // window. The latter COMBOBOX is a stand-in for the content one while it
-      // is expanded.
-      // XXX: VO focus behaves weirdly if we expose the dummy XUL COMBOBOX in
-      // the tree. We are only interested in its menu child.
-      return YES;
-    }
-  }
-
-  return [super moxIgnoreWithParent:parent];
-}
-
 @end
 
 @implementation mozRadioButtonAccessible
@@ -154,6 +137,14 @@
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
+- (void)stateChanged:(uint64_t)state isEnabled:(BOOL)enabled {
+  [super stateChanged:state isEnabled:enabled];
+
+  if (state & (states::CHECKED | states::PRESSED | states::MIXED)) {
+    [self moxPostNotification:NSAccessibilityValueChangedNotification];
+  }
+}
+
 @end
 
 @implementation mozPaneAccessible
diff -Nru firefox-84.0.2+build1/accessible/mac/mozTableAccessible.h firefox-85.0+build1/accessible/mac/mozTableAccessible.h
--- firefox-84.0.2+build1/accessible/mac/mozTableAccessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozTableAccessible.h	2021-01-18 19:58:08.000000000 +0000
@@ -125,6 +125,9 @@
 // override
 - (NSArray*)moxSelectedRows;
 
+// override
+- (NSString*)moxOrientation;
+
 @end
 
 @interface mozOutlineRowAccessible : mozTableRowAccessible
@@ -136,6 +139,9 @@
 - (NSNumber*)moxDisclosing;
 
 // override
+- (NSNumber*)moxExpanded;
+
+// override
 - (id)moxDisclosedByRow;
 
 // override
diff -Nru firefox-84.0.2+build1/accessible/mac/mozTableAccessible.mm firefox-85.0+build1/accessible/mac/mozTableAccessible.mm
--- firefox-84.0.2+build1/accessible/mac/mozTableAccessible.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozTableAccessible.mm	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 #include "Accessible.h"
 #include "TableAccessible.h"
 #include "TableCellAccessible.h"
+#include "XULTreeAccessible.h"
 #include "Pivot.h"
 #include "Relation.h"
 
@@ -409,7 +410,26 @@
 }
 
 - (NSArray*)moxColumns {
-  // Webkit says we shouldn't do anything here
+  if (Accessible* acc = mGeckoAccessible.AsAccessible()) {
+    if (acc->IsContent() && acc->GetContent()->IsXULElement(nsGkAtoms::tree)) {
+      XULTreeAccessible* treeAcc = (XULTreeAccessible*)acc;
+      NSMutableArray* cols = [[NSMutableArray alloc] init];
+      // XUL trees store their columns in a group at the tree's first
+      // child. Here, we iterate over that group to get each column's
+      // native accessible and add it to our col array.
+      Accessible* treeColumns = treeAcc->GetChildAt(0);
+      if (treeColumns) {
+        uint32_t colCount = treeColumns->ChildCount();
+        for (uint32_t i = 0; i < colCount; i++) {
+          Accessible* treeColumnItem = treeColumns->GetChildAt(i);
+          [cols addObject:GetNativeFromGeckoAccessible(treeColumnItem)];
+        }
+        return cols;
+      }
+    }
+  }
+  // Webkit says we shouldn't expose any cols for aria-tree
+  // so we return an empty array here
   return @[];
 }
 
@@ -425,6 +445,10 @@
   return selectedRows;
 }
 
+- (NSString*)moxOrientation {
+  return NSAccessibilityVerticalOrientationValue;
+}
+
 @end
 
 @implementation mozOutlineRowAccessible
@@ -437,6 +461,10 @@
   return @([self stateWithMask:states::EXPANDED] != 0);
 }
 
+- (NSNumber*)moxExpanded {
+  return @([self stateWithMask:states::EXPANDED] != 0);
+}
+
 - (id)moxDisclosedByRow {
   // According to webkit: this attr corresponds to the row
   // that contains this row. It should be the same as the
@@ -492,8 +520,9 @@
   } else if (ProxyAccessible* proxy = mGeckoAccessible.AsProxy()) {
     groupPos = proxy->GroupPosition();
   }
-
-  return @(groupPos.level);
+  // mac expects 0-indexed levels, but groupPos.level is 1-indexed
+  // so we subtract 1 here for levels above 0
+  return groupPos.level > 0 ? @(groupPos.level - 1) : @(groupPos.level);
 }
 
 - (NSArray*)moxDisclosedRows {
diff -Nru firefox-84.0.2+build1/accessible/mac/mozTextAccessible.h firefox-85.0+build1/accessible/mac/mozTextAccessible.h
--- firefox-84.0.2+build1/accessible/mac/mozTextAccessible.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozTextAccessible.h	2021-01-18 19:58:08.000000000 +0000
@@ -25,6 +25,9 @@
 - (NSNumber*)moxInsertionPointLineNumber;
 
 // override
+- (NSString*)moxRole;
+
+// override
 - (NSString*)moxSubrole;
 
 // override
diff -Nru firefox-84.0.2+build1/accessible/mac/mozTextAccessible.mm firefox-85.0+build1/accessible/mac/mozTextAccessible.mm
--- firefox-84.0.2+build1/accessible/mac/mozTextAccessible.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/mozTextAccessible.mm	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,7 @@
 
 #import "mozTextAccessible.h"
 #import "GeckoTextMarker.h"
+#import "MOXTextMarkerDelegate.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -43,6 +44,8 @@
 - (long)textLength;
 - (BOOL)isReadOnly;
 - (NSString*)text;
+- (GeckoTextMarkerRange)selection;
+- (GeckoTextMarkerRange)textMarkerRangeFromRange:(NSValue*)range;
 @end
 
 @implementation mozTextAccessible
@@ -131,6 +134,15 @@
   return (lineNumber >= 0) ? [NSNumber numberWithInt:lineNumber] : nil;
 }
 
+- (NSString*)moxRole {
+  if ([self ARIARole] == nsGkAtoms::textbox ||
+      [self stateWithMask:states::MULTI_LINE]) {
+    return NSAccessibilityTextAreaRole;
+  }
+
+  return [super moxRole];
+}
+
 - (NSString*)moxSubrole {
   MOZ_ASSERT(!mGeckoAccessible.IsNull());
 
@@ -150,80 +162,35 @@
 }
 
 - (NSNumber*)moxNumberOfCharacters {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
-  Accessible* acc = mGeckoAccessible.AsAccessible();
-  ProxyAccessible* proxy = mGeckoAccessible.AsProxy();
-  HyperTextAccessible* textAcc = acc ? acc->AsHyperText() : nullptr;
-  if (!textAcc && !proxy) {
-    return @0;
-  }
-
-  return textAcc ? @(textAcc->CharacterCount()) : @(proxy->CharacterCount());
+  return @([self textLength]);
 }
 
 - (NSString*)moxSelectedText {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
-  int32_t start = 0, end = 0;
-  nsAutoString selText;
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      textAcc->SelectionBoundsAt(0, &start, &end);
-      if (start != end) {
-        textAcc->TextSubstring(start, end, selText);
-      }
-    }
-  } else {
-    mGeckoAccessible.AsProxy()->SelectionBoundsAt(0, selText, &start, &end);
+  GeckoTextMarkerRange selection = [self selection];
+  if (!selection.IsValid()) {
+    return nil;
   }
 
-  return nsCocoaUtils::ToNSString(selText);
+  return selection.Text();
 }
 
 - (NSValue*)moxSelectedTextRange {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
-  int32_t start = 0;
-  int32_t end = 0;
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      if (textAcc->SelectionCount()) {
-        textAcc->SelectionBoundsAt(0, &start, &end);
-      } else {
-        start = textAcc->CaretOffset();
-        end = start != -1 ? start : 0;
-      }
-    }
-  } else {
-    ProxyAccessible* proxy = mGeckoAccessible.AsProxy();
-    if (proxy->SelectionCount()) {
-      nsString data;
-      proxy->SelectionBoundsAt(0, data, &start, &end);
-    } else {
-      start = proxy->CaretOffset();
-      end = start != -1 ? start : 0;
-    }
+  GeckoTextMarkerRange selection = [self selection];
+  if (!selection.IsValid()) {
+    return nil;
   }
 
-  return [NSValue valueWithRange:NSMakeRange(start, end - start)];
+  GeckoTextMarkerRange fromStartToSelection(
+      GeckoTextMarker(mGeckoAccessible, 0), selection.mStart);
+
+  return [NSValue valueWithRange:NSMakeRange(fromStartToSelection.Length(),
+                                             selection.Length())];
 }
 
 - (NSValue*)moxVisibleCharacterRange {
   // XXX this won't work with Textarea and such as we actually don't give
   // the visible character range.
-  Accessible* acc = mGeckoAccessible.AsAccessible();
-  ProxyAccessible* proxy = mGeckoAccessible.AsProxy();
-  HyperTextAccessible* textAcc = acc ? acc->AsHyperText() : nullptr;
-  if (!textAcc && !proxy) {
-    return nil;
-  }
-
-  return [NSValue
-      valueWithRange:NSMakeRange(0, textAcc ? textAcc->CharacterCount()
-                                            : proxy->CharacterCount())];
+  return [NSValue valueWithRange:NSMakeRange(0, [self textLength])];
 }
 
 - (BOOL)moxBlockSelector:(SEL)selector {
@@ -278,23 +245,10 @@
 }
 
 - (void)moxSetSelectedTextRange:(NSValue*)selectedTextRange {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
-  NSRange range;
-  if (!ToNSRange(selectedTextRange, &range)) {
-    return;
-  }
+  GeckoTextMarkerRange markerRange =
+      [self textMarkerRangeFromRange:selectedTextRange];
 
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      textAcc->SetSelectionBoundsAt(0, range.location,
-                                    range.location + range.length);
-    }
-  } else {
-    mGeckoAccessible.AsProxy()->SetSelectionBoundsAt(
-        0, range.location, range.location + range.length);
-  }
+  markerRange.Select();
 }
 
 - (void)moxSetVisibleCharacterRange:(NSValue*)visibleCharacterRange {
@@ -319,21 +273,13 @@
 }
 
 - (NSString*)moxStringForRange:(NSValue*)range {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
+  GeckoTextMarkerRange markerRange = [self textMarkerRangeFromRange:range];
 
-  NSRange r = [range rangeValue];
-  nsAutoString text;
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      textAcc->TextSubstring(r.location, r.location + r.length, text);
-    }
-  } else {
-    mGeckoAccessible.AsProxy()->TextSubstring(r.location, r.location + r.length,
-                                              text);
+  if (!markerRange.IsValid()) {
+    return nil;
   }
 
-  return nsCocoaUtils::ToNSString(text);
+  return markerRange.Text();
 }
 
 - (NSAttributedString*)moxAttributedStringForRange:(NSValue*)range {
@@ -352,23 +298,13 @@
 }
 
 - (NSValue*)moxBoundsForRange:(NSValue*)range {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
+  GeckoTextMarkerRange markerRange = [self textMarkerRangeFromRange:range];
 
-  NSRange r = [range rangeValue];
-  int32_t start = r.location;
-  int32_t end = start + r.length;
-  DesktopIntRect bounds;
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      bounds = DesktopIntRect::FromUnknownRect(textAcc->TextBounds(start, end));
-    }
-  } else {
-    bounds = DesktopIntRect::FromUnknownRect(
-        mGeckoAccessible.AsProxy()->TextBounds(start, end));
+  if (!markerRange.IsValid()) {
+    return nil;
   }
 
-  return [NSValue valueWithRect:nsCocoaUtils::GeckoRectToCocoaRect(bounds)];
+  return markerRange.Bounds();
 }
 
 #pragma mark - mozAccessible
@@ -427,16 +363,7 @@
 #pragma mark -
 
 - (long)textLength {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
-  Accessible* acc = mGeckoAccessible.AsAccessible();
-  ProxyAccessible* proxy = mGeckoAccessible.AsProxy();
-  HyperTextAccessible* textAcc = acc ? acc->AsHyperText() : nullptr;
-  if (!textAcc && !proxy) {
-    return 0;
-  }
-
-  return textAcc ? textAcc->CharacterCount() : proxy->CharacterCount();
+  return [[self text] length];
 }
 
 - (BOOL)isReadOnly {
@@ -444,26 +371,42 @@
 }
 
 - (NSString*)text {
-  MOZ_ASSERT(!mGeckoAccessible.IsNull());
-
   // A password text field returns an empty value
   if (mRole == roles::PASSWORD_TEXT) {
     return @"";
   }
 
-  nsAutoString text;
-  if (mGeckoAccessible.IsAccessible()) {
-    if (HyperTextAccessible* textAcc =
-            mGeckoAccessible.AsAccessible()->AsHyperText()) {
-      textAcc->TextSubstring(0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT,
-                             text);
-    }
-  } else {
-    mGeckoAccessible.AsProxy()->TextSubstring(
-        0, nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT, text);
+  id<MOXTextMarkerSupport> delegate = [self moxTextMarkerDelegate];
+  return [delegate
+      moxStringForTextMarkerRange:[delegate
+                                      moxTextMarkerRangeForUIElement:self]];
+}
+
+- (GeckoTextMarkerRange)selection {
+  MOZ_ASSERT(!mGeckoAccessible.IsNull());
+
+  id<MOXTextMarkerSupport> delegate = [self moxTextMarkerDelegate];
+  GeckoTextMarkerRange selection =
+      [static_cast<MOXTextMarkerDelegate*>(delegate) selection];
+
+  if (!selection.Crop(mGeckoAccessible)) {
+    // The selection is not in this accessible. Return invalid range.
+    return GeckoTextMarkerRange();
   }
 
-  return nsCocoaUtils::ToNSString(text);
+  return selection;
+}
+
+- (GeckoTextMarkerRange)textMarkerRangeFromRange:(NSValue*)range {
+  NSRange r = [range rangeValue];
+
+  GeckoTextMarker startMarker =
+      GeckoTextMarker::MarkerFromIndex(mGeckoAccessible, r.location);
+
+  GeckoTextMarker endMarker =
+      GeckoTextMarker::MarkerFromIndex(mGeckoAccessible, r.location + r.length);
+
+  return GeckoTextMarkerRange(startMarker, endMarker);
 }
 
 @end
diff -Nru firefox-84.0.2+build1/accessible/mac/Platform.mm firefox-85.0+build1/accessible/mac/Platform.mm
--- firefox-84.0.2+build1/accessible/mac/Platform.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/Platform.mm	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,12 @@
 #include "MOXWebAreaAccessible.h"
 
 #include "nsAppShell.h"
+#include "mozilla/Telemetry.h"
+
+// Available from 10.13 onwards; test availability at runtime before using
+@interface NSWorkspace (AvailableSinceHighSierra)
+@property(readonly) BOOL isVoiceOverEnabled;
+@end
 
 namespace mozilla {
 namespace a11y {
@@ -77,14 +83,16 @@
 }
 
 void ProxyEvent(ProxyAccessible* aProxy, uint32_t aEventType) {
-  // ignore everything but focus-changed, value-changed, caret,
-  // selection, and document load complete events for now.
+  // Ignore event that we don't escape below, they aren't yet supported.
   if (aEventType != nsIAccessibleEvent::EVENT_FOCUS &&
       aEventType != nsIAccessibleEvent::EVENT_VALUE_CHANGE &&
       aEventType != nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE &&
       aEventType != nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED &&
       aEventType != nsIAccessibleEvent::EVENT_DOCUMENT_LOAD_COMPLETE &&
-      aEventType != nsIAccessibleEvent::EVENT_REORDER)
+      aEventType != nsIAccessibleEvent::EVENT_REORDER &&
+      aEventType != nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED &&
+      aEventType != nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED &&
+      aEventType != nsIAccessibleEvent::EVENT_NAME_CHANGE)
     return;
 
   mozAccessible* wrapper = GetNativeFromGeckoAccessible(aProxy);
@@ -180,8 +188,18 @@
 @implementation GeckoNSApplication (a11y)
 
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
-  if ([attribute isEqualToString:@"AXEnhancedUserInterface"])
+  NSLog(@"Checking a11y");
+  if ([attribute isEqualToString:@"AXEnhancedUserInterface"]) {
     mozilla::a11y::sA11yShouldBeEnabled = ([value intValue] == 1);
+#if defined(MOZ_TELEMETRY_REPORTING)
+    if ([[NSWorkspace sharedWorkspace]
+            respondsToSelector:@selector(isVoiceOverEnabled)] &&
+        [[NSWorkspace sharedWorkspace] isVoiceOverEnabled]) {
+      Telemetry::ScalarSet(Telemetry::ScalarID::A11Y_INSTANTIATORS,
+                           u"VoiceOver"_ns);
+    }
+#endif  // defined(MOZ_TELEMETRY_REPORTING)
+  }
 
   return [super accessibilitySetValue:value forAttribute:attribute];
 }
diff -Nru firefox-84.0.2+build1/accessible/mac/RotorRules.h firefox-85.0+build1/accessible/mac/RotorRules.h
--- firefox-84.0.2+build1/accessible/mac/RotorRules.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/RotorRules.h	2021-01-18 19:58:08.000000000 +0000
@@ -57,6 +57,14 @@
   virtual uint16_t Match(const AccessibleOrProxy& aAccOrProxy) override;
 };
 
+class RotorTextEntryRule final : public RotorRule {
+ public:
+  explicit RotorTextEntryRule(AccessibleOrProxy& aDirectDescendantsFrom);
+  explicit RotorTextEntryRule();
+
+  virtual uint16_t Match(const AccessibleOrProxy& aAccOrProxy) override;
+};
+
 class RotorLinkRule : public RotorRule {
  public:
   explicit RotorLinkRule();
@@ -113,6 +121,15 @@
   int32_t mLevel;
 };
 
+class RotorLiveRegionRule : public RotorRule {
+ public:
+  explicit RotorLiveRegionRule(AccessibleOrProxy& aDirectDescendantsFrom)
+      : RotorRule(aDirectDescendantsFrom) {}
+  explicit RotorLiveRegionRule() : RotorRule() {}
+
+  uint16_t Match(const AccessibleOrProxy& aAccOrProxy) override;
+};
+
 /**
  * This rule matches all accessibles with roles::OUTLINEITEM. If
  * outlines are nested, it ignores the nested subtree and returns
diff -Nru firefox-84.0.2+build1/accessible/mac/RotorRules.mm firefox-85.0+build1/accessible/mac/RotorRules.mm
--- firefox-84.0.2+build1/accessible/mac/RotorRules.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/mac/RotorRules.mm	2021-01-18 19:58:07.000000000 +0000
@@ -164,6 +164,31 @@
   return result;
 }
 
+// Rotor TextEntry Rule
+
+RotorTextEntryRule::RotorTextEntryRule(
+    AccessibleOrProxy& aDirectDescendantsFrom)
+    : RotorRule(aDirectDescendantsFrom){};
+
+RotorTextEntryRule::RotorTextEntryRule() : RotorRule(){};
+
+uint16_t RotorTextEntryRule::Match(const AccessibleOrProxy& aAccOrProxy) {
+  uint16_t result = RotorRule::Match(aAccOrProxy);
+
+  // if a match was found in the base-class's Match function,
+  // it is valid to consider that match again here. if it is
+  // not of the desired role, we flip the match bit to "unmatch"
+  // otherwise, the match persists.
+  if ((result & nsIAccessibleTraversalRule::FILTER_MATCH)) {
+    if (aAccOrProxy.Role() != roles::PASSWORD_TEXT &&
+        aAccOrProxy.Role() != roles::ENTRY) {
+      result &= ~nsIAccessibleTraversalRule::FILTER_MATCH;
+    }
+  }
+
+  return result;
+}
+
 // Rotor Link Rule
 
 RotorLinkRule::RotorLinkRule(AccessibleOrProxy& aDirectDescendantsFrom)
@@ -308,6 +333,18 @@
   return result;
 }
 
+uint16_t RotorLiveRegionRule::Match(const AccessibleOrProxy& aAccOrProxy) {
+  uint16_t result = RotorRule::Match(aAccOrProxy);
+
+  if ((result & nsIAccessibleTraversalRule::FILTER_MATCH)) {
+    mozAccessible* nativeMatch = GetNativeFromGeckoAccessible(aAccOrProxy);
+    if (![nativeMatch moxIsLiveRegion]) {
+      result &= ~nsIAccessibleTraversalRule::FILTER_MATCH;
+    }
+  }
+  return result;
+}
+
 // Outline Rule
 
 OutlineRule::OutlineRule() : RotorRule(){};
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_app.js firefox-85.0+build1/accessible/tests/browser/mac/browser_app.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_app.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_app.js	2021-01-18 19:58:08.000000000 +0000
@@ -159,3 +159,23 @@
     }
   );
 });
+
+/**
+ * Tests for location bar
+ */
+add_task(async () => {
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: "http://example.com",
+    },
+    async browser => {
+      let input = await getMacAccessible("urlbar-input");
+      is(
+        input.getAttributeValue("AXValue"),
+        "example.com",
+        "Location bar has correct value"
+      );
+    }
+  );
+});
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser.ini firefox-85.0+build1/accessible/tests/browser/mac/browser.ini
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -4,6 +4,9 @@
   head.js
   doc_aria_tabs.html
   doc_textmarker_test.html
+  doc_rich_listbox.xhtml
+  doc_menulist.xhtml
+  doc_tree.xhtml
   !/accessible/tests/browser/shared-head.js
   !/accessible/tests/browser/*.jsm
   !/accessible/tests/mochitest/*.js
@@ -38,4 +41,8 @@
 [browser_text_selection.js]
 [browser_navigate.js]
 [browser_outline.js]
+[browser_outline_xul.js]
 [browser_hierarchy.js]
+[browser_menulist.js]
+[browser_rich_listbox.js]
+[browser_live_regions.js]
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_input.js firefox-85.0+build1/accessible/tests/browser/mac/browser_input.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_input.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_input.js	2021-01-18 19:58:08.000000000 +0000
@@ -4,88 +4,208 @@
 
 "use strict";
 
+async function testInput(browser, accDoc) {
+  let input = getNativeInterface(accDoc, "input");
+
+  is(input.getAttributeValue("AXDescription"), "Name", "Correct input label");
+  is(input.getAttributeValue("AXTitle"), "", "Correct input title");
+  is(input.getAttributeValue("AXValue"), "Elmer Fudd", "Correct input value");
+  is(
+    input.getAttributeValue("AXNumberOfCharacters"),
+    10,
+    "Correct length of value"
+  );
+
+  ok(input.attributeNames.includes("AXSelectedText"), "Has AXSelectedText");
+  ok(
+    input.attributeNames.includes("AXSelectedTextRange"),
+    "Has AXSelectedTextRange"
+  );
+
+  let evt = Promise.all([
+    waitForMacEvent("AXFocusedUIElementChanged", "input"),
+    waitForMacEvent("AXSelectedTextChanged", "body"),
+    waitForMacEvent("AXSelectedTextChanged", "input"),
+  ]);
+  await SpecialPowers.spawn(browser, [], () => {
+    content.document.getElementById("input").focus();
+  });
+  await evt;
+
+  evt = Promise.all([
+    waitForMacEvent("AXSelectedTextChanged", "body"),
+    waitForMacEvent("AXSelectedTextChanged", "input"),
+  ]);
+  await SpecialPowers.spawn(browser, [], () => {
+    let elm = content.document.getElementById("input");
+    if (elm.setSelectionRange) {
+      elm.setSelectionRange(6, 9);
+    } else {
+      let r = new content.Range();
+      let textNode = elm.firstElementChild.firstChild;
+      r.setStart(textNode, 6);
+      r.setEnd(textNode, 9);
+
+      let s = content.getSelection();
+      s.removeAllRanges();
+      s.addRange(r);
+    }
+  });
+  await evt;
+
+  is(
+    input.getAttributeValue("AXSelectedText"),
+    "Fud",
+    "Correct text is selected"
+  );
+
+  Assert.deepEqual(
+    input.getAttributeValue("AXSelectedTextRange"),
+    [6, 3],
+    "correct range selected"
+  );
+
+  ok(
+    input.isAttributeSettable("AXSelectedTextRange"),
+    "AXSelectedTextRange is settable"
+  );
+
+  evt = Promise.all([
+    waitForMacEvent("AXSelectedTextChanged"),
+    waitForMacEvent("AXSelectedTextChanged"),
+  ]);
+  input.setAttributeValue("AXSelectedTextRange", NSRange(1, 7));
+  await evt;
+
+  Assert.deepEqual(
+    input.getAttributeValue("AXSelectedTextRange"),
+    [1, 7],
+    "correct range selected"
+  );
+
+  is(
+    input.getAttributeValue("AXSelectedText"),
+    "lmer Fu",
+    "Correct text is selected"
+  );
+
+  let domSelection = await SpecialPowers.spawn(browser, [], () => {
+    let elm = content.document.querySelector("input#input");
+    if (elm) {
+      return elm.value.substring(elm.selectionStart, elm.selectionEnd);
+    }
+
+    return content.getSelection().toString();
+  });
+
+  is(domSelection, "lmer Fu", "correct DOM selection");
+
+  is(
+    input.getParameterizedAttributeValue("AXStringForRange", NSRange(3, 5)),
+    "er Fu",
+    "AXStringForRange works"
+  );
+}
+
 /**
  * Input selection test
  */
 addAccessibleTask(
   `<input aria-label="Name" id="input" value="Elmer Fudd">`,
-  async (browser, accDoc) => {
-    let input = getNativeInterface(accDoc, "input");
-
-    is(input.getAttributeValue("AXDescription"), "Name", "Correct input label");
-    is(input.getAttributeValue("AXTitle"), "", "Correct input title");
-    is(
-      input.getAttributeValue("AXNumberOfCharacters"),
-      10,
-      "Correct length of value"
-    );
+  testInput
+);
 
-    ok(input.attributeNames.includes("AXSelectedText"), "Has AXSelecetdText");
-    ok(
-      input.attributeNames.includes("AXSelectedTextRange"),
-      "Has AXSelecetdTextRange"
-    );
+/**
+ * contenteditable selection test
+ */
+addAccessibleTask(
+  `<div aria-label="Name" tabindex="0" role="textbox" aria-multiline="true" id="input" contenteditable>
+     <p>Elmer Fudd</p>
+   </div>`,
+  testInput
+);
 
-    // XXX: Need to look into why we send so many AXSelectedTextChanged notifications.
+/**
+ * test contenteditable with selection that extends past editable part
+ */
+addAccessibleTask(
+  `<span aria-label="Name"
+         tabindex="0"
+         role="textbox"
+         id="input"
+         contenteditable>Elmer Fudd</span> <span id="notinput">is the name</span>`,
+  async (browser, accDoc) => {
     let evt = Promise.all([
-      waitForMacEvent("AXFocusedUIElementChanged"),
-      waitForMacEvent("AXSelectedTextChanged"),
-      waitForMacEvent("AXSelectedTextChanged"),
-      waitForMacEvent("AXSelectedTextChanged"),
+      waitForMacEvent("AXFocusedUIElementChanged", "input"),
+      waitForMacEvent("AXSelectedTextChanged", "body"),
+      waitForMacEvent("AXSelectedTextChanged", "input"),
     ]);
     await SpecialPowers.spawn(browser, [], () => {
-      let elm = content.document.getElementById("input");
-      elm.focus();
-      elm.setSelectionRange(6, 9);
+      content.document.getElementById("input").focus();
     });
     await evt;
 
-    is(
-      input.getAttributeValue("AXSelectedText"),
-      "Fud",
-      "Correct text is selected"
-    );
-
-    Assert.deepEqual(
-      input.getAttributeValue("AXSelectedTextRange"),
-      [6, 3],
-      "correct range selected"
-    );
-
-    ok(
-      input.isAttributeSettable("AXSelectedTextRange"),
-      "AXSelectedTextRange is settable"
-    );
+    evt = waitForEvent(EVENT_TEXT_CARET_MOVED);
+    await SpecialPowers.spawn(browser, [], () => {
+      let input = content.document.getElementById("input");
+      let notinput = content.document.getElementById("notinput");
 
-    evt = Promise.all([
-      waitForMacEvent("AXSelectedTextChanged"),
-      waitForMacEvent("AXSelectedTextChanged"),
-    ]);
-    input.setAttributeValue("AXSelectedTextRange", NSRange(1, 7));
+      let r = new content.Range();
+      r.setStart(input.firstChild, 4);
+      r.setEnd(notinput.firstChild, 6);
+
+      let s = content.getSelection();
+      s.removeAllRanges();
+      s.addRange(r);
+    });
+    await evt;
 
-    Assert.deepEqual(
-      input.getAttributeValue("AXSelectedTextRange"),
-      [1, 7],
-      "correct range selected"
-    );
+    let input = getNativeInterface(accDoc, "input");
 
     is(
       input.getAttributeValue("AXSelectedText"),
-      "lmer Fu",
-      "Correct text is selected"
+      "r Fudd",
+      "Correct text is selected in #input"
     );
 
-    let domSelection = await SpecialPowers.spawn(browser, [], () => {
-      let elm = content.document.getElementById("input");
-      return [elm.selectionStart, elm.selectionEnd];
-    });
-
-    Assert.deepEqual(domSelection, [1, 8], "correct DOM selection");
-
     is(
-      input.getParameterizedAttributeValue("AXStringForRange", NSRange(3, 5)),
-      "er Fu",
-      "AXStringForRange works"
+      stringForRange(
+        input,
+        input.getAttributeValue("AXSelectedTextMarkerRange")
+      ),
+      "r Fudd is the",
+      "Correct text is selected in document"
+    );
+  }
+);
+
+/**
+ * test nested content editables and their ancestor getters.
+ */
+addAccessibleTask(
+  `<div id="outer" role="textbox" contenteditable="true">
+     <p id="p">Bob <a href="#" id="link">Loblaw's</a></p>
+     <div id="inner" role="textbox" contenteditable="true">
+       Law <a href="#" id="inner_link">Blog</a>
+     </div>
+   </div>`,
+  (browser, accDoc) => {
+    let link = getNativeInterface(accDoc, "link");
+    let innerLink = getNativeInterface(accDoc, "inner_link");
+
+    let idmatches = (elem, id) => {
+      is(elem.getAttributeValue("AXDOMIdentifier"), id, "Matches ID");
+    };
+
+    idmatches(link.getAttributeValue("AXEditableAncestor"), "outer");
+    idmatches(link.getAttributeValue("AXFocusableAncestor"), "outer");
+    idmatches(link.getAttributeValue("AXHighestEditableAncestor"), "outer");
+
+    idmatches(innerLink.getAttributeValue("AXEditableAncestor"), "inner");
+    idmatches(innerLink.getAttributeValue("AXFocusableAncestor"), "inner");
+    idmatches(
+      innerLink.getAttributeValue("AXHighestEditableAncestor"),
+      "outer"
     );
   }
 );
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_live_regions.js firefox-85.0+build1/accessible/tests/browser/mac/browser_live_regions.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_live_regions.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_live_regions.js	2021-01-18 19:58:07.000000000 +0000
@@ -0,0 +1,165 @@
+/* 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";
+
+/**
+ * Test live region creation and removal.
+ */
+addAccessibleTask(
+  `
+  <div id="polite" aria-relevant="removals">Polite region</div>
+  <div id="assertive" aria-live="assertive">Assertive region</div>
+  `,
+  async (browser, accDoc) => {
+    let politeRegion = getNativeInterface(accDoc, "polite");
+    ok(
+      !politeRegion.attributeNames.includes("AXARIALive"),
+      "region is not live"
+    );
+
+    let liveRegionAdded = waitForMacEvent("AXLiveRegionCreated", "polite");
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document
+        .getElementById("polite")
+        .setAttribute("aria-atomic", "true");
+      content.document
+        .getElementById("polite")
+        .setAttribute("aria-live", "polite");
+    });
+    await liveRegionAdded;
+    is(
+      politeRegion.getAttributeValue("AXARIALive"),
+      "polite",
+      "region is now live"
+    );
+    ok(politeRegion.getAttributeValue("AXARIAAtomic"), "region is atomic");
+    is(
+      politeRegion.getAttributeValue("AXARIARelevant"),
+      "removals",
+      "region has defined aria-relevant"
+    );
+
+    let assertiveRegion = getNativeInterface(accDoc, "assertive");
+    is(
+      assertiveRegion.getAttributeValue("AXARIALive"),
+      "assertive",
+      "region is assertive"
+    );
+    ok(
+      !assertiveRegion.getAttributeValue("AXARIAAtomic"),
+      "region is not atomic"
+    );
+    is(
+      assertiveRegion.getAttributeValue("AXARIARelevant"),
+      "additions text",
+      "region has default aria-relevant"
+    );
+
+    let liveRegionRemoved = waitForEvent(
+      EVENT_LIVE_REGION_REMOVED,
+      "assertive"
+    );
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document.getElementById("assertive").removeAttribute("aria-live");
+    });
+    await liveRegionRemoved;
+    ok(!assertiveRegion.getAttributeValue("AXARIALive"), "region is not live");
+
+    liveRegionAdded = waitForMacEvent("AXLiveRegionCreated", "new-region");
+    await SpecialPowers.spawn(browser, [], () => {
+      let newRegionElm = content.document.createElement("div");
+      newRegionElm.id = "new-region";
+      newRegionElm.setAttribute("aria-live", "assertive");
+      content.document.body.appendChild(newRegionElm);
+    });
+    await liveRegionAdded;
+
+    let newRegion = getNativeInterface(accDoc, "new-region");
+    is(
+      newRegion.getAttributeValue("AXARIALive"),
+      "assertive",
+      "region is assertive"
+    );
+
+    let loadComplete = Promise.all([
+      waitForMacEvent("AXLoadComplete"),
+      waitForMacEvent("AXLiveRegionCreated", "region-1"),
+      waitForMacEvent("AXLiveRegionCreated", "region-2"),
+      waitForMacEvent("AXLiveRegionCreated", "status"),
+      waitForMacEvent("AXLiveRegionCreated", "output"),
+    ]);
+
+    await SpecialPowers.spawn(browser, [], () => {
+      content.location = `data:text/html;charset=utf-8,
+        <div id="region-1" aria-live="polite"></div>
+        <div id="region-2" aria-live="assertive"></div>
+        <div id="region-3" aria-live="off"></div>
+        <div id="alert" role="alert"></div>
+        <div id="status" role="status"></div>
+        <output id="output"></output>`;
+    });
+    let webArea = (await loadComplete)[0];
+
+    is(webArea.getAttributeValue("AXRole"), "AXWebArea", "web area yeah");
+    const searchPred = {
+      AXSearchKey: "AXLiveRegionSearchKey",
+      AXResultsLimit: -1,
+      AXDirection: "AXDirectionNext",
+    };
+    const liveRegions = webArea.getParameterizedAttributeValue(
+      "AXUIElementsForSearchPredicate",
+      NSDictionary(searchPred)
+    );
+    Assert.deepEqual(
+      liveRegions.map(r => r.getAttributeValue("AXDOMIdentifier")),
+      ["region-1", "region-2", "alert", "status", "output"],
+      "SearchPredicate returned all live regions"
+    );
+  }
+);
+
+/**
+ * Test live region changes
+ */
+addAccessibleTask(
+  `
+  <div id="live" aria-live="polite">
+  The time is <span id="time">4:55pm</span>
+  <p id="p" style="display: none">Georgia on my mind</p>
+  <button id="button" aria-label="Start"></button>
+  </div>
+  `,
+  async (browser, accDoc) => {
+    let liveRegionChanged = waitForMacEvent("AXLiveRegionChanged", "live");
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document.getElementById("time").textContent = "4:56pm";
+    });
+    await liveRegionChanged;
+    ok(true, "changed textContent");
+
+    liveRegionChanged = waitForMacEvent("AXLiveRegionChanged", "live");
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document.getElementById("p").style.display = "block";
+    });
+    await liveRegionChanged;
+    ok(true, "changed display style to block");
+
+    liveRegionChanged = waitForMacEvent("AXLiveRegionChanged", "live");
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document.getElementById("p").style.display = "none";
+    });
+    await liveRegionChanged;
+    ok(true, "changed display style to none");
+
+    liveRegionChanged = waitForMacEvent("AXLiveRegionChanged", "live");
+    await SpecialPowers.spawn(browser, [], () => {
+      content.document
+        .getElementById("button")
+        .setAttribute("aria-label", "Stop");
+    });
+    await liveRegionChanged;
+    ok(true, "changed aria-label");
+  }
+);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_menulist.js firefox-85.0+build1/accessible/tests/browser/mac/browser_menulist.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_menulist.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_menulist.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,52 @@
+/* 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";
+
+/* import-globals-from ../../mochitest/attributes.js */
+/* import-globals-from ../../mochitest/role.js */
+/* import-globals-from ../../mochitest/states.js */
+loadScripts(
+  { name: "role.js", dir: MOCHITESTS_DIR },
+  { name: "states.js", dir: MOCHITESTS_DIR },
+  { name: "attributes.js", dir: MOCHITESTS_DIR }
+);
+
+addAccessibleTask(
+  "mac/doc_menulist.xhtml",
+  async (browser, accDoc) => {
+    const menulist = getNativeInterface(accDoc, "defaultZoom");
+
+    let actions = menulist.actionNames;
+    ok(actions.includes("AXPress"), "menu has press action");
+
+    let event = waitForMacEvent("AXMenuOpened");
+    menulist.performAction("AXPress");
+    const menupopup = await event;
+
+    const menuItems = menupopup.getAttributeValue("AXChildren");
+    is(menuItems.length, 4, "Found four children in menulist");
+    is(
+      menuItems[0].getAttributeValue("AXTitle"),
+      "50%",
+      "First item has correct title"
+    );
+    is(
+      menuItems[1].getAttributeValue("AXTitle"),
+      "100%",
+      "Second item has correct title"
+    );
+    is(
+      menuItems[2].getAttributeValue("AXTitle"),
+      "150%",
+      "Third item has correct title"
+    );
+    is(
+      menuItems[3].getAttributeValue("AXTitle"),
+      "200%",
+      "Fourth item has correct title"
+    );
+  },
+  { topLevel: false, chrome: true }
+);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_outline.js firefox-85.0+build1/accessible/tests/browser/mac/browser_outline.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_outline.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_outline.js	2021-01-18 19:58:08.000000000 +0000
@@ -80,8 +80,8 @@
     );
     is(
       outRows[0].getAttributeValue("AXDisclosureLevel"),
-      1,
-      "Row is level one"
+      0,
+      "Row is level zero"
     );
 
     is(outRows[1].getAttributeValue("AXDisclosing"), 1, "Row is disclosing");
@@ -97,8 +97,8 @@
     );
     is(
       outRows[1].getAttributeValue("AXDisclosureLevel"),
-      1,
-      "Row is level one"
+      0,
+      "Row is level zero"
     );
 
     is(
@@ -118,8 +118,8 @@
     );
     is(
       outRows[2].getAttributeValue("AXDisclosureLevel"),
-      1,
-      "Row is level one"
+      0,
+      "Row is level zero"
     );
 
     is(outRows[3].getAttributeValue("AXDisclosing"), 1, "Row is disclosing");
@@ -137,8 +137,8 @@
     );
     is(
       outRows[3].getAttributeValue("AXDisclosureLevel"),
-      2,
-      "Row is level two"
+      1,
+      "Row is level one"
     );
   }
 );
@@ -260,8 +260,8 @@
     );
     is(
       outRows[0].getAttributeValue("AXDisclosureLevel"),
-      1,
-      "Row is level one"
+      0,
+      "Row is level zero"
     );
 
     is(outRows[2].getAttributeValue("AXDisclosing"), 1, "Row is disclosing");
@@ -277,8 +277,8 @@
     );
     is(
       outRows[2].getAttributeValue("AXDisclosureLevel"),
-      2,
-      "Row is level two"
+      1,
+      "Row is level one"
     );
 
     is(
@@ -301,8 +301,8 @@
     );
     is(
       outRows[3].getAttributeValue("AXDisclosureLevel"),
-      3,
-      "Row is level three"
+      2,
+      "Row is level two"
     );
 
     is(
@@ -322,8 +322,8 @@
     );
     is(
       outRows[5].getAttributeValue("AXDisclosureLevel"),
-      1,
-      "Row is level one"
+      0,
+      "Row is level zero"
     );
 
     is(outRows[6].getAttributeValue("AXDisclosing"), 1, "Row is disclosing");
@@ -341,8 +341,8 @@
     );
     is(
       outRows[6].getAttributeValue("AXDisclosureLevel"),
-      2,
-      "Row is level two"
+      1,
+      "Row is level one"
     );
 
     is(
@@ -364,8 +364,8 @@
     );
     is(
       outRows[7].getAttributeValue("AXDisclosureLevel"),
-      3,
-      "Row is level three"
+      2,
+      "Row is level two"
     );
   }
 );
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_outline_xul.js firefox-85.0+build1/accessible/tests/browser/mac/browser_outline_xul.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_outline_xul.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_outline_xul.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,274 @@
+/* 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";
+
+/* import-globals-from ../../mochitest/attributes.js */
+loadScripts({ name: "attributes.js", dir: MOCHITESTS_DIR });
+
+addAccessibleTask(
+  "mac/doc_tree.xhtml",
+  async (browser, accDoc) => {
+    const tree = getNativeInterface(accDoc, "tree");
+    is(
+      tree.getAttributeValue("AXRole"),
+      "AXOutline",
+      "Found tree with role outline"
+    );
+    // XUL trees store all rows as direct children of the outline,
+    // so we should see nine here instead of just three:
+    // (Groceries, Fruits, Veggies)
+    const treeChildren = tree.getAttributeValue("AXChildren");
+    is(treeChildren.length, 9, "Found nine direct children");
+
+    const treeCols = tree.getAttributeValue("AXColumns");
+    is(treeCols.length, 1, "Found one column in tree");
+
+    // Here, we should get only outline rows, not the title
+    const treeRows = tree.getAttributeValue("AXRows");
+    is(treeRows.length, 8, "Found 8 total rows");
+
+    is(
+      treeRows[0].getAttributeValue("AXDescription"),
+      "Fruits",
+      "Located correct first row, row has correct desc"
+    );
+    is(
+      treeRows[0].getAttributeValue("AXDisclosing"),
+      1,
+      "Fruits is disclosing"
+    );
+    is(
+      treeRows[0].getAttributeValue("AXDisclosedByRow"),
+      null,
+      "Fruits is disclosed by outline"
+    );
+    is(
+      treeRows[0].getAttributeValue("AXDisclosureLevel"),
+      0,
+      "Fruits is level zero"
+    );
+    let disclosedRows = treeRows[0].getAttributeValue("AXDisclosedRows");
+    is(disclosedRows.length, 2, "Fruits discloses two rows");
+    is(
+      disclosedRows[0].getAttributeValue("AXDescription"),
+      "Apple",
+      "fruits discloses apple"
+    );
+    is(
+      disclosedRows[1].getAttributeValue("AXDescription"),
+      "Orange",
+      "fruits discloses orange"
+    );
+
+    is(
+      treeRows[1].getAttributeValue("AXDescription"),
+      "Apple",
+      "Located correct second row, row has correct desc"
+    );
+    is(
+      treeRows[1].getAttributeValue("AXDisclosing"),
+      0,
+      "Apple is not disclosing"
+    );
+    is(
+      treeRows[1]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Fruits",
+      "Apple is disclosed by fruits"
+    );
+    is(
+      treeRows[1].getAttributeValue("AXDisclosureLevel"),
+      1,
+      "Apple is level one"
+    );
+    is(
+      treeRows[1].getAttributeValue("AXDisclosedRows").length,
+      0,
+      "Apple does not disclose rows"
+    );
+
+    is(
+      treeRows[2].getAttributeValue("AXDescription"),
+      "Orange",
+      "Located correct third row, row has correct desc"
+    );
+    is(
+      treeRows[2].getAttributeValue("AXDisclosing"),
+      0,
+      "Orange is not disclosing"
+    );
+    is(
+      treeRows[2]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Fruits",
+      "Orange is disclosed by fruits"
+    );
+    is(
+      treeRows[2].getAttributeValue("AXDisclosureLevel"),
+      1,
+      "Orange is level one"
+    );
+    is(
+      treeRows[2].getAttributeValue("AXDisclosedRows").length,
+      0,
+      "Orange does not disclose rows"
+    );
+
+    is(
+      treeRows[3].getAttributeValue("AXDescription"),
+      "Veggies",
+      "Located correct fourth row, row has correct desc"
+    );
+    is(
+      treeRows[3].getAttributeValue("AXDisclosing"),
+      1,
+      "Veggies is disclosing"
+    );
+    is(
+      treeRows[3].getAttributeValue("AXDisclosedByRow"),
+      null,
+      "Veggies is disclosed by outline"
+    );
+    is(
+      treeRows[3].getAttributeValue("AXDisclosureLevel"),
+      0,
+      "Veggies is level zero"
+    );
+    disclosedRows = treeRows[3].getAttributeValue("AXDisclosedRows");
+    is(disclosedRows.length, 2, "Veggies discloses two rows");
+    is(
+      disclosedRows[0].getAttributeValue("AXDescription"),
+      "Green Veggies",
+      "Veggies discloses green veggies"
+    );
+    is(
+      disclosedRows[1].getAttributeValue("AXDescription"),
+      "Squash",
+      "Veggies discloses squash"
+    );
+
+    is(
+      treeRows[4].getAttributeValue("AXDescription"),
+      "Green Veggies",
+      "Located correct fifth row, row has correct desc"
+    );
+    is(
+      treeRows[4].getAttributeValue("AXDisclosing"),
+      1,
+      "Green veggies is disclosing"
+    );
+    is(
+      treeRows[4]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Veggies",
+      "Green Veggies is disclosed by veggies"
+    );
+    is(
+      treeRows[4].getAttributeValue("AXDisclosureLevel"),
+      1,
+      "Green veggies is level one"
+    );
+    disclosedRows = treeRows[4].getAttributeValue("AXDisclosedRows");
+    is(disclosedRows.length, 2, "Green veggies has two rows");
+    is(
+      disclosedRows[0].getAttributeValue("AXDescription"),
+      "Spinach",
+      "Green veggies discloses spinach"
+    );
+    is(
+      disclosedRows[1].getAttributeValue("AXDescription"),
+      "Peas",
+      "Green veggies discloses peas"
+    );
+
+    is(
+      treeRows[5].getAttributeValue("AXDescription"),
+      "Spinach",
+      "Located correct sixth row, row has correct desc"
+    );
+    is(
+      treeRows[5].getAttributeValue("AXDisclosing"),
+      0,
+      "Spinach is not disclosing"
+    );
+    is(
+      treeRows[5]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Green Veggies",
+      "Spinach is disclosed by green veggies"
+    );
+    is(
+      treeRows[5].getAttributeValue("AXDisclosureLevel"),
+      2,
+      "Spinach is level two"
+    );
+    is(
+      treeRows[5].getAttributeValue("AXDisclosedRows").length,
+      0,
+      "Spinach does not disclose rows"
+    );
+
+    is(
+      treeRows[6].getAttributeValue("AXDescription"),
+      "Peas",
+      "Located correct seventh row, row has correct desc"
+    );
+    is(
+      treeRows[6].getAttributeValue("AXDisclosing"),
+      0,
+      "Peas is not disclosing"
+    );
+    is(
+      treeRows[6]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Green Veggies",
+      "Peas is disclosed by green veggies"
+    );
+    is(
+      treeRows[6].getAttributeValue("AXDisclosureLevel"),
+      2,
+      "Peas is level two"
+    );
+    is(
+      treeRows[6].getAttributeValue("AXDisclosedRows").length,
+      0,
+      "Peas does not disclose rows"
+    );
+
+    is(
+      treeRows[7].getAttributeValue("AXDescription"),
+      "Squash",
+      "Located correct eighth row, row has correct desc"
+    );
+    is(
+      treeRows[7].getAttributeValue("AXDisclosing"),
+      0,
+      "Squash is not disclosing"
+    );
+    is(
+      treeRows[7]
+        .getAttributeValue("AXDisclosedByRow")
+        .getAttributeValue("AXDescription"),
+      "Veggies",
+      "Squash is disclosed by veggies"
+    );
+    is(
+      treeRows[7].getAttributeValue("AXDisclosureLevel"),
+      1,
+      "Squash is level one"
+    );
+    is(
+      treeRows[7].getAttributeValue("AXDisclosedRows").length,
+      0,
+      "Squash does not disclose rows"
+    );
+  },
+  { topLevel: false, chrome: true }
+);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_popupbutton.js firefox-85.0+build1/accessible/tests/browser/mac/browser_popupbutton.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_popupbutton.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_popupbutton.js	2021-01-18 19:58:08.000000000 +0000
@@ -69,12 +69,8 @@
     let menuParent = menu.getAttributeValue("AXParent");
     is(
       menuParent.getAttributeValue("AXRole"),
-      "AXGroup",
-      "dropdown parent is a group"
-    );
-    ok(
-      menuParent.attributeNames.includes("AXMain"),
-      "group is main/root element"
+      "AXPopUpButton",
+      "dropdown parent is a popup button"
     );
 
     let menuItems = menu.getAttributeValue("AXChildren").map(c => {
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_rich_listbox.js firefox-85.0+build1/accessible/tests/browser/mac/browser_rich_listbox.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_rich_listbox.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_rich_listbox.js	2021-01-18 19:58:07.000000000 +0000
@@ -0,0 +1,73 @@
+/* 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";
+
+/* import-globals-from ../../mochitest/attributes.js */
+loadScripts({ name: "attributes.js", dir: MOCHITESTS_DIR });
+
+addAccessibleTask(
+  "mac/doc_rich_listbox.xhtml",
+  async (browser, accDoc) => {
+    const categories = getNativeInterface(accDoc, "categories");
+    const categoriesChildren = categories.getAttributeValue("AXChildren");
+    is(categoriesChildren.length, 4, "Found listbox and 4 items");
+
+    const general = getNativeInterface(accDoc, "general");
+    is(
+      general.getAttributeValue("AXTitle"),
+      "general",
+      "general has appropriate title"
+    );
+    is(
+      categoriesChildren[0].getAttributeValue("AXTitle"),
+      general.getAttributeValue("AXTitle"),
+      "Found general listitem"
+    );
+    is(
+      general.getAttributeValue("AXEnabled"),
+      1,
+      "general is enabled, not dimmed"
+    );
+
+    const home = getNativeInterface(accDoc, "home");
+    is(home.getAttributeValue("AXTitle"), "home", "home has appropriate title");
+    is(
+      categoriesChildren[1].getAttributeValue("AXTitle"),
+      home.getAttributeValue("AXTitle"),
+      "Found home listitem"
+    );
+    is(home.getAttributeValue("AXEnabled"), 1, "Home is enabled, not dimmed");
+
+    const search = getNativeInterface(accDoc, "search");
+    is(
+      search.getAttributeValue("AXTitle"),
+      "search",
+      "search has appropriate title"
+    );
+    is(
+      categoriesChildren[2].getAttributeValue("AXTitle"),
+      search.getAttributeValue("AXTitle"),
+      "Found search listitem"
+    );
+    is(
+      search.getAttributeValue("AXEnabled"),
+      1,
+      "search is enabled, not dimmed"
+    );
+
+    const privacy = getNativeInterface(accDoc, "privacy");
+    is(
+      privacy.getAttributeValue("AXTitle"),
+      "privacy",
+      "privacy has appropriate title"
+    );
+    is(
+      categoriesChildren[3].getAttributeValue("AXTitle"),
+      privacy.getAttributeValue("AXTitle"),
+      "Found privacy listitem"
+    );
+  },
+  { topLevel: false, chrome: true }
+);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_roles_elements.js firefox-85.0+build1/accessible/tests/browser/mac/browser_roles_elements.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_roles_elements.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_roles_elements.js	2021-01-18 19:58:07.000000000 +0000
@@ -73,12 +73,21 @@
   <div id="timer" role="timer"></div>
   <div id="tooltip" role="tooltip"></div>
 
+  <!-- text entries -->
+  <div id="textbox_multiline" role="textbox" aria-multiline="true"></div>
+  <div id="textbox_singleline" role="textbox" aria-multiline="false"></div>
+  <textarea id="textArea"></textarea>
+  <input id="textInput">
+
   <!-- True HTML5 search box -->
   <input type="search" id="htmlSearch" />
 
   <!-- A button morphed into a toggle via ARIA -->
   <button id="toggle" aria-pressed="false"></button>
 
+  <!-- A button with a 'banana' role description -->
+  <button id="banana" aria-roledescription="banana"></button>
+
   <!-- Other elements -->
   <del id="deletion">Deleted text</del>
   <dl id="dl"><dt id="dt">term</dt><dd id="dd">definition</dd></dl>
@@ -172,12 +181,21 @@
     testRoleAndSubRole(accDoc, "timer", null, "AXApplicationTimer");
     testRoleAndSubRole(accDoc, "tooltip", "AXGroup", "AXUserInterfaceTooltip");
 
+    // Text boxes
+    testRoleAndSubRole(accDoc, "textbox_multiline", "AXTextArea");
+    testRoleAndSubRole(accDoc, "textbox_singleline", "AXTextArea");
+    testRoleAndSubRole(accDoc, "textArea", "AXTextArea");
+    testRoleAndSubRole(accDoc, "textInput", "AXTextField");
+
     // True HTML5 search field
     testRoleAndSubRole(accDoc, "htmlSearch", "AXTextField", "AXSearchField");
 
     // A button morphed into a toggle by ARIA
     testRoleAndSubRole(accDoc, "toggle", "AXCheckBox", "AXToggle");
 
+    // A banana button
+    testRoleAndSubRole(accDoc, "banana", "AXButton", null, "banana");
+
     // Other elements
     testRoleAndSubRole(accDoc, "deletion", "AXGroup", "AXDeleteStyleGroup");
     testRoleAndSubRole(accDoc, "dl", "AXList", "AXDescriptionList");
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_rotor.js firefox-85.0+build1/accessible/tests/browser/mac/browser_rotor.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_rotor.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_rotor.js	2021-01-18 19:58:07.000000000 +0000
@@ -1040,11 +1040,10 @@
       "AXUIElementsForSearchPredicate",
       NSDictionary(searchPred)
     );
-    is(results.length, 1, "WebArea is before root group");
     is(
-      results[0].getAttributeValue("AXRole"),
-      "AXWebArea",
-      "Got web area accessible"
+      results.length,
+      0,
+      "Searching backwards from root group should yield no results"
     );
 
     const rootGroup = webArea.getAttributeValue("AXChildren")[0];
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_text_basics.js firefox-85.0+build1/accessible/tests/browser/mac/browser_text_basics.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_text_basics.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_text_basics.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,14 @@
   is(stringForRange(macDoc, range), expected, msg);
 }
 
-function testUIElement(macDoc, marker, msg, expectedRole, expectedValue) {
+function testUIElement(
+  macDoc,
+  marker,
+  msg,
+  expectedRole,
+  expectedValue,
+  expectedRange
+) {
   let elem = macDoc.getParameterizedAttributeValue(
     "AXUIElementForTextMarker",
     marker
@@ -26,7 +33,7 @@
   );
   is(
     stringForRange(macDoc, elemRange),
-    expectedValue,
+    expectedRange,
     `${msg}: element range matches element value`
   );
 }
@@ -238,3 +245,21 @@
     is(stringForRange(macDoc, range), "ello good");
   }
 );
+
+addAccessibleTask(
+  `<input id="input" value=""><a href="#">goodbye</a>`,
+  async (browser, accDoc) => {
+    let macDoc = accDoc.nativeInterface.QueryInterface(
+      Ci.nsIAccessibleMacInterface
+    );
+
+    let input = getNativeInterface(accDoc, "input");
+
+    let range = macDoc.getParameterizedAttributeValue(
+      "AXTextMarkerRangeForUIElement",
+      input
+    );
+
+    is(stringForRange(macDoc, range), "", "string value is correct");
+  }
+);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/browser_toggle_radio_check.js firefox-85.0+build1/accessible/tests/browser/mac/browser_toggle_radio_check.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/browser_toggle_radio_check.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/browser_toggle_radio_check.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,10 +23,14 @@
     let actions = checkbox.actionNames;
     ok(actions.includes("AXPress"), "Has press action");
 
+    let evt = waitForMacEvent("AXValueChanged", "vehicle");
     checkbox.performAction("AXPress");
+    await evt;
     is(checkbox.getAttributeValue("AXValue"), 1, "Correct checked value");
 
+    evt = waitForMacEvent("AXValueChanged", "vehicle");
     checkbox.performAction("AXPress");
+    await evt;
     is(checkbox.getAttributeValue("AXValue"), 0, "Correct checked value");
   }
 );
@@ -52,10 +56,14 @@
     let actions = toggle.actionNames;
     ok(actions.includes("AXPress"), "Has press action");
 
+    let evt = waitForMacEvent("AXValueChanged", "toggle");
     toggle.performAction("AXPress");
+    await evt;
     is(toggle.getAttributeValue("AXValue"), 1, "Correct checked value");
 
+    evt = waitForMacEvent("AXValueChanged", "toggle");
     toggle.performAction("AXPress");
+    await evt;
     is(toggle.getAttributeValue("AXValue"), 0, "Correct checked value");
   }
 );
@@ -82,10 +90,14 @@
     let actions = checkbox.actionNames;
     ok(actions.includes("AXPress"), "Has press action");
 
+    let evt = waitForMacEvent("AXValueChanged", "checkbox");
     checkbox.performAction("AXPress");
+    await evt;
     is(checkbox.getAttributeValue("AXValue"), 1, "Correct checked value");
 
+    evt = waitForMacEvent("AXValueChanged", "checkbox");
     checkbox.performAction("AXPress");
+    await evt;
     is(checkbox.getAttributeValue("AXValue"), 2, "Correct checked value");
   }
 );
@@ -112,9 +124,12 @@
     let actions = dewey.actionNames;
     ok(actions.includes("AXPress"), "Has press action");
 
-    let stateChanged = waitForEvent(EVENT_STATE_CHANGE, "huey");
+    let evt = Promise.all([
+      waitForMacEvent("AXValueChanged", "huey"),
+      waitForMacEvent("AXValueChanged", "dewey"),
+    ]);
     dewey.performAction("AXPress");
-    await stateChanged;
+    await evt;
     is(
       dewey.getAttributeValue("AXValue"),
       1,
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/doc_menulist.xhtml firefox-85.0+build1/accessible/tests/browser/mac/doc_menulist.xhtml
--- firefox-84.0.2+build1/accessible/tests/browser/mac/doc_menulist.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/doc_menulist.xhtml	2021-01-18 19:58:07.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<window
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <hbox>
+    <label control="defaultZoom" value="Zoom"/>
+    <hbox>
+      <menulist id="defaultZoom">
+        <menupopup>
+          <menuitem label="50%" value="50"/>
+          <menuitem label="100%" value="100"/>
+          <menuitem label="150%" value="150"/>
+          <menuitem label="200%" value="200"/>
+        </menupopup>
+      </menulist>
+    </hbox>
+  </hbox>
+</window>
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/doc_rich_listbox.xhtml firefox-85.0+build1/accessible/tests/browser/mac/doc_rich_listbox.xhtml
--- firefox-84.0.2+build1/accessible/tests/browser/mac/doc_rich_listbox.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/doc_rich_listbox.xhtml	2021-01-18 19:58:07.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <richlistbox id="categories">
+    <richlistitem id="general">
+      <label value="general"/>
+    </richlistitem>
+
+    <richlistitem id="home">
+      <label value="home"/>
+    </richlistitem>
+
+    <richlistitem id="search">
+      <label value="search"/>
+    </richlistitem>
+
+    <richlistitem id="privacy">
+      <label value="privacy"/>
+    </richlistitem>
+  </richlistbox>
+</window>
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/doc_textmarker_test.html firefox-85.0+build1/accessible/tests/browser/mac/doc_textmarker_test.html
--- firefox-84.0.2+build1/accessible/tests/browser/mac/doc_textmarker_test.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/doc_textmarker_test.html	2021-01-18 19:58:07.000000000 +0000
@@ -25,1996 +25,2400 @@
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bob", "Bob"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bob", "Bob"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bob", "Bob"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bob", " "],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: [" ", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", "Loblaw"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Loblaw", " "],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: [" ", "Lobs"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Lobs", "Lobs"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Lobs", "Lobs"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Lobs", "Lobs"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Lobs", " "],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: [" ", "Law"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Law", "Law"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Law", "Law"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Law", " "],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: [" ", "Bomb"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bomb", "Bomb"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bomb", "Bomb"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "Bob Loblaw Lobs Law Bomb",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb"],
           words: ["Bomb", "Bomb"],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "Bob Loblaw Lobs Law Bomb",
           paragraph: "I love all of my children equally",
           lines: ["Bob Loblaw Lobs Law Bomb",
                   "Bob Loblaw Lobs Law Bomb",
                   "I love all of my children equally"],
           words: ["Bomb", ""],
-          element: ["AXStaticText", "Bob Loblaw Lobs Law Bomb"] },
+          element: ["AXStaticText",
+                    "Bob Loblaw Lobs Law Bomb",
+                    "Bob Loblaw Lobs Law Bomb"] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["I", " "],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "love"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["love", "love"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["love", "love"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["love", "love"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["love", " "],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "all"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["all", "all"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["all", "all"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["all", " "],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "of"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["of", "of"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["of", " "],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "my"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["my", "my"],
-          element: ["AXStaticText", "I love all of my "] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["my", " "],
-          element: ["AXStaticText", "I love all of my "] },
-        { style: "children",
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
+        { style: "I love all of my ",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "I love all of my ", "I love all of my "] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", "children"],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: "children",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["children", " "],
-          element: ["AXStaticText", "children"] },
+          element: ["AXStaticText", "children", "children"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: [" ", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "I love all of my children equally",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "I love all of my children equally"],
           words: ["equally", "equally"],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: " equally",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["I love all of my children equally",
                   "I love all of my children equally",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["equally", ""],
-          element: ["AXStaticText", " equally"] },
+          element: ["AXStaticText", " equally", " equally"] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["This", "This"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["This", "This"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["This", "This"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["This", " "],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "is"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["is", "is"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["is", " "],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "the"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["the", "the"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["the", "the"],
-          element: ["AXStaticText", "This is the "] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["the", " "],
-          element: ["AXStaticText", "This is the "] },
-        { style: "best",
+          element: ["AXStaticText", "This is the ", "This is the "] },
+        { style: "This is the ",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "best"],
-          element: ["AXStaticText", "best"] },
+          element: ["AXStaticText", "This is the ", "This is the "] },
         { style: "best",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["best", "best"],
-          element: ["AXStaticText", "best"] },
+          element: ["AXStaticText", "best", "best"] },
         { style: "best",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["best", "best"],
-          element: ["AXStaticText", "best"] },
+          element: ["AXStaticText", "best", "best"] },
         { style: "best",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["best", "best"],
-          element: ["AXStaticText", "best"] },
-        { style: " free scr",
+          element: ["AXStaticText", "best", "best"] },
+        { style: "best",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["best", " "],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", "best", "best"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "free"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["free", "free"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["free", "free"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["free", "free"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["free", " "],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "scrapbooking"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", " free scr"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", " free scr"] },
-        { style: "apbook",
+          element: ["AXStaticText", " free scr", " free scr"] },
+        { style: " free scr",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", " free scr", " free scr"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "apbook",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "apbook"] },
+          element: ["AXStaticText", "apbook", "apbook"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", "scrapbooking"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["scrapbooking", " "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "class"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["class", "class"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["class", "class"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["class", "class"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["class", "class"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["class", " "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "I"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["I", " "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "have"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["have", "have"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["have", "have"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["have", "have"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["have", " "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "ever"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["ever", "ever"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["ever", "ever"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["ever", "ever"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["ever", " "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: [" ", "taken"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["taken", "taken"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["taken", "taken"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["taken", "taken"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
         { style: "ing class I have ever taken",
           paragraph: "This is the best free scrapbooking class I have ever taken",
           lines: ["This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken",
                   "This is the best free scrapbooking class I have ever taken"],
           words: ["taken", "taken"],
-          element: ["AXStaticText", "ing class I have ever taken"] },
-        { style: "ing class I have ever taken",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["This is the best free scrapbooking class I have ever taken",
-                  "This is the best free scrapbooking class I have ever taken",
-                  "Fried cheese with club sauce"],
-          words: ["taken", "\u2022 "],
-          element: ["AXStaticText", "ing class I have ever taken"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
-          words: ["Fried", "Fried"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
-          words: ["Fried", "Fried"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
-          words: ["Fried", "Fried"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
-          words: ["Fried", "Fried"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
-          words: ["Fried", " "],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
+        { style: "ing class I have ever taken",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["This is the best free scrapbooking class I have ever taken",
+                  "This is the best free scrapbooking class I have ever taken",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["taken", ""],
+          element: ["AXStaticText",
+                    "ing class I have ever taken",
+                    "ing class I have ever taken"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["\u2022 Fried", "\u2022 Fried"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["\u2022 Fried", "\u2022 Fried"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["\u2022 Fried", "\u2022 Fried"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["\u2022 Fried", "\u2022 Fried"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
+          words: ["\u2022 Fried", " "],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: [" ", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", "cheese"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["cheese", " "],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: [" ", "with"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["with", " "],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: [" ", "club"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["club", " "],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: [" ", "sauce"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Fried cheese with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Fried cheese with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Fried cheese with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Fried cheese with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Fried cheese with club sauce",
-                  "Fried cheese with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["sauce", "\u2022 "],
-          element: ["AXStaticText", "Fried cheese with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", "Popcorn"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
-          words: ["Popcorn", " "],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Fried cheese with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Fried cheese with club sauce",
+                  "\u2022 Fried cheese with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["sauce", ""],
+          element: ["AXStaticText",
+                    "Fried cheese with club sauce",
+                    "\u2022 Fried cheese with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", "\u2022 Popcorn"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
+          words: ["\u2022 Popcorn", " "],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: [" ", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", "shrimp"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["shrimp", " "],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: [" ", "with"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["with", " "],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: [" ", "club"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["club", " "],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: [" ", "sauce"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Popcorn shrimp with club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Popcorn shrimp with club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Popcorn shrimp with club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Popcorn shrimp with club sauce",
-                  "Popcorn shrimp with club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["sauce", "\u2022 "],
-          element: ["AXStaticText", "Popcorn shrimp with club sauce"] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", "Chicken"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
-          words: ["Chicken", " "],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Popcorn shrimp with club sauce",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Popcorn shrimp with club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["sauce", ""],
+          element: ["AXStaticText",
+                    "Popcorn shrimp with club sauce",
+                    "\u2022 Popcorn shrimp with club sauce"] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", "\u2022 Chicken"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
+          words: ["\u2022 Chicken", " "],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: [" ", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", "fingers"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["fingers", " "],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: [" ", "with"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["with", "with"],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "Chicken fingers with ",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["with", " "],
-          element: ["AXStaticText", "Chicken fingers with "] },
-        { style: "spicy",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
+        { style: "\u2022 Chicken fingers with ",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: [" ", "spicy"],
-          element: ["AXStaticText", "spicy"] },
+          element: ["AXStaticText",
+                    "Chicken fingers with ",
+                    "\u2022 Chicken fingers with "] },
         { style: "spicy",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["spicy", "spicy"],
-          element: ["AXStaticText", "spicy"] },
+          element: ["AXStaticText", "spicy", "spicy"] },
         { style: "spicy",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["spicy", "spicy"],
-          element: ["AXStaticText", "spicy"] },
+          element: ["AXStaticText", "spicy", "spicy"] },
         { style: "spicy",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["spicy", "spicy"],
-          element: ["AXStaticText", "spicy"] },
+          element: ["AXStaticText", "spicy", "spicy"] },
         { style: "spicy",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["spicy", "spicy"],
-          element: ["AXStaticText", "spicy"] },
-        { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          element: ["AXStaticText", "spicy", "spicy"] },
+        { style: "spicy",
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["spicy", " "],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", "spicy", "spicy"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: [" ", "club"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["club", "club"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["club", " "],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: [" ", "sauce"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
-          paragraph: "Chicken fingers with spicy club sauce",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce"],
+          paragraph: "\u2022 Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce"],
           words: ["sauce", "sauce"],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: " club sauce",
           paragraph: "Do not order the Skip's Scramble",
-          lines: ["Chicken fingers with spicy club sauce",
-                  "Chicken fingers with spicy club sauce",
+          lines: ["\u2022 Chicken fingers with spicy club sauce",
+                  "\u2022 Chicken fingers with spicy club sauce",
                   "Do not order the Skip's Scramble"],
           words: ["sauce", ""],
-          element: ["AXStaticText", " club sauce"] },
+          element: ["AXStaticText", " club sauce", " club sauce"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Do", "Do"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Do", " "],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: [" ", "not"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["not", "not"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["not", "not"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["not", " "],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: [" ", "order"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["order", "order"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["order", "order"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["order", "order"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["order", "order"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["order", " "],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: [" ", "the"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["the", "the"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["the", "the"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["the", " "],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: [" ", "Skip'"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Skip'", "Skip'"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Skip'", "Skip'"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Skip'", "Skip'"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Skip'", "'"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Skip'", "s"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["s", " "],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: [" ", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "Do not order the Skip's Scramble",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble"],
           words: ["Scramble", "Scramble"],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "Do not order the Skip's Scramble",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Do not order the Skip's Scramble",
                   "Do not order the Skip's Scramble",
                   "These "],
           words: ["Scramble", ""],
-          element: ["AXStaticText", "Do not order the Skip's Scramble"] },
+          element: ["AXStaticText",
+                    "Do not order the Skip's Scramble",
+                    "Do not order the Skip's Scramble"] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["These ", "These ", "These "],
           words: ["These", "These"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["These ", "These ", "These "],
           words: ["These", "These"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["These ", "These ", "These "],
           words: ["These", "These"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["These ", "These ", "These "],
           words: ["These", "These"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["These ", "These ", "These "],
           words: ["These", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["are ", "are ", "are "],
           words: [" ", "are"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["are ", "are ", "are "],
           words: ["are", "are"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["are ", "are ", "are "],
           words: ["are", "are"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["are ", "are ", "are "],
           words: ["are", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["my ", "my ", "my "],
           words: [" ", "my"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["my ", "my ", "my "],
           words: ["my", "my"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["my ", "my ", "my "],
           words: ["my", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: [" ", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards,"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", "awards, "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["awards, ", "awards, ", "awards, "],
           words: ["awards,", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: [" ", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", "Mother. "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Mother. ", "Mother. ", "Mother. "],
           words: ["Mother.", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["From ", "From ", "From "],
           words: [" ", "From"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["From ", "From ", "From "],
           words: ["From", "From"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["From ", "From ", "From "],
           words: ["From", "From"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["From ", "From ", "From "],
           words: ["From", "From"],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["From ", "From ", "From "],
           words: ["From", " "],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Army.", "Army.", "Army."],
           words: [" ", "Army."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Army.", "Army.", "Army."],
           words: ["Army.", "Army."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Army.", "Army.", "Army."],
           words: ["Army.", "Army."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Army.", "Army.", "Army."],
           words: ["Army.", "Army."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "These are my awards, Mother. From Army.",
           lines: ["Army.", "Army.", "Army."],
           words: ["Army.", "Army."],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "These are my awards, Mother. From Army.",
           paragraph: "I deceived you, mom.",
           lines: ["Army.", "Army.", "I deceived you, mom."],
           words: ["Army.", ""],
-          element: ["AXStaticText", "These are my awards, Mother. From Army."] },
+          element: ["AXStaticText",
+                    "These are my awards, Mother. From Army.",
+                    "These are my awards, Mother. From Army."] },
         { style: "I ",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["I", " "],
-          element: ["AXStaticText", "I "] },
-        { style: "deceived you",
+          element: ["AXStaticText", "I ", "I "] },
+        { style: "I ",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: [" ", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXStaticText", "I ", "I "] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", "deceived"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["deceived", " "],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: [" ", "you"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["you", "you"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["deceived you", "deceived you", "deceived you"],
           words: ["you", "you"],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: "deceived you",
           paragraph: "deceived you",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["you", ""],
-          element: ["AXTextField", "deceived you"] },
+          element: ["AXTextField", "deceived you", "deceived you"] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: [",", " "],
-          element: ["AXStaticText", ", mom."] },
+          element: ["AXStaticText", ", mom.", ", mom."] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: [", ", "mom."],
-          element: ["AXStaticText", ", mom."] },
+          element: ["AXStaticText", ", mom.", ", mom."] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["mom.", "mom."],
-          element: ["AXStaticText", ", mom."] },
+          element: ["AXStaticText", ", mom.", ", mom."] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["mom.", "mom."],
-          element: ["AXStaticText", ", mom."] },
+          element: ["AXStaticText", ", mom.", ", mom."] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["mom.", "mom."],
-          element: ["AXStaticText", ", mom."] },
+          element: ["AXStaticText", ", mom.", ", mom."] },
         { style: ", mom.",
           paragraph: "I deceived you, mom.",
           lines: ["I deceived you, mom.", "I deceived you, mom.", "I deceived you, mom."],
           words: ["mom.", ""],
-          element: ["AXStaticText", ", mom."] }];
+          element: ["AXStaticText", ", mom.", ", mom."] }];
     </script>
   </body>
 </html>
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/doc_tree.xhtml firefox-85.0+build1/accessible/tests/browser/mac/doc_tree.xhtml
--- firefox-84.0.2+build1/accessible/tests/browser/mac/doc_tree.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/doc_tree.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+
+<window
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <tree id="tree" hidecolumnpicker="true">
+    <treecols>
+      <treecol primary="true" label="Groceries"/>
+    </treecols>
+    <treechildren id="internalTree">
+      <treeitem id="fruits" container="true" open="true">
+        <treerow>
+          <treecell label="Fruits"/>
+        </treerow>
+        <treechildren>
+          <treeitem id="apple">
+            <treerow>
+              <treecell label="Apple"/>
+            </treerow>
+          </treeitem>
+          <treeitem id="orange">
+            <treerow>
+              <treecell label="Orange"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </treeitem>
+      <treeitem id="veggies" container="true" open="true">
+        <treerow>
+          <treecell label="Veggies"/>
+        </treerow>
+        <treechildren>
+          <treeitem id="greenVeggies" container="true" open="true">
+            <treerow>
+              <treecell label="Green Veggies"/>
+            </treerow>
+            <treechildren>
+              <treeitem id="spinach">
+                <treerow>
+                  <treecell label="Spinach"/>
+                </treerow>
+              </treeitem>
+              <treeitem id="peas">
+                <treerow>
+                  <treecell label="Peas"/>
+                </treerow>
+              </treeitem>
+            </treechildren>
+          </treeitem>
+          <treeitem id="squash">
+            <treerow>
+              <treecell label="Squash"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </treeitem>
+    </treechildren>
+  </tree>
+</window>
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/mac/head.js firefox-85.0+build1/accessible/tests/browser/mac/head.js
--- firefox-84.0.2+build1/accessible/tests/browser/mac/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/mac/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -28,13 +28,25 @@
 }
 
 function waitForMacEventWithInfo(notificationType, filter) {
+  let filterFunc = (macIface, data) => {
+    if (!filter) {
+      return true;
+    }
+
+    if (typeof filter == "function") {
+      return filter(macIface, data);
+    }
+
+    return macIface.getAttributeValue("AXDOMIdentifier") == filter;
+  };
+
   return new Promise(resolve => {
     let eventObserver = {
       observe(subject, topic, data) {
         let macEvent = subject.QueryInterface(Ci.nsIAccessibleMacEvent);
         if (
           data === notificationType &&
-          (!filter || filter(macEvent.macIface, macEvent.data))
+          filterFunc(macEvent.macIface, macEvent.data)
         ) {
           Services.obs.removeObserver(this, "accessible-mac-event");
           resolve(macEvent);
diff -Nru firefox-84.0.2+build1/accessible/tests/browser/shared-head.js firefox-85.0+build1/accessible/tests/browser/shared-head.js
--- firefox-84.0.2+build1/accessible/tests/browser/shared-head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/browser/shared-head.js	2021-01-18 19:58:08.000000000 +0000
@@ -431,7 +431,11 @@
     gIsRemoteIframe = options.remoteIframe;
     gIsIframe = options.iframe || gIsRemoteIframe;
     let url;
-    if (doc.endsWith("html") && !gIsIframe) {
+    if (options.chrome && doc.endsWith("html")) {
+      // Load with a chrome:// URL so this loads as a chrome document in the
+      // parent process.
+      url = `${CURRENT_DIR}${doc}`;
+    } else if (doc.endsWith("html") && !gIsIframe) {
       url = `${CURRENT_CONTENT_DIR}${doc}`;
     } else {
       url = snippetToURL(doc, options);
@@ -445,10 +449,13 @@
       }
     });
 
-    const onContentDocLoad = waitForEvent(
-      EVENT_DOCUMENT_LOAD_COMPLETE,
-      DEFAULT_CONTENT_DOC_BODY_ID
-    );
+    let onContentDocLoad;
+    if (!options.chrome) {
+      onContentDocLoad = waitForEvent(
+        EVENT_DOCUMENT_LOAD_COMPLETE,
+        DEFAULT_CONTENT_DOC_BODY_ID
+      );
+    }
 
     let onIframeDocLoad;
     if (options.remoteIframe && !options.skipFissionDocLoad) {
@@ -476,11 +483,29 @@
         await SimpleTest.promiseFocus(browser);
         await loadContentScripts(browser, "Common.jsm");
 
-        if (Services.appinfo.browserTabsRemoteAutostart) {
+        if (options.chrome) {
+          ok(!browser.isRemoteBrowser, "Not remote browser");
+        } else if (Services.appinfo.browserTabsRemoteAutostart) {
           ok(browser.isRemoteBrowser, "Actually remote browser");
         }
 
-        const { accessible: docAccessible } = await onContentDocLoad;
+        let docAccessible;
+        if (options.chrome) {
+          // Chrome documents don't fire DOCUMENT_LOAD_COMPLETE. Instead, wait
+          // until we can get the DocAccessible and it doesn't have the busy
+          // state.
+          await BrowserTestUtils.waitForCondition(() => {
+            docAccessible = getAccessible(browser.contentWindow.document);
+            if (!docAccessible) {
+              return false;
+            }
+            const state = {};
+            docAccessible.getState(state, {});
+            return !(state.value & STATE_BUSY);
+          });
+        } else {
+          ({ accessible: docAccessible } = await onContentDocLoad);
+        }
         let iframeDocAccessible;
         if (gIsIframe) {
           if (!options.skipFissionDocLoad) {
@@ -515,6 +540,12 @@
  *         - {Boolean} topLevel
  *           Flag to run the test with content in the top level content process.
  *           Default is true.
+ *         - {Boolean} chrome
+ *           Flag to run the test with content as a chrome document in the
+ *           parent process. Default is false. This is only valid if url is a
+ *           relative URL to a XUL document, not a markup snippet. topLevel
+ *           should usually be set to false in this case, since XUL documents
+ *           don't work in the content process.
  *         - {Boolean} iframe
  *           Flag to run the test with content wrapped in an iframe. Default is
  *           false.
@@ -533,11 +564,28 @@
  *           a set of attributes to be applied to a iframe content document body
  */
 function addAccessibleTask(doc, task, options = {}) {
-  const { topLevel = true, iframe = false, remoteIframe = false } = options;
+  const {
+    topLevel = true,
+    chrome = false,
+    iframe = false,
+    remoteIframe = false,
+  } = options;
   if (topLevel) {
     add_task(
       accessibleTask(doc, task, {
         ...options,
+        chrome: false,
+        iframe: false,
+        remoteIframe: false,
+      })
+    );
+  }
+
+  if (chrome) {
+    add_task(
+      accessibleTask(doc, task, {
+        ...options,
+        topLevel: false,
         iframe: false,
         remoteIframe: false,
       })
@@ -549,6 +597,7 @@
       accessibleTask(doc, task, {
         ...options,
         topLevel: false,
+        chrome: false,
         remoteIframe: false,
       })
     );
@@ -559,6 +608,7 @@
       accessibleTask(doc, task, {
         ...options,
         topLevel: false,
+        chrome: false,
         iframe: false,
       })
     );
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/attributes/test_obj_css.xhtml firefox-85.0+build1/accessible/tests/mochitest/attributes/test_obj_css.xhtml
--- firefox-84.0.2+build1/accessible/tests/mochitest/attributes/test_obj_css.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/attributes/test_obj_css.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -22,9 +22,6 @@
       // CSS display
       testCSSAttrs("display_mozbox");
       testCSSAttrs("display_mozinlinebox");
-      testCSSAttrs("display_mozgrid");
-      testCSSAttrs("display_mozgridgroup");
-      testCSSAttrs("display_mozgridline");
       testCSSAttrs("display_mozdeck");
       testCSSAttrs("display_mozpopup");
 
@@ -53,9 +50,6 @@
 
   <vbox id="display_mozbox" style="display: -moz-box;" role="img"/>
   <vbox id="display_mozinlinebox" style="display: -moz-inline-box;" role="img"/>
-  <vbox id="display_mozgrid" style="display: -moz-grid;" role="img"/>
-  <vbox id="display_mozgridgroup" style="display: -moz-grid-group;" role="img"/>
-  <vbox id="display_mozgridline" style="display: -moz-grid-line;" role="img"/>
   <vbox id="display_mozdeck" style="display: -moz-deck;" role="img"/>
   <vbox id="display_mozpopup" style="display: -moz-popup;" role="img"/>
 
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/attributes/test_obj.html firefox-85.0+build1/accessible/tests/mochitest/attributes/test_obj.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/attributes/test_obj.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/attributes/test_obj.html	2021-01-18 19:58:08.000000000 +0000
@@ -72,6 +72,11 @@
       testAttrs("live", {"live": "polite"}, true);
       testAttrs("live2", {"live": "polite"}, true);
       testAbsentAttrs("live3", {"live": ""});
+      if (MAC) {
+        testAttrs("alert", {"live": "assertive"}, true);
+      } else {
+        testAbsentAttrs("alert", {"live": "assertive"});
+      }
       testAttrs("log", {"live": "polite"}, true);
       testAttrs("logAssertive", {"live": "assertive"}, true);
       testAttrs("marquee", {"live": "off"}, true);
@@ -82,6 +87,11 @@
       // container-live object attribute
       testAttrs("liveChild", {"container-live": "polite"}, true);
       testAttrs("live2Child", {"container-live": "polite"}, true);
+      if (MAC) {
+        testAttrs("alertChild", {"container-live": "assertive"}, true);
+      } else {
+        testAbsentAttrs("alertChild", {"container-live": "assertive"});
+      }
       testAttrs("logChild", {"container-live": "polite"}, true);
       testAttrs("logAssertiveChild", {"container-live": "assertive"}, true);
       testAttrs("marqueeChild", {"container-live": "off"}, true);
@@ -234,6 +244,7 @@
   <div id="live" aria-live="polite">excuse <div id="liveChild">me</div></div>
   <div id="live2" role="marquee" aria-live="polite">excuse <div id="live2Child">me</div></div>
   <div id="live3" role="region">excuse</div>
+  <div id="alert" role="alert">excuse <div id="alertChild">me</div></div>
   <div id="log" role="log">excuse <div id="logChild">me</div></div>
   <div id="logAssertive" role="log" aria-live="assertive">excuse <div id="logAssertiveChild">me</div></div>
   <div id="marquee" role="marquee">excuse <div id="marqueeChild">me</div></div>
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/elm/a11y.ini firefox-85.0+build1/accessible/tests/mochitest/elm/a11y.ini
--- firefox-84.0.2+build1/accessible/tests/mochitest/elm/a11y.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/elm/a11y.ini	2021-01-18 19:58:07.000000000 +0000
@@ -10,7 +10,6 @@
 [test_listbox.xhtml]
 [test_MathMLSpec.html]
 [test_nsApplicationAcc.html]
-[test_plugin.html]
 [test_canvas.html]
 [test_shadowroot.html]
 support-files = test_shadowroot_subframe.html
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_HTMLSpec.html firefox-85.0+build1/accessible/tests/mochitest/elm/test_HTMLSpec.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_HTMLSpec.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/elm/test_HTMLSpec.html	2021-01-18 19:58:08.000000000 +0000
@@ -461,20 +461,8 @@
       // ////////////////////////////////////////////////////////////////////////
       // HTML:embed (windowless/windowed plugins and media)
 
-      if (WIN) {
-        obj = {
-          role: ROLE_EMBEDDED_OBJECT,
-          states: STATE_UNAVAILABLE,
-        };
-
-        testElm("embed_plugin_windowless", obj);
-
-        obj = {
-          role: ROLE_EMBEDDED_OBJECT,
-          absentStates: STATE_UNAVAILABLE,
-        };
-        testElm("embed_plugin_windowed", obj);
-      }
+      ok(!isAccessible("embed_plugin_windowless"), "(blocked) windowless plugin embed element is not accessible");
+      ok(!isAccessible("embed_plugin_windowed"), "(blocked) windowed plugin embed element is not accessible");
 
       obj = {
         role: ROLE_GRAPHIC,
@@ -1133,20 +1121,8 @@
       // ////////////////////////////////////////////////////////////////////////
       // HTML:object (windowless/windowed plugins and media) and HTML:param
 
-      if (WIN) {
-        obj = {
-          role: ROLE_EMBEDDED_OBJECT,
-          states: STATE_UNAVAILABLE,
-          children: [ ], // no child for HTML:param
-        };
-        testElm("object_plugin_windowless", obj);
-
-        obj = {
-          role: ROLE_EMBEDDED_OBJECT,
-          absentStates: STATE_UNAVAILABLE,
-        };
-        testElm("object_plugin_windowed", obj);
-      }
+      ok(!isAccessible("object_plugin_windowless"), "(blocked) windowless plugin object element is not accessible");
+      ok(!isAccessible("object_plugin_windowed"), "(blocked) windowed plugin object element is not accessible");
 
       obj = {
         role: ROLE_GRAPHIC,
@@ -1481,7 +1457,6 @@
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTest);
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     </script>
 </head>
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_MathMLSpec.html firefox-85.0+build1/accessible/tests/mochitest/elm/test_MathMLSpec.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_MathMLSpec.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/elm/test_MathMLSpec.html	2021-01-18 19:58:08.000000000 +0000
@@ -351,7 +351,6 @@
 
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTest);
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
 
     </script>
 </head>
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_plugin.html firefox-85.0+build1/accessible/tests/mochitest/elm/test_plugin.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/elm/test_plugin.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/elm/test_plugin.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Plugin tests</title>
-  <link rel="stylesheet" type="text/css"
-        href="chrome://mochikit/content/tests/SimpleTest/test.css" />
-
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-
-  <script type="application/javascript"
-          src="../common.js"></script>
-  <script type="application/javascript"
-          src="../role.js"></script>
-  <script type="application/javascript"
-          src="../states.js"></script>
-
-  <script type="application/javascript">
-
-    function doTest() {
-      if (!WIN) {
-        ok(true,
-           "It's Windows specific test. Feel free to extend the test.");
-
-        SimpleTest.finish();
-        return;
-      }
-
-      testStates("plugin-windowless", STATE_UNAVAILABLE);
-      testAccessibleTree("plugin-windowless", { EMBEDDED_OBJECT: [ ] });
-
-      testStates("plugin-windowless-fallback", STATE_UNAVAILABLE);
-      testAccessibleTree("plugin-windowless-fallback", { EMBEDDED_OBJECT: [ ] });
-
-      testStates("plugin-windowed", 0, 0, STATE_UNAVAILABLE);
-      testAccessibleTree("plugin-windowed", { EMBEDDED_OBJECT: [ { NOTHING: [] } ] });
-
-      testStates("plugin-windowed-fallback", 0, 0, STATE_UNAVAILABLE);
-      testAccessibleTree("plugin-windowed-fallback",
-                         { EMBEDDED_OBJECT: [ { NOTHING: [] } ] });
-
-      // make sure we handle content changes under the plugin.
-      getNode("fallback1").setAttribute("href", "5");
-      getNode("fallback2").setAttribute("href", "5");
-      SimpleTest.executeSoon(function() { SimpleTest.finish(); });
-    }
-
-    SimpleTest.waitForExplicitFinish();
-    addA11yLoadEvent(doTest);
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-</head>
-<body>
-
-  <a target="_blank"
-     title="Embed and object HTML tags should be given an accessible role of embedded object"
-     href="https://bugzilla.mozilla.org/show_bug.cgi?id=485270">Bug 485270</a>
-  <a target="_blank"
-     title="Embedded object accessibles for inaccessible/windowless plugins should not expose a NULL child"
-     href="https://bugzilla.mozilla.org/show_bug.cgi?id=816856">Bug 816856</a>
-  <a target="_blank"
-     title="Updating accessible tree for plugin with fallback shouldn't crash"
-     href="https://bugzilla.mozilla.org/show_bug.cgi?id=881636">Bug 881636</a>
-  <p id="display"></p>
-  <div id="content" style="display: none"></div>
-  <pre id="test">
-  </pre>
-
-  <embed id="plugin-windowless" type="application/x-test"
-         width="300" height="300"></embed>
-  <embed id="plugin-windowed" type="application/x-test" wmode="window"
-         width="300" height="300"></embed>
-  <embed id="plugin-windowless-fallback" type="application/x-test"
-    width="300" height="300"><a id="fallback1">foo</a></embed>
-  <embed id="plugin-windowed-fallback" type="application/x-test" wmode="window"
-    width="300" height="300"><a id="fallback2">foo</a></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/focus/test_takeFocus.html firefox-85.0+build1/accessible/tests/mochitest/focus/test_takeFocus.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/focus/test_takeFocus.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/focus/test_takeFocus.html	2021-01-18 19:58:08.000000000 +0000
@@ -49,7 +49,6 @@
       gQueue.push(new takeFocusInvoker("aria-link2"));
       gQueue.push(new takeFocusInvoker("link"));
       gQueue.push(new takeFocusInvoker("item2"));
-      gQueue.push(new takeFocusInvoker("plugin"));
       gQueue.push(new takeFocusInvoker(document));
       gQueue.push(new takeFocusInvoker("lb_item2"));
       gQueue.push(new takeFocusInvoker(document));
@@ -60,13 +59,8 @@
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
-    function waitForPlugin() {
-      window.setTimeout((isAccessible("plugin") ? doTest : waitForPlugin), 0);
-    }
-
     SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    addA11yLoadEvent(waitForPlugin);
+    addA11yLoadEvent(doTest);
   </script>
 </head>
 
@@ -83,11 +77,6 @@
     Mozilla Bug 452710
   </a>
   <a target="_blank"
-     href="https://bugzilla.mozilla.org/show_bug.cgi?id=646361"
-     title="No focus event fired on document when focus is set to the document while focused in a plugin">
-    Mozilla Bug 646361
-  </a>
-  <a target="_blank"
      href="https://bugzilla.mozilla.org/show_bug.cgi?id=706067"
      title="Make takeFocus work on widget items">
     Mozilla Bug 706067
@@ -108,8 +97,6 @@
     <div role="option" id="item3">item3</div>
   </div>
 
-  <embed id="plugin" type="application/x-test" width="200" height="200" wmode="window"></embed>
-
   <select id="listbox" size="5">
     <option id="lb_item1">item1</option>
     <option id="lb_item2">item2</option>
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/name/test_browserui.xhtml firefox-85.0+build1/accessible/tests/mochitest/name/test_browserui.xhtml
--- firefox-84.0.2+build1/accessible/tests/mochitest/name/test_browserui.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/name/test_browserui.xhtml	2021-01-18 19:58:07.000000000 +0000
@@ -34,8 +34,8 @@
       let docLoaded = waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, event =>
         event.accessible.QueryInterface(nsIAccessibleDocument).URL === ABOUT_LICENSE_URL,
         `Loaded tab: ${ABOUT_LICENSE_URL}`);
-      await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser,
-        ABOUT_LICENSE_URL);
+      BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser,
+        "about:license");
       await loaded;
       await docLoaded;
       await winFocused;
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/promisified-events.js firefox-85.0+build1/accessible/tests/mochitest/promisified-events.js
--- firefox-84.0.2+build1/accessible/tests/mochitest/promisified-events.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/promisified-events.js	2021-01-18 19:58:07.000000000 +0000
@@ -42,6 +42,8 @@
 const EVENT_ALERT = nsIAccessibleEvent.EVENT_ALERT;
 const EVENT_TEXT_SELECTION_CHANGED =
   nsIAccessibleEvent.EVENT_TEXT_SELECTION_CHANGED;
+const EVENT_LIVE_REGION_ADDED = nsIAccessibleEvent.EVENT_LIVE_REGION_ADDED;
+const EVENT_LIVE_REGION_REMOVED = nsIAccessibleEvent.EVENT_LIVE_REGION_REMOVED;
 
 const EventsLogger = {
   enabled: false,
diff -Nru firefox-84.0.2+build1/accessible/tests/mochitest/treeupdate/test_delayed_removal.html firefox-85.0+build1/accessible/tests/mochitest/treeupdate/test_delayed_removal.html
--- firefox-84.0.2+build1/accessible/tests/mochitest/treeupdate/test_delayed_removal.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/tests/mochitest/treeupdate/test_delayed_removal.html	2021-01-18 19:58:08.000000000 +0000
@@ -307,6 +307,40 @@
       ] });
     }
 
+    // Slack seems to often restyle containers and change children
+    // simultaneously, this results in an insertion queue filled with
+    // redundant insertions and unparented nodes.
+    // This test duplicates some of this.
+    async function testSlack() {
+      let msg = "testSlack";
+      info(msg);
+
+      window.windowUtils.advanceTimeAndRefresh(100);
+      let event = waitForEvent(EVENT_REORDER, "c14", "testSlack");
+
+      let keyContainer = document.querySelector("#c14 .intermediate");
+      keyContainer.style.display = "inline-block";
+      document.body.offsetTop; // Flush layout.
+
+      let one = document.querySelector("#c14 [aria-label='one']");
+      let three = document.querySelector("#c14 [aria-label='three']");
+      one.remove();
+      three.remove();
+      // insert one first
+      keyContainer.firstChild.before(one.cloneNode());
+      // insert three last
+      keyContainer.lastChild.after(three.cloneNode());
+
+      keyContainer.style.display = "flex";
+      document.body.offsetTop; // Flush layout.
+
+      window.windowUtils.restoreNormalRefresh();
+
+      await event;
+
+      is(getAccessible("c14").name, "one two three", "subtree has correct order");
+    }
+
     async function doTest() {
       await hideDivFromInsideSpan();
 
@@ -334,6 +368,7 @@
 
       await testCSSGeneratedContentRemovedFromButton();
 
+      await testSlack();
       SimpleTest.finish();
     }
 
@@ -406,6 +441,13 @@
     <button id="b13" class="before" onclick="this.className = ''; this.insertAdjacentElement('afterend', document.createElement('hr'))">go</button>
   </div>
 
+  <div role="heading" id="c14" data-qa="virtual-list-item">
+    <div class="intermediate">
+      <div role="img" aria-label="one"></div> two <div role="img"
+        aria-label="three"></div>
+    </div>
+  </div>
+
   <div id="eventdump"></div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/accessible/windows/msaa/AccessibleWrap.h firefox-85.0+build1/accessible/windows/msaa/AccessibleWrap.h
--- firefox-84.0.2+build1/accessible/windows/msaa/AccessibleWrap.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/msaa/AccessibleWrap.h	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,9 @@
 #include "mozilla/a11y/ProxyAccessible.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/mscom/Utils.h"
+#include "mozilla/StaticPtr.h"
+#include "nsXULAppAPI.h"
+#include "Units.h"
 
 #if defined(__GNUC__) || defined(__clang__)
 // Inheriting from both XPCOM and MSCOM interfaces causes a lot of warnings
diff -Nru firefox-84.0.2+build1/accessible/windows/msaa/CompatibilityUIA.cpp firefox-85.0+build1/accessible/windows/msaa/CompatibilityUIA.cpp
--- firefox-84.0.2+build1/accessible/windows/msaa/CompatibilityUIA.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/msaa/CompatibilityUIA.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "Compatibility.h"
 
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/WindowsVersion.h"
diff -Nru firefox-84.0.2+build1/accessible/windows/msaa/DocAccessibleWrap.cpp firefox-85.0+build1/accessible/windows/msaa/DocAccessibleWrap.cpp
--- firefox-84.0.2+build1/accessible/windows/msaa/DocAccessibleWrap.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/msaa/DocAccessibleWrap.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -188,9 +188,8 @@
         rect.MoveToX(rootRect.X() - rect.X());
         rect.MoveByY(-rootRect.Y());
 
-        nsCOMPtr<nsISupports> container = mDocumentNode->GetContainer();
-        nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
-        docShell->GetIsActive(&isActive);
+        auto* bc = mDocumentNode->GetBrowsingContext();
+        isActive = bc && bc->IsActive();
       }
 
       RefPtr<DocAccessibleWrap> self(this);
diff -Nru firefox-84.0.2+build1/accessible/windows/msaa/LazyInstantiator.cpp firefox-85.0+build1/accessible/windows/msaa/LazyInstantiator.cpp
--- firefox-84.0.2+build1/accessible/windows/msaa/LazyInstantiator.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/msaa/LazyInstantiator.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsXPCOM.h"
 #include "RootAccessibleWrap.h"
 #include "WinUtils.h"
+#include "prenv.h"
 
 #include <oaidl.h>
 
diff -Nru firefox-84.0.2+build1/accessible/windows/msaa/nsEventMap.h firefox-85.0+build1/accessible/windows/msaa/nsEventMap.h
--- firefox-84.0.2+build1/accessible/windows/msaa/nsEventMap.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/msaa/nsEventMap.h	2021-01-18 19:58:07.000000000 +0000
@@ -102,5 +102,7 @@
   EVENT_OBJECT_VALUECHANGE,                          // nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE
   kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_SCROLLING
   kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_ANNOUNCEMENT
+  kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_LIVE_REGION_ADDED
+  kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_LIVE_REGION_REMOVED
     // clang-format on
 };
diff -Nru firefox-84.0.2+build1/accessible/windows/sdn/sdnAccessible.cpp firefox-85.0+build1/accessible/windows/sdn/sdnAccessible.cpp
--- firefox-84.0.2+build1/accessible/windows/sdn/sdnAccessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/windows/sdn/sdnAccessible.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsRange.h"
 
 #include "mozilla/dom/BorrowedAttrInfo.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/PresShell.h"
diff -Nru firefox-84.0.2+build1/accessible/xpcom/xpcAccessibleMacInterface.mm firefox-85.0+build1/accessible/xpcom/xpcAccessibleMacInterface.mm
--- firefox-84.0.2+build1/accessible/xpcom/xpcAccessibleMacInterface.mm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/xpcom/xpcAccessibleMacInterface.mm	2021-01-18 19:58:07.000000000 +0000
@@ -8,8 +8,11 @@
 
 #include "nsCocoaUtils.h"
 #include "nsContentUtils.h"
+#include "nsIObserverService.h"
+#include "nsISimpleEnumerator.h"
 #include "nsIXPConnect.h"
 #include "mozilla/dom/ToJSValue.h"
+#include "mozilla/Services.h"
 #include "nsString.h"
 
 #import "mozAccessible.h"
diff -Nru firefox-84.0.2+build1/accessible/xul/XULComboboxAccessible.cpp firefox-85.0+build1/accessible/xul/XULComboboxAccessible.cpp
--- firefox-84.0.2+build1/accessible/xul/XULComboboxAccessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/xul/XULComboboxAccessible.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -12,6 +12,7 @@
 #include "Role.h"
 #include "States.h"
 
+#include "mozilla/dom/Element.h"
 #include "nsIDOMXULMenuListElement.h"
 
 using namespace mozilla::a11y;
diff -Nru firefox-84.0.2+build1/accessible/xul/XULTreeAccessible.cpp firefox-85.0+build1/accessible/xul/XULTreeAccessible.cpp
--- firefox-84.0.2+build1/accessible/xul/XULTreeAccessible.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/accessible/xul/XULTreeAccessible.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -981,7 +981,7 @@
 
   RefPtr<dom::XULTreeElement> tree = nsCoreUtils::GetTree(mContent);
   if (tree) {
-    nsCOMPtr<nsITreeView> treeView = tree->GetView();
+    nsCOMPtr<nsITreeView> treeView = tree->GetView(FlushType::None);
     if (treeView) {
       int32_t rowCount = 0;
       treeView->GetRowCount(&rowCount);
diff -Nru firefox-84.0.2+build1/browser/actors/AboutPrivateBrowsingParent.jsm firefox-85.0+build1/browser/actors/AboutPrivateBrowsingParent.jsm
--- firefox-84.0.2+build1/browser/actors/AboutPrivateBrowsingParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/AboutPrivateBrowsingParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -58,7 +58,8 @@
       }
       case "SearchHandoff": {
         let searchAlias = "";
-        let searchAliases = Services.search.defaultPrivateEngine.aliases;
+        let searchEngine = Services.search.defaultPrivateEngine;
+        let searchAliases = searchEngine.aliases;
         if (searchAliases && searchAliases.length) {
           searchAlias = `${searchAliases[0]} `;
         }
@@ -70,6 +71,7 @@
         } else {
           // Pass the provided text to the awesomebar. Prepend the @engine shortcut.
           urlBar.search(`${searchAlias}${aMessage.data.text}`, {
+            searchEngine,
             searchModeEntry: "handoff",
           });
           isFirstChange = false;
@@ -82,7 +84,10 @@
           if (isFirstChange) {
             isFirstChange = false;
             urlBar.removeHiddenFocus();
-            urlBar.search(searchAlias, { searchModeEntry: "handoff" });
+            urlBar.search(searchAlias, {
+              searchEngine,
+              searchModeEntry: "handoff",
+            });
             this.sendAsyncMessage("HideSearch");
             urlBar.removeEventListener("compositionstart", checkFirstChange);
             urlBar.removeEventListener("paste", checkFirstChange);
diff -Nru firefox-84.0.2+build1/browser/actors/AboutTabCrashedParent.jsm firefox-85.0+build1/browser/actors/AboutTabCrashedParent.jsm
--- firefox-84.0.2+build1/browser/actors/AboutTabCrashedParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/AboutTabCrashedParent.jsm	2021-01-18 19:58:07.000000000 +0000
@@ -36,7 +36,7 @@
 
     switch (message.name) {
       case "Load": {
-        gAboutTabCrashedPages.set(this, this.browser);
+        gAboutTabCrashedPages.set(this, browser);
         this.updateTabCrashedCount();
 
         let report = TabCrashHandler.onAboutTabCrashedLoad(browser);
diff -Nru firefox-84.0.2+build1/browser/actors/BrowserTabParent.jsm firefox-85.0+build1/browser/actors/BrowserTabParent.jsm
--- firefox-84.0.2+build1/browser/actors/BrowserTabParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/BrowserTabParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -30,15 +30,6 @@
         browser.ownerGlobal.gBrowserInit._firstContentWindowPaintDeferred.resolve();
         break;
       }
-
-      case "Browser:LoadURI": {
-        if (gBrowser.sessionHistoryInParent) {
-          message.data.historyIndex =
-            browsingContext.sessionHistory.requestedIndex;
-        }
-        gBrowser.ownerGlobal.RedirectLoad(browser, message.data);
-        break;
-      }
     }
   }
 }
diff -Nru firefox-84.0.2+build1/browser/actors/ContentSearchParent.jsm firefox-85.0+build1/browser/actors/ContentSearchParent.jsm
--- firefox-84.0.2+build1/browser/actors/ContentSearchParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/ContentSearchParent.jsm	2021-01-18 19:58:07.000000000 +0000
@@ -12,21 +12,13 @@
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "FormHistory",
-  "resource://gre/modules/FormHistory.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "PrivateBrowsingUtils",
-  "resource://gre/modules/PrivateBrowsingUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "SearchSuggestionController",
-  "resource://gre/modules/SearchSuggestionController.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
+  FormHistory: "resource://gre/modules/FormHistory.jsm",
+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
+  SearchSuggestionController:
+    "resource://gre/modules/SearchSuggestionController.jsm",
+});
 
 const MAX_LOCAL_SUGGESTIONS = 3;
 const MAX_SUGGESTIONS = 6;
@@ -250,7 +242,7 @@
       };
       win.openTrustedLinkIn(submission.uri.spec, where, params);
     }
-    win.BrowserSearch.recordSearchInTelemetry(engine, data.healthReportKey, {
+    BrowserSearchTelemetry.recordSearch(browser, engine, data.healthReportKey, {
       selection: data.selection,
       url: submission.uri,
     });
@@ -314,7 +306,12 @@
     } catch (err) {
       return false;
     }
-    if (isPrivate || !entry) {
+    if (
+      isPrivate ||
+      !entry ||
+      entry.value.length >
+        SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH
+    ) {
       return false;
     }
     let browserData = this._suggestionDataForBrowser(browser, true);
diff -Nru firefox-84.0.2+build1/browser/actors/moz.build firefox-85.0+build1/browser/actors/moz.build
--- firefox-84.0.2+build1/browser/actors/moz.build	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -81,8 +81,8 @@
     "RefreshBlockerParent.jsm",
     "RFPHelperChild.jsm",
     "RFPHelperParent.jsm",
-    "SearchTelemetryChild.jsm",
-    "SearchTelemetryParent.jsm",
+    "SearchSERPTelemetryChild.jsm",
+    "SearchSERPTelemetryParent.jsm",
     "SwitchDocumentDirectionChild.jsm",
     "WebRTCChild.jsm",
     "WebRTCParent.jsm",
diff -Nru firefox-84.0.2+build1/browser/actors/PageInfoChild.jsm firefox-85.0+build1/browser/actors/PageInfoChild.jsm
--- firefox-84.0.2+build1/browser/actors/PageInfoChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/PageInfoChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
@@ -90,6 +91,9 @@
     docInfo.characterSet = document.characterSet;
     docInfo.lastModified = document.lastModified;
     docInfo.principal = document.nodePrincipal;
+    docInfo.cookieJarSettings = E10SUtils.serializeCookieJarSettings(
+      document.cookieJarSettings
+    );
 
     let documentURIObject = {};
     documentURIObject.spec = document.documentURIObject.spec;
diff -Nru firefox-84.0.2+build1/browser/actors/PageStyleChild.jsm firefox-85.0+build1/browser/actors/PageStyleChild.jsm
--- firefox-84.0.2+build1/browser/actors/PageStyleChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/PageStyleChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
 var EXPORTED_SYMBOLS = ["PageStyleChild"];
 
 class PageStyleChild extends JSWindowActorChild {
@@ -22,9 +20,7 @@
         if (!window || window.closed) {
           return;
         }
-        let styleSheets = Array.from(this.document.styleSheets);
-        let filteredStyleSheets = this._filterStyleSheets(styleSheets, window);
-
+        let filteredStyleSheets = this._collectStyleSheets(window);
         this.sendAsyncMessage("PageStyle:Add", {
           filteredStyleSheets,
           authorStyleDisabled: this.docShell.contentViewer.authorStyleDisabled,
@@ -55,82 +51,126 @@
   }
 
   /**
+   * Returns links that would represent stylesheets once loaded.
+   */
+  _collectLinks(document) {
+    let result = [];
+    for (let link of document.querySelectorAll("link")) {
+      if (link.namespaceURI !== "http://www.w3.org/1999/xhtml") {
+        continue;
+      }
+      let isStyleSheet = Array.from(link.relList).some(
+        r => r.toLowerCase() == "stylesheet"
+      );
+      if (!isStyleSheet) {
+        continue;
+      }
+      if (!link.href) {
+        continue;
+      }
+      result.push(link);
+    }
+    return result;
+  }
+
+  /**
    * Switch the stylesheet so that only the sheet with the given title is enabled.
    */
   _switchStylesheet(title) {
-    let docStyleSheets = this.document.styleSheets;
+    let document = this.document;
+    let docStyleSheets = Array.from(document.styleSheets);
+    let links;
 
     // Does this doc contain a stylesheet with this title?
     // If not, it's a subframe's stylesheet that's being changed,
     // so no need to disable stylesheets here.
     let docContainsStyleSheet = !title;
     if (title) {
-      for (let docStyleSheet of docStyleSheets) {
-        if (docStyleSheet.title === title) {
-          docContainsStyleSheet = true;
-          break;
+      links = this._collectLinks(document);
+      docContainsStyleSheet =
+        docStyleSheets.some(sheet => sheet.title == title) ||
+        links.some(link => link.title == title);
+    }
+
+    for (let sheet of docStyleSheets) {
+      if (sheet.title) {
+        if (docContainsStyleSheet) {
+          sheet.disabled = sheet.title !== title;
         }
+      } else if (sheet.disabled) {
+        sheet.disabled = false;
       }
     }
 
-    for (let docStyleSheet of docStyleSheets) {
-      if (docStyleSheet.title) {
-        if (docContainsStyleSheet) {
-          docStyleSheet.disabled = docStyleSheet.title !== title;
+    // If there's no title, we just need to disable potentially-enabled
+    // stylesheets via document.styleSheets, so no need to deal with links
+    // there.
+    //
+    // We don't want to enable <link rel="stylesheet" disabled> without title
+    // that were not enabled before.
+    if (title) {
+      for (let link of links) {
+        if (link.title == title && link.disabled) {
+          link.disabled = false;
         }
-      } else if (docStyleSheet.disabled) {
-        docStyleSheet.disabled = false;
       }
     }
   }
 
   /**
-   * Filter the stylesheets that actually apply to this webpage.
-   * @param styleSheets The list of stylesheets from the document.
-   * @param content     The window object that the webpage lives in.
+   * Get the stylesheets that have a title (and thus can be switched) in this
+   * webpage.
+   *
+   * @param content     The window object for the page.
    */
-  _filterStyleSheets(styleSheets, content) {
+  _collectStyleSheets(content) {
     let result = [];
+    let document = content.document;
 
-    // Only stylesheets with a title can act as an alternative stylesheet.
-    for (let currentStyleSheet of styleSheets) {
-      if (!currentStyleSheet.title) {
+    for (let sheet of document.styleSheets) {
+      let title = sheet.title;
+      if (!title) {
+        // Sheets without a title are not alternates.
         continue;
       }
 
       // Skip any stylesheets that don't match the screen media type.
-      if (currentStyleSheet.media.length) {
-        let mediaQueryList = currentStyleSheet.media.mediaText;
-        if (!content.matchMedia(mediaQueryList).matches) {
-          continue;
-        }
+      let media = sheet.media.mediaText;
+      if (media && !content.matchMedia(media).matches) {
+        continue;
       }
 
-      let URI;
-      try {
-        if (
-          !currentStyleSheet.ownerNode ||
-          // Special-case style nodes, which have no href.
-          currentStyleSheet.ownerNode.nodeName.toLowerCase() != "style"
-        ) {
-          URI = Services.io.newURI(currentStyleSheet.href);
-        }
-      } catch (e) {
-        if (e.result != Cr.NS_ERROR_MALFORMED_URI) {
-          throw e;
-        }
+      // We skip links here, see below.
+      if (
+        sheet.href &&
+        sheet.ownerNode &&
+        sheet.ownerNode.nodeName.toLowerCase() == "link"
+      ) {
         continue;
       }
 
-      // We won't send data URIs all of the way up to the parent, as these
-      // can be arbitrarily large.
-      let sentURI = !URI || URI.scheme == "data" ? null : URI.spec;
-
-      result.push({
-        title: currentStyleSheet.title,
-        disabled: currentStyleSheet.disabled,
-        href: sentURI,
-      });
+      let disabled = sheet.disabled;
+      result.push({ title, disabled });
+    }
+
+    // This is tricky, because we can't just rely on document.styleSheets, as
+    // `<link disabled>` makes the sheet don't appear there at all.
+    for (let link of this._collectLinks(document)) {
+      let title = link.title;
+      if (!title) {
+        continue;
+      }
+
+      let media = link.media;
+      if (media && !content.matchMedia(media).matches) {
+        continue;
+      }
+
+      let disabled =
+        link.disabled ||
+        !!link.sheet?.disabled ||
+        document.preferredStyleSheetSet != title;
+      result.push({ title, disabled });
     }
 
     return result;
diff -Nru firefox-84.0.2+build1/browser/actors/PluginChild.jsm firefox-85.0+build1/browser/actors/PluginChild.jsm
--- firefox-84.0.2+build1/browser/actors/PluginChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/PluginChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -276,6 +276,11 @@
       overlay.removeAttribute("notext");
     }
 
+    if (fallbackType == Ci.nsIObjectLoadingContent.PLUGIN_BLOCK_ALL) {
+      overlay.setAttribute("blockall", "blockall");
+      return OVERLAY_DISPLAY.HIDDEN;
+    }
+
     // The hit test below only works with correct layout information,
     // don't do it if layout needs flush.
     // We also don't want to access scrollWidth/scrollHeight if
@@ -384,6 +389,8 @@
         return "PluginVulnerableUpdatable";
       case Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_NO_UPDATE:
         return "PluginVulnerableNoUpdate";
+      case Ci.nsIObjectLoadingContent.PLUGIN_BLOCK_ALL:
+        return "PluginBlockAll";
       default:
         // Not all states map to a handler
         return null;
@@ -475,6 +482,7 @@
         this.onPluginCrashed(pluginElement, event);
         break;
 
+      case "PluginBlockAll":
       case "PluginNotFound": {
         /* NOP */
         break;
@@ -717,6 +725,7 @@
       event.originalTarget.getAttribute("anonid") != "closeIcon" &&
       event.originalTarget.id != "closeIcon" &&
       !overlay.hasAttribute("dismissed") &&
+      !overlay.hasAttribute("blockall") &&
       event.button == 0 &&
       event.isTrusted
     ) {
diff -Nru firefox-84.0.2+build1/browser/actors/SearchSERPTelemetryChild.jsm firefox-85.0+build1/browser/actors/SearchSERPTelemetryChild.jsm
--- firefox-84.0.2+build1/browser/actors/SearchSERPTelemetryChild.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/actors/SearchSERPTelemetryChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,197 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+var EXPORTED_SYMBOLS = ["SearchSERPTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  clearTimeout: "resource://gre/modules/Timer.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+  setTimeout: "resource://gre/modules/Timer.jsm",
+});
+
+const SHARED_DATA_KEY = "SearchTelemetry:ProviderInfo";
+const ADLINK_CHECK_TIMEOUT_MS = 1000;
+
+/**
+ * SearchProviders looks after keeping track of the search provider information
+ * received from the main process.
+ *
+ * It is separate to SearchTelemetryChild so that it is not constructed for each
+ * tab, but once per process.
+ */
+class SearchProviders {
+  constructor() {
+    this._searchProviderInfo = null;
+    Services.cpmm.sharedData.addEventListener("change", this);
+  }
+
+  /**
+   * Gets the search provider information for any provider with advert information.
+   * If there is nothing in the cache, it will obtain it from shared data.
+   *
+   * @returns {object} Returns the search provider information. @see SearchTelemetry.jsm
+   */
+  get info() {
+    if (this._searchProviderInfo) {
+      return this._searchProviderInfo;
+    }
+
+    this._searchProviderInfo = Services.cpmm.sharedData.get(SHARED_DATA_KEY);
+
+    if (!this._searchProviderInfo) {
+      return null;
+    }
+
+    // Filter-out non-ad providers so that we're not trying to match against
+    // those unnecessarily.
+    this._searchProviderInfo = this._searchProviderInfo
+      .filter(p => "extraAdServersRegexps" in p)
+      .map(p => {
+        return {
+          ...p,
+          searchPageRegexp: new RegExp(p.searchPageRegexp),
+          extraAdServersRegexps: p.extraAdServersRegexps.map(
+            r => new RegExp(r)
+          ),
+        };
+      });
+
+    return this._searchProviderInfo;
+  }
+
+  /**
+   * Handles events received from sharedData notifications.
+   *
+   * @param {object} event The event details.
+   */
+  handleEvent(event) {
+    switch (event.type) {
+      case "change": {
+        if (event.changedKeys.includes(SHARED_DATA_KEY)) {
+          // Just null out the provider information for now, we'll fetch it next
+          // time we need it.
+          this._searchProviderInfo = null;
+        }
+        break;
+      }
+    }
+  }
+}
+
+const searchProviders = new SearchProviders();
+
+/**
+ * SearchTelemetryChild monitors for pages that are partner searches, and
+ * looks through them to find links which looks like adverts and sends back
+ * a notification to SearchTelemetry for possible telemetry reporting.
+ *
+ * Only the partner details and the fact that at least one ad was found on the
+ * page are returned to SearchTelemetry. If no ads are found, no notification is
+ * given.
+ */
+class SearchSERPTelemetryChild extends JSWindowActorChild {
+  /**
+   * Determines if there is a provider that matches the supplied URL and returns
+   * the information associated with that provider.
+   *
+   * @param {string} url The url to check
+   * @returns {array|null} Returns null if there's no match, otherwise an array
+   *   of provider name and the provider information.
+   */
+  _getProviderInfoForUrl(url) {
+    return searchProviders.info?.find(info => info.searchPageRegexp.test(url));
+  }
+
+  /**
+   * Checks to see if the page is a partner and has an ad link within it. If so,
+   * it will notify SearchTelemetry.
+   */
+  _checkForAdLink() {
+    try {
+      if (!this.contentWindow) {
+        return;
+      }
+    } catch (ex) {
+      // unload occurred before the timer expired
+      return;
+    }
+
+    let doc = this.document;
+    let url = doc.documentURI;
+    let providerInfo = this._getProviderInfoForUrl(url);
+    if (!providerInfo) {
+      return;
+    }
+
+    let regexps = providerInfo.extraAdServersRegexps;
+    let anchors = doc.getElementsByTagName("a");
+    let hasAds = false;
+    for (let anchor of anchors) {
+      if (!anchor.href) {
+        continue;
+      }
+      for (let regexp of regexps) {
+        if (regexp.test(anchor.href)) {
+          hasAds = true;
+          break;
+        }
+      }
+      if (hasAds) {
+        break;
+      }
+    }
+    if (hasAds) {
+      this.sendAsyncMessage("SearchTelemetry:PageInfo", {
+        hasAds: true,
+        url,
+      });
+    }
+  }
+
+  /**
+   * Handles events received from the actor child notifications.
+   *
+   * @param {object} event The event details.
+   */
+  handleEvent(event) {
+    const cancelCheck = () => {
+      if (this._waitForContentTimeout) {
+        clearTimeout(this._waitForContentTimeout);
+      }
+    };
+
+    const check = () => {
+      cancelCheck();
+      this._waitForContentTimeout = setTimeout(() => {
+        this._checkForAdLink();
+      }, ADLINK_CHECK_TIMEOUT_MS);
+    };
+
+    switch (event.type) {
+      case "pageshow": {
+        // If a page is loaded from the bfcache, we won't get a "DOMContentLoaded"
+        // event, so we need to rely on "pageshow" in this case. Note: we do this
+        // so that we remain consistent with the *.in-content:sap* count for the
+        // SEARCH_COUNTS histogram.
+        if (event.persisted) {
+          check();
+        }
+        break;
+      }
+      case "DOMContentLoaded": {
+        check();
+        break;
+      }
+      case "unload": {
+        cancelCheck();
+        break;
+      }
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/actors/SearchSERPTelemetryParent.jsm firefox-85.0+build1/browser/actors/SearchSERPTelemetryParent.jsm
--- firefox-84.0.2+build1/browser/actors/SearchSERPTelemetryParent.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/actors/SearchSERPTelemetryParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+var EXPORTED_SYMBOLS = ["SearchSERPTelemetryParent"];
+
+ChromeUtils.defineModuleGetter(
+  this,
+  "SearchSERPTelemetry",
+  "resource:///modules/SearchSERPTelemetry.jsm"
+);
+
+class SearchSERPTelemetryParent extends JSWindowActorParent {
+  receiveMessage(msg) {
+    if (msg.name == "SearchTelemetry:PageInfo") {
+      SearchSERPTelemetry.reportPageWithAds(msg.data);
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/actors/SearchTelemetryChild.jsm firefox-85.0+build1/browser/actors/SearchTelemetryChild.jsm
--- firefox-84.0.2+build1/browser/actors/SearchTelemetryChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/SearchTelemetryChild.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-var EXPORTED_SYMBOLS = ["SearchTelemetryChild", "ADLINK_CHECK_TIMEOUT_MS"];
-
-const { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  clearTimeout: "resource://gre/modules/Timer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
-  setTimeout: "resource://gre/modules/Timer.jsm",
-});
-
-const SHARED_DATA_KEY = "SearchTelemetry:ProviderInfo";
-const ADLINK_CHECK_TIMEOUT_MS = 1000;
-
-/**
- * SearchProviders looks after keeping track of the search provider information
- * received from the main process.
- *
- * It is separate to SearchTelemetryChild so that it is not constructed for each
- * tab, but once per process.
- */
-class SearchProviders {
-  constructor() {
-    this._searchProviderInfo = null;
-    Services.cpmm.sharedData.addEventListener("change", this);
-  }
-
-  /**
-   * Gets the search provider information for any provider with advert information.
-   * If there is nothing in the cache, it will obtain it from shared data.
-   *
-   * @returns {object} Returns the search provider information. @see SearchTelemetry.jsm
-   */
-  get info() {
-    if (this._searchProviderInfo) {
-      return this._searchProviderInfo;
-    }
-
-    this._searchProviderInfo = Services.cpmm.sharedData.get(SHARED_DATA_KEY);
-
-    if (!this._searchProviderInfo) {
-      return null;
-    }
-
-    // Filter-out non-ad providers so that we're not trying to match against
-    // those unnecessarily.
-    this._searchProviderInfo = this._searchProviderInfo
-      .filter(p => "extraAdServersRegexps" in p)
-      .map(p => {
-        return {
-          ...p,
-          searchPageRegexp: new RegExp(p.searchPageRegexp),
-          extraAdServersRegexps: p.extraAdServersRegexps.map(
-            r => new RegExp(r)
-          ),
-        };
-      });
-
-    return this._searchProviderInfo;
-  }
-
-  /**
-   * Handles events received from sharedData notifications.
-   *
-   * @param {object} event The event details.
-   */
-  handleEvent(event) {
-    switch (event.type) {
-      case "change": {
-        if (event.changedKeys.includes(SHARED_DATA_KEY)) {
-          // Just null out the provider information for now, we'll fetch it next
-          // time we need it.
-          this._searchProviderInfo = null;
-        }
-        break;
-      }
-    }
-  }
-}
-
-const searchProviders = new SearchProviders();
-
-/**
- * SearchTelemetryChild monitors for pages that are partner searches, and
- * looks through them to find links which looks like adverts and sends back
- * a notification to SearchTelemetry for possible telemetry reporting.
- *
- * Only the partner details and the fact that at least one ad was found on the
- * page are returned to SearchTelemetry. If no ads are found, no notification is
- * given.
- */
-class SearchTelemetryChild extends JSWindowActorChild {
-  /**
-   * Determines if there is a provider that matches the supplied URL and returns
-   * the information associated with that provider.
-   *
-   * @param {string} url The url to check
-   * @returns {array|null} Returns null if there's no match, otherwise an array
-   *   of provider name and the provider information.
-   */
-  _getProviderInfoForUrl(url) {
-    return searchProviders.info?.find(info => info.searchPageRegexp.test(url));
-  }
-
-  /**
-   * Checks to see if the page is a partner and has an ad link within it. If so,
-   * it will notify SearchTelemetry.
-   */
-  _checkForAdLink() {
-    try {
-      if (!this.contentWindow) {
-        return;
-      }
-    } catch (ex) {
-      // unload occurred before the timer expired
-      return;
-    }
-
-    let doc = this.document;
-    let url = doc.documentURI;
-    let providerInfo = this._getProviderInfoForUrl(url);
-    if (!providerInfo) {
-      return;
-    }
-
-    let regexps = providerInfo.extraAdServersRegexps;
-    let anchors = doc.getElementsByTagName("a");
-    let hasAds = false;
-    for (let anchor of anchors) {
-      if (!anchor.href) {
-        continue;
-      }
-      for (let regexp of regexps) {
-        if (regexp.test(anchor.href)) {
-          hasAds = true;
-          break;
-        }
-      }
-      if (hasAds) {
-        break;
-      }
-    }
-    if (hasAds) {
-      this.sendAsyncMessage("SearchTelemetry:PageInfo", {
-        hasAds: true,
-        url,
-      });
-    }
-  }
-
-  /**
-   * Handles events received from the actor child notifications.
-   *
-   * @param {object} event The event details.
-   */
-  handleEvent(event) {
-    const cancelCheck = () => {
-      if (this._waitForContentTimeout) {
-        clearTimeout(this._waitForContentTimeout);
-      }
-    };
-
-    const check = () => {
-      cancelCheck();
-      this._waitForContentTimeout = setTimeout(() => {
-        this._checkForAdLink();
-      }, ADLINK_CHECK_TIMEOUT_MS);
-    };
-
-    switch (event.type) {
-      case "pageshow": {
-        // If a page is loaded from the bfcache, we won't get a "DOMContentLoaded"
-        // event, so we need to rely on "pageshow" in this case. Note: we do this
-        // so that we remain consistent with the *.in-content:sap* count for the
-        // SEARCH_COUNTS histogram.
-        if (event.persisted) {
-          check();
-        }
-        break;
-      }
-      case "DOMContentLoaded": {
-        check();
-        break;
-      }
-      case "unload": {
-        cancelCheck();
-        break;
-      }
-    }
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/actors/SearchTelemetryParent.jsm firefox-85.0+build1/browser/actors/SearchTelemetryParent.jsm
--- firefox-84.0.2+build1/browser/actors/SearchTelemetryParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/SearchTelemetryParent.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-
-var EXPORTED_SYMBOLS = ["SearchTelemetryParent"];
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "SearchTelemetry",
-  "resource:///modules/SearchTelemetry.jsm"
-);
-
-class SearchTelemetryParent extends JSWindowActorParent {
-  receiveMessage(msg) {
-    if (msg.name == "SearchTelemetry:PageInfo") {
-      SearchTelemetry.reportPageWithAds(msg.data);
-    }
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/actors/WebRTCParent.jsm firefox-85.0+build1/browser/actors/WebRTCParent.jsm
--- firefox-84.0.2+build1/browser/actors/WebRTCParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/actors/WebRTCParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -45,6 +45,14 @@
   "nsIOSPermissionRequest"
 );
 
+// Keep in sync with defines at base_capturer_pipewire.cc
+// With PipeWire we can't select which system resource is shared so
+// we don't create a window/screen list. Instead we place these constants
+// as window name/id so frontend code can identify PipeWire backend
+// and does not try to create screen/window preview.
+const PIPEWIRE_PORTAL_NAME = "####_PIPEWIRE_PORTAL_####";
+const PIPEWIRE_ID = 0xaffffff;
+
 class WebRTCParent extends JSWindowActorParent {
   didDestroy() {
     webrtcUI.forgetStreamsFromBrowserContext(this.browsingContext);
@@ -753,6 +761,8 @@
         );
         menupopup.appendChild(doc.createXULElement("menuseparator"));
 
+        let isPipeWire = false;
+
         // Build the list of 'devices'.
         let monitorIndex = 1;
         for (let i = 0; i < devices.length; ++i) {
@@ -774,6 +784,24 @@
             }
           } else {
             name = device.name;
+            // When we share content by PipeWire add only one item to the device
+            // list. When it's selected PipeWire portal dialog is opened and
+            // user confirms actual window/screen sharing there.
+            // Don't mark it as scary as there's an extra confirmation step by
+            // PipeWire portal dialog.
+            if (name == PIPEWIRE_PORTAL_NAME && device.id == PIPEWIRE_ID) {
+              isPipeWire = true;
+              let sawcStringId = "getUserMedia.sharePipeWirePortal.label";
+              let item = addDeviceToList(
+                menupopup,
+                stringBundle.getString(sawcStringId),
+                i,
+                type
+              );
+              item.deviceId = device.id;
+              item.mediaSource = type;
+              break;
+            }
             if (type == "application") {
               // The application names returned by the platform are of the form:
               // <window count>\x1e<application name>
@@ -888,39 +916,41 @@
             perms.EXPIRE_SESSION
           );
 
-          video.deviceId = deviceId;
-          let constraints = {
-            video: { mediaSource: type, deviceId: { exact: deviceId } },
-          };
-          chromeWin.navigator.mediaDevices.getUserMedia(constraints).then(
-            stream => {
-              if (video.deviceId != deviceId) {
-                // The user has selected a different device or closed the panel
-                // before getUserMedia finished.
-                stream.getTracks().forEach(t => t.stop());
-                return;
-              }
-              video.srcObject = stream;
-              video.stream = stream;
-              doc.getElementById("webRTC-preview").hidden = false;
-              video.onloadedmetadata = function(e) {
-                video.play();
-              };
-            },
-            err => {
-              if (
-                err.name == "OverconstrainedError" &&
-                err.constraint == "deviceId"
-              ) {
-                // Window has disappeared since enumeration, which can happen.
-                // No preview for you.
-                return;
+          if (!isPipeWire) {
+            video.deviceId = deviceId;
+            let constraints = {
+              video: { mediaSource: type, deviceId: { exact: deviceId } },
+            };
+            chromeWin.navigator.mediaDevices.getUserMedia(constraints).then(
+              stream => {
+                if (video.deviceId != deviceId) {
+                  // The user has selected a different device or closed the panel
+                  // before getUserMedia finished.
+                  stream.getTracks().forEach(t => t.stop());
+                  return;
+                }
+                video.srcObject = stream;
+                video.stream = stream;
+                doc.getElementById("webRTC-preview").hidden = false;
+                video.onloadedmetadata = function(e) {
+                  video.play();
+                };
+              },
+              err => {
+                if (
+                  err.name == "OverconstrainedError" &&
+                  err.constraint == "deviceId"
+                ) {
+                  // Window has disappeared since enumeration, which can happen.
+                  // No preview for you.
+                  return;
+                }
+                Cu.reportError(
+                  `error in preview: ${err.message} ${err.constraint}`
+                );
               }
-              Cu.reportError(
-                `error in preview: ${err.message} ${err.constraint}`
-              );
-            }
-          );
+            );
+          }
         };
         menupopup.addEventListener("command", menupopup._commandEventListener);
       }
diff -Nru firefox-84.0.2+build1/browser/app/nsBrowserApp.cpp firefox-85.0+build1/browser/app/nsBrowserApp.cpp
--- firefox-84.0.2+build1/browser/app/nsBrowserApp.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/nsBrowserApp.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -6,6 +6,7 @@
 #include "nsXULAppAPI.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/XREAppData.h"
+#include "XREShellData.h"
 #include "application.ini.h"
 #include "mozilla/Bootstrap.h"
 #if defined(XP_WIN)
diff -Nru firefox-84.0.2+build1/browser/app/profile/firefox.js firefox-85.0+build1/browser/app/profile/firefox.js
--- firefox-84.0.2+build1/browser/app/profile/firefox.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/profile/firefox.js	2021-01-18 19:58:08.000000000 +0000
@@ -330,6 +330,7 @@
 pref("browser.urlbar.suggest.openpage",             true);
 pref("browser.urlbar.suggest.searches",             true);
 pref("browser.urlbar.suggest.topsites",             true);
+pref("browser.urlbar.suggest.engines",              true);
 
 // As a user privacy measure, don't fetch search suggestions if a pasted string
 // is longer than this.
@@ -368,7 +369,9 @@
 
 // Whether the urlbar displays one-offs to filter searches to history,
 // bookmarks, or tabs.
-pref("browser.urlbar.update2.localOneOffs", true);
+pref("browser.urlbar.shortcuts.bookmarks", true);
+pref("browser.urlbar.shortcuts.tabs", true);
+pref("browser.urlbar.shortcuts.history", true);
 
 // Whether the urlbar one-offs act as search filters instead of executing a
 // search immediately.
@@ -379,18 +382,25 @@
 // search mode is active.
 pref("browser.urlbar.update2.restyleBrowsingHistoryAsSearch", true);
 
-// Whether we display a tab-to-complete result when the user types an engine
-// name.
-pref("browser.urlbar.update2.tabToComplete", true);
-
 pref("browser.urlbar.eventTelemetry.enabled", false);
 
+// When we send events to Urlbar extensions, we wait this amount of time in
+// milliseconds for them to respond before timing out.
+pref("browser.urlbar.extension.timeout", 400);
+
 // Controls when to DNS resolve single word search strings, after they were
 // searched for. If the string is resolved as a valid host, show a
 // "Did you mean to go to 'host'" prompt.
 // 0 - never resolve; 1 - use heuristics (default); 2 - always resolve
 pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 1);
 
+// Whether IME composition should close the results panel.
+// The default value is true because some IME open a picker panel, and we end
+// up with two panels on top of each other. Since for now we can't detect that
+// we leave this choice to the user, hopefully in the future this can be flipped
+// for everyone.
+pref("browser.urlbar.imeCompositionClosesPanel", true);
+
 pref("browser.altClickSave", false);
 
 // Enable logging downloads operations to the Console.
@@ -574,6 +584,12 @@
 // browser.tabs.remote.separatedMozillaDomains).
 pref("browser.tabs.remote.separatePrivilegedMozillaWebContentProcess", true);
 
+#ifdef NIGHTLY_BUILD
+pref("browser.tabs.tooltipsShowPid", true);
+#else
+pref("browser.tabs.tooltipsShowPid", false);
+#endif
+
 // allow_eval_* is enabled on Firefox Desktop only at this
 // point in time
 pref("security.allow_eval_with_system_principal", false);
@@ -823,6 +839,8 @@
 
 pref("browser.preferences.exposeHTTPSOnly", true);
 
+pref("browser.proton.enabled", false);
+
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);
 
@@ -1271,6 +1289,7 @@
 pref("services.sync.prefs.sync.browser.urlbar.suggest.openpage", true);
 pref("services.sync.prefs.sync.browser.urlbar.suggest.searches", true);
 pref("services.sync.prefs.sync.browser.urlbar.suggest.topsites", true);
+pref("services.sync.prefs.sync.browser.urlbar.suggest.engines", true);
 pref("services.sync.prefs.sync.dom.disable_open_during_load", true);
 pref("services.sync.prefs.sync.dom.disable_window_flip", true);
 pref("services.sync.prefs.sync.dom.disable_window_move_resize", true);
@@ -1361,6 +1380,13 @@
 // Activates preloading of the new tab url.
 pref("browser.newtab.preload", true);
 
+// Preference to enable the entire new newtab experience at once.
+pref("browser.newtabpage.activity-stream.newNewtabExperience.enabled", false);
+
+// A preference which allows us to enable the fly out customization overlay
+// on the newtab page.
+pref("browser.newtabpage.activity-stream.customizationMenu.enabled", false);
+
 // Activity Stream prefs that control to which page to redirect
 #ifndef RELEASE_OR_BETA
   pref("browser.newtabpage.activity-stream.debug", false);
@@ -1384,6 +1410,10 @@
 pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":true,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}");
 pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"whats-new-panel\",\"moments-page\",\"snippets\",\"cfr-fxa\",\"aboutwelcome\"],\"updateCycleInMs\":3600000}");
 
+// ASRouter user prefs
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", true);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", true);
+
 // The pref that controls if ASRouter uses the remote fluent files.
 // It's enabled by default, but could be disabled to force ASRouter to use the local files.
 pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", true);
@@ -1411,7 +1441,7 @@
 
 // Allows Pocket story collections to be dismissed.
 pref("browser.newtabpage.activity-stream.discoverystream.isCollectionDismissible", true);
-pref("browser.newtabpage.activity-stream.discoverystream.personalization.version", 1);
+pref("browser.newtabpage.activity-stream.discoverystream.personalization.version", 2);
 // Configurable keys used by personalization version 2.
 pref("browser.newtabpage.activity-stream.discoverystream.personalization.modelKeys", "nb_model_arts_and_entertainment, nb_model_autos_and_vehicles, nb_model_beauty_and_fitness, nb_model_blogging_resources_and_services, nb_model_books_and_literature, nb_model_business_and_industrial, nb_model_computers_and_electronics, nb_model_finance, nb_model_food_and_drink, nb_model_games, nb_model_health, nb_model_hobbies_and_leisure, nb_model_home_and_garden, nb_model_internet_and_telecom, nb_model_jobs_and_education, nb_model_law_and_government, nb_model_online_communities, nb_model_people_and_society, nb_model_pets_and_animals, nb_model_real_estate, nb_model_reference, nb_model_science, nb_model_shopping, nb_model_sports, nb_model_travel");
 // System pref to allow Pocket stories personalization to be turned on/off.
@@ -1448,6 +1478,7 @@
 // See Console.jsm LOG_LEVELS for all possible values
 pref("messaging-system.log", "warn");
 pref("messaging-system.rsexperimentloader.enabled", true);
+pref("messaging-system.rsexperimentloader.collection_id", "nimbus-desktop-experiments");
 
 // Enable the DOM fullscreen API.
 pref("full-screen-api.enabled", true);
@@ -1703,9 +1734,9 @@
 // One value from each section must be included in the browser.contentblocking.features.strict pref.
 #ifdef NIGHTLY_BUILD
 // Enable Dynamic First-Party Isolation in Nightly.
-pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior5,cm,fp,stp");
+pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior5,cm,fp,stp,lvl2");
 #else
-pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior4,cm,fp,stp");
+pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior4,cm,fp,stp,lvl2");
 #endif
 
 // Hide the "Change Block List" link for trackers/tracking content in the custom
@@ -2047,6 +2078,10 @@
 pref("browser.discovery.sites", "addons.mozilla.org");
 
 pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds)
+pref("browser.engagement.downloads-button.has-used", false);
+pref("browser.engagement.fxa-toolbar-menu-button.has-used", false);
+pref("browser.engagement.home-button.has-used", false);
+pref("browser.engagement.sidebar-button.has-used", false);
 
 pref("browser.aboutConfig.showWarning", true);
 
@@ -2057,14 +2092,15 @@
 // "always": Always show
 // "never": Never show
 pref("browser.toolbars.bookmarks.visibility", "newtab");
+
+// Visibility of the "Show Other Bookmarks" menuitem in the
+// bookmarks toolbar contextmenu.
+pref("browser.toolbars.bookmarks.showOtherBookmarks", true);
+
 // When true, this pref will always show the bookmarks bar on
-// the New Tab Page, allowing showing/hiding via keyboard shortcut,
-// and other functionality to improve the usage of the Bookmarks Toolbar.
-#ifdef EARLY_BETA_OR_EARLIER
+// the New Tab Page, and other functionality to improve the usage of the
+// Bookmarks Toolbar.
 pref("browser.toolbars.bookmarks.2h2020", true);
-#else
-pref("browser.toolbars.bookmarks.2h2020", false);
-#endif
 
 // Prefs to control the Firefox Account toolbar menu.
 // This pref will surface existing Firefox Account information
diff -Nru firefox-84.0.2+build1/browser/app/winlauncher/DllBlocklistInit.cpp firefox-85.0+build1/browser/app/winlauncher/DllBlocklistInit.cpp
--- firefox-84.0.2+build1/browser/app/winlauncher/DllBlocklistInit.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/winlauncher/DllBlocklistInit.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/BinarySearch.h"
 #include "mozilla/ImportDir.h"
 #include "mozilla/NativeNt.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Types.h"
 #include "mozilla/WindowsDllBlocklist.h"
 #include "mozilla/WinHeaderOnlyUtils.h"
diff -Nru firefox-84.0.2+build1/browser/app/winlauncher/freestanding/CheckForCaller.h firefox-85.0+build1/browser/app/winlauncher/freestanding/CheckForCaller.h
--- firefox-84.0.2+build1/browser/app/winlauncher/freestanding/CheckForCaller.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/app/winlauncher/freestanding/CheckForCaller.h	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,36 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_freestanding_CheckForCaller_h
+#define mozilla_freestanding_CheckForCaller_h
+
+namespace mozilla {
+
+#if defined(_MSC_VER)
+#  include <intrin.h>
+#  pragma intrinsic(_ReturnAddress)
+#  define RETURN_ADDRESS() _ReturnAddress()
+#elif defined(__GNUC__) || defined(__clang__)
+#  define RETURN_ADDRESS() \
+    __builtin_extract_return_addr(__builtin_return_address(0))
+#endif
+
+template <int N>
+bool CheckForAddress(void* aReturnAddress, const wchar_t (&aName)[N]) {
+  HMODULE callingModule;
+  if (!::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                                GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                            reinterpret_cast<LPCWSTR>(aReturnAddress),
+                            &callingModule)) {
+    return false;
+  }
+
+  return callingModule && callingModule == ::GetModuleHandleW(aName);
+}
+
+}  // namespace mozilla
+
+#endif  // mozilla_freestanding_CheckForCaller_h
diff -Nru firefox-84.0.2+build1/browser/app/winlauncher/freestanding/SharedSection.cpp firefox-85.0+build1/browser/app/winlauncher/freestanding/SharedSection.cpp
--- firefox-84.0.2+build1/browser/app/winlauncher/freestanding/SharedSection.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/winlauncher/freestanding/SharedSection.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "SharedSection.h"
 
+#include "CheckForCaller.h"
+
 namespace mozilla {
 namespace freestanding {
 
@@ -226,6 +228,12 @@
   // We enable pre-spawn CIG only in Nightly for now because it caused
   // a compat issue (bug 1682304).
 #if defined(NIGHTLY_BUILD)
+  const bool isCallerXul = CheckForAddress(RETURN_ADDRESS(), L"xul.dll");
+  MOZ_ASSERT(isCallerXul);
+  if (!isCallerXul) {
+    return 0;
+  }
+
   LauncherResult<SharedSection::Layout*> resultView = gSharedSection.GetView();
   if (resultView.isErr()) {
     return 0;
diff -Nru firefox-84.0.2+build1/browser/app/winlauncher/NtLoaderAPI.cpp firefox-85.0+build1/browser/app/winlauncher/NtLoaderAPI.cpp
--- firefox-84.0.2+build1/browser/app/winlauncher/NtLoaderAPI.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/winlauncher/NtLoaderAPI.cpp	2021-01-18 19:58:07.000000000 +0000
@@ -6,34 +6,15 @@
 
 #include "mozilla/LoaderAPIInterfaces.h"
 
+#include "freestanding/CheckForCaller.h"
 #include "freestanding/LoaderPrivateAPI.h"
 
-#if defined(_MSC_VER)
-#  include <intrin.h>
-#  pragma intrinsic(_ReturnAddress)
-#  define RETURN_ADDRESS() _ReturnAddress()
-#elif defined(__GNUC__) || defined(__clang__)
-#  define RETURN_ADDRESS() \
-    __builtin_extract_return_addr(__builtin_return_address(0))
-#endif
-
-static bool CheckForMozglue(void* aReturnAddress) {
-  HMODULE callingModule;
-  if (!::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
-                                GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-                            reinterpret_cast<LPCWSTR>(aReturnAddress),
-                            &callingModule)) {
-    return false;
-  }
-
-  return callingModule && callingModule == ::GetModuleHandleW(L"mozglue.dll");
-}
-
 namespace mozilla {
 
 extern "C" MOZ_EXPORT nt::LoaderAPI* GetNtLoaderAPI(
     nt::LoaderObserver* aNewObserver) {
-  const bool isCallerMozglue = CheckForMozglue(RETURN_ADDRESS());
+  const bool isCallerMozglue =
+      CheckForAddress(RETURN_ADDRESS(), L"mozglue.dll");
   MOZ_ASSERT(isCallerMozglue);
   if (!isCallerMozglue) {
     return nullptr;
diff -Nru firefox-84.0.2+build1/browser/app/winlauncher/test/TestCrossProcessWin.cpp firefox-85.0+build1/browser/app/winlauncher/test/TestCrossProcessWin.cpp
--- firefox-84.0.2+build1/browser/app/winlauncher/test/TestCrossProcessWin.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/app/winlauncher/test/TestCrossProcessWin.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -132,6 +132,30 @@
       return 1;
     }
 
+    auto getDependentModulePaths =
+        reinterpret_cast<uint32_t (*)(uint32_t**)>(::GetProcAddress(
+            ::GetModuleHandleW(nullptr), "GetDependentModulePaths"));
+    if (!getDependentModulePaths) {
+      printf(
+          "TEST-FAILED | TestCrossProcessWin | "
+          "Failed to get a pointer to GetDependentModulePaths - %08lx.\n",
+          ::GetLastError());
+      return 1;
+    }
+
+#if !defined(DEBUG)
+    // GetDependentModulePaths does not allow a caller other than xul.dll.
+    // Skip on Debug build because it hits MOZ_ASSERT.
+    uint32_t* modulePathArray;
+    if (getDependentModulePaths(&modulePathArray) || modulePathArray) {
+      printf(
+          "TEST-FAILED | TestCrossProcessWin | "
+          "GetDependentModulePaths should return zero if the caller is "
+          "not xul.dll.\n");
+      return 1;
+    }
+#endif  // !defined(DEBUG)
+
     if (!VerifySharedSection(gSharedSection)) {
       return 1;
     }
diff -Nru firefox-84.0.2+build1/browser/base/content/aboutDialog.js firefox-85.0+build1/browser/base/content/aboutDialog.js
--- firefox-84.0.2+build1/browser/base/content/aboutDialog.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/aboutDialog.js	2021-01-18 19:58:07.000000000 +0000
@@ -72,10 +72,12 @@
 
   // Show a release notes link if we have a URL.
   let relNotesLink = document.getElementById("releasenotes");
-  let relNotesPrefType = Services.prefs.getPrefType("app.releaseNotesURL");
+  let relNotesPrefType = Services.prefs.getPrefType(
+    "app.releaseNotesURL.aboutDialog"
+  );
   if (relNotesPrefType != Services.prefs.PREF_INVALID) {
     let relNotesURL = Services.urlFormatter.formatURLPref(
-      "app.releaseNotesURL"
+      "app.releaseNotesURL.aboutDialog"
     );
     if (relNotesURL != "about:blank") {
       relNotesLink.href = relNotesURL;
diff -Nru firefox-84.0.2+build1/browser/base/content/aboutDialog.xhtml firefox-85.0+build1/browser/base/content/aboutDialog.xhtml
--- firefox-84.0.2+build1/browser/base/content/aboutDialog.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/aboutDialog.xhtml	2021-01-18 19:58:07.000000000 +0000
@@ -128,17 +128,17 @@
           <vbox id="experimental" hidden="true">
             <description class="text-blurb" id="warningDesc" data-l10n-id="warningDesc-version"></description>
             <description class="text-blurb" id="communityExperimentalDesc" data-l10n-id="community-exp">
-              <label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-exp-mozillaLink"></label>
+              <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-exp-mozillaLink"></label>
               <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label>
             </description>
           </vbox>
           <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
-            <label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-mozillaLink"></label>
+            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"></label>
             <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label>
           </description>
           <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
             <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"></label>
-            <label is="text-link" href="http://www.mozilla.org/contribute/" data-l10n-name="helpus-getInvolvedLink"></label>
+            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"></label>
           </description>
         </vbox>
       </vbox>
@@ -147,7 +147,7 @@
       <hbox pack="center">
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label>
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label>
-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label>
+        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"></label>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
     </vbox>
diff -Nru firefox-84.0.2+build1/browser/base/content/browser.css firefox-85.0+build1/browser/base/content/browser.css
--- firefox-84.0.2+build1/browser/base/content/browser.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser.css	2021-01-18 19:58:08.000000000 +0000
@@ -156,7 +156,7 @@
 }
 
 @supports not -moz-bool-pref("browser.tabs.tabmanager.enabled") {
-  #tabbrowser-tabs:not([overflow="true"]):not([hashiddentabs]) ~ #alltabs-button {
+  #tabbrowser-tabs:not([overflow="true"], [hashiddentabs]) ~ #alltabs-button {
     display: none;
   }
   #tabbrowser-tabs:not([overflow="true"])[using-closing-tabs-spacer] ~ #alltabs-button {
@@ -187,7 +187,7 @@
   min-width: calc(var(--tab-min-width) + 10px);
 }
 
-.tabbrowser-tab:not([pinned]):not([fadein]) {
+.tabbrowser-tab:not([pinned], [fadein]) {
   max-width: 0.1px;
   min-width: 0.1px;
   visibility: hidden;
@@ -651,8 +651,8 @@
   }
 }
 
-#urlbar[actionoverride] > #urlbar-input-container > #urlbar-label-box,
-#urlbar:not([actiontype="switchtab"]):not([actiontype="extension"]):not([searchmode]) > #urlbar-input-container > #urlbar-label-box,
+#urlbar[actiontype="switchtab"][actionoverride] > #urlbar-input-container > #urlbar-label-box,
+#urlbar:not([actiontype="switchtab"], [actiontype="extension"], [searchmode]) > #urlbar-input-container > #urlbar-label-box,
 #urlbar:not([actiontype="switchtab"]) > #urlbar-input-container > #urlbar-label-box > #urlbar-label-switchtab,
 #urlbar:not([actiontype="extension"]) > #urlbar-input-container > #urlbar-label-box > #urlbar-label-extension,
 #urlbar[searchmode][breakout-extend] > #urlbar-input-container > #urlbar-label-box,
@@ -876,8 +876,12 @@
 /*  Full Screen UI */
 
 #fullscr-toggler {
+  top: 0;
+  left: 0;
+  right: 0;
   height: 1px;
-  background: black;
+  position: fixed;
+  z-index: 2147483647;
 }
 
 #fullscreen-and-pointerlock-wrapper {
@@ -1418,6 +1422,19 @@
   font-size: large;
 }
 
+printpreview-pagination {
+  opacity: 0;
+  transition: opacity 100ms 500ms;
+}
+printpreview-pagination:focus-within,
+.previewStack:hover > printpreview-pagination {
+  opacity: 1;
+  transition: opacity 100ms;
+}
+.previewStack[rendering=true] > printpreview-pagination {
+  opacity: 0;
+}
+
 @media (prefers-color-scheme: dark) {
   .previewStack {
     background-color: #2A2A2E;
@@ -1440,7 +1457,7 @@
   }
 }
 
-toolbar[keyNav=true]:not([collapsed=true]):not([customizing=true]) toolbartabstop {
+toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
   -moz-user-focus: normal;
 }
 
diff -Nru firefox-84.0.2+build1/browser/base/content/browser-ctrlTab.js firefox-85.0+build1/browser/base/content/browser-ctrlTab.js
--- firefox-84.0.2+build1/browser/base/content/browser-ctrlTab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser-ctrlTab.js	2021-01-18 19:58:08.000000000 +0000
@@ -383,8 +383,6 @@
       return;
     }
 
-    document.addEventListener("keyup", this, true);
-
     this.canvasWidth = Math.ceil(
       (screen.availWidth * 0.85) / this.maxTabPreviews
     );
@@ -454,8 +452,6 @@
   },
 
   suspendGUI: function ctrlTab_suspendGUI() {
-    document.removeEventListener("keyup", this, true);
-
     for (let preview of this.previews) {
       this.updatePreview(preview, null);
     }
@@ -480,6 +476,8 @@
       return;
     }
 
+    Services.els.addSystemEventListener(document, "keyup", this, false);
+
     let tabs = gBrowser.visibleTabs;
     if (tabs.length > 2) {
       this.open();
@@ -584,8 +582,21 @@
         this.onKeyPress(event);
         break;
       case "keyup":
-        if (event.keyCode == event.DOM_VK_CONTROL) {
-          this.pick();
+        // During cycling tabs, we avoid sending keyup event to content document.
+        event.preventDefault();
+        event.stopPropagation();
+
+        if (event.keyCode === event.DOM_VK_CONTROL) {
+          Services.els.removeSystemEventListener(
+            document,
+            "keyup",
+            this,
+            false
+          );
+
+          if (this.isOpen) {
+            this.pick();
+          }
         }
         break;
       case "popupshowing":
diff -Nru firefox-84.0.2+build1/browser/base/content/browser-fullScreenAndPointerLock.js firefox-85.0+build1/browser/base/content/browser-fullScreenAndPointerLock.js
--- firefox-84.0.2+build1/browser/base/content/browser-fullScreenAndPointerLock.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser-fullScreenAndPointerLock.js	2021-01-18 19:58:08.000000000 +0000
@@ -349,10 +349,6 @@
       this._isPopupOpen = false;
       this.cleanup();
     }
-
-    if (enterFS && !document.fullscreenElement) {
-      Services.telemetry.scalarAdd("fullscreen.used", 1);
-    }
   },
 
   exitDomFullScreen() {
@@ -790,15 +786,6 @@
       !BrowserHandler.kiosk
     ) {
       gNavToolbox.setAttribute("fullscreenShouldAnimate", true);
-      // Hide the fullscreen toggler until the transition ends.
-      let listener = () => {
-        gNavToolbox.removeEventListener("transitionend", listener, true);
-        if (this._isChromeCollapsed) {
-          this._fullScrToggler.hidden = false;
-        }
-      };
-      gNavToolbox.addEventListener("transitionend", listener, true);
-      this._fullScrToggler.hidden = true;
     }
 
     gNavToolbox.style.marginTop =
diff -Nru firefox-84.0.2+build1/browser/base/content/browser.js firefox-85.0+build1/browser/base/content/browser.js
--- firefox-84.0.2+build1/browser/base/content/browser.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser.js	2021-01-18 19:58:07.000000000 +0000
@@ -20,6 +20,7 @@
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AMTelemetry: "resource://gre/modules/AddonManager.jsm",
   NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.jsm",
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
@@ -89,6 +90,7 @@
   WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
   fxAccounts: "resource://gre/modules/FxAccounts.jsm",
   webrtcUI: "resource:///modules/webrtcUI.jsm",
+  WebsiteFilter: "resource:///modules/policies/WebsiteFilter.jsm",
   ZoomUI: "resource:///modules/ZoomUI.jsm",
 });
 
@@ -552,6 +554,16 @@
   false
 );
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "gProton",
+  "browser.proton.enabled",
+  false,
+  (pref, oldValue, newValue) => {
+    document.documentElement.toggleAttribute("proton", newValue);
+  }
+);
+
 customElements.setElementCreationCallback("translation-notification", () => {
   Services.scriptloader.loadSubScript(
     "chrome://browser/content/translation-notification.js",
@@ -1537,32 +1549,31 @@
     throw new Error("Cannot load with mismatched userContextId");
   }
 
-  let {
-    uriObject,
-    requiredRemoteType,
-    mustChangeProcess,
-    newFrameloader,
-  } = E10SUtils.shouldLoadURIInBrowser(
-    browser,
-    uri,
-    gMultiProcessBrowser,
-    gFissionBrowser,
-    loadFlags
-  );
-  if (uriObject && handleUriInChrome(browser, uriObject)) {
-    // If we've handled the URI in Chrome then just return here.
-    return;
-  }
-  if (newFrameloader) {
-    // If a new frameloader is needed for process reselection because this used
-    // to be a preloaded browser, clear the preloaded state now.
-    browser.removeAttribute("preloadedState");
-  }
+  // Attempt to perform URI fixup to see if we can handle this URI in chrome.
+  try {
+    let fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_NONE;
+    if (loadFlags & Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) {
+      fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
+    }
+    if (loadFlags & Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS) {
+      fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS;
+    }
+    if (PrivateBrowsingUtils.isBrowserPrivate(browser)) {
+      fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_PRIVATE_CONTEXT;
+    }
 
-  // !requiredRemoteType means we're loading in the parent/this process.
-  if (!requiredRemoteType) {
-    browser.isNavigating = true;
+    let uriObject = Services.uriFixup.getFixupURIInfo(uri, fixupFlags)
+      .preferredURI;
+    if (uriObject && handleUriInChrome(browser, uriObject)) {
+      // If we've handled the URI in Chrome, then just return here.
+      return;
+    }
+  } catch (e) {
+    // getFixupURIInfo may throw. Gracefully recover and try to load the URI normally.
   }
+
+  // XXX(nika): Is `browser.isNavigating` necessary anymore?
+  browser.isNavigating = true;
   let loadURIOptions = {
     triggeringPrincipal,
     csp,
@@ -1572,96 +1583,9 @@
     hasValidUserGestureActivation,
   };
   try {
-    if (!mustChangeProcess) {
-      browser.webNavigation.loadURI(uri, loadURIOptions);
-    } else {
-      // Check if the current browser is allowed to unload.
-      let { permitUnload } = browser.permitUnload();
-      if (!permitUnload) {
-        return;
-      }
-
-      if (postData) {
-        postData = serializeInputStream(postData);
-      }
-
-      let loadParams = {
-        uri,
-        triggeringPrincipal: triggeringPrincipal
-          ? E10SUtils.serializePrincipal(triggeringPrincipal)
-          : null,
-        flags: loadFlags,
-        referrerInfo: E10SUtils.serializeReferrerInfo(referrerInfo),
-        remoteType: requiredRemoteType,
-        postData,
-        newFrameloader,
-        csp: csp ? gSerializationHelper.serializeToString(csp) : null,
-      };
-
-      if (userContextId) {
-        loadParams.userContextId = userContextId;
-      }
-
-      if (browser.webNavigation.maybeCancelContentJSExecution) {
-        let cancelContentJSEpoch = browser.webNavigation.maybeCancelContentJSExecution(
-          Ci.nsIRemoteTab.NAVIGATE_URL,
-          { uri: uriObject }
-        );
-        loadParams.cancelContentJSEpoch = cancelContentJSEpoch;
-      }
-      LoadInOtherProcess(browser, loadParams);
-    }
-  } catch (e) {
-    // If anything goes wrong when switching remoteness, just switch remoteness
-    // manually and load the URI.
-    // We might lose history that way but at least the browser loaded a page.
-    // This might be necessary if SessionStore wasn't initialized yet i.e.
-    // when the homepage is a non-remote page.
-    if (mustChangeProcess) {
-      Cu.reportError(e);
-      gBrowser.updateBrowserRemotenessByURL(browser, uri);
-
-      browser.webNavigation.loadURI(uri, loadURIOptions);
-    } else {
-      throw e;
-    }
+    browser.webNavigation.loadURI(uri, loadURIOptions);
   } finally {
-    if (!requiredRemoteType) {
-      browser.isNavigating = false;
-    }
-  }
-}
-
-// Starts a new load in the browser first switching the browser to the correct
-// process
-function LoadInOtherProcess(browser, loadOptions, historyIndex = -1) {
-  let tab = gBrowser.getTabForBrowser(browser);
-  SessionStore.navigateAndRestore(tab, loadOptions, historyIndex);
-}
-
-// Called when a docshell has attempted to load a page in an incorrect process.
-// This function is responsible for loading the page in the correct process.
-function RedirectLoad(browser, data) {
-  if (browser.getAttribute("preloadedState") === "consumed") {
-    browser.removeAttribute("preloadedState");
-    data.loadOptions.newFrameloader = true;
-  }
-
-  // We should only start the redirection if the browser window has finished
-  // starting up. Otherwise, we should wait until the startup is done.
-  if (gBrowserInit.delayedStartupFinished) {
-    LoadInOtherProcess(browser, data.loadOptions, data.historyIndex);
-  } else {
-    let delayedStartupFinished = (subject, topic) => {
-      if (topic == "browser-delayed-startup-finished" && subject == window) {
-        Services.obs.removeObserver(delayedStartupFinished, topic);
-        LoadInOtherProcess(browser, data.loadOptions, data.historyIndex);
-      }
-    };
-    Services.obs.addObserver(
-      delayedStartupFinished,
-      "browser-delayed-startup-finished"
-    );
+    browser.isNavigating = false;
   }
 }
 
@@ -1708,6 +1632,16 @@
   },
 
   onBeforeInitialXULLayout() {
+    BookmarkingUI.updateEmptyToolbarMessage();
+    setToolbarVisibility(
+      BookmarkingUI.toolbar,
+      gBookmarksToolbar2h2020
+        ? gBookmarksToolbarVisibility
+        : gBookmarksToolbarVisibility == "always",
+      false,
+      false
+    );
+
     // Set a sane starting width/height for all resolutions on new profiles.
     if (Services.prefs.getBoolPref("privacy.resistFingerprinting")) {
       // When the fingerprinting resistance is enabled, making sure that we don't
@@ -1776,6 +1710,8 @@
       document.documentElement.setAttribute("icon", "main-window");
     }
 
+    document.documentElement.toggleAttribute("proton", gProton);
+
     // Call this after we set attributes that might change toolbars' computed
     // text color.
     ToolbarIconColor.init();
@@ -1803,15 +1739,6 @@
       let node = document.getElementById(area);
       CustomizableUI.registerToolbarNode(node);
     }
-    let bookmarksToolbarVisibility = gBookmarksToolbar2h2020
-      ? gBookmarksToolbarVisibility
-      : gBookmarksToolbarVisibility == "always";
-    setToolbarVisibility(
-      gNavToolbox.querySelector("#PersonalToolbar"),
-      bookmarksToolbarVisibility,
-      false,
-      false
-    );
     BrowserSearch.initPlaceHolder();
 
     // Hack to ensure that the various initial pages favicon is loaded
@@ -2361,6 +2288,10 @@
     }
 
     scheduleIdleTask(() => {
+      PlacesToolbarHelper.startShowingToolbar();
+    });
+
+    scheduleIdleTask(() => {
       // Initialize the Sync UI
       gSync.init();
     });
@@ -2457,11 +2388,11 @@
       //                      a tabbrowser, which will be replaced by this
       //                      window (for this case, all other arguments are
       //                      ignored).
-      if (!window.arguments || !window.arguments[0]) {
+      let uri = window.arguments?.[0];
+      if (!uri || uri instanceof window.XULElement) {
         return null;
       }
 
-      let uri = window.arguments[0];
       let defaultArgs = BrowserHandler.defaultArgs;
 
       // If the given URI is different from the homepage, we want to load it.
@@ -4494,7 +4425,9 @@
       csp
     );
     if (engine) {
-      BrowserSearch.recordSearchInTelemetry(engine, "contextmenu", { url });
+      BrowserSearchTelemetry.recordSearch(gBrowser, engine, "contextmenu", {
+        url,
+      });
     }
   },
 
@@ -4511,7 +4444,7 @@
       csp
     );
     if (engine) {
-      BrowserSearch.recordSearchInTelemetry(engine, "system", { url });
+      BrowserSearchTelemetry.recordSearch(gBrowser, engine, "system", { url });
     }
   },
 
@@ -4530,9 +4463,14 @@
       tab
     );
 
-    BrowserSearch.recordSearchInTelemetry(result.engine, "webextension", {
-      url: result.url,
-    });
+    BrowserSearchTelemetry.recordSearch(
+      gBrowser,
+      result.engine,
+      "webextension",
+      {
+        url: result.url,
+      }
+    );
   },
 
   pasteAndSearch(event) {
@@ -4559,53 +4497,6 @@
     var where = newWindowPref == 3 ? "tab" : "window";
     openTrustedLinkIn(this.searchEnginesURL, where);
   },
-
-  /**
-   * Helper to record a search with Telemetry.
-   *
-   * Telemetry records only search counts and nothing pertaining to the search itself.
-   *
-   * @param engine
-   *        (nsISearchEngine) The engine handling the search.
-   * @param source
-   *        (string) Where the search originated from. See BrowserUsageTelemetry for
-   *        allowed values.
-   * @param details [optional]
-   *        An optional parameter passed to |BrowserUsageTelemetry.recordSearch|.
-   *        See its documentation for allowed options.
-   *        Additionally, if the search was a suggested search, |details.selection|
-   *        indicates where the item was in the suggestion list and how the user
-   *        selected it: {selection: {index: The selected index, kind: "key" or "mouse"}}
-   */
-  recordSearchInTelemetry(engine, source, details = {}) {
-    try {
-      BrowserUsageTelemetry.recordSearch(gBrowser, engine, source, details);
-    } catch (ex) {
-      Cu.reportError(ex);
-    }
-  },
-
-  /**
-   * Helper to record a one-off search with Telemetry.
-   *
-   * Telemetry records only search counts and nothing pertaining to the search itself.
-   *
-   * @param engine
-   *        (nsISearchEngine) The engine handling the search.
-   * @param source
-   *        (string) Where the search originated from. See BrowserUsageTelemetry for
-   *        allowed values.
-   * @param type
-   *        (string) Indicates how the user selected the search item.
-   */
-  recordOneoffSearchInTelemetry(engine, source, type) {
-    try {
-      const details = { type, isOneOff: true };
-      BrowserUsageTelemetry.recordSearch(gBrowser, engine, source, details);
-    } catch (ex) {
-      Cu.reportError(ex);
-    }
-  },
 };
 
 XPCOMUtils.defineConstant(this, "BrowserSearch", BrowserSearch);
@@ -5194,50 +5085,6 @@
     );
   },
 
-  // Check whether this URI should load in the current process
-  shouldLoadURI(
-    aDocShell,
-    aURI,
-    aReferrerInfo,
-    aHasPostData,
-    aTriggeringPrincipal,
-    aCsp
-  ) {
-    if (!gMultiProcessBrowser) {
-      return true;
-    }
-
-    let browser = aDocShell
-      .QueryInterface(Ci.nsIDocShellTreeItem)
-      .sameTypeRootTreeItem.QueryInterface(Ci.nsIDocShell).chromeEventHandler;
-
-    // Ignore loads that aren't in the main tabbrowser
-    if (
-      browser.localName != "browser" ||
-      !browser.getTabBrowser ||
-      browser.getTabBrowser() != gBrowser
-    ) {
-      return true;
-    }
-
-    if (!E10SUtils.shouldLoadURI(aDocShell, aURI, aHasPostData)) {
-      // XXX: Do we want to complain if we have post data but are still
-      // redirecting the load? Perhaps a telemetry probe? Theoretically we
-      // shouldn't do this, as it throws out data. See bug 1348018.
-      E10SUtils.redirectLoad(
-        aDocShell,
-        aURI,
-        aReferrerInfo,
-        aTriggeringPrincipal,
-        null,
-        aCsp
-      );
-      return false;
-    }
-
-    return true;
-  },
-
   onProgressChange(
     aWebProgress,
     aRequest,
@@ -6254,9 +6101,9 @@
         // If we have an opener, that means that the caller is expecting access
         // to the nsIDOMWindow of the opened tab right away. For e10s windows,
         // this means forcing the newly opened browser to be non-remote so that
-        // we can hand back the nsIDOMWindow. The XULBrowserWindow.shouldLoadURI
-        // will do the job of shuttling off the newly opened browser to run in
-        // the right process once it starts loading a URI.
+        // we can hand back the nsIDOMWindow. DocumentLoadListener will do the
+        // job of shuttling off the newly opened browser to run in the right
+        // process once it starts loading a URI.
         let forceNotRemote = aOpenWindowInfo && !aOpenWindowInfo.isRemote;
         let userContextId = aOpenWindowInfo
           ? aOpenWindowInfo.originAttributes.userContextId
@@ -6611,7 +6458,7 @@
         isVisible = false;
         break;
       case "newtab":
-        let { currentURI } = gBrowser;
+        let currentURI = gBrowser?.currentURI;
         if (!gBrowserInit.domContentLoaded) {
           let uriToLoad = gBrowserInit.uriToLoadPromise;
           if (uriToLoad) {
@@ -6624,7 +6471,8 @@
             } catch (ex) {}
           }
         }
-        isVisible = BookmarkingUI.isOnNewTabPage({ currentURI });
+        isVisible =
+          !!currentURI && BookmarkingUI.isOnNewTabPage({ currentURI });
         break;
     }
   }
@@ -7444,31 +7292,6 @@
       sheetData.preferredStyleSheetSet || styleSheets.preferredStyleSheetSet;
   },
 
-  /**
-   * Return an array of Objects representing stylesheets in a
-   * browser. Note that the pageshow event needs to fire in content
-   * before this information will be available.
-   *
-   * @param browser (optional)
-   *        The <xul:browser> to search for stylesheets. If omitted, this
-   *        defaults to the currently selected tab's browser.
-   * @returns Array
-   *        An Array of Objects representing stylesheets in the browser.
-   *        See the documentation for gPageStyleMenu for a description
-   *        of the Object structure.
-   */
-  getBrowserStyleSheets(browser) {
-    if (!browser) {
-      browser = gBrowser.selectedBrowser;
-    }
-
-    let data = this._pageStyleSheets.get(browser.permanentKey);
-    if (!data) {
-      return [];
-    }
-    return data.filteredStyleSheets;
-  },
-
   clearBrowserStyleSheets(permanentKey) {
     this._pageStyleSheets.delete(permanentKey);
   },
diff -Nru firefox-84.0.2+build1/browser/base/content/browser-places.js firefox-85.0+build1/browser/base/content/browser-places.js
--- firefox-84.0.2+build1/browser/base/content/browser-places.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser-places.js	2021-01-18 19:58:07.000000000 +0000
@@ -19,6 +19,18 @@
   "browser.newtabpage.enabled",
   false
 );
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "SHOW_OTHER_BOOKMARKS",
+  "browser.toolbars.bookmarks.showOtherBookmarks",
+  true,
+  (aPref, aPrevVal, aNewVal) => {
+    BookmarkingUI.maybeShowOtherBookmarksFolder();
+    document
+      .getElementById("PlacesToolbar")
+      ?._placesView?.updateNodesVisibility();
+  }
+);
 ChromeUtils.defineModuleGetter(
   this,
   "PanelMultiView",
@@ -1128,11 +1140,40 @@
  * toolbar. It also has helper functions for the managed bookmarks button.
  */
 var PlacesToolbarHelper = {
+  /**
+   * If init is called and _canShowPromise is null, this method
+   * is overwritten and won't run.
+   * If we get called and nobody has tried to call `init` yet,
+   * just create a resolved promise for _canShowPromise.
+   */
+  _readyToShowCallback() {
+    this._canShowPromise = Promise.resolve();
+  },
+  _readyToShow: false,
+  _canShowPromise: null,
+
   get _viewElt() {
     return document.getElementById("PlacesToolbar");
   },
 
-  init: function PTH_init() {
+  /**
+   * Initialize. This will await _canShowPromise - which is either created
+   * as a resolved promise if the idle task calling startShowingToolbar is
+   * called first, or created here and resolved once startShowingToolbar is
+   * called.
+   */
+  init() {
+    if (!this._readyToShow) {
+      this._canShowPromise = new Promise(resolve => {
+        this._readyToShowCallback = resolve;
+      });
+      this._canShowPromise.then(() => this._realInit());
+    } else {
+      this._realInit();
+    }
+  },
+
+  _realInit() {
     let viewElt = this._viewElt;
     if (!viewElt || viewElt._placesView) {
       return;
@@ -1163,9 +1204,22 @@
       return;
     }
 
+    if (
+      toolbar.id == "PersonalToolbar" &&
+      !toolbar.hasAttribute("initialized")
+    ) {
+      toolbar.setAttribute("initialized", "true");
+      BookmarkingUI.updateEmptyToolbarMessage();
+    }
+
     new PlacesToolbar(`place:parent=${PlacesUtils.bookmarks.toolbarGuid}`);
   },
 
+  startShowingToolbar() {
+    this._readyToShow = true;
+    this._readyToShowCallback();
+  },
+
   handleEvent(event) {
     switch (event.type) {
       case "toolbarvisibilitychange":
@@ -1176,12 +1230,16 @@
     }
   },
 
+  /**
+   * This is a no-op if we haven't been initialized.
+   */
   uninit: function PTH_uninit() {
     if (this._isObservingToolbars) {
       delete this._isObservingToolbars;
       window.removeEventListener("toolbarvisibilitychange", this);
     }
     CustomizableUI.removeListener(this);
+    this._readyToShowCallback = () => {};
   },
 
   customizeStart: function PTH_customizeStart() {
@@ -1610,17 +1668,17 @@
     let menuItems = [
       [
         showOnNewTabMenuItem,
-        "toolbar-context-menu-bookmarks-toolbar-on-new-tab",
+        "toolbar-context-menu-bookmarks-toolbar-on-new-tab-2",
         "newtab",
       ],
       [
         alwaysShowMenuItem,
-        "toolbar-context-menu-bookmarks-toolbar-always-show",
+        "toolbar-context-menu-bookmarks-toolbar-always-show-2",
         "always",
       ],
       [
         alwaysHideMenuItem,
-        "toolbar-context-menu-bookmarks-toolbar-never-show",
+        "toolbar-context-menu-bookmarks-toolbar-never-show-2",
         "never",
       ],
     ];
@@ -1651,41 +1709,49 @@
     return menu;
   },
 
+  /**
+   * Check if we need to make the empty toolbar message `hidden`.
+   * We'll have it unhidden during startup, to make sure the toolbar
+   * has height, and we'll unhide it if there is nothing else on the toolbar.
+   * We hide it in customize mode, unless there's nothing on the toolbar.
+   */
   updateEmptyToolbarMessage() {
-    let hasVisibleChildren = !!this.toolbar.querySelector(
-      `#PersonalToolbar > toolbarpaletteitem > toolbarbutton:not([hidden]),
-       #PersonalToolbar > toolbarpaletteitem > toolbaritem:not([hidden]):not(#personal-bookmarks),
-       #PersonalToolbar > toolbarbutton:not([hidden]),
-       #PersonalToolbar > toolbaritem:not([hidden]):not(#personal-bookmarks)`
-    );
+    let emptyMsg = document.getElementById("personal-toolbar-empty");
 
-    let toolbarBookmarkCount = 0;
-    // Prevent loading PlacesUtil.jsm during startup.
-    if (Cu.isModuleLoaded("resource://gre/modules/PlacesUtils.jsm")) {
-      toolbarBookmarkCount = PlacesUtils.getChildCountForFolder(
-        PlacesUtils.bookmarks.toolbarGuid
-      );
-    } else {
-      const kPlacesInitComplete = "places-init-complete";
-      let observer = {
-        observe() {
-          Services.obs.removeObserver(observer, kPlacesInitComplete);
-          BookmarkingUI.updateEmptyToolbarMessage();
-        },
-      };
-      Services.obs.addObserver(observer, kPlacesInitComplete);
+    // If the bookmarks are here but it's early in startup, show the message.
+    // It'll get made visibility: hidden early in startup anyway - it's just
+    // to ensure the toolbar has height.
+    if (!this.toolbar.hasAttribute("initialized")) {
+      emptyMsg.hidden = false;
+      emptyMsg.setAttribute("nowidth", "");
+      return;
     }
 
-    let bookmarksToolbarItemsPlacement = CustomizableUI.getPlacementOfWidget(
-      "personal-bookmarks"
+    // Do we have visible kids?
+    let hasVisibleChildren = !!this.toolbar.querySelector(
+      `:scope > toolbarpaletteitem > toolbarbutton:not([hidden]),
+       :scope > toolbarpaletteitem > toolbaritem:not([hidden], #personal-bookmarks),
+       :scope > toolbarbutton:not([hidden]),
+       :scope > toolbaritem:not([hidden], #personal-bookmarks)`
     );
-    hasVisibleChildren ||=
-      bookmarksToolbarItemsPlacement?.area == CustomizableUI.AREA_BOOKMARKS &&
-      (this._isCustomizing || !!toolbarBookmarkCount);
 
-    document.getElementById(
-      "personal-toolbar-empty"
-    ).hidden = hasVisibleChildren;
+    if (!hasVisibleChildren) {
+      // Hmm, apparently not. Check for bookmarks or customize mode:
+      let bookmarksToolbarItemsPlacement = CustomizableUI.getPlacementOfWidget(
+        "personal-bookmarks"
+      );
+      let bookmarksItemInToolbar =
+        bookmarksToolbarItemsPlacement?.area == CustomizableUI.AREA_BOOKMARKS;
+
+      hasVisibleChildren =
+        bookmarksItemInToolbar &&
+        (this._isCustomizing ||
+          !!PlacesUtils.getChildCountForFolder(
+            PlacesUtils.bookmarks.toolbarGuid
+          ));
+    }
+    emptyMsg.hidden = hasVisibleChildren;
+    emptyMsg.toggleAttribute("nowidth", !hasVisibleChildren);
   },
 
   openLibraryIfLinkClicked(event) {
@@ -2247,12 +2313,6 @@
               }
             }
           }
-          if (ev.parentGuid == PlacesUtils.bookmarks.toolbarGuid) {
-            Services.telemetry.scalarAdd(
-              "browser.engagement.bookmarks_toolbar_bookmark_added",
-              1
-            );
-          }
           break;
         case "bookmark-removed":
           // If one of the tracked bookmarks has been removed, unregister it.
@@ -2306,7 +2366,6 @@
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
   onBeforeItemRemoved() {},
-  onItemVisited() {},
   onItemMoved(
     aItemId,
     aProperty,
@@ -2331,12 +2390,6 @@
     if (hasMovedToToolbar || hasMovedOutOfToolbar) {
       this.updateEmptyToolbarMessage();
     }
-    if (hasMovedToToolbar) {
-      Services.telemetry.scalarAdd(
-        "browser.engagement.bookmarks_toolbar_bookmark_added",
-        1
-      );
-    }
   },
 
   onWidgetUnderflow(aNode, aContainer) {
@@ -2365,6 +2418,7 @@
 
     if (
       numberOfBookmarks > 0 &&
+      SHOW_OTHER_BOOKMARKS &&
       placement?.area == CustomizableUI.AREA_BOOKMARKS
     ) {
       let otherBookmarksPopup = document.getElementById("OtherBookmarksPopup");
@@ -2379,5 +2433,36 @@
     }
   },
 
+  buildShowOtherBookmarksMenuItem() {
+    let unfiledGuid = PlacesUtils.bookmarks.unfiledGuid;
+    let numberOfBookmarks = PlacesUtils.getChildCountForFolder(unfiledGuid);
+
+    if (!gBookmarksToolbar2h2020 || numberOfBookmarks < 1) {
+      return null;
+    }
+
+    let menuItem = document.createXULElement("menuitem");
+
+    menuItem.setAttribute("id", "show-other-bookmarks_PersonalToolbar");
+    menuItem.setAttribute("toolbarId", "PersonalToolbar");
+    menuItem.setAttribute("type", "checkbox");
+    menuItem.setAttribute("checked", SHOW_OTHER_BOOKMARKS);
+    menuItem.setAttribute("selectiontype", "none|single");
+
+    MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl");
+    document.l10n.setAttributes(
+      menuItem,
+      "toolbar-context-menu-bookmarks-show-other-bookmarks"
+    );
+    menuItem.addEventListener("command", () => {
+      Services.prefs.setBoolPref(
+        "browser.toolbars.bookmarks.showOtherBookmarks",
+        !SHOW_OTHER_BOOKMARKS
+      );
+    });
+
+    return menuItem;
+  },
+
   QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
 };
diff -Nru firefox-84.0.2+build1/browser/base/content/browser-siteIdentity.js firefox-85.0+build1/browser/base/content/browser-siteIdentity.js
--- firefox-84.0.2+build1/browser/base/content/browser-siteIdentity.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser-siteIdentity.js	2021-01-18 19:58:08.000000000 +0000
@@ -1975,8 +1975,18 @@
 
   async _createGeoLocationLastAccessIndicator() {
     let lastAccessStr = await this._getGeoLocationLastAccess();
+    let geoContainer = document.getElementById("identity-popup-geo-container");
 
-    if (lastAccessStr == null) {
+    // Check whether geoContainer still exists.
+    // We are async, the identity popup could have been closed already.
+    // Also check if it is already populated with a time label.
+    // This can happen if we update the permission panel multiple times in a
+    // short timeframe.
+    if (
+      lastAccessStr == null ||
+      !geoContainer ||
+      document.getElementById("geo-access-indicator-item")
+    ) {
       return;
     }
     let lastAccess = new Date(lastAccessStr);
@@ -2007,13 +2017,7 @@
     indicator.appendChild(icon);
     indicator.appendChild(text);
 
-    let geoContainer = document.getElementById("identity-popup-geo-container");
-
-    // Check whether geoContainer still exists.
-    // We are async, the identity popup could have been closed already.
-    if (geoContainer) {
-      geoContainer.appendChild(indicator);
-    }
+    geoContainer.appendChild(indicator);
   },
 
   _createProtocolHandlerPermissionItem(permission, key) {
diff -Nru firefox-84.0.2+build1/browser/base/content/browser.xhtml firefox-85.0+build1/browser/base/content/browser.xhtml
--- firefox-84.0.2+build1/browser/base/content/browser.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/browser.xhtml	2021-01-18 19:58:07.000000000 +0000
@@ -1348,10 +1348,13 @@
           <image role="presentation" id="fxa-menu-avatar"/>
           <vbox flex="1">
             <label id="fxa-menu-header-title"
-                   defaultLabel="&fxa.menu.signin.label;">&fxa.menu.signin.label;</label>
+                   crop="end"
+                   value="&fxa.menu.signin.label;"
+                   defaultLabel="&fxa.menu.signin.label;"/>
             <label id="fxa-menu-header-description"
                    crop="end"
-                   defaultLabel="&fxa.menu.turnOnSync.label;">&fxa.menu.turnOnSync.label;</label>
+                   value="&fxa.menu.turnOnSync.label;"
+                   defaultLabel="&fxa.menu.turnOnSync.label;"/>
           </vbox>
         </toolbarbutton>
         <toolbarseparator/>
@@ -2255,8 +2258,6 @@
   </toolbox>
   </box>
 
-  <hbox id="fullscr-toggler" hidden="true"/>
-
   <hbox flex="1" id="browser">
     <vbox id="browser-border-start" hidden="true" layer="true"/>
     <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
@@ -2328,5 +2329,8 @@
   </vbox>
 
   <html:div id="a11y-announcement" role="alert"/>
+
+  <!-- Put it at the very end to make sure it's not covered by anything. -->
+  <html:div id="fullscr-toggler" hidden="hidden"/>
 </html:body>
 </html>
diff -Nru firefox-84.0.2+build1/browser/base/content/nsContextMenu.js firefox-85.0+build1/browser/base/content/nsContextMenu.js
--- firefox-84.0.2+build1/browser/base/content/nsContextMenu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/nsContextMenu.js	2021-01-18 19:58:08.000000000 +0000
@@ -457,6 +457,16 @@
       "context-savelink",
       this.onSaveableLink || this.onPlainTextLink
     );
+    if (
+      (this.onSaveableLink || this.onPlainTextLink) &&
+      Services.policies.status === Services.policies.ACTIVE
+    ) {
+      this.setItemAttr(
+        "context-savelink",
+        "disabled",
+        !WebsiteFilter.isAllowed(this.linkURL)
+      );
+    }
 
     // Save image depends on having loaded its content, video and audio don't.
     this.showItem("context-saveimage", this.onLoadedImage || this.onCanvas);
@@ -1462,7 +1472,26 @@
             );
 
             const title = bundle.GetStringFromName("downloadErrorAlertTitle");
-            const msg = bundle.GetStringFromName("downloadErrorGeneric");
+            let msg = bundle.GetStringFromName("downloadErrorGeneric");
+
+            try {
+              const channel = aRequest.QueryInterface(Ci.nsIChannel);
+              const reason = channel.loadInfo.requestBlockingReason;
+              if (
+                reason == Ci.nsILoadInfo.BLOCKING_REASON_EXTENSION_WEBREQUEST
+              ) {
+                try {
+                  const properties = channel.QueryInterface(Ci.nsIPropertyBag);
+                  const id = properties.getProperty("cancelledByExtension");
+                  msg = bundle.formatStringFromName("downloadErrorBlockedBy", [
+                    WebExtensionPolicy.getByID(id).name,
+                  ]);
+                } catch (err) {
+                  // "cancelledByExtension" doesn't have to be available.
+                  msg = bundle.GetStringFromName("downloadErrorExtension");
+                }
+              }
+            } catch (ex) {}
 
             let window = Services.wm.getOuterWindowWithId(windowID);
             Services.prompt.alert(window, title, msg);
diff -Nru firefox-84.0.2+build1/browser/base/content/pageinfo/pageInfo.js firefox-85.0+build1/browser/base/content/pageinfo/pageInfo.js
--- firefox-84.0.2+build1/browser/base/content/pageinfo/pageInfo.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/pageinfo/pageInfo.js	2021-01-18 19:58:08.000000000 +0000
@@ -712,6 +712,9 @@
         true,
         Services.io.newURI(item.baseURI)
       );
+      let cookieJarSettings = E10SUtils.deserializeCookieJarSettings(
+        gDocInfo.cookieJarSettings
+      );
       saveURL(
         url,
         null,
@@ -719,7 +722,7 @@
         false,
         false,
         referrerInfo,
-        null,
+        cookieJarSettings,
         null,
         gDocInfo.isContentWindowPrivate,
         gDocInfo.principal
@@ -736,6 +739,9 @@
             true,
             aBaseURI
           );
+          let cookieJarSettings = E10SUtils.deserializeCookieJarSettings(
+            gDocInfo.cookieJarSettings
+          );
           internalSave(
             aURIString,
             null,
@@ -746,6 +752,7 @@
             "SaveImageTitle",
             aChosenData,
             referrerInfo,
+            cookieJarSettings,
             null,
             false,
             null,
diff -Nru firefox-84.0.2+build1/browser/base/content/tabbrowser.css firefox-85.0+build1/browser/base/content/tabbrowser.css
--- firefox-84.0.2+build1/browser/base/content/tabbrowser.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/tabbrowser.css	2021-01-18 19:58:08.000000000 +0000
@@ -7,11 +7,11 @@
 .tab-icon-pending:not([pendingicon]),
 .tab-icon-pending[busy],
 .tab-icon-pending[pinned],
-.tab-icon-image:not([src]):not([pinned]):not([crashed]):not([pictureinpicture])[selected],
-.tab-icon-image:not([src]):not([pinned]):not([crashed]):not([sharing]):not([pictureinpicture]),
+.tab-icon-image:not([src], [pinned], [crashed], [pictureinpicture])[selected],
+.tab-icon-image:not([src], [pinned], [crashed], [sharing], [pictureinpicture]),
 .tab-icon-image[busy],
 .tab-throbber:not([busy]),
-.tab-icon-sound:not([soundplaying]):not([muted]):not([activemedia-blocked]):not([pictureinpicture]),
+.tab-icon-sound:not([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]),
 .tab-icon-sound[pinned],
 .tab-sharing-icon-overlay,
 .tab-icon-overlay {
@@ -40,13 +40,13 @@
 }
 
 .tab-label-container[textoverflow][labeldirection=ltr]:not([pinned]),
-.tab-label-container[textoverflow]:not([labeldirection]):not([pinned]):-moz-locale-dir(ltr) {
+.tab-label-container[textoverflow]:not([labeldirection], [pinned]):-moz-locale-dir(ltr) {
   direction: ltr;
   mask-image: linear-gradient(to left, transparent, black 2em);
 }
 
 .tab-label-container[textoverflow][labeldirection=rtl]:not([pinned]),
-.tab-label-container[textoverflow]:not([labeldirection]):not([pinned]):-moz-locale-dir(rtl) {
+.tab-label-container[textoverflow]:not([labeldirection], [pinned]):-moz-locale-dir(rtl) {
   direction: rtl;
   mask-image: linear-gradient(to right, transparent, black 2em);
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/tabbrowser.js firefox-85.0+build1/browser/base/content/tabbrowser.js
--- firefox-84.0.2+build1/browser/base/content/tabbrowser.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/tabbrowser.js	2021-01-18 19:58:08.000000000 +0000
@@ -968,9 +968,14 @@
           ? "Private"
           : "Default";
       if (title) {
+        // We're using a function rather than just using `title` as the
+        // new substring to avoid `$$`, `$'` etc. having a special
+        // meaning to `replace`.
+        // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#specifying_a_string_as_a_parameter
+        // and the documentation for functions for more info about this.
         return docElement.dataset["contentTitle" + dataSuffix].replace(
           "CONTENTTITLE",
-          title
+          () => title
         );
       }
 
@@ -1389,17 +1394,20 @@
         tab._sharingState = {};
       }
       tab._sharingState = Object.assign(tab._sharingState, aState);
-      if (aState.webRTC && aState.webRTC.sharing) {
-        if (aState.webRTC.paused) {
-          tab.removeAttribute("sharing");
+
+      if ("webRTC" in aState) {
+        if (tab._sharingState.webRTC?.sharing) {
+          if (tab._sharingState.webRTC.paused) {
+            tab.removeAttribute("sharing");
+          } else {
+            tab.setAttribute("sharing", aState.webRTC.sharing);
+          }
         } else {
-          tab.setAttribute("sharing", aState.webRTC.sharing);
+          tab._sharingState.webRTC = null;
+          tab.removeAttribute("sharing");
         }
-      } else {
-        tab._sharingState.webRTC = null;
-        tab.removeAttribute("sharing");
+        this._tabAttrModified(tab, ["sharing"]);
       }
-      this._tabAttrModified(tab, ["sharing"]);
 
       if (aBrowser == this.selectedBrowser) {
         gIdentityHandler.updateSharingIndicator();
@@ -3222,14 +3230,20 @@
       this.removeTabs(selectedTabs);
     },
 
-    removeTabs(tabs) {
+    removeTabs(
+      tabs,
+      { animate = true, suppressWarnAboutClosingWindow = false } = {}
+    ) {
       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
       // can be considered equivalent to closing the window.
       if (
         this.tabs.length == tabs.length &&
         Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab")
       ) {
-        window.closeWindow(true, window.warnAboutClosingWindow);
+        window.closeWindow(
+          true,
+          suppressWarnAboutClosingWindow ? null : window.warnAboutClosingWindow
+        );
         return;
       }
 
@@ -3240,7 +3254,8 @@
       try {
         let tabsWithBeforeUnload = [];
         let lastToClose;
-        let aParams = { animate: true, prewarmed: true };
+        let aParams = { animate, prewarmed: true };
+
         for (let tab of tabs) {
           if (tab.selected) {
             lastToClose = tab;
@@ -3454,7 +3469,14 @@
         this._tabLayerCache.splice(tabCacheIndex, 1);
       }
 
-      this._blurTab(aTab);
+      // Delay hiding the the active tab if we're screen sharing.
+      // See Bug 1642747.
+      let screenShareInActiveTab =
+        aTab == this.selectedTab && aTab._sharingState?.webRTC?.screen;
+
+      if (!screenShareInActiveTab) {
+        this._blurTab(aTab);
+      }
 
       var closeWindow = false;
       var newTab = false;
@@ -4994,9 +5016,9 @@
       if (includeLabel) {
         label = tab._fullLabel || tab.getAttribute("label");
       }
-      if (AppConstants.NIGHTLY_BUILD) {
+      if (Services.prefs.getBoolPref("browser.tabs.tooltipsShowPid", false)) {
         if (tab.linkedBrowser) {
-          // On Nightly builds, show the PID of the content process, and if
+          // When enabled, show the PID of the content process, and if
           // we're running with fission enabled, try to include PIDs for
           // every remote subframe.
           let [contentPid, ...framePids] = E10SUtils.getBrowserPids(
@@ -5690,18 +5712,6 @@
             Ci.nsIWebProgress.NOTIFY_ALL
           );
 
-          // Restore the securityUI state.
-          let securityUI = browser.securityUI;
-          let state = securityUI
-            ? securityUI.state
-            : Ci.nsIWebProgressListener.STATE_IS_INSECURE;
-          this._callProgressListeners(
-            browser,
-            "onSecurityChange",
-            [browser.webProgress, null, state],
-            true,
-            false
-          );
           let cbEvent = browser.getContentBlockingEvents();
           // Include the true final argument to indicate that this event is
           // simulated (instead of being observed by the webProgressListener).
diff -Nru firefox-84.0.2+build1/browser/base/content/tab-content.js firefox-85.0+build1/browser/base/content/tab-content.js
--- firefox-84.0.2+build1/browser/base/content/tab-content.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/tab-content.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,11 +11,6 @@
 
 ChromeUtils.defineModuleGetter(
   this,
-  "E10SUtils",
-  "resource://gre/modules/E10SUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
   "BrowserUtils",
   "resource://gre/modules/BrowserUtils.jsm"
 );
@@ -42,25 +37,11 @@
     aTriggeringPrincipal,
     aCsp
   ) {
-    if (!E10SUtils.shouldLoadURI(aDocShell, aURI, aHasPostData)) {
-      E10SUtils.redirectLoad(
-        aDocShell,
-        aURI,
-        aReferrerInfo,
-        aTriggeringPrincipal,
-        null,
-        aCsp
-      );
-      return false;
-    }
-
     return true;
   },
 
   shouldLoadURIInThisProcess(aURI) {
-    let remoteSubframes = docShell.QueryInterface(Ci.nsILoadContext)
-      .useRemoteSubframes;
-    return E10SUtils.shouldLoadURIInThisProcess(aURI, remoteSubframes);
+    return true;
   },
 };
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutCertError_mitm.js firefox-85.0+build1/browser/base/content/test/about/browser_aboutCertError_mitm.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutCertError_mitm.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_aboutCertError_mitm.js	2021-01-18 19:58:08.000000000 +0000
@@ -28,23 +28,35 @@
     () => {
       gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, UNKNOWN_ISSUER);
       browser = gBrowser.selectedBrowser;
-      certErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
+      // The page will reload by itself after the initial canary request, so we wait
+      // until the AboutNetErrorLoad event has happened twice.
+      certErrorLoaded = new Promise(resolve => {
+        let loaded = 0;
+        let removeEventListener = BrowserTestUtils.addContentEventListener(
+          browser,
+          "AboutNetErrorLoad",
+          () => {
+            if (++loaded == 2) {
+              removeEventListener();
+              resolve();
+            }
+          },
+          { capture: false, wantUntrusted: true }
+        );
+      });
     },
     false
   );
 
   await certErrorLoaded;
 
-  // The page will reload after the initial canary request, so we'll just
-  // wait until we're seeing the dedicated MitM page.
-  await TestUtils.waitForCondition(function() {
-    return SpecialPowers.spawn(browser, [], () => {
-      return (
-        content.document.body.getAttribute("code") ==
-        "MOZILLA_PKIX_ERROR_MITM_DETECTED"
-      );
-    });
-  }, "Loads the MitM error page.");
+  await SpecialPowers.spawn(browser, [], () => {
+    is(
+      content.document.body.getAttribute("code"),
+      "MOZILLA_PKIX_ERROR_MITM_DETECTED",
+      "MitM error page has loaded."
+    );
+  });
 
   ok(true, "Successfully loaded the MitM error page.");
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbarEmpty.js firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbarEmpty.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbarEmpty.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbarEmpty.js	2021-01-18 19:58:07.000000000 +0000
@@ -108,6 +108,19 @@
           "Toolbar is visible when there are no items in the toolbar area",
       });
       ok(!emptyMessage.hidden, "Empty message is shown with toolbar empty");
+      // Click the link and check we open the library:
+      let winPromise = BrowserTestUtils.domWindowOpenedAndLoaded();
+      EventUtils.synthesizeMouseAtCenter(
+        emptyMessage.querySelector(".text-link"),
+        {}
+      );
+      let libraryWin = await winPromise;
+      is(
+        libraryWin.document.location.href,
+        "chrome://browser/content/places/places.xhtml",
+        "Should have opened library."
+      );
+      await BrowserTestUtils.closeWindow(libraryWin);
     }
 
     // 4: Put personal-bookmarks back in the toolbar and confirm the toolbar is visible now
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_bookmarksToolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -31,7 +31,7 @@
     );
 
     // 2: Test that the toolbar is hidden when the browser is navigated away from newtab
-    await BrowserTestUtils.loadURI(newtab.linkedBrowser, "https://example.com");
+    BrowserTestUtils.loadURI(newtab.linkedBrowser, "https://example.com");
     await BrowserTestUtils.browserLoaded(newtab.linkedBrowser);
     if (featureEnabled) {
       await waitForBookmarksToolbarVisibility({
@@ -46,7 +46,7 @@
     );
 
     // 3: Re-load about:newtab in the browser for the following tests and confirm toolbar reappears
-    await BrowserTestUtils.loadURI(newtab.linkedBrowser, "about:newtab");
+    BrowserTestUtils.loadURI(newtab.linkedBrowser, "about:newtab");
     await BrowserTestUtils.browserLoaded(newtab.linkedBrowser);
     if (featureEnabled) {
       await waitForBookmarksToolbarVisibility({
@@ -92,7 +92,7 @@
     });
 
     // 7: Similar to #3 above, loading about:newtab in example should show toolbar
-    await BrowserTestUtils.loadURI(example.linkedBrowser, "about:newtab");
+    BrowserTestUtils.loadURI(example.linkedBrowser, "about:newtab");
     await BrowserTestUtils.browserLoaded(example.linkedBrowser);
     if (featureEnabled) {
       await waitForBookmarksToolbarVisibility({
@@ -126,10 +126,7 @@
     await BrowserTestUtils.switchTab(gBrowser, newtab);
     await waitForBookmarksToolbarVisibility({ visible: false });
     ok(!isBookmarksToolbarVisible(), "Toolbar should hide with custom newtab");
-    await BrowserTestUtils.loadURI(
-      example.linkedBrowser,
-      AboutNewTab.newTabURL
-    );
+    BrowserTestUtils.loadURI(example.linkedBrowser, AboutNewTab.newTabURL);
     await BrowserTestUtils.browserLoaded(example.linkedBrowser);
     await BrowserTestUtils.switchTab(gBrowser, example);
     if (featureEnabled) {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_defaultBrowserNotification.js firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_defaultBrowserNotification.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutNewTab_defaultBrowserNotification.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_aboutNewTab_defaultBrowserNotification.js	2021-01-18 19:58:08.000000000 +0000
@@ -74,10 +74,7 @@
       "Notification should be default browser"
     );
 
-    await BrowserTestUtils.loadURI(
-      gBrowser.selectedBrowser,
-      "https://example.com"
-    );
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "https://example.com");
 
     let notificationRemoved = await TestUtils.waitForCondition(
       () =>
@@ -108,7 +105,7 @@
         !gBrowser.getNotificationBox(tab.linkedBrowser).currentNotification,
       "a notification should not be shown on about:robots"
     );
-    await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:home");
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:home");
 
     let notification = await TestUtils.waitForCondition(
       () =>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutStopReload.js firefox-85.0+build1/browser/base/content/test/about/browser_aboutStopReload.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_aboutStopReload.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_aboutStopReload.js	2021-01-18 19:58:08.000000000 +0000
@@ -57,7 +57,7 @@
   stopReloadContainerObserver.observe(stopReloadContainer, {
     attributeFilter: ["animate"],
   });
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
   BrowserTestUtils.removeTab(tab);
 
   Assert.ok(
@@ -82,7 +82,7 @@
   stopReloadContainerObserver.observe(stopReloadContainer, {
     attributeFilter: ["animate"],
   });
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:mozilla");
   BrowserTestUtils.removeTab(tab);
 
   Assert.ok(
@@ -132,7 +132,7 @@
     return !gBrowser.tabAnimationsInProgress;
   });
   let animatePromise = getAnimatePromise(stopReloadContainer);
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
   await animatePromise;
   BrowserTestUtils.removeTab(tab);
 
@@ -158,7 +158,7 @@
     return !gBrowser.tabAnimationsInProgress;
   });
   let animatePromise = getAnimatePromise(stopReloadContainer);
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "https://example.com");
   await animatePromise;
   await waitForNoAnimation(stopReloadContainer);
   BrowserTestUtils.removeTab(tab);
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser_bug435325.js firefox-85.0+build1/browser/base/content/test/about/browser_bug435325.js
--- firefox-84.0.2+build1/browser/base/content/test/about/browser_bug435325.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser_bug435325.js	2021-01-18 19:58:08.000000000 +0000
@@ -21,7 +21,7 @@
   await BrowserTestUtils.withNewTab("about:blank", async function(browser) {
     let netErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
 
-    await BrowserTestUtils.loadURI(browser, "http://example.com/");
+    BrowserTestUtils.loadURI(browser, "http://example.com/");
     await netErrorLoaded;
 
     // Re-enable the proxy so example.com is resolved to localhost, rather than
diff -Nru firefox-84.0.2+build1/browser/base/content/test/about/browser.ini firefox-85.0+build1/browser/base/content/test/about/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/about/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/about/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,9 @@
 [browser_aboutCertError_clockSkew.js]
 [browser_aboutCertError_exception.js]
 [browser_aboutCertError_mitm.js]
-skip-if = true #Bug 1603002
+skip-if = 
+  asan || tsan  # Bug 1678590
+  debug  # Bug 1678590
 [browser_aboutCertError_multiple_errors.js]
 [browser_aboutCertError_noSubjectAltName.js]
 [browser_aboutCertError_telemetry.js]
@@ -36,10 +38,12 @@
   xfo_iframe.sjs
 [browser_aboutNewTab_bookmarksToolbar.js]
 [browser_aboutNewTab_bookmarksToolbarEmpty.js]
+skip-if = tsan # Bug 1676326, highly frequent on TSan
 [browser_aboutNewTab_bookmarksToolbarNewWindow.js]
+skip-if = fission && tsan # Bug 1674948, perma on Fission+TSan
 [browser_aboutNewTab_bookmarksToolbarPrefs.js]
 [browser_aboutNewTab_defaultBrowserNotification.js]
-skip-if = debug || asan || ccov # Default browser checks are skipped on debug builds, bug 1660723
+skip-if = debug || asan || tsan || ccov # Default browser checks are skipped on debug builds, bug 1660723
 [browser_aboutStopReload.js]
 [browser_aboutSupport.js]
 [browser_aboutSupport_newtab_security_state.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_childprocess.js	2021-01-18 19:58:08.000000000 +0000
@@ -5,6 +5,10 @@
   "https://example.com/browser/browser/base/content/test/contextMenu/";
 
 add_task(async function() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.menuitem.enabled", true]],
+  });
+
   let tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
     gBaseURL + "subtst_contextmenu.html"
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu.js firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu.js
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu.js	2021-01-18 19:58:08.000000000 +0000
@@ -107,6 +107,10 @@
 add_task(async function test_setup_html() {
   let url = example_base + "subtst_contextmenu.html";
 
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.menuitem.enabled", true]],
+  });
+
   await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
 
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
@@ -1728,65 +1732,6 @@
   */
 });
 
-add_task(async function test_click_to_play_blocked_plugin() {
-  await test_contextmenu(
-    "#test-plugin",
-    [
-      "context-navigation",
-      null,
-      [
-        "context-back",
-        false,
-        "context-forward",
-        false,
-        "context-reload",
-        true,
-        "context-bookmarkpage",
-        true,
-      ],
-      null,
-      "---",
-      null,
-      "context-ctp-play",
-      true,
-      "context-ctp-hide",
-      true,
-      "---",
-      null,
-      "context-savepage",
-      true,
-      ...(hasPocket ? ["context-pocket", true] : []),
-      "---",
-      null,
-      "context-sendpagetodevice",
-      true,
-      [],
-      null,
-      "---",
-      null,
-      "context-viewbgimage",
-      false,
-      "context-selectall",
-      true,
-      "---",
-      null,
-      "context-viewsource",
-      true,
-      "context-viewinfo",
-      true,
-    ],
-    {
-      maybeScreenshotsPresent: true,
-      preCheckContextMenuFn() {
-        setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-      },
-      postCheckContextMenuFn() {
-        getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-      },
-    }
-  );
-});
-
 add_task(async function test_longdesc() {
   await test_contextmenu("#test-longdesc", [
     "context-viewimage",
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_loadblobinnewtab.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,7 @@
     false,
     RESOURCE_LINK
   );
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, RESOURCE_LINK);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, RESOURCE_LINK);
   await loaded;
 
   const generatedBlobURL = await ContentTask.spawn(
@@ -97,7 +97,7 @@
     false,
     RESOURCE_LINK
   );
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, RESOURCE_LINK);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, RESOURCE_LINK);
   await loaded;
 
   const generatedBlobURL = await ContentTask.spawn(
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/browser_contextmenu_save_blocked.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,80 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+var MockFilePicker = SpecialPowers.MockFilePicker;
+MockFilePicker.init(window);
+
+function mockPromptService() {
+  let { prompt } = Services;
+  let promptService = {
+    QueryInterface: ChromeUtils.generateQI(["nsIPromptService"]),
+    alert: () => {},
+  };
+  Services.prompt = promptService;
+  registerCleanupFunction(() => {
+    Services.prompt = prompt;
+  });
+  return promptService;
+}
+
+add_task(async function test_save_link_blocked_by_extension() {
+  let ext = ExtensionTestUtils.loadExtension({
+    manifest: {
+      applications: { gecko: { id: "cancel@test" } },
+      name: "Cancel Test",
+      permissions: ["webRequest", "webRequestBlocking", "<all_urls>"],
+    },
+
+    background() {
+      // eslint-disable-next-line no-undef
+      browser.webRequest.onBeforeRequest.addListener(
+        details => {
+          return { cancel: details.url === "http://example.com/" };
+        },
+        { urls: ["*://*/*"] },
+        ["blocking"]
+      );
+    },
+  });
+  await ext.startup();
+
+  await BrowserTestUtils.withNewTab(
+    `data:text/html;charset=utf-8,<a href="http://example.com">Download</a>`,
+    async browser => {
+      let menu = document.getElementById("contentAreaContextMenu");
+      let popupShown = BrowserTestUtils.waitForEvent(menu, "popupshown");
+      BrowserTestUtils.synthesizeMouseAtCenter(
+        "a[href]",
+        { type: "contextmenu", button: 2 },
+        browser
+      );
+      await popupShown;
+
+      await new Promise(resolve => {
+        let promptService = mockPromptService();
+        promptService.alert = (window, title, msg) => {
+          is(
+            msg,
+            "The download cannot be saved because it is blocked by Cancel Test.",
+            "prompt should be shown"
+          );
+          setTimeout(resolve, 0);
+        };
+
+        MockFilePicker.showCallback = function(fp) {
+          ok(false, "filepicker should never been shown");
+          setTimeout(resolve, 0);
+          return Ci.nsIFilePicker.returnCancel;
+        };
+        EventUtils.synthesizeMouseAtCenter(
+          menu.querySelector("#context-savelink"),
+          {}
+        );
+      });
+    }
+  );
+
+  await ext.unload();
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser.ini firefox-85.0+build1/browser/base/content/test/contextMenu/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/browser.ini	2021-01-18 19:58:07.000000000 +0000
@@ -16,6 +16,7 @@
 
 [browser_contextmenu_loadblobinnewtab.js]
 support-files = browser_contextmenu_loadblobinnewtab.html
+[browser_contextmenu_save_blocked.js]
 [browser_contextmenu_spellcheck.js]
 skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
 [browser_view_image.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/contextMenu/subtst_contextmenu.html firefox-85.0+build1/browser/base/content/test/contextMenu/subtst_contextmenu.html
--- firefox-84.0.2+build1/browser/base/content/test/contextMenu/subtst_contextmenu.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/contextMenu/subtst_contextmenu.html	2021-01-18 19:58:08.000000000 +0000
@@ -78,7 +78,6 @@
 <a id="test-image-link" href="#"><img src="ctxmenu-image.png"></a>
 <input id="test-select-input-text" type="text" value="input">
 <input id="test-select-input-text-type-password" type="password" value="password">
-<embed id="test-plugin" style="width: 200px; height: 200px;" type="application/x-test"></embed>
 <img id="test-longdesc" src="ctxmenu-image.png" longdesc="http://www.mozilla.org"></embed>
 <iframe id="test-srcdoc" width="98"  height="98" srcdoc="Hello World" style="border: 1px solid black"></iframe>
 <svg id="svg-with-link" width=10 height=10><a xlink:href="http://example.com/"><circle cx="50%" cy="50%" r="50%" fill="blue"/></a></svg>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/favicons/browser_favicon_load.js firefox-85.0+build1/browser/base/content/test/favicons/browser_favicon_load.js
--- firefox-84.0.2+build1/browser/base/content/test/favicons/browser_favicon_load.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/favicons/browser_favicon_load.js	2021-01-18 19:58:08.000000000 +0000
@@ -100,11 +100,9 @@
 
 function waitOnFaviconLoaded(aFaviconURL) {
   return PlacesTestUtils.waitForNotification(
-    "onPageChanged",
-    (uri, attr, value, id) =>
-      attr === Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-      value === aFaviconURL,
-    "history"
+    "favicon-changed",
+    events => events.some(e => e.faviconUrl == aFaviconURL),
+    "places"
   );
 }
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/forms/browser_selectpopup.js firefox-85.0+build1/browser/base/content/test/forms/browser_selectpopup.js
--- firefox-84.0.2+build1/browser/base/content/test/forms/browser_selectpopup.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/forms/browser_selectpopup.js	2021-01-18 19:58:08.000000000 +0000
@@ -904,7 +904,7 @@
   let browserLoadedPromise = BrowserTestUtils.browserLoaded(
     newWin.gBrowser.selectedBrowser
   );
-  await BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, pageUrl);
+  BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, pageUrl);
   await browserLoadedPromise;
 
   newWin.gBrowser.selectedBrowser.focus();
diff -Nru firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser_bug1620341.js firefox-85.0+build1/browser/base/content/test/fullscreen/browser_bug1620341.js
--- firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser_bug1620341.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/fullscreen/browser_bug1620341.js	2021-01-18 19:58:08.000000000 +0000
@@ -43,9 +43,6 @@
             frameDoc.addEventListener(message, handler);
           });
 
-          // In fission, we may not have docShell active automatically,
-          // Force docShell active manually
-          content.docShell.isActive = true;
           frameDoc.getElementById("request").click();
           await waitForFullscreen;
         });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser_fullscreen_cross_origin.js firefox-85.0+build1/browser/base/content/test/fullscreen/browser_fullscreen_cross_origin.js
--- firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser_fullscreen_cross_origin.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/fullscreen/browser_fullscreen_cross_origin.js	2021-01-18 19:58:07.000000000 +0000
@@ -31,9 +31,6 @@
               }
               frameDoc.addEventListener(message, handler);
             });
-            // In fission, we may not have docShell active automatically,
-            // Force docShell active manually
-            content.docShell.isActive = true;
             frameDoc.getElementById("request").click();
             await waitForFullscreen;
           });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser.ini firefox-85.0+build1/browser/base/content/test/fullscreen/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/fullscreen/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/fullscreen/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,6 @@
 [browser_fullscreen_window_open.js]
 skip-if = debug && os == 'mac' # Bug 1568570
 [browser_fullscreen_window_focus.js]
-skip-if = os == 'mac' || (debug && fission && os == "linux" && os_version == "18.04") # Bug 1568570, 1618386
+skip-if = os == 'mac' # Bug 1568570
 [browser_fullscreen_api_fission.js]
 support-files = fullscreen.html FullscreenFrame.jsm
diff -Nru firefox-84.0.2+build1/browser/base/content/test/fullscreen/FullscreenFrame.jsm firefox-85.0+build1/browser/base/content/test/fullscreen/FullscreenFrame.jsm
--- firefox-84.0.2+build1/browser/base/content/test/fullscreen/FullscreenFrame.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/fullscreen/FullscreenFrame.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -45,7 +45,7 @@
       case "ExitFullscreen":
         return this.contentWindow.document.exitFullscreen();
       case "RequestFullscreen":
-        this.docShell.isActive = true;
+        this.browsingContext.isActive = true;
         return Promise.all([this.changed(), this.requestFullscreen()]);
       case "CreateChild":
         let child = msg.data;
diff -Nru firefox-84.0.2+build1/browser/base/content/test/fullscreen/head.js firefox-85.0+build1/browser/base/content/test/fullscreen/head.js
--- firefox-84.0.2+build1/browser/base/content/test/fullscreen/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/fullscreen/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,7 +38,7 @@
   SpecialPowers.spawn(browser, [fullScreenState], async state => {
     // Wait for document focus before requesting full-screen
     await ContentTaskUtils.waitForCondition(
-      () => docShell.isActive && content.document.hasFocus(),
+      () => content.browsingContext.isActive && content.document.hasFocus(),
       "Waiting for document focus"
     );
     if (state) {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_addCertException.js firefox-85.0+build1/browser/base/content/test/general/browser_addCertException.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_addCertException.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_addCertException.js	2021-01-18 19:58:08.000000000 +0000
@@ -53,17 +53,17 @@
     .getPropertyValue("background-image");
   is(
     identityIconImage,
-    'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+    'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
     "Using expected icon image in the identity block"
   );
   is(
     securityViewBG,
-    'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+    'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
     "Using expected icon image in the Control Center main view"
   );
   is(
     securityContentBG,
-    'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+    'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
     "Using expected icon image in the Control Center subview"
   );
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_alltabslistener.js firefox-85.0+build1/browser/base/content/test/general/browser_alltabslistener.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_alltabslistener.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_alltabslistener.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,17 +25,7 @@
     info(
       "FrontProgress (" + url + "): " + state + " 0x" + aStateFlags.toString(16)
     );
-    Assert.less(
-      gFrontNotificationsPos,
-      gFrontNotifications.length,
-      "Got an expected notification for the front notifications listener"
-    );
-    is(
-      state,
-      gFrontNotifications[gFrontNotificationsPos],
-      "Got a notification for the front notifications listener"
-    );
-    gFrontNotificationsPos++;
+    assertCorrectBrowserAndEventOrderForFront(state);
   },
 
   onLocationChange(aWebProgress, aRequest, aLocationURI, aFlags) {
@@ -45,17 +35,7 @@
     }
     var state = "onLocationChange";
     info("FrontProgress: " + state + " " + aLocationURI.spec);
-    Assert.less(
-      gFrontNotificationsPos,
-      gFrontNotifications.length,
-      "Got an expected notification for the front notifications listener"
-    );
-    is(
-      state,
-      gFrontNotifications[gFrontNotificationsPos],
-      "Got a notification for the front notifications listener"
-    );
-    gFrontNotificationsPos++;
+    assertCorrectBrowserAndEventOrderForFront(state);
   },
 
   onSecurityChange(aWebProgress, aRequest, aState) {
@@ -65,20 +45,24 @@
     }
     var state = "onSecurityChange";
     info("FrontProgress (" + url + "): " + state + " 0x" + aState.toString(16));
-    Assert.less(
-      gFrontNotificationsPos,
-      gFrontNotifications.length,
-      "Got an expected notification for the front notifications listener"
-    );
-    is(
-      state,
-      gFrontNotifications[gFrontNotificationsPos],
-      "Got a notification for the front notifications listener"
-    );
-    gFrontNotificationsPos++;
+    assertCorrectBrowserAndEventOrderForFront(state);
   },
 };
 
+function assertCorrectBrowserAndEventOrderForFront(aEventName) {
+  Assert.less(
+    gFrontNotificationsPos,
+    gFrontNotifications.length,
+    "Got an expected notification for the front notifications listener"
+  );
+  is(
+    aEventName,
+    gFrontNotifications[gFrontNotificationsPos],
+    "Got a notification for the front notifications listener"
+  );
+  gFrontNotificationsPos++;
+}
+
 var gAllProgressListener = {
   onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
     var url = getOriginalURL(aRequest);
@@ -90,19 +74,11 @@
     info(
       "AllProgress (" + url + "): " + state + " 0x" + aStateFlags.toString(16)
     );
-    ok(
-      aBrowser == gTestBrowser,
-      state + " notification came from the correct browser"
-    );
-    Assert.less(
-      gAllNotificationsPos,
-      gAllNotifications.length,
-      "Got an expected notification for the all notifications listener"
-    );
-    is(
+    assertCorrectBrowserAndEventOrderForAll(state, aBrowser);
+    assertReceivedFlags(
       state,
       gAllNotifications[gAllNotificationsPos],
-      "Got a notification for the all notifications listener"
+      aStateFlags
     );
     gAllNotificationsPos++;
 
@@ -129,19 +105,11 @@
     }
     var state = "onLocationChange";
     info("AllProgress: " + state + " " + aLocationURI.spec);
-    ok(
-      aBrowser == gTestBrowser,
-      state + " notification came from the correct browser"
-    );
-    Assert.less(
-      gAllNotificationsPos,
-      gAllNotifications.length,
-      "Got an expected notification for the all notifications listener"
-    );
-    is(
-      state,
+    assertCorrectBrowserAndEventOrderForAll(state, aBrowser);
+    assertReceivedFlags(
+      "onLocationChange",
       gAllNotifications[gAllNotificationsPos],
-      "Got a notification for the all notifications listener"
+      aFlags
     );
     gAllNotificationsPos++;
   },
@@ -154,15 +122,7 @@
     }
     var state = "onSecurityChange";
     info("AllProgress (" + url + "): " + state + " 0x" + aState.toString(16));
-    ok(
-      aBrowser == gTestBrowser,
-      state + " notification came from the correct browser"
-    );
-    Assert.less(
-      gAllNotificationsPos,
-      gAllNotifications.length,
-      "Got an expected notification for the all notifications listener"
-    );
+    assertCorrectBrowserAndEventOrderForAll(state, aBrowser);
     is(
       state,
       gAllNotifications[gAllNotificationsPos],
@@ -172,6 +132,35 @@
   },
 };
 
+function assertCorrectBrowserAndEventOrderForAll(aState, aBrowser) {
+  ok(
+    aBrowser == gTestBrowser,
+    aState + " notification came from the correct browser"
+  );
+  Assert.less(
+    gAllNotificationsPos,
+    gAllNotifications.length,
+    "Got an expected notification for the all notifications listener"
+  );
+}
+
+function assertReceivedFlags(aState, aObjOrEvent, aFlags) {
+  if (aObjOrEvent !== null && typeof aObjOrEvent === "object") {
+    is(
+      aState,
+      aObjOrEvent.state,
+      "Got a notification for the all notifications listener"
+    );
+    is(aFlags, aFlags & aObjOrEvent.flags, `Got correct flags for ${aState}`);
+  } else {
+    is(
+      aState,
+      aObjOrEvent,
+      "Got a notification for the all notifications listener"
+    );
+  }
+}
+
 var gFrontNotifications,
   gAllNotifications,
   gFrontNotificationsPos,
@@ -187,23 +176,6 @@
   "http://mochi.test:8888/browser/browser/base/content/test/general/dummy_page.html";
 var gNextTest;
 
-function setExpectationForCrossDomainFrontBrowserLoad() {
-  // In fission, we swap remoteness for this load, and we'll get sent a
-  // notification to ensure the security state shown by the browser remains
-  // correct after the remoteness change - we need to account for that:
-  if (gFissionBrowser) {
-    gFrontNotifications = [
-      "onStateChange",
-      "onSecurityChange",
-      "onLocationChange",
-      "onSecurityChange",
-      "onStateChange",
-    ];
-  } else {
-    gFrontNotifications = gAllNotifications;
-  }
-}
-
 async function test() {
   waitForExplicitFinish();
 
@@ -250,13 +222,13 @@
   gBrowser.addProgressListener(gFrontProgressListener);
   gBrowser.addTabsProgressListener(gAllProgressListener);
 
-  setExpectationForCrossDomainFrontBrowserLoad();
+  gFrontNotifications = gAllNotifications;
   runTest(gForegroundBrowser, "http://example.org" + gTestPage, startTest2);
 }
 
 function startTest2() {
   info("\nTest 2");
-  setExpectationForCrossDomainFrontBrowserLoad();
+  gFrontNotifications = gAllNotifications;
   runTest(gForegroundBrowser, "https://example.com" + gTestPage, startTest3);
 }
 
@@ -285,13 +257,63 @@
   gBrowser.selectedTab = gForegroundTab;
   gBrowser.addProgressListener(gFrontProgressListener);
 
-  setExpectationForCrossDomainFrontBrowserLoad();
+  gFrontNotifications = gAllNotifications;
   runTest(gForegroundBrowser, "http://example.org" + gTestPage, startTest6);
 }
 
 function startTest6() {
   info("\nTest 6");
   gFrontNotifications = [];
+  runTest(gBackgroundBrowser, "http://example.org" + gTestPage, startTest7);
+}
+
+// Navigate from remote to non-remote
+function startTest7() {
+  info("\nTest 7");
+  gFrontNotifications = [];
+  gAllNotifications = [
+    "onStateChange",
+    "onLocationChange",
+    "onSecurityChange",
+    {
+      state: "onLocationChange",
+      flags: Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT,
+    }, // dummy onLocationChange event
+    "onStateChange",
+  ];
+  runTest(gBackgroundBrowser, "about:preferences", startTest8);
+}
+
+// Navigate from non-remote to non-remote
+function startTest8() {
+  info("\nTest 8");
+  gFrontNotifications = [];
+  gAllNotifications = [
+    "onStateChange",
+    {
+      state: "onStateChange",
+      flags:
+        Ci.nsIWebProgressListener.STATE_IS_REDIRECTED_DOCUMENT |
+        Ci.nsIWebProgressListener.STATE_IS_REQUEST |
+        Ci.nsIWebProgressListener.STATE_START,
+    },
+    "onLocationChange",
+    "onSecurityChange",
+    "onStateChange",
+  ];
+  runTest(gBackgroundBrowser, "about:config", startTest9);
+}
+
+// Navigate from non-remote to remote
+function startTest9() {
+  info("\nTest 9");
+  gFrontNotifications = [];
+  gAllNotifications = [
+    "onStateChange",
+    "onLocationChange",
+    "onSecurityChange",
+    "onStateChange",
+  ];
   runTest(gBackgroundBrowser, "http://example.org" + gTestPage, finishTest);
 }
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_bug495058.js firefox-85.0+build1/browser/base/content/test/general/browser_bug495058.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_bug495058.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_bug495058.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,8 @@
 add_task(async function() {
   for (let uri of URIS) {
     let tab = BrowserTestUtils.addTab(gBrowser);
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+    BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+    await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
     let win = gBrowser.replaceTabWithWindow(tab);
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_bug724239.js firefox-85.0+build1/browser/base/content/test/general/browser_bug724239.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_bug724239.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_bug724239.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,11 +22,11 @@
     async function(browser) {
       // Can't load it directly because that'll use a preloaded tab if present.
       let stopped = BrowserTestUtils.browserStopped(browser, "about:newtab");
-      await BrowserTestUtils.loadURI(browser, "about:newtab");
+      BrowserTestUtils.loadURI(browser, "about:newtab");
       await stopped;
 
       stopped = BrowserTestUtils.browserStopped(browser, "http://example.com/");
-      await BrowserTestUtils.loadURI(browser, "http://example.com/");
+      BrowserTestUtils.loadURI(browser, "http://example.com/");
       await stopped;
 
       // This makes sure the parent process has the most up-to-date notion
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_bug763468_perwindowpb.js firefox-85.0+build1/browser/base/content/test/general/browser_bug763468_perwindowpb.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_bug763468_perwindowpb.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_bug763468_perwindowpb.js	2021-01-18 19:58:08.000000000 +0000
@@ -45,18 +45,13 @@
 async function openNewTab(aWindow, aExpectedURL) {
   // Open a new tab
   aWindow.BrowserOpenTab();
-
   let browser = aWindow.gBrowser.selectedBrowser;
-  let loadPromise = BrowserTestUtils.browserLoaded(
-    browser,
-    false,
-    aExpectedURL
-  );
-  let alreadyLoaded = await ContentTask.spawn(browser, aExpectedURL, url => {
-    let doc = content.document;
-    return doc && doc.readyState === "complete" && doc.location.href == url;
-  });
-  if (!alreadyLoaded) {
-    await loadPromise;
+
+  // We're already loaded.
+  if (browser.currentURI.spec === aExpectedURL) {
+    return;
   }
+
+  // Wait for any location change.
+  await BrowserTestUtils.waitForLocationChange(aWindow.gBrowser);
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_bug767836_perwindowpb.js firefox-85.0+build1/browser/base/content/test/general/browser_bug767836_perwindowpb.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_bug767836_perwindowpb.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_bug767836_perwindowpb.js	2021-01-18 19:58:08.000000000 +0000
@@ -64,18 +64,13 @@
 async function openNewTab(aWindow, aExpectedURL) {
   // Open a new tab
   aWindow.BrowserOpenTab();
-
   let browser = aWindow.gBrowser.selectedBrowser;
-  let loadPromise = BrowserTestUtils.browserLoaded(
-    browser,
-    false,
-    aExpectedURL
-  );
-  let alreadyLoaded = await ContentTask.spawn(browser, aExpectedURL, url => {
-    let doc = content.document;
-    return doc && doc.readyState === "complete" && doc.location.href == url;
-  });
-  if (!alreadyLoaded) {
-    await loadPromise;
+
+  // We're already loaded.
+  if (browser.currentURI.spec === aExpectedURL) {
+    return;
   }
+
+  // Wait for any location change.
+  await BrowserTestUtils.waitForLocationChange(aWindow.gBrowser);
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_ctrlTab.js firefox-85.0+build1/browser/base/content/test/general/browser_ctrlTab.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_ctrlTab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_ctrlTab.js	2021-01-18 19:58:07.000000000 +0000
@@ -211,6 +211,17 @@
         ? "back to the previously selected tab"
         : normalized + " tabs back in most-recently-selected order";
 
+    // Add keyup listener to all content documents.
+    await Promise.all(
+      gBrowser.tabs.map(tab =>
+        SpecialPowers.spawn(tab.linkedBrowser, [], () => {
+          content.window.addEventListener("keyup", () => {
+            content.window._ctrlTabTestKeyupHappend = true;
+          });
+        })
+      )
+    );
+
     for (let i = 0; i < tabTimes; i++) {
       await pressCtrlTab();
 
@@ -253,5 +264,19 @@
         " goes " +
         where
     );
+
+    const keyupEvents = await Promise.all(
+      gBrowser.tabs.map(tab =>
+        SpecialPowers.spawn(
+          tab.linkedBrowser,
+          [],
+          () => !!content.window._ctrlTabTestKeyupHappend
+        )
+      )
+    );
+    ok(
+      keyupEvents.every(isKeyupHappned => !isKeyupHappned),
+      "Content document doesn't capture Keyup event during cycling tabs"
+    );
   }
 });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_datachoices_notification.js firefox-85.0+build1/browser/base/content/test/general/browser_datachoices_notification.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_datachoices_notification.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_datachoices_notification.js	2021-01-18 19:58:07.000000000 +0000
@@ -143,12 +143,7 @@
   Preferences.reset(PREF_ACCEPTED_POLICY_DATE);
 }
 
-add_task(async function test_single_window() {
-  clearAcceptedPolicy();
-
-  // Close all the notifications, then try to trigger the data choices infobar.
-  await closeAllNotifications();
-
+function assertCoherentInitialState() {
   // Make sure that we have a coherent initial state.
   Assert.equal(
     Preferences.get(PREF_ACCEPTED_POLICY_VERSION, 0),
@@ -164,6 +159,15 @@
     !TelemetryReportingPolicy.testIsUserNotified(),
     "User not notified about datareporting policy."
   );
+}
+
+add_task(async function test_single_window() {
+  clearAcceptedPolicy();
+
+  // Close all the notifications, then try to trigger the data choices infobar.
+  await closeAllNotifications();
+
+  assertCoherentInitialState();
 
   let alertShownPromise = promiseWaitForAlertActive(gNotificationBox);
   Assert.ok(
@@ -219,9 +223,11 @@
 
 add_task(async function test_multiple_windows() {
   clearAcceptedPolicy();
+  assertCoherentInitialState(); // bug 1571932
 
   // Close all the notifications, then try to trigger the data choices infobar.
   await closeAllNotifications();
+  assertCoherentInitialState(); // bug 1571932
 
   // Ensure we see the notification on all windows and that action on one window
   // results in dismiss on every window.
@@ -232,21 +238,7 @@
     "2nd window has a global notification box."
   );
 
-  // Make sure that we have a coherent initial state.
-  Assert.equal(
-    Preferences.get(PREF_ACCEPTED_POLICY_VERSION, 0),
-    0,
-    "No version should be set on init."
-  );
-  Assert.equal(
-    Preferences.get(PREF_ACCEPTED_POLICY_DATE, 0),
-    0,
-    "No date should be set on init."
-  );
-  Assert.ok(
-    !TelemetryReportingPolicy.testIsUserNotified(),
-    "User not notified about datareporting policy."
-  );
+  assertCoherentInitialState();
 
   let showAlertPromises = [
     promiseWaitForAlertActive(gNotificationBox),
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js firefox-85.0+build1/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_domFullscreen_fullscreenMode.js	2021-01-18 19:58:08.000000000 +0000
@@ -37,7 +37,7 @@
 function waitForDocActivated(aBrowser) {
   return SpecialPowers.spawn(aBrowser, [], () => {
     return ContentTaskUtils.waitForCondition(
-      () => docShell.isActive && content.document.hasFocus()
+      () => content.browsingContext.isActive && content.document.hasFocus()
     );
   });
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser.ini firefox-85.0+build1/browser/base/content/test/general/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/general/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -54,7 +54,6 @@
 [browser_addKeywordSearch.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_alltabslistener.js]
-skip-if = fission #Bug 1661833
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_backButtonFitts.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
@@ -231,7 +230,6 @@
 [browser_homeDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_invalid_uri_back_forward_manipulation.js]
-skip-if = fission # Bug 1667386
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_lastAccessedTab.js]
 skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bug 969405)
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_newTabDrop.js firefox-85.0+build1/browser/base/content/test/general/browser_newTabDrop.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_newTabDrop.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_newTabDrop.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,20 +26,20 @@
 
 // New Tab Button opens any link.
 add_task(async function single_url() {
-  await dropText("mochi.test/first", ["http://www.mochi.test/first"]);
+  await dropText("mochi.test/first", ["https://www.mochi.test/first"]);
 });
 add_task(async function single_url2() {
-  await dropText("mochi.test/second", ["http://www.mochi.test/second"]);
+  await dropText("mochi.test/second", ["https://www.mochi.test/second"]);
 });
 add_task(async function single_url3() {
-  await dropText("mochi.test/third", ["http://www.mochi.test/third"]);
+  await dropText("mochi.test/third", ["https://www.mochi.test/third"]);
 });
 
 // Single text/plain item, with multiple links.
 add_task(async function multiple_urls() {
   await dropText("mochi.test/1\nmochi.test/2", [
-    "http://www.mochi.test/1",
-    "http://www.mochi.test/2",
+    "https://www.mochi.test/1",
+    "https://www.mochi.test/2",
   ]);
 });
 
@@ -51,9 +51,9 @@
       [{ type: "text/plain", data: "mochi.test/6\nmochi.test/7" }],
     ],
     [
-      "http://www.mochi.test/5",
-      "http://www.mochi.test/6",
-      "http://www.mochi.test/7",
+      "https://www.mochi.test/5",
+      "https://www.mochi.test/6",
+      "https://www.mochi.test/7",
     ]
   );
 });
@@ -70,7 +70,7 @@
         },
       ],
     ],
-    ["http://www.mochi.test/8", "http://www.mochi.test/9"]
+    ["https://www.mochi.test/8", "https://www.mochi.test/9"]
   );
 });
 
@@ -83,7 +83,7 @@
         { type: "text/x-moz-url", data: "mochi.test/11\nTITLE11" },
       ],
     ],
-    ["http://www.mochi.test/11"]
+    ["https://www.mochi.test/11"]
   );
 });
 
@@ -94,11 +94,11 @@
     urls.push("mochi.test/multi" + i);
   }
   await dropText(urls.join("\n"), [
-    "http://www.mochi.test/multi0",
-    "http://www.mochi.test/multi1",
-    "http://www.mochi.test/multi2",
-    "http://www.mochi.test/multi3",
-    "http://www.mochi.test/multi4",
+    "https://www.mochi.test/multi0",
+    "https://www.mochi.test/multi1",
+    "https://www.mochi.test/multi2",
+    "https://www.mochi.test/multi3",
+    "https://www.mochi.test/multi4",
   ]);
 });
 add_task(async function multiple_tabs_over_max_accept() {
@@ -111,11 +111,11 @@
     urls.push("mochi.test/accept" + i);
   }
   await dropText(urls.join("\n"), [
-    "http://www.mochi.test/accept0",
-    "http://www.mochi.test/accept1",
-    "http://www.mochi.test/accept2",
-    "http://www.mochi.test/accept3",
-    "http://www.mochi.test/accept4",
+    "https://www.mochi.test/accept0",
+    "https://www.mochi.test/accept1",
+    "https://www.mochi.test/accept2",
+    "https://www.mochi.test/accept3",
+    "https://www.mochi.test/accept4",
   ]);
 
   await confirmPromise;
@@ -151,10 +151,10 @@
     non url2
 `,
     [
-      "http://www.mochi.test/urls0",
-      "http://www.mochi.test/urls1",
-      "http://www.mochi.test/urls2",
-      "http://www.mochi.test/urls3",
+      "https://www.mochi.test/urls0",
+      "https://www.mochi.test/urls1",
+      "https://www.mochi.test/urls2",
+      "https://www.mochi.test/urls3",
     ]
   );
 });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_newWindowDrop.js firefox-85.0+build1/browser/base/content/test/general/browser_newWindowDrop.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_newWindowDrop.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_newWindowDrop.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,7 +38,7 @@
 
 // New Window Button opens any link.
 add_task(async function single_url() {
-  await dropText("mochi.test/first", ["http://www.mochi.test/first"]);
+  await dropText("mochi.test/first", ["https://www.mochi.test/first"]);
 });
 add_task(async function single_javascript() {
   await dropText("javascript:'bad'", ["about:blank"]);
@@ -47,31 +47,31 @@
   await dropText("jAvascript:'bad'", ["about:blank"]);
 });
 add_task(async function single_url2() {
-  await dropText("mochi.test/second", ["http://www.mochi.test/second"]);
+  await dropText("mochi.test/second", ["https://www.mochi.test/second"]);
 });
 add_task(async function single_data_url() {
   await dropText("data:text/html,bad", ["data:text/html,bad"]);
 });
 add_task(async function single_url3() {
-  await dropText("mochi.test/third", ["http://www.mochi.test/third"]);
+  await dropText("mochi.test/third", ["https://www.mochi.test/third"]);
 });
 
 // Single text/plain item, with multiple links.
 add_task(async function multiple_urls() {
   await dropText("mochi.test/1\nmochi.test/2", [
-    "http://www.mochi.test/1",
-    "http://www.mochi.test/2",
+    "https://www.mochi.test/1",
+    "https://www.mochi.test/2",
   ]);
 });
 add_task(async function multiple_urls_javascript() {
   await dropText("javascript:'bad1'\nmochi.test/3", [
     "about:blank",
-    "http://www.mochi.test/3",
+    "https://www.mochi.test/3",
   ]);
 });
 add_task(async function multiple_urls_data() {
   await dropText("mochi.test/4\ndata:text/html,bad1", [
-    "http://www.mochi.test/4",
+    "https://www.mochi.test/4",
     "data:text/html,bad1",
   ]);
 });
@@ -84,9 +84,9 @@
       [{ type: "text/plain", data: "mochi.test/6\nmochi.test/7" }],
     ],
     [
-      "http://www.mochi.test/5",
-      "http://www.mochi.test/6",
-      "http://www.mochi.test/7",
+      "https://www.mochi.test/5",
+      "https://www.mochi.test/6",
+      "https://www.mochi.test/7",
     ]
   );
 });
@@ -103,7 +103,7 @@
         },
       ],
     ],
-    ["http://www.mochi.test/8", "http://www.mochi.test/9"]
+    ["https://www.mochi.test/8", "https://www.mochi.test/9"]
   );
 });
 
@@ -116,7 +116,7 @@
         { type: "text/x-moz-url", data: "mochi.test/11\nTITLE11" },
       ],
     ],
-    ["http://www.mochi.test/11"]
+    ["https://www.mochi.test/11"]
   );
 });
 
@@ -127,11 +127,11 @@
     urls.push("mochi.test/multi" + i);
   }
   await dropText(urls.join("\n"), [
-    "http://www.mochi.test/multi0",
-    "http://www.mochi.test/multi1",
-    "http://www.mochi.test/multi2",
-    "http://www.mochi.test/multi3",
-    "http://www.mochi.test/multi4",
+    "https://www.mochi.test/multi0",
+    "https://www.mochi.test/multi1",
+    "https://www.mochi.test/multi2",
+    "https://www.mochi.test/multi3",
+    "https://www.mochi.test/multi4",
   ]);
 });
 add_task(async function multiple_tabs_over_max_accept() {
@@ -146,11 +146,11 @@
   await dropText(
     urls.join("\n"),
     [
-      "http://www.mochi.test/accept0",
-      "http://www.mochi.test/accept1",
-      "http://www.mochi.test/accept2",
-      "http://www.mochi.test/accept3",
-      "http://www.mochi.test/accept4",
+      "https://www.mochi.test/accept0",
+      "https://www.mochi.test/accept1",
+      "https://www.mochi.test/accept2",
+      "https://www.mochi.test/accept3",
+      "https://www.mochi.test/accept4",
     ],
     true
   );
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_page_style_menu.js firefox-85.0+build1/browser/base/content/test/general/browser_page_style_menu.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_page_style_menu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_page_style_menu.js	2021-01-18 19:58:07.000000000 +0000
@@ -23,6 +23,8 @@
   "http://example.com"
 );
 
+const kStyleSheetsInPageStyleSample = 18;
+
 /*
  * Test that the right stylesheets do (and others don't) show up
  * in the page style menu.
@@ -34,8 +36,8 @@
     false
   );
   let browser = tab.linkedBrowser;
-  await BrowserTestUtils.loadURI(browser, WEB_ROOT + "page_style_sample.html");
-  await promiseStylesheetsLoaded(tab, 17);
+  BrowserTestUtils.loadURI(browser, WEB_ROOT + "page_style_sample.html");
+  await promiseStylesheetsLoaded(tab, kStyleSheetsInPageStyleSample);
 
   let menuitems = fillPopupAndGetItems();
   let items = menuitems.map(el => ({
@@ -96,7 +98,7 @@
 
   let disableStyles = document.getElementById("menu_pageStyleNoStyle");
   let defaultStyles = document.getElementById("menu_pageStylePersistentOnly");
-  let otherStyles = menuitems[menuitems.length - 1];
+  let otherStyles = menuitems[0].parentNode.querySelector("[label='28']");
 
   // Assert that the menu works as expected.
   disableStyles.click();
@@ -163,8 +165,12 @@
     new FileUtils.File(getTestFilePath("page_style_sample.html"))
   ).spec;
   await BrowserTestUtils.withNewTab(FILE_PAGE, async function(browser) {
-    await promiseStylesheetsLoaded(browser, 17);
+    await promiseStylesheetsLoaded(browser, kStyleSheetsInPageStyleSample);
     let menuitems = fillPopupAndGetItems();
-    is(menuitems.length, 17, "Should have 17 items even for file: URI.");
+    is(
+      menuitems.length,
+      kStyleSheetsInPageStyleSample,
+      "Should have the right amount of items even for file: URI."
+    );
   });
 });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_page_style_menu_update.js firefox-85.0+build1/browser/base/content/test/general/browser_page_style_menu_update.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_page_style_menu_update.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_page_style_menu_update.js	2021-01-18 19:58:07.000000000 +0000
@@ -14,8 +14,8 @@
     false
   );
   let browser = tab.linkedBrowser;
-  await BrowserTestUtils.loadURI(browser, PAGE);
-  await promiseStylesheetsLoaded(tab, 17);
+  BrowserTestUtils.loadURI(browser, PAGE);
+  await promiseStylesheetsLoaded(tab, 18);
 
   let menupopup = document.getElementById("pageStyleMenu").menupopup;
   gPageStyleMenu.fillPopup(menupopup);
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_tabDrop.js firefox-85.0+build1/browser/base/content/test/general/browser_tabDrop.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_tabDrop.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_tabDrop.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,3 +1,6 @@
+// TODO (Bug 1680996): Investigate why this test takes a long time.
+requestLongerTimeout(2);
+
 const ANY_URL = undefined;
 
 registerCleanupFunction(async function cleanup() {
@@ -22,7 +25,7 @@
 });
 
 add_task(async function single_url() {
-  await dropText("mochi.test/first", ["http://www.mochi.test/first"]);
+  await dropText("mochi.test/first", ["https://www.mochi.test/first"]);
 });
 add_task(async function single_javascript() {
   await dropText("javascript:'bad'", []);
@@ -34,20 +37,20 @@
   await dropText("search this", [ANY_URL]);
 });
 add_task(async function single_url2() {
-  await dropText("mochi.test/second", ["http://www.mochi.test/second"]);
+  await dropText("mochi.test/second", ["https://www.mochi.test/second"]);
 });
 add_task(async function single_data_url() {
   await dropText("data:text/html,bad", []);
 });
 add_task(async function single_url3() {
-  await dropText("mochi.test/third", ["http://www.mochi.test/third"]);
+  await dropText("mochi.test/third", ["https://www.mochi.test/third"]);
 });
 
 // Single text/plain item, with multiple links.
 add_task(async function multiple_urls() {
   await dropText("mochi.test/1\nmochi.test/2", [
-    "http://www.mochi.test/1",
-    "http://www.mochi.test/2",
+    "https://www.mochi.test/1",
+    "https://www.mochi.test/2",
   ]);
 });
 add_task(async function multiple_urls_javascript() {
@@ -65,9 +68,9 @@
       [{ type: "text/plain", data: "mochi.test/6\nmochi.test/7" }],
     ],
     [
-      "http://www.mochi.test/5",
-      "http://www.mochi.test/6",
-      "http://www.mochi.test/7",
+      "https://www.mochi.test/5",
+      "https://www.mochi.test/6",
+      "https://www.mochi.test/7",
     ]
   );
 });
@@ -84,7 +87,7 @@
         },
       ],
     ],
-    ["http://www.mochi.test/8", "http://www.mochi.test/9"]
+    ["https://www.mochi.test/8", "https://www.mochi.test/9"]
   );
 });
 
@@ -97,7 +100,7 @@
         { type: "text/x-moz-url", data: "mochi.test/11\nTITLE11" },
       ],
     ],
-    ["http://www.mochi.test/11"]
+    ["https://www.mochi.test/11"]
   );
 });
 
@@ -108,11 +111,11 @@
     urls.push("mochi.test/multi" + i);
   }
   await dropText(urls.join("\n"), [
-    "http://www.mochi.test/multi0",
-    "http://www.mochi.test/multi1",
-    "http://www.mochi.test/multi2",
-    "http://www.mochi.test/multi3",
-    "http://www.mochi.test/multi4",
+    "https://www.mochi.test/multi0",
+    "https://www.mochi.test/multi1",
+    "https://www.mochi.test/multi2",
+    "https://www.mochi.test/multi3",
+    "https://www.mochi.test/multi4",
   ]);
 });
 add_task(async function multiple_tabs_over_max_accept() {
@@ -125,11 +128,11 @@
     urls.push("mochi.test/accept" + i);
   }
   await dropText(urls.join("\n"), [
-    "http://www.mochi.test/accept0",
-    "http://www.mochi.test/accept1",
-    "http://www.mochi.test/accept2",
-    "http://www.mochi.test/accept3",
-    "http://www.mochi.test/accept4",
+    "https://www.mochi.test/accept0",
+    "https://www.mochi.test/accept1",
+    "https://www.mochi.test/accept2",
+    "https://www.mochi.test/accept3",
+    "https://www.mochi.test/accept4",
   ]);
 
   await confirmPromise;
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_tabs_isActive.js firefox-85.0+build1/browser/base/content/test/general/browser_tabs_isActive.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_tabs_isActive.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_tabs_isActive.js	2021-01-18 19:58:08.000000000 +0000
@@ -24,7 +24,11 @@
 }
 
 function getChildTabState(aTab) {
-  return ContentTask.spawn(aTab.linkedBrowser, null, () => docShell.isActive);
+  return ContentTask.spawn(
+    aTab.linkedBrowser,
+    null,
+    () => content.browsingContext.isActive
+  );
 }
 
 function checkState(parentSide, childSide, value, message) {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/browser_windowactivation.js firefox-85.0+build1/browser/base/content/test/general/browser_windowactivation.js
--- firefox-84.0.2+build1/browser/base/content/test/general/browser_windowactivation.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/browser_windowactivation.js	2021-01-18 19:58:08.000000000 +0000
@@ -4,98 +4,110 @@
 
 /* eslint-env mozilla/frame-script */
 
-const testPage = getRootDirectory(gTestPath) + "file_window_activation.html";
-const testPage2 = getRootDirectory(gTestPath) + "file_window_activation2.html";
+const testPageChrome =
+  getRootDirectory(gTestPath) + "file_window_activation.html";
+const testPageHttp = testPageChrome.replace(
+  "chrome://mochitests/content",
+  "http://example.com"
+);
+const testPageWindow =
+  getRootDirectory(gTestPath) + "file_window_activation2.html";
 
 add_task(async function reallyRunTests() {
-  let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, testPage);
-  let browser1 = tab1.linkedBrowser;
+  let chromeTab1 = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    testPageChrome
+  );
+  let chromeBrowser1 = chromeTab1.linkedBrowser;
 
-  // This can't use openNewForegroundTab because if we focus tab2 now, we
+  // This can't use openNewForegroundTab because if we focus chromeTab2 now, we
   // won't send a focus event during test 6, further down in this file.
-  let tab2 = BrowserTestUtils.addTab(gBrowser, testPage);
-  let browser2 = tab2.linkedBrowser;
-  await BrowserTestUtils.browserLoaded(browser2);
+  let chromeTab2 = BrowserTestUtils.addTab(gBrowser, testPageChrome);
+  let chromeBrowser2 = chromeTab2.linkedBrowser;
+  await BrowserTestUtils.browserLoaded(chromeBrowser2);
+
+  let httpTab = BrowserTestUtils.addTab(gBrowser, testPageHttp);
+  let httpBrowser = httpTab.linkedBrowser;
+  await BrowserTestUtils.browserLoaded(httpBrowser);
 
   function failTest() {
     ok(false, "Test received unexpected activate/deactivate event");
   }
 
-  // The content should not receive activate or deactivate events. If it
-  // does, fail the test.
-  BrowserTestUtils.waitForContentEvent(browser1, "activate", true).then(
-    failTest
-  );
-  BrowserTestUtils.waitForContentEvent(browser2, "activate", true).then(
-    failTest
-  );
-  BrowserTestUtils.waitForContentEvent(browser1, "deactivate", true).then(
-    failTest
-  );
-  BrowserTestUtils.waitForContentEvent(browser2, "deactivate", true).then(
-    failTest
-  );
+  // chrome:// url tabs should not receive "activate" or "deactivate" events
+  // as they should be sent to the top-level window in the parent process.
+  for (let b of [chromeBrowser1, chromeBrowser2]) {
+    BrowserTestUtils.waitForContentEvent(b, "activate", true).then(failTest);
+    BrowserTestUtils.waitForContentEvent(b, "deactivate", true).then(failTest);
+  }
 
   gURLBar.focus();
 
-  gBrowser.selectedTab = tab1;
+  gBrowser.selectedTab = chromeTab1;
 
-  // The test performs four checks, using -moz-window-inactive on two child tabs.
+  // The test performs four checks, using -moz-window-inactive on three child
+  // tabs (2 loading chrome:// urls and one loading an http:// url).
   // First, the initial state should be transparent. The second check is done
   // while another window is focused. The third check is done after that window
   // is closed and the main window focused again. The fourth check is done after
   // switching to the second tab.
 
   // Step 1 - check the initial state
-  let colorBrowser1 = await getBackgroundColor(browser1, true);
-  let colorBrowser2 = await getBackgroundColor(browser2, true);
-  is(colorBrowser1, "rgba(0, 0, 0, 0)", "first window initial");
-  is(colorBrowser2, "rgba(0, 0, 0, 0)", "second window initial");
+  let colorChromeBrowser1 = await getBackgroundColor(chromeBrowser1, true);
+  let colorChromeBrowser2 = await getBackgroundColor(chromeBrowser2, true);
+  let colorHttpBrowser = await getBackgroundColor(httpBrowser, true);
+  is(colorChromeBrowser1, "rgba(0, 0, 0, 0)", "first tab initial");
+  is(colorChromeBrowser2, "rgba(0, 0, 0, 0)", "second tab initial");
+  is(colorHttpBrowser, "rgba(0, 0, 0, 0)", "third tab initial");
 
   // Step 2 - open and focus another window
-  let otherWindow = window.open(testPage2, "", "chrome");
+  let otherWindow = window.open(testPageWindow, "", "chrome");
   await SimpleTest.promiseFocus(otherWindow);
-  colorBrowser1 = await getBackgroundColor(browser1, true);
-  colorBrowser2 = await getBackgroundColor(browser2, true);
-  is(colorBrowser1, "rgb(255, 0, 0)", "first window lowered");
-  is(colorBrowser2, "rgb(255, 0, 0)", "second window lowered");
+  colorChromeBrowser1 = await getBackgroundColor(chromeBrowser1, false);
+  colorChromeBrowser2 = await getBackgroundColor(chromeBrowser2, false);
+  colorHttpBrowser = await getBackgroundColor(httpBrowser, false);
+  is(colorChromeBrowser1, "rgb(255, 0, 0)", "first tab lowered");
+  is(colorChromeBrowser2, "rgb(255, 0, 0)", "second tab lowered");
+  is(colorHttpBrowser, "rgb(255, 0, 0)", "third tab lowered");
 
   // Step 3 - close the other window again
   otherWindow.close();
-  colorBrowser1 = await getBackgroundColor(browser1, true);
-  colorBrowser2 = await getBackgroundColor(browser2, true);
-  is(colorBrowser1, "rgba(0, 0, 0, 0)", "first window raised");
-  is(colorBrowser2, "rgba(0, 0, 0, 0)", "second window raised");
+  colorChromeBrowser1 = await getBackgroundColor(chromeBrowser1, true);
+  colorChromeBrowser2 = await getBackgroundColor(chromeBrowser2, true);
+  colorHttpBrowser = await getBackgroundColor(httpBrowser, true);
+  is(colorChromeBrowser1, "rgba(0, 0, 0, 0)", "first tab raised");
+  is(colorChromeBrowser2, "rgba(0, 0, 0, 0)", "second tab raised");
+  is(colorHttpBrowser, "rgba(0, 0, 0, 0)", "third tab raised");
 
   // Step 4 - switch to the second tab
-  gBrowser.selectedTab = tab2;
-  colorBrowser1 = await getBackgroundColor(browser1, false);
-  colorBrowser2 = await getBackgroundColor(browser2, false);
-  is(colorBrowser1, "rgba(0, 0, 0, 0)", "first window after tab switch");
-  is(colorBrowser2, "rgba(0, 0, 0, 0)", "second window after tab switch");
-
-  BrowserTestUtils.removeTab(tab1);
-  BrowserTestUtils.removeTab(tab2);
+  gBrowser.selectedTab = chromeTab2;
+  colorChromeBrowser1 = await getBackgroundColor(chromeBrowser1, true);
+  colorChromeBrowser2 = await getBackgroundColor(chromeBrowser2, true);
+  colorHttpBrowser = await getBackgroundColor(httpBrowser, true);
+  is(colorChromeBrowser1, "rgba(0, 0, 0, 0)", "first tab after tab switch");
+  is(colorChromeBrowser2, "rgba(0, 0, 0, 0)", "second tab after tab switch");
+  is(colorHttpBrowser, "rgba(0, 0, 0, 0)", "third tab after tab switch");
+
+  BrowserTestUtils.removeTab(chromeTab1);
+  BrowserTestUtils.removeTab(chromeTab2);
+  BrowserTestUtils.removeTab(httpTab);
   otherWindow = null;
 });
 
-function getBackgroundColor(browser, ifChanged) {
-  return SpecialPowers.spawn(browser, [], () => {
-    return new Promise(resolve => {
-      let oldColor = null;
-      let timer = content.setInterval(() => {
-        let area = content.document.getElementById("area");
-        if (!area) {
-          return; /* hasn't loaded yet */
-        }
-
-        let color = content.getComputedStyle(area).backgroundColor;
-        if (oldColor != color || !ifChanged) {
-          content.clearInterval(timer);
-          oldColor = color;
-          resolve(color);
-        }
-      }, 20);
-    });
-  });
+function getBackgroundColor(browser, expectedActive) {
+  return SpecialPowers.spawn(
+    browser,
+    [!expectedActive],
+    async hasPseudoClass => {
+      let area = content.document.getElementById("area");
+      await ContentTaskUtils.waitForCondition(() => {
+        return area;
+      }, "Page has loaded");
+      await ContentTaskUtils.waitForCondition(() => {
+        return area.matches(":-moz-window-inactive") == hasPseudoClass;
+      }, `Window is considered ${hasPseudoClass ? "inactive" : "active"}`);
+
+      return content.getComputedStyle(area).backgroundColor;
+    }
+  );
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/head.js firefox-85.0+build1/browser/base/content/test/general/head.js
--- firefox-84.0.2+build1/browser/base/content/test/general/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -377,7 +377,7 @@
 
 async function loadBadCertPage(url) {
   let loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
   await loaded;
 
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
@@ -401,6 +401,7 @@
 
   await TestUtils.waitForCondition(() => {
     let menu = styleMenu._pageStyleSheets.get(permanentKey);
+    info(`waiting for sheets: ${menu && menu.filteredStyleSheets.length}`);
     return menu && menu.filteredStyleSheets.length >= styleSheetCount;
   }, "waiting for style sheets to load");
 }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/general/page_style_sample.html firefox-85.0+build1/browser/base/content/test/general/page_style_sample.html
--- firefox-84.0.2+build1/browser/base/content/test/general/page_style_sample.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/general/page_style_sample.html	2021-01-18 19:58:08.000000000 +0000
@@ -38,8 +38,8 @@
     <link data-state="1" href="404.css" title="25" rel="alternate stylesheet" media="only screen">
     <link data-state="1" href="404.css" title="26" rel="alternate stylesheet" media="screen and (min-device-width: 1px)">
     <link data-state="0" href="404.css" title="27" rel="alternate stylesheet" media="screen and (max-device-width: 1px)">
-    <!-- It's important that this is the last one for the purposes of the test. -->
     <style data-state="1" title="28">:root { color: blue }</style>
+    <link data-state="1" href="404.css" title="29" rel="alternate stylesheet" disabled>
   </head>
   <body></body>
 </html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/metaTags/browser.ini firefox-85.0+build1/browser/base/content/test/metaTags/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/metaTags/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/metaTags/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -5,4 +5,5 @@
 [browser_bad_meta_tags.js]
 support-files = bad_meta_tags.html
 [browser_meta_tags.js]
+skip-if = tsan # Bug 1403403
 support-files = meta_tags.html
diff -Nru firefox-84.0.2+build1/browser/base/content/test/outOfProcess/browser_controller.js firefox-85.0+build1/browser/base/content/test/outOfProcess/browser_controller.js
--- firefox-84.0.2+build1/browser/base/content/test/outOfProcess/browser_controller.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/outOfProcess/browser_controller.js	2021-01-18 19:58:08.000000000 +0000
@@ -49,7 +49,7 @@
     // need to wait for the focus to have been updated.
     await SpecialPowers.spawn(browsingContexts[stepNum], [], () => {
       return ContentTaskUtils.waitForCondition(
-        () => docShell.isActive && content.document.hasFocus()
+        () => content.browsingContext.isActive && content.document.hasFocus()
       );
     });
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser.ini firefox-85.0+build1/browser/base/content/test/performance/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -56,5 +56,3 @@
 [browser_window_resize.js]
 [browser_windowclose.js]
 [browser_windowopen.js]
-
-
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_preferences_usage.js firefox-85.0+build1/browser/base/content/test/performance/browser_preferences_usage.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_preferences_usage.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_preferences_usage.js	2021-01-18 19:58:08.000000000 +0000
@@ -264,7 +264,7 @@
   for (let i = 0; i < 50; i++) {
     let url = urls[i % urls.length];
     info(`Navigating to ${url}...`);
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, url);
+    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
     await BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, url);
     info(`Loaded ${url}.`);
   }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_content.js firefox-85.0+build1/browser/base/content/test/performance/browser_startup_content.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_content.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_startup_content.js	2021-01-18 19:58:08.000000000 +0000
@@ -40,8 +40,7 @@
     "resource:///actors/BrowserTabChild.jsm",
     "resource:///actors/LinkHandlerChild.jsm",
     "resource:///actors/PageStyleChild.jsm",
-    "resource:///actors/SearchTelemetryChild.jsm",
-    "resource://gre/modules/E10SUtils.jsm",
+    "resource:///actors/SearchSERPTelemetryChild.jsm",
     "resource://gre/modules/Readerable.jsm",
 
     // Telemetry
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_images.js firefox-85.0+build1/browser/base/content/test/performance/browser_startup_images.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_images.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_startup_images.js	2021-01-18 19:58:08.000000000 +0000
@@ -52,7 +52,7 @@
   },
 
   {
-    file: "chrome://browser/skin/chevron.svg",
+    file: "chrome://global/skin/icons/chevron.svg",
     platforms: ["win", "linux", "macosx"],
     intermittentShown: ["win", "linux"],
   },
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup.js firefox-85.0+build1/browser/base/content/test/performance/browser_startup.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_startup.js	2021-01-18 19:58:08.000000000 +0000
@@ -82,7 +82,6 @@
     denylist: {
       components: new Set([
         "PageIconProtocolHandler.js",
-        "PlacesCategoriesStarter.js",
         "nsPlacesExpiration.js",
       ]),
       modules: new Set([
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_mainthreadio.js firefox-85.0+build1/browser/base/content/test/performance/browser_startup_mainthreadio.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_mainthreadio.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_startup_mainthreadio.js	2021-01-18 19:58:08.000000000 +0000
@@ -219,8 +219,7 @@
       path: "ProfD:xulstore/data.mdb",
       condition: WIN,
       read: 1,
-      write: 3,
-      fsync: 1,
+      write: 1,
     },
   ],
 
@@ -281,12 +280,6 @@
       condition: WIN,
       stat: 1,
     },
-    {
-      // bug 1546838
-      path: "ProfD:xulstore/data.mdb",
-      condition: WIN,
-      read: 2,
-    },
   ],
 
   // We reach this phase right after showing the first browser window.
@@ -305,12 +298,6 @@
       stat: 1,
     },
     {
-      // bug 1586808
-      path: "UserPlugins.parent:",
-      condition: WIN,
-      stat: 1,
-    },
-    {
       path: "XREAppFeat:formautofill@mozilla.org.xpi",
       condition: !WIN,
       stat: 1,
@@ -366,7 +353,7 @@
       // bug 1546838
       path: "ProfD:xulstore/data.mdb",
       condition: MAC,
-      write: 3,
+      write: 1,
     },
   ],
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_syncIPC.js firefox-85.0+build1/browser/base/content/test/performance/browser_startup_syncIPC.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_startup_syncIPC.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_startup_syncIPC.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,10 @@
 const WIN = AppConstants.platform == "win";
 const MAC = AppConstants.platform == "macosx";
 const WEBRENDER = window.windowUtils.layerManagerType == "WebRender";
+const SKELETONUI = Services.prefs.getBoolPref(
+  "browser.startup.preXulSkeletonUI",
+  false
+);
 
 /*
  * Specifying 'ignoreIfUnused: true' will make the test ignore unused entries;
@@ -118,7 +122,10 @@
     },
     {
       name: "PGPU::Msg_GetDeviceStatus",
-      condition: WIN && WEBRENDER, // bug 1553740 might want to drop the WEBRENDER clause here
+      // bug 1553740 might want to drop the WEBRENDER clause here.
+      // Additionally, the skeleton UI causes us to attach "before first paint" to a
+      // later event, which lets this sneak in.
+      condition: WIN && (WEBRENDER || SKELETONUI),
       // If Init() completes before we call EnsureGPUReady we won't send GetDeviceStatus
       // so we can safely ignore if unused.
       ignoreIfUnused: true,
@@ -259,7 +266,7 @@
     },
     {
       name: "PCompositorBridge::Msg_FlushRendering",
-      condition: MAC || LINUX,
+      condition: MAC || LINUX || SKELETONUI,
       ignoreIfUnused: true,
       maxCount: 1,
     },
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/browser_windowopen.js firefox-85.0+build1/browser/base/content/test/performance/browser_windowopen.js
--- firefox-84.0.2+build1/browser/base/content/test/performance/browser_windowopen.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/browser_windowopen.js	2021-01-18 19:58:08.000000000 +0000
@@ -45,6 +45,8 @@
   Services.obs.notifyObservers(null, "startupcache-invalidate");
   Services.obs.notifyObservers(null, "chrome-flush-caches");
 
+  let bookmarksToolbarRect = await getBookmarksToolbarRect();
+
   let win = window.openDialog(
     AppConstants.BROWSER_CHROME_URL,
     "_blank",
@@ -54,8 +56,6 @@
 
   await disableFxaBadge();
 
-  let bookmarksToolbarRect = await getBookmarksToolbarRect();
-
   let alreadyFocused = false;
   let inRange = (val, min, max) => min <= val && val <= max;
   let expectations = {
@@ -101,12 +101,31 @@
           },
         },
         {
-          name: "bug 1667237 - the bookmarks toolbar shouldn't flicker",
+          name: "Initial bookmark icon appearing after startup",
+          condition: r =>
+            r.w == 16 &&
+            r.h == 16 && // icon size
+            inRange(
+              r.y1,
+              bookmarksToolbarRect.top,
+              bookmarksToolbarRect.top + bookmarksToolbarRect.height / 2
+            ) && // in the toolbar
+            inRange(r.x1, 11, 13), // very close to the left of the screen
+        },
+        {
+          // Note that the length and x values here are a bit weird because on
+          // some fonts, we appear to detect the two words separately.
+          name:
+            "Initial bookmark text ('Getting Started' or 'Get Involved') appearing after startup",
           condition: r =>
-            r.y1 >= bookmarksToolbarRect.top &&
-            r.y2 <= bookmarksToolbarRect.bottom &&
-            r.x1 >= bookmarksToolbarRect.left &&
-            r.x2 <= bookmarksToolbarRect.right,
+            inRange(r.w, 25, 120) && // length of text
+            inRange(r.h, 9, 15) && // height of text
+            inRange(
+              r.y1,
+              bookmarksToolbarRect.top,
+              bookmarksToolbarRect.top + bookmarksToolbarRect.height / 2
+            ) && // in the toolbar
+            inRange(r.x1, 30, 90), // close to the left of the screen
         },
       ],
     },
diff -Nru firefox-84.0.2+build1/browser/base/content/test/performance/io/browser.ini firefox-85.0+build1/browser/base/content/test/performance/io/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/performance/io/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/performance/io/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
 # Disabled on Linux asan due to bug 1549729.
 # Disabled on Windows Arm64 due to bug 1551493.
 # Disabled on Windows asan due to intermittent startup hangs, bug 1629824.
-skip-if = debug || (os == "linux" && asan) || (os == "win" && (asan || processor == "aarch64"))
+skip-if = debug || tsan || (os == "linux" && asan) || (os == "win" && (asan || processor == "aarch64"))
 # to avoid overhead when running the browser normally, startupRecorder.js will
 # do almost nothing unless browser.startup.record is true.
 # gfx.canvas.willReadFrequently.enable is just an optimization, but needs to be
@@ -18,6 +18,7 @@
 environment =
   GNOME_ACCESSIBILITY=0
   MOZ_PROFILER_STARTUP=1
+  MOZ_PROFILER_STARTUP_PERFORMANCE_TEST=1
   MOZ_PROFILER_STARTUP_FEATURES=js,mainthreadio,ipcmessages
   MOZ_PROFILER_STARTUP_ENTRIES=10000000
 [../browser_startup_mainthreadio.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/permissions/browser_autoplay_blocked.js firefox-85.0+build1/browser/base/content/test/permissions/browser_autoplay_blocked.js
--- firefox-84.0.2+build1/browser/base/content/test/permissions/browser_autoplay_blocked.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/permissions/browser_autoplay_blocked.js	2021-01-18 19:58:08.000000000 +0000
@@ -208,7 +208,7 @@
   Services.prefs.setIntPref(AUTOPLAY_PREF, Ci.nsIAutoplay.BLOCKED);
 
   await BrowserTestUtils.withNewTab("about:home", async function(browser) {
-    await BrowserTestUtils.loadURI(browser, AUTOPLAY_PAGE);
+    BrowserTestUtils.loadURI(browser, AUTOPLAY_PAGE);
     await blockedIconShown();
 
     gBrowser.goBack();
@@ -255,7 +255,7 @@
 
   await BrowserTestUtils.withNewTab("about:home", async function(browser) {
     await blockedIconHidden();
-    await BrowserTestUtils.loadURI(browser, AUTOPLAY_PAGE);
+    BrowserTestUtils.loadURI(browser, AUTOPLAY_PAGE);
     await blockedIconShown();
     Services.prefs.setIntPref(AUTOPLAY_PREF, Ci.nsIAutoplay.ALLOWED);
 
@@ -308,7 +308,7 @@
 
   await BrowserTestUtils.withNewTab("about:home", async function(browser) {
     await blockedIconHidden();
-    await BrowserTestUtils.loadURI(browser, MUTED_AUTOPLAY_PAGE);
+    BrowserTestUtils.loadURI(browser, MUTED_AUTOPLAY_PAGE);
     await blockedIconShown();
 
     await openIdentityPopup();
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/blockNoPlugins-plugins.json firefox-85.0+build1/browser/base/content/test/plugins/blockNoPlugins-plugins.json
--- firefox-84.0.2+build1/browser/base/content/test/plugins/blockNoPlugins-plugins.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/blockNoPlugins-plugins.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginHard-plugins.json firefox-85.0+build1/browser/base/content/test/plugins/blockPluginHard-plugins.json
--- firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginHard-plugins.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/blockPluginHard-plugins.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-[
-  {
-    "matchFilename": "libnptest\\.so|nptest\\.dll|Test\\.plugin",
-    "versionRange": [
-      {
-        "severity": "2"
-      }
-    ],
-    "blockID": "p9999"
-  }
-]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginInfoURL-plugins.json firefox-85.0+build1/browser/base/content/test/plugins/blockPluginInfoURL-plugins.json
--- firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginInfoURL-plugins.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/blockPluginInfoURL-plugins.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-[
-  {
-    "matchFilename": "libnptest\\.so|nptest\\.dll|Test\\.plugin",
-    "versionRange": [
-      {
-        "severity": "2"
-      }
-    ],
-    "blockID": "p9999",
-    "infoURL": "http://test.url.com/"
-  }
-]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginVulnerableNoUpdate-plugins.json firefox-85.0+build1/browser/base/content/test/plugins/blockPluginVulnerableNoUpdate-plugins.json
--- firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginVulnerableNoUpdate-plugins.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/blockPluginVulnerableNoUpdate-plugins.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-[
-  {
-    "matchFilename": "libnptest\\.so|nptest\\.dll|Test\\.plugin",
-    "versionRange": [
-      {
-        "severity": "0",
-        "vulnerabilityStatus": "2"
-      }
-    ],
-    "blockID": "p9999"
-  }
-]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginVulnerableUpdatable-plugins.json firefox-85.0+build1/browser/base/content/test/plugins/blockPluginVulnerableUpdatable-plugins.json
--- firefox-84.0.2+build1/browser/base/content/test/plugins/blockPluginVulnerableUpdatable-plugins.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/blockPluginVulnerableUpdatable-plugins.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-[
-  {
-    "matchFilename": "libnptest\\.so|nptest\\.dll|Test\\.plugin",
-    "versionRange": [
-      {
-        "severity": "0",
-        "vulnerabilityStatus": "1"
-      }
-    ],
-    "blockID": "p9999"
-  }
-]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_blocking.js firefox-85.0+build1/browser/base/content/test/plugins/browser_blocking.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_blocking.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_blocking.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,433 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-
-function updateAllTestPlugins(aState) {
-  setTestPluginEnabledState(aState, "Test Plug-in");
-  setTestPluginEnabledState(aState, "Second Test Plug-in");
-}
-
-function promisePluginActivated() {
-  return SpecialPowers.spawn(gBrowser.selectedBrowser, [], function() {
-    return ContentTaskUtils.waitForCondition(
-      () => content.document.getElementById("test").activated,
-      "Wait for plugin to be activated"
-    );
-  });
-}
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    updateAllTestPlugins(Ci.nsIPluginTag.STATE_ENABLED);
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  // Prime the content process
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>hi</html>"
-  );
-});
-
-// Tests a vulnerable, updatable plugin
-
-add_task(async function() {
-  // enable hard blocklisting of test
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginVulnerableUpdatable",
-    gTestBrowser
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE,
-    "Test 18a, plugin fallback type should be PLUGIN_VULNERABLE_UPDATABLE"
-  );
-  ok(!pluginInfo.activated, "Test 18a, Plugin should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay && overlay.classList.contains("visible"),
-      "Test 18a, Plugin overlay should exist, not be hidden"
-    );
-
-    let updateLink = plugin.openOrClosedShadowRoot.getElementById(
-      "checkForUpdatesLink"
-    );
-    Assert.ok(
-      updateLink.style.visibility != "hidden",
-      "Test 18a, Plugin should have an update link"
-    );
-  });
-
-  let promise = BrowserTestUtils.waitForEvent(
-    gBrowser.tabContainer,
-    "TabOpen",
-    true
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let updateLink = plugin.openOrClosedShadowRoot.getElementById(
-      "checkForUpdatesLink"
-    );
-    let bounds = updateLink.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-  await promise;
-
-  promise = BrowserTestUtils.waitForEvent(
-    gBrowser.tabContainer,
-    "TabClose",
-    true
-  );
-  gBrowser.removeCurrentTab();
-  await promise;
-});
-
-add_task(async function() {
-  // clicking the update link should not activate the plugin
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE,
-    "Test 18a, plugin fallback type should be PLUGIN_VULNERABLE_UPDATABLE"
-  );
-  ok(!pluginInfo.activated, "Test 18b, Plugin should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay && overlay.classList.contains("visible"),
-      "Test 18b, Plugin overlay should exist, not be hidden"
-    );
-  });
-});
-
-// Tests a vulnerable plugin with no update
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginVulnerableNoUpdate",
-    gTestBrowser
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 18c, Should have a click-to-play notification");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_NO_UPDATE,
-    "Test 18c, plugin fallback type should be PLUGIN_VULNERABLE_NO_UPDATE"
-  );
-  ok(!pluginInfo.activated, "Test 18c, Plugin should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay && overlay.classList.contains("visible"),
-      "Test 18c, Plugin overlay should exist, not be hidden"
-    );
-
-    let updateLink = plugin.openOrClosedShadowRoot.getElementById(
-      "checkForUpdatesLink"
-    );
-    Assert.ok(
-      updateLink && updateLink.style.display != "block",
-      "Test 18c, Plugin should not have an update link"
-    );
-  });
-
-  // check that click "Allow" works with blocked plugins
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await promisePluginActivated();
-  pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_NO_UPDATE,
-    "Test 18c, plugin fallback type should be PLUGIN_VULNERABLE_NO_UPDATE"
-  );
-  ok(pluginInfo.activated, "Test 18c, Plugin should be activated");
-  let enabledState = getTestPluginEnabledState();
-  ok(
-    enabledState,
-    "Test 18c, Plugin enabled state should be STATE_CLICKTOPLAY"
-  );
-});
-
-// continue testing "Always allow", make sure it sticks.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 18d, Waited too long for plugin to activate");
-
-  clearAllPluginPermissions();
-});
-
-// clicking the in-content overlay of a vulnerable plugin should bring
-// up the notification and not directly activate the plugin
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 18f, Should have a click-to-play notification");
-  ok(notification.dismissed, "Test 18f, notification should start dismissed");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 18f, Waited too long for plugin to activate");
-
-  var oldEventCallback = notification.options.eventCallback;
-  let promise = promiseForCondition(() => oldEventCallback == null);
-  notification.options.eventCallback = function() {
-    if (oldEventCallback) {
-      oldEventCallback();
-    }
-    oldEventCallback = null;
-  };
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let bounds = plugin.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-  await promise;
-
-  ok(notification, "Test 18g, Should have a click-to-play notification");
-  ok(!notification.dismissed, "Test 18g, notification should be open");
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 18g, Plugin should not be activated");
-});
-
-// Test that "always allow"-ing a plugin will not allow it when it becomes
-// blocklisted.
-add_task(async function() {
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 24a, Should have a click-to-play notification");
-
-  // Plugin should start as CTP
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-    "Test 24a, plugin fallback type should be PLUGIN_CLICK_TO_PLAY"
-  );
-  ok(!pluginInfo.activated, "Test 24a, Plugin should not be active.");
-
-  // simulate "allow"
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await promisePluginActivated();
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 24a, Plugin should be active.");
-
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginVulnerableUpdatable",
-    gTestBrowser
-  );
-});
-
-// the plugin is now blocklisted, so it should not automatically load
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 24b, Should have a click-to-play notification");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE,
-    "Test 24b, plugin fallback type should be PLUGIN_VULNERABLE_UPDATABLE"
-  );
-  ok(!pluginInfo.activated, "Test 24b, Plugin should not be active.");
-
-  // simulate "allow"
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await promisePluginActivated();
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 24b, Plugin should be active.");
-
-  clearAllPluginPermissions();
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-});
-
-// Plugin sync removal test. Note this test produces a notification drop down since
-// the plugin we add has zero dims.
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_syncRemoved.html"
-  );
-
-  // Maybe there some better trick here, we need to wait for the page load, then
-  // wait for the js to execute in the page.
-  await waitForMs(500);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins"
-  );
-  ok(
-    notification,
-    "Test 25: There should be a plugin notification even if the plugin was immediately removed"
-  );
-  ok(
-    notification.dismissed,
-    "Test 25: The notification should be dismissed by default"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>hi</html>"
-  );
-});
-
-// Tests a page with a blocked plugin in it and make sure the infoURL property
-// the blocklist file gets used.
-add_task(async function() {
-  clearAllPluginPermissions();
-
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginInfoURL",
-    gTestBrowser
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins"
-  );
-
-  // Since the plugin notification is dismissed by default, reshow it.
-  await promiseForNotificationShown(notification);
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_BLOCKLISTED,
-    "Test 26, plugin fallback type should be PLUGIN_BLOCKLISTED"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    Assert.ok(!plugin.activated, "Plugin should not be activated.");
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_blocklist_content.js firefox-85.0+build1/browser/base/content/test/plugins/browser_blocklist_content.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_blocklist_content.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_blocklist_content.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-var gTestBrowser = null;
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gChromeRoot = getRootDirectory(gTestPath);
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_ENABLED,
-    "Second Test Plug-in"
-  );
-
-  // Prime the blocklist service, the remote service doesn't launch on startup.
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-});
-
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let test = content.document.getElementById("test");
-    Assert.ok(test.activated, "task 1a: test plugin should be activated!");
-  });
-});
-
-// Load a fresh page, load a new plugin blocklist, then load the same page again.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>GO!</html>"
-  );
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockPluginHard", gTestBrowser);
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let test = content.document.getElementById("test");
-    ok(!test.activated, "task 2a: test plugin shouldn't activate!");
-  });
-});
-
-// Unload the block list and lets do this again, only this time lets
-// hack around in the content blocklist service maliciously.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>GO!</html>"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-
-  // Hack the planet! Load our blocklist shim, so we can mess with blocklist
-  // return results in the content process. Active until we close our tab.
-  let base = gChromeRoot.slice(0, -1);
-
-  let actor = {
-    child: {
-      moduleURI: `${base}/BlocklistTestProxy.jsm`,
-      observer: ["webnavigation-create"],
-    },
-  };
-  ChromeUtils.registerProcessActor("BlocklistTestProxy", actor);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let test = content.document.getElementById("test");
-    Assert.ok(test.activated, "task 3a: test plugin should be activated!");
-  });
-
-  registerCleanupFunction(async function() {
-    let dp =
-      gBrowser.selectedBrowser.browsingContext.currentWindowGlobal.domProcess;
-    await dp.getActor("BlocklistTestProxy").sendQuery("unload");
-
-    ChromeUtils.unregisterProcessActor("BlocklistTestProxy", actor);
-  });
-});
-
-// Load a fresh page, load a new plugin blocklist, then load the same page again.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>GO!</html>"
-  );
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockPluginHard", gTestBrowser);
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let test = content.document.getElementById("test");
-    Assert.ok(!test.activated, "task 4a: test plugin shouldn't activate!");
-  });
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug743421.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug743421.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug743421.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug743421.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  let newTab = BrowserTestUtils.addTab(gBrowser);
-  gBrowser.selectedTab = newTab;
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY,
-    "Second Test Plug-in"
-  );
-
-  // Prime the blocklist service, the remote service doesn't launch on startup.
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-});
-
-// Tests that navigation within the page and the window.history API doesn't break click-to-play state.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_add_dynamically.html"
-  );
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(!notification, "Test 1a, Should not have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    new XPCNativeWrapper(XPCNativeWrapper.unwrap(content).addPlugin());
-  });
-
-  await promisePopupNotification("click-to-play-plugins");
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementsByTagName("embed")[0];
-    Assert.ok(!plugin.activated, "Test 1b, Plugin should not be activated");
-  });
-
-  // Click the activate button on doorhanger to make sure it works
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementsByTagName("embed")[0];
-    Assert.ok(plugin.activated, "Test 1b, Plugin should be activated");
-  });
-});
-
-add_task(async function() {
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 1c, Should still have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    new XPCNativeWrapper(XPCNativeWrapper.unwrap(content).addPlugin());
-    let plugin = content.document.getElementsByTagName("embed")[1];
-    Assert.ok(
-      plugin.activated,
-      "Test 1c, Newly inserted plugin in activated page should be activated"
-    );
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementsByTagName("embed")[1];
-    Assert.ok(plugin.activated, "Test 1d, Plugin should be activated");
-
-    let promise = ContentTaskUtils.waitForEvent(content, "hashchange");
-    content.location += "#anchorNavigation";
-    await promise;
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    new XPCNativeWrapper(XPCNativeWrapper.unwrap(content).addPlugin());
-    let plugin = content.document.getElementsByTagName("embed")[2];
-    Assert.ok(plugin.activated, "Test 1e, Plugin should be activated");
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementsByTagName("embed")[2];
-    Assert.ok(plugin.activated, "Test 1f, Plugin should be activated");
-
-    content.history.replaceState({}, "", "replacedState");
-    new XPCNativeWrapper(XPCNativeWrapper.unwrap(content).addPlugin());
-    plugin = content.document.getElementsByTagName("embed")[3];
-    Assert.ok(plugin.activated, "Test 1g, Plugin should be activated");
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug744745.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug744745.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug744745.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug744745.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let promisePluginBindingAttached = BrowserTestUtils.waitForContentEvent(
-    gTestBrowser,
-    "PluginBindingAttached",
-    true,
-    null,
-    true
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_bug744745.html"
-  );
-
-  await promisePluginBindingAttached;
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    if (!plugin) {
-      Assert.ok(false, "plugin element not available.");
-      return;
-    }
-    // We can't use MochiKit's routine
-    let style = content.getComputedStyle(plugin);
-    Assert.ok(
-      "opacity" in style && style.opacity == 1,
-      "plugin style properly configured."
-    );
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug787619.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug787619.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug787619.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug787619.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-var gWrapperClickCount = 0;
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let testRoot = getRootDirectory(gTestPath).replace(
-    "chrome://mochitests/content/",
-    "http://127.0.0.1:8888/"
-  );
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    testRoot + "plugin_bug787619.html"
-  );
-
-  // Due to layout being async, "PluginBindAttached" may trigger later.
-  // This forces a layout flush, thus triggering it, and schedules the
-  // test so it is definitely executed afterwards.
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  // check plugin state
-  let pluginInfo = await promiseForPluginInfo("plugin");
-  ok(!pluginInfo.activated, "1a plugin should not be activated");
-
-  // click the overlay to prompt
-  let promise = promisePopupNotification("click-to-play-plugins");
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("plugin");
-    let bounds = plugin.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-  await promise;
-
-  // check plugin state
-  pluginInfo = await promiseForPluginInfo("plugin");
-  ok(!pluginInfo.activated, "1b plugin should not be activated");
-
-  let condition = () =>
-    !PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed && PopupNotifications.panel.firstElementChild;
-  await promiseForCondition(condition);
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  // check plugin state
-  pluginInfo = await promiseForPluginInfo("plugin");
-  ok(pluginInfo.activated, "plugin should be activated");
-
-  is(gWrapperClickCount, 0, "wrapper should not have received any clicks");
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug797677.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug797677.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug797677.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug797677.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,12 +7,6 @@
 
 add_task(async function() {
   registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
     Services.console.unregisterListener(errorListener);
     gBrowser.removeCurrentTab();
     window.focus();
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug812562.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug812562.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug812562.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug812562.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-
-add_task(async function() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.navigation.requireUserInteraction", false]],
-  });
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  // Prime the blocklist service, the remote service doesn't launch on startup.
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-});
-
-// Tests that the going back will reshow the notification for click-to-play
-// blocklisted plugins
-add_task(async function() {
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginVulnerableUpdatable",
-    gTestBrowser
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    popupNotification,
-    "test part 1: Should have a click-to-play notification"
-  );
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE,
-    "plugin should be marked as VULNERABLE"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    Assert.ok(
-      !!content.document.getElementById("test"),
-      "test part 1: plugin should not be activated"
-    );
-  });
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-});
-
-add_task(async function() {
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "test part 2: Should not have a click-to-play notification"
-  );
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    Assert.ok(
-      !content.document.getElementById("test"),
-      "test part 2: plugin should not be activated"
-    );
-  });
-
-  let obsPromise = TestUtils.topicObserved(
-    "PopupNotifications-updateNotShowing"
-  );
-  let overlayPromise = promisePopupNotification("click-to-play-plugins");
-  gTestBrowser.goBack();
-  await obsPromise;
-  await overlayPromise;
-});
-
-add_task(async function() {
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    popupNotification,
-    "test part 3: Should have a click-to-play notification"
-  );
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE,
-    "plugin should be marked as VULNERABLE"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    Assert.ok(
-      !!content.document.getElementById("test"),
-      "test part 3: plugin should not be activated"
-    );
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug818118.js firefox-85.0+build1/browser/base/content/test/plugins/browser_bug818118.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_bug818118.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_bug818118.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_both.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(popupNotification, "should have a click-to-play notification");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-    "plugin should be click to play"
-  );
-  ok(!pluginInfo.activated, "plugin should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], () => {
-    let unknown = content.document.getElementById("unknown");
-    ok(unknown, "should have unknown plugin in page");
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata.html firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <title>Plugin Clear Site Data sanitize test</title>
-
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
-    <script type="application/javascript">
-      function testSteps() {
-        // Make sure clearing by timerange is supported.
-        var p = document.getElementById("plugin1");
-        p.setSitesWithDataCapabilities(true);
-
-        p.setSitesWithData(
-          "foo.com:0:5," +
-          "bar.com:0:100," +
-          "baz.com:1:5," +
-          "qux.com:1:100"
-        );
-      }
-    </script>
-  </head>
-
-  <body onload="testSteps();"></body>
-
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata.js firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-var gTestBrowser = null;
-
-// Test clearing plugin data using Sanitizer.jsm.
-const testURL1 = gTestRoot + "browser_clearplugindata.html";
-const testURL2 = gTestRoot + "browser_clearplugindata_noage.html";
-
-const { Sanitizer } = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
-
-const pluginHostIface = Ci.nsIPluginHost;
-var pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-pluginHost.QueryInterface(pluginHostIface);
-
-var pluginTag = getTestPlugin();
-
-function stored(needles) {
-  let something = pluginHost.siteHasData(this.pluginTag, null);
-  if (!needles) {
-    return something;
-  }
-
-  if (!something) {
-    return false;
-  }
-
-  for (let i = 0; i < needles.length; ++i) {
-    if (!pluginHost.siteHasData(this.pluginTag, needles[i])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    if (gTestBrowser) {
-      gBrowser.removeCurrentTab();
-    }
-    window.focus();
-    gTestBrowser = null;
-  });
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_ENABLED,
-    "Second Test Plug-in"
-  );
-});
-
-function setPrefs(cookies, pluginData) {
-  let itemPrefs = Services.prefs.getBranch("privacy.cpd.");
-  itemPrefs.setBoolPref("history", false);
-  itemPrefs.setBoolPref("downloads", false);
-  itemPrefs.setBoolPref("cache", false);
-  itemPrefs.setBoolPref("cookies", cookies);
-  itemPrefs.setBoolPref("formdata", false);
-  itemPrefs.setBoolPref("offlineApps", false);
-  itemPrefs.setBoolPref("passwords", false);
-  itemPrefs.setBoolPref("sessions", false);
-  itemPrefs.setBoolPref("siteSettings", false);
-  itemPrefs.setBoolPref("pluginData", pluginData);
-}
-
-async function testClearingData(url) {
-  // Load page to set data for the plugin.
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  await promiseTabLoadEvent(gBrowser.selectedTab, url);
-
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  ok(
-    stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-    "Data stored for sites"
-  );
-
-  // Clear 20 seconds ago.
-  // In the case of testURL2 the plugin will throw
-  // NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED, which should result in us
-  // clearing all data regardless of age.
-  let now_uSec = Date.now() * 1000;
-  let range = [now_uSec - 20 * 1000000, now_uSec];
-  await Sanitizer.sanitize(null, { range, ignoreTimespan: false });
-
-  if (url == testURL1) {
-    ok(stored(["bar.com", "qux.com"]), "Data stored for sites");
-    ok(!stored(["foo.com"]), "Data cleared for foo.com");
-    ok(!stored(["baz.com"]), "Data cleared for baz.com");
-
-    // Clear everything.
-    await Sanitizer.sanitize(null, { ignoreTimespan: false });
-  }
-
-  ok(!stored(null), "All data cleared");
-
-  gBrowser.removeCurrentTab();
-  gTestBrowser = null;
-}
-
-add_task(async function() {
-  // Test when sanitizing cookies.
-  await setPrefs(true, false);
-  await testClearingData(testURL1);
-  await testClearingData(testURL2);
-
-  // Test when sanitizing pluginData.
-  await setPrefs(false, true);
-  await testClearingData(testURL1);
-  await testClearingData(testURL2);
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata_noage.html firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata_noage.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_clearplugindata_noage.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_clearplugindata_noage.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <title>Plugin Clear Site Data sanitize test without age</title>
-
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
-    <script type="application/javascript">
-      function testSteps() {
-        // Make sure clearing by timerange is disabled.
-        var p = document.getElementById("plugin1");
-        p.setSitesWithDataCapabilities(false);
-
-        p.setSitesWithData(
-          "foo.com:0:5," +
-          "bar.com:0:100," +
-          "baz.com:1:5," +
-          "qux.com:1:100"
-        );
-      }
-    </script>
-  </head>
-
-  <body onload="testSteps();"></body>
-
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_context_menu.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_context_menu.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_context_menu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_context_menu.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-// Test that the activate action in content menus for CTP plugins works
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-  let bindingPromise = BrowserTestUtils.waitForContentEvent(
-    gBrowser.selectedBrowser,
-    "PluginBindingAttached",
-    true,
-    null,
-    true
-  );
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-  await bindingPromise;
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-  ok(popupNotification, "Test 1, Should have a click-to-play notification");
-
-  // check plugin state
-  let pluginInfo = await promiseForPluginInfo("test", gBrowser.selectedBrowser);
-  ok(!pluginInfo.activated, "plugin should not be activated");
-
-  // Display a context menu on the test plugin so we can test
-  // activation menu options.
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    let bounds = plugin.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("contextmenu", left, top, 2, 1, 0);
-  });
-
-  popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-  ok(popupNotification, "Should have a click-to-play notification");
-  ok(popupNotification.dismissed, "notification should be dismissed");
-
-  // fixes a occasional test timeout on win7 opt
-  await promiseForCondition(() => document.getElementById("context-ctp-play"));
-
-  let actMenuItem = document.getElementById("context-ctp-play");
-  ok(actMenuItem, "Should have a context menu entry for activating the plugin");
-
-  // Activate the plugin via the context menu
-  EventUtils.synthesizeMouseAtCenter(actMenuItem, {});
-
-  await promiseForCondition(
-    () =>
-      !PopupNotifications.panel.dismissed &&
-      PopupNotifications.panel.firstElementChild
-  );
-
-  // Activate the plugin
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  // check plugin state
-  pluginInfo = await promiseForPluginInfo("test", gBrowser.selectedBrowser);
-  ok(pluginInfo.activated, "plugin should be activated");
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_crashreporting.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_crashreporting.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_crashreporting.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_crashreporting.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,263 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-const SERVER_URL =
-  "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
-const PLUGIN_PAGE = gTestRoot + "plugin_big.html";
-const PLUGIN_SMALL_PAGE = gTestRoot + "plugin_small.html";
-
-/**
- * Takes an nsIPropertyBag and converts it into a JavaScript Object. It
- * will also convert any nsIPropertyBag's within the nsIPropertyBag
- * recursively.
- *
- * @param aBag
- *        The nsIPropertyBag to convert.
- * @return Object
- *        Keyed on the names of the nsIProperty's within the nsIPropertyBag,
- *        and mapping to their values.
- */
-function convertPropertyBag(aBag) {
-  let result = {};
-  for (let { name, value } of aBag.enumerator) {
-    if (value instanceof Ci.nsIPropertyBag) {
-      value = convertPropertyBag(value);
-    }
-    result[name] = value;
-  }
-  return result;
-}
-
-add_task(async function setup() {
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables plugin
-  // crash reports.  This test needs them enabled.  The test also needs a mock
-  // report server, and fortunately one is already set up by toolkit/
-  // crashreporter/test/Makefile.in.  Assign its URL to MOZ_CRASHREPORTER_URL,
-  // which CrashSubmit.jsm uses as a server override.
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  let noReport = env.get("MOZ_CRASHREPORTER_NO_REPORT");
-  let serverURL = env.get("MOZ_CRASHREPORTER_URL");
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-  env.set("MOZ_CRASHREPORTER_URL", SERVER_URL);
-
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  registerCleanupFunction(function cleanUp() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", noReport);
-    env.set("MOZ_CRASHREPORTER_URL", serverURL);
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    window.focus();
-  });
-});
-
-/**
- * Test that plugin crash submissions still work properly after
- * click-to-play activation.
- */
-add_task(async function() {
-  await BrowserTestUtils.withNewTab(PLUGIN_PAGE, async function(browser) {
-    // Work around for delayed PluginBindingAttached
-    await promiseUpdatePluginBindings(browser);
-
-    let pluginInfo = await promiseForPluginInfo("test", browser);
-    ok(!pluginInfo.activated, "Plugin should not be activated");
-
-    // Simulate clicking the "Allow Always" button.
-    let notification = PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      browser
-    );
-    await promiseForNotificationShown(notification, browser);
-    PopupNotifications.panel.firstElementChild.button.click();
-
-    // Prepare a crash report topic observer that only returns when
-    // the crash report has been successfully sent.
-    let crashReportChecker = (subject, data) => {
-      return data == "success";
-    };
-    let crashReportPromise = TestUtils.topicObserved(
-      "crash-report-status",
-      crashReportChecker
-    );
-
-    await SpecialPowers.spawn(browser, [], async function() {
-      let plugin = content.document.getElementById("test");
-
-      await ContentTaskUtils.waitForCondition(() => {
-        return plugin.activated;
-      }, "Waited too long for plugin to activate.");
-
-      try {
-        Cu.waiveXrays(plugin).crash();
-      } catch (e) {}
-
-      // Wait for the shadow DOM to be connected.
-      await ContentTaskUtils.waitForCondition(
-        () => plugin.openOrClosedShadowRoot,
-        "Need plugin shadow root"
-      );
-
-      let getUI = id => {
-        return plugin.openOrClosedShadowRoot.getElementById(id);
-      };
-
-      // Now wait until the plugin crash report UI shows itself, which is
-      // asynchronous.
-      let statusDiv;
-
-      await ContentTaskUtils.waitForCondition(() => {
-        statusDiv = getUI("submitStatus");
-        return statusDiv?.getAttribute("status") == "please";
-      }, "Waited too long for plugin to show crash report UI");
-
-      // Make sure the UI matches our expectations...
-      let style = content.getComputedStyle(getUI("pleaseSubmit"));
-      if (style.display != "block") {
-        throw new Error(
-          `Submission UI visibility is not correct. ` +
-            `Expected block style, got ${style.display}.`
-        );
-      }
-
-      // Fill the crash report in with some test values that we'll test for in
-      // the parent.
-      getUI("submitComment").value = "a test comment";
-      let optIn = getUI("submitURLOptIn");
-      if (!optIn.checked) {
-        throw new Error("URL opt-in should default to true.");
-      }
-
-      // Submit the report.
-      optIn.click();
-      getUI("submitButton").click();
-
-      // And wait for the parent to say that the crash report was submitted
-      // successfully. This can take time on debug builds.
-      await ContentTaskUtils.waitForCondition(
-        () => {
-          return statusDiv.getAttribute("status") == "success";
-        },
-        "Timed out waiting for plugin binding to be in success state",
-        100,
-        200
-      );
-    });
-
-    let [subject] = await crashReportPromise;
-
-    ok(
-      subject instanceof Ci.nsIPropertyBag,
-      "The crash report subject should be an nsIPropertyBag."
-    );
-
-    let crashData = convertPropertyBag(subject);
-    ok(crashData.serverCrashID, "Should have a serverCrashID set.");
-
-    // Remove the submitted report file after ensuring it exists.
-    let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-    file.initWithPath(Services.crashmanager._submittedDumpsDir);
-    file.append(crashData.serverCrashID + ".txt");
-    ok(file.exists(), "Submitted report file should exist");
-    file.remove(false);
-
-    ok(crashData.extra, "Extra data should exist");
-    is(
-      crashData.extra.PluginUserComment,
-      "a test comment",
-      "Comment in extra data should match comment in textbox"
-    );
-
-    is(
-      crashData.extra.PluginContentURL,
-      undefined,
-      "URL should be absent from extra data when opt-in not checked"
-    );
-  });
-});
-
-/**
- * Test that plugin crash submissions still work properly after
- * click-to-play with the notification bar.
- */
-add_task(async function() {
-  await BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: PLUGIN_SMALL_PAGE,
-    },
-    async function(browser) {
-      // Work around for delayed PluginBindingAttached
-      await promiseUpdatePluginBindings(browser);
-
-      let pluginInfo = await promiseForPluginInfo("test", browser);
-      ok(pluginInfo.activated, "Plugin should be activated from previous test");
-
-      // Prepare a crash report topic observer that only returns when
-      // the crash report has been successfully sent.
-      let crashReportChecker = (subject, data) => {
-        return data == "success";
-      };
-      let crashReportPromise = TestUtils.topicObserved(
-        "crash-report-status",
-        crashReportChecker
-      );
-
-      await SpecialPowers.spawn(browser, [], async function() {
-        let plugin = content.document.getElementById("test");
-
-        await ContentTaskUtils.waitForCondition(() => {
-          return plugin.activated;
-        }, "Waited too long for plugin to activate.");
-
-        try {
-          Cu.waiveXrays(plugin).crash();
-        } catch (e) {}
-      });
-
-      // Wait for the notification bar to be displayed.
-      let notification = await waitForNotificationBar(
-        "plugin-crashed",
-        browser
-      );
-
-      // Then click the button to submit the crash report.
-      let buttons = notification.querySelectorAll(".notification-button");
-      is(buttons.length, 2, "Should have two buttons.");
-
-      // The "Submit Crash Report" button should be the second one.
-      let submitButton = buttons[1];
-      submitButton.click();
-
-      let [subject] = await crashReportPromise;
-
-      ok(
-        subject instanceof Ci.nsIPropertyBag,
-        "The crash report subject should be an nsIPropertyBag."
-      );
-
-      let crashData = convertPropertyBag(subject);
-      ok(crashData.serverCrashID, "Should have a serverCrashID set.");
-
-      // Remove the submitted report file after ensuring it exists.
-      let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-      file.initWithPath(Services.crashmanager._submittedDumpsDir);
-      file.append(crashData.serverCrashID + ".txt");
-      ok(file.exists(), "Submitted report file should exist");
-      file.remove(false);
-
-      is(
-        crashData.extra.PluginContentURL,
-        undefined,
-        "URL should be absent from extra data when opt-in not checked"
-      );
-    }
-  );
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_drag_drop.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_drag_drop.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_drag_drop.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_drag_drop.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,159 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gNewWindow = null;
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gNewWindow.close();
-    await BrowserTestUtils.waitForEvent(gNewWindow, "unload", true);
-    gNewWindow = null;
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-});
-
-add_task(async function() {
-  gNewWindow = gBrowser.replaceTabWithWindow(gBrowser.selectedTab);
-
-  // XXX technically can't load fire before we get this call???
-  await BrowserTestUtils.waitForEvent(gNewWindow, "load", true);
-
-  await promisePopupNotification(
-    "click-to-play-plugins",
-    gNewWindow.gBrowser.selectedBrowser
-  );
-
-  ok(
-    PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gNewWindow.gBrowser.selectedBrowser
-    ),
-    "Should have a click-to-play notification in the tab in the new window"
-  );
-  ok(
-    !PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gBrowser.selectedBrowser
-    ),
-    "Should not have a click-to-play notification in the old window now"
-  );
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gBrowser.swapBrowsersAndCloseOther(
-    gBrowser.selectedTab,
-    gNewWindow.gBrowser.selectedTab
-  );
-
-  await promisePopupNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-
-  ok(
-    PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gBrowser.selectedBrowser
-    ),
-    "Should have a click-to-play notification in the initial tab again"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-});
-
-add_task(async function() {
-  await promisePopupNotification("click-to-play-plugins");
-
-  gNewWindow = gBrowser.replaceTabWithWindow(gBrowser.selectedTab);
-
-  await promiseWaitForFocus(gNewWindow);
-
-  await promisePopupNotification(
-    "click-to-play-plugins",
-    gNewWindow.gBrowser.selectedBrowser
-  );
-});
-
-add_task(async function() {
-  ok(
-    PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gNewWindow.gBrowser.selectedBrowser
-    ),
-    "Should have a click-to-play notification in the tab in the new window"
-  );
-  ok(
-    !PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gBrowser.selectedBrowser
-    ),
-    "Should not have a click-to-play notification in the old window now"
-  );
-
-  let pluginInfo = await promiseForPluginInfo(
-    "test",
-    gNewWindow.gBrowser.selectedBrowser
-  );
-  ok(!pluginInfo.activated, "plugin should not be activated");
-
-  await SpecialPowers.spawn(
-    gNewWindow.gBrowser.selectedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("test");
-      let bounds = plugin.getBoundingClientRect();
-      let left = (bounds.left + bounds.right) / 2;
-      let top = (bounds.top + bounds.bottom) / 2;
-      let utils = content.windowUtils;
-      utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-      utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-    }
-  );
-
-  let condition = () =>
-    !PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gNewWindow.gBrowser.selectedBrowser
-    ).dismissed && gNewWindow.PopupNotifications.panel.firstElementChild;
-  await promiseForCondition(condition);
-});
-
-add_task(async function() {
-  // Click the activate button on doorhanger to make sure it works
-  gNewWindow.PopupNotifications.panel.firstElementChild.button.click();
-
-  let pluginInfo = await promiseForPluginInfo(
-    "test",
-    gNewWindow.gBrowser.selectedBrowser
-  );
-  ok(pluginInfo.activated, "plugin should be activated");
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_favorfallback.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_favorfallback.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_favorfallback.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_favorfallback.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,6 @@
 add_task(async function() {
   registerCleanupFunction(function() {
     clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Shockwave Flash");
     Services.prefs.clearUserPref("plugins.favorfallback.mode");
     Services.prefs.clearUserPref("plugins.favorfallback.rules");
   });
@@ -16,10 +15,6 @@
 
 add_task(async function() {
   Services.prefs.setCharPref("plugins.favorfallback.mode", "follow-ctp");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY,
-    "Shockwave Flash"
-  );
 });
 
 /* The expected behavior of each testcase is documented with its markup
@@ -81,8 +76,8 @@
           );
           is(
             ctpPlugin.pluginFallbackType,
-            Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-            "Plugin is CTP"
+            Ci.nsIObjectLoadingContent.PLUGIN_ALTERNATE,
+            "Plugins always use alternate content"
           );
         }
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_hide_overlay.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_hide_overlay.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_hide_overlay.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_hide_overlay.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY,
-    "Second Test Plug-in"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-  // Tests that the overlay can be hidden for plugins using the close icon.
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    let closeIcon = plugin.openOrClosedShadowRoot.getElementById("closeIcon");
-    let bounds = closeIcon.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-
-    Assert.ok(
-      !overlay.classList.contains("visible"),
-      "overlay should be hidden."
-    );
-  });
-});
-
-// Test that the overlay cannot be interacted with after the user closes the overlay
-add_task(async function() {
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-  setTestPluginEnabledState(
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY,
-    "Second Test Plug-in"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    let closeIcon = plugin.openOrClosedShadowRoot.getElementById("closeIcon");
-    let closeIconBounds = closeIcon.getBoundingClientRect();
-    let overlayBounds = overlay.getBoundingClientRect();
-    let overlayLeft = (overlayBounds.left + overlayBounds.right) / 2;
-    let overlayTop = (overlayBounds.left + overlayBounds.right) / 2;
-    let closeIconLeft = (closeIconBounds.left + closeIconBounds.right) / 2;
-    let closeIconTop = (closeIconBounds.top + closeIconBounds.bottom) / 2;
-    let utils = content.windowUtils;
-    // Simulate clicking on the close icon.
-    utils.sendMouseEvent(
-      "mousedown",
-      closeIconLeft,
-      closeIconTop,
-      0,
-      1,
-      0,
-      false,
-      0,
-      0
-    );
-    utils.sendMouseEvent(
-      "mouseup",
-      closeIconLeft,
-      closeIconTop,
-      0,
-      1,
-      0,
-      false,
-      0,
-      0
-    );
-
-    // Simulate clicking on the overlay.
-    utils.sendMouseEvent(
-      "mousedown",
-      overlayLeft,
-      overlayTop,
-      0,
-      1,
-      0,
-      false,
-      0,
-      0
-    );
-    utils.sendMouseEvent(
-      "mouseup",
-      overlayLeft,
-      overlayTop,
-      0,
-      1,
-      0,
-      false,
-      0,
-      0
-    );
-
-    Assert.ok(
-      overlay.hasAttribute("dismissed") &&
-        !overlay.classList.contains("visible"),
-      "Overlay should be hidden"
-    );
-  });
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins"
-  );
-
-  ok(notification.dismissed, "No notification should be shown");
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_iframe.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_iframe.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_iframe.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_iframe.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_iframe.html"
-  );
-
-  // Tests that the overlays are visible and actionable if the plugin is in an iframe.
-
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let frame = content.document.getElementById("frame");
-    let doc = frame.contentDocument;
-    let plugin = doc.getElementById("test");
-    await ContentTaskUtils.waitForCondition(
-      () => plugin.openOrClosedShadowRoot?.getElementById("main"),
-      "Wait for plugin shadow root"
-    );
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      plugin && overlay.classList.contains("visible"),
-      "Test 1, Plugin overlay should exist, not be hidden"
-    );
-
-    let closeIcon = plugin.openOrClosedShadowRoot.getElementById("closeIcon");
-    let bounds = closeIcon.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = doc.defaultView.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-    Assert.ok(
-      !overlay.classList.contains("visible"),
-      "Test 1, Plugin overlay should exist, be hidden"
-    );
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_nonplugins.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_nonplugins.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_nonplugins.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_nonplugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_DISABLED, "Test Plug-in");
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_two_types.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-  // Test that the click-to-play notification is not shown for non-plugin object elements
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-  ok(popupNotification, "Test 1, Should have a click-to-play notification");
-
-  let pluginRemovedPromise = BrowserTestUtils.waitForContentEvent(
-    gBrowser.selectedBrowser,
-    "PluginRemoved",
-    true,
-    null,
-    true
-  );
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let plugin = content.document.getElementById("secondtestA");
-    plugin.remove();
-    plugin = content.document.getElementById("secondtestB");
-    plugin.remove();
-
-    let image = content.document.createElement("object");
-    image.type = "image/png";
-    image.data = "moz.png";
-    content.document.body.appendChild(image);
-  });
-  await pluginRemovedPromise;
-
-  popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-  ok(popupNotification, "Test 2, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    plugin.remove();
-  });
-
-  popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gBrowser.selectedBrowser
-  );
-  ok(
-    popupNotification,
-    "Test 3, Should still have a click-to-play notification"
-  );
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_outsideScrollArea.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_outsideScrollArea.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_outsideScrollArea.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_outsideScrollArea.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,11 +9,6 @@
 add_task(async function() {
   registerCleanupFunction(function() {
     clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
     Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
     gBrowser.removeCurrentTab();
     window.focus();
@@ -27,22 +22,13 @@
   let newTab = BrowserTestUtils.addTab(gBrowser);
   gBrowser.selectedTab = newTab;
   gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "Test 1, Should not have a click-to-play notification"
-  );
 });
 
-// Test that the click-to-play overlay is not hidden for elements
-// partially or fully outside the viewport.
+// Test that the plugin "blockall" overlay is always present but hidden,
+// regardless of whether the overlay is fully, partially, or not in the
+// viewport.
 
+// fully in viewport
 add_task(async function() {
   await promiseTabLoadEvent(
     gBrowser.selectedTab,
@@ -54,7 +40,7 @@
     let p = doc.createElement("embed");
 
     p.setAttribute("id", "test");
-    p.setAttribute("type", "application/x-test");
+    p.setAttribute("type", "application/x-shockwave-flash");
     p.style.left = "0";
     p.style.bottom = "200px";
 
@@ -64,20 +50,16 @@
   // Work around for delayed PluginBindingAttached
   await promiseUpdatePluginBindings(gTestBrowser);
 
-  await promisePopupNotification("click-to-play-plugins");
-
   await SpecialPowers.spawn(gTestBrowser, [], async function() {
     let plugin = content.document.getElementById("test");
     let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay &&
-        overlay.classList.contains("visible") &&
-        overlay.getAttribute("sizing") != "blank",
-      "Test 2, overlay should be visible."
-    );
+    Assert.ok(overlay);
+    Assert.ok(!overlay.getAttribute("visible"));
+    Assert.ok(overlay.getAttribute("blockall") == "blockall");
   });
 });
 
+// partially in viewport
 add_task(async function() {
   await promiseTabLoadEvent(
     gBrowser.selectedTab,
@@ -89,7 +71,7 @@
     let p = doc.createElement("embed");
 
     p.setAttribute("id", "test");
-    p.setAttribute("type", "application/x-test");
+    p.setAttribute("type", "application/x-shockwave-flash");
     p.style.left = "0";
     p.style.bottom = "-410px";
 
@@ -99,20 +81,16 @@
   // Work around for delayed PluginBindingAttached
   await promiseUpdatePluginBindings(gTestBrowser);
 
-  await promisePopupNotification("click-to-play-plugins");
-
   await SpecialPowers.spawn(gTestBrowser, [], async function() {
     let plugin = content.document.getElementById("test");
     let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay &&
-        overlay.classList.contains("visible") &&
-        overlay.getAttribute("sizing") != "blank",
-      "Test 3, overlay should be visible."
-    );
+    Assert.ok(overlay);
+    Assert.ok(!overlay.getAttribute("visible"));
+    Assert.ok(overlay.getAttribute("blockall") == "blockall");
   });
 });
 
+// not in viewport
 add_task(async function() {
   await promiseTabLoadEvent(
     gBrowser.selectedTab,
@@ -124,7 +102,7 @@
     let p = doc.createElement("embed");
 
     p.setAttribute("id", "test");
-    p.setAttribute("type", "application/x-test");
+    p.setAttribute("type", "application/x-shockwave-flash");
     p.style.left = "-600px";
     p.style.bottom = "0";
 
@@ -134,13 +112,11 @@
   // Work around for delayed PluginBindingAttached
   await promiseUpdatePluginBindings(gTestBrowser);
 
-  await promisePopupNotification("click-to-play-plugins");
   await SpecialPowers.spawn(gTestBrowser, [], async function() {
     let plugin = content.document.getElementById("test");
     let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      !overlay || overlay.getAttribute("sizing") == "blank",
-      "Test 4, overlay should be blank."
-    );
+    Assert.ok(overlay);
+    Assert.ok(!overlay.getAttribute("visible"));
+    Assert.ok(overlay.getAttribute("blockall") == "blockall");
   });
 });
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_overlay_styles.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_overlay_styles.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_overlay_styles.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_overlay_styles.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/* This test ensures that the click-to-play "Activate Plugin" overlay
- * is shown in the right style (which is dependent on its size).
- */
-
-const rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-var gTestBrowser = null;
-
-const gTestcases = {
-  // 10x10
-  testcase1: {
-    sizing: "blank",
-    notext: null,
-  },
-
-  // 40x40
-  testcase2: {
-    sizing: "tiny",
-    notext: "notext",
-  },
-
-  // 100x70
-  testcase3: {
-    sizing: "reduced",
-    notext: "notext",
-  },
-
-  // 200x200
-  testcase4: {
-    sizing: null,
-    notext: "notext",
-  },
-
-  // 300x300
-  testcase5: {
-    sizing: null,
-    notext: null,
-  },
-};
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    gBrowser.removeCurrentTab();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "Sanity check, should not have a click-to-play notification"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_overlay_styles.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [gTestcases], async function(
-    testcases
-  ) {
-    let doc = content.document;
-
-    for (let testcaseId of Object.keys(testcases)) {
-      let plugin = doc.querySelector(`#${testcaseId} > object`);
-      let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-      Assert.ok(overlay, `overlay exists in ${testcaseId}`);
-
-      let expectations = testcases[testcaseId];
-
-      Assert.ok(
-        overlay.classList.contains("visible"),
-        `The expected visibility is correct in ${testcaseId}`
-      );
-
-      Assert.ok(
-        overlay.getAttribute("sizing") == expectations.sizing,
-        `The expected sizing is correct in ${testcaseId}`
-      );
-
-      Assert.ok(
-        overlay.getAttribute("notext") == expectations.notext,
-        `The expected notext is correct in ${testcaseId}`
-      );
-    }
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_resize.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_resize.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_resize.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_resize.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    gBrowser.removeCurrentTab();
-    window.focus();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  let newTab = BrowserTestUtils.addTab(gBrowser);
-  gBrowser.selectedTab = newTab;
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "Test 1, Should not have a click-to-play notification"
-  );
-
-  await promiseTabLoadEvent(newTab, gTestRoot + "plugin_small.html"); // 10x10 plugin
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-});
-
-// Test that the overlay is hidden for "small" plugin elements and is shown
-// once they are resized to a size that can hold the overlay
-add_task(async function() {
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(popupNotification, "Test 2, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      !overlay || overlay.getAttribute("sizing") == "blank",
-      "Test 2, overlay should be blank."
-    );
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    plugin.style.width = "300px";
-  });
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      !overlay || overlay.getAttribute("sizing") == "blank",
-      "Test 3, overlay should be blank."
-    );
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    plugin.style.height = "300px";
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    content.document.getElementById("test").clientTop;
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay && overlay.getAttribute("sizing") != "blank",
-      "Test 4, overlay should be visible."
-    );
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    plugin.style.width = "10px";
-    plugin.style.height = "10px";
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    content.document.getElementById("test").clientTop;
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      !overlay || overlay.getAttribute("sizing") == "blank",
-      "Test 5, overlay should be blank."
-    );
-  });
-});
-
-add_task(async function() {
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    plugin.style.height = "300px";
-    plugin.style.width = "300px";
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    content.document.getElementById("test").clientTop;
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(
-      overlay && overlay.getAttribute("sizing") != "blank",
-      "Test 6, overlay should be visible."
-    );
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_shouldShowOverlay.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_shouldShowOverlay.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_shouldShowOverlay.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_shouldShowOverlay.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/* This test ensures that the click-to-play "Activate Plugin" overlay
- * is shown when expected.
- * All testcases are in the plugin_shouldShowOverlay.html file.
- *
- * Note: Technically, the overlay is *always* shown. When this test was
- * originally written, the meaning of "shown" was "shown with the contents",
- * as opposed to "shown as blank". The behavior hasn't changed, but the naming
- * has: now, a "shown as blank" overlay no longer receives a ".hidden" class.
- * It receives a sizing="blank" attribute.
- */
-
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-var gTestBrowser = null;
-
-add_task(async function() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    gBrowser.removeCurrentTab();
-    gTestBrowser = null;
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "Sanity check, should not have a click-to-play notification"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_shouldShowOverlay.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let testcases = doc.querySelectorAll(".testcase");
-
-    for (let testcase of testcases) {
-      let plugin = testcase.querySelector("object");
-      Assert.ok(plugin, `plugin exists in ${testcase.id}`);
-
-      let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-      Assert.ok(overlay, `overlay exists in ${testcase.id}`);
-
-      let expectedVisibility = testcase.getAttribute("shouldshow") == "true";
-      Assert.ok(
-        (overlay.getAttribute("sizing") != "blank") == expectedVisibility,
-        `The expected visibility is correct in ${testcase.id}`
-      );
-    }
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_zoom.js firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_zoom.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_CTP_zoom.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_CTP_zoom.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,11 +11,6 @@
 add_task(async function() {
   registerCleanupFunction(function() {
     clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
     Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
     FullZoom.reset(); // must be called before closing the tab we zoomed!
     gBrowser.removeCurrentTab();
@@ -30,17 +25,6 @@
   gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
   gTestBrowser = gBrowser.selectedBrowser;
 
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Test Plug-in");
-
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(
-    !popupNotification,
-    "Test 1, Should not have a click-to-play notification"
-  );
-
   await promiseTabLoadEvent(
     gBrowser.selectedTab,
     gTestRoot + "plugin_zoom.html"
@@ -48,8 +32,6 @@
 
   // Work around for delayed PluginBindingAttached
   await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
 });
 
 // Enlarges the zoom level 4 times and tests that the overlay is
@@ -69,8 +51,10 @@
       let plugin = doc.getElementById("test");
       let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
       Assert.ok(
-        overlay && overlay.classList.contains("visible"),
-        "Overlay should be visible for zoom change count " + args.count
+        overlay &&
+          !overlay.classList.contains("visible") &&
+          overlay.getAttribute("blockall") == "blockall",
+        "Overlay should be present for zoom change count " + args.count
       );
     });
   }
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser.ini firefox-85.0+build1/browser/base/content/test/plugins/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -3,95 +3,23 @@
   plugin.load_flash_only=false
 support-files =
   BlocklistTestProxy.jsm
-  blockNoPlugins-plugins.json
-  blockPluginHard-plugins.json
-  blockPluginInfoURL-plugins.json
-  blockPluginVulnerableNoUpdate-plugins.json
-  blockPluginVulnerableUpdatable-plugins.json
-  browser_clearplugindata.html
-  browser_clearplugindata_noage.html
   empty_file.html
   head.js
-  plugin_add_dynamically.html
-  plugin_alternate_content.html
-  plugin_big.html
-  plugin_both.html
-  plugin_both2.html
-  plugin_bug744745.html
-  plugin_bug749455.html
-  plugin_bug787619.html
   plugin_bug797677.html
   plugin_favorfallback.html
-  plugin_hidden_to_visible.html
-  plugin_iframe.html
   plugin_outsideScrollArea.html
-  plugin_overlay_styles.html
   plugin_simple_blank.swf
-  plugin_shouldShowOverlay.html
-  plugin_small.html
-  plugin_small_2.html
-  plugin_syncRemoved.html
   plugin_test.html
-  plugin_test2.html
-  plugin_two_types.html
-  plugin_unknown.html
-  plugin_crashCommentAndURL.html
   plugin_zoom.html
 
-[browser_bug743421.js]
-tags = blocklist
-[browser_bug744745.js]
-[browser_bug787619.js]
 [browser_bug797677.js]
-[browser_bug812562.js]
-tags = blocklist
-[browser_bug818118.js]
-[browser_clearplugindata.js]
-tags = blocklist
-[browser_CTP_context_menu.js]
-skip-if = fission || toolkit == "gtk" # Fails with Fission, and we're unlikely to spend time to fix it. fails intermittently on Linux (bug 909342)
-tags = blocklist
-[browser_CTP_crashreporting.js]
-skip-if = !crashreporter || verify || os == 'win' # bug 1442837
-tags = blocklist
-[browser_CTP_drag_drop.js]
-tags = blocklist
 [browser_CTP_favorfallback.js]
-[browser_CTP_hide_overlay.js]
-tags = blocklist
-[browser_CTP_iframe.js]
-tags = blocklist
-[browser_CTP_nonplugins.js]
-skip-if = verify
-tags = blocklist
 [browser_CTP_outsideScrollArea.js]
 tags = blocklist
-[browser_CTP_overlay_styles.js]
-[browser_CTP_resize.js]
-tags = blocklist
-[browser_CTP_shouldShowOverlay.js]
 [browser_CTP_zoom.js]
 tags = blocklist
-[browser_blocking.js]
-tags = blocklist
-[browser_iterate_hidden_plugins.js]
-[browser_plugin_framed_domain.js]
-[browser_pluginnotification.js]
-tags = blocklist
-[browser_plugin_reloading.js]
-tags = blocklist
-[browser_blocklist_content.js]
-skip-if = !e10s
-tags = blocklist
 [browser_enable_DRM_prompt.js]
 skip-if = (os == 'win' && processor == 'aarch64') # bug 1533164
 [browser_private_browsing_eme_persistent_state.js]
 [browser_globalplugin_crashinfobar.js]
 skip-if = !crashreporter
-[browser_pluginCrashCommentAndURL.js]
-skip-if = fission || !crashreporter # Fails with Fission, and we're unlikely to spend time to fix it.
-[browser_pluginCrashReportNonDeterminism.js]
-skip-if = !crashreporter
-[browser_private_clicktoplay.js]
-[browser_subframe_access_hidden_plugins.js]
-skip-if = fission # Fails with Fission, and we're unlikely to spend time to fix it.
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_iterate_hidden_plugins.js firefox-85.0+build1/browser/base/content/test/plugins/browser_iterate_hidden_plugins.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_iterate_hidden_plugins.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_iterate_hidden_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-"use strict";
-
-const TEST_PLUGIN_NAME = "Test Plug-in";
-const HIDDEN_CTP_PLUGIN_PREF = "plugins.navigator.hidden_ctp_plugin";
-
-/**
- * If a plugin is click-to-play and named in HIDDEN_CTP_PLUGIN_PREF,
- * then the plugin should be hidden in the navigator.plugins list by default
- * when iterating.
- */
-
-add_task(async function setup() {
-  // We'll make the Test Plugin click-to-play.
-  let originalPluginState = getTestPluginEnabledState();
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-  registerCleanupFunction(() => {
-    setTestPluginEnabledState(originalPluginState);
-  });
-
-  // And then make the plugin hidden.
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      [HIDDEN_CTP_PLUGIN_PREF, TEST_PLUGIN_NAME],
-      ["plugins.show_infobar", true],
-    ],
-  });
-});
-
-/**
- * Tests that if a plugin is click-to-play and in the
- * HIDDEN_CTP_PLUGIN_PREF list, then it shouldn't be visible
- * when iterating navigator.plugins.
- */
-add_task(async function test_plugin_is_hidden_on_iteration() {
-  // The plugin should not be visible when we iterate
-  // navigator.plugins.
-  await BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: "http://example.com",
-    },
-    async function(browser) {
-      await SpecialPowers.spawn(browser, [TEST_PLUGIN_NAME], async function(
-        pluginName
-      ) {
-        let plugins = Array.from(content.navigator.plugins);
-        Assert.ok(
-          plugins.every(p => p.name != pluginName),
-          "Should not find Test Plugin"
-        );
-      });
-    }
-  );
-
-  // Now clear the HIDDEN_CTP_PLUGIN_PREF temporarily and
-  // make sure we can see the plugin again.
-  await SpecialPowers.pushPrefEnv({
-    set: [[HIDDEN_CTP_PLUGIN_PREF, ""]],
-  });
-
-  // Note that I have to do this in a new tab since navigator
-  // caches navigator.plugins after an initial read.
-  await BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: "http://example.com",
-    },
-    async function(browser) {
-      await SpecialPowers.spawn(browser, [TEST_PLUGIN_NAME], async function(
-        pluginName
-      ) {
-        let plugins = Array.from(content.navigator.plugins);
-        Assert.ok(
-          plugins.some(p => p.name == pluginName),
-          "Should have found the Test Plugin"
-        );
-      });
-    }
-  );
-
-  await SpecialPowers.popPrefEnv();
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginCrashCommentAndURL.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,315 +0,0 @@
-/* global gBrowser */
-ChromeUtils.import("resource://gre/modules/CrashSubmit.jsm", this);
-
-const SERVER_URL =
-  "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
-
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gTestBrowser = null;
-var config = {};
-
-add_task(async function() {
-  // The test harness sets MOZ_CRASHREPORTER_NO_REPORT, which disables plugin
-  // crash reports.  This test needs them enabled.  The test also needs a mock
-  // report server, and fortunately one is already set up by toolkit/
-  // crashreporter/test/Makefile.in.  Assign its URL to MOZ_CRASHREPORTER_URL,
-  // which CrashSubmit.jsm uses as a server override.
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  let noReport = env.get("MOZ_CRASHREPORTER_NO_REPORT");
-  let serverUrl = env.get("MOZ_CRASHREPORTER_URL");
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-  env.set("MOZ_CRASHREPORTER_URL", SERVER_URL);
-
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  // Crash immediately
-  Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", 0);
-
-  registerCleanupFunction(async function() {
-    Services.prefs.clearUserPref("dom.ipc.plugins.timeoutSecs");
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", noReport);
-    env.set("MOZ_CRASHREPORTER_URL", serverUrl);
-    env = null;
-    config = null;
-    gTestBrowser = null;
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  config = {
-    shouldSubmissionUIBeVisible: true,
-    comment: "",
-    urlOptIn: false,
-  };
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED);
-
-  let pluginCrashed = promisePluginCrashed();
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_crashCommentAndURL.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  // Wait for the plugin to crash
-  await pluginCrashed;
-
-  let crashReportStatus = TestUtils.topicObserved(
-    "crash-report-status",
-    onSubmitStatus
-  );
-
-  // Test that the crash submission UI is actually visible and submit the crash report.
-  await SpecialPowers.spawn(gTestBrowser, [config], async function(aConfig) {
-    let doc = content.document;
-    let plugin = doc.getElementById("plugin");
-    let pleaseSubmit = plugin.openOrClosedShadowRoot.getElementById(
-      "pleaseSubmit"
-    );
-    let submitButton = plugin.openOrClosedShadowRoot.getElementById(
-      "submitButton"
-    );
-    // Test that we don't send the URL when urlOptIn is false.
-    plugin.openOrClosedShadowRoot.getElementById("submitURLOptIn").checked =
-      aConfig.urlOptIn;
-    submitButton.click();
-    Assert.equal(
-      content.getComputedStyle(pleaseSubmit).display == "block",
-      aConfig.shouldSubmissionUIBeVisible,
-      "The crash UI should be visible"
-    );
-  });
-
-  await crashReportStatus;
-});
-
-add_task(async function() {
-  config = {
-    shouldSubmissionUIBeVisible: true,
-    comment: "a test comment",
-    urlOptIn: true,
-  };
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED);
-
-  let pluginCrashed = promisePluginCrashed();
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_crashCommentAndURL.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  // Wait for the plugin to crash
-  await pluginCrashed;
-
-  let crashReportStatus = TestUtils.topicObserved(
-    "crash-report-status",
-    onSubmitStatus
-  );
-
-  // Test that the crash submission UI is actually visible and submit the crash report.
-  await SpecialPowers.spawn(gTestBrowser, [config], async function(aConfig) {
-    let doc = content.document;
-    let plugin = doc.getElementById("plugin");
-    let pleaseSubmit = plugin.openOrClosedShadowRoot.getElementById(
-      "pleaseSubmit"
-    );
-    let submitButton = plugin.openOrClosedShadowRoot.getElementById(
-      "submitButton"
-    );
-    // Test that we send the URL when urlOptIn is true.
-    plugin.openOrClosedShadowRoot.getElementById("submitURLOptIn").checked =
-      aConfig.urlOptIn;
-    plugin.openOrClosedShadowRoot.getElementById("submitComment").value =
-      aConfig.comment;
-    submitButton.click();
-    Assert.equal(
-      content.getComputedStyle(pleaseSubmit).display == "block",
-      aConfig.shouldSubmissionUIBeVisible,
-      "The crash UI should be visible"
-    );
-  });
-
-  await crashReportStatus;
-});
-
-add_task(async function() {
-  config = {
-    shouldSubmissionUIBeVisible: false,
-    comment: "",
-    urlOptIn: true,
-  };
-
-  // Deferred promise object used by the test to wait for the crash handler
-  let crashDeferred = PromiseUtils.defer();
-
-  // Clear out any minidumps we create from plugin crashes, this is needed
-  // because we do not submit the crash otherwise the submission process would
-  // have deleted the crash dump files for us.
-  let crashObserver = (subject, topic, data) => {
-    if (topic != "plugin-crashed") {
-      return;
-    }
-
-    let propBag = subject.QueryInterface(Ci.nsIPropertyBag2);
-    let minidumpID = propBag.getPropertyAsAString("pluginDumpID");
-    let additionalDumps = propBag.getPropertyAsACString("additionalMinidumps");
-
-    Services.crashmanager.ensureCrashIsPresent(minidumpID).then(() => {
-      let minidumpDir = Services.dirsvc.get("UAppData", Ci.nsIFile);
-      minidumpDir.append("Crash Reports");
-      minidumpDir.append("pending");
-
-      let pluginDumpFile = minidumpDir.clone();
-      pluginDumpFile.append(minidumpID + ".dmp");
-
-      let extraFile = minidumpDir.clone();
-      extraFile.append(minidumpID + ".extra");
-
-      pluginDumpFile.remove(false);
-      extraFile.remove(false);
-
-      if (additionalDumps.length) {
-        const names = additionalDumps.split(",");
-        for (const name of names) {
-          let additionalDumpFile = minidumpDir.clone();
-          additionalDumpFile.append(minidumpID + "-" + name + ".dmp");
-          additionalDumpFile.remove(false);
-        }
-      }
-
-      crashDeferred.resolve();
-    });
-  };
-
-  Services.obs.addObserver(crashObserver, "plugin-crashed");
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED);
-
-  let pluginCrashed = promisePluginCrashed();
-
-  // Make sure that the plugin container is too small to display the crash submission UI
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot +
-      "plugin_crashCommentAndURL.html?" +
-      encodeURIComponent(JSON.stringify({ width: 300, height: 300 }))
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  // Wait for the plugin to crash
-  await pluginCrashed;
-
-  // Test that the crash submission UI is not visible and do not submit a crash report.
-  await SpecialPowers.spawn(gTestBrowser, [config], async function(aConfig) {
-    let doc = content.document;
-    let plugin = doc.getElementById("plugin");
-    let pleaseSubmit = plugin.openOrClosedShadowRoot.getElementById(
-      "pleaseSubmit"
-    );
-    Assert.equal(
-      !!pleaseSubmit &&
-        content.getComputedStyle(pleaseSubmit).display == "block",
-      aConfig.shouldSubmissionUIBeVisible,
-      "Plugin crash UI should not be visible"
-    );
-  });
-
-  await crashDeferred.promise;
-  Services.obs.removeObserver(crashObserver, "plugin-crashed");
-});
-
-function promisePluginCrashed() {
-  return new ContentTask.spawn(gTestBrowser, {}, async function() {
-    await new Promise(resolve => {
-      addEventListener(
-        "PluginCrashReporterDisplayed",
-        function onPluginCrashed() {
-          removeEventListener("PluginCrashReporterDisplayed", onPluginCrashed);
-          resolve();
-        }
-      );
-    });
-  });
-}
-
-function onSubmitStatus(aSubject, aData) {
-  if (aData === "submitting") {
-    return false;
-  }
-
-  is(aData, "success", "The crash report should be submitted successfully");
-
-  let propBag = aSubject.QueryInterface(Ci.nsIPropertyBag);
-  if (aData == "success") {
-    let remoteID = getPropertyBagValue(propBag, "serverCrashID");
-    ok(!!remoteID, "serverCrashID should be set");
-
-    // Remove the submitted report file.
-    let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-    file.initWithPath(Services.crashmanager._submittedDumpsDir);
-    file.append(remoteID + ".txt");
-    ok(file.exists(), "Submitted report file should exist");
-    file.remove(false);
-  }
-
-  let extra = getPropertyBagValue(propBag, "extra");
-  ok(extra instanceof Ci.nsIPropertyBag, "Extra data should be property bag");
-
-  let val = getPropertyBagValue(extra, "PluginUserComment");
-  if (config.comment) {
-    is(
-      val,
-      config.comment,
-      "Comment in extra data should match comment in textbox"
-    );
-  } else {
-    ok(
-      val === undefined,
-      "Comment should be absent from extra data when textbox is empty"
-    );
-  }
-
-  val = getPropertyBagValue(extra, "PluginContentURL");
-  if (config.urlOptIn) {
-    is(
-      val,
-      gBrowser.currentURI.spec,
-      "URL in extra data should match browser URL when opt-in checked"
-    );
-  } else {
-    ok(
-      val === undefined,
-      "URL should be absent from extra data when opt-in not checked"
-    );
-  }
-
-  return true;
-}
-
-function getPropertyBagValue(bag, key) {
-  try {
-    var val = bag.getProperty(key);
-  } catch (e) {
-    if (e.result != Cr.NS_ERROR_FAILURE) {
-      throw e;
-    }
-  }
-  return val;
-}
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginCrashReportNonDeterminism.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,321 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const { PromiseUtils } = ChromeUtils.import(
-  "resource://gre/modules/PromiseUtils.jsm"
-);
-
-const { PluginManager } = ChromeUtils.import(
-  "resource:///actors/PluginParent.jsm"
-);
-
-/**
- * With e10s, plugins must run in their own process. This means we have
- * three processes at a minimum when we're running a plugin:
- *
- * 1) The main browser, or "chrome" process
- * 2) The content process hosting the plugin instance
- * 3) The plugin process
- *
- * If the plugin process crashes, we cannot be sure if the chrome process
- * will hear about it first, or the content process will hear about it
- * first. Because of how IPC works, that's really up to the operating system,
- * and we assume any guarantees about it, so we have to account for both
- * possibilities.
- *
- * This test exercises the browser's reaction to both possibilities.
- */
-
-const CRASH_URL =
-  "http://example.com/browser/browser/base/content/test/plugins/plugin_crashCommentAndURL.html";
-
-/**
- * In order for our test to work, we need to be able to put a plugin
- * in a very specific state. Specifically, we need it to match the
- * :-moz-handler-crashed pseudoselector. The only way I can find to
- * do that is by actually crashing the plugin. So we wait for the
- * plugin to crash and show the "please" state (since that will
- * only show if both the message from the parent has been received
- * AND the PluginCrashed event has fired).
- *
- * Once in that state, we try to rewind the clock a little bit - we clear
- * out the crashData cache in the PluginContent with a message, and we also
- * override the pluginFallbackState of the <object> to fool PluginContent
- * into believing that the plugin is in a particular state.
- *
- * @param browser
- *        The browser that has loaded the CRASH_URL that we need to
- *        prepare to be in the special state.
- * @param pluginFallbackState
- *        The value we should override the <object>'s pluginFallbackState
- *        with.
- * @return Promise
- *        The Promise resolves when the plugin has officially been put into
- *        the crash reporter state, and then "rewound" to have the "status"
- *        attribute of the statusDiv removed. The resolved Promise returns
- *        the run ID for the crashed plugin. It rejects if we never get into
- *        the crash reporter state.
- */
-function preparePlugin(browser, pluginFallbackState) {
-  return SpecialPowers.spawn(browser, [pluginFallbackState], async function(
-    contentPluginFallbackState
-  ) {
-    let plugin = content.document.getElementById("plugin");
-    // CRASH_URL will load a plugin that crashes immediately. We
-    // wait until the plugin has finished being put into the crash
-    // state.
-    let statusDiv;
-    await ContentTaskUtils.waitForCondition(() => {
-      statusDiv = plugin.openOrClosedShadowRoot.getElementById("submitStatus");
-
-      return statusDiv && statusDiv.getAttribute("status") == "please";
-    }, "Timed out waiting for plugin to be in crash report state");
-
-    // "Rewind", by wiping out the status attribute...
-    statusDiv.removeAttribute("status");
-    // Somehow, I'm able to get away with overriding the getter for
-    // this XPCOM object. Probably because I've got chrome privledges.
-    Object.defineProperty(plugin, "pluginFallbackType", {
-      get() {
-        return contentPluginFallbackState;
-      },
-    });
-    return plugin.runID;
-  }).then(runID => {
-    let { currentWindowGlobal } = browser.frameLoader.browsingContext;
-    currentWindowGlobal
-      .getActor("Plugin")
-      .sendAsyncMessage("PluginParent:Test:ClearCrashData");
-    return runID;
-  });
-}
-
-// Bypass click-to-play
-setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED);
-
-// Deferred promise object used by the test to wait for the crash handler
-let crashDeferred = null;
-
-// Clear out any minidumps we create from plugins - we really don't care
-// about them.
-let crashObserver = (subject, topic, data) => {
-  if (topic != "plugin-crashed") {
-    return;
-  }
-
-  let propBag = subject.QueryInterface(Ci.nsIPropertyBag2);
-  let minidumpID = propBag.getPropertyAsAString("pluginDumpID");
-  let additionalMinidumps = propBag.getPropertyAsACString(
-    "additionalMinidumps"
-  );
-
-  Services.crashmanager.ensureCrashIsPresent(minidumpID).then(() => {
-    let minidumpDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-    minidumpDir.append("minidumps");
-
-    let pluginDumpFile = minidumpDir.clone();
-    pluginDumpFile.append(minidumpID + ".dmp");
-
-    let extraFile = minidumpDir.clone();
-    extraFile.append(minidumpID + ".extra");
-
-    ok(pluginDumpFile.exists(), "Found minidump");
-    ok(extraFile.exists(), "Found extra file");
-
-    pluginDumpFile.remove(false);
-    extraFile.remove(false);
-
-    if (additionalMinidumps.length) {
-      const names = additionalMinidumps.split(",");
-      for (const name of names) {
-        let additionalDumpFile = minidumpDir.clone();
-        additionalDumpFile.append(minidumpID + "-" + name + ".dmp");
-        additionalDumpFile.remove(false);
-      }
-    }
-
-    crashDeferred.resolve();
-  });
-};
-
-Services.obs.addObserver(crashObserver, "plugin-crashed");
-// plugins.testmode will make PluginParent:Test:ClearCrashData work.
-Services.prefs.setBoolPref("plugins.testmode", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("plugins.testmode");
-  Services.obs.removeObserver(crashObserver, "plugin-crashed");
-});
-
-/**
- * In this case, the chrome process hears about the crash first.
- */
-add_task(async function testChromeHearsPluginCrashFirst() {
-  // Setup the crash observer promise
-  crashDeferred = PromiseUtils.defer();
-
-  // Open a remote window so that we can run this test even if e10s is not
-  // enabled by default.
-  let win = await BrowserTestUtils.openNewBrowserWindow({ remote: true });
-  let browser = win.gBrowser.selectedBrowser;
-
-  BrowserTestUtils.loadURI(browser, CRASH_URL);
-  await BrowserTestUtils.browserLoaded(browser);
-
-  // In this case, we want the <object> to match the -moz-handler-crashed
-  // pseudoselector, but we want it to seem still active, because the
-  // content process is not yet supposed to know that the plugin has
-  // crashed.
-  await preparePlugin(browser, Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE);
-
-  // In this case, the parent responds immediately when the child asks
-  // for crash data. in `testContentHearsCrashFirst we will delay the
-  // response (simulating what happens if the parent doesn't know about
-  // the crash yet).
-  await SpecialPowers.spawn(browser, [], async function() {
-    // At this point, the content process should have heard the
-    // plugin crash message from the parent, and we are OK to emit
-    // the PluginCrashed event.
-    let plugin = content.document.getElementById("plugin");
-    let statusDiv = plugin.openOrClosedShadowRoot.getElementById(
-      "submitStatus"
-    );
-
-    if (statusDiv.getAttribute("status") == "please") {
-      Assert.ok(false, "Did not expect plugin to be in crash report mode yet.");
-      return;
-    }
-
-    // Now we need the plugin to seem crashed to the child actor, without
-    // actually crashing the plugin again. We hack around this by overriding
-    // the pluginFallbackType again.
-    Object.defineProperty(plugin, "pluginFallbackType", {
-      get() {
-        return Ci.nsIObjectLoadingContent.PLUGIN_CRASHED;
-      },
-    });
-
-    let event = new content.PluginCrashedEvent("PluginCrashed", {
-      pluginName: "",
-      pluginDumpID: "",
-      submittedCrashReport: false,
-      bubbles: true,
-      cancelable: true,
-    });
-
-    plugin.dispatchEvent(event);
-    // The plugin child actor will go fetch crash info in the parent. Wait
-    // for it to come back:
-    await ContentTaskUtils.waitForCondition(
-      () => statusDiv.getAttribute("status") == "please"
-    );
-    Assert.equal(
-      statusDiv.getAttribute("status"),
-      "please",
-      "Should have been showing crash report UI"
-    );
-  });
-  await BrowserTestUtils.closeWindow(win);
-  await crashDeferred.promise;
-});
-
-/**
- * In this case, the content process hears about the crash first.
- */
-add_task(async function testContentHearsCrashFirst() {
-  // Setup the crash observer promise
-  crashDeferred = PromiseUtils.defer();
-
-  // Open a remote window so that we can run this test even if e10s is not
-  // enabled by default.
-  let win = await BrowserTestUtils.openNewBrowserWindow({ remote: true });
-  let browser = win.gBrowser.selectedBrowser;
-
-  BrowserTestUtils.loadURI(browser, CRASH_URL);
-  await BrowserTestUtils.browserLoaded(browser);
-
-  // In this case, we want the <object> to match the -moz-handler-crashed
-  // pseudoselector, and we want the plugin to seem crashed, since the
-  // content process in this case has heard about the crash first.
-  let runID = await preparePlugin(
-    browser,
-    Ci.nsIObjectLoadingContent.PLUGIN_CRASHED
-  );
-
-  // We resolve this promise when we're ready to tell the child from the parent.
-  let allowParentToRespond = PromiseUtils.defer();
-  // This promise is resolved as soon as we're contacted by the child.
-  // It forces the parent not to respond until `allowParentToRespond` has been
-  // resolved.
-  let parentRequestPromise = new Promise(resolve => {
-    PluginManager.mockResponse(browser, function(data) {
-      resolve(data);
-
-      return allowParentToRespond.promise.then(() => {
-        return { pluginName: "", runID, state: "please" };
-      });
-    });
-  });
-
-  await SpecialPowers.spawn(browser, [], async function() {
-    // At this point, the content process has not yet heard from the
-    // parent about the crash report. Let's ensure that by making sure
-    // we're not showing the plugin crash report UI.
-    let plugin = content.document.getElementById("plugin");
-    let statusDiv = plugin.openOrClosedShadowRoot.getElementById(
-      "submitStatus"
-    );
-
-    if (statusDiv.getAttribute("status") == "please") {
-      Assert.ok(false, "Did not expect plugin to be in crash report mode yet.");
-    }
-
-    let event = new content.PluginCrashedEvent("PluginCrashed", {
-      pluginName: "",
-      pluginDumpID: "",
-      submittedCrashReport: false,
-      bubbles: true,
-      cancelable: true,
-    });
-
-    plugin.dispatchEvent(event);
-  });
-  let receivedData = await parentRequestPromise;
-  is(receivedData.runID, runID, "Should get a request for the same crash.");
-
-  await SpecialPowers.spawn(browser, [], function() {
-    let plugin = content.document.getElementById("plugin");
-    let statusDiv = plugin.openOrClosedShadowRoot.getElementById(
-      "submitStatus"
-    );
-    Assert.notEqual(
-      statusDiv.getAttribute("status"),
-      "please",
-      "Should not yet be showing crash report UI"
-    );
-  });
-
-  // Now allow the parent to respond to the child with crash info:
-  allowParentToRespond.resolve();
-
-  await SpecialPowers.spawn(browser, [], async function() {
-    // At this point, the content process will have heard the message
-    // from the parent and reacted to it. We should be showing the plugin
-    // crash report UI now.
-    let plugin = content.document.getElementById("plugin");
-    let statusDiv = plugin.openOrClosedShadowRoot.getElementById(
-      "submitStatus"
-    );
-    await ContentTaskUtils.waitForCondition(() => {
-      return statusDiv && statusDiv.getAttribute("status") == "please";
-    });
-
-    Assert.equal(
-      statusDiv.getAttribute("status"),
-      "please",
-      "Should have been showing crash report UI"
-    );
-  });
-
-  await BrowserTestUtils.closeWindow(win);
-  await crashDeferred.promise;
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_plugin_framed_domain.js firefox-85.0+build1/browser/base/content/test/plugins/browser_plugin_framed_domain.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_plugin_framed_domain.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_plugin_framed_domain.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "https://example.com/"
-);
-
-/**
- * Verify that giving permission to a plugin works based on the toplevel
- * page's principal, so that permissions meant for framed plugins persist
- * correctly for the duration of the session.
- */
-add_task(async function test_toplevel_frame_permission() {
-  await BrowserTestUtils.withNewTab(
-    gTestRoot + "empty_file.html",
-    async browser => {
-      // Add a cross-origin iframe and return when it's loaded.
-      await SpecialPowers.spawn(browser.browsingContext, [], async function() {
-        let doc = content.document;
-        let iframe = doc.createElement("iframe");
-        let loadPromise = ContentTaskUtils.waitForEvent(iframe, "load");
-        iframe.src = doc.location.href.replace(".com/", ".org/");
-        doc.body.appendChild(iframe);
-        // Note that we cannot return (rather than await) loadPromise, because
-        // it resolves with the event, which isn't structured-clonable.
-        await loadPromise;
-      });
-
-      // Show a plugin notification from the iframe's actor:
-      let { currentWindowGlobal } = browser.browsingContext.children[0];
-      let actor = currentWindowGlobal.getActor("Plugin");
-      const kHost = Cc["@mozilla.org/plugin/host;1"].getService(
-        Ci.nsIPluginHost
-      );
-      const { PLUGIN_CLICK_TO_PLAY } = Ci.nsIObjectLoadingContent;
-      let plugin = kHost.getPluginTags()[0];
-      actor.showClickToPlayNotification(
-        browser,
-        { id: plugin.id, fallbackType: PLUGIN_CLICK_TO_PLAY },
-        false /* showNow */
-      );
-
-      // Check that it is associated with the toplevel origin (.com), not
-      // the subframe's origin (.org):
-      let notification = PopupNotifications.getNotification(
-        "click-to-play-plugins",
-        browser
-      );
-      is(
-        notification.options.principal.host,
-        "example.com",
-        "Should use top host for permission prompt!"
-      );
-    }
-  );
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginnotification.js firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginnotification.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_pluginnotification.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_pluginnotification.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,626 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-var gTestBrowser = null;
-
-function updateAllTestPlugins(aState) {
-  setTestPluginEnabledState(aState, "Test Plug-in");
-  setTestPluginEnabledState(aState, "Second Test Plug-in");
-}
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gTestBrowser = null;
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  // Prime the blocklist service, the remote service doesn't launch on startup.
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-});
-
-// Tests a page with an unknown plugin in it.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_unknown.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("unknown");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED,
-    "Test 1a, plugin fallback type should be PLUGIN_UNSUPPORTED"
-  );
-});
-
-// Test that the doorhanger is shown when the user clicks on the overlay
-// after having previously blocked the plugin.
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Plugin should not be activated");
-
-  // Simulate clicking the "Allow" button.
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Plugin should be activated");
-
-  // Simulate clicking the "Block" button.
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.secondaryButton.click();
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Plugin should not be activated");
-
-  let browserLoaded = BrowserTestUtils.browserLoaded(gTestBrowser);
-  gTestBrowser.reload();
-  await browserLoaded;
-  notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-
-  // Simulate clicking the overlay
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let bounds = plugin.openOrClosedShadowRoot
-      .getElementById("main")
-      .getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-
-  ok(!notification.dismissed, "A plugin notification should be shown.");
-
-  clearAllPluginPermissions();
-});
-
-// Tests that going back will reshow the notification for click-to-play plugins
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>hi</html>"
-  );
-
-  // make sure the notification is gone
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(!notification, "Test 11b, Should not have a click-to-play notification");
-
-  gTestBrowser.webNavigation.goBack();
-
-  await promisePopupNotification("click-to-play-plugins");
-});
-
-// Tests that the "Allow Always" permission works for click-to-play plugins
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 12a, Plugin should not be activated");
-
-  // Simulate clicking the "Allow" button.
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-
-  await promiseForNotificationShown(notification);
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 12a, Plugin should be activated");
-});
-
-// Test that the "Always" permission, when set for just the Test plugin,
-// does not also allow the Second Test plugin.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_two_types.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  await promisePopupNotification("click-to-play-plugins");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let test = content.document.getElementById("test");
-    let secondtestA = content.document.getElementById("secondtestA");
-    let secondtestB = content.document.getElementById("secondtestB");
-    Assert.ok(
-      test.activated && !secondtestA.activated && !secondtestB.activated,
-      "Content plugins are set up"
-    );
-  });
-
-  clearAllPluginPermissions();
-});
-
-// Tests that the plugin's "activated" property is true for working plugins
-// with click-to-play disabled.
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_ENABLED);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test2.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("test1");
-  ok(pluginInfo.activated, "Test 14, Plugin should be activated");
-});
-
-// Tests that the overlay is shown instead of alternate content when
-// plugins are click to play.
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_alternate_content.html"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let mainBox = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(!!mainBox, "Test 15, Plugin overlay should exist");
-  });
-});
-
-// Tests that mContentType is used for click-to-play plugins, and not the
-// inspected type.
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_bug749455.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 17, Should have a click-to-play notification");
-});
-
-// Tests that clicking the icon of the overlay activates the doorhanger
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 18g, Plugin should not be activated");
-
-  ok(
-    PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed,
-    "Test 19a, Doorhanger should start out dismissed"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let icon = plugin.openOrClosedShadowRoot.getElementById("icon");
-    let bounds = icon.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-
-  let condition = () =>
-    !PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed;
-  await promiseForCondition(condition);
-});
-
-// Tests that clicking the text of the overlay activates the plugin
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 18g, Plugin should not be activated");
-
-  ok(
-    PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed,
-    "Test 19c, Doorhanger should start out dismissed"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let text = plugin.openOrClosedShadowRoot.getElementById("clickToPlay");
-    let bounds = text.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-
-  let condition = () =>
-    !PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed;
-  await promiseForCondition(condition);
-});
-
-// Tests that clicking the box of the overlay activates the doorhanger
-// (just to be thorough)
-add_task(async function() {
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 18g, Plugin should not be activated");
-
-  ok(
-    PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed,
-    "Test 19e, Doorhanger should start out dismissed"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", 50, 50, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", 50, 50, 0, 1, 0, false, 0, 0);
-  });
-
-  let condition = () =>
-    !PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser)
-      .dismissed && PopupNotifications.panel.firstElementChild;
-  await promiseForCondition(condition);
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 19e, Plugin should not be activated");
-
-  clearAllPluginPermissions();
-});
-
-// Tests that a plugin in a div that goes from style="display: none" to
-// "display: block" can be clicked to activate.
-add_task(async function() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_hidden_to_visible.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 20a, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let overlay = plugin.openOrClosedShadowRoot.getElementById("main");
-    Assert.ok(!!overlay, "Test 20a, Plugin overlay should exist");
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let mainBox = plugin.openOrClosedShadowRoot.getElementById("main");
-    let overlayRect = mainBox.getBoundingClientRect();
-    Assert.ok(
-      overlayRect.width == 0 && overlayRect.height == 0,
-      "Test 20a, plugin should have an overlay with 0px width and height"
-    );
-  });
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 20b, plugin should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let div = doc.getElementById("container");
-    Assert.equal(
-      div.style.display,
-      "none",
-      "Test 20b, container div should be display: none"
-    );
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let div = doc.getElementById("container");
-    div.style.display = "block";
-  });
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    // Waiting for layout to flush and the overlay layout to compute
-    await new Promise(resolve => content.requestAnimationFrame(resolve));
-    await new Promise(resolve => content.requestAnimationFrame(resolve));
-
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let mainBox = plugin.openOrClosedShadowRoot.getElementById("main");
-    let overlayRect = mainBox.getBoundingClientRect();
-    Assert.ok(
-      overlayRect.width == 200 && overlayRect.height == 200,
-      "Test 20c, plugin should have overlay dims of 200px"
-    );
-  });
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(!pluginInfo.activated, "Test 20b, plugin should not be activated");
-
-  ok(notification.dismissed, "Test 20c, Doorhanger should start out dismissed");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    let bounds = plugin.getBoundingClientRect();
-    let left = (bounds.left + bounds.right) / 2;
-    let top = (bounds.top + bounds.bottom) / 2;
-    let utils = content.windowUtils;
-    utils.sendMouseEvent("mousedown", left, top, 0, 1, 0, false, 0, 0);
-    utils.sendMouseEvent("mouseup", left, top, 0, 1, 0, false, 0, 0);
-  });
-
-  let condition = () =>
-    !notification.dismissed && !!PopupNotifications.panel.firstElementChild;
-  await promiseForCondition(condition);
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(pluginInfo.activated, "Test 20c, plugin should be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    Assert.ok(
-      !plugin.openOrClosedShadowRoot,
-      "Test 20c, CTP UA Widget Shadow Root is removed"
-    );
-  });
-
-  clearAllPluginPermissions();
-});
-
-// Tests that a click-to-play plugin resets its activated state when changing types
-add_task(async function() {
-  clearAllPluginPermissions();
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 22, Should have a click-to-play notification");
-
-  // Plugin should start as CTP
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-    "Test 23, plugin fallback type should be PLUGIN_CLICK_TO_PLAY"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    plugin.type = null;
-    // We currently don't properly change state just on type change,
-    // so rebind the plugin to tree. bug 767631
-    plugin.parentNode.appendChild(plugin);
-  });
-
-  pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.displayedType,
-    Ci.nsIObjectLoadingContent.TYPE_NULL,
-    "Test 23, plugin should be TYPE_NULL"
-  );
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("test");
-    plugin.type = "application/x-test";
-    plugin.parentNode.appendChild(plugin);
-  });
-
-  pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.displayedType,
-    Ci.nsIObjectLoadingContent.TYPE_NULL,
-    "Test 23, plugin should be TYPE_NULL"
-  );
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-    "Test 23, plugin fallback type should be PLUGIN_CLICK_TO_PLAY"
-  );
-  ok(!pluginInfo.activated, "Test 23, plugin node should not be activated");
-});
-
-// Plugin sync removal test. Note this test produces a notification drop down since
-// the plugin we add has zero dims.
-add_task(async function blockPluginSyncRemoved() {
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_syncRemoved.html"
-  );
-
-  // Maybe there some better trick here, we need to wait for the page load, then
-  // wait for the js to execute in the page.
-  await waitForMs(500);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins"
-  );
-  ok(
-    notification,
-    "Test 25: There should be a plugin notification even if the plugin was immediately removed"
-  );
-  ok(
-    notification.dismissed,
-    "Test 25: The notification should be dismissed by default"
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html>hi</html>"
-  );
-});
-
-// Tests a page with a blocked plugin in it and make sure the infoURL property
-// the blocklist file gets used.
-add_task(async function blockPluginInfoURL() {
-  clearAllPluginPermissions();
-
-  await asyncSetAndUpdateBlocklist(
-    gTestRoot + "blockPluginInfoURL",
-    gTestBrowser
-  );
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  info("Waiting for plugin bindings");
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins"
-  );
-
-  info("Waiting for notification to be shown");
-  // Since the plugin notification is dismissed by default, reshow it.
-  await promiseForNotificationShown(notification);
-
-  info("Waiting for plugin info");
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_BLOCKLISTED,
-    "Test 26, plugin fallback type should be PLUGIN_BLOCKLISTED"
-  );
-  ok(!pluginInfo.activated, "Plugin should be activated.");
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_plugin_reloading.js firefox-85.0+build1/browser/base/content/test/plugins/browser_plugin_reloading.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_plugin_reloading.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_plugin_reloading.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-var gTestBrowser = null;
-
-function updateAllTestPlugins(aState) {
-  setTestPluginEnabledState(aState, "Test Plug-in");
-  setTestPluginEnabledState(aState, "Second Test Plug-in");
-}
-
-add_task(async function() {
-  registerCleanupFunction(async function() {
-    clearAllPluginPermissions();
-    setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-    setTestPluginEnabledState(
-      Ci.nsIPluginTag.STATE_ENABLED,
-      "Second Test Plug-in"
-    );
-    await asyncSetAndUpdateBlocklist(
-      gTestRoot + "blockNoPlugins",
-      gTestBrowser
-    );
-    gTestBrowser = null;
-    gBrowser.removeCurrentTab();
-    window.focus();
-  });
-});
-
-add_task(async function() {
-  gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
-  gTestBrowser = gBrowser.selectedBrowser;
-
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  // Prime the blocklist service, the remote service doesn't launch on startup.
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    "data:text/html,<html></html>"
-  );
-
-  await asyncSetAndUpdateBlocklist(gTestRoot + "blockNoPlugins", gTestBrowser);
-});
-
-// Tests that a click-to-play plugin retains its activated state upon reloading
-add_task(async function() {
-  clearAllPluginPermissions();
-
-  updateAllTestPlugins(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseTabLoadEvent(
-    gBrowser.selectedTab,
-    gTestRoot + "plugin_test.html"
-  );
-
-  // Work around for delayed PluginBindingAttached
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  let notification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(notification, "Test 1, Should have a click-to-play notification");
-
-  let pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.pluginFallbackType,
-    Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY,
-    "Test 2, plugin fallback type should be PLUGIN_CLICK_TO_PLAY"
-  );
-
-  // run the plugin
-  await promisePlayObject("test");
-
-  await promiseUpdatePluginBindings(gTestBrowser);
-
-  pluginInfo = await promiseForPluginInfo("test");
-  is(
-    pluginInfo.displayedType,
-    Ci.nsIObjectLoadingContent.TYPE_PLUGIN,
-    "Test 3, plugin should have started"
-  );
-  ok(pluginInfo.activated, "Test 4, plugin node should not be activated");
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    let npobj1 = Cu.waiveXrays(plugin).getObjectValue();
-    // eslint-disable-next-line no-self-assign
-    plugin.src = plugin.src;
-    let pluginsDiffer = false;
-    try {
-      Cu.waiveXrays(plugin).checkObjectValue(npobj1);
-    } catch (e) {
-      pluginsDiffer = true;
-    }
-
-    Assert.ok(pluginsDiffer, "Test 5, plugins differ.");
-  });
-
-  pluginInfo = await promiseForPluginInfo("test");
-  ok(
-    pluginInfo.activated,
-    "Test 6, Plugin should have retained activated state."
-  );
-  is(
-    pluginInfo.displayedType,
-    Ci.nsIObjectLoadingContent.TYPE_PLUGIN,
-    "Test 7, plugin should have started"
-  );
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_private_clicktoplay.js firefox-85.0+build1/browser/base/content/test/plugins/browser_private_clicktoplay.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_private_clicktoplay.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_private_clicktoplay.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir;
-const gHttpTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-var gTestBrowser = null;
-var gNextTest = null;
-var gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-
-var gPrivateWindow = null;
-var gPrivateBrowser = null;
-
-function finishTest() {
-  clearAllPluginPermissions();
-  gBrowser.removeCurrentTab();
-  if (gPrivateWindow) {
-    gPrivateWindow.close();
-  }
-  window.focus();
-}
-
-let createPrivateWindow = async function createPrivateWindow(url) {
-  gPrivateWindow = await BrowserTestUtils.openNewBrowserWindow({
-    private: true,
-  });
-  ok(!!gPrivateWindow, "should have created a private window.");
-  gPrivateBrowser = gPrivateWindow.gBrowser.selectedBrowser;
-
-  BrowserTestUtils.loadURI(gPrivateBrowser, url);
-  await BrowserTestUtils.browserLoaded(gPrivateBrowser, false, url);
-  info("loaded " + url);
-};
-
-add_task(async function test() {
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-    getTestPlugin("Second Test Plug-in").enabledState =
-      Ci.nsIPluginTag.STATE_ENABLED;
-  });
-
-  // This test works under the assumption that private browsing windows
-  // share permissions with regular windows. Setting a pref to revert to this
-  // behavior. The test should be updated and the pref overwrite removed.
-  // See Bug 1588457
-  await SpecialPowers.pushPrefEnv({
-    set: [["permissions.isolateBy.privateBrowsing", false]],
-  });
-
-  let newTab = BrowserTestUtils.addTab(gBrowser);
-  gBrowser.selectedTab = newTab;
-  gTestBrowser = gBrowser.selectedBrowser;
-  let promise = BrowserTestUtils.browserLoaded(gTestBrowser);
-
-  getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  getTestPlugin("Second Test Plug-in").enabledState =
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  await promise;
-});
-
-add_task(async function test1a() {
-  await createPrivateWindow(gHttpTestRoot + "plugin_test.html");
-});
-
-add_task(async function test1b() {
-  let popupNotification = gPrivateWindow.PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gPrivateBrowser
-  );
-  ok(popupNotification, "Test 1b, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gPrivateBrowser, [], function() {
-    let plugin = content.document.getElementById("test");
-    ok(!plugin.activated, "Test 1b, Plugin should not be activated");
-  });
-
-  // Check the button status
-  let promiseShown = BrowserTestUtils.waitForEvent(
-    gPrivateWindow.PopupNotifications.panel,
-    "Shown"
-  );
-  popupNotification.reshow();
-
-  await promiseShown;
-  is(
-    gPrivateWindow.PopupNotifications.panel.firstElementChild.checkbox.hidden,
-    true,
-    "'Remember' checkbox should be hidden in private windows"
-  );
-
-  let promises = [
-    BrowserTestUtils.browserLoaded(
-      gTestBrowser,
-      false,
-      gHttpTestRoot + "plugin_test.html"
-    ),
-    BrowserTestUtils.waitForEvent(window, "activate"),
-  ];
-  gPrivateWindow.close();
-  BrowserTestUtils.loadURI(gTestBrowser, gHttpTestRoot + "plugin_test.html");
-  await Promise.all(promises);
-  await SimpleTest.promiseFocus(window);
-});
-
-add_task(async function test2a() {
-  // enable test plugin on this site
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(popupNotification, "Test 2a, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], function() {
-    let plugin = content.document.getElementById("test");
-    ok(!plugin.activated, "Test 2a, Plugin should not be activated");
-  });
-
-  // Simulate clicking the "Allow Now" button.
-  let promiseShown = BrowserTestUtils.waitForEvent(
-    PopupNotifications.panel,
-    "Shown"
-  );
-  popupNotification.reshow();
-  await promiseShown;
-
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    let condition = () => plugin.activated;
-    await ContentTaskUtils.waitForCondition(
-      condition,
-      "Test 2a, Waited too long for plugin to activate"
-    );
-  });
-});
-
-add_task(async function test2c() {
-  let topicObserved = TestUtils.topicObserved(
-    "PopupNotifications-updateNotShowing"
-  );
-  await createPrivateWindow(gHttpTestRoot + "plugin_test.html");
-  await topicObserved;
-
-  let popupNotification = await TestUtils.waitForCondition(() => {
-    return gPrivateWindow.PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gPrivateBrowser
-    );
-  }, "Waiting for click-to-play-plugins notification in the private window");
-  ok(popupNotification, "Test 2c, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gPrivateBrowser, [], function() {
-    let plugin = content.document.getElementById("test");
-    ok(plugin.activated, "Test 2c, Plugin should be activated");
-  });
-
-  // Check the button status
-  let promiseShown = BrowserTestUtils.waitForEvent(
-    gPrivateWindow.PopupNotifications.panel,
-    "Shown"
-  );
-  popupNotification.reshow();
-  await promiseShown;
-  is(
-    gPrivateWindow.PopupNotifications.panel.firstElementChild.secondaryButton
-      .hidden,
-    false,
-    "Test 2c, Activated plugin in a private window should have visible 'Block' button."
-  );
-  is(
-    gPrivateWindow.PopupNotifications.panel.firstElementChild.checkbox.hidden,
-    true,
-    "Test 2c, Activated plugin in a private window should not have visible 'Remember' checkbox."
-  );
-
-  clearAllPluginPermissions();
-
-  let promises = [
-    BrowserTestUtils.browserLoaded(
-      gTestBrowser,
-      false,
-      gHttpTestRoot + "plugin_test.html"
-    ),
-    BrowserTestUtils.waitForEvent(window, "activate"),
-  ];
-  gPrivateWindow.close();
-  BrowserTestUtils.loadURI(gTestBrowser, gHttpTestRoot + "plugin_test.html");
-  await Promise.all(promises);
-  await SimpleTest.promiseFocus(window);
-});
-
-add_task(async function test3a() {
-  // enable test plugin on this site
-  let popupNotification = PopupNotifications.getNotification(
-    "click-to-play-plugins",
-    gTestBrowser
-  );
-  ok(popupNotification, "Test 3a, Should have a click-to-play notification");
-
-  await SpecialPowers.spawn(gTestBrowser, [], function() {
-    let plugin = content.document.getElementById("test");
-    ok(!plugin.activated, "Test 3a, Plugin should not be activated");
-  });
-
-  // Simulate clicking the "Allow" button.
-  let promiseShown = BrowserTestUtils.waitForEvent(
-    PopupNotifications.panel,
-    "Shown"
-  );
-  popupNotification.reshow();
-  await promiseShown;
-  PopupNotifications.panel.firstElementChild.button.click();
-
-  await SpecialPowers.spawn(gTestBrowser, [], async function() {
-    let plugin = content.document.getElementById("test");
-    let condition = () => plugin.activated;
-    await ContentTaskUtils.waitForCondition(
-      condition,
-      "Test 3a, Waited too long for plugin to activate"
-    );
-  });
-});
-
-add_task(async function test3c() {
-  let topicObserved = TestUtils.topicObserved(
-    "PopupNotifications-updateNotShowing"
-  );
-  await createPrivateWindow(gHttpTestRoot + "plugin_test.html");
-  await topicObserved;
-
-  let popupNotification = await TestUtils.waitForCondition(() => {
-    return gPrivateWindow.PopupNotifications.getNotification(
-      "click-to-play-plugins",
-      gPrivateBrowser
-    );
-  }, "Waiting for click-to-play-plugins notification in the private window");
-  ok(popupNotification, "Test 3c, Should have a click-to-play notification");
-
-  // Check the button status
-  let promiseShown = BrowserTestUtils.waitForEvent(
-    gPrivateWindow.PopupNotifications.panel,
-    "Shown"
-  );
-  popupNotification.reshow();
-  await promiseShown;
-  is(
-    gPrivateWindow.PopupNotifications.panel.firstElementChild.secondaryButton
-      .hidden,
-    false,
-    "Test 3c, Activated plugin in a private window should have visible 'Block' button."
-  );
-  is(
-    gPrivateWindow.PopupNotifications.panel.firstElementChild.checkbox.hidden,
-    true,
-    "Test 3c, Activated plugin in a private window should not have visible 'Remember' checkbox."
-  );
-
-  BrowserTestUtils.loadURI(
-    gPrivateBrowser,
-    gHttpTestRoot + "plugin_two_types.html"
-  );
-  await BrowserTestUtils.browserLoaded(gPrivateBrowser);
-
-  finishTest();
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/browser_subframe_access_hidden_plugins.js firefox-85.0+build1/browser/base/content/test/plugins/browser_subframe_access_hidden_plugins.js
--- firefox-84.0.2+build1/browser/base/content/test/plugins/browser_subframe_access_hidden_plugins.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/browser_subframe_access_hidden_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-"use strict";
-
-const TEST_PLUGIN_NAME = "Test Plug-in";
-const HIDDEN_CTP_PLUGIN_PREF = "plugins.navigator.hidden_ctp_plugin";
-const DOMAIN_1 = "http://example.com";
-const DOMAIN_2 = "http://mochi.test:8888";
-
-/**
- * If a plugin is click-to-play and named in HIDDEN_CTP_PLUGIN_PREF,
- * then the plugin should be hidden in the navigator.plugins list by
- * default. However, if a plugin has been allowed on a top-level
- * document, we should let subframes of that document access
- * navigator.plugins.
- */
-add_task(async function setup() {
-  // We'll make the Test Plugin click-to-play.
-  let originalPluginState = getTestPluginEnabledState();
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-  registerCleanupFunction(() => {
-    setTestPluginEnabledState(originalPluginState);
-    clearAllPluginPermissions();
-  });
-
-  // And then make the plugin hidden.
-  await SpecialPowers.pushPrefEnv({
-    set: [[HIDDEN_CTP_PLUGIN_PREF, TEST_PLUGIN_NAME]],
-  });
-});
-
-add_task(async function test_plugin_accessible_in_subframe() {
-  // Let's make it so that DOMAIN_1 allows the test plugin to
-  // be activated. This permission will be cleaned up inside
-  // our registerCleanupFunction when the test ends.
-  let ssm = Services.scriptSecurityManager;
-  let principal = ssm.createContentPrincipalFromOrigin(DOMAIN_1);
-  let pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(
-    Ci.nsIPluginHost
-  );
-  let permString = pluginHost.getPermissionStringForType("application/x-test");
-  Services.perms.addFromPrincipal(
-    principal,
-    permString,
-    Ci.nsIPermissionManager.ALLOW_ACTION,
-    Ci.nsIPermissionManager.EXPIRE_NEVER,
-    0 /* expireTime */
-  );
-
-  await BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: DOMAIN_1,
-    },
-    async function(browser) {
-      await SpecialPowers.spawn(
-        browser,
-        [[TEST_PLUGIN_NAME, DOMAIN_2]],
-        async function([pluginName, domain2]) {
-          Assert.ok(
-            content.navigator.plugins[pluginName],
-            "Top-level document should find Test Plugin"
-          );
-
-          // Now manually create a subframe hosted at domain2...
-          let subframe = content.document.createElement("iframe");
-          subframe.src = domain2;
-          let loadedPromise = ContentTaskUtils.waitForEvent(subframe, "load");
-          content.document.body.appendChild(subframe);
-          await loadedPromise;
-
-          // Make sure that the HiddenPlugin event never fires in content.
-          let sawEvent = false;
-          docShell.chromeEventHandler.addEventListener(
-            "HiddenPlugin",
-            function onHiddenPlugin(e) {
-              sawEvent = true;
-              docShell.chromeEventHandler.removeEventListener(
-                "HiddenPlugin",
-                onHiddenPlugin,
-                true
-              );
-            },
-            true
-          );
-
-          Assert.ok(
-            subframe.contentWindow.navigator.plugins[pluginName],
-            "Subframe should find Test Plugin"
-          );
-          Assert.ok(!sawEvent, "Should not have seen the HiddenPlugin event.");
-        }
-      );
-    }
-  );
-});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_add_dynamically.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_add_dynamically.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_add_dynamically.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_add_dynamically.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<script>
-function addPlugin(aId, aType = "application/x-test") {
-  var embed = document.createElement("embed");
-  embed.setAttribute("id", aId);
-  embed.style.width = "200px";
-  embed.style.height = "200px";
-  embed.setAttribute("type", aType);
-  return document.body.appendChild(embed);
-}
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_alternate_content.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_alternate_content.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_alternate_content.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_alternate_content.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!-- bug 739575 -->
-<html>
-<head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-</head>
-<body>
-<object id="test" type="application/x-test" style="height: 200px; width:200px">
-<p><a href="about:blank">you should not see this link when plugins are click-to-play</a></p>
-</object>
-</body></html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_big.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_big.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_big.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_big.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="test" style="width: 500px; height: 500px" type="application/x-test">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_both2.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_both2.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_both2.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_both2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="test" style="width: 100px; height: 100px" type="application/x-test">
-<embed id="unknown" style="width: 100px; height: 100px" type="application/x-unknown">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_both.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_both.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_both.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_both.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="unknown" style="width: 100px; height: 100px" type="application/x-unknown">
-<embed id="test" style="width: 100px; height: 100px" type="application/x-test">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug744745.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug744745.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug744745.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug744745.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head><meta charset="utf-8"/></head>
-<body>
-<style>
-.x {
-  opacity: 0 !important;
-}
-</style>
-<object id="test" class="x" type="application/x-test" width=200 height=200></object>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug749455.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug749455.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug749455.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug749455.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<!-- bug 749455 -->
-<html>
-<head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-</head>
-<body>
-<embed src="plugin_bug749455.html" type="application/x-test" width="100px" height="100px"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug787619.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug787619.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_bug787619.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_bug787619.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head><meta charset="utf-8"/></head>
-<body>
-  <a id="wrapper">
-    <embed id="plugin" style="width: 200px; height: 200px" type="application/x-test">
-  </a>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_crashCommentAndURL.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_crashCommentAndURL.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_crashCommentAndURL.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_crashCommentAndURL.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <script type="text/javascript">
-      function crash() {
-        var plugin = document.getElementById("plugin");
-        var argStr = decodeURIComponent(window.location.search.substr(1));
-        if (argStr) {
-          var args = JSON.parse(argStr);
-          for (var key in args)
-            plugin.setAttribute(key, args[key]);
-        }
-        try {
-          plugin.crash();
-        } catch (err) {}
-      }
-    </script>
-  </head>
-  <body onload="crash();">
-    <embed id="plugin" type="application/x-test"
-           width="400" height="400"
-           drawmode="solid" color="FF00FFFF">
-    </embed>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_hidden_to_visible.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_hidden_to_visible.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_hidden_to_visible.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_hidden_to_visible.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-  <div id="container" style="display: none">
-    <object id="test" type="application/x-test" style="width: 200px; height: 200px;"></object>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_iframe.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_iframe.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_iframe.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_iframe.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<iframe id="frame" with="400" height="400" src="plugin_test.html">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_overlay_styles.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_overlay_styles.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_overlay_styles.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_overlay_styles.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-
-  <div id="testcase1" class="testcase">
-    <object width="10" height="10" type="application/x-test"></object>
-  </div>
-
-  <div id="testcase2" class="testcase">
-    <object width="40" height="40" type="application/x-test"></object>
-  </div>
-
-  <div id="testcase3" class="testcase">
-    <object width="100" height="70" type="application/x-test"></object>
-  </div>
-
-  <div id="testcase4" class="testcase">
-    <object width="200" height="200" type="application/x-test"></object>
-  </div>
-
-  <div id="testcase5" class="testcase">
-    <object width="300" height="300" type="application/x-test"></object>
-  </div>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_shouldShowOverlay.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_shouldShowOverlay.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_shouldShowOverlay.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_shouldShowOverlay.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<style>
-object {
-  width: 200px;
-  height: 200px;
-}
-
-.testcase {
-  position: relative;
-  margin-bottom: 5px;
-}
-
-.cover {
-  position: absolute;
-  width: 20px;
-  height: 20px;
-  background-color: green;
-}
-</style>
-</head>
-<body>
-
-  <div id="testcase1" class="testcase" shouldshow="true"
-       style="top: -100px">
-    <!-- Should show overlay even though the top part is outside
-       of the page. -->
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase2" class="testcase" shouldshow="true"
-       style="left: -100px">
-    <!-- Should show overlay even though the left part is outside
-       of the page. -->
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase3" class="testcase" shouldshow="false"
-       style="left: -210px">
-    <!-- The object is entirely outside of the page, so the overlay
-         should NOT show. -->
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase4" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though the top-left corner is covered. -->
-    <div class="cover" style="top: 0; left: 0"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase5" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though the top-right corner is covered. -->
-    <div class="cover" style="top: 0; left: 180px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase6" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though the bottom-left corner is covered. -->
-    <div class="cover" style="top: 180px; left: 0"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-
-  <div id="testcase7" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though the bottom-right corner is covered. -->
-    <div class="cover" style="top: 180px; left: 180px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase8" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though the center is covered. -->
-    <div class="cover" style="top: 90px; left: 90px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase9" class="testcase" shouldshow="true">
-    <!-- Should show overlay even though multiple points are covered,
-       but not all of them. -->
-    <div class="cover" style="top: 0; left: 0"></div>
-    <div class="cover" style="top: 0; left: 180px"></div>
-    <div class="cover" style="top: 180px; left: 0"></div>
-    <div class="cover" style="top: 180px; left: 180px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase10" class="testcase" shouldshow="true">
-    <!-- Another case where 4 are covered, but not all. -->
-    <div class="cover" style="top: 90px; left: 90px"></div>
-    <div class="cover" style="top: 0; left: 180px"></div>
-    <div class="cover" style="top: 180px; left: 0"></div>
-    <div class="cover" style="top: 180px; left: 180px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase11" class="testcase" shouldshow="false">
-    <!-- All corners and center are covered here, so in this
-         case the overlay should NOT show. -->
-    <div class="cover" style="top: 0; left: 0"></div>
-    <div class="cover" style="top: 0; left: 180px"></div>
-    <div class="cover" style="top: 180px; left: 0"></div>
-    <div class="cover" style="top: 180px; left: 180px"></div>
-    <div class="cover" style="top: 90px; left: 90px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-  <div id="testcase12" class="testcase" shouldshow="false">
-        <!-- All corners and center are covered here, by a single
-        element. In this case the overlay should NOT show. -->
-    <div class="cover" style="width: 200px; height:200px"></div>
-    <object type="application/x-test"></object>
-  </div>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_small_2.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_small_2.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_small_2.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_small_2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="test" style="width: 10px; height: 10px" type="application/x-second-test">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_small.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_small.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_small.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_small.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="test" style="width: 10px; height: 10px" type="application/x-test">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_syncRemoved.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_syncRemoved.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_syncRemoved.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_syncRemoved.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<body>
-<script type="text/javascript">
-  // create an embed, insert it in the doc and immediately remove it
-  var embed = document.createElement("embed");
-  embed.setAttribute("id", "test");
-  embed.setAttribute("type", "application/x-test");
-  embed.setAttribute("style", "width: 0px; height: 0px;");
-  document.body.appendChild(embed);
-  window.getComputedStyle(embed).top;
-  document.body.remove(embed);
-</script>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_test2.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_test2.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_test2.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_test2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="test1" style="width: 200px; height: 200px" type="application/x-test">
-<embed id="test2" style="width: 200px; height: 200px" type="application/x-test">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_two_types.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_two_types.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_two_types.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_two_types.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head><meta charset="utf-8"/></head>
-<body>
-<embed id="test" style="width: 200px; height: 200px" type="application/x-test"/>
-<embed id="secondtestA" style="width: 200px; height: 200px" type="application/x-second-test"/>
-<embed id="secondtestB" style="width: 200px; height: 200px" type="application/x-second-test"/>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_unknown.html firefox-85.0+build1/browser/base/content/test/plugins/plugin_unknown.html
--- firefox-84.0.2+build1/browser/base/content/test/plugins/plugin_unknown.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/plugins/plugin_unknown.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-<embed id="unknown" style="width: 100px; height: 100px" type="application/x-unknown">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/protectionsUI/browser.ini firefox-85.0+build1/browser/base/content/test/protectionsUI/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/protectionsUI/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/protectionsUI/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -32,6 +32,9 @@
 skip-if = debug || asan # Bug 1546797
 [browser_protectionsUI_socialtracking.js]
 [browser_protectionsUI_shield_visibility.js]
+support-files =
+  sandboxed.html
+  sandboxed.html^headers^
 [browser_protectionsUI_state.js]
 [browser_protectionsUI_state_reset.js]
 [browser_protectionsUI_telemetry.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js firefox-85.0+build1/browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js
--- firefox-84.0.2+build1/browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/protectionsUI/browser_protectionsUI_shield_visibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -66,6 +66,12 @@
     testURL: "view-source:https://example.com/",
     hidden: true,
   },
+  {
+    type: "top level sandbox",
+    testURL:
+      "https://example.com/browser/browser/base/content/test/protectionsUI/sandboxed.html",
+    hidden: false,
+  },
 ];
 
 add_task(async function setup() {
@@ -97,7 +103,7 @@
         if (testData.type === "certificateError") {
           pageLoaded = BrowserTestUtils.waitForErrorPage(browser);
         } else {
-          pageLoaded = BrowserTestUtils.browserLoaded(browser);
+          pageLoaded = BrowserTestUtils.browserLoaded(browser, true);
         }
       },
       false
diff -Nru firefox-84.0.2+build1/browser/base/content/test/protectionsUI/sandboxed.html firefox-85.0+build1/browser/base/content/test/protectionsUI/sandboxed.html
--- firefox-84.0.2+build1/browser/base/content/test/protectionsUI/sandboxed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/protectionsUI/sandboxed.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<!-- 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/. -->
+<html dir="ltr" xml:lang="en-US" lang="en-US">
+  <head>
+    <meta charset="utf8">
+  </head>
+  <body>
+    <iframe src="http://trackertest.org/browser/browser/base/content/test/protectionsUI/cookieServer.sjs"></iframe>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/protectionsUI/sandboxed.html^headers^ firefox-85.0+build1/browser/base/content/test/protectionsUI/sandboxed.html^headers^
--- firefox-84.0.2+build1/browser/base/content/test/protectionsUI/sandboxed.html^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/protectionsUI/sandboxed.html^headers^	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts;
diff -Nru firefox-84.0.2+build1/browser/base/content/test/sanitize/browser.ini firefox-85.0+build1/browser/base/content/test/sanitize/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/sanitize/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/sanitize/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 
 [browser_purgehistory_clears_sh.js]
 [browser_sanitize-formhistory.js]
+[browser_sanitize-history.js]
 [browser_sanitize-offlineData.js]
 [browser_sanitize-passwordDisabledHosts.js]
 [browser_sanitize-sitepermissions.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js firefox-85.0+build1/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js
--- firefox-84.0.2+build1/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/sanitize/browser_purgehistory_clears_sh.js	2021-01-18 19:58:08.000000000 +0000
@@ -33,7 +33,7 @@
         content.history.pushState({}, "");
         content.history.back();
         await new Promise(function(r) {
-          content.setTimeout(r);
+          content.onpopstate = r;
         });
         let newHistory = content.history.length;
         Assert.equal(startHistory, 1, "Initial SHistory size");
diff -Nru firefox-84.0.2+build1/browser/base/content/test/sanitize/browser_sanitize-history.js firefox-85.0+build1/browser/base/content/test/sanitize/browser_sanitize-history.js
--- firefox-84.0.2+build1/browser/base/content/test/sanitize/browser_sanitize-history.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/sanitize/browser_sanitize-history.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,129 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Tests that sanitizing history will clear storage access permissions
+// for sites without cookies or site data.
+add_task(async function sanitizeStorageAccessPermissions() {
+  await new Promise(resolve => {
+    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, resolve);
+  });
+
+  await SiteDataTestUtils.addToIndexedDB("https://sub.example.org");
+  await SiteDataTestUtils.addToCookies("https://example.com");
+
+  PermissionTestUtils.add(
+    "https://example.org",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "https://example.com",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "http://mochi.test",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  // Add some time in between taking the snapshot of the timestamp
+  // to avoid flakyness.
+  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+  await new Promise(c => setTimeout(c, 100));
+  let timestamp = Date.now();
+  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+  await new Promise(c => setTimeout(c, 100));
+
+  PermissionTestUtils.add(
+    "http://example.net",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  await Sanitizer.sanitize(["history"], { range: [timestamp, Date.now()] });
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "http://example.net",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "http://mochi.test",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+
+  await Sanitizer.sanitize(["history"]);
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "http://mochi.test",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "http://example.net",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+
+  await Sanitizer.sanitize(["history", "siteSettings"]);
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "http://mochi.test",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_check_identity_state.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_check_identity_state.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_check_identity_state.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_check_identity_state.js	2021-01-18 19:58:08.000000000 +0000
@@ -544,7 +544,7 @@
 
   is(
     getSecurityConnectionBG(),
-    `url("chrome://browser/skin/connection-mixed-passive-loaded.svg")`,
+    `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`,
     "Security connection should show a warning lock icon."
   );
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_deprecatedTLSVersions.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_deprecatedTLSVersions.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_deprecatedTLSVersions.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_deprecatedTLSVersions.js	2021-01-18 19:58:08.000000000 +0000
@@ -46,7 +46,7 @@
 
   await BrowserTestUtils.withNewTab("about:blank", async function(browser) {
     // Try deprecated versions
-    await BrowserTestUtils.loadURI(browser, HTTPS_TLS1_0);
+    BrowserTestUtils.loadURI(browser, HTTPS_TLS1_0);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "broken");
     is(
@@ -56,7 +56,7 @@
     );
     await checkConnectionState("not-secure");
 
-    await BrowserTestUtils.loadURI(browser, HTTPS_TLS1_1);
+    BrowserTestUtils.loadURI(browser, HTTPS_TLS1_1);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "broken");
     is(
@@ -67,14 +67,14 @@
     await checkConnectionState("not-secure");
 
     // Transition to secure
-    await BrowserTestUtils.loadURI(browser, HTTPS_TLS1_2);
+    BrowserTestUtils.loadURI(browser, HTTPS_TLS1_2);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "secure");
     is(getIdentityMode(), "verifiedDomain", "Identity should be verified");
     await checkConnectionState("secure");
 
     // Transition back to broken
-    await BrowserTestUtils.loadURI(browser, HTTPS_TLS1_1);
+    BrowserTestUtils.loadURI(browser, HTTPS_TLS1_1);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "broken");
     is(
@@ -85,7 +85,7 @@
     await checkConnectionState("not-secure");
 
     // TLS1.3 for completeness
-    await BrowserTestUtils.loadURI(browser, HTTPS_TLS1_3);
+    BrowserTestUtils.loadURI(browser, HTTPS_TLS1_3);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "secure");
     is(getIdentityMode(), "verifiedDomain", "Identity should be verified");
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_geolocation_indicator.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_geolocation_indicator.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_geolocation_indicator.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_geolocation_indicator.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,6 +3,8 @@
 
 "use strict";
 
+requestLongerTimeout(2);
+
 ChromeUtils.import("resource:///modules/PermissionUI.jsm", this);
 ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
 const { PermissionTestUtils } = ChromeUtils.import(
@@ -43,10 +45,11 @@
 
 async function checkForDOMElement(state, id) {
   info(`Testing state ${state} of element  ${id}`);
+  let el;
   try {
     await BrowserTestUtils.waitForCondition(
       () => {
-        let el = document.getElementById(id);
+        el = document.getElementById(id);
         return el != null;
       },
       `Waiting for ${id}`,
@@ -54,15 +57,23 @@
     );
   } catch (e) {
     ok(!state, `${id} has correct state`);
-    return;
+    return el;
   }
   ok(state, `${id} has correct state`);
+
+  return el;
 }
 
 async function testIdentityPopupGeoContainer(
   containerVisible,
   timestampVisible
 ) {
+  // The container holds the timestamp element, therefore we can't have a
+  // visible timestamp without the container.
+  if (timestampVisible && !containerVisible) {
+    ok(false, "Can't have timestamp without container");
+  }
+
   // Only call openIdentityPopup if popup is closed, otherwise it does not resolve
   if (!gIdentityHandler._identityBox.hasAttribute("open")) {
     await openIdentityPopup();
@@ -72,6 +83,26 @@
     containerVisible,
     "identity-popup-geo-container"
   );
+
+  if (containerVisible && timestampVisible) {
+    // Wait for the geo container to be fully populated.
+    // The time label is computed async.
+    let container = await checkContainer;
+    await BrowserTestUtils.waitForCondition(
+      () => container.childElementCount == 2,
+      "identity-popup-geo-container should have two elements."
+    );
+    is(
+      container.childNodes[0].classList[0],
+      "identity-popup-permission-item",
+      "Geo container should have permission item."
+    );
+    is(
+      container.childNodes[1].id,
+      "geo-access-indicator-item",
+      "Geo container should have indicator item."
+    );
+  }
   let checkAccessIndicator = checkForDOMElement(
     timestampVisible,
     "geo-access-indicator-item"
@@ -334,3 +365,17 @@
   ]);
   await cleanup(tab);
 });
+
+/**
+ * Tests that we only show the last access label once when the sharing
+ * state is updated multiple times while the popup is open.
+ */
+add_task(async function test_identity_no_duplicate_last_access_label() {
+  let tab = await openExamplePage();
+  await setGeoLastAccess(tab.linkedBrowser, true);
+  await openIdentityPopup();
+  gBrowser.updateBrowserSharing(tab.linkedBrowser, { geo: true });
+  gBrowser.updateBrowserSharing(tab.linkedBrowser, { geo: true });
+  await testIdentityPopupGeoContainer(true, true);
+  await cleanup(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_getSecurityInfo.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_getSecurityInfo.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_getSecurityInfo.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_getSecurityInfo.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,7 @@
 add_task(async function test() {
   await BrowserTestUtils.withNewTab("about:blank", async function(browser) {
     let loaded = BrowserTestUtils.waitForErrorPage(browser);
-    await BrowserTestUtils.loadURI(browser, "https://self-signed.example.com");
+    BrowserTestUtils.loadURI(browser, "https://self-signed.example.com");
     await loaded;
 
     let securityInfo = await browser.browsingContext.currentWindowGlobal.getSecurityInfo();
@@ -33,14 +33,14 @@
     );
 
     loaded = BrowserTestUtils.browserLoaded(browser);
-    await BrowserTestUtils.loadURI(browser, "http://example.com");
+    BrowserTestUtils.loadURI(browser, "http://example.com");
     await loaded;
 
     securityInfo = await browser.browsingContext.currentWindowGlobal.getSecurityInfo();
     ok(!securityInfo, "Found no security info");
 
     loaded = BrowserTestUtils.browserLoaded(browser);
-    await BrowserTestUtils.loadURI(browser, "https://example.com");
+    BrowserTestUtils.loadURI(browser, "https://example.com");
     await loaded;
 
     securityInfo = await browser.browsingContext.currentWindowGlobal.getSecurityInfo();
@@ -55,7 +55,7 @@
     );
 
     loaded = BrowserTestUtils.browserLoaded(browser);
-    await BrowserTestUtils.loadURI(browser, IFRAME_PAGE);
+    BrowserTestUtils.loadURI(browser, IFRAME_PAGE);
     await loaded;
 
     // Get the info of the parent, which is HTTP.
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,7 @@
   {
     type: "http",
     testURL: "http://example.com",
-    img_url: `url("chrome://browser/skin/connection-mixed-active-loaded.svg")`,
+    img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`,
   },
   {
     type: "https",
@@ -50,7 +50,7 @@
   {
     type: "mixedPassiveContent",
     testURL: kBaseURI + "file_mixedPassiveContent.html",
-    img_url: `url("chrome://browser/skin/connection-mixed-passive-loaded.svg")`,
+    img_url: `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`,
   },
   {
     type: "mixedActiveContent",
@@ -60,7 +60,7 @@
   {
     type: "certificateError",
     testURL: "https://self-signed.example.com",
-    img_url: `url("chrome://browser/skin/connection-mixed-passive-loaded.svg")`,
+    img_url: `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`,
   },
   {
     type: "localhost",
@@ -75,12 +75,12 @@
   {
     type: "data URI",
     testURL: "data:text/html,<div>",
-    img_url: `url("chrome://browser/skin/connection-mixed-active-loaded.svg")`,
+    img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`,
   },
   {
     type: "view-source HTTP",
     testURL: "view-source:http://example.com/",
-    img_url: `url("chrome://browser/skin/connection-mixed-active-loaded.svg")`,
+    img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`,
   },
   {
     type: "view-source HTTPS",
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser.ini firefox-85.0+build1/browser/base/content/test/siteIdentity/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -122,3 +122,4 @@
 support-files =
   file_mixedPassiveContent.html
   file_bug1045809_1.html
+[browser_tab_sharing_state.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,7 +25,7 @@
 
 function checkIdentityPopup(icon) {
   gIdentityHandler.refreshIdentityPopup();
-  is(getIdentityIcon(), `url("chrome://browser/skin/${icon}")`);
+  is(getIdentityIcon(), `url("chrome://global/skin/icons/${icon}")`);
   is(getConnectionState(), "secure-cert-user-overridden");
   isnot(
     getPopupContentVerifier().style.display,
@@ -52,7 +52,7 @@
   checkIdentityPopup("connection-mixed-active-loaded.svg");
 
   // check that a warning is shown even without mixed content
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     gBrowser.selectedBrowser,
     "https://self-signed.example.com"
   );
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixedContentFromOnunload.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixedContentFromOnunload.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixedContentFromOnunload.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixedContentFromOnunload.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,7 +38,7 @@
     // Navigation from an http page to a https page with no mixed content
     // The http page loads an http image on unload
     url = HTTPS_TEST_ROOT_1 + "file_mixedContentFromOnunload_test1.html";
-    await BrowserTestUtils.loadURI(browser, url);
+    BrowserTestUtils.loadURI(browser, url);
     await BrowserTestUtils.browserLoaded(browser);
     // check security state.  Since current url is https and doesn't have any
     // mixed content resources, we expect it to be secure.
@@ -51,10 +51,10 @@
     // Navigation from an http page to a https page that has mixed display content
     // The https page loads an http image on unload
     url = HTTP_TEST_ROOT_2 + "file_mixedContentFromOnunload.html";
-    await BrowserTestUtils.loadURI(browser, url);
+    BrowserTestUtils.loadURI(browser, url);
     await BrowserTestUtils.browserLoaded(browser);
     url = HTTPS_TEST_ROOT_2 + "file_mixedContentFromOnunload_test2.html";
-    await BrowserTestUtils.loadURI(browser, url);
+    BrowserTestUtils.loadURI(browser, url);
     await BrowserTestUtils.browserLoaded(browser);
     isSecurityState(browser, "broken");
     await assertMixedContentBlockingState(browser, {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js	2021-01-18 19:58:08.000000000 +0000
@@ -49,7 +49,7 @@
   // seem to work with withNewTab.
   await BrowserTestUtils.withNewTab("about:blank", async browser => {
     // Navigate to the test URI.
-    await BrowserTestUtils.loadURI(browser, testcase.uri);
+    BrowserTestUtils.loadURI(browser, testcase.uri);
     if (!testcase.expectErrorPage) {
       await BrowserTestUtils.browserLoaded(browser, false, testcase.uri);
     } else {
@@ -62,7 +62,7 @@
     );
 
     // Navigate to a URI that should be secure.
-    await BrowserTestUtils.loadURI(browser, kSecureURI);
+    BrowserTestUtils.loadURI(browser, kSecureURI);
     await BrowserTestUtils.browserLoaded(browser, false, kSecureURI);
     let secureIdentityMode = window.document.getElementById("identity-box")
       .className;
@@ -91,7 +91,7 @@
     is(secureIdentityMode, "verifiedDomain", "identity should start as secure");
 
     // Navigate to the test URI.
-    await BrowserTestUtils.loadURI(browser, testcase.uri);
+    BrowserTestUtils.loadURI(browser, testcase.uri);
     if (!testcase.expectErrorPage) {
       await BrowserTestUtils.browserLoaded(browser, false, testcase.uri);
     } else {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_tab_sharing_state.js firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_tab_sharing_state.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/browser_tab_sharing_state.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/browser_tab_sharing_state.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,96 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests gBrowser#updateBrowserSharing
+ */
+add_task(async function testBrowserSharingStateSetter() {
+  const WEBRTC_TEST_STATE = {
+    camera: 0,
+    microphone: 1,
+    paused: false,
+    sharing: "microphone",
+    showMicrophoneIndicator: true,
+    showScreenSharingIndicator: "",
+    windowId: 0,
+  };
+
+  const WEBRTC_TEST_STATE2 = {
+    camera: 1,
+    microphone: 1,
+    paused: false,
+    sharing: "camera",
+    showCameraIndicator: true,
+    showMicrophoneIndicator: true,
+    showScreenSharingIndicator: "",
+    windowId: 1,
+  };
+
+  await BrowserTestUtils.withNewTab("https://example.com", async browser => {
+    let tab = gBrowser.selectedTab;
+    is(tab._sharingState, undefined, "No sharing state initially.");
+    ok(!tab.hasAttribute("sharing"), "No tab sharing attribute initially.");
+
+    // Set an active sharing state for webrtc
+    gBrowser.updateBrowserSharing(browser, { webRTC: WEBRTC_TEST_STATE });
+    Assert.deepEqual(
+      tab._sharingState,
+      { webRTC: WEBRTC_TEST_STATE },
+      "Should have correct webRTC sharing state."
+    );
+    is(
+      tab.getAttribute("sharing"),
+      WEBRTC_TEST_STATE.sharing,
+      "Tab sharing attribute reflects webRTC sharing state."
+    );
+
+    // Set sharing state for geolocation
+    gBrowser.updateBrowserSharing(browser, { geo: true });
+    Assert.deepEqual(
+      tab._sharingState,
+      {
+        webRTC: WEBRTC_TEST_STATE,
+        geo: true,
+      },
+      "Should have sharing state for both webRTC and geolocation."
+    );
+    is(
+      tab.getAttribute("sharing"),
+      WEBRTC_TEST_STATE.sharing,
+      "Geolocation sharing doesn't update the tab sharing attribute."
+    );
+
+    // Update webRTC sharing state
+    gBrowser.updateBrowserSharing(browser, { webRTC: WEBRTC_TEST_STATE2 });
+    Assert.deepEqual(
+      tab._sharingState,
+      { geo: true, webRTC: WEBRTC_TEST_STATE2 },
+      "Should have updated webRTC sharing state while maintaining geolocation state."
+    );
+    is(
+      tab.getAttribute("sharing"),
+      WEBRTC_TEST_STATE2.sharing,
+      "Tab sharing attribute reflects webRTC sharing state."
+    );
+
+    // Clear webRTC sharing state
+    gBrowser.updateBrowserSharing(browser, { webRTC: null });
+    Assert.deepEqual(
+      tab._sharingState,
+      { geo: true, webRTC: null },
+      "Should only have sharing state for geolocation."
+    );
+    ok(
+      !tab.hasAttribute("sharing"),
+      "Ending webRTC sharing should remove tab sharing attribute."
+    );
+
+    // Clear geolocation sharing state
+    gBrowser.updateBrowserSharing(browser, { geo: null });
+    Assert.deepEqual(tab._sharingState, { geo: null, webRTC: null });
+    ok(
+      !tab.hasAttribute("sharing"),
+      "Tab sharing attribute should not be set."
+    );
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/siteIdentity/head.js firefox-85.0+build1/browser/base/content/test/siteIdentity/head.js
--- firefox-84.0.2+build1/browser/base/content/test/siteIdentity/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/siteIdentity/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -213,7 +213,7 @@
     if (activeLoaded) {
       is(
         identityIconImage,
-        'url("chrome://browser/skin/connection-mixed-active-loaded.svg")',
+        'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")',
         "Using active loaded icon"
       );
     }
@@ -227,14 +227,14 @@
     if (passiveLoaded && !(activeLoaded || activeBlocked)) {
       is(
         identityIconImage,
-        'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+        'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
         "Using passive loaded icon"
       );
     }
     if (passiveLoaded && activeBlocked) {
       is(
         identityIconImage,
-        'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+        'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
         "Using active blocked and passive loaded icon"
       );
     }
@@ -309,12 +309,12 @@
   if (stateInsecure) {
     is(
       securityViewBG,
-      'url("chrome://browser/skin/connection-mixed-active-loaded.svg")',
+      'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")',
       "CC using 'not secure' icon"
     );
     is(
       securityContentBG,
-      'url("chrome://browser/skin/connection-mixed-active-loaded.svg")',
+      'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")',
       "CC using 'not secure' icon"
     );
   }
@@ -347,12 +347,12 @@
     } else if (activeBlocked || passiveLoaded) {
       is(
         securityViewBG,
-        'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+        'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
         "CC using degraded icon"
       );
       is(
         securityContentBG,
-        'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
+        'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")',
         "CC using degraded icon"
       );
     } else {
@@ -402,7 +402,7 @@
 
 async function loadBadCertPage(url) {
   let loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
   await loaded;
 
   await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
diff -Nru firefox-84.0.2+build1/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js firefox-85.0+build1/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
--- firefox-84.0.2+build1/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js	2021-01-18 19:58:08.000000000 +0000
@@ -70,10 +70,19 @@
   );
   is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
 
+  Services.prefs.setBoolPref("browser.startup.preXulSkeletonUI", true);
+  Services.prefs.setBoolPref("browser.tabs.drawInTitlebar", false);
+  enabled = WindowsRegistry.readRegKey(
+    Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
+    "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
+    `${firefoxPath}|Enabled`
+  );
+  is(enabled, 0, "Pre-XUL skeleton UI is disabled in the Windows registry");
+
   await BrowserTestUtils.closeWindow(win);
 });
 
-add_task(async function testWritesSizeValuesOnChange() {
+add_task(async function testPersistsNecessaryValuesOnChange() {
   // Enable the skeleton UI, since if it's disabled we won't persist the size values
   await SpecialPowers.pushPrefEnv({
     set: [["browser.startup.preXulSkeletonUI", true]],
@@ -89,6 +98,7 @@
     "SpringsCSSSpan",
     "SearchbarCSSSpan",
     "Theme",
+    "MenubarShown",
   ];
 
   // Remove all of the registry values to ensure old tests aren't giving us false
@@ -109,9 +119,10 @@
       "Software\\Mozilla\\Firefox\\PreXULSkeletonUISettings",
       `${firefoxPath}|${key}`
     );
-    ok(
-      value,
-      `Skeleton UI registry values should have a non-zero value for ${key}`
+    isnot(
+      typeof value,
+      "undefined",
+      `Skeleton UI registry values should have a defined value for ${key}`
     );
     if (value.length) {
       let hasNonZero = false;
diff -Nru firefox-84.0.2+build1/browser/base/content/test/static/browser.ini firefox-85.0+build1/browser/base/content/test/static/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/static/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/static/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -1,8 +1,8 @@
 [DEFAULT]
 # These tests can be prone to intermittent failures on slower systems.
 # Since the specific flavor doesn't matter from a correctness standpoint,
-# just skip the tests on ASAN and debug builds.
-skip-if = asan || debug
+# just skip the tests on sanitizer and debug builds.
+skip-if = asan || tsan || debug
 support-files =
   head.js
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabdialogs/browser_subdialog_esc.js firefox-85.0+build1/browser/base/content/test/tabdialogs/browser_subdialog_esc.js
--- firefox-84.0.2+build1/browser/base/content/test/tabdialogs/browser_subdialog_esc.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabdialogs/browser_subdialog_esc.js	2021-01-18 19:58:08.000000000 +0000
@@ -54,3 +54,65 @@
     ok(true, "Load completed");
   });
 });
+
+/**
+ * Tests that ESC on a SubDialog with an open dropdown doesn't close the dialog.
+ */
+add_task(async function test_subdialog_esc_on_dropdown_does_not_close_dialog() {
+  await BrowserTestUtils.withNewTab("http://example.com", async function(
+    browser
+  ) {
+    // Open the test dialog
+    let dialogBox = gBrowser.getTabDialogBox(browser);
+    let dialogClose = dialogBox.open(TEST_DIALOG_PATH, {
+      keepOpenSameOriginNav: true,
+    });
+
+    let dialogs = dialogBox._dialogManager._dialogs;
+
+    is(dialogs.length, 1, "Dialog manager has a dialog.");
+
+    let dialog = dialogs[0];
+
+    info("Waiting for dialog to open.");
+    await dialog._dialogReady;
+
+    // Open dropdown
+    let select = dialog._frame.contentDocument.getElementById("select");
+    let shownPromise = BrowserTestUtils.waitForEvent(
+      select,
+      "popupshowing",
+      true
+    );
+
+    info("Opening dropdown");
+    select.focus();
+    EventUtils.synthesizeKey("VK_SPACE", {}, dialog._frame.contentWindow);
+
+    await shownPromise;
+
+    let hiddenPromise = BrowserTestUtils.waitForEvent(
+      select,
+      "popuphiding",
+      true
+    );
+
+    // Race dropdown closing vs SubDialog close
+    let race = Promise.race([
+      hiddenPromise.then(() => true),
+      dialogClose.then(() => false),
+    ]);
+
+    // Close the dropdown with esc key
+    info("Hitting escape key.");
+    await EventUtils.synthesizeKey("KEY_Escape");
+
+    let result = await race;
+    ok(result, "Select closed first");
+
+    await new Promise(resolve => executeSoon(resolve));
+
+    ok(!dialog._isClosing, "Dialog is not closing");
+    ok(dialog._openedURL, "Dialog is open");
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabdialogs/subdialog.xhtml firefox-85.0+build1/browser/base/content/test/tabdialogs/subdialog.xhtml
--- firefox-84.0.2+build1/browser/base/content/test/tabdialogs/subdialog.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabdialogs/subdialog.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -7,8 +7,7 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
-        title="Sample sub-dialog" style="width: 32em; height: 5em;"
-        onload="document.getElementById('textbox').focus();">
+        title="Sample sub-dialog">
 <dialog id="subDialog">
   <script>
     document.addEventListener("dialogaccept", acceptSubdialog);
@@ -21,6 +20,11 @@
 
   <html:input id="textbox" value="Default text" />
 
+  <html:select id="select">
+    <html:option>Foo</html:option>
+    <html:option>Bar</html:option>
+  </html:select>
+
   <separator class="thin"/>
 
   <button oncommand="window.close();" label="Close" />
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabMediaIndicator/browser_mediaplayback_audibility_change.js firefox-85.0+build1/browser/base/content/test/tabMediaIndicator/browser_mediaplayback_audibility_change.js
--- firefox-84.0.2+build1/browser/base/content/test/tabMediaIndicator/browser_mediaplayback_audibility_change.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabMediaIndicator/browser_mediaplayback_audibility_change.js	2021-01-18 19:58:08.000000000 +0000
@@ -62,7 +62,7 @@
   await waitForTabSoundIndicatorAppears(tab);
 
   info(`sound indicator should disappear after navigating tab to blank page`);
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:blank");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:blank");
   await waitForTabSoundIndicatorDisappears(tab);
 
   info("remove tab");
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabMediaIndicator/browser_mediaPlayback.js firefox-85.0+build1/browser/base/content/test/tabMediaIndicator/browser_mediaPlayback.js
--- firefox-84.0.2+build1/browser/base/content/test/tabMediaIndicator/browser_mediaPlayback.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabMediaIndicator/browser_mediaPlayback.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,8 +14,10 @@
 }
 
 async function test_on_browser(url, browser) {
+  info(`run test for ${url}`);
+  const startPromise = wait_for_event(browser, "DOMAudioPlaybackStarted");
   BrowserTestUtils.loadURI(browser, url);
-  await wait_for_event(browser, "DOMAudioPlaybackStarted");
+  await startPromise;
   await wait_for_event(browser, "DOMAudioPlaybackStopped");
 }
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js firefox-85.0+build1/browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js
--- firefox-84.0.2+build1/browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabPrompts/browser_confirmFolderUpload.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,140 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { PromptTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromptTestUtils.jsm"
+);
+
+/**
+ * Create a temporary test directory that will be cleaned up on test shutdown.
+ * @returns {String} - absolute directory path.
+ */
+function getTestDirectory() {
+  let tmpDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
+  tmpDir.append("testdir");
+  if (!tmpDir.exists()) {
+    tmpDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
+    registerCleanupFunction(() => {
+      tmpDir.remove(true);
+    });
+  }
+
+  let file1 = tmpDir.clone();
+  file1.append("foo.txt");
+  if (!file1.exists()) {
+    file1.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o600);
+  }
+
+  let file2 = tmpDir.clone();
+  file2.append("bar.txt");
+  if (!file2.exists()) {
+    file2.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o600);
+  }
+
+  return tmpDir.path;
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Allow using our MockFilePicker in the content process.
+      ["dom.filesystem.pathcheck.disabled", true],
+      ["dom.webkitBlink.dirPicker.enabled", true],
+    ],
+  });
+});
+
+/**
+ * Create a file input, select a folder and wait for the upload confirmation
+ * prompt to open.
+ * @param {boolean} confirmUpload - Whether to accept (true) or cancel the
+ * prompt (false).
+ * @returns {Promise} - Resolves once the prompt has been closed.
+ */
+async function testUploadPrompt(confirmUpload) {
+  await BrowserTestUtils.withNewTab("http://example.com", async browser => {
+    // Create file input element
+    await ContentTask.spawn(browser, null, () => {
+      let input = content.document.createElement("input");
+      input.id = "filepicker";
+      input.setAttribute("type", "file");
+      input.setAttribute("webkitdirectory", "");
+      content.document.body.appendChild(input);
+    });
+
+    // If we're confirming the dialog, register a  "change" listener on the
+    // file input.
+    let changePromise;
+    if (confirmUpload) {
+      changePromise = ContentTask.spawn(browser, null, async () => {
+        let input = content.document.getElementById("filepicker");
+        return ContentTaskUtils.waitForEvent(input, "change").then(
+          e => e.target.files.length
+        );
+      });
+    }
+
+    // Register prompt promise
+    let promptPromise = PromptTestUtils.waitForPrompt(browser, {
+      modalType: Services.prompt.MODAL_TYPE_TAB,
+      promptType: "confirmEx",
+    });
+
+    // Open filepicker
+    let path = getTestDirectory();
+    await ContentTask.spawn(browser, { path }, args => {
+      let MockFilePicker = content.SpecialPowers.MockFilePicker;
+      MockFilePicker.init(
+        content,
+        "A Mock File Picker",
+        content.SpecialPowers.Ci.nsIFilePicker.modeGetFolder
+      );
+      MockFilePicker.useDirectory(args.path);
+
+      let input = content.document.getElementById("filepicker");
+      input.click();
+    });
+
+    // Wait for confirmation prompt
+    let prompt = await promptPromise;
+    ok(prompt, "Shown upload confirmation prompt");
+    is(prompt.ui.button0.label, "Upload", "Accept button label");
+    ok(prompt.ui.button1.hasAttribute("default"), "Cancel is default button");
+
+    // Close confirmation prompt
+    await PromptTestUtils.handlePrompt(prompt, {
+      buttonNumClick: confirmUpload ? 0 : 1,
+    });
+
+    // If we accepted, wait for the input elements "change" event
+    if (changePromise) {
+      let fileCount = await changePromise;
+      is(fileCount, 2, "Should have selected 2 files");
+    } else {
+      let fileCount = await ContentTask.spawn(browser, null, () => {
+        return content.document.getElementById("filepicker").files.length;
+      });
+
+      is(fileCount, 0, "Should not have selected any files");
+    }
+
+    // Cleanup
+    await ContentTask.spawn(browser, null, () => {
+      content.SpecialPowers.MockFilePicker.cleanup();
+    });
+  });
+}
+
+// Tests the confirmation prompt that shows after the user picked a folder.
+
+// Confirm the prompt
+add_task(async function test_confirm() {
+  await testUploadPrompt(true);
+});
+
+// Cancel the prompt
+add_task(async function test_cancel() {
+  await testUploadPrompt(false);
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabPrompts/browser.ini firefox-85.0+build1/browser/base/content/test/tabPrompts/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/tabPrompts/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabPrompts/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -2,6 +2,7 @@
 support-files = file_beforeunload_stop.html
 [browser_closeTabSpecificPanels.js]
 skip-if = verify && debug && (os == 'linux')
+[browser_confirmFolderUpload.js]
 [browser_multiplePrompts.js]
 [browser_openPromptInBackgroundTab.js]
 support-files = openPromptOffTimeout.html
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser_close_during_beforeunload.js firefox-85.0+build1/browser/base/content/test/tabs/browser_close_during_beforeunload.js
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser_close_during_beforeunload.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser_close_during_beforeunload.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,7 @@
   let win = await BrowserTestUtils.openNewBrowserWindow();
 
   let browser = win.gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
 
   await SpecialPowers.spawn(browser, [], () => {
     // eslint-disable-next-line mozilla/balanced-listeners
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser_e10s_chrome_process.js firefox-85.0+build1/browser/base/content/test/tabs/browser_e10s_chrome_process.js
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser_e10s_chrome_process.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser_e10s_chrome_process.js	2021-01-18 19:58:08.000000000 +0000
@@ -36,14 +36,7 @@
       false,
       endURL
     );
-    let expectSyncChange = await transitionTask(browser, endURL);
-    if (expectSyncChange) {
-      is(
-        browser.isRemoteBrowser,
-        endProcessIsRemote,
-        "Should have switched to the right process synchronously"
-      );
-    }
+    await transitionTask(browser, endURL);
     await docLoadedPromise;
 
     is(browser.currentURI.spec, endURL, "Should have made it to the final URL");
@@ -121,21 +114,17 @@
   // Loads the new page by calling browser.loadURI directly
   async function loadURI(browser, uri) {
     info("Calling browser.loadURI");
-    await BrowserTestUtils.loadURI(browser, uri);
-    return true;
+    BrowserTestUtils.loadURI(browser, uri);
   },
 
   // Loads the new page by finding a link with the right href in the document and
   // clicking it
   function clickLink(browser, uri) {
     info("Clicking link");
-
     SpecialPowers.spawn(browser, [uri], function frame_script(frameUri) {
       let link = content.document.querySelector("a[href='" + frameUri + "']");
       link.click();
     });
-
-    return false;
   },
 ];
 
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser_e10s_switchbrowser.js firefox-85.0+build1/browser/base/content/test/tabs/browser_e10s_switchbrowser.js
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser_e10s_switchbrowser.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser_e10s_switchbrowser.js	2021-01-18 19:58:08.000000000 +0000
@@ -356,18 +356,7 @@
   info("2");
   // Load another page
   info("Loading about:robots");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:robots");
-  is(
-    gBrowser.selectedBrowser.isRemoteBrowser,
-    false,
-    "Remote attribute should be correct"
-  );
-  is(
-    gBrowser.selectedBrowser.permanentKey,
-    permanentKey,
-    "browser.permanentKey is still the same"
-  );
-
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:robots");
   await BrowserTestUtils.browserStopped(gBrowser);
   is(
     gBrowser.selectedBrowser.isRemoteBrowser,
@@ -383,21 +372,10 @@
   info("3");
   // Load the remote page again
   info("Loading http://example.org/" + DUMMY_PATH);
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     gBrowser.selectedBrowser,
     "http://example.org/" + DUMMY_PATH
   );
-  is(
-    gBrowser.selectedBrowser.isRemoteBrowser,
-    expectedRemote,
-    "Remote attribute should be correct"
-  );
-  is(
-    gBrowser.selectedBrowser.permanentKey,
-    permanentKey,
-    "browser.permanentKey is still the same"
-  );
-
   await BrowserTestUtils.browserStopped(gBrowser);
   is(
     gBrowser.selectedBrowser.isRemoteBrowser,
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser.ini firefox-85.0+build1/browser/base/content/test/tabs/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -75,7 +75,7 @@
 [browser_new_tab_in_privilegedabout_process_pref.js]
 skip-if = !e10s || (os == 'linux' && debug && bits == 64) || fission # Pref and test only relevant for e10s, Bug 1581500. Bug 1668809
 [browser_privilegedmozilla_process_pref.js]
-skip-if = !e10s || fission # Pref and test only relevant for e10s.
+skip-if = !e10s # Pref and test only relevant for e10s.
 [browser_newwindow_tabstrip_overflow.js]
 [browser_open_newtab_start_observer_notification.js]
 [browser_opened_file_tab_navigated_to_web.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js firefox-85.0+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js	2021-01-18 19:58:08.000000000 +0000
@@ -39,7 +39,7 @@
     false,
     "http://example.com/"
   );
-  await BrowserTestUtils.loadURI(appTab.linkedBrowser, "http://example.com/");
+  BrowserTestUtils.loadURI(appTab.linkedBrowser, "http://example.com/");
   info("Started loading example.com");
   await pageLoadPromise;
   info("Loaded example.com");
diff -Nru firefox-84.0.2+build1/browser/base/content/test/tabs/browser_privilegedmozilla_process_pref.js firefox-85.0+build1/browser/base/content/test/tabs/browser_privilegedmozilla_process_pref.js
--- firefox-84.0.2+build1/browser/base/content/test/tabs/browser_privilegedmozilla_process_pref.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/tabs/browser_privilegedmozilla_process_pref.js	2021-01-18 19:58:08.000000000 +0000
@@ -159,9 +159,6 @@
     );
     browser.goBack();
     await promiseLocation;
-    // We will need to ensure that the process flip has fully completed so that
-    // the navigation history data will be available when we do browser.goForward();
-    await BrowserTestUtils.waitForEvent(newTab, "SSTabRestored");
     is(
       browser.frameLoader.remoteTab.osPid,
       privilegedPid,
@@ -175,9 +172,6 @@
     );
     browser.goForward();
     await promiseLocation;
-    // We will need to ensure that the process flip has fully completed so that
-    // the navigation history data will be available when we do browser.gotoIndex(0);
-    await BrowserTestUtils.waitForEvent(newTab, "SSTabRestored");
     checkBrowserRemoteType(
       browser,
       E10SUtils.WEB_REMOTE_TYPE,
diff -Nru firefox-84.0.2+build1/browser/base/content/test/webrtc/browser_devices_get_user_media_screen_tab_close.js firefox-85.0+build1/browser/base/content/test/webrtc/browser_devices_get_user_media_screen_tab_close.js
--- firefox-84.0.2+build1/browser/base/content/test/webrtc/browser_devices_get_user_media_screen_tab_close.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/webrtc/browser_devices_get_user_media_screen_tab_close.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,73 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const TEST_ROOT = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content/",
+  "https://example.com/"
+);
+const TEST_PAGE = TEST_ROOT + "get_user_media.html";
+
+/**
+ * Tests that the given tab is the currently selected tab.
+ * @param {Element} aTab - Tab to test.
+ */
+function testSelected(aTab) {
+  is(aTab, gBrowser.selectedTab, "Tab is gBrowser.selectedTab");
+  is(aTab.getAttribute("selected"), "true", "Tab has property 'selected'");
+  is(
+    aTab.getAttribute("visuallyselected"),
+    "true",
+    "Tab has property 'visuallyselected'"
+  );
+}
+
+/**
+ * Tests that when closing a tab with active screen sharing, the screen sharing
+ * ends and the tab closes properly.
+ */
+add_task(async function testScreenSharingTabClose() {
+  let initialTab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "http://example.com"
+  );
+
+  // Open another foreground tab and ensure its selected.
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PAGE);
+  testSelected(tab);
+
+  // Start screen sharing in active tab
+  await shareDevices(tab.linkedBrowser, false, false, SHARE_WINDOW);
+  ok(tab._sharingState.webRTC.screen, "Tab has webRTC screen sharing state");
+
+  let recordingEndedPromise = expectObserverCalled(
+    "recording-window-ended",
+    1,
+    tab.linkedBrowser.browsingContext
+  );
+  let tabClosedPromise = BrowserTestUtils.waitForCondition(
+    () => gBrowser.selectedTab == initialTab,
+    "Waiting for tab to close"
+  );
+
+  // Close tab
+  BrowserTestUtils.removeTab(tab, { animate: true, byMouse: true });
+
+  // Wait for screen sharing to end
+  await recordingEndedPromise;
+
+  // Wait for tab to be fully closed
+  await tabClosedPromise;
+
+  // Test that we're back to the initial tab.
+  testSelected(initialTab);
+
+  // There should be no active sharing for the selected tab.
+  ok(
+    !gBrowser.selectedTab._sharingState?.webRTC?.screen,
+    "Selected tab doesn't have webRTC screen sharing state"
+  );
+
+  BrowserTestUtils.removeTab(initialTab);
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/webrtc/browser.ini firefox-85.0+build1/browser/base/content/test/webrtc/browser.ini
--- firefox-84.0.2+build1/browser/base/content/test/webrtc/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/webrtc/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -5,6 +5,8 @@
   get_user_media_in_xorigin_frame.html
   get_user_media_in_xorigin_frame_ancestor.html
   head.js
+  single_peerconnection.html
+
 prefs =
   privacy.webrtc.allowSilencingNotifications=true
   privacy.webrtc.legacyGlobalIndicator=false
@@ -26,6 +28,7 @@
 skip-if = (os == "win" && !debug) || (os =="linux" && !debug && bits == 64) # Bug 1440900
 [browser_devices_get_user_media_screen.js]
 skip-if = (os == 'linux') # Bug 1503991
+[browser_devices_get_user_media_screen_tab_close.js]
 [browser_devices_get_user_media_tear_off_tab.js]
 [browser_devices_get_user_media_unprompted_access.js]
 [browser_devices_get_user_media_unprompted_access_in_frame.js]
@@ -40,3 +43,4 @@
 [browser_tab_switch_warning.js]
 [browser_webrtc_hooks.js]
 [browser_devices_get_user_media_queue_request.js]
+[browser_WebrtcGlobalInformation.js]
diff -Nru firefox-84.0.2+build1/browser/base/content/test/webrtc/browser_WebrtcGlobalInformation.js firefox-85.0+build1/browser/base/content/test/webrtc/browser_WebrtcGlobalInformation.js
--- firefox-84.0.2+build1/browser/base/content/test/webrtc/browser_WebrtcGlobalInformation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/webrtc/browser_WebrtcGlobalInformation.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,229 @@
+/* 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";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserTestUtils: "resource://testing-common/BrowserTestUtils.jsm",
+});
+
+const ProcessTools = Cc["@mozilla.org/processtools-service;1"].getService(
+  Ci.nsIProcessToolsService
+);
+
+let getStatsReports = async (filter = "") => {
+  let { reports } = await new Promise(r =>
+    WebrtcGlobalInformation.getAllStats(r, filter)
+  );
+
+  ok(Array.isArray(reports), "|reports| is an array");
+
+  let sanityCheckReport = report => {
+    isnot(report.pcid, "", "pcid is non-empty");
+    if (filter.length) {
+      is(report.pcid, filter, "pcid matches filter");
+    }
+  };
+
+  reports.forEach(sanityCheckReport);
+  return reports;
+};
+
+let getLogging = async () => {
+  let logs = await new Promise(r => WebrtcGlobalInformation.getLogging("", r));
+  ok(Array.isArray(logs), "|logs| is an array");
+  return logs;
+};
+
+let checkStatsReportCount = async (count, filter = "") => {
+  let reports = await getStatsReports(filter);
+  is(reports.length, count, `|reports| should have length ${count}`);
+  if (reports.length != count) {
+    info(`reports = ${JSON.stringify(reports)}`);
+  }
+  return reports;
+};
+
+let checkLoggingEmpty = async () => {
+  let logs = await getLogging();
+  is(logs.length, 0, "Logging is empty");
+  if (logs.length) {
+    info(`logs = ${JSON.stringify(logs)}`);
+  }
+  return logs;
+};
+
+let checkLoggingNonEmpty = async () => {
+  let logs = await getLogging();
+  isnot(logs.length, 0, "Logging is not empty");
+  return logs;
+};
+
+let clearAndCheck = async () => {
+  WebrtcGlobalInformation.clearAllStats();
+  WebrtcGlobalInformation.clearLogging();
+  await checkStatsReportCount(0);
+  await checkLoggingEmpty();
+};
+
+let openTabInNewProcess = async file => {
+  let rootDir = getRootDirectory(gTestPath);
+  rootDir = rootDir.replace(
+    "chrome://mochitests/content/",
+    "https://example.com/"
+  );
+  let absoluteURI = rootDir + file;
+
+  return BrowserTestUtils.openNewForegroundTab({
+    gBrowser,
+    opening: absoluteURI,
+    forceNewProcess: true,
+  });
+};
+
+let killTabProcess = async tab => {
+  ProcessTools.kill(tab.linkedBrowser.frameLoader.remoteTab.osPid);
+};
+
+add_task(async () => {
+  info("Test that clearAllStats is callable");
+  WebrtcGlobalInformation.clearAllStats();
+  ok(true, "clearAllStats returns");
+});
+
+add_task(async () => {
+  info("Test that clearLogging is callable");
+  WebrtcGlobalInformation.clearLogging();
+  ok(true, "clearLogging returns");
+});
+
+add_task(async () => {
+  info(
+    "Test that getAllStats is callable, and returns 0 results when no RTCPeerConnections have existed"
+  );
+  await checkStatsReportCount(0);
+});
+
+add_task(async () => {
+  info(
+    "Test that getLogging is callable, and returns 0 results when no RTCPeerConnections have existed"
+  );
+  await checkLoggingEmpty();
+});
+
+add_task(async () => {
+  info("Test that we can get stats/logging for a PC on the parent process");
+  await clearAndCheck();
+  let pc = new RTCPeerConnection();
+  await pc.setLocalDescription(
+    await pc.createOffer({ offerToReceiveAudio: true })
+  );
+  // Let ICE stack go quiescent
+  await new Promise(r => {
+    pc.onicegatheringstatechange = () => {
+      if (pc.iceGatheringState == "complete") {
+        r();
+      }
+    };
+  });
+  await checkStatsReportCount(1);
+  await checkLoggingNonEmpty();
+  pc.close();
+  pc = null;
+  // Closing a PC should not do anything to the ICE logging
+  await checkLoggingNonEmpty();
+  // There's just no way to get a signal that the ICE stack has stopped logging
+  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+  await new Promise(r => setTimeout(r, 2000));
+  await clearAndCheck();
+});
+
+add_task(async () => {
+  info("Test that we can get stats/logging for a PC on a content process");
+  await clearAndCheck();
+  let tab = await openTabInNewProcess("single_peerconnection.html");
+  await checkStatsReportCount(1);
+  await checkLoggingNonEmpty();
+  await killTabProcess(tab);
+  BrowserTestUtils.removeTab(tab);
+  await clearAndCheck();
+});
+
+add_task(async () => {
+  info("Test filtering for stats reports (parent process)");
+  await clearAndCheck();
+  let pc1 = new RTCPeerConnection();
+  let pc2 = new RTCPeerConnection();
+  let allReports = await checkStatsReportCount(2);
+  await checkStatsReportCount(1, allReports[0].pcid);
+  pc1.close();
+  pc2.close();
+  pc1 = null;
+  pc2 = null;
+  await checkStatsReportCount(1, allReports[0].pcid);
+  await clearAndCheck();
+});
+
+add_task(async () => {
+  info("Test filtering for stats reports (content process)");
+  await clearAndCheck();
+  let tab1 = await openTabInNewProcess("single_peerconnection.html");
+  let tab2 = await openTabInNewProcess("single_peerconnection.html");
+  let allReports = await checkStatsReportCount(2);
+  await checkStatsReportCount(1, allReports[0].pcid);
+  await killTabProcess(tab1);
+  BrowserTestUtils.removeTab(tab1);
+  await killTabProcess(tab2);
+  BrowserTestUtils.removeTab(tab2);
+  await checkStatsReportCount(1, allReports[0].pcid);
+  await clearAndCheck();
+});
+
+add_task(async () => {
+  info("Test that stats/logging persists when PC is closed (parent process)");
+  await clearAndCheck();
+  let pc = new RTCPeerConnection();
+  // This stuff will generate logging
+  await pc.setLocalDescription(
+    await pc.createOffer({ offerToReceiveAudio: true })
+  );
+  await new Promise(r => (pc.onicecandidate = r));
+  let reports = await checkStatsReportCount(1);
+  isnot(
+    window.browsingContext.browserId,
+    undefined,
+    "browserId is defined for parent process"
+  );
+  is(
+    reports[0].browserId,
+    window.browsingContext.browserId,
+    "browserId for stats report matches parent process"
+  );
+  await checkLoggingNonEmpty();
+  pc.close();
+  pc = null;
+  await checkStatsReportCount(1);
+  await checkLoggingNonEmpty();
+  await clearAndCheck();
+});
+
+add_task(async () => {
+  info("Test that stats/logging persists when PC is closed (content process)");
+  await clearAndCheck();
+  let tab = await openTabInNewProcess("single_peerconnection.html");
+  let { browserId } = tab.linkedBrowser;
+  let reports = await checkStatsReportCount(1);
+  is(reports[0].browserId, browserId, "browserId for stats report matches tab");
+  isnot(
+    browserId,
+    window.browsingContext.browserId,
+    "tab browser id is not the same as parent process browser id"
+  );
+  await checkLoggingNonEmpty();
+  await killTabProcess(tab);
+  BrowserTestUtils.removeTab(tab);
+  await checkStatsReportCount(1);
+  await checkLoggingNonEmpty();
+  await clearAndCheck();
+});
diff -Nru firefox-84.0.2+build1/browser/base/content/test/webrtc/single_peerconnection.html firefox-85.0+build1/browser/base/content/test/webrtc/single_peerconnection.html
--- firefox-84.0.2+build1/browser/base/content/test/webrtc/single_peerconnection.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/webrtc/single_peerconnection.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head><meta charset="UTF-8"></head>
+<body>
+<div id="Page that opens a single peerconnection"></div>
+<script>
+  let test = async () => {
+    let pc = new RTCPeerConnection();
+    await pc.setLocalDescription(await pc.createOffer({offerToReceiveAudio: true}));
+  };
+  test();
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/browser/base/content/test/zoom/head.js firefox-85.0+build1/browser/base/content/test/zoom/head.js
--- firefox-84.0.2+build1/browser/base/content/test/zoom/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/test/zoom/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -219,7 +219,7 @@
   let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
 
   if (url) {
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, url);
+    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
   }
 
   return loaded;
diff -Nru firefox-84.0.2+build1/browser/base/content/webext-panels.js firefox-85.0+build1/browser/base/content/webext-panels.js
--- firefox-84.0.2+build1/browser/base/content/webext-panels.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/base/content/webext-panels.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,6 +38,7 @@
   browser.setAttribute("type", "content");
   browser.setAttribute("flex", "1");
   browser.setAttribute("disableglobalhistory", "true");
+  browser.setAttribute("messagemanagergroup", "webext-browsers");
   browser.setAttribute("webextension-view-type", panel.viewType);
   browser.setAttribute("context", "contentAreaContextMenu");
   browser.setAttribute("tooltip", "aHTMLTooltip");
diff -Nru firefox-84.0.2+build1/browser/branding/aurora/pref/firefox-branding.js firefox-85.0+build1/browser/branding/aurora/pref/firefox-branding.js
--- firefox-84.0.2+build1/browser/branding/aurora/pref/firefox-branding.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/branding/aurora/pref/firefox-branding.js	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,7 @@
 pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/aurora/");
 
 pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
 
 // The number of days a binary is permitted to be old
 // without checking for an update.  This assumes that
diff -Nru firefox-84.0.2+build1/browser/branding/nightly/pref/firefox-branding.js firefox-85.0+build1/browser/branding/nightly/pref/firefox-branding.js
--- firefox-84.0.2+build1/browser/branding/nightly/pref/firefox-branding.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/branding/nightly/pref/firefox-branding.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,6 +19,7 @@
 pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/");
 
 pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
 
 // The number of days a binary is permitted to be old
 // without checking for an update.  This assumes that
diff -Nru firefox-84.0.2+build1/browser/branding/official/pref/firefox-branding.js firefox-85.0+build1/browser/branding/official/pref/firefox-branding.js
--- firefox-84.0.2+build1/browser/branding/official/pref/firefox-branding.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/branding/official/pref/firefox-branding.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,10 +20,12 @@
   pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta");
   pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");
   pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
 #else
   pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/");
   pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
   pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
 #endif
 
 // The number of days a binary is permitted to be old
diff -Nru firefox-84.0.2+build1/browser/components/aboutconfig/test/browser/browser.ini firefox-85.0+build1/browser/components/aboutconfig/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/aboutconfig/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutconfig/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = debug || asan # Bug 1507747 and bug 1520398
+skip-if = debug || asan || tsan # Bug 1507747 and bug 1520398
 support-files =
   head.js
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/AboutLoginsChild.jsm firefox-85.0+build1/browser/components/aboutlogins/AboutLoginsChild.jsm
--- firefox-84.0.2+build1/browser/components/aboutlogins/AboutLoginsChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/AboutLoginsChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -180,6 +180,10 @@
         recordTelemetryEvent(event.detail);
         break;
       }
+      case "AboutLoginsRemoveAllLogins": {
+        this.sendAsyncMessage("AboutLogins:RemoveAllLogins");
+        break;
+      }
       case "AboutLoginsSortChanged": {
         this.sendAsyncMessage("AboutLogins:SortChanged", event.detail);
         break;
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/AboutLoginsParent.jsm firefox-85.0+build1/browser/components/aboutlogins/AboutLoginsParent.jsm
--- firefox-84.0.2+build1/browser/components/aboutlogins/AboutLoginsParent.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/AboutLoginsParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -426,6 +426,10 @@
         fp.open(fpCallback);
         break;
       }
+      case "AboutLogins:RemoveAllLogins": {
+        Services.logins.removeAllUserFacingLogins();
+        break;
+      }
     }
   }
 
@@ -790,12 +794,14 @@
     // authenticated. More diagnostics and error states can be handled
     // by other more Sync-specific pages.
     const loggedIn = state.status != UIState.STATUS_NOT_CONFIGURED;
+    const passwordSyncEnabled = state.syncEnabled && PASSWORD_SYNC_ENABLED;
 
     return {
       loggedIn,
       email: state.email,
       avatarURL: state.avatarURL,
       fxAccountsEnabled: FXA_ENABLED,
+      passwordSyncEnabled,
     };
   },
 
@@ -815,6 +821,7 @@
   onPasswordSyncEnabledPreferenceChange(data, previous, latest) {
     Services.prefs.clearUserPref(SHOW_PASSWORD_SYNC_NOTIFICATION_PREF);
     this.updatePasswordSyncNotificationState(this.getSyncState(), latest);
+    this.messageSubscribers("AboutLogins:SyncState", this.getSyncState());
   },
 };
 var _AboutLogins = AboutLogins;
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.css firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.css
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.css	2021-01-18 19:58:08.000000000 +0000
@@ -56,7 +56,7 @@
 :root:not(.initialized) login-intro,
 :root:not(.initialized) login-item,
 :root.empty-search login-intro,
-:root:not(.no-logins):not(.empty-search):not(.login-selected) login-intro,
+:root:not(.no-logins, .empty-search, .login-selected) login-intro,
 login-item[data-editing="true"] + login-intro,
 .login-selected login-intro,
 :root:not(.login-selected) login-item:not([data-editing="true"]),
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.html firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.html
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.html	2021-01-18 19:58:08.000000000 +0000
@@ -13,6 +13,7 @@
     <link rel="localization" href="browser/branding/brandings.ftl">
     <link rel="localization" href="browser/aboutLogins.ftl">
     <script type="module" src="chrome://browser/content/aboutlogins/components/confirmation-dialog.js"></script>
+    <script type="module" src="chrome://browser/content/aboutlogins/components/remove-logins-dialog.js"></script>
     <script type="module" src="chrome://browser/content/aboutlogins/components/fxaccounts-button.js"></script>
     <script type="module" src="chrome://browser/content/aboutlogins/components/login-filter.js"></script>
     <script type="module" src="chrome://browser/content/aboutlogins/components/login-intro.js"></script>
@@ -37,6 +38,7 @@
     <login-item></login-item>
     <login-intro></login-intro>
     <confirmation-dialog hidden></confirmation-dialog>
+    <remove-logins-dialog hidden></remove-logins-dialog>
     <div id="master-password-required-overlay"></div>
 
     <template id="confirmation-dialog-template">
@@ -61,6 +63,31 @@
       </div>
     </template>
 
+    <template id="remove-logins-dialog-template">
+      <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
+      <link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
+      <link rel="stylesheet" href="chrome://browser/content/aboutlogins/components/remove-logins-dialog.css">
+      <div class="overlay">
+      <div class="container" role="dialog" aria-labelledby="title" aria-describedby="message">
+        <button class="dismiss-button" data-l10n-id="confirmation-dialog-dismiss-button">
+          <img class="dismiss-icon" src="chrome://global/skin/icons/close.svg"/>
+        </button>
+        <div class="content">
+          <img class="warning-icon" src="chrome://global/skin/icons/delete.svg"/>
+          <h1 class="title" id="title"></h1>
+          <p class="message" id="message"></p>
+          <div class="checkbox-wrapper">
+            <input id="confirmation-checkbox" type="checkbox" class="checkbox"></input>
+            <label for="confirmation-checkbox"></label>
+          </div>
+        </div>
+        <div class="buttons">
+          <button class="confirm-button danger-button"></button>
+          <button class="cancel-button" data-l10n-id="confirmation-dialog-cancel-button"></button>
+        </div>
+      </div>
+    </template>
+
     <template id="fxaccounts-button-template">
       <link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
       <link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
@@ -275,6 +302,7 @@
         <button role="menuitem" class="menuitem-button menuitem-import-browser ghost-button" hidden data-supported-platforms="Win32,MacIntel" data-event-name="AboutLoginsImportFromBrowser" data-l10n-id="about-logins-menu-menuitem-import-from-another-browser"></button>
         <button role="menuitem" class="menuitem-button menuitem-import-file ghost-button" data-event-name="AboutLoginsImportFromFile" data-l10n-id="about-logins-menu-menuitem-import-from-a-file"></button>
         <button role="menuitem" class="menuitem-button menuitem-export ghost-button" data-event-name="AboutLoginsExportPasswordsDialog" data-l10n-id="about-logins-menu-menuitem-export-logins"></button>
+        <button role="menuitem" class="menuitem-button menuitem-remove-all-logins ghost-button" data-event-name="AboutLoginsRemoveAllLoginsDialog" data-l10n-id="about-logins-menu-menuitem-remove-all-logins"></button>
         <hr role="separator" class="menuitem-separator"></hr>
         <button role="menuitem" class="menuitem-button menuitem-preferences ghost-button" data-event-name="AboutLoginsOpenPreferences" data-l10n-id="menu-menuitem-preferences"></button>
         <hr role="separator" class="menuitem-separator"></hr>
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.js firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/aboutLogins.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/aboutLogins.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,13 @@
   loginIntro: document.querySelector("login-intro"),
   loginItem: document.querySelector("login-item"),
   loginFilter: document.querySelector("login-filter"),
+  menuButton: document.querySelector("menu-button"),
+  // removeAllLogins button is nested inside of menuButton
+  get removeAllButton() {
+    return this.menuButton.shadowRoot.querySelector(
+      ".menuitem-remove-all-logins"
+    );
+  },
 };
 
 let numberOfLogins = 0;
@@ -23,6 +30,7 @@
   document.documentElement.classList.toggle("no-logins", numberOfLogins == 0);
   gElements.loginList.classList.toggle("no-logins", numberOfLogins == 0);
   gElements.loginItem.classList.toggle("no-logins", numberOfLogins == 0);
+  gElements.removeAllButton.disabled = numberOfLogins == 0;
 }
 
 function handleAllLogins(logins) {
@@ -31,9 +39,14 @@
   updateNoLogins();
 }
 
+let fxaLoggedIn = null;
+let passwordSyncEnabled = null;
+
 function handleSyncState(syncState) {
   gElements.fxAccountsButton.updateState(syncState);
   gElements.loginIntro.updateState(syncState);
+  fxaLoggedIn = syncState.loggedIn;
+  passwordSyncEnabled = syncState.passwordSyncEnabled;
 }
 
 window.addEventListener("AboutLoginsChromeToContent", event => {
@@ -114,6 +127,45 @@
     }
   }
 });
+
+window.addEventListener("AboutLoginsRemoveAllLoginsDialog", () => {
+  let loginItem = document.querySelector("login-item");
+  if (loginItem.dataset.editing) {
+    loginItem._toggleEditing();
+  }
+  let options = {};
+  if (fxaLoggedIn && passwordSyncEnabled) {
+    options.title = "about-logins-confirm-remove-all-sync-dialog-title";
+    options.message = "about-logins-confirm-remove-all-sync-dialog-message";
+  } else {
+    options.title = "about-logins-confirm-remove-all-dialog-title";
+    options.message = "about-logins-confirm-remove-all-dialog-message";
+  }
+  options.confirmCheckboxLabel =
+    "about-logins-confirm-remove-all-dialog-checkbox-label";
+  options.confirmButtonLabel =
+    "about-logins-confirm-remove-all-dialog-confirm-button-label";
+  options.count = numberOfLogins;
+
+  let dialog = document.querySelector("remove-logins-dialog");
+  let dialogPromise = dialog.show(options);
+  try {
+    dialogPromise.then(
+      () => {
+        window.document.documentElement.classList.remove("login-selected");
+        let removeAllEvt = new CustomEvent("AboutLoginsRemoveAllLogins", {
+          bubbles: true,
+        });
+        window.dispatchEvent(removeAllEvt);
+      },
+      () => {}
+    );
+  } catch (e) {
+    if (e != undefined) {
+      throw e;
+    }
+  }
+});
 
 window.addEventListener("AboutLoginsExportPasswordsDialog", async event => {
   recordTelemetryEvent({
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/components/login-item.css firefox-85.0+build1/browser/components/aboutlogins/content/components/login-item.css
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/components/login-item.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/components/login-item.css	2021-01-18 19:58:08.000000000 +0000
@@ -247,6 +247,7 @@
   cursor: pointer;
   -moz-context-properties: fill;
   fill: currentColor !important;
+  color: inherit !important;
   opacity: var(--reveal-checkbox-opacity);
   flex-shrink: 0;
 }
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/components/menu-button.css firefox-85.0+build1/browser/components/aboutlogins/content/components/menu-button.css
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/components/menu-button.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/components/menu-button.css	2021-01-18 19:58:08.000000000 +0000
@@ -78,6 +78,10 @@
   background-image: url("chrome://browser/skin/save.svg");
 }
 
+.menuitem-remove-all-logins {
+  background-image: url("chrome://global/skin/icons/delete.svg");
+}
+
 .menuitem-preferences {
   background-image: url("chrome://global/skin/icons/settings.svg");
 }
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/components/menu-button.js firefox-85.0+build1/browser/components/aboutlogins/content/components/menu-button.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/components/menu-button.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/components/menu-button.js	2021-01-18 19:58:08.000000000 +0000
@@ -129,6 +129,13 @@
     if (this._menu.hidden) {
       this._showMenu();
     }
+    if (successor.disabled) {
+      if (next) {
+        successor = items[activeItemIndex + 2];
+      } else {
+        successor = items[activeItemIndex - 2];
+      }
+    }
     successor.focus();
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.css firefox-85.0+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.css
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.css	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.css	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,128 @@
+/* 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/. */
+
+ .overlay {
+  position: fixed;
+  z-index: 1;
+  inset: 0;
+  /* TODO: this color is used in the about:preferences overlay, but
+           why isn't it declared as a variable? */
+  background-color: rgba(0,0,0,0.5);
+  display: flex;
+}
+
+.container {
+  z-index: 2;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  min-width: 300px;
+  max-width: 660px;
+  min-height: 200px;
+  align-self: center;
+  margin-inline-start: calc(var(--sidebar-width) - 48px);
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-text-color);
+  box-shadow: var(--shadow-30);
+  /* show a border in high contrast mode */
+  outline: 1px solid transparent;
+}
+
+@media screen and (max-width: 938px) {
+  .container {
+    margin-inline-start: auto;
+    margin-inline-end: 8px;
+  }
+}
+
+@media screen and (max-width: 676px) {
+  .container {
+    margin-inline-start: 8px;
+    margin-inline-end: 8px;
+  }
+}
+
+.title {
+  grid-area: 1 / 2 / 2 / 8;
+}
+
+.message {
+  font-weight: 600;
+  grid-area: 2 / 2 / 3 / 8;
+  font-size: 1.25em;
+}
+
+label[for="confirmation-checkbox"] {
+  font-size: 1.25em;
+}
+
+.dismiss-button {
+  position: absolute;
+  top: 0;
+  inset-inline-end: 0;
+  min-width: 20px;
+  min-height: 20px;
+  margin: 16px;
+  padding: 0;
+  line-height: 0;
+}
+
+.dismiss-icon {
+  -moz-context-properties: fill, fill-opacity;
+  fill: currentColor;
+  fill-opacity: 0;
+}
+
+.warning-icon {
+  -moz-context-properties: fill;
+  fill: currentColor;
+  width: 32px;
+  height: 32px;
+  margin: 8px;
+}
+
+.content,
+.buttons {
+  padding: 36px 48px;
+  padding-bottom: 24px;
+}
+
+.content {
+  display: grid;
+  grid-template-columns: 0.5fr 1fr 1fr 1fr 1fr 1fr 1fr;
+  grid-template-rows: 0.5fr 0.5fr 0.5fr;
+}
+
+.checkbox-wrapper {
+  display: flex;
+  grid-area: 3 / 2 / 4 / 8;
+  align-self: first baseline;
+}
+
+.warning-icon {
+  grid-area: 1 / 1 / 2 / 2;
+}
+
+.checkbox {
+  grid-area: 3 / 2 / 4 / 8;
+  font-size: 1.1em;
+  align-self: center;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  padding-block: 16px 32px;
+  padding-inline: 48px 0;
+  border-top: 1px solid var(--in-content-border-color);
+  margin-inline: 48px;
+}
+
+.buttons.macosx > .confirm-button {
+  order: 1;
+}
+
+.buttons > button {
+  min-width: 140px;
+}
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.js firefox-85.0+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/content/components/remove-logins-dialog.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,121 @@
+/* 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/. */
+
+import { setKeyboardAccessForNonDialogElements } from "../aboutLoginsUtils.js";
+
+export default class RemoveLoginsDialog extends HTMLElement {
+  constructor() {
+    super();
+    this._promise = null;
+  }
+
+  connectedCallback() {
+    if (this.shadowRoot) {
+      return;
+    }
+    let template = document.querySelector("#remove-logins-dialog-template");
+    let shadowRoot = this.attachShadow({ mode: "open" });
+    document.l10n.connectRoot(shadowRoot);
+    shadowRoot.appendChild(template.content.cloneNode(true));
+
+    this._buttons = this.shadowRoot.querySelector(".buttons");
+    this._cancelButton = this.shadowRoot.querySelector(".cancel-button");
+    this._confirmButton = this.shadowRoot.querySelector(".confirm-button");
+    this._dismissButton = this.shadowRoot.querySelector(".dismiss-button");
+    this._message = this.shadowRoot.querySelector(".message");
+    this._overlay = this.shadowRoot.querySelector(".overlay");
+    this._title = this.shadowRoot.querySelector(".title");
+    this._checkbox = this.shadowRoot.querySelector(".checkbox");
+    this._checkboxLabel = this.shadowRoot.querySelector(
+      "label[for='confirmation-checkbox']"
+    );
+
+    this._buttons.classList.toggle("macosx", navigator.platform == "MacIntel");
+  }
+
+  handleEvent(event) {
+    switch (event.type) {
+      case "keydown":
+        if (event.key === "Escape" && !event.defaultPrevented) {
+          this.onCancel();
+        }
+        break;
+      case "click":
+        if (
+          event.target.classList.contains("cancel-button") ||
+          event.currentTarget.classList.contains("dismiss-button") ||
+          event.target.classList.contains("overlay")
+        ) {
+          this.onCancel();
+        } else if (event.target.classList.contains("confirm-button")) {
+          this.onConfirm();
+        } else if (event.target.classList.contains("checkbox")) {
+          this._confirmButton.disabled = !this._checkbox.checked;
+        }
+    }
+  }
+
+  hide() {
+    setKeyboardAccessForNonDialogElements(true);
+    this._cancelButton.removeEventListener("click", this);
+    this._confirmButton.removeEventListener("click", this);
+    this._dismissButton.removeEventListener("click", this);
+    this._overlay.removeEventListener("click", this);
+    this._checkbox.removeEventListener("click", this);
+    window.removeEventListener("keydown", this);
+
+    this._checkbox.checked = false;
+
+    this.hidden = true;
+  }
+
+  show({ title, message, confirmButtonLabel, confirmCheckboxLabel, count }) {
+    setKeyboardAccessForNonDialogElements(false);
+    this.hidden = false;
+
+    document.l10n.setAttributes(this._title, title, {
+      count,
+    });
+    document.l10n.setAttributes(this._message, message, {
+      count,
+    });
+    document.l10n.setAttributes(this._confirmButton, confirmButtonLabel, {
+      count,
+    });
+    document.l10n.setAttributes(this._checkboxLabel, confirmCheckboxLabel, {
+      count,
+    });
+
+    this._checkbox.addEventListener("click", this);
+    this._cancelButton.addEventListener("click", this);
+    this._confirmButton.addEventListener("click", this);
+    this._dismissButton.addEventListener("click", this);
+    this._overlay.addEventListener("click", this);
+    window.addEventListener("keydown", this);
+
+    this._confirmButton.disabled = true;
+    // For speed-of-use, focus the confirmation checkbox when the dialog loads.
+    // Introducing this checkbox provides enough of a buffer for accidental deletions.
+    this._checkbox.focus();
+
+    this._promise = new Promise((resolve, reject) => {
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+
+    return this._promise;
+  }
+
+  onCancel() {
+    this._reject();
+    this.hide();
+  }
+
+  onConfirm() {
+    this._resolve();
+    this.hide();
+  }
+}
+
+customElements.define("remove-logins-dialog", RemoveLoginsDialog);
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/jar.mn firefox-85.0+build1/browser/components/aboutlogins/jar.mn
--- firefox-84.0.2+build1/browser/components/aboutlogins/jar.mn	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/jar.mn	2021-01-18 19:58:08.000000000 +0000
@@ -5,6 +5,8 @@
 browser.jar:
   content/browser/aboutlogins/components/confirmation-dialog.css      (content/components/confirmation-dialog.css)
   content/browser/aboutlogins/components/confirmation-dialog.js       (content/components/confirmation-dialog.js)
+  content/browser/aboutlogins/components/remove-logins-dialog.css     (content/components/remove-logins-dialog.css)
+  content/browser/aboutlogins/components/remove-logins-dialog.js      (content/components/remove-logins-dialog.js)
   content/browser/aboutlogins/components/fxaccounts-button.css (content/components/fxaccounts-button.css)
   content/browser/aboutlogins/components/fxaccounts-button.js  (content/components/fxaccounts-button.js)
   content/browser/aboutlogins/components/login-filter.css      (content/components/login-filter.css)
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js	2021-01-18 19:58:08.000000000 +0000
@@ -50,7 +50,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js	2021-01-18 19:58:08.000000000 +0000
@@ -36,7 +36,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_breachAlertShowingForAddedLogin.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_breachAlertShowingForAddedLogin.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_breachAlertShowingForAddedLogin.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_breachAlertShowingForAddedLogin.js	2021-01-18 19:58:08.000000000 +0000
@@ -21,7 +21,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_createLogin.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_createLogin.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_createLogin.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_createLogin.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(aboutLoginsTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser.ini firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,7 @@
 # Run first so content events from previous tests won't trickle in.
 # Skip ASAN and debug since waiting for content events is already slow.
 [browser_aaa_eventTelemetry_run_first.js]
-skip-if = asan || ccov || debug || (os == "win" && !debug) # bug 1605494 is more prevalent on linux, Bug 1627419
+skip-if = asan || tsan || ccov || debug || (os == "win" && !debug) # bug 1605494 is more prevalent on linux, Bug 1627419
 [browser_alertDismissedAfterChangingPassword.js]
 [browser_breachAlertShowingForAddedLogin.js]
 [browser_confirmDeleteDialog.js]
@@ -37,8 +37,9 @@
 [browser_openSite.js]
 [browser_osAuthDialog.js]
 skip-if = (os == 'linux') # bug 1527745
+[browser_removeAllDialog.js]
 [browser_sessionRestore.js]
-skip-if = debug # Bug 1576876
+skip-if = tsan || debug # Bug 1576876
 [browser_tabKeyNav.js]
 [browser_updateLogin.js]
 [browser_vulnerableLoginAddedInSecondaryWindow.js]
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js	2021-01-18 19:58:08.000000000 +0000
@@ -124,7 +124,7 @@
     );
   });
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   await SpecialPowers.spawn(browser, [], async () => {
     let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,7 +25,7 @@
   TEST_LOGIN3 = await addLogin(TEST_LOGIN3);
   info(`TEST_LOGIN3 added with guid=${TEST_LOGIN3.guid}`);
   registerCleanupFunction(() => {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     Services.prefs.clearUserPref(SORT_PREF_NAME);
   });
 });
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_masterPassword.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_masterPassword.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_masterPassword.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_masterPassword.js	2021-01-18 19:58:08.000000000 +0000
@@ -43,7 +43,7 @@
   await mpDialogShown;
 
   registerCleanupFunction(async function() {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_openFiltered.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_openFiltered.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_openFiltered.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_openFiltered.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,7 +26,7 @@
   await tabOpenedPromise;
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_openSite.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_openSite.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_openSite.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_openSite.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,7 +25,7 @@
   });
 
   registerCleanupFunction(function() {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,381 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable mozilla/no-arbitrary-setTimeout */
+
+ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
+const OS_REAUTH_PREF = "signon.management.page.os-auth.enabled";
+
+async function openRemoveAllDialog(browser) {
+  await SimpleTest.promiseFocus(browser);
+  await BrowserTestUtils.synthesizeMouseAtCenter("menu-button", {}, browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let menuButton = content.document.querySelector("menu-button");
+    let menu = menuButton.shadowRoot.querySelector("ul.menu");
+    await ContentTaskUtils.waitForCondition(() => !menu.hidden);
+  });
+  function getRemoveAllMenuButton() {
+    let menuButton = window.document.querySelector("menu-button");
+    return menuButton.shadowRoot.querySelector(".menuitem-remove-all-logins");
+  }
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    getRemoveAllMenuButton,
+    {},
+    browser
+  );
+  info("remove all dialog should be opened");
+}
+
+async function activateLoginItemEdit(browser) {
+  await SimpleTest.promiseFocus(browser);
+  function getLoginItemEditButton() {
+    let loginItem = window.document.querySelector("login-item");
+    return loginItem.shadowRoot.querySelector(".edit-button");
+  }
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    getLoginItemEditButton,
+    {},
+    browser
+  );
+  info("login-item should be in edit mode");
+}
+
+async function waitForRemoveAllLogins() {
+  return new Promise(resolve => {
+    Services.obs.addObserver(function observer(subject, topic, changeType) {
+      if (changeType != "removeAllLogins") {
+        return;
+      }
+
+      Services.obs.removeObserver(observer, "passwordmgr-storage-changed");
+      resolve();
+    }, "passwordmgr-storage-changed");
+  });
+}
+
+add_task(async function setup() {
+  await BrowserTestUtils.openNewForegroundTab({
+    gBrowser,
+    url: "about:logins",
+  });
+  registerCleanupFunction(() => {
+    BrowserTestUtils.removeTab(gBrowser.selectedTab);
+    Services.logins.removeAllUserFacingLogins();
+  });
+  TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
+});
+
+add_task(async function test_remove_all_dialog_l10n() {
+  ok(TEST_LOGIN1, "test_login1");
+  let browser = gBrowser.selectedBrowser;
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    const EventUtils = ContentTaskUtils.getEventUtils(content);
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    ok(!dialog.hidden);
+    let title = dialog.shadowRoot.querySelector(".title");
+    let message = dialog.shadowRoot.querySelector(".message");
+    let label = dialog.shadowRoot.querySelector(
+      "label[for='confirmation-checkbox']"
+    );
+    let cancelButton = dialog.shadowRoot.querySelector(".cancel-button");
+    let removeAllButton = dialog.shadowRoot.querySelector(".confirm-button");
+    await content.document.l10n.translateElements([
+      title,
+      message,
+      label,
+      cancelButton,
+      removeAllButton,
+    ]);
+    is(
+      title.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-title",
+      "Title contents should match l10n-id attribute set on element"
+    );
+    is(
+      message.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-message",
+      "Message contents should match l10n-id attribute set on element"
+    );
+    is(
+      label.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-checkbox-label",
+      "Label contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      cancelButton.dataset.l10nId,
+      "confirmation-dialog-cancel-button",
+      "Cancel button contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      removeAllButton.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-confirm-button-label",
+      "Remove all button contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      JSON.parse(title.dataset.l10nArgs).count,
+      1,
+      "Title contents should match l10n-args attribute set on element"
+    );
+    is(
+      JSON.parse(message.dataset.l10nArgs).count,
+      1,
+      "Message contents should match l10n-args attribute set on element"
+    );
+    is(
+      JSON.parse(label.dataset.l10nArgs).count,
+      1,
+      "Label contents should match l10n-id attribute set on outer element"
+    );
+    EventUtils.synthesizeMouseAtCenter(
+      dialog.shadowRoot.querySelector(".cancel-button"),
+      {},
+      content
+    );
+    await ContentTaskUtils.waitForCondition(
+      () => dialog.hidden,
+      "Waiting for the dialog to be hidden after clicking cancel button"
+    );
+  });
+});
+
+add_task(async function test_remove_all_dialog_keyboard_navigation() {
+  let browser = gBrowser.selectedBrowser;
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    const EventUtils = ContentTaskUtils.getEventUtils(content);
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    let cancelButton = dialog.shadowRoot.querySelector(".cancel-button");
+    let removeAllButton = dialog.shadowRoot.querySelector(".confirm-button");
+    is(
+      removeAllButton.disabled,
+      true,
+      "Remove all should be disabled on dialog open"
+    );
+    await EventUtils.synthesizeKey(" ", {}, content);
+    is(
+      removeAllButton.disabled,
+      false,
+      "Remove all should be enabled when activating the checkbox"
+    );
+    await EventUtils.synthesizeKey(" ", {}, content);
+    is(
+      removeAllButton.disabled,
+      true,
+      "Remove all should be disabled after deactivating the checkbox"
+    );
+    await EventUtils.synthesizeKey("KEY_Tab", {}, content);
+    is(
+      dialog.shadowRoot.activeElement,
+      cancelButton,
+      "Cancel button should be the next element in tab order"
+    );
+    await EventUtils.synthesizeKey(" ", {}, content);
+    await ContentTaskUtils.waitForCondition(
+      () => dialog.hidden,
+      "Waiting for the dialog to be hidden after activating cancel button via Space key"
+    );
+  });
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    await EventUtils.synthesizeKey("KEY_Escape", {}, content);
+    await ContentTaskUtils.waitForCondition(
+      () => dialog.hidden,
+      "Waiting for the dialog to be hidden after activating Escape key"
+    );
+  });
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    let dismissButton = dialog.shadowRoot.querySelector(".dismiss-button");
+    await EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true }, content);
+    is(
+      dialog.shadowRoot.activeElement,
+      dismissButton,
+      "dismiss button should be focused"
+    );
+    await EventUtils.synthesizeKey(" ", {}, content);
+    await ContentTaskUtils.waitForCondition(
+      () => dialog.hidden,
+      "Waiting for the dialog to be hidden after activating X button"
+    );
+  });
+});
+
+add_task(async function test_remove_all_dialog_remove_logins() {
+  TEST_LOGIN2 = await addLogin(TEST_LOGIN2);
+  let browser = gBrowser.selectedBrowser;
+  let removeAllPromise = waitForRemoveAllLogins();
+
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    let title = dialog.shadowRoot.querySelector(".title");
+    let message = dialog.shadowRoot.querySelector(".message");
+    let label = dialog.shadowRoot.querySelector(
+      "label[for='confirmation-checkbox']"
+    );
+    let cancelButton = dialog.shadowRoot.querySelector(".cancel-button");
+    let removeAllButton = dialog.shadowRoot.querySelector(".confirm-button");
+
+    let checkbox = dialog.shadowRoot.querySelector(".checkbox");
+
+    await content.document.l10n.translateElements([
+      title,
+      message,
+      cancelButton,
+      removeAllButton,
+      label,
+      checkbox,
+    ]);
+    is(
+      dialog.shadowRoot.activeElement,
+      checkbox,
+      "Checkbox should be the focused element on dialog open"
+    );
+    is(
+      title.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-title",
+      "Title contents should match l10n-id attribute set on element"
+    );
+    is(
+      JSON.parse(title.dataset.l10nArgs).count,
+      2,
+      "Title contents should match l10n-args attribute set on element"
+    );
+    is(
+      message.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-message",
+      "Message contents should match l10n-id attribute set on element"
+    );
+    is(
+      JSON.parse(message.dataset.l10nArgs).count,
+      2,
+      "Message contents should match l10n-args attribute set on element"
+    );
+    is(
+      label.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-checkbox-label",
+      "Label contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      JSON.parse(label.dataset.l10nArgs).count,
+      2,
+      "Label contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      cancelButton.dataset.l10nId,
+      "confirmation-dialog-cancel-button",
+      "Cancel button contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      removeAllButton.dataset.l10nId,
+      "about-logins-confirm-remove-all-dialog-confirm-button-label",
+      "Remove all button contents should match l10n-id attribute set on outer element"
+    );
+    is(
+      removeAllButton.disabled,
+      true,
+      "Remove all button should be disabled on dialog open"
+    );
+  });
+  function activateConfirmCheckbox() {
+    let dialog = window.document.querySelector("remove-logins-dialog");
+    return dialog.shadowRoot.querySelector(".checkbox");
+  }
+
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    activateConfirmCheckbox,
+    {},
+    browser
+  );
+
+  await SpecialPowers.spawn(browser, [], async () => {
+    let dialog = Cu.waiveXrays(
+      content.document.querySelector("remove-logins-dialog")
+    );
+    let removeAllButton = dialog.shadowRoot.querySelector(".confirm-button");
+    is(
+      removeAllButton.disabled,
+      false,
+      "Remove all should be enabled after clicking the checkbox"
+    );
+  });
+  function getDialogRemoveAllButton() {
+    let dialog = window.document.querySelector("remove-logins-dialog");
+    return dialog.shadowRoot.querySelector(".confirm-button");
+  }
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    getDialogRemoveAllButton,
+    {},
+    browser
+  );
+  await removeAllPromise;
+  await SpecialPowers.spawn(browser, [], async () => {
+    let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.documentElement.classList.contains("no-logins"),
+      "Waiting for no logins view since all logins should be deleted"
+    );
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        !content.document.documentElement.classList.contains("login-selected"),
+      "Waiting for the FxA Sync illustration to reappear"
+    );
+    await ContentTaskUtils.waitForCondition(
+      () => loginList.classList.contains("no-logins"),
+      "Waiting for login-list to be in no logins view as all logins should be deleted"
+    );
+  });
+  await BrowserTestUtils.synthesizeMouseAtCenter("menu-button", {}, browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let menuButton = content.document.querySelector("menu-button");
+    let removeAllMenuButton = menuButton.shadowRoot.querySelector(
+      ".menuitem-remove-all-logins"
+    );
+    ok(
+      removeAllMenuButton.disabled,
+      "Remove all logins menu button is disabled if there are no logins"
+    );
+  });
+  await SpecialPowers.spawn(browser, [], async () => {
+    let menuButton = Cu.waiveXrays(
+      content.document.querySelector("menu-button")
+    );
+    let menu = menuButton.shadowRoot.querySelector("ul.menu");
+    await EventUtils.synthesizeKey("KEY_Escape", {}, content);
+    await ContentTaskUtils.waitForCondition(
+      () => menu.hidden,
+      "Waiting for menu to close"
+    );
+  });
+});
+
+add_task(async function test_ensure_edit_mode_reset_login_item() {
+  // Preferences.set(OS_REAUTH_PREF, false);
+  await SpecialPowers.pushPrefEnv({
+    set: [[OS_REAUTH_PREF, false]],
+  });
+  TEST_LOGIN2 = await addLogin(TEST_LOGIN2);
+  let browser = gBrowser.selectedBrowser;
+  await activateLoginItemEdit(browser);
+  await openRemoveAllDialog(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let loginItem = content.document.querySelector("login-item");
+    ok(
+      !loginItem.dataset.editing,
+      "Login item is no longer in edit mode due to remove all dialog being present"
+    );
+  });
+  await SpecialPowers.popPrefEnv();
+});
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_sessionRestore.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_sessionRestore.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_sessionRestore.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_sessionRestore.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,7 +23,7 @@
 add_task(async function() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   registerCleanupFunction(() => {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 
   const testGuid = TEST_LOGIN1.guid;
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_tabKeyNav.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_tabKeyNav.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_tabKeyNav.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_tabKeyNav.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,7 +22,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_updateLogin.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_updateLogin.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_updateLogin.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_updateLogin.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,7 @@
   });
   registerCleanupFunction(() => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_vulnerableLoginAddedInSecondaryWindow.js firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_vulnerableLoginAddedInSecondaryWindow.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/browser/browser_vulnerableLoginAddedInSecondaryWindow.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/browser/browser_vulnerableLoginAddedInSecondaryWindow.js	2021-01-18 19:58:08.000000000 +0000
@@ -43,7 +43,7 @@
 
   registerCleanupFunction(async () => {
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     await BrowserTestUtils.closeWindow(newWin);
   });
 });
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/chrome/test_login_list.html firefox-85.0+build1/browser/components/aboutlogins/tests/chrome/test_login_list.html
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/chrome/test_login_list.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/chrome/test_login_list.html	2021-01-18 19:58:08.000000000 +0000
@@ -220,7 +220,7 @@
   }));
 
   gLoginList.setLogins([TEST_LOGIN_3]);
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 1, "The one stored login should be displayed");
   is(loginListItems[0].dataset.guid, TEST_LOGIN_3.guid, "login-list-item should have correct guid attribute");
   let loginUsername = loginListItems[0].querySelector(".username");
@@ -229,7 +229,7 @@
 
 add_task(async function test_populated_list() {
   gLoginList.setLogins([TEST_LOGIN_1, TEST_LOGIN_2]);
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 2, "The two stored logins should be displayed");
   is(loginListItems[0].getAttribute("role"), "option", "Each login-list-item should have role='option'");
   is(loginListItems[0].dataset.guid, TEST_LOGIN_1.guid, "login-list-item should have correct guid attribute");
@@ -240,7 +240,7 @@
   ok(loginListItems[0].classList.contains("selected"), "The first item should be selected by default");
   ok(!loginListItems[1].classList.contains("selected"), "The second item should not be selected by default");
   loginListItems[0].click();
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 2, "After selecting one, only the two stored logins should be displayed");
   ok(loginListItems[0].classList.contains("selected"), "The first item should be selected");
   ok(!loginListItems[1].classList.contains("selected"), "The second item should still not be selected");
@@ -253,7 +253,7 @@
   vulnerableLogins.set(TEST_LOGIN_1.guid, true);
   vulnerableLogins.set(TEST_LOGIN_3.guid, true);
   gLoginList.setVulnerableLogins(vulnerableLogins);
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   let alertIcon = loginListItems[0].querySelector(".alert-icon");
   is(loginListItems[0].dataset.guid, TEST_LOGIN_1.guid, "The first login should be TEST_LOGIN_1");
   ok(!loginListItems[0].classList.contains("vulnerable"), "The first login should not have the .vulnerable class");
@@ -275,7 +275,7 @@
   gLoginList.setLogins([TEST_LOGIN_1, TEST_LOGIN_2]);
   let emptySearchText = gLoginList.shadowRoot.querySelector(".empty-search-message");
   ok(isHidden(emptySearchText), "The empty search text should be hidden when there are results in the list");
-  is(gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])").length, 2, "Both logins should be visible");
+  is(gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])").length, 2, "Both logins should be visible");
   let countSpan = gLoginList.shadowRoot.querySelector(".count");
   is(JSON.parse(countSpan.getAttribute("data-l10n-args")).count, 2, "Count should match full list length");
   window.dispatchEvent(new CustomEvent("AboutLoginsFilterLogins", {
@@ -399,12 +399,12 @@
 add_task(async function test_login_added() {
   info("selected sort: " + gLoginList.shadowRoot.getElementById("login-sort").selectedIndex);
 
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 2, "Should have two logins at start of test");
   let newLogin = Object.assign({}, TEST_LOGIN_1, {title: "example2.example.com", guid: "111222"});
   gLoginList.loginAdded(newLogin);
   await asyncElementRendered();
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 3, "New login should be added to the list");
   is(loginListItems[0].dataset.guid, TEST_LOGIN_1.guid, "login-list-item1 should have correct guid attribute");
   is(loginListItems[1].dataset.guid, TEST_LOGIN_2.guid, "login-list-item2 should have correct guid attribute");
@@ -418,7 +418,7 @@
 add_task(async function test_login_removed() {
   gLoginList.loginRemoved({guid: "111222"});
   await asyncElementRendered();
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 2, "New login should be removed from the list");
   is(loginListItems[0].dataset.guid, TEST_LOGIN_1.guid, "login-list-item1 should have correct guid attribute");
   is(loginListItems[1].dataset.guid, TEST_LOGIN_2.guid, "login-list-item2 should have correct guid attribute");
@@ -479,7 +479,7 @@
   let loginSort = gLoginList.shadowRoot.getElementById("login-sort");
   loginSort.value = "last-used";
   dispatchChangeEvent(loginSort);
-  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems.length, 3, "The list should contain the three stored logins");
   let timeUsed1 = gLoginList._logins[loginListItems[0].dataset.guid].login.timeLastUsed;
   let timeUsed2 = gLoginList._logins[loginListItems[1].dataset.guid].login.timeLastUsed;
@@ -490,7 +490,7 @@
   // sort by title
   loginSort.value = "name";
   dispatchChangeEvent(loginSort);
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   let title1 = gLoginList._logins[loginListItems[0].dataset.guid].login.title;
   let title2 = gLoginList._logins[loginListItems[1].dataset.guid].login.title;
   let title3 = gLoginList._logins[loginListItems[2].dataset.guid].login.title;
@@ -500,7 +500,7 @@
   // sort by title in reverse alphabetical order
   loginSort.value = "name-reverse";
   dispatchChangeEvent(loginSort);
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   title1 = gLoginList._logins[loginListItems[0].dataset.guid].login.title;
   title2 = gLoginList._logins[loginListItems[1].dataset.guid].login.title;
   title3 = gLoginList._logins[loginListItems[2].dataset.guid].login.title;
@@ -511,7 +511,7 @@
   // sort by last changed
   loginSort.value = "last-changed";
   dispatchChangeEvent(loginSort);
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   let pwChanged1 = gLoginList._logins[loginListItems[0].dataset.guid].login.timePasswordChanged;
   let pwChanged2 = gLoginList._logins[loginListItems[1].dataset.guid].login.timePasswordChanged;
   let pwChanged3 = gLoginList._logins[loginListItems[2].dataset.guid].login.timePasswordChanged;
@@ -524,7 +524,7 @@
   let vulnerableLogins = new Map();
   gLoginList.setVulnerableLogins(vulnerableLogins);
   dispatchChangeEvent(loginSort);
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   is(loginListItems[0].classList.contains("breached"), true, "Breached login should be displayed at top of list");
   is(!loginListItems[1].classList.contains("breached"), true, "Non-breached login should be displayed below breached");
 
@@ -532,7 +532,7 @@
   gLoginList.setBreaches(new Map());
   loginSort.value = "alerts";
   dispatchChangeEvent(loginSort);
-  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item, [hidden])");
   title1 = gLoginList._logins[loginListItems[0].dataset.guid].login.title;
   title2 = gLoginList._logins[loginListItems[1].dataset.guid].login.title;
   is(title1.localeCompare(title2), -1, "Logins should be sorted alphabetically by hostname");
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/chrome/test_menu_button.html firefox-85.0+build1/browser/components/aboutlogins/tests/chrome/test_menu_button.html
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/chrome/test_menu_button.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/chrome/test_menu_button.html	2021-01-18 19:58:08.000000000 +0000
@@ -95,6 +95,7 @@
     sendKey("TAB"); // Import from file
   }
   sendKey("TAB"); // Export
+  sendKey("TAB"); // Remove All Logins
 
   if (navigator.platform == "Win32" || navigator.platform == "MacIntel") {
     // The Import menuitem is only visible on Windows/macOS, where we will need another Tab
@@ -145,6 +146,7 @@
 
   let allItems = [
     "menuitem-export",
+    "menuitem-remove-all-logins",
     "menuitem-preferences",
     "menuitem-help",
   ];
diff -Nru firefox-84.0.2+build1/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js firefox-85.0+build1/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js
--- firefox-84.0.2+build1/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js	2021-01-18 19:58:08.000000000 +0000
@@ -199,7 +199,7 @@
   );
 
   info("Clear login storage");
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   const breachesByLoginGUID2 = await LoginBreaches.getPotentialBreachesByLoginGUID(
     [BREACHED_LOGIN, NOT_BREACHED_LOGIN],
diff -Nru firefox-84.0.2+build1/browser/components/BrowserGlue.jsm firefox-85.0+build1/browser/components/BrowserGlue.jsm
--- firefox-84.0.2+build1/browser/components/BrowserGlue.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/BrowserGlue.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -16,59 +16,98 @@
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterDefaultConfig",
-  "resource://activity-stream/lib/ASRouterDefaultConfig.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterNewTabHook",
-  "resource://activity-stream/lib/ASRouterNewTabHook.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ActorManagerParent",
-  "resource://gre/modules/ActorManagerParent.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "AboutNewTab",
-  "resource:///modules/AboutNewTab.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "E10SUtils",
-  "resource://gre/modules/E10SUtils.jsm"
-);
-
-ChromeUtils.defineModuleGetter(this, "Log", "resource://gre/modules/Log.jsm");
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "NetUtil",
-  "resource://gre/modules/NetUtil.jsm"
-);
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "DeferredTask",
-  "resource://gre/modules/DeferredTask.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AboutNewTab: "resource:///modules/AboutNewTab.jsm",
+  ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
+  AddonManager: "resource://gre/modules/AddonManager.jsm",
+  AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
+  ASRouterDefaultConfig:
+    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
+  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
+  AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
+  Blocklist: "resource://gre/modules/Blocklist.jsm",
+  BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.jsm",
+  BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.jsm",
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
+  BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
+  BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
+  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
+  ContextualIdentityService:
+    "resource://gre/modules/ContextualIdentityService.jsm",
+  Corroborate: "resource://gre/modules/Corroborate.jsm",
+  DeferredTask: "resource://gre/modules/DeferredTask.jsm",
+  Discovery: "resource:///modules/Discovery.jsm",
+  DoHController: "resource:///modules/DoHController.jsm",
+  DownloadsViewableInternally:
+    "resource:///modules/DownloadsViewableInternally.jsm",
+  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
+  ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
+  FeatureGate: "resource://featuregates/FeatureGate.jsm",
+  FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm",
+  FxAccounts: "resource://gre/modules/FxAccounts.jsm",
+  HomePage: "resource:///modules/HomePage.jsm",
+  Integration: "resource://gre/modules/Integration.jsm",
+  Log: "resource://gre/modules/Log.jsm",
+  LoginBreaches: "resource:///modules/LoginBreaches.jsm",
+  NetUtil: "resource://gre/modules/NetUtil.jsm",
+  NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
+  Normandy: "resource://normandy/Normandy.jsm",
+  OS: "resource://gre/modules/osfile.jsm",
+  OsEnvironment: "resource://gre/modules/OsEnvironment.jsm",
+  PageActions: "resource:///modules/PageActions.jsm",
+  PageThumbs: "resource://gre/modules/PageThumbs.jsm",
+  PdfJs: "resource://pdf.js/PdfJs.jsm",
+  PermissionUI: "resource:///modules/PermissionUI.jsm",
+  PlacesBackups: "resource://gre/modules/PlacesBackups.jsm",
+  PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.jsm",
+  PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
+  PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
+  PluralForm: "resource://gre/modules/PluralForm.jsm",
+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
+  ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
+  PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
+  RemoteSettings: "resource://services-settings/remote-settings.js",
+  RemoteSecuritySettings:
+    "resource://gre/modules/psm/RemoteSecuritySettings.jsm",
+  RFPHelper: "resource://gre/modules/RFPHelper.jsm",
+  SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
+  Sanitizer: "resource:///modules/Sanitizer.jsm",
+  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
+  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
+  SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
+  SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
+  TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
+  TabUnloader: "resource:///modules/TabUnloader.jsm",
+  TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
+  TRRRacer: "resource:///modules/TRRPerformance.jsm",
+  UIState: "resource://services-sync/UIState.jsm",
+  WebChannel: "resource://gre/modules/WebChannel.jsm",
+  WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
+});
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "FeatureGate",
-  "resource://featuregates/FeatureGate.jsm"
-);
+// eslint-disable-next-line no-unused-vars
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AboutLoginsParent: "resource:///modules/AboutLoginsParent.jsm",
+  PluginManager: "resource:///actors/PluginParent.jsm",
+});
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "PlacesUIUtils",
-  "resource:///modules/PlacesUIUtils.jsm"
-);
+// Modules requiring an initialization method call.
+let initializedModules = {};
+[
+  [
+    "ContentPrefServiceParent",
+    "resource://gre/modules/ContentPrefServiceParent.jsm",
+    "alwaysInit",
+  ],
+  ["UpdateListener", "resource://gre/modules/UpdateListener.jsm", "init"],
+].forEach(([name, resource, init]) => {
+  XPCOMUtils.defineLazyGetter(this, name, () => {
+    ChromeUtils.import(resource, initializedModules);
+    initializedModules[name][init]();
+    return initializedModules[name];
+  });
+});
 
 XPCOMUtils.defineLazyServiceGetter(
   this,
@@ -155,6 +194,7 @@
         AboutLoginsOpenPreferences: { wantUntrusted: true },
         AboutLoginsOpenSite: { wantUntrusted: true },
         AboutLoginsRecordTelemetryEvent: { wantUntrusted: true },
+        AboutLoginsRemoveAllLogins: { wantUntrusted: true },
         AboutLoginsSortChanged: { wantUntrusted: true },
         AboutLoginsSyncEnable: { wantUntrusted: true },
         AboutLoginsSyncOptions: { wantUntrusted: true },
@@ -193,8 +233,12 @@
       },
     },
     // The wildcard on about:newtab is for the ?endpoint query parameter
-    // that is used for snippets debugging.
-    matches: ["about:home", "about:welcome", "about:newtab*"],
+    // that is used for snippets debugging. The wildcard for about:home
+    // is similar, and also allows for falling back to loading the
+    // about:home document dynamically if an attempt is made to load
+    // about:home?jscache from the AboutHomeStartupCache as a top-level
+    // load.
+    matches: ["about:home*", "about:welcome", "about:newtab*"],
     remoteTypes: ["privilegedabout"],
   },
 
@@ -594,12 +638,12 @@
     enablePreference: "accessibility.blockautorefresh",
   },
 
-  SearchTelemetry: {
+  SearchSERPTelemetry: {
     parent: {
-      moduleURI: "resource:///actors/SearchTelemetryParent.jsm",
+      moduleURI: "resource:///actors/SearchSERPTelemetryParent.jsm",
     },
     child: {
-      moduleURI: "resource:///actors/SearchTelemetryChild.jsm",
+      moduleURI: "resource:///actors/SearchSERPTelemetryChild.jsm",
       events: {
         DOMContentLoaded: {},
         pageshow: { mozSystemGroup: true },
@@ -794,93 +838,6 @@
   () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject
 );
 
-// lazy module getters
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  AddonManager: "resource://gre/modules/AddonManager.jsm",
-  AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
-  AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
-  Blocklist: "resource://gre/modules/Blocklist.jsm",
-  BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.jsm",
-  BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.jsm",
-  BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
-  BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
-  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
-  ContextualIdentityService:
-    "resource://gre/modules/ContextualIdentityService.jsm",
-  Corroborate: "resource://gre/modules/Corroborate.jsm",
-  Discovery: "resource:///modules/Discovery.jsm",
-  DoHController: "resource:///modules/DoHController.jsm",
-  DownloadsViewableInternally:
-    "resource:///modules/DownloadsViewableInternally.jsm",
-  ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
-  FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm",
-  FxAccounts: "resource://gre/modules/FxAccounts.jsm",
-  HomePage: "resource:///modules/HomePage.jsm",
-  Integration: "resource://gre/modules/Integration.jsm",
-  LoginBreaches: "resource:///modules/LoginBreaches.jsm",
-  NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
-  Normandy: "resource://normandy/Normandy.jsm",
-  ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-  OS: "resource://gre/modules/osfile.jsm",
-  OsEnvironment: "resource://gre/modules/OsEnvironment.jsm",
-  PageActions: "resource:///modules/PageActions.jsm",
-  PageThumbs: "resource://gre/modules/PageThumbs.jsm",
-  PdfJs: "resource://pdf.js/PdfJs.jsm",
-  PermissionUI: "resource:///modules/PermissionUI.jsm",
-  PlacesBackups: "resource://gre/modules/PlacesBackups.jsm",
-  PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  PluralForm: "resource://gre/modules/PluralForm.jsm",
-  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
-  PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
-  RemoteSettings: "resource://services-settings/remote-settings.js",
-  RemoteSecuritySettings:
-    "resource://gre/modules/psm/RemoteSecuritySettings.jsm",
-  RFPHelper: "resource://gre/modules/RFPHelper.jsm",
-  SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
-  Sanitizer: "resource:///modules/Sanitizer.jsm",
-  SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
-  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
-  SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
-  SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
-  TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
-  TabUnloader: "resource:///modules/TabUnloader.jsm",
-  TRRRacer: "resource:///modules/TRRPerformance.jsm",
-  UIState: "resource://services-sync/UIState.jsm",
-  WebChannel: "resource://gre/modules/WebChannel.jsm",
-  WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
-});
-
-// eslint-disable-next-line no-unused-vars
-XPCOMUtils.defineLazyModuleGetters(this, {
-  AboutLoginsParent: "resource:///modules/AboutLoginsParent.jsm",
-  AsyncPrefs: "resource://gre/modules/AsyncPrefs.jsm",
-  PluginManager: "resource:///actors/PluginParent.jsm",
-});
-
-/**
- * IF YOU ADD OR REMOVE FROM THIS LIST, PLEASE UPDATE THE LIST ABOVE AS WELL.
- * XXX Bug 1325373 is for making eslint detect these automatically.
- */
-
-let initializedModules = {};
-
-[
-  [
-    "ContentPrefServiceParent",
-    "resource://gre/modules/ContentPrefServiceParent.jsm",
-    "alwaysInit",
-  ],
-  ["UpdateListener", "resource://gre/modules/UpdateListener.jsm", "init"],
-].forEach(([name, resource, init]) => {
-  XPCOMUtils.defineLazyGetter(this, name, () => {
-    ChromeUtils.import(resource, initializedModules);
-    initializedModules[name][init]();
-    return initializedModules[name];
-  });
-});
-
 if (AppConstants.MOZ_CRASHREPORTER) {
   XPCOMUtils.defineLazyModuleGetters(this, {
     UnsubmittedCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
@@ -1134,14 +1091,6 @@
           if (this._placesBrowserInitComplete) {
             Services.obs.notifyObservers(null, "places-browser-init-complete");
           }
-        } else if (data == "migrateMatchBucketsPrefForUI66") {
-          this._migrateMatchBucketsPrefForUI66().then(() => {
-            Services.obs.notifyObservers(
-              null,
-              "browser-glue-test",
-              "migrateMatchBucketsPrefForUI66-done"
-            );
-          });
         } else if (data == "add-breaches-sync-handler") {
           this._addBreachesSyncHandler();
         }
@@ -1185,7 +1134,7 @@
           Cu.reportError(ex);
         }
         let win = BrowserWindowTracker.getTopWindow();
-        win.BrowserSearch.recordSearchInTelemetry(engine, "urlbar");
+        BrowserSearchTelemetry.recordSearch(win.gBrowser, engine, "urlbar");
         break;
       case "browser-search-engine-modified":
         // Ensure we cleanup the hiddenOneOffs pref when removing
@@ -1230,9 +1179,6 @@
         DownloadsViewableInternally.register();
 
         break;
-      case "shield-init-complete":
-        this._shieldInitComplete = true;
-        break;
     }
   },
 
@@ -1269,7 +1215,6 @@
     os.addObserver(this, "xpi-signature-changed");
     os.addObserver(this, "sync-ui-state:update");
     os.addObserver(this, "handlersvc-store-initialized");
-    os.addObserver(this, "shield-init-complete");
 
     ActorManagerParent.addJSProcessActors(JSPROCESSACTORS);
     ActorManagerParent.addJSWindowActors(JSWINDOWACTORS);
@@ -1343,7 +1288,6 @@
     os.removeObserver(this, "flash-plugin-hang");
     os.removeObserver(this, "xpi-signature-changed");
     os.removeObserver(this, "sync-ui-state:update");
-    os.removeObserver(this, "shield-init-complete");
 
     Services.prefs.removeObserver(
       "privacy.trackingprotection",
@@ -1911,11 +1855,12 @@
 
     this._collectFirstPartyIsolationTelemetry();
 
-    if (!this._placesTelemetryGathered) {
-      Cc["@mozilla.org/places/categoriesStarter;1"]
-        .getService(Ci.nsIObserver)
-        .observe(null, "gather-places-telemetry", null);
+    if (!this._placesTelemetryGathered && TelemetryUtils.isTelemetryEnabled) {
       this._placesTelemetryGathered = true;
+      // Collect Places telemetry on the first idle.
+      Services.tm.idleDispatchToMainThread(() => {
+        PlacesDBUtils.telemetry();
+      });
     }
 
     // Set the default favicon size for UI views that use the page-icon protocol.
@@ -2170,7 +2115,7 @@
     }
 
     BrowserUsageTelemetry.uninit();
-    SearchTelemetry.uninit();
+    SearchSERPTelemetry.uninit();
     PageThumbs.uninit();
     NewTabUtils.uninit();
 
@@ -2365,7 +2310,7 @@
     this._windowsWereRestored = true;
 
     BrowserUsageTelemetry.init();
-    SearchTelemetry.init();
+    SearchSERPTelemetry.init();
 
     ExtensionsUI.init();
 
@@ -2698,6 +2643,12 @@
         },
       },
 
+      {
+        task: () => {
+          PlacesUIUtils.ensureBookmarkToolbarTelemetryListening();
+        },
+      },
+
       // Marionette needs to be initialized as very last step
       {
         task: () => {
@@ -3350,132 +3301,6 @@
 
     let xulStore = Services.xulStore;
 
-    if (currentUIVersion < 52) {
-      // Keep old devtools log persistence behavior after splitting netmonitor and
-      // webconsole prefs (bug 1307881).
-      if (Services.prefs.getBoolPref("devtools.webconsole.persistlog", false)) {
-        Services.prefs.setBoolPref("devtools.netmonitor.persistlog", true);
-      }
-    }
-
-    // Update user customizations that will interfere with the Safe Browsing V2
-    // to V4 migration (bug 1395419).
-    if (currentUIVersion < 53) {
-      const MALWARE_PREF = "urlclassifier.malwareTable";
-      if (Services.prefs.prefHasUserValue(MALWARE_PREF)) {
-        let malwareList = Services.prefs.getCharPref(MALWARE_PREF);
-        if (malwareList.includes("goog-malware-shavar")) {
-          malwareList.replace("goog-malware-shavar", "goog-malware-proto");
-          Services.prefs.setCharPref(MALWARE_PREF, malwareList);
-        }
-      }
-    }
-
-    if (currentUIVersion < 55) {
-      Services.prefs.clearUserPref("browser.customizemode.tip0.shown");
-    }
-
-    if (currentUIVersion < 56) {
-      // Prior to the end of the Firefox 57 cycle, the sidebarcommand being present
-      // or not was the only thing that distinguished whether the sidebar was open.
-      // Now, the sidebarcommand always indicates the last opened sidebar, and we
-      // correctly persist the checked attribute to indicate whether or not the
-      // sidebar was open. We should set the checked attribute in case it wasn't:
-      if (xulStore.getValue(BROWSER_DOCURL, "sidebar-box", "sidebarcommand")) {
-        xulStore.setValue(BROWSER_DOCURL, "sidebar-box", "checked", "true");
-      }
-    }
-
-    if (currentUIVersion < 58) {
-      // With Firefox 57, we are doing a one time reset of the geo prefs due to bug 1413652
-      Services.prefs.clearUserPref("browser.search.countryCode");
-      Services.prefs.clearUserPref("browser.search.region");
-      Services.prefs.clearUserPref("browser.search.isUS");
-    }
-
-    if (currentUIVersion < 59) {
-      let searchInitializedPromise = new Promise(resolve => {
-        if (Services.search.isInitialized) {
-          resolve();
-        }
-        const SEARCH_SERVICE_TOPIC = "browser-search-service";
-        Services.obs.addObserver(function observer(subject, topic, data) {
-          if (data != "init-complete") {
-            return;
-          }
-          Services.obs.removeObserver(observer, SEARCH_SERVICE_TOPIC);
-          resolve();
-        }, SEARCH_SERVICE_TOPIC);
-      });
-      searchInitializedPromise.then(() => {
-        let currentEngine = Services.search.defaultEngine.wrappedJSObject;
-        // Only reset the current engine if it wasn't set by a WebExtension
-        // and it is not one of the default engines.
-        // If the original default is not a default, the user has a weird
-        // configuration probably involving langpacks, it's not worth
-        // attempting to reset their settings.
-        if (
-          currentEngine._extensionID ||
-          currentEngine.isAppProvided ||
-          !Services.search.originalDefaultEngine.isAppProvided
-        ) {
-          return;
-        }
-
-        if (!currentEngine._loadPath.startsWith("[https]")) {
-          Services.search.resetToOriginalDefaultEngine();
-        }
-      });
-
-      // Migrate the old requested locales prefs to use the new model
-      const SELECTED_LOCALE_PREF = "general.useragent.locale";
-      const MATCHOS_LOCALE_PREF = "intl.locale.matchOS";
-
-      if (
-        Services.prefs.prefHasUserValue(MATCHOS_LOCALE_PREF) ||
-        Services.prefs.prefHasUserValue(SELECTED_LOCALE_PREF)
-      ) {
-        if (Services.prefs.getBoolPref(MATCHOS_LOCALE_PREF, false)) {
-          Services.locale.requestedLocales = [];
-        } else {
-          let locale = Services.prefs.getComplexValue(
-            SELECTED_LOCALE_PREF,
-            Ci.nsIPrefLocalizedString
-          );
-          if (locale) {
-            try {
-              Services.locale.requestedLocales = [locale.data];
-            } catch (e) {
-              /* Don't panic if the value is not a valid locale code. */
-            }
-          }
-        }
-        Services.prefs.clearUserPref(SELECTED_LOCALE_PREF);
-        Services.prefs.clearUserPref(MATCHOS_LOCALE_PREF);
-      }
-    }
-
-    if (currentUIVersion < 61) {
-      // Remove persisted toolbarset from navigator toolbox
-      xulStore.removeValue(BROWSER_DOCURL, "navigator-toolbox", "toolbarset");
-    }
-
-    if (currentUIVersion < 62) {
-      // Remove iconsize and mode from all the toolbars
-      let toolbars = [
-        "navigator-toolbox",
-        "nav-bar",
-        "PersonalToolbar",
-        "TabsToolbar",
-        "toolbar-menubar",
-      ];
-      for (let resourceName of ["mode", "iconsize"]) {
-        for (let toolbarId of toolbars) {
-          xulStore.removeValue(BROWSER_DOCURL, toolbarId, resourceName);
-        }
-      }
-    }
-
     if (currentUIVersion < 64) {
       OS.File.remove(
         OS.Path.join(OS.Constants.Path.profileDir, "directoryLinks.json"),
@@ -3516,12 +3341,6 @@
       });
     }
 
-    if (currentUIVersion < 66) {
-      // Set whether search suggestions or history/bookmarks results come first
-      // in the urlbar results, and uninstall a related Shield study.
-      this._migrateMatchBucketsPrefForUI66();
-    }
-
     if (currentUIVersion < 67) {
       // Migrate devtools firebug theme users to light theme (bug 1378108):
       if (Services.prefs.getCharPref("devtools.theme") == "firebug") {
@@ -4027,93 +3846,6 @@
     );
   },
 
-  async _migrateMatchBucketsPrefForUI66() {
-    // This does two related things.
-    //
-    // (1) Profiles created on or after Firefox 57's release date were eligible
-    // for a Shield study that changed the browser.urlbar.matchBuckets pref in
-    // order to show search suggestions above history/bookmarks in the urlbar
-    // popup.  This uninstalls that study.  (It's actually slightly more
-    // complex.  The study set the pref to several possible values, but the
-    // overwhelming number of profiles in the study got search suggestions
-    // first, followed by history/bookmarks.)
-    //
-    // (2) This also ensures that (a) new users see search suggestions above
-    // history/bookmarks, thereby effectively making the study permanent, and
-    // (b) old users (including those in the study) continue to see whatever
-    // they were seeing before.  This works together with UnifiedComplete.js.
-    // By default, the browser.urlbar.matchBuckets pref does not exist, and
-    // UnifiedComplete.js internally hardcodes a default value for it.  Before
-    // Firefox 60, the hardcoded default was to show history/bookmarks first.
-    // After 60, it's to show search suggestions first.
-
-    // Wait for Shield init to complete.
-    await new Promise(resolve => {
-      if (this._shieldInitComplete) {
-        resolve();
-        return;
-      }
-      let topic = "shield-init-complete";
-      Services.obs.addObserver(function obs() {
-        Services.obs.removeObserver(obs, topic);
-        resolve();
-      }, topic);
-    });
-
-    // Now get the pref's value.  If the study is active, the value will have
-    // just been set (on the default branch) as part of Shield's init.  The pref
-    // should not exist otherwise (normally).
-    let prefName = "browser.urlbar.matchBuckets";
-    let prefValue = Services.prefs.getCharPref(prefName, "");
-
-    // Get the study (aka experiment).  It may not be installed.
-    let experiment = null;
-    let experimentName = "pref-flip-search-composition-57-release-1413565";
-    let { PreferenceExperiments } = ChromeUtils.import(
-      "resource://normandy/lib/PreferenceExperiments.jsm"
-    );
-    try {
-      experiment = await PreferenceExperiments.get(experimentName);
-    } catch (e) {}
-
-    // Uninstall the study, resetting the pref to its state before the study.
-    if (experiment && !experiment.expired) {
-      await PreferenceExperiments.stop(experimentName, {
-        resetValue: true,
-        reason: "external:search-ui-migration",
-      });
-    }
-
-    // At this point, normally the pref should not exist.  If it does, then it
-    // either has a user value, or something unexpectedly set its value on the
-    // default branch.  Either way, preserve that value.
-    if (Services.prefs.getCharPref(prefName, "")) {
-      return;
-    }
-
-    // The new default is "suggestion:4,general:5" (show search suggestions
-    // before history/bookmarks), but we implement that by leaving the pref
-    // undefined, and UnifiedComplete.js hardcodes that value internally.  So if
-    // the pref was "suggestion:4,general:5" (modulo whitespace), we're done.
-    if (prefValue) {
-      let buckets = PlacesUtils.convertMatchBucketsStringToArray(prefValue);
-      if (
-        ObjectUtils.deepEqual(buckets, [
-          ["suggestion", 4],
-          ["general", 5],
-        ])
-      ) {
-        return;
-      }
-    }
-
-    // Set the pref on the user branch.  If the pref had a value, then preserve
-    // it.  Otherwise, set the previous default value, which was to show history
-    // and bookmarks before search suggestions.
-    prefValue = prefValue || "general:5,suggestion:Infinity";
-    Services.prefs.setCharPref(prefName, prefValue);
-  },
-
   /**
    * Open preferences even if there are no open windows.
    */
@@ -4455,6 +4187,7 @@
         "privacy.trackingprotection.socialtracking.enabled": null,
         "privacy.trackingprotection.fingerprinting.enabled": null,
         "privacy.trackingprotection.cryptomining.enabled": null,
+        "privacy.annotate_channels.strict_list.enabled": null,
       },
       standard: {
         "network.cookie.cookieBehavior": null,
@@ -4463,6 +4196,7 @@
         "privacy.trackingprotection.socialtracking.enabled": null,
         "privacy.trackingprotection.fingerprinting.enabled": null,
         "privacy.trackingprotection.cryptomining.enabled": null,
+        "privacy.annotate_channels.strict_list.enabled": null,
       },
     };
     let type = "strict";
@@ -4521,6 +4255,16 @@
             "privacy.trackingprotection.socialtracking.enabled"
           ] = false;
           break;
+        case "lvl2":
+          this.CATEGORY_PREFS[type][
+            "privacy.annotate_channels.strict_list.enabled"
+          ] = true;
+          break;
+        case "-lvl2":
+          this.CATEGORY_PREFS[type][
+            "privacy.annotate_channels.strict_list.enabled"
+          ] = false;
+          break;
         case "cookieBehavior0":
           this.CATEGORY_PREFS[type]["network.cookie.cookieBehavior"] =
             Ci.nsICookieService.BEHAVIOR_ACCEPT;
@@ -5116,6 +4860,11 @@
   // messages as a signal that it's likely time to refresh the cache.
   CACHE_DEBOUNCE_RATE_MS: 5000,
 
+  // This is how long we'll block the AsyncShutdown while waiting for
+  // the cache to write. If we fail to write within that time, we will
+  // allow the shutdown to proceed.
+  SHUTDOWN_CACHE_WRITE_TIMEOUT_MS: 1000,
+
   // The following values are as possible values for the
   // browser.startup.abouthome_cache_result scalar. Keep these in sync with the
   // scalar definition in Scalars.yaml. See setDeferredResult for more
@@ -5157,6 +4906,7 @@
   _initted: false,
   _hasWrittenThisSession: false,
   _finalized: false,
+  _firstPrivilegedProcessCreated: false,
 
   init() {
     if (this._initted) {
@@ -5203,6 +4953,10 @@
     Services.obs.addObserver(this, "ipc:content-shutdown");
     Services.obs.addObserver(this, "intl:app-locales-changed");
 
+    this.log.trace("Constructing pipes.");
+    this._pagePipe = this.makePipe();
+    this._scriptPipe = this.makePipe();
+
     this._cacheEntryPromise = new Promise(resolve => {
       this._cacheEntryResolver = resolve;
     });
@@ -5277,9 +5031,12 @@
       this.log = null;
     }
 
+    this._procManager = null;
+    this._procManagerID = null;
     this._appender = null;
     this._cacheDeferred = null;
     this._finalized = false;
+    this._firstPrivilegedProcessCreated = false;
   },
 
   _aboutHomeURI: null,
@@ -5303,13 +5060,18 @@
    * never written during the session, one is generated and written
    * before the async function resolves.
    *
+   * @param withTimeout (boolean)
+   *   Whether or not the timeout mechanism should be used. Defaults
+   *   to true.
    * @returns Promise
-   * @resolves undefined
+   * @resolves boolean
    *   If a cache has never been written, or a cache write is in
-   *   progress, resolves when the cache has been written. Otherwise,
-   *   resolves immediately.
+   *   progress, resolves true when the cache has been written. Also
+   *   resolves to true if a cache didn't need to be written.
+   *
+   *   Resolves to false if a cache write unexpectedly timed out.
    */
-  async onShutdown() {
+  async onShutdown(withTimeout = true) {
     // If we never wrote this session, arm the task so that the next
     // step can finalize.
     if (!this._hasWrittenThisSession) {
@@ -5325,8 +5087,41 @@
     if (this._cacheTask.isArmed) {
       this.log.trace("Finalizing cache task on shutdown");
       this._finalized = true;
-      await this._cacheTask.finalize();
+
+      // To avoid hanging shutdowns, we'll ensure that we wait a maximum of
+      // SHUTDOWN_CACHE_WRITE_TIMEOUT_MS millseconds before giving up.
+      let { setTimeout, clearTimeout } = ChromeUtils.import(
+        "resource://gre/modules/Timer.jsm"
+      );
+
+      const TIMED_OUT = Symbol();
+      let timeoutID = 0;
+
+      let timeoutPromise = new Promise(resolve => {
+        timeoutID = setTimeout(
+          () => resolve(TIMED_OUT),
+          this.SHUTDOWN_CACHE_WRITE_TIMEOUT_MS
+        );
+      });
+
+      let promises = [this._cacheTask.finalize()];
+      if (withTimeout) {
+        this.log.trace("Using timeout mechanism.");
+        promises.push(timeoutPromise);
+      } else {
+        this.log.trace("Skipping timeout mechanism.");
+      }
+
+      let result = await Promise.race(promises);
+      this.log.trace("Done blocking shutdown.");
+      clearTimeout(timeoutID);
+      if (result === TIMED_OUT) {
+        this.log.error("Timed out getting cache streams. Skipping cache task.");
+        return false;
+      }
     }
+    this.log.trace("onShutdown is exiting");
+    return true;
   },
 
   /**
@@ -5340,16 +5135,21 @@
   async cacheNow() {
     this.log.trace("Caching now.");
     this._cacheProgress = "Getting cache streams";
+
     let { pageInputStream, scriptInputStream } = await this.requestCache();
 
     if (!pageInputStream || !scriptInputStream) {
+      this.log.trace("Failed to get cache streams.");
       this._cacheProgress = "Failed to get streams";
       return;
     }
 
+    this.log.trace("Got cache streams.");
+
     this._cacheProgress = "Writing to cache";
 
     try {
+      this.log.trace("Populating cache.");
       await this.populateCache(pageInputStream, scriptInputStream);
     } catch (e) {
       this._cacheProgress = "Failed to populate cache";
@@ -5414,20 +5214,6 @@
     return pipe;
   },
 
-  /**
-   * Constructs and caches two nsIPipe instances - one for the about:home
-   * page, and one for its hydration script. If these nsIPipe instances
-   * already exist, this function does nothing.
-   */
-  makePipes() {
-    if (this._pagePipe && this._scriptPipe) {
-      return;
-    }
-    this.log.trace("Constructing pipes.");
-    this._pagePipe = this.makePipe();
-    this._scriptPipe = this.makePipe();
-  },
-
   get pagePipe() {
     return this._pagePipe;
   },
@@ -5445,13 +5231,8 @@
    * In the event that the nsICacheEntry doesn't contain anything usable,
    * the nsInputStreams on the nsIPipe's are closed.
    */
-  maybeConnectToPipes() {
-    if (!this._cacheEntry) {
-      this.log.trace(
-        "Not connecting to pipes yet - the cache entry isn't available yet"
-      );
-      return;
-    }
+  connectToPipes() {
+    this.log.trace(`Connecting nsICacheEntry to pipes.`);
 
     // If the cache doesn't yet exist, we'll know because the version metadata
     // won't exist yet.
@@ -5530,47 +5311,7 @@
     }
 
     this.setDeferredResult(this.CACHE_RESULT_SCALARS.VALID_AND_USED);
-    this.log.trace("Streams connected to pipes. Dropping references to pipes.");
-    this._pagePipe = null;
-    this._scriptPipe = null;
-  },
-
-  /**
-   * Sends down the nsIPipe's to a recently created "privileged about
-   * content process".
-   *
-   * @param aProcManager (ContentProcessMessageManager)
-   *   The message manager for the newly created "privileged about
-   *   content process".
-   * @param aProcessParent
-   *   The nsIDOMProcessParent for the tab.
-   */
-  sendCacheInputStreams(aProcManager, aProcessParent) {
-    if (aProcManager.remoteType != E10SUtils.PRIVILEGEDABOUT_REMOTE_TYPE) {
-      throw new Error(
-        "Cannot send about:home cache to a non-privileged content process."
-      );
-    }
-    // Construct the nsIPipe's if they haven't been made already, which
-    // can occur if the nsICacheEntry hasn't been retrieved yet.
-    this.makePipes();
-    this.log.info("Sending input streams down to content process.");
-    let actor = aProcessParent.getActor("BrowserProcess");
-    actor.sendAsyncMessage(this.SEND_STREAMS_MESSAGE, {
-      pageInputStream: this.pagePipe.inputStream,
-      scriptInputStream: this.scriptPipe.inputStream,
-    });
-
-    // We might have the nsICacheEntry already, so we can connect it
-    // to the pipes immediately. Otherwise, we'll wait until the cache
-    // entry has been retrieved.
-    if (this._cacheEntry) {
-      this.log.trace(
-        "The cache entry is already available. Connecting to pipes " +
-          "immediately."
-      );
-      this.maybeConnectToPipes();
-    }
+    this.log.trace("Streams connected to pipes.");
   },
 
   /**
@@ -5665,6 +5406,8 @@
         );
       });
     });
+
+    this.log.trace("populateCache has finished.");
   },
 
   /**
@@ -5714,15 +5457,36 @@
    */
   onContentProcessCreated(childID, procManager, processParent) {
     if (procManager.remoteType == E10SUtils.PRIVILEGEDABOUT_REMOTE_TYPE) {
+      if (this._finalized) {
+        this.log.trace(
+          "Ignoring privileged about content process launch after finalization."
+        );
+        return;
+      }
+
+      if (this._firstPrivilegedProcessCreated) {
+        this.log.trace(
+          "Ignoring non-first privileged about content processes."
+        );
+        return;
+      }
+
       this.log.trace(
-        `A privileged about content process is launching with ID ${childID}.` +
-          "Sending it the cache input streams."
+        `A privileged about content process is launching with ID ${childID}.`
       );
-      this.sendCacheInputStreams(procManager, processParent);
+
+      this.log.info("Sending input streams down to content process.");
+      let actor = processParent.getActor("BrowserProcess");
+      actor.sendAsyncMessage(this.SEND_STREAMS_MESSAGE, {
+        pageInputStream: this.pagePipe.inputStream,
+        scriptInputStream: this.scriptPipe.inputStream,
+      });
+
       procManager.addMessageListener(this.CACHE_RESPONSE_MESSAGE, this);
       procManager.addMessageListener(this.CACHE_USAGE_RESULT_MESSAGE, this);
       this._procManager = procManager;
       this._procManagerID = childID;
+      this._firstPrivilegedProcessCreated = true;
     }
   },
 
@@ -5736,7 +5500,9 @@
    *   ipc:content-shutdown.
    */
   onContentProcessShutdown(childID) {
+    this.log.info(`Content process shutdown: ${childID}`);
     if (this._procManagerID == childID) {
+      this.log.info("It was the current privileged about process.");
       if (this._cacheDeferred) {
         this.log.error(
           "A privileged about content process shut down while cache streams " +
@@ -5936,9 +5702,7 @@
     this.log.trace("Cache entry is available.");
 
     this._cacheEntry = aEntry;
-    this.makePipes();
-    this.maybeConnectToPipes();
-
+    this.connectToPipes();
     this._cacheEntryResolver(this._cacheEntry);
   },
 };
diff -Nru firefox-84.0.2+build1/browser/components/customizableui/content/panelUI.inc.xhtml firefox-85.0+build1/browser/components/customizableui/content/panelUI.inc.xhtml
--- firefox-84.0.2+build1/browser/components/customizableui/content/panelUI.inc.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/customizableui/content/panelUI.inc.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -233,10 +233,11 @@
                        class="extension-controlled-notification"
                        popupid="extension-new-tab"
                        hidden="true"
-                       data-lazy-l10n-id="appmenu-new-tab-controlled"
+                       data-lazy-l10n-id="appmenu-new-tab-controlled-changes"
                        data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
                        closebuttonhidden="true"
                        dropmarkerhidden="true"
+                       buttonhighlight="true"
                        checkboxhidden="true">
       <popupnotificationcontent orient="vertical">
         <description id="extension-new-tab-notification-description"/>
@@ -246,10 +247,11 @@
                        class="extension-controlled-notification"
                        popupid="extension-homepage"
                        hidden="true"
-                       data-lazy-l10n-id="appmenu-homepage-controlled"
+                       data-lazy-l10n-id="appmenu-homepage-controlled-changes"
                        data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
                        closebuttonhidden="true"
                        dropmarkerhidden="true"
+                       buttonhighlight="true"
                        checkboxhidden="true">
       <popupnotificationcontent orient="vertical">
         <description id="extension-homepage-notification-description"/>
diff -Nru firefox-84.0.2+build1/browser/components/customizableui/CustomizeMode.jsm firefox-85.0+build1/browser/components/customizableui/CustomizeMode.jsm
--- firefox-84.0.2+build1/browser/components/customizableui/CustomizeMode.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/customizableui/CustomizeMode.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -419,7 +419,7 @@
       this.document.documentElement.setAttribute("customizing", true);
 
       let customizableToolbars = document.querySelectorAll(
-        "toolbar[customizable=true]:not([autohide=true]):not([collapsed=true])"
+        "toolbar[customizable=true]:not([autohide=true], [collapsed=true])"
       );
       for (let toolbar of customizableToolbars) {
         toolbar.setAttribute("customizing", true);
diff -Nru firefox-84.0.2+build1/browser/components/customizableui/PanelMultiView.jsm firefox-85.0+build1/browser/components/customizableui/PanelMultiView.jsm
--- firefox-84.0.2+build1/browser/components/customizableui/PanelMultiView.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/customizableui/PanelMultiView.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -1444,7 +1444,7 @@
       // Non-hidden <label> or <description> elements that also aren't empty
       // and also don't have a value attribute can be multiline (if their
       // text content is long enough).
-      let isMultiline = ":not(:is([hidden],[value],:empty))";
+      let isMultiline = ":not([hidden],[value],:empty)";
       let selector = [
         "description" + isMultiline,
         "label" + isMultiline,
diff -Nru firefox-84.0.2+build1/browser/components/customizableui/test/browser_editcontrols_update.js firefox-85.0+build1/browser/components/customizableui/test/browser_editcontrols_update.js
--- firefox-84.0.2+build1/browser/components/customizableui/test/browser_editcontrols_update.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/customizableui/test/browser_editcontrols_update.js	2021-01-18 19:58:08.000000000 +0000
@@ -74,6 +74,13 @@
   });
 }
 
+// Call this between `.select()` to make sure the selection actually changes
+// and thus TextInputListener::UpdateTextInputCommands() is called.
+function deselectURLBarAndSpin() {
+  gURLBar.inputField.setSelectionRange(0, 0);
+  return new Promise(setTimeout);
+}
+
 add_task(async function test_init() {
   // Put something on the clipboard to verify that the paste button is properly enabled during the test.
   let clipboardHelper = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(
@@ -121,8 +128,9 @@
   // Check that updates do not occur after the panel has been closed.
   checkState(true, "Update when edit-controls is on panel and hidden");
 
-  // Mac will update the enabled st1ate even when the panel is closed so that
+  // Mac will update the enabled state even when the panel is closed so that
   // main menubar shortcuts will work properly.
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(isMac ? 1 : 0);
   gURLBar.select();
   await overridePromise;
@@ -158,6 +166,7 @@
   await overridePromise;
   checkState(false, "Update when edit-controls on toolbar and focused");
 
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(1);
   gURLBar.select();
   await overridePromise;
@@ -185,6 +194,7 @@
 
   // Mac will update the enabled state even when the buttons are overflowing,
   // so main menubar shortcuts will work properly.
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(isMac ? 1 : 0);
   gURLBar.select();
   await overridePromise;
@@ -194,6 +204,7 @@
   );
 
   // Check that we get an update if we select content while the panel is open.
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(1);
   await navbar.overflowable.show();
   gURLBar.select();
@@ -201,6 +212,7 @@
 
   // And that we don't (except on mac) when the panel is hidden.
   kOverflowPanel.hidePopup();
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(isMac ? 1 : 0);
   gURLBar.select();
   await overridePromise;
@@ -215,11 +227,13 @@
   // updateEditUIVisibility should be called when customization happens but isn't. See bug 1359790.
   updateEditUIVisibility();
 
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(isMac ? 1 : 0);
   gURLBar.select();
   await overridePromise;
 
   // Check that we get an update if we select content while the panel is open.
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(1);
   await navbar.overflowable.show();
   gURLBar.select();
@@ -227,6 +241,7 @@
 
   // And that we don't (except on mac) when the panel is hidden.
   kOverflowPanel.hidePopup();
+  await deselectURLBarAndSpin();
   overridePromise = expectCommandUpdate(isMac ? 1 : 0);
   gURLBar.select();
   await overridePromise;
diff -Nru firefox-84.0.2+build1/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js firefox-85.0+build1/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
--- firefox-84.0.2+build1/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,13 +15,13 @@
     // Setting docshell activated/deactivated will trigger visibility state
     // changes to relevant state ("visible" or "hidden"). AFAIK, there is no
     // such event notifying docshell is being activated, so I use
-    // "visibilitychange" event rather than polling the docShell.isActive.
+    // "visibilitychange" event rather than polling the isActive flag.
     await ContentTaskUtils.waitForEvent(
       content.document,
       "visibilitychange",
       true /* capture */,
       aEvent => {
-        return content.docShell.isActive;
+        return content.browsingContext.isActive;
       }
     );
   });
diff -Nru firefox-84.0.2+build1/browser/components/doh/DoHHeuristics.jsm firefox-85.0+build1/browser/components/doh/DoHHeuristics.jsm
--- firefox-84.0.2+build1/browser/components/doh/DoHHeuristics.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/doh/DoHHeuristics.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -227,20 +227,12 @@
     Ci.nsIX509CertDB
   );
 
-  let allCerts = certdb.getCerts();
-  for (let cert of allCerts) {
-    if (
-      certdb.isCertTrusted(
-        cert,
-        Ci.nsIX509Cert.CA_CERT,
-        Ci.nsIX509CertDB.TRUSTED_SSL
-      )
-    ) {
-      if (!cert.isBuiltInRoot) {
-        // this cert is a trust anchor that wasn't shipped with the browser
-        return "disable_doh";
-      }
-    }
+  let hasThirdPartyRoots = await new Promise(resolve => {
+    certdb.asyncHasThirdPartyRoots(resolve);
+  });
+
+  if (hasThirdPartyRoots) {
+    return "disable_doh";
   }
 
   return "enable_doh";
diff -Nru firefox-84.0.2+build1/browser/components/downloads/content/downloads.css firefox-85.0+build1/browser/components/downloads/content/downloads.css
--- firefox-84.0.2+build1/browser/components/downloads/content/downloads.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/downloads/content/downloads.css	2021-01-18 19:58:08.000000000 +0000
@@ -43,60 +43,60 @@
   display: none;
 }
 
-.download-state:not(:is([state="6"], /* Blocked (parental) */
-                        [state="8"], /* Blocked (dirty)    */
-                        [state="9"]) /* Blocked (policy)   */)
+.download-state:not([state="6"],/* Blocked (parental) */
+                    [state="8"],/* Blocked (dirty)    */
+                    [state="9"] /* Blocked (policy)   */)
                                            .downloadBlockedBadge,
 
-.download-state:not(:is([state="-1"],/* Starting (initial) */
-                        [state="5"], /* Starting (queued)  */
-                        [state="0"], /* Downloading        */
-                        [state="4"], /* Paused             */
-                        [state="7"]) /* Scanning           */)
+.download-state:not([state="-1"],/* Starting (initial) */
+                    [state="5"], /* Starting (queued)  */
+                    [state="0"], /* Downloading        */
+                    [state="4"], /* Paused             */
+                    [state="7"]  /* Scanning           */)
                                            .downloadProgress,
 
-.download-state:not(    [state="0"]  /* Downloading        */)
+.download-state:not([state="0"]  /* Downloading        */)
                                            .downloadPauseMenuItem,
 
-.download-state:not(    [state="4"]  /* Paused             */)
+.download-state:not([state="4"]  /* Paused             */)
                                            .downloadResumeMenuItem,
 
 /* Blocked (dirty) downloads that have not been confirmed and
    have temporary data. */
-.download-state:not(    [state="8"]  /* Blocked (dirty)    */)
-                                           .downloadUnblockMenuItem,
-.download-state[state="8"]:not(.temporary-block)
+.download-state:not([state="8"]  /* Blocked (dirty)    */)
                                            .downloadUnblockMenuItem,
 
-.download-state:not(:is([state="1"], /* Finished           */
-                        [state="2"], /* Failed             */
-                        [state="3"], /* Canceled           */
-                        [state="6"], /* Blocked (parental) */
-                        [state="8"], /* Blocked (dirty)    */
-                        [state="9"]) /* Blocked (policy)   */)
+.download-state[state="8"]:not(.temporary-block) .downloadUnblockMenuItem,
+
+.download-state:not([state="1"], /* Finished           */
+                    [state="2"], /* Failed             */
+                    [state="3"], /* Canceled           */
+                    [state="6"], /* Blocked (parental) */
+                    [state="8"], /* Blocked (dirty)    */
+                    [state="9"]  /* Blocked (policy)   */)
                                            .downloadRemoveFromHistoryMenuItem,
 
-.download-state:not(:is([state="-1"],/* Starting (initial) */
-                        [state="0"], /* Downloading        */
-                        [state="1"], /* Finished           */
-                        [state="4"], /* Paused             */
-                        [state="5"]) /* Starting (queued)  */)
-                                           .downloadShowMenuItem,
-.download-state[state="1"]:not([exists])
+.download-state:not([state="-1"],/* Starting (initial) */
+                    [state="0"], /* Downloading        */
+                    [state="1"], /* Finished           */
+                    [state="4"], /* Paused             */
+                    [state="5"]  /* Starting (queued)  */)
                                            .downloadShowMenuItem,
 
-.download-state:not(:is([state="-1"],/* Starting (initial) */
-                        [state="0"], /* Downloading        */
-                        [state="1"], /* Finished           */
-                        [state="4"], /* Paused             */
-                        [state="5"], /* Starting (queued)  */
-                        [state="8"]) /* Blocked (dirty)    */)
-                                           .downloadCommandsSeparator,
-.download-state[state="1"]:not([exists])
-                                           .downloadCommandsSeparator,
-.download-state[state="8"]:not(.temporary-block)
+.download-state[state="1"]:not([exists])   .downloadShowMenuItem,
+
+.download-state:not([state="-1"],/* Starting (initial) */
+                    [state="0"], /* Downloading        */
+                    [state="1"], /* Finished           */
+                    [state="4"], /* Paused             */
+                    [state="5"], /* Starting (queued)  */
+                    [state="8"]  /* Blocked (dirty)    */)
                                            .downloadCommandsSeparator,
 
+.download-state[state="1"]:not([exists])   .downloadCommandsSeparator,
+
+.download-state[state="8"]:not(.temporary-block) .downloadCommandsSeparator,
+
 /* the system-viewer context menu items are only shown for certain mime-types
    and can be individually enabled via prefs */
 .download-state:not([viewable-internally]) .downloadUseSystemDefaultMenuItem,
@@ -108,19 +108,18 @@
 
 /*** Visibility of download button labels ***/
 
-.download-state:not(:is([state="-1"],/* Starting (initial) */
-                        [state="5"], /* Starting (queued)  */
-                        [state="0"], /* Downloading        */
-                        [state="4"]) /* Paused             */)
+.download-state:not([state="-1"],/* Starting (initial) */
+                    [state="5"], /* Starting (queued)  */
+                    [state="0"], /* Downloading        */
+                    [state="4"]  /* Paused             */)
                                            .downloadCancel,
 
-.download-state:not(:is([state="2"], /* Failed             */
-                        [state="3"]) /* Canceled           */)
+.download-state:not([state="2"], /* Failed             */
+                    [state="3"]  /* Canceled           */)
                                            .downloadRetry,
 
-.download-state:not(    [state="1"]  /* Finished           */)
-                                           .downloadShow
-{
+.download-state:not([state="1"]  /* Finished           */)
+                                           .downloadShow {
   display: none;
 }
 
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/downloads/test/browser/blank.JPG and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/downloads/test/browser/blank.JPG differ
diff -Nru firefox-84.0.2+build1/browser/components/downloads/test/browser/browser_image_mimetype_issues.js firefox-85.0+build1/browser/components/downloads/test/browser/browser_image_mimetype_issues.js
--- firefox-84.0.2+build1/browser/components/downloads/test/browser/browser_image_mimetype_issues.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/downloads/test/browser/browser_image_mimetype_issues.js	2021-01-18 19:58:08.000000000 +0000
@@ -111,3 +111,23 @@
     }
   );
 });
+
+/**
+ * Make sure that a valid JPEG image using the .JPG extension doesn't
+ * get it replaced with .jpeg.
+ */
+add_task(async function test_save_page_on_JPEG_image_document() {
+  await BrowserTestUtils.withNewTab(`${TEST_ROOT}/blank.JPG`, async browser => {
+    await new Promise(resolve => {
+      MockFilePicker.showCallback = function(fp) {
+        ok(
+          fp.defaultString.endsWith("JPG"),
+          `filepicker for "save page" has "${fp.defaultString}", should end in JPG`
+        );
+        setTimeout(resolve, 0);
+        return Ci.nsIFilePicker.returnCancel;
+      };
+      document.getElementById("Browser:SavePage").doCommand();
+    });
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/downloads/test/browser/browser.ini firefox-85.0+build1/browser/components/downloads/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/downloads/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/downloads/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 support-files =
   not-really-a-jpeg.jpeg
   not-really-a-jpeg.jpeg^headers^
+  blank.JPG
 [browser_overflow_anchor.js]
 skip-if = os == "linux" # Bug 952422
 [browser_confirm_unblock_download.js]
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm firefox-85.0+build1/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/helpers/WebsiteFilter.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -134,4 +134,15 @@
   createInstance(outer, iid) {
     return this.QueryInterface(iid);
   },
+  isAllowed(url) {
+    if (this._blockPatterns?.matches(url.toLowerCase())) {
+      if (
+        !this._exceptionsPatterns ||
+        !this._exceptionsPatterns.matches(url.toLowerCase())
+      ) {
+        return false;
+      }
+    }
+    return true;
+  },
 };
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/Policies.jsm firefox-85.0+build1/browser/components/enterprisepolicies/Policies.jsm
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/Policies.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/Policies.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -2320,7 +2320,11 @@
           )} - {url}`
         );
       },
-      onInstallEnded: () => {
+      /* eslint-disable-next-line no-shadow */
+      onInstallEnded: (install, addon) => {
+        if (addon.type == "theme") {
+          addon.enable();
+        }
         install.removeListener(listener);
         log.debug(`Installation succeeded - ${url}`);
       },
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser.ini firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
   policytest_v0.2.xpi
   policy_websitefilter_block.html
   policy_websitefilter_exception.html
+  policy_websitefilter_savelink.html
   ../../../../../toolkit/components/antitracking/test/browser/page.html
   ../../../../../toolkit/components/antitracking/test/browser/subResources.sjs
   extensionsettings.html
@@ -23,9 +24,6 @@
 [browser_policy_bookmarks.js]
 [browser_policy_cookie_settings.js]
 [browser_policy_disable_feedback_commands.js]
-[browser_policy_disable_flash_plugin.js]
-skip-if = (processor == 'aarch64' && os == 'win')
-reason = Plugins are not supported on Windows/AArch64
 [browser_policy_disable_fxaccounts.js]
 skip-if = (verify && debug && (os == 'mac'))
 [browser_policy_disable_masterpassword.js]
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_bookmarks.js	2021-01-18 19:58:08.000000000 +0000
@@ -113,7 +113,6 @@
       onBeginUpdateBatch() {},
       onEndUpdateBatch() {},
       onItemChanged() {},
-      onItemVisited() {},
       onItemMoved() {},
     };
     PlacesUtils.bookmarks.addObserver(bmObserver);
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_flash_plugin.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const labelTextAskToActivate = "Ask to Activate";
-const labelTextNeverActivate = "Never Activate";
-
-function restore_prefs() {
-  Services.prefs.clearUserPref("plugin.state.flash");
-}
-registerCleanupFunction(restore_prefs);
-
-async function assert_flash_locked_status(win, locked, expectedLabelText) {
-  let addonCard = await BrowserTestUtils.waitForCondition(async () => {
-    let doc = win.getHtmlBrowser().contentDocument;
-    await win.htmlBrowserLoaded;
-    return doc.querySelector(`addon-card[addon-id*="Shockwave Flash"]`);
-  }, "Get HTML about:addons card for flash plugin");
-
-  const pluginOptions = addonCard.querySelector("plugin-options");
-  const pluginAction = pluginOptions.querySelector("panel-item[checked]");
-  ok(
-    pluginAction.textContent.includes(expectedLabelText),
-    `Got plugin action "${expectedLabelText}"`
-  );
-
-  // All other buttons (besides the checked one and the expand action)
-  // are expected to be disabled if locked is true.
-  for (const item of pluginOptions.querySelectorAll("panel-item")) {
-    const actionName = item.getAttribute("action");
-    if (actionName.includes("always")) {
-      ok(item.hidden, `Plugin action "${actionName}" should be hidden.`);
-    } else if (
-      !item.hasAttribute("checked") &&
-      actionName !== "expand" &&
-      actionName !== "preferences"
-    ) {
-      is(
-        item.shadowRoot.querySelector("button").disabled,
-        locked,
-        `Plugin action "${actionName}" should be ${
-          locked ? "disabled" : "enabled"
-        }`
-      );
-    }
-  }
-}
-
-async function test_flash_status({ expectedLabelText, locked }) {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-  const win = await BrowserOpenAddonsMgr("addons://list/plugin");
-
-  await assert_flash_locked_status(win, locked, expectedLabelText);
-
-  BrowserTestUtils.removeTab(tab);
-
-  is(
-    Services.prefs.prefIsLocked("plugin.state.flash"),
-    locked,
-    "Flash pref lock state should match policy lock state"
-  );
-}
-
-add_task(async function test_enabled() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {
-        Default: true,
-      },
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextAskToActivate,
-    locked: false,
-  });
-
-  restore_prefs();
-});
-
-add_task(async function test_enabled_locked() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {
-        Default: true,
-        Locked: true,
-      },
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextAskToActivate,
-    locked: true,
-  });
-
-  restore_prefs();
-});
-
-add_task(async function test_disabled() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {
-        Default: false,
-      },
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextNeverActivate,
-    locked: false,
-  });
-
-  restore_prefs();
-});
-
-add_task(async function test_disabled_locked() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {
-        Default: false,
-        Locked: true,
-      },
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextNeverActivate,
-    locked: true,
-  });
-
-  restore_prefs();
-});
-
-add_task(async function test_ask() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {},
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextAskToActivate,
-    locked: false,
-  });
-
-  restore_prefs();
-});
-
-add_task(async function test_ask_locked() {
-  await setupPolicyEngineWithJson({
-    policies: {
-      FlashPlugin: {
-        Locked: true,
-      },
-    },
-  });
-
-  await test_flash_status({
-    expectedLabelText: labelTextAskToActivate,
-    locked: true,
-  });
-
-  restore_prefs();
-});
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_websitefilter.js firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_websitefilter.js
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_websitefilter.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/browser_policy_websitefilter.js	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,7 @@
   "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser/";
 const BLOCKED_PAGE = "policy_websitefilter_block.html";
 const EXCEPTION_PAGE = "policy_websitefilter_exception.html";
+const SAVELINKAS_PAGE = "policy_websitefilter_savelink.html";
 
 add_task(async function test_http() {
   await setupPolicyEngineWithJson({
@@ -53,3 +54,75 @@
 
   await checkBlockedPage("file:///this_should_be_blocked", true);
 });
+
+add_task(async function test_savelink() {
+  await setupPolicyEngineWithJson({
+    policies: {
+      WebsiteFilter: {
+        Block: ["*://mochi.test/*policy_websitefilter_block*"],
+      },
+    },
+  });
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    SUPPORT_FILES_PATH + SAVELINKAS_PAGE
+  );
+
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let promiseContextMenuOpen = BrowserTestUtils.waitForEvent(
+    contextMenu,
+    "popupshown"
+  );
+  await BrowserTestUtils.synthesizeMouse(
+    "#savelink_blocked",
+    0,
+    0,
+    {
+      type: "contextmenu",
+      button: 2,
+      centered: true,
+    },
+    gBrowser.selectedBrowser
+  );
+  await promiseContextMenuOpen;
+
+  let saveLink = document.getElementById("context-savelink");
+  is(saveLink.disabled, true, "Save Link As should be disabled");
+
+  let promiseContextMenuHidden = BrowserTestUtils.waitForEvent(
+    contextMenu,
+    "popuphidden"
+  );
+  contextMenu.hidePopup();
+  await promiseContextMenuHidden;
+
+  promiseContextMenuOpen = BrowserTestUtils.waitForEvent(
+    contextMenu,
+    "popupshown"
+  );
+  await BrowserTestUtils.synthesizeMouse(
+    "#savelink_notblocked",
+    0,
+    0,
+    {
+      type: "contextmenu",
+      button: 2,
+      centered: true,
+    },
+    gBrowser.selectedBrowser
+  );
+  await promiseContextMenuOpen;
+
+  saveLink = document.getElementById("context-savelink");
+  is(saveLink.disabled, false, "Save Link As should not be disabled");
+
+  promiseContextMenuHidden = BrowserTestUtils.waitForEvent(
+    contextMenu,
+    "popuphidden"
+  );
+  contextMenu.hidePopup();
+  await promiseContextMenuHidden;
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_savelink.html firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_savelink.html
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_savelink.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_savelink.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Save Link As test</title>
+  </head>
+  <body>
+    <a id="savelink_blocked" href="http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_block.html">Should not be saveable</a><br/>
+    <a id="savelink_notblocked" href="http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser/policy_websitefilter_no_block.html">Should be saveable</a>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js firefox-85.0+build1/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js
--- firefox-84.0.2+build1/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/enterprisepolicies/tests/xpcshell/test_extensionsettings.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,7 @@
 const BASE_URL = `http://example.com/data`;
 
 let addonID = "policytest2@mozilla.com";
+let themeID = "policytheme@mozilla.com";
 
 add_task(async function setup() {
   await AddonTestUtils.promiseStartupManager();
@@ -219,3 +220,36 @@
   );
   equal(newRestrictedDomains, restrictedDomains + ",example.com,example.org");
 });
+
+add_task(async function test_theme() {
+  let themeFile = AddonTestUtils.createTempWebExtensionFile({
+    manifest: {
+      applications: {
+        gecko: {
+          id: themeID,
+        },
+      },
+      theme: {},
+    },
+  });
+
+  server.registerFile("/data/policy_theme.xpi", themeFile);
+
+  await Promise.all([
+    AddonTestUtils.promiseInstallEvent("onInstallEnded"),
+    setupPolicyEngineWithJson({
+      policies: {
+        ExtensionSettings: {
+          "policytheme@mozilla.com": {
+            installation_mode: "normal_installed",
+            install_url: BASE_URL + "/policy_theme.xpi",
+          },
+        },
+      },
+    }),
+  ]);
+  let currentTheme = Services.prefs.getCharPref("extensions.activeThemeID");
+  equal(currentTheme, themeID, "Theme should be active");
+  let addon = await AddonManager.getAddonByID(themeID);
+  await addon.uninstall();
+});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/ext-browser.json firefox-85.0+build1/browser/components/extensions/ext-browser.json
--- firefox-84.0.2+build1/browser/components/extensions/ext-browser.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/ext-browser.json	2021-01-18 19:58:08.000000000 +0000
@@ -18,8 +18,8 @@
     ]
   },
   "browsingData": {
-    "url": "chrome://browser/content/parent/ext-browsingData.js",
-    "schema": "chrome://browser/content/schemas/browsing_data.json",
+    "url": "chrome://extensions/content/parent/ext-browsingData.js",
+    "schema": "chrome://extensions/content/schemas/browsing_data.json",
     "scopes": ["addon_parent"],
     "paths": [
       ["browsingData"]
diff -Nru firefox-84.0.2+build1/browser/components/extensions/ExtensionBrowsingData.jsm firefox-85.0+build1/browser/components/extensions/ExtensionBrowsingData.jsm
--- firefox-84.0.2+build1/browser/components/extensions/ExtensionBrowsingData.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/ExtensionBrowsingData.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,78 @@
+/* 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 EXPORTED_SYMBOLS = ["BrowsingDataDelegate"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyGetter(this, "makeRange", () => {
+  const { ExtensionParent } = ChromeUtils.import(
+    "resource://gre/modules/ExtensionParent.jsm"
+  );
+  // Defined in ext-browsingData.js
+  return ExtensionParent.apiManager.global.makeRange;
+});
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  Preferences: "resource://gre/modules/Preferences.jsm",
+  Sanitizer: "resource:///modules/Sanitizer.jsm",
+});
+
+class BrowsingDataDelegate {
+  // Unused for now
+  constructor(extension) {}
+
+  // This method returns undefined for all data types that are _not_ handled by
+  // this delegate.
+  handleRemoval(dataType, options) {
+    switch (dataType) {
+      case "downloads":
+        return Sanitizer.items.downloads.clear(makeRange(options));
+      case "formData":
+        return Sanitizer.items.formdata.clear(makeRange(options));
+      case "history":
+        return Sanitizer.items.history.clear(makeRange(options));
+
+      default:
+        return undefined;
+    }
+  }
+
+  settings() {
+    const PREF_DOMAIN = "privacy.cpd.";
+    // The following prefs are the only ones in Firefox that match corresponding
+    // values used by Chrome when rerturning settings.
+    const PREF_LIST = ["cache", "cookies", "history", "formdata", "downloads"];
+
+    // since will be the start of what is returned by Sanitizer.getClearRange
+    // divided by 1000 to convert to ms.
+    // If Sanitizer.getClearRange returns undefined that means the range is
+    // currently "Everything", so we should set since to 0.
+    let clearRange = Sanitizer.getClearRange();
+    let since = clearRange ? clearRange[0] / 1000 : 0;
+    let options = { since };
+
+    let dataToRemove = {};
+    let dataRemovalPermitted = {};
+
+    for (let item of PREF_LIST) {
+      // The property formData needs a different case than the
+      // formdata preference.
+      const name = item === "formdata" ? "formData" : item;
+      dataToRemove[name] = Preferences.get(`${PREF_DOMAIN}${item}`);
+      // Firefox doesn't have the same concept of dataRemovalPermitted
+      // as Chrome, so it will always be true.
+      dataRemovalPermitted[name] = true;
+    }
+
+    return Promise.resolve({
+      options,
+      dataToRemove,
+      dataRemovalPermitted,
+    });
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/extensions/ExtensionControlledPopup.jsm firefox-85.0+build1/browser/components/extensions/ExtensionControlledPopup.jsm
--- firefox-84.0.2+build1/browser/components/extensions/ExtensionControlledPopup.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/ExtensionControlledPopup.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,7 @@
  * @fileOverview
  * This module exports a class that can be used to handle displaying a popup
  * doorhanger with a primary action to not show a popup for this extension again
- * and a secondary action to disable the extension.
+ * and a secondary action disables the addon, or brings the user to their settings.
  *
  * The original purpose of the popup was to notify users of an extension that has
  * changed the New Tab or homepage. Users would see this popup the first time they
@@ -109,6 +109,12 @@
    * @param {string} opts.learnMoreLink
    *                 The name of the SUMO page to link to, this is added to
    *                 app.support.baseURL.
+   * @param optional {string} opts.preferencesLocation
+   *                 If included, the name of the preferences tab that will be opened
+   *                 by the secondary action. If not included, the secondary option will
+   *                 disable the addon.
+   * @param optional {string} opts.preferencesEntrypoint
+   *                 The entrypoint to pass to preferences telemetry.
    * @param {function} opts.onObserverAdded
    *                   A callback that is triggered when an observer is registered to
    *                   trigger the popup on the next observerTopic.
@@ -135,6 +141,8 @@
     this.getLocalizedDescription = opts.getLocalizedDescription;
     this.learnMoreMessageId = opts.learnMoreMessageId;
     this.learnMoreLink = opts.learnMoreLink;
+    this.preferencesLocation = opts.preferencesLocation;
+    this.preferencesEntrypoint = opts.preferencesEntrypoint;
     this.onObserverAdded = opts.onObserverAdded;
     this.onObserverRemoved = opts.onObserverRemoved;
     this.beforeDisableAddon = opts.beforeDisableAddon;
@@ -280,6 +288,12 @@
       if (event.originalTarget == popupnotification.button) {
         // Main action is to keep changes.
         await this.setConfirmation(extensionId);
+      } else if (this.preferencesLocation) {
+        // Secondary action opens Preferences, if a preferencesLocation option is included.
+        let options = this.Entrypoint
+          ? { urlParams: { entrypoint: this.Entrypoint } }
+          : {};
+        win.openPreferences(this.preferencesLocation, options);
       } else {
         // Secondary action is to restore settings.
         if (this.beforeDisableAddon) {
diff -Nru firefox-84.0.2+build1/browser/components/extensions/extension.css firefox-85.0+build1/browser/components/extensions/extension.css
--- firefox-84.0.2+build1/browser/components/extensions/extension.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/extension.css	2021-01-18 19:58:08.000000000 +0000
@@ -265,24 +265,24 @@
 }
 
 /* Interactive States */
-button.browser-style:hover:not(.pressed):not(:disabled):not(.focused),
-select.browser-style:hover:not(.pressed):not(:disabled):not(.focused) {
+button.browser-style:hover:not(.pressed, :disabled, .focused),
+select.browser-style:hover:not(.pressed, :disabled, .focused) {
   background-color: #ebebeb;
   border: 1px solid #b1b1b1;
 }
 
-button.browser-style:hover:active:not(.hover):not(:disabled):not(.focused),
-select.browser-style:hover:active:not(.hover):not(:disabled):not(.focused) {
+button.browser-style:hover:active:not(.hover, :disabled, .focused),
+select.browser-style:hover:active:not(.hover, :disabled, .focused) {
   background-color: #d4d4d4;
   border: 1px solid #858585;
 }
 
-button.browser-style.default:hover:not(.pressed):not(:disabled):not(.focused) {
+button.browser-style.default:hover:not(.pressed, :disabled, .focused) {
   background-color: #0670cc;
   border-color: #005bab;
 }
 
-button.browser-style.default:hover:active:not(.hover):not(:disabled):not(.focused) {
+button.browser-style.default:hover:active:not(.hover, :disabled, .focused) {
   background-color: #005bab;
   border-color: #004480;
 }
diff -Nru firefox-84.0.2+build1/browser/components/extensions/ExtensionPopups.jsm firefox-85.0+build1/browser/components/extensions/ExtensionPopups.jsm
--- firefox-84.0.2+build1/browser/components/extensions/ExtensionPopups.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/ExtensionPopups.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -301,6 +301,7 @@
     let browser = document.createXULElement("browser");
     browser.setAttribute("type", "content");
     browser.setAttribute("disableglobalhistory", "true");
+    browser.setAttribute("messagemanagergroup", "webext-browsers");
     browser.setAttribute("transparent", "true");
     browser.setAttribute("class", "webextension-popup-browser");
     browser.setAttribute("webextension-view-type", "popup");
diff -Nru firefox-84.0.2+build1/browser/components/extensions/jar.mn firefox-85.0+build1/browser/components/extensions/jar.mn
--- firefox-84.0.2+build1/browser/components/extensions/jar.mn	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/jar.mn	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,6 @@
     content/browser/parent/ext-bookmarks.js (parent/ext-bookmarks.js)
     content/browser/parent/ext-browser.js (parent/ext-browser.js)
     content/browser/parent/ext-browserAction.js (parent/ext-browserAction.js)
-    content/browser/parent/ext-browsingData.js (parent/ext-browsingData.js)
     content/browser/parent/ext-chrome-settings-overrides.js (parent/ext-chrome-settings-overrides.js)
     content/browser/parent/ext-commands.js (parent/ext-commands.js)
     content/browser/parent/ext-devtools.js (parent/ext-devtools.js)
diff -Nru firefox-84.0.2+build1/browser/components/extensions/moz.build firefox-85.0+build1/browser/components/extensions/moz.build
--- firefox-84.0.2+build1/browser/components/extensions/moz.build	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 ]
 
 EXTRA_JS_MODULES += [
+    "ExtensionBrowsingData.jsm",
     "ExtensionControlledPopup.jsm",
     "ExtensionPopups.jsm",
 ]
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-bookmarks.js firefox-85.0+build1/browser/components/extensions/parent/ext-bookmarks.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-bookmarks.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-bookmarks.js	2021-01-18 19:58:08.000000000 +0000
@@ -172,8 +172,6 @@
     }
   }
 
-  onItemVisited() {}
-
   onItemMoved(
     id,
     oldParentId,
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-browsingData.js firefox-85.0+build1/browser/components/extensions/parent/ext-browsingData.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-browsingData.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-browsingData.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,441 +0,0 @@
-/* -*- 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";
-
-var { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  LoginHelper: "resource://gre/modules/LoginHelper.jsm",
-  PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
-  Preferences: "resource://gre/modules/Preferences.jsm",
-  Sanitizer: "resource:///modules/Sanitizer.jsm",
-  Services: "resource://gre/modules/Services.jsm",
-  setTimeout: "resource://gre/modules/Timer.jsm",
-  ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
-});
-
-XPCOMUtils.defineLazyServiceGetter(
-  this,
-  "quotaManagerService",
-  "@mozilla.org/dom/quota-manager-service;1",
-  "nsIQuotaManagerService"
-);
-
-/**
- * A number of iterations after which to yield time back
- * to the system.
- */
-const YIELD_PERIOD = 10;
-
-const makeRange = options => {
-  return options.since == null
-    ? null
-    : [PlacesUtils.toPRTime(options.since), PlacesUtils.toPRTime(Date.now())];
-};
-
-// General implementation for clearing data using Services.clearData.
-// Currently Sanitizer.items uses this under the hood.
-async function clearData(options, flags) {
-  if (options.hostnames) {
-    await Promise.all(
-      options.hostnames.map(
-        host =>
-          new Promise(resolve => {
-            // Set aIsUserRequest to true. This means when the ClearDataService
-            // "Cleaner" implementation doesn't support clearing by host
-            // it will delete all data instead.
-            // This is appropriate for cases like |cache|, which doesn't
-            // support clearing by a time range.
-            // In future when we use this for other data types, we have to
-            // evaluate if that behavior is still acceptable.
-            Services.clearData.deleteDataFromHost(host, true, flags, resolve);
-          })
-      )
-    );
-    return;
-  }
-
-  if (options.since) {
-    const range = makeRange(options);
-    await new Promise(resolve => {
-      Services.clearData.deleteDataInTimeRange(...range, true, flags, resolve);
-    });
-    return;
-  }
-
-  // Don't return the promise here and above to prevent leaking the resolved
-  // value.
-  await new Promise(resolve => Services.clearData.deleteData(flags, resolve));
-}
-
-const clearCache = options => {
-  return clearData(options, Ci.nsIClearDataService.CLEAR_ALL_CACHES);
-};
-
-const clearCookies = async function(options) {
-  let cookieMgr = Services.cookies;
-  // This code has been borrowed from Sanitizer.jsm.
-  let yieldCounter = 0;
-
-  if (options.since || options.hostnames || options.cookieStoreId) {
-    // Iterate through the cookies and delete any created after our cutoff.
-    let cookies = cookieMgr.cookies;
-    if (
-      !options.cookieStoreId ||
-      isPrivateCookieStoreId(options.cookieStoreId)
-    ) {
-      // By default nsICookieManager.cookies doesn't contain private cookies.
-      const privateCookies = cookieMgr.getCookiesWithOriginAttributes(
-        JSON.stringify({
-          privateBrowsingId: 1,
-        })
-      );
-      cookies = cookies.concat(privateCookies);
-    }
-    for (const cookie of cookies) {
-      if (
-        (!options.since ||
-          cookie.creationTime >= PlacesUtils.toPRTime(options.since)) &&
-        (!options.hostnames ||
-          options.hostnames.includes(cookie.host.replace(/^\./, ""))) &&
-        (!options.cookieStoreId ||
-          getCookieStoreIdForOriginAttributes(cookie.originAttributes) ===
-            options.cookieStoreId)
-      ) {
-        // This cookie was created after our cutoff, clear it.
-        cookieMgr.remove(
-          cookie.host,
-          cookie.name,
-          cookie.path,
-          cookie.originAttributes
-        );
-
-        if (++yieldCounter % YIELD_PERIOD == 0) {
-          await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long.
-        }
-      }
-    }
-  } else {
-    // Remove everything.
-    cookieMgr.removeAll();
-  }
-};
-
-const clearDownloads = options => {
-  return Sanitizer.items.downloads.clear(makeRange(options));
-};
-
-const clearFormData = options => {
-  return Sanitizer.items.formdata.clear(makeRange(options));
-};
-
-const clearHistory = options => {
-  return Sanitizer.items.history.clear(makeRange(options));
-};
-
-// Ideally we could reuse the logic in Sanitizer.jsm or nsIClearDataService,
-// but this API exposes an ability to wipe data at a much finger granularity
-// than those APIs. (See also Bug 1531276)
-async function clearQuotaManager(options, dataType) {
-  // Can not clear localStorage/indexedDB in private browsing mode,
-  // just ignore.
-  if (options.cookieStoreId == PRIVATE_STORE) {
-    return;
-  }
-
-  let promises = [];
-  await new Promise((resolve, reject) => {
-    quotaManagerService.getUsage(request => {
-      if (request.resultCode != Cr.NS_OK) {
-        reject({ message: `Clear ${dataType} failed` });
-        return;
-      }
-
-      for (let item of request.result) {
-        let principal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
-          item.origin
-        );
-
-        // Consistently to removeIndexedDB and the API documentation for
-        // removeLocalStorage, we should only clear the data stored by
-        // regular websites, on the contrary we shouldn't clear data stored
-        // by browser components (like about:newtab) or other extensions.
-        if (!["http", "https", "file"].includes(principal.scheme)) {
-          continue;
-        }
-
-        let host = principal.hostPort;
-        if (
-          (!options.hostnames || options.hostnames.includes(host)) &&
-          (!options.cookieStoreId ||
-            getCookieStoreIdForOriginAttributes(principal.originAttributes) ===
-              options.cookieStoreId)
-        ) {
-          promises.push(
-            new Promise((resolve, reject) => {
-              let clearRequest;
-              if (dataType === "indexedDB") {
-                clearRequest = quotaManagerService.clearStoragesForPrincipal(
-                  principal,
-                  null,
-                  "idb"
-                );
-              } else {
-                clearRequest = quotaManagerService.clearStoragesForPrincipal(
-                  principal,
-                  "default",
-                  "ls"
-                );
-              }
-
-              clearRequest.callback = () => {
-                if (clearRequest.resultCode == Cr.NS_OK) {
-                  resolve();
-                } else {
-                  reject({ message: `Clear ${dataType} failed` });
-                }
-              };
-            })
-          );
-        }
-      }
-
-      resolve();
-    });
-  });
-
-  return Promise.all(promises);
-}
-
-const clearIndexedDB = async function(options) {
-  return clearQuotaManager(options, "indexedDB");
-};
-
-const clearLocalStorage = async function(options) {
-  if (options.since) {
-    return Promise.reject({
-      message: "Firefox does not support clearing localStorage with 'since'.",
-    });
-  }
-
-  // The legacy LocalStorage implementation that will eventually be removed
-  // depends on this observer notification.  Some other subsystems like
-  // Reporting headers depend on this too.
-  // When NextGenLocalStorage is enabled these notifications are ignored.
-  if (options.hostnames) {
-    for (let hostname of options.hostnames) {
-      Services.obs.notifyObservers(
-        null,
-        "extension:purge-localStorage",
-        hostname
-      );
-    }
-  } else {
-    Services.obs.notifyObservers(null, "extension:purge-localStorage");
-  }
-
-  if (Services.domStorageManager.nextGenLocalStorageEnabled) {
-    return clearQuotaManager(options, "localStorage");
-  }
-};
-
-const clearPasswords = async function(options) {
-  let yieldCounter = 0;
-
-  // Iterate through the logins and delete any updated after our cutoff.
-  for (let login of await LoginHelper.getAllUserFacingLogins()) {
-    login.QueryInterface(Ci.nsILoginMetaInfo);
-    if (!options.since || login.timePasswordChanged >= options.since) {
-      Services.logins.removeLogin(login);
-      if (++yieldCounter % YIELD_PERIOD == 0) {
-        await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long.
-      }
-    }
-  }
-};
-
-const clearPluginData = options => {
-  return clearData(options, Ci.nsIClearDataService.CLEAR_PLUGIN_DATA);
-};
-
-const clearServiceWorkers = options => {
-  if (!options.hostnames) {
-    return ServiceWorkerCleanUp.removeAll();
-  }
-
-  return Promise.all(
-    options.hostnames.map(host => {
-      return ServiceWorkerCleanUp.removeFromHost(host);
-    })
-  );
-};
-
-const doRemoval = (options, dataToRemove, extension) => {
-  if (
-    options.originTypes &&
-    (options.originTypes.protectedWeb || options.originTypes.extension)
-  ) {
-    return Promise.reject({
-      message:
-        "Firefox does not support protectedWeb or extension as originTypes.",
-    });
-  }
-
-  if (options.cookieStoreId) {
-    const SUPPORTED_TYPES = ["cookies", "indexedDB"];
-    if (Services.domStorageManager.nextGenLocalStorageEnabled) {
-      // Only the next-gen storage supports removal by cookieStoreId.
-      SUPPORTED_TYPES.push("localStorage");
-    }
-
-    for (let dataType in dataToRemove) {
-      if (dataToRemove[dataType] && !SUPPORTED_TYPES.includes(dataType)) {
-        return Promise.reject({
-          message: `Firefox does not support clearing ${dataType} with 'cookieStoreId'.`,
-        });
-      }
-    }
-
-    if (
-      !isPrivateCookieStoreId(options.cookieStoreId) &&
-      !isDefaultCookieStoreId(options.cookieStoreId) &&
-      !getContainerForCookieStoreId(options.cookieStoreId)
-    ) {
-      return Promise.reject({
-        message: `Invalid cookieStoreId: ${options.cookieStoreId}`,
-      });
-    }
-  }
-
-  let removalPromises = [];
-  let invalidDataTypes = [];
-  for (let dataType in dataToRemove) {
-    if (dataToRemove[dataType]) {
-      switch (dataType) {
-        case "cache":
-          removalPromises.push(clearCache(options));
-          break;
-        case "cookies":
-          removalPromises.push(clearCookies(options));
-          break;
-        case "downloads":
-          removalPromises.push(clearDownloads(options));
-          break;
-        case "formData":
-          removalPromises.push(clearFormData(options));
-          break;
-        case "history":
-          removalPromises.push(clearHistory(options));
-          break;
-        case "indexedDB":
-          removalPromises.push(clearIndexedDB(options));
-          break;
-        case "localStorage":
-          removalPromises.push(clearLocalStorage(options));
-          break;
-        case "passwords":
-          removalPromises.push(clearPasswords(options));
-          break;
-        case "pluginData":
-          removalPromises.push(clearPluginData(options));
-          break;
-        case "serviceWorkers":
-          removalPromises.push(clearServiceWorkers(options));
-          break;
-        default:
-          invalidDataTypes.push(dataType);
-      }
-    }
-  }
-  if (extension && invalidDataTypes.length) {
-    extension.logger.warn(
-      `Firefox does not support dataTypes: ${invalidDataTypes.toString()}.`
-    );
-  }
-  return Promise.all(removalPromises);
-};
-
-this.browsingData = class extends ExtensionAPI {
-  getAPI(context) {
-    let { extension } = context;
-    return {
-      browsingData: {
-        settings() {
-          const PREF_DOMAIN = "privacy.cpd.";
-          // The following prefs are the only ones in Firefox that match corresponding
-          // values used by Chrome when rerturning settings.
-          const PREF_LIST = [
-            "cache",
-            "cookies",
-            "history",
-            "formdata",
-            "downloads",
-          ];
-
-          // since will be the start of what is returned by Sanitizer.getClearRange
-          // divided by 1000 to convert to ms.
-          // If Sanitizer.getClearRange returns undefined that means the range is
-          // currently "Everything", so we should set since to 0.
-          let clearRange = Sanitizer.getClearRange();
-          let since = clearRange ? clearRange[0] / 1000 : 0;
-          let options = { since };
-
-          let dataToRemove = {};
-          let dataRemovalPermitted = {};
-
-          for (let item of PREF_LIST) {
-            // The property formData needs a different case than the
-            // formdata preference.
-            const name = item === "formdata" ? "formData" : item;
-            dataToRemove[name] = Preferences.get(`${PREF_DOMAIN}${item}`);
-            // Firefox doesn't have the same concept of dataRemovalPermitted
-            // as Chrome, so it will always be true.
-            dataRemovalPermitted[name] = true;
-          }
-
-          return Promise.resolve({
-            options,
-            dataToRemove,
-            dataRemovalPermitted,
-          });
-        },
-        remove(options, dataToRemove) {
-          return doRemoval(options, dataToRemove, extension);
-        },
-        removeCache(options) {
-          return doRemoval(options, { cache: true });
-        },
-        removeCookies(options) {
-          return doRemoval(options, { cookies: true });
-        },
-        removeDownloads(options) {
-          return doRemoval(options, { downloads: true });
-        },
-        removeFormData(options) {
-          return doRemoval(options, { formData: true });
-        },
-        removeHistory(options) {
-          return doRemoval(options, { history: true });
-        },
-        removeIndexedDB(options) {
-          return doRemoval(options, { indexedDB: true });
-        },
-        removeLocalStorage(options) {
-          return doRemoval(options, { localStorage: true });
-        },
-        removePasswords(options) {
-          return doRemoval(options, { passwords: true });
-        },
-        removePluginData(options) {
-          return doRemoval(options, { pluginData: true });
-        },
-      },
-    };
-  }
-};
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-chrome-settings-overrides.js firefox-85.0+build1/browser/components/extensions/parent/ext-chrome-settings-overrides.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-chrome-settings-overrides.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-chrome-settings-overrides.js	2021-01-18 19:58:08.000000000 +0000
@@ -57,6 +57,8 @@
     descriptionMessageId: "homepageControlled.message",
     learnMoreMessageId: "homepageControlled.learnMore",
     learnMoreLink: "extension-home",
+    preferencesLocation: "home-homeOverride",
+    preferencesEntrypoint: "addon-manage-home-override",
     async beforeDisableAddon(popup, win) {
       // Disabling an add-on should remove the tabs that it has open, but we want
       // to open the new homepage in this tab (which might get closed).
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-devtools.js firefox-85.0+build1/browser/components/extensions/parent/ext-devtools.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-devtools.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-devtools.js	2021-01-18 19:58:08.000000000 +0000
@@ -320,10 +320,15 @@
 
     /* eslint-disable mozilla/balanced-listeners */
     extension.on("add-permissions", (ignoreEvent, permissions) => {
+      Services.prefs.setBoolPref(
+        `${getDevToolsPrefBranchName(extension.id)}.enabled`,
+        true
+      );
       if (permissions.permissions.includes("devtools")) {
         this._initialize();
       }
     });
+
     extension.on("remove-permissions", (ignoreEvent, permissions) => {
       Services.prefs.setBoolPref(
         `${getDevToolsPrefBranchName(extension.id)}.enabled`,
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-history.js firefox-85.0+build1/browser/components/extensions/parent/ext-history.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-history.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-history.js	2021-01-18 19:58:08.000000000 +0000
@@ -123,7 +123,6 @@
       onClearHistory() {
         this.emit("visitRemoved", { allHistory: true, urls: [] });
       }
-      onPageChanged() {}
       onFrecencyChanged() {}
       onManyFrecenciesChanged() {}
       onDeleteVisits(uri, partialRemoval, guid, reason) {
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-tabs.js firefox-85.0+build1/browser/components/extensions/parent/ext-tabs.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-tabs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-tabs.js	2021-01-18 19:58:08.000000000 +0000
@@ -48,7 +48,7 @@
   );
 });
 
-var { ExtensionError } = ExtensionUtils;
+var { DefaultMap, ExtensionError } = ExtensionUtils;
 
 const TABHIDE_PREFNAME = "extensions.webextensions.tabhide.enabled";
 
@@ -803,8 +803,29 @@
         },
 
         async remove(tabIds) {
-          for (let nativeTab of getNativeTabsFromIDArray(tabIds)) {
-            nativeTab.ownerGlobal.gBrowser.removeTab(nativeTab);
+          let nativeTabs = getNativeTabsFromIDArray(tabIds);
+
+          if (nativeTabs.length === 1) {
+            nativeTabs[0].ownerGlobal.gBrowser.removeTab(nativeTabs[0]);
+            return;
+          }
+
+          // Or for multiple tabs, first group them by window
+          let windowTabMap = new DefaultMap(() => []);
+          for (let nativeTab of nativeTabs) {
+            windowTabMap.get(nativeTab.ownerGlobal).push(nativeTab);
+          }
+
+          // Then make one call to removeTabs() for each window, to keep the
+          // count accurate for SessionStore.getLastClosedTabCount().
+          // Note: always pass options to disable animation and the warning
+          // dialogue box, so that way all tabs are actually closed when the
+          // browser.tabs.remove() promise resolves
+          for (let [eachWindow, tabsToClose] of windowTabMap.entries()) {
+            eachWindow.gBrowser.removeTabs(tabsToClose, {
+              animate: false,
+              suppressWarnAboutClosingWindow: true,
+            });
           }
         },
 
diff -Nru firefox-84.0.2+build1/browser/components/extensions/parent/ext-url-overrides.js firefox-85.0+build1/browser/components/extensions/parent/ext-url-overrides.js
--- firefox-84.0.2+build1/browser/components/extensions/parent/ext-url-overrides.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/parent/ext-url-overrides.js	2021-01-18 19:58:08.000000000 +0000
@@ -41,6 +41,8 @@
     descriptionMessageId: "newTabControlled.message2",
     learnMoreMessageId: "newTabControlled.learnMore",
     learnMoreLink: "extension-home",
+    preferencesLocation: "home-newtabOverride",
+    preferencesEntrypoint: "addon-manage-newtab-override",
     onObserverAdded() {
       AboutNewTab.willNotifyUser = true;
     },
diff -Nru firefox-84.0.2+build1/browser/components/extensions/schemas/browsing_data.json firefox-85.0+build1/browser/components/extensions/schemas/browsing_data.json
--- firefox-84.0.2+build1/browser/components/extensions/schemas/browsing_data.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/schemas/browsing_data.json	1970-01-01 00:00:00.000000000 +0000
@@ -1,423 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-[
-  {
-    "namespace": "manifest",
-    "types": [
-      {
-        "$extend": "OptionalPermission",
-        "choices": [{
-          "type": "string",
-          "enum": [
-            "browsingData"
-          ]
-        }]
-      }
-    ]
-  },
-  {
-    "namespace": "browsingData",
-    "description": "Use the <code>chrome.browsingData</code> API to remove browsing data from a user's local profile.",
-    "permissions": ["browsingData"],
-    "types": [
-      {
-        "id": "RemovalOptions",
-        "type": "object",
-        "description": "Options that determine exactly what data will be removed.",
-        "properties": {
-          "since": {
-            "$ref": "extensionTypes.Date",
-            "optional": true,
-            "description": "Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the <code>getTime</code> method of the JavaScript <code>Date</code> object). If absent, defaults to 0 (which would remove all browsing data)."
-          },
-          "hostnames": {
-            "type": "array",
-            "items": {"type": "string", "format": "hostname"},
-            "optional": true,
-            "description": "Only remove data associated with these hostnames (only applies to cookies and localStorage)."
-          },
-          "cookieStoreId": {
-            "type": "string",
-            "description": "Only remove data associated with this specific cookieStoreId.",
-            "optional": true
-          },
-          "originTypes": {
-            "type": "object",
-            "optional": true,
-            "description": "An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only \"unprotected\" origins. Please ensure that you <em>really</em> want to remove application data before adding 'protectedWeb' or 'extensions'.",
-            "properties": {
-              "unprotectedWeb": {
-                "type": "boolean",
-                "optional": true,
-                "description": "Normal websites."
-              },
-              "protectedWeb": {
-                "type": "boolean",
-                "optional": true,
-                "description": "Websites that have been installed as hosted applications (be careful!)."
-              },
-              "extension": {
-                "type": "boolean",
-                "optional": true,
-                "description": "Extensions and packaged applications a user has installed (be _really_ careful!)."
-              }
-            }
-          }
-        }
-      },
-      {
-        "id": "DataTypeSet",
-        "type": "object",
-        "description": "A set of data types. Missing data types are interpreted as <code>false</code>.",
-        "properties": {
-          "cache": {
-            "type": "boolean",
-            "optional": true,
-            "description": "The browser's cache. Note: when removing data, this clears the <em>entire</em> cache: it is not limited to the range you specify."
-          },
-          "cookies": {
-            "type": "boolean",
-            "optional": true,
-            "description": "The browser's cookies."
-          },
-          "downloads": {
-            "type": "boolean",
-            "optional": true,
-            "description": "The browser's download list."
-          },
-          "formData": {
-            "type": "boolean",
-            "optional": true,
-            "description": "The browser's stored form data."
-          },
-          "history": {
-            "type": "boolean",
-            "optional": true,
-            "description": "The browser's history."
-          },
-          "indexedDB": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Websites' IndexedDB data."
-          },
-          "localStorage": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Websites' local storage data."
-          },
-          "serverBoundCertificates": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Server-bound certificates."
-          },
-          "passwords": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Stored passwords."
-          },
-          "pluginData": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Plugins' data."
-          },
-          "serviceWorkers": {
-            "type": "boolean",
-            "optional": true,
-            "description": "Service Workers."
-          }
-        }
-      }
-    ],
-    "functions": [
-      {
-        "name": "settings",
-        "description": "Reports which types of data are currently selected in the 'Clear browsing data' settings UI.  Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "name": "callback",
-            "type": "function",
-            "parameters": [
-              {
-                "name": "result",
-                "type": "object",
-                "properties": {
-                  "options": {
-                    "$ref": "RemovalOptions"
-                  },
-                  "dataToRemove": {
-                    "$ref": "DataTypeSet",
-                    "description": "All of the types will be present in the result, with values of <code>true</code> if they are both selected to be removed and permitted to be removed, otherwise <code>false</code>."
-                  },
-                  "dataRemovalPermitted": {
-                    "$ref": "DataTypeSet",
-                    "description": "All of the types will be present in the result, with values of <code>true</code> if they are permitted to be removed (e.g., by enterprise policy) and <code>false</code> if not."
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      {
-        "name": "remove",
-        "description": "Clears various types of browsing data stored in a user's profile.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "dataToRemove",
-            "$ref": "DataTypeSet",
-            "description": "The set of data types to remove."
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when deletion has completed.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeAppcache",
-        "description": "Clears websites' appcache data.",
-        "type": "function",
-        "async": "callback",
-        "unsupported": true,
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when websites' appcache data has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeCache",
-        "description": "Clears the browser's cache.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's cache has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeCookies",
-        "description": "Clears the browser's cookies and server-bound certificates modified within a particular timeframe.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's cookies and server-bound certificates have been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeDownloads",
-        "description": "Clears the browser's list of downloaded files (<em>not</em> the downloaded files themselves).",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's list of downloaded files has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeFileSystems",
-        "description": "Clears websites' file system data.",
-        "type": "function",
-        "async": "callback",
-        "unsupported": true,
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when websites' file systems have been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeFormData",
-        "description": "Clears the browser's stored form data (autofill).",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's form data has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeHistory",
-        "description": "Clears the browser's history.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's history has cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeIndexedDB",
-        "description": "Clears websites' IndexedDB data.",
-        "type": "function",
-        "async": "callback",
-        "unsupported": true,
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when websites' IndexedDB data has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeLocalStorage",
-        "description": "Clears websites' local storage data.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when websites' local storage has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removePluginData",
-        "description": "Clears plugins' data.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when plugins' data has been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removePasswords",
-        "description": "Clears the browser's stored passwords.",
-        "type": "function",
-        "async": "callback",
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when the browser's passwords have been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      },
-      {
-        "name": "removeWebSQL",
-        "description": "Clears websites' WebSQL data.",
-        "type": "function",
-        "async": "callback",
-        "unsupported": true,
-        "parameters": [
-          {
-            "$ref": "RemovalOptions",
-            "name": "options"
-          },
-          {
-            "name": "callback",
-            "type": "function",
-            "description": "Called when websites' WebSQL databases have been cleared.",
-            "optional": true,
-            "parameters": []
-          }
-        ]
-      }
-    ]
-  }
-]
diff -Nru firefox-84.0.2+build1/browser/components/extensions/schemas/jar.mn firefox-85.0+build1/browser/components/extensions/schemas/jar.mn
--- firefox-84.0.2+build1/browser/components/extensions/schemas/jar.mn	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/schemas/jar.mn	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,6 @@
 
 browser.jar:
     content/browser/schemas/bookmarks.json
-    content/browser/schemas/browsing_data.json
     content/browser/schemas/chrome_settings_overrides.json
     content/browser/schemas/commands.json
     content/browser/schemas/devtools.json
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browserAction_contextMenu.js	2021-01-18 19:58:08.000000000 +0000
@@ -662,7 +662,8 @@
       await customizationReady;
     } else {
       info("Navigate the about:addons tab to about:blank");
-      await BrowserTestUtils.loadURI(browser, "about:blank");
+      BrowserTestUtils.loadURI(browser, "about:blank");
+      await BrowserTestUtils.browserLoaded(browser);
     }
 
     return menu;
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js	2021-01-18 19:58:08.000000000 +0000
@@ -288,10 +288,7 @@
   });
 
   let win = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(
-    win.gBrowser.selectedBrowser,
-    "http://example.com/"
-  );
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
 
   // Make sure the mouse isn't hovering over the browserAction widget.
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_indexedDB.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_indexedDB.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_indexedDB.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_indexedDB.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-"use strict";
-
-add_task(async function testIndexedDB() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["privacy.userContext.enabled", true]],
-  });
-
-  function background() {
-    browser.test.onMessage.addListener(async msg => {
-      await browser.browsingData.remove(msg, { indexedDB: true });
-      browser.test.sendMessage("indexedDBRemoved");
-    });
-  }
-
-  function contentScript() {
-    // eslint-disable-next-line mozilla/balanced-listeners
-    window.addEventListener(
-      "message",
-      msg => {
-        browser.test.sendMessage("indexedDBCreated");
-      },
-      true
-    );
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData", "tabs"],
-      content_scripts: [
-        {
-          matches: [
-            "http://mochi.test/*/file_indexedDB.html",
-            "http://example.com/*/file_indexedDB.html",
-            "http://example.net/*/file_indexedDB.html",
-          ],
-          js: ["script.js"],
-          run_at: "document_start",
-        },
-      ],
-    },
-    files: {
-      "script.js": contentScript,
-    },
-  });
-
-  let win = await BrowserTestUtils.openNewBrowserWindow();
-  await focusWindow(win);
-
-  await extension.startup();
-
-  const PAGE =
-    "/browser/browser/components/extensions/test/browser/file_indexedDB.html";
-
-  // Create two tabs.
-  BrowserTestUtils.addTab(win.gBrowser, `http://mochi.test:8888${PAGE}`);
-  BrowserTestUtils.addTab(win.gBrowser, `http://example.com${PAGE}`);
-  // Create tab with cookieStoreId "firefox-container-1"
-  BrowserTestUtils.addTab(win.gBrowser, `http://example.net${PAGE}`, {
-    userContextId: 1,
-  });
-
-  await extension.awaitMessage("indexedDBCreated");
-  await extension.awaitMessage("indexedDBCreated");
-  await extension.awaitMessage("indexedDBCreated");
-
-  function getOrigins() {
-    return new Promise(resolve => {
-      let origins = [];
-      Services.qms.getUsage(request => {
-        for (let i = 0; i < request.result.length; ++i) {
-          if (request.result[i].usage === 0) {
-            continue;
-          }
-          if (
-            request.result[i].origin.startsWith("http://mochi.test") ||
-            request.result[i].origin.startsWith("http://example.com") ||
-            request.result[i].origin.startsWith("http://example.net")
-          ) {
-            origins.push(request.result[i].origin);
-          }
-        }
-        resolve(origins.sort());
-      });
-    });
-  }
-
-  let origins = await getOrigins();
-  is(origins.length, 3, "IndexedDB databases have been populated.");
-
-  // Deleting private browsing mode data is silently ignored.
-  extension.sendMessage({ cookieStoreId: "firefox-private" });
-  await extension.awaitMessage("indexedDBRemoved");
-
-  origins = await getOrigins();
-  is(origins.length, 3, "All indexedDB remains after clearing firefox-private");
-
-  // Delete by hostname
-  extension.sendMessage({ hostnames: ["example.com"] });
-  await extension.awaitMessage("indexedDBRemoved");
-
-  origins = await getOrigins();
-  is(origins.length, 2, "IndexedDB data only for only two domains left");
-  ok(origins[0].startsWith("http://example.net"), "example.net not deleted");
-  ok(origins[1].startsWith("http://mochi.test"), "mochi.test not deleted");
-
-  // Delete by cookieStoreId
-  extension.sendMessage({ cookieStoreId: "firefox-container-1" });
-  await extension.awaitMessage("indexedDBRemoved");
-
-  origins = await getOrigins();
-  is(origins.length, 1, "IndexedDB data only for only one domain");
-  ok(origins[0].startsWith("http://mochi.test"), "mochi.test not deleted");
-
-  // Delete all
-  extension.sendMessage({});
-  await extension.awaitMessage("indexedDBRemoved");
-
-  origins = await getOrigins();
-  is(origins.length, 0, "All IndexedDB data has been removed.");
-
-  await extension.unload();
-  await BrowserTestUtils.closeWindow(win);
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_localStorage.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-add_task(async function setup() {
-  // make sure userContext is enabled.
-  return SpecialPowers.pushPrefEnv({
-    set: [["privacy.userContext.enabled", true]],
-  });
-});
-
-add_task(async function testLocalStorage() {
-  async function background() {
-    function waitForTabs() {
-      return new Promise(resolve => {
-        let tabs = [];
-
-        let listener = async (msg, { tab }) => {
-          if (msg !== "content-script-ready") {
-            return;
-          }
-
-          tabs.push(tab);
-          if (tabs.length == 3) {
-            browser.runtime.onMessage.removeListener(listener);
-            resolve(tabs);
-          }
-        };
-        browser.runtime.onMessage.addListener(listener);
-      });
-    }
-
-    function sendMessageToTabs(tabs, message) {
-      return Promise.all(
-        tabs.map(tab => {
-          return browser.tabs.sendMessage(tab.id, message);
-        })
-      );
-    }
-
-    let tabs = await waitForTabs();
-
-    browser.test.assertRejects(
-      browser.browsingData.removeLocalStorage({ since: Date.now() }),
-      "Firefox does not support clearing localStorage with 'since'.",
-      "Expected error received when using unimplemented parameter 'since'."
-    );
-
-    await sendMessageToTabs(tabs, "resetLocalStorage");
-    await browser.browsingData.removeLocalStorage({
-      hostnames: ["example.com"],
-    });
-    await browser.tabs.sendMessage(tabs[0].id, "checkLocalStorageCleared");
-    await browser.tabs.sendMessage(tabs[1].id, "checkLocalStorageSet");
-
-    if (
-      SpecialPowers.Services.domStorageManager.nextGenLocalStorageEnabled ===
-      false
-    ) {
-      // This assertion fails when localStorage is using the legacy
-      // implementation (See Bug 1595431).
-      browser.test.log("Skipped assertion on nextGenLocalStorageEnabled=false");
-    } else {
-      await browser.tabs.sendMessage(tabs[2].id, "checkLocalStorageSet");
-    }
-
-    await sendMessageToTabs(tabs, "resetLocalStorage");
-    await sendMessageToTabs(tabs, "checkLocalStorageSet");
-    await browser.browsingData.removeLocalStorage({});
-    await sendMessageToTabs(tabs, "checkLocalStorageCleared");
-
-    await sendMessageToTabs(tabs, "resetLocalStorage");
-    await sendMessageToTabs(tabs, "checkLocalStorageSet");
-    await browser.browsingData.remove({}, { localStorage: true });
-    await sendMessageToTabs(tabs, "checkLocalStorageCleared");
-
-    // Can only delete cookieStoreId with LSNG enabled.
-    if (SpecialPowers.Services.domStorageManager.nextGenLocalStorageEnabled) {
-      await sendMessageToTabs(tabs, "resetLocalStorage");
-      await sendMessageToTabs(tabs, "checkLocalStorageSet");
-      await browser.browsingData.removeLocalStorage({
-        cookieStoreId: "firefox-container-1",
-      });
-      await browser.tabs.sendMessage(tabs[0].id, "checkLocalStorageSet");
-      await browser.tabs.sendMessage(tabs[1].id, "checkLocalStorageSet");
-      await browser.tabs.sendMessage(tabs[2].id, "checkLocalStorageCleared");
-
-      await sendMessageToTabs(tabs, "resetLocalStorage");
-      await sendMessageToTabs(tabs, "checkLocalStorageSet");
-      // Hostname doesn't match, so nothing cleared.
-      await browser.browsingData.removeLocalStorage({
-        cookieStoreId: "firefox-container-1",
-        hostnames: ["example.net"],
-      });
-      await sendMessageToTabs(tabs, "checkLocalStorageSet");
-
-      await sendMessageToTabs(tabs, "resetLocalStorage");
-      await sendMessageToTabs(tabs, "checkLocalStorageSet");
-      // Deleting private browsing mode data is silently ignored.
-      await browser.browsingData.removeLocalStorage({
-        cookieStoreId: "firefox-private",
-      });
-      await sendMessageToTabs(tabs, "checkLocalStorageSet");
-    } else {
-      await browser.test.assertRejects(
-        browser.browsingData.removeLocalStorage({
-          cookieStoreId: "firefox-container-1",
-        }),
-        "removeLocalStorage with cookieStoreId requires LSNG"
-      );
-    }
-
-    // Cleanup (checkLocalStorageCleared creates empty LS databases).
-    await browser.browsingData.removeLocalStorage({});
-
-    await browser.tabs.remove(tabs.map(tab => tab.id));
-
-    browser.test.notifyPass("done");
-  }
-
-  function contentScript() {
-    browser.runtime.onMessage.addListener(msg => {
-      if (msg === "resetLocalStorage") {
-        localStorage.clear();
-        localStorage.setItem("test", "test");
-      } else if (msg === "checkLocalStorageSet") {
-        browser.test.assertEq(
-          "test",
-          localStorage.getItem("test"),
-          `checkLocalStorageSet: ${location.href}`
-        );
-      } else if (msg === "checkLocalStorageCleared") {
-        browser.test.assertEq(
-          null,
-          localStorage.getItem("test"),
-          `checkLocalStorageCleared: ${location.href}`
-        );
-      }
-    });
-    browser.runtime.sendMessage("content-script-ready");
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      name: "Test Extension",
-      permissions: ["browsingData"],
-      content_scripts: [
-        {
-          matches: [
-            "http://example.com/",
-            "http://example.net/",
-            "http://test1.example.com/",
-          ],
-          js: ["content-script.js"],
-          run_at: "document_end",
-        },
-      ],
-    },
-    files: {
-      "content-script.js": contentScript,
-    },
-  });
-
-  await extension.startup();
-
-  const TABS = [
-    { url: "http://example.com" },
-    { url: "http://example.net" },
-    {
-      url: "http://test1.example.com",
-      options: {
-        userContextId: 1,
-      },
-    },
-  ];
-
-  for (let info of TABS) {
-    let tab = await BrowserTestUtils.addTab(gBrowser, info.url, info.options);
-    let browser = gBrowser.getBrowserForTab(tab);
-    await BrowserTestUtils.browserLoaded(browser);
-  }
-
-  await extension.awaitFinish("done");
-  await extension.unload();
-});
-
-// Verify that browsingData.removeLocalStorage doesn't break on data stored
-// in about:newtab or file principals.
-add_task(async function test_browserData_on_aboutnewtab_and_file_data() {
-  let extension = ExtensionTestUtils.loadExtension({
-    async background() {
-      await browser.browsingData.removeLocalStorage({}).catch(err => {
-        browser.test.fail(`${err} :: ${err.stack}`);
-      });
-      browser.test.sendMessage("done");
-    },
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  // Let's create some data on about:newtab origin.
-  const { SiteDataTestUtils } = ChromeUtils.import(
-    "resource://testing-common/SiteDataTestUtils.jsm"
-  );
-  await SiteDataTestUtils.addToIndexedDB("about:newtab", "foo", "bar", {});
-  await SiteDataTestUtils.addToIndexedDB("file:///fake/file", "foo", "bar", {});
-
-  await extension.startup();
-  await extension.awaitMessage("done");
-  await extension.unload();
-});
-
-add_task(async function test_browserData_should_not_remove_extension_data() {
-  if (!Services.prefs.getBoolPref("dom.storage.next_gen")) {
-    // When LSNG isn't enabled, the browsingData API does still clear
-    // all the extensions localStorage if called without a list of specific
-    // origins to clear.
-    info("Test skipped because LSNG is currently disabled");
-    return;
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    async background() {
-      window.localStorage.setItem("key", "value");
-      await browser.browsingData.removeLocalStorage({}).catch(err => {
-        browser.test.fail(`${err} :: ${err.stack}`);
-      });
-      browser.test.sendMessage("done", window.localStorage.getItem("key"));
-    },
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  await extension.startup();
-  const lsValue = await extension.awaitMessage("done");
-  is(lsValue, "value", "Got the expected localStorage data");
-  await extension.unload();
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-XPCOMUtils.defineLazyServiceGetter(
-  this,
-  "pluginHost",
-  "@mozilla.org/plugin/host;1",
-  "nsIPluginHost"
-);
-
-// Returns the chrome side nsIPluginTag for the test plugin.
-function getTestPlugin() {
-  let tags = pluginHost.getPluginTags();
-  let plugin = tags.find(tag => tag.name == "Test Plug-in");
-  if (!plugin) {
-    ok(false, "Unable to find plugin");
-  }
-  return plugin;
-}
-
-const TEST_ROOT = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-const TEST_URL = TEST_ROOT + "file_clearplugindata.html";
-const REFERENCE_DATE = Date.now();
-const PLUGIN_TAG = getTestPlugin();
-
-/* Due to layout being async, "PluginBindAttached" may trigger later. This
-   returns a Promise that resolves once we've forced a layout flush, which
-   triggers the PluginBindAttached event to fire. This trick only works if
-   there is some sort of plugin in the page.
- */
-function promiseUpdatePluginBindings(browser) {
-  return SpecialPowers.spawn(browser, [], async function() {
-    let doc = content.document;
-    let elems = doc.getElementsByTagName("embed");
-    if (elems && elems.length) {
-      elems[0].clientTop; // eslint-disable-line no-unused-expressions
-    }
-  });
-}
-
-function stored(needles) {
-  let something = pluginHost.siteHasData(PLUGIN_TAG, null);
-  if (!needles) {
-    return something;
-  }
-
-  if (!something) {
-    return false;
-  }
-
-  if (needles.every(value => pluginHost.siteHasData(PLUGIN_TAG, value))) {
-    return true;
-  }
-
-  return false;
-}
-
-add_task(async function testPluginData() {
-  function background() {
-    browser.test.onMessage.addListener(async (msg, options) => {
-      if (msg == "removePluginData") {
-        await browser.browsingData.removePluginData(options);
-      } else {
-        await browser.browsingData.remove(options, { pluginData: true });
-      }
-      browser.test.sendMessage("pluginDataRemoved");
-    });
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  async function testRemovalMethod(method) {
-    // Clear plugin data with no since value.
-
-    // Load page to set data for the plugin.
-    let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-    await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-
-    extension.sendMessage(method, {});
-    await extension.awaitMessage("pluginDataRemoved");
-
-    ok(!stored(null), "All data cleared");
-    BrowserTestUtils.removeTab(tab);
-
-    // Clear pluginData with recent since value.
-
-    // Load page to set data for the plugin.
-    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-    await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-
-    extension.sendMessage(method, { since: REFERENCE_DATE - 20000 });
-    await extension.awaitMessage("pluginDataRemoved");
-
-    ok(stored(["bar.com", "qux.com"]), "Data stored for sites");
-    ok(!stored(["foo.com"]), "Data cleared for foo.com");
-    ok(!stored(["baz.com"]), "Data cleared for baz.com");
-    BrowserTestUtils.removeTab(tab);
-
-    // Clear pluginData with old since value.
-
-    // Load page to set data for the plugin.
-    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-    await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-
-    extension.sendMessage(method, { since: REFERENCE_DATE - 1000000 });
-    await extension.awaitMessage("pluginDataRemoved");
-
-    ok(!stored(null), "All data cleared");
-    BrowserTestUtils.removeTab(tab);
-
-    // Clear pluginData for specific hosts.
-
-    // Load page to set data for the plugin.
-    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-    await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-
-    extension.sendMessage(method, { hostnames: ["bar.com", "baz.com"] });
-    await extension.awaitMessage("pluginDataRemoved");
-
-    ok(stored(["foo.com", "qux.com"]), "Data stored for sites");
-    ok(!stored(["bar.com"]), "Data cleared for bar.com");
-    ok(!stored(["baz.com"]), "Data cleared for baz.com");
-    BrowserTestUtils.removeTab(tab);
-
-    // Clear pluginData for no hosts.
-
-    // Load page to set data for the plugin.
-    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-    await promiseUpdatePluginBindings(gBrowser.selectedBrowser);
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-
-    extension.sendMessage(method, { hostnames: [] });
-    await extension.awaitMessage("pluginDataRemoved");
-
-    ok(
-      stored(["foo.com", "bar.com", "baz.com", "qux.com"]),
-      "Data stored for sites"
-    );
-    BrowserTestUtils.removeTab(tab);
-  }
-
-  PLUGIN_TAG.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-
-  await extension.startup();
-
-  await testRemovalMethod("removePluginData");
-  await testRemovalMethod("remove");
-
-  await extension.unload();
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-"use strict";
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.serviceWorkers.exemptFromPerDomainMax", true],
-      ["dom.serviceWorkers.enabled", true],
-      ["dom.serviceWorkers.testing.enabled", true],
-    ],
-  });
-});
-
-add_task(async function testServiceWorkers() {
-  function background() {
-    const PAGE =
-      "/browser/browser/components/extensions/test/browser/file_serviceWorker.html";
-
-    browser.runtime.onMessage.addListener(msg => {
-      browser.test.sendMessage("serviceWorkerRegistered");
-    });
-
-    browser.test.onMessage.addListener(async msg => {
-      await browser.browsingData.remove(
-        { hostnames: msg.hostnames },
-        { serviceWorkers: true }
-      );
-      browser.test.sendMessage("serviceWorkersRemoved");
-    });
-
-    // Create two serviceWorkers.
-    browser.tabs.create({ url: `http://mochi.test:8888${PAGE}` });
-    browser.tabs.create({ url: `http://example.com${PAGE}` });
-  }
-
-  function contentScript() {
-    // eslint-disable-next-line mozilla/balanced-listeners
-    window.addEventListener(
-      "message",
-      msg => {
-        if (msg.data == "serviceWorkerRegistered") {
-          browser.runtime.sendMessage("serviceWorkerRegistered");
-        }
-      },
-      true
-    );
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData", "tabs"],
-      content_scripts: [
-        {
-          matches: [
-            "http://mochi.test/*/file_serviceWorker.html",
-            "http://example.com/*/file_serviceWorker.html",
-          ],
-          js: ["script.js"],
-          run_at: "document_start",
-        },
-      ],
-    },
-    files: {
-      "script.js": contentScript,
-    },
-  });
-
-  let serviceWorkerManager = SpecialPowers.Cc[
-    "@mozilla.org/serviceworkers/manager;1"
-  ].getService(SpecialPowers.Ci.nsIServiceWorkerManager);
-
-  let win = await BrowserTestUtils.openNewBrowserWindow();
-  await focusWindow(win);
-
-  await extension.startup();
-  await extension.awaitMessage("serviceWorkerRegistered");
-  await extension.awaitMessage("serviceWorkerRegistered");
-
-  // Even though we await the registrations by waiting for the messages,
-  // sometimes the serviceWorkers are still not registered at this point.
-  async function getRegistrations(count) {
-    await BrowserTestUtils.waitForCondition(
-      () => serviceWorkerManager.getAllRegistrations().length === count,
-      `Wait for ${count} service workers to be registered`
-    );
-    return serviceWorkerManager.getAllRegistrations();
-  }
-
-  let serviceWorkers = await getRegistrations(2);
-  is(serviceWorkers.length, 2, "ServiceWorkers have been registered.");
-
-  extension.sendMessage({ hostnames: ["example.com"] });
-  await extension.awaitMessage("serviceWorkersRemoved");
-
-  serviceWorkers = await getRegistrations(1);
-  is(
-    serviceWorkers.length,
-    1,
-    "ServiceWorkers for example.com have been removed."
-  );
-  let host = serviceWorkers.queryElementAt(
-    0,
-    Ci.nsIServiceWorkerRegistrationInfo
-  ).principal.host;
-  is(host, "mochi.test", "ServiceWorkers for example.com have been removed.");
-
-  extension.sendMessage({});
-  await extension.awaitMessage("serviceWorkersRemoved");
-
-  serviceWorkers = await getRegistrations(0);
-  is(serviceWorkers.length, 0, "All ServiceWorkers have been removed.");
-
-  await extension.unload();
-  await BrowserTestUtils.closeWindow(win);
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_chrome_settings_overrides_home.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_chrome_settings_overrides_home.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_chrome_settings_overrides_home.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_chrome_settings_overrides_home.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,6 +38,32 @@
   return !!(item && item.value);
 }
 
+async function assertPreferencesShown(_spotlight) {
+  await TestUtils.waitForCondition(
+    () => gBrowser.currentURI.spec == "about:preferences#home",
+    "Should open about:preferences."
+  );
+
+  await SpecialPowers.spawn(
+    gBrowser.selectedBrowser,
+    [_spotlight],
+    async spotlight => {
+      let doc = content.document;
+      let section = await ContentTaskUtils.waitForCondition(
+        () => doc.querySelector(".spotlight"),
+        "The spotlight should appear."
+      );
+      Assert.equal(
+        section.getAttribute("data-subcategory"),
+        spotlight,
+        "The correct section is spotlighted."
+      );
+    }
+  );
+
+  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+}
+
 add_task(async function test_multiple_extensions_overriding_home_page() {
   let defaultHomePage = getHomePageURL();
 
@@ -368,36 +394,53 @@
 
   let popupShown = promisePopupShown(panel);
   BrowserHome();
-  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, () =>
+    gURLBar.value.endsWith("ext2.html")
+  );
   await popupShown;
 
-  ok(gURLBar.value.endsWith("ext2.html"), "ext2 is in control");
-
-  // Click Restore Settings.
+  // Click Manage.
   let popupHidden = promisePopupHidden(panel);
-  let prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
+  // Ensures the preferences tab opens, checks the spotlight, and then closes it
+  let spotlightShown = assertPreferencesShown("homeOverride");
   popupnotification.secondaryButton.click();
-  await prefPromise;
   await popupHidden;
+  await spotlightShown;
 
-  // Expect a new doorhanger for the next extension.
-  await promisePopupShown(panel);
+  let prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
+  await ext2.unload();
+  await prefPromise;
 
-  ok(gURLBar.value.endsWith("ext1.html"), "ext1 is in control");
+  // Expect a new doorhanger for the next extension.
+  popupShown = promisePopupShown(panel);
+  await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:blank");
+  let openHomepage = TestUtils.topicObserved("browser-open-homepage-start");
+  BrowserHome();
+  await openHomepage;
+  await popupShown;
+  await TestUtils.waitForCondition(
+    () => gURLBar.value.endsWith("ext1.html"),
+    "ext1 is in control"
+  );
 
-  // Click Restore Settings again.
+  // Click manage again.
   popupHidden = promisePopupHidden(panel);
-  prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
+  // Ensures the preferences tab opens, checks the spotlight, and then closes it
+  spotlightShown = assertPreferencesShown("homeOverride");
   popupnotification.secondaryButton.click();
   await popupHidden;
+  await spotlightShown;
+
+  prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
+  await ext1.unload();
   await prefPromise;
 
-  await BrowserTestUtils.waitForLocationChange(gBrowser, defaultHomePage);
+  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  openHomepage = TestUtils.topicObserved("browser-open-homepage-start");
+  BrowserHome();
+  await openHomepage;
 
   is(getHomePageURL(), defaultHomePage, "The homepage is set back to default");
-
-  await ext1.unload();
-  await ext2.unload();
 });
 
 add_task(async function test_doorhanger_new_window() {
@@ -444,25 +487,40 @@
     "extension-homepage-notification-description"
   );
 
-  ok(win.gURLBar.value.endsWith("ext2.html"), "ext2 is in control");
+  await TestUtils.waitForCondition(
+    () => win.gURLBar.value.endsWith("ext2.html"),
+    "ext2 is in control"
+  );
+
   is(
     description.textContent,
     "An extension,  Ext2, changed what you see when you open your homepage and new windows.Learn more",
     "The extension name is in the popup"
   );
 
-  // Click Restore Settings.
+  // Click Manage.
   let popupHidden = promisePopupHidden(panel);
-  let prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
   let popupnotification = doc.getElementById("extension-homepage-notification");
   popupnotification.secondaryButton.click();
-  await prefPromise;
   await popupHidden;
 
+  let prefPromise = promisePrefChangeObserved(HOMEPAGE_URL_PREF);
+  await ext2.unload();
+  await prefPromise;
+
   // Expect a new doorhanger for the next extension.
-  await promisePopupShown(panel);
+  let popupShown = promisePopupShown(panel);
+  await BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:blank");
+  let openHomepage = TestUtils.topicObserved("browser-open-homepage-start");
+  win.BrowserHome();
+  await openHomepage;
+  await popupShown;
+
+  await TestUtils.waitForCondition(
+    () => win.gURLBar.value.endsWith("ext1.html"),
+    "ext1 is in control"
+  );
 
-  ok(win.gURLBar.value.endsWith("ext1.html"), "ext1 is in control");
   is(
     description.textContent,
     "An extension,  Ext1, changed what you see when you open your homepage and new windows.Learn more",
@@ -473,18 +531,24 @@
   popupnotification.button.click();
   await TestUtils.waitForCondition(() => isConfirmed(ext1Id));
 
-  ok(getHomePageURL().endsWith("ext1.html"), "The homepage is still the set");
+  ok(
+    getHomePageURL().endsWith("ext1.html"),
+    "The homepage is still the first eextension"
+  );
 
   await BrowserTestUtils.closeWindow(win);
   await ext1.unload();
-  await ext2.unload();
 
   ok(!isConfirmed(ext1Id), "The confirmation is cleaned up on uninstall");
-});
+  // Skipping for window leak in debug builds, follow up bug: 1678412
+}).skip(AppConstants.DEBUG);
 
 add_task(async function test_overriding_home_page_incognito_not_allowed() {
   await SpecialPowers.pushPrefEnv({
-    set: [["extensions.allowPrivateBrowsingByDefault", false]],
+    set: [
+      ["extensions.allowPrivateBrowsingByDefault", false],
+      ["browser.startup.page", 1],
+    ],
   });
 
   let extension = ExtensionTestUtils.loadExtension({
@@ -504,6 +568,7 @@
 
   let windowOpenedPromise = BrowserTestUtils.waitForNewWindow({ url });
   let win = OpenBrowserWindow();
+
   await windowOpenedPromise;
   let doc = win.document;
   let panel = ExtensionControlledPopup._getAndMaybeCreatePanel(doc);
@@ -604,12 +669,14 @@
   let windowOpenedPromise = BrowserTestUtils.waitForNewWindow();
   let win = OpenBrowserWindow({ private: true });
   await windowOpenedPromise;
+  let openHomepage = TestUtils.topicObserved("browser-open-homepage-start");
   win.BrowserHome();
   await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await openHomepage;
 
   is(win.gURLBar.value, "", "home page not used in private window");
   is(
-    gBrowser.selectedBrowser.currentURI.spec,
+    win.gBrowser.selectedBrowser.currentURI.spec,
     "about:home",
     "home page not used in private window"
   );
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_commands_onCommand.js	2021-01-18 19:58:08.000000000 +0000
@@ -185,7 +185,7 @@
 
   // Create a window before the extension is loaded.
   let win1 = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
+  BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
   await BrowserTestUtils.browserLoaded(win1.gBrowser.selectedBrowser);
 
   // We would have previously focused the window's content area after the
@@ -269,7 +269,7 @@
 
   // Create another window after the extension is loaded.
   let win2 = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:robots");
+  BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:robots");
   await BrowserTestUtils.browserLoaded(win2.gBrowser.selectedBrowser);
 
   // See comment above.
@@ -309,10 +309,7 @@
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({
     private: true,
   });
-  await BrowserTestUtils.loadURI(
-    privateWin.gBrowser.selectedBrowser,
-    "about:robots"
-  );
+  BrowserTestUtils.loadURI(privateWin.gBrowser.selectedBrowser, "about:robots");
   await BrowserTestUtils.browserLoaded(privateWin.gBrowser.selectedBrowser);
 
   // See comment above.
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_currentWindow.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_currentWindow.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_currentWindow.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_currentWindow.js	2021-01-18 19:58:08.000000000 +0000
@@ -62,10 +62,10 @@
 
   await focusWindow(win2);
 
-  await BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
+  BrowserTestUtils.loadURI(win1.gBrowser.selectedBrowser, "about:robots");
   await BrowserTestUtils.browserLoaded(win1.gBrowser.selectedBrowser);
 
-  await BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:config");
+  BrowserTestUtils.loadURI(win2.gBrowser.selectedBrowser, "about:config");
   await BrowserTestUtils.browserLoaded(win2.gBrowser.selectedBrowser);
 
   let extension = ExtensionTestUtils.loadExtension({
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_inspectedWindow_targetSwitch.js	2021-01-18 19:58:08.000000000 +0000
@@ -29,7 +29,7 @@
   const originalTabId = await getCurrentTabId(extension);
 
   const onSwitched = toolbox.targetList.once("switched-target");
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
   await onSwitched;
 
   const currentTabId = await getCurrentTabId(extension);
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_network_targetSwitch.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,7 @@
 async function testOnNavigatedEvent(uri, tab, toolbox, extension) {
   const onNavigated = extension.awaitMessage("network-onNavigated");
   const onSwitched = toolbox.targetList.once("switched-target");
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
   await onSwitched;
   const result = await onNavigated;
   is(result, uri, "devtools.network.onNavigated works correctly");
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_optional.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_optional.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_devtools_optional.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_devtools_optional.js	2021-01-18 19:58:08.000000000 +0000
@@ -107,6 +107,20 @@
   checkEnabled(false);
   assertDevToolsExtensionEnabled(extension.uuid, false);
 
+  info("Close the developer toolbox");
+  await closeToolboxForTab(tab);
+
+  extension.sendMessage("request");
+  await extension.awaitMessage("done");
+
+  info("Open the developer toolbox");
+  openToolboxForTab(tab);
+
+  checkEnabled(true);
+
+  info("Wait the devtools page load");
+  await extension.awaitMessage("devtools_page_loaded");
+  assertDevToolsExtensionEnabled(extension.uuid, true);
   await extension.unload();
 
   await closeToolboxForTab(tab);
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_find.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_find.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_find.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_find.js	2021-01-18 19:58:08.000000000 +0000
@@ -407,7 +407,7 @@
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({
     private: true,
   });
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     privateWin.gBrowser.selectedBrowser,
     "http://example.com"
   );
@@ -446,7 +446,7 @@
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({
     private: true,
   });
-  await BrowserTestUtils.loadURI(privateWin.gBrowser.selectedBrowser, url);
+  BrowserTestUtils.loadURI(privateWin.gBrowser.selectedBrowser, url);
   await BrowserTestUtils.browserLoaded(privateWin.gBrowser.selectedBrowser);
 
   let extension = ExtensionTestUtils.loadExtension({
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_menus_refresh.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_menus_refresh.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_menus_refresh.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_menus_refresh.js	2021-01-18 19:58:08.000000000 +0000
@@ -403,7 +403,7 @@
   elem = extension.getXULElementByMenuId("item2");
   is(elem, null, "menu item 2 should be hidden");
 
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, PAGE + "?2");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, PAGE + "?2");
   await BrowserTestUtils.browserStopped(tab.linkedBrowser);
 
   await extension.callMenuApi("refresh");
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,7 @@
 add_task(async function test_sessions_get_recently_closed() {
   async function openAndCloseWindow(url = "http://example.com", tabUrls) {
     let win = await BrowserTestUtils.openNewBrowserWindow();
-    await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
     await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
     if (tabUrls) {
       for (let url of tabUrls) {
@@ -145,7 +145,7 @@
   // Test with a window with navigation history.
   let win = await BrowserTestUtils.openNewBrowserWindow();
   for (let url of ["about:robots", "about:mozilla", "http://example.com/"]) {
-    await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
     await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js	2021-01-18 19:58:08.000000000 +0000
@@ -53,7 +53,7 @@
   let win = await BrowserTestUtils.openNewBrowserWindow();
   let tabBrowser = win.gBrowser.selectedBrowser;
   for (let url of ["about:robots", "about:mozilla", "about:config"]) {
-    await BrowserTestUtils.loadURI(tabBrowser, url);
+    BrowserTestUtils.loadURI(tabBrowser, url);
     await BrowserTestUtils.browserLoaded(tabBrowser, false, url);
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_restore.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_restore.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_sessions_restore.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_sessions_restore.js	2021-01-18 19:58:08.000000000 +0000
@@ -87,7 +87,7 @@
   await extension.awaitMessage("ready");
 
   let win = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, "about:config");
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, "about:config");
   await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
   for (let url of ["about:robots", "about:mozilla"]) {
     await BrowserTestUtils.openNewForegroundTab(win.gBrowser, url);
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_printPreview.js	2021-01-18 19:58:08.000000000 +0000
@@ -55,6 +55,10 @@
     );
 
     gBrowser.getTabDialogBox(gBrowser.selectedBrowser).abortAllDialogs();
+    // Wait for the preview to go away
+    await BrowserTestUtils.waitForCondition(
+      () => !document.querySelector(".printPreviewBrowser")
+    );
 
     await extension.awaitFinish("tabs.printPreview");
   }
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_remove.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_remove.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_remove.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_remove.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,251 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+"use strict";
+
+add_task(async function undoCloseAfterExtRemovesOneTab() {
+  let initialTab = gBrowser.selectedTab;
+
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["tabs"],
+    },
+
+    background: async function() {
+      let tabs = await browser.tabs.query({});
+
+      browser.test.assertEq(3, tabs.length, "Should have 3 tabs");
+
+      let tabIdsToRemove = (
+        await browser.tabs.query({
+          url: "https://example.com/closeme/*",
+        })
+      ).map(tab => tab.id);
+
+      await browser.tabs.remove(tabIdsToRemove);
+      browser.test.sendMessage("removedtabs");
+    },
+  });
+
+  await Promise.all([
+    BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com/1"),
+    BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "https://example.com/closeme/2"
+    ),
+  ]);
+
+  await extension.startup();
+  await extension.awaitMessage("removedtabs");
+
+  is(
+    gBrowser.tabs.length,
+    2,
+    "Once extension has closed a tab, there should be 2 tabs open"
+  );
+
+  is(
+    SessionStore.getLastClosedTabCount(window),
+    1,
+    "SessionStore should know that one tab was closed"
+  );
+
+  undoCloseTab();
+
+  is(
+    gBrowser.tabs.length,
+    3,
+    "All tabs should be restored for a total of 3 tabs"
+  );
+
+  await BrowserTestUtils.waitForEvent(gBrowser.tabs[2], "SSTabRestored");
+
+  is(
+    gBrowser.tabs[2].linkedBrowser.currentURI.spec,
+    "https://example.com/closeme/2",
+    "Restored tab at index 2 should have expected URL"
+  );
+
+  await extension.unload();
+  gBrowser.removeAllTabsBut(initialTab);
+});
+
+add_task(async function undoCloseAfterExtRemovesMultipleTabs() {
+  let initialTab = gBrowser.selectedTab;
+
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["tabs"],
+    },
+
+    background: async function() {
+      let tabIds = (await browser.tabs.query({})).map(tab => tab.id);
+
+      browser.test.assertEq(
+        8,
+        tabIds.length,
+        "Should have 8 total tabs (4 in each window: the initial blank tab and the 3 opened by this test)"
+      );
+
+      let tabIdsToRemove = (
+        await browser.tabs.query({
+          url: "https://example.com/closeme/*",
+        })
+      ).map(tab => tab.id);
+
+      await browser.tabs.remove(tabIdsToRemove);
+
+      browser.test.sendMessage("removedtabs");
+    },
+  });
+
+  await Promise.all([
+    BrowserTestUtils.openNewForegroundTab(gBrowser, "https://example.com/1"),
+    BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "https://example.com/closeme/2"
+    ),
+    BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "https://example.com/closeme/3"
+    ),
+  ]);
+
+  let window2 = await BrowserTestUtils.openNewBrowserWindow();
+
+  await Promise.all([
+    BrowserTestUtils.openNewForegroundTab(
+      window2.gBrowser,
+      "https://example.com/4"
+    ),
+    BrowserTestUtils.openNewForegroundTab(
+      window2.gBrowser,
+      "https://example.com/closeme/5"
+    ),
+    BrowserTestUtils.openNewForegroundTab(
+      window2.gBrowser,
+      "https://example.com/closeme/6"
+    ),
+  ]);
+
+  await extension.startup();
+  await extension.awaitMessage("removedtabs");
+
+  is(
+    gBrowser.tabs.length,
+    2,
+    "Original window should have 2 tabs still open, after closing tabs"
+  );
+
+  is(
+    window2.gBrowser.tabs.length,
+    2,
+    "Second window should have 2 tabs still open, after closing tabs"
+  );
+
+  is(
+    SessionStore.getLastClosedTabCount(window),
+    2,
+    "SessionStore of original window should know that multiple tabs were closed"
+  );
+
+  is(
+    SessionStore.getLastClosedTabCount(window2),
+    2,
+    "SessionStore of second window should know that multiple tabs were closed"
+  );
+
+  undoCloseTab();
+  window2.undoCloseTab();
+
+  is(
+    gBrowser.tabs.length,
+    4,
+    "All tabs in original window should be restored for a total of 4 tabs"
+  );
+
+  is(
+    window2.gBrowser.tabs.length,
+    4,
+    "All tabs in second window should be restored for a total of 4 tabs"
+  );
+
+  await Promise.all([
+    BrowserTestUtils.waitForEvent(gBrowser.tabs[2], "SSTabRestored"),
+    BrowserTestUtils.waitForEvent(gBrowser.tabs[3], "SSTabRestored"),
+    BrowserTestUtils.waitForEvent(window2.gBrowser.tabs[2], "SSTabRestored"),
+    BrowserTestUtils.waitForEvent(window2.gBrowser.tabs[3], "SSTabRestored"),
+  ]);
+
+  is(
+    gBrowser.tabs[2].linkedBrowser.currentURI.spec,
+    "https://example.com/closeme/2",
+    "Original window restored tab at index 2 should have expected URL"
+  );
+
+  is(
+    gBrowser.tabs[3].linkedBrowser.currentURI.spec,
+    "https://example.com/closeme/3",
+    "Original window restored tab at index 3 should have expected URL"
+  );
+
+  is(
+    window2.gBrowser.tabs[2].linkedBrowser.currentURI.spec,
+    "https://example.com/closeme/5",
+    "Second window restored tab at index 2 should have expected URL"
+  );
+
+  is(
+    window2.gBrowser.tabs[3].linkedBrowser.currentURI.spec,
+    "https://example.com/closeme/6",
+    "Second window restored tab at index 3 should have expected URL"
+  );
+
+  await extension.unload();
+  await BrowserTestUtils.closeWindow(window2);
+  gBrowser.removeAllTabsBut(initialTab);
+});
+
+add_task(async function closeWindowIfExtClosesAllTabs() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.tabs.closeWindowWithLastTab", true],
+      ["browser.tabs.warnOnClose", true],
+    ],
+  });
+
+  let extension = ExtensionTestUtils.loadExtension({
+    background: async function() {
+      let tabsToRemove = await browser.tabs.query({ currentWindow: true });
+
+      let currentWindowId = tabsToRemove[0].windowId;
+
+      browser.test.assertEq(
+        2,
+        tabsToRemove.length,
+        "Current window should have 2 tabs to remove"
+      );
+
+      await browser.tabs.remove(tabsToRemove.map(tab => tab.id));
+
+      await browser.test.assertRejects(
+        browser.windows.get(currentWindowId),
+        RegExp(`Invalid window ID: ${currentWindowId}`),
+        "After closing tabs, 2nd window should be closed and querying for it should be rejected"
+      );
+
+      browser.test.notifyPass("done");
+    },
+  });
+
+  let window2 = await BrowserTestUtils.openNewBrowserWindow();
+
+  await BrowserTestUtils.openNewForegroundTab(
+    window2.gBrowser,
+    "https://example.com/"
+  );
+
+  await extension.startup();
+  await extension.awaitFinish("done");
+  await extension.unload();
+  await SpecialPowers.popPrefEnv();
+});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_tabs_update_url.js	2021-01-18 19:58:08.000000000 +0000
@@ -171,7 +171,7 @@
 
   let win = await BrowserTestUtils.openNewBrowserWindow();
   let tabBrowser = win.gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(tabBrowser, URL);
+  BrowserTestUtils.loadURI(tabBrowser, URL);
   await BrowserTestUtils.browserLoaded(tabBrowser, false, URL);
   let tab = win.gBrowser.selectedTab;
 
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,8 +19,6 @@
   "resource:///modules/ExtensionControlledPopup.jsm"
 );
 
-const NEWTAB_URI_1 = "webext-newtab-1.html";
-
 function getNotificationSetting(extensionId) {
   return ExtensionSettingsStore.getSetting("newTabNotification", extensionId);
 }
@@ -34,19 +32,37 @@
   notification.button.click();
 }
 
-function clickRestoreSettings(notification) {
+function clickManage(notification) {
   notification.secondaryButton.click();
 }
 
-function waitForNewTab() {
+async function promiseNewTab(expectUrl = AboutNewTab.newTabURL, win = window) {
   let eventName = "browser-open-newtab-start";
-  return new Promise(resolve => {
-    function observer() {
+  let newTabStartPromise = new Promise(resolve => {
+    async function observer(subject) {
       Services.obs.removeObserver(observer, eventName);
-      resolve();
+      resolve(subject.wrappedJSObject);
     }
     Services.obs.addObserver(observer, eventName);
   });
+
+  let newtabShown = TestUtils.waitForCondition(
+    () => win.gBrowser.currentURI.spec == expectUrl,
+    `Should open correct new tab url ${expectUrl}.`
+  );
+
+  win.BrowserOpenTab();
+  const newTabCreatedPromise = newTabStartPromise;
+  const browser = await newTabCreatedPromise;
+  await newtabShown;
+  const tab = win.gBrowser.selectedTab;
+
+  Assert.deepEqual(
+    browser,
+    tab.linkedBrowser,
+    "browser-open-newtab-start notified with the created browser"
+  );
+  return tab;
 }
 
 function waitForAddonDisabled(addon) {
@@ -77,51 +93,42 @@
   });
 }
 
+// Default test extension data for newtab.
+const extensionData = {
+  manifest: {
+    applications: {
+      gecko: {
+        id: "newtaburl@mochi.test",
+      },
+    },
+    chrome_url_overrides: {
+      newtab: "newtab.html",
+    },
+  },
+  files: {
+    "newtab.html": "<h1>New tab!</h1>",
+  },
+  useAddonManager: "temporary",
+};
+
 add_task(async function test_new_tab_opens() {
   let panel = getNewTabDoorhanger().closest("panel");
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      chrome_url_overrides: {
-        newtab: NEWTAB_URI_1,
-      },
-    },
-    useAddonManager: "temporary",
-    files: {
-      [NEWTAB_URI_1]: `
-        <!DOCTYPE html>
-        <head>
-          <meta charset="utf-8"/></head>
-        <html>
-          <body>
-            <script src="newtab.js"></script>
-          </body>
-        </html>
-      `,
-
-      "newtab.js": function() {
-        window.onload = () => {
-          browser.test.sendMessage("from-newtab-page", window.location.href);
-        };
-      },
-    },
-  });
+  let extension = ExtensionTestUtils.loadExtension(extensionData);
 
   await extension.startup();
+  let extensionNewTabUrl = `moz-extension://${extension.uuid}/newtab.html`;
 
   // Simulate opening the newtab open as a user would.
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
+  let tab = await promiseNewTab(extensionNewTabUrl);
   await popupShown;
 
-  let url = await extension.awaitMessage("from-newtab-page");
-  ok(url.endsWith(NEWTAB_URI_1), "Newtab url is overridden by the extension.");
-
   // This will show a confirmation doorhanger, make sure we don't leave it open.
   let popupHidden = promisePopupHidden(panel);
   panel.hidePopup();
   await popupHidden;
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
   await extension.unload();
 });
 
@@ -149,7 +156,7 @@
 
   // Simulate opening the New Tab as a user would.
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
+  let tab = await promiseNewTab();
   await popupShown;
 
   // Ensure the doorhanger is shown and the setting isn't set yet.
@@ -187,10 +194,8 @@
   );
 
   // Close the first tab and open another new tab.
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  let newTabOpened = waitForNewTab();
-  BrowserOpenTab();
-  await newTabOpened;
+  BrowserTestUtils.removeTab(tab);
+  tab = await promiseNewTab();
 
   // Verify the doorhanger is not shown a second time.
   ok(
@@ -199,7 +204,7 @@
   );
   is(gURLBar.focused, true, "The URL bar is focused with no doorhanger");
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
   await extension.unload();
 });
 
@@ -212,18 +217,11 @@
     version: "1.0",
     name: "New Tab Add-on",
     applications: { gecko: { id: extensionId } },
-    chrome_url_overrides: { newtab: "keep.html" },
-  };
-  let files = {
-    "keep.html":
-      '<script src="newtab.js"></script><h1 id="extension-new-tab">New Tab!</h1>',
-    "newtab.js": () => {
-      window.onload = browser.test.sendMessage("newtab");
-    },
+    chrome_url_overrides: { newtab: "newtab.html" },
   };
   let extension = ExtensionTestUtils.loadExtension({
+    ...extensionData,
     manifest,
-    files,
     useAddonManager: "permanent",
   });
 
@@ -233,11 +231,11 @@
   );
 
   await extension.startup();
+  let extensionNewTabUrl = `moz-extension://${extension.uuid}/newtab.html`;
 
   // Simulate opening the New Tab as a user would.
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
-  await extension.awaitMessage("newtab");
+  let tab = await promiseNewTab(extensionNewTabUrl);
   await popupShown;
 
   // Ensure the panel is open and the setting isn't saved yet.
@@ -286,9 +284,8 @@
   );
 
   // Close the first tab and open another new tab.
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  BrowserOpenTab();
-  await extension.awaitMessage("newtab");
+  BrowserTestUtils.removeTab(tab);
+  tab = await promiseNewTab(extensionNewTabUrl);
 
   // Verify the doorhanger is not shown a second time.
   ok(
@@ -296,18 +293,18 @@
     "The notification panel is not opened after keeping the changes"
   );
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
 
   let upgradedExtension = ExtensionTestUtils.loadExtension({
+    ...extensionData,
     manifest: Object.assign({}, manifest, { version: "2.0" }),
-    files,
     useAddonManager: "permanent",
   });
 
   await upgradedExtension.startup();
+  extensionNewTabUrl = `moz-extension://${upgradedExtension.uuid}/newtab.html`;
 
-  BrowserOpenTab();
-  await upgradedExtension.awaitMessage("newtab");
+  tab = await promiseNewTab(extensionNewTabUrl);
 
   // Ensure panel is closed and setting is still set.
   ok(
@@ -320,7 +317,7 @@
     "The New Tab notification is set after keeping the changes"
   );
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
   await upgradedExtension.unload();
   await extension.unload();
 
@@ -360,7 +357,7 @@
 
   // Simulate opening the newtab open as a user would.
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
+  let tab = await promiseNewTab();
   await popupShown;
 
   // Verify that the panel is open and add-on is enabled.
@@ -377,67 +374,39 @@
     "The New Tab notification is not set for this extension"
   );
 
-  // Click the Restore Changes button.
-  let addonDisabled = waitForAddonDisabled(addon);
-  let popupHidden = promisePopupHidden(panel);
-  let locationChanged = BrowserTestUtils.waitForLocationChange(
-    gBrowser,
-    "about:newtab"
+  // Click the Manage button.
+  let preferencesShown = TestUtils.waitForCondition(
+    () => gBrowser.currentURI.spec == "about:preferences#home",
+    "Should open about:preferences."
   );
-  clickRestoreSettings(notification);
+
+  let popupHidden = promisePopupHidden(panel);
+  clickManage(notification);
   await popupHidden;
-  await addonDisabled;
-  await locationChanged;
+  await preferencesShown;
 
   // Ensure panel is closed, settings haven't changed and add-on is disabled.
   ok(
     panel.getAttribute("panelopen") != "true",
     "The notification panel is closed after click"
   );
+
   is(
     getNotificationSetting(extensionId),
     null,
-    "The New Tab notification is not set after restoring the settings"
-  );
-  is(addon.userDisabled, true, "The extension is now disabled");
-  is(
-    gBrowser.currentURI.spec,
-    "about:newtab",
-    "The user has been redirected to about:newtab"
+    "The New Tab notification is not set after clicking manage"
   );
 
-  // Wait for the next event tick to make sure the remaining part of the test
-  // is not executed inside tabbrowser's onLocationChange.
-  // See bug 1416153 for more details.
-  await TestUtils.waitForTick();
-
   // Reopen a browser tab and verify that there's no doorhanger.
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  let newTabOpened = waitForNewTab();
-  BrowserOpenTab();
-  await newTabOpened;
+  BrowserTestUtils.removeTab(tab);
+  tab = await promiseNewTab();
 
   ok(
     panel.getAttribute("panelopen") != "true",
     "The notification panel is not opened after keeping the changes"
   );
 
-  // FIXME: We need to enable the add-on so it gets cleared from the
-  // ExtensionSettingsStore for now. See bug 1408226.
-  let addonEnabled = new Promise(resolve => {
-    let listener = {
-      onEnabled(enabledAddon) {
-        if (enabledAddon.id == addon.id) {
-          AddonManager.removeAddonListener(listener);
-          resolve();
-        }
-      },
-    };
-    AddonManager.addAddonListener(listener);
-  });
-  await addon.enable();
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  await addonEnabled;
+  BrowserTestUtils.removeTab(tab);
   await extension.unload();
 });
 
@@ -454,11 +423,7 @@
     files: {
       "restore-one.html": `
         <h1 id="extension-new-tab">New Tab!</h1>
-        <script src="newtab.js"></script>
       `,
-      "newtab.js": function() {
-        browser.test.sendMessage("from-newtab-page", window.location.href);
-      },
     },
     useAddonManager: "temporary",
   });
@@ -492,7 +457,7 @@
 
   // Simulate opening the newtab open as a user would.
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
+  let tab1 = await promiseNewTab();
   await popupShown;
 
   // Verify that the panel is open and add-on is enabled.
@@ -509,23 +474,36 @@
     "The New Tab notification is not set for this extension"
   );
 
-  // Click the Restore Changes button.
-  let addonDisabled = waitForAddonDisabled(addonTwo);
+  // Click the Manage button.
   let popupHidden = promisePopupHidden(panel);
-  let newTabUrlPromise = extensionOne.awaitMessage("from-newtab-page");
-  clickRestoreSettings(notification);
+  let preferencesShown = TestUtils.waitForCondition(
+    () => gBrowser.currentURI.spec == "about:preferences#home",
+    "Should open about:preferences."
+  );
+  clickManage(notification);
   await popupHidden;
+  await preferencesShown;
+
+  // Disable the second addon then refresh the new tab expect to see a new addon dropdown.
+  let addonDisabled = waitForAddonDisabled(addonTwo);
+  addonTwo.disable();
   await addonDisabled;
-  await promisePopupShown(panel);
-  let newTabUrl = await newTabUrlPromise;
 
   // Ensure the panel opens again for the next add-on.
+  popupShown = promisePopupShown(panel);
+  let newtabShown = TestUtils.waitForCondition(
+    () => gBrowser.currentURI.spec == AboutNewTab.newTabURL,
+    "Should open correct new tab url."
+  );
+  let tab2 = await promiseNewTab();
+  await newtabShown;
+  await popupShown;
+
   is(
     getNotificationSetting(extensionTwoId),
     null,
     "The New Tab notification is not set after restoring the settings"
   );
-  is(addonTwo.userDisabled, true, "The extension is now disabled");
   let addonOne = await AddonManager.getAddonByID(extensionOneId);
   is(
     addonOne.userDisabled,
@@ -544,20 +522,25 @@
   );
   is(
     gBrowser.currentURI.spec,
-    newTabUrl,
+    AboutNewTab.newTabURL,
     "The user is now on the next extension's New Tab page"
   );
 
-  addonDisabled = waitForAddonDisabled(addonOne);
-  popupHidden = promisePopupHidden(panel);
-  let locationChanged = BrowserTestUtils.waitForLocationChange(
-    gBrowser,
-    "about:newtab"
+  preferencesShown = TestUtils.waitForCondition(
+    () => gBrowser.currentURI.spec == "about:preferences#home",
+    "Should open about:preferences."
   );
-  clickRestoreSettings(notification);
+  popupHidden = promisePopupHidden(panel);
+  clickManage(notification);
   await popupHidden;
+  await preferencesShown;
+  // remove the extra preferences tab.
+  BrowserTestUtils.removeTab(tab2);
+
+  addonDisabled = waitForAddonDisabled(addonOne);
+  addonOne.disable();
   await addonDisabled;
-  await locationChanged;
+  tab2 = await promiseNewTab();
 
   ok(
     panel.getAttribute("panelopen") != "true",
@@ -568,31 +551,21 @@
     null,
     "The New Tab notification is not set after restoring the settings"
   );
-  is(addonOne.userDisabled, true, "The extension is now disabled");
   is(
     gBrowser.currentURI.spec,
     "about:newtab",
     "The user is now on the original New Tab URL since all extensions are disabled"
   );
 
-  // Wait for the next event tick to make sure the remaining part of the test
-  // is not executed inside tabbrowser's onLocationChange.
-  // See bug 1416153 for more details.
-  await TestUtils.waitForTick();
-
   // Reopen a browser tab and verify that there's no doorhanger.
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  let newTabOpened = waitForNewTab();
-  BrowserOpenTab();
-  await newTabOpened;
+  BrowserTestUtils.removeTab(tab2);
+  tab2 = await promiseNewTab();
 
   ok(
     panel.getAttribute("panelopen") != "true",
     "The notification panel is not opened after keeping the changes"
   );
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-
   // FIXME: We need to enable the add-on so it gets cleared from the
   // ExtensionSettingsStore for now. See bug 1408226.
   let addonsEnabled = Promise.all([
@@ -602,6 +575,9 @@
   await addonOne.enable();
   await addonTwo.enable();
   await addonsEnabled;
+  BrowserTestUtils.removeTab(tab1);
+  BrowserTestUtils.removeTab(tab2);
+
   await extensionOne.unload();
   await extensionTwo.unload();
 });
@@ -613,29 +589,10 @@
  */
 add_task(async function dontTemporarilyShowAboutExtensionPath() {
   await ExtensionSettingsStore.initialize();
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      name: "Test Extension",
-      applications: {
-        gecko: {
-          id: "newtaburl@mochi.test",
-        },
-      },
-      chrome_url_overrides: {
-        newtab: "newtab.html",
-      },
-    },
-    background() {
-      browser.test.sendMessage("url", browser.runtime.getURL("newtab.html"));
-    },
-    files: {
-      "newtab.html": "<h1>New tab!</h1>",
-    },
-    useAddonManager: "temporary",
-  });
+  let extension = ExtensionTestUtils.loadExtension(extensionData);
 
   await extension.startup();
-  let url = await extension.awaitMessage("url");
+  let extensionNewTabUrl = `moz-extension://${extension.uuid}/newtab.html`;
 
   let wpl = {
     onLocationChange() {
@@ -644,7 +601,10 @@
   };
   gBrowser.addProgressListener(wpl);
 
-  let tab = await BrowserTestUtils.openNewForegroundTab({ gBrowser, url });
+  let tab = await BrowserTestUtils.openNewForegroundTab({
+    gBrowser,
+    url: extensionNewTabUrl,
+  });
 
   gBrowser.removeProgressListener(wpl);
   is(gURLBar.value, "", "URL bar value should be empty.");
@@ -668,49 +628,23 @@
   let panel = getNewTabDoorhanger().closest("panel");
 
   let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      chrome_url_overrides: { newtab: "newtab.html" },
-      name: "extension",
-      applications: {
-        gecko: { id: "@not-allowed-newtab" },
-      },
-    },
-    files: {
-      "newtab.html": `
-        <!DOCTYPE html>
-        <head>
-          <meta charset="utf-8"/></head>
-        <html>
-          <body>
-            <script src="newtab.js"></script>
-          </body>
-        </html>
-      `,
-
-      "newtab.js": function() {
-        window.onload = () => {
-          browser.test.sendMessage("from-newtab-page", window.location.href);
-        };
-      },
-    },
+    ...extensionData,
     useAddonManager: "permanent",
   });
 
   await extension.startup();
+  let extensionNewTabUrl = `moz-extension://${extension.uuid}/newtab.html`;
 
   let popupShown = promisePopupShown(panel);
-  BrowserOpenTab();
+  let tab = await promiseNewTab(extensionNewTabUrl);
   await popupShown;
 
-  let url = await extension.awaitMessage("from-newtab-page");
-  ok(url.endsWith("newtab.html"), "Newtab url is overridden by the extension.");
-
   // This will show a confirmation doorhanger, make sure we don't leave it open.
   let popupHidden = promisePopupHidden(panel);
   panel.hidePopup();
   await popupHidden;
 
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
 
   // Verify a private window does not open the extension page.  We would
   // get an extra notification that we don't listen for if it gets loaded.
@@ -718,18 +652,14 @@
   let win = OpenBrowserWindow({ private: true });
   await windowOpenedPromise;
 
-  let newTabOpened = waitForNewTab();
-  win.BrowserOpenTab();
-  await newTabOpened;
+  await promiseNewTab("about:privatebrowsing", win);
 
   is(win.gURLBar.value, "", "newtab not used in private window");
 
   // Verify setting the pref directly doesn't bypass permissions.
   let origUrl = AboutNewTab.newTabURL;
-  AboutNewTab.newTabURL = url;
-  newTabOpened = waitForNewTab();
-  win.BrowserOpenTab();
-  await newTabOpened;
+  AboutNewTab.newTabURL = extensionNewTabUrl;
+  await promiseNewTab("about:privatebrowsing", win);
 
   is(win.gURLBar.value, "", "directly set newtab not used in private window");
 
@@ -745,48 +675,22 @@
   });
 
   let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      chrome_url_overrides: { newtab: "newtab.html" },
-      name: "extension",
-      applications: {
-        gecko: { id: "@spanning-newtab" },
-      },
-    },
-    files: {
-      "newtab.html": `
-        <!DOCTYPE html>
-        <head>
-          <meta charset="utf-8"/></head>
-        <html>
-          <body>
-            <script src="newtab.js"></script>
-          </body>
-        </html>
-      `,
-
-      "newtab.js": function() {
-        window.onload = () => {
-          browser.test.sendMessage("from-newtab-page", window.location.href);
-        };
-      },
-    },
+    ...extensionData,
     useAddonManager: "permanent",
     incognitoOverride: "spanning",
   });
 
   await extension.startup();
+  let extensionNewTabUrl = `moz-extension://${extension.uuid}/newtab.html`;
 
   let windowOpenedPromise = BrowserTestUtils.waitForNewWindow();
   let win = OpenBrowserWindow({ private: true });
   await windowOpenedPromise;
   let panel = ExtensionControlledPopup._getAndMaybeCreatePanel(win.document);
   let popupShown = promisePopupShown(panel);
-  win.BrowserOpenTab();
+  await promiseNewTab(extensionNewTabUrl, win);
   await popupShown;
 
-  let url = await extension.awaitMessage("from-newtab-page");
-  ok(url.endsWith("newtab.html"), "Newtab url is overridden by the extension.");
-
   // This will show a confirmation doorhanger, make sure we don't leave it open.
   let popupHidden = promisePopupHidden(panel);
   panel.hidePopup();
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_windows.js firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_windows.js
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser_ext_windows.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser_ext_windows.js	2021-01-18 19:58:08.000000000 +0000
@@ -191,7 +191,7 @@
   let promiseLoaded = BrowserTestUtils.browserLoaded(
     realWin.gBrowser.selectedBrowser
   );
-  await BrowserTestUtils.loadURI(realWin.gBrowser.selectedBrowser, NEW_URL);
+  BrowserTestUtils.loadURI(realWin.gBrowser.selectedBrowser, NEW_URL);
   await promiseLoaded;
   await verifyTitle(
     realWin,
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/browser.ini firefox-85.0+build1/browser/components/extensions/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,6 @@
   ctxmenu-image.png
   context_tabs_onUpdated_page.html
   context_tabs_onUpdated_iframe.html
-  file_clearplugindata.html
   file_find_frames.html
   file_popup_api_injection_a.html
   file_popup_api_injection_b.html
@@ -34,12 +33,9 @@
   file_language_tlh.html
   file_dummy.html
   file_title.html
-  file_indexedDB.html
-  file_serviceWorker.html
   webNav_createdTarget.html
   webNav_createdTargetSource.html
   webNav_createdTargetSource_subframe.html
-  serviceWorker.js
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
   ../../../../../toolkit/components/extensions/test/mochitest/head_webrequest.js
@@ -79,11 +75,6 @@
 [browser_ext_browsingData_cookieStoreId.js]
 [browser_ext_browsingData_formData.js]
 [browser_ext_browsingData_history.js]
-[browser_ext_browsingData_indexedDB.js]
-[browser_ext_browsingData_localStorage.js]
-[browser_ext_browsingData_pluginData.js]
-skip-if = (os == 'mac' && debug) # Plugin test causes Mac window to lose active state and times out other tests.
-[browser_ext_browsingData_serviceWorkers.js]
 [browser_ext_chrome_settings_overrides_home.js]
 [browser_ext_commands_execute_browser_action.js]
 [browser_ext_commands_execute_page_action.js]
@@ -98,7 +89,6 @@
 [browser_ext_contentscript_in_parent.js]
 [browser_ext_contentscript_incognito.js]
 [browser_ext_contentscript_nontab_connect.js]
-skip-if = fission
 [browser_ext_contextMenus.js]
 support-files = !/browser/components/places/tests/browser/head.js
 [browser_ext_contextMenus_checkboxes.js]
@@ -263,6 +253,7 @@
 [browser_ext_tabs_readerMode.js]
 [browser_ext_tabs_reload.js]
 [browser_ext_tabs_reload_bypass_cache.js]
+[browser_ext_tabs_remove.js]
 [browser_ext_tabs_saveAsPDF.js]
 [browser_ext_tabs_sendMessage.js]
 [browser_ext_tabs_sharingState.js]
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/file_clearplugindata.html firefox-85.0+build1/browser/components/extensions/test/browser/file_clearplugindata.html
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/file_clearplugindata.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/file_clearplugindata.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <title>Plugin Clear Site Data sanitize test</title>
-
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
-  </head>
-
-  <body></body>
-
-  <script type="application/javascript">
-    "use strict";
-
-    // Make sure clearing by timerange is supported.
-    let p = document.getElementById("plugin1");
-    p.setSitesWithDataCapabilities(true);
-
-    p.setSitesWithData(
-      "foo.com:0:5," +
-      "bar.com:0:100," +
-      "baz.com:1:5," +
-      "qux.com:1:100"
-    );
-  </script>
-
-</html>
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/file_indexedDB.html firefox-85.0+build1/browser/components/extensions/test/browser/file_indexedDB.html
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/file_indexedDB.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/file_indexedDB.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script>
-"use strict";
-
-const objectStoreName = "Objects";
-
-let test = {key: 0, value: "test"};
-
-let request = indexedDB.open("WebExtensionTest", 1);
-request.onupgradeneeded = event => {
-  let db = event.target.result;
-  let objectStore = db.createObjectStore(objectStoreName,
-                                         {autoIncrement: 0});
-  request = objectStore.add(test.value, test.key);
-  request.onsuccess = event => {
-    db.close();
-    window.postMessage("indexedDBCreated", "*");
-  };
-};
-    </script>
-  </head>
-  <body>
-    This is a test page.
-  </body>
-<html>
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/browser/file_serviceWorker.html firefox-85.0+build1/browser/components/extensions/test/browser/file_serviceWorker.html
--- firefox-84.0.2+build1/browser/components/extensions/test/browser/file_serviceWorker.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/browser/file_serviceWorker.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <script>
-      "use strict";
-
-      navigator.serviceWorker.register("serviceWorker.js").then(() => {
-        window.postMessage("serviceWorkerRegistered", "*");
-      });
-    </script>
-  </head>
-  <body>
-    This is a test page.
-  </body>
-<html>
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js
--- firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,462 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-"use strict";
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "setTimeout",
-  "resource://gre/modules/Timer.jsm"
-);
-
-const { SiteDataTestUtils } = ChromeUtils.import(
-  "resource://testing-common/SiteDataTestUtils.jsm"
-);
-
-const COOKIE = {
-  host: "example.com",
-  name: "test_cookie",
-  path: "/",
-};
-const COOKIE_NET = {
-  host: "example.net",
-  name: "test_cookie",
-  path: "/",
-};
-const COOKIE_ORG = {
-  host: "example.org",
-  name: "test_cookie",
-  path: "/",
-};
-let since, oldCookie;
-
-function addCookie(cookie) {
-  Services.cookies.add(
-    cookie.host,
-    cookie.path,
-    cookie.name,
-    "test",
-    false,
-    false,
-    false,
-    Date.now() / 1000 + 10000,
-    {},
-    Ci.nsICookie.SAMESITE_NONE,
-    Ci.nsICookie.SCHEME_HTTPS
-  );
-  ok(
-    Services.cookies.cookieExists(cookie.host, cookie.path, cookie.name, {}),
-    `Cookie ${cookie.name} was created.`
-  );
-}
-
-async function setUpCookies() {
-  Services.cookies.removeAll();
-
-  // Add a cookie which will end up with an older creationTime.
-  oldCookie = Object.assign({}, COOKIE, { name: Date.now() });
-  addCookie(oldCookie);
-  await new Promise(resolve => setTimeout(resolve, 10));
-  since = Date.now();
-  await new Promise(resolve => setTimeout(resolve, 10));
-
-  // Add a cookie which will end up with a more recent creationTime.
-  addCookie(COOKIE);
-
-  // Add cookies for different domains.
-  addCookie(COOKIE_NET);
-  addCookie(COOKIE_ORG);
-}
-
-async function setUpCache() {
-  Services.cache2.clear();
-
-  // Add cache entries for different domains.
-  for (const domain of ["example.net", "example.org", "example.com"]) {
-    await SiteDataTestUtils.addCacheEntry(`http://${domain}/`, "disk");
-    await SiteDataTestUtils.addCacheEntry(`http://${domain}/`, "memory");
-  }
-}
-
-function hasCacheEntry(domain) {
-  const disk = SiteDataTestUtils.hasCacheEntry(`http://${domain}/`, "disk");
-  const memory = SiteDataTestUtils.hasCacheEntry(`http://${domain}/`, "memory");
-
-  equal(
-    disk,
-    memory,
-    `For ${domain} either either both or neither caches need to exists.`
-  );
-  return disk;
-}
-
-add_task(async function testCache() {
-  function background() {
-    browser.test.onMessage.addListener(async msg => {
-      if (msg == "removeCache") {
-        await browser.browsingData.removeCache({});
-      } else {
-        await browser.browsingData.remove({}, { cache: true });
-      }
-      browser.test.sendMessage("cacheRemoved");
-    });
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  async function testRemovalMethod(method) {
-    await setUpCache();
-
-    extension.sendMessage(method);
-    await extension.awaitMessage("cacheRemoved");
-
-    ok(!hasCacheEntry("example.net"), "example.net cache was removed");
-    ok(!hasCacheEntry("example.org"), "example.org cache was removed");
-    ok(!hasCacheEntry("example.com"), "example.com cache was removed");
-  }
-
-  await extension.startup();
-
-  await testRemovalMethod("removeCache");
-  await testRemovalMethod("remove");
-
-  await extension.unload();
-});
-
-add_task(async function testCookies() {
-  // Above in setUpCookies we create an 'old' cookies, wait 10ms, then log a timestamp.
-  // Here we ask the browser to delete all cookies after the timestamp, with the intention
-  // that the 'old' cookie is not removed. The issue arises when the timer precision is
-  // low enough such that the timestamp that gets logged is the same as the 'old' cookie.
-  // We hardcode a precision value to ensure that there is time between the 'old' cookie
-  // and the timestamp generation.
-  Services.prefs.setBoolPref("privacy.reduceTimerPrecision", true);
-  Services.prefs.setIntPref(
-    "privacy.resistFingerprinting.reduceTimerPrecision.microseconds",
-    2000
-  );
-
-  registerCleanupFunction(function() {
-    Services.prefs.clearUserPref("privacy.reduceTimerPrecision");
-    Services.prefs.clearUserPref(
-      "privacy.resistFingerprinting.reduceTimerPrecision.microseconds"
-    );
-  });
-
-  function background() {
-    browser.test.onMessage.addListener(async (msg, options) => {
-      if (msg == "removeCookies") {
-        await browser.browsingData.removeCookies(options);
-      } else {
-        await browser.browsingData.remove(options, { cookies: true });
-      }
-      browser.test.sendMessage("cookiesRemoved");
-    });
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  async function testRemovalMethod(method) {
-    // Clear cookies with a recent since value.
-    await setUpCookies();
-    extension.sendMessage(method, { since });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(
-      Services.cookies.cookieExists(
-        oldCookie.host,
-        oldCookie.path,
-        oldCookie.name,
-        {}
-      ),
-      "Old cookie was not removed."
-    );
-    ok(
-      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-      "Recent cookie was removed."
-    );
-
-    // Clear cookies with an old since value.
-    await setUpCookies();
-    addCookie(COOKIE);
-    extension.sendMessage(method, { since: since - 100000 });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(
-      !Services.cookies.cookieExists(
-        oldCookie.host,
-        oldCookie.path,
-        oldCookie.name,
-        {}
-      ),
-      "Old cookie was removed."
-    );
-    ok(
-      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-      "Recent cookie was removed."
-    );
-
-    // Clear cookies with no since value and valid originTypes.
-    await setUpCookies();
-    extension.sendMessage(method, {
-      originTypes: { unprotectedWeb: true, protectedWeb: false },
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(
-      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-      `Cookie ${COOKIE.name}  was removed.`
-    );
-    ok(
-      !Services.cookies.cookieExists(
-        oldCookie.host,
-        oldCookie.path,
-        oldCookie.name,
-        {}
-      ),
-      `Cookie ${oldCookie.name}  was removed.`
-    );
-  }
-
-  await extension.startup();
-
-  await testRemovalMethod("removeCookies");
-  await testRemovalMethod("remove");
-
-  await extension.unload();
-});
-
-add_task(async function testCacheAndCookies() {
-  function background() {
-    browser.test.onMessage.addListener(async options => {
-      await browser.browsingData.remove(options, {
-        cache: true,
-        cookies: true,
-      });
-      browser.test.sendMessage("cacheAndCookiesRemoved");
-    });
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  await extension.startup();
-
-  // Clear cache and cookies with a recent since value.
-  await setUpCookies();
-  await setUpCache();
-  extension.sendMessage({ since });
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  ok(
-    Services.cookies.cookieExists(
-      oldCookie.host,
-      oldCookie.path,
-      oldCookie.name,
-      {}
-    ),
-    "Old cookie was not removed."
-  );
-  ok(
-    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    "Recent cookie was removed."
-  );
-
-  // Cache does not support |since| and deletes everything!
-  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
-  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
-  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
-
-  // Clear cache and cookies with an old since value.
-  await setUpCookies();
-  await setUpCache();
-  extension.sendMessage({ since: since - 100000 });
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  // Cache does not support |since| and deletes everything!
-  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
-  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
-  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
-
-  ok(
-    !Services.cookies.cookieExists(
-      oldCookie.host,
-      oldCookie.path,
-      oldCookie.name,
-      {}
-    ),
-    "Old cookie was removed."
-  );
-  ok(
-    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    "Recent cookie was removed."
-  );
-
-  // Clear cache and cookies with hostnames value.
-  await setUpCookies();
-  await setUpCache();
-  extension.sendMessage({
-    hostnames: ["example.net", "example.org", "unknown.com"],
-  });
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  ok(
-    Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    `Cookie ${COOKIE.name}  was not removed.`
-  );
-  ok(
-    !Services.cookies.cookieExists(
-      COOKIE_NET.host,
-      COOKIE_NET.path,
-      COOKIE_NET.name,
-      {}
-    ),
-    `Cookie ${COOKIE_NET.name}  was removed.`
-  );
-  ok(
-    !Services.cookies.cookieExists(
-      COOKIE_ORG.host,
-      COOKIE_ORG.path,
-      COOKIE_ORG.name,
-      {}
-    ),
-    `Cookie ${COOKIE_ORG.name}  was removed.`
-  );
-
-  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
-  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
-  ok(hasCacheEntry("example.com"), "example.com cache was not removed");
-
-  // Clear cache and cookies with (empty) hostnames value.
-  await setUpCookies();
-  await setUpCache();
-  extension.sendMessage({ hostnames: [] });
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  ok(
-    Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    `Cookie ${COOKIE.name}  was not removed.`
-  );
-  ok(
-    Services.cookies.cookieExists(
-      COOKIE_NET.host,
-      COOKIE_NET.path,
-      COOKIE_NET.name,
-      {}
-    ),
-    `Cookie ${COOKIE_NET.name}  was not removed.`
-  );
-  ok(
-    Services.cookies.cookieExists(
-      COOKIE_ORG.host,
-      COOKIE_ORG.path,
-      COOKIE_ORG.name,
-      {}
-    ),
-    `Cookie ${COOKIE_ORG.name}  was not removed.`
-  );
-
-  ok(hasCacheEntry("example.net"), "example.net cache was not removed");
-  ok(hasCacheEntry("example.org"), "example.org cache was not removed");
-  ok(hasCacheEntry("example.com"), "example.com cache was not removed");
-
-  // Clear cache and cookies with both hostnames and since values.
-  await setUpCache();
-  await setUpCookies();
-  extension.sendMessage({ hostnames: ["example.com"], since });
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  ok(
-    Services.cookies.cookieExists(
-      oldCookie.host,
-      oldCookie.path,
-      oldCookie.name,
-      {}
-    ),
-    "Old cookie was not removed."
-  );
-  ok(
-    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    "Recent cookie was removed."
-  );
-  ok(
-    Services.cookies.cookieExists(
-      COOKIE_NET.host,
-      COOKIE_NET.path,
-      COOKIE_NET.name,
-      {}
-    ),
-    "Cookie with different hostname was not removed"
-  );
-  ok(
-    Services.cookies.cookieExists(
-      COOKIE_ORG.host,
-      COOKIE_ORG.path,
-      COOKIE_ORG.name,
-      {}
-    ),
-    "Cookie with different hostname was not removed"
-  );
-
-  ok(hasCacheEntry("example.net"), "example.net cache was not removed");
-  ok(hasCacheEntry("example.org"), "example.org cache was not removed");
-  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
-
-  // Clear cache and cookies with no since or hostnames value.
-  await setUpCache();
-  await setUpCookies();
-  extension.sendMessage({});
-  await extension.awaitMessage("cacheAndCookiesRemoved");
-
-  ok(
-    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
-    `Cookie ${COOKIE.name}  was removed.`
-  );
-  ok(
-    !Services.cookies.cookieExists(
-      oldCookie.host,
-      oldCookie.path,
-      oldCookie.name,
-      {}
-    ),
-    `Cookie ${oldCookie.name}  was removed.`
-  );
-  ok(
-    !Services.cookies.cookieExists(
-      COOKIE_NET.host,
-      COOKIE_NET.path,
-      COOKIE_NET.name,
-      {}
-    ),
-    `Cookie ${COOKIE_NET.name}  was removed.`
-  );
-  ok(
-    !Services.cookies.cookieExists(
-      COOKIE_ORG.host,
-      COOKIE_ORG.path,
-      COOKIE_ORG.name,
-      {}
-    ),
-    `Cookie ${COOKIE_ORG.name}  was removed.`
-  );
-
-  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
-  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
-  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
-
-  await extension.unload();
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js
--- firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-"use strict";
-
-// "Normal" cookie
-const COOKIE_NORMAL = {
-  host: "example.com",
-  name: "test_cookie",
-  path: "/",
-  originAttributes: {},
-};
-// Private browsing cookie
-const COOKIE_PRIVATE = {
-  host: "example.net",
-  name: "test_cookie",
-  path: "/",
-  originAttributes: {
-    privateBrowsingId: 1,
-  },
-};
-// "firefox-container-1" cookie
-const COOKIE_CONTAINER = {
-  host: "example.org",
-  name: "test_cookie",
-  path: "/",
-  originAttributes: {
-    userContextId: 1,
-  },
-};
-
-function cookieExists(cookie) {
-  return Services.cookies.cookieExists(
-    cookie.host,
-    cookie.path,
-    cookie.name,
-    cookie.originAttributes
-  );
-}
-
-function addCookie(cookie) {
-  const THE_FUTURE = Date.now() + 5 * 60;
-
-  Services.cookies.add(
-    cookie.host,
-    cookie.path,
-    cookie.name,
-    "test",
-    false,
-    false,
-    false,
-    THE_FUTURE,
-    cookie.originAttributes,
-    Ci.nsICookie.SAMESITE_NONE,
-    Ci.nsICookie.SCHEME_HTTPS
-  );
-
-  ok(cookieExists(cookie), `Cookie ${cookie.name} was created.`);
-}
-
-async function setUpCookies() {
-  Services.cookies.removeAll();
-
-  addCookie(COOKIE_NORMAL);
-  addCookie(COOKIE_PRIVATE);
-  addCookie(COOKIE_CONTAINER);
-}
-
-add_task(async function testCookies() {
-  Services.prefs.setBoolPref("privacy.userContext.enabled", true);
-
-  function background() {
-    browser.test.onMessage.addListener(async (msg, options) => {
-      if (msg == "removeCookies") {
-        await browser.browsingData.removeCookies(options);
-      } else {
-        await browser.browsingData.remove(options, { cookies: true });
-      }
-      browser.test.sendMessage("cookiesRemoved");
-    });
-  }
-
-  let extension = ExtensionTestUtils.loadExtension({
-    background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  });
-
-  async function testRemovalMethod(method) {
-    // Clear only "normal"/default cookies.
-    await setUpCookies();
-
-    extension.sendMessage(method, { cookieStoreId: "firefox-default" });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(!cookieExists(COOKIE_NORMAL), "Normal cookie was removed");
-    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-
-    // Clear container cookie
-    await setUpCookies();
-
-    extension.sendMessage(method, { cookieStoreId: "firefox-container-1" });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
-    ok(!cookieExists(COOKIE_CONTAINER), "Container cookie was removed");
-
-    // Clear private cookie
-    await setUpCookies();
-
-    extension.sendMessage(method, { cookieStoreId: "firefox-private" });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-
-    // Clear container cookie with correct hostname
-    await setUpCookies();
-
-    extension.sendMessage(method, {
-      cookieStoreId: "firefox-container-1",
-      hostnames: ["example.org"],
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
-    ok(!cookieExists(COOKIE_CONTAINER), "Container cookie was removed");
-
-    // Clear container cookie with incorrect hostname; nothing is removed
-    await setUpCookies();
-
-    extension.sendMessage(method, {
-      cookieStoreId: "firefox-container-1",
-      hostnames: ["example.com"],
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-
-    // Clear private cookie with correct hostname
-    await setUpCookies();
-
-    extension.sendMessage(method, {
-      cookieStoreId: "firefox-private",
-      hostnames: ["example.net"],
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-
-    // Clear private cookie with incorrect hostname; nothing is removed
-    await setUpCookies();
-
-    extension.sendMessage(method, {
-      cookieStoreId: "firefox-private",
-      hostnames: ["example.com"],
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-
-    // Clear private cookie by hostname
-    await setUpCookies();
-
-    extension.sendMessage(method, {
-      hostnames: ["example.net"],
-    });
-    await extension.awaitMessage("cookiesRemoved");
-
-    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
-    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
-    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
-  }
-
-  await extension.startup();
-
-  await testRemovalMethod("removeCookies");
-  await testRemovalMethod("remove");
-
-  await extension.unload();
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData.js firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData.js
--- firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-add_task(async function testInvalidArguments() {
-  async function background() {
-    const UNSUPPORTED_DATA_TYPES = ["appcache", "fileSystems", "webSQL"];
-
-    await browser.test.assertRejects(
-      browser.browsingData.remove(
-        { originTypes: { protectedWeb: true } },
-        { cookies: true }
-      ),
-      "Firefox does not support protectedWeb or extension as originTypes.",
-      "Expected error received when using protectedWeb originType."
-    );
-
-    await browser.test.assertRejects(
-      browser.browsingData.removeCookies({ originTypes: { extension: true } }),
-      "Firefox does not support protectedWeb or extension as originTypes.",
-      "Expected error received when using extension originType."
-    );
-
-    for (let dataType of UNSUPPORTED_DATA_TYPES) {
-      let dataTypes = {};
-      dataTypes[dataType] = true;
-      browser.test.assertThrows(
-        () => browser.browsingData.remove({}, dataTypes),
-        /Type error for parameter dataToRemove/,
-        `Expected error received when using ${dataType} dataType.`
-      );
-    }
-
-    browser.test.notifyPass("invalidArguments");
-  }
-
-  let extensionData = {
-    background: background,
-    manifest: {
-      permissions: ["browsingData"],
-    },
-  };
-
-  let extension = ExtensionTestUtils.loadExtension(extensionData);
-  await extension.startup();
-  await extension.awaitFinish("invalidArguments");
-  await extension.unload();
-});
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_passwords.js firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_passwords.js
--- firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_passwords.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/xpcshell/test_ext_browsingData_passwords.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,7 +38,7 @@
 }
 
 async function setupPasswords() {
-  loginManager.removeAllLogins();
+  loginManager.removeAllUserFacingLogins();
   addLogin(FXA_HOST, REFERENCE_DATE);
   addLogin(NEW_HOST, REFERENCE_DATE);
   addLogin(OLD_HOST, REFERENCE_DATE - 10000);
diff -Nru firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/xpcshell.ini firefox-85.0+build1/browser/components/extensions/test/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/browser/components/extensions/test/xpcshell/xpcshell.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/extensions/test/xpcshell/xpcshell.ini	2021-01-18 19:58:08.000000000 +0000
@@ -5,9 +5,6 @@
 dupe-manifest =
 
 [test_ext_bookmarks.js]
-[test_ext_browsingData.js]
-[test_ext_browsingData_cookies_cache.js]
-[test_ext_browsingData_cookies_cookieStoreId.js]
 [test_ext_browsingData_downloads.js]
 [test_ext_browsingData_passwords.js]
 skip-if = tsan # Times out, bug 1612707
diff -Nru firefox-84.0.2+build1/browser/components/migration/MSMigrationUtils.jsm firefox-85.0+build1/browser/components/migration/MSMigrationUtils.jsm
--- firefox-84.0.2+build1/browser/components/migration/MSMigrationUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/migration/MSMigrationUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -769,11 +769,17 @@
   ].createInstance(Ci.nsIWindowsRegKey);
   let cTypes = new CtypesKernelHelpers();
   try {
-    typedURLKey.open(
-      Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
-      registryKeyPath + "\\TypedURLs",
-      Ci.nsIWindowsRegKey.ACCESS_READ
-    );
+    try {
+      typedURLKey.open(
+        Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
+        registryKeyPath + "\\TypedURLs",
+        Ci.nsIWindowsRegKey.ACCESS_READ
+      );
+    } catch (ex) {
+      // Ignore errors opening this registry key - if it doesn't work, there's
+      // no way we can get useful info here.
+      return typedURLs;
+    }
     try {
       typedURLTimeKey.open(
         Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
diff -Nru firefox-84.0.2+build1/browser/components/migration/tests/unit/test_Chrome_passwords_emptySource.js firefox-85.0+build1/browser/components/migration/tests/unit/test_Chrome_passwords_emptySource.js
--- firefox-84.0.2+build1/browser/components/migration/tests/unit/test_Chrome_passwords_emptySource.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/migration/tests/unit/test_Chrome_passwords_emptySource.js	2021-01-18 19:58:08.000000000 +0000
@@ -50,7 +50,7 @@
   }
 
   registerCleanupFunction(() => {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/components/migration/tests/unit/test_Chrome_passwords.js firefox-85.0+build1/browser/components/migration/tests/unit/test_Chrome_passwords.js
--- firefox-84.0.2+build1/browser/components/migration/tests/unit/test_Chrome_passwords.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/migration/tests/unit/test_Chrome_passwords.js	2021-01-18 19:58:08.000000000 +0000
@@ -272,7 +272,7 @@
   }
 
   registerCleanupFunction(() => {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     if (loginCrypto.finalize) {
       loginCrypto.finalize();
     }
@@ -327,7 +327,7 @@
     "Sanity check the source exists"
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   let logins = Services.logins.getAllLogins();
   Assert.equal(
     logins.length,
diff -Nru firefox-84.0.2+build1/browser/components/migration/tests/unit/test_IE7_passwords.js firefox-85.0+build1/browser/components/migration/tests/unit/test_IE7_passwords.js
--- firefox-84.0.2+build1/browser/components/migration/tests/unit/test_IE7_passwords.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/migration/tests/unit/test_IE7_passwords.js	2021-01-18 19:58:08.000000000 +0000
@@ -1293,7 +1293,7 @@
   let hashes = []; // the hashes of all migrator websites, this is going to be used for the clean up
 
   registerCleanupFunction(() => {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     logins = Services.logins.getAllLogins();
     Assert.equal(logins.length, 0, "There are no logins after the cleanup");
     // remove all the values created in this test from the registry
diff -Nru firefox-84.0.2+build1/browser/components/newtab/AboutNewTabService.jsm firefox-85.0+build1/browser/components/newtab/AboutNewTabService.jsm
--- firefox-84.0.2+build1/browser/components/newtab/AboutNewTabService.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/AboutNewTabService.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -93,6 +93,19 @@
   CACHE_REQUEST_MESSAGE: "AboutHomeStartupCache:CacheRequest",
   CACHE_RESPONSE_MESSAGE: "AboutHomeStartupCache:CacheResponse",
   CACHE_USAGE_RESULT_MESSAGE: "AboutHomeStartupCache:UsageResult",
+  STATES: {
+    UNAVAILABLE: 0,
+    UNCONSUMED: 1,
+    PAGE_CONSUMED: 2,
+    PAGE_AND_SCRIPT_CONSUMED: 3,
+    FAILED: 4,
+  },
+  REQUEST_TYPE: {
+    PAGE: 0,
+    SCRIPT: 1,
+  },
+  _state: 0,
+  _consumerBCID: null,
 
   /**
    * Called via a process script very early on in the process lifetime. This
@@ -129,6 +142,7 @@
     this._pageInputStream = pageInputStream;
     this._scriptInputStream = scriptInputStream;
     this._initted = true;
+    this.setState(this.STATES.UNCONSUMED);
   },
 
   /**
@@ -159,6 +173,8 @@
     this._pageInputStream = null;
     this._scriptInputStream = null;
     this._initted = false;
+    this._state = this.STATES.UNAVAILABLE;
+    this._consumerBCID = null;
   },
 
   /**
@@ -166,12 +182,15 @@
    * return an nsIChannel for a cached about:home document that we
    * were initialized with. If we failed to be initted with the
    * cache, or the input streams that we were sent have no data
-   * yet available, this function returns null. The caller should =
+   * yet available, this function returns null. The caller should
    * fall back to generating the page dynamically.
    *
    * This function will be called when loading about:home, or
    * about:home?jscache - the latter returns the cached script.
    *
+   * It is expected that the same BrowsingContext that loads the cached
+   * page will also load the cached script.
+   *
    * @param uri (nsIURI)
    *   The URI for the requested page, as passed by nsIAboutNewTabService.
    * @param loadInfo (nsILoadInfo)
@@ -184,7 +203,27 @@
       return null;
     }
 
-    let isScriptRequest = uri.query === "jscache";
+    if (this._state >= this.STATES.PAGE_AND_SCRIPT_CONSUMED) {
+      return null;
+    }
+
+    let requestType =
+      uri.query === "jscache"
+        ? this.REQUEST_TYPE.SCRIPT
+        : this.REQUEST_TYPE.PAGE;
+
+    // If this is a page request, then we need to be in the UNCONSUMED state,
+    // since we expect the page request to come first. If this is a script
+    // request, we expect to be in PAGE_CONSUMED state, since the page cache
+    // stream should he been consumed already.
+    if (
+      (requestType === this.REQUEST_TYPE.PAGE &&
+        this._state !== this.STATES.UNCONSUMED) ||
+      (requestType === this.REQUEST_TYPE_SCRIPT &&
+        this._state !== this.STATES.PAGE_CONSUMED)
+    ) {
+      return null;
+    }
 
     // If by this point, we don't have anything in the streams,
     // then either the cache was too slow to give us data, or the cache
@@ -194,16 +233,18 @@
     // We only do this on the page request, because by the time
     // we get to the script request, we should have already drained
     // the page input stream.
-    if (!isScriptRequest) {
+    if (requestType === this.REQUEST_TYPE.PAGE) {
       try {
         if (
           !this._scriptInputStream.available() ||
           !this._pageInputStream.available()
         ) {
+          this.setState(this.STATES.FAILED);
           this.reportUsageResult(false /* success */);
           return null;
         }
       } catch (e) {
+        this.setState(this.STATES.FAILED);
         if (e.result === Cr.NS_BASE_STREAM_CLOSED) {
           this.reportUsageResult(false /* success */);
           return null;
@@ -212,17 +253,37 @@
       }
     }
 
+    if (
+      requestType === this.REQUEST_TYPE.SCRIPT &&
+      this._consumerBCID !== loadInfo.browsingContextID
+    ) {
+      // Some other document is somehow requesting the script - one
+      // that didn't originally request the page. This is not allowed.
+      this.setState(this.STATES.FAILED);
+      return null;
+    }
+
     let channel = Cc[
       "@mozilla.org/network/input-stream-channel;1"
     ].createInstance(Ci.nsIInputStreamChannel);
     channel.QueryInterface(Ci.nsIChannel);
     channel.setURI(uri);
     channel.loadInfo = loadInfo;
-    channel.contentStream = isScriptRequest
-      ? this._scriptInputStream
-      : this._pageInputStream;
-
-    this.reportUsageResult(true /* success */);
+    channel.contentStream =
+      requestType === this.REQUEST_TYPE.PAGE
+        ? this._pageInputStream
+        : this._scriptInputStream;
+
+    if (requestType === this.REQUEST_TYPE.SCRIPT) {
+      this.setState(this.STATES.PAGE_AND_SCRIPT_CONSUMED);
+      this.reportUsageResult(true /* success */);
+    } else {
+      this.setState(this.STATES.PAGE_CONSUMED);
+      // Stash the BrowsingContext ID so that when the script stream
+      // attempts to be consumed, we ensure that it's from the same
+      // BrowsingContext that loaded the page.
+      this._consumerBCID = loadInfo.browsingContextID;
+    }
 
     return channel;
   },
@@ -303,6 +364,25 @@
       this._cacheWorker = null;
     }
   },
+
+  /**
+   * Transitions the AboutHomeStartupCacheChild from one state
+   * to the next, where each state is defined in this.STATES.
+   *
+   * States can only be transitioned in increasing order, otherwise
+   * an error is logged.
+   */
+  setState(state) {
+    if (state > this._state) {
+      this._state = state;
+    } else {
+      console.error(
+        "AboutHomeStartupCacheChild could not transition from state " +
+          `${this._state} to ${state}`,
+        new Error().stack
+      );
+    }
+  },
 };
 
 /**
diff -Nru firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm firefox-85.0+build1/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm
--- firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -130,6 +130,11 @@
     };
 
     listener.onLocationChange = (aWebProgress, aRequest, aLocation, aFlags) => {
+      // Exit if actor 'AboutWelcome' has already been destroyed or
+      // content window doesn't exist
+      if (!this.manager || !this.contentWindow) {
+        return;
+      }
       log.debug(`onLocationChange handled: ${aWebProgress.DOMWindow}`);
       this.AWSendToParent("LOCATION_CHANGED");
     };
diff -Nru firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js firefox-85.0+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js
--- firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js	2021-01-18 19:58:08.000000000 +0000
@@ -377,7 +377,7 @@
     })();
   }, [metricsFlowUri]); // Transition to next screen, opening about:home on last screen button CTA
 
-  const handleTransition = index < props.screens.length ? Object(react__WEBPACK_IMPORTED_MODULE_0__["useCallback"])(() => setScreenIndex(prevState => prevState + 1), []) : _lib_aboutwelcome_utils__WEBPACK_IMPORTED_MODULE_3__["AboutWelcomeUtils"].handleUserAction({
+  const handleTransition = index < props.screens.length - 1 ? () => setScreenIndex(prevState => prevState + 1) : () => _lib_aboutwelcome_utils__WEBPACK_IMPORTED_MODULE_3__["AboutWelcomeUtils"].handleUserAction({
     type: "OPEN_ABOUT_PAGE",
     data: {
       args: "home",
@@ -404,7 +404,7 @@
   }, []);
   const useImportable = props.message_id.includes("IMPORTABLE"); // Track whether we have already sent the importable sites impression telemetry
 
-  const [importTelemetrySent, setImportTelemetrySent] = Object(react__WEBPACK_IMPORTED_MODULE_0__["useState"])(null);
+  const importTelemetrySent = Object(react__WEBPACK_IMPORTED_MODULE_0__["useRef"])(false);
   const [topSites, setTopSites] = Object(react__WEBPACK_IMPORTED_MODULE_0__["useState"])([]);
   Object(react__WEBPACK_IMPORTED_MODULE_0__["useEffect"])(() => {
     (async () => {
@@ -412,12 +412,12 @@
       const importable = JSON.parse((await window.AWGetImportableSites()));
       const showImportable = useImportable && importable.length >= 5;
 
-      if (!importTelemetrySent) {
+      if (!importTelemetrySent.current) {
         _lib_aboutwelcome_utils__WEBPACK_IMPORTED_MODULE_3__["AboutWelcomeUtils"].sendImpressionTelemetry(`${props.message_id}_SITES`, {
           display: showImportable ? "importable" : "static",
           importable: importable.length
         });
-        setImportTelemetrySent(true);
+        importTelemetrySent.current = true;
       }
 
       setTopSites(showImportable ? {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.css firefox-85.0+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.css
--- firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/aboutwelcome/content/aboutwelcome.css	2021-01-18 19:58:08.000000000 +0000
@@ -458,15 +458,13 @@
     .onboardingContainer .tiles-media-section .media {
       height: 390px;
       width: 800px; }
-    @media (prefers-reduced-motion) {
-      .onboardingContainer .tiles-media-section {
-        height: 200px;
-        width: 800px;
-        margin: 0; }
-        .onboardingContainer .tiles-media-section.privacy {
-          background: top no-repeat url("chrome://activity-stream/content/data/content/assets/firefox-protections.svg"); }
-        .onboardingContainer .tiles-media-section .media {
-          opacity: 0; } }
+    .onboardingContainer .tiles-media-section.privacy {
+      background: top no-repeat url("chrome://activity-stream/content/data/content/assets/firefox-protections.svg");
+      height: 200px;
+      width: 800px;
+      margin: 0; }
+      .onboardingContainer .tiles-media-section.privacy.media {
+        opacity: 0; }
   .onboardingContainer button {
     font-family: inherit;
     cursor: pointer;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm firefox-85.0+build1/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm
--- firefox-84.0.2+build1/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/aboutwelcome/lib/AboutWelcomeTelemetry.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -13,6 +13,7 @@
   ClientID: "resource://gre/modules/ClientID.jsm",
   Services: "resource://gre/modules/Services.jsm",
   TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
+  AttributionCode: "resource:///modules/AttributionCode.jsm",
 });
 XPCOMUtils.defineLazyServiceGetters(this, {
   gUUIDGenerator: ["@mozilla.org/uuid-generator;1", "nsIUUIDGenerator"],
@@ -65,6 +66,26 @@
     return `${structuredIngestionEndpointBase}/${extension}`;
   }
 
+  /**
+   * Attach browser attribution data to a ping payload.
+   *
+   * It intentionally queries the *cached* attribution data other than calling
+   * `getAttrDataAsync()` in order to minimize the overhead here.
+   * For the same reason, we are not querying the attribution data from
+   * `TelemetryEnvironment.currentEnvironment.settings`.
+   *
+   * In practice, it's very likely that the attribution data is already read
+   * and cached at some point by `AboutWelcomeParent`, so it should be able to
+   * read the cached results for the most if not all of the pings.
+   */
+  _maybeAttachAttribution(ping) {
+    const attribution = AttributionCode.getCachedAttributionData();
+    if (attribution && Object.keys(attribution).length) {
+      ping.attribution = attribution;
+    }
+    return ping;
+  }
+
   async _createPing(event) {
     if (event.event_context && typeof event.event_context === "object") {
       event.event_context = JSON.stringify(event.event_context);
@@ -77,7 +98,7 @@
       browser_session_id: browserSessionId,
     };
 
-    return ping;
+    return this._maybeAttachAttribution(ping);
   }
 
   async sendTelemetry(event) {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/actors/ASRouterChild.jsm firefox-85.0+build1/browser/components/newtab/actors/ASRouterChild.jsm
--- firefox-84.0.2+build1/browser/components/newtab/actors/ASRouterChild.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/actors/ASRouterChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -9,17 +9,12 @@
 const { MESSAGE_TYPE_LIST, MESSAGE_TYPE_HASH: msg } = ChromeUtils.import(
   "resource://activity-stream/common/ActorConstants.jsm"
 );
-const { ASRouterTelemetry } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouterTelemetry.jsm"
-);
-
 const VALID_TYPES = new Set(MESSAGE_TYPE_LIST);
 
 class ASRouterChild extends JSWindowActorChild {
   constructor() {
     super();
     this.observers = new Set();
-    this.telemetry = new ASRouterTelemetry({ isParentProcess: false });
   }
 
   didDestroy() {
@@ -92,15 +87,6 @@
   asRouterMessage({ type, data }) {
     if (VALID_TYPES.has(type)) {
       switch (type) {
-        // these messages are telemetry and can be done client side
-        case msg.AS_ROUTER_TELEMETRY_USER_EVENT:
-        case msg.TOOLBAR_BADGE_TELEMETRY:
-        case msg.TOOLBAR_PANEL_TELEMETRY:
-        case msg.MOMENTS_PAGE_TELEMETRY:
-        case msg.DOORHANGER_TELEMETRY: {
-          return this.telemetry.sendTelemetry({ type, data });
-        }
-        // these messages don't need a repsonse
         case msg.DISABLE_PROVIDER:
         case msg.ENABLE_PROVIDER:
         case msg.EXPIRE_QUERY_CACHE:
diff -Nru firefox-84.0.2+build1/browser/components/newtab/bin/render-activity-stream-html.js firefox-85.0+build1/browser/components/newtab/bin/render-activity-stream-html.js
--- firefox-84.0.2+build1/browser/components/newtab/bin/render-activity-stream-html.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/bin/render-activity-stream-html.js	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,6 @@
     <link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
     <div id="root"></div>
     <div id="footer-asrouter-container" role="presentation"></div>${
       options.noscripts ? "" : scriptRender
diff -Nru firefox-84.0.2+build1/browser/components/newtab/common/Actions.jsm firefox-85.0+build1/browser/components/newtab/common/Actions.jsm
--- firefox-84.0.2+build1/browser/components/newtab/common/Actions.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/common/Actions.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -138,7 +138,6 @@
   "SUBMIT_SIGNIN",
   "SYSTEM_TICK",
   "TELEMETRY_IMPRESSION_STATS",
-  "TELEMETRY_PERFORMANCE_EVENT",
   "TELEMETRY_UNDESIRED_EVENT",
   "TELEMETRY_USER_EVENT",
   "TOP_SITES_CANCEL_EDIT",
@@ -335,21 +334,6 @@
 }
 
 /**
- * PerfEvent - A telemetry ping indicating a performance-related event.
- *
- * @param  {object} data Fields to include in the ping (value, etc.)
- * @param  {int} importContext (For testing) Override the import context for testing.
- * @return {object} An action. For UI code, a AlsoToMain action.
- */
-function PerfEvent(data, importContext = globalImportContext) {
-  const action = {
-    type: actionTypes.TELEMETRY_PERFORMANCE_EVENT,
-    data,
-  };
-  return importContext === UI_CODE ? AlsoToMain(action) : action;
-}
-
-/**
  * ImpressionStats - A telemetry ping indicating an impression stats.
  *
  * @param  {object} data Fields to include in the ping
@@ -422,7 +406,6 @@
   UserEvent,
   ASRouterUserEvent,
   UndesiredEvent,
-  PerfEvent,
   ImpressionStats,
   AlsoToOneContent,
   OnlyToOneContent,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss firefox-85.0+build1/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss	2021-01-18 19:58:08.000000000 +0000
@@ -525,6 +525,17 @@
     }
   }
 
+  // "tiles-media-section" styles here will support tiles of type 
+  // "video" when the screen JSON it set in the below format:
+
+  // "tiles": {
+  //   "type": "video",
+  //   "source": {
+  //     "default" : "<media-file-uri>",
+  //     "dark" : "<media-file-dark-mode-uri>"
+  //   }
+  // }
+
   .tiles-media-section {
     align-self: center;
     position: relative;
@@ -543,16 +554,13 @@
       width: 800px;
     }
 
-    @media (prefers-reduced-motion) {
+    &.privacy {
+      background: top no-repeat url('chrome://activity-stream/content/data/content/assets/firefox-protections.svg');
       height: 200px;
       width: 800px;
       margin: 0;
 
-      &.privacy {
-        background: top no-repeat url('chrome://activity-stream/content/data/content/assets/firefox-protections.svg');
-      }
-
-      .media {
+      &.media {
         opacity: 0;
       }
     }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx firefox-85.0+build1/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx	2021-01-18 19:58:08.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/. */
 
-import React, { useState, useCallback, useEffect } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import { Localized } from "./MSLocalized";
 import { Zap } from "./Zap";
 import { AboutWelcomeUtils } from "../../lib/aboutwelcome-utils";
@@ -53,12 +53,13 @@
 
   // Transition to next screen, opening about:home on last screen button CTA
   const handleTransition =
-    index < props.screens.length
-      ? useCallback(() => setScreenIndex(prevState => prevState + 1), [])
-      : AboutWelcomeUtils.handleUserAction({
-          type: "OPEN_ABOUT_PAGE",
-          data: { args: "home", where: "current" },
-        });
+    index < props.screens.length - 1
+      ? () => setScreenIndex(prevState => prevState + 1)
+      : () =>
+          AboutWelcomeUtils.handleUserAction({
+            type: "OPEN_ABOUT_PAGE",
+            data: { args: "home", where: "current" },
+          });
 
   // Update top sites with default sites by region when region is available
   const [region, setRegion] = useState(null);
@@ -82,19 +83,19 @@
 
   const useImportable = props.message_id.includes("IMPORTABLE");
   // Track whether we have already sent the importable sites impression telemetry
-  const [importTelemetrySent, setImportTelemetrySent] = useState(null);
+  const importTelemetrySent = useRef(false);
   const [topSites, setTopSites] = useState([]);
   useEffect(() => {
     (async () => {
       let DEFAULT_SITES = await window.AWGetDefaultSites();
       const importable = JSON.parse(await window.AWGetImportableSites());
       const showImportable = useImportable && importable.length >= 5;
-      if (!importTelemetrySent) {
+      if (!importTelemetrySent.current) {
         AboutWelcomeUtils.sendImpressionTelemetry(`${props.message_id}_SITES`, {
           display: showImportable ? "importable" : "static",
           importable: importable.length,
         });
-        setImportTelemetrySent(true);
+        importTelemetrySent.current = true;
       }
       setTopSites(
         showImportable
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/asrouter-content.jsx firefox-85.0+build1/browser/components/newtab/content-src/asrouter/asrouter-content.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/asrouter-content.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/asrouter-content.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -12,9 +12,7 @@
 import React from "react";
 import ReactDOM from "react-dom";
 import { SnippetsTemplates } from "./templates/template-manifest";
-import { FirstRun } from "./templates/FirstRun/FirstRun";
 
-const TEMPLATES_ABOVE_PAGE = ["extended_triplets"];
 const TEMPLATES_BELOW_SEARCH = ["simple_below_search_snippet"];
 
 // Note: nextProps/prevProps refer to props passed to <ImpressionsWrapper />, not <ASRouterUISurface />
@@ -40,9 +38,6 @@
 
     this.state = { message: {} };
     if (props.document) {
-      this.headerPortal = props.document.getElementById(
-        "header-asrouter-container"
-      );
       this.footerPortal = props.document.getElementById(
         "footer-asrouter-container"
       );
@@ -169,16 +164,6 @@
   }
 
   clearMessage(id) {
-    // Request new set of dynamic triplet cards when click on a card CTA clear
-    // message and 'id' matches one of the cards in message bundle
-    if (
-      this.state.message &&
-      this.state.message.bundle &&
-      this.state.message.bundle.find(card => card.id === id)
-    ) {
-      this.requestMessage();
-    }
-
     if (id === this.state.message.id) {
       this.setState({ message: {} });
     }
@@ -323,35 +308,6 @@
     );
   }
 
-  renderFirstRun() {
-    const { message } = this.state;
-    if (TEMPLATES_ABOVE_PAGE.includes(message.template)) {
-      return (
-        <ImpressionsWrapper
-          id="FIRST_RUN"
-          message={this.state.message}
-          sendImpression={this.sendImpression}
-          shouldSendImpressionOnUpdate={shouldSendImpressionOnUpdate}
-          // This helps with testing
-          document={this.props.document}
-        >
-          <FirstRun
-            document={this.props.document}
-            message={message}
-            sendUserActionTelemetry={this.sendUserActionTelemetry}
-            executeAction={ASRouterUtils.executeAction}
-            onBlockById={ASRouterUtils.blockById}
-            onDismiss={this.onDismiss}
-            fxaEndpoint={this.props.fxaEndpoint}
-            appUpdateChannel={this.props.appUpdateChannel}
-            fetchFlowParams={this.fetchFlowParams}
-          />
-        </ImpressionsWrapper>
-      );
-    }
-    return null;
-  }
-
   render() {
     const { message } = this.state;
     if (!message.id) {
@@ -360,9 +316,6 @@
     const shouldRenderBelowSearch = TEMPLATES_BELOW_SEARCH.includes(
       message.template
     );
-    const shouldRenderInHeader = TEMPLATES_ABOVE_PAGE.includes(
-      message.template
-    );
 
     return shouldRenderBelowSearch ? (
       // Render special below search snippets in place;
@@ -370,15 +323,14 @@
         {this.renderSnippets()}
       </div>
     ) : (
-      // For onboarding, regular snippets etc. we should render
-      // everything in our footer container.
+      // For regular snippets etc. we should render everything in our footer
+      // container.
       ReactDOM.createPortal(
         <>
           {this.renderPreviewBanner()}
-          {this.renderFirstRun()}
           {this.renderSnippets()}
         </>,
-        shouldRenderInHeader ? this.headerPortal : this.footerPortal
+        this.footerPortal
       )
     );
   }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx firefox-85.0+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -21,24 +21,11 @@
   componentWillMount() {
     this.props.document.addEventListener("keydown", this.onKeyDown);
     this.props.document.body.classList.add("modal-open");
-    this.header = this.props.document.getElementById(
-      "header-asrouter-container"
-    );
-
-    if (this.header) {
-      this.props.document.getElementById("root").classList.add("modal-height");
-    }
   }
 
   componentWillUnmount() {
     this.props.document.removeEventListener("keydown", this.onKeyDown);
     this.props.document.body.classList.remove("modal-open");
-
-    if (this.header) {
-      this.props.document
-        .getElementById("root")
-        .classList.remove("modal-height");
-    }
   }
 
   render() {
@@ -59,13 +46,6 @@
           id={props.id}
           role="dialog"
         >
-          {props.hasDismissIcon && (
-            <button
-              className="icon icon-dismiss"
-              onClick={props.onClose}
-              data-l10n-id="onboarding-cards-dismiss"
-            />
-          )}
           {props.children}
         </div>
       </div>
@@ -74,24 +54,3 @@
 }
 
 ModalOverlayWrapper.defaultProps = { document: global.document };
-
-export class ModalOverlay extends React.PureComponent {
-  render() {
-    const { title, button_label } = this.props;
-    return (
-      <ModalOverlayWrapper onClose={this.props.onDismissBundle}>
-        <h2> {title} </h2>
-        {this.props.children}
-        <div className="footer">
-          <button
-            className="button primary modalButton"
-            onClick={this.props.onDismissBundle}
-          >
-            {" "}
-            {button_label}{" "}
-          </button>
-        </div>
-      </ModalOverlayWrapper>
-    );
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss firefox-85.0+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss	2021-01-18 19:58:08.000000000 +0000
@@ -23,12 +23,6 @@
   }
 }
 
-.modal-height {
-  // "Welcome header" has 40px of padding and 36px font size that get neglected using position absolute
-  // causing this to visually collide with the newtab searchbar
-  padding-top: 80px;
-}
-
 .modalOverlayInner {
   min-width: min-content;
   width: 100%;
@@ -54,23 +48,6 @@
     display: block;
   }
 
-  .icon-dismiss {
-    border: 0;
-    cursor: pointer;
-    inset-inline-end: 0;
-    padding: 20px;
-    fill: $white;
-    position: absolute;
-
-    &:hover {
-      background-color: $trailhead-purple;
-    }
-
-    &:focus {
-      border: 1px dotted;
-    }
-  }
-
   h2 {
     color: $grey-60;
     text-align: center;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/docs/first-run.md firefox-85.0+build1/browser/components/newtab/content-src/asrouter/docs/first-run.md
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/docs/first-run.md	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/docs/first-run.md	2021-01-18 19:58:08.000000000 +0000
@@ -7,16 +7,3 @@
 A full-page multistep experience that shows up on first run since Fx80 with browser.aboutwelcome.enabled pref as true.
 
 Setting browser.aboutwelcome.enabled to false make first run looks like about:newtab and hides about:welcome
-
-## Triplets
-The cards that show up above the new tab content on the first instance of new tab. Setting browser.aboutwelcome.enabled to false and trailhead.firstrun.newtab.triplets to one of values below hides multistage welcome and takes user straight to triplets on opening about:welcome page
-
-* supercharge - Shows Sync, Monitor and Mobile onboarding cards. Supported in 71+.
-* payoff - Shows Monitor, Facbook Container and Firefox Send onboarding cards. Supported in 71 only.
-* mutidevice - Shows Pocket, Send Tabs and Mobile onboarding cards. Supported in 71 only.
-* privacy - Shows Private Browsing, Tracking Protection and Lockwise. Supported in 71 only.
-
-In 72+
-* static - same experience as ‘supercharge’ triplet - with Sync, Monitor and Mobile onboarding cards
-* dynamic - Dynamic triplets showing three onboarding cards (Sync, Monitor and Private Browsing) that gets swapped with preselected list of cards that satisfies targeting rules. Preselected cards supported are Send Tab, Mobile and Lockwise.
-* dynamic_chrome - Dynamic triplets showing three onboarding cards (Chrome switchers, Sync and Monitor) that gets swapped with preselected list of cards that satisfies targeting rules. Preselected cards supported are Private Browsing, Send Tab, Mobile and Lockwise.
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md firefox-85.0+build1/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md	2021-01-18 19:58:08.000000000 +0000
@@ -28,7 +28,6 @@
 * [sync](#sync)
 * [topFrecentSites](#topfrecentsites)
 * [totalBookmarksCount](#totalbookmarkscount)
-* [trailheadTriplet](#trailheadtriplet)
 * [usesFirefoxSync](#usesfirefoxsync)
 * [isFxAEnabled](#isFxAEnabled)
 * [xpinstallEnabled](#xpinstallEnabled)
@@ -443,10 +442,6 @@
 declare const totalBookmarksCount: number;
 ```
 
-### `trailheadTriplet`
-
-(67.05+ only) Experiment branch for "triplet" study
-
 ### `usesFirefoxSync`
 
 Does the user use Firefox sync?
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/FirstRun.jsx	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +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/. */
-
-import React from "react";
-import { Triplets } from "./Triplets";
-import { BASE_PARAMS } from "./addUtmParams";
-
-// Note: should match the transition time on .trailheadCards in _Trailhead.scss
-const TRANSITION_LENGTH = 500;
-
-export const FLUENT_FILES = [
-  "branding/brand.ftl",
-  "browser/branding/brandings.ftl",
-  "browser/branding/sync-brand.ftl",
-  "browser/newtab/onboarding.ftl",
-];
-
-export const helpers = {
-  addFluent(document) {
-    FLUENT_FILES.forEach(file => {
-      const link = document.head.appendChild(document.createElement("link"));
-      link.href = file;
-      link.rel = "localization";
-    });
-  },
-};
-
-export class FirstRun extends React.PureComponent {
-  constructor(props) {
-    super(props);
-
-    this.didLoadFlowParams = false;
-
-    this.state = {
-      didUserClearTriplets: false,
-      flowParams: undefined,
-    };
-
-    this.closeTriplets = this.closeTriplets.bind(this);
-
-    helpers.addFluent(this.props.document);
-    // Update utm campaign parameters by appending channel for
-    // differentiating campaign in amplitude
-    if (this.props.appUpdateChannel) {
-      BASE_PARAMS.utm_campaign += `-${this.props.appUpdateChannel}`;
-    }
-  }
-
-  get UTMTerm() {
-    const { message } = this.props;
-    let UTMTerm = message.utm_term || "";
-
-    UTMTerm =
-      message.utm_term && message.trailheadTriplet
-        ? `${message.utm_term}-${message.trailheadTriplet}`
-        : UTMTerm;
-    return UTMTerm;
-  }
-
-  async fetchFlowParams() {
-    const { fxaEndpoint, fetchFlowParams } = this.props;
-
-    if (fxaEndpoint && this.UTMTerm && !this.didLoadFlowParams) {
-      this.didLoadFlowParams = true;
-      const flowParams = await fetchFlowParams({
-        ...BASE_PARAMS,
-        entrypoint: "activity-stream-firstrun",
-        form_type: "email",
-        utm_term: this.UTMTerm,
-      });
-      this.setState({ flowParams });
-    }
-  }
-
-  componentDidMount() {
-    this.fetchFlowParams();
-  }
-
-  componentDidUpdate() {
-    // In case we didn't have FXA info immediately, try again when we receive it.
-    this.fetchFlowParams();
-  }
-
-  closeTriplets() {
-    this.setState({ didUserClearTriplets: true });
-
-    // Closing triplets should prevent any future extended triplets from showing up
-    setTimeout(() => {
-      this.props.onBlockById("EXTENDED_TRIPLETS_1");
-    }, TRANSITION_LENGTH);
-  }
-
-  render() {
-    const { props, state, UTMTerm } = this;
-    const { sendUserActionTelemetry, executeAction, message } = props;
-
-    const { didUserClearTriplets, flowParams } = state;
-
-    const hasTriplets = Boolean(message.bundle && message.bundle.length);
-    const triplets = hasTriplets ? message.bundle : null;
-    const isTripletsContainerVisible = hasTriplets && !didUserClearTriplets;
-
-    // Allow 1) falsy to not render a header 2) default welcome header 3) custom header
-    const tripletsHeaderId =
-      message.tripletsHeaderId === undefined
-        ? "onboarding-welcome-header"
-        : message.tripletsHeaderId;
-
-    return (
-      <>
-        {hasTriplets ? (
-          <Triplets
-            document={props.document}
-            cards={triplets}
-            headerId={tripletsHeaderId}
-            showCardPanel={isTripletsContainerVisible}
-            hideContainer={this.closeTriplets}
-            sendUserActionTelemetry={sendUserActionTelemetry}
-            UTMTerm={`${UTMTerm}-card`}
-            flowParams={flowParams}
-            onAction={executeAction}
-            onBlockById={props.onBlockById}
-          />
-        ) : null}
-      </>
-    );
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/Triplets.jsx firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/Triplets.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/Triplets.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/Triplets.jsx	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +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/. */
-
-import React from "react";
-import { OnboardingCard } from "../../templates/OnboardingMessage/OnboardingMessage";
-import { addUtmParams } from "./addUtmParams";
-
-export class Triplets extends React.PureComponent {
-  constructor(props) {
-    super(props);
-    this.onCardAction = this.onCardAction.bind(this);
-    this.onHideContainer = this.onHideContainer.bind(this);
-  }
-
-  componentWillMount() {
-    global.document.body.classList.add("inline-onboarding");
-  }
-
-  componentWillUnmount() {
-    this.props.document.body.classList.remove("inline-onboarding");
-  }
-
-  onCardAction(action, message) {
-    let actionUpdates = {};
-    const { flowParams, UTMTerm } = this.props;
-
-    if (action.type === "OPEN_URL") {
-      let url = new URL(action.data.args);
-      addUtmParams(url, UTMTerm);
-
-      if (action.addFlowParams) {
-        url.searchParams.append("device_id", flowParams.deviceId);
-        url.searchParams.append("flow_id", flowParams.flowId);
-        url.searchParams.append("flow_begin_time", flowParams.flowBeginTime);
-      }
-
-      actionUpdates = { data: { ...action.data, args: url.toString() } };
-    }
-
-    this.props.onAction({ ...action, ...actionUpdates });
-    // Only block if message is in dynamic triplets experiment
-    if (message.blockOnClick) {
-      this.props.onBlockById(message.id, { preloadedOnly: true });
-    }
-  }
-
-  onHideContainer() {
-    const { sendUserActionTelemetry, cards, hideContainer } = this.props;
-    hideContainer();
-    sendUserActionTelemetry({
-      event: "DISMISS",
-      id: "onboarding-cards",
-      message_id: cards.map(m => m.id).join(","),
-      action: "onboarding_user_event",
-    });
-  }
-
-  render() {
-    const {
-      cards,
-      headerId,
-      showCardPanel,
-      sendUserActionTelemetry,
-    } = this.props;
-    return (
-      <div
-        className={`trailheadCards ${showCardPanel ? "expanded" : "collapsed"}`}
-      >
-        <div className="trailheadCardsInner" aria-hidden={!showCardPanel}>
-          {headerId && <h1 data-l10n-id={headerId} />}
-          <div className={`trailheadCardGrid${showCardPanel ? " show" : ""}`}>
-            {cards.map(card => (
-              <OnboardingCard
-                key={card.id}
-                message={card}
-                className="trailheadCard"
-                sendUserActionTelemetry={sendUserActionTelemetry}
-                onAction={this.onCardAction}
-                UISurface="TRAILHEAD"
-                {...card}
-              />
-            ))}
-          </div>
-          {showCardPanel && (
-            <button
-              className="icon icon-dismiss"
-              onClick={this.onHideContainer}
-              data-l10n-id="onboarding-cards-dismiss"
-            />
-          )}
-        </div>
-      </div>
-    );
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/_Triplets.scss firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/_Triplets.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/_Triplets.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/asrouter/templates/FirstRun/_Triplets.scss	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-.trailheadCards {
-  background: var(--trailhead-cards-background-color);
-  overflow: hidden;
-  text-align: center;
-  // Note: should match TRANSITION_LENGTH in FirstRun.jsx
-  transition: max-height 0.5s $photon-easing;
-
-  // This is needed for the transition to work, but will cut off content at the smallest breakpoint
-  @media (min-width: $break-point-medium) {
-    max-height: 1000px;
-  }
-
-  &.collapsed {
-    max-height: 0;
-  }
-
-  h1 {
-    font-size: 36px;
-    font-weight: 200;
-    margin: 0 0 40px;
-    color: var(--trailhead-header-text-color);
-  }
-}
-
-.trailheadCardsInner {
-  margin: auto;
-  padding: 40px $section-horizontal-padding;
-
-  @media (min-width: $break-point-medium) {
-    width: $wrapper-max-width-medium;
-  }
-
-  @media (min-width: $break-point-large) {
-    width: $wrapper-max-width-large;
-  }
-
-  @media (min-width: $break-point-widest) {
-    width: $wrapper-max-width-widest;
-  }
-
-  .icon-dismiss {
-    border: 0;
-    border-radius: 4px;
-    cursor: pointer;
-    inset-inline-end: 15px;
-    padding: 15px;
-    opacity: 0.75;
-    position: absolute;
-    top: 15px;
-
-    &:hover,
-    &:focus {
-      background-color: var(--newtab-element-active-color);
-    }
-  }
-}
-
-.trailheadCardGrid {
-  display: grid;
-  grid-gap: $base-gutter;
-  margin: 0;
-  opacity: 0;
-  transition: opacity 0.4s;
-  transition-delay: 0.1s;
-  grid-auto-rows: 1fr;
-
-  &.show {
-    opacity: 1;
-  }
-
-  @media (min-width: $break-point-medium) {
-    grid-template-columns: repeat(auto-fit, $card-width);
-  }
-
-  @media (min-width: $break-point-widest) {
-    grid-template-columns: repeat(auto-fit, $card-width-large);
-  }
-}
-
-.trailheadCard {
-  position: relative;
-  background: var(--newtab-card-background-color);
-  border-radius: 4px;
-  box-shadow: var(--newtab-card-shadow);
-
-  font-size: 13px;
-  padding: 20px 20px 60px;
-
-  @media (max-width: 865px) {
-    padding: 20px;
-  }
-
-  @media (min-width: $break-point-widest) {
-    font-size: 15px;
-  }
-
-  .onboardingTitle {
-    font-weight: normal;
-    color: var(--newtab-text-primary-color);
-    margin: 10px 0 4px;
-    font-size: 15px;
-
-    @media (min-width: $break-point-widest) {
-      font-size: 18px;
-    }
-  }
-
-  .onboardingText {
-    margin: 0 0 60px;
-    color: var(--newtab-text-conditional-color);
-    line-height: 1.5;
-    font-weight: 200;
-  }
-
-  .onboardingButton {
-    color: var(--newtab-text-conditional-color);
-    background: var(--trailhead-card-button-background-color);
-    border: 0;
-    margin: 14px;
-    min-width: 70%;
-    padding: 6px 14px;
-    white-space: pre-wrap;
-
-    &:focus,
-    &:hover {
-      box-shadow: none;
-      background: var(--trailhead-card-button-background-hover-color);
-    }
-
-    &:focus {
-      outline: dotted 1px;
-    }
-
-    &:active {
-      background: var(--trailhead-card-button-background-active-color);
-    }
-  }
-
-  .onboardingButtonContainer {
-    position: absolute;
-    bottom: 16px;
-    left: 0;
-    width: 100%;
-    text-align: center;
-  }
-}
-
-.activity-stream.welcome {
-  overflow: hidden;
-}
-
-.inline-onboarding {
-  &.activity-stream.welcome {
-    overflow-y: hidden;
-  }
-
-  .outer-wrapper {
-    position: relative;
-    display: block;
-
-    .prefs-button {
-      button {
-        position: absolute;
-      }
-    }
-  }
-
-  .asrouter-toggle {
-    position: absolute;
-  }
-}
-
-.error {
-  display: none;
-}
-
-.error.active {
-  display: block;
-  padding: 5px 12px;
-  animation: fade-down 450ms;
-  font-size: 12px;
-  font-weight: 500;
-  color: $white;
-  background-color: $red-60;
-  position: absolute;
-  inset-inline-start: 50px;
-  top: -28px;
-  border-radius: 2px;
-
-  &::before {
-    inset-inline-start: 12px;
-    background: $red-60;
-    bottom: -8px;
-    content: '.';
-    height: 16px;
-    position: absolute;
-    text-indent: -999px;
-    transform: rotate(45deg);
-    white-space: nowrap;
-    width: 16px;
-    z-index: -1;
-  }
-}
-
-@keyframes fade-down {
-  0% {
-    opacity: 0;
-    transform: translateY(-15px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -5,7 +5,6 @@
 import { actionCreators as ac, actionTypes as at } from "common/Actions.jsm";
 import { ASRouterUtils } from "../../asrouter/asrouter-utils";
 import { connect } from "react-redux";
-import { ModalOverlay } from "../../asrouter/components/ModalOverlay/ModalOverlay";
 import React from "react";
 import { SimpleHashRouter } from "./SimpleHashRouter";
 
@@ -489,9 +488,6 @@
     this.handleClearAllImpressionsByProvider = this.handleClearAllImpressionsByProvider.bind(
       this
     );
-    this.findOtherBundledMessagesOfSameTemplate = this.findOtherBundledMessagesOfSameTemplate.bind(
-      this
-    );
     this.handleExpressionEval = this.handleExpressionEval.bind(this);
     this.onChangeTargetingParameters = this.onChangeTargetingParameters.bind(
       this
@@ -501,7 +497,6 @@
     );
     this.setAttribution = this.setAttribution.bind(this);
     this.onCopyTargetingParams = this.onCopyTargetingParams.bind(this);
-    this.onPasteTargetingParams = this.onPasteTargetingParams.bind(this);
     this.onNewTargetingParams = this.onNewTargetingParams.bind(this);
     this.handleUpdateWNMessages = this.handleUpdateWNMessages.bind(this);
     this.handleForceWNP = this.handleForceWNP.bind(this);
@@ -521,11 +516,9 @@
       collapsedMessages: [],
       modifiedMessages: [],
       evaluationStatus: {},
-      trailheadTriplet: "",
       stringTargetingParameters: null,
       newStringTargetingParameters: null,
       copiedToClipboard: false,
-      pasteFromClipboard: false,
       attributionParameters: {
         source: "addons.mozilla.org",
         medium: "referral",
@@ -572,27 +565,11 @@
     }).then(this.setStateFromParent);
   }
 
-  findOtherBundledMessagesOfSameTemplate(template) {
-    return this.state.messages.filter(
-      msg => msg.template === template && msg.bundled
-    );
-  }
-
   handleBlock(msg) {
-    if (msg.bundled && msg.template !== "onboarding") {
-      // If we are blocking a message that belongs to a bundle, block all other messages that are bundled of that same template
-      let bundle = this.findOtherBundledMessagesOfSameTemplate(msg.template);
-      return () => ASRouterUtils.blockBundle(bundle);
-    }
     return () => ASRouterUtils.blockById(msg.id);
   }
 
   handleUnblock(msg) {
-    if (msg.bundled && msg.template !== "onboarding") {
-      // If we are unblocking a message that belongs to a bundle, unblock all other messages that are bundled of that same template
-      let bundle = this.findOtherBundledMessagesOfSameTemplate(msg.template);
-      return () => ASRouterUtils.unblockBundle(bundle);
-    }
     return () => ASRouterUtils.unblockById(msg.id);
   }
 
@@ -827,14 +804,6 @@
     document.execCommand("copy");
   }
 
-  // Copy all clipboard data to targeting parameters
-  onPasteTargetingParams(event) {
-    this.setState(({ pasteFromClipboard }) => ({
-      pasteFromClipboard: !pasteFromClipboard,
-      newStringTargetingParameters: "",
-    }));
-  }
-
   onNewTargetingParams(event) {
     this.setState({ newStringTargetingParameters: event.target.value });
     event.target.classList.remove("errorState");
@@ -1324,35 +1293,6 @@
     );
   }
 
-  renderPasteModal() {
-    if (!this.state.pasteFromClipboard) {
-      return null;
-    }
-    const errors =
-      this.refs.targetingParamsEval &&
-      this.refs.targetingParamsEval.innerText.length;
-    return (
-      <ModalOverlay
-        innerStyle="pasteModal"
-        title="New targeting parameters"
-        button_label={errors ? "Cancel" : "Done"}
-        onDismissBundle={this.onPasteTargetingParams}
-      >
-        <div className="onboardingMessage">
-          <p>
-            <textarea
-              onChange={this.onNewTargetingParams}
-              value={this.state.newStringTargetingParameters}
-              rows="20"
-              cols="60"
-            />
-          </p>
-          <p ref="targetingParamsEval" />
-        </div>
-      </ModalOverlay>
-    );
-  }
-
   renderTargetingParameters() {
     // There was no error and the result is truthy
     const success =
@@ -1412,13 +1352,6 @@
                   ? "Parameters copied!"
                   : "Copy parameters"}
               </button>
-              <button
-                className="ASRouterButton secondary"
-                onClick={this.onPasteTargetingParams}
-                disabled={this.state.pasteFromClipboard}
-              >
-                Paste parameters
-              </button>
             </td>
           </tr>
           {this.state.stringTargetingParameters &&
@@ -1686,19 +1619,6 @@
     return <p>No errors</p>;
   }
 
-  renderTrailheadInfo() {
-    return (
-      <table className="minimal-table">
-        <tbody>
-          <tr>
-            <td>Triplet branch</td>
-            <td>{this.state.trailheadTriplet}</td>
-          </tr>
-        </tbody>
-      </table>
-    );
-  }
-
   renderWNPTests() {
     if (!this.state.messages) {
       return null;
@@ -1858,12 +1778,9 @@
               </button>
             </h2>
             {this.state.providers ? this.renderProviders() : null}
-            <h2>Trailhead</h2>
-            {this.renderTrailheadInfo()}
             <h2>Messages</h2>
             {this.renderMessageFilter()}
             {this.renderMessages()}
-            {this.renderPasteModal()}
           </React.Fragment>
         );
     }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.scss firefox-85.0+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.scss	2021-01-18 19:58:08.000000000 +0000
@@ -1,7 +1,7 @@
 .asrouter-toggle {
   position: fixed;
-  top: 15px;
-  inset-inline-end: 48px;
+  top: 50px;
+  inset-inline-end: 15px;
   border: 0;
   background: none;
   z-index: 1;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/Base/Base.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/Base/Base.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/Base/Base.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/Base/Base.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -9,20 +9,30 @@
 import { connect } from "react-redux";
 import { DiscoveryStreamBase } from "content-src/components/DiscoveryStreamBase/DiscoveryStreamBase";
 import { ErrorBoundary } from "content-src/components/ErrorBoundary/ErrorBoundary";
+import { CustomizeMenu } from "content-src/components/CustomizeMenu/CustomizeMenu";
 import React from "react";
 import { Search } from "content-src/components/Search/Search";
 import { Sections } from "content-src/components/Sections/Sections";
+import { CSSTransition } from "react-transition-group";
 
-const PrefsButton = props => (
+export const PrefsButton = ({ onClick, icon }) => (
   <div className="prefs-button">
     <button
-      className="icon icon-settings"
-      onClick={props.onClick}
+      className={`icon ${icon || "icon-settings"}`}
+      onClick={onClick}
       data-l10n-id="newtab-settings-button"
     />
   </div>
 );
 
+export const PersonalizeButton = ({ onClick }) => (
+  <button
+    className="personalize-button"
+    onClick={onClick}
+    data-l10n-id="newtab-personalize-button-label"
+  />
+);
+
 // Returns a function will not be continuously triggered when called. The
 // function will be triggered if called again after `wait` milliseconds.
 function debounce(func, wait) {
@@ -102,8 +112,11 @@
   constructor(props) {
     super(props);
     this.openPreferences = this.openPreferences.bind(this);
+    this.openCustomizationMenu = this.openCustomizationMenu.bind(this);
+    this.closeCustomizationMenu = this.closeCustomizationMenu.bind(this);
     this.onWindowScroll = debounce(this.onWindowScroll.bind(this), 5);
-    this.state = { fixedSearch: false };
+    this.setPref = this.setPref.bind(this);
+    this.state = { fixedSearch: false, customizeMenuVisible: false };
   }
 
   componentDidMount() {
@@ -133,12 +146,27 @@
     this.props.dispatch(ac.UserEvent({ event: "OPEN_NEWTAB_PREFS" }));
   }
 
+  openCustomizationMenu() {
+    this.setState({ customizeMenuVisible: true });
+  }
+
+  closeCustomizationMenu() {
+    this.setState({ customizeMenuVisible: false });
+  }
+
+  setPref(pref, value) {
+    this.props.dispatch(ac.SetPref(pref, value));
+  }
+
   render() {
     const { props } = this;
     const { App } = props;
     const { initialized } = App;
     const prefs = props.Prefs.values;
 
+    // Values from experiment data
+    const { prefsButtonIcon } = prefs.featureConfig || {};
+
     const isDiscoveryStream =
       props.DiscoveryStream.config && props.DiscoveryStream.config.enabled;
     let filteredSections = props.Sections.filter(
@@ -157,6 +185,24 @@
       (!prefs["feeds.section.topstories"] ||
         (!prefs["feeds.system.topstories"] && prefs.region));
 
+    const customizationMenuEnabled = prefs["customizationMenu.enabled"];
+    const newNewtabExperienceEnabled = prefs["newNewtabExperience.enabled"];
+    const canShowCustomizationMenu =
+      customizationMenuEnabled || newNewtabExperienceEnabled;
+    const showCustomizationMenu =
+      canShowCustomizationMenu && this.state.customizeMenuVisible;
+    const enabledSections = {
+      topSitesEnabled: prefs["feeds.topsites"],
+      pocketEnabled: prefs["feeds.section.topstories"],
+      snippetsEnabled: prefs["feeds.snippets"],
+      highlightsEnabled: prefs["feeds.section.highlights"],
+      showSponsoredTopSitesEnabled: prefs.showSponsoredTopSites,
+      showSponsoredPocketEnabled: prefs.showSponsored,
+      topSitesRowsCount: prefs.topSitesRows,
+    };
+    const pocketRegion = prefs["feeds.system.topstories"];
+    const { mayHaveSponsoredTopSites } = prefs;
+
     const outerClassName = [
       "outer-wrapper",
       isDiscoveryStream && pocketEnabled && "ds-outer-wrapper-search-alignment",
@@ -173,6 +219,11 @@
 
     return (
       <div>
+        {canShowCustomizationMenu ? (
+          <PersonalizeButton onClick={this.openCustomizationMenu} />
+        ) : (
+          <PrefsButton onClick={this.openPreferences} icon={prefsButtonIcon} />
+        )}
         <div className={outerClassName}>
           <main>
             {prefs.showSearch && (
@@ -200,11 +251,28 @@
               ) : (
                 <Sections />
               )}
-              <PrefsButton onClick={this.openPreferences} />
             </div>
             <ConfirmDialog />
           </main>
         </div>
+        {canShowCustomizationMenu && (
+          <CSSTransition
+            timeout={0}
+            classNames="customize-animate"
+            in={showCustomizationMenu}
+            appear={true}
+          >
+            <CustomizeMenu
+              onClose={this.closeCustomizationMenu}
+              openPreferences={this.openPreferences}
+              setPref={this.setPref}
+              enabledSections={enabledSections}
+              pocketRegion={pocketRegion}
+              mayHaveSponsoredTopSites={mayHaveSponsoredTopSites}
+              dispatch={this.props.dispatch}
+            />
+          </CSSTransition>
+        )}
       </div>
     );
   }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/Base/_Base.scss firefox-85.0+build1/browser/components/newtab/content-src/components/Base/_Base.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/Base/_Base.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/Base/_Base.scss	2021-01-18 19:58:08.000000000 +0000
@@ -136,3 +136,46 @@
     }
   }
 }
+
+@media (max-height: 701px) {
+  .personalize-button {
+    position: absolute;
+    top: 16px;
+    inset-inline-end: 16px;
+  }
+}
+
+@media (min-height: 700px) {
+  .personalize-button {
+    position: fixed;
+    top: 16px;
+    inset-inline-end: 16px;
+    z-index: 1000;
+  }
+}
+
+.personalize-button {
+  font-size: 12px;
+  border: 0;
+  border-radius: 4px;
+  background-color: var(--newtab-background-button-color);
+  color: var(--newtab-background-button-text-color);
+  padding: 0 10px;
+  min-height: 32px;
+  max-width: 150px;
+
+  &:hover {
+    background-color: var(--newtab-background-button-hover-color);
+  }
+
+  &:active {
+    background-color: var(--newtab-background-button-active-color);
+  }
+
+  &:focus-visible {
+    border: 1px solid var(--newtab-focus-border);
+    border-radius: 4px;
+    outline: 0;
+    box-shadow: $newtab-focus-outline;
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,11 @@
+/* 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/. */
+
+import React from "react";
+
+export class BackgroundsSection extends React.PureComponent {
+  render() {
+    return <div />;
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,239 @@
+/* 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/. */
+
+import React from "react";
+import { actionCreators as ac } from "common/Actions.jsm";
+
+export class ContentSection extends React.PureComponent {
+  constructor(props) {
+    super(props);
+    this.onPreferenceSelect = this.onPreferenceSelect.bind(this);
+  }
+
+  inputUserEvent(eventSource, status) {
+    this.props.dispatch(
+      ac.UserEvent({
+        event: "PREF_CHANGED",
+        source: eventSource,
+        value: { status, menu_source: "CUSTOMIZE_MENU" },
+      })
+    );
+  }
+
+  onPreferenceSelect(e) {
+    let prefName = e.target.getAttribute("preference");
+    const eventSource = e.target.getAttribute("eventSource");
+    let value;
+    if (e.target.nodeName === "SELECT") {
+      value = parseInt(e.target.value, 10);
+    } else if (e.target.nodeName === "INPUT") {
+      value = e.target.checked;
+      if (eventSource) {
+        this.inputUserEvent(eventSource, value);
+      }
+    }
+    this.props.setPref(prefName, value);
+  }
+
+  render() {
+    const {
+      topSitesEnabled,
+      pocketEnabled,
+      highlightsEnabled,
+      snippetsEnabled,
+      showSponsoredTopSitesEnabled,
+      showSponsoredPocketEnabled,
+      topSitesRowsCount,
+    } = this.props.enabledSections;
+
+    return (
+      <div className="home-section">
+        <div id="shortcuts-section" className="section">
+          <div>
+            <h2
+              className="title"
+              data-l10n-id="newtab-custom-shortcuts-title"
+            />
+            <p
+              className="subtitle"
+              data-l10n-id="newtab-custom-shortcuts-subtitle"
+            ></p>
+            <div
+              className={`more-info-top-wrapper ${
+                topSitesEnabled ? "" : "shrink"
+              }`}
+            >
+              <div
+                className={`more-information ${
+                  topSitesEnabled ? "expand" : "shrink"
+                }`}
+              >
+                <select
+                  id="row-selector"
+                  className="selector"
+                  name="row-count"
+                  preference="topSitesRows"
+                  value={topSitesRowsCount}
+                  onChange={this.onPreferenceSelect}
+                  disabled={!topSitesEnabled}
+                >
+                  <option
+                    value="1"
+                    data-l10n-id="newtab-custom-row-selector"
+                    data-l10n-args='{"num": 1}'
+                  />
+                  <option
+                    value="2"
+                    data-l10n-id="newtab-custom-row-selector"
+                    data-l10n-args='{"num": 2}'
+                  />
+                  <option
+                    value="3"
+                    data-l10n-id="newtab-custom-row-selector"
+                    data-l10n-args='{"num": 3}'
+                  />
+                  <option
+                    value="4"
+                    data-l10n-id="newtab-custom-row-selector"
+                    data-l10n-args='{"num": 4}'
+                  />
+                </select>
+                {this.props.mayHaveSponsoredTopSites && (
+                  <div className="check-wrapper">
+                    <input
+                      id="sponsored-shortcuts"
+                      className="sponsored-checkbox"
+                      disabled={!topSitesEnabled}
+                      checked={showSponsoredTopSitesEnabled}
+                      type="checkbox"
+                      onChange={this.onPreferenceSelect}
+                      preference="showSponsoredTopSites"
+                    />
+                    <label
+                      className="sponsored"
+                      htmlFor="sponsored-shortcuts"
+                      data-l10n-id="newtab-custom-sponsored-sites"
+                    />
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+          <label className="switch">
+            <input
+              checked={topSitesEnabled}
+              type="checkbox"
+              onChange={this.onPreferenceSelect}
+              preference="feeds.topsites"
+            />
+            <span className="slider"></span>
+          </label>
+        </div>
+
+        {this.props.pocketRegion && (
+          <div id="pocket-section" className="section">
+            <div>
+              <h2 className="title" data-l10n-id="newtab-custom-pocket-title" />
+              <p
+                className="subtitle"
+                data-l10n-id="newtab-custom-pocket-subtitle"
+              />
+              {this.props.mayHaveSponsoredStories && (
+                <div
+                  className={`more-info-pocket-wrapper ${
+                    pocketEnabled ? "" : "shrink"
+                  }`}
+                >
+                  <div
+                    className={`more-information ${
+                      pocketEnabled ? "expand" : "shrink"
+                    }`}
+                  >
+                    <div className="check-wrapper">
+                      <input
+                        id="sponsored-pocket"
+                        className="sponsored-checkbox"
+                        disabled={!pocketEnabled}
+                        checked={showSponsoredPocketEnabled}
+                        type="checkbox"
+                        onChange={this.onPreferenceSelect}
+                        preference="showSponsored"
+                        eventSource="POCKET_SPOCS"
+                      />
+                      <label
+                        className="sponsored"
+                        htmlFor="sponsored-pocket"
+                        data-l10n-id="newtab-custom-pocket-sponsored"
+                      />
+                    </div>
+                  </div>
+                </div>
+              )}
+            </div>
+            <label className="switch">
+              <input
+                checked={pocketEnabled}
+                type="checkbox"
+                onChange={this.onPreferenceSelect}
+                preference="feeds.section.topstories"
+                eventSource="TOP_STORIES"
+              />
+              <span className="slider"></span>
+            </label>
+          </div>
+        )}
+
+        <div id="recent-section" className="section">
+          <div>
+            <h2 className="title" data-l10n-id="newtab-custom-recent-title" />
+            <p
+              className="subtitle"
+              data-l10n-id="newtab-custom-recent-subtitle"
+            />
+          </div>
+          <label className="switch">
+            <input
+              checked={highlightsEnabled}
+              type="checkbox"
+              onChange={this.onPreferenceSelect}
+              preference="feeds.section.highlights"
+              eventSource="HIGHLIGHTS"
+            />
+            <span className="slider"></span>
+          </label>
+        </div>
+
+        <div id="snippets-section" className="section">
+          <div>
+            <h2 className="title" data-l10n-id="newtab-custom-snippets-title" />
+            <p
+              className="subtitle"
+              data-l10n-id="newtab-custom-snippets-subtitle"
+            />
+          </div>
+          <label className="switch">
+            <input
+              checked={snippetsEnabled}
+              type="checkbox"
+              onChange={this.onPreferenceSelect}
+              preference="feeds.snippets"
+            />
+            <span className="slider"></span>
+          </label>
+        </div>
+
+        <span className="divider"></span>
+
+        <div>
+          <button
+            id="settings-link"
+            className="external-link"
+            onClick={this.props.openPreferences}
+            data-l10n-id="newtab-custom-settings"
+          />
+        </div>
+      </div>
+    );
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/CustomizeMenu.jsx	2021-01-18 19:58:08.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/. */
+
+import { ThemesSection } from "content-src/components/CustomizeMenu/ThemesSection/ThemesSection";
+import { BackgroundsSection } from "content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection";
+import { ContentSection } from "content-src/components/CustomizeMenu/ContentSection/ContentSection";
+import { connect } from "react-redux";
+import React from "react";
+
+export class _CustomizeMenu extends React.PureComponent {
+  render() {
+    return (
+      <div className="customize-menu">
+        <button
+          onClick={this.props.onClose}
+          className="close-button"
+          data-l10n-id="newtab-custom-close-button"
+        />
+        <ThemesSection />
+        <BackgroundsSection />
+        <ContentSection
+          openPreferences={this.props.openPreferences}
+          setPref={this.props.setPref}
+          enabledSections={this.props.enabledSections}
+          pocketRegion={this.props.pocketRegion}
+          mayHaveSponsoredTopSites={this.props.mayHaveSponsoredTopSites}
+          mayHaveSponsoredStories={this.props.DiscoveryStream.config.show_spocs}
+          dispatch={this.props.dispatch}
+        />
+      </div>
+    );
+  }
+}
+
+export const CustomizeMenu = connect(state => ({
+  DiscoveryStream: state.DiscoveryStream,
+}))(_CustomizeMenu);
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,276 @@
+
+.customize-menu {
+  color: var(--customize-menu-primary-text-color);
+  background-color: var(--customize-menu-background);
+  width: 432px;
+  height: 100%;
+  position: fixed;
+  inset-block: 0;
+  inset-inline-end: 0;
+  z-index: 1001;
+  padding: 16px;
+  transition: transform 250ms $customize-menu-slide-bezier;
+  overflow: auto;
+  transform: translateX(435px);
+
+  &:dir(rtl) {
+    transform: translateX(-435px);
+  }
+
+  &.customize-animate-enter-done {
+    transform: translateX(0);
+  }
+
+  &.customize-animate-enter-done,
+  &.customize-animate-enter-active,
+  &.customize-animate-exit-active {
+    box-shadow: 0 0 64px var(--customize-menu-first-shadow), 0 0 24px var(--customize-menu-second-shadow);
+  }
+
+  &.customize-animate-exit-done {
+    transform: translateX(435px);
+
+    &:dir(rtl) {
+      transform: translateX(-435px);
+    }
+  }
+
+  .close-button {
+    margin-inline-start: auto;
+    margin-bottom: 28px;
+    white-space: nowrap;
+    display: block;
+    background-color: var(--customize-menu-secondary-action-background);
+    padding: 8px 10px;
+    border: $customize-menu-border-tint;
+    border-radius: 4px;
+    color: var(--customize-menu-primary-text-color);
+    font-size: 13px;
+    font-weight: 600;
+  }
+
+  .close-button:hover {
+    background-color: var(--customize-menu-secondary-action-background-hover);
+  }
+
+  .close-button:hover:active {
+    background-color: var(--customize-menu-secondary-action-background-active);
+  }
+}
+
+.grid-skip {
+  display: contents;
+}
+
+.home-section {
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-template-rows: repeat(4, auto);
+  grid-row-gap: 32px;
+  padding: 0 16px;
+
+  .section {
+    display: grid;
+    grid-template-rows: auto;
+    grid-template-columns: auto 26px;
+
+    .title {
+      grid-column: 1 / -1;
+      margin: 0;
+      font-weight: 600;
+      font-size: 16px;
+      margin-bottom: 10px;
+    }
+
+    .subtitle {
+      margin: 0;
+      font-size: 14px;
+    }
+
+    .sponsored {
+      font-size: 14px;
+      margin-inline-start: 5px;
+    }
+
+    .check-wrapper {
+      position: relative;
+    }
+
+    .sponsored-checkbox {
+      margin-inline-start: 2px;
+      width: 16px;
+      height: 16px;
+      vertical-align: middle;
+      border: $customize-menu-border-tint;
+      box-sizing: border-box;
+      border-radius: 4px;
+      appearance: none;
+      background-color: var(--newtab-primary-action-background-off);
+    }
+
+    .sponsored-checkbox:checked {
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-check-fill);
+      background: url('chrome://global/skin/icons/check.svg') center no-repeat;
+      background-color: var(--newtab-primary-action-background);
+      background-size: 10px;
+    }
+
+    .sponsored-checkbox:active + .checkmark {
+      fill: $newtab-card-tint;
+    }
+
+    .selector {
+      color: var(--customize-menu-primary-text-color);
+      width: 118px;
+      display: block;
+      border: 1px solid var(--customize-menu-line-color);
+      border-radius: 4px;
+      appearance: none;
+      padding-block: 7px;
+      padding-inline: 10px 13px;
+      margin-bottom: 10px;
+      margin-inline-start: 2px;
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-primary-text-color);
+      background: url('#{$image-path}glyph-arrowhead-down-12.svg') right no-repeat;
+      background-size: 8px;
+      background-origin: content-box;
+      background-color: var(--customize-menu-background);
+
+      &:dir(rtl) {
+        background-position-x: left;
+      }
+    }
+
+    .switch {
+      position: relative;
+      display: inline-block;
+      width: 26px;
+      height: 16px;
+    }
+
+    .switch input {
+      opacity: 0;
+      width: 0;
+      height: 0;
+    }
+
+    .slider {
+      position: absolute;
+      inset: 0;
+      transition: 250ms;
+      border-radius: 13px;
+      border: $customize-menu-border-tint;
+      background-color: var(--newtab-primary-action-background-off);
+
+      &::before {
+        position: absolute;
+        content: '';
+        height: 8px;
+        width: 8px;
+        inset-inline-start: 3px;
+        bottom: 3px;
+        background-color: var(--customize-menu-primary-action-text);
+        transition: 250ms;
+        border-radius: 50%;
+        outline: $customize-menu-border-tint;
+        -moz-outline-radius: 11px;
+      }
+    }
+
+    .switch input:focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border-selected);
+      outline: 0;
+      box-shadow: $newtab-focus-outline;
+    }
+
+    .switch input:not(:checked):focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border);
+    }
+
+    input:checked + .slider {
+      background-color: var(--newtab-primary-action-background);
+    }
+
+    input:checked + .slider::before {
+      transform: translateX(10px);
+    }
+
+    input:checked + .slider:dir(rtl)::before {
+      transform: translateX(-10px);
+    }
+
+    .more-info-top-wrapper,
+    .more-info-pocket-wrapper {
+      margin-inline-start: -2px;
+      overflow: hidden;
+      transition: max-height 250ms $customize-menu-expand-bezier;
+
+      &.shrink {
+        max-height: 0;
+      }
+
+      .more-information {
+        padding-top: 12px;
+        position: relative;
+        transition: top 250ms $customize-menu-expand-bezier;
+      }
+
+      .more-information.expand {
+        top: 0;
+      }
+    }
+
+    .more-info-top-wrapper {
+      max-height: 78px;
+
+      .more-information {
+        top: -77px;
+      }
+    }
+
+    .more-info-pocket-wrapper {
+      max-height: 35px;
+
+      .more-information {
+        top: -35px;
+      }
+    }
+  }
+
+  .divider {
+    border-top: 1px var(--customize-menu-seperator-line-color) solid;
+    margin: 0 -16px;
+  }
+
+  .external-link {
+    font-size: 14px;
+    cursor: pointer;
+    border: 1px solid transparent;
+    -moz-context-properties: fill;
+    fill: var(--customize-menu-primary-text-color);
+    background: url('chrome://global/skin/icons/settings.svg') left no-repeat;
+    background-size: 16px;
+    padding-inline-start: 21px;
+    margin-bottom: 20px;
+
+    &:dir(rtl) {
+      background-position-x: right;
+    }
+  }
+
+  .external-link:hover {
+    text-decoration: underline;
+  }
+}
+
+.home-section .section .sponsored-checkbox:focus-visible,
+.selector:focus-visible,
+.external-link:focus-visible,
+.close-button:focus-visible {
+  border: 1px solid var(--newtab-focus-border);
+  border-radius: 4px;
+  outline: 0;
+  box-shadow: $newtab-focus-outline;
+}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/ThemesSection/ThemesSection.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/ThemesSection/ThemesSection.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/CustomizeMenu/ThemesSection/ThemesSection.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/CustomizeMenu/ThemesSection/ThemesSection.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,11 @@
+/* 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/. */
+
+import React from "react";
+
+export class ThemesSection extends React.PureComponent {
+  render() {
+    return <div />;
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -360,6 +360,7 @@
             privacyNoticeURL={topStories.privacyNoticeURL}
             showPrefName={topStories.pref.feed}
             title={message.header.title}
+            eventSource="CARDGRID"
           >
             {this.renderLayout(layoutRender)}
           </CollapsibleSection>
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/Navigation.jsx firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/Navigation.jsx
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/Navigation.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/Navigation.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -43,49 +43,16 @@
   }
 }
 
-class ExploreTopics extends React.PureComponent {
-  render() {
-    const { explore_topics } = this.props;
-    if (!explore_topics) {
-      return null;
-    }
-    return (
-      <>
-        <Topic
-          dispatch={this.props.dispatch}
-          className="ds-navigation-inline-explore-more"
-          url={explore_topics.url}
-          name={explore_topics.name}
-        />
-        <Topic
-          dispatch={this.props.dispatch}
-          className="ds-navigation-header-explore-more"
-          url={explore_topics.url}
-          name={explore_topics.header}
-        />
-      </>
-    );
-  }
-}
-
 export class Navigation extends React.PureComponent {
   render() {
-    const { links } = this.props || [];
-    const { alignment } = this.props || "centered";
-    // Basic isn't currently used, but keeping it here to be very explicit.
-    // The other variant that's supported is "responsive".
-    // The responsive variant is intended for longer lists of topics, more than 6.
-    // It hides the last item on larger displays. The last item is meant for "see more topics"
-    const variant = this.props.display_variant || "basic";
+    const links = this.props.links || [];
+    const alignment = this.props.alignment || "centered";
     const header = this.props.header || {};
-    const { explore_topics } = this.props;
     return (
-      <div
-        className={`ds-navigation ds-navigation-${alignment} ds-navigation-variant-${variant}`}
-      >
+      <div className={`ds-navigation ds-navigation-${alignment}`}>
         {header.title ? (
           <FluentOrText message={header.title}>
-            <span className="ds-header" />
+            <span className="ds-navigation-header" />
           </FluentOrText>
         ) : null}
         <ul>
@@ -100,10 +67,6 @@
               </li>
             ))}
         </ul>
-        <ExploreTopics
-          dispatch={this.props.dispatch}
-          explore_topics={explore_topics}
-        />
       </div>
     );
   }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Navigation/_Navigation.scss	2021-01-18 19:58:08.000000000 +0000
@@ -1,8 +1,18 @@
 .ds-navigation {
-  line-height: 32px;
+  @include dark-theme-only {
+    color: $grey-30;
+  }
+
+  color: $grey-50;
   padding: 4px 0;
-  font-size: 14px;
   font-weight: 600;
+  line-height: 22px;
+  font-size: 11.5px;
+
+  @media (min-width: $break-point-widest) {
+    line-height: 32px;
+    font-size: 14px;
+  }
 
   &.ds-navigation-centered {
     text-align: center;
@@ -12,55 +22,6 @@
     text-align: end;
   }
 
-  &.ds-navigation-variant-responsive {
-    font-size: 11px;
-
-    .ds-header {
-      font-size: 11px;
-    }
-
-    .ds-navigation-inline-explore-more,
-    .ds-header,
-    ul li,
-    ul {
-      display: none;
-    }
-
-    @media (min-width: $break-point-medium) {
-      .ds-navigation-inline-explore-more,
-      .ds-header,
-      ul {
-        display: inline-block;
-      }
-
-      .ds-navigation-header-explore-more {
-        display: none;
-      }
-
-      ul li {
-        &:nth-child(-n+3) {
-          display: inline-block;
-        }
-      }
-    }
-    @media (min-width: $break-point-large) {
-      ul li {
-        &:nth-child(-n+6) {
-          display: inline-block;
-        }
-      }
-    }
-    @media (min-width: $break-point-widest) {
-      ul li {
-        display: inline-block;
-      }
-
-      .ds-navigation-inline-explore-more {
-        display: none;
-      }
-    }
-  }
-
   ul {
     display: inline;
     margin: 0;
@@ -73,7 +34,6 @@
     &::after {
       content: '·';
       padding: 6px;
-      color: $grey-50;
     }
 
     &:last-child::after {
@@ -92,8 +52,7 @@
     }
   }
 
-  .ds-header {
-    margin-bottom: 8px;
-    padding-inline-end: 8px;
+  .ds-navigation-header {
+    padding-inline-end: 6px;
   }
 }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/components/Search/_Search.scss firefox-85.0+build1/browser/components/newtab/content-src/components/Search/_Search.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/components/Search/_Search.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/components/Search/_Search.scss	2021-01-18 19:58:08.000000000 +0000
@@ -13,13 +13,13 @@
   }
 
   .logo-and-wordmark {
-    $logo-size: 96px;
-    $wordmark-size: 172px;
+    $logo-size: 82px;
+    $wordmark-size: 134px;
 
     align-items: center;
     display: flex;
     justify-content: center;
-    margin-bottom: 49px;
+    margin-bottom: 48px;
 
     .logo {
       background: url('chrome://branding/content/about-logo.png') no-repeat center;
@@ -39,7 +39,7 @@
       display: inline-block;
       fill: var(--newtab-search-wordmark-color);
       height: $logo-size;
-      margin-inline-start: 15px;
+      margin-inline-start: 16px;
       width: $wordmark-size;
     }
 
@@ -57,6 +57,7 @@
         background-size: $wordmark-small-size;
         height: $logo-size-small;
         width: $wordmark-small-size;
+        margin-inline-start: 12px;
       }
     }
   }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/.eslintrc.js firefox-85.0+build1/browser/components/newtab/content-src/.eslintrc.js
--- firefox-84.0.2+build1/browser/components/newtab/content-src/.eslintrc.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/.eslintrc.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,5 +7,6 @@
 module.exports = {
   rules: {
     "import/no-commonjs": 2,
+    "react/jsx-no-bind": 0,
   },
 };
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_activity-stream.scss firefox-85.0+build1/browser/components/newtab/content-src/styles/_activity-stream.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_activity-stream.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/styles/_activity-stream.scss	2021-01-18 19:58:08.000000000 +0000
@@ -139,6 +139,7 @@
 @import '../components/Search/Search';
 @import '../components/ContextMenu/ContextMenu';
 @import '../components/ConfirmDialog/ConfirmDialog';
+@import '../components/CustomizeMenu/CustomizeMenu';
 @import '../components/Card/Card';
 @import '../components/CollapsibleSection/CollapsibleSection';
 @import '../components/ASRouterAdmin/ASRouterAdmin';
@@ -175,6 +176,4 @@
 @import '../asrouter/templates/SimpleBelowSearchSnippet/SimpleBelowSearchSnippet';
 @import '../asrouter/templates/SimpleSnippet/SimpleSnippet';
 @import '../asrouter/templates/SubmitFormSnippet/SubmitFormSnippet';
-@import '../asrouter/templates/OnboardingMessage/OnboardingMessage';
-@import '../asrouter/templates/FirstRun/Triplets';
 @import '../asrouter/templates/EOYSnippet/EOYSnippet';
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_theme.scss firefox-85.0+build1/browser/components/newtab/content-src/styles/_theme.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_theme.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/styles/_theme.scss	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,7 @@
 $input-error-boxshadow: textbox-shadow($red-60);
 $shadow-primary: 0 0 0 5px var(--newtab-card-active-outline-color);
 $shadow-secondary: 0 1px 4px 0 $grey-90-20;
+$newtab-focus-outline: 0 0 0 2px var(--newtab-focus-outline);
 
 // Default theme
 body {
@@ -39,6 +40,12 @@
   --newtab-textbox-border: #{$grey-90-20};
   @include textbox-focus($blue-60); // sass-lint:disable-line mixins-before-declarations
 
+  // Background buttons
+  --newtab-background-button-color: #{$newtab-background-button-default-color};
+  --newtab-background-button-text-color: #{$newtab-background-button-default-text-color};
+  --newtab-background-button-hover-color: #{$newtab-background-button-default-hover-color};
+  --newtab-background-button-active-color: #{$newtab-background-button-default-active-color};
+
   // Buttons
   --newtab-button-primary-color: #{$blue-60};
   --newtab-button-secondary-color: inherit;
@@ -87,12 +94,23 @@
   --newtab-snippets-background-color: #{$white};
   --newtab-snippets-hairline-color: transparent;
 
-  // Trailhead
-  --trailhead-header-text-color: #{$trailhead-purple};
-  --trailhead-cards-background-color: #{$grey-20};
-  --trailhead-card-button-background-color: #{$grey-90-10};
-  --trailhead-card-button-background-hover-color: #{$grey-90-20};
-  --trailhead-card-button-background-active-color: #{$grey-90-30};
+  // New New Tab
+  --newtab-focus-outline: #{$newtab-focus-outline};
+  --newtab-focus-border: #{$blue-60};
+  --newtab-focus-border-selected: #{$newtab-card-tint};
+  --newtab-primary-action-background: #{$blue-60};
+  --newtab-primary-action-background-off: #{$newtab-primary-action-background-off};
+  --customize-menu-primary-text-color: #{$newtab-card-primary-text-color};
+  --customize-menu-check-fill: #{$white};
+  --customize-menu-background: #{$white};
+  --customize-menu-secondary-action-background: #{$grey-10};
+  --customize-menu-secondary-action-background-hover: #{$grey-20};
+  --customize-menu-secondary-action-background-active: #{$newtab-card-secondary-action-background-active};
+  --customize-menu-seperator-line-color: #{$newtab-card-separator-line-color};
+  --customize-menu-first-shadow: #{$newtab-card-firstshadow};
+  --customize-menu-second-shadow: #{$newtab-card-secondshadow};
+  --customize-menu-primary-action-text: #{$white};
+  --customize-menu-line-color: #{$newtab-card-line-color};
 
   &[lwt-newtab-brighttext] {
     // General styles
@@ -116,6 +134,12 @@
     --newtab-textbox-border: #{$grey-10-20};
     @include textbox-focus($blue-40); // sass-lint:disable-line mixins-before-declarations
 
+    // Background buttons.
+    --newtab-background-button-color: #{$newtab-background-button-darktheme-color};
+    --newtab-background-button-text-color: #{$newtab-background-button-darktheme-text-color};
+    --newtab-background-button-hover-color: #{$newtab-background-button-darktheme-hover-color};
+    --newtab-background-button-active-color: #{$newtab-background-button-darktheme-active-color};
+
     // Feed buttons
     --newtab-feed-button-background: #{$grey-70};
     --newtab-feed-button-text: #{$grey-10};
@@ -160,11 +184,22 @@
     --newtab-snippets-background-color: #{$grey-70};
     --newtab-snippets-hairline-color: #{$white-10};
 
-    // Trailhead
-    --trailhead-header-text-color: #{$white-60};
-    --trailhead-cards-background-color: #{$grey-90-10};
-    --trailhead-card-button-background-color: #{$grey-90-30};
-    --trailhead-card-button-background-hover-color: #{$grey-90-50};
-    --trailhead-card-button-background-active-color: #{$grey-90-70};
+    // New New Tab
+    --newtab-focus-outline: #{$newtab-darktheme-focus-outline};
+    --newtab-focus-border: #{$newtab-darktheme-focus-border};
+    --newtab-focus-border-selected: #{$newtab-darktheme-focus-border-selected};
+    --newtab-primary-action-background: #{$newtab-darktheme-primary-action-background};
+    --newtab-primary-action-background-off: #{$newtab-darktheme-primary-action-background-off};
+    --customize-menu-primary-text-color: #{$newtab-card-darktheme-primary-text-color};
+    --customize-menu-check-fill: #{$newtab-card-darktheme-primary-text-color};
+    --customize-menu-background: #{$grey-70};
+    --customize-menu-secondary-action-background: #{$newtab-card-darktheme-secondary-action-background};
+    --customize-menu-secondary-action-background-hover: #{$newtab-card-darktheme-secondary-action-background-hover};
+    --customize-menu-secondary-action-background-active: #{$newtab-card-darktheme-secondary-action-background-active};
+    --customize-menu-seperator-line-color: #{$newtab-card-darktheme-separator-line-color};
+    --customize-menu-first-shadow: #{$newtab-card-darktheme-firstshadow};
+    --customize-menu-second-shadow: #{$newtab-darktheme-card-secondshadow};
+    --customize-menu-primary-action-text: #{$newtab-card-darktheme-primary-text-color};
+    --customize-menu-line-color: #{$newtab-card-darktheme-line-color};
   }
 }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_variables.scss firefox-85.0+build1/browser/components/newtab/content-src/styles/_variables.scss
--- firefox-84.0.2+build1/browser/components/newtab/content-src/styles/_variables.scss	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/content-src/styles/_variables.scss	2021-01-18 19:58:08.000000000 +0000
@@ -88,11 +88,39 @@
 $about-welcome-extra-links: #676F7E;
 $firefox-wordmark-default-color: #363959;
 $firefox-wordmark-darktheme-color: $white;
-$trailhead-violet: #7542E5;
-$trailhead-purple: #2B2156;
-$trailhead-purple-80: #36296D;
-$trailhead-blue-60: #0250BB;
-$trailhead-blue-70: #054096;
+
+// New new tab experience colors.
+$newtab-background-button-default-color: rgba(223, 223, 223, 0.5);
+$newtab-background-button-darktheme-color: rgba(80, 80, 80, 0.5);
+$newtab-background-button-default-text-color: #484848;
+$newtab-background-button-darktheme-text-color: #CDCDD4;
+$newtab-background-button-default-hover-color: rgba(196, 196, 196, 0.5);
+$newtab-background-button-darktheme-hover-color: rgba(114, 114, 114, 0.5);
+$newtab-background-button-default-active-color: rgba(151, 151, 151, 0.5);
+$newtab-background-button-darktheme-active-color: rgba(173, 173, 173, 0.5);
+$newtab-background-button-focus-boxshadow-color: rgba(0, 96, 223, 0.25);
+$newtab-card-primary-text-color: #20123A;
+$newtab-card-darktheme-primary-text-color: #E0E0E6;
+$newtab-card-line-color: #716F87;
+$newtab-card-darktheme-line-color: #B9B7CC;
+$newtab-card-separator-line-color: #E1E0E6;
+$newtab-card-darktheme-separator-line-color: #53515F;
+$newtab-card-tint: rgba(0, 0, 0, 0.15);
+$newtab-card-firstshadow: rgba(9, 32, 77, 0.12);
+$newtab-card-darktheme-firstshadow: rgba(21, 20, 26, 0.5);
+$newtab-card-secondshadow: rgba(29, 17, 51, 0.12);
+$newtab-darktheme-card-secondshadow: rgba(21, 20, 26, 0.75);
+$newtab-focus-outline: rgba(0, 96, 223, 0.25);
+$newtab-darktheme-focus-outline: rgba(80, 145, 241, 0.5);
+$newtab-darktheme-focus-border: #B5D3FF;
+$newtab-darktheme-focus-border-selected: #B5D3FF;
+$newtab-darktheme-primary-action-background: #4484E2;
+$newtab-primary-action-background-off: #E9E9E9;
+$newtab-darktheme-primary-action-background-off: #6A6A6F;
+$newtab-card-darktheme-secondary-action-background: #515156;
+$newtab-card-darktheme-secondary-action-background-hover: #606065;
+$newtab-card-secondary-action-background-active: #E2E2E6;
+$newtab-card-darktheme-secondary-action-background-active: #6F6F74;
 
 // Photon transitions from http://design.firefox.com/photon/motion/duration-and-easing.html
 $photon-easing: cubic-bezier(0.07, 0.95, 0, 1);
@@ -164,6 +192,11 @@
 
 $textbox-shadow-size: 4px;
 
+$customize-menu-slide-bezier: cubic-bezier(0.46, 0.03, 0.52, 0.96);
+$customize-menu-expand-bezier: cubic-bezier(0.82, 0.085, 0.395, 0.895);
+$customize-menu-border-tint: 1px solid $newtab-card-tint;
+
+
 @mixin fade-in {
   box-shadow: inset $inner-box-shadow, $shadow-primary;
   transition: box-shadow 150ms;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-linux.css firefox-85.0+build1/browser/components/newtab/css/activity-stream-linux.css
--- firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-linux.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/css/activity-stream-linux.css	2021-01-18 19:58:08.000000000 +0000
@@ -46,6 +46,10 @@
   --newtab-textbox-border: rgba(12, 12, 13, 0.2);
   --newtab-textbox-focus-color: #0060DF;
   --newtab-textbox-focus-boxshadow: 0 0 0 1px #0060DF, 0 0 0 4px rgba(0, 96, 223, 0.3);
+  --newtab-background-button-color: rgba(223, 223, 223, 0.5);
+  --newtab-background-button-text-color: #484848;
+  --newtab-background-button-hover-color: rgba(196, 196, 196, 0.5);
+  --newtab-background-button-active-color: rgba(151, 151, 151, 0.5);
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
   --newtab-feed-button-background: #EDEDF0;
@@ -76,11 +80,22 @@
   --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent;
-  --trailhead-header-text-color: #2B2156;
-  --trailhead-cards-background-color: #EDEDF0;
-  --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1);
-  --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2);
-  --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.3); }
+  --newtab-focus-outline: 0 0 0 2px var(--newtab-focus-outline);
+  --newtab-focus-border: #0060DF;
+  --newtab-focus-border-selected: rgba(0, 0, 0, 0.15);
+  --newtab-primary-action-background: #0060DF;
+  --newtab-primary-action-background-off: #E9E9E9;
+  --customize-menu-primary-text-color: #20123A;
+  --customize-menu-check-fill: #FFF;
+  --customize-menu-background: #FFF;
+  --customize-menu-secondary-action-background: #F9F9FA;
+  --customize-menu-secondary-action-background-hover: #EDEDF0;
+  --customize-menu-secondary-action-background-active: #E2E2E6;
+  --customize-menu-seperator-line-color: #E1E0E6;
+  --customize-menu-first-shadow: rgba(9, 32, 77, 0.12);
+  --customize-menu-second-shadow: rgba(29, 17, 51, 0.12);
+  --customize-menu-primary-action-text: #FFF;
+  --customize-menu-line-color: #716F87; }
   body[lwt-newtab-brighttext] {
     --newtab-background-color: #2A2A2E;
     --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
@@ -102,6 +117,10 @@
     --newtab-textbox-border: rgba(249, 249, 250, 0.2);
     --newtab-textbox-focus-color: #45A1FF;
     --newtab-textbox-focus-boxshadow: 0 0 0 1px #45A1FF, 0 0 0 4px rgba(69, 161, 255, 0.3);
+    --newtab-background-button-color: rgba(80, 80, 80, 0.5);
+    --newtab-background-button-text-color: #CDCDD4;
+    --newtab-background-button-hover-color: rgba(114, 114, 114, 0.5);
+    --newtab-background-button-active-color: rgba(173, 173, 173, 0.5);
     --newtab-feed-button-background: #38383D;
     --newtab-feed-button-text: #F9F9FA;
     --newtab-feed-button-background-faded: rgba(56, 56, 61, 0.6);
@@ -130,11 +149,22 @@
     --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2);
     --newtab-snippets-background-color: #38383D;
     --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1);
-    --trailhead-header-text-color: rgba(255, 255, 255, 0.6);
-    --trailhead-cards-background-color: rgba(12, 12, 13, 0.1);
-    --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3);
-    --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.5);
-    --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.7); }
+    --newtab-focus-outline: rgba(80, 145, 241, 0.5);
+    --newtab-focus-border: #B5D3FF;
+    --newtab-focus-border-selected: #B5D3FF;
+    --newtab-primary-action-background: #4484E2;
+    --newtab-primary-action-background-off: #6A6A6F;
+    --customize-menu-primary-text-color: #E0E0E6;
+    --customize-menu-check-fill: #E0E0E6;
+    --customize-menu-background: #38383D;
+    --customize-menu-secondary-action-background: #515156;
+    --customize-menu-secondary-action-background-hover: #606065;
+    --customize-menu-secondary-action-background-active: #6F6F74;
+    --customize-menu-seperator-line-color: #53515F;
+    --customize-menu-first-shadow: rgba(21, 20, 26, 0.5);
+    --customize-menu-second-shadow: rgba(21, 20, 26, 0.75);
+    --customize-menu-primary-action-text: #E0E0E6;
+    --customize-menu-line-color: #B9B7CC; }
 
 .icon {
   background-position: center center;
@@ -453,6 +483,38 @@
   .prefs-button button:active {
     background-color: var(--newtab-element-active-color); }
 
+@media (max-height: 701px) {
+  .personalize-button {
+    position: absolute;
+    top: 16px;
+    inset-inline-end: 16px; } }
+
+@media (min-height: 700px) {
+  .personalize-button {
+    position: fixed;
+    top: 16px;
+    inset-inline-end: 16px;
+    z-index: 1000; } }
+
+.personalize-button {
+  font-size: 12px;
+  border: 0;
+  border-radius: 4px;
+  background-color: var(--newtab-background-button-color);
+  color: var(--newtab-background-button-text-color);
+  padding: 0 10px;
+  min-height: 32px;
+  max-width: 150px; }
+  .personalize-button:hover {
+    background-color: var(--newtab-background-button-hover-color); }
+  .personalize-button:active {
+    background-color: var(--newtab-background-button-active-color); }
+  .personalize-button:focus-visible {
+    border: 1px solid var(--newtab-focus-border);
+    border-radius: 4px;
+    outline: 0;
+    box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .as-error-fallback {
   align-items: center;
   border-radius: 3px;
@@ -1033,25 +1095,25 @@
     align-items: center;
     display: flex;
     justify-content: center;
-    margin-bottom: 49px; }
+    margin-bottom: 48px; }
     .search-wrapper .logo-and-wordmark .logo {
       background: url("chrome://branding/content/about-logo.png") no-repeat center;
-      background-size: 96px;
+      background-size: 82px;
       display: inline-block;
-      height: 96px;
-      width: 96px; }
+      height: 82px;
+      width: 82px; }
       @media (min-resolution: 2x) {
         .search-wrapper .logo-and-wordmark .logo {
           background-image: url("chrome://branding/content/about-logo@2x.png"); } }
     .search-wrapper .logo-and-wordmark .wordmark {
       background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
-      background-size: 172px;
+      background-size: 134px;
       -moz-context-properties: fill;
       display: inline-block;
       fill: var(--newtab-search-wordmark-color);
-      height: 96px;
-      margin-inline-start: 15px;
-      width: 172px; }
+      height: 82px;
+      margin-inline-start: 16px;
+      width: 134px; }
     @media (max-width: 609px) {
       .search-wrapper .logo-and-wordmark .logo {
         background-size: 64px;
@@ -1060,7 +1122,8 @@
       .search-wrapper .logo-and-wordmark .wordmark {
         background-size: 100px;
         height: 64px;
-        width: 100px; } }
+        width: 100px;
+        margin-inline-start: 12px; } }
   .search-wrapper .search-inner-wrapper {
     cursor: default;
     display: flex;
@@ -1362,6 +1425,201 @@
   font-size: 15px;
   z-index: 11002; }
 
+.customize-menu {
+  color: var(--customize-menu-primary-text-color);
+  background-color: var(--customize-menu-background);
+  width: 432px;
+  height: 100%;
+  position: fixed;
+  inset-block: 0;
+  inset-inline-end: 0;
+  z-index: 1001;
+  padding: 16px;
+  transition: transform 250ms cubic-bezier(0.46, 0.03, 0.52, 0.96);
+  overflow: auto;
+  transform: translateX(435px); }
+  .customize-menu:dir(rtl) {
+    transform: translateX(-435px); }
+  .customize-menu.customize-animate-enter-done {
+    transform: translateX(0); }
+  .customize-menu.customize-animate-enter-done, .customize-menu.customize-animate-enter-active, .customize-menu.customize-animate-exit-active {
+    box-shadow: 0 0 64px var(--customize-menu-first-shadow), 0 0 24px var(--customize-menu-second-shadow); }
+  .customize-menu.customize-animate-exit-done {
+    transform: translateX(435px); }
+    .customize-menu.customize-animate-exit-done:dir(rtl) {
+      transform: translateX(-435px); }
+  .customize-menu .close-button {
+    margin-inline-start: auto;
+    margin-bottom: 28px;
+    white-space: nowrap;
+    display: block;
+    background-color: var(--customize-menu-secondary-action-background);
+    padding: 8px 10px;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    color: var(--customize-menu-primary-text-color);
+    font-size: 13px;
+    font-weight: 600; }
+  .customize-menu .close-button:hover {
+    background-color: var(--customize-menu-secondary-action-background-hover); }
+  .customize-menu .close-button:hover:active {
+    background-color: var(--customize-menu-secondary-action-background-active); }
+
+.grid-skip {
+  display: contents; }
+
+.home-section {
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-template-rows: repeat(4, auto);
+  grid-row-gap: 32px;
+  padding: 0 16px; }
+  .home-section .section {
+    display: grid;
+    grid-template-rows: auto;
+    grid-template-columns: auto 26px; }
+    .home-section .section .title {
+      grid-column: 1 / -1;
+      margin: 0;
+      font-weight: 600;
+      font-size: 16px;
+      margin-bottom: 10px; }
+    .home-section .section .subtitle {
+      margin: 0;
+      font-size: 14px; }
+    .home-section .section .sponsored {
+      font-size: 14px;
+      margin-inline-start: 5px; }
+    .home-section .section .check-wrapper {
+      position: relative; }
+    .home-section .section .sponsored-checkbox {
+      margin-inline-start: 2px;
+      width: 16px;
+      height: 16px;
+      vertical-align: middle;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      box-sizing: border-box;
+      border-radius: 4px;
+      appearance: none;
+      background-color: var(--newtab-primary-action-background-off); }
+    .home-section .section .sponsored-checkbox:checked {
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-check-fill);
+      background: url("chrome://global/skin/icons/check.svg") center no-repeat;
+      background-color: var(--newtab-primary-action-background);
+      background-size: 10px; }
+    .home-section .section .sponsored-checkbox:active + .checkmark {
+      fill: rgba(0, 0, 0, 0.15); }
+    .home-section .section .selector {
+      color: var(--customize-menu-primary-text-color);
+      width: 118px;
+      display: block;
+      border: 1px solid var(--customize-menu-line-color);
+      border-radius: 4px;
+      appearance: none;
+      padding-block: 7px;
+      padding-inline: 10px 13px;
+      margin-bottom: 10px;
+      margin-inline-start: 2px;
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-primary-text-color);
+      background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;
+      background-size: 8px;
+      background-origin: content-box;
+      background-color: var(--customize-menu-background); }
+      .home-section .section .selector:dir(rtl) {
+        background-position-x: left; }
+    .home-section .section .switch {
+      position: relative;
+      display: inline-block;
+      width: 26px;
+      height: 16px; }
+    .home-section .section .switch input {
+      opacity: 0;
+      width: 0;
+      height: 0; }
+    .home-section .section .slider {
+      position: absolute;
+      inset: 0;
+      transition: 250ms;
+      border-radius: 13px;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      background-color: var(--newtab-primary-action-background-off); }
+      .home-section .section .slider::before {
+        position: absolute;
+        content: '';
+        height: 8px;
+        width: 8px;
+        inset-inline-start: 3px;
+        bottom: 3px;
+        background-color: var(--customize-menu-primary-action-text);
+        transition: 250ms;
+        border-radius: 50%;
+        outline: 1px solid rgba(0, 0, 0, 0.15);
+        -moz-outline-radius: 11px; }
+    .home-section .section .switch input:focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border-selected);
+      outline: 0;
+      box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+    .home-section .section .switch input:not(:checked):focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border); }
+    .home-section .section input:checked + .slider {
+      background-color: var(--newtab-primary-action-background); }
+    .home-section .section input:checked + .slider::before {
+      transform: translateX(10px); }
+    .home-section .section input:checked + .slider:dir(rtl)::before {
+      transform: translateX(-10px); }
+    .home-section .section .more-info-top-wrapper,
+    .home-section .section .more-info-pocket-wrapper {
+      margin-inline-start: -2px;
+      overflow: hidden;
+      transition: max-height 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper.shrink,
+      .home-section .section .more-info-pocket-wrapper.shrink {
+        max-height: 0; }
+      .home-section .section .more-info-top-wrapper .more-information,
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        padding-top: 12px;
+        position: relative;
+        transition: top 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper .more-information.expand,
+      .home-section .section .more-info-pocket-wrapper .more-information.expand {
+        top: 0; }
+    .home-section .section .more-info-top-wrapper {
+      max-height: 78px; }
+      .home-section .section .more-info-top-wrapper .more-information {
+        top: -77px; }
+    .home-section .section .more-info-pocket-wrapper {
+      max-height: 35px; }
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        top: -35px; }
+  .home-section .divider {
+    border-top: 1px var(--customize-menu-seperator-line-color) solid;
+    margin: 0 -16px; }
+  .home-section .external-link {
+    font-size: 14px;
+    cursor: pointer;
+    border: 1px solid transparent;
+    -moz-context-properties: fill;
+    fill: var(--customize-menu-primary-text-color);
+    background: url("chrome://global/skin/icons/settings.svg") left no-repeat;
+    background-size: 16px;
+    padding-inline-start: 21px;
+    margin-bottom: 20px; }
+    .home-section .external-link:dir(rtl) {
+      background-position-x: right; }
+  .home-section .external-link:hover {
+    text-decoration: underline; }
+
+.home-section .section .sponsored-checkbox:focus-visible,
+.selector:focus-visible,
+.external-link:focus-visible,
+.close-button:focus-visible {
+  border: 1px solid var(--newtab-focus-border);
+  border-radius: 4px;
+  outline: 0;
+  box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .card-outer {
   background: var(--newtab-card-background-color);
   border-radius: 3px;
@@ -1679,8 +1937,8 @@
 
 .asrouter-toggle {
   position: fixed;
-  top: 15px;
-  inset-inline-end: 48px;
+  top: 50px;
+  inset-inline-end: 15px;
   border: 0;
   background: none;
   z-index: 1;
@@ -2559,40 +2817,21 @@
     color: #003EAA; }
 
 .ds-navigation {
-  line-height: 32px;
+  color: #737373;
   padding: 4px 0;
-  font-size: 14px;
-  font-weight: 600; }
+  font-weight: 600;
+  line-height: 22px;
+  font-size: 11.5px; }
+  [lwt-newtab-brighttext] .ds-navigation {
+    color: #D7D7DB; }
+  @media (min-width: 1122px) {
+    .ds-navigation {
+      line-height: 32px;
+      font-size: 14px; } }
   .ds-navigation.ds-navigation-centered {
     text-align: center; }
   .ds-navigation.ds-navigation-right-aligned {
     text-align: end; }
-  .ds-navigation.ds-navigation-variant-responsive {
-    font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-header {
-      font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-    .ds-navigation.ds-navigation-variant-responsive .ds-header,
-    .ds-navigation.ds-navigation-variant-responsive ul li,
-    .ds-navigation.ds-navigation-variant-responsive ul {
-      display: none; }
-    @media (min-width: 610px) {
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-      .ds-navigation.ds-navigation-variant-responsive .ds-header,
-      .ds-navigation.ds-navigation-variant-responsive ul {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-header-explore-more {
-        display: none; }
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+3) {
-        display: inline-block; } }
-    @media (min-width: 866px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+6) {
-        display: inline-block; } }
-    @media (min-width: 1122px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more {
-        display: none; } }
   .ds-navigation ul {
     display: inline;
     margin: 0;
@@ -2601,17 +2840,15 @@
     display: inline-block; }
     .ds-navigation ul li::after {
       content: '·';
-      padding: 6px;
-      color: #737373; }
+      padding: 6px; }
     .ds-navigation ul li:last-child::after {
       content: none; }
     .ds-navigation ul li a:hover, .ds-navigation ul li a:active {
       text-decoration: underline; }
     .ds-navigation ul li a:active {
       color: #003EAA; }
-  .ds-navigation .ds-header {
-    margin-bottom: 8px;
-    padding-inline-end: 8px; }
+  .ds-navigation .ds-navigation-header {
+    padding-inline-end: 6px; }
 
 .ds-section-title {
   text-align: center;
@@ -3532,9 +3769,6 @@
   .modalOverlayOuter.active {
     display: flex; }
 
-.modal-height {
-  padding-top: 80px; }
-
 .modalOverlayInner {
   min-width: min-content;
   width: 100%;
@@ -3555,17 +3789,6 @@
       border-radius: 0; } }
   .modalOverlayInner.active {
     display: block; }
-  .modalOverlayInner .icon-dismiss {
-    border: 0;
-    cursor: pointer;
-    inset-inline-end: 0;
-    padding: 20px;
-    fill: #FFF;
-    position: absolute; }
-    .modalOverlayInner .icon-dismiss:hover {
-      background-color: #2B2156; }
-    .modalOverlayInner .icon-dismiss:focus {
-      border: 1px dotted; }
   .modalOverlayInner h2 {
     color: #4A4A4F;
     text-align: center;
@@ -3938,305 +4161,6 @@
   .submissionStatus .submitStatusTitle {
     font-size: 20px; }
 
-.onboardingMessageImage.addons {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-addons@2x.png"); }
-
-.onboardingMessageImage.privatebrowsing {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-privatebrowsing@2x.png"); }
-
-.onboardingMessageImage.screenshots {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-screenshots@2x.png"); }
-
-.onboardingMessageImage.gift {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-gift@2x.png"); }
-
-.onboardingMessageImage.sync {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-sync@2x.png"); }
-
-.onboardingMessageImage.devices {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-devices.svg"); }
-
-.onboardingMessageImage.fbcont {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-fbcont.svg"); }
-
-.onboardingMessageImage.import {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-import.svg"); }
-
-.onboardingMessageImage.ffmonitor {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffmonitor.svg"); }
-
-.onboardingMessageImage.ffsend {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffsend.svg"); }
-
-.onboardingMessageImage.lockwise {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-lockwise.svg"); }
-
-.onboardingMessageImage.mobile {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-mobile.svg"); }
-
-.onboardingMessageImage.pledge {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pledge.svg"); }
-
-.onboardingMessageImage.pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pocket.svg"); }
-
-.onboardingMessageImage.private {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-private.svg"); }
-
-.onboardingMessageImage.sendtab {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-sendtab.svg"); }
-
-.onboardingMessageImage.tracking {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-tracking.svg"); }
-
-.onboardingMessage {
-  height: 340px;
-  text-align: center;
-  padding: 13px;
-  font-weight: 200; }
-  @media (max-width: 850px) {
-    .onboardingMessage {
-      height: 170px;
-      text-align: left;
-      padding: 10px;
-      border-bottom: 1px solid #D7D7DB;
-      display: flex;
-      margin-bottom: 11px; }
-      .onboardingMessage:last-child {
-        border: 0; }
-      .onboardingMessage .onboardingContent {
-        padding-left: 10px;
-        height: 100%; }
-        .onboardingMessage .onboardingContent > span > h3 {
-          margin-top: 0;
-          margin-bottom: 4px;
-          font-weight: 400; }
-        .onboardingMessage .onboardingContent > span > p {
-          margin-top: 0;
-          line-height: 22px;
-          font-size: 15px; } }
-  @media (max-width: 650px) {
-    .onboardingMessage {
-      height: 250px; } }
-  .onboardingMessage .onboardingContent {
-    height: 175px; }
-    .onboardingMessage .onboardingContent > span > h3 {
-      color: #0C0C0D;
-      margin-bottom: 8px;
-      font-weight: 400; }
-    .onboardingMessage .onboardingContent > span > p {
-      color: #4A4A4F;
-      margin-top: 0;
-      height: 180px;
-      margin-bottom: 12px;
-      font-size: 15px;
-      line-height: 22px; }
-      @media (max-width: 650px) {
-        .onboardingMessage .onboardingContent > span > p {
-          margin-bottom: 0;
-          height: 160px; } }
-  .onboardingMessage .onboardingButton {
-    background-color: rgba(12, 12, 13, 0.1);
-    border: 0;
-    width: 150px;
-    height: 30px;
-    margin-bottom: 23px;
-    padding: 4px 0 6px;
-    font-size: 15px; }
-    @media (max-width: 850px) {
-      .onboardingMessage .onboardingButton {
-        float: right;
-        margin-top: -105px;
-        margin-inline-end: -10px; } }
-    @media (max-width: 650px) {
-      .onboardingMessage .onboardingButton {
-        float: none; } }
-    .onboardingMessage .onboardingButton:focus, .onboardingMessage .onboardingButton.active, .onboardingMessage .onboardingButton:hover {
-      box-shadow: 0 0 0 5px #D7D7DB;
-      transition: box-shadow 150ms; }
-  .onboardingMessage::before {
-    content: '';
-    height: 230px;
-    width: 1px;
-    position: absolute;
-    background-color: #D7D7DB;
-    margin-top: 40px;
-    margin-inline-start: 215px; }
-    @media (max-width: 850px) {
-      .onboardingMessage::before {
-        content: none; } }
-  .onboardingMessage:last-child::before {
-    content: none; }
-
-.onboardingMessageImage {
-  height: 112px;
-  width: 180px;
-  background-size: auto 140px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  display: inline-block; }
-  @media (max-width: 865px) {
-    .onboardingMessageImage {
-      height: 75px;
-      min-width: 80px;
-      background-size: 140px; } }
-
-.trailheadCards {
-  background: var(--trailhead-cards-background-color);
-  overflow: hidden;
-  text-align: center;
-  transition: max-height 0.5s cubic-bezier(0.07, 0.95, 0, 1); }
-  @media (min-width: 610px) {
-    .trailheadCards {
-      max-height: 1000px; } }
-  .trailheadCards.collapsed {
-    max-height: 0; }
-  .trailheadCards h1 {
-    font-size: 36px;
-    font-weight: 200;
-    margin: 0 0 40px;
-    color: var(--trailhead-header-text-color); }
-
-.trailheadCardsInner {
-  margin: auto;
-  padding: 40px 25px; }
-  @media (min-width: 610px) {
-    .trailheadCardsInner {
-      width: 530px; } }
-  @media (min-width: 866px) {
-    .trailheadCardsInner {
-      width: 786px; } }
-  @media (min-width: 1122px) {
-    .trailheadCardsInner {
-      width: 1042px; } }
-  .trailheadCardsInner .icon-dismiss {
-    border: 0;
-    border-radius: 4px;
-    cursor: pointer;
-    inset-inline-end: 15px;
-    padding: 15px;
-    opacity: 0.75;
-    position: absolute;
-    top: 15px; }
-    .trailheadCardsInner .icon-dismiss:hover, .trailheadCardsInner .icon-dismiss:focus {
-      background-color: var(--newtab-element-active-color); }
-
-.trailheadCardGrid {
-  display: grid;
-  grid-gap: 32px;
-  margin: 0;
-  opacity: 0;
-  transition: opacity 0.4s;
-  transition-delay: 0.1s;
-  grid-auto-rows: 1fr; }
-  .trailheadCardGrid.show {
-    opacity: 1; }
-  @media (min-width: 610px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 224px); } }
-  @media (min-width: 1122px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 309px); } }
-
-.trailheadCard {
-  position: relative;
-  background: var(--newtab-card-background-color);
-  border-radius: 4px;
-  box-shadow: var(--newtab-card-shadow);
-  font-size: 13px;
-  padding: 20px 20px 60px; }
-  @media (max-width: 865px) {
-    .trailheadCard {
-      padding: 20px; } }
-  @media (min-width: 1122px) {
-    .trailheadCard {
-      font-size: 15px; } }
-  .trailheadCard .onboardingTitle {
-    font-weight: normal;
-    color: var(--newtab-text-primary-color);
-    margin: 10px 0 4px;
-    font-size: 15px; }
-    @media (min-width: 1122px) {
-      .trailheadCard .onboardingTitle {
-        font-size: 18px; } }
-  .trailheadCard .onboardingText {
-    margin: 0 0 60px;
-    color: var(--newtab-text-conditional-color);
-    line-height: 1.5;
-    font-weight: 200; }
-  .trailheadCard .onboardingButton {
-    color: var(--newtab-text-conditional-color);
-    background: var(--trailhead-card-button-background-color);
-    border: 0;
-    margin: 14px;
-    min-width: 70%;
-    padding: 6px 14px;
-    white-space: pre-wrap; }
-    .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover {
-      box-shadow: none;
-      background: var(--trailhead-card-button-background-hover-color); }
-    .trailheadCard .onboardingButton:focus {
-      outline: dotted 1px; }
-    .trailheadCard .onboardingButton:active {
-      background: var(--trailhead-card-button-background-active-color); }
-  .trailheadCard .onboardingButtonContainer {
-    position: absolute;
-    bottom: 16px;
-    left: 0;
-    width: 100%;
-    text-align: center; }
-
-.activity-stream.welcome {
-  overflow: hidden; }
-
-.inline-onboarding.activity-stream.welcome {
-  overflow-y: hidden; }
-
-.inline-onboarding .outer-wrapper {
-  position: relative;
-  display: block; }
-  .inline-onboarding .outer-wrapper .prefs-button button {
-    position: absolute; }
-
-.inline-onboarding .asrouter-toggle {
-  position: absolute; }
-
-.error {
-  display: none; }
-
-.error.active {
-  display: block;
-  padding: 5px 12px;
-  animation: fade-down 450ms;
-  font-size: 12px;
-  font-weight: 500;
-  color: #FFF;
-  background-color: #D70022;
-  position: absolute;
-  inset-inline-start: 50px;
-  top: -28px;
-  border-radius: 2px; }
-  .error.active::before {
-    inset-inline-start: 12px;
-    background: #D70022;
-    bottom: -8px;
-    content: '.';
-    height: 16px;
-    position: absolute;
-    text-indent: -999px;
-    transform: rotate(45deg);
-    white-space: nowrap;
-    width: 16px;
-    z-index: -1; }
-
-@keyframes fade-down {
-  0% {
-    opacity: 0;
-    transform: translateY(-15px); }
-  100% {
-    opacity: 1;
-    transform: translateY(0); } }
-
 .EOYSnippetForm {
   margin: 10px 0 8px;
   align-self: start;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-mac.css firefox-85.0+build1/browser/components/newtab/css/activity-stream-mac.css
--- firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-mac.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/css/activity-stream-mac.css	2021-01-18 19:58:08.000000000 +0000
@@ -49,6 +49,10 @@
   --newtab-textbox-border: rgba(12, 12, 13, 0.2);
   --newtab-textbox-focus-color: #0060DF;
   --newtab-textbox-focus-boxshadow: 0 0 0 1px #0060DF, 0 0 0 4px rgba(0, 96, 223, 0.3);
+  --newtab-background-button-color: rgba(223, 223, 223, 0.5);
+  --newtab-background-button-text-color: #484848;
+  --newtab-background-button-hover-color: rgba(196, 196, 196, 0.5);
+  --newtab-background-button-active-color: rgba(151, 151, 151, 0.5);
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
   --newtab-feed-button-background: #EDEDF0;
@@ -79,11 +83,22 @@
   --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent;
-  --trailhead-header-text-color: #2B2156;
-  --trailhead-cards-background-color: #EDEDF0;
-  --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1);
-  --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2);
-  --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.3); }
+  --newtab-focus-outline: 0 0 0 2px var(--newtab-focus-outline);
+  --newtab-focus-border: #0060DF;
+  --newtab-focus-border-selected: rgba(0, 0, 0, 0.15);
+  --newtab-primary-action-background: #0060DF;
+  --newtab-primary-action-background-off: #E9E9E9;
+  --customize-menu-primary-text-color: #20123A;
+  --customize-menu-check-fill: #FFF;
+  --customize-menu-background: #FFF;
+  --customize-menu-secondary-action-background: #F9F9FA;
+  --customize-menu-secondary-action-background-hover: #EDEDF0;
+  --customize-menu-secondary-action-background-active: #E2E2E6;
+  --customize-menu-seperator-line-color: #E1E0E6;
+  --customize-menu-first-shadow: rgba(9, 32, 77, 0.12);
+  --customize-menu-second-shadow: rgba(29, 17, 51, 0.12);
+  --customize-menu-primary-action-text: #FFF;
+  --customize-menu-line-color: #716F87; }
   body[lwt-newtab-brighttext] {
     --newtab-background-color: #2A2A2E;
     --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
@@ -105,6 +120,10 @@
     --newtab-textbox-border: rgba(249, 249, 250, 0.2);
     --newtab-textbox-focus-color: #45A1FF;
     --newtab-textbox-focus-boxshadow: 0 0 0 1px #45A1FF, 0 0 0 4px rgba(69, 161, 255, 0.3);
+    --newtab-background-button-color: rgba(80, 80, 80, 0.5);
+    --newtab-background-button-text-color: #CDCDD4;
+    --newtab-background-button-hover-color: rgba(114, 114, 114, 0.5);
+    --newtab-background-button-active-color: rgba(173, 173, 173, 0.5);
     --newtab-feed-button-background: #38383D;
     --newtab-feed-button-text: #F9F9FA;
     --newtab-feed-button-background-faded: rgba(56, 56, 61, 0.6);
@@ -133,11 +152,22 @@
     --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2);
     --newtab-snippets-background-color: #38383D;
     --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1);
-    --trailhead-header-text-color: rgba(255, 255, 255, 0.6);
-    --trailhead-cards-background-color: rgba(12, 12, 13, 0.1);
-    --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3);
-    --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.5);
-    --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.7); }
+    --newtab-focus-outline: rgba(80, 145, 241, 0.5);
+    --newtab-focus-border: #B5D3FF;
+    --newtab-focus-border-selected: #B5D3FF;
+    --newtab-primary-action-background: #4484E2;
+    --newtab-primary-action-background-off: #6A6A6F;
+    --customize-menu-primary-text-color: #E0E0E6;
+    --customize-menu-check-fill: #E0E0E6;
+    --customize-menu-background: #38383D;
+    --customize-menu-secondary-action-background: #515156;
+    --customize-menu-secondary-action-background-hover: #606065;
+    --customize-menu-secondary-action-background-active: #6F6F74;
+    --customize-menu-seperator-line-color: #53515F;
+    --customize-menu-first-shadow: rgba(21, 20, 26, 0.5);
+    --customize-menu-second-shadow: rgba(21, 20, 26, 0.75);
+    --customize-menu-primary-action-text: #E0E0E6;
+    --customize-menu-line-color: #B9B7CC; }
 
 .icon {
   background-position: center center;
@@ -456,6 +486,38 @@
   .prefs-button button:active {
     background-color: var(--newtab-element-active-color); }
 
+@media (max-height: 701px) {
+  .personalize-button {
+    position: absolute;
+    top: 16px;
+    inset-inline-end: 16px; } }
+
+@media (min-height: 700px) {
+  .personalize-button {
+    position: fixed;
+    top: 16px;
+    inset-inline-end: 16px;
+    z-index: 1000; } }
+
+.personalize-button {
+  font-size: 12px;
+  border: 0;
+  border-radius: 4px;
+  background-color: var(--newtab-background-button-color);
+  color: var(--newtab-background-button-text-color);
+  padding: 0 10px;
+  min-height: 32px;
+  max-width: 150px; }
+  .personalize-button:hover {
+    background-color: var(--newtab-background-button-hover-color); }
+  .personalize-button:active {
+    background-color: var(--newtab-background-button-active-color); }
+  .personalize-button:focus-visible {
+    border: 1px solid var(--newtab-focus-border);
+    border-radius: 4px;
+    outline: 0;
+    box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .as-error-fallback {
   align-items: center;
   border-radius: 3px;
@@ -1036,25 +1098,25 @@
     align-items: center;
     display: flex;
     justify-content: center;
-    margin-bottom: 49px; }
+    margin-bottom: 48px; }
     .search-wrapper .logo-and-wordmark .logo {
       background: url("chrome://branding/content/about-logo.png") no-repeat center;
-      background-size: 96px;
+      background-size: 82px;
       display: inline-block;
-      height: 96px;
-      width: 96px; }
+      height: 82px;
+      width: 82px; }
       @media (min-resolution: 2x) {
         .search-wrapper .logo-and-wordmark .logo {
           background-image: url("chrome://branding/content/about-logo@2x.png"); } }
     .search-wrapper .logo-and-wordmark .wordmark {
       background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
-      background-size: 172px;
+      background-size: 134px;
       -moz-context-properties: fill;
       display: inline-block;
       fill: var(--newtab-search-wordmark-color);
-      height: 96px;
-      margin-inline-start: 15px;
-      width: 172px; }
+      height: 82px;
+      margin-inline-start: 16px;
+      width: 134px; }
     @media (max-width: 609px) {
       .search-wrapper .logo-and-wordmark .logo {
         background-size: 64px;
@@ -1063,7 +1125,8 @@
       .search-wrapper .logo-and-wordmark .wordmark {
         background-size: 100px;
         height: 64px;
-        width: 100px; } }
+        width: 100px;
+        margin-inline-start: 12px; } }
   .search-wrapper .search-inner-wrapper {
     cursor: default;
     display: flex;
@@ -1365,6 +1428,201 @@
   font-size: 15px;
   z-index: 11002; }
 
+.customize-menu {
+  color: var(--customize-menu-primary-text-color);
+  background-color: var(--customize-menu-background);
+  width: 432px;
+  height: 100%;
+  position: fixed;
+  inset-block: 0;
+  inset-inline-end: 0;
+  z-index: 1001;
+  padding: 16px;
+  transition: transform 250ms cubic-bezier(0.46, 0.03, 0.52, 0.96);
+  overflow: auto;
+  transform: translateX(435px); }
+  .customize-menu:dir(rtl) {
+    transform: translateX(-435px); }
+  .customize-menu.customize-animate-enter-done {
+    transform: translateX(0); }
+  .customize-menu.customize-animate-enter-done, .customize-menu.customize-animate-enter-active, .customize-menu.customize-animate-exit-active {
+    box-shadow: 0 0 64px var(--customize-menu-first-shadow), 0 0 24px var(--customize-menu-second-shadow); }
+  .customize-menu.customize-animate-exit-done {
+    transform: translateX(435px); }
+    .customize-menu.customize-animate-exit-done:dir(rtl) {
+      transform: translateX(-435px); }
+  .customize-menu .close-button {
+    margin-inline-start: auto;
+    margin-bottom: 28px;
+    white-space: nowrap;
+    display: block;
+    background-color: var(--customize-menu-secondary-action-background);
+    padding: 8px 10px;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    color: var(--customize-menu-primary-text-color);
+    font-size: 13px;
+    font-weight: 600; }
+  .customize-menu .close-button:hover {
+    background-color: var(--customize-menu-secondary-action-background-hover); }
+  .customize-menu .close-button:hover:active {
+    background-color: var(--customize-menu-secondary-action-background-active); }
+
+.grid-skip {
+  display: contents; }
+
+.home-section {
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-template-rows: repeat(4, auto);
+  grid-row-gap: 32px;
+  padding: 0 16px; }
+  .home-section .section {
+    display: grid;
+    grid-template-rows: auto;
+    grid-template-columns: auto 26px; }
+    .home-section .section .title {
+      grid-column: 1 / -1;
+      margin: 0;
+      font-weight: 600;
+      font-size: 16px;
+      margin-bottom: 10px; }
+    .home-section .section .subtitle {
+      margin: 0;
+      font-size: 14px; }
+    .home-section .section .sponsored {
+      font-size: 14px;
+      margin-inline-start: 5px; }
+    .home-section .section .check-wrapper {
+      position: relative; }
+    .home-section .section .sponsored-checkbox {
+      margin-inline-start: 2px;
+      width: 16px;
+      height: 16px;
+      vertical-align: middle;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      box-sizing: border-box;
+      border-radius: 4px;
+      appearance: none;
+      background-color: var(--newtab-primary-action-background-off); }
+    .home-section .section .sponsored-checkbox:checked {
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-check-fill);
+      background: url("chrome://global/skin/icons/check.svg") center no-repeat;
+      background-color: var(--newtab-primary-action-background);
+      background-size: 10px; }
+    .home-section .section .sponsored-checkbox:active + .checkmark {
+      fill: rgba(0, 0, 0, 0.15); }
+    .home-section .section .selector {
+      color: var(--customize-menu-primary-text-color);
+      width: 118px;
+      display: block;
+      border: 1px solid var(--customize-menu-line-color);
+      border-radius: 4px;
+      appearance: none;
+      padding-block: 7px;
+      padding-inline: 10px 13px;
+      margin-bottom: 10px;
+      margin-inline-start: 2px;
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-primary-text-color);
+      background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;
+      background-size: 8px;
+      background-origin: content-box;
+      background-color: var(--customize-menu-background); }
+      .home-section .section .selector:dir(rtl) {
+        background-position-x: left; }
+    .home-section .section .switch {
+      position: relative;
+      display: inline-block;
+      width: 26px;
+      height: 16px; }
+    .home-section .section .switch input {
+      opacity: 0;
+      width: 0;
+      height: 0; }
+    .home-section .section .slider {
+      position: absolute;
+      inset: 0;
+      transition: 250ms;
+      border-radius: 13px;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      background-color: var(--newtab-primary-action-background-off); }
+      .home-section .section .slider::before {
+        position: absolute;
+        content: '';
+        height: 8px;
+        width: 8px;
+        inset-inline-start: 3px;
+        bottom: 3px;
+        background-color: var(--customize-menu-primary-action-text);
+        transition: 250ms;
+        border-radius: 50%;
+        outline: 1px solid rgba(0, 0, 0, 0.15);
+        -moz-outline-radius: 11px; }
+    .home-section .section .switch input:focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border-selected);
+      outline: 0;
+      box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+    .home-section .section .switch input:not(:checked):focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border); }
+    .home-section .section input:checked + .slider {
+      background-color: var(--newtab-primary-action-background); }
+    .home-section .section input:checked + .slider::before {
+      transform: translateX(10px); }
+    .home-section .section input:checked + .slider:dir(rtl)::before {
+      transform: translateX(-10px); }
+    .home-section .section .more-info-top-wrapper,
+    .home-section .section .more-info-pocket-wrapper {
+      margin-inline-start: -2px;
+      overflow: hidden;
+      transition: max-height 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper.shrink,
+      .home-section .section .more-info-pocket-wrapper.shrink {
+        max-height: 0; }
+      .home-section .section .more-info-top-wrapper .more-information,
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        padding-top: 12px;
+        position: relative;
+        transition: top 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper .more-information.expand,
+      .home-section .section .more-info-pocket-wrapper .more-information.expand {
+        top: 0; }
+    .home-section .section .more-info-top-wrapper {
+      max-height: 78px; }
+      .home-section .section .more-info-top-wrapper .more-information {
+        top: -77px; }
+    .home-section .section .more-info-pocket-wrapper {
+      max-height: 35px; }
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        top: -35px; }
+  .home-section .divider {
+    border-top: 1px var(--customize-menu-seperator-line-color) solid;
+    margin: 0 -16px; }
+  .home-section .external-link {
+    font-size: 14px;
+    cursor: pointer;
+    border: 1px solid transparent;
+    -moz-context-properties: fill;
+    fill: var(--customize-menu-primary-text-color);
+    background: url("chrome://global/skin/icons/settings.svg") left no-repeat;
+    background-size: 16px;
+    padding-inline-start: 21px;
+    margin-bottom: 20px; }
+    .home-section .external-link:dir(rtl) {
+      background-position-x: right; }
+  .home-section .external-link:hover {
+    text-decoration: underline; }
+
+.home-section .section .sponsored-checkbox:focus-visible,
+.selector:focus-visible,
+.external-link:focus-visible,
+.close-button:focus-visible {
+  border: 1px solid var(--newtab-focus-border);
+  border-radius: 4px;
+  outline: 0;
+  box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .card-outer {
   background: var(--newtab-card-background-color);
   border-radius: 3px;
@@ -1682,8 +1940,8 @@
 
 .asrouter-toggle {
   position: fixed;
-  top: 15px;
-  inset-inline-end: 48px;
+  top: 50px;
+  inset-inline-end: 15px;
   border: 0;
   background: none;
   z-index: 1;
@@ -2562,40 +2820,21 @@
     color: #003EAA; }
 
 .ds-navigation {
-  line-height: 32px;
+  color: #737373;
   padding: 4px 0;
-  font-size: 14px;
-  font-weight: 600; }
+  font-weight: 600;
+  line-height: 22px;
+  font-size: 11.5px; }
+  [lwt-newtab-brighttext] .ds-navigation {
+    color: #D7D7DB; }
+  @media (min-width: 1122px) {
+    .ds-navigation {
+      line-height: 32px;
+      font-size: 14px; } }
   .ds-navigation.ds-navigation-centered {
     text-align: center; }
   .ds-navigation.ds-navigation-right-aligned {
     text-align: end; }
-  .ds-navigation.ds-navigation-variant-responsive {
-    font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-header {
-      font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-    .ds-navigation.ds-navigation-variant-responsive .ds-header,
-    .ds-navigation.ds-navigation-variant-responsive ul li,
-    .ds-navigation.ds-navigation-variant-responsive ul {
-      display: none; }
-    @media (min-width: 610px) {
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-      .ds-navigation.ds-navigation-variant-responsive .ds-header,
-      .ds-navigation.ds-navigation-variant-responsive ul {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-header-explore-more {
-        display: none; }
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+3) {
-        display: inline-block; } }
-    @media (min-width: 866px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+6) {
-        display: inline-block; } }
-    @media (min-width: 1122px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more {
-        display: none; } }
   .ds-navigation ul {
     display: inline;
     margin: 0;
@@ -2604,17 +2843,15 @@
     display: inline-block; }
     .ds-navigation ul li::after {
       content: '·';
-      padding: 6px;
-      color: #737373; }
+      padding: 6px; }
     .ds-navigation ul li:last-child::after {
       content: none; }
     .ds-navigation ul li a:hover, .ds-navigation ul li a:active {
       text-decoration: underline; }
     .ds-navigation ul li a:active {
       color: #003EAA; }
-  .ds-navigation .ds-header {
-    margin-bottom: 8px;
-    padding-inline-end: 8px; }
+  .ds-navigation .ds-navigation-header {
+    padding-inline-end: 6px; }
 
 .ds-section-title {
   text-align: center;
@@ -3535,9 +3772,6 @@
   .modalOverlayOuter.active {
     display: flex; }
 
-.modal-height {
-  padding-top: 80px; }
-
 .modalOverlayInner {
   min-width: min-content;
   width: 100%;
@@ -3558,17 +3792,6 @@
       border-radius: 0; } }
   .modalOverlayInner.active {
     display: block; }
-  .modalOverlayInner .icon-dismiss {
-    border: 0;
-    cursor: pointer;
-    inset-inline-end: 0;
-    padding: 20px;
-    fill: #FFF;
-    position: absolute; }
-    .modalOverlayInner .icon-dismiss:hover {
-      background-color: #2B2156; }
-    .modalOverlayInner .icon-dismiss:focus {
-      border: 1px dotted; }
   .modalOverlayInner h2 {
     color: #4A4A4F;
     text-align: center;
@@ -3941,305 +4164,6 @@
   .submissionStatus .submitStatusTitle {
     font-size: 20px; }
 
-.onboardingMessageImage.addons {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-addons@2x.png"); }
-
-.onboardingMessageImage.privatebrowsing {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-privatebrowsing@2x.png"); }
-
-.onboardingMessageImage.screenshots {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-screenshots@2x.png"); }
-
-.onboardingMessageImage.gift {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-gift@2x.png"); }
-
-.onboardingMessageImage.sync {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-sync@2x.png"); }
-
-.onboardingMessageImage.devices {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-devices.svg"); }
-
-.onboardingMessageImage.fbcont {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-fbcont.svg"); }
-
-.onboardingMessageImage.import {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-import.svg"); }
-
-.onboardingMessageImage.ffmonitor {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffmonitor.svg"); }
-
-.onboardingMessageImage.ffsend {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffsend.svg"); }
-
-.onboardingMessageImage.lockwise {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-lockwise.svg"); }
-
-.onboardingMessageImage.mobile {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-mobile.svg"); }
-
-.onboardingMessageImage.pledge {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pledge.svg"); }
-
-.onboardingMessageImage.pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pocket.svg"); }
-
-.onboardingMessageImage.private {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-private.svg"); }
-
-.onboardingMessageImage.sendtab {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-sendtab.svg"); }
-
-.onboardingMessageImage.tracking {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-tracking.svg"); }
-
-.onboardingMessage {
-  height: 340px;
-  text-align: center;
-  padding: 13px;
-  font-weight: 200; }
-  @media (max-width: 850px) {
-    .onboardingMessage {
-      height: 170px;
-      text-align: left;
-      padding: 10px;
-      border-bottom: 1px solid #D7D7DB;
-      display: flex;
-      margin-bottom: 11px; }
-      .onboardingMessage:last-child {
-        border: 0; }
-      .onboardingMessage .onboardingContent {
-        padding-left: 10px;
-        height: 100%; }
-        .onboardingMessage .onboardingContent > span > h3 {
-          margin-top: 0;
-          margin-bottom: 4px;
-          font-weight: 400; }
-        .onboardingMessage .onboardingContent > span > p {
-          margin-top: 0;
-          line-height: 22px;
-          font-size: 15px; } }
-  @media (max-width: 650px) {
-    .onboardingMessage {
-      height: 250px; } }
-  .onboardingMessage .onboardingContent {
-    height: 175px; }
-    .onboardingMessage .onboardingContent > span > h3 {
-      color: #0C0C0D;
-      margin-bottom: 8px;
-      font-weight: 400; }
-    .onboardingMessage .onboardingContent > span > p {
-      color: #4A4A4F;
-      margin-top: 0;
-      height: 180px;
-      margin-bottom: 12px;
-      font-size: 15px;
-      line-height: 22px; }
-      @media (max-width: 650px) {
-        .onboardingMessage .onboardingContent > span > p {
-          margin-bottom: 0;
-          height: 160px; } }
-  .onboardingMessage .onboardingButton {
-    background-color: rgba(12, 12, 13, 0.1);
-    border: 0;
-    width: 150px;
-    height: 30px;
-    margin-bottom: 23px;
-    padding: 4px 0 6px;
-    font-size: 15px; }
-    @media (max-width: 850px) {
-      .onboardingMessage .onboardingButton {
-        float: right;
-        margin-top: -105px;
-        margin-inline-end: -10px; } }
-    @media (max-width: 650px) {
-      .onboardingMessage .onboardingButton {
-        float: none; } }
-    .onboardingMessage .onboardingButton:focus, .onboardingMessage .onboardingButton.active, .onboardingMessage .onboardingButton:hover {
-      box-shadow: 0 0 0 5px #D7D7DB;
-      transition: box-shadow 150ms; }
-  .onboardingMessage::before {
-    content: '';
-    height: 230px;
-    width: 1px;
-    position: absolute;
-    background-color: #D7D7DB;
-    margin-top: 40px;
-    margin-inline-start: 215px; }
-    @media (max-width: 850px) {
-      .onboardingMessage::before {
-        content: none; } }
-  .onboardingMessage:last-child::before {
-    content: none; }
-
-.onboardingMessageImage {
-  height: 112px;
-  width: 180px;
-  background-size: auto 140px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  display: inline-block; }
-  @media (max-width: 865px) {
-    .onboardingMessageImage {
-      height: 75px;
-      min-width: 80px;
-      background-size: 140px; } }
-
-.trailheadCards {
-  background: var(--trailhead-cards-background-color);
-  overflow: hidden;
-  text-align: center;
-  transition: max-height 0.5s cubic-bezier(0.07, 0.95, 0, 1); }
-  @media (min-width: 610px) {
-    .trailheadCards {
-      max-height: 1000px; } }
-  .trailheadCards.collapsed {
-    max-height: 0; }
-  .trailheadCards h1 {
-    font-size: 36px;
-    font-weight: 200;
-    margin: 0 0 40px;
-    color: var(--trailhead-header-text-color); }
-
-.trailheadCardsInner {
-  margin: auto;
-  padding: 40px 25px; }
-  @media (min-width: 610px) {
-    .trailheadCardsInner {
-      width: 530px; } }
-  @media (min-width: 866px) {
-    .trailheadCardsInner {
-      width: 786px; } }
-  @media (min-width: 1122px) {
-    .trailheadCardsInner {
-      width: 1042px; } }
-  .trailheadCardsInner .icon-dismiss {
-    border: 0;
-    border-radius: 4px;
-    cursor: pointer;
-    inset-inline-end: 15px;
-    padding: 15px;
-    opacity: 0.75;
-    position: absolute;
-    top: 15px; }
-    .trailheadCardsInner .icon-dismiss:hover, .trailheadCardsInner .icon-dismiss:focus {
-      background-color: var(--newtab-element-active-color); }
-
-.trailheadCardGrid {
-  display: grid;
-  grid-gap: 32px;
-  margin: 0;
-  opacity: 0;
-  transition: opacity 0.4s;
-  transition-delay: 0.1s;
-  grid-auto-rows: 1fr; }
-  .trailheadCardGrid.show {
-    opacity: 1; }
-  @media (min-width: 610px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 224px); } }
-  @media (min-width: 1122px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 309px); } }
-
-.trailheadCard {
-  position: relative;
-  background: var(--newtab-card-background-color);
-  border-radius: 4px;
-  box-shadow: var(--newtab-card-shadow);
-  font-size: 13px;
-  padding: 20px 20px 60px; }
-  @media (max-width: 865px) {
-    .trailheadCard {
-      padding: 20px; } }
-  @media (min-width: 1122px) {
-    .trailheadCard {
-      font-size: 15px; } }
-  .trailheadCard .onboardingTitle {
-    font-weight: normal;
-    color: var(--newtab-text-primary-color);
-    margin: 10px 0 4px;
-    font-size: 15px; }
-    @media (min-width: 1122px) {
-      .trailheadCard .onboardingTitle {
-        font-size: 18px; } }
-  .trailheadCard .onboardingText {
-    margin: 0 0 60px;
-    color: var(--newtab-text-conditional-color);
-    line-height: 1.5;
-    font-weight: 200; }
-  .trailheadCard .onboardingButton {
-    color: var(--newtab-text-conditional-color);
-    background: var(--trailhead-card-button-background-color);
-    border: 0;
-    margin: 14px;
-    min-width: 70%;
-    padding: 6px 14px;
-    white-space: pre-wrap; }
-    .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover {
-      box-shadow: none;
-      background: var(--trailhead-card-button-background-hover-color); }
-    .trailheadCard .onboardingButton:focus {
-      outline: dotted 1px; }
-    .trailheadCard .onboardingButton:active {
-      background: var(--trailhead-card-button-background-active-color); }
-  .trailheadCard .onboardingButtonContainer {
-    position: absolute;
-    bottom: 16px;
-    left: 0;
-    width: 100%;
-    text-align: center; }
-
-.activity-stream.welcome {
-  overflow: hidden; }
-
-.inline-onboarding.activity-stream.welcome {
-  overflow-y: hidden; }
-
-.inline-onboarding .outer-wrapper {
-  position: relative;
-  display: block; }
-  .inline-onboarding .outer-wrapper .prefs-button button {
-    position: absolute; }
-
-.inline-onboarding .asrouter-toggle {
-  position: absolute; }
-
-.error {
-  display: none; }
-
-.error.active {
-  display: block;
-  padding: 5px 12px;
-  animation: fade-down 450ms;
-  font-size: 12px;
-  font-weight: 500;
-  color: #FFF;
-  background-color: #D70022;
-  position: absolute;
-  inset-inline-start: 50px;
-  top: -28px;
-  border-radius: 2px; }
-  .error.active::before {
-    inset-inline-start: 12px;
-    background: #D70022;
-    bottom: -8px;
-    content: '.';
-    height: 16px;
-    position: absolute;
-    text-indent: -999px;
-    transform: rotate(45deg);
-    white-space: nowrap;
-    width: 16px;
-    z-index: -1; }
-
-@keyframes fade-down {
-  0% {
-    opacity: 0;
-    transform: translateY(-15px); }
-  100% {
-    opacity: 1;
-    transform: translateY(0); } }
-
 .EOYSnippetForm {
   margin: 10px 0 8px;
   align-self: start;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-windows.css firefox-85.0+build1/browser/components/newtab/css/activity-stream-windows.css
--- firefox-84.0.2+build1/browser/components/newtab/css/activity-stream-windows.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/css/activity-stream-windows.css	2021-01-18 19:58:08.000000000 +0000
@@ -46,6 +46,10 @@
   --newtab-textbox-border: rgba(12, 12, 13, 0.2);
   --newtab-textbox-focus-color: #0060DF;
   --newtab-textbox-focus-boxshadow: 0 0 0 1px #0060DF, 0 0 0 4px rgba(0, 96, 223, 0.3);
+  --newtab-background-button-color: rgba(223, 223, 223, 0.5);
+  --newtab-background-button-text-color: #484848;
+  --newtab-background-button-hover-color: rgba(196, 196, 196, 0.5);
+  --newtab-background-button-active-color: rgba(151, 151, 151, 0.5);
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
   --newtab-feed-button-background: #EDEDF0;
@@ -76,11 +80,22 @@
   --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1);
   --newtab-snippets-background-color: #FFF;
   --newtab-snippets-hairline-color: transparent;
-  --trailhead-header-text-color: #2B2156;
-  --trailhead-cards-background-color: #EDEDF0;
-  --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1);
-  --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2);
-  --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.3); }
+  --newtab-focus-outline: 0 0 0 2px var(--newtab-focus-outline);
+  --newtab-focus-border: #0060DF;
+  --newtab-focus-border-selected: rgba(0, 0, 0, 0.15);
+  --newtab-primary-action-background: #0060DF;
+  --newtab-primary-action-background-off: #E9E9E9;
+  --customize-menu-primary-text-color: #20123A;
+  --customize-menu-check-fill: #FFF;
+  --customize-menu-background: #FFF;
+  --customize-menu-secondary-action-background: #F9F9FA;
+  --customize-menu-secondary-action-background-hover: #EDEDF0;
+  --customize-menu-secondary-action-background-active: #E2E2E6;
+  --customize-menu-seperator-line-color: #E1E0E6;
+  --customize-menu-first-shadow: rgba(9, 32, 77, 0.12);
+  --customize-menu-second-shadow: rgba(29, 17, 51, 0.12);
+  --customize-menu-primary-action-text: #FFF;
+  --customize-menu-line-color: #716F87; }
   body[lwt-newtab-brighttext] {
     --newtab-background-color: #2A2A2E;
     --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
@@ -102,6 +117,10 @@
     --newtab-textbox-border: rgba(249, 249, 250, 0.2);
     --newtab-textbox-focus-color: #45A1FF;
     --newtab-textbox-focus-boxshadow: 0 0 0 1px #45A1FF, 0 0 0 4px rgba(69, 161, 255, 0.3);
+    --newtab-background-button-color: rgba(80, 80, 80, 0.5);
+    --newtab-background-button-text-color: #CDCDD4;
+    --newtab-background-button-hover-color: rgba(114, 114, 114, 0.5);
+    --newtab-background-button-active-color: rgba(173, 173, 173, 0.5);
     --newtab-feed-button-background: #38383D;
     --newtab-feed-button-text: #F9F9FA;
     --newtab-feed-button-background-faded: rgba(56, 56, 61, 0.6);
@@ -130,11 +149,22 @@
     --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2);
     --newtab-snippets-background-color: #38383D;
     --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1);
-    --trailhead-header-text-color: rgba(255, 255, 255, 0.6);
-    --trailhead-cards-background-color: rgba(12, 12, 13, 0.1);
-    --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3);
-    --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.5);
-    --trailhead-card-button-background-active-color: rgba(12, 12, 13, 0.7); }
+    --newtab-focus-outline: rgba(80, 145, 241, 0.5);
+    --newtab-focus-border: #B5D3FF;
+    --newtab-focus-border-selected: #B5D3FF;
+    --newtab-primary-action-background: #4484E2;
+    --newtab-primary-action-background-off: #6A6A6F;
+    --customize-menu-primary-text-color: #E0E0E6;
+    --customize-menu-check-fill: #E0E0E6;
+    --customize-menu-background: #38383D;
+    --customize-menu-secondary-action-background: #515156;
+    --customize-menu-secondary-action-background-hover: #606065;
+    --customize-menu-secondary-action-background-active: #6F6F74;
+    --customize-menu-seperator-line-color: #53515F;
+    --customize-menu-first-shadow: rgba(21, 20, 26, 0.5);
+    --customize-menu-second-shadow: rgba(21, 20, 26, 0.75);
+    --customize-menu-primary-action-text: #E0E0E6;
+    --customize-menu-line-color: #B9B7CC; }
 
 .icon {
   background-position: center center;
@@ -453,6 +483,38 @@
   .prefs-button button:active {
     background-color: var(--newtab-element-active-color); }
 
+@media (max-height: 701px) {
+  .personalize-button {
+    position: absolute;
+    top: 16px;
+    inset-inline-end: 16px; } }
+
+@media (min-height: 700px) {
+  .personalize-button {
+    position: fixed;
+    top: 16px;
+    inset-inline-end: 16px;
+    z-index: 1000; } }
+
+.personalize-button {
+  font-size: 12px;
+  border: 0;
+  border-radius: 4px;
+  background-color: var(--newtab-background-button-color);
+  color: var(--newtab-background-button-text-color);
+  padding: 0 10px;
+  min-height: 32px;
+  max-width: 150px; }
+  .personalize-button:hover {
+    background-color: var(--newtab-background-button-hover-color); }
+  .personalize-button:active {
+    background-color: var(--newtab-background-button-active-color); }
+  .personalize-button:focus-visible {
+    border: 1px solid var(--newtab-focus-border);
+    border-radius: 4px;
+    outline: 0;
+    box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .as-error-fallback {
   align-items: center;
   border-radius: 3px;
@@ -1033,25 +1095,25 @@
     align-items: center;
     display: flex;
     justify-content: center;
-    margin-bottom: 49px; }
+    margin-bottom: 48px; }
     .search-wrapper .logo-and-wordmark .logo {
       background: url("chrome://branding/content/about-logo.png") no-repeat center;
-      background-size: 96px;
+      background-size: 82px;
       display: inline-block;
-      height: 96px;
-      width: 96px; }
+      height: 82px;
+      width: 82px; }
       @media (min-resolution: 2x) {
         .search-wrapper .logo-and-wordmark .logo {
           background-image: url("chrome://branding/content/about-logo@2x.png"); } }
     .search-wrapper .logo-and-wordmark .wordmark {
       background: url("chrome://branding/content/firefox-wordmark.svg") no-repeat center center;
-      background-size: 172px;
+      background-size: 134px;
       -moz-context-properties: fill;
       display: inline-block;
       fill: var(--newtab-search-wordmark-color);
-      height: 96px;
-      margin-inline-start: 15px;
-      width: 172px; }
+      height: 82px;
+      margin-inline-start: 16px;
+      width: 134px; }
     @media (max-width: 609px) {
       .search-wrapper .logo-and-wordmark .logo {
         background-size: 64px;
@@ -1060,7 +1122,8 @@
       .search-wrapper .logo-and-wordmark .wordmark {
         background-size: 100px;
         height: 64px;
-        width: 100px; } }
+        width: 100px;
+        margin-inline-start: 12px; } }
   .search-wrapper .search-inner-wrapper {
     cursor: default;
     display: flex;
@@ -1362,6 +1425,201 @@
   font-size: 15px;
   z-index: 11002; }
 
+.customize-menu {
+  color: var(--customize-menu-primary-text-color);
+  background-color: var(--customize-menu-background);
+  width: 432px;
+  height: 100%;
+  position: fixed;
+  inset-block: 0;
+  inset-inline-end: 0;
+  z-index: 1001;
+  padding: 16px;
+  transition: transform 250ms cubic-bezier(0.46, 0.03, 0.52, 0.96);
+  overflow: auto;
+  transform: translateX(435px); }
+  .customize-menu:dir(rtl) {
+    transform: translateX(-435px); }
+  .customize-menu.customize-animate-enter-done {
+    transform: translateX(0); }
+  .customize-menu.customize-animate-enter-done, .customize-menu.customize-animate-enter-active, .customize-menu.customize-animate-exit-active {
+    box-shadow: 0 0 64px var(--customize-menu-first-shadow), 0 0 24px var(--customize-menu-second-shadow); }
+  .customize-menu.customize-animate-exit-done {
+    transform: translateX(435px); }
+    .customize-menu.customize-animate-exit-done:dir(rtl) {
+      transform: translateX(-435px); }
+  .customize-menu .close-button {
+    margin-inline-start: auto;
+    margin-bottom: 28px;
+    white-space: nowrap;
+    display: block;
+    background-color: var(--customize-menu-secondary-action-background);
+    padding: 8px 10px;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    color: var(--customize-menu-primary-text-color);
+    font-size: 13px;
+    font-weight: 600; }
+  .customize-menu .close-button:hover {
+    background-color: var(--customize-menu-secondary-action-background-hover); }
+  .customize-menu .close-button:hover:active {
+    background-color: var(--customize-menu-secondary-action-background-active); }
+
+.grid-skip {
+  display: contents; }
+
+.home-section {
+  display: grid;
+  grid-template-columns: 1fr;
+  grid-template-rows: repeat(4, auto);
+  grid-row-gap: 32px;
+  padding: 0 16px; }
+  .home-section .section {
+    display: grid;
+    grid-template-rows: auto;
+    grid-template-columns: auto 26px; }
+    .home-section .section .title {
+      grid-column: 1 / -1;
+      margin: 0;
+      font-weight: 600;
+      font-size: 16px;
+      margin-bottom: 10px; }
+    .home-section .section .subtitle {
+      margin: 0;
+      font-size: 14px; }
+    .home-section .section .sponsored {
+      font-size: 14px;
+      margin-inline-start: 5px; }
+    .home-section .section .check-wrapper {
+      position: relative; }
+    .home-section .section .sponsored-checkbox {
+      margin-inline-start: 2px;
+      width: 16px;
+      height: 16px;
+      vertical-align: middle;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      box-sizing: border-box;
+      border-radius: 4px;
+      appearance: none;
+      background-color: var(--newtab-primary-action-background-off); }
+    .home-section .section .sponsored-checkbox:checked {
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-check-fill);
+      background: url("chrome://global/skin/icons/check.svg") center no-repeat;
+      background-color: var(--newtab-primary-action-background);
+      background-size: 10px; }
+    .home-section .section .sponsored-checkbox:active + .checkmark {
+      fill: rgba(0, 0, 0, 0.15); }
+    .home-section .section .selector {
+      color: var(--customize-menu-primary-text-color);
+      width: 118px;
+      display: block;
+      border: 1px solid var(--customize-menu-line-color);
+      border-radius: 4px;
+      appearance: none;
+      padding-block: 7px;
+      padding-inline: 10px 13px;
+      margin-bottom: 10px;
+      margin-inline-start: 2px;
+      -moz-context-properties: fill;
+      fill: var(--customize-menu-primary-text-color);
+      background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;
+      background-size: 8px;
+      background-origin: content-box;
+      background-color: var(--customize-menu-background); }
+      .home-section .section .selector:dir(rtl) {
+        background-position-x: left; }
+    .home-section .section .switch {
+      position: relative;
+      display: inline-block;
+      width: 26px;
+      height: 16px; }
+    .home-section .section .switch input {
+      opacity: 0;
+      width: 0;
+      height: 0; }
+    .home-section .section .slider {
+      position: absolute;
+      inset: 0;
+      transition: 250ms;
+      border-radius: 13px;
+      border: 1px solid rgba(0, 0, 0, 0.15);
+      background-color: var(--newtab-primary-action-background-off); }
+      .home-section .section .slider::before {
+        position: absolute;
+        content: '';
+        height: 8px;
+        width: 8px;
+        inset-inline-start: 3px;
+        bottom: 3px;
+        background-color: var(--customize-menu-primary-action-text);
+        transition: 250ms;
+        border-radius: 50%;
+        outline: 1px solid rgba(0, 0, 0, 0.15);
+        -moz-outline-radius: 11px; }
+    .home-section .section .switch input:focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border-selected);
+      outline: 0;
+      box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+    .home-section .section .switch input:not(:checked):focus-visible + .slider {
+      border: 1px solid var(--newtab-focus-border); }
+    .home-section .section input:checked + .slider {
+      background-color: var(--newtab-primary-action-background); }
+    .home-section .section input:checked + .slider::before {
+      transform: translateX(10px); }
+    .home-section .section input:checked + .slider:dir(rtl)::before {
+      transform: translateX(-10px); }
+    .home-section .section .more-info-top-wrapper,
+    .home-section .section .more-info-pocket-wrapper {
+      margin-inline-start: -2px;
+      overflow: hidden;
+      transition: max-height 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper.shrink,
+      .home-section .section .more-info-pocket-wrapper.shrink {
+        max-height: 0; }
+      .home-section .section .more-info-top-wrapper .more-information,
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        padding-top: 12px;
+        position: relative;
+        transition: top 250ms cubic-bezier(0.82, 0.085, 0.395, 0.895); }
+      .home-section .section .more-info-top-wrapper .more-information.expand,
+      .home-section .section .more-info-pocket-wrapper .more-information.expand {
+        top: 0; }
+    .home-section .section .more-info-top-wrapper {
+      max-height: 78px; }
+      .home-section .section .more-info-top-wrapper .more-information {
+        top: -77px; }
+    .home-section .section .more-info-pocket-wrapper {
+      max-height: 35px; }
+      .home-section .section .more-info-pocket-wrapper .more-information {
+        top: -35px; }
+  .home-section .divider {
+    border-top: 1px var(--customize-menu-seperator-line-color) solid;
+    margin: 0 -16px; }
+  .home-section .external-link {
+    font-size: 14px;
+    cursor: pointer;
+    border: 1px solid transparent;
+    -moz-context-properties: fill;
+    fill: var(--customize-menu-primary-text-color);
+    background: url("chrome://global/skin/icons/settings.svg") left no-repeat;
+    background-size: 16px;
+    padding-inline-start: 21px;
+    margin-bottom: 20px; }
+    .home-section .external-link:dir(rtl) {
+      background-position-x: right; }
+  .home-section .external-link:hover {
+    text-decoration: underline; }
+
+.home-section .section .sponsored-checkbox:focus-visible,
+.selector:focus-visible,
+.external-link:focus-visible,
+.close-button:focus-visible {
+  border: 1px solid var(--newtab-focus-border);
+  border-radius: 4px;
+  outline: 0;
+  box-shadow: 0 0 0 2px var(--newtab-focus-outline); }
+
 .card-outer {
   background: var(--newtab-card-background-color);
   border-radius: 3px;
@@ -1679,8 +1937,8 @@
 
 .asrouter-toggle {
   position: fixed;
-  top: 15px;
-  inset-inline-end: 48px;
+  top: 50px;
+  inset-inline-end: 15px;
   border: 0;
   background: none;
   z-index: 1;
@@ -2559,40 +2817,21 @@
     color: #003EAA; }
 
 .ds-navigation {
-  line-height: 32px;
+  color: #737373;
   padding: 4px 0;
-  font-size: 14px;
-  font-weight: 600; }
+  font-weight: 600;
+  line-height: 22px;
+  font-size: 11.5px; }
+  [lwt-newtab-brighttext] .ds-navigation {
+    color: #D7D7DB; }
+  @media (min-width: 1122px) {
+    .ds-navigation {
+      line-height: 32px;
+      font-size: 14px; } }
   .ds-navigation.ds-navigation-centered {
     text-align: center; }
   .ds-navigation.ds-navigation-right-aligned {
     text-align: end; }
-  .ds-navigation.ds-navigation-variant-responsive {
-    font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-header {
-      font-size: 11px; }
-    .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-    .ds-navigation.ds-navigation-variant-responsive .ds-header,
-    .ds-navigation.ds-navigation-variant-responsive ul li,
-    .ds-navigation.ds-navigation-variant-responsive ul {
-      display: none; }
-    @media (min-width: 610px) {
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more,
-      .ds-navigation.ds-navigation-variant-responsive .ds-header,
-      .ds-navigation.ds-navigation-variant-responsive ul {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-header-explore-more {
-        display: none; }
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+3) {
-        display: inline-block; } }
-    @media (min-width: 866px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li:nth-child(-n+6) {
-        display: inline-block; } }
-    @media (min-width: 1122px) {
-      .ds-navigation.ds-navigation-variant-responsive ul li {
-        display: inline-block; }
-      .ds-navigation.ds-navigation-variant-responsive .ds-navigation-inline-explore-more {
-        display: none; } }
   .ds-navigation ul {
     display: inline;
     margin: 0;
@@ -2601,17 +2840,15 @@
     display: inline-block; }
     .ds-navigation ul li::after {
       content: '·';
-      padding: 6px;
-      color: #737373; }
+      padding: 6px; }
     .ds-navigation ul li:last-child::after {
       content: none; }
     .ds-navigation ul li a:hover, .ds-navigation ul li a:active {
       text-decoration: underline; }
     .ds-navigation ul li a:active {
       color: #003EAA; }
-  .ds-navigation .ds-header {
-    margin-bottom: 8px;
-    padding-inline-end: 8px; }
+  .ds-navigation .ds-navigation-header {
+    padding-inline-end: 6px; }
 
 .ds-section-title {
   text-align: center;
@@ -3532,9 +3769,6 @@
   .modalOverlayOuter.active {
     display: flex; }
 
-.modal-height {
-  padding-top: 80px; }
-
 .modalOverlayInner {
   min-width: min-content;
   width: 100%;
@@ -3555,17 +3789,6 @@
       border-radius: 0; } }
   .modalOverlayInner.active {
     display: block; }
-  .modalOverlayInner .icon-dismiss {
-    border: 0;
-    cursor: pointer;
-    inset-inline-end: 0;
-    padding: 20px;
-    fill: #FFF;
-    position: absolute; }
-    .modalOverlayInner .icon-dismiss:hover {
-      background-color: #2B2156; }
-    .modalOverlayInner .icon-dismiss:focus {
-      border: 1px dotted; }
   .modalOverlayInner h2 {
     color: #4A4A4F;
     text-align: center;
@@ -3938,305 +4161,6 @@
   .submissionStatus .submitStatusTitle {
     font-size: 20px; }
 
-.onboardingMessageImage.addons {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-addons@2x.png"); }
-
-.onboardingMessageImage.privatebrowsing {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-privatebrowsing@2x.png"); }
-
-.onboardingMessageImage.screenshots {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-screenshots@2x.png"); }
-
-.onboardingMessageImage.gift {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-gift@2x.png"); }
-
-.onboardingMessageImage.sync {
-  background-image: url("chrome://activity-stream/content/data/content/assets/illustration-sync@2x.png"); }
-
-.onboardingMessageImage.devices {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-devices.svg"); }
-
-.onboardingMessageImage.fbcont {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-fbcont.svg"); }
-
-.onboardingMessageImage.import {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-import.svg"); }
-
-.onboardingMessageImage.ffmonitor {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffmonitor.svg"); }
-
-.onboardingMessageImage.ffsend {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-ffsend.svg"); }
-
-.onboardingMessageImage.lockwise {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-lockwise.svg"); }
-
-.onboardingMessageImage.mobile {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-mobile.svg"); }
-
-.onboardingMessageImage.pledge {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pledge.svg"); }
-
-.onboardingMessageImage.pocket {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-pocket.svg"); }
-
-.onboardingMessageImage.private {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-private.svg"); }
-
-.onboardingMessageImage.sendtab {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-sendtab.svg"); }
-
-.onboardingMessageImage.tracking {
-  background-image: url("chrome://activity-stream/content/data/content/assets/trailhead/card-illo-tracking.svg"); }
-
-.onboardingMessage {
-  height: 340px;
-  text-align: center;
-  padding: 13px;
-  font-weight: 200; }
-  @media (max-width: 850px) {
-    .onboardingMessage {
-      height: 170px;
-      text-align: left;
-      padding: 10px;
-      border-bottom: 1px solid #D7D7DB;
-      display: flex;
-      margin-bottom: 11px; }
-      .onboardingMessage:last-child {
-        border: 0; }
-      .onboardingMessage .onboardingContent {
-        padding-left: 10px;
-        height: 100%; }
-        .onboardingMessage .onboardingContent > span > h3 {
-          margin-top: 0;
-          margin-bottom: 4px;
-          font-weight: 400; }
-        .onboardingMessage .onboardingContent > span > p {
-          margin-top: 0;
-          line-height: 22px;
-          font-size: 15px; } }
-  @media (max-width: 650px) {
-    .onboardingMessage {
-      height: 250px; } }
-  .onboardingMessage .onboardingContent {
-    height: 175px; }
-    .onboardingMessage .onboardingContent > span > h3 {
-      color: #0C0C0D;
-      margin-bottom: 8px;
-      font-weight: 400; }
-    .onboardingMessage .onboardingContent > span > p {
-      color: #4A4A4F;
-      margin-top: 0;
-      height: 180px;
-      margin-bottom: 12px;
-      font-size: 15px;
-      line-height: 22px; }
-      @media (max-width: 650px) {
-        .onboardingMessage .onboardingContent > span > p {
-          margin-bottom: 0;
-          height: 160px; } }
-  .onboardingMessage .onboardingButton {
-    background-color: rgba(12, 12, 13, 0.1);
-    border: 0;
-    width: 150px;
-    height: 30px;
-    margin-bottom: 23px;
-    padding: 4px 0 6px;
-    font-size: 15px; }
-    @media (max-width: 850px) {
-      .onboardingMessage .onboardingButton {
-        float: right;
-        margin-top: -105px;
-        margin-inline-end: -10px; } }
-    @media (max-width: 650px) {
-      .onboardingMessage .onboardingButton {
-        float: none; } }
-    .onboardingMessage .onboardingButton:focus, .onboardingMessage .onboardingButton.active, .onboardingMessage .onboardingButton:hover {
-      box-shadow: 0 0 0 5px #D7D7DB;
-      transition: box-shadow 150ms; }
-  .onboardingMessage::before {
-    content: '';
-    height: 230px;
-    width: 1px;
-    position: absolute;
-    background-color: #D7D7DB;
-    margin-top: 40px;
-    margin-inline-start: 215px; }
-    @media (max-width: 850px) {
-      .onboardingMessage::before {
-        content: none; } }
-  .onboardingMessage:last-child::before {
-    content: none; }
-
-.onboardingMessageImage {
-  height: 112px;
-  width: 180px;
-  background-size: auto 140px;
-  background-position: center center;
-  background-repeat: no-repeat;
-  display: inline-block; }
-  @media (max-width: 865px) {
-    .onboardingMessageImage {
-      height: 75px;
-      min-width: 80px;
-      background-size: 140px; } }
-
-.trailheadCards {
-  background: var(--trailhead-cards-background-color);
-  overflow: hidden;
-  text-align: center;
-  transition: max-height 0.5s cubic-bezier(0.07, 0.95, 0, 1); }
-  @media (min-width: 610px) {
-    .trailheadCards {
-      max-height: 1000px; } }
-  .trailheadCards.collapsed {
-    max-height: 0; }
-  .trailheadCards h1 {
-    font-size: 36px;
-    font-weight: 200;
-    margin: 0 0 40px;
-    color: var(--trailhead-header-text-color); }
-
-.trailheadCardsInner {
-  margin: auto;
-  padding: 40px 25px; }
-  @media (min-width: 610px) {
-    .trailheadCardsInner {
-      width: 530px; } }
-  @media (min-width: 866px) {
-    .trailheadCardsInner {
-      width: 786px; } }
-  @media (min-width: 1122px) {
-    .trailheadCardsInner {
-      width: 1042px; } }
-  .trailheadCardsInner .icon-dismiss {
-    border: 0;
-    border-radius: 4px;
-    cursor: pointer;
-    inset-inline-end: 15px;
-    padding: 15px;
-    opacity: 0.75;
-    position: absolute;
-    top: 15px; }
-    .trailheadCardsInner .icon-dismiss:hover, .trailheadCardsInner .icon-dismiss:focus {
-      background-color: var(--newtab-element-active-color); }
-
-.trailheadCardGrid {
-  display: grid;
-  grid-gap: 32px;
-  margin: 0;
-  opacity: 0;
-  transition: opacity 0.4s;
-  transition-delay: 0.1s;
-  grid-auto-rows: 1fr; }
-  .trailheadCardGrid.show {
-    opacity: 1; }
-  @media (min-width: 610px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 224px); } }
-  @media (min-width: 1122px) {
-    .trailheadCardGrid {
-      grid-template-columns: repeat(auto-fit, 309px); } }
-
-.trailheadCard {
-  position: relative;
-  background: var(--newtab-card-background-color);
-  border-radius: 4px;
-  box-shadow: var(--newtab-card-shadow);
-  font-size: 13px;
-  padding: 20px 20px 60px; }
-  @media (max-width: 865px) {
-    .trailheadCard {
-      padding: 20px; } }
-  @media (min-width: 1122px) {
-    .trailheadCard {
-      font-size: 15px; } }
-  .trailheadCard .onboardingTitle {
-    font-weight: normal;
-    color: var(--newtab-text-primary-color);
-    margin: 10px 0 4px;
-    font-size: 15px; }
-    @media (min-width: 1122px) {
-      .trailheadCard .onboardingTitle {
-        font-size: 18px; } }
-  .trailheadCard .onboardingText {
-    margin: 0 0 60px;
-    color: var(--newtab-text-conditional-color);
-    line-height: 1.5;
-    font-weight: 200; }
-  .trailheadCard .onboardingButton {
-    color: var(--newtab-text-conditional-color);
-    background: var(--trailhead-card-button-background-color);
-    border: 0;
-    margin: 14px;
-    min-width: 70%;
-    padding: 6px 14px;
-    white-space: pre-wrap; }
-    .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover {
-      box-shadow: none;
-      background: var(--trailhead-card-button-background-hover-color); }
-    .trailheadCard .onboardingButton:focus {
-      outline: dotted 1px; }
-    .trailheadCard .onboardingButton:active {
-      background: var(--trailhead-card-button-background-active-color); }
-  .trailheadCard .onboardingButtonContainer {
-    position: absolute;
-    bottom: 16px;
-    left: 0;
-    width: 100%;
-    text-align: center; }
-
-.activity-stream.welcome {
-  overflow: hidden; }
-
-.inline-onboarding.activity-stream.welcome {
-  overflow-y: hidden; }
-
-.inline-onboarding .outer-wrapper {
-  position: relative;
-  display: block; }
-  .inline-onboarding .outer-wrapper .prefs-button button {
-    position: absolute; }
-
-.inline-onboarding .asrouter-toggle {
-  position: absolute; }
-
-.error {
-  display: none; }
-
-.error.active {
-  display: block;
-  padding: 5px 12px;
-  animation: fade-down 450ms;
-  font-size: 12px;
-  font-weight: 500;
-  color: #FFF;
-  background-color: #D70022;
-  position: absolute;
-  inset-inline-start: 50px;
-  top: -28px;
-  border-radius: 2px; }
-  .error.active::before {
-    inset-inline-start: 12px;
-    background: #D70022;
-    bottom: -8px;
-    content: '.';
-    height: 16px;
-    position: absolute;
-    text-indent: -999px;
-    transform: rotate(45deg);
-    white-space: nowrap;
-    width: 16px;
-    z-index: -1; }
-
-@keyframes fade-down {
-  0% {
-    opacity: 0;
-    transform: translateY(-15px); }
-  100% {
-    opacity: 1;
-    transform: translateY(0); } }
-
 .EOYSnippetForm {
   margin: 10px 0 8px;
   align-self: start;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/data/content/activity-stream.bundle.js firefox-85.0+build1/browser/components/newtab/data/content/activity-stream.bundle.js
--- firefox-84.0.2+build1/browser/components/newtab/data/content/activity-stream.bundle.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/data/content/activity-stream.bundle.js	2021-01-18 19:58:08.000000000 +0000
@@ -97,15 +97,15 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "renderCache", function() { return renderCache; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var content_src_components_Base_Base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var content_src_lib_detect_user_session_start__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(68);
-/* harmony import */ var content_src_lib_init_store__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(69);
+/* harmony import */ var content_src_lib_detect_user_session_start__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(65);
+/* harmony import */ var content_src_lib_init_store__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(15);
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(14);
 /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(74);
+/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(72);
 /* 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/. */
@@ -205,7 +205,7 @@
 // }
 const actionTypes = {};
 
-for (const type of ["ABOUT_SPONSORED_TOP_SITES", "ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_INITIALIZED", "AS_ROUTER_PREF_CHANGED", "AS_ROUTER_TARGETING_UPDATE", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "CLEAR_PREF", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISCOVERY_STREAM_COLLECTION_DISMISSIBLE_TOGGLE", "DISCOVERY_STREAM_CONFIG_CHANGE", "DISCOVERY_STREAM_CONFIG_RESET", "DISCOVERY_STREAM_CONFIG_RESET_DEFAULTS", "DISCOVERY_STREAM_CONFIG_SETUP", "DISCOVERY_STREAM_CONFIG_SET_VALUE", "DISCOVERY_STREAM_DEV_EXPIRE_CACHE", "DISCOVERY_STREAM_DEV_IDLE_DAILY", "DISCOVERY_STREAM_DEV_SYNC_RS", "DISCOVERY_STREAM_DEV_SYSTEM_TICK", "DISCOVERY_STREAM_FEEDS_UPDATE", "DISCOVERY_STREAM_FEED_UPDATE", "DISCOVERY_STREAM_IMPRESSION_STATS", "DISCOVERY_STREAM_LAYOUT_RESET", "DISCOVERY_STREAM_LAYOUT_UPDATE", "DISCOVERY_STREAM_LINK_BLOCKED", "DISCOVERY_STREAM_LOADED_CONTENT", "DISCOVERY_STREAM_PERSONALIZATION_INIT", "DISCOVERY_STREAM_PERSONALIZATION_LAST_UPDATED", "DISCOVERY_STREAM_PERSONALIZATION_VERSION", "DISCOVERY_STREAM_PERSONALIZATION_VERSION_TOGGLE", "DISCOVERY_STREAM_RETRY_FEED", "DISCOVERY_STREAM_SPOCS_CAPS", "DISCOVERY_STREAM_SPOCS_ENDPOINT", "DISCOVERY_STREAM_SPOCS_FILL", "DISCOVERY_STREAM_SPOCS_PLACEMENTS", "DISCOVERY_STREAM_SPOCS_UPDATE", "DISCOVERY_STREAM_SPOC_BLOCKED", "DISCOVERY_STREAM_SPOC_IMPRESSION", "DOWNLOAD_CHANGED", "FAKE_FOCUS_SEARCH", "FILL_SEARCH_TERM", "HANDOFF_SEARCH_TO_AWESOMEBAR", "HIDE_PRIVACY_INFO", "HIDE_SEARCH", "INIT", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PARTNER_LINK_ATTRIBUTION", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "POCKET_CTA", "POCKET_LINK_DELETED_OR_ARCHIVED", "POCKET_LOGGED_IN", "POCKET_WAITING_FOR_SPOC", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SHOW_PRIVACY_INFO", "SHOW_SEARCH", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_PREVIEW_MODE", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SUBMIT_SIGNIN", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_CLOSE_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_OPEN_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_PINNED_SEARCH_SHORTCUTS", "UPDATE_SEARCH_SHORTCUTS", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) {
+for (const type of ["ABOUT_SPONSORED_TOP_SITES", "ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_INITIALIZED", "AS_ROUTER_PREF_CHANGED", "AS_ROUTER_TARGETING_UPDATE", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "CLEAR_PREF", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISCOVERY_STREAM_COLLECTION_DISMISSIBLE_TOGGLE", "DISCOVERY_STREAM_CONFIG_CHANGE", "DISCOVERY_STREAM_CONFIG_RESET", "DISCOVERY_STREAM_CONFIG_RESET_DEFAULTS", "DISCOVERY_STREAM_CONFIG_SETUP", "DISCOVERY_STREAM_CONFIG_SET_VALUE", "DISCOVERY_STREAM_DEV_EXPIRE_CACHE", "DISCOVERY_STREAM_DEV_IDLE_DAILY", "DISCOVERY_STREAM_DEV_SYNC_RS", "DISCOVERY_STREAM_DEV_SYSTEM_TICK", "DISCOVERY_STREAM_FEEDS_UPDATE", "DISCOVERY_STREAM_FEED_UPDATE", "DISCOVERY_STREAM_IMPRESSION_STATS", "DISCOVERY_STREAM_LAYOUT_RESET", "DISCOVERY_STREAM_LAYOUT_UPDATE", "DISCOVERY_STREAM_LINK_BLOCKED", "DISCOVERY_STREAM_LOADED_CONTENT", "DISCOVERY_STREAM_PERSONALIZATION_INIT", "DISCOVERY_STREAM_PERSONALIZATION_LAST_UPDATED", "DISCOVERY_STREAM_PERSONALIZATION_VERSION", "DISCOVERY_STREAM_PERSONALIZATION_VERSION_TOGGLE", "DISCOVERY_STREAM_RETRY_FEED", "DISCOVERY_STREAM_SPOCS_CAPS", "DISCOVERY_STREAM_SPOCS_ENDPOINT", "DISCOVERY_STREAM_SPOCS_FILL", "DISCOVERY_STREAM_SPOCS_PLACEMENTS", "DISCOVERY_STREAM_SPOCS_UPDATE", "DISCOVERY_STREAM_SPOC_BLOCKED", "DISCOVERY_STREAM_SPOC_IMPRESSION", "DOWNLOAD_CHANGED", "FAKE_FOCUS_SEARCH", "FILL_SEARCH_TERM", "HANDOFF_SEARCH_TO_AWESOMEBAR", "HIDE_PRIVACY_INFO", "HIDE_SEARCH", "INIT", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PARTNER_LINK_ATTRIBUTION", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "POCKET_CTA", "POCKET_LINK_DELETED_OR_ARCHIVED", "POCKET_LOGGED_IN", "POCKET_WAITING_FOR_SPOC", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SHOW_PRIVACY_INFO", "SHOW_SEARCH", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_PREVIEW_MODE", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SUBMIT_SIGNIN", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_CLOSE_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_OPEN_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_PINNED_SEARCH_SHORTCUTS", "UPDATE_SEARCH_SHORTCUTS", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) {
   actionTypes[type] = type;
 } // Helper function for creating routed actions between content and main
 // Not intended to be used by consumers
@@ -391,22 +391,6 @@
   return importContext === UI_CODE ? AlsoToMain(action) : action;
 }
 /**
- * PerfEvent - A telemetry ping indicating a performance-related event.
- *
- * @param  {object} data Fields to include in the ping (value, etc.)
- * @param  {int} importContext (For testing) Override the import context for testing.
- * @return {object} An action. For UI code, a AlsoToMain action.
- */
-
-
-function PerfEvent(data, importContext = globalImportContext) {
-  const action = {
-    type: actionTypes.TELEMETRY_PERFORMANCE_EVENT,
-    data
-  };
-  return importContext === UI_CODE ? AlsoToMain(action) : action;
-}
-/**
  * ImpressionStats - A telemetry ping indicating an impression stats.
  *
  * @param  {object} data Fields to include in the ping
@@ -483,7 +467,6 @@
   UserEvent,
   ASRouterUserEvent,
   UndesiredEvent,
-  PerfEvent,
   ImpressionStats,
   AlsoToOneContent,
   OnlyToOneContent,
@@ -559,21 +542,26 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_Base", function() { return _Base; });
+/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PrefsButton", function() { return PrefsButton; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PersonalizeButton", function() { return PersonalizeButton; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_Base", function() { return _Base; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BaseContent", function() { return BaseContent; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Base", function() { return Base; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var content_src_components_ASRouterAdmin_ASRouterAdmin__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var _asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11);
-/* harmony import */ var content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(19);
+/* harmony import */ var _asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(10);
+/* harmony import */ var content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(20);
-/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(39);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(67);
-/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(50);
+/* harmony import */ var content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(16);
+/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(35);
+/* harmony import */ var content_src_components_CustomizeMenu_CustomizeMenu__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(71);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(8);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(64);
+/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(47);
+/* harmony import */ var react_transition_group__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(29);
+/* harmony import */ var react_transition_group__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react_transition_group__WEBPACK_IMPORTED_MODULE_11__);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -590,16 +578,26 @@
 
 
 
-const PrefsButton = props => react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
+
+const PrefsButton = ({
+  onClick,
+  icon
+}) => react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
   className: "prefs-button"
-}, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("button", {
-  className: "icon icon-settings",
-  onClick: props.onClick,
+}, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("button", {
+  className: `icon ${icon || "icon-settings"}`,
+  onClick: onClick,
   "data-l10n-id": "newtab-settings-button"
-})); // Returns a function will not be continuously triggered when called. The
+}));
+const PersonalizeButton = ({
+  onClick
+}) => react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("button", {
+  className: "personalize-button",
+  onClick: onClick,
+  "data-l10n-id": "newtab-personalize-button-label"
+}); // Returns a function will not be continuously triggered when called. The
 // function will be triggered if called again after `wait` milliseconds.
 
-
 function debounce(func, wait) {
   let timer;
   return (...args) => {
@@ -616,7 +614,7 @@
   };
 }
 
-class _Base extends react__WEBPACK_IMPORTED_MODULE_7___default.a.PureComponent {
+class _Base extends react__WEBPACK_IMPORTED_MODULE_8___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
@@ -657,23 +655,27 @@
       return null;
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], {
+    return react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], {
       className: "base-content-fallback"
-    }, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_7___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(BaseContent, _extends({}, this.props, {
+    }, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_8___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(BaseContent, _extends({}, this.props, {
       adminContent: this.state
-    })), isDevtoolsEnabled ? react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_ASRouterAdmin_ASRouterAdmin__WEBPACK_IMPORTED_MODULE_1__["ASRouterAdmin"], {
+    })), isDevtoolsEnabled ? react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_ASRouterAdmin_ASRouterAdmin__WEBPACK_IMPORTED_MODULE_1__["ASRouterAdmin"], {
       notifyContent: this.notifyContent
     }) : null));
   }
 
 }
-class BaseContent extends react__WEBPACK_IMPORTED_MODULE_7___default.a.PureComponent {
+class BaseContent extends react__WEBPACK_IMPORTED_MODULE_8___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.openPreferences = this.openPreferences.bind(this);
+    this.openCustomizationMenu = this.openCustomizationMenu.bind(this);
+    this.closeCustomizationMenu = this.closeCustomizationMenu.bind(this);
     this.onWindowScroll = debounce(this.onWindowScroll.bind(this), 5);
+    this.setPref = this.setPref.bind(this);
     this.state = {
-      fixedSearch: false
+      fixedSearch: false,
+      customizeMenuVisible: false
     };
   }
 
@@ -711,6 +713,22 @@
     }));
   }
 
+  openCustomizationMenu() {
+    this.setState({
+      customizeMenuVisible: true
+    });
+  }
+
+  closeCustomizationMenu() {
+    this.setState({
+      customizeMenuVisible: false
+    });
+  }
+
+  setPref(pref, value) {
+    this.props.dispatch(common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionCreators"].SetPref(pref, value));
+  }
+
   render() {
     const {
       props
@@ -721,35 +739,72 @@
     const {
       initialized
     } = App;
-    const prefs = props.Prefs.values;
+    const prefs = props.Prefs.values; // Values from experiment data
+
+    const {
+      prefsButtonIcon
+    } = prefs.featureConfig || {};
     const isDiscoveryStream = props.DiscoveryStream.config && props.DiscoveryStream.config.enabled;
     let filteredSections = props.Sections.filter(section => section.id !== "topstories");
     const pocketEnabled = prefs["feeds.section.topstories"] && prefs["feeds.system.topstories"];
     const noSectionsEnabled = !prefs["feeds.topsites"] && !pocketEnabled && filteredSections.filter(section => section.enabled).length === 0;
     const searchHandoffEnabled = prefs["improvesearch.handoffToAwesomebar"];
     const showLogo = prefs["logowordmark.alwaysVisible"] && (!prefs["feeds.section.topstories"] || !prefs["feeds.system.topstories"] && prefs.region);
+    const customizationMenuEnabled = prefs["customizationMenu.enabled"];
+    const newNewtabExperienceEnabled = prefs["newNewtabExperience.enabled"];
+    const canShowCustomizationMenu = customizationMenuEnabled || newNewtabExperienceEnabled;
+    const showCustomizationMenu = canShowCustomizationMenu && this.state.customizeMenuVisible;
+    const enabledSections = {
+      topSitesEnabled: prefs["feeds.topsites"],
+      pocketEnabled: prefs["feeds.section.topstories"],
+      snippetsEnabled: prefs["feeds.snippets"],
+      highlightsEnabled: prefs["feeds.section.highlights"],
+      showSponsoredTopSitesEnabled: prefs.showSponsoredTopSites,
+      showSponsoredPocketEnabled: prefs.showSponsored,
+      topSitesRowsCount: prefs.topSitesRows
+    };
+    const pocketRegion = prefs["feeds.system.topstories"];
+    const {
+      mayHaveSponsoredTopSites
+    } = prefs;
     const outerClassName = ["outer-wrapper", isDiscoveryStream && pocketEnabled && "ds-outer-wrapper-search-alignment", isDiscoveryStream && "ds-outer-wrapper-breakpoint-override", prefs.showSearch && this.state.fixedSearch && !noSectionsEnabled && "fixed-search", prefs.showSearch && noSectionsEnabled && "only-search", showLogo && "visible-logo"].filter(v => v).join(" ");
-    return react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
+    return react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", null, canShowCustomizationMenu ? react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(PersonalizeButton, {
+      onClick: this.openCustomizationMenu
+    }) : react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(PrefsButton, {
+      onClick: this.openPreferences,
+      icon: prefsButtonIcon
+    }), react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
       className: outerClassName
-    }, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("main", null, prefs.showSearch && react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
+    }, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("main", null, prefs.showSearch && react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
       className: "non-collapsible-section"
-    }, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], null, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_8__["Search"], _extends({
+    }, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], null, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_9__["Search"], _extends({
       showLogo: noSectionsEnabled || showLogo,
       handoffEnabled: searchHandoffEnabled
-    }, props.Search)))), react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_2__["ASRouterUISurface"], {
+    }, props.Search)))), react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_2__["ASRouterUISurface"], {
       adminContent: this.props.adminContent,
       appUpdateChannel: this.props.Prefs.values.appUpdateChannel,
       fxaEndpoint: this.props.Prefs.values.fxa_endpoint,
       dispatch: this.props.dispatch
-    }), react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
+    }), react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
       className: `body-wrapper${initialized ? " on" : ""}`
-    }, isDiscoveryStream ? react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], {
+    }, isDiscoveryStream ? react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_6__["ErrorBoundary"], {
       className: "borderless-error"
-    }, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_5__["DiscoveryStreamBase"], {
+    }, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_5__["DiscoveryStreamBase"], {
       locale: props.App.locale
-    })) : react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_9__["Sections"], null), react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(PrefsButton, {
-      onClick: this.openPreferences
-    })), react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_3__["ConfirmDialog"], null))));
+    })) : react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_10__["Sections"], null)), react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_3__["ConfirmDialog"], null))), canShowCustomizationMenu && react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(react_transition_group__WEBPACK_IMPORTED_MODULE_11__["CSSTransition"], {
+      timeout: 0,
+      classNames: "customize-animate",
+      in: showCustomizationMenu,
+      appear: true
+    }, react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(content_src_components_CustomizeMenu_CustomizeMenu__WEBPACK_IMPORTED_MODULE_7__["CustomizeMenu"], {
+      onClose: this.closeCustomizationMenu,
+      openPreferences: this.openPreferences,
+      setPref: this.setPref,
+      enabledSections: enabledSections,
+      pocketRegion: pocketRegion,
+      mayHaveSponsoredTopSites: mayHaveSponsoredTopSites,
+      dispatch: this.props.dispatch
+    })));
   }
 
 }
@@ -806,10 +861,9 @@
 /* harmony import */ var _asrouter_asrouter_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _SimpleHashRouter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _SimpleHashRouter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -821,8 +875,7 @@
 
 
 
-
-const Row = props => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", _extends({
+const Row = props => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", _extends({
   className: "message-item"
 }, props), props.children);
 
@@ -853,7 +906,7 @@
   "dev-test-all": "A little bit of everything. Good layout for testing all components",
   "dev-test-feeds": "Stress testing for slow feeds"
 };
-class ToggleStoryButton extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class ToggleStoryButton extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.handleClick = this.handleClick.bind(this);
@@ -864,13 +917,13 @@
   }
 
   render() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       onClick: this.handleClick
     }, "collapse/open");
   }
 
 }
-class ToggleMessageJSON extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class ToggleMessageJSON extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.handleClick = this.handleClick.bind(this);
@@ -882,16 +935,16 @@
 
   render() {
     let iconName = this.props.isCollapsed ? "icon icon-arrowhead-forward-small" : "icon icon-arrowhead-down-small";
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "clearButton",
       onClick: this.handleClick
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: iconName
     }));
   }
 
 }
-class TogglePrefCheckbox extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class TogglePrefCheckbox extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.onChange = this.onChange.bind(this);
@@ -902,7 +955,7 @@
   }
 
   render() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "checkbox",
       checked: this.props.checked,
       onChange: this.onChange,
@@ -911,7 +964,7 @@
   }
 
 }
-class Personalization extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class Personalization extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.togglePersonalizationVersion = this.togglePersonalizationVersion.bind(this);
@@ -929,20 +982,20 @@
       version,
       initialized
     } = this.props.state.Personalization;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.togglePersonalizationVersion
-    }, version === 1 ? "Enable V2 Personalization" : "Enable V1 Personalization"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, version === 1 ? "Enable V2 Personalization" : "Enable V1 Personalization"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Personalization version"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, version)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Personalization version"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, version)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Personalization Last Updated"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, relativeTime(lastUpdated) || "(no data)")), version === 2 ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Personalization Last Updated"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, relativeTime(lastUpdated) || "(no data)")), version === 2 ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Personalization V2 Initialized"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, initialized ? "true" : "false")) : null)));
+    }, "Personalization V2 Initialized"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, initialized ? "true" : "false")) : null)));
   }
 
 }
-class DiscoveryStreamAdmin extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class DiscoveryStreamAdmin extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.restorePrefDefaults = this.restorePrefDefaults.bind(this);
@@ -1016,11 +1069,11 @@
   }
 
   renderComponent(width, component) {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Type"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, component.type)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Type"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, component.type)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Width"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, width)), component.feed && this.renderFeed(component.feed)));
+    }, "Width"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, width)), component.feed && this.renderFeed(component.feed)));
   }
 
   isCurrentVariant(id) {
@@ -1034,14 +1087,14 @@
       feeds
     } = this.props.state.DiscoveryStream;
     const feed = feeds.data[url].data;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h4", null, "Feed url: ", url), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, feed.recommendations.map(story => this.renderStoryData(story)))));
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h4", null, "Feed url: ", url), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, feed.recommendations.map(story => this.renderStoryData(story)))));
   }
 
   renderFeedsData() {
     const {
       feeds
     } = this.props.state.DiscoveryStream;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, Object.keys(feeds.data).map(url => this.renderFeedData(url)));
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, Object.keys(feeds.data).map(url => this.renderFeedData(url)));
   }
 
   renderSpocs() {
@@ -1054,11 +1107,11 @@
       spocsData = spocs.data.spocs.items || [];
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "spocs_endpoint"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, spocs.spocs_endpoint)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "spocs_endpoint"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, spocs.spocs_endpoint)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, relativeTime(spocs.lastUpdated))))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h4", null, "Spoc data"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, spocsData.map(spoc => this.renderStoryData(spoc)))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h4", null, "Spoc frequency caps"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, spocs.frequency_caps.map(spoc => this.renderStoryData(spoc)))));
+    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, relativeTime(spocs.lastUpdated))))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h4", null, "Spoc data"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, spocsData.map(spoc => this.renderStoryData(spoc)))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h4", null, "Spoc frequency caps"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, spocs.frequency_caps.map(spoc => this.renderStoryData(spoc)))));
   }
 
   onStoryToggle(story) {
@@ -1079,17 +1132,17 @@
       storyData = JSON.stringify(story, null, 2);
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: "message-item",
       key: story.id
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "message-id"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, story.id, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(ToggleStoryButton, {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, story.id, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(ToggleStoryButton, {
       story: story,
       onClick: this.onStoryToggle
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "message-summary"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("pre", null, storyData)));
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("pre", null, storyData)));
   }
 
   renderFeed(feed) {
@@ -1101,11 +1154,11 @@
       return null;
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Feed url"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, feed.url)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Feed url"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, feed.url)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, relativeTime(feeds.data[feed.url] ? feeds.data[feed.url].lastUpdated : null) || "(no data)")));
+    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, relativeTime(feeds.data[feed.url] ? feeds.data[feed.url].lastUpdated : null) || "(no data)")));
   }
 
   render() {
@@ -1115,66 +1168,66 @@
       lastUpdated,
       layout
     } = this.props.state.DiscoveryStream;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.restorePrefDefaults
-    }, "Restore Pref Defaults"), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Restore Pref Defaults"), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.refreshCache
-    }, "Refresh Cache"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Refresh Cache"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.expireCache
-    }, "Expire Cache"), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Expire Cache"), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.systemTick
-    }, "Trigger System Tick"), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Trigger System Tick"), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.idleDaily
-    }, "Trigger Idle Daily"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Trigger Idle Daily"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button",
       onClick: this.syncRemoteSettings
-    }, "Sync Remote Settings"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, prefToggles.map(pref => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, {
+    }, "Sync Remote Settings"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, prefToggles.map(pref => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, {
       key: pref
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(TogglePrefCheckbox, {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(TogglePrefCheckbox, {
       checked: config[pref],
       pref: pref,
       onChange: this.setConfigValue
-    })))))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Endpoint variant"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, "You can also change this manually by changing this pref:", " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("code", null, "browser.newtabpage.activity-stream.discoverystream.config")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", {
+    })))))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Endpoint variant"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, "You can also change this manually by changing this pref:", " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("code", null, "browser.newtabpage.activity-stream.discoverystream.config")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", {
       style: config.enabled && !config.hardcoded_layout ? null : {
         opacity: 0.5
       }
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, Object.keys(LAYOUT_VARIANTS).map(id => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, Object.keys(LAYOUT_VARIANTS).map(id => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, {
       key: id
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "radio",
       value: id,
       checked: this.isCurrentVariant(id),
       onChange: this.changeEndpointVariant
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, id), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, LAYOUT_VARIANTS[id]))))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Caching info"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", {
+    }, id), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, LAYOUT_VARIANTS[id]))))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Caching info"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", {
       style: config.enabled ? null : {
         opacity: 0.5
       }
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, relativeTime(lastUpdated) || "(no data)")))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Layout"), layout.map((row, rowIndex) => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
+    }, "Data last fetched"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, relativeTime(lastUpdated) || "(no data)")))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Layout"), layout.map((row, rowIndex) => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
       key: `row-${rowIndex}`
-    }, row.components.map((component, componentIndex) => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
+    }, row.components.map((component, componentIndex) => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
       key: `component-${componentIndex}`,
       className: "ds-component"
-    }, this.renderComponent(row.width, component))))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Personalization"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Personalization, {
+    }, this.renderComponent(row.width, component))))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Personalization"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Personalization, {
       dispatch: this.props.dispatch,
       state: {
         Personalization: this.props.state.Personalization
       }
-    }), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Spocs"), this.renderSpocs(), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h3", null, "Feeds Data"), this.renderFeedsData());
+    }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Spocs"), this.renderSpocs(), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", null, "Feeds Data"), this.renderFeedsData());
   }
 
 }
-class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.handleEnabledToggle = this.handleEnabledToggle.bind(this);
@@ -1183,13 +1236,11 @@
     this.onChangeMessageGroupsFilter = this.onChangeMessageGroupsFilter.bind(this);
     this.unblockAll = this.unblockAll.bind(this);
     this.handleClearAllImpressionsByProvider = this.handleClearAllImpressionsByProvider.bind(this);
-    this.findOtherBundledMessagesOfSameTemplate = this.findOtherBundledMessagesOfSameTemplate.bind(this);
     this.handleExpressionEval = this.handleExpressionEval.bind(this);
     this.onChangeTargetingParameters = this.onChangeTargetingParameters.bind(this);
     this.onChangeAttributionParameters = this.onChangeAttributionParameters.bind(this);
     this.setAttribution = this.setAttribution.bind(this);
     this.onCopyTargetingParams = this.onCopyTargetingParams.bind(this);
-    this.onPasteTargetingParams = this.onPasteTargetingParams.bind(this);
     this.onNewTargetingParams = this.onNewTargetingParams.bind(this);
     this.handleUpdateWNMessages = this.handleUpdateWNMessages.bind(this);
     this.handleForceWNP = this.handleForceWNP.bind(this);
@@ -1209,11 +1260,9 @@
       collapsedMessages: [],
       modifiedMessages: [],
       evaluationStatus: {},
-      trailheadTriplet: "",
       stringTargetingParameters: null,
       newStringTargetingParameters: null,
       copiedToClipboard: false,
-      pasteFromClipboard: false,
       attributionParameters: {
         source: "addons.mozilla.org",
         medium: "referral",
@@ -1267,27 +1316,11 @@
     }).then(this.setStateFromParent);
   }
 
-  findOtherBundledMessagesOfSameTemplate(template) {
-    return this.state.messages.filter(msg => msg.template === template && msg.bundled);
-  }
-
   handleBlock(msg) {
-    if (msg.bundled && msg.template !== "onboarding") {
-      // If we are blocking a message that belongs to a bundle, block all other messages that are bundled of that same template
-      let bundle = this.findOtherBundledMessagesOfSameTemplate(msg.template);
-      return () => _asrouter_asrouter_utils__WEBPACK_IMPORTED_MODULE_1__["ASRouterUtils"].blockBundle(bundle);
-    }
-
     return () => _asrouter_asrouter_utils__WEBPACK_IMPORTED_MODULE_1__["ASRouterUtils"].blockById(msg.id);
   }
 
   handleUnblock(msg) {
-    if (msg.bundled && msg.template !== "onboarding") {
-      // If we are unblocking a message that belongs to a bundle, unblock all other messages that are bundled of that same template
-      let bundle = this.findOtherBundledMessagesOfSameTemplate(msg.template);
-      return () => _asrouter_asrouter_utils__WEBPACK_IMPORTED_MODULE_1__["ASRouterUtils"].unblockBundle(bundle);
-    }
-
     return () => _asrouter_asrouter_utils__WEBPACK_IMPORTED_MODULE_1__["ASRouterUtils"].unblockById(msg.id);
   }
 
@@ -1541,16 +1574,6 @@
 
     document.addEventListener("copy", setClipboardData);
     document.execCommand("copy");
-  } // Copy all clipboard data to targeting parameters
-
-
-  onPasteTargetingParams(event) {
-    this.setState(({
-      pasteFromClipboard
-    }) => ({
-      pasteFromClipboard: !pasteFromClipboard,
-      newStringTargetingParameters: ""
-    }));
   }
 
   onNewTargetingParams(event) {
@@ -1607,37 +1630,37 @@
       itemClassName += " blocked";
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: itemClassName,
       key: `${msg.id}-${msg.provider}`
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "message-id"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, msg.id, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(ToggleMessageJSON, {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, msg.id, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(ToggleMessageJSON, {
       msgId: `${msg.id}`,
       toggleJSON: this.toggleJSON,
       isCollapsed: isCollapsed
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "button-column"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: `button ${isBlocked ? "" : " primary"}`,
       onClick: isBlocked ? this.handleUnblock(msg) : this.handleBlock(msg)
     }, isBlocked ? "Unblock" : "Block"), // eslint-disable-next-line no-nested-ternary
-    isBlocked ? null : isModified ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    isBlocked ? null : isModified ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button restore" // eslint-disable-next-line react/jsx-no-bind
       ,
       onClick: e => this.resetJSON(msg)
-    }, "Reset") : react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Reset") : react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button show",
       onClick: this.handleOverride(msg.id)
-    }, "Show"), isBlocked ? null : react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Show"), isBlocked ? null : react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button modify" // eslint-disable-next-line react/jsx-no-bind
       ,
       onClick: e => this.modifyJson(msg)
-    }, "Modify"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), "(", impressions, " impressions)"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Modify"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), "(", impressions, " impressions)"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "message-summary"
-    }, isBlocked && react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, "Block reason:", isBlockedByGroup && " Blocked by group", isProviderExcluded && " Excluded by provider", isMessageBlocked && " Message blocked"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("pre", {
+    }, isBlocked && react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, "Block reason:", isBlockedByGroup && " Blocked by group", isProviderExcluded && " Excluded by provider", isMessageBlocked && " Message blocked"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("pre", {
       className: isCollapsed ? "collapsed" : "expanded"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("textarea", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("textarea", {
       id: `${msg.id}-textarea`,
       name: msg.id,
       className: "general-textarea",
@@ -1686,24 +1709,24 @@
       itemClassName += " blocked";
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: itemClassName,
       key: `${msg.id}-${msg.provider}`
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "message-id"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, msg.id, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), "(", impressions, " impressions)")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(ToggleMessageJSON, {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, msg.id, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), "(", impressions, " impressions)")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(ToggleMessageJSON, {
       msgId: `${msg.id}`,
       toggleJSON: this.toggleJSON,
       isCollapsed: isCollapsed
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "checkbox",
       id: `${msg.id} checkbox`,
       name: `${msg.id} checkbox`
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: `message-summary`
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("pre", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("pre", {
       className: isCollapsed ? "collapsed" : "expanded"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("textarea", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("textarea", {
       id: `${msg.id}-textarea`,
       className: "wnp-textarea",
       name: msg.id
@@ -1730,15 +1753,15 @@
     }
 
     const messagesToShow = this.state.messageFilter === "all" ? this.state.messages : this.state.messages.filter(message => message.provider === this.state.messageFilter);
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton slim" // eslint-disable-next-line react/jsx-no-bind
       ,
       onClick: e => this.toggleAllMessages(messagesToShow)
-    }, "Collapse/Expand All"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", {
+    }, "Collapse/Expand All"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", {
       className: "helpLink"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "icon icon-small-spacer icon-info"
-    }), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, "To modify a message, change the JSON and click 'Modify' to see your changes. Click 'Reset' to restore the JSON to the original.")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderMessageItem(msg)))));
+    }), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "To modify a message, change the JSON and click 'Modify' to see your changes. Click 'Reset' to restore the JSON to the original.")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderMessageItem(msg)))));
   }
 
   renderMessagesByGroup() {
@@ -1747,7 +1770,7 @@
     }
 
     const messagesToShow = this.state.messageGroupsFilter === "all" ? this.state.messages.filter(m => m.groups.length) : this.state.messages.filter(message => message.groups.includes(this.state.messageGroupsFilter));
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderMessageItem(msg))));
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderMessageItem(msg))));
   }
 
   renderWNMessages() {
@@ -1756,7 +1779,7 @@
     }
 
     const messagesToShow = this.state.messages.filter(message => message.provider === "whats-new-panel" && message.content.body);
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderWNMessageItem(msg))));
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, messagesToShow.map(msg => this.renderWNMessageItem(msg))));
   }
 
   renderMessageFilter() {
@@ -1764,18 +1787,18 @@
       return null;
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "unblock-all ASRouterButton test-only",
       onClick: this.unblockAll
-    }, "Unblock All Snippets"), "Show messages from ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("select", {
+    }, "Unblock All Snippets"), "Show messages from ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("select", {
       value: this.state.messageFilter,
       onChange: this.onChangeMessageFilter
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("option", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("option", {
       value: "all"
-    }, "all providers"), this.state.providers.map(provider => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("option", {
+    }, "all providers"), this.state.providers.map(provider => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("option", {
       key: provider.id,
       value: provider.id
-    }, provider.id))), this.state.messageFilter !== "all" && !this.state.messageFilter.includes("_local_testing") ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, provider.id))), this.state.messageFilter !== "all" && !this.state.messageFilter.includes("_local_testing") ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "button messages-reset",
       onClick: this.handleClearAllImpressionsByProvider
     }, "Reset All") : null);
@@ -1786,27 +1809,27 @@
       return null;
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, "Show messages from ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("select", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, "Show messages from ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("select", {
       value: this.state.messageGroupsFilter,
       onChange: this.onChangeMessageGroupsFilter
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("option", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("option", {
       value: "all"
-    }, "all groups"), this.state.groups.map(group => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("option", {
+    }, "all groups"), this.state.groups.map(group => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("option", {
       key: group.id,
       value: group.id
     }, group.id))));
   }
 
   renderTableHead() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: "message-item"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Provider ID"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "Source"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Provider ID"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, "Source"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Cohort"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, "Cohort"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
     }, "Last Updated")));
   }
@@ -1815,7 +1838,7 @@
     const providersConfig = this.state.providerPrefs;
     const providerInfo = this.state.providers;
     const userPrefInfo = this.state.userPrefs;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, this.renderTableHead(), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, providersConfig.map((provider, i) => {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, this.renderTableHead(), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, providersConfig.map((provider, i) => {
       const isTestProvider = provider.id.includes("_local_testing");
       const info = providerInfo.find(p => p.id === provider.id) || {};
       const isUserEnabled = provider.id in userPrefInfo ? userPrefInfo[provider.id] : true;
@@ -1823,7 +1846,7 @@
       let label = "local";
 
       if (provider.type === "remote") {
-        label = react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, "endpoint (", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+        label = react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "endpoint (", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
           className: "providerUrl",
           target: "_blank",
           href: info.url,
@@ -1832,7 +1855,7 @@
       } else if (provider.type === "remote-settings") {
         label = `remote settings (${provider.bucket})`;
       } else if (provider.type === "remote-experiments") {
-        label = react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, "remote settings (", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+        label = react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
           className: "providerUrl",
           target: "_blank",
           href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
@@ -1854,22 +1877,22 @@
         label = `disabled via ${reasonsDisabled.join(", ")}`;
       }
 
-      return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+      return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
         className: "message-item",
         key: i
-      }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, isTestProvider ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+      }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, isTestProvider ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
         type: "checkbox",
         disabled: true,
         readOnly: true,
         checked: true
-      }) : react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+      }) : react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
         type: "checkbox",
         "data-provider": provider.id,
         checked: isUserEnabled && isSystemEnabled,
         onChange: this.handleEnabledToggle
-      })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, provider.id), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+      })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, provider.id), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
         className: `sourceLabel${isUserEnabled && isSystemEnabled ? "" : " isDisabled"}`
-      }, label)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, provider.cohort), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+      }, label)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, provider.cohort), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
         style: {
           whiteSpace: "nowrap"
         }
@@ -1877,71 +1900,44 @@
     })));
   }
 
-  renderPasteModal() {
-    if (!this.state.pasteFromClipboard) {
-      return null;
-    }
-
-    const errors = this.refs.targetingParamsEval && this.refs.targetingParamsEval.innerText.length;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_3__["ModalOverlay"], {
-      innerStyle: "pasteModal",
-      title: "New targeting parameters",
-      button_label: errors ? "Cancel" : "Done",
-      onDismissBundle: this.onPasteTargetingParams
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
-      className: "onboardingMessage"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("textarea", {
-      onChange: this.onNewTargetingParams,
-      value: this.state.newStringTargetingParameters,
-      rows: "20",
-      cols: "60"
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", {
-      ref: "targetingParamsEval"
-    })));
-  }
-
   renderTargetingParameters() {
     // There was no error and the result is truthy
     const success = this.state.evaluationStatus.success && !!this.state.evaluationStatus.result;
     const result = JSON.stringify(this.state.evaluationStatus.result, null, 2) || "(Empty result)";
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Evaluate JEXL expression"))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("textarea", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Evaluate JEXL expression"))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("textarea", {
       ref: "expressionInput",
       rows: "10",
       cols: "60",
       placeholder: "Evaluate JEXL expressions and mock parameters by changing their values below"
-    })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, "Status:", " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, "Status:", " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       ref: "evaluationStatus"
-    }, success ? "✅" : "�", ", Result: ", result))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, success ? "✅" : "�", ", Result: ", result))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton secondary",
       onClick: this.handleExpressionEval
-    }, "Evaluate"))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Modify targeting parameters"))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Evaluate"))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Modify targeting parameters"))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton secondary",
       onClick: this.onCopyTargetingParams,
       disabled: this.state.copiedToClipboard
-    }, this.state.copiedToClipboard ? "Parameters copied!" : "Copy parameters"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
-      className: "ASRouterButton secondary",
-      onClick: this.onPasteTargetingParams,
-      disabled: this.state.pasteFromClipboard
-    }, "Paste parameters"))), this.state.stringTargetingParameters && Object.keys(this.state.stringTargetingParameters).map((param, i) => {
+    }, this.state.copiedToClipboard ? "Parameters copied!" : "Copy parameters"))), this.state.stringTargetingParameters && Object.keys(this.state.stringTargetingParameters).map((param, i) => {
       const value = this.state.stringTargetingParameters[param];
       const errorState = this.state.targetingParametersError && this.state.targetingParametersError.id === param;
       const className = errorState ? "errorState" : "";
-      const inputComp = (value && value.length) > 30 ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("textarea", {
+      const inputComp = (value && value.length) > 30 ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("textarea", {
         name: param,
         className: className,
         value: value,
         rows: "10",
         cols: "60",
         onChange: this.onChangeTargetingParameters
-      }) : react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+      }) : react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
         name: param,
         className: className,
         value: value,
         onChange: this.onChangeTargetingParameters
       });
-      return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+      return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
         key: i
-      }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, param), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, inputComp));
+      }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, param), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, inputComp));
     })));
   }
 
@@ -1981,61 +1977,61 @@
     const {
       config
     } = this.props.DiscoveryStream;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: "message-item"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Enabled"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, config.enabled ? "yes" : "no")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    }, "Enabled"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, config.enabled ? "yes" : "no")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       className: "message-item"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       className: "min"
-    }, "Endpoint"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, config.endpoint || "(empty)")))));
+    }, "Endpoint"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, config.endpoint || "(empty)")))));
   }
 
   renderAttributionParamers() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, " Attribution Parameters "), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, " ", "This forces the browser to set some attribution parameters, useful for testing the Return To AMO feature. Clicking on 'Force Attribution', with the default values in each field, will demo the Return To AMO flow with the addon called 'Iridium for Youtube'. If you wish to try different attribution parameters, enter them in the text boxes. If you wish to try a different addon with the Return To AMO flow, make sure the 'content' text box has the addon GUID, then click 'Force Attribution'. Clicking on 'Force Attribution' with blank text boxes reset attribution data."), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Source ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, " Attribution Parameters "), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, " ", "This forces the browser to set some attribution parameters, useful for testing the Return To AMO feature. Clicking on 'Force Attribution', with the default values in each field, will demo the Return To AMO flow with the addon called 'Iridium for Youtube'. If you wish to try different attribution parameters, enter them in the text boxes. If you wish to try a different addon with the Return To AMO flow, make sure the 'content' text box has the addon GUID, then click 'Force Attribution'. Clicking on 'Force Attribution' with blank text boxes reset attribution data."), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Source ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "source",
       placeholder: "addons.mozilla.org",
       value: this.state.attributionParameters.source,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Medium ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Medium ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "medium",
       placeholder: "referral",
       value: this.state.attributionParameters.medium,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Campaign ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Campaign ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "campaign",
       placeholder: "non-fx-button",
       value: this.state.attributionParameters.campaign,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Content ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Content ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "content",
       placeholder: "iridium@particlecore.github.io",
       value: this.state.attributionParameters.content,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Experiment ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Experiment ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "experiment",
       placeholder: "ua-onboarding",
       value: this.state.attributionParameters.experiment,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Variation ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " Variation ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "variation",
       placeholder: "chrome",
       value: this.state.attributionParameters.variation,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " User Agent ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("b", null, " User Agent ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", {
       type: "text",
       name: "ua",
       placeholder: "Google Chrome 123",
       value: this.state.attributionParameters.ua,
       onChange: this.onChangeAttributionParameters
-    }), " ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }), " ")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton primary button",
       onClick: this.setAttribution
     }, " ", "Force Attribution", " "), " "))));
@@ -2045,34 +2041,28 @@
     id,
     errors
   }) {
-    const providerId = react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", {
+    const providerId = react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", {
       rowSpan: errors.length
     }, id); // .reverse() so that the last error (most recent) is first
 
     return errors.map(({
       error,
       timestamp
-    }, cellKey) => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+    }, cellKey) => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
       key: cellKey
-    }, cellKey === errors.length - 1 ? providerId : null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, error.message), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, relativeTime(timestamp)))).reverse();
+    }, cellKey === errors.length - 1 ? providerId : null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, error.message), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, relativeTime(timestamp)))).reverse();
   }
 
   renderErrors() {
     const providersWithErrors = this.state.providers && this.state.providers.filter(p => p.errors && p.errors.length);
 
     if (providersWithErrors && providersWithErrors.length) {
-      return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", {
+      return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", {
         className: "errorReporting"
-      }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("th", null, "Provider ID"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("th", null, "Message"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("th", null, "Timestamp"))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, providersWithErrors.map(this.renderErrorMessage)));
+      }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("th", null, "Provider ID"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("th", null, "Message"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("th", null, "Timestamp"))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, providersWithErrors.map(this.renderErrorMessage)));
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, "No errors");
-  }
-
-  renderTrailheadInfo() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", {
-      className: "minimal-table"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "Triplet branch"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, this.state.trailheadTriplet))));
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", null, "No errors");
   }
 
   renderWNPTests() {
@@ -2081,20 +2071,20 @@
     }
 
     let messagesToShow = this.state.messages.filter(message => message.provider === "whats-new-panel");
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", {
       className: "helpLink"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "icon icon-small-spacer icon-info"
-    }), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, "To correctly render selected messages, click 'Open What's New Panel', select the messages you want to see, and click 'Render Selected Messages'.", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), "To modify a message, select it, modify the JSON and click 'Render Selected Messages' again to see your changes.", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("br", null), "Click 'Reset Panel' to close the panel and reset all JSON to its original state.")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "To correctly render selected messages, click 'Open What's New Panel', select the messages you want to see, and click 'Render Selected Messages'.", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), "To modify a message, select it, modify the JSON and click 'Render Selected Messages' again to see your changes.", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("br", null), "Click 'Reset Panel' to close the panel and reset all JSON to its original state.")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton primary button",
       onClick: this.handleForceWNP
-    }, "Open What's New Panel"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Open What's New Panel"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton secondary button",
       onClick: this.handleUpdateWNMessages
-    }, "Render Selected Messages"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Render Selected Messages"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton secondary button",
       onClick: this.resetPanel
-    }, "Reset Panel"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Messages"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+    }, "Reset Panel"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Messages"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
       className: "ASRouterButton slim button" // eslint-disable-next-line react/jsx-no-bind
       ,
       onClick: e => this.toggleAllMessages(messagesToShow)
@@ -2106,35 +2096,35 @@
 
     switch (section) {
       case "wnpanel":
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "What's New Panel"), this.renderWNPTests());
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "What's New Panel"), this.renderWNPTests());
 
       case "targeting":
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Targeting Utilities"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Targeting Utilities"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
           className: "button",
           onClick: this.expireCache
         }, "Expire Cache"), " ", "(This expires the cache in ASR Targeting for bookmarks and top sites)", this.renderTargetingParameters(), this.renderAttributionParamers());
 
       case "groups":
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Message Groups"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Message Groups"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
           className: "button",
           onClick: this.resetGroups
-        }, "Reset group impressions"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", {
+        }, "Reset group impressions"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("thead", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tr", {
           className: "message-item"
-        }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "Enabled"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "Impressions count"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "Custom frequency"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, "User preferences"))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tbody", null, this.state.groups && this.state.groups.map(({
+        }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, "Enabled"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, "Impressions count"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, "Custom frequency"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, "User preferences"))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("tbody", null, this.state.groups && this.state.groups.map(({
           id,
           enabled,
           frequency,
           userPreferences = []
-        }, index) => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(Row, {
+        }, index) => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(Row, {
           key: id
-        }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(TogglePrefCheckbox, {
+        }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(TogglePrefCheckbox, {
           checked: enabled,
           pref: id,
           disabled: true
-        })), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, this._getGroupImpressionsCount(id, frequency)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, JSON.stringify(frequency, null, 2)), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, userPreferences.join(", ")))))), this.renderMessageGroupsFilter(), this.renderMessagesByGroup());
+        })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, this._getGroupImpressionsCount(id, frequency)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, JSON.stringify(frequency, null, 2)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("td", null, userPreferences.join(", ")))))), this.renderMessageGroupsFilter(), this.renderMessagesByGroup());
 
       case "ds":
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Discovery Stream"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(DiscoveryStreamAdmin, {
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Discovery Stream"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(DiscoveryStreamAdmin, {
           state: {
             DiscoveryStream: this.props.DiscoveryStream,
             Personalization: this.props.Personalization
@@ -2144,48 +2134,48 @@
         }));
 
       case "errors":
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "ASRouter Errors"), this.renderErrors());
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "ASRouter Errors"), this.renderErrors());
 
       default:
-        return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Message Providers", " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("button", {
+        return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Message Providers", " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", {
           title: "Restore all provider settings that ship with Firefox",
           className: "button",
           onClick: this.resetPref
-        }, "Restore default prefs")), this.state.providers ? this.renderProviders() : null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Trailhead"), this.renderTrailheadInfo(), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, "Messages"), this.renderMessageFilter(), this.renderMessages(), this.renderPasteModal());
+        }, "Restore default prefs")), this.state.providers ? this.renderProviders() : null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h2", null, "Messages"), this.renderMessageFilter(), this.renderMessages());
     }
   }
 
   render() {
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", {
       className: `asrouter-admin ${this.props.collapsed ? "collapsed" : "expanded"}`
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("aside", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("aside", {
       className: "sidebar"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("ul", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("ul", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools"
-    }, "General")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, "General")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools-wnpanel"
-    }, "What's New Panel")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, "What's New Panel")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools-targeting"
-    }, "Targeting")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, "Targeting")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools-groups"
-    }, "Message Groups")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, "Message Groups")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools-ds"
-    }, "Discovery Stream")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }, "Discovery Stream")), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools-errors"
-    }, "Errors")))), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("main", {
+    }, "Errors")))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("main", {
       className: "main-panel"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h1", null, "AS Router Admin"), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h1", null, "AS Router Admin"), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", {
       className: "helpLink"
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "icon icon-small-spacer icon-info"
-    }), " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", null, "Need help using these tools? Check out our", " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    }), " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "Need help using these tools? Check out our", " ", react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       target: "blank",
       href: "https://github.com/mozilla/activity-stream/blob/master/content-src/asrouter/docs/debugging-docs.md"
     }, "documentation"))), this.getSection()));
   }
 
 }
-class CollapseToggle extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent {
+class CollapseToggle extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent {
   constructor(props) {
     super(props);
     this.onCollapseToggle = this.onCollapseToggle.bind(this);
@@ -2238,22 +2228,22 @@
     } = this;
     const isCollapsed = this.state.collapsed || !renderAdmin;
     const label = `${isCollapsed ? "Expand" : "Collapse"} devtools`;
-    return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_4___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("a", {
+    return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", {
       href: "#devtools",
       title: label,
       "aria-label": label,
       className: `asrouter-toggle ${isCollapsed ? "collapsed" : "expanded"}`,
       onClick: this.renderAdmin ? this.onCollapseToggle : null
-    }, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("span", {
+    }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: "icon icon-devtools"
-    })), renderAdmin ? react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(ASRouterAdminInner, _extends({}, props, {
+    })), renderAdmin ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(ASRouterAdminInner, _extends({}, props, {
       collapsed: this.state.collapsed
     })) : null);
   }
 
 }
 
-const _ASRouterAdmin = props => react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(_SimpleHashRouter__WEBPACK_IMPORTED_MODULE_5__["SimpleHashRouter"], null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement(CollapseToggle, props));
+const _ASRouterAdmin = props => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_SimpleHashRouter__WEBPACK_IMPORTED_MODULE_4__["SimpleHashRouter"], null, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(CollapseToggle, props));
 
 const ASRouterAdmin = Object(react_redux__WEBPACK_IMPORTED_MODULE_2__["connect"])(state => ({
   Sections: state.Sections,
@@ -2423,114 +2413,18 @@
 
 /***/ }),
 /* 8 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModalOverlayWrapper", function() { return ModalOverlayWrapper; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModalOverlay", function() { return ModalOverlay; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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/. */
-
-class ModalOverlayWrapper extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.onKeyDown = this.onKeyDown.bind(this);
-  } // The intended behaviour is to listen for an escape key
-  // but not for a click; see Bug 1582242
-
-
-  onKeyDown(event) {
-    if (event.key === "Escape") {
-      this.props.onClose(event);
-    }
-  }
-
-  componentWillMount() {
-    this.props.document.addEventListener("keydown", this.onKeyDown);
-    this.props.document.body.classList.add("modal-open");
-    this.header = this.props.document.getElementById("header-asrouter-container");
-
-    if (this.header) {
-      this.props.document.getElementById("root").classList.add("modal-height");
-    }
-  }
-
-  componentWillUnmount() {
-    this.props.document.removeEventListener("keydown", this.onKeyDown);
-    this.props.document.body.classList.remove("modal-open");
-
-    if (this.header) {
-      this.props.document.getElementById("root").classList.remove("modal-height");
-    }
-  }
-
-  render() {
-    const {
-      props
-    } = this;
-    let className = props.unstyled ? "" : "modalOverlayInner active";
-
-    if (props.innerClassName) {
-      className += ` ${props.innerClassName}`;
-    }
-
-    return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: "modalOverlayOuter active",
-      onKeyDown: this.onKeyDown,
-      role: "presentation"
-    }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: className,
-      "aria-labelledby": props.headerId,
-      id: props.id,
-      role: "dialog"
-    }, props.hasDismissIcon && react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
-      className: "icon icon-dismiss",
-      onClick: props.onClose,
-      "data-l10n-id": "onboarding-cards-dismiss"
-    }), props.children));
-  }
-
-}
-ModalOverlayWrapper.defaultProps = {
-  document: global.document
-};
-class ModalOverlay extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent {
-  render() {
-    const {
-      title,
-      button_label
-    } = this.props;
-    return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(ModalOverlayWrapper, {
-      onClose: this.props.onDismissBundle
-    }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("h2", null, " ", title, " "), this.props.children, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: "footer"
-    }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
-      className: "button primary modalButton",
-      onClick: this.props.onDismissBundle
-    }, " ", button_label, " ")));
-  }
-
-}
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
-
-/***/ }),
-/* 9 */
 /***/ (function(module, exports) {
 
 module.exports = React;
 
 /***/ }),
-/* 10 */
+/* 9 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleHashRouter", function() { return SimpleHashRouter; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -2573,7 +2467,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 11 */
+/* 10 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2582,16 +2476,15 @@
 /* harmony import */ var common_ActorConstants_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6);
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
 /* harmony import */ var _asrouter_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
-/* harmony import */ var _rich_text_strings__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(73);
-/* harmony import */ var _components_ImpressionsWrapper_ImpressionsWrapper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(12);
-/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(71);
-/* harmony import */ var content_src_lib_constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(14);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9);
+/* harmony import */ var _rich_text_strings__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70);
+/* harmony import */ var _components_ImpressionsWrapper_ImpressionsWrapper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(11);
+/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(68);
+/* harmony import */ var content_src_lib_constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(15);
+/* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(14);
 /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _templates_template_manifest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(72);
-/* harmony import */ var _templates_FirstRun_FirstRun__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(16);
+/* harmony import */ var _templates_template_manifest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(69);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -2607,8 +2500,6 @@
 
 
 
-
-const TEMPLATES_ABOVE_PAGE = ["extended_triplets"];
 const TEMPLATES_BELOW_SEARCH = ["simple_below_search_snippet"]; // Note: nextProps/prevProps refer to props passed to <ImpressionsWrapper />, not <ASRouterUISurface />
 
 function shouldSendImpressionOnUpdate(nextProps, prevProps) {
@@ -2632,7 +2523,6 @@
     };
 
     if (props.document) {
-      this.headerPortal = props.document.getElementById("header-asrouter-container");
       this.footerPortal = props.document.getElementById("footer-asrouter-container");
     }
   }
@@ -2787,12 +2677,6 @@
   }
 
   clearMessage(id) {
-    // Request new set of dynamic triplet cards when click on a card CTA clear
-    // message and 'id' matches one of the cards in message bundle
-    if (this.state.message && this.state.message.bundle && this.state.message.bundle.find(card => card.id === id)) {
-      this.requestMessage();
-    }
-
     if (id === this.state.message.id) {
       this.setState({
         message: {}
@@ -2957,35 +2841,6 @@
     }), react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("span", null, "Preview Purposes Only"));
   }
 
-  renderFirstRun() {
-    const {
-      message
-    } = this.state;
-
-    if (TEMPLATES_ABOVE_PAGE.includes(message.template)) {
-      return react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_components_ImpressionsWrapper_ImpressionsWrapper__WEBPACK_IMPORTED_MODULE_4__["ImpressionsWrapper"], {
-        id: "FIRST_RUN",
-        message: this.state.message,
-        sendImpression: this.sendImpression,
-        shouldSendImpressionOnUpdate: shouldSendImpressionOnUpdate // This helps with testing
-        ,
-        document: this.props.document
-      }, react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_templates_FirstRun_FirstRun__WEBPACK_IMPORTED_MODULE_10__["FirstRun"], {
-        document: this.props.document,
-        message: message,
-        sendUserActionTelemetry: this.sendUserActionTelemetry,
-        executeAction: _asrouter_utils__WEBPACK_IMPORTED_MODULE_2__["ASRouterUtils"].executeAction,
-        onBlockById: _asrouter_utils__WEBPACK_IMPORTED_MODULE_2__["ASRouterUtils"].blockById,
-        onDismiss: this.onDismiss,
-        fxaEndpoint: this.props.fxaEndpoint,
-        appUpdateChannel: this.props.appUpdateChannel,
-        fetchFlowParams: this.fetchFlowParams
-      }));
-    }
-
-    return null;
-  }
-
   render() {
     const {
       message
@@ -2996,13 +2851,12 @@
     }
 
     const shouldRenderBelowSearch = TEMPLATES_BELOW_SEARCH.includes(message.template);
-    const shouldRenderInHeader = TEMPLATES_ABOVE_PAGE.includes(message.template);
     return shouldRenderBelowSearch ? // Render special below search snippets in place;
     react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
       className: "below-search-snippet-wrapper"
-    }, this.renderSnippets()) : // For onboarding, regular snippets etc. we should render
-    // everything in our footer container.
-    react_dom__WEBPACK_IMPORTED_MODULE_8___default.a.createPortal(react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_7___default.a.Fragment, null, this.renderPreviewBanner(), this.renderFirstRun(), this.renderSnippets()), shouldRenderInHeader ? this.headerPortal : this.footerPortal);
+    }, this.renderSnippets()) : // For regular snippets etc. we should render everything in our footer
+    // container.
+    react_dom__WEBPACK_IMPORTED_MODULE_8___default.a.createPortal(react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_7___default.a.Fragment, null, this.renderPreviewBanner(), this.renderSnippets()), this.footerPortal);
   }
 
 }
@@ -3012,7 +2866,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 12 */
+/* 11 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3020,7 +2874,7 @@
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VISIBLE", function() { return VISIBLE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VISIBILITY_CHANGE_EVENT", function() { return VISIBILITY_CHANGE_EVENT; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ImpressionsWrapper", function() { return ImpressionsWrapper; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -3092,13 +2946,13 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 13 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = PropTypes;
 
 /***/ }),
-/* 14 */
+/* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3138,303 +2992,13 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 15 */
+/* 14 */
 /***/ (function(module, exports) {
 
 module.exports = ReactDOM;
 
 /***/ }),
-/* 16 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FLUENT_FILES", function() { return FLUENT_FILES; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "helpers", function() { return helpers; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FirstRun", function() { return FirstRun; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _Triplets__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17);
-/* harmony import */ var _addUtmParams__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-/* 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/. */
-
-
- // Note: should match the transition time on .trailheadCards in _Trailhead.scss
-
-const TRANSITION_LENGTH = 500;
-const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/brandings.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"];
-const helpers = {
-  addFluent(document) {
-    FLUENT_FILES.forEach(file => {
-      const link = document.head.appendChild(document.createElement("link"));
-      link.href = file;
-      link.rel = "localization";
-    });
-  }
-
-};
-class FirstRun extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.didLoadFlowParams = false;
-    this.state = {
-      didUserClearTriplets: false,
-      flowParams: undefined
-    };
-    this.closeTriplets = this.closeTriplets.bind(this);
-    helpers.addFluent(this.props.document); // Update utm campaign parameters by appending channel for
-    // differentiating campaign in amplitude
-
-    if (this.props.appUpdateChannel) {
-      _addUtmParams__WEBPACK_IMPORTED_MODULE_2__["BASE_PARAMS"].utm_campaign += `-${this.props.appUpdateChannel}`;
-    }
-  }
-
-  get UTMTerm() {
-    const {
-      message
-    } = this.props;
-    let UTMTerm = message.utm_term || "";
-    UTMTerm = message.utm_term && message.trailheadTriplet ? `${message.utm_term}-${message.trailheadTriplet}` : UTMTerm;
-    return UTMTerm;
-  }
-
-  async fetchFlowParams() {
-    const {
-      fxaEndpoint,
-      fetchFlowParams
-    } = this.props;
-
-    if (fxaEndpoint && this.UTMTerm && !this.didLoadFlowParams) {
-      this.didLoadFlowParams = true;
-      const flowParams = await fetchFlowParams({ ..._addUtmParams__WEBPACK_IMPORTED_MODULE_2__["BASE_PARAMS"],
-        entrypoint: "activity-stream-firstrun",
-        form_type: "email",
-        utm_term: this.UTMTerm
-      });
-      this.setState({
-        flowParams
-      });
-    }
-  }
-
-  componentDidMount() {
-    this.fetchFlowParams();
-  }
-
-  componentDidUpdate() {
-    // In case we didn't have FXA info immediately, try again when we receive it.
-    this.fetchFlowParams();
-  }
-
-  closeTriplets() {
-    this.setState({
-      didUserClearTriplets: true
-    }); // Closing triplets should prevent any future extended triplets from showing up
-
-    setTimeout(() => {
-      this.props.onBlockById("EXTENDED_TRIPLETS_1");
-    }, TRANSITION_LENGTH);
-  }
-
-  render() {
-    const {
-      props,
-      state,
-      UTMTerm
-    } = this;
-    const {
-      sendUserActionTelemetry,
-      executeAction,
-      message
-    } = props;
-    const {
-      didUserClearTriplets,
-      flowParams
-    } = state;
-    const hasTriplets = Boolean(message.bundle && message.bundle.length);
-    const triplets = hasTriplets ? message.bundle : null;
-    const isTripletsContainerVisible = hasTriplets && !didUserClearTriplets; // Allow 1) falsy to not render a header 2) default welcome header 3) custom header
-
-    const tripletsHeaderId = message.tripletsHeaderId === undefined ? "onboarding-welcome-header" : message.tripletsHeaderId;
-    return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_0___default.a.Fragment, null, hasTriplets ? react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_Triplets__WEBPACK_IMPORTED_MODULE_1__["Triplets"], {
-      document: props.document,
-      cards: triplets,
-      headerId: tripletsHeaderId,
-      showCardPanel: isTripletsContainerVisible,
-      hideContainer: this.closeTriplets,
-      sendUserActionTelemetry: sendUserActionTelemetry,
-      UTMTerm: `${UTMTerm}-card`,
-      flowParams: flowParams,
-      onAction: executeAction,
-      onBlockById: props.onBlockById
-    }) : null);
-  }
-
-}
-
-/***/ }),
-/* 17 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Triplets", function() { return Triplets; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _templates_OnboardingMessage_OnboardingMessage__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(76);
-/* harmony import */ var _addUtmParams__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18);
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-/* 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/. */
-
-
-
-class Triplets extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.onCardAction = this.onCardAction.bind(this);
-    this.onHideContainer = this.onHideContainer.bind(this);
-  }
-
-  componentWillMount() {
-    global.document.body.classList.add("inline-onboarding");
-  }
-
-  componentWillUnmount() {
-    this.props.document.body.classList.remove("inline-onboarding");
-  }
-
-  onCardAction(action, message) {
-    let actionUpdates = {};
-    const {
-      flowParams,
-      UTMTerm
-    } = this.props;
-
-    if (action.type === "OPEN_URL") {
-      let url = new URL(action.data.args);
-      Object(_addUtmParams__WEBPACK_IMPORTED_MODULE_2__["addUtmParams"])(url, UTMTerm);
-
-      if (action.addFlowParams) {
-        url.searchParams.append("device_id", flowParams.deviceId);
-        url.searchParams.append("flow_id", flowParams.flowId);
-        url.searchParams.append("flow_begin_time", flowParams.flowBeginTime);
-      }
-
-      actionUpdates = {
-        data: { ...action.data,
-          args: url.toString()
-        }
-      };
-    }
-
-    this.props.onAction({ ...action,
-      ...actionUpdates
-    }); // Only block if message is in dynamic triplets experiment
-
-    if (message.blockOnClick) {
-      this.props.onBlockById(message.id, {
-        preloadedOnly: true
-      });
-    }
-  }
-
-  onHideContainer() {
-    const {
-      sendUserActionTelemetry,
-      cards,
-      hideContainer
-    } = this.props;
-    hideContainer();
-    sendUserActionTelemetry({
-      event: "DISMISS",
-      id: "onboarding-cards",
-      message_id: cards.map(m => m.id).join(","),
-      action: "onboarding_user_event"
-    });
-  }
-
-  render() {
-    const {
-      cards,
-      headerId,
-      showCardPanel,
-      sendUserActionTelemetry
-    } = this.props;
-    return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: `trailheadCards ${showCardPanel ? "expanded" : "collapsed"}`
-    }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: "trailheadCardsInner",
-      "aria-hidden": !showCardPanel
-    }, headerId && react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("h1", {
-      "data-l10n-id": headerId
-    }), react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
-      className: `trailheadCardGrid${showCardPanel ? " show" : ""}`
-    }, cards.map(card => react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_templates_OnboardingMessage_OnboardingMessage__WEBPACK_IMPORTED_MODULE_1__["OnboardingCard"], _extends({
-      key: card.id,
-      message: card,
-      className: "trailheadCard",
-      sendUserActionTelemetry: sendUserActionTelemetry,
-      onAction: this.onCardAction,
-      UISurface: "TRAILHEAD"
-    }, card)))), showCardPanel && react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", {
-      className: "icon icon-dismiss",
-      onClick: this.onHideContainer,
-      "data-l10n-id": "onboarding-cards-dismiss"
-    })));
-  }
-
-}
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
-
-/***/ }),
-/* 18 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BASE_PARAMS", function() { return BASE_PARAMS; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "addUtmParams", function() { return addUtmParams; });
-/* 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/. */
-
-/**
- * BASE_PARAMS keys/values can be modified from outside this file
- */
-const BASE_PARAMS = {
-  utm_source: "activity-stream",
-  utm_campaign: "firstrun",
-  utm_medium: "referral"
-};
-/**
- * Takes in a url as a string or URL object and returns a URL object with the
- * utm_* parameters added to it. If a URL object is passed in, the paraemeters
- * are added to it (the return value can be ignored in that case as it's the
- * same object).
- */
-
-function addUtmParams(url, utmTerm) {
-  let returnUrl = url;
-
-  if (typeof returnUrl === "string") {
-    returnUrl = new URL(url);
-  }
-
-  Object.keys(BASE_PARAMS).forEach(key => {
-    returnUrl.searchParams.append(key, BASE_PARAMS[key]);
-  });
-  returnUrl.searchParams.append("utm_term", utmTerm);
-  return returnUrl;
-}
-
-/***/ }),
-/* 19 */
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3444,7 +3008,7 @@
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -3539,7 +3103,7 @@
 const ConfirmDialog = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(state => state.Dialog)(_ConfirmDialog);
 
 /***/ }),
-/* 20 */
+/* 16 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3548,25 +3112,25 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_DiscoveryStreamBase", function() { return _DiscoveryStreamBase; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DiscoveryStreamBase", function() { return DiscoveryStreamBase; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_CardGrid_CardGrid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_CollectionCardGrid_CollectionCardGrid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36);
-/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(38);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_CardGrid_CardGrid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_CollectionCardGrid_CollectionCardGrid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(32);
+/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSMessage_DSMessage__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(43);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSPrivacyModal_DSPrivacyModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(44);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSSignup_DSSignup__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(45);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSTextPromo_DSTextPromo__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(46);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_Hero_Hero__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(47);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_Highlights_Highlights__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(49);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_HorizontalRule_HorizontalRule__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(62);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_List_List__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(48);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_Navigation_Navigation__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(63);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSMessage_DSMessage__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(39);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSPrivacyModal_DSPrivacyModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(40);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSSignup_DSSignup__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(42);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSTextPromo_DSTextPromo__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(43);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_Hero_Hero__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(44);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_Highlights_Highlights__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(46);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_HorizontalRule_HorizontalRule__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(59);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_List_List__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(45);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_Navigation_Navigation__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(60);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_SectionTitle_SectionTitle__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(64);
-/* harmony import */ var content_src_lib_selectLayoutRender__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(65);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(66);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_SectionTitle_SectionTitle__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(61);
+/* harmony import */ var content_src_lib_selectLayoutRender__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(62);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(63);
 /* 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/. */
@@ -3894,7 +3458,8 @@
       },
       privacyNoticeURL: topStories.privacyNoticeURL,
       showPrefName: topStories.pref.feed,
-      title: message.header.title
+      title: message.header.title,
+      eventSource: "CARDGRID"
     }, this.renderLayout(layoutRender)), this.renderLayout([{
       width: 12,
       components: [{
@@ -3934,16 +3499,16 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 21 */
+/* 17 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CardGrid", function() { return CardGrid; });
-/* harmony import */ var _DSCard_DSCard_jsx__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
-/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35);
-/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
+/* harmony import */ var _DSCard_DSCard_jsx__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
+/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
+/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
 /* 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,
@@ -4034,7 +3599,7 @@
 };
 
 /***/ }),
-/* 22 */
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4045,14 +3610,14 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSCard", function() { return DSCard; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaceholderDSCard", function() { return PlaceholderDSCard; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23);
-/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
+/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
+/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(20);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
-/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(31);
-/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(34);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
+/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(27);
+/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(30);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_8__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -4343,13 +3908,13 @@
 });
 
 /***/ }),
-/* 23 */
+/* 19 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSImage", function() { return DSImage; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -4495,15 +4060,15 @@
 };
 
 /***/ }),
-/* 24 */
+/* 20 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSLinkMenu", function() { return DSLinkMenu; });
-/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(21);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(24);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -4585,7 +4150,7 @@
 };
 
 /***/ }),
-/* 25 */
+/* 21 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4595,9 +4160,9 @@
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(26);
-/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(22);
+/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -4698,14 +4263,14 @@
 const LinkMenu = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(getState)(_LinkMenu);
 
 /***/ }),
-/* 26 */
+/* 22 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ContextMenu", function() { return ContextMenu; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ContextMenuItem", function() { return ContextMenuItem; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -4876,7 +4441,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 27 */
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5180,13 +4745,13 @@
 };
 
 /***/ }),
-/* 28 */
+/* 24 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ContextMenuButton", function() { return ContextMenuButton; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -5265,7 +4830,7 @@
 }
 
 /***/ }),
-/* 29 */
+/* 25 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5273,7 +4838,7 @@
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "INTERSECTION_RATIO", function() { return INTERSECTION_RATIO; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ImpressionStats", function() { return ImpressionStats; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -5487,14 +5052,14 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 30 */
+/* 26 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SafeAnchor", function() { return SafeAnchor; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -5576,7 +5141,7 @@
 }
 
 /***/ }),
-/* 31 */
+/* 27 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5584,11 +5149,11 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "StatusMessage", function() { return StatusMessage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SponsorLabel", function() { return SponsorLabel; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSContextFooter", function() { return DSContextFooter; });
-/* harmony import */ var _Card_types_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32);
-/* harmony import */ var react_transition_group__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33);
+/* harmony import */ var _Card_types_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28);
+/* harmony import */ var react_transition_group__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(29);
 /* harmony import */ var react_transition_group__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_transition_group__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
+/* harmony import */ var _FluentOrText_FluentOrText_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
 /* 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,
@@ -5684,7 +5249,7 @@
 }
 
 /***/ }),
-/* 32 */
+/* 28 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5721,19 +5286,19 @@
 };
 
 /***/ }),
-/* 33 */
+/* 29 */
 /***/ (function(module, exports) {
 
 module.exports = ReactTransitionGroup;
 
 /***/ }),
-/* 34 */
+/* 30 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FluentOrText", function() { return FluentOrText; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -5773,14 +5338,14 @@
 }
 
 /***/ }),
-/* 35 */
+/* 31 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSEmptyState", function() { return DSEmptyState; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -5877,17 +5442,17 @@
 }
 
 /***/ }),
-/* 36 */
+/* 32 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CollectionCardGrid", function() { return CollectionCardGrid; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_CardGrid_CardGrid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSDismiss_DSDismiss__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(37);
-/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_CardGrid_CardGrid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(17);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSDismiss_DSDismiss__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33);
+/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -6034,13 +5599,13 @@
 }
 
 /***/ }),
-/* 37 */
+/* 33 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSDismiss", function() { return DSDismiss; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -6096,20 +5661,20 @@
 }
 
 /***/ }),
-/* 38 */
+/* 34 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CollapsibleSection", function() { return CollapsibleSection; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39);
-/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35);
+/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var content_src_components_SectionMenu_SectionMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(41);
-/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(42);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(28);
+/* harmony import */ var content_src_components_SectionMenu_SectionMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(37);
+/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(38);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(24);
 /* 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/. */
@@ -6394,15 +5959,15 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 39 */
+/* 35 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorBoundaryFallback", function() { return ErrorBoundaryFallback; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ErrorBoundary", function() { return ErrorBoundary; });
-/* harmony import */ var content_src_components_A11yLinkButton_A11yLinkButton__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(40);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_A11yLinkButton_A11yLinkButton__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -6481,13 +6046,13 @@
 };
 
 /***/ }),
-/* 40 */
+/* 36 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A11yLinkButton", function() { return A11yLinkButton; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -6511,7 +6076,7 @@
 }
 
 /***/ }),
-/* 41 */
+/* 37 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6519,10 +6084,10 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_SectionMenu", function() { return _SectionMenu; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SectionMenu", function() { return SectionMenu; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(22);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42);
+/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(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/. */
@@ -6617,7 +6182,7 @@
 const SectionMenu = _SectionMenu;
 
 /***/ }),
-/* 42 */
+/* 38 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -6747,16 +6312,16 @@
 };
 
 /***/ }),
-/* 43 */
+/* 39 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSMessage", function() { return DSMessage; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30);
-/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
+/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
 /* 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/. */
@@ -6789,16 +6354,16 @@
 }
 
 /***/ }),
-/* 44 */
+/* 40 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSPrivacyModal", function() { return DSPrivacyModal; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
-/* harmony import */ var content_src_asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
+/* harmony import */ var content_src_asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(41);
 /* 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/. */
@@ -6865,19 +6430,84 @@
 }
 
 /***/ }),
-/* 45 */
+/* 41 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModalOverlayWrapper", function() { return ModalOverlayWrapper; });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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/. */
+
+class ModalOverlayWrapper extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent {
+  constructor(props) {
+    super(props);
+    this.onKeyDown = this.onKeyDown.bind(this);
+  } // The intended behaviour is to listen for an escape key
+  // but not for a click; see Bug 1582242
+
+
+  onKeyDown(event) {
+    if (event.key === "Escape") {
+      this.props.onClose(event);
+    }
+  }
+
+  componentWillMount() {
+    this.props.document.addEventListener("keydown", this.onKeyDown);
+    this.props.document.body.classList.add("modal-open");
+  }
+
+  componentWillUnmount() {
+    this.props.document.removeEventListener("keydown", this.onKeyDown);
+    this.props.document.body.classList.remove("modal-open");
+  }
+
+  render() {
+    const {
+      props
+    } = this;
+    let className = props.unstyled ? "" : "modalOverlayInner active";
+
+    if (props.innerClassName) {
+      className += ` ${props.innerClassName}`;
+    }
+
+    return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
+      className: "modalOverlayOuter active",
+      onKeyDown: this.onKeyDown,
+      role: "presentation"
+    }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
+      className: className,
+      "aria-labelledby": props.headerId,
+      id: props.id,
+      role: "dialog"
+    }, props.children));
+  }
+
+}
+ModalOverlayWrapper.defaultProps = {
+  document: global.document
+};
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
+
+/***/ }),
+/* 42 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSSignup", function() { return DSSignup; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(25);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(24);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(30);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
 /* 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/. */
@@ -7032,20 +6662,20 @@
 };
 
 /***/ }),
-/* 46 */
+/* 43 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DSTextPromo", function() { return DSTextPromo; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSDismiss_DSDismiss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(37);
-/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(23);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(27);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_DiscoveryStreamComponents_DSDismiss_DSDismiss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33);
+/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(19);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(23);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(30);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(26);
 /* 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/. */
@@ -7181,23 +6811,23 @@
 }
 
 /***/ }),
-/* 47 */
+/* 44 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hero", function() { return Hero; });
-/* harmony import */ var _DSCard_DSCard_jsx__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
+/* harmony import */ var _DSCard_DSCard_jsx__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(1);
-/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35);
-/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
-/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(24);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29);
-/* harmony import */ var _List_List_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(48);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9);
+/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(31);
+/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(19);
+/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
+/* harmony import */ var _List_List_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(45);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(30);
-/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(31);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(26);
+/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(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/. */
@@ -7374,7 +7004,7 @@
 };
 
 /***/ }),
-/* 48 */
+/* 45 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7386,14 +7016,14 @@
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35);
-/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
-/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(24);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(29);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9);
+/* harmony import */ var _DSEmptyState_DSEmptyState_jsx__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(31);
+/* harmony import */ var _DSImage_DSImage_jsx__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(19);
+/* harmony import */ var _DSLinkMenu_DSLinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(20);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(30);
-/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(31);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(26);
+/* harmony import */ var _DSContextFooter_DSContextFooter_jsx__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(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/. */
@@ -7578,7 +7208,7 @@
 }))(_List);
 
 /***/ }),
-/* 49 */
+/* 46 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7587,9 +7217,9 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Highlights", function() { return Highlights; });
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(50);
+/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(47);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -7619,7 +7249,7 @@
 }))(_Highlights);
 
 /***/ }),
-/* 50 */
+/* 47 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7629,18 +7259,18 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_Sections", function() { return _Sections; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sections", function() { return Sections; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_components_Card_Card__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
-/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38);
-/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(53);
-/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
+/* harmony import */ var content_src_components_Card_Card__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(48);
+/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
+/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(50);
+/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(30);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var content_src_components_MoreRecommendations_MoreRecommendations__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(55);
-/* harmony import */ var content_src_components_PocketLoggedInCta_PocketLoggedInCta__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(56);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_MoreRecommendations_MoreRecommendations__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(52);
+/* harmony import */ var content_src_components_PocketLoggedInCta_PocketLoggedInCta__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(53);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var content_src_components_Topics_Topics__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(57);
-/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(58);
+/* harmony import */ var content_src_components_Topics_Topics__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(54);
+/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(55);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -7990,7 +7620,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 51 */
+/* 48 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7999,14 +7629,14 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Card", function() { return Card; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PlaceholderCard", function() { return PlaceholderCard; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32);
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28);
-/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24);
+/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(21);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(52);
+/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(49);
 /* 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/. */
@@ -8342,7 +7972,7 @@
 });
 
 /***/ }),
-/* 52 */
+/* 49 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8411,15 +8041,15 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 53 */
+/* 50 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ComponentPerfTimer", function() { return ComponentPerfTimer; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_lib_perf_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(54);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9);
+/* harmony import */ var content_src_lib_perf_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -8591,7 +8221,7 @@
 }
 
 /***/ }),
-/* 54 */
+/* 51 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8701,13 +8331,13 @@
 const perfService = new _PerfService();
 
 /***/ }),
-/* 55 */
+/* 52 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MoreRecommendations", function() { return MoreRecommendations; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -8733,7 +8363,7 @@
 }
 
 /***/ }),
-/* 56 */
+/* 53 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8742,7 +8372,7 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "PocketLoggedInCta", function() { return PocketLoggedInCta; });
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -8776,14 +8406,14 @@
 }))(_PocketLoggedInCta);
 
 /***/ }),
-/* 57 */
+/* 54 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Topic", function() { return Topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Topics", function() { return Topics; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -8821,7 +8451,7 @@
 }
 
 /***/ }),
-/* 58 */
+/* 55 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8829,18 +8459,18 @@
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_TopSites", function() { return _TopSites; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSites", function() { return TopSites; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59);
-/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38);
-/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(53);
+/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
+/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
+/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(50);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9);
+/* harmony import */ var _asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _SearchShortcutsForm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(60);
-/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(74);
-/* harmony import */ var _TopSiteForm__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(75);
-/* harmony import */ var _TopSite__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(61);
+/* harmony import */ var _SearchShortcutsForm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57);
+/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(72);
+/* harmony import */ var _TopSiteForm__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(73);
+/* harmony import */ var _TopSite__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(58);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -9049,7 +8679,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 59 */
+/* 56 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9076,7 +8706,7 @@
 const MIN_CORNER_FAVICON_SIZE = 16;
 
 /***/ }),
-/* 60 */
+/* 57 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9084,9 +8714,9 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SelectableSearchShortcut", function() { return SelectableSearchShortcut; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SearchShortcutsForm", function() { return SearchShortcutsForm; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59);
+/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(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/. */
@@ -9267,7 +8897,7 @@
 }
 
 /***/ }),
-/* 61 */
+/* 58 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9277,14 +8907,14 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSitePlaceholder", function() { return TopSitePlaceholder; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSiteList", function() { return TopSiteList; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(59);
-/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(25);
-/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9);
+/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
+/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(21);
+/* harmony import */ var _DiscoveryStreamImpressionStats_ImpressionStats__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52);
-/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(74);
-/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(28);
+/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(49);
+/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(72);
+/* harmony import */ var content_src_components_ContextMenu_ContextMenuButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(24);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -9970,13 +9600,13 @@
 }
 
 /***/ }),
-/* 62 */
+/* 59 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "HorizontalRule", function() { return HorizontalRule; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -9992,7 +9622,7 @@
 }
 
 /***/ }),
-/* 63 */
+/* 60 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10000,10 +9630,10 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Topic", function() { return Topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Navigation", function() { return Navigation; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30);
-/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34);
+/* harmony import */ var _SafeAnchor_SafeAnchor__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(26);
+/* harmony import */ var content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30);
 /* 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/. */
@@ -10043,77 +9673,36 @@
   }
 
 }
-
-class ExploreTopics extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureComponent {
-  render() {
-    const {
-      explore_topics
-    } = this.props;
-
-    if (!explore_topics) {
-      return null;
-    }
-
-    return react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_1___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(Topic, {
-      dispatch: this.props.dispatch,
-      className: "ds-navigation-inline-explore-more",
-      url: explore_topics.url,
-      name: explore_topics.name
-    }), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(Topic, {
-      dispatch: this.props.dispatch,
-      className: "ds-navigation-header-explore-more",
-      url: explore_topics.url,
-      name: explore_topics.header
-    }));
-  }
-
-}
-
 class Navigation extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureComponent {
   render() {
-    const {
-      links
-    } = this.props || [];
-    const {
-      alignment
-    } = this.props || "centered"; // Basic isn't currently used, but keeping it here to be very explicit.
-    // The other variant that's supported is "responsive".
-    // The responsive variant is intended for longer lists of topics, more than 6.
-    // It hides the last item on larger displays. The last item is meant for "see more topics"
-
-    const variant = this.props.display_variant || "basic";
+    const links = this.props.links || [];
+    const alignment = this.props.alignment || "centered";
     const header = this.props.header || {};
-    const {
-      explore_topics
-    } = this.props;
     return react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", {
-      className: `ds-navigation ds-navigation-${alignment} ds-navigation-variant-${variant}`
+      className: `ds-navigation ds-navigation-${alignment}`
     }, header.title ? react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(content_src_components_FluentOrText_FluentOrText__WEBPACK_IMPORTED_MODULE_3__["FluentOrText"], {
       message: header.title
     }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("span", {
-      className: "ds-header"
+      className: "ds-navigation-header"
     })) : null, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("ul", null, links && links.map(t => react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("li", {
       key: t.name
     }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(Topic, {
       url: t.url,
       name: t.name,
       dispatch: this.props.dispatch
-    })))), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(ExploreTopics, {
-      dispatch: this.props.dispatch,
-      explore_topics: explore_topics
-    }));
+    })))));
   }
 
 }
 
 /***/ }),
-/* 64 */
+/* 61 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SectionTitle", function() { return SectionTitle; });
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_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,
@@ -10139,7 +9728,7 @@
 }
 
 /***/ }),
-/* 65 */
+/* 62 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10410,7 +9999,7 @@
 };
 
 /***/ }),
-/* 66 */
+/* 63 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10419,9 +10008,9 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSites", function() { return TopSites; });
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(58);
-/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(74);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
+/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55);
+/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(72);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
 /* 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,
@@ -10561,7 +10150,7 @@
 }))(_TopSites);
 
 /***/ }),
-/* 67 */
+/* 64 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10571,8 +10160,8 @@
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var content_src_lib_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9);
+/* harmony import */ var content_src_lib_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
 /* 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,
@@ -10753,14 +10342,14 @@
 const Search = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])()(_Search);
 
 /***/ }),
-/* 68 */
+/* 65 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DetectUserSessionStart", function() { return DetectUserSessionStart; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var content_src_lib_perf_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(54);
+/* harmony import */ var content_src_lib_perf_service__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
 /* 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/. */
@@ -10835,7 +10424,7 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 69 */
+/* 66 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10848,7 +10437,7 @@
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queueEarlyMessageMiddleware", function() { return queueEarlyMessageMiddleware; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initStore", function() { return initStore; });
 /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(70);
+/* harmony import */ var redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(67);
 /* harmony import */ var redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(redux__WEBPACK_IMPORTED_MODULE_1__);
 /* 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,
@@ -11014,23 +10603,23 @@
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(3)))
 
 /***/ }),
-/* 70 */
+/* 67 */
 /***/ (function(module, exports) {
 
 module.exports = Redux;
 
 /***/ }),
-/* 71 */
+/* 68 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 
 // EXTERNAL MODULE: external "React"
-var external_React_ = __webpack_require__(9);
+var external_React_ = __webpack_require__(8);
 
 // EXTERNAL MODULE: external "PropTypes"
-var external_PropTypes_ = __webpack_require__(13);
+var external_PropTypes_ = __webpack_require__(12);
 var external_PropTypes_default = /*#__PURE__*/__webpack_require__.n(external_PropTypes_);
 
 // CONCATENATED MODULE: ./node_modules/fluent-sequence/src/map_sync.js
@@ -11817,14 +11406,14 @@
 
 
 /***/ }),
-/* 72 */
+/* 69 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 
 // EXTERNAL MODULE: external "React"
-var external_React_ = __webpack_require__(9);
+var external_React_ = __webpack_require__(8);
 var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_);
 
 // CONCATENATED MODULE: ./content-src/asrouter/components/Button/Button.jsx
@@ -11866,10 +11455,10 @@
 
 /* harmony default export */ var ConditionalWrapper_ConditionalWrapper = (ConditionalWrapper);
 // EXTERNAL MODULE: ./node_modules/fluent-react/src/index.js + 14 modules
-var src = __webpack_require__(71);
+var src = __webpack_require__(68);
 
 // EXTERNAL MODULE: ./content-src/asrouter/rich-text-strings.js + 7 modules
-var rich_text_strings = __webpack_require__(73);
+var rich_text_strings = __webpack_require__(70);
 
 // CONCATENATED MODULE: ./content-src/asrouter/template-utils.js
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -13149,7 +12738,7 @@
 };
 
 /***/ }),
-/* 73 */
+/* 70 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -14569,7 +14158,280 @@
 }
 
 /***/ }),
-/* 74 */
+/* 71 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+
+// EXTERNAL MODULE: external "React"
+var external_React_ = __webpack_require__(8);
+var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_);
+
+// CONCATENATED MODULE: ./content-src/components/CustomizeMenu/ThemesSection/ThemesSection.jsx
+/* 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/. */
+
+class ThemesSection_ThemesSection extends external_React_default.a.PureComponent {
+  render() {
+    return external_React_default.a.createElement("div", null);
+  }
+
+}
+// CONCATENATED MODULE: ./content-src/components/CustomizeMenu/BackgroundsSection/BackgroundsSection.jsx
+/* 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/. */
+
+class BackgroundsSection_BackgroundsSection extends external_React_default.a.PureComponent {
+  render() {
+    return external_React_default.a.createElement("div", null);
+  }
+
+}
+// EXTERNAL MODULE: ./common/Actions.jsm
+var Actions = __webpack_require__(1);
+
+// CONCATENATED MODULE: ./content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+/* 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/. */
+
+
+class ContentSection_ContentSection extends external_React_default.a.PureComponent {
+  constructor(props) {
+    super(props);
+    this.onPreferenceSelect = this.onPreferenceSelect.bind(this);
+  }
+
+  inputUserEvent(eventSource, status) {
+    this.props.dispatch(Actions["actionCreators"].UserEvent({
+      event: "PREF_CHANGED",
+      source: eventSource,
+      value: {
+        status,
+        menu_source: "CUSTOMIZE_MENU"
+      }
+    }));
+  }
+
+  onPreferenceSelect(e) {
+    let prefName = e.target.getAttribute("preference");
+    const eventSource = e.target.getAttribute("eventSource");
+    let value;
+
+    if (e.target.nodeName === "SELECT") {
+      value = parseInt(e.target.value, 10);
+    } else if (e.target.nodeName === "INPUT") {
+      value = e.target.checked;
+
+      if (eventSource) {
+        this.inputUserEvent(eventSource, value);
+      }
+    }
+
+    this.props.setPref(prefName, value);
+  }
+
+  render() {
+    const {
+      topSitesEnabled,
+      pocketEnabled,
+      highlightsEnabled,
+      snippetsEnabled,
+      showSponsoredTopSitesEnabled,
+      showSponsoredPocketEnabled,
+      topSitesRowsCount
+    } = this.props.enabledSections;
+    return external_React_default.a.createElement("div", {
+      className: "home-section"
+    }, external_React_default.a.createElement("div", {
+      id: "shortcuts-section",
+      className: "section"
+    }, external_React_default.a.createElement("div", null, external_React_default.a.createElement("h2", {
+      className: "title",
+      "data-l10n-id": "newtab-custom-shortcuts-title"
+    }), external_React_default.a.createElement("p", {
+      className: "subtitle",
+      "data-l10n-id": "newtab-custom-shortcuts-subtitle"
+    }), external_React_default.a.createElement("div", {
+      className: `more-info-top-wrapper ${topSitesEnabled ? "" : "shrink"}`
+    }, external_React_default.a.createElement("div", {
+      className: `more-information ${topSitesEnabled ? "expand" : "shrink"}`
+    }, external_React_default.a.createElement("select", {
+      id: "row-selector",
+      className: "selector",
+      name: "row-count",
+      preference: "topSitesRows",
+      value: topSitesRowsCount,
+      onChange: this.onPreferenceSelect,
+      disabled: !topSitesEnabled
+    }, external_React_default.a.createElement("option", {
+      value: "1",
+      "data-l10n-id": "newtab-custom-row-selector",
+      "data-l10n-args": "{\"num\": 1}"
+    }), external_React_default.a.createElement("option", {
+      value: "2",
+      "data-l10n-id": "newtab-custom-row-selector",
+      "data-l10n-args": "{\"num\": 2}"
+    }), external_React_default.a.createElement("option", {
+      value: "3",
+      "data-l10n-id": "newtab-custom-row-selector",
+      "data-l10n-args": "{\"num\": 3}"
+    }), external_React_default.a.createElement("option", {
+      value: "4",
+      "data-l10n-id": "newtab-custom-row-selector",
+      "data-l10n-args": "{\"num\": 4}"
+    })), this.props.mayHaveSponsoredTopSites && external_React_default.a.createElement("div", {
+      className: "check-wrapper"
+    }, external_React_default.a.createElement("input", {
+      id: "sponsored-shortcuts",
+      className: "sponsored-checkbox",
+      disabled: !topSitesEnabled,
+      checked: showSponsoredTopSitesEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "showSponsoredTopSites"
+    }), external_React_default.a.createElement("label", {
+      className: "sponsored",
+      htmlFor: "sponsored-shortcuts",
+      "data-l10n-id": "newtab-custom-sponsored-sites"
+    }))))), external_React_default.a.createElement("label", {
+      className: "switch"
+    }, external_React_default.a.createElement("input", {
+      checked: topSitesEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "feeds.topsites"
+    }), external_React_default.a.createElement("span", {
+      className: "slider"
+    }))), this.props.pocketRegion && external_React_default.a.createElement("div", {
+      id: "pocket-section",
+      className: "section"
+    }, external_React_default.a.createElement("div", null, external_React_default.a.createElement("h2", {
+      className: "title",
+      "data-l10n-id": "newtab-custom-pocket-title"
+    }), external_React_default.a.createElement("p", {
+      className: "subtitle",
+      "data-l10n-id": "newtab-custom-pocket-subtitle"
+    }), this.props.mayHaveSponsoredStories && external_React_default.a.createElement("div", {
+      className: `more-info-pocket-wrapper ${pocketEnabled ? "" : "shrink"}`
+    }, external_React_default.a.createElement("div", {
+      className: `more-information ${pocketEnabled ? "expand" : "shrink"}`
+    }, external_React_default.a.createElement("div", {
+      className: "check-wrapper"
+    }, external_React_default.a.createElement("input", {
+      id: "sponsored-pocket",
+      className: "sponsored-checkbox",
+      disabled: !pocketEnabled,
+      checked: showSponsoredPocketEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "showSponsored",
+      eventSource: "POCKET_SPOCS"
+    }), external_React_default.a.createElement("label", {
+      className: "sponsored",
+      htmlFor: "sponsored-pocket",
+      "data-l10n-id": "newtab-custom-pocket-sponsored"
+    }))))), external_React_default.a.createElement("label", {
+      className: "switch"
+    }, external_React_default.a.createElement("input", {
+      checked: pocketEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "feeds.section.topstories",
+      eventSource: "TOP_STORIES"
+    }), external_React_default.a.createElement("span", {
+      className: "slider"
+    }))), external_React_default.a.createElement("div", {
+      id: "recent-section",
+      className: "section"
+    }, external_React_default.a.createElement("div", null, external_React_default.a.createElement("h2", {
+      className: "title",
+      "data-l10n-id": "newtab-custom-recent-title"
+    }), external_React_default.a.createElement("p", {
+      className: "subtitle",
+      "data-l10n-id": "newtab-custom-recent-subtitle"
+    })), external_React_default.a.createElement("label", {
+      className: "switch"
+    }, external_React_default.a.createElement("input", {
+      checked: highlightsEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "feeds.section.highlights",
+      eventSource: "HIGHLIGHTS"
+    }), external_React_default.a.createElement("span", {
+      className: "slider"
+    }))), external_React_default.a.createElement("div", {
+      id: "snippets-section",
+      className: "section"
+    }, external_React_default.a.createElement("div", null, external_React_default.a.createElement("h2", {
+      className: "title",
+      "data-l10n-id": "newtab-custom-snippets-title"
+    }), external_React_default.a.createElement("p", {
+      className: "subtitle",
+      "data-l10n-id": "newtab-custom-snippets-subtitle"
+    })), external_React_default.a.createElement("label", {
+      className: "switch"
+    }, external_React_default.a.createElement("input", {
+      checked: snippetsEnabled,
+      type: "checkbox",
+      onChange: this.onPreferenceSelect,
+      preference: "feeds.snippets"
+    }), external_React_default.a.createElement("span", {
+      className: "slider"
+    }))), external_React_default.a.createElement("span", {
+      className: "divider"
+    }), external_React_default.a.createElement("div", null, external_React_default.a.createElement("button", {
+      id: "settings-link",
+      className: "external-link",
+      onClick: this.props.openPreferences,
+      "data-l10n-id": "newtab-custom-settings"
+    })));
+  }
+
+}
+// EXTERNAL MODULE: external "ReactRedux"
+var external_ReactRedux_ = __webpack_require__(7);
+
+// CONCATENATED MODULE: ./content-src/components/CustomizeMenu/CustomizeMenu.jsx
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_CustomizeMenu", function() { return CustomizeMenu_CustomizeMenu; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CustomizeMenu", function() { return CustomizeMenu; });
+/* 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/. */
+
+
+
+
+
+class CustomizeMenu_CustomizeMenu extends external_React_default.a.PureComponent {
+  render() {
+    return external_React_default.a.createElement("div", {
+      className: "customize-menu"
+    }, external_React_default.a.createElement("button", {
+      onClick: this.props.onClose,
+      className: "close-button",
+      "data-l10n-id": "newtab-custom-close-button"
+    }), external_React_default.a.createElement(ThemesSection_ThemesSection, null), external_React_default.a.createElement(BackgroundsSection_BackgroundsSection, null), external_React_default.a.createElement(ContentSection_ContentSection, {
+      openPreferences: this.props.openPreferences,
+      setPref: this.props.setPref,
+      enabledSections: this.props.enabledSections,
+      pocketRegion: this.props.pocketRegion,
+      mayHaveSponsoredTopSites: this.props.mayHaveSponsoredTopSites,
+      mayHaveSponsoredStories: this.props.DiscoveryStream.config.show_spocs,
+      dispatch: this.props.dispatch
+    }));
+  }
+
+}
+const CustomizeMenu = Object(external_ReactRedux_["connect"])(state => ({
+  DiscoveryStream: state.DiscoveryStream
+}))(CustomizeMenu_CustomizeMenu);
+
+/***/ }),
+/* 72 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15539,7 +15401,7 @@
 };
 
 /***/ }),
-/* 75 */
+/* 73 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15549,14 +15411,14 @@
 var Actions = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./content-src/components/A11yLinkButton/A11yLinkButton.jsx
-var A11yLinkButton = __webpack_require__(40);
+var A11yLinkButton = __webpack_require__(36);
 
 // EXTERNAL MODULE: external "React"
-var external_React_ = __webpack_require__(9);
+var external_React_ = __webpack_require__(8);
 var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_);
 
 // EXTERNAL MODULE: ./content-src/components/TopSites/TopSitesConstants.js
-var TopSitesConstants = __webpack_require__(59);
+var TopSitesConstants = __webpack_require__(56);
 
 // CONCATENATED MODULE: ./content-src/components/TopSites/TopSiteFormInput.jsx
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -15671,7 +15533,7 @@
   validationError: false
 };
 // EXTERNAL MODULE: ./content-src/components/TopSites/TopSite.jsx
-var TopSite = __webpack_require__(61);
+var TopSite = __webpack_require__(58);
 
 // CONCATENATED MODULE: ./content-src/components/TopSites/TopSiteForm.jsx
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSiteForm", function() { return TopSiteForm_TopSiteForm; });
@@ -15967,127 +15829,5 @@
   index: -1
 };
 
-/***/ }),
-/* 76 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-
-// EXTERNAL MODULE: external "React"
-var external_React_ = __webpack_require__(9);
-var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_);
-
-// CONCATENATED MODULE: ./content-src/aboutwelcome/components/MSLocalized.jsx
-/* 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/. */
-
-const MS_STRING_PROP = "string_id";
-/**
- * Based on the .text prop, localizes an inner element if a string_id
- * is provided, OR renders plain text, OR hides it if nothing is provided.
- *
- * Examples:
- *
- * Localized text
- * ftl:
- *  title = Welcome
- * jsx:
- *   <Localized text={{string_id: "title"}}><h1 /></Localized>
- * output:
- *   <h1 data-l10n-id="title">Welcome</h1>
- *
- * Unlocalized text
- * jsx:
- *   <Localized text="Welcome"><h1 /></Localized>
- * output:
- *   <h1>Welcome</h1>
- */
-
-const Localized = ({
-  text,
-  children
-}) => {
-  if (!text) {
-    return null;
-  }
-
-  let props = children ? children.props : {};
-  let textNode;
-
-  if (typeof text === "object" && text[MS_STRING_PROP]) {
-    props = { ...props
-    };
-    props["data-l10n-id"] = text[MS_STRING_PROP];
-  } else if (typeof text === "string") {
-    textNode = text;
-  }
-
-  if (!children) {
-    return external_React_default.a.createElement("span", props, textNode);
-  } else if (textNode) {
-    return external_React_default.a.cloneElement(children, props, textNode);
-  }
-
-  return external_React_default.a.cloneElement(children, props);
-};
-// CONCATENATED MODULE: ./content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.jsx
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OnboardingCard", function() { return OnboardingMessage_OnboardingCard; });
-/* 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/. */
-
-
-class OnboardingMessage_OnboardingCard extends external_React_default.a.PureComponent {
-  constructor(props) {
-    super(props);
-    this.onClick = this.onClick.bind(this);
-  }
-
-  onClick() {
-    const {
-      props
-    } = this;
-    const ping = {
-      event: "CLICK_BUTTON",
-      message_id: props.id,
-      id: props.UISurface
-    };
-    props.sendUserActionTelemetry(ping);
-    props.onAction(props.content.primary_button.action, props.message);
-  }
-
-  render() {
-    const {
-      content
-    } = this.props;
-    const className = this.props.className || "onboardingMessage";
-    return external_React_default.a.createElement("div", {
-      className: className
-    }, external_React_default.a.createElement("div", {
-      className: `onboardingMessageImage ${content.icon}`
-    }), external_React_default.a.createElement("div", {
-      className: "onboardingContent"
-    }, external_React_default.a.createElement("span", null, external_React_default.a.createElement(Localized, {
-      text: content.title
-    }, external_React_default.a.createElement("h2", {
-      className: "onboardingTitle"
-    })), external_React_default.a.createElement(Localized, {
-      text: content.text
-    }, external_React_default.a.createElement("p", {
-      className: "onboardingText"
-    }))), external_React_default.a.createElement("span", {
-      className: "onboardingButtonContainer"
-    }, external_React_default.a.createElement(Localized, {
-      text: content.primary_button.label
-    }, external_React_default.a.createElement("button", {
-      className: "button onboardingButton",
-      onClick: this.onClick
-    })))));
-  }
-
-}
-
 /***/ })
 /******/ ]);
\ No newline at end of file
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/assets/privacy-onboarding-dark.webm and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/assets/privacy-onboarding-dark.webm differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/assets/privacy-onboarding.webm and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/assets/privacy-onboarding.webm differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/adidas.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/adidas.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/baidu-com.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/baidu-com.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/baidu-com.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/baidu-com.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/etsy.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/etsy.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/geico.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/geico.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/hrblock.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/hrblock.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/nike.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/nike.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/samsung.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/samsung.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/turbotax.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/turbotax.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/vodafone.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/vodafone.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/favicons/wix.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/favicons/wix.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/adidas@2x.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/adidas@2x.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/baidu-com@2x.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/baidu-com@2x.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/ebay@2x.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/ebay@2x.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/etsy@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/etsy@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/geico@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/geico@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/hrblock@2x.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/hrblock@2x.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/nike@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/nike@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/samsung@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/samsung@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/turbotax@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/turbotax@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/vodafone@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/vodafone@2x.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/images/wix@2x.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/newtab/data/content/tippytop/images/wix@2x.jpg differ
diff -Nru firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/top_sites.json firefox-85.0+build1/browser/components/newtab/data/content/tippytop/top_sites.json
--- firefox-84.0.2+build1/browser/components/newtab/data/content/tippytop/top_sites.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/data/content/tippytop/top_sites.json	2021-01-18 19:58:08.000000000 +0000
@@ -1,5 +1,11 @@
 [
   {
+    "title": "adidas",
+    "urls": ["https://www.adidas.co.uk/", "https://www.adidas.de/", "https://www.adidas.fr/"],
+    "image_url": "images/adidas@2x.png",
+    "favicon_url": "favicons/adidas.png"
+  },
+  {
     "title": "aliexpress",
     "url": "https://www.aliexpress.com/",
     "image_url": "images/aliexpress-com@2x.png",
@@ -27,7 +33,7 @@
     "title": "baidu",
     "url": "https://www.baidu.com/",
     "image_url": "images/baidu-com@2x.png",
-    "favicon_url": "favicons/baidu-com.ico"
+    "favicon_url": "favicons/baidu-com.png"
   },
   {
     "title": "bbc",
@@ -60,18 +66,36 @@
     "favicon_url": "favicons/ebay.ico"
   },
   {
+    "title": "etsy",
+    "url": "https://www.etsy.com/",
+    "image_url": "images/etsy@2x.jpg",
+    "favicon_url": "favicons/etsy.ico"
+  },
+  {
     "title": "facebook",
     "url": "https://www.facebook.com/",
     "image_url": "images/facebook-com@2x.png",
     "favicon_url": "favicons/facebook-com.ico"
   },
   {
+    "title": "geico",
+    "url": "https://www.geico.com/",
+    "image_url": "images/geico@2x.jpg",
+    "favicon_url": "favicons/geico.png"
+  },
+  {
     "title": "google",
     "url": "https://www.google.com/",
     "image_url": "images/google-com@2x.png",
     "favicon_url": "favicons/google-com.ico"
   },
   {
+    "title": "hrblock",
+    "url": "https://www.hrblock.com/",
+    "image_url": "images/hrblock@2x.png",
+    "favicon_url": "favicons/hrblock.ico"
+  },
+  {
     "title": "ifeng",
     "url": "https://www.ifeng.com/",
     "image_url": "images/ifeng-com@2x.png",
@@ -90,6 +114,12 @@
     "favicon_url": "favicons/leboncoin-fr.png"
   },
   {
+    "title": "nike",
+    "url": "https://www.nike.com/",
+    "image_url": "images/nike@2x.jpg",
+    "favicon_url": "favicons/nike.ico"
+  },
+  {
     "title": "ok",
     "url": "https://www.ok.ru/",
     "image_url": "images/ok-ru@2x.png",
@@ -108,6 +138,18 @@
     "favicon_url": "favicons/reddit-com.png"
   },
   {
+    "title": "samsung",
+    "url": "https://samsung.com/",
+    "image_url": "images/samsung@2x.jpg",
+    "favicon_url": "favicons/samsung.ico"
+  },
+  {
+    "title": "turbotax",
+    "url": "https://turbotax.intuit.com/",
+    "image_url": "images/turbotax@2x.jpg",
+    "favicon_url": "favicons/turbotax.png"
+  },
+  {
     "title": "twitter",
     "url": "https://twitter.com/",
     "image_url": "images/twitter-com@2x.png",
@@ -120,6 +162,12 @@
     "favicon_url": "favicons/vk-com.ico"
   },
   {
+    "title": "vodafone",
+    "url": "https://www.vodafone.co.uk/",
+    "image_url": "images/vodafone@2x.jpg",
+    "favicon_url": "favicons/vodafone.png"
+  },
+  {
     "title": "weibo",
     "url": "https://weibo.com/",
     "image_url": "images/weibo-com@2x.png",
@@ -132,6 +180,12 @@
     "favicon_url": "favicons/wikipedia-org.ico"
   },
   {
+    "title": "wix",
+    "url": "https://www.wix.com/",
+    "image_url": "images/wix@2x.jpg",
+    "favicon_url": "favicons/wix.ico"
+  },
+  {
     "title": "wykop",
     "url": "https://www.wykop.pl/",
     "image_url": "images/wykop-pl@2x.png",
diff -Nru firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/about_home_startup_cache.md firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/about_home_startup_cache.md
--- firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/about_home_startup_cache.md	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/about_home_startup_cache.md	2021-01-18 19:58:08.000000000 +0000
@@ -46,7 +46,7 @@
 
 When the `AboutRedirector` in the "privileged about content process" notices that a request has been made to `about:home`, it asks `nsIAboutNewTabService` to return a new `nsIChannel` for that document. The `AboutNewTabChildService` then checks to see if the `AboutHomeStartupCacheChild` can return an `nsIChannel` for any cached content.
 
-If, at this point, nothing has been streamed from the parent, we fall back to loading the dynamic `about:home` document. This might occur if the cache doesn't exist yet, or if we were too slow to pull it off of the disk.
+If, at this point, nothing has been streamed from the parent, we fall back to loading the dynamic `about:home` document. This might occur if the cache doesn't exist yet, or if we were too slow to pull it off of the disk. Subsequent attempts to load `about:home` will bypass the cache and load the dynamic document instead. This is true even if the privileged about content process crashes and a new one is created.
 
 The `AboutHomeStartupCacheChild` will also be responsible for generating the cache periodically. Periodically, the `AboutNewTabService` will send down the most up-to-date state for `about:home` from the parent process, and then the `AboutHomeStartupCacheChild` will generate document markup using ReactDOMServer within a `ChromeWorker`. After that's generated, the "privileged about content process" will send up `nsIInputStream` instances for both the markup and the script for the initial page state. The `AboutHomeStartupCache` singleton inside of `BrowserGlue` is responsible for receiving those `nsIInputStream`'s and persisting them in the HTTP cache for the next start.
 
diff -Nru firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/data_dictionary.md firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/data_dictionary.md
--- firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/data_dictionary.md	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/data_dictionary.md	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,6 @@
 - a `health` ping that reports whether or not a user has a custom about:home or about:newtab page
 - a `session` ping that describes the ending of an Activity Stream session (a new tab is closed or refreshed), and
 - an `event` ping that records specific data about individual user interactions while interacting with Activity Stream
-- a `performance` ping that records specific performance related events
 - an `undesired` ping that records data about bad app states and missing data
 - an `impression_stats` ping that records data about Pocket impressions and user interactions
 
@@ -78,30 +77,6 @@
 }
 ```
 
-## Example Activity Stream `performance` Log
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "addon_version": "20180710100040",
-  "client_id": "374dc4d8-0cb2-4ac5-a3cf-c5a9bc3c602e",
-  "event": "previewCacheHit",
-  "event_id": "45f1912165ca4dfdb5c1c2337dbdc58f",
-  "locale": "en-US",
-  "page": "unknown", // all session-specific perf events should be part of the session perf object
-  "receive_at": 1457396660000,
-  "source": "TOP_FRECENT_SITES",
-  "value": 1,
-  "user_prefs": 7,
-
-  // These fields are generated on the server
-  "ip": "10.192.171.13",
-  "ua": "python-requests/2.9.1",
-  "receive_at": 1457396660000,
-  "date": "2016-03-07"
-}
-```
-
 ## Example Activity Stream `undesired event` Log
 
 ```js
@@ -208,7 +183,7 @@
 +============================+======================================================================================================================================================+==================+
 | ``action_position``        | [Optional] The index of the element in the ``source`` that was clicked.                                                                              | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
-| ``action``                 | [Required] Either ``activity_stream_event``, ``activity_stream_session``, or ``activity_stream_performance``.                                        | :one:            |
+| ``action``                 | [Required] Either ``activity_stream_event`` or ``activity_stream_session``.                                                                          | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``addon_version``          | [Required] Firefox build ID, i.e. ``Services.appinfo.appBuildID``.                                                                                   | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
@@ -223,8 +198,6 @@
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``shield_id``              | [Optional] DEPRECATED: use `experiments` instead. The unique identifier for a specific experiment.                                                   | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
-| ``event_id``               | [Required] An identifier shared by multiple performance pings that describe an entire request flow.                                                  | :one:            |
-+----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``event``                  | [Required] The type of event. Any user defined string ("click", "share", "delete", "more\_items")                                                    | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``event_context``          | [Optional] A string to record the context of an AS Router event ping. Compound context values will be stringified by JSON.stringify                  | :one:            |
@@ -267,9 +240,6 @@
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``url``                    | [Optional] The URL of the recommendation shown in one of the highlights spots, if any.                                                               | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
-| ``value`` (performance)    | [Required] An integer that represents the measured performance value. Can store counts, times in milliseconds, and should always be a positive       |                  |
-|                            |  integer.                                                                                                                                            | :one:            |
-+----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``value`` (event)          | [Optional] An object with keys "icon\_type" and "card\_type" to record the extra information for event ping                                          | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 | ``ver``                    | [Auto populated by Onyx] The version of the Onyx API the ping was sent to.                                                                           | :one:            |
@@ -343,7 +313,21 @@
 |                            | `Example: {"experiment_1": {"branch": "control"}, "experiment_2": {"branch": "treatment"}}`. This deprecates the `shield_id` used in Activity Stream |                  |
 |                            | and Messaging System.                                                                                                                                |                  |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
-| `browser_session_id`       | [Optional] The unique identifier for a browser session, retrieved from TelemetrySession                                                              | :one:            |
+| ``browser_session_id``     | [Optional] The unique identifier for a browser session, retrieved from TelemetrySession                                                              | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.source``     | [Optional] Referring partner domain, when install happens via a known partner                                                                        | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.medium``     | [Optional] Category of the source, such as 'organic' for a search engine                                                                             | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.campaign``   | [Optional] Identifier of the particular campaign that led to the download of the product                                                             | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.content``    | [Optional] Identifier to indicate the particular link within a campaign                                                                              | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.experiment`` | [Optional] Funnel experiment identifier, see bug 1567339                                                                                             | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.variantion`` | [Optional] Funnel experiment variant identifier, see bug 1567339                                                                                     | :one:            |
++----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
+| ``attribution.ua``         | [Optional] Derived user agent, see bug 1595063                                                                                                       | :one:            |
 +----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+------------------+
 ```
 
diff -Nru firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/data_events.md firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/data_events.md
--- firefox-84.0.2+build1/browser/components/newtab/docs/v2-system-addon/data_events.md	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/docs/v2-system-addon/data_events.md	2021-01-18 19:58:08.000000000 +0000
@@ -10,27 +10,6 @@
 
 The following is a detailed overview of the different kinds of data we collect in the Activity Stream. See [data_dictionary.md](data_dictionary.md) for more details for each field.
 
-## Health ping
-
-This is a heartbeat ping indicating whether Activity Stream is currently being used or not, it's submitted once upon the browser initialization.
-
-```js
-{
-  "client_id": "374dc4d8-0cb2-4ac5-a3cf-c5a9bc3c602e",
-  "locale": "en-US",
-  "version": "62.0a1",
-  "release_channel": "nightly",
-  "event": "AS_ENABLED",
-  "value": 10
-}
-```
-where the "value" is encoded as:
-  * Value 0: default
-  * Value 1: about:blank
-  * Value 2: web extension
-  * Value 3: other custom URL(s)
-Two encoded integers for about:newtab and about:home are combined in a bitwise fashion. For instance, if both about:home and about:newtab were set to about:blank, then `value = 5 = (1 | (1 << 2))`, i.e `value = (bitfield of about:newtab) | (bitfield of about:newhome << 2)`.
-
 ## Page takeover ping
 
 This ping is submitted once upon Activity Stream initialization if either about:home or about:newtab are set to a custom URL. It sends the category of the custom URL. It also includes the web extension id of the extension controlling the home and/or newtab page.
@@ -469,6 +448,23 @@
 }
 ```
 
+#### Changing preferences from about:preferences#home
+
+```js
+{
+  "event": "PREF_CHANGED",
+  "source": "TOP_STORIES|POCKET_SPOCS|HIGHLIGHTS",
+  "value": "{\"status\":true|false,\"menu_source\":\"ABOUT_PREFERENCES|CUSTOMIZE_MENU\"}"
+  "release_channel": "default",
+  "experiments": {},
+  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
+  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
+  "addon_version": "20180710100040",
+  "locale": "en-US",
+  "user_prefs": 7
+}
+```
+
 #### Pinning a tab
 
 ```js
@@ -513,57 +509,6 @@
 }
 ```
 
-### Onboarding user events on about:welcome
-
-#### Form Submit Events
-
-```js
-{
-  "event": ["SUBMIT_EMAIL" | "SUBMIT_SIGNIN" | "SKIPPED_SIGNIN"],
-  "value": {
-    "has_flow_params": false,
-  }
-
-  // Basic metadata
-  "action": "activity_stream_event",
-  "page": "about:welcome",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "session_id": "005deed0-e3e4-4c02-a041-17405fd703f6",
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7
-}
-```
-
-#### Firefox Accounts Metrics flow errors
-
-```js
-{
-  "event": ["FXA_METRICS_FETCH_ERROR" | "FXA_METRICS_ERROR"],
-  "value": 500, // Only FXA_METRICS_FETCH_ERROR provides this value, this value is any valid HTTP status code except 200.
-
-  // Basic metadata
-  "action": "activity_stream_event",
-  "page": "about:welcome",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "session_id": "005deed0-e3e4-4c02-a041-17405fd703f6",
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7
-}
-```
-
-
 ## Session end pings
 
 When a session ends, the browser will send a `"activity_stream_session"` ping to our metrics servers. This ping contains the length of the session, a unique reason for why the session ended, and some additional metadata.
@@ -744,336 +689,7 @@
 }
 ```
 
-## Performance pings
-
-These pings are captured to record performance related events i.e. how long certain operations take to execute.
-
-### Domain affinity calculation v1
-
-This reports the duration of the domain affinity calculation in milliseconds.
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "topstories.domain.affinity.calculation.ms",
-  "value": 43
-}
-```
-
-### Domain affinity calculation v2
-
-These report the duration of the domain affinity v2 calculations in milliseconds.
-
-#### Total calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_TOTAL_DURATION",
-  "value": 43
-}
-```
-
-#### getRecipe calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_GET_RECIPE_DURATION",
-  "value": 43
-}
-```
-
-#### RecipeExecutor calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_RECIPE_EXECUTOR_DURATION",
-  "value": 43
-}
-```
-
-#### taggers calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_TAGGERS_DURATION",
-  "value": 43
-}
-```
-
-#### createInterestVector calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_CREATE_INTEREST_VECTOR_DURATION",
-  "value": 43
-}
-```
-
-#### calculateItemRelevanceScore calculation in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION",
-  "value": 43
-}
-```
-
-### History size used for v2 calculation
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_HISTORY_SIZE",
-  "value": 43
-}
-```
-
-### Error events for v2 calculation
-
-These report any failures during domain affinity v2 calculations, and where it failed.
-
-#### getRecipe error
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_GET_RECIPE_ERROR"
-}
-```
-
-#### generateRecipeExecutor error
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_GENERATE_RECIPE_EXECUTOR_ERROR"
-}
-```
-
-#### createInterestVector error
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "PERSONALIZATION_V2_CREATE_INTEREST_VECTOR_ERROR"
-}
-```
-
-### Discovery Stream loaded content
-
-This reports all the loaded content (a list of `id`s and positions) when the user opens a newtab page and the page becomes visible. Note that this ping is a superset of the Discovery Stream impression ping, as impression pings are also subject to the individual visibility.
-
-```js
-{
-  "action": "activity_stream_impression_stats",
-
-  // Both "client_id" and "session_id" are set to "n/a" in this ping.
-  "client_id": "n/a",
-  "session_id": "n/a",
-  "impression_id": "{005deed0-e3e4-4c02-a041-17405fd703f6}",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "source": ["HERO" | "CARDGRID" | "LIST"],
-  "page": ["about:newtab" | "about:home" | "about:welcome" | "unknown"],
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-
-  // Indicating this is a `loaded content` ping (as opposed to impression) as well as the size of `tiles`
-  "loaded": 3,
-  "tiles": [{"id": 10000, "pos": 0}, {"id": 10001, "pos": 1}, {"id": 10002, "pos": 2}]
-}
-```
-
-### Discovery Stream performance pings
-
-#### Request time of layout feed in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "LAYOUT_REQUEST_TIME",
-  "value": 42
-}
-```
-
-#### Request time of SPOCS feed in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "SPOCS_REQUEST_TIME",
-  "value": 42
-}
-```
-
-#### Request time of component feed feed in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "COMPONENT_FEED_REQUEST_TIME",
-  "value": 42
-}
-```
-
-#### Request time of total Discovery Stream feed in ms
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "DS_FEED_TOTAL_REQUEST_TIME",
-  "value": 136
-}
-```
-
-#### Cache age of Discovery Stream feed in second
-
-```js
-{
-  "action": "activity_stream_performance_event",
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "user_prefs": 7,
-  "event": "DS_CACHE_AGE_IN_SEC",
-  "value": 1800 // 30 minutes
-}
-```
-
-### Discovery Stream SPOCS Fill ping
+## Discovery Stream SPOCS Fill ping
 
 This reports the internal status of Pocket SPOCS (Sponsored Contents).
 
@@ -1195,59 +811,6 @@
 }
 ```
 
-#### Onboarding impression
-```js
-{
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "action": "onboarding_user_event",
-  "impression_id": "n/a",
-  "source": "FIRST_RUN",
-  "addon_version": "20180710100040",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "message_id": "EXTENDED_TRIPLETS_1",
-  "event": "IMPRESSION",
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "event_context": { "page": ["about:welcome" | "about:home" | "about:newtab"] }
-}
-```
-
-#### Onboarding Simplified Welcome impression
-```js
-{
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "version": "76.0a1",
-  "locale": "en-US",
-  "experiments": {},
-  "release_channel": "default",
-  "addon_version": "20200330194034"
-  "message_id": "ABOUT_WELCOME",
-  "event": "IMPRESSION",
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "event_context": { "page": "about:welcome" }
-}
-```
-#### Onboarding Simplified Welcome Session End ping
-```js
-{
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "version": "76.0a1",
-  "locale": "en-US",
-  "experiments": {},
-  "release_channel": "default",
-  "addon_version": "20200330194034"
-  "message_id": "ABOUT_WELCOME",
-  "id": "ABOUT_WELCOME",
-  "event": "SESSION_END",
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "event_context": { "page": "about:welcome", "reason":
-    ["welcome-window-closed" | "welcome-tab-closed" | "app-shut-down" | "address-bar-navigated" | "unknown"]}
-}
-```
-
 ### User interaction pings
 
 This reports the user's interaction with Activity Stream Router.
@@ -1270,26 +833,6 @@
 }
 ```
 
-#### Onboarding interaction pings
-```js
-{
-  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
-  "action": "onboarding_user_event",
-  "addon_version": "20180710100040",
-  "impression_id": "n/a",
-  "locale": "en-US",
-  "experiments": {
-    "experiment_1": {"branch": "control"},
-    "experiment_2": {"branch": "treatment"}
-  },
-  "source": "ONBOARDING",
-  "message_id": "onboarding_message_1",
-  "event": ["IMPRESSION" | "CLICK_BUTTION" | "INSTALL" | "BLOCK"],
-  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
-  "event_context": { "page": ["about:welcome" | "about:home" | "about:newtab"] }
-}
-```
-
 #### CFR interaction pings for all the prerelease channels and shield experiment
 ```js
 {
@@ -1518,3 +1061,108 @@
   "bar" // attribute
 ]
 ```
+
+## Firefox Onboarding (about:welcome) pings
+
+These record the telemetry metrics during the Firefox onboarding experience.
+
+### Onboarding impressions
+```js
+{
+  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
+  "version": "76.0a1",
+  "locale": "en-US",
+  "experiments": {},
+  "release_channel": "default",
+  "addon_version": "20200330194034"
+  "message_id": ["DEFAULT_ABOUTWELCOME" | "DEFAULT_ABOUTWELCOME_AW_GET_STARTED" | "DEFAULT_ABOUTWELCOME_SITES" | "DEFAULT_ABOUTWELCOME_AW_IMPORT_SETTINGS" | "DEFAULT_ABOUTWELCOME_AW_CHOOSE_THEME", "RTAMO_DEFAULT_WELCOME"],
+  "event": "IMPRESSION",
+  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
+  "event_context": { "page": "about:welcome" },
+  "attribution": {
+    "source": "mozilla.org",
+    "medium": "referral",
+    "campaign": "Firefox-Brand-US-Mozilla-Org",
+    "content": "test-addon@github.io",
+    "experiment": "ua-onboarding",
+    "variation": "chrome",
+    "ua": "firefox"
+  }
+}
+```
+
+### Onboarding button clicks
+```js
+{
+  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
+  "version": "76.0a1",
+  "locale": "en-US",
+  "experiments": {},
+  "release_channel": "default",
+  "addon_version": "20200330194034"
+  "message_id": ["DEFAULT_ABOUTWELCOME_AW_GET_STARTED" | "DEFAULT_ABOUTWELCOME_AW_IMPORT_SETTINGS" | "DEFAULT_ABOUTWELCOME_AW_CHOOSE_THEME" | "RTAMO_DEFAULT_WELCOME"],
+  "event": "CLICK_BUTTION",
+  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
+  "event_context": { "page": "about:welcome", "source": ["primary_button", "secondary_button"] },
+  "attribution": {
+    "source": "mozilla.org",
+    "medium": "referral",
+    "campaign": "Firefox-Brand-US-Mozilla-Org",
+    "content": "test-addon@github.io",
+    "experiment": "ua-onboarding",
+    "variation": "chrome",
+    "ua": "firefox"
+  }
+}
+```
+
+### Onboarding Return-To-AMO install ping
+```js
+{
+  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
+  "version": "76.0a1",
+  "locale": "en-US",
+  "experiments": {},
+  "release_channel": "default",
+  "addon_version": "20200330194034"
+  "message_id": "RTAMO_DEFAULT_WELCOME",
+  "event": "INSTALL",
+  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
+  "event_context": { "page": "about:welcome", "source": "ADD_EXTENSION_BUTTON" },
+  "attribution": {
+    "source": "mozilla.org",
+    "medium": "referral",
+    "campaign": "Firefox-Brand-US-Mozilla-Org",
+    "content": "test-addon@github.io",
+    "experiment": "ua-onboarding",
+    "variation": "chrome",
+    "ua": "firefox"
+  }
+}
+```
+
+### Onboarding session end ping
+```js
+{
+  "client_id": "26288a14-5cc4-d14f-ae0a-bb01ef45be9c",
+  "version": "76.0a1",
+  "locale": "en-US",
+  "experiments": {},
+  "release_channel": "default",
+  "addon_version": "20200330194034"
+  "message_id": "DEFAULT_ABOUTWELCOME",
+  "event": "SESSION_END",
+  "browser_session_id": "e7e52665-7db3-f348-9918-e93160eb2ef3",
+  "event_context": { "page": "about:welcome", "reason":
+    ["welcome-window-closed" | "welcome-tab-closed" | "app-shut-down" | "address-bar-navigated" | "unknown"]},
+  "attribution": {
+    "source": "mozilla.org",
+    "medium": "referral",
+    "campaign": "Firefox-Brand-US-Mozilla-Org",
+    "content": "test-addon@github.io",
+    "experiment": "ua-onboarding",
+    "variation": "chrome",
+    "ua": "firefox"
+  }
+}
+```
diff -Nru firefox-84.0.2+build1/browser/components/newtab/.eslintrc.js firefox-85.0+build1/browser/components/newtab/.eslintrc.js
--- firefox-84.0.2+build1/browser/components/newtab/.eslintrc.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/.eslintrc.js	2021-01-18 19:58:08.000000000 +0000
@@ -49,10 +49,13 @@
         "content-src/components/CollapsibleSection/CollapsibleSection.jsx",
         "content-src/components/DiscoveryStreamComponents/DSEmptyState/DSEmptyState.jsx",
         "content-src/components/DiscoveryStreamComponents/DSPrivacyModal/DSPrivacyModal.jsx",
+        "content-src/components/CustomizeMenu/**",
       ],
       rules: {
         "jsx-a11y/anchor-has-content": 0,
         "jsx-a11y/heading-has-content": 0,
+        "jsx-a11y/label-has-associated-control": 0,
+        "jsx-a11y/no-onchange": 0,
       },
     },
     {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/karma.mc.config.js firefox-85.0+build1/browser/components/newtab/karma.mc.config.js
--- firefox-84.0.2+build1/browser/components/newtab/karma.mc.config.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/karma.mc.config.js	2021-01-18 19:58:08.000000000 +0000
@@ -164,6 +164,18 @@
               functions: 0,
               branches: 0,
             },
+            "content-src/components/CustomizeMenu/**/*.jsx": {
+              statements: 0,
+              lines: 0,
+              functions: 0,
+              branches: 0,
+            },
+            "content-src/components/CustomizeMenu/*.jsx": {
+              statements: 0,
+              lines: 0,
+              functions: 0,
+              branches: 0,
+            },
             "content-src/lib/aboutwelcome-utils.js": {
               statements: 50,
               lines: 50,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/AboutPreferences.jsm firefox-85.0+build1/browser/components/newtab/lib/AboutPreferences.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/AboutPreferences.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/AboutPreferences.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,7 @@
 "use strict";
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { actionTypes: at } = ChromeUtils.import(
+const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
   "resource://activity-stream/common/Actions.jsm"
 );
 
@@ -26,14 +26,38 @@
     id: "topsites",
     pref: {
       feed: "feeds.topsites",
-      titleString: "home-prefs-topsites-header",
-      descString: "home-prefs-topsites-description",
+      titleString:
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+        ) ||
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.customizationMenu.enabled"
+        )
+          ? "home-prefs-shortcuts-header"
+          : "home-prefs-topsites-header",
+      descString:
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+        ) ||
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.customizationMenu.enabled"
+        )
+          ? "home-prefs-shortcuts-description"
+          : "home-prefs-topsites-description",
       get nestedPrefs() {
         return Services.prefs.getBoolPref("browser.topsites.useRemoteSetting")
           ? [
               {
                 name: "showSponsoredTopSites",
-                titleString: "home-prefs-topsites-by-option-sponsored",
+                titleString:
+                  Services.prefs.getBoolPref(
+                    "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+                  ) ||
+                  Services.prefs.getBoolPref(
+                    "browser.newtabpage.activity-stream.customizationMenu.enabled"
+                  )
+                    ? "home-prefs-shortcuts-by-option-sponsored"
+                    : "home-prefs-topsites-by-option-sponsored",
               },
             ]
           : [];
@@ -51,7 +75,15 @@
     pref: {
       feed: "feeds.snippets",
       titleString: "home-prefs-snippets-header",
-      descString: "home-prefs-snippets-description",
+      descString:
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+        ) ||
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.customizationMenu.enabled"
+        )
+          ? "home-prefs-snippets-description-new"
+          : "home-prefs-snippets-description",
     },
     icon: "info",
   },
@@ -97,6 +129,21 @@
     return sectionsCopy;
   }
 
+  setupUserEvent(element, eventSource) {
+    element.addEventListener("command", e => {
+      const { checked } = e.target;
+      if (typeof checked === "boolean") {
+        this.store.dispatch(
+          ac.UserEvent({
+            event: "PREF_CHANGED",
+            source: eventSource,
+            value: { status: checked, menu_source: "ABOUT_PREFERENCES" },
+          })
+        );
+      }
+    });
+  }
+
   observe(window) {
     const discoveryStreamConfig = this.store.getState().DiscoveryStream.config;
     let sections = this.store.getState().Sections;
@@ -163,6 +210,7 @@
         maxRows,
         rowsPref,
         shouldHidePref,
+        eventSource,
       } = sectionData;
       const { feed: name, titleString = {}, descString, nestedPrefs = [] } =
         prefData || {};
@@ -183,6 +231,10 @@
       const checkbox = createAppend("checkbox", sectionVbox);
       checkbox.classList.add("section-checkbox");
       checkbox.setAttribute("src", iconUrl);
+      // Setup a user event if we have an event source for this pref.
+      if (eventSource) {
+        this.setupUserEvent(checkbox, eventSource);
+      }
       document.l10n.setAttributes(
         checkbox,
         getString(titleString),
@@ -250,6 +302,10 @@
       // Add a checkbox pref for any nested preferences
       nestedPrefs.forEach(nested => {
         const subcheck = createAppend("checkbox", detailVbox);
+        // Setup a user event if we have an event source for this pref.
+        if (nested.eventSource) {
+          this.setupUserEvent(subcheck, nested.eventSource);
+        }
         subcheck.classList.add("indent");
         document.l10n.setAttributes(subcheck, nested.titleString);
         linkPref(subcheck, nested.name, "bool");
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/ActivityStream.jsm firefox-85.0+build1/browser/components/newtab/lib/ActivityStream.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/ActivityStream.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/ActivityStream.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -414,20 +414,6 @@
     },
   ],
   [
-    "asrouter.userprefs.cfr.addons",
-    {
-      title: "Does the user allow CFR addon recommendations?",
-      value: true,
-    },
-  ],
-  [
-    "asrouter.userprefs.cfr.features",
-    {
-      title: "Does the user allow CFR feature recommendations?",
-      value: true,
-    },
-  ],
-  [
     "asrouter.providers.onboarding",
     {
       title: "Configuration for onboarding provider",
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/ASRouter.jsm firefox-85.0+build1/browser/components/newtab/lib/ASRouter.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/ASRouter.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/ASRouter.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -37,12 +37,6 @@
 XPCOMUtils.defineLazyServiceGetters(this, {
   BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"],
 });
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "isSeparateAboutWelcome",
-  "browser.aboutwelcome.enabled",
-  true
-);
 const { actionCreators: ac } = ChromeUtils.import(
   "resource://activity-stream/common/Actions.jsm"
 );
@@ -63,11 +57,6 @@
   "resource:///modules/AttributionCode.jsm"
 );
 
-const TRAILHEAD_CONFIG = {
-  DID_SEE_ABOUT_WELCOME_PREF: "trailhead.firstrun.didSeeAboutWelcome",
-  DYNAMIC_TRIPLET_BUNDLE_LENGTH: 3,
-};
-
 // List of hosts for endpoints that serve router messages.
 // Key is allowed host, value is a name for the endpoint host.
 const DEFAULT_ALLOWLIST_HOSTS = {
@@ -298,8 +287,19 @@
             provider.id,
             options.dispatchCFRAction
           );
-        } else if (RS_PROVIDERS_WITH_L10N.includes(provider.id)) {
-          const locale = Services.locale.appLocaleAsBCP47;
+        } else if (
+          RS_PROVIDERS_WITH_L10N.includes(provider.id) &&
+          (RemoteL10n.isLocaleSupported(Services.locale.appLocaleAsBCP47) ||
+            // While it's not a valid locale, "und" is commonly observed on
+            // Linux platforms. Per l10n team, it's reasonable to fallback to
+            // "en-US", therefore, we should allow the fetch for it.
+            Services.locale.appLocaleAsBCP47 === "und")
+        ) {
+          let locale = Services.locale.appLocaleAsBCP47;
+          // Fallback to "en-US" if locale is "und"
+          if (locale === "und") {
+            locale = "en-US";
+          }
           const recordId = `${RS_FLUENT_RECORD_PREFIX}-${locale}`;
           const kinto = new KintoHttpClient(
             Services.prefs.getStringPref(RS_SERVER_PREF)
@@ -1021,7 +1021,6 @@
       providerPrefs: ASRouterPreferences.providers,
       userPrefs: ASRouterPreferences.getAllUserPreferences(),
       targetingParameters,
-      trailheadTriplet: ASRouterPreferences.trailheadTriplet,
       errors: this.errors,
     }));
   }
@@ -1097,10 +1096,6 @@
     return Promise.resolve({ evaluationStatus });
   }
 
-  _orderBundle(bundle) {
-    return bundle.sort((a, b) => a.order - b.order);
-  }
-
   unblockAll() {
     return this.setState({ messageBlockList: [] });
   }
@@ -1160,97 +1155,6 @@
     return true;
   }
 
-  async _getBundledMessages(originalMessage, trigger, force = false) {
-    let result = [];
-    let bundleLength;
-    let bundleTemplate;
-    let originalId;
-
-    if (originalMessage.includeBundle) {
-      // The original message is not part of the bundle, so don't include it
-      bundleLength = originalMessage.includeBundle.length;
-      bundleTemplate = originalMessage.includeBundle.template;
-    } else {
-      // The original message is part of the bundle
-      bundleLength = originalMessage.bundled;
-      bundleTemplate = originalMessage.template;
-      originalId = originalMessage.id;
-      // Add in a copy of the first message
-      result.push({
-        content: originalMessage.content,
-        id: originalMessage.id,
-        order: originalMessage.order || 0,
-      });
-    }
-
-    // First, find all messages of same template. These are potential matching targeting candidates
-    let bundledMessagesOfSameTemplate = this.state.messages.filter(
-      msg =>
-        msg.bundled &&
-        msg.template === bundleTemplate &&
-        msg.id !== originalId &&
-        this.isUnblockedMessage(msg)
-    );
-
-    if (force) {
-      // Forcefully show the messages without targeting matching - this is for about:newtab#asrouter to show the messages
-      for (const message of bundledMessagesOfSameTemplate) {
-        result.push({ content: message.content, id: message.id });
-        // Stop once we have enough messages to fill a bundle
-        if (result.length === bundleLength) {
-          break;
-        }
-      }
-    } else {
-      // Find all messages that matches the targeting context
-      const allMessages = await this.handleMessageRequest({
-        messages: bundledMessagesOfSameTemplate,
-        triggerId: trigger && trigger.id,
-        triggerContext: trigger && trigger.context,
-        triggerParam: trigger && trigger.param,
-        ordered: true,
-        returnAll: true,
-      });
-
-      if (allMessages && allMessages.length) {
-        // Retrieve enough messages needed to fill a bundle
-        // Only copy the content of the message (that's what the UI cares about)
-        result = result.concat(
-          allMessages.slice(0, bundleLength).map(message => ({
-            content: message.content,
-            id: message.id,
-            order: message.order || 0,
-            // This is used to determine whether to block when action is triggered
-            // Only block for dynamic triplets experiment and when there are more messages available
-            blockOnClick:
-              ASRouterPreferences.trailheadTriplet.startsWith("dynamic") &&
-              allMessages.length >
-                TRAILHEAD_CONFIG.DYNAMIC_TRIPLET_BUNDLE_LENGTH,
-          }))
-        );
-      }
-    }
-
-    // If we did not find enough messages to fill the bundle, do not send the bundle down
-    if (result.length < bundleLength) {
-      return null;
-    }
-
-    // The bundle may have some extra attributes, like a header, or a dismiss button, so attempt to get those strings now
-    // This is a temporary solution until we can use Fluent strings in the content process, in which case the content can
-    // handle finding these strings on its own. See bug 1488973
-    const extraTemplateStrings = await this._extraTemplateStrings(
-      originalMessage
-    );
-
-    return {
-      bundle: this._orderBundle(result),
-      ...(extraTemplateStrings && { extraTemplateStrings }),
-      provider: originalMessage.provider,
-      template: originalMessage.template,
-    };
-  }
-
   async _extraTemplateStrings(originalMessage) {
     let extraTemplateStrings;
     let localProvider = this._findProvider(originalMessage.provider);
@@ -1268,6 +1172,10 @@
   }
 
   routeCFRMessage(message, browser, trigger, force = false) {
+    if (!message) {
+      return { message: {} };
+    }
+
     switch (message.template) {
       case "whatsnew_panel_message":
         if (force) {
@@ -1318,33 +1226,7 @@
       case "update_action":
         MomentsPageHub.executeAction(message);
         break;
-      default:
-        break;
-    }
-  }
-
-  async sendMessage(message, trigger, force, browser) {
-    if (!message) {
-      return { message: {} };
-    } else if (message.bundled) {
-      const bundle =
-        (await this._getBundledMessages(message, trigger, force)) || {};
-      return { message: bundle };
-    } else if (message.includeBundle) {
-      const bundledMessages = await this._getBundledMessages(
-        message,
-        message.includeBundle.trigger,
-        force
-      );
-      return {
-        message: {
-          ...message,
-          trailheadTriplet: ASRouterPreferences.trailheadTriplet || "",
-          bundle: bundledMessages && bundledMessages.bundle,
-        },
-      };
     }
-    this.routeCFRMessage(message, browser, trigger, force);
 
     return { message };
   }
@@ -1537,7 +1419,7 @@
   }
 
   setMessageById({ id, ...data }, force, browser) {
-    return this.sendMessage(this.getMessageById(id), data, force, browser);
+    return this.routeCFRMessage(this.getMessageById(id), browser, data, force);
   }
 
   blockMessageById(idOrIds) {
@@ -1764,21 +1646,11 @@
     } else {
       const telemetryObject = { tabId };
       TelemetryStopwatch.start("MS_MESSAGE_REQUEST_TIME_MS", telemetryObject);
-      // On new tab, send cards if they match and not part of default multistage onboarding experience;
-      // othwerise send a snippet
-      if (!isSeparateAboutWelcome) {
-        message = await this.handleMessageRequest({
-          template: "extended_triplets",
-        });
-      }
-      // If no extended triplets message was returned, show snippets instead
-      if (!message) {
-        message = await this.handleMessageRequest({ provider: "snippets" });
-      }
+      message = await this.handleMessageRequest({ provider: "snippets" });
       TelemetryStopwatch.finish("MS_MESSAGE_REQUEST_TIME_MS", telemetryObject);
     }
 
-    return this.sendMessage(message, undefined, false, browser);
+    return this.routeCFRMessage(message, browser, undefined, false);
   }
 
   _recordReachEvent(message) {
@@ -1835,11 +1707,11 @@
       );
     }
 
-    return this.sendMessage(
+    return this.routeCFRMessage(
       nonReachMessages[0] || null,
+      browser,
       trigger,
-      false,
-      browser
+      false
     );
   }
 
@@ -1867,7 +1739,6 @@
   }
 }
 this._ASRouter = _ASRouter;
-this.TRAILHEAD_CONFIG = TRAILHEAD_CONFIG;
 
 /**
  * ASRouter - singleton instance of _ASRouter that controls all messages
@@ -1875,9 +1746,4 @@
  */
 this.ASRouter = new _ASRouter();
 
-const EXPORTED_SYMBOLS = [
-  "_ASRouter",
-  "ASRouter",
-  "MessageLoaderUtils",
-  "TRAILHEAD_CONFIG",
-];
+const EXPORTED_SYMBOLS = ["_ASRouter", "ASRouter", "MessageLoaderUtils"];
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterParentProcessMessageHandler.jsm firefox-85.0+build1/browser/components/newtab/lib/ASRouterParentProcessMessageHandler.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterParentProcessMessageHandler.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/ASRouterParentProcessMessageHandler.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -30,7 +30,6 @@
 
   handleCFRAction({ type, data }, browser) {
     switch (type) {
-      case msg.AS_ROUTER_TELEMETRY_USER_EVENT:
       case msg.TOOLBAR_BADGE_TELEMETRY:
       case msg.TOOLBAR_PANEL_TELEMETRY:
       case msg.MOMENTS_PAGE_TELEMETRY:
@@ -45,6 +44,11 @@
 
   handleMessage(name, data, { id: tabId, browser } = { browser: null }) {
     switch (name) {
+      case msg.AS_ROUTER_TELEMETRY_USER_EVENT:
+        return this.handleTelemetry({
+          type: msg.AS_ROUTER_TELEMETRY_USER_EVENT,
+          data,
+        });
       case msg.BLOCK_MESSAGE_BY_ID: {
         // Block the message but don't dismiss it in case the action taken has
         // another state that needs to be visible
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterPreferences.jsm firefox-85.0+build1/browser/components/newtab/lib/ASRouterPreferences.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterPreferences.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/ASRouterPreferences.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -13,14 +13,6 @@
 const DEVTOOLS_PREF =
   "browser.newtabpage.activity-stream.asrouter.devtoolsEnabled";
 const FXA_USERNAME_PREF = "services.sync.username";
-const FIRST_RUN_TRIPLET_PREF = "trailhead.firstrun.newtab.triplets";
-
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "trailheadTripletPref",
-  FIRST_RUN_TRIPLET_PREF,
-  ""
-);
 
 const DEFAULT_STATE = {
   _initialized: false,
@@ -106,11 +98,6 @@
     }, []);
   }
 
-  // istanbul ignore next
-  get trailheadTriplet() {
-    return trailheadTripletPref;
-  }
-
   get providers() {
     if (!this._initialized || this._providers === null) {
       const config = this._getProviderConfig();
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterTargeting.jsm firefox-85.0+build1/browser/components/newtab/lib/ASRouterTargeting.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/ASRouterTargeting.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/ASRouterTargeting.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -420,9 +420,6 @@
   get isFxAEnabled() {
     return isFxAEnabled;
   },
-  get trailheadTriplet() {
-    return ASRouterPreferences.trailheadTriplet;
-  },
   get sync() {
     return {
       desktopDevices: clientsDevicesDesktop,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/DiscoveryStreamFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/DiscoveryStreamFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/DiscoveryStreamFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -373,12 +373,10 @@
     const cachedData = (await this.cache.get()) || {};
     let { layout } = cachedData;
     if (this.isExpired({ cachedData, key: "layout", isStartup })) {
-      const start = Cu.now();
       const layoutResponse = await this.fetchFromEndpoint(
         this.config.layout_endpoint
       );
       if (layoutResponse && layoutResponse.layout) {
-        this.layoutRequestTime = Math.round(Cu.now() - start);
         layout = {
           lastUpdated: Date.now(),
           spocs: layoutResponse.spocs,
@@ -601,7 +599,6 @@
     // Reset the flag that indicates whether or not at least one API request
     // was issued to fetch the component feed in `getComponentFeed()`.
     this.componentFeedFetched = false;
-    const start = Cu.now();
     const { newFeedsPromises, newFeeds } = this.buildFeedPromises(
       DiscoveryStream.layout,
       isStartup,
@@ -613,7 +610,6 @@
 
     if (this.componentFeedFetched) {
       this.cleanUpTopRecImpressionPref(newFeeds);
-      this.componentFeedRequestTime = Math.round(Cu.now() - start);
     }
     await this.cache.set("feeds", newFeeds);
     sendUpdate({
@@ -707,7 +703,6 @@
       if (this.isExpired({ cachedData, key: "spocs", isStartup })) {
         const endpoint = this.store.getState().DiscoveryStream.spocs
           .spocs_endpoint;
-        const start = Cu.now();
 
         const headers = new Headers();
         headers.append("content-type", "application/json");
@@ -727,7 +722,6 @@
         });
 
         if (spocsResponse) {
-          this.spocsRequestTime = Math.round(Cu.now() - start);
           spocsState = {
             lastUpdated: Date.now(),
             spocs: {
@@ -994,7 +988,6 @@
 
   async scoreItems(items, type) {
     const filtered = [];
-    const scoreStart = Cu.now();
     const spocsPersonalized = this.store.getState().Prefs.values[
       PREF_SPOCS_PERSONALIZED
     ];
@@ -1020,9 +1013,6 @@
       // Sort by highest scores.
       .sort(this.sortItem);
 
-    if (this.personalized && personalizedByType) {
-      this.providerSwitcher.dispatchRelevanceScoreDuration(scoreStart);
-    }
     return { data, filtered };
   }
 
@@ -1428,91 +1418,6 @@
     return active.concat(expired);
   }
 
-  /**
-   * Reports the cache age in seconds for Discovery Stream.
-   */
-  async reportCacheAge() {
-    const cachedData = (await this.cache.get()) || {};
-    const { layout, spocs, feeds } = cachedData;
-    let cacheAge = Date.now();
-    let updated = false;
-
-    if (layout && layout.lastUpdated && layout.lastUpdated < cacheAge) {
-      updated = true;
-      cacheAge = layout.lastUpdated;
-    }
-
-    if (spocs && spocs.lastUpdated && spocs.lastUpdated < cacheAge) {
-      updated = true;
-      cacheAge = spocs.lastUpdated;
-    }
-
-    if (feeds) {
-      Object.keys(feeds).forEach(url => {
-        const feed = feeds[url];
-        if (feed.lastUpdated && feed.lastUpdated < cacheAge) {
-          updated = true;
-          cacheAge = feed.lastUpdated;
-        }
-      });
-    }
-
-    if (updated) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event: "DS_CACHE_AGE_IN_SEC",
-          value: Math.round((Date.now() - cacheAge) / 1000),
-        })
-      );
-    }
-  }
-
-  /**
-   * Reports various time durations when the feed is requested from endpoint for
-   * the first time. This could happen on the browser start-up, or the pref changes
-   * of discovery stream.
-   *
-   * Metrics to be reported:
-   *   - Request time for layout endpoint
-   *   - Request time for feed endpoint
-   *   - Request time for spoc endpoint
-   *   - Total request time for data completeness
-   */
-  reportRequestTime() {
-    if (this.layoutRequestTime) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event: "LAYOUT_REQUEST_TIME",
-          value: this.layoutRequestTime,
-        })
-      );
-    }
-    if (this.spocsRequestTime) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event: "SPOCS_REQUEST_TIME",
-          value: this.spocsRequestTime,
-        })
-      );
-    }
-    if (this.componentFeedRequestTime) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event: "COMPONENT_FEED_REQUEST_TIME",
-          value: this.componentFeedRequestTime,
-        })
-      );
-    }
-    if (this.totalRequestTime) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event: "DS_FEED_TOTAL_REQUEST_TIME",
-          value: this.totalRequestTime,
-        })
-      );
-    }
-  }
-
   enableStories() {
     if (this.config.enabled && this.loaded) {
       // If stories are being re enabled, ensure we have stories.
@@ -1521,14 +1426,9 @@
   }
 
   async enable() {
-    // Note that cache age needs to be reported prior to refreshAll.
-    await this.reportCacheAge();
-    const start = Cu.now();
     await this.refreshAll({ updateOpenTabs: true, isStartup: true });
     Services.obs.addObserver(this, "idle-daily");
     this.loaded = true;
-    this.totalRequestTime = Math.round(Cu.now() - start);
-    this.reportRequestTime();
   }
 
   async reset() {
@@ -1578,10 +1478,6 @@
     );
     this.domainAffinitiesLastUpdated = null;
     this.loaded = false;
-    this.layoutRequestTime = undefined;
-    this.spocsRequestTime = undefined;
-    this.componentFeedRequestTime = undefined;
-    this.totalRequestTime = undefined;
   }
 
   async onPrefChange() {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/OnboardingMessageProvider.jsm firefox-85.0+build1/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/OnboardingMessageProvider.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/OnboardingMessageProvider.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -3,9 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 /* globals Localization */
-const { FX_MONITOR_OAUTH_CLIENT_ID } = ChromeUtils.import(
-  "resource://gre/modules/FxAccountsCommon.js"
-);
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const L10N = new Localization([
@@ -17,289 +14,6 @@
 
 const ONBOARDING_MESSAGES = () => [
   {
-    id: "EXTENDED_TRIPLETS_1",
-    template: "extended_triplets",
-    campaign: "firstrun_triplets",
-    targeting:
-      "trailheadTriplet && ((currentDate|date - profileAgeCreated) / 86400000) < 7",
-    includeBundle: {
-      length: 3,
-      template: "onboarding",
-      trigger: { id: "showOnboarding" },
-    },
-    frequency: { lifetime: 5 },
-    utm_term: "trailhead-cards",
-  },
-  {
-    id: "TRAILHEAD_CARD_1",
-    template: "onboarding",
-    bundled: 3,
-    order: 3,
-    content: {
-      title: { string_id: "onboarding-tracking-protection-title2" },
-      text: { string_id: "onboarding-tracking-protection-text2" },
-      icon: "tracking",
-      primary_button: {
-        label: { string_id: "onboarding-tracking-protection-button2" },
-        action:
-          Services.locale.appLocaleAsBCP47.substr(0, 2) === "en"
-            ? {
-                type: "OPEN_URL",
-                data: {
-                  args: "https://mzl.la/ETPdefault",
-                  where: "tabshifted",
-                },
-              }
-            : {
-                type: "OPEN_PREFERENCES_PAGE",
-                data: { category: "privacy-trackingprotection" },
-              },
-      },
-    },
-    targeting: "trailheadTriplet == 'privacy'",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_2",
-    template: "onboarding",
-    bundled: 3,
-    order: 1,
-    content: {
-      title: { string_id: "onboarding-data-sync-title" },
-      text: { string_id: "onboarding-data-sync-text2" },
-      icon: "devices",
-      primary_button: {
-        label: { string_id: "onboarding-data-sync-button2" },
-        action: {
-          type: "OPEN_URL",
-          addFlowParams: true,
-          data: {
-            args:
-              "https://accounts.firefox.com/?service=sync&action=email&context=fx_desktop_v3&entrypoint=activity-stream-firstrun&style=trailhead",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting:
-      "(trailheadTriplet in ['supercharge', 'static'] || ( 'dynamic' in trailheadTriplet && usesFirefoxSync == false)) && isChinaRepack == false",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_3",
-    template: "onboarding",
-    bundled: 3,
-    order: 2,
-    content: {
-      title: { string_id: "onboarding-firefox-monitor-title" },
-      text: { string_id: "onboarding-firefox-monitor-text2" },
-      icon: "ffmonitor",
-      primary_button: {
-        label: { string_id: "onboarding-firefox-monitor-button" },
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://monitor.firefox.com/", where: "tabshifted" },
-        },
-      },
-    },
-    // Use service oauth client_id to identify 'Firefox Monitor' service attached to Firefox Account
-    // https://docs.telemetry.mozilla.org/datasets/fxa_metrics/attribution.html#service-attribution
-    targeting: `(trailheadTriplet in ['supercharge', 'static', 'privacy'] || ('dynamic' in trailheadTriplet && !("${FX_MONITOR_OAUTH_CLIENT_ID}" in attachedFxAOAuthClients|mapToProperty('id')))) && isChinaRepack == false`,
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_4",
-    template: "onboarding",
-    bundled: 3,
-    order: 3,
-    content: {
-      title: { string_id: "onboarding-browse-privately-title" },
-      text: { string_id: "onboarding-browse-privately-text" },
-      icon: "private",
-      primary_button: {
-        label: { string_id: "onboarding-browse-privately-button" },
-        action: { type: "OPEN_PRIVATE_BROWSER_WINDOW" },
-      },
-    },
-    targeting: "'dynamic' in trailheadTriplet",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_5",
-    template: "onboarding",
-    bundled: 3,
-    order: 5,
-    content: {
-      title: { string_id: "onboarding-firefox-send-title" },
-      text: { string_id: "onboarding-firefox-send-text2" },
-      icon: "ffsend",
-      primary_button: {
-        label: { string_id: "onboarding-firefox-send-button" },
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://send.firefox.com/", where: "tabshifted" },
-        },
-      },
-    },
-    targeting: "trailheadTriplet == 'payoff' && isChinaRepack == false",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_6",
-    template: "onboarding",
-    bundled: 3,
-    order: 6,
-    content: {
-      title: { string_id: "onboarding-mobile-phone-title" },
-      text: { string_id: "onboarding-mobile-phone-text" },
-      icon: "mobile",
-      primary_button: {
-        label: { string_id: "onboarding-mobile-phone-button" },
-        action: {
-          type: "OPEN_URL",
-          data: {
-            args: "https://www.mozilla.org/firefox/mobile/",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting:
-      "trailheadTriplet in ['supercharge', 'static'] || ('dynamic' in trailheadTriplet && sync.mobileDevices < 1)",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_7",
-    template: "onboarding",
-    bundled: 3,
-    order: 4,
-    content: {
-      title: { string_id: "onboarding-send-tabs-title" },
-      text: { string_id: "onboarding-send-tabs-text2" },
-      icon: "sendtab",
-      primary_button: {
-        label: { string_id: "onboarding-send-tabs-button" },
-        action: {
-          type: "OPEN_URL",
-          data: {
-            args:
-              "https://support.mozilla.org/kb/send-tab-firefox-desktop-other-devices",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting: "'dynamic' in trailheadTriplet",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_8",
-    template: "onboarding",
-    bundled: 3,
-    order: 2,
-    content: {
-      title: { string_id: "onboarding-pocket-anywhere-title" },
-      text: { string_id: "onboarding-pocket-anywhere-text2" },
-      icon: "pocket",
-      primary_button: {
-        label: { string_id: "onboarding-pocket-anywhere-button" },
-        action: {
-          type: "OPEN_URL",
-          data: {
-            args: "https://getpocket.com/firefox_learnmore",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting: "trailheadTriplet == 'multidevice' && isChinaRepack == false",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_9",
-    template: "onboarding",
-    bundled: 3,
-    order: 7,
-    content: {
-      title: { string_id: "onboarding-lockwise-strong-passwords-title" },
-      text: { string_id: "onboarding-lockwise-strong-passwords-text" },
-      icon: "lockwise",
-      primary_button: {
-        label: { string_id: "onboarding-lockwise-strong-passwords-button" },
-        action: {
-          type: "OPEN_ABOUT_PAGE",
-          data: { args: "logins", where: "tabshifted" },
-        },
-      },
-    },
-    targeting: "'dynamic' in trailheadTriplet && isChinaRepack == false",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_10",
-    template: "onboarding",
-    bundled: 3,
-    order: 4,
-    content: {
-      title: { string_id: "onboarding-facebook-container-title" },
-      text: { string_id: "onboarding-facebook-container-text2" },
-      icon: "fbcont",
-      primary_button: {
-        label: { string_id: "onboarding-facebook-container-button" },
-        action: {
-          type: "OPEN_URL",
-          data: {
-            args:
-              "https://addons.mozilla.org/firefox/addon/facebook-container/",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting: "trailheadTriplet == 'payoff' && isChinaRepack == false",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_11",
-    template: "onboarding",
-    bundled: 3,
-    order: 0,
-    content: {
-      title: { string_id: "onboarding-import-browser-settings-title" },
-      text: { string_id: "onboarding-import-browser-settings-text" },
-      icon: "import",
-      primary_button: {
-        label: { string_id: "onboarding-import-browser-settings-button" },
-        action: { type: "SHOW_MIGRATION_WIZARD" },
-      },
-    },
-    targeting: "trailheadTriplet == 'dynamic_chrome'",
-    trigger: { id: "showOnboarding" },
-  },
-  {
-    id: "TRAILHEAD_CARD_12",
-    template: "onboarding",
-    bundled: 3,
-    order: 1,
-    content: {
-      title: { string_id: "onboarding-personal-data-promise-title" },
-      text: { string_id: "onboarding-personal-data-promise-text" },
-      icon: "pledge",
-      primary_button: {
-        label: { string_id: "onboarding-personal-data-promise-button" },
-        action: {
-          type: "OPEN_URL",
-          data: {
-            args: "https://www.mozilla.org/firefox/privacy/",
-            where: "tabshifted",
-          },
-        },
-      },
-    },
-    targeting: "trailheadTriplet == 'privacy'",
-    trigger: { id: "showOnboarding" },
-  },
-  {
     id: "FXA_ACCOUNTS_BADGE",
     template: "toolbar_badge",
     content: {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/PanelTestProvider.jsm firefox-85.0+build1/browser/components/newtab/lib/PanelTestProvider.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/PanelTestProvider.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/PanelTestProvider.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -64,81 +64,6 @@
     trigger: { id: "momentsUpdate" },
   },
   {
-    id: "WHATS_NEW_AWESOMEBAR_74",
-    template: "whatsnew_panel_message",
-    order: 1,
-    content: {
-      bucket_id: "WHATS_NEW_AWESOMEBAR_74",
-      published_date: 1581675076835,
-      title: { string_id: "cfr-whatsnew-searchbar-title" },
-      icon_url: "chrome://browser/skin/search-glass.svg",
-      icon_alt: { string_id: "cfr-whatsnew-searchbar-icon-alt-text" },
-      body: { string_id: "cfr-whatsnew-searchbar-body-topsites" },
-      cta_url:
-        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/address-bar-search",
-      cta_type: "OPEN_URL",
-      link_text: { string_id: "cfr-whatsnew-pip-cta" },
-    },
-    targeting: `firefoxVersion >= 74`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
-    id: "WHATS_NEW_PIP_76",
-    template: "whatsnew_panel_message",
-    order: 3,
-    content: {
-      bucket_id: "WHATS_NEW_76",
-      published_date: 1586859903200,
-      title: { string_id: "cfr-whatsnew-pip-fullscreen-header" },
-      icon_url:
-        "chrome://activity-stream/content/data/content/assets/remote/pip-message-icon.svg",
-      icon_alt: { string_id: "cfr-whatsnew-pip-fullscreen-icon-alt" },
-      body: { string_id: "cfr-whatsnew-pip-fullscreen-body" },
-      cta_url:
-        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/about-p2p",
-      cta_type: "OPEN_URL",
-      link_text: { string_id: "cfr-whatsnew-pip-cta" },
-    },
-    targeting: `firefoxVersion >= 76`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
-    id: "WHATS_NEW_VULNERABLE_PASSWORDS",
-    template: "whatsnew_panel_message",
-    order: 2,
-    content: {
-      bucket_id: "WHATS_NEW_76",
-      published_date: 1586859903200,
-      title: { string_id: "cfr-whatsnew-passwords-header" },
-      icon_url: "chrome://browser/content/logos/lockwise.svg",
-      icon_alt: { string_id: "cfr-whatsnew-passwords-icon-alt" },
-      body: { string_id: "cfr-whatsnew-passwords-body" },
-      cta_url:
-        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/lockwise-alerts",
-      cta_type: "OPEN_URL",
-      link_text: { string_id: "cfr-whatsnew-pip-cta" },
-    },
-    targeting: `firefoxVersion >= 76`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
-    id: "WHATS_NEW_PERMISSION_PROMPT_72",
-    template: "whatsnew_panel_message",
-    order: 5,
-    content: {
-      bucket_id: "WHATS_NEW_72",
-      published_date: 1574776601000,
-      title: { string_id: "cfr-whatsnew-permission-prompt-header" },
-      body: { string_id: "cfr-whatsnew-permission-prompt-body" },
-      cta_url:
-        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/whats-new-notifications",
-      cta_type: "OPEN_URL",
-      link_text: { string_id: "cfr-whatsnew-permission-prompt-cta" },
-    },
-    targeting: `firefoxVersion >= 72`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
     id: "WHATS_NEW_FINGERPRINTER_COUNTER_72",
     template: "whatsnew_panel_message",
     order: 6,
@@ -216,225 +141,119 @@
     trigger: { id: "whatsNewPanelOpened" },
   },
   {
-    id: "WHATS_NEW_69_1",
-    template: "whatsnew_panel_message",
-    order: 1,
-    content: {
-      bucket_id: "WHATS_NEW_69_1",
-      published_date: 1557346235089,
-      title: "Something new in Firefox 69",
-      body:
-        "The New Enhanced Tracking Protection, gives you the best level of protection and performance. Discover how this version is the safest version of firefox ever made.",
-      link_text: "Learn more on our blog",
-      cta_url: "https://blog.mozilla.org/",
-      cta_type: "OPEN_URL",
-    },
-    targeting: `firefoxVersion > 68`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
-    id: "WHATS_NEW_70_3",
+    id: "WHATS_NEW_SEARCH_SHORTCUTS_84",
     template: "whatsnew_panel_message",
     order: 2,
     content: {
-      bucket_id: "WHATS_NEW_70_3",
+      bucket_id: "WHATS_NEW_SEARCH_SHORTCUTS_84",
       published_date: 1560969794394,
-      layout: "tracking-protections",
-      layout_title_content_variable: "blockedCount",
-      title: { string_id: "cfr-whatsnew-tracking-blocked-title" },
-      subtitle: { string_id: "cfr-whatsnew-tracking-blocked-subtitle" },
-      icon_url:
-        "chrome://activity-stream/content/data/content/assets/protection-report-icon.png",
-      icon_alt: "Protection Report icon",
-      body: { string_id: "cfr-whatsnew-tracking-protect-body" },
-      link_text: { string_id: "cfr-whatsnew-tracking-blocked-link-text" },
-      cta_url: "",
-      cta_type: "OPEN_PROTECTION_REPORT",
-    },
-    targeting: `firefoxVersion > 69 && totalBlockedCount > 0`,
-    trigger: { id: "whatsNewPanelOpened" },
-  },
-  {
-    id: "BOOKMARK_CFR",
-    template: "cfr_doorhanger",
-    groups: ["cfr"],
-    content: {
-      layout: "icon_and_message",
-      category: "cfrFeatures",
-      notification_text: { string_id: "cfr-doorhanger-feature-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",
+      title: {
+        string_id: "cfr-whatsnew-search-shortcuts-header",
       },
-      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" },
-            },
-          },
-        ],
+      icon_url: "chrome://global/skin/icons/check.svg",
+      icon_alt: {
+        string_id: "cfr-whatsnew-searchbar-icon-alt-text",
+      },
+      body: {
+        string_id: "cfr-whatsnew-search-shortcuts-body",
+      },
+      cta_url:
+        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/search-shortcuts",
+      cta_type: "OPEN_URL",
+      link_text: {
+        string_id: "cfr-whatsnew-pip-cta",
       },
     },
-    targeting: "true",
+    targeting: "firefoxVersion >= 84",
     trigger: {
-      id: "openBookmarkedURL",
+      id: "whatsNewPanelOpened",
     },
   },
   {
-    id: "PDF_URL_FFX_SEND",
-    template: "cfr_doorhanger",
-    groups: ["cfr"],
+    id: "WHATS_NEW_PIONEER_82",
+    template: "whatsnew_panel_message",
+    order: 1,
     content: {
-      layout: "icon_and_message",
-      category: "cfrFeatures",
-      notification_text: { string_id: "cfr-doorhanger-extension-notification" },
-      heading_text: { string_id: "cfr-doorhanger-firefox-send-header" },
-      info_icon: {
-        label: { string_id: "cfr-doorhanger-extension-sumo-link" },
-        sumo_path: "https://example.com",
-      },
-      text: { string_id: "cfr-doorhanger-firefox-send-body" },
-      icon: "chrome://branding/content/icon64.png",
-      buttons: {
-        primary: {
-          label: { string_id: "cfr-doorhanger-firefox-send-ok-button" },
-          action: {
-            type: "OPEN_URL",
-            data: {
-              args:
-                "https://send.firefox.com/login/?utm_source=activity-stream&entrypoint=activity-stream-cfr-pdf",
-              where: "tabshifted",
-            },
-          },
-        },
-        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" },
-            },
-          },
-        ],
-      },
+      bucket_id: "WHATS_NEW_PIONEER_82",
+      published_date: 1603152000000,
+      title: "Put your data to work for a better internet",
+      icon_url: "",
+      icon_alt: "",
+      body:
+        "Contribute your data to Mozilla's Pioneer program to help researchers understand pressing technology issues like misinformation, data privacy, and ethical AI.",
+      cta_url: "pioneer",
+      cta_where: "tab",
+      cta_type: "OPEN_ABOUT_PAGE",
+      link_text: "Join Pioneer",
     },
-    targeting: "true",
+    targeting: "firefoxVersion >= 82",
     trigger: {
-      id: "openURL",
-      patterns: ["*://*/*.pdf"],
+      id: "whatsNewPanelOpened",
     },
   },
   {
-    id: "SEND_TAB_CFR",
-    template: "cfr_doorhanger",
-    groups: ["cfr"],
+    id: "WHATS_NEW_MEDIA_SESSION_82",
+    template: "whatsnew_panel_message",
+    order: 3,
     content: {
-      layout: "icon_and_message",
-      category: "cfrFeatures",
-      notification_text: { string_id: "cfr-doorhanger-extension-notification" },
-      heading_text: { string_id: "cfr-doorhanger-send-tab-header" },
-      info_icon: {
-        label: { string_id: "cfr-doorhanger-extension-sumo-link" },
-        sumo_path: "https://example.com",
+      bucket_id: "WHATS_NEW_MEDIA_SESSION_82",
+      published_date: 1603152000000,
+      title: {
+        string_id: "cfr-whatsnew-media-keys-header",
       },
-      text: { string_id: "cfr-doorhanger-send-tab-body" },
-      icon: "chrome://branding/content/icon64.png",
-      buttons: {
-        primary: {
-          label: { string_id: "cfr-doorhanger-send-tab-ok-button" },
-          action: {
-            type: "HIGHLIGHT_FEATURE",
-            data: { args: "pageAction-sendToDevice" },
-          },
-        },
-        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" },
-            },
-          },
-        ],
+      body: {
+        string_id: "cfr-whatsnew-media-keys-body",
+      },
+      cta_url:
+        "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/media-keyboard-control",
+      cta_type: "OPEN_URL",
+      link_text: {
+        string_id: "cfr-whatsnew-media-keys-button",
       },
     },
-    targeting: "true",
+    targeting: "firefoxVersion >= 82",
     trigger: {
-      // Match any URL that has a Reader Mode icon
-      id: "openArticleURL",
-      patterns: ["*://*/*"],
+      id: "whatsNewPanelOpened",
     },
   },
   {
-    id: "SEND_RECIPE_TAB_CFR",
+    id: "WHATS_NEW_69_1",
+    template: "whatsnew_panel_message",
+    order: 1,
+    content: {
+      bucket_id: "WHATS_NEW_69_1",
+      published_date: 1557346235089,
+      title: "Something new in Firefox 69",
+      body:
+        "The New Enhanced Tracking Protection, gives you the best level of protection and performance. Discover how this version is the safest version of firefox ever made.",
+      link_text: "Learn more on our blog",
+      cta_url: "https://blog.mozilla.org/",
+      cta_type: "OPEN_URL",
+    },
+    targeting: `firefoxVersion > 68`,
+    trigger: { id: "whatsNewPanelOpened" },
+  },
+  {
+    id: "BOOKMARK_CFR",
     template: "cfr_doorhanger",
-    // Higher priority because this has the same targeting rules as
-    // SEND_TAB_CFR but is more specific
-    priority: 1,
     groups: ["cfr"],
     content: {
       layout: "icon_and_message",
       category: "cfrFeatures",
-      notification_text: { string_id: "cfr-doorhanger-extension-notification" },
-      heading_text: { string_id: "cfr-doorhanger-send-tab-recipe-header" },
+      notification_text: { string_id: "cfr-doorhanger-feature-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-send-tab-body" },
+      text: { string_id: "cfr-doorhanger-sync-bookmarks-body" },
       icon: "chrome://branding/content/icon64.png",
       buttons: {
         primary: {
-          label: { string_id: "cfr-doorhanger-send-tab-ok-button" },
+          label: { string_id: "cfr-doorhanger-sync-bookmarks-ok-button" },
           action: {
-            type: "HIGHLIGHT_FEATURE",
-            data: { args: "pageAction-sendToDevice" },
+            type: "OPEN_PREFERENCES_PAGE",
+            data: { category: "sync" },
           },
         },
         secondary: [
@@ -461,8 +280,7 @@
     },
     targeting: "true",
     trigger: {
-      id: "openArticleURL",
-      params: ["www.allrecipes.com", "allrecipes.com"],
+      id: "openBookmarkedURL",
     },
   },
   {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm firefox-85.0+build1/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -9,10 +9,6 @@
   "resource://services-settings/remote-settings.js"
 );
 
-const { actionCreators: ac } = ChromeUtils.import(
-  "resource://activity-stream/common/Actions.jsm"
-);
-
 ChromeUtils.defineModuleGetter(
   this,
   "NewTabUtils",
@@ -38,10 +34,6 @@
   constructor(v2Params) {
     this.v2Params = v2Params || {};
     this.modelKeys = this.v2Params.modelKeys;
-    this.dispatch = this.v2Params.dispatch;
-    if (!this.dispatch) {
-      this.dispatch = () => {};
-    }
     this.onSync = this.onSync.bind(this);
     this.setup();
   }
@@ -141,7 +133,6 @@
    */
   async getRecipe() {
     if (!this.recipes || !this.recipes.length) {
-      const start = Cu.now();
       const result = await RemoteSettings(RECIPE_NAME).get();
       this.recipes = await Promise.all(
         result.map(async record => ({
@@ -149,12 +140,6 @@
           recordKey: record.key,
         }))
       );
-      this.dispatch(
-        ac.PerfEvent({
-          event: "PERSONALIZATION_V2_GET_RECIPE_DURATION",
-          value: Math.round(Cu.now() - start),
-        })
-      );
     }
     return this.recipes[0];
   }
@@ -200,13 +185,6 @@
       endTimeSecs
     );
 
-    this.dispatch(
-      ac.PerfEvent({
-        event: "PERSONALIZATION_V2_HISTORY_SIZE",
-        value: history.length,
-      })
-    );
-
     return history;
   }
 
@@ -235,55 +213,30 @@
   }
 
   async generateTaggers() {
-    const start = Cu.now();
     await this.personalityProviderWorker.post("generateTaggers", [
       this.modelKeys,
     ]);
-    this.dispatch(
-      ac.PerfEvent({
-        event: "PERSONALIZATION_V2_TAGGERS_DURATION",
-        value: Math.round(Cu.now() - start),
-      })
-    );
   }
 
   async generateRecipeExecutor() {
-    const start = Cu.now();
     await this.personalityProviderWorker.post("generateRecipeExecutor");
-    this.dispatch(
-      ac.PerfEvent({
-        event: "PERSONALIZATION_V2_RECIPE_EXECUTOR_DURATION",
-        value: Math.round(Cu.now() - start),
-      })
-    );
   }
 
   async createInterestVector() {
     const history = await this.getHistory();
 
-    const interestVectorPerfStart = Cu.now();
     const interestVectorResult = await this.personalityProviderWorker.post(
       "createInterestVector",
       [history]
     );
 
-    this.dispatch(
-      ac.PerfEvent({
-        event: "PERSONALIZATION_V2_CREATE_INTEREST_VECTOR_DURATION",
-        value: Math.round(Cu.now() - interestVectorPerfStart),
-      })
-    );
     return interestVectorResult;
   }
 
   async init(callback) {
-    const perfStart = Cu.now();
     await this.setBaseAttachmentsURL();
     await this.setInterestConfig();
     if (!this.interestConfig) {
-      this.dispatch(
-        ac.PerfEvent({ event: "PERSONALIZATION_V2_GET_RECIPE_ERROR" })
-      );
       return;
     }
 
@@ -294,11 +247,6 @@
     const fetchModelsResult = await this.fetchModels();
     // If this fails, log an error and return.
     if (!fetchModelsResult.ok) {
-      this.dispatch(
-        ac.PerfEvent({
-          event: "PERSONALIZATION_V2_FETCH_MODELS_ERROR",
-        })
-      );
       return;
     }
     await this.generateTaggers();
@@ -309,11 +257,6 @@
       const interestVectorResult = await this.createInterestVector();
       // If that failed, log an error and return.
       if (!interestVectorResult.ok) {
-        this.dispatch(
-          ac.PerfEvent({
-            event: "PERSONALIZATION_V2_CREATE_INTEREST_VECTOR_ERROR",
-          })
-        );
         return;
       }
       this.interestVector = interestVectorResult.interestVector;
@@ -324,35 +267,12 @@
     // In that case, the interest vector is provided and not created, so we just set it.
     await this.setInterestVector();
 
-    this.dispatch(
-      ac.PerfEvent({
-        event: "PERSONALIZATION_V2_TOTAL_DURATION",
-        value: Math.round(Cu.now() - perfStart),
-      })
-    );
-
     this.initialized = true;
     if (callback) {
       callback();
     }
   }
 
-  dispatchRelevanceScoreDuration(start) {
-    // If v2 is not yet initialized we don't bother tracking yet.
-    // Before it is initialized it doesn't do any ranking.
-    // Once it's initialized it ensures ranking is done.
-    // v1 doesn't have any initialized issues around ranking,
-    // and should be ready right away.
-    if (this.initialized) {
-      this.dispatch(
-        ac.PerfEvent({
-          event: "PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION",
-          value: Math.round(Cu.now() - start),
-        })
-      );
-    }
-  }
-
   async calculateItemRelevanceScore(pocketItem) {
     if (!this.initialized) {
       return pocketItem.item_score || 1;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/PlacesFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/PlacesFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/PlacesFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/PlacesFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -86,8 +86,6 @@
 
   onManyFrecenciesChanged() {}
 
-  onPageChanged() {}
-
   onDeleteVisits() {}
 }
 
@@ -105,8 +103,6 @@
 
   onEndUpdateBatch() {}
 
-  onItemVisited() {}
-
   onItemMoved() {}
 
   // Disabled due to performance cost, see Issue 3203 /
@@ -389,17 +385,22 @@
     }
   }
 
-  fillSearchTopSiteTerm({ _target, data }) {
+  async fillSearchTopSiteTerm({ _target, data }) {
+    const searchEngine = await Services.search.getEngineByAlias(data.label);
     _target.browser.ownerGlobal.gURLBar.search(data.label, {
+      searchEngine,
       searchModeEntry: "topsites_newtab",
     });
   }
 
-  _getSearchPrefix(isPrivateWindow) {
-    const searchAliases =
-      Services.search[
-        isPrivateWindow ? "defaultPrivateEngine" : "defaultEngine"
-      ].aliases;
+  _getDefaultSearchEngine(isPrivateWindow) {
+    return Services.search[
+      isPrivateWindow ? "defaultPrivateEngine" : "defaultEngine"
+    ];
+  }
+
+  _getSearchPrefix(searchEngine) {
+    const searchAliases = searchEngine.aliases;
     if (searchAliases && searchAliases.length) {
       return `${searchAliases[0]} `;
     }
@@ -407,9 +408,10 @@
   }
 
   handoffSearchToAwesomebar({ _target, data, meta }) {
-    const searchAlias = this._getSearchPrefix(
+    const searchEngine = this._getDefaultSearchEngine(
       PrivateBrowsingUtils.isBrowserPrivate(_target.browser)
     );
+    const searchAlias = this._getSearchPrefix(searchEngine);
     const urlBar = _target.browser.ownerGlobal.gURLBar;
     let isFirstChange = true;
 
@@ -417,6 +419,7 @@
       urlBar.setHiddenFocus();
     } else {
       urlBar.search(searchAlias + data.text, {
+        searchEngine,
         searchModeEntry: "handoff",
       });
       isFirstChange = false;
@@ -429,7 +432,10 @@
       if (isFirstChange) {
         isFirstChange = false;
         urlBar.removeHiddenFocus();
-        urlBar.search(searchAlias, { searchModeEntry: "handoff" });
+        urlBar.search(searchAlias, {
+          searchEngine,
+          searchModeEntry: "handoff",
+        });
         this.store.dispatch(
           ac.OnlyToOneContent({ type: at.HIDE_SEARCH }, meta.fromTarget)
         );
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/PrefsFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/PrefsFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/PrefsFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/PrefsFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -25,6 +25,12 @@
 
 ChromeUtils.defineModuleGetter(
   this,
+  "ExperimentAPI",
+  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+);
+
+ChromeUtils.defineModuleGetter(
+  this,
   "Region",
   "resource://gre/modules/Region.jsm"
 );
@@ -33,6 +39,7 @@
   constructor(prefMap) {
     this._prefMap = prefMap;
     this._prefs = new Prefs();
+    this.onExperimentUpdated = this.onExperimentUpdated.bind(this);
   }
 
   onPrefChanged(name, value) {
@@ -68,8 +75,67 @@
     this._prefMap.set(key, { value });
   }
 
+  /**
+   * Combine default values with experiment values for
+   * the feature config.
+   * */
+  getFeatureConfigFromExperimentData(experimentData) {
+    return {
+      // Icon that shows up in the corner to link to preferences
+      prefsButtonIcon: "icon-settings",
+
+      // Override defaults with any experiment values, if any exist.
+      ...(experimentData?.branch?.feature?.value || {}),
+    };
+  }
+
+  /**
+   * Helper for initializing experiment and feature config data in .init()
+   * */
+  addExperimentDataToValues(values) {
+    let experimentData;
+    try {
+      experimentData = ExperimentAPI.getExperiment({
+        featureId: "newtab",
+      });
+    } catch (e) {
+      Cu.reportError(e);
+    }
+    values.experimentData = experimentData;
+    values.featureConfig = this.getFeatureConfigFromExperimentData(
+      experimentData
+    );
+  }
+
+  /**
+   * Handler for when experiment data updates.
+   */
+  onExperimentUpdated(event, experimentData) {
+    this.store.dispatch(
+      ac.BroadcastToContent({
+        type: at.PREF_CHANGED,
+        data: { name: "experimentData", value: experimentData },
+      })
+    );
+    this.store.dispatch(
+      ac.BroadcastToContent({
+        type: at.PREF_CHANGED,
+        data: {
+          name: "featureConfig",
+          value: this.getFeatureConfigFromExperimentData(experimentData),
+        },
+      })
+    );
+  }
+
   init() {
     this._prefs.observeBranch(this);
+    ExperimentAPI.on(
+      "update",
+      { featureId: "newtab" },
+      this.onExperimentUpdated
+    );
+
     this._storage = this.store.dbStorage.getDbTable("sectionPrefs");
 
     // Get the initial value of each activity stream pref
@@ -117,6 +183,10 @@
       value: searchTopSiteExperimentPrefValue,
     });
 
+    values.mayHaveSponsoredTopSites = Services.prefs.getBoolPref(
+      "browser.topsites.useRemoteSetting"
+    );
+
     // Read the pref for search hand-off from firefox.js and store it
     // in our interal list of prefs to watch
     let handoffToAwesomebarPrefValue = Services.prefs.getBoolPref(
@@ -127,6 +197,10 @@
       value: handoffToAwesomebarPrefValue,
     });
 
+    this.addExperimentDataToValues(values);
+
+    this._setBoolPref(values, "newNewtabExperience.enabled", false);
+    this._setBoolPref(values, "customizationMenu.enabled", false);
     this._setBoolPref(values, "logowordmark.alwaysVisible", false);
     this._setBoolPref(values, "feeds.section.topstories", false);
     this._setBoolPref(values, "discoverystream.enabled", false);
@@ -161,6 +235,7 @@
 
   removeListeners() {
     this._prefs.ignoreBranch(this);
+    ExperimentAPI.off(this.onExperimentUpdated);
     if (this.geo === "") {
       Services.obs.removeObserver(this, Region.REGION_TOPIC);
     }
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/RecommendationProviderSwitcher.jsm firefox-85.0+build1/browser/components/newtab/lib/RecommendationProviderSwitcher.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/RecommendationProviderSwitcher.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/RecommendationProviderSwitcher.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -74,15 +74,8 @@
       return;
     }
 
-    const start = Cu.now();
     // Otherwise, if we get this far, we fallback to a v1 personalization provider.
     this.affinityProvider = new UserDomainAffinityProvider(...args);
-    this.store.dispatch(
-      ac.PerfEvent({
-        event: "topstories.domain.affinity.calculation.ms",
-        value: Math.round(Cu.now() - start),
-      })
-    );
   }
 
   /*
@@ -140,21 +133,6 @@
     return this.affinityProvider.getAffinities();
   }
 
-  dispatchRelevanceScoreDuration(scoreStart) {
-    if (this.affinityProvider) {
-      if (this.affinityProvider.dispatchRelevanceScoreDuration) {
-        this.affinityProvider.dispatchRelevanceScoreDuration(scoreStart);
-      } else {
-        this.store.dispatch(
-          ac.PerfEvent({
-            event: "PERSONALIZATION_V1_ITEM_RELEVANCE_SCORE_DURATION",
-            value: Math.round(Cu.now() - scoreStart),
-          })
-        );
-      }
-    }
-  }
-
   async calculateItemRelevanceScore(item) {
     if (this.affinityProvider) {
       const scoreResult = await this.affinityProvider.calculateItemRelevanceScore(
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/RemoteL10n.jsm firefox-85.0+build1/browser/components/newtab/lib/RemoteL10n.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/RemoteL10n.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/RemoteL10n.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -22,6 +22,128 @@
   Services: "resource://gre/modules/Services.jsm",
 });
 
+/**
+ * All supported locales for remote l10n
+ *
+ * This is used by ASRouter.jsm to check if the locale is supported before
+ * issuing the request for remote fluent files to RemoteSettings.
+ *
+ * Note:
+ *   * this is generated based on "browser/locales/all-locales" as l10n doesn't
+ *     provide an API to fetch that list
+ *
+ *   * this list doesn't include "en-US", though "en-US" is well supported and
+ *     `_RemoteL10n.isLocaleSupported()` will handle it properly
+ */
+const ALL_LOCALES = new Set([
+  "ach",
+  "af",
+  "an",
+  "ar",
+  "ast",
+  "az",
+  "be",
+  "bg",
+  "bn",
+  "bo",
+  "br",
+  "brx",
+  "bs",
+  "ca",
+  "ca-valencia",
+  "cak",
+  "ckb",
+  "cs",
+  "cy",
+  "da",
+  "de",
+  "dsb",
+  "el",
+  "en-CA",
+  "en-GB",
+  "eo",
+  "es-AR",
+  "es-CL",
+  "es-ES",
+  "es-MX",
+  "et",
+  "eu",
+  "fa",
+  "ff",
+  "fi",
+  "fr",
+  "fy-NL",
+  "ga-IE",
+  "gd",
+  "gl",
+  "gn",
+  "gu-IN",
+  "he",
+  "hi-IN",
+  "hr",
+  "hsb",
+  "hu",
+  "hy-AM",
+  "hye",
+  "ia",
+  "id",
+  "is",
+  "it",
+  "ja",
+  "ja-JP-mac",
+  "ka",
+  "kab",
+  "kk",
+  "km",
+  "kn",
+  "ko",
+  "lij",
+  "lo",
+  "lt",
+  "ltg",
+  "lv",
+  "meh",
+  "mk",
+  "mr",
+  "ms",
+  "my",
+  "nb-NO",
+  "ne-NP",
+  "nl",
+  "nn-NO",
+  "oc",
+  "pa-IN",
+  "pl",
+  "pt-BR",
+  "pt-PT",
+  "rm",
+  "ro",
+  "ru",
+  "scn",
+  "si",
+  "sk",
+  "sl",
+  "son",
+  "sq",
+  "sr",
+  "sv-SE",
+  "szl",
+  "ta",
+  "te",
+  "th",
+  "tl",
+  "tr",
+  "trs",
+  "uk",
+  "ur",
+  "uz",
+  "vi",
+  "wo",
+  "xh",
+  "zh-CN",
+  "zh-TW",
+]);
+
 class _RemoteL10n {
   constructor() {
     this._l10n = null;
@@ -114,6 +236,10 @@
   reloadL10n() {
     this._l10n = null;
   }
+
+  isLocaleSupported(locale) {
+    return locale === "en-US" || ALL_LOCALES.has(locale);
+  }
 }
 
 this.RemoteL10n = new _RemoteL10n();
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/SearchShortcuts.jsm firefox-85.0+build1/browser/components/newtab/lib/SearchShortcuts.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/SearchShortcuts.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/SearchShortcuts.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -55,8 +55,8 @@
 // Get the search form URL for a given search keyword. This allows us to pick
 // different tippytop icons for the different variants. Sush as yandex.com vs. yandex.ru.
 // See more details in bug 1643523.
-function getSearchFormURL(keyword) {
-  const engine = Services.search.getEngineByAlias(keyword);
+async function getSearchFormURL(keyword) {
+  const engine = await Services.search.getEngineByAlias(keyword);
   return engine?.wrappedJSObject._searchForm;
 }
 this.getSearchFormURL = getSearchFormURL;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/SectionsManager.jsm firefox-85.0+build1/browser/components/newtab/lib/SectionsManager.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/SectionsManager.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/SectionsManager.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -34,7 +34,15 @@
         values: { provider: options.provider_name },
       },
       descString: {
-        id: "home-prefs-recommended-by-description-update",
+        id:
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+          ) ||
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.customizationMenu.enabled"
+          )
+            ? "home-prefs-recommended-by-description-new"
+            : "home-prefs-recommended-by-description-update",
         values: { provider: options.provider_name },
       },
       nestedPrefs: options.show_spocs
@@ -43,6 +51,7 @@
               name: "showSponsored",
               titleString: "home-prefs-recommended-by-option-sponsored-stories",
               icon: "icon-info",
+              eventSource: "POCKET_SPOCS",
             },
           ]
         : [],
@@ -93,8 +102,28 @@
   "feeds.section.highlights": options => ({
     id: "highlights",
     pref: {
-      titleString: { id: "home-prefs-highlights-header" },
-      descString: { id: "home-prefs-highlights-description" },
+      titleString: {
+        id:
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+          ) ||
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.customizationMenu.enabled"
+          )
+            ? "home-prefs-recent-activity-header"
+            : "home-prefs-highlights-header",
+      },
+      descString: {
+        id:
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+          ) ||
+          Services.prefs.getBoolPref(
+            "browser.newtabpage.activity-stream.customizationMenu.enabled"
+          )
+            ? "home-prefs-recent-activity-description"
+            : "home-prefs-highlights-description",
+      },
       nestedPrefs: [
         {
           name: "section.highlights.includeVisited",
@@ -121,7 +150,17 @@
     shouldHidePref: false,
     eventSource: "HIGHLIGHTS",
     icon: "highlights",
-    title: { id: "newtab-section-header-highlights" },
+    title: {
+      id:
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+        ) ||
+        Services.prefs.getBoolPref(
+          "browser.newtabpage.activity-stream.customizationMenu.enabled"
+        )
+          ? "newtab-section-header-recent-activity"
+          : "newtab-section-header-highlights",
+    },
     compactCards: true,
     rowsPref: "section.highlights.rows",
     maxRows: 4,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/TelemetryFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/TelemetryFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/TelemetryFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/TelemetryFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -118,18 +118,15 @@
 );
 
 this.TelemetryFeed = class TelemetryFeed {
-  constructor({ isParentProcess = true } = {}) {
+  constructor() {
     this.sessions = new Map();
     this._prefs = new Prefs();
+    this._impressionId = this.getOrCreateImpressionId();
     this._aboutHomeSeen = false;
     this._classifySite = classifySite;
     this._addWindowListeners = this._addWindowListeners.bind(this);
     this._browserOpenNewtabStart = null;
     this.handleEvent = this.handleEvent.bind(this);
-    if (isParentProcess && !this._prefs.get(PREF_IMPRESSION_ID)) {
-      const id = String(gUUIDGenerator.generateUUID());
-      this._prefs.set(PREF_IMPRESSION_ID, id);
-    }
   }
 
   get telemetryEnabled() {
@@ -231,8 +228,13 @@
     return pinnedTabs;
   }
 
-  get _impressionId() {
-    return this._prefs.get(PREF_IMPRESSION_ID);
+  getOrCreateImpressionId() {
+    let impressionId = this._prefs.get(PREF_IMPRESSION_ID);
+    if (!impressionId) {
+      impressionId = String(gUUIDGenerator.generateUUID());
+      this._prefs.set(PREF_IMPRESSION_ID, impressionId);
+    }
+    return impressionId;
   }
 
   browserOpenNewtabStart() {
@@ -578,12 +580,6 @@
     );
   }
 
-  createPerformanceEvent(action) {
-    return Object.assign(this.createPing(), action.data, {
-      action: "activity_stream_performance_event",
-    });
-  }
-
   createSessionEndEvent(session) {
     return Object.assign(this.createPing(), {
       session_id: session.session_id,
@@ -695,10 +691,8 @@
    * Per Bug 1485069, all the metrics for Snippets in AS router use client_id in
    * all the release channels
    */
-  applySnippetsPolicy(ping) {
-    // XXX Bug 1677723
-    // ping.client_id = await this.telemetryClientId;
-    ping.client_id = this._impressionId;
+  async applySnippetsPolicy(ping) {
+    ping.client_id = await this.telemetryClientId;
     delete ping.action;
     return { ping, pingType: "snippets" };
   }
@@ -969,9 +963,6 @@
       case at.AS_ROUTER_TELEMETRY_USER_EVENT:
         this.handleASRouterUserEvent(action);
         break;
-      case at.TELEMETRY_PERFORMANCE_EVENT:
-        this.sendEvent(this.createPerformanceEvent(action));
-        break;
       case at.UNINIT:
         this.uninit();
         break;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/TopSitesFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/TopSitesFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/TopSitesFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/TopSitesFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -98,13 +98,6 @@
   "ask",
   "duckduckgo",
 ];
-let SEARCH_TILE_OVERRIDE_PREFS = new Map();
-for (let searchProvider of ["amazon", "google"]) {
-  SEARCH_TILE_OVERRIDE_PREFS.set(
-    `browser.newtabpage.searchTileOverride.${searchProvider}.url`,
-    searchProvider
-  );
-}
 
 const REMOTE_SETTING_DEFAULTS_PREF = "browser.topsites.useRemoteSetting";
 const REMOTE_SETTING_MIGRATION_ID_PREF =
@@ -147,9 +140,6 @@
     this._readDefaults({ isStartup: true });
     this._storage = this.store.dbStorage.getDbTable("sectionPrefs");
     Services.obs.addObserver(this, "browser-search-engine-modified");
-    for (let [pref] of SEARCH_TILE_OVERRIDE_PREFS) {
-      Services.prefs.addObserver(pref, this);
-    }
     Services.prefs.addObserver(REMOTE_SETTING_DEFAULTS_PREF, this);
     Services.prefs.addObserver(DEFAULT_SITES_POLICY_PREF, this);
     Services.prefs.addObserver(DEFAULT_SITES_EXPERIMENTS_PREF_BRANCH, this);
@@ -158,9 +148,6 @@
   uninit() {
     PageThumbs.removeExpirationFilter(this);
     Services.obs.removeObserver(this, "browser-search-engine-modified");
-    for (let [pref] of SEARCH_TILE_OVERRIDE_PREFS) {
-      Services.prefs.removeObserver(pref, this);
-    }
     Services.prefs.removeObserver(REMOTE_SETTING_DEFAULTS_PREF, this);
     Services.prefs.removeObserver(DEFAULT_SITES_POLICY_PREF, this);
     Services.prefs.removeObserver(DEFAULT_SITES_EXPERIMENTS_PREF_BRANCH, this);
@@ -187,8 +174,6 @@
           data.startsWith(DEFAULT_SITES_EXPERIMENTS_PREF_BRANCH)
         ) {
           this._readDefaults();
-        } else if (SEARCH_TILE_OVERRIDE_PREFS.has(data)) {
-          this.refresh({ broadcast: true });
         }
         break;
     }
@@ -525,11 +510,11 @@
     // Get defaults.
     let date = new Date();
     let pad = number => number.toString().padStart(2, "0");
-    let yyyymmdd =
+    let yyyymmddhh =
       String(date.getFullYear()) +
       pad(date.getMonth() + 1) +
-      pad(date.getDate());
-    let yyyymmddhh = yyyymmdd + pad(date.getHours());
+      pad(date.getDate()) +
+      pad(date.getHours());
     let notBlockedDefaultSites = [];
     let sponsored = [];
     for (let link of DEFAULT_TOP_SITES) {
@@ -689,19 +674,6 @@
     // Remove excess items after we inserted sponsored ones.
     withPinned = withPinned.slice(0, numItems);
 
-    let searchTileOverrideURLs = new Map();
-    if (!this._useRemoteSetting) {
-      for (let [pref, hostname] of SEARCH_TILE_OVERRIDE_PREFS) {
-        let url = Services.prefs.getStringPref(pref, "");
-        if (url) {
-          url = url
-            .replace("%YYYYMMDD%", yyyymmdd)
-            .replace("%YYYYMMDDHH%", yyyymmddhh);
-          searchTileOverrideURLs.set(hostname, url);
-        }
-      }
-    }
-
     // Now, get a tippy top icon, a rich icon, or screenshot for every item
     for (const link of withPinned) {
       if (link) {
@@ -709,7 +681,7 @@
         if (link.customScreenshotURL) {
           this._fetchScreenshot(link, link.customScreenshotURL, isStartup);
         } else if (link.searchTopSite && !link.isDefault) {
-          this._attachTippyTopIconForSearchShortcut(link, link.label);
+          await this._attachTippyTopIconForSearchShortcut(link, link.label);
         } else {
           this._fetchIcon(link, isStartup);
         }
@@ -723,20 +695,6 @@
         if (ATTRIBUTION_REQUEST_SITES.includes(link.original_url || link.url)) {
           link.sendAttributionRequest = true;
         }
-
-        for (let [hostname, url] of searchTileOverrideURLs) {
-          // The `searchVendor` property is set if the engine was re-added manually.
-          if (
-            link.searchTopSite &&
-            !link.searchVendor &&
-            link.hostname === hostname
-          ) {
-            delete link.searchTopSite;
-            delete link.label;
-            link.url = url;
-            link.sendAttributionRequest = true;
-          }
-        }
       }
     }
 
@@ -754,12 +712,12 @@
    * @param {Object} link A link object with a `url` property
    * @param {string} keyword Search keyword
    */
-  _attachTippyTopIconForSearchShortcut(link, keyword) {
+  async _attachTippyTopIconForSearchShortcut(link, keyword) {
     if (
       ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"].includes(keyword)
     ) {
       let site = { url: link.url };
-      site.url = getSearchFormURL(keyword) || site.url;
+      site.url = (await getSearchFormURL(keyword)) || site.url;
       this._tippyTopProvider.processSite(site);
       link.tippyTopIcon = site.tippyTopIcon;
       link.smallFavicon = site.smallFavicon;
@@ -823,20 +781,18 @@
     }
 
     // Populate the state with available search shortcuts
-    const searchShortcuts = (await Services.search.getDefaultEngines()).reduce(
-      (result, engine) => {
-        const shortcut = CUSTOM_SEARCH_SHORTCUTS.find(s =>
-          engine.aliases.includes(s.keyword)
-        );
-        if (shortcut) {
-          let clone = { ...shortcut };
-          this._attachTippyTopIconForSearchShortcut(clone, clone.keyword);
-          result.push(clone);
-        }
-        return result;
-      },
-      []
-    );
+    let searchShortcuts = [];
+    for (const engine of await Services.search.getDefaultEngines()) {
+      const shortcut = CUSTOM_SEARCH_SHORTCUTS.find(s =>
+        engine.aliases.includes(s.keyword)
+      );
+      if (shortcut) {
+        let clone = { ...shortcut };
+        await this._attachTippyTopIconForSearchShortcut(clone, clone.keyword);
+        searchShortcuts.push(clone);
+      }
+    }
+
     this.store.dispatch(
       ac.BroadcastToContent({
         type: at.UPDATE_SEARCH_SHORTCUTS,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/lib/TopStoriesFeed.jsm firefox-85.0+build1/browser/components/newtab/lib/TopStoriesFeed.jsm
--- firefox-84.0.2+build1/browser/components/newtab/lib/TopStoriesFeed.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/lib/TopStoriesFeed.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -237,14 +237,7 @@
       return provider;
     }
 
-    const start = Cu.now();
     const v1Provider = this.UserDomainAffinityProvider(...args);
-    this.store.dispatch(
-      ac.PerfEvent({
-        event: "topstories.domain.affinity.calculation.ms",
-        value: Math.round(Cu.now() - start),
-      })
-    );
 
     return v1Provider;
   }
@@ -332,41 +325,11 @@
     return { topics: this.topics, stories: this.stories };
   }
 
-  dispatchRelevanceScore(start) {
-    let event = "PERSONALIZATION_V1_ITEM_RELEVANCE_SCORE_DURATION";
-    let initialized = true;
-    if (!this.personalized) {
-      return;
-    }
-    const { affinityProviderV2 } = this;
-    if (affinityProviderV2 && affinityProviderV2.use_v2) {
-      if (this.affinityProvider) {
-        initialized = this.affinityProvider.initialized;
-        event = "PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION";
-      }
-    }
-
-    // If v2 is not yet initialized we don't bother tracking yet.
-    // Before it is initialized it doesn't do any ranking.
-    // Once it's initialized it ensures ranking is done.
-    // v1 doesn't have any initialized issues around ranking,
-    // and should be ready right away.
-    if (initialized) {
-      this.store.dispatch(
-        ac.PerfEvent({
-          event,
-          value: Math.round(Cu.now() - start),
-        })
-      );
-    }
-  }
-
   transform(items) {
     if (!items) {
       return [];
     }
 
-    const scoreStart = Cu.now();
     const calcResult = items
       .filter(s => !NewTabUtils.blockedLinks.isBlocked({ url: s.url }))
       .map(s => {
@@ -403,7 +366,6 @@
       })
       .sort(this.personalized ? this.compareScore : (a, b) => 0);
 
-    this.dispatchRelevanceScore(scoreStart);
     return calcResult;
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream-debug.html firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream-debug.html
--- firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream-debug.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream-debug.html	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,6 @@
     <link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
     <div id="root"></div>
     <div id="footer-asrouter-container" role="presentation"></div>
     <script src="chrome://browser/content/contentSearchUI.js"></script>
diff -Nru firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream.html firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream.html
--- firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream.html	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,6 @@
     <link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
     <div id="root"></div>
     <div id="footer-asrouter-container" role="presentation"></div>
     <script src="chrome://browser/content/contentSearchUI.js"></script>
diff -Nru firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream-noscripts.html firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream-noscripts.html
--- firefox-84.0.2+build1/browser/components/newtab/prerendered/activity-stream-noscripts.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/prerendered/activity-stream-noscripts.html	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,6 @@
     <link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
   </head>
   <body class="activity-stream">
-    <div id="header-asrouter-container" role="presentation"></div>
     <div id="root"></div>
     <div id="footer-asrouter-container" role="presentation"></div>
   </body>
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser.ini firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser.ini
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = tsan #Bug 1677049
 support-files =
   head.js
   ../ds_layout.json
@@ -20,7 +21,7 @@
   browser.newtabpage.activity-stream.discoverystream.endpoints=https://example.com
 
 [browser_basic_endtoend.js]
-skip-if = asan || debug #Bug 1651277
+skip-if = asan || tsan || debug #Bug 1651277
 [browser_bump_version.js]
 [browser_disabled.js]
 [browser_locale_change.js]
@@ -29,4 +30,6 @@
 [browser_overwrite_cache.js]
 [browser_process_crash.js]
 skip-if = !e10s || !crashreporter
+[browser_same_consumer.js]
 [browser_sanitize.js]
+[browser_shutdown_timeout.js]
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_overwrite_cache.js firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_overwrite_cache.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_overwrite_cache.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_overwrite_cache.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,6 +22,7 @@
         </head>
         <body>
           <h1 id="${TEST_ID}">Something new</h1>
+          <div id="root"></div>
         </body>
         <script src="about:home?jscache"></script>
       </html>`,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_process_crash.js firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_process_crash.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_process_crash.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_process_crash.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,7 @@
  * Test that if the "privileged about content process" crashes, that it
  * drops its internal reference to the "privileged about content process"
  * process manager, and that a subsequent restart of that process type
- * results in a new cached document load. Also tests that crashing of
+ * results in a dynamic document load. Also tests that crashing of
  * any other content process type doesn't clear the process manager
  * reference.
  */
@@ -24,12 +24,21 @@
     );
   });
 
-  let latestProcManager = AboutHomeStartupCache._procManager;
-
   await BrowserTestUtils.withNewTab("about:home", async browser => {
-    await ensureCachedAboutHome(browser);
+    // The cache should still be considered "valid and used", since it was
+    // used successfully before the crash.
+    await ensureDynamicAboutHome(
+      browser,
+      AboutHomeStartupCache.CACHE_RESULT_SCALARS.VALID_AND_USED
+    );
+
+    // Now simulate a restart to attach the AboutHomeStartupCache to
+    // the new privileged about content process.
+    await simulateRestart(browser);
   });
 
+  let latestProcManager = AboutHomeStartupCache._procManager;
+
   await BrowserTestUtils.withNewTab("http://example.com", async browser => {
     await BrowserTestUtils.crashFrame(browser);
     Assert.equal(
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_same_consumer.js firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_same_consumer.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_same_consumer.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_same_consumer.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Tests that if a page attempts to load the script stream without
+ * having also loaded the page stream, that it will fail and get
+ * the default non-cached script.
+ */
+add_task(async function test_same_consumer() {
+  await BrowserTestUtils.withNewTab("about:home", async browser => {
+    await simulateRestart(browser);
+
+    // We need the CSP meta tag in about: pages, otherwise we hit assertions in
+    // debug builds.
+    //
+    // We inject a script that sets a __CACHE_CONSUMED__ property to true on
+    // the window element. We'll test to ensure that if we try to load the
+    // script cache from a different BrowsingContext that this property is
+    // not set.
+    await injectIntoCache(
+      `
+      <html>
+        <head>
+        <meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; connect-src https:; img-src https: data: blob:; style-src 'unsafe-inline';">
+        </head>
+        <body>
+          <h1>A fake about:home page</h1>
+          <div id="root"></div>
+        </body>
+      </html>`,
+      "window.__CACHE_CONSUMED__ = true;"
+    );
+    await simulateRestart(browser, false /* withAutoShutdownWrite */);
+
+    // Attempting to load the script from the cache should fail, and instead load
+    // the markup.
+    await BrowserTestUtils.withNewTab("about:home?jscache", async browser2 => {
+      await SpecialPowers.spawn(browser2, [], async () => {
+        Assert.ok(
+          !Cu.waiveXrays(content).__CACHE_CONSUMED__,
+          "Should not have found __CACHE_CONSUMED__ property"
+        );
+        Assert.ok(
+          content.document.body.classList.contains("activity-stream"),
+          "Should have found activity-stream class on <body> element"
+        );
+      });
+    });
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_shutdown_timeout.js firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_shutdown_timeout.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/browser_shutdown_timeout.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/browser_shutdown_timeout.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,45 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Tests that if there's a substantial delay in getting the cache
+ * streams from the privileged about content process for any reason
+ * during shutdown, that we timeout and let the AsyncShutdown proceed,
+ * rather than letting it block until AsyncShutdown causes a shutdown
+ * hang crash.
+ */
+add_task(async function test_shutdown_timeout() {
+  await BrowserTestUtils.withNewTab("about:home", async browser => {
+    // First, make sure the cache is populated so that later on, after
+    // the timeout, simulateRestart doesn't complain about not finding
+    // a pre-existing cache. This complaining only happens if this test
+    // is run in isolation.
+    await clearCache();
+    await simulateRestart(browser);
+
+    // Next, manually shutdown the AboutHomeStartupCacheChild so that
+    // it doesn't respond to requests to the cache streams.
+    await SpecialPowers.spawn(browser, [], async () => {
+      let { AboutHomeStartupCacheChild } = ChromeUtils.import(
+        "resource:///modules/AboutNewTabService.jsm"
+      );
+      AboutHomeStartupCacheChild.uninit();
+    });
+
+    // Then, manually dirty the cache state so that we attempt to write
+    // on shutdown.
+    AboutHomeStartupCache.onPreloadedNewTabMessage();
+
+    await simulateRestart(browser, { expectTimeout: true });
+
+    Assert.ok(
+      true,
+      "We reached here, which means shutdown didn't block forever."
+    );
+
+    // Clear the cache so that we're not in a half-persisted state.
+    await clearCache();
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/head.js firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/head.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/abouthomecache/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/abouthomecache/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -65,6 +65,11 @@
  *       this to avoid the HTTP cache "losing the race" against reading the
  *       about:home document from the omni.ja. This defaults to true.
  *
+ *     expectTimeout (boolean, optional):
+ *       If true, indicates that it's expected that AboutHomeStartupCache will
+ *       timeout when shutting down. If false, such timeouts will result in
+ *       test failures. Defaults to false.
+ *
  * @returns Promise
  * @resolves undefined
  *   Resolves once the restart simulation is complete, and the <xul:browser>
@@ -73,9 +78,10 @@
 // eslint-disable-next-line no-unused-vars
 async function simulateRestart(
   browser,
-  { withAutoShutdownWrite, ensureCacheWinsRace } = {
+  { withAutoShutdownWrite, ensureCacheWinsRace, expectTimeout } = {
     withAutoShutdownWrite: true,
     ensureCacheWinsRace: true,
+    expectTimeout: false,
   }
 ) {
   info("Simulating restart of the browser");
@@ -88,7 +94,15 @@
 
   if (withAutoShutdownWrite && AboutHomeStartupCache.initted) {
     info("Simulating shutdown write");
-    await AboutHomeStartupCache.onShutdown();
+    let timedOut = !(await AboutHomeStartupCache.onShutdown(expectTimeout));
+    if (timedOut && !expectTimeout) {
+      Assert.ok(
+        false,
+        "AboutHomeStartupCache shutdown unexpectedly timed out."
+      );
+    } else if (!timedOut && expectTimeout) {
+      Assert.ok(false, "AboutHomeStartupCache shutdown failed to time out.");
+    }
     info("Shutdown write done");
   } else {
     info("Intentionally skipping shutdown write");
@@ -110,7 +124,8 @@
   if (AboutHomeStartupCache.initted) {
     let processManager = browser.messageManager.processMessageManager;
     let pp = browser.browsingContext.currentWindowGlobal.domProcess;
-    AboutHomeStartupCache.sendCacheInputStreams(processManager, pp);
+    let { childID } = pp;
+    AboutHomeStartupCache.onContentProcessCreated(childID, processManager, pp);
 
     info("Waiting for AboutHomeStartupCache cache entry");
     await AboutHomeStartupCache.ensureCacheEntry();
@@ -144,7 +159,10 @@
  *
  * @param page (String)
  *   The HTML content to write into the cache. This cannot be the empty
- *   string.
+ *   string. Note that this string should contain a node that has an
+ *   id of "root", in order for the newtab scripts to attach correctly.
+ *   Otherwise, an exception might get thrown which can cause shutdown
+ *   leaks.
  * @param script (String)
  *   The JS content to write into the cache that can be loaded via
  *   about:home?jscache. This cannot be the empty string.
@@ -158,6 +176,10 @@
     throw new Error("Cannot injectIntoCache with falsey values");
   }
 
+  if (!page.includes(`id="root"`)) {
+    throw new Error("Page markup must include a root node.");
+  }
+
   await AboutHomeStartupCache.ensureCacheEntry();
 
   let pageInputStream = Cc[
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js	2021-01-18 19:58:08.000000000 +0000
@@ -88,6 +88,13 @@
             navigate: true,
           },
         },
+        secondary_button: {
+          label: "Import",
+          action: {
+            type: "SHOW_MIGRATION_WIZARD",
+            data: { source: "chrome" },
+          },
+        },
       },
     },
   ],
@@ -637,6 +644,7 @@
 add_task(async function test_AWMultistage_Themes() {
   let browser = await openAboutWelcome();
   let aboutWelcomeActor = await getAboutWelcomeParent(browser);
+
   const sandbox = sinon.createSandbox();
   // Stub AboutWelcomeParent Content Message Handler
   sandbox
@@ -700,3 +708,59 @@
     "automatic click source recorded in Telemetry"
   );
 });
+
+add_task(async function test_AWMultistage_Import() {
+  let browser = await openAboutWelcome();
+  let aboutWelcomeActor = await getAboutWelcomeParent(browser);
+
+  // click twice to advance to screen 3
+  await onButtonClick(browser, "button.primary");
+  await onButtonClick(browser, "button.primary");
+
+  const sandbox = sinon.createSandbox();
+  // Stub AboutWelcomeParent Content Message Handler
+  sandbox
+    .stub(aboutWelcomeActor, "onContentMessage")
+    .resolves("")
+    .withArgs("AWPage:IMPORTABLE_SITES")
+    .resolves([]);
+  registerCleanupFunction(() => {
+    sandbox.restore();
+  });
+
+  await onButtonClick(browser, "button.secondary");
+  const { callCount } = aboutWelcomeActor.onContentMessage;
+
+  let actionCall;
+  let eventCall;
+  for (let i = 0; i < callCount; i++) {
+    const call = aboutWelcomeActor.onContentMessage.getCall(i);
+    info(`Call #${i}: ${call.args[0]} ${JSON.stringify(call.args[1])}`);
+    if (call.calledWithMatch("SPECIAL")) {
+      actionCall = call;
+    } else if (call.calledWithMatch("", { event: "CLICK_BUTTON" })) {
+      eventCall = call;
+    }
+  }
+
+  Assert.equal(
+    actionCall.args[0],
+    "AWPage:SPECIAL_ACTION",
+    "Got call to handle special action"
+  );
+  Assert.equal(
+    actionCall.args[1].type,
+    "SHOW_MIGRATION_WIZARD",
+    "Special action SHOW_MIGRATION_WIZARD event handled"
+  );
+  Assert.equal(
+    actionCall.args[1].data.source,
+    "chrome",
+    "Source passed to event handler"
+  );
+  Assert.equal(
+    eventCall.args[0],
+    "AWPage:TELEMETRY_EVENT",
+    "Got call to handle Telemetry event"
+  );
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_aboutwelcome_observer.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_aboutwelcome_observer.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_aboutwelcome_observer.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_aboutwelcome_observer.js	2021-01-18 19:58:08.000000000 +0000
@@ -62,10 +62,7 @@
     aboutWelcomeActor.AboutWelcomeObserver,
     "AboutWelcomeObserver is not null"
   );
-  await BrowserTestUtils.loadURI(
-    gBrowser.selectedBrowser,
-    "http://example.com/#foo"
-  );
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "http://example.com/#foo");
   await BrowserTestUtils.waitForLocationChange(
     gBrowser,
     "http://example.com/#foo"
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_cfr.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_cfr.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_cfr.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_cfr.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,6 +11,10 @@
   "resource://activity-stream/lib/CFRMessageProvider.jsm"
 );
 
+const { TelemetryFeed } = ChromeUtils.import(
+  "resource://activity-stream/lib/TelemetryFeed.jsm"
+);
+
 const createDummyRecommendation = ({
   action,
   category,
@@ -218,9 +222,13 @@
 });
 
 add_task(async function test_cfr_notification_show() {
+  const sendPingStub = sinon.stub(
+    TelemetryFeed.prototype,
+    "sendStructuredIngestionEvent"
+  );
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   const response = await trigger_cfr_panel(browser, "example.com");
@@ -269,12 +277,17 @@
     0,
     "Should have removed the notification"
   );
+
+  Assert.ok(sendPingStub.callCount >= 1, "Recorded some events");
+  let cfrPing = sendPingStub.args.find(args => args[2] === "cfr");
+  Assert.equal(cfrPing[0].source, "CFR", "Got a CFR event");
+  sendPingStub.restore();
 });
 
 add_task(async function test_cfr_notification_show() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   let response = await trigger_cfr_panel(browser, "example.com", {
@@ -340,7 +353,7 @@
 add_task(async function test_cfr_notification_minimize() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   let response = await trigger_cfr_panel(browser, "example.com");
@@ -387,7 +400,7 @@
 add_task(async function test_cfr_notification_minimize_2() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   let response = await trigger_cfr_panel(browser, "example.com");
@@ -449,7 +462,7 @@
 add_task(async function test_cfr_addon_install() {
   // addRecommendation checks that scheme starts with http and host matches
   const browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   const response = await trigger_cfr_panel(browser, "example.com", {
@@ -508,7 +521,7 @@
 add_task(async function test_cfr_pin_tab_notification_show() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   const response = await trigger_cfr_panel(browser, "example.com", {
@@ -564,7 +577,7 @@
   async function test_cfr_social_tracking_protection_notification_show() {
     // addRecommendation checks that scheme starts with http and host matches
     let browser = gBrowser.selectedBrowser;
-    await BrowserTestUtils.loadURI(browser, "http://example.com/");
+    BrowserTestUtils.loadURI(browser, "http://example.com/");
     await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
     const showPanel = BrowserTestUtils.waitForEvent(
@@ -617,7 +630,7 @@
 
     // addRecommendation checks that scheme starts with http and host matches
     let browser = gBrowser.selectedBrowser;
-    await BrowserTestUtils.loadURI(browser, "http://example.com/");
+    BrowserTestUtils.loadURI(browser, "http://example.com/");
     await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
     const showPanel = BrowserTestUtils.waitForEvent(
@@ -680,7 +693,7 @@
 
     // addRecommendation checks that scheme starts with http and host matches
     let browser = gBrowser.selectedBrowser;
-    await BrowserTestUtils.loadURI(browser, "http://example.com/");
+    BrowserTestUtils.loadURI(browser, "http://example.com/");
     await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
     const showPanel = BrowserTestUtils.waitForEvent(
@@ -730,7 +743,7 @@
 add_task(async function test_cfr_features_and_addon_show() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   // Trigger Feature CFR
@@ -821,7 +834,7 @@
 add_task(async function test_cfr_addon_and_features_show() {
   // addRecommendation checks that scheme starts with http and host matches
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   // Trigger Feature CFR
@@ -919,17 +932,17 @@
     "example.com",
   ]);
 
-  await BrowserTestUtils.loadURI(browser, "about:blank");
+  BrowserTestUtils.loadURI(browser, "about:blank");
   await BrowserTestUtils.browserLoaded(browser, false, "about:blank");
 
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   Assert.equal(count, 1, "Count navigation to example.com");
 
   // Anchor scroll triggers a location change event with the same document
   // https://searchfox.org/mozilla-central/rev/8848b9741fc4ee4e9bc3ae83ea0fc048da39979f/uriloader/base/nsIWebProgressListener.idl#400-403
-  await BrowserTestUtils.loadURI(browser, "http://example.com/#foo");
+  BrowserTestUtils.loadURI(browser, "http://example.com/#foo");
   await BrowserTestUtils.waitForLocationChange(
     gBrowser,
     "http://example.com/#foo"
@@ -937,7 +950,7 @@
 
   Assert.equal(count, 1, "It should ignore same page navigation");
 
-  await BrowserTestUtils.loadURI(browser, TEST_URL);
+  BrowserTestUtils.loadURI(browser, TEST_URL);
   await BrowserTestUtils.browserLoaded(browser, false, TEST_URL);
 
   Assert.equal(count, 2, "We moved to a new document");
@@ -954,7 +967,7 @@
   await frequentVisitsTrigger.init(triggerHandler, [], ["*://*.example.com/"]);
 
   const browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   await BrowserTestUtils.waitForCondition(
@@ -962,7 +975,7 @@
     "Registered pattern matched the current location"
   );
 
-  await BrowserTestUtils.loadURI(browser, "about:config");
+  BrowserTestUtils.loadURI(browser, "about:config");
   await BrowserTestUtils.browserLoaded(browser, false, "about:config");
 
   await BrowserTestUtils.waitForCondition(
@@ -970,7 +983,7 @@
     "Navigated to a new page but not a match"
   );
 
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   await BrowserTestUtils.waitForCondition(
@@ -978,7 +991,7 @@
     "Navigated to a location that matches the pattern but within 15 mins"
   );
 
-  await BrowserTestUtils.loadURI(browser, "http://www.example.com/");
+  BrowserTestUtils.loadURI(browser, "http://www.example.com/");
   await BrowserTestUtils.browserLoaded(
     browser,
     false,
@@ -1019,7 +1032,7 @@
 add_task(async function test_cfr_notification_keyboard() {
   // addRecommendation checks that scheme starts with http and host matches
   const browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, "http://example.com/");
+  BrowserTestUtils.loadURI(browser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(browser, false, "http://example.com/");
 
   const response = await trigger_cfr_panel(browser, "example.com");
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,132 +16,139 @@
 const { TelemetryFeed } = ChromeUtils.import(
   "resource://activity-stream/lib/TelemetryFeed.jsm"
 );
+const { TelemetryTestUtils } = ChromeUtils.import(
+  "resource://testing-common/TelemetryTestUtils.jsm"
+);
 
-const EXPERIMENT_PAYLOAD = ExperimentFakes.recipe(
-  // In tests by default studies/experiments are turned off. We turn them on
-  // to run the test and rollback at the end. Cleanup causes unenrollment so
-  // for cases where the test runs multiple times we need unique ids.
-  `test_xman_cfr_${Date.now()}`,
-  {
-    id: "xman_test_message",
-    bucketConfig: {
-      count: 100,
-      start: 0,
-      total: 100,
-      namespace: "mochitest",
-      randomizationUnit: "normandy_id",
-    },
-    branches: [
-      {
-        slug: "control",
-        ratio: 1,
-        feature: {
-          featureId: "cfr",
-          enabled: true,
-          value: {
-            id: "xman_test_message",
-            content: {
-              text: "This is a test CFR",
-              addon: {
-                id: "954390",
-                icon:
-                  "chrome://activity-stream/content/data/content/assets/cfr_fb_container.png",
-                title: "Facebook Container",
-                users: 1455872,
-                author: "Mozilla",
-                rating: 4.5,
-                amo_url:
-                  "https://addons.mozilla.org/firefox/addon/facebook-container/",
-              },
-              buttons: {
-                primary: {
-                  label: {
-                    string_id: "cfr-doorhanger-extension-ok-button",
-                  },
-                  action: {
-                    data: {
-                      url: null,
-                    },
-                    type: "INSTALL_ADDON_FROM_URL",
-                  },
+const EXPERIMENT_PAYLOAD = () =>
+  ExperimentFakes.recipe(
+    // In tests by default studies/experiments are turned off. We turn them on
+    // to run the test and rollback at the end. Cleanup causes unenrollment so
+    // for cases where the test runs multiple times we need unique ids.
+    `test_xman_cfr_${Date.now()}`,
+    {
+      id: "xman_test_message",
+      bucketConfig: {
+        count: 100,
+        start: 0,
+        total: 100,
+        namespace: "mochitest",
+        randomizationUnit: "normandy_id",
+      },
+      branches: [
+        {
+          slug: "control",
+          ratio: 1,
+          feature: {
+            featureId: "cfr",
+            enabled: true,
+            value: {
+              id: "xman_test_message",
+              content: {
+                text: "This is a test CFR",
+                addon: {
+                  id: "954390",
+                  icon:
+                    "chrome://activity-stream/content/data/content/assets/cfr_fb_container.png",
+                  title: "Facebook Container",
+                  users: 1455872,
+                  author: "Mozilla",
+                  rating: 4.5,
+                  amo_url:
+                    "https://addons.mozilla.org/firefox/addon/facebook-container/",
                 },
-                secondary: [
-                  {
+                buttons: {
+                  primary: {
                     label: {
-                      string_id: "cfr-doorhanger-extension-cancel-button",
+                      string_id: "cfr-doorhanger-extension-ok-button",
                     },
                     action: {
-                      type: "CANCEL",
+                      data: {
+                        url: null,
+                      },
+                      type: "INSTALL_ADDON_FROM_URL",
                     },
                   },
-                  {
-                    label: {
-                      string_id:
-                        "cfr-doorhanger-extension-never-show-recommendation",
+                  secondary: [
+                    {
+                      label: {
+                        string_id: "cfr-doorhanger-extension-cancel-button",
+                      },
+                      action: {
+                        type: "CANCEL",
+                      },
                     },
-                  },
-                  {
-                    label: {
-                      string_id:
-                        "cfr-doorhanger-extension-manage-settings-button",
+                    {
+                      label: {
+                        string_id:
+                          "cfr-doorhanger-extension-never-show-recommendation",
+                      },
                     },
-                    action: {
-                      data: {
-                        origin: "CFR",
-                        category: "general-cfraddons",
+                    {
+                      label: {
+                        string_id:
+                          "cfr-doorhanger-extension-manage-settings-button",
+                      },
+                      action: {
+                        data: {
+                          origin: "CFR",
+                          category: "general-cfraddons",
+                        },
+                        type: "OPEN_PREFERENCES_PAGE",
                       },
-                      type: "OPEN_PREFERENCES_PAGE",
                     },
+                  ],
+                },
+                category: "cfrAddons",
+                bucket_id: "CFR_M1",
+                info_icon: {
+                  label: {
+                    string_id: "cfr-doorhanger-extension-sumo-link",
                   },
-                ],
-              },
-              category: "cfrAddons",
-              bucket_id: "CFR_M1",
-              info_icon: {
-                label: {
-                  string_id: "cfr-doorhanger-extension-sumo-link",
+                  sumo_path: "extensionrecommendations",
+                },
+                heading_text: "Welcome to the experiment",
+                notification_text: {
+                  string_id: "cfr-doorhanger-extension-notification2",
                 },
-                sumo_path: "extensionrecommendations",
               },
-              heading_text: "Welcome to the experiment",
-              notification_text: {
-                string_id: "cfr-doorhanger-extension-notification2",
+              trigger: {
+                id: "openURL",
+                params: [
+                  "www.facebook.com",
+                  "facebook.com",
+                  "www.instagram.com",
+                  "instagram.com",
+                  "www.whatsapp.com",
+                  "whatsapp.com",
+                  "web.whatsapp.com",
+                  "www.messenger.com",
+                  "messenger.com",
+                ],
               },
+              template: "cfr_doorhanger",
+              frequency: {
+                lifetime: 3,
+              },
+              targeting: "true",
             },
-            trigger: {
-              id: "openURL",
-              params: [
-                "www.facebook.com",
-                "facebook.com",
-                "www.instagram.com",
-                "instagram.com",
-                "www.whatsapp.com",
-                "whatsapp.com",
-                "web.whatsapp.com",
-                "www.messenger.com",
-                "messenger.com",
-              ],
-            },
-            template: "cfr_doorhanger",
-            frequency: {
-              lifetime: 3,
-            },
-            targeting: "true",
           },
         },
-      },
-    ],
-    userFacingName: "About:Welcome Pull Factor Reinforcement",
-    isEnrollmentPaused: false,
-    experimentDocumentUrl:
-      "https://experimenter.services.mozilla.com/experiments/aboutwelcome-pull-factor-reinforcement/",
-    userFacingDescription:
-      "This study uses 4 different variants of about:welcome with a goal of testing new experiment framework and get insights on whether reinforcing pull-factors improves retention.",
-  }
-);
+      ],
+      userFacingName: "About:Welcome Pull Factor Reinforcement",
+      isEnrollmentPaused: false,
+      experimentDocumentUrl:
+        "https://experimenter.services.mozilla.com/experiments/aboutwelcome-pull-factor-reinforcement/",
+      userFacingDescription:
+        "This study uses 4 different variants of about:welcome with a goal of testing new experiment framework and get insights on whether reinforcing pull-factors improves retention.",
+    }
+  );
 
-add_task(async function test_loading_experimentsAPI() {
-  // Force the WNPanel provider cache to 0 by modifying updateCycleInMs
+const client = RemoteSettings("nimbus-desktop-experiments");
+
+// no `add_task` because we want to run this setup before each test not before
+// the entire test suite.
+async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["app.shield.optoutstudies.enabled", true],
@@ -151,16 +158,27 @@
       ],
     ],
   });
-  const client = RemoteSettings("nimbus-desktop-experiments");
+
   await client.db.importChanges(
     {},
     42,
     [
       // Modify targeting to ensure the messages always show up
-      { ...EXPERIMENT_PAYLOAD },
+      { ...EXPERIMENT_PAYLOAD() },
     ],
     { clear: true }
   );
+}
+
+async function cleanup() {
+  await client.db.clear();
+  await SpecialPowers.popPrefEnv();
+  // Reload the provider
+  await ASRouter._updateMessageProviders();
+}
+
+add_task(async function test_loading_experimentsAPI() {
+  await setup();
   // Fetch the new recipe from RS
   await RemoteSettingsExperimentLoader.updateRecipes();
   await BrowserTestUtils.waitForCondition(
@@ -184,8 +202,47 @@
     "Experiment message found in ASRouter state"
   );
 
-  await client.db.clear();
-  await SpecialPowers.popPrefEnv();
+  await cleanup();
+});
+
+add_task(async function test_exposure_ping() {
+  await setup();
+  Services.telemetry.clearScalars();
+  // Fetch the new recipe from RS
+  await RemoteSettingsExperimentLoader.updateRecipes();
+  await BrowserTestUtils.waitForCondition(
+    () => ExperimentAPI.getExperiment({ featureId: "cfr" }),
+    "ExperimentAPI should return an experiment"
+  );
+
   // Reload the provider
   await ASRouter._updateMessageProviders();
+  // Wait to load the messages from the messaging-experiments provider
+  await ASRouter.loadMessagesFromAllProviders();
+
+  Assert.ok(
+    ASRouter.state.messages.find(m => m.id === "xman_test_message"),
+    "Experiment message found in ASRouter state"
+  );
+
+  const exposureSpy = sinon.spy(ExperimentAPI, "recordExposureEvent");
+
+  await ASRouter.sendTriggerMessage({
+    tabId: 1,
+    browser: gBrowser.selectedBrowser,
+    id: "openURL",
+    param: { host: "messenger.com" },
+  });
+
+  Assert.ok(exposureSpy.callCount === 1, "Should send exposure ping");
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, true);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    "telemetry.event_counts",
+    "normandy#expose#feature_study",
+    1
+  );
+
+  exposureSpy.restore();
+  await cleanup();
 });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_group_frequency.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_group_frequency.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_group_frequency.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_group_frequency.js	2021-01-18 19:58:08.000000000 +0000
@@ -119,7 +119,7 @@
   Assert.ok(groupState.enabled, "Group is enabled");
 
   let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-  await BrowserTestUtils.loadURI(tab1.linkedBrowser, TEST_URL);
+  BrowserTestUtils.loadURI(tab1.linkedBrowser, TEST_URL);
 
   let chiclet = document.getElementById("contextual-feature-recommendation");
   Assert.ok(chiclet, "CFR chiclet element found (tab1)");
@@ -138,7 +138,7 @@
   BrowserTestUtils.removeTab(tab1);
 
   let tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-  await BrowserTestUtils.loadURI(tab2.linkedBrowser, TEST_URL);
+  BrowserTestUtils.loadURI(tab2.linkedBrowser, TEST_URL);
 
   Assert.ok(chiclet, "CFR chiclet element found (tab2)");
   await BrowserTestUtils.waitForCondition(
@@ -161,7 +161,7 @@
   BrowserTestUtils.removeTab(tab2);
 
   let tab3 = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-  await BrowserTestUtils.loadURI(tab3.linkedBrowser, TEST_URL);
+  BrowserTestUtils.loadURI(tab3.linkedBrowser, TEST_URL);
 
   await BrowserTestUtils.waitForCondition(
     () => chiclet.hidden,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js	2021-01-18 19:58:08.000000000 +0000
@@ -113,7 +113,7 @@
   Assert.ok(ASRouter.isUnblockedMessage(msg), "Message is unblocked");
 
   let tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-  await BrowserTestUtils.loadURI(tab1.linkedBrowser, TEST_URL);
+  BrowserTestUtils.loadURI(tab1.linkedBrowser, TEST_URL);
 
   let chiclet = document.getElementById("contextual-feature-recommendation");
   Assert.ok(chiclet, "CFR chiclet element found");
@@ -135,7 +135,7 @@
   );
 
   let tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_URL);
-  await BrowserTestUtils.loadURI(tab2.linkedBrowser, TEST_URL);
+  BrowserTestUtils.loadURI(tab2.linkedBrowser, TEST_URL);
 
   await BrowserTestUtils.waitForCondition(
     () => chiclet.hidden,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_snippets.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_snippets.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_asrouter_snippets.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_asrouter_snippets.js	2021-01-18 19:58:08.000000000 +0000
@@ -4,6 +4,10 @@
   "resource://activity-stream/lib/ASRouter.jsm"
 );
 
+const { TelemetryFeed } = ChromeUtils.import(
+  "resource://activity-stream/lib/TelemetryFeed.jsm"
+);
+
 add_task(async function render_below_search_snippet() {
   ASRouter._validPreviewEndpoint = () => true;
   await BrowserTestUtils.withNewTab(
@@ -125,3 +129,65 @@
     }
   );
 });
+
+add_task(async function test_snippets_telemetry() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      [
+        "browser.newtabpage.activity-stream.asrouter.providers.snippets",
+        `{"id":"snippets","enabled":true,"type":"remote","url":"https://example.com/browser/browser/components/newtab/test/browser/snippet.json","updateCycleInMs":0}`,
+      ],
+      ["browser.newtabpage.activity-stream.feeds.snippets", true],
+    ],
+  });
+  const sendPingStub = sinon.stub(
+    TelemetryFeed.prototype,
+    "sendStructuredIngestionEvent"
+  );
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      // Work around any issues caching might introduce by navigating to
+      // about blank first
+      url: "about:blank",
+    },
+    async browser => {
+      await BrowserTestUtils.loadURI(browser, "about:home");
+      await BrowserTestUtils.browserLoaded(browser);
+      let text = await SpecialPowers.spawn(browser, [], async () => {
+        await ContentTaskUtils.waitForCondition(
+          () => content.document.querySelector(".activity-stream"),
+          `Should render Activity Stream`
+        );
+        await ContentTaskUtils.waitForCondition(
+          () =>
+            content.document.querySelector(
+              "#footer-asrouter-container .SimpleSnippet"
+            ),
+          "Should find the snippet inside the footer container"
+        );
+
+        return content.document.querySelector(
+          "#footer-asrouter-container .SimpleSnippet"
+        ).innerText;
+      });
+
+      Assert.equal(
+        text,
+        "On January 30th Nightly will introduce dedicated profiles, making it simpler to run different installations of Firefox side by side. Learn what this means for you.",
+        "Snippet content match"
+      );
+    }
+  );
+
+  Assert.ok(sendPingStub.callCount >= 1, "We registered some pings");
+  const snippetsPing = sendPingStub.args.find(args => args[2] === "snippets");
+  Assert.ok(snippetsPing, "Found the snippets ping");
+  Assert.equal(
+    snippetsPing[0].event,
+    "IMPRESSION",
+    "It's the correct ping type"
+  );
+
+  sendPingStub.restore();
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_customize_menu_content.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_customize_menu_content.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_customize_menu_content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_customize_menu_content.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,179 @@
+"use strict";
+
+test_newtab({
+  async before({ pushPrefs }) {
+    await pushPrefs(
+      ["browser.newtabpage.activity-stream.newNewtabExperience.enabled", true],
+      ["browser.newtabpage.activity-stream.customizationMenu.enabled", true],
+      ["browser.newtabpage.activity-stream.feeds.topsites", false],
+      ["browser.newtabpage.activity-stream.feeds.section.topstories", false],
+      ["browser.newtabpage.activity-stream.feeds.section.highlights", false],
+      ["browser.newtabpage.activity-stream.feeds.snippets", false]
+    );
+  },
+  test: async function test_render_customizeMenu() {
+    const TOPSITES_PREF = "browser.newtabpage.activity-stream.feeds.topsites";
+    const HIGHLIGHTS_PREF =
+      "browser.newtabpage.activity-stream.feeds.section.highlights";
+    const SNIPPETS_PREF = "browser.newtabpage.activity-stream.feeds.snippets";
+    const TOPSTORIES_PREF =
+      "browser.newtabpage.activity-stream.feeds.section.topstories";
+
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".personalize-button"),
+      "Wait for prefs button to load on the newtab page"
+    );
+
+    let customizeButton = content.document.querySelector(".personalize-button");
+    customizeButton.click();
+
+    let defaultPos = "matrix(1, 0, 0, 1, 0, 0)";
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.getComputedStyle(
+          content.document.querySelector(".customize-menu")
+        ).transform === defaultPos,
+      "Customize Menu should be visible on screen"
+    );
+
+    // Test close button.
+    let closeButton = content.document.querySelector(".close-button");
+    closeButton.click();
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.getComputedStyle(
+          content.document.querySelector(".customize-menu")
+        ).transform !== defaultPos,
+      "Customize Menu should not be visible anymore"
+    );
+
+    // Reopen the customize menu
+    customizeButton.click();
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.getComputedStyle(
+          content.document.querySelector(".customize-menu")
+        ).transform === defaultPos,
+      "Customize Menu should be visible on screen now"
+    );
+
+    // Test that clicking the shortcuts toggle will make the section appear on the newtab page.
+    let shortcutsSwitch = content.document.querySelector(
+      "#shortcuts-section .switch"
+    );
+    let shortcutsSection = content.document.querySelector(
+      "section[data-section-id='topsites']"
+    );
+    Assert.ok(
+      !Services.prefs.getBoolPref(TOPSITES_PREF),
+      "Topsites are turned off"
+    );
+    Assert.ok(!shortcutsSection, "Shortcuts section is not rendered");
+
+    let prefPromise = ContentTaskUtils.waitForCondition(
+      () => Services.prefs.getBoolPref(TOPSITES_PREF),
+      "TopSites pref is turned on"
+    );
+    shortcutsSwitch.click();
+    await prefPromise;
+
+    Assert.ok(
+      content.document.querySelector("section[data-section-id='topsites']"),
+      "Shortcuts section is rendered"
+    );
+
+    // Test that clicking the pocket toggle will make the pocket section appear on the newtab page
+    let pocketSwitch = content.document.querySelector(
+      "#pocket-section .switch"
+    );
+    Assert.ok(
+      !Services.prefs.getBoolPref(TOPSTORIES_PREF),
+      "Pocket pref is turned off"
+    );
+    Assert.ok(
+      !content.document.querySelector("section[data-section-id='topstories']"),
+      "Pocket section is not rendered"
+    );
+
+    prefPromise = ContentTaskUtils.waitForCondition(
+      () => Services.prefs.getBoolPref(TOPSTORIES_PREF),
+      "Pocket pref is turned on"
+    );
+    pocketSwitch.click();
+    await prefPromise;
+
+    Assert.ok(
+      content.document.querySelector("section[data-section-id='topstories']"),
+      "Pocket section is rendered"
+    );
+
+    // Test that clicking the recent activity toggle will make the recent activity section appear on the newtab page
+    let highlightsSwitch = content.document.querySelector(
+      "#recent-section .switch"
+    );
+    Assert.ok(
+      !Services.prefs.getBoolPref(HIGHLIGHTS_PREF),
+      "Highlights pref is turned off"
+    );
+    Assert.ok(
+      !content.document.querySelector("section[data-section-id='highlights']"),
+      "Highlights section is not rendered"
+    );
+
+    prefPromise = ContentTaskUtils.waitForCondition(
+      () => Services.prefs.getBoolPref(HIGHLIGHTS_PREF),
+      "Highlights pref is turned on"
+    );
+    highlightsSwitch.click();
+    await prefPromise;
+
+    Assert.ok(
+      content.document.querySelector("section[data-section-id='highlights']"),
+      "Highlights section is rendered"
+    );
+
+    // Test that clicking the snippets toggle will flip the snippets pref
+    // note: Snippets are disabled in tests.
+    let snippetsSwitch = content.document.querySelector(
+      "#snippets-section .switch"
+    );
+    Assert.ok(
+      !Services.prefs.getBoolPref(SNIPPETS_PREF),
+      "Snippets pref is turned off"
+    );
+
+    prefPromise = ContentTaskUtils.waitForCondition(
+      () => Services.prefs.getBoolPref(SNIPPETS_PREF),
+      "Snippets pref is turned on after click"
+    );
+    snippetsSwitch.click();
+    await prefPromise;
+
+    prefPromise = ContentTaskUtils.waitForCondition(
+      () => !Services.prefs.getBoolPref(SNIPPETS_PREF),
+      "Snippets pref is turned on after click"
+    );
+    snippetsSwitch.click();
+    await prefPromise;
+  },
+  async after() {
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.customizationMenu.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.feeds.topsites"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.feeds.section.topstories"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.feeds.section.highlights"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.feeds.snippets"
+    );
+  },
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_customize_menu_render.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_customize_menu_render.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_customize_menu_render.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_customize_menu_render.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,183 @@
+"use strict";
+
+// Test that the customization menu is rendered when
+// the parent pref is set to true even if the customize
+// menu specific pref is false.
+test_newtab({
+  async before({ pushPrefs }) {
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled",
+      true,
+    ]);
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.customizationMenu.enabled",
+      false,
+    ]);
+  },
+  test: async function test_render_customizeMenu() {
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".personalize-button"),
+      "Wait for personalize button to load on the newtab page"
+    );
+
+    let defaultPos = "matrix(1, 0, 0, 1, 0, 0)";
+    ok(
+      content.getComputedStyle(
+        content.document.querySelector(".customize-menu")
+      ).transform !== defaultPos,
+      "Customize Menu should be rendered, but not visible yet"
+    );
+
+    let customizeButton = content.document.querySelector(".personalize-button");
+    customizeButton.click();
+
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.getComputedStyle(
+          content.document.querySelector(".customize-menu")
+        ).transform === defaultPos,
+      "Customize Menu should be visible now"
+    );
+  },
+  async after() {
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.customizationMenu.enabled"
+    );
+  },
+});
+
+// Test that the customization menu is rendered when the parent
+// pref is set to false and the customize menu specific pref is
+// set to true.
+test_newtab({
+  async before({ pushPrefs }) {
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled",
+      false,
+    ]);
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.customizationMenu.enabled",
+      true,
+    ]);
+  },
+  test: async function test_render_customizeMenu() {
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".personalize-button"),
+      "Wait for personalize button to load on the newtab page"
+    );
+
+    let defaultPos = "matrix(1, 0, 0, 1, 0, 0)";
+    ok(
+      content.getComputedStyle(
+        content.document.querySelector(".customize-menu")
+      ).transform !== defaultPos,
+      "Customize Menu should be rendered, but not visible"
+    );
+
+    let customizeButton = content.document.querySelector(".personalize-button");
+    customizeButton.click();
+
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.getComputedStyle(
+          content.document.querySelector(".customize-menu")
+        ).transform === defaultPos,
+      "Customize Menu should be visible now"
+    );
+  },
+  async after() {
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.customizationMenu.enabled"
+    );
+  },
+});
+
+// Test that the customization menu is rendered when both the parent pref and
+// the customize menu specific pref is set to true.
+test_newtab({
+  async before({ pushPrefs }) {
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled",
+      true,
+    ]);
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.customizationMenu.enabled",
+      true,
+    ]);
+  },
+  test: async function test_render_customizeMenu() {
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".personalize-button"),
+      "Wait for personalize button to load on the newtab page"
+    );
+
+    let defaultPos = "matrix(1, 0, 0, 1, 0, 0)";
+    ok(
+      content.getComputedStyle(
+        content.document.querySelector(".customize-menu")
+      ).transform !== defaultPos,
+      "Customize Menu should be rendered, but not visible"
+    );
+
+    let customizeButton = content.document.querySelector(".personalize-button");
+    customizeButton.click();
+
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".customize-menu"),
+      "Customize Menu should be rendered now"
+    );
+  },
+  async after() {
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.customizationMenu.enabled"
+    );
+  },
+});
+
+// Test that the customization menu is not rendered when both the parent pref and
+// the customize menu specific pref is set to false.
+test_newtab({
+  async before({ pushPrefs }) {
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled",
+      false,
+    ]);
+    await pushPrefs([
+      "browser.newtabpage.activity-stream.customizationMenu.enabled",
+      false,
+    ]);
+  },
+  test: async function test_render_customizeMenu() {
+    await ContentTaskUtils.waitForCondition(
+      () => content.document.querySelector(".prefs-button .icon"),
+      "Prefs button should exist"
+    );
+
+    ok(
+      !content.document.querySelector(".personalize-button"),
+      "personalize button should not be rendered"
+    );
+
+    ok(
+      !content.document.querySelector(".customize-menu"),
+      "Customize Menu should not be rendered"
+    );
+  },
+  async after() {
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.newNewtabExperience.enabled"
+    );
+    Services.prefs.clearUserPref(
+      "browser.newtabpage.activity-stream.customizationMenu.enabled"
+    );
+  },
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser.ini firefox-85.0+build1/browser/components/newtab/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,7 @@
   browser.newtabpage.activity-stream.feeds.system.topstories=true
   browser.newtabpage.activity-stream.feeds.section.topstories=true
   browser.newtabpage.activity-stream.feeds.section.topstories.options={"provider_name":""}
+  messaging-system.log=all
 
 [browser_aboutwelcome_actors.js]
 [browser_aboutwelcome_simplified.js]
@@ -31,6 +32,7 @@
 [browser_discovery_styles.js]
 [browser_enabled_newtabpage.js]
 [browser_highlights_section.js]
+[browser_newtab_experiment_api.js]
 [browser_discovery_card.js]
 [browser_getScreenshots.js]
 [browser_newtab_overrides.js]
@@ -49,3 +51,5 @@
 [browser_asrouter_group_frequency.js]
 [browser_asrouter_group_userprefs.js]
 [browser_trigger_listeners.js]
+[browser_customize_menu_render.js]
+[browser_customize_menu_content.js]
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_newtab_experiment_api.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_newtab_experiment_api.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_newtab_experiment_api.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_newtab_experiment_api.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,90 @@
+"use strict";
+
+const { ExperimentAPI } = ChromeUtils.import(
+  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+);
+const { ExperimentFakes } = ChromeUtils.import(
+  "resource://testing-common/MSTestUtils.jsm"
+);
+
+/**
+ * Enrolls browser in an experiment with value featureValue and
+ * runs a test in newtab content
+ *
+ * @param {string} slug A slug
+ * @param {NewTabFeatureConfig} featureValue A feature config
+ * @param {NewTabTest} test A new tab test compatible with test_newtab (see head.js)
+ */
+async function testWithExperimentFeatureValue(slug, featureValue, test) {
+  test_newtab({
+    async before() {
+      let updatePromise = ExperimentFakes.waitForExperimentUpdate(
+        ExperimentAPI,
+        {
+          slug,
+        }
+      );
+
+      ExperimentAPI._store.addExperiment({
+        slug,
+        branch: {
+          slug: `${slug}-treatment`,
+          feature: {
+            enabled: true,
+            featureId: "newtab",
+            value: featureValue,
+          },
+        },
+        active: true,
+      });
+
+      await updatePromise;
+    },
+    test,
+    async after() {
+      ExperimentAPI._store._deleteForTests(slug);
+      is(ExperimentAPI._store.getAll().includes(slug), false, "Cleanup done");
+    },
+  });
+}
+
+/**
+ * Test the ExperimentAPI overrides default values.
+ */
+testWithExperimentFeatureValue(
+  `mochitest-newtab-${Date.now()}`,
+  { prefsButtonIcon: "icon-info" },
+  async function check_icon_changes_with_experiment() {
+    let el = content.document.querySelector(".prefs-button .icon");
+    ok(el, "there should be a settings icon");
+
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.document
+          .querySelector(".prefs-button .icon")
+          .classList.contains("icon-info"),
+      "settings icon uses prefsButtonIcon value set in the experiment"
+    );
+  }
+);
+
+/**
+ * Test the ExperimentAPI uses default values for an empty feature config.
+ */
+testWithExperimentFeatureValue(
+  `mochitest-newtab-${Date.now()}`,
+  // Empty feature value should result in using all defaults
+  null,
+  async function check_icon_uses_default() {
+    let el = content.document.querySelector(".prefs-button .icon");
+    ok(el, "there should be a settings icon");
+
+    await ContentTaskUtils.waitForCondition(
+      () =>
+        content.document
+          .querySelector(".prefs-button .icon")
+          .classList.contains("icon-settings"),
+      "settings icon uses default value"
+    );
+  }
+);
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_newtab_overrides.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_newtab_overrides.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_newtab_overrides.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_newtab_overrides.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,6 @@
     aSubject,
     aData
   ) {
-    // jshint unused:false
     Assert.equal(aData, aNewURL, testMessage);
     return true;
   });
@@ -62,7 +61,7 @@
           "activity stream principal should not match systemPrincipal"
         );
       });
-    }); // jshint ignore:line
+    });
   }
 });
 
@@ -87,7 +86,7 @@
     Assert.ok(AboutNewTab.newTabURLOverridden, "url has been overridden");
 
     // simulate a newtab open as a user would
-    BrowserOpenTab(); // jshint ignore:line
+    BrowserOpenTab();
 
     let browser = gBrowser.selectedBrowser;
     await BrowserTestUtils.browserLoaded(browser);
@@ -99,7 +98,7 @@
         args.url.trim(),
         "Got right URL"
       );
-    }); // jshint ignore:line
+    });
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 });
@@ -121,7 +120,7 @@
     Assert.ok(AboutNewTab.newTabURLOverridden, "url has been overridden");
 
     // simulate a newtab open as a user would
-    BrowserOpenTab(); // jshint ignore:line
+    BrowserOpenTab();
 
     let browser = gBrowser.selectedBrowser;
     await BrowserTestUtils.browserLoaded(browser);
@@ -133,7 +132,7 @@
         "about:blank",
         "Got right URL"
       );
-    }); // jshint ignore:line
+    });
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
 });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_topsites_contextMenu_options.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_topsites_contextMenu_options.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_topsites_contextMenu_options.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_topsites_contextMenu_options.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,8 +8,7 @@
   before: setDefaultTopSites,
   // Test verifies the menu options for a default top site.
   test: async function defaultTopSites_menuOptions() {
-    const siteSelector =
-      ".top-site-outer:not(.search-shortcut):not(.placeholder)";
+    const siteSelector = ".top-site-outer:not(.search-shortcut, .placeholder)";
     await ContentTaskUtils.waitForCondition(
       () => content.document.querySelector(siteSelector),
       "Topsite tippytop icon not found"
@@ -48,8 +47,7 @@
   before: setDefaultTopSites,
   // Test verifies that the next top site in queue replaces a dismissed top site.
   test: async function defaultTopSites_dismiss() {
-    const siteSelector =
-      ".top-site-outer:not(.search-shortcut):not(.placeholder)";
+    const siteSelector = ".top-site-outer:not(.search-shortcut, .placeholder)";
     await ContentTaskUtils.waitForCondition(
       () => content.document.querySelector(siteSelector),
       "Topsite tippytop icon not found"
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_topsites_section.js firefox-85.0+build1/browser/components/newtab/test/browser/browser_topsites_section.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/browser_topsites_section.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/browser_topsites_section.js	2021-01-18 19:58:08.000000000 +0000
@@ -31,8 +31,7 @@
   before: setDefaultTopSites,
   // it should pin the website when we click the first option of the topsite context menu.
   test: async function topsites_pin_unpin() {
-    const siteSelector =
-      ".top-site-outer:not(.search-shortcut):not(.placeholder)";
+    const siteSelector = ".top-site-outer:not(.search-shortcut, .placeholder)";
     await ContentTaskUtils.waitForCondition(
       () => content.document.querySelector(siteSelector),
       "Topsite tippytop icon not found"
@@ -188,7 +187,7 @@
 
     return searchTopSites[0].innerText.trim();
   },
-  after(searchTopSiteTag) {
+  async after(searchTopSiteTag) {
     ok(
       gURLBar.focused,
       "We clicked a search topsite the focus should be in location bar"
@@ -199,15 +198,18 @@
         "Should contain the tag of the search topsite clicked"
       );
     } else {
-      let engineName = Services.search.getEngineByAlias(searchTopSiteTag).name;
+      let engine = await Services.search.getEngineByAlias(searchTopSiteTag);
+
       // We don't use UrlbarTestUtils.assertSearchMode here since the newtab
       // testing scope doesn't integrate well with UrlbarTestUtils.
-      ok(
-        ObjectUtils.deepEqual(
-          gURLBar.searchMode,
-          { engineName, entry: "topsites_newtab", isPreview: false },
-          "The Urlbar is in search mode."
-        )
+      Assert.deepEqual(
+        gURLBar.searchMode,
+        {
+          engineName: engine.name,
+          entry: "topsites_newtab",
+          isPreview: false,
+        },
+        "The Urlbar is in search mode."
       );
       ok(
         gURLBar.hasAttribute("searchmode"),
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/browser/head.js firefox-85.0+build1/browser/components/newtab/test/browser/head.js
--- firefox-84.0.2+build1/browser/components/newtab/test/browser/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -98,7 +98,7 @@
 // eslint-disable-next-line no-unused-vars
 async function waitForUrlLoad(url) {
   let browser = gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, url);
+  BrowserTestUtils.loadURI(browser, url);
   await BrowserTestUtils.browserLoaded(browser, false, url);
 }
 
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/schemas/pings.js firefox-85.0+build1/browser/components/newtab/test/schemas/pings.js
--- firefox-84.0.2+build1/browser/components/newtab/test/schemas/pings.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/schemas/pings.js	2021-01-18 19:58:08.000000000 +0000
@@ -212,15 +212,6 @@
   })
 );
 
-export const PerfPing = Joi.object().keys(
-  Object.assign({}, baseKeys, {
-    source: Joi.string(),
-    event: Joi.string().required(),
-    action: Joi.valid("activity_stream_performance_event").required(),
-    value: Joi.number().required(),
-  })
-);
-
 export const SessionPing = Joi.object().keys(
   Object.assign({}, baseKeys, {
     session_id: baseKeys.session_id.required(),
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/aboutwelcome/MultiStageAboutWelcome.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/aboutwelcome/MultiStageAboutWelcome.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/aboutwelcome/MultiStageAboutWelcome.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/aboutwelcome/MultiStageAboutWelcome.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -1,4 +1,3 @@
-import { act } from "react-dom/test-utils";
 import { GlobalOverrider } from "test/unit/utils";
 import {
   MultiStageAboutWelcome,
@@ -6,7 +5,10 @@
 } from "content-src/aboutwelcome/components/MultiStageAboutWelcome";
 import React from "react";
 import { shallow, mount } from "enzyme";
-import { DEFAULT_WELCOME_CONTENT } from "content-src/lib/aboutwelcome-utils";
+import {
+  DEFAULT_WELCOME_CONTENT,
+  AboutWelcomeUtils,
+} from "content-src/lib/aboutwelcome-utils";
 
 describe("MultiStageAboutWelcome module", () => {
   let globals;
@@ -22,11 +24,12 @@
   beforeEach(async () => {
     globals = new GlobalOverrider();
     globals.set({
-      AWGetDefaultSites: () => Promise.resolve({}),
+      AWGetDefaultSites: () => Promise.resolve([]),
       AWGetImportableSites: () => Promise.resolve("{}"),
       AWGetSelectedTheme: () => Promise.resolve("automatic"),
       AWSendEventTelemetry: () => {},
       AWWaitForRegionChange: () => Promise.resolve(),
+      AWGetRegion: () => Promise.resolve(),
     });
     sandbox = sinon.createSandbox();
   });
@@ -43,21 +46,41 @@
       assert.ok(wrapper.exists());
     });
 
-    it("should pass activeTheme and initialTheme props to WelcomeScreen", async () => {
-      let wrapper;
+    it("should send <MESSAGEID>_SITES impression telemetry ", async () => {
+      const impressionSpy = sandbox.spy(
+        AboutWelcomeUtils,
+        "sendImpressionTelemetry"
+      );
+      globals.set({
+        AWGetImportableSites: () =>
+          Promise.resolve('["site-1","site-2","site-3","site-4","site-5"]'),
+      });
 
-      await act(async () => {
-        // need to use mount, as shallow doesn't currently support effects
-        wrapper = mount(<MultiStageAboutWelcome {...DEFAULT_PROPS} />);
-
-        // Spin the event loop to allow the useEffect hooks to execute,
-        // any promises to resolve, and re-rendering to happen after the
-        // promises have updated the state/props
-        await new Promise(resolve => setTimeout(resolve, 0));
+      mount(<MultiStageAboutWelcome {...DEFAULT_PROPS} />);
+      // Delay slightly to make sure we've finished executing any promise
+      await new Promise(resolve => setTimeout(resolve, 0));
+
+      assert.calledTwice(impressionSpy);
+      assert.equal(
+        impressionSpy.firstCall.args[0],
+        `${DEFAULT_PROPS.message_id}_${DEFAULT_PROPS.screens[0].id}`
+      );
+      assert.equal(
+        impressionSpy.secondCall.args[0],
+        `${DEFAULT_PROPS.message_id}_SITES`
+      );
+      assert.equal(impressionSpy.secondCall.lastArg.display, "static");
+      assert.equal(impressionSpy.secondCall.lastArg.importable, 5);
+    });
 
-        // sync up enzyme's representation with the real DOM
-        wrapper.update();
-      });
+    it("should pass activeTheme and initialTheme props to WelcomeScreen", async () => {
+      let wrapper = mount(<MultiStageAboutWelcome {...DEFAULT_PROPS} />);
+      // Spin the event loop to allow the useEffect hooks to execute,
+      // any promises to resolve, and re-rendering to happen after the
+      // promises have updated the state/props
+      await new Promise(resolve => setTimeout(resolve, 0));
+      // sync up enzyme's representation with the real DOM
+      wrapper.update();
 
       let welcomeScreenWrapper = wrapper.find(WelcomeScreen);
       assert.strictEqual(welcomeScreenWrapper.prop("activeTheme"), "automatic");
@@ -66,9 +89,55 @@
         "automatic"
       );
     });
+
+    it("should handle primary Action", () => {
+      const stub = sinon.stub(AboutWelcomeUtils, "sendActionTelemetry");
+      let wrapper = mount(<MultiStageAboutWelcome {...DEFAULT_PROPS} />);
+      wrapper.update();
+
+      let welcomeScreenWrapper = wrapper.find(WelcomeScreen);
+      const btnPrimary = welcomeScreenWrapper.find(".primary");
+      btnPrimary.simulate("click");
+      assert.calledOnce(stub);
+      assert.equal(
+        stub.firstCall.args[0],
+        welcomeScreenWrapper.props().messageId
+      );
+      assert.equal(stub.firstCall.args[1], "primary_button");
+    });
   });
 
   describe("WelcomeScreen component", () => {
+    describe("get started screen", () => {
+      const startScreen = DEFAULT_WELCOME_CONTENT.screens.find(screen => {
+        return screen.id === "AW_GET_STARTED";
+      });
+
+      const GET_STARTED_SCREEN_PROPS = {
+        id: startScreen.id,
+        totalNumberofScreens: 1,
+        order: startScreen.order,
+        content: startScreen.content,
+        topSites: [],
+        messageId: `${DEFAULT_PROPS.message_id}_${startScreen.id}`,
+        UTMTerm: DEFAULT_PROPS.utm_term,
+        flowParams: null,
+      };
+
+      it("should render GetStarted Screen", () => {
+        const wrapper = shallow(
+          <WelcomeScreen {...GET_STARTED_SCREEN_PROPS} />
+        );
+        assert.ok(wrapper.exists());
+      });
+
+      it("should have primary and secondary button in the rendered input", () => {
+        const wrapper = mount(<WelcomeScreen {...GET_STARTED_SCREEN_PROPS} />);
+        assert.ok(wrapper.find(".primary"));
+        assert.isTrue(wrapper.find("div.secondary-cta").hasClass("top"));
+        assert.ok(wrapper.find(".secondary"));
+      });
+    });
     describe("theme screen", () => {
       const themeScreen = DEFAULT_WELCOME_CONTENT.screens.find(screen => {
         return screen.id === "AW_CHOOSE_THEME";
@@ -80,7 +149,7 @@
         order: themeScreen.order,
         content: themeScreen.content,
         navigate: null,
-        topSites: {},
+        topSites: [],
         messageId: `${DEFAULT_PROPS.message_id}_${themeScreen.id}`,
         UTMTerm: DEFAULT_PROPS.utm_term,
         flowParams: null,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterChild.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterChild.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterChild.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterChild.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -30,29 +30,6 @@
     asRouterChild = null;
   });
   describe("asRouterMessage", () => {
-    describe("sends telemetry types to telemetry", () => {
-      [
-        msg.AS_ROUTER_TELEMETRY_USER_EVENT,
-        msg.TOOLBAR_BADGE_TELEMETRY,
-        msg.TOOLBAR_PANEL_TELEMETRY,
-        msg.MOMENTS_PAGE_TELEMETRY,
-        msg.DOORHANGER_TELEMETRY,
-      ].forEach(type => {
-        it(`type ${type}`, () => {
-          asRouterChild.asRouterMessage({
-            type,
-            data: {
-              something: 1,
-            },
-          });
-          sandbox.assert.calledOnce(asRouterChild.telemetry.sendTelemetry);
-          sandbox.assert.calledWith(asRouterChild.telemetry.sendTelemetry, {
-            type,
-            data: { something: 1 },
-          });
-        });
-      });
-    });
     describe("uses sendAsyncMessage for types that don't need an async response", () => {
       [
         msg.DISABLE_PROVIDER,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -225,39 +225,6 @@
     });
   });
 
-  describe("Triplet bundle Card", () => {
-    it("should send NEW_TAB_MESSAGE_REQUEST if a bundle card id is blocked or cleared", async () => {
-      sandbox.stub(ASRouterUtils, "sendMessage").resolves();
-      const FAKE_TRIPLETS_BUNDLE_1 = [
-        {
-          id: "CARD_1",
-          content: {
-            title: { string_id: "onboarding-private-browsing-title" },
-            text: { string_id: "onboarding-private-browsing-text" },
-            icon: "icon",
-            primary_button: {
-              label: { string_id: "onboarding-button-label-get-started" },
-              action: {
-                type: "OPEN_URL",
-                data: { args: "https://example.com/" },
-              },
-            },
-          },
-        },
-      ];
-      wrapper.setState({
-        message: { bundle: FAKE_TRIPLETS_BUNDLE_1 },
-      });
-
-      wrapper.instance().clearMessage("CARD_1");
-      assert.calledOnce(ASRouterUtils.sendMessage);
-      assert.calledWithExactly(ASRouterUtils.sendMessage, {
-        type: "NEWTAB_MESSAGE_REQUEST",
-        data: { endpoint: undefined },
-      });
-    });
-  });
-
   describe("impressions", () => {
     function simulateVisibilityChange(value) {
       fakeDocument.visibilityState = value;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterParentProcessMessageHandler.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterParentProcessMessageHandler.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterParentProcessMessageHandler.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterParentProcessMessageHandler.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -121,7 +121,7 @@
     ].forEach(type => {
       it(`telemetry type "${type}" is sent to telemetry`, () => {
         handler.handleCFRAction({
-          type: msg.AS_ROUTER_TELEMETRY_USER_EVENT,
+          type,
           data: { id: 1 },
         });
         assert.calledOnce(config.sendTelemetry);
@@ -129,7 +129,25 @@
       });
     });
   });
-  describe("handleMessage", () => {
+  describe("#handleMessage", () => {
+    it("#default: should throw for unknown msg types", () => {
+      handler.handleMessage("err").then(
+        () => assert.fail("It should not succeed"),
+        () => assert.ok(true)
+      );
+    });
+    describe("#AS_ROUTER_TELEMETRY_USER_EVENT", () => {
+      it("should route AS_ROUTER_TELEMETRY_USER_EVENT to handleTelemetry", async () => {
+        const data = { data: "foo" };
+        await handler.handleMessage(msg.AS_ROUTER_TELEMETRY_USER_EVENT, data);
+
+        assert.calledOnce(handler.handleTelemetry);
+        assert.calledWithExactly(handler.handleTelemetry, {
+          type: msg.AS_ROUTER_TELEMETRY_USER_EVENT,
+          data,
+        });
+      });
+    });
     describe("BLOCK_MESSAGE_BY_ID action", () => {
       it("with preventDismiss returns false", async () => {
         const result = await handler.handleMessage(msg.BLOCK_MESSAGE_BY_ID, {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -87,7 +87,7 @@
       const [
         m1,
         m2,
-        m3,
+        m3 = { id: "m3" },
       ] = await OnboardingMessageProvider.getUntranslatedMessages();
       const checkMessageTargetingStub = sandbox
         .stub(ASRouterTargeting, "checkMessageTargeting")
@@ -118,7 +118,7 @@
       const [
         m1,
         m2,
-        m3,
+        m3 = { id: "m3" },
       ] = await OnboardingMessageProvider.getUntranslatedMessages();
       const checkMessageTargetingStub = sandbox
         .stub(ASRouterTargeting, "checkMessageTargeting")
@@ -149,7 +149,7 @@
       const [
         m1,
         m2,
-        m3,
+        m3 = { id: "m3" },
       ] = await OnboardingMessageProvider.getUntranslatedMessages();
       const checkMessageTargetingStub = sandbox
         .stub(ASRouterTargeting, "checkMessageTargeting")
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouter.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouter.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/ASRouter.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/ASRouter.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -126,8 +126,6 @@
         profileAgeReset: {},
         usesFirefoxSync: false,
         isFxAEnabled: true,
-        trailheadInterrupt: "join",
-        trailheadTriplet: "dynamic",
         sync: {
           desktopDevices: 0,
           mobileDevices: 0,
@@ -186,9 +184,6 @@
     sandbox.spy(ASRouterPreferences, "uninit");
     sandbox.spy(ASRouterPreferences, "addListener");
     sandbox.spy(ASRouterPreferences, "removeListener");
-    sandbox.stub(ASRouterPreferences, "trailheadTriplet").get(() => {
-      return "test";
-    });
     sandbox.replaceGetter(
       ASRouterPreferences,
       "personalizedCfrScores",
@@ -313,6 +308,9 @@
           return fakeTargetingContext.evalWithDefault(expr);
         }
       },
+      RemoteL10n: {
+        isLocaleSupported: () => true,
+      },
     });
     await createRouterAndInit();
   });
@@ -651,7 +649,6 @@
         ASRouterPreferences.getAllUserPreferences()
       );
       assert.deepEqual(state.targetingParameters, {});
-      assert.deepEqual(state.trailhead, ASRouterPreferences.trailhead);
       assert.deepEqual(state.errors, Router.errors);
     });
     it("should not send a message on a state change asrouter.devtoolsEnabled pref is on", async () => {
@@ -1521,26 +1518,6 @@
 
       assert.deepEqual(response.message, message);
     });
-    it("should send an empty object message if no bundle is available", async () => {
-      // force the only message to be a bundled message that needs 2 messages in the bundle
-      await Router.setState({
-        messages: [
-          {
-            id: "foo1",
-            groups: ["snippets"],
-            provider: "snippets",
-            template: "simple_template",
-            bundled: 2,
-            content: { title: "Foo1", body: "Foo123-1" },
-          },
-        ],
-      });
-      let response = await Router.sendNewTabMessage({
-        tabId: 0,
-        browser: {},
-      });
-      assert.deepEqual(response.message, {});
-    });
     it("should send an empty object message if no messages are available", async () => {
       await Router.setState({ messages: [] });
       let response = await Router.sendNewTabMessage({
@@ -1609,89 +1586,6 @@
       });
     });
 
-    it("should handle onboarding message provider", async () => {
-      const handleMessageRequestStub = sandbox.stub(
-        Router,
-        "handleMessageRequest"
-      );
-      handleMessageRequestStub
-        .withArgs({
-          template: "extended_triplets",
-        })
-        .resolves({ id: "foo" });
-      sandbox.stub(Router, "sendNewTabMessage").resolves();
-      await Router.sendNewTabMessage({
-        tabId: 0,
-        browser: {},
-      });
-
-      assert.calledOnce(Router.sendNewTabMessage);
-    });
-    it("should hide extended triplets by default when browser.aboutwelcome.enabled is true", async () => {
-      const handleMessageRequestStub = sandbox.stub(
-        Router,
-        "handleMessageRequest"
-      );
-      handleMessageRequestStub
-        .withArgs({
-          template: "extended_triplets",
-        })
-        .resolves({ id: "foo" });
-      await Router.sendNewTabMessage({
-        tabId: 0,
-        browser: {},
-      });
-
-      assert.calledOnce(handleMessageRequestStub);
-      assert.calledWithExactly(handleMessageRequestStub, {
-        provider: "snippets",
-      });
-    });
-    it("should show extended triplets when browser.aboutwelcome.enabled is false", async () => {
-      globals.set({ isSeparateAboutWelcome: false });
-      const handleMessageRequestStub = sandbox.stub(
-        Router,
-        "handleMessageRequest"
-      );
-      handleMessageRequestStub
-        .withArgs({
-          template: "extended_triplets",
-        })
-        .resolves({ id: "foo" });
-      await Router.sendNewTabMessage({
-        tabId: 0,
-        browser: {},
-      });
-
-      assert.calledOnce(handleMessageRequestStub);
-      assert.calledWithExactly(handleMessageRequestStub, {
-        template: "extended_triplets",
-      });
-    });
-    it("should fallback to snippets if onboarding message provider returned none when browser.aboutwelcome.enabled is false", async () => {
-      globals.set({ isSeparateAboutWelcome: false });
-      const handleMessageRequestStub = sandbox.stub(
-        Router,
-        "handleMessageRequest"
-      );
-      handleMessageRequestStub
-        .withArgs({
-          template: "extended_triplets",
-        })
-        .resolves(null);
-      await Router.sendNewTabMessage({
-        tabId: 0,
-        browser: {},
-      });
-
-      assert.calledTwice(handleMessageRequestStub);
-      assert.calledWithExactly(handleMessageRequestStub, {
-        template: "extended_triplets",
-      });
-      assert.calledWithExactly(handleMessageRequestStub, {
-        provider: "snippets",
-      });
-    });
     it("should record telemetry for message request duration", async () => {
       const startTelemetryStopwatch = sandbox.stub(
         global.TelemetryStopwatch,
@@ -1754,65 +1648,6 @@
   });
 
   describe("#setMessageById", async () => {
-    it("should call _getBundledMessages if we request a message that needs to be bundled", async () => {
-      sandbox.stub(Router, "_getBundledMessages").resolves();
-      // forcefully pick a message which needs to be bundled (the second message in FAKE_LOCAL_MESSAGES)
-      const [, testMessage] = Router.state.messages;
-      await Router.setMessageById({ id: testMessage.id });
-      assert.calledOnce(Router._getBundledMessages);
-    });
-    it("should properly pick another message of the same template if it is bundled; force = true", async () => {
-      // forcefully pick a message which needs to be bundled (the second message in FAKE_LOCAL_MESSAGES)
-      const [, testMessage1, testMessage2] = Router.state.messages;
-      let response = await Router.setMessageById(
-        { id: testMessage1.id },
-        true /* force */
-      );
-
-      // Expected object should have some properties of the original message it picked (testMessage1)
-      // plus the bundled content of the others that it picked of the same template (testMessage2)
-      const expectedObj = {
-        template: testMessage1.template,
-        provider: testMessage1.provider,
-        bundle: [
-          { content: testMessage1.content, id: testMessage1.id, order: 1 },
-          { content: testMessage2.content, id: testMessage2.id },
-        ],
-      };
-
-      assert.deepEqual(response.message, expectedObj);
-    });
-    it("should properly pick another message of the same template if it is bundled; force = false", async () => {
-      // forcefully pick a message which needs to be bundled (the second message in FAKE_LOCAL_MESSAGES)
-      const [, testMessage1, testMessage2] = Router.state.messages;
-
-      ASRouterTargeting.findMatchingMessage.callsFake(({ messages }) => [
-        messages[0],
-      ]);
-
-      let response = await Router.setMessageById(
-        { id: testMessage1.id },
-        false
-      );
-
-      // Expected object should have some properties of the original message it picked (testMessage1)
-      // plus the bundled content of the others that it picked of the same template (testMessage2)
-      const expectedObj = {
-        template: testMessage1.template,
-        provider: testMessage1.provider,
-        bundle: [
-          { content: testMessage1.content, id: testMessage1.id, order: 1 },
-          {
-            content: testMessage2.content,
-            id: testMessage2.id,
-            order: 2,
-            blockOnClick: false,
-          },
-        ],
-      };
-
-      assert.deepEqual(response.message, expectedObj);
-    });
     it("should send an empty message if provided id did not resolve to a message", async () => {
       let response = await Router.setMessageById({ id: -1 }, true, {});
       assert.deepEqual(response.message, {});
@@ -1917,33 +1752,33 @@
     });
   });
 
-  describe("#sendMessage", () => {
-    it("should allow for echoing back message modifications", async () => {
+  describe("#routeCFRMessage", () => {
+    it("should allow for echoing back message modifications", () => {
       const message = { somekey: "some value" };
       const data = { content: message };
       const browser = {};
-      let msg = await Router.sendMessage(data.content, data, false, browser);
+      let msg = Router.routeCFRMessage(data.content, browser, data, false);
       assert.deepEqual(msg.message, message);
     });
     it("should call CFRPageActions.forceRecommendation if the template is cfr_action and force is true", async () => {
       sandbox.stub(CFRPageActions, "forceRecommendation");
       const testMessage = { id: "foo", template: "cfr_doorhanger" };
       await Router.setState({ messages: [testMessage] });
-      await Router.sendMessage(testMessage, null, true, {});
+      Router.routeCFRMessage(testMessage, {}, null, true);
 
       assert.calledOnce(CFRPageActions.forceRecommendation);
     });
     it("should call BookmarkPanelHub.forceShowMessage the provider is cfr-fxa", async () => {
       const testMessage = { id: "foo", template: "fxa_bookmark_panel" };
       await Router.setState({ messages: [testMessage] });
-      await Router.sendMessage(testMessage, null, true, {});
+      Router.routeCFRMessage(testMessage, {}, null, true);
       assert.calledOnce(FakeBookmarkPanelHub.forceShowMessage);
     });
     it("should call CFRPageActions.addRecommendation if the template is cfr_action and force is false", async () => {
       sandbox.stub(CFRPageActions, "addRecommendation");
       const testMessage = { id: "foo", template: "cfr_doorhanger" };
       await Router.setState({ messages: [testMessage] });
-      await Router.sendMessage(testMessage, {}, false, {});
+      Router.routeCFRMessage(testMessage, {}, {}, false);
       assert.calledOnce(CFRPageActions.addRecommendation);
     });
   });
@@ -1956,7 +1791,6 @@
         providerPrefs: ASRouterPreferences.providers,
         userPrefs: ASRouterPreferences.getAllUserPreferences(),
         targetingParameters: {},
-        trailheadTriplet: ASRouterPreferences.trailheadTriplet,
         errors: Router.errors,
       });
 
@@ -2132,48 +1966,6 @@
     });
   });
 
-  describe("_getBundledMessages", () => {
-    it("should return a null bundle if we do not have enough messages to fill the bundle", async () => {
-      // force the only message to be a bundled message that needs 2 messages in the bundle
-      await Router.setState({
-        messages: [
-          {
-            id: "foo1",
-            template: "simple_template",
-            bundled: 2,
-            content: { title: "Foo1", body: "Foo123-1" },
-            groups: ["bundle"],
-            provider: "snippets",
-          },
-        ],
-        providers: [{ id: "snippets" }],
-      });
-      const bundle = await Router._getBundledMessages(Router.state.messages[0]);
-      assert.equal(bundle, null);
-    });
-    it("should send down extra attributes in the bundle if they exist", async () => {
-      sandbox.stub(Router, "_findProvider").returns({
-        getExtraAttributes() {
-          return Promise.resolve({ header: "header" });
-        },
-      });
-      await Router.setState({
-        messages: [
-          {
-            id: "foo1",
-            template: "simple_template",
-            bundled: 1,
-            content: { title: "Foo1", body: "Foo123-1" },
-            groups: ["snippets"],
-          },
-        ],
-        providers: [{ id: "snippets" }],
-      });
-      const result = await Router._getBundledMessages(Router.state.messages[0]);
-      assert.equal(result.extraTemplateStrings.header, "header");
-    });
-  });
-
   describe("forceAttribution", () => {
     let setReferrerUrl;
     beforeEach(() => {
@@ -3055,4 +2847,52 @@
       assert.lengthOf(result.messages, 0);
     });
   });
+  describe("#_remoteSettingsLoader", () => {
+    let provider;
+    let spy;
+    beforeEach(() => {
+      provider = {
+        id: "cfr",
+        bucket: "cfr",
+      };
+      sandbox
+        .stub(MessageLoaderUtils, "_getRemoteSettingsMessages")
+        .resolves([{ id: "message_1" }]);
+      spy = sandbox.spy();
+      global.Downloader.prototype.download = spy;
+    });
+    it("should allow fetch for known locales", async () => {
+      sandbox
+        .stub(global.Services.locale, "appLocaleAsBCP47")
+        .get(() => "en-US");
+      sandbox.stub(global.RemoteL10n, "isLocaleSupported").returns(true);
+
+      await MessageLoaderUtils._remoteSettingsLoader(provider, {});
+
+      assert.calledOnce(spy);
+    });
+    it("should fallback to 'en-US' for locale 'und' ", async () => {
+      sandbox.stub(global.Services.locale, "appLocaleAsBCP47").get(() => "und");
+      sandbox.stub(global.RemoteL10n, "isLocaleSupported").returns(false);
+      const getRecordSpy = sandbox.spy(
+        global.KintoHttpClient.prototype,
+        "getRecord"
+      );
+
+      await MessageLoaderUtils._remoteSettingsLoader(provider, {});
+
+      assert.ok(getRecordSpy.args[0][0].includes("en-US"));
+      assert.calledOnce(spy);
+    });
+    it("should not allow fetch for unsupported locales", async () => {
+      sandbox
+        .stub(global.Services.locale, "appLocaleAsBCP47")
+        .get(() => "unkown");
+      sandbox.stub(global.RemoteL10n, "isLocaleSupported").returns(false);
+
+      await MessageLoaderUtils._remoteSettingsLoader(provider, {});
+
+      assert.notCalled(spy);
+    });
+  });
 });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,7 @@
   it("should have a message", () => {
     // Careful: when changing this number make sure that new messages also go
     // through schema verifications.
-    assert.lengthOf(messages, 18);
+    assert.lengthOf(messages, 13);
   });
   it("should be a valid message", () => {
     const fxaMessages = messages.filter(
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/RemoteL10n.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -149,4 +149,15 @@
       assert.equal(el.textContent, "foo");
     });
   });
+  describe("#isLocaleSupported", () => {
+    it("should return true if the locale is en-US", () => {
+      assert.ok(RemoteL10n.isLocaleSupported("en-US"));
+    });
+    it("should return true if the locale is in all-locales", () => {
+      assert.ok(RemoteL10n.isLocaleSupported("en-CA"));
+    });
+    it("should return false if the locale is not in all-locales", () => {
+      assert.ok(!RemoteL10n.isLocaleSupported("und"));
+    });
+  });
 });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/TargetingDocs.test.js firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/TargetingDocs.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/TargetingDocs.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/TargetingDocs.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,7 @@
 // The following targeting parameters are either deprecated or should not be included in the docs for some reason.
 const SKIP_DOCS = [];
 // These are extra message context attributes via ASRouter.jsm
-const MESSAGE_CONTEXT_ATTRIBUTES = ["previousSessionEnd", "trailheadTriplet"];
+const MESSAGE_CONTEXT_ATTRIBUTES = ["previousSessionEnd"];
 
 function getHeadingsFromDocs() {
   const re = /### `(\w+)`/g;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/templates/FirstRun.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/templates/FirstRun.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/templates/FirstRun.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/templates/FirstRun.test.jsx	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-import {
-  FirstRun,
-  FLUENT_FILES,
-} from "content-src/asrouter/templates/FirstRun/FirstRun";
-import { Triplets } from "content-src/asrouter/templates/FirstRun/Triplets";
-import { OnboardingMessageProvider } from "lib/OnboardingMessageProvider.jsm";
-import { mount } from "enzyme";
-import React from "react";
-
-const FAKE_TRIPLETS_BUNDLE_1 = [
-  {
-    id: "CARD_1",
-    content: {
-      title: { string_id: "onboarding-private-browsing-title" },
-      text: { string_id: "onboarding-private-browsing-text" },
-      icon: "icon",
-      primary_button: {
-        label: { string_id: "onboarding-button-label-get-started" },
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://example.com/" },
-        },
-      },
-    },
-  },
-];
-
-const FAKE_TRIPLETS_BUNDLE_2 = [
-  {
-    id: "CARD_2",
-    content: {
-      title: { string_id: "onboarding-data-sync-title" },
-      text: { string_id: "onboarding-data-sync-text2" },
-      icon: "icon",
-      primary_button: {
-        label: { string_id: "onboarding-data-sync-button2" },
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://foo.com/" },
-        },
-      },
-    },
-  },
-];
-
-const FAKE_FLOW_PARAMS = {
-  deviceId: "foo",
-  flowId: "abc1",
-  flowBeginTime: 1234,
-};
-
-async function getTestMessage(id, requestNewBundle) {
-  const message = (
-    await OnboardingMessageProvider.getUntranslatedMessages()
-  ).find(msg => msg.id === id);
-
-  // Simulate dynamic triplets by returning a different bundle
-  if (requestNewBundle) {
-    return { ...message, bundle: FAKE_TRIPLETS_BUNDLE_2 };
-  }
-  return { ...message, bundle: FAKE_TRIPLETS_BUNDLE_1 };
-}
-
-describe("<FirstRun>", () => {
-  let wrapper;
-  let message;
-  let fakeDoc;
-  let sandbox;
-  let clock;
-  let onBlockByIdStub;
-
-  async function setup() {
-    sandbox = sinon.createSandbox();
-    clock = sandbox.useFakeTimers();
-    message = await getTestMessage("EXTENDED_TRIPLETS_1");
-    fakeDoc = {
-      body: document.createElement("body"),
-      head: document.createElement("head"),
-      createElement: type => document.createElement(type),
-      getElementById: () => document.createElement("div"),
-      activeElement: document.createElement("div"),
-    };
-    onBlockByIdStub = sandbox.stub();
-
-    sandbox
-      .stub(global, "fetch")
-      .withArgs("http://fake.com/endpoint")
-      .resolves({
-        ok: true,
-        status: 200,
-        json: () => Promise.resolve(FAKE_FLOW_PARAMS),
-      });
-
-    wrapper = mount(
-      <FirstRun
-        message={message}
-        document={fakeDoc}
-        dispatch={() => {}}
-        sendUserActionTelemetry={() => {}}
-        onBlockById={onBlockByIdStub}
-      />
-    );
-  }
-
-  beforeEach(setup);
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it("should render", () => {
-    assert.ok(wrapper);
-  });
-  describe("with triplets", () => {
-    it("should render triplets", () => {
-      assert.lengthOf(wrapper.find(Triplets), 1, "<Triplets>");
-    });
-    it("should show the card panel and the content on the Triplets", () => {
-      const tripletsProps = wrapper.find(Triplets).props();
-      assert.propertyVal(tripletsProps, "showCardPanel", true);
-    });
-    it("should set the UTM term to trailhead-cards-card (for the extended-triplet message)", () => {
-      const tProps = wrapper.find(Triplets).props();
-      assert.propertyVal(tProps, "UTMTerm", "trailhead-cards-card");
-    });
-  });
-
-  describe("with no triplets", () => {
-    it("should render empty", () => {
-      message = { type: "FOO_123" };
-      wrapper = mount(<FirstRun message={message} document={fakeDoc} />);
-
-      assert.isTrue(wrapper.isEmptyRender());
-    });
-  });
-
-  it("should pass along executeAction appropriately", () => {
-    const stub = sandbox.stub();
-    wrapper = mount(
-      <FirstRun message={message} document={fakeDoc} executeAction={stub} />
-    );
-    assert.propertyVal(wrapper.find(Triplets).props(), "onAction", stub);
-  });
-
-  it("should load flow params on mount if fxaEndpoint is defined", () => {
-    const stub = sandbox.stub();
-    wrapper = mount(
-      <FirstRun
-        message={message}
-        document={fakeDoc}
-        fetchFlowParams={stub}
-        fxaEndpoint="https://foo.com"
-      />
-    );
-    assert.calledOnce(stub);
-  });
-
-  it("should load flow params onUpdate if fxaEndpoint is not defined on mount and then later defined", () => {
-    const stub = sandbox.stub();
-    wrapper = mount(
-      <FirstRun message={message} document={fakeDoc} fetchFlowParams={stub} />
-    );
-    assert.notCalled(stub);
-    wrapper.setProps({ fxaEndpoint: "https://foo.com" });
-    assert.calledOnce(stub);
-  });
-
-  it("should not load flow params again onUpdate if they were already set", () => {
-    const stub = sandbox.stub();
-    wrapper = mount(
-      <FirstRun
-        message={message}
-        document={fakeDoc}
-        fetchFlowParams={stub}
-        fxaEndpoint="https://foo.com"
-      />
-    );
-    wrapper.setProps({ foo: "bar" });
-    wrapper.setProps({ foo: "baz" });
-    assert.calledOnce(stub);
-  });
-
-  it("should load fluent files on mount", () => {
-    assert.lengthOf(fakeDoc.head.querySelectorAll("link"), FLUENT_FILES.length);
-  });
-
-  it("should update didUserClearTriplets state to true on close of triplet", () => {
-    assert.isFalse(wrapper.state().didUserClearTriplets);
-    // Simulate calling close Triplets
-    wrapper
-      .find(Triplets)
-      .find(".icon-dismiss")
-      .simulate("click");
-    assert.isTrue(wrapper.state().didUserClearTriplets);
-  });
-
-  it("should hide triplets when closeTriplets is called and block extended triplets after 500ms", () => {
-    // Simulate calling next scene
-    wrapper
-      .find(Triplets)
-      .find(".icon-dismiss")
-      .simulate("click");
-
-    assert.isFalse(
-      wrapper
-        .find(Triplets)
-        .find(".trailheadCardGrid")
-        .hasClass("show"),
-      "Show triplet content"
-    );
-
-    assert.notCalled(onBlockByIdStub);
-    clock.tick(500);
-    assert.calledWith(onBlockByIdStub, "EXTENDED_TRIPLETS_1");
-  });
-
-  it("should update triplets card when cards in message bundle changes", async () => {
-    let tripletsProps = wrapper.find(Triplets).props();
-    assert.propertyVal(tripletsProps, "cards", FAKE_TRIPLETS_BUNDLE_1);
-
-    const messageWithNewBundle = await getTestMessage("TRAILHEAD_1", true);
-    wrapper.setProps({ message: messageWithNewBundle });
-    tripletsProps = wrapper.find(Triplets).props();
-    assert.propertyVal(tripletsProps, "cards", FAKE_TRIPLETS_BUNDLE_2);
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/templates/Triplets.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/templates/Triplets.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/asrouter/templates/Triplets.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/asrouter/templates/Triplets.test.jsx	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-import { mount } from "enzyme";
-import { Triplets } from "content-src/asrouter/templates/FirstRun/Triplets";
-import { OnboardingCard } from "content-src/asrouter/templates/OnboardingMessage/OnboardingMessage";
-import React from "react";
-
-const CARDS = [
-  {
-    id: "CARD_1",
-    content: {
-      title: { string_id: "onboarding-private-browsing-title" },
-      text: { string_id: "onboarding-private-browsing-text" },
-      icon: "icon",
-      primary_button: {
-        label: { string_id: "onboarding-button-label-get-started" },
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://example.com/" },
-        },
-      },
-    },
-  },
-  {
-    id: "CARD_2",
-    content: {
-      title: "Test title",
-      text: "Test body text",
-      icon: "icon",
-      primary_button: {
-        label: "Test button label",
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://example.com/" },
-        },
-      },
-    },
-  },
-  {
-    id: "CARD_3",
-    content: {
-      title: "Test title with no body text",
-      icon: "icon",
-      primary_button: {
-        label: "Test button label with no body text",
-        action: {
-          type: "OPEN_URL",
-          data: { args: "https://example.com/" },
-        },
-      },
-    },
-  },
-];
-
-describe("<Triplets>", () => {
-  let wrapper;
-  let sandbox;
-  let sendTelemetryStub;
-  let onAction;
-  let onHide;
-  let onBlockById;
-
-  async function setup() {
-    sandbox = sinon.createSandbox();
-    sendTelemetryStub = sandbox.stub();
-    onAction = sandbox.stub();
-    onBlockById = sandbox.stub();
-    onHide = sandbox.stub();
-
-    wrapper = mount(
-      <Triplets
-        cards={CARDS}
-        showCardPanel={true}
-        showContent={true}
-        hideContainer={onHide}
-        onAction={onAction}
-        UTMTerm="trailhead-join-card"
-        onBlockById={onBlockById}
-        sendUserActionTelemetry={sendTelemetryStub}
-      />
-    );
-  }
-
-  beforeEach(setup);
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  it("should add an expanded class to container if props.showCardPanel is true", () => {
-    wrapper.setProps({ showCardPanel: true });
-    assert.isTrue(
-      wrapper.find(".trailheadCards").hasClass("expanded"),
-      "has .expanded)"
-    );
-  });
-  it("should add a collapsed class to container if props.showCardPanel is true", () => {
-    wrapper.setProps({ showCardPanel: false });
-    assert.isFalse(
-      wrapper.find(".trailheadCards").hasClass("expanded"),
-      "has .expanded)"
-    );
-  });
-  it("should send telemetry and call props.hideContainer when the dismiss button is clicked", () => {
-    wrapper.find("button.icon-dismiss").simulate("click");
-    assert.calledOnce(onHide);
-    assert.calledWith(sendTelemetryStub, {
-      event: "DISMISS",
-      message_id: `${CARDS[0].id},${CARDS[1].id},${CARDS[2].id}`,
-      id: "onboarding-cards",
-      action: "onboarding_user_event",
-    });
-  });
-  it("should add utm_* query params to card actions and send the right ping when a card button is clicked", () => {
-    wrapper
-      .find(OnboardingCard)
-      .first()
-      .find("button.onboardingButton")
-      .simulate("click");
-    assert.calledOnce(onAction);
-    const url = onAction.firstCall.args[0].data.args;
-    assert.equal(
-      url,
-      "https://example.com/?utm_source=activity-stream&utm_campaign=firstrun&utm_medium=referral&utm_term=trailhead-join-card"
-    );
-    assert.calledWith(sendTelemetryStub, {
-      event: "CLICK_BUTTON",
-      message_id: CARDS[0].id,
-      id: "TRAILHEAD",
-    });
-  });
-  it("should not call blockById by default when a card button is clicked", () => {
-    wrapper
-      .find(OnboardingCard)
-      .first()
-      .find("button.onboardingButton")
-      .simulate("click");
-    assert.notCalled(onBlockById);
-  });
-  it("should call blockById when blockOnClick on message is true", () => {
-    CARDS[0].blockOnClick = true;
-    wrapper
-      .find(OnboardingCard)
-      .first()
-      .find("button.onboardingButton")
-      .simulate("click");
-    assert.calledOnce(onBlockById);
-    assert.calledWith(onBlockById, CARDS[0].id);
-  });
-  it("Onboarding card without text content should hide onboardingText paragraph", () => {
-    assert.lengthOf(
-      wrapper
-        .find(OnboardingCard)
-        .last()
-        .find("p.onboardingText"),
-      0
-    );
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/common/Actions.test.js firefox-85.0+build1/browser/components/newtab/test/unit/common/Actions.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/common/Actions.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/common/Actions.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -207,22 +207,6 @@
       assert.isFalse(au.isSendToMain(action), "isSendToMain");
     });
   });
-  describe("PerfEvent", () => {
-    it("should include the right data", () => {
-      const data = { action: "foo" };
-      assert.equal(ac.UndesiredEvent(data).data, data);
-    });
-    it("should wrap with AlsoToMain if in UI code", () => {
-      assert.isTrue(
-        au.isSendToMain(ac.PerfEvent({ action: "foo" })),
-        "isSendToMain"
-      );
-    });
-    it("should not wrap with AlsoToMain if not in UI code", () => {
-      const action = ac.PerfEvent({ action: "foo" }, BACKGROUND_PROCESS);
-      assert.isFalse(au.isSendToMain(action), "isSendToMain");
-    });
-  });
   describe("ImpressionStats", () => {
     it("should include the right data", () => {
       const data = { action: "foo" };
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/ASRouterAdmin.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/ASRouterAdmin.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/ASRouterAdmin.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/ASRouterAdmin.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -75,7 +75,7 @@
       assert.equal(
         wrapper
           .find("h2")
-          .at(2)
+          .at(1)
           .text(),
         "Messages"
       );
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/Base.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/Base.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/Base.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/Base.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -1,4 +1,8 @@
-import { _Base as Base, BaseContent } from "content-src/components/Base/Base";
+import {
+  _Base as Base,
+  BaseContent,
+  PrefsButton,
+} from "content-src/components/Base/Base";
 import { ASRouterAdmin } from "content-src/components/ASRouterAdmin/ASRouterAdmin";
 import { ErrorBoundary } from "content-src/components/ErrorBoundary/ErrorBoundary";
 import React from "react";
@@ -91,6 +95,17 @@
     );
   });
 
+  it("should render the PrefsButton component with featureConfig values", () => {
+    const wrapper = shallow(
+      <BaseContent
+        {...DEFAULT_PROPS}
+        Prefs={{ values: { featureConfig: { prefsButtonIcon: "icon-foo" } } }}
+      />
+    );
+    assert.lengthOf(wrapper.find(PrefsButton), 1);
+    assert.equal(wrapper.find(PrefsButton).prop("icon"), "icon-foo");
+  });
+
   it("should render only search if no Sections are enabled", () => {
     const onlySearchProps = Object.assign({}, DEFAULT_PROPS, {
       Sections: [{ id: "highlights", enabled: false }],
@@ -101,3 +116,16 @@
     assert.lengthOf(wrapper.find(".only-search"), 1);
   });
 });
+
+describe("<PrefsButton>", () => {
+  it("should render icon-settings if props.icon is empty", () => {
+    const wrapper = shallow(<PrefsButton icon="" />);
+
+    assert.isTrue(wrapper.find("button").hasClass("icon-settings"));
+  });
+  it("should render props.icon as a className", () => {
+    const wrapper = shallow(<PrefsButton icon="icon-happy" />);
+
+    assert.isTrue(wrapper.find("button").hasClass("icon-happy"));
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/CustomiseMenu.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,40 @@
+import { actionCreators as ac } from "common/Actions.jsm";
+import { ContentSection } from "content-src/components/CustomizeMenu/ContentSection/ContentSection";
+import { shallow } from "enzyme";
+import React from "react";
+
+const DEFAULT_PROPS = {
+  enabledSections: {},
+  dispatch: sinon.stub(),
+  setPref: sinon.stub(),
+};
+
+describe("ContentSection", () => {
+  let wrapper;
+  beforeEach(() => {
+    wrapper = shallow(<ContentSection {...DEFAULT_PROPS} />);
+  });
+
+  it("should render the component", () => {
+    assert.ok(wrapper.exists());
+  });
+
+  it("should dispatch UserEvent for INPUT", () => {
+    wrapper.instance().onPreferenceSelect({
+      target: {
+        nodeName: "INPUT",
+        checked: true,
+        getAttribute: attribute => attribute,
+      },
+    });
+
+    assert.calledWith(
+      DEFAULT_PROPS.dispatch,
+      ac.UserEvent({
+        event: "PREF_CHANGED",
+        source: "eventSource",
+        value: { status: true, menu_source: "CUSTOMIZE_MENU" },
+      })
+    );
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamBase.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamBase.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamBase.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamBase.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -277,6 +277,13 @@
         .type(),
       CollapsibleSection
     );
+    assert.equal(
+      wrapper
+        .children()
+        .at(0)
+        .props().eventSource,
+      "CARDGRID"
+    );
   });
 
   it("should render a Message component", () => {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/Navigation.test.jsx firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/Navigation.test.jsx
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/Navigation.test.jsx	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/Navigation.test.jsx	2021-01-18 19:58:08.000000000 +0000
@@ -27,7 +27,27 @@
   it("should render a title", () => {
     wrapper.setProps({ header: { title: "Foo" } });
 
-    assert.equal(wrapper.find(".ds-header").text(), "Foo");
+    assert.equal(wrapper.find(".ds-navigation-header").text(), "Foo");
+  });
+
+  it("should not render a title", () => {
+    wrapper.setProps({ header: null });
+
+    assert.lengthOf(wrapper.find(".ds-navigation-header"), 0);
+  });
+
+  it("should set default alignment", () => {
+    assert.lengthOf(wrapper.find(".ds-navigation-centered"), 1);
+  });
+
+  it("should set custom alignment", () => {
+    wrapper.setProps({ alignment: "left-align" });
+
+    assert.lengthOf(wrapper.find(".ds-navigation-left-align"), 1);
+  });
+
+  it("should set default of no links", () => {
+    assert.lengthOf(wrapper.find("ul").children(), 0);
   });
 
   it("should render a FluentOrText", () => {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/AboutPreferences.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/AboutPreferences.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/AboutPreferences.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/AboutPreferences.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
   AboutPreferences,
   PREFERENCES_LOADED_EVENT,
 } from "lib/AboutPreferences.jsm";
-import { actionTypes as at } from "common/Actions.jsm";
+import { actionTypes as at, actionCreators as ac } from "common/Actions.jsm";
 import { GlobalOverrider } from "test/unit/utils";
 
 describe("AboutPreferences Feed", () => {
@@ -261,18 +261,70 @@
 
         assert.calledWith(node.setAttribute, "data-l10n-id", titleString);
       });
-      it("should add a link for top stories", () => {
-        const href = "https://disclaimer/";
+    });
+    describe("top stories", () => {
+      const href = "https://disclaimer/";
+      const eventSource = "https://disclaimer/";
+      beforeEach(() => {
         prefStructure = [
           {
             id: "topstories",
             pref: { feed: "feed", learnMore: { link: { href } } },
+            eventSource,
           },
         ];
-
+      });
+      it("should add a link for top stories", () => {
         testRender();
         assert.calledWith(node.setAttribute, "href", href);
       });
+      it("should setup a user event for top stories eventSource", () => {
+        sinon.spy(instance, "setupUserEvent");
+        testRender();
+        assert.calledWith(node.addEventListener, "command");
+        assert.calledWith(instance.setupUserEvent, node, eventSource);
+      });
+      it("should setup a user event for top stories nested pref eventSource", () => {
+        sinon.spy(instance, "setupUserEvent");
+        prefStructure = [
+          {
+            id: "topstories",
+            pref: {
+              feed: "feed",
+              learnMore: { link: { href } },
+              nestedPrefs: [
+                {
+                  name: "showSponsored",
+                  titleString:
+                    "home-prefs-recommended-by-option-sponsored-stories",
+                  icon: "icon-info",
+                  eventSource: "POCKET_SPOCS",
+                },
+              ],
+            },
+          },
+        ];
+        testRender();
+        assert.calledWith(node.addEventListener, "command");
+        assert.calledWith(instance.setupUserEvent, node, "POCKET_SPOCS");
+      });
+      it("should fire store dispatch with onCommand", () => {
+        const element = {
+          addEventListener: (command, action) => {
+            // Trigger the action right away because we only care about testing the action here.
+            action({ target: { checked: true } });
+          },
+        };
+        instance.setupUserEvent(element, eventSource);
+        assert.calledWith(
+          instance.store.dispatch,
+          ac.UserEvent({
+            event: "PREF_CHANGED",
+            source: eventSource,
+            value: { menu_source: "ABOUT_PREFERENCES", status: true },
+          })
+        );
+      });
     });
     describe("description line", () => {
       it("should render a description", () => {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -681,21 +681,6 @@
       const { args } = global.Promise.all.firstCall;
       assert.equal(args[0].length, 3);
     });
-
-    it("should not record the request time if no fetch request was issued", async () => {
-      const fakeComponents = { components: [] };
-      const fakeLayout = [fakeComponents, { components: [{}] }, {}];
-      fakeDiscoveryStream = { DiscoveryStream: { layout: fakeLayout } };
-      fakeCache = {
-        feeds: { "foo.com": { lastUpdated: Date.now(), data: "data" } },
-      };
-      sandbox.stub(feed.cache, "get").returns(Promise.resolve(fakeCache));
-      feed.componentFeedRequestTime = undefined;
-
-      await feed.loadComponentFeeds(feed.store.dispatch);
-
-      assert.isUndefined(feed.componentFeedRequestTime);
-    });
   });
 
   describe("#getComponentFeed", () => {
@@ -1979,14 +1964,10 @@
       sandbox.stub(feed.cache, "set").returns(Promise.resolve());
       setPref(CONFIG_PREF_NAME, { enabled: true });
       sandbox.stub(feed, "loadLayout").returns(Promise.resolve());
-      sandbox.stub(feed, "reportCacheAge").resolves();
-      sandbox.spy(feed, "reportRequestTime");
 
       await feed.onAction({ type: at.INIT });
 
       assert.calledOnce(feed.loadLayout);
-      assert.calledOnce(feed.reportCacheAge);
-      assert.calledOnce(feed.reportRequestTime);
       assert.isTrue(feed.loaded);
     });
   });
@@ -2850,79 +2831,6 @@
     });
   });
 
-  describe("#reportCacheAge", () => {
-    let cache;
-    const cacheAge = 30;
-    beforeEach(() => {
-      cache = {
-        layout: { lastUpdated: Date.now() - 10 * 1000 },
-        feeds: { "foo.com": { lastUpdated: Date.now() - cacheAge * 1000 } },
-        spocs: { lastUpdated: Date.now() - 20 * 1000 },
-      };
-      sandbox.stub(feed.cache, "get").resolves(cache);
-    });
-
-    it("should report the oldest lastUpdated date as the cache age", async () => {
-      sandbox.spy(feed.store, "dispatch");
-      feed.loaded = false;
-      await feed.reportCacheAge();
-
-      assert.calledOnce(feed.store.dispatch);
-
-      const [action] = feed.store.dispatch.firstCall.args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(action.data.event, "DS_CACHE_AGE_IN_SEC");
-      assert.isAtLeast(action.data.value, cacheAge);
-      feed.loaded = true;
-    });
-  });
-
-  describe("#reportRequestTime", () => {
-    let cache;
-    const cacheAge = 30;
-    beforeEach(() => {
-      cache = {
-        layout: { lastUpdated: Date.now() - 10 * 1000 },
-        feeds: { "foo.com": { lastUpdated: Date.now() - cacheAge * 1000 } },
-        spocs: { lastUpdated: Date.now() - 20 * 1000 },
-      };
-      sandbox.stub(feed.cache, "get").resolves(cache);
-    });
-
-    it("should report all the request times", async () => {
-      sandbox.spy(feed.store, "dispatch");
-      feed.loaded = false;
-      feed.layoutRequestTime = 1000;
-      feed.spocsRequestTime = 2000;
-      feed.componentFeedRequestTime = 3000;
-      feed.totalRequestTime = 5000;
-      feed.reportRequestTime();
-
-      assert.equal(feed.store.dispatch.callCount, 4);
-
-      let [action] = feed.store.dispatch.getCall(0).args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(action.data.event, "LAYOUT_REQUEST_TIME");
-      assert.equal(action.data.value, 1000);
-
-      [action] = feed.store.dispatch.getCall(1).args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(action.data.event, "SPOCS_REQUEST_TIME");
-      assert.equal(action.data.value, 2000);
-
-      [action] = feed.store.dispatch.getCall(2).args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(action.data.event, "COMPONENT_FEED_REQUEST_TIME");
-      assert.equal(action.data.value, 3000);
-
-      [action] = feed.store.dispatch.getCall(3).args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(action.data.event, "DS_FEED_TOTAL_REQUEST_TIME");
-      assert.equal(action.data.value, 5000);
-      feed.loaded = true;
-    });
-  });
-
   describe("#loadAffinityScoresCache", () => {
     it("should create an affinity provider from cached affinities", async () => {
       feed._prefCache.config = {
@@ -2999,17 +2907,6 @@
         { item_score: 0.5, min_score: 0.6, score: 0.5 },
       ]);
     });
-    it("should fire dispatchRelevanceScoreDuration if available", async () => {
-      feed.providerSwitcher.dispatchRelevanceScoreDuration = sandbox
-        .stub()
-        .returns();
-      feed._prefCache.config = {
-        personalized: true,
-      };
-      await feed.scoreItems([]);
-
-      assert.calledOnce(feed.providerSwitcher.dispatchRelevanceScoreDuration);
-    });
   });
   describe("#scoreItem", () => {
     it("should call calculateItemRelevanceScore with affinity provider", async () => {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PersonalityProvider/PersonalityProvider.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/PersonalityProvider/PersonalityProvider.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PersonalityProvider/PersonalityProvider.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/PersonalityProvider/PersonalityProvider.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -273,19 +273,13 @@
     });
   });
   describe("#init", () => {
-    beforeEach(() => {
-      sandbox.stub(instance, "dispatch").returns();
-    });
     it("should return early if setInterestConfig fails", async () => {
       sandbox.stub(instance, "setBaseAttachmentsURL").returns();
       sandbox.stub(instance, "setInterestConfig").returns();
       instance.interestConfig = null;
-      await instance.init();
-      assert.calledWithMatch(instance.dispatch, {
-        data: {
-          event: "PERSONALIZATION_V2_GET_RECIPE_ERROR",
-        },
-      });
+      const callback = globals.sandbox.stub();
+      await instance.init(callback);
+      assert.notCalled(callback);
     });
     it("should return early if fetchModels fails", async () => {
       sandbox.stub(instance, "setBaseAttachmentsURL").returns();
@@ -293,12 +287,9 @@
       sandbox.stub(instance, "fetchModels").resolves({
         ok: false,
       });
-      await instance.init();
-      assert.calledWithMatch(instance.dispatch, {
-        data: {
-          event: "PERSONALIZATION_V2_FETCH_MODELS_ERROR",
-        },
-      });
+      const callback = globals.sandbox.stub();
+      await instance.init(callback);
+      assert.notCalled(callback);
     });
     it("should return early if createInterestVector fails", async () => {
       sandbox.stub(instance, "setBaseAttachmentsURL").returns();
@@ -312,12 +303,9 @@
       sandbox.stub(instance, "createInterestVector").resolves({
         ok: false,
       });
-      await instance.init();
-      assert.calledWithMatch(instance.dispatch, {
-        data: {
-          event: "PERSONALIZATION_V2_CREATE_INTEREST_VECTOR_ERROR",
-        },
-      });
+      const callback = globals.sandbox.stub();
+      await instance.init(callback);
+      assert.notCalled(callback);
     });
     it("should call callback on successful init", async () => {
       sandbox.stub(instance, "setBaseAttachmentsURL").returns();
@@ -360,30 +348,6 @@
       assert.calledOnce(instance.setInterestVector);
     });
   });
-  describe("#dispatchRelevanceScoreDuration", () => {
-    beforeEach(() => {
-      sandbox.stub(instance, "dispatch").returns();
-    });
-    it("should dispatch PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION only if initialized", () => {
-      let dispatch = globals.sandbox.stub();
-      instance.dispatch = dispatch;
-
-      instance.initialized = false;
-      instance.dispatchRelevanceScoreDuration(1000);
-
-      assert.notCalled(dispatch);
-
-      instance.initialized = true;
-      instance.dispatchRelevanceScoreDuration(1000);
-
-      assert.calledOnce(dispatch);
-
-      assert.equal(
-        dispatch.firstCall.args[0].data.event,
-        "PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION"
-      );
-    });
-  });
   describe("#calculateItemRelevanceScore", () => {
     it("should return score for uninitialized provider", async () => {
       instance.initialized = false;
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PlacesFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/PlacesFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PlacesFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/PlacesFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -396,7 +396,7 @@
       assert.equal(url.endsWith("sponsor-privacy"), true);
       assert.equal(where, "tab");
     });
-    it("should set the URL bar value to the label value", () => {
+    it("should set the URL bar value to the label value", async () => {
       const locationBar = { search: sandbox.stub() };
       const action = {
         type: at.FILL_SEARCH_TERM,
@@ -404,10 +404,11 @@
         _target: { browser: { ownerGlobal: { gURLBar: locationBar } } },
       };
 
-      feed.fillSearchTopSiteTerm(action);
+      await feed.fillSearchTopSiteTerm(action);
 
       assert.calledOnce(locationBar.search);
       assert.calledWithExactly(locationBar.search, "@Foo", {
+        searchEngine: null,
         searchModeEntry: "topsites_newtab",
       });
     });
@@ -616,6 +617,7 @@
       });
       assert.calledOnce(fakeUrlBar.search);
       assert.calledWith(fakeUrlBar.search, "@google foo", {
+        searchEngine: global.Services.search.defaultEngine,
         searchModeEntry: "handoff",
       });
       assert.notCalled(fakeUrlBar.focus);
@@ -643,6 +645,7 @@
       });
       assert.calledOnce(fakeUrlBar.search);
       assert.calledWith(fakeUrlBar.search, "@bing foo", {
+        searchEngine: global.Services.search.defaultPrivateEngine,
         searchModeEntry: "handoff",
       });
       assert.notCalled(fakeUrlBar.focus);
@@ -670,6 +673,7 @@
       });
       assert.calledOnce(fakeUrlBar.search);
       assert.calledWithExactly(fakeUrlBar.search, "@google foo", {
+        searchEngine: global.Services.search.defaultEngine,
         searchModeEntry: "handoff",
       });
       assert.notCalled(fakeUrlBar.focus);
@@ -696,6 +700,7 @@
       });
       assert.calledOnce(fakeUrlBar.search);
       assert.calledWithExactly(fakeUrlBar.search, "foo", {
+        searchEngine: global.Services.search.defaultEngine,
         searchModeEntry: "handoff",
       });
     });
@@ -751,7 +756,6 @@
         observer.onTitleChanged();
         observer.onFrecencyChanged();
         observer.onManyFrecenciesChanged();
-        observer.onPageChanged();
         observer.onDeleteVisits();
       });
     });
@@ -1108,7 +1112,6 @@
       it("should have a various empty functions for xpconnect happiness", () => {
         observer.onBeginUpdateBatch();
         observer.onEndUpdateBatch();
-        observer.onItemVisited();
         observer.onItemMoved();
         observer.onItemChanged();
       });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PrefsFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/PrefsFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/PrefsFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/PrefsFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -82,6 +82,45 @@
     assert.equal(data.bar, 2);
     assert.isTrue(data.isPrivateBrowsingEnabled);
   });
+  it("should dispatch PREFS_INITIAL_VALUES with a .featureConfig", () => {
+    sandbox.stub(global.ExperimentAPI, "getExperiment").returns({
+      active: true,
+      branch: {
+        slug: "foo",
+        feature: {
+          featureId: "newtab",
+          value: { prefsButtonIcon: "icon-foo" },
+        },
+      },
+    });
+    feed.onAction({ type: at.INIT });
+    assert.equal(
+      feed.store.dispatch.firstCall.args[0].type,
+      at.PREFS_INITIAL_VALUES
+    );
+    const [{ data }] = feed.store.dispatch.firstCall.args;
+    assert.deepEqual(data.featureConfig, { prefsButtonIcon: "icon-foo" });
+  });
+  it("should dispatch PREFS_INITIAL_VALUES with a default feature config if no experiment is returned", () => {
+    sandbox.stub(global.ExperimentAPI, "getExperiment").returns(null);
+    feed.onAction({ type: at.INIT });
+    assert.equal(
+      feed.store.dispatch.firstCall.args[0].type,
+      at.PREFS_INITIAL_VALUES
+    );
+    const [{ data }] = feed.store.dispatch.firstCall.args;
+    assert.deepEqual(data.featureConfig, { prefsButtonIcon: "icon-settings" });
+  });
+  it("should dispatch PREFS_INITIAL_VALUES with a default feature config ExperimentAPI throws", () => {
+    sandbox.stub(global.ExperimentAPI, "getExperiment").throws();
+    feed.onAction({ type: at.INIT });
+    assert.equal(
+      feed.store.dispatch.firstCall.args[0].type,
+      at.PREFS_INITIAL_VALUES
+    );
+    const [{ data }] = feed.store.dispatch.firstCall.args;
+    assert.deepEqual(data.featureConfig, { prefsButtonIcon: "icon-settings" });
+  });
   it("should add one branch observer on init", () => {
     feed.onAction({ type: at.INIT });
     assert.calledOnce(feed._prefs.observeBranch);
@@ -131,6 +170,36 @@
       })
     );
   });
+  it("should send 2 PREF_CHANGED actions when onExperimentUpdated is called", () => {
+    const experimentData = {
+      active: true,
+      slug: "foo",
+      branch: {
+        slug: "boo",
+        feature: {
+          featureId: "newtab",
+          value: { prefsButtonIcon: "icon-boo" },
+        },
+      },
+    };
+    feed.onExperimentUpdated({}, experimentData);
+    assert.calledTwice(feed.store.dispatch);
+    assert.calledWith(
+      feed.store.dispatch,
+      ac.BroadcastToContent({
+        type: at.PREF_CHANGED,
+        data: { name: "experimentData", value: experimentData },
+      })
+    );
+    assert.calledWith(
+      feed.store.dispatch,
+      ac.BroadcastToContent({
+        type: at.PREF_CHANGED,
+        data: { name: "featureConfig", value: { prefsButtonIcon: "icon-boo" } },
+      })
+    );
+  });
+
   it("should set storage pref on UPDATE_SECTION_PREFS", async () => {
     await feed.onAction({
       type: at.UPDATE_SECTION_PREFS,
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/RecommendationProviderSwitcher.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/RecommendationProviderSwitcher.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/RecommendationProviderSwitcher.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/RecommendationProviderSwitcher.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -127,32 +127,6 @@
     });
   });
 
-  describe("#dispatchRelevanceScoreDuration", () => {
-    it("should call dispatchRelevanceScoreDuration if available", () => {
-      feed.affinityProvider = {
-        dispatchRelevanceScoreDuration: sandbox.stub().returns(),
-      };
-      feed.dispatchRelevanceScoreDuration(0);
-      assert.calledWith(
-        feed.affinityProvider.dispatchRelevanceScoreDuration,
-        0
-      );
-    });
-    it("should fire PERSONALIZATION_V1_ITEM_RELEVANCE_SCORE_DURATION", () => {
-      feed.affinityProvider = {};
-      sandbox.spy(feed.store, "dispatch");
-      feed.dispatchRelevanceScoreDuration(0);
-      assert.calledWithMatch(
-        feed.store.dispatch,
-        ac.PerfEvent({
-          event: "PERSONALIZATION_V1_ITEM_RELEVANCE_SCORE_DURATION",
-        })
-      );
-
-      assert.calledOnce(feed.store.dispatch);
-    });
-  });
-
   describe("#calculateItemRelevanceScore", () => {
     it("should use personalized score with affinity provider", async () => {
       const item = {};
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,6 @@
   ASRouterEventPing,
   BasePing,
   ImpressionStatsPing,
-  PerfPing,
   SessionPing,
   SpocsFillPing,
   UndesiredPing,
@@ -102,16 +101,8 @@
     ASRouterPreferences.uninit();
   });
   describe("#init", () => {
-    it("should set preferences in parent process", () => {
-      const testInstance = new TelemetryFeed({ isParentProcess: true });
-      // unfortuntely testing gUUIDGenerator.generateUUID is not possible here
-      // but we still need test coverage
-      assert.isDefined(testInstance);
-    });
-    it("should not set preferences in content process", () => {
-      const testInstance = new TelemetryFeed({ isParentProcess: false });
-      // unfortuntely testing gUUIDGenerator.generateUUID is not possible here
-      // but we still need test coverage
+    it("should create an instance", () => {
+      const testInstance = new TelemetryFeed();
       assert.isDefined(testInstance);
     });
     it("should add .pingCentre, a PingCentre instance", () => {
@@ -639,20 +630,6 @@
         });
       });
     });
-    describe("#createPerformanceEvent", () => {
-      it("should create a valid event without a session", async () => {
-        const action = ac.PerfEvent({
-          event: "SCREENSHOT_FINISHED",
-          value: 100,
-        });
-        const ping = await instance.createPerformanceEvent(action);
-
-        // Is it valid?
-        assert.validate(ping, PerfPing);
-        // Does it have the right value?
-        assert.propertyVal(ping, "value", 100);
-      });
-    });
     describe("#createSessionEndEvent", () => {
       it("should create a valid event", async () => {
         const ping = await instance.createSessionEndEvent({
@@ -916,8 +893,7 @@
       const { ping, pingType } = await instance.applySnippetsPolicy(data);
 
       assert.equal(pingType, "snippets");
-      // XXX Bug 1677723
-      assert.propertyVal(ping, "client_id", FAKE_UUID);
+      assert.propertyVal(ping, "client_id", FAKE_TELEMETRY_ID);
       assert.propertyVal(ping, "message_id", "snippets_message_01");
     });
   });
@@ -1499,16 +1475,6 @@
         });
       });
     });
-    it("should send an event on a TELEMETRY_PERFORMANCE_EVENT action", () => {
-      const sendEvent = sandbox.stub(instance, "sendEvent");
-      const eventCreator = sandbox.stub(instance, "createPerformanceEvent");
-      const action = { type: at.TELEMETRY_PERFORMANCE_EVENT };
-
-      instance.onAction(action);
-
-      assert.calledWith(eventCreator, action);
-      assert.calledWith(sendEvent, eventCreator.returnValue);
-    });
     it("should send an event on a TELEMETRY_IMPRESSION_STATS action", () => {
       const sendEvent = sandbox.stub(instance, "sendStructuredIngestionEvent");
       const eventCreator = sandbox.stub(instance, "createImpressionStats");
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TopSitesFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/TopSitesFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TopSitesFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/TopSitesFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -1963,12 +1963,12 @@
     });
 
     it("should choose the -ru icons for Yandex search shortcut", async () => {
-      sandbox.stub(global.Services.search, "getEngineByAlias").returns({
+      sandbox.stub(global.Services.search, "getEngineByAlias").resolves({
         wrappedJSObject: { _searchForm: "https://www.yandex.ru/" },
       });
 
       const link = { url: "https://yandex.com" };
-      feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
+      await feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
 
       assert.equal(link.tippyTopIcon, "yandex-ru.png");
       assert.equal(link.smallFavicon, "yandex-ru.ico");
@@ -1976,12 +1976,12 @@
     });
 
     it("should choose -com icons for Yandex search shortcut", async () => {
-      sandbox.stub(global.Services.search, "getEngineByAlias").returns({
+      sandbox.stub(global.Services.search, "getEngineByAlias").resolves({
         wrappedJSObject: { _searchForm: "https://www.yandex.com/" },
       });
 
       const link = { url: "https://yandex.com" };
-      feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
+      await feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
 
       assert.equal(link.tippyTopIcon, "yandex.png");
       assert.equal(link.smallFavicon, "yandex.ico");
@@ -1989,10 +1989,10 @@
     });
 
     it("should use the -com icons if can't fetch the search form URL", async () => {
-      sandbox.stub(global.Services.search, "getEngineByAlias").returns(null);
+      sandbox.stub(global.Services.search, "getEngineByAlias").resolves(null);
 
       const link = { url: "https://yandex.com" };
-      feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
+      await feed._attachTippyTopIconForSearchShortcut(link, "@yandex");
 
       assert.equal(link.tippyTopIcon, "yandex.png");
       assert.equal(link.smallFavicon, "yandex.ico");
@@ -2000,12 +2000,12 @@
     });
 
     it("should choose the correct icon for other non-yandex search shortcut", async () => {
-      sandbox.stub(global.Services.search, "getEngineByAlias").returns({
+      sandbox.stub(global.Services.search, "getEngineByAlias").resolves({
         wrappedJSObject: { _searchForm: "https://www.google.com/" },
       });
 
       const link = { url: "https://google.com" };
-      feed._attachTippyTopIconForSearchShortcut(link, "@google");
+      await feed._attachTippyTopIconForSearchShortcut(link, "@google");
 
       assert.equal(link.tippyTopIcon, "google.png");
       assert.equal(link.smallFavicon, "google.ico");
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TopStoriesFeed.test.js firefox-85.0+build1/browser/components/newtab/test/unit/lib/TopStoriesFeed.test.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/lib/TopStoriesFeed.test.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/lib/TopStoriesFeed.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -913,38 +913,6 @@
       let rotated = instance.rotate(items);
       assert.deepEqual(items, rotated);
     });
-    it("should not dispatch ITEM_RELEVANCE_SCORE_DURATION metrics for not personalized", () => {
-      instance.personalized = false;
-      instance.dispatchRelevanceScore(50);
-      assert.notCalled(instance.store.dispatch);
-    });
-    it("should not dispatch v2 ITEM_RELEVANCE_SCORE_DURATION until initialized", () => {
-      instance.personalized = true;
-      instance.affinityProviderV2 = { use_v2: true };
-      instance.affinityProvider = {};
-      instance.dispatchRelevanceScore(50);
-      assert.notCalled(instance.store.dispatch);
-      instance.affinityProvider = { initialized: true };
-      instance.dispatchRelevanceScore(50);
-      assert.calledOnce(instance.store.dispatch);
-      const [action] = instance.store.dispatch.firstCall.args;
-      assert.equal(action.type, "TELEMETRY_PERFORMANCE_EVENT");
-      assert.equal(
-        action.data.event,
-        "PERSONALIZATION_V2_ITEM_RELEVANCE_SCORE_DURATION"
-      );
-    });
-    it("should dispatch v1 ITEM_RELEVANCE_SCORE_DURATION", () => {
-      instance.personalized = true;
-      instance.dispatchRelevanceScore(50);
-      assert.calledOnce(instance.store.dispatch);
-      const [action] = instance.store.dispatch.firstCall.args;
-      assert.equal(action.type, "TELEMETRY_PERFORMANCE_EVENT");
-      assert.equal(
-        action.data.event,
-        "PERSONALIZATION_V1_ITEM_RELEVANCE_SCORE_DURATION"
-      );
-    });
     it("should record top story impressions", async () => {
       instance._prefs = { get: pref => undefined, set: sinon.spy() };
       instance.personalized = true;
@@ -1264,7 +1232,6 @@
       globals.set("NewTabUtils", {
         blockedLinks: { isBlocked: globals.sandbox.spy() },
       });
-      instance.dispatchRelevanceScore = () => {};
 
       const response = {
         settings: { spocsPerNewTabs: 0.5 },
@@ -1345,7 +1312,6 @@
     });
     it("should delay inserting spoc if stories haven't been fetched", async () => {
       let fetchStub = globals.sandbox.stub();
-      instance.dispatchRelevanceScore = () => {};
       instance.dispatchSpocDone = () => {};
       sectionsManagerStub.sections.set("topstories", {
         options: {
@@ -1458,7 +1424,6 @@
     });
     it("should not insert spoc if user opted out", async () => {
       let fetchStub = globals.sandbox.stub();
-      instance.dispatchRelevanceScore = () => {};
       instance.dispatchSpocDone = () => {};
       sectionsManagerStub.sections.set("topstories", {
         options: {
@@ -1730,7 +1695,6 @@
     });
     it("should maintain frequency caps when inserting spocs", async () => {
       let fetchStub = globals.sandbox.stub();
-      instance.dispatchRelevanceScore = () => {};
       instance.dispatchSpocDone = () => {};
       sectionsManagerStub.sections.set("topstories", {
         options: {
@@ -1834,7 +1798,6 @@
     });
     it("should maintain client-side MAX_LIFETIME_CAP", async () => {
       let fetchStub = globals.sandbox.stub();
-      instance.dispatchRelevanceScore = () => {};
       instance.dispatchSpocDone = () => {};
       sectionsManagerStub.sections.set("topstories", {
         options: {
@@ -1961,26 +1924,6 @@
       instance.observe("", "idle-daily");
       assert.isUndefined(instance.affinityProvider);
     });
-    it("should send performance telemetry when updating domain affinities", async () => {
-      instance.getPocketState = () => {};
-      instance.dispatchPocketCta = () => {};
-      instance.init();
-      instance.personalized = true;
-      clock.tick(MIN_DOMAIN_AFFINITIES_UPDATE_TIME);
-      instance.updateSettings({
-        timeSegments: {},
-        domainAffinityParameterSets: {},
-      });
-      await instance.observe("", "idle-daily");
-
-      assert.calledOnce(instance.store.dispatch);
-      let [action] = instance.store.dispatch.firstCall.args;
-      assert.equal(action.type, at.TELEMETRY_PERFORMANCE_EVENT);
-      assert.equal(
-        action.data.event,
-        "topstories.domain.affinity.calculation.ms"
-      );
-    });
     it("should add idle-daily observer right away, before waiting on init data", async () => {
       const addObserver = globals.sandbox.stub();
       globals.set("Services", { obs: { addObserver } });
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/unit/unit-entry.js firefox-85.0+build1/browser/components/newtab/test/unit/unit-entry.js
--- firefox-84.0.2+build1/browser/components/newtab/test/unit/unit-entry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/unit/unit-entry.js	2021-01-18 19:58:08.000000000 +0000
@@ -360,7 +360,7 @@
         searchForm: "https://www.bing.com",
         aliases: ["@bing"],
       },
-      getEngineByAlias: () => null,
+      getEngineByAlias: async () => null,
     },
     scriptSecurityManager: {
       createNullPrincipal() {},
@@ -430,6 +430,11 @@
     },
   },
   FX_MONITOR_OAUTH_CLIENT_ID: "fake_client_id",
+  ExperimentAPI: {
+    getExperiment() {},
+    on: () => {},
+    off: () => {},
+  },
   TelemetryEnvironment: {
     setExperimentActive() {},
     currentEnvironment: {
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/xpcshell/test_AboutNewTab.js firefox-85.0+build1/browser/components/newtab/test/xpcshell/test_AboutNewTab.js
--- firefox-84.0.2+build1/browser/components/newtab/test/xpcshell/test_AboutNewTab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/xpcshell/test_AboutNewTab.js	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,6 @@
 function nextChangeNotificationPromise(aNewURL, testMessage) {
   return new Promise(resolve => {
     Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
-      // jshint unused:false
       Services.obs.removeObserver(observer, aTopic);
       Assert.equal(aData, aNewURL, testMessage);
       resolve();
@@ -108,7 +107,6 @@
 function setBoolPrefAndWaitForChange(pref, value, testMessage) {
   return new Promise(resolve => {
     Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
-      // jshint unused:false
       Services.obs.removeObserver(observer, aTopic);
       Assert.equal(aData, AboutNewTab.newTabURL, testMessage);
       resolve();
diff -Nru firefox-84.0.2+build1/browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js firefox-85.0+build1/browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js
--- firefox-84.0.2+build1/browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/newtab/test/xpcshell/test_AboutWelcomeTelemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,9 @@
 const { AboutWelcomeTelemetry } = ChromeUtils.import(
   "resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm"
 );
+const { AttributionCode } = ChromeUtils.import(
+  "resource:///modules/AttributionCode.jsm"
+);
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 const TELEMETRY_PREF = "browser.newtabpage.activity-stream.telemetry";
 
@@ -46,3 +49,39 @@
     "Endpoint is correct"
   );
 });
+
+add_task(function test_mayAttachAttribution() {
+  const sandbox = sinon.createSandbox();
+  const AWTelemetry = new AboutWelcomeTelemetry();
+
+  sandbox.stub(AttributionCode, "getCachedAttributionData").returns(null);
+
+  let ping = AWTelemetry._maybeAttachAttribution({});
+
+  equal(ping.attribution, undefined, "Should not set attribution if it's null");
+
+  sandbox.restore();
+  sandbox.stub(AttributionCode, "getCachedAttributionData").returns({});
+  ping = AWTelemetry._maybeAttachAttribution({});
+
+  equal(
+    ping.attribution,
+    undefined,
+    "Should not set attribution if it's empty"
+  );
+
+  const attr = {
+    source: "google.com",
+    medium: "referral",
+    campaign: "Firefox-Brand-US-Chrome",
+    content: "(not set)",
+    experiment: "(not set)",
+    variation: "(not set)",
+    ua: "chrome",
+  };
+  sandbox.restore();
+  sandbox.stub(AttributionCode, "getCachedAttributionData").returns(attr);
+  ping = AWTelemetry._maybeAttachAttribution({});
+
+  equal(ping.attribution, attr, "Should set attribution if it presents");
+});
diff -Nru firefox-84.0.2+build1/browser/components/originattributes/test/browser/browser_favicon_firstParty.js firefox-85.0+build1/browser/components/originattributes/test/browser/browser_favicon_firstParty.js
--- firefox-84.0.2+build1/browser/components/originattributes/test/browser/browser_favicon_firstParty.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/originattributes/test/browser/browser_favicon_firstParty.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,6 +11,9 @@
 const { PlacesUtils } = ChromeUtils.import(
   "resource://gre/modules/PlacesUtils.jsm"
 );
+const { PlacesTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PlacesTestUtils.jsm"
+);
 
 let EventUtils = {};
 Services.scriptloader.loadSubScript(
@@ -171,21 +174,11 @@
 }
 
 function waitOnFaviconLoaded(aFaviconURL) {
-  return new Promise(resolve => {
-    let observer = {
-      onPageChanged(uri, attr, value, id) {
-        if (
-          attr === Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-          value === aFaviconURL
-        ) {
-          resolve();
-          PlacesUtils.history.removeObserver(observer, false);
-        }
-      },
-    };
-
-    PlacesUtils.history.addObserver(observer);
-  });
+  return PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events => events.some(e => e.faviconUrl == aFaviconURL),
+    "places"
+  );
 }
 
 async function openTab(aURL) {
diff -Nru firefox-84.0.2+build1/browser/components/originattributes/test/browser/browser_favicon_userContextId.js firefox-85.0+build1/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
--- firefox-84.0.2+build1/browser/components/originattributes/test/browser/browser_favicon_userContextId.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/originattributes/test/browser/browser_favicon_userContextId.js	2021-01-18 19:58:08.000000000 +0000
@@ -158,11 +158,9 @@
 
 function waitOnFaviconLoaded(aFaviconURL) {
   return PlacesTestUtils.waitForNotification(
-    "onPageChanged",
-    (uri, attr, value, id) =>
-      attr === Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-      value === aFaviconURL,
-    "history"
+    "favicon-changed",
+    events => events.some(e => e.faviconUrl == aFaviconURL),
+    "places"
   );
 }
 
diff -Nru firefox-84.0.2+build1/browser/components/places/content/bookmarkProperties.js firefox-85.0+build1/browser/components/places/content/bookmarkProperties.js
--- firefox-84.0.2+build1/browser/components/places/content/bookmarkProperties.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/content/bookmarkProperties.js	2021-01-18 19:58:08.000000000 +0000
@@ -237,7 +237,6 @@
    * dialog to initialize the state of the panel.
    */
   async onDialogLoad() {
-    document.title = this._getDialogTitle();
     document.addEventListener("dialogaccept", function() {
       BookmarkPropertiesPanel.onDialogAccept();
     });
@@ -251,6 +250,7 @@
       .getButton("accept");
     acceptButton.disabled = true;
     await this._determineItemInfo();
+    document.title = this._getDialogTitle();
 
     // Allow initialization to complete in a truely async manner so that we're
     // not blocking the main thread.
diff -Nru firefox-84.0.2+build1/browser/components/places/content/browserPlacesViews.js firefox-85.0+build1/browser/components/places/content/browserPlacesViews.js
--- firefox-84.0.2+build1/browser/components/places/content/browserPlacesViews.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/content/browserPlacesViews.js	2021-01-18 19:58:08.000000000 +0000
@@ -250,8 +250,18 @@
     this._contextMenuShown = aPopup;
     window.updateCommands("places");
 
-    // Add the View menu for the Bookmarks Toolbar if the click originated
-    // from the Bookmarks Toolbar.
+    // Ensure that an existing "Show Other Bookmarks" item is removed before adding it
+    // again. This item should only be added when gBookmarksToolbar2h2020 is true, but
+    // its possible the pref could be toggled off in the same window. This results in
+    // the "Show Other Bookmarks" menu item still being visible even when the pref is
+    // set to false.
+    let existingOtherBookmarksItem = aPopup.querySelector(
+      "#show-other-bookmarks_PersonalToolbar"
+    );
+    existingOtherBookmarksItem?.remove();
+
+    // Add the View menu for the Bookmarks Toolbar and "Show Other Bookmarks" menu item
+    // if the click originated from the Bookmarks Toolbar.
     if (gBookmarksToolbar2h2020) {
       let existingSubmenu = aPopup.querySelector("#toggle_PersonalToolbar");
       existingSubmenu?.remove();
@@ -259,6 +269,21 @@
       if (bookmarksToolbar?.contains(aPopup.triggerNode)) {
         let menu = BookmarkingUI.buildBookmarksToolbarSubmenu(bookmarksToolbar);
         aPopup.appendChild(menu);
+
+        if (
+          aPopup.triggerNode.id === "OtherBookmarks" ||
+          aPopup.triggerNode.id === "PlacesChevron" ||
+          aPopup.triggerNode.id === "PlacesToolbarItems"
+        ) {
+          let otherBookmarksMenuItem = BookmarkingUI.buildShowOtherBookmarksMenuItem();
+
+          if (otherBookmarksMenuItem) {
+            aPopup.insertBefore(
+              otherBookmarksMenuItem,
+              menu.nextElementSibling
+            );
+          }
+        }
       }
     }
 
@@ -551,6 +576,9 @@
     }
   },
 
+  // Opt-out of history details updates, since all the views derived from this
+  // are not showing them.
+  observeHistoryDetails: false,
   nodeHistoryDetailsChanged() {},
   nodeTagsChanged() {},
   nodeDateAddedChanged() {},
@@ -893,7 +921,10 @@
 
   this._viewElt._placesView = this;
 
-  this._addEventListeners(this._viewElt, this._cbEvents, false);
+  this._dragRoot = BookmarkingUI.toolbar.contains(this._viewElt)
+    ? BookmarkingUI.toolbar
+    : this._viewElt;
+  this._addEventListeners(this._dragRoot, this._cbEvents, false);
   this._addEventListeners(this._rootElt, ["popupshowing", "popuphidden"], true);
   this._addEventListeners(this._rootElt, ["overflow", "underflow"], true);
   this._addEventListeners(window, ["resize", "unload"], false);
@@ -943,7 +974,9 @@
   ]),
 
   uninit: function PT_uninit() {
-    this._removeEventListeners(this._viewElt, this._cbEvents, false);
+    if (this._dragRoot) {
+      this._removeEventListeners(this._dragRoot, this._cbEvents, false);
+    }
     this._removeEventListeners(
       this._rootElt,
       ["popupshowing", "popuphidden"],
@@ -975,6 +1008,18 @@
     return this._resultNode && this._rootElt;
   },
 
+  _runBeforeFrameRender(callback) {
+    return new Promise((resolve, reject) => {
+      window.requestAnimationFrame(() => {
+        try {
+          resolve(callback());
+        } catch (err) {
+          reject(err);
+        }
+      });
+    });
+  },
+
   async _rebuild() {
     // Clear out references to existing nodes, since they will be removed
     // and re-added.
@@ -995,37 +1040,35 @@
       // calculate a precise number of visible items, thus we guess a size from
       // the first non-separator node (because separators have flexible size).
       let startIndex = 0;
-      let limit = await new Promise(resolve =>
-        window.requestAnimationFrame(() => {
-          if (!this._isAlive) {
-            return resolve(cc);
-          }
+      let limit = await this._runBeforeFrameRender(() => {
+        if (!this._isAlive) {
+          return cc;
+        }
 
-          // Look for the first non-separator node.
-          let elt;
-          while (startIndex < cc) {
-            elt = this._insertNewItem(
-              this._resultNode.getChild(startIndex),
-              this._rootElt
-            );
-            ++startIndex;
-            if (elt.localName != "toolbarseparator") {
-              break;
-            }
-          }
-          if (!elt) {
-            return resolve(cc);
+        // Look for the first non-separator node.
+        let elt;
+        while (startIndex < cc) {
+          elt = this._insertNewItem(
+            this._resultNode.getChild(startIndex),
+            this._rootElt
+          );
+          ++startIndex;
+          if (elt.localName != "toolbarseparator") {
+            break;
           }
+        }
+        if (!elt) {
+          return cc;
+        }
 
-          return window.promiseDocumentFlushed(() => {
-            // We assume a button with just the icon will be more or less a square,
-            // then compensate the measurement error by considering a larger screen
-            // width. Moreover the window could be bigger than the screen.
-            let size = elt.clientHeight || 1; // Sanity fallback.
-            resolve(Math.min(cc, parseInt((window.screen.width * 1.5) / size)));
-          });
-        })
-      );
+        return window.promiseDocumentFlushed(() => {
+          // We assume a button with just the icon will be more or less a square,
+          // then compensate the measurement error by considering a larger screen
+          // width. Moreover the window could be bigger than the screen.
+          let size = elt.clientHeight || 1; // Sanity fallback.
+          return Math.min(cc, parseInt((window.screen.width * 1.5) / size));
+        });
+      });
 
       if (!this._isAlive) {
         return;
diff -Nru firefox-84.0.2+build1/browser/components/places/content/editBookmark.js firefox-85.0+build1/browser/components/places/content/editBookmark.js
--- firefox-84.0.2+build1/browser/components/places/content/editBookmark.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/content/editBookmark.js	2021-01-18 19:58:08.000000000 +0000
@@ -1297,7 +1297,6 @@
 
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
-  onItemVisited() {},
 };
 
 XPCOMUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => {
diff -Nru firefox-84.0.2+build1/browser/components/places/content/places.js firefox-85.0+build1/browser/components/places/content/places.js
--- firefox-84.0.2+build1/browser/components/places/content/places.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/content/places.js	2021-01-18 19:58:08.000000000 +0000
@@ -717,11 +717,13 @@
 
   _fillDetailsPane: function PO__fillDetailsPane(aNodeList) {
     var infoBox = document.getElementById("infoBox");
-    var detailsDeck = document.getElementById("detailsDeck");
+    var itemsCountBox = document.getElementById("itemsCountBox");
 
     // Make sure the infoBox UI is visible if we need to use it, we hide it
     // below when we don't.
     infoBox.hidden = false;
+    itemsCountBox.hidden = true;
+
     let selectedNode = aNodeList.length == 1 ? aNodeList[0] : null;
 
     // If an input within a panel is focused, force-blur it so its contents
@@ -746,11 +748,7 @@
           (selectedNode.itemId == -1 &&
             gEditItemOverlay.uri &&
             gEditItemOverlay.uri == selectedNode.uri);
-        if (
-          nodeIsSame &&
-          detailsDeck.selectedIndex == 1 &&
-          !gEditItemOverlay.multiEdit
-        ) {
+        if (nodeIsSame && !infoBox.hidden && !gEditItemOverlay.multiEdit) {
           return;
         }
       }
@@ -760,8 +758,6 @@
     gEditItemOverlay.uninitPanel(false);
 
     if (selectedNode && !PlacesUtils.nodeIsSeparator(selectedNode)) {
-      detailsDeck.selectedIndex = 1;
-
       gEditItemOverlay.initPanel({
         node: selectedNode,
         hiddenRows: ["folderPicker"],
@@ -769,13 +765,11 @@
     } else if (!selectedNode && aNodeList[0]) {
       if (aNodeList.every(PlacesUtils.nodeIsURI)) {
         let uris = aNodeList.map(node => Services.io.newURI(node.uri));
-        detailsDeck.selectedIndex = 1;
         gEditItemOverlay.initPanel({
           uris,
           hiddenRows: ["folderPicker", "location", "keyword", "name"],
         });
       } else {
-        detailsDeck.selectedIndex = 0;
         let selectItemDesc = document.getElementById("selectItemDescription");
         let itemsCountLabel = document.getElementById("itemsCountText");
         selectItemDesc.hidden = false;
@@ -787,7 +781,6 @@
         infoBox.hidden = true;
       }
     } else {
-      detailsDeck.selectedIndex = 0;
       infoBox.hidden = true;
       let selectItemDesc = document.getElementById("selectItemDescription");
       let itemsCountLabel = document.getElementById("itemsCountText");
@@ -810,6 +803,7 @@
         );
       }
     }
+    itemsCountBox.hidden = !infoBox.hidden;
   },
 };
 
@@ -1298,7 +1292,7 @@
   _specialViews: new Map(),
 
   init: function CA_init() {
-    this._deck = document.getElementById("placesViewsDeck");
+    this._box = document.getElementById("placesViewsBox");
     this._toolbar = document.getElementById("placesToolbar");
     ContentTree.init();
     this._setupView();
@@ -1362,12 +1356,16 @@
   },
 
   get currentView() {
-    return PlacesUIUtils.getViewForNode(this._deck.selectedPanel);
+    let selectedPane = [...this._box.children].filter(
+      child => !child.hidden
+    )[0];
+    return PlacesUIUtils.getViewForNode(selectedPane);
   },
   set currentView(aNewView) {
     let oldView = this.currentView;
     if (oldView != aNewView) {
-      this._deck.selectedPanel = aNewView.associatedElement;
+      oldView.associatedElement.hidden = true;
+      aNewView.associatedElement.hidden = false;
 
       // If the content area inactivated view was focused, move focus
       // to the new view.
@@ -1399,8 +1397,8 @@
     let options = this.currentViewOptions;
 
     // showDetailsPane.
-    let detailsDeck = document.getElementById("detailsDeck");
-    detailsDeck.hidden = !options.showDetailsPane;
+    let detailsPane = document.getElementById("detailsPane");
+    detailsPane.hidden = !options.showDetailsPane;
 
     // toolbarSet.
     for (let elt of this._toolbar.childNodes) {
@@ -1433,7 +1431,7 @@
   },
 
   focus() {
-    this._deck.selectedPanel.focus();
+    this.currentView.associatedElement.focus();
   },
 };
 
diff -Nru firefox-84.0.2+build1/browser/components/places/content/places.xhtml firefox-85.0+build1/browser/components/places/content/places.xhtml
--- firefox-84.0.2+build1/browser/components/places/content/places.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/content/places.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -356,9 +356,7 @@
     </tree>
     <splitter collapse="none" persist="state"></splitter>
     <vbox id="contentView" flex="4">
-      <deck id="placesViewsDeck"
-            selectedIndex="0"
-            flex="1">
+      <vbox id="placesViewsBox" flex="1">
         <tree id="placeContent"
               class="plain placesTree"
               context="placesContext"
@@ -405,12 +403,13 @@
           <treechildren flex="1" onclick="ContentTree.onClick(event);"/>
         </tree>
         <richlistbox flex="1"
+                     hidden="true"
                      seltype="multiple"
                      id="downloadsRichListBox"
                      context="downloadsContextMenu"/>
-      </deck>
-      <deck id="detailsDeck" style="height: 11em;">
-        <vbox id="itemsCountBox" align="center">
+      </vbox>
+      <vbox id="detailsPane" style="height: 11em;">
+        <vbox id="itemsCountBox" align="center" flex="1" hidden="true">
           <spacer flex="3"/>
           <label id="itemsCountText"/>
           <spacer flex="1"/>
@@ -419,10 +418,10 @@
           </description>
           <spacer flex="3"/>
         </vbox>
-        <vbox id="infoBox">
+        <vbox id="infoBox" flex="1">
 #include editBookmarkPanel.inc.xhtml
         </vbox>
-      </deck>
+      </vbox>
     </vbox>
   </hbox>
 </window>
diff -Nru firefox-84.0.2+build1/browser/components/places/PlacesUIUtils.jsm firefox-85.0+build1/browser/components/places/PlacesUIUtils.jsm
--- firefox-84.0.2+build1/browser/components/places/PlacesUIUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/PlacesUIUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -233,6 +233,7 @@
 };
 
 var PlacesUIUtils = {
+  _bookmarkToolbarTelemetryListening: false,
   LAST_USED_FOLDERS_META_KEY: "bookmarks/lastusedfolders",
 
   getFormattedString: function PUIU_getFormattedString(key, params) {
@@ -1160,6 +1161,69 @@
     }
   },
 
+  ensureBookmarkToolbarTelemetryListening() {
+    if (this._bookmarkToolbarTelemetryListening) {
+      return;
+    }
+
+    // This listener is for counting new bookmarks
+    let placesUtilsObserversListener = events => {
+      for (let event of events) {
+        if (
+          event.type == "bookmark-added" &&
+          event.parentGuid == PlacesUtils.bookmarks.toolbarGuid
+        ) {
+          Services.telemetry.scalarAdd(
+            "browser.engagement.bookmarks_toolbar_bookmark_added",
+            1
+          );
+        }
+      }
+    };
+
+    // This listener is for tracking bookmark moves
+    let placesUtilsBookmarksObserver = {
+      onBeginUpdateBatch() {},
+      onEndUpdateBatch() {},
+      onItemChanged() {},
+      onItemMoved(
+        aItemId,
+        aProperty,
+        aIsAnnotationProperty,
+        aNewValue,
+        aLastModified,
+        aItemType,
+        aGuid,
+        oldParentGuid,
+        newParentGuid
+      ) {
+        let hasMovedToToolbar =
+          newParentGuid == PlacesUtils.bookmarks.toolbarGuid &&
+          oldParentGuid != PlacesUtils.bookmarks.toolbarGuid;
+        if (hasMovedToToolbar) {
+          Services.telemetry.scalarAdd(
+            "browser.engagement.bookmarks_toolbar_bookmark_added",
+            1
+          );
+        }
+      },
+    };
+
+    this._bookmarkToolbarTelemetryListening = true;
+    PlacesUtils.observers.addListener(
+      ["bookmark-added"],
+      placesUtilsObserversListener
+    );
+    PlacesUtils.bookmarks.addObserver(placesUtilsBookmarksObserver);
+    PlacesUtils.registerShutdownFunction(() => {
+      PlacesUtils.observers.removeListener(
+        ["bookmark-added"],
+        placesUtilsObserversListener
+      );
+      PlacesUtils.bookmarks.removeObserver(placesUtilsBookmarksObserver);
+    });
+  },
+
   /**
    * Uncollapses PersonalToolbar if its collapsed status is not
    * persisted, and user customized it or changed default bookmarks.
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_bookmarks_change_title.js firefox-85.0+build1/browser/components/places/tests/browser/browser_bookmarks_change_title.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_bookmarks_change_title.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_bookmarks_change_title.js	2021-01-18 19:58:08.000000000 +0000
@@ -120,9 +120,16 @@
       EventUtils.synthesizeMouseAtCenter(properties, {});
     },
     async function test(dialogWin) {
+      // Ensure the dialog has initialized.
+      await TestUtils.waitForCondition(() => dialogWin.document.title);
+
       let namepicker = dialogWin.document.getElementById(
         "editBMPanel_namePicker"
       );
+      Assert.ok(
+        dialogWin.document.title.includes(titleAfterFirstUpdate),
+        "Dialog window title should include bookmark title."
+      );
       Assert.equal(
         namepicker.value,
         titleAfterFirstUpdate,
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_bookmarks_toolbar_telemetry.js firefox-85.0+build1/browser/components/places/tests/browser/browser_bookmarks_toolbar_telemetry.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_bookmarks_toolbar_telemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_bookmarks_toolbar_telemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -64,6 +64,12 @@
     1
   );
 
+  // Extra windows are opened to make sure telemetry numbers aren't
+  // double counted since there will be multiple instances of the
+  // bookmarks toolbar.
+  let extraWindows = [];
+  extraWindows.push(await BrowserTestUtils.openNewBrowserWindow());
+
   Services.telemetry.getSnapshotForScalars("main", true);
   let bookmarks = await PlacesUtils.bookmarks.insertTree({
     guid: PlacesUtils.bookmarks.toolbarGuid,
@@ -79,17 +85,39 @@
 
   let newtab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
   registerCleanupFunction(() => BrowserTestUtils.removeTab(newtab));
-  Services.telemetry.getSnapshotForScalars("main", true);
   let bookmarkToolbarButton = document.querySelector(
     "#PlacesToolbarItems > toolbarbutton"
   );
   bookmarkToolbarButton.click();
   TelemetryTestUtils.assertScalar(
-    TelemetryTestUtils.getProcessScalars("parent", false, true),
+    TelemetryTestUtils.getProcessScalars("parent"),
     "browser.engagement.bookmarks_toolbar_bookmark_opened",
     1,
     "Bookmarks opened value should be 1"
   );
+
+  extraWindows.push(await BrowserTestUtils.openNewBrowserWindow());
+  extraWindows.push(await BrowserTestUtils.openNewBrowserWindow());
+
+  // Simulate dragging a bookmark within the toolbar to ensure
+  // that the bookmarks_toolbar_bookmark_added probe doesn't increment
+  let srcElement = document.querySelector("#PlacesToolbar .bookmark-item");
+  let destElement = document.querySelector("#PlacesToolbar");
+  await EventUtils.synthesizePlainDragAndDrop({
+    srcElement,
+    destElement,
+  });
+
+  TelemetryTestUtils.assertScalar(
+    TelemetryTestUtils.getProcessScalars("parent"),
+    "browser.engagement.bookmarks_toolbar_bookmark_added",
+    3,
+    "Bookmarks added value should still be 3"
+  );
+
+  for (let win of extraWindows) {
+    await BrowserTestUtils.closeWindow(win);
+  }
 });
 
 async function changeToolbarVisibilityViaContextMenu(nextState) {
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js firefox-85.0+build1/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_click_bookmarks_on_toolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,25 @@
 
 var gBookmarkElements = [];
 
+function waitForBookmarkElements(expectedCount) {
+  let container = document.getElementById("PlacesToolbarItems");
+  if (container.childElementCount == expectedCount) {
+    return Promise.resolve();
+  }
+  return new Promise(resolve => {
+    info("Waiting for bookmarks");
+    let mut = new MutationObserver(mutations => {
+      info("Elements appeared");
+      if (container.childElementCount == expectedCount) {
+        resolve();
+        mut.disconnect();
+      }
+    });
+
+    mut.observe(container, { childList: true });
+  });
+}
+
 function getToolbarNodeForItemGuid(aItemGuid) {
   var children = document.getElementById("PlacesToolbarItems").children;
   for (let child of children) {
@@ -49,6 +68,7 @@
 }
 
 add_task(async function setup() {
+  await PlacesUtils.bookmarks.eraseEverything();
   let bookmarks = await Promise.all(
     TEST_PAGES.map((url, index) => {
       return PlacesUtils.bookmarks.insert({
@@ -65,6 +85,7 @@
     await promiseSetToolbarVisibility(toolbar, true);
   }
 
+  await waitForBookmarkElements(TEST_PAGES.length);
   for (let bookmark of bookmarks) {
     let element = getToolbarNodeForItemGuid(bookmark.guid);
     Assert.notEqual(element, null, "Found node on toolbar");
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js firefox-85.0+build1/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_drag_bookmarks_on_toolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -5,7 +5,7 @@
 const TEST_URL = "http://www.mozilla.org";
 const TEST_TITLE = "example_title";
 
-var gBookmarksToolbar = window.document.getElementById("PlacesToolbar");
+var gBookmarksToolbar = window.document.getElementById("PersonalToolbar");
 var dragDirections = { LEFT: 0, UP: 1, RIGHT: 2, DOWN: 3 };
 
 /**
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_editBookmark_keywords.js firefox-85.0+build1/browser/components/places/tests/browser/browser_editBookmark_keywords.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_editBookmark_keywords.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_editBookmark_keywords.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,6 @@
       PlacesUtils.bookmarks.addObserver({
         onBeginUpdateBatch() {},
         onEndUpdateBatch() {},
-        onItemVisited() {},
         onItemMoved() {},
         onItemChanged(id, property, isAnno, value) {
           PlacesUtils.bookmarks.removeObserver(this);
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser.ini firefox-85.0+build1/browser/components/places/tests/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -53,6 +53,7 @@
 [browser_bookmarksProperties.js]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [browser_check_correct_controllers.js]
+skip-if = tsan # Intermittently times out on TSan
 [browser_click_bookmarks_on_toolbar.js]
 [browser_controller_onDrop_query.js]
 [browser_controller_onDrop_sidebar.js]
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_toolbar_other_bookmarks.js firefox-85.0+build1/browser/components/places/tests/browser/browser_toolbar_other_bookmarks.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_toolbar_other_bookmarks.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_toolbar_other_bookmarks.js	2021-01-18 19:58:08.000000000 +0000
@@ -30,10 +30,7 @@
   let toolbar = document.getElementById("PersonalToolbar");
   let wasCollapsed = toolbar.collapsed;
 
-  // Uncollapse the personal toolbar if needed.
-  if (wasCollapsed) {
-    await promiseSetToolbarVisibility(toolbar, true);
-  }
+  await setupBookmarksToolbar();
 
   // Cleanup.
   registerCleanupFunction(async () => {
@@ -53,18 +50,18 @@
   });
 
   info("Check visibility of an empty Other Bookmarks folder.");
-  testIsOtherBookmarksHidden(true);
+  await testIsOtherBookmarksHidden(true);
 
   info("Ensure folder appears in toolbar when a new bookmark is added.");
   let bookmarks = await PlacesUtils.bookmarks.insertTree({
     guid: PlacesUtils.bookmarks.unfiledGuid,
     children: bookmarksInfo,
   });
-  testIsOtherBookmarksHidden(false);
+  await testIsOtherBookmarksHidden(false);
 
   info("Ensure folder disappears from toolbar when no bookmarks are present.");
   await PlacesUtils.bookmarks.remove(bookmarks);
-  testIsOtherBookmarksHidden(true);
+  await testIsOtherBookmarksHidden(true);
 });
 
 // Test that folder visibility is correct when moving bookmarks to an empty
@@ -79,7 +76,7 @@
     guid: PlacesUtils.bookmarks.toolbarGuid,
     children: bookmarksInfo,
   });
-  testIsOtherBookmarksHidden(true);
+  await testIsOtherBookmarksHidden(true);
 
   info("Move toolbar bookmarks to Other Bookmarks folder.");
   await PlacesUtils.bookmarks.moveToFolder(
@@ -87,7 +84,7 @@
     PlacesUtils.bookmarks.unfiledGuid,
     PlacesUtils.bookmarks.DEFAULT_INDEX
   );
-  testIsOtherBookmarksHidden(false);
+  await testIsOtherBookmarksHidden(false);
 
   info("Move bookmarks from Other Bookmarks back to the toolbar.");
   await PlacesUtils.bookmarks.moveToFolder(
@@ -95,7 +92,7 @@
     PlacesUtils.bookmarks.toolbarGuid,
     PlacesUtils.bookmarks.DEFAULT_INDEX
   );
-  testIsOtherBookmarksHidden(true);
+  await testIsOtherBookmarksHidden(true);
 });
 
 // Test OtherBookmarksPopup in toolbar.
@@ -110,7 +107,7 @@
     children: bookmarksInfo,
   });
 
-  testIsOtherBookmarksHidden(false);
+  await testIsOtherBookmarksHidden(false);
 
   info("Check the popup menu has correct number of children.");
   await openMenuPopup("#OtherBookmarksPopup", "#OtherBookmarks");
@@ -159,30 +156,22 @@
 });
 
 add_task(async function testOnlyShowOtherFolderInBookmarksToolbar() {
-  testIsOtherBookmarksHidden(false);
+  await testIsOtherBookmarksHidden(false);
 
   // Test that moving the personal-bookmarks widget out of the
   // Bookmarks Toolbar will hide the "Other Bookmarks" folder.
   let widgetId = "personal-bookmarks";
   CustomizableUI.addWidgetToArea(widgetId, CustomizableUI.AREA_NAVBAR);
-  testIsOtherBookmarksHidden(true);
+  await testIsOtherBookmarksHidden(true);
 
   CustomizableUI.reset();
-  testIsOtherBookmarksHidden(false);
+  await testIsOtherBookmarksHidden(false);
 });
 
 // Test that the menu popup updates when menu items are deleted from it while
 // it's open.
 add_task(async function testDeletingMenuItems() {
-  let toolbar = document.getElementById("PersonalToolbar");
-  let wasCollapsed = toolbar.collapsed;
-
-  // Uncollapse the personal toolbar if needed.
-  if (wasCollapsed) {
-    await promiseSetToolbarVisibility(toolbar, true);
-  }
-
-  await PlacesUtils.bookmarks.eraseEverything();
+  await setupBookmarksToolbar();
 
   await SpecialPowers.pushPrefEnv({
     set: [[BOOKMARKS_H2_2020_PREF, true]],
@@ -243,14 +232,148 @@
   CustomizableUI.reset();
 });
 
+// Test "Show Other Bookmarks" menu item visibility in toolbar context menu.
+add_task(async function testShowingOtherBookmarksContextMenuItem() {
+  await setupBookmarksToolbar();
+
+  await SpecialPowers.pushPrefEnv({
+    set: [[BOOKMARKS_H2_2020_PREF, true]],
+  });
+
+  info("Add bookmark to Other Bookmarks.");
+  let bookmark = await PlacesUtils.bookmarks.insertTree({
+    guid: PlacesUtils.bookmarks.unfiledGuid,
+    children: [{ title: "firefox", url: "http://example.com" }],
+  });
+
+  info("'Show Other Bookmarks' menu item should be checked by default.");
+  await testOtherBookmarksCheckedState(true);
+
+  info("Toggle off showing the Other Bookmarks folder.");
+  await selectShowOtherBookmarksMenuItem();
+  await testOtherBookmarksCheckedState(false);
+  await testIsOtherBookmarksHidden(true);
+
+  info("Toggle on showing the Other Bookmarks folder.");
+  await selectShowOtherBookmarksMenuItem();
+  await testOtherBookmarksCheckedState(true);
+  await testIsOtherBookmarksHidden(false);
+
+  info(
+    "Ensure 'Show Other Bookmarks' isn't shown when Other Bookmarks is empty."
+  );
+  await PlacesUtils.bookmarks.remove(bookmark);
+  await testIsOtherBookmarksMenuItemShown(false);
+
+  info("Add a bookmark to the empty Other Bookmarks folder.");
+  await PlacesUtils.bookmarks.insertTree({
+    guid: PlacesUtils.bookmarks.unfiledGuid,
+    children: [{ title: "firefox", url: "http://example.com" }],
+  });
+  await testIsOtherBookmarksMenuItemShown(true);
+
+  info(
+    "Ensure that displaying Other Bookmarks is consistent across separate windows."
+  );
+  let newWin = await BrowserTestUtils.openNewBrowserWindow();
+
+  await TestUtils.waitForCondition(() => {
+    let otherBookmarks = newWin.document.getElementById("OtherBookmarks");
+    return !otherBookmarks.hidden;
+  }, "Other Bookmarks folder failed to show in other window.");
+
+  info("Hide the Other Bookmarks folder from the original window.");
+  await selectShowOtherBookmarksMenuItem();
+
+  await TestUtils.waitForCondition(() => {
+    let otherBookmarks = newWin.document.getElementById("OtherBookmarks");
+    return otherBookmarks.hidden;
+  }, "Other Bookmarks folder failed to be hidden in other window.");
+  ok(true, "Other Bookmarks was successfully hidden in other window.");
+
+  info("Show the Other Bookmarks folder from the original window.");
+  await selectShowOtherBookmarksMenuItem();
+
+  await TestUtils.waitForCondition(() => {
+    let otherBookmarks = newWin.document.getElementById("OtherBookmarks");
+    return !otherBookmarks.hidden;
+  }, "Other Bookmarks folder failed to be shown in other window.");
+  ok(true, "Other Bookmarks was successfully shown in other window.");
+
+  await BrowserTestUtils.closeWindow(newWin);
+});
+
+// Test 'Show Other Bookmarks' isn't shown when pref is false.
+add_task(async function showOtherBookmarksMenuItemPrefDisabled() {
+  await setupBookmarksToolbar();
+  await SpecialPowers.pushPrefEnv({
+    set: [[BOOKMARKS_H2_2020_PREF, false]],
+  });
+  await testIsOtherBookmarksMenuItemShown(false);
+});
+
+// Test that node visibility for toolbar overflow is consisten when the "Other Bookmarks"
+// folder is shown/hidden.
+add_task(async function testOtherBookmarksToolbarOverFlow() {
+  await setupBookmarksToolbar();
+  await SpecialPowers.pushPrefEnv({
+    set: [[BOOKMARKS_H2_2020_PREF, true]],
+  });
+
+  info(
+    "Ensure that visible nodes when showing/hiding Other Bookmarks is consistent across separate windows."
+  );
+  // Add bookmarks to other bookmarks
+  await PlacesUtils.bookmarks.insertTree({
+    guid: PlacesUtils.bookmarks.unfiledGuid,
+    children: [{ title: "firefox", url: "http://example.com" }],
+  });
+
+  let newWin = await BrowserTestUtils.openNewBrowserWindow();
+
+  // Add bookmarks to the toolbar
+  await PlacesUtils.bookmarks.insertTree({
+    guid: PlacesUtils.bookmarks.toolbarGuid,
+    children: Array(100)
+      .fill("")
+      .map((_, i) => ({ title: `test ${i}`, url: `http:example.com/${i}` })),
+  });
+
+  info("Hide the Other Bookmarks folder from the original window.");
+  await selectShowOtherBookmarksMenuItem("#OtherBookmarks");
+  await BrowserTestUtils.waitForEvent(
+    document.getElementById("PersonalToolbar"),
+    "BookmarksToolbarVisibilityUpdated"
+  );
+  ok(true, "Nodes successfully updated for both windows.");
+  await testUpdatedNodeVisibility(newWin);
+
+  info("Show the Other Bookmarks folder from the original window.");
+  await selectShowOtherBookmarksMenuItem("#PlacesChevron");
+  await BrowserTestUtils.waitForEvent(
+    document.getElementById("PersonalToolbar"),
+    "BookmarksToolbarVisibilityUpdated"
+  );
+  ok(true, "Nodes successfully updated for both windows.");
+  await testUpdatedNodeVisibility(newWin);
+
+  await BrowserTestUtils.closeWindow(newWin);
+});
+
 /**
  * Tests whether or not the "Other Bookmarks" folder is visible.
  */
 async function testIsOtherBookmarksHidden(expected) {
   info("Test whether or not the 'Other Bookmarks' folder is visible.");
-  let otherBookmarks = document.getElementById("OtherBookmarks");
 
-  await BrowserTestUtils.waitForAttribute("hidden", otherBookmarks, expected);
+  // Ensure the toolbar is visible.
+  let toolbar = document.getElementById("PersonalToolbar");
+  await promiseSetToolbarVisibility(toolbar, true);
+
+  await TestUtils.waitForCondition(() => {
+    let otherBookmarks = document.getElementById("OtherBookmarks");
+    return otherBookmarks.hidden === expected;
+  }, "Other Bookmarks folder failed to change hidden state.");
 
   ok(true, `Other Bookmarks folder "hidden" state should be ${expected}.`);
 }
@@ -275,6 +398,53 @@
 }
 
 /**
+ * Test helper for checking the 'checked' state of the "Show Other Bookmarks" menu item
+ * after selecting it from the context menu.
+ *
+ * @param {Boolean} expectedCheckedState
+ *        Whether or not the menu item is checked.
+ */
+async function testOtherBookmarksCheckedState(expectedCheckedState) {
+  info("Check 'Show Other Bookmarks' menu item state");
+  await openToolbarContextMenu();
+
+  let otherBookmarksMenuItem = document.querySelector(
+    "#show-other-bookmarks_PersonalToolbar"
+  );
+
+  is(
+    otherBookmarksMenuItem.getAttribute("checked"),
+    `${expectedCheckedState}`,
+    `Other Bookmarks item's checked state should be ${expectedCheckedState}`
+  );
+
+  await closeToolbarContextMenu();
+}
+
+/**
+ * Test helper for checking whether or not the 'Show Other Bookmarks' menu item
+ * appears in the toolbar's context menu.
+ *
+ * @param {Boolean} expected
+ *        Whether or not the menu item appears in the toolbar conext menu.
+ */
+async function testIsOtherBookmarksMenuItemShown(expected) {
+  await openToolbarContextMenu();
+
+  let otherBookmarksMenuItem = document.querySelector(
+    "#show-other-bookmarks_PersonalToolbar"
+  );
+
+  is(
+    !!otherBookmarksMenuItem,
+    expected,
+    "'Show Other Bookmarks' menu item appearance state is correct."
+  );
+
+  await closeToolbarContextMenu();
+}
+
+/**
  * Helper for opening a menu popup.
  *
  * @param {String}  popupSelector
@@ -304,3 +474,121 @@
   popup.hidePopup();
   await BrowserTestUtils.waitForPopupEvent(popup, "hidden");
 }
+
+/**
+ * Helper for opening the toolbar context menu.
+ *
+ * @param {String}  toolbarSelector
+ *        Optional. The selector for the toolbar context menu.
+ *        Defaults to #PlacesToolbarItems.
+ */
+async function openToolbarContextMenu(toolbarSelector = "#PlacesToolbarItems") {
+  let contextMenu = document.getElementById("placesContext");
+  let toolbar = document.querySelector(toolbarSelector);
+  let openToolbarContextMenuPromise = BrowserTestUtils.waitForPopupEvent(
+    contextMenu,
+    "shown"
+  );
+
+  // Use the end of the toolbar because the beginning (and even middle, on
+  // some resolutions) might be occluded by the empty toolbar message, which
+  // has a different context menu.
+  let bounds = toolbar.getBoundingClientRect();
+  EventUtils.synthesizeMouse(toolbar, bounds.width - 5, 5, {
+    type: "contextmenu",
+  });
+
+  await openToolbarContextMenuPromise;
+}
+
+/**
+ * Helper for closing the toolbar context menu.
+ */
+async function closeToolbarContextMenu() {
+  let contextMenu = document.getElementById("placesContext");
+  let closeToolbarContextMenuPromise = BrowserTestUtils.waitForPopupEvent(
+    contextMenu,
+    "hidden"
+  );
+  contextMenu.hidePopup();
+  await closeToolbarContextMenuPromise;
+}
+
+/**
+ * Helper for setting up the bookmarks toolbar state. This ensures the beginning
+ * of a task will always have the bookmark toolbar in a state that makes the
+ * Other Bookmarks folder testable.
+ */
+async function setupBookmarksToolbar() {
+  let toolbar = document.getElementById("PersonalToolbar");
+  let wasCollapsed = toolbar.collapsed;
+
+  // Uncollapse the personal toolbar if needed.
+  if (wasCollapsed) {
+    await promiseSetToolbarVisibility(toolbar, true);
+  }
+
+  await PlacesUtils.bookmarks.eraseEverything();
+}
+
+/**
+ * Helper for selecting the "Show Other Bookmarks" menu item from the bookmarks
+ * toolbar context menu.
+ *
+ * @param {String}  selector
+ *        Optional. The selector for the node that triggers showing the
+ *        "Show Other Bookmarks" context menu item in the toolbar.
+ *        Defaults to #PlacesToolbarItem when `openToolbarContextMenu` is
+ *        called.
+ */
+async function selectShowOtherBookmarksMenuItem(selector) {
+  info("Select 'Show Other Bookmarks' menu item");
+  await openToolbarContextMenu(selector);
+
+  let otherBookmarksMenuItem = document.querySelector(
+    "#show-other-bookmarks_PersonalToolbar"
+  );
+  let contextMenu = document.getElementById("placesContext");
+
+  EventUtils.synthesizeMouseAtCenter(otherBookmarksMenuItem, {});
+
+  await BrowserTestUtils.waitForPopupEvent(contextMenu, "hidden");
+  await closeToolbarContextMenu();
+}
+
+/**
+ * Test helper for node visibility in the bookmarks toolbar between two windows.
+ *
+ * @param {Window}  otherWin
+ *        The other window whose toolbar items we want to compare with.
+ */
+function testUpdatedNodeVisibility(otherWin) {
+  // Get visible toolbar nodes for both the current and other windows.
+  let toolbarItems = document.getElementById("PlacesToolbarItems");
+  let currentVisibleNodes = [];
+
+  for (let node of toolbarItems.children) {
+    if (node.style.visibility === "visible") {
+      currentVisibleNodes.push(node);
+    }
+  }
+
+  let otherToolbarItems = otherWin.document.getElementById(
+    "PlacesToolbarItems"
+  );
+  let otherVisibleNodes = [];
+
+  for (let node of otherToolbarItems.children) {
+    if (node.style.visibility === "visible") {
+      otherVisibleNodes.push(node);
+    }
+  }
+
+  let lastIdx = otherVisibleNodes.length - 1;
+
+  is(
+    currentVisibleNodes[lastIdx]?.bookmarkGuid,
+    otherVisibleNodes[lastIdx]?.bookmarkGuid,
+    "Last visible toolbar bookmark is the same in both windows."
+  );
+}
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_views_iconsupdate.js firefox-85.0+build1/browser/components/places/tests/browser/browser_views_iconsupdate.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_views_iconsupdate.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_views_iconsupdate.js	2021-01-18 19:58:08.000000000 +0000
@@ -55,7 +55,7 @@
   let sidebarRect = await getRectForSidebarItem(bm.guid);
   let sidebarShot1 = TestUtils.screenshotArea(sidebarRect, window);
 
-  await new Promise(resolve => {
+  let iconURI = await new Promise(resolve => {
     PlacesUtils.favicons.setAndFetchFaviconForPage(
       PAGE_URI,
       ICON_URI,
@@ -65,28 +65,29 @@
       Services.scriptSecurityManager.getSystemPrincipal()
     );
   });
+  Assert.ok(iconURI.equals(ICON_URI), "Succesfully set the icon");
 
   // The icon is read asynchronously from the network, we don't have an easy way
-  // to wait for that.
-  await new Promise(resolve => {
-    setTimeout(resolve, 3000);
-  });
-
-  // Assert.notEqual truncates the strings, so it is unusable here for failure
-  // debugging purposes.
-  let toolbarShot2 = TestUtils.screenshotArea(toolbarElt, window);
-  if (toolbarShot1 != toolbarShot2) {
-    info("Before toolbar: " + toolbarShot1);
-    info("After toolbar: " + toolbarShot2);
-  }
-  Assert.notEqual(toolbarShot1, toolbarShot2, "The UI should have updated");
+  // to wait for that, thus we must poll.
+  await TestUtils.waitForCondition(() => {
+    // Assert.notEqual truncates the strings, so it is unusable here for failure
+    // debugging purposes.
+    let toolbarShot2 = TestUtils.screenshotArea(toolbarElt, window);
+    if (toolbarShot1 != toolbarShot2) {
+      info("Before toolbar: " + toolbarShot1);
+      info("After toolbar: " + toolbarShot2);
+    }
+    return toolbarShot1 != toolbarShot2;
+  }, "Waiting for the toolbar icon to update");
 
-  let sidebarShot2 = TestUtils.screenshotArea(sidebarRect, window);
-  if (sidebarShot1 != sidebarShot2) {
-    info("Before sidebar: " + sidebarShot1);
-    info("After sidebar: " + sidebarShot2);
-  }
-  Assert.notEqual(sidebarShot1, sidebarShot2, "The UI should have updated");
+  await TestUtils.waitForCondition(() => {
+    let sidebarShot2 = TestUtils.screenshotArea(sidebarRect, window);
+    if (sidebarShot1 != sidebarShot2) {
+      info("Before sidebar: " + sidebarShot1);
+      info("After sidebar: " + sidebarShot2);
+    }
+    return sidebarShot1 != sidebarShot2;
+  }, "Waiting for the sidebar icon to update");
 });
 
 /**
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/browser_views_liveupdate.js firefox-85.0+build1/browser/components/places/tests/browser/browser_views_liveupdate.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/browser_views_liveupdate.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/browser_views_liveupdate.js	2021-01-18 19:58:08.000000000 +0000
@@ -211,7 +211,6 @@
 
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
-  onItemVisited() {},
 
   onItemChanged(
     itemId,
diff -Nru firefox-84.0.2+build1/browser/components/places/tests/browser/head.js firefox-85.0+build1/browser/components/places/tests/browser/head.js
--- firefox-84.0.2+build1/browser/components/places/tests/browser/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/places/tests/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,7 @@
     aLeftPaneRoot
   );
   waitForFocus(function() {
+    checkLibraryPaneVisibility(library, aLeftPaneRoot);
     callback(library);
   }, library);
 
@@ -39,6 +40,7 @@
           aLeftPaneRoot
         );
       }
+      checkLibraryPaneVisibility(library, aLeftPaneRoot);
       resolve(library);
     } else {
       openLibrary(resolve, aLeftPaneRoot);
@@ -62,6 +64,32 @@
   });
 }
 
+function checkLibraryPaneVisibility(library, selectedPane) {
+  // Make sure right view is shown
+  if (selectedPane == "Downloads") {
+    Assert.ok(
+      library.ContentTree.view.hidden,
+      "Bookmark/History tree is hidden"
+    );
+    Assert.ok(
+      !library.document.getElementById("downloadsRichListBox").hidden,
+      "Downloads are shown"
+    );
+  } else {
+    Assert.ok(
+      !library.ContentTree.view.hidden,
+      "Bookmark/History tree is shown"
+    );
+    Assert.ok(
+      library.document.getElementById("downloadsRichListBox").hidden,
+      "Downloads are hidden"
+    );
+  }
+
+  // Check currentView getter
+  Assert.ok(!library.ContentArea.currentView.hidden, "Current view is shown");
+}
+
 /**
  * Waits for a clipboard operation to complete, looking for the expected type.
  *
diff -Nru firefox-84.0.2+build1/browser/components/pocket/content/panels/js/saved.js firefox-85.0+build1/browser/components/pocket/content/panels/js/saved.js
--- firefox-84.0.2+build1/browser/components/pocket/content/panels/js/saved.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/pocket/content/panels/js/saved.js	2021-01-18 19:58:08.000000000 +0000
@@ -21,6 +21,7 @@
   this.autocloseTimer = null;
   this.inoverflowmenu = false;
   this.dictJSON = {};
+  this.autocloseTimerEnabled = false;
   this.autocloseTiming = 4500;
   this.autocloseTimingFinalState = 2000;
   this.mouseInside = false;
@@ -115,6 +116,10 @@
     });
   };
   this.startCloseTimer = function(manualtime) {
+    if (!myself.autocloseTimerEnabled) {
+      return;
+    }
+
     var settime = manualtime ? manualtime : myself.autocloseTiming;
     if (typeof myself.autocloseTimer == "number") {
       clearTimeout(myself.autocloseTimer);
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/addEngine.js firefox-85.0+build1/browser/components/preferences/dialogs/addEngine.js
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/addEngine.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/addEngine.js	2021-01-18 19:58:08.000000000 +0000
@@ -50,7 +50,7 @@
   async onAliasInput() {
     let validity = "";
     if (this._alias.value) {
-      let engine = Services.search.getEngineByAlias(this._alias.value);
+      let engine = await Services.search.getEngineByAlias(this._alias.value);
       if (engine) {
         engine = document.getElementById("engineAliasExists").textContent;
       }
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/addEngine.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/addEngine.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/addEngine.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/addEngine.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="add-engine-window"
         data-l10n-attrs="title, style"
-        persist="screenX screenY width height" screenX="24" screenY="24">
+        persist="width height">
 
   <dialog
     buttons="accept,cancel"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/applicationManager.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/applicationManager.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/applicationManager.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/applicationManager.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -10,8 +10,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gAppManagerDialog.onLoad();"
         data-l10n-id="app-manager-window"
-        data-l10n-attrs="title, style"
-        persist="screenX screenY">
+        data-l10n-attrs="title, style">
 <dialog id="appManager"
         buttons="accept,cancel">
 
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/blocklists.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/blocklists.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/blocklists.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/blocklists.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -8,14 +8,13 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
 <window id="BlocklistsDialog"
-        windowtype="Browser:Blocklists"
         data-l10n-id="blocklist-window"
         data-l10n-attrs="title, style"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gBlocklistManager.onLoad();"
         onunload="gBlocklistManager.uninit();"
-        persist="screenX screenY width height">
+        persist="width height">
 
   <dialog
     buttons="accept,cancel"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/browserLanguages.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/browserLanguages.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/browserLanguages.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/browserLanguages.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,6 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="browser-languages-window"
         data-l10n-attrs="title, style"
-        persist="screenX screenY"
         onload="gBrowserLanguagesDialog.onLoad();">
 <dialog id="BrowserLanguagesDialog"
         buttons="accept,cancel,help"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/clearSiteData.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/clearSiteData.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/clearSiteData.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/clearSiteData.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -9,12 +9,11 @@
 <?xml-stylesheet href="chrome://browser/content/preferences/dialogs/clearSiteData.css" type="text/css"?>
 
 <window id="ClearSiteDataDialog"
-        windowtype="Browser:ClearSiteData"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="clear-site-data-window"
         data-l10n-attrs="title, style"
-        persist="screenX screenY width height">
+        persist="width height">
 
   <dialog
     buttons="accept,cancel"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/colors.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/colors.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/colors.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/colors.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="colors-window"
         data-l10n-attrs="title, style"
-        persist="lastSelected screenX screenY">
+        persist="lastSelected">
 <dialog id="ColorsDialog"
         buttons="accept,cancel,help"
         helpTopic="prefs-fonts-and-colors">
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/connection.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/connection.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/connection.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/connection.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="connection-window"
         data-l10n-attrs="title, style"
-        persist="lastSelected screenX screenY"
+        persist="lastSelected"
         onload="gConnectionsDialog.checkForSystemProxy();">
 <dialog id="ConnectionsDialog"
         buttons="accept,cancel,help"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/containers.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/containers.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/containers.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/containers.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,7 @@
         data-l10n-attrs="title, style"
         onload="gContainersManager.onLoad();"
         onunload="gContainersManager.uninit();"
-        persist="screenX screenY width height">
+        persist="width height">
 
   <dialog
     buttons="accept"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/fonts.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/fonts.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/fonts.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/fonts.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="fonts-window"
         data-l10n-attrs="title"
-        persist="lastSelected screenX screenY">
+        persist="lastSelected">
 <dialog id="FontsDialog"
         buttons="accept,cancel,help"
         helpTopic="prefs-fonts-and-colors">
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/languages.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/languages.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/languages.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/languages.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="webpage-languages-window"
         data-l10n-attrs="title, style"
-        persist="lastSelected screenX screenY"
+        persist="lastSelected"
         onload="gLanguagesDialog.onLoad();">
 <dialog id="LanguagesDialog"
         buttons="accept,cancel,help"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/permissions.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/permissions.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/permissions.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/permissions.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,7 @@
         data-l10n-attrs="title, style"
         onload="gPermissionManager.onLoad();"
         onunload="gPermissionManager.uninit();"
-        persist="screenX screenY width height"
+        persist="width height"
         onkeypress="gPermissionManager.onWindowKeyPress(event);">
 
   <dialog
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/sanitize.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/sanitize.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/sanitize.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/sanitize.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,7 @@
         type="child"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
-        persist="lastSelected screenX screenY"
+        persist="lastSelected"
         data-l10n-id="sanitize-prefs"
         data-l10n-attrs="style"
         onload="gSanitizeDialog.init();">
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/selectBookmark.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/selectBookmark.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/selectBookmark.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/selectBookmark.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="select-bookmark-window"
         data-l10n-attrs="title, style"
-        persist="screenX screenY width height" screenX="24" screenY="24"
+        persist="width height"
         onload="SelectBookmarkDialog.init();">
 <dialog id="selectBookmarkDialog">
 
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -8,15 +8,14 @@
 <?xml-stylesheet href="chrome://browser/content/preferences/dialogs/siteDataSettings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
-<window windowtype="Browser:SiteDataRemoveSelected"
+<window id="SiteDataRemoveSelectedDialog"
         width="500"
         data-l10n-id="site-data-removing-dialog"
         data-l10n-attrs="title"
         onload="gSiteDataRemoveSelected.init();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
-<dialog id="SiteDataRemoveSelectedDialog"
-        data-l10n-id="site-data-removing-dialog"
+<dialog data-l10n-id="site-data-removing-dialog"
         data-l10n-attrs="buttonlabelaccept">
 
   <linkset>
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/siteDataSettings.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/siteDataSettings.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/siteDataSettings.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/siteDataSettings.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,7 @@
 <?xml-stylesheet href="chrome://browser/content/preferences/dialogs/siteDataSettings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
 
-<window id="SiteDataSettingsDialog" windowtype="Browser:SiteDataSettings"
+<window id="SiteDataSettingsDialog"
         data-l10n-id="site-data-settings-window"
         data-l10n-attrs="title"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,7 +17,7 @@
         style="width: 45em;"
         onload="gSiteDataSettings.init();"
         onkeypress="gSiteDataSettings.onKeyPress(event);"
-        persist="screenX screenY width height">
+        persist="width height">
 
 <dialog
   buttons="accept,cancel"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/sitePermissions.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/sitePermissions.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/sitePermissions.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/sitePermissions.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -9,14 +9,13 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
 <window id="SitePermissionsDialog"
-        windowtype="Browser:SitePermissions"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="permissions-window"
         data-l10n-attrs="title, style"
         onload="gSitePermissionsManager.onLoad();"
         onunload="gSitePermissionsManager.uninit();"
-        persist="screenX screenY width height">
+        persist="width height">
 
   <dialog
     buttons="accept,cancel"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/dialogs/translation.xhtml firefox-85.0+build1/browser/components/preferences/dialogs/translation.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/dialogs/translation.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/dialogs/translation.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -8,14 +8,13 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
 <window id="TranslationDialog"
-        windowtype="Browser:TranslationExceptions"
         data-l10n-id="translation-window"
         data-l10n-attrs="title, style"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gTranslationExceptions.onLoad();"
         onunload="gTranslationExceptions.uninit();"
-        persist="screenX screenY width height">
+        persist="width height">
 
   <dialog
     buttons="accept"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/extensionControlled.js firefox-85.0+build1/browser/components/preferences/extensionControlled.js
--- firefox-84.0.2+build1/browser/components/preferences/extensionControlled.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/extensionControlled.js	2021-01-18 19:58:08.000000000 +0000
@@ -59,8 +59,6 @@
 
 let extensionControlledContentIds = {
   "privacy.containers": "browserContainersExtensionContent",
-  homepage_override: "browserHomePageExtensionContent",
-  newTabURL: "browserNewTabExtensionContent",
   webNotificationsDisabled: "browserNotificationsPermissionExtensionContent",
   "services.passwordSavingEnabled": "passwordManagerExtensionContent",
   "proxy.settings": "proxyExtensionContent",
@@ -73,8 +71,6 @@
 };
 
 const extensionControlledL10nKeys = {
-  homepage_override: "homepage-override",
-  newTabURL: "new-tab-url",
   webNotificationsDisabled: "web-notifications",
   "services.passwordSavingEnabled": "password-saving",
   "privacy.containers": "privacy-containers",
diff -Nru firefox-84.0.2+build1/browser/components/preferences/findInPage.js firefox-85.0+build1/browser/components/preferences/findInPage.js
--- firefox-84.0.2+build1/browser/components/preferences/findInPage.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/findInPage.js	2021-01-18 19:58:08.000000000 +0000
@@ -260,7 +260,7 @@
       // Building the range for highlighted areas
       let rootPreferencesChildren = [
         ...document.querySelectorAll(
-          "#mainPrefPane > *:not([data-hidden-from-search]):not(script):not(stringbundle)"
+          "#mainPrefPane > *:not([data-hidden-from-search], script, stringbundle)"
         ),
       ];
 
diff -Nru firefox-84.0.2+build1/browser/components/preferences/home.inc.xhtml firefox-85.0+build1/browser/components/preferences/home.inc.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/home.inc.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/home.inc.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -25,14 +25,10 @@
   <label><html:h2 data-l10n-id="home-new-windows-tabs-header"/></label>
   <description data-l10n-id="home-new-windows-tabs-description2" />
 
-  <hbox id="homepageAndNewWindowsOption">
+  <hbox id="homepageAndNewWindowsOption" align="center" data-subcategory="homeOverride">
     <label control="homeMode" data-l10n-id="home-homepage-mode-label" flex="1" />
 
     <vbox class="homepageMenuItemContainer" flex="1">
-      <html:input id="homePrefHidden"
-                  type="text"
-                  preference="browser.startup.homepage"
-                  hidden="true" />
       <menulist id="homeMode"
                 class="check-home-page-controlled"
                 data-preference-related="browser.startup.homepage">
@@ -81,34 +77,19 @@
       </vbox>
     </vbox>
   </hbox>
-  <hbox id="browserHomePageExtensionContent"
-        align="center" hidden="true" class="extension-controlled">
-    <description control="disableHomePageExtension" flex="1" />
-    <button id="disableHomePageExtension"
-            is="highlightable-button"
-            class="extension-controlled-button accessory-button"
-            data-l10n-id="disable-extension" />
-  </hbox>
-
-  <hbox id="newTabsOption">
-    <label control="newTabMode" data-l10n-id="home-newtabs-mode-label" flex="1" />
+  <vbox data-subcategory="newtabOverride">
+    <hbox id="newTabsOption" align="center">
+      <label control="newTabMode" data-l10n-id="home-newtabs-mode-label" flex="1" />
 
-    <menulist id="newTabMode"
-                flex="1"
-                preference="browser.newtabpage.enabled">
-      <menupopup>
-        <menuitem value="0" data-l10n-id="home-mode-choice-default" />
-        <menuitem value="1" data-l10n-id="home-mode-choice-blank" />
-      </menupopup>
-    </menulist>
-  </hbox>
-  <hbox id="browserNewTabExtensionContent"
-        align="center" hidden="true" class="extension-controlled">
-    <description control="disableNewTabExtension" flex="1" />
-    <button id="disableNewTabExtension"
-            is="highlightable-button"
-            class="extension-controlled-button accessory-button"
-            data-l10n-id="disable-extension" />
-  </hbox>
+      <!-- This can be set to an extension value which is managed outside of
+        Preferences so we need to handle setting the pref manually.-->
+      <menulist id="newTabMode" flex="1" data-preference-related="browser.newtabpage.enabled">
+        <menupopup>
+          <menuitem value="0" data-l10n-id="home-mode-choice-default" />
+          <menuitem value="1" data-l10n-id="home-mode-choice-blank" />
+        </menupopup>
+      </menulist>
+    </hbox>
+  </vbox>
 </groupbox>
 </html:template>
diff -Nru firefox-84.0.2+build1/browser/components/preferences/home.js firefox-85.0+build1/browser/components/preferences/home.js
--- firefox-84.0.2+build1/browser/components/preferences/home.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/home.js	2021-01-18 19:58:08.000000000 +0000
@@ -28,6 +28,11 @@
   { id: "browser.newtabpage.enabled", type: "bool" },
 ]);
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ExtensionPreferencesManager:
+    "resource://gre/modules/ExtensionPreferencesManager.jsm",
+});
+
 const HOMEPAGE_OVERRIDE_KEY = "homepage_override";
 const URL_OVERRIDES_TYPE = "url_overrides";
 const NEW_TAB_KEY = "newTabURL";
@@ -62,27 +67,151 @@
     return false;
   },
 
+  async syncToNewTabPref() {
+    let menulist = document.getElementById("newTabMode");
+
+    if (["0", "1"].includes(menulist.value)) {
+      let newtabEnabledPref = Services.prefs.getBoolPref(
+        this.NEWTAB_ENABLED_PREF,
+        true
+      );
+      let newValue = menulist.value !== this.HOME_MODE_BLANK;
+      // Only set this if the pref has changed, otherwise the pref change will trigger other listeners to repeat.
+      if (newtabEnabledPref !== newValue) {
+        Services.prefs.setBoolPref(this.NEWTAB_ENABLED_PREF, newValue);
+      }
+      let selectedAddon = ExtensionSettingsStore.getSetting(
+        URL_OVERRIDES_TYPE,
+        NEW_TAB_KEY
+      );
+      if (selectedAddon) {
+        ExtensionSettingsStore.select(null, URL_OVERRIDES_TYPE, NEW_TAB_KEY);
+      }
+    } else {
+      let addon = await AddonManager.getAddonByID(menulist.value);
+      if (addon && addon.isActive) {
+        ExtensionSettingsStore.select(
+          addon.id,
+          URL_OVERRIDES_TYPE,
+          NEW_TAB_KEY
+        );
+      }
+    }
+  },
+
+  async syncFromNewTabPref() {
+    let menulist = document.getElementById("newTabMode");
+
+    // If the new tab url was changed to about:blank or about:newtab
+    if (
+      AboutNewTab.newTabURL === "about:newtab" ||
+      AboutNewTab.newTabURL === "about:blank"
+    ) {
+      let newtabEnabledPref = Services.prefs.getBoolPref(
+        this.NEWTAB_ENABLED_PREF,
+        true
+      );
+      let newValue = newtabEnabledPref
+        ? this.HOME_MODE_FIREFOX_HOME
+        : this.HOME_MODE_BLANK;
+      if (newValue !== menulist.value) {
+        menulist.value = newValue;
+      }
+      // If change was triggered by installing an addon we need to update
+      // the value of the menulist to be that addon.
+    } else {
+      let selectedAddon = ExtensionSettingsStore.getSetting(
+        URL_OVERRIDES_TYPE,
+        NEW_TAB_KEY
+      );
+      if (selectedAddon && menulist.value !== selectedAddon.id) {
+        menulist.value = selectedAddon.id;
+      }
+    }
+  },
+
   /**
-   * _handleNewTabOverrides: disables new tab settings UI. Called by
-   * an observer in ._watchNewTab that watches for new tab url changes
-   */
-  async _handleNewTabOverrides() {
-    const isControlled = await handleControllingExtension(
-      URL_OVERRIDES_TYPE,
-      NEW_TAB_KEY
-    );
-    const el = document.getElementById("newTabMode");
-    el.disabled = isControlled;
+   *  _updateMenuInterface: adds items to or removes them from the menulists
+   * @param {string} selectId Optional Id of the menulist to add or remove items from.
+   *                          If not included this will update both home and newtab menus.
+   */
+  async _updateMenuInterface(selectId) {
+    let selects;
+    if (selectId) {
+      selects = [document.getElementById(selectId)];
+    } else {
+      let newTabSelect = document.getElementById("newTabMode");
+      let homeSelect = document.getElementById("homeMode");
+      selects = [homeSelect, newTabSelect];
+    }
+
+    for (let select of selects) {
+      // Remove addons from the menu popup which are no longer installed, or disabled.
+      // let menuOptions = select.menupopup.childNodes;
+      let menuOptions = Array.from(select.menupopup.childNodes);
+
+      for (let option of menuOptions) {
+        // If the value is not a number, assume it is an addon ID
+        if (!/^\d+$/.test(option.value)) {
+          let addon = await AddonManager.getAddonByID(option.value);
+          if (option && (!addon || !addon.isActive)) {
+            option.remove();
+          }
+        }
+      }
+
+      let extensionOptions;
+      if (select.id === "homeMode") {
+        extensionOptions = await ExtensionSettingsStore.getAllSettings(
+          PREF_SETTING_TYPE,
+          HOMEPAGE_OVERRIDE_KEY
+        );
+      } else {
+        extensionOptions = await ExtensionSettingsStore.getAllSettings(
+          URL_OVERRIDES_TYPE,
+          NEW_TAB_KEY
+        );
+      }
+      let addons = await AddonManager.getAddonsByIDs(
+        extensionOptions.map(a => a.id)
+      );
+
+      // Add addon options to the menu popups
+      let menupopup = select.querySelector("menupopup");
+      for (let addon of addons) {
+        if (!addon || !addon.id || !addon.isActive) {
+          continue;
+        }
+        let currentOption = select.querySelector(
+          `[value="${CSS.escape(addon.id)}"]`
+        );
+        if (!currentOption) {
+          let option = document.createXULElement("menuitem");
+          option.classList.add("addon-with-favicon");
+          option.value = addon.id;
+          option.label = addon.name;
+          menupopup.append(option);
+          option.querySelector("image").src = addon.iconURL;
+        }
+        let setting = extensionOptions.find(o => o.id == addon.id);
+        if (
+          (select.id === "homeMode" && setting.value == HomePage.get()) ||
+          (select.id === "newTabMode" && setting.value == AboutNewTab.newTabURL)
+        ) {
+          select.value = addon.id;
+        }
+      }
+    }
   },
 
   /**
-   * watchNewTab: Listen for changes to the new tab url and disable appropriate
-   * areas of the UI
+   * watchNewTab: Listen for changes to the new tab url and enable/disable appropriate
+   * areas of the UI.
    */
   watchNewTab() {
-    this._handleNewTabOverrides();
-    let newTabObserver = {
-      observe: this._handleNewTabOverrides.bind(this),
+    let newTabObserver = () => {
+      this.syncFromNewTabPref();
+      this._updateMenuInterface("newTabMode");
     };
     Services.obs.addObserver(newTabObserver, "newtab-url-changed");
     window.addEventListener("unload", () => {
@@ -91,6 +220,50 @@
   },
 
   /**
+   * watchHomePrefChange: Listen for preferences changes on the Home Tab in order to
+   * show the appropriate home menu selection.
+   */
+  watchHomePrefChange() {
+    const homePrefObserver = (subject, topic, data) => {
+      // only update this UI if it is exactly the HOMEPAGE_PREF, not other prefs with the same root.
+      if (data && data != this.HOMEPAGE_PREF) {
+        return;
+      }
+      this._updateUseCurrentButton();
+      this._renderCustomSettings();
+      this._handleHomePageOverrides();
+      this._updateMenuInterface("homeMode");
+    };
+
+    Services.prefs.addObserver(this.HOMEPAGE_PREF, homePrefObserver);
+    window.addEventListener("unload", () => {
+      Services.prefs.removeObserver(this.HOMEPAGE_PREF, homePrefObserver);
+    });
+  },
+
+  /**
+   * Listen extension changes on the New Tab and Home Tab
+   * in order to update the UI and show or hide the Restore Defaults button.
+   */
+  watchExtensionPrefChange() {
+    const extensionSettingChanged = (evt, setting) => {
+      if (setting.key == "homepage_override" && setting.type == "prefs") {
+        this._updateMenuInterface("homeMode");
+      } else if (
+        setting.key == "newTabURL" &&
+        setting.type == "url_overrides"
+      ) {
+        this._updateMenuInterface("newTabMode");
+      }
+    };
+
+    Management.on("extension-setting-changed", extensionSettingChanged);
+    window.addEventListener("unload", () => {
+      Management.off("extension-setting-changed", extensionSettingChanged);
+    });
+  },
+
+  /**
    * Listen for all preferences changes on the Home Tab in order to show or
    * hide the Restore Defaults button.
    */
@@ -119,10 +292,12 @@
     const customSettingsContainerEl = document.getElementById("customSettings");
     const customUrlEl = document.getElementById("homePageUrl");
     const homePage = HomePage.get();
-
     const isHomePageCustom =
-      isControlled ||
-      (!this._isHomePageDefaultValue() && !this.isHomePageBlank());
+      (!this._isHomePageDefaultValue() &&
+        !this.isHomePageBlank() &&
+        !isControlled) ||
+      homePage.locked;
+
     if (typeof shouldShow === "undefined") {
       shouldShow = isHomePageCustom;
     }
@@ -168,17 +343,6 @@
       startupPref.value === gMainPane.STARTUP_PREF_BLANK
     );
   },
-  /**
-   * isHomePageControlled
-   * @resolves {bool} Is the homepage being controlled by an extension?
-   * @returns {Promise}
-   */
-  isHomePageControlled() {
-    if (HomePage.locked) {
-      return Promise.resolve(false);
-    }
-    return handleControllingExtension(PREF_SETTING_TYPE, HOMEPAGE_OVERRIDE_KEY);
-  },
 
   /**
    * _isTabAboutPreferences: Is a given tab set to about:preferences?
@@ -212,14 +376,14 @@
     return tabs;
   },
 
-  _renderHomepageMode(isControlled) {
+  _renderHomepageMode(controllingExtension) {
     const isDefault = this._isHomePageDefaultValue();
     const isBlank = this.isHomePageBlank();
     const el = document.getElementById("homeMode");
     let newValue;
 
-    if (isControlled) {
-      newValue = this.HOME_MODE_CUSTOM;
+    if (controllingExtension && controllingExtension.id) {
+      newValue = controllingExtension.id;
     } else if (isDefault) {
       newValue = this.HOME_MODE_FIREFOX_HOME;
     } else if (isBlank) {
@@ -250,7 +414,7 @@
         }
 
         if (pref === this.HOMEPAGE_PREF) {
-          isDisabled = HomePage.locked || isControlled;
+          isDisabled = HomePage.locked;
         } else {
           isDisabled = Preferences.get(pref).locked || isControlled;
         }
@@ -265,39 +429,33 @@
   },
 
   async _handleHomePageOverrides() {
+    let controllingExtension;
     if (HomePage.locked) {
-      // An extension can't control these settings if they're locked.
-      hideControllingExtension(HOMEPAGE_OVERRIDE_KEY);
+      // Disable inputs if they are locked.
+      this._renderCustomSettings();
       this._setInputDisabledStates(false);
     } else {
-      const isControlled = await this.isHomePageControlled();
-      this._setInputDisabledStates(isControlled);
-      this._renderCustomSettings({ isControlled });
-      this._renderHomepageMode(isControlled);
+      if (HomePage.get().startsWith("moz-extension:")) {
+        controllingExtension = await getControllingExtension(
+          PREF_SETTING_TYPE,
+          HOMEPAGE_OVERRIDE_KEY
+        );
+      }
+      this._setInputDisabledStates();
+      this._renderCustomSettings({
+        isControlled: !!controllingExtension,
+      });
     }
-  },
-
-  syncFromHomePref() {
-    this._updateUseCurrentButton();
-    this._renderCustomSettings();
-    this._renderHomepageMode();
-    this._handleHomePageOverrides();
-  },
-
-  syncFromNewTabPref() {
-    const newtabPref = Preferences.get(this.NEWTAB_ENABLED_PREF);
-    return newtabPref.value
-      ? this.HOME_MODE_FIREFOX_HOME
-      : this.HOME_MODE_BLANK;
-  },
-
-  syncToNewTabPref(value) {
-    return value !== this.HOME_MODE_BLANK;
+    this._renderHomepageMode(controllingExtension);
   },
 
   onMenuChange(event) {
     const { value } = event.target;
     const startupPref = Preferences.get("browser.startup.page");
+    let selectedAddon = ExtensionSettingsStore.getSetting(
+      PREF_SETTING_TYPE,
+      HOMEPAGE_OVERRIDE_KEY
+    );
 
     switch (value) {
       case this.HOME_MODE_FIREFOX_HOME:
@@ -309,6 +467,13 @@
         } else {
           this._renderCustomSettings({ shouldShow: false });
         }
+        if (selectedAddon) {
+          ExtensionSettingsStore.select(
+            null,
+            PREF_SETTING_TYPE,
+            HOMEPAGE_OVERRIDE_KEY
+          );
+        }
         break;
       case this.HOME_MODE_BLANK:
         if (HomePage.get() !== "about:blank") {
@@ -316,6 +481,13 @@
         } else {
           this._renderCustomSettings({ shouldShow: false });
         }
+        if (selectedAddon) {
+          ExtensionSettingsStore.select(
+            null,
+            PREF_SETTING_TYPE,
+            HOMEPAGE_OVERRIDE_KEY
+          );
+        }
         break;
       case this.HOME_MODE_CUSTOM:
         if (startupPref.value === gMainPane.STARTUP_PREF_BLANK) {
@@ -325,7 +497,25 @@
           HomePage.clear();
         }
         this._renderCustomSettings({ shouldShow: true });
+        if (selectedAddon) {
+          ExtensionSettingsStore.select(
+            null,
+            PREF_SETTING_TYPE,
+            HOMEPAGE_OVERRIDE_KEY
+          );
+        }
         break;
+      // extensions will have a variety of values as their ID, so treat it as default
+      default:
+        AddonManager.getAddonByID(value).then(addon => {
+          if (addon && addon.isActive) {
+            ExtensionPreferencesManager.selectSetting(
+              addon.id,
+              HOMEPAGE_OVERRIDE_KEY
+            );
+          }
+          this._renderCustomSettings({ shouldShow: false });
+        });
     }
   },
 
@@ -406,7 +596,9 @@
 
   restoreDefaultHomePage() {
     HomePage.reset();
+    this._handleHomePageOverrides();
     Services.prefs.clearUserPref(this.NEWTAB_ENABLED_PREF);
+    AboutNewTab.resetNewTabURL();
   },
 
   onCustomHomePageInput(event) {
@@ -443,8 +635,17 @@
       !this.isPocketNewtabEnabled &&
       this.homePanePrefs.some(pref => pref.hasUserValue);
     const newtabPref = Preferences.get(this.NEWTAB_ENABLED_PREF);
+    const extensionControlled = Preferences.get(
+      "browser.startup.homepage_override.extensionControlled"
+    );
 
-    return homeContentChanged || HomePage.overridden || newtabPref.hasUserValue;
+    return (
+      homeContentChanged ||
+      HomePage.overridden ||
+      newtabPref.hasUserValue ||
+      AboutNewTab.newTabURLOverridden ||
+      extensionControlled
+    );
   },
 
   /**
@@ -471,9 +672,6 @@
   init() {
     // Event Listeners
     document
-      .getElementById("homeMode")
-      .addEventListener("command", this.onMenuChange.bind(this));
-    document
       .getElementById("homePageUrl")
       .addEventListener("change", this.onCustomHomePageChange.bind(this));
     document
@@ -489,40 +687,24 @@
       .getElementById("restoreDefaultHomePageBtn")
       .addEventListener("command", this.restoreDefaultPrefsForHome.bind(this));
 
-    Preferences.addSyncFromPrefListener(
-      document.getElementById("homePrefHidden"),
-      () => this.syncFromHomePref()
-    );
-    Preferences.addSyncFromPrefListener(
-      document.getElementById("newTabMode"),
-      () => this.syncFromNewTabPref()
-    );
-    Preferences.addSyncToPrefListener(
-      document.getElementById("newTabMode"),
-      element => this.syncToNewTabPref(element.value)
-    );
+    // Setup the add-on options for the new tab section before registering the
+    // listener.
+    this._updateMenuInterface();
+    document
+      .getElementById("newTabMode")
+      .addEventListener("command", this.syncToNewTabPref.bind(this));
+    document
+      .getElementById("homeMode")
+      .addEventListener("command", this.onMenuChange.bind(this));
 
     this._updateUseCurrentButton();
+    this._handleHomePageOverrides();
     window.addEventListener("focus", this._updateUseCurrentButton.bind(this));
 
     // Extension/override-related events
     this.watchNewTab();
-    document
-      .getElementById("disableHomePageExtension")
-      .addEventListener(
-        "command",
-        makeDisableControllingExtension(
-          PREF_SETTING_TYPE,
-          HOMEPAGE_OVERRIDE_KEY
-        )
-      );
-    document
-      .getElementById("disableNewTabExtension")
-      .addEventListener(
-        "command",
-        makeDisableControllingExtension(URL_OVERRIDES_TYPE, NEW_TAB_KEY)
-      );
-
+    this.watchHomePrefChange();
+    this.watchExtensionPrefChange();
     this.watchHomeTabPrefChange();
     // Notify observers that the UI is now ready
     Services.obs.notifyObservers(window, "home-pane-loaded");
diff -Nru firefox-84.0.2+build1/browser/components/preferences/preferences.xhtml firefox-85.0+build1/browser/components/preferences/preferences.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/preferences.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/preferences.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -32,6 +32,7 @@
   <link rel="localization" href="branding/brand.ftl"/>
   <link rel="localization" href="browser/branding/brandings.ftl"/>
   <link rel="localization" href="browser/branding/sync-brand.ftl"/>
+  <link rel="localization" href="browser/browser.ftl"/>
   <link rel="localization" href="browser/preferences/preferences.ftl"/>
   <!-- Used by fontbuilder.js -->
   <link rel="localization" href="browser/preferences/fonts.ftl"/>
diff -Nru firefox-84.0.2+build1/browser/components/preferences/privacy.inc.xhtml firefox-85.0+build1/browser/components/preferences/privacy.inc.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/privacy.inc.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/privacy.inc.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -632,6 +632,8 @@
             preference="browser.urlbar.suggest.openpage"/>
   <checkbox id="topSitesSuggestion" data-l10n-id="addressbar-locbar-topsites-option"
             preference="browser.urlbar.suggest.topsites"/>
+  <checkbox id="enginesSuggestion" data-l10n-id="addressbar-locbar-engines-option"
+            preference="browser.urlbar.suggest.engines"/>
   <label id="openSearchEnginePreferences" is="text-link"
          data-l10n-id="addressbar-suggestions-settings"/>
 </groupbox>
@@ -943,22 +945,6 @@
 <!-- Certificates -->
 <groupbox id="certSelection" data-category="panePrivacy" hidden="true">
   <label><html:h2 data-l10n-id="certs-header"/></label>
-  <description id="CertSelectionDesc" control="certSelection" data-l10n-id="certs-personal-label"/>
-
-  <!--
-    The values on these radio buttons may look like l10n issues, but
-    they're not - this preference uses *those strings* as its values.
-    I KID YOU NOT.
-  -->
-  <radiogroup id="certSelection"
-              preftype="string"
-              preference="security.default_personal_cert"
-              aria-labelledby="CertSelectionDesc">
-    <radio data-l10n-id="certs-select-auto-option"
-           value="Select Automatically"/>
-    <radio data-l10n-id="certs-select-ask-option"
-           value="Ask Every Time"/>
-  </radiogroup>
   <hbox align="start">
     <checkbox id="enableOCSP"
               data-l10n-id="certs-enable-ocsp"
diff -Nru firefox-84.0.2+build1/browser/components/preferences/privacy.js firefox-85.0+build1/browser/components/preferences/privacy.js
--- firefox-84.0.2+build1/browser/components/preferences/privacy.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/privacy.js	2021-01-18 19:58:08.000000000 +0000
@@ -136,6 +136,7 @@
   { id: "browser.urlbar.suggest.history", type: "bool" },
   { id: "browser.urlbar.suggest.openpage", type: "bool" },
   { id: "browser.urlbar.suggest.topsites", type: "bool" },
+  { id: "browser.urlbar.suggest.engines", type: "bool" },
 
   // History
   { id: "places.history.enabled", type: "bool" },
diff -Nru firefox-84.0.2+build1/browser/components/preferences/search.inc.xhtml firefox-85.0+build1/browser/components/preferences/search.inc.xhtml
--- firefox-84.0.2+build1/browser/components/preferences/search.inc.xhtml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/search.inc.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -76,7 +76,7 @@
       <label><html:h2 data-l10n-id="search-one-click-header2" /></label>
       <description data-l10n-id="search-one-click-desc" />
 
-      <tree id="engineList" flex="1" rows="8" hidecolumnpicker="true" editable="true"
+      <tree id="engineList" flex="1" rows="11" hidecolumnpicker="true" editable="true"
             seltype="single" allowunderflowscroll="true">
         <treechildren id="engineChildren" flex="1"/>
         <treecols>
diff -Nru firefox-84.0.2+build1/browser/components/preferences/search.js firefox-85.0+build1/browser/components/preferences/search.js
--- firefox-84.0.2+build1/browser/components/preferences/search.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/search.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,16 @@
   "ExtensionSettingsStore",
   "resource://gre/modules/ExtensionSettingsStore.jsm"
 );
+ChromeUtils.defineModuleGetter(
+  this,
+  "UrlbarPrefs",
+  "resource:///modules/UrlbarPrefs.jsm"
+);
+ChromeUtils.defineModuleGetter(
+  this,
+  "UrlbarUtils",
+  "resource:///modules/UrlbarUtils.jsm"
+);
 
 Preferences.addAll([
   { id: "browser.search.suggest.enabled", type: "bool" },
@@ -402,7 +412,7 @@
       switch (aVerb) {
         case "engine-added":
           gEngineView._engineStore.addEngine(aEngine);
-          gEngineView.rowCountChanged(gEngineView.lastIndex, 1);
+          gEngineView.rowCountChanged(gEngineView.lastEngineIndex, 1);
           gSearchPane.buildDefaultEngineDropDowns();
           break;
         case "engine-changed":
@@ -465,7 +475,10 @@
 
     if (aEvent.charCode == KeyEvent.DOM_VK_SPACE) {
       // Space toggles the checkbox.
-      let newValue = !gEngineView._engineStore.engines[index].shown;
+      let newValue = !gEngineView.getCellValue(
+        index,
+        tree.columns.getNamedColumn("engineShown")
+      );
       gEngineView.setCellValue(
         index,
         tree.columns.getFirstColumn(),
@@ -494,6 +507,11 @@
   },
 
   startEditingAlias(index) {
+    // Local shortcut aliases can't be edited.
+    if (gEngineView._getLocalShortcut(index)) {
+      return;
+    }
+
     let tree = document.getElementById("engineList");
     let engine = gEngineView._engineStore.engines[index];
     tree.startEditing(index, tree.columns.getLastColumn());
@@ -515,7 +533,7 @@
     let index = gEngineView._engineStore.removeEngine(aEngine);
     gEngineView.rowCountChanged(index, -1);
     gEngineView.invalidate();
-    gEngineView.selection.select(Math.min(index, gEngineView.lastIndex));
+    gEngineView.selection.select(Math.min(index, gEngineView.rowCount - 1));
     gEngineView.ensureRowIsVisible(gEngineView.currentIndex);
     document.getElementById("engineList").focus();
   },
@@ -602,6 +620,13 @@
 
 function onDragEngineStart(event) {
   var selectedIndex = gEngineView.selectedIndex;
+
+  // Local shortcut rows can't be dragged or re-ordered.
+  if (gEngineView._getLocalShortcut(selectedIndex)) {
+    event.preventDefault();
+    return;
+  }
+
   var tree = document.getElementById("engineList");
   let cell = tree.getCellAt(event.clientX, event.clientY);
   if (selectedIndex >= 0 && !gEngineView.isCheckBox(cell.row, cell.col)) {
@@ -622,7 +647,7 @@
   ]).then(([visibleEngines, defaultEngines]) => {
     for (let engine of visibleEngines) {
       this.addEngine(engine);
-      gEngineView.rowCountChanged(gEngineView.lastIndex, 1);
+      gEngineView.rowCountChanged(gEngineView.lastEngineIndex, 1);
     }
     this._defaultEngines = defaultEngines.map(this._cloneEngine, this);
     gSearchPane.buildDefaultEngineDropDowns();
@@ -760,14 +785,38 @@
 
 function EngineView(aEngineStore) {
   this._engineStore = aEngineStore;
+
+  UrlbarPrefs.addObserver(this);
+
+  // This maps local shortcut sources to their l10n names.  The names are needed
+  // by getCellText.  Getting the names is async but getCellText is not, so we
+  // cache them here to retrieve them syncronously in getCellText.
+  this._localShortcutL10nNames = new Map();
+  document.l10n
+    .formatValues(
+      UrlbarUtils.LOCAL_SEARCH_MODES.map(mode => {
+        let name = UrlbarUtils.getResultSourceName(mode.source);
+        return { id: `urlbar-search-mode-${name}` };
+      })
+    )
+    .then(names => {
+      for (let { source } of UrlbarUtils.LOCAL_SEARCH_MODES) {
+        this._localShortcutL10nNames.set(source, names.shift());
+      }
+      // Invalidate the tree now that we have the names in case getCellText was
+      // called before name retrieval finished.
+      this.invalidate();
+    });
 }
+
 EngineView.prototype = {
   _engineStore: null,
   tree: null,
 
-  get lastIndex() {
-    return this.rowCount - 1;
+  get lastEngineIndex() {
+    return this._engineStore.engines.length - 1;
   },
+
   get selectedIndex() {
     var seln = this.selection;
     if (seln.getRangeCount() > 0) {
@@ -777,6 +826,7 @@
     }
     return -1;
   },
+
   get selectedEngine() {
     return this._engineStore.engines[this.selectedIndex];
   },
@@ -789,7 +839,7 @@
   },
 
   invalidate() {
-    this.tree.invalidate();
+    this.tree?.invalidate();
   },
 
   ensureRowIsVisible(index) {
@@ -805,16 +855,61 @@
   },
 
   isEngineSelectedAndRemovable() {
-    return this.selectedIndex != -1 && this.lastIndex != 0;
+    // We don't allow the last remaining engine to be removed, thus the
+    // `this.lastEngineIndex != 0` check.
+    return (
+      this.selectedIndex != -1 &&
+      this.lastEngineIndex != 0 &&
+      !this._getLocalShortcut(this.selectedIndex)
+    );
+  },
+
+  /**
+   * Returns the local shortcut corresponding to a tree row, or null if the row
+   * is not a local shortcut.
+   *
+   * @param {number} index
+   *   The tree row index.
+   * @returns {object}
+   *   The local shortcut object or null if the row is not a local shortcut.
+   */
+  _getLocalShortcut(index) {
+    let engineCount = this._engineStore.engines.length;
+    if (index < engineCount) {
+      return null;
+    }
+    return UrlbarUtils.LOCAL_SEARCH_MODES[index - engineCount];
+  },
+
+  /**
+   * Called by UrlbarPrefs when a urlbar pref changes.
+   *
+   * @param {string} pref
+   *   The name of the pref relative to the browser.urlbar branch.
+   */
+  onPrefChanged(pref) {
+    // If one of the local shortcut prefs was toggled, toggle its row's
+    // checkbox.
+    let parts = pref.split(".");
+    if (parts[0] == "shortcuts" && parts[1] && parts.length == 2) {
+      this.invalidate();
+    }
   },
 
   // nsITreeView
   get rowCount() {
-    return this._engineStore.engines.length;
+    return (
+      this._engineStore.engines.length + UrlbarUtils.LOCAL_SEARCH_MODES.length
+    );
   },
 
   getImageSrc(index, column) {
     if (column.id == "engineName") {
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        return shortcut.icon;
+      }
+
       if (this._engineStore.engines[index].iconURI) {
         return this._engineStore.engines[index].iconURI.spec;
       }
@@ -830,8 +925,16 @@
 
   getCellText(index, column) {
     if (column.id == "engineName") {
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        return this._localShortcutL10nNames.get(shortcut.source) || "";
+      }
       return this._engineStore.engines[index].name;
     } else if (column.id == "engineKeyword") {
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        return shortcut.restrict;
+      }
       return this._engineStore.engines[index].originalEngine.aliases.join(", ");
     }
     return "";
@@ -846,11 +949,19 @@
     return (
       sourceIndex != -1 &&
       sourceIndex != targetIndex &&
-      sourceIndex != targetIndex + orientation
+      sourceIndex != targetIndex + orientation &&
+      // Local shortcut rows can't be dragged or dropped on.
+      targetIndex < this._engineStore.engines.length
     );
   },
 
   async drop(dropIndex, orientation, dataTransfer) {
+    // Local shortcut rows can't be dragged or dropped on.  This can sometimes
+    // be reached even though canDrop returns false for these rows.
+    if (this._engineStore.engines.length <= dropIndex) {
+      return;
+    }
+
     var sourceIndex = this.getSourceIndexFromDrag(dataTransfer);
     var sourceEngine = this._engineStore.engines[sourceIndex];
 
@@ -877,6 +988,14 @@
     return "";
   },
   getCellProperties(index, column) {
+    if (column.id == "engineName") {
+      // For local shortcut rows, return the result source name so we can style
+      // the icons in CSS.
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        return UrlbarUtils.getResultSourceName(shortcut.source);
+      }
+    }
     return "";
   },
   getColumnProperties(column) {
@@ -908,6 +1027,10 @@
   },
   getCellValue(index, column) {
     if (column.id == "engineShown") {
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        return UrlbarPrefs.get(shortcut.pref);
+      }
       return this._engineStore.engines[index].shown;
     }
     return undefined;
@@ -917,10 +1040,19 @@
   selectionChanged() {},
   cycleCell(row, column) {},
   isEditable(index, column) {
-    return column.id != "engineName";
+    return (
+      column.id != "engineName" &&
+      (column.id == "engineShown" || !this._getLocalShortcut(index))
+    );
   },
   setCellValue(index, column, value) {
     if (column.id == "engineShown") {
+      let shortcut = this._getLocalShortcut(index);
+      if (shortcut) {
+        UrlbarPrefs.set(shortcut.pref, value == "true");
+        this.invalidate();
+        return;
+      }
       this._engineStore.engines[index].shown = value == "true";
       gEngineView.invalidate();
       gSearchPane.saveOneClickEnginesList();
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_contentblocking_categories.js firefox-85.0+build1/browser/components/preferences/tests/browser_contentblocking_categories.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_contentblocking_categories.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_contentblocking_categories.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,6 +16,7 @@
 const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 const CM_PREF = "privacy.trackingprotection.cryptomining.enabled";
 const STP_PREF = "privacy.trackingprotection.socialtracking.enabled";
+const LEVEL2_PREF = "privacy.annotate_channels.strict_list.enabled";
 const STRICT_DEF_PREF = "browser.contentblocking.features.strict";
 
 // Tests that the content blocking standard category definition is based on the default settings of
@@ -54,6 +55,10 @@
     !Services.prefs.prefHasUserValue(NCB_PREF),
     `${NCB_PREF} pref has the default value`
   );
+  ok(
+    !Services.prefs.prefHasUserValue(LEVEL2_PREF),
+    `${LEVEL2_PREF} pref has the default value`
+  );
 
   let defaults = Services.prefs.getDefaultBranch("");
   let originalTP = defaults.getBoolPref(TP_PREF);
@@ -62,6 +67,7 @@
   let originalCM = defaults.getBoolPref(CM_PREF);
   let originalSTP = defaults.getBoolPref(STP_PREF);
   let originalNCB = defaults.getIntPref(NCB_PREF);
+  let originalLEVEL2 = defaults.getBoolPref(LEVEL2_PREF);
 
   let nonDefaultNCB;
   switch (originalNCB) {
@@ -79,6 +85,7 @@
   defaults.setBoolPref(CM_PREF, !originalCM);
   defaults.setBoolPref(CM_PREF, !originalSTP);
   defaults.setIntPref(NCB_PREF, !originalNCB);
+  defaults.setBoolPref(LEVEL2_PREF, !originalLEVEL2);
 
   ok(
     !Services.prefs.prefHasUserValue(TP_PREF),
@@ -104,6 +111,10 @@
     !Services.prefs.prefHasUserValue(NCB_PREF),
     `${NCB_PREF} pref has the default value`
   );
+  ok(
+    !Services.prefs.prefHasUserValue(LEVEL2_PREF),
+    `${LEVEL2_PREF} pref has the default value`
+  );
 
   // cleanup
   defaults.setIntPref(NCB_PREF, originalNCB);
@@ -113,6 +124,7 @@
   defaults.setBoolPref(CM_PREF, originalCM);
   defaults.setBoolPref(STP_PREF, originalSTP);
   defaults.setIntPref(NCB_PREF, originalNCB);
+  defaults.setBoolPref(LEVEL2_PREF, originalLEVEL2);
 });
 
 // Tests that the content blocking strict category definition changes the behavior
@@ -123,7 +135,7 @@
   let originalStrictPref = defaults.getStringPref(STRICT_DEF_PREF);
   defaults.setStringPref(
     STRICT_DEF_PREF,
-    "tp,tpPrivate,fp,cm,cookieBehavior0,stp"
+    "tp,tpPrivate,fp,cm,cookieBehavior0,stp,lvl2"
   );
   Services.prefs.setStringPref(CAT_PREF, "strict");
   is(
@@ -138,7 +150,7 @@
   );
   is(
     Services.prefs.getStringPref(STRICT_DEF_PREF),
-    "tp,tpPrivate,fp,cm,cookieBehavior0,stp",
+    "tp,tpPrivate,fp,cm,cookieBehavior0,stp,lvl2",
     `${STRICT_DEF_PREF} changed to what we set.`
   );
 
@@ -172,6 +184,11 @@
     Ci.nsICookieService.BEHAVIOR_ACCEPT,
     `${NCB_PREF} has been set to BEHAVIOR_REJECT_TRACKER`
   );
+  is(
+    Services.prefs.getBoolPref(LEVEL2_PREF),
+    true,
+    `${LEVEL2_PREF} pref has been set to true`
+  );
 
   // Note, if a pref is not listed it will use the default value, however this is only meant as a
   // backup if a mistake is made. The UI will not respond correctly.
@@ -200,10 +217,14 @@
     !Services.prefs.prefHasUserValue(NCB_PREF),
     `${NCB_PREF} pref has the default value`
   );
+  ok(
+    !Services.prefs.prefHasUserValue(LEVEL2_PREF),
+    `${LEVEL2_PREF} pref has the default value`
+  );
 
   defaults.setStringPref(
     STRICT_DEF_PREF,
-    "-tpPrivate,-fp,-cm,-tp,cookieBehavior3,-stp"
+    "-tpPrivate,-fp,-cm,-tp,cookieBehavior3,-stp,-lvl2"
   );
   is(
     Services.prefs.getBoolPref(TP_PREF),
@@ -235,6 +256,11 @@
     Ci.nsICookieService.BEHAVIOR_LIMIT_FOREIGN,
     `${NCB_PREF} has been set to BEHAVIOR_REJECT_TRACKER`
   );
+  is(
+    Services.prefs.getBoolPref(LEVEL2_PREF),
+    false,
+    `${LEVEL2_PREF} pref has been set to false`
+  );
 
   // cleanup
   defaults.setStringPref(STRICT_DEF_PREF, originalStrictPref);
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_contentblocking.js firefox-85.0+build1/browser/components/preferences/tests/browser_contentblocking.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_contentblocking.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_contentblocking.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,6 +13,7 @@
 const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 const STP_PREF = "privacy.trackingprotection.socialtracking.enabled";
 const CM_PREF = "privacy.trackingprotection.cryptomining.enabled";
+const LEVEL2_PREF = "privacy.annotate_channels.strict_list.enabled";
 const PREF_TEST_NOTIFICATIONS =
   "browser.safebrowsing.test-notifications.enabled";
 const STRICT_PREF = "browser.contentblocking.features.strict";
@@ -283,6 +284,7 @@
     [FP_PREF]: null,
     [STP_PREF]: null,
     [CM_PREF]: null,
+    [LEVEL2_PREF]: null,
   };
 
   for (let pref in prefs) {
@@ -311,6 +313,10 @@
   Services.prefs.setBoolPref(STP_PREF, !Services.prefs.getBoolPref(STP_PREF));
   Services.prefs.setBoolPref(FP_PREF, !Services.prefs.getBoolPref(FP_PREF));
   Services.prefs.setBoolPref(CM_PREF, !Services.prefs.getBoolPref(CM_PREF));
+  Services.prefs.setBoolPref(
+    LEVEL2_PREF,
+    !Services.prefs.getBoolPref(LEVEL2_PREF)
+  );
 
   for (let pref in prefs) {
     switch (Services.prefs.getPrefType(pref)) {
@@ -371,6 +377,7 @@
 add_task(async function testContentBlockingStrictCategory() {
   Services.prefs.setBoolPref(TP_PREF, false);
   Services.prefs.setBoolPref(TP_PBM_PREF, false);
+  Services.prefs.setBoolPref(LEVEL2_PREF, false);
   Services.prefs.setIntPref(
     NCB_PREF,
     Ci.nsICookieService.BEHAVIOR_LIMIT_FOREIGN
@@ -461,6 +468,20 @@
           `${CM_PREF} has been set to false`
         );
         break;
+      case "lvl2":
+        is(
+          Services.prefs.getBoolPref(LEVEL2_PREF),
+          true,
+          `${CM_PREF} has been set to true`
+        );
+        break;
+      case "-lvl2":
+        is(
+          Services.prefs.getBoolPref(LEVEL2_PREF),
+          false,
+          `${CM_PREF} has been set to false`
+        );
+        break;
       case "cookieBehavior0":
         is(
           Services.prefs.getIntPref(NCB_PREF),
@@ -868,13 +889,19 @@
 // if it is the only tab.
 add_task(async function testContentBlockingReloadWarningSingleTab() {
   Services.prefs.setStringPref(CAT_PREF, "standard");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, PRIVACY_PAGE);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, PRIVACY_PAGE);
+  await BrowserTestUtils.browserLoaded(
+    gBrowser.selectedBrowser,
+    false,
+    PRIVACY_PAGE
+  );
 
   let reloadWarnings = [
     ...gBrowser.contentDocument.querySelectorAll(
       ".content-blocking-warning.reload-tabs"
     ),
   ];
+  ok(reloadWarnings.length, "must have at least one reload warning");
   ok(
     reloadWarnings.every(el => el.hidden),
     "all of the warnings to reload tabs are initially hidden"
@@ -889,7 +916,8 @@
     "all of the warnings to reload tabs are still hidden"
   );
   Services.prefs.setStringPref(CAT_PREF, "standard");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:newtab");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:newtab");
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 });
 
 // Checks that the reload tabs message reloads all tabs except the active tab.
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_extension_controlled.js firefox-85.0+build1/browser/components/preferences/tests/browser_extension_controlled.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_extension_controlled.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_extension_controlled.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,6 +1,11 @@
 /* eslint-env webextensions */
 
 const PROXY_PREF = "network.proxy.type";
+const HOMEPAGE_URL_PREF = "browser.startup.homepage";
+const HOMEPAGE_OVERRIDE_KEY = "homepage_override";
+const URL_OVERRIDES_TYPE = "url_overrides";
+const NEW_TAB_KEY = "newTabURL";
+const PREF_SETTING_TYPE = "prefs";
 
 ChromeUtils.defineModuleGetter(
   this,
@@ -21,6 +26,10 @@
 );
 AddonTestUtils.initMochitest(this);
 
+const { ExtensionPreferencesManager } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionPreferencesManager.jsm"
+);
+
 const TEST_DIR = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
 const CHROME_URL_ROOT = TEST_DIR + "/";
 const PERMISSIONS_URL =
@@ -36,24 +45,6 @@
   return fileurl.QueryInterface(Ci.nsIFileURL);
 }
 
-async function installAddon(xpiName) {
-  let filePath = getSupportsFile(`addons/${xpiName}`).file;
-  let install = await AddonManager.getInstallForFile(filePath);
-  if (!install) {
-    throw new Error(`An install was not created for ${filePath}`);
-  }
-  return new Promise((resolve, reject) => {
-    install.addListener({
-      onDownloadFailed: reject,
-      onDownloadCancelled: reject,
-      onInstallFailed: reject,
-      onInstallCancelled: reject,
-      onInstallEnded: resolve,
-    });
-    install.install();
-  });
-}
-
 function waitForMessageChange(
   element,
   cb,
@@ -136,89 +127,209 @@
 }
 
 add_task(async function testExtensionControlledHomepage() {
+  const ADDON_ID = "@set_homepage";
+  const SECOND_ADDON_ID = "@second_set_homepage";
+
   await openPreferencesViaOpenPreferencesAPI("paneHome", { leaveOpen: true });
-  let doc = gBrowser.contentDocument;
+  let homepagePref = () => Services.prefs.getCharPref(HOMEPAGE_URL_PREF);
+  let originalHomepagePref = homepagePref();
   is(
     gBrowser.currentURI.spec,
     "about:preferences#home",
     "#home should be in the URI for about:preferences"
   );
-  let homepagePref = () =>
-    Services.prefs.getCharPref("browser.startup.homepage");
-  let originalHomepagePref = homepagePref();
-  let extensionHomepage = "https://developer.mozilla.org/";
-  let controlledContent = doc.getElementById("browserHomePageExtensionContent");
-
+  let doc = gBrowser.contentDocument;
   let homeModeEl = doc.getElementById("homeMode");
   let customSettingsSection = doc.getElementById("customSettings");
 
+  is(homeModeEl.itemCount, 3, "The menu list starts with 3 options");
+
+  let promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount === 4,
+    "wait for the addon option to be added as an option in the menu list"
+  );
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      name: "set_homepage",
+      applications: {
+        gecko: {
+          id: ADDON_ID,
+        },
+      },
+      chrome_settings_overrides: { homepage: "/home.html" },
+    },
+  });
+  await extension.startup();
+  await promise;
+
   // The homepage is set to the default and the custom settings section is hidden
-  ok(originalHomepagePref != extensionHomepage, "homepage is empty by default");
   is(homeModeEl.disabled, false, "The homepage menulist is enabled");
   is(
     customSettingsSection.hidden,
     true,
     "The custom settings element is hidden"
   );
-  is(controlledContent.hidden, true, "The extension controlled row is hidden");
 
-  // Install an extension that will set the homepage.
-  let promise = waitForMessageShown("browserHomePageExtensionContent");
-  await installAddon("set_homepage.xpi");
+  let addon = await AddonManager.getAddonByID(ADDON_ID);
+  is(
+    homeModeEl.value,
+    addon.id,
+    "the home select menu's value is set to the addon"
+  );
+
+  promise = TestUtils.waitForPrefChange(HOMEPAGE_URL_PREF);
+  // Set the Menu to the default value
+  homeModeEl.value = "0";
+  homeModeEl.dispatchEvent(new Event("command"));
   await promise;
+  is(homepagePref(), originalHomepagePref, "homepage is set back to default");
+  let levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    addon.id,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
+  );
+  is(
+    levelOfControl,
+    "not_controllable",
+    "getLevelOfControl returns not_controllable."
+  );
+  let setting = await ExtensionPreferencesManager.getSetting(
+    HOMEPAGE_OVERRIDE_KEY
+  );
+  ok(!setting.value, "the setting is not set.");
 
-  // The homepage has been set by the extension, the user is notified and it isn't editable.
-  let controlledLabel = controlledContent.querySelector("description");
-  is(homepagePref(), extensionHomepage, "homepage is set by extension");
-  Assert.deepEqual(
-    doc.l10n.getAttributes(controlledLabel),
-    {
-      id: "extension-controlled-homepage-override",
-      args: {
-        name: "set_homepage",
+  promise = TestUtils.waitForPrefChange(HOMEPAGE_URL_PREF);
+  // Set the menu to the addon value
+  homeModeEl.value = ADDON_ID;
+  homeModeEl.dispatchEvent(new Event("command"));
+  await promise;
+  ok(
+    homepagePref().startsWith("moz-extension") &&
+      homepagePref().endsWith("home.html"),
+    "Home url should be provided by the extension."
+  );
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    addon.id,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
+  );
+  is(
+    levelOfControl,
+    "controlled_by_this_extension",
+    "getLevelOfControl returns controlled_by_this_extension."
+  );
+  setting = await ExtensionPreferencesManager.getSetting(HOMEPAGE_OVERRIDE_KEY);
+  ok(
+    setting.value.startsWith("moz-extension") &&
+      setting.value.endsWith("home.html"),
+    "The setting value is the same as the extension."
+  );
+
+  // Add a second extension, ensure it is added to the menulist and selected.
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 5,
+    "addon option is added as an option in the menu list"
+  );
+  let secondExtension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      name: "second_set_homepage",
+      applications: {
+        gecko: {
+          id: SECOND_ADDON_ID,
+        },
       },
+      chrome_settings_overrides: { homepage: "/home2.html" },
     },
-    "The user is notified that an extension is controlling the homepage"
-  );
-  is(controlledContent.hidden, false, "The extension controlled row is hidden");
-  is(homeModeEl.disabled, true, "The homepage input is disabled");
+  });
+  await secondExtension.startup();
+  await promise;
 
-  // Disable the extension.
-  let enableMessageShown = waitForEnableMessage(controlledContent.id);
-  doc.getElementById("disableHomePageExtension").click();
-  await enableMessageShown;
+  let secondAddon = await AddonManager.getAddonByID(SECOND_ADDON_ID);
+  is(homeModeEl.value, SECOND_ADDON_ID, "home menulist is set to the add-on");
 
-  // The user is notified how to enable the extension.
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    secondAddon.id,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
+  );
   is(
-    doc.l10n.getAttributes(controlledLabel.querySelector("label")).id,
-    "extension-controlled-enable",
-    "The user is notified of how to enable the extension again"
+    levelOfControl,
+    "controlled_by_this_extension",
+    "getLevelOfControl returns controlled_by_this_extension."
+  );
+  setting = await ExtensionPreferencesManager.getSetting(HOMEPAGE_OVERRIDE_KEY);
+  ok(
+    setting.value.startsWith("moz-extension") &&
+      setting.value.endsWith("home2.html"),
+    "The setting value is the same as the extension."
   );
 
-  // The user can dismiss the enable instructions.
-  let hidden = waitForMessageHidden("browserHomePageExtensionContent");
-  controlledLabel.querySelector("image:last-of-type").click();
-  await hidden;
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 4,
+    "addon option is no longer an option in the menu list after disable, even if it was not selected"
+  );
+  await addon.disable();
+  await promise;
+
+  // Ensure that re-enabling an addon adds it back to the menulist
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 5,
+    "addon option is added again to the menulist when enabled"
+  );
+  await addon.enable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 4,
+    "addon option is no longer an option in the menu list after disable"
+  );
+  await secondAddon.disable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 5,
+    "addon option is added again to the menulist when enabled"
+  );
+  await secondAddon.enable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => homeModeEl.itemCount == 3,
+    "addon options are no longer an option in the menu list after disabling all addons"
+  );
+  await secondAddon.disable();
+  await addon.disable();
+  await promise;
+
+  is(homeModeEl.value, "0", "addon option is not selected in the menu list");
+
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    secondAddon.id,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
+  );
+  is(
+    levelOfControl,
+    "controllable_by_this_extension",
+    "getLevelOfControl returns controllable_by_this_extension."
+  );
+  setting = await ExtensionPreferencesManager.getSetting(HOMEPAGE_OVERRIDE_KEY);
+  ok(!setting.value, "The setting value is back to default.");
 
   // The homepage elements are reset to their original state.
   is(homepagePref(), originalHomepagePref, "homepage is set back to default");
   is(homeModeEl.disabled, false, "The homepage menulist is enabled");
-  is(controlledContent.hidden, true, "The extension controlled row is hidden");
-
-  // Cleanup the add-on and tab.
-  let addon = await AddonManager.getAddonByID("@set_homepage");
-  // Enable the extension so we get the UNINSTALL event, which is needed by
-  // ExtensionPreferencesManager to clean up properly.
-  // FIXME: See https://bugzilla.mozilla.org/show_bug.cgi?id=1408226.
-  promise = waitForMessageShown("browserHomePageExtensionContent");
-  await addon.enable();
-  await promise;
-  // Do the uninstall now that the enable code has been run.
-  await addon.uninstall();
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  await extension.unload();
+  await secondExtension.unload();
 });
 
 add_task(async function testPrefLockedHomepage() {
+  const ADDON_ID = "@set_homepage";
   await openPreferencesViaOpenPreferencesAPI("paneHome", { leaveOpen: true });
   let doc = gBrowser.contentDocument;
   is(
@@ -237,7 +348,6 @@
   let homePageInput = doc.getElementById("homePageUrl");
   let prefs = Services.prefs.getDefaultBranch(null);
   let mutationOpts = { attributes: true, attributeFilter: ["disabled"] };
-  let controlledContent = doc.getElementById("browserHomePageExtensionContent");
 
   // Helper functions.
   let getButton = pref =>
@@ -277,14 +387,39 @@
     prefs.setCharPref(homePagePref, originalHomepage);
   };
 
+  // Lock or unlock prefs then wait for all mutations to finish.
+  // Expects a bool indicating if we should lock or unlock.
+  let waitForLockMutations = lock => {
+    let mutationsDone = waitForAllMutations();
+    if (lock) {
+      lockPrefs();
+    } else {
+      unlockPrefs();
+    }
+    return mutationsDone;
+  };
+
   ok(
     originalHomepage != extensionHomepage,
     "The extension will change the homepage"
   );
 
   // Install an extension that sets the homepage to MDN.
-  let promise = waitForMessageShown(controlledContent.id);
-  await installAddon("set_homepage.xpi");
+  let promise = TestUtils.waitForPrefChange(HOMEPAGE_URL_PREF);
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      name: "set_homepage",
+      applications: {
+        gecko: {
+          id: ADDON_ID,
+        },
+      },
+      chrome_settings_overrides: { homepage: "https://developer.mozilla.org/" },
+    },
+  });
+  await extension.startup();
   await promise;
 
   // Check that everything is still disabled, homepage didn't change.
@@ -298,34 +433,9 @@
     extensionHomepage,
     "The homepage is set by the extension"
   );
-  is(
-    homePageInput.disabled,
-    true,
-    "Homepage custom input is disabled when set by extension"
-  );
-  is(
-    homeModeEl.disabled,
-    true,
-    "Homepage menulist is disabled when set by extension"
-  );
-  buttonPrefs.forEach(pref => {
-    is(
-      getButton(pref).disabled,
-      true,
-      `${pref} is disabled when set by extension`
-    );
-  });
-  is(
-    controlledContent.hidden,
-    false,
-    "The extension controlled message is shown"
-  );
 
   // Lock all of the prefs, wait for the UI to update.
-  let messageHidden = waitForMessageHidden(controlledContent.id);
-
-  lockPrefs();
-  await messageHidden;
+  await waitForLockMutations(true);
 
   // Check that everything is now disabled.
   is(getHomepage(), lockedHomepage, "The reported homepage is set by the pref");
@@ -335,11 +445,6 @@
     true,
     "The homepage is disabed when the pref is locked"
   );
-  is(
-    homeModeEl.disabled,
-    true,
-    "Homepage menulist is disabled when the pref is locked"
-  );
 
   buttonPrefs.forEach(pref => {
     is(
@@ -348,52 +453,70 @@
       `The ${pref} button is disabled when locked`
     );
   });
+
+  let levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    ADDON_ID,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
+  );
   is(
-    controlledContent.hidden,
-    true,
-    "The extension controlled message is hidden when locked"
+    levelOfControl,
+    "not_controllable",
+    "getLevelOfControl returns not_controllable, the pref is locked."
   );
 
+  // Verify that the UI is selecting the extension's Id in the menulist
+  let unlockedPromise = TestUtils.waitForCondition(
+    () => homeModeEl.value == ADDON_ID,
+    "Homepage menulist value is equal to the extension ID"
+  );
   // Unlock the prefs, wait for the UI to update.
-  let messageShown = waitForMessageShown(controlledContent.id);
   unlockPrefs();
-  await messageShown;
+  await unlockedPromise;
 
-  // Verify that the UI is showing the extension's settings.
   is(
-    homePageInput.value,
-    extensionHomepage,
-    "The homepage is set by the extension"
+    homeModeEl.disabled,
+    false,
+    "the home select element is not disabled when the pref is not locked"
   );
   is(
     homePageInput.disabled,
-    true,
-    "Homepage is disabled when set by extension"
+    false,
+    "The homepage is enabled when the pref is unlocked"
   );
   is(
-    homeModeEl.disabled,
-    true,
-    "Homepage menulist is disabled when set by extension"
+    getHomepage(),
+    extensionHomepage,
+    "The homepage is reset to extension page"
+  );
+
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    ADDON_ID,
+    HOMEPAGE_OVERRIDE_KEY,
+    PREF_SETTING_TYPE
   );
-  buttonPrefs.forEach(pref => {
-    is(
-      getButton(pref).disabled,
-      true,
-      `${pref} is disabled when set by extension`
-    );
-  });
   is(
-    controlledContent.hidden,
-    false,
-    "The extension controlled message is shown when unlocked"
+    levelOfControl,
+    "controlled_by_this_extension",
+    "getLevelOfControl returns controlled_by_this_extension after prefs are unlocked."
+  );
+  let setting = await ExtensionPreferencesManager.getSetting(
+    HOMEPAGE_OVERRIDE_KEY
+  );
+  is(
+    setting.value,
+    extensionHomepage,
+    "The setting value is equal to the extensionHomepage."
   );
 
   // Uninstall the add-on.
-  let addon = await AddonManager.getAddonByID("@set_homepage");
-  promise = waitForEnableMessage(controlledContent.id);
-  await addon.uninstall();
+  promise = TestUtils.waitForPrefChange(HOMEPAGE_URL_PREF);
+  await extension.unload();
   await promise;
 
+  setting = await ExtensionPreferencesManager.getSetting(HOMEPAGE_OVERRIDE_KEY);
+  ok(!setting, "The setting is gone after the addon is uninstalled.");
+
   // Check that everything is now enabled again.
   is(
     getHomepage(),
@@ -420,9 +543,7 @@
   });
 
   // Lock the prefs without an extension.
-  let mutationsDone = waitForAllMutations();
-  lockPrefs();
-  await mutationsDone;
+  await waitForLockMutations(true);
 
   // Check that everything is now disabled.
   is(getHomepage(), lockedHomepage, "The reported homepage is set by the pref");
@@ -435,7 +556,7 @@
   is(
     homeModeEl.disabled,
     true,
-    "Homepage menulist is disabled when prefis locked"
+    "Homepage menulist is disabled when pref is locked"
   );
   buttonPrefs.forEach(pref => {
     is(
@@ -446,8 +567,7 @@
   });
 
   // Unlock the prefs without an extension.
-  unlockPrefs();
-  await waitForAllMutations();
+  await waitForLockMutations(false);
 
   // Check that everything is enabled again.
   is(
@@ -473,81 +593,192 @@
       `The ${pref} button is enabled when unlocked`
     );
   });
-  is(
-    controlledContent.hidden,
-    true,
-    "The extension controlled message is hidden when unlocked with no extension"
-  );
 
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
 });
 
 add_task(async function testExtensionControlledNewTab() {
+  const ADDON_ID = "@set_newtab";
+  const SECOND_ADDON_ID = "@second_set_newtab";
+  const DEFAULT_NEWTAB = "about:newtab";
+  const NEWTAB_CONTROLLED_PREF = "browser.newtab.extensionControlled";
+
   await openPreferencesViaOpenPreferencesAPI("paneHome", { leaveOpen: true });
-  let doc = gBrowser.contentDocument;
   is(
     gBrowser.currentURI.spec,
     "about:preferences#home",
     "#home should be in the URI for about:preferences"
   );
 
-  let controlledContent = doc.getElementById("browserNewTabExtensionContent");
-
-  // The new tab is set to the default and message is hidden.
-  ok(!AboutNewTab.newTabURL.startsWith("moz-extension:"), "new tab is not set");
-  is(controlledContent.hidden, true, "The extension controlled row is hidden");
-
+  let doc = gBrowser.contentDocument;
+  let newTabMenuList = doc.getElementById("newTabMode");
+  // The new tab page is set to the default.
+  is(AboutNewTab.newTabURL, DEFAULT_NEWTAB, "new tab is set to default");
+
+  let promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 3,
+    "addon option is added as an option in the menu list"
+  );
   // Install an extension that will set the new tab page.
-  let promise = waitForMessageShown("browserNewTabExtensionContent");
-  await installAddon("set_newtab.xpi");
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      name: "set_newtab",
+      applications: {
+        gecko: {
+          id: ADDON_ID,
+        },
+      },
+      chrome_url_overrides: { newtab: "/newtab.html" },
+    },
+  });
+  await extension.startup();
+
   await promise;
+  let addon = await AddonManager.getAddonByID(ADDON_ID);
+
+  is(newTabMenuList.value, ADDON_ID, "New tab menulist is set to the add-on");
 
-  // The new tab page has been set by the extension and the user is notified.
-  let controlledLabel = controlledContent.querySelector("description");
+  let levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    addon.id,
+    NEW_TAB_KEY,
+    URL_OVERRIDES_TYPE
+  );
+  is(
+    levelOfControl,
+    "controlled_by_this_extension",
+    "getLevelOfControl returns controlled_by_this_extension."
+  );
+  let setting = ExtensionSettingsStore.getSetting(
+    URL_OVERRIDES_TYPE,
+    NEW_TAB_KEY
+  );
   ok(
-    AboutNewTab.newTabURL.startsWith("moz-extension:"),
-    "new tab url is set by extension"
+    setting.value.startsWith("moz-extension") &&
+      setting.value.endsWith("newtab.html"),
+    "The url_overrides is set by this extension"
   );
-  Assert.deepEqual(
-    doc.l10n.getAttributes(controlledLabel),
-    {
-      id: "extension-controlled-new-tab-url",
-      args: {
-        name: "set_newtab",
+
+  promise = TestUtils.waitForPrefChange(NEWTAB_CONTROLLED_PREF);
+  // Set the menu to the default value
+  newTabMenuList.value = "0";
+  newTabMenuList.dispatchEvent(new Event("command"));
+  await promise;
+  let newTabPref = Services.prefs.getBoolPref(NEWTAB_CONTROLLED_PREF, false);
+  is(newTabPref, false, "the new tab is not controlled");
+
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    addon.id,
+    NEW_TAB_KEY,
+    URL_OVERRIDES_TYPE
+  );
+  is(
+    levelOfControl,
+    "not_controllable",
+    "getLevelOfControl returns not_controllable."
+  );
+  setting = ExtensionSettingsStore.getSetting(URL_OVERRIDES_TYPE, NEW_TAB_KEY);
+  ok(!setting.value, "The url_overrides is not set by this extension");
+
+  promise = TestUtils.waitForPrefChange(NEWTAB_CONTROLLED_PREF);
+  // Set the menu to a the addon value
+  newTabMenuList.value = ADDON_ID;
+  newTabMenuList.dispatchEvent(new Event("command"));
+  await promise;
+  newTabPref = Services.prefs.getBoolPref(NEWTAB_CONTROLLED_PREF, false);
+  is(newTabPref, true, "the new tab is controlled");
+
+  // Add a second extension, ensure it is added to the menulist and selected.
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 4,
+    "addon option is added as an option in the menu list"
+  );
+  let secondExtension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      name: "second_set_newtab",
+      applications: {
+        gecko: {
+          id: SECOND_ADDON_ID,
+        },
       },
+      chrome_url_overrides: { newtab: "/newtab2.html" },
     },
-    "The user is notified that an extension is controlling the new tab page"
+  });
+  await secondExtension.startup();
+  await promise;
+  let secondAddon = await AddonManager.getAddonByID(SECOND_ADDON_ID);
+  is(
+    newTabMenuList.value,
+    SECOND_ADDON_ID,
+    "New tab menulist is set to the add-on"
   );
-  is(controlledContent.hidden, false, "The extension controlled row is hidden");
 
-  // Disable the extension.
-  doc.getElementById("disableNewTabExtension").click();
-
-  // Verify the user is notified how to enable the extension.
-  await waitForEnableMessage(controlledContent.id);
+  levelOfControl = await ExtensionPreferencesManager.getLevelOfControl(
+    secondAddon.id,
+    NEW_TAB_KEY,
+    URL_OVERRIDES_TYPE
+  );
   is(
-    doc.l10n.getAttributes(controlledLabel.querySelector("label")).id,
-    "extension-controlled-enable",
-    "The user is notified of how to enable the extension again"
+    levelOfControl,
+    "controlled_by_this_extension",
+    "getLevelOfControl returns controlled_by_this_extension."
+  );
+  setting = ExtensionSettingsStore.getSetting(URL_OVERRIDES_TYPE, NEW_TAB_KEY);
+  ok(
+    setting.value.startsWith("moz-extension") &&
+      setting.value.endsWith("newtab2.html"),
+    "The url_overrides is set by the second extension"
   );
 
-  // Verify the enable message can be dismissed.
-  let hidden = waitForMessageHidden(controlledContent.id);
-  let dismissButton = controlledLabel.querySelector("image:last-of-type");
-  dismissButton.click();
-  await hidden;
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 3,
+    "addon option is no longer an option in the menu list after disable, even if it was not selected"
+  );
+  await addon.disable();
+  await promise;
 
-  // Ensure the New Tab page has been reset and there is no message.
-  ok(
-    !AboutNewTab.newTabURL.startsWith("moz-extension:"),
+  // Ensure that re-enabling an addon adds it back to the menulist
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 4,
+    "addon option is added again to the menulist when enabled"
+  );
+  await addon.enable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 3,
+    "addon option is no longer an option in the menu list after disable"
+  );
+  await secondAddon.disable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 4,
+    "addon option is added again to the menulist when enabled"
+  );
+  await secondAddon.enable();
+  await promise;
+
+  promise = TestUtils.waitForCondition(
+    () => newTabMenuList.itemCount == 2,
+    "addon options are all removed after disabling all"
+  );
+  await addon.disable();
+  await secondAddon.disable();
+  await promise;
+  is(
+    AboutNewTab.newTabURL,
+    DEFAULT_NEWTAB,
     "new tab page is set back to default"
   );
-  is(controlledContent.hidden, true, "The extension controlled row is shown");
 
-  // Cleanup the tab and add-on.
+  // Cleanup the tabs and add-on.
   BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  let addon = await AddonManager.getAddonByID("@set_newtab");
-  await addon.uninstall();
+  await extension.unload();
+  await secondExtension.unload();
 });
 
 add_task(async function testExtensionControlledWebNotificationsPermission() {
@@ -648,19 +879,11 @@
       "about:preferences#home",
       "#home should be in the URI for about:preferences"
     );
-    let controlledContent = doc.getElementById(
-      "browserHomePageExtensionContent"
-    );
 
     // The homepage is enabled.
     let homepageInput = doc.getElementById("homePageUrl");
     is(homepageInput.disabled, false, "The homepage input is enabled");
     is(homepageInput.value, "", "The homepage input is empty");
-    is(
-      controlledContent.hidden,
-      true,
-      "The extension controlled row is hidden"
-    );
 
     BrowserTestUtils.removeTab(gBrowser.selectedTab);
   }
@@ -697,7 +920,7 @@
   let jsonFileName = "extension-settings.json";
   let storePath = PathUtils.join(await PathUtils.getProfileDir(), jsonFileName);
 
-  await IOUtils.writeAtomicUTF8(storePath, JSON.stringify(storeData));
+  await IOUtils.writeUTF8(storePath, JSON.stringify(storeData));
 
   // Reload the ExtensionSettingsStore so it will read the file on disk. Don't
   // finalize the current store since it will overwrite our file.
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser.ini firefox-85.0+build1/browser/components/preferences/tests/browser.ini
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -28,6 +28,7 @@
 [browser_search_within_preferences_2.js]
 [browser_search_within_preferences_command.js]
 [browser_search_subdialogs_within_preferences_1.js]
+skip-if = tsan # Bug 1678829
 [browser_search_subdialogs_within_preferences_2.js]
 [browser_search_subdialogs_within_preferences_3.js]
 [browser_search_subdialogs_within_preferences_4.js]
@@ -68,11 +69,12 @@
 [browser_homepage_default.js]
 [browser_https_only_section.js]
 [browser_extension_controlled.js]
-skip-if = ccov && (os == 'linux' || os == 'win') # Linux: bug 1613530, Windows: bug 1437051
+skip-if = tsan || ccov && (os == 'linux' || os == 'win') # Linux: bug 1613530, Windows: bug 1437051
 [browser_languages_subdialog.js]
 [browser_browser_languages_subdialog.js]
-skip-if = (!debug && os == 'win') # Bug 1518370
+skip-if = tsan || (!debug && os == 'win') # Bug 1518370
 [browser_layersacceleration.js]
+[browser_localSearchShortcuts.js]
 [browser_masterpassword.js]
 [browser_media_control.js]
 skip-if = (os == 'win' && os_version == '6.1') || (verify && os == 'mac') #Bug 1667454
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_localSearchShortcuts.js firefox-85.0+build1/browser/components/preferences/tests/browser_localSearchShortcuts.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_localSearchShortcuts.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_localSearchShortcuts.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,313 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Checks the local shortcut rows in the engines list of the search pane.
+ */
+
+"use strict";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
+  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
+});
+
+let gTree;
+
+add_task(async function init() {
+  let prefs = await openPreferencesViaOpenPreferencesAPI("search", {
+    leaveOpen: true,
+  });
+  registerCleanupFunction(() => {
+    BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  });
+
+  Assert.equal(
+    prefs.selectedPane,
+    "paneSearch",
+    "Sanity check: Search pane is selected by default"
+  );
+
+  gTree = gBrowser.contentDocument.querySelector("#engineList");
+  gTree.scrollIntoView();
+  gTree.focus();
+});
+
+// The rows should be visible and checked by default.
+add_task(async function visible() {
+  await checkRowVisibility(true);
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.equal(
+      gTree.view.getCellValue(row, gTree.columns.getNamedColumn("engineShown")),
+      "true",
+      "Row is checked initially"
+    );
+  });
+});
+
+// The rows should not be visible when the urlbar's update2 is disabled.
+add_task(async function update2Disabled() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.update2", false]],
+  });
+  await checkRowVisibility(false);
+  await SpecialPowers.popPrefEnv();
+  await checkRowVisibility(true);
+});
+
+// Toggling the browser.urlbar.shortcuts.* prefs should toggle the corresponding
+// checkboxes in the rows.
+add_task(async function syncFromPrefs() {
+  let col = gTree.columns.getNamedColumn("engineShown");
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "true",
+      "Row is checked initially"
+    );
+    await SpecialPowers.pushPrefEnv({
+      set: [[getUrlbarPrefName(shortcut.pref), false]],
+    });
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "false",
+      "Row is unchecked after disabling pref"
+    );
+    await SpecialPowers.popPrefEnv();
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "true",
+      "Row is checked after re-enabling pref"
+    );
+  });
+});
+
+// Pressing the space key while a row is selected should toggle its checkbox
+// and pref.
+add_task(async function syncToPrefs_spaceKey() {
+  let col = gTree.columns.getNamedColumn("engineShown");
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.ok(
+      UrlbarPrefs.get(shortcut.pref),
+      "Sanity check: Pref is enabled initially"
+    );
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "true",
+      "Row is checked initially"
+    );
+    gTree.view.selection.select(row);
+    EventUtils.synthesizeKey(" ", {}, gTree.ownerGlobal);
+    Assert.ok(
+      !UrlbarPrefs.get(shortcut.pref),
+      "Pref is disabled after pressing space key"
+    );
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "false",
+      "Row is unchecked after pressing space key"
+    );
+    Services.prefs.clearUserPref(getUrlbarPrefName(shortcut.pref));
+  });
+});
+
+// Clicking the checkbox in a local shortcut row should toggle the checkbox and
+// pref.
+add_task(async function syncToPrefs_click() {
+  let col = gTree.columns.getNamedColumn("engineShown");
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.ok(
+      UrlbarPrefs.get(shortcut.pref),
+      "Sanity check: Pref is enabled initially"
+    );
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "true",
+      "Row is checked initially"
+    );
+
+    let rect = gTree.getCoordsForCellItem(row, col, "cell");
+    let x = rect.x + rect.width / 2;
+    let y = rect.y + rect.height / 2;
+    EventUtils.synthesizeMouse(gTree.body, x, y, {}, gTree.ownerGlobal);
+
+    Assert.ok(
+      !UrlbarPrefs.get(shortcut.pref),
+      "Pref is disabled after clicking checkbox"
+    );
+    Assert.equal(
+      gTree.view.getCellValue(row, col),
+      "false",
+      "Row is unchecked after clicking checkbox"
+    );
+    Services.prefs.clearUserPref(getUrlbarPrefName(shortcut.pref));
+  });
+});
+
+// The keyword column should not be editable according to isEditable().
+add_task(async function keywordNotEditable_isEditable() {
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.ok(
+      !gTree.view.isEditable(
+        row,
+        gTree.columns.getNamedColumn("engineKeyword")
+      ),
+      "Keyword column is not editable"
+    );
+  });
+});
+
+// Pressing the enter key while a row is selected shouldn't allow the keyword to
+// be edited.
+add_task(async function keywordNotEditable_enterKey() {
+  let col = gTree.columns.getNamedColumn("engineKeyword");
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.ok(
+      shortcut.restrict,
+      "Sanity check: Shortcut restriction char is non-empty"
+    );
+    Assert.equal(
+      gTree.view.getCellText(row, col),
+      shortcut.restrict,
+      "Sanity check: Keyword column has correct restriction char initially"
+    );
+
+    gTree.view.selection.select(row);
+    EventUtils.synthesizeKey("KEY_Enter", {}, gTree.ownerGlobal);
+    EventUtils.sendString("newkeyword");
+    EventUtils.synthesizeKey("KEY_Enter", {}, gTree.ownerGlobal);
+
+    // Wait a moment to allow for any possible asynchronicity.
+    // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+    await new Promise(r => setTimeout(r, 500));
+
+    Assert.equal(
+      gTree.view.getCellText(row, col),
+      shortcut.restrict,
+      "Keyword column is still restriction char"
+    );
+  });
+});
+
+// Double-clicking the keyword column shouldn't allow the keyword to be edited.
+add_task(async function keywordNotEditable_click() {
+  let col = gTree.columns.getNamedColumn("engineKeyword");
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    Assert.ok(
+      shortcut.restrict,
+      "Sanity check: Shortcut restriction char is non-empty"
+    );
+    Assert.equal(
+      gTree.view.getCellText(row, col),
+      shortcut.restrict,
+      "Sanity check: Keyword column has correct restriction char initially"
+    );
+
+    let rect = gTree.getCoordsForCellItem(row, col, "text");
+    let x = rect.x + rect.width / 2;
+    let y = rect.y + rect.height / 2;
+
+    let promise = BrowserTestUtils.waitForEvent(gTree, "dblclick");
+
+    // Click once to select the row.
+    EventUtils.synthesizeMouse(
+      gTree.body,
+      x,
+      y,
+      { clickCount: 1 },
+      gTree.ownerGlobal
+    );
+
+    // Now double-click the keyword column.
+    EventUtils.synthesizeMouse(
+      gTree.body,
+      x,
+      y,
+      { clickCount: 2 },
+      gTree.ownerGlobal
+    );
+
+    await promise;
+
+    EventUtils.sendString("newkeyword");
+    EventUtils.synthesizeKey("KEY_Enter", {}, gTree.ownerGlobal);
+
+    // Wait a moment to allow for any possible asynchronicity.
+    // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+    await new Promise(r => setTimeout(r, 500));
+
+    Assert.equal(
+      gTree.view.getCellText(row, col),
+      shortcut.restrict,
+      "Keyword column is still restriction char"
+    );
+  });
+});
+
+/**
+ * Asserts that the engine and local shortcut rows are present in the tree.
+ */
+async function checkRowVisibility() {
+  let engines = await Services.search.getVisibleEngines();
+
+  Assert.equal(
+    gTree.view.rowCount,
+    engines.length + UrlbarUtils.LOCAL_SEARCH_MODES.length,
+    "Expected number of tree rows"
+  );
+
+  // Check the engine rows.
+  for (let row = 0; row < engines.length; row++) {
+    let engine = engines[row];
+    let text = gTree.view.getCellText(
+      row,
+      gTree.columns.getNamedColumn("engineName")
+    );
+    Assert.equal(
+      text,
+      engine.name,
+      `Sanity check: Tree row ${row} has expected engine name`
+    );
+  }
+
+  // Check the shortcut rows.
+  await forEachLocalShortcutRow(async (row, shortcut) => {
+    let text = gTree.view.getCellText(
+      row,
+      gTree.columns.getNamedColumn("engineName")
+    );
+    let name = UrlbarUtils.getResultSourceName(shortcut.source);
+    let l10nName = await gTree.ownerDocument.l10n.formatValue(
+      `urlbar-search-mode-${name}`
+    );
+    Assert.ok(l10nName, "Sanity check: l10n name is non-empty");
+    Assert.equal(text, l10nName, `Tree row ${row} has expected shortcut name`);
+  });
+}
+
+/**
+ * Calls a callback for each local shortcut row in the tree.
+ *
+ * @param {function} callback
+ *   Called for each local shortcut row like: callback(rowIndex, shortcutObject)
+ */
+async function forEachLocalShortcutRow(callback) {
+  let engines = await Services.search.getVisibleEngines();
+  for (let i = 0; i < UrlbarUtils.LOCAL_SEARCH_MODES.length; i++) {
+    let shortcut = UrlbarUtils.LOCAL_SEARCH_MODES[i];
+    let row = engines.length + i;
+    await callback(row, shortcut);
+  }
+}
+
+/**
+ * Prepends the `browser.urlbar.` branch to the given relative pref.
+ *
+ * @param {string} relativePref
+ *   A pref name relative to the `browser.urlbar.`.
+ * @returns {string}
+ *   The full pref name with `browser.urlbar.` prepended.
+ */
+function getUrlbarPrefName(relativePref) {
+  return `browser.urlbar.${relativePref}`;
+}
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_searchRestoreDefaults.js firefox-85.0+build1/browser/components/preferences/tests/browser_searchRestoreDefaults.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_searchRestoreDefaults.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_searchRestoreDefaults.js	2021-01-18 19:58:08.000000000 +0000
@@ -105,3 +105,88 @@
 
   gBrowser.removeCurrentTab();
 });
+
+// This removes the last two engines and then the remaining engines from top to
+// bottom, and then it restores the default engines.  See bug 1681818.
+add_task(async function test_removeOutOfOrder() {
+  await openPreferencesViaOpenPreferencesAPI("search", { leaveOpen: true });
+
+  let doc = gBrowser.selectedBrowser.contentDocument;
+  let restoreDefaultsButton = doc.getElementById("restoreDefaultSearchEngines");
+  Assert.ok(
+    restoreDefaultsButton.disabled,
+    "The restore-defaults button is disabled initially"
+  );
+
+  let tree = doc.querySelector("#engineList");
+  let removeEngineButton = doc.getElementById("removeEngineButton");
+  removeEngineButton.scrollIntoView();
+
+  let defaultEngines = await Services.search.getDefaultEngines();
+
+  // Remove the last two engines.  After each removal, the selection should move
+  // to the first local shortcut.
+  for (let i = 0; i < 2; i++) {
+    tree.view.selection.select(defaultEngines.length - i - 1);
+    let updatedPromise = SearchTestUtils.promiseSearchNotification(
+      SearchUtils.MODIFIED_TYPE.CHANGED,
+      SearchUtils.TOPIC_ENGINE_MODIFIED
+    );
+    removeEngineButton.click();
+    await updatedPromise;
+    Assert.ok(
+      removeEngineButton.disabled,
+      "The remove-engine button is disabled because a local shortcut is selected"
+    );
+    Assert.ok(
+      !restoreDefaultsButton.disabled,
+      "The restore-defaults button is enabled after removing an engine"
+    );
+  }
+
+  // Remove the remaining engines from top to bottom except for the final
+  // remaining engine, which by design can't be removed.
+  for (let i = 0; i < defaultEngines.length - 3; i++) {
+    tree.view.selection.select(0);
+    let updatedPromise = SearchTestUtils.promiseSearchNotification(
+      SearchUtils.MODIFIED_TYPE.CHANGED,
+      SearchUtils.TOPIC_ENGINE_MODIFIED
+    );
+    removeEngineButton.click();
+    await updatedPromise;
+    Assert.ok(
+      !restoreDefaultsButton.disabled,
+      "The restore-defaults button is enabled after removing an engine"
+    );
+  }
+  Assert.ok(
+    removeEngineButton.disabled,
+    "The remove-engine button is disabled because only one engine remains"
+  );
+
+  // Click the restore-defaults button.
+  let updatedPromise = SearchTestUtils.promiseSearchNotification(
+    SearchUtils.MODIFIED_TYPE.CHANGED,
+    SearchUtils.TOPIC_ENGINE_MODIFIED
+  );
+  restoreDefaultsButton.click();
+  await updatedPromise;
+
+  // Wait for the restore-defaults button to update its state.
+  await TestUtils.waitForCondition(
+    () => restoreDefaultsButton.disabled,
+    "Waiting for the restore-defaults button to become disabled"
+  );
+
+  Assert.ok(
+    restoreDefaultsButton.disabled,
+    "The restore-defaults button is disabled after restoring defaults"
+  );
+  Assert.equal(
+    tree.view.rowCount,
+    defaultEngines.length + UrlbarUtils.LOCAL_SEARCH_MODES.length,
+    "All engines are restored"
+  );
+
+  gBrowser.removeCurrentTab();
+});
diff -Nru firefox-84.0.2+build1/browser/components/preferences/tests/browser_statePartitioning_strings.js firefox-85.0+build1/browser/components/preferences/tests/browser_statePartitioning_strings.js
--- firefox-84.0.2+build1/browser/components/preferences/tests/browser_statePartitioning_strings.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/preferences/tests/browser_statePartitioning_strings.js	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const CB_STRICT_FEATURES_PREF = "browser.contentblocking.features.strict";
-const CB_STRICT_FEATURES_VALUE = "tp,tpPrivate,cookieBehavior5,cm,fp,stp";
+const CB_STRICT_FEATURES_VALUE = "tp,tpPrivate,cookieBehavior5,cm,fp,stp,lvl2";
 const MVP_UI_PREF = "browser.contentblocking.state-partitioning.mvp.ui.enabled";
 const FPI_PREF = "privacy.firstparty.isolate";
 const COOKIE_BEHAVIOR_PREF = "network.cookie.cookieBehavior";
diff -Nru firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js
--- firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_blobUrl.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,7 @@
     false,
     BASE_URI
   );
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, BASE_URI);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, BASE_URI);
   await loaded;
 
   let blobURL;
@@ -42,7 +42,7 @@
     false,
     BASE_URI
   );
-  await BrowserTestUtils.loadURI(privateTab, BASE_URI);
+  BrowserTestUtils.loadURI(privateTab, BASE_URI);
   await privateTabLoaded;
 
   await SpecialPowers.spawn(privateTab, [blobURL], function(url) {
diff -Nru firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
--- firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js	2021-01-18 19:58:08.000000000 +0000
@@ -156,21 +156,11 @@
 }
 
 function waitOnFaviconLoaded(aFaviconURL) {
-  return new Promise(resolve => {
-    let observer = {
-      onPageChanged(uri, attr, value, id) {
-        if (
-          attr === Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-          value === aFaviconURL
-        ) {
-          resolve();
-          PlacesUtils.history.removeObserver(observer, false);
-        }
-      },
-    };
-
-    PlacesUtils.history.addObserver(observer);
-  });
+  return PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events => events.some(e => e.faviconUrl == aFaviconURL),
+    "places"
+  );
 }
 
 async function assignCookies(aBrowser, aURL, aCookieValue) {
diff -Nru firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js
--- firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newtab_from_popup.js	2021-01-18 19:58:08.000000000 +0000
@@ -37,7 +37,7 @@
   // First, open a private browsing window, and load our
   // testing page.
   let privBrowser = privWin.gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(privBrowser, WINDOW_BODY);
+  BrowserTestUtils.loadURI(privBrowser, WINDOW_BODY);
   await BrowserTestUtils.browserLoaded(privBrowser);
 
   // Next, click on the link in the testing page, and ensure
diff -Nru firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js
--- firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js	2021-01-18 19:58:08.000000000 +0000
@@ -35,7 +35,7 @@
 
   async function testTabTitle(aWindow, url, insidePB, expected_title) {
     let tab = await BrowserTestUtils.openNewForegroundTab(aWindow.gBrowser);
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, url);
+    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
     await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
     await BrowserTestUtils.waitForCondition(() => {
diff -Nru firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
--- firefox-84.0.2+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,21 +19,19 @@
     });
   }
 
-  function promiseTestReady(aIsZoomedWindow, aWindow) {
+  async function promiseTestReady(aIsZoomedWindow, aWindow) {
     // Need to wait on two things, the ordering of which is not guaranteed:
     // (1) the page load, and (2) FullZoom's update to the new page's zoom
     // level.  FullZoom broadcasts "browser-fullZoom:location-change" when its
     // update is done.  (See bug 856366 for details.)
 
     let browser = aWindow.gBrowser.selectedBrowser;
-    return BrowserTestUtils.loadURI(browser, "about:blank")
-      .then(() => {
-        return Promise.all([
-          BrowserTestUtils.browserLoaded(browser),
-          promiseLocationChange(),
-        ]);
-      })
-      .then(() => doTest(aIsZoomedWindow, aWindow));
+    BrowserTestUtils.loadURI(browser, "about:blank");
+    await Promise.all([
+      BrowserTestUtils.browserLoaded(browser),
+      promiseLocationChange(),
+    ]);
+    doTest(aIsZoomedWindow, aWindow);
   }
 
   function doTest(aIsZoomedWindow, aWindow) {
diff -Nru firefox-84.0.2+build1/browser/components/prompts/PromptCollection.jsm firefox-85.0+build1/browser/components/prompts/PromptCollection.jsm
--- firefox-84.0.2+build1/browser/components/prompts/PromptCollection.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/prompts/PromptCollection.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -131,6 +131,48 @@
       result.QueryInterface(Ci.nsIPropertyBag2).get("buttonNumClicked") == 0
     );
   }
+
+  confirmFolderUpload(browsingContext, directoryName) {
+    let title;
+    let message;
+    let acceptLabel;
+
+    try {
+      title = this.stringBundles.dom.GetStringFromName(
+        "FolderUploadPrompt.title"
+      );
+      message = this.stringBundles.dom.formatStringFromName(
+        "FolderUploadPrompt.message",
+        [directoryName]
+      );
+      acceptLabel = this.stringBundles.dom.GetStringFromName(
+        "FolderUploadPrompt.acceptButtonLabel"
+      );
+    } catch (exception) {
+      Cu.reportError("Failed to get strings from dom.properties");
+      return false;
+    }
+
+    let buttonFlags =
+      Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 +
+      Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1 +
+      Services.prompt.BUTTON_POS_1_DEFAULT;
+
+    return (
+      Services.prompt.confirmExBC(
+        browsingContext,
+        Services.prompt.MODAL_TYPE_TAB,
+        title,
+        message,
+        buttonFlags,
+        acceptLabel,
+        null,
+        null,
+        null,
+        {}
+      ) === 0
+    );
+  }
 }
 
 const BUNDLES = {
diff -Nru firefox-84.0.2+build1/browser/components/protections/test/browser/head.js firefox-85.0+build1/browser/components/protections/test/browser/head.js
--- firefox-84.0.2+build1/browser/components/protections/test/browser/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/protections/test/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -83,7 +83,7 @@
 };
 
 registerCleanupFunction(function head_cleanup() {
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 // Used to replace AboutProtectionsParent.VPNSubStatus and Region.current
diff -Nru firefox-84.0.2+build1/browser/components/search/BrowserSearchTelemetry.jsm firefox-85.0+build1/browser/components/search/BrowserSearchTelemetry.jsm
--- firefox-84.0.2+build1/browser/components/search/BrowserSearchTelemetry.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/BrowserSearchTelemetry.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,352 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["BrowserSearchTelemetry"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
+});
+
+// A list of known search origins.
+const KNOWN_SEARCH_SOURCES = [
+  "abouthome",
+  "contextmenu",
+  "newtab",
+  "searchbar",
+  "system",
+  "urlbar",
+  "urlbar-searchmode",
+  "webextension",
+];
+
+const KNOWN_ONEOFF_SOURCES = [
+  "oneoff-urlbar",
+  "oneoff-searchbar",
+  "unknown", // Edge case: this is the searchbar (see bug 1195733 comment 7).
+];
+
+/**
+ * The handler class. TODO
+ */
+class BrowserSearchTelemetryHandler {
+  /**
+   * Determines if we should record a search for this browser instance.
+   * Private Browsing mode is normally skipped.
+   *
+   * @param {tabbrowser} tabbrowser
+   *   The browser where the search was loaded.
+   * @returns {boolean}
+   *   True if the search should be recorded, false otherwise.
+   */
+  shouldRecordSearchCount(tabbrowser) {
+    return (
+      !PrivateBrowsingUtils.isWindowPrivate(tabbrowser.ownerGlobal) ||
+      !Services.prefs.getBoolPref("browser.engagement.search_counts.pbm", false)
+    );
+  }
+
+  /**
+   * The main entry point for recording search related Telemetry. This includes
+   * search counts and engagement measurements.
+   *
+   * Telemetry records only search counts per engine and action origin, but
+   * nothing pertaining to the search contents themselves.
+   *
+   * @param {tabbrowser} tabbrowser
+   *        The tabbrowser where the search was loaded.
+   * @param {nsISearchEngine} engine
+   *        The engine handling the search.
+   * @param {string} source
+   *        Where the search originated from. See KNOWN_SEARCH_SOURCES for allowed
+   *        values.
+   * @param {object} [details] Options object.
+   * @param {boolean} [details.isOneOff=false]
+   *        true if this event was generated by a one-off search.
+   * @param {boolean} [details.isSuggestion=false]
+   *        true if this event was generated by a suggested search.
+   * @param {boolean} [details.isFormHistory=false]
+   *        true if this event was generated by a form history result.
+   * @param {string} [details.alias=null]
+   *        The search engine alias used in the search, if any.
+   * @param {object} [details.type=null]
+   *        The object describing the event that triggered the search.
+   * @throws if source is not in the known sources list.
+   */
+  recordSearch(tabbrowser, engine, source, details = {}) {
+    try {
+      if (!this.shouldRecordSearchCount(tabbrowser)) {
+        return;
+      }
+
+      const countIdPrefix = `${engine.telemetryId}.`;
+      const countIdSource = countIdPrefix + source;
+      let histogram = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS");
+
+      if (details.isOneOff) {
+        if (!KNOWN_ONEOFF_SOURCES.includes(source)) {
+          // Silently drop the error if this bogus call
+          // came from 'urlbar' or 'searchbar'. They're
+          // calling |recordSearch| twice from two different
+          // code paths because they want to record the search
+          // in SEARCH_COUNTS.
+          if (["urlbar", "searchbar"].includes(source)) {
+            histogram.add(countIdSource);
+            PartnerLinkAttribution.makeSearchEngineRequest(
+              engine,
+              details.url
+            ).catch(Cu.reportError);
+            return;
+          }
+          console.trace("Unknown source for one-off search: ", source);
+          return;
+        }
+      } else {
+        if (!KNOWN_SEARCH_SOURCES.includes(source)) {
+          console.trace("Unknown source for search: ", source);
+          return;
+        }
+        if (
+          details.alias &&
+          engine.isAppProvided &&
+          engine.aliases.includes(details.alias)
+        ) {
+          // This is a keyword search using an AppProvided engine.
+          // Record the source as "alias", not "urlbar".
+          histogram.add(countIdPrefix + "alias");
+        } else {
+          histogram.add(countIdSource);
+        }
+      }
+
+      // Dispatch the search signal to other handlers.
+      this._handleSearchAction(engine, source, details);
+    } catch (ex) {
+      // Catch any errors here, so that search actions are not broken if
+      // telemetry is broken for some reason.
+      console.error(ex);
+    }
+  }
+
+  _recordSearch(engine, url, source, action = null) {
+    // The one-off buttons are logged in two places, if we hit here with the
+    // action as oneoff and no url, then we are hitting the attribution case
+    // in `recordSearch` above. Really this needs re-architecturing so we
+    // do not have two distinct calls to `recordSearch` for one-offs
+    // (see bug 1662553).
+    if (!(action == "oneoff" && !url)) {
+      PartnerLinkAttribution.makeSearchEngineRequest(engine, url).catch(
+        Cu.reportError
+      );
+    }
+
+    let scalarKey = action ? "search_" + action : "search";
+    Services.telemetry.keyedScalarAdd(
+      "browser.engagement.navigation." + source,
+      scalarKey,
+      1
+    );
+    Services.telemetry.recordEvent("navigation", "search", source, action, {
+      engine: engine.telemetryId,
+    });
+  }
+
+  /**
+   * Records entry into the Urlbar's search mode.
+   *
+   * Telemetry records only which search mode is entered and how it was entered.
+   * It does not record anything pertaining to searches made within search mode.
+   * @param {object} searchMode
+   *   A search mode object. See UrlbarInput.setSearchMode documentation for
+   *   details.
+   */
+  recordSearchMode(searchMode) {
+    // Search mode preview is not search mode. Recording it would just create
+    // noise.
+    if (searchMode.isPreview) {
+      return;
+    }
+    let scalarKey;
+    if (searchMode.engineName) {
+      let engine = Services.search.getEngineByName(searchMode.engineName);
+      let resultDomain = engine.getResultDomain();
+      // For built-in engines, sanitize the data in a few special cases to make
+      // analysis easier.
+      if (!engine.isAppProvided) {
+        scalarKey = "other";
+      } else if (resultDomain.includes("amazon.")) {
+        // Group all the localized Amazon sites together.
+        scalarKey = "Amazon";
+      } else if (resultDomain.endsWith("wikipedia.org")) {
+        // Group all the localized Wikipedia sites together.
+        scalarKey = "Wikipedia";
+      } else {
+        scalarKey = searchMode.engineName;
+      }
+    } else if (searchMode.source) {
+      scalarKey = UrlbarUtils.getResultSourceName(searchMode.source) || "other";
+    }
+
+    Services.telemetry.keyedScalarAdd(
+      "urlbar.searchmode." + searchMode.entry,
+      scalarKey,
+      1
+    );
+  }
+
+  _handleSearchAction(engine, source, details) {
+    switch (source) {
+      case "urlbar":
+      case "oneoff-urlbar":
+      case "searchbar":
+      case "oneoff-searchbar":
+      case "unknown": // Edge case: this is the searchbar (see bug 1195733 comment 7).
+        this._handleSearchAndUrlbar(engine, source, details);
+        break;
+      case "urlbar-searchmode":
+        this._handleSearchAndUrlbar(engine, "urlbar_searchmode", details);
+        break;
+      case "abouthome":
+        this._recordSearch(engine, details.url, "about_home", "enter");
+        break;
+      case "newtab":
+        this._recordSearch(engine, details.url, "about_newtab", "enter");
+        break;
+      case "contextmenu":
+      case "system":
+      case "webextension":
+        this._recordSearch(engine, details.url, source);
+        break;
+    }
+  }
+
+  /**
+   * This function handles the "urlbar", "urlbar-oneoff", "searchbar" and
+   * "searchbar-oneoff" sources.
+   *
+   * @param {msISearchEngine} engine
+   *   The engine handling the search.
+   * @param {string} source
+   *   Where the search originated from.
+   * @param {object} details
+   *   @see recordSearch
+   */
+  _handleSearchAndUrlbar(engine, source, details) {
+    // We want "urlbar" and "urlbar-oneoff" (and similar cases) to go in the same
+    // scalar, but in a different key.
+
+    // When using one-offs in the searchbar we get an "unknown" source. See bug
+    // 1195733 comment 7 for the context. Fix-up the label here.
+    const sourceName =
+      source === "unknown" ? "searchbar" : source.replace("oneoff-", "");
+
+    const isOneOff = !!details.isOneOff;
+    if (isOneOff) {
+      // We will receive a signal from the "urlbar"/"searchbar" even when the
+      // search came from "oneoff-urlbar". That's because both signals
+      // are propagated from search.xml. Skip it if that's the case.
+      // Moreover, we skip the "unknown" source that comes from the searchbar
+      // when performing searches from the default search engine. See bug 1195733
+      // comment 7 for context.
+      if (["urlbar", "searchbar", "unknown"].includes(source)) {
+        return;
+      }
+
+      // If that's a legit one-off search signal, record it using the relative key.
+      this._recordSearch(engine, details.url, sourceName, "oneoff");
+      return;
+    }
+
+    // The search was not a one-off. It was a search with the default search engine.
+    if (details.isFormHistory) {
+      // It came from a form history result.
+      this._recordSearch(engine, details.url, sourceName, "formhistory");
+      return;
+    } else if (details.isSuggestion) {
+      // It came from a suggested search, so count it as such.
+      this._recordSearch(engine, details.url, sourceName, "suggestion");
+      return;
+    } else if (details.alias) {
+      // This one came from a search that used an alias.
+      this._recordSearch(engine, details.url, sourceName, "alias");
+      return;
+    }
+
+    // The search signal was generated by typing something and pressing enter.
+    this._recordSearch(engine, details.url, sourceName, "enter");
+  }
+
+  /**
+   * Records the method by which the user selected a result from the urlbar or
+   * searchbar.
+   *
+   * @param {Event} event
+   *        The event that triggered the selection.
+   * @param {string} source
+   *        Either "urlbar" or "searchbar" depending on the source.
+   * @param {number} index
+   *        The index that the user chose in the popup, or -1 if there wasn't a
+   *        selection.
+   * @param {string} userSelectionBehavior
+   *        How the user cycled through results before picking the current match.
+   *        Could be one of "tab", "arrow" or "none".
+   */
+  recordSearchSuggestionSelectionMethod(
+    event,
+    source,
+    index,
+    userSelectionBehavior = "none"
+  ) {
+    // If the contents of the histogram are changed then
+    // `UrlbarTestUtils.SELECTED_RESULT_METHODS` should also be updated.
+    if (source == "searchbar" && userSelectionBehavior != "none") {
+      throw new Error("Did not expect a selection behavior for the searchbar.");
+    }
+
+    let histogram = Services.telemetry.getHistogramById(
+      source == "urlbar"
+        ? "FX_URLBAR_SELECTED_RESULT_METHOD"
+        : "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+    );
+    // command events are from the one-off context menu.  Treat them as clicks.
+    // Note that we don't care about MouseEvent subclasses here, since
+    // those are not clicks.
+    let isClick =
+      event &&
+      (ChromeUtils.getClassName(event) == "MouseEvent" ||
+        event.type == "command");
+    let category;
+    if (isClick) {
+      category = "click";
+    } else if (index >= 0) {
+      switch (userSelectionBehavior) {
+        case "tab":
+          category = "tabEnterSelection";
+          break;
+        case "arrow":
+          category = "arrowEnterSelection";
+          break;
+        case "rightClick":
+          // Selected by right mouse button.
+          category = "rightClickEnter";
+          break;
+        default:
+          category = "enterSelection";
+      }
+    } else {
+      category = "enter";
+    }
+    histogram.add(category);
+  }
+}
+
+var BrowserSearchTelemetry = new BrowserSearchTelemetryHandler();
diff -Nru firefox-84.0.2+build1/browser/components/search/content/autocomplete-popup.js firefox-85.0+build1/browser/components/search/content/autocomplete-popup.js
--- firefox-84.0.2+build1/browser/components/search/content/autocomplete-popup.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/content/autocomplete-popup.js	2021-01-18 19:58:08.000000000 +0000
@@ -177,8 +177,9 @@
 
       // Check for middle-click or modified clicks on the search bar
       if (popupForSearchBar) {
-        BrowserUsageTelemetry.recordSearchbarSelectedResultMethod(
+        BrowserSearchTelemetry.recordSearchSuggestionSelectionMethod(
           aEvent,
+          "searchbar",
           this.selectedIndex
         );
 
diff -Nru firefox-84.0.2+build1/browser/components/search/content/searchbar.js firefox-85.0+build1/browser/components/search/content/searchbar.js
--- firefox-84.0.2+build1/browser/components/search/content/searchbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/content/searchbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -106,6 +106,10 @@
         "resource://gre/modules/FormHistory.jsm",
         {}
       ).FormHistory;
+      this.SearchSuggestionController = ChromeUtils.import(
+        "resource://gre/modules/SearchSuggestionController.jsm",
+        {}
+      ).SearchSuggestionController;
 
       Services.obs.addObserver(this.observer, "browser-search-engine-modified");
       Services.obs.addObserver(this.observer, "browser-search-service");
@@ -348,8 +352,9 @@
       let selection = this.telemetrySearchDetails;
       let oneOffRecorded = false;
 
-      BrowserUsageTelemetry.recordSearchbarSelectedResultMethod(
+      BrowserSearchTelemetry.recordSearchSuggestionSelectionMethod(
         aEvent,
+        "searchbar",
         selection ? selection.index : -1
       );
 
@@ -379,7 +384,10 @@
           if (!aEngine) {
             aEngine = this.currentEngine;
           }
-          BrowserSearch.recordOneoffSearchInTelemetry(aEngine, source, type);
+          BrowserSearchTelemetry.recordSearch(gBrowser, aEngine, source, {
+            type,
+            isOneOff: true,
+          });
         }
       }
 
@@ -407,7 +415,9 @@
       if (
         aData &&
         !PrivateBrowsingUtils.isWindowPrivate(window) &&
-        this.FormHistory.enabled
+        this.FormHistory.enabled &&
+        aData.length <=
+          this.SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH
       ) {
         this.FormHistory.update(
           {
@@ -439,7 +449,12 @@
         selection: telemetrySearchDetails,
         url: submission.uri,
       };
-      BrowserSearch.recordSearchInTelemetry(engine, "searchbar", details);
+      BrowserSearchTelemetry.recordSearch(
+        gBrowser,
+        engine,
+        "searchbar",
+        details
+      );
       // null parameter below specifies HTML response for search
       let params = {
         postData: submission.postData,
diff -Nru firefox-84.0.2+build1/browser/components/search/docs/index.rst firefox-85.0+build1/browser/components/search/docs/index.rst
--- firefox-84.0.2+build1/browser/components/search/docs/index.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/docs/index.rst	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,21 @@
+Search
+======
+
+This document describes the implementation of parts of Firefox's search interfaces.
+
+The search area covers:
+
+  * Search bar on the toolbar
+  * In-content search
+  * One-off search buttons on both the search and address bars
+
+Search Engine handling is taken care of with the `toolkit Search Service`_.
+
+Most of the search code lives in `browser/components/search`_.
+
+.. toctree::
+
+   telemetry
+
+.. _toolkit Search Service: /toolkit/search/index.html
+.. _browser/components/search: https://searchfox.org/mozilla-central/source/browser/components/search
diff -Nru firefox-84.0.2+build1/browser/components/search/docs/telemetry.rst firefox-85.0+build1/browser/components/search/docs/telemetry.rst
--- firefox-84.0.2+build1/browser/components/search/docs/telemetry.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/docs/telemetry.rst	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,45 @@
+Telemetry
+=========
+
+This section describes existing telemetry probes measuring interaction with
+search engines.
+
+Note: Some search related probes are also documented on the `address bar telemetry`_
+page.
+
+.. toctree::
+   :caption: Table of Contents
+
+   telemetry
+
+Search probes relevant to front-end searches
+--------------------------------------------
+
+The following probes are all handled by `SearchSERPTelemetry.jsm and the associated parent/child actors`_.
+
+Definitions:
+
+  * ``organic`` is a search that a user performs by visiting a search engine
+    directly.
+  * ``sap`` (search access point) is a search that a user performs by visiting
+    via one of Firefox's access points, using the associated partner codes.
+  * ``sap-follow-on`` is a SAP search where the user has first accessed the site
+    via a SAP, and then performed an additional search.
+  * ``SERP`` refers to a search engine result page.
+
+SEARCH_COUNTS
+  This histogram records search counts for visits to SERP in-content pages. It
+  also stores other items - see `address bar telemetry`_. For in-content
+  searches, the format is
+  ``<provider>.in-content:[sap|sap-follow-on|organic]:[code|none]``.
+
+browser.search.with_ads
+  This keyed scalar records counts of SERP pages with adverts displayed.
+  The key format is ``<provider>:<sap|organic>``.
+
+browser.search.ad_clicks
+  Records clicks of adverts on SERP pages. The key format is
+  ``<provider>:<sap|organic>``.
+
+.. _address bar telemetry: /browser/urlbar/telemetry.html
+.. _SearchSERPTelemetry.jsm and the associated parent/child actors: https://searchfox.org/mozilla-central/search?q=&path=SearchSERPTelemetry*.jsm&case=false&regexp=false
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/search/extensions/baidu/favicon.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/search/extensions/baidu/favicon.ico differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/browser/components/search/extensions/bing/favicon.ico and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/browser/components/search/extensions/bing/favicon.ico differ
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/bing/manifest.json firefox-85.0+build1/browser/components/search/extensions/bing/manifest.json
--- firefox-84.0.2+build1/browser/components/search/extensions/bing/manifest.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/bing/manifest.json	2021-01-18 19:58:08.000000000 +0000
@@ -1,8 +1,8 @@
 {
   "name": "Bing",
-  "description": "Bing. Search by Microsoft.",
+  "description": "Microsoft Bing",
   "manifest_version": 2,
-  "version": "1.2",
+  "version": "1.3",
   "applications": {
     "gecko": {
       "id": "bing@search.mozilla.org"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/bolcom/_locales/fy-NL/messages.json firefox-85.0+build1/browser/components/search/extensions/bolcom/_locales/fy-NL/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/bolcom/_locales/fy-NL/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/bolcom/_locales/fy-NL/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,7 +6,7 @@
     "message": "Sykje by bol.com"
   },
   "searchUrl": {
-    "message": "https://www.bol.com/nl/s/algemeen/zoekresultaten/Ntt/{searchTerms}/Ntk/media_all/Nty/1/suggestedFor/{searchTerms}/N/0/Ne/0/search/true/searchType/qck/index.html"
+    "message": "https://www.bol.com/nl/s/?searchtext={searchTerms}"
   },
   "searchForm": {
     "message": "https://www.bol.com/"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/bolcom/_locales/nl/messages.json firefox-85.0+build1/browser/components/search/extensions/bolcom/_locales/nl/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/bolcom/_locales/nl/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/bolcom/_locales/nl/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,7 +6,7 @@
     "message": "Zoeken bij bol.com"
   },
   "searchUrl": {
-    "message": "https://www.bol.com/nl/s/algemeen/zoekresultaten/Ntt/{searchTerms}/Ntk/media_all/Nty/1/suggestedFor/{searchTerms}/N/0/Ne/0/search/true/searchType/qck/index.html"
+    "message": "https://www.bol.com/nl/s/?searchtext={searchTerms}"
   },
   "searchForm": {
     "message": "https://www.bol.com/"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/bolcom/manifest.json firefox-85.0+build1/browser/components/search/extensions/bolcom/manifest.json
--- firefox-84.0.2+build1/browser/components/search/extensions/bolcom/manifest.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/bolcom/manifest.json	2021-01-18 19:58:08.000000000 +0000
@@ -2,7 +2,7 @@
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
   "manifest_version": 2,
-  "version": "1.0",
+  "version": "1.1",
   "applications": {
     "gecko": {
       "id": "bolcom@search.mozilla.org"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/at/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/at/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/at/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/at/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/5221-53469-19255-0/1"
+    "message": "https://www.ebay.at/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.at/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.at/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5221-53469-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=16&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/au/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/au/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/au/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/au/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/705-53470-19255-0/1"
+    "message": "https://www.ebay.com.au/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.com.au/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com.au/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=705-53470-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=15&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/be/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/be/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/be/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/be/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/1553-53471-19255-0/1"
+    "message": "https://www.befr.ebay.be/sch/"
   },
   "searchForm": {
     "message": "https://www.befr.ebay.be/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.befr.ebay.be/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1553-53471-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=23&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ca/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ca/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ca/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ca/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/706-53473-19255-0/1"
+    "message": "https://ebay.ca/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.ca/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ca/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=706-53473-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=2&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ch/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ch/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ch/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ch/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/5222-53480-19255-0/1"
+    "message": "https://www.ebay.ch/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.ch/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ch/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5222-53480-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=193&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/de/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/de/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/de/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/de/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/707-53477-19255-0/1"
+    "message": "https://ebay.de/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.de/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.de/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=707-53477-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=77&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/en/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/en/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/en/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/en/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/711-53200-19255-0/1"
+    "message": "https://www.ebay.com/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.com/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=711-53200-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=0&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/es/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/es/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/es/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/es/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/1185-53479-19255-0/1"
+    "message": "https://www.ebay.es/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.es/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.es/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1185-53479-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=186&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/fr/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/fr/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/fr/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/fr/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/709-53476-19255-0/1"
+    "message": "https://www.ebay.fr/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.fr/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.fr/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=709-53476-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=71&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ie/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ie/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/ie/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/ie/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/5282-53468-19255-0/1"
+    "message": "https://www.ebay.ie/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.ie/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ie/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5282-53468-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=205&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/it/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/it/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/it/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/it/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/724-53478-19255-0/1"
+    "message": "https://www.ebay.it/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.it/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.it/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=724-53478-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=101&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/nl/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/nl/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/nl/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/nl/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/1346-53482-19255-0/1"
+    "message": "https://www.ebay.nl/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.nl/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.nl/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1346-53482-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=146&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/uk/messages.json firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/uk/messages.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/_locales/uk/messages.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/_locales/uk/messages.json	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,13 @@
     "message": "eBay - Online auctions"
   },
   "searchUrl": {
-    "message": "https://rover.ebay.com/rover/1/710-53481-19255-0/1"
+    "message": "https://www.ebay.co.uk/sch/"
   },
   "searchForm": {
     "message": "https://www.ebay.co.uk/"
   },
   "searchUrlGetParams": {
-    "message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.co.uk/sch/{searchTerms}"
+    "message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=710-53481-19255-0&kw={searchTerms}"
   },
   "suggestUrlGetParams": {
     "message": "sId=3&fmt=osr&kwd={searchTerms}"
diff -Nru firefox-84.0.2+build1/browser/components/search/extensions/ebay/manifest.json firefox-85.0+build1/browser/components/search/extensions/ebay/manifest.json
--- firefox-84.0.2+build1/browser/components/search/extensions/ebay/manifest.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/extensions/ebay/manifest.json	2021-01-18 19:58:08.000000000 +0000
@@ -2,7 +2,7 @@
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
   "manifest_version": 2,
-  "version": "1.2",
+  "version": "1.3",
   "applications": {
     "gecko": {
       "id": "ebay@search.mozilla.org"
diff -Nru firefox-84.0.2+build1/browser/components/search/moz.build firefox-85.0+build1/browser/components/search/moz.build
--- firefox-84.0.2+build1/browser/components/search/moz.build	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -5,8 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
+    "BrowserSearchTelemetry.jsm",
     "SearchOneOffs.jsm",
-    "SearchTelemetry.jsm",
+    "SearchSERPTelemetry.jsm",
     "SearchUIUtils.jsm",
 ]
 
@@ -21,5 +22,7 @@
 
 JAR_MANIFESTS += ["jar.mn"]
 
+SPHINX_TREES["/browser/search"] = "docs"
+
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "Search")
diff -Nru firefox-84.0.2+build1/browser/components/search/schema/search-telemetry-schema.json firefox-85.0+build1/browser/components/search/schema/search-telemetry-schema.json
--- firefox-84.0.2+build1/browser/components/search/schema/search-telemetry-schema.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/schema/search-telemetry-schema.json	2021-01-18 19:58:08.000000000 +0000
@@ -47,7 +47,7 @@
     },
     "followOnCookies": {
       "type": "array",
-      "title": "Follow-on Cookes",
+      "title": "Follow-on Cookies",
       "description": "An array of cookie details that are used to identify follow-on searches.",
       "items": {
         "type": "object",
diff -Nru firefox-84.0.2+build1/browser/components/search/SearchOneOffs.jsm firefox-85.0+build1/browser/components/search/SearchOneOffs.jsm
--- firefox-84.0.2+build1/browser/components/search/SearchOneOffs.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/SearchOneOffs.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   clearTimeout: "resource://gre/modules/Timer.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   SearchUIUtils: "resource:///modules/SearchUIUtils.jsm",
@@ -1073,11 +1074,10 @@
       source += "-" + this.telemetryOrigin;
     }
 
-    this.window.BrowserSearch.recordOneoffSearchInTelemetry(
-      engine,
-      source,
-      type
-    );
+    BrowserSearchTelemetry.recordSearch(this.window.gBrowser, engine, source, {
+      type,
+      isOneOff: true,
+    });
     return true;
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/search/SearchSERPTelemetry.jsm firefox-85.0+build1/browser/components/search/SearchSERPTelemetry.jsm
--- firefox-84.0.2+build1/browser/components/search/SearchSERPTelemetry.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/SearchSERPTelemetry.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,763 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["SearchSERPTelemetry"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
+  RemoteSettings: "resource://services-settings/remote-settings.js",
+  SearchUtils: "resource://gre/modules/SearchUtils.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+});
+
+// The various histograms and scalars that we report to.
+const SEARCH_COUNTS_HISTOGRAM_KEY = "SEARCH_COUNTS";
+const SEARCH_WITH_ADS_SCALAR = "browser.search.with_ads";
+const SEARCH_AD_CLICKS_SCALAR = "browser.search.ad_clicks";
+const SEARCH_DATA_TRANSFERRED_SCALAR = "browser.search.data_transferred";
+const SEARCH_TELEMETRY_PRIVATE_BROWSING_KEY_SUFFIX = "pb";
+
+const TELEMETRY_SETTINGS_KEY = "search-telemetry";
+
+XPCOMUtils.defineLazyGetter(this, "logConsole", () => {
+  return console.createInstance({
+    prefix: "SearchTelemetry",
+    maxLogLevel: SearchUtils.loggingEnabled ? "Debug" : "Warn",
+  });
+});
+
+/**
+ * TelemetryHandler is the main class handling Search Engine Result Page (SERP)
+ * telemetry. It primarily deals with tracking of what pages are loaded into tabs.
+ *
+ * It handles the *in-content:sap* keys of the SEARCH_COUNTS histogram.
+ */
+class TelemetryHandler {
+  // Whether or not this class is initialised.
+  _initialized = false;
+
+  // An instance of ContentHandler.
+  _contentHandler;
+
+  // The original provider information, mainly used for tests.
+  _originalProviderInfo = null;
+
+  // The current search provider info.
+  _searchProviderInfo = null;
+
+  // An instance of remote settings that is used to access the provider info.
+  _telemetrySettings;
+
+  // _browserInfoByURL is a map of tracked search urls to objects containing:
+  // * {object} info
+  //   the search provider information associated with the url.
+  // * {WeakSet} browsers
+  //   a weak set of browsers that have the url loaded.
+  // * {integer} count
+  //   a manual count of browsers logged.
+  // We keep a weak set of browsers, in case we miss something on our counts
+  // and cause a memory leak - worst case our map is slightly bigger than it
+  // needs to be.
+  // The manual count is because WeakSet doesn't give us size/length
+  // information, but we want to know when we can clean up our associated
+  // entry.
+  _browserInfoByURL = new Map();
+
+  constructor() {
+    this._contentHandler = new ContentHandler({
+      browserInfoByURL: this._browserInfoByURL,
+      findBrowserItemForURL: (...args) => this._findBrowserItemForURL(...args),
+      getProviderInfoForURL: (...args) => this._getProviderInfoForURL(...args),
+      checkURLForSerpMatch: (...args) => this._checkURLForSerpMatch(...args),
+    });
+  }
+
+  /**
+   * Initializes the TelemetryHandler and its ContentHandler. It will add
+   * appropriate listeners to the window so that window opening and closing
+   * can be tracked.
+   */
+  async init() {
+    if (this._initialized) {
+      return;
+    }
+
+    this._telemetrySettings = RemoteSettings(TELEMETRY_SETTINGS_KEY);
+    let rawProviderInfo = [];
+    try {
+      rawProviderInfo = await this._telemetrySettings.get();
+    } catch (ex) {
+      logConsole.error("Could not get settings:", ex);
+    }
+
+    // Send the provider info to the child handler.
+    this._contentHandler.init(rawProviderInfo);
+    this._originalProviderInfo = rawProviderInfo;
+
+    // Now convert the regexps into
+    this._setSearchProviderInfo(rawProviderInfo);
+
+    for (let win of Services.wm.getEnumerator("navigator:browser")) {
+      this._registerWindow(win);
+    }
+    Services.wm.addListener(this);
+
+    this._initialized = true;
+  }
+
+  /**
+   * Uninitializes the TelemetryHandler and its ContentHandler.
+   */
+  uninit() {
+    if (!this._initialized) {
+      return;
+    }
+
+    this._contentHandler.uninit();
+
+    for (let win of Services.wm.getEnumerator("navigator:browser")) {
+      this._unregisterWindow(win);
+    }
+    Services.wm.removeListener(this);
+
+    this._initialized = false;
+  }
+
+  /**
+   * Handles the TabClose event received from the listeners.
+   *
+   * @param {object} event
+   */
+  handleEvent(event) {
+    if (event.type != "TabClose") {
+      Cu.reportError(`Received unexpected event type ${event.type}`);
+      return;
+    }
+
+    this.stopTrackingBrowser(event.target.linkedBrowser);
+  }
+
+  /**
+   * Test-only function, used to override the provider information, so that
+   * unit tests can set it to easy to test values.
+   *
+   * @param {array} providerInfo @see search-telemetry-schema.json for type information.
+   */
+  overrideSearchTelemetryForTests(providerInfo) {
+    let info = providerInfo ? providerInfo : this._originalProviderInfo;
+    this._contentHandler.overrideSearchTelemetryForTests(info);
+    this._setSearchProviderInfo(info);
+  }
+
+  /**
+   * Used to set the local version of the search provider information.
+   * This automatically maps the regexps to RegExp objects so that
+   * we don't have to create a new instance each time.
+   *
+   * @param {array} providerInfo
+   *   A raw array of provider information to set.
+   */
+  _setSearchProviderInfo(providerInfo) {
+    this._searchProviderInfo = providerInfo.map(provider => {
+      let newProvider = {
+        ...provider,
+        searchPageRegexp: new RegExp(provider.searchPageRegexp),
+      };
+      if (provider.extraAdServersRegexps) {
+        newProvider.extraAdServersRegexps = provider.extraAdServersRegexps.map(
+          r => new RegExp(r)
+        );
+      }
+      return newProvider;
+    });
+  }
+
+  reportPageWithAds(info) {
+    this._contentHandler._reportPageWithAds(info);
+  }
+
+  /**
+   * This may start tracking a tab based on the URL. If the URL matches a search
+   * partner, and it has a code, then we'll start tracking it. This will aid
+   * determining if it is a page we should be tracking for adverts.
+   *
+   * @param {object} browser The browser associated with the page.
+   * @param {string} url The url that was loaded in the browser.
+   */
+  updateTrackingStatus(browser, url) {
+    if (
+      !BrowserSearchTelemetry.shouldRecordSearchCount(browser.getTabBrowser())
+    ) {
+      return;
+    }
+    let info = this._checkURLForSerpMatch(url);
+    if (!info) {
+      this.stopTrackingBrowser(browser);
+      return;
+    }
+
+    this._reportSerpPage(info, url);
+
+    let item = this._browserInfoByURL.get(url);
+    if (item) {
+      item.browsers.add(browser);
+      item.count++;
+    } else {
+      this._browserInfoByURL.set(url, {
+        browsers: new WeakSet([browser]),
+        info,
+        count: 1,
+      });
+    }
+  }
+
+  /**
+   * Stops tracking of a tab, for example the tab has loaded a different URL.
+   *
+   * @param {object} browser The browser associated with the tab to stop being
+   *                         tracked.
+   */
+  stopTrackingBrowser(browser) {
+    for (let [url, item] of this._browserInfoByURL) {
+      if (item.browsers.has(browser)) {
+        item.browsers.delete(browser);
+        item.count--;
+      }
+
+      if (!item.count) {
+        this._browserInfoByURL.delete(url);
+      }
+    }
+  }
+
+  /**
+   * Parts of the URL, like search params and hashes, may be mutated by scripts
+   * on a page we're tracking. Since we don't want to keep track of that
+   * ourselves in order to keep the list of browser objects a weak-referenced
+   * set, we do optional fuzzy matching of URLs to fetch the most relevant item
+   * that contains tracking information.
+   *
+   * @param {string} url URL to fetch the tracking data for.
+   * @returns {object} Map containing the following members:
+   *   - {WeakSet} browsers
+   *     Set of browser elements that belong to `url`.
+   *   - {object} info
+   *     Info dictionary as returned by `_checkURLForSerpMatch`.
+   *   - {number} count
+   *     The number of browser element we can most accurately tell we're
+   *     tracking, since they're inside a WeakSet.
+   */
+  _findBrowserItemForURL(url) {
+    try {
+      url = new URL(url);
+    } catch (ex) {
+      return null;
+    }
+
+    const compareURLs = (url1, url2) => {
+      // In case of an exact match, well, that's an obvious winner.
+      if (url1.href == url2.href) {
+        return Infinity;
+      }
+
+      // Each step we get closer to the two URLs being the same, we increase the
+      // score. The consumer of this method will use these scores to see which
+      // of the URLs is the best match.
+      let score = 0;
+      if (url1.hostname == url2.hostname) {
+        ++score;
+        if (url1.pathname == url2.pathname) {
+          ++score;
+          for (let [key1, value1] of url1.searchParams) {
+            // Let's not fuss about the ordering of search params, since the
+            // score effect will solve that.
+            if (url2.searchParams.has(key1)) {
+              ++score;
+              if (url2.searchParams.get(key1) == value1) {
+                ++score;
+              }
+            }
+          }
+          if (url1.hash == url2.hash) {
+            ++score;
+          }
+        }
+      }
+      return score;
+    };
+
+    let item;
+    let currentBestMatch = 0;
+    for (let [trackingURL, candidateItem] of this._browserInfoByURL) {
+      if (currentBestMatch === Infinity) {
+        break;
+      }
+      try {
+        // Make sure to cache the parsed URL object, since there's no reason to
+        // do it twice.
+        trackingURL =
+          candidateItem._trackingURL ||
+          (candidateItem._trackingURL = new URL(trackingURL));
+      } catch (ex) {
+        continue;
+      }
+      let score = compareURLs(url, trackingURL);
+      if (score > currentBestMatch) {
+        item = candidateItem;
+        currentBestMatch = score;
+      }
+    }
+
+    return item;
+  }
+
+  // nsIWindowMediatorListener
+
+  /**
+   * This is called when a new window is opened, and handles registration of
+   * that window if it is a browser window.
+   *
+   * @param {nsIAppWindow} appWin The xul window that was opened.
+   */
+  onOpenWindow(appWin) {
+    let win = appWin.docShell.domWindow;
+    win.addEventListener(
+      "load",
+      () => {
+        if (
+          win.document.documentElement.getAttribute("windowtype") !=
+          "navigator:browser"
+        ) {
+          return;
+        }
+
+        this._registerWindow(win);
+      },
+      { once: true }
+    );
+  }
+
+  /**
+   * Listener that is called when a window is closed, and handles deregistration of
+   * that window if it is a browser window.
+   *
+   * @param {nsIAppWindow} appWin The xul window that was closed.
+   */
+  onCloseWindow(appWin) {
+    let win = appWin.docShell.domWindow;
+
+    if (
+      win.document.documentElement.getAttribute("windowtype") !=
+      "navigator:browser"
+    ) {
+      return;
+    }
+
+    this._unregisterWindow(win);
+  }
+
+  /**
+   * Adds event listeners for the window and registers it with the content handler.
+   *
+   * @param {object} win The window to register.
+   */
+  _registerWindow(win) {
+    win.gBrowser.tabContainer.addEventListener("TabClose", this);
+  }
+
+  /**
+   * Removes event listeners for the window and unregisters it with the content
+   * handler.
+   *
+   * @param {object} win The window to unregister.
+   */
+  _unregisterWindow(win) {
+    for (let tab of win.gBrowser.tabs) {
+      this.stopTrackingBrowser(tab);
+    }
+
+    win.gBrowser.tabContainer.removeEventListener("TabClose", this);
+  }
+
+  /**
+   * Searches for provider information for a given url.
+   *
+   * @param {string} url The url to match for a provider.
+   * @param {boolean} useOnlyExtraAdServers If true, this will use the extra
+   *   ad server regexp to match instead of the main regexp.
+   * @returns {array|null} Returns an array of provider name and the provider information.
+   */
+  _getProviderInfoForURL(url, useOnlyExtraAdServers = false) {
+    if (useOnlyExtraAdServers) {
+      return this._searchProviderInfo.find(info => {
+        if (info.extraAdServersRegexps) {
+          for (let regexp of info.extraAdServersRegexps) {
+            if (regexp.test(url)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      });
+    }
+
+    return this._searchProviderInfo.find(info =>
+      info.searchPageRegexp.test(url)
+    );
+  }
+
+  /**
+   * Checks to see if a url is a search partner location, and determines the
+   * provider and codes used.
+   *
+   * @param {string} url The url to match.
+   * @returns {null|object} Returns null if there is no match found. Otherwise,
+   *   returns an object of strings for provider, code and type.
+   */
+  _checkURLForSerpMatch(url) {
+    let searchProviderInfo = this._getProviderInfoForURL(url);
+    if (!searchProviderInfo) {
+      return null;
+    }
+    let queries = new URLSearchParams(url.split("#")[0].split("?")[1]);
+    if (!queries.get(searchProviderInfo.queryParamName)) {
+      return null;
+    }
+    // Default to organic to simplify things.
+    // We override type in the sap cases.
+    let type = "organic";
+    let code;
+    if (searchProviderInfo.codeParamName) {
+      code = queries.get(searchProviderInfo.codeParamName);
+      if (
+        code &&
+        searchProviderInfo.codePrefixes.some(p => code.startsWith(p))
+      ) {
+        if (
+          searchProviderInfo.followOnParamNames &&
+          searchProviderInfo.followOnParamNames.some(p => queries.has(p))
+        ) {
+          type = "sap-follow-on";
+        } else {
+          type = "sap";
+        }
+      } else if (searchProviderInfo.followOnCookies) {
+        // Especially Bing requires lots of extra work related to cookies.
+        for (let followOnCookie of searchProviderInfo.followOnCookies) {
+          if (followOnCookie.extraCodeParamName) {
+            let eCode = queries.get(followOnCookie.extraCodeParamName);
+            if (
+              !eCode ||
+              !followOnCookie.extraCodePrefixes.some(p => eCode.startsWith(p))
+            ) {
+              continue;
+            }
+          }
+
+          // If this cookie is present, it's probably an SAP follow-on.
+          // This might be an organic follow-on in the same session, but there
+          // is no way to tell the difference.
+          for (let cookie of Services.cookies.getCookiesFromHost(
+            followOnCookie.host,
+            {}
+          )) {
+            if (cookie.name != followOnCookie.name) {
+              continue;
+            }
+
+            let [cookieParam, cookieValue] = cookie.value
+              .split("=")
+              .map(p => p.trim());
+            if (
+              cookieParam == followOnCookie.codeParamName &&
+              followOnCookie.codePrefixes.some(p => cookieValue.startsWith(p))
+            ) {
+              type = "sap-follow-on";
+              code = cookieValue;
+              break;
+            }
+          }
+        }
+      }
+    }
+    return { provider: searchProviderInfo.telemetryId, type, code };
+  }
+
+  /**
+   * Logs telemetry for a search provider visit.
+   *
+   * @param {object} info
+   * @param {string} info.provider The name of the provider.
+   * @param {string} info.type The type of search.
+   * @param {string} [info.code] The code for the provider.
+   * @param {string} url The url that was matched (for debug logging only).
+   */
+  _reportSerpPage(info, url) {
+    let payload = `${info.provider}.in-content:${info.type}:${info.code ||
+      "none"}`;
+    let histogram = Services.telemetry.getKeyedHistogramById(
+      SEARCH_COUNTS_HISTOGRAM_KEY
+    );
+    histogram.add(payload);
+    logConsole.debug("Counting", payload, "for", url);
+  }
+}
+
+/**
+ * ContentHandler deals with handling telemetry of the content within a tab -
+ * when ads detected and when they are selected.
+ *
+ * It handles the "browser.search.with_ads" and "browser.search.ad_clicks"
+ * scalars.
+ */
+class ContentHandler {
+  /**
+   * Constructor.
+   *
+   * @param {object} options
+   * @param {Map} options.browserInfoByURL The  map of urls from TelemetryHandler.
+   * @param {function} options.getProviderInfoForURL A function that obtains
+   *   the provider information for a url.
+   */
+  constructor(options) {
+    this._browserInfoByURL = options.browserInfoByURL;
+    this._findBrowserItemForURL = options.findBrowserItemForURL;
+    this._getProviderInfoForURL = options.getProviderInfoForURL;
+    this._checkURLForSerpMatch = options.checkURLForSerpMatch;
+  }
+
+  /**
+   * Initializes the content handler. This will also set up the shared data that is
+   * shared with the SearchTelemetryChild actor.
+   *
+   * @param {array} providerInfo
+   *  The provider information for the search telemetry to record.
+   */
+  init(providerInfo) {
+    Services.ppmm.sharedData.set("SearchTelemetry:ProviderInfo", providerInfo);
+
+    Cc["@mozilla.org/network/http-activity-distributor;1"]
+      .getService(Ci.nsIHttpActivityDistributor)
+      .addObserver(this);
+
+    Services.obs.addObserver(this, "http-on-stop-request");
+  }
+
+  /**
+   * Uninitializes the content handler.
+   */
+  uninit() {
+    Cc["@mozilla.org/network/http-activity-distributor;1"]
+      .getService(Ci.nsIHttpActivityDistributor)
+      .removeObserver(this);
+
+    Services.obs.removeObserver(this, "http-on-stop-request");
+  }
+
+  /**
+   * Test-only function to override the search provider information for use
+   * with tests. Passes it to the SearchTelemetryChild actor.
+   *
+   * @param {object} providerInfo @see SEARCH_PROVIDER_INFO for type information.
+   */
+  overrideSearchTelemetryForTests(providerInfo) {
+    Services.ppmm.sharedData.set("SearchTelemetry:ProviderInfo", providerInfo);
+  }
+
+  /**
+   * Reports bandwidth used by the given channel if it is used by search requests.
+   *
+   * @param {object} aChannel The channel that generated the activity.
+   */
+  _reportChannelBandwidth(aChannel) {
+    if (!(aChannel instanceof Ci.nsIChannel)) {
+      return;
+    }
+    let wrappedChannel = ChannelWrapper.get(aChannel);
+
+    let getTopURL = channel => {
+      // top-level document
+      if (
+        channel.loadInfo &&
+        channel.loadInfo.externalContentPolicyType ==
+          Ci.nsIContentPolicy.TYPE_DOCUMENT
+      ) {
+        return channel.finalURL;
+      }
+
+      // iframe
+      let frameAncestors;
+      try {
+        frameAncestors = channel.frameAncestors;
+      } catch (e) {
+        frameAncestors = null;
+      }
+      if (frameAncestors) {
+        let ancestor = frameAncestors.find(obj => obj.frameId == 0);
+        if (ancestor) {
+          return ancestor.url;
+        }
+      }
+
+      // top-level resource
+      if (channel.loadInfo && channel.loadInfo.loadingPrincipal) {
+        return channel.loadInfo.loadingPrincipal.spec;
+      }
+
+      return null;
+    };
+
+    let topUrl = getTopURL(wrappedChannel);
+    if (!topUrl) {
+      return;
+    }
+
+    let info = this._checkURLForSerpMatch(topUrl);
+    if (!info) {
+      return;
+    }
+
+    let bytesTransferred =
+      wrappedChannel.requestSize + wrappedChannel.responseSize;
+    let { provider } = info;
+
+    let isPrivate =
+      wrappedChannel.loadInfo &&
+      wrappedChannel.loadInfo.originAttributes.privateBrowsingId > 0;
+    if (isPrivate) {
+      provider += `-${SEARCH_TELEMETRY_PRIVATE_BROWSING_KEY_SUFFIX}`;
+    }
+
+    Services.telemetry.keyedScalarAdd(
+      SEARCH_DATA_TRANSFERRED_SCALAR,
+      provider,
+      bytesTransferred
+    );
+  }
+
+  observe(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case "http-on-stop-request":
+        this._reportChannelBandwidth(aSubject);
+        break;
+    }
+  }
+
+  /**
+   * Listener that observes network activity, so that we can determine if a link
+   * from a search provider page was followed, and if then if that link was an
+   * ad click or not.
+   *
+   * @param {nsIChannel} nativeChannel   The channel that generated the activity.
+   * @param {number}     activityType    The type of activity.
+   * @param {number}     activitySubtype The subtype for the activity.
+   */
+  observeActivity(
+    nativeChannel,
+    activityType,
+    activitySubtype /*,
+    timestamp,
+    extraSizeData,
+    extraStringData*/
+  ) {
+    // NOTE: the channel handling code here is inspired by WebRequest.jsm.
+    if (
+      !this._browserInfoByURL.size ||
+      activityType !=
+        Ci.nsIHttpActivityObserver.ACTIVITY_TYPE_HTTP_TRANSACTION ||
+      activitySubtype !=
+        Ci.nsIHttpActivityObserver.ACTIVITY_SUBTYPE_TRANSACTION_CLOSE
+    ) {
+      return;
+    }
+
+    // Sometimes we get a NullHttpChannel, which implements nsIHttpChannel but
+    // not nsIChannel.
+    if (!(nativeChannel instanceof Ci.nsIChannel)) {
+      return;
+    }
+    let channel = ChannelWrapper.get(nativeChannel);
+    // The wrapper is consistent across redirects, so we can use it to track state.
+    if (channel._adClickRecorded) {
+      logConsole.debug("Ad click already recorded");
+      return;
+    }
+
+    // Make a trip through the event loop to make sure statuses have a chance to
+    // be processed before we get all the info.
+    Services.tm.dispatchToMainThread(() => {
+      // We suspect that No Content (204) responses are used to transfer or
+      // update beacons. They lead to use double-counting ad-clicks, so let's
+      // ignore them.
+      if (channel.statusCode == 204) {
+        logConsole.debug("Ignoring activity from ambiguous responses");
+        return;
+      }
+
+      let originURL = channel.originURI && channel.originURI.spec;
+      let item = this._findBrowserItemForURL(originURL);
+      if (!originURL || !item) {
+        return;
+      }
+
+      let URL = channel.finalURL;
+      let info = this._getProviderInfoForURL(URL, true);
+      if (!info) {
+        return;
+      }
+
+      try {
+        Services.telemetry.keyedScalarAdd(
+          SEARCH_AD_CLICKS_SCALAR,
+          `${info.telemetryId}:${item.info.type}`,
+          1
+        );
+        channel._adClickRecorded = true;
+        logConsole.debug(
+          "Counting ad click in page for",
+          info.telemetryId,
+          originURL,
+          URL
+        );
+      } catch (e) {
+        Cu.reportError(e);
+      }
+    });
+  }
+
+  /**
+   * Logs telemetry for a page with adverts, if it is one of the partner search
+   * provider pages that we're tracking.
+   *
+   * @param {object} info
+   * @param {boolean} info.hasAds Whether or not the page has adverts.
+   * @param {string} info.url The url of the page.
+   */
+  _reportPageWithAds(info) {
+    let item = this._findBrowserItemForURL(info.url);
+    if (!item) {
+      logConsole.warn(
+        "Expected to report URI for",
+        info.url,
+        "with ads but couldn't find the information"
+      );
+      return;
+    }
+
+    logConsole.debug("Counting ads in page for", item.info.provider, info.url);
+    Services.telemetry.keyedScalarAdd(
+      SEARCH_WITH_ADS_SCALAR,
+      `${item.info.provider}:${item.info.type}`,
+      1
+    );
+  }
+}
+
+var SearchSERPTelemetry = new TelemetryHandler();
diff -Nru firefox-84.0.2+build1/browser/components/search/SearchTelemetry.jsm firefox-85.0+build1/browser/components/search/SearchTelemetry.jsm
--- firefox-84.0.2+build1/browser/components/search/SearchTelemetry.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/SearchTelemetry.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,760 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var EXPORTED_SYMBOLS = ["SearchTelemetry"];
-
-const { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  RemoteSettings: "resource://services-settings/remote-settings.js",
-  SearchUtils: "resource://gre/modules/SearchUtils.jsm",
-  Services: "resource://gre/modules/Services.jsm",
-});
-
-// The various histograms and scalars that we report to.
-const SEARCH_COUNTS_HISTOGRAM_KEY = "SEARCH_COUNTS";
-const SEARCH_WITH_ADS_SCALAR = "browser.search.with_ads";
-const SEARCH_AD_CLICKS_SCALAR = "browser.search.ad_clicks";
-const SEARCH_DATA_TRANSFERRED_SCALAR = "browser.search.data_transferred";
-const SEARCH_TELEMETRY_PRIVATE_BROWSING_KEY_SUFFIX = "pb";
-
-const TELEMETRY_SETTINGS_KEY = "search-telemetry";
-
-XPCOMUtils.defineLazyGetter(this, "logConsole", () => {
-  return console.createInstance({
-    prefix: "SearchTelemetry",
-    maxLogLevel: SearchUtils.loggingEnabled ? "Debug" : "Warn",
-  });
-});
-
-/**
- * TelemetryHandler is the main class handling search telemetry. It primarily
- * deals with tracking of what pages are loaded into tabs.
- *
- * It handles the *in-content:sap* keys of the SEARCH_COUNTS histogram.
- */
-class TelemetryHandler {
-  // Whether or not this class is initialised.
-  _initialized = false;
-
-  // An instance of ContentHandler.
-  _contentHandler;
-
-  // The original provider information, mainly used for tests.
-  _originalProviderInfo = null;
-
-  // The current search provider info.
-  _searchProviderInfo = null;
-
-  // An instance of remote settings that is used to access the provider info.
-  _telemetrySettings;
-
-  // _browserInfoByURL is a map of tracked search urls to objects containing:
-  // * {object} info
-  //   the search provider information associated with the url.
-  // * {WeakSet} browsers
-  //   a weak set of browsers that have the url loaded.
-  // * {integer} count
-  //   a manual count of browsers logged.
-  // We keep a weak set of browsers, in case we miss something on our counts
-  // and cause a memory leak - worst case our map is slightly bigger than it
-  // needs to be.
-  // The manual count is because WeakSet doesn't give us size/length
-  // information, but we want to know when we can clean up our associated
-  // entry.
-  _browserInfoByURL = new Map();
-
-  constructor() {
-    this._contentHandler = new ContentHandler({
-      browserInfoByURL: this._browserInfoByURL,
-      findBrowserItemForURL: (...args) => this._findBrowserItemForURL(...args),
-      getProviderInfoForURL: (...args) => this._getProviderInfoForURL(...args),
-      checkURLForSerpMatch: (...args) => this._checkURLForSerpMatch(...args),
-    });
-  }
-
-  /**
-   * Initializes the TelemetryHandler and its ContentHandler. It will add
-   * appropriate listeners to the window so that window opening and closing
-   * can be tracked.
-   */
-  async init() {
-    if (this._initialized) {
-      return;
-    }
-
-    this._telemetrySettings = RemoteSettings(TELEMETRY_SETTINGS_KEY);
-    let rawProviderInfo = [];
-    try {
-      rawProviderInfo = await this._telemetrySettings.get();
-    } catch (ex) {
-      logConsole.error("Could not get settings:", ex);
-    }
-
-    // Send the provider info to the child handler.
-    this._contentHandler.init(rawProviderInfo);
-    this._originalProviderInfo = rawProviderInfo;
-
-    // Now convert the regexps into
-    this._setSearchProviderInfo(rawProviderInfo);
-
-    for (let win of Services.wm.getEnumerator("navigator:browser")) {
-      this._registerWindow(win);
-    }
-    Services.wm.addListener(this);
-
-    this._initialized = true;
-  }
-
-  /**
-   * Uninitializes the TelemetryHandler and its ContentHandler.
-   */
-  uninit() {
-    if (!this._initialized) {
-      return;
-    }
-
-    this._contentHandler.uninit();
-
-    for (let win of Services.wm.getEnumerator("navigator:browser")) {
-      this._unregisterWindow(win);
-    }
-    Services.wm.removeListener(this);
-
-    this._initialized = false;
-  }
-
-  /**
-   * Handles the TabClose event received from the listeners.
-   *
-   * @param {object} event
-   */
-  handleEvent(event) {
-    if (event.type != "TabClose") {
-      Cu.reportError(`Received unexpected event type ${event.type}`);
-      return;
-    }
-
-    this.stopTrackingBrowser(event.target.linkedBrowser);
-  }
-
-  /**
-   * Test-only function, used to override the provider information, so that
-   * unit tests can set it to easy to test values.
-   *
-   * @param {array} providerInfo @see search-telemetry-schema.json for type information.
-   */
-  overrideSearchTelemetryForTests(providerInfo) {
-    let info = providerInfo ? providerInfo : this._originalProviderInfo;
-    this._contentHandler.overrideSearchTelemetryForTests(info);
-    this._setSearchProviderInfo(info);
-  }
-
-  /**
-   * Used to set the local version of the search provider information.
-   * This automatically maps the regexps to RegExp objects so that
-   * we don't have to create a new instance each time.
-   *
-   * @param {array} providerInfo
-   *   A raw array of provider information to set.
-   */
-  _setSearchProviderInfo(providerInfo) {
-    this._searchProviderInfo = providerInfo.map(provider => {
-      let newProvider = {
-        ...provider,
-        searchPageRegexp: new RegExp(provider.searchPageRegexp),
-      };
-      if (provider.extraAdServersRegexps) {
-        newProvider.extraAdServersRegexps = provider.extraAdServersRegexps.map(
-          r => new RegExp(r)
-        );
-      }
-      return newProvider;
-    });
-  }
-
-  reportPageWithAds(info) {
-    this._contentHandler._reportPageWithAds(info);
-  }
-
-  /**
-   * This may start tracking a tab based on the URL. If the URL matches a search
-   * partner, and it has a code, then we'll start tracking it. This will aid
-   * determining if it is a page we should be tracking for adverts.
-   *
-   * @param {object} browser The browser associated with the page.
-   * @param {string} url The url that was loaded in the browser.
-   */
-  updateTrackingStatus(browser, url) {
-    let info = this._checkURLForSerpMatch(url);
-    if (!info) {
-      this.stopTrackingBrowser(browser);
-      return;
-    }
-
-    this._reportSerpPage(info, url);
-
-    // If we have a code, then we also track this for potential ad clicks.
-    if (info.code) {
-      let item = this._browserInfoByURL.get(url);
-      if (item) {
-        item.browsers.add(browser);
-        item.count++;
-      } else {
-        this._browserInfoByURL.set(url, {
-          browsers: new WeakSet([browser]),
-          info,
-          count: 1,
-        });
-      }
-    }
-  }
-
-  /**
-   * Stops tracking of a tab, for example the tab has loaded a different URL.
-   *
-   * @param {object} browser The browser associated with the tab to stop being
-   *                         tracked.
-   */
-  stopTrackingBrowser(browser) {
-    for (let [url, item] of this._browserInfoByURL) {
-      if (item.browsers.has(browser)) {
-        item.browsers.delete(browser);
-        item.count--;
-      }
-
-      if (!item.count) {
-        this._browserInfoByURL.delete(url);
-      }
-    }
-  }
-
-  /**
-   * Parts of the URL, like search params and hashes, may be mutated by scripts
-   * on a page we're tracking. Since we don't want to keep track of that
-   * ourselves in order to keep the list of browser objects a weak-referenced
-   * set, we do optional fuzzy matching of URLs to fetch the most relevant item
-   * that contains tracking information.
-   *
-   * @param {string} url URL to fetch the tracking data for.
-   * @returns {object} Map containing the following members:
-   *   - {WeakSet} browsers
-   *     Set of browser elements that belong to `url`.
-   *   - {object} info
-   *     Info dictionary as returned by `_checkURLForSerpMatch`.
-   *   - {number} count
-   *     The number of browser element we can most accurately tell we're
-   *     tracking, since they're inside a WeakSet.
-   */
-  _findBrowserItemForURL(url) {
-    try {
-      url = new URL(url);
-    } catch (ex) {
-      return null;
-    }
-
-    const compareURLs = (url1, url2) => {
-      // In case of an exact match, well, that's an obvious winner.
-      if (url1.href == url2.href) {
-        return Infinity;
-      }
-
-      // Each step we get closer to the two URLs being the same, we increase the
-      // score. The consumer of this method will use these scores to see which
-      // of the URLs is the best match.
-      let score = 0;
-      if (url1.hostname == url2.hostname) {
-        ++score;
-        if (url1.pathname == url2.pathname) {
-          ++score;
-          for (let [key1, value1] of url1.searchParams) {
-            // Let's not fuss about the ordering of search params, since the
-            // score effect will solve that.
-            if (url2.searchParams.has(key1)) {
-              ++score;
-              if (url2.searchParams.get(key1) == value1) {
-                ++score;
-              }
-            }
-          }
-          if (url1.hash == url2.hash) {
-            ++score;
-          }
-        }
-      }
-      return score;
-    };
-
-    let item;
-    let currentBestMatch = 0;
-    for (let [trackingURL, candidateItem] of this._browserInfoByURL) {
-      if (currentBestMatch === Infinity) {
-        break;
-      }
-      try {
-        // Make sure to cache the parsed URL object, since there's no reason to
-        // do it twice.
-        trackingURL =
-          candidateItem._trackingURL ||
-          (candidateItem._trackingURL = new URL(trackingURL));
-      } catch (ex) {
-        continue;
-      }
-      let score = compareURLs(url, trackingURL);
-      if (score > currentBestMatch) {
-        item = candidateItem;
-        currentBestMatch = score;
-      }
-    }
-
-    return item;
-  }
-
-  // nsIWindowMediatorListener
-
-  /**
-   * This is called when a new window is opened, and handles registration of
-   * that window if it is a browser window.
-   *
-   * @param {nsIAppWindow} appWin The xul window that was opened.
-   */
-  onOpenWindow(appWin) {
-    let win = appWin.docShell.domWindow;
-    win.addEventListener(
-      "load",
-      () => {
-        if (
-          win.document.documentElement.getAttribute("windowtype") !=
-          "navigator:browser"
-        ) {
-          return;
-        }
-
-        this._registerWindow(win);
-      },
-      { once: true }
-    );
-  }
-
-  /**
-   * Listener that is called when a window is closed, and handles deregistration of
-   * that window if it is a browser window.
-   *
-   * @param {nsIAppWindow} appWin The xul window that was closed.
-   */
-  onCloseWindow(appWin) {
-    let win = appWin.docShell.domWindow;
-
-    if (
-      win.document.documentElement.getAttribute("windowtype") !=
-      "navigator:browser"
-    ) {
-      return;
-    }
-
-    this._unregisterWindow(win);
-  }
-
-  /**
-   * Adds event listeners for the window and registers it with the content handler.
-   *
-   * @param {object} win The window to register.
-   */
-  _registerWindow(win) {
-    win.gBrowser.tabContainer.addEventListener("TabClose", this);
-  }
-
-  /**
-   * Removes event listeners for the window and unregisters it with the content
-   * handler.
-   *
-   * @param {object} win The window to unregister.
-   */
-  _unregisterWindow(win) {
-    for (let tab of win.gBrowser.tabs) {
-      this.stopTrackingBrowser(tab);
-    }
-
-    win.gBrowser.tabContainer.removeEventListener("TabClose", this);
-  }
-
-  /**
-   * Searches for provider information for a given url.
-   *
-   * @param {string} url The url to match for a provider.
-   * @param {boolean} useOnlyExtraAdServers If true, this will use the extra
-   *   ad server regexp to match instead of the main regexp.
-   * @returns {array|null} Returns an array of provider name and the provider information.
-   */
-  _getProviderInfoForURL(url, useOnlyExtraAdServers = false) {
-    if (useOnlyExtraAdServers) {
-      return this._searchProviderInfo.find(info => {
-        if (info.extraAdServersRegexps) {
-          for (let regexp of info.extraAdServersRegexps) {
-            if (regexp.test(url)) {
-              return true;
-            }
-          }
-        }
-        return false;
-      });
-    }
-
-    return this._searchProviderInfo.find(info =>
-      info.searchPageRegexp.test(url)
-    );
-  }
-
-  /**
-   * Checks to see if a url is a search partner location, and determines the
-   * provider and codes used.
-   *
-   * @param {string} url The url to match.
-   * @returns {null|object} Returns null if there is no match found. Otherwise,
-   *   returns an object of strings for provider, code and type.
-   */
-  _checkURLForSerpMatch(url) {
-    let searchProviderInfo = this._getProviderInfoForURL(url);
-    if (!searchProviderInfo) {
-      return null;
-    }
-    let queries = new URLSearchParams(url.split("#")[0].split("?")[1]);
-    if (!queries.get(searchProviderInfo.queryParamName)) {
-      return null;
-    }
-    // Default to organic to simplify things.
-    // We override type in the sap cases.
-    let type = "organic";
-    let code;
-    if (searchProviderInfo.codeParamName) {
-      code = queries.get(searchProviderInfo.codeParamName);
-      if (
-        code &&
-        searchProviderInfo.codePrefixes.some(p => code.startsWith(p))
-      ) {
-        if (
-          searchProviderInfo.followOnParamNames &&
-          searchProviderInfo.followOnParamNames.some(p => queries.has(p))
-        ) {
-          type = "sap-follow-on";
-        } else {
-          type = "sap";
-        }
-      } else if (searchProviderInfo.followOnCookies) {
-        // Especially Bing requires lots of extra work related to cookies.
-        for (let followOnCookie of searchProviderInfo.followOnCookies) {
-          if (followOnCookie.extraCodeParamName) {
-            let eCode = queries.get(followOnCookie.extraCodeParamName);
-            if (
-              !eCode ||
-              !followOnCookie.extraCodePrefixes.some(p => eCode.startsWith(p))
-            ) {
-              continue;
-            }
-          }
-
-          // If this cookie is present, it's probably an SAP follow-on.
-          // This might be an organic follow-on in the same session, but there
-          // is no way to tell the difference.
-          for (let cookie of Services.cookies.getCookiesFromHost(
-            followOnCookie.host,
-            {}
-          )) {
-            if (cookie.name != followOnCookie.name) {
-              continue;
-            }
-
-            let [cookieParam, cookieValue] = cookie.value
-              .split("=")
-              .map(p => p.trim());
-            if (
-              cookieParam == followOnCookie.codeParamName &&
-              followOnCookie.codePrefixes.some(p => cookieValue.startsWith(p))
-            ) {
-              type = "sap-follow-on";
-              code = cookieValue;
-              break;
-            }
-          }
-        }
-      }
-    }
-    return { provider: searchProviderInfo.telemetryId, type, code };
-  }
-
-  /**
-   * Logs telemetry for a search provider visit.
-   *
-   * @param {object} info
-   * @param {string} info.provider The name of the provider.
-   * @param {string} info.type The type of search.
-   * @param {string} [info.code] The code for the provider.
-   * @param {string} url The url that was matched (for debug logging only).
-   */
-  _reportSerpPage(info, url) {
-    let payload = `${info.provider}.in-content:${info.type}:${info.code ||
-      "none"}`;
-    let histogram = Services.telemetry.getKeyedHistogramById(
-      SEARCH_COUNTS_HISTOGRAM_KEY
-    );
-    histogram.add(payload);
-    logConsole.debug("Counting", payload, "for", url);
-  }
-}
-
-/**
- * ContentHandler deals with handling telemetry of the content within a tab -
- * when ads detected and when they are selected.
- *
- * It handles the "browser.search.with_ads" and "browser.search.ad_clicks"
- * scalars.
- */
-class ContentHandler {
-  /**
-   * Constructor.
-   *
-   * @param {object} options
-   * @param {Map} options.browserInfoByURL The  map of urls from TelemetryHandler.
-   * @param {function} options.getProviderInfoForURL A function that obtains
-   *   the provider information for a url.
-   */
-  constructor(options) {
-    this._browserInfoByURL = options.browserInfoByURL;
-    this._findBrowserItemForURL = options.findBrowserItemForURL;
-    this._getProviderInfoForURL = options.getProviderInfoForURL;
-    this._checkURLForSerpMatch = options.checkURLForSerpMatch;
-  }
-
-  /**
-   * Initializes the content handler. This will also set up the shared data that is
-   * shared with the SearchTelemetryChild actor.
-   *
-   * @param {array} providerInfo
-   *  The provider information for the search telemetry to record.
-   */
-  init(providerInfo) {
-    Services.ppmm.sharedData.set("SearchTelemetry:ProviderInfo", providerInfo);
-
-    Cc["@mozilla.org/network/http-activity-distributor;1"]
-      .getService(Ci.nsIHttpActivityDistributor)
-      .addObserver(this);
-
-    Services.obs.addObserver(this, "http-on-stop-request");
-  }
-
-  /**
-   * Uninitializes the content handler.
-   */
-  uninit() {
-    Cc["@mozilla.org/network/http-activity-distributor;1"]
-      .getService(Ci.nsIHttpActivityDistributor)
-      .removeObserver(this);
-
-    Services.obs.removeObserver(this, "http-on-stop-request");
-  }
-
-  /**
-   * Test-only function to override the search provider information for use
-   * with tests. Passes it to the SearchTelemetryChild actor.
-   *
-   * @param {object} providerInfo @see SEARCH_PROVIDER_INFO for type information.
-   */
-  overrideSearchTelemetryForTests(providerInfo) {
-    Services.ppmm.sharedData.set("SearchTelemetry:ProviderInfo", providerInfo);
-  }
-
-  /**
-   * Reports bandwidth used by the given channel if it is used by search requests.
-   *
-   * @param {object} aChannel The channel that generated the activity.
-   */
-  _reportChannelBandwidth(aChannel) {
-    if (!(aChannel instanceof Ci.nsIChannel)) {
-      return;
-    }
-    let wrappedChannel = ChannelWrapper.get(aChannel);
-
-    let getTopURL = channel => {
-      // top-level document
-      if (
-        channel.loadInfo &&
-        channel.loadInfo.externalContentPolicyType ==
-          Ci.nsIContentPolicy.TYPE_DOCUMENT
-      ) {
-        return channel.finalURL;
-      }
-
-      // iframe
-      let frameAncestors;
-      try {
-        frameAncestors = channel.frameAncestors;
-      } catch (e) {
-        frameAncestors = null;
-      }
-      if (frameAncestors) {
-        let ancestor = frameAncestors.find(obj => obj.frameId == 0);
-        if (ancestor) {
-          return ancestor.url;
-        }
-      }
-
-      // top-level resource
-      if (channel.loadInfo && channel.loadInfo.loadingPrincipal) {
-        return channel.loadInfo.loadingPrincipal.spec;
-      }
-
-      return null;
-    };
-
-    let topUrl = getTopURL(wrappedChannel);
-    if (!topUrl) {
-      return;
-    }
-
-    let info = this._checkURLForSerpMatch(topUrl);
-    if (!info) {
-      return;
-    }
-
-    let bytesTransferred =
-      wrappedChannel.requestSize + wrappedChannel.responseSize;
-    let { provider } = info;
-
-    let isPrivate =
-      wrappedChannel.loadInfo &&
-      wrappedChannel.loadInfo.originAttributes.privateBrowsingId > 0;
-    if (isPrivate) {
-      provider += `-${SEARCH_TELEMETRY_PRIVATE_BROWSING_KEY_SUFFIX}`;
-    }
-
-    Services.telemetry.keyedScalarAdd(
-      SEARCH_DATA_TRANSFERRED_SCALAR,
-      provider,
-      bytesTransferred
-    );
-  }
-
-  observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "http-on-stop-request":
-        this._reportChannelBandwidth(aSubject);
-        break;
-    }
-  }
-
-  /**
-   * Listener that observes network activity, so that we can determine if a link
-   * from a search provider page was followed, and if then if that link was an
-   * ad click or not.
-   *
-   * @param {nsIChannel} nativeChannel   The channel that generated the activity.
-   * @param {number}     activityType    The type of activity.
-   * @param {number}     activitySubtype The subtype for the activity.
-   */
-  observeActivity(
-    nativeChannel,
-    activityType,
-    activitySubtype /*,
-    timestamp,
-    extraSizeData,
-    extraStringData*/
-  ) {
-    // NOTE: the channel handling code here is inspired by WebRequest.jsm.
-    if (
-      !this._browserInfoByURL.size ||
-      activityType !=
-        Ci.nsIHttpActivityObserver.ACTIVITY_TYPE_HTTP_TRANSACTION ||
-      activitySubtype !=
-        Ci.nsIHttpActivityObserver.ACTIVITY_SUBTYPE_TRANSACTION_CLOSE
-    ) {
-      return;
-    }
-
-    // Sometimes we get a NullHttpChannel, which implements nsIHttpChannel but
-    // not nsIChannel.
-    if (!(nativeChannel instanceof Ci.nsIChannel)) {
-      return;
-    }
-    let channel = ChannelWrapper.get(nativeChannel);
-    // The wrapper is consistent across redirects, so we can use it to track state.
-    if (channel._adClickRecorded) {
-      logConsole.debug("Ad click already recorded");
-      return;
-    }
-
-    // Make a trip through the event loop to make sure statuses have a chance to
-    // be processed before we get all the info.
-    Services.tm.dispatchToMainThread(() => {
-      // We suspect that No Content (204) responses are used to transfer or
-      // update beacons. They lead to use double-counting ad-clicks, so let's
-      // ignore them.
-      if (channel.statusCode == 204) {
-        logConsole.debug("Ignoring activity from ambiguous responses");
-        return;
-      }
-
-      let originURL = channel.originURI && channel.originURI.spec;
-      let info = this._findBrowserItemForURL(originURL);
-      if (!originURL || !info) {
-        return;
-      }
-
-      let URL = channel.finalURL;
-      info = this._getProviderInfoForURL(URL, true);
-      if (!info) {
-        return;
-      }
-
-      try {
-        Services.telemetry.keyedScalarAdd(
-          SEARCH_AD_CLICKS_SCALAR,
-          info.telemetryId,
-          1
-        );
-        channel._adClickRecorded = true;
-        logConsole.debug(
-          "Counting ad click in page for",
-          info.telemetryId,
-          originURL,
-          URL
-        );
-      } catch (e) {
-        Cu.reportError(e);
-      }
-    });
-  }
-
-  /**
-   * Logs telemetry for a page with adverts, if it is one of the partner search
-   * provider pages that we're tracking.
-   *
-   * @param {object} info
-   * @param {boolean} info.hasAds Whether or not the page has adverts.
-   * @param {string} info.url The url of the page.
-   */
-  _reportPageWithAds(info) {
-    let item = this._findBrowserItemForURL(info.url);
-    if (!item) {
-      logConsole.warn(
-        "Expected to report URI for",
-        info.url,
-        "with ads but couldn't find the information"
-      );
-      return;
-    }
-
-    Services.telemetry.keyedScalarAdd(
-      SEARCH_WITH_ADS_SCALAR,
-      item.info.provider,
-      1
-    );
-    logConsole.debug("Counting ads in page for", item.info.provider, info.url);
-  }
-}
-
-var SearchTelemetry = new TelemetryHandler();
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_addEngine.js firefox-85.0+build1/browser/components/search/test/browser/browser_addEngine.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_addEngine.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_addEngine.js	2021-01-18 19:58:08.000000000 +0000
@@ -60,7 +60,7 @@
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABGklEQVQoz2NgGB6AnZ1dUlJSXl4eSDIyMhLW4Ovr%2B%2Fr168uXL69Zs4YoG%2BLi4i5dusTExMTGxsbNzd3f37937976%2BnpmZmagbHR09J49e5YvX66kpATVEBYW9ubNm2nTphkbG7e2tp44cQLIuHfvXm5urpaWFlDKysqqu7v73LlzECMYIiIiHj58mJCQoKKicvXq1bS0NKBgW1vbjh074uPjgeqAXE1NzSdPnvDz84M0AEUvXLgAsW379u1z5swBen3jxo2zZ892cHB4%2BvQp0KlAfwI1cHJyghQFBwfv2rULokFXV%2FfixYu7d%2B8GGqGgoMDKyrpu3br9%2B%2FcDuXl5eVA%2FAEWBfoWHAdAYoNuAYQ0XAeoUERFhGDYAAPoUaT2dfWJuAAAAAElFTkSuQmCC"
       );
     },
-    added(engine) {
+    async added(engine) {
       ok(engine, "engine was added.");
 
       checkEngine(this.engine, engine);
@@ -68,7 +68,7 @@
       let engineFromSS = gSS.getEngineByName(this.engine.name);
       is(engine, engineFromSS, "engine is obtainable via getEngineByName");
 
-      let aEngine = gSS.getEngineByAlias("fooalias");
+      let aEngine = await gSS.getEngineByAlias("fooalias");
       ok(!aEngine, "Alias was not parsed from engine description");
 
       gSS.defaultEngine = engine;
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_contentSearchUI.js firefox-85.0+build1/browser/components/search/test/browser/browser_contentSearchUI.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_contentSearchUI.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_contentSearchUI.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,16 +10,20 @@
 XPCOMUtils.defineLazyModuleGetters(this, {
   ContentSearch: "resource:///actors/ContentSearchParent.jsm",
   FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm",
+  SearchSuggestionController:
+    "resource://gre/modules/SearchSuggestionController.jsm",
 });
 
 requestLongerTimeout(2);
 
 function waitForSuggestions() {
-  return SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
-    return ContentTaskUtils.waitForCondition(() => {
-      return content.gController.input.getAttribute("aria-expanded") == "true";
-    });
-  });
+  return SpecialPowers.spawn(gBrowser.selectedBrowser, [], () =>
+    ContentTaskUtils.waitForCondition(
+      () => content.gController.input.getAttribute("aria-expanded") == "true",
+      "Waiting for suggestions",
+      200 // Increased interval to support long textruns.
+    )
+  );
 }
 
 async function waitForSearch() {
@@ -117,6 +121,20 @@
       }
       break;
     }
+    case "text": {
+      await SpecialPowers.spawn(
+        gBrowser.selectedBrowser,
+        [data.value],
+        text => {
+          content.gController.input.value = text.substring(0, text.length - 1);
+          content.synthesizeKey(text.substring(text.length - 1), {});
+        }
+      );
+      if (data?.waitForSuggestions) {
+        await waitForSuggestions();
+      }
+      break;
+    }
     case "startComposition":
       await BrowserTestUtils.synthesizeComposition(
         "compositionstart",
@@ -652,6 +670,43 @@
 
   await msg("reset");
 });
+
+add_task(async function formHistory_limit() {
+  info("Check long strings are not added to form history");
+  await focusContentSearchBar();
+  const gLongString = new Array(
+    SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH + 1
+  )
+    .fill("x")
+    .join("");
+  // Type and confirm a very long string.
+  let state = await msg("text", {
+    value: gLongString,
+    waitForSuggestions: true,
+  });
+  checkState(
+    state,
+    gLongString,
+    [`${gLongString}foo`, `${gLongString}bar`],
+    -1
+  );
+
+  await FormHistoryTestUtils.clear("searchbar-history");
+  let entry = await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
+    return content.gController.addInputValueToFormHistory();
+  });
+  // There's nothing we can wait for, since addition should not be happening.
+  /* eslint-disable mozilla/no-arbitrary-setTimeout */
+  await new Promise(resolve => setTimeout(resolve, 500));
+  Assert.equal(
+    await FormHistoryTestUtils.count("searchbar-history", {
+      source: entry.source,
+    }),
+    0
+  );
+
+  await msg("reset");
+});
 
 add_task(async function cycleEngines() {
   await focusContentSearchBar();
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser.ini firefox-85.0+build1/browser/components/search/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -40,6 +40,15 @@
 [browser_oneOffContextMenu_setDefault.js]
 skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to Bug 1584886
 [browser_private_search_perwindowpb.js]
+[browser_search_telemetry_aboutHome.js]
+tags = search-telemetry
+[browser_search_telemetry_content.js]
+tags = search-telemetry
+[browser_search_telemetry_searchbar.js]
+tags = search-telemetry
+support-files =
+  telemetrySearchSuggestions.sjs
+  telemetrySearchSuggestions.xml
 [browser_searchbar_addEngine.js]
 [browser_searchbar_context.js]
 [browser_searchbar_default.js]
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchbar_default.js firefox-85.0+build1/browser/components/search/test/browser/browser_searchbar_default.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchbar_default.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_searchbar_default.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,10 @@
 
 "use strict";
 
+const { SearchSuggestionController } = ChromeUtils.import(
+  "resource://gre/modules/SearchSuggestionController.jsm"
+);
+
 const templateNormal = "https://example.com/?q=";
 const templatePrivate = "https://example.com/?query=";
 
@@ -74,8 +78,14 @@
   });
 });
 
-async function doSearch(win, tab, engineName, expectedUrl) {
-  await searchInSearchbar(win, "query");
+async function doSearch(
+  win,
+  tab,
+  engineName,
+  templateUrl,
+  inputText = "query"
+) {
+  await searchInSearchbar(win, inputText);
 
   Assert.ok(
     win.BrowserSearch.searchBar.textbox.popup.searchbarEngineName
@@ -90,7 +100,7 @@
 
   Assert.equal(
     tab.linkedBrowser.currentURI.spec,
-    expectedUrl,
+    templateUrl + inputText,
     "Should have loaded the expected search page."
   );
 }
@@ -101,7 +111,7 @@
     "about:blank"
   );
 
-  await doSearch(window, tab, "MozSearch1", templateNormal + "query");
+  await doSearch(window, tab, "MozSearch1", templateNormal);
 
   BrowserTestUtils.removeTab(tab);
 });
@@ -109,12 +119,7 @@
 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 doSearch(win, win.gBrowser.selectedTab, "MozSearch1", templateNormal);
 
   await BrowserTestUtils.closeWindow(win);
 });
@@ -130,12 +135,49 @@
 
   const win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
 
-  await doSearch(
-    win,
-    win.gBrowser.selectedTab,
-    "MozSearch2",
-    templatePrivate + "query"
-  );
+  await doSearch(win, win.gBrowser.selectedTab, "MozSearch2", templatePrivate);
 
   await BrowserTestUtils.closeWindow(win);
 });
+
+add_task(async function test_form_history() {
+  const tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+  await FormHistoryTestUtils.clear("searchbar-history");
+  const gShortString = new Array(
+    SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH
+  )
+    .fill("a")
+    .join("");
+  let promiseAdd = TestUtils.topicObserved("satchel-storage-changed");
+  await doSearch(window, tab, "MozSearch1", templateNormal, gShortString);
+  await promiseAdd;
+  let entries = (await FormHistoryTestUtils.search("searchbar-history")).map(
+    entry => entry.value
+  );
+  Assert.deepEqual(
+    entries,
+    [gShortString],
+    "Should have stored search history"
+  );
+
+  await FormHistoryTestUtils.clear("searchbar-history");
+  const gLongString = new Array(
+    SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH + 1
+  )
+    .fill("a")
+    .join("");
+  await doSearch(window, tab, "MozSearch1", templateNormal, gLongString);
+  // There's nothing we can wait for, since addition should not be happening.
+  /* eslint-disable mozilla/no-arbitrary-setTimeout */
+  await new Promise(resolve => setTimeout(resolve, 500));
+  entries = (await FormHistoryTestUtils.search("searchbar-history")).map(
+    entry => entry.value
+  );
+  Assert.deepEqual(entries, [], "Should not find form history");
+
+  await FormHistoryTestUtils.clear("searchbar-history");
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js firefox-85.0+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_searchEngine_behaviors.js	2021-01-18 19:58:08.000000000 +0000
@@ -45,7 +45,7 @@
   {
     alias: "e",
     baseURL:
-      "https://rover.ebay.com/rover/1/711-53200-19255-0/1?ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com/sch/foo",
+      "https://www.ebay.com/sch/?toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=711-53200-19255-0&kw=foo",
     codes: {
       context: "",
       keyword: "",
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_aboutHome.js firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_aboutHome.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_aboutHome.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_aboutHome.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,122 @@
+"use strict";
+
+const SCALAR_ABOUT_HOME = "browser.engagement.navigation.about_home";
+
+add_task(async function setup() {
+  // about:home uses IndexedDB. However, the test finishes too quickly and doesn't
+  // allow it enougth time to save. So it throws. This disables all the uncaught
+  // exception in this file and that's the reason why we split about:home tests
+  // out of the other UsageTelemetry files.
+  ignoreAllUncaughtExceptions();
+
+  // 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
+  // in content doesn't display the default search engine among the one-off engines.
+  await Services.search.addEngineWithDetails("MozSearch", {
+    alias: "mozalias",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  await Services.search.addEngineWithDetails("MozSearch2", {
+    alias: "mozalias2",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  // Make the first engine the default search engine.
+  let engineDefault = Services.search.getEngineByName("MozSearch");
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engineDefault);
+
+  // Move the second engine at the beginning of the one-off list.
+  let engineOneOff = Services.search.getEngineByName("MozSearch2");
+  await Services.search.moveEngine(engineOneOff, 0);
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(engineDefault);
+    await Services.search.removeEngine(engineOneOff);
+    await PlacesUtils.history.clear();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+    Services.telemetry.canRecordExtended = oldCanRecord;
+  });
+});
+
+add_task(async function test_abouthome_activitystream_simpleQuery() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  info("Load about:home.");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:home");
+  await BrowserTestUtils.browserStopped(tab.linkedBrowser, "about:home");
+
+  info("Wait for ContentSearchUI search provider to initialize.");
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
+    await ContentTaskUtils.waitForCondition(
+      () => content.wrappedJSObject.gContentSearchController.defaultEngine
+    );
+  });
+
+  info("Trigger a simple search, just test + enter.");
+  let p = BrowserTestUtils.browserStopped(
+    tab.linkedBrowser,
+    "http://example.com/?q=test+query"
+  );
+  await typeInSearchField(
+    tab.linkedBrowser,
+    "test query",
+    "newtab-search-text"
+  );
+  await BrowserTestUtils.synthesizeKey("VK_RETURN", {}, tab.linkedBrowser);
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_ABOUT_HOME,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_ABOUT_HOME]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.abouthome",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "about_home",
+        value: "enter",
+        extra: { engine: "other-MozSearch" },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_content.js firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_content.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_content.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,198 @@
+"use strict";
+
+const BASE_PROBE_NAME = "browser.engagement.navigation.";
+const SCALAR_CONTEXT_MENU = BASE_PROBE_NAME + "contextmenu";
+const SCALAR_ABOUT_NEWTAB = BASE_PROBE_NAME + "about_newtab";
+
+add_task(async function setup() {
+  // 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
+  // in content doesn't display the default search engine among the one-off engines.
+  await Services.search.addEngineWithDetails("MozSearch", {
+    alias: "mozalias",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  await Services.search.addEngineWithDetails("MozSearch2", {
+    alias: "mozalias2",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  // Make the first engine the default search engine.
+  let engineDefault = Services.search.getEngineByName("MozSearch");
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engineDefault);
+
+  // Move the second engine at the beginning of the one-off list.
+  let engineOneOff = Services.search.getEngineByName("MozSearch2");
+  await Services.search.moveEngine(engineOneOff, 0);
+
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.select_events.enabled", true], // We want select events to be fired.
+    ],
+  });
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(engineDefault);
+    await Services.search.removeEngine(engineOneOff);
+    await PlacesUtils.history.clear();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+    Services.telemetry.canRecordExtended = oldCanRecord;
+  });
+});
+
+add_task(async function test_context_menu() {
+  // Let's reset the Telemetry data.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  // Open a new tab with a page containing some text.
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "data:text/plain;charset=utf8,test%20search"
+  );
+
+  info("Select all the text in the page.");
+  await SpecialPowers.spawn(tab.linkedBrowser, [""], async function() {
+    return new Promise(resolve => {
+      content.document.addEventListener("selectionchange", () => resolve(), {
+        once: true,
+      });
+      content.document.getSelection().selectAllChildren(content.document.body);
+    });
+  });
+
+  info("Open the context menu.");
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let popupPromise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
+  BrowserTestUtils.synthesizeMouseAtCenter(
+    "body",
+    { type: "contextmenu", button: 2 },
+    gBrowser.selectedBrowser
+  );
+  await popupPromise;
+
+  info("Click on search.");
+  let searchItem = contextMenu.getElementsByAttribute(
+    "id",
+    "context-searchselect"
+  )[0];
+  searchItem.click();
+
+  info("Validate the search metrics.");
+
+  // Telemetry is not updated synchronously here, we must wait for it.
+  await TestUtils.waitForCondition(() => {
+    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+    return Object.keys(scalars[SCALAR_CONTEXT_MENU] || {}).length == 1;
+  }, "This search must increment one entry in the scalar.");
+
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_CONTEXT_MENU,
+    "search",
+    1
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.contextmenu",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "contextmenu",
+        value: null,
+        extra: { engine: "other-MozSearch" },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  contextMenu.hidePopup();
+  BrowserTestUtils.removeTab(gBrowser.selectedTab);
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_about_newtab() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:newtab",
+    false
+  );
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
+    await ContentTaskUtils.waitForCondition(() => !content.document.hidden);
+  });
+
+  info("Trigger a simple serch, just text + enter.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await typeInSearchField(
+    tab.linkedBrowser,
+    "test query",
+    "newtab-search-text"
+  );
+  await BrowserTestUtils.synthesizeKey("VK_RETURN", {}, tab.linkedBrowser);
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_ABOUT_NEWTAB,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_ABOUT_NEWTAB]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.newtab",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "about_newtab",
+        value: "enter",
+        extra: { engine: "other-MozSearch" },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchTelemetry.js firefox-85.0+build1/browser/components/search/test/browser/browser_searchTelemetry.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_searchTelemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_searchTelemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -2,16 +2,16 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /*
- * Main tests for SearchTelemetry - general engine visiting and link clicking.
+ * Main tests for SearchSERPTelemetry - general engine visiting and link clicking.
  */
 
 "use strict";
 
-const { SearchTelemetry } = ChromeUtils.import(
-  "resource:///modules/SearchTelemetry.jsm"
+const { SearchSERPTelemetry } = ChromeUtils.import(
+  "resource:///modules/SearchSERPTelemetry.jsm"
 );
 const { ADLINK_CHECK_TIMEOUT_MS } = ChromeUtils.import(
-  "resource:///actors/SearchTelemetryChild.jsm"
+  "resource:///actors/SearchSERPTelemetryChild.jsm"
 );
 
 const TEST_PROVIDER_INFO = [
@@ -37,8 +37,8 @@
   return `http://${server}/browser/browser/components/search/test/browser/${page}`;
 }
 
-function getSERPUrl(page) {
-  return page + "?s=test&abc=ff";
+function getSERPUrl(page, organic = false) {
+  return `${page}?s=test${organic ? "" : "&abc=ff"}`;
 }
 
 function getSERPFollowOnUrl(page) {
@@ -116,7 +116,7 @@
 }
 
 add_task(async function setup() {
-  SearchTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
+  SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO);
   await waitForIdle();
   // Enable local telemetry recording for the duration of the tests.
   let oldCanRecord = Services.telemetry.canRecordExtended;
@@ -125,7 +125,7 @@
 
   registerCleanupFunction(async () => {
     Services.prefs.clearUserPref("browser.search.log");
-    SearchTelemetry.overrideSearchTelemetryForTests();
+    SearchSERPTelemetry.overrideSearchTelemetryForTests();
     Services.telemetry.canRecordExtended = oldCanRecord;
     Services.telemetry.clearScalars();
   });
@@ -202,7 +202,26 @@
   await assertTelemetry(
     { "example.in-content:sap:ff": 1 },
     {
-      "browser.search.with_ads": { example: 1 },
+      "browser.search.with_ads": { "example:sap": 1 },
+    }
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_track_ad_organic() {
+  Services.telemetry.clearScalars();
+  searchCounts.clear();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    getSERPUrl(getPageUrl(false, true), true)
+  );
+
+  await assertTelemetry(
+    { "example.in-content:organic:none": 1 },
+    {
+      "browser.search.with_ads": { "example:organic": 1 },
     }
   );
 
@@ -216,7 +235,7 @@
   let win = await BrowserTestUtils.openNewBrowserWindow();
 
   let url = getSERPUrl(getPageUrl(false, true));
-  await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
   await BrowserTestUtils.browserLoaded(
     win.gBrowser.selectedBrowser,
     false,
@@ -226,7 +245,7 @@
   await assertTelemetry(
     { "example.in-content:sap:ff": 1 },
     {
-      "browser.search.with_ads": { example: 1 },
+      "browser.search.with_ads": { "example:sap": 1 },
     }
   );
 
@@ -256,7 +275,7 @@
   await assertTelemetry(
     { "example.in-content:sap:ff": 2 },
     {
-      "browser.search.with_ads": { example: 1 },
+      "browser.search.with_ads": { "example:sap": 1 },
     }
   );
 
@@ -265,20 +284,25 @@
   }
 });
 
-add_task(async function test_track_ad_click() {
+async function track_ad_click(testOrganic) {
   // Note: the above tests have already checked a page with no ad-urls.
   searchCounts.clear();
   Services.telemetry.clearScalars();
 
+  let expectedScalarKey = `example:${testOrganic ? "organic" : "sap"}`;
+  let expectedHistogramKey = `example.in-content:${
+    testOrganic ? "organic:none" : "sap:ff"
+  }`;
+
   let tab = await BrowserTestUtils.openNewForegroundTab(
     gBrowser,
-    getSERPUrl(getPageUrl(false, true))
+    getSERPUrl(getPageUrl(false, true), testOrganic)
   );
 
   await assertTelemetry(
-    { "example.in-content:sap:ff": 1 },
+    { [expectedHistogramKey]: 1 },
     {
-      "browser.search.with_ads": { example: 1 },
+      "browser.search.with_ads": { [expectedScalarKey]: 1 },
     }
   );
 
@@ -291,10 +315,10 @@
   await new Promise(resolve => setTimeout(resolve, ADLINK_CHECK_TIMEOUT_MS));
 
   await assertTelemetry(
-    { "example.in-content:sap:ff": 1 },
+    { [expectedHistogramKey]: 1 },
     {
-      "browser.search.with_ads": { example: 1 },
-      "browser.search.ad_clicks": { example: 1 },
+      "browser.search.with_ads": { [expectedScalarKey]: 1 },
+      "browser.search.ad_clicks": { [expectedScalarKey]: 1 },
     }
   );
 
@@ -307,10 +331,10 @@
 
   // We've gone back, so we register an extra display & if it is with ads or not.
   await assertTelemetry(
-    { "example.in-content:sap:ff": 2 },
+    { [expectedHistogramKey]: 2 },
     {
-      "browser.search.with_ads": { example: 2 },
-      "browser.search.ad_clicks": { example: 1 },
+      "browser.search.with_ads": { [expectedScalarKey]: 2 },
+      "browser.search.ad_clicks": { [expectedScalarKey]: 1 },
     }
   );
 
@@ -323,14 +347,22 @@
   await new Promise(resolve => setTimeout(resolve, ADLINK_CHECK_TIMEOUT_MS));
 
   await assertTelemetry(
-    { "example.in-content:sap:ff": 2 },
+    { [expectedHistogramKey]: 2 },
     {
-      "browser.search.with_ads": { example: 2 },
-      "browser.search.ad_clicks": { example: 2 },
+      "browser.search.with_ads": { [expectedScalarKey]: 2 },
+      "browser.search.ad_clicks": { [expectedScalarKey]: 2 },
     }
   );
 
   BrowserTestUtils.removeTab(tab);
+}
+
+add_task(async function test_track_ad_click() {
+  await track_ad_click(false);
+});
+
+add_task(async function test_track_ad_click_organic() {
+  await track_ad_click(true);
 });
 
 add_task(async function test_track_ad_click_with_location_change_other_tab() {
@@ -342,7 +374,7 @@
   await assertTelemetry(
     { "example.in-content:sap:ff": 1 },
     {
-      "browser.search.with_ads": { example: 1 },
+      "browser.search.with_ads": { "example:sap": 1 },
     }
   );
 
@@ -362,8 +394,8 @@
   await assertTelemetry(
     { "example.in-content:sap:ff": 1 },
     {
-      "browser.search.with_ads": { example: 1 },
-      "browser.search.ad_clicks": { example: 1 },
+      "browser.search.with_ads": { "example:sap": 1 },
+      "browser.search.ad_clicks": { "example:sap": 1 },
     }
   );
 
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_searchbar.js firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_searchbar.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/browser_search_telemetry_searchbar.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/browser_search_telemetry_searchbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,467 @@
+"use strict";
+
+const SCALAR_SEARCHBAR = "browser.engagement.navigation.searchbar";
+
+ChromeUtils.defineModuleGetter(
+  this,
+  "UrlbarTestUtils",
+  "resource://testing-common/UrlbarTestUtils.jsm"
+);
+
+function checkHistogramResults(resultIndexes, expected, histogram) {
+  for (let [i, val] of Object.entries(resultIndexes.values)) {
+    if (i == expected) {
+      Assert.equal(
+        val,
+        1,
+        `expected counts should match for ${histogram} index ${i}`
+      );
+    } else {
+      Assert.equal(
+        !!val,
+        false,
+        `unexpected counts should be zero for ${histogram} index ${i}`
+      );
+    }
+  }
+}
+
+let searchInSearchbar = async function(inputText) {
+  let win = window;
+  await new Promise(r => waitForFocus(r, win));
+  let sb = BrowserSearch.searchBar;
+  // Write the search query in the searchbar.
+  sb.focus();
+  sb.value = inputText;
+  sb.textbox.controller.startSearch(inputText);
+  // Wait for the popup to show.
+  await BrowserTestUtils.waitForEvent(sb.textbox.popup, "popupshown");
+  // And then for the search to complete.
+  await BrowserTestUtils.waitForCondition(
+    () =>
+      sb.textbox.controller.searchStatus >=
+      Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH,
+    "The search in the searchbar must complete."
+  );
+};
+
+/**
+ * Click one of the entries in the search suggestion popup.
+ *
+ * @param {string} entryName
+ *        The name of the elemet to click on.
+ * @param {object} [clickOptions]
+ *        The options to use for the click.
+ */
+function clickSearchbarSuggestion(entryName, clickOptions = {}) {
+  let richlistbox = BrowserSearch.searchBar.textbox.popup.richlistbox;
+  let richlistitem = Array.prototype.find.call(
+    richlistbox.children,
+    item => item.getAttribute("ac-value") == entryName
+  );
+
+  // Make sure the suggestion is visible and simulate the click.
+  richlistbox.ensureElementIsVisible(richlistitem);
+  EventUtils.synthesizeMouseAtCenter(richlistitem, clickOptions);
+}
+
+add_task(async function setup() {
+  await gCUITestUtils.addSearchBar();
+  registerCleanupFunction(() => {
+    gCUITestUtils.removeSearchBar();
+  });
+
+  // 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("MozSearch", {
+    alias: "mozalias",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  await Services.search.addEngineWithDetails("MozSearch2", {
+    alias: "mozalias2",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  // Make the first engine the default search engine.
+  let engineDefault = Services.search.getEngineByName("MozSearch");
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engineDefault);
+
+  // Move the second engine at the beginning of the one-off list.
+  let engineOneOff = Services.search.getEngineByName("MozSearch2");
+  await Services.search.moveEngine(engineOneOff, 0);
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(engineDefault);
+    await Services.search.removeEngine(engineOneOff);
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+  });
+});
+
+add_task(async function test_plainQuery() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Simulate entering a simple search.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInSearchbar("simple query");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_SEARCHBAR,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.searchbar",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "searchbar",
+        value: "enter",
+        extra: { engine: "other-MozSearch" },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Performs a search using the first result, a one-off button, and the Return
+// (Enter) key.
+add_task(async function test_oneOff_enter() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Perform a one-off search using the first engine.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInSearchbar("query");
+
+  info("Pressing Alt+Down to highlight the first one off engine.");
+  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_SEARCHBAR,
+    "search_oneoff",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch2.searchbar",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "searchbar",
+        value: "oneoff",
+        extra: { engine: "other-MozSearch2" },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Performs a search using the second result, a one-off button, and the Return
+// (Enter) key.  This only tests the FX_SEARCHBAR_SELECTED_RESULT_METHOD
+// histogram since test_oneOff_enter covers everything else.
+add_task(async function test_oneOff_enterSelection() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  // Create an engine to generate search suggestions and add it as default
+  // for this test.
+  const url = getRootDirectory(gTestPath) + "telemetrySearchSuggestions.xml";
+  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
+  let previousEngine = await Services.search.getDefault();
+  await Services.search.setDefault(suggestionEngine);
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Type a query. Suggestions should be generated by the test engine.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInSearchbar("query");
+
+  info(
+    "Select the second result, press Alt+Down to take us to the first one-off engine."
+  );
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await Services.search.setDefault(previousEngine);
+  await Services.search.removeEngine(suggestionEngine);
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Performs a search using a click on a one-off button.  This only tests the
+// FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
+// everything else.
+add_task(async function test_oneOff_click() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Type a query.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInSearchbar("query");
+  info("Click the first one-off button.");
+  BrowserSearch.searchBar.textbox.popup.oneOffButtons
+    .getSelectableButtons(false)[0]
+    .click();
+  await p;
+
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+async function checkSuggestionClick(clickOptions, waitForActionFn) {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  // Create an engine to generate search suggestions and add it as default
+  // for this test.
+  const url = getRootDirectory(gTestPath) + "telemetrySearchSuggestions.xml";
+  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
+  let previousEngine = await Services.search.getDefault();
+  await Services.search.setDefault(suggestionEngine);
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Perform a one-off search using the first engine.");
+  let p = waitForActionFn(tab);
+  await searchInSearchbar("query");
+  info("Clicking the searchbar suggestion.");
+  clickSearchbarSuggestion("queryfoo", clickOptions);
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_SEARCHBAR,
+    "search_suggestion",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  let searchEngineId = "other-" + suggestionEngine.name;
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    searchEngineId + ".searchbar",
+    1
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      {
+        object: "searchbar",
+        value: "suggestion",
+        extra: { engine: searchEngineId },
+      },
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await Services.search.setDefault(previousEngine);
+  await Services.search.removeEngine(suggestionEngine);
+  BrowserTestUtils.removeTab(tab);
+}
+
+// Clicks the first suggestion offered by the test search engine.
+add_task(async function test_suggestion_click() {
+  await checkSuggestionClick({}, tab => {
+    return BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  });
+});
+
+add_task(async function test_suggestion_middle_click() {
+  let openedTab;
+  await checkSuggestionClick({ button: 1 }, () => {
+    return BrowserTestUtils.waitForNewTab(gBrowser, "http://example.com/").then(
+      tab => (openedTab = tab)
+    );
+  });
+  BrowserTestUtils.removeTab(openedTab);
+});
+
+// Selects and presses the Return (Enter) key on the first suggestion offered by
+// the test search engine.  This only tests the
+// FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_suggestion_click
+// covers everything else.
+add_task(async function test_suggestion_enterSelection() {
+  // Let's reset the counts.
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  // Create an engine to generate search suggestions and add it as default
+  // for this test.
+  const url = getRootDirectory(gTestPath) + "telemetrySearchSuggestions.xml";
+  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
+  let previousEngine = await Services.search.getDefault();
+  await Services.search.setDefault(suggestionEngine);
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Type a query. Suggestions should be generated by the test engine.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInSearchbar("query");
+  info("Select the second result and press Return.");
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  let resultMethods = resultMethodHist.snapshot();
+  checkHistogramResults(
+    resultMethods,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
+    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await Services.search.setDefault(previousEngine);
+  await Services.search.removeEngine(suggestionEngine);
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/head.js firefox-85.0+build1/browser/components/search/test/browser/head.js
--- firefox-84.0.2+build1/browser/components/search/test/browser/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -5,9 +5,11 @@
   AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
   CustomizableUITestUtils:
     "resource://testing-common/CustomizableUITestUtils.jsm",
+  FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm",
 });
 
@@ -127,3 +129,15 @@
   }
   return oneOffs;
 }
+
+async function typeInSearchField(browser, text, fieldName) {
+  await SpecialPowers.spawn(browser, [[fieldName, text]], async function([
+    contentFieldName,
+    contentText,
+  ]) {
+    // Put the focus on the search box.
+    let searchInput = content.document.getElementById(contentFieldName);
+    searchInput.focus();
+    searchInput.value = contentText;
+  });
+}
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/mozsearch.sjs firefox-85.0+build1/browser/components/search/test/browser/mozsearch.sjs
--- firefox-84.0.2+build1/browser/components/search/test/browser/mozsearch.sjs	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/mozsearch.sjs	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
 
 function handleRequest(req, resp) {
   resp.setHeader("Content-Type", "text/html", false);
-  if (req.hasHeader("Origin")) {
+  if (req.hasHeader("Origin") && req.getHeader("Origin") != "null") {
     resp.write("error");
     return;
   }
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/telemetrySearchSuggestions.sjs firefox-85.0+build1/browser/components/search/test/browser/telemetrySearchSuggestions.sjs
--- firefox-84.0.2+build1/browser/components/search/test/browser/telemetrySearchSuggestions.sjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/telemetrySearchSuggestions.sjs	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,9 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function handleRequest(req, resp) {
+  let suffixes = ["foo", "bar"];
+  let data = [req.queryString, suffixes.map(s => req.queryString + s)];
+  resp.setHeader("Content-Type", "application/json", false);
+  resp.write(JSON.stringify(data));
+}
diff -Nru firefox-84.0.2+build1/browser/components/search/test/browser/telemetrySearchSuggestions.xml firefox-85.0+build1/browser/components/search/test/browser/telemetrySearchSuggestions.xml
--- firefox-84.0.2+build1/browser/components/search/test/browser/telemetrySearchSuggestions.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/browser/telemetrySearchSuggestions.xml	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>browser_UsageTelemetry usageTelemetrySearchSuggestions.xml</ShortName>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/search/test/browser/telemetrySearchSuggestions.sjs?{searchTerms}"/>
+<Url type="text/html" method="GET" template="http://example.com" rel="searchform"/>
+</SearchPlugin>
diff -Nru firefox-84.0.2+build1/browser/components/search/test/unit/test_urlTelemetry.js firefox-85.0+build1/browser/components/search/test/unit/test_urlTelemetry.js
--- firefox-84.0.2+build1/browser/components/search/test/unit/test_urlTelemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/search/test/unit/test_urlTelemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,25 +1,27 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { SearchTelemetry } = ChromeUtils.import(
-  "resource:///modules/SearchTelemetry.jsm"
-);
-const { SearchUtils } = ChromeUtils.import(
-  "resource://gre/modules/SearchUtils.jsm"
-);
-const { TelemetryTestUtils } = ChromeUtils.import(
-  "resource://testing-common/TelemetryTestUtils.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
+  NetUtil: "resource://gre/modules/NetUtil.jsm",
+  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
+  SearchUtils: "resource://gre/modules/SearchUtils.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+  sinon: "resource://testing-common/Sinon.jsm",
+  TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
+});
+
 const TESTS = [
   {
     title: "Google search access point",
     trackingUrl:
       "https://www.google.com/search?q=test&ie=utf-8&oe=utf-8&client=firefox-b-1-ab",
     expectedSearchCountEntry: "google.in-content:sap:firefox-b-1-ab",
-    expectedAdKey: "google",
+    expectedAdKey: "google:sap",
     adUrls: [
       "https://www.googleadservices.com/aclk=foobar",
       "https://www.googleadservices.com/pagead/aclk=foobar",
@@ -43,6 +45,9 @@
     trackingUrl:
       "https://www.google.com/search?source=hp&ei=EI_VALUE&q=test&oq=test&gs_l=GS_L_VALUE",
     expectedSearchCountEntry: "google.in-content:organic:none",
+    expectedAdKey: "google:organic",
+    adUrls: ["https://www.googleadservices.com/aclk=foobar"],
+    nonAdUrls: ["https://www.googleadservices.com/?aclk=foobar"],
   },
   {
     title: "Google organic UK",
@@ -66,7 +71,7 @@
     title: "Bing search access point",
     trackingUrl: "https://www.bing.com/search?q=test&pc=MOZI&form=MOZLBR",
     expectedSearchCountEntry: "bing.in-content:sap:MOZI",
-    expectedAdKey: "bing",
+    expectedAdKey: "bing:sap",
     adUrls: [
       "https://www.bing.com/aclick?ld=foo",
       "https://www.bing.com/fd/ls/GLinkPingPost.aspx?IG=bar&url=https%3A%2F%2Fwww.bing.com%2Faclick",
@@ -110,12 +115,15 @@
     trackingUrl:
       "https://www.bing.com/search?q=test&qs=n&form=QBLH&sp=-1&pq=&sc=0-0&sk=&cvid=CVID_VALUE",
     expectedSearchCountEntry: "bing.in-content:organic:none",
+    expectedAdKey: "bing:organic",
+    adUrls: ["https://www.bing.com/aclick?ld=foo"],
+    nonAdUrls: ["https://www.bing.com/fd/ls/ls.gif?IG=foo"],
   },
   {
     title: "DuckDuckGo search access point",
     trackingUrl: "https://duckduckgo.com/?q=test&t=ffab",
     expectedSearchCountEntry: "duckduckgo.in-content:sap:ffab",
-    expectedAdKey: "duckduckgo",
+    expectedAdKey: "duckduckgo:sap",
     adUrls: [
       "https://duckduckgo.com/y.js?ad_provider=foo",
       "https://duckduckgo.com/y.js?f=bar&ad_provider=foo",
@@ -131,6 +139,9 @@
     title: "DuckDuckGo organic",
     trackingUrl: "https://duckduckgo.com/?q=test&t=hi&ia=news",
     expectedSearchCountEntry: "duckduckgo.in-content:organic:hi",
+    expectedAdKey: "duckduckgo:organic",
+    adUrls: ["https://duckduckgo.com/y.js?ad_provider=foo"],
+    nonAdUrls: ["https://duckduckgo.com/?q=foo&t=ffab&ia=images&iax=images"],
   },
   {
     title: "Baidu search access point",
@@ -174,7 +185,7 @@
     ),
     loadUsingSystemPrincipal: true,
   });
-  SearchTelemetry._contentHandler.observeActivity(
+  SearchSERPTelemetry._contentHandler.observeActivity(
     channel,
     Ci.nsIHttpActivityObserver.ACTIVITY_TYPE_HTTP_TRANSACTION,
     Ci.nsIHttpActivityObserver.ACTIVITY_SUBTYPE_TRANSACTION_CLOSE
@@ -201,7 +212,8 @@
 
 add_task(async function setup() {
   Services.prefs.setBoolPref(SearchUtils.BROWSER_SEARCH_PREF + "log", true);
-  await SearchTelemetry.init();
+  await SearchSERPTelemetry.init();
+  sinon.stub(BrowserSearchTelemetry, "shouldRecordSearchCount").returns(true);
 });
 
 add_task(async function test_parsing_search_urls() {
@@ -210,7 +222,12 @@
     if (test.setUp) {
       test.setUp();
     }
-    SearchTelemetry.updateTrackingStatus({}, test.trackingUrl);
+    SearchSERPTelemetry.updateTrackingStatus(
+      {
+        getTabBrowser: () => {},
+      },
+      test.trackingUrl
+    );
     const hs = Services.telemetry
       .getKeyedHistogramById("SEARCH_COUNTS")
       .snapshot();
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/ContentRestore.jsm firefox-85.0+build1/browser/components/sessionstore/ContentRestore.jsm
--- firefox-84.0.2+build1/browser/components/sessionstore/ContentRestore.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/ContentRestore.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -18,11 +18,6 @@
   "Utils",
   "resource://gre/modules/sessionstore/Utils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "E10SUtils",
-  "resource://gre/modules/E10SUtils.jsm"
-);
 /**
  * This module implements the content side of session restoration. The chrome
  * side is handled by SessionStore.jsm. The functions in this module are called
@@ -254,56 +249,12 @@
       if (loadArguments) {
         // If the load was started in another process, and the in-flight channel
         // was redirected into this process, resume that load within our process.
-        if (loadArguments.redirectLoadSwitchId) {
-          webNavigation.resumeRedirectedLoad(
-            loadArguments.redirectLoadSwitchId,
-            loadArguments.redirectHistoryIndex
-          );
-          return true;
-        }
-
-        // A load has been redirected to a new process so get history into the
-        // same state it was before the load started then trigger the load.
-        // Referrer information is now stored as a referrerInfo property. We
-        // should also cope with the old format of passing `referrer` and
-        // `referrerPolicy` separately.
-        let referrerInfo = loadArguments.referrerInfo;
-        if (referrerInfo) {
-          referrerInfo = E10SUtils.deserializeReferrerInfo(referrerInfo);
-        } else {
-          let referrer = loadArguments.referrer
-            ? Services.io.newURI(loadArguments.referrer)
-            : null;
-          let referrerPolicy =
-            "referrerPolicy" in loadArguments
-              ? loadArguments.referrerPolicy
-              : Ci.nsIReferrerInfo.EMPTY;
-          let ReferrerInfo = Components.Constructor(
-            "@mozilla.org/referrer-info;1",
-            "nsIReferrerInfo",
-            "init"
-          );
-          referrerInfo = new ReferrerInfo(referrerPolicy, true, referrer);
-        }
-        let postData = loadArguments.postData
-          ? E10SUtils.makeInputStream(loadArguments.postData)
-          : null;
-        let triggeringPrincipal = E10SUtils.deserializePrincipal(
-          loadArguments.triggeringPrincipal,
-          () => Services.scriptSecurityManager.createNullPrincipal({})
+        //
+        // NOTE: In this case `isRemotenessUpdate` must be true.
+        webNavigation.resumeRedirectedLoad(
+          loadArguments.redirectLoadSwitchId,
+          loadArguments.redirectHistoryIndex
         );
-        let csp = loadArguments.csp
-          ? E10SUtils.deserializeCSP(loadArguments.csp)
-          : null;
-
-        let loadURIOptions = {
-          triggeringPrincipal,
-          loadFlags: loadArguments.flags,
-          referrerInfo,
-          postData,
-          csp,
-        };
-        webNavigation.loadURI(loadArguments.uri, loadURIOptions);
       } else if (tabData.userTypedValue && tabData.userTypedClear) {
         // If the user typed a URL into the URL bar and hit enter right before
         // we crashed, we want to start loading that page again. A non-zero
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/SessionStartup.jsm firefox-85.0+build1/browser/components/sessionstore/SessionStartup.jsm
--- firefox-84.0.2+build1/browser/components/sessionstore/SessionStartup.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/SessionStartup.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -213,6 +213,10 @@
         "browser.engagement.restored_pinned_tabs_count",
         pinnedTabCount
       );
+      Services.telemetry.scalarSetMaximum(
+        "browser.engagement.max_concurrent_tab_pinned_count",
+        pinnedTabCount
+      );
     }, 60000);
 
     // If this is a normal restore then throw away any previous session.
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/SessionStore.jsm firefox-85.0+build1/browser/components/sessionstore/SessionStore.jsm
--- firefox-84.0.2+build1/browser/components/sessionstore/SessionStore.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/SessionStore.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,6 @@
 const TAB_LAZY_STATES = new WeakMap();
 const TAB_STATE_NEEDS_RESTORE = 1;
 const TAB_STATE_RESTORING = 2;
-const TAB_STATE_WILL_RESTORE = 3;
 const TAB_STATE_FOR_BROWSER = new WeakMap();
 const WINDOW_RESTORE_IDS = new WeakMap();
 const WINDOW_RESTORE_ZINDICES = new WeakMap();
@@ -430,14 +429,6 @@
     return SessionStoreInternal.reviveAllCrashedTabs();
   },
 
-  navigateAndRestore(tab, loadArguments, historyIndex) {
-    return SessionStoreInternal.navigateAndRestore(
-      tab,
-      loadArguments,
-      historyIndex
-    );
-  },
-
   updateSessionStoreFromTablistener(aBrowser, aBrowsingContext, aData) {
     return SessionStoreInternal.updateSessionStoreFromTablistener(
       aBrowser,
@@ -604,11 +595,6 @@
   // reason about.
   _saveableClosedWindowData: new WeakSet(),
 
-  // A map (xul:browser -> object) that maps a browser that is switching
-  // remoteness via navigateAndRestore, to the loadArguments that were
-  // most recently passed when calling navigateAndRestore.
-  _remotenessChangingBrowsers: new WeakMap(),
-
   // whether a setBrowserState call is in progress
   _browserSetState: false,
 
@@ -1038,7 +1024,9 @@
       },
 
       OnHistoryNewEntry(newURI, oldIndex) {
-        this.notifySHistoryChanges(oldIndex);
+        // We use oldIndex - 1 to collect the current entry as well. This makes sure to
+        // collect any changes that were made to the entry while the document was active.
+        this.notifySHistoryChanges(oldIndex == -1 ? oldIndex : oldIndex - 1);
       },
 
       OnHistoryGotoIndex() {
@@ -1055,14 +1043,6 @@
 
       OnHistoryReplaceEntry() {
         this.notifySHistoryChanges(-1);
-
-        let win = this.browser.ownerGlobal;
-        let tab = win ? win.gBrowser.getTabForBrowser(this.browser) : null;
-        if (tab) {
-          let event = tab.ownerDocument.createEvent("CustomEvent");
-          event.initCustomEvent("SSHistoryReplaceEntry", true, false);
-          tab.dispatchEvent(event);
-        }
       },
     };
 
@@ -3866,148 +3846,6 @@
   },
 
   /**
-   * Navigate the given |tab| by first collecting its current state and then
-   * either changing only the index of the currently shown history entry,
-   * or restoring the exact same state again and passing the new URL to load
-   * in |loadArguments|. Use this method to seamlessly switch between pages
-   * loaded in the parent and pages loaded in the child process.
-   *
-   * This method might be called multiple times before it has finished
-   * flushing the browser tab. If that occurs, the loadArguments from
-   * the most recent call to navigateAndRestore will be used once the
-   * flush has finished.
-   *
-   * This method returns a promise which will be resolved when the browser
-   * element's process has been swapped. The load is not guaranteed to have
-   * been completed at this point.
-   */
-  navigateAndRestore(tab, loadArguments, historyIndex) {
-    let window = tab.ownerGlobal;
-
-    if (!window.__SSi) {
-      Cu.reportError("Tab's window must be tracked.");
-      return Promise.reject();
-    }
-
-    let browser = tab.linkedBrowser;
-
-    // If we were alerady waiting for a flush from a previous call to
-    // navigateAndRestore on this tab, update the loadArguments stored, and
-    // asynchronously wait on the flush's promise.
-    if (this._remotenessChangingBrowsers.has(browser.permanentKey)) {
-      let opts = this._remotenessChangingBrowsers.get(browser.permanentKey);
-      // XXX(nika): In the existing logic, we always use the initial
-      // historyIndex value, and don't update it if multiple navigateAndRestore
-      // calls are made. Should we update it here?
-      opts.loadArguments = loadArguments;
-      return opts.promise;
-    }
-
-    // Begin the asynchronous NavigateAndRestore process, and store the current
-    // load arguments and promise in our _remotenessChangingBrowsers weakmap.
-    let promise = this._asyncNavigateAndRestore(tab);
-    this._remotenessChangingBrowsers.set(browser.permanentKey, {
-      loadArguments,
-      historyIndex,
-      promise,
-    });
-
-    // Set up the browser UI to look like we're doing something while waiting
-    // for a TabStateFlush from our frame scripts.
-    let uriObj;
-    try {
-      uriObj = Services.io.newURI(loadArguments.uri);
-    } catch (e) {}
-
-    // Start the throbber to pretend we're doing something while actually
-    // waiting for data from the frame script. This throbber is disabled
-    // if the URI is a local about: URI.
-    if (!uriObj || (uriObj && !uriObj.schemeIs("about"))) {
-      tab.setAttribute("busy", "true");
-    }
-
-    // Hack to ensure that the about:home, about:newtab, and about:welcome
-    // favicon is loaded instantaneously, to avoid flickering and improve
-    // perceived performance.
-    window.gBrowser.setDefaultIcon(tab, uriObj);
-
-    TAB_STATE_FOR_BROWSER.set(tab.linkedBrowser, TAB_STATE_WILL_RESTORE);
-
-    // Notify of changes to closed objects.
-    this._notifyOfClosedObjectsChange();
-
-    return promise;
-  },
-
-  /**
-   * Internal logic called by navigateAndRestore to flush tab state, and
-   * trigger a remoteness changing load with the most recent load arguments.
-   *
-   * This method's promise will resolve when the process for the given
-   * xul:browser element has successfully been swapped.
-   *
-   * @param tab to navigate and restore.
-   */
-  async _asyncNavigateAndRestore(tab) {
-    let permanentKey = tab.linkedBrowser.permanentKey;
-    let browser = tab.linkedBrowser;
-
-    // NOTE: This is currently the only async operation used, but this is likely
-    // to change in the future.
-    await this.prepareToChangeRemoteness(browser);
-
-    // Now that we have flushed state, our loadArguments, etc. may have been
-    // overwritten by multiple calls to navigateAndRestore. Load the most
-    // recently stored one.
-    let { loadArguments, historyIndex } = this._remotenessChangingBrowsers.get(
-      permanentKey
-    );
-    this._remotenessChangingBrowsers.delete(permanentKey);
-
-    // The tab might have been closed/gone in the meantime.
-    if (tab.closing || !tab.linkedBrowser) {
-      return;
-    }
-
-    // The tab or its window might be gone.
-    let window = tab.ownerGlobal;
-    if (!window || !window.__SSi || window.closed) {
-      return;
-    }
-
-    let tabState = TabState.clone(tab, TAB_CUSTOM_VALUES.get(tab));
-    let options = {
-      restoreImmediately: true,
-      // We want to make sure that this information is passed to restoreTab
-      // whether or not a historyIndex is passed in. Thus, we extract it from
-      // the loadArguments.
-      newFrameloader: loadArguments.newFrameloader,
-      remoteType: loadArguments.remoteType,
-      // Make sure that SessionStore knows that this restoration is due
-      // to a navigation, as opposed to us restoring a closed window or tab.
-      restoreContentReason: RESTORE_TAB_CONTENT_REASON.NAVIGATE_AND_RESTORE,
-    };
-
-    if (historyIndex >= 0) {
-      tabState.index = historyIndex + 1;
-      tabState.index = Math.max(
-        1,
-        Math.min(tabState.index, tabState.entries.length)
-      );
-    } else {
-      options.loadArguments = loadArguments;
-    }
-
-    // Need to reset restoring tabs.
-    if (TAB_STATE_FOR_BROWSER.has(tab.linkedBrowser)) {
-      this._resetLocalTabRestoringState(tab);
-    }
-
-    // Restore the state into the tab.
-    this.restoreTab(tab, tabState, options);
-  },
-
-  /**
    * Retrieves the latest session history information for a tab. The cached data
    * is returned immediately, but a callback may be provided that supplies
    * up-to-date data when or if it is available. The callback is passed a single
@@ -4943,9 +4781,6 @@
     let activeIndex = tabData.index - 1;
     let activePageData = tabData.entries[activeIndex] || null;
     let uri = activePageData ? activePageData.url || null : null;
-    if (loadArguments) {
-      uri = loadArguments.uri;
-    }
 
     this.markTabAsRestoring(aTab);
 
@@ -4953,22 +4788,10 @@
     // necessary.
     let isRemotenessUpdate = aOptions.isRemotenessUpdate;
     if (!isRemotenessUpdate) {
-      let newFrameloader = aOptions.newFrameloader;
-      if (aOptions.remoteType !== undefined) {
-        // We already have a selected remote type so we update to that.
-        isRemotenessUpdate = tabbrowser.updateBrowserRemoteness(browser, {
-          remoteType: aOptions.remoteType,
-          newFrameloader,
-        });
-      } else {
-        isRemotenessUpdate = tabbrowser.updateBrowserRemotenessByURL(
-          browser,
-          uri,
-          {
-            newFrameloader,
-          }
-        );
-      }
+      isRemotenessUpdate = tabbrowser.updateBrowserRemotenessByURL(
+        browser,
+        uri
+      );
 
       if (isRemotenessUpdate) {
         // We updated the remoteness, so we need to send the history down again.
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser_async_remove_tab.js firefox-85.0+build1/browser/components/sessionstore/test/browser_async_remove_tab.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser_async_remove_tab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser_async_remove_tab.js	2021-01-18 19:58:08.000000000 +0000
@@ -32,56 +32,6 @@
   return ss.undoCloseTab(window, index);
 }
 
-function promiseNewLocationAndHistoryEntryReplaced(tab, snippet) {
-  let browser = tab.linkedBrowser;
-
-  if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    SpecialPowers.spawn(browser, [snippet], async function(codeSnippet) {
-      // Need to define 'webNavigation' for 'codeSnippet'
-      // eslint-disable-next-line no-unused-vars
-      let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
-      // Evaluate the snippet that changes the location.
-      // eslint-disable-next-line no-eval
-      eval(codeSnippet);
-    });
-    return promiseOnHistoryReplaceEntry(tab);
-  }
-
-  return SpecialPowers.spawn(browser, [snippet], async function(codeSnippet) {
-    let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
-    let shistory = webNavigation.sessionHistory.legacySHistory;
-
-    // Evaluate the snippet that changes the location.
-    // eslint-disable-next-line no-eval
-    eval(codeSnippet);
-
-    return new Promise(resolve => {
-      let listener = {
-        OnHistoryReplaceEntry() {
-          shistory.removeSHistoryListener(this);
-          resolve();
-        },
-
-        QueryInterface: ChromeUtils.generateQI([
-          "nsISHistoryListener",
-          "nsISupportsWeakReference",
-        ]),
-      };
-
-      shistory.addSHistoryListener(listener);
-
-      /* Keep the weak shistory listener alive. */
-      docShell.chromeEventHandler.addEventListener("unload", function() {
-        try {
-          shistory.removeSHistoryListener(listener);
-        } catch (e) {
-          /* Will most likely fail. */
-        }
-      });
-    });
-  });
-}
-
 add_task(async function dont_save_empty_tabs() {
   let { tab, r } = await createTabWithRandomValue("about:blank");
 
@@ -132,10 +82,14 @@
   ok(browser.isRemoteBrowser, "browser is remote");
 
   // Replace about:blank with a new remote page.
-  let snippet =
-    'webNavigation.loadURI("https://example.com/",\
-    {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()})';
-  await promiseNewLocationAndHistoryEntryReplaced(tab, snippet);
+  let entryReplaced = promiseOnHistoryReplaceEntry(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
+    webNavigation.loadURI("https://example.com/", {
+      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+    });
+  });
+  await entryReplaced;
 
   // Remotness shouldn't have changed.
   ok(browser.isRemoteBrowser, "browser is still remote");
@@ -157,14 +111,10 @@
   ok(browser.isRemoteBrowser, "browser is remote");
 
   // Replace about:blank with a non-remote entry.
-  await BrowserTestUtils.loadURI(browser, "about:robots");
+  BrowserTestUtils.loadURI(browser, "about:robots");
+  await BrowserTestUtils.browserLoaded(browser);
   ok(!browser.isRemoteBrowser, "browser is not remote anymore");
 
-  // Switching remoteness caused a SessionRestore to begin, moving over history
-  // and initiating the load in the target process. Wait for the full restore
-  // and load to complete before trying to close the tab.
-  await promiseTabRestored(tab);
-
   // Remove the tab before the update arrives.
   let promise = promiseRemoveTabAndSessionState(tab);
 
@@ -178,10 +128,15 @@
 
 add_task(async function dont_save_empty_tabs_final() {
   let { tab, r } = await createTabWithRandomValue("https://example.com/");
+  let browser = tab.linkedBrowser;
+  ok(browser.isRemoteBrowser, "browser is remote");
 
   // Replace the current page with an about:blank entry.
-  let snippet = 'content.location.replace("about:blank")';
-  await promiseNewLocationAndHistoryEntryReplaced(tab, snippet);
+  let entryReplaced = promiseOnHistoryReplaceEntry(browser);
+  await SpecialPowers.spawn(browser, [], async () => {
+    content.location.replace("about:blank");
+  });
+  await entryReplaced;
 
   // Remove the tab before the update arrives.
   let promise = promiseRemoveTabAndSessionState(tab);
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser_async_window_flushing.js firefox-85.0+build1/browser/components/sessionstore/test/browser_async_window_flushing.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser_async_window_flushing.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser_async_window_flushing.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,12 +38,8 @@
     content.location = newPage;
   });
 
-  if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    let tab = newWin.gBrowser.selectedTab;
-    await promiseOnHistoryReplaceEntry(tab);
-  } else {
-    await promiseOnHistoryReplaceEntryInChild(browser);
-  }
+  await promiseOnHistoryReplaceEntry(browser);
+
   // Clear out the userTypedValue so that the new window looks like
   // it's really not worth restoring.
   browser.userTypedValue = null;
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser.ini firefox-85.0+build1/browser/components/sessionstore/test/browser.ini
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -80,7 +80,7 @@
 skip-if = debug # bug 1167933
 [browser_async_remove_tab.js]
 run-if = e10s
-skip-if = fission || debug # bug 1211084
+skip-if = debug # bug 1211084
 [browser_attributes.js]
 [browser_backup_recovery.js]
 skip-if = (verify && debug && (os == 'linux'))
@@ -98,7 +98,6 @@
 [browser_dying_cache.js]
 skip-if = (os == 'win') # bug 1331853
 [browser_dynamic_frames.js]
-skip-if = fission
 [browser_formdata.js]
 skip-if = fission || (verify && debug)
 [browser_formdata_cc.js]
@@ -128,6 +127,7 @@
 skip-if = fission
 [browser_scrollPositionsReaderMode.js]
 [browser_sessionHistory.js]
+skip-if = tsan # Bug 1651907, highly frequent on TSan
 support-files =
   file_sessionHistory_hashchange.html
 [browser_sessionStorage.js]
@@ -141,7 +141,7 @@
 run-if = e10s
 skip-if = fission
 [browser_upgrade_backup.js]
-skip-if = debug || asan || (verify && debug && os == 'mac') # Bug 1435394 disabled on Linux, OSX and Windows
+skip-if = debug || asan || tsan || (verify && debug && os == 'mac') # Bug 1435394 disabled on Linux, OSX and Windows
 [browser_windowRestore_perwindowpb.js]
 [browser_248970_b_perwindowpb.js]
 # Disabled because of leaks.
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser_restore_reversed_z_order.js firefox-85.0+build1/browser/components/sessionstore/test/browser_restore_reversed_z_order.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser_restore_reversed_z_order.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser_restore_reversed_z_order.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,7 @@
     let browserLoaded = BrowserTestUtils.browserLoaded(
       window.gBrowser.selectedBrowser
     );
-    await BrowserTestUtils.loadURI(window.gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(window.gBrowser.selectedBrowser, url);
     await browserLoaded;
     // Capture the title.
     gTestURLsMap.set(url, window.gBrowser.selectedTab.label);
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser_sessionHistory.js firefox-85.0+build1/browser/components/sessionstore/test/browser_sessionHistory.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser_sessionHistory.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser_sessionHistory.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,8 +17,8 @@
   const PAGE = "http://example.com/";
 
   // Load a new URI.
-  let historyReplacePromise = promiseOnHistoryReplaceEntryInChild(browser);
-  await BrowserTestUtils.loadURI(browser, PAGE);
+  let historyReplacePromise = promiseOnHistoryReplaceEntry(browser);
+  BrowserTestUtils.loadURI(browser, PAGE);
 
   // Remove the tab before it has finished loading.
   await historyReplacePromise;
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/browser_urlbarSearchMode.js firefox-85.0+build1/browser/components/sessionstore/test/browser_urlbarSearchMode.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/browser_urlbarSearchMode.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/browser_urlbarSearchMode.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/sessionstore/test/head.js firefox-85.0+build1/browser/components/sessionstore/test/head.js
--- firefox-84.0.2+build1/browser/components/sessionstore/test/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/sessionstore/test/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -524,10 +524,6 @@
   return new Promise(resolve => whenDelayedStartupFinished(aWindow, resolve));
 }
 
-function promiseOnHistoryReplaceEntry(tab) {
-  return BrowserTestUtils.waitForEvent(tab, "SSHistoryReplaceEntry");
-}
-
 function promiseTabRestored(tab) {
   return BrowserTestUtils.waitForEvent(tab, "SSTabRestored");
 }
@@ -659,7 +655,7 @@
   );
 }
 
-function promiseOnHistoryReplaceEntryInChild(browser) {
+function promiseOnHistoryReplaceEntry(browser) {
   if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
     return new Promise(resolve => {
       let sessionHistory = browser.browsingContext?.sessionHistory;
diff -Nru firefox-84.0.2+build1/browser/components/shell/nsGNOMEShellSearchProvider.cpp firefox-85.0+build1/browser/components/shell/nsGNOMEShellSearchProvider.cpp
--- firefox-84.0.2+build1/browser/components/shell/nsGNOMEShellSearchProvider.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/shell/nsGNOMEShellSearchProvider.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 #include "base/message_loop.h"  // for MessageLoop
 #include "base/task.h"          // for NewRunnableMethod, etc
 #include "nsIServiceManager.h"
+#include "nsIURI.h"
 #include "nsNetCID.h"
 #include "nsPrintfCString.h"
 #include "nsIIOService.h"
diff -Nru firefox-84.0.2+build1/browser/components/shell/nsGNOMEShellService.cpp firefox-85.0+build1/browser/components/shell/nsGNOMEShellService.cpp
--- firefox-84.0.2+build1/browser/components/shell/nsGNOMEShellService.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/shell/nsGNOMEShellService.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Preferences.h"
 
 #include "nsCOMPtr.h"
 #include "nsGNOMEShellService.h"
diff -Nru firefox-84.0.2+build1/browser/components/shell/nsMacShellService.cpp firefox-85.0+build1/browser/components/shell/nsMacShellService.cpp
--- firefox-84.0.2+build1/browser/components/shell/nsMacShellService.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/shell/nsMacShellService.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsIImageLoadingContent.h"
 #include "mozilla/dom/Document.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIContent.h"
 #include "nsICookieJarSettings.h"
 #include "nsIObserverService.h"
@@ -18,6 +19,7 @@
 #include "nsString.h"
 #include "nsIDocShell.h"
 #include "nsILoadContext.h"
+#include "nsIPrefService.h"
 #include "mozilla/dom/Element.h"
 #include "DesktopBackgroundImage.h"
 
diff -Nru firefox-84.0.2+build1/browser/components/shell/nsWindowsShellService.cpp firefox-85.0+build1/browser/components/shell/nsWindowsShellService.cpp
--- firefox-84.0.2+build1/browser/components/shell/nsWindowsShellService.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/shell/nsWindowsShellService.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -9,9 +9,11 @@
 #include "imgIContainer.h"
 #include "imgIRequest.h"
 #include "mozilla/RefPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIContent.h"
 #include "nsIImageLoadingContent.h"
 #include "nsIOutputStream.h"
+#include "nsIPrefService.h"
 #include "nsIStringBundle.h"
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
@@ -25,6 +27,7 @@
 #include "nsXULAppAPI.h"
 #include "mozilla/WindowsVersion.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/gfx/2D.h"
 #include "WindowsDefaultBrowser.h"
 
 #include "windows.h"
diff -Nru firefox-84.0.2+build1/browser/components/tests/browser/browser.ini firefox-85.0+build1/browser/components/tests/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/tests/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/tests/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,3 @@
 [browser_default_bookmark_toolbar_visibility.js]
 [browser_initial_tab_remoteType.js]
 [browser_startup_homepage.js]
-[browser_urlbar_matchBuckets_migration60.js]
-skip-if = os == 'win' #Bug 1592498
-
-
diff -Nru firefox-84.0.2+build1/browser/components/tests/browser/browser_urlbar_matchBuckets_migration60.js firefox-85.0+build1/browser/components/tests/browser/browser_urlbar_matchBuckets_migration60.js
--- firefox-84.0.2+build1/browser/components/tests/browser/browser_urlbar_matchBuckets_migration60.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/tests/browser/browser_urlbar_matchBuckets_migration60.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Makes sure the browser.urlbar.matchBuckets pref is set correctly starting in
-// Firefox 60, nsBrowserGlue UI version 66.
-
-const PREF_NAME = "browser.urlbar.matchBuckets";
-const PREF_VALUE_SUGGESTIONS_FIRST = "suggestion:4,general:5";
-const PREF_VALUE_GENERAL_FIRST = "general:5,suggestion:Infinity";
-const STUDY_NAME = "pref-flip-search-composition-57-release-1413565";
-
-ChromeUtils.import("resource://normandy/lib/PreferenceExperiments.jsm", this);
-
-// Migrates without doing anything else.  The pref should be set to show history
-// first.
-add_task(async function migrate() {
-  await sanityCheckInitialState();
-
-  // Trigger migration.  The pref is cleared initially, so after migration it
-  // should be set on the user branch to show history first.
-  await promiseMigration();
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    PREF_VALUE_GENERAL_FIRST,
-    "Pref should be set, general first"
-  );
-  Assert.ok(
-    Services.prefs.prefHasUserValue(PREF_NAME),
-    "Pref should be set on user branch"
-  );
-
-  Services.prefs.clearUserPref(PREF_NAME);
-});
-
-// Sets the pref to a value on the user branch and migrates.  The pref shouldn't
-// change.
-add_task(async function setUserPrefAndMigrate() {
-  await sanityCheckInitialState();
-
-  // Set a value for the pref on the user branch.
-  let userValue = "userTest:10";
-  Services.prefs.setCharPref(PREF_NAME, userValue);
-
-  // Trigger migration.  The pref should be preserved.
-  await promiseMigration();
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    userValue,
-    "Pref should remain same"
-  );
-  Assert.ok(
-    Services.prefs.prefHasUserValue(PREF_NAME),
-    "Pref should remain on user branch"
-  );
-
-  Services.prefs.clearUserPref(PREF_NAME);
-});
-
-// Sets the pref to a value on the default branch and migrates.  The pref
-// shouldn't change.
-add_task(async function setDefaultPrefAndMigrate() {
-  await sanityCheckInitialState();
-
-  // Set a value for the pref on the default branch.
-  let defaultValue = "defaultTest:10";
-  Services.prefs.getDefaultBranch(PREF_NAME).setCharPref("", defaultValue);
-
-  // Trigger migration.  The pref should be preserved.
-  await promiseMigration();
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    defaultValue,
-    "Pref should remain same"
-  );
-  Assert.ok(
-    !Services.prefs.prefHasUserValue(PREF_NAME),
-    "Pref should remain on default branch"
-  );
-
-  Services.prefs.deleteBranch(PREF_NAME);
-});
-
-// Installs the study using the pref that the overwhelming majority of users
-// will see ("ratio": 97, "value": "suggestion:4,general:5") and migrates.  The
-// study should be stopped and the pref should remain cleared.
-add_task(async function installStudyAndMigrate() {
-  await sanityCheckInitialState();
-
-  // Normandy can't unset the pref if it didn't already have a value, so give it
-  // a value that will be treated as empty by the migration.
-  Services.prefs.getDefaultBranch(PREF_NAME).setCharPref("", "");
-
-  // Install the study.  It should set the pref.
-  await PreferenceExperiments.start(newExperimentOpts());
-  Assert.ok(await PreferenceExperiments.has(STUDY_NAME), "Study installed");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    PREF_VALUE_SUGGESTIONS_FIRST,
-    "Pref should be set by study"
-  );
-
-  // Trigger migration.  The study should be stopped, and the pref should be
-  // cleared since it's the default value.
-  await promiseMigration();
-  Assert.ok(!(await getNonExpiredExperiment()), "Study stopped");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    "",
-    "Pref should be cleared"
-  );
-
-  await PreferenceExperiments.clearAllExperimentStorage();
-});
-
-// Installs the study using the pref that the overwhelming majority of users
-// will see ("ratio": 97, "value": "suggestion:4,general:5"), except that the
-// pref has unnecessary spaces in it, and then migrates.  The study should be
-// stopped and the pref should remain cleared.  i.e., the migration code should
-// parse the pref value and compare the resulting buckets instead of comparing
-// strings directly.
-add_task(async function installStudyPrefWithSpacesAndMigrate() {
-  await sanityCheckInitialState();
-
-  // Install the study.  It should set the pref.
-  const preferenceValue = " suggestion : 4, general : 5 ";
-  const experiment = newExperimentOpts({
-    preferences: {
-      [PREF_NAME]: {
-        preferenceValue,
-      },
-    },
-  });
-  await PreferenceExperiments.start(experiment);
-  Assert.ok(await PreferenceExperiments.has(STUDY_NAME), "Study installed");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    preferenceValue,
-    "Pref should be set by study"
-  );
-
-  // Trigger migration.  The study should be stopped, and the pref should be
-  // cleared since it's the default value.
-  await promiseMigration();
-  Assert.ok(!(await getNonExpiredExperiment()), "Study stopped");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    "",
-    "Pref should be cleared"
-  );
-
-  await PreferenceExperiments.clearAllExperimentStorage();
-});
-
-// Installs the study using a pref that a tiny number of users will see
-// ("ratio": 1, "value": "general:3,suggestion:6") and migrates.  The study
-// should be stopped and the pref should be preserved since it's not the new
-// default.
-add_task(async function installStudyMinorityPrefAndMigrate() {
-  await sanityCheckInitialState();
-
-  // Install the study.  It should set the pref.
-  let preferenceValue = "general:3,suggestion:6";
-  const experiment = newExperimentOpts({
-    preferences: {
-      [PREF_NAME]: {
-        preferenceValue,
-      },
-    },
-  });
-  await PreferenceExperiments.start(experiment);
-  Assert.ok(await PreferenceExperiments.has(STUDY_NAME), "Study installed");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    preferenceValue,
-    "Pref should be set by study"
-  );
-
-  // Trigger migration.  The study should be stopped, and the pref should remain
-  // the same since it's a non-default value.  It should be set on the user
-  // branch.
-  await promiseMigration();
-  Assert.ok(!(await getNonExpiredExperiment()), "Study stopped");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    preferenceValue,
-    "Pref should remain the same"
-  );
-  Assert.ok(
-    Services.prefs.prefHasUserValue(PREF_NAME),
-    "Pref should be set on user branch"
-  );
-
-  await PreferenceExperiments.clearAllExperimentStorage();
-  Services.prefs.clearUserPref(PREF_NAME);
-});
-
-// Sets the pref to some value on the default branch, installs the study, and
-// migrates.  The study should be stopped and the original pref value should be
-// restored.
-add_task(async function setDefaultPrefInstallStudyAndMigrate() {
-  await sanityCheckInitialState();
-
-  // First, set the pref to some value on the default branch.  (If the pref is
-  // set on the user branch, starting the study actually throws because the
-  // study's branch is the default branch.)
-  let defaultValue = "test:10";
-  Services.prefs.getDefaultBranch(PREF_NAME).setCharPref("", defaultValue);
-
-  // Install the study.  It should set the pref.
-  await PreferenceExperiments.start(newExperimentOpts());
-  Assert.ok(await PreferenceExperiments.has(STUDY_NAME), "Study installed");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    PREF_VALUE_SUGGESTIONS_FIRST,
-    "Pref should be set by study"
-  );
-
-  // Trigger migration.  The study should be stopped, and the pref should be
-  // restored to the value set above.
-  await promiseMigration();
-  Assert.ok(!(await getNonExpiredExperiment()), "Study stopped");
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    defaultValue,
-    "Pref should be restored to user value"
-  );
-
-  await PreferenceExperiments.clearAllExperimentStorage();
-  Services.prefs.deleteBranch(PREF_NAME);
-});
-
-async function sanityCheckInitialState() {
-  Assert.equal(
-    Services.prefs.getCharPref(PREF_NAME, ""),
-    "",
-    "Pref should be cleared initially"
-  );
-  Assert.ok(
-    !(await PreferenceExperiments.has(STUDY_NAME)),
-    "Study should not be installed initially"
-  );
-}
-
-function promiseMigration() {
-  let topic = "browser-glue-test";
-  let donePromise = TestUtils.topicObserved(topic, (subj, data) => {
-    return "migrateMatchBucketsPrefForUI66-done" == data;
-  });
-  Cc["@mozilla.org/browser/browserglue;1"]
-    .getService(Ci.nsIObserver)
-    .observe(null, topic, "migrateMatchBucketsPrefForUI66");
-  return donePromise;
-}
-
-function newExperimentOpts(opts = {}) {
-  const defaultPref = {
-    [PREF_NAME]: {},
-  };
-  const defaultPrefInfo = {
-    preferenceValue: PREF_VALUE_SUGGESTIONS_FIRST,
-    preferenceBranchType: "default",
-    preferenceType: "string",
-  };
-  const preferences = {};
-  for (const [prefName, prefInfo] of Object.entries(
-    opts.preferences || defaultPref
-  )) {
-    preferences[prefName] = { ...defaultPrefInfo, ...prefInfo };
-  }
-
-  return Object.assign(
-    {
-      slug: STUDY_NAME,
-      actionName: "SomeAction",
-      branch: "branch",
-    },
-    opts,
-    {
-      preferences,
-    }
-  );
-}
-
-async function getNonExpiredExperiment() {
-  try {
-    let exp = await PreferenceExperiments.get(STUDY_NAME);
-    if (exp.expired) {
-      return null;
-    }
-  } catch (ex) {}
-  return null;
-}
diff -Nru firefox-84.0.2+build1/browser/components/tests/startupRecorder.js firefox-85.0+build1/browser/components/tests/startupRecorder.js
--- firefox-84.0.2+build1/browser/components/tests/startupRecorder.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/tests/startupRecorder.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,10 @@
 
 let firstPaintNotification = "widget-first-paint";
 // widget-first-paint fires much later than expected on Linux.
-if (AppConstants.platform == "linux") {
+if (
+  AppConstants.platform == "linux" ||
+  Services.prefs.getBoolPref("browser.startup.preXulSkeletonUI", false)
+) {
   firstPaintNotification = "xul-window-visible";
 }
 
@@ -203,7 +206,7 @@
       let env = Cc["@mozilla.org/process/environment;1"].getService(
         Ci.nsIEnvironment
       );
-      if (!env.exists("MOZ_PROFILER_STARTUP")) {
+      if (!env.exists("MOZ_PROFILER_STARTUP_PERFORMANCE_TEST")) {
         this._resolve();
         this._resolve = null;
         return;
diff -Nru firefox-84.0.2+build1/browser/components/touchbar/tests/browser/browser_touchbar_tests.js firefox-85.0+build1/browser/components/touchbar/tests/browser/browser_touchbar_tests.js
--- firefox-84.0.2+build1/browser/components/touchbar/tests/browser/browser_touchbar_tests.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/touchbar/tests/browser/browser_touchbar_tests.js	2021-01-18 19:58:08.000000000 +0000
@@ -97,7 +97,7 @@
     "chrome://browser/skin/search-glass.svg",
     "OpenLocation should be displaying the search glass icon."
   );
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     gBrowser.selectedBrowser,
     TEST_PATH + "video_test.html"
   );
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_autoFill_canonize.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_autoFill_canonize.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_autoFill_canonize.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_autoFill_canonize.js	2021-01-18 19:58:08.000000000 +0000
@@ -55,8 +55,8 @@
     desc: "CTRL+ENTER on the autofilled part should bypass autofill",
     typed: "exam",
     autofilled: "example.com/",
-    modified: "www.exam.com",
-    waitForUrl: "http://www.exam.com/",
+    modified: "https://www.exam.com",
+    waitForUrl: "https://www.exam.com/",
     keys: [["KEY_Enter", { ctrlKey: true }]],
   });
 });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_autoOpen.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_autoOpen.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_autoOpen.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_autoOpen.js	2021-01-18 19:58:08.000000000 +0000
@@ -81,7 +81,7 @@
         // After example.com closes, about:newtab/home is selected again.
         await checkOpensOnFocus();
         // Load example.com in the same tab.
-        await BrowserTestUtils.loadURI(
+        BrowserTestUtils.loadURI(
           gBrowser.selectedBrowser,
           "http://example.com/"
         );
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_canonizeURL.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_canonizeURL.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_canonizeURL.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_canonizeURL.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,15 +15,15 @@
 
   let defaultEngine = await Services.search.getDefault();
   let testcases = [
-    ["example", "http://www.example.com/", { ctrlKey: true }],
+    ["example", "https://www.example.com/", { ctrlKey: true }],
     // Check that a direct load is not overwritten by a previous canonization.
     ["http://example.com/test/", "http://example.com/test/", {}],
-    ["ex-ample", "http://www.ex-ample.com/", { ctrlKey: true }],
-    ["  example ", "http://www.example.com/", { ctrlKey: true }],
-    [" example/foo ", "http://www.example.com/foo", { ctrlKey: true }],
+    ["ex-ample", "https://www.ex-ample.com/", { ctrlKey: true }],
+    ["  example ", "https://www.example.com/", { ctrlKey: true }],
+    [" example/foo ", "https://www.example.com/foo", { ctrlKey: true }],
     [
       " example/foo bar ",
-      "http://www.example.com/foo%20bar",
+      "https://www.example.com/foo%20bar",
       { ctrlKey: true },
     ],
     ["example.net", "http://example.net/", { ctrlKey: true }],
@@ -158,11 +158,11 @@
   ]);
 
   let testcases = [
-    ["ex", "http://www.ex.com/", { ctrlKey: true }],
+    ["ex", "https://www.ex.com/", { ctrlKey: true }],
     // Check that a direct load is not overwritten by a previous canonization.
     ["ex", "http://example.com/", {}],
     // search alias
-    ["@goo", "http://www%2E@goo.com/", { ctrlKey: true }],
+    ["@goo", "https://www.goo.com/", { ctrlKey: true }],
   ];
 
   function promiseAutofill() {
@@ -232,13 +232,13 @@
   EventUtils.synthesizeKey("VK_CONTROL", { type: "keyup" });
 
   info("Send enter key with the ctrl");
-  EventUtils.synthesizeKey("VK_RETURN", { type: "keydown", ctrlKey: true });
-  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-  is(
-    gBrowser.selectedBrowser.documentURI.spec,
-    `http://www.${testWord}.com/`,
-    "The loaded url is canonized"
+  const onLoad = BrowserTestUtils.waitForDocLoadAndStopIt(
+    `https://www.${testWord}.com/`,
+    gBrowser.selectedBrowser
   );
+  EventUtils.synthesizeKey("VK_RETURN", { type: "keydown", ctrlKey: true });
+  await onLoad;
+  info("The loaded url is canonized");
 });
 
 function simulatePastingToUrlbar(text) {
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_dynamicResults.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_dynamicResults.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_dynamicResults.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_dynamicResults.js	2021-01-18 19:58:08.000000000 +0000
@@ -46,6 +46,9 @@
   ],
 };
 
+const DUMMY_PAGE =
+  "http://example.com/browser/browser/base/content/test/general/dummy_page.html";
+
 // Tests the dynamic type registration functions and stylesheet loading.
 add_task(async function registration() {
   // Get our test stylesheet URIs.
@@ -400,6 +403,202 @@
   });
 });
 
+// Tests picking elements in a dynamic result.
+add_task(async function shouldNavigate() {
+  /**
+   * A dummy provider that providers results with a `shouldNavigate` property.
+   */
+  class TestShouldNavigateProvider extends TestProvider {
+    /**
+     * @param {object} context - Data regarding the context of the query.
+     * @param {function} addCallback - Function to add a result to the query.
+     */
+    async startQuery(context, addCallback) {
+      for (let result of this._results) {
+        result.payload.searchString = context.searchString;
+        result.payload.shouldNavigate = true;
+        result.payload.url = DUMMY_PAGE;
+        addCallback(this, result);
+      }
+    }
+  }
+
+  await withDynamicTypeProvider(async provider => {
+    // Do a search.
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: "test",
+      waitForFocus: SimpleTest.waitForFocus,
+    });
+
+    // Sanity check that the dynamic result is at index 1.
+    let row = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1);
+    Assert.equal(
+      row.result.type,
+      UrlbarUtils.RESULT_TYPE.DYNAMIC,
+      "row.result.type"
+    );
+
+    // The heuristic result will be selected.  Arrow down from the heuristic
+    // to the selectable element.
+    let element = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-selectable`
+    );
+    Assert.ok(element, "Sanity check element");
+    EventUtils.synthesizeKey("KEY_ArrowDown", { repeat: 1 });
+    Assert.equal(
+      UrlbarTestUtils.getSelectedElement(window),
+      element,
+      `Selected element: ${name}`
+    );
+
+    // Pick the element.
+    let pickPromise = provider.promisePick();
+    await UrlbarTestUtils.promisePopupClose(window, () =>
+      EventUtils.synthesizeKey("KEY_Enter")
+    );
+    // Verify that pickResult was still called.
+    let [result, pickedElement] = await pickPromise;
+    Assert.equal(result, row.result, "Picked result");
+    Assert.equal(pickedElement, element, "Picked element");
+
+    await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+    is(
+      gBrowser.currentURI.spec,
+      DUMMY_PAGE,
+      "We navigated to payload.url when result selected"
+    );
+
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:home");
+    await BrowserTestUtils.browserLoaded(
+      gBrowser.selectedBrowser,
+      false,
+      "about:home"
+    );
+
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: "test",
+      waitForFocus: SimpleTest.waitForFocus,
+    });
+
+    row = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1);
+    element = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-selectable`
+    );
+
+    pickPromise = provider.promisePick();
+    EventUtils.synthesizeMouseAtCenter(element, {});
+    [result, pickedElement] = await pickPromise;
+    Assert.equal(result, row.result, "Picked result");
+    Assert.equal(pickedElement, element, "Picked element");
+
+    await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+    is(
+      gBrowser.currentURI.spec,
+      DUMMY_PAGE,
+      "We navigated to payload.url when result is clicked"
+    );
+  }, new TestShouldNavigateProvider());
+});
+
+// Tests applying highlighting to a dynamic result.
+add_task(async function highlighting() {
+  /**
+   * Provides a dynamic result with highlighted text.
+   */
+  class TestHighlightProvider extends TestProvider {
+    startQuery(context, addCallback) {
+      let result = Object.assign(
+        new UrlbarResult(
+          UrlbarUtils.RESULT_TYPE.DYNAMIC,
+          UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+          ...UrlbarResult.payloadAndSimpleHighlights(context.tokens, {
+            dynamicType: DYNAMIC_TYPE_NAME,
+            text: ["Test title", UrlbarUtils.HIGHLIGHT.SUGGESTED],
+          })
+        ),
+        { suggestedIndex: 1 }
+      );
+      addCallback(this, result);
+    }
+
+    getViewUpdate(result, idsByName) {
+      return {};
+    }
+  }
+
+  // Test that highlighting is applied.
+  await withDynamicTypeProvider(async () => {
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: "test",
+      waitForFocus: SimpleTest.waitForFocus,
+    });
+
+    let row = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1);
+    Assert.equal(
+      row.result.type,
+      UrlbarUtils.RESULT_TYPE.DYNAMIC,
+      "row.result.type"
+    );
+    let parentTextNode = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-text`
+    );
+    let highlightedTextNode = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-text > strong`
+    );
+    Assert.equal(parentTextNode.firstChild.textContent, "Test");
+    Assert.equal(
+      highlightedTextNode.textContent,
+      " title",
+      "The highlighting was applied successfully."
+    );
+  }, new TestHighlightProvider());
+
+  /**
+   * Provides a dynamic result with highlighted text that is then overridden.
+   */
+  class TestHighlightProviderOveridden extends TestHighlightProvider {
+    getViewUpdate(result, idsByName) {
+      return {
+        text: {
+          textContent: "Test title",
+        },
+      };
+    }
+  }
+
+  // Test that highlighting is not applied when overridden from getViewUpdate.
+  await withDynamicTypeProvider(async () => {
+    // Do a search.
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: "test",
+      waitForFocus: SimpleTest.waitForFocus,
+    });
+
+    let row = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1);
+    Assert.equal(
+      row.result.type,
+      UrlbarUtils.RESULT_TYPE.DYNAMIC,
+      "row.result.type"
+    );
+    let parentTextNode = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-text`
+    );
+    let highlightedTextNode = row.querySelector(
+      `.urlbarView-dynamic-${DYNAMIC_TYPE_NAME}-text > strong`
+    );
+    Assert.equal(
+      parentTextNode.firstChild.textContent,
+      "Test title",
+      "No highlighting was applied"
+    );
+    Assert.ok(!highlightedTextNode, "The <strong> child node was deleted.");
+  }, new TestHighlightProviderOveridden());
+});
+
 /**
  * Provides a dynamic result.
  */
@@ -428,7 +627,11 @@
     }
   }
 
-  getViewUpdate(result) {
+  getViewUpdate(result, idsByName) {
+    for (let child of DYNAMIC_TYPE_VIEW_TEMPLATE.children) {
+      Assert.ok(idsByName.get(child.name), `idsByName contains ${child.name}`);
+    }
+
     return {
       selectable: {
         textContent: "Selectable",
@@ -473,7 +676,15 @@
   }
 }
 
-async function withDynamicTypeProvider(callback) {
+/**
+ * Provides a dynamic result.
+ * @param {object} callback - Function that runs the body of the test.
+ * @param {object} provider - The dummy provider to use.
+ */
+async function withDynamicTypeProvider(
+  callback,
+  provider = new TestProvider()
+) {
   // Add a dynamic result type.
   UrlbarResult.addDynamicResultType(DYNAMIC_TYPE_NAME);
   UrlbarView.addDynamicViewTemplate(
@@ -482,7 +693,6 @@
   );
 
   // Add a provider of the dynamic type.
-  let provider = new TestProvider();
   UrlbarProvidersManager.registerProvider(provider);
 
   await callback(provider);
@@ -510,6 +720,13 @@
       ),
       "child.name should be in classList"
     );
+    // We have to use startsWith/endsWith since the middle of the ID is a random
+    // number.
+    Assert.ok(actualChild.id.startsWith("urlbarView-row-"));
+    Assert.ok(
+      actualChild.id.endsWith(child.name),
+      "The child was assigned the correct ID."
+    );
     for (let [name, value] of Object.entries(child.attributes || {})) {
       Assert.equal(actualChild.getAttribute(name), value, `attribute: ${name}`);
     }
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_ime_composition.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_ime_composition.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_ime_composition.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_ime_composition.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
 
 // Tests ime composition handling.
 
-function synthesizeCompositionChange(string) {
+function composeAndCheckPanel(string, isPopupOpen) {
   EventUtils.synthesizeCompositionChange({
     composition: {
       string,
@@ -17,29 +17,66 @@
     caret: { start: string.length, length: 0 },
     key: { key: string ? string[string.length - 1] : "KEY_Backspace" },
   });
-  // Modifying composition should not open the popup.
-  Assert.ok(!UrlbarTestUtils.isPopupOpen(window), "Popup should be closed");
+  Assert.equal(
+    UrlbarTestUtils.isPopupOpen(window),
+    isPopupOpen,
+    "Check panel open state"
+  );
 }
 
-add_task(async function test_composition() {
-  gURLBar.focus();
+add_task(async function() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0]],
+  });
+
+  await PlacesUtils.history.clear();
   // Add at least one typed entry for the empty results set. Also clear history
   // so that this can be over the autofill threshold.
-  await PlacesUtils.history.clear();
   await PlacesTestUtils.addVisits({
     uri: "http://mozilla.org/",
     transition: PlacesUtils.history.TRANSITIONS.TYPED,
   });
+  // Add a bookmark to ensure we autofill the engine domain for tab-to-search.
+  let bm = await PlacesUtils.bookmarks.insert({
+    url: "http://example.com/",
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
+  });
+  let engine = await Services.search.addEngineWithDetails("Test", {
+    alias: "@test",
+    template: `http://example.com/?search={searchTerms}`,
+  });
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engine);
+
+  registerCleanupFunction(async () => {
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(engine);
+    await PlacesUtils.bookmarks.remove(bm);
+    await PlacesUtils.history.clear();
+  });
 
-  info(
-    "The popup should not be shown during composition but, after compositionend, it should be."
-  );
-  Assert.ok(!UrlbarTestUtils.isPopupOpen(window), "Popup should be closed");
-  synthesizeCompositionChange("I");
+  // Test both pref values.
+  for (let val of [true, false]) {
+    await SpecialPowers.pushPrefEnv({
+      set: [["browser.urlbar.imeCompositionClosesPanel", val]],
+    });
+    await test_composition(val);
+    await test_composition_searchMode_preview(val);
+    await test_composition_tabToSearch(val);
+  }
+});
+
+async function test_composition(compositionClosesPanel) {
+  gURLBar.focus();
+  await UrlbarTestUtils.promisePopupClose(window);
+
+  info("Check the panel state during composition");
+  composeAndCheckPanel("I", false);
   Assert.equal(gURLBar.value, "I", "Check urlbar value");
-  synthesizeCompositionChange("In");
+  composeAndCheckPanel("In", false);
   Assert.equal(gURLBar.value, "In", "Check urlbar value");
-  // Committing composition should open the popup.
+
+  info("Committing composition should open the panel.");
   await UrlbarTestUtils.promisePopupOpen(window, () => {
     EventUtils.synthesizeComposition({
       type: "compositioncommitasis",
@@ -48,14 +85,13 @@
   });
   Assert.equal(gURLBar.value, "In", "Check urlbar value");
 
-  info(
-    "If composition starts while the popup is shown, the compositionstart event should close the popup."
-  );
+  info("Check the panel state starting from an open panel.");
   Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open");
-  synthesizeCompositionChange("t");
+  composeAndCheckPanel("t", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Int", "Check urlbar value");
-  synthesizeCompositionChange("te");
+  composeAndCheckPanel("te", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Inte", "Check urlbar value");
+
   // Committing composition should open the popup.
   await UrlbarTestUtils.promisePopupOpen(window, () => {
     EventUtils.synthesizeComposition({
@@ -67,9 +103,9 @@
 
   info("If composition is cancelled, the value shouldn't be changed.");
   Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open");
-  synthesizeCompositionChange("r");
+  composeAndCheckPanel("r", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Inter", "Check urlbar value");
-  synthesizeCompositionChange("");
+  composeAndCheckPanel("", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Inte", "Check urlbar value");
   // Canceled compositionend should reopen the popup.
   await UrlbarTestUtils.promisePopupOpen(window, () => {
@@ -87,12 +123,13 @@
   Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open");
   EventUtils.synthesizeKey("VK_LEFT", { shiftKey: true });
   EventUtils.synthesizeKey("VK_LEFT", { shiftKey: true });
-  synthesizeCompositionChange("t");
+  composeAndCheckPanel("t", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Int", "Check urlbar value");
-  synthesizeCompositionChange("te");
+  composeAndCheckPanel("te", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "Inte", "Check urlbar value");
-  synthesizeCompositionChange("");
+  composeAndCheckPanel("", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "In", "Check urlbar value");
+
   // Canceled compositionend should search the result with the latest value.
   await UrlbarTestUtils.promisePopupOpen(window, () => {
     EventUtils.synthesizeComposition({
@@ -112,18 +149,19 @@
   await UrlbarTestUtils.promisePopupClose(window, () => {
     EventUtils.synthesizeKey("KEY_Escape", {});
   });
-
   Assert.equal(gURLBar.value, "", "Check urlbar value");
 
   info("Composition which is canceled shouldn't cause opening the popup.");
   Assert.ok(!UrlbarTestUtils.isPopupOpen(window), "Popup should be closed");
-  synthesizeCompositionChange("I");
+  composeAndCheckPanel("I", false);
   Assert.equal(gURLBar.value, "I", "Check urlbar value");
-  synthesizeCompositionChange("In");
+  composeAndCheckPanel("In", false);
   Assert.equal(gURLBar.value, "In", "Check urlbar value");
-  synthesizeCompositionChange("");
+  composeAndCheckPanel("", false);
   Assert.equal(gURLBar.value, "", "Check urlbar value");
-  // Canceled compositionend shouldn't open the popup if it was closed.
+
+  info("Canceled compositionend shouldn't open the popup if it was closed.");
+  await UrlbarTestUtils.promisePopupClose(window);
   EventUtils.synthesizeComposition({
     type: "compositioncommitasis",
     key: { key: "KEY_Escape" },
@@ -141,11 +179,11 @@
     "If popup is open at starting composition, the popup should be reopened after composition anyway."
   );
   Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open");
-  synthesizeCompositionChange("I");
+  composeAndCheckPanel("I", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "I", "Check urlbar value");
-  synthesizeCompositionChange("In");
+  composeAndCheckPanel("In", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "In", "Check urlbar value");
-  synthesizeCompositionChange("");
+  composeAndCheckPanel("", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "", "Check urlbar value");
   // A canceled compositionend should open the popup if it was open.
   await UrlbarTestUtils.promisePopupOpen(window, () => {
@@ -168,12 +206,15 @@
   EventUtils.synthesizeKey("KEY_Backspace", {});
   EventUtils.synthesizeKey("KEY_Backspace", {});
   Assert.equal(gURLBar.value, "", "Check urlbar value");
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape", {});
+  });
 
   info("With autofill, compositionstart shouldn't open the popup");
   Assert.ok(!UrlbarTestUtils.isPopupOpen(window), "Popup should be closed");
-  synthesizeCompositionChange("M");
+  composeAndCheckPanel("M", false);
   Assert.equal(gURLBar.value, "M", "Check urlbar value");
-  synthesizeCompositionChange("Mo");
+  composeAndCheckPanel("Mo", false);
   Assert.equal(gURLBar.value, "Mo", "Check urlbar value");
   // Committing composition should open the popup.
   await UrlbarTestUtils.promisePopupOpen(window, () => {
@@ -183,24 +224,11 @@
     });
   });
   Assert.equal(gURLBar.value, "Mozilla.org/", "Check urlbar value");
-});
+}
 
-add_task(async function test_composition_searchMode_preview() {
+async function test_composition_searchMode_preview(compositionClosesPanel) {
   info("Check Search Mode preview is retained by composition");
 
-  let engine = await Services.search.addEngineWithDetails("Test", {
-    alias: "@test",
-    template: `http://example.com/?search={searchTerms}`,
-  });
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(engine);
-
-  registerCleanupFunction(async () => {
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(engine);
-    await PlacesUtils.history.clear();
-  });
-
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
     value: "@",
@@ -215,31 +243,21 @@
     entry: "keywordoffer",
   };
   await UrlbarTestUtils.assertSearchMode(window, expectedSearchMode);
-  synthesizeCompositionChange("I");
+  composeAndCheckPanel("I", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "I", "Check urlbar value");
+  if (!compositionClosesPanel) {
+    await UrlbarTestUtils.promiseSearchComplete(window);
+  }
   // Test that we are in confirmed search mode.
   await UrlbarTestUtils.assertSearchMode(window, {
     engineName: "Test",
     entry: "keywordoffer",
   });
   await UrlbarTestUtils.exitSearchMode(window);
-});
-
-// Note: this is reusing the engine addedby the previous sub-test.
-add_task(async function test_composition_tabToSearch() {
-  info("Check Tab-to-Seatch is retained by composition");
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0]],
-  });
+}
 
-  // Add a bookmark to ensure we autofill the engine domain for tab-to-search.
-  let bm = await PlacesUtils.bookmarks.insert({
-    url: "http://example.com/",
-    parentGuid: PlacesUtils.bookmarks.menuGuid,
-  });
-  registerCleanupFunction(async () => {
-    await PlacesUtils.bookmarks.remove(bm);
-  });
+async function test_composition_tabToSearch(compositionClosesPanel) {
+  info("Check Tab-to-Search is retained by composition");
 
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
@@ -255,12 +273,15 @@
     entry: "tabtosearch",
   };
   await UrlbarTestUtils.assertSearchMode(window, expectedSearchMode);
-  synthesizeCompositionChange("I");
+  composeAndCheckPanel("I", !compositionClosesPanel);
   Assert.equal(gURLBar.value, "I", "Check urlbar value");
+  if (!compositionClosesPanel) {
+    await UrlbarTestUtils.promiseSearchComplete(window);
+  }
   // Test that we are in confirmed search mode.
   await UrlbarTestUtils.assertSearchMode(window, {
     engineName: "Test",
     entry: "tabtosearch",
   });
   await UrlbarTestUtils.exitSearchMode(window);
-});
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser.ini firefox-85.0+build1/browser/components/urlbar/tests/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
   head-common.js
 
 [browser_aboutHomeLoading.js]
+skip-if = tsan # Intermittently times out, see 1622698 (frequent on TSan).
 [browser_action_searchengine.js]
 [browser_action_searchengine_alias.js]
 [browser_action_searchengine_alias_legacy.js]
@@ -147,6 +148,7 @@
 [browser_retainedResultsOnFocus.js]
 [browser_revert.js]
 [browser_searchFunction.js]
+[browser_searchHistoryLimit.js]
 [browser_searchMode_alias_replacement.js]
 support-files =
   searchSuggestionEngine.xml
@@ -248,6 +250,31 @@
   searchSuggestionEngine.sjs
 [browser_urlbar_selection.js]
 skip-if = (os == 'mac') # bug 1570474
+[browser_urlbar_telemetry_dynamic.js]
+support-files =
+  urlbarTelemetryUrlbarDynamic.css
+[browser_urlbar_telemetry_extension.js]
+tags = search-telemetry
+[browser_urlbar_telemetry_places.js]
+tags = search-telemetry
+[browser_urlbar_telemetry_remotetab.js]
+tags = search-telemetry
+[browser_urlbar_telemetry_searchmode.js]
+tags = search-telemetry
+support-files =
+  urlbarTelemetrySearchSuggestions.sjs
+  urlbarTelemetrySearchSuggestions.xml
+[browser_urlbar_telemetry_tabtosearch.js]
+tags = search-telemetry
+[browser_urlbar_telemetry_tip.js]
+tags = search-telemetry
+[browser_urlbar_telemetry_topsite.js]
+tags = search-telemetry
+[browser_urlbar_telemetry.js]
+tags = search-telemetry
+support-files =
+  urlbarTelemetrySearchSuggestions.sjs
+  urlbarTelemetrySearchSuggestions.xml
 [browser_UrlbarInput_formatValue.js]
 [browser_UrlbarInput_hiddenFocus.js]
 [browser_UrlbarInput_overflow.js]
@@ -255,6 +282,7 @@
 [browser_UrlbarInput_setURI.js]
 [browser_UrlbarInput_tooltip.js]
 [browser_UrlbarInput_trimURLs.js]
+
 [browser_userTypedValue.js]
 support-files = file_userTypedValue.html
 [browser_valueOnTabSwitch.js]
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_inputHistory_emptystring.js	2021-01-18 19:58:08.000000000 +0000
@@ -88,7 +88,7 @@
         // A page other than TEST_URL must be loaded, or the first Top Site
         // result will be a switch-to-tab result and page won't be reloaded when
         // the result is selected.
-        await BrowserTestUtils.loadURI(selectedBrowser, "http://example.org/");
+        BrowserTestUtils.loadURI(selectedBrowser, "http://example.org/");
         await BrowserTestUtils.browserLoaded(selectedBrowser);
         gURLBar.blur();
         EventUtils.synthesizeMouseAtCenter(gURLBar.textbox, {});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_contextMenu.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,7 +22,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_heuristicRestyle.js	2021-01-18 19:58:08.000000000 +0000
@@ -2,7 +2,7 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
- * Tests that non-search heuristic results are updated to search results when a
+ * Tests that heuristic results are updated/restyled to search results when a
  * one-off is selected.
  */
 
@@ -12,6 +12,33 @@
   return UrlbarTestUtils.getOneOffSearchButtons(window);
 });
 
+const TEST_DEFAULT_ENGINE_NAME = "Test";
+
+const HISTORY_URL = "https://mozilla.org/";
+
+const KEYWORD = "kw";
+const KEYWORD_URL = "https://mozilla.org/search?q=%s";
+
+// Expected result data for our test results.
+const RESULT_DATA_BY_TYPE = {
+  [UrlbarUtils.RESULT_TYPE.URL]: {
+    icon: `page-icon:${HISTORY_URL}`,
+    actionL10n: {
+      id: "urlbar-result-action-visit",
+    },
+  },
+  [UrlbarUtils.RESULT_TYPE.SEARCH]: {
+    icon: "chrome://browser/skin/search-glass.svg",
+    actionL10n: {
+      id: "urlbar-result-action-search-w-engine",
+      args: { engine: TEST_DEFAULT_ENGINE_NAME },
+    },
+  },
+  [UrlbarUtils.RESULT_TYPE.KEYWORD]: {
+    icon: `page-icon:${KEYWORD_URL}`,
+  },
+};
+
 function getSourceIcon(source) {
   switch (source) {
     case UrlbarUtils.RESULT_SOURCE.BOOKMARKS:
@@ -25,35 +52,73 @@
   }
 }
 
-let HISTORY_URL = "https://mozilla.org/";
-
-async function urlResultIsNotRestyled(resultDetails) {
+/**
+ * Asserts that the heuristic result is *not* restyled to look like a search
+ * result.
+ *
+ * @param {UrlbarUtils.RESULT_TYPE} expectedType
+ *   The expected type of the heuristic.
+ * @param {object} resultDetails
+ *   The return value of UrlbarTestUtils.getDetailsOfResultAt(window, 0).
+ */
+async function heuristicIsNotRestyled(expectedType, resultDetails) {
   Assert.equal(
     resultDetails.type,
-    UrlbarUtils.RESULT_TYPE.URL,
-    "The restyled result is a URL result."
+    expectedType,
+    "The restyled result is the expected type."
   );
+
   Assert.equal(
     resultDetails.displayed.title,
     resultDetails.title,
     "The displayed title is equal to the payload title."
   );
-  let [actionText] = await document.l10n.formatValues([
-    { id: "urlbar-result-action-visit" },
-  ]);
+
+  let data = RESULT_DATA_BY_TYPE[expectedType];
+  Assert.ok(data, "Sanity check: Expected type is recognized");
+
+  let [actionText] = data.actionL10n
+    ? await document.l10n.formatValues([data.actionL10n])
+    : [""];
   Assert.equal(
     resultDetails.displayed.action,
     actionText,
-    "The result's action text is unchanged."
+    "The result has the expected non-styled action text."
+  );
+
+  Assert.equal(
+    BrowserTestUtils.is_visible(resultDetails.element.separator),
+    !!actionText,
+    "The title separator is " + (actionText ? "visible" : "hidden")
   );
   Assert.equal(
+    BrowserTestUtils.is_visible(resultDetails.element.action),
+    !!actionText,
+    "The action text is " + (actionText ? "visible" : "hidden")
+  );
+
+  Assert.equal(
     resultDetails.image,
-    `page-icon:${HISTORY_URL}`,
-    "The result's icon should be restored to being the URL's favicon."
+    data.icon,
+    "The result has the expected non-styled icon."
   );
 }
 
-async function urlResultIsRestyled(
+/**
+ * Asserts that the heuristic result is restyled to look like a search result.
+ *
+ * @param {UrlbarUtils.RESULT_TYPE} expectedType
+ *   The expected type of the heuristic.
+ * @param {object} resultDetails
+ *   The return value of UrlbarTestUtils.getDetailsOfResultAt(window, 0).
+ * @param {string} searchString
+ *   The current search string.  The restyled heuristic result's title is
+ *   expected to be this string.
+ * @param {element} selectedOneOff
+ *   The selected one-off button.
+ */
+async function heuristicIsRestyled(
+  expectedType,
   resultDetails,
   searchString,
   selectedOneOff
@@ -66,9 +131,10 @@
   }
   Assert.equal(
     resultDetails.type,
-    UrlbarUtils.RESULT_TYPE.URL,
-    "The restyled result is still a URL result."
+    expectedType,
+    "The restyled result is still the expected type."
   );
+
   let actionText;
   if (engine) {
     [actionText] = await document.l10n.formatValues([
@@ -91,16 +157,22 @@
     actionText,
     "Restyled result's action text should be updated"
   );
-  Assert.notEqual(
-    resultDetails.displayed.title,
-    resultDetails.title,
-    "The displayed title is different from the payload title."
-  );
+
   Assert.equal(
     resultDetails.displayed.title,
     searchString,
     "The restyled result's title should be equal to the search string."
   );
+
+  Assert.ok(
+    BrowserTestUtils.is_visible(resultDetails.element.separator),
+    "The restyled result's title separator should be visible"
+  );
+  Assert.ok(
+    BrowserTestUtils.is_visible(resultDetails.element.action),
+    "The restyled result's action text should be visible"
+  );
+
   if (engine) {
     Assert.equal(
       resultDetails.image,
@@ -116,42 +188,53 @@
   }
 }
 
-async function assertState(result, oneOff, textValue = undefined) {
-  Assert.equal(
-    UrlbarTestUtils.getSelectedRowIndex(window),
-    result,
-    "Expected result should be selected"
-  );
+/**
+ * Asserts that the specified one-off (if any) is selected and that the
+ * heuristic result is either restyled or not restyled as appropriate.  If
+ * there's a selected one-off, then the heuristic is expected to be restyled; if
+ * there's no selected one-off, then it's expected not to be restyled.
+ *
+ * @param {string} searchString
+ *   The current search string.  If a one-off is selected, then the restyled
+ *   heuristic result's title is expected to be this string.
+ * @param {UrlbarUtils.RESULT_TYPE} expectedHeuristicType
+ *   The expected type of the heuristic.
+ * @param {number} expectedSelectedOneOffIndex
+ *   The index of the expected selected one-off button.  If no one-off is
+ *   expected to be selected, then pass -1.
+ */
+async function assertState(
+  searchString,
+  expectedHeuristicType,
+  expectedSelectedOneOffIndex
+) {
   Assert.equal(
     oneOffSearchButtons.selectedButtonIndex,
-    oneOff,
+    expectedSelectedOneOffIndex,
     "Expected one-off should be selected"
   );
-  if (textValue !== undefined) {
-    Assert.equal(gURLBar.value, textValue, "Expected value");
-  }
-  if (result == 0) {
-    let resultDetails = await UrlbarTestUtils.getDetailsOfResultAt(
-      window,
-      result
+
+  let resultDetails = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
+  if (expectedSelectedOneOffIndex >= 0) {
+    await heuristicIsRestyled(
+      expectedHeuristicType,
+      resultDetails,
+      searchString,
+      oneOffSearchButtons.selectedButton
     );
-    if (oneOff >= 0) {
-      await urlResultIsRestyled(
-        resultDetails,
-        textValue,
-        oneOffSearchButtons.selectedButton
-      );
-    } else {
-      await urlResultIsNotRestyled(resultDetails);
-    }
+  } else {
+    await heuristicIsNotRestyled(expectedHeuristicType, resultDetails);
   }
 }
 
 add_task(async function init() {
   let oldDefaultEngine = await Services.search.getDefault();
-  let engine = await Services.search.addEngineWithDetails("Test", {
-    template: `http://example.com/?search={searchTerms}`,
-  });
+  let engine = await Services.search.addEngineWithDetails(
+    TEST_DEFAULT_ENGINE_NAME,
+    {
+      template: `http://example.com/?search={searchTerms}`,
+    }
+  );
   await Services.search.setDefault(engine);
   await Services.search.moveEngine(engine, 0);
 
@@ -159,19 +242,25 @@
     await PlacesTestUtils.addVisits(HISTORY_URL);
   }
 
+  await PlacesUtils.keywords.insert({
+    keyword: KEYWORD,
+    url: KEYWORD_URL,
+  });
+
+  registerCleanupFunction(async function() {
+    await Services.search.setDefault(oldDefaultEngine);
+    await Services.search.removeEngine(engine);
+    await PlacesUtils.history.clear();
+    await PlacesUtils.keywords.remove(KEYWORD);
+  });
+
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.suggest.searches", false],
     ],
   });
-  registerCleanupFunction(async function() {
-    await Services.search.setDefault(oldDefaultEngine);
-    await Services.search.removeEngine(engine);
-    await PlacesUtils.history.clear();
-  });
 
   // Move the mouse away from the view so that a result or one-off isn't
   // inadvertently highlighted.  See bug 1659011.
@@ -184,93 +273,238 @@
   );
 });
 
-add_task(async function basic() {
-  const typedValue = "mozilla.or";
-  let rebuildPromise = BrowserTestUtils.waitForEvent(
-    oneOffSearchButtons,
-    "rebuild"
+add_task(async function arrow_engine_url() {
+  await doArrowTest("mozilla.or", UrlbarUtils.RESULT_TYPE.URL, false);
+});
+
+add_task(async function arrow_engine_search() {
+  await doArrowTest("test", UrlbarUtils.RESULT_TYPE.SEARCH, false);
+});
+
+add_task(async function arrow_engine_keyword() {
+  await doArrowTest(`${KEYWORD} test`, UrlbarUtils.RESULT_TYPE.KEYWORD, false);
+});
+
+add_task(async function arrow_local_url() {
+  await doArrowTest("mozilla.or", UrlbarUtils.RESULT_TYPE.URL, true);
+});
+
+add_task(async function arrow_local_search() {
+  await doArrowTest("test", UrlbarUtils.RESULT_TYPE.SEARCH, true);
+});
+
+add_task(async function arrow_local_keyword() {
+  await doArrowTest(`${KEYWORD} test`, UrlbarUtils.RESULT_TYPE.KEYWORD, true);
+});
+
+/**
+ * Arrows down to the one-offs, checks the heuristic, and clicks it.
+ *
+ * @param {string} searchString
+ *   The search string to use.
+ * @param {UrlbarUtils.RESULT_TYPE} expectedHeuristicType
+ *   The type of heuristic result that the search string is expected to trigger.
+ * @param {boolean} useLocal
+ *   Whether to test a local one-off or an engine one-off.  If true, test a
+ *   local one-off.  If false, test an engine one-off.
+ */
+async function doArrowTest(searchString, expectedHeuristicType, useLocal) {
+  await doTest(searchString, expectedHeuristicType, useLocal, async () => {
+    info(
+      "Arrow down to the one-offs, observe heuristic is restyled as a search result."
+    );
+    let resultCount = UrlbarTestUtils.getResultCount(window);
+    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey("KEY_ArrowDown", { repeat: resultCount });
+    await searchPromise;
+    await assertState(searchString, expectedHeuristicType, 0);
+
+    let depth = 1;
+    if (useLocal) {
+      for (; !oneOffSearchButtons.selectedButton.source; depth++) {
+        EventUtils.synthesizeKey("KEY_ArrowDown");
+      }
+      Assert.ok(
+        oneOffSearchButtons.selectedButton.source,
+        "Selected one-off is local"
+      );
+      await assertState(searchString, expectedHeuristicType, depth - 1);
+    }
+
+    info(
+      "Arrow up out of the one-offs, observe heuristic styling is restored."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowUp", { repeat: depth });
+    await assertState(searchString, expectedHeuristicType, -1);
+
+    info(
+      "Arrow back down into the one-offs, observe heuristic is restyled as a search result."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown", { repeat: depth });
+    await assertState(searchString, expectedHeuristicType, depth - 1);
+  });
+}
+
+add_task(async function altArrow_engine_url() {
+  await doAltArrowTest("mozilla.or", UrlbarUtils.RESULT_TYPE.URL, false);
+});
+
+add_task(async function altArrow_engine_search() {
+  await doAltArrowTest("test", UrlbarUtils.RESULT_TYPE.SEARCH, false);
+});
+
+add_task(async function altArrow_engine_keyword() {
+  await doAltArrowTest(
+    `${KEYWORD} test`,
+    UrlbarUtils.RESULT_TYPE.KEYWORD,
+    false
   );
+});
+
+add_task(async function altArrow_local_url() {
+  await doAltArrowTest("mozilla.or", UrlbarUtils.RESULT_TYPE.URL, true);
+});
+
+add_task(async function altArrow_local_search() {
+  await doAltArrowTest("test", UrlbarUtils.RESULT_TYPE.SEARCH, true);
+});
+
+add_task(async function altArrow_local_keyword() {
+  await doAltArrowTest(
+    `${KEYWORD} test`,
+    UrlbarUtils.RESULT_TYPE.KEYWORD,
+    true
+  );
+});
+
+/**
+ * Alt-arrows down to the one-offs so that the heuristic remains selected,
+ * checks the heuristic, and clicks it.
+ *
+ * @param {string} searchString
+ *   The search string to use.
+ * @param {UrlbarUtils.RESULT_TYPE} expectedHeuristicType
+ *   The type of heuristic result that the search string is expected to trigger.
+ * @param {boolean} useLocal
+ *   Whether to test a local one-off or an engine one-off.  If true, test a
+ *   local one-off.  If false, test an engine one-off.
+ */
+async function doAltArrowTest(searchString, expectedHeuristicType, useLocal) {
+  await doTest(searchString, expectedHeuristicType, useLocal, async () => {
+    info(
+      "Alt+down into the one-offs, observe heuristic is restyled as a search result."
+    );
+    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+    await searchPromise;
+    await assertState(searchString, expectedHeuristicType, 0);
+
+    let depth = 1;
+    if (useLocal) {
+      for (; !oneOffSearchButtons.selectedButton.source; depth++) {
+        EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+      }
+      Assert.ok(
+        oneOffSearchButtons.selectedButton.source,
+        "Selected one-off is local"
+      );
+      await assertState(searchString, expectedHeuristicType, depth - 1);
+    }
+
+    info(
+      "Arrow down and then up to re-select the heuristic, observe its styling is restored."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    EventUtils.synthesizeKey("KEY_ArrowUp");
+    await assertState(searchString, expectedHeuristicType, -1);
+
+    info(
+      "Alt+down into the one-offs, observe the heuristic is restyled as a search result."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true, repeat: depth });
+    await assertState(searchString, expectedHeuristicType, depth - 1);
+
+    info("Alt+up out of the one-offs, observe the heuristic is restored.");
+    EventUtils.synthesizeKey("KEY_ArrowUp", { altKey: true, repeat: depth });
+    await assertState(searchString, expectedHeuristicType, -1);
+
+    info(
+      "Alt+down into the one-offs, observe the heuristic is restyled as a search result."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true, repeat: depth });
+    await assertState(searchString, expectedHeuristicType, depth - 1);
+  });
+}
+
+/**
+ * The main test function.  Starts a search, asserts that the heuristic has the
+ * expected type, calls a callback to run more checks, and then finally clicks
+ * the restyled heuristic to make sure search mode is confirmed.
+ *
+ * @param {string} searchString
+ *   The search string to use.
+ * @param {UrlbarUtils.RESULT_TYPE} expectedHeuristicType
+ *   The type of heuristic result that the search string is expected to trigger.
+ * @param {boolean} useLocal
+ *   Whether to test a local one-off or an engine one-off.  If true, test a
+ *   local one-off.  If false, test an engine one-off.
+ * @param {function} callback
+ *   This is called after the search completes.  It should perform whatever
+ *   checks are necessary for the test task.  Important: When it returns, it
+ *   should make sure that the first one-off is selected.
+ */
+async function doTest(searchString, expectedHeuristicType, useLocal, callback) {
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
-    value: typedValue,
+    value: searchString,
     fireInputEvent: true,
   });
-  await rebuildPromise;
-  await assertState(0, -1, `${typedValue}g/`);
-
-  // Alt+Down to the first one-off.  Now the first result and the first one-off
-  // should both be selected. The input is still autofilled to `mozilla.org/`.
-  info(
-    "Alt+Arrow to one-offs, observe heuristic is restyled as a search result."
+  await TestUtils.waitForCondition(
+    () => !oneOffSearchButtons._rebuilding,
+    "Waiting for one-offs to finish rebuilding"
   );
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  await searchPromise;
-  await assertState(0, 0, typedValue);
 
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  await assertState(0, 1, typedValue);
-
-  info("Select the second result and observe the heuristic is restored.");
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_ArrowUp");
-  await assertState(0, -1, `${typedValue}g/`);
-
-  info("Cycle past the one-offs and observe the heuristic is restored.");
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  await assertState(0, 0, typedValue);
+  let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
+  Assert.ok(result.heuristic, "First result is heuristic");
+  Assert.equal(
+    result.type,
+    expectedHeuristicType,
+    "Heuristic is expected type"
+  );
+  await assertState(searchString, expectedHeuristicType, -1);
 
-  EventUtils.synthesizeKey("KEY_ArrowUp", { altKey: true });
-  await assertState(0, -1, typedValue);
+  await callback();
 
-  info(
-    "Cycle through the one-offs, observe heuristic is restyled as a search result."
+  Assert.ok(
+    oneOffSearchButtons.selectedButton,
+    "The callback should leave a one-off selected so that the heuristic remains re-styled"
   );
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  await assertState(0, 0, typedValue);
 
   info("Click the heuristic result and observe it confirms search mode.");
   let selectedButton = oneOffSearchButtons.selectedButton;
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName: selectedButton.engine.name,
+  let expectedSearchMode = {
     entry: "oneoff",
     isPreview: true,
-  });
+  };
+  if (useLocal) {
+    expectedSearchMode.source = selectedButton.source;
+  } else {
+    expectedSearchMode.engineName = selectedButton.engine.name;
+  }
+
+  await UrlbarTestUtils.assertSearchMode(window, expectedSearchMode);
+
   let heuristicRow = await UrlbarTestUtils.waitForAutocompleteResultAt(
     window,
     0
   );
-  searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
   EventUtils.synthesizeMouseAtCenter(heuristicRow, {});
   await searchPromise;
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName: selectedButton.engine.name,
-    entry: "oneoff",
-    isPreview: false,
-  });
-
-  await UrlbarTestUtils.exitSearchMode(window);
-  await UrlbarTestUtils.promisePopupClose(window);
-});
-
-add_task(async function localOneOff() {
-  const typedValue = "mozilla.org";
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: typedValue,
-    fireInputEvent: true,
-  });
 
-  let numButtons = oneOffSearchButtons.getSelectableButtons(false).length;
-  await assertState(0, -1, `${typedValue}/`);
-
-  info("Select the history one-off.");
-  EventUtils.synthesizeKey("KEY_ArrowUp", { altKey: true });
-  await assertState(0, numButtons - 1, typedValue);
-
-  info("Select the tabs one-off and check favicon and action text change.");
-  EventUtils.synthesizeKey("KEY_ArrowUp", { altKey: true });
-  await assertState(0, numButtons - 2, typedValue);
+  expectedSearchMode.isPreview = false;
+  await UrlbarTestUtils.assertSearchMode(window, expectedSearchMode);
 
+  await UrlbarTestUtils.exitSearchMode(window);
   await UrlbarTestUtils.promisePopupClose(window);
-});
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,18 +26,13 @@
   );
   await Services.search.moveEngine(engine, 0);
 
-  Services.prefs.setBoolPref(
-    "browser.search.separatePrivateDefault.ui.enabled",
-    false
-  );
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.search.separatePrivateDefault.ui.enabled", false]],
+  });
+
   registerCleanupFunction(async function() {
     await PlacesUtils.history.clear();
     await UrlbarTestUtils.formHistory.clear();
-    Services.prefs.clearUserPref(
-      "browser.search.separatePrivateDefault.ui.enabled"
-    );
-    Services.prefs.clearUserPref("browser.urlbar.update2");
-    Services.prefs.clearUserPref("browser.urlbar.update2.oneOffsRefresh");
   });
 
   // Initialize history with enough visits to fill up the view.
@@ -137,7 +132,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -203,7 +197,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -372,11 +365,10 @@
 add_task(async function searchWith() {
   // Enable suggestions for this subtest so we can check non-heuristic results.
   let oldDefaultEngine = await Services.search.getDefault();
-  let oldSuggestPref = Services.prefs.getBoolPref(
-    "browser.urlbar.suggest.searches"
-  );
   await Services.search.setDefault(engine);
-  Services.prefs.setBoolPref("browser.urlbar.suggest.searches", true);
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.suggest.searches", true]],
+  });
 
   let typedValue = "foo";
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
@@ -443,7 +435,7 @@
     "Second result's action text should be updated"
   );
 
-  Services.prefs.setBoolPref("browser.urlbar.suggest.searches", oldSuggestPref);
+  await SpecialPowers.popPrefEnv();
   await Services.search.setDefault(oldDefaultEngine);
   await hidePopup();
 });
@@ -457,8 +449,12 @@
   let typedValue = "foo.bar";
 
   for (let refresh of [true, false]) {
-    UrlbarPrefs.set("update2", refresh);
-    UrlbarPrefs.set("update2.oneOffsRefresh", refresh);
+    await SpecialPowers.pushPrefEnv({
+      set: [
+        ["browser.urlbar.update2", refresh],
+        ["browser.urlbar.update2.oneOffsRefresh", refresh],
+      ],
+    });
 
     await UrlbarTestUtils.promiseAutocompleteResultPopup({
       window,
@@ -490,6 +486,8 @@
       EventUtils.synthesizeMouseAtCenter(oneOffs[0], {});
       await resultsPromise;
     }
+
+    await SpecialPowers.popPrefEnv();
   }
 
   gBrowser.removeTab(gBrowser.selectedTab);
@@ -505,8 +503,12 @@
   let typedValue = "foo.bar";
 
   for (let refresh of [true, false]) {
-    UrlbarPrefs.set("update2", refresh);
-    UrlbarPrefs.set("update2.oneOffsRefresh", refresh);
+    await SpecialPowers.pushPrefEnv({
+      set: [
+        ["browser.urlbar.update2", refresh],
+        ["browser.urlbar.update2.oneOffsRefresh", refresh],
+      ],
+    });
 
     await UrlbarTestUtils.promiseAutocompleteResultPopup({
       window,
@@ -543,14 +545,17 @@
       EventUtils.synthesizeKey("KEY_Enter");
       await resultsPromise;
     }
+
+    await SpecialPowers.popPrefEnv();
   }
 
   gBrowser.removeTab(gBrowser.selectedTab);
   await UrlbarTestUtils.formHistory.clear();
 });
 
-// Hidden engines should not appear in the one-offs.
-add_task(async function hiddenOneOffs() {
+// When all engines and local shortcuts are hidden except for the current
+// engine, the one-offs container should be hidden.
+add_task(async function allOneOffsHiddenExceptCurrentEngine() {
   // Disable all the engines but the current one, check the oneoffs are
   // hidden and that moving up selects the last match.
   let defaultEngine = await Services.search.getDefault();
@@ -558,7 +563,13 @@
     e => e.name != defaultEngine.name
   );
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.search.hiddenOneOffs", engines.map(e => e.name).join(",")]],
+    set: [
+      ["browser.search.hiddenOneOffs", engines.map(e => e.name).join(",")],
+      ...UrlbarUtils.LOCAL_SEARCH_MODES.map(m => [
+        `browser.urlbar.${m.pref}`,
+        false,
+      ]),
+    ],
   });
 
   let typedValue = "foo";
@@ -570,8 +581,8 @@
   await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
   assertState(0, -1);
   Assert.equal(
-    getComputedStyle(oneOffSearchButtons.container).display,
-    "none",
+    UrlbarTestUtils.getOneOffSearchButtonsVisible(window),
+    false,
     "The one-off buttons should be hidden"
   );
   EventUtils.synthesizeKey("KEY_ArrowUp");
@@ -652,18 +663,17 @@
   await SpecialPowers.popPrefEnv();
 });
 
-// Makes sure local search mode one-offs exist.
-add_task(async function localOneOffs() {
+// Makes sure the local shortcuts exist.
+add_task(async function localShortcuts() {
   oneOffSearchButtons.invalidateCache();
-  await doLocalOneOffsShownTest();
+  await doLocalShortcutsShownTest();
 });
 
-// Clicks a local search mode one-off.
-add_task(async function localOneOffClick() {
+// Clicks a local shortcut button.
+add_task(async function localShortcutClick() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -684,7 +694,7 @@
   await rebuildPromise;
 
   let buttons = oneOffSearchButtons.localButtons;
-  Assert.ok(buttons.length, "Sanity check: Local one-offs exist");
+  Assert.ok(buttons.length, "Sanity check: Local shortcuts exist");
 
   for (let button of buttons) {
     Assert.ok(button.source, "Sanity check: Button has a source");
@@ -706,12 +716,11 @@
   await SpecialPowers.popPrefEnv();
 });
 
-// Presses the Return key when a local search mode one-off is selected.
-add_task(async function localOneOffReturn() {
+// Presses the Return key when a local shortcut is selected.
+add_task(async function localShortcutReturn() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -732,7 +741,7 @@
   await rebuildPromise;
 
   let buttons = oneOffSearchButtons.localButtons;
-  Assert.ok(buttons.length, "Sanity check: Local one-offs exist");
+  Assert.ok(buttons.length, "Sanity check: Local shortcuts exist");
 
   let allButtons = oneOffSearchButtons.getSelectableButtons(false);
   let firstLocalIndex = allButtons.length - buttons.length;
@@ -748,7 +757,7 @@
     });
     await TestUtils.waitForCondition(
       () => oneOffSearchButtons.selectedButtonIndex == index,
-      "Waiting for local one-off to become selected"
+      "Waiting for local shortcut to become selected"
     );
 
     let expectedSelectedResultIndex = -1;
@@ -780,13 +789,12 @@
   await SpecialPowers.popPrefEnv();
 });
 
-// With an empty search string, clicking a local one-off should result in no
+// With an empty search string, clicking a local shortcut should result in no
 // heuristic result.
-add_task(async function localOneOffEmptySearchString() {
+add_task(async function localShortcutEmptySearchString() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -809,7 +817,7 @@
   );
 
   let buttons = oneOffSearchButtons.localButtons;
-  Assert.ok(buttons.length, "Sanity check: Local one-offs exist");
+  Assert.ok(buttons.length, "Sanity check: Local shortcuts exist");
 
   for (let button of buttons) {
     Assert.ok(button.source, "Sanity check: Button has a source");
@@ -888,7 +896,13 @@
     e => e.name != engine.name
   );
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.search.hiddenOneOffs", engines.map(e => e.name).join(",")]],
+    set: [
+      ["browser.search.hiddenOneOffs", engines.map(e => e.name).join(",")],
+      ...UrlbarUtils.LOCAL_SEARCH_MODES.map(m => [
+        `browser.urlbar.${m.pref}`,
+        false,
+      ]),
+    ],
   });
   Assert.ok(
     !oneOffSearchButtons._engineInfo,
@@ -940,14 +954,144 @@
   await SpecialPowers.popPrefEnv();
 });
 
+// Hides each of the local shortcuts one at a time.  The search buttons should
+// automatically rebuild themselves.
+add_task(async function individualLocalShortcutsHidden() {
+  for (let { pref, source } of UrlbarUtils.LOCAL_SEARCH_MODES) {
+    await SpecialPowers.pushPrefEnv({
+      set: [[`browser.urlbar.${pref}`, false]],
+    });
+
+    let rebuildPromise = BrowserTestUtils.waitForEvent(
+      oneOffSearchButtons,
+      "rebuild"
+    );
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: "",
+    });
+    await rebuildPromise;
+
+    Assert.equal(
+      UrlbarTestUtils.getOneOffSearchButtonsVisible(window),
+      true,
+      "One-offs are visible"
+    );
+
+    let buttons = oneOffSearchButtons.localButtons;
+    Assert.ok(buttons.length, "Sanity check: Local shortcuts exist");
+
+    let otherModes = UrlbarUtils.LOCAL_SEARCH_MODES.filter(
+      m => m.source != source
+    );
+    Assert.equal(
+      buttons.length,
+      otherModes.length,
+      "Expected number of enabled local shortcut buttons"
+    );
+
+    for (let i = 0; i < buttons.length; i++) {
+      Assert.equal(
+        buttons[i].source,
+        otherModes[i].source,
+        "Button has the expected source"
+      );
+    }
+
+    await hidePopup();
+    await SpecialPowers.popPrefEnv();
+  }
+});
+
+// Hides all the local shortcuts at once.
+add_task(async function allLocalShortcutsHidden() {
+  await SpecialPowers.pushPrefEnv({
+    set: UrlbarUtils.LOCAL_SEARCH_MODES.map(m => [
+      `browser.urlbar.${m.pref}`,
+      false,
+    ]),
+  });
+
+  let rebuildPromise = BrowserTestUtils.waitForEvent(
+    oneOffSearchButtons,
+    "rebuild"
+  );
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "",
+  });
+  await rebuildPromise;
+
+  Assert.equal(
+    UrlbarTestUtils.getOneOffSearchButtonsVisible(window),
+    true,
+    "One-offs are visible"
+  );
+
+  Assert.equal(
+    oneOffSearchButtons.localButtons.length,
+    0,
+    "All local shortcuts should be hidden"
+  );
+
+  Assert.greater(
+    oneOffSearchButtons.getSelectableButtons(false).filter(b => b.engine)
+      .length,
+    0,
+    "Engine one-offs should not be hidden"
+  );
+
+  await hidePopup();
+  await SpecialPowers.popPrefEnv();
+});
+
+// Hides all the engines but none of the local shortcuts.
+add_task(async function localShortcutsShownWhenEnginesHidden() {
+  let engines = await Services.search.getVisibleEngines();
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.search.hiddenOneOffs", engines.map(e => e.name).join(",")]],
+  });
+
+  let rebuildPromise = BrowserTestUtils.waitForEvent(
+    oneOffSearchButtons,
+    "rebuild"
+  );
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "",
+  });
+  await rebuildPromise;
+
+  Assert.equal(
+    UrlbarTestUtils.getOneOffSearchButtonsVisible(window),
+    true,
+    "One-offs are visible"
+  );
+
+  Assert.equal(
+    oneOffSearchButtons.localButtons.length,
+    UrlbarUtils.LOCAL_SEARCH_MODES.length,
+    "All local shortcuts are visible"
+  );
+
+  Assert.equal(
+    oneOffSearchButtons.getSelectableButtons(false).filter(b => b.engine)
+      .length,
+    0,
+    "All engine one-offs are hidden"
+  );
+
+  await hidePopup();
+  await SpecialPowers.popPrefEnv();
+});
+
 /**
- * Checks that the local one-offs are shown correctly.
+ * Checks that the local shortcuts are shown correctly.
  */
-async function doLocalOneOffsShownTest() {
+async function doLocalShortcutsShownTest() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -958,12 +1102,12 @@
   );
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
-    value: "doLocalOneOffsShownTest",
+    value: "doLocalShortcutsShownTest",
   });
   await rebuildPromise;
 
   let buttons = oneOffSearchButtons.localButtons;
-  Assert.equal(buttons.length, 3, "Expected number of local buttons");
+  Assert.equal(buttons.length, 3, "Expected number of local shortcuts");
 
   let expectedSource;
   let seenIDs = new Set();
@@ -984,7 +1128,7 @@
         expectedSource = UrlbarUtils.RESULT_SOURCE.HISTORY;
         break;
       default:
-        Assert.ok(false, `Unexpected local button ID: ${button.id}`);
+        Assert.ok(false, `Unexpected local shortcut ID: ${button.id}`);
         break;
     }
     Assert.equal(button.source, expectedSource, "Expected button.source");
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_oneOffs_keyModifiers.js	2021-01-18 19:58:08.000000000 +0000
@@ -42,7 +42,6 @@
       // This test is only concerned with update2 behaviour.
       ["browser.urlbar.update2", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
-      ["browser.urlbar.update2.localOneOffs", true],
     ],
   });
 
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_placeholder.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_placeholder.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_placeholder.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_placeholder.js	2021-01-18 19:58:08.000000000 +0000
@@ -276,7 +276,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_remoteness_switch.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_remoteness_switch.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_remoteness_switch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_remoteness_switch.js	2021-01-18 19:58:08.000000000 +0000
@@ -35,7 +35,7 @@
     ) {
       return loadedURL == "about:config";
     });
-    await BrowserTestUtils.loadURI(browser, "about:config");
+    BrowserTestUtils.loadURI(browser, "about:config");
     await didLoad;
 
     gBrowser.goBack();
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_retainedResultsOnFocus.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_retainedResultsOnFocus.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_retainedResultsOnFocus.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_retainedResultsOnFocus.js	2021-01-18 19:58:08.000000000 +0000
@@ -268,7 +268,7 @@
   registerCleanupFunction(PlacesUtils.history.clear);
 
   let win = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, "about:robots");
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, "about:robots");
   let tab1 = win.gBrowser.selectedTab;
 
   info("Open a new tab and the empty search");
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchFunction.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchFunction.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchFunction.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchFunction.js	2021-01-18 19:58:08.000000000 +0000
@@ -234,7 +234,10 @@
   });
 
   await UrlbarTestUtils.promisePopupOpen(window, async () =>
-    gURLBar.search(`${ALIAS} test`, { searchModeEntry: "handoff" })
+    gURLBar.search(`${ALIAS} test`, {
+      searchEngine: aliasEngine,
+      searchModeEntry: "handoff",
+    })
   );
   Assert.ok(gURLBar.hasAttribute("focused"), "Urlbar is focused");
 
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchHistoryLimit.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchHistoryLimit.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchHistoryLimit.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchHistoryLimit.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,92 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This test checks that search values longer than
+ * SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH are not added to
+ * search history.
+ */
+
+"use strict";
+
+const { SearchSuggestionController } = ChromeUtils.import(
+  "resource://gre/modules/SearchSuggestionController.jsm"
+);
+
+let gEngine;
+
+add_task(async function setup() {
+  gEngine = await Services.search.addEngineWithDetails("TestLimit", {
+    template: "http://example.com/?search={searchTerms}",
+  });
+  let oldDefaultEngine = await Services.search.getDefault();
+  await Services.search.setDefault(gEngine);
+  await UrlbarTestUtils.formHistory.clear();
+
+  registerCleanupFunction(async function() {
+    await Services.search.setDefault(oldDefaultEngine);
+    await Services.search.removeEngine(gEngine);
+    await UrlbarTestUtils.formHistory.clear();
+  });
+});
+
+add_task(async function sanityCheckShortString() {
+  const shortString = new Array(
+    SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH
+  )
+    .fill("a")
+    .join("");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: shortString,
+  });
+  let url = gEngine.getSubmission(shortString).uri.spec;
+  let loadPromise = BrowserTestUtils.browserLoaded(
+    gBrowser.selectedBrowser,
+    false,
+    url
+  );
+  let addPromise = UrlbarTestUtils.formHistory.promiseChanged("add");
+  EventUtils.synthesizeKey("VK_RETURN");
+  await Promise.all([loadPromise, addPromise]);
+
+  let formHistory = (
+    await UrlbarTestUtils.formHistory.search({ source: gEngine.name })
+  ).map(entry => entry.value);
+  Assert.deepEqual(
+    formHistory,
+    [shortString],
+    "Should find form history after adding it"
+  );
+
+  await UrlbarTestUtils.formHistory.clear();
+});
+
+add_task(async function urlbar_checkLongString() {
+  const longString = new Array(
+    SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH + 1
+  )
+    .fill("a")
+    .join("");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: longString,
+  });
+  let url = gEngine.getSubmission(longString).uri.spec;
+  let loadPromise = BrowserTestUtils.browserLoaded(
+    gBrowser.selectedBrowser,
+    false,
+    url
+  );
+  EventUtils.synthesizeKey("VK_RETURN");
+  await loadPromise;
+  // There's nothing we can wait for, since addition should not be happening.
+  /* eslint-disable mozilla/no-arbitrary-setTimeout */
+  await new Promise(resolve => setTimeout(resolve, 500));
+  let formHistory = (
+    await UrlbarTestUtils.formHistory.search({ source: gEngine.name })
+  ).map(entry => entry.value);
+  Assert.deepEqual(formHistory, [], "Should not find form history");
+
+  await UrlbarTestUtils.formHistory.clear();
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_autofill.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_autofill.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_autofill.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_autofill.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_clickLink.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_clickLink.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_clickLink.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_clickLink.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_heuristic.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_heuristic.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_heuristic.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_heuristic.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_indicator.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_indicator.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_indicator.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_indicator.js	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,6 @@
     set: [
       ["browser.search.separatePrivateDefault.ui.enabled", false],
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -299,25 +298,54 @@
   Assert.ok(!UrlbarTestUtils.isPopupOpen(window), "Urlbar view is closed.");
 });
 
-// Tests that Accel+K enters search mode with the default engine.
+// Tests that Accel+K enters search mode with the default engine. Also tests
+// that Accel+K highlights the typed search string.
 add_task(async function keyboard_shortcut() {
+  const query = "test query";
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: query,
+  });
   await UrlbarTestUtils.assertSearchMode(window, null);
+  Assert.equal(
+    gURLBar.selectionStart,
+    gURLBar.selectionEnd,
+    "The search string is not highlighted."
+  );
   EventUtils.synthesizeKey("k", { accelKey: true });
   await UrlbarTestUtils.assertSearchMode(window, {
     source: UrlbarUtils.RESULT_SOURCE.SEARCH,
     engineName: defaultEngine.name,
     entry: "shortcut",
   });
+  Assert.equal(gURLBar.value, query, "The search string was not cleared.");
+  Assert.equal(gURLBar.selectionStart, 0);
+  Assert.equal(
+    gURLBar.selectionEnd,
+    query.length,
+    "The search string is highlighted."
+  );
   await UrlbarTestUtils.exitSearchMode(window, {
     clickClose: true,
     waitForSearch: false,
   });
+  await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
 });
 
 // Tests that the Tools:Search menu item enters search mode with the default
-// engine.
+// engine. Also tests that Tools:Search highlights the typed search string.
 add_task(async function menubar_item() {
+  const query = "test query 2";
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: query,
+  });
   await UrlbarTestUtils.assertSearchMode(window, null);
+  Assert.equal(
+    gURLBar.selectionStart,
+    gURLBar.selectionEnd,
+    "The search string is not highlighted."
+  );
   let command = window.document.getElementById("Tools:Search");
   command.doCommand();
   await UrlbarTestUtils.assertSearchMode(window, {
@@ -325,10 +353,18 @@
     engineName: defaultEngine.name,
     entry: "shortcut",
   });
+  Assert.equal(gURLBar.value, query, "The search string was not cleared.");
+  Assert.equal(gURLBar.selectionStart, 0);
+  Assert.equal(
+    gURLBar.selectionEnd,
+    query.length,
+    "The search string is highlighted."
+  );
   await UrlbarTestUtils.exitSearchMode(window, {
     clickClose: true,
     waitForSearch: false,
   });
+  await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
 });
 
 // Tests that entering search mode invalidates pageproxystate and that
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_localOneOffs_actionText.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,7 +19,6 @@
       ["browser.urlbar.suggest.searches", true],
       ["browser.urlbar.update2", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
-      ["browser.urlbar.update2.localOneOffs", true],
     ],
   });
   engine = await SearchTestUtils.promiseNewSearchEngine(
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_no_results.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_no_results.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_no_results.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_no_results.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_pickResult.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_pickResult.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_pickResult.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_pickResult.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,7 +13,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_preview.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_preview.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_preview.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_preview.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
       // TODO (Bug 1675558) - This should not be a requirement for the whole test.
       ["browser.urlbar.update2.emptySearchBehavior", 2],
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_sessionStore.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,7 +23,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_setURI.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_setURI.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_setURI.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_setURI.js	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchMode_switchTabs.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchSuggestions.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchSuggestions.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_searchSuggestions.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_searchSuggestions.js	2021-01-18 19:58:08.000000000 +0000
@@ -132,7 +132,9 @@
 });
 
 add_task(async function ctrlEnterOnSuggestion() {
-  await testPressEnterOnSuggestion("http://www.foofoo.com/", { ctrlKey: true });
+  await testPressEnterOnSuggestion("https://www.foofoo.com/", {
+    ctrlKey: true,
+  });
 });
 
 add_task(async function copySuggestionText() {
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tabKeyBehavior.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tabKeyBehavior.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tabKeyBehavior.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tabKeyBehavior.js	2021-01-18 19:58:08.000000000 +0000
@@ -185,7 +185,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.tabToComplete", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
@@ -235,7 +234,6 @@
     set: [
       ["browser.urlbar.update2", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
-      ["browser.urlbar.update2.localOneOffs", true],
     ],
   });
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tabToSearch.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tabToSearch.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tabToSearch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tabToSearch.js	2021-01-18 19:58:08.000000000 +0000
@@ -24,7 +24,6 @@
     set: [
       ["browser.urlbar.update2", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
-      ["browser.urlbar.update2.tabToComplete", true],
       // Disable onboarding results for general tests. They are enabled in tests
       // that specifically address onboarding.
       ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_textruns.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_textruns.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_textruns.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_textruns.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,13 +8,29 @@
  */
 
 add_task(async function() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.suggest.searches", true]],
+  });
+  let engine = await Services.search.addEngineWithDetails("Test", {
+    template: "http://example.com/?search={searchTerms}",
+  });
+  let oldDefaultEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engine);
+
   let lotsOfSpaces = "%20".repeat(300);
   await PlacesTestUtils.addVisits({
     uri: `https://textruns.mozilla.org/${lotsOfSpaces}/test/`,
     title: `A long ${lotsOfSpaces} title`,
   });
+  await UrlbarTestUtils.formHistory.add([
+    { value: `A long ${lotsOfSpaces} textruns suggestion` },
+  ]);
+
   registerCleanupFunction(async function() {
     await PlacesUtils.history.clear();
+    await UrlbarTestUtils.formHistory.clear();
+    await Services.search.setDefault(oldDefaultEngine);
+    await Services.search.removeEngine(engine);
   });
 
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
@@ -22,6 +38,13 @@
     value: "textruns",
   });
   let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 1);
+  Assert.equal(result.searchParams.engine, "Test", "Sanity check engine");
+  Assert.equal(
+    result.displayed.title.length,
+    UrlbarUtils.MAX_TEXT_LENGTH,
+    "Result title should be limited"
+  );
+  result = await UrlbarTestUtils.getDetailsOfResultAt(window, 2);
   Assert.equal(
     result.displayed.title.length,
     UrlbarUtils.MAX_TEXT_LENGTH,
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tokenAlias.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tokenAlias.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_tokenAlias.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_tokenAlias.js	2021-01-18 19:58:08.000000000 +0000
@@ -27,7 +27,6 @@
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
       ["browser.urlbar.update2.oneOffsRefresh", true],
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_updateForDomainCompletion.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_updateForDomainCompletion.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_updateForDomainCompletion.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_updateForDomainCompletion.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,14 +11,14 @@
     async function(browser) {
       gURLBar.value = "example";
       gURLBar.select();
-      let loadPromise = BrowserTestUtils.browserLoaded(
-        browser,
-        false,
-        url => url == "http://www.example.com/"
+      const loadPromise = BrowserTestUtils.waitForDocLoadAndStopIt(
+        "https://www.example.com/",
+        gBrowser.selectedBrowser
       );
+
       EventUtils.sendKey("return");
       await loadPromise;
-      is(gURLBar.value, "www.example.com");
+      ok(true, "https://www.example.com is loaded correctly");
     }
   );
 });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -387,7 +387,10 @@
   async function(win) {
     info("Type something and canonize");
     win.gURLBar.select();
-    let promise = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+    const promise = BrowserTestUtils.waitForDocLoadAndStopIt(
+      "https://www.example.com/",
+      gBrowser.selectedBrowser
+    );
     await UrlbarTestUtils.promiseAutocompleteResultPopup({
       window: win,
       value: "example",
@@ -1056,7 +1059,6 @@
     await SpecialPowers.pushPrefEnv({
       set: [
         ["browser.urlbar.update2", true],
-        ["browser.urlbar.update2.tabToComplete", true],
         ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
       ],
     });
@@ -1394,7 +1396,6 @@
     await SpecialPowers.pushPrefEnv({
       set: [
         ["browser.urlbar.update2", true],
-        ["browser.urlbar.update2.tabToComplete", true],
         ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
       ],
     });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,160 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry for dynamic results.
+ */
+
+"use strict";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
+  UrlbarResult: "resource:///modules/UrlbarResult.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+  UrlbarView: "resource:///modules/UrlbarView.jsm",
+});
+
+const DYNAMIC_TYPE_NAME = "test";
+
+/**
+ * A test URLBar provider.
+ */
+class TestProvider extends UrlbarTestUtils.TestProvider {
+  constructor() {
+    super({
+      priority: Infinity,
+      results: [
+        Object.assign(
+          new UrlbarResult(
+            UrlbarUtils.RESULT_TYPE.DYNAMIC,
+            UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+            {
+              dynamicType: DYNAMIC_TYPE_NAME,
+            }
+          ),
+          { heuristic: true }
+        ),
+      ],
+    });
+  }
+
+  getViewUpdate(result, idsByName) {
+    return {
+      title: {
+        textContent: "This is a dynamic result.",
+      },
+      button: {
+        textContent: "Click Me",
+      },
+    };
+  }
+}
+
+add_task(async function test() {
+  // Add a dynamic result type.
+  UrlbarResult.addDynamicResultType(DYNAMIC_TYPE_NAME);
+  UrlbarView.addDynamicViewTemplate(DYNAMIC_TYPE_NAME, {
+    stylesheet:
+      getRootDirectory(gTestPath) + "urlbarTelemetryUrlbarDynamic.css",
+    children: [
+      {
+        name: "title",
+        tag: "span",
+      },
+      {
+        name: "buttonSpacer",
+        tag: "span",
+      },
+      {
+        name: "button",
+        tag: "span",
+        attributes: {
+          role: "button",
+        },
+      },
+    ],
+  });
+  registerCleanupFunction(() => {
+    UrlbarView.removeDynamicViewTemplate(DYNAMIC_TYPE_NAME);
+    UrlbarResult.removeDynamicResultType(DYNAMIC_TYPE_NAME);
+  });
+
+  // Register a provider that returns the dynamic result type.
+  let provider = new TestProvider();
+  UrlbarProvidersManager.registerProvider(provider);
+  registerCleanupFunction(() => {
+    UrlbarProvidersManager.unregisterProvider(provider);
+  });
+
+  const histograms = snapshotHistograms();
+
+  // Do a search to show the dynamic result.
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    waitForFocus,
+    value: "test",
+    fireInputEvent: true,
+  });
+
+  // Press enter on the result's button.  It will be preselected since the
+  // result is the heuristic.
+  await UrlbarTestUtils.promisePopupClose(window, () =>
+    EventUtils.synthesizeKey("KEY_Enter")
+  );
+
+  assertTelemetryResults(
+    histograms,
+    "dynamic",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  // Clean up for subsequent tests.
+  gURLBar.handleRevert();
+});
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,181 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry with extension actions.
+ */
+
+"use strict";
+
+const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function assertSearchTelemetryEmpty(search_hist) {
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  Assert.ok(
+    !(SCALAR_URLBAR in scalars),
+    `Should not have recorded ${SCALAR_URLBAR}`
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    undefined
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    false
+  );
+  events = (events.parent || []).filter(
+    e => e[1] == "navigation" && e[2] == "search"
+  );
+  Assert.deepEqual(
+    events,
+    [],
+    "Should not have recorded any navigation search events"
+  );
+}
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Disable search suggestions in the urlbar.
+      ["browser.urlbar.suggest.searches", false],
+      // Clear historical search suggestions to avoid interference from previous
+      // tests.
+      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
+      // Use the default matching bucket configuration.
+      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
+      // Turn autofill off.
+      ["browser.urlbar.autoFill", false],
+    ],
+  });
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Clear history so that history added by previous tests doesn't mess up this
+  // test when it selects results in the urlbar.
+  await PlacesUtils.history.clear();
+  await PlacesUtils.bookmarks.eraseEverything();
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await PlacesUtils.history.clear();
+    await PlacesUtils.bookmarks.eraseEverything();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+  });
+});
+
+add_task(async function test_extension() {
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      omnibox: {
+        keyword: "omniboxtest",
+      },
+
+      background() {
+        /* global browser */
+        browser.omnibox.setDefaultSuggestion({
+          description: "doit",
+        });
+        // Just do nothing for this test.
+        browser.omnibox.onInputEntered.addListener(() => {});
+        browser.omnibox.onInputChanged.addListener((text, suggest) => {
+          suggest([]);
+        });
+      },
+    },
+  });
+
+  await extension.startup();
+
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    waitForFocus,
+    value: "omniboxtest ",
+    fireInputEvent: true,
+  });
+  EventUtils.synthesizeKey("KEY_Enter");
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "extension",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  await extension.unload();
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,1691 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry with search related actions.
+ */
+
+"use strict";
+
+const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
+const SCALAR_SEARCHMODE = "browser.engagement.navigation.urlbar_searchmode";
+
+// The preference to enable suggestions in the urlbar.
+const SUGGEST_URLBAR_PREF = "browser.urlbar.suggest.searches";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function searchInAwesomebar(value, win = window) {
+  return UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window: win,
+    waitForFocus,
+    value,
+    fireInputEvent: true,
+  });
+}
+
+/**
+ * Click one of the entries in the urlbar suggestion popup.
+ *
+ * @param {string} resultTitle
+ *        The title of the result to click on.
+ * @param {number} button [optional]
+ *        which button to click.
+ * @returns {number}
+ *          The index of the result that was clicked, or -1 if not found.
+ */
+async function clickURLBarSuggestion(resultTitle, button = 1) {
+  await UrlbarTestUtils.promiseSearchComplete(window);
+
+  const count = UrlbarTestUtils.getResultCount(window);
+  for (let i = 0; i < count; i++) {
+    let result = await UrlbarTestUtils.getDetailsOfResultAt(window, i);
+    if (result.displayed.title == resultTitle) {
+      // This entry is the search suggestion we're looking for.
+      let element = await UrlbarTestUtils.waitForAutocompleteResultAt(
+        window,
+        i
+      );
+      if (button == 1) {
+        EventUtils.synthesizeMouseAtCenter(element, {});
+      } else if (button == 2) {
+        EventUtils.synthesizeMouseAtCenter(element, {
+          type: "mousedown",
+          button: 2,
+        });
+      }
+      return i;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Create an engine to generate search suggestions and add it as default
+ * for this test.
+ *
+ * @param {function} taskFn
+ *   The function to run with the new search engine as default.
+ */
+async function withNewSearchEngine(taskFn) {
+  const url =
+    getRootDirectory(gTestPath) + "urlbarTelemetrySearchSuggestions.xml";
+  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
+  let previousEngine = await Services.search.getDefault();
+  await Services.search.setDefault(suggestionEngine);
+
+  try {
+    await taskFn(suggestionEngine);
+  } finally {
+    await Services.search.setDefault(previousEngine);
+    await Services.search.removeEngine(suggestionEngine);
+  }
+}
+
+add_task(async function setup() {
+  // Create a new search engine.
+  await Services.search.addEngineWithDetails("MozSearch", {
+    alias: "mozalias",
+    method: "GET",
+    template: "http://example.com/?q={searchTerms}",
+  });
+
+  // Make it the default search engine.
+  let engine = Services.search.getEngineByName("MozSearch");
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engine);
+
+  // And the first one-off engine.
+  await Services.search.moveEngine(engine, 0);
+
+  // Enable search suggestions in the urlbar.
+  let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
+  Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Clear history so that history added by previous tests doesn't mess up this
+  // test when it selects results in the urlbar.
+  await PlacesUtils.history.clear();
+
+  // Clear historical search suggestions to avoid interference from previous
+  // tests.
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 0]],
+  });
+
+  // Use the default matching bucket configuration.
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.matchBuckets", "general:5,suggestion:4"]],
+  });
+
+  // Allows UrlbarTestUtils to access this scope's test helpers, like Assert.
+  UrlbarTestUtils.init(this);
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(engine);
+    Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
+    await PlacesUtils.history.clear();
+    await UrlbarTestUtils.formHistory.clear();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+    UrlbarTestUtils.uninit();
+  });
+});
+
+add_task(async function test_simpleQuery() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Simulate entering a simple search.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("simple query");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_URLBAR,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_URLBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // SEARCH_COUNTS should be incremented, but only the urlbar source since an
+  // internal @search keyword was not used.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    1
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      [
+        "navigation",
+        "search",
+        "urlbar",
+        "enter",
+        { engine: "other-MozSearch" },
+      ],
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    resultIndexByTypeHist,
+    "searchengine",
+    0,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_searchMode_enter() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Enter search mode using an alias and a query.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("mozalias query");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_SEARCHMODE,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_SEARCHMODE]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      [
+        "navigation",
+        "search",
+        "urlbar_searchmode",
+        "enter",
+        { engine: "other-MozSearch" },
+      ],
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    resultIndexByTypeHist,
+    "searchengine",
+    0,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// This subtest can be removed with the update2 pref.
+add_task(async function test_searchAlias_legacy() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", false],
+      ["browser.urlbar.update2.oneOffsRefresh", false],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Search using a search alias.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("mozalias query");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_URLBAR,
+    "search_alias",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_URLBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      [
+        "navigation",
+        "search",
+        "urlbar",
+        "alias",
+        { engine: "other-MozSearch" },
+      ],
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    resultIndexByTypeHist,
+    "searchengine",
+    0,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using the first result, a one-off button, and the Return
+// (Enter) key.
+// This subtest can be removed with the update2 pref.
+add_task(async function test_oneOff_enter_legacy() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", false],
+      ["browser.urlbar.update2.oneOffsRefresh", false],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Perform a one-off search using the first engine. Update 2 disabled.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("query");
+
+  info("Pressing Alt+Down to take us to the first one-off engine.");
+  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_URLBAR,
+    "search_oneoff",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_URLBAR]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // SEARCH_COUNTS should be incremented, but only the urlbar source since an
+  // internal @search keyword was not used.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    1
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      [
+        "navigation",
+        "search",
+        "urlbar",
+        "oneoff",
+        { engine: "other-MozSearch" },
+      ],
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    resultIndexByTypeHist,
+    "searchengine",
+    0,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using the first result, a one-off button, and the Return
+// (Enter) key.
+add_task(async function test_oneOff_enter() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Perform a one-off search using the first engine.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("query");
+
+  info("Pressing Alt+Down to take us to the first one-off engine.");
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+  let engine = UrlbarTestUtils.getOneOffSearchButtons(window).selectedButton
+    .engine;
+  EventUtils.synthesizeKey("KEY_Enter");
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName: engine.name,
+    entry: "oneoff",
+  });
+
+  // Now that we're in search mode, execute the search.
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  // Check if the scalars contain the expected values.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    SCALAR_SEARCHMODE,
+    "search_enter",
+    1
+  );
+  Assert.equal(
+    Object.keys(scalars[SCALAR_SEARCHMODE]).length,
+    1,
+    "This search must only increment one entry in the scalar."
+  );
+
+  // SEARCH_COUNTS should be incremented, but only the urlbar-searchmode source
+  // since aliases aren't counted separately in search mode.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar-searchmode",
+    1
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  TelemetryTestUtils.assertEvents(
+    [
+      [
+        "navigation",
+        "search",
+        "urlbar_searchmode",
+        "enter",
+        { engine: "other-MozSearch" },
+      ],
+    ],
+    { category: "navigation", method: "search" }
+  );
+
+  // Check the histograms as well.
+  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    resultIndexByTypeHist,
+    "searchengine",
+    0,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using the second result, a one-off button, and the Return
+// (Enter) key.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram
+// since test_oneOff_enter covers everything else.
+// This subtest can be removed with the update2 pref.
+add_task(async function test_oneOff_enterSelection_legacy() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", false],
+      ["browser.urlbar.update2.oneOffsRefresh", false],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info(
+      "Type a query. Suggestions should be generated by the test engine. Update2 disabled."
+    );
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+
+    info(
+      "Select the second result, press Alt+Down to take us to the first one-off engine."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using the second result, a one-off button, and the Return
+// (Enter) key.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram
+// since test_oneOff_enter covers everything else.
+add_task(async function test_oneOff_enterSelection() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+
+    info(
+      "Select the second result, press Alt+Down to take us to the first one-off engine."
+    );
+    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
+    let engine = UrlbarTestUtils.getOneOffSearchButtons(window).selectedButton
+      .engine;
+    EventUtils.synthesizeKey("KEY_Enter");
+    await searchPromise;
+
+    await UrlbarTestUtils.assertSearchMode(window, {
+      engineName: engine.name,
+      entry: "oneoff",
+    });
+
+    // Now that we're in search mode, execute the search.
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using a click on a one-off button.  This only tests the
+// FX_URLBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
+// everything else.
+// This subtest can be removed with the update2 pref.
+add_task(async function test_oneOff_click_legacy() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", false],
+      ["browser.urlbar.update2.oneOffsRefresh", false],
+    ],
+  });
+  Services.telemetry.clearScalars();
+
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Type a query.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("query");
+  info("Click the first one-off button. Update2 disabled");
+  UrlbarTestUtils.getOneOffSearchButtons(window)
+    .getSelectableButtons(false)[0]
+    .click();
+  await p;
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Performs a search using a click on a one-off button.  This only tests the
+// FX_URLBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
+// everything else.
+add_task(async function test_oneOff_click() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  info("Type a query.");
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("query");
+
+  info("Click the first one-off button.");
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  let oneOffButton = UrlbarTestUtils.getOneOffSearchButtons(
+    window
+  ).getSelectableButtons(false)[0];
+  oneOffButton.click();
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName: oneOffButton.engine.name,
+    entry: "oneoff",
+  });
+
+  // Now that we're in search mode, execute the search.
+  let element = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 0);
+  Assert.ok(element, "Found result after entering search mode.");
+  EventUtils.synthesizeMouseAtCenter(element, {});
+  await p;
+
+  TelemetryTestUtils.assertHistogram(
+    resultMethodHist,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+    1
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Clicks the first suggestion offered by the test search engine.
+add_task(async function test_suggestion_click() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  await UrlbarTestUtils.formHistory.clear();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  await withNewSearchEngine(async function(engine) {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    info("Clicking the urlbar suggestion.");
+    await clickURLBarSuggestion("queryfoo");
+    await p;
+
+    // Check if the scalars contain the expected values.
+    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+    TelemetryTestUtils.assertKeyedScalar(
+      scalars,
+      SCALAR_URLBAR,
+      "search_suggestion",
+      1
+    );
+    Assert.equal(
+      Object.keys(scalars[SCALAR_URLBAR]).length,
+      1,
+      "This search must only increment one entry in the scalar."
+    );
+
+    // SEARCH_COUNTS should be incremented.
+    let searchEngineId = "other-" + engine.name;
+    TelemetryTestUtils.assertKeyedHistogramSum(
+      search_hist,
+      searchEngineId + ".urlbar",
+      1
+    );
+
+    // Also check events.
+    TelemetryTestUtils.assertEvents(
+      [
+        [
+          "navigation",
+          "search",
+          "urlbar",
+          "suggestion",
+          { engine: searchEngineId },
+        ],
+      ],
+      { category: "navigation", method: "search" }
+    );
+
+    // Check the histograms as well.
+    TelemetryTestUtils.assertHistogram(resultIndexHist, 3, 1);
+
+    TelemetryTestUtils.assertHistogram(
+      resultTypeHist,
+      UrlbarUtils.SELECTED_RESULT_TYPES.searchsuggestion,
+      1
+    );
+
+    TelemetryTestUtils.assertKeyedHistogramValue(
+      resultIndexByTypeHist,
+      "searchsuggestion",
+      3,
+      1
+    );
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+});
+
+// Selects and presses the Return (Enter) key on the first suggestion offered by
+// the test search engine.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD
+// histogram since test_suggestion_click covers everything else.
+add_task(async function test_suggestion_arrowEnterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    info("Select the second result and press Return.");
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+});
+
+// Selects through tab and presses the Return (Enter) key on the first
+// suggestion offered by the test search engine.
+add_task(async function test_suggestion_tabEnterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    info("Select the second result and press Return.");
+    EventUtils.synthesizeKey("KEY_Tab");
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+});
+
+// Selects through code and presses the Return (Enter) key on the first
+// suggestion offered by the test search engine.
+add_task(async function test_suggestion_enterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    info("Select the second result and press Return.");
+    UrlbarTestUtils.setSelectedRowIndex(window, 1);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+});
+
+// Clicks the first suggestion offered by the test search engine when in search
+// mode.
+add_task(async function test_searchmode_suggestion_click() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  await withNewSearchEngine(async function(engine) {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    await searchInAwesomebar("query");
+    await UrlbarTestUtils.enterSearchMode(window, {
+      engineName: engine.name,
+    });
+    info("Clicking the urlbar suggestion.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await clickURLBarSuggestion("queryfoo");
+    await p;
+
+    // Check if the scalars contain the expected values.
+    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+    TelemetryTestUtils.assertKeyedScalar(
+      scalars,
+      SCALAR_SEARCHMODE,
+      "search_suggestion",
+      1
+    );
+    Assert.equal(
+      Object.keys(scalars[SCALAR_SEARCHMODE]).length,
+      1,
+      "This search must only increment one entry in the scalar."
+    );
+
+    // SEARCH_COUNTS should be incremented.
+    let searchEngineId = "other-" + engine.name;
+    TelemetryTestUtils.assertKeyedHistogramSum(
+      search_hist,
+      searchEngineId + ".urlbar-searchmode",
+      1
+    );
+
+    // Also check events.
+    TelemetryTestUtils.assertEvents(
+      [
+        [
+          "navigation",
+          "search",
+          "urlbar_searchmode",
+          "suggestion",
+          { engine: searchEngineId },
+        ],
+      ],
+      { category: "navigation", method: "search" }
+    );
+
+    // Check the histograms as well.
+    TelemetryTestUtils.assertHistogram(resultIndexHist, 1, 1);
+
+    TelemetryTestUtils.assertHistogram(
+      resultTypeHist,
+      UrlbarUtils.SELECTED_RESULT_TYPES.searchsuggestion,
+      1
+    );
+
+    TelemetryTestUtils.assertKeyedHistogramValue(
+      resultIndexByTypeHist,
+      "searchsuggestion",
+      1,
+      1
+    );
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+  await SpecialPowers.popPrefEnv();
+});
+
+// Selects and presses the Return (Enter) key on the first suggestion offered by
+// the test search engine in search mode.  This only tests the
+// FX_URLBAR_SELECTED_RESULT_METHOD histogram since
+// test_searchmode_suggestion_click covers everything else.
+add_task(async function test_searchmode_suggestion_arrowEnterSelection() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function(engine) {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    await UrlbarTestUtils.enterSearchMode(window, {
+      engineName: engine.name,
+    });
+    info("Select the second result and press Return.");
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
+      1
+    );
+    BrowserTestUtils.removeTab(tab);
+  });
+  await SpecialPowers.popPrefEnv();
+});
+
+// Selects through tab and presses the Return (Enter) key on the first
+// suggestion offered by the test search engine in search mode.
+add_task(async function test_suggestion_tabEnterSelection() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function(engine) {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    await UrlbarTestUtils.enterSearchMode(window, {
+      engineName: engine.name,
+    });
+    info("Select the second result and press Return.");
+    EventUtils.synthesizeKey("KEY_Tab");
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+  await SpecialPowers.popPrefEnv();
+});
+
+// Selects through code and presses the Return (Enter) key on the first
+// suggestion offered by the test search engine in search mode.
+add_task(async function test_suggestion_enterSelection() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+    ],
+  });
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await withNewSearchEngine(async function(engine) {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. Suggestions should be generated by the test engine.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("query");
+    await UrlbarTestUtils.enterSearchMode(window, {
+      engineName: engine.name,
+    });
+    info("Select the second result and press Return.");
+    UrlbarTestUtils.setSelectedRowIndex(window, 1);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+  });
+  await SpecialPowers.popPrefEnv();
+});
+
+// Clicks a form history result.
+add_task(async function test_formHistory_click() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  await UrlbarTestUtils.formHistory.clear();
+  await UrlbarTestUtils.formHistory.add(["foobar"]);
+
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
+  });
+
+  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX"
+  );
+  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+  );
+  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+  );
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  await withNewSearchEngine(async engine => {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. There should be form history.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("foo");
+    info("Clicking the form history.");
+    let foobarIndex = await clickURLBarSuggestion("foobar");
+    await p;
+
+    // Check if the scalars contain the expected values.
+    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+    TelemetryTestUtils.assertKeyedScalar(
+      scalars,
+      SCALAR_URLBAR,
+      "search_formhistory",
+      1
+    );
+    Assert.equal(
+      Object.keys(scalars[SCALAR_URLBAR]).length,
+      1,
+      "This search must only increment one entry in the scalar."
+    );
+
+    // SEARCH_COUNTS should be incremented.
+    let searchEngineId = "other-" + engine.name;
+    TelemetryTestUtils.assertKeyedHistogramSum(
+      search_hist,
+      searchEngineId + ".urlbar",
+      1
+    );
+
+    // Also check events.
+    TelemetryTestUtils.assertEvents(
+      [
+        [
+          "navigation",
+          "search",
+          "urlbar",
+          "formhistory",
+          { engine: searchEngineId },
+        ],
+      ],
+      { category: "navigation", method: "search" }
+    );
+
+    // Check the histograms as well.
+    TelemetryTestUtils.assertHistogram(resultIndexHist, foobarIndex, 1);
+
+    TelemetryTestUtils.assertHistogram(
+      resultTypeHist,
+      UrlbarUtils.SELECTED_RESULT_TYPES.formhistory,
+      1
+    );
+
+    TelemetryTestUtils.assertKeyedHistogramValue(
+      resultIndexByTypeHist,
+      "formhistory",
+      foobarIndex,
+      1
+    );
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+    await UrlbarTestUtils.formHistory.clear();
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+// Selects and presses the Return (Enter) key on a form history result.  This
+// only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram since
+// test_formHistory_click covers everything else.
+add_task(async function test_formHistory_arrowEnterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await UrlbarTestUtils.formHistory.clear();
+  await UrlbarTestUtils.formHistory.add(["foobar"]);
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
+  });
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. There should be form history.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("foo");
+    info("Select the form history result and press Return.");
+    while (gURLBar.untrimmedValue != "foobar") {
+      EventUtils.synthesizeKey("KEY_ArrowDown");
+    }
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+    await UrlbarTestUtils.formHistory.clear();
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+// Selects through tab and presses the Return (Enter) key on a form history
+// result.
+add_task(async function test_formHistory_tabEnterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await UrlbarTestUtils.formHistory.clear();
+  await UrlbarTestUtils.formHistory.add(["foobar"]);
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
+  });
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. There should be form history.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("foo");
+    info("Select the form history result and press Return.");
+    while (gURLBar.untrimmedValue != "foobar") {
+      EventUtils.synthesizeKey("KEY_Tab");
+    }
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+    await UrlbarTestUtils.formHistory.clear();
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+// Selects through code and presses the Return (Enter) key on a form history
+// result.
+add_task(async function test_formHistory_enterSelection() {
+  Services.telemetry.clearScalars();
+  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
+    "FX_URLBAR_SELECTED_RESULT_METHOD"
+  );
+
+  await UrlbarTestUtils.formHistory.clear();
+  await UrlbarTestUtils.formHistory.add(["foobar"]);
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
+  });
+
+  await withNewSearchEngine(async function() {
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      "about:blank"
+    );
+
+    info("Type a query. There should be form history.");
+    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    await searchInAwesomebar("foo");
+    info("Select the second result and press Return.");
+    let index = 1;
+    while (gURLBar.untrimmedValue != "foobar") {
+      UrlbarTestUtils.setSelectedRowIndex(window, index++);
+    }
+    EventUtils.synthesizeKey("KEY_Enter");
+    await p;
+
+    TelemetryTestUtils.assertHistogram(
+      resultMethodHist,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
+      1
+    );
+
+    BrowserTestUtils.removeTab(tab);
+    await UrlbarTestUtils.formHistory.clear();
+    await SpecialPowers.popPrefEnv();
+  });
+});
+
+add_task(async function test_privateWindow() {
+  // Override the search telemetry search provider info to
+  // count in-content SEARCH_COUNTs telemetry for our test engine.
+  SearchSERPTelemetry.overrideSearchTelemetryForTests([
+    {
+      telemetryId: "example",
+      searchPageRegexp: "^http://example\\.com/",
+      queryParamName: "q",
+    },
+  ]);
+
+  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
+    "SEARCH_COUNTS"
+  );
+
+  // First, do a bunch of searches in a private window.
+  let win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
+
+  info("Search in a private window and the pref does not exist");
+  let p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    1
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    1
+  );
+
+  info("Search again in a private window after setting the pref to true");
+  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", true);
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should *not* be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    1
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    1
+  );
+
+  info("Search again in a private window after setting the pref to false");
+  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", false);
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    2
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    2
+  );
+
+  info("Search again in a private window after clearing the pref");
+  Services.prefs.clearUserPref("browser.engagement.search_counts.pbm");
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    3
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    3
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+
+  // Now, do a bunch of searches in a non-private window.  Telemetry should
+  // always be recorded regardless of the pref's value.
+  win = await BrowserTestUtils.openNewBrowserWindow();
+
+  info("Search in a non-private window and the pref does not exist");
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    4
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    4
+  );
+
+  info("Search again in a non-private window after setting the pref to true");
+  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", true);
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    5
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    5
+  );
+
+  info("Search again in a non-private window after setting the pref to false");
+  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", false);
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    6
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    6
+  );
+
+  info("Search again in a non-private window after clearing the pref");
+  Services.prefs.clearUserPref("browser.engagement.search_counts.pbm");
+  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await searchInAwesomebar("another query", win);
+  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
+  await p;
+
+  // SEARCH_COUNTS should be incremented.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    7
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "example.in-content:organic:none",
+    7
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+
+  // Reset the search provider info.
+  SearchSERPTelemetry.overrideSearchTelemetryForTests();
+  await UrlbarTestUtils.formHistory.clear();
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,330 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry with places related actions (e.g. history/
+ * bookmark selection).
+ */
+
+"use strict";
+
+const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
+
+const TEST_URL = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "http://mochi.test:8888"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function searchInAwesomebar(value, win = window) {
+  return UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window: win,
+    waitForFocus,
+    value,
+    fireInputEvent: true,
+  });
+}
+
+function assertSearchTelemetryEmpty(search_hist) {
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  Assert.ok(
+    !(SCALAR_URLBAR in scalars),
+    `Should not have recorded ${SCALAR_URLBAR}`
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    undefined
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    false
+  );
+  events = (events.parent || []).filter(
+    e => e[1] == "navigation" && e[2] == "search"
+  );
+  Assert.deepEqual(
+    events,
+    [],
+    "Should not have recorded any navigation search events"
+  );
+}
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Disable search suggestions in the urlbar.
+      ["browser.urlbar.suggest.searches", false],
+      // Clear historical search suggestions to avoid interference from previous
+      // tests.
+      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
+      // Use the default matching bucket configuration.
+      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
+      // Turn autofill off.
+      ["browser.urlbar.autoFill", false],
+    ],
+  });
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Clear history so that history added by previous tests doesn't mess up this
+  // test when it selects results in the urlbar.
+  await PlacesUtils.history.clear();
+  await PlacesUtils.bookmarks.eraseEverything();
+
+  await PlacesUtils.keywords.insert({
+    keyword: "get",
+    url: TEST_URL + "?q=%s",
+  });
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    await PlacesUtils.keywords.remove("get");
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await PlacesUtils.history.clear();
+    await PlacesUtils.bookmarks.eraseEverything();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+  });
+});
+
+add_task(async function test_history() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  await PlacesTestUtils.addVisits([
+    {
+      uri: "http://example.com",
+      title: "example",
+      transition: Ci.nsINavHistoryService.TRANSITION_TYPED,
+    },
+  ]);
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("example");
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "history",
+    1,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_bookmark() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  let bm = await PlacesUtils.bookmarks.insert({
+    url: "http://example.com",
+    title: "example",
+    parentGuid: PlacesUtils.bookmarks.menuGuid,
+  });
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("example");
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "bookmark",
+    1,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+  );
+
+  await PlacesUtils.bookmarks.remove(bm);
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_keyword() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("get example");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "keyword",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_switchtab() {
+  const histograms = snapshotHistograms();
+
+  let homeTab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:buildconfig"
+  );
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:mozilla"
+  );
+
+  let p = BrowserTestUtils.waitForEvent(gBrowser, "TabSwitchDone");
+  await searchInAwesomebar("about:buildconfig");
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "switchtab",
+    1,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+  );
+
+  BrowserTestUtils.removeTab(tab);
+  BrowserTestUtils.removeTab(homeTab);
+});
+
+add_task(async function test_visitURL() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("http://example.com");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "visiturl",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_autofill() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  await PlacesTestUtils.addVisits([
+    {
+      uri: "http://example.com/mypage",
+      title: "example",
+      transition: Ci.nsINavHistoryService.TRANSITION_TYPED,
+    },
+  ]);
+
+  Services.prefs.setBoolPref("browser.urlbar.autoFill", true);
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await searchInAwesomebar("example.com/my");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "autofill",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,211 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry with remote tab action.
+ */
+
+"use strict";
+
+const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function assertSearchTelemetryEmpty(search_hist) {
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  Assert.ok(
+    !(SCALAR_URLBAR in scalars),
+    `Should not have recorded ${SCALAR_URLBAR}`
+  );
+
+  // Make sure SEARCH_COUNTS contains identical values.
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.urlbar",
+    undefined
+  );
+  TelemetryTestUtils.assertKeyedHistogramSum(
+    search_hist,
+    "other-MozSearch.alias",
+    undefined
+  );
+
+  // Also check events.
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    false
+  );
+  events = (events.parent || []).filter(
+    e => e[1] == "navigation" && e[2] == "search"
+  );
+  Assert.deepEqual(
+    events,
+    [],
+    "Should not have recorded any navigation search events"
+  );
+}
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Disable search suggestions in the urlbar.
+      ["browser.urlbar.suggest.searches", false],
+      // Clear historical search suggestions to avoid interference from previous
+      // tests.
+      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
+      // Use the default matching bucket configuration.
+      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
+      // Turn autofill off.
+      ["browser.urlbar.autoFill", false],
+      // Special prefs for remote tabs.
+      ["services.sync.username", "fake"],
+      ["services.sync.syncedTabs.showRemoteTabs", true],
+    ],
+  });
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Enable event recording for the events tested here.
+  Services.telemetry.setEventRecordingEnabled("navigation", true);
+
+  // Clear history so that history added by previous tests doesn't mess up this
+  // test when it selects results in the urlbar.
+  await PlacesUtils.history.clear();
+  await PlacesUtils.bookmarks.eraseEverything();
+
+  const REMOTE_TAB = {
+    id: "7cqCr77ptzX3",
+    type: "client",
+    lastModified: 1492201200,
+    name: "zcarter's Nightly on MacBook-Pro-25",
+    clientType: "desktop",
+    tabs: [
+      {
+        type: "tab",
+        title: "Test Remote",
+        url: "http://example.com",
+        icon: UrlbarUtils.ICON.DEFAULT,
+        client: "7cqCr77ptzX3",
+        lastUsed: 1452124677,
+      },
+    ],
+  };
+
+  const sandbox = sinon.createSandbox();
+
+  let originalSyncedTabsInternal = SyncedTabs._internal;
+  SyncedTabs._internal = {
+    isConfiguredToSyncTabs: true,
+    hasSyncedThisSession: true,
+    getTabClients() {
+      return Promise.resolve([]);
+    },
+    syncTabs() {
+      return Promise.resolve();
+    },
+  };
+
+  // Tell the Sync XPCOM service it is initialized.
+  let weaveXPCService = Cc["@mozilla.org/weave/service;1"].getService(
+    Ci.nsISupports
+  ).wrappedJSObject;
+  let oldWeaveServiceReady = weaveXPCService.ready;
+  weaveXPCService.ready = true;
+
+  sandbox
+    .stub(SyncedTabs._internal, "getTabClients")
+    .callsFake(() => Promise.resolve(Cu.cloneInto([REMOTE_TAB], {})));
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    sandbox.restore();
+    weaveXPCService.ready = oldWeaveServiceReady;
+    SyncedTabs._internal = originalSyncedTabsInternal;
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await PlacesUtils.history.clear();
+    await PlacesUtils.bookmarks.eraseEverything();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+  });
+});
+
+add_task(async function test_remotetab() {
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    waitForFocus,
+    value: "example",
+    fireInputEvent: true,
+  });
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await p;
+
+  assertSearchTelemetryEmpty(histograms.search_hist);
+  assertTelemetryResults(
+    histograms,
+    "remotetab",
+    1,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,581 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests the urlbar.searchmode.* scalars telemetry with search mode
+ * related actions.
+ */
+
+"use strict";
+
+const ENTRY_SCALAR_PREFIX = "urlbar.searchmode.";
+const PICKED_SCALAR_PREFIX = "urlbar.picked.searchmode.";
+const ENGINE_ALIAS = "alias";
+const TEST_QUERY = "test";
+let engineName;
+let engineDomain;
+
+// The preference to enable suggestions.
+const SUGGEST_PREF = "browser.search.suggest.enabled";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AppConstants: "resource://gre/modules/AppConstants.jsm",
+  UrlbarProviderTabToSearch:
+    "resource:///modules/UrlbarProviderTabToSearch.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "TouchBarHelper",
+  "@mozilla.org/widget/touchbarhelper;1",
+  "nsITouchBarHelper"
+);
+
+/**
+ * Asserts that search mode telemetry was recorded correctly. Checks both the
+ * urlbar.searchmode.* and urlbar.searchmode_picked.* probes.
+ * @param {string} entry
+ *   A search mode entry point.
+ * @param {string} engineOrSource
+ *   An engine name or a search mode source.
+ * @param {number} [resultIndex]
+ *   The index of the result picked while in search mode. Only pass this
+ *   parameter if a result is picked.
+ */
+function assertSearchModeScalars(entry, engineOrSource, resultIndex = -1) {
+  // Check if the urlbar.searchmode.entry scalar contains the expected value.
+  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
+  TelemetryTestUtils.assertKeyedScalar(
+    scalars,
+    ENTRY_SCALAR_PREFIX + entry,
+    engineOrSource,
+    1
+  );
+
+  for (let e of UrlbarUtils.SEARCH_MODE_ENTRY) {
+    if (e == entry) {
+      Assert.equal(
+        Object.keys(scalars[ENTRY_SCALAR_PREFIX + entry]).length,
+        1,
+        `This search must only increment one entry in the correct scalar: ${e}`
+      );
+    } else {
+      Assert.ok(
+        !scalars[ENTRY_SCALAR_PREFIX + e],
+        `No other urlbar.searchmode scalars should be recorded. Checking ${e}`
+      );
+    }
+  }
+
+  if (resultIndex >= 0) {
+    TelemetryTestUtils.assertKeyedScalar(
+      scalars,
+      PICKED_SCALAR_PREFIX + entry,
+      resultIndex,
+      1
+    );
+  }
+
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.update2.oneOffsRefresh", true],
+      // Disable tab-to-search onboarding results for general tests. They are
+      // enabled in tests that specifically address onboarding.
+      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
+    ],
+  });
+
+  // Create an engine to generate search suggestions and add it as default
+  // for this test.
+  const url =
+    getRootDirectory(gTestPath) + "urlbarTelemetrySearchSuggestions.xml";
+  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
+  suggestionEngine.alias = ENGINE_ALIAS;
+  engineDomain = suggestionEngine.getResultDomain();
+  engineName = suggestionEngine.name;
+
+  // Make it the default search engine.
+  let originalEngine = await Services.search.getDefault();
+  await Services.search.setDefault(suggestionEngine);
+
+  // And the first one-off engine.
+  await Services.search.moveEngine(suggestionEngine, 0);
+
+  // Enable local telemetry recording for the duration of the tests.
+  let oldCanRecord = Services.telemetry.canRecordExtended;
+  Services.telemetry.canRecordExtended = true;
+
+  // Clear history so that history added by previous tests doesn't mess up this
+  // test when it selects results in the urlbar.
+  await PlacesUtils.history.clear();
+
+  // Clear historical search suggestions to avoid interference from previous
+  // tests.
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 0]],
+  });
+
+  // Allows UrlbarTestUtils to access this scope's test helpers, like Assert.
+  UrlbarTestUtils.init(this);
+
+  // Make sure to restore the engine once we're done.
+  registerCleanupFunction(async function() {
+    Services.telemetry.canRecordExtended = oldCanRecord;
+    await Services.search.setDefault(originalEngine);
+    await Services.search.removeEngine(suggestionEngine);
+    await PlacesUtils.history.clear();
+    Services.telemetry.setEventRecordingEnabled("navigation", false);
+    UrlbarTestUtils.uninit();
+  });
+});
+
+// Clicks the first one off.
+add_task(async function test_oneoff_remote() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // Enters search mode by clicking a one-off.
+  await UrlbarTestUtils.enterSearchMode(window);
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("oneoff", "other", 0);
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Clicks the history one off.
+add_task(async function test_oneoff_local() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // Enters search mode by clicking a one-off.
+  await UrlbarTestUtils.enterSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.HISTORY,
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("oneoff", "history", 0);
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Checks that the Amazon search mode name is collapsed to "Amazon".
+add_task(async function test_oneoff_amazon() {
+  // Disable suggestions to avoid hitting Amazon servers.
+  await SpecialPowers.pushPrefEnv({
+    set: [[SUGGEST_PREF, false]],
+  });
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // Enters search mode by clicking a one-off.
+  await UrlbarTestUtils.enterSearchMode(window, {
+    engineName: "Amazon.com",
+  });
+  assertSearchModeScalars("oneoff", "Amazon");
+  await UrlbarTestUtils.exitSearchMode(window);
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Checks that the Wikipedia search mode name is collapsed to "Wikipedia".
+add_task(async function test_oneoff_wikipedia() {
+  // Disable suggestions to avoid hitting Wikipedia servers.
+  await SpecialPowers.pushPrefEnv({
+    set: [[SUGGEST_PREF, false]],
+  });
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // Enters search mode by clicking a one-off.
+  await UrlbarTestUtils.enterSearchMode(window, {
+    engineName: "Wikipedia (en)",
+  });
+  assertSearchModeScalars("oneoff", "Wikipedia");
+  await UrlbarTestUtils.exitSearchMode(window);
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Enters search mode by pressing the keyboard shortcut.
+add_task(async function test_shortcut() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // Enter search mode by pressing the keyboard shortcut.
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey("k", { accelKey: true });
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName,
+    source: UrlbarUtils.RESULT_SOURCE.SEARCH,
+    entry: "shortcut",
+  });
+  assertSearchModeScalars("shortcut", "other");
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Enters search mode by selecting a Top Site from the Urlbar.
+add_task(async function test_topsites_urlbar() {
+  // Disable suggestions to avoid hitting Amazon servers.
+  await SpecialPowers.pushPrefEnv({
+    set: [[SUGGEST_PREF, false]],
+  });
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  // Enter search mode by selecting a Top Site from the Urlbar.
+  await UrlbarTestUtils.promisePopupOpen(window, () => {
+    if (gURLBar.getAttribute("pageproxystate") == "invalid") {
+      gURLBar.handleRevert();
+    }
+    EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
+  });
+  await UrlbarTestUtils.promiseSearchComplete(window);
+
+  let amazonSearch = await UrlbarTestUtils.waitForAutocompleteResultAt(
+    window,
+    0
+  );
+  Assert.equal(
+    amazonSearch.result.payload.keyword,
+    "@amazon",
+    "First result should have the Amazon keyword."
+  );
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeMouseAtCenter(amazonSearch, {});
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName: amazonSearch.result.payload.engine,
+    entry: "topsites_urlbar",
+  });
+  assertSearchModeScalars("topsites_urlbar", "Amazon");
+  await UrlbarTestUtils.exitSearchMode(window);
+
+  BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
+});
+
+// Enters search mode by selecting a keyword offer result.
+add_task(async function test_keywordoffer() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  // Do a search for "@" + our test alias.  It should autofill with a trailing
+  // space, and the heuristic result should be an autofill result with a keyword
+  // offer.
+  let alias = "@" + ENGINE_ALIAS;
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: alias,
+  });
+  let keywordOfferResult = await UrlbarTestUtils.getDetailsOfResultAt(
+    window,
+    0
+  );
+  Assert.equal(
+    keywordOfferResult.searchParams.keyword,
+    alias,
+    "The first result should be a keyword search result with the correct alias."
+  );
+
+  // Pick the keyword offer result.
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName,
+    entry: "keywordoffer",
+  });
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "foo",
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("keywordoffer", "other", 0);
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Enters search mode by typing an alias.
+add_task(async function test_typed() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  // Enter search mode by selecting a keywordoffer result.
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: `${ENGINE_ALIAS} `,
+  });
+
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey(" ");
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName,
+    entry: "typed",
+  });
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "foo",
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("typed", "other", 0);
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Enters search mode by calling the same function called by the Search
+// Bookmarks menu item in Library > Bookmarks.
+add_task(async function test_bookmarkmenu() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  PlacesCommandHook.searchBookmarks();
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS,
+    entry: "bookmarkmenu",
+  });
+  assertSearchModeScalars("bookmarkmenu", "bookmarks");
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Enters search mode by calling the same function called by the Search Tabs
+// menu item in the tab overflow menu.
+add_task(async function test_tabmenu() {
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  gTabsPanel.searchTabs();
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.TABS,
+    entry: "tabmenu",
+  });
+  assertSearchModeScalars("tabmenu", "tabs");
+});
+
+// Enters search mode by performing a search handoff on about:privatebrowsing.
+// NOTE: We don't test handoff on about:home. Running mochitests on about:home
+// is quite difficult. This subtest verifies that `handoff` is a valid scalar
+// suffix and that a call to
+// UrlbarInput.search(value, { searchEngine, searchModeEntry: "handoff" }) records values in
+// the urlbar.searchmode.handoff scalar. PlacesFeed.test.js verfies that
+// about:home handoff makes that exact call.
+add_task(async function test_handoff_pbm() {
+  let win = await BrowserTestUtils.openNewBrowserWindow({
+    private: true,
+    waitForTabURL: "about:privatebrowsing",
+  });
+  let tab = win.gBrowser.selectedBrowser;
+
+  await SpecialPowers.spawn(tab, [], async function() {
+    let btn = content.document.getElementById("search-handoff-button");
+    btn.click();
+  });
+
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(win);
+  await new Promise(r => EventUtils.synthesizeKey("f", {}, win, r));
+  await searchPromise;
+  await UrlbarTestUtils.assertSearchMode(win, {
+    engineName,
+    entry: "handoff",
+  });
+  assertSearchModeScalars("handoff", "other");
+
+  await UrlbarTestUtils.exitSearchMode(win);
+  await UrlbarTestUtils.promisePopupClose(win);
+  await BrowserTestUtils.closeWindow(win);
+});
+
+// Enters search mode by tapping a search shortcut on the Touch Bar.
+add_task(async function test_touchbar() {
+  if (AppConstants.platform != "macosx") {
+    return;
+  }
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: TEST_QUERY,
+  });
+  // We have to fake the tap on the Touch Bar since mochitests have no way of
+  // interacting with the Touch Bar.
+  TouchBarHelper.insertRestrictionInUrlbar(UrlbarTokenizer.RESTRICT.HISTORY);
+  await UrlbarTestUtils.assertSearchMode(window, {
+    source: UrlbarUtils.RESULT_SOURCE.HISTORY,
+    entry: "touchbar",
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("touchbar", "history", 0);
+  BrowserTestUtils.removeTab(tab);
+});
+
+// Enters search mode by selecting a tab-to-search result.
+// Tests that tab-to-search results preview search mode when highlighted. These
+// results are worth testing separately since they do not set the
+// payload.keyword parameter.
+add_task(async function test_tabtosearch() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Do not show the onboarding result for this subtest.
+      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
+    ],
+  });
+  await PlacesTestUtils.addVisits([`http://${engineDomain}/`]);
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: engineDomain.slice(0, 4),
+  });
+  let tabToSearchResult = (
+    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
+  ).result;
+  Assert.equal(
+    tabToSearchResult.providerName,
+    "TabToSearch",
+    "The second result is a tab-to-search result."
+  );
+  Assert.equal(
+    tabToSearchResult.payload.engine,
+    engineName,
+    "The tab-to-search result is for the correct engine."
+  );
+  await UrlbarTestUtils.assertSearchMode(window, null);
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    1,
+    "Sanity check: The second result is selected."
+  );
+  // Pick the tab-to-search result.
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName,
+    entry: "tabtosearch",
+  });
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "foo",
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("tabtosearch", "other", 0);
+
+  BrowserTestUtils.removeTab(tab);
+
+  await PlacesUtils.history.clear();
+  await SpecialPowers.popPrefEnv();
+});
+
+// Enters search mode by selecting a tab-to-search onboarding result.
+add_task(async function test_tabtosearch_onboard() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.tabToSearch.onboard.interactionsLeft", 3]],
+  });
+  await PlacesTestUtils.addVisits([`http://${engineDomain}/`]);
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: engineDomain.slice(0, 4),
+  });
+  let tabToSearchResult = (
+    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
+  ).result;
+  Assert.equal(
+    tabToSearchResult.providerName,
+    "TabToSearch",
+    "The second result is a tab-to-search result."
+  );
+  Assert.equal(
+    tabToSearchResult.payload.engine,
+    engineName,
+    "The tab-to-search result is for the correct engine."
+  );
+  Assert.equal(
+    tabToSearchResult.payload.dynamicType,
+    "onboardTabToSearch",
+    "The tab-to-search result is an onboarding result."
+  );
+  await UrlbarTestUtils.assertSearchMode(window, null);
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    1,
+    "Sanity check: The second result is selected."
+  );
+  // Pick the tab-to-search onboarding result.
+  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await searchPromise;
+
+  await UrlbarTestUtils.assertSearchMode(window, {
+    engineName,
+    entry: "tabtosearch_onboard",
+  });
+
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "foo",
+  });
+  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter");
+  await loadPromise;
+  assertSearchModeScalars("tabtosearch_onboard", "other", 0);
+
+  UrlbarPrefs.set("tabToSearch.onboard.interactionsLeft", 3);
+  delete UrlbarProviderTabToSearch.onboardingInteractionAtTime;
+
+  BrowserTestUtils.removeTab(tab);
+  await PlacesUtils.history.clear();
+  await SpecialPowers.popPrefEnv();
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,359 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests telemetry for tabtosearch results.
+ * NB: This file does not test the search mode `entry` field for tab-to-search
+ * results. That is tested in browser_UsageTelemetry_urlbar_searchmode.js.
+ */
+
+"use strict";
+
+const ENGINE_NAME = "MozSearch";
+const ENGINE_DOMAIN = "example.com";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+/**
+ * Checks to see if the second result in the Urlbar is an onboarding result
+ * with the correct engine.
+ *
+ * @param {string} engineName
+ *   The expected engine name.
+ */
+async function checkForOnboardingResult(engineName) {
+  Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open.");
+  let tabToSearchResult = (
+    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
+  ).result;
+  Assert.equal(
+    tabToSearchResult.providerName,
+    "TabToSearch",
+    "The second result is a tab-to-search result."
+  );
+  Assert.equal(
+    tabToSearchResult.payload.engine,
+    engineName,
+    "The tab-to-search result is for the first engine."
+  );
+  Assert.equal(
+    tabToSearchResult.payload.dynamicType,
+    "onboardTabToSearch",
+    "The tab-to-search result is an onboarding result."
+  );
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.update2", true],
+      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
+    ],
+  });
+
+  let engine = await Services.search.addEngineWithDetails(ENGINE_NAME, {
+    template: `http://${ENGINE_DOMAIN}/?q={searchTerms}`,
+  });
+
+  UrlbarTestUtils.init(this);
+
+  registerCleanupFunction(async () => {
+    UrlbarTestUtils.uninit();
+    await Services.search.removeEngine(engine);
+  });
+});
+
+add_task(async function test() {
+  await BrowserTestUtils.withNewTab("about:blank", async () => {
+    const histograms = snapshotHistograms();
+
+    for (let i = 0; i < 3; i++) {
+      await PlacesTestUtils.addVisits([`https://${ENGINE_DOMAIN}/`]);
+    }
+
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: ENGINE_DOMAIN.slice(0, 4),
+    });
+
+    let tabToSearchResult = (
+      await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
+    ).result;
+    Assert.equal(
+      tabToSearchResult.providerName,
+      "TabToSearch",
+      "The second result is a tab-to-search result."
+    );
+    Assert.equal(
+      tabToSearchResult.payload.engine,
+      ENGINE_NAME,
+      "The tab-to-search result is for the correct engine."
+    );
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    Assert.equal(
+      UrlbarTestUtils.getSelectedRowIndex(window),
+      1,
+      "Sanity check: The second result is selected."
+    );
+
+    // Select the tab-to-search result.
+    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await searchPromise;
+
+    await UrlbarTestUtils.assertSearchMode(window, {
+      engineName: ENGINE_NAME,
+      entry: "tabtosearch",
+    });
+
+    assertTelemetryResults(
+      histograms,
+      "tabtosearch",
+      1,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+    );
+
+    await UrlbarTestUtils.exitSearchMode(window);
+    await UrlbarTestUtils.promisePopupClose(window, () => {
+      gURLBar.blur();
+    });
+    await PlacesUtils.history.clear();
+  });
+});
+
+add_task(async function onboarding_impressions() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.urlbar.tabToSearch.onboard.interactionsLeft", 3]],
+  });
+
+  await BrowserTestUtils.withNewTab("about:blank", async browser => {
+    const firstEngineHost = "example";
+    let secondEngine = await Services.search.addEngineWithDetails(
+      `${ENGINE_NAME}2`,
+      { template: `http://${firstEngineHost}-2.com/?q={searchTerms}` }
+    );
+
+    for (let i = 0; i < 3; i++) {
+      await PlacesTestUtils.addVisits([`https://${firstEngineHost}-2.com`]);
+      await PlacesTestUtils.addVisits([`https://${ENGINE_DOMAIN}/`]);
+    }
+
+    // First do multiple searches for substrings of firstEngineHost. The view
+    // should show the same tab-to-search onboarding result the entire time, so
+    // we should not continue to increment urlbar.tips.
+    for (let i = 1; i < firstEngineHost.length; i++) {
+      info(
+        `Search for "${firstEngineHost.slice(
+          0,
+          i
+        )}". Only record one impression for this sequence.`
+      );
+      await UrlbarTestUtils.promiseAutocompleteResultPopup({
+        window,
+        value: firstEngineHost.slice(0, i),
+        fireInputEvent: true,
+      });
+      await checkForOnboardingResult(ENGINE_NAME);
+    }
+
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      1
+    );
+
+    info("Type through autofill to second engine hostname. Record impression.");
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: firstEngineHost,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(ENGINE_NAME);
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: `${firstEngineHost}-`,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    // Since the user typed past the autofill for the first engine, we showed a
+    // different onboarding result and now we increment
+    // tabtosearch_onboard-shown.
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      3
+    );
+
+    info("Make a typo and return to autofill. Do not record impression.");
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: `${firstEngineHost}-`,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: `${firstEngineHost}-3`,
+      fireInputEvent: true,
+    });
+    Assert.equal(
+      UrlbarTestUtils.getResultCount(window),
+      1,
+      "We are not showing a tab-to-search result."
+    );
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: `${firstEngineHost}-2`,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      4
+    );
+
+    info("Cancel then restart autofill. Do not record impression.");
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: `${firstEngineHost}-2`,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey("KEY_Backspace");
+    await searchPromise;
+    Assert.greater(
+      UrlbarTestUtils.getResultCount(window),
+      1,
+      "Sanity check: we have more than one result."
+    );
+    let result = (await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1))
+      .result;
+    Assert.notEqual(
+      result.type,
+      UrlbarUtils.RESULT_TYPE.SEARCH,
+      "The second result is not a tab-to-search result."
+    );
+    searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    // Type the "." from `example-2.com`.
+    EventUtils.synthesizeKey(".");
+    await searchPromise;
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      5
+    );
+
+    // See javadoc for UrlbarProviderTabToSearch.onEngagement for discussion
+    // about retained results.
+    info("Reopen the result set with retained results. Record impression.");
+    await UrlbarTestUtils.promisePopupOpen(window, () => {
+      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
+    });
+    await checkForOnboardingResult(`${ENGINE_NAME}2`);
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      6
+    );
+
+    info(
+      "Open a result page and then autofill engine host. Record impression."
+    );
+    await UrlbarTestUtils.promiseAutocompleteResultPopup({
+      window,
+      value: firstEngineHost,
+      fireInputEvent: true,
+    });
+    await checkForOnboardingResult(ENGINE_NAME);
+    // Press enter on the heuristic result so we visit example.com without
+    // doing an additional search.
+    let loadPromise = BrowserTestUtils.browserLoaded(browser);
+    EventUtils.synthesizeKey("KEY_Enter");
+    await loadPromise;
+    // Click the Urlbar and type to simulate what a user would actually do. If
+    // we use promiseAutocompleteResultPopup, no query would be made between
+    // this one and the previous tab-to-search query. Thus
+    // `onboardingEnginesShown` would not be cleared. This would not happen
+    // in real-world usage.
+    await UrlbarTestUtils.promisePopupOpen(window, () => {
+      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
+    });
+    searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
+    EventUtils.synthesizeKey(firstEngineHost.slice(0, 4));
+    await searchPromise;
+    await checkForOnboardingResult(ENGINE_NAME);
+    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
+    // We clear the scalar this time.
+    TelemetryTestUtils.assertKeyedScalar(
+      TelemetryTestUtils.getProcessScalars("parent", true, true),
+      "urlbar.tips",
+      "tabtosearch_onboard-shown",
+      8
+    );
+
+    await PlacesUtils.history.clear();
+    await Services.search.removeEngine(secondEngine);
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,149 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry for tip results.
+ */
+
+"use strict";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
+  UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
+  UrlbarResult: "resource:///modules/UrlbarResult.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      // Disable search suggestions in the urlbar.
+      ["browser.urlbar.suggest.searches", false],
+      // Turn autofill off.
+      ["browser.urlbar.autoFill", false],
+    ],
+  });
+  await PlacesUtils.history.clear();
+  await PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(async function test() {
+  // Add a restricting provider that returns a preselected heuristic tip result.
+  let provider = new TipProvider([
+    Object.assign(
+      new UrlbarResult(
+        UrlbarUtils.RESULT_TYPE.TIP,
+        UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+        {
+          icon: "",
+          text: "This is a test tip.",
+          buttonText: "OK",
+          type: "test",
+        }
+      ),
+      { heuristic: true }
+    ),
+  ]);
+  UrlbarProvidersManager.registerProvider(provider);
+
+  const histograms = snapshotHistograms();
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  // Show the view and press enter to select the tip.
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    waitForFocus,
+    value: "test",
+    fireInputEvent: true,
+  });
+  EventUtils.synthesizeKey("KEY_Enter");
+
+  assertTelemetryResults(
+    histograms,
+    "tip",
+    0,
+    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
+  );
+
+  UrlbarProvidersManager.unregisterProvider(provider);
+  BrowserTestUtils.removeTab(tab);
+});
+
+/**
+ * A test URLBar provider.
+ */
+class TipProvider extends UrlbarProvider {
+  constructor(results) {
+    super();
+    this._results = results;
+  }
+  get name() {
+    return "TestProviderTip";
+  }
+  get type() {
+    return UrlbarUtils.PROVIDER_TYPE.PROFILE;
+  }
+  isActive(context) {
+    return true;
+  }
+  getPriority(context) {
+    return 1;
+  }
+  async startQuery(context, addCallback) {
+    context.preselected = true;
+    for (const result of this._results) {
+      addCallback(this, result);
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,151 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/**
+ * This file tests urlbar telemetry for topsite results.
+ */
+
+"use strict";
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AboutNewTab: "resource:///modules/AboutNewTab.jsm",
+  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
+});
+
+const EN_US_TOPSITES =
+  "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/";
+
+function snapshotHistograms() {
+  Services.telemetry.clearScalars();
+  Services.telemetry.clearEvents();
+  return {
+    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX"
+    ),
+    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
+    ),
+    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
+      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
+    ),
+    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
+      "FX_URLBAR_SELECTED_RESULT_METHOD"
+    ),
+    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
+  };
+}
+
+function assertTelemetryResults(histograms, type, index, method) {
+  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
+
+  TelemetryTestUtils.assertHistogram(
+    histograms.resultTypeHist,
+    UrlbarUtils.SELECTED_RESULT_TYPES[type],
+    1
+  );
+
+  TelemetryTestUtils.assertKeyedHistogramValue(
+    histograms.resultIndexByTypeHist,
+    type,
+    index,
+    1
+  );
+
+  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
+
+  TelemetryTestUtils.assertKeyedScalar(
+    TelemetryTestUtils.getProcessScalars("parent", true, true),
+    `urlbar.picked.${type}`,
+    index,
+    1
+  );
+}
+
+/**
+ * Updates the Top Sites feed.
+ * @param {function} condition
+ *   A callback that returns true after Top Sites are successfully updated.
+ * @param {boolean} searchShortcuts
+ *   True if Top Sites search shortcuts should be enabled.
+ */
+async function updateTopSites(condition, searchShortcuts = false) {
+  // Toggle the pref to clear the feed cache and force an update.
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.newtabpage.activity-stream.feeds.system.topsites", false],
+      ["browser.newtabpage.activity-stream.feeds.system.topsites", true],
+      [
+        "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts",
+        searchShortcuts,
+      ],
+    ],
+  });
+
+  // Wait for the feed to be updated.
+  await TestUtils.waitForCondition(() => {
+    let sites = AboutNewTab.getTopSites();
+    return condition(sites);
+  }, "Waiting for top sites to be updated");
+}
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.urlbar.suggest.topsites", true],
+      ["browser.newtabpage.activity-stream.default.sites", EN_US_TOPSITES],
+    ],
+  });
+  await updateTopSites(
+    sites => sites && sites.length == EN_US_TOPSITES.split(",").length
+  );
+});
+
+add_task(async function test() {
+  await BrowserTestUtils.withNewTab("about:blank", async () => {
+    let sites = AboutNewTab.getTopSites();
+    Assert.equal(
+      sites.length,
+      6,
+      "The test suite browser should have 6 Top Sites."
+    );
+
+    const histograms = snapshotHistograms();
+
+    await UrlbarTestUtils.promisePopupOpen(window, () => {
+      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
+    });
+
+    await UrlbarTestUtils.promiseSearchComplete(window);
+    Assert.equal(
+      UrlbarTestUtils.getResultCount(window),
+      sites.length,
+      "The number of results should be the same as the number of Top Sites (6)."
+    );
+    // Select the first resultm and confirm it.
+    let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
+    EventUtils.synthesizeKey("KEY_ArrowDown");
+    Assert.equal(
+      UrlbarTestUtils.getSelectedRowIndex(window),
+      0,
+      "The first result should be selected"
+    );
+
+    let loadPromise = BrowserTestUtils.waitForDocLoadAndStopIt(
+      result.url,
+      gBrowser.selectedBrowser
+    );
+    EventUtils.synthesizeKey("KEY_Enter");
+    await loadPromise;
+
+    assertTelemetryResults(
+      histograms,
+      "topsite",
+      0,
+      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
+    );
+    await UrlbarTestUtils.promisePopupClose(window, () => {
+      gURLBar.blur();
+    });
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.sjs firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.sjs
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.sjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.sjs	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,9 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function handleRequest(req, resp) {
+  let suffixes = ["foo", "bar"];
+  let data = [req.queryString, suffixes.map(s => req.queryString + s)];
+  resp.setHeader("Content-Type", "application/json", false);
+  resp.write(JSON.stringify(data));
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.xml firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.xml
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.xml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.xml	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>browser_urlbar_telemetry urlbarTelemetrySearchSuggestions.xml</ShortName>
+<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/urlbar/tests/browser/urlbarTelemetrySearchSuggestions.sjs?{searchTerms}"/>
+<Url type="text/html" method="GET" template="http://example.com" rel="searchform"/>
+</SearchPlugin>
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetryUrlbarDynamic.css firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetryUrlbarDynamic.css
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser/urlbarTelemetryUrlbarDynamic.css	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser/urlbarTelemetryUrlbarDynamic.css	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,45 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+.urlbarView-row[dynamicType=test] > .urlbarView-row-inner {
+  display: flex;
+  align-items: center;
+  min-height: 32px;
+  width: 100%;
+}
+
+.urlbarView-dynamic-test-button {
+  min-height: 16px;
+  padding: 8px;
+  border: none;
+  border-radius: 2px;
+  font-size: 0.93em;
+  color: inherit;
+  background-color: var(--urlbarView-button-background);
+  min-width: 8.75em;
+  text-align: center;
+  flex-basis: initial;
+  flex-shrink: 0;
+}
+
+.urlbarView-dynamic-test-button[selected] {
+  color: white;
+  background-color: var(--urlbarView-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-dynamic-test-button:hover {
+  color: white;
+  background-color: var(--urlbarView-primary-button-background-hover);
+}
+
+.urlbarView-dynamic-test-button:active {
+  color: white;
+  background-color: var(--urlbarView-primary-button-background-active);
+}
+
+.urlbarView-dynamic-test-buttonSpacer {
+  flex-basis: 48px;
+  flex-grow: 1;
+  flex-shrink: 1;
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser-tips/browser_interventions.js firefox-85.0+build1/browser/components/urlbar/tests/browser-tips/browser_interventions.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser-tips/browser_interventions.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser-tips/browser_interventions.js	2021-01-18 19:58:08.000000000 +0000
@@ -195,7 +195,7 @@
     Assert.ok(BrowserTestUtils.is_visible(helpButton));
     EventUtils.synthesizeMouseAtCenter(helpButton, {});
 
-    await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, helpUrl);
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, helpUrl);
     await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
     const scalars = TelemetryTestUtils.getProcessScalars("parent", true, true);
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js firefox-85.0+build1/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js	2021-01-18 19:58:08.000000000 +0000
@@ -157,7 +157,7 @@
   await setDefaultEngine("Google");
   await BrowserTestUtils.withNewTab("about:blank", async () => {
     await withDNSRedirect("www.google.com", "/", async url => {
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
       await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
       await checkTip(window, UrlbarProviderSearchTips.TIP_TYPE.REDIRECT, false);
 
@@ -327,7 +327,7 @@
   await setDefaultEngine("Google");
   await BrowserTestUtils.withNewTab("about:blank", async () => {
     await withDNSRedirect("www.google.com", "/", async url => {
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
       await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
       await checkTip(window, UrlbarProviderSearchTips.TIP_TYPE.REDIRECT, false);
 
@@ -383,7 +383,7 @@
   await setDefaultEngine("Google");
   await BrowserTestUtils.withNewTab("about:blank", async () => {
     await withDNSRedirect("www.google.com", "/", async url => {
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
       await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
       await checkTip(window, UrlbarProviderSearchTips.TIP_TYPE.REDIRECT, false);
 
@@ -490,7 +490,7 @@
     // Give it a big persistence so it doesn't go away on page load.
     note.persistence = 100;
     await withDNSRedirect("www.google.com", "/", async url => {
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
       await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
       await checkTip(window, UrlbarProviderSearchTips.TIP_TYPE.NONE);
       box.removeNotification(note, true);
@@ -516,7 +516,7 @@
   await setDefaultEngine("Google");
   await BrowserTestUtils.withNewTab("about:blank", async () => {
     await withDNSRedirect("www.google.com", "/", async url => {
-      await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
       await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
       await checkTip(window, UrlbarProviderSearchTips.TIP_TYPE.REDIRECT, false);
       // We're just looking for any target outside the Urlbar.
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/api.js firefox-85.0+build1/browser/components/urlbar/tests/ext/api.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/api.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/api.js	2021-01-18 19:58:08.000000000 +0000
@@ -39,6 +39,10 @@
             this._addDynamicViewTemplate(name, viewTemplate);
           },
 
+          attributionURL: this._getDefaultSettingsAPI(
+            "browser.partnerlink.attributionURL"
+          ),
+
           clearInput() {
             let window = BrowserWindowTracker.getTopWindow();
             window.gURLBar.value = "";
@@ -49,16 +53,23 @@
             "browser.urlbar.eventTelemetry.enabled"
           ),
 
+          extensionTimeout: this._getDefaultSettingsAPI(
+            "browser.urlbar.extension.timeout"
+          ),
+
           onViewUpdateRequested: new EventManager({
             context,
             name: "experiments.urlbar.onViewUpdateRequested",
             register: (fire, providerName) => {
               let provider = UrlbarProviderExtension.getOrCreate(providerName);
-              provider.setEventListener("getViewUpdate", result => {
-                return fire.async(result.payload).catch(error => {
-                  throw context.normalizeError(error);
-                });
-              });
+              provider.setEventListener(
+                "getViewUpdate",
+                (result, idsByName) => {
+                  return fire.async(result.payload, idsByName).catch(error => {
+                    throw context.normalizeError(error);
+                  });
+                }
+              );
               return () => provider.setEventListener("getViewUpdate", null);
             },
           }).api(),
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_attributionURL.js firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_attributionURL.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_attributionURL.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_attributionURL.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,16 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* global browser */
+
+// This tests the browser.experiments.urlbar.engagementTelemetry WebExtension
+// Experiment API.
+
+"use strict";
+
+add_settings_tasks("browser.partnerlink.attributionURL", "string", () => {
+  browser.test.onMessage.addListener(async (method, arg) => {
+    let result = await browser.experiments.urlbar.attributionURL[method](arg);
+    browser.test.sendMessage("done", result);
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_engagementTelemetry.js firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_engagementTelemetry.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_engagementTelemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_engagementTelemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,7 @@
 
 "use strict";
 
-add_settings_tasks("browser.urlbar.eventTelemetry.enabled", () => {
+add_settings_tasks("browser.urlbar.eventTelemetry.enabled", "boolean", () => {
   browser.test.onMessage.addListener(async (method, arg) => {
     let result = await browser.experiments.urlbar.engagementTelemetry[method](
       arg
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_extensionTimeout.js firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_extensionTimeout.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_extensionTimeout.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser_ext_urlbar_extensionTimeout.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,16 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* global browser */
+
+// This tests the browser.experiments.urlbar.engagementTelemetry WebExtension
+// Experiment API.
+
+"use strict";
+
+add_settings_tasks("browser.urlbar.extension.timeout", "number", () => {
+  browser.test.onMessage.addListener(async (method, arg) => {
+    let result = await browser.experiments.urlbar.extensionTimeout[method](arg);
+    browser.test.sendMessage("done", result);
+  });
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser.ini firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser.ini
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -9,8 +9,10 @@
   ../schema.json
   head.js
 
+[browser_ext_urlbar_attributionURL.js]
 [browser_ext_urlbar_clearInput.js]
 [browser_ext_urlbar_dynamicResult.js]
 support-files =
   dynamicResult.css
 [browser_ext_urlbar_engagementTelemetry.js]
+[browser_ext_urlbar_extensionTimeout.js]
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/head.js firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/head.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/browser/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -82,7 +82,18 @@
   return ext;
 }
 
-function add_settings_tasks(prefName, background) {
+/**
+ * Tests toggling a preference value via an experiments.urlbar API.
+ *
+ * @param {string} prefName
+ *   The name of the pref to be tested.
+ * @param {string} type
+ *   The type of the pref being set. One of "string", "boolean", or "number".
+ * @param {function} background
+ *   Boilerplate function that returns the value from calling the
+ *   browser.experiments.urlbar.prefName[method] APIs.
+ */
+function add_settings_tasks(prefName, type, background) {
   let defaultPreferences = new Preferences({ defaultBranch: true });
 
   let originalValue = defaultPreferences.get(prefName);
@@ -90,18 +101,38 @@
     defaultPreferences.set(prefName, originalValue);
   });
 
+  let firstValue, secondValue;
+  switch (type) {
+    case "string":
+      firstValue = "test value 1";
+      secondValue = "test value 2";
+      break;
+    case "number":
+      firstValue = 10;
+      secondValue = 100;
+      break;
+    case "boolean":
+      firstValue = false;
+      secondValue = true;
+      break;
+    default:
+      Assert.fail(
+        `"type" parameter must be one of "string", "number", or "boolean"`
+      );
+  }
+
   add_task(async function get() {
     let ext = await loadExtension({ background });
 
-    defaultPreferences.set(prefName, false);
+    defaultPreferences.set(prefName, firstValue);
     ext.sendMessage("get", {});
     let result = await ext.awaitMessage("done");
-    Assert.strictEqual(result.value, false);
+    Assert.strictEqual(result.value, firstValue);
 
-    defaultPreferences.set(prefName, true);
+    defaultPreferences.set(prefName, secondValue);
     ext.sendMessage("get", {});
     result = await ext.awaitMessage("done");
-    Assert.strictEqual(result.value, true);
+    Assert.strictEqual(result.value, secondValue);
 
     await ext.unload();
   });
@@ -109,112 +140,112 @@
   add_task(async function set() {
     let ext = await loadExtension({ background });
 
-    defaultPreferences.set(prefName, false);
-    ext.sendMessage("set", { value: true });
+    defaultPreferences.set(prefName, firstValue);
+    ext.sendMessage("set", { value: secondValue });
     let result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), true);
+    Assert.strictEqual(defaultPreferences.get(prefName), secondValue);
 
-    ext.sendMessage("set", { value: false });
+    ext.sendMessage("set", { value: firstValue });
     result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
 
     await ext.unload();
   });
 
   add_task(async function clear() {
     // no set()
-    defaultPreferences.set(prefName, false);
+    defaultPreferences.set(prefName, firstValue);
     let ext = await loadExtension({ background });
     ext.sendMessage("clear", {});
     let result = await ext.awaitMessage("done");
     Assert.strictEqual(result, false);
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
     await ext.unload();
 
-    // false -> true
-    defaultPreferences.set(prefName, false);
+    // firstValue -> secondValue
+    defaultPreferences.set(prefName, firstValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: true });
+    ext.sendMessage("set", { value: secondValue });
     await ext.awaitMessage("done");
     ext.sendMessage("clear", {});
     result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
     await ext.unload();
 
-    // true -> false
-    defaultPreferences.set(prefName, true);
+    // secondValue -> firstValue
+    defaultPreferences.set(prefName, secondValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: false });
+    ext.sendMessage("set", { value: firstValue });
     await ext.awaitMessage("done");
     ext.sendMessage("clear", {});
     result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), true);
+    Assert.strictEqual(defaultPreferences.get(prefName), secondValue);
     await ext.unload();
 
-    // false -> false
-    defaultPreferences.set(prefName, false);
+    // firstValue -> firstValue
+    defaultPreferences.set(prefName, firstValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: false });
+    ext.sendMessage("set", { value: firstValue });
     await ext.awaitMessage("done");
     ext.sendMessage("clear", {});
     result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
     await ext.unload();
 
-    // true -> true
-    defaultPreferences.set(prefName, true);
+    // secondValue -> secondValue
+    defaultPreferences.set(prefName, secondValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: true });
+    ext.sendMessage("set", { value: secondValue });
     await ext.awaitMessage("done");
     ext.sendMessage("clear", {});
     result = await ext.awaitMessage("done");
     Assert.strictEqual(result, true);
-    Assert.strictEqual(defaultPreferences.get(prefName), true);
+    Assert.strictEqual(defaultPreferences.get(prefName), secondValue);
     await ext.unload();
   });
 
   add_task(async function shutdown() {
     // no set()
-    defaultPreferences.set(prefName, false);
+    defaultPreferences.set(prefName, firstValue);
     let ext = await loadExtension({ background });
     await ext.unload();
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
 
-    // false -> true
-    defaultPreferences.set(prefName, false);
+    // firstValue -> secondValue
+    defaultPreferences.set(prefName, firstValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: true });
+    ext.sendMessage("set", { value: secondValue });
     await ext.awaitMessage("done");
     await ext.unload();
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
 
-    // true -> false
-    defaultPreferences.set(prefName, true);
+    // secondValue -> firstValue
+    defaultPreferences.set(prefName, secondValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: false });
+    ext.sendMessage("set", { value: firstValue });
     await ext.awaitMessage("done");
     await ext.unload();
-    Assert.strictEqual(defaultPreferences.get(prefName), true);
+    Assert.strictEqual(defaultPreferences.get(prefName), secondValue);
 
-    // false -> false
-    defaultPreferences.set(prefName, false);
+    // firstValue -> firstValue
+    defaultPreferences.set(prefName, firstValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: false });
+    ext.sendMessage("set", { value: firstValue });
     await ext.awaitMessage("done");
     await ext.unload();
-    Assert.strictEqual(defaultPreferences.get(prefName), false);
+    Assert.strictEqual(defaultPreferences.get(prefName), firstValue);
 
-    // true -> true
-    defaultPreferences.set(prefName, true);
+    // secondValue -> secondValue
+    defaultPreferences.set(prefName, secondValue);
     ext = await loadExtension({ background });
-    ext.sendMessage("set", { value: true });
+    ext.sendMessage("set", { value: secondValue });
     await ext.awaitMessage("done");
     await ext.unload();
-    Assert.strictEqual(defaultPreferences.get(prefName), true);
+    Assert.strictEqual(defaultPreferences.get(prefName), secondValue);
   });
 }
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/ext/schema.json firefox-85.0+build1/browser/components/urlbar/tests/ext/schema.json
--- firefox-84.0.2+build1/browser/components/urlbar/tests/ext/schema.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/ext/schema.json	2021-01-18 19:58:08.000000000 +0000
@@ -17,9 +17,17 @@
       }
     ],
     "properties": {
+      "attributionURL": {
+        "$ref": "types.Setting",
+        "description": "Gets or sets the attribution URL for the current browser session."
+      },
       "engagementTelemetry": {
         "$ref": "types.Setting",
         "description": "Enables or disables the engagement telemetry for the current browser session."
+      },
+      "extensionTimeout": {
+        "$ref": "types.Setting",
+        "description": "Sets the amount of time in ms that extensions have to return results to the browser.urlbar API."
       }
     },
     "events": [
@@ -32,6 +40,11 @@
             "name": "payload",
             "type": "object",
             "description": "The result's payload."
+          },
+          {
+            "name": "idsByName",
+            "type": "object",
+            "description": "A Map from an element's name, as defined by the provider; to its ID in the DOM, as defined by the browser."
           }
         ],
         "extraParameters": [
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/head.js firefox-85.0+build1/browser/components/urlbar/tests/unit/head.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/head.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -596,6 +596,7 @@
     heuristic = false,
     type = UrlbarUtils.RESULT_TYPE.SEARCH,
     source = UrlbarUtils.RESULT_SOURCE.SEARCH,
+    satisfiesAutofillThreshold = false,
   }
 ) {
   // Tail suggestion common cases, handled here to reduce verbosity in tests.
@@ -636,6 +637,12 @@
   if (uri) {
     payload.url = uri;
   }
+  if (providerName == "TabToSearch") {
+    payload.satisfiesAutofillThreshold = satisfiesAutofillThreshold;
+    if (payload.url.startsWith("www.")) {
+      payload.url = payload.url.substring(4);
+    }
+  }
 
   let result = new UrlbarResult(
     type,
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_originsAndQueries.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_originsAndQueries.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_originsAndQueries.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_originsAndQueries.js	2021-01-18 19:58:08.000000000 +0000
@@ -162,9 +162,16 @@
     await check_results({
       context,
       matches: [
+        makeVisitResult(context, {
+          source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+          uri: "http://www." + search + "/",
+          title: "http://www." + search + "/",
+          displayUrl: "http://www." + search,
+          heuristic: true,
+          providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
+        }),
         makeSearchResult(context, {
           engineName: ENGINE_NAME,
-          heuristic: true,
           providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
         }),
       ],
@@ -392,9 +399,16 @@
     await check_results({
       context,
       matches: [
+        makeVisitResult(context, {
+          source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+          uri: "http://www." + search + "/",
+          title: "http://www." + search + "/",
+          displayUrl: "http://www." + search,
+          heuristic: true,
+          providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
+        }),
         makeSearchResult(context, {
           engineName: ENGINE_NAME,
-          heuristic: true,
           providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
         }),
       ],
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_partial_search_engines.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_partial_search_engines.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_partial_search_engines.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_partial_search_engines.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * https://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Search engine origins are autofilled normally when they get over the
-// threshold, though certain origins redirect to localized subdomains, that
-// the user is unlikely to type, for example wikipedia.org => en.wikipedia.org.
-// This checks that we can autofill the search engine origin even if the user
-// types just "wiki".
-
-"use strict";
-
-add_task(async function setup() {
-  Services.prefs.setBoolPref("browser.urlbar.suggest.searches", false);
-  // Enable tab-to-search.
-  Services.prefs.setBoolPref("browser.urlbar.update2", true);
-  Services.prefs.setBoolPref("browser.urlbar.update2.tabToComplete", true);
-  // Disable tab-to-search onboarding results.
-  Services.prefs.setIntPref(
-    "browser.urlbar.tabToSearch.onboard.interactionsLeft",
-    0
-  );
-  Services.prefs.setBoolPref(
-    "browser.search.separatePrivateDefault.ui.enabled",
-    false
-  );
-
-  registerCleanupFunction(() => {
-    Services.prefs.clearUserPref("browser.urlbar.suggest.searches");
-    Services.prefs.clearUserPref(
-      "browser.search.separatePrivateDefault.ui.enabled"
-    );
-    Services.prefs.clearUserPref("browser.urlbar.update2");
-    Services.prefs.clearUserPref("browser.urlbar.update2.tabToComplete");
-    Services.prefs.clearUserPref(
-      "browser.urlbar.tabToSearch.onboard.interactionsLeft"
-    );
-  });
-
-  let url = "https://en.example.com/";
-  let engine = await Services.search.addEngineWithDetails("TestEngine", {
-    method: "GET",
-    template: url,
-    searchGetParams: "q={searchTerms}",
-  });
-  registerCleanupFunction(async () => {
-    await Services.search.removeEngine(engine);
-  });
-  // Make sure the engine domain would be autofilled.
-  await PlacesUtils.bookmarks.insert({
-    url,
-    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
-  });
-
-  info("Test matching cases");
-
-  for (let searchStr of ["e", "en", "ex", "example.com"]) {
-    info("Searching for " + searchStr);
-    let context = createContext(searchStr, { isPrivate: false });
-    let [title] = UrlbarUtils.stripPrefixAndTrim(url, {
-      stripHttp: true,
-      trimEmptyQuery: true,
-      trimSlash: true,
-    });
-    await check_results({
-      context,
-      autofilled:
-        searchStr + url.substring(url.indexOf(searchStr) + searchStr.length),
-      completed: url,
-      matches: [
-        makeVisitResult(context, {
-          uri: url,
-          title,
-          heuristic: true,
-        }),
-        makeSearchResult(context, {
-          engineName: engine.name,
-          engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
-          uri: "en.example.",
-          keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
-          query: "",
-          providerName: "TabToSearch",
-        }),
-      ],
-    });
-  }
-
-  info("Test a www engine");
-  let url2 = "https://www.it.mochi.com/";
-  let engine2 = await Services.search.addEngineWithDetails("TestEngine2", {
-    method: "GET",
-    template: url2,
-    searchGetParams: "q={searchTerms}",
-  });
-  registerCleanupFunction(async () => {
-    await Services.search.removeEngine(engine2);
-  });
-  // Make sure the engine domain would be autofilled.
-  await PlacesUtils.bookmarks.insert({
-    url: url2,
-    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
-  });
-
-  for (let searchStr of ["mo", "it", "it.m", "www.it"]) {
-    info("Searching for " + searchStr);
-    let context = createContext(searchStr, { isPrivate: false });
-    let [title] = UrlbarUtils.stripPrefixAndTrim(url2, {
-      stripHttp: true,
-      trimEmptyQuery: true,
-      trimSlash: true,
-    });
-    await check_results({
-      context,
-      autofilled:
-        searchStr + url2.substring(url2.indexOf(searchStr) + searchStr.length),
-      completed: url2,
-      matches: [
-        makeVisitResult(context, {
-          uri: url2,
-          title,
-          heuristic: true,
-        }),
-        makeSearchResult(context, {
-          engineName: engine2.name,
-          engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
-          uri: "www.it.mochi.",
-          keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
-          query: "",
-          providerName: "TabToSearch",
-        }),
-      ],
-    });
-  }
-
-  info("Test non-matching cases");
-
-  for (let searchStr of ["www.en", "www.ex", "https://ex"]) {
-    info("Searching for " + searchStr);
-    let context = createContext(searchStr, { isPrivate: false });
-    // We don't want to generate all the possible results here, just check
-    // the heuristic result is not autofill.
-    let controller = UrlbarTestUtils.newMockController();
-    await UrlbarProvidersManager.startQuery(context, controller);
-    Assert.ok(context.results[0].heuristic, "Check heuristic result");
-    Assert.notEqual(context.results[0].providerName, "Autofill");
-  }
-
-  info("Restricting to history should not autofill our bookmark");
-  let context = createContext("ex", {
-    isPrivate: false,
-    sources: [UrlbarUtils.RESULT_SOURCE.HISTORY],
-  });
-  let controller = UrlbarTestUtils.newMockController();
-  await UrlbarProvidersManager.startQuery(context, controller);
-  Assert.ok(context.results[0].heuristic, "Check heuristic result");
-  Assert.notEqual(context.results[0].providerName, "Autofill");
-});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_urls.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_urls.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_autofill_urls.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_autofill_urls.js	2021-01-18 19:58:08.000000000 +0000
@@ -132,3 +132,87 @@
   });
   await cleanupPlaces();
 });
+
+// autofill with case insensitive from history and bookmark.
+add_task(async function caseInsensitiveFromHistoryAndBookmark() {
+  Services.prefs.setBoolPref("browser.urlbar.suggest.bookmark", true);
+  Services.prefs.setBoolPref("browser.urlbar.suggest.history", true);
+
+  await PlacesTestUtils.addVisits([
+    {
+      uri: "http://example.com/foo",
+    },
+  ]);
+
+  await testCaseInsensitive();
+
+  Services.prefs.clearUserPref("browser.urlbar.suggest.bookmark");
+  Services.prefs.clearUserPref("browser.urlbar.suggest.history");
+  await cleanupPlaces();
+});
+
+// autofill with case insensitive from history.
+add_task(async function caseInsensitiveFromHistory() {
+  Services.prefs.setBoolPref("browser.urlbar.suggest.bookmark", false);
+  Services.prefs.setBoolPref("browser.urlbar.suggest.history", true);
+
+  await PlacesTestUtils.addVisits([
+    {
+      uri: "http://example.com/foo",
+    },
+  ]);
+
+  await testCaseInsensitive();
+
+  Services.prefs.clearUserPref("browser.urlbar.suggest.bookmark");
+  Services.prefs.clearUserPref("browser.urlbar.suggest.history");
+  await cleanupPlaces();
+});
+
+// autofill with case insensitive from bookmark.
+add_task(async function caseInsensitiveFromBookmark() {
+  Services.prefs.setBoolPref("browser.urlbar.suggest.bookmark", true);
+  Services.prefs.setBoolPref("browser.urlbar.suggest.history", false);
+
+  await PlacesTestUtils.addBookmarkWithDetails({
+    uri: "http://example.com/foo",
+  });
+
+  await testCaseInsensitive();
+
+  Services.prefs.clearUserPref("browser.urlbar.suggest.bookmark");
+  Services.prefs.clearUserPref("browser.urlbar.suggest.history");
+  await cleanupPlaces();
+});
+
+async function testCaseInsensitive() {
+  const testData = [
+    {
+      input: "example.com/F",
+      expectedAutofill: "example.com/Foo",
+    },
+    {
+      // Test with prefix.
+      input: "http://example.com/F",
+      expectedAutofill: "http://example.com/Foo",
+    },
+  ];
+
+  for (const { input, expectedAutofill } of testData) {
+    const context = createContext(input, {
+      isPrivate: false,
+    });
+    await check_results({
+      context,
+      autofilled: expectedAutofill,
+      completed: "http://example.com/foo",
+      matches: [
+        makeVisitResult(context, {
+          uri: "http://example.com/foo",
+          title: "example.com/foo",
+          heuristic: true,
+        }),
+      ],
+    });
+  }
+}
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_avoid_middle_complete.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_avoid_middle_complete.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_avoid_middle_complete.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_avoid_middle_complete.js	2021-01-18 19:58:08.000000000 +0000
@@ -152,9 +152,16 @@
   await check_results({
     context,
     matches: [
+      makeVisitResult(context, {
+        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+        uri: "http://www.ham/",
+        title: "http://www.ham/",
+        displayUrl: "http://www.ham",
+        heuristic: true,
+      }),
       makeSearchResult(context, {
         engineName: ENGINE_NAME,
-        heuristic: true,
+        query: "www.ham",
       }),
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_casing.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_casing.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_casing.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_casing.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const ENGINE_NAME = "engine-suggestions.xml";
+const AUTOFILL_PROVIDERNAME = "Autofill";
 const HEURISTIC_FALLBACK_PROVIDERNAME = "HeuristicFallback";
 const UNIFIEDCOMPLETE_PROVIDERNAME = "UnifiedComplete";
 
@@ -42,19 +43,16 @@
   let context = createContext("mozilla.org/T", { isPrivate: false });
   await check_results({
     context,
+    autofilled: "mozilla.org/Test/",
+    completed: "http://mozilla.org/test/",
     matches: [
       makeVisitResult(context, {
-        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        uri: "http://mozilla.org/T",
-        title: "http://mozilla.org/T",
-        iconUri: "page-icon:http://mozilla.org/",
-        heuristic: true,
-        providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
-      }),
-      makeVisitResult(context, {
+        source: UrlbarUtils.RESULT_SOURCE.HISTORY,
         uri: "http://mozilla.org/test/",
-        title: "test visit for http://mozilla.org/test/",
-        providerName: UNIFIEDCOMPLETE_PROVIDERNAME,
+        title: "mozilla.org/test/",
+        iconUri: "page-icon:http://mozilla.org/test/",
+        heuristic: true,
+        providerName: AUTOFILL_PROVIDERNAME,
       }),
     ],
   });
@@ -90,19 +88,16 @@
   let context = createContext("mOzilla.org/t", { isPrivate: false });
   await check_results({
     context,
+    autofilled: "mOzilla.org/test/",
+    completed: "http://mozilla.org/Test/",
     matches: [
       makeVisitResult(context, {
-        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        uri: "http://mozilla.org/t",
-        title: "http://mozilla.org/t",
-        iconUri: "page-icon:http://mozilla.org/",
-        heuristic: true,
-        providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
-      }),
-      makeVisitResult(context, {
+        source: UrlbarUtils.RESULT_SOURCE.HISTORY,
         uri: "http://mozilla.org/Test/",
-        title: "test visit for http://mozilla.org/Test/",
-        providerName: UNIFIEDCOMPLETE_PROVIDERNAME,
+        title: "mozilla.org/Test/",
+        iconUri: "page-icon:http://mozilla.org/Test/",
+        heuristic: true,
+        providerName: AUTOFILL_PROVIDERNAME,
       }),
     ],
   });
@@ -190,19 +185,16 @@
   let context = createContext("http://mOzilla.org/t", { isPrivate: false });
   await check_results({
     context,
+    autofilled: "http://mOzilla.org/test/",
+    completed: "http://mozilla.org/Test/",
     matches: [
       makeVisitResult(context, {
-        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        uri: "http://mozilla.org/t",
-        title: "http://mozilla.org/t",
-        iconUri: "page-icon:http://mozilla.org/",
-        heuristic: true,
-        providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
-      }),
-      makeVisitResult(context, {
+        source: UrlbarUtils.RESULT_SOURCE.HISTORY,
         uri: "http://mozilla.org/Test/",
-        title: "test visit for http://mozilla.org/Test/",
-        providerName: UNIFIEDCOMPLETE_PROVIDERNAME,
+        title: "mozilla.org/Test/",
+        iconUri: "page-icon:http://mozilla.org/Test/",
+        heuristic: true,
+        providerName: AUTOFILL_PROVIDERNAME,
       }),
     ],
   });
@@ -238,19 +230,16 @@
   let context = createContext("http://www.mOzilla.org/t", { isPrivate: false });
   await check_results({
     context,
+    autofilled: "http://www.mOzilla.org/test/",
+    completed: "http://www.mozilla.org/Test/",
     matches: [
       makeVisitResult(context, {
-        source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        uri: "http://www.mozilla.org/t",
-        title: "http://www.mozilla.org/t",
-        iconUri: "page-icon:http://www.mozilla.org/",
-        heuristic: true,
-        providerName: HEURISTIC_FALLBACK_PROVIDERNAME,
-      }),
-      makeVisitResult(context, {
+        source: UrlbarUtils.RESULT_SOURCE.HISTORY,
         uri: "http://www.mozilla.org/Test/",
-        title: "test visit for http://www.mozilla.org/Test/",
-        providerName: UNIFIEDCOMPLETE_PROVIDERNAME,
+        title: "www.mozilla.org/Test/",
+        iconUri: "page-icon:http://www.mozilla.org/Test/",
+        heuristic: true,
+        providerName: AUTOFILL_PROVIDERNAME,
       }),
     ],
   });
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,6 @@
   Services.prefs.setBoolPref("browser.search.suggest.enabled", false);
   // Enable tab-to-search.
   Services.prefs.setBoolPref("browser.urlbar.update2", true);
-  Services.prefs.setBoolPref("browser.urlbar.update2.tabToComplete", true);
   // Disable tab-to-search onboarding results. Those are covered in
   // browser/components/urlbar/tests/browser/browser_tabToSearch.js.
   Services.prefs.setIntPref(
@@ -65,6 +64,24 @@
       }),
     ],
   });
+
+  info("Repeat the search but with tab-to-search disabled through pref.");
+  Services.prefs.setBoolPref("browser.urlbar.suggest.engines", false);
+  await check_results({
+    context,
+    autofilled: "example.com/",
+    completed: "https://example.com/",
+    matches: [
+      makeVisitResult(context, {
+        uri: "https://example.com/",
+        title: "https://example.com",
+        heuristic: true,
+        providerName: "Autofill",
+      }),
+    ],
+  });
+  Services.prefs.clearUserPref("browser.urlbar.suggest.engines");
+
   await cleanupPlaces();
 });
 
@@ -351,25 +368,20 @@
 });
 
 add_task(async function test_publicSuffix() {
-  info(
-    "Tab-to-search results appear also in case of different subdomain and suffix."
-  );
+  info("Tab-to-search results appear also in case of partial host match.");
   let engine = await Services.search.addEngineWithDetails("MyTest", {
     template: "https://test.mytest.it/?search={searchTerms}",
   });
-  // The top level domain will be autofilled, not the full domain.
-  await PlacesTestUtils.addVisits(["https://mytest.com/"]);
+  await PlacesTestUtils.addVisits(["https://test.mytest.it/"]);
   let context = createContext("my", { isPrivate: false });
   await check_results({
     context,
-    autofilled: "mytest.com/",
-    completed: "https://mytest.com/",
     matches: [
-      makeVisitResult(context, {
-        uri: "https://mytest.com/",
-        title: "https://mytest.com",
+      makeSearchResult(context, {
+        engineName: Services.search.defaultEngine.name,
+        engineIconUri: Services.search.defaultEngine.iconURI?.spec,
         heuristic: true,
-        providerName: "Autofill",
+        providerName: "HeuristicFallback",
       }),
       makeSearchResult(context, {
         engineName: engine.name,
@@ -378,6 +390,12 @@
         keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
         query: "",
         providerName: "TabToSearch",
+        satisfiesAutofillThreshold: true,
+      }),
+      makeVisitResult(context, {
+        uri: "https://test.mytest.it/",
+        title: "test visit for https://test.mytest.it/",
+        providerName: "UnifiedComplete",
       }),
     ],
   });
@@ -409,3 +427,55 @@
   await cleanupPlaces();
   await Services.search.removeEngine(suffixEngine);
 });
+
+add_task(async function test_disabledEngine() {
+  info("Tab-to-search results does not appear for a Pref-disabled engine.");
+  let engine = await Services.search.addEngineWithDetails("Disabled", {
+    template: "https://disabled.com/?search={searchTerms}",
+  });
+  await PlacesTestUtils.addVisits(["https://disabled.com/"]);
+  let context = createContext("dis", { isPrivate: false });
+
+  info("Sanity check that the engine would appear.");
+  await check_results({
+    context,
+    autofilled: "disabled.com/",
+    completed: "https://disabled.com/",
+    matches: [
+      makeVisitResult(context, {
+        uri: "https://disabled.com/",
+        title: "https://disabled.com",
+        heuristic: true,
+        providerName: "Autofill",
+      }),
+      makeSearchResult(context, {
+        engineName: engine.name,
+        engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
+        uri: UrlbarUtils.stripPublicSuffixFromHost(engine.getResultDomain()),
+        keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
+        query: "",
+        providerName: "TabToSearch",
+      }),
+    ],
+  });
+
+  info("Now disable the engine.");
+  Services.prefs.setCharPref("browser.search.hiddenOneOffs", engine.name);
+  await check_results({
+    context,
+    autofilled: "disabled.com/",
+    completed: "https://disabled.com/",
+    matches: [
+      makeVisitResult(context, {
+        uri: "https://disabled.com/",
+        title: "https://disabled.com",
+        heuristic: true,
+        providerName: "Autofill",
+      }),
+    ],
+  });
+  Services.prefs.clearUserPref("browser.search.hiddenOneOffs");
+
+  await cleanupPlaces();
+  await Services.search.removeEngine(engine);
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,154 @@
+/* Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Search engine origins are autofilled normally when they get over the
+// threshold, though certain origins redirect to localized subdomains, that
+// the user is unlikely to type, for example wikipedia.org => en.wikipedia.org.
+// We should get a tab to search result also for these cases, where a normal
+// autofill wouldn't happen.
+
+"use strict";
+
+add_task(async function setup() {
+  Services.prefs.setBoolPref("browser.urlbar.suggest.searches", false);
+  // Enable tab-to-search.
+  Services.prefs.setBoolPref("browser.urlbar.update2", true);
+  // Disable tab-to-search onboarding results.
+  Services.prefs.setIntPref(
+    "browser.urlbar.tabToSearch.onboard.interactionsLeft",
+    0
+  );
+  Services.prefs.setBoolPref(
+    "browser.search.separatePrivateDefault.ui.enabled",
+    false
+  );
+
+  registerCleanupFunction(() => {
+    Services.prefs.clearUserPref("browser.urlbar.suggest.searches");
+    Services.prefs.clearUserPref(
+      "browser.search.separatePrivateDefault.ui.enabled"
+    );
+    Services.prefs.clearUserPref("browser.urlbar.update2");
+    Services.prefs.clearUserPref("browser.urlbar.update2.tabToComplete");
+    Services.prefs.clearUserPref(
+      "browser.urlbar.tabToSearch.onboard.interactionsLeft"
+    );
+  });
+
+  let url = "https://en.example.com/";
+  let engine = await Services.search.addEngineWithDetails("TestEngine", {
+    method: "GET",
+    template: url,
+    searchGetParams: "q={searchTerms}",
+  });
+  let defaultEngine = await Services.search.getDefault();
+  await Services.search.setDefault(engine);
+  registerCleanupFunction(async () => {
+    await Services.search.setDefault(defaultEngine);
+    await Services.search.removeEngine(engine);
+  });
+  // Make sure the engine domain would be autofilled.
+  await PlacesUtils.bookmarks.insert({
+    url,
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark",
+  });
+
+  info("Test matching cases");
+
+  for (let searchStr of ["ex", "example.c"]) {
+    info("Searching for " + searchStr);
+    let context = createContext(searchStr, { isPrivate: false });
+    await check_results({
+      context,
+      matches: [
+        makeSearchResult(context, {
+          engineName: Services.search.defaultEngine.name,
+          providerName: "HeuristicFallback",
+          heuristic: true,
+        }),
+        makeSearchResult(context, {
+          engineName: engine.name,
+          engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
+          uri: "en.example.",
+          keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
+          query: "",
+          providerName: "TabToSearch",
+          satisfiesAutofillThreshold: true,
+        }),
+        makeBookmarkResult(context, {
+          uri: url,
+          title: "bookmark",
+        }),
+      ],
+    });
+  }
+
+  info("Test a www engine");
+  let url2 = "https://www.it.mochi.com/";
+  let engine2 = await Services.search.addEngineWithDetails("TestEngine2", {
+    method: "GET",
+    template: url2,
+    searchGetParams: "q={searchTerms}",
+  });
+  registerCleanupFunction(async () => {
+    await Services.search.removeEngine(engine2);
+  });
+  // Make sure the engine domain would be autofilled.
+  await PlacesUtils.bookmarks.insert({
+    url: url2,
+    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+    title: "bookmark",
+  });
+
+  for (let searchStr of ["mo", "mochi.c"]) {
+    info("Searching for " + searchStr);
+    let context = createContext(searchStr, { isPrivate: false });
+    await check_results({
+      context,
+      matches: [
+        makeSearchResult(context, {
+          engineName: Services.search.defaultEngine.name,
+          providerName: "HeuristicFallback",
+          heuristic: true,
+        }),
+        makeSearchResult(context, {
+          engineName: engine2.name,
+          engineIconUri: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
+          uri: "www.it.mochi.",
+          keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
+          query: "",
+          providerName: "TabToSearch",
+          satisfiesAutofillThreshold: true,
+        }),
+        makeBookmarkResult(context, {
+          uri: url2,
+          title: "bookmark",
+        }),
+      ],
+    });
+  }
+
+  info("Test non-matching cases");
+
+  for (let searchStr of ["www.en", "www.ex", "https://ex"]) {
+    info("Searching for " + searchStr);
+    let context = createContext(searchStr, { isPrivate: false });
+    // We don't want to generate all the possible results here, just check
+    // the heuristic result is not autofill.
+    let controller = UrlbarTestUtils.newMockController();
+    await UrlbarProvidersManager.startQuery(context, controller);
+    Assert.ok(context.results[0].heuristic, "Check heuristic result");
+    Assert.notEqual(context.results[0].providerName, "Autofill");
+  }
+
+  info("Restricting to history should not autofill our bookmark");
+  let context = createContext("ex", {
+    isPrivate: false,
+    sources: [UrlbarUtils.RESULT_SOURCE.HISTORY],
+  });
+  let controller = UrlbarTestUtils.newMockController();
+  await UrlbarProvidersManager.startQuery(context, controller);
+  Assert.ok(context.results[0].heuristic, "Check heuristic result");
+  Assert.notEqual(context.results[0].providerName, "Autofill");
+});
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_search_engine_host.js firefox-85.0+build1/browser/components/urlbar/tests/unit/test_search_engine_host.js
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_search_engine_host.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_search_engine_host.js	2021-01-18 19:58:08.000000000 +0000
@@ -54,7 +54,6 @@
 
 add_task(async function test_searchEngine_noautoFill() {
   Services.prefs.setBoolPref("browser.urlbar.update2", true);
-  Services.prefs.setBoolPref("browser.urlbar.update2.tabToComplete", true);
   Services.prefs.setIntPref(
     "browser.urlbar.tabToSearch.onboard.interactionsLeft",
     0
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.jsm firefox-85.0+build1/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -54,6 +54,26 @@
   Assert.ok(matchedEngine2);
 });
 
+add_task(async function onlyEnabled_option_nomatch() {
+  let engine = await Services.search.getDefault();
+  let domain = engine.getResultDomain();
+  let token = domain.substr(0, 1);
+  Services.prefs.setCharPref("browser.search.hiddenOneOffs", engine.name);
+  let matchedEngines = await UrlbarSearchUtils.enginesForDomainPrefix(token, {
+    onlyEnabled: true,
+  });
+  Assert.ok(
+    !matchedEngines.length || matchedEngines[0].getResultDomain() != domain
+  );
+  Services.prefs.clearUserPref("browser.search.hiddenOneOffs");
+  matchedEngines = await UrlbarSearchUtils.enginesForDomainPrefix(token, {
+    onlyEnabled: true,
+  });
+  Assert.ok(
+    matchedEngines.length && matchedEngines[0].getResultDomain() == domain
+  );
+});
+
 add_task(async function add_search_engine_match() {
   let promiseTopic = promiseSearchTopic("engine-added");
   Assert.equal(
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/unit/xpcshell.ini firefox-85.0+build1/browser/components/urlbar/tests/unit/xpcshell.ini
--- firefox-84.0.2+build1/browser/components/urlbar/tests/unit/xpcshell.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/unit/xpcshell.ini	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,6 @@
 [test_autofill_origins.js]
 [test_autofill_originsAndQueries.js]
 [test_autofill_prefix_fallback.js]
-[test_autofill_partial_search_engines.js]
 [test_autofill_search_engines.js]
 [test_autofill_search_engine_aliases.js]
 [test_autofill_urls.js]
@@ -32,6 +31,7 @@
 [test_providersManager_filtering.js]
 [test_providersManager_maxResults.js]
 [test_providerTabToSearch.js]
+[test_providerTabToSearch_partialHost.js]
 [test_providerUnifiedComplete.js]
 [test_providerUnifiedComplete_duplicate_entries.js]
 [test_query_url.js]
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/tests/UrlbarTestUtils.jsm firefox-85.0+build1/browser/components/urlbar/tests/UrlbarTestUtils.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/tests/UrlbarTestUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/tests/UrlbarTestUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -403,12 +403,13 @@
       "Urlbar should never be in search mode without the corresponding attribute."
     );
 
-    if (!expectedSearchMode) {
-      this.Assert.ok(
-        !window.gURLBar.searchMode,
-        "gURLBar.searchMode not expected"
-      );
+    this.Assert.equal(
+      !!window.gURLBar.searchMode,
+      !!expectedSearchMode,
+      "gURLBar.searchMode should exist as expected"
+    );
 
+    if (!expectedSearchMode) {
       // Check the input's placeholder.
       const prefName =
         "browser.urlbar.placeholderName" +
@@ -425,10 +426,28 @@
     }
 
     // Default to full search mode for less verbose tests.
+    expectedSearchMode = { ...expectedSearchMode };
     if (!expectedSearchMode.hasOwnProperty("isPreview")) {
       expectedSearchMode.isPreview = false;
     }
 
+    // expectedSearchMode may come from UrlbarUtils.LOCAL_SEARCH_MODES.  The
+    // objects in that array include useful metadata like icon URIs and pref
+    // names that are not usually included in actual search mode objects.  For
+    // convenience, ignore those properties if they aren't also present in the
+    // urlbar's actual search mode object.
+    let ignoreProperties = ["icon", "pref", "restrict"];
+    for (let prop of ignoreProperties) {
+      if (prop in expectedSearchMode && !(prop in window.gURLBar.searchMode)) {
+        if (this._testScope) {
+          this._testScope.info(
+            `Ignoring unimportant property '${prop}' in expected search mode`
+          );
+        }
+        delete expectedSearchMode[prop];
+      }
+    }
+
     this.Assert.deepEqual(
       window.gURLBar.searchMode,
       expectedSearchMode,
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarController.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarController.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarController.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarController.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,7 @@
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
-  BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   FormHistory: "resource://gre/modules/FormHistory.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
@@ -518,8 +518,9 @@
       // will happen when you press the Enter key.  Treat it as no selection.
       selectedResult = resultIndex > 0 || !result.heuristic ? resultIndex : -1;
     }
-    BrowserUsageTelemetry.recordUrlbarSelectedResultMethod(
+    BrowserSearchTelemetry.recordSearchSuggestionSelectionMethod(
       event,
+      "urlbar",
       selectedResult,
       this._userSelectionBehavior
     );
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarInput.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarInput.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarInput.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarInput.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,7 @@
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
-  BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
+  BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.jsm",
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   ExtensionSearchHandler: "resource://gre/modules/ExtensionSearchHandler.jsm",
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
@@ -678,6 +678,22 @@
     element = null,
     browser = this.window.gBrowser.selectedBrowser
   ) {
+    // When a one-off is selected, we restyle heuristic results to look like
+    // search results. In the unlikely event that they are clicked, instead of
+    // picking the results as usual, we confirm search mode, same as if the user
+    // had selected them and pressed the enter key. Restyling results in this
+    // manner was agreed on as a compromise between consistent UX and
+    // engineering effort. See review discussion at bug 1667766.
+    if (
+      result.heuristic &&
+      this.searchMode?.isPreview &&
+      this.view.oneOffSearchButtons.selectedButton
+    ) {
+      this.confirmSearchMode();
+      this.search(this.value);
+      return;
+    }
+
     let originalUntrimmedValue = this.untrimmedValue;
     let isCanonized = this.setValueFromResult(result, event);
     let where = this._whereToOpen(event);
@@ -685,19 +701,8 @@
       allowInheritPrincipal: false,
     };
 
-    // When update2 is enabled and a one-off is selected, we restyle URL
-    // heuristic results to look like search results. In the unlikely event that
-    // they are clicked, we confirm search mode instead of navigating to the
-    // URL. This was agreed on as a compromise between consistent UX and
-    // engineering effort. See review discussion at bug 1667766.
-    let urlResultWillConfirmSearchMode =
-      this.searchMode &&
-      result.heuristic &&
-      result.type == UrlbarUtils.RESULT_TYPE.URL &&
-      this.view.oneOffSearchButtons.selectedButton;
-
     let selIndex = result.rowIndex;
-    if (!result.payload.keywordOffer && !urlResultWillConfirmSearchMode) {
+    if (!result.payload.keywordOffer) {
       this.view.close(/* elementPicked */ true);
     }
 
@@ -719,11 +724,6 @@
 
     switch (result.type) {
       case UrlbarUtils.RESULT_TYPE.URL: {
-        if (urlResultWillConfirmSearchMode) {
-          this.confirmSearchMode();
-          this.search(this.value);
-          return;
-        }
         // Bug 1578856: both the provider and the docshell run heuristics to
         // decide how to handle a non-url string, either fixing it to a url, or
         // searching for it.
@@ -904,20 +904,31 @@
         break;
       }
       case UrlbarUtils.RESULT_TYPE.DYNAMIC: {
-        this.handleRevert();
-        this.controller.engagementEvent.record(event, {
-          selIndex,
-          searchString: this._lastSearchString,
-          selType: this.controller.engagementEvent.typeFromElement(element),
-          provider: result.providerName,
-        });
+        url = result.payload.url;
+        // Do not revert the Urlbar if we're going to navigate. We want the URL
+        // populated so we can navigate to it.
+        if (!url || !result.payload.shouldNavigate) {
+          this.handleRevert();
+        }
+
         let provider = UrlbarProvidersManager.getProvider(result.providerName);
         if (!provider) {
           Cu.reportError(`Provider not found: ${result.providerName}`);
           return;
         }
         provider.tryMethod("pickResult", result, element);
-        return;
+
+        // If we won't be navigating, this is the end of the engagement.
+        if (!url || !result.payload.shouldNavigate) {
+          this.controller.engagementEvent.record(event, {
+            selIndex,
+            searchString: this._lastSearchString,
+            selType: this.controller.engagementEvent.typeFromElement(element),
+            provider: result.providerName,
+          });
+          return;
+        }
+        break;
       }
       case UrlbarUtils.RESULT_TYPE.OMNIBOX: {
         this.controller.engagementEvent.record(event, {
@@ -1297,6 +1308,8 @@
    * @param {string} value
    *   The input's value will be set to this value, and the search will
    *   use it as its query.
+   * @param {UrlbarUtils.WEB_ENGINE_NAMES} [options.searchEngine]
+   *   Search engine to use when the search is using a known alias.
    * @param {UrlbarUtils.SEARCH_MODE_ENTRY} [options.searchModeEntry]
    *   If provided, we will record this parameter as the search mode entry point
    *   in Telemetry. Consumers should provide this if they expect their call
@@ -1305,7 +1318,7 @@
    *   If true, the urlbar will be focused.  If false, the focus will remain
    *   unchanged.
    */
-  search(value, { searchModeEntry, focus = true } = {}) {
+  search(value, { searchEngine, searchModeEntry, focus = true } = {}) {
     if (focus) {
       this.focus();
     }
@@ -1316,12 +1329,8 @@
     if (UrlbarPrefs.get("update2")) {
       // Check if the string starts with a restriction token.
       searchMode = UrlbarUtils.searchModeForToken(tokens[0]);
-      if (!searchMode) {
-        // Check if the string starts with an engine alias.
-        let engine = Services.search.getEngineByAlias(tokens[0]);
-        if (engine) {
-          searchMode = { engineName: engine.name };
-        }
+      if (!searchMode && searchEngine) {
+        searchMode = { engineName: searchEngine.name };
       }
     }
 
@@ -1516,7 +1525,7 @@
         this.valueIsTyped = true;
         if (!searchMode.isPreview && !areSearchModesSame) {
           try {
-            BrowserUsageTelemetry.recordSearchMode(searchMode);
+            BrowserSearchTelemetry.recordSearchMode(searchMode);
           } catch (ex) {
             Cu.reportError(ex);
           }
@@ -1549,7 +1558,11 @@
         engineName: UrlbarSearchUtils.getDefaultEngine(this.isPrivate).name,
         entry: "shortcut",
       };
-      this.search("");
+      // The searchMode setter clears the input if pageproxystate is valid, so
+      // we know at this point this.value will either be blank or the user's
+      // typed string.
+      this.search(this.value);
+      this.select();
     } else {
       this.search(UrlbarTokenizer.RESTRICT.SEARCH);
     }
@@ -2198,7 +2211,8 @@
     details.isOneOff = isOneOff;
     details.type = eventType;
 
-    this.window.BrowserSearch.recordSearchInTelemetry(
+    BrowserSearchTelemetry.recordSearch(
+      this.window.gBrowser,
       engine,
       // Without checking !isOneOff, we might record the string
       // oneoff_urlbar-searchmode in the SEARCH_COUNTS probe (in addition to
@@ -2265,7 +2279,18 @@
     } else {
       value = value + suffix;
     }
-    value = "http://www." + value;
+
+    try {
+      const info = Services.uriFixup.getFixupURIInfo(
+        value,
+        Ci.nsIURIFixup.FIXUP_FLAGS_MAKE_ALTERNATE_URI
+      );
+      value = info.fixedURI.spec;
+    } catch (ex) {
+      Cu.reportError(
+        `An error occured while trying to fixup "${value}": ${ex}`
+      );
+    }
 
     this.value = value;
     return value;
@@ -2957,9 +2982,10 @@
     // We should do nothing during composition or if composition was canceled
     // and we didn't close the popup on composition start.
     if (
-      compositionState == UrlbarUtils.COMPOSITION.COMPOSING ||
-      (compositionState == UrlbarUtils.COMPOSITION.CANCELED &&
-        !compositionClosedPopup)
+      UrlbarPrefs.get("imeCompositionClosesPanel") &&
+      (compositionState == UrlbarUtils.COMPOSITION.COMPOSING ||
+        (compositionState == UrlbarUtils.COMPOSITION.CANCELED &&
+          !compositionClosedPopup))
     ) {
       return;
     }
@@ -3141,6 +3167,10 @@
     }
     this._compositionState = UrlbarUtils.COMPOSITION.COMPOSING;
 
+    if (!UrlbarPrefs.get("imeCompositionClosesPanel")) {
+      return;
+    }
+
     // Close the view. This will also stop searching.
     if (this.view.isOpen) {
       // We're closing the view, but we want to retain search mode if the
@@ -3167,11 +3197,13 @@
       throw new Error("Trying to stop a non existing composition?");
     }
 
-    // Clear the selection and the cached result, since they refer to the
-    // state before this composition. A new input event will be generated after
-    // this.
-    this.view.clearSelection();
-    this._resultForCurrentValue = null;
+    if (UrlbarPrefs.get("imeCompositionClosesPanel")) {
+      // Clear the selection and the cached result, since they refer to the
+      // state before this composition. A new input even will be generated
+      // after this.
+      this.view.clearSelection();
+      this._resultForCurrentValue = null;
+    }
 
     // We can't yet retrieve the committed value from the editor, since it isn't
     // completely committed yet. We'll handle it at the next input event.
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -305,36 +305,48 @@
     }
 
     if (result.providerName == "TabToSearch") {
-      // Discard tab-to-search results if we're not autofilling a URL or
-      // a tab-to-search result was added already.
-      if (
-        state.context.heuristicResult.type != UrlbarUtils.RESULT_TYPE.URL ||
-        !state.context.heuristicResult.autofill ||
-        !state.canAddTabToSearch
-      ) {
+      // Discard the result if a tab-to-search result was added already.
+      if (!state.canAddTabToSearch) {
         return false;
       }
 
-      let autofillHostname = new URL(state.context.heuristicResult.payload.url)
-        .hostname;
-      let [autofillDomain] = UrlbarUtils.stripPrefixAndTrim(autofillHostname, {
-        stripWww: true,
-      });
-      // Strip the public suffix because we want to allow matching "domain.it"
-      // with "domain.com".
-      autofillDomain = UrlbarUtils.stripPublicSuffixFromHost(autofillDomain);
-      if (!autofillDomain) {
-        return false;
-      }
+      if (!result.payload.satisfiesAutofillThreshold) {
+        // Discard the result if the heuristic result is not autofill.
+        if (
+          state.context.heuristicResult.type != UrlbarUtils.RESULT_TYPE.URL ||
+          !state.context.heuristicResult.autofill
+        ) {
+          return false;
+        }
 
-      // For tab-to-search results, result.payload.url is the engine's domain
-      // with the public suffix already stripped, for example "www.mozilla.".
-      let [engineDomain] = UrlbarUtils.stripPrefixAndTrim(result.payload.url, {
-        stripWww: true,
-      });
-      // Discard if the engine domain does not end with the autofilled one.
-      if (!engineDomain.endsWith(autofillDomain)) {
-        return false;
+        let autofillHostname = new URL(
+          state.context.heuristicResult.payload.url
+        ).hostname;
+        let [autofillDomain] = UrlbarUtils.stripPrefixAndTrim(
+          autofillHostname,
+          {
+            stripWww: true,
+          }
+        );
+        // Strip the public suffix because we want to allow matching "domain.it"
+        // with "domain.com".
+        autofillDomain = UrlbarUtils.stripPublicSuffixFromHost(autofillDomain);
+        if (!autofillDomain) {
+          return false;
+        }
+
+        // For tab-to-search results, result.payload.url is the engine's domain
+        // with the public suffix already stripped, for example "www.mozilla.".
+        let [engineDomain] = UrlbarUtils.stripPrefixAndTrim(
+          result.payload.url,
+          {
+            stripWww: true,
+          }
+        );
+        // Discard if the engine domain does not end with the autofilled one.
+        if (!engineDomain.endsWith(autofillDomain)) {
+          return false;
+        }
       }
     }
 
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarPrefs.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarPrefs.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarPrefs.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarPrefs.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -101,6 +101,9 @@
   // Applies URL highlighting and other styling to the text in the urlbar input.
   ["formatting.enabled", true],
 
+  // Whether during IME composition the results panel should be closed.
+  ["imeCompositionClosesPanel", true],
+
   // Controls the composition of search results.
   ["matchBuckets", "suggestion:4,general:Infinity"],
 
@@ -135,23 +138,30 @@
   // homepage is opened.
   ["searchTips.test.ignoreShowLimits", false],
 
+  // Whether to show each local search shortcut button in the view.
+  ["shortcuts.bookmarks", true],
+  ["shortcuts.tabs", true],
+  ["shortcuts.history", true],
+
   // Whether speculative connections should be enabled.
   ["speculativeConnect.enabled", true],
 
-  // Results will include the user's bookmarks when this is true.
+  // Whether results will include the user's bookmarks.
   ["suggest.bookmark", true],
 
-  // Results will include the user's history when this is true.
+  // Whether results will include the user's history.
   ["suggest.history", true],
 
-  // Results will include switch-to-tab results when this is true.
+  // Whether results will include switch-to-tab results.
   ["suggest.openpage", true],
 
-  // Results will include search suggestions when this is true.
+  // Whether results will include search suggestions.
   ["suggest.searches", false],
 
-  // Results will include Top Sites and the view will open on focus when this
-  // is true.
+  // Whether results will include search engines (e.g. tab-to-search).
+  ["suggest.engines", true],
+
+  // Whether results will include top sites and the view will open on focus.
   ["suggest.topsites", true],
 
   // When using switch to tabs, if set to true this will move the tab into the
@@ -192,10 +202,6 @@
   //  2 - Show search and browsing history
   ["update2.emptySearchBehavior", 0],
 
-  // Whether the urlbar displays one-offs to filter searches to history,
-  // bookmarks, or tabs.
-  ["update2.localOneOffs", true],
-
   // Whether the urlbar one-offs act as search filters instead of executing a
   // search immediately.
   ["update2.oneOffsRefresh", true],
@@ -204,10 +210,6 @@
   // be restyled and deduped against form history. This only happens when
   // search mode is active.
   ["update2.restyleBrowsingHistoryAsSearch", true],
-
-  // Whether we display a tab-to-complete result when the user types an engine
-  // name.
-  ["update2.tabToComplete", true],
 ]);
 const PREF_OTHER_DEFAULTS = new Map([
   ["keyword.enabled", true],
@@ -290,10 +292,12 @@
    * @returns {*} The preference value.
    */
   get(pref) {
-    if (!this._map.has(pref)) {
-      this._map.set(pref, this._getPrefValue(pref));
+    let value = this._map.get(pref);
+    if (value === undefined) {
+      value = this._getPrefValue(pref);
+      this._map.set(pref, value);
     }
-    return this._map.get(pref);
+    return value;
   }
 
   /**
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderAutofill.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarProviderAutofill.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderAutofill.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarProviderAutofill.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -157,48 +157,60 @@
 
 const QUERY_URL_HISTORY_BOOKMARK = urlQuery(
   `AND (bookmarked OR frecency > 20)
-     AND strip_prefix_and_userinfo(url) BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
   `AND (bookmarked OR frecency > 20)
-     AND strip_prefix_and_userinfo(url) BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
 );
 
 const QUERY_URL_PREFIX_HISTORY_BOOKMARK = urlQuery(
   `AND (bookmarked OR frecency > 20)
-     AND url BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
   `AND (bookmarked OR frecency > 20)
-     AND url BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
 );
 
 const QUERY_URL_HISTORY = urlQuery(
   `AND (visited OR NOT bookmarked)
      AND frecency > 20
-     AND strip_prefix_and_userinfo(url) BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
   `AND (visited OR NOT bookmarked)
      AND frecency > 20
-     AND strip_prefix_and_userinfo(url) BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
 );
 
 const QUERY_URL_PREFIX_HISTORY = urlQuery(
   `AND (visited OR NOT bookmarked)
      AND frecency > 20
-     AND url BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
   `AND (visited OR NOT bookmarked)
      AND frecency > 20
-     AND url BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
 );
 
 const QUERY_URL_BOOKMARK = urlQuery(
   `AND bookmarked
-     AND strip_prefix_and_userinfo(url) BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN :strippedURL AND :strippedURL || X'FFFF'`,
   `AND bookmarked
-     AND strip_prefix_and_userinfo(url) BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
+     AND strip_prefix_and_userinfo(url) COLLATE NOCASE
+       BETWEEN 'www.' || :strippedURL AND 'www.' || :strippedURL || X'FFFF'`
 );
 
 const QUERY_URL_PREFIX_BOOKMARK = urlQuery(
   `AND bookmarked
-     AND url BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || :strippedURL AND :prefix || :strippedURL || X'FFFF'`,
   `AND bookmarked
-     AND url BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
+     AND url COLLATE NOCASE
+       BETWEEN :prefix || 'www.' || :strippedURL AND :prefix || 'www.' || :strippedURL || X'FFFF'`
 );
 
 const kProtocolsWithIcons = [
@@ -375,6 +387,68 @@
   }
 
   /**
+   * Filters hosts by retaining only the ones over the autofill threshold, then
+   * sorts them by their frecency, and extracts the one with the highest value.
+   * @param {UrlbarQueryContext} queryContext The current queryContext.
+   * @param {Array} hosts Array of host names to examine.
+   * @returns {Promise} Resolved when the filtering is complete.
+   * @resolves {string} The top matching host, or null if not found.
+   */
+  async getTopHostOverThreshold(queryContext, hosts) {
+    let db = await PlacesUtils.promiseLargeCacheDBConnection();
+    let conditions = [];
+    // Pay attention to the order of params, since they are not named.
+    let params = [UrlbarPrefs.get("autoFill.stddevMultiplier"), ...hosts];
+    let sources = queryContext.sources;
+    if (
+      sources.includes(UrlbarUtils.RESULT_SOURCE.HISTORY) &&
+      sources.includes(UrlbarUtils.RESULT_SOURCE.BOOKMARKS)
+    ) {
+      conditions.push(`(bookmarked OR ${SQL_AUTOFILL_FRECENCY_THRESHOLD})`);
+    } else if (sources.includes(UrlbarUtils.RESULT_SOURCE.HISTORY)) {
+      conditions.push(`visited AND ${SQL_AUTOFILL_FRECENCY_THRESHOLD}`);
+    } else if (sources.includes(UrlbarUtils.RESULT_SOURCE.BOOKMARKS)) {
+      conditions.push("bookmarked");
+    }
+
+    let rows = await db.executeCached(
+      `
+        ${SQL_AUTOFILL_WITH},
+        origins(id, prefix, host_prefix, host, fixed, host_frecency, frecency, bookmarked, visited) AS (
+          SELECT
+          id,
+          prefix,
+          first_value(prefix) OVER (
+            PARTITION BY host ORDER BY frecency DESC, prefix = "https://" DESC, id DESC
+          ),
+          host,
+          fixup_url(host),
+          TOTAL(frecency) OVER (PARTITION BY fixup_url(host)),
+          frecency,
+          MAX(EXISTS(
+            SELECT 1 FROM moz_places WHERE origin_id = o.id AND foreign_count > 0
+          )) OVER (PARTITION BY fixup_url(host)),
+          MAX(EXISTS(
+            SELECT 1 FROM moz_places WHERE origin_id = o.id AND visit_count > 0
+          )) OVER (PARTITION BY fixup_url(host))
+          FROM moz_origins o
+          WHERE o.host IN (${new Array(hosts.length).fill("?").join(",")})
+        )
+        SELECT host
+        FROM origins
+        ${conditions.length ? "WHERE " + conditions.join(" AND ") : ""}
+        ORDER BY frecency DESC, prefix = "https://" DESC, id DESC
+        LIMIT 1
+      `,
+      params
+    );
+    if (!rows.length) {
+      return null;
+    }
+    return rows[0].getResultByName("host");
+  }
+
+  /**
    * Obtains the query to search for autofill origin results.
    *
    * @param {UrlbarQueryContext} queryContext
@@ -522,7 +596,11 @@
         //  - http://mozilla.org/f[oo/]
         //  - http://mozilla.org/foo/b[ar/]
         //  - http://mozilla.org/foo/bar/b[az]
-        let strippedURLIndex = url.indexOf(strippedURL);
+        // And, toLowerCase() is preferred over toLocaleLowerCase() here
+        // because "COLLATE NOCASE" in the SQL only handles ASCII characters.
+        let strippedURLIndex = url
+          .toLowerCase()
+          .indexOf(strippedURL.toLowerCase());
         let strippedPrefix = url.substr(0, strippedURLIndex);
         let nextSlashIndex = url.indexOf(
           "/",
@@ -575,15 +653,6 @@
       return result;
     }
 
-    // This searches whether the search string matches part of a search engine
-    // domain, in those cases where it wouldn't match the full domain. For
-    // example "wiki" would not match "en.wikipedia.org", but this allows to
-    // do it.
-    result = await this._matchSearchEnginePartialDomain(queryContext);
-    if (result) {
-      return result;
-    }
-
     // Or we may want to fill a search engine domain regardless of the threshold.
     result = await this._matchSearchEngineDomain(queryContext);
     if (result) {
@@ -721,143 +790,6 @@
     };
     return result;
   }
-
-  async _matchSearchEnginePartialDomain(queryContext) {
-    // Differently from other autofill cases, here we don't strip the scheme
-    // or a trailing slash from the search string, because we want this to act
-    // as a shortcut to search engines. It's unlikely the user would type
-    // a url like string to search.
-    // We also don't strip www, since it may look strange that the user types
-    // "www.wiki" and we suggest "en.wikipedia.org".
-    // In practice, we only match when typing a partial top-level domain.
-    if (
-      !UrlbarTokenizer.looksLikeOrigin(queryContext.searchString, {
-        ignoreKnownDomains: true,
-      })
-    ) {
-      return null;
-    }
-
-    let trimmedString = queryContext.searchString.startsWith("www.")
-      ? queryContext.searchString.substring(4)
-      : queryContext.searchString;
-    if (trimmedString.includes(".")) {
-      trimmedString = UrlbarUtils.stripPublicSuffixFromHost(trimmedString);
-    }
-    let engines = await UrlbarSearchUtils.enginesForDomainPrefix(
-      trimmedString,
-      {
-        matchAllDomainLevels: true,
-      }
-    );
-    let autofillByHost = new Map();
-    for (let engine of engines) {
-      let host = engine.getResultDomain();
-      if (host.startsWith(queryContext.searchString)) {
-        // This should have been handled by origin autofill already.
-        continue;
-      }
-      let indexOfString = host.indexOf(queryContext.searchString);
-      if (indexOfString == -1) {
-        // We only want perfect matches here, if the user types www.engine and
-        // the engine doesn't have www, we can't trust it.
-        continue;
-      }
-      autofillByHost.set(
-        host,
-        queryContext.searchString +
-          host.substring(indexOfString + queryContext.searchString.length) +
-          "/"
-      );
-    }
-    if (!autofillByHost.size) {
-      return null;
-    }
-
-    // Now we could have multiple matching engines, we must sort them by the
-    // frecency of their origin, then extract the one with the highest value
-    // that satisfies the autofill threshold.
-    let db = await PlacesUtils.promiseLargeCacheDBConnection();
-    let hosts = Array.from(autofillByHost.keys());
-
-    let conditions = [];
-    // Pay attention to the order of params, since they are not named.
-    let params = [UrlbarPrefs.get("autoFill.stddevMultiplier"), ...hosts];
-    let sources = queryContext.sources;
-    if (
-      sources.includes(UrlbarUtils.RESULT_SOURCE.HISTORY) &&
-      sources.includes(UrlbarUtils.RESULT_SOURCE.BOOKMARKS)
-    ) {
-      conditions.push(`(bookmarked OR ${SQL_AUTOFILL_FRECENCY_THRESHOLD})`);
-    } else if (sources.includes(UrlbarUtils.RESULT_SOURCE.HISTORY)) {
-      conditions.push(`visited AND ${SQL_AUTOFILL_FRECENCY_THRESHOLD}`);
-    } else if (sources.includes(UrlbarUtils.RESULT_SOURCE.BOOKMARKS)) {
-      conditions.push("bookmarked");
-    }
-
-    let rows = await db.executeCached(
-      `
-        ${SQL_AUTOFILL_WITH},
-        origins(id, prefix, host_prefix, host, fixed, host_frecency, frecency, bookmarked, visited) AS (
-          SELECT
-          id,
-          prefix,
-          first_value(prefix) OVER (
-            PARTITION BY host ORDER BY frecency DESC, prefix = "https://" DESC, id DESC
-          ),
-          host,
-          fixup_url(host),
-          TOTAL(frecency) OVER (PARTITION BY fixup_url(host)),
-          frecency,
-          MAX(EXISTS(
-            SELECT 1 FROM moz_places WHERE origin_id = o.id AND foreign_count > 0
-          )) OVER (PARTITION BY fixup_url(host)),
-          MAX(EXISTS(
-            SELECT 1 FROM moz_places WHERE origin_id = o.id AND visit_count > 0
-          )) OVER (PARTITION BY fixup_url(host))
-          FROM moz_origins o
-          WHERE o.host IN (${new Array(hosts.length).fill("?").join(",")})
-        )
-        SELECT host_prefix, host
-        FROM origins
-        ${conditions.length ? "WHERE " + conditions.join(" AND ") : ""}
-        ORDER BY frecency DESC, prefix = "https://" DESC, id DESC
-        LIMIT 1
-      `,
-      params
-    );
-    if (!rows.length) {
-      return null;
-    }
-    let host = rows[0].getResultByName("host");
-    let host_prefix = rows[0].getResultByName("host_prefix");
-
-    // The value autofilled in the input field is the user typed string, plus
-    // the portion of the found engine domain and a trailing slash.
-    let autofill = autofillByHost.get(host);
-    let url = host_prefix + host + "/";
-    let [title] = UrlbarUtils.stripPrefixAndTrim(url, {
-      stripHttp: true,
-      trimEmptyQuery: true,
-      trimSlash: true,
-    });
-    let result = new UrlbarResult(
-      UrlbarUtils.RESULT_TYPE.URL,
-      UrlbarUtils.RESULT_SOURCE.HISTORY,
-      ...UrlbarResult.payloadAndSimpleHighlights(queryContext.tokens, {
-        title: [title, UrlbarUtils.HIGHLIGHT.TYPED],
-        url: [url, UrlbarUtils.HIGHLIGHT.TYPED],
-        icon: iconHelper(url),
-      })
-    );
-    result.autofill = {
-      value: autofill,
-      selectionStart: queryContext.searchString.length,
-      selectionEnd: autofill.length,
-    };
-
-    return result;
-  }
 }
 
 var UrlbarProviderAutofill = new ProviderAutofill();
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderExtension.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarProviderExtension.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderExtension.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarProviderExtension.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -181,10 +181,13 @@
    * describing the view update.  See the base UrlbarProvider class for more.
    *
    * @param {UrlbarResult} result The result whose view will be updated.
+   * @param {Map} idsByName
+   *   A Map from an element's name, as defined by the provider; to its ID in
+   *   the DOM, as defined by the browser.
    * @returns {object} An object describing the view update.
    */
-  async getViewUpdate(result) {
-    return this._notifyListener("getViewUpdate", result);
+  async getViewUpdate(result, idsByName) {
+    return this._notifyListener("getViewUpdate", result, idsByName);
   }
 
   /**
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderTabToSearch.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarProviderTabToSearch.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarProviderTabToSearch.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarProviderTabToSearch.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -19,8 +19,10 @@
   UrlbarView: "resource:///modules/UrlbarView.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
+  UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.jsm",
   UrlbarResult: "resource:///modules/UrlbarResult.jsm",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm",
+  UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
@@ -133,7 +135,7 @@
       queryContext.tokens.length == 1 &&
       !queryContext.searchMode &&
       UrlbarPrefs.get("update2") &&
-      UrlbarPrefs.get("update2.tabToComplete")
+      UrlbarPrefs.get("suggest.engines")
     );
   }
 
@@ -152,9 +154,12 @@
    * describing the view update.
    *
    * @param {UrlbarResult} result The result whose view will be updated.
+   * @param {Map} idsByName
+   *   A Map from an element's name, as defined by the provider; to its ID in
+   *   the DOM, as defined by the browser.
    * @returns {object} An object describing the view update.
    */
-  getViewUpdate(result) {
+  getViewUpdate(result, idsByName) {
     return {
       icon: {
         attributes: {
@@ -287,7 +292,6 @@
     // enginesForDomainPrefix only matches against engine domains.
     // Remove trailing slashes and www. from the search string and check if the
     // resulting string is worth matching.
-    // The muxer will verify that the found result matches the autofilled value.
     let [searchStr] = UrlbarUtils.stripPrefixAndTrim(
       queryContext.searchString,
       {
@@ -295,54 +299,138 @@
         trimSlash: true,
       }
     );
+    // Skip any string that cannot be an origin.
+    if (
+      !UrlbarTokenizer.looksLikeOrigin(searchStr, {
+        ignoreKnownDomains: true,
+        noIp: true,
+      })
+    ) {
+      return;
+    }
 
-    // Add all matching engines. The muxer will pick the one that matches
-    // autofill, if any.
+    // Also remove the public suffix, if present, to allow for partial matches.
+    if (searchStr.includes(".")) {
+      searchStr = UrlbarUtils.stripPublicSuffixFromHost(searchStr);
+    }
+
+    // Add all matching engines.
     let engines = await UrlbarSearchUtils.enginesForDomainPrefix(searchStr, {
       matchAllDomainLevels: true,
+      onlyEnabled: true,
     });
+    if (!engines.length) {
+      return;
+    }
 
     const onboardingInteractionsLeft = UrlbarPrefs.get(
       "tabToSearch.onboard.interactionsLeft"
     );
+
+    // If the engine host begins with the search string, autofill may happen
+    // for it, and the Muxer will retain the result only if there's a matching
+    // autofill heuristic result.
+    // Otherwise, we may have a partial match, where the search string is at
+    // the boundary of a host part, for example "wiki" in "en.wikipedia.org".
+    // We put those engines apart, and later we check if their host satisfies
+    // the autofill threshold. If they do, we mark them with the
+    // "satisfiesAutofillThreshold" payload property, so the muxer can avoid
+    // filtering them out.
+    let partialMatchEnginesByHost = new Map();
+
     for (let engine of engines) {
-      // Set the domain without public suffix as url, it will be used by
-      // the muxer to evaluate this result.
-      let url = engine.getResultDomain();
-      url = url.substr(0, url.length - engine.searchUrlPublicSuffix.length);
-      let result;
-      if (onboardingInteractionsLeft > 0) {
-        result = new UrlbarResult(
-          UrlbarUtils.RESULT_TYPE.DYNAMIC,
-          UrlbarUtils.RESULT_SOURCE.SEARCH,
-          {
-            engine: engine.name,
-            url,
-            keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
-            icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
-            dynamicType: DYNAMIC_RESULT_TYPE,
-          }
-        );
-        result.resultSpan = 2;
-      } else {
-        result = new UrlbarResult(
-          UrlbarUtils.RESULT_TYPE.SEARCH,
-          UrlbarUtils.RESULT_SOURCE.SEARCH,
-          ...UrlbarResult.payloadAndSimpleHighlights(queryContext.tokens, {
-            engine: engine.name,
-            url,
-            keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
-            icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
-            query: "",
-          })
-        );
+      // Trim the engine host. This will also be set as the result url, so the
+      // Muxer can use it to filter.
+      let [host] = UrlbarUtils.stripPrefixAndTrim(engine.getResultDomain(), {
+        stripWww: true,
+      });
+      // Check if the host may be autofilled.
+      if (host.startsWith(searchStr.toLocaleLowerCase())) {
+        if (onboardingInteractionsLeft > 0) {
+          addCallback(this, makeOnboardingResult(engine));
+        } else {
+          addCallback(this, makeResult(queryContext, engine));
+        }
+        continue;
       }
 
-      result.suggestedIndex = 1;
-      addCallback(this, result);
+      // Otherwise it may be a partial match that would not be autofilled.
+      if (host.includes("." + searchStr.toLocaleLowerCase())) {
+        partialMatchEnginesByHost.set(engine.getResultDomain(), engine);
+        // Don't continue here, we are looking for more partial matches.
+      }
+      // We also try to match the searchForm domain, because otherwise for an
+      // engine like ebay, we'd check rover.ebay.com, when the user is likely
+      // to visit ebay.LANG. The searchForm URL often points to the main host.
+      let searchFormHost;
+      try {
+        searchFormHost = new URL(engine.searchForm).host;
+      } catch (ex) {
+        // Invalid url or no searchForm.
+      }
+      if (searchFormHost?.includes("." + searchStr)) {
+        partialMatchEnginesByHost.set(searchFormHost, engine);
+      }
+    }
+    if (partialMatchEnginesByHost.size) {
+      let host = await UrlbarProviderAutofill.getTopHostOverThreshold(
+        queryContext,
+        Array.from(partialMatchEnginesByHost.keys())
+      );
+      if (host) {
+        let engine = partialMatchEnginesByHost.get(host);
+        if (onboardingInteractionsLeft > 0) {
+          addCallback(this, makeOnboardingResult(engine, true));
+        } else {
+          addCallback(this, makeResult(queryContext, engine, true));
+        }
+      }
     }
   }
 }
 
+function makeOnboardingResult(engine, satisfiesAutofillThreshold = false) {
+  let [url] = UrlbarUtils.stripPrefixAndTrim(engine.getResultDomain(), {
+    stripWww: true,
+  });
+  url = url.substr(0, url.length - engine.searchUrlPublicSuffix.length);
+  let result = new UrlbarResult(
+    UrlbarUtils.RESULT_TYPE.DYNAMIC,
+    UrlbarUtils.RESULT_SOURCE.SEARCH,
+    {
+      engine: engine.name,
+      url,
+      keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
+      icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
+      dynamicType: DYNAMIC_RESULT_TYPE,
+      satisfiesAutofillThreshold,
+    }
+  );
+  result.resultSpan = 2;
+  result.suggestedIndex = 1;
+  return result;
+}
+
+function makeResult(context, engine, satisfiesAutofillThreshold = false) {
+  let [url] = UrlbarUtils.stripPrefixAndTrim(engine.getResultDomain(), {
+    stripWww: true,
+  });
+  url = url.substr(0, url.length - engine.searchUrlPublicSuffix.length);
+  let result = new UrlbarResult(
+    UrlbarUtils.RESULT_TYPE.SEARCH,
+    UrlbarUtils.RESULT_SOURCE.SEARCH,
+    ...UrlbarResult.payloadAndSimpleHighlights(context.tokens, {
+      engine: engine.name,
+      url,
+      keywordOffer: UrlbarUtils.KEYWORD_OFFER.SHOW,
+      icon: UrlbarUtils.ICON.SEARCH_GLASS_INVERTED,
+      query: "",
+      satisfiesAutofillThreshold,
+    })
+  );
+  result.suggestedIndex = 1;
+  return result;
+}
+
 var UrlbarProviderTabToSearch = new ProviderTabToSearch();
 initializeDynamicResult();
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarResult.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarResult.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarResult.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarResult.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -246,11 +246,11 @@
     // For performance reasons limit excessive string lengths, to reduce the
     // amount of string matching we do here, and avoid wasting resources to
     // handle long textruns that the user would never see anyway.
-    for (let prop of ["displayUrl", "title"].filter(p => p in payloadInfo)) {
-      payloadInfo[prop][0] = payloadInfo[prop][0].substring(
-        0,
-        UrlbarUtils.MAX_TEXT_LENGTH
-      );
+    for (let prop of ["displayUrl", "title", "suggestion"]) {
+      let val = payloadInfo[prop]?.[0];
+      if (typeof val == "string") {
+        payloadInfo[prop][0] = val.substring(0, UrlbarUtils.MAX_TEXT_LENGTH);
+      }
     }
 
     let entries = Object.entries(payloadInfo);
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarSearchOneOffs.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarSearchOneOffs.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarSearchOneOffs.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarSearchOneOffs.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -13,32 +13,9 @@
   SearchOneOffs: "resource:///modules/SearchOneOffs.jsm",
   Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
-  UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm",
   UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
-// Maps from RESULT_SOURCE values to { restrict } objects.
-const LOCAL_MODES = new Map([
-  [
-    UrlbarUtils.RESULT_SOURCE.BOOKMARKS,
-    {
-      restrict: UrlbarTokenizer.RESTRICT.BOOKMARK,
-    },
-  ],
-  [
-    UrlbarUtils.RESULT_SOURCE.TABS,
-    {
-      restrict: UrlbarTokenizer.RESTRICT.OPENPAGE,
-    },
-  ],
-  [
-    UrlbarUtils.RESULT_SOURCE.HISTORY,
-    {
-      restrict: UrlbarTokenizer.RESTRICT.HISTORY,
-    },
-  ],
-]);
-
 /**
  * The one-off search buttons in the urlbar.
  */
@@ -305,6 +282,23 @@
   }
 
   /**
+   * Overrides the willHide method in the superclass to account for the local
+   * search mode buttons.
+   *
+   * @returns {boolean}
+   *   True if we will hide the one-offs when they are requested.
+   */
+  async willHide() {
+    // We need to call super.willHide() even when we return false below because
+    // it has the necessary side effect of creating this._engineInfo.
+    let superWillHide = await super.willHide();
+    if (UrlbarUtils.LOCAL_SEARCH_MODES.some(m => UrlbarPrefs.get(m.pref))) {
+      return false;
+    }
+    return superWillHide;
+  }
+
+  /**
    * Called when a pref tracked by UrlbarPrefs changes.
    *
    * @param {string} changedPref
@@ -315,9 +309,11 @@
     // Invalidate the engine cache when the local-one-offs-related prefs change
     // so that the one-offs rebuild themselves the next time the view opens.
     if (
-      ["update2", "update2.localOneOffs", "update2.oneOffsRefresh"].includes(
-        changedPref
-      )
+      [
+        "update2",
+        "update2.oneOffsRefresh",
+        ...UrlbarUtils.LOCAL_SEARCH_MODES.map(m => m.pref),
+      ].includes(changedPref)
     ) {
       this.invalidateCache();
     }
@@ -342,11 +338,14 @@
   _rebuildEngineList(engines) {
     super._rebuildEngineList(engines);
 
-    if (!this.view.oneOffsRefresh || !UrlbarPrefs.get("update2.localOneOffs")) {
+    if (!this.view.oneOffsRefresh) {
       return;
     }
 
-    for (let [source, { restrict }] of LOCAL_MODES) {
+    for (let { source, pref, restrict } of UrlbarUtils.LOCAL_SEARCH_MODES) {
+      if (!UrlbarPrefs.get(pref)) {
+        continue;
+      }
       let name = UrlbarUtils.getResultSourceName(source);
       let button = this.document.createXULElement("button");
       button.id = `urlbar-engine-one-off-item-${name}`;
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarSearchUtils.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarSearchUtils.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarSearchUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarSearchUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -64,13 +64,26 @@
    *   Match at each sub domain, for example "a.b.c.com" will be matched at
    *   "a.b.c.com", "b.c.com", and "c.com". Partial matches are always returned
    *   after perfect matches.
+   * @param {boolean} [options.onlyEnabled]
+   *   Match only engines that have not been disabled on the Search Preferences
+   *   list.
    * @returns {Array<nsISearchEngine>}
    *   An array of all matching engines. An empty array if there are none.
    */
-  async enginesForDomainPrefix(prefix, { matchAllDomainLevels = false } = {}) {
+  async enginesForDomainPrefix(
+    prefix,
+    { matchAllDomainLevels = false, onlyEnabled = false } = {}
+  ) {
     await this.init();
     prefix = prefix.toLowerCase();
 
+    let disabledEngines = onlyEnabled
+      ? Services.prefs
+          .getStringPref("browser.search.hiddenOneOffs", "")
+          .split(",")
+          .filter(e => !!e)
+      : [];
+
     // Array of partially matched engines, added through matchPrefix().
     let partialMatchEngines = [];
     function matchPrefix(engine, engineHost) {
@@ -90,6 +103,9 @@
     // Array of fully matched engines.
     let engines = [];
     for (let engine of await Services.search.getVisibleEngines()) {
+      if (disabledEngines.includes(engine.name)) {
+        continue;
+      }
       let domain = engine.getResultDomain();
       if (domain.startsWith(prefix) || domain.startsWith("www." + prefix)) {
         engines.push(engine);
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarUtils.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarUtils.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarUtils.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarUtils.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -28,6 +28,8 @@
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
+  SearchSuggestionController:
+    "resource://gre/modules/SearchSuggestionController.jsm",
   Services: "resource://gre/modules/Services.jsm",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm",
   UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
@@ -218,6 +220,31 @@
     "typed",
   ]),
 
+  // Search mode objects corresponding to the local shortcuts in the view, in
+  // order they appear.  Pref names are relative to the `browser.urlbar` branch.
+  get LOCAL_SEARCH_MODES() {
+    return [
+      {
+        source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS,
+        restrict: UrlbarTokenizer.RESTRICT.BOOKMARK,
+        icon: "chrome://browser/skin/bookmark.svg",
+        pref: "shortcuts.bookmarks",
+      },
+      {
+        source: UrlbarUtils.RESULT_SOURCE.TABS,
+        restrict: UrlbarTokenizer.RESTRICT.OPENPAGE,
+        icon: "chrome://browser/skin/tab.svg",
+        pref: "shortcuts.tabs",
+      },
+      {
+        source: UrlbarUtils.RESULT_SOURCE.HISTORY,
+        restrict: UrlbarTokenizer.RESTRICT.HISTORY,
+        icon: "chrome://browser/skin/history.svg",
+        pref: "shortcuts.history",
+      },
+    ];
+  },
+
   /**
    * Returns the payload schema for the given type of result.
    *
@@ -268,8 +295,7 @@
       return { url, postData, mayInheritPrincipal };
     }
 
-    await Services.search.init();
-    let engine = Services.search.getEngineByAlias(keyword);
+    let engine = await Services.search.getEngineByAlias(keyword);
     if (engine) {
       let submission = engine.getSubmission(param, null, "keyword");
       return {
@@ -360,7 +386,10 @@
    *          The array is sorted by match indexes ascending.
    */
   getTokenMatches(tokens, str, highlightType) {
-    str = str.toLocaleLowerCase();
+    // Only search a portion of the string, because not more than a certain
+    // amount of characters are visible in the UI, matching over what is visible
+    // would be expensive and pointless.
+    str = str.substring(0, UrlbarUtils.MAX_TEXT_LENGTH).toLocaleLowerCase();
     // To generate non-overlapping ranges, we start from a 0-filled array with
     // the same length of the string, and use it as a collision marker, setting
     // 1 where the text should be highlighted.
@@ -563,20 +592,19 @@
       return null;
     }
 
-    switch (token) {
-      case UrlbarTokenizer.RESTRICT.BOOKMARK:
-        return { source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS };
-      case UrlbarTokenizer.RESTRICT.HISTORY:
-        return { source: UrlbarUtils.RESULT_SOURCE.HISTORY };
-      case UrlbarTokenizer.RESTRICT.OPENPAGE:
-        return { source: UrlbarUtils.RESULT_SOURCE.TABS };
-      case UrlbarTokenizer.RESTRICT.SEARCH:
-        return {
-          engineName: UrlbarSearchUtils.getDefaultEngine(this.isPrivate).name,
-        };
+    if (token == UrlbarTokenizer.RESTRICT.SEARCH) {
+      return {
+        engineName: UrlbarSearchUtils.getDefaultEngine(this.isPrivate).name,
+      };
     }
 
-    return null;
+    let mode = UrlbarUtils.LOCAL_SEARCH_MODES.find(m => m.restrict == token);
+    if (!mode) {
+      return null;
+    }
+
+    // Return a copy so callers don't modify the object in LOCAL_SEARCH_MODES.
+    return { ...mode };
   },
 
   /**
@@ -683,10 +711,17 @@
    *   not be used in hot paths.
    */
   stripPublicSuffixFromHost(host) {
-    return host.substring(
-      0,
-      host.length - Services.eTLD.getKnownPublicSuffixFromHost(host).length
-    );
+    try {
+      return host.substring(
+        0,
+        host.length - Services.eTLD.getKnownPublicSuffixFromHost(host).length
+      );
+    } catch (ex) {
+      if (ex.result != Cr.NS_ERROR_HOST_IS_IP_ADDRESS) {
+        throw ex;
+      }
+    }
+    return host;
   },
 
   /**
@@ -903,7 +938,13 @@
     // If the user types a search engine alias without a search string,
     // we have an empty search string and we can't bump it.
     // We also don't want to add history in private browsing mode.
-    if (!value || input.isPrivate) {
+    // Finally we don't want to store extremely long strings that would not be
+    // particularly useful to the user.
+    if (
+      !value ||
+      input.isPrivate ||
+      value.length > SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH
+    ) {
       return Promise.resolve();
     }
     return new Promise((resolve, reject) => {
@@ -1048,6 +1089,9 @@
       query: {
         type: "string",
       },
+      satisfiesAutofillThreshold: {
+        type: "boolean",
+      },
       suggestion: {
         type: "string",
       },
@@ -1244,6 +1288,12 @@
       dynamicType: {
         type: "string",
       },
+      // If `shouldNavigate` is `true` and the payload contains a `url`
+      // property, when the result is selected the browser will navigate to the
+      // `url`.
+      shouldNavigate: {
+        type: "boolean",
+      },
     },
   },
 };
@@ -1590,6 +1640,12 @@
    *
    * @param {UrlbarResult} result
    *   The result whose view will be updated.
+   * @param {Map} idsByName
+   *   A Map from an element's name, as defined by the provider; to its ID in
+   *   the DOM, as defined by the browser. The browser manages element IDs for
+   *   dynamic results to prevent collisions. However, a provider may need to
+   *   access the IDs of the elements created for its results. For example, to
+   *   set various `aria` attributes.
    * @returns {object}
    *   A view update object as described above.  The names of properties are the
    *   the names of elements declared in the view template.  The values of
@@ -1599,7 +1655,8 @@
    *
    *   {object} [attributes]
    *     A mapping from attribute names to values.  Each name-value pair results
-   *     in an attribute being added to the element.
+   *     in an attribute being added to the element.  The `id` attribute is
+   *     reserved and cannot be set by the provider.
    *   {object} [style]
    *     A plain object that can be used to add inline styles to the element,
    *     like `display: none`.   `element.style` is updated for each name-value
@@ -1610,7 +1667,7 @@
    *   {string} [textContent]
    *     A string that will be set as `element.textContent`.
    */
-  getViewUpdate(result) {
+  getViewUpdate(result, idsByName) {
     return null;
   }
 
diff -Nru firefox-84.0.2+build1/browser/components/urlbar/UrlbarView.jsm firefox-85.0+build1/browser/components/urlbar/UrlbarView.jsm
--- firefox-84.0.2+build1/browser/components/urlbar/UrlbarView.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/components/urlbar/UrlbarView.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -800,7 +800,10 @@
    *     Names must be unique within a view template, but they don't need to be
    *     globally unique.  i.e., two different view templates can use the same
    *     names, and other DOM elements can use the same names in their IDs and
-   *     classes.
+   *     classes.  The name also suffixes the dynamic element's ID: an element
+   *     with name `data` will get the ID `urlbarView-row-{unique number}-data`.
+   *     If there is no name provided for the root element, the root element
+   *     will not get an ID.
    *   {string} tag
    *     The tag name of the object.  It is required for all objects in the
    *     structure except the root object and declares the kind of element that
@@ -808,7 +811,9 @@
    *   {object} [attributes]
    *     An optional mapping from attribute names to values.  For each
    *     name-value pair, an attribute is added to the element created for the
-   *     object.
+   *     object. The `id` attribute is reserved and cannot be set by the
+   *     provider. Element IDs are passed back to the provider in getViewUpdate
+   *     if they are needed.
    *   {array} [children]
    *     An optional list of children.  Each item in the array must be an object
    *     as described here.  For each item, a child element as described by the
@@ -1106,27 +1111,41 @@
   _createRowContentForDynamicType(item, result) {
     let { dynamicType } = result.payload;
     let viewTemplate = UrlbarView.dynamicViewTemplatesByName.get(dynamicType);
-    this._buildViewForDynamicType(dynamicType, item._content, viewTemplate);
+    this._buildViewForDynamicType(
+      dynamicType,
+      item._content,
+      item._elements,
+      viewTemplate
+    );
   }
 
-  _buildViewForDynamicType(type, parentNode, template) {
+  _buildViewForDynamicType(type, parentNode, elementsByName, template) {
     // Add classes to parentNode's classList.
     for (let className of template.classList || []) {
       parentNode.classList.add(className);
     }
     // Set attributes on parentNode.
     for (let [name, value] of Object.entries(template.attributes || {})) {
+      if (name == "id") {
+        // We do not allow dynamic results to set IDs for their Nodes. IDs are
+        // managed by the view to ensure they are unique.
+        Cu.reportError(
+          "Dynamic results are prohibited from setting their own IDs."
+        );
+        continue;
+      }
       parentNode.setAttribute(name, value);
     }
     if (template.name) {
       parentNode.setAttribute("name", template.name);
+      elementsByName.set(template.name, parentNode);
     }
     // Recurse into children.
     for (let childTemplate of template.children || []) {
       let child = this._createElement(childTemplate.tag);
       child.classList.add(`urlbarView-dynamic-${type}-${childTemplate.name}`);
       parentNode.appendChild(child);
-      this._buildViewForDynamicType(type, child, childTemplate);
+      this._buildViewForDynamicType(type, child, elementsByName, childTemplate);
     }
   }
 
@@ -1372,12 +1391,14 @@
     if (actionSetter) {
       actionSetter();
       item._originalActionSetter = actionSetter;
+      item.setAttribute("has-action", "true");
     } else {
       item._originalActionSetter = () => {
         action.removeAttribute("data-l10n-id");
         action.textContent = "";
       };
       item._originalActionSetter();
+      item.removeAttribute("has-action");
     }
 
     if (!title.hasAttribute("isurl")) {
@@ -1385,8 +1406,6 @@
     } else {
       title.removeAttribute("dir");
     }
-
-    item._elements.get("titleSeparator").hidden = !actionSetter && !setURL;
   }
 
   /**
@@ -1476,16 +1495,47 @@
   async _updateRowForDynamicType(item, result) {
     item.setAttribute("dynamicType", result.payload.dynamicType);
 
+    let idsByName = new Map();
+    for (let [name, node] of item._elements) {
+      node.id = `${item.id}-${name}`;
+      idsByName.set(name, node.id);
+    }
+
+    // First, apply highlighting. We do this before updating via getViewUpdate
+    // so the dynamic provider can override the highlighting by setting the
+    // textContent of the highlighted node, if it wishes.
+    for (let [payloadName, highlights] of Object.entries(
+      result.payloadHighlights
+    )) {
+      if (!highlights.length) {
+        continue;
+      }
+      // Highlighting only works if the dynamic element name is the same as the
+      // highlighted payload property name.
+      let nodeToHighlight = item.querySelector(`#${item.id}-${payloadName}`);
+      this._addTextContentWithHighlights(
+        nodeToHighlight,
+        result.payload[payloadName],
+        highlights
+      );
+    }
+
     // Get the view update from the result's provider.
     let provider = UrlbarProvidersManager.getProvider(result.providerName);
-    let viewUpdate = await provider.getViewUpdate(result);
+    let viewUpdate = await provider.getViewUpdate(result, idsByName);
 
     // Update each node in the view by name.
     for (let [nodeName, update] of Object.entries(viewUpdate)) {
-      let node = item.querySelector(
-        `.urlbarView-dynamic-${result.payload.dynamicType}-${nodeName}`
-      );
+      let node = item.querySelector(`#${item.id}-${nodeName}`);
       for (let [attrName, value] of Object.entries(update.attributes || {})) {
+        if (attrName == "id") {
+          // We do not allow dynamic results to set IDs for their Nodes. IDs are
+          // managed by the view to ensure they are unique.
+          Cu.reportError(
+            "Dynamic results are prohibited from setting their own IDs."
+          );
+          continue;
+        }
         node.setAttribute(attrName, value);
       }
       for (let [styleName, value] of Object.entries(update.style || {})) {
@@ -1919,31 +1969,12 @@
 
     let engine = this.oneOffSearchButtons.selectedButton?.engine;
     let source = this.oneOffSearchButtons.selectedButton?.source;
-    switch (source) {
-      case UrlbarUtils.RESULT_SOURCE.BOOKMARKS:
-        source = {
-          attribute: "bookmarks",
-          l10nId: "urlbar-result-action-search-bookmarks",
-          icon: "chrome://browser/skin/bookmark.svg",
-        };
-        break;
-      case UrlbarUtils.RESULT_SOURCE.HISTORY:
-        source = {
-          attribute: "history",
-          l10nId: "urlbar-result-action-search-history",
-          icon: "chrome://browser/skin/history.svg",
-        };
-        break;
-      case UrlbarUtils.RESULT_SOURCE.TABS:
-        source = {
-          attribute: "tabs",
-          l10nId: "urlbar-result-action-search-tabs",
-          icon: "chrome://browser/skin/tab.svg",
-        };
-        break;
-      default:
-        source = null;
-        break;
+
+    let localSearchMode;
+    if (source) {
+      localSearchMode = UrlbarUtils.LOCAL_SEARCH_MODES.find(
+        m => m.source == source
+      );
     }
 
     for (let item of this._rows.children) {
@@ -1975,7 +2006,7 @@
         this.oneOffsRefresh &&
         result.heuristic &&
         !engine &&
-        !source &&
+        !localSearchMode &&
         this.input.searchMode &&
         !this.input.searchMode.isPreview
       ) {
@@ -1988,7 +2019,11 @@
 
       // If a one-off button is the only selection, force the heuristic result
       // to show its action text, so the engine name is visible.
-      if (result.heuristic && !this.selectedElement && (source || engine)) {
+      if (
+        result.heuristic &&
+        !this.selectedElement &&
+        (localSearchMode || engine)
+      ) {
         item.setAttribute("show-action-text", "true");
       } else {
         item.removeAttribute("show-action-text");
@@ -2017,26 +2052,35 @@
         continue;
       }
 
-      // Update heuristic URL result titles to reflect the search string. This
-      // means we restyle a URL result to look like a search result. We override
-      // result-picking behaviour in UrlbarInput.pickResult.
-      if (
-        this.oneOffsRefresh &&
-        result.heuristic &&
-        result.type == UrlbarUtils.RESULT_TYPE.URL
-      ) {
+      // If the result is the heuristic and a one-off is selected (i.e.,
+      // localSearchMode || engine), then restyle it to look like a search
+      // result; otherwise, remove such styling. For restyled results, we
+      // override the usual result-picking behaviour in UrlbarInput.pickResult.
+      if (this.oneOffsRefresh && result.heuristic) {
         title.textContent =
-          source || engine
+          localSearchMode || engine
             ? this._queryContext.searchString
-            : result.payload.title;
+            : result.title;
+
+        // Set the restyled-search attribute so the action text and title
+        // separator are shown or hidden via CSS as appropriate.
+        if (localSearchMode || engine) {
+          item.setAttribute("restyled-search", "true");
+        } else {
+          item.removeAttribute("restyled-search");
+        }
       }
 
       // Update result action text.
-      if (source) {
+      if (localSearchMode) {
         // Update the result action text for a local one-off.
-        this.document.l10n.setAttributes(action, source.l10nId);
+        let name = UrlbarUtils.getResultSourceName(localSearchMode.source);
+        this.document.l10n.setAttributes(
+          action,
+          `urlbar-result-action-search-${name}`
+        );
         if (result.heuristic) {
-          item.setAttribute("source", source.attribute);
+          item.setAttribute("source", name);
         }
       } else if (engine && !result.payload.inPrivateWindow) {
         // Update the result action text for an engine one-off.
@@ -2060,12 +2104,8 @@
       }
 
       // Update result favicons.
-      let iconOverride = source?.icon || engine?.iconURI?.spec;
-      if (
-        !iconOverride &&
-        (source || engine) &&
-        result.type == UrlbarUtils.RESULT_TYPE.URL
-      ) {
+      let iconOverride = localSearchMode?.icon || engine?.iconURI?.spec;
+      if (!iconOverride && (localSearchMode || engine)) {
         // For one-offs without an icon, do not allow restyled URL results to
         // use their own icons.
         iconOverride = UrlbarUtils.ICON.SEARCH_GLASS;
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux32/debug firefox-85.0+build1/browser/config/mozconfigs/linux32/debug
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux32/debug	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux32/debug	2021-01-18 19:58:08.000000000 +0000
@@ -10,11 +10,6 @@
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-if [ -z "$USE_ARTIFACT" ]; then
-  # Keep basic GDB symbols around in debug builds
-  ac_add_options STRIP_FLAGS=--strip-debug
-fi
-
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux32/nightly firefox-85.0+build1/browser/config/mozconfigs/linux32/nightly
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux32/nightly	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux32/nightly	2021-01-18 19:58:08.000000000 +0000
@@ -2,10 +2,4 @@
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# STRIP_FLAGS is only valid for builds that strip; valgrind builds disable stripping
-if [ -z "$USE_VALGRIND" ] && [ -z "$USE_ARTIFACT" ]; then
-  # Keep basic GDB symbols around in Nightly builds
-  ac_add_options STRIP_FLAGS=--strip-debug
-fi
-
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux32/valgrind firefox-85.0+build1/browser/config/mozconfigs/linux32/valgrind
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux32/valgrind	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux32/valgrind	2021-01-18 19:58:08.000000000 +0000
@@ -1,5 +1,3 @@
-USE_VALGRIND=1
-
 . $topsrcdir/browser/config/mozconfigs/linux32/nightly
 
 ac_add_options --enable-valgrind
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux64/code-coverage firefox-85.0+build1/browser/config/mozconfigs/linux64/code-coverage
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux64/code-coverage	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux64/code-coverage	2021-01-18 19:58:08.000000000 +0000
@@ -1,6 +1,3 @@
-# Avoid setting any incompatible strip flags in the nightly config
-NOSTRIP_BUILD=1
-
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux64/debug firefox-85.0+build1/browser/config/mozconfigs/linux64/debug
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux64/debug	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux64/debug	2021-01-18 19:58:08.000000000 +0000
@@ -11,9 +11,4 @@
 
 ac_add_options --with-branding=browser/branding/nightly
 
-if [ -z "$USE_ARTIFACT" ]; then
-  # Keep basic GDB symbols around in debug builds
-  ac_add_options STRIP_FLAGS=--strip-debug
-fi
-
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux64/nightly firefox-85.0+build1/browser/config/mozconfigs/linux64/nightly
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux64/nightly	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux64/nightly	2021-01-18 19:58:08.000000000 +0000
@@ -2,11 +2,4 @@
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# STRIP_FLAGS is only valid for builds that strip;
-# Some builds like valgrind or code coverage disable stripping.
-if [ -z "$NOSTRIP_BUILD" ] && [ -z "$USE_ARTIFACT" ]; then
-  # Keep basic GDB symbols around in Nightly builds
-  ac_add_options STRIP_FLAGS=--strip-debug
-fi
-
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/linux64/valgrind firefox-85.0+build1/browser/config/mozconfigs/linux64/valgrind
--- firefox-84.0.2+build1/browser/config/mozconfigs/linux64/valgrind	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/linux64/valgrind	2021-01-18 19:58:08.000000000 +0000
@@ -1,8 +1,5 @@
 MOZ_AUTOMATION_CHECK=0
 
-# Avoid setting any incompatible strip flags in the nightly config
-NOSTRIP_BUILD=1
-
 . $topsrcdir/browser/config/mozconfigs/linux64/nightly
 
 ac_add_options --enable-valgrind
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/code-coverage firefox-85.0+build1/browser/config/mozconfigs/macosx64/code-coverage
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/code-coverage	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64/code-coverage	2021-01-18 19:58:08.000000000 +0000
@@ -1,6 +1,3 @@
-# Avoid setting any incompatible strip flags in the nightly config
-NOSTRIP_BUILD=1
-
 . "$topsrcdir/browser/config/mozconfigs/macosx64/nightly"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/nightly firefox-85.0+build1/browser/config/mozconfigs/macosx64/nightly
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/nightly	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64/nightly	2021-01-18 19:58:08.000000000 +0000
@@ -9,9 +9,4 @@
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# STRIP_FLAGS is only valid for builds that strip; code coverage builds disable stripping
-if [ -z "$NOSTRIP_BUILD" ] && [ -z "$USE_ARTIFACT" ]; then
-  ac_add_options STRIP_FLAGS=-S
-fi
-
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/plain-debug firefox-85.0+build1/browser/config/mozconfigs/macosx64/plain-debug
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/plain-debug	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64/plain-debug	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,3 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx64/plain-opt"
+
+ac_add_options --enable-debug
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/plain-opt firefox-85.0+build1/browser/config/mozconfigs/macosx64/plain-opt
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64/plain-opt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64/plain-opt	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,8 @@
+CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
+RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
+RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
+RUSTFMT="${MOZ_FETCHES_DIR}/rustc/bin/rustfmt"
+CBINDGEN="${MOZ_FETCHES_DIR}/cbindgen/cbindgen"
+
+export NODEJS="${MOZ_FETCHES_DIR}/node/bin/node"
+NASM="${MOZ_FETCHES_DIR}/nasm/nasm"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/common-opt firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/common-opt
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/common-opt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/common-opt	2021-01-18 19:58:08.000000000 +0000
@@ -29,7 +29,7 @@
 export CFLAGS="$CFLAGS -mcpu=apple-a12"
 export CXXFLAGS="$CXXFLAGS -mcpu=apple-a12"
 
-RUSTC="$MOZ_FETCHES_DIR/rustc-beta/rustc/bin/rustc"
-CARGO="$MOZ_FETCHES_DIR/rustc-beta/rustc/bin/cargo"
-RUSTDOC="$MOZ_FETCHES_DIR/rustc-beta/rustc/bin/rustdoc"
-RUSTFMT="$MOZ_FETCHES_DIR/rustc-beta/rustc/bin/rustfmt"
+RUSTC="$MOZ_FETCHES_DIR/rustc-1.49/rustc/bin/rustc"
+CARGO="$MOZ_FETCHES_DIR/rustc-1.49/rustc/bin/cargo"
+RUSTDOC="$MOZ_FETCHES_DIR/rustc-1.49/rustc/bin/rustdoc"
+RUSTFMT="$MOZ_FETCHES_DIR/rustc-1.49/rustc/bin/rustfmt"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/devedition firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/devedition
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/devedition	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/devedition	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,19 @@
+. "$topsrcdir/browser/config/mozconfigs/macosx64-aarch64/common-opt"
+
+# Add-on signing is not required for DevEdition
+MOZ_REQUIRE_SIGNING=0
+
+ac_add_options --enable-instruments
+
+# Cross-compiled builds fail when dtrace is enabled
+if test `uname -s` != Linux; then
+  ac_add_options --enable-dtrace
+fi
+
+if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
+ac_add_options --with-macbundlename-prefix=Firefox
+fi
+
+ac_add_options --with-branding=browser/branding/aurora
+
+. "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/nightly firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/nightly
--- firefox-84.0.2+build1/browser/config/mozconfigs/macosx64-aarch64/nightly	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/mozconfigs/macosx64-aarch64/nightly	2021-01-18 19:58:08.000000000 +0000
@@ -9,9 +9,4 @@
 
 ac_add_options --with-branding=browser/branding/nightly
 
-# STRIP_FLAGS is only valid for builds that strip; code coverage builds disable stripping
-if [ -z "$NOSTRIP_BUILD" ] && [ -z "$USE_ARTIFACT" ]; then
-  ac_add_options STRIP_FLAGS=-S
-fi
-
 . "$topsrcdir/build/mozconfig.common.override"
diff -Nru firefox-84.0.2+build1/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest firefox-85.0+build1/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest
--- firefox-84.0.2+build1/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[
-  {
-    "size": 31991917,
-    "visibility": "internal",
-    "digest": "c5c0be09972b56b5980dc9d06b61ff49cf58c4572913437256a79b202e19e936af3c0ab0924df72b9f648d518c257597f84800a84bb80e68af4eabdaf1df5f24",
-    "algorithm": "sha512",
-    "unpack": true,
-    "filename": "MacOSX10.12.sdk.tar.bz2"
-  }
-]
diff -Nru firefox-84.0.2+build1/browser/config/tooltool-manifests/macosx64/cross-releng.manifest firefox-85.0+build1/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
--- firefox-84.0.2+build1/browser/config/tooltool-manifests/macosx64/cross-releng.manifest	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/tooltool-manifests/macosx64/cross-releng.manifest	2021-01-18 19:58:08.000000000 +0000
@@ -1,10 +1,10 @@
 [
   {
-    "size": 34094283,
+    "size": 31991917,
     "visibility": "internal",
-    "digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
+    "digest": "c5c0be09972b56b5980dc9d06b61ff49cf58c4572913437256a79b202e19e936af3c0ab0924df72b9f648d518c257597f84800a84bb80e68af4eabdaf1df5f24",
     "algorithm": "sha512",
     "unpack": true,
-    "filename": "MacOSX10.11.sdk.tar.xz"
+    "filename": "MacOSX10.12.sdk.tar.bz2"
   }
 ]
diff -Nru firefox-84.0.2+build1/browser/config/version_display.txt firefox-85.0+build1/browser/config/version_display.txt
--- firefox-84.0.2+build1/browser/config/version_display.txt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/version_display.txt	2021-01-18 19:58:08.000000000 +0000
@@ -1 +1 @@
-84.0.2
+85.0
diff -Nru firefox-84.0.2+build1/browser/config/version.txt firefox-85.0+build1/browser/config/version.txt
--- firefox-84.0.2+build1/browser/config/version.txt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/config/version.txt	2021-01-18 19:58:08.000000000 +0000
@@ -1 +1 @@
-84.0.2
+85.0
diff -Nru firefox-84.0.2+build1/browser/docs/BrowserUsageTelemetry.rst firefox-85.0+build1/browser/docs/BrowserUsageTelemetry.rst
--- firefox-84.0.2+build1/browser/docs/BrowserUsageTelemetry.rst	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/docs/BrowserUsageTelemetry.rst	2021-01-18 19:58:08.000000000 +0000
@@ -12,9 +12,7 @@
 ================
 This module exposes the ``recordSearch`` method, which serves as the main entry point for recording search related Telemetry. It records only the search *counts* per engine and the origin of the search, but nothing pertaining the search contents themselves.
 
-As the transition to the ``BrowserUsageTelemetry`` happens, the ``recordSearch`` calls are dispatched through `BrowserSearch.recordSearchInTelemetry <https://searchfox.org/mozilla-central/rev/1a973762afcbc5066f73f1508b0c846872fe3952/browser/base/content/browser.js#4498>`_, that is called by all the search related UI components (urlbar, searchbar, context menu and about\:\* pages).
-
-A list of the components recording search Telemetry can be found using the following `Searchfox search <https://searchfox.org/mozilla-central/search?q=recordSearchInTelemetry>`_.
+A list of the components recording search Telemetry can be found using the following `Searchfox search <https://searchfox.org/mozilla-central/search?q=recordSearch>`_.
 
 Tab and window interactions
 ===========================
diff -Nru firefox-84.0.2+build1/browser/docs/index.rst firefox-85.0+build1/browser/docs/index.rst
--- firefox-84.0.2+build1/browser/docs/index.rst	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/docs/index.rst	2021-01-18 19:58:08.000000000 +0000
@@ -15,9 +15,9 @@
    installer/windows/installer/index
    /toolkit/mozapps/defaultagent/default-browser-agent/index
    components/newtab/content-src/asrouter/docs/index
+   search/index
    base/sslerrorreport/index
    base/tabbrowser/index
    touchbar/index
    components/uitour/docs/index
    components/payments/docs/index
-
diff -Nru firefox-84.0.2+build1/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css firefox-85.0+build1/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css
--- firefox-84.0.2+build1/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css	2021-01-18 19:58:08.000000000 +0000
@@ -182,7 +182,7 @@
   content: "";
   width: 16px;
   height: 16px;
-  background-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg);
+  background-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg);
   -moz-context-properties: fill;
   fill: GrayText;
 }
diff -Nru firefox-84.0.2+build1/browser/extensions/formautofill/test/browser/browser_autocomplete_marked_back_forward.js firefox-85.0+build1/browser/extensions/formautofill/test/browser/browser_autocomplete_marked_back_forward.js
--- firefox-84.0.2+build1/browser/extensions/formautofill/test/browser/browser_autocomplete_marked_back_forward.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/formautofill/test/browser/browser_autocomplete_marked_back_forward.js	2021-01-18 19:58:08.000000000 +0000
@@ -38,7 +38,7 @@
 
     // Now navigate forward and make sure autofill autocomplete results are still attached
     let loadPromise = BrowserTestUtils.browserLoaded(browser);
-    await BrowserTestUtils.loadURI(browser, `${URL}?load=2`);
+    BrowserTestUtils.loadURI(browser, `${URL}?load=2`);
     info("expecting browser loaded");
     await loadPromise;
 
diff -Nru firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/browser.ini firefox-85.0+build1/browser/extensions/screenshots/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/screenshots/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -1,2 +1,4 @@
+[browser_screenshots_injection.js]
+support-files = injection-page.html
 [browser_screenshots_ui_check.js]
 skip-if = os == 'win' && debug # Bug 1394967
diff -Nru firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/browser_screenshots_injection.js firefox-85.0+build1/browser/extensions/screenshots/test/browser/browser_screenshots_injection.js
--- firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/browser_screenshots_injection.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/screenshots/test/browser/browser_screenshots_injection.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,72 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const TEST_PATH = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "https://example.com"
+);
+
+/**
+ * Check that web content cannot break into screenshots.
+ */
+add_task(async function test_inject_srcdoc() {
+  // If Screenshots was disabled, enable it just for this test.
+  const addon = await AddonManager.getAddonByID("screenshots@mozilla.org");
+  const isEnabled = addon.enabled;
+  if (!isEnabled) {
+    await addon.enable({allowSystemAddons: true});
+    registerCleanupFunction(async () => {
+      await addon.disable({allowSystemAddons: true});
+    });
+  }
+
+  await BrowserTestUtils.withNewTab(TEST_PATH + "injection-page.html",
+    async (browser) => {
+      // Set up the content hijacking. Do this so we can see it without
+      // awaiting - the promise should never resolve.
+      let response = null;
+      let responsePromise = SpecialPowers.spawn(browser, [], () => {
+        return new Promise(resolve => {
+          // We can't pass `resolve` directly because of sandboxing.
+          // `responseHandler` gets invoked from the content page.
+          content.wrappedJSObject.responseHandler = Cu.exportFunction(
+            function(arg) {
+              resolve(arg)
+            },
+            content
+          );
+        });
+      }).then(
+        r => {
+          ok(false, "Should not have gotten HTML but got: " + r);
+          response = r;
+        },
+        () => {
+          // Do nothing - we expect this to error when the test finishes
+          // and the actor is destroyed, while the promise still hasn't
+          // been resolved. We need to catch it in order not to throw
+          // uncaught rejection errors and inadvertently fail the test.
+        }
+      );
+
+      let error;
+      let errorPromise = new Promise(resolve => {
+        SpecialPowers.registerConsoleListener(msg => {
+          if (msg.message?.match(/iframe URL does not match expected blank.html/)) {
+            error = msg;
+            resolve();
+          }
+        });
+      });
+
+      // Now try to start the screenshot flow:
+      document.querySelector("keyset[id*=screenshot] > key").doCommand();
+      await Promise.race([errorPromise, responsePromise]);
+      ok(error, "Should get the relevant error: " + error?.message);
+      ok(!response, "Should not get a response from the webpage.");
+
+      SpecialPowers.postConsoleSentinel();
+    });
+});
diff -Nru firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/injection-page.html firefox-85.0+build1/browser/extensions/screenshots/test/browser/injection-page.html
--- firefox-84.0.2+build1/browser/extensions/screenshots/test/browser/injection-page.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/screenshots/test/browser/injection-page.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,24 @@
+<body>
+<script>
+let callback = function(mutationsList, observer) {
+  for (let mutation of mutationsList) {
+    let [added] = mutation.addedNodes;
+    if (added instanceof HTMLIFrameElement && added.id == "firefox-screenshots-preview-iframe") {
+      added.srcdoc = "<html></html>";
+      // Now we have to wait for the doc to be populated.
+      let interval = setInterval(() => {
+        console.log(added.contentDocument.innerHTML);
+        if (added.contentDocument.body.innerHTML) {
+          clearInterval(interval);
+          window.responseHandler(added.contentDocument.body.innerHTML);
+        }
+      }, 100);
+      observer.disconnect();
+    }
+  }
+};
+
+observer = new MutationObserver(callback);
+observer.observe(document.body, {childList: true});
+</script>
+</body>
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/data/injections.js firefox-85.0+build1/browser/extensions/webcompat/data/injections.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/data/injections.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/data/injections.js	2021-01-18 19:58:08.000000000 +0000
@@ -272,20 +272,6 @@
     customFunc: "detectSwipeFix",
   },
   {
-    id: "bug1632019",
-    platform: "all",
-    domain: "everyman.co",
-    bug: "1632019",
-    contentScripts: {
-      matches: ["https://everyman.co/*"],
-      css: [
-        {
-          file: "injections/css/bug1632019-everyman.co-gallery-width-fix.css",
-        },
-      ],
-    },
-  },
-  {
     id: "bug1644830",
     platform: "desktop",
     domain: "usps.com",
@@ -415,6 +401,54 @@
     },
   },
   {
+    id: "bug1631811",
+    platform: "all",
+    domain: "datastudio.google.com",
+    bug: "1631811",
+    contentScripts: {
+      matches: ["https://datastudio.google.com/embed/reporting/*"],
+      js: [
+        {
+          file: "injections/js/bug1631811-datastudio.google.com-indexedDB.js",
+        },
+      ],
+      allFrames: true,
+    },
+  },
+  {
+    id: "bug1665035",
+    platform: "desktop",
+    domain: "dckids.com",
+    bug: "1665035",
+    contentScripts: {
+      matches: [
+        "https://d3qlaywcwingl6.cloudfront.net/content/*/Html5Game/*",
+        "https://d3qlaywcwingl6.cloudfront.net/*/game/content/*",
+      ],
+      js: [
+        {
+          file: "injections/js/bug1665035-dckids.com-cookieEnabled.js",
+        },
+      ],
+      allFrames: true,
+    },
+  },
+  {
+    id: "bug1677442",
+    platform: "desktop",
+    domain: "store.hp.com",
+    bug: "1677442",
+    contentScripts: {
+      matches: ["*://d3nkfb7815bs43.cloudfront.net/*forstore.hp.com*"],
+      js: [
+        {
+          file: "injections/js/bug1677442-store.hp.com-disable-indexeddb.js",
+        },
+      ],
+      allFrames: true,
+    },
+  },
+  {
     id: "bug1682238",
     platform: "desktop",
     domain: "gamearter.com",
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/data/picture_in_picture_overrides.js firefox-85.0+build1/browser/extensions/webcompat/data/picture_in_picture_overrides.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/data/picture_in_picture_overrides.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/data/picture_in_picture_overrides.js	2021-01-18 19:58:08.000000000 +0000
@@ -52,5 +52,9 @@
     udemy: {
       "https://*.udemy.com/*": { policy: TOGGLE_POLICIES.ONE_QUARTER },
     },
+
+    youtube: {
+      "https://*.youtube.com/*": { visibilityThreshold: 0.9 },
+    },
   };
 }
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/data/ua_overrides.js firefox-85.0+build1/browser/extensions/webcompat/data/ua_overrides.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/data/ua_overrides.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/data/ua_overrides.js	2021-01-18 19:58:08.000000000 +0000
@@ -109,7 +109,7 @@
      * Spoofing as Chrome prevents the site from doing a constant page refresh
      */
     id: "bug1610010",
-    platform: "desktop",
+    platform: "all",
     domain: "criticalcareontario.ca",
     bug: "1610010",
     config: {
@@ -695,6 +695,44 @@
       },
     },
   },
+  {
+    /*
+     * Bug 1679847 - Add UA override for avto.pro
+     * Webcompat issue #60043 - https://webcompat.com/issues/60043
+     *
+     * Unless Chrome is in the UA, the site serves a desktop version
+     * on catalog pages
+     */
+    id: "bug1679847",
+    platform: "android",
+    domain: "avto.pro",
+    bug: "1679847",
+    config: {
+      matches: ["https://avto.pro/catalog/*"],
+      uaTransformer: () => {
+        return UAHelpers.getDeviceAppropriateChromeUA();
+      },
+    },
+  },
+  {
+    /*
+     * Bug 1679869 - Add UA override for vh1.com
+     * Webcompat issue #52755 - https://webcompat.com/issues/52755
+     *
+     * The site is not showing videos on Firefox on mobile stating
+     * that android 4.4.4 and chrome browser required
+     */
+    id: "bug1679869",
+    platform: "android",
+    domain: "vh1.com",
+    bug: "1679869",
+    config: {
+      matches: ["*://*.vh1.com/*"],
+      uaTransformer: () => {
+        return UAHelpers.getDeviceAppropriateChromeUA();
+      },
+    },
+  },
 ];
 
 const UAHelpers = {
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/injections/css/bug1632019-everyman.co-gallery-width-fix.css firefox-85.0+build1/browser/extensions/webcompat/injections/css/bug1632019-everyman.co-gallery-width-fix.css
--- firefox-84.0.2+build1/browser/extensions/webcompat/injections/css/bug1632019-everyman.co-gallery-width-fix.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/injections/css/bug1632019-everyman.co-gallery-width-fix.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-/**
- * everyman.co - Unable to view the gallery due to preview being too big
- * Bug #1632019 - https://bugzilla.mozilla.org/show_bug.cgi?id=1632019
- * WebCompat issue #50968 - https://webcompat.com/issues/50968
- *
- * everyman.co has product gallery with image preview taking
- * too much space and making the site unusable. Applying min-width
- * to ancestor element fixes the issue. See also
- * https://bugzilla.mozilla.org/show_bug.cgi?id=1316534
- */
-.product-gallery {
-  min-width: 0;
-}
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1631811-datastudio.google.com-indexedDB.js firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1631811-datastudio.google.com-indexedDB.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1631811-datastudio.google.com-indexedDB.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1631811-datastudio.google.com-indexedDB.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,18 @@
+"use strict";
+
+/**
+ * Bug 1631811 - disable indexedDB for datastudio.google.com iframes
+ *
+ * Indexed DB is disabled already for these iframes due to cookie blocking.
+ * This intervention changes the functionality from throwing a SecurityError
+ * when indexedDB is accessed to removing it from the window object
+ */
+
+console.info(
+  "window.indexedDB has been overwritten for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1631811 for details."
+);
+
+Object.defineProperty(window.wrappedJSObject, "indexedDB", {
+  get: undefined,
+  set: undefined,
+});
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1665035-dckids.com-cookieEnabled.js firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1665035-dckids.com-cookieEnabled.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1665035-dckids.com-cookieEnabled.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1665035-dckids.com-cookieEnabled.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,30 @@
+"use strict";
+
+/**
+ * Bug 1665035 - enable navigator.cookieEnabled and spoof window.navigator on Linux
+ *
+ * Some of the games are not starting because navigator.cookieEnabled
+ * returns false for trackers with ETP strict. Overwriting the value allows
+ * to play the games. In addition, Linux desktop devices are incorrectly
+ * flagged as mobile devices (even if ETP is disabled), so spoofing
+ * window.navigator.platform here.
+ */
+
+console.info(
+  "window.cookieEnabled has been overwritten for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1665035 for details."
+);
+
+Object.defineProperty(window.navigator.wrappedJSObject, "cookieEnabled", {
+  value: true,
+  writable: false,
+});
+
+if (navigator.platform.includes("Linux")) {
+  console.info(
+    "navigator.platform has been overwritten for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1665035 for details."
+  );
+  Object.defineProperty(window.navigator.wrappedJSObject, "platform", {
+    value: "Win64",
+    writable: false,
+  });
+}
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1677442-store.hp.com-disable-indexeddb.js firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1677442-store.hp.com-disable-indexeddb.js
--- firefox-84.0.2+build1/browser/extensions/webcompat/injections/js/bug1677442-store.hp.com-disable-indexeddb.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/injections/js/bug1677442-store.hp.com-disable-indexeddb.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,20 @@
+"use strict";
+
+/**
+ * Bug 1677442 - disable indexedDB for d3nkfb7815bs43.cloudfront.net
+ *
+ * The site embeds an iframe with a 3D viewer. The request fails
+ *  because BabylonJS (the 3d library) tries to access indexedDB
+ *  from the third party context (d3nkfb7815bs43.cloudfront.net)
+ *  Disabling indexedDB fixes it, causing it to fetch the 3d resource
+ *  via network.
+ */
+
+console.info(
+  "window.indexedDB has been overwritten for compatibility reasons. See https://bugzilla.mozilla.org/show_bug.cgi?id=1677442 for details."
+);
+
+Object.defineProperty(window.wrappedJSObject, "indexedDB", {
+  get: undefined,
+  set: undefined,
+});
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/manifest.json firefox-85.0+build1/browser/extensions/webcompat/manifest.json
--- firefox-84.0.2+build1/browser/extensions/webcompat/manifest.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/manifest.json	2021-01-18 19:58:08.000000000 +0000
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "17.1.0",
+  "version": "18.2.0",
 
   "applications": {
     "gecko": {
diff -Nru firefox-84.0.2+build1/browser/extensions/webcompat/moz.build firefox-85.0+build1/browser/extensions/webcompat/moz.build
--- firefox-84.0.2+build1/browser/extensions/webcompat/moz.build	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/extensions/webcompat/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -57,7 +57,6 @@
     "injections/css/bug1605611-maps.google.com-directions-time.css",
     "injections/css/bug1610016-gaana.com-input-position-fix.css",
     "injections/css/bug1610344-directv.com.co-hide-unsupported-message.css",
-    "injections/css/bug1632019-everyman.co-gallery-width-fix.css",
     "injections/css/bug1644830-missingmail.usps.com-checkboxes-not-visible.css",
     "injections/css/bug1645064-s-kanava.fi-invisible-charts.css",
     "injections/css/bug1651917-teletrader.com.body-transform-origin.css",
@@ -78,6 +77,9 @@
     "injections/js/bug1579159-m.tailieu.vn-pdfjs-worker-disable.js",
     "injections/js/bug1605611-maps.google.com-directions-time.js",
     "injections/js/bug1610358-pcloud.com-appVersion-change.js",
+    "injections/js/bug1631811-datastudio.google.com-indexedDB.js",
+    "injections/js/bug1665035-dckids.com-cookieEnabled.js",
+    "injections/js/bug1677442-store.hp.com-disable-indexeddb.js",
     "injections/js/bug1682238-gamearter.com-ua-change.js",
 ]
 
diff -Nru firefox-84.0.2+build1/browser/installer/windows/nsis/shared.nsh firefox-85.0+build1/browser/installer/windows/nsis/shared.nsh
--- firefox-84.0.2+build1/browser/installer/windows/nsis/shared.nsh	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/installer/windows/nsis/shared.nsh	2021-01-18 19:58:08.000000000 +0000
@@ -202,6 +202,7 @@
 ${EndIf}
 !endif
 
+${RemoveDefaultBrowserAgentShortcut}
 !macroend
 !define PostUpdate "!insertmacro PostUpdate"
 
@@ -425,6 +426,43 @@
 !macroend
 !define UpdateOneShortcutBranding "!insertmacro UpdateOneShortcutBranding"
 
+; Remove a shortcut unintentionally added by the default browser agent (bug 1672957, 1681207)
+!macro RemoveDefaultBrowserAgentShortcut
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+
+  ; 2 is CSIDL_PROGRAMS, it's simpler to use this to get the user's Start Menu Programs than
+  ; to use $SMPROGRAMS and rely on SetShellVarContext current.
+  System::Call "Shell32::SHGetSpecialFolderPathW(p 0, t.r1, i 2, i 0)"
+
+  ; The shortcut would have been named MOZ_BASE_NAME regardless of branding.
+  ; According to defines.nsi.in AppName should match application.ini, and application.ini.in sets
+  ; [App] Name from MOZ_BASE_NAME.
+  StrCpy $1 "$1\${AppName}.lnk"
+  ShellLink::GetShortCutTarget $1
+  Pop $0
+
+  ; ShellLink::GetShortCutTarget, and the underlying IShellLink::GetPath(), have an issue
+  ; where "C:\Program Files" becomes "C:\Program Files (x86)" in some cases.
+  ; It should be OK to remove the shortcut (which matches our app name) even if it isn't from this
+  ; install, as long as the file name portion of the target path matches.
+  StrCpy $2 "\default-browser-agent.exe"
+  StrLen $3 $2
+  ; Select the substring to match from the end of the target path.
+  StrCpy $0 $0 $3 -$3
+  ${If} $0 == $2
+    Delete $1
+  ${EndIf}
+
+  Pop $3
+  Pop $2
+  Pop $1
+  Pop $0
+!macroend
+!define RemoveDefaultBrowserAgentShortcut "!insertmacro RemoveDefaultBrowserAgentShortcut"
+
 !macro AddAssociationIfNoneExist FILE_TYPE KEY
   ClearErrors
   EnumRegKey $7 HKCR "${FILE_TYPE}" 0
@@ -1609,7 +1647,22 @@
   ${Unless} ${Errors}
     ; This is all protected by a user choice hash in Windows 8 so it won't
     ; help, but it also won't hurt.
-    AppAssocReg::SetAppAsDefaultAll "$R9"
+    AppAssocReg::SetAppAsDefault "$R9" ".htm" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" ".html" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" ".shtml" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" ".webp" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" ".xht" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" ".xhtml" "file"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" "http" "protocol"
+    Pop $0
+    AppAssocReg::SetAppAsDefault "$R9" "https" "protocol"
+    Pop $0
   ${EndUnless}
   ${RemoveDeprecatedKeys}
   ${MigrateTaskBarShortcut}
diff -Nru firefox-84.0.2+build1/browser/installer/windows/nsis/uninstaller.nsi firefox-85.0+build1/browser/installer/windows/nsis/uninstaller.nsi
--- firefox-84.0.2+build1/browser/installer/windows/nsis/uninstaller.nsi	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/installer/windows/nsis/uninstaller.nsi	2021-01-18 19:58:08.000000000 +0000
@@ -603,6 +603,7 @@
   ; Uninstall the default browser agent scheduled task.
   ; This also removes the registry entries it creates.
   ExecWait '"$INSTDIR\default-browser-agent.exe" uninstall $AppUserModelID'
+  ${RemoveDefaultBrowserAgentShortcut}
 
   ${un.RemovePrecompleteEntries} "false"
 
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/aboutLogins.ftl firefox-85.0+build1/browser/locales/en-US/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/aboutLogins.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/aboutLogins.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -23,6 +23,7 @@
 about-logins-menu-menuitem-import-from-another-browser = Import from Another Browser…
 about-logins-menu-menuitem-import-from-a-file = Import from a File…
 about-logins-menu-menuitem-export-logins = Export Logins…
+about-logins-menu-menuitem-remove-all-logins = Remove All Logins…
 menu-menuitem-preferences =
   { PLATFORM() ->
       [windows] Options
@@ -160,6 +161,40 @@
 confirm-delete-dialog-message = This action cannot be undone.
 about-logins-confirm-remove-dialog-confirm-button = Remove
 
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+  { $count ->
+     [1] Remove
+    *[other] Remove All
+  }
+
+about-logins-confirm-remove-all-dialog-checkbox-label =
+  { $count ->
+     [1] Yes, remove this login
+    *[other] Yes, remove these logins
+  }
+
+about-logins-confirm-remove-all-dialog-title =
+  { $count ->
+     [one] Remove { $count } login?
+    *[other] Remove all { $count } logins?
+  }
+about-logins-confirm-remove-all-dialog-message =
+  { $count ->
+     [1] This will remove the login you’ve saved to { -brand-short-name } and any breach alerts that appear here. You won’t be able to undo this action.
+    *[other] This will remove the logins you’ve saved to { -brand-short-name } and any breach alerts that appear here. You won’t be able to undo this action.
+  }
+
+about-logins-confirm-remove-all-sync-dialog-title =
+  { $count ->
+     [one] Remove { $count } login from all devices?
+    *[other] Remove all { $count } logins from all devices?
+  }
+about-logins-confirm-remove-all-sync-dialog-message=
+  { $count ->
+     [1] This will remove the login you’ve saved to { -brand-short-name } on all devices synced to your { -fxaccount-brand-name }. This will also remove breach alerts that appear here. You won’t be able to undo this action.
+    *[other] This will remove all logins you’ve saved to { -brand-short-name } on all devices synced to your { -fxaccount-brand-name }. This will also remove breach alerts that appear here. You won’t be able to undo this action.
+  }
+
 about-logins-confirm-export-dialog-title = Export logins and passwords
 about-logins-confirm-export-dialog-message = Your passwords will be saved as readable text (e.g., BadP@ssw0rd) so anyone who can open the exported file can view them.
 about-logins-confirm-export-dialog-confirm-button = Export…
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/appMenuNotifications.ftl firefox-85.0+build1/browser/locales/en-US/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/appMenuNotifications.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/appMenuNotifications.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -40,18 +40,18 @@
     .label = Allow this extension to run in Private Windows
     .accesskey = A
 
-appmenu-new-tab-controlled =
-    .label = Your New Tab has changed.
+appmenu-new-tab-controlled-changes =
+    .label = Your new tab has changed.
     .buttonlabel = Keep Changes
     .buttonaccesskey = K
-    .secondarybuttonlabel = Disable Extension
-    .secondarybuttonaccesskey = D
-appmenu-homepage-controlled =
-    .label = Your home page has changed.
+    .secondarybuttonlabel = Manage New Tabs
+    .secondarybuttonaccesskey = M
+appmenu-homepage-controlled-changes =
+    .label = Your homepage has changed.
     .buttonlabel = Keep Changes
     .buttonaccesskey = K
-    .secondarybuttonlabel = Disable Extension
-    .secondarybuttonaccesskey = D
+    .secondarybuttonlabel = Manage Homepage
+    .secondarybuttonaccesskey = M
 appmenu-tab-hide-controlled =
     .label = Access Your Hidden Tabs
     .buttonlabel = Keep Tabs Hidden
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/asrouter.ftl firefox-85.0+build1/browser/locales/en-US/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/asrouter.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/newtab/asrouter.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -105,17 +105,6 @@
 
 cfr-whatsnew-release-notes-link-text = Read the release notes
 
-cfr-whatsnew-fx70-title = { -brand-short-name } now fights harder for your privacy
-cfr-whatsnew-fx70-body =
-   The latest update enhances the Tracking Protection feature and makes it
-   easier than ever to create secure passwords for every site.
-
-cfr-whatsnew-tracking-protect-title = Protect yourself from trackers
-cfr-whatsnew-tracking-protect-body =
-   { -brand-short-name } blocks many common social and cross-site trackers that
-   follow what you do online.
-cfr-whatsnew-tracking-protect-link-text = View Your Report
-
 # 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.
@@ -139,10 +128,8 @@
    backed up passwords from anywhere.
 cfr-whatsnew-lockwise-take-link-text = Get the app
 
-## Search Bar
+## Search bar
 
-cfr-whatsnew-searchbar-title = Type less, find more with the address bar
-cfr-whatsnew-searchbar-body-topsites = Now, just select the address bar, and a box will expand with links to your top sites.
 cfr-whatsnew-searchbar-icon-alt-text = Magnifying glass icon
 
 ## Picture-in-Picture
@@ -151,12 +138,6 @@
 cfr-whatsnew-pip-body = Picture-in-picture pops video into a floating window so you can watch while working in other tabs.
 cfr-whatsnew-pip-cta = Learn more
 
-## Permission Prompt
-
-cfr-whatsnew-permission-prompt-header = Fewer annoying site pop-ups
-cfr-whatsnew-permission-prompt-body = { -brand-shorter-name } now blocks sites from automatically asking to send you pop-up messages.
-cfr-whatsnew-permission-prompt-cta = Learn more
-
 ## Fingerprinter Counter
 
 # This string is displayed before a large numeral that indicates the total
@@ -187,21 +168,6 @@
 cfr-doorhanger-sync-logins-ok-button = Turn on { -sync-brand-short-name }
   .accesskey = T
 
-## Send Tab
-
-cfr-doorhanger-send-tab-header = Read this on the go
-cfr-doorhanger-send-tab-recipe-header = Take this recipe to the kitchen
-cfr-doorhanger-send-tab-body = Send Tab lets you easily share this link to your phone or anywhere you’re signed in to { -brand-product-name }.
-cfr-doorhanger-send-tab-ok-button = Try Send Tab
-  .accesskey = T
-
-## Firefox Send
-
-cfr-doorhanger-firefox-send-header = Share this PDF securely
-cfr-doorhanger-firefox-send-body = Keep your sensitive documents safe from prying eyes with end-to-end encryption and a link that disappears when you’re done.
-cfr-doorhanger-firefox-send-ok-button = Try { -send-brand-name }
-  .accesskey = T
-
 ## Social Tracking Protection
 
 cfr-doorhanger-socialtracking-ok-button = See Protections
@@ -233,24 +199,6 @@
 
 ## What’s New Panel Content for Firefox 76
 
-## Lockwise message
-
-cfr-whatsnew-lockwise-header = Easily create secure passwords
-cfr-whatsnew-lockwise-body = It’s difficult to think of unique, secure passwords for every account. When creating a password, select the password field to use a secure, generated password from { -brand-shorter-name }.
-cfr-whatsnew-lockwise-icon-alt = { -lockwise-brand-short-name } icon
-
-## Vulnerable Passwords message
-
-cfr-whatsnew-passwords-header = Get alerts about vulnerable passwords
-cfr-whatsnew-passwords-body = Hackers know people reuse the same passwords. If you used the same password on multiple sites, and one of those sites was in a data breach, you’ll see an alert in { -lockwise-brand-short-name } to change your password on those sites.
-cfr-whatsnew-passwords-icon-alt = Vulnerable password key icon
-
-## Picture-in-Picture fullscreen message
-
-cfr-whatsnew-pip-fullscreen-header = Take picture-in-picture fullscreen
-cfr-whatsnew-pip-fullscreen-body = When you pop a video into a floating window, you can now double-click on that window to go fullscreen.
-cfr-whatsnew-pip-fullscreen-icon-alt = Picture-in-picture icon
-
 ## Protections Dashboard message
 
 cfr-whatsnew-protections-header = Protections at a glance
@@ -258,11 +206,6 @@
 cfr-whatsnew-protections-cta-link = View Protections Dashboard
 cfr-whatsnew-protections-icon-alt = Shield icon
 
-## Better PDF message
-
-cfr-whatsnew-better-pdf-header = Better PDF experience
-cfr-whatsnew-better-pdf-body = PDF documents now open directly in { -brand-short-name }, keeping your workflow within easy reach.
-
 ## DOH Message
 
 cfr-doorhanger-doh-body = Your privacy matters. { -brand-short-name } now securely routes your DNS requests whenever possible to a partner service to protect you while you browse.
@@ -297,3 +240,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Search shortcuts in the address bar
 cfr-whatsnew-search-shortcuts-body = Now, when you type a search engine or specific site into the address bar, a blue shortcut will appear in the search suggestions beneath. Select that shortcut to complete your search directly from the address bar.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protection from malicious supercookies
+cfr-whatsnew-supercookies-body = Websites can secretly attach a “supercookie� to your browser that can follow you around the web, even after you clear your cookies. { -brand-short-name } now provides strong protection against supercookies so they can’t be used to track your online activities from one site to the next.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Better bookmarking
+cfr-whatsnew-bookmarking-body = It’s easier to keep track of your favorite sites. { -brand-short-name } now remembers your preferred location for saved bookmarks, shows the bookmarks toolbar by default on new tabs, and gives you easy access to the rest of your bookmarks via a toolbar folder.
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/newtab.ftl firefox-85.0+build1/browser/locales/en-US/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/newtab.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/newtab/newtab.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,9 @@
 newtab-page-title = New Tab
 newtab-settings-button =
     .title = Customize your New Tab page
+newtab-personalize-button-label = Personalize
+    .title = Personalize new tab
+    .aria-label = Personalize new tab
 
 ## Search box component.
 
@@ -177,6 +180,7 @@
 
 newtab-section-header-topsites = Top Sites
 newtab-section-header-highlights = Highlights
+newtab-section-header-recent-activity = Recent activity
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recommended by { $provider }
@@ -214,3 +218,28 @@
 
 newtab-error-fallback-info = Oops, something went wrong loading this content.
 newtab-error-fallback-refresh-link = Refresh page to try again.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Shortcuts
+newtab-custom-shortcuts-subtitle = Sites you save or visit
+newtab-custom-row-selector =
+        { $num ->
+            [one] { $num } row
+           *[other] { $num } rows
+        }
+newtab-custom-sponsored-sites = Sponsored shortcuts
+newtab-custom-pocket-title = Recommended by { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Exceptional content curated by { -pocket-brand-name }, part of the { -brand-product-name } family
+newtab-custom-pocket-sponsored = Sponsored stories
+newtab-custom-recent-title = Recent activity
+newtab-custom-recent-subtitle = A selection of recent sites and content
+newtab-custom-close-button = Close
+
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippets
+newtab-custom-snippets-subtitle = Tips and news from { -vendor-short-name } and { -brand-product-name }
+newtab-custom-settings = Manage more settings
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/onboarding.ftl firefox-85.0+build1/browser/locales/en-US/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/newtab/onboarding.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/newtab/onboarding.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -11,9 +11,6 @@
 onboarding-welcome-header = Welcome to { -brand-short-name }
 onboarding-start-browsing-button-label = Start Browsing
 onboarding-not-now-button-label = Not now
-onboarding-cards-dismiss =
-    .title = Dismiss
-    .aria-label = Dismiss
 
 ## Custom Return To AMO onboarding strings
 
@@ -120,62 +117,3 @@
   .aria-description =
     Use a colorful appearance for buttons,
     menus, and windows.
-
-## These strings belong to the individual onboarding messages.
-
-## Each message has a title and a description of what the browser feature is.
-## Each message also has an associated button for the user to try the feature.
-## The string for the button is found above, in the UI strings section
-
-onboarding-tracking-protection-title2 = Protection From Tracking
-onboarding-tracking-protection-text2 = { -brand-short-name } helps stop websites from tracking you online, making it harder for ads to follow you around the web.
-onboarding-tracking-protection-button2 = How it Works
-
-onboarding-data-sync-title = Take Your Settings with You
-# "Sync" is short for synchronize.
-onboarding-data-sync-text2 = Sync your bookmarks, passwords, and more everywhere you use { -brand-product-name }.
-onboarding-data-sync-button2 = Sign in to { -sync-brand-short-name }
-
-onboarding-firefox-monitor-title = Stay Alert to Data Breaches
-onboarding-firefox-monitor-text2 = { -monitor-brand-name } monitors if your email has appeared in a known data breach and alerts you if it appears in a new breach.
-onboarding-firefox-monitor-button = Sign Up for Alerts
-
-onboarding-browse-privately-title = Browse Privately
-onboarding-browse-privately-text = Private Browsing clears your search and browsing history to keep it secret from anyone who uses your computer.
-onboarding-browse-privately-button = Open a Private Window
-
-onboarding-firefox-send-title = Keep Your Shared Files Private
-onboarding-firefox-send-text2 = Upload your files to { -send-brand-name } to share them with end-to-end encryption and a link that automatically expires.
-onboarding-firefox-send-button = Try { -send-brand-name }
-
-onboarding-mobile-phone-title = Get { -brand-product-name } on Your Phone
-onboarding-mobile-phone-text = Download { -brand-product-name } for iOS or Android and sync your data across devices.
-# "Mobile" is short for mobile/cellular phone, "Browser" is short for web
-# browser.
-onboarding-mobile-phone-button = Download Mobile Browser
-
-onboarding-send-tabs-title = Instantly Send Yourself Tabs
-# "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a
-# tab's context menu.
-onboarding-send-tabs-text2 = Easily share pages between your devices without having to copy links or leave the browser.
-onboarding-send-tabs-button = Start Using Send Tabs
-
-onboarding-pocket-anywhere-title = Read and Listen Anywhere
-onboarding-pocket-anywhere-text2 = Save your favorite content offline with the { -pocket-brand-name } App and read, listen, and watch whenever it’s convenient for you.
-onboarding-pocket-anywhere-button = Try { -pocket-brand-name }
-
-onboarding-lockwise-strong-passwords-title = Create and Store Strong Passwords
-onboarding-lockwise-strong-passwords-text = { -lockwise-brand-name } creates strong passwords on the spot and saves all of them in one place.
-onboarding-lockwise-strong-passwords-button = Manage Your Logins
-
-onboarding-facebook-container-title = Set Boundaries with Facebook
-onboarding-facebook-container-text2 = { -facebook-container-brand-name } keeps your profile separate from everything else, making it harder for Facebook to target you with ads.
-onboarding-facebook-container-button = Add the Extension
-
-onboarding-import-browser-settings-title = Import Your Bookmarks, Passwords, and More
-onboarding-import-browser-settings-text = Dive right in—easily bring your Chrome sites and settings with you.
-onboarding-import-browser-settings-button = Import Chrome Data
-
-onboarding-personal-data-promise-title = Private by Design
-onboarding-personal-data-promise-text = { -brand-product-name } treats your data with respect by taking less of it, protecting it, and being clear about how we use it.
-onboarding-personal-data-promise-button = Read our Promise
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/preferences/preferences.ftl firefox-85.0+build1/browser/locales/en-US/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/preferences/preferences.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/preferences/preferences.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -95,14 +95,6 @@
 ## Variables:
 ##   $name (String): name of the extension
 
-# This string is shown to notify the user that their home page
-# is being controlled by an extension.
-extension-controlled-homepage-override = An extension, <img data-l10n-name="icon"/> { $name }, is controlling your home page.
-
-# This string is shown to notify the user that their new tab page
-# is being controlled by an extension.
-extension-controlled-new-tab-url = An extension, <img data-l10n-name="icon"/> { $name }, is controlling your New Tab page.
-
 # This string is shown to notify the user that the password manager setting
 # is being controlled by an extension
 extension-controlled-password-saving = An extension, <img data-l10n-name="icon"/> { $name }, is controlling this setting.
@@ -629,6 +621,11 @@
 home-prefs-topsites-description = The sites you visit most
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsored Top Sites
+home-prefs-shortcuts-header =
+    .label = Shortcuts
+home-prefs-shortcuts-description = Sites you save or visit
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsored shortcuts
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -636,6 +633,7 @@
 home-prefs-recommended-by-header =
     .label = Recommended by { $provider }
 home-prefs-recommended-by-description-update = Exceptional content from across the web, curated by { $provider }
+home-prefs-recommended-by-description-new = Exceptional content curated by { $provider }, part of the { -brand-product-name } family
 ##
 
 home-prefs-recommended-by-learn-more = How it works
@@ -654,6 +652,10 @@
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pages Saved to { -pocket-brand-name }
 
+home-prefs-recent-activity-header =
+    .label = Recent activity
+home-prefs-recent-activity-description = A selection of recent sites and content
+
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -661,6 +663,9 @@
 home-prefs-snippets-header =
     .label = Snippets
 home-prefs-snippets-description = Updates from { -vendor-short-name } and { -brand-product-name }
+
+home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name }
+
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -1110,6 +1115,9 @@
 addressbar-locbar-topsites-option =
     .label = Top sites
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Search engines
+    .accesskey = a
 
 addressbar-suggestions-settings = Change preferences for search engine suggestions
 
@@ -1313,16 +1321,6 @@
 
 certs-header = Certificates
 
-certs-personal-label = When a server requests your personal certificate
-
-certs-select-auto-option =
-    .label = Select one automatically
-    .accesskey = S
-
-certs-select-ask-option =
-    .label = Ask you every time
-    .accesskey = A
-
 certs-enable-ocsp =
     .label = Query OCSP responder servers to confirm the current validity of certificates
     .accesskey = Q
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/browser/toolbarContextMenu.ftl firefox-85.0+build1/browser/locales/en-US/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/browser/locales/en-US/browser/toolbarContextMenu.ftl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/browser/toolbarContextMenu.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -55,12 +55,16 @@
     .label = Customize…
     .accesskey = C
 
-toolbar-context-menu-bookmarks-toolbar-always-show =
-    .label = Always
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Always Show
     .accesskey = A
-toolbar-context-menu-bookmarks-toolbar-never-show =
-    .label = Never
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Never Show
     .accesskey = N
-toolbar-context-menu-bookmarks-toolbar-on-new-tab =
-    .label = Only on New Tab
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Only Show on New Tab
     .accesskey = O
+
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Show Other Bookmarks
+    .accesskey = h
diff -Nru firefox-84.0.2+build1/browser/locales/en-US/chrome/browser/browser.properties firefox-85.0+build1/browser/locales/en-US/chrome/browser/browser.properties
--- firefox-84.0.2+build1/browser/locales/en-US/chrome/browser/browser.properties	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/en-US/chrome/browser/browser.properties	2021-01-18 19:58:08.000000000 +0000
@@ -767,6 +767,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=W
 getUserMedia.pickWindowOrScreen.label = Select Window or Screen
 getUserMedia.shareEntireScreen.label = Entire screen
+getUserMedia.sharePipeWirePortal.label = Use operating system settings
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/browser/locales/l10n-changesets.json firefox-85.0+build1/browser/locales/l10n-changesets.json
--- firefox-84.0.2+build1/browser/locales/l10n-changesets.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/locales/l10n-changesets.json	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b7c51131d66f7b9acf57784eab71bf2b5ccf3b48"
+        "revision": "5931ef1b8321f1f35b4448e5e0041413943b797e"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "39a312857e262a7f5cb88c9b3b271030e62d6eb5"
+        "revision": "d8253e153fe43474a150de4dce5755261745c75c"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6d47fe0b577939edcdbeed42564ecadb12af61c3"
+        "revision": "d2d1af6bd47e55e008a2a18611e915368df0c414"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4532a784f6ae280f6bc56a8e480bc1b0d3ffd2a5"
+        "revision": "a5ec12818da503166a13563ef17582dafa920249"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "092da3c0bc1bcc3c8d6e58b831d7af090f75f7cb"
+        "revision": "2c0f6a0da2cc1407e2d884471868bdac4000cd37"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "3e773c68eb41d6feb47fb043772b66abfe9cfa4c"
+        "revision": "b4abfad8128347151d5ed5dd27b51e9cdfd056cd"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e608c09c29cb05e13b26352f324a901d9e5a2dd4"
+        "revision": "486e503c3cea65b9fa4302c24f150c3525d100ab"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b1275cf66da4f72af437faee6c7198c87dfa4bfe"
+        "revision": "1c333dd3ed3560dde62f9a0b829688c6dd9feda8"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d3ca3a8b081fffaa41a595a02492abc4e467c232"
+        "revision": "7884a1950bc6c8d736218695dd3cb938529c0f1a"
     },
     "br": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "55e429dce327ecd8ee648db4ab168225edf66b13"
+        "revision": "c208e5501de9ebee30e7643d7638c0e408a2b1b6"
     },
     "bs": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8e419224f451d258280cf9cb4f5904f0ab7c1f66"
+        "revision": "1a15c4fa9b5293ddb125bc1f2599cf1406630898"
     },
     "ca": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b1b7a5f533eebcaf5c41d40c0eb2f84712e038a0"
+        "revision": "69c7a81099249fe9afdaa1253005b41e04762625"
     },
     "ca-valencia": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "83cb1916a9883f05ea0a25d2cdd7b8733dba9c2f"
+        "revision": "82c6c166cd8d8d18f7ee069424363f2916bd9c03"
     },
     "cak": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "00ac02c3d65bf3350db11412bae8ac3ed9d649a0"
+        "revision": "348fb951da2e44231b1fbb9381dd16933df05603"
     },
     "cs": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "750804d5fe56eaafe57b016589c285bdf0cc730e"
+        "revision": "52299869923f96dedb36777d26b3e3786301c780"
     },
     "cy": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "384cd707c94d5a9c2546611fbda6b477a17a3959"
+        "revision": "ad2e7075de5e328d37929cc7839f7de2e6688795"
     },
     "da": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "95d3c0771469862d511313aa6531f642199754bd"
+        "revision": "f806376c1b216267be7bf6b135107344d1fae569"
     },
     "de": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ddb65124e914083cda1cf9b17dfd2ca685cb4b14"
+        "revision": "fb4085344c54dfc7449c47bb90f79e93debb0421"
     },
     "dsb": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "942a2c0fe0699ce193ce923a9c77f11398ccfa96"
+        "revision": "bb27af18ad8854d242e3ba5ffba65bf12816a232"
     },
     "el": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "15d6b6a9903f7cbd1288a138f7b4ab8c18780fff"
+        "revision": "405b8fe65766300f306da2b998e71f2a209605fd"
     },
     "en-CA": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "14e7baa702c4faa6c565a95498d769bf9407addf"
+        "revision": "de63f66fdc8575348c0d37daf179f50bdff45c04"
     },
     "en-GB": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "45b3ae3f1990acb17146c8d3fd12660cea5cfedf"
+        "revision": "6065958f0b5adf07624d5b3f83baa02da1f9dd3a"
     },
     "eo": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0e9255ffc074a32174fbc6857298019836007d95"
+        "revision": "b1845240671e32615314500ac57353b782d7cf4f"
     },
     "es-AR": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "73f5fac35fc77d8e9f9b9fca6bd521c4c6595574"
+        "revision": "22c1e1d73dece24e1531725c49456f812ae6f69b"
     },
     "es-CL": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7e4051e9b457f4ecb091ef31009e79cb39ed4876"
+        "revision": "5359018de29824f58836350a45637f91651056c6"
     },
     "es-ES": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "21489ae1ddc1ac3ab567dc9c5dcc9d4b1f4184fb"
+        "revision": "ea9ace16c3f2437ddb60a65db5da6c14fbacf67c"
     },
     "es-MX": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "16ec48890d93f77cb496ea20ae26bd60e285b636"
+        "revision": "1a2efd67768e431812c8ac8fb48e66ee68b8b7d4"
     },
     "et": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cda8b0f2f9a900bce4b58b307740cb611cf34c75"
+        "revision": "ee3e8a70abd84b877f0297ba288de23d55420542"
     },
     "eu": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b0e86dfe840570f4f2883c7e52a18f70b2585ecb"
+        "revision": "6631fb78bf0afe5573032db4c3fd07384025c351"
     },
     "fa": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "5c2eee6e0c0eab15d5fdfcfae8cb63ee8a856644"
+        "revision": "6e12b4da7dcb8d13892f764af154685d33094c52"
     },
     "ff": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d3da0d2552e1f352183329e538fb828d2e7da0d0"
+        "revision": "ae465c0bcc2011e9f45cd89a89d0269a9fd8acea"
     },
     "fi": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b08bc1c593e8b6d8fe93c966bb0156f7727725a4"
+        "revision": "f6976fadbb902414d8ccfa1817719efc58da8a6a"
     },
     "fr": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0265b469dab6dd8763af275aeb104da286a44f02"
+        "revision": "81ddb962639bcacac59600a57ebcbd9aad4a4411"
     },
     "fy-NL": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ff4c902458a452b40be584c49ea5d432942c9ffc"
+        "revision": "5712c29aa35eadaf3a4c4d9be0a50d65d8bd0569"
     },
     "ga-IE": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "90e429cd3aeea754b12e7755529745e95da76468"
+        "revision": "f3445cc36583c5b9981d5950d8d6878e7d71f246"
     },
     "gd": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "36e6ed4c26af24163bc1839c77f8e612bcee1689"
+        "revision": "c93c3b8dfd79557f2a641483a4660d32170a6829"
     },
     "gl": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1884cffa6ec1748e304c8139336884223a5bae5f"
+        "revision": "644c99fed4ff4b794efc7b8c748964c1445dcd29"
     },
     "gn": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e168253be7681b50700606fbcc8de76f76307433"
+        "revision": "97e82f41669ef8479dbd1914bcd2c683f7b95c16"
     },
     "gu-IN": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9e28a0389e29032d40a1fe7501d946c5eb83f104"
+        "revision": "a6124b684332c7d589864790dd37afa0dceee95b"
     },
     "he": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f94455601307a064c650b4a16be61328dfe45d87"
+        "revision": "a8fe48d30737ef3f0d3a17f386819c7a5c6aa9fb"
     },
     "hi-IN": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "26133f3764584f41415c60a74230a03f2c31cb4a"
+        "revision": "9082b3ae142e3e4689a4d838e8d0f079a6cf8a98"
     },
     "hr": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a74d2dd80766d69977aabbf885c41e398528f98e"
+        "revision": "deadd8f68ba55a73b8194f41100dc4b28766467b"
     },
     "hsb": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9edb2358d3c7ceb3ce2059726851b206547e5028"
+        "revision": "8b140e3f3f1412ae58f3edfc76223decc1d16fa9"
     },
     "hu": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6979730b70be6c34677172ca4cf9a4118831581c"
+        "revision": "24f1d711325b975396713cf78e5e7a57c771da1b"
     },
     "hy-AM": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "690bd531df639506e326c43c6e497cf585326960"
+        "revision": "85ae30de1184274e23ccc3e88fdf6456856315c4"
     },
     "ia": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8587e207b3276a6a735263e1fda531c826daef3b"
+        "revision": "8a6fa89de8870280cbc3a6f18af73daf1fc602d5"
     },
     "id": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "404a32cfdf999fbf54ea2d70ddb35e75c231ca23"
+        "revision": "ccc1ea4e75f2b484cba880ee2d110a222f6c9bb1"
     },
     "is": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a343eeb84be66943ccf1f026a0960a175b1d476f"
+        "revision": "f97052bd86d3e45d10d688c59411a18d411d082c"
     },
     "it": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f5b7c0ffeb52a9b99aff849343ab6ab596bfd7b4"
+        "revision": "d342ad30e60a95059c4a59cc1674c869e2a517b6"
     },
     "ja": {
         "pin": false,
@@ -895,7 +895,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "93229fc044fccd4e5ff4ebdea3bacec9d8a3a212"
+        "revision": "3bf640364769b6b1c70c0119f5f9997b3861262a"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -903,7 +903,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "3c226554e733aab4bd500267f480bab144128e9e"
+        "revision": "6deeb76870e9272b4b7538ae852841282ecc5783"
     },
     "ka": {
         "pin": false,
@@ -921,7 +921,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a0905da2899201e777e14278cde9d7dba2bdb233"
+        "revision": "d3de2aab42be56ba3efc5c7ae2a39b25a0da4692"
     },
     "kab": {
         "pin": false,
@@ -939,7 +939,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "08e76b063e416f177a90a16de9b15b0fdd075922"
+        "revision": "eebd2fbbe86cb52f4cc3c834d5f9bb3a799dbc4d"
     },
     "kk": {
         "pin": false,
@@ -957,7 +957,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "37b321109f70b332c7c30672f9002bb1dc629c6d"
+        "revision": "b74d15d5572fea9d615eec802e3402e48f845844"
     },
     "km": {
         "pin": false,
@@ -975,7 +975,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "94ab8b097aaf010df0dd140e7ba7b4613f152571"
+        "revision": "9c9351c5374c2eb2cedc89d82e25a588c1503692"
     },
     "kn": {
         "pin": false,
@@ -993,7 +993,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c1a7c317d39033fc45ec94b9e9b8d8dbfd3655e7"
+        "revision": "0cef02eaa9eaeaac7249fb05c39b6ddbc874d8d3"
     },
     "ko": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "64851df10dc77251c64413a8b7d6d66e34e0291d"
+        "revision": "fa9ad2e777b4cba20553e677ef81e90e270d48a3"
     },
     "lij": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "985306a40226f04b593181d683a7ef477b061cdb"
+        "revision": "fd5002fd59c7c8af39c2791e9144e5bd421e0b03"
     },
     "lt": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b38e69052c4067d12d36ea1347820c51914b7422"
+        "revision": "fc5ea3fa4b246e53fd79c9d21c466b08e62b7697"
     },
     "lv": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0e47383e4a7a90fcc4ae37fb8e48cae6e6b0d6a7"
+        "revision": "23e5e9be7bbf35d9c488df10777991789b8233b6"
     },
     "mk": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6e1d507ad573bd0c9c91f2a1d42918217ff21844"
+        "revision": "318efe6b098218d25a2dd0acfc1120eabab641c1"
     },
     "mr": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4709fe8c5bb500280202696696b2bfb17d4c1323"
+        "revision": "cdc47acbdf3feeea13b356918a18199ba6f39e09"
     },
     "ms": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b2c85133686c4ec10688878e0049f8e501fb0560"
+        "revision": "44026eefaaa59ad255336f16e77f9ea4f4b7f78e"
     },
     "my": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7fb7f3ebe42bb6868706e766f393fd5dd508420c"
+        "revision": "45573b562c639e3b20c9e7b4ca2e35a92c642010"
     },
     "nb-NO": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0e452bb81f52154c6f1a055e5609d9ab88f1ca68"
+        "revision": "d806c3b140104228468a960ba6fd40ce1d4cc314"
     },
     "ne-NP": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c2338facd6260d8074e9a2774774705a157ca700"
+        "revision": "11925dc20a0c3e261b89b91d5069604310a0edab"
     },
     "nl": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "735459e992a0084c61ab7b7f100bda60825c82ad"
+        "revision": "836f75380c48ee1e1e410b1f362d37a4b8e4b9aa"
     },
     "nn-NO": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "95cfead463dc5d13b9a01ae240f38adc74fa52a0"
+        "revision": "c10f275625cd9e5d206e17d7b2bfb2494ab713aa"
     },
     "oc": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "61b8e31ba7d6dd29719bc1510fe2f456faa40dcf"
+        "revision": "bc210791bdfcd1a9941e62d6f9f3bd11949dafb8"
     },
     "pa-IN": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "07e47c62b635b7733eebfb78c555b314845bf366"
+        "revision": "e002c738964319dc29a063ed206aac0c99a97137"
     },
     "pl": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "231ffee64fc22e8744043da6818c053c495cdf56"
+        "revision": "be448df7cce1750e767baca2b04aa466d60e489d"
     },
     "pt-BR": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "9342b57fc84e08faf7a8c00f0274b5a1169416de"
+        "revision": "cce4bfbb3bca07dbcecb2d15f566551b56c4d7dc"
     },
     "pt-PT": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f3fb06b7b493681ebad94e37f87a78baf69221ff"
+        "revision": "799e3f9548edbeee8833004f028f1ad13876a6b5"
     },
     "rm": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "67fd2980b94307d017b11f823beb752d70f78ca3"
+        "revision": "985ecad67eac992051742e05a56e1b349f3f53b7"
     },
     "ro": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "af6a1e3768ca9d002c05191bbacaeead8ff713a5"
+        "revision": "9f84b0c8057487241b665ab927e800f06ad4f344"
     },
     "ru": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "816f1e8c54a6afd59c0951c94b6367cd8990fe7c"
+        "revision": "67cdcb3532efc212bc1ef8be22ee1460aa7320c0"
     },
     "si": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1b1c583bc1a7f3d4f17d688a0aebb2f18351d68f"
+        "revision": "56312dd141ef51a3529c320d129d10f53e0bf1eb"
     },
     "sk": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8de2ed39cf199876aa05253f1250f6926307849f"
+        "revision": "fcacf7c3b0553af13da134faefa3d110d0dea50a"
     },
     "sl": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "aca7a42dea91813f27ec7a537cc5f05d94d8b120"
+        "revision": "409c6a3d314cecc2d7c2ced9d8d6640eaaf4ecbf"
     },
     "son": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "bb6e67b163aa48a25687ab548af3af673200fa0b"
+        "revision": "074a242f4e8e7f4d56222cd151970111a220578b"
     },
     "sq": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "5ea1444b0fff8ccc3256f1b81c8999f7082e3f3d"
+        "revision": "c8ae93ded129ca25903c679d95fdde68db72f82e"
     },
     "sr": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "44e025928077cff5f06eaf1795e1ef56308ea056"
+        "revision": "007496a6854ab47ed248be723ae98ac81e27911a"
     },
     "sv-SE": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "efda9d877f94df4ef26181c95787738acdcf7176"
+        "revision": "1978d5ab8357852f8df79e773aadc4fb50563520"
     },
     "ta": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2983431013c5c1796a814fcf884086c0ac45f332"
+        "revision": "48d383b1244f3cab3ab099e7f6cc0dbdd1792393"
     },
     "te": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "967a948f8c58d17fd0943192a6920788f1d0931b"
+        "revision": "be5186d50fc297da4e39053ebe41e602614f6c7f"
     },
     "th": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2bfa6c8426df66eab36d6c02962e73858f2c5c6b"
+        "revision": "4a8026c1564e312e4d952fdddf5b7f998f03a8d8"
     },
     "tl": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e820082133880774f553db379f2b650462d45085"
+        "revision": "3f13e6cf3ee24a7fbedeebeefb82c204411fec26"
     },
     "tr": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "18085000af4c5f39133ccb92335a960d591a6410"
+        "revision": "915e9c207473c6c2f4353eae809dcf89ae29ca27"
     },
     "trs": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "41f27a51143874a6416a1ff50fab665c9a77b922"
+        "revision": "251f8c6cab5d0ec8da60fda09619fbe9fbb4b327"
     },
     "uk": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fa85ea439b855569575f785fe388efdd29a2a139"
+        "revision": "5d40241a26298ee40ecd4919c6b412435410d649"
     },
     "ur": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4da22818f08e485b51be7039d27e30f66123671a"
+        "revision": "485682538b8ce3f63f8dbac999debd7dd32f243b"
     },
     "uz": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "39321fe4236b530220d766ff6012c2074c0c0144"
+        "revision": "c059c04c0e94a88c982163ee169e7302305b785e"
     },
     "vi": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c368d2e89ec8eb8b61207768b38a9d01ea5dc1e4"
+        "revision": "ca894cdb57ff7b7017b8e467afcd07950ab56c36"
     },
     "xh": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1fd7d240e08eecc1328bc96ed9c7d4681bf80e88"
+        "revision": "32bcf89f6ee201a2837478350a31e2e2d1b6c69f"
     },
     "zh-CN": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a205122a8a5167b02b5687dee4306b9d98210fd3"
+        "revision": "9215337ee86b40225328172a7dea1b342985d126"
     },
     "zh-TW": {
         "pin": false,
@@ -1713,6 +1713,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1f4a6fff730c4fbfeb660ad3f0da6561a79f05ce"
+        "revision": "de2fee3a071ece9bd9cb15db1673682b6ca8ff86"
     }
 }
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/browser/modules/BrowserUsageTelemetry.jsm firefox-85.0+build1/browser/modules/BrowserUsageTelemetry.jsm
--- firefox-84.0.2+build1/browser/modules/BrowserUsageTelemetry.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/BrowserUsageTelemetry.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -22,13 +22,11 @@
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   CustomizableUI: "resource:///modules/CustomizableUI.jsm",
   PageActions: "resource:///modules/PageActions.jsm",
-  PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
+  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm",
   Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   clearTimeout: "resource://gre/modules/Timer.jsm",
-  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
 });
 
 // This pref is in seconds!
@@ -67,24 +65,6 @@
 const TOTAL_URI_COUNT_NORMAL_AND_PRIVATE_MODE_SCALAR_NAME =
   "browser.engagement.total_uri_count_normal_and_private_mode";
 
-// A list of known search origins.
-const KNOWN_SEARCH_SOURCES = [
-  "abouthome",
-  "contextmenu",
-  "newtab",
-  "searchbar",
-  "system",
-  "urlbar",
-  "urlbar-searchmode",
-  "webextension",
-];
-
-const KNOWN_ONEOFF_SOURCES = [
-  "oneoff-urlbar",
-  "oneoff-searchbar",
-  "unknown", // Edge case: this is the searchbar (see bug 1195733 comment 7).
-];
-
 const MINIMUM_TAB_COUNT_INTERVAL_MS = 5 * 60 * 1000; // 5 minutes, in ms
 
 // The elements we consider to be interactive.
@@ -137,6 +117,19 @@
 
 const KNOWN_ADDONS = [];
 
+// Buttons that, when clicked, set a preference to true. The convention
+// is that the preference is named:
+//
+// browser.engagement.<button id>.has-used
+//
+// and is defaulted to false.
+const SET_USAGE_PREF_BUTTONS = [
+  "downloads-button",
+  "fxa-toolbar-menu-button",
+  "home-button",
+  "sidebar-button",
+];
+
 function telemetryId(widgetId, obscureAddons = true) {
   // Add-on IDs need to be obscured.
   function addonId(id) {
@@ -214,13 +207,6 @@
   return pinnedTabs;
 }
 
-function shouldRecordSearchCount(tabbrowser) {
-  return (
-    !PrivateBrowsingUtils.isWindowPrivate(tabbrowser.ownerGlobal) ||
-    !Services.prefs.getBoolPref("browser.engagement.search_counts.pbm", false)
-  );
-}
-
 let URICountListener = {
   // A set containing the visited domains, see bug 1271310.
   _domainSet: new Set(),
@@ -263,7 +249,7 @@
   onLocationChange(browser, webProgress, request, uri, flags) {
     if (!(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT)) {
       // By default, assume we no longer need to track this tab.
-      SearchTelemetry.stopTrackingBrowser(browser);
+      SearchSERPTelemetry.stopTrackingBrowser(browser);
     }
 
     // Don't count this URI if it's an error page.
@@ -334,11 +320,8 @@
       return;
     }
 
-    if (
-      shouldRecordSearchCount(browser.getTabBrowser()) &&
-      !(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT)
-    ) {
-      SearchTelemetry.updateTrackingStatus(browser, uriSpec);
+    if (!(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT)) {
+      SearchSERPTelemetry.updateTrackingStatus(browser, uriSpec);
     }
 
     // Update total URI count, including when in private mode.
@@ -426,8 +409,7 @@
     getTelemetryClientId: async () => ClientID.getClientID(),
     getUpdateDirectory: () => Services.dirsvc.get("UpdRootD", Ci.nsIFile),
     readProfileCountFile: async path => IOUtils.readUTF8(path),
-    writeProfileCountFile: async (path, data) =>
-      IOUtils.writeAtomicUTF8(path, data),
+    writeProfileCountFile: async (path, data) => IOUtils.writeUTF8(path, data),
   },
 
   _inited: false,
@@ -544,305 +526,6 @@
   },
 
   /**
-   * The main entry point for recording search related Telemetry. This includes
-   * search counts and engagement measurements.
-   *
-   * Telemetry records only search counts per engine and action origin, but
-   * nothing pertaining to the search contents themselves.
-   *
-   * @param {tabbrowser} tabbrowser
-   *        The tabbrowser where the search was loaded.
-   * @param {nsISearchEngine} engine
-   *        The engine handling the search.
-   * @param {String} source
-   *        Where the search originated from. See KNOWN_SEARCH_SOURCES for allowed
-   *        values.
-   * @param {Object} [details] Options object.
-   * @param {Boolean} [details.isOneOff=false]
-   *        true if this event was generated by a one-off search.
-   * @param {Boolean} [details.isSuggestion=false]
-   *        true if this event was generated by a suggested search.
-   * @param {Boolean} [details.isFormHistory=false]
-   *        true if this event was generated by a form history result.
-   * @param {String} [details.alias=null]
-   *        The search engine alias used in the search, if any.
-   * @param {Object} [details.type=null]
-   *        The object describing the event that triggered the search.
-   * @throws if source is not in the known sources list.
-   */
-  recordSearch(tabbrowser, engine, source, details = {}) {
-    if (!shouldRecordSearchCount(tabbrowser)) {
-      return;
-    }
-
-    const countIdPrefix = `${engine.telemetryId}.`;
-    const countIdSource = countIdPrefix + source;
-    let histogram = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS");
-
-    if (details.isOneOff) {
-      if (!KNOWN_ONEOFF_SOURCES.includes(source)) {
-        // Silently drop the error if this bogus call
-        // came from 'urlbar' or 'searchbar'. They're
-        // calling |recordSearch| twice from two different
-        // code paths because they want to record the search
-        // in SEARCH_COUNTS.
-        if (["urlbar", "searchbar"].includes(source)) {
-          histogram.add(countIdSource);
-          PartnerLinkAttribution.makeSearchEngineRequest(
-            engine,
-            details.url
-          ).catch(Cu.reportError);
-          return;
-        }
-        throw new Error("Unknown source for one-off search: " + source);
-      }
-    } else {
-      if (!KNOWN_SEARCH_SOURCES.includes(source)) {
-        throw new Error("Unknown source for search: " + source);
-      }
-      if (
-        details.alias &&
-        engine.isAppProvided &&
-        engine.aliases.includes(details.alias)
-      ) {
-        // This is a keyword search using an AppProvided engine.
-        // Record the source as "alias", not "urlbar".
-        histogram.add(countIdPrefix + "alias");
-      } else {
-        histogram.add(countIdSource);
-      }
-    }
-
-    // Dispatch the search signal to other handlers.
-    this._handleSearchAction(engine, source, details);
-  },
-
-  _recordSearch(engine, url, source, action = null) {
-    // The one-off buttons are logged in two places, if we hit here with the
-    // action as oneoff and no url, then we are hitting the attribution case
-    // in `recordSearch` above. Really this needs re-architecturing so we
-    // do not have two distinct calls to `recordSearch` for one-offs
-    // (see bug 1662553).
-    if (!(action == "oneoff" && !url)) {
-      PartnerLinkAttribution.makeSearchEngineRequest(engine, url).catch(
-        Cu.reportError
-      );
-    }
-
-    let scalarKey = action ? "search_" + action : "search";
-    Services.telemetry.keyedScalarAdd(
-      "browser.engagement.navigation." + source,
-      scalarKey,
-      1
-    );
-    Services.telemetry.recordEvent("navigation", "search", source, action, {
-      engine: engine.telemetryId,
-    });
-  },
-
-  /**
-   * Records entry into the Urlbar's search mode.
-   *
-   * Telemetry records only which search mode is entered and how it was entered.
-   * It does not record anything pertaining to searches made within search mode.
-   * @param {object} searchMode
-   *   A search mode object. See UrlbarInput.setSearchMode documentation for
-   *   details.
-   */
-  recordSearchMode(searchMode) {
-    // Search mode preview is not search mode. Recording it would just create
-    // noise.
-    if (searchMode.isPreview) {
-      return;
-    }
-    let scalarKey;
-    if (searchMode.engineName) {
-      let engine = Services.search.getEngineByName(searchMode.engineName);
-      let resultDomain = engine.getResultDomain();
-      // For built-in engines, sanitize the data in a few special cases to make
-      // analysis easier.
-      if (!engine.isAppProvided) {
-        scalarKey = "other";
-      } else if (resultDomain.includes("amazon.")) {
-        // Group all the localized Amazon sites together.
-        scalarKey = "Amazon";
-      } else if (resultDomain.endsWith("wikipedia.org")) {
-        // Group all the localized Wikipedia sites together.
-        scalarKey = "Wikipedia";
-      } else {
-        scalarKey = searchMode.engineName;
-      }
-    } else if (searchMode.source) {
-      scalarKey = UrlbarUtils.getResultSourceName(searchMode.source) || "other";
-    }
-
-    Services.telemetry.keyedScalarAdd(
-      "urlbar.searchmode." + searchMode.entry,
-      scalarKey,
-      1
-    );
-  },
-
-  _handleSearchAction(engine, source, details) {
-    switch (source) {
-      case "urlbar":
-      case "oneoff-urlbar":
-      case "searchbar":
-      case "oneoff-searchbar":
-      case "unknown": // Edge case: this is the searchbar (see bug 1195733 comment 7).
-        this._handleSearchAndUrlbar(engine, source, details);
-        break;
-      case "urlbar-searchmode":
-        this._handleSearchAndUrlbar(engine, "urlbar_searchmode", details);
-        break;
-      case "abouthome":
-        this._recordSearch(engine, details.url, "about_home", "enter");
-        break;
-      case "newtab":
-        this._recordSearch(engine, details.url, "about_newtab", "enter");
-        break;
-      case "contextmenu":
-      case "system":
-      case "webextension":
-        this._recordSearch(engine, details.url, source);
-        break;
-    }
-  },
-
-  /**
-   * This function handles the "urlbar", "urlbar-oneoff", "searchbar" and
-   * "searchbar-oneoff" sources.
-   */
-  _handleSearchAndUrlbar(engine, source, details) {
-    // We want "urlbar" and "urlbar-oneoff" (and similar cases) to go in the same
-    // scalar, but in a different key.
-
-    // When using one-offs in the searchbar we get an "unknown" source. See bug
-    // 1195733 comment 7 for the context. Fix-up the label here.
-    const sourceName =
-      source === "unknown" ? "searchbar" : source.replace("oneoff-", "");
-
-    const isOneOff = !!details.isOneOff;
-    if (isOneOff) {
-      // We will receive a signal from the "urlbar"/"searchbar" even when the
-      // search came from "oneoff-urlbar". That's because both signals
-      // are propagated from search.xml. Skip it if that's the case.
-      // Moreover, we skip the "unknown" source that comes from the searchbar
-      // when performing searches from the default search engine. See bug 1195733
-      // comment 7 for context.
-      if (["urlbar", "searchbar", "unknown"].includes(source)) {
-        return;
-      }
-
-      // If that's a legit one-off search signal, record it using the relative key.
-      this._recordSearch(engine, details.url, sourceName, "oneoff");
-      return;
-    }
-
-    // The search was not a one-off. It was a search with the default search engine.
-    if (details.isFormHistory) {
-      // It came from a form history result.
-      this._recordSearch(engine, details.url, sourceName, "formhistory");
-      return;
-    } else if (details.isSuggestion) {
-      // It came from a suggested search, so count it as such.
-      this._recordSearch(engine, details.url, sourceName, "suggestion");
-      return;
-    } else if (details.alias) {
-      // This one came from a search that used an alias.
-      this._recordSearch(engine, details.url, sourceName, "alias");
-      return;
-    }
-
-    // The search signal was generated by typing something and pressing enter.
-    this._recordSearch(engine, details.url, sourceName, "enter");
-  },
-
-  /**
-   * Records the method by which the user selected a result from the urlbar.
-   *
-   * @param {Event} event
-   *        The event that triggered the selection.
-   * @param {number} index
-   *        The index that the user chose in the popup, or -1 if there wasn't a
-   *        selection.
-   * @param {string} userSelectionBehavior
-   *        How the user cycled through results before picking the current match.
-   *        Could be one of "tab", "arrow" or "none".
-   */
-  recordUrlbarSelectedResultMethod(
-    event,
-    index,
-    userSelectionBehavior = "none"
-  ) {
-    this._recordUrlOrSearchbarSelectedResultMethod(
-      event,
-      index,
-      "FX_URLBAR_SELECTED_RESULT_METHOD",
-      userSelectionBehavior
-    );
-  },
-
-  /**
-   * Records the method by which the user selected a searchbar result.
-   *
-   * @param {Event} event
-   *        The event that triggered the selection.
-   * @param {number} highlightedIndex
-   *        The index that the user chose in the popup, or -1 if there wasn't a
-   *        selection.
-   */
-  recordSearchbarSelectedResultMethod(event, highlightedIndex) {
-    this._recordUrlOrSearchbarSelectedResultMethod(
-      event,
-      highlightedIndex,
-      "FX_SEARCHBAR_SELECTED_RESULT_METHOD",
-      "none"
-    );
-  },
-
-  _recordUrlOrSearchbarSelectedResultMethod(
-    event,
-    highlightedIndex,
-    histogramID,
-    userSelectionBehavior
-  ) {
-    // If the contents of the histogram are changed then
-    // `UrlbarTestUtils.SELECTED_RESULT_METHODS` should also be updated.
-
-    let histogram = Services.telemetry.getHistogramById(histogramID);
-    // command events are from the one-off context menu.  Treat them as clicks.
-    // Note that we don't care about MouseEvent subclasses here, since
-    // those are not clicks.
-    let isClick =
-      event &&
-      (ChromeUtils.getClassName(event) == "MouseEvent" ||
-        event.type == "command");
-    let category;
-    if (isClick) {
-      category = "click";
-    } else if (highlightedIndex >= 0) {
-      switch (userSelectionBehavior) {
-        case "tab":
-          category = "tabEnterSelection";
-          break;
-        case "arrow":
-          category = "arrowEnterSelection";
-          break;
-        case "rightClick":
-          // Selected by right mouse button.
-          category = "rightClickEnter";
-          break;
-        default:
-          category = "enterSelection";
-      }
-    } else {
-      category = "enter";
-    }
-    histogram.add(category);
-  },
-
-  /**
    * This gets called shortly after the SessionStore has finished restoring
    * windows and tabs. It counts the open tabs and adds listeners to all the
    * windows.
@@ -1132,6 +815,10 @@
     if (item && source) {
       let scalar = `browser.ui.interaction.${source.replace("-", "_")}`;
       Services.telemetry.keyedScalarAdd(scalar, telemetryId(item), 1);
+
+      if (SET_USAGE_PREF_BUTTONS.includes(item)) {
+        Services.prefs.setBoolPref(`browser.engagement.${item}.has-used`, true);
+      }
     }
   },
 
diff -Nru firefox-84.0.2+build1/browser/modules/PingCentre.jsm firefox-85.0+build1/browser/modules/PingCentre.jsm
--- firefox-84.0.2+build1/browser/modules/PingCentre.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/PingCentre.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -33,9 +33,6 @@
 
 const FHR_UPLOAD_ENABLED_PREF = "datareporting.healthreport.uploadEnabled";
 
-const IS_MAIN_PROCESS =
-  Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT;
-
 /**
  * Observe various notifications and send them to a telemetry endpoint.
  *
@@ -82,12 +79,8 @@
   }
 
   _createExperimentsPayload() {
-    let experiments = {};
-    // XXX Workaround for bug 1677723
-    if (!IS_MAIN_PROCESS) {
-      return experiments;
-    }
     let activeExperiments = TelemetryEnvironment.getActiveExperiments();
+    let experiments = {};
     for (let experimentID in activeExperiments) {
       if (
         activeExperiments[experimentID] &&
diff -Nru firefox-84.0.2+build1/browser/modules/Sanitizer.jsm firefox-85.0+build1/browser/modules/Sanitizer.jsm
--- firefox-84.0.2+build1/browser/modules/Sanitizer.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/Sanitizer.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -14,23 +14,11 @@
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   FormHistory: "resource://gre/modules/FormHistory.jsm",
+  PrincipalsCollector: "resource://gre/modules/PrincipalsCollector.jsm",
   ContextualIdentityService:
     "resource://gre/modules/ContextualIdentityService.jsm",
 });
 
-XPCOMUtils.defineLazyServiceGetter(
-  this,
-  "quotaManagerService",
-  "@mozilla.org/dom/quota-manager-service;1",
-  "nsIQuotaManagerService"
-);
-XPCOMUtils.defineLazyServiceGetter(
-  this,
-  "serviceWorkerManager",
-  "@mozilla.org/serviceworkers/manager;1",
-  "nsIServiceWorkerManager"
-);
-
 var logConsole;
 function log(msg) {
   if (!logConsole) {
@@ -273,7 +261,7 @@
    *           specify a specific range.
    *           If timespan is not ignored, and range is not set, sanitize() will
    *           use the value of the timespan pref to determine a range.
-   *         - range (default: null)
+   *         - range (default: null): array-tuple of [from, to] timestamps
    *         - privateStateForNewWindow (default: "non-private"): when clearing
    *           open windows, defines the private state for the newly opened window.
    */
@@ -352,7 +340,7 @@
 
   // When making any changes to the sanitize implementations here,
   // please check whether the changes are applicable to Android
-  // (mobile/android/modules/Sanitizer.jsm) as well.
+  // (mobile/android/modules/geckoview/GeckoViewStorageController.jsm) as well.
 
   items: {
     cache: {
@@ -392,9 +380,24 @@
           range,
           Ci.nsIClearDataService.CLEAR_HISTORY |
             Ci.nsIClearDataService.CLEAR_SESSION_HISTORY |
-            Ci.nsIClearDataService.CLEAR_STORAGE_ACCESS |
             Ci.nsIClearDataService.CLEAR_CONTENT_BLOCKING_RECORDS
         );
+
+        // storageAccessAPI permissions record every site that the user
+        // interacted with and thus mirror history quite closely. It makes
+        // sense to clear them when we clear history. However, since their absence
+        // indicates that we can purge cookies and site data for tracking origins without
+        // user interaction, we need to ensure that we only delete those permissions that
+        // do not have any existing storage.
+        let principalsCollector = new PrincipalsCollector();
+        let principals = await principalsCollector.getAllPrincipals();
+        await new Promise(resolve => {
+          Services.clearData.deleteUserInteractionForClearingHistory(
+            principals,
+            range ? range[0] : 0,
+            resolve
+          );
+        });
         TelemetryStopwatch.finish("FX_SANITIZE_HISTORY", refObj);
       },
     },
@@ -749,90 +752,6 @@
   }
 }
 
-// This is an helper that retrieves the principals with site data just once
-// and only when needed.
-class PrincipalsCollector {
-  constructor() {
-    this.principals = null;
-  }
-
-  async getAllPrincipals(progress) {
-    if (this.principals == null) {
-      // Here is the list of principals with site data.
-      this.principals = await this.getAllPrincipalsInternal(progress);
-    }
-
-    return this.principals;
-  }
-
-  async getAllPrincipalsInternal(progress) {
-    progress.step = "principals-quota-manager";
-    let principals = await new Promise(resolve => {
-      quotaManagerService.listOrigins().callback = request => {
-        progress.step = "principals-quota-manager-listOrigins";
-        if (request.resultCode != Cr.NS_OK) {
-          // We are probably shutting down. We don't want to propagate the
-          // error, rejecting the promise.
-          resolve([]);
-          return;
-        }
-
-        let list = [];
-        for (const origin of request.result) {
-          let principal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
-            origin
-          );
-          if (isSupportedPrincipal(principal)) {
-            list.push(principal);
-          }
-        }
-
-        progress.step = "principals-quota-manager-completed";
-        resolve(list);
-      };
-    }).catch(ex => {
-      Cu.reportError("QuotaManagerService promise failed: " + ex);
-      return [];
-    });
-
-    progress.step = "principals-service-workers";
-    let serviceWorkers = serviceWorkerManager.getAllRegistrations();
-    for (let i = 0; i < serviceWorkers.length; i++) {
-      let sw = serviceWorkers.queryElementAt(
-        i,
-        Ci.nsIServiceWorkerRegistrationInfo
-      );
-      // We don't need to check the scheme. SW are just exposed to http/https URLs.
-      principals.push(sw.principal);
-    }
-
-    // Let's take the list of unique hosts+OA from cookies.
-    progress.step = "principals-cookies";
-    let cookies = Services.cookies.cookies;
-    let hosts = new Set();
-    for (let cookie of cookies) {
-      hosts.add(
-        cookie.rawHost +
-          ChromeUtils.originAttributesToSuffix(cookie.originAttributes)
-      );
-    }
-
-    progress.step = "principals-host-cookie";
-    hosts.forEach(host => {
-      // Cookies and permissions are handled by origin/host. Doesn't matter if we
-      // use http: or https: schema here.
-      principals.push(
-        Services.scriptSecurityManager.createContentPrincipalFromOrigin(
-          "https://" + host
-        )
-      );
-    });
-
-    progress.step = "total-principals:" + principals.length;
-    return principals;
-  }
-}
-
 async function sanitizeOnShutdown(progress) {
   log("Sanitizing on shutdown");
   progress.sanitizationPrefs = {
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_ContentSearch.js firefox-85.0+build1/browser/modules/test/browser/browser_ContentSearch.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_ContentSearch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_ContentSearch.js	2021-01-18 19:58:08.000000000 +0000
@@ -2,15 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "SearchTestUtils",
+  "resource://testing-common/SearchTestUtils.jsm"
+);
+
+SearchTestUtils.init(this);
+
 const SERVICE_EVENT_TYPE = "ContentSearchService";
 const CLIENT_EVENT_TYPE = "ContentSearchClient";
 
-/* import-globals-from ../../../components/search/test/browser/head.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/browser/components/search/test/browser/head.js",
-  this
-);
-
 var arrayBufferIconTested = false;
 var plainURIIconTested = false;
 
@@ -40,22 +42,19 @@
     ],
   });
 
-  await promiseNewEngine("testEngine.xml", {
-    setAsCurrent: true,
-    testPath:
-      "chrome://mochitests/content/browser/browser/components/search/test/browser/",
-  });
+  let engine = await SearchTestUtils.promiseNewSearchEngine(
+    "chrome://mochitests/content/browser/browser/components/search/test/browser/testEngine.xml"
+  );
+  await Services.search.setDefault(engine);
 
-  await promiseNewEngine("testEngine_diacritics.xml", {
-    setAsCurrent: false,
-    setAsCurrentPrivate: true,
-    testPath:
-      "chrome://mochitests/content/browser/browser/components/search/test/browser/",
-  });
+  let engine2 = await SearchTestUtils.promiseNewSearchEngine(
+    "chrome://mochitests/content/browser/browser/components/search/test/browser/testEngine_diacritics.xml"
+  );
+  await Services.search.setDefaultPrivate(engine2);
 
-  await promiseNewEngine("testEngine_chromeicon.xml", {
-    setAsCurrent: false,
-  });
+  await SearchTestUtils.promiseNewSearchEngine(
+    getRootDirectory(gTestPath) + "testEngine_chromeicon.xml"
+  );
 
   registerCleanupFunction(async () => {
     await Services.search.setDefault(originalEngine);
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser.ini firefox-85.0+build1/browser/modules/test/browser/browser.ini
--- firefox-84.0.2+build1/browser/modules/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,6 @@
   contentSearchBadImage.xml
   contentSearchSuggestions.sjs
   contentSearchSuggestions.xml
-  !/browser/components/search/test/browser/head.js
   !/browser/components/search/test/browser/testEngine.xml
   !/browser/components/search/test/browser/testEngine_diacritics.xml
   testEngine_chromeicon.xml
@@ -27,6 +26,7 @@
   search-engines/engines.json
 [browser_PermissionUI.js]
 [browser_PermissionUI_prompts.js]
+[browser_UsageTelemetry_usagePrefs.js]
 [browser_preloading_tab_moving.js]
 [browser_ProcessHangNotifications.js]
 skip-if = !e10s
@@ -53,26 +53,6 @@
 skip-if = verify && debug
 [browser_UsageTelemetry_toolbars.js]
 [browser_UsageTelemetry_uniqueOriginsVisitedInPast24Hours.js]
-[browser_UsageTelemetry_urlbar_dynamic.js]
-support-files =
-  usageTelemetryUrlbarDynamic.css
-[browser_UsageTelemetry_urlbar_extension.js]
-[browser_UsageTelemetry_urlbar_places.js]
-[browser_UsageTelemetry_urlbar_remotetab.js]
-[browser_UsageTelemetry_urlbar_searchmode.js]
-[browser_UsageTelemetry_urlbar_tabtosearch.js]
-[browser_UsageTelemetry_urlbar_tip.js]
-[browser_UsageTelemetry_urlbar_topsite.js]
-[browser_UsageTelemetry_urlbar.js]
-support-files =
-  usageTelemetrySearchSuggestions.sjs
-  usageTelemetrySearchSuggestions.xml
-[browser_UsageTelemetry_searchbar.js]
-support-files =
-  usageTelemetrySearchSuggestions.sjs
-  usageTelemetrySearchSuggestions.xml
-[browser_UsageTelemetry_content.js]
-[browser_UsageTelemetry_content_aboutHome.js]
 [browser_UsageTelemetry_content_aboutRestartRequired.js]
 [browser_UsageTelemetry_numberOfSiteOriginsPerTabs.js]
 support-files =
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_PartnerLinkAttribution.js firefox-85.0+build1/browser/modules/test/browser/browser_PartnerLinkAttribution.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_PartnerLinkAttribution.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_PartnerLinkAttribution.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,6 @@
   CustomizableUITestUtils:
     "resource://testing-common/CustomizableUITestUtils.jsm",
   Region: "resource://gre/modules/Region.jsm",
-  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.jsm",
   UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
   HttpServer: "resource://testing-common/httpd.js",
@@ -80,11 +79,15 @@
 
   // Make sure to restore the engine once we're done.
   registerCleanupFunction(async function() {
+    let settingsWritten = SearchTestUtils.promiseSearchNotification(
+      "write-settings-to-disk-complete"
+    );
     await SearchTestUtils.updateRemoteSettingsConfig();
     await gHttpServer.stop();
     gHttpServer = null;
     await PlacesUtils.history.clear();
     gCUITestUtils.removeSearchBar();
+    await settingsWritten;
   });
 });
 
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_ProcessHangNotifications.js firefox-85.0+build1/browser/modules/test/browser/browser_ProcessHangNotifications.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_ProcessHangNotifications.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_ProcessHangNotifications.js	2021-01-18 19:58:08.000000000 +0000
@@ -120,7 +120,7 @@
 };
 
 // on dev edition we add a button for js debugging of hung scripts.
-let buttonCount = UpdateUtils.UpdateChannel == "aurora" ? 3 : 2;
+let buttonCount = AppConstants.MOZ_DEV_EDITION ? 3 : 2;
 
 add_task(async function setup() {
   // Create a fake WebExtensionPolicy that we can use for
@@ -155,8 +155,7 @@
   let notification = await promise;
 
   let buttons = notification.currentNotification.getElementsByTagName("button");
-  // Fails on aurora on-push builds, bug 1232204
-  // is(buttons.length, buttonCount, "proper number of buttons");
+  is(buttons.length, buttonCount, "proper number of buttons");
 
   // Click the "Stop It" button, we should get a terminate script callback
   buttons[0].click();
@@ -179,8 +178,7 @@
   let notification = await promise;
 
   let buttons = notification.currentNotification.getElementsByTagName("button");
-  // Fails on aurora on-push builds, bug 1232204
-  // is(buttons.length, buttonCount, "proper number of buttons");
+  is(buttons.length, buttonCount, "proper number of buttons");
 
   await pushPrefs(["browser.hangNotification.waitPeriod", 1000]);
 
@@ -253,8 +251,9 @@
   let notification = await promise;
 
   let buttons = notification.currentNotification.getElementsByTagName("button");
-  // Fails on aurora on-push builds, bug 1232204
-  // is(buttons.length, buttonCount, "proper number of buttons");
+  // Plugin hangs only ever show 2 buttons in the notification - even in
+  // DevEdition.
+  is(buttons.length, 2, "proper number of buttons");
 
   // Click the "Stop It" button, we should get a terminate script callback
   buttons[0].click();
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_Telemetry_numberOfSiteOriginsPerDocument.js firefox-85.0+build1/browser/modules/test/browser/browser_Telemetry_numberOfSiteOriginsPerDocument.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_Telemetry_numberOfSiteOriginsPerDocument.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_Telemetry_numberOfSiteOriginsPerDocument.js	2021-01-18 19:58:08.000000000 +0000
@@ -77,11 +77,11 @@
   ];
 
   // Navigate to an interstitial page.
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "about:blank");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:blank");
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
   // Navigate to another test page.
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, testPage);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, testPage);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
   wgpDestroyedPromises.push(
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_content_aboutHome.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-"use strict";
-
-const SCALAR_ABOUT_HOME = "browser.engagement.navigation.about_home";
-
-add_task(async function setup() {
-  // about:home uses IndexedDB. However, the test finishes too quickly and doesn't
-  // allow it enougth time to save. So it throws. This disables all the uncaught
-  // exception in this file and that's the reason why we split about:home tests
-  // out of the other UsageTelemetry files.
-  ignoreAllUncaughtExceptions();
-
-  // 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
-  // in content doesn't display the default search engine among the one-off engines.
-  await Services.search.addEngineWithDetails("MozSearch", {
-    alias: "mozalias",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  await Services.search.addEngineWithDetails("MozSearch2", {
-    alias: "mozalias2",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  // Make the first engine the default search engine.
-  let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(engineDefault);
-
-  // Move the second engine at the beginning of the one-off list.
-  let engineOneOff = Services.search.getEngineByName("MozSearch2");
-  await Services.search.moveEngine(engineOneOff, 0);
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(engineDefault);
-    await Services.search.removeEngine(engineOneOff);
-    await PlacesUtils.history.clear();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-    Services.telemetry.canRecordExtended = oldCanRecord;
-  });
-});
-
-add_task(async function test_abouthome_activitystream_simpleQuery() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  info("Load about:home.");
-  BrowserTestUtils.loadURI(tab.linkedBrowser, "about:home");
-  await BrowserTestUtils.browserStopped(tab.linkedBrowser, "about:home");
-
-  info("Wait for ContentSearchUI search provider to initialize.");
-  await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
-    await ContentTaskUtils.waitForCondition(
-      () => content.wrappedJSObject.gContentSearchController.defaultEngine
-    );
-  });
-
-  info("Trigger a simple search, just test + enter.");
-  let p = BrowserTestUtils.browserStopped(
-    tab.linkedBrowser,
-    "http://example.com/?q=test+query"
-  );
-  await typeInSearchField(
-    tab.linkedBrowser,
-    "test query",
-    "newtab-search-text"
-  );
-  await BrowserTestUtils.synthesizeKey("VK_RETURN", {}, tab.linkedBrowser);
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_ABOUT_HOME,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_ABOUT_HOME]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.abouthome",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "about_home",
-        value: "enter",
-        extra: { engine: "other-MozSearch" },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_content.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_content.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_content.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_content.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-"use strict";
-
-const BASE_PROBE_NAME = "browser.engagement.navigation.";
-const SCALAR_CONTEXT_MENU = BASE_PROBE_NAME + "contextmenu";
-const SCALAR_ABOUT_NEWTAB = BASE_PROBE_NAME + "about_newtab";
-
-add_task(async function setup() {
-  // 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
-  // in content doesn't display the default search engine among the one-off engines.
-  await Services.search.addEngineWithDetails("MozSearch", {
-    alias: "mozalias",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  await Services.search.addEngineWithDetails("MozSearch2", {
-    alias: "mozalias2",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  // Make the first engine the default search engine.
-  let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(engineDefault);
-
-  // Move the second engine at the beginning of the one-off list.
-  let engineOneOff = Services.search.getEngineByName("MozSearch2");
-  await Services.search.moveEngine(engineOneOff, 0);
-
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["dom.select_events.enabled", true], // We want select events to be fired.
-    ],
-  });
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(engineDefault);
-    await Services.search.removeEngine(engineOneOff);
-    await PlacesUtils.history.clear();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-    Services.telemetry.canRecordExtended = oldCanRecord;
-  });
-});
-
-add_task(async function test_context_menu() {
-  // Let's reset the Telemetry data.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  // Open a new tab with a page containing some text.
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "data:text/plain;charset=utf8,test%20search"
-  );
-
-  info("Select all the text in the page.");
-  await SpecialPowers.spawn(tab.linkedBrowser, [""], async function() {
-    return new Promise(resolve => {
-      content.document.addEventListener("selectionchange", () => resolve(), {
-        once: true,
-      });
-      content.document.getSelection().selectAllChildren(content.document.body);
-    });
-  });
-
-  info("Open the context menu.");
-  let contextMenu = document.getElementById("contentAreaContextMenu");
-  let popupPromise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
-  BrowserTestUtils.synthesizeMouseAtCenter(
-    "body",
-    { type: "contextmenu", button: 2 },
-    gBrowser.selectedBrowser
-  );
-  await popupPromise;
-
-  info("Click on search.");
-  let searchItem = contextMenu.getElementsByAttribute(
-    "id",
-    "context-searchselect"
-  )[0];
-  searchItem.click();
-
-  info("Validate the search metrics.");
-
-  // Telemetry is not updated synchronously here, we must wait for it.
-  await TestUtils.waitForCondition(() => {
-    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-    return Object.keys(scalars[SCALAR_CONTEXT_MENU] || {}).length == 1;
-  }, "This search must increment one entry in the scalar.");
-
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_CONTEXT_MENU,
-    "search",
-    1
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.contextmenu",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "contextmenu",
-        value: null,
-        extra: { engine: "other-MozSearch" },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  contextMenu.hidePopup();
-  BrowserTestUtils.removeTab(gBrowser.selectedTab);
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_about_newtab() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:newtab",
-    false
-  );
-  await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
-    await ContentTaskUtils.waitForCondition(() => !content.document.hidden);
-  });
-
-  info("Trigger a simple serch, just text + enter.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await typeInSearchField(
-    tab.linkedBrowser,
-    "test query",
-    "newtab-search-text"
-  );
-  await BrowserTestUtils.synthesizeKey("VK_RETURN", {}, tab.linkedBrowser);
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_ABOUT_NEWTAB,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_ABOUT_NEWTAB]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.newtab",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "about_newtab",
-        value: "enter",
-        extra: { engine: "other-MozSearch" },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_domains.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_domains.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_domains.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_domains.js	2021-01-18 19:58:08.000000000 +0000
@@ -83,7 +83,7 @@
   checkCounts({ totalURIs: 0, domainCount: 0, totalUnfilteredURIs: 0 });
 
   // Open a different page and check the counts.
-  await BrowserTestUtils.loadURI(firstTab.linkedBrowser, "http://example.com/");
+  BrowserTestUtils.loadURI(firstTab.linkedBrowser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(firstTab.linkedBrowser);
   checkCounts({ totalURIs: 1, domainCount: 1, totalUnfilteredURIs: 1 });
 
@@ -98,7 +98,7 @@
 
   // Open a new window and set the tab to a new address.
   let newWin = await BrowserTestUtils.openNewBrowserWindow();
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     newWin.gBrowser.selectedBrowser,
     "http://example.com/"
   );
@@ -123,7 +123,7 @@
 
   // Check that we're counting page fragments.
   let loadingStopped = browserLocationChanged(newWin.gBrowser.selectedBrowser);
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     newWin.gBrowser.selectedBrowser,
     "http://example.com/#2"
   );
@@ -131,7 +131,7 @@
   checkCounts({ totalURIs: 3, domainCount: 1, totalUnfilteredURIs: 3 });
 
   // Check that a different URI from the example.com domain doesn't increment the unique count.
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     newWin.gBrowser.selectedBrowser,
     "http://test1.example.com/"
   );
@@ -139,7 +139,7 @@
   checkCounts({ totalURIs: 4, domainCount: 1, totalUnfilteredURIs: 4 });
 
   // Make sure that the unique domains counter is incrementing for a different domain.
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     newWin.gBrowser.selectedBrowser,
     "https://example.org/"
   );
@@ -169,7 +169,7 @@
   // Check that uncommon protocols get counted in the unfiltered URI probe.
   const TEST_PAGE =
     "data:text/html,<a id='target' href='%23par1'>Click me</a><a name='par1'>The paragraph.</a>";
-  await BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, TEST_PAGE);
+  BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, TEST_PAGE);
   await BrowserTestUtils.browserLoaded(newWin.gBrowser.selectedBrowser);
   checkCounts({ totalURIs: 5, domainCount: 2, totalUnfilteredURIs: 6 });
 
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry.js	2021-01-18 19:58:08.000000000 +0000
@@ -325,7 +325,7 @@
   );
   openedTabs.push(tab);
   BrowserUsageTelemetry._lastRecordTabCount = 0;
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
+  BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   checkTabCountHistogram(
     tabCountHist.snapshot(),
@@ -401,7 +401,7 @@
     Date.now() - MINIMUM_TAB_COUNT_INTERVAL_MS / 2;
   {
     let oldLastRecordTabCount = BrowserUsageTelemetry._lastRecordTabCount;
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
+    BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
     await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
     checkTabCountHistogram(
       tabCountHist.snapshot(),
@@ -419,7 +419,7 @@
     Date.now() - (MINIMUM_TAB_COUNT_INTERVAL_MS + 1000);
   {
     let oldLastRecordTabCount = BrowserUsageTelemetry._lastRecordTabCount;
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
+    BrowserTestUtils.loadURI(tab.linkedBrowser, "http://example.com/");
     await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
     checkTabCountHistogram(
       tabCountHist.snapshot(),
@@ -581,3 +581,70 @@
 
   await BrowserTestUtils.closeWindow(win);
 });
+
+add_task(async function test_restored_max_pinned_count() {
+  // Following pinned tab testing example from
+  // https://searchfox.org/mozilla-central/rev/1843375acbbca68127713e402be222350ac99301/browser/components/sessionstore/test/browser_pinned_tabs.js
+  Services.telemetry.clearScalars();
+  const { E10SUtils } = ChromeUtils.import(
+    "resource://gre/modules/E10SUtils.jsm"
+  );
+  const BACKUP_STATE = SessionStore.getBrowserState();
+  const triggeringPrincipal_base64 = E10SUtils.SERIALIZED_SYSTEMPRINCIPAL;
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.sessionstore.restore_on_demand", true],
+      ["browser.sessionstore.restore_tabs_lazily", true],
+    ],
+  });
+  let sessionRestoredPromise = new Promise(resolve => {
+    Services.obs.addObserver(resolve, "sessionstore-browser-state-restored");
+  });
+
+  info("Set browser state to 1 pinned tab.");
+  await SessionStore.setBrowserState(
+    JSON.stringify({
+      windows: [
+        {
+          selected: 1,
+          tabs: [
+            {
+              pinned: true,
+              entries: [
+                { url: "https://example.com", triggeringPrincipal_base64 },
+              ],
+            },
+          ],
+        },
+      ],
+    })
+  );
+
+  info("Await `sessionstore-browser-state-restored` promise.");
+  await sessionRestoredPromise;
+
+  const scalars = TelemetryTestUtils.getProcessScalars("parent");
+
+  TelemetryTestUtils.assertScalar(
+    scalars,
+    MAX_TAB_PINNED,
+    1,
+    "The maximum tabs pinned count must match the expected value."
+  );
+
+  gBrowser.unpinTab(gBrowser.selectedTab);
+
+  TelemetryTestUtils.assertScalar(
+    scalars,
+    MAX_TAB_PINNED,
+    1,
+    "The maximum tabs pinned count must match the expected value."
+  );
+
+  sessionRestoredPromise = new Promise(resolve => {
+    Services.obs.addObserver(resolve, "sessionstore-browser-state-restored");
+  });
+  await SessionStore.setBrowserState(BACKUP_STATE);
+  await SpecialPowers.popPrefEnv();
+  await sessionRestoredPromise;
+});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_private_and_restore.js	2021-01-18 19:58:08.000000000 +0000
@@ -34,7 +34,7 @@
   let privateWin = await BrowserTestUtils.openNewBrowserWindow({
     private: true,
   });
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     privateWin.gBrowser.selectedBrowser,
     "http://example.com/"
   );
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,458 +0,0 @@
-"use strict";
-
-const SCALAR_SEARCHBAR = "browser.engagement.navigation.searchbar";
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "UrlbarTestUtils",
-  "resource://testing-common/UrlbarTestUtils.jsm"
-);
-
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
-);
-let gCUITestUtils = new CustomizableUITestUtils(window);
-
-function checkHistogramResults(resultIndexes, expected, histogram) {
-  for (let [i, val] of Object.entries(resultIndexes.values)) {
-    if (i == expected) {
-      Assert.equal(
-        val,
-        1,
-        `expected counts should match for ${histogram} index ${i}`
-      );
-    } else {
-      Assert.equal(
-        !!val,
-        false,
-        `unexpected counts should be zero for ${histogram} index ${i}`
-      );
-    }
-  }
-}
-
-let searchInSearchbar = async function(inputText) {
-  let win = window;
-  await new Promise(r => waitForFocus(r, win));
-  let sb = BrowserSearch.searchBar;
-  // Write the search query in the searchbar.
-  sb.focus();
-  sb.value = inputText;
-  sb.textbox.controller.startSearch(inputText);
-  // Wait for the popup to show.
-  await BrowserTestUtils.waitForEvent(sb.textbox.popup, "popupshown");
-  // And then for the search to complete.
-  await BrowserTestUtils.waitForCondition(
-    () =>
-      sb.textbox.controller.searchStatus >=
-      Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH,
-    "The search in the searchbar must complete."
-  );
-};
-
-/**
- * Click one of the entries in the search suggestion popup.
- *
- * @param {String} entryName
- *        The name of the elemet to click on.
- */
-function clickSearchbarSuggestion(entryName) {
-  let richlistbox = BrowserSearch.searchBar.textbox.popup.richlistbox;
-  let richlistitem = Array.prototype.find.call(
-    richlistbox.children,
-    item => item.getAttribute("ac-value") == entryName
-  );
-
-  // Make sure the suggestion is visible and simulate the click.
-  richlistbox.ensureElementIsVisible(richlistitem);
-  EventUtils.synthesizeMouseAtCenter(richlistitem, {});
-}
-
-add_task(async function setup() {
-  await gCUITestUtils.addSearchBar();
-  registerCleanupFunction(() => {
-    gCUITestUtils.removeSearchBar();
-  });
-
-  // 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("MozSearch", {
-    alias: "mozalias",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  await Services.search.addEngineWithDetails("MozSearch2", {
-    alias: "mozalias2",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  // Make the first engine the default search engine.
-  let engineDefault = Services.search.getEngineByName("MozSearch");
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(engineDefault);
-
-  // Move the second engine at the beginning of the one-off list.
-  let engineOneOff = Services.search.getEngineByName("MozSearch2");
-  await Services.search.moveEngine(engineOneOff, 0);
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(engineDefault);
-    await Services.search.removeEngine(engineOneOff);
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-  });
-});
-
-add_task(async function test_plainQuery() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Simulate entering a simple search.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("simple query");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_SEARCHBAR,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.searchbar",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "searchbar",
-        value: "enter",
-        extra: { engine: "other-MozSearch" },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Performs a search using the first result, a one-off button, and the Return
-// (Enter) key.
-add_task(async function test_oneOff_enter() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Perform a one-off search using the first engine.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("query");
-
-  info("Pressing Alt+Down to highlight the first one off engine.");
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_SEARCHBAR,
-    "search_oneoff",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch2.searchbar",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "searchbar",
-        value: "oneoff",
-        extra: { engine: "other-MozSearch2" },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Performs a search using the second result, a one-off button, and the Return
-// (Enter) key.  This only tests the FX_SEARCHBAR_SELECTED_RESULT_METHOD
-// histogram since test_oneOff_enter covers everything else.
-add_task(async function test_oneOff_enterSelection() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  // Create an engine to generate search suggestions and add it as default
-  // for this test.
-  const url =
-    getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml";
-  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
-  let previousEngine = await Services.search.getDefault();
-  await Services.search.setDefault(suggestionEngine);
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Type a query. Suggestions should be generated by the test engine.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("query");
-
-  info(
-    "Select the second result, press Alt+Down to take us to the first one-off engine."
-  );
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await Services.search.setDefault(previousEngine);
-  await Services.search.removeEngine(suggestionEngine);
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Performs a search using a click on a one-off button.  This only tests the
-// FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
-// everything else.
-add_task(async function test_oneOff_click() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Type a query.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("query");
-  info("Click the first one-off button.");
-  BrowserSearch.searchBar.textbox.popup.oneOffButtons
-    .getSelectableButtons(false)[0]
-    .click();
-  await p;
-
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Clicks the first suggestion offered by the test search engine.
-add_task(async function test_suggestion_click() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  // Create an engine to generate search suggestions and add it as default
-  // for this test.
-  const url =
-    getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml";
-  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
-  let previousEngine = await Services.search.getDefault();
-  await Services.search.setDefault(suggestionEngine);
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Perform a one-off search using the first engine.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("query");
-  info("Clicking the searchbar suggestion.");
-  clickSearchbarSuggestion("queryfoo");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_SEARCHBAR,
-    "search_suggestion",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_SEARCHBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  let searchEngineId = "other-" + suggestionEngine.name;
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    searchEngineId + ".searchbar",
-    1
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      {
-        object: "searchbar",
-        value: "suggestion",
-        extra: { engine: searchEngineId },
-      },
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await Services.search.setDefault(previousEngine);
-  await Services.search.removeEngine(suggestionEngine);
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Selects and presses the Return (Enter) key on the first suggestion offered by
-// the test search engine.  This only tests the
-// FX_SEARCHBAR_SELECTED_RESULT_METHOD histogram since test_suggestion_click
-// covers everything else.
-add_task(async function test_suggestion_enterSelection() {
-  // Let's reset the counts.
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  // Create an engine to generate search suggestions and add it as default
-  // for this test.
-  const url =
-    getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml";
-  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
-  let previousEngine = await Services.search.getDefault();
-  await Services.search.setDefault(suggestionEngine);
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Type a query. Suggestions should be generated by the test engine.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInSearchbar("query");
-  info("Select the second result and press Return.");
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  let resultMethods = resultMethodHist.snapshot();
-  checkHistogramResults(
-    resultMethods,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
-    "FX_SEARCHBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await Services.search.setDefault(previousEngine);
-  await Services.search.removeEngine(suggestionEngine);
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_toolbars.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,9 +25,10 @@
 }
 
 Services.prefs.setBoolPref("browser.uiCustomization.skipSourceNodeCheck", true);
-registerCleanupFunction(() =>
-  Services.prefs.clearUserPref("browser.uiCustomization.skipSourceNodeCheck")
-);
+registerCleanupFunction(() => {
+  CustomizableUI.reset();
+  Services.prefs.clearUserPref("browser.uiCustomization.skipSourceNodeCheck");
+});
 
 // Stolen from browser/components/customizableui/tests/browser/head.js
 function simulateItemDrag(aToDrag, aTarget, aEvent = {}, aOffset = 2) {
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_dynamic.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_dynamic.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_dynamic.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_dynamic.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry for dynamic results.
- */
-
-"use strict";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
-  UrlbarResult: "resource:///modules/UrlbarResult.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-  UrlbarView: "resource:///modules/UrlbarView.jsm",
-});
-
-const DYNAMIC_TYPE_NAME = "test";
-
-class TestProvider extends UrlbarTestUtils.TestProvider {
-  constructor() {
-    super({
-      priority: Infinity,
-      results: [
-        Object.assign(
-          new UrlbarResult(
-            UrlbarUtils.RESULT_TYPE.DYNAMIC,
-            UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-            {
-              dynamicType: DYNAMIC_TYPE_NAME,
-            }
-          ),
-          { heuristic: true }
-        ),
-      ],
-    });
-  }
-
-  getViewUpdate(result) {
-    return {
-      title: {
-        textContent: "This is a dynamic result.",
-      },
-      button: {
-        textContent: "Click Me",
-      },
-    };
-  }
-}
-
-add_task(async function test() {
-  // Add a dynamic result type.
-  UrlbarResult.addDynamicResultType(DYNAMIC_TYPE_NAME);
-  UrlbarView.addDynamicViewTemplate(DYNAMIC_TYPE_NAME, {
-    stylesheet: getRootDirectory(gTestPath) + "usageTelemetryUrlbarDynamic.css",
-    children: [
-      {
-        name: "title",
-        tag: "span",
-      },
-      {
-        name: "buttonSpacer",
-        tag: "span",
-      },
-      {
-        name: "button",
-        tag: "span",
-        attributes: {
-          role: "button",
-        },
-      },
-    ],
-  });
-  registerCleanupFunction(() => {
-    UrlbarView.removeDynamicViewTemplate(DYNAMIC_TYPE_NAME);
-    UrlbarResult.removeDynamicResultType(DYNAMIC_TYPE_NAME);
-  });
-
-  // Register a provider that returns the dynamic result type.
-  let provider = new TestProvider();
-  UrlbarProvidersManager.registerProvider(provider);
-  registerCleanupFunction(() => {
-    UrlbarProvidersManager.unregisterProvider(provider);
-  });
-
-  const histograms = snapshotHistograms();
-
-  // Do a search to show the dynamic result.
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    waitForFocus,
-    value: "test",
-    fireInputEvent: true,
-  });
-
-  // Press enter on the result's button.  It will be preselected since the
-  // result is the heuristic.
-  await UrlbarTestUtils.promisePopupClose(window, () =>
-    EventUtils.synthesizeKey("KEY_Enter")
-  );
-
-  assertTelemetryResults(
-    histograms,
-    "dynamic",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  // Clean up for subsequent tests.
-  gURLBar.handleRevert();
-});
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_extension.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_extension.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_extension.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_extension.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry with extension actions.
- */
-
-"use strict";
-
-const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-function assertSearchTelemetryEmpty(search_hist) {
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  Assert.ok(
-    !(SCALAR_URLBAR in scalars),
-    `Should not have recorded ${SCALAR_URLBAR}`
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    undefined
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  let events = Services.telemetry.snapshotEvents(
-    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
-    false
-  );
-  events = (events.parent || []).filter(
-    e => e[1] == "navigation" && e[2] == "search"
-  );
-  Assert.deepEqual(
-    events,
-    [],
-    "Should not have recorded any navigation search events"
-  );
-}
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      // Disable search suggestions in the urlbar.
-      ["browser.urlbar.suggest.searches", false],
-      // Clear historical search suggestions to avoid interference from previous
-      // tests.
-      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
-      // Use the default matching bucket configuration.
-      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
-      // Turn autofill off.
-      ["browser.urlbar.autoFill", false],
-    ],
-  });
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Clear history so that history added by previous tests doesn't mess up this
-  // test when it selects results in the urlbar.
-  await PlacesUtils.history.clear();
-  await PlacesUtils.bookmarks.eraseEverything();
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await PlacesUtils.history.clear();
-    await PlacesUtils.bookmarks.eraseEverything();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-  });
-});
-
-add_task(async function test_extension() {
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      omnibox: {
-        keyword: "omniboxtest",
-      },
-
-      background() {
-        /* global browser */
-        browser.omnibox.setDefaultSuggestion({
-          description: "doit",
-        });
-        // Just do nothing for this test.
-        browser.omnibox.onInputEntered.addListener(() => {});
-        browser.omnibox.onInputChanged.addListener((text, suggest) => {
-          suggest([]);
-        });
-      },
-    },
-  });
-
-  await extension.startup();
-
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    waitForFocus,
-    value: "omniboxtest ",
-    fireInputEvent: true,
-  });
-  EventUtils.synthesizeKey("KEY_Enter");
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "extension",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  await extension.unload();
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1688 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry with search related actions.
- */
-
-"use strict";
-
-const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
-const SCALAR_SEARCHMODE = "browser.engagement.navigation.urlbar_searchmode";
-
-// The preference to enable suggestions in the urlbar.
-const SUGGEST_URLBAR_PREF = "browser.urlbar.suggest.searches";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-function searchInAwesomebar(value, win = window) {
-  return UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window: win,
-    waitForFocus,
-    value,
-    fireInputEvent: true,
-  });
-}
-
-/**
- * Click one of the entries in the urlbar suggestion popup.
- *
- * @param {String} resultTitle
- *        The title of the result to click on.
- * @param {Number} button [optional]
- *        which button to click.
- * @returns {Number}
- *          The index of the result that was clicked, or -1 if not found.
- */
-async function clickURLBarSuggestion(resultTitle, button = 1) {
-  await UrlbarTestUtils.promiseSearchComplete(window);
-
-  const count = UrlbarTestUtils.getResultCount(window);
-  for (let i = 0; i < count; i++) {
-    let result = await UrlbarTestUtils.getDetailsOfResultAt(window, i);
-    if (result.displayed.title == resultTitle) {
-      // This entry is the search suggestion we're looking for.
-      let element = await UrlbarTestUtils.waitForAutocompleteResultAt(
-        window,
-        i
-      );
-      if (button == 1) {
-        EventUtils.synthesizeMouseAtCenter(element, {});
-      } else if (button == 2) {
-        EventUtils.synthesizeMouseAtCenter(element, {
-          type: "mousedown",
-          button: 2,
-        });
-      }
-      return i;
-    }
-  }
-  return -1;
-}
-
-/**
- * Create an engine to generate search suggestions and add it as default
- * for this test.
- */
-async function withNewSearchEngine(taskFn) {
-  const url =
-    getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml";
-  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
-  let previousEngine = await Services.search.getDefault();
-  await Services.search.setDefault(suggestionEngine);
-
-  try {
-    await taskFn(suggestionEngine);
-  } finally {
-    await Services.search.setDefault(previousEngine);
-    await Services.search.removeEngine(suggestionEngine);
-  }
-}
-
-add_task(async function setup() {
-  // Create a new search engine.
-  await Services.search.addEngineWithDetails("MozSearch", {
-    alias: "mozalias",
-    method: "GET",
-    template: "http://example.com/?q={searchTerms}",
-  });
-
-  // Make it the default search engine.
-  let engine = Services.search.getEngineByName("MozSearch");
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(engine);
-
-  // And the first one-off engine.
-  await Services.search.moveEngine(engine, 0);
-
-  // Enable search suggestions in the urlbar.
-  let suggestionsEnabled = Services.prefs.getBoolPref(SUGGEST_URLBAR_PREF);
-  Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, true);
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Clear history so that history added by previous tests doesn't mess up this
-  // test when it selects results in the urlbar.
-  await PlacesUtils.history.clear();
-
-  // Clear historical search suggestions to avoid interference from previous
-  // tests.
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 0]],
-  });
-
-  // Use the default matching bucket configuration.
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.matchBuckets", "general:5,suggestion:4"]],
-  });
-
-  // Allows UrlbarTestUtils to access this scope's test helpers, like Assert.
-  UrlbarTestUtils.init(this);
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(engine);
-    Services.prefs.setBoolPref(SUGGEST_URLBAR_PREF, suggestionsEnabled);
-    await PlacesUtils.history.clear();
-    await UrlbarTestUtils.formHistory.clear();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-    UrlbarTestUtils.uninit();
-  });
-});
-
-add_task(async function test_simpleQuery() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Simulate entering a simple search.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("simple query");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_URLBAR,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_URLBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // SEARCH_COUNTS should be incremented, but only the urlbar source since an
-  // internal @search keyword was not used.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    1
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      [
-        "navigation",
-        "search",
-        "urlbar",
-        "enter",
-        { engine: "other-MozSearch" },
-      ],
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    resultIndexByTypeHist,
-    "searchengine",
-    0,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_searchMode_enter() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Enter search mode using an alias and a query.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("mozalias query");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_SEARCHMODE,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_SEARCHMODE]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      [
-        "navigation",
-        "search",
-        "urlbar_searchmode",
-        "enter",
-        { engine: "other-MozSearch" },
-      ],
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    resultIndexByTypeHist,
-    "searchengine",
-    0,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// This subtest can be removed with the update2 pref.
-add_task(async function test_searchAlias_legacy() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", false],
-      ["browser.urlbar.update2.oneOffsRefresh", false],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Search using a search alias.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("mozalias query");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_URLBAR,
-    "search_alias",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_URLBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      [
-        "navigation",
-        "search",
-        "urlbar",
-        "alias",
-        { engine: "other-MozSearch" },
-      ],
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    resultIndexByTypeHist,
-    "searchengine",
-    0,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using the first result, a one-off button, and the Return
-// (Enter) key.
-// This subtest can be removed with the update2 pref.
-add_task(async function test_oneOff_enter_legacy() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", false],
-      ["browser.urlbar.update2.oneOffsRefresh", false],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Perform a one-off search using the first engine. Update 2 disabled.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("query");
-
-  info("Pressing Alt+Down to take us to the first one-off engine.");
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_URLBAR,
-    "search_oneoff",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_URLBAR]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // SEARCH_COUNTS should be incremented, but only the urlbar source since an
-  // internal @search keyword was not used.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    1
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      [
-        "navigation",
-        "search",
-        "urlbar",
-        "oneoff",
-        { engine: "other-MozSearch" },
-      ],
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    resultIndexByTypeHist,
-    "searchengine",
-    0,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using the first result, a one-off button, and the Return
-// (Enter) key.
-add_task(async function test_oneOff_enter() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Perform a one-off search using the first engine.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("query");
-
-  info("Pressing Alt+Down to take us to the first one-off engine.");
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-  let engine = UrlbarTestUtils.getOneOffSearchButtons(window).selectedButton
-    .engine;
-  EventUtils.synthesizeKey("KEY_Enter");
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName: engine.name,
-    entry: "oneoff",
-  });
-
-  // Now that we're in search mode, execute the search.
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  // Check if the scalars contain the expected values.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    SCALAR_SEARCHMODE,
-    "search_enter",
-    1
-  );
-  Assert.equal(
-    Object.keys(scalars[SCALAR_SEARCHMODE]).length,
-    1,
-    "This search must only increment one entry in the scalar."
-  );
-
-  // SEARCH_COUNTS should be incremented, but only the urlbar-searchmode source
-  // since aliases aren't counted separately in search mode.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar-searchmode",
-    1
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  TelemetryTestUtils.assertEvents(
-    [
-      [
-        "navigation",
-        "search",
-        "urlbar_searchmode",
-        "enter",
-        { engine: "other-MozSearch" },
-      ],
-    ],
-    { category: "navigation", method: "search" }
-  );
-
-  // Check the histograms as well.
-  TelemetryTestUtils.assertHistogram(resultIndexHist, 0, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES.searchengine,
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    resultIndexByTypeHist,
-    "searchengine",
-    0,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using the second result, a one-off button, and the Return
-// (Enter) key.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram
-// since test_oneOff_enter covers everything else.
-// This subtest can be removed with the update2 pref.
-add_task(async function test_oneOff_enterSelection_legacy() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", false],
-      ["browser.urlbar.update2.oneOffsRefresh", false],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info(
-      "Type a query. Suggestions should be generated by the test engine. Update2 disabled."
-    );
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-
-    info(
-      "Select the second result, press Alt+Down to take us to the first one-off engine."
-    );
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using the second result, a one-off button, and the Return
-// (Enter) key.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram
-// since test_oneOff_enter covers everything else.
-add_task(async function test_oneOff_enterSelection() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-
-    info(
-      "Select the second result, press Alt+Down to take us to the first one-off engine."
-    );
-    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-    EventUtils.synthesizeKey("KEY_ArrowDown", { altKey: true });
-    let engine = UrlbarTestUtils.getOneOffSearchButtons(window).selectedButton
-      .engine;
-    EventUtils.synthesizeKey("KEY_Enter");
-    await searchPromise;
-
-    await UrlbarTestUtils.assertSearchMode(window, {
-      engineName: engine.name,
-      entry: "oneoff",
-    });
-
-    // Now that we're in search mode, execute the search.
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using a click on a one-off button.  This only tests the
-// FX_URLBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
-// everything else.
-// This subtest can be removed with the update2 pref.
-add_task(async function test_oneOff_click_legacy() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", false],
-      ["browser.urlbar.update2.oneOffsRefresh", false],
-    ],
-  });
-  Services.telemetry.clearScalars();
-
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Type a query.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("query");
-  info("Click the first one-off button. Update2 disabled");
-  UrlbarTestUtils.getOneOffSearchButtons(window)
-    .getSelectableButtons(false)[0]
-    .click();
-  await p;
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Performs a search using a click on a one-off button.  This only tests the
-// FX_URLBAR_SELECTED_RESULT_METHOD histogram since test_oneOff_enter covers
-// everything else.
-add_task(async function test_oneOff_click() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  info("Type a query.");
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("query");
-
-  info("Click the first one-off button.");
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  let oneOffButton = UrlbarTestUtils.getOneOffSearchButtons(
-    window
-  ).getSelectableButtons(false)[0];
-  oneOffButton.click();
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName: oneOffButton.engine.name,
-    entry: "oneoff",
-  });
-
-  // Now that we're in search mode, execute the search.
-  let element = await UrlbarTestUtils.waitForAutocompleteResultAt(window, 0);
-  Assert.ok(element, "Found result after entering search mode.");
-  EventUtils.synthesizeMouseAtCenter(element, {});
-  await p;
-
-  TelemetryTestUtils.assertHistogram(
-    resultMethodHist,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-    1
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Clicks the first suggestion offered by the test search engine.
-add_task(async function test_suggestion_click() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  await UrlbarTestUtils.formHistory.clear();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  await withNewSearchEngine(async function(engine) {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    info("Clicking the urlbar suggestion.");
-    await clickURLBarSuggestion("queryfoo");
-    await p;
-
-    // Check if the scalars contain the expected values.
-    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-    TelemetryTestUtils.assertKeyedScalar(
-      scalars,
-      SCALAR_URLBAR,
-      "search_suggestion",
-      1
-    );
-    Assert.equal(
-      Object.keys(scalars[SCALAR_URLBAR]).length,
-      1,
-      "This search must only increment one entry in the scalar."
-    );
-
-    // SEARCH_COUNTS should be incremented.
-    let searchEngineId = "other-" + engine.name;
-    TelemetryTestUtils.assertKeyedHistogramSum(
-      search_hist,
-      searchEngineId + ".urlbar",
-      1
-    );
-
-    // Also check events.
-    TelemetryTestUtils.assertEvents(
-      [
-        [
-          "navigation",
-          "search",
-          "urlbar",
-          "suggestion",
-          { engine: searchEngineId },
-        ],
-      ],
-      { category: "navigation", method: "search" }
-    );
-
-    // Check the histograms as well.
-    TelemetryTestUtils.assertHistogram(resultIndexHist, 3, 1);
-
-    TelemetryTestUtils.assertHistogram(
-      resultTypeHist,
-      UrlbarUtils.SELECTED_RESULT_TYPES.searchsuggestion,
-      1
-    );
-
-    TelemetryTestUtils.assertKeyedHistogramValue(
-      resultIndexByTypeHist,
-      "searchsuggestion",
-      3,
-      1
-    );
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-});
-
-// Selects and presses the Return (Enter) key on the first suggestion offered by
-// the test search engine.  This only tests the FX_URLBAR_SELECTED_RESULT_METHOD
-// histogram since test_suggestion_click covers everything else.
-add_task(async function test_suggestion_arrowEnterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    info("Select the second result and press Return.");
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-});
-
-// Selects through tab and presses the Return (Enter) key on the first
-// suggestion offered by the test search engine.
-add_task(async function test_suggestion_tabEnterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    info("Select the second result and press Return.");
-    EventUtils.synthesizeKey("KEY_Tab");
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-});
-
-// Selects through code and presses the Return (Enter) key on the first
-// suggestion offered by the test search engine.
-add_task(async function test_suggestion_enterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    info("Select the second result and press Return.");
-    UrlbarTestUtils.setSelectedRowIndex(window, 1);
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-});
-
-// Clicks the first suggestion offered by the test search engine when in search
-// mode.
-add_task(async function test_searchmode_suggestion_click() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  await withNewSearchEngine(async function(engine) {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    await searchInAwesomebar("query");
-    await UrlbarTestUtils.enterSearchMode(window, {
-      engineName: engine.name,
-    });
-    info("Clicking the urlbar suggestion.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await clickURLBarSuggestion("queryfoo");
-    await p;
-
-    // Check if the scalars contain the expected values.
-    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-    TelemetryTestUtils.assertKeyedScalar(
-      scalars,
-      SCALAR_SEARCHMODE,
-      "search_suggestion",
-      1
-    );
-    Assert.equal(
-      Object.keys(scalars[SCALAR_SEARCHMODE]).length,
-      1,
-      "This search must only increment one entry in the scalar."
-    );
-
-    // SEARCH_COUNTS should be incremented.
-    let searchEngineId = "other-" + engine.name;
-    TelemetryTestUtils.assertKeyedHistogramSum(
-      search_hist,
-      searchEngineId + ".urlbar-searchmode",
-      1
-    );
-
-    // Also check events.
-    TelemetryTestUtils.assertEvents(
-      [
-        [
-          "navigation",
-          "search",
-          "urlbar_searchmode",
-          "suggestion",
-          { engine: searchEngineId },
-        ],
-      ],
-      { category: "navigation", method: "search" }
-    );
-
-    // Check the histograms as well.
-    TelemetryTestUtils.assertHistogram(resultIndexHist, 1, 1);
-
-    TelemetryTestUtils.assertHistogram(
-      resultTypeHist,
-      UrlbarUtils.SELECTED_RESULT_TYPES.searchsuggestion,
-      1
-    );
-
-    TelemetryTestUtils.assertKeyedHistogramValue(
-      resultIndexByTypeHist,
-      "searchsuggestion",
-      1,
-      1
-    );
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-  await SpecialPowers.popPrefEnv();
-});
-
-// Selects and presses the Return (Enter) key on the first suggestion offered by
-// the test search engine in search mode.  This only tests the
-// FX_URLBAR_SELECTED_RESULT_METHOD histogram since
-// test_searchmode_suggestion_click covers everything else.
-add_task(async function test_searchmode_suggestion_arrowEnterSelection() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function(engine) {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    await UrlbarTestUtils.enterSearchMode(window, {
-      engineName: engine.name,
-    });
-    info("Select the second result and press Return.");
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
-      1
-    );
-    BrowserTestUtils.removeTab(tab);
-  });
-  await SpecialPowers.popPrefEnv();
-});
-
-// Selects through tab and presses the Return (Enter) key on the first
-// suggestion offered by the test search engine in search mode.
-add_task(async function test_suggestion_tabEnterSelection() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function(engine) {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    await UrlbarTestUtils.enterSearchMode(window, {
-      engineName: engine.name,
-    });
-    info("Select the second result and press Return.");
-    EventUtils.synthesizeKey("KEY_Tab");
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-  await SpecialPowers.popPrefEnv();
-});
-
-// Selects through code and presses the Return (Enter) key on the first
-// suggestion offered by the test search engine in search mode.
-add_task(async function test_suggestion_enterSelection() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-    ],
-  });
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await withNewSearchEngine(async function(engine) {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. Suggestions should be generated by the test engine.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("query");
-    await UrlbarTestUtils.enterSearchMode(window, {
-      engineName: engine.name,
-    });
-    info("Select the second result and press Return.");
-    UrlbarTestUtils.setSelectedRowIndex(window, 1);
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  });
-  await SpecialPowers.popPrefEnv();
-});
-
-// Clicks a form history result.
-add_task(async function test_formHistory_click() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  await UrlbarTestUtils.formHistory.clear();
-  await UrlbarTestUtils.formHistory.add(["foobar"]);
-
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
-  });
-
-  let resultIndexHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX"
-  );
-  let resultTypeHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-  );
-  let resultIndexByTypeHist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-  );
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  await withNewSearchEngine(async engine => {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. There should be form history.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("foo");
-    info("Clicking the form history.");
-    let foobarIndex = await clickURLBarSuggestion("foobar");
-    await p;
-
-    // Check if the scalars contain the expected values.
-    const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-    TelemetryTestUtils.assertKeyedScalar(
-      scalars,
-      SCALAR_URLBAR,
-      "search_formhistory",
-      1
-    );
-    Assert.equal(
-      Object.keys(scalars[SCALAR_URLBAR]).length,
-      1,
-      "This search must only increment one entry in the scalar."
-    );
-
-    // SEARCH_COUNTS should be incremented.
-    let searchEngineId = "other-" + engine.name;
-    TelemetryTestUtils.assertKeyedHistogramSum(
-      search_hist,
-      searchEngineId + ".urlbar",
-      1
-    );
-
-    // Also check events.
-    TelemetryTestUtils.assertEvents(
-      [
-        [
-          "navigation",
-          "search",
-          "urlbar",
-          "formhistory",
-          { engine: searchEngineId },
-        ],
-      ],
-      { category: "navigation", method: "search" }
-    );
-
-    // Check the histograms as well.
-    TelemetryTestUtils.assertHistogram(resultIndexHist, foobarIndex, 1);
-
-    TelemetryTestUtils.assertHistogram(
-      resultTypeHist,
-      UrlbarUtils.SELECTED_RESULT_TYPES.formhistory,
-      1
-    );
-
-    TelemetryTestUtils.assertKeyedHistogramValue(
-      resultIndexByTypeHist,
-      "formhistory",
-      foobarIndex,
-      1
-    );
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.click,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-    await UrlbarTestUtils.formHistory.clear();
-    await SpecialPowers.popPrefEnv();
-  });
-});
-
-// Selects and presses the Return (Enter) key on a form history result.  This
-// only tests the FX_URLBAR_SELECTED_RESULT_METHOD histogram since
-// test_formHistory_click covers everything else.
-add_task(async function test_formHistory_arrowEnterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await UrlbarTestUtils.formHistory.clear();
-  await UrlbarTestUtils.formHistory.add(["foobar"]);
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
-  });
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. There should be form history.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("foo");
-    info("Select the form history result and press Return.");
-    while (gURLBar.untrimmedValue != "foobar") {
-      EventUtils.synthesizeKey("KEY_ArrowDown");
-    }
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-    await UrlbarTestUtils.formHistory.clear();
-    await SpecialPowers.popPrefEnv();
-  });
-});
-
-// Selects through tab and presses the Return (Enter) key on a form history
-// result.
-add_task(async function test_formHistory_tabEnterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await UrlbarTestUtils.formHistory.clear();
-  await UrlbarTestUtils.formHistory.add(["foobar"]);
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
-  });
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. There should be form history.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("foo");
-    info("Select the form history result and press Return.");
-    while (gURLBar.untrimmedValue != "foobar") {
-      EventUtils.synthesizeKey("KEY_Tab");
-    }
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.tabEnterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-    await UrlbarTestUtils.formHistory.clear();
-    await SpecialPowers.popPrefEnv();
-  });
-});
-
-// Selects through code and presses the Return (Enter) key on a form history
-// result.
-add_task(async function test_formHistory_enterSelection() {
-  Services.telemetry.clearScalars();
-  let resultMethodHist = TelemetryTestUtils.getAndClearHistogram(
-    "FX_URLBAR_SELECTED_RESULT_METHOD"
-  );
-
-  await UrlbarTestUtils.formHistory.clear();
-  await UrlbarTestUtils.formHistory.add(["foobar"]);
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 1]],
-  });
-
-  await withNewSearchEngine(async function() {
-    let tab = await BrowserTestUtils.openNewForegroundTab(
-      gBrowser,
-      "about:blank"
-    );
-
-    info("Type a query. There should be form history.");
-    let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await searchInAwesomebar("foo");
-    info("Select the second result and press Return.");
-    let index = 1;
-    while (gURLBar.untrimmedValue != "foobar") {
-      UrlbarTestUtils.setSelectedRowIndex(window, index++);
-    }
-    EventUtils.synthesizeKey("KEY_Enter");
-    await p;
-
-    TelemetryTestUtils.assertHistogram(
-      resultMethodHist,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.enterSelection,
-      1
-    );
-
-    BrowserTestUtils.removeTab(tab);
-    await UrlbarTestUtils.formHistory.clear();
-    await SpecialPowers.popPrefEnv();
-  });
-});
-
-add_task(async function test_privateWindow() {
-  // Override the search telemetry search provider info to
-  // count in-content SEARCH_COUNTs telemetry for our test engine.
-  SearchTelemetry.overrideSearchTelemetryForTests([
-    {
-      telemetryId: "example",
-      searchPageRegexp: "^http://example\\.com/",
-      queryParamName: "q",
-    },
-  ]);
-
-  let search_hist = TelemetryTestUtils.getAndClearKeyedHistogram(
-    "SEARCH_COUNTS"
-  );
-
-  // First, do a bunch of searches in a private window.
-  let win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
-
-  info("Search in a private window and the pref does not exist");
-  let p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    1
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    1
-  );
-
-  info("Search again in a private window after setting the pref to true");
-  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", true);
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should *not* be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    1
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    1
-  );
-
-  info("Search again in a private window after setting the pref to false");
-  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", false);
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    2
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    2
-  );
-
-  info("Search again in a private window after clearing the pref");
-  Services.prefs.clearUserPref("browser.engagement.search_counts.pbm");
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    3
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    3
-  );
-
-  await BrowserTestUtils.closeWindow(win);
-
-  // Now, do a bunch of searches in a non-private window.  Telemetry should
-  // always be recorded regardless of the pref's value.
-  win = await BrowserTestUtils.openNewBrowserWindow();
-
-  info("Search in a non-private window and the pref does not exist");
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    4
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    4
-  );
-
-  info("Search again in a non-private window after setting the pref to true");
-  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", true);
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    5
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    5
-  );
-
-  info("Search again in a non-private window after setting the pref to false");
-  Services.prefs.setBoolPref("browser.engagement.search_counts.pbm", false);
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    6
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    6
-  );
-
-  info("Search again in a non-private window after clearing the pref");
-  Services.prefs.clearUserPref("browser.engagement.search_counts.pbm");
-  p = BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  await searchInAwesomebar("another query", win);
-  EventUtils.synthesizeKey("KEY_Enter", undefined, win);
-  await p;
-
-  // SEARCH_COUNTS should be incremented.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    7
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "example.in-content:organic:none",
-    7
-  );
-
-  await BrowserTestUtils.closeWindow(win);
-
-  // Reset the search provider info.
-  SearchTelemetry.overrideSearchTelemetryForTests();
-  await UrlbarTestUtils.formHistory.clear();
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_places.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_places.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_places.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_places.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,330 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry with places related actions (e.g. history/
- * bookmark selection).
- */
-
-"use strict";
-
-const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
-
-const TEST_URL = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content",
-  "http://mochi.test:8888"
-);
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-function searchInAwesomebar(value, win = window) {
-  return UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window: win,
-    waitForFocus,
-    value,
-    fireInputEvent: true,
-  });
-}
-
-function assertSearchTelemetryEmpty(search_hist) {
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  Assert.ok(
-    !(SCALAR_URLBAR in scalars),
-    `Should not have recorded ${SCALAR_URLBAR}`
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    undefined
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  let events = Services.telemetry.snapshotEvents(
-    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
-    false
-  );
-  events = (events.parent || []).filter(
-    e => e[1] == "navigation" && e[2] == "search"
-  );
-  Assert.deepEqual(
-    events,
-    [],
-    "Should not have recorded any navigation search events"
-  );
-}
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      // Disable search suggestions in the urlbar.
-      ["browser.urlbar.suggest.searches", false],
-      // Clear historical search suggestions to avoid interference from previous
-      // tests.
-      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
-      // Use the default matching bucket configuration.
-      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
-      // Turn autofill off.
-      ["browser.urlbar.autoFill", false],
-    ],
-  });
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Clear history so that history added by previous tests doesn't mess up this
-  // test when it selects results in the urlbar.
-  await PlacesUtils.history.clear();
-  await PlacesUtils.bookmarks.eraseEverything();
-
-  await PlacesUtils.keywords.insert({
-    keyword: "get",
-    url: TEST_URL + "?q=%s",
-  });
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    await PlacesUtils.keywords.remove("get");
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await PlacesUtils.history.clear();
-    await PlacesUtils.bookmarks.eraseEverything();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-  });
-});
-
-add_task(async function test_history() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  await PlacesTestUtils.addVisits([
-    {
-      uri: "http://example.com",
-      title: "example",
-      transition: Ci.nsINavHistoryService.TRANSITION_TYPED,
-    },
-  ]);
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("example");
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "history",
-    1,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_bookmark() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  let bm = await PlacesUtils.bookmarks.insert({
-    url: "http://example.com",
-    title: "example",
-    parentGuid: PlacesUtils.bookmarks.menuGuid,
-  });
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("example");
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "bookmark",
-    1,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-  );
-
-  await PlacesUtils.bookmarks.remove(bm);
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_keyword() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("get example");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "keyword",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_switchtab() {
-  const histograms = snapshotHistograms();
-
-  let homeTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:buildconfig"
-  );
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:mozilla"
-  );
-
-  let p = BrowserTestUtils.waitForEvent(gBrowser, "TabSwitchDone");
-  await searchInAwesomebar("about:buildconfig");
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "switchtab",
-    1,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-  );
-
-  BrowserTestUtils.removeTab(tab);
-  BrowserTestUtils.removeTab(homeTab);
-});
-
-add_task(async function test_visitURL() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("http://example.com");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "visiturl",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-add_task(async function test_autofill() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  await PlacesTestUtils.addVisits([
-    {
-      uri: "http://example.com/mypage",
-      title: "example",
-      transition: Ci.nsINavHistoryService.TRANSITION_TYPED,
-    },
-  ]);
-
-  Services.prefs.setBoolPref("browser.urlbar.autoFill", true);
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await searchInAwesomebar("example.com/my");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "autofill",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_remotetab.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_remotetab.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_remotetab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_remotetab.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry with remote tab action.
- */
-
-"use strict";
-
-const SCALAR_URLBAR = "browser.engagement.navigation.urlbar";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
-
-function assertSearchTelemetryEmpty(search_hist) {
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  Assert.ok(
-    !(SCALAR_URLBAR in scalars),
-    `Should not have recorded ${SCALAR_URLBAR}`
-  );
-
-  // Make sure SEARCH_COUNTS contains identical values.
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.urlbar",
-    undefined
-  );
-  TelemetryTestUtils.assertKeyedHistogramSum(
-    search_hist,
-    "other-MozSearch.alias",
-    undefined
-  );
-
-  // Also check events.
-  let events = Services.telemetry.snapshotEvents(
-    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
-    false
-  );
-  events = (events.parent || []).filter(
-    e => e[1] == "navigation" && e[2] == "search"
-  );
-  Assert.deepEqual(
-    events,
-    [],
-    "Should not have recorded any navigation search events"
-  );
-}
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      // Disable search suggestions in the urlbar.
-      ["browser.urlbar.suggest.searches", false],
-      // Clear historical search suggestions to avoid interference from previous
-      // tests.
-      ["browser.urlbar.maxHistoricalSearchSuggestions", 0],
-      // Use the default matching bucket configuration.
-      ["browser.urlbar.matchBuckets", "general:5,suggestion:4"],
-      // Turn autofill off.
-      ["browser.urlbar.autoFill", false],
-      // Special prefs for remote tabs.
-      ["services.sync.username", "fake"],
-      ["services.sync.syncedTabs.showRemoteTabs", true],
-    ],
-  });
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Enable event recording for the events tested here.
-  Services.telemetry.setEventRecordingEnabled("navigation", true);
-
-  // Clear history so that history added by previous tests doesn't mess up this
-  // test when it selects results in the urlbar.
-  await PlacesUtils.history.clear();
-  await PlacesUtils.bookmarks.eraseEverything();
-
-  const REMOTE_TAB = {
-    id: "7cqCr77ptzX3",
-    type: "client",
-    lastModified: 1492201200,
-    name: "zcarter's Nightly on MacBook-Pro-25",
-    clientType: "desktop",
-    tabs: [
-      {
-        type: "tab",
-        title: "Test Remote",
-        url: "http://example.com",
-        icon: UrlbarUtils.ICON.DEFAULT,
-        client: "7cqCr77ptzX3",
-        lastUsed: 1452124677,
-      },
-    ],
-  };
-
-  const sandbox = sinon.createSandbox();
-
-  let originalSyncedTabsInternal = SyncedTabs._internal;
-  SyncedTabs._internal = {
-    isConfiguredToSyncTabs: true,
-    hasSyncedThisSession: true,
-    getTabClients() {
-      return Promise.resolve([]);
-    },
-    syncTabs() {
-      return Promise.resolve();
-    },
-  };
-
-  // Tell the Sync XPCOM service it is initialized.
-  let weaveXPCService = Cc["@mozilla.org/weave/service;1"].getService(
-    Ci.nsISupports
-  ).wrappedJSObject;
-  let oldWeaveServiceReady = weaveXPCService.ready;
-  weaveXPCService.ready = true;
-
-  sandbox
-    .stub(SyncedTabs._internal, "getTabClients")
-    .callsFake(() => Promise.resolve(Cu.cloneInto([REMOTE_TAB], {})));
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    sandbox.restore();
-    weaveXPCService.ready = oldWeaveServiceReady;
-    SyncedTabs._internal = originalSyncedTabsInternal;
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await PlacesUtils.history.clear();
-    await PlacesUtils.bookmarks.eraseEverything();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-  });
-});
-
-add_task(async function test_remotetab() {
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    waitForFocus,
-    value: "example",
-    fireInputEvent: true,
-  });
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await p;
-
-  assertSearchTelemetryEmpty(histograms.search_hist);
-  assertTelemetryResults(
-    histograms,
-    "remotetab",
-    1,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-  );
-
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_searchmode.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_searchmode.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_searchmode.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_searchmode.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,587 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests the urlbar.searchmode.* scalars telemetry with search mode
- * related actions.
- */
-
-"use strict";
-
-const ENTRY_SCALAR_PREFIX = "urlbar.searchmode.";
-const PICKED_SCALAR_PREFIX = "urlbar.picked.searchmode.";
-const ENGINE_ALIAS = "alias";
-const TEST_QUERY = "test";
-let engineName;
-let engineDomain;
-
-// The preference to enable suggestions.
-const SUGGEST_PREF = "browser.search.suggest.enabled";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  AppConstants: "resource://gre/modules/AppConstants.jsm",
-  SearchTelemetry: "resource:///modules/SearchTelemetry.jsm",
-  UrlbarProviderTabToSearch:
-    "resource:///modules/UrlbarProviderTabToSearch.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-XPCOMUtils.defineLazyServiceGetter(
-  this,
-  "TouchBarHelper",
-  "@mozilla.org/widget/touchbarhelper;1",
-  "nsITouchBarHelper"
-);
-
-/**
- * Asserts that search mode telemetry was recorded correctly. Checks both the
- * urlbar.searchmode.* and urlbar.searchmode_picked.* probes.
- * @param {string} entry
- *   A search mode entry point.
- * @param {string} engineOrSource
- *   An engine name or a search mode source.
- * @param {number} [resultIndex]
- *   The index of the result picked while in search mode. Only pass this
- *   parameter if a result is picked.
- */
-function assertSearchModeScalars(entry, engineOrSource, resultIndex = -1) {
-  // Check if the urlbar.searchmode.entry scalar contains the expected value.
-  const scalars = TelemetryTestUtils.getProcessScalars("parent", true, false);
-  TelemetryTestUtils.assertKeyedScalar(
-    scalars,
-    ENTRY_SCALAR_PREFIX + entry,
-    engineOrSource,
-    1
-  );
-
-  for (let e of UrlbarUtils.SEARCH_MODE_ENTRY) {
-    if (e == entry) {
-      Assert.equal(
-        Object.keys(scalars[ENTRY_SCALAR_PREFIX + entry]).length,
-        1,
-        `This search must only increment one entry in the correct scalar: ${e}`
-      );
-    } else {
-      Assert.ok(
-        !scalars[ENTRY_SCALAR_PREFIX + e],
-        `No other urlbar.searchmode scalars should be recorded. Checking ${e}`
-      );
-    }
-  }
-
-  if (resultIndex >= 0) {
-    TelemetryTestUtils.assertKeyedScalar(
-      scalars,
-      PICKED_SCALAR_PREFIX + entry,
-      resultIndex,
-      1
-    );
-  }
-
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.localOneOffs", true],
-      ["browser.urlbar.update2.oneOffsRefresh", true],
-      // Disable tab-to-search onboarding results for general tests. They are
-      // enabled in tests that specifically address onboarding.
-      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
-    ],
-  });
-
-  // Create an engine to generate search suggestions and add it as default
-  // for this test.
-  const url =
-    getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml";
-  let suggestionEngine = await Services.search.addOpenSearchEngine(url, "");
-  suggestionEngine.alias = ENGINE_ALIAS;
-  engineDomain = suggestionEngine.getResultDomain();
-  engineName = suggestionEngine.name;
-
-  // Make it the default search engine.
-  let originalEngine = await Services.search.getDefault();
-  await Services.search.setDefault(suggestionEngine);
-
-  // And the first one-off engine.
-  await Services.search.moveEngine(suggestionEngine, 0);
-
-  // Enable local telemetry recording for the duration of the tests.
-  let oldCanRecord = Services.telemetry.canRecordExtended;
-  Services.telemetry.canRecordExtended = true;
-
-  // Clear history so that history added by previous tests doesn't mess up this
-  // test when it selects results in the urlbar.
-  await PlacesUtils.history.clear();
-
-  // Clear historical search suggestions to avoid interference from previous
-  // tests.
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.maxHistoricalSearchSuggestions", 0]],
-  });
-
-  // Allows UrlbarTestUtils to access this scope's test helpers, like Assert.
-  UrlbarTestUtils.init(this);
-
-  // Make sure to restore the engine once we're done.
-  registerCleanupFunction(async function() {
-    Services.telemetry.canRecordExtended = oldCanRecord;
-    await Services.search.setDefault(originalEngine);
-    await Services.search.removeEngine(suggestionEngine);
-    await PlacesUtils.history.clear();
-    Services.telemetry.setEventRecordingEnabled("navigation", false);
-    UrlbarTestUtils.uninit();
-  });
-});
-
-// Clicks the first one off.
-add_task(async function test_oneoff_remote() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // Enters search mode by clicking a one-off.
-  await UrlbarTestUtils.enterSearchMode(window);
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("oneoff", "other", 0);
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Clicks the history one off.
-add_task(async function test_oneoff_local() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // Enters search mode by clicking a one-off.
-  await UrlbarTestUtils.enterSearchMode(window, {
-    source: UrlbarUtils.RESULT_SOURCE.HISTORY,
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("oneoff", "history", 0);
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Checks that the Amazon search mode name is collapsed to "Amazon".
-add_task(async function test_oneoff_amazon() {
-  // Disable suggestions to avoid hitting Amazon servers.
-  await SpecialPowers.pushPrefEnv({
-    set: [[SUGGEST_PREF, false]],
-  });
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // Enters search mode by clicking a one-off.
-  await UrlbarTestUtils.enterSearchMode(window, {
-    engineName: "Amazon.com",
-  });
-  assertSearchModeScalars("oneoff", "Amazon");
-  await UrlbarTestUtils.exitSearchMode(window);
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Checks that the Wikipedia search mode name is collapsed to "Wikipedia".
-add_task(async function test_oneoff_wikipedia() {
-  // Disable suggestions to avoid hitting Wikipedia servers.
-  await SpecialPowers.pushPrefEnv({
-    set: [[SUGGEST_PREF, false]],
-  });
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // Enters search mode by clicking a one-off.
-  await UrlbarTestUtils.enterSearchMode(window, {
-    engineName: "Wikipedia (en)",
-  });
-  assertSearchModeScalars("oneoff", "Wikipedia");
-  await UrlbarTestUtils.exitSearchMode(window);
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Enters search mode by pressing the keyboard shortcut.
-add_task(async function test_shortcut() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // Enter search mode by pressing the keyboard shortcut.
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("k", { accelKey: true });
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName,
-    source: UrlbarUtils.RESULT_SOURCE.SEARCH,
-    entry: "shortcut",
-  });
-  assertSearchModeScalars("shortcut", "other");
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Enters search mode by selecting a Top Site from the Urlbar.
-add_task(async function test_topsites_urlbar() {
-  // Disable suggestions to avoid hitting Amazon servers.
-  await SpecialPowers.pushPrefEnv({
-    set: [[SUGGEST_PREF, false]],
-  });
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  // Enter search mode by selecting a Top Site from the Urlbar.
-  await UrlbarTestUtils.promisePopupOpen(window, () => {
-    if (gURLBar.getAttribute("pageproxystate") == "invalid") {
-      gURLBar.handleRevert();
-    }
-    EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
-  });
-  await UrlbarTestUtils.promiseSearchComplete(window);
-
-  let amazonSearch = await UrlbarTestUtils.waitForAutocompleteResultAt(
-    window,
-    0
-  );
-  Assert.equal(
-    amazonSearch.result.payload.keyword,
-    "@amazon",
-    "First result should have the Amazon keyword."
-  );
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeMouseAtCenter(amazonSearch, {});
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName: amazonSearch.result.payload.engine,
-    entry: "topsites_urlbar",
-  });
-  assertSearchModeScalars("topsites_urlbar", "Amazon");
-  await UrlbarTestUtils.exitSearchMode(window);
-
-  BrowserTestUtils.removeTab(tab);
-  await SpecialPowers.popPrefEnv();
-});
-
-// Enters search mode by selecting a keyword offer result.
-add_task(async function test_keywordoffer() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  // Do a search for "@" + our test alias.  It should autofill with a trailing
-  // space, and the heuristic result should be an autofill result with a keyword
-  // offer.
-  let alias = "@" + ENGINE_ALIAS;
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: alias,
-  });
-  let keywordOfferResult = await UrlbarTestUtils.getDetailsOfResultAt(
-    window,
-    0
-  );
-  Assert.equal(
-    keywordOfferResult.searchParams.keyword,
-    alias,
-    "The first result should be a keyword search result with the correct alias."
-  );
-
-  // Pick the keyword offer result.
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName,
-    entry: "keywordoffer",
-  });
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "foo",
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("keywordoffer", "other", 0);
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Enters search mode by typing an alias.
-add_task(async function test_typed() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  // Enter search mode by selecting a keywordoffer result.
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: `${ENGINE_ALIAS} `,
-  });
-
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey(" ");
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName,
-    entry: "typed",
-  });
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "foo",
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("typed", "other", 0);
-
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Enters search mode by calling the same function called by the Search
-// Bookmarks menu item in Library > Bookmarks.
-add_task(async function test_bookmarkmenu() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  PlacesCommandHook.searchBookmarks();
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS,
-    entry: "bookmarkmenu",
-  });
-  assertSearchModeScalars("bookmarkmenu", "bookmarks");
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Enters search mode by calling the same function called by the Search Tabs
-// menu item in the tab overflow menu.
-add_task(async function test_tabmenu() {
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  gTabsPanel.searchTabs();
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    source: UrlbarUtils.RESULT_SOURCE.TABS,
-    entry: "tabmenu",
-  });
-  assertSearchModeScalars("tabmenu", "tabs");
-});
-
-// Enters search mode by performing a search handoff on about:privatebrowsing.
-// NOTE: We don't test handoff on about:home. Running mochitests on about:home
-// is quite difficult. This subtest verifies that `handoff` is a valid scalar
-// suffix and that a call to
-// UrlbarInput.search(value, { searchModeEntry: "handoff" }) records values in
-// the urlbar.searchmode.handoff scalar. PlacesFeed.test.js verfies that
-// about:home handoff makes that exact call.
-add_task(async function test_handoff_pbm() {
-  let win = await BrowserTestUtils.openNewBrowserWindow({
-    private: true,
-    waitForTabURL: "about:privatebrowsing",
-  });
-  let tab = win.gBrowser.selectedBrowser;
-
-  await SpecialPowers.spawn(tab, [], async function() {
-    let btn = content.document.getElementById("search-handoff-button");
-    btn.click();
-  });
-
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(win);
-  await new Promise(r => EventUtils.synthesizeKey("f", {}, win, r));
-  await searchPromise;
-  await UrlbarTestUtils.assertSearchMode(win, {
-    engineName,
-    entry: "handoff",
-  });
-  assertSearchModeScalars("handoff", "other");
-
-  await UrlbarTestUtils.exitSearchMode(win);
-  await UrlbarTestUtils.promisePopupClose(win);
-  await BrowserTestUtils.closeWindow(win);
-});
-
-// Enters search mode by tapping a search shortcut on the Touch Bar.
-add_task(async function test_touchbar() {
-  if (AppConstants.platform != "macosx") {
-    return;
-  }
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: TEST_QUERY,
-  });
-  // We have to fake the tap on the Touch Bar since mochitests have no way of
-  // interacting with the Touch Bar.
-  TouchBarHelper.insertRestrictionInUrlbar(UrlbarTokenizer.RESTRICT.HISTORY);
-  await UrlbarTestUtils.assertSearchMode(window, {
-    source: UrlbarUtils.RESULT_SOURCE.HISTORY,
-    entry: "touchbar",
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("touchbar", "history", 0);
-  BrowserTestUtils.removeTab(tab);
-});
-
-// Enters search mode by selecting a tab-to-search result.
-// Tests that tab-to-search results preview search mode when highlighted. These
-// results are worth testing separately since they do not set the
-// payload.keyword parameter.
-add_task(async function test_tabtosearch() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2.tabToComplete", true],
-      // Do not show the onboarding result for this subtest.
-      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
-    ],
-  });
-  await PlacesTestUtils.addVisits([`http://${engineDomain}/`]);
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: engineDomain.slice(0, 4),
-  });
-  let tabToSearchResult = (
-    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
-  ).result;
-  Assert.equal(
-    tabToSearchResult.providerName,
-    "TabToSearch",
-    "The second result is a tab-to-search result."
-  );
-  Assert.equal(
-    tabToSearchResult.payload.engine,
-    engineName,
-    "The tab-to-search result is for the correct engine."
-  );
-  await UrlbarTestUtils.assertSearchMode(window, null);
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  Assert.equal(
-    UrlbarTestUtils.getSelectedRowIndex(window),
-    1,
-    "Sanity check: The second result is selected."
-  );
-  // Pick the tab-to-search result.
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName,
-    entry: "tabtosearch",
-  });
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "foo",
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("tabtosearch", "other", 0);
-
-  BrowserTestUtils.removeTab(tab);
-
-  await PlacesUtils.history.clear();
-  await SpecialPowers.popPrefEnv();
-});
-
-// Enters search mode by selecting a tab-to-search onboarding result.
-add_task(async function test_tabtosearch_onboard() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2.tabToComplete", true],
-      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 3],
-    ],
-  });
-  await PlacesTestUtils.addVisits([`http://${engineDomain}/`]);
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: engineDomain.slice(0, 4),
-  });
-  let tabToSearchResult = (
-    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
-  ).result;
-  Assert.equal(
-    tabToSearchResult.providerName,
-    "TabToSearch",
-    "The second result is a tab-to-search result."
-  );
-  Assert.equal(
-    tabToSearchResult.payload.engine,
-    engineName,
-    "The tab-to-search result is for the correct engine."
-  );
-  Assert.equal(
-    tabToSearchResult.payload.dynamicType,
-    "onboardTabToSearch",
-    "The tab-to-search result is an onboarding result."
-  );
-  await UrlbarTestUtils.assertSearchMode(window, null);
-  EventUtils.synthesizeKey("KEY_ArrowDown");
-  Assert.equal(
-    UrlbarTestUtils.getSelectedRowIndex(window),
-    1,
-    "Sanity check: The second result is selected."
-  );
-  // Pick the tab-to-search onboarding result.
-  let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await searchPromise;
-
-  await UrlbarTestUtils.assertSearchMode(window, {
-    engineName,
-    entry: "tabtosearch_onboard",
-  });
-
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "foo",
-  });
-  let loadPromise = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  EventUtils.synthesizeKey("KEY_Enter");
-  await loadPromise;
-  assertSearchModeScalars("tabtosearch_onboard", "other", 0);
-
-  UrlbarPrefs.set("tabToSearch.onboard.interactionsLeft", 3);
-  delete UrlbarProviderTabToSearch.onboardingInteractionAtTime;
-
-  BrowserTestUtils.removeTab(tab);
-  await PlacesUtils.history.clear();
-  await SpecialPowers.popPrefEnv();
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tabtosearch.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tabtosearch.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tabtosearch.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tabtosearch.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,357 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests telemetry for tabtosearch results.
- * NB: This file does not test the search mode `entry` field for tab-to-search
- * results. That is tested in browser_UsageTelemetry_urlbar_searchmode.js.
- */
-
-"use strict";
-
-const ENGINE_NAME = "MozSearch";
-const ENGINE_DOMAIN = "example.com";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-/**
- * Checks to see if the second result in the Urlbar is an onboarding result
- * with the correct engine.
- */
-async function checkForOnboardingResult(engineName) {
-  Assert.ok(UrlbarTestUtils.isPopupOpen(window), "Popup should be open.");
-  let tabToSearchResult = (
-    await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
-  ).result;
-  Assert.equal(
-    tabToSearchResult.providerName,
-    "TabToSearch",
-    "The second result is a tab-to-search result."
-  );
-  Assert.equal(
-    tabToSearchResult.payload.engine,
-    engineName,
-    "The tab-to-search result is for the first engine."
-  );
-  Assert.equal(
-    tabToSearchResult.payload.dynamicType,
-    "onboardTabToSearch",
-    "The tab-to-search result is an onboarding result."
-  );
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.update2", true],
-      ["browser.urlbar.update2.tabToComplete", true],
-      ["browser.urlbar.tabToSearch.onboard.interactionsLeft", 0],
-    ],
-  });
-
-  let engine = await Services.search.addEngineWithDetails(ENGINE_NAME, {
-    template: `http://${ENGINE_DOMAIN}/?q={searchTerms}`,
-  });
-
-  UrlbarTestUtils.init(this);
-
-  registerCleanupFunction(async () => {
-    UrlbarTestUtils.uninit();
-    await Services.search.removeEngine(engine);
-  });
-});
-
-add_task(async function test() {
-  await BrowserTestUtils.withNewTab("about:blank", async () => {
-    const histograms = snapshotHistograms();
-
-    for (let i = 0; i < 3; i++) {
-      await PlacesTestUtils.addVisits([`https://${ENGINE_DOMAIN}/`]);
-    }
-
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: ENGINE_DOMAIN.slice(0, 4),
-    });
-
-    let tabToSearchResult = (
-      await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1)
-    ).result;
-    Assert.equal(
-      tabToSearchResult.providerName,
-      "TabToSearch",
-      "The second result is a tab-to-search result."
-    );
-    Assert.equal(
-      tabToSearchResult.payload.engine,
-      ENGINE_NAME,
-      "The tab-to-search result is for the correct engine."
-    );
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    Assert.equal(
-      UrlbarTestUtils.getSelectedRowIndex(window),
-      1,
-      "Sanity check: The second result is selected."
-    );
-
-    // Select the tab-to-search result.
-    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-    EventUtils.synthesizeKey("KEY_Enter");
-    await searchPromise;
-
-    await UrlbarTestUtils.assertSearchMode(window, {
-      engineName: ENGINE_NAME,
-      entry: "tabtosearch",
-    });
-
-    assertTelemetryResults(
-      histograms,
-      "tabtosearch",
-      1,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-    );
-
-    await UrlbarTestUtils.exitSearchMode(window);
-    await UrlbarTestUtils.promisePopupClose(window, () => {
-      gURLBar.blur();
-    });
-    await PlacesUtils.history.clear();
-  });
-});
-
-add_task(async function onboarding_impressions() {
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.urlbar.tabToSearch.onboard.interactionsLeft", 3]],
-  });
-
-  await BrowserTestUtils.withNewTab("about:blank", async browser => {
-    const firstEngineHost = "example";
-    let secondEngine = await Services.search.addEngineWithDetails(
-      `${ENGINE_NAME}2`,
-      { template: `http://${firstEngineHost}-2.com/?q={searchTerms}` }
-    );
-
-    for (let i = 0; i < 3; i++) {
-      await PlacesTestUtils.addVisits([`https://${firstEngineHost}-2.com`]);
-      await PlacesTestUtils.addVisits([`https://${ENGINE_DOMAIN}/`]);
-    }
-
-    // First do multiple searches for substrings of firstEngineHost. The view
-    // should show the same tab-to-search onboarding result the entire time, so
-    // we should not continue to increment urlbar.tips.
-    for (let i = 1; i < firstEngineHost.length; i++) {
-      info(
-        `Search for "${firstEngineHost.slice(
-          0,
-          i
-        )}". Only record one impression for this sequence.`
-      );
-      await UrlbarTestUtils.promiseAutocompleteResultPopup({
-        window,
-        value: firstEngineHost.slice(0, i),
-        fireInputEvent: true,
-      });
-      await checkForOnboardingResult(ENGINE_NAME);
-    }
-
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      1
-    );
-
-    info("Type through autofill to second engine hostname. Record impression.");
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: firstEngineHost,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(ENGINE_NAME);
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: `${firstEngineHost}-`,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    // Since the user typed past the autofill for the first engine, we showed a
-    // different onboarding result and now we increment
-    // tabtosearch_onboard-shown.
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      3
-    );
-
-    info("Make a typo and return to autofill. Do not record impression.");
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: `${firstEngineHost}-`,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: `${firstEngineHost}-3`,
-      fireInputEvent: true,
-    });
-    Assert.equal(
-      UrlbarTestUtils.getResultCount(window),
-      1,
-      "We are not showing a tab-to-search result."
-    );
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: `${firstEngineHost}-2`,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      4
-    );
-
-    info("Cancel then restart autofill. Do not record impression.");
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: `${firstEngineHost}-2`,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    let searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-    EventUtils.synthesizeKey("KEY_Backspace");
-    await searchPromise;
-    Assert.greater(
-      UrlbarTestUtils.getResultCount(window),
-      1,
-      "Sanity check: we have more than one result."
-    );
-    let result = (await UrlbarTestUtils.waitForAutocompleteResultAt(window, 1))
-      .result;
-    Assert.notEqual(
-      result.type,
-      UrlbarUtils.RESULT_TYPE.SEARCH,
-      "The second result is not a tab-to-search result."
-    );
-    searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-    // Type the "." from `example-2.com`.
-    EventUtils.synthesizeKey(".");
-    await searchPromise;
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      5
-    );
-
-    // See javadoc for UrlbarProviderTabToSearch.onEngagement for discussion
-    // about retained results.
-    info("Reopen the result set with retained results. Record impression.");
-    await UrlbarTestUtils.promisePopupOpen(window, () => {
-      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
-    });
-    await checkForOnboardingResult(`${ENGINE_NAME}2`);
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      6
-    );
-
-    info(
-      "Open a result page and then autofill engine host. Record impression."
-    );
-    await UrlbarTestUtils.promiseAutocompleteResultPopup({
-      window,
-      value: firstEngineHost,
-      fireInputEvent: true,
-    });
-    await checkForOnboardingResult(ENGINE_NAME);
-    // Press enter on the heuristic result so we visit example.com without
-    // doing an additional search.
-    let loadPromise = BrowserTestUtils.browserLoaded(browser);
-    EventUtils.synthesizeKey("KEY_Enter");
-    await loadPromise;
-    // Click the Urlbar and type to simulate what a user would actually do. If
-    // we use promiseAutocompleteResultPopup, no query would be made between
-    // this one and the previous tab-to-search query. Thus
-    // `onboardingEnginesShown` would not be cleared. This would not happen
-    // in real-world usage.
-    await UrlbarTestUtils.promisePopupOpen(window, () => {
-      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
-    });
-    searchPromise = UrlbarTestUtils.promiseSearchComplete(window);
-    EventUtils.synthesizeKey(firstEngineHost.slice(0, 4));
-    await searchPromise;
-    await checkForOnboardingResult(ENGINE_NAME);
-    await UrlbarTestUtils.promisePopupClose(window, () => gURLBar.blur());
-    // We clear the scalar this time.
-    TelemetryTestUtils.assertKeyedScalar(
-      TelemetryTestUtils.getProcessScalars("parent", true, true),
-      "urlbar.tips",
-      "tabtosearch_onboard-shown",
-      8
-    );
-
-    await PlacesUtils.history.clear();
-    await Services.search.removeEngine(secondEngine);
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tip.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tip.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tip.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_tip.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry for tip results.
- */
-
-"use strict";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
-  UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
-  UrlbarResult: "resource:///modules/UrlbarResult.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      // Disable search suggestions in the urlbar.
-      ["browser.urlbar.suggest.searches", false],
-      // Turn autofill off.
-      ["browser.urlbar.autoFill", false],
-    ],
-  });
-  await PlacesUtils.history.clear();
-  await PlacesUtils.bookmarks.eraseEverything();
-});
-
-add_task(async function test() {
-  // Add a restricting provider that returns a preselected heuristic tip result.
-  let provider = new TipProvider([
-    Object.assign(
-      new UrlbarResult(
-        UrlbarUtils.RESULT_TYPE.TIP,
-        UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
-        {
-          icon: "",
-          text: "This is a test tip.",
-          buttonText: "OK",
-          type: "test",
-        }
-      ),
-      { heuristic: true }
-    ),
-  ]);
-  UrlbarProvidersManager.registerProvider(provider);
-
-  const histograms = snapshotHistograms();
-
-  let tab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:blank"
-  );
-
-  // Show the view and press enter to select the tip.
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    waitForFocus,
-    value: "test",
-    fireInputEvent: true,
-  });
-  EventUtils.synthesizeKey("KEY_Enter");
-
-  assertTelemetryResults(
-    histograms,
-    "tip",
-    0,
-    UrlbarTestUtils.SELECTED_RESULT_METHODS.enter
-  );
-
-  UrlbarProvidersManager.unregisterProvider(provider);
-  BrowserTestUtils.removeTab(tab);
-});
-
-class TipProvider extends UrlbarProvider {
-  constructor(results) {
-    super();
-    this._results = results;
-  }
-  get name() {
-    return "TestProviderTip";
-  }
-  get type() {
-    return UrlbarUtils.PROVIDER_TYPE.PROFILE;
-  }
-  isActive(context) {
-    return true;
-  }
-  getPriority(context) {
-    return 1;
-  }
-  async startQuery(context, addCallback) {
-    context.preselected = true;
-    for (const result of this._results) {
-      addCallback(this, result);
-    }
-  }
-}
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_topsite.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_topsite.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_topsite.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_urlbar_topsite.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * This file tests urlbar telemetry for topsite results.
- */
-
-"use strict";
-
-XPCOMUtils.defineLazyModuleGetters(this, {
-  AboutNewTab: "resource:///modules/AboutNewTab.jsm",
-  UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
-});
-
-const EN_US_TOPSITES =
-  "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/";
-
-function snapshotHistograms() {
-  Services.telemetry.clearScalars();
-  Services.telemetry.clearEvents();
-  return {
-    resultIndexHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX"
-    ),
-    resultTypeHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_TYPE_2"
-    ),
-    resultIndexByTypeHist: TelemetryTestUtils.getAndClearKeyedHistogram(
-      "FX_URLBAR_SELECTED_RESULT_INDEX_BY_TYPE_2"
-    ),
-    resultMethodHist: TelemetryTestUtils.getAndClearHistogram(
-      "FX_URLBAR_SELECTED_RESULT_METHOD"
-    ),
-    search_hist: TelemetryTestUtils.getAndClearKeyedHistogram("SEARCH_COUNTS"),
-  };
-}
-
-function assertTelemetryResults(histograms, type, index, method) {
-  TelemetryTestUtils.assertHistogram(histograms.resultIndexHist, index, 1);
-
-  TelemetryTestUtils.assertHistogram(
-    histograms.resultTypeHist,
-    UrlbarUtils.SELECTED_RESULT_TYPES[type],
-    1
-  );
-
-  TelemetryTestUtils.assertKeyedHistogramValue(
-    histograms.resultIndexByTypeHist,
-    type,
-    index,
-    1
-  );
-
-  TelemetryTestUtils.assertHistogram(histograms.resultMethodHist, method, 1);
-
-  TelemetryTestUtils.assertKeyedScalar(
-    TelemetryTestUtils.getProcessScalars("parent", true, true),
-    `urlbar.picked.${type}`,
-    index,
-    1
-  );
-}
-
-/**
- * Updates the Top Sites feed.
- * @param {function} condition
- *   A callback that returns true after Top Sites are successfully updated.
- * @param {boolean} searchShortcuts
- *   True if Top Sites search shortcuts should be enabled.
- */
-async function updateTopSites(condition, searchShortcuts = false) {
-  // Toggle the pref to clear the feed cache and force an update.
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.newtabpage.activity-stream.feeds.system.topsites", false],
-      ["browser.newtabpage.activity-stream.feeds.system.topsites", true],
-      [
-        "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts",
-        searchShortcuts,
-      ],
-    ],
-  });
-
-  // Wait for the feed to be updated.
-  await TestUtils.waitForCondition(() => {
-    let sites = AboutNewTab.getTopSites();
-    return condition(sites);
-  }, "Waiting for top sites to be updated");
-}
-
-add_task(async function setup() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.urlbar.suggest.topsites", true],
-      ["browser.newtabpage.activity-stream.default.sites", EN_US_TOPSITES],
-    ],
-  });
-  await updateTopSites(
-    sites => sites && sites.length == EN_US_TOPSITES.split(",").length
-  );
-});
-
-add_task(async function test() {
-  await BrowserTestUtils.withNewTab("about:blank", async () => {
-    let sites = AboutNewTab.getTopSites();
-    Assert.equal(
-      sites.length,
-      6,
-      "The test suite browser should have 6 Top Sites."
-    );
-
-    const histograms = snapshotHistograms();
-
-    await UrlbarTestUtils.promisePopupOpen(window, () => {
-      EventUtils.synthesizeMouseAtCenter(gURLBar.inputField, {});
-    });
-
-    await UrlbarTestUtils.promiseSearchComplete(window);
-    Assert.equal(
-      UrlbarTestUtils.getResultCount(window),
-      sites.length,
-      "The number of results should be the same as the number of Top Sites (6)."
-    );
-    // Select the first resultm and confirm it.
-    let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
-    EventUtils.synthesizeKey("KEY_ArrowDown");
-    Assert.equal(
-      UrlbarTestUtils.getSelectedRowIndex(window),
-      0,
-      "The first result should be selected"
-    );
-
-    let loadPromise = BrowserTestUtils.waitForDocLoadAndStopIt(
-      result.url,
-      gBrowser.selectedBrowser
-    );
-    EventUtils.synthesizeKey("KEY_Enter");
-    await loadPromise;
-
-    assertTelemetryResults(
-      histograms,
-      "topsite",
-      0,
-      UrlbarTestUtils.SELECTED_RESULT_METHODS.arrowEnterSelection
-    );
-    await UrlbarTestUtils.promisePopupClose(window, () => {
-      gURLBar.blur();
-    });
-  });
-});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_usagePrefs.js firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_usagePrefs.js
--- firefox-84.0.2+build1/browser/modules/test/browser/browser_UsageTelemetry_usagePrefs.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/browser_UsageTelemetry_usagePrefs.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,53 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const BUTTONS_TO_TEST = {
+  "downloads-button": "browser.engagement.downloads-button.has-used",
+  "fxa-toolbar-menu-button":
+    "browser.engagement.fxa-toolbar-menu-button.has-used",
+  "home-button": "browser.engagement.home-button.has-used",
+  "sidebar-button": "browser.engagement.sidebar-button.has-used",
+};
+
+/**
+ * Tests that preferences are set when users interact with the
+ * buttons in BUTTONS_TO_TEST.
+ */
+add_task(async function test_usage_prefs_set() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.download.autohideButton", false]],
+  });
+
+  registerCleanupFunction(() => {
+    // Clicking on the sidebar button will show the sidebar, so we'll
+    // make sure it's hidden when the test ends.
+    SidebarUI.hide();
+  });
+
+  const PREFS_TO_FALSE = Object.values(BUTTONS_TO_TEST).map(prefName => {
+    return [prefName, false];
+  });
+
+  await SpecialPowers.pushPrefEnv({
+    set: PREFS_TO_FALSE,
+  });
+
+  for (let buttonID in BUTTONS_TO_TEST) {
+    let pref = BUTTONS_TO_TEST[buttonID];
+    Assert.ok(
+      !Services.prefs.getBoolPref(pref),
+      `${pref} should start at false.`
+    );
+
+    info(`Clicking on ${buttonID}`);
+    let element = document.getElementById(buttonID);
+    EventUtils.synthesizeMouseAtCenter(element, {}, window);
+
+    Assert.ok(
+      Services.prefs.getBoolPref(pref),
+      `${pref} should now be true after interacting.`
+    );
+  }
+});
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/formValidation/browser_form_validation.js firefox-85.0+build1/browser/modules/test/browser/formValidation/browser_form_validation.js
--- firefox-84.0.2+build1/browser/modules/test/browser/formValidation/browser_form_validation.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/formValidation/browser_form_validation.js	2021-01-18 19:58:08.000000000 +0000
@@ -416,7 +416,7 @@
     gInvalidFormPopup,
     "popuphidden"
   );
-  await BrowserTestUtils.loadURI(browser, "data:text/html,<div>hello!</div>");
+  BrowserTestUtils.loadURI(browser, "data:text/html,<div>hello!</div>");
   await BrowserTestUtils.browserLoaded(browser);
 
   await popupHiddenPromise;
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs firefox-85.0+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs
--- firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function handleRequest(req, resp) {
-  let suffixes = ["foo", "bar"];
-  let data = [req.queryString, suffixes.map(s => req.queryString + s)];
-  resp.setHeader("Content-Type", "application/json", false);
-  resp.write(JSON.stringify(data));
-}
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.xml firefox-85.0+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.xml
--- firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.xml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/usageTelemetrySearchSuggestions.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>browser_UsageTelemetry usageTelemetrySearchSuggestions.xml</ShortName>
-<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/modules/test/browser/usageTelemetrySearchSuggestions.sjs?{searchTerms}"/>
-<Url type="text/html" method="GET" template="http://example.com" rel="searchform"/>
-</SearchPlugin>
diff -Nru firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetryUrlbarDynamic.css firefox-85.0+build1/browser/modules/test/browser/usageTelemetryUrlbarDynamic.css
--- firefox-84.0.2+build1/browser/modules/test/browser/usageTelemetryUrlbarDynamic.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/test/browser/usageTelemetryUrlbarDynamic.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-.urlbarView-row[dynamicType=test] > .urlbarView-row-inner {
-  display: flex;
-  align-items: center;
-  min-height: 32px;
-  width: 100%;
-}
-
-.urlbarView-dynamic-test-button {
-  min-height: 16px;
-  padding: 8px;
-  border: none;
-  border-radius: 2px;
-  font-size: 0.93em;
-  color: inherit;
-  background-color: var(--urlbarView-button-background);
-  min-width: 8.75em;
-  text-align: center;
-  flex-basis: initial;
-  flex-shrink: 0;
-}
-
-.urlbarView-dynamic-test-button[selected] {
-  color: white;
-  background-color: var(--urlbarView-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-dynamic-test-button:hover {
-  color: white;
-  background-color: var(--urlbarView-primary-button-background-hover);
-}
-
-.urlbarView-dynamic-test-button:active {
-  color: white;
-  background-color: var(--urlbarView-primary-button-background-active);
-}
-
-.urlbarView-dynamic-test-buttonSpacer {
-  flex-basis: 48px;
-  flex-grow: 1;
-  flex-shrink: 1;
-}
diff -Nru firefox-84.0.2+build1/browser/modules/WindowsJumpLists.jsm firefox-85.0+build1/browser/modules/WindowsJumpLists.jsm
--- firefox-84.0.2+build1/browser/modules/WindowsJumpLists.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/WindowsJumpLists.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -82,7 +82,6 @@
     onFrecencyChanged() {},
     onManyFrecenciesChanged() {},
     onDeleteURI() {},
-    onPageChanged() {},
     onDeleteVisits() {},
     QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
   });
diff -Nru firefox-84.0.2+build1/browser/modules/WindowsPreviewPerTab.jsm firefox-85.0+build1/browser/modules/WindowsPreviewPerTab.jsm
--- firefox-84.0.2+build1/browser/modules/WindowsPreviewPerTab.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/modules/WindowsPreviewPerTab.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -770,7 +770,11 @@
     if (!this._observersAdded) {
       this.prefs.addObserver(DISABLE_THRESHOLD_PREF_NAME, this, true);
       this.prefs.addObserver(CACHE_EXPIRATION_TIME_PREF_NAME, this, true);
-      PlacesUtils.history.addObserver(this, true);
+      this._placesListener = this.handlePlacesEvents.bind(this);
+      PlacesUtils.observers.addListener(
+        ["favicon-changed"],
+        this._placesListener
+      );
       this._observersAdded = true;
     }
 
@@ -798,6 +802,10 @@
       tabWinObject.destroy(); // This will remove us from the array.
       delete tabWinObject.win.gTaskbarTabGroup; // Tidy up the window.
     }
+    PlacesUtils.observers.removeListener(
+      ["favicon-changed"],
+      this._placesListener
+    );
   },
 
   addPreview(preview) {
@@ -879,24 +887,16 @@
     }
   },
 
-  /* nsINavHistoryObserver implementation */
-  onBeginUpdateBatch() {},
-  onEndUpdateBatch() {},
-  onTitleChanged() {},
-  onFrecencyChanged() {},
-  onManyFrecenciesChanged() {},
-  onDeleteURI() {},
-  onClearHistory() {},
-  onDeleteVisits() {},
-  onPageChanged(uri, changedConst, newValue) {
-    if (
-      this.enabled &&
-      changedConst == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON
-    ) {
-      for (let win of this.windows) {
-        for (let [tab] of win.previews) {
-          if (tab.getAttribute("image") == newValue) {
-            win.updateFavicon(tab, newValue);
+  handlePlacesEvents(events) {
+    for (let event of events) {
+      switch (event.type) {
+        case "favicon-changed": {
+          for (let win of this.windows) {
+            for (let [tab] of win.previews) {
+              if (tab.getAttribute("image") == event.faviconUrl) {
+                win.updateFavicon(tab, event.faviconUrl);
+              }
+            }
           }
         }
       }
@@ -905,7 +905,6 @@
 
   QueryInterface: ChromeUtils.generateQI([
     "nsISupportsWeakReference",
-    "nsINavHistoryObserver",
     "nsIObserver",
   ]),
 };
diff -Nru firefox-84.0.2+build1/browser/themes/linux/browser.css firefox-85.0+build1/browser/themes/linux/browser.css
--- firefox-84.0.2+build1/browser/themes/linux/browser.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/linux/browser.css	2021-01-18 19:58:08.000000000 +0000
@@ -185,8 +185,8 @@
   }
 }
 
-#urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background,
-#searchbar:not(:-moz-lwtheme):not(:focus-within) {
+#urlbar:not(:-moz-lwtheme, [focused="true"]) > #urlbar-background,
+#searchbar:not(:-moz-lwtheme, :focus-within) {
   border-color: ThreeDShadow;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/linux/places/organizer.css firefox-85.0+build1/browser/themes/linux/places/organizer.css
--- firefox-84.0.2+build1/browser/themes/linux/places/organizer.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/linux/places/organizer.css	2021-01-18 19:58:08.000000000 +0000
@@ -91,7 +91,7 @@
 }
 
 /* Info box */
-#detailsDeck {
+#detailsPane {
   padding: 5px;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/linux/places/sidebar.css firefox-85.0+build1/browser/themes/linux/places/sidebar.css
--- firefox-84.0.2+build1/browser/themes/linux/places/sidebar.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/linux/places/sidebar.css	2021-01-18 19:58:08.000000000 +0000
@@ -19,7 +19,7 @@
   margin-inline-start: 4px;
 }
 
-#viewButton:-moz-focusring:not(:hover):not([open]) {
+#viewButton:-moz-focusring:not(:hover, [open]) {
   outline: 1px dotted -moz-DialogText;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/osx/browser.css firefox-85.0+build1/browser/themes/osx/browser.css
--- firefox-84.0.2+build1/browser/themes/osx/browser.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/osx/browser.css	2021-01-18 19:58:08.000000000 +0000
@@ -123,7 +123,7 @@
 }
 
 /* Draw the bottom border of the tabs toolbar when titlebar isn't using vibrancy */
-:root:not(:is([inFullscreen], [tabsintitlebar])) #nav-bar:not([tabs-hidden="true"]),
+:root:not([inFullscreen], [tabsintitlebar]) #nav-bar:not([tabs-hidden="true"]),
 #nav-bar:not([tabs-hidden="true"]):-moz-lwtheme {
   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--tabs-border-color);
 }
@@ -487,7 +487,7 @@
   margin-block: 1px 0;
 }
 
-.tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"]):not([multiselected]) {
+.tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-icon-image:not([selected="true"], [multiselected]) {
   opacity: .9;
 }
 
@@ -499,7 +499,7 @@
   opacity: 0.9999;
 }
 
-.tab-label-container:not([selected="true"]):not([multiselected]) {
+.tab-label-container:not([selected="true"], [multiselected]) {
   opacity: .7;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/osx/customizableui/panelUI.css firefox-85.0+build1/browser/themes/osx/customizableui/panelUI.css
--- firefox-84.0.2+build1/browser/themes/osx/customizableui/panelUI.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/osx/customizableui/panelUI.css	2021-01-18 19:58:08.000000000 +0000
@@ -35,7 +35,7 @@
   margin-inline-start: 18px;
 }
 
-.subviewbutton:not(:is([image],[targetURI],.bookmark-item)) > .menu-iconic-left {
+.subviewbutton:not([image],[targetURI],.bookmark-item) > .menu-iconic-left {
   display: none;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/osx/places/organizer.css firefox-85.0+build1/browser/themes/osx/places/organizer.css
--- firefox-84.0.2+build1/browser/themes/osx/places/organizer.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/osx/places/organizer.css	2021-01-18 19:58:08.000000000 +0000
@@ -143,7 +143,7 @@
 }
 
 /* Info box */
-#detailsDeck {
+#detailsPane {
   border-top: 1px solid #919191;
   background-color: #f0f0f0;
   padding: 10px;
diff -Nru firefox-84.0.2+build1/browser/themes/shared/autocomplete.inc.css firefox-85.0+build1/browser/themes/shared/autocomplete.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/autocomplete.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/autocomplete.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -164,7 +164,7 @@
 }
 
 #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg);
+  list-style-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg);
   -moz-context-properties: fill;
   fill: var(--grey-60);
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/browser.inc.css firefox-85.0+build1/browser/themes/shared/browser.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/browser.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/browser.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -91,6 +91,27 @@
   transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear;
 }
 
+#PersonalToolbar[collapsed=false]:not([initialized]) > #personal-toolbar-empty {
+  visibility: hidden;
+}
+
+/*
+ * Make the empty bookmarks toolbar message take up no horizontal space.
+ * This avoids two issues:
+ * 1) drag/drop of urls/bookmarks to the toolbar not working, because they land
+ *    on the personal-toolbar-empty element.
+ * 2) buttons in the toolbar moving horizontally while the window opens,
+ *    because the element is first shown at full width and then completely
+ *    hidden.
+ */
+#PersonalToolbar[collapsed=false] > #personal-toolbar-empty[nowidth] > #personal-toolbar-empty-description {
+  margin-inline: 0;
+  width: 0;
+  white-space: nowrap;
+  position: relative;
+  z-index: 1;
+}
+
 #PersonalToolbar[collapsed=true].instant {
   visibility: collapse;
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/controlcenter/panel.inc.css firefox-85.0+build1/browser/themes/shared/controlcenter/panel.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/controlcenter/panel.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/controlcenter/panel.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -379,7 +379,7 @@
 }
 
 .identity-popup-security-connection {
-  background-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg);
+  background-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg);
 }
 
 #identity-popup[connection=chrome] .identity-popup-security-connection {
@@ -407,13 +407,13 @@
 /* Use [isbroken] to make sure we don't show a warning lock on an http page. See Bug 1192162. */
 #identity-popup[ciphers=weak] .identity-popup-security-connection,
 #identity-popup[mixedcontent~=passive-loaded][isbroken] .identity-popup-security-connection {
-  background-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg);
+  background-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg);
   -moz-context-properties: fill, fill-opacity;
 }
 
 #identity-popup[connection=secure-cert-user-overridden] .identity-popup-security-connection,
 #identity-popup[connection=cert-error-page] .identity-popup-security-connection {
-  background-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg);
+  background-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg);
   fill: unset;
   -moz-context-properties: fill;
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/customizableui/customizeMode.inc.css firefox-85.0+build1/browser/themes/shared/customizableui/customizeMode.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/customizableui/customizeMode.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/customizableui/customizeMode.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -75,7 +75,7 @@
   padding: 2px 5px;
 }
 
-.customizationmode-checkbox:not(:-moz-lwtheme):not([disabled]),
+.customizationmode-checkbox:not(:-moz-lwtheme, [disabled]),
 .customizationmode-button {
   /* !important overrides :hover:active color from button.css on Mac */
   color: rgb(71, 71, 71) !important;
diff -Nru firefox-84.0.2+build1/browser/themes/shared/customizableui/panelUI.inc.css firefox-85.0+build1/browser/themes/shared/customizableui/panelUI.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/customizableui/panelUI.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/customizableui/panelUI.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -7,14 +7,8 @@
 %define menuPanelWidth 22.35em
 %define wideMenuPanelWidth 29em
 %define standaloneSubviewWidth 30em
-% XXXgijs This is the ugliest bit of code I think I've ever written for Mozilla.
-% Basically, the 0.1px is there to avoid CSS rounding errors causing buttons to wrap.
-% For gory details, refer to https://bugzilla.mozilla.org/show_bug.cgi?id=963365#c11
-% There's no calc() here (and therefore lots of calc() where this is used) because
-% we don't support nested calc(): https://bugzilla.mozilla.org/show_bug.cgi?id=968761
-%define menuPanelButtonWidth (@menuPanelWidth@ / 3 - 0.1px)
-%define buttonStateHover :not(:is([disabled],[open],:active)):is(:hover,:focus)
-%define menuStateHover :not(:is([disabled],:active))[_moz-menuactive]
+%define buttonStateHover :not([disabled],[open],:active):is(:hover,:focus)
+%define menuStateHover :not([disabled],:active)[_moz-menuactive]
 %define buttonStateActive :not([disabled]):is([open],:hover:active)
 %define menuStateActive :not([disabled])[_moz-menuactive]:active
 %define menuStateMenuActive :not([disabled])[_moz-menuactive]
@@ -32,7 +26,7 @@
 %define appmenuWarningBackgroundColorActiveBrightText hsla(55,100%,50%,.2)
 %define appmenuWarningColorBrightText #F9F9FA
 
-:root:not([uidensity=compact]):not([chromehidden~="toolbar"]) #PanelUI-button {
+:root:not([uidensity=compact], [chromehidden~="toolbar"]) #PanelUI-button {
   margin-inline-start: 3px;
   border-inline-start: 1px solid;
   border-image: linear-gradient(
@@ -44,7 +38,7 @@
   border-image-slice: 1;
 }
 
-:root:not([uidensity=compact]):not([chromehidden~="toolbar"]) #nav-bar[brighttext] > #PanelUI-button {
+:root:not([uidensity=compact], [chromehidden~="toolbar"]) #nav-bar[brighttext] > #PanelUI-button {
   border-image-source: linear-gradient(
     transparent 4px,
     var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.2)) 4px,
@@ -1446,10 +1440,9 @@
   -moz-box-orient: horizontal;
 }
 
-/* In customize mode, extend the buttons *only* in the panel, just to make them not look stupid */
-toolbarpaletteitem[place="menu-panel"] > .toolbaritem-combined-buttons > toolbarbutton {
-  min-width: calc(@menuPanelButtonWidth@ - 1px);
-  max-width: calc(@menuPanelButtonWidth@ - 1px);
+toolbarpaletteitem[place="menu-panel"],
+toolbarpaletteitem[place="menu-panel"] > toolbaritem {
+  -moz-box-flex: 1;
 }
 
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton:not(.toolbarbutton-1)[disabled] {
@@ -1811,7 +1804,7 @@
   list-style-image: url("chrome://browser/skin/reload.svg");
 }
 
-.subviewbutton.download:not([canShow]):not([canRetry]) > .action-button {
+.subviewbutton.download:not([canShow], [canRetry]) > .action-button {
   fill: currentColor;
   fill-opacity: 0.4;
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/downloads/allDownloadsView.inc.css firefox-85.0+build1/browser/themes/shared/downloads/allDownloadsView.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/downloads/allDownloadsView.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/downloads/allDownloadsView.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -121,11 +121,7 @@
 }
 
 .downloadIconShow > .button-box > .button-icon {
-%ifdef XP_MACOSX
-  list-style-image: url("chrome://browser/skin/panel-icon-magnifier.svg");
-%else
-  list-style-image: url("chrome://browser/skin/panel-icon-folder.svg");
-%endif
+  list-style-image: url("chrome://global/skin/icons/findFile.svg");
 }
 
 .downloadIconRetry > .button-box > .button-icon {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/downloads/downloads.inc.css firefox-85.0+build1/browser/themes/shared/downloads/downloads.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/downloads/downloads.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/downloads/downloads.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -206,11 +206,7 @@
 }
 
 .downloadIconShow > .button-box > .button-icon {
-%ifdef XP_MACOSX
-  list-style-image: url("chrome://browser/skin/panel-icon-magnifier.svg");
-%else
-  list-style-image: url("chrome://browser/skin/panel-icon-folder.svg");
-%endif
+  list-style-image: url("chrome://global/skin/icons/findFile.svg");
 }
 
 .downloadIconRetry > .button-box > .button-icon {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/icons/chevron.svg firefox-85.0+build1/browser/themes/shared/icons/chevron.svg
--- firefox-84.0.2+build1/browser/themes/shared/icons/chevron.svg	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/icons/chevron.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M8.707,7.293l-5-5A1,1,0,0,0,2.293,3.707L6.586,8,2.293,12.293a1,1,0,1,0,1.414,1.414l5-5A1,1,0,0,0,8.707,7.293Zm6,0-5-5A1,1,0,0,0,8.293,3.707L12.586,8,8.293,12.293a1,1,0,1,0,1.414,1.414l5-5A1,1,0,0,0,14.707,7.293Z"/>
-</svg>
diff -Nru firefox-84.0.2+build1/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg firefox-85.0+build1/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg
--- firefox-84.0.2+build1/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/identity-block/connection-mixed-active-loaded.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path d="M12.5 6.984h-.484L4 15h8.5a1.5 1.5 0 0 0 1.5-1.5V8.484a1.5 1.5 0 0 0-1.5-1.5zm-6.5 0V5a2 2 0 0 1 4 0v1l1.892-1.892A4 4 0 0 0 4 5v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5a1.483 1.483 0 0 0 .07.43l6.946-6.946z" fill="context-fill" fill-opacity="context-fill-opacity"/>
-  <path d="M2 15a1 1 0 0 1-.707-1.707l12-12a1 1 0 0 1 1.414 1.414l-12 12A1 1 0 0 1 2 15z" fill="#ff0039"/>
-</svg>
diff -Nru firefox-84.0.2+build1/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg firefox-85.0+build1/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg
--- firefox-84.0.2+build1/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path d="M8 1a4 4 0 0 0-4 4v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5A1.5 1.5 0 0 0 3.5 15h2.535a2.274 2.274 0 0 1 .207-1.318L9.43 7.27a2.266 2.266 0 0 1 .2-.286H6V5a2 2 0 0 1 4 0v1.568A2.255 2.255 0 0 1 11.478 6a2.283 2.283 0 0 1 .522.073V5a4 4 0 0 0-4-4z" fill="context-fill" fill-opacity="context-fill-opacity"/>
-  <path d="M15.818 14.127l-3.189-6.411a1.285 1.285 0 0 0-2.3 0l-3.192 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873z" fill="#ffbf00"/>
-  <path d="M11.478 8a.272.272 0 0 1 .256.161l3.188 6.412a.291.291 0 0 1-.013.291.275.275 0 0 1-.243.137H8.289a.275.275 0 0 1-.243-.137.29.29 0 0 1-.013-.291l3.188-6.412A.272.272 0 0 1 11.478 8m0-1a1.272 1.272 0 0 0-1.152.716l-3.189 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873l-3.189-6.411A1.272 1.272 0 0 0 11.478 7z" fill="#d76e00" opacity=".35"/>
-  <path d="M11.5 12a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-1 0v2a.5.5 0 0 0 .5.5zm0 .809a.691.691 0 1 0 .691.691.691.691 0 0 0-.691-.691z" fill="#fff"/>
-</svg>
diff -Nru firefox-84.0.2+build1/browser/themes/shared/identity-block/identity-block.inc.css firefox-85.0+build1/browser/themes/shared/identity-block/identity-block.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/identity-block/identity-block.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/identity-block/identity-block.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -40,7 +40,7 @@
   -moz-user-focus: ignore;
 }
 
-#identity-box:hover:not(.no-hover):not([open=true]),
+#identity-box:hover:not(.no-hover, [open=true]),
 #tracking-protection-icon-container:hover:not([open=true]) {
   background-color: hsla(0,0%,70%,.2);
   fill-opacity: .8;
@@ -69,7 +69,7 @@
 #identity-icon-label {
   padding-inline-start: 4px;
 }
-#identity-box:not(.chromeUI):not(.extensionPage):not(.notSecureText) {
+#identity-box:not(.chromeUI, .extensionPage, .notSecureText) {
   --urlbar-separator-color: transparent;
 }
 
@@ -167,14 +167,14 @@
 #identity-box[pageproxystate="valid"].mixedDisplayContentLoadedActiveBlocked > #identity-icon,
 #identity-box[pageproxystate="valid"].certUserOverridden > #identity-icon,
 #identity-box[pageproxystate="valid"].certErrorPage > #identity-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg);
+  list-style-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg);
   fill: unset;
 }
 
 #identity-box[pageproxystate="valid"].notSecure > #identity-icon,
 #identity-box[pageproxystate="valid"].mixedActiveContent > #identity-icon,
 #identity-box[pageproxystate="valid"].httpsOnlyErrorPage > #identity-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg);
+  list-style-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg);
 }
 
 #permissions-granted-icon {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/jar.inc.mn firefox-85.0+build1/browser/themes/shared/jar.inc.mn
--- firefox-84.0.2+build1/browser/themes/shared/jar.inc.mn	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/jar.inc.mn	2021-01-18 19:58:08.000000000 +0000
@@ -56,8 +56,6 @@
   skin/classic/browser/fxaSignout.css                          (../shared/fxaSignout.css)
   skin/classic/browser/permissions.svg                         (../shared/identity-block/permissions.svg)
   skin/classic/browser/connection-secure.svg                   (../shared/identity-block/connection-secure.svg)
-  skin/classic/browser/connection-mixed-passive-loaded.svg     (../shared/identity-block/connection-mixed-passive-loaded.svg)
-  skin/classic/browser/connection-mixed-active-loaded.svg      (../shared/identity-block/connection-mixed-active-loaded.svg)
   skin/classic/browser/info.svg                                (../shared/info.svg)
   skin/classic/browser/newInstall.css                          (../shared/newInstall.css)
   skin/classic/browser/newInstallPage.css                      (../shared/newInstallPage.css)
@@ -107,11 +105,6 @@
   skin/classic/browser/tracking-protection-animation.svg        (../shared/identity-block/tracking-protection-animation.svg)
   skin/classic/browser/tracking-protection-animation-brighttext.svg (../shared/identity-block/tracking-protection-animation-brighttext.svg)
   skin/classic/browser/panel-icon-cancel.svg                   (../shared/panel-icon-cancel.svg)
-#ifndef XP_MACOSX
-  skin/classic/browser/panel-icon-folder.svg                   (../shared/panel-icon-folder.svg)
-#else
-  skin/classic/browser/panel-icon-magnifier.svg                (../shared/panel-icon-magnifier.svg)
-#endif
   skin/classic/browser/panel-icon-retry.svg                    (../shared/panel-icon-retry.svg)
   skin/classic/browser/toolbar-drag-indicator.svg              (../shared/toolbar-drag-indicator.svg)
 
@@ -173,7 +166,6 @@
   skin/classic/browser/bookmark-star-on-tray.svg      (../shared/icons/bookmark-star-on-tray.svg)
   skin/classic/browser/bookmarks-toolbar.svg          (../shared/icons/bookmarks-toolbar.svg)
   skin/classic/browser/characterEncoding.svg          (../shared/icons/characterEncoding.svg)
-  skin/classic/browser/chevron.svg                    (../shared/icons/chevron.svg)
   skin/classic/browser/chevron-animation.svg          (../shared/icons/chevron-animation.svg)
   skin/classic/browser/check-animation.svg            (../shared/icons/check-animation.svg)
   skin/classic/browser/customize.svg                  (../shared/icons/customize.svg)
diff -Nru firefox-84.0.2+build1/browser/themes/shared/panel-icon-folder.svg firefox-85.0+build1/browser/themes/shared/panel-icon-folder.svg
--- firefox-84.0.2+build1/browser/themes/shared/panel-icon-folder.svg	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/panel-icon-folder.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="32" height="32" viewBox="0 0 32 32">
-  <path fill="context-fill" d="M17.3,9.4c0,0,1.1,0,3.7,0c1.7,0,2,0,5.6,0c0.6,0,0.6,0,1.1,0V9.2c0-1.5-0.9-2.6-2-2.6h-5.8V6.3c0-0.6-1.5-2-2.8-2h-7.1 H7.6H4.9v2.4v2.4v2.2c2.8,0,8.5,0,8.5,0C16.4,11.3,17.3,9.4,17.3,9.4z M29,13c0-0.6-0.6-1.1-1.5-1.7l0,0c-0.2,0-0.6,0-0.9,0 c-2.8,0-3,0-4.8,0c-1.9,0-3.3,0-3.3,0s-1.5,2.4-3.7,2.4c0,0-6.5,0-9.1,0H5.4C3,13.7,3,15.9,3,15.9l1.1,9.7C4.1,27.1,5,28,6.5,28 h19.1c1.5,0,2.4-0.9,2.4-2.4L29,13.7l0,0l0,0C29,13.7,29,13,29,13z" />
-</svg>
-
diff -Nru firefox-84.0.2+build1/browser/themes/shared/panel-icon-magnifier.svg firefox-85.0+build1/browser/themes/shared/panel-icon-magnifier.svg
--- firefox-84.0.2+build1/browser/themes/shared/panel-icon-magnifier.svg	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/panel-icon-magnifier.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg"
-     width="32" height="32" viewBox="0 0 32 32">
-  <path fill="context-fill" d="M12.9,2c6,0,11,5,11,11c0,2.2-0.6,4.2-1.8,6l7.2,7c0.8,0.8,0.8,2.4,0,3.2c-0.6,0.6-1.2,0.8-1.6,0.8s-1.2-0.2-1.6-0.6l-7-7 c-1.8,1.2-3.8,1.8-6,1.8c-6,0-11-5-11-11C2.1,7.2,6.9,2,12.9,2z M12.9,20c3.8,0,7-3.2,7-7s-3.2-7-7-7s-7,3.2-7,7S9.1,20,12.9,20z" />
-</svg>
-
diff -Nru firefox-84.0.2+build1/browser/themes/shared/preferences/preferences.inc.css firefox-85.0+build1/browser/themes/shared/preferences/preferences.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/preferences/preferences.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/preferences/preferences.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -440,6 +440,10 @@
   margin-block: 0;
 }
 
+.addon-with-favicon .menu-iconic-icon {
+  margin-inline-start: 0;
+}
+
 /* Search Pane */
 
 #engineList {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/preferences/search.css firefox-85.0+build1/browser/themes/shared/preferences/search.css
--- firefox-84.0.2+build1/browser/themes/shared/preferences/search.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/preferences/search.css	2021-01-18 19:58:08.000000000 +0000
@@ -62,6 +62,26 @@
   margin-inline-start: 0;
 }
 
+#engineList treechildren::-moz-tree-image(bookmarks),
+#engineList treechildren::-moz-tree-image(tabs),
+#engineList treechildren::-moz-tree-image(history) {
+  -moz-context-properties: fill;
+}
+
+/* Local search shortcut icon colors.  These should match the values in
+   urlbarView.inc.css. */
+#engineList treechildren::-moz-tree-image(bookmarks) {
+  fill: #0060df; /* Blue-60 */
+}
+#engineList treechildren::-moz-tree-image(tabs) {
+  fill: #008eaf; /* Teal-70 */
+}
+#engineList treechildren::-moz-tree-image(history),
+#engineList treechildren::-moz-tree-image(bookmarks, selected),
+#engineList treechildren::-moz-tree-image(tabs, selected) {
+  fill: currentColor;
+}
+
 #engineShown {
   min-width: 26px;
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/preferences/siteDataSettings.css firefox-85.0+build1/browser/themes/shared/preferences/siteDataSettings.css
--- firefox-84.0.2+build1/browser/themes/shared/preferences/siteDataSettings.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/preferences/siteDataSettings.css	2021-01-18 19:58:08.000000000 +0000
@@ -28,12 +28,13 @@
 /**
  * Confirmation dialog of removing sites selected
  */
-:root[windowtype="Browser:SiteDataRemoveSelected"] {
+#SiteDataRemoveSelectedDialog {
   min-height: 36em;
+  padding: 16px;
 }
 
-#SiteDataRemoveSelectedDialog {
-  padding: 16px;
+#SiteDataRemoveSelectedDialog > dialog {
+  padding: 0; /* override dialog.css */
 }
 
 #contentContainer {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/sidebar.inc.css firefox-85.0+build1/browser/themes/shared/sidebar.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/sidebar.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/sidebar.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -78,8 +78,8 @@
   padding: 2px 4px;
 }
 
-#sidebar-switcher-target:-moz-focusring:not(:hover):not([open]),
-#sidebar-close:-moz-focusring:not(:hover):not([open]) {
+#sidebar-switcher-target:-moz-focusring:not(:hover, [open]),
+#sidebar-close:-moz-focusring:not(:hover, [open]) {
   outline: 1px dotted;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/shared/tabs.inc.css firefox-85.0+build1/browser/themes/shared/tabs.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/tabs.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/tabs.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -460,8 +460,8 @@
   opacity: .8;
 }
 
-.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover),
-.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) {
+.tab-icon-sound[soundplaying-scheduledremoval]:not([muted], :hover),
+.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted], :hover) {
   transition: opacity .3s linear var(--soundplaying-removal-delay);
   opacity: 0;
 }
@@ -506,7 +506,7 @@
   transition: opacity 150ms ease;
 }
 
-.tabbrowser-tab:not([visuallyselected=true]):not([multiselected]),
+.tabbrowser-tab:not([visuallyselected=true], [multiselected]),
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
@@ -582,32 +582,32 @@
 
 /* Tab hover */
 
-.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]):not([multiselected]) {
+.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true], [multiselected]) {
   background-color: rgba(0,0,0,.1);
 }
 
-#TabsToolbar[brighttext] .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]):not([multiselected]) {
+#TabsToolbar[brighttext] .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true], [multiselected]) {
   background-color: rgba(255,255,255,.1);
 }
 
 @media (prefers-reduced-motion: no-preference) {
-  .tab-line:not([selected=true]):not([multiselected]) {
+  .tab-line:not([selected=true], [multiselected]) {
     transition: transform 250ms var(--animation-easing-function), opacity 250ms var(--animation-easing-function);
   }
 }
 
-.tab-line:not([selected=true]):not([multiselected]) {
+.tab-line:not([selected=true], [multiselected]) {
   opacity: 0;
   transform: scaleX(0);
 }
 
-.tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true]):not([multiselected]) {
+.tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true], [multiselected]) {
   background-color: rgba(0,0,0,.2);
   opacity: 1;
   transform: none;
 }
 
-#TabsToolbar[brighttext] .tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true]):not([multiselected]) {
+#TabsToolbar[brighttext] .tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true], [multiselected]) {
   background-color: rgba(255,255,255,.2);
 }
 
@@ -636,11 +636,11 @@
   background-repeat: no-repeat;
 }
 
-.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([selected="true"]) {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned], [selected="true"]) {
   background-position-x: left 11px;
 }
 
-.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([selected="true"]):-moz-locale-dir(rtl) {
+.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned], [selected="true"]):-moz-locale-dir(rtl) {
   background-position-x: right 11px;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/shared/toolbarbutton-icons.inc.css firefox-85.0+build1/browser/themes/shared/toolbarbutton-icons.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/toolbarbutton-icons.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/toolbarbutton-icons.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -328,7 +328,7 @@
 
 #PlacesChevron,
 #nav-bar-overflow-button {
-  list-style-image: url("chrome://browser/skin/chevron.svg");
+  list-style-image: url("chrome://global/skin/icons/chevron.svg");
 }
 
 #nav-bar-overflow-button[animate] > .toolbarbutton-icon {
diff -Nru firefox-84.0.2+build1/browser/themes/shared/toolbarbuttons.inc.css firefox-85.0+build1/browser/themes/shared/toolbarbuttons.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/toolbarbuttons.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/toolbarbuttons.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -23,6 +23,8 @@
 
   --toolbarseparator-color: var(--lwt-toolbar-vertical-separator, rgba(0,0,0,.3));
 
+  --bookmark-block-padding: 4px;
+
   /* This default value of --toolbarbutton-height is defined to prevent
      CSS errors for an invalid variable. The value should not get used,
      as a more specific value should be set when the value will be used. */
@@ -31,10 +33,12 @@
 
 :root[uidensity=compact] {
   --toolbarbutton-outer-padding: 1px;
+  --bookmark-block-padding: 1px;
 }
 
 :root[uidensity=touch] {
   --toolbarbutton-inner-padding: 9px;
+  --bookmark-block-padding: 7px;
 }
 
 /* We use :-moz-lwtheme-* for toolbarbuttons that aren't inside a toolbar, and
@@ -171,14 +175,14 @@
   opacity: .3;
 }
 
-#PersonalToolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover,
+#PersonalToolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover,
 #tabbrowser-arrowscrollbox:not([scrolledtostart=true])::part(scrollbutton-up):hover,
 #tabbrowser-arrowscrollbox:not([scrolledtoend=true])::part(scrollbutton-down):hover,
-.findbar-button:not(:is([checked="true"],[disabled="true"])):hover,
-toolbarbutton.bookmark-item:not(.subviewbutton):hover:not([disabled="true"]):not([open]),
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text,
-toolbar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack {
+.findbar-button:not([checked="true"],[disabled="true"]):hover,
+toolbarbutton.bookmark-item:not(.subviewbutton, [disabled=true], [open]):hover,
+toolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover > .toolbarbutton-icon,
+toolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover > .toolbarbutton-text,
+toolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover > .toolbarbutton-badge-stack {
   background-color: var(--toolbarbutton-hover-background);
   color: inherit;
 }
@@ -278,7 +282,7 @@
   padding: 10px;
 }
 
-:root:not([uidensity=compact]) #back-button:not([disabled]):not([open]):hover > .toolbarbutton-icon {
+:root:not([uidensity=compact]) #back-button:not([disabled], [open]):hover > .toolbarbutton-icon {
   background-color: var(--backbutton-hover-background) !important;
   box-shadow: 0 1px 6px hsla(0,0%,0%,.1);
   border-color: hsla(240,5%,5%,.35);
@@ -307,7 +311,7 @@
 #personal-toolbar-empty-description,
 toolbarbutton.bookmark-item:not(.subviewbutton) {
   margin: 0 2px;
-  padding: 4px;
+  padding: var(--bookmark-block-padding) 4px;
 }
 
 toolbarbutton.bookmark-item:not(.subviewbutton) {
@@ -317,11 +321,14 @@
 
 :root[uidensity=compact] toolbarbutton.bookmark-item:not(.subviewbutton) {
   margin-inline: 1px;
-  padding-block: 1px;
 }
 
-:root[uidensity=touch] toolbarbutton.bookmark-item:not(.subviewbutton) {
-  padding-block: 7px;
+/**
+ * Ensure that the description is always at least as big as a bookmarks item,
+ * where its icon is 16px (which may be more than inline text height);
+ */
+#personal-toolbar-empty-description {
+  min-height: calc(16px + 2 * var(--bookmark-block-padding));
 }
 
 #bookmarks-toolbar-placeholder {
@@ -382,7 +389,7 @@
 }
 
 /* When adjacent to the bookmarks items, give the bookmarks items a leading separator. */
-#PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks,
+#PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks,
 #PersonalToolbar > #import-button + #personal-bookmarks,
 #PlacesToolbarItems > toolbarseparator::before {
   border-inline-start: 1px solid;
@@ -395,13 +402,22 @@
 }
 
 @media (min-resolution: 2dppx) {
-  #PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks,
+  #PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks,
   #PersonalToolbar > #import-button + #personal-bookmarks,
   #PlacesToolbarItems > toolbarseparator::before {
     border-inline-start-width: 0.5px;
   }
 }
 
+/* Add spacing around the separator between the import button and the bookmark
+ * items, such that it matches spacing around bookmark separators. */
+#PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks,
+#PersonalToolbar > #import-button + #personal-bookmarks {
+  /* space before the separator (added to 2px margin on the import button) */
+  margin-inline-start: 2px;
+  /* space after (same as `padding-inline` for separators above) */
+  padding-inline-start: 4px;
+}
 
 /* The bookmarks toolbar is smaller than the other toolbars, so we
  * need to override the badge position to not be cut off. */
diff -Nru firefox-84.0.2+build1/browser/themes/shared/UITour.inc.css firefox-85.0+build1/browser/themes/shared/UITour.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/UITour.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/UITour.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -121,7 +121,7 @@
   transition-duration: 150ms;
 }
 
-#UITourTooltipButtons > button:not(.button-link):not(:active):hover {
+#UITourTooltipButtons > button:not(.button-link, :active):hover {
   background-color: hsla(210,4%,10%,.15);
   border-color: hsla(210,4%,10%,.15);
   box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset;
diff -Nru firefox-84.0.2+build1/browser/themes/shared/urlbar-searchbar.inc.css firefox-85.0+build1/browser/themes/shared/urlbar-searchbar.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/urlbar-searchbar.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/urlbar-searchbar.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -505,7 +505,7 @@
   height: 30px;
 }
 
-#page-action-buttons > :not([hidden]):not(toolbartabstop) ~ #pageActionSeparator {
+#page-action-buttons > :not([hidden], toolbartabstop) ~ #pageActionSeparator {
   /* Show the separator between the page actions and other elements when at
      least one of the latter is shown. */
   visibility: visible;
diff -Nru firefox-84.0.2+build1/browser/themes/shared/urlbarView.inc.css firefox-85.0+build1/browser/themes/shared/urlbarView.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/urlbarView.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/urlbarView.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -99,7 +99,7 @@
   padding-block: 6px;
 }
 
-:root[uidensity=touch] .urlbarView-row:not([type=tip]):not([type=dynamic]) {
+:root[uidensity=touch] .urlbarView-row:not([type=tip], [type=dynamic]) {
   padding-block: 11px;
 }
 
@@ -151,7 +151,7 @@
   /* Note: switchtab entries show the url only in override mode,
      remotetab and sponsored ones only when selected or :hover. */
   .urlbarView[actionoverride] .urlbarView-results[wrap] > .urlbarView-row[has-url] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
-  .urlbarView-results[wrap] > .urlbarView-row[has-url]:not([type$=tab]):not([sponsored]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
+  .urlbarView-results[wrap] > .urlbarView-row[has-url]:not([type$=tab], [sponsored]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
   .urlbarView-results[wrap] > .urlbarView-row:is([type=remotetab], [sponsored]):is(:hover, [selected]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
   .urlbarView-results[wrap] > .urlbarView-row[type=tabtosearch] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator {
     display: none;
@@ -172,12 +172,12 @@
   flex-wrap: wrap;
 }
 
-.urlbarView-row:not([type=tip]):not([type=dynamic]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title[overflow],
+.urlbarView-row:not([type=tip], [type=dynamic]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title[overflow],
 .urlbarView-url[overflow] {
   mask-image: linear-gradient(to left, transparent, black 2em);
 }
 
-.urlbarView-row:not([type=tip]):not([type=dynamic]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title[overflow]:not([isurl]):-moz-locale-dir(rtl) {
+.urlbarView-row:not([type=tip], [type=dynamic]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title[overflow]:not([isurl]):-moz-locale-dir(rtl) {
   mask-image: linear-gradient(to right, transparent, black 2em);
 }
 
@@ -186,11 +186,11 @@
   direction: ltr !important;
 }
 
-.urlbarView-row:not([type=tip]):not([type=dynamic]):hover > .urlbarView-row-inner {
+.urlbarView-row:not([type=tip], [type=dynamic]):hover > .urlbarView-row-inner {
   background: var(--arrowpanel-dimmed);
 }
 
-.urlbarView-row:not([type=tip]):not([type=dynamic])[selected] > .urlbarView-row-inner {
+.urlbarView-row:not([type=tip], [type=dynamic])[selected] > .urlbarView-row-inner {
   background: var(--autocomplete-popup-highlight-background);
   color: var(--autocomplete-popup-highlight-color);
   fill-opacity: 1;
@@ -494,8 +494,9 @@
   color: inherit;
 }
 
-.urlbarView-row:is([type=remotetab], [sponsored]):not([selected]):not(:hover) > .urlbarView-row-inner > .urlbarView-url,
-.urlbarView-row[type=search]:not([selected]):not(:hover):not([show-action-text]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
+.urlbarView-row:is([type=remotetab], [sponsored]):not([selected], :hover) > .urlbarView-row-inner > .urlbarView-url,
+.urlbarView-row:is([type=search], [restyled-search]):not([selected], [show-action-text], :hover) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
+.urlbarView-row:not([has-action], [has-url], [restyled-search]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-title-separator,
 .urlbarView:not([actionoverride]) .urlbarView-row[type=switchtab] > .urlbarView-row-inner > .urlbarView-url {
   /* Use visibility:collapse instead of display:none since the latter can
      confuse the overflow state of title and url elements when their content
@@ -504,7 +505,8 @@
 }
 
 .urlbarView-row:is([type=remotetab], [sponsored]):is([selected], :hover) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action,
-.urlbarView-row[type=search]:not([selected]):not(:hover):not([show-action-text]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action,
+.urlbarView-row:is([type=search], [restyled-search]):not([selected], [show-action-text], :hover) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action,
+.urlbarView-row:not([has-action], [has-url], [restyled-search]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action,
 .urlbarView[actionoverride] .urlbarView-row[type=switchtab] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action {
   display: none;
 }
diff -Nru firefox-84.0.2+build1/browser/themes/shared/webRTC-indicator.inc.css firefox-85.0+build1/browser/themes/shared/webRTC-indicator.inc.css
--- firefox-84.0.2+build1/browser/themes/shared/webRTC-indicator.inc.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/shared/webRTC-indicator.inc.css	2021-01-18 19:58:08.000000000 +0000
@@ -114,12 +114,12 @@
  * If we're not sharing either the screen or the window, we can
  * hide the entire display sharing section.
  */
-:root:not(:is([sharingscreen],[sharingwindow])) > body > #display-share,
-:root:not(:is([sharingscreen],[sharingwindow])) > body > #display-share + .separator,
+:root:not([sharingscreen],[sharingwindow]) > body > #display-share,
+:root:not([sharingscreen],[sharingwindow]) > body > #display-share + .separator,
 :root:not([sharingvideo]) > body > #device-share > #camera-mute-toggle,
 :root:not([sharingaudio]) > body > #device-share > #microphone-mute-toggle,
-:root:not(:is([sharingvideo],[sharingaudio])) > body > #device-share,
-:root:not(:is([sharingvideo],[sharingaudio])) > body > #device-share + .separator {
+:root:not([sharingvideo],[sharingaudio]) > body > #device-share,
+:root:not([sharingvideo],[sharingaudio]) > body > #device-share + .separator {
   display:none;
 }
 
diff -Nru firefox-84.0.2+build1/browser/themes/windows/browser-aero.css firefox-85.0+build1/browser/themes/windows/browser-aero.css
--- firefox-84.0.2+build1/browser/themes/windows/browser-aero.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/windows/browser-aero.css	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,7 @@
           :root[sizemode=normal][tabsintitlebar] {
             border-top: 1px solid -moz-win-accentcolor;
           }
-          :root[tabsintitlebar]:not(:-moz-window-inactive):not(:-moz-lwtheme),
+          :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme),
           :root[tabsintitlebar]:not(:-moz-window-inactive)[lwt-default-theme-in-dark-mode] {
             background-color: -moz-win-accentcolor;
             color: -moz-win-accentcolortext;
@@ -301,7 +301,7 @@
     }
   }
 
-  :root[darkwindowframe="true"]:not(:-moz-window-inactive):not(:-moz-lwtheme) {
+  :root[darkwindowframe="true"]:not(:-moz-window-inactive, :-moz-lwtheme) {
     color: white;
   }
 
@@ -309,7 +309,7 @@
   @media (-moz-os-version: windows-win7),
          (-moz-os-version: windows-win8) {
     /* Vertical toolbar border */
-    #main-window[sizemode=normal] .browser-toolbar:not(.titlebar-color):not(:-moz-lwtheme),
+    #main-window[sizemode=normal] .browser-toolbar:not(.titlebar-color, :-moz-lwtheme),
     #main-window[sizemode=normal] .browser-toolbar:-moz-lwtheme {
       border-inline: 1px solid @glassShadowColor@;
       background-clip: padding-box;
@@ -360,7 +360,7 @@
     text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
   }
 
-  #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
+  #main-menubar:not(:-moz-lwtheme, :-moz-window-inactive) {
     background-color: rgba(255,255,255,.5);
     color: black;
     border-radius: 4px;
diff -Nru firefox-84.0.2+build1/browser/themes/windows/browser.css firefox-85.0+build1/browser/themes/windows/browser.css
--- firefox-84.0.2+build1/browser/themes/windows/browser.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/windows/browser.css	2021-01-18 19:58:08.000000000 +0000
@@ -190,11 +190,11 @@
   /* Please keep the menu text colors in this media block in sync with
    * compacttheme.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
    */
-  :root[tabsintitlebar]:not([inFullscreen]):not(:-moz-lwtheme) {
+  :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme) {
     color: CaptionText;
   }
 
-  :root[tabsintitlebar]:not([inFullscreen]):not(:-moz-lwtheme):-moz-window-inactive {
+  :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme):-moz-window-inactive {
     color: InactiveCaptionText;
   }
 }
@@ -274,8 +274,8 @@
   :root:not([inDOMFullscreen]) #titlebar:-moz-lwtheme {
     visibility: hidden;
   }
-  :root:not([inDOMFullscreen]):not([chromehidden~="menubar"]) #toolbar-menubar:-moz-lwtheme,
-  :root:not([inDOMFullscreen]):not([chromehidden~="toolbar"]) #TabsToolbar:-moz-lwtheme {
+  :root:not([inDOMFullscreen], [chromehidden~="menubar"]) #toolbar-menubar:-moz-lwtheme,
+  :root:not([inDOMFullscreen], [chromehidden~="toolbar"]) #TabsToolbar:-moz-lwtheme {
     visibility: visible;
   }
 }
@@ -530,8 +530,8 @@
 }
 
 @media (-moz-windows-default-theme: 0) {
-  #urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background,
-  #searchbar:not(:-moz-lwtheme):not(:focus-within) {
+  #urlbar:not(:-moz-lwtheme, [focused="true"]) > #urlbar-background,
+  #searchbar:not(:-moz-lwtheme, :focus-within) {
     border-color: ThreeDShadow;
   }
 }
diff -Nru firefox-84.0.2+build1/browser/themes/windows/compacttheme.css firefox-85.0+build1/browser/themes/windows/compacttheme.css
--- firefox-84.0.2+build1/browser/themes/windows/compacttheme.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/windows/compacttheme.css	2021-01-18 19:58:08.000000000 +0000
@@ -36,10 +36,10 @@
     /* Because we're forcing the tabs toolbar to be [brighttext] to
      * get white toolbar button icons, we need to manually set the
      * correct color for the tab hover state for the light theme. */
-    .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]):not([multiselected]):-moz-lwtheme-darktext {
+    .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true], [multiselected]):-moz-lwtheme-darktext {
       background-color: rgba(0,0,0,.1) !important;
     }
-    .tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true]):not([multiselected]):-moz-lwtheme-darktext {
+    .tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true], [multiselected]):-moz-lwtheme-darktext {
       background-color: rgba(0,0,0,.2) !important;
     }
   }
diff -Nru firefox-84.0.2+build1/browser/themes/windows/places/organizer.css firefox-85.0+build1/browser/themes/windows/places/organizer.css
--- firefox-84.0.2+build1/browser/themes/windows/places/organizer.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/themes/windows/places/organizer.css	2021-01-18 19:58:08.000000000 +0000
@@ -108,7 +108,7 @@
 
 /* Info box */
 
-#detailsDeck {
+#detailsPane {
   border-top: 1px solid var(--organizer-border-color);
   padding: 5px;
 }
@@ -240,7 +240,7 @@
     background-color: var(--organizer-background-primary-color);
   }
 
-  #detailsDeck {
+  #detailsPane {
     background-color: var(--organizer-background-intermediate-color);
     color: var(--organizer-text-primary-color);
   }
diff -Nru firefox-84.0.2+build1/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm firefox-85.0+build1/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
--- firefox-84.0.2+build1/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -152,7 +152,7 @@
       .removeAttribute("remotecontrol");
 
     let selectedBrowser = browserWindow.gBrowser.selectedBrowser;
-    await BrowserTestUtils.loadURI(selectedBrowser, HOME_PAGE);
+    BrowserTestUtils.loadURI(selectedBrowser, HOME_PAGE);
     await BrowserTestUtils.browserLoaded(selectedBrowser);
 
     for (let i = 0; i < this.combos.length; i++) {
diff -Nru firefox-84.0.2+build1/build/build-clang/bug-1605181-isConstexpr.patch firefox-85.0+build1/build/build-clang/bug-1605181-isConstexpr.patch
--- firefox-84.0.2+build1/build/build-clang/bug-1605181-isConstexpr.patch	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/bug-1605181-isConstexpr.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-From 5c5e860535d8924a3d6eb950bb8a4945df01e9b7 Mon Sep 17 00:00:00 2001
-From: Gabor Horvath <xazax@google.com>
-Date: Wed, 27 Nov 2019 10:56:36 -0800
-Subject: [PATCH] [clang-tidy] Fix PR35824
-
-Differential Revision: https://reviews.llvm.org/D46027
----
- .../bugprone/SuspiciousSemicolonCheck.cpp     |  3 +-
- ...ugprone-suspicious-semicolon-constexpr.cpp | 31 +++++++++++++++++++
- 2 files changed, 33 insertions(+), 1 deletion(-)
- create mode 100644 clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp
-
-diff --git a/clang-tools-extra/clang-tidy/bugprone/SuspiciousSemicolonCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/SuspiciousSemicolonCheck.cpp
-index d94731beba94..9b34f5ab55a7 100644
---- a/clang-tools-extra/clang-tidy/bugprone/SuspiciousSemicolonCheck.cpp
-+++ b/clang-tools-extra/clang-tidy/bugprone/SuspiciousSemicolonCheck.cpp
-@@ -20,7 +20,8 @@ namespace bugprone {
- void SuspiciousSemicolonCheck::registerMatchers(MatchFinder *Finder) {
-   Finder->addMatcher(
-       stmt(anyOf(ifStmt(hasThen(nullStmt().bind("semi")),
--                        unless(hasElse(stmt()))),
-+                        unless(hasElse(stmt())),
-+                        unless(isConstexpr())),
-                  forStmt(hasBody(nullStmt().bind("semi"))),
-                  cxxForRangeStmt(hasBody(nullStmt().bind("semi"))),
-                  whileStmt(hasBody(nullStmt().bind("semi")))))
-diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp
-new file mode 100644
-index 000000000000..c18dd7bd1e93
---- /dev/null
-+++ b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp
-@@ -0,0 +1,31 @@
-+// RUN: %check_clang_tidy %s bugprone-suspicious-semicolon %t -- -- -std=c++17
-+
-+void fail()
-+{
-+  int x = 0;
-+  if(x > 5); (void)x;
-+  // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
-+  // CHECK-FIXES: if(x > 5) (void)x;
-+}
-+
-+template <int X>
-+int foo(int a) {
-+    if constexpr(X > 0) {
-+        return a;
-+    }
-+    return a + 1;
-+}
-+
-+template <int X>
-+int foo2(int a) {
-+    // FIXME: diagnose the case below. See https://reviews.llvm.org/D46234
-+    // for details.
-+    if constexpr(X > 0);
-+        return a;
-+    return a + 1;
-+}
-+
-+int main(void) {
-+    foo2<0>(1);
-+    return foo<0>(1);
-+}
diff -Nru firefox-84.0.2+build1/build/build-clang/bug-1606630-if_constexpr.patch firefox-85.0+build1/build/build-clang/bug-1606630-if_constexpr.patch
--- firefox-84.0.2+build1/build/build-clang/bug-1606630-if_constexpr.patch	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/bug-1606630-if_constexpr.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-diff --git a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
-index 117ef36d78f..da0bef32c09 100644
---- a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
-+++ b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
-@@ -123,7 +123,10 @@ void BracesAroundStatementsCheck::storeOptions(
- }
-
- void BracesAroundStatementsCheck::registerMatchers(MatchFinder *Finder) {
--  Finder->addMatcher(ifStmt().bind("if"), this);
-+  Finder->addMatcher(
-+      ifStmt(unless(allOf(isConstexpr(), isInTemplateInstantiation())))
-+          .bind("if"),
-+      this);
-   Finder->addMatcher(whileStmt().bind("while"), this);
-   Finder->addMatcher(doStmt().bind("do"), this);
-   Finder->addMatcher(forStmt().bind("for"), this);
-diff --git a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
-index 0fd5c1fc55c..3167d159b74 100644
---- a/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
-+++ b/clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
-@@ -106,7 +106,11 @@ void MisleadingIndentationCheck::missingBracesCheck(const SourceManager &SM,
- }
-
- void MisleadingIndentationCheck::registerMatchers(MatchFinder *Finder) {
--  Finder->addMatcher(ifStmt(hasElse(stmt())).bind("if"), this);
-+  Finder->addMatcher(
-+      ifStmt(allOf(hasElse(stmt()),
-+                   unless(allOf(isConstexpr(), isInTemplateInstantiation()))))
-+          .bind("if"),
-+      this);
-   Finder->addMatcher(
-       compoundStmt(has(stmt(anyOf(ifStmt(), forStmt(), whileStmt()))))
-           .bind("compound"),
diff -Nru firefox-84.0.2+build1/build/build-clang/build-clang.py firefox-85.0+build1/build/build-clang/build-clang.py
--- firefox-84.0.2+build1/build/build-clang/build-clang.py	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/build-clang.py	2021-01-18 19:58:08.000000000 +0000
@@ -763,7 +763,7 @@
         raise ValueError("Config file needs to set gcc_dir")
 
     if is_darwin() or osx_cross_compile:
-        os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.11"
+        os.environ["MACOSX_DEPLOYMENT_TARGET"] = "10.12"
 
     cc = get_tool(config, "cc")
     cxx = get_tool(config, "cxx")
@@ -862,7 +862,7 @@
         # Force things on.
         extra_cflags2 = []
         extra_cxxflags2 = [
-            "-fms-compatibility-version=19.13.26128",
+            "-fms-compatibility-version=19.15.26726",
             "-Xclang",
             "-std=c++14",
         ]
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-11-android.json firefox-85.0+build1/build/build-clang/clang-11-android.json
--- firefox-84.0.2+build1/build/build-clang/clang-11-android.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-11-android.json	2021-01-18 19:58:08.000000000 +0000
@@ -50,6 +50,7 @@
       "static-llvm-symbolizer.patch",
       "find_symbolizer_linux_clang_10.patch",
       "rename_gcov_flush_clang_11.patch",
+      "stack-clash-fix-probing.patch",
       "revert-r362047-and-r362065.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-11-linux64.json firefox-85.0+build1/build/build-clang/clang-11-linux64.json
--- firefox-84.0.2+build1/build/build-clang/clang-11-linux64.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-11-linux64.json	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,8 @@
       "android-mangling-error.patch",
       "unpoison-thread-stacks_clang_10.patch",
       "downgrade-mangling-error.patch",
+      "llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch",
+      "stack-clash-fix-probing.patch",
       "loosen-msvc-detection.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-11-win64-2stage.json firefox-85.0+build1/build/build-clang/clang-11-win64-2stage.json
--- firefox-84.0.2+build1/build/build-clang/clang-11-win64-2stage.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-11-win64-2stage.json	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
     "cxx": "cl.exe",
     "ml": "ml64.exe",
     "patches": [
+      "unpoison-thread-stacks_clang_10.patch",
       "bug47258-extract-symbols-mbcs.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-11-win64.json firefox-85.0+build1/build/build-clang/clang-11-win64.json
--- firefox-84.0.2+build1/build/build-clang/clang-11-win64.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-11-win64.json	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,7 @@
       "unpoison-thread-stacks_clang_10.patch",
       "downgrade-mangling-error.patch",
       "bug47258-extract-symbols-mbcs.patch",
+      "llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch",
       "loosen-msvc-detection.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang_format_10.patch firefox-85.0+build1/build/build-clang/clang_format_10.patch
--- firefox-84.0.2+build1/build/build-clang/clang_format_10.patch	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang_format_10.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
-index 70bcd7048c5..8cb786a4d34 100644
---- a/clang/lib/Format/TokenAnnotator.cpp
-+++ b/clang/lib/Format/TokenAnnotator.cpp
-@@ -2176,6 +2176,10 @@ static bool isFunctionDeclarationName(const FormatToken &Current,
-         Next = Next->Next;
-         continue;
-       }
-+      if (Next->is(TT_TemplateOpener) && Next->MatchingParen) {
-+        Next = Next->MatchingParen;
-+        continue;
-+      }
- 
-       break;
-     }
-@@ -2705,20 +2709,40 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
-                                     tok::l_square));
-   if (Right.is(tok::star) && Left.is(tok::l_paren))
-     return false;
--  if (Right.isOneOf(tok::star, tok::amp, tok::ampamp) &&
--      (Left.is(tok::identifier) || Left.isSimpleTypeSpecifier()) &&
--      // Space between the type and the * in:
--      //   operator void*()
--      //   operator char*()
--      //   operator /*comment*/ const char*()
--      //   operator volatile /*comment*/ char*()
--      //   operator Foo*()
--      // dependent on PointerAlignment style.
--      Left.Previous &&
--      (Left.Previous->endsSequence(tok::kw_operator) ||
--       Left.Previous->endsSequence(tok::kw_const, tok::kw_operator) ||
--       Left.Previous->endsSequence(tok::kw_volatile, tok::kw_operator)))
--    return (Style.PointerAlignment != FormatStyle::PAS_Left);
-+  if (Right.is(tok::star) && Left.is(tok::star))
-+    return false;
-+  if (Right.isOneOf(tok::star, tok::amp, tok::ampamp)) {
-+    const FormatToken *Previous = &Left;
-+    while (Previous && !Previous->is(tok::kw_operator)) {
-+      if (Previous->is(tok::identifier) || Previous->isSimpleTypeSpecifier()) {
-+        Previous = Previous->getPreviousNonComment();
-+        continue;
-+      }
-+      if (Previous->is(TT_TemplateCloser) && Previous->MatchingParen) {
-+        Previous = Previous->MatchingParen->getPreviousNonComment();
-+        continue;
-+      }
-+      if (Previous->is(tok::coloncolon)) {
-+        Previous = Previous->getPreviousNonComment();
-+        continue;
-+      }
-+      break;
-+    }
-+    // Space between the type and the * in:
-+    //   operator void*()
-+    //   operator char*()
-+    //   operator /*comment*/ const char*()
-+    //   operator volatile /*comment*/ char*()
-+    //   operator Foo*()
-+    //   operator C<T>*()
-+    //   operator std::Foo*()
-+    //   operator C<T>::D<U>*()
-+    // dependent on PointerAlignment style.
-+    if (Previous && (Previous->endsSequence(tok::kw_operator) ||
-+       Previous->endsSequence(tok::kw_const, tok::kw_operator) ||
-+       Previous->endsSequence(tok::kw_volatile, tok::kw_operator)))
-+      return (Style.PointerAlignment != FormatStyle::PAS_Left);
-+  }
-   const auto SpaceRequiredForArrayInitializerLSquare =
-       [](const FormatToken &LSquareTok, const FormatStyle &Style) {
-         return Style.SpacesInContainerLiterals ||
-diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
-index a5a26b5c1e8..7f8a3795e6e 100644
---- a/clang/unittests/Format/FormatTest.cpp
-+++ b/clang/unittests/Format/FormatTest.cpp
-@@ -6185,7 +6185,17 @@ TEST_F(FormatTest, ReturnTypeBreakingStyle) {
-                "void\n"
-                "A::operator[]() {}\n"
-                "void\n"
--               "A::operator!() {}\n",
-+               "A::operator!() {}\n"
-+               "void\n"
-+               "A::operator**() {}\n"
-+               "void\n"
-+               "A::operator<Foo> *() {}\n"
-+               "void\n"
-+               "A::operator<Foo> **() {}\n"
-+               "void\n"
-+               "A::operator<Foo> &() {}\n"
-+               "void\n"
-+               "A::operator void **() {}\n",
-                Style);
-   verifyFormat("constexpr auto\n"
-                "operator()() const -> reference {}\n"
-@@ -6202,6 +6212,10 @@ TEST_F(FormatTest, ReturnTypeBreakingStyle) {
-                "constexpr auto\n"
-                "operator void *() const -> reference {}\n"
-                "constexpr auto\n"
-+               "operator void **() const -> reference {}\n"
-+               "constexpr auto\n"
-+               "operator void *() const -> reference {}\n"
-+               "constexpr auto\n"
-                "operator void &() const -> reference {}\n"
-                "constexpr auto\n"
-                "operator void &&() const -> reference {}\n"
-@@ -14986,9 +15000,20 @@ TEST_F(FormatTest, OperatorSpacing) {
-   Style.PointerAlignment = FormatStyle::PAS_Right;
-   verifyFormat("Foo::operator*();", Style);
-   verifyFormat("Foo::operator void *();", Style);
-+  verifyFormat("Foo::operator void **();", Style);
-   verifyFormat("Foo::operator()(void *);", Style);
-   verifyFormat("Foo::operator*(void *);", Style);
-   verifyFormat("Foo::operator*();", Style);
-+  verifyFormat("Foo::operator**();", Style);
-+  verifyFormat("Foo::operator&();", Style);
-+  verifyFormat("Foo::operator<int> *();", Style);
-+  verifyFormat("Foo::operator<Foo> *();", Style);
-+  verifyFormat("Foo::operator<int> **();", Style);
-+  verifyFormat("Foo::operator<Foo> **();", Style);
-+  verifyFormat("Foo::operator<int> &();", Style);
-+  verifyFormat("Foo::operator<Foo> &();", Style);
-+  verifyFormat("Foo::operator<int> &&();", Style);
-+  verifyFormat("Foo::operator<Foo> &&();", Style);
-   verifyFormat("operator*(int (*)(), class Foo);", Style);
- 
-   verifyFormat("Foo::operator&();", Style);
-@@ -14999,21 +15024,39 @@ TEST_F(FormatTest, OperatorSpacing) {
-   verifyFormat("operator&(int (&)(), class Foo);", Style);
- 
-   verifyFormat("Foo::operator&&();", Style);
-+  verifyFormat("Foo::operator**();", Style);
-   verifyFormat("Foo::operator void &&();", Style);
-   verifyFormat("Foo::operator()(void &&);", Style);
-   verifyFormat("Foo::operator&&(void &&);", Style);
-   verifyFormat("Foo::operator&&();", Style);
-   verifyFormat("operator&&(int(&&)(), class Foo);", Style);
-+  verifyFormat("operator const nsTArrayRight<E> &()", Style);
-+  verifyFormat("[[nodiscard]] operator const nsTArrayRight<E, Allocator> &()",
-+               Style);
-+  verifyFormat("operator void **()", Style);
-+  verifyFormat("operator const FooRight<Object> &()", Style);
-+  verifyFormat("operator const FooRight<Object> *()", Style);
-+  verifyFormat("operator const FooRight<Object> **()", Style);
- 
-   Style.PointerAlignment = FormatStyle::PAS_Left;
-   verifyFormat("Foo::operator*();", Style);
-+  verifyFormat("Foo::operator**();", Style);
-   verifyFormat("Foo::operator void*();", Style);
-+  verifyFormat("Foo::operator void**();", Style);
-   verifyFormat("Foo::operator/*comment*/ void*();", Style);
-   verifyFormat("Foo::operator/*a*/ const /*b*/ void*();", Style);
-   verifyFormat("Foo::operator/*a*/ volatile /*b*/ void*();", Style);
-   verifyFormat("Foo::operator()(void*);", Style);
-   verifyFormat("Foo::operator*(void*);", Style);
-   verifyFormat("Foo::operator*();", Style);
-+  verifyFormat("Foo::operator<int>*();", Style);
-+  verifyFormat("Foo::operator<Foo>*();", Style);
-+  verifyFormat("Foo::operator<int>**();", Style);
-+  verifyFormat("Foo::operator<Foo>**();", Style);
-+  verifyFormat("Foo::operator<int>&();", Style);
-+  verifyFormat("Foo::operator<Foo>&();", Style);
-+  verifyFormat("Foo::operator<int>&&();", Style);
-+  verifyFormat("Foo::operator<Foo>&&();", Style);
-   verifyFormat("operator*(int (*)(), class Foo);", Style);
- 
-   verifyFormat("Foo::operator&();", Style);
-@@ -15035,6 +15078,21 @@ TEST_F(FormatTest, OperatorSpacing) {
-   verifyFormat("Foo::operator&&(void&&);", Style);
-   verifyFormat("Foo::operator&&();", Style);
-   verifyFormat("operator&&(int(&&)(), class Foo);", Style);
-+  verifyFormat("operator const nsTArrayLeft<E>&()", Style);
-+  verifyFormat("[[nodiscard]] operator const nsTArrayLeft<E, Allocator>&()",
-+               Style);
-+  verifyFormat("operator void**()", Style);
-+  verifyFormat("operator const FooLeft<Object>&()", Style);
-+  verifyFormat("operator const FooLeft<Object>*()", Style);
-+  verifyFormat("operator const FooLeft<Object>**()", Style);
-+
-+  // PR45107
-+  verifyFormat("operator Vector<String>&();", Style);
-+  verifyFormat("operator const Vector<String>&();", Style);
-+  verifyFormat("operator foo::Bar*();", Style);
-+  verifyFormat("operator const Foo<X>::Bar<Y>*();", Style);
-+  verifyFormat("operator/*a*/ const /*b*/ Foo /*c*/<X> /*d*/ ::Bar<Y>*();",
-+               Style);
- 
-   Style.PointerAlignment = FormatStyle::PAS_Middle;
-   verifyFormat("Foo::operator*();", Style);
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-format-11.patch firefox-85.0+build1/build/build-clang/clang-format-11.patch
--- firefox-84.0.2+build1/build/build-clang/clang-format-11.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-format-11.patch	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,154 @@
+From b9e789447f14c0330edd22c82746af29e7c3b259 Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre@debian.org>
+Date: Sat, 17 Oct 2020 19:51:05 +0200
+Subject: [PATCH] Revert "[clang-format] Fix AlignConsecutive on PP blocks"
+
+This reverts commit b2eb439317576ce718193763c12bff9fccdfc166.
+
+Caused the regression:
+https://bugs.llvm.org/show_bug.cgi?id=47589
+
+Reviewed By: MyDeveloperDay
+
+Differential Revision: https://reviews.llvm.org/D89464
+---
+ clang/lib/Format/FormatToken.h                |  6 -----
+ clang/lib/Format/UnwrappedLineParser.cpp      |  2 --
+ clang/lib/Format/WhitespaceManager.cpp        | 10 +++-----
+ clang/unittests/Format/FormatTest.cpp         | 23 -------------------
+ clang/unittests/Format/FormatTestComments.cpp | 21 -----------------
+ 5 files changed, 3 insertions(+), 59 deletions(-)
+
+diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h
+index d4287f53fde..b132a3e84da 100644
+--- a/clang/lib/Format/FormatToken.h
++++ b/clang/lib/Format/FormatToken.h
+@@ -183,12 +183,6 @@ struct FormatToken {
+   /// before the token.
+   bool MustBreakBefore = false;
+
+-  /// Whether to not align across this token
+-  ///
+-  /// This happens for example when a preprocessor directive ended directly
+-  /// before the token, but very rarely otherwise.
+-  bool MustBreakAlignBefore = false;
+-
+   /// The raw text of the token.
+   ///
+   /// Contains the raw token text without leading whitespace and without leading
+diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
+index a37386425aa..ea8a41cfba8 100644
+--- a/clang/lib/Format/UnwrappedLineParser.cpp
++++ b/clang/lib/Format/UnwrappedLineParser.cpp
+@@ -3037,7 +3037,6 @@ void UnwrappedLineParser::readToken(int LevelDifference) {
+       }
+       FormatTok = Tokens->getNextToken();
+       FormatTok->MustBreakBefore = true;
+-      FormatTok->MustBreakAlignBefore = true;
+     }
+
+     if (!PPStack.empty() && (PPStack.back().Kind == PP_Unreachable) &&
+@@ -3062,7 +3061,6 @@ void UnwrappedLineParser::pushToken(FormatToken *Tok) {
+   Line->Tokens.push_back(UnwrappedLineNode(Tok));
+   if (MustBreakBeforeNextToken) {
+     Line->Tokens.back().Tok->MustBreakBefore = true;
+-    Line->Tokens.back().Tok->MustBreakAlignBefore = true;
+     MustBreakBeforeNextToken = false;
+   }
+ }
+diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp
+index 32e0b685ea0..3a265bd0916 100644
+--- a/clang/lib/Format/WhitespaceManager.cpp
++++ b/clang/lib/Format/WhitespaceManager.cpp
+@@ -411,11 +411,9 @@ static unsigned AlignTokens(const FormatStyle &Style, F &&Matches,
+     if (Changes[i].NewlinesBefore != 0) {
+       CommasBeforeMatch = 0;
+       EndOfSequence = i;
+-      // If there is a blank line, there is a forced-align-break (eg,
+-      // preprocessor), or if the last line didn't contain any matching token,
+-      // the sequence ends here.
+-      if (Changes[i].NewlinesBefore > 1 ||
+-          Changes[i].Tok->MustBreakAlignBefore || !FoundMatchOnLine)
++      // If there is a blank line, or if the last line didn't contain any
++      // matching token, the sequence ends here.
++      if (Changes[i].NewlinesBefore > 1 || !FoundMatchOnLine)
+         AlignCurrentSequence();
+
+       FoundMatchOnLine = false;
+@@ -726,8 +724,6 @@ void WhitespaceManager::alignTrailingComments() {
+     if (Changes[i].StartOfBlockComment)
+       continue;
+     Newlines += Changes[i].NewlinesBefore;
+-    if (Changes[i].Tok->MustBreakAlignBefore)
+-      BreakBeforeNext = true;
+     if (!Changes[i].IsTrailingComment)
+       continue;
+
+diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
+index 17d302f0b65..7e4d1fca509 100644
+--- a/clang/unittests/Format/FormatTest.cpp
++++ b/clang/unittests/Format/FormatTest.cpp
+@@ -11968,29 +11968,6 @@ TEST_F(FormatTest, AlignConsecutiveAssignments) {
+   verifyFormat("int oneTwoThree = 123; // comment\n"
+                "int oneTwo      = 12;  // comment",
+                Alignment);
+-
+-  // Bug 25167
+-  verifyFormat("#if A\n"
+-               "#else\n"
+-               "int aaaaaaaa = 12;\n"
+-               "#endif\n"
+-               "#if B\n"
+-               "#else\n"
+-               "int a = 12;\n"
+-               "#endif\n",
+-               Alignment);
+-  verifyFormat("enum foo {\n"
+-               "#if A\n"
+-               "#else\n"
+-               "  aaaaaaaa = 12;\n"
+-               "#endif\n"
+-               "#if B\n"
+-               "#else\n"
+-               "  a = 12;\n"
+-               "#endif\n"
+-               "};\n",
+-               Alignment);
+-
+   EXPECT_EQ("int a = 5;\n"
+             "\n"
+             "int oneTwoThree = 123;",
+diff --git a/clang/unittests/Format/FormatTestComments.cpp b/clang/unittests/Format/FormatTestComments.cpp
+index 47509f29744..d5b9f8e0885 100644
+--- a/clang/unittests/Format/FormatTestComments.cpp
++++ b/clang/unittests/Format/FormatTestComments.cpp
+@@ -2780,27 +2780,6 @@ TEST_F(FormatTestComments, AlignTrailingComments) {
+                    "       // line 2 about b\n"
+                    "       long b;",
+                    getLLVMStyleWithColumns(80)));
+-
+-  // Checks an edge case in preprocessor handling.
+-  // These comments should *not* be aligned
+-  EXPECT_EQ(
+-      "#if FOO\n"
+-      "#else\n"
+-      "long a; // Line about a\n"
+-      "#endif\n"
+-      "#if BAR\n"
+-      "#else\n"
+-      "long b_long_name; // Line about b\n"
+-      "#endif\n",
+-      format("#if FOO\n"
+-             "#else\n"
+-             "long a;           // Line about a\n" // Previous (bad) behavior
+-             "#endif\n"
+-             "#if BAR\n"
+-             "#else\n"
+-             "long b_long_name; // Line about b\n"
+-             "#endif\n",
+-             getLLVMStyleWithColumns(80)));
+ }
+
+ TEST_F(FormatTestComments, AlignsBlockCommentDecorations) {
+--
+2.28.0
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-tidy-ci.patch firefox-85.0+build1/build/build-clang/clang-tidy-ci.patch
--- firefox-84.0.2+build1/build/build-clang/clang-tidy-ci.patch	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-tidy-ci.patch	2021-01-18 19:58:08.000000000 +0000
@@ -1,23 +1,23 @@
 diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
-index 40aaf402ec0..2184d51c643 100644
+index d6913dfd3c07..d031a163fdd7 100644
 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp
 +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp
-@@ -410,6 +410,7 @@ ClangTidyASTConsumerFactory::CreateASTConsumer(
- 
-   for (auto &Check : Checks) {
+@@ -418,6 +418,7 @@ ClangTidyASTConsumerFactory::CreateASTConsumer(
+     if (!Check->isLanguageVersionSupported(Context.getLangOpts()))
+       continue;
      Check->registerMatchers(&*Finder);
 +    Check->registerPPCallbacks(Compiler);
      Check->registerPPCallbacks(*SM, PP, ModuleExpanderPP);
    }
- 
+
 diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.h b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
-index 1ad881f673a..59982bd377e 100644
+index 54b725126752..200780e86804 100644
 --- a/clang-tools-extra/clang-tidy/ClangTidyCheck.h
 +++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
-@@ -53,6 +53,9 @@ public:
-   /// constructor using the Options.get() methods below.
-   ClangTidyCheck(StringRef CheckName, ClangTidyContext *Context);
- 
+@@ -130,6 +130,9 @@ public:
+     return true;
+   }
+
 +  /// This has been deprecated in clang 9 - needed by mozilla-must-override
 +  virtual void registerPPCallbacks(CompilerInstance &Compiler) {}
 +
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-tidy-linux64.json firefox-85.0+build1/build/build-clang/clang-tidy-linux64.json
--- firefox-84.0.2+build1/build/build-clang/clang-tidy-linux64.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-tidy-linux64.json	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,6 @@
     "patches": [
         "clang-tidy-ci.patch",
         "clang-tidy-no-errors.patch",
-        "clang_format_10.patch"
+        "clang-format-11.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-tidy-macosx64.json firefox-85.0+build1/build/build-clang/clang-tidy-macosx64.json
--- firefox-84.0.2+build1/build/build-clang/clang-tidy-macosx64.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-tidy-macosx64.json	2021-01-18 19:58:08.000000000 +0000
@@ -17,7 +17,8 @@
     "patches": [
       "clang-tidy-ci.patch",
       "clang-tidy-no-errors.patch",
+      "compiler-rt-cross-compile.patch",
       "compiler-rt-no-codesign.patch",
-      "clang_format_10.patch"
+      "clang-format-11.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/clang-tidy-win64.json firefox-85.0+build1/build/build-clang/clang-tidy-win64.json
--- firefox-84.0.2+build1/build/build-clang/clang-tidy-win64.json	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/clang-tidy-win64.json	2021-01-18 19:58:08.000000000 +0000
@@ -11,6 +11,6 @@
     "patches": [
         "clang-tidy-ci.patch",
         "clang-tidy-no-errors.patch",
-        "clang_format_10.patch"
+        "clang-format-11.patch"
     ]
 }
diff -Nru firefox-84.0.2+build1/build/build-clang/llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch firefox-85.0+build1/build/build-clang/llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch
--- firefox-84.0.2+build1/build/build-clang/llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/llvmorg-12-init-10926-gb79e990f401-LTO-new-pass-manager.patch	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,66 @@
+diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h
+index 7c439176f3a4..ae969c6bdd8b 100644
+--- a/lld/COFF/Config.h
++++ b/lld/COFF/Config.h
+@@ -155,6 +155,11 @@ struct Configuration {
+   // Used for /opt:lldltocachepolicy=policy
+   llvm::CachePruningPolicy ltoCachePolicy;
+ 
++  // Used for /opt:[no]ltonewpassmanager
++  bool ltoNewPassManager = false;
++  // Used for /opt:[no]ltodebugpassmanager
++  bool ltoDebugPassManager = false;
++
+   // Used for /merge:from=to (e.g. /merge:.rdata=.text)
+   std::map<StringRef, StringRef> merge;
+ 
+diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
+index 9ceccef86779..db2ae241dddf 100644
+--- a/lld/COFF/Driver.cpp
++++ b/lld/COFF/Driver.cpp
+@@ -1418,6 +1418,8 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) {
+   unsigned icfLevel =
+       args.hasArg(OPT_profile) ? 0 : 1; // 0: off, 1: limited, 2: on
+   unsigned tailMerge = 1;
++  bool ltoNewPM = false;
++  bool ltoDebugPM = false;
+   for (auto *arg : args.filtered(OPT_opt)) {
+     std::string str = StringRef(arg->getValue()).lower();
+     SmallVector<StringRef, 1> vec;
+@@ -1435,6 +1437,14 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) {
+         tailMerge = 2;
+       } else if (s == "nolldtailmerge") {
+         tailMerge = 0;
++      } else if (s == "ltonewpassmanager") {
++        ltoNewPM = true;
++      } else if (s == "noltonewpassmanager") {
++        ltoNewPM = false;
++      } else if (s == "ltodebugpassmanager") {
++        ltoDebugPM = true;
++      } else if (s == "noltodebugpassmanager") {
++        ltoDebugPM = false;
+       } else if (s.startswith("lldlto=")) {
+         StringRef optLevel = s.substr(7);
+         if (optLevel.getAsInteger(10, config->ltoo) || config->ltoo > 3)
+@@ -1464,6 +1474,8 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) {
+   config->doGC = doGC;
+   config->doICF = icfLevel > 0;
+   config->tailMerge = (tailMerge == 1 && config->doICF) || tailMerge == 2;
++  config->ltoNewPassManager = ltoNewPM;
++  config->ltoDebugPassManager = ltoDebugPM;
+ 
+   // Handle /lldsavetemps
+   if (args.hasArg(OPT_lldsavetemps))
+diff --git a/lld/COFF/LTO.cpp b/lld/COFF/LTO.cpp
+index bb44819e60f8..e55fb544b050 100644
+--- a/lld/COFF/LTO.cpp
++++ b/lld/COFF/LTO.cpp
+@@ -82,6 +82,8 @@ static lto::Config createConfig() {
+   c.MAttrs = getMAttrs();
+   c.CGOptLevel = args::getCGOptLevel(config->ltoo);
+   c.AlwaysEmitRegularLTOObj = !config->ltoObjPath.empty();
++  c.UseNewPM = config->ltoNewPassManager;
++  c.DebugPassManager = config->ltoDebugPassManager;
+ 
+   if (config->saveTemps)
+     checkError(c.addSaveTemps(std::string(config->outputFile) + ".",
diff -Nru firefox-84.0.2+build1/build/build-clang/stack-clash-fix-probing.patch firefox-85.0+build1/build/build-clang/stack-clash-fix-probing.patch
--- firefox-84.0.2+build1/build/build-clang/stack-clash-fix-probing.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/build/build-clang/stack-clash-fix-probing.patch	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,753 @@
+From a1e0363c7402f7aa58e24e0e6dfa447ebabc1910 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton@redhat.com>
+Date: Wed, 30 Sep 2020 11:35:00 +0200
+Subject: [PATCH] Fix limit behavior of dynamic alloca
+
+When the allocation size is 0, we shouldn't probe. Within [1,  PAGE_SIZE], we
+should probe once etc.
+
+This fixes https://bugs.llvm.org/show_bug.cgi?id=47657
+
+Differential Revision: https://reviews.llvm.org/D88548
+
+(cherry picked from commit 9573c9f2a363da71b2c07a3add4e52721e6028a0)
+
+Also contains the patches:
+https://github.com/llvm/llvm-project/commit/aac36687f7978f33751daf2870b5c812124ebfaf
+https://github.com/llvm/llvm-project/commit/bbe6cbbed8c7460a7e8477373b9250543362e771
+
+
+These 3 patches have been merged in the 11 branch
+and should be part of the 11.0.1 release
+Index: llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86FrameLowering.cpp
+===================================================================
+--- llvm-toolchain-11-11.0.0.orig/llvm/lib/Target/X86/X86FrameLowering.cpp
++++ llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86FrameLowering.cpp
+@@ -586,29 +586,55 @@ void X86FrameLowering::emitStackProbeInl
+   const uint64_t StackProbeSize = TLI.getStackProbeSize(MF);
+   uint64_t ProbeChunk = StackProbeSize * 8;
+ 
++  uint64_t MaxAlign =
++      TRI->needsStackRealignment(MF) ? calculateMaxStackAlign(MF) : 0;
++
+   // Synthesize a loop or unroll it, depending on the number of iterations.
++  // BuildStackAlignAND ensures that only MaxAlign % StackProbeSize bits left
++  // between the unaligned rsp and current rsp
+   if (Offset > ProbeChunk) {
+-    emitStackProbeInlineGenericLoop(MF, MBB, MBBI, DL, Offset);
++    emitStackProbeInlineGenericLoop(MF, MBB, MBBI, DL, Offset,
++                                    MaxAlign % StackProbeSize);
+   } else {
+-    emitStackProbeInlineGenericBlock(MF, MBB, MBBI, DL, Offset);
++    emitStackProbeInlineGenericBlock(MF, MBB, MBBI, DL, Offset,
++                                     MaxAlign % StackProbeSize);
+   }
+ }
+ 
+ void X86FrameLowering::emitStackProbeInlineGenericBlock(
+     MachineFunction &MF, MachineBasicBlock &MBB,
+-    MachineBasicBlock::iterator MBBI, const DebugLoc &DL,
+-    uint64_t Offset) const {
++    MachineBasicBlock::iterator MBBI, const DebugLoc &DL, uint64_t Offset,
++    uint64_t AlignOffset) const {
+ 
+   const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
+   const X86TargetLowering &TLI = *STI.getTargetLowering();
+   const unsigned Opc = getSUBriOpcode(Uses64BitFramePtr, Offset);
+   const unsigned MovMIOpc = Is64Bit ? X86::MOV64mi32 : X86::MOV32mi;
+   const uint64_t StackProbeSize = TLI.getStackProbeSize(MF);
++
+   uint64_t CurrentOffset = 0;
+-  // 0 Thanks to return address being saved on the stack
+-  uint64_t CurrentProbeOffset = 0;
+ 
+-  // For the first N - 1 pages, just probe. I tried to take advantage of
++  assert(AlignOffset < StackProbeSize);
++
++  // If the offset is so small it fits within a page, there's nothing to do.
++  if (StackProbeSize < Offset + AlignOffset) {
++
++    MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(Opc), StackPtr)
++                           .addReg(StackPtr)
++                           .addImm(StackProbeSize - AlignOffset)
++                           .setMIFlag(MachineInstr::FrameSetup);
++    MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
++
++    addRegOffset(BuildMI(MBB, MBBI, DL, TII.get(MovMIOpc))
++                     .setMIFlag(MachineInstr::FrameSetup),
++                 StackPtr, false, 0)
++        .addImm(0)
++        .setMIFlag(MachineInstr::FrameSetup);
++    NumFrameExtraProbe++;
++    CurrentOffset = StackProbeSize - AlignOffset;
++  }
++
++  // For the next N - 1 pages, just probe. I tried to take advantage of
+   // natural probes but it implies much more logic and there was very few
+   // interesting natural probes to interleave.
+   while (CurrentOffset + StackProbeSize < Offset) {
+@@ -626,9 +652,9 @@ void X86FrameLowering::emitStackProbeInl
+         .setMIFlag(MachineInstr::FrameSetup);
+     NumFrameExtraProbe++;
+     CurrentOffset += StackProbeSize;
+-    CurrentProbeOffset += StackProbeSize;
+   }
+ 
++  // No need to probe the tail, it is smaller than a Page.
+   uint64_t ChunkSize = Offset - CurrentOffset;
+   MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(Opc), StackPtr)
+                          .addReg(StackPtr)
+@@ -639,8 +665,8 @@ void X86FrameLowering::emitStackProbeInl
+ 
+ void X86FrameLowering::emitStackProbeInlineGenericLoop(
+     MachineFunction &MF, MachineBasicBlock &MBB,
+-    MachineBasicBlock::iterator MBBI, const DebugLoc &DL,
+-    uint64_t Offset) const {
++    MachineBasicBlock::iterator MBBI, const DebugLoc &DL, uint64_t Offset,
++    uint64_t AlignOffset) const {
+   assert(Offset && "null offset");
+ 
+   const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
+@@ -648,6 +674,26 @@ void X86FrameLowering::emitStackProbeInl
+   const unsigned MovMIOpc = Is64Bit ? X86::MOV64mi32 : X86::MOV32mi;
+   const uint64_t StackProbeSize = TLI.getStackProbeSize(MF);
+ 
++  if (AlignOffset) {
++    if (AlignOffset < StackProbeSize) {
++      // Perform a first smaller allocation followed by a probe.
++      const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, AlignOffset);
++      MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(SUBOpc), StackPtr)
++                             .addReg(StackPtr)
++                             .addImm(AlignOffset)
++                             .setMIFlag(MachineInstr::FrameSetup);
++      MI->getOperand(3).setIsDead(); // The EFLAGS implicit def is dead.
++
++      addRegOffset(BuildMI(MBB, MBBI, DL, TII.get(MovMIOpc))
++                       .setMIFlag(MachineInstr::FrameSetup),
++                   StackPtr, false, 0)
++          .addImm(0)
++          .setMIFlag(MachineInstr::FrameSetup);
++      NumFrameExtraProbe++;
++      Offset -= AlignOffset;
++    }
++  }
++
+   // Synthesize a loop
+   NumFrameLoopProbe++;
+   const BasicBlock *LLVM_BB = MBB.getBasicBlock();
+@@ -666,8 +712,8 @@ void X86FrameLowering::emitStackProbeInl
+ 
+   // save loop bound
+   {
+-    const unsigned Opc = getSUBriOpcode(Uses64BitFramePtr, Offset);
+-    BuildMI(MBB, MBBI, DL, TII.get(Opc), FinalStackProbed)
++    const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, Offset);
++    BuildMI(MBB, MBBI, DL, TII.get(SUBOpc), FinalStackProbed)
+         .addReg(FinalStackProbed)
+         .addImm(Offset / StackProbeSize * StackProbeSize)
+         .setMIFlag(MachineInstr::FrameSetup);
+@@ -675,8 +721,8 @@ void X86FrameLowering::emitStackProbeInl
+ 
+   // allocate a page
+   {
+-    const unsigned Opc = getSUBriOpcode(Uses64BitFramePtr, StackProbeSize);
+-    BuildMI(testMBB, DL, TII.get(Opc), StackPtr)
++    const unsigned SUBOpc = getSUBriOpcode(Uses64BitFramePtr, StackProbeSize);
++    BuildMI(testMBB, DL, TII.get(SUBOpc), StackPtr)
+         .addReg(StackPtr)
+         .addImm(StackProbeSize)
+         .setMIFlag(MachineInstr::FrameSetup);
+@@ -1052,13 +1098,149 @@ void X86FrameLowering::BuildStackAlignAN
+                                           uint64_t MaxAlign) const {
+   uint64_t Val = -MaxAlign;
+   unsigned AndOp = getANDriOpcode(Uses64BitFramePtr, Val);
+-  MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(AndOp), Reg)
+-                         .addReg(Reg)
+-                         .addImm(Val)
+-                         .setMIFlag(MachineInstr::FrameSetup);
+ 
+-  // The EFLAGS implicit def is dead.
+-  MI->getOperand(3).setIsDead();
++  MachineFunction &MF = *MBB.getParent();
++  const X86Subtarget &STI = MF.getSubtarget<X86Subtarget>();
++  const X86TargetLowering &TLI = *STI.getTargetLowering();
++  const uint64_t StackProbeSize = TLI.getStackProbeSize(MF);
++  const bool EmitInlineStackProbe = TLI.hasInlineStackProbe(MF);
++
++  // We want to make sure that (in worst case) less than StackProbeSize bytes
++  // are not probed after the AND. This assumption is used in
++  // emitStackProbeInlineGeneric.
++  if (Reg == StackPtr && EmitInlineStackProbe && MaxAlign >= StackProbeSize) {
++    {
++      NumFrameLoopProbe++;
++      MachineBasicBlock *entryMBB =
++          MF.CreateMachineBasicBlock(MBB.getBasicBlock());
++      MachineBasicBlock *headMBB =
++          MF.CreateMachineBasicBlock(MBB.getBasicBlock());
++      MachineBasicBlock *bodyMBB =
++          MF.CreateMachineBasicBlock(MBB.getBasicBlock());
++      MachineBasicBlock *footMBB =
++          MF.CreateMachineBasicBlock(MBB.getBasicBlock());
++
++      MachineFunction::iterator MBBIter = MBB.getIterator();
++      MF.insert(MBBIter, entryMBB);
++      MF.insert(MBBIter, headMBB);
++      MF.insert(MBBIter, bodyMBB);
++      MF.insert(MBBIter, footMBB);
++      const unsigned MovMIOpc = Is64Bit ? X86::MOV64mi32 : X86::MOV32mi;
++      Register FinalStackProbed = Uses64BitFramePtr ? X86::R11 : X86::R11D;
++
++      // Setup entry block
++      {
++
++        entryMBB->splice(entryMBB->end(), &MBB, MBB.begin(), MBBI);
++        BuildMI(entryMBB, DL, TII.get(TargetOpcode::COPY), FinalStackProbed)
++            .addReg(StackPtr)
++            .setMIFlag(MachineInstr::FrameSetup);
++        MachineInstr *MI =
++            BuildMI(entryMBB, DL, TII.get(AndOp), FinalStackProbed)
++                .addReg(FinalStackProbed)
++                .addImm(Val)
++                .setMIFlag(MachineInstr::FrameSetup);
++
++        // The EFLAGS implicit def is dead.
++        MI->getOperand(3).setIsDead();
++
++        BuildMI(entryMBB, DL,
++                TII.get(Uses64BitFramePtr ? X86::CMP64rr : X86::CMP32rr))
++            .addReg(FinalStackProbed)
++            .addReg(StackPtr)
++            .setMIFlag(MachineInstr::FrameSetup);
++        BuildMI(entryMBB, DL, TII.get(X86::JCC_1))
++            .addMBB(&MBB)
++            .addImm(X86::COND_E)
++            .setMIFlag(MachineInstr::FrameSetup);
++        entryMBB->addSuccessor(headMBB);
++        entryMBB->addSuccessor(&MBB);
++      }
++
++      // Loop entry block
++
++      {
++        const unsigned SUBOpc =
++            getSUBriOpcode(Uses64BitFramePtr, StackProbeSize);
++        BuildMI(headMBB, DL, TII.get(SUBOpc), StackPtr)
++            .addReg(StackPtr)
++            .addImm(StackProbeSize)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        BuildMI(headMBB, DL,
++                TII.get(Uses64BitFramePtr ? X86::CMP64rr : X86::CMP32rr))
++            .addReg(FinalStackProbed)
++            .addReg(StackPtr)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        // jump
++        BuildMI(headMBB, DL, TII.get(X86::JCC_1))
++            .addMBB(footMBB)
++            .addImm(X86::COND_B)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        headMBB->addSuccessor(bodyMBB);
++        headMBB->addSuccessor(footMBB);
++      }
++
++      // setup loop body
++      {
++        addRegOffset(BuildMI(bodyMBB, DL, TII.get(MovMIOpc))
++                         .setMIFlag(MachineInstr::FrameSetup),
++                     StackPtr, false, 0)
++            .addImm(0)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        const unsigned SUBOpc =
++            getSUBriOpcode(Uses64BitFramePtr, StackProbeSize);
++        BuildMI(bodyMBB, DL, TII.get(SUBOpc), StackPtr)
++            .addReg(StackPtr)
++            .addImm(StackProbeSize)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        // cmp with stack pointer bound
++        BuildMI(bodyMBB, DL,
++                TII.get(Uses64BitFramePtr ? X86::CMP64rr : X86::CMP32rr))
++            .addReg(FinalStackProbed)
++            .addReg(StackPtr)
++            .setMIFlag(MachineInstr::FrameSetup);
++
++        // jump
++        BuildMI(bodyMBB, DL, TII.get(X86::JCC_1))
++            .addMBB(bodyMBB)
++            .addImm(X86::COND_B)
++            .setMIFlag(MachineInstr::FrameSetup);
++        bodyMBB->addSuccessor(bodyMBB);
++        bodyMBB->addSuccessor(footMBB);
++      }
++
++      // setup loop footer
++      {
++        BuildMI(footMBB, DL, TII.get(TargetOpcode::COPY), StackPtr)
++            .addReg(FinalStackProbed)
++            .setMIFlag(MachineInstr::FrameSetup);
++        addRegOffset(BuildMI(footMBB, DL, TII.get(MovMIOpc))
++                         .setMIFlag(MachineInstr::FrameSetup),
++                     StackPtr, false, 0)
++            .addImm(0)
++            .setMIFlag(MachineInstr::FrameSetup);
++        footMBB->addSuccessor(&MBB);
++      }
++
++      recomputeLiveIns(*headMBB);
++      recomputeLiveIns(*bodyMBB);
++      recomputeLiveIns(*footMBB);
++      recomputeLiveIns(MBB);
++    }
++  } else {
++    MachineInstr *MI = BuildMI(MBB, MBBI, DL, TII.get(AndOp), Reg)
++                           .addReg(Reg)
++                           .addImm(Val)
++                           .setMIFlag(MachineInstr::FrameSetup);
++
++    // The EFLAGS implicit def is dead.
++    MI->getOperand(3).setIsDead();
++  }
+ }
+ 
+ bool X86FrameLowering::has128ByteRedZone(const MachineFunction& MF) const {
+Index: llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86FrameLowering.h
+===================================================================
+--- llvm-toolchain-11-11.0.0.orig/llvm/lib/Target/X86/X86FrameLowering.h
++++ llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86FrameLowering.h
+@@ -213,14 +213,14 @@ private:
+   void emitStackProbeInlineGenericBlock(MachineFunction &MF,
+                                         MachineBasicBlock &MBB,
+                                         MachineBasicBlock::iterator MBBI,
+-                                        const DebugLoc &DL,
+-                                        uint64_t Offset) const;
++                                        const DebugLoc &DL, uint64_t Offset,
++                                        uint64_t Align) const;
+ 
+   void emitStackProbeInlineGenericLoop(MachineFunction &MF,
+                                        MachineBasicBlock &MBB,
+                                        MachineBasicBlock::iterator MBBI,
+-                                       const DebugLoc &DL,
+-                                       uint64_t Offset) const;
++                                       const DebugLoc &DL, uint64_t Offset,
++                                       uint64_t Align) const;
+ 
+   /// Emit a stub to later inline the target stack probe.
+   MachineInstr *emitStackProbeInlineStub(MachineFunction &MF,
+Index: llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-large-large-align.ll
+===================================================================
+--- /dev/null
++++ llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-large-large-align.ll
+@@ -0,0 +1,88 @@
++; RUN: llc < %s | FileCheck %s
++
++
++target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
++target triple = "x86_64-unknown-linux-gnu"
++
++define i32 @foo_noprotect() local_unnamed_addr {
++; CHECK-LABEL: foo_noprotect:
++; CHECK:       # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:   .cfi_def_cfa_offset 16
++; CHECK-NEXT:   .cfi_offset %rbp, -16
++; CHECK-NEXT:   movq	%rsp, %rbp
++; CHECK-NEXT:   .cfi_def_cfa_register %rbp
++; CHECK-NEXT:   andq	$-4096, %rsp                    # imm = 0xF000
++; CHECK-NEXT:   subq	$73728, %rsp                    # imm = 0x12000
++; CHECK-NEXT:   movl	$1, 392(%rsp)
++; CHECK-NEXT:   movl	$1, 28792(%rsp)
++; CHECK-NEXT:   movl	(%rsp), %eax
++; CHECK-NEXT:   movq	%rbp, %rsp
++; CHECK-NEXT:   popq	%rbp
++; CHECK-NEXT:   .cfi_def_cfa %rsp, 8
++; CHECK-NEXT:   retq
++
++
++  %a = alloca i32, i64 18000, align 4096
++  %b0 = getelementptr inbounds i32, i32* %a, i64 98
++  %b1 = getelementptr inbounds i32, i32* %a, i64 7198
++  store volatile i32 1, i32* %b0
++  store volatile i32 1, i32* %b1
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++define i32 @foo_protect() local_unnamed_addr #0 {
++; CHECK-LABEL: foo_protect:
++; CHECK:       # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:	movq	%rsp, %r11
++; CHECK-NEXT:	andq	$-4096, %r11                    # imm = 0xF000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	je	.LBB1_4
++; CHECK-NEXT:# %bb.1:
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	jb	.LBB1_3
++; CHECK-NEXT:.LBB1_2:                                # =>This Inner Loop Header: Depth=1
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	jb	.LBB1_2
++; CHECK-NEXT:.LBB1_3:
++; CHECK-NEXT:	movq	%r11, %rsp
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:.LBB1_4:
++; CHECK-NEXT:	movq	%rsp, %r11
++; CHECK-NEXT:	subq	$73728, %r11                    # imm = 0x12000
++; CHECK-NEXT:.LBB1_5:                                # =>This Inner Loop Header: Depth=1
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:	cmpq	%r11, %rsp
++; CHECK-NEXT:	jne	.LBB1_5
++; CHECK-NEXT:# %bb.6:
++; CHECK-NEXT:	movl	$1, 392(%rsp)
++; CHECK-NEXT:	movl	$1, 28792(%rsp)
++; CHECK-NEXT:	movl	(%rsp), %eax
++; CHECK-NEXT:	movq	%rbp, %rsp
++; CHECK-NEXT:	popq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa %rsp, 8
++; CHECK-NEXT:	retq
++
++
++
++
++  %a = alloca i32, i64 18000, align 4096
++  %b0 = getelementptr inbounds i32, i32* %a, i64 98
++  %b1 = getelementptr inbounds i32, i32* %a, i64 7198
++  store volatile i32 1, i32* %b0
++  store volatile i32 1, i32* %b1
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++attributes #0 =  {"probe-stack"="inline-asm"}
+Index: llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-no-free-probe.ll
+===================================================================
+--- llvm-toolchain-11-11.0.0.orig/llvm/test/CodeGen/X86/stack-clash-no-free-probe.ll
++++ /dev/null
+@@ -1,27 +0,0 @@
+-; RUN: llc < %s | FileCheck %s
+-
+-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+-target triple = "x86_64-unknown-linux-gnu"
+-
+-define i32 @foo(i64 %i) local_unnamed_addr #0 {
+-; CHECK-LABEL: foo:
+-; CHECK:       # %bb.0:
+-; CHECK-NEXT:  subq	$4096, %rsp # imm = 0x1000
+-; CHECK-NEXT:  movq	$0, (%rsp)
+-; CHECK-NEXT:  subq	$3784, %rsp # imm = 0xEC8
+-; CHECK-NEXT:  .cfi_def_cfa_offset 7888
+-; CHECK-NEXT:  movl	$1, -128(%rsp,%rdi,4)
+-; CHECK-NEXT:  movl	-128(%rsp), %eax
+-; CHECK-NEXT:  addq	$7880, %rsp # imm = 0x1EC8
+-; CHECK-NEXT:  .cfi_def_cfa_offset 8
+-; CHECK-NEXT:  retq
+-
+-  %a = alloca i32, i32 2000, align 16
+-  %b = getelementptr inbounds i32, i32* %a, i64 %i
+-  store volatile i32 1, i32* %b
+-  %c = load volatile i32, i32* %a
+-  ret i32 %c
+-}
+-
+-attributes #0 =  {"probe-stack"="inline-asm"}
+-
+Index: llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-small-alloc-medium-align.ll
+===================================================================
+--- /dev/null
++++ llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-small-alloc-medium-align.ll
+@@ -0,0 +1,135 @@
++; RUN: llc < %s | FileCheck %s
++
++target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
++target triple = "x86_64-unknown-linux-gnu"
++
++; | case1 | alloca + align < probe_size
++define i32 @foo1(i64 %i) local_unnamed_addr #0 {
++; CHECK-LABEL: foo1:
++; CHECK:        # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:   andq    $-64, %rsp
++; CHECK-NEXT:   subq    $832, %rsp                      # imm = 0x340
++; CHECK-NEXT:   movl    $1, (%rsp,%rdi,4)
++; CHECK-NEXT:   movl    (%rsp), %eax
++; CHECK-NEXT:   movq    %rbp, %rsp
++; CHECK-NEXT:   popq    %rbp
++; CHECK-NEXT:	.cfi_def_cfa %rsp, 8
++; CHECK-NEXT:	retq
++
++  %a = alloca i32, i32 200, align 64
++  %b = getelementptr inbounds i32, i32* %a, i64 %i
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++; | case2 | alloca > probe_size, align > probe_size
++define i32 @foo2(i64 %i) local_unnamed_addr #0 {
++; CHECK-LABEL: foo2:
++; CHECK:        # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:   andq    $-2048, %rsp                    # imm = 0xF800
++; CHECK-NEXT:   subq    $2048, %rsp                     # imm = 0x800
++; CHECK-NEXT:   movq    $0, (%rsp)
++; CHECK-NEXT:   subq    $4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:   movq    $0, (%rsp)
++; CHECK-NEXT:   subq    $2048, %rsp                     # imm = 0x800
++; CHECK-NEXT:   movl    $1, (%rsp,%rdi,4)
++; CHECK-NEXT:   movl    (%rsp), %eax
++; CHECK-NEXT:   movq    %rbp, %rsp
++; CHECK-NEXT:   popq    %rbp
++; CHECK-NEXT:   .cfi_def_cfa %rsp, 8
++; CHECK-NEXT:   retq
++
++  %a = alloca i32, i32 2000, align 2048
++  %b = getelementptr inbounds i32, i32* %a, i64 %i
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++; | case3 | alloca < probe_size, align < probe_size, alloca + align > probe_size
++define i32 @foo3(i64 %i) local_unnamed_addr #0 {
++; CHECK-LABEL: foo3:
++; CHECK:        # %bb.0:
++; CHECK-NEXT:   pushq   %rbp
++; CHECK-NEXT:   .cfi_def_cfa_offset 16
++; CHECK-NEXT:   .cfi_offset %rbp, -16
++; CHECK-NEXT:   movq    %rsp, %rbp
++; CHECK-NEXT:   .cfi_def_cfa_register %rbp
++; CHECK-NEXT:   andq    $-1024, %rsp                    # imm = 0xFC00
++; CHECK-NEXT:   subq    $3072, %rsp                     # imm = 0xC00
++; CHECK-NEXT:   movq    $0, (%rsp)
++; CHECK-NEXT:   subq    $1024, %rsp                     # imm = 0x400
++; CHECK-NEXT:   movl    $1, (%rsp,%rdi,4)
++; CHECK-NEXT:   movl    (%rsp), %eax
++; CHECK-NEXT:   movq    %rbp, %rsp
++; CHECK-NEXT:   popq    %rbp
++; CHECK-NEXT:   .cfi_def_cfa %rsp, 8
++; CHECK-NEXT:   retq
++
++
++  %a = alloca i32, i32 1000, align 1024
++  %b = getelementptr inbounds i32, i32* %a, i64 %i
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++; | case4 | alloca + probe_size < probe_size, followed by dynamic alloca
++define i32 @foo4(i64 %i) local_unnamed_addr #0 {
++; CHECK-LABEL: foo4:
++; CHECK:        # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:	pushq	%rbx
++; CHECK-NEXT:	andq	$-64, %rsp
++; CHECK-NEXT:	subq	$896, %rsp                      # imm = 0x380
++; CHECK-NEXT:	movq	%rsp, %rbx
++; CHECK-NEXT:	.cfi_offset %rbx, -24
++; CHECK-NEXT:	movl	$1, (%rbx,%rdi,4)
++; CHECK-NEXT:	movl	(%rbx), %ecx
++; CHECK-NEXT:	movq	%rsp, %rax
++; CHECK-NEXT:	leaq	15(,%rcx,4), %rcx
++; CHECK-NEXT:	andq	$-16, %rcx
++; CHECK-NEXT:	subq	%rcx, %rax
++; CHECK-NEXT:	cmpq	%rsp, %rax
++; CHECK-NEXT:	jge	.LBB3_3
++; CHECK-NEXT:.LBB3_2:                                # =>This Inner Loop Header: Depth=1
++; CHECK-NEXT:	xorq	$0, (%rsp)
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	cmpq	%rsp, %rax
++; CHECK-NEXT:	jl	.LBB3_2
++; CHECK-NEXT:.LBB3_3:
++; CHECK-NEXT:	andq	$-64, %rax
++; CHECK-NEXT:	movq	%rax, %rsp
++; CHECK-NEXT:	movl	(%rax), %eax
++; CHECK-NEXT:	leaq	-8(%rbp), %rsp
++; CHECK-NEXT:	popq	%rbx
++; CHECK-NEXT:	popq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa %rsp, 8
++; CHECK-NEXT:	retq
++
++  %a = alloca i32, i32 200, align 64
++  %b = getelementptr inbounds i32, i32* %a, i64 %i
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  %d = alloca i32, i32 %c, align 64
++  %e = load volatile i32, i32* %d
++  ret i32 %e
++}
++
++attributes #0 =  {"probe-stack"="inline-asm"}
++
+Index: llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-small-large-align.ll
+===================================================================
+--- /dev/null
++++ llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-small-large-align.ll
+@@ -0,0 +1,83 @@
++; RUN: llc < %s | FileCheck %s
++
++
++target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
++target triple = "x86_64-unknown-linux-gnu"
++
++define i32 @foo_noprotect() local_unnamed_addr {
++; CHECK-LABEL: foo_noprotect:
++; CHECK:       # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:	andq	$-65536, %rsp
++; CHECK-NEXT:	subq	$65536, %rsp
++; CHECK-NEXT:	movl	$1, 392(%rsp)
++; CHECK-NEXT:	movl	(%rsp), %eax
++; CHECK-NEXT:	movq	%rbp, %rsp
++; CHECK-NEXT:	popq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa %rsp, 8
++; CHECK-NEXT:	retq
++
++
++
++  %a = alloca i32, i64 100, align 65536
++  %b = getelementptr inbounds i32, i32* %a, i64 98
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++define i32 @foo_protect() local_unnamed_addr #0 {
++; CHECK-LABEL: foo_protect:
++; CHECK:       # %bb.0:
++; CHECK-NEXT:	pushq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa_offset 16
++; CHECK-NEXT:	.cfi_offset %rbp, -16
++; CHECK-NEXT:	movq	%rsp, %rbp
++; CHECK-NEXT:	.cfi_def_cfa_register %rbp
++; CHECK-NEXT:	movq	%rsp, %r11
++; CHECK-NEXT:	andq	$-65536, %r11                   # imm = 0xFFFF0000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	je	.LBB1_4
++; CHECK-NEXT:# %bb.1:
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	jb	.LBB1_3
++; CHECK-NEXT:.LBB1_2:                                # =>This Inner Loop Header: Depth=1
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	cmpq	%rsp, %r11
++; CHECK-NEXT:	jb	.LBB1_2
++; CHECK-NEXT:.LBB1_3:
++; CHECK-NEXT:	movq	%r11, %rsp
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:.LBB1_4:
++; CHECK-NEXT:	movq	%rsp, %r11
++; CHECK-NEXT:	subq	$65536, %r11                    # imm = 0x10000
++; CHECK-NEXT:.LBB1_5:                                # =>This Inner Loop Header: Depth=1
++; CHECK-NEXT:	subq	$4096, %rsp                     # imm = 0x1000
++; CHECK-NEXT:	movq	$0, (%rsp)
++; CHECK-NEXT:	cmpq	%r11, %rsp
++; CHECK-NEXT:	jne	.LBB1_5
++; CHECK-NEXT:# %bb.6:
++; CHECK-NEXT:	movl	$1, 392(%rsp)
++; CHECK-NEXT:	movl	(%rsp), %eax
++; CHECK-NEXT:	movq	%rbp, %rsp
++; CHECK-NEXT:	popq	%rbp
++; CHECK-NEXT:	.cfi_def_cfa %rsp, 8
++; CHECK-NEXT:	retq
++
++
++
++
++  %a = alloca i32, i64 100, align 65536
++  %b = getelementptr inbounds i32, i32* %a, i64 98
++  store volatile i32 1, i32* %b
++  %c = load volatile i32, i32* %a
++  ret i32 %c
++}
++
++attributes #0 =  {"probe-stack"="inline-asm"}
+Index: llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86ISelLowering.cpp
+===================================================================
+--- llvm-toolchain-11-11.0.0.orig/llvm/lib/Target/X86/X86ISelLowering.cpp
++++ llvm-toolchain-11-11.0.0/llvm/lib/Target/X86/X86ISelLowering.cpp
+@@ -31876,7 +31876,7 @@ X86TargetLowering::EmitLoweredProbedAllo
+ 
+   BuildMI(testMBB, DL, TII->get(X86::JCC_1))
+       .addMBB(tailMBB)
+-      .addImm(X86::COND_L);
++      .addImm(X86::COND_GE);
+   testMBB->addSuccessor(blockMBB);
+   testMBB->addSuccessor(tailMBB);
+ 
+@@ -31892,9 +31892,9 @@ X86TargetLowering::EmitLoweredProbedAllo
+   //
+   // The property we want to enforce is to never have more than [page alloc] between two probes.
+ 
+-  const unsigned MovMIOpc =
+-      TFI.Uses64BitFramePtr ? X86::MOV64mi32 : X86::MOV32mi;
+-  addRegOffset(BuildMI(blockMBB, DL, TII->get(MovMIOpc)), physSPReg, false, 0)
++  const unsigned XORMIOpc =
++      TFI.Uses64BitFramePtr ? X86::XOR64mi8 : X86::XOR32mi8;
++  addRegOffset(BuildMI(blockMBB, DL, TII->get(XORMIOpc)), physSPReg, false, 0)
+       .addImm(0);
+ 
+   BuildMI(blockMBB, DL,
+Index: llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-dynamic-alloca.ll
+===================================================================
+--- llvm-toolchain-11-11.0.0.orig/llvm/test/CodeGen/X86/stack-clash-dynamic-alloca.ll
++++ llvm-toolchain-11-11.0.0/llvm/test/CodeGen/X86/stack-clash-dynamic-alloca.ll
+@@ -24,12 +24,12 @@ attributes #0 =  {"probe-stack"="inline-
+ ; CHECK-X86-64-NEXT:  	andq	$-16, %rcx
+ ; CHECK-X86-64-NEXT:  	subq	%rcx, %rax
+ ; CHECK-X86-64-NEXT:  	cmpq	%rsp, %rax
+-; CHECK-X86-64-NEXT:  	jl	.LBB0_3
++; CHECK-X86-64-NEXT:  	jge .LBB0_3
+ ; CHECK-X86-64-NEXT:  .LBB0_2: # =>This Inner Loop Header: Depth=1
+-; CHECK-X86-64-NEXT:  	movq	$0, (%rsp)
++; CHECK-X86-64-NEXT:  	xorq  $0, (%rsp)
+ ; CHECK-X86-64-NEXT:  	subq	$4096, %rsp # imm = 0x1000
+ ; CHECK-X86-64-NEXT:  	cmpq	%rsp, %rax
+-; CHECK-X86-64-NEXT:  	jge	.LBB0_2
++; CHECK-X86-64-NEXT:  	jl	.LBB0_2
+ ; CHECK-X86-64-NEXT:  .LBB0_3:
+ ; CHECK-X86-64-NEXT:  	movq	%rax, %rsp
+ ; CHECK-X86-64-NEXT:  	movl	$1, 4792(%rax)
+@@ -54,12 +54,12 @@ attributes #0 =  {"probe-stack"="inline-
+ ; CHECK-X86-32-NEXT:    andl    $-16, %ecx
+ ; CHECK-X86-32-NEXT:    subl    %ecx, %eax
+ ; CHECK-X86-32-NEXT:    cmpl    %esp, %eax
+-; CHECK-X86-32-NEXT:    jl  .LBB0_3
++; CHECK-X86-32-NEXT:    jge  .LBB0_3
+ ; CHECK-X86-32-NEXT:  .LBB0_2: # =>This Inner Loop Header: Depth=1
+-; CHECK-X86-32-NEXT:    movl    $0, (%esp)
++; CHECK-X86-32-NEXT:    xorl    $0, (%esp)
+ ; CHECK-X86-32-NEXT:    subl    $4096, %esp # imm = 0x1000
+ ; CHECK-X86-32-NEXT:    cmpl    %esp, %eax
+-; CHECK-X86-32-NEXT:    jge .LBB0_2
++; CHECK-X86-32-NEXT:    jl .LBB0_2
+ ; CHECK-X86-32-NEXT:  .LBB0_3:
+ ; CHECK-X86-32-NEXT:    movl    %eax, %esp
+ ; CHECK-X86-32-NEXT:    movl    $1, 4792(%eax)
diff -Nru firefox-84.0.2+build1/build/build-rust/example.patch firefox-85.0+build1/build/build-rust/example.patch
--- firefox-84.0.2+build1/build/build-rust/example.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/build/build-rust/example.patch	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,12 @@
+diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
+index 2a4c42ea0a4..c94b24e9cb1 100644
+--- a/CONTRIBUTING.md
++++ b/CONTRIBUTING.md
+@@ -1,5 +1,7 @@
+ # Contributing to Rust
+ 
++Hello this is a harmless little example patch!
++
+ Thank you for your interest in contributing to Rust!
+ 
+ To get started, read the [Getting Started] guide in the [rustc-dev-guide].
diff -Nru firefox-84.0.2+build1/build/build-rust/README firefox-85.0+build1/build/build-rust/README
--- firefox-84.0.2+build1/build/build-rust/README	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/build/build-rust/README	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,3 @@
+This directory is for patches to rust toolchains, see these docs for details:
+
+https://firefox-source-docs.mozilla.org/build/buildsystem/toolchains.html
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/build/clang-plugin/ThreadAllows.txt firefox-85.0+build1/build/clang-plugin/ThreadAllows.txt
--- firefox-84.0.2+build1/build/clang-plugin/ThreadAllows.txt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/clang-plugin/ThreadAllows.txt	2021-01-18 19:58:08.000000000 +0000
@@ -8,10 +8,8 @@
 AwaitIdlePaused
 BGReadURLs
 BHMgr Processor
-BgFileSaver
 COM Intcpt Log
 COM MTA
-Cache Deleter
 Cache I/O
 Cameras IPC
 ChainedPipePump
@@ -51,7 +49,6 @@
 MediaTrackGrph
 mtransport
 NamedPipeSrv
-NetPredictClean
 Netlink Monitor
 OSKeyStore
 OutputDrain
@@ -75,7 +72,6 @@
 SuicideManager
 SuicideThread
 TEQ AwaitIdle
-TelemetryGVIO
 Test Thread
 Test thread
 TestPipe
diff -Nru firefox-84.0.2+build1/build/common_virtualenv_packages.txt firefox-85.0+build1/build/common_virtualenv_packages.txt
--- firefox-84.0.2+build1/build/common_virtualenv_packages.txt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/common_virtualenv_packages.txt	2021-01-18 19:58:08.000000000 +0000
@@ -44,9 +44,6 @@
 mozilla.pth:third_party/python/python-hglib
 mozilla.pth:third_party/python/pluggy
 mozilla.pth:third_party/python/jsmin
-!windows:optional:setup.py:third_party/python/psutil:build_ext:--inplace
-!windows:mozilla.pth:third_party/python/psutil
-windows:mozilla.pth:third_party/python/psutil-cp27-none-win_amd64
 mozilla.pth:third_party/python/pylru
 mozilla.pth:third_party/python/pystache
 python2:mozilla.pth:third_party/python/PyYAML/lib
diff -Nru firefox-84.0.2+build1/build/debian-packages/valgrind-jessie.diff firefox-85.0+build1/build/debian-packages/valgrind-jessie.diff
--- firefox-84.0.2+build1/build/debian-packages/valgrind-jessie.diff	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/debian-packages/valgrind-jessie.diff	2021-01-18 19:58:08.000000000 +0000
@@ -1,43 +1,45 @@
-diff -Nru valgrind-3.15.0/debian/changelog valgrind-3.15.0/debian/changelog
---- valgrind-3.15.0/debian/changelog	2019-07-14 19:23:29.000000000 +0900
-+++ valgrind-3.15.0/debian/changelog	2019-07-17 18:19:13.000000000 +0900
-@@ -1,3 +1,13 @@
-+valgrind (1:3.15.0-1.deb8moz1) jessie; urgency=medium
+diff -Nru valgrind-3.16.1/debian/changelog valgrind-3.16.1/debian/changelog
+--- valgrind-3.16.1/debian/changelog	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/changelog	2020-12-09 09:17:53.000000000 +0900
+@@ -1,3 +1,16 @@
++valgrind (1:3.16.1-1.deb8moz1) jessie; urgency=medium
 +
 +  * Mozilla backport for jessie.
 +  * debian/control, debian/compat: Drop debhelper compat back to 9, which
 +    requires adding back an explicit dependency on dh-autoreconf.
-+  * debian/rules: Debhelper only defaulted to --parallel in compat >= 10, so
-+    add --parallel back.
++  * debian/rules:
++    - Debhelper only defaulted to --parallel in compat >= 10, so add
++      --parallel back.
++    - Add an explicit --libexecdir to match that of debhelper compat level >=
++      12.
 +
-+ -- Mike Hommey <glandium@mozilla.com>  Wed, 17 Jul 2019 18:19:13 +0900
++ -- Mike Hommey <glandium@mozilla.com>  Wed, 9 Dec 2020 09:17:53 +0900
 +
- valgrind (1:3.15.0-1) unstable; urgency=medium
+ valgrind (1:3.16.1-1) unstable; urgency=medium
  
    * New upstream release
-diff -Nru valgrind-3.15.0/debian/compat valgrind-3.15.0/debian/compat
---- valgrind-3.15.0/debian/compat	2019-07-14 19:23:29.000000000 +0900
-+++ valgrind-3.15.0/debian/compat	2019-07-17 18:19:13.000000000 +0900
-@@ -1 +1 @@
--12
+diff -Nru valgrind-3.16.1/debian/compat valgrind-3.16.1/debian/compat
+--- valgrind-3.16.1/debian/compat	1970-01-01 09:00:00.000000000 +0900
++++ valgrind-3.16.1/debian/compat	2020-12-09 09:15:49.000000000 +0900
+@@ -0,0 +1 @@
 +9
-diff -Nru valgrind-3.15.0/debian/control valgrind-3.15.0/debian/control
---- valgrind-3.15.0/debian/control	2019-07-14 19:23:29.000000000 +0900
-+++ valgrind-3.15.0/debian/control	2019-07-17 18:19:13.000000000 +0900
+diff -Nru valgrind-3.16.1/debian/control valgrind-3.16.1/debian/control
+--- valgrind-3.16.1/debian/control	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/control	2020-12-09 09:17:53.000000000 +0900
 @@ -2,7 +2,8 @@
  Section: devel
  Priority: optional
  Maintainer: Alessandro Ghedini <ghedo@debian.org>
--Build-Depends: debhelper (>= 12),
+-Build-Depends: debhelper-compat (= 13),
 +Build-Depends: debhelper (>= 9),
 + dh-autoreconf,
   gdb,
   gcc-multilib [amd64],
   libc6-dev-i386 [amd64],
-diff -Nru valgrind-3.15.0/debian/rules valgrind-3.15.0/debian/rules
---- valgrind-3.15.0/debian/rules	2019-07-14 19:23:29.000000000 +0900
-+++ valgrind-3.15.0/debian/rules	2019-07-17 18:19:13.000000000 +0900
-@@ -11,7 +11,7 @@
+diff -Nru valgrind-3.16.1/debian/rules valgrind-3.16.1/debian/rules
+--- valgrind-3.16.1/debian/rules	2020-06-29 02:49:18.000000000 +0900
++++ valgrind-3.16.1/debian/rules	2020-12-09 09:17:53.000000000 +0900
+@@ -11,16 +11,16 @@
  LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
  
  %:
@@ -45,8 +47,10 @@
 +	dh $@ --parallel --with=autoreconf
  
  override_dh_auto_configure:
- 	dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-@@ -20,7 +20,7 @@
+-	dh_auto_configure -- --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	dh_auto_configure -- --libexecdir=/usr/libexec --enable-tls CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ 
+ override_dh_auto_test:
  	: # do nothing for now
  
  override_dh_auto_build:
diff -Nru firefox-84.0.2+build1/build/docs/sccache-dist.rst firefox-85.0+build1/build/docs/sccache-dist.rst
--- firefox-84.0.2+build1/build/docs/sccache-dist.rst	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/docs/sccache-dist.rst	2021-01-18 19:58:08.000000000 +0000
@@ -89,12 +89,12 @@
 * Compiling from a Windows client is supported but hasn't seen as much testing
   as other platforms. The following example mozconfig can be used as a guide::
 
-    ac_add_options CCACHE=/path/to/home/.mozbuild/sccache/sccache.exe
+    ac_add_options CCACHE="C:/Users/<USER>/.mozbuild/sccache/sccache.exe"
 
-    export CC="/path/to/home/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
-    export CXX="/path/to/home/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
-    export HOST_CC="/path/to/home/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
-    export HOST_CXX="/path/to/home/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
+    export CC="C:/Users/<USER>/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
+    export CXX="C:/Users/<USER>/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
+    export HOST_CC="C:/Users/<USER>/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
+    export HOST_CXX="C:/Users/<USER>/.mozbuild/clang/bin/clang-cl.exe --driver-mode=cl"
 
   The client config should be located at
   ``~/AppData/Roaming/Mozilla/sccache/config/config``, and as on macOS custom
@@ -135,7 +135,7 @@
 * When attempting to get your client running, the output of ``sccache -s`` should
   be consulted to confirm compilations are being distributed. To receive helpful
   logging from the local daemon in case they aren't, run
-  ``SCCACHE_NO_DAEMON=1 SCCACHE_LOG=sccache=trace path/to/sccache --start-server``
+  ``SCCACHE_NO_DAEMON=1 SCCACHE_START_SERVER=1 SCCACHE_LOG=sccache=trace path/to/sccache``
   in a terminal window separate from your build prior to building. *NOTE* use
   ``RUST_LOG`` instead of ``SCCACHE_LOG`` if your build of ``sccache`` does not
   include `pull request 822
diff -Nru firefox-84.0.2+build1/build/docs/toolchains.rst firefox-85.0+build1/build/docs/toolchains.rst
--- firefox-84.0.2+build1/build/docs/toolchains.rst	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/docs/toolchains.rst	2021-01-18 19:58:08.000000000 +0000
@@ -7,11 +7,121 @@
 There are various scripts in the repository for producing archives
 of the build tools (e.g. compilers and linkers) required to build.
 
+Clang and Rust
+==============
+
+To modify the toolchains used for a particular task, you may need several
+things:
+
+1. A `build task`_
+
+2. Which uses a toolchain task
+
+    - `clang toolchain`_
+    - `rust toolchain`_
+
+3. Which uses a git fetch
+
+    - `clang fetch`_
+    - (from-source ``dev`` builds only) `rust fetch`_
+
+4. (clang only) Which uses a `config json`_
+
+5. Which takes patches_ you may want to apply.
+
+For the most part, you should be able to accomplish what you want by
+copying/editing the existing examples in those files.
+
+.. _build task: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/build/linux.yml#5-45
+.. _clang toolchain: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/toolchain/clang.yml#51-72
+.. _rust toolchain: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/toolchain/rust.yml#57-74
+.. _clang fetch: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/fetch/toolchains.yml#413-418
+.. _rust fetch: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/fetch/toolchains.yml#434-439
+.. _config json: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/build/build-clang/clang-linux64.json
+.. _patches: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/build/build-clang/static-llvm-symbolizer.patch
+
 Clang
-=====
+-----
+
+Building clang is handled by `build-clang.py`_, which uses several resources
+in the `build-clang`_ directory. Read the `build-clang README`_ for more
+details.
+
+.. _build-clang.py: https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.py
+.. _build-clang README: https://searchfox.org/mozilla-central/source/build/build-clang/README
+.. _build-clang: https://searchfox.org/mozilla-central/source/build/build-clang/
+
+Rust
+----
+
+Rust builds are handled by `repack_rust.py`_. The primary purpose of
+that script is to download prebuilt tarballs from the Rust project.
+
+It uses the same basic format as `rustup` for specifying the toolchain
+(via ``--channel``):
+
+- request a stable build with ``1.xx.y`` (e.g. ``1.47.0``)
+- request a beta build with ``beta-yyyy-mm-dd`` (e.g. ``beta-2020-08-26``)
+- request a nightly build with ``nightly-yyyy-mm-dd`` (e.g. ``nightly-2020-08-26``)
+- request a build from `Rust's ci`_ with ``bors-$sha`` (e.g. ``bors-796a2a9bbe7614610bd67d4cd0cf0dfff0468778``)
+- request a from-source build with ``dev``
+
+Rust From Source
+----------------
+
+As of this writing, from-source builds for Rust are a new feature, and not
+used anywhere by default. The feature was added so that we can test patches
+to rustc against the tree. Expect things to be a bit hacky and limited.
+
+Most importantly, building from source requires your toolchain to have a
+`fetch of the rust tree`_ as well as `clang and binutils toolchains`_. It is also
+recommended to upgrade the worker-type to e.g. ``b-linux-large``.
+
+Rust's build dependencies are fairly minimal, and it has a sanity check
+that should catch any missing or too-old dependencies. See the `Rust README`_
+for more details.
+
+Patches are set via `the --patch flag`_ (passed via ``toolchain/rust.yml``).
+Patch paths are assumed to be relative to ``/build/build-rust/``, and may be
+optionally prefixed with ``module-path:`` to specify they apply to that git
+submodule in the Rust source. e.g. ``--patch src/llvm-project:mypatch.diff``
+patches rust's llvm with ``/build/build-rust/mypatch.diff``. There are no
+currently checked in rust patches to use as an example, but they should be
+the same format as `the clang ones`_.
+
+Rust builds are not currently configurable, and uses a `hardcoded config.toml`_,
+which you may need to edit for your purposes. See Rust's `example config`_ for
+details/defaults. Note that these options do occasionally change, so be sure
+you're using options for the version you're targeting. For instance, there was
+a large change around Rust ~1.48, and the currently checked in config was for
+1.47, so it may not work properly when building the latest version of Rust.
+
+Rust builds are currently limited to targeting only the host platform.
+Although the machinery is in place to request additional targets, the
+cross-compilation fails for some unknown reason. We have not yet investigated
+what needs to be done to get this working.
+
+While Rust generally maintains a clean tree for building ``rustc`` and
+``cargo``, other tools like ``rustfmt`` or ``miri`` are allowed to be
+transiently broken. This means not every commit in the Rust tree will be
+able to build the `tools we require`_.
+
+Although ``repack_rust`` considers ``rustfmt`` an optional package, Rust builds
+do not currently implement this and will fail if ``rustfmt`` is busted. Some
+attempt was made to work around it, but `more work is needed`_.
+
+.. _Rust's ci: https://github.com/rust-lang/rust/pull/77875#issuecomment-736092083
+.. _repack_rust.py: https://searchfox.org/mozilla-central/source/taskcluster/scripts/misc/repack_rust.py
+.. _fetch of the rust tree: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/toolchain/rust.yml#69-71
+.. _clang and binutils toolchains: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/ci/toolchain/rust.yml#72-74
+.. _the --patch flag: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/scripts/misc/repack_rust.py#667-675
+.. _the clang ones: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/build/build-clang/static-llvm-symbolizer.patch
+.. _Rust README: https://github.com/rust-lang/rust/#building-on-a-unix-like-system
+.. _hardcoded config.toml: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/scripts/misc/repack_rust.py#384-421
+.. _example config: https://github.com/rust-lang/rust/blob/b7ebc6b0c1ba3c27ebb17c0b496ece778ef11e18/config.toml.example
+.. _tools we require: https://searchfox.org/mozilla-central/rev/168c45a7acc44e9904cfd4eebcb9eb080e05699c/taskcluster/scripts/misc/repack_rust.py#398
+.. _more work is needed: https://github.com/rust-lang/rust/issues/79249
 
-See the ``build/build-clang`` directory. Read ``build/build-clang/README``
-for more.
 
 Windows
 =======
diff -Nru firefox-84.0.2+build1/build/gyp.mozbuild firefox-85.0+build1/build/gyp.mozbuild
--- firefox-84.0.2+build1/build/gyp.mozbuild	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/gyp.mozbuild	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 gyp_vars.update({
     'lsan': 0,
     'asan': 0,
+    'tsan': 1 if CONFIG['MOZ_TSAN'] else 0,
     'ubsan' : 0,
     'fuzzing' : 1 if CONFIG['FUZZING'] else 0,
     'libfuzzer' : 1 if CONFIG['LIBFUZZER'] else 0,
diff -Nru firefox-84.0.2+build1/build/mach_bootstrap.py firefox-85.0+build1/build/mach_bootstrap.py
--- firefox-84.0.2+build1/build/mach_bootstrap.py	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/mach_bootstrap.py	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 import math
 import os
 import platform
+import shutil
 import subprocess
 import sys
 import uuid
@@ -197,6 +198,13 @@
         print("You are running Python", platform.python_version())
         sys.exit(1)
 
+    # This directory was deleted in bug 1666345, but there may be some ignored
+    # files here. We can safely just delete it for the user so they don't have
+    # to clean the repo themselves.
+    deleted_dir = os.path.join(topsrcdir, "third_party", "python", "psutil")
+    if os.path.exists(deleted_dir):
+        shutil.rmtree(deleted_dir, ignore_errors=True)
+
     # Global build system and mach state is stored in a central directory. By
     # default, this is ~/.mozbuild. However, it can be defined via an
     # environment variable. We detect first run (by lack of this directory
@@ -503,7 +511,8 @@
 
     has_psutil, logical_cores, physical_cores, memory_total = get_psutil_stats()
     if has_psutil:
-        # psutil may not be available if a successful build hasn't occurred yet.
+        # psutil may not be available (we allow `mach create-mach-environment`
+        # to fail to install it).
         system_metrics.logical_cores.add(logical_cores)
         system_metrics.physical_cores.add(physical_cores)
         if memory_total is not None:
diff -Nru firefox-84.0.2+build1/build/macosx/cross-mozconfig.common firefox-85.0+build1/build/macosx/cross-mozconfig.common
--- firefox-84.0.2+build1/build/macosx/cross-mozconfig.common	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/macosx/cross-mozconfig.common	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,7 @@
 #   tar -C $(dirname ${sdk_path}) -cHjf /tmp/$(basename ${sdk_path}).tar.bz2 $(basename ${sdk_path})
 # Upload the resulting tarball from /tmp to tooltool, and change the entry in
 # `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`.
-CROSS_SYSROOT=$topsrcdir/MacOSX10.11.sdk
+CROSS_SYSROOT=$topsrcdir/MacOSX10.12.sdk
 
 export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
 export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++"
diff -Nru firefox-84.0.2+build1/build/moz.configure/flags.configure firefox-85.0+build1/build/moz.configure/flags.configure
--- firefox-84.0.2+build1/build/moz.configure/flags.configure	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/moz.configure/flags.configure	2021-01-18 19:58:08.000000000 +0000
@@ -40,13 +40,10 @@
     host,
     target,
     "MOZ_PGO",
-    lto.enabled,
     enable_fuzzing,
     ubsan,
 )
-def new_pass_manager_flags(
-    enabled, compiler, host, target, pgo, lto, enable_fuzzing, ubsan
-):
+def new_pass_manager_flags(enabled, compiler, host, target, pgo, enable_fuzzing, ubsan):
     if host.os == "OSX":
         # Some native Mac builds hang with the new pass manager. Given the
         # inability to test in CI, don't take the risk of further breakage.
@@ -57,10 +54,6 @@
         # too tedious to test them all here. PGO is the only thing that matters
         # enough to make an exception for.
         return None
-    if target.os == "WINNT" and target.cpu == "aarch64" and not lto:
-        # Building without LTO on aarch64-windows fails on some large functions
-        # because clang doesn't know how to split SEH unwind info.
-        return None
     if enable_fuzzing and compiler.version < "10.0.0":
         # Clang 9 does not seem to play well with libFuzzer
         return None
diff -Nru firefox-84.0.2+build1/build/moz.configure/lto-pgo.configure firefox-85.0+build1/build/moz.configure/lto-pgo.configure
--- firefox-84.0.2+build1/build/moz.configure/lto-pgo.configure	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/moz.configure/lto-pgo.configure	2021-01-18 19:58:08.000000000 +0000
@@ -183,12 +183,24 @@
 @depends(
     "--enable-lto",
     c_compiler,
+    select_linker,
+    "MOZ_AUTOMATION",
     "MOZ_LD64_KNOWN_GOOD",
     target,
     "--enable-profile-generate",
+    new_pass_manager_flags,
 )
 @imports("multiprocessing")
-def lto(value, c_compiler, ld64_known_good, target, instrumented_build):
+def lto(
+    value,
+    c_compiler,
+    select_linker,
+    automation,
+    ld64_known_good,
+    target,
+    instrumented_build,
+    newpm_flags,
+):
     cflags = []
     ldflags = []
     enabled = None
@@ -265,10 +277,13 @@
             # instruction sets.
         else:
             num_cores = multiprocessing.cpu_count()
-            if len(value) and value[0].lower() == "full":
-                cflags.append("-flto")
+            if len(value) and value[0].lower() == "thin":
+                die(
+                    "gcc does not support thin LTO. Use `--enable-lto` "
+                    "to enable full LTO for gcc."
+                )
             else:
-                cflags.append("-flto=thin")
+                cflags.append("-flto")
             cflags.append("-flifetime-dse=1")
 
             ldflags.append("-flto=%s" % num_cores)
@@ -284,6 +299,20 @@
         elif c_compiler.type == "clang":
             ldflags.append("-Wl,-plugin-opt=-import-instr-limit=10")
 
+        # If we're using the new pass manager, we can also enable the new PM
+        # during LTO. Further we can use the resulting size savings to increase
+        # the import limit in hot functions.
+        if newpm_flags:
+            if target.os == "WINNT":
+                # On Windows, this flag requires a change from clang-12, which
+                # is applied as a patch to our automation toolchain.
+                if automation or c_compiler.version >= "12.0.0":
+                    ldflags.append("-opt:ltonewpassmanager")
+                    ldflags.append("-mllvm:-import-hot-multiplier=30")
+            elif select_linker.KIND != "ld64" and c_compiler.type == "clang":
+                ldflags.append("-Wl,-plugin-opt=new-pass-manager")
+                ldflags.append("-Wl,-plugin-opt=-import-hot-multiplier=30")
+
     return namespace(
         enabled=enabled,
         cflags=cflags,
diff -Nru firefox-84.0.2+build1/build/moz.configure/nss.configure firefox-85.0+build1/build/moz.configure/nss.configure
--- firefox-84.0.2+build1/build/moz.configure/nss.configure	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/moz.configure/nss.configure	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,7 @@
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 
 nss_pkg = pkg_check_modules(
-    "NSS", "nss >= 3.59.1", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.60", when="--with-system-nss", config=False
 )
 
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
diff -Nru firefox-84.0.2+build1/build/moz.configure/rust.configure firefox-85.0+build1/build/moz.configure/rust.configure
--- firefox-84.0.2+build1/build/moz.configure/rust.configure	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/moz.configure/rust.configure	2021-01-18 19:58:08.000000000 +0000
@@ -147,10 +147,10 @@
     )
 
 
-@depends(rustc_info, cargo_info, build_project, c_compiler, target)
+@depends(rustc_info, cargo_info, build_project)
 @imports(_from="mozboot.util", _import="MINIMUM_RUST_VERSION")
 @imports(_from="textwrap", _import="dedent")
-def rust_compiler(rustc_info, cargo_info, build_project, c_compiler, target):
+def rust_compiler(rustc_info, cargo_info, build_project):
     if not rustc_info:
         die(
             dedent(
@@ -165,9 +165,7 @@
             )
         )
     if build_project == "tools/crashreporter":
-        rustc_min_version = Version("1.38.0")
-    elif target.os == "WINNT" and c_compiler.type != "clang-cl":
-        rustc_min_version = Version("1.44.0")
+        rustc_min_version = Version("1.47.0")
     else:
         rustc_min_version = Version(MINIMUM_RUST_VERSION)
     cargo_min_version = rustc_min_version
diff -Nru firefox-84.0.2+build1/build/moz.configure/toolchain.configure firefox-85.0+build1/build/moz.configure/toolchain.configure
--- firefox-84.0.2+build1/build/moz.configure/toolchain.configure	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/moz.configure/toolchain.configure	2021-01-18 19:58:08.000000000 +0000
@@ -114,7 +114,7 @@
         "--enable-macos-target",
         env="MACOSX_DEPLOYMENT_TARGET",
         nargs=1,
-        default=depends(target)(lambda t: "11.0" if t.cpu == "aarch64" else "10.9"),
+        default=depends(target)(lambda t: "11.0" if t.cpu == "aarch64" else "10.12"),
         help="Set the minimum MacOS version needed at runtime{|}",
     )
 
@@ -151,7 +151,7 @@
     @imports(_from="os.path", _import="isdir")
     @imports("plistlib")
     def macos_sdk(sdk, host):
-        sdk_min_version = Version("10.11")
+        sdk_min_version = Version("10.12")
         sdk_max_version = Version("11.0")
 
         if sdk:
@@ -415,6 +415,8 @@
                 version = Version("8.0.0")
             elif version < "12.0":
                 version = Version("9.0.0")
+            elif version < "12.0.1":
+                version = Version("10.0.0")
             else:
                 version = Version("10.0.0.or.more")
 
@@ -2143,9 +2145,13 @@
 
 
 @depends(
-    rustc_opt_level, debug_rust, "--enable-debug-symbols", "--enable-frame-pointers"
+    rustc_opt_level,
+    debug_rust,
+    target,
+    "--enable-debug-symbols",
+    "--enable-frame-pointers",
 )
-def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers):
+def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers):
     # Cargo currently supports only two interesting profiles for building:
     # development and release. Those map (roughly) to --enable-debug and
     # --disable-debug in Gecko, respectively.
@@ -2179,6 +2185,9 @@
         opts.append("debuginfo=%s" % debug_info)
     if frame_pointers:
         opts.append("force-frame-pointers=yes")
+    # CFG for arm64 is crashy, see `def security_hardening_cflags`.
+    if target.kernel == "WINNT" and target.cpu != "aarch64":
+        opts.append("control-flow-guard=yes")
 
     flags = []
     for opt in opts:
@@ -2745,6 +2754,9 @@
         # With this setup, we can still run files through these targets in TSan builds,
         # e.g. those obtained from regular fuzzing.
         # This code can be removed once libFuzzer has been made compatible with TSan.
+        #
+        # Also, this code needs to be kept in sync with certain gyp files, currently:
+        #   - dom/media/webrtc/transport/third_party/nICEr/nicer.gyp
         return namespace(no_link_flag_supported=False, use_flags=[])
 
     if value:
diff -Nru firefox-84.0.2+build1/build/non-unified-compat firefox-85.0+build1/build/non-unified-compat
--- firefox-84.0.2+build1/build/non-unified-compat	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/non-unified-compat	2021-01-18 19:58:08.000000000 +0000
@@ -63,4 +63,14 @@
 dom/url/
 dom/vr/
 dom/webauthn/
-dom/webbrowserpersist/
\ No newline at end of file
+dom/webbrowserpersist/
+dom/webgpu/
+dom/webidl/
+dom/webshare/
+dom/websocket/
+dom/workers/
+dom/worklet/
+dom/xhr/
+dom/xml/
+dom/xslt/
+dom/xul/
\ No newline at end of file
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/build/pgo/certs/cert9.db and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/build/pgo/certs/cert9.db differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/build/pgo/certs/key4.db and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/build/pgo/certs/key4.db differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/build/pgo/certs/mochitest.client and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/build/pgo/certs/mochitest.client differ
diff -Nru firefox-84.0.2+build1/build/valgrind/x86_64-pc-linux-gnu.sup firefox-85.0+build1/build/valgrind/x86_64-pc-linux-gnu.sup
--- firefox-84.0.2+build1/build/valgrind/x86_64-pc-linux-gnu.sup	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/valgrind/x86_64-pc-linux-gnu.sup	2021-01-18 19:58:08.000000000 +0000
@@ -232,7 +232,7 @@
    Bug 984196
    Memcheck:Leak
    ...
-   fun:glxtest
+   fun:childgltest
    ...
 }
 
diff -Nru firefox-84.0.2+build1/build/win64/mozconfig.asan firefox-85.0+build1/build/win64/mozconfig.asan
--- firefox-84.0.2+build1/build/win64/mozconfig.asan	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/build/win64/mozconfig.asan	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
 if [ -d "$MOZ_FETCHES_DIR/clang" ]; then
     CLANG_LIB_DIR="$(cd $MOZ_FETCHES_DIR/clang/lib/clang/* && cd lib/windows && pwd)"
 
-    export LIB=$LIB:$CLANG_LIB_DIR
+    export LIB=$CLANG_LIB_DIR
     export LDFLAGS="clang_rt.asan_dynamic-x86_64.lib clang_rt.asan_dynamic_runtime_thunk-x86_64.lib"
 
     export MOZ_COPY_PDBS=1
diff -Nru firefox-84.0.2+build1/BUILDID firefox-85.0+build1/BUILDID
--- firefox-84.0.2+build1/BUILDID	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/BUILDID	2021-01-18 20:09:52.000000000 +0000
@@ -1 +1 @@
-20210105180113
\ No newline at end of file
+20210118153634
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/caps/BasePrincipal.cpp firefox-85.0+build1/caps/BasePrincipal.cpp
--- firefox-84.0.2+build1/caps/BasePrincipal.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/BasePrincipal.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/ChromeUtils.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/Components.h"
@@ -105,7 +106,21 @@
 NS_IMETHODIMP
 BasePrincipal::GetSiteOrigin(nsACString& aSiteOrigin) {
   MOZ_ASSERT(mInitialized);
-  return GetOrigin(aSiteOrigin);
+
+  nsresult rv = GetSiteOriginNoSuffix(aSiteOrigin);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoCString suffix;
+  rv = GetOriginSuffix(suffix);
+  NS_ENSURE_SUCCESS(rv, rv);
+  aSiteOrigin.Append(suffix);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+BasePrincipal::GetSiteOriginNoSuffix(nsACString& aSiteOrigin) {
+  MOZ_ASSERT(mInitialized);
+  return GetOriginNoSuffix(aSiteOrigin);
 }
 
 // Returns the inner Json::value of the serialized principal
@@ -322,6 +337,19 @@
   return NS_OK;
 }
 
+bool BasePrincipal::FastSubsumesIgnoringFPD(
+    nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) {
+  MOZ_ASSERT(aOther);
+
+  if (Kind() == eContentPrincipal &&
+      !dom::ChromeUtils::IsOriginAttributesEqualIgnoringFPD(
+          mOriginAttributes, Cast(aOther)->mOriginAttributes)) {
+    return false;
+  }
+
+  return SubsumesInternal(aOther, aConsideration);
+}
+
 bool BasePrincipal::Subsumes(nsIPrincipal* aOther,
                              DocumentDomainConsideration aConsideration) {
   MOZ_ASSERT(aOther);
diff -Nru firefox-84.0.2+build1/caps/BasePrincipal.h firefox-85.0+build1/caps/BasePrincipal.h
--- firefox-84.0.2+build1/caps/BasePrincipal.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/BasePrincipal.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,26 +7,35 @@
 #ifndef mozilla_BasePrincipal_h
 #define mozilla_BasePrincipal_h
 
-#include "nsJSPrincipals.h"
-
-#include "mozilla/Attributes.h"
+#include <stdint.h>
+#include "ErrorList.h"
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/OriginAttributes.h"
-
-class nsAtom;
-class nsIContentSecurityPolicy;
-class nsIObjectOutputStream;
-class nsIObjectInputStream;
-class nsIURI;
+#include "mozilla/RefPtr.h"
+#include "nsAtom.h"
+#include "nsIPrincipal.h"
+#include "nsJSPrincipals.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
 
 class ExpandedPrincipal;
-
+class mozIDOMWindow;
+class nsIChannel;
+class nsIReferrerInfo;
+class nsISupports;
+class nsIURI;
 namespace Json {
 class Value;
 }
+
 namespace mozilla {
+
 namespace dom {
-class Document;
+enum class ReferrerPolicy : uint8_t;
 }
+
 namespace extensions {
 class WebExtensionPolicy;
 }
@@ -146,7 +155,8 @@
       bool* aIsInIsolatedMozBrowserElement) final;
   NS_IMETHOD GetUserContextId(uint32_t* aUserContextId) final;
   NS_IMETHOD GetPrivateBrowsingId(uint32_t* aPrivateBrowsingId) final;
-  NS_IMETHOD GetSiteOrigin(nsACString& aOrigin) override;
+  NS_IMETHOD GetSiteOrigin(nsACString& aSiteOrigin) final;
+  NS_IMETHOD GetSiteOriginNoSuffix(nsACString& aSiteOrigin) override;
   NS_IMETHOD IsThirdPartyURI(nsIURI* uri, bool* aRes) override;
   NS_IMETHOD IsThirdPartyPrincipal(nsIPrincipal* uri, bool* aRes) override;
   NS_IMETHOD IsThirdPartyChannel(nsIChannel* aChannel, bool* aRes) override;
@@ -321,8 +331,8 @@
       nsIURI* aURI, const OriginAttributes& aAttrs,
       const nsACString& aOriginNoSuffix);
 
-  inline bool FastSubsumesIgnoringFPD(
-      nsIPrincipal* aOther, DocumentDomainConsideration aConsideration);
+  bool FastSubsumesIgnoringFPD(nsIPrincipal* aOther,
+                               DocumentDomainConsideration aConsideration);
 
   RefPtr<nsAtom> mOriginNoSuffix;
   RefPtr<nsAtom> mOriginSuffix;
@@ -397,19 +407,6 @@
   return Subsumes(aOther, ConsiderDocumentDomain);
 }
 
-inline bool BasePrincipal::FastSubsumesIgnoringFPD(
-    nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) {
-  MOZ_ASSERT(aOther);
-
-  if (Kind() == eContentPrincipal &&
-      !dom::ChromeUtils::IsOriginAttributesEqualIgnoringFPD(
-          mOriginAttributes, Cast(aOther)->mOriginAttributes)) {
-    return false;
-  }
-
-  return SubsumesInternal(aOther, aConsideration);
-}
-
 inline bool BasePrincipal::FastSubsumesIgnoringFPD(nsIPrincipal* aOther) {
   return FastSubsumesIgnoringFPD(aOther, DontConsiderDocumentDomain);
 }
diff -Nru firefox-84.0.2+build1/caps/ContentPrincipal.cpp firefox-85.0+build1/caps/ContentPrincipal.cpp
--- firefox-84.0.2+build1/caps/ContentPrincipal.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/ContentPrincipal.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -440,7 +440,7 @@
 }
 
 NS_IMETHODIMP
-ContentPrincipal::GetSiteOrigin(nsACString& aSiteOrigin) {
+ContentPrincipal::GetSiteOriginNoSuffix(nsACString& aSiteOrigin) {
   // Handle some special URIs first.
   nsAutoCString baseDomain;
   bool handled;
@@ -450,7 +450,7 @@
   if (handled) {
     // This is a special URI ("file:", "about:", "view-source:", etc). Just
     // return the origin.
-    return GetOrigin(aSiteOrigin);
+    return GetOriginNoSuffix(aSiteOrigin);
   }
 
   // For everything else, we ask the TLD service. Note that, unlike in
@@ -491,15 +491,7 @@
 
   rv = GenerateOriginNoSuffixFromURI(siteUri, aSiteOrigin);
   MOZ_ASSERT(NS_SUCCEEDED(rv), "failed to create siteOriginNoSuffix");
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoCString suffix;
-  rv = GetOriginSuffix(suffix);
-  MOZ_ASSERT(NS_SUCCEEDED(rv), "failed to create suffix");
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  aSiteOrigin.Append(suffix);
-  return NS_OK;
+  return rv;
 }
 
 nsresult ContentPrincipal::GetSiteIdentifier(SiteIdentifier& aSite) {
diff -Nru firefox-84.0.2+build1/caps/ContentPrincipal.h firefox-85.0+build1/caps/ContentPrincipal.h
--- firefox-84.0.2+build1/caps/ContentPrincipal.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/ContentPrincipal.h	2021-01-18 19:58:08.000000000 +0000
@@ -30,7 +30,7 @@
   NS_IMETHOD SetDomain(nsIURI* aDomain) override;
   NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
   NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
-  NS_IMETHOD GetSiteOrigin(nsACString& aSiteOrigin) override;
+  NS_IMETHOD GetSiteOriginNoSuffix(nsACString& aSiteOrigin) override;
   bool IsContentPrincipal() const override { return true; }
 
   ContentPrincipal();
diff -Nru firefox-84.0.2+build1/caps/nsIPrincipal.idl firefox-85.0+build1/caps/nsIPrincipal.idl
--- firefox-84.0.2+build1/caps/nsIPrincipal.idl	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/nsIPrincipal.idl	2021-01-18 19:58:08.000000000 +0000
@@ -418,12 +418,16 @@
      * For most principals, |siteOrigin| matches |origin| precisely. Only
      * principals which allow mutating |domain|, such as ContentPrincipal,
      * override the default implementation in BasePrincipal.
-     *
-     * TODO(nika): Use this in DocGroup.
      */
     readonly attribute ACString siteOrigin;
 
     /**
+     * The base part of |siteOrigin| without the concatenation with
+     * |originSuffix|.
+     */
+    readonly attribute ACString siteOriginNoSuffix;
+
+    /**
      * The base domain of the principal URI to which this principal pertains
      * (generally the document URI), handling null principals and
      * non-hierarchical schemes correctly.
diff -Nru firefox-84.0.2+build1/caps/nsJSPrincipals.h firefox-85.0+build1/caps/nsJSPrincipals.h
--- firefox-84.0.2+build1/caps/nsJSPrincipals.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/nsJSPrincipals.h	2021-01-18 19:58:08.000000000 +0000
@@ -6,9 +6,14 @@
 
 #ifndef nsJSPrincipals_h__
 #define nsJSPrincipals_h__
-#include "jsapi.h"
+
+#include "js/Principals.h"
 #include "nsIPrincipal.h"
 
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+
 namespace mozilla {
 namespace ipc {
 class PrincipalInfo;
diff -Nru firefox-84.0.2+build1/caps/OriginAttributes.h firefox-85.0+build1/caps/OriginAttributes.h
--- firefox-84.0.2+build1/caps/OriginAttributes.h	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/OriginAttributes.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_OriginAttributes_h
 #define mozilla_OriginAttributes_h
 
-#include "mozilla/dom/ChromeUtils.h"
 #include "mozilla/dom/ChromeUtilsBinding.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsIScriptSecurityManager.h"
diff -Nru firefox-84.0.2+build1/caps/tests/mochitest/mochitest.ini firefox-85.0+build1/caps/tests/mochitest/mochitest.ini
--- firefox-84.0.2+build1/caps/tests/mochitest/mochitest.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/tests/mochitest/mochitest.ini	2021-01-18 19:58:08.000000000 +0000
@@ -13,5 +13,4 @@
 [test_bug423375.html]
 [test_bug470804.html]
 [test_bug1367586.html]
-skip-if = fission # bug 1649329, intermittent even without fission
 [test_disallowInheritPrincipal.html]
diff -Nru firefox-84.0.2+build1/caps/tests/unit/test_site_origin.js firefox-85.0+build1/caps/tests/unit/test_site_origin.js
--- firefox-84.0.2+build1/caps/tests/unit/test_site_origin.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/caps/tests/unit/test_site_origin.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,112 @@
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const scriptSecMan = Services.scriptSecurityManager;
+
+function makeURI(uri) {
+  return Services.io.newURI(uri);
+}
+
+// SystemPrincipal checks
+let systemPrincipal = scriptSecMan.getSystemPrincipal();
+Assert.ok(systemPrincipal.isSystemPrincipal);
+Assert.equal(systemPrincipal.origin, "[System Principal]");
+Assert.equal(systemPrincipal.originNoSuffix, "[System Principal]");
+Assert.equal(systemPrincipal.siteOrigin, "[System Principal]");
+Assert.equal(systemPrincipal.siteOriginNoSuffix, "[System Principal]");
+
+// ContentPrincipal checks
+let uri1 = Services.io.newURI("http://example.com");
+let prinicpal1 = scriptSecMan.createContentPrincipal(uri1, {
+  userContextId: 11,
+});
+Assert.ok(prinicpal1.isContentPrincipal);
+Assert.equal(prinicpal1.origin, "http://example.com^userContextId=11");
+Assert.equal(prinicpal1.originNoSuffix, "http://example.com");
+Assert.equal(prinicpal1.siteOrigin, "http://example.com^userContextId=11");
+Assert.equal(prinicpal1.siteOriginNoSuffix, "http://example.com");
+
+let uri2 = Services.io.newURI("http://test1.example.com");
+let prinicpal2 = scriptSecMan.createContentPrincipal(uri2, {
+  userContextId: 22,
+});
+Assert.ok(prinicpal2.isContentPrincipal);
+Assert.equal(prinicpal2.origin, "http://test1.example.com^userContextId=22");
+Assert.equal(prinicpal2.originNoSuffix, "http://test1.example.com");
+Assert.equal(prinicpal2.siteOrigin, "http://example.com^userContextId=22");
+Assert.equal(prinicpal2.siteOriginNoSuffix, "http://example.com");
+
+let uri3 = Services.io.newURI("https://test1.test2.example.com:5555");
+let prinicpal3 = scriptSecMan.createContentPrincipal(uri3, {
+  userContextId: 5555,
+});
+Assert.ok(prinicpal3.isContentPrincipal);
+Assert.equal(
+  prinicpal3.origin,
+  "https://test1.test2.example.com:5555^userContextId=5555"
+);
+Assert.equal(prinicpal3.originNoSuffix, "https://test1.test2.example.com:5555");
+Assert.equal(prinicpal3.siteOrigin, "https://example.com^userContextId=5555");
+Assert.equal(prinicpal3.siteOriginNoSuffix, "https://example.com");
+
+let aboutURI = Services.io.newURI("about:preferences");
+let aboutPrincipal = scriptSecMan.createContentPrincipal(aboutURI, {
+  userContextId: 66,
+});
+Assert.ok(aboutPrincipal.isContentPrincipal);
+Assert.equal(aboutPrincipal.origin, "about:preferences^userContextId=66");
+Assert.equal(aboutPrincipal.originNoSuffix, "about:preferences");
+Assert.equal(aboutPrincipal.siteOrigin, "about:preferences^userContextId=66");
+Assert.equal(aboutPrincipal.siteOriginNoSuffix, "about:preferences");
+
+// NullPrincipal checks
+let nullPrincipal = scriptSecMan.createNullPrincipal({ userContextId: 33 });
+Assert.ok(nullPrincipal.isNullPrincipal);
+Assert.ok(nullPrincipal.origin.includes("moz-nullprincipal"));
+Assert.ok(nullPrincipal.origin.includes("^userContextId=33"));
+Assert.ok(nullPrincipal.originNoSuffix.includes("moz-nullprincipal"));
+Assert.ok(!nullPrincipal.originNoSuffix.includes("^userContextId=33"));
+Assert.ok(nullPrincipal.siteOrigin.includes("moz-nullprincipal"));
+Assert.ok(nullPrincipal.siteOrigin.includes("^userContextId=33"));
+Assert.ok(nullPrincipal.siteOriginNoSuffix.includes("moz-nullprincipal"));
+Assert.ok(!nullPrincipal.siteOriginNoSuffix.includes("^userContextId=33"));
+
+// ExpandedPrincipal checks
+let expandedPrincipal = Cu.getObjectPrincipal(Cu.Sandbox([prinicpal2]));
+Assert.ok(expandedPrincipal.isExpandedPrincipal);
+Assert.equal(
+  expandedPrincipal.origin,
+  "[Expanded Principal [http://test1.example.com^userContextId=22]]^userContextId=22"
+);
+Assert.equal(
+  expandedPrincipal.originNoSuffix,
+  "[Expanded Principal [http://test1.example.com^userContextId=22]]"
+);
+Assert.equal(
+  expandedPrincipal.siteOrigin,
+  "[Expanded Principal [http://test1.example.com^userContextId=22]]^userContextId=22"
+);
+Assert.equal(
+  expandedPrincipal.siteOriginNoSuffix,
+  "[Expanded Principal [http://test1.example.com^userContextId=22]]"
+);
+
+let ipv6URI = Services.io.newURI("https://[2001:db8::ff00:42:8329]:123");
+let ipv6Principal = scriptSecMan.createContentPrincipal(ipv6URI, {
+  userContextId: 6,
+});
+Assert.ok(ipv6Principal.isContentPrincipal);
+Assert.equal(
+  ipv6Principal.origin,
+  "https://[2001:db8::ff00:42:8329]:123^userContextId=6"
+);
+Assert.equal(
+  ipv6Principal.originNoSuffix,
+  "https://[2001:db8::ff00:42:8329]:123"
+);
+Assert.equal(
+  ipv6Principal.siteOrigin,
+  "https://[2001:db8::ff00:42:8329]^userContextId=6"
+);
+Assert.equal(
+  ipv6Principal.siteOriginNoSuffix,
+  "https://[2001:db8::ff00:42:8329]"
+);
diff -Nru firefox-84.0.2+build1/caps/tests/unit/xpcshell.ini firefox-85.0+build1/caps/tests/unit/xpcshell.ini
--- firefox-84.0.2+build1/caps/tests/unit/xpcshell.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/caps/tests/unit/xpcshell.ini	2021-01-18 19:58:08.000000000 +0000
@@ -4,3 +4,4 @@
 [test_origin.js]
 [test_uri_escaping.js]
 [test_ipv6_host_literal.js]
+[test_site_origin.js]
diff -Nru firefox-84.0.2+build1/.cargo/config.in firefox-85.0+build1/.cargo/config.in
--- firefox-84.0.2+build1/.cargo/config.in	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/.cargo/config.in	2021-01-18 19:58:07.000000000 +0000
@@ -10,7 +10,7 @@
 [source."https://github.com/mozilla/neqo"]
 git = "https://github.com/mozilla/neqo"
 replace-with = "vendored-sources"
-tag = "v0.4.14"
+tag = "v0.4.16"
 
 [source."https://github.com/mozilla/mp4parse-rust"]
 git = "https://github.com/mozilla/mp4parse-rust"
@@ -22,10 +22,25 @@
 replace-with = "vendored-sources"
 rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"
 
+[source."https://github.com/mozilla-spidermonkey/wasmtime"]
+git = "https://github.com/mozilla-spidermonkey/wasmtime"
+replace-with = "vendored-sources"
+rev = "3334d92350da40b90d2529c147db3ea44918b558"
+
+[source."https://github.com/mozilla-spidermonkey/wasm-tools"]
+git = "https://github.com/mozilla-spidermonkey/wasm-tools"
+replace-with = "vendored-sources"
+rev = "1b7763faa484e62752538b78e7a69883f4faceee"
+
+[source."https://github.com/mozilla-spidermonkey/regalloc.rs"]
+git = "https://github.com/mozilla-spidermonkey/regalloc.rs"
+replace-with = "vendored-sources"
+rev = "fc5d1d33317b0fbd36725757f80a95127eff5109"
+
 [source."https://github.com/mozilla-spidermonkey/jsparagus"]
 git = "https://github.com/mozilla-spidermonkey/jsparagus"
 replace-with = "vendored-sources"
-rev = "1dc60327164a3f64f87180147b1f3a2a9cc74276"
+rev = "d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 
 [source."https://github.com/kvark/spirv_cross"]
 branch = "wgpu4"
@@ -47,26 +62,21 @@
 replace-with = "vendored-sources"
 rev = "0917fe780032a6bbb23d71be545f9c1834128d75"
 
+[source."https://github.com/hsivonen/chardetng"]
+git = "https://github.com/hsivonen/chardetng"
+replace-with = "vendored-sources"
+rev = "7d5e0608d3e012bdfea3bd199111e3546607dd31"
+
 [source."https://github.com/gfx-rs/naga"]
 git = "https://github.com/gfx-rs/naga"
 replace-with = "vendored-sources"
 rev = "4d4e1cd4cbfad2b81264a7239a336b6ec1346611"
 
-[source."https://github.com/emilio/rust-smallvec"]
-branch = "1.3-as-1.5"
-git = "https://github.com/emilio/rust-smallvec"
-replace-with = "vendored-sources"
-
 [source."https://github.com/djg/cubeb-pulse-rs"]
 git = "https://github.com/djg/cubeb-pulse-rs"
 replace-with = "vendored-sources"
 rev = "bf31534d08b2c16fb5e4c5834944ae3271efbd63"
 
-[source."https://github.com/bytecodealliance/wasmtime"]
-git = "https://github.com/bytecodealliance/wasmtime"
-replace-with = "vendored-sources"
-rev = "e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
-
 [source."https://github.com/badboy/failure"]
 git = "https://github.com/badboy/failure"
 replace-with = "vendored-sources"
@@ -75,17 +85,17 @@
 [source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"]
 git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"
 replace-with = "vendored-sources"
-rev = "ed8bac8812e9f335d5fadd0f4ece96981aba88a3"
+rev = "f3cace4fb8b53db0849c62af4fa62bade5a620f7"
 
 [source."https://github.com/PLSysSec/lucet_sandbox_compiler"]
 git = "https://github.com/PLSysSec/lucet_sandbox_compiler"
 replace-with = "vendored-sources"
-rev = "477d8fc53a64705a9d3fbcce9de92f4988558525"
+rev = "cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 
 [source."https://github.com/ChunMinChang/cubeb-coreaudio-rs"]
 git = "https://github.com/ChunMinChang/cubeb-coreaudio-rs"
 replace-with = "vendored-sources"
-rev = "87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09"
+rev = "1e1222d6213e28eabd7f4302d00765ae1153a31e"
 
 [source.crates-io]
 replace-with = "vendored-sources"
diff -Nru firefox-84.0.2+build1/Cargo.lock firefox-85.0+build1/Cargo.lock
--- firefox-84.0.2+build1/Cargo.lock	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/Cargo.lock	2021-01-18 19:58:07.000000000 +0000
@@ -28,15 +28,6 @@
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
 name = "anyhow"
 version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -226,7 +217,7 @@
  "bindgen",
  "cranelift-codegen",
  "cranelift-wasm",
- "env_logger 0.6.2",
+ "env_logger",
  "log",
  "smallvec",
 ]
@@ -286,18 +277,14 @@
  "cexpr",
  "cfg-if 0.1.10",
  "clang-sys",
- "clap",
- "env_logger 0.7.1",
  "lazy_static",
  "lazycell",
- "log",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "which",
 ]
 
 [[package]]
@@ -538,7 +525,7 @@
  "nserror",
  "nsstring",
  "rental",
- "rkv 0.15.0",
+ "rkv",
  "rust_cascade",
  "sha2",
  "storage_variant",
@@ -578,8 +565,7 @@
 [[package]]
 name = "chardetng"
 version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7817bfb797fd08f0b1cf095378254b28cb0b5000412ca32b490c9d9e225ffc38"
+source = "git+https://github.com/hsivonen/chardetng?rev=7d5e0608d3e012bdfea3bd199111e3546607dd31#7d5e0608d3e012bdfea3bd199111e3546607dd31"
 dependencies = [
  "encoding_rs",
  "memchr",
@@ -624,23 +610,11 @@
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f16b89cbb9ee36d87483dc939fe9f1e13c05898d56d7b230a0d4dff033a536"
 dependencies = [
- "ansi_term",
- "atty",
  "bitflags",
  "strsim",
  "term_size",
  "textwrap",
  "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
 ]
 
 [[package]]
@@ -764,7 +738,7 @@
 [[package]]
 name = "coreaudio-sys-utils"
 version = "0.1.0"
-source = "git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09#87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09"
+source = "git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=1e1222d6213e28eabd7f4302d00765ae1153a31e#1e1222d6213e28eabd7f4302d00765ae1153a31e"
 dependencies = [
  "core-foundation-sys",
  "coreaudio-sys",
@@ -790,22 +764,22 @@
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 dependencies = [
- "cranelift-entity 0.67.0",
+ "cranelift-entity 0.68.0",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 dependencies = [
  "byteorder",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
- "cranelift-entity 0.67.0",
+ "cranelift-entity 0.68.0",
  "log",
  "regalloc",
  "smallvec",
@@ -815,32 +789,32 @@
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 dependencies = [
  "cranelift-codegen-shared",
- "cranelift-entity 0.67.0",
+ "cranelift-entity 0.68.0",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 
 [[package]]
 name = "cranelift-entity"
 version = "0.41.0"
-source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=477d8fc53a64705a9d3fbcce9de92f4988558525#477d8fc53a64705a9d3fbcce9de92f4988558525"
+source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -850,16 +824,17 @@
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.67.0"
-source = "git+https://github.com/bytecodealliance/wasmtime?rev=e22e2c3722f2fbccd3c8d3230119fa04c332c69c#e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+version = "0.68.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasmtime?rev=3334d92350da40b90d2529c147db3ea44918b558#3334d92350da40b90d2529c147db3ea44918b558"
 dependencies = [
  "cranelift-codegen",
- "cranelift-entity 0.67.0",
+ "cranelift-entity 0.68.0",
  "cranelift-frontend",
  "itertools 0.9.0",
  "log",
+ "smallvec",
  "thiserror",
- "wasmparser 0.63.0",
+ "wasmparser 0.67.0",
 ]
 
 [[package]]
@@ -964,22 +939,12 @@
 
 [[package]]
 name = "cstr"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6557bdb1dc9647eae1cf7f5601b14cd45fc3c7ccf2df618387416fe542da6ea"
-dependencies = [
- "cstr-macros",
- "procedural-masquerade",
-]
-
-[[package]]
-name = "cstr-macros"
-version = "0.1.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
+checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
 dependencies = [
- "procedural-masquerade",
- "syn",
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -1013,7 +978,7 @@
 [[package]]
 name = "cubeb-coreaudio"
 version = "0.1.0"
-source = "git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09#87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09"
+source = "git+https://github.com/ChunMinChang/cubeb-coreaudio-rs?rev=1e1222d6213e28eabd7f4302d00765ae1153a31e#1e1222d6213e28eabd7f4302d00765ae1153a31e"
 dependencies = [
  "atomic",
  "audio-mixer",
@@ -1227,9 +1192,9 @@
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"
+checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
 dependencies = [
  "dtoa",
 ]
@@ -1313,22 +1278,9 @@
 
 [[package]]
 name = "env_logger"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
 dependencies = [
  "atty",
  "humantime",
@@ -1571,14 +1523,15 @@
  "bincode",
  "chrono",
  "crossbeam-channel",
- "ffi-support",
  "glean",
  "glean-core",
+ "inherent",
  "log",
  "nsstring",
  "once_cell",
  "serde",
  "tempfile",
+ "thin-vec",
  "thiserror",
  "uuid",
  "xpcom",
@@ -1759,7 +1712,7 @@
  "lazy_static",
  "libc",
  "lmdb-rkv",
- "rkv 0.10.4",
+ "rkv",
  "tempfile",
 ]
 
@@ -1768,7 +1721,7 @@
 version = "0.1.0"
 dependencies = [
  "app_services_logger",
- "env_logger 0.6.2",
+ "env_logger",
  "lazy_static",
  "log",
 ]
@@ -2107,10 +2060,11 @@
 
 [[package]]
 name = "glean"
-version = "33.4.0"
+version = "33.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f52254ae2baf857eec45b424a0d2dfe6ac63f353b594cfa4bee033f8386b25c"
+checksum = "120a2f092bcf0b8fa0ec864e1a063426638f7084671eddfd138b5571e1e2c6fd"
 dependencies = [
+ "chrono",
  "crossbeam-channel",
  "glean-core",
  "inherent",
@@ -2119,13 +2073,15 @@
  "serde",
  "serde_json",
  "thiserror",
+ "time",
+ "uuid",
 ]
 
 [[package]]
 name = "glean-core"
-version = "33.4.0"
+version = "33.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e3c82289c1ce270c1accc086f9cac083c15ddc01d167e9c6e0b8ed32a4b47c"
+checksum = "b2c8e087b69c8392fca868214b4675230e36832f231cc6045d08caed0d33e3c1"
 dependencies = [
  "bincode",
  "chrono",
@@ -2133,7 +2089,7 @@
  "flate2",
  "log",
  "once_cell",
- "rkv 0.15.0",
+ "rkv",
  "serde",
  "serde_json",
  "uuid",
@@ -2362,12 +2318,9 @@
 
 [[package]]
 name = "humantime"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
+checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
 
 [[package]]
 name = "hyper"
@@ -2451,9 +2404,9 @@
 
 [[package]]
 name = "inherent"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2db418475edf9eb55fec92b7527be6d9a7b880bff6651cb0c0345af57f1cadf"
+checksum = "f3a1325a022293a53274277a7c5c3c5bc73405cb443bb96cc2ce20ff4121e995"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2548,7 +2501,7 @@
 dependencies = [
  "bindgen",
  "cmake",
- "env_logger 0.6.2",
+ "env_logger",
  "glob",
  "lazy_static",
  "libc",
@@ -2560,7 +2513,7 @@
 [[package]]
 name = "jsparagus"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "jsparagus-ast",
  "jsparagus-emitter",
@@ -2574,7 +2527,7 @@
 [[package]]
 name = "jsparagus-ast"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "bumpalo",
  "indexmap",
@@ -2583,7 +2536,7 @@
 [[package]]
 name = "jsparagus-emitter"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "bumpalo",
  "byteorder",
@@ -2596,7 +2549,7 @@
 [[package]]
 name = "jsparagus-generated-parser"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "bumpalo",
  "jsparagus-ast",
@@ -2606,12 +2559,12 @@
 [[package]]
 name = "jsparagus-json-log"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 
 [[package]]
 name = "jsparagus-parser"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "arrayvec",
  "bumpalo",
@@ -2623,7 +2576,7 @@
 [[package]]
 name = "jsparagus-scope"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "indexmap",
  "jsparagus-ast",
@@ -2633,7 +2586,7 @@
 [[package]]
 name = "jsparagus-stencil"
 version = "0.1.0"
-source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=1dc60327164a3f64f87180147b1f3a2a9cc74276#1dc60327164a3f64f87180147b1f3a2a9cc74276"
+source = "git+https://github.com/mozilla-spidermonkey/jsparagus?rev=d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24#d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24"
 dependencies = [
  "jsparagus-ast",
 ]
@@ -2699,12 +2652,11 @@
  "failure",
  "lazy_static",
  "libc",
- "lmdb-rkv",
  "log",
  "moz_task",
  "nserror",
  "nsstring",
- "rkv 0.15.0",
+ "rkv",
  "storage_variant",
  "tempfile",
  "thin-vec",
@@ -2881,7 +2833,7 @@
 [[package]]
 name = "lucet-module-wasmsbx"
 version = "0.1.1"
-source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=477d8fc53a64705a9d3fbcce9de92f4988558525#477d8fc53a64705a9d3fbcce9de92f4988558525"
+source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 dependencies = [
  "bincode",
  "byteorder",
@@ -2897,7 +2849,7 @@
 [[package]]
 name = "lucet-runtime-internals-wasmsbx"
 version = "0.1.1"
-source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=477d8fc53a64705a9d3fbcce9de92f4988558525#477d8fc53a64705a9d3fbcce9de92f4988558525"
+source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2919,7 +2871,7 @@
 [[package]]
 name = "lucet-runtime-wasmsbx"
 version = "0.1.1"
-source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=477d8fc53a64705a9d3fbcce9de92f4988558525#477d8fc53a64705a9d3fbcce9de92f4988558525"
+source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 dependencies = [
  "cc",
  "libc",
@@ -2932,10 +2884,11 @@
 [[package]]
 name = "lucet-wasi-wasmsbx"
 version = "0.1.1"
-source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=477d8fc53a64705a9d3fbcce9de92f4988558525#477d8fc53a64705a9d3fbcce9de92f4988558525"
+source = "git+https://github.com/PLSysSec/lucet_sandbox_compiler?rev=cd07861d1c92147b35b538e6f94fde7d1986f9ad#cd07861d1c92147b35b538e6f94fde7d1986f9ad"
 dependencies = [
  "cast",
  "failure",
+ "lazy_static",
  "libc",
  "lucet-module-wasmsbx",
  "lucet-runtime-internals-wasmsbx",
@@ -3342,11 +3295,11 @@
 
 [[package]]
 name = "neqo-common"
-version = "0.4.14"
-source = "git+https://github.com/mozilla/neqo?tag=v0.4.14#ec00592e3332b7a0eb4b88457a89c24c55bf3974"
+version = "0.4.16"
+source = "git+https://github.com/mozilla/neqo?tag=v0.4.16#1b0664a1e2b3ac59a5c919d32ddc284dc57634e6"
 dependencies = [
  "chrono",
- "env_logger 0.7.1",
+ "env_logger",
  "lazy_static",
  "log",
  "qlog",
@@ -3354,8 +3307,8 @@
 
 [[package]]
 name = "neqo-crypto"
-version = "0.4.14"
-source = "git+https://github.com/mozilla/neqo?tag=v0.4.14#ec00592e3332b7a0eb4b88457a89c24c55bf3974"
+version = "0.4.16"
+source = "git+https://github.com/mozilla/neqo?tag=v0.4.16#1b0664a1e2b3ac59a5c919d32ddc284dc57634e6"
 dependencies = [
  "bindgen",
  "log",
@@ -3367,8 +3320,8 @@
 
 [[package]]
 name = "neqo-http3"
-version = "0.4.14"
-source = "git+https://github.com/mozilla/neqo?tag=v0.4.14#ec00592e3332b7a0eb4b88457a89c24c55bf3974"
+version = "0.4.16"
+source = "git+https://github.com/mozilla/neqo?tag=v0.4.16#1b0664a1e2b3ac59a5c919d32ddc284dc57634e6"
 dependencies = [
  "log",
  "neqo-common",
@@ -3381,8 +3334,8 @@
 
 [[package]]
 name = "neqo-qpack"
-version = "0.4.14"
-source = "git+https://github.com/mozilla/neqo?tag=v0.4.14#ec00592e3332b7a0eb4b88457a89c24c55bf3974"
+version = "0.4.16"
+source = "git+https://github.com/mozilla/neqo?tag=v0.4.16#1b0664a1e2b3ac59a5c919d32ddc284dc57634e6"
 dependencies = [
  "lazy_static",
  "log",
@@ -3395,8 +3348,8 @@
 
 [[package]]
 name = "neqo-transport"
-version = "0.4.14"
-source = "git+https://github.com/mozilla/neqo?tag=v0.4.14#ec00592e3332b7a0eb4b88457a89c24c55bf3974"
+version = "0.4.16"
+source = "git+https://github.com/mozilla/neqo?tag=v0.4.16#1b0664a1e2b3ac59a5c919d32ddc284dc57634e6"
 dependencies = [
  "indexmap",
  "lazy_static",
@@ -3662,7 +3615,7 @@
 dependencies = [
  "byteorder",
  "core-foundation",
- "env_logger 0.6.2",
+ "env_logger",
  "lazy_static",
  "libloading 0.5.2",
  "log",
@@ -3697,9 +3650,9 @@
 
 [[package]]
 name = "parking_lot"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
  "lock_api",
@@ -3708,12 +3661,11 @@
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"
 dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
+ "cfg-if 1.0.0",
  "instant",
  "libc",
  "redox_syscall",
@@ -3894,9 +3846,9 @@
 
 [[package]]
 name = "plane-split"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2211e7ccc9b6260779dd9bad59f7b10889d6361974623b9e405afd7e7e764654"
+checksum = "f3f7075ec146b897b6e0faca47adeb7ed3d4f6eaa8145bf19db17311081b3f63"
 dependencies = [
  "binary-space-partition",
  "euclid",
@@ -3906,9 +3858,9 @@
 
 [[package]]
 name = "plist"
-version = "0.5.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31850d149352e2b75f0e4b206045ee3775076c422892328343beca48a2b5cf17"
+checksum = "50ce7c785e06e3a9e6f546c1a30d3d59111a31a21bc294fb1496241a572c9a00"
 dependencies = [
  "base64 0.10.1",
  "humantime",
@@ -3973,12 +3925,6 @@
 ]
 
 [[package]]
-name = "procedural-masquerade"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260"
-
-[[package]]
 name = "processtools"
 version = "0.1.0"
 dependencies = [
@@ -4226,9 +4172,8 @@
 
 [[package]]
 name = "regalloc"
-version = "0.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2041c2d34f6ff346d6f428974f03d8bf12679b0c816bb640dc5eb1d48848d8d1"
+version = "0.0.31"
+source = "git+https://github.com/mozilla-spidermonkey/regalloc.rs?rev=fc5d1d33317b0fbd36725757f80a95127eff5109#fc5d1d33317b0fbd36725757f80a95127eff5109"
 dependencies = [
  "log",
  "rustc-hash",
@@ -4257,12 +4202,12 @@
 name = "remote"
 version = "0.1.0"
 dependencies = [
- "failure",
  "http",
  "libc",
  "log",
  "nserror",
  "nsstring",
+ "thiserror",
  "xpcom",
 ]
 
@@ -4304,29 +4249,9 @@
 
 [[package]]
 name = "rkv"
-version = "0.10.4"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a3dbc1f4971372545ed4175f23ef206c81e5874cd574d153646e7ee78f6793"
-dependencies = [
- "arrayref",
- "bincode",
- "bitflags",
- "byteorder",
- "failure",
- "lazy_static",
- "lmdb-rkv",
- "ordered-float",
- "serde",
- "serde_derive",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "rkv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97d1b6321740ce36d77d67d22ff84ac8a996cf69dbd0727b8bcae52f1c98aaa"
+checksum = "917d7a01f8c1ae46226e9d8dd24314279be7b04dfd0b24340d420e6927c2e687"
 dependencies = [
  "arrayref",
  "bincode",
@@ -4348,7 +4273,7 @@
 [[package]]
 name = "rlbox_lucet_sandbox"
 version = "0.1.0"
-source = "git+https://github.com/PLSysSec/rlbox_lucet_sandbox/?rev=ed8bac8812e9f335d5fadd0f4ece96981aba88a3#ed8bac8812e9f335d5fadd0f4ece96981aba88a3"
+source = "git+https://github.com/PLSysSec/rlbox_lucet_sandbox/?rev=f3cace4fb8b53db0849c62af4fa62bade5a620f7#f3cace4fb8b53db0849c62af4fa62bade5a620f7"
 dependencies = [
  "failure",
  "goblin",
@@ -4387,9 +4312,9 @@
 
 [[package]]
 name = "rusqlite"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3d4791ab5517217f51216a84a688b53c1ebf7988736469c538d02f46ddba68"
+checksum = "d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112"
 dependencies = [
  "bitflags",
  "fallible-iterator",
@@ -4740,8 +4665,9 @@
 
 [[package]]
 name = "smallvec"
-version = "1.5.0"
-source = "git+https://github.com/emilio/rust-smallvec?branch=1.3-as-1.5#7579d2fa282282e4d1d96d0c67fc186314a6b6c0"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
 dependencies = [
  "serde",
 ]
@@ -4751,7 +4677,7 @@
 version = "0.1.0"
 dependencies = [
  "bumpalo",
- "env_logger 0.6.2",
+ "env_logger",
  "jsparagus",
  "log",
 ]
@@ -4951,7 +4877,7 @@
  "atomic_refcell",
  "cssparser",
  "cstr",
- "env_logger 0.6.2",
+ "env_logger",
  "geckoservo",
  "libc",
  "log",
@@ -5624,12 +5550,6 @@
 checksum = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
 name = "version_check"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5715,9 +5635,8 @@
 
 [[package]]
 name = "wasmparser"
-version = "0.63.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da5d7300428d75d8b3cdfb736e41ee6af8926d69c1de2f201a1a22f234b7b5"
+version = "0.67.0"
+source = "git+https://github.com/mozilla-spidermonkey/wasm-tools?rev=1b7763faa484e62752538b78e7a69883f4faceee#1b7763faa484e62752538b78e7a69883f4faceee"
 
 [[package]]
 name = "wast"
@@ -5825,6 +5744,7 @@
  "log",
  "malloc_size_of_derive",
  "num-traits",
+ "objc",
  "plane-split",
  "rayon",
  "ron",
@@ -5879,6 +5799,7 @@
  "log",
  "nsstring",
  "num_cpus",
+ "objc",
  "rayon",
  "swgl",
  "thin-vec",
@@ -5956,15 +5877,6 @@
 ]
 
 [[package]]
-name = "which"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
-dependencies = [
- "libc",
-]
-
-[[package]]
 name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6096,6 +6008,7 @@
 name = "xpcom"
 version = "0.1.0"
 dependencies = [
+ "cstr",
  "libc",
  "nserror",
  "nsstring",
@@ -6131,13 +6044,12 @@
  "cstr",
  "failure",
  "libc",
- "lmdb-rkv",
  "log",
  "moz_task",
  "nserror",
  "nsstring",
  "once_cell",
- "rkv 0.10.4",
+ "rkv",
  "serde_json",
  "tempfile",
  "xpcom",
diff -Nru firefox-84.0.2+build1/Cargo.toml firefox-85.0+build1/Cargo.toml
--- firefox-84.0.2+build1/Cargo.toml	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/Cargo.toml	2021-01-18 19:58:08.000000000 +0000
@@ -63,27 +63,29 @@
 debug-assertions = false
 panic = "abort"
 
+# Optimize build dependencies, because bindgen and proc macros / style
+# compilation take more to run than to build otherwise.
+[profile.dev.build-override]
+opt-level = 1
+
+[profile.release.build-override]
+opt-level = 1
+
 [patch.crates-io]
+chardetng = { git = "https://github.com/hsivonen/chardetng", rev="7d5e0608d3e012bdfea3bd199111e3546607dd31" }
 libudev-sys = { path = "dom/webauthn/libudev-sys" }
 packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
-rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="ed8bac8812e9f335d5fadd0f4ece96981aba88a3" }
+rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }
 nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
 spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4", rev = "e9eff10f964957e7a001c5f712effe17ce09aa99" }
 # failure's backtrace feature might break our builds, see bug 1608157.
 failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
 failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-# This is a hack. Smallvec 1.4/1.5 cause a big performance regression,
-# see bug 1671170.
-#
-# Fortunately all the consumers build fine with 1.3. We can remove this hack
-# once https://github.com/rusqlite/rusqlite/pull/855 and
-# https://github.com/Amanieu/parking_lot/pull/266 have been merged.
-smallvec = { git = "https://github.com/emilio/rust-smallvec", branch = "1.3-as-1.5", rev = "7579d2fa282282e4d1d96d0c67fc186314a6b6c0" }
 
 [patch.crates-io.cranelift-codegen]
-git = "https://github.com/bytecodealliance/wasmtime"
-rev = "e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+git = "https://github.com/mozilla-spidermonkey/wasmtime"
+rev = "3334d92350da40b90d2529c147db3ea44918b558"
 
 [patch.crates-io.cranelift-wasm]
-git = "https://github.com/bytecodealliance/wasmtime"
-rev = "e22e2c3722f2fbccd3c8d3230119fa04c332c69c"
+git = "https://github.com/mozilla-spidermonkey/wasmtime"
+rev = "3334d92350da40b90d2529c147db3ea44918b558"
diff -Nru firefox-84.0.2+build1/chrome/nsChromeRegistry.cpp firefox-85.0+build1/chrome/nsChromeRegistry.cpp
--- firefox-84.0.2+build1/chrome/nsChromeRegistry.cpp	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/chrome/nsChromeRegistry.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsChromeRegistryContent.h"
 
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsError.h"
 #include "nsEscape.h"
 #include "nsNetUtil.h"
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/config/external/icu/data/icudt67l.dat and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/config/external/icu/data/icudt67l.dat differ
diff -Nru firefox-84.0.2+build1/config/makefiles/rust.mk firefox-85.0+build1/config/makefiles/rust.mk
--- firefox-84.0.2+build1/config/makefiles/rust.mk	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/config/makefiles/rust.mk	2021-01-18 19:58:08.000000000 +0000
@@ -53,8 +53,11 @@
 cargo_build_flags += -j1
 endif
 
-# This should also be paired with -Zbuild-std, but that doesn't work yet.
+# We also need to rebuild the rust stdlib so that it's instrumented. Because
+# build-std is still pretty experimental, we need to explicitly request
+# the panic_abort crate for `panic = "abort"` support.
 ifdef MOZ_TSAN
+cargo_build_flags += -Zbuild-std=std,panic_abort
 RUSTFLAGS += -Zsanitizer=thread
 endif
 
@@ -69,14 +72,11 @@
 ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
 cargo_rustc_flags += -Clto
 endif
-# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
-# using -Clto.
-ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
+# We need -Cembed-bitcode=yes for all crates when using -Clto.
 RUSTFLAGS += -Cembed-bitcode=yes
 endif
 endif
 endif
-endif
 
 ifdef CARGO_INCREMENTAL
 export CARGO_INCREMENTAL
diff -Nru firefox-84.0.2+build1/config/milestone.txt firefox-85.0+build1/config/milestone.txt
--- firefox-84.0.2+build1/config/milestone.txt	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/config/milestone.txt	2021-01-18 19:58:08.000000000 +0000
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-84.0.2
+85.0
diff -Nru firefox-84.0.2+build1/config/rules.mk firefox-85.0+build1/config/rules.mk
--- firefox-84.0.2+build1/config/rules.mk	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/config/rules.mk	2021-01-18 19:58:08.000000000 +0000
@@ -881,35 +881,6 @@
 # hacks in recursivemake.py that check if Makefile.in sets the variable.
 ifneq ($(XPI_PKGNAME),)
 tools realchrome::
-ifdef STRIP_XPI
-ifndef MOZ_DEBUG
-	@echo 'Stripping $(XPI_PKGNAME) package directory...'
-	@echo $(FINAL_TARGET)
-	@cd $(FINAL_TARGET) && find . ! -type d \
-			! -name '*.js' \
-			! -name '*.xpt' \
-			! -name '*.gif' \
-			! -name '*.jpg' \
-			! -name '*.png' \
-			! -name '*.xpm' \
-			! -name '*.txt' \
-			! -name '*.rdf' \
-			! -name '*.sh' \
-			! -name '*.properties' \
-			! -name '*.dtd' \
-			! -name '*.html' \
-			! -name '*.xul' \
-			! -name '*.css' \
-			! -name '*.xml' \
-			! -name '*.jar' \
-			! -name '*.dat' \
-			! -name '*.tbl' \
-			! -name '*.src' \
-			! -name '*.reg' \
-			$(PLATFORM_EXCLUDE_LIST) \
-			-exec $(STRIP) $(STRIP_FLAGS) {} >/dev/null 2>&1 \;
-endif
-endif
 	@echo 'Packaging $(XPI_PKGNAME).xpi...'
 	$(call py_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')
 endif
diff -Nru firefox-84.0.2+build1/debian/build/create-tarball.py firefox-85.0+build1/debian/build/create-tarball.py
--- firefox-84.0.2+build1/debian/build/create-tarball.py	2020-10-14 17:04:21.000000000 +0000
+++ firefox-85.0+build1/debian/build/create-tarball.py	2021-01-18 20:39:02.000000000 +0000
@@ -136,7 +136,7 @@
         CheckCall(['cargo', 'new', 'vendored-cbindgen', '--vcs', 'none'])
         with ScopedWorkingDirectory('vendored-cbindgen'):
           with open('Cargo.toml', 'a+') as fd:
-            fd.write('cbindgen = "=0.15.0"')
+            fd.write('cbindgen = "=0.16.0"')
           CheckCall(['cargo', 'vendor'])
           with ScopedWorkingDirectory('vendor/cbindgen'):
             os.makedirs('.cargo')
diff -Nru firefox-84.0.2+build1/debian/changelog firefox-85.0+build1/debian/changelog
--- firefox-84.0.2+build1/debian/changelog	2021-01-06 12:27:15.000000000 +0000
+++ firefox-85.0+build1/debian/changelog	2021-01-18 20:41:55.000000000 +0000
@@ -1,3 +1,34 @@
+firefox (85.0+build1-0ubuntu0.16.04.1) xenial; urgency=medium
+
+  * New upstream release (85.0+build1)
+
+  [ Olivier Tilloy ]
+  * Re-enable and update debian/patches/unity-menubar.patch
+  * Update test expectation (https://bugzilla.mozilla.org/1680596)
+    - debian/tests/html5test
+  * Partially rewrite an autopkgtest to make it more robust
+    - debian/tests/search-engines
+  * Remove patches that are no longer needed
+    - debian/patches/fix-make-package-tests-without-webrtc.patch
+    - debian/patches/ppc-no-static-sizes.patch
+
+  [ Rico Tzschichholz ]
+  * Bump build-dep on rustc >= 1.47.0 and cargo >= 0.47
+    - debian/control{,.in}
+  * Make cargo 0.47 aka 1.46.0 sufficient
+    - debian/patches/relax-cargo-dep.patch
+  * Update cbindgen to 0.16.0
+    - debian/build/create-tarball.py
+  * Reduce the rust debuginfo level unconditionally on all architectures,
+    given that builds started failing reliably on amd64 with rustc 1.47
+    - update
+      debian/patches/reduce-rust-debuginfo-on-selected-architectures.patch and
+      rename it to debian/patches/reduce-rust-debuginfo.patch
+  * Update patches
+    - debian/patches/python3-remove-fstrings.patch
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Mon, 18 Jan 2021 21:41:55 +0100
+
 firefox (84.0.2+build1-0ubuntu0.16.04.1) xenial; urgency=medium
 
   * New upstream release (84.0.2+build1)
diff -Nru firefox-84.0.2+build1/debian/control firefox-85.0+build1/debian/control
--- firefox-84.0.2+build1/debian/control	2021-01-06 12:27:15.000000000 +0000
+++ firefox-85.0+build1/debian/control	2021-01-18 20:41:55.000000000 +0000
@@ -41,8 +41,8 @@
 	clang-11 | clang-10 | clang-8,
 	libclang-11-dev | libclang-10-dev | libclang-8-dev,
 	llvm-11-dev | llvm-10-dev | llvm-8-dev,
-	cargo (>= 0.44),
-	rustc (>= 1.43.0),
+	cargo (>= 0.47),
+	rustc (>= 1.47.0),
 	nodejs-mozilla (>= 10.21),
 	nasm-mozilla (>= 2.14.02),
 	gcc-mozilla (>= 7),
diff -Nru firefox-84.0.2+build1/debian/control.in firefox-85.0+build1/debian/control.in
--- firefox-84.0.2+build1/debian/control.in	2021-01-06 12:27:15.000000000 +0000
+++ firefox-85.0+build1/debian/control.in	2021-01-18 20:41:55.000000000 +0000
@@ -41,8 +41,8 @@
 	clang-11 | clang-10 | clang-8,
 	libclang-11-dev | libclang-10-dev | libclang-8-dev,
 	llvm-11-dev | llvm-10-dev | llvm-8-dev,
-	cargo (>= 0.44),
-	rustc (>= 1.43.0),
+	cargo (>= 0.47),
+	rustc (>= 1.47.0),
 	nodejs-mozilla (>= 10.21),
 	nasm-mozilla (>= 2.14.02),
 	gcc-mozilla (>= 7),
diff -Nru firefox-84.0.2+build1/debian/patches/fix-make-package-tests-without-webrtc.patch firefox-85.0+build1/debian/patches/fix-make-package-tests-without-webrtc.patch
--- firefox-84.0.2+build1/debian/patches/fix-make-package-tests-without-webrtc.patch	2020-09-21 16:39:24.000000000 +0000
+++ firefox-85.0+build1/debian/patches/fix-make-package-tests-without-webrtc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-Index: firefox-trunk-35.0~a1~hg20140919r206162/testing/testsuite-targets.mk
-===================================================================
---- firefox-trunk-35.0~a1~hg20140919r206162.orig/testing/testsuite-targets.mk	2014-09-19 17:19:29.231205154 +0100
-+++ firefox-trunk-35.0~a1~hg20140919r206162/testing/testsuite-targets.mk	2014-09-19 17:21:58.607205930 +0100
-@@ -402,9 +402,11 @@
-   stage-marionette \
-   stage-cppunittests \
-   stage-jittest \
--  stage-steeplechase \
-   stage-web-platform-tests \
-   $(NULL)
-+ifdef MOZ_WEBRTC
-+package-tests: stage-steeplechase
-+endif
- else
- # This staging area has been built for us by universal/flight.mk
- PKG_STAGE = $(DIST)/universal/test-stage
diff -Nru firefox-84.0.2+build1/debian/patches/ppc-no-static-sizes.patch firefox-85.0+build1/debian/patches/ppc-no-static-sizes.patch
--- firefox-84.0.2+build1/debian/patches/ppc-no-static-sizes.patch	2020-10-14 17:04:21.000000000 +0000
+++ firefox-85.0+build1/debian/patches/ppc-no-static-sizes.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-# HG changeset patch
-# Parent b735e618c2a860972197942f6680c941e3c9a67f
-# User Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
-Bug 997353 - Do not use compile-time page size for PowerPC.
-
-The PowerPC architecture allows various memory page sizes, making it impossible
-to predict the runtime page size.
-
-Index: b/memory/build/mozjemalloc.cpp
-===================================================================
---- a/memory/build/mozjemalloc.cpp
-+++ b/memory/build/mozjemalloc.cpp
-@@ -182,7 +182,7 @@
- // Debug builds are opted out too, for test coverage.
- #ifndef MOZ_DEBUG
- #  if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && \
--      !defined(__aarch64__) && !defined(__powerpc__) && !defined(XP_MACOSX)
-+      !defined(__aarch64__) && !defined(__powerpc__) && !defined(XP_MACOSX) && !defined(__powerpc64__)
- #    define MALLOC_STATIC_PAGESIZE 1
- #  endif
- #endif
diff -Nru firefox-84.0.2+build1/debian/patches/python3-remove-fstrings.patch firefox-85.0+build1/debian/patches/python3-remove-fstrings.patch
--- firefox-84.0.2+build1/debian/patches/python3-remove-fstrings.patch	2020-12-09 08:50:35.000000000 +0000
+++ firefox-85.0+build1/debian/patches/python3-remove-fstrings.patch	2021-01-18 20:39:02.000000000 +0000
@@ -427,6 +427,6 @@
                  category_name = util.snake_case(category_name)
 -                full_path = f"{category_name}::{metric_name}"
 +                full_path = "{}::{}".format(category_name, metric_name)
-                 objs_by_type[key].append((get_metric_id(metric), full_path))
  
-     # Now for the modules for each category.
+                 if metric.type == "event":
+                     events_by_id[get_metric_id(metric)] = full_path
diff -Nru firefox-84.0.2+build1/debian/patches/reduce-rust-debuginfo-on-selected-architectures.patch firefox-85.0+build1/debian/patches/reduce-rust-debuginfo-on-selected-architectures.patch
--- firefox-84.0.2+build1/debian/patches/reduce-rust-debuginfo-on-selected-architectures.patch	2020-12-09 08:50:35.000000000 +0000
+++ firefox-85.0+build1/debian/patches/reduce-rust-debuginfo-on-selected-architectures.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Description: reduce the rust debuginfo level on selected architectures where
- compiling with debuginfo=2 causes the OOM killer to interrupt the build on
- launchpad builders. Initially this was only on 32 bit architectures, but with
- firefox 63 it started happening frequently on arm64 and ppc64el too, and with
- newer versions it started happening very frequently on s390x too.
-
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -2138,9 +2138,9 @@
- 
- 
- @depends(
--    rustc_opt_level, debug_rust, "--enable-debug-symbols", "--enable-frame-pointers"
-+    rustc_opt_level, debug_rust, "--enable-debug-symbols", "--enable-frame-pointers", host
- )
--def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers):
-+def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers, host):
-     # Cargo currently supports only two interesting profiles for building:
-     # development and release. Those map (roughly) to --enable-debug and
-     # --disable-debug in Gecko, respectively.
-@@ -1895,6 +1895,8 @@ def rust_compile_flags(opt_level, debug_
- 
-     if debug_symbols:
-         debug_info = "2"
-+        if host.bitness == 32 or host.cpu in ("aarch64", "ppc64", "s390x"):
-+            debug_info = "1"
- 
-     opts = []
- 
diff -Nru firefox-84.0.2+build1/debian/patches/reduce-rust-debuginfo.patch firefox-85.0+build1/debian/patches/reduce-rust-debuginfo.patch
--- firefox-84.0.2+build1/debian/patches/reduce-rust-debuginfo.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/debian/patches/reduce-rust-debuginfo.patch	2021-01-18 20:41:55.000000000 +0000
@@ -0,0 +1,21 @@
+Description: reduce the rust debuginfo level
+ because compiling with debuginfo=2 causes the OOM killer to interrupt the build
+ on launchpad builders. Initially this was only on 32 bit architectures, but
+ with firefox 63 it started happening frequently on arm64 and ppc64el too,
+ with newer versions it started happening very frequently on s390x too, and with
+ firefox 84 (built with rustc 1.47) it started happening on amd64 too.
+ This patch would initially decrease debug_info for selected architectures, but
+ with recent versions of rustc pretty much all supported architectures are
+ affected, so it is now unconditional.
+
+--- a/build/moz.configure/toolchain.configure
++++ b/build/moz.configure/toolchain.configure
+@@ -2167,7 +2167,7 @@ def rust_compile_flags(opt_level, debug_
+         debug_assertions = False
+ 
+     if debug_symbols:
+-        debug_info = "2"
++        debug_info = "1"
+ 
+     opts = []
+ 
diff -Nru firefox-84.0.2+build1/debian/patches/relax-cargo-dep.patch firefox-85.0+build1/debian/patches/relax-cargo-dep.patch
--- firefox-84.0.2+build1/debian/patches/relax-cargo-dep.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/debian/patches/relax-cargo-dep.patch	2021-01-18 20:39:02.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -168,7 +168,7 @@
+         rustc_min_version = Version("1.47.0")
+     else:
+         rustc_min_version = Version(MINIMUM_RUST_VERSION)
+-    cargo_min_version = rustc_min_version
++    cargo_min_version = Version("1.46.0")
+ 
+     version = rustc_info.version
+     is_nightly = "nightly" in version.version
diff -Nru firefox-84.0.2+build1/debian/patches/series firefox-85.0+build1/debian/patches/series
--- firefox-84.0.2+build1/debian/patches/series	2020-11-16 21:57:00.000000000 +0000
+++ firefox-85.0+build1/debian/patches/series	2021-01-18 20:39:02.000000000 +0000
@@ -1,15 +1,14 @@
-ppc-no-static-sizes.patch
+relax-cargo-dep.patch
 ubuntu-bookmarks.patch
 ubuntu-ua-string-changes.patch
 unity-menubar.patch
-#fix-make-package-tests-without-webrtc.patch
 support-coinstallable-trunk-build.patch
 set-prgname-to-remoting-name.patch
 use-system-icupkg.patch
 rust-drop-dll-checksums.patch
 webrtc-fix-compiler-flags-for-armhf.patch
 s390x-ycbcr.patch
-reduce-rust-debuginfo-on-selected-architectures.patch
+reduce-rust-debuginfo.patch
 fix-armhf-webrtc-build.patch
 armhf-disable-unaligned-fp-access-emulation.patch
 armhf-reduce-linker-memory-use.patch
diff -Nru firefox-84.0.2+build1/debian/patches/unity-menubar.patch firefox-85.0+build1/debian/patches/unity-menubar.patch
--- firefox-84.0.2+build1/debian/patches/unity-menubar.patch	2020-12-09 08:50:35.000000000 +0000
+++ firefox-85.0+build1/debian/patches/unity-menubar.patch	2021-01-18 20:39:02.000000000 +0000
@@ -14,7 +14,7 @@
              <menu id="file-menu" data-l10n-id="menu-file">
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6427,11 +6427,18 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6274,11 +6274,18 @@ function onViewToolbarsPopupShowing(aEve
    MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl");
    let firstMenuItem = aInsertPoint || popup.firstElementChild;
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
@@ -98,7 +98,7 @@
      "components.conf",
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -320,6 +320,9 @@ pref("dom.mouseevent.click.hack.use_lega
+@@ -312,6 +312,9 @@ pref("dom.mouseevent.click.hack.use_lega
  // Fastback caching - if this pref is negative, then we calculate the number
  // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
@@ -126,7 +126,7 @@
  }
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -60,6 +60,15 @@ UNIFIED_SOURCES += [
+@@ -59,6 +59,15 @@ UNIFIED_SOURCES += [
  
  SOURCES += [
      "MediaKeysEventSourceFactory.cpp",
@@ -142,7 +142,7 @@
      "nsWindow.cpp",  # conflicts with X11 headers
      "WaylandVsyncSource.cpp",  # conflicts with X11 headers
  ]
-@@ -140,6 +149,7 @@ LOCAL_INCLUDES += [
+@@ -139,6 +148,7 @@ LOCAL_INCLUDES += [
      "/layout/base",
      "/layout/forms",
      "/layout/generic",
@@ -4476,7 +4476,7 @@
 +#endif /* __nsNativeMenuDocListener_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsNativeMenuService.cpp
-@@ -0,0 +1,503 @@
+@@ -0,0 +1,504 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -4484,6 +4484,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 "mozilla/dom/Element.h"
 +#include "mozilla/Assertions.h"
 +#include "mozilla/Preferences.h"
 +#include "mozilla/UniquePtr.h"
@@ -5069,7 +5070,7 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -6096,6 +6096,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -6148,6 +6148,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5100,7 +5101,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -701,6 +705,8 @@ class nsWindow final : public nsBaseWidg
+@@ -703,6 +707,8 @@ class nsWindow final : public nsBaseWidg
    static CSDSupportLevel sCSDSupportLevel;
  
    static bool sTransparentMainWindow;
@@ -5146,7 +5147,7 @@
  import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
-@@ -2560,7 +2561,7 @@ STATIC_ATOMS = [
+@@ -2562,7 +2563,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS
@@ -5174,7 +5175,7 @@
  if defined('MOZ_X11'):
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -71,7 +71,7 @@
+@@ -76,7 +76,7 @@
  #  include "mozilla/XULStore.h"
  #endif
  
diff -Nru firefox-84.0.2+build1/debian/tests/html5test firefox-85.0+build1/debian/tests/html5test
--- firefox-84.0.2+build1/debian/tests/html5test	2020-09-21 16:39:24.000000000 +0000
+++ firefox-85.0+build1/debian/tests/html5test	2021-01-18 20:39:02.000000000 +0000
@@ -41,7 +41,7 @@
     match = re.search("YOUR BROWSER SCORES (\d+) OUT OF (\d+) POINTS", score)
     assert match is not None
     score = (int(match.group(1)), int(match.group(2)))
-    expected_score = (507, 555)
+    expected_score = (506, 555)
     sys.stderr.flush()
     print("Score: {}/{}".format(score[0], score[1]))
 
@@ -76,7 +76,7 @@
         ("row-elements.interactive.details", "Yes"),
         ("row-elements.interactive.summary", "Yes"),
         ("row-elements.interactive.menutoolbar", "No"),
-        ("row-elements.interactive.menucontext", "Partial"),
+        ("row-elements.interactive.menucontext", "No"),
         ("row-elements.interactive.dialog", "No"),
         ("row-elements.hidden", "Yes"),
         ("row-elements.dynamic", "Yes"),
diff -Nru firefox-84.0.2+build1/debian/tests/search-engines firefox-85.0+build1/debian/tests/search-engines
--- firefox-84.0.2+build1/debian/tests/search-engines	2020-11-13 15:51:59.000000000 +0000
+++ firefox-85.0+build1/debian/tests/search-engines	2021-01-18 20:39:02.000000000 +0000
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from selenium import webdriver
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from urllib.parse import urlparse, parse_qs
@@ -32,35 +33,24 @@
     for i, v in enumerate(expected_engines):
         driver.get(search_settings_page)
         selector = driver.find_element_by_id("defaultEngine")
-        popup = selector.find_element_by_tag_name("menupopup")
-        driver.execute_script("arguments[0].openMenu(new MouseEvent('click'))",
-                              selector)
-        WebDriverWait(driver, 10).until(EC.visibility_of(popup))
-
-        # For some reason, an XPath selector doesn't work here
-        engines = popup.find_elements_by_tag_name("menuitem")
-        found = False
+        count = int(selector.get_attribute("itemCount"))
         expected = v['label']
-        for engine in engines:
-            if engine.get_attribute("label") == expected:
-                found = True
-                break
-        assert found, "Search engine not found: {}".format(expected)
-        WebDriverWait(driver, 10).until(EC.visibility_of(engine))
-        engine.click()
+        i = 0
+        while (selector.get_attribute("label") != expected) and (i < count):
+            i = i + 1
+            selector.send_keys(Keys.ARROW_DOWN)
+        assert selector.get_attribute("label") == expected, \
+               "Search engine not found: {}".format(expected)
 
         driver.get(homepage)
         driver.find_element_by_id("newtab-search-text").send_keys("foobarbaz")
         driver.find_element_by_id("searchSubmit").click()
         WebDriverWait(driver, 10).until(EC.url_changes(homepage))
+        print("search URL for {}: {}".format(expected, driver.current_url))
         url = urlparse(driver.current_url)
-        print("netloc for {} [{}]: {}".format(
-                expected, v['netloc'], url.netloc))
         assert url.netloc == v['netloc']
         query = parse_qs(url.query)
         for pk, pv in v['params'].items():
-            print("query parameter for {} [{}={}]: {}".format(
-                    expected, pk, pv, query.get(pk)))
             assert query[pk] == [pv]
 
     driver.quit()
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/aboutdebugging.js firefox-85.0+build1/devtools/client/aboutdebugging/aboutdebugging.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/aboutdebugging.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/aboutdebugging.js	2021-01-18 19:58:08.000000000 +0000
@@ -130,9 +130,6 @@
     adbProcess.on("adb-ready", this.onAdbProcessReady);
     // get the initial status of adb process, in case it's already started
     this.onAdbProcessReady();
-
-    // Remove deprecated remote debugging extensions.
-    await adbAddon.uninstallUnsupportedExtensions();
   },
 
   onAdbAddonUpdated() {
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/src/actions/debug-targets.js firefox-85.0+build1/devtools/client/aboutdebugging/src/actions/debug-targets.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/src/actions/debug-targets.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/src/actions/debug-targets.js	2021-01-18 19:58:08.000000000 +0000
@@ -27,7 +27,6 @@
 } = require("devtools/client/aboutdebugging/src/modules/runtimes-state-helper");
 
 const {
-  DEBUG_TARGETS,
   DEBUG_TARGET_PANE,
   REQUEST_EXTENSIONS_FAILURE,
   REQUEST_EXTENSIONS_START,
@@ -52,17 +51,6 @@
 
 const Actions = require("devtools/client/aboutdebugging/src/actions/index");
 
-function isCachedActorNeeded(runtime, type, id) {
-  // Unique ids for workers were introduced in Firefox 68 (Bug 1539328). When debugging
-  // older browsers, the id falls back to the actor ID. Check if the target id is a worker
-  // actorID (which means getFrontByID() should return an actor with id).
-  // Can be removed when Firefox 68 is in Release channel.
-  return (
-    type === DEBUG_TARGETS.WORKER &&
-    runtime.runtimeDetails.clientWrapper.client.getFrontByID(id)
-  );
-}
-
 function getTabForUrl(url) {
   for (const navigator of Services.wm.getEnumerator("navigator:browser")) {
     for (const browser of navigator.gBrowser.browsers) {
@@ -81,31 +69,23 @@
 function inspectDebugTarget(type, id) {
   return async ({ dispatch, getState }) => {
     const runtime = getCurrentRuntime(getState().runtimes);
-    id = encodeURIComponent(id);
 
-    let url;
-    if (
-      runtime.id === RUNTIMES.THIS_FIREFOX &&
-      !isCachedActorNeeded(runtime, type, id)
-    ) {
-      // Even when debugging on This Firefox we need to re-use the client since the worker
-      // actor is cached in the client instance. Instead we should pass an id that does
-      // not depend on the client (such as the worker url). This will be fixed in
-      // Bug 1539328.
-      // Once the target is destroyed after closing the toolbox, the front will be gone
-      // and can no longer be used. When debugging This Firefox, workers are regularly
-      // updated so this is not an issue. On remote runtimes however, trying to inspect a
-      // worker a second time after closing the corresponding about:devtools-toolbox tab
-      // will fail. See Bug 1534201.
-      url = `about:devtools-toolbox?type=${type}&id=${id}`;
-    } else {
-      const remoteId = remoteClientManager.getRemoteId(
+    const urlParams = {
+      id,
+      type,
+    };
+
+    if (runtime.id !== RUNTIMES.THIS_FIREFOX) {
+      urlParams.remoteId = remoteClientManager.getRemoteId(
         runtime.id,
         runtime.type
       );
-      url = `about:devtools-toolbox?type=${type}&id=${id}&remoteId=${remoteId}`;
     }
 
+    const url = `about:devtools-toolbox?${new window.URLSearchParams(
+      urlParams
+    )}`;
+
     const existingTab = getTabForUrl(url);
     if (existingTab) {
       const navigator = existingTab.ownerGlobal;
@@ -192,17 +172,11 @@
         runtime.runtimeDetails.info.type,
         DEBUG_TARGET_PANE.TAB
       );
-      const tabs = isSupported
-        ? await clientWrapper.listTabs({
-            // Backward compatibility: this is only used for FF75 or older.
-            // The argument can be dropped when FF76 hits the release channel.
-            favicons: true,
-          })
-        : [];
+      const tabs = isSupported ? await clientWrapper.listTabs() : [];
 
-      // Fetch the missing information for all tabs.
+      // Fetch the favicon for all tabs.
       await Promise.all(
-        tabs.map(descriptorFront => descriptorFront.retrieveAsyncFormData())
+        tabs.map(descriptorFront => descriptorFront.retrieveFavicon())
       );
 
       dispatch({ type: REQUEST_TABS_SUCCESS, tabs });
@@ -224,15 +198,14 @@
       const addons = await clientWrapper.listAddons({
         iconDataURL: isIconDataURLRequired,
       });
-      let extensions = addons.filter(a => a.debuggable);
 
-      // Filter out hidden & system addons unless the dedicated preference is set to true.
-      if (!getState().ui.showHiddenAddons) {
-        // System addons should normally also have the hidden flag. However on DevTools
-        // side, `hidden` is not available on FF67 servers or older. Check both flags for
-        // backward compatibility.
-        extensions = extensions.filter(e => !e.isSystem && !e.hidden);
-      }
+      const showHiddenAddons = getState().ui.showHiddenAddons;
+
+      // Filter out non-debuggable addons as well as hidden ones, unless the dedicated
+      // preference is set to true.
+      const extensions = addons.filter(
+        a => a.debuggable && (!a.hidden || showHiddenAddons)
+      );
 
       const installedExtensions = extensions.filter(
         e => !e.temporarilyInstalled
@@ -292,16 +265,8 @@
           continue;
         }
 
-        try {
-          const subscription = await registrationFront.getPushSubscription();
-          serviceWorker.subscription = subscription;
-        } catch (e) {
-          // See Bug 1637687. On GeckoView, some PushSubscription methods are
-          // not implemented. PushSubscriptionActor was patched in FF78 to avoid
-          // throwing, but old servers might still throw.
-          // Backward-compatibility: remove when FF78 hits release.
-          console.error("Failed to retrieve service worker subscription", e);
-        }
+        const subscription = await registrationFront.getPushSubscription();
+        serviceWorker.subscription = subscription;
       }
 
       dispatch({
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/src/modules/client-wrapper.js firefox-85.0+build1/devtools/client/aboutdebugging/src/modules/client-wrapper.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/src/modules/client-wrapper.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/src/modules/client-wrapper.js	2021-01-18 19:58:08.000000000 +0000
@@ -127,8 +127,8 @@
     }
   }
 
-  async listTabs(options) {
-    return this.client.mainRoot.listTabs(options);
+  async listTabs() {
+    return this.client.mainRoot.listTabs();
   }
 
   async listAddons(options) {
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/src/modules/runtime-default-preferences.js firefox-85.0+build1/devtools/client/aboutdebugging/src/modules/runtime-default-preferences.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/src/modules/runtime-default-preferences.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/src/modules/runtime-default-preferences.js	2021-01-18 19:58:08.000000000 +0000
@@ -31,24 +31,7 @@
  *   PreferenceFront.
  * - type {String}: the preference type (either BOOL, CHAR or INT).
  */
-const DEFAULT_PREFERENCES = [
-  // Backward compatibility: can be removed when FF82 is on release.
-  // Fixed on the server by Bug 1662058.
-  {
-    prefName: "devtools.inspector.compatibility.target-browsers",
-    defaultValue: "",
-    trait: "targetBrowsersPref",
-    type: PREFERENCE_TYPES.CHAR,
-  },
-  // Backward compatibility: can be removed when FF81 is on release.
-  // Fixed on the server by Bug 1659866.
-  {
-    prefName: "devtools.overflow.debugging.enabled",
-    defaultValue: false,
-    trait: "overflowDebuggingPref",
-    type: PREFERENCE_TYPES.BOOL,
-  },
-];
+const DEFAULT_PREFERENCES = [];
 exports.DEFAULT_PREFERENCES = DEFAULT_PREFERENCES;
 
 const METHODS = {
@@ -71,15 +54,18 @@
  * corresponding to the provided clientWrapper, if needed.
  *
  * Note: prefDescriptors will most likely be DEFAULT_PREFERENCES when
- * used in production code, but can be parametrized for tests.
+ * used in production code, but can be parameterized for tests.
  *
  * @param {ClientWrapper} clientWrapper
  * @param {Array} prefDescriptors
  *        Array of preference descriptors, see DEFAULT_PREFERENCES.
  */
 async function setDefaultPreferencesIfNeeded(clientWrapper, prefDescriptors) {
-  const preferenceFront = await clientWrapper.getFront("preference");
+  if (!prefDescriptors || prefDescriptors.length === 0) {
+    return;
+  }
 
+  const preferenceFront = await clientWrapper.getFront("preference");
   const preferenceTraits = await preferenceFront.getTraits();
 
   // Note: using Promise.all here fails because the request/responses get mixed.
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_remote_runtime.js	2021-01-18 19:58:08.000000000 +0000
@@ -118,12 +118,9 @@
   // when the new tab was processed.
   info("Wait until the tab target for 'http://some.random/url.com' appears");
   const testTab = {
-    retrieveAsyncFormData: () => {},
+    retrieveFavicon: () => {},
     outerWindowID: 0,
-    traits: {
-      getFavicon: true,
-      hasTabInfo: true,
-    },
+    traits: {},
     url: "http://some.random/url.com",
   };
   remoteClient.listTabs = () => [testTab];
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_thisfirefox_worker_inspection.js firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_thisfirefox_worker_inspection.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_thisfirefox_worker_inspection.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_thisfirefox_worker_inspection.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,9 +20,6 @@
     serviceWorkers: [],
     sharedWorkers: [],
   });
-  // Override getFrontByID of client and getWorker function of root of client
-  // which is used in inspect action for worker.
-  thisFirefoxClient.client.getFrontByID = id => null;
   thisFirefoxClient.client.mainRoot = {
     getWorker: id => {
       return id === testWorker.id ? testWorker : null;
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_workers_remote_runtime.js	2021-01-18 19:58:08.000000000 +0000
@@ -136,12 +136,9 @@
   // when the new tab was processed.
   info("Wait until the tab target for 'http://some.random/url.com' appears");
   const testTab = {
-    retrieveAsyncFormData: () => {},
+    retrieveFavicon: () => {},
     outerWindowID: 0,
-    traits: {
-      getFavicon: true,
-      hasTabInfo: true,
-    },
+    traits: {},
     url: "http://some.random/url.com",
   };
   remoteClient.listTabs = () => [testTab];
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser.ini firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser.ini
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,7 @@
 [browser_aboutdebugging_devtoolstoolbox_navigate_reload_button.js]
 [browser_aboutdebugging_devtoolstoolbox_navigate_to_url.js]
 [browser_aboutdebugging_devtoolstoolbox_performance.js]
-skip-if = os == 'linux' && e10s && (asan || debug) # Same skip-if as old perf panel test suite. Bug 1254821
+skip-if = os == 'linux' && e10s && (asan || tsan || debug) # Same skip-if as old perf panel test suite. Bug 1254821
 [browser_aboutdebugging_devtoolstoolbox_reload.js]
 skip-if = verify || ccov || (os == 'linux' && debug) #bug 1544828, test loads the toolbox 2 times for each panel, might timeout or OOM
 [browser_aboutdebugging_devtoolstoolbox_shortcuts.js]
diff -Nru firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js
--- firefox-84.0.2+build1/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/aboutdebugging/test/browser/mocks/helper-client-wrapper-mock.js	2021-01-18 19:58:08.000000000 +0000
@@ -114,12 +114,9 @@
   // Create a fake about:debugging tab because our test helper openAboutDebugging
   // waits until about:debugging is displayed in the list of tabs.
   const mockAboutDebuggingTab = {
-    retrieveAsyncFormData: () => {},
+    retrieveFavicon: () => {},
     outerWindowID: 0,
-    traits: {
-      getFavicon: true,
-      hasTabInfo: true,
-    },
+    traits: {},
     url: "about:debugging",
   };
 
diff -Nru firefox-84.0.2+build1/devtools/client/accessibility/accessibility.css firefox-85.0+build1/devtools/client/accessibility/accessibility.css
--- firefox-84.0.2+build1/devtools/client/accessibility/accessibility.css	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/accessibility/accessibility.css	2021-01-18 19:58:08.000000000 +0000
@@ -290,6 +290,7 @@
 .description img {
   margin-inline-end: 12px;
   flex-basis: 42px;
+  height: 42px;
   flex-shrink: 0;
   -moz-context-properties: fill;
   fill: var(--grey-40);
diff -Nru firefox-84.0.2+build1/devtools/client/accessibility/utils/audit.js firefox-85.0+build1/devtools/client/accessibility/utils/audit.js
--- firefox-84.0.2+build1/devtools/client/accessibility/utils/audit.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/accessibility/utils/audit.js	2021-01-18 19:58:08.000000000 +0000
@@ -21,7 +21,7 @@
 
   onProgressForWalker(walker, progress) {
     this.combinedProgress.set(walker, progress);
-    // We did not get all initial progres events from all frames, do not
+    // We did not get all initial progress events from all frames, do not
     // relay them to the client until we can calculate combined total below.
     if (this.combinedProgress.size < this.totalFrames) {
       return;
@@ -29,15 +29,10 @@
 
     let combinedTotal = 0;
     let combinedCompleted = 0;
-    // TODO: We can stop using percentage when Firefox 79 is on the release
-    // channel. Until then ...
-    for (const {
-      completed,
-      total,
-      percentage,
-    } of this.combinedProgress.values()) {
+
+    for (const { completed, total } of this.combinedProgress.values()) {
       combinedTotal += total;
-      combinedCompleted += completed ?? Math.round((percentage * total) / 100);
+      combinedCompleted += completed;
     }
     this.onProgress({
       total: combinedTotal,
diff -Nru firefox-84.0.2+build1/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js firefox-85.0+build1/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
--- firefox-84.0.2+build1/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,6 @@
 import { showMenu } from "../../context-menu/menu";
 import { connect } from "../../utils/connect";
 import actions from "../../actions";
-import { features } from "../../utils/prefs";
 
 import {
   getSelectedSource,
@@ -126,7 +125,7 @@
   onContextMenu = (event: any, item: any) => {
     const { addWatchpoint, removeWatchpoint } = this.props;
 
-    if (!features.watchpoints || !item.parent || !item.contents.configurable) {
+    if (!item.parent || !item.contents.configurable) {
       return;
     }
 
diff -Nru firefox-84.0.2+build1/devtools/client/debugger/src/utils/prefs.js firefox-85.0+build1/devtools/client/debugger/src/utils/prefs.js
--- firefox-84.0.2+build1/devtools/client/debugger/src/utils/prefs.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/debugger/src/utils/prefs.js	2021-01-18 19:58:08.000000000 +0000
@@ -75,7 +75,6 @@
   pref("devtools.debugger.features.log-points", true);
   pref("devtools.debugger.features.inline-preview", true);
   pref("devtools.debugger.features.overlay-step-buttons", true);
-  pref("devtools.debugger.features.watchpoints", true);
   pref("devtools.debugger.features.frame-step", true);
   pref("devtools.editor.tabsize", 2);
 }
@@ -157,7 +156,6 @@
   commandClick: ["Bool", "command-click"],
   showOverlay: ["Bool", "overlay"],
   inlinePreview: ["Bool", "inline-preview"],
-  watchpoints: ["Bool", "watchpoints"],
   windowlessServiceWorkers: ["Bool", "windowless-service-workers"],
   frameStep: ["Bool", "frame-step"],
 });
diff -Nru firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser_dbg-paused-overlay-loading.js firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser_dbg-paused-overlay-loading.js
--- firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser_dbg-paused-overlay-loading.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser_dbg-paused-overlay-loading.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+/* 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 that the paused overlay isn't visible after resuming if the debugger paused
+// while the DOM was still loading (Bug 1678636).
+
+add_task(async function() {
+  const dbg = await initDebuggerWithAbsoluteURL(
+    "data:text/html,<meta charset=utf8><script>debugger;</script>"
+  );
+
+  info("Reload the page to hit the debugger statement while loading");
+  reload(dbg);
+  await waitForPaused(dbg);
+  // TODO: Check that the overlay is displayed (Bug 1580394), it's not at the moment.
+  ok(true, "We're paused");
+
+  // TODO: Resume with clicking on the overlay button, when Bug 1580394 is fixed.
+  info("Resume");
+  resume(dbg);
+  await waitFor(() => !isPaused(dbg), "Wait for the debugger to resume");
+  ok(true, "We're not paused anymore");
+
+  info("Wait for a bit, just to make sure the overlay isn't displayed");
+  await waitForTime(5000);
+
+  const testFront = await getTestActor(dbg.toolbox);
+  const isPausedOverlayVisible = await testFront.isPausedDebuggerOverlayVisible();
+  is(
+    isPausedOverlayVisible,
+    false,
+    "The pause overlay is not visible after resuming"
+  );
+});
diff -Nru firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js
--- firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,6 @@
 // then removing and adding a watchpoint during the same pause
 
 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");
@@ -36,7 +35,7 @@
   resume(dbg);
   await waitForPaused(dbg);
   assertPausedAtSourceAndLine(dbg, sourceId, 19);
-   
+
   info("Remove the get watchpoint on b");
   const removedWatchpoint1 = waitForDispatch(dbg, "REMOVE_WATCHPOINT");
   const el1 = await waitForElementWithSelector(dbg, ".remove-get-watchpoint");
@@ -44,11 +43,13 @@
   clickElementWithSelector(dbg, ".remove-get-watchpoint");
   await removedWatchpoint1;
 
-  info("Resume and wait to skip the second `obj.b` and pause on the debugger statement");
+  info(
+    "Resume and wait to skip the second `obj.b` and pause on the debugger statement"
+  );
   resume(dbg);
   await waitForPaused(dbg);
   assertPausedAtSourceAndLine(dbg, sourceId, 21);
-   
+
   info("Resume and pause on the debugger statement in getB");
   resume(dbg);
   await waitForPaused(dbg);
@@ -68,19 +69,19 @@
   resume(dbg);
   await waitForPaused(dbg);
   assertPausedAtSourceAndLine(dbg, sourceId, 6);
-  
+
   info("Resume and pause on the debugger statement");
   resume(dbg);
   await waitForPaused(dbg);
   assertPausedAtSourceAndLine(dbg, sourceId, 24);
-  
+
   info("Remove the get watchpoint on b");
   const removedWatchpoint2 = waitForDispatch(dbg, "REMOVE_WATCHPOINT");
   await toggleScopeNode(dbg, 3);
   await rightClickScopeNode(dbg, 5);
   const el2 = await waitForElementWithSelector(dbg, ".remove-get-watchpoint");
   el2.scrollIntoView();
-     clickElementWithSelector(dbg, ".remove-get-watchpoint");
+  clickElementWithSelector(dbg, ".remove-get-watchpoint");
   await removedWatchpoint2;
 
   info("Add back the get watchpoint on b");
@@ -103,4 +104,3 @@
 async function getScopeValue(dbg, index) {
   return (await waitForElement(dbg, "scopeValue", index)).innerText;
 }
-
diff -Nru firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser.ini firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser.ini
--- firefox-84.0.2+build1/devtools/client/debugger/test/mochitest/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/debugger/test/mochitest/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -115,6 +115,7 @@
 [browser_dbg-pause-on-next.js]
 [browser_dbg-pause-ux.js]
 skip-if = os == "win"
+[browser_dbg-paused-overlay-loading.js]
 [browser_dbg-paused-overlay.js]
 [browser_dbg-navigation-when-paused.js]
 [browser_dbg-navigation.js]
@@ -194,7 +195,12 @@
 [browser_dbg-windowless-service-workers.js]
 skip-if = !serviceworker_e10s || (os == 'linux' && ccov) # parent intercept mode is needed bug 1588154. Bug 1613543, the test consistently timeouts on Linux coverage builds.
 [browser_dbg-worker-scopes.js]
-skip-if = (os == 'linux' && debug) || (os == 'linux' && asan) || ccov  #Bug 1456013, Bug 1559547
+skip-if = 
+  os == 'linux' && debug # Bug 1456013
+  ccov # Bug 1456013
+  os == 'linux' && asan # Bug 1559547
+  os == 'mac' # Bug 1607321
+  os == 'win' && os_version == '10.0' && bits == 64 # Bug 1607321
 [browser_dbg-event-handler.js]
 [browser_dbg-event-breakpoints.js]
 [browser_dbg-eval-throw.js]
diff -Nru firefox-84.0.2+build1/devtools/client/definitions.js firefox-85.0+build1/devtools/client/definitions.js
--- firefox-84.0.2+build1/devtools/client/definitions.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/definitions.js	2021-01-18 19:58:08.000000000 +0000
@@ -319,11 +319,7 @@
   tooltip: l10n("memory.tooltip"),
 
   isTargetSupported: function(target) {
-    return (
-      target.getTrait("heapSnapshots") &&
-      !target.isAddon &&
-      !target.isWorkerTarget
-    );
+    return !target.isAddon && !target.isWorkerTarget;
   },
 
   build: function(frame, target) {
@@ -377,10 +373,7 @@
   inMenu: true,
 
   isTargetSupported: function(target) {
-    return (
-      target.isLocalTab ||
-      (target.hasActor("storage") && target.getTrait("storageInspector"))
-    );
+    return target.hasActor("storage");
   },
 
   build: function(iframeWindow, toolbox) {
@@ -581,10 +574,8 @@
       if (highlighter.isShown()) {
         return highlighter.hide();
       }
-      // Starting with FF63, higlighter's spec accept a null first argument.
-      // Still pass an empty object to fake a domnode front in order to support old
-      // servers.
-      return highlighter.show({});
+
+      return highlighter.show();
     },
     isChecked(toolbox) {
       // if the inspector doesn't exist, then the highlighter has not yet been connected
diff -Nru firefox-84.0.2+build1/devtools/client/devtools-client.js firefox-85.0+build1/devtools/client/devtools-client.js
--- firefox-84.0.2+build1/devtools/client/devtools-client.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/devtools-client.js	2021-01-18 19:58:08.000000000 +0000
@@ -344,9 +344,6 @@
    *                     that is copied.  See stream-utils.js.
    */
   startBulkRequest(request) {
-    if (!this.traits.bulk) {
-      throw Error("Server doesn't support bulk transfers");
-    }
     if (!this.mainRoot) {
       throw Error("Have not yet received a hello packet from the server.");
     }
diff -Nru firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js firefox-85.0+build1/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js
--- firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/browser-toolbox/test/browser_browser_toolbox_print_preview.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// There are shutdown issues for which multiple rejections are left uncaught.
+// See bug 1018184 for resolving these issues.
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
+PromiseTestUtils.allowMatchingRejectionsGlobally(/File closed/);
+
+// On debug test machine, it takes about 50s to run the test.
+requestLongerTimeout(4);
+
+// Test that the MultiProcessBrowserToolbox can be opened when print preview is
+// started, and can select elements in the print preview document.
+add_task(async function() {
+  // Forces the Browser Toolbox to open on the inspector by default
+  await pushPref("devtools.browsertoolbox.panel", "inspector");
+
+  // Force the modal print preview, otherwise the printPreview command will not
+  // open the expected UI.
+  await pushPref("print.tab_modal.enabled", true);
+
+  // Open the tab *after* opening the Browser Toolbox in order to force creating the remote frames
+  // late and exercise frame target watching code.
+  await addTab(`data:text/html,<div id="test-div">PRINT PREVIEW TEST</div>`);
+
+  info("Start the print preview for the current tab");
+  document.getElementById("cmd_printPreview").doCommand();
+
+  const ToolboxTask = await initBrowserToolboxTask({
+    enableBrowserToolboxFission: true,
+  });
+  await ToolboxTask.importFunctions({
+    selectNodeFront,
+  });
+
+  const hasCloseButton = await ToolboxTask.spawn(null, async () => {
+    /* global gToolbox */
+    const inspector = gToolbox.getPanel("inspector");
+
+    info("Select the printpreview document in the markup view");
+    const browser = await selectNodeFront(
+      inspector,
+      inspector.walker,
+      'browser[printpreview="true"]'
+    );
+    const browserTarget = await browser.connectToRemoteFrame();
+    const walker = (await browserTarget.getFront("inspector")).walker;
+
+    info("Select the #test-div in the print preview document");
+    await selectNodeFront(inspector, walker, "#test-div");
+    return !!gToolbox.doc.getElementById("toolbox-close");
+  });
+  ok(!hasCloseButton, "Browser toolbox doesn't have a close button");
+
+  await ToolboxTask.destroy();
+});
diff -Nru firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/test/browser.ini firefox-85.0+build1/devtools/client/framework/browser-toolbox/test/browser.ini
--- firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/test/browser.ini	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/browser-toolbox/test/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -28,5 +28,6 @@
 [browser_browser_toolbox_evaluation_context.js]
 [browser_browser_toolbox_fission_contentframe_inspector.js]
 [browser_browser_toolbox_fission_inspector.js]
-skip-if = (os == 'linux' || os == 'mac' || (os == 'win' && os_version == '10.0')) && bits == 64 #Bug 1605107 
+skip-if = (os == 'linux' || os == 'mac' || (os == 'win' && os_version == '10.0')) && bits == 64 #Bug 1605107
+[browser_browser_toolbox_print_preview.js]
 [browser_browser_toolbox_rtl.js]
diff -Nru firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/window.html firefox-85.0+build1/devtools/client/framework/browser-toolbox/window.html
--- firefox-84.0.2+build1/devtools/client/framework/browser-toolbox/window.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/browser-toolbox/window.html	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="chrome://global/skin/global.css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/common.css"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/browser-toolbox/window.css"/>
-    <script src="chrome://global/content/globalOverlay.js"></script>
     <script src="chrome://devtools/content/framework/browser-toolbox/window.js"></script>
     <script src="chrome://global/content/viewSourceUtils.js"></script>
     <script src="chrome://browser/content/utilityOverlay.js"></script>
diff -Nru firefox-84.0.2+build1/devtools/client/framework/test/browser.ini firefox-85.0+build1/devtools/client/framework/test/browser.ini
--- firefox-84.0.2+build1/devtools/client/framework/test/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/test/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -98,7 +98,7 @@
 [browser_toolbox_hosts_size.js]
 [browser_toolbox_hosts_telemetry.js]
 [browser_toolbox_keyboard_navigation.js]
-skip-if = os == "mac" # Full keyboard navigation on OSX only works if Full Keyboard Access setting is set to All Control in System Keyboard Preferences
+[browser_toolbox_keyboard_navigation_notification_box.js]
 [browser_toolbox_meatball.js]
 [browser_toolbox_options.js]
 [browser_toolbox_options_multiple_tabs.js]
diff -Nru firefox-84.0.2+build1/devtools/client/framework/test/browser_toolbox_keyboard_navigation_notification_box.js firefox-85.0+build1/devtools/client/framework/test/browser_toolbox_keyboard_navigation_notification_box.js
--- firefox-84.0.2+build1/devtools/client/framework/test/browser_toolbox_keyboard_navigation_notification_box.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/test/browser_toolbox_keyboard_navigation_notification_box.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,49 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Tests keyboard navigation of the DevTools notification box.
+
+// The test page attempts to load a stylesheet at an invalid URL which will
+// trigger a devtools notification to show up on top of the window.
+const TEST_PAGE = `<link rel="stylesheet" type="text/css" href="http://mochi.test:1234/invalid.port">`;
+const TEST_URL = `data:text/html;charset=utf8,${TEST_PAGE}`;
+
+add_task(async function() {
+  info("Create a test tab and open the toolbox");
+  const toolbox = await openNewTabAndToolbox(TEST_URL, "styleeditor");
+  const doc = toolbox.doc;
+
+  info("Wait until the notification box displays the stylesheet warning");
+  const notificationBox = await waitFor(() =>
+    doc.querySelector(".notificationbox")
+  );
+
+  ok(
+    notificationBox.querySelector(".notification"),
+    "A notification is rendered"
+  );
+
+  const toolbar = doc.querySelector(".devtools-tabbar");
+  const tabButtons = toolbar.querySelectorAll(".devtools-tab, button");
+
+  // Put the keyboard focus onto the first tab button.
+  tabButtons[0].focus();
+  is(doc.activeElement.id, tabButtons[0].id, "First tab button is focused.");
+
+  // Move the focus to the notification box.
+  info("Send a shift+tab key event to focus the previous focusable element");
+  EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
+  is(
+    doc.activeElement,
+    notificationBox.querySelector(".messageCloseButton"),
+    "The focus is on the close button of the notification"
+  );
+
+  info("Send a vk_space key event to click on the close button");
+  EventUtils.synthesizeKey("VK_SPACE");
+
+  info("Wait until the notification is removed");
+  await waitUntil(() => !notificationBox.querySelector(".notificationbox"));
+});
diff -Nru firefox-84.0.2+build1/devtools/client/framework/test/browser_toolbox_remoteness_change.js firefox-85.0+build1/devtools/client/framework/test/browser_toolbox_remoteness_change.js
--- firefox-84.0.2+build1/devtools/client/framework/test/browser_toolbox_remoteness_change.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/test/browser_toolbox_remoteness_change.js	2021-01-18 19:58:08.000000000 +0000
@@ -49,7 +49,7 @@
     // So, fallback to BrowserTestUtils helpers in this test when
     // the target-switching preference is turned off.
     const onBrowserLoaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-    await BrowserTestUtils.loadURI(tab.linkedBrowser, URL_2);
+    BrowserTestUtils.loadURI(tab.linkedBrowser, URL_2);
     await onBrowserLoaded;
   }
 
diff -Nru firefox-84.0.2+build1/devtools/client/framework/toolbox.js firefox-85.0+build1/devtools/client/framework/toolbox.js
--- firefox-84.0.2+build1/devtools/client/framework/toolbox.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/toolbox.js	2021-01-18 19:58:08.000000000 +0000
@@ -305,7 +305,6 @@
   this._saveSplitConsoleHeight = this._saveSplitConsoleHeight.bind(this);
   this._onFocus = this._onFocus.bind(this);
   this._onBrowserMessage = this._onBrowserMessage.bind(this);
-  this._updateTextBoxMenuItems = this._updateTextBoxMenuItems.bind(this);
   this._onPerformanceFrontEvent = this._onPerformanceFrontEvent.bind(this);
   this._onTabsOrderUpdated = this._onTabsOrderUpdated.bind(this);
   this._onToolbarFocus = this._onToolbarFocus.bind(this);
@@ -3793,21 +3792,6 @@
   },
 
   /**
-   * Enable / disable necessary textbox menu items using globalOverlay.js.
-   */
-  _updateTextBoxMenuItems: function() {
-    const window = this.win;
-    [
-      "cmd_undo",
-      "cmd_delete",
-      "cmd_cut",
-      "cmd_copy",
-      "cmd_paste",
-      "cmd_selectAll",
-    ].forEach(window.goUpdateCommand);
-  },
-
-  /**
    * Open the textbox context menu at given coordinates.
    * Panels in the toolbox can call this on contextmenu events with event.screenX/Y
    * instead of having to implement their own copy/paste/selectAll menu.
@@ -3979,14 +3963,11 @@
     );
   },
 
-  viewElementInInspector: async function(objectActor, reason) {
+  viewElementInInspector: async function(objectGrip, reason) {
     // Open the inspector and select the DOM Element.
     await this.loadTool("inspector");
     const inspector = this.getPanel("inspector");
-    const nodeFound = await inspector.inspectNodeActor(
-      objectActor.actor,
-      reason
-    );
+    const nodeFound = await inspector.inspectNodeActor(objectGrip, reason);
     if (nodeFound) {
       await this.selectTool("inspector", reason);
     }
diff -Nru firefox-84.0.2+build1/devtools/client/framework/toolbox-options.js firefox-85.0+build1/devtools/client/framework/toolbox-options.js
--- firefox-84.0.2+build1/devtools/client/framework/toolbox-options.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/toolbox-options.js	2021-01-18 19:58:08.000000000 +0000
@@ -289,7 +289,10 @@
       checkboxLabel.appendChild(checkboxInput);
       checkboxLabel.appendChild(checkboxSpanLabel);
 
-      // TODO: remove in Firefox 71, with bug #1519103
+      // We shouldn't have deprecated tools anymore, but we might have one in the future,
+      // when migrating the storage inspector to the application panel (Bug 1681059).
+      // Let's keep this code for now so we keep the l10n property around and avoid
+      // unnecessary translation work if we need it again in the future.
       if (tool.deprecated) {
         const deprecationURL = this.panelDoc.createElement("a");
         deprecationURL.title = deprecationURL.href = tool.deprecationURL;
diff -Nru firefox-84.0.2+build1/devtools/client/framework/toolbox.xhtml firefox-85.0+build1/devtools/client/framework/toolbox.xhtml
--- firefox-84.0.2+build1/devtools/client/framework/toolbox.xhtml	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/framework/toolbox.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -20,7 +20,6 @@
   <script src="chrome://devtools/content/shared/theme-switching.js"/>
   <script src="chrome://global/content/viewSourceUtils.js"/>
 
-  <script src="chrome://global/content/globalOverlay.js"/>
   <script src="chrome://devtools/content/framework/toolbox-init.js"/>
 
   <vbox id="toolbox-container" flex="1" role="group">
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/accessibility.js firefox-85.0+build1/devtools/client/fronts/accessibility.js
--- firefox-84.0.2+build1/devtools/client/fronts/accessibility.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/accessibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -531,8 +531,7 @@
     try {
       this._traits = await this.getTraits();
     } catch (e) {
-      // Backward compatibility: can be removed when FF84 is on the release
-      // channel.
+      // @backward-compat { version 84 } getTraits isn't available on older server.
       this._traits = {};
     }
   }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/compatibility.js firefox-85.0+build1/devtools/client/fronts/compatibility.js
--- firefox-84.0.2+build1/devtools/client/fronts/compatibility.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/compatibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,59 +10,7 @@
 } = require("devtools/shared/protocol");
 const { compatibilitySpec } = require("devtools/shared/specs/compatibility");
 
-const PREF_TARGET_BROWSERS = "devtools.inspector.compatibility.target-browsers";
-
-class CompatibilityFront extends FrontClassWithSpec(compatibilitySpec) {
-  constructor(client, targetFront, parentFront) {
-    super(client, targetFront, parentFront);
-    this.client = client;
-  }
-
-  async initialize() {
-    // Backward-compatibility: can be removed when FF81 is on the release
-    // channel. See 1659866.
-    const preferenceFront = await this.client.mainRoot.getFront("preference");
-    try {
-      await preferenceFront.getCharPref(PREF_TARGET_BROWSERS);
-    } catch (e) {
-      // If `getCharPref` failed, the preference is not set on the server (most
-      // likely Fenix). Set a default value, otherwise compatibility actor
-      // methods might throw.
-      await preferenceFront.setCharPref(PREF_TARGET_BROWSERS, "");
-    }
-  }
-
-  /*
-   * Backwards compatibility wrapper for getCSSDeclarationBlockIssues.
-   * This can be removed once FF82 hits the release channel
-   */
-  async _getTraits() {
-    if (!this._traits) {
-      try {
-        // From FF82+, getTraits() is supported
-        const { traits } = await super.getTraits();
-        this._traits = traits;
-      } catch (e) {
-        this._traits = {};
-      }
-    }
-
-    return this._traits;
-  }
-
-  /*
-   * Backwards compatibility wrapper for getCSSDeclarationBlockIssues.
-   * This can be removed once FF82 hits the release channel
-   */
-  async getCSSDeclarationBlockIssues(declarationBlock, targetBrowsers) {
-    const traits = await this._getTraits();
-    if (!traits.declarationBlockIssueComputationEnabled) {
-      return [];
-    }
-
-    return super.getCSSDeclarationBlockIssues(declarationBlock, targetBrowsers);
-  }
-}
+class CompatibilityFront extends FrontClassWithSpec(compatibilitySpec) {}
 
 exports.CompatibilityFront = CompatibilityFront;
 registerFront(CompatibilityFront);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/css-properties.js firefox-85.0+build1/devtools/client/fronts/css-properties.js
--- firefox-84.0.2+build1/devtools/client/fronts/css-properties.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/css-properties.js	2021-01-18 19:58:08.000000000 +0000
@@ -238,12 +238,6 @@
   // and it is not the client CSS_PROPERTIES_DB object.
   // (prevent comparing to CSS_PROPERTIES_DB to avoid loading client database)
   if (typeof db.from == "string") {
-    // Firefox 49's getCSSDatabase() just returned the properties object, but
-    // now it returns an object with multiple types of CSS information.
-    if (!db.properties) {
-      db = { properties: db };
-    }
-
     const missingSupports = !db.properties.color.supports;
     const missingValues = !db.properties.color.values;
     const missingSubproperties = !db.properties.background.subproperties;
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/descriptors/process.js firefox-85.0+build1/devtools/client/fronts/descriptors/process.js
--- firefox-84.0.2+build1/devtools/client/fronts/descriptors/process.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/descriptors/process.js	2021-01-18 19:58:08.000000000 +0000
@@ -51,8 +51,7 @@
     front.actorID = form.actor;
     front.form(form);
 
-    // FF84+ pass the processID via ContentProcessTargetFront's form, so that
-    // there is no need to override it from the descriptor anymore
+    // @backward-compat { version 84 } Older server don't send the processID in the form
     if (!front.processID) {
       front.processID = this.id;
     }
@@ -99,15 +98,6 @@
     return this._targetFrontPromise;
   }
 
-  getCachedWatcher() {
-    for (const child of this.poolChildren()) {
-      if (child.typeName == "watcher") {
-        return child;
-      }
-    }
-    return null;
-  }
-
   destroy() {
     if (this._processTargetFront) {
       this._processTargetFront.destroy();
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/descriptors/tab.js firefox-85.0+build1/devtools/client/fronts/descriptors/tab.js
--- firefox-84.0.2+build1/devtools/client/fronts/descriptors/tab.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/descriptors/tab.js	2021-01-18 19:58:08.000000000 +0000
@@ -116,7 +116,7 @@
 
   get favicon() {
     // Note: the favicon is not part of the default form() payload, it will be
-    // added in `retrieveAsyncFormData`.
+    // added in `retrieveFavicon`.
     return this._form.favicon;
   }
 
@@ -144,41 +144,19 @@
   }
 
   /**
-   * This method is mostly intended for backward compatibility (FF76 and older).
+   * Safely retrieves the favicon via getFavicon() and populates this._form.favicon.
    *
-   * It also retrieves the favicon via getFavicon() for regular servers, but
-   * the main reason this is done here is to keep it close to the solution
-   * used to get the favicon for FF75.
-   *
-   * Once FF75 & FF76 hit release, we could let callers explicitly retrieve the
-   * favicon instead of inserting it in the form dynamically.
+   * We could let callers explicitly retrieve the favicon instead of inserting it in the
+   * form dynamically.
    */
-  async retrieveAsyncFormData() {
+  async retrieveFavicon() {
     try {
-      if (!this.traits.hasTabInfo) {
-        // Backward compatibility for FF76 or older
-        const targetForm = await super.getTarget();
-        this._form.outerWindowID = targetForm.outerWindowID;
-        this._form.title = targetForm.title;
-        this._form.url = targetForm.url;
-
-        if (!this.traits.getFavicon) {
-          // Backward compatibility for FF75 or older.
-          this._form.favicon = targetForm.favicon;
-        }
-      }
-
-      if (this.traits.getFavicon) {
-        this._form.favicon = await this.getFavicon();
-      }
+      this._form.favicon = await this.getFavicon();
     } catch (e) {
       // We might request the data for a tab which is going to be destroyed.
       // In this case the TargetFront will be destroyed. Otherwise log an error.
       if (!this.isDestroyed()) {
-        console.error(
-          "Failed to retrieve the async form data for " + this.url,
-          e
-        );
+        console.error("Failed to retrieve the favicon for " + this.url, e);
       }
     }
   }
@@ -210,15 +188,6 @@
     return this._targetFrontPromise;
   }
 
-  getCachedWatcher() {
-    for (const child of this.poolChildren()) {
-      if (child.typeName == "watcher") {
-        return child;
-      }
-    }
-    return null;
-  }
-
   /**
    * Handle tabs events.
    */
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/descriptors/worker.js firefox-85.0+build1/devtools/client/fronts/descriptors/worker.js
--- firefox-84.0.2+build1/devtools/client/fronts/descriptors/worker.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/descriptors/worker.js	2021-01-18 19:58:08.000000000 +0000
@@ -31,10 +31,7 @@
 
   form(json) {
     this.actorID = json.actor;
-    // `id` was added in Firefox 68 to the worker target actor. Fallback to the actorID
-    // when debugging older clients.
-    // Fallback can be removed when Firefox 68 will be in the Release channel.
-    this.id = json.id || this.actorID;
+    this.id = json.id;
 
     // Save the full form for Target class usage.
     // Do not use `form` name to avoid colliding with protocol.js's `form` method
@@ -91,20 +88,12 @@
         return;
       }
 
-      // Immediately retrieve console and thread actors that will be later used by Target.
-      let connectResponse;
-      if (this.actorID.includes("workerDescriptor")) {
-        connectResponse = await super.getTarget();
-      } else {
-        // Backwards compatibility for FF82 servers and below.
-        // Can be deleted once FF83 is merged into release.
-        connectResponse = await this.connect({});
-      }
+      const workerTargetForm = await super.getTarget();
 
       // Set the console actor ID on the form to expose it to Target.attachConsole
       // Set the ThreadActor on the target form so it is accessible by getFront
-      this.targetForm.consoleActor = connectResponse.consoleActor;
-      this.targetForm.threadActor = connectResponse.threadActor;
+      this.targetForm.consoleActor = workerTargetForm.consoleActor;
+      this.targetForm.threadActor = workerTargetForm.threadActor;
 
       if (this.isDestroyedOrBeingDestroyed()) {
         return;
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/inspector.js firefox-85.0+build1/devtools/client/fronts/inspector.js
--- firefox-84.0.2+build1/devtools/client/fronts/inspector.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/inspector.js	2021-01-18 19:58:08.000000000 +0000
@@ -58,11 +58,6 @@
     );
     this.walker = await this.getWalker({
       showAllAnonymousContent,
-      // Backward compatibility for Firefox 74 or older.
-      // getWalker() now uses a single boolean flag to drive the display of
-      // both anonymous content and user-agent shadow roots.
-      // Older servers used separate flags. See Bug 1613773.
-      showUserAgentShadowRoots: showAllAnonymousContent,
     });
 
     // We need to reparent the RootNode of remote iframe Walkers
@@ -177,16 +172,6 @@
    *                                    if the NodeFront couldn't be created/retrieved.
    */
   async getNodeFrontFromNodeGrip(grip) {
-    const gripHasContentDomReference = "contentDomReference" in grip;
-
-    if (!gripHasContentDomReference) {
-      // Backward compatibility ( < Firefox 71):
-      // If the grip does not have a contentDomReference, we can't know in which browsing
-      // context id the node lives. We fall back on gripToNodeFront that might retrieve
-      // the expected nodeFront.
-      return this.walker.gripToNodeFront(grip);
-    }
-
     return this.getNodeActorFromContentDomReference(grip.contentDomReference);
   }
 
@@ -210,8 +195,8 @@
     // fetch the node's target.
     let target;
     if (descriptorFront && descriptorFront.traits.watcher) {
-      const watcher = await descriptorFront.getWatcher();
-      target = await watcher.getBrowsingContextTarget(browsingContextId);
+      const watcherFront = await descriptorFront.getWatcher();
+      target = await watcherFront.getBrowsingContextTarget(browsingContextId);
     } else {
       // For descriptors which don't expose a watcher (e.g. WebExtension)
       // we used to call RootActor::getBrowsingContextDescriptor, but it was
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/layout.js firefox-85.0+build1/devtools/client/fronts/layout.js
--- firefox-84.0.2+build1/devtools/client/fronts/layout.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/layout.js	2021-01-18 19:58:08.000000000 +0000
@@ -119,13 +119,8 @@
 
   /**
    * Get the text direction of the grid container.
-   * Added in Firefox 60.
    */
   get direction() {
-    if (!this._form.direction) {
-      return "ltr";
-    }
-
     return this._form.direction;
   }
 
@@ -145,13 +140,8 @@
 
   /**
    * Get the writing mode of the grid container.
-   * Added in Firefox 60.
    */
   get writingMode() {
-    if (!this._form.writingMode) {
-      return "horizontal-tb";
-    }
-
     return this._form.writingMode;
   }
 }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/moz.build firefox-85.0+build1/devtools/client/fronts/moz.build
--- firefox-84.0.2+build1/devtools/client/fronts/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -30,7 +30,8 @@
     "manifest.js",
     "media-rule.js",
     "memory.js",
-    "network.js",
+    "network-content.js",
+    "network-parent.js",
     "node.js",
     "object.js",
     "page-style.js",
@@ -44,7 +45,6 @@
     "root.js",
     "screenshot.js",
     "source.js",
-    "stacktraces.js",
     "storage.js",
     "string.js",
     "style-rule.js",
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/network-content.js firefox-85.0+build1/devtools/client/fronts/network-content.js
--- firefox-84.0.2+build1/devtools/client/fronts/network-content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/network-content.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,22 @@
+/* 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 {
+  FrontClassWithSpec,
+  registerFront,
+} = require("devtools/shared/protocol");
+const { networkContentSpec } = require("devtools/shared/specs/network-content");
+
+class NetworkContentFront extends FrontClassWithSpec(networkContentSpec) {
+  constructor(client, targetFront, parentFront) {
+    super(client, targetFront, parentFront);
+    // Attribute name from which to retrieve the actorID out of the target actor's form
+    this.formAttributeName = "networkContentActor";
+  }
+}
+
+exports.NetworkContentFront = NetworkContentFront;
+registerFront(NetworkContentFront);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/network.js firefox-85.0+build1/devtools/client/fronts/network.js
--- firefox-84.0.2+build1/devtools/client/fronts/network.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/network.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const {
-  FrontClassWithSpec,
-  registerFront,
-} = require("devtools/shared/protocol");
-const { networkSpec } = require("devtools/shared/specs/network");
-
-/**
- * Client side for the network actor, used for managing network requests.
- */
-
-class NetworkFront extends FrontClassWithSpec(networkSpec) {
-  constructor(client, targetFront, parentFront) {
-    super(client, targetFront, parentFront);
-    // Attribute name from which to retrieve the actorID out of the target actor's form
-    this.formAttributeName = "networkActor";
-  }
-}
-
-registerFront(NetworkFront);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/network-parent.js firefox-85.0+build1/devtools/client/fronts/network-parent.js
--- firefox-84.0.2+build1/devtools/client/fronts/network-parent.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/network-parent.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,25 @@
+/* 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 {
+  FrontClassWithSpec,
+  registerFront,
+} = require("devtools/shared/protocol");
+const { networkParentSpec } = require("devtools/shared/specs/network-parent");
+
+/**
+ * Client side for the network actor, used for managing network requests.
+ */
+
+class NetworkParentFront extends FrontClassWithSpec(networkParentSpec) {
+  constructor(client, targetFront, parentFront) {
+    super(client, targetFront, parentFront);
+    // Attribute name from which to retrieve the actorID out of the target actor's form
+    this.formAttributeName = "networkParentActor";
+  }
+}
+
+registerFront(NetworkParentFront);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/node.js firefox-85.0+build1/devtools/client/fronts/node.js
--- firefox-84.0.2+build1/devtools/client/fronts/node.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/node.js	2021-01-18 19:58:08.000000000 +0000
@@ -321,12 +321,6 @@
     return this._form.isTopLevelDocument;
   }
 
-  // Backward compatibility: needed when connecting to older servers.
-  // Can be removed when Firefox 81 is on the release channel.
-  set isTopLevelDocument(isTopLevelDocument) {
-    this._form.isTopLevelDocument = isTopLevelDocument;
-  }
-
   get isShadowRoot() {
     return this._form.isShadowRoot;
   }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/object.js firefox-85.0+build1/devtools/client/fronts/object.js
--- firefox-84.0.2+build1/devtools/client/fronts/object.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/object.js	2021-01-18 19:58:08.000000000 +0000
@@ -240,6 +240,43 @@
   }
 
   /**
+   * Request the state of a promise.
+   */
+  async getPromiseState() {
+    if (this._grip.class !== "Promise") {
+      console.error("getPromiseState is only valid for promise grips.");
+      return null;
+    }
+
+    let response, promiseState;
+    try {
+      response = await super.promiseState();
+      promiseState = response.promiseState;
+    } catch (error) {
+      // @backward-compat { version 85 } On older server, the promiseState request didn't
+      // didn't exist (bug 1552648). The promise state was directly included in the grip.
+      if (error.message.includes("unrecognizedPacketType")) {
+        promiseState = this._grip.promiseState;
+        response = { promiseState };
+      } else {
+        throw error;
+      }
+    }
+
+    const { value, reason } = promiseState;
+
+    if (value) {
+      promiseState.value = getAdHocFrontOrPrimitiveGrip(value, this);
+    }
+
+    if (reason) {
+      promiseState.reason = getAdHocFrontOrPrimitiveGrip(reason, this);
+    }
+
+    return response;
+  }
+
+  /**
    * Request the target and handler internal slots of a proxy.
    */
   async getProxySlots() {
@@ -356,24 +393,6 @@
  * @param {String|Number|Object} packet: The packet returned by the server
  */
 function createChildFronts(objectFront, packet) {
-  // Handle Promise fullfilled and rejected values
-  if (packet.class == "Promise" && packet.promiseState) {
-    if (packet.promiseState.state == "fulfilled" && packet.promiseState.value) {
-      packet.promiseState.value = getAdHocFrontOrPrimitiveGrip(
-        packet.promiseState.value,
-        objectFront
-      );
-    } else if (
-      packet.promiseState.state == "rejected" &&
-      packet.promiseState.reason
-    ) {
-      packet.promiseState.reason = getAdHocFrontOrPrimitiveGrip(
-        packet.promiseState.reason,
-        objectFront
-      );
-    }
-  }
-
   if (packet.preview) {
     const { message, entries } = packet.preview;
 
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/page-style.js firefox-85.0+build1/devtools/client/fronts/page-style.js
--- firefox-84.0.2+build1/devtools/client/fronts/page-style.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/page-style.js	2021-01-18 19:58:08.000000000 +0000
@@ -80,7 +80,7 @@
       throw new Error("`type` should not be empty");
     }
 
-    if (!this._form.traits.getAttributesInOwnerDocument || !search) {
+    if (!search) {
       return [];
     }
 
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/preference.js firefox-85.0+build1/devtools/client/fronts/preference.js
--- firefox-84.0.2+build1/devtools/client/fronts/preference.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/preference.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,17 +19,10 @@
   }
 
   async getTraits() {
-    if (this._traits) {
-      return this._traits;
+    if (!this._traits) {
+      this._traits = await super.getTraits();
     }
 
-    try {
-      this._traits = await this.getTraits();
-    } catch (e) {
-      // Backward compatibility: can be removed when FF82 is on the release
-      // channel.
-      this._traits = {};
-    }
     return this._traits;
   }
 }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/stacktraces.js firefox-85.0+build1/devtools/client/fronts/stacktraces.js
--- firefox-84.0.2+build1/devtools/client/fronts/stacktraces.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/stacktraces.js	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/. */
-
-"use strict";
-
-const {
-  FrontClassWithSpec,
-  registerFront,
-} = require("devtools/shared/protocol");
-const { stackTracesSpec } = require("devtools/shared/specs/stacktraces");
-
-class StackTracesFront extends FrontClassWithSpec(stackTracesSpec) {
-  constructor(client, targetFront, parentFront) {
-    super(client, targetFront, parentFront);
-    // Attribute name from which to retrieve the actorID out of the target actor's form
-    this.formAttributeName = "stacktracesActor";
-  }
-}
-
-exports.StackTracesFront = StackTracesFront;
-registerFront(StackTracesFront);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/style-sheets.js firefox-85.0+build1/devtools/client/fronts/style-sheets.js
--- firefox-84.0.2+build1/devtools/client/fronts/style-sheets.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/style-sheets.js	2021-01-18 19:58:08.000000000 +0000
@@ -25,15 +25,8 @@
     if (this._traits) {
       return this._traits;
     }
-
-    try {
-      // FF81+ getTraits() is supported.
-      const { traits } = await super.getTraits();
-      this._traits = traits;
-    } catch (e) {
-      this._traits = {};
-    }
-
+    const { traits } = await super.getTraits();
+    this._traits = traits;
     return this._traits;
   }
 }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/targets/target-mixin.js firefox-85.0+build1/devtools/client/fronts/targets/target-mixin.js
--- firefox-84.0.2+build1/devtools/client/fronts/targets/target-mixin.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/targets/target-mixin.js	2021-01-18 19:58:08.000000000 +0000
@@ -134,8 +134,8 @@
      *
      * @return {TargetMixin} the parent target.
      */
-    getWatcher() {
-      // Starting with FF77, all additional frame targets are spawn by the WatcherActor and are managed by it.
+    getWatcherFront() {
+      // All additional frame targets are spawn by the WatcherActor and are managed by it.
       if (this.parentFront.typeName == "watcher") {
         return this.parentFront;
       }
@@ -150,7 +150,7 @@
         return this.parentFront.getWatcher();
       }
 
-      // Finally, for FF<=76, there is no watcher.
+      // For WebExtension, the descriptor doesn't expose a watcher yet (See Bug 1675456).
       return null;
     }
 
@@ -160,29 +160,28 @@
      * @return {TargetMixin} the parent target.
      */
     async getParentTarget() {
-      // Starting with FF77, we support frames watching via watchTargets for Tab and Process descriptors.
-      const watcher = await this.getWatcher();
-      if (watcher) {
-        // Safety check, in theory all watcher should support frames.
-        if (watcher.traits.frame) {
+      // We now support frames watching via watchTargets for Tab and Process descriptors.
+      const watcherFront = await this.getWatcherFront();
+      if (watcherFront) {
+        // Safety check, in theory all watcher should support frames. We should be able
+        // to remove this as part of Bug 1680280.
+        if (watcherFront.traits.frame) {
           // Retrieve the Watcher, which manage all the targets and should already have a reference to
           // to the parent target.
-          return watcher.getParentBrowsingContextTarget(this.browsingContextID);
+          return watcherFront.getParentBrowsingContextTarget(
+            this.browsingContextID
+          );
         }
         return null;
       }
 
-      // Other targets, like WebExtensions, don't have a Watcher yet, nor do expose `getParentTarget`.
-      // We can't fetch parent target yet for these targets.
-      if (!this.parentFront.getParentTarget) {
-        return null;
+      if (this.parentFront.getParentTarget) {
+        return this.parentFront.getParentTarget();
       }
 
-      // Backward compat for FF<=76
-      //
-      // In these versions of Firefox, we still have FrameDescriptor for Frame targets
-      // and can fetch the parent target from it.
-      return this.parentFront.getParentTarget();
+      // Other targets, like WebExtensions, don't have a Watcher yet, nor do expose `getParentTarget`.
+      // We can't fetch parent target yet for these targets.
+      return null;
     }
 
     /**
@@ -193,11 +192,11 @@
     async getBrowsingContextTarget(browsingContextID) {
       // Tab and Process Descriptors expose a Watcher, which is creating the
       // targets and should be used to fetch any.
-      const watcher = await this.getWatcher();
-      if (watcher) {
+      const watcherFront = await this.getWatcherFront();
+      if (watcherFront) {
         // Safety check, in theory all watcher should support frames.
-        if (watcher.traits.frame) {
-          return watcher.getBrowsingContextTarget(browsingContextID);
+        if (watcherFront.traits.frame) {
+          return watcherFront.getBrowsingContextTarget(browsingContextID);
         }
         return null;
       }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/thread.js firefox-85.0+build1/devtools/client/fronts/thread.js
--- firefox-84.0.2+build1/devtools/client/fronts/thread.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/thread.js	2021-01-18 19:58:08.000000000 +0000
@@ -183,7 +183,7 @@
   async getSources() {
     let sources = [];
     try {
-      ({ sources } = await super.sources());
+      sources = await super.sources();
     } catch (e) {
       // we may have closed the connection
       console.log(`getSources failed. Connection may have closed: ${e}`);
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/walker.js firefox-85.0+build1/devtools/client/fronts/walker.js
--- firefox-84.0.2+build1/devtools/client/fronts/walker.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/walker.js	2021-01-18 19:58:08.000000000 +0000
@@ -12,12 +12,6 @@
 const { walkerSpec } = require("devtools/shared/specs/walker");
 const { safeAsyncMethod } = require("devtools/shared/async-utils");
 
-loader.lazyRequireGetter(
-  this,
-  "nodeConstants",
-  "devtools/shared/dom-node-constants"
-);
-
 /**
  * Client side of the DOM walker.
  */
@@ -65,8 +59,7 @@
     // calling watchRootNode, so we keep this assignment as a fallback.
     this.rootNode = types.getType("domnode").read(json.root, this);
 
-    // FF42+ the actor starts exposing traits
-    this.traits = json.traits || {};
+    this.traits = json.traits;
   }
 
   /**
@@ -153,17 +146,6 @@
     return response.node;
   }
 
-  async gripToNodeFront(grip) {
-    const response = await this.getNodeActorFromObjectActor(grip.actor);
-    const nodeFront = response ? response.node : null;
-    if (!nodeFront) {
-      throw new Error(
-        "The ValueGrip passed could not be translated to a NodeFront"
-      );
-    }
-    return nodeFront;
-  }
-
   async getNodeActorFromWindowID(windowID) {
     const response = await super.getNodeActorFromWindowID(windowID);
     return response ? response.node : null;
@@ -329,35 +311,6 @@
         if ("numChildren" in change) {
           targetFront._form.numChildren = change.numChildren;
         }
-      } else if (change.type === "frameLoad") {
-        // Backward compatibility for FF80 or older.
-        // The frameLoad mutation was removed in FF81 in favor of the root-node
-        // resource.
-
-        // Nothing we need to do here, except verify that we don't have any
-        // document children, because we should have gotten a documentUnload
-        // first.
-        for (const child of targetFront.treeChildren()) {
-          if (child.nodeType === nodeConstants.DOCUMENT_NODE) {
-            console.warn(
-              "Got an unexpected frameLoad in the inspector, " +
-                "please file a bug on bugzilla.mozilla.org!"
-            );
-            console.trace();
-          }
-        }
-      } else if (change.type === "documentUnload") {
-        // Backward compatibility for FF80 or older.
-        // The documentUnload mutation was removed in FF81 in favor of the
-        // root-node resource.
-
-        // We try to give fronts instead of actorIDs, but these fronts need
-        // to be destroyed now.
-        emittedMutation.target = targetFront.actorID;
-        emittedMutation.targetParent = targetFront.parentNode();
-
-        // Release the document node and all of its children, even retained.
-        this._releaseFront(targetFront, true);
       } else if (change.type === "shadowRootAttached") {
         targetFront._form.isShadowHost = true;
       } else if (change.type === "customElementDefined") {
@@ -552,14 +505,14 @@
   }
 
   _onRootNodeAvailable(rootNode) {
-    if (this._isTopLevelRootNode(rootNode)) {
+    if (rootNode.isTopLevelDocument) {
       this.rootNode = rootNode;
       this._rootNodePromiseResolve(this.rootNode);
     }
   }
 
   _onRootNodeDestroyed(rootNode) {
-    if (this._isTopLevelRootNode(rootNode)) {
+    if (rootNode.isTopLevelDocument) {
       this._rootNodePromise = new Promise(
         r => (this._rootNodePromiseResolve = r)
       );
@@ -567,16 +520,6 @@
     }
   }
 
-  _isTopLevelRootNode(rootNode) {
-    if (!rootNode.traits.supportsIsTopLevelDocument) {
-      // When `supportsIsTopLevelDocument` is false, a root-node resource is
-      // necessarily top level, so we can fallback to true.
-      return true;
-    }
-
-    return rootNode.isTopLevelDocument;
-  }
-
   /**
    * Start the element picker on the debuggee target.
    * @param {Boolean} doFocus - Optionally focus the content area once the picker is
@@ -586,16 +529,8 @@
     if (this._isPicking) {
       return Promise.resolve();
     }
-    this._isPicking = true;
-
-    // Firefox 80 - backwards compatibility for servers without walker.pick()
-    if (!this.traits.supportsNodePicker) {
-      // parent is InspectorFront
-      return doFocus
-        ? this.parentFront.highlighter.pickAndFocus()
-        : this.parentFront.highlighter.pick();
-    }
 
+    this._isPicking = true;
     return super.pick(doFocus);
   }
 
@@ -606,14 +541,8 @@
     if (!this._isPicking) {
       return Promise.resolve();
     }
-    this._isPicking = false;
-
-    // Firefox 80 - backwards compatibility for servers without walker.cancelPick()
-    if (!this.traits.supportsNodePicker) {
-      // parent is InspectorFront
-      return this.parentFront.highlighter.cancelPick();
-    }
 
+    this._isPicking = false;
     return super.cancelPick();
   }
 }
diff -Nru firefox-84.0.2+build1/devtools/client/fronts/worker/service-worker-registration.js firefox-85.0+build1/devtools/client/fronts/worker/service-worker-registration.js
--- firefox-84.0.2+build1/devtools/client/fronts/worker/service-worker-registration.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/fronts/worker/service-worker-registration.js	2021-01-18 19:58:08.000000000 +0000
@@ -70,7 +70,7 @@
   form(form) {
     this.actorID = form.actor;
     this._form = form;
-    // FF70+ ServiceWorkerRegistration actor starts exposing traits object
+    // @backward-compat { version 70 } ServiceWorkerRegistration actor now exposes traits
     this.traits = form.traits || {};
   }
 }
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/animation/test/browser_animation_fission_switch-target.js firefox-85.0+build1/devtools/client/inspector/animation/test/browser_animation_fission_switch-target.js
--- firefox-84.0.2+build1/devtools/client/inspector/animation/test/browser_animation_fission_switch-target.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/animation/test/browser_animation_fission_switch-target.js	2021-01-18 19:58:08.000000000 +0000
@@ -83,7 +83,7 @@
   const previousAnimationsFront = animationInspector.animationsFront;
   const onReloaded = inspector.once("reloaded");
   const onUpdated = inspector.once("inspector-updated");
-  await BrowserTestUtils.loadURI(browser, uri);
+  BrowserTestUtils.loadURI(browser, uri);
   await waitUntil(
     () => previousAnimationsFront !== animationInspector.animationsFront
   );
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_panel-select.js firefox-85.0+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_panel-select.js
--- firefox-84.0.2+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_panel-select.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_panel-select.js	2021-01-18 19:58:08.000000000 +0000
@@ -104,10 +104,7 @@
   await _selectSidebarPanel(inspector, "changesview");
 
   info("Navigate to another page");
-  await BrowserTestUtils.loadURI(
-    tab.linkedBrowser,
-    _toDataURL(TEST_ANOTHER_URI)
-  );
+  BrowserTestUtils.loadURI(tab.linkedBrowser, _toDataURL(TEST_ANOTHER_URI));
 
   info("Select the compatibility panel again");
   const onSelectedNodePaneUpdated = waitForUpdateSelectedNodeAction(
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_top-level-target-change.js firefox-85.0+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_top-level-target-change.js
--- firefox-84.0.2+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_top-level-target-change.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/compatibility/test/browser/browser_compatibility_event_top-level-target-change.js	2021-01-18 19:58:08.000000000 +0000
@@ -71,6 +71,6 @@
   const onSelectedNodeUpdated = waitForUpdateSelectedNodeAction(store);
   const onTopLevelTargetUpdated = waitForUpdateTopLevelTargetAction(store);
   const onLoaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
   await Promise.all([onLoaded, onSelectedNodeUpdated, onTopLevelTargetUpdated]);
 }
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/inspector.js firefox-85.0+build1/devtools/client/inspector/inspector.js
--- firefox-84.0.2+build1/devtools/client/inspector/inspector.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/inspector.js	2021-01-18 19:58:08.000000000 +0000
@@ -206,7 +206,7 @@
     // stylesheet resources before instanciating the inspector front since pageStyle
     // actor should refer the watcher.
     if (
-      this.toolbox.resourceWatcher.hasWatcherSupport(
+      this.toolbox.resourceWatcher.hasResourceWatcherSupport(
         this.toolbox.resourceWatcher.TYPES.STYLESHEET
       )
     ) {
@@ -1948,10 +1948,10 @@
     );
   },
 
-  async inspectNodeActor(nodeActor, reason) {
-    const nodeFront = await this.inspectorFront.getNodeFrontFromNodeGrip({
-      actor: nodeActor,
-    });
+  async inspectNodeActor(nodeGrip, reason) {
+    const nodeFront = await this.inspectorFront.getNodeFrontFromNodeGrip(
+      nodeGrip
+    );
     if (!nodeFront) {
       console.error(
         "The object cannot be linked to the inspector, the " +
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/markup/markup.js firefox-85.0+build1/devtools/client/inspector/markup/markup.js
--- firefox-84.0.2+build1/devtools/client/inspector/markup/markup.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/markup/markup.js	2021-01-18 19:58:08.000000000 +0000
@@ -242,6 +242,9 @@
  *         The inspector we're watching.
  * @param  {iframe} frame
  *         An iframe in which the caller has kindly loaded markup.xhtml.
+ * @param  {XULWindow} controllerWindow
+ *         Will enable the undo/redo feature from devtools/client/shared/undo.
+ *         Should be a XUL window, will typically point to the toolbox window.
  */
 function MarkupView(inspector, frame, controllerWindow) {
   EventEmitter.decorate(this);
@@ -1404,22 +1407,8 @@
    */
   _onWalkerMutations: function(mutations) {
     for (const mutation of mutations) {
-      let type = mutation.type;
-      let target = mutation.target;
-
-      if (mutation.type === "documentUnload") {
-        // Backward compatibility for FF80 or older.
-        // The documentUnload mutation was removed in FF81 in favor of the
-        // root-node resource.
-
-        // Treat this as a childList change of the child (maybe the protocol
-        // should do this).
-        type = "childList";
-        target = mutation.targetParent;
-        if (!target) {
-          continue;
-        }
-      }
+      const type = mutation.type;
+      const target = mutation.target;
 
       const container = this.getContainer(target);
       if (!container) {
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/markup/test/browser_markup_copy_html.js firefox-85.0+build1/devtools/client/inspector/markup/test/browser_markup_copy_html.js
--- firefox-84.0.2+build1/devtools/client/inspector/markup/test/browser_markup_copy_html.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/markup/test/browser_markup_copy_html.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,15 +11,12 @@
     div {
       color: red;
     }
+
     span {
       text-decoration: underline;
     }
   </style>
-  <div>
-    <span>
-      <em>Hello</em>
-    </span>
-  </div>
+  <div><span><em>Hello</em></span></div>
   <script>
     console.log("Hello!");
   </script>
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/markup/views/element-editor.js firefox-85.0+build1/devtools/client/inspector/markup/views/element-editor.js
--- firefox-84.0.2+build1/devtools/client/inspector/markup/views/element-editor.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/markup/views/element-editor.js	2021-01-18 19:58:08.000000000 +0000
@@ -365,7 +365,6 @@
   _createScrollableBadge: function() {
     const isInteractive =
       this.isOverflowDebuggingEnabled &&
-      this.node.walkerFront.traits.supportsOverflowDebugging2 &&
       // Document elements cannot have interative scrollable badges since retrieval of their
       // overflow causing elements is not supported.
       !this.node.isDocumentElement;
@@ -503,10 +502,7 @@
    * scrollable badge is active/inactive.
    */
   updateOverflowHighlight: async function() {
-    if (
-      !this.isOverflowDebuggingEnabled ||
-      !this.node.walkerFront.traits.supportsOverflowDebugging2
-    ) {
+    if (!this.isOverflowDebuggingEnabled) {
       return;
     }
 
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/models/rule.js firefox-85.0+build1/devtools/client/inspector/rules/models/rule.js
--- firefox-84.0.2+build1/devtools/client/inspector/rules/models/rule.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/models/rule.js	2021-01-18 19:58:08.000000000 +0000
@@ -84,18 +84,11 @@
     this.textProps = this.textProps.concat(this._getDisabledProperties());
 
     this.getUniqueSelector = this.getUniqueSelector.bind(this);
-    this.onDeclarationsUpdated = this.onDeclarationsUpdated.bind(this);
     this.onLocationChanged = this.onLocationChanged.bind(this);
     this.onStyleRuleFrontUpdated = this.onStyleRuleFrontUpdated.bind(this);
     this.updateOriginalLocation = this.updateOriginalLocation.bind(this);
 
-    // Added in Firefox 72 for backwards compatibility of initial fix for Bug 1557689.
-    // See follow-up fix in Bug 1593944.
-    if (this.domRule.traits.emitsRuleUpdatedEvent) {
-      this.domRule.on("rule-updated", this.onStyleRuleFrontUpdated);
-    } else {
-      this.domRule.on("declarations-updated", this.onDeclarationsUpdated);
-    }
+    this.domRule.on("rule-updated", this.onStyleRuleFrontUpdated);
   }
 
   destroy() {
@@ -103,13 +96,7 @@
       this._unsubscribeSourceMap();
     }
 
-    // Added in Firefox 72
-    if (this.domRule.traits.emitsRuleUpdatedEvent) {
-      this.domRule.off("rule-updated", this.onStyleRuleFrontUpdated);
-    } else {
-      this.domRule.off("declarations-updated", this.onDeclarationsUpdated);
-    }
-
+    this.domRule.off("rule-updated", this.onStyleRuleFrontUpdated);
     this.domRule.off("location-changed", this.onLocationChanged);
     this.compatibilityIssues = null;
   }
@@ -657,20 +644,7 @@
     const textProps = [];
     const store = this.elementStyle.store;
 
-    // Starting with FF49, StyleRuleActors provide parsed declarations.
-    let props = this.domRule.declarations;
-    if (!props.length) {
-      // If the authored text has an invalid property, it will show up
-      // as nameless.  Skip these as we don't currently have a good
-      // way to display them.
-      props = parseNamedDeclarations(
-        this.cssProperties.isKnown,
-        this.domRule.authoredText,
-        true
-      );
-    }
-
-    for (const prop of props) {
+    for (const prop of this.domRule.declarations) {
       const name = prop.name;
       // In an inherited rule, we only show inherited properties.
       // However, we must keep all properties in order for rule
@@ -929,39 +903,6 @@
   }
 
   /**
-   * TODO: Remove after Firefox 75. Keep until then for backwards-compatibility for Bug
-   * 1557689 which has an updated fix from Bug 1593944.
-   * Handler for "declarations-updated" events fired from the StyleRuleActor for a
-   * CSS rule when the status of any of its CSS declarations change.
-   *
-   * Check whether the used/unused status of any declaration has changed and update the
-   * inactive CSS indicator in the UI accordingly.
-   *
-   * @param {Array} declarations
-   *        List of objects describing all CSS declarations of this CSS rule.
-   *        @See StyleRuleActor._declarations
-   */
-  onDeclarationsUpdated(declarations) {
-    this.textProps.forEach((textProp, index) => {
-      const isUsedPrevious = textProp.isUsed().used;
-      const isUsedCurrent = declarations[index].isUsed.used;
-
-      // Skip if property used state did not change.
-      if (isUsedPrevious === isUsedCurrent) {
-        return;
-      }
-
-      // Replace the method called by TextPropertyEditor to check whether the CSS
-      // declaration is used with the updated declaration's `isUsed` object.
-      // TODO: convert from Object to Boolean. See Bug 1574471
-      textProp.isUsed = () => declarations[index].isUsed;
-
-      // Reflect the new active/inactive flag state in the UI.
-      textProp.editor.updatePropertyUsedIndicator();
-    });
-  }
-
-  /**
    * Handler for "location-changed" events fired from the StyleRuleActor. This could
    * occur by adding a new declaration to the rule. Updates the source location of the
    * rule. This will overwrite the source map location.
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_part1.ini firefox-85.0+build1/devtools/client/inspector/rules/test/browser_part1.ini
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_part1.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/browser_part1.ini	2021-01-18 19:58:08.000000000 +0000
@@ -50,6 +50,8 @@
 [browser_rules_class_panel_mutation.js]
 [browser_rules_class_panel_state_preserved.js]
 [browser_rules_class_panel_toggle.js]
+[browser_rules_color_scheme_simulation.js]
+fail-if = fission # Bug 1678945
 [browser_rules_colorpicker-and-image-tooltip_01.js]
 [browser_rules_colorpicker-and-image-tooltip_02.js]
 [browser_rules_colorpicker-appears-on-swatch-click-or-keyboard-activation.js]
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_color_scheme_simulation.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,87 @@
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test color scheme simulation.
+const TEST_URI = URL_ROOT + "doc_media_queries.html";
+
+add_task(async function() {
+  await pushPref("devtools.inspector.color-scheme-simulation.enabled", true);
+  await addTab(TEST_URI);
+  const { inspector, view } = await openRuleView();
+
+  info("Check that the color scheme simulation button exists");
+  const button = inspector.panelDoc.querySelector(
+    "#color-scheme-simulation-toggle"
+  );
+  ok(button, "The color scheme simulation button exists");
+
+  is(
+    button.getAttribute("state"),
+    null,
+    "At first, the button has no specific state"
+  );
+
+  // Define functions checking if the rule view display the expected property.
+  const divHasDefaultStyling = () =>
+    getPropertiesForRuleIndex(view, 1).has("background-color:yellow");
+  const divHasDarkSchemeStyling = () =>
+    getPropertiesForRuleIndex(view, 1).has("background-color:darkblue");
+  const iframeElHasDefaultStyling = () =>
+    getPropertiesForRuleIndex(view, 1).has("background:cyan");
+  const iframeHasDarkSchemeStyling = () =>
+    getPropertiesForRuleIndex(view, 1).has("background:darkred");
+
+  info(
+    "Select the div that will change according to conditions in prefered color scheme"
+  );
+  await selectNode("div", inspector);
+  ok(divHasDefaultStyling(), "The rule view shows the expected initial rule");
+
+  info("Click on the button until we get to the dark scheme simulation state");
+  button.click();
+  await waitFor(() => button.getAttribute("state") === "dark");
+  ok(true, "The button has the expected dark state");
+
+  await waitFor(() => divHasDarkSchemeStyling());
+  ok(
+    true,
+    "The rules view was updated with the rule view from the dark scheme media query"
+  );
+
+  info("Select the node from the remote iframe");
+  const iframeEl = await getNodeFrontInFrame("html", "iframe", inspector);
+  await selectNode(iframeEl, inspector);
+
+  // This fails when Fission is enabled. See Bug 1678945.
+  ok(
+    iframeHasDarkSchemeStyling(),
+    "The simulation is also applied on the remote iframe"
+  );
+
+  info("Select the top level div again");
+  await selectNode("div", inspector);
+
+  info("Click the button again to simulate light mode");
+  button.click();
+  await waitFor(() => button.getAttribute("state") === "light");
+  ok(true, "The button has the expected light state");
+  // TODO: Actually simulate light mode. This might require to set the OS-level preference
+  // to dark as the default state might consume the rule from the like scheme media query.
+
+  await waitFor(() => divHasDefaultStyling());
+
+  info("Click the button once more to disable simulation");
+  const onRuleViewRefreshed = view.once("ruleview-refreshed");
+  button.click();
+  await waitFor(() => button.getAttribute("state") === null);
+  ok(true, "The button has no specific state again");
+  await onRuleViewRefreshed;
+  ok(divHasDefaultStyling(), "We're not simulating color-scheme anymore");
+
+  info("Select the node from the remote iframe again");
+  await selectNode(iframeEl, inspector);
+  await waitFor(() => iframeElHasDefaultStyling());
+  ok(true, "The simulation stopped on the remote iframe as well");
+});
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_inactive_css_visited.js firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_inactive_css_visited.js
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_inactive_css_visited.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_inactive_css_visited.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,6 +26,8 @@
           "background-color": "transparent",
           "border-color": "lime",
           color: "rgba(0, 255, 0, 0.8)",
+          "text-decoration-color": "lime",
+          "text-emphasis-color": "seagreen",
         },
         ruleIndex: 2,
       },
@@ -41,6 +43,8 @@
           color: "rgba(0, 255, 0, 0.8)",
           "font-size": "100px",
           "margin-left": "50px",
+          "text-decoration-color": "lime",
+          "text-emphasis-color": "seagreen",
         },
         ruleIndex: 1,
       },
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_pseudo_lock_options.js firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_pseudo_lock_options.js
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/browser_rules_pseudo_lock_options.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/browser_rules_pseudo_lock_options.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,6 +26,9 @@
     div:visited {
       color: orange;
     }
+    div:focus-visible {
+      color: wheat;
+    }
   </style>
   <div>test div</div>
 `;
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/doc_media_queries.html firefox-85.0+build1/devtools/client/inspector/rules/test/doc_media_queries.html
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/doc_media_queries.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/doc_media_queries.html	2021-01-18 19:58:08.000000000 +0000
@@ -14,11 +14,21 @@
     @media screen and (min-width: 1px) {
       div {
         width: 200px;
+        background-color: yellow;
+      }
+    }
+
+    @media (prefers-color-scheme: dark) {
+      div {
+        background-color: darkblue;
       }
     }
   </style>
 </head>
 <body>
 <div></div>
+<iframe
+  src='http://example.org/document-builder.sjs?html=<style>html { background: cyan;} @media (prefers-color-scheme: dark) {html {background: darkred;}}'>
+</iframe>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/rules/test/doc_visited.html firefox-85.0+build1/devtools/client/inspector/rules/test/doc_visited.html
--- firefox-84.0.2+build1/devtools/client/inspector/rules/test/doc_visited.html	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/rules/test/doc_visited.html	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,8 @@
       color: rgba(0, 255, 0, 0.8);
       font-size: 100px;
       margin-left: 50px;
+      text-decoration-color: lime;
+      text-emphasis-color: seagreen;
     }
     a:visited { color: lime; }
     a:link { color: blue; }
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/shared/highlighters-overlay.js firefox-85.0+build1/devtools/client/inspector/shared/highlighters-overlay.js
--- firefox-84.0.2+build1/devtools/client/inspector/shared/highlighters-overlay.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/shared/highlighters-overlay.js	2021-01-18 19:58:08.000000000 +0000
@@ -114,6 +114,10 @@
     // It will fully replace this.highlighters when all highlighter consumers are updated
     // to use it as the single source of truth for which highlighters are visible.
     this._activeHighlighters = new Map();
+    // Map of highlighter types to symbols. Showing highlighters is an async operation,
+    // until it doesn't complete, this map will be populated with the requested type and
+    // a unique symbol identifying that request. Once completed, the entry is removed.
+    this._pendingHighlighters = new Map();
     // Collection of instantiated highlighter actors like FlexboxHighlighter,
     // ShapesHighlighter and GeometryEditorHighlighter.
     this.highlighters = {};
@@ -369,17 +373,35 @@
    * @return {Promise}
    */
   async showHighlighterTypeForNode(type, nodeFront, options) {
-    const skipShow = await this._beforeShowHighlighterTypeForNode(
+    const promise = this._beforeShowHighlighterTypeForNode(
       type,
       nodeFront,
       options
     );
 
-    if (skipShow) {
+    // Set a pending highlighter in order to detect if, while we were awaiting, there was
+    // a more recent request to highlight a node with the same type, or a request to hide
+    // the highlighter. Then we will abort this one in favor of the newer one.
+    // This needs to be done before the 'await' in order to be synchronous, but after
+    // calling _beforeShowHighlighterTypeForNode, since it can call hideHighlighterType.
+    const id = Symbol();
+    this._pendingHighlighters.set(type, id);
+    const skipShow = await promise;
+
+    if (this._pendingHighlighters.get(type) !== id) {
+      return;
+    } else if (skipShow) {
+      this._pendingHighlighters.delete(type);
       return;
     }
 
     const highlighter = await this._getHighlighterTypeForNode(type, nodeFront);
+
+    if (this._pendingHighlighters.get(type) !== id) {
+      return;
+    }
+    this._pendingHighlighters.delete(type);
+
     // Set a timer to automatically hide the highlighter if a duration is provided.
     const timer = this.scheduleAutoHideHighlighterType(type, options?.duration);
     // TODO: support case for multiple highlighter instances (ex: multiple grids)
@@ -431,6 +453,10 @@
    * @return {Promise}
    */
   async hideHighlighterType(type) {
+    if (this._pendingHighlighters.has(type)) {
+      // Abort pending highlighters for the given type.
+      this._pendingHighlighters.delete(type);
+    }
     if (!this._activeHighlighters.has(type)) {
       return;
     }
@@ -1696,6 +1722,7 @@
     }
 
     this._activeHighlighters.clear();
+    this._pendingHighlighters.clear();
     this.gridHighlighters.clear();
     this.parentGridHighlighters.clear();
     this.subgridToParentMap.clear();
@@ -1754,6 +1781,7 @@
     }
 
     this._activeHighlighters.clear();
+    this._pendingHighlighters.clear();
 
     for (const type in this.highlighters) {
       if (this.highlighters[type]) {
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/browser.ini firefox-85.0+build1/devtools/client/inspector/test/browser.ini
--- firefox-84.0.2+build1/devtools/client/inspector/test/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -85,6 +85,7 @@
 [browser_inspector_highlighter-05.js]
 [browser_inspector_highlighter-06.js]
 [browser_inspector_highlighter-07.js]
+[browser_inspector_highlighter-08.js]
 [browser_inspector_highlighter-autohide-config_01.js]
 [browser_inspector_highlighter-autohide-config_02.js]
 [browser_inspector_highlighter-autohide-config_03.js]
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_highlighter-08.js firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_highlighter-08.js
--- firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_highlighter-08.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_highlighter-08.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,65 @@
+/* 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";
+
+// Test that performing multiple requests to highlight nodes or to hide the highlighter,
+// without waiting for the former ones to complete, still works well.
+add_task(async function() {
+  info("Loading the test document and opening the inspector");
+  const { inspector, testActor } = await openInspectorForURL("data:text/html,");
+  const html = await getNodeFront("html", inspector);
+  const body = await getNodeFront("body", inspector);
+  const type = inspector.highlighters.TYPES.BOXMODEL;
+  const getActiveHighlighter = () => {
+    return inspector.highlighters.getActiveHighlighter(type);
+  };
+  is(getActiveHighlighter(), null, "The highlighter is hidden by default");
+
+  info("Highlight <body>, and hide the highlighter immediately after");
+  await Promise.all([
+    inspector.highlighters.showHighlighterTypeForNode(type, body),
+    inspector.highlighters.hideHighlighterType(type),
+  ]);
+  is(getActiveHighlighter(), null, "The highlighter is hidden");
+
+  info("Highlight <body>, then <html>, then <body> again, synchronously");
+  await Promise.all([
+    inspector.highlighters.showHighlighterTypeForNode(type, body),
+    inspector.highlighters.showHighlighterTypeForNode(type, html),
+    inspector.highlighters.showHighlighterTypeForNode(type, body),
+  ]);
+  ok(
+    await testActor.assertHighlightedNode("body"),
+    "The highlighter highlights <body>"
+  );
+
+  info("Highlight <html>, then <body>, then <html> again, synchronously");
+  await Promise.all([
+    inspector.highlighters.showHighlighterTypeForNode(type, html),
+    inspector.highlighters.showHighlighterTypeForNode(type, body),
+    inspector.highlighters.showHighlighterTypeForNode(type, html),
+  ]);
+  ok(
+    await testActor.assertHighlightedNode("html"),
+    "The highlighter highlights <html>"
+  );
+
+  info("Hide the highlighter, and highlight <html> immediately after");
+  await Promise.all([
+    inspector.highlighters.hideHighlighterType(type),
+    inspector.highlighters.showHighlighterTypeForNode(type, body),
+  ]);
+  ok(
+    await testActor.assertHighlightedNode("body"),
+    "The highlighter highlights <body>"
+  );
+
+  info("Highlight <html>, and hide the highlighter immediately after");
+  await Promise.all([
+    inspector.highlighters.showHighlighterTypeForNode(type, html),
+    inspector.highlighters.hideHighlighterType(type),
+  ]);
+  is(getActiveHighlighter(), null, "The highlighter is hidden");
+});
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_highlighter-autohide-config_03.js firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_highlighter-autohide-config_03.js
--- firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_highlighter-autohide-config_03.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_highlighter-autohide-config_03.js	2021-01-18 19:58:08.000000000 +0000
@@ -28,14 +28,14 @@
   );
 
   info("Show Box Model Highlighter, then hide after half a second");
-  inspector.highlighters.showHighlighterTypeForNode(
+  await inspector.highlighters.showHighlighterTypeForNode(
     inspector.highlighters.TYPES.BOXMODEL,
     nodeFront,
     { duration: HALF_SECOND }
   );
 
   info("Show Box Model Highlighter again, then hide after one second");
-  inspector.highlighters.showHighlighterTypeForNode(
+  await inspector.highlighters.showHighlighterTypeForNode(
     inspector.highlighters.TYPES.BOXMODEL,
     nodeFront,
     { duration: ONE_SECOND }
@@ -47,7 +47,9 @@
   /*
   Since the second duration passed is longer than the first and is supposed to overwrite
   the first, it is reasonable to expect that the "highlighter-hidden" event was emitted
-  after the second (longer) duration expired. As an added check, we naively wait for an additional time amounting to the sum of both durations to check if the first timer was somehow not overwritten and fires another "highlighter-hidden" event.
+  after the second (longer) duration expired. As an added check, we naively wait for an
+  additional time amounting to the sum of both durations to check if the first timer was
+  somehow not overwritten and fires another "highlighter-hidden" event.
    */
   let wasEmitted = false;
   const waitForExtraEvent = new Promise((resolve, reject) => {
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js
--- firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_pseudoclass-lock.js	2021-01-18 19:58:08.000000000 +0000
@@ -61,7 +61,7 @@
   const tab = toolbox.target.localTab;
   await toolbox.destroy();
 
-  // As the toolbox get detroyed, we need to fetch a new test-actor
+  // As the toolbox get destroyed, we need to fetch a new test-actor
   testActor = await getTestActorWithoutToolbox(tab);
 
   await assertPseudoRemovedFromNode(testActor, "#div-1");
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js
--- firefox-84.0.2+build1/devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/browser_inspector_remove-iframe-during-load.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,7 +17,7 @@
   // See next comments.
   const browser = tab.linkedBrowser;
   const onBrowserLoaded = BrowserTestUtils.browserLoaded(browser);
-  await BrowserTestUtils.loadURI(browser, TEST_URL);
+  BrowserTestUtils.loadURI(browser, TEST_URL);
   await onBrowserLoaded;
 
   // We do not want to wait for the inspector to be fully ready before testing
diff -Nru firefox-84.0.2+build1/devtools/client/inspector/test/head.js firefox-85.0+build1/devtools/client/inspector/test/head.js
--- firefox-84.0.2+build1/devtools/client/inspector/test/head.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/inspector/test/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -294,9 +294,53 @@
  * @return {Promise} Resolves when the inspector is updated with the new node
  */
 var getNodeFrontInFrame = async function(selector, frameSelector, inspector) {
-  const iframe = await getNodeFront(frameSelector, inspector);
-  const { nodes } = await inspector.walker.children(iframe);
-  return inspector.walker.querySelector(nodes[0], selector);
+  let walker;
+
+  // If frameSelector is already a NodeFront, we can directly retrieve its walker
+  if (frameSelector._form) {
+    walker = frameSelector.walkerFront;
+  } else {
+    // The iframe could be remote, so we need to retrieve the associated target front.
+    const iframeBrowsingContextId = await SpecialPowers.spawn(
+      gBrowser.selectedTab.linkedBrowser,
+      [frameSelector],
+      function(innerFrameSelector) {
+        const el = content.document.querySelector(innerFrameSelector);
+        if (!el) {
+          return null;
+        }
+
+        return el.browsingContext.id;
+      }
+    );
+
+    if (!iframeBrowsingContextId) {
+      throw new Error(`Couldn't find an iframe matching "${frameSelector}"`);
+    }
+
+    const { descriptorFront } = inspector.inspectorFront.targetFront;
+    const watcherFront = await descriptorFront.getWatcher();
+    const target = await watcherFront.getBrowsingContextTarget(
+      iframeBrowsingContextId
+    );
+    const inspectorFront = await target.getFront("inspector");
+    walker = inspectorFront.walker;
+  }
+
+  let queryNode;
+  if (walker === inspector.inspectorFront.walker) {
+    // If the walker for the iframe is the same as the top-level target in the inspector,
+    // we need to retrieve the element from the iframe first children.
+    const iframe = await getNodeFront(frameSelector, inspector);
+    const { nodes } = await walker.children(iframe);
+    queryNode = nodes[0];
+  } else {
+    // whereas if we have a dedicated target for the iframe, we can directly query from
+    // the walker root node.
+    queryNode = walker.rootNode;
+  }
+
+  return walker.querySelector(queryNode, selector);
 };
 
 /**
diff -Nru firefox-84.0.2+build1/devtools/client/locales/en-US/aboutdebugging.ftl firefox-85.0+build1/devtools/client/locales/en-US/aboutdebugging.ftl
--- firefox-84.0.2+build1/devtools/client/locales/en-US/aboutdebugging.ftl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/locales/en-US/aboutdebugging.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -59,10 +59,6 @@
 # Text displayed as connection error in sidebar item when the connection has timed out.
 about-debugging-sidebar-item-connect-button-connection-timeout = Connection timed out
 
-# Temporary text displayed in sidebar items representing remote runtimes after
-# successfully connecting to them. Temporary UI, do not localize.
-about-debugging-sidebar-item-connected-label = Connected
-
 # Text displayed in sidebar items for remote devices where a compatible browser (eg
 # Firefox) has not been detected yet. Typically, Android phones connected via USB with
 # USB debugging enabled, but where Firefox is not started.
diff -Nru firefox-84.0.2+build1/devtools/client/locales/en-US/markers.properties firefox-85.0+build1/devtools/client/locales/en-US/markers.properties
--- firefox-84.0.2+build1/devtools/client/locales/en-US/markers.properties	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/locales/en-US/markers.properties	2021-01-18 19:58:08.000000000 +0000
@@ -118,7 +118,7 @@
 marker.gcreason.label.INCREMENTAL_TOO_SLOW=Allocations Rate Too Fast
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
-marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
diff -Nru firefox-84.0.2+build1/devtools/client/locales/en-US/tooltips.ftl firefox-85.0+build1/devtools/client/locales/en-US/tooltips.ftl
--- firefox-84.0.2+build1/devtools/client/locales/en-US/tooltips.ftl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/locales/en-US/tooltips.ftl	2021-01-18 19:58:08.000000000 +0000
@@ -39,6 +39,8 @@
 
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
@@ -69,6 +71,8 @@
 
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
 
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
+
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
 ## the property is incompatible and the platforms it is incompatible on.
diff -Nru firefox-84.0.2+build1/devtools/client/locales/en-US/webconsole.properties firefox-85.0+build1/devtools/client/locales/en-US/webconsole.properties
--- firefox-84.0.2+build1/devtools/client/locales/en-US/webconsole.properties	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/locales/en-US/webconsole.properties	2021-01-18 19:58:08.000000000 +0000
@@ -479,6 +479,11 @@
 # 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.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Pretty print expression
+
 # 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).
diff -Nru firefox-84.0.2+build1/devtools/client/memory/test/browser/browser_memory_fission_switch_target.js firefox-85.0+build1/devtools/client/memory/test/browser/browser_memory_fission_switch_target.js
--- firefox-84.0.2+build1/devtools/client/memory/test/browser/browser_memory_fission_switch_target.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/memory/test/browser/browser_memory_fission_switch_target.js	2021-01-18 19:58:08.000000000 +0000
@@ -19,7 +19,7 @@
   const { gToolbox: toolbox, gStore: store } = panel.panelWin;
 
   info("Open a page running on the content process");
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, CONTENT_PROCESS_URI);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, CONTENT_PROCESS_URI);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
   await takeAndWaitSnapshot(
     panel.panelWin,
@@ -80,7 +80,7 @@
 async function navigateTo(uri, toolbox, tab) {
   const onSwitched = toolbox.targetList.once("switched-target");
   const onLoaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, uri);
   await onLoaded;
   await onSwitched;
   ok(true, "switched-target event is fired");
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/actions/requests.js firefox-85.0+build1/devtools/client/netmonitor/src/actions/requests.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/actions/requests.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/actions/requests.js	2021-01-18 19:58:08.000000000 +0000
@@ -122,11 +122,13 @@
       data.body = request.requestPostData.postData.text;
     }
 
-    connector.sendHTTPRequest(data, response => {
-      return dispatch({
-        type: SEND_CUSTOM_REQUEST,
-        id: response.eventActor.actor,
-      });
+    // @backward-compat { version 85 } Introduced `channelId` to eventually
+    // replace `actor`.
+    const { channelId, actor } = await connector.sendHTTPRequest(data);
+
+    dispatch({
+      type: SEND_CUSTOM_REQUEST,
+      id: channelId || actor,
     });
   };
 }
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/chrome-connector.js firefox-85.0+build1/devtools/client/netmonitor/src/connector/chrome-connector.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/chrome-connector.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/connector/chrome-connector.js	2021-01-18 19:58:08.000000000 +0000
@@ -89,9 +89,8 @@
    * Send a HTTP request data payload
    *
    * @param {object} data data payload would like to sent to backend
-   * @param {function} callback callback will be invoked after the request finished
    */
-  sendHTTPRequest(data, callback) {
+  sendHTTPRequest(data) {
     // TODO : not support. currently didn't provide this feature in CDP API.
   }
 
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/firefox-connector.js firefox-85.0+build1/devtools/client/netmonitor/src/connector/firefox-connector.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/firefox-connector.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/connector/firefox-connector.js	2021-01-18 19:58:08.000000000 +0000
@@ -46,20 +46,22 @@
     this.onTargetAvailable = this.onTargetAvailable.bind(this);
     this.onResourceAvailable = this.onResourceAvailable.bind(this);
     this.onResourceUpdated = this.onResourceUpdated.bind(this);
+
+    this.networkFront = null;
   }
 
   get currentTarget() {
     return this.toolbox.targetList.targetFront;
   }
 
-  get hasWatcherSupport() {
-    return this.toolbox.resourceWatcher.hasWatcherSupport(
+  get hasResourceWatcherSupport() {
+    return this.toolbox.resourceWatcher.hasResourceWatcherSupport(
       this.toolbox.resourceWatcher.TYPES.NETWORK_EVENT
     );
   }
 
-  get currentWatcher() {
-    return this.toolbox.resourceWatcher.watcher;
+  get watcherFront() {
+    return this.toolbox.resourceWatcher.watcherFront;
   }
 
   /**
@@ -163,6 +165,9 @@
 
     // Initialize Responsive Emulation front for network throttling.
     this.responsiveFront = await this.currentTarget.getFront("responsive");
+    if (this.hasResourceWatcherSupport) {
+      this.networkFront = await this.watcherFront.getNetworkParentActor();
+    }
   }
 
   async onResourceAvailable(resources) {
@@ -385,10 +390,19 @@
    * Send a HTTP request data payload
    *
    * @param {object} data data payload would like to sent to backend
-   * @param {function} callback callback will be invoked after the request finished
    */
-  sendHTTPRequest(data, callback) {
-    this.webConsoleFront.sendHTTPRequest(data).then(callback);
+  async sendHTTPRequest(data) {
+    if (this.hasResourceWatcherSupport && this.currentTarget) {
+      const networkContentFront = await this.currentTarget.getFront(
+        "networkContent"
+      );
+      const { channelId } = await networkContentFront.sendHTTPRequest(data);
+      return { channelId };
+    }
+    const {
+      eventActor: { actor },
+    } = await this.webConsoleFront.sendHTTPRequest(data);
+    return { actor };
   }
 
   /**
@@ -413,9 +427,8 @@
    * Get the list of blocked URLs
    */
   async getBlockedUrls() {
-    if (this.hasWatcherSupport && this.currentWatcher) {
-      const network = await this.currentWatcher.getNetworkActor();
-      return network.getBlockedUrls();
+    if (this.hasResourceWatcherSupport && this.networkFront) {
+      return this.networkFront.getBlockedUrls();
     }
     if (!this.webConsoleFront.traits.blockedUrls) {
       return [];
@@ -429,9 +442,8 @@
    * @param {object} urls An array of URL strings
    */
   async setBlockedUrls(urls) {
-    if (this.hasWatcherSupport && this.currentWatcher) {
-      const network = await this.currentWatcher.getNetworkActor();
-      return network.setBlockedUrls(urls);
+    if (this.hasResourceWatcherSupport && this.networkFront) {
+      return this.networkFront.setBlockedUrls(urls);
     }
     return this.webConsoleFront.setBlockedUrls(urls);
   }
@@ -569,12 +581,22 @@
   }
 
   async updateNetworkThrottling(enabled, profile) {
+    const throttlingFront =
+      this.hasResourceWatcherSupport && this.networkFront
+        ? this.networkFront
+        : this.responsiveFront;
+
     if (!enabled) {
-      await this.responsiveFront.clearNetworkThrottling();
+      throttlingFront.clearNetworkThrottling();
     } else {
-      const data = throttlingProfiles.find(({ id }) => id == profile);
-      const { download, upload, latency } = data;
-      await this.responsiveFront.setNetworkThrottling({
+      // The profile can be either a profile id which is used to
+      // search the predefined throttle profiles or a profile object
+      // as defined in the trottle tests.
+      if (typeof profile === "string") {
+        profile = throttlingProfiles.find(({ id }) => id == profile);
+      }
+      const { download, upload, latency } = profile;
+      await throttlingFront.setNetworkThrottling({
         downloadThroughput: download,
         uploadThroughput: upload,
         latency,
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/firefox-data-provider.js firefox-85.0+build1/devtools/client/netmonitor/src/connector/firefox-data-provider.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/connector/firefox-data-provider.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/connector/firefox-data-provider.js	2021-01-18 19:58:08.000000000 +0000
@@ -303,8 +303,10 @@
    * @return {object}
    */
   async _getStackTraceFromWatcher(actor) {
-    const stacktracesFront = await actor.targetFront.getFront("stacktraces");
-    const stacktrace = await stacktracesFront.getStackTrace(
+    const networkContentFront = await actor.targetFront.getFront(
+      "networkContent"
+    );
+    const stacktrace = await networkContentFront.getStackTrace(
       actor.stacktraceResourceId
     );
     return { stacktrace };
@@ -520,7 +522,7 @@
       // Do a RDP request to fetch data from the actor.
       if (
         clientMethodName == "getStackTrace" &&
-        this.resourceWatcher.hasWatcherSupport(
+        this.resourceWatcher.hasResourceWatcherSupport(
           this.resourceWatcher.TYPES.NETWORK_EVENT_STACKTRACE
         )
       ) {
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/har/har-builder.js firefox-85.0+build1/devtools/client/netmonitor/src/har/har-builder.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/har/har-builder.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/har/har-builder.js	2021-01-18 19:58:08.000000000 +0000
@@ -125,7 +125,7 @@
     // handshake period.
     entry.time = TIMING_KEYS.reduce((sum, type) => {
       const time = entry.timings[type];
-      return typeof time != "undefined" ? sum + time : sum;
+      return typeof time != "undefined" && time != -1 ? sum + time : sum;
     }, 0);
 
     // Security state isn't part of HAR spec, and so create
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/har/har-importer.js firefox-85.0+build1/devtools/client/netmonitor/src/har/har-importer.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/har/har-importer.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/har/har-importer.js	2021-01-18 19:58:08.000000000 +0000
@@ -90,7 +90,7 @@
         },
         totalTime: TIMING_KEYS.reduce((sum, type) => {
           const time = entry.timings[type];
-          return time != -1 ? sum + time : sum;
+          return typeof time != "undefined" && time != -1 ? sum + time : sum;
         }, 0),
 
         httpVersion: entry.request.httpVersion,
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js firefox-85.0+build1/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js	2021-01-18 19:58:08.000000000 +0000
@@ -32,19 +32,14 @@
   const size = 4096;
   const uploadSize = actuallyThrottle ? size / 3 : 0;
 
-  const request = {
-    "NetworkMonitor.throttleData": {
-      latencyMean: 0,
-      latencyMax: 0,
-      downloadBPSMean: 200000,
-      downloadBPSMax: 200000,
-      uploadBPSMean: uploadSize,
-      uploadBPSMax: uploadSize,
-    },
+  const throttleProfile = {
+    latency: 0,
+    download: 200000,
+    upload: uploadSize,
   };
 
   info("sending throttle request");
-  await connector.setPreferences(request);
+  await connector.updateNetworkThrottling(true, throttleProfile);
 
   // Execute one POST request on the page and wait till its done.
   const wait = waitForNetworkEvents(monitor, 1);
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/src/reducers/requests.js firefox-85.0+build1/devtools/client/netmonitor/src/reducers/requests.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/src/reducers/requests.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/src/reducers/requests.js	2021-01-18 19:58:08.000000000 +0000
@@ -33,6 +33,8 @@
     requests: [],
     // Selected request ID
     selectedId: null,
+    // @backward-compact { version 85 } The preselectedId can either be
+    // the actor id on old servers, or the resourceId on new ones.
     preselectedId: null,
     // True if the monitor is recording HTTP traffic
     recording: true,
@@ -171,8 +173,16 @@
   }
 
   // Select the request if it was preselected and there is no other selection.
-  if (state.preselectedId && state.preselectedId === action.id) {
-    nextState.selectedId = state.selectedId || state.preselectedId;
+  if (state.preselectedId) {
+    if (state.preselectedId === action.id) {
+      nextState.selectedId = state.selectedId || state.preselectedId;
+    }
+    // @backward-compact { version 85 } The preselectedId can be resourceId
+    // instead of actor id when a custom request is created, and could not be
+    // selected immediately because it was not yet in the request map.
+    else if (state.preselectedId === newRequest.resourceId) {
+      nextState.selectedId = action.id;
+    }
     nextState.preselectedId = null;
   }
 
@@ -272,12 +282,18 @@
     return state;
   }
 
+  // Find the cloned requests to be removed
   const removedRequest = requests.find(needle => needle.id === selectedId);
 
   // If the custom request is already in the Map, select it immediately,
   // and reset `preselectedId` attribute.
-  const hasPreselectedId =
-    preselectedId && requests.find(needle => needle.id === preselectedId);
+  // @backward-compact { version 85 } The preselectId can also be a resourceId
+  // or an actor id.
+  const customRequest = requests.find(
+    needle => needle.id === preselectedId || needle.resourceId === preselectedId
+  );
+  const hasPreselectedId = preselectedId && customRequest;
+
   return {
     ...state,
     // Only custom requests can be removed
@@ -285,7 +301,7 @@
       item => item.id !== selectedId
     ),
     preselectedId: hasPreselectedId ? null : preselectedId,
-    selectedId: hasPreselectedId ? preselectedId : null,
+    selectedId: hasPreselectedId ? customRequest.id : null,
   };
 }
 
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/test/browser_net_resend_xhr.js firefox-85.0+build1/devtools/client/netmonitor/test/browser_net_resend_xhr.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/test/browser_net_resend_xhr.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/test/browser_net_resend_xhr.js	2021-01-18 19:58:08.000000000 +0000
@@ -29,11 +29,12 @@
   );
   const originalRequest = getSelectedRequest(store.getState());
 
+  const waitForResentRequestEvent = waitForNetworkEvents(monitor, 1);
   // Context Menu > "Resend"
   EventUtils.sendMouseEvent({ type: "contextmenu" }, firstRequest);
   getContextMenuItem(monitor, "request-list-context-resend-only").click();
 
-  await performRequests(monitor, tab, 2);
+  await waitForResentRequestEvent;
 
   // Selects request that was resent
   const selectedRequest = getSelectedRequest(store.getState());
diff -Nru firefox-84.0.2+build1/devtools/client/netmonitor/test/browser_net_throttle.js firefox-85.0+build1/devtools/client/netmonitor/test/browser_net_throttle.js
--- firefox-84.0.2+build1/devtools/client/netmonitor/test/browser_net_throttle.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/netmonitor/test/browser_net_throttle.js	2021-01-18 19:58:08.000000000 +0000
@@ -18,7 +18,7 @@
   const { ACTIVITY_TYPE } = windowRequire(
     "devtools/client/netmonitor/src/constants"
   );
-  const { setPreferences, triggerActivity } = connector;
+  const { updateNetworkThrottling, triggerActivity } = connector;
   const { getSortedRequests } = windowRequire(
     "devtools/client/netmonitor/src/selectors/index"
   );
@@ -29,19 +29,15 @@
   // of SIMPLE_URL in bytes.
   const size = actuallyThrottle ? 200 : 0;
 
-  const request = {
-    "NetworkMonitor.throttleData": {
-      latencyMean: 0,
-      latencyMax: 0,
-      downloadBPSMean: size,
-      downloadBPSMax: size,
-      uploadBPSMean: 10000,
-      uploadBPSMax: 10000,
-    },
+  const throttleProfile = {
+    latency: 0,
+    download: size,
+    upload: 10000,
   };
 
   info("sending throttle request");
-  await setPreferences(request);
+
+  await updateNetworkThrottling(true, throttleProfile);
 
   const wait = waitForNetworkEvents(monitor, 1);
   await triggerActivity(ACTIVITY_TYPE.RELOAD.WITH_CACHE_DISABLED);
diff -Nru firefox-84.0.2+build1/devtools/client/performance/test/browser_perf-fission-switch-target.js firefox-85.0+build1/devtools/client/performance/test/browser_perf-fission-switch-target.js
--- firefox-84.0.2+build1/devtools/client/performance/test/browser_perf-fission-switch-target.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance/test/browser_perf-fission-switch-target.js	2021-01-18 19:58:08.000000000 +0000
@@ -41,11 +41,11 @@
   await PerformanceView.once(EVENTS.UI_RECORDING_PROFILER_STATUS_RENDERED);
 
   info("Navigate to a page running on main process");
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, MAIN_PROCESS_URL);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, MAIN_PROCESS_URL);
   await PerformanceView.once(EVENTS.UI_RECORDING_PROFILER_STATUS_RENDERED);
 
   info("Return to a page running on content process again");
-  await BrowserTestUtils.loadURI(tab.linkedBrowser, CONTENT_PROCESS_URL);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, CONTENT_PROCESS_URL);
   await PerformanceView.once(EVENTS.UI_RECORDING_PROFILER_STATUS_RENDERED);
 
   info("Stop recording");
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/browser.js firefox-85.0+build1/devtools/client/performance-new/browser.js
--- firefox-84.0.2+build1/devtools/client/performance-new/browser.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/browser.js	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,7 @@
  * @typedef {import("./@types/perf").GetEnvironmentVariable} GetEnvironmentVariable
  * @typedef {import("./@types/perf").GetActiveBrowsingContextID} GetActiveBrowsingContextID
  * @typedef {import("./@types/perf").MinimallyTypedGeckoProfile} MinimallyTypedGeckoProfile
+ * * @typedef {import("./@types/perf").ProfilerViewMode} ProfilerViewMode
  */
 
 const ChromeUtils = require("ChromeUtils");
@@ -62,13 +63,16 @@
  * into a new browser tab, and injects the profile via a frame script.
  *
  * @param {MinimallyTypedGeckoProfile} profile - The Gecko profile.
+ * @param {ProfilerViewMode | undefined} profilerViewMode - View mode for the Firefox Profiler
+ *   front-end timeline. While opening the url, we should append a query string
+ *   if a view other than "full" needs to be displayed.
  * @param {GetSymbolTableCallback} getSymbolTableCallback - A callback function with the signature
  *   (debugName, breakpadId) => Promise<SymbolTableAsTuple>, which will be invoked
  *   when profiler.firefox.com sends SYMBOL_TABLE_REQUEST_EVENT messages to us. This
  *   function should obtain a symbol table for the requested binary and resolve the
  *   returned promise with it.
  */
-function receiveProfile(profile, getSymbolTableCallback) {
+function receiveProfile(profile, profilerViewMode, getSymbolTableCallback) {
   const Services = lazy.Services();
   // Find the most recently used window, as the DevTools client could be in a variety
   // of hosts.
@@ -90,11 +94,22 @@
     UI_BASE_URL_PATH_DEFAULT
   );
 
-  const tab = browser.addWebTab(`${baseUrl}${baseUrlPath}`, {
-    triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({
-      userContextId: browser.contentPrincipal.userContextId,
-    }),
-  });
+  // We automatically open up the "full" mode if no query string is present.
+  // `undefined` also means nothing is specified, and it should open the "full"
+  // timeline view in that case.
+  const viewModeQueryString =
+    profilerViewMode !== undefined && profilerViewMode !== "full"
+      ? `?view=${profilerViewMode}`
+      : "";
+
+  const tab = browser.addWebTab(
+    `${baseUrl}${baseUrlPath}${viewModeQueryString}`,
+    {
+      triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({
+        userContextId: browser.contentPrincipal.userContextId,
+      }),
+    }
+  );
   browser.selectedTab = tab;
   const mm = tab.linkedBrowser.messageManager;
   mm.loadFrameScript(
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/popup/background.jsm.js firefox-85.0+build1/devtools/client/performance-new/popup/background.jsm.js
--- firefox-84.0.2+build1/devtools/client/performance-new/popup/background.jsm.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/popup/background.jsm.js	2021-01-18 19:58:08.000000000 +0000
@@ -33,6 +33,7 @@
  * @typedef {import("../@types/perf").MessageFromFrontend} MessageFromFrontend
  * @typedef {import("../@types/perf").PageContext} PageContext
  * @typedef {import("../@types/perf").Presets} Presets
+ * @typedef {import("../@types/perf").ProfilerViewMode} ProfilerViewMode
  */
 
 /** @type {PerformancePref["Entries"]} */
@@ -93,6 +94,7 @@
     features: ["screenshots", "js"],
     threads: ["GeckoMain", "Compositor", "Renderer", "DOM Worker"],
     duration: 0,
+    profilerViewMode: "active-tab",
   },
   "firefox-platform": {
     label: "Firefox Platform",
@@ -193,6 +195,29 @@
 }
 
 /**
+ * Return the proper view mode for the Firefox Profiler front-end timeline by
+ * looking at the proper preset that is selected.
+ * Return value can be undefined when the preset is unknown or custom.
+ * @param {PageContext} pageContext
+ * @return {ProfilerViewMode | undefined}
+ */
+function getProfilerViewModeForCurrentPreset(pageContext) {
+  const postfix = getPrefPostfix(pageContext);
+  const presetName = Services.prefs.getCharPref(PRESET_PREF + postfix);
+
+  if (presetName === "custom") {
+    return undefined;
+  }
+
+  const preset = presets[presetName];
+  if (!preset) {
+    console.error(`Unknown profiler preset was encountered: "${presetName}"`);
+    return undefined;
+  }
+  return preset.profilerViewMode;
+}
+
+/**
  * This function is called directly by devtools/startup/DevToolsStartup.jsm when
  * using the shortcut keys to capture a profile.
  * @param {PageContext} pageContext
@@ -221,8 +246,9 @@
       }
     );
 
+  const profilerViewMode = getProfilerViewModeForCurrentPreset(pageContext);
   const receiveProfile = lazy.BrowserModule().receiveProfile;
-  receiveProfile(profile, (debugName, breakpadId) => {
+  receiveProfile(profile, profilerViewMode, (debugName, breakpadId) => {
     return getSymbolsFromThisBrowser(pageContext, debugName, breakpadId);
   });
 
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/store/actions.js firefox-85.0+build1/devtools/client/performance-new/store/actions.js
--- firefox-84.0.2+build1/devtools/client/performance-new/store/actions.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/store/actions.js	2021-01-18 19:58:08.000000000 +0000
@@ -212,7 +212,8 @@
 
     const getSymbolTable = selectors.getSymbolTableGetter(getState())(profile);
     const receiveProfile = selectors.getReceiveProfileFn(getState());
-    receiveProfile(profile, getSymbolTable);
+    const profilerViewMode = selectors.getProfilerViewMode(getState());
+    receiveProfile(profile, profilerViewMode, getSymbolTable);
     dispatch(changeRecordingState("available-to-record"));
   };
 };
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/store/selectors.js firefox-85.0+build1/devtools/client/performance-new/store/selectors.js
--- firefox-84.0.2+build1/devtools/client/performance-new/store/selectors.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/store/selectors.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,6 +16,7 @@
  * @typedef {import("../@types/perf").GetEnvironmentVariable} GetEnvironmentVariable
  * @typedef {import("../@types/perf").PageContext} PageContext
  * @typedef {import("../@types/perf").Presets} Presets
+ * @typedef {import("../@types/perf").ProfilerViewMode} ProfilerViewMode
  */
 /**
  * @template S
@@ -56,6 +57,9 @@
 /** @type {Selector<string>} */
 const getPresetName = state => state.presetName;
 
+/** @type {Selector<ProfilerViewMode | undefined>} */
+const getProfilerViewMode = state => state.profilerViewMode;
+
 /**
  * When remote profiling, there will be a back button to the settings.
  *
@@ -160,6 +164,7 @@
   getObjdirs,
   getPresets,
   getPresetName,
+  getProfilerViewMode,
   getOpenRemoteDevTools,
   getOpenAboutProfiling,
   getRecordingSettings,
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/test/browser/browser.ini firefox-85.0+build1/devtools/client/performance-new/test/browser/browser.ini
--- firefox-84.0.2+build1/devtools/client/performance-new/test/browser/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -13,6 +13,7 @@
 [browser_aboutprofiling-entries.js]
 [browser_aboutprofiling-features-disabled.js]
 [browser_aboutprofiling-features.js]
+skip-if = tsan # Frequently times out on TSan
 [browser_aboutprofiling-interval.js]
 [browser_aboutprofiling-threads.js]
 [browser_aboutprofiling-threads-behavior.js]
@@ -28,6 +29,7 @@
 [browser_webchannel-enable-menu-button.js]
 [browser_popup-profiler-states.js]
 [browser_popup-record-capture.js]
+[browser_popup-record-capture-view.js]
 [browser_popup-record-discard.js]
 
 # The popupshown and popuphidden events are not firing correctly on linux, as of
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/test/browser/browser_popup-record-capture-view.js firefox-85.0+build1/devtools/client/performance-new/test/browser/browser_popup-record-capture-view.js
--- firefox-84.0.2+build1/devtools/client/performance-new/test/browser/browser_popup-record-capture-view.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/test/browser/browser_popup-record-capture-view.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,67 @@
+/* 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 FRONTEND_BASE_URL =
+  "http://example.com/browser/devtools/client/performance-new/test/browser/fake-frontend.html";
+
+add_task(async function test() {
+  info(
+    "Test that the profiler pop-up correctly opens the captured profile on the " +
+      "correct frontend view by adding proper view query string"
+  );
+  await setProfilerFrontendUrl(FRONTEND_BASE_URL);
+  await makeSureProfilerPopupIsEnabled();
+
+  // First check for "firefox-platform" preset which will have no "view" query
+  // string because this is where our traditional "full" view opens up.
+  await openPopupAndAssertUrlForPreset({
+    preset: "firefox-platform",
+    expectedUrl: FRONTEND_BASE_URL,
+  });
+
+  // Now, let's check for "web-developer" preset. This will open up the frontend
+  // with "active-tab" view query string. Frontend will understand and open the active tab view for it.
+  await openPopupAndAssertUrlForPreset({
+    preset: "web-developer",
+    expectedUrl: FRONTEND_BASE_URL + "?view=active-tab",
+  });
+});
+
+async function openPopupAndAssertUrlForPreset({ preset, expectedUrl }) {
+  // First, switch to the preset we want to test.
+  BackgroundJSM.changePreset(
+    "aboutprofiling",
+    preset,
+    [] // We don't need any features for this test.
+  );
+
+  // Let's capture a profile and assert newly created tab's url.
+  await openPopupAndEnsureCloses(window, async () => {
+    {
+      const button = await getElementByLabel(document, "Start Recording");
+      info("Click the button to start recording.");
+      button.click();
+    }
+
+    {
+      const button = await getElementByLabel(document, "Capture");
+      info("Click the button to capture the recording.");
+      button.click();
+    }
+
+    info(
+      "If the profiler successfully captures a profile, it will create a new " +
+        "tab with the proper view query string depending on the preset."
+    );
+
+    await waitForTabUrl({
+      initialTitle: "Waiting on the profile",
+      successTitle: "Profile received",
+      errorTitle: "Error",
+      expectedUrl,
+    });
+  });
+}
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/test/browser/head.js firefox-85.0+build1/devtools/client/performance-new/test/browser/head.js
--- firefox-84.0.2+build1/devtools/client/performance-new/test/browser/head.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/test/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -366,6 +366,52 @@
 }
 
 /**
+ * This function checks the url of a tab so we can assert the frontend's url
+ * with our expected url. This function runs in a loop every
+ * requestAnimationFrame, and checks for a initialTitle. Asserts as soon as it
+ * finds that title. We don't have to look for success title or error title
+ * since we only care about the url.
+ * @param {{
+ *     initialTitle: string,
+ *     successTitle: string,
+ *     errorTitle: string,
+ *     expectedUrl: string
+ *   }}
+ */
+async function waitForTabUrl({
+  initialTitle,
+  successTitle,
+  errorTitle,
+  expectedUrl,
+}) {
+  const logPeriodically = createPeriodicLogger();
+
+  info(`Waiting for the selected tab to have the url "${expectedUrl}".`);
+
+  return waitUntil(() => {
+    switch (gBrowser.selectedTab.textContent) {
+      case initialTitle:
+      case successTitle:
+        if (gBrowser.currentURI.spec === expectedUrl) {
+          ok(true, `The selected tab has the url ${expectedUrl}`);
+          BrowserTestUtils.removeTab(gBrowser.selectedTab);
+          return true;
+        }
+        throw new Error(
+          `Found a different url on the fake frontend: ${gBrowser.currentURI.spec}`
+        );
+      case errorTitle:
+        throw new Error(
+          "The fake frontend indicated that there was an error injecting the profile."
+        );
+      default:
+        logPeriodically(`> Waiting for the fake frontend tab to be loaded.`);
+        return false;
+    }
+  });
+}
+
+/**
  * This function checks the document title of a tab as an easy way to pass
  * messages from a content page to the mochitest.
  * @param {string} title
diff -Nru firefox-84.0.2+build1/devtools/client/performance-new/@types/perf.d.ts firefox-85.0+build1/devtools/client/performance-new/@types/perf.d.ts
--- firefox-84.0.2+build1/devtools/client/performance-new/@types/perf.d.ts	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/performance-new/@types/perf.d.ts	2021-01-18 19:58:08.000000000 +0000
@@ -50,17 +50,22 @@
  * ActorReadyGeckoProfilerInterface and the PerfFront return promises.
  */
 export interface PerfFront {
-  startProfiler: (options: RecordingStateFromPreferences) => MaybePromise<boolean>;
+  startProfiler: (
+    options: RecordingStateFromPreferences
+  ) => MaybePromise<boolean>;
   getProfileAndStopProfiler: () => Promise<any>;
   stopProfilerAndDiscardProfile: () => MaybePromise<void>;
-  getSymbolTable: (path: string, breakpadId: string) => Promise<[number[], number[], number[]]>;
+  getSymbolTable: (
+    path: string,
+    breakpadId: string
+  ) => Promise<[number[], number[], number[]]>;
   isActive: () => MaybePromise<boolean>;
   isSupportedPlatform: () => MaybePromise<boolean>;
   isLockedForPrivateBrowsing: () => MaybePromise<boolean>;
   on: (type: string, listener: () => void) => void;
   off: (type: string, listener: () => void) => void;
-  destroy: () => void,
-  getSupportedFeatures: () => MaybePromise<string[]>
+  destroy: () => void;
+  getSupportedFeatures: () => MaybePromise<string[]>;
 }
 
 /**
@@ -112,8 +117,9 @@
   threads: string[];
   objdirs: string[];
   presetName: string;
+  profilerViewMode: ProfilerViewMode | undefined;
   initializedValues: InitializedValues | null;
-  promptEnvRestart: null | string
+  promptEnvRestart: null | string;
 }
 
 export type Selector<T> = (state: State) => T;
@@ -152,7 +158,7 @@
  * reason to maintain a full type definition here.
  */
 export interface MinimallyTypedGeckoProfile {
-  libs: Array<{ debugName: string, breakpadId: string }>;
+  libs: Array<{ debugName: string; breakpadId: string }>;
   processes: Array<MinimallyTypedGeckoProfile>;
 }
 
@@ -163,17 +169,22 @@
 
 export type ReceiveProfile = (
   geckoProfile: MinimallyTypedGeckoProfile,
+  profilerViewMode: ProfilerViewMode | undefined,
   getSymbolTableCallback: GetSymbolTableCallback
 ) => void;
 
-export type SetRecordingPreferences = (settings: RecordingStateFromPreferences) => void;
+export type SetRecordingPreferences = (
+  settings: RecordingStateFromPreferences
+) => void;
 
 /**
  * This is the type signature for a function to restart the browser with a given
  * environment variable. Currently only implemented for the popup.
  */
-export type RestartBrowserWithEnvironmentVariable =
-    (envName: string, value: string) => void;
+export type RestartBrowserWithEnvironmentVariable = (
+  envName: string,
+  value: string
+) => void;
 
 /**
  * This is the type signature for a function to query the browser for an
@@ -223,14 +234,16 @@
   // Determine the current page context.
   pageContext: PageContext;
   // The popup and devtools panel use different codepaths for getting symbol tables.
-  getSymbolTableGetter: (profile: MinimallyTypedGeckoProfile) => GetSymbolTableCallback;
+  getSymbolTableGetter: (
+    profile: MinimallyTypedGeckoProfile
+  ) => GetSymbolTableCallback;
   // The list of profiler features that the current target supports.
-  supportedFeatures: string[]
+  supportedFeatures: string[];
   // Allow different devtools contexts to open about:profiling with different methods.
   // e.g. via a new tab, or page navigation.
-  openAboutProfiling?: () => void,
+  openAboutProfiling?: () => void;
   // Allow about:profiling to switch back to the remote devtools panel.
-  openRemoteDevTools?: () => void,
+  openRemoteDevTools?: () => void;
 }
 
 /**
@@ -261,7 +274,7 @@
   | {
       type: "CHANGE_FEATURES";
       features: string[];
-      promptEnvRestart: string | null
+      promptEnvRestart: string | null;
     }
   | {
       type: "CHANGE_THREADS";
@@ -278,10 +291,12 @@
       setRecordingPreferences: SetRecordingPreferences;
       presets: Presets;
       pageContext: PageContext;
-      openAboutProfiling?: () => void,
-      openRemoteDevTools?: () => void,
+      openAboutProfiling?: () => void;
+      openRemoteDevTools?: () => void;
       recordingSettingsFromPreferences: RecordingStateFromPreferences;
-      getSymbolTableGetter: (profile: MinimallyTypedGeckoProfile) => GetSymbolTableCallback;
+      getSymbolTableGetter: (
+        profile: MinimallyTypedGeckoProfile
+      ) => GetSymbolTableCallback;
       supportedFeatures: string[];
     }
   | {
@@ -298,7 +313,9 @@
   pageContext: PageContext;
   recordingPreferences: RecordingStateFromPreferences;
   supportedFeatures: string[];
-  getSymbolTableGetter: (profile: MinimallyTypedGeckoProfile) => GetSymbolTableCallback;
+  getSymbolTableGetter: (
+    profile: MinimallyTypedGeckoProfile
+  ) => GetSymbolTableCallback;
   openAboutProfiling?: () => void;
   openRemoteDevTools?: () => void;
 }
@@ -406,11 +423,17 @@
  * A collection of functions to scale numbers.
  */
 export interface ScaleFunctions {
-  fromFractionToValue: NumberScaler,
-  fromValueToFraction: NumberScaler,
-  fromFractionToSingleDigitValue: NumberScaler,
+  fromFractionToValue: NumberScaler;
+  fromValueToFraction: NumberScaler;
+  fromFractionToSingleDigitValue: NumberScaler;
 }
 
+/**
+ * View mode for the Firefox Profiler front-end timeline.
+ * `undefined` is defaulted to full automatically.
+ */
+export type ProfilerViewMode = "full" | "active-tab" | "origins";
+
 export interface PresetDefinition {
   label: string;
   description: string;
@@ -419,6 +442,7 @@
   features: string[];
   threads: string[];
   duration: number;
+  profilerViewMode?: ProfilerViewMode;
 }
 
 export interface Presets {
@@ -444,7 +468,7 @@
   | {
       type: "ENABLE_MENU_BUTTON_DONE";
       requestId: number;
-    }
+    };
 
 /**
  * This represents an event channel that can talk to a content page on the web.
@@ -456,9 +480,16 @@
  */
 export class ProfilerWebChannel {
   constructor(id: string, url: MockedExports.nsIURI);
-  send: (message: MessageToFrontend, target: MockedExports.WebChannelTarget) => void;
+  send: (
+    message: MessageToFrontend,
+    target: MockedExports.WebChannelTarget
+  ) => void;
   listen: (
-    handler: (idle: string, message: MessageFromFrontend, target: MockedExports.WebChannelTarget) => void
+    handler: (
+      idle: string,
+      message: MessageFromFrontend,
+      target: MockedExports.WebChannelTarget
+    ) => void
   ) => void;
 }
 
@@ -468,16 +499,16 @@
  */
 export interface FeatureDescription {
   // The name of the feature as shown in the UI.
-  name: string,
+  name: string;
   // The key value of the feature, this will be stored in prefs, and used in the
   // nsiProfiler interface.
-  value: string,
+  value: string;
   // The full description of the preset, this will need to be localized.
-  title: string,
+  title: string;
   // This will give the user a hint that it's recommended on.
-  recommended?: boolean,
+  recommended?: boolean;
   // This will give the user a hint that it's an experimental feature.
-  experimental?: boolean,
+  experimental?: boolean;
   // This will give a reason if the feature is disabled.
-  disabledReason?: string,
+  disabledReason?: string;
 }
diff -Nru firefox-84.0.2+build1/devtools/client/responsive/test/browser/browser_network_throttling.js firefox-85.0+build1/devtools/client/responsive/test/browser/browser_network_throttling.js
--- firefox-84.0.2+build1/devtools/client/responsive/test/browser/browser_network_throttling.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/responsive/test/browser/browser_network_throttling.js	2021-01-18 19:58:08.000000000 +0000
@@ -37,7 +37,11 @@
 }
 
 var testNetworkThrottlingState = async function(ui, expected) {
-  const state = await ui.responsiveFront.getNetworkThrottling();
+  const front =
+    ui.hasResourceWatcherSupport && ui.networkFront
+      ? ui.networkFront
+      : ui.responsiveFront;
+  const state = await front.getNetworkThrottling();
   Assert.deepEqual(
     state,
     expected,
diff -Nru firefox-84.0.2+build1/devtools/client/responsive/test/browser/head.js firefox-85.0+build1/devtools/client/responsive/test/browser/head.js
--- firefox-84.0.2+build1/devtools/client/responsive/test/browser/head.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/responsive/test/browser/head.js	2021-01-18 19:58:08.000000000 +0000
@@ -589,7 +589,7 @@
 
 async function load(browser, url) {
   const loaded = BrowserTestUtils.browserLoaded(browser, false, null, false);
-  await BrowserTestUtils.loadURI(browser, url);
+  BrowserTestUtils.loadURI(browser, url);
   await loaded;
 }
 
diff -Nru firefox-84.0.2+build1/devtools/client/responsive/ui.js firefox-85.0+build1/devtools/client/responsive/ui.js
--- firefox-84.0.2+build1/devtools/client/responsive/ui.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/devtools/client/responsive/ui.js	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,9 @@
 } = require("devtools/client/responsive/utils/orientation");
 const Constants = require("devtools/client/responsive/constants");
 const { TargetList } = require("devtools/shared/resources/target-list");
+const {
+  ResourceWatcher,
+} = require("devtools/shared/resources/resource-watcher");
 
 loader.lazyRequireGetter(
   this,
@@ -93,6 +96,7 @@
 
     this.onTargetAvailable = this.onTargetAvailable.bind(this);
 
+    this.networkFront = null;
     // Promise resovled when the UI init has completed.
     this.inited = this.init();
 
@@ -115,6 +119,16 @@
     return this.targetList.targetFront;
   }
 
+  get watcherFront() {
+    return this.resourceWatcher.watcherFront;
+  }
+
+  get hasResourceWatcherSupport() {
+    return this.resourceWatcher.hasResourceWatcherSupport(
+      this.resourceWatcher.TYPES.NETWORK_EVENT
+    );
+  }
+
   /**
    * Open RDM while preserving the state of the page.
    */
@@ -290,10 +304,20 @@
       // the tab has to be reloaded to remove the emulated settings created by RDM.
       currentTarget = this.currentTarget;
 
+      // Resseting the throtting needs to be done before the
+      // network events watching is stopped.
+      await this.updateNetworkThrottling();
+
       this.targetList.unwatchTargets(
         [this.targetList.TYPES.FRAME],
         this.onTargetAvailable
       );
+
+      this.resourceWatcher.unwatchResources(
+        [this.resourceWatcher.TYPES.NETWORK_EVENT],
+        { onAvailable: this.onNetworkResourceAvailable }
+      );
+
       this.targetList.destroy();
     }
 
@@ -325,7 +349,6 @@
     if (!isTabContentDestroying) {
       let reloadNeeded = false;
       await this.updateDPPX();
-      await this.updateNetworkThrottling();
       reloadNeeded |=
         (await this.updateUserAgent()) && this.reloadOnChange("userAgent");
       reloadNeeded |=
@@ -374,12 +397,27 @@
 
     const descriptor = await this.client.mainRoot.getTab();
     const targetFront = await descriptor.getTarget();
+
     this.targetList = new TargetList(this.client.mainRoot, targetFront);
+    this.resourceWatcher = new ResourceWatcher(this.targetList);
+
     this.targetList.startListening();
+
     await this.targetList.watchTargets(
       [this.targetList.TYPES.FRAME],
       this.onTargetAvailable
     );
+
+    // To support network throttling the resource watcher
+    // needs to be watching for network resources.
+    await this.resourceWatcher.watchResources(
+      [this.resourceWatcher.TYPES.NETWORK_EVENT],
+      { onAvailable: this.onNetworkResourceAvailable }
+    );
+
+    if (this.hasResourceWatcherSupport) {
+      this.networkFront = await this.watcherFront.getNetworkParentActor();
+    }
   }
 
   /**
@@ -813,13 +851,18 @@
    *         (This is always immediate, so it's always false.)
    */
   async updateNetworkThrottling(enabled, profile) {
+    const throttlingFront =
+      this.hasResourceWatcherSupport && this.networkFront
+        ? this.networkFront
+        : this.responsiveFront;
+
     if (!enabled) {
-      await this.responsiveFront.clearNetworkThrottling();
+      await throttlingFront.clearNetworkThrottling();
       return false;
     }
     const data = throttlingProfiles.find(({ id }) => id == profile);
     const { download, upload, latency } = data;
-    await this.responsiveFront.setNetworkThrottling({
+    await throttlingFront.setNetworkThrottling({
       downloadThroughput: download,
       uploadThroughput: upload,
       latency,
@@ -1024,6 +1067,9 @@
       await this.restoreActorState();
     }
   }
+  // This just needed to setup watching for network resources,
+  // to support network throttling.
+  onNetworkResourceAvailable() {}
 
   async onRemotenessChange(event) {
     // The current tab target will be destroyed by the process change.
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/NotificationBox.css firefox-85.0+build1/devtools/client/shared/components/NotificationBox.css
--- firefox-84.0.2+build1/devtools/client/shared/components/NotificationBox.css	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/NotificationBox.css	2021-01-18 19:58:08.000000000 +0000
@@ -93,6 +93,7 @@
   background-color: transparent;
   background-repeat: no-repeat;
   border-radius: 2px;
+  border-width: 0;
   -moz-context-properties: fill;
   fill: currentColor;
 }
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/NotificationBox.js firefox-85.0+build1/devtools/client/shared/components/NotificationBox.js
--- firefox-84.0.2+build1/devtools/client/shared/components/NotificationBox.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/NotificationBox.js	2021-01-18 19:58:08.000000000 +0000
@@ -240,7 +240,7 @@
         notification.buttons.map(props =>
           this.renderButton(props, notification)
         ),
-        div({
+        button({
           className: "messageCloseButton",
           title: this.props.closeButtonTooltip,
           onClick: this.close.bind(this, notification),
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/client.js firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/client.js
--- firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/client.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/client.js	2021-01-18 19:58:08.000000000 +0000
@@ -79,6 +79,10 @@
   }
 }
 
+async function getPromiseState(objectFront) {
+  return objectFront.getPromiseState();
+}
+
 async function getProxySlots(objectFront) {
   return objectFront.getProxySlots();
 }
@@ -100,5 +104,6 @@
   enumSymbols,
   getPrototype,
   getFullText,
+  getPromiseState,
   getProxySlots,
 };
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/load-properties.js firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/load-properties.js
--- firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/load-properties.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/load-properties.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
   getPrototype,
   enumSymbols,
   getFullText,
+  getPromiseState,
   getProxySlots,
 } = require("devtools/client/shared/components/object-inspector/utils/client");
 
@@ -24,6 +25,7 @@
   nodeIsEntries,
   nodeIsMapEntry,
   nodeIsPrimitive,
+  nodeIsPromise,
   nodeIsProxy,
   nodeNeedsNumericalBuckets,
   nodeIsLongString,
@@ -77,6 +79,10 @@
     promises.push(getFullText(longStringFront, item));
   }
 
+  if (shouldLoadItemPromiseState(item, loadedProperties)) {
+    promises.push(getPromiseState(getObjectFront()));
+  }
+
   if (shouldLoadItemProxySlots(item, loadedProperties)) {
     promises.push(getProxySlots(getObjectFront()));
   }
@@ -104,6 +110,10 @@
       data.fullText = response.fullText;
     }
 
+    if (response.promiseState) {
+      data.promiseState = response.promiseState;
+    }
+
     if (response.proxyTarget && response.proxyHandler) {
       data.proxyTarget = response.proxyTarget;
       data.proxyHandler = response.proxyHandler;
@@ -198,6 +208,10 @@
   return !loadedProperties.has(item.path) && nodeIsLongString(item);
 }
 
+function shouldLoadItemPromiseState(item, loadedProperties = new Map()) {
+  return !loadedProperties.has(item.path) && nodeIsPromise(item);
+}
+
 function shouldLoadItemProxySlots(item, loadedProperties = new Map()) {
   return !loadedProperties.has(item.path) && nodeIsProxy(item);
 }
@@ -211,5 +225,6 @@
   shouldLoadItemPrototype,
   shouldLoadItemSymbols,
   shouldLoadItemFullText,
+  shouldLoadItemPromiseState,
   shouldLoadItemProxySlots,
 };
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/node.js firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/node.js
--- firefox-84.0.2+build1/devtools/client/shared/components/object-inspector/utils/node.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/object-inspector/utils/node.js	2021-01-18 19:58:08.000000000 +0000
@@ -281,11 +281,8 @@
   );
 }
 
-function makeNodesForPromiseProperties(item) {
-  const {
-    promiseState: { reason, value, state },
-  } = getValue(item);
-
+function makeNodesForPromiseProperties(loadedProps, item) {
+  const { reason, value, state } = loadedProps.promiseState;
   const properties = [];
 
   if (state) {
@@ -577,10 +574,6 @@
     }, this);
   }
 
-  if (nodeIsPromise(parent)) {
-    nodes.push(...makeNodesForPromiseProperties(parent));
-  }
-
   if (nodeHasEntries(parent)) {
     nodes.push(makeNodesForEntries(parent));
   }
@@ -805,6 +798,10 @@
     return addToCache(makeNodesForMapEntry(item));
   }
 
+  if (nodeIsPromise(item) && hasLoadedProps) {
+    return addToCache(makeNodesForPromiseProperties(loadedProps, item));
+  }
+
   if (nodeIsProxy(item) && hasLoadedProps) {
     return addToCache(makeNodesForProxyProperties(loadedProps, item));
   }
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/element-node.js firefox-85.0+build1/devtools/client/shared/components/reps/reps/element-node.js
--- firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/element-node.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/reps/reps/element-node.js	2021-01-18 19:58:08.000000000 +0000
@@ -121,6 +121,9 @@
     // Initiate config
     const config = {
       "data-link-actor-id": object.actor,
+      "data-link-content-dom-reference": JSON.stringify(
+        object.contentDomReference
+      ),
       className: "objectBox objectBox-node",
     };
 
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/grip.js firefox-85.0+build1/devtools/client/shared/components/reps/reps/grip.js
--- firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/grip.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/reps/reps/grip.js	2021-01-18 19:58:08.000000000 +0000
@@ -201,8 +201,8 @@
     // The server synthesizes some property names for a Proxy, like
     // <target> and <handler>; we don't want to quote these because,
     // as synthetic properties, they appear more natural when
-    // unquoted.
-    const suppressQuotes = object.class === "Proxy";
+    // unquoted. Analogous for a Promise.
+    const suppressQuotes = ["Proxy", "Promise"].includes(object.class);
     const propsArray = getProps(props, properties, indexes, suppressQuotes);
 
     // Show symbols.
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/promise.js firefox-85.0+build1/devtools/client/shared/components/reps/reps/promise.js
--- firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/promise.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/reps/reps/promise.js	2021-01-18 19:58:08.000000000 +0000
@@ -13,11 +13,10 @@
   // Dependencies
   const {
     getGripType,
-    isGrip,
     wrapRender,
   } = require("devtools/client/shared/components/reps/reps/rep-utils");
 
-  const PropRep = require("devtools/client/shared/components/reps/reps/prop-rep");
+  const Grip = require("devtools/client/shared/components/reps/reps/grip");
   const {
     MODE,
   } = require("devtools/client/shared/components/reps/reps/constants");
@@ -38,101 +37,58 @@
 
   function PromiseRep(props) {
     const object = props.object;
-    const shouldRenderTooltip = props.shouldRenderTooltip;
-    const { promiseState } = object;
 
+    // @backward-compat { version 85 } On older servers, the preview of a promise was
+    // useless and didn't include the internal promise state, which was directly exposed
+    // in the grip.
+    if (object.promiseState) {
+      const { state, value, reason } = object.promiseState;
+      const ownProperties = Object.create(null);
+      ownProperties["<state>"] = { value: state };
+      let ownPropertiesLength = 1;
+      if (state == "fulfilled") {
+        ownProperties["<value>"] = { value: value };
+        ++ownPropertiesLength;
+      } else if (state == "rejected") {
+        ownProperties["<reason>"] = { value: reason };
+        ++ownPropertiesLength;
+      }
+      object.preview = {
+        kind: "Object",
+        ownProperties,
+        ownPropertiesLength,
+      };
+    }
+
+    if (props.mode !== MODE.TINY) {
+      return Grip.rep(props);
+    }
+
+    const shouldRenderTooltip = props.shouldRenderTooltip;
     const config = {
       "data-link-actor-id": object.actor,
       className: "objectBox objectBox-object",
       title: shouldRenderTooltip ? "Promise" : null,
     };
 
-    if (props.mode === MODE.TINY) {
-      const {
-        Rep,
-      } = require("devtools/client/shared/components/reps/reps/rep");
-
-      return span(
-        config,
-        getTitle(object),
-        span(
-          {
-            className: "objectLeftBrace",
-          },
-          " { "
-        ),
-        Rep({ object: promiseState.state }),
-        span(
-          {
-            className: "objectRightBrace",
-          },
-          " }"
-        )
-      );
-    }
+    const { Rep } = require("devtools/client/shared/components/reps/reps/rep");
 
-    const propsArray = getProps(props, promiseState);
     return span(
       config,
       getTitle(object),
-      span(
-        {
-          className: "objectLeftBrace",
-        },
-        " { "
-      ),
-      ...propsArray,
-      span(
-        {
-          className: "objectRightBrace",
-        },
-        " }"
-      )
+      span({ className: "objectLeftBrace" }, " { "),
+      Rep({ object: object.preview.ownProperties["<state>"].value }),
+      span({ className: "objectRightBrace" }, " }")
     );
   }
 
   function getTitle(object) {
-    return span(
-      {
-        className: "objectTitle",
-      },
-      object.class
-    );
-  }
-
-  function getProps(props, promiseState) {
-    const keys = ["state"];
-    if (promiseState.hasOwnProperty("value")) {
-      keys.push("value");
-    } else if (promiseState.hasOwnProperty("reason")) {
-      keys.push("reason");
-    }
-
-    return keys.reduce((res, key, i) => {
-      const object = promiseState[key];
-      res = res.concat(
-        PropRep({
-          ...props,
-          mode: MODE.TINY,
-          name: `<${key}>`,
-          object: object.getGrip ? object.getGrip() : object,
-          equal: ": ",
-          suppressQuotes: true,
-        })
-      );
-
-      // Interleave commas between elements
-      if (i !== keys.length - 1) {
-        res.push(", ");
-      }
-
-      return res;
-    }, []);
+    return span({ className: "objectTitle" }, object.class);
   }
 
   // Registration
   function supportsObject(object, noGrip = false) {
-    if (noGrip === true || !isGrip(object)) {
+    if (!Grip.supportsObject(object, noGrip)) {
       return false;
     }
     return getGripType(object, noGrip) == "Promise";
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/rep-utils.js firefox-85.0+build1/devtools/client/shared/components/reps/reps/rep-utils.js
--- firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/rep-utils.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/reps/reps/rep-utils.js	2021-01-18 19:58:08.000000000 +0000
@@ -346,11 +346,6 @@
       return [];
     }
 
-    // Promise resolved value Grip
-    if (grip.promiseState && grip.promiseState.value) {
-      return [grip.promiseState.value];
-    }
-
     // Array Grip
     if (grip.preview && grip.preview.items) {
       return grip.preview.items;
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/text-node.js firefox-85.0+build1/devtools/client/shared/components/reps/reps/text-node.js
--- firefox-84.0.2+build1/devtools/client/shared/components/reps/reps/text-node.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/reps/reps/text-node.js	2021-01-18 19:58:08.000000000 +0000
@@ -67,6 +67,9 @@
 
     const config = {
       "data-link-actor-id": object.actor,
+      "data-link-content-dom-reference": JSON.stringify(
+        object.contentDomReference
+      ),
       className: "objectBox objectBox-textNode",
       title: shouldRenderTooltip ? `#text "${getTextContent(object)}"` : null,
     };
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js firefox-85.0+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js
--- firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/promises.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -31,24 +31,24 @@
   });
 
   it("makeNodesForPromiseProperties", () => {
-    const promise = {
+    const item = {
       path: "root",
       contents: {
         value: {
           actor: "server2.conn2.child1/obj36",
-          promiseState: {
-            state: "rejected",
-            reason: {
-              type: "3",
-            },
-          },
           class: "Promise",
           type: "object",
         },
       },
     };
+    const promiseState = {
+      state: "rejected",
+      reason: {
+        type: "3",
+      },
+    };
 
-    const properties = makeNodesForPromiseProperties(promise);
+    const properties = makeNodesForPromiseProperties({promiseState}, item);
     expect(properties).toMatchSnapshot();
   });
 });
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/__snapshots__/promises.test.js.snap firefox-85.0+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/__snapshots__/promises.test.js.snap
--- firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/__snapshots__/promises.test.js.snap	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/test/node/components/object-inspector/utils/__snapshots__/promises.test.js.snap	2021-01-18 19:58:08.000000000 +0000
@@ -13,12 +13,6 @@
         "value": Object {
           "actor": "server2.conn2.child1/obj36",
           "class": "Promise",
-          "promiseState": Object {
-            "reason": Object {
-              "type": "3",
-            },
-            "state": "rejected",
-          },
           "type": "object",
         },
       },
@@ -42,12 +36,6 @@
         "value": Object {
           "actor": "server2.conn2.child1/obj36",
           "class": "Promise",
-          "promiseState": Object {
-            "reason": Object {
-              "type": "3",
-            },
-            "state": "rejected",
-          },
           "type": "object",
         },
       },
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/reps/promise.test.js firefox-85.0+build1/devtools/client/shared/components/test/node/components/reps/promise.test.js
--- firefox-84.0.2+build1/devtools/client/shared/components/test/node/components/reps/promise.test.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/test/node/components/reps/promise.test.js	2021-01-18 19:58:08.000000000 +0000
@@ -106,9 +106,12 @@
 
 describe("Promise - fulfilled with array", () => {
   const object = stubs.get("FulfilledWithArray");
-  const length = getGripLengthBubbleText(object.promiseState.value, {
-    mode: MODE.TINY,
-  });
+  const length = getGripLengthBubbleText(
+    object.preview.ownProperties["<value>"].value,
+    {
+      mode: MODE.TINY,
+    }
+  );
   const out = `Promise { <state>: "fulfilled", <value>: ${length} […] }`;
 
   it("selects PromiseRep Rep for Promise fulfilled with an array", () => {
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/test/node/stubs/reps/big-int.js firefox-85.0+build1/devtools/client/shared/components/test/node/stubs/reps/big-int.js
--- firefox-84.0.2+build1/devtools/client/shared/components/test/node/stubs/reps/big-int.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/test/node/stubs/reps/big-int.js	2021-01-18 19:58:08.000000000 +0000
@@ -175,23 +175,21 @@
   extensible: true,
   frozen: false,
   sealed: false,
-  promiseState: {
-    state: "fulfilled",
-    value: {
-      type: "BigInt",
-      text: "1",
-    },
-    creationTimestamp: 1550831461773.1665,
-    timeToSettle: 0.036448000464588404,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownSymbols: [],
-    ownPropertiesLength: 0,
-    ownSymbolsLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: {
+          type: "BigInt",
+          text: "1",
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
diff -Nru firefox-84.0.2+build1/devtools/client/shared/components/test/node/stubs/reps/promise.js firefox-85.0+build1/devtools/client/shared/components/test/node/stubs/reps/promise.js
--- firefox-84.0.2+build1/devtools/client/shared/components/test/node/stubs/reps/promise.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/components/test/node/stubs/reps/promise.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,16 +9,15 @@
   type: "object",
   actor: "server1.conn1.child1/obj54",
   class: "Promise",
-  promiseState: {
-    state: "pending",
-    creationTimestamp: 1477327760242.5752,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "pending",
+      },
+    },
+    ownPropertiesLength: 1,
   },
 });
 
@@ -26,18 +25,18 @@
   type: "object",
   actor: "server1.conn1.child1/obj55",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: 42,
-    creationTimestamp: 1477327760242.721,
-    timeToSettle: 0.018497000000479602,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: 42,
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -45,18 +44,18 @@
   type: "object",
   actor: "server1.conn1.child1/obj56",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: "foo",
-    creationTimestamp: 1477327760243.2483,
-    timeToSettle: 0.0019969999998465937,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: "foo",
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -64,26 +63,26 @@
   type: "object",
   actor: "server1.conn1.child1/obj59",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: {
-      type: "object",
-      actor: "server1.conn1.child1/obj60",
-      class: "Object",
-      extensible: true,
-      frozen: false,
-      sealed: false,
-      ownPropertyLength: 2,
-    },
-    creationTimestamp: 1477327760243.2214,
-    timeToSettle: 0.002035999999861815,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: {
+          type: "object",
+          actor: "server1.conn1.child1/obj60",
+          class: "Object",
+          extensible: true,
+          frozen: false,
+          sealed: false,
+          ownPropertyLength: 2,
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -91,30 +90,30 @@
   type: "object",
   actor: "server1.conn1.child1/obj57",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: {
-      type: "object",
-      actor: "server1.conn1.child1/obj58",
-      class: "Array",
-      extensible: true,
-      frozen: false,
-      sealed: false,
-      ownPropertyLength: 4,
-      preview: {
-        kind: "ArrayLike",
-        length: 3,
-      },
-    },
-    creationTimestamp: 1477327760242.9597,
-    timeToSettle: 0.006158000000141328,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: {
+          type: "object",
+          actor: "server1.conn1.child1/obj58",
+          class: "Array",
+          extensible: true,
+          frozen: false,
+          sealed: false,
+          ownPropertyLength: 4,
+          preview: {
+            kind: "ArrayLike",
+            length: 3,
+          },
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -122,38 +121,38 @@
   type: "object",
   actor: "server1.conn1.child1/obj217",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: {
-      type: "object",
-      actor: "server1.conn1.child1/obj218",
-      class: "HTMLButtonElement",
-      extensible: true,
-      frozen: false,
-      sealed: false,
-      ownPropertyLength: 0,
-      preview: {
-        kind: "DOMNode",
-        nodeType: 1,
-        nodeName: "button",
-        isConnected: true,
-        attributes: {
-          id: "btn-1",
-          class: "btn btn-log",
-          type: "button",
-        },
-        attributesLength: 3,
-      },
-    },
-    creationTimestamp: 1480423091620.3716,
-    timeToSettle: 0.02842400000372436,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: {
+          type: "object",
+          actor: "server1.conn1.child1/obj218",
+          class: "HTMLButtonElement",
+          extensible: true,
+          frozen: false,
+          sealed: false,
+          ownPropertyLength: 0,
+          preview: {
+            kind: "DOMNode",
+            nodeType: 1,
+            nodeName: "button",
+            isConnected: true,
+            attributes: {
+              id: "btn-1",
+              class: "btn btn-log",
+              type: "button",
+            },
+            attributesLength: 3,
+          },
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -161,38 +160,38 @@
   type: "object",
   actor: "server1.conn1.child1/obj217",
   class: "Promise",
-  promiseState: {
-    state: "fulfilled",
-    value: {
-      type: "object",
-      actor: "server1.conn1.child1/obj218",
-      class: "HTMLButtonElement",
-      extensible: true,
-      frozen: false,
-      sealed: false,
-      ownPropertyLength: 0,
-      preview: {
-        kind: "DOMNode",
-        nodeType: 1,
-        nodeName: "button",
-        isConnected: false,
-        attributes: {
-          id: "btn-1",
-          class: "btn btn-log",
-          type: "button",
-        },
-        attributesLength: 3,
-      },
-    },
-    creationTimestamp: 1480423091620.3716,
-    timeToSettle: 0.02842400000372436,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "fulfilled",
+      },
+      "<value>": {
+        value: {
+          type: "object",
+          actor: "server1.conn1.child1/obj218",
+          class: "HTMLButtonElement",
+          extensible: true,
+          frozen: false,
+          sealed: false,
+          ownPropertyLength: 0,
+          preview: {
+            kind: "DOMNode",
+            nodeType: 1,
+            nodeName: "button",
+            isConnected: false,
+            attributes: {
+              id: "btn-1",
+              class: "btn btn-log",
+              type: "button",
+            },
+            attributesLength: 3,
+          },
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -200,18 +199,18 @@
   type: "object",
   actor: "server0.conn0.child3/obj27",
   class: "Promise",
-  promiseState: {
-    state: "rejected",
-    reason: 123,
-    creationTimestamp: 1604166587850.8196,
-    timeToSettle: 0.002147999999579042,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "rejected",
+      },
+      "<reason>": {
+        value: 123,
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
@@ -219,26 +218,26 @@
   type: "object",
   actor: "server0.conn0.child3/obj67",
   class: "Promise",
-  promiseState: {
-    state: "rejected",
-    reason: {
-      type: "object",
-      actor: "server1.conn1.child1/obj68",
-      class: "Object",
-      extensible: true,
-      frozen: false,
-      sealed: false,
-      ownPropertyLength: 1,
-    },
-    creationTimestamp: 1604166111838.8694,
-    timeToSettle: 0.0017999999690800905,
-  },
   ownPropertyLength: 0,
   preview: {
     kind: "Object",
-    ownProperties: {},
-    ownPropertiesLength: 0,
-    safeGetterValues: {},
+    ownProperties: {
+      "<state>": {
+        value: "rejected",
+      },
+      "<reason>": {
+        value: {
+          type: "object",
+          actor: "server1.conn1.child1/obj68",
+          class: "Object",
+          extensible: true,
+          frozen: false,
+          sealed: false,
+          ownPropertyLength: 1,
+        },
+      },
+    },
+    ownPropertiesLength: 2,
   },
 });
 
diff -Nru firefox-84.0.2+build1/devtools/client/shared/output-parser.js firefox-85.0+build1/devtools/client/shared/output-parser.js
--- firefox-84.0.2+build1/devtools/client/shared/output-parser.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/output-parser.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,19 +16,14 @@
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);
 
-const CONIC_GRADIENT_ENABLED = Services.prefs.getBoolPref(
-  "layout.css.conic-gradient.enabled"
-);
-
 // Functions that accept an angle argument.
 const ANGLE_TAKING_FUNCTIONS = [
   "linear-gradient",
   "-moz-linear-gradient",
   "repeating-linear-gradient",
   "-moz-repeating-linear-gradient",
-  ...(CONIC_GRADIENT_ENABLED
-    ? ["conic-gradient", "repeating-conic-gradient"]
-    : []),
+  "conic-gradient",
+  "repeating-conic-gradient",
   "rotate",
   "rotateX",
   "rotateY",
@@ -57,9 +52,8 @@
   "-moz-radial-gradient",
   "repeating-radial-gradient",
   "-moz-repeating-radial-gradient",
-  ...(CONIC_GRADIENT_ENABLED
-    ? ["conic-gradient", "repeating-conic-gradient"]
-    : []),
+  "conic-gradient",
+  "repeating-conic-gradient",
   "drop-shadow",
 ];
 // Functions that accept a shape argument.
diff -Nru firefox-84.0.2+build1/devtools/client/shared/remote-debugging/adb/adb-addon.js firefox-85.0+build1/devtools/client/shared/remote-debugging/adb/adb-addon.js
--- firefox-84.0.2+build1/devtools/client/shared/remote-debugging/adb/adb-addon.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/remote-debugging/adb/adb-addon.js	2021-01-18 19:58:08.000000000 +0000
@@ -11,11 +11,6 @@
 const PREF_ADB_EXTENSION_URL = "devtools.remote.adb.extensionURL";
 const PREF_ADB_EXTENSION_ID = "devtools.remote.adb.extensionID";
 
-// Extension ID for adb helper extension that might be installed on Firefox 63 or older.
-const ADB_HELPER_ADDON_ID = "adbhelper@mozilla.org";
-// Extension ID for Valence extension that is no longer supported.
-const VALENCE_ADDON_ID = "fxdevtools-adapters@mozilla.org";
-
 const ADB_ADDON_STATES = {
   DOWNLOADING: "downloading",
   INSTALLED: "installed",
@@ -132,25 +127,6 @@
     addon.uninstall();
   }
 
-  /**
-   * Cleanup old remote debugging extensions from profiles that might still have them
-   * installed. Should be called from remote debugging entry points.
-   */
-  async uninstallUnsupportedExtensions() {
-    const [adbHelperAddon, valenceAddon] = await Promise.all([
-      AddonManager.getAddonByID(ADB_HELPER_ADDON_ID),
-      AddonManager.getAddonByID(VALENCE_ADDON_ID),
-    ]);
-
-    if (adbHelperAddon) {
-      adbHelperAddon.uninstall();
-    }
-
-    if (valenceAddon) {
-      valenceAddon.uninstall();
-    }
-  }
-
   installFailureHandler(install, message) {
     this.status = ADB_ADDON_STATES.UNINSTALLED;
     this.emit("failure", message);
diff -Nru firefox-84.0.2+build1/devtools/client/shared/sourceeditor/codemirror/codemirror.bundle.js firefox-85.0+build1/devtools/client/shared/sourceeditor/codemirror/codemirror.bundle.js
--- firefox-84.0.2+build1/devtools/client/shared/sourceeditor/codemirror/codemirror.bundle.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/sourceeditor/codemirror/codemirror.bundle.js	2021-01-18 19:58:08.000000000 +0000
@@ -1 +1 @@
-var CodeMirror=function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=7)}([function(e,t,n){e.exports=function(){"use strict";var e=navigator.userAgent,t=navigator.platform,n=/gecko\/\d/i.test(e),r=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=/Edge\/(\d+)/.exec(e),a=r||i||o,l=a&&(r?document.documentMode||6:+(o||i)[1]),s=!o&&/WebKit\//.test(e),c=s&&/Qt\/\d+\.\d+/.test(e),u=!o&&/Chrome\//.test(e),f=/Opera\//.test(e),d=/Apple Computer/.test(navigator.vendor),h=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),m=!o&&/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),g=/Android/.test(e),v=m||g||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),y=m||/Mac/.test(t),b=/\bCrOS\b/.test(e),x=/win/i.test(t),w=f&&e.match(/Version\/(\d*\.\d*)/);w&&(w=Number(w[1])),w&&w>=15&&(f=!1,s=!0);var k=y&&(c||f&&(null==w||w<12.11)),C=n||a&&l>=9;function S(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var T,L=function(e,t){var n=e.className,r=S(t).exec(n);if(r){var i=n.slice(r.index+r[0].length);e.className=n.slice(0,r.index)+(i?r[1]+i:"")}};function M(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function O(e,t){return M(e).appendChild(t)}function N(e,t,n,r){var i=document.createElement(e);if(n&&(i.className=n),r&&(i.style.cssText=r),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function A(e,t,n,r){var i=N(e,t,n,r);return i.setAttribute("role","presentation"),i}function E(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t);do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}function z(){var e;try{e=document.activeElement}catch(t){e=document.body||null}for(;e&&e.shadowRoot&&e.shadowRoot.activeElement;)e=e.shadowRoot.activeElement;return e}function P(e,t){var n=e.className;S(t).test(n)||(e.className+=(n?" ":"")+t)}function D(e,t){for(var n=e.split(" "),r=0;r<n.length;r++)n[r]&&!S(n[r]).test(t)&&(t+=" "+n[r]);return t}T=document.createRange?function(e,t,n,r){var i=document.createRange();return i.setEnd(r||e,n),i.setStart(e,t),i}:function(e,t,n){var r=document.body.createTextRange();try{r.moveToElementText(e.parentNode)}catch(e){return r}return r.collapse(!0),r.moveEnd("character",n),r.moveStart("character",t),r};var I=function(e){e.select()};function _(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function F(e,t,n){for(var r in t||(t={}),e)!e.hasOwnProperty(r)||!1===n&&t.hasOwnProperty(r)||(t[r]=e[r]);return t}function W(e,t,n,r,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length);for(var o=r||0,a=i||0;;){var l=e.indexOf("\t",o);if(l<0||l>=t)return a+(t-o);a+=l-o,a+=n-a%n,o=l+1}}m?I=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:a&&(I=function(e){try{e.select()}catch(e){}});var R=function(){this.id=null,this.f=null,this.time=0,this.handler=_(this.onTimeout,this)};function H(e,t){for(var n=0;n<e.length;++n)if(e[n]==t)return n;return-1}R.prototype.onTimeout=function(e){e.id=0,e.time<=+new Date?e.f():setTimeout(e.handler,e.time-+new Date)},R.prototype.set=function(e,t){this.f=t;var n=+new Date+e;(!this.id||n<this.time)&&(clearTimeout(this.id),this.id=setTimeout(this.handler,e),this.time=n)};var B={toString:function(){return"CodeMirror.Pass"}},j={scroll:!1},q={origin:"*mouse"},U={origin:"+move"};function V(e,t,n){for(var r=0,i=0;;){var o=e.indexOf("\t",r);-1==o&&(o=e.length);var a=o-r;if(o==e.length||i+a>=t)return r+Math.min(a,t-i);if(i+=o-r,r=o+1,(i+=n-i%n)>=t)return r}}var K=[""];function $(e){for(;K.length<=e;)K.push(G(K)+" ");return K[e]}function G(e){return e[e.length-1]}function X(e,t){for(var n=[],r=0;r<e.length;r++)n[r]=t(e[r],r);return n}function Y(){}function Z(e,t){var n;return Object.create?n=Object.create(e):(Y.prototype=e,n=new Y),t&&F(t,n),n}var Q=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function J(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||Q.test(e))}function ee(e,t){return t?!!(t.source.indexOf("\\w")>-1&&J(e))||t.test(e):J(e)}function te(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var ne=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function re(e){return e.charCodeAt(0)>=768&&ne.test(e)}function ie(e,t,n){for(;(n<0?t>0:t<e.length)&&re(e.charAt(t));)t+=n;return t}function oe(e,t,n){for(var r=t>n?-1:1;;){if(t==n)return t;var i=(t+n)/2,o=r<0?Math.ceil(i):Math.floor(i);if(o==t)return e(o)?t:n;e(o)?n=o:t=o+r}}var ae=null;function le(e,t,n){var r;ae=null;for(var i=0;i<e.length;++i){var o=e[i];if(o.from<t&&o.to>t)return i;o.to==t&&(o.from!=o.to&&"before"==n?r=i:ae=i),o.from==t&&(o.from!=o.to&&"before"!=n?r=i:ae=i)}return null!=r?r:ae}var se=function(){var e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,t=/[stwN]/,n=/[LRr]/,r=/[Lb1n]/,i=/[1n]/;function o(e,t,n){this.level=e,this.from=t,this.to=n}return function(a,l){var s="ltr"==l?"L":"R";if(0==a.length||"ltr"==l&&!e.test(a))return!1;for(var c,u=a.length,f=[],d=0;d<u;++d)f.push((c=a.charCodeAt(d))<=247?"bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN".charAt(c):1424<=c&&c<=1524?"R":1536<=c&&c<=1785?"nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111".charAt(c-1536):1774<=c&&c<=2220?"r":8192<=c&&c<=8203?"w":8204==c?"b":"L");for(var h=0,p=s;h<u;++h){var m=f[h];"m"==m?f[h]=p:p=m}for(var g=0,v=s;g<u;++g){var y=f[g];"1"==y&&"r"==v?f[g]="n":n.test(y)&&(v=y,"r"==y&&(f[g]="R"))}for(var b=1,x=f[0];b<u-1;++b){var w=f[b];"+"==w&&"1"==x&&"1"==f[b+1]?f[b]="1":","!=w||x!=f[b+1]||"1"!=x&&"n"!=x||(f[b]=x),x=w}for(var k=0;k<u;++k){var C=f[k];if(","==C)f[k]="N";else if("%"==C){var S=void 0;for(S=k+1;S<u&&"%"==f[S];++S);for(var T=k&&"!"==f[k-1]||S<u&&"1"==f[S]?"1":"N",L=k;L<S;++L)f[L]=T;k=S-1}}for(var M=0,O=s;M<u;++M){var N=f[M];"L"==O&&"1"==N?f[M]="L":n.test(N)&&(O=N)}for(var A=0;A<u;++A)if(t.test(f[A])){var E=void 0;for(E=A+1;E<u&&t.test(f[E]);++E);for(var z="L"==(A?f[A-1]:s),P=z==("L"==(E<u?f[E]:s))?z?"L":"R":s,D=A;D<E;++D)f[D]=P;A=E-1}for(var I,_=[],F=0;F<u;)if(r.test(f[F])){var W=F;for(++F;F<u&&r.test(f[F]);++F);_.push(new o(0,W,F))}else{var R=F,H=_.length,B="rtl"==l?1:0;for(++F;F<u&&"L"!=f[F];++F);for(var j=R;j<F;)if(i.test(f[j])){R<j&&(_.splice(H,0,new o(1,R,j)),H+=B);var q=j;for(++j;j<F&&i.test(f[j]);++j);_.splice(H,0,new o(2,q,j)),H+=B,R=j}else++j;R<F&&_.splice(H,0,new o(1,R,F))}return"ltr"==l&&(1==_[0].level&&(I=a.match(/^\s+/))&&(_[0].from=I[0].length,_.unshift(new o(0,0,I[0].length))),1==G(_).level&&(I=a.match(/\s+$/))&&(G(_).to-=I[0].length,_.push(new o(0,u-I[0].length,u)))),"rtl"==l?_.reverse():_}}();function ce(e,t){var n=e.order;return null==n&&(n=e.order=se(e.text,t)),n}var ue=[],fe=function(e,t,n){if(e.addEventListener)e.addEventListener(t,n,!1);else if(e.attachEvent)e.attachEvent("on"+t,n);else{var r=e._handlers||(e._handlers={});r[t]=(r[t]||ue).concat(n)}};function de(e,t){return e._handlers&&e._handlers[t]||ue}function he(e,t,n){if(e.removeEventListener)e.removeEventListener(t,n,!1);else if(e.detachEvent)e.detachEvent("on"+t,n);else{var r=e._handlers,i=r&&r[t];if(i){var o=H(i,n);o>-1&&(r[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function pe(e,t){var n=de(e,t);if(n.length)for(var r=Array.prototype.slice.call(arguments,2),i=0;i<n.length;++i)n[i].apply(null,r)}function me(e,t,n){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),pe(e,n||t.type,e,t),we(t)||t.codemirrorIgnore}function ge(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var n=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),r=0;r<t.length;++r)-1==H(n,t[r])&&n.push(t[r])}function ve(e,t){return de(e,t).length>0}function ye(e){e.prototype.on=function(e,t){fe(this,e,t)},e.prototype.off=function(e,t){he(this,e,t)}}function be(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function xe(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function we(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function ke(e){be(e),xe(e)}function Ce(e){return e.target||e.srcElement}function Se(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),y&&e.ctrlKey&&1==t&&(t=3),t}var Te,Le,Me=function(){if(a&&l<9)return!1;var e=N("div");return"draggable"in e||"dragDrop"in e}();function Oe(e){if(null==Te){var t=N("span","​");O(e,N("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Te=t.offsetWidth<=1&&t.offsetHeight>2&&!(a&&l<8))}var n=Te?N("span","​"):N("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return n.setAttribute("cm-text",""),n}function Ne(e){if(null!=Le)return Le;var t=O(e,document.createTextNode("AخA")),n=T(t,0,1).getBoundingClientRect(),r=T(t,1,2).getBoundingClientRect();return M(e),!(!n||n.left==n.right)&&(Le=r.right-n.right<3)}var Ae,Ee=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,n=[],r=e.length;t<=r;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),a=o.indexOf("\r");-1!=a?(n.push(o.slice(0,a)),t+=a+1):(n.push(o),t=i+1)}return n}:function(e){return e.split(/\r\n?|\n/)},ze=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(e){return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch(e){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Pe="oncopy"in(Ae=N("div"))||(Ae.setAttribute("oncopy","return;"),"function"==typeof Ae.oncopy),De=null,Ie={},_e={};function Fe(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),Ie[e]=t}function We(e){if("string"==typeof e&&_e.hasOwnProperty(e))e=_e[e];else if(e&&"string"==typeof e.name&&_e.hasOwnProperty(e.name)){var t=_e[e.name];"string"==typeof t&&(t={name:t}),(e=Z(t,e)).name=t.name}else{if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return We("application/xml");if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return We("application/json")}return"string"==typeof e?{name:e}:e||{name:"null"}}function Re(e,t){t=We(t);var n=Ie[t.name];if(!n)return Re(e,"text/plain");var r=n(e,t);if(He.hasOwnProperty(t.name)){var i=He[t.name];for(var o in i)i.hasOwnProperty(o)&&(r.hasOwnProperty(o)&&(r["_"+o]=r[o]),r[o]=i[o])}if(r.name=t.name,t.helperType&&(r.helperType=t.helperType),t.modeProps)for(var a in t.modeProps)r[a]=t.modeProps[a];return r}var He={};function Be(e,t){F(t,He.hasOwnProperty(e)?He[e]:He[e]={})}function je(e,t){if(!0===t)return t;if(e.copyState)return e.copyState(t);var n={};for(var r in t){var i=t[r];i instanceof Array&&(i=i.concat([])),n[r]=i}return n}function qe(e,t){for(var n;e.innerMode&&(n=e.innerMode(t))&&n.mode!=e;)t=n.state,e=n.mode;return n||{mode:e,state:t}}function Ue(e,t,n){return!e.startState||e.startState(t,n)}var Ve=function(e,t,n){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=n};function Ke(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var n=e;!n.lines;)for(var r=0;;++r){var i=n.children[r],o=i.chunkSize();if(t<o){n=i;break}t-=o}return n.lines[t]}function $e(e,t,n){var r=[],i=t.line;return e.iter(t.line,n.line+1,(function(e){var o=e.text;i==n.line&&(o=o.slice(0,n.ch)),i==t.line&&(o=o.slice(t.ch)),r.push(o),++i})),r}function Ge(e,t,n){var r=[];return e.iter(t,n,(function(e){r.push(e.text)})),r}function Xe(e,t){var n=t-e.height;if(n)for(var r=e;r;r=r.parent)r.height+=n}function Ye(e){if(null==e.parent)return null;for(var t=e.parent,n=H(t.lines,e),r=t.parent;r;t=r,r=r.parent)for(var i=0;r.children[i]!=t;++i)n+=r.children[i].chunkSize();return n+t.first}function Ze(e,t){var n=e.first;e:do{for(var r=0;r<e.children.length;++r){var i=e.children[r],o=i.height;if(t<o){e=i;continue e}t-=o,n+=i.chunkSize()}return n}while(!e.lines);for(var a=0;a<e.lines.length;++a){var l=e.lines[a].height;if(t<l)break;t-=l}return n+a}function Qe(e,t){return t>=e.first&&t<e.first+e.size}function Je(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function et(e,t,n){if(void 0===n&&(n=null),!(this instanceof et))return new et(e,t,n);this.line=e,this.ch=t,this.sticky=n}function tt(e,t){return e.line-t.line||e.ch-t.ch}function nt(e,t){return e.sticky==t.sticky&&0==tt(e,t)}function rt(e){return et(e.line,e.ch)}function it(e,t){return tt(e,t)<0?t:e}function ot(e,t){return tt(e,t)<0?e:t}function at(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function lt(e,t){if(t.line<e.first)return et(e.first,0);var n=e.first+e.size-1;return t.line>n?et(n,Ke(e,n).text.length):function(e,t){var n=e.ch;return null==n||n>t?et(e.line,t):n<0?et(e.line,0):e}(t,Ke(e,t.line).text.length)}function st(e,t){for(var n=[],r=0;r<t.length;r++)n[r]=lt(e,t[r]);return n}Ve.prototype.eol=function(){return this.pos>=this.string.length},Ve.prototype.sol=function(){return this.pos==this.lineStart},Ve.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},Ve.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},Ve.prototype.eat=function(e){var t=this.string.charAt(this.pos);if("string"==typeof e?t==e:t&&(e.test?e.test(t):e(t)))return++this.pos,t},Ve.prototype.eatWhile=function(e){for(var t=this.pos;this.eat(e););return this.pos>t},Ve.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},Ve.prototype.skipToEnd=function(){this.pos=this.string.length},Ve.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},Ve.prototype.backUp=function(e){this.pos-=e},Ve.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=W(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?W(this.string,this.lineStart,this.tabSize):0)},Ve.prototype.indentation=function(){return W(this.string,null,this.tabSize)-(this.lineStart?W(this.string,this.lineStart,this.tabSize):0)},Ve.prototype.match=function(e,t,n){if("string"!=typeof e){var r=this.string.slice(this.pos).match(e);return r&&r.index>0?null:(r&&!1!==t&&(this.pos+=r[0].length),r)}var i=function(e){return n?e.toLowerCase():e};if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},Ve.prototype.current=function(){return this.string.slice(this.start,this.pos)},Ve.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}},Ve.prototype.lookAhead=function(e){var t=this.lineOracle;return t&&t.lookAhead(e)},Ve.prototype.baseToken=function(){var e=this.lineOracle;return e&&e.baseToken(this.pos)};var ct=function(e,t){this.state=e,this.lookAhead=t},ut=function(e,t,n,r){this.state=t,this.doc=e,this.line=n,this.maxLookAhead=r||0,this.baseTokens=null,this.baseTokenPos=1};function ft(e,t,n,r){var i=[e.state.modeGen],o={};xt(e,t.text,e.doc.mode,n,(function(e,t){return i.push(e,t)}),o,r);for(var a=n.state,l=function(r){n.baseTokens=i;var l=e.state.overlays[r],s=1,c=0;n.state=!0,xt(e,t.text,l.mode,n,(function(e,t){for(var n=s;c<e;){var r=i[s];r>e&&i.splice(s,1,e,i[s+1],r),s+=2,c=Math.min(e,r)}if(t)if(l.opaque)i.splice(n,s-n,e,"overlay "+t),s=n+2;else for(;n<s;n+=2){var o=i[n+1];i[n+1]=(o?o+" ":"")+"overlay "+t}}),o),n.state=a,n.baseTokens=null,n.baseTokenPos=1},s=0;s<e.state.overlays.length;++s)l(s);return{styles:i,classes:o.bgClass||o.textClass?o:null}}function dt(e,t,n){if(!t.styles||t.styles[0]!=e.state.modeGen){var r=ht(e,Ye(t)),i=t.text.length>e.options.maxHighlightLength&&je(e.doc.mode,r.state),o=ft(e,t,r);i&&(r.state=i),t.stateAfter=r.save(!i),t.styles=o.styles,o.classes?t.styleClasses=o.classes:t.styleClasses&&(t.styleClasses=null),n===e.doc.highlightFrontier&&(e.doc.modeFrontier=Math.max(e.doc.modeFrontier,++e.doc.highlightFrontier))}return t.styles}function ht(e,t,n){var r=e.doc,i=e.display;if(!r.mode.startState)return new ut(r,!0,t);var o=function(e,t,n){for(var r,i,o=e.doc,a=n?-1:t-(e.doc.mode.innerMode?1e3:100),l=t;l>a;--l){if(l<=o.first)return o.first;var s=Ke(o,l-1),c=s.stateAfter;if(c&&(!n||l+(c instanceof ct?c.lookAhead:0)<=o.modeFrontier))return l;var u=W(s.text,null,e.options.tabSize);(null==i||r>u)&&(i=l-1,r=u)}return i}(e,t,n),a=o>r.first&&Ke(r,o-1).stateAfter,l=a?ut.fromSaved(r,a,o):new ut(r,Ue(r.mode),o);return r.iter(o,t,(function(n){pt(e,n.text,l);var r=l.line;n.stateAfter=r==t-1||r%5==0||r>=i.viewFrom&&r<i.viewTo?l.save():null,l.nextLine()})),n&&(r.modeFrontier=l.line),l}function pt(e,t,n,r){var i=e.doc.mode,o=new Ve(t,e.options.tabSize,n);for(o.start=o.pos=r||0,""==t&&mt(i,n.state);!o.eol();)gt(i,o,n.state),o.start=o.pos}function mt(e,t){if(e.blankLine)return e.blankLine(t);if(e.innerMode){var n=qe(e,t);return n.mode.blankLine?n.mode.blankLine(n.state):void 0}}function gt(e,t,n,r){for(var i=0;i<10;i++){r&&(r[0]=qe(e,n).mode);var o=e.token(t,n);if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}ut.prototype.lookAhead=function(e){var t=this.doc.getLine(this.line+e);return null!=t&&e>this.maxLookAhead&&(this.maxLookAhead=e),t},ut.prototype.baseToken=function(e){if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=e;)this.baseTokenPos+=2;var t=this.baseTokens[this.baseTokenPos+1];return{type:t&&t.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-e}},ut.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},ut.fromSaved=function(e,t,n){return t instanceof ct?new ut(e,je(e.mode,t.state),n,t.lookAhead):new ut(e,je(e.mode,t),n)},ut.prototype.save=function(e){var t=!1!==e?je(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new ct(t,this.maxLookAhead):t};var vt=function(e,t,n){this.start=e.start,this.end=e.pos,this.string=e.current(),this.type=t||null,this.state=n};function yt(e,t,n,r){var i,o,a=e.doc,l=a.mode,s=Ke(a,(t=lt(a,t)).line),c=ht(e,t.line,n),u=new Ve(s.text,e.options.tabSize,c);for(r&&(o=[]);(r||u.pos<t.ch)&&!u.eol();)u.start=u.pos,i=gt(l,u,c.state),r&&o.push(new vt(u,i,je(a.mode,c.state)));return r?o:new vt(u,i,c.state)}function bt(e,t){if(e)for(;;){var n=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!n)break;e=e.slice(0,n.index)+e.slice(n.index+n[0].length);var r=n[1]?"bgClass":"textClass";null==t[r]?t[r]=n[2]:new RegExp("(?:^|\\s)"+n[2]+"(?:$|\\s)").test(t[r])||(t[r]+=" "+n[2])}return e}function xt(e,t,n,r,i,o,a){var l=n.flattenSpans;null==l&&(l=e.options.flattenSpans);var s,c=0,u=null,f=new Ve(t,e.options.tabSize,r),d=e.options.addModeClass&&[null];for(""==t&&bt(mt(n,r.state),o);!f.eol();){if(f.pos>e.options.maxHighlightLength?(l=!1,a&&pt(e,t,r,f.pos),f.pos=t.length,s=null):s=bt(gt(n,f,r.state,d),o),d){var h=d[0].name;h&&(s="m-"+(s?h+" "+s:h))}if(!l||u!=s){for(;c<f.start;)i(c=Math.min(f.start,c+5e3),u);u=s}f.start=f.pos}for(;c<f.pos;){var p=Math.min(f.pos,c+5e3);i(p,u),c=p}}var wt=!1,kt=!1;function Ct(e,t,n){this.marker=e,this.from=t,this.to=n}function St(e,t){if(e)for(var n=0;n<e.length;++n){var r=e[n];if(r.marker==t)return r}}function Tt(e,t){for(var n,r=0;r<e.length;++r)e[r]!=t&&(n||(n=[])).push(e[r]);return n}function Lt(e,t){if(t.full)return null;var n=Qe(e,t.from.line)&&Ke(e,t.from.line).markedSpans,r=Qe(e,t.to.line)&&Ke(e,t.to.line).markedSpans;if(!n&&!r)return null;var i=t.from.ch,o=t.to.ch,a=0==tt(t.from,t.to),l=function(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],a=o.marker;if(null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==a.type&&(!n||!o.marker.insertLeft)){var l=null==o.to||(a.inclusiveRight?o.to>=t:o.to>t);(r||(r=[])).push(new Ct(a,o.from,l?null:o.to))}}return r}(n,i,a),s=function(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],a=o.marker;if(null==o.to||(a.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==a.type&&(!n||o.marker.insertLeft)){var l=null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t);(r||(r=[])).push(new Ct(a,l?null:o.from-t,null==o.to?null:o.to-t))}}return r}(r,o,a),c=1==t.text.length,u=G(t.text).length+(c?i:0);if(l)for(var f=0;f<l.length;++f){var d=l[f];if(null==d.to){var h=St(s,d.marker);h?c&&(d.to=null==h.to?null:h.to+u):d.to=i}}if(s)for(var p=0;p<s.length;++p){var m=s[p];null!=m.to&&(m.to+=u),null==m.from?St(l,m.marker)||(m.from=u,c&&(l||(l=[])).push(m)):(m.from+=u,c&&(l||(l=[])).push(m))}l&&(l=Mt(l)),s&&s!=l&&(s=Mt(s));var g=[l];if(!c){var v,y=t.text.length-2;if(y>0&&l)for(var b=0;b<l.length;++b)null==l[b].to&&(v||(v=[])).push(new Ct(l[b].marker,null,null));for(var x=0;x<y;++x)g.push(v);g.push(s)}return g}function Mt(e){for(var t=0;t<e.length;++t){var n=e[t];null!=n.from&&n.from==n.to&&!1!==n.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function Ot(e){var t=e.markedSpans;if(t){for(var n=0;n<t.length;++n)t[n].marker.detachLine(e);e.markedSpans=null}}function Nt(e,t){if(t){for(var n=0;n<t.length;++n)t[n].marker.attachLine(e);e.markedSpans=t}}function At(e){return e.inclusiveLeft?-1:0}function Et(e){return e.inclusiveRight?1:0}function zt(e,t){var n=e.lines.length-t.lines.length;if(0!=n)return n;var r=e.find(),i=t.find(),o=tt(r.from,i.from)||At(e)-At(t);if(o)return-o;var a=tt(r.to,i.to)||Et(e)-Et(t);return a||t.id-e.id}function Pt(e,t){var n,r=kt&&e.markedSpans;if(r)for(var i=void 0,o=0;o<r.length;++o)(i=r[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!n||zt(n,i.marker)<0)&&(n=i.marker);return n}function Dt(e){return Pt(e,!0)}function It(e){return Pt(e,!1)}function _t(e,t){var n,r=kt&&e.markedSpans;if(r)for(var i=0;i<r.length;++i){var o=r[i];o.marker.collapsed&&(null==o.from||o.from<t)&&(null==o.to||o.to>t)&&(!n||zt(n,o.marker)<0)&&(n=o.marker)}return n}function Ft(e,t,n,r,i){var o=Ke(e,t),a=kt&&o.markedSpans;if(a)for(var l=0;l<a.length;++l){var s=a[l];if(s.marker.collapsed){var c=s.marker.find(0),u=tt(c.from,n)||At(s.marker)-At(i),f=tt(c.to,r)||Et(s.marker)-Et(i);if(!(u>=0&&f<=0||u<=0&&f>=0)&&(u<=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?tt(c.to,n)>=0:tt(c.to,n)>0)||u>=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?tt(c.from,r)<=0:tt(c.from,r)<0)))return!0}}}function Wt(e){for(var t;t=Dt(e);)e=t.find(-1,!0).line;return e}function Rt(e,t){var n=Ke(e,t),r=Wt(n);return n==r?t:Ye(r)}function Ht(e,t){if(t>e.lastLine())return t;var n,r=Ke(e,t);if(!Bt(e,r))return t;for(;n=It(r);)r=n.find(1,!0).line;return Ye(r)+1}function Bt(e,t){var n=kt&&t.markedSpans;if(n)for(var r=void 0,i=0;i<n.length;++i)if((r=n[i]).marker.collapsed){if(null==r.from)return!0;if(!r.marker.widgetNode&&0==r.from&&r.marker.inclusiveLeft&&jt(e,t,r))return!0}}function jt(e,t,n){if(null==n.to){var r=n.marker.find(1,!0);return jt(e,r.line,St(r.line.markedSpans,n.marker))}if(n.marker.inclusiveRight&&n.to==t.text.length)return!0;for(var i=void 0,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==n.to&&(null==i.to||i.to!=n.from)&&(i.marker.inclusiveLeft||n.marker.inclusiveRight)&&jt(e,t,i))return!0}function qt(e){for(var t=0,n=(e=Wt(e)).parent,r=0;r<n.lines.length;++r){var i=n.lines[r];if(i==e)break;t+=i.height}for(var o=n.parent;o;o=(n=o).parent)for(var a=0;a<o.children.length;++a){var l=o.children[a];if(l==n)break;t+=l.height}return t}function Ut(e){if(0==e.height)return 0;for(var t,n=e.text.length,r=e;t=Dt(r);){var i=t.find(0,!0);r=i.from.line,n+=i.from.ch-i.to.ch}for(r=e;t=It(r);){var o=t.find(0,!0);n-=r.text.length-o.from.ch,n+=(r=o.to.line).text.length-o.to.ch}return n}function Vt(e){var t=e.display,n=e.doc;t.maxLine=Ke(n,n.first),t.maxLineLength=Ut(t.maxLine),t.maxLineChanged=!0,n.iter((function(e){var n=Ut(e);n>t.maxLineLength&&(t.maxLineLength=n,t.maxLine=e)}))}var Kt=function(e,t,n){this.text=e,Nt(this,t),this.height=n?n(this):1};function $t(e){e.parent=null,Ot(e)}Kt.prototype.lineNo=function(){return Ye(this)},ye(Kt);var Gt={},Xt={};function Yt(e,t){if(!e||/^\s*$/.test(e))return null;var n=t.addModeClass?Xt:Gt;return n[e]||(n[e]=e.replace(/\S+/g,"cm-$&"))}function Zt(e,t){var n=A("span",null,null,s?"padding-right: .1px":null),r={pre:A("pre",[n],"CodeMirror-line"),content:n,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,a=void 0;r.pos=0,r.addToken=Jt,Ne(e.display.measure)&&(a=ce(o,e.doc.direction))&&(r.addToken=en(r.addToken,a)),r.map=[],nn(o,r,dt(e,o,t!=e.display.externalMeasured&&Ye(o))),o.styleClasses&&(o.styleClasses.bgClass&&(r.bgClass=D(o.styleClasses.bgClass,r.bgClass||"")),o.styleClasses.textClass&&(r.textClass=D(o.styleClasses.textClass,r.textClass||""))),0==r.map.length&&r.map.push(0,0,r.content.appendChild(Oe(e.display.measure))),0==i?(t.measure.map=r.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(r.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(s){var l=r.content.lastChild;(/\bcm-tab\b/.test(l.className)||l.querySelector&&l.querySelector(".cm-tab"))&&(r.content.className="cm-tab-wrap-hack")}return pe(e,"renderLine",e,t.line,r.pre),r.pre.className&&(r.textClass=D(r.pre.className,r.textClass||"")),r}function Qt(e){var t=N("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Jt(e,t,n,r,i,o,s){if(t){var c,u=e.splitSpaces?function(e,t){if(e.length>1&&!/  /.test(e))return e;for(var n=t,r="",i=0;i<e.length;i++){var o=e.charAt(i);" "!=o||!n||i!=e.length-1&&32!=e.charCodeAt(i+1)||(o=" "),r+=o,n=" "==o}return r}(t,e.trailingSpace):t,f=e.cm.state.specialChars,d=!1;if(f.test(t)){c=document.createDocumentFragment();for(var h=0;;){f.lastIndex=h;var p=f.exec(t),m=p?p.index-h:t.length-h;if(m){var g=document.createTextNode(u.slice(h,h+m));a&&l<9?c.appendChild(N("span",[g])):c.appendChild(g),e.map.push(e.pos,e.pos+m,g),e.col+=m,e.pos+=m}if(!p)break;h+=m+1;var v=void 0;if("\t"==p[0]){var y=e.cm.options.tabSize,b=y-e.col%y;(v=c.appendChild(N("span",$(b),"cm-tab"))).setAttribute("role","presentation"),v.setAttribute("cm-text","\t"),e.col+=b}else"\r"==p[0]||"\n"==p[0]?((v=c.appendChild(N("span","\r"==p[0]?"�":"�","cm-invalidchar"))).setAttribute("cm-text",p[0]),e.col+=1):((v=e.cm.options.specialCharPlaceholder(p[0])).setAttribute("cm-text",p[0]),a&&l<9?c.appendChild(N("span",[v])):c.appendChild(v),e.col+=1);e.map.push(e.pos,e.pos+1,v),e.pos++}}else e.col+=t.length,c=document.createTextNode(u),e.map.push(e.pos,e.pos+t.length,c),a&&l<9&&(d=!0),e.pos+=t.length;if(e.trailingSpace=32==u.charCodeAt(t.length-1),n||r||i||d||o||s){var x=n||"";r&&(x+=r),i&&(x+=i);var w=N("span",[c],x,o);if(s)for(var k in s)s.hasOwnProperty(k)&&"style"!=k&&"class"!=k&&w.setAttribute(k,s[k]);return e.content.appendChild(w)}e.content.appendChild(c)}}function en(e,t){return function(n,r,i,o,a,l,s){i=i?i+" cm-force-border":"cm-force-border";for(var c=n.pos,u=c+r.length;;){for(var f=void 0,d=0;d<t.length&&!((f=t[d]).to>c&&f.from<=c);d++);if(f.to>=u)return e(n,r,i,o,a,l,s);e(n,r.slice(0,f.to-c),i,o,null,l,s),o=null,r=r.slice(f.to-c),c=f.to}}}function tn(e,t,n,r){var i=!r&&n.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!r&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",n.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function nn(e,t,n){var r=e.markedSpans,i=e.text,o=0;if(r)for(var a,l,s,c,u,f,d,h=i.length,p=0,m=1,g="",v=0;;){if(v==p){s=c=u=l="",d=null,f=null,v=1/0;for(var y=[],b=void 0,x=0;x<r.length;++x){var w=r[x],k=w.marker;if("bookmark"==k.type&&w.from==p&&k.widgetNode)y.push(k);else if(w.from<=p&&(null==w.to||w.to>p||k.collapsed&&w.to==p&&w.from==p)){if(null!=w.to&&w.to!=p&&v>w.to&&(v=w.to,c=""),k.className&&(s+=" "+k.className),k.css&&(l=(l?l+";":"")+k.css),k.startStyle&&w.from==p&&(u+=" "+k.startStyle),k.endStyle&&w.to==v&&(b||(b=[])).push(k.endStyle,w.to),k.title&&((d||(d={})).title=k.title),k.attributes)for(var C in k.attributes)(d||(d={}))[C]=k.attributes[C];k.collapsed&&(!f||zt(f.marker,k)<0)&&(f=w)}else w.from>p&&v>w.from&&(v=w.from)}if(b)for(var S=0;S<b.length;S+=2)b[S+1]==v&&(c+=" "+b[S]);if(!f||f.from==p)for(var T=0;T<y.length;++T)tn(t,0,y[T]);if(f&&(f.from||0)==p){if(tn(t,(null==f.to?h+1:f.to)-p,f.marker,null==f.from),null==f.to)return;f.to==p&&(f=!1)}}if(p>=h)break;for(var L=Math.min(h,v);;){if(g){var M=p+g.length;if(!f){var O=M>L?g.slice(0,L-p):g;t.addToken(t,O,a?a+s:s,u,p+O.length==v?c:"",l,d)}if(M>=L){g=g.slice(L-p),p=L;break}p=M,u=""}g=i.slice(o,o=n[m++]),a=Yt(n[m++],t.cm.options)}}else for(var N=1;N<n.length;N+=2)t.addToken(t,i.slice(o,o=n[N]),Yt(n[N+1],t.cm.options))}function rn(e,t,n){this.line=t,this.rest=function(e){for(var t,n;t=It(e);)e=t.find(1,!0).line,(n||(n=[])).push(e);return n}(t),this.size=this.rest?Ye(G(this.rest))-n+1:1,this.node=this.text=null,this.hidden=Bt(e,t)}function on(e,t,n){for(var r,i=[],o=t;o<n;o=r){var a=new rn(e.doc,Ke(e.doc,o),o);r=o+a.size,i.push(a)}return i}var an=null,ln=null;function sn(e,t){var n=de(e,t);if(n.length){var r,i=Array.prototype.slice.call(arguments,2);an?r=an.delayedCallbacks:ln?r=ln:(r=ln=[],setTimeout(cn,0));for(var o=function(e){r.push((function(){return n[e].apply(null,i)}))},a=0;a<n.length;++a)o(a)}}function cn(){var e=ln;ln=null;for(var t=0;t<e.length;++t)e[t]()}function un(e,t,n,r){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];"text"==o?hn(e,t):"gutter"==o?mn(e,t,n,r):"class"==o?pn(e,t):"widget"==o&&gn(e,t,r)}t.changes=null}function fn(e){return e.node==e.text&&(e.node=N("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),a&&l<8&&(e.node.style.zIndex=2)),e.node}function dn(e,t){var n=e.display.externalMeasured;return n&&n.line==t.line?(e.display.externalMeasured=null,t.measure=n.measure,n.built):Zt(e,t)}function hn(e,t){var n=t.text.className,r=dn(e,t);t.text==t.node&&(t.node=r.pre),t.text.parentNode.replaceChild(r.pre,t.text),t.text=r.pre,r.bgClass!=t.bgClass||r.textClass!=t.textClass?(t.bgClass=r.bgClass,t.textClass=r.textClass,pn(e,t)):n&&(t.text.className=n)}function pn(e,t){!function(e,t){var n=t.bgClass?t.bgClass+" "+(t.line.bgClass||""):t.line.bgClass;if(n&&(n+=" CodeMirror-linebackground"),t.background)n?t.background.className=n:(t.background.parentNode.removeChild(t.background),t.background=null);else if(n){var r=fn(t);t.background=r.insertBefore(N("div",null,n),r.firstChild),e.display.input.setUneditable(t.background)}}(e,t),t.line.wrapClass?fn(t).className=t.line.wrapClass:t.node!=t.text&&(t.node.className="");var n=t.textClass?t.textClass+" "+(t.line.textClass||""):t.line.textClass;t.text.className=n||""}function mn(e,t,n,r){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=fn(t);t.gutterBackground=N("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px; width: "+r.gutterTotalWidth+"px"),e.display.input.setUneditable(t.gutterBackground),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var a=fn(t),l=t.gutter=N("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px");if(e.display.input.setUneditable(l),a.insertBefore(l,t.text),t.line.gutterClass&&(l.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=l.appendChild(N("div",Je(e.options,n),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+r.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var s=0;s<e.display.gutterSpecs.length;++s){var c=e.display.gutterSpecs[s].className,u=o.hasOwnProperty(c)&&o[c];u&&l.appendChild(N("div",[u],"CodeMirror-gutter-elt","left: "+r.gutterLeft[c]+"px; width: "+r.gutterWidth[c]+"px"))}}}function gn(e,t,n){t.alignable&&(t.alignable=null);for(var r=S("CodeMirror-linewidget"),i=t.node.firstChild,o=void 0;i;i=o)o=i.nextSibling,r.test(i.className)&&t.node.removeChild(i);yn(e,t,n)}function vn(e,t,n,r){var i=dn(e,t);return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),pn(e,t),mn(e,t,n,r),yn(e,t,r),t.node}function yn(e,t,n){if(bn(e,t.line,t,n,!0),t.rest)for(var r=0;r<t.rest.length;r++)bn(e,t.rest[r],t,n,!1)}function bn(e,t,n,r,i){if(t.widgets)for(var o=fn(n),a=0,l=t.widgets;a<l.length;++a){var s=l[a],c=N("div",[s.node],"CodeMirror-linewidget"+(s.className?" "+s.className:""));s.handleMouseEvents||c.setAttribute("cm-ignore-events","true"),xn(s,c,n,r),e.display.input.setUneditable(c),i&&s.above?o.insertBefore(c,n.gutter||n.text):o.appendChild(c),sn(s,"redraw")}}function xn(e,t,n,r){if(e.noHScroll){(n.alignable||(n.alignable=[])).push(t);var i=r.wrapperWidth;t.style.left=r.fixedPos+"px",e.coverGutter||(i-=r.gutterTotalWidth,t.style.paddingLeft=r.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-r.gutterTotalWidth+"px"))}function wn(e){if(null!=e.height)return e.height;var t=e.doc.cm;if(!t)return 0;if(!E(document.body,e.node)){var n="position: relative;";e.coverGutter&&(n+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(n+="width: "+t.display.wrapper.clientWidth+"px;"),O(t.display.measure,N("div",[e.node],null,n))}return e.height=e.node.parentNode.offsetHeight}function kn(e,t){for(var n=Ce(t);n!=e.wrapper;n=n.parentNode)if(!n||1==n.nodeType&&"true"==n.getAttribute("cm-ignore-events")||n.parentNode==e.sizer&&n!=e.mover)return!0}function Cn(e){return e.lineSpace.offsetTop}function Sn(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function Tn(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=O(e.measure,N("pre","x","CodeMirror-line-like")),n=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,r={left:parseInt(n.paddingLeft),right:parseInt(n.paddingRight)};return isNaN(r.left)||isNaN(r.right)||(e.cachedPaddingH=r),r}function Ln(e){return 50-e.display.nativeBarWidth}function Mn(e){return e.display.scroller.clientWidth-Ln(e)-e.display.barWidth}function On(e){return e.display.scroller.clientHeight-Ln(e)-e.display.barHeight}function Nn(e,t,n){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};for(var r=0;r<e.rest.length;r++)if(e.rest[r]==t)return{map:e.measure.maps[r],cache:e.measure.caches[r]};for(var i=0;i<e.rest.length;i++)if(Ye(e.rest[i])>n)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}function An(e,t,n,r){return Pn(e,zn(e,t),n,r)}function En(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[ur(e,t)];var n=e.display.externalMeasured;return n&&t>=n.lineN&&t<n.lineN+n.size?n:void 0}function zn(e,t){var n=Ye(t),r=En(e,n);r&&!r.text?r=null:r&&r.changes&&(un(e,r,n,or(e)),e.curOp.forceUpdate=!0),r||(r=function(e,t){var n=Ye(t=Wt(t)),r=e.display.externalMeasured=new rn(e.doc,t,n);r.lineN=n;var i=r.built=Zt(e,r);return r.text=i.pre,O(e.display.lineMeasure,i.pre),r}(e,t));var i=Nn(r,t,n);return{line:t,view:r,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function Pn(e,t,n,r,i){t.before&&(n=-1);var o,s=n+(r||"");return t.cache.hasOwnProperty(s)?o=t.cache[s]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(function(e,t,n){var r=e.options.lineWrapping,i=r&&Mn(e);if(!t.measure.heights||r&&t.measure.width!=i){var o=t.measure.heights=[];if(r){t.measure.width=i;for(var a=t.text.firstChild.getClientRects(),l=0;l<a.length-1;l++){var s=a[l],c=a[l+1];Math.abs(s.bottom-c.bottom)>2&&o.push((s.bottom+c.top)/2-n.top)}}o.push(n.bottom-n.top)}}(e,t.view,t.rect),t.hasHeights=!0),(o=function(e,t,n,r){var i,o=_n(t.map,n,r),s=o.node,c=o.start,u=o.end,f=o.collapse;if(3==s.nodeType){for(var d=0;d<4;d++){for(;c&&re(t.line.text.charAt(o.coverStart+c));)--c;for(;o.coverStart+u<o.coverEnd&&re(t.line.text.charAt(o.coverStart+u));)++u;if((i=a&&l<9&&0==c&&u==o.coverEnd-o.coverStart?s.parentNode.getBoundingClientRect():Fn(T(s,c,u).getClientRects(),r)).left||i.right||0==c)break;u=c,c-=1,f="right"}a&&l<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=De)return De;var t=O(e,N("span","x")),n=t.getBoundingClientRect(),r=T(t,0,1).getBoundingClientRect();return De=Math.abs(n.left-r.left)>1}(e))return t;var n=screen.logicalXDPI/screen.deviceXDPI,r=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*n,right:t.right*n,top:t.top*r,bottom:t.bottom*r}}(e.display.measure,i))}else{var h;c>0&&(f=r="right"),i=e.options.lineWrapping&&(h=s.getClientRects()).length>1?h["right"==r?h.length-1:0]:s.getBoundingClientRect()}if(a&&l<9&&!c&&(!i||!i.left&&!i.right)){var p=s.parentNode.getClientRects()[0];i=p?{left:p.left,right:p.left+ir(e.display),top:p.top,bottom:p.bottom}:In}for(var m=i.top-t.rect.top,g=i.bottom-t.rect.top,v=(m+g)/2,y=t.view.measure.heights,b=0;b<y.length-1&&!(v<y[b]);b++);var x=b?y[b-1]:0,w=y[b],k={left:("right"==f?i.right:i.left)-t.rect.left,right:("left"==f?i.left:i.right)-t.rect.left,top:x,bottom:w};return i.left||i.right||(k.bogus=!0),e.options.singleCursorHeightPerLine||(k.rtop=m,k.rbottom=g),k}(e,t,n,r)).bogus||(t.cache[s]=o)),{left:o.left,right:o.right,top:i?o.rtop:o.top,bottom:i?o.rbottom:o.bottom}}var Dn,In={left:0,right:0,top:0,bottom:0};function _n(e,t,n){for(var r,i,o,a,l,s,c=0;c<e.length;c+=3)if(l=e[c],s=e[c+1],t<l?(i=0,o=1,a="left"):t<s?o=1+(i=t-l):(c==e.length-3||t==s&&e[c+3]>t)&&(i=(o=s-l)-1,t>=s&&(a="right")),null!=i){if(r=e[c+2],l==s&&n==(r.insertLeft?"left":"right")&&(a=n),"left"==n&&0==i)for(;c&&e[c-2]==e[c-3]&&e[c-1].insertLeft;)r=e[2+(c-=3)],a="left";if("right"==n&&i==s-l)for(;c<e.length-3&&e[c+3]==e[c+4]&&!e[c+5].insertLeft;)r=e[(c+=3)+2],a="right";break}return{node:r,start:i,end:o,collapse:a,coverStart:l,coverEnd:s}}function Fn(e,t){var n=In;if("left"==t)for(var r=0;r<e.length&&(n=e[r]).left==n.right;r++);else for(var i=e.length-1;i>=0&&(n=e[i]).left==n.right;i--);return n}function Wn(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function Rn(e){e.display.externalMeasure=null,M(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)Wn(e.display.view[t])}function Hn(e){Rn(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function Bn(){return u&&g?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function jn(){return u&&g?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function qn(e){var t=0;if(e.widgets)for(var n=0;n<e.widgets.length;++n)e.widgets[n].above&&(t+=wn(e.widgets[n]));return t}function Un(e,t,n,r,i){if(!i){var o=qn(t);n.top+=o,n.bottom+=o}if("line"==r)return n;r||(r="local");var a=qt(t);if("local"==r?a+=Cn(e.display):a-=e.display.viewOffset,"page"==r||"window"==r){var l=e.display.lineSpace.getBoundingClientRect();a+=l.top+("window"==r?0:jn());var s=l.left+("window"==r?0:Bn());n.left+=s,n.right+=s}return n.top+=a,n.bottom+=a,n}function Vn(e,t,n){if("div"==n)return t;var r=t.left,i=t.top;if("page"==n)r-=Bn(),i-=jn();else if("local"==n||!n){var o=e.display.sizer.getBoundingClientRect();r+=o.left,i+=o.top}var a=e.display.lineSpace.getBoundingClientRect();return{left:r-a.left,top:i-a.top}}function Kn(e,t,n,r,i){return r||(r=Ke(e.doc,t.line)),Un(e,r,An(e,r,t.ch,i),n)}function $n(e,t,n,r,i,o){function a(t,a){var l=Pn(e,i,t,a?"right":"left",o);return a?l.left=l.right:l.right=l.left,Un(e,r,l,n)}r=r||Ke(e.doc,t.line),i||(i=zn(e,r));var l=ce(r,e.doc.direction),s=t.ch,c=t.sticky;if(s>=r.text.length?(s=r.text.length,c="before"):s<=0&&(s=0,c="after"),!l)return a("before"==c?s-1:s,"before"==c);function u(e,t,n){return a(n?e-1:e,1==l[t].level!=n)}var f=le(l,s,c),d=ae,h=u(s,f,"before"==c);return null!=d&&(h.other=u(s,d,"before"!=c)),h}function Gn(e,t){var n=0;t=lt(e.doc,t),e.options.lineWrapping||(n=ir(e.display)*t.ch);var r=Ke(e.doc,t.line),i=qt(r)+Cn(e.display);return{left:n,right:n,top:i,bottom:i+r.height}}function Xn(e,t,n,r,i){var o=et(e,t,n);return o.xRel=i,r&&(o.outside=r),o}function Yn(e,t,n){var r=e.doc;if((n+=e.display.viewOffset)<0)return Xn(r.first,0,null,-1,-1);var i=Ze(r,n),o=r.first+r.size-1;if(i>o)return Xn(r.first+r.size-1,Ke(r,o).text.length,null,1,1);t<0&&(t=0);for(var a=Ke(r,i);;){var l=er(e,a,i,t,n),s=_t(a,l.ch+(l.xRel>0||l.outside>0?1:0));if(!s)return l;var c=s.find(1);if(c.line==i)return c;a=Ke(r,i=c.line)}}function Zn(e,t,n,r){r-=qn(t);var i=t.text.length,o=oe((function(t){return Pn(e,n,t-1).bottom<=r}),i,0);return{begin:o,end:i=oe((function(t){return Pn(e,n,t).top>r}),o,i)}}function Qn(e,t,n,r){return n||(n=zn(e,t)),Zn(e,t,n,Un(e,t,Pn(e,n,r),"line").top)}function Jn(e,t,n,r){return!(e.bottom<=n)&&(e.top>n||(r?e.left:e.right)>t)}function er(e,t,n,r,i){i-=qt(t);var o=zn(e,t),a=qn(t),l=0,s=t.text.length,c=!0,u=ce(t,e.doc.direction);if(u){var f=(e.options.lineWrapping?nr:tr)(e,t,n,o,u,r,i);l=(c=1!=f.level)?f.from:f.to-1,s=c?f.to:f.from-1}var d,h,p=null,m=null,g=oe((function(t){var n=Pn(e,o,t);return n.top+=a,n.bottom+=a,!!Jn(n,r,i,!1)&&(n.top<=i&&n.left<=r&&(p=t,m=n),!0)}),l,s),v=!1;if(m){var y=r-m.left<m.right-r,b=y==c;g=p+(b?0:1),h=b?"after":"before",d=y?m.left:m.right}else{c||g!=s&&g!=l||g++,h=0==g?"after":g==t.text.length?"before":Pn(e,o,g-(c?1:0)).bottom+a<=i==c?"after":"before";var x=$n(e,et(n,g,h),"line",t,o);d=x.left,v=i<x.top?-1:i>=x.bottom?1:0}return Xn(n,g=ie(t.text,g,1),h,v,r-d)}function tr(e,t,n,r,i,o,a){var l=oe((function(l){var s=i[l],c=1!=s.level;return Jn($n(e,et(n,c?s.to:s.from,c?"before":"after"),"line",t,r),o,a,!0)}),0,i.length-1),s=i[l];if(l>0){var c=1!=s.level,u=$n(e,et(n,c?s.from:s.to,c?"after":"before"),"line",t,r);Jn(u,o,a,!0)&&u.top>a&&(s=i[l-1])}return s}function nr(e,t,n,r,i,o,a){var l=Zn(e,t,r,a),s=l.begin,c=l.end;/\s/.test(t.text.charAt(c-1))&&c--;for(var u=null,f=null,d=0;d<i.length;d++){var h=i[d];if(!(h.from>=c||h.to<=s)){var p=Pn(e,r,1!=h.level?Math.min(c,h.to)-1:Math.max(s,h.from)).right,m=p<o?o-p+1e9:p-o;(!u||f>m)&&(u=h,f=m)}}return u||(u=i[i.length-1]),u.from<s&&(u={from:s,to:u.to,level:u.level}),u.to>c&&(u={from:u.from,to:c,level:u.level}),u}function rr(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==Dn){Dn=N("pre",null,"CodeMirror-line-like");for(var t=0;t<49;++t)Dn.appendChild(document.createTextNode("x")),Dn.appendChild(N("br"));Dn.appendChild(document.createTextNode("x"))}O(e.measure,Dn);var n=Dn.offsetHeight/50;return n>3&&(e.cachedTextHeight=n),M(e.measure),n||1}function ir(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=N("span","xxxxxxxxxx"),n=N("pre",[t],"CodeMirror-line-like");O(e.measure,n);var r=t.getBoundingClientRect(),i=(r.right-r.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function or(e){for(var t=e.display,n={},r={},i=t.gutters.clientLeft,o=t.gutters.firstChild,a=0;o;o=o.nextSibling,++a){var l=e.display.gutterSpecs[a].className;n[l]=o.offsetLeft+o.clientLeft+i,r[l]=o.clientWidth}return{fixedPos:ar(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:n,gutterWidth:r,wrapperWidth:t.wrapper.clientWidth}}function ar(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function lr(e){var t=rr(e.display),n=e.options.lineWrapping,r=n&&Math.max(5,e.display.scroller.clientWidth/ir(e.display)-3);return function(i){if(Bt(e.doc,i))return 0;var o=0;if(i.widgets)for(var a=0;a<i.widgets.length;a++)i.widgets[a].height&&(o+=i.widgets[a].height);return n?o+(Math.ceil(i.text.length/r)||1)*t:o+t}}function sr(e){var t=e.doc,n=lr(e);t.iter((function(e){var t=n(e);t!=e.height&&Xe(e,t)}))}function cr(e,t,n,r){var i=e.display;if(!n&&"true"==Ce(t).getAttribute("cm-not-content"))return null;var o,a,l=i.lineSpace.getBoundingClientRect();try{o=t.clientX-l.left,a=t.clientY-l.top}catch(e){return null}var s,c=Yn(e,o,a);if(r&&c.xRel>0&&(s=Ke(e.doc,c.line).text).length==c.ch){var u=W(s,s.length,e.options.tabSize)-s.length;c=et(c.line,Math.max(0,Math.round((o-Tn(e.display).left)/ir(e.display))-u))}return c}function ur(e,t){if(t>=e.display.viewTo)return null;if((t-=e.display.viewFrom)<0)return null;for(var n=e.display.view,r=0;r<n.length;r++)if((t-=n[r].size)<0)return r}function fr(e,t,n,r){null==t&&(t=e.doc.first),null==n&&(n=e.doc.first+e.doc.size),r||(r=0);var i=e.display;if(r&&n<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)kt&&Rt(e.doc,t)<i.viewTo&&hr(e);else if(n<=i.viewFrom)kt&&Ht(e.doc,n+r)>i.viewFrom?hr(e):(i.viewFrom+=r,i.viewTo+=r);else if(t<=i.viewFrom&&n>=i.viewTo)hr(e);else if(t<=i.viewFrom){var o=pr(e,n,n+r,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=r):hr(e)}else if(n>=i.viewTo){var a=pr(e,t,t,-1);a?(i.view=i.view.slice(0,a.index),i.viewTo=a.lineN):hr(e)}else{var l=pr(e,t,t,-1),s=pr(e,n,n+r,1);l&&s?(i.view=i.view.slice(0,l.index).concat(on(e,l.lineN,s.lineN)).concat(i.view.slice(s.index)),i.viewTo+=r):hr(e)}var c=i.externalMeasured;c&&(n<c.lineN?c.lineN+=r:t<c.lineN+c.size&&(i.externalMeasured=null))}function dr(e,t,n){e.curOp.viewChanged=!0;var r=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(r.externalMeasured=null),!(t<r.viewFrom||t>=r.viewTo)){var o=r.view[ur(e,t)];if(null!=o.node){var a=o.changes||(o.changes=[]);-1==H(a,n)&&a.push(n)}}}function hr(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function pr(e,t,n,r){var i,o=ur(e,t),a=e.display.view;if(!kt||n==e.doc.first+e.doc.size)return{index:o,lineN:n};for(var l=e.display.viewFrom,s=0;s<o;s++)l+=a[s].size;if(l!=t){if(r>0){if(o==a.length-1)return null;i=l+a[o].size-t,o++}else i=l-t;t+=i,n+=i}for(;Rt(e.doc,n)!=n;){if(o==(r<0?0:a.length-1))return null;n+=r*a[o-(r<0?1:0)].size,o+=r}return{index:o,lineN:n}}function mr(e){for(var t=e.display.view,n=0,r=0;r<t.length;r++){var i=t[r];i.hidden||i.node&&!i.changes||++n}return n}function gr(e){e.display.input.showSelection(e.display.input.prepareSelection())}function vr(e,t){void 0===t&&(t=!0);for(var n=e.doc,r={},i=r.cursors=document.createDocumentFragment(),o=r.selection=document.createDocumentFragment(),a=0;a<n.sel.ranges.length;a++)if(t||a!=n.sel.primIndex){var l=n.sel.ranges[a];if(!(l.from().line>=e.display.viewTo||l.to().line<e.display.viewFrom)){var s=l.empty();(s||e.options.showCursorWhenSelecting)&&yr(e,l.head,i),s||xr(e,l,o)}}return r}function yr(e,t,n){var r=$n(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=n.appendChild(N("div"," ","CodeMirror-cursor"));if(i.style.left=r.left+"px",i.style.top=r.top+"px",i.style.height=Math.max(0,r.bottom-r.top)*e.options.cursorHeight+"px",r.other){var o=n.appendChild(N("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));o.style.display="",o.style.left=r.other.left+"px",o.style.top=r.other.top+"px",o.style.height=.85*(r.other.bottom-r.other.top)+"px"}}function br(e,t){return e.top-t.top||e.left-t.left}function xr(e,t,n){var r=e.display,i=e.doc,o=document.createDocumentFragment(),a=Tn(e.display),l=a.left,s=Math.max(r.sizerWidth,Mn(e)-r.sizer.offsetLeft)-a.right,c="ltr"==i.direction;function u(e,t,n,r){t<0&&(t=0),t=Math.round(t),r=Math.round(r),o.appendChild(N("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px;\n                             top: "+t+"px; width: "+(null==n?s-e:n)+"px;\n                             height: "+(r-t)+"px"))}function f(t,n,r){var o,a,f=Ke(i,t),d=f.text.length;function h(n,r){return Kn(e,et(t,n),"div",f,r)}function p(t,n,r){var i=Qn(e,f,null,t),o="ltr"==n==("after"==r)?"left":"right";return h("after"==r?i.begin:i.end-(/\s/.test(f.text.charAt(i.end-1))?2:1),o)[o]}var m=ce(f,i.direction);return function(e,t,n,r){if(!e)return r(t,n,"ltr",0);for(var i=!1,o=0;o<e.length;++o){var a=e[o];(a.from<n&&a.to>t||t==n&&a.to==t)&&(r(Math.max(a.from,t),Math.min(a.to,n),1==a.level?"rtl":"ltr",o),i=!0)}i||r(t,n,"ltr")}(m,n||0,null==r?d:r,(function(e,t,i,f){var g="ltr"==i,v=h(e,g?"left":"right"),y=h(t-1,g?"right":"left"),b=null==n&&0==e,x=null==r&&t==d,w=0==f,k=!m||f==m.length-1;if(y.top-v.top<=3){var C=(c?x:b)&&k,S=(c?b:x)&&w?l:(g?v:y).left,T=C?s:(g?y:v).right;u(S,v.top,T-S,v.bottom)}else{var L,M,O,N;g?(L=c&&b&&w?l:v.left,M=c?s:p(e,i,"before"),O=c?l:p(t,i,"after"),N=c&&x&&k?s:y.right):(L=c?p(e,i,"before"):l,M=!c&&b&&w?s:v.right,O=!c&&x&&k?l:y.left,N=c?p(t,i,"after"):s),u(L,v.top,M-L,v.bottom),v.bottom<y.top&&u(l,v.bottom,null,y.top),u(O,y.top,N-O,y.bottom)}(!o||br(v,o)<0)&&(o=v),br(y,o)<0&&(o=y),(!a||br(v,a)<0)&&(a=v),br(y,a)<0&&(a=y)})),{start:o,end:a}}var d=t.from(),h=t.to();if(d.line==h.line)f(d.line,d.ch,h.ch);else{var p=Ke(i,d.line),m=Ke(i,h.line),g=Wt(p)==Wt(m),v=f(d.line,d.ch,g?p.text.length+1:null).end,y=f(h.line,g?0:null,h.ch).start;g&&(v.top<y.top-2?(u(v.right,v.top,null,v.bottom),u(l,y.top,y.left,y.bottom)):u(v.right,v.top,y.left-v.right,v.bottom)),v.bottom<y.top&&u(l,v.bottom,null,y.top)}n.appendChild(o)}function wr(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var n=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval((function(){e.hasFocus()||Tr(e),t.cursorDiv.style.visibility=(n=!n)?"":"hidden"}),e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function kr(e){e.state.focused||(e.display.input.focus(),Sr(e))}function Cr(e){e.state.delayingBlurEvent=!0,setTimeout((function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,Tr(e))}),100)}function Sr(e,t){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(pe(e,"focus",e,t),e.state.focused=!0,P(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),s&&setTimeout((function(){return e.display.input.reset(!0)}),20)),e.display.input.receivedFocus()),wr(e))}function Tr(e,t){e.state.delayingBlurEvent||(e.state.focused&&(pe(e,"blur",e,t),e.state.focused=!1,L(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout((function(){e.state.focused||(e.display.shift=!1)}),150))}function Lr(e){for(var t=e.display,n=t.lineDiv.offsetTop,r=0;r<t.view.length;r++){var i=t.view[r],o=e.options.lineWrapping,s=void 0,c=0;if(!i.hidden){if(a&&l<8){var u=i.node.offsetTop+i.node.offsetHeight;s=u-n,n=u}else{var f=i.node.getBoundingClientRect();s=f.bottom-f.top,!o&&i.text.firstChild&&(c=i.text.firstChild.getBoundingClientRect().right-f.left-1)}var d=i.line.height-s;if((d>.005||d<-.005)&&(Xe(i.line,s),Mr(i.line),i.rest))for(var h=0;h<i.rest.length;h++)Mr(i.rest[h]);if(c>e.display.sizerWidth){var p=Math.ceil(c/ir(e.display));p>e.display.maxLineLength&&(e.display.maxLineLength=p,e.display.maxLine=i.line,e.display.maxLineChanged=!0)}}}}function Mr(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t){var n=e.widgets[t],r=n.node.parentNode;r&&(n.height=r.offsetHeight)}}function Or(e,t,n){var r=n&&null!=n.top?Math.max(0,n.top):e.scroller.scrollTop;r=Math.floor(r-Cn(e));var i=n&&null!=n.bottom?n.bottom:r+e.wrapper.clientHeight,o=Ze(t,r),a=Ze(t,i);if(n&&n.ensure){var l=n.ensure.from.line,s=n.ensure.to.line;l<o?(o=l,a=Ze(t,qt(Ke(t,l))+e.wrapper.clientHeight)):Math.min(s,t.lastLine())>=a&&(o=Ze(t,qt(Ke(t,s))-e.wrapper.clientHeight),a=s)}return{from:o,to:Math.max(a,o+1)}}function Nr(e,t){var n=e.display,r=rr(e.display);t.top<0&&(t.top=0);var i=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:n.scroller.scrollTop,o=On(e),a={};t.bottom-t.top>o&&(t.bottom=t.top+o);var l=e.doc.height+Sn(n),s=t.top<r,c=t.bottom>l-r;if(t.top<i)a.scrollTop=s?0:t.top;else if(t.bottom>i+o){var u=Math.min(t.top,(c?l:t.bottom)-o);u!=i&&(a.scrollTop=u)}var f=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:n.scroller.scrollLeft,d=Mn(e)-(e.options.fixedGutter?n.gutters.offsetWidth:0),h=t.right-t.left>d;return h&&(t.right=t.left+d),t.left<10?a.scrollLeft=0:t.left<f?a.scrollLeft=Math.max(0,t.left-(h?0:10)):t.right>d+f-3&&(a.scrollLeft=t.right+(h?0:10)-d),a}function Ar(e,t){null!=t&&(Pr(e),e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+t)}function Er(e){Pr(e);var t=e.getCursor();e.curOp.scrollToPos={from:t,to:t,margin:e.options.cursorScrollMargin}}function zr(e,t,n){null==t&&null==n||Pr(e),null!=t&&(e.curOp.scrollLeft=t),null!=n&&(e.curOp.scrollTop=n)}function Pr(e){var t=e.curOp.scrollToPos;t&&(e.curOp.scrollToPos=null,Dr(e,Gn(e,t.from),Gn(e,t.to),t.margin))}function Dr(e,t,n,r){var i=Nr(e,{left:Math.min(t.left,n.left),top:Math.min(t.top,n.top)-r,right:Math.max(t.right,n.right),bottom:Math.max(t.bottom,n.bottom)+r});zr(e,i.scrollLeft,i.scrollTop)}function Ir(e,t){Math.abs(e.doc.scrollTop-t)<2||(n||si(e,{top:t}),_r(e,t,!0),n&&si(e),ri(e,100))}function _r(e,t,n){t=Math.max(0,Math.min(e.display.scroller.scrollHeight-e.display.scroller.clientHeight,t)),(e.display.scroller.scrollTop!=t||n)&&(e.doc.scrollTop=t,e.display.scrollbars.setScrollTop(t),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t))}function Fr(e,t,n,r){t=Math.max(0,Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth)),(n?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)&&!r||(e.doc.scrollLeft=t,fi(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function Wr(e){var t=e.display,n=t.gutters.offsetWidth,r=Math.round(e.doc.height+Sn(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?n:0,docHeight:r,scrollHeight:r+Ln(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:n}}var Rr=function(e,t,n){this.cm=n;var r=this.vert=N("div",[N("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=N("div",[N("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");r.tabIndex=i.tabIndex=-1,e(r),e(i),fe(r,"scroll",(function(){r.clientHeight&&t(r.scrollTop,"vertical")})),fe(i,"scroll",(function(){i.clientWidth&&t(i.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,a&&l<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Rr.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,n=e.scrollHeight>e.clientHeight+1,r=e.nativeBarWidth;if(n){this.vert.style.display="block",this.vert.style.bottom=t?r+"px":"0";var i=e.viewHeight-(t?r:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=n?r+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(n?r:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==r&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:n?r:0,bottom:t?r:0}},Rr.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},Rr.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},Rr.prototype.zeroWidthHack=function(){var e=y&&!h?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new R,this.disableVert=new R},Rr.prototype.enableZeroWidthBar=function(e,t,n){e.style.pointerEvents="auto",t.set(1e3,(function r(){var i=e.getBoundingClientRect();("vert"==n?document.elementFromPoint(i.right-1,(i.top+i.bottom)/2):document.elementFromPoint((i.right+i.left)/2,i.bottom-1))!=e?e.style.pointerEvents="none":t.set(1e3,r)}))},Rr.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var Hr=function(){};function Br(e,t){t||(t=Wr(e));var n=e.display.barWidth,r=e.display.barHeight;jr(e,t);for(var i=0;i<4&&n!=e.display.barWidth||r!=e.display.barHeight;i++)n!=e.display.barWidth&&e.options.lineWrapping&&Lr(e),jr(e,Wr(e)),n=e.display.barWidth,r=e.display.barHeight}function jr(e,t){var n=e.display,r=n.scrollbars.update(t);n.sizer.style.paddingRight=(n.barWidth=r.right)+"px",n.sizer.style.paddingBottom=(n.barHeight=r.bottom)+"px",n.heightForcer.style.borderBottom=r.bottom+"px solid transparent",r.right&&r.bottom?(n.scrollbarFiller.style.display="block",n.scrollbarFiller.style.height=r.bottom+"px",n.scrollbarFiller.style.width=r.right+"px"):n.scrollbarFiller.style.display="",r.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(n.gutterFiller.style.display="block",n.gutterFiller.style.height=r.bottom+"px",n.gutterFiller.style.width=t.gutterWidth+"px"):n.gutterFiller.style.display=""}Hr.prototype.update=function(){return{bottom:0,right:0}},Hr.prototype.setScrollLeft=function(){},Hr.prototype.setScrollTop=function(){},Hr.prototype.clear=function(){};var qr={native:Rr,null:Hr};function Ur(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&L(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new qr[e.options.scrollbarStyle]((function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),fe(t,"mousedown",(function(){e.state.focused&&setTimeout((function(){return e.display.input.focus()}),0)})),t.setAttribute("cm-not-content","true")}),(function(t,n){"horizontal"==n?Fr(e,t):Ir(e,t)}),e),e.display.scrollbars.addClass&&P(e.display.wrapper,e.display.scrollbars.addClass)}var Vr=0;function Kr(e){var t;e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:0,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Vr},t=e.curOp,an?an.ops.push(t):t.ownsGroup=an={ops:[t],delayedCallbacks:[]}}function $r(e){var t=e.curOp;t&&function(e,t){var n=e.ownsGroup;if(n)try{!function(e){var t=e.delayedCallbacks,n=0;do{for(;n<t.length;n++)t[n].call(null);for(var r=0;r<e.ops.length;r++){var i=e.ops[r];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(n<t.length)}(n)}finally{an=null,t(n)}}(t,(function(e){for(var t=0;t<e.ops.length;t++)e.ops[t].cm.curOp=null;!function(e){for(var t=e.ops,n=0;n<t.length;n++)Gr(t[n]);for(var r=0;r<t.length;r++)Xr(t[r]);for(var i=0;i<t.length;i++)Yr(t[i]);for(var o=0;o<t.length;o++)Zr(t[o]);for(var a=0;a<t.length;a++)Qr(t[a])}(e)}))}function Gr(e){var t=e.cm,n=t.display;!function(e){var t=e.display;!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=Ln(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=Ln(e)+"px",t.scrollbarsClipped=!0)}(t),e.updateMaxLine&&Vt(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<n.viewFrom||e.scrollToPos.to.line>=n.viewTo)||n.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new oi(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Xr(e){e.updatedDisplay=e.mustUpdate&&ai(e.cm,e.update)}function Yr(e){var t=e.cm,n=t.display;e.updatedDisplay&&Lr(t),e.barMeasure=Wr(t),n.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=An(t,n.maxLine,n.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(n.scroller.clientWidth,n.sizer.offsetLeft+e.adjustWidthTo+Ln(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,n.sizer.offsetLeft+e.adjustWidthTo-Mn(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=n.input.prepareSelection())}function Zr(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&Fr(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var n=e.focus&&e.focus==z();e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,n),(e.updatedDisplay||e.startHeight!=t.doc.height)&&Br(t,e.barMeasure),e.updatedDisplay&&ui(t,e.barMeasure),e.selectionChanged&&wr(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),n&&kr(e.cm)}function Qr(e){var t=e.cm,n=t.display,r=t.doc;e.updatedDisplay&&li(t,e.update),null==n.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(n.wheelStartX=n.wheelStartY=null),null!=e.scrollTop&&_r(t,e.scrollTop,e.forceScroll),null!=e.scrollLeft&&Fr(t,e.scrollLeft,!0,!0),e.scrollToPos&&function(e,t){if(!me(e,"scrollCursorIntoView")){var n=e.display,r=n.sizer.getBoundingClientRect(),i=null;if(t.top+r.top<0?i=!0:t.bottom+r.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!p){var o=N("div","​",null,"position: absolute;\n                         top: "+(t.top-n.viewOffset-Cn(e.display))+"px;\n                         height: "+(t.bottom-t.top+Ln(e)+n.barHeight)+"px;\n                         left: "+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}(t,function(e,t,n,r){var i;null==r&&(r=0),e.options.lineWrapping||t!=n||(n="before"==(t=t.ch?et(t.line,"before"==t.sticky?t.ch-1:t.ch,"after"):t).sticky?et(t.line,t.ch+1,"before"):t);for(var o=0;o<5;o++){var a=!1,l=$n(e,t),s=n&&n!=t?$n(e,n):l,c=Nr(e,i={left:Math.min(l.left,s.left),top:Math.min(l.top,s.top)-r,right:Math.max(l.left,s.left),bottom:Math.max(l.bottom,s.bottom)+r}),u=e.doc.scrollTop,f=e.doc.scrollLeft;if(null!=c.scrollTop&&(Ir(e,c.scrollTop),Math.abs(e.doc.scrollTop-u)>1&&(a=!0)),null!=c.scrollLeft&&(Fr(e,c.scrollLeft),Math.abs(e.doc.scrollLeft-f)>1&&(a=!0)),!a)break}return i}(t,lt(r,e.scrollToPos.from),lt(r,e.scrollToPos.to),e.scrollToPos.margin));var i=e.maybeHiddenMarkers,o=e.maybeUnhiddenMarkers;if(i)for(var a=0;a<i.length;++a)i[a].lines.length||pe(i[a],"hide");if(o)for(var l=0;l<o.length;++l)o[l].lines.length&&pe(o[l],"unhide");n.wrapper.offsetHeight&&(r.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&pe(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Jr(e,t){if(e.curOp)return t();Kr(e);try{return t()}finally{$r(e)}}function ei(e,t){return function(){if(e.curOp)return t.apply(e,arguments);Kr(e);try{return t.apply(e,arguments)}finally{$r(e)}}}function ti(e){return function(){if(this.curOp)return e.apply(this,arguments);Kr(this);try{return e.apply(this,arguments)}finally{$r(this)}}}function ni(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);Kr(t);try{return e.apply(this,arguments)}finally{$r(t)}}}function ri(e,t){e.doc.highlightFrontier<e.display.viewTo&&e.state.highlight.set(t,_(ii,e))}function ii(e){var t=e.doc;if(!(t.highlightFrontier>=e.display.viewTo)){var n=+new Date+e.options.workTime,r=ht(e,t.highlightFrontier),i=[];t.iter(r.line,Math.min(t.first+t.size,e.display.viewTo+500),(function(o){if(r.line>=e.display.viewFrom){var a=o.styles,l=o.text.length>e.options.maxHighlightLength?je(t.mode,r.state):null,s=ft(e,o,r,!0);l&&(r.state=l),o.styles=s.styles;var c=o.styleClasses,u=s.classes;u?o.styleClasses=u:c&&(o.styleClasses=null);for(var f=!a||a.length!=o.styles.length||c!=u&&(!c||!u||c.bgClass!=u.bgClass||c.textClass!=u.textClass),d=0;!f&&d<a.length;++d)f=a[d]!=o.styles[d];f&&i.push(r.line),o.stateAfter=r.save(),r.nextLine()}else o.text.length<=e.options.maxHighlightLength&&pt(e,o.text,r),o.stateAfter=r.line%5==0?r.save():null,r.nextLine();if(+new Date>n)return ri(e,e.options.workDelay),!0})),t.highlightFrontier=r.line,t.modeFrontier=Math.max(t.modeFrontier,r.line),i.length&&Jr(e,(function(){for(var t=0;t<i.length;t++)dr(e,i[t],"text")}))}}var oi=function(e,t,n){var r=e.display;this.viewport=t,this.visible=Or(r,e.doc,t),this.editorIsHidden=!r.wrapper.offsetWidth,this.wrapperHeight=r.wrapper.clientHeight,this.wrapperWidth=r.wrapper.clientWidth,this.oldDisplayWidth=Mn(e),this.force=n,this.dims=or(e),this.events=[]};function ai(e,t){var n=e.display,r=e.doc;if(t.editorIsHidden)return hr(e),!1;if(!t.force&&t.visible.from>=n.viewFrom&&t.visible.to<=n.viewTo&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo)&&n.renderedView==n.view&&0==mr(e))return!1;di(e)&&(hr(e),t.dims=or(e));var i=r.first+r.size,o=Math.max(t.visible.from-e.options.viewportMargin,r.first),a=Math.min(i,t.visible.to+e.options.viewportMargin);n.viewFrom<o&&o-n.viewFrom<20&&(o=Math.max(r.first,n.viewFrom)),n.viewTo>a&&n.viewTo-a<20&&(a=Math.min(i,n.viewTo)),kt&&(o=Rt(e.doc,o),a=Ht(e.doc,a));var l=o!=n.viewFrom||a!=n.viewTo||n.lastWrapHeight!=t.wrapperHeight||n.lastWrapWidth!=t.wrapperWidth;!function(e,t,n){var r=e.display;0==r.view.length||t>=r.viewTo||n<=r.viewFrom?(r.view=on(e,t,n),r.viewFrom=t):(r.viewFrom>t?r.view=on(e,t,r.viewFrom).concat(r.view):r.viewFrom<t&&(r.view=r.view.slice(ur(e,t))),r.viewFrom=t,r.viewTo<n?r.view=r.view.concat(on(e,r.viewTo,n)):r.viewTo>n&&(r.view=r.view.slice(0,ur(e,n)))),r.viewTo=n}(e,o,a),n.viewOffset=qt(Ke(e.doc,n.viewFrom)),e.display.mover.style.top=n.viewOffset+"px";var c=mr(e);if(!l&&0==c&&!t.force&&n.renderedView==n.view&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo))return!1;var u=function(e){if(e.hasFocus())return null;var t=z();if(!t||!E(e.display.lineDiv,t))return null;var n={activeElt:t};if(window.getSelection){var r=window.getSelection();r.anchorNode&&r.extend&&E(e.display.lineDiv,r.anchorNode)&&(n.anchorNode=r.anchorNode,n.anchorOffset=r.anchorOffset,n.focusNode=r.focusNode,n.focusOffset=r.focusOffset)}return n}(e);return c>4&&(n.lineDiv.style.display="none"),function(e,t,n){var r=e.display,i=e.options.lineNumbers,o=r.lineDiv,a=o.firstChild;function l(t){var n=t.nextSibling;return s&&y&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),n}for(var c=r.view,u=r.viewFrom,f=0;f<c.length;f++){var d=c[f];if(d.hidden);else if(d.node&&d.node.parentNode==o){for(;a!=d.node;)a=l(a);var h=i&&null!=t&&t<=u&&d.lineNumber;d.changes&&(H(d.changes,"gutter")>-1&&(h=!1),un(e,d,u,n)),h&&(M(d.lineNumber),d.lineNumber.appendChild(document.createTextNode(Je(e.options,u)))),a=d.node.nextSibling}else{var p=vn(e,d,u,n);o.insertBefore(p,a)}u+=d.size}for(;a;)a=l(a)}(e,n.updateLineNumbers,t.dims),c>4&&(n.lineDiv.style.display=""),n.renderedView=n.view,function(e){if(e&&e.activeElt&&e.activeElt!=z()&&(e.activeElt.focus(),!/^(INPUT|TEXTAREA)$/.test(e.activeElt.nodeName)&&e.anchorNode&&E(document.body,e.anchorNode)&&E(document.body,e.focusNode))){var t=window.getSelection(),n=document.createRange();n.setEnd(e.anchorNode,e.anchorOffset),n.collapse(!1),t.removeAllRanges(),t.addRange(n),t.extend(e.focusNode,e.focusOffset)}}(u),M(n.cursorDiv),M(n.selectionDiv),n.gutters.style.height=n.sizer.style.minHeight=0,l&&(n.lastWrapHeight=t.wrapperHeight,n.lastWrapWidth=t.wrapperWidth,ri(e,400)),n.updateLineNumbers=null,!0}function li(e,t){for(var n=t.viewport,r=!0;;r=!1){if(r&&e.options.lineWrapping&&t.oldDisplayWidth!=Mn(e))r&&(t.visible=Or(e.display,e.doc,n));else if(n&&null!=n.top&&(n={top:Math.min(e.doc.height+Sn(e.display)-On(e),n.top)}),t.visible=Or(e.display,e.doc,n),t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)break;if(!ai(e,t))break;Lr(e);var i=Wr(e);gr(e),Br(e,i),ui(e,i),t.force=!1}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function si(e,t){var n=new oi(e,t);if(ai(e,n)){Lr(e),li(e,n);var r=Wr(e);gr(e),Br(e,r),ui(e,r),n.finish()}}function ci(e){var t=e.gutters.offsetWidth;e.sizer.style.marginLeft=t+"px"}function ui(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Ln(e)+"px"}function fi(e){var t=e.display,n=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var r=ar(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=r+"px",a=0;a<n.length;a++)if(!n[a].hidden){e.options.fixedGutter&&(n[a].gutter&&(n[a].gutter.style.left=o),n[a].gutterBackground&&(n[a].gutterBackground.style.left=o));var l=n[a].alignable;if(l)for(var s=0;s<l.length;s++)l[s].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=r+i+"px")}}function di(e){if(!e.options.lineNumbers)return!1;var t=e.doc,n=Je(e.options,t.first+t.size-1),r=e.display;if(n.length!=r.lineNumChars){var i=r.measure.appendChild(N("div",[N("div",n)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,a=i.offsetWidth-o;return r.lineGutter.style.width="",r.lineNumInnerWidth=Math.max(o,r.lineGutter.offsetWidth-a)+1,r.lineNumWidth=r.lineNumInnerWidth+a,r.lineNumChars=r.lineNumInnerWidth?n.length:-1,r.lineGutter.style.width=r.lineNumWidth+"px",ci(e.display),!0}return!1}function hi(e,t){for(var n=[],r=!1,i=0;i<e.length;i++){var o=e[i],a=null;if("string"!=typeof o&&(a=o.style,o=o.className),"CodeMirror-linenumbers"==o){if(!t)continue;r=!0}n.push({className:o,style:a})}return t&&!r&&n.push({className:"CodeMirror-linenumbers",style:null}),n}function pi(e){var t=e.gutters,n=e.gutterSpecs;M(t),e.lineGutter=null;for(var r=0;r<n.length;++r){var i=n[r],o=i.className,a=i.style,l=t.appendChild(N("div",null,"CodeMirror-gutter "+o));a&&(l.style.cssText=a),"CodeMirror-linenumbers"==o&&(e.lineGutter=l,l.style.width=(e.lineNumWidth||1)+"px")}t.style.display=n.length?"":"none",ci(e)}function mi(e){pi(e.display),fr(e),fi(e)}function gi(e,t,r,i){var o=this;this.input=r,o.scrollbarFiller=N("div",null,"CodeMirror-scrollbar-filler"),o.scrollbarFiller.setAttribute("cm-not-content","true"),o.gutterFiller=N("div",null,"CodeMirror-gutter-filler"),o.gutterFiller.setAttribute("cm-not-content","true"),o.lineDiv=A("div",null,"CodeMirror-code"),o.selectionDiv=N("div",null,null,"position: relative; z-index: 1"),o.cursorDiv=N("div",null,"CodeMirror-cursors"),o.measure=N("div",null,"CodeMirror-measure"),o.lineMeasure=N("div",null,"CodeMirror-measure"),o.lineSpace=A("div",[o.measure,o.lineMeasure,o.selectionDiv,o.cursorDiv,o.lineDiv],null,"position: relative; outline: none");var c=A("div",[o.lineSpace],"CodeMirror-lines");o.mover=N("div",[c],null,"position: relative"),o.sizer=N("div",[o.mover],"CodeMirror-sizer"),o.sizerWidth=null,o.heightForcer=N("div",null,null,"position: absolute; height: 50px; width: 1px;"),o.gutters=N("div",null,"CodeMirror-gutters"),o.lineGutter=null,o.scroller=N("div",[o.sizer,o.heightForcer,o.gutters],"CodeMirror-scroll"),o.scroller.setAttribute("tabIndex","-1"),o.wrapper=N("div",[o.scrollbarFiller,o.gutterFiller,o.scroller],"CodeMirror"),a&&l<8&&(o.gutters.style.zIndex=-1,o.scroller.style.paddingRight=0),s||n&&v||(o.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(o.wrapper):e(o.wrapper)),o.viewFrom=o.viewTo=t.first,o.reportedViewFrom=o.reportedViewTo=t.first,o.view=[],o.renderedView=null,o.externalMeasured=null,o.viewOffset=0,o.lastWrapHeight=o.lastWrapWidth=0,o.updateLineNumbers=null,o.nativeBarWidth=o.barHeight=o.barWidth=0,o.scrollbarsClipped=!1,o.lineNumWidth=o.lineNumInnerWidth=o.lineNumChars=null,o.alignWidgets=!1,o.cachedCharWidth=o.cachedTextHeight=o.cachedPaddingH=null,o.maxLine=null,o.maxLineLength=0,o.maxLineChanged=!1,o.wheelDX=o.wheelDY=o.wheelStartX=o.wheelStartY=null,o.shift=!1,o.selForContextMenu=null,o.activeTouch=null,o.gutterSpecs=hi(i.gutters,i.lineNumbers),pi(o),r.init(o)}oi.prototype.signal=function(e,t){ve(e,t)&&this.events.push(arguments)},oi.prototype.finish=function(){for(var e=0;e<this.events.length;e++)pe.apply(null,this.events[e])};var vi=0,yi=null;function bi(e){var t=e.wheelDeltaX,n=e.wheelDeltaY;return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==n&&e.detail&&e.axis==e.VERTICAL_AXIS?n=e.detail:null==n&&(n=e.wheelDelta),{x:t,y:n}}function xi(e){var t=bi(e);return t.x*=yi,t.y*=yi,t}function wi(e,t){var r=bi(t),i=r.x,o=r.y,a=e.display,l=a.scroller,c=l.scrollWidth>l.clientWidth,u=l.scrollHeight>l.clientHeight;if(i&&c||o&&u){if(o&&y&&s)e:for(var d=t.target,h=a.view;d!=l;d=d.parentNode)for(var p=0;p<h.length;p++)if(h[p].node==d){e.display.currentWheelTarget=d;break e}if(i&&!n&&!f&&null!=yi)return o&&u&&Ir(e,Math.max(0,l.scrollTop+o*yi)),Fr(e,Math.max(0,l.scrollLeft+i*yi)),(!o||o&&u)&&be(t),void(a.wheelStartX=null);if(o&&null!=yi){var m=o*yi,g=e.doc.scrollTop,v=g+a.wrapper.clientHeight;m<0?g=Math.max(0,g+m-50):v=Math.min(e.doc.height,v+m+50),si(e,{top:g,bottom:v})}vi<20&&(null==a.wheelStartX?(a.wheelStartX=l.scrollLeft,a.wheelStartY=l.scrollTop,a.wheelDX=i,a.wheelDY=o,setTimeout((function(){if(null!=a.wheelStartX){var e=l.scrollLeft-a.wheelStartX,t=l.scrollTop-a.wheelStartY,n=t&&a.wheelDY&&t/a.wheelDY||e&&a.wheelDX&&e/a.wheelDX;a.wheelStartX=a.wheelStartY=null,n&&(yi=(yi*vi+n)/(vi+1),++vi)}}),200)):(a.wheelDX+=i,a.wheelDY+=o))}}a?yi=-.53:n?yi=15:u?yi=-.7:d&&(yi=-1/3);var ki=function(e,t){this.ranges=e,this.primIndex=t};ki.prototype.primary=function(){return this.ranges[this.primIndex]},ki.prototype.equals=function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var n=this.ranges[t],r=e.ranges[t];if(!nt(n.anchor,r.anchor)||!nt(n.head,r.head))return!1}return!0},ki.prototype.deepCopy=function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new Ci(rt(this.ranges[t].anchor),rt(this.ranges[t].head));return new ki(e,this.primIndex)},ki.prototype.somethingSelected=function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},ki.prototype.contains=function(e,t){t||(t=e);for(var n=0;n<this.ranges.length;n++){var r=this.ranges[n];if(tt(t,r.from())>=0&&tt(e,r.to())<=0)return n}return-1};var Ci=function(e,t){this.anchor=e,this.head=t};function Si(e,t,n){var r=e&&e.options.selectionsMayTouch,i=t[n];t.sort((function(e,t){return tt(e.from(),t.from())})),n=H(t,i);for(var o=1;o<t.length;o++){var a=t[o],l=t[o-1],s=tt(l.to(),a.from());if(r&&!a.empty()?s>0:s>=0){var c=ot(l.from(),a.from()),u=it(l.to(),a.to()),f=l.empty()?a.from()==a.head:l.from()==l.head;o<=n&&--n,t.splice(--o,2,new Ci(f?u:c,f?c:u))}}return new ki(t,n)}function Ti(e,t){return new ki([new Ci(e,t||e)],0)}function Li(e){return e.text?et(e.from.line+e.text.length-1,G(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}function Mi(e,t){if(tt(e,t.from)<0)return e;if(tt(e,t.to)<=0)return Li(t);var n=e.line+t.text.length-(t.to.line-t.from.line)-1,r=e.ch;return e.line==t.to.line&&(r+=Li(t).ch-t.to.ch),et(n,r)}function Oi(e,t){for(var n=[],r=0;r<e.sel.ranges.length;r++){var i=e.sel.ranges[r];n.push(new Ci(Mi(i.anchor,t),Mi(i.head,t)))}return Si(e.cm,n,e.sel.primIndex)}function Ni(e,t,n){return e.line==t.line?et(n.line,e.ch-t.ch+n.ch):et(n.line+(e.line-t.line),e.ch)}function Ai(e){e.doc.mode=Re(e.options,e.doc.modeOption),Ei(e)}function Ei(e){e.doc.iter((function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)})),e.doc.modeFrontier=e.doc.highlightFrontier=e.doc.first,ri(e,100),e.state.modeGen++,e.curOp&&fr(e)}function zi(e,t){return 0==t.from.ch&&0==t.to.ch&&""==G(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function Pi(e,t,n,r){function i(e){return n?n[e]:null}function o(e,n,i){!function(e,t,n,r){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),Ot(e),Nt(e,n);var i=r?r(e):1;i!=e.height&&Xe(e,i)}(e,n,i,r),sn(e,"change",e,t)}function a(e,t){for(var n=[],o=e;o<t;++o)n.push(new Kt(c[o],i(o),r));return n}var l=t.from,s=t.to,c=t.text,u=Ke(e,l.line),f=Ke(e,s.line),d=G(c),h=i(c.length-1),p=s.line-l.line;if(t.full)e.insert(0,a(0,c.length)),e.remove(c.length,e.size-c.length);else if(zi(e,t)){var m=a(0,c.length-1);o(f,f.text,h),p&&e.remove(l.line,p),m.length&&e.insert(l.line,m)}else if(u==f)if(1==c.length)o(u,u.text.slice(0,l.ch)+d+u.text.slice(s.ch),h);else{var g=a(1,c.length-1);g.push(new Kt(d+u.text.slice(s.ch),h,r)),o(u,u.text.slice(0,l.ch)+c[0],i(0)),e.insert(l.line+1,g)}else if(1==c.length)o(u,u.text.slice(0,l.ch)+c[0]+f.text.slice(s.ch),i(0)),e.remove(l.line+1,p);else{o(u,u.text.slice(0,l.ch)+c[0],i(0)),o(f,d+f.text.slice(s.ch),h);var v=a(1,c.length-1);p>1&&e.remove(l.line+1,p-1),e.insert(l.line+1,v)}sn(e,"change",e,t)}function Di(e,t,n){!function e(r,i,o){if(r.linked)for(var a=0;a<r.linked.length;++a){var l=r.linked[a];if(l.doc!=i){var s=o&&l.sharedHist;n&&!s||(t(l.doc,s),e(l.doc,r,s))}}}(e,null,!0)}function Ii(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,sr(e),Ai(e),_i(e),e.options.lineWrapping||Vt(e),e.options.mode=t.modeOption,fr(e)}function _i(e){("rtl"==e.doc.direction?P:L)(e.display.lineDiv,"CodeMirror-rtl")}function Fi(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function Wi(e,t){var n={from:rt(t.from),to:Li(t),text:$e(e,t.from,t.to)};return qi(e,n,t.from.line,t.to.line+1),Di(e,(function(e){return qi(e,n,t.from.line,t.to.line+1)}),!0),n}function Ri(e){for(;e.length&&G(e).ranges;)e.pop()}function Hi(e,t,n,r){var i=e.history;i.undone.length=0;var o,a,l=+new Date;if((i.lastOp==r||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&i.lastModTime>l-(e.cm?e.cm.options.historyEventDelay:500)||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Ri(e.done),G(e.done)):e.done.length&&!G(e.done).ranges?G(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),G(e.done)):void 0}(i,i.lastOp==r)))a=G(o.changes),0==tt(t.from,t.to)&&0==tt(t.from,a.to)?a.to=Li(t):o.changes.push(Wi(e,t));else{var s=G(i.done);for(s&&s.ranges||ji(e.sel,i.done),o={changes:[Wi(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(n),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=l,i.lastOp=i.lastSelOp=r,i.lastOrigin=i.lastSelOrigin=t.origin,a||pe(e,"historyAdded")}function Bi(e,t,n,r){var i=e.history,o=r&&r.origin;n==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,n,r){var i=t.charAt(0);return"*"==i||"+"==i&&n.ranges.length==r.ranges.length&&n.somethingSelected()==r.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,G(i.done),t))?i.done[i.done.length-1]=t:ji(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=n,r&&!1!==r.clearRedo&&Ri(i.undone)}function ji(e,t){var n=G(t);n&&n.ranges&&n.equals(e)||t.push(e)}function qi(e,t,n,r){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,n),Math.min(e.first+e.size,r),(function(n){n.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=n.markedSpans),++o}))}function Ui(e){if(!e)return null;for(var t,n=0;n<e.length;++n)e[n].marker.explicitlyCleared?t||(t=e.slice(0,n)):t&&t.push(e[n]);return t?t.length?t:null:e}function Vi(e,t){var n=function(e,t){var n=t["spans_"+e.id];if(!n)return null;for(var r=[],i=0;i<t.text.length;++i)r.push(Ui(n[i]));return r}(e,t),r=Lt(e,t);if(!n)return r;if(!r)return n;for(var i=0;i<n.length;++i){var o=n[i],a=r[i];if(o&&a)e:for(var l=0;l<a.length;++l){for(var s=a[l],c=0;c<o.length;++c)if(o[c].marker==s.marker)continue e;o.push(s)}else a&&(n[i]=a)}return n}function Ki(e,t,n){for(var r=[],i=0;i<e.length;++i){var o=e[i];if(o.ranges)r.push(n?ki.prototype.deepCopy.call(o):o);else{var a=o.changes,l=[];r.push({changes:l});for(var s=0;s<a.length;++s){var c=a[s],u=void 0;if(l.push({from:c.from,to:c.to,text:c.text}),t)for(var f in c)(u=f.match(/^spans_(\d+)$/))&&H(t,Number(u[1]))>-1&&(G(l)[f]=c[f],delete c[f])}}}return r}function $i(e,t,n,r){if(r){var i=e.anchor;if(n){var o=tt(t,i)<0;o!=tt(n,i)<0?(i=t,t=n):o!=tt(t,n)<0&&(t=n)}return new Ci(i,t)}return new Ci(n||t,t)}function Gi(e,t,n,r,i){null==i&&(i=e.cm&&(e.cm.display.shift||e.extend)),Ji(e,new ki([$i(e.sel.primary(),t,n,i)],0),r)}function Xi(e,t,n){for(var r=[],i=e.cm&&(e.cm.display.shift||e.extend),o=0;o<e.sel.ranges.length;o++)r[o]=$i(e.sel.ranges[o],t[o],null,i);Ji(e,Si(e.cm,r,e.sel.primIndex),n)}function Yi(e,t,n,r){var i=e.sel.ranges.slice(0);i[t]=n,Ji(e,Si(e.cm,i,e.sel.primIndex),r)}function Zi(e,t,n,r){Ji(e,Ti(t,n),r)}function Qi(e,t,n){var r=e.history.done,i=G(r);i&&i.ranges?(r[r.length-1]=t,eo(e,t,n)):Ji(e,t,n)}function Ji(e,t,n){eo(e,t,n),Bi(e,e.sel,e.cm?e.cm.curOp.id:NaN,n)}function eo(e,t,n){(ve(e,"beforeSelectionChange")||e.cm&&ve(e.cm,"beforeSelectionChange"))&&(t=function(e,t,n){var r={ranges:t.ranges,update:function(t){this.ranges=[];for(var n=0;n<t.length;n++)this.ranges[n]=new Ci(lt(e,t[n].anchor),lt(e,t[n].head))},origin:n&&n.origin};return pe(e,"beforeSelectionChange",e,r),e.cm&&pe(e.cm,"beforeSelectionChange",e.cm,r),r.ranges!=t.ranges?Si(e.cm,r.ranges,r.ranges.length-1):t}(e,t,n));var r=n&&n.bias||(tt(t.primary().head,e.sel.primary().head)<0?-1:1);to(e,ro(e,t,r,!0)),n&&!1===n.scroll||!e.cm||Er(e.cm)}function to(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=1,e.cm.curOp.selectionChanged=!0,ge(e.cm)),sn(e,"cursorActivity",e))}function no(e){to(e,ro(e,e.sel,null,!1))}function ro(e,t,n,r){for(var i,o=0;o<t.ranges.length;o++){var a=t.ranges[o],l=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],s=oo(e,a.anchor,l&&l.anchor,n,r),c=oo(e,a.head,l&&l.head,n,r);(i||s!=a.anchor||c!=a.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new Ci(s,c))}return i?Si(e.cm,i,t.primIndex):t}function io(e,t,n,r,i){var o=Ke(e,t.line);if(o.markedSpans)for(var a=0;a<o.markedSpans.length;++a){var l=o.markedSpans[a],s=l.marker,c="selectLeft"in s?!s.selectLeft:s.inclusiveLeft,u="selectRight"in s?!s.selectRight:s.inclusiveRight;if((null==l.from||(c?l.from<=t.ch:l.from<t.ch))&&(null==l.to||(u?l.to>=t.ch:l.to>t.ch))){if(i&&(pe(s,"beforeCursorEnter"),s.explicitlyCleared)){if(o.markedSpans){--a;continue}break}if(!s.atomic)continue;if(n){var f=s.find(r<0?1:-1),d=void 0;if((r<0?u:c)&&(f=ao(e,f,-r,f&&f.line==t.line?o:null)),f&&f.line==t.line&&(d=tt(f,n))&&(r<0?d<0:d>0))return io(e,f,t,r,i)}var h=s.find(r<0?-1:1);return(r<0?c:u)&&(h=ao(e,h,r,h.line==t.line?o:null)),h?io(e,h,t,r,i):null}}return t}function oo(e,t,n,r,i){var o=r||1,a=io(e,t,n,o,i)||!i&&io(e,t,n,o,!0)||io(e,t,n,-o,i)||!i&&io(e,t,n,-o,!0);return a||(e.cantEdit=!0,et(e.first,0))}function ao(e,t,n,r){return n<0&&0==t.ch?t.line>e.first?lt(e,et(t.line-1)):null:n>0&&t.ch==(r||Ke(e,t.line)).text.length?t.line<e.first+e.size-1?et(t.line+1,0):null:new et(t.line,t.ch+n)}function lo(e){e.setSelection(et(e.firstLine(),0),et(e.lastLine()),j)}function so(e,t,n){var r={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){return r.canceled=!0}};return n&&(r.update=function(t,n,i,o){t&&(r.from=lt(e,t)),n&&(r.to=lt(e,n)),i&&(r.text=i),void 0!==o&&(r.origin=o)}),pe(e,"beforeChange",e,r),e.cm&&pe(e.cm,"beforeChange",e.cm,r),r.canceled?(e.cm&&(e.cm.curOp.updateInput=2),null):{from:r.from,to:r.to,text:r.text,origin:r.origin}}function co(e,t,n){if(e.cm){if(!e.cm.curOp)return ei(e.cm,co)(e,t,n);if(e.cm.state.suppressEdits)return}if(!(ve(e,"beforeChange")||e.cm&&ve(e.cm,"beforeChange"))||(t=so(e,t,!0))){var r=wt&&!n&&function(e,t,n){var r=null;if(e.iter(t.line,n.line+1,(function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var n=e.markedSpans[t].marker;!n.readOnly||r&&-1!=H(r,n)||(r||(r=[])).push(n)}})),!r)return null;for(var i=[{from:t,to:n}],o=0;o<r.length;++o)for(var a=r[o],l=a.find(0),s=0;s<i.length;++s){var c=i[s];if(!(tt(c.to,l.from)<0||tt(c.from,l.to)>0)){var u=[s,1],f=tt(c.from,l.from),d=tt(c.to,l.to);(f<0||!a.inclusiveLeft&&!f)&&u.push({from:c.from,to:l.from}),(d>0||!a.inclusiveRight&&!d)&&u.push({from:l.to,to:c.to}),i.splice.apply(i,u),s+=u.length-3}}return i}(e,t.from,t.to);if(r)for(var i=r.length-1;i>=0;--i)uo(e,{from:r[i].from,to:r[i].to,text:i?[""]:t.text,origin:t.origin});else uo(e,t)}}function uo(e,t){if(1!=t.text.length||""!=t.text[0]||0!=tt(t.from,t.to)){var n=Oi(e,t);Hi(e,t,n,e.cm?e.cm.curOp.id:NaN),po(e,t,n,Lt(e,t));var r=[];Di(e,(function(e,n){n||-1!=H(r,e.history)||(yo(e.history,t),r.push(e.history)),po(e,t,null,Lt(e,t))}))}}function fo(e,t,n){var r=e.cm&&e.cm.state.suppressEdits;if(!r||n){for(var i,o=e.history,a=e.sel,l="undo"==t?o.done:o.undone,s="undo"==t?o.undone:o.done,c=0;c<l.length&&(i=l[c],n?!i.ranges||i.equals(e.sel):i.ranges);c++);if(c!=l.length){for(o.lastOrigin=o.lastSelOrigin=null;;){if(!(i=l.pop()).ranges){if(r)return void l.push(i);break}if(ji(i,s),n&&!i.equals(e.sel))return void Ji(e,i,{clearRedo:!1});a=i}var u=[];ji(a,s),s.push({changes:u,generation:o.generation}),o.generation=i.generation||++o.maxGeneration;for(var f=ve(e,"beforeChange")||e.cm&&ve(e.cm,"beforeChange"),d=function(n){var r=i.changes[n];if(r.origin=t,f&&!so(e,r,!1))return l.length=0,{};u.push(Wi(e,r));var o=n?Oi(e,r):G(l);po(e,r,o,Vi(e,r)),!n&&e.cm&&e.cm.scrollIntoView({from:r.from,to:Li(r)});var a=[];Di(e,(function(e,t){t||-1!=H(a,e.history)||(yo(e.history,r),a.push(e.history)),po(e,r,null,Vi(e,r))}))},h=i.changes.length-1;h>=0;--h){var p=d(h);if(p)return p.v}}}}function ho(e,t){if(0!=t&&(e.first+=t,e.sel=new ki(X(e.sel.ranges,(function(e){return new Ci(et(e.anchor.line+t,e.anchor.ch),et(e.head.line+t,e.head.ch))})),e.sel.primIndex),e.cm)){fr(e.cm,e.first,e.first-t,t);for(var n=e.cm.display,r=n.viewFrom;r<n.viewTo;r++)dr(e.cm,r,"gutter")}}function po(e,t,n,r){if(e.cm&&!e.cm.curOp)return ei(e.cm,po)(e,t,n,r);if(t.to.line<e.first)ho(e,t.text.length-1-(t.to.line-t.from.line));else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);ho(e,i),t={from:et(e.first,0),to:et(t.to.line+i,t.to.ch),text:[G(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:et(o,Ke(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=$e(e,t.from,t.to),n||(n=Oi(e,t)),e.cm?function(e,t,n){var r=e.doc,i=e.display,o=t.from,a=t.to,l=!1,s=o.line;e.options.lineWrapping||(s=Ye(Wt(Ke(r,o.line))),r.iter(s,a.line+1,(function(e){if(e==i.maxLine)return l=!0,!0}))),r.sel.contains(t.from,t.to)>-1&&ge(e),Pi(r,t,n,lr(e)),e.options.lineWrapping||(r.iter(s,o.line+t.text.length,(function(e){var t=Ut(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,l=!1)})),l&&(e.curOp.updateMaxLine=!0)),function(e,t){if(e.modeFrontier=Math.min(e.modeFrontier,t),!(e.highlightFrontier<t-10)){for(var n=e.first,r=t-1;r>n;r--){var i=Ke(e,r).stateAfter;if(i&&(!(i instanceof ct)||r+i.lookAhead<t)){n=r+1;break}}e.highlightFrontier=Math.min(e.highlightFrontier,n)}}(r,o.line),ri(e,400);var c=t.text.length-(a.line-o.line)-1;t.full?fr(e):o.line!=a.line||1!=t.text.length||zi(e.doc,t)?fr(e,o.line,a.line+1,c):dr(e,o.line,"text");var u=ve(e,"changes"),f=ve(e,"change");if(f||u){var d={from:o,to:a,text:t.text,removed:t.removed,origin:t.origin};f&&sn(e,"change",e,d),u&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(d)}e.display.selForContextMenu=null}(e.cm,t,r):Pi(e,t,r),eo(e,n,j),e.cantEdit&&oo(e,et(e.firstLine(),0))&&(e.cantEdit=!1)}}function mo(e,t,n,r,i){var o;r||(r=n),tt(r,n)<0&&(n=(o=[r,n])[0],r=o[1]),"string"==typeof t&&(t=e.splitLines(t)),co(e,{from:n,to:r,text:t,origin:i})}function go(e,t,n,r){n<e.line?e.line+=r:t<e.line&&(e.line=t,e.ch=0)}function vo(e,t,n,r){for(var i=0;i<e.length;++i){var o=e[i],a=!0;if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0);for(var l=0;l<o.ranges.length;l++)go(o.ranges[l].anchor,t,n,r),go(o.ranges[l].head,t,n,r)}else{for(var s=0;s<o.changes.length;++s){var c=o.changes[s];if(n<c.from.line)c.from=et(c.from.line+r,c.from.ch),c.to=et(c.to.line+r,c.to.ch);else if(t<=c.to.line){a=!1;break}}a||(e.splice(0,i+1),i=0)}}}function yo(e,t){var n=t.from.line,r=t.to.line,i=t.text.length-(r-n)-1;vo(e.done,n,r,i),vo(e.undone,n,r,i)}function bo(e,t,n,r){var i=t,o=t;return"number"==typeof t?o=Ke(e,at(e,t)):i=Ye(t),null==i?null:(r(o,i)&&e.cm&&dr(e.cm,i,n),o)}function xo(e){this.lines=e,this.parent=null;for(var t=0,n=0;n<e.length;++n)e[n].parent=this,t+=e[n].height;this.height=t}function wo(e){this.children=e;for(var t=0,n=0,r=0;r<e.length;++r){var i=e[r];t+=i.chunkSize(),n+=i.height,i.parent=this}this.size=t,this.height=n,this.parent=null}Ci.prototype.from=function(){return ot(this.anchor,this.head)},Ci.prototype.to=function(){return it(this.anchor,this.head)},Ci.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch},xo.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var n=e,r=e+t;n<r;++n){var i=this.lines[n];this.height-=i.height,$t(i),sn(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,n){this.height+=n,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var r=0;r<t.length;++r)t[r].parent=this},iterN:function(e,t,n){for(var r=e+t;e<r;++e)if(n(this.lines[e]))return!0}},wo.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t;for(var n=0;n<this.children.length;++n){var r=this.children[n],i=r.chunkSize();if(e<i){var o=Math.min(t,i-e),a=r.height;if(r.removeInner(e,o),this.height-=a-r.height,i==o&&(this.children.splice(n--,1),r.parent=null),0==(t-=o))break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof xo))){var l=[];this.collapse(l),this.children=[new xo(l)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,n){this.size+=t.length,this.height+=n;for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<=o){if(i.insertInner(e,t,n),i.lines&&i.lines.length>50){for(var a=i.lines.length%25+25,l=a;l<i.lines.length;){var s=new xo(i.lines.slice(l,l+=25));i.height-=s.height,this.children.splice(++r,0,s),s.parent=this}i.lines=i.lines.slice(0,a),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this;do{var t=new wo(e.children.splice(e.children.length-5,5));if(e.parent){e.size-=t.size,e.height-=t.height;var n=H(e.parent.children,e);e.parent.children.splice(n+1,0,t)}else{var r=new wo(e.children);r.parent=e,e.children=[r,t],e=r}t.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},iterN:function(e,t,n){for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<o){var a=Math.min(t,o-e);if(i.iterN(e,a,n))return!0;if(0==(t-=a))break;e=0}else e-=o}}};var ko=function(e,t,n){if(n)for(var r in n)n.hasOwnProperty(r)&&(this[r]=n[r]);this.doc=e,this.node=t};function Co(e,t,n){qt(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Ar(e,n)}ko.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,n=this.line,r=Ye(n);if(null!=r&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(n.widgets=null);var o=wn(this);Xe(n,Math.max(0,n.height-o)),e&&(Jr(e,(function(){Co(e,n,-o),dr(e,r,"widget")})),sn(e,"lineWidgetCleared",e,this,r))}},ko.prototype.changed=function(){var e=this,t=this.height,n=this.doc.cm,r=this.line;this.height=null;var i=wn(this)-t;i&&(Bt(this.doc,r)||Xe(r,r.height+i),n&&Jr(n,(function(){n.curOp.forceUpdate=!0,Co(n,r,i),sn(n,"lineWidgetChanged",n,e,Ye(r))})))},ye(ko);var So=0,To=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++So};function Lo(e,t,n,r,i){if(r&&r.shared)return function(e,t,n,r,i){(r=F(r)).shared=!1;var o=[Lo(e,t,n,r,i)],a=o[0],l=r.widgetNode;return Di(e,(function(e){l&&(r.widgetNode=l.cloneNode(!0)),o.push(Lo(e,lt(e,t),lt(e,n),r,i));for(var s=0;s<e.linked.length;++s)if(e.linked[s].isParent)return;a=G(o)})),new Mo(o,a)}(e,t,n,r,i);if(e.cm&&!e.cm.curOp)return ei(e.cm,Lo)(e,t,n,r,i);var o=new To(e,i),a=tt(t,n);if(r&&F(r,o,!1),a>0||0==a&&!1!==o.clearWhenEmpty)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=A("span",[o.replacedWith],"CodeMirror-widget"),r.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),r.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Ft(e,t.line,t,n,o)||t.line!=n.line&&Ft(e,n.line,t,n,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");kt=!0}o.addToHistory&&Hi(e,{from:t,to:n,origin:"markText"},e.sel,NaN);var l,s=t.line,c=e.cm;if(e.iter(s,n.line+1,(function(e){c&&o.collapsed&&!c.options.lineWrapping&&Wt(e)==c.display.maxLine&&(l=!0),o.collapsed&&s!=t.line&&Xe(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new Ct(o,s==t.line?t.ch:null,s==n.line?n.ch:null)),++s})),o.collapsed&&e.iter(t.line,n.line+1,(function(t){Bt(e,t)&&Xe(t,0)})),o.clearOnEnter&&fe(o,"beforeCursorEnter",(function(){return o.clear()})),o.readOnly&&(wt=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++So,o.atomic=!0),c){if(l&&(c.curOp.updateMaxLine=!0),o.collapsed)fr(c,t.line,n.line+1);else if(o.className||o.startStyle||o.endStyle||o.css||o.attributes||o.title)for(var u=t.line;u<=n.line;u++)dr(c,u,"text");o.atomic&&no(c.doc),sn(c,"markerAdded",c,o)}return o}To.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&Kr(e),ve(this,"clear")){var n=this.find();n&&sn(this,"clear",n.from,n.to)}for(var r=null,i=null,o=0;o<this.lines.length;++o){var a=this.lines[o],l=St(a.markedSpans,this);e&&!this.collapsed?dr(e,Ye(a),"text"):e&&(null!=l.to&&(i=Ye(a)),null!=l.from&&(r=Ye(a))),a.markedSpans=Tt(a.markedSpans,l),null==l.from&&this.collapsed&&!Bt(this.doc,a)&&e&&Xe(a,rr(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(var s=0;s<this.lines.length;++s){var c=Wt(this.lines[s]),u=Ut(c);u>e.display.maxLineLength&&(e.display.maxLine=c,e.display.maxLineLength=u,e.display.maxLineChanged=!0)}null!=r&&e&&this.collapsed&&fr(e,r,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&no(e.doc)),e&&sn(e,"markerCleared",e,this,r,i),t&&$r(e),this.parent&&this.parent.clear()}},To.prototype.find=function(e,t){var n,r;null==e&&"bookmark"==this.type&&(e=1);for(var i=0;i<this.lines.length;++i){var o=this.lines[i],a=St(o.markedSpans,this);if(null!=a.from&&(n=et(t?o:Ye(o),a.from),-1==e))return n;if(null!=a.to&&(r=et(t?o:Ye(o),a.to),1==e))return r}return n&&{from:n,to:r}},To.prototype.changed=function(){var e=this,t=this.find(-1,!0),n=this,r=this.doc.cm;t&&r&&Jr(r,(function(){var i=t.line,o=Ye(t.line),a=En(r,o);if(a&&(Wn(a),r.curOp.selectionChanged=r.curOp.forceUpdate=!0),r.curOp.updateMaxLine=!0,!Bt(n.doc,i)&&null!=n.height){var l=n.height;n.height=null;var s=wn(n)-l;s&&Xe(i,i.height+s)}sn(r,"markerChanged",r,e)}))},To.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;t.maybeHiddenMarkers&&-1!=H(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},To.prototype.detachLine=function(e){if(this.lines.splice(H(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}},ye(To);var Mo=function(e,t){this.markers=e,this.primary=t;for(var n=0;n<e.length;++n)e[n].parent=this};function Oo(e){return e.findMarks(et(e.first,0),e.clipPos(et(e.lastLine())),(function(e){return e.parent}))}function No(e){for(var t=function(t){var n=e[t],r=[n.primary.doc];Di(n.primary.doc,(function(e){return r.push(e)}));for(var i=0;i<n.markers.length;i++){var o=n.markers[i];-1==H(r,o.doc)&&(o.parent=null,n.markers.splice(i--,1))}},n=0;n<e.length;n++)t(n)}Mo.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();sn(this,"clear")}},Mo.prototype.find=function(e,t){return this.primary.find(e,t)},ye(Mo);var Ao=0,Eo=function(e,t,n,r,i){if(!(this instanceof Eo))return new Eo(e,t,n,r,i);null==n&&(n=0),wo.call(this,[new xo([new Kt("",null)])]),this.first=n,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=n;var o=et(n,0);this.sel=Ti(o),this.history=new Fi(null),this.id=++Ao,this.modeOption=t,this.lineSep=r,this.direction="rtl"==i?"rtl":"ltr",this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),Pi(this,{from:o,to:o,text:e}),Ji(this,Ti(o),j)};Eo.prototype=Z(wo.prototype,{constructor:Eo,iter:function(e,t,n){n?this.iterN(e-this.first,t-e,n):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var n=0,r=0;r<t.length;++r)n+=t[r].height;this.insertInner(e-this.first,t,n)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=Ge(this,this.first,this.first+this.size);return!1===e?t:t.join(e||this.lineSeparator())},setValue:ni((function(e){var t=et(this.first,0),n=this.first+this.size-1;co(this,{from:t,to:et(n,Ke(this,n).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),this.cm&&zr(this.cm,0,0),Ji(this,Ti(t),j)})),replaceRange:function(e,t,n,r){mo(this,e,t=lt(this,t),n=n?lt(this,n):t,r)},getRange:function(e,t,n){var r=$e(this,lt(this,e),lt(this,t));return!1===n?r:r.join(n||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){if(Qe(this,e))return Ke(this,e)},getLineNumber:function(e){return Ye(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=Ke(this,e)),Wt(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return lt(this,e)},getCursor:function(e){var t=this.sel.primary();return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:ni((function(e,t,n){Zi(this,lt(this,"number"==typeof e?et(e,t||0):e),null,n)})),setSelection:ni((function(e,t,n){Zi(this,lt(this,e),lt(this,t||e),n)})),extendSelection:ni((function(e,t,n){Gi(this,lt(this,e),t&&lt(this,t),n)})),extendSelections:ni((function(e,t){Xi(this,st(this,e),t)})),extendSelectionsBy:ni((function(e,t){Xi(this,st(this,X(this.sel.ranges,e)),t)})),setSelections:ni((function(e,t,n){if(e.length){for(var r=[],i=0;i<e.length;i++)r[i]=new Ci(lt(this,e[i].anchor),lt(this,e[i].head));null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),Ji(this,Si(this.cm,r,t),n)}})),addSelection:ni((function(e,t,n){var r=this.sel.ranges.slice(0);r.push(new Ci(lt(this,e),lt(this,t||e))),Ji(this,Si(this.cm,r,r.length-1),n)})),getSelection:function(e){for(var t,n=this.sel.ranges,r=0;r<n.length;r++){var i=$e(this,n[r].from(),n[r].to());t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],n=this.sel.ranges,r=0;r<n.length;r++){var i=$e(this,n[r].from(),n[r].to());!1!==e&&(i=i.join(e||this.lineSeparator())),t[r]=i}return t},replaceSelection:function(e,t,n){for(var r=[],i=0;i<this.sel.ranges.length;i++)r[i]=e;this.replaceSelections(r,t,n||"+input")},replaceSelections:ni((function(e,t,n){for(var r=[],i=this.sel,o=0;o<i.ranges.length;o++){var a=i.ranges[o];r[o]={from:a.from(),to:a.to(),text:this.splitLines(e[o]),origin:n}}for(var l=t&&"end"!=t&&function(e,t,n){for(var r=[],i=et(e.first,0),o=i,a=0;a<t.length;a++){var l=t[a],s=Ni(l.from,i,o),c=Ni(Li(l),i,o);if(i=l.to,o=c,"around"==n){var u=e.sel.ranges[a],f=tt(u.head,u.anchor)<0;r[a]=new Ci(f?c:s,f?s:c)}else r[a]=new Ci(s,s)}return new ki(r,e.sel.primIndex)}(this,r,t),s=r.length-1;s>=0;s--)co(this,r[s]);l?Qi(this,l):this.cm&&Er(this.cm)})),undo:ni((function(){fo(this,"undo")})),redo:ni((function(){fo(this,"redo")})),undoSelection:ni((function(){fo(this,"undo",!0)})),redoSelection:ni((function(){fo(this,"redo",!0)})),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,n=0,r=0;r<e.done.length;r++)e.done[r].ranges||++t;for(var i=0;i<e.undone.length;i++)e.undone[i].ranges||++n;return{undo:t,redo:n}},clearHistory:function(){var e=this;this.history=new Fi(this.history.maxGeneration),Di(this,(function(t){return t.history=e.history}),!0)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Ki(this.history.done),undone:Ki(this.history.undone)}},setHistory:function(e){var t=this.history=new Fi(this.history.maxGeneration);t.done=Ki(e.done.slice(0),null,!0),t.undone=Ki(e.undone.slice(0),null,!0)},setGutterMarker:ni((function(e,t,n){return bo(this,e,"gutter",(function(e){var r=e.gutterMarkers||(e.gutterMarkers={});return r[t]=n,!n&&te(r)&&(e.gutterMarkers=null),!0}))})),clearGutter:ni((function(e){var t=this;this.iter((function(n){n.gutterMarkers&&n.gutterMarkers[e]&&bo(t,n,"gutter",(function(){return n.gutterMarkers[e]=null,te(n.gutterMarkers)&&(n.gutterMarkers=null),!0}))}))})),lineInfo:function(e){var t;if("number"==typeof e){if(!Qe(this,e))return null;if(t=e,!(e=Ke(this,e)))return null}else if(null==(t=Ye(e)))return null;return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},addLineClass:ni((function(e,t,n){return bo(this,e,"gutter"==t?"gutter":"class",(function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass";if(e[r]){if(S(n).test(e[r]))return!1;e[r]+=" "+n}else e[r]=n;return!0}))})),removeLineClass:ni((function(e,t,n){return bo(this,e,"gutter"==t?"gutter":"class",(function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[r];if(!i)return!1;if(null==n)e[r]=null;else{var o=i.match(S(n));if(!o)return!1;var a=o.index+o[0].length;e[r]=i.slice(0,o.index)+(o.index&&a!=i.length?" ":"")+i.slice(a)||null}return!0}))})),addLineWidget:ni((function(e,t,n){return function(e,t,n,r){var i=new ko(e,n,r),o=e.cm;return o&&i.noHScroll&&(o.display.alignWidgets=!0),bo(e,t,"widget",(function(t){var n=t.widgets||(t.widgets=[]);if(null==i.insertAt?n.push(i):n.splice(Math.min(n.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!Bt(e,t)){var r=qt(t)<e.scrollTop;Xe(t,t.height+wn(i)),r&&Ar(o,i.height),o.curOp.forceUpdate=!0}return!0})),o&&sn(o,"lineWidgetAdded",o,i,"number"==typeof t?t:Ye(t)),i}(this,e,t,n)})),removeLineWidget:function(e){e.clear()},markText:function(e,t,n){return Lo(this,lt(this,e),lt(this,t),n,n&&n.type||"range")},setBookmark:function(e,t){var n={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return Lo(this,e=lt(this,e),e,n,"bookmark")},findMarksAt:function(e){var t=[],n=Ke(this,(e=lt(this,e)).line).markedSpans;if(n)for(var r=0;r<n.length;++r){var i=n[r];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,n){e=lt(this,e),t=lt(this,t);var r=[],i=e.line;return this.iter(e.line,t.line+1,(function(o){var a=o.markedSpans;if(a)for(var l=0;l<a.length;l++){var s=a[l];null!=s.to&&i==e.line&&e.ch>=s.to||null==s.from&&i!=e.line||null!=s.from&&i==t.line&&s.from>=t.ch||n&&!n(s.marker)||r.push(s.marker.parent||s.marker)}++i})),r},getAllMarks:function(){var e=[];return this.iter((function(t){var n=t.markedSpans;if(n)for(var r=0;r<n.length;++r)null!=n[r].from&&e.push(n[r].marker)})),e},posFromIndex:function(e){var t,n=this.first,r=this.lineSeparator().length;return this.iter((function(i){var o=i.text.length+r;if(o>e)return t=e,!0;e-=o,++n})),lt(this,et(n,t))},indexFromPos:function(e){var t=(e=lt(this,e)).ch;if(e.line<this.first||e.ch<0)return 0;var n=this.lineSeparator().length;return this.iter(this.first,e.line,(function(e){t+=e.text.length+n})),t},copy:function(e){var t=new Eo(Ge(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,n=this.first+this.size;null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<n&&(n=e.to);var r=new Eo(Ge(this,t,n),e.mode||this.modeOption,t,this.lineSep,this.direction);return e.sharedHist&&(r.history=this.history),(this.linked||(this.linked=[])).push({doc:r,sharedHist:e.sharedHist}),r.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var n=0;n<t.length;n++){var r=t[n],i=r.find(),o=e.clipPos(i.from),a=e.clipPos(i.to);if(tt(o,a)){var l=Lo(e,o,a,r.primary,r.primary.type);r.markers.push(l),l.parent=r}}}(r,Oo(this)),r},unlinkDoc:function(e){if(e instanceof Ma&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t)if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),No(Oo(this));break}if(e.history==this.history){var n=[e.id];Di(e,(function(e){return n.push(e.id)}),!0),e.history=new Fi(null),e.history.done=Ki(this.history.done,n),e.history.undone=Ki(this.history.undone,n)}},iterLinkedDocs:function(e){Di(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):Ee(e)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:ni((function(e){var t;"rtl"!=e&&(e="ltr"),e!=this.direction&&(this.direction=e,this.iter((function(e){return e.order=null})),this.cm&&Jr(t=this.cm,(function(){_i(t),fr(t)})))}))}),Eo.prototype.eachLine=Eo.prototype.iter;var zo=0;function Po(e){var t=this;if(Do(t),!me(t,e)&&!kn(t.display,e)){be(e),a&&(zo=+new Date);var n=cr(t,e,!0),r=e.dataTransfer.files;if(n&&!t.isReadOnly())if(r&&r.length&&window.FileReader&&window.File)for(var i=r.length,o=Array(i),l=0,s=function(){++l==i&&ei(t,(function(){var e={from:n=lt(t.doc,n),to:n,text:t.doc.splitLines(o.filter((function(e){return null!=e})).join(t.doc.lineSeparator())),origin:"paste"};co(t.doc,e),Qi(t.doc,Ti(lt(t.doc,n),lt(t.doc,Li(e))))}))()},c=function(e,n){if(t.options.allowDropFileTypes&&-1==H(t.options.allowDropFileTypes,e.type))s();else{var r=new FileReader;r.onerror=function(){return s()},r.onload=function(){var e=r.result;/[\x00-\x08\x0e-\x1f]{2}/.test(e)||(o[n]=e),s()},r.readAsText(e)}},u=0;u<r.length;u++)c(r[u],u);else{if(t.state.draggingText&&t.doc.sel.contains(n)>-1)return t.state.draggingText(e),void setTimeout((function(){return t.display.input.focus()}),20);try{var f=e.dataTransfer.getData("Text");if(f){var d;if(t.state.draggingText&&!t.state.draggingText.copy&&(d=t.listSelections()),eo(t.doc,Ti(n,n)),d)for(var h=0;h<d.length;++h)mo(t.doc,"",d[h].anchor,d[h].head,"drag");t.replaceSelection(f,"around","paste"),t.display.input.focus()}}catch(e){}}}}function Do(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function Io(e){if(document.getElementsByClassName){for(var t=document.getElementsByClassName("CodeMirror"),n=[],r=0;r<t.length;r++){var i=t[r].CodeMirror;i&&n.push(i)}n.length&&n[0].operation((function(){for(var t=0;t<n.length;t++)e(n[t])}))}}var _o=!1;function Fo(){var e;_o||(fe(window,"resize",(function(){null==e&&(e=setTimeout((function(){e=null,Io(Wo)}),100))})),fe(window,"blur",(function(){return Io(Tr)})),_o=!0)}function Wo(e){var t=e.display;t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize()}for(var Ro={3:"Pause",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",145:"ScrollLock",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",224:"Mod",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},Ho=0;Ho<10;Ho++)Ro[Ho+48]=Ro[Ho+96]=String(Ho);for(var Bo=65;Bo<=90;Bo++)Ro[Bo]=String.fromCharCode(Bo);for(var jo=1;jo<=12;jo++)Ro[jo+111]=Ro[jo+63235]="F"+jo;var qo={};function Uo(e){var t,n,r,i,o=e.split(/-(?!$)/);e=o[o.length-1];for(var a=0;a<o.length-1;a++){var l=o[a];if(/^(cmd|meta|m)$/i.test(l))i=!0;else if(/^a(lt)?$/i.test(l))t=!0;else if(/^(c|ctrl|control)$/i.test(l))n=!0;else{if(!/^s(hift)?$/i.test(l))throw new Error("Unrecognized modifier name: "+l);r=!0}}return t&&(e="Alt-"+e),n&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),r&&(e="Shift-"+e),e}function Vo(e){var t={};for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];if(/^(name|fallthrough|(de|at)tach)$/.test(n))continue;if("..."==r){delete e[n];continue}for(var i=X(n.split(" "),Uo),o=0;o<i.length;o++){var a=void 0,l=void 0;o==i.length-1?(l=i.join(" "),a=r):(l=i.slice(0,o+1).join(" "),a="...");var s=t[l];if(s){if(s!=a)throw new Error("Inconsistent bindings for "+l)}else t[l]=a}delete e[n]}for(var c in t)e[c]=t[c];return e}function Ko(e,t,n,r){var i=(t=Yo(t)).call?t.call(e,r):t[e];if(!1===i)return"nothing";if("..."===i)return"multi";if(null!=i&&n(i))return"handled";if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return Ko(e,t.fallthrough,n,r);for(var o=0;o<t.fallthrough.length;o++){var a=Ko(e,t.fallthrough[o],n,r);if(a)return a}}}function $o(e){var t="string"==typeof e?e:Ro[e.keyCode];return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t}function Go(e,t,n){var r=e;return t.altKey&&"Alt"!=r&&(e="Alt-"+e),(k?t.metaKey:t.ctrlKey)&&"Ctrl"!=r&&(e="Ctrl-"+e),(k?t.ctrlKey:t.metaKey)&&"Mod"!=r&&(e="Cmd-"+e),!n&&t.shiftKey&&"Shift"!=r&&(e="Shift-"+e),e}function Xo(e,t){if(f&&34==e.keyCode&&e.char)return!1;var n=Ro[e.keyCode];return null!=n&&!e.altGraphKey&&(3==e.keyCode&&e.code&&(n=e.code),Go(n,e,t))}function Yo(e){return"string"==typeof e?qo[e]:e}function Zo(e,t){for(var n=e.doc.sel.ranges,r=[],i=0;i<n.length;i++){for(var o=t(n[i]);r.length&&tt(o.from,G(r).to)<=0;){var a=r.pop();if(tt(a.from,o.from)<0){o.from=a.from;break}}r.push(o)}Jr(e,(function(){for(var t=r.length-1;t>=0;t--)mo(e.doc,"",r[t].from,r[t].to,"+delete");Er(e)}))}function Qo(e,t,n){var r=ie(e.text,t+n,n);return r<0||r>e.text.length?null:r}function Jo(e,t,n){var r=Qo(e,t.ch,n);return null==r?null:new et(t.line,r,n<0?"after":"before")}function ea(e,t,n,r,i){if(e){"rtl"==t.doc.direction&&(i=-i);var o=ce(n,t.doc.direction);if(o){var a,l=i<0?G(o):o[0],s=i<0==(1==l.level)?"after":"before";if(l.level>0||"rtl"==t.doc.direction){var c=zn(t,n);a=i<0?n.text.length-1:0;var u=Pn(t,c,a).top;a=oe((function(e){return Pn(t,c,e).top==u}),i<0==(1==l.level)?l.from:l.to-1,a),"before"==s&&(a=Qo(n,a,1))}else a=i<0?l.to:l.from;return new et(r,a,s)}}return new et(r,i<0?n.text.length:0,i<0?"before":"after")}qo.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},qo.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},qo.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},qo.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},qo.default=y?qo.macDefault:qo.pcDefault;var ta={selectAll:lo,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),j)},killLine:function(e){return Zo(e,(function(t){if(t.empty()){var n=Ke(e.doc,t.head.line).text.length;return t.head.ch==n&&t.head.line<e.lastLine()?{from:t.head,to:et(t.head.line+1,0)}:{from:t.head,to:et(t.head.line,n)}}return{from:t.from(),to:t.to()}}))},deleteLine:function(e){return Zo(e,(function(t){return{from:et(t.from().line,0),to:lt(e.doc,et(t.to().line+1,0))}}))},delLineLeft:function(e){return Zo(e,(function(e){return{from:et(e.from().line,0),to:e.from()}}))},delWrappedLineLeft:function(e){return Zo(e,(function(t){var n=e.charCoords(t.head,"div").top+5;return{from:e.coordsChar({left:0,top:n},"div"),to:t.from()}}))},delWrappedLineRight:function(e){return Zo(e,(function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div");return{from:t.from(),to:r}}))},undo:function(e){return e.undo()},redo:function(e){return e.redo()},undoSelection:function(e){return e.undoSelection()},redoSelection:function(e){return e.redoSelection()},goDocStart:function(e){return e.extendSelection(et(e.firstLine(),0))},goDocEnd:function(e){return e.extendSelection(et(e.lastLine()))},goLineStart:function(e){return e.extendSelectionsBy((function(t){return na(e,t.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(e){return e.extendSelectionsBy((function(t){return ra(e,t.head)}),{origin:"+move",bias:1})},goLineEnd:function(e){return e.extendSelectionsBy((function(t){return function(e,t){var n=Ke(e.doc,t),r=function(e){for(var t;t=It(e);)e=t.find(1,!0).line;return e}(n);return r!=n&&(t=Ye(r)),ea(!0,e,n,t,-1)}(e,t.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div")}),U)},goLineLeft:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:n},"div")}),U)},goLineLeftSmart:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return r.ch<e.getLine(r.line).search(/\S/)?ra(e,t.head):r}),U)},goLineUp:function(e){return e.moveV(-1,"line")},goLineDown:function(e){return e.moveV(1,"line")},goPageUp:function(e){return e.moveV(-1,"page")},goPageDown:function(e){return e.moveV(1,"page")},goCharLeft:function(e){return e.moveH(-1,"char")},goCharRight:function(e){return e.moveH(1,"char")},goColumnLeft:function(e){return e.moveH(-1,"column")},goColumnRight:function(e){return e.moveH(1,"column")},goWordLeft:function(e){return e.moveH(-1,"word")},goGroupRight:function(e){return e.moveH(1,"group")},goGroupLeft:function(e){return e.moveH(-1,"group")},goWordRight:function(e){return e.moveH(1,"word")},delCharBefore:function(e){return e.deleteH(-1,"codepoint")},delCharAfter:function(e){return e.deleteH(1,"char")},delWordBefore:function(e){return e.deleteH(-1,"word")},delWordAfter:function(e){return e.deleteH(1,"word")},delGroupBefore:function(e){return e.deleteH(-1,"group")},delGroupAfter:function(e){return e.deleteH(1,"group")},indentAuto:function(e){return e.indentSelection("smart")},indentMore:function(e){return e.indentSelection("add")},indentLess:function(e){return e.indentSelection("subtract")},insertTab:function(e){return e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],n=e.listSelections(),r=e.options.tabSize,i=0;i<n.length;i++){var o=n[i].from(),a=W(e.getLine(o.line),o.ch,r);t.push($(r-a%r))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){return Jr(e,(function(){for(var t=e.listSelections(),n=[],r=0;r<t.length;r++)if(t[r].empty()){var i=t[r].head,o=Ke(e.doc,i.line).text;if(o)if(i.ch==o.length&&(i=new et(i.line,i.ch-1)),i.ch>0)i=new et(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),et(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var a=Ke(e.doc,i.line-1).text;a&&(i=new et(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+a.charAt(a.length-1),et(i.line-1,a.length-1),i,"+transpose"))}n.push(new Ci(i,i))}e.setSelections(n)}))},newlineAndIndent:function(e){return Jr(e,(function(){for(var t=e.listSelections(),n=t.length-1;n>=0;n--)e.replaceRange(e.doc.lineSeparator(),t[n].anchor,t[n].head,"+input");t=e.listSelections();for(var r=0;r<t.length;r++)e.indentLine(t[r].from().line,null,!0);Er(e)}))},openLine:function(e){return e.replaceSelection("\n","start")},toggleOverwrite:function(e){return e.toggleOverwrite()}};function na(e,t){var n=Ke(e.doc,t),r=Wt(n);return r!=n&&(t=Ye(r)),ea(!0,e,r,t,1)}function ra(e,t){var n=na(e,t.line),r=Ke(e.doc,n.line),i=ce(r,e.doc.direction);if(!i||0==i[0].level){var o=Math.max(n.ch,r.text.search(/\S/)),a=t.line==n.line&&t.ch<=o&&t.ch;return et(n.line,a?0:o,n.sticky)}return n}function ia(e,t,n){if("string"==typeof t&&!(t=ta[t]))return!1;e.display.input.ensurePolled();var r=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),n&&(e.display.shift=!1),i=t(e)!=B}finally{e.display.shift=r,e.state.suppressEdits=!1}return i}var oa=new R;function aa(e,t,n,r){var i=e.state.keySeq;if(i){if($o(t))return"handled";if(/\'$/.test(t)?e.state.keySeq=null:oa.set(50,(function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())})),la(e,i+" "+t,n,r))return!0}return la(e,t,n,r)}function la(e,t,n,r){var i=function(e,t,n){for(var r=0;r<e.state.keyMaps.length;r++){var i=Ko(t,e.state.keyMaps[r],n,e);if(i)return i}return e.options.extraKeys&&Ko(t,e.options.extraKeys,n,e)||Ko(t,e.options.keyMap,n,e)}(e,t,r);return"multi"==i&&(e.state.keySeq=t),"handled"==i&&sn(e,"keyHandled",e,t,n),"handled"!=i&&"multi"!=i||(be(n),wr(e)),!!i}function sa(e,t){var n=Xo(t,!0);return!!n&&(t.shiftKey&&!e.state.keySeq?aa(e,"Shift-"+n,t,(function(t){return ia(e,t,!0)}))||aa(e,n,t,(function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return ia(e,t)})):aa(e,n,t,(function(t){return ia(e,t)})))}var ca=null;function ua(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField()||(t.curOp.focus=z(),me(t,e)))){a&&l<11&&27==e.keyCode&&(e.returnValue=!1);var r=e.keyCode;t.display.shift=16==r||e.shiftKey;var i=sa(t,e);f&&(ca=i?r:null,i||88!=r||Pe||!(y?e.metaKey:e.ctrlKey)||t.replaceSelection("",null,"cut")),n&&!y&&!i&&46==r&&e.shiftKey&&!e.ctrlKey&&document.execCommand&&document.execCommand("cut"),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv;function n(e){18!=e.keyCode&&e.altKey||(L(t,"CodeMirror-crosshair"),he(document,"keyup",n),he(document,"mouseover",n))}P(t,"CodeMirror-crosshair"),fe(document,"keyup",n),fe(document,"mouseover",n)}(t)}}function fa(e){16==e.keyCode&&(this.doc.sel.shift=!1),me(this,e)}function da(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField()||kn(t.display,e)||me(t,e)||e.ctrlKey&&!e.altKey||y&&e.metaKey)){var n=e.keyCode,r=e.charCode;if(f&&n==ca)return ca=null,void be(e);if(!f||e.which&&!(e.which<10)||!sa(t,e)){var i=String.fromCharCode(null==r?n:r);"\b"!=i&&(function(e,t,n){return aa(e,"'"+n+"'",t,(function(t){return ia(e,t,!0)}))}(t,e,i)||t.display.input.onKeyPress(e))}}}var ha,pa,ma=function(e,t,n){this.time=e,this.pos=t,this.button=n};function ga(e){var t=this,n=t.display;if(!(me(t,e)||n.activeTouch&&n.input.supportsTouch()))if(n.input.ensurePolled(),n.shift=e.shiftKey,kn(n,e))s||(n.scroller.draggable=!1,setTimeout((function(){return n.scroller.draggable=!0}),100));else if(!ba(t,e)){var r=cr(t,e),i=Se(e),o=r?function(e,t){var n=+new Date;return pa&&pa.compare(n,e,t)?(ha=pa=null,"triple"):ha&&ha.compare(n,e,t)?(pa=new ma(n,e,t),ha=null,"double"):(ha=new ma(n,e,t),pa=null,"single")}(r,i):"single";window.focus(),1==i&&t.state.selectingText&&t.state.selectingText(e),r&&function(e,t,n,r,i){var o="Click";return"double"==r?o="Double"+o:"triple"==r&&(o="Triple"+o),aa(e,Go(o=(1==t?"Left":2==t?"Middle":"Right")+o,i),i,(function(t){if("string"==typeof t&&(t=ta[t]),!t)return!1;var r=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),r=t(e,n)!=B}finally{e.state.suppressEdits=!1}return r}))}(t,i,r,o,e)||(1==i?r?function(e,t,n,r){a?setTimeout(_(kr,e),0):e.curOp.focus=z();var i,o=function(e,t,n){var r=e.getOption("configureMouse"),i=r?r(e,t,n):{};if(null==i.unit){var o=b?n.shiftKey&&n.metaKey:n.altKey;i.unit=o?"rectangle":"single"==t?"char":"double"==t?"word":"line"}return(null==i.extend||e.doc.extend)&&(i.extend=e.doc.extend||n.shiftKey),null==i.addNew&&(i.addNew=y?n.metaKey:n.ctrlKey),null==i.moveOnDrag&&(i.moveOnDrag=!(y?n.altKey:n.ctrlKey)),i}(e,n,r),c=e.doc.sel;e.options.dragDrop&&Me&&!e.isReadOnly()&&"single"==n&&(i=c.contains(t))>-1&&(tt((i=c.ranges[i]).from(),t)<0||t.xRel>0)&&(tt(i.to(),t)>0||t.xRel<0)?function(e,t,n,r){var i=e.display,o=!1,c=ei(e,(function(t){s&&(i.scroller.draggable=!1),e.state.draggingText=!1,he(i.wrapper.ownerDocument,"mouseup",c),he(i.wrapper.ownerDocument,"mousemove",u),he(i.scroller,"dragstart",f),he(i.scroller,"drop",c),o||(be(t),r.addNew||Gi(e.doc,n,null,null,r.extend),s&&!d||a&&9==l?setTimeout((function(){i.wrapper.ownerDocument.body.focus({preventScroll:!0}),i.input.focus()}),20):i.input.focus())})),u=function(e){o=o||Math.abs(t.clientX-e.clientX)+Math.abs(t.clientY-e.clientY)>=10},f=function(){return o=!0};s&&(i.scroller.draggable=!0),e.state.draggingText=c,c.copy=!r.moveOnDrag,i.scroller.dragDrop&&i.scroller.dragDrop(),fe(i.wrapper.ownerDocument,"mouseup",c),fe(i.wrapper.ownerDocument,"mousemove",u),fe(i.scroller,"dragstart",f),fe(i.scroller,"drop",c),Cr(e),setTimeout((function(){return i.input.focus()}),20)}(e,r,t,o):function(e,t,n,r){var i=e.display,o=e.doc;be(t);var a,l,s=o.sel,c=s.ranges;if(r.addNew&&!r.extend?(l=o.sel.contains(n),a=l>-1?c[l]:new Ci(n,n)):(a=o.sel.primary(),l=o.sel.primIndex),"rectangle"==r.unit)r.addNew||(a=new Ci(n,n)),n=cr(e,t,!0,!0),l=-1;else{var u=va(e,n,r.unit);a=r.extend?$i(a,u.anchor,u.head,r.extend):u}r.addNew?-1==l?(l=c.length,Ji(o,Si(e,c.concat([a]),l),{scroll:!1,origin:"*mouse"})):c.length>1&&c[l].empty()&&"char"==r.unit&&!r.extend?(Ji(o,Si(e,c.slice(0,l).concat(c.slice(l+1)),0),{scroll:!1,origin:"*mouse"}),s=o.sel):Yi(o,l,a,q):(l=0,Ji(o,new ki([a],0),q),s=o.sel);var f=n;function d(t){if(0!=tt(f,t))if(f=t,"rectangle"==r.unit){for(var i=[],c=e.options.tabSize,u=W(Ke(o,n.line).text,n.ch,c),d=W(Ke(o,t.line).text,t.ch,c),h=Math.min(u,d),p=Math.max(u,d),m=Math.min(n.line,t.line),g=Math.min(e.lastLine(),Math.max(n.line,t.line));m<=g;m++){var v=Ke(o,m).text,y=V(v,h,c);h==p?i.push(new Ci(et(m,y),et(m,y))):v.length>y&&i.push(new Ci(et(m,y),et(m,V(v,p,c))))}i.length||i.push(new Ci(n,n)),Ji(o,Si(e,s.ranges.slice(0,l).concat(i),l),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var b,x=a,w=va(e,t,r.unit),k=x.anchor;tt(w.anchor,k)>0?(b=w.head,k=ot(x.from(),w.anchor)):(b=w.anchor,k=it(x.to(),w.head));var C=s.ranges.slice(0);C[l]=function(e,t){var n=t.anchor,r=t.head,i=Ke(e.doc,n.line);if(0==tt(n,r)&&n.sticky==r.sticky)return t;var o=ce(i);if(!o)return t;var a=le(o,n.ch,n.sticky),l=o[a];if(l.from!=n.ch&&l.to!=n.ch)return t;var s,c=a+(l.from==n.ch==(1!=l.level)?0:1);if(0==c||c==o.length)return t;if(r.line!=n.line)s=(r.line-n.line)*("ltr"==e.doc.direction?1:-1)>0;else{var u=le(o,r.ch,r.sticky),f=u-a||(r.ch-n.ch)*(1==l.level?-1:1);s=u==c-1||u==c?f<0:f>0}var d=o[c+(s?-1:0)],h=s==(1==d.level),p=h?d.from:d.to,m=h?"after":"before";return n.ch==p&&n.sticky==m?t:new Ci(new et(n.line,p,m),r)}(e,new Ci(lt(o,k),b)),Ji(o,Si(e,C,l),q)}}var h=i.wrapper.getBoundingClientRect(),p=0;function m(t){e.state.selectingText=!1,p=1/0,t&&(be(t),i.input.focus()),he(i.wrapper.ownerDocument,"mousemove",g),he(i.wrapper.ownerDocument,"mouseup",v),o.history.lastSelOrigin=null}var g=ei(e,(function(t){0!==t.buttons&&Se(t)?function t(n){var a=++p,l=cr(e,n,!0,"rectangle"==r.unit);if(l)if(0!=tt(l,f)){e.curOp.focus=z(),d(l);var s=Or(i,o);(l.line>=s.to||l.line<s.from)&&setTimeout(ei(e,(function(){p==a&&t(n)})),150)}else{var c=n.clientY<h.top?-20:n.clientY>h.bottom?20:0;c&&setTimeout(ei(e,(function(){p==a&&(i.scroller.scrollTop+=c,t(n))})),50)}}(t):m(t)})),v=ei(e,m);e.state.selectingText=v,fe(i.wrapper.ownerDocument,"mousemove",g),fe(i.wrapper.ownerDocument,"mouseup",v)}(e,r,t,o)}(t,r,o,e):Ce(e)==n.scroller&&be(e):2==i?(r&&Gi(t.doc,r),setTimeout((function(){return n.input.focus()}),20)):3==i&&(C?t.display.input.onContextMenu(e):Cr(t)))}}function va(e,t,n){if("char"==n)return new Ci(t,t);if("word"==n)return e.findWordAt(t);if("line"==n)return new Ci(et(t.line,0),lt(e.doc,et(t.line+1,0)));var r=n(e,t);return new Ci(r.from,r.to)}function ya(e,t,n,r){var i,o;if(t.touches)i=t.touches[0].clientX,o=t.touches[0].clientY;else try{i=t.clientX,o=t.clientY}catch(e){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;r&&be(t);var a=e.display,l=a.lineDiv.getBoundingClientRect();if(o>l.bottom||!ve(e,n))return we(t);o-=l.top-a.viewOffset;for(var s=0;s<e.display.gutterSpecs.length;++s){var c=a.gutters.childNodes[s];if(c&&c.getBoundingClientRect().right>=i)return pe(e,n,e,Ze(e.doc,o),e.display.gutterSpecs[s].className,t),we(t)}}function ba(e,t){return ya(e,t,"gutterClick",!0)}function xa(e,t){kn(e.display,t)||function(e,t){return!!ve(e,"gutterContextMenu")&&ya(e,t,"gutterContextMenu",!1)}(e,t)||me(e,t,"contextmenu")||C||e.display.input.onContextMenu(t)}function wa(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Hn(e)}ma.prototype.compare=function(e,t,n){return this.time+400>e&&0==tt(t,this.pos)&&n==this.button};var ka={toString:function(){return"CodeMirror.Init"}},Ca={},Sa={};function Ta(e,t,n){if(!t!=!(n&&n!=ka)){var r=e.display.dragFunctions,i=t?fe:he;i(e.display.scroller,"dragstart",r.start),i(e.display.scroller,"dragenter",r.enter),i(e.display.scroller,"dragover",r.over),i(e.display.scroller,"dragleave",r.leave),i(e.display.scroller,"drop",r.drop)}}function La(e){e.options.lineWrapping?(P(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(L(e.display.wrapper,"CodeMirror-wrap"),Vt(e)),sr(e),fr(e),Hn(e),setTimeout((function(){return Br(e)}),100)}function Ma(e,t){var n=this;if(!(this instanceof Ma))return new Ma(e,t);this.options=t=t?F(t):{},F(Ca,t,!1);var r=t.value;"string"==typeof r?r=new Eo(r,t.mode,null,t.lineSeparator,t.direction):t.mode&&(r.modeOption=t.mode),this.doc=r;var i=new Ma.inputStyles[t.inputStyle](this),o=this.display=new gi(e,r,i,t);for(var c in o.wrapper.CodeMirror=this,wa(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),Ur(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:-1,cutIncoming:-1,selectingText:!1,draggingText:!1,highlight:new R,keySeq:null,specialChars:null},t.autofocus&&!v&&o.input.focus(),a&&l<11&&setTimeout((function(){return n.display.input.reset(!0)}),20),function(e){var t=e.display;fe(t.scroller,"mousedown",ei(e,ga)),fe(t.scroller,"dblclick",a&&l<11?ei(e,(function(t){if(!me(e,t)){var n=cr(e,t);if(n&&!ba(e,t)&&!kn(e.display,t)){be(t);var r=e.findWordAt(n);Gi(e.doc,r.anchor,r.head)}}})):function(t){return me(e,t)||be(t)}),fe(t.scroller,"contextmenu",(function(t){return xa(e,t)})),fe(t.input.getField(),"contextmenu",(function(n){t.scroller.contains(n.target)||xa(e,n)}));var n,r={end:0};function i(){t.activeTouch&&(n=setTimeout((function(){return t.activeTouch=null}),1e3),(r=t.activeTouch).end=+new Date)}function o(e,t){if(null==t.left)return!0;var n=t.left-e.left,r=t.top-e.top;return n*n+r*r>400}fe(t.scroller,"touchstart",(function(i){if(!me(e,i)&&!function(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}(i)&&!ba(e,i)){t.input.ensurePolled(),clearTimeout(n);var o=+new Date;t.activeTouch={start:o,moved:!1,prev:o-r.end<=300?r:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}})),fe(t.scroller,"touchmove",(function(){t.activeTouch&&(t.activeTouch.moved=!0)})),fe(t.scroller,"touchend",(function(n){var r=t.activeTouch;if(r&&!kn(t,n)&&null!=r.left&&!r.moved&&new Date-r.start<300){var a,l=e.coordsChar(t.activeTouch,"page");a=!r.prev||o(r,r.prev)?new Ci(l,l):!r.prev.prev||o(r,r.prev.prev)?e.findWordAt(l):new Ci(et(l.line,0),lt(e.doc,et(l.line+1,0))),e.setSelection(a.anchor,a.head),e.focus(),be(n)}i()})),fe(t.scroller,"touchcancel",i),fe(t.scroller,"scroll",(function(){t.scroller.clientHeight&&(Ir(e,t.scroller.scrollTop),Fr(e,t.scroller.scrollLeft,!0),pe(e,"scroll",e))})),fe(t.scroller,"mousewheel",(function(t){return wi(e,t)})),fe(t.scroller,"DOMMouseScroll",(function(t){return wi(e,t)})),fe(t.wrapper,"scroll",(function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0})),t.dragFunctions={enter:function(t){me(e,t)||ke(t)},over:function(t){me(e,t)||(function(e,t){var n=cr(e,t);if(n){var r=document.createDocumentFragment();yr(e,n,r),e.display.dragCursor||(e.display.dragCursor=N("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),O(e.display.dragCursor,r)}}(e,t),ke(t))},start:function(t){return function(e,t){if(a&&(!e.state.draggingText||+new Date-zo<100))ke(t);else if(!me(e,t)&&!kn(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!d)){var n=N("img",null,null,"position: fixed; left: 0; top: 0;");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",f&&(n.width=n.height=1,e.display.wrapper.appendChild(n),n._top=n.offsetTop),t.dataTransfer.setDragImage(n,0,0),f&&n.parentNode.removeChild(n)}}(e,t)},drop:ei(e,Po),leave:function(t){me(e,t)||Do(e)}};var s=t.input.getField();fe(s,"keyup",(function(t){return fa.call(e,t)})),fe(s,"keydown",ei(e,ua)),fe(s,"keypress",ei(e,da)),fe(s,"focus",(function(t){return Sr(e,t)})),fe(s,"blur",(function(t){return Tr(e,t)}))}(this),Fo(),Kr(this),this.curOp.forceUpdate=!0,Ii(this,r),t.autofocus&&!v||this.hasFocus()?setTimeout((function(){n.hasFocus()&&!n.state.focused&&Sr(n)}),20):Tr(this),Sa)Sa.hasOwnProperty(c)&&Sa[c](this,t[c],ka);di(this),t.finishInit&&t.finishInit(this);for(var u=0;u<Oa.length;++u)Oa[u](this);$r(this),s&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(o.lineDiv).textRendering&&(o.lineDiv.style.textRendering="auto")}Ma.defaults=Ca,Ma.optionHandlers=Sa;var Oa=[];function Na(e,t,n,r){var i,o=e.doc;null==n&&(n="add"),"smart"==n&&(o.mode.indent?i=ht(e,t).state:n="prev");var a=e.options.tabSize,l=Ke(o,t),s=W(l.text,null,a);l.stateAfter&&(l.stateAfter=null);var c,u=l.text.match(/^\s*/)[0];if(r||/\S/.test(l.text)){if("smart"==n&&((c=o.mode.indent(i,l.text.slice(u.length),l.text))==B||c>150)){if(!r)return;n="prev"}}else c=0,n="not";"prev"==n?c=t>o.first?W(Ke(o,t-1).text,null,a):0:"add"==n?c=s+e.options.indentUnit:"subtract"==n?c=s-e.options.indentUnit:"number"==typeof n&&(c=s+n),c=Math.max(0,c);var f="",d=0;if(e.options.indentWithTabs)for(var h=Math.floor(c/a);h;--h)d+=a,f+="\t";if(d<c&&(f+=$(c-d)),f!=u)return mo(o,f,et(t,0),et(t,u.length),"+input"),l.stateAfter=null,!0;for(var p=0;p<o.sel.ranges.length;p++){var m=o.sel.ranges[p];if(m.head.line==t&&m.head.ch<u.length){var g=et(t,u.length);Yi(o,p,new Ci(g,g));break}}}Ma.defineInitHook=function(e){return Oa.push(e)};var Aa=null;function Ea(e){Aa=e}function za(e,t,n,r,i){var o=e.doc;e.display.shift=!1,r||(r=o.sel);var a=+new Date-200,l="paste"==i||e.state.pasteIncoming>a,s=Ee(t),c=null;if(l&&r.ranges.length>1)if(Aa&&Aa.text.join("\n")==t){if(r.ranges.length%Aa.text.length==0){c=[];for(var u=0;u<Aa.text.length;u++)c.push(o.splitLines(Aa.text[u]))}}else s.length==r.ranges.length&&e.options.pasteLinesPerSelection&&(c=X(s,(function(e){return[e]})));for(var f=e.curOp.updateInput,d=r.ranges.length-1;d>=0;d--){var h=r.ranges[d],p=h.from(),m=h.to();h.empty()&&(n&&n>0?p=et(p.line,p.ch-n):e.state.overwrite&&!l?m=et(m.line,Math.min(Ke(o,m.line).text.length,m.ch+G(s).length)):l&&Aa&&Aa.lineWise&&Aa.text.join("\n")==s.join("\n")&&(p=m=et(p.line,0)));var g={from:p,to:m,text:c?c[d%c.length]:s,origin:i||(l?"paste":e.state.cutIncoming>a?"cut":"+input")};co(e.doc,g),sn(e,"inputRead",e,g)}t&&!l&&Da(e,t),Er(e),e.curOp.updateInput<2&&(e.curOp.updateInput=f),e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=-1}function Pa(e,t){var n=e.clipboardData&&e.clipboardData.getData("Text");if(n)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||Jr(t,(function(){return za(t,n,0,null,"paste")})),!0}function Da(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var n=e.doc.sel,r=n.ranges.length-1;r>=0;r--){var i=n.ranges[r];if(!(i.head.ch>100||r&&n.ranges[r-1].head.line==i.head.line)){var o=e.getModeAt(i.head),a=!1;if(o.electricChars){for(var l=0;l<o.electricChars.length;l++)if(t.indexOf(o.electricChars.charAt(l))>-1){a=Na(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(Ke(e.doc,i.head.line).text.slice(0,i.head.ch))&&(a=Na(e,i.head.line,"smart"));a&&sn(e,"electricInput",e,i.head.line)}}}function Ia(e){for(var t=[],n=[],r=0;r<e.doc.sel.ranges.length;r++){var i=e.doc.sel.ranges[r].head.line,o={anchor:et(i,0),head:et(i+1,0)};n.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:n}}function _a(e,t,n,r){e.setAttribute("autocorrect",n?"":"off"),e.setAttribute("autocapitalize",r?"":"off"),e.setAttribute("spellcheck",!!t)}function Fa(){var e=N("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),t=N("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return s?e.style.width="1000px":e.setAttribute("wrap","off"),m&&(e.style.border="1px solid black"),_a(e),t}function Wa(e,t,n,r,i){var o=t,a=n,l=Ke(e,t.line),s=i&&"rtl"==e.direction?-n:n;function c(o){var a,c;if("codepoint"==r){var u=l.text.charCodeAt(t.ch+(r>0?0:-1));a=isNaN(u)?null:new et(t.line,Math.max(0,Math.min(l.text.length,t.ch+n*(u>=55296&&u<56320?2:1))),-n)}else a=i?function(e,t,n,r){var i=ce(t,e.doc.direction);if(!i)return Jo(t,n,r);n.ch>=t.text.length?(n.ch=t.text.length,n.sticky="before"):n.ch<=0&&(n.ch=0,n.sticky="after");var o=le(i,n.ch,n.sticky),a=i[o];if("ltr"==e.doc.direction&&a.level%2==0&&(r>0?a.to>n.ch:a.from<n.ch))return Jo(t,n,r);var l,s=function(e,n){return Qo(t,e instanceof et?e.ch:e,n)},c=function(n){return e.options.lineWrapping?(l=l||zn(e,t),Qn(e,t,l,n)):{begin:0,end:t.text.length}},u=c("before"==n.sticky?s(n,-1):n.ch);if("rtl"==e.doc.direction||1==a.level){var f=1==a.level==r<0,d=s(n,f?1:-1);if(null!=d&&(f?d<=a.to&&d<=u.end:d>=a.from&&d>=u.begin)){var h=f?"before":"after";return new et(n.line,d,h)}}var p=function(e,t,r){for(var o=function(e,t){return t?new et(n.line,s(e,1),"before"):new et(n.line,e,"after")};e>=0&&e<i.length;e+=t){var a=i[e],l=t>0==(1!=a.level),c=l?r.begin:s(r.end,-1);if(a.from<=c&&c<a.to)return o(c,l);if(c=l?a.from:s(a.to,-1),r.begin<=c&&c<r.end)return o(c,l)}},m=p(o+r,r,u);if(m)return m;var g=r>0?u.end:s(u.begin,-1);return null==g||r>0&&g==t.text.length||!(m=p(r>0?0:i.length-1,r,c(g)))?null:m}(e.cm,l,t,n):Jo(l,t,n);if(null==a){if(o||(c=t.line+s)<e.first||c>=e.first+e.size||(t=new et(c,t.ch,t.sticky),!(l=Ke(e,c))))return!1;t=ea(i,e.cm,l,t.line,s)}else t=a;return!0}if("char"==r||"codepoint"==r)c();else if("column"==r)c(!0);else if("word"==r||"group"==r)for(var u=null,f="group"==r,d=e.cm&&e.cm.getHelper(t,"wordChars"),h=!0;!(n<0)||c(!h);h=!1){var p=l.text.charAt(t.ch)||"\n",m=ee(p,d)?"w":f&&"\n"==p?"n":!f||/\s/.test(p)?null:"p";if(!f||h||m||(m="s"),u&&u!=m){n<0&&(n=1,c(),t.sticky="after");break}if(m&&(u=m),n>0&&!c(!h))break}var g=oo(e,t,o,a,!0);return nt(o,g)&&(g.hitSide=!0),g}function Ra(e,t,n,r){var i,o,a=e.doc,l=t.left;if("page"==r){var s=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),c=Math.max(s-.5*rr(e.display),3);i=(n>0?t.bottom:t.top)+n*c}else"line"==r&&(i=n>0?t.bottom+3:t.top-3);for(;(o=Yn(e,l,i)).outside;){if(n<0?i<=0:i>=a.height){o.hitSide=!0;break}i+=5*n}return o}var Ha=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new R,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};function Ba(e,t){var n=En(e,t.line);if(!n||n.hidden)return null;var r=Ke(e.doc,t.line),i=Nn(n,r,t.line),o=ce(r,e.doc.direction),a="left";o&&(a=le(o,t.ch)%2?"right":"left");var l=_n(i.map,t.ch,a);return l.offset="right"==l.collapse?l.end:l.start,l}function ja(e,t){return t&&(e.bad=!0),e}function qa(e,t,n){var r;if(t==e.display.lineDiv){if(!(r=e.display.lineDiv.childNodes[n]))return ja(e.clipPos(et(e.display.viewTo-1)),!0);t=null,n=0}else for(r=t;;r=r.parentNode){if(!r||r==e.display.lineDiv)return null;if(r.parentNode&&r.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==r)return Ua(o,t,n)}}function Ua(e,t,n){var r=e.text.firstChild,i=!1;if(!t||!E(r,t))return ja(et(Ye(e.line),0),!0);if(t==r&&(i=!0,t=r.childNodes[n],n=0,!t)){var o=e.rest?G(e.rest):e.line;return ja(et(Ye(o),o.text.length),i)}var a=3==t.nodeType?t:null,l=t;for(a||1!=t.childNodes.length||3!=t.firstChild.nodeType||(a=t.firstChild,n&&(n=a.nodeValue.length));l.parentNode!=r;)l=l.parentNode;var s=e.measure,c=s.maps;function u(t,n,r){for(var i=-1;i<(c?c.length:0);i++)for(var o=i<0?s.map:c[i],a=0;a<o.length;a+=3){var l=o[a+2];if(l==t||l==n){var u=Ye(i<0?e.line:e.rest[i]),f=o[a]+r;return(r<0||l!=t)&&(f=o[a+(r?1:0)]),et(u,f)}}}var f=u(a,l,n);if(f)return ja(f,i);for(var d=l.nextSibling,h=a?a.nodeValue.length-n:0;d;d=d.nextSibling){if(f=u(d,d.firstChild,0))return ja(et(f.line,f.ch-h),i);h+=d.textContent.length}for(var p=l.previousSibling,m=n;p;p=p.previousSibling){if(f=u(p,p.firstChild,-1))return ja(et(f.line,f.ch+m),i);m+=p.textContent.length}}Ha.prototype.init=function(e){var t=this,n=this,r=n.cm,i=n.div=e.lineDiv;function o(e){for(var t=e.target;t;t=t.parentNode){if(t==i)return!0;if(/\bCodeMirror-(?:line)?widget\b/.test(t.className))break}return!1}function a(e){if(o(e)&&!me(r,e)){if(r.somethingSelected())Ea({lineWise:!1,text:r.getSelections()}),"cut"==e.type&&r.replaceSelection("",null,"cut");else{if(!r.options.lineWiseCopyCut)return;var t=Ia(r);Ea({lineWise:!0,text:t.text}),"cut"==e.type&&r.operation((function(){r.setSelections(t.ranges,0,j),r.replaceSelection("",null,"cut")}))}if(e.clipboardData){e.clipboardData.clearData();var a=Aa.text.join("\n");if(e.clipboardData.setData("Text",a),e.clipboardData.getData("Text")==a)return void e.preventDefault()}var l=Fa(),s=l.firstChild;r.display.lineSpace.insertBefore(l,r.display.lineSpace.firstChild),s.value=Aa.text.join("\n");var c=document.activeElement;I(s),setTimeout((function(){r.display.lineSpace.removeChild(l),c.focus(),c==i&&n.showPrimarySelection()}),50)}}_a(i,r.options.spellcheck,r.options.autocorrect,r.options.autocapitalize),fe(i,"paste",(function(e){!o(e)||me(r,e)||Pa(e,r)||l<=11&&setTimeout(ei(r,(function(){return t.updateFromDOM()})),20)})),fe(i,"compositionstart",(function(e){t.composing={data:e.data,done:!1}})),fe(i,"compositionupdate",(function(e){t.composing||(t.composing={data:e.data,done:!1})})),fe(i,"compositionend",(function(e){t.composing&&(e.data!=t.composing.data&&t.readFromDOMSoon(),t.composing.done=!0)})),fe(i,"touchstart",(function(){return n.forceCompositionEnd()})),fe(i,"input",(function(){t.composing||t.readFromDOMSoon()})),fe(i,"copy",a),fe(i,"cut",a)},Ha.prototype.screenReaderLabelChanged=function(e){e?this.div.setAttribute("aria-label",e):this.div.removeAttribute("aria-label")},Ha.prototype.prepareSelection=function(){var e=vr(this.cm,!1);return e.focus=document.activeElement==this.div,e},Ha.prototype.showSelection=function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},Ha.prototype.getSelection=function(){return this.cm.display.wrapper.ownerDocument.getSelection()},Ha.prototype.showPrimarySelection=function(){var e=this.getSelection(),t=this.cm,r=t.doc.sel.primary(),i=r.from(),o=r.to();if(t.display.viewTo==t.display.viewFrom||i.line>=t.display.viewTo||o.line<t.display.viewFrom)e.removeAllRanges();else{var a=qa(t,e.anchorNode,e.anchorOffset),l=qa(t,e.focusNode,e.focusOffset);if(!a||a.bad||!l||l.bad||0!=tt(ot(a,l),i)||0!=tt(it(a,l),o)){var s=t.display.view,c=i.line>=t.display.viewFrom&&Ba(t,i)||{node:s[0].measure.map[2],offset:0},u=o.line<t.display.viewTo&&Ba(t,o);if(!u){var f=s[s.length-1].measure,d=f.maps?f.maps[f.maps.length-1]:f.map;u={node:d[d.length-1],offset:d[d.length-2]-d[d.length-3]}}if(c&&u){var h,p=e.rangeCount&&e.getRangeAt(0);try{h=T(c.node,c.offset,u.offset,u.node)}catch(e){}h&&(!n&&t.state.focused?(e.collapse(c.node,c.offset),h.collapsed||(e.removeAllRanges(),e.addRange(h))):(e.removeAllRanges(),e.addRange(h)),p&&null==e.anchorNode?e.addRange(p):n&&this.startGracePeriod()),this.rememberSelection()}else e.removeAllRanges()}}},Ha.prototype.startGracePeriod=function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation((function(){return e.cm.curOp.selectionChanged=!0}))}),20)},Ha.prototype.showMultipleSelections=function(e){O(this.cm.display.cursorDiv,e.cursors),O(this.cm.display.selectionDiv,e.selection)},Ha.prototype.rememberSelection=function(){var e=this.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},Ha.prototype.selectionInEditor=function(){var e=this.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return E(this.div,t)},Ha.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()&&document.activeElement==this.div||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Ha.prototype.blur=function(){this.div.blur()},Ha.prototype.getField=function(){return this.div},Ha.prototype.supportsTouch=function(){return!0},Ha.prototype.receivedFocus=function(){var e=this;this.selectionInEditor()?this.pollSelection():Jr(this.cm,(function(){return e.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,(function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))}))},Ha.prototype.selectionChanged=function(){var e=this.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},Ha.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var e=this.getSelection(),t=this.cm;if(g&&u&&this.cm.display.gutterSpecs.length&&function(e){for(var t=e;t;t=t.parentNode)if(/CodeMirror-gutter-wrapper/.test(t.className))return!0;return!1}(e.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var n=qa(t,e.anchorNode,e.anchorOffset),r=qa(t,e.focusNode,e.focusOffset);n&&r&&Jr(t,(function(){Ji(t.doc,Ti(n,r),j),(n.bad||r.bad)&&(t.curOp.selectionChanged=!0)}))}}},Ha.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var e,t,n,r=this.cm,i=r.display,o=r.doc.sel.primary(),a=o.from(),l=o.to();if(0==a.ch&&a.line>r.firstLine()&&(a=et(a.line-1,Ke(r.doc,a.line-1).length)),l.ch==Ke(r.doc,l.line).text.length&&l.line<r.lastLine()&&(l=et(l.line+1,0)),a.line<i.viewFrom||l.line>i.viewTo-1)return!1;a.line==i.viewFrom||0==(e=ur(r,a.line))?(t=Ye(i.view[0].line),n=i.view[0].node):(t=Ye(i.view[e].line),n=i.view[e-1].node.nextSibling);var s,c,u=ur(r,l.line);if(u==i.view.length-1?(s=i.viewTo-1,c=i.lineDiv.lastChild):(s=Ye(i.view[u+1].line)-1,c=i.view[u+1].node.previousSibling),!n)return!1;for(var f=r.doc.splitLines(function(e,t,n,r,i){var o="",a=!1,l=e.doc.lineSeparator(),s=!1;function c(){a&&(o+=l,s&&(o+=l),a=s=!1)}function u(e){e&&(c(),o+=e)}function f(t){if(1==t.nodeType){var n=t.getAttribute("cm-text");if(n)return void u(n);var o,d=t.getAttribute("cm-marker");if(d){var h=e.findMarks(et(r,0),et(i+1,0),(g=+d,function(e){return e.id==g}));return void(h.length&&(o=h[0].find(0))&&u($e(e.doc,o.from,o.to).join(l)))}if("false"==t.getAttribute("contenteditable"))return;var p=/^(pre|div|p|li|table|br)$/i.test(t.nodeName);if(!/^br$/i.test(t.nodeName)&&0==t.textContent.length)return;p&&c();for(var m=0;m<t.childNodes.length;m++)f(t.childNodes[m]);/^(pre|p)$/i.test(t.nodeName)&&(s=!0),p&&(a=!0)}else 3==t.nodeType&&u(t.nodeValue.replace(/\u200b/g,"").replace(/\u00a0/g," "));var g}for(;f(t),t!=n;)t=t.nextSibling,s=!1;return o}(r,n,c,t,s)),d=$e(r.doc,et(t,0),et(s,Ke(r.doc,s).text.length));f.length>1&&d.length>1;)if(G(f)==G(d))f.pop(),d.pop(),s--;else{if(f[0]!=d[0])break;f.shift(),d.shift(),t++}for(var h=0,p=0,m=f[0],g=d[0],v=Math.min(m.length,g.length);h<v&&m.charCodeAt(h)==g.charCodeAt(h);)++h;for(var y=G(f),b=G(d),x=Math.min(y.length-(1==f.length?h:0),b.length-(1==d.length?h:0));p<x&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)++p;if(1==f.length&&1==d.length&&t==a.line)for(;h&&h>a.ch&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)h--,p++;f[f.length-1]=y.slice(0,y.length-p).replace(/^\u200b+/,""),f[0]=f[0].slice(h).replace(/\u200b+$/,"");var w=et(t,h),k=et(s,d.length?G(d).length-p:0);return f.length>1||f[0]||tt(w,k)?(mo(r.doc,f,w,k,"+input"),!0):void 0},Ha.prototype.ensurePolled=function(){this.forceCompositionEnd()},Ha.prototype.reset=function(){this.forceCompositionEnd()},Ha.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Ha.prototype.readFromDOMSoon=function(){var e=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout((function(){if(e.readDOMTimeout=null,e.composing){if(!e.composing.done)return;e.composing=null}e.updateFromDOM()}),80))},Ha.prototype.updateFromDOM=function(){var e=this;!this.cm.isReadOnly()&&this.pollContent()||Jr(this.cm,(function(){return fr(e.cm)}))},Ha.prototype.setUneditable=function(e){e.contentEditable="false"},Ha.prototype.onKeyPress=function(e){0==e.charCode||this.composing||(e.preventDefault(),this.cm.isReadOnly()||ei(this.cm,za)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0))},Ha.prototype.readOnlyChanged=function(e){this.div.contentEditable=String("nocursor"!=e)},Ha.prototype.onContextMenu=function(){},Ha.prototype.resetPosition=function(){},Ha.prototype.needsContentAttribute=!0;var Va=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new R,this.hasSelection=!1,this.composing=null};Va.prototype.init=function(e){var t=this,n=this,r=this.cm;this.createField(e);var i=this.textarea;function o(e){if(!me(r,e)){if(r.somethingSelected())Ea({lineWise:!1,text:r.getSelections()});else{if(!r.options.lineWiseCopyCut)return;var t=Ia(r);Ea({lineWise:!0,text:t.text}),"cut"==e.type?r.setSelections(t.ranges,null,j):(n.prevInput="",i.value=t.text.join("\n"),I(i))}"cut"==e.type&&(r.state.cutIncoming=+new Date)}}e.wrapper.insertBefore(this.wrapper,e.wrapper.firstChild),m&&(i.style.width="0px"),fe(i,"input",(function(){a&&l>=9&&t.hasSelection&&(t.hasSelection=null),n.poll()})),fe(i,"paste",(function(e){me(r,e)||Pa(e,r)||(r.state.pasteIncoming=+new Date,n.fastPoll())})),fe(i,"cut",o),fe(i,"copy",o),fe(e.scroller,"paste",(function(t){if(!kn(e,t)&&!me(r,t)){if(!i.dispatchEvent)return r.state.pasteIncoming=+new Date,void n.focus();var o=new Event("paste");o.clipboardData=t.clipboardData,i.dispatchEvent(o)}})),fe(e.lineSpace,"selectstart",(function(t){kn(e,t)||be(t)})),fe(i,"compositionstart",(function(){var e=r.getCursor("from");n.composing&&n.composing.range.clear(),n.composing={start:e,range:r.markText(e,r.getCursor("to"),{className:"CodeMirror-composing"})}})),fe(i,"compositionend",(function(){n.composing&&(n.poll(),n.composing.range.clear(),n.composing=null)}))},Va.prototype.createField=function(e){this.wrapper=Fa(),this.textarea=this.wrapper.firstChild},Va.prototype.screenReaderLabelChanged=function(e){e?this.textarea.setAttribute("aria-label",e):this.textarea.removeAttribute("aria-label")},Va.prototype.prepareSelection=function(){var e=this.cm,t=e.display,n=e.doc,r=vr(e);if(e.options.moveInputWithCursor){var i=$n(e,n.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),a=t.lineDiv.getBoundingClientRect();r.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+a.top-o.top)),r.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+a.left-o.left))}return r},Va.prototype.showSelection=function(e){var t=this.cm.display;O(t.cursorDiv,e.cursors),O(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Va.prototype.reset=function(e){if(!this.contextMenuPending&&!this.composing){var t=this.cm;if(t.somethingSelected()){this.prevInput="";var n=t.getSelection();this.textarea.value=n,t.state.focused&&I(this.textarea),a&&l>=9&&(this.hasSelection=n)}else e||(this.prevInput=this.textarea.value="",a&&l>=9&&(this.hasSelection=null))}},Va.prototype.getField=function(){return this.textarea},Va.prototype.supportsTouch=function(){return!1},Va.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!v||z()!=this.textarea))try{this.textarea.focus()}catch(e){}},Va.prototype.blur=function(){this.textarea.blur()},Va.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Va.prototype.receivedFocus=function(){this.slowPoll()},Va.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,(function(){e.poll(),e.cm.state.focused&&e.slowPoll()}))},Va.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0,t.polling.set(20,(function n(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,n))}))},Va.prototype.poll=function(){var e=this,t=this.cm,n=this.textarea,r=this.prevInput;if(this.contextMenuPending||!t.state.focused||ze(n)&&!r&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=n.value;if(i==r&&!t.somethingSelected())return!1;if(a&&l>=9&&this.hasSelection===i||y&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(8203!=o||r||(r="​"),8666==o)return this.reset(),this.cm.execCommand("undo")}for(var s=0,c=Math.min(r.length,i.length);s<c&&r.charCodeAt(s)==i.charCodeAt(s);)++s;return Jr(t,(function(){za(t,i.slice(s),r.length-s,null,e.composing?"*compose":null),i.length>1e3||i.indexOf("\n")>-1?n.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},Va.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Va.prototype.onKeyPress=function(){a&&l>=9&&(this.hasSelection=null),this.fastPoll()},Va.prototype.onContextMenu=function(e){var t=this,n=t.cm,r=n.display,i=t.textarea;t.contextMenuPending&&t.contextMenuPending();var o=cr(n,e),c=r.scroller.scrollTop;if(o&&!f){n.options.resetSelectionOnContextMenu&&-1==n.doc.sel.contains(o)&&ei(n,Ji)(n.doc,Ti(o),j);var u,d=i.style.cssText,h=t.wrapper.style.cssText,p=t.wrapper.offsetParent.getBoundingClientRect();if(t.wrapper.style.cssText="position: static",i.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px;\n      z-index: 1000; background: "+(a?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",s&&(u=window.scrollY),r.input.focus(),s&&window.scrollTo(null,u),r.input.reset(),n.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=v,r.selForContextMenu=n.doc.sel,clearTimeout(r.detectingSelectAll),a&&l>=9&&g(),C){ke(e);var m=function(){he(window,"mouseup",m),setTimeout(v,20)};fe(window,"mouseup",m)}else setTimeout(v,50)}function g(){if(null!=i.selectionStart){var e=n.somethingSelected(),o="​"+(e?i.value:"");i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,r.selForContextMenu=n.doc.sel}}function v(){if(t.contextMenuPending==v&&(t.contextMenuPending=!1,t.wrapper.style.cssText=h,i.style.cssText=d,a&&l<9&&r.scrollbars.setScrollTop(r.scroller.scrollTop=c),null!=i.selectionStart)){(!a||a&&l<9)&&g();var e=0,o=function(){r.selForContextMenu==n.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?ei(n,lo)(n):e++<10?r.detectingSelectAll=setTimeout(o,500):(r.selForContextMenu=null,r.input.reset())};r.detectingSelectAll=setTimeout(o,200)}}},Va.prototype.readOnlyChanged=function(e){e||this.reset(),this.textarea.disabled="nocursor"==e,this.textarea.readOnly=!!e},Va.prototype.setUneditable=function(){},Va.prototype.needsContentAttribute=!1,function(e){var t=e.optionHandlers;function n(n,r,i,o){e.defaults[n]=r,i&&(t[n]=o?function(e,t,n){n!=ka&&i(e,t,n)}:i)}e.defineOption=n,e.Init=ka,n("value","",(function(e,t){return e.setValue(t)}),!0),n("mode",null,(function(e,t){e.doc.modeOption=t,Ai(e)}),!0),n("indentUnit",2,Ai,!0),n("indentWithTabs",!1),n("smartIndent",!0),n("tabSize",4,(function(e){Ei(e),Hn(e),fr(e)}),!0),n("lineSeparator",null,(function(e,t){if(e.doc.lineSep=t,t){var n=[],r=e.doc.first;e.doc.iter((function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,n.push(et(r,o))}r++}));for(var i=n.length-1;i>=0;i--)mo(e.doc,t,n[i],et(n[i].line,n[i].ch+t.length))}})),n("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g,(function(e,t,n){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),n!=ka&&e.refresh()})),n("specialCharPlaceholder",Qt,(function(e){return e.refresh()}),!0),n("electricChars",!0),n("inputStyle",v?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),n("spellcheck",!1,(function(e,t){return e.getInputField().spellcheck=t}),!0),n("autocorrect",!1,(function(e,t){return e.getInputField().autocorrect=t}),!0),n("autocapitalize",!1,(function(e,t){return e.getInputField().autocapitalize=t}),!0),n("rtlMoveVisually",!x),n("wholeLineUpdateBefore",!0),n("theme","default",(function(e){wa(e),mi(e)}),!0),n("keyMap","default",(function(e,t,n){var r=Yo(t),i=n!=ka&&Yo(n);i&&i.detach&&i.detach(e,r),r.attach&&r.attach(e,i||null)})),n("extraKeys",null),n("configureMouse",null),n("lineWrapping",!1,La,!0),n("gutters",[],(function(e,t){e.display.gutterSpecs=hi(t,e.options.lineNumbers),mi(e)}),!0),n("fixedGutter",!0,(function(e,t){e.display.gutters.style.left=t?ar(e.display)+"px":"0",e.refresh()}),!0),n("coverGutterNextToScrollbar",!1,(function(e){return Br(e)}),!0),n("scrollbarStyle","native",(function(e){Ur(e),Br(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)}),!0),n("lineNumbers",!1,(function(e,t){e.display.gutterSpecs=hi(e.options.gutters,t),mi(e)}),!0),n("firstLineNumber",1,mi,!0),n("lineNumberFormatter",(function(e){return e}),mi,!0),n("showCursorWhenSelecting",!1,gr,!0),n("resetSelectionOnContextMenu",!0),n("lineWiseCopyCut",!0),n("pasteLinesPerSelection",!0),n("selectionsMayTouch",!1),n("readOnly",!1,(function(e,t){"nocursor"==t&&(Tr(e),e.display.input.blur()),e.display.input.readOnlyChanged(t)})),n("screenReaderLabel",null,(function(e,t){t=""===t?null:t,e.display.input.screenReaderLabelChanged(t)})),n("disableInput",!1,(function(e,t){t||e.display.input.reset()}),!0),n("dragDrop",!0,Ta),n("allowDropFileTypes",null),n("cursorBlinkRate",530),n("cursorScrollMargin",0),n("cursorHeight",1,gr,!0),n("singleCursorHeightPerLine",!0,gr,!0),n("workTime",100),n("workDelay",100),n("flattenSpans",!0,Ei,!0),n("addModeClass",!1,Ei,!0),n("pollInterval",100),n("undoDepth",200,(function(e,t){return e.doc.history.undoDepth=t})),n("historyEventDelay",1250),n("viewportMargin",10,(function(e){return e.refresh()}),!0),n("maxHighlightLength",1e4,Ei,!0),n("moveInputWithCursor",!0,(function(e,t){t||e.display.input.resetPosition()})),n("tabindex",null,(function(e,t){return e.display.input.getField().tabIndex=t||""})),n("autofocus",null),n("direction","ltr",(function(e,t){return e.doc.setDirection(t)}),!0),n("phrases",null)}(Ma),function(e){var t=e.optionHandlers,n=e.helpers={};e.prototype={constructor:e,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,n){var r=this.options,i=r[e];r[e]==n&&"mode"!=e||(r[e]=n,t.hasOwnProperty(e)&&ei(this,t[e])(this,n,i),pe(this,"optionChange",this,e))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](Yo(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,n=0;n<t.length;++n)if(t[n]==e||t[n].name==e)return t.splice(n,1),!0},addOverlay:ti((function(t,n){var r=t.token?t:e.getMode(this.options,t);if(r.startState)throw new Error("Overlays may not be stateful.");!function(e,t,n){for(var r=0,i=n(t);r<e.length&&n(e[r])<=i;)r++;e.splice(r,0,t)}(this.state.overlays,{mode:r,modeSpec:t,opaque:n&&n.opaque,priority:n&&n.priority||0},(function(e){return e.priority})),this.state.modeGen++,fr(this)})),removeOverlay:ti((function(e){for(var t=this.state.overlays,n=0;n<t.length;++n){var r=t[n].modeSpec;if(r==e||"string"==typeof e&&r.name==e)return t.splice(n,1),this.state.modeGen++,void fr(this)}})),indentLine:ti((function(e,t,n){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),Qe(this.doc,e)&&Na(this,e,t,n)})),indentSelection:ti((function(e){for(var t=this.doc.sel.ranges,n=-1,r=0;r<t.length;r++){var i=t[r];if(i.empty())i.head.line>n&&(Na(this,i.head.line,e,!0),n=i.head.line,r==this.doc.sel.primIndex&&Er(this));else{var o=i.from(),a=i.to(),l=Math.max(n,o.line);n=Math.min(this.lastLine(),a.line-(a.ch?0:1))+1;for(var s=l;s<n;++s)Na(this,s,e);var c=this.doc.sel.ranges;0==o.ch&&t.length==c.length&&c[r].from().ch>0&&Yi(this.doc,r,new Ci(o,c[r].to()),j)}}})),getTokenAt:function(e,t){return yt(this,e,t)},getLineTokens:function(e,t){return yt(this,et(e),t,!0)},getTokenTypeAt:function(e){e=lt(this.doc,e);var t,n=dt(this,Ke(this.doc,e.line)),r=0,i=(n.length-1)/2,o=e.ch;if(0==o)t=n[2];else for(;;){var a=r+i>>1;if((a?n[2*a-1]:0)>=o)i=a;else{if(!(n[2*a+1]<o)){t=n[2*a+2];break}r=a+1}}var l=t?t.indexOf("overlay "):-1;return l<0?t:0==l?null:t.slice(0,l-1)},getModeAt:function(t){var n=this.doc.mode;return n.innerMode?e.innerMode(n,this.getTokenAt(t).state).mode:n},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var r=[];if(!n.hasOwnProperty(t))return r;var i=n[t],o=this.getModeAt(e);if("string"==typeof o[t])i[o[t]]&&r.push(i[o[t]]);else if(o[t])for(var a=0;a<o[t].length;a++){var l=i[o[t][a]];l&&r.push(l)}else o.helperType&&i[o.helperType]?r.push(i[o.helperType]):i[o.name]&&r.push(i[o.name]);for(var s=0;s<i._global.length;s++){var c=i._global[s];c.pred(o,this)&&-1==H(r,c.val)&&r.push(c.val)}return r},getStateAfter:function(e,t){var n=this.doc;return ht(this,(e=at(n,null==e?n.first+n.size-1:e))+1,t).state},cursorCoords:function(e,t){var n=this.doc.sel.primary();return $n(this,null==e?n.head:"object"==typeof e?lt(this.doc,e):e?n.from():n.to(),t||"page")},charCoords:function(e,t){return Kn(this,lt(this.doc,e),t||"page")},coordsChar:function(e,t){return Yn(this,(e=Vn(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=Vn(this,{top:e,left:0},t||"page").top,Ze(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t,n){var r,i=!1;if("number"==typeof e){var o=this.doc.first+this.doc.size-1;e<this.doc.first?e=this.doc.first:e>o&&(e=o,i=!0),r=Ke(this.doc,e)}else r=e;return Un(this,r,{top:0,left:0},t||"page",n||i).top+(i?this.doc.height-qt(r):0)},defaultTextHeight:function(){return rr(this.display)},defaultCharWidth:function(){return ir(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,n,r,i){var o,a,l,s=this.display,c=(e=$n(this,lt(this.doc,e))).bottom,u=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),s.sizer.appendChild(t),"over"==r)c=e.top;else if("above"==r||"near"==r){var f=Math.max(s.wrapper.clientHeight,this.doc.height),d=Math.max(s.sizer.clientWidth,s.lineSpace.clientWidth);("above"==r||e.bottom+t.offsetHeight>f)&&e.top>t.offsetHeight?c=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=f&&(c=e.bottom),u+t.offsetWidth>d&&(u=d-t.offsetWidth)}t.style.top=c+"px",t.style.left=t.style.right="","right"==i?(u=s.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?u=0:"middle"==i&&(u=(s.sizer.clientWidth-t.offsetWidth)/2),t.style.left=u+"px"),n&&(o=this,a={left:u,top:c,right:u+t.offsetWidth,bottom:c+t.offsetHeight},null!=(l=Nr(o,a)).scrollTop&&Ir(o,l.scrollTop),null!=l.scrollLeft&&Fr(o,l.scrollLeft))},triggerOnKeyDown:ti(ua),triggerOnKeyPress:ti(da),triggerOnKeyUp:fa,triggerOnMouseDown:ti(ga),execCommand:function(e){if(ta.hasOwnProperty(e))return ta[e].call(null,this)},triggerElectric:ti((function(e){Da(this,e)})),findPosH:function(e,t,n,r){var i=1;t<0&&(i=-1,t=-t);for(var o=lt(this.doc,e),a=0;a<t&&!(o=Wa(this.doc,o,i,n,r)).hitSide;++a);return o},moveH:ti((function(e,t){var n=this;this.extendSelectionsBy((function(r){return n.display.shift||n.doc.extend||r.empty()?Wa(n.doc,r.head,e,t,n.options.rtlMoveVisually):e<0?r.from():r.to()}),U)})),deleteH:ti((function(e,t){var n=this.doc.sel,r=this.doc;n.somethingSelected()?r.replaceSelection("",null,"+delete"):Zo(this,(function(n){var i=Wa(r,n.head,e,t,!1);return e<0?{from:i,to:n.head}:{from:n.head,to:i}}))})),findPosV:function(e,t,n,r){var i=1,o=r;t<0&&(i=-1,t=-t);for(var a=lt(this.doc,e),l=0;l<t;++l){var s=$n(this,a,"div");if(null==o?o=s.left:s.left=o,(a=Ra(this,s,i,n)).hitSide)break}return a},moveV:ti((function(e,t){var n=this,r=this.doc,i=[],o=!this.display.shift&&!r.extend&&r.sel.somethingSelected();if(r.extendSelectionsBy((function(a){if(o)return e<0?a.from():a.to();var l=$n(n,a.head,"div");null!=a.goalColumn&&(l.left=a.goalColumn),i.push(l.left);var s=Ra(n,l,e,t);return"page"==t&&a==r.sel.primary()&&Ar(n,Kn(n,s,"div").top-l.top),s}),U),i.length)for(var a=0;a<r.sel.ranges.length;a++)r.sel.ranges[a].goalColumn=i[a]})),findWordAt:function(e){var t=Ke(this.doc,e.line).text,n=e.ch,r=e.ch;if(t){var i=this.getHelper(e,"wordChars");"before"!=e.sticky&&r!=t.length||!n?++r:--n;for(var o=t.charAt(n),a=ee(o,i)?function(e){return ee(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!ee(e)};n>0&&a(t.charAt(n-1));)--n;for(;r<t.length&&a(t.charAt(r));)++r}return new Ci(et(e.line,n),et(e.line,r))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?P(this.display.cursorDiv,"CodeMirror-overwrite"):L(this.display.cursorDiv,"CodeMirror-overwrite"),pe(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==z()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:ti((function(e,t){zr(this,e,t)})),getScrollInfo:function(){var e=this.display.scroller;return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-Ln(this)-this.display.barHeight,width:e.scrollWidth-Ln(this)-this.display.barWidth,clientHeight:On(this),clientWidth:Mn(this)}},scrollIntoView:ti((function(e,t){null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:et(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line?function(e,t){Pr(e),e.curOp.scrollToPos=t}(this,e):Dr(this,e.from,e.to,e.margin)})),setSize:ti((function(e,t){var n=this,r=function(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e};null!=e&&(this.display.wrapper.style.width=r(e)),null!=t&&(this.display.wrapper.style.height=r(t)),this.options.lineWrapping&&Rn(this);var i=this.display.viewFrom;this.doc.iter(i,this.display.viewTo,(function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){dr(n,i,"widget");break}++i})),this.curOp.forceUpdate=!0,pe(this,"refresh",this)})),operation:function(e){return Jr(this,e)},startOperation:function(){return Kr(this)},endOperation:function(){return $r(this)},refresh:ti((function(){var e=this.display.cachedTextHeight;fr(this),this.curOp.forceUpdate=!0,Hn(this),zr(this,this.doc.scrollLeft,this.doc.scrollTop),ci(this.display),(null==e||Math.abs(e-rr(this.display))>.5||this.options.lineWrapping)&&sr(this),pe(this,"refresh",this)})),swapDoc:ti((function(e){var t=this.doc;return t.cm=null,this.state.selectingText&&this.state.selectingText(),Ii(this,e),Hn(this),this.display.input.reset(),zr(this,e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,sn(this,"swapDoc",this,t),t})),phrase:function(e){var t=this.options.phrases;return t&&Object.prototype.hasOwnProperty.call(t,e)?t[e]:e},getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},ye(e),e.registerHelper=function(t,r,i){n.hasOwnProperty(t)||(n[t]=e[t]={_global:[]}),n[t][r]=i},e.registerGlobalHelper=function(t,r,i,o){e.registerHelper(t,r,o),n[t]._global.push({pred:i,val:o})}}(Ma);var Ka="iter insert remove copy getEditor constructor".split(" ");for(var $a in Eo.prototype)Eo.prototype.hasOwnProperty($a)&&H(Ka,$a)<0&&(Ma.prototype[$a]=function(e){return function(){return e.apply(this.doc,arguments)}}(Eo.prototype[$a]));return ye(Eo),Ma.inputStyles={textarea:Va,contenteditable:Ha},Ma.defineMode=function(e){Ma.defaults.mode||"null"==e||(Ma.defaults.mode=e),Fe.apply(this,arguments)},Ma.defineMIME=function(e,t){_e[e]=t},Ma.defineMode("null",(function(){return{token:function(e){return e.skipToEnd()}}})),Ma.defineMIME("text/plain","null"),Ma.defineExtension=function(e,t){Ma.prototype[e]=t},Ma.defineDocExtension=function(e,t){Eo.prototype[e]=t},Ma.fromTextArea=function(e,t){if((t=t?F(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var n=z();t.autofocus=n==e||null!=e.getAttribute("autofocus")&&n==document.body}function r(){e.value=l.getValue()}var i;if(e.form&&(fe(e.form,"submit",r),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var a=o.submit=function(){r(),o.submit=i,o.submit(),o.submit=a}}catch(e){}}t.finishInit=function(n){n.save=r,n.getTextArea=function(){return e},n.toTextArea=function(){n.toTextArea=isNaN,r(),e.parentNode.removeChild(n.getWrapperElement()),e.style.display="",e.form&&(he(e.form,"submit",r),t.leaveSubmitMethodAlone||"function"!=typeof e.form.submit||(e.form.submit=i))}},e.style.display="none";var l=Ma((function(t){return e.parentNode.insertBefore(t,e.nextSibling)}),t);return l},function(e){e.off=he,e.on=fe,e.wheelEventPixels=xi,e.Doc=Eo,e.splitLines=Ee,e.countColumn=W,e.findColumn=V,e.isWordChar=J,e.Pass=B,e.signal=pe,e.Line=Kt,e.changeEnd=Li,e.scrollbarModel=qr,e.Pos=et,e.cmpPos=tt,e.modes=Ie,e.mimeModes=_e,e.resolveMode=We,e.getMode=Re,e.modeExtensions=He,e.extendMode=Be,e.copyState=je,e.startState=Ue,e.innerMode=qe,e.commands=ta,e.keyMap=qo,e.keyName=Xo,e.isModifierKey=$o,e.lookupKey=Ko,e.normalizeKeyMap=Vo,e.StringStream=Ve,e.SharedTextMarker=Mo,e.TextMarker=To,e.LineWidget=ko,e.e_preventDefault=be,e.e_stopPropagation=xe,e.e_stop=ke,e.addClass=P,e.contains=E,e.rmClass=L,e.keyNames=Ro}(Ma),Ma.version="5.58.1",Ma}()},function(e,t,n){!function(e){"use strict";e.defineMode("javascript",(function(t,n){var r,i,o=t.indentUnit,a=n.statementIndent,l=n.jsonld,s=n.json||l,c=n.typescript,u=n.wordCharacters||/[\w$\xa1-\uffff]/,f=function(){function e(e){return{type:e,style:"keyword"}}var t=e("keyword a"),n=e("keyword b"),r=e("keyword c"),i=e("keyword d"),o=e("operator"),a={type:"atom",style:"atom"};return{if:e("if"),while:t,with:t,else:n,do:n,try:n,finally:n,return:i,break:i,continue:i,new:e("new"),delete:r,void:r,throw:r,debugger:e("debugger"),var:e("var"),const:e("var"),let:e("var"),function:e("function"),catch:e("catch"),for:e("for"),switch:e("switch"),case:e("case"),default:e("default"),in:o,typeof:o,instanceof:o,true:a,false:a,null:a,undefined:a,NaN:a,Infinity:a,this:e("this"),class:e("class"),super:e("atom"),yield:r,export:e("export"),import:e("import"),extends:r,await:r}}(),d=/[+\-*&%=<>!?|~^@]/,h=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;function p(e,t,n){return r=e,i=n,t}function m(e,t){var n,r=e.next();if('"'==r||"'"==r)return t.tokenize=(n=r,function(e,t){var r,i=!1;if(l&&"@"==e.peek()&&e.match(h))return t.tokenize=m,p("jsonld-keyword","meta");for(;null!=(r=e.next())&&(r!=n||i);)i=!i&&"\\"==r;return i||(t.tokenize=m),p("string","string")}),t.tokenize(e,t);if("."==r&&e.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/))return p("number","number");if("."==r&&e.match(".."))return p("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(r))return p(r);if("="==r&&e.eat(">"))return p("=>","operator");if("0"==r&&e.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/))return p("number","number");if(/\d/.test(r))return e.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/),p("number","number");if("/"==r)return e.eat("*")?(t.tokenize=g,g(e,t)):e.eat("/")?(e.skipToEnd(),p("comment","comment")):$e(e,t,1)?(function(e){for(var t,n=!1,r=!1;null!=(t=e.next());){if(!n){if("/"==t&&!r)return;"["==t?r=!0:r&&"]"==t&&(r=!1)}n=!n&&"\\"==t}}(e),e.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/),p("regexp","string-2")):(e.eat("="),p("operator","operator",e.current()));if("`"==r)return t.tokenize=v,v(e,t);if("#"==r)return e.skipToEnd(),p("error","error");if("<"==r&&e.match("!--")||"-"==r&&e.match("->"))return e.skipToEnd(),p("comment","comment");if(d.test(r))return">"==r&&t.lexical&&">"==t.lexical.type||(e.eat("=")?"!"!=r&&"="!=r||e.eat("="):/[<>*+\-]/.test(r)&&(e.eat(r),">"==r&&e.eat(r))),p("operator","operator",e.current());if(u.test(r)){e.eatWhile(u);var i=e.current();if("."!=t.lastType){if(f.propertyIsEnumerable(i)){var o=f[i];return p(o.type,o.style,i)}if("async"==i&&e.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/,!1))return p("async","keyword",i)}return p("variable","variable",i)}}function g(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=m;break}r="*"==n}return p("comment","comment")}function v(e,t){for(var n,r=!1;null!=(n=e.next());){if(!r&&("`"==n||"$"==n&&e.eat("{"))){t.tokenize=m;break}r=!r&&"\\"==n}return p("quasi","string-2",e.current())}function y(e,t){t.fatArrowAt&&(t.fatArrowAt=null);var n=e.string.indexOf("=>",e.start);if(!(n<0)){if(c){var r=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(e.string.slice(e.start,n));r&&(n=r.index)}for(var i=0,o=!1,a=n-1;a>=0;--a){var l=e.string.charAt(a),s="([{}])".indexOf(l);if(s>=0&&s<3){if(!i){++a;break}if(0==--i){"("==l&&(o=!0);break}}else if(s>=3&&s<6)++i;else if(u.test(l))o=!0;else if(/["'\/`]/.test(l))for(;;--a){if(0==a)return;if(e.string.charAt(a-1)==l&&"\\"!=e.string.charAt(a-2)){a--;break}}else if(o&&!i){++a;break}}o&&!i&&(t.fatArrowAt=a)}}var b={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0};function x(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.prev=i,this.info=o,null!=r&&(this.align=r)}function w(e,t){for(var n=e.localVars;n;n=n.next)if(n.name==t)return!0;for(var r=e.context;r;r=r.prev)for(n=r.vars;n;n=n.next)if(n.name==t)return!0}var k={state:null,column:null,marked:null,cc:null};function C(){for(var e=arguments.length-1;e>=0;e--)k.cc.push(arguments[e])}function S(){return C.apply(null,arguments),!0}function T(e,t){for(var n=t;n;n=n.next)if(n.name==e)return!0;return!1}function L(e){var t=k.state;if(k.marked="def",t.context)if("var"==t.lexical.info&&t.context&&t.context.block){var r=function e(t,n){if(n){if(n.block){var r=e(t,n.prev);return r?r==n.prev?n:new O(r,n.vars,!0):null}return T(t,n.vars)?n:new O(n.prev,new N(t,n.vars),!1)}return null}(e,t.context);if(null!=r)return void(t.context=r)}else if(!T(e,t.localVars))return void(t.localVars=new N(e,t.localVars));n.globalVars&&!T(e,t.globalVars)&&(t.globalVars=new N(e,t.globalVars))}function M(e){return"public"==e||"private"==e||"protected"==e||"abstract"==e||"readonly"==e}function O(e,t,n){this.prev=e,this.vars=t,this.block=n}function N(e,t){this.name=e,this.next=t}var A=new N("this",new N("arguments",null));function E(){k.state.context=new O(k.state.context,k.state.localVars,!1),k.state.localVars=A}function z(){k.state.context=new O(k.state.context,k.state.localVars,!0),k.state.localVars=null}function P(){k.state.localVars=k.state.context.vars,k.state.context=k.state.context.prev}function D(e,t){var n=function(){var n=k.state,r=n.indented;if("stat"==n.lexical.type)r=n.lexical.indented;else for(var i=n.lexical;i&&")"==i.type&&i.align;i=i.prev)r=i.indented;n.lexical=new x(r,k.stream.column(),e,null,n.lexical,t)};return n.lex=!0,n}function I(){var e=k.state;e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function _(e){return function t(n){return n==e?S():";"==e||"}"==n||")"==n||"]"==n?C():S(t)}}function F(e,t){return"var"==e?S(D("vardef",t),ye,_(";"),I):"keyword a"==e?S(D("form"),B,F,I):"keyword b"==e?S(D("form"),F,I):"keyword d"==e?k.stream.match(/^\s*$/,!1)?S():S(D("stat"),q,_(";"),I):"debugger"==e?S(_(";")):"{"==e?S(D("}"),z,oe,I,P):";"==e?S():"if"==e?("else"==k.state.lexical.info&&k.state.cc[k.state.cc.length-1]==I&&k.state.cc.pop()(),S(D("form"),B,F,I,Se)):"function"==e?S(Oe):"for"==e?S(D("form"),Te,F,I):"class"==e||c&&"interface"==t?(k.marked="keyword",S(D("form","class"==e?e:t),Pe,I)):"variable"==e?c&&"declare"==t?(k.marked="keyword",S(F)):c&&("module"==t||"enum"==t||"type"==t)&&k.stream.match(/^\s*\w/,!1)?(k.marked="keyword","enum"==t?S(Ve):"type"==t?S(Ae,_("operator"),ue,_(";")):S(D("form"),be,_("{"),D("}"),oe,I,I)):c&&"namespace"==t?(k.marked="keyword",S(D("form"),R,F,I)):c&&"abstract"==t?(k.marked="keyword",S(F)):S(D("stat"),Q):"switch"==e?S(D("form"),B,_("{"),D("}","switch"),z,oe,I,I,P):"case"==e?S(R,_(":")):"default"==e?S(_(":")):"catch"==e?S(D("form"),E,W,F,I,P):"export"==e?S(D("stat"),Fe,I):"import"==e?S(D("stat"),Re,I):"async"==e?S(F):"@"==t?S(R,F):C(D("stat"),R,_(";"),I)}function W(e){if("("==e)return S(Ee,_(")"))}function R(e,t){return j(e,t,!1)}function H(e,t){return j(e,t,!0)}function B(e){return"("!=e?C():S(D(")"),R,_(")"),I)}function j(e,t,n){if(k.state.fatArrowAt==k.stream.start){var r=n?X:G;if("("==e)return S(E,D(")"),re(Ee,")"),I,_("=>"),r,P);if("variable"==e)return C(E,be,_("=>"),r,P)}var i=n?V:U;return b.hasOwnProperty(e)?S(i):"function"==e?S(Oe,i):"class"==e||c&&"interface"==t?(k.marked="keyword",S(D("form"),ze,I)):"keyword c"==e||"async"==e?S(n?H:R):"("==e?S(D(")"),q,_(")"),I,i):"operator"==e||"spread"==e?S(n?H:R):"["==e?S(D("]"),Ue,I,i):"{"==e?ie(ee,"}",null,i):"quasi"==e?C(K,i):"new"==e?S(function(e){return function(t){return"."==t?S(e?Z:Y):"variable"==t&&c?S(me,e?V:U):C(e?H:R)}}(n)):"import"==e?S(R):S()}function q(e){return e.match(/[;\}\)\],]/)?C():C(R)}function U(e,t){return","==e?S(R):V(e,t,!1)}function V(e,t,n){var r=0==n?U:V,i=0==n?R:H;return"=>"==e?S(E,n?X:G,P):"operator"==e?/\+\+|--/.test(t)||c&&"!"==t?S(r):c&&"<"==t&&k.stream.match(/^([^>]|<.*?>)*>\s*\(/,!1)?S(D(">"),re(ue,">"),I,r):"?"==t?S(R,_(":"),i):S(i):"quasi"==e?C(K,r):";"!=e?"("==e?ie(H,")","call",r):"."==e?S(J,r):"["==e?S(D("]"),q,_("]"),I,r):c&&"as"==t?(k.marked="keyword",S(ue,r)):"regexp"==e?(k.state.lastType=k.marked="operator",k.stream.backUp(k.stream.pos-k.stream.start-1),S(i)):void 0:void 0}function K(e,t){return"quasi"!=e?C():"${"!=t.slice(t.length-2)?S(K):S(R,$)}function $(e){if("}"==e)return k.marked="string-2",k.state.tokenize=v,S(K)}function G(e){return y(k.stream,k.state),C("{"==e?F:R)}function X(e){return y(k.stream,k.state),C("{"==e?F:H)}function Y(e,t){if("target"==t)return k.marked="keyword",S(U)}function Z(e,t){if("target"==t)return k.marked="keyword",S(V)}function Q(e){return":"==e?S(I,F):C(U,_(";"),I)}function J(e){if("variable"==e)return k.marked="property",S()}function ee(e,t){return"async"==e?(k.marked="property",S(ee)):"variable"==e||"keyword"==k.style?(k.marked="property","get"==t||"set"==t?S(te):(c&&k.state.fatArrowAt==k.stream.start&&(n=k.stream.match(/^\s*:\s*/,!1))&&(k.state.fatArrowAt=k.stream.pos+n[0].length),S(ne))):"number"==e||"string"==e?(k.marked=l?"property":k.style+" property",S(ne)):"jsonld-keyword"==e?S(ne):c&&M(t)?(k.marked="keyword",S(ee)):"["==e?S(R,ae,_("]"),ne):"spread"==e?S(H,ne):"*"==t?(k.marked="keyword",S(ee)):":"==e?C(ne):void 0;var n}function te(e){return"variable"!=e?C(ne):(k.marked="property",S(Oe))}function ne(e){return":"==e?S(H):"("==e?C(Oe):void 0}function re(e,t,n){function r(i,o){if(n?n.indexOf(i)>-1:","==i){var a=k.state.lexical;return"call"==a.info&&(a.pos=(a.pos||0)+1),S((function(n,r){return n==t||r==t?C():C(e)}),r)}return i==t||o==t?S():n&&n.indexOf(";")>-1?C(e):S(_(t))}return function(n,i){return n==t||i==t?S():C(e,r)}}function ie(e,t,n){for(var r=3;r<arguments.length;r++)k.cc.push(arguments[r]);return S(D(t,n),re(e,t),I)}function oe(e){return"}"==e?S():C(F,oe)}function ae(e,t){if(c){if(":"==e)return S(ue);if("?"==t)return S(ae)}}function le(e,t){if(c&&(":"==e||"in"==t))return S(ue)}function se(e){if(c&&":"==e)return k.stream.match(/^\s*\w+\s+is\b/,!1)?S(R,ce,ue):S(ue)}function ce(e,t){if("is"==t)return k.marked="keyword",S()}function ue(e,t){return"keyof"==t||"typeof"==t||"infer"==t?(k.marked="keyword",S("typeof"==t?H:ue)):"variable"==e||"void"==t?(k.marked="type",S(pe)):"|"==t||"&"==t?S(ue):"string"==e||"number"==e||"atom"==e?S(pe):"["==e?S(D("]"),re(ue,"]",","),I,pe):"{"==e?S(D("}"),re(de,"}",",;"),I,pe):"("==e?S(re(he,")"),fe,pe):"<"==e?S(re(ue,">"),ue):void 0}function fe(e){if("=>"==e)return S(ue)}function de(e,t){return"variable"==e||"keyword"==k.style?(k.marked="property",S(de)):"?"==t||"number"==e||"string"==e?S(de):":"==e?S(ue):"["==e?S(_("variable"),le,_("]"),de):"("==e?C(Ne,de):void 0}function he(e,t){return"variable"==e&&k.stream.match(/^\s*[?:]/,!1)||"?"==t?S(he):":"==e?S(ue):"spread"==e?S(he):C(ue)}function pe(e,t){return"<"==t?S(D(">"),re(ue,">"),I,pe):"|"==t||"."==e||"&"==t?S(ue):"["==e?S(ue,_("]"),pe):"extends"==t||"implements"==t?(k.marked="keyword",S(ue)):"?"==t?S(ue,_(":"),ue):void 0}function me(e,t){if("<"==t)return S(D(">"),re(ue,">"),I,pe)}function ge(){return C(ue,ve)}function ve(e,t){if("="==t)return S(ue)}function ye(e,t){return"enum"==t?(k.marked="keyword",S(Ve)):C(be,ae,ke,Ce)}function be(e,t){return c&&M(t)?(k.marked="keyword",S(be)):"variable"==e?(L(t),S()):"spread"==e?S(be):"["==e?ie(we,"]"):"{"==e?ie(xe,"}"):void 0}function xe(e,t){return"variable"!=e||k.stream.match(/^\s*:/,!1)?("variable"==e&&(k.marked="property"),"spread"==e?S(be):"}"==e?C():"["==e?S(R,_("]"),_(":"),xe):S(_(":"),be,ke)):(L(t),S(ke))}function we(){return C(be,ke)}function ke(e,t){if("="==t)return S(H)}function Ce(e){if(","==e)return S(ye)}function Se(e,t){if("keyword b"==e&&"else"==t)return S(D("form","else"),F,I)}function Te(e,t){return"await"==t?S(Te):"("==e?S(D(")"),Le,I):void 0}function Le(e){return"var"==e?S(ye,Me):"variable"==e?S(Me):C(Me)}function Me(e,t){return")"==e?S():";"==e?S(Me):"in"==t||"of"==t?(k.marked="keyword",S(R,Me)):C(R,Me)}function Oe(e,t){return"*"==t?(k.marked="keyword",S(Oe)):"variable"==e?(L(t),S(Oe)):"("==e?S(E,D(")"),re(Ee,")"),I,se,F,P):c&&"<"==t?S(D(">"),re(ge,">"),I,Oe):void 0}function Ne(e,t){return"*"==t?(k.marked="keyword",S(Ne)):"variable"==e?(L(t),S(Ne)):"("==e?S(E,D(")"),re(Ee,")"),I,se,P):c&&"<"==t?S(D(">"),re(ge,">"),I,Ne):void 0}function Ae(e,t){return"keyword"==e||"variable"==e?(k.marked="type",S(Ae)):"<"==t?S(D(">"),re(ge,">"),I):void 0}function Ee(e,t){return"@"==t&&S(R,Ee),"spread"==e?S(Ee):c&&M(t)?(k.marked="keyword",S(Ee)):c&&"this"==e?S(ae,ke):C(be,ae,ke)}function ze(e,t){return"variable"==e?Pe(e,t):De(e,t)}function Pe(e,t){if("variable"==e)return L(t),S(De)}function De(e,t){return"<"==t?S(D(">"),re(ge,">"),I,De):"extends"==t||"implements"==t||c&&","==e?("implements"==t&&(k.marked="keyword"),S(c?ue:R,De)):"{"==e?S(D("}"),Ie,I):void 0}function Ie(e,t){return"async"==e||"variable"==e&&("static"==t||"get"==t||"set"==t||c&&M(t))&&k.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(k.marked="keyword",S(Ie)):"variable"==e||"keyword"==k.style?(k.marked="property",S(c?_e:Oe,Ie)):"number"==e||"string"==e?S(c?_e:Oe,Ie):"["==e?S(R,ae,_("]"),c?_e:Oe,Ie):"*"==t?(k.marked="keyword",S(Ie)):c&&"("==e?C(Ne,Ie):";"==e||","==e?S(Ie):"}"==e?S():"@"==t?S(R,Ie):void 0}function _e(e,t){if("?"==t)return S(_e);if(":"==e)return S(ue,ke);if("="==t)return S(H);var n=k.state.lexical.prev;return C(n&&"interface"==n.info?Ne:Oe)}function Fe(e,t){return"*"==t?(k.marked="keyword",S(qe,_(";"))):"default"==t?(k.marked="keyword",S(R,_(";"))):"{"==e?S(re(We,"}"),qe,_(";")):C(F)}function We(e,t){return"as"==t?(k.marked="keyword",S(_("variable"))):"variable"==e?C(H,We):void 0}function Re(e){return"string"==e?S():"("==e?C(R):C(He,Be,qe)}function He(e,t){return"{"==e?ie(He,"}"):("variable"==e&&L(t),"*"==t&&(k.marked="keyword"),S(je))}function Be(e){if(","==e)return S(He,Be)}function je(e,t){if("as"==t)return k.marked="keyword",S(He)}function qe(e,t){if("from"==t)return k.marked="keyword",S(R)}function Ue(e){return"]"==e?S():C(re(H,"]"))}function Ve(){return C(D("form"),be,_("{"),D("}"),re(Ke,"}"),I,I)}function Ke(){return C(be,ke)}function $e(e,t,n){return t.tokenize==m&&/^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(t.lastType)||"quasi"==t.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(n||0)))}return P.lex=!0,I.lex=!0,{startState:function(e){var t={tokenize:m,lastType:"sof",cc:[],lexical:new x((e||0)-o,0,"block",!1),localVars:n.localVars,context:n.localVars&&new O(null,null,!1),indented:e||0};return n.globalVars&&"object"==typeof n.globalVars&&(t.globalVars=n.globalVars),t},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation(),y(e,t)),t.tokenize!=g&&e.eatSpace())return null;var n=t.tokenize(e,t);return"comment"==r?n:(t.lastType="operator"!=r||"++"!=i&&"--"!=i?r:"incdec",function(e,t,n,r,i){var o=e.cc;for(k.state=e,k.stream=i,k.marked=null,k.cc=o,k.style=t,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((o.length?o.pop():s?R:F)(n,r)){for(;o.length&&o[o.length-1].lex;)o.pop()();return k.marked?k.marked:"variable"==n&&w(e,r)?"variable-2":t}}(t,n,r,i,e))},indent:function(t,r){if(t.tokenize==g)return e.Pass;if(t.tokenize!=m)return 0;var i,l=r&&r.charAt(0),s=t.lexical;if(!/^\s*else\b/.test(r))for(var c=t.cc.length-1;c>=0;--c){var u=t.cc[c];if(u==I)s=s.prev;else if(u!=Se)break}for(;("stat"==s.type||"form"==s.type)&&("}"==l||(i=t.cc[t.cc.length-1])&&(i==U||i==V)&&!/^[,\.=+\-*:?[\(]/.test(r));)s=s.prev;a&&")"==s.type&&"stat"==s.prev.type&&(s=s.prev);var f=s.type,h=l==f;return"vardef"==f?s.indented+("operator"==t.lastType||","==t.lastType?s.info.length+1:0):"form"==f&&"{"==l?s.indented:"form"==f?s.indented+o:"stat"==f?s.indented+(function(e,t){return"operator"==e.lastType||","==e.lastType||d.test(t.charAt(0))||/[,.]/.test(t.charAt(0))}(t,r)?a||o:0):"switch"!=s.info||h||0==n.doubleIndentSwitch?s.align?s.column+(h?0:1):s.indented+(h?0:o):s.indented+(/^(?:case|default)\b/.test(r)?o:2*o)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:s?null:"/*",blockCommentEnd:s?null:"*/",blockCommentContinue:s?null:" * ",lineComment:s?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:s?"json":"javascript",jsonldMode:l,jsonMode:s,expressionAllowed:$e,skipExpression:function(e){var t=e.cc[e.cc.length-1];t!=R&&t!=H||e.cc.pop()}}})),e.registerHelper("wordChars","javascript",/[\w$]/),e.defineMIME("text/javascript","javascript"),e.defineMIME("text/ecmascript","javascript"),e.defineMIME("application/javascript","javascript"),e.defineMIME("application/x-javascript","javascript"),e.defineMIME("application/ecmascript","javascript"),e.defineMIME("application/json",{name:"javascript",json:!0}),e.defineMIME("application/x-json",{name:"javascript",json:!0}),e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),e.defineMIME("text/typescript",{name:"javascript",typescript:!0}),e.defineMIME("application/typescript",{name:"javascript",typescript:!0})}(n(0))},function(e,t,n){!function(e){"use strict";var t={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,allowMissingTagName:!1,caseFold:!1};e.defineMode("xml",(function(r,i){var o,a,l=r.indentUnit,s={},c=i.htmlMode?t:n;for(var u in c)s[u]=c[u];for(var u in i)s[u]=i[u];function f(e,t){function n(n){return t.tokenize=n,n(e,t)}var r=e.next();return"<"==r?e.eat("!")?e.eat("[")?e.match("CDATA[")?n(h("atom","]]>")):null:e.match("--")?n(h("comment","--\x3e")):e.match("DOCTYPE",!0,!0)?(e.eatWhile(/[\w\._\-]/),n(function e(t){return function(n,r){for(var i;null!=(i=n.next());){if("<"==i)return r.tokenize=e(t+1),r.tokenize(n,r);if(">"==i){if(1==t){r.tokenize=f;break}return r.tokenize=e(t-1),r.tokenize(n,r)}}return"meta"}}(1))):null:e.eat("?")?(e.eatWhile(/[\w\._\-]/),t.tokenize=h("meta","?>"),"meta"):(o=e.eat("/")?"closeTag":"openTag",t.tokenize=d,"tag bracket"):"&"==r?(e.eat("#")?e.eat("x")?e.eatWhile(/[a-fA-F\d]/)&&e.eat(";"):e.eatWhile(/[\d]/)&&e.eat(";"):e.eatWhile(/[\w\.\-:]/)&&e.eat(";"))?"atom":"error":(e.eatWhile(/[^&<]/),null)}function d(e,t){var n,r,i=e.next();if(">"==i||"/"==i&&e.eat(">"))return t.tokenize=f,o=">"==i?"endTag":"selfcloseTag","tag bracket";if("="==i)return o="equals",null;if("<"==i){t.tokenize=f,t.state=v,t.tagName=t.tagStart=null;var a=t.tokenize(e,t);return a?a+" tag error":"tag error"}return/[\'\"]/.test(i)?(t.tokenize=(n=i,(r=function(e,t){for(;!e.eol();)if(e.next()==n){t.tokenize=d;break}return"string"}).isInAttribute=!0,r),t.stringStartCol=e.column(),t.tokenize(e,t)):(e.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function h(e,t){return function(n,r){for(;!n.eol();){if(n.match(t)){r.tokenize=f;break}n.next()}return e}}function p(e,t,n){this.prev=e.context,this.tagName=t,this.indent=e.indented,this.startOfLine=n,(s.doNotIndent.hasOwnProperty(t)||e.context&&e.context.noIndent)&&(this.noIndent=!0)}function m(e){e.context&&(e.context=e.context.prev)}function g(e,t){for(var n;;){if(!e.context)return;if(n=e.context.tagName,!s.contextGrabbers.hasOwnProperty(n)||!s.contextGrabbers[n].hasOwnProperty(t))return;m(e)}}function v(e,t,n){return"openTag"==e?(n.tagStart=t.column(),y):"closeTag"==e?b:v}function y(e,t,n){return"word"==e?(n.tagName=t.current(),a="tag",k):s.allowMissingTagName&&"endTag"==e?(a="tag bracket",k(e,0,n)):(a="error",y)}function b(e,t,n){if("word"==e){var r=t.current();return n.context&&n.context.tagName!=r&&s.implicitlyClosed.hasOwnProperty(n.context.tagName)&&m(n),n.context&&n.context.tagName==r||!1===s.matchClosing?(a="tag",x):(a="tag error",w)}return s.allowMissingTagName&&"endTag"==e?(a="tag bracket",x(e,0,n)):(a="error",w)}function x(e,t,n){return"endTag"!=e?(a="error",x):(m(n),v)}function w(e,t,n){return a="error",x(e,0,n)}function k(e,t,n){if("word"==e)return a="attribute",C;if("endTag"==e||"selfcloseTag"==e){var r=n.tagName,i=n.tagStart;return n.tagName=n.tagStart=null,"selfcloseTag"==e||s.autoSelfClosers.hasOwnProperty(r)?g(n,r):(g(n,r),n.context=new p(n,r,i==n.indented)),v}return a="error",k}function C(e,t,n){return"equals"==e?S:(s.allowMissing||(a="error"),k(e,0,n))}function S(e,t,n){return"string"==e?T:"word"==e&&s.allowUnquoted?(a="string",k):(a="error",k(e,0,n))}function T(e,t,n){return"string"==e?T:k(e,0,n)}return f.isInText=!0,{startState:function(e){var t={tokenize:f,state:v,indented:e||0,tagName:null,tagStart:null,context:null};return null!=e&&(t.baseIndent=e),t},token:function(e,t){if(!t.tagName&&e.sol()&&(t.indented=e.indentation()),e.eatSpace())return null;o=null;var n=t.tokenize(e,t);return(n||o)&&"comment"!=n&&(a=null,t.state=t.state(o||n,e,t),a&&(n="error"==a?n+" error":a)),n},indent:function(t,n,r){var i=t.context;if(t.tokenize.isInAttribute)return t.tagStart==t.indented?t.stringStartCol+1:t.indented+l;if(i&&i.noIndent)return e.Pass;if(t.tokenize!=d&&t.tokenize!=f)return r?r.match(/^(\s*)/)[0].length:0;if(t.tagName)return!1!==s.multilineTagIndentPastTag?t.tagStart+t.tagName.length+2:t.tagStart+l*(s.multilineTagIndentFactor||1);if(s.alignCDATA&&/<!\[CDATA\[/.test(n))return 0;var o=n&&/^<(\/)?([\w_:\.-]*)/.exec(n);if(o&&o[1])for(;i;){if(i.tagName==o[2]){i=i.prev;break}if(!s.implicitlyClosed.hasOwnProperty(i.tagName))break;i=i.prev}else if(o)for(;i;){var a=s.contextGrabbers[i.tagName];if(!a||!a.hasOwnProperty(o[2]))break;i=i.prev}for(;i&&i.prev&&!i.startOfLine;)i=i.prev;return i?i.indent+l:t.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:s.htmlMode?"html":"xml",helperType:s.htmlMode?"html":"xml",skipAttribute:function(e){e.state==S&&(e.state=k)},xmlCurrentTag:function(e){return e.tagName?{name:e.tagName,close:"closeTag"==e.type}:null},xmlCurrentContext:function(e){for(var t=[],n=e.context;n;n=n.prev)n.tagName&&t.push(n.tagName);return t.reverse()}}})),e.defineMIME("text/xml","xml"),e.defineMIME("application/xml","xml"),e.mimeModes.hasOwnProperty("text/html")||e.defineMIME("text/html",{name:"xml",htmlMode:!0})}(n(0))},function(e,t,n){!function(e){function t(t,n,r){var i,o=t.getWrapperElement();return(i=o.appendChild(document.createElement("div"))).className=r?"CodeMirror-dialog CodeMirror-dialog-bottom":"CodeMirror-dialog CodeMirror-dialog-top","string"==typeof n?i.innerHTML=n:i.appendChild(n),e.addClass(o,"dialog-opened"),i}function n(e,t){e.state.currentNotificationClose&&e.state.currentNotificationClose(),e.state.currentNotificationClose=t}e.defineExtension("openDialog",(function(r,i,o){o||(o={}),n(this,null);var a=t(this,r,o.bottom),l=!1,s=this;function c(t){if("string"==typeof t)f.value=t;else{if(l)return;l=!0,e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a),s.focus(),o.onClose&&o.onClose(a)}}var u,f=a.getElementsByTagName("input")[0];return f?(f.focus(),o.value&&(f.value=o.value,!1!==o.selectValueOnOpen&&f.select()),o.onInput&&e.on(f,"input",(function(e){o.onInput(e,f.value,c)})),o.onKeyUp&&e.on(f,"keyup",(function(e){o.onKeyUp(e,f.value,c)})),e.on(f,"keydown",(function(t){o&&o.onKeyDown&&o.onKeyDown(t,f.value,c)||((27==t.keyCode||!1!==o.closeOnEnter&&13==t.keyCode)&&(f.blur(),e.e_stop(t),c()),13==t.keyCode&&i(f.value,t))})),!1!==o.closeOnBlur&&e.on(f,"blur",c)):(u=a.getElementsByTagName("button")[0])&&(e.on(u,"click",(function(){c(),s.focus()})),!1!==o.closeOnBlur&&e.on(u,"blur",c),u.focus()),c})),e.defineExtension("openConfirm",(function(r,i,o){n(this,null);var a=t(this,r,o&&o.bottom),l=a.getElementsByTagName("button"),s=!1,c=this,u=1;function f(){s||(s=!0,e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a),c.focus())}l[0].focus();for(var d=0;d<l.length;++d){var h=l[d];!function(t){e.on(h,"click",(function(n){e.e_preventDefault(n),f(),t&&t(c)}))}(i[d]),e.on(h,"blur",(function(){--u,setTimeout((function(){u<=0&&f()}),200)})),e.on(h,"focus",(function(){++u}))}})),e.defineExtension("openNotification",(function(r,i){n(this,c);var o,a=t(this,r,i&&i.bottom),l=!1,s=i&&void 0!==i.duration?i.duration:5e3;function c(){l||(l=!0,clearTimeout(o),e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a))}return e.on(a,"click",(function(t){e.e_preventDefault(t),c()})),s&&(o=setTimeout(c,s)),c}))}(n(0))},function(e,t,n){!function(e){"use strict";var t,n,r=e.Pos;function i(e,t){for(var n=function(e){var t=e.flags;return null!=t?t:(e.ignoreCase?"i":"")+(e.global?"g":"")+(e.multiline?"m":"")}(e),r=n,i=0;i<t.length;i++)-1==r.indexOf(t.charAt(i))&&(r+=t.charAt(i));return n==r?e:new RegExp(e.source,r)}function o(e,t,n){t=i(t,"g");for(var o=n.line,a=n.ch,l=e.lastLine();o<=l;o++,a=0){t.lastIndex=a;var s=e.getLine(o),c=t.exec(s);if(c)return{from:r(o,c.index),to:r(o,c.index+c[0].length),match:c}}}function a(e,t,n){if(!function(e){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(e.source)}(t))return o(e,t,n);t=i(t,"gm");for(var a,l=1,s=n.line,c=e.lastLine();s<=c;){for(var u=0;u<l&&!(s>c);u++){var f=e.getLine(s++);a=null==a?f:a+"\n"+f}l*=2,t.lastIndex=n.ch;var d=t.exec(a);if(d){var h=a.slice(0,d.index).split("\n"),p=d[0].split("\n"),m=n.line+h.length-1,g=h[h.length-1].length;return{from:r(m,g),to:r(m+p.length-1,1==p.length?g+p[0].length:p[p.length-1].length),match:d}}}}function l(e,t){for(var n,r=0;;){t.lastIndex=r;var i=t.exec(e);if(!i)return n;if((r=(n=i).index+(n[0].length||1))==e.length)return n}}function s(e,t,n){t=i(t,"g");for(var o=n.line,a=n.ch,s=e.firstLine();o>=s;o--,a=-1){var c=e.getLine(o);a>-1&&(c=c.slice(0,a));var u=l(c,t);if(u)return{from:r(o,u.index),to:r(o,u.index+u[0].length),match:u}}}function c(e,t,n){t=i(t,"gm");for(var o,a=1,s=n.line,c=e.firstLine();s>=c;){for(var u=0;u<a;u++){var f=e.getLine(s--);o=null==o?f.slice(0,n.ch):f+"\n"+o}a*=2;var d=l(o,t);if(d){var h=o.slice(0,d.index).split("\n"),p=d[0].split("\n"),m=s+h.length,g=h[h.length-1].length;return{from:r(m,g),to:r(m+p.length-1,1==p.length?g+p[0].length:p[p.length-1].length),match:d}}}}function u(e,t,n,r){if(e.length==t.length)return n;for(var i=0,o=n+Math.max(0,e.length-t.length);;){if(i==o)return i;var a=i+o>>1,l=r(e.slice(0,a)).length;if(l==n)return a;l>n?o=a:i=a+1}}function f(e,i,o,a){if(!i.length)return null;var l=a?t:n,s=l(i).split(/\r|\n\r?/);e:for(var c=o.line,f=o.ch,d=e.lastLine()+1-s.length;c<=d;c++,f=0){var h=e.getLine(c).slice(f),p=l(h);if(1==s.length){var m=p.indexOf(s[0]);if(-1==m)continue e;return o=u(h,p,m,l)+f,{from:r(c,u(h,p,m,l)+f),to:r(c,u(h,p,m+s[0].length,l)+f)}}var g=p.length-s[0].length;if(p.slice(g)==s[0]){for(var v=1;v<s.length-1;v++)if(l(e.getLine(c+v))!=s[v])continue e;var y=e.getLine(c+s.length-1),b=l(y),x=s[s.length-1];if(b.slice(0,x.length)==x)return{from:r(c,u(h,p,g,l)+f),to:r(c+s.length-1,u(y,b,x.length,l))}}}}function d(e,i,o,a){if(!i.length)return null;var l=a?t:n,s=l(i).split(/\r|\n\r?/);e:for(var c=o.line,f=o.ch,d=e.firstLine()-1+s.length;c>=d;c--,f=-1){var h=e.getLine(c);f>-1&&(h=h.slice(0,f));var p=l(h);if(1==s.length){var m=p.lastIndexOf(s[0]);if(-1==m)continue e;return{from:r(c,u(h,p,m,l)),to:r(c,u(h,p,m+s[0].length,l))}}var g=s[s.length-1];if(p.slice(0,g.length)==g){var v=1;for(o=c-s.length+1;v<s.length-1;v++)if(l(e.getLine(o+v))!=s[v])continue e;var y=e.getLine(c+1-s.length),b=l(y);if(b.slice(b.length-s[0].length)==s[0])return{from:r(c+1-s.length,u(y,b,y.length-s[0].length,l)),to:r(c,u(h,p,g.length,l))}}}}function h(e,t,n,l){var u;this.atOccurrence=!1,this.doc=e,n=n?e.clipPos(n):r(0,0),this.pos={from:n,to:n},"object"==typeof l?u=l.caseFold:(u=l,l=null),"string"==typeof t?(null==u&&(u=!1),this.matches=function(n,r){return(n?d:f)(e,t,r,u)}):(t=i(t,"gm"),l&&!1===l.multiline?this.matches=function(n,r){return(n?s:o)(e,t,r)}:this.matches=function(n,r){return(n?c:a)(e,t,r)})}String.prototype.normalize?(t=function(e){return e.normalize("NFD").toLowerCase()},n=function(e){return e.normalize("NFD")}):(t=function(e){return e.toLowerCase()},n=function(e){return e}),h.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(t){for(var n=this.matches(t,this.doc.clipPos(t?this.pos.from:this.pos.to));n&&0==e.cmpPos(n.from,n.to);)t?n.from.ch?n.from=r(n.from.line,n.from.ch-1):n=n.from.line==this.doc.firstLine()?null:this.matches(t,this.doc.clipPos(r(n.from.line-1))):n.to.ch<this.doc.getLine(n.to.line).length?n.to=r(n.to.line,n.to.ch+1):n=n.to.line==this.doc.lastLine()?null:this.matches(t,r(n.to.line+1,0));if(n)return this.pos=n,this.atOccurrence=!0,this.pos.match||!0;var i=r(t?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:i,to:i},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(t,n){if(this.atOccurrence){var i=e.splitLines(t);this.doc.replaceRange(i,this.pos.from,this.pos.to,n),this.pos.to=r(this.pos.from.line+i.length-1,i[i.length-1].length+(1==i.length?this.pos.from.ch:0))}}},e.defineExtension("getSearchCursor",(function(e,t,n){return new h(this.doc,e,t,n)})),e.defineDocExtension("getSearchCursor",(function(e,t,n){return new h(this,e,t,n)})),e.defineExtension("selectMatches",(function(t,n){for(var r=[],i=this.getSearchCursor(t,this.getCursor("from"),n);i.findNext()&&!(e.cmpPos(i.to(),this.getCursor("to"))>0);)r.push({anchor:i.from(),head:i.to()});r.length&&this.setSelections(r,0)}))}(n(0))},function(e,t,n){!function(e){"use strict";function t(e){for(var t={},n=0;n<e.length;++n)t[e[n].toLowerCase()]=!0;return t}e.defineMode("css",(function(t,n){var r=n.inline;n.propertyKeywords||(n=e.resolveMode("text/css"));var i,o,a=t.indentUnit,l=n.tokenHooks,s=n.documentTypes||{},c=n.mediaTypes||{},u=n.mediaFeatures||{},f=n.mediaValueKeywords||{},d=n.propertyKeywords||{},h=n.nonStandardPropertyKeywords||{},p=n.fontProperties||{},m=n.counterDescriptors||{},g=n.colorKeywords||{},v=n.valueKeywords||{},y=n.allowNested,b=n.lineComment,x=!0===n.supportsAtComponent;function w(e,t){return i=t,e}function k(e,t){var n=e.next();if(l[n]){var r=l[n](e,t);if(!1!==r)return r}return"@"==n?(e.eatWhile(/[\w\\\-]/),w("def",e.current())):"="==n||("~"==n||"|"==n)&&e.eat("=")?w(null,"compare"):'"'==n||"'"==n?(t.tokenize=C(n),t.tokenize(e,t)):"#"==n?(e.eatWhile(/[\w\\\-]/),w("atom","hash")):"!"==n?(e.match(/^\s*\w*/),w("keyword","important")):/\d/.test(n)||"."==n&&e.eat(/\d/)?(e.eatWhile(/[\w.%]/),w("number","unit")):"-"!==n?/[,+>*\/]/.test(n)?w(null,"select-op"):"."==n&&e.match(/^-?[_a-z][_a-z0-9-]*/i)?w("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(n)?w(null,n):e.match(/[\w-.]+(?=\()/)?(/^(url(-prefix)?|domain|regexp)$/.test(e.current().toLowerCase())&&(t.tokenize=S),w("variable callee","variable")):/[\w\\\-]/.test(n)?(e.eatWhile(/[\w\\\-]/),w("property","word")):w(null,null):/[\d.]/.test(e.peek())?(e.eatWhile(/[\w.%]/),w("number","unit")):e.match(/^-[\w\\\-]*/)?(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?w("variable-2","variable-definition"):w("variable-2","variable")):e.match(/^\w+-/)?w("meta","meta"):void 0}function C(e){return function(t,n){for(var r,i=!1;null!=(r=t.next());){if(r==e&&!i){")"==e&&t.backUp(1);break}i=!i&&"\\"==r}return(r==e||!i&&")"!=e)&&(n.tokenize=null),w("string","string")}}function S(e,t){return e.next(),e.match(/\s*[\"\')]/,!1)?t.tokenize=null:t.tokenize=C(")"),w(null,"(")}function T(e,t,n){this.type=e,this.indent=t,this.prev=n}function L(e,t,n,r){return e.context=new T(n,t.indentation()+(!1===r?0:a),e.context),n}function M(e){return e.context.prev&&(e.context=e.context.prev),e.context.type}function O(e,t,n){return E[n.context.type](e,t,n)}function N(e,t,n,r){for(var i=r||1;i>0;i--)n.context=n.context.prev;return O(e,t,n)}function A(e){var t=e.current().toLowerCase();o=v.hasOwnProperty(t)?"atom":g.hasOwnProperty(t)?"keyword":"variable"}var E={top:function(e,t,n){if("{"==e)return L(n,t,"block");if("}"==e&&n.context.prev)return M(n);if(x&&/@component/i.test(e))return L(n,t,"atComponentBlock");if(/^@(-moz-)?document$/i.test(e))return L(n,t,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/i.test(e))return L(n,t,"atBlock");if(/^@(font-face|counter-style)/i.test(e))return n.stateArg=e,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(e))return"keyframes";if(e&&"@"==e.charAt(0))return L(n,t,"at");if("hash"==e)o="builtin";else if("word"==e)o="tag";else{if("variable-definition"==e)return"maybeprop";if("interpolation"==e)return L(n,t,"interpolation");if(":"==e)return"pseudo";if(y&&"("==e)return L(n,t,"parens")}return n.context.type},block:function(e,t,n){if("word"==e){var r=t.current().toLowerCase();return d.hasOwnProperty(r)?(o="property","maybeprop"):h.hasOwnProperty(r)?(o="string-2","maybeprop"):y?(o=t.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(o+=" error","maybeprop")}return"meta"==e?"block":y||"hash"!=e&&"qualifier"!=e?E.top(e,t,n):(o="error","block")},maybeprop:function(e,t,n){return":"==e?L(n,t,"prop"):O(e,t,n)},prop:function(e,t,n){if(";"==e)return M(n);if("{"==e&&y)return L(n,t,"propBlock");if("}"==e||"{"==e)return N(e,t,n);if("("==e)return L(n,t,"parens");if("hash"!=e||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(t.current())){if("word"==e)A(t);else if("interpolation"==e)return L(n,t,"interpolation")}else o+=" error";return"prop"},propBlock:function(e,t,n){return"}"==e?M(n):"word"==e?(o="property","maybeprop"):n.context.type},parens:function(e,t,n){return"{"==e||"}"==e?N(e,t,n):")"==e?M(n):"("==e?L(n,t,"parens"):"interpolation"==e?L(n,t,"interpolation"):("word"==e&&A(t),"parens")},pseudo:function(e,t,n){return"meta"==e?"pseudo":"word"==e?(o="variable-3",n.context.type):O(e,t,n)},documentTypes:function(e,t,n){return"word"==e&&s.hasOwnProperty(t.current())?(o="tag",n.context.type):E.atBlock(e,t,n)},atBlock:function(e,t,n){if("("==e)return L(n,t,"atBlock_parens");if("}"==e||";"==e)return N(e,t,n);if("{"==e)return M(n)&&L(n,t,y?"block":"top");if("interpolation"==e)return L(n,t,"interpolation");if("word"==e){var r=t.current().toLowerCase();o="only"==r||"not"==r||"and"==r||"or"==r?"keyword":c.hasOwnProperty(r)?"attribute":u.hasOwnProperty(r)?"property":f.hasOwnProperty(r)?"keyword":d.hasOwnProperty(r)?"property":h.hasOwnProperty(r)?"string-2":v.hasOwnProperty(r)?"atom":g.hasOwnProperty(r)?"keyword":"error"}return n.context.type},atComponentBlock:function(e,t,n){return"}"==e?N(e,t,n):"{"==e?M(n)&&L(n,t,y?"block":"top",!1):("word"==e&&(o="error"),n.context.type)},atBlock_parens:function(e,t,n){return")"==e?M(n):"{"==e||"}"==e?N(e,t,n,2):E.atBlock(e,t,n)},restricted_atBlock_before:function(e,t,n){return"{"==e?L(n,t,"restricted_atBlock"):"word"==e&&"@counter-style"==n.stateArg?(o="variable","restricted_atBlock_before"):O(e,t,n)},restricted_atBlock:function(e,t,n){return"}"==e?(n.stateArg=null,M(n)):"word"==e?(o="@font-face"==n.stateArg&&!p.hasOwnProperty(t.current().toLowerCase())||"@counter-style"==n.stateArg&&!m.hasOwnProperty(t.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},keyframes:function(e,t,n){return"word"==e?(o="variable","keyframes"):"{"==e?L(n,t,"top"):O(e,t,n)},at:function(e,t,n){return";"==e?M(n):"{"==e||"}"==e?N(e,t,n):("word"==e?o="tag":"hash"==e&&(o="builtin"),"at")},interpolation:function(e,t,n){return"}"==e?M(n):"{"==e||";"==e?N(e,t,n):("word"==e?o="variable":"variable"!=e&&"("!=e&&")"!=e&&(o="error"),"interpolation")}};return{startState:function(e){return{tokenize:null,state:r?"block":"top",stateArg:null,context:new T(r?"block":"top",e||0,null)}},token:function(e,t){if(!t.tokenize&&e.eatSpace())return null;var n=(t.tokenize||k)(e,t);return n&&"object"==typeof n&&(i=n[1],n=n[0]),o=n,"comment"!=i&&(t.state=E[t.state](i,e,t)),o},indent:function(e,t){var n=e.context,r=t&&t.charAt(0),i=n.indent;return"prop"!=n.type||"}"!=r&&")"!=r||(n=n.prev),n.prev&&("}"!=r||"block"!=n.type&&"top"!=n.type&&"interpolation"!=n.type&&"restricted_atBlock"!=n.type?(")"!=r||"parens"!=n.type&&"atBlock_parens"!=n.type)&&("{"!=r||"at"!=n.type&&"atBlock"!=n.type)||(i=Math.max(0,n.indent-a)):i=(n=n.prev).indent),i},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:b,fold:"brace"}}));var n=["domain","regexp","url","url-prefix"],r=t(n),i=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],o=t(i),a=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],l=t(a),s=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],c=t(s),u=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","mix-blend-mode","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],f=t(u),d=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],h=t(d),p=t(["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"]),m=t(["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"]),g=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],v=t(g),y=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],b=t(y),x=n.concat(i).concat(a).concat(s).concat(u).concat(d).concat(g).concat(y);function w(e,t){for(var n,r=!1;null!=(n=e.next());){if(r&&"/"==n){t.tokenize=null;break}r="*"==n}return["comment","comment"]}e.registerHelper("hintWords","css",x),e.defineMIME("text/css",{documentTypes:r,mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,fontProperties:p,counterDescriptors:m,colorKeywords:v,valueKeywords:b,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=w,w(e,t))}},name:"css"}),e.defineMIME("text/x-scss",{mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,colorKeywords:v,valueKeywords:b,fontProperties:p,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=w,w(e,t)):["operator","operator"]},":":function(e){return!!e.match(/\s*\{/,!1)&&[null,null]},$:function(e){return e.match(/^[\w-]+/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(e){return!!e.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),e.defineMIME("text/x-less",{mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,colorKeywords:v,valueKeywords:b,fontProperties:p,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=w,w(e,t)):["operator","operator"]},"@":function(e){return e.eat("{")?[null,"interpolation"]:!e.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i,!1)&&(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),e.defineMIME("text/x-gss",{documentTypes:r,mediaTypes:o,mediaFeatures:l,propertyKeywords:f,nonStandardPropertyKeywords:h,fontProperties:p,counterDescriptors:m,colorKeywords:v,valueKeywords:b,supportsAtComponent:!0,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=w,w(e,t))}},name:"css",helperType:"gss"})}(n(0))},function(e,t,n){!function(e){"use strict";function t(t,n,i,o){if(i&&i.call){var a=i;i=null}else a=r(t,i,"rangeFinder");"number"==typeof n&&(n=e.Pos(n,0));var l=r(t,i,"minFoldSize");function s(e){var r=a(t,n);if(!r||r.to.line-r.from.line<l)return null;for(var i=t.findMarksAt(r.from),s=0;s<i.length;++s)if(i[s].__isFold&&"fold"!==o){if(!e)return null;r.cleared=!0,i[s].clear()}return r}var c=s(!0);if(r(t,i,"scanUp"))for(;!c&&n.line>t.firstLine();)n=e.Pos(n.line-1,0),c=s(!1);if(c&&!c.cleared&&"unfold"!==o){var u=function(e,t){var n=r(e,t,"widget");if("string"==typeof n){var i=document.createTextNode(n);(n=document.createElement("span")).appendChild(i),n.className="CodeMirror-foldmarker"}else n&&(n=n.cloneNode(!0));return n}(t,i);e.on(u,"mousedown",(function(t){f.clear(),e.e_preventDefault(t)}));var f=t.markText(c.from,c.to,{replacedWith:u,clearOnEnter:r(t,i,"clearOnEnter"),__isFold:!0});f.on("clear",(function(n,r){e.signal(t,"unfold",t,n,r)})),e.signal(t,"fold",t,c.from,c.to)}}e.newFoldFunction=function(e,n){return function(r,i){t(r,i,{rangeFinder:e,widget:n})}},e.defineExtension("foldCode",(function(e,n,r){t(this,e,n,r)})),e.defineExtension("isFolded",(function(e){for(var t=this.findMarksAt(e),n=0;n<t.length;++n)if(t[n].__isFold)return!0})),e.commands.toggleFold=function(e){e.foldCode(e.getCursor())},e.commands.fold=function(e){e.foldCode(e.getCursor(),null,"fold")},e.commands.unfold=function(e){e.foldCode(e.getCursor(),null,"unfold")},e.commands.foldAll=function(t){t.operation((function(){for(var n=t.firstLine(),r=t.lastLine();n<=r;n++)t.foldCode(e.Pos(n,0),null,"fold")}))},e.commands.unfoldAll=function(t){t.operation((function(){for(var n=t.firstLine(),r=t.lastLine();n<=r;n++)t.foldCode(e.Pos(n,0),null,"unfold")}))},e.registerHelper("fold","combine",(function(){var e=Array.prototype.slice.call(arguments,0);return function(t,n){for(var r=0;r<e.length;++r){var i=e[r](t,n);if(i)return i}}})),e.registerHelper("fold","auto",(function(e,t){for(var n=e.getHelpers(t,"fold"),r=0;r<n.length;r++){var i=n[r](e,t);if(i)return i}}));var n={rangeFinder:e.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(e,t,r){if(t&&void 0!==t[r])return t[r];var i=e.options.foldOptions;return i&&void 0!==i[r]?i[r]:n[r]}e.defineOption("foldOptions",null),e.defineExtension("foldOption",(function(e,t){return r(this,e,t)}))}(n(0))},function(e,t,n){n(3),n(4),n(8),n(9),n(10),n(11),n(12),n(1),n(2),n(5),n(13),n(14),n(15),n(16),n(17),n(18),n(19),n(20),n(22),n(23),n(24),n(6),n(25),n(26),n(27),n(28),n(29),n(30),e.exports=n(0)},function(e,t,n){!function(e){"use strict";function t(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function n(e){return e.state.search||(e.state.search=new t)}function r(e){return"string"==typeof e&&e==e.toLowerCase()}function i(e,t,n){return e.getSearchCursor(t,n,{caseFold:r(t),multiline:!0})}function o(e,t,n,r,i){e.openDialog?e.openDialog(t,i,{value:r,selectValueOnOpen:!0}):i(prompt(n,r))}function a(e){return e.replace(/\\([nrt\\])/g,(function(e,t){return"n"==t?"\n":"r"==t?"\r":"t"==t?"\t":"\\"==t?"\\":e}))}function l(e){var t=e.match(/^\/(.*)\/([a-z]*)$/);if(t)try{e=new RegExp(t[1],-1==t[2].indexOf("i")?"":"i")}catch(e){}else e=a(e);return("string"==typeof e?""==e:e.test(""))&&(e=/x^/),e}var s;function c(e,t,n){t.queryText=n,t.query=l(n),e.removeOverlay(t.overlay,r(t.query)),t.overlay=function(e,t){return"string"==typeof e?e=new RegExp(e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),t?"gi":"g"):e.global||(e=new RegExp(e.source,e.ignoreCase?"gi":"g")),{token:function(t){e.lastIndex=t.pos;var n=e.exec(t.string);if(n&&n.index==t.pos)return t.pos+=n[0].length||1,"searching";n?t.pos=n.index:t.skipToEnd()}}}(t.query,r(t.query)),e.addOverlay(t.overlay),e.showMatchesOnScrollbar&&(t.annotate&&(t.annotate.clear(),t.annotate=null),t.annotate=e.showMatchesOnScrollbar(t.query,r(t.query)))}function u(t,r,i,a){if(!s){let e=t.getWrapperElement().ownerDocument,n=e.createElement("input");n.type="search",n.placeholder=t.l10n("findCmd.promptMessage"),n.style.marginInlineStart="1em",n.style.marginInlineEnd="1em",n.style.flexGrow="1",n.addEventListener("focus",()=>n.select()),(s=e.createElement("div")).appendChild(n),s.style.display="flex"}var l=n(t);if(l.query)return f(t,r);var u=t.getSelection()||l.lastQuery;if(u instanceof RegExp&&"x^"==u.source&&(u=null),i&&t.openDialog){var h=null,p=function(n,r){e.e_stop(r),n&&(n!=l.queryText&&(c(t,l,n),l.posFrom=l.posTo=t.getCursor()),h&&(h.style.opacity=1),f(t,r.shiftKey,(function(e,n){var r;n.line<3&&document.querySelector&&(r=t.display.wrapper.querySelector(".CodeMirror-dialog"))&&r.getBoundingClientRect().bottom-4>t.cursorCoords(n,"window").top&&((h=r).style.opacity=.4)})))};!function(e,t,n,r,i){e.openDialog(t,r,{value:n,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){d(e)},onKeyDown:i})}(t,s,u,p,(function(r,i){var o=e.keyName(r),a=t.getOption("extraKeys"),l=a&&a[o]||e.keyMap[t.getOption("keyMap")][o];"findNext"==l||"findPrev"==l||"findPersistentNext"==l||"findPersistentPrev"==l?(e.e_stop(r),c(t,n(t),i),t.execCommand(l)):"find"!=l&&"findPersistent"!=l||(e.e_stop(r),p(i,r))})),a&&u&&(c(t,l,u),f(t,r))}else o(t,s,"Search for:",u,(function(e){e&&!l.query&&t.operation((function(){c(t,l,e),l.posFrom=l.posTo=t.getCursor(),f(t,r)}))}))}function f(t,r,o){t.operation((function(){var a=n(t),l=i(t,a.query,r?a.posFrom:a.posTo);(l.find(r)||(l=i(t,a.query,r?e.Pos(t.lastLine()):e.Pos(t.firstLine(),0))).find(r))&&(t.setSelection(l.from(),l.to()),t.scrollIntoView({from:l.from(),to:l.to()},20),a.posFrom=l.from(),a.posTo=l.to(),o&&o(l.from(),l.to()))}))}function d(e){e.operation((function(){var t=n(e);t.lastQuery=t.query,t.query&&(t.query=t.queryText=null,e.removeOverlay(t.overlay),t.annotate&&(t.annotate.clear(),t.annotate=null))}))}function h(e,t,n){e.operation((function(){for(var r=i(e,t);r.findNext();)if("string"!=typeof t){var o=e.getRange(r.from(),r.to()).match(t);r.replace(n.replace(/\$(\d)/g,(function(e,t){return o[t]})))}else r.replace(n)}))}function p(e,t){if(e.getOption("readOnly"))return;var r=e.getSelection()||n(e).lastQuery;let s=e.getWrapperElement().ownerDocument,c=s.createElement("span");c.classList.add("CodeMirror-search-label"),c.textContent=t?"Replace all:":"Replace:";let u=s.createDocumentFragment();u.appendChild(c.cloneNode(!0));let f=s.createElement("input");f.setAttribute("type","text"),f.setAttribute("style","width: 10em"),f.classList.add("CodeMirror-search-field"),u.appendChild(f);let p=s.createElement("span");p.setAttribute("style","color: #888"),p.classList.add("CodeMirror-search-hint"),p.textContent="(Use /re/ syntax for regexp search)",u.appendChild(p),o(e,u,c,r,(function(n){if(!n)return;n=l(n);let r=s.createDocumentFragment(),u=c.cloneNode(!1);u.textContent="With:",r.appendChild(u);let f=s.createElement("input");f.setAttribute("type","text"),f.setAttribute("style","width: 10em"),f.classList.add("CodeMirror-search-field"),r.appendChild(f),o(e,r,"Replace with:","",(function(r){if(r=a(r),t)h(e,n,r);else{d(e);var o=i(e,n,e.getCursor("from")),l=function(){var t,a=o.from();if(!(t=o.findNext())&&(o=i(e,n),!(t=o.findNext())||a&&o.from().line==a.line&&o.from().ch==a.ch))return;e.setSelection(o.from(),o.to()),e.scrollIntoView({from:o.from(),to:o.to()});let f=s.createDocumentFragment(),d=c.cloneNode(!1);d.textContent="Replace?",f.appendChild(d);let p=s.createElement("button");p.textContent="Yes",f.appendChild(p);let m=s.createElement("button");m.textContent="No",f.appendChild(m);let g=s.createElement("button");g.textContent="All",f.appendChild(g);let v=s.createElement("button");v.textContent="Stop",f.appendChild(v),function(e,t,n,r){e.openConfirm?e.openConfirm(t,r):confirm(n)&&r[0]()}(e,f,"Replace?",[function(){u(t)},l,function(){h(e,n,r)}])},u=function(e){o.replace("string"==typeof n?r:r.replace(/\$(\d)/g,(function(t,n){return e[n]}))),l()};l()}}))}))}e.commands.find=function(e){d(e),u(e)},e.commands.findPersistent=function(e){d(e),u(e,!1,!0)},e.commands.findPersistentNext=function(e){u(e,!1,!0,!0)},e.commands.findPersistentPrev=function(e){u(e,!0,!0,!0)},e.commands.findNext=u,e.commands.findPrev=function(e){u(e,!0)},e.commands.clearSearch=d,e.commands.replace=p,e.commands.replaceAll=function(e){p(e,!0)}}(n(0),n(4),n(3))},function(e,t,n){!function(e){var t=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),n=e.Pos,r={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<","<":">>",">":"<<"};function i(e){return e&&e.bracketRegex||/[(){}[\]]/}function o(e,t,o){var l=e.getLineHandle(t.line),s=t.ch-1,c=o&&o.afterCursor;null==c&&(c=/(^| )cm-fat-cursor($| )/.test(e.getWrapperElement().className));var u=i(o),f=!c&&s>=0&&u.test(l.text.charAt(s))&&r[l.text.charAt(s)]||u.test(l.text.charAt(s+1))&&r[l.text.charAt(++s)];if(!f)return null;var d=">"==f.charAt(1)?1:-1;if(o&&o.strict&&d>0!=(s==t.ch))return null;var h=e.getTokenTypeAt(n(t.line,s+1)),p=a(e,n(t.line,s+(d>0?1:0)),d,h||null,o);return null==p?null:{from:n(t.line,s),to:p&&p.pos,match:p&&p.ch==f.charAt(0),forward:d>0}}function a(e,t,o,a,l){for(var s=l&&l.maxScanLineLength||1e4,c=l&&l.maxScanLines||1e3,u=[],f=i(l),d=o>0?Math.min(t.line+c,e.lastLine()+1):Math.max(e.firstLine()-1,t.line-c),h=t.line;h!=d;h+=o){var p=e.getLine(h);if(p){var m=o>0?0:p.length-1,g=o>0?p.length:-1;if(!(p.length>s))for(h==t.line&&(m=t.ch-(o<0?1:0));m!=g;m+=o){var v=p.charAt(m);if(f.test(v)&&(void 0===a||e.getTokenTypeAt(n(h,m+1))==a)){var y=r[v];if(y&&">"==y.charAt(1)==o>0)u.push(v);else{if(!u.length)return{pos:n(h,m),ch:v};u.pop()}}}}}return h-o!=(o>0?e.lastLine():e.firstLine())&&null}function l(e,r,i){for(var a=e.state.matchBrackets.maxHighlightLineLength||1e3,l=[],s=e.listSelections(),c=0;c<s.length;c++){var u=s[c].empty()&&o(e,s[c].head,i);if(u&&e.getLine(u.from.line).length<=a){var f=u.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";l.push(e.markText(u.from,n(u.from.line,u.from.ch+1),{className:f})),u.to&&e.getLine(u.to.line).length<=a&&l.push(e.markText(u.to,n(u.to.line,u.to.ch+1),{className:f}))}}if(l.length){t&&e.state.focused&&e.focus();var d=function(){e.operation((function(){for(var e=0;e<l.length;e++)l[e].clear()}))};if(!r)return d;setTimeout(d,800)}}function s(e){e.operation((function(){e.state.matchBrackets.currentlyHighlighted&&(e.state.matchBrackets.currentlyHighlighted(),e.state.matchBrackets.currentlyHighlighted=null),e.state.matchBrackets.currentlyHighlighted=l(e,!1,e.state.matchBrackets)}))}e.defineOption("matchBrackets",!1,(function(t,n,r){r&&r!=e.Init&&(t.off("cursorActivity",s),t.state.matchBrackets&&t.state.matchBrackets.currentlyHighlighted&&(t.state.matchBrackets.currentlyHighlighted(),t.state.matchBrackets.currentlyHighlighted=null)),n&&(t.state.matchBrackets="object"==typeof n?n:{},t.on("cursorActivity",s))})),e.defineExtension("matchBrackets",(function(){l(this,!0)})),e.defineExtension("findMatchingBracket",(function(e,t,n){return(n||"boolean"==typeof t)&&(n?(n.strict=t,t=n):t=t?{strict:!0}:null),o(this,e,t)})),e.defineExtension("scanForBracket",(function(e,t,n,r){return a(this,e,t,n,r)}))}(n(0))},function(e,t,n){!function(e){var t={pairs:"()[]{}''\"\"",closeBefore:")]}'\":;>",triples:"",explode:"[]{}"},n=e.Pos;function r(e,n){return"pairs"==n&&"string"==typeof e?e:"object"==typeof e&&null!=e[n]?e[n]:t[n]}e.defineOption("autoCloseBrackets",!1,(function(t,n,a){a&&a!=e.Init&&(t.removeKeyMap(i),t.state.closeBrackets=null),n&&(o(r(n,"pairs")),t.state.closeBrackets=n,t.addKeyMap(i))}));var i={Backspace:function(t){var i=l(t);if(!i||t.getOption("disableInput"))return e.Pass;for(var o=r(i,"pairs"),a=t.listSelections(),c=0;c<a.length;c++){if(!a[c].empty())return e.Pass;var u=s(t,a[c].head);if(!u||o.indexOf(u)%2!=0)return e.Pass}for(c=a.length-1;c>=0;c--){var f=a[c].head;t.replaceRange("",n(f.line,f.ch-1),n(f.line,f.ch+1),"+delete")}},Enter:function(t){var n=l(t),i=n&&r(n,"explode");if(!i||t.getOption("disableInput"))return e.Pass;for(var o=t.listSelections(),a=0;a<o.length;a++){if(!o[a].empty())return e.Pass;var c=s(t,o[a].head);if(!c||i.indexOf(c)%2!=0)return e.Pass}t.operation((function(){var e=t.lineSeparator()||"\n";t.replaceSelection(e+e,null),t.execCommand("goCharLeft"),o=t.listSelections();for(var n=0;n<o.length;n++){var r=o[n].head.line;t.indentLine(r,null,!0),t.indentLine(r+1,null,!0)}}))}};function o(e){for(var t=0;t<e.length;t++){var n=e.charAt(t),r="'"+n+"'";i[r]||(i[r]=a(n))}}function a(t){return function(i){return function(t,i){var o=l(t);if(!o||t.getOption("disableInput"))return e.Pass;var a=r(o,"pairs"),s=a.indexOf(i);if(-1==s)return e.Pass;for(var u,f=r(o,"closeBefore"),d=r(o,"triples"),h=a.charAt(s+1)==i,p=t.listSelections(),m=s%2==0,g=0;g<p.length;g++){var v,y=p[g],b=y.head,x=t.getRange(b,n(b.line,b.ch+1));if(m&&!y.empty())v="surround";else if(!h&&m||x!=i)if(h&&b.ch>1&&d.indexOf(i)>=0&&t.getRange(n(b.line,b.ch-2),b)==i+i){if(b.ch>2&&/\bstring/.test(t.getTokenTypeAt(n(b.line,b.ch-2))))return e.Pass;v="addFour"}else if(h){var w=0==b.ch?" ":t.getRange(n(b.line,b.ch-1),b);if(e.isWordChar(x)||w==i||e.isWordChar(w))return e.Pass;v="both"}else{if(!m||!(0===x.length||/\s/.test(x)||f.indexOf(x)>-1))return e.Pass;v="both"}else v=h&&c(t,b)?"both":d.indexOf(i)>=0&&t.getRange(b,n(b.line,b.ch+3))==i+i+i?"skipThree":"skip";if(u){if(u!=v)return e.Pass}else u=v}var k=s%2?a.charAt(s-1):i,C=s%2?i:a.charAt(s+1);t.operation((function(){if("skip"==u)t.execCommand("goCharRight");else if("skipThree"==u)for(var r=0;r<3;r++)t.execCommand("goCharRight");else if("surround"==u){var i=t.getSelections();for(r=0;r<i.length;r++)i[r]=k+i[r]+C;for(t.replaceSelections(i,"around"),i=t.listSelections().slice(),r=0;r<i.length;r++)i[r]=(o=i[r],a=void 0,a=e.cmpPos(o.anchor,o.head)>0,{anchor:new n(o.anchor.line,o.anchor.ch+(a?-1:1)),head:new n(o.head.line,o.head.ch+(a?1:-1))});t.setSelections(i)}else"both"==u?(t.replaceSelection(k+C,null),t.triggerElectric(k+C),t.execCommand("goCharLeft")):"addFour"==u&&(t.replaceSelection(k+k+k+k,"before"),t.execCommand("goCharRight"));var o,a}))}(i,t)}}function l(e){var t=e.state.closeBrackets;return!t||t.override?t:e.getModeAt(e.getCursor()).closeBrackets||t}function s(e,t){var r=e.getRange(n(t.line,t.ch-1),n(t.line,t.ch+1));return 2==r.length?r:null}function c(e,t){var r=e.getTokenAt(n(t.line,t.ch+1));return/\bstring/.test(r.type)&&r.start==t.ch&&(0==t.ch||!/\bstring/.test(e.getTokenTypeAt(t)))}o(t.pairs+"`")}(n(0))},function(e,t,n){!function(e){"use strict";var t={},n=/[^\s\u00a0]/,r=e.Pos;function i(e){var t=e.search(n);return-1==t?0:t}function o(e,t){var n=e.getMode();return!1!==n.useInnerComments&&n.innerMode?e.getModeAt(t):n}e.commands.toggleComment=function(e){e.toggleComment()},e.defineExtension("toggleComment",(function(e){e||(e=t);for(var n=1/0,i=this.listSelections(),o=null,a=i.length-1;a>=0;a--){var l=i[a].from(),s=i[a].to();l.line>=n||(s.line>=n&&(s=r(n,0)),n=l.line,null==o?this.uncomment(l,s,e)?o="un":(this.lineComment(l,s,e),o="line"):"un"==o?this.uncomment(l,s,e):this.lineComment(l,s,e))}})),e.defineExtension("lineComment",(function(e,a,l){l||(l=t);var s=this,c=o(s,e),u=s.getLine(e.line);if(null!=u&&(f=e,d=u,!/\bstring\b/.test(s.getTokenTypeAt(r(f.line,0)))||/^[\'\"\`]/.test(d))){var f,d,h=l.lineComment||c.lineComment;if(h){var p=Math.min(0!=a.ch||a.line==e.line?a.line+1:a.line,s.lastLine()+1),m=null==l.padding?" ":l.padding,g=l.commentBlankLines||e.line==a.line;s.operation((function(){if(l.indent){for(var t=null,o=e.line;o<p;++o){var a=(c=s.getLine(o)).slice(0,i(c));(null==t||t.length>a.length)&&(t=a)}for(o=e.line;o<p;++o){var c=s.getLine(o),u=t.length;(g||n.test(c))&&(c.slice(0,u)!=t&&(u=i(c)),s.replaceRange(t+h+m,r(o,0),r(o,u)))}}else for(o=e.line;o<p;++o)(g||n.test(s.getLine(o)))&&s.replaceRange(h+m,r(o,0))}))}else(l.blockCommentStart||c.blockCommentStart)&&(l.fullLines=!0,s.blockComment(e,a,l))}})),e.defineExtension("blockComment",(function(e,i,a){a||(a=t);var l=this,s=o(l,e),c=a.blockCommentStart||s.blockCommentStart,u=a.blockCommentEnd||s.blockCommentEnd;if(c&&u){if(!/\bcomment\b/.test(l.getTokenTypeAt(r(e.line,0)))){var f=Math.min(i.line,l.lastLine());f!=e.line&&0==i.ch&&n.test(l.getLine(f))&&--f;var d=null==a.padding?" ":a.padding;e.line>f||l.operation((function(){if(0!=a.fullLines){var t=n.test(l.getLine(f));l.replaceRange(d+u,r(f)),l.replaceRange(c+d,r(e.line,0));var o=a.blockCommentLead||s.blockCommentLead;if(null!=o)for(var h=e.line+1;h<=f;++h)(h!=f||t)&&l.replaceRange(o+d,r(h,0))}else l.replaceRange(u,i),l.replaceRange(c,e)}))}}else(a.lineComment||s.lineComment)&&0!=a.fullLines&&l.lineComment(e,i,a)})),e.defineExtension("uncomment",(function(e,i,a){a||(a=t);var l,s=this,c=o(s,e),u=Math.min(0!=i.ch||i.line==e.line?i.line:i.line-1,s.lastLine()),f=Math.min(e.line,u),d=a.lineComment||c.lineComment,h=[],p=null==a.padding?" ":a.padding;e:if(d){for(var m=f;m<=u;++m){var g=s.getLine(m),v=g.indexOf(d);if(v>-1&&!/comment/.test(s.getTokenTypeAt(r(m,v+1)))&&(v=-1),-1==v&&n.test(g))break e;if(v>-1&&n.test(g.slice(0,v)))break e;h.push(g)}if(s.operation((function(){for(var e=f;e<=u;++e){var t=h[e-f],n=t.indexOf(d),i=n+d.length;n<0||(t.slice(i,i+p.length)==p&&(i+=p.length),l=!0,s.replaceRange("",r(e,n),r(e,i)))}})),l)return!0}var y=a.blockCommentStart||c.blockCommentStart,b=a.blockCommentEnd||c.blockCommentEnd;if(!y||!b)return!1;var x=a.blockCommentLead||c.blockCommentLead,w=s.getLine(f),k=w.indexOf(y);if(-1==k)return!1;var C=u==f?w:s.getLine(u),S=C.indexOf(b,u==f?k+y.length:0),T=r(f,k+1),L=r(u,S+1);if(-1==S||!/comment/.test(s.getTokenTypeAt(T))||!/comment/.test(s.getTokenTypeAt(L))||s.getRange(T,L,"\n").indexOf(b)>-1)return!1;var M=w.lastIndexOf(y,e.ch),O=-1==M?-1:w.slice(0,e.ch).indexOf(b,M+y.length);if(-1!=M&&-1!=O&&O+b.length!=e.ch)return!1;O=C.indexOf(b,i.ch);var N=C.slice(i.ch).lastIndexOf(y,O-i.ch);return M=-1==O||-1==N?-1:i.ch+N,(-1==O||-1==M||M==i.ch)&&(s.operation((function(){s.replaceRange("",r(u,S-(p&&C.slice(S-p.length,S)==p?p.length:0)),r(u,S+b.length));var e=k+y.length;if(p&&w.slice(e,e+p.length)==p&&(e+=p.length),s.replaceRange("",r(f,k),r(f,e)),x)for(var t=f+1;t<=u;++t){var i=s.getLine(t),o=i.indexOf(x);if(-1!=o&&!n.test(i.slice(0,o))){var a=o+x.length;p&&i.slice(a,a+p.length)==p&&(a+=p.length),s.replaceRange("",r(t,o),r(t,a))}}})),!0)}))}(n(0))},function(e,t,n){!function(e){e.inputStyles.accessibleTextArea=class extends e.inputStyles.textarea{init(e){super.init(e),this.textarea.addEventListener("compositionstart",this._onCompositionStart.bind(this))}_onCompositionStart(){if(this.textarea.selectionEnd===this.textarea.value.length)return;this.textarea.value=this.textarea.value.substring(0,this.textarea.selectionEnd);const e=this.textarea.value.length;this.textarea.setSelectionRange(e,e),this.prevInput=this.textarea.value}reset(e){if(e||this.contextMenuPending||this.composing||this.cm.somethingSelected())return void super.reset(e);const t=this.cm.getCursor();let n,r;if(this.cm.options.lineWrapping){const e=this.cm.charCoords(t,"page").top;n=this.cm.coordsChar({left:-1/0,top:e}),r=this.cm.coordsChar({left:1/0,top:e})}else{const e=1e3*Math.floor(t.ch/1e3);n={ch:e,line:t.line},r={ch:e+1e3,line:t.line}}this.textarea.value=this.cm.getRange(n,r);const i=t.ch-n.ch;this.textarea.setSelectionRange(i,i),this.prevInput=this.textarea.value}poll(){if(this.contextMenuPending||this.composing)return super.poll();const e=this.textarea.value;let t=0;const n=Math.min(this.prevInput.length,e.length);for(;t<n&&this.prevInput[t]===e[t];)++t;let r=0;for(;r<n-t&&this.prevInput[this.prevInput.length-r-1]===e[e.length-r-1];)++r;const i=this.textarea;this.textarea=document.createElement("textarea"),this.textarea.value=e.substring(t,e.length-r),this.textarea.setSelectionRange(i.selectionStart-t,i.selectionEnd-t),this.prevInput="";const o=super.poll();return this.prevInput=e,this.textarea=i,o}}}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("clojure",(function(t){var n=["false","nil","true"],r=[".","catch","def","do","if","monitor-enter","monitor-exit","new","quote","recur","set!","throw","try","var"],i=["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","cast","cat","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"];e.registerHelper("hintWords","clojure",[].concat(n,r,i));var o=g(n),a=g(r),l=g(i),s=g(["->","->>","as->","binding","bound-fn","case","catch","comment","cond","cond->","cond->>","condp","def","definterface","defmethod","defn","defmacro","defprotocol","defrecord","defstruct","deftype","do","doseq","dotimes","doto","extend","extend-protocol","extend-type","fn","for","future","if","if-let","if-not","if-some","let","letfn","locking","loop","ns","proxy","reify","struct-map","some->","some->>","try","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn"]),c=/^(?:[\\\[\]\s"(),;@^`{}~]|$)/,u=/^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/,f=/^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/,d=/^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;function h(e,t){if(e.eatSpace()||e.eat(","))return["space",null];if(e.match(u))return[null,"number"];if(e.match(f))return[null,"string-2"];if(e.eat(/^"/))return(t.tokenize=p)(e,t);if(e.eat(/^[(\[{]/))return["open","bracket"];if(e.eat(/^[)\]}]/))return["close","bracket"];if(e.eat(/^;/))return e.skipToEnd(),["space","comment"];if(e.eat(/^[#'@^`~]/))return[null,"meta"];var n=e.match(d),r=n&&n[0];return r?"comment"===r&&"("===t.lastToken?(t.tokenize=m)(e,t):v(r,o)||":"===r.charAt(0)?["symbol","atom"]:v(r,a)||v(r,l)?["symbol","keyword"]:"("===t.lastToken?["symbol","builtin"]:["symbol","variable"]:(e.next(),e.eatWhile((function(e){return!v(e,c)})),[null,"error"])}function p(e,t){for(var n,r=!1;n=e.next();){if('"'===n&&!r){t.tokenize=h;break}r=!r&&"\\"===n}return[null,"string"]}function m(e,t){for(var n,r=1;n=e.next();)if(")"===n&&r--,"("===n&&r++,0===r){e.backUp(1),t.tokenize=h;break}return["space","comment"]}function g(e){for(var t={},n=0;n<e.length;++n)t[e[n]]=!0;return t}function v(e,t){return t instanceof RegExp?t.test(e):t instanceof Object?t.propertyIsEnumerable(e):void 0}return{startState:function(){return{ctx:{prev:null,start:0,indentTo:0},lastToken:null,tokenize:h}},token:function(e,n){e.sol()&&"number"!=typeof n.ctx.indentTo&&(n.ctx.indentTo=n.ctx.start+1);var r=n.tokenize(e,n),i=r[0],o=r[1],a=e.current();return"space"!==i&&("("===n.lastToken&&null===n.ctx.indentTo?"symbol"===i&&v(a,s)?n.ctx.indentTo=n.ctx.start+t.indentUnit:n.ctx.indentTo="next":"next"===n.ctx.indentTo&&(n.ctx.indentTo=e.column()),n.lastToken=a),"open"===i?n.ctx={prev:n.ctx,start:e.column(),indentTo:null}:"close"===i&&(n.ctx=n.ctx.prev||n.ctx),o},indent:function(e){var t=e.ctx.indentTo;return"number"==typeof t?t:e.ctx.start+1},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),e.defineMIME("text/x-clojure","clojure"),e.defineMIME("text/x-clojurescript","clojure"),e.defineMIME("application/edn","clojure")}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("haxe",(function(e,t){var n=e.indentUnit;function r(e){return{type:e,style:"keyword"}}var i,o=r("keyword a"),a=r("keyword b"),l=r("keyword c"),s=r("operator"),c={type:"atom",style:"atom"},u={type:"attribute",style:"attribute"},f=r("typedef"),d={if:o,while:o,else:a,do:a,try:a,return:l,break:l,continue:l,new:l,throw:l,var:r("var"),inline:u,static:u,using:r("import"),public:u,private:u,cast:r("cast"),import:r("import"),macro:r("macro"),function:r("function"),catch:r("catch"),untyped:r("untyped"),callback:r("cb"),for:r("for"),switch:r("switch"),case:r("case"),default:r("default"),in:s,never:r("property_access"),trace:r("trace"),class:f,abstract:f,enum:f,interface:f,typedef:f,extends:f,implements:f,dynamic:f,true:c,false:c,null:c},h=/[+\-*&%=<>!?|]/;function p(e,t,n){return t.tokenize=n,n(e,t)}function m(e,t){for(var n,r=!1;null!=(n=e.next());){if(n==t&&!r)return!0;r=!r&&"\\"==n}}function g(e,t,n){return f=e,i=n,t}function v(e,t){var n=e.next();if('"'==n||"'"==n)return p(e,t,(r=n,function(e,t){return m(e,r)&&(t.tokenize=v),g("string","string")}));if(/[\[\]{}\(\),;\:\.]/.test(n))return g(n);if("0"==n&&e.eat(/x/i))return e.eatWhile(/[\da-f]/i),g("number","number");if(/\d/.test(n)||"-"==n&&e.eat(/\d/))return e.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/),g("number","number");if(t.reAllowed&&"~"==n&&e.eat(/\//))return m(e,"/"),e.eatWhile(/[gimsu]/),g("regexp","string-2");if("/"==n)return e.eat("*")?p(e,t,y):e.eat("/")?(e.skipToEnd(),g("comment","comment")):(e.eatWhile(h),g("operator",null,e.current()));if("#"==n)return e.skipToEnd(),g("conditional","meta");if("@"==n)return e.eat(/:/),e.eatWhile(/[\w_]/),g("metadata","meta");if(h.test(n))return e.eatWhile(h),g("operator",null,e.current());if(/[A-Z]/.test(n))return e.eatWhile(/[\w_<>]/),g("type","variable-3",i=e.current());e.eatWhile(/[\w_]/);var r,i=e.current(),o=d.propertyIsEnumerable(i)&&d[i];return o&&t.kwAllowed?g(o.type,o.style,i):g("variable","variable",i)}function y(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=v;break}r="*"==n}return g("comment","comment")}var b={atom:!0,number:!0,variable:!0,string:!0,regexp:!0};function x(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.prev=i,this.info=o,null!=r&&(this.align=r)}function w(e,t){for(var n=e.localVars;n;n=n.next)if(n.name==t)return!0}function k(e,t){if(/[a-z]/.test(t.charAt(0)))return!1;for(var n=e.importedtypes.length,r=0;r<n;r++)if(e.importedtypes[r]==t)return!0}function C(e){for(var t=S.state,n=t.importedtypes;n;n=n.next)if(n.name==e)return;t.importedtypes={name:e,next:t.importedtypes}}var S={state:null,column:null,marked:null,cc:null};function T(){for(var e=arguments.length-1;e>=0;e--)S.cc.push(arguments[e])}function L(){return T.apply(null,arguments),!0}function M(e,t){for(var n=t;n;n=n.next)if(n.name==e)return!0;return!1}function O(e){var t=S.state;if(t.context){if(S.marked="def",M(e,t.localVars))return;t.localVars={name:e,next:t.localVars}}else if(t.globalVars){if(M(e,t.globalVars))return;t.globalVars={name:e,next:t.globalVars}}}var N={name:"this",next:null};function A(){S.state.context||(S.state.localVars=N),S.state.context={prev:S.state.context,vars:S.state.localVars}}function E(){S.state.localVars=S.state.context.vars,S.state.context=S.state.context.prev}function z(e,t){var n=function(){var n=S.state;n.lexical=new x(n.indented,S.stream.column(),e,null,n.lexical,t)};return n.lex=!0,n}function P(){var e=S.state;e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function D(e){return function t(n){return n==e?L():";"==e?T():L(t)}}function I(e){return"@"==e?L(H):"var"==e?L(z("vardef"),X,D(";"),P):"keyword a"==e?L(z("form"),_,I,P):"keyword b"==e?L(z("form"),I,P):"{"==e?L(z("}"),A,G,P,E):";"==e?L():"attribute"==e?L(R):"function"==e?L(J):"for"==e?L(z("form"),D("("),z(")"),Z,D(")"),P,I,P):"variable"==e?L(z("stat"),U):"switch"==e?L(z("form"),_,z("}","switch"),D("{"),G,P,P):"case"==e?L(_,D(":")):"default"==e?L(D(":")):"catch"==e?L(z("form"),A,D("("),re,D(")"),I,P,E):"import"==e?L(j,D(";")):"typedef"==e?L(q):T(z("stat"),_,D(";"),P)}function _(e){return b.hasOwnProperty(e)||"type"==e?L(W):"function"==e?L(J):"keyword c"==e?L(F):"("==e?L(z(")"),F,D(")"),P,W):"operator"==e?L(_):"["==e?L(z("]"),$(F,"]"),P,W):"{"==e?L(z("}"),$(K,"}"),P,W):L()}function F(e){return e.match(/[;\}\)\],]/)?T():T(_)}function W(e,t){return"operator"==e&&/\+\+|--/.test(t)?L(W):"operator"==e||":"==e?L(_):";"!=e?"("==e?L(z(")"),$(_,")"),P,W):"."==e?L(V,W):"["==e?L(z("]"),_,D("]"),P,W):void 0:void 0}function R(e){return"attribute"==e?L(R):"function"==e?L(J):"var"==e?L(X):void 0}function H(e){return":"==e||"variable"==e?L(H):"("==e?L(z(")"),$(B,")"),P,I):void 0}function B(e){if("variable"==e)return L()}function j(e,t){return"variable"==e&&/[A-Z]/.test(t.charAt(0))?(C(t),L()):"variable"==e||"property"==e||"."==e||"*"==t?L(j):void 0}function q(e,t){return"variable"==e&&/[A-Z]/.test(t.charAt(0))?(C(t),L()):"type"==e&&/[A-Z]/.test(t.charAt(0))?L():void 0}function U(e){return":"==e?L(P,I):T(W,D(";"),P)}function V(e){if("variable"==e)return S.marked="property",L()}function K(e){if("variable"==e&&(S.marked="property"),b.hasOwnProperty(e))return L(D(":"),_)}function $(e,t){function n(r){return","==r?L(e,n):r==t?L():L(D(t))}return function(r){return r==t?L():T(e,n)}}function G(e){return"}"==e?L():T(I,G)}function X(e,t){return"variable"==e?(O(t),L(ee,Y)):L()}function Y(e,t){return"="==t?L(_,Y):","==e?L(X):void 0}function Z(e,t){return"variable"==e?(O(t),L(Q,_)):T()}function Q(e,t){if("in"==t)return L()}function J(e,t){return"variable"==e||"type"==e?(O(t),L(J)):"new"==t?L(J):"("==e?L(z(")"),A,$(re,")"),P,ee,I,E):void 0}function ee(e){if(":"==e)return L(te)}function te(e){return"type"==e||"variable"==e?L():"{"==e?L(z("}"),$(ne,"}"),P):void 0}function ne(e){if("variable"==e)return L(ee)}function re(e,t){if("variable"==e)return O(t),L(ee)}return E.lex=!0,P.lex=!0,{startState:function(e){var r={tokenize:v,reAllowed:!0,kwAllowed:!0,cc:[],lexical:new x((e||0)-n,0,"block",!1),localVars:t.localVars,importedtypes:["Int","Float","String","Void","Std","Bool","Dynamic","Array"],context:t.localVars&&{vars:t.localVars},indented:0};return t.globalVars&&"object"==typeof t.globalVars&&(r.globalVars=t.globalVars),r},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation()),e.eatSpace())return null;var n=t.tokenize(e,t);return"comment"==f?n:(t.reAllowed=!("operator"!=f&&"keyword c"!=f&&!f.match(/^[\[{}\(,;:]$/)),t.kwAllowed="."!=f,function(e,t,n,r,i){var o=e.cc;for(S.state=e,S.stream=i,S.marked=null,S.cc=o,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((o.length?o.pop():I)(n,r)){for(;o.length&&o[o.length-1].lex;)o.pop()();return S.marked?S.marked:"variable"==n&&w(e,r)?"variable-2":"variable"==n&&k(e,r)?"variable-3":t}}(t,n,f,i,e))},indent:function(e,t){if(e.tokenize!=v)return 0;var r=t&&t.charAt(0),i=e.lexical;"stat"==i.type&&"}"==r&&(i=i.prev);var o=i.type,a=r==o;return"vardef"==o?i.indented+4:"form"==o&&"{"==r?i.indented:"stat"==o||"form"==o?i.indented+n:"switch"!=i.info||a?i.align?i.column+(a?0:1):i.indented+(a?0:n):i.indented+(/^(?:case|default)\b/.test(t)?n:2*n)},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),e.defineMIME("text/x-haxe","haxe"),e.defineMode("hxml",(function(){return{startState:function(){return{define:!1,inString:!1}},token:function(e,t){var n=e.peek(),r=e.sol();if("#"==n)return e.skipToEnd(),"comment";if(r&&"-"==n){var i="variable-2";return e.eat(/-/),"-"==e.peek()&&(e.eat(/-/),i="keyword a"),"D"==e.peek()&&(e.eat(/[D]/),i="keyword c",t.define=!0),e.eatWhile(/[A-Z]/i),i}return n=e.peek(),0==t.inString&&"'"==n&&(t.inString=!0,e.next()),1==t.inString?(e.skipTo("'")||e.skipToEnd(),"'"==e.peek()&&(e.next(),t.inString=!1),"string"):(e.next(),null)},lineComment:"#"}})),e.defineMIME("text/x-hxml","hxml")}(n(0))},function(e,t,n){!function(e){"use strict";var t={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]},n={};function r(e,t){var r=e.match(function(e){var t=n[e];return t||(n[e]=new RegExp("\\s+"+e+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*"))}(t));return r?/^\s*(.*?)\s*$/.exec(r[2])[1]:""}function i(e,t){return new RegExp((t?"^":"")+"</s*"+e+"s*>","i")}function o(e,t){for(var n in e)for(var r=t[n]||(t[n]=[]),i=e[n],o=i.length-1;o>=0;o--)r.unshift(i[o])}e.defineMode("htmlmixed",(function(n,a){var l=e.getMode(n,{name:"xml",htmlMode:!0,multilineTagIndentFactor:a.multilineTagIndentFactor,multilineTagIndentPastTag:a.multilineTagIndentPastTag}),s={},c=a&&a.tags,u=a&&a.scriptTypes;if(o(t,s),c&&o(c,s),u)for(var f=u.length-1;f>=0;f--)s.script.unshift(["type",u[f].matches,u[f].mode]);function d(t,o){var a,c=l.token(t,o.htmlState),u=/\btag\b/.test(c);if(u&&!/[<>\s\/]/.test(t.current())&&(a=o.htmlState.tagName&&o.htmlState.tagName.toLowerCase())&&s.hasOwnProperty(a))o.inTag=a+" ";else if(o.inTag&&u&&/>$/.test(t.current())){var f=/^([\S]+) (.*)/.exec(o.inTag);o.inTag=null;var h=">"==t.current()&&function(e,t){for(var n=0;n<e.length;n++){var i=e[n];if(!i[0]||i[1].test(r(t,i[0])))return i[2]}}(s[f[1]],f[2]),p=e.getMode(n,h),m=i(f[1],!0),g=i(f[1],!1);o.token=function(e,t){return e.match(m,!1)?(t.token=d,t.localState=t.localMode=null,null):function(e,t,n){var r=e.current(),i=r.search(t);return i>-1?e.backUp(r.length-i):r.match(/<\/?$/)&&(e.backUp(r.length),e.match(t,!1)||e.match(r)),n}(e,g,t.localMode.token(e,t.localState))},o.localMode=p,o.localState=e.startState(p,l.indent(o.htmlState,"",""))}else o.inTag&&(o.inTag+=t.current(),t.eol()&&(o.inTag+=" "));return c}return{startState:function(){return{token:d,inTag:null,localMode:null,localState:null,htmlState:e.startState(l)}},copyState:function(t){var n;return t.localState&&(n=e.copyState(t.localMode,t.localState)),{token:t.token,inTag:t.inTag,localMode:t.localMode,localState:n,htmlState:e.copyState(l,t.htmlState)}},token:function(e,t){return t.token(e,t)},indent:function(t,n,r){return!t.localMode||/^\s*<\//.test(n)?l.indent(t.htmlState,n,r):t.localMode.indent?t.localMode.indent(t.localState,n,r):e.Pass},innerMode:function(e){return{state:e.localState||e.htmlState,mode:e.localMode||l}}}}),"xml","javascript","css"),e.defineMIME("text/html","htmlmixed")}(n(0),n(2),n(1),n(5))},function(e,t,n){!function(e){"use strict";function t(e,t,n,r){this.state=e,this.mode=t,this.depth=n,this.prev=r}function n(r){return new t(e.copyState(r.mode,r.state),r.mode,r.depth,r.prev&&n(r.prev))}e.defineMode("jsx",(function(r,i){var o=e.getMode(r,{name:"xml",allowMissing:!0,multilineTagIndentPastTag:!1,allowMissingTagName:!0}),a=e.getMode(r,i&&i.base||"javascript");function l(e){var t=e.tagName;e.tagName=null;var n=o.indent(e,"","");return e.tagName=t,n}function s(n,i){return i.context.mode==o?function(n,i,c){if(2==c.depth)return n.match(/^.*?\*\//)?c.depth=1:n.skipToEnd(),"comment";if("{"==n.peek()){o.skipAttribute(c.state);var u=l(c.state),f=c.state.context;if(f&&n.match(/^[^>]*>\s*$/,!1)){for(;f.prev&&!f.startOfLine;)f=f.prev;f.startOfLine?u-=r.indentUnit:c.prev.state.lexical&&(u=c.prev.state.lexical.indented)}else 1==c.depth&&(u+=r.indentUnit);return i.context=new t(e.startState(a,u),a,0,i.context),null}if(1==c.depth){if("<"==n.peek())return o.skipAttribute(c.state),i.context=new t(e.startState(o,l(c.state)),o,0,i.context),null;if(n.match("//"))return n.skipToEnd(),"comment";if(n.match("/*"))return c.depth=2,s(n,i)}var d,h=o.token(n,c.state),p=n.current();return/\btag\b/.test(h)?/>$/.test(p)?c.state.context?c.depth=0:i.context=i.context.prev:/^</.test(p)&&(c.depth=1):!h&&(d=p.indexOf("{"))>-1&&n.backUp(p.length-d),h}(n,i,i.context):function(n,r,i){if("<"==n.peek()&&a.expressionAllowed(n,i.state))return a.skipExpression(i.state),r.context=new t(e.startState(o,a.indent(i.state,"","")),o,0,r.context),null;var l=a.token(n,i.state);if(!l&&null!=i.depth){var s=n.current();"{"==s?i.depth++:"}"==s&&0==--i.depth&&(r.context=r.context.prev)}return l}(n,i,i.context)}return{startState:function(){return{context:new t(e.startState(a),a)}},copyState:function(e){return{context:n(e.context)}},token:s,indent:function(e,t,n){return e.context.mode.indent(e.context.state,t,n)},innerMode:function(e){return e.context}}}),"xml","javascript"),e.defineMIME("text/jsx","jsx"),e.defineMIME("text/typescript-jsx",{name:"jsx",base:{name:"javascript",typescript:!0}})}(n(0),n(2),n(1))},function(e,t,n){!function(e){"use strict";e.defineMode("coffeescript",(function(e,t){function n(e){return new RegExp("^(("+e.join(")|(")+"))\\b")}var r=/^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/,i=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/,o=/^[_A-Za-z$][_A-Za-z$0-9]*/,a=/^@[_A-Za-z$][_A-Za-z$0-9]*/,l=n(["and","or","not","is","isnt","in","instanceof","typeof"]),s=["for","while","loop","if","unless","else","switch","try","catch","finally","class"],c=n(s.concat(["break","by","continue","debugger","delete","do","in","of","new","return","then","this","@","throw","when","until","extends"]));s=n(s);var u=/^('{3}|\"{3}|['\"])/,f=/^(\/{3}|\/)/,d=n(["Infinity","NaN","undefined","null","true","false","on","off","yes","no"]);function h(e,t){if(e.sol()){null===t.scope.align&&(t.scope.align=!1);var n=t.scope.offset;if(e.eatSpace()){var s=e.indentation();return s>n&&"coffee"==t.scope.type?"indent":s<n?"dedent":null}n>0&&v(e,t)}if(e.eatSpace())return null;var h=e.peek();if(e.match("####"))return e.skipToEnd(),"comment";if(e.match("###"))return t.tokenize=m,t.tokenize(e,t);if("#"===h)return e.skipToEnd(),"comment";if(e.match(/^-?[0-9\.]/,!1)){var g=!1;if(e.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)&&(g=!0),e.match(/^-?\d+\.\d*/)&&(g=!0),e.match(/^-?\.\d+/)&&(g=!0),g)return"."==e.peek()&&e.backUp(1),"number";var y=!1;if(e.match(/^-?0x[0-9a-f]+/i)&&(y=!0),e.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)&&(y=!0),e.match(/^-?0(?![\dx])/i)&&(y=!0),y)return"number"}if(e.match(u))return t.tokenize=p(e.current(),!1,"string"),t.tokenize(e,t);if(e.match(f)){if("/"!=e.current()||e.match(/^.*\//,!1))return t.tokenize=p(e.current(),!0,"string-2"),t.tokenize(e,t);e.backUp(1)}return e.match(r)||e.match(l)?"operator":e.match(i)?"punctuation":e.match(d)?"atom":e.match(a)||t.prop&&e.match(o)?"property":e.match(c)?"keyword":e.match(o)?"variable":(e.next(),"error")}function p(e,n,r){return function(i,o){for(;!i.eol();)if(i.eatWhile(/[^'"\/\\]/),i.eat("\\")){if(i.next(),n&&i.eol())return r}else{if(i.match(e))return o.tokenize=h,r;i.eat(/['"\/]/)}return n&&(t.singleLineStringErrors?r="error":o.tokenize=h),r}}function m(e,t){for(;!e.eol();){if(e.eatWhile(/[^#]/),e.match("###")){t.tokenize=h;break}e.eatWhile("#")}return"comment"}function g(t,n,r){r=r||"coffee";for(var i=0,o=!1,a=null,l=n.scope;l;l=l.prev)if("coffee"===l.type||"}"==l.type){i=l.offset+e.indentUnit;break}"coffee"!==r?(o=null,a=t.column()+t.current().length):n.scope.align&&(n.scope.align=!1),n.scope={offset:i,type:r,prev:n.scope,align:o,alignOffset:a}}function v(e,t){if(t.scope.prev){if("coffee"===t.scope.type){for(var n=e.indentation(),r=!1,i=t.scope;i;i=i.prev)if(n===i.offset){r=!0;break}if(!r)return!0;for(;t.scope.prev&&t.scope.offset!==n;)t.scope=t.scope.prev;return!1}return t.scope=t.scope.prev,!1}}return{startState:function(e){return{tokenize:h,scope:{offset:e||0,type:"coffee",prev:null,align:!1},prop:!1,dedent:0}},token:function(e,t){var n=null===t.scope.align&&t.scope;n&&e.sol()&&(n.align=!1);var r=function(e,t){var n=t.tokenize(e,t),r=e.current();"return"===r&&(t.dedent=!0),(("->"===r||"=>"===r)&&e.eol()||"indent"===n)&&g(e,t);var i="[({".indexOf(r);if(-1!==i&&g(e,t,"])}".slice(i,i+1)),s.exec(r)&&g(e,t),"then"==r&&v(e,t),"dedent"===n&&v(e,t))return"error";if(-1!==(i="])}".indexOf(r))){for(;"coffee"==t.scope.type&&t.scope.prev;)t.scope=t.scope.prev;t.scope.type==r&&(t.scope=t.scope.prev)}return t.dedent&&e.eol()&&("coffee"==t.scope.type&&t.scope.prev&&(t.scope=t.scope.prev),t.dedent=!1),n}(e,t);return r&&"comment"!=r&&(n&&(n.align=!0),t.prop="punctuation"==r&&"."==e.current()),r},indent:function(e,t){if(e.tokenize!=h)return 0;var n=e.scope,r=t&&"])}".indexOf(t.charAt(0))>-1;if(r)for(;"coffee"==n.type&&n.prev;)n=n.prev;var i=r&&n.type===t.charAt(0);return n.align?n.alignOffset-(i?1:0):(i?n.prev:n).offset},lineComment:"#",fold:"indent"}})),e.defineMIME("application/vnd.coffeescript","coffeescript"),e.defineMIME("text/x-coffeescript","coffeescript"),e.defineMIME("text/coffeescript","coffeescript")}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("elm",(function(){function e(e,t,n){return t(n),n(e,t)}var t=/[a-z_]/,n=/[A-Z]/,r=/[0-9]/,i=/[0-9A-Fa-f]/,o=/[0-7]/,a=/[a-z_A-Z0-9\']/,l=/[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/,s=/[(),;[\]`{}]/,c=/[ \t\v\f]/;function u(){return function(d,h){if(d.eatWhile(c))return null;var p=d.next();if(s.test(p)){if("{"==p&&d.eat("-")){var m="comment";return d.eat("#")&&(m="meta"),e(d,h,function e(t,n){return 0==n?u():function(r,i){for(var o=n;!r.eol();){var a=r.next();if("{"==a&&r.eat("-"))++o;else if("-"==a&&r.eat("}")&&0==--o)return i(u()),t}return i(e(t,o)),t}}(m,1))}return null}if("'"==p)return d.eat("\\"),d.next(),d.eat("'")?"string":"error";if('"'==p)return e(d,h,f);if(n.test(p))return d.eatWhile(a),d.eat(".")?"qualifier":"variable-2";if(t.test(p)){var g=1===d.pos;return d.eatWhile(a),g?"type":"variable"}if(r.test(p)){if("0"==p){if(d.eat(/[xX]/))return d.eatWhile(i),"integer";if(d.eat(/[oO]/))return d.eatWhile(o),"number"}return d.eatWhile(r),m="number",d.eat(".")&&(m="number",d.eatWhile(r)),d.eat(/[eE]/)&&(m="number",d.eat(/[-+]/),d.eatWhile(r)),m}return l.test(p)?"-"==p&&d.eat(/-/)&&(d.eatWhile(/-/),!d.eat(l))?(d.skipToEnd(),"comment"):(d.eatWhile(l),"builtin"):"error"}}function f(e,t){for(;!e.eol();){var n=e.next();if('"'==n)return t(u()),"string";if("\\"==n){if(e.eol()||e.eat(c))return t(d),"string";e.eat("&")||e.next()}}return t(u()),"error"}function d(t,n){return t.eat("\\")?e(t,n,f):(t.next(),n(u()),"error")}var h=function(){for(var e={},t=["case","of","as","if","then","else","let","in","infix","infixl","infixr","type","alias","input","output","foreign","loopback","module","where","import","exposing","_","..","|",":","=","\\",'"',"->","<-"],n=t.length;n--;)e[t[n]]="keyword";return e}();return{startState:function(){return{f:u()}},copyState:function(e){return{f:e.f}},token:function(e,t){var n=t.f(e,(function(e){t.f=e})),r=e.current();return h.hasOwnProperty(r)?h[r]:n}}})),e.defineMIME("text/x-elm","elm")}(n(0))},function(e,t,n){!function(e){"use strict";function t(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.info=r,this.align=i,this.prev=o}function n(e,n,r,i){var o=e.indented;return e.context&&"statement"==e.context.type&&"statement"!=r&&(o=e.context.indented),e.context=new t(o,n,r,i,null,e.context)}function r(e){var t=e.context.type;return")"!=t&&"]"!=t&&"}"!=t||(e.indented=e.context.indented),e.context=e.context.prev}function i(e,t,n){return"variable"==t.prevToken||"type"==t.prevToken||!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(e.string.slice(0,n))||!(!t.typeAtEndOfLine||e.column()!=e.indentation())||void 0}function o(e){for(;;){if(!e||"top"==e.type)return!0;if("}"==e.type&&"namespace"!=e.prev.info)return!1;e=e.prev}}function a(e){for(var t={},n=e.split(" "),r=0;r<n.length;++r)t[n[r]]=!0;return t}function l(e,t){return"function"==typeof e?e(t):e.propertyIsEnumerable(t)}e.defineMode("clike",(function(a,s){var c,u,f=a.indentUnit,d=s.statementIndentUnit||f,h=s.dontAlignCalls,p=s.keywords||{},m=s.types||{},g=s.builtin||{},v=s.blockKeywords||{},y=s.defKeywords||{},b=s.atoms||{},x=s.hooks||{},w=s.multiLineStrings,k=!1!==s.indentStatements,C=!1!==s.indentSwitch,S=s.namespaceSeparator,T=s.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,L=s.numberStart||/[\d\.]/,M=s.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,O=s.isOperatorChar||/[+\-*&%=<>!?|\/]/,N=s.isIdentifierChar||/[\w\$_\xa1-\uffff]/,A=s.isReservedIdentifier||!1;function E(e,t){var n,r=e.next();if(x[r]){var i=x[r](e,t);if(!1!==i)return i}if('"'==r||"'"==r)return t.tokenize=(n=r,function(e,t){for(var r,i=!1,o=!1;null!=(r=e.next());){if(r==n&&!i){o=!0;break}i=!i&&"\\"==r}return(o||!i&&!w)&&(t.tokenize=null),"string"}),t.tokenize(e,t);if(T.test(r))return c=r,null;if(L.test(r)){if(e.backUp(1),e.match(M))return"number";e.next()}if("/"==r){if(e.eat("*"))return t.tokenize=z,z(e,t);if(e.eat("/"))return e.skipToEnd(),"comment"}if(O.test(r)){for(;!e.match(/^\/[\/*]/,!1)&&e.eat(O););return"operator"}if(e.eatWhile(N),S)for(;e.match(S);)e.eatWhile(N);var o=e.current();return l(p,o)?(l(v,o)&&(c="newstatement"),l(y,o)&&(u=!0),"keyword"):l(m,o)?"type":l(g,o)||A&&A(o)?(l(v,o)&&(c="newstatement"),"builtin"):l(b,o)?"atom":"variable"}function z(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=null;break}r="*"==n}return"comment"}function P(e,t){s.typeFirstDefinitions&&e.eol()&&o(t.context)&&(t.typeAtEndOfLine=i(e,t,e.pos))}return{startState:function(e){return{tokenize:null,context:new t((e||0)-f,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(e,t){var a=t.context;if(e.sol()&&(null==a.align&&(a.align=!1),t.indented=e.indentation(),t.startOfLine=!0),e.eatSpace())return P(e,t),null;c=u=null;var l=(t.tokenize||E)(e,t);if("comment"==l||"meta"==l)return l;if(null==a.align&&(a.align=!0),";"==c||":"==c||","==c&&e.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==t.context.type;)r(t);else if("{"==c)n(t,e.column(),"}");else if("["==c)n(t,e.column(),"]");else if("("==c)n(t,e.column(),")");else if("}"==c){for(;"statement"==a.type;)a=r(t);for("}"==a.type&&(a=r(t));"statement"==a.type;)a=r(t)}else c==a.type?r(t):k&&(("}"==a.type||"top"==a.type)&&";"!=c||"statement"==a.type&&"newstatement"==c)&&n(t,e.column(),"statement",e.current());if("variable"==l&&("def"==t.prevToken||s.typeFirstDefinitions&&i(e,t,e.start)&&o(t.context)&&e.match(/^\s*\(/,!1))&&(l="def"),x.token){var f=x.token(e,t,l);void 0!==f&&(l=f)}return"def"==l&&!1===s.styleDefs&&(l="variable"),t.startOfLine=!1,t.prevToken=u?"def":l||c,P(e,t),l},indent:function(t,n){if(t.tokenize!=E&&null!=t.tokenize||t.typeAtEndOfLine)return e.Pass;var r=t.context,i=n&&n.charAt(0),o=i==r.type;if("statement"==r.type&&"}"==i&&(r=r.prev),s.dontIndentStatements)for(;"statement"==r.type&&s.dontIndentStatements.test(r.info);)r=r.prev;if(x.indent){var a=x.indent(t,r,n,f);if("number"==typeof a)return a}var l=r.prev&&"switch"==r.prev.info;if(s.allmanIndentation&&/[{(]/.test(i)){for(;"top"!=r.type&&"}"!=r.type;)r=r.prev;return r.indented}return"statement"==r.type?r.indented+("{"==i?0:d):!r.align||h&&")"==r.type?")"!=r.type||o?r.indented+(o?0:f)+(o||!l||/^(?:case|default)\b/.test(n)?0:f):r.indented+d:r.column+(o?0:1)},electricInput:C?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:"//",fold:"brace"}}));var s="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile inline restrict asm fortran",c=a("int long char short double float unsigned signed void bool"),u=a("SEL instancetype id Class Protocol BOOL");function f(e){return l(c,e)||/.+_t$/.test(e)}var d="case do else for if switch while struct enum union";function h(e,t){if(!t.startOfLine)return!1;for(var n,r=null;n=e.peek();){if("\\"==n&&e.match(/^.$/)){r=h;break}if("/"==n&&e.match(/^\/[\/\*]/,!1))break;e.next()}return t.tokenize=r,"meta"}function p(e,t){return"type"==t.prevToken&&"type"}function m(e){return!(!e||e.length<2||"_"!=e[0]||"_"!=e[1]&&e[1]===e[1].toLowerCase())}function g(e){return e.eatWhile(/[\w\.']/),"number"}function v(e,t){if(e.backUp(1),e.match(/(R|u8R|uR|UR|LR)/)){var n=e.match(/"([^\s\\()]{0,16})\(/);return!!n&&(t.cpp11RawStringDelim=n[1],t.tokenize=b,b(e,t))}return e.match(/(u8|u|U|L)/)?!!e.match(/["']/,!1)&&"string":(e.next(),!1)}function y(e,t){for(var n;null!=(n=e.next());)if('"'==n&&!e.eat('"')){t.tokenize=null;break}return"string"}function b(e,t){var n=t.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&");return e.match(new RegExp(".*?\\)"+n+'"'))?t.tokenize=null:e.skipToEnd(),"string"}function x(t,n){"string"==typeof t&&(t=[t]);var r=[];function i(e){if(e)for(var t in e)e.hasOwnProperty(t)&&r.push(t)}i(n.keywords),i(n.types),i(n.builtin),i(n.atoms),r.length&&(n.helperType=t[0],e.registerHelper("hintWords",t[0],r));for(var o=0;o<t.length;++o)e.defineMIME(t[o],n)}function w(e,t){for(var n=!1;!e.eol();){if(!n&&e.match('"""')){t.tokenize=null;break}n="\\"==e.next()&&!n}return"string"}function k(e){return function(t,n){for(var r;r=t.next();){if("*"==r&&t.eat("/")){if(1==e){n.tokenize=null;break}return n.tokenize=k(e-1),n.tokenize(t,n)}if("/"==r&&t.eat("*"))return n.tokenize=k(e+1),n.tokenize(t,n)}return"comment"}}x(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:a(s),types:f,blockKeywords:a(d),defKeywords:a("struct enum union"),typeFirstDefinitions:!0,atoms:a("NULL true false"),isReservedIdentifier:m,hooks:{"#":h,"*":p},modeProps:{fold:["brace","include"]}}),x(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:a(s+"alignas alignof and and_eq audit axiom bitand bitor catch class compl concept constexpr const_cast decltype delete dynamic_cast explicit export final friend import module mutable namespace new noexcept not not_eq operator or or_eq override private protected public reinterpret_cast requires static_assert static_cast template this thread_local throw try typeid typename using virtual xor xor_eq"),types:f,blockKeywords:a(d+" class try catch"),defKeywords:a("struct enum union class namespace"),typeFirstDefinitions:!0,atoms:a("true false NULL nullptr"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,isReservedIdentifier:m,hooks:{"#":h,"*":p,u:v,U:v,L:v,R:v,0:g,1:g,2:g,3:g,4:g,5:g,6:g,7:g,8:g,9:g,token:function(e,t,n){if("variable"==n&&"("==e.peek()&&(";"==t.prevToken||null==t.prevToken||"}"==t.prevToken)&&(r=e.current(),(i=/(\w+)::~?(\w+)$/.exec(r))&&i[1]==i[2]))return"def";var r,i}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),x("text/x-java",{name:"clike",keywords:a("abstract assert break case catch class const continue default do else enum extends final finally for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:a("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:a("catch class do else finally for if switch try while"),defKeywords:a("class interface enum @interface"),typeFirstDefinitions:!0,atoms:a("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(e){return!e.match("interface",!1)&&(e.eatWhile(/[\w\$_]/),"meta")}},modeProps:{fold:["brace","import"]}}),x("text/x-csharp",{name:"clike",keywords:a("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:a("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:a("catch class do else finally for foreach if struct switch try while"),defKeywords:a("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:a("true false null"),hooks:{"@":function(e,t){return e.eat('"')?(t.tokenize=y,y(e,t)):(e.eatWhile(/[\w\$_]/),"meta")}}}),x("text/x-scala",{name:"clike",keywords:a("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:a("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:a("catch class enum do else finally for forSome if match switch try while"),defKeywords:a("class enum def object package trait type val var"),atoms:a("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},'"':function(e,t){return!!e.match('""')&&(t.tokenize=w,t.tokenize(e,t))},"'":function(e){return e.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"=":function(e,n){var r=n.context;return!("}"!=r.type||!r.align||!e.eat(">"))&&(n.context=new t(r.indented,r.column,r.type,r.info,null,r.prev),"operator")},"/":function(e,t){return!!e.eat("*")&&(t.tokenize=k(1),t.tokenize(e,t))}},modeProps:{closeBrackets:{pairs:'()[]{}""',triples:'"'}}}),x("text/x-kotlin",{name:"clike",keywords:a("package as typealias class interface this super val operator var fun for is in This throw return annotation break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend actual expect setparam"),types:a("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy LazyThreadSafetyMode LongArray Nothing ShortArray Unit"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:a("catch class do else finally for if where try while enum"),defKeywords:a("class val var object interface fun"),atoms:a("true false null this"),hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},"*":function(e,t){return"."==t.prevToken?"variable":"operator"},'"':function(e,t){var n;return t.tokenize=(n=e.match('""'),function(e,t){for(var r,i=!1,o=!1;!e.eol();){if(!n&&!i&&e.match('"')){o=!0;break}if(n&&e.match('"""')){o=!0;break}r=e.next(),!i&&"$"==r&&e.match("{")&&e.skipTo("}"),i=!i&&"\\"==r&&!n}return!o&&n||(t.tokenize=null),"string"}),t.tokenize(e,t)},"/":function(e,t){return!!e.eat("*")&&(t.tokenize=k(1),t.tokenize(e,t))},indent:function(e,t,n,r){var i=n&&n.charAt(0);return"}"!=e.prevToken&&")"!=e.prevToken||""!=n?"operator"==e.prevToken&&"}"!=n&&"}"!=e.context.type||"variable"==e.prevToken&&"."==i||("}"==e.prevToken||")"==e.prevToken)&&"."==i?2*r+t.indented:t.align&&"}"==t.type?t.indented+(e.context.type==(n||"").charAt(0)?0:r):void 0:e.indented}},modeProps:{closeBrackets:{triples:'"'}}}),x(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:a("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:a("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:a("for while do if else struct"),builtin:a("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:a("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":h},modeProps:{fold:["brace","include"]}}),x("text/x-nesc",{name:"clike",keywords:a(s+" as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:f,blockKeywords:a(d),atoms:a("null true false"),hooks:{"#":h},modeProps:{fold:["brace","include"]}}),x("text/x-objectivec",{name:"clike",keywords:a(s+" bycopy byref in inout oneway out self super atomic nonatomic retain copy readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd @interface @implementation @end @protocol @encode @property @synthesize @dynamic @class @public @package @private @protected @required @optional @try @catch @finally @import @selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),types:function(e){return f(e)||l(u,e)},builtin:a("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"),blockKeywords:a(d+" @synthesize @try @catch @finally @autoreleasepool @synchronized"),defKeywords:a("struct enum union @interface @implementation @protocol @class"),dontIndentStatements:/^@.*$/,typeFirstDefinitions:!0,atoms:a("YES NO NULL Nil nil true false nullptr"),isReservedIdentifier:m,hooks:{"#":h,"*":p},modeProps:{fold:["brace","include"]}}),x("text/x-squirrel",{name:"clike",keywords:a("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:f,blockKeywords:a("case catch class else for foreach if switch try while"),defKeywords:a("function local class"),typeFirstDefinitions:!0,atoms:a("true false null"),hooks:{"#":h},modeProps:{fold:["brace","include"]}});var C=null;x("text/x-ceylon",{name:"clike",keywords:a("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(e){var t=e.charAt(0);return t===t.toUpperCase()&&t!==t.toLowerCase()},blockKeywords:a("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:a("class dynamic function interface module object package value"),builtin:a("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:a("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},'"':function(e,t){return t.tokenize=function e(t){return function(n,r){for(var i,o=!1,a=!1;!n.eol();){if(!o&&n.match('"')&&("single"==t||n.match('""'))){a=!0;break}if(!o&&n.match("``")){C=e(t),a=!0;break}i=n.next(),o="single"==t&&!o&&"\\"==i}return a&&(r.tokenize=null),"string"}}(e.match('""')?"triple":"single"),t.tokenize(e,t)},"`":function(e,t){return!(!C||!e.match("`"))&&(t.tokenize=C,C=null,t.tokenize(e,t))},"'":function(e){return e.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(e,t,n){if(("variable"==n||"type"==n)&&"."==t.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})}(n(0))},function(e,t,n){!function(e){"use strict";e.defineSimpleMode("rust",{start:[{regex:/b?"/,token:"string",next:"string"},{regex:/b?r"/,token:"string",next:"string_raw"},{regex:/b?r#+"/,token:"string",next:"string_raw_hash"},{regex:/'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/,token:"string-2"},{regex:/b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/,token:"string-2"},{regex:/(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,token:"number"},{regex:/(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,token:"keyword"},{regex:/\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/,token:"atom"},{regex:/\b(?:true|false|Some|None|Ok|Err)\b/,token:"builtin"},{regex:/\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/#!?\[.*\]/,token:"meta"},{regex:/\/\/.*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/[a-zA-Z_]\w*!/,token:"variable-3"},{regex:/[a-zA-Z_]\w*/,token:"variable"},{regex:/[\{\[\(]/,indent:!0},{regex:/[\}\]\)]/,dedent:!0}],string:[{regex:/"/,token:"string",next:"start"},{regex:/(?:[^\\"]|\\(?:.|$))*/,token:"string"}],string_raw:[{regex:/"/,token:"string",next:"start"},{regex:/[^"]*/,token:"string"}],string_raw_hash:[{regex:/"#+/,token:"string",next:"start"},{regex:/(?:[^"]|"(?!#))*/,token:"string"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{dontIndentStates:["comment"],electricInput:/^\s*\}$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}),e.defineMIME("text/x-rustsrc","rust"),e.defineMIME("text/rust","rust")}(n(0),n(21))},function(e,t,n){!function(e){"use strict";function t(e,t){if(!e.hasOwnProperty(t))throw new Error("Undefined state "+t+" in simple mode")}function n(e,t){if(!e)return/(?:)/;var n="";return e instanceof RegExp?(e.ignoreCase&&(n="i"),e=e.source):e=String(e),new RegExp((!1===t?"":"^")+"(?:"+e+")",n)}function r(e,r){(e.next||e.push)&&t(r,e.next||e.push),this.regex=n(e.regex),this.token=function(e){if(!e)return null;if(e.apply)return e;if("string"==typeof e)return e.replace(/\./g," ");for(var t=[],n=0;n<e.length;n++)t.push(e[n]&&e[n].replace(/\./g," "));return t}(e.token),this.data=e}function i(e,t){return function(n,r){if(r.pending){var i=r.pending.shift();return 0==r.pending.length&&(r.pending=null),n.pos+=i.text.length,i.token}if(r.local){if(r.local.end&&n.match(r.local.end)){var o=r.local.endToken||null;return r.local=r.localState=null,o}var l;return o=r.local.mode.token(n,r.localState),r.local.endScan&&(l=r.local.endScan.exec(n.current()))&&(n.pos=n.start+l.index),o}for(var s=e[r.state],c=0;c<s.length;c++){var u=s[c],f=(!u.data.sol||n.sol())&&n.match(u.regex);if(f){u.data.next?r.state=u.data.next:u.data.push?((r.stack||(r.stack=[])).push(r.state),r.state=u.data.push):u.data.pop&&r.stack&&r.stack.length&&(r.state=r.stack.pop()),u.data.mode&&a(t,r,u.data.mode,u.token),u.data.indent&&r.indent.push(n.indentation()+t.indentUnit),u.data.dedent&&r.indent.pop();var d=u.token;if(d&&d.apply&&(d=d(f)),f.length>2&&u.token&&"string"!=typeof u.token){r.pending=[];for(var h=2;h<f.length;h++)f[h]&&r.pending.push({text:f[h],token:u.token[h-1]});return n.backUp(f[0].length-(f[1]?f[1].length:0)),d[0]}return d&&d.join?d[0]:d}}return n.next(),null}}function o(e,t){if(e===t)return!0;if(!e||"object"!=typeof e||!t||"object"!=typeof t)return!1;var n=0;for(var r in e)if(e.hasOwnProperty(r)){if(!t.hasOwnProperty(r)||!o(e[r],t[r]))return!1;n++}for(var r in t)t.hasOwnProperty(r)&&n--;return 0==n}function a(t,r,i,a){var l;if(i.persistent)for(var s=r.persistentStates;s&&!l;s=s.next)(i.spec?o(i.spec,s.spec):i.mode==s.mode)&&(l=s);var c=l?l.mode:i.mode||e.getMode(t,i.spec),u=l?l.state:e.startState(c);i.persistent&&!l&&(r.persistentStates={mode:c,spec:i.spec,state:u,next:r.persistentStates}),r.localState=u,r.local={mode:c,end:i.end&&n(i.end),endScan:i.end&&!1!==i.forceEnd&&n(i.end,!1),endToken:a&&a.join?a[a.length-1]:a}}function l(t,n){return function(r,i,o){if(r.local&&r.local.mode.indent)return r.local.mode.indent(r.localState,i,o);if(null==r.indent||r.local||n.dontIndentStates&&function(e,t){for(var n=0;n<t.length;n++)if(t[n]===e)return!0}(r.state,n.dontIndentStates)>-1)return e.Pass;var a=r.indent.length-1,l=t[r.state];e:for(;;){for(var s=0;s<l.length;s++){var c=l[s];if(c.data.dedent&&!1!==c.data.dedentIfLineStart){var u=c.regex.exec(i);if(u&&u[0]){a--,(c.next||c.push)&&(l=t[c.next||c.push]),i=i.slice(u[0].length);continue e}}}break}return a<0?0:r.indent[a]}}e.defineSimpleMode=function(t,n){e.defineMode(t,(function(t){return e.simpleMode(t,n)}))},e.simpleMode=function(n,o){t(o,"start");var a={},s=o.meta||{},c=!1;for(var u in o)if(u!=s&&o.hasOwnProperty(u))for(var f=a[u]=[],d=o[u],h=0;h<d.length;h++){var p=d[h];f.push(new r(p,o)),(p.indent||p.dedent)&&(c=!0)}var m={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:c?[]:null}},copyState:function(t){var n={state:t.state,pending:t.pending,local:t.local,localState:null,indent:t.indent&&t.indent.slice(0)};t.localState&&(n.localState=e.copyState(t.local.mode,t.localState)),t.stack&&(n.stack=t.stack.slice(0));for(var r=t.persistentStates;r;r=r.next)n.persistentStates={mode:r.mode,spec:r.spec,state:r.state==t.localState?n.localState:e.copyState(r.mode,r.state),next:n.persistentStates};return n},token:i(a,n),innerMode:function(e){return e.local&&{mode:e.local.mode,state:e.localState}},indent:l(a,s)};if(s)for(var g in s)s.hasOwnProperty(g)&&(m[g]=s[g]);return m}}(n(0))},function(e,t,n){var r,i,o;i=[n(0)],void 0===(o="function"==typeof(r=function(e){"use strict";var t=/[\w\$_\.\\\/@]/;function n(e){var t=Object.create(null);return e.forEach((function(e){t[e]=!0})),t}e.defineMode("wasm",(function(){var e=n(["function","import","export","table","memory","segment","as","type","of","from","typeof","br","br_if","loop","br_table","if","else","call","call_import","call_indirect","nop","unreachable","var","align","select","return"]),r=n(["i32:8","i32:8u","i32:8s","i32:16","i32:16u","i32:16s","i64:8","i64:8u","i64:8s","i64:16","i64:16u","i64:16s","i64:32","i64:32u","i64:32s","i32.add","i32.sub","i32.mul","i32.div_s","i32.div_u","i32.rem_s","i32.rem_u","i32.and","i32.or","i32.xor","i32.shl","i32.shr_u","i32.shr_s","i32.rotr","i32.rotl","i32.eq","i32.ne","i32.lt_s","i32.le_s","i32.lt_u","i32.le_u","i32.gt_s","i32.ge_s","i32.gt_u","i32.ge_u","i32.clz","i32.ctz","i32.popcnt","i32.eqz","i64.add","i64.sub","i64.mul","i64.div_s","i64.div_u","i64.rem_s","i64.rem_u","i64.and","i64.or","i64.xor","i64.shl","i64.shr_u","i64.shr_s","i64.rotr","i64.rotl","i64.eq","i64.ne","i64.lt_s","i64.le_s","i64.lt_u","i64.le_u","i64.gt_s","i64.ge_s","i64.gt_u","i64.ge_u","i64.clz","i64.ctz","i64.popcnt","i64.eqz","f32.add","f32.sub","f32.mul","f32.div","f32.min","f32.max","f32.abs","f32.neg","f32.copysign","f32.ceil","f32.floor","f32.trunc","f32.nearest","f32.sqrt","f32.eq","f32.ne","f32.lt","f32.le","f32.gt","f32.ge","f64.add","f64.sub","f64.mul","f64.div","f64.min","f64.max","f64.abs","f64.neg","f64.copysign","f64.ceil","f64.floor","f64.trunc","f64.nearest","f64.sqrt","f64.eq","f64.ne","f64.lt","f64.le","f64.gt","f64.ge","i32.trunc_s/f32","i32.trunc_s/f64","i32.trunc_u/f32","i32.trunc_u/f64","i32.wrap/i64","i64.trunc_s/f32","i64.trunc_s/f64","i64.trunc_u/f32","i64.trunc_u/f64","i64.extend_s/i32","i64.extend_u/i32","f32.convert_s/i32","f32.convert_u/i32","f32.convert_s/i64","f32.convert_u/i64","f32.demote/f64","f32.reinterpret/i32","f64.convert_s/i32","f64.convert_u/i32","f64.convert_s/i64","f64.convert_u/i64","f64.promote/f32","f64.reinterpret/i64","i32.reinterpret/f32","i64.reinterpret/f64"]),i=n(["i32","i64","f32","f64"]),o=/[\-!]/,a=n(["+","-","*","/","/s","/u","%","%s","%u","<<",">>u",">>s",">=","<=","==","!=","<s","<u","<=s","<=u",">=s",">=u",">s",">u","<",">","=","&","|","^","!"]);function l(n,l){var u,f=n.next();if("$"===f)return n.eatWhile(t),"variable";if("@"===f)return n.eatWhile(t),"meta";if('"'===f)return l.tokenize=(u=f,function(e,t){for(var n,r=!1;null!=(n=e.next());){if(n==u&&!r)return t.tokenize=null,"string";r=!r&&"\\"===n}return"string"}),l.tokenize(n,l);if("/"==f){if(n.eat("*"))return l.tokenize=s,s(n,l);if(n.eat("/"))return n.skipToEnd(),"comment"}if(/\d/.test(f)||("-"===f||"+"===f)&&/\d/.test(n.peek()))return n.eatWhile(/[\w\._\-+]/),"number";if(/[\[\]\(\)\{\},:]/.test(f))return null;if(o.test(f))return"operator";n.eatWhile(t);var d=n.current();if(d in a)return"operator";if(d in e)return"keyword";if(d in i){if(!n.eat(":"))return"builtin";n.eatWhile(t),d=n.current()}return d in r?"builtin":"Temporary"===d?(l.tokenize=c,l.tokenize(n,l)):null}function s(e,t){var n;for(t.commentDepth=1;null!=(n=e.next());){if("*"===n&&e.eat("/")&&0==--t.commentDepth)return t.tokenize=null,"comment";"/"===n&&e.eat("*")&&t.commentDepth++}return"comment"}function c(e,t){for(var n,r=t.commentState;null!=(n=e.next());)if(0===r&&"t"===n)r=1;else if(1===r&&":"===n)return t.tokenize=null,t.commentState=0,r=2,"comment";return t.commentState=r,"comment"}return{startState:function(){return{tokenize:null,commentState:0,commentDepth:0}},token:function(e,t){return e.eatSpace()?null:(t.tokenize||l)(e,t)}}})),e.registerHelper("wordChars","wasm",t),e.defineMIME("text/wasm","wasm")})?r.apply(t,i):r)||(e.exports=o)},function(e,t,n){!function(e){"use strict";var t="CodeMirror-activeline-background";function n(e){for(var n=0;n<e.state.activeLines.length;n++)e.removeLineClass(e.state.activeLines[n],"wrap","CodeMirror-activeline"),e.removeLineClass(e.state.activeLines[n],"background",t),e.removeLineClass(e.state.activeLines[n],"gutter","CodeMirror-activeline-gutter")}function r(e,r){for(var i=[],o=0;o<r.length;o++){var a=r[o],l=e.getOption("styleActiveLine");if("object"==typeof l&&l.nonEmpty?a.anchor.line==a.head.line:a.empty()){var s=e.getLineHandleVisualStart(a.head.line);i[i.length-1]!=s&&i.push(s)}}(function(e,t){if(e.length!=t.length)return!1;for(var n=0;n<e.length;n++)if(e[n]!=t[n])return!1;return!0})(e.state.activeLines,i)||e.operation((function(){n(e);for(var r=0;r<i.length;r++)e.addLineClass(i[r],"wrap","CodeMirror-activeline"),e.addLineClass(i[r],"background",t),e.addLineClass(i[r],"gutter","CodeMirror-activeline-gutter");e.state.activeLines=i}))}function i(e,t){r(e,t.ranges)}e.defineOption("styleActiveLine",!1,(function(t,o,a){var l=a!=e.Init&&a;o!=l&&(l&&(t.off("beforeSelectionChange",i),n(t),delete t.state.activeLines),o&&(t.state.activeLines=[],r(t,t.listSelections()),t.on("beforeSelectionChange",i)))}))}(n(0))},function(e,t,n){!function(e){e.defineOption("showTrailingSpace",!1,(function(t,n,r){r==e.Init&&(r=!1),r&&!n?t.removeOverlay("trailingspace"):!r&&n&&t.addOverlay({token:function(e){for(var t=e.string.length,n=t;n&&/\s/.test(e.string.charAt(n-1));--n);return n>e.pos?(e.pos=n,null):(e.pos=t,"trailingspace")},name:"trailingspace"})}))}(n(0))},function(e,t,n){!function(e){"use strict";e.registerHelper("fold","brace",(function(t,n){var r,i=n.line,o=t.getLine(i);function a(a){for(var l=n.ch,s=0;;){var c=l<=0?-1:o.lastIndexOf(a,l-1);if(-1!=c){if(1==s&&c<n.ch)break;if(r=t.getTokenTypeAt(e.Pos(i,c+1)),!/^(comment|string)/.test(r))return c+1;l=c-1}else{if(1==s)break;s=1,l=o.length}}}var l="{",s="}",c=a("{");if(null==c&&(l="[",s="]",c=a("[")),null!=c){var u,f,d=1,h=t.lastLine();e:for(var p=i;p<=h;++p)for(var m=t.getLine(p),g=p==i?c:0;;){var v=m.indexOf(l,g),y=m.indexOf(s,g);if(v<0&&(v=m.length),y<0&&(y=m.length),(g=Math.min(v,y))==m.length)break;if(t.getTokenTypeAt(e.Pos(p,g+1))==r)if(g==v)++d;else if(!--d){u=p,f=g;break e}++g}if(null!=u&&i!=u)return{from:e.Pos(i,c),to:e.Pos(u,f)}}})),e.registerHelper("fold","import",(function(t,n){function r(n){if(n<t.firstLine()||n>t.lastLine())return null;var r=t.getTokenAt(e.Pos(n,1));if(/\S/.test(r.string)||(r=t.getTokenAt(e.Pos(n,r.end+1))),"keyword"!=r.type||"import"!=r.string)return null;for(var i=n,o=Math.min(t.lastLine(),n+10);i<=o;++i){var a=t.getLine(i).indexOf(";");if(-1!=a)return{startCh:r.end,end:e.Pos(i,a)}}}var i,o=n.line,a=r(o);if(!a||r(o-1)||(i=r(o-2))&&i.end.line==o-1)return null;for(var l=a.end;;){var s=r(l.line+1);if(null==s)break;l=s.end}return{from:t.clipPos(e.Pos(o,a.startCh+1)),to:l}})),e.registerHelper("fold","include",(function(t,n){function r(n){if(n<t.firstLine()||n>t.lastLine())return null;var r=t.getTokenAt(e.Pos(n,1));return/\S/.test(r.string)||(r=t.getTokenAt(e.Pos(n,r.end+1))),"meta"==r.type&&"#include"==r.string.slice(0,8)?r.start+8:void 0}var i=n.line,o=r(i);if(null==o||null!=r(i-1))return null;for(var a=i;null!=r(a+1);)++a;return{from:e.Pos(i,o+1),to:t.clipPos(e.Pos(a))}}))}(n(0))},function(e,t,n){!function(e){"use strict";e.registerGlobalHelper("fold","comment",(function(e){return e.blockCommentStart&&e.blockCommentEnd}),(function(t,n){var r=t.getModeAt(n),i=r.blockCommentStart,o=r.blockCommentEnd;if(i&&o){for(var a,l=n.line,s=t.getLine(l),c=n.ch,u=0;;){var f=c<=0?-1:s.lastIndexOf(i,c-1);if(-1!=f){if(1==u&&f<n.ch)return;if(/comment/.test(t.getTokenTypeAt(e.Pos(l,f+1)))&&(0==f||s.slice(f-o.length,f)==o||!/comment/.test(t.getTokenTypeAt(e.Pos(l,f))))){a=f+i.length;break}c=f-1}else{if(1==u)return;u=1,c=s.length}}var d,h,p=1,m=t.lastLine();e:for(var g=l;g<=m;++g)for(var v=t.getLine(g),y=g==l?a:0;;){var b=v.indexOf(i,y),x=v.indexOf(o,y);if(b<0&&(b=v.length),x<0&&(x=v.length),(y=Math.min(b,x))==v.length)break;if(y==b)++p;else if(!--p){d=g,h=y;break e}++y}if(null!=d&&(l!=d||h!=a))return{from:e.Pos(l,a),to:e.Pos(d,h)}}}))}(n(0))},function(e,t,n){!function(e){"use strict";var t=e.Pos;function n(e,t){return e.line-t.line||e.ch-t.ch}var r="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",i=new RegExp("<(/?)(["+r+"]["+r+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*)","g");function o(e,t,n,r){this.line=t,this.ch=n,this.cm=e,this.text=e.getLine(t),this.min=r?Math.max(r.from,e.firstLine()):e.firstLine(),this.max=r?Math.min(r.to-1,e.lastLine()):e.lastLine()}function a(e,n){var r=e.cm.getTokenTypeAt(t(e.line,n));return r&&/\btag\b/.test(r)}function l(e){if(!(e.line>=e.max))return e.ch=0,e.text=e.cm.getLine(++e.line),!0}function s(e){if(!(e.line<=e.min))return e.text=e.cm.getLine(--e.line),e.ch=e.text.length,!0}function c(e){for(;;){var t=e.text.indexOf(">",e.ch);if(-1==t){if(l(e))continue;return}if(a(e,t+1)){var n=e.text.lastIndexOf("/",t),r=n>-1&&!/\S/.test(e.text.slice(n+1,t));return e.ch=t+1,r?"selfClose":"regular"}e.ch=t+1}}function u(e){for(;;){var t=e.ch?e.text.lastIndexOf("<",e.ch-1):-1;if(-1==t){if(s(e))continue;return}if(a(e,t+1)){i.lastIndex=t,e.ch=t;var n=i.exec(e.text);if(n&&n.index==t)return n}else e.ch=t}}function f(e){for(;;){i.lastIndex=e.ch;var t=i.exec(e.text);if(!t){if(l(e))continue;return}if(a(e,t.index+1))return e.ch=t.index+t[0].length,t;e.ch=t.index+1}}function d(e){for(;;){var t=e.ch?e.text.lastIndexOf(">",e.ch-1):-1;if(-1==t){if(s(e))continue;return}if(a(e,t+1)){var n=e.text.lastIndexOf("/",t),r=n>-1&&!/\S/.test(e.text.slice(n+1,t));return e.ch=t+1,r?"selfClose":"regular"}e.ch=t}}function h(e,n){for(var r=[];;){var i,o=f(e),a=e.line,l=e.ch-(o?o[0].length:0);if(!o||!(i=c(e)))return;if("selfClose"!=i)if(o[1]){for(var s=r.length-1;s>=0;--s)if(r[s]==o[2]){r.length=s;break}if(s<0&&(!n||n==o[2]))return{tag:o[2],from:t(a,l),to:t(e.line,e.ch)}}else r.push(o[2])}}function p(e,n){for(var r=[];;){var i=d(e);if(!i)return;if("selfClose"!=i){var o=e.line,a=e.ch,l=u(e);if(!l)return;if(l[1])r.push(l[2]);else{for(var s=r.length-1;s>=0;--s)if(r[s]==l[2]){r.length=s;break}if(s<0&&(!n||n==l[2]))return{tag:l[2],from:t(e.line,e.ch),to:t(o,a)}}}else u(e)}}e.registerHelper("fold","xml",(function(e,r){for(var i=new o(e,r.line,0);;){var a=f(i);if(!a||i.line!=r.line)return;var l=c(i);if(!l)return;if(!a[1]&&"selfClose"!=l){var s=t(i.line,i.ch),u=h(i,a[2]);return u&&n(u.from,s)>0?{from:s,to:u.from}:null}}})),e.findMatchingTag=function(e,r,i){var a=new o(e,r.line,r.ch,i);if(-1!=a.text.indexOf(">")||-1!=a.text.indexOf("<")){var l=c(a),s=l&&t(a.line,a.ch),f=l&&u(a);if(l&&f&&!(n(a,r)>0)){var d={from:t(a.line,a.ch),to:s,tag:f[2]};return"selfClose"==l?{open:d,close:null,at:"open"}:f[1]?{open:p(a,f[2]),close:d,at:"close"}:{open:d,close:h(a=new o(e,s.line,s.ch,i),f[2]),at:"open"}}}},e.findEnclosingTag=function(e,t,n,r){for(var i=new o(e,t.line,t.ch,n);;){var a=p(i,r);if(!a)break;var l=h(new o(e,t.line,t.ch,n),a.tag);if(l)return{open:a,close:l}}},e.scanForClosingTag=function(e,t,n,r){return h(new o(e,t.line,t.ch,r?{from:0,to:r}:null),n)}}(n(0))},function(e,t,n){!function(e){"use strict";e.defineOption("foldGutter",!1,(function(t,r,i){var o;i&&i!=e.Init&&(t.clearGutter(t.state.foldGutter.options.gutter),t.state.foldGutter=null,t.off("gutterClick",l),t.off("changes",s),t.off("viewportChange",c),t.off("fold",u),t.off("unfold",u),t.off("swapDoc",s)),r&&(t.state.foldGutter=new n((!0===(o=r)&&(o={}),null==o.gutter&&(o.gutter="CodeMirror-foldgutter"),null==o.indicatorOpen&&(o.indicatorOpen="CodeMirror-foldgutter-open"),null==o.indicatorFolded&&(o.indicatorFolded="CodeMirror-foldgutter-folded"),o)),a(t),t.on("gutterClick",l),t.on("changes",s),t.on("viewportChange",c),t.on("fold",u),t.on("unfold",u),t.on("swapDoc",s))}));var t=e.Pos;function n(e){this.options=e,this.from=this.to=0}function r(e,n){for(var r=e.findMarks(t(n,0),t(n+1,0)),i=0;i<r.length;++i)if(r[i].__isFold){var o=r[i].find(-1);if(o&&o.line===n)return r[i]}}function i(e){if("string"==typeof e){var t=document.createElement("div");return t.className=e+" CodeMirror-guttermarker-subtle",t}return e.cloneNode(!0)}function o(e,n,o){var a=e.state.foldGutter.options,l=n,s=e.foldOption(a,"minFoldSize"),c=e.foldOption(a,"rangeFinder");e.eachLine(n,o,(function(n){var o=null;if(r(e,l))o=i(a.indicatorFolded);else{var u=t(l,0),f=c&&c(e,u);f&&f.to.line-f.from.line>=s&&(o=i(a.indicatorOpen))}e.setGutterMarker(n,a.gutter,o),++l}))}function a(e){var t=e.getViewport(),n=e.state.foldGutter;n&&(e.operation((function(){o(e,t.from,t.to)})),n.from=t.from,n.to=t.to)}function l(e,n,i){var o=e.state.foldGutter;if(o){var a=o.options;if(i==a.gutter){var l=r(e,n);l?l.clear():e.foldCode(t(n,0),a)}}}function s(e){var t=e.state.foldGutter;if(t){var n=t.options;t.from=t.to=0,clearTimeout(t.changeUpdate),t.changeUpdate=setTimeout((function(){a(e)}),n.foldOnChangeTimeSpan||600)}}function c(e){var t=e.state.foldGutter;if(t){var n=t.options;clearTimeout(t.changeUpdate),t.changeUpdate=setTimeout((function(){var n=e.getViewport();t.from==t.to||n.from-t.to>20||t.from-n.to>20?a(e):e.operation((function(){n.from<t.from&&(o(e,n.from,t.from),t.from=n.from),n.to>t.to&&(o(e,t.to,n.to),t.to=n.to)}))}),n.updateViewportTimeSpan||400)}}function u(e,t){var n=e.state.foldGutter;if(n){var r=t.line;r>=n.from&&r<n.to&&o(e,r,r+1)}}}(n(0),n(6))},function(e,t,n){!function(e){"use strict";e.runMode=function(t,n,r,i){var o=e.getMode(e.defaults,n),a=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<9);if(r.appendChild){var l=i&&i.tabSize||e.defaults.tabSize,s=r,c=0;s.innerHTML="",r=function(e,t){if("\n"==e)return s.appendChild(document.createTextNode(a?"\r":e)),void(c=0);for(var n="",r=0;;){var i=e.indexOf("\t",r);if(-1==i){n+=e.slice(r),c+=e.length-r;break}c+=i-r,n+=e.slice(r,i);var o=l-c%l;c+=o;for(var u=0;u<o;++u)n+=" ";r=i+1}if(t){var f=s.appendChild(document.createElement("span"));f.className="cm-"+t.replace(/ +/g," cm-"),f.appendChild(document.createTextNode(n))}else s.appendChild(document.createTextNode(n))}}for(var u=e.splitLines(t),f=i&&i.state||e.startState(o),d=0,h=u.length;d<h;++d){d&&r("\n");var p=new e.StringStream(u[d]);for(!p.string&&o.blankLine&&o.blankLine(f);!p.eol();){var m=o.token(p,f);r(p.current(),m,d,p.start,f),p.start=p.pos}}}}(n(0))},function(e,t,n){!function(e){function t(e){e.state.placeholder&&(e.state.placeholder.parentNode.removeChild(e.state.placeholder),e.state.placeholder=null)}function n(e){t(e);var n=e.state.placeholder=document.createElement("pre");n.style.cssText="height: 0; overflow: visible",n.style.direction=e.getOption("direction"),n.className="CodeMirror-placeholder CodeMirror-line-like";var r=e.getOption("placeholder");"string"==typeof r&&(r=document.createTextNode(r)),n.appendChild(r),e.display.lineSpace.insertBefore(n,e.display.lineSpace.firstChild)}function r(e){o(e)&&n(e)}function i(e){var r=e.getWrapperElement(),i=o(e);r.className=r.className.replace(" CodeMirror-empty","")+(i?" CodeMirror-empty":""),i?n(e):t(e)}function o(e){return 1===e.lineCount()&&""===e.getLine(0)}e.defineOption("placeholder","",(function(n,o,a){var l=a&&a!=e.Init;if(o&&!l)n.on("blur",r),n.on("change",i),n.on("swapDoc",i),i(n);else if(!o&&l){n.off("blur",r),n.off("change",i),n.off("swapDoc",i),t(n);var s=n.getWrapperElement();s.className=s.className.replace(" CodeMirror-empty","")}o&&!n.hasFocus()&&r(n)}))}(n(0))}]);
\ No newline at end of file
+var CodeMirror=function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=7)}([function(e,t,n){e.exports=function(){"use strict";var e=navigator.userAgent,t=navigator.platform,n=/gecko\/\d/i.test(e),r=/MSIE \d/.test(e),i=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(e),o=/Edge\/(\d+)/.exec(e),a=r||i||o,l=a&&(r?document.documentMode||6:+(o||i)[1]),s=!o&&/WebKit\//.test(e),c=s&&/Qt\/\d+\.\d+/.test(e),u=!o&&/Chrome\//.test(e),f=/Opera\//.test(e),d=/Apple Computer/.test(navigator.vendor),h=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(e),p=/PhantomJS/.test(e),m=!o&&/AppleWebKit/.test(e)&&/Mobile\/\w+/.test(e),g=/Android/.test(e),v=m||g||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(e),y=m||/Mac/.test(t),b=/\bCrOS\b/.test(e),x=/win/i.test(t),w=f&&e.match(/Version\/(\d*\.\d*)/);w&&(w=Number(w[1])),w&&w>=15&&(f=!1,s=!0);var k=y&&(c||f&&(null==w||w<12.11)),C=n||a&&l>=9;function S(e){return new RegExp("(^|\\s)"+e+"(?:$|\\s)\\s*")}var T,L=function(e,t){var n=e.className,r=S(t).exec(n);if(r){var i=n.slice(r.index+r[0].length);e.className=n.slice(0,r.index)+(i?r[1]+i:"")}};function M(e){for(var t=e.childNodes.length;t>0;--t)e.removeChild(e.firstChild);return e}function O(e,t){return M(e).appendChild(t)}function N(e,t,n,r){var i=document.createElement(e);if(n&&(i.className=n),r&&(i.style.cssText=r),"string"==typeof t)i.appendChild(document.createTextNode(t));else if(t)for(var o=0;o<t.length;++o)i.appendChild(t[o]);return i}function A(e,t,n,r){var i=N(e,t,n,r);return i.setAttribute("role","presentation"),i}function E(e,t){if(3==t.nodeType&&(t=t.parentNode),e.contains)return e.contains(t);do{if(11==t.nodeType&&(t=t.host),t==e)return!0}while(t=t.parentNode)}function z(){var e;try{e=document.activeElement}catch(t){e=document.body||null}for(;e&&e.shadowRoot&&e.shadowRoot.activeElement;)e=e.shadowRoot.activeElement;return e}function P(e,t){var n=e.className;S(t).test(n)||(e.className+=(n?" ":"")+t)}function D(e,t){for(var n=e.split(" "),r=0;r<n.length;r++)n[r]&&!S(n[r]).test(t)&&(t+=" "+n[r]);return t}T=document.createRange?function(e,t,n,r){var i=document.createRange();return i.setEnd(r||e,n),i.setStart(e,t),i}:function(e,t,n){var r=document.body.createTextRange();try{r.moveToElementText(e.parentNode)}catch(e){return r}return r.collapse(!0),r.moveEnd("character",n),r.moveStart("character",t),r};var I=function(e){e.select()};function _(e){var t=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,t)}}function F(e,t,n){for(var r in t||(t={}),e)!e.hasOwnProperty(r)||!1===n&&t.hasOwnProperty(r)||(t[r]=e[r]);return t}function W(e,t,n,r,i){null==t&&-1==(t=e.search(/[^\s\u00a0]/))&&(t=e.length);for(var o=r||0,a=i||0;;){var l=e.indexOf("\t",o);if(l<0||l>=t)return a+(t-o);a+=l-o,a+=n-a%n,o=l+1}}m?I=function(e){e.selectionStart=0,e.selectionEnd=e.value.length}:a&&(I=function(e){try{e.select()}catch(e){}});var R=function(){this.id=null,this.f=null,this.time=0,this.handler=_(this.onTimeout,this)};function H(e,t){for(var n=0;n<e.length;++n)if(e[n]==t)return n;return-1}R.prototype.onTimeout=function(e){e.id=0,e.time<=+new Date?e.f():setTimeout(e.handler,e.time-+new Date)},R.prototype.set=function(e,t){this.f=t;var n=+new Date+e;(!this.id||n<this.time)&&(clearTimeout(this.id),this.id=setTimeout(this.handler,e),this.time=n)};var B={toString:function(){return"CodeMirror.Pass"}},j={scroll:!1},q={origin:"*mouse"},U={origin:"+move"};function V(e,t,n){for(var r=0,i=0;;){var o=e.indexOf("\t",r);-1==o&&(o=e.length);var a=o-r;if(o==e.length||i+a>=t)return r+Math.min(a,t-i);if(i+=o-r,r=o+1,(i+=n-i%n)>=t)return r}}var K=[""];function $(e){for(;K.length<=e;)K.push(G(K)+" ");return K[e]}function G(e){return e[e.length-1]}function X(e,t){for(var n=[],r=0;r<e.length;r++)n[r]=t(e[r],r);return n}function Y(){}function Z(e,t){var n;return Object.create?n=Object.create(e):(Y.prototype=e,n=new Y),t&&F(t,n),n}var Q=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;function J(e){return/\w/.test(e)||e>"€"&&(e.toUpperCase()!=e.toLowerCase()||Q.test(e))}function ee(e,t){return t?!!(t.source.indexOf("\\w")>-1&&J(e))||t.test(e):J(e)}function te(e){for(var t in e)if(e.hasOwnProperty(t)&&e[t])return!1;return!0}var ne=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;function re(e){return e.charCodeAt(0)>=768&&ne.test(e)}function ie(e,t,n){for(;(n<0?t>0:t<e.length)&&re(e.charAt(t));)t+=n;return t}function oe(e,t,n){for(var r=t>n?-1:1;;){if(t==n)return t;var i=(t+n)/2,o=r<0?Math.ceil(i):Math.floor(i);if(o==t)return e(o)?t:n;e(o)?n=o:t=o+r}}var ae=null;function le(e,t,n){var r;ae=null;for(var i=0;i<e.length;++i){var o=e[i];if(o.from<t&&o.to>t)return i;o.to==t&&(o.from!=o.to&&"before"==n?r=i:ae=i),o.from==t&&(o.from!=o.to&&"before"!=n?r=i:ae=i)}return null!=r?r:ae}var se=function(){var e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,t=/[stwN]/,n=/[LRr]/,r=/[Lb1n]/,i=/[1n]/;function o(e,t,n){this.level=e,this.from=t,this.to=n}return function(a,l){var s="ltr"==l?"L":"R";if(0==a.length||"ltr"==l&&!e.test(a))return!1;for(var c,u=a.length,f=[],d=0;d<u;++d)f.push((c=a.charCodeAt(d))<=247?"bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN".charAt(c):1424<=c&&c<=1524?"R":1536<=c&&c<=1785?"nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111".charAt(c-1536):1774<=c&&c<=2220?"r":8192<=c&&c<=8203?"w":8204==c?"b":"L");for(var h=0,p=s;h<u;++h){var m=f[h];"m"==m?f[h]=p:p=m}for(var g=0,v=s;g<u;++g){var y=f[g];"1"==y&&"r"==v?f[g]="n":n.test(y)&&(v=y,"r"==y&&(f[g]="R"))}for(var b=1,x=f[0];b<u-1;++b){var w=f[b];"+"==w&&"1"==x&&"1"==f[b+1]?f[b]="1":","!=w||x!=f[b+1]||"1"!=x&&"n"!=x||(f[b]=x),x=w}for(var k=0;k<u;++k){var C=f[k];if(","==C)f[k]="N";else if("%"==C){var S=void 0;for(S=k+1;S<u&&"%"==f[S];++S);for(var T=k&&"!"==f[k-1]||S<u&&"1"==f[S]?"1":"N",L=k;L<S;++L)f[L]=T;k=S-1}}for(var M=0,O=s;M<u;++M){var N=f[M];"L"==O&&"1"==N?f[M]="L":n.test(N)&&(O=N)}for(var A=0;A<u;++A)if(t.test(f[A])){var E=void 0;for(E=A+1;E<u&&t.test(f[E]);++E);for(var z="L"==(A?f[A-1]:s),P=z==("L"==(E<u?f[E]:s))?z?"L":"R":s,D=A;D<E;++D)f[D]=P;A=E-1}for(var I,_=[],F=0;F<u;)if(r.test(f[F])){var W=F;for(++F;F<u&&r.test(f[F]);++F);_.push(new o(0,W,F))}else{var R=F,H=_.length,B="rtl"==l?1:0;for(++F;F<u&&"L"!=f[F];++F);for(var j=R;j<F;)if(i.test(f[j])){R<j&&(_.splice(H,0,new o(1,R,j)),H+=B);var q=j;for(++j;j<F&&i.test(f[j]);++j);_.splice(H,0,new o(2,q,j)),H+=B,R=j}else++j;R<F&&_.splice(H,0,new o(1,R,F))}return"ltr"==l&&(1==_[0].level&&(I=a.match(/^\s+/))&&(_[0].from=I[0].length,_.unshift(new o(0,0,I[0].length))),1==G(_).level&&(I=a.match(/\s+$/))&&(G(_).to-=I[0].length,_.push(new o(0,u-I[0].length,u)))),"rtl"==l?_.reverse():_}}();function ce(e,t){var n=e.order;return null==n&&(n=e.order=se(e.text,t)),n}var ue=[],fe=function(e,t,n){if(e.addEventListener)e.addEventListener(t,n,!1);else if(e.attachEvent)e.attachEvent("on"+t,n);else{var r=e._handlers||(e._handlers={});r[t]=(r[t]||ue).concat(n)}};function de(e,t){return e._handlers&&e._handlers[t]||ue}function he(e,t,n){if(e.removeEventListener)e.removeEventListener(t,n,!1);else if(e.detachEvent)e.detachEvent("on"+t,n);else{var r=e._handlers,i=r&&r[t];if(i){var o=H(i,n);o>-1&&(r[t]=i.slice(0,o).concat(i.slice(o+1)))}}}function pe(e,t){var n=de(e,t);if(n.length)for(var r=Array.prototype.slice.call(arguments,2),i=0;i<n.length;++i)n[i].apply(null,r)}function me(e,t,n){return"string"==typeof t&&(t={type:t,preventDefault:function(){this.defaultPrevented=!0}}),pe(e,n||t.type,e,t),we(t)||t.codemirrorIgnore}function ge(e){var t=e._handlers&&e._handlers.cursorActivity;if(t)for(var n=e.curOp.cursorActivityHandlers||(e.curOp.cursorActivityHandlers=[]),r=0;r<t.length;++r)-1==H(n,t[r])&&n.push(t[r])}function ve(e,t){return de(e,t).length>0}function ye(e){e.prototype.on=function(e,t){fe(this,e,t)},e.prototype.off=function(e,t){he(this,e,t)}}function be(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function xe(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0}function we(e){return null!=e.defaultPrevented?e.defaultPrevented:0==e.returnValue}function ke(e){be(e),xe(e)}function Ce(e){return e.target||e.srcElement}function Se(e){var t=e.which;return null==t&&(1&e.button?t=1:2&e.button?t=3:4&e.button&&(t=2)),y&&e.ctrlKey&&1==t&&(t=3),t}var Te,Le,Me=function(){if(a&&l<9)return!1;var e=N("div");return"draggable"in e||"dragDrop"in e}();function Oe(e){if(null==Te){var t=N("span","​");O(e,N("span",[t,document.createTextNode("x")])),0!=e.firstChild.offsetHeight&&(Te=t.offsetWidth<=1&&t.offsetHeight>2&&!(a&&l<8))}var n=Te?N("span","​"):N("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return n.setAttribute("cm-text",""),n}function Ne(e){if(null!=Le)return Le;var t=O(e,document.createTextNode("AخA")),n=T(t,0,1).getBoundingClientRect(),r=T(t,1,2).getBoundingClientRect();return M(e),!(!n||n.left==n.right)&&(Le=r.right-n.right<3)}var Ae,Ee=3!="\n\nb".split(/\n/).length?function(e){for(var t=0,n=[],r=e.length;t<=r;){var i=e.indexOf("\n",t);-1==i&&(i=e.length);var o=e.slice(t,"\r"==e.charAt(i-1)?i-1:i),a=o.indexOf("\r");-1!=a?(n.push(o.slice(0,a)),t+=a+1):(n.push(o),t=i+1)}return n}:function(e){return e.split(/\r\n?|\n/)},ze=window.getSelection?function(e){try{return e.selectionStart!=e.selectionEnd}catch(e){return!1}}:function(e){var t;try{t=e.ownerDocument.selection.createRange()}catch(e){}return!(!t||t.parentElement()!=e)&&0!=t.compareEndPoints("StartToEnd",t)},Pe="oncopy"in(Ae=N("div"))||(Ae.setAttribute("oncopy","return;"),"function"==typeof Ae.oncopy),De=null,Ie={},_e={};function Fe(e,t){arguments.length>2&&(t.dependencies=Array.prototype.slice.call(arguments,2)),Ie[e]=t}function We(e){if("string"==typeof e&&_e.hasOwnProperty(e))e=_e[e];else if(e&&"string"==typeof e.name&&_e.hasOwnProperty(e.name)){var t=_e[e.name];"string"==typeof t&&(t={name:t}),(e=Z(t,e)).name=t.name}else{if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+xml$/.test(e))return We("application/xml");if("string"==typeof e&&/^[\w\-]+\/[\w\-]+\+json$/.test(e))return We("application/json")}return"string"==typeof e?{name:e}:e||{name:"null"}}function Re(e,t){t=We(t);var n=Ie[t.name];if(!n)return Re(e,"text/plain");var r=n(e,t);if(He.hasOwnProperty(t.name)){var i=He[t.name];for(var o in i)i.hasOwnProperty(o)&&(r.hasOwnProperty(o)&&(r["_"+o]=r[o]),r[o]=i[o])}if(r.name=t.name,t.helperType&&(r.helperType=t.helperType),t.modeProps)for(var a in t.modeProps)r[a]=t.modeProps[a];return r}var He={};function Be(e,t){F(t,He.hasOwnProperty(e)?He[e]:He[e]={})}function je(e,t){if(!0===t)return t;if(e.copyState)return e.copyState(t);var n={};for(var r in t){var i=t[r];i instanceof Array&&(i=i.concat([])),n[r]=i}return n}function qe(e,t){for(var n;e.innerMode&&(n=e.innerMode(t))&&n.mode!=e;)t=n.state,e=n.mode;return n||{mode:e,state:t}}function Ue(e,t,n){return!e.startState||e.startState(t,n)}var Ve=function(e,t,n){this.pos=this.start=0,this.string=e,this.tabSize=t||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=n};function Ke(e,t){if((t-=e.first)<0||t>=e.size)throw new Error("There is no line "+(t+e.first)+" in the document.");for(var n=e;!n.lines;)for(var r=0;;++r){var i=n.children[r],o=i.chunkSize();if(t<o){n=i;break}t-=o}return n.lines[t]}function $e(e,t,n){var r=[],i=t.line;return e.iter(t.line,n.line+1,(function(e){var o=e.text;i==n.line&&(o=o.slice(0,n.ch)),i==t.line&&(o=o.slice(t.ch)),r.push(o),++i})),r}function Ge(e,t,n){var r=[];return e.iter(t,n,(function(e){r.push(e.text)})),r}function Xe(e,t){var n=t-e.height;if(n)for(var r=e;r;r=r.parent)r.height+=n}function Ye(e){if(null==e.parent)return null;for(var t=e.parent,n=H(t.lines,e),r=t.parent;r;t=r,r=r.parent)for(var i=0;r.children[i]!=t;++i)n+=r.children[i].chunkSize();return n+t.first}function Ze(e,t){var n=e.first;e:do{for(var r=0;r<e.children.length;++r){var i=e.children[r],o=i.height;if(t<o){e=i;continue e}t-=o,n+=i.chunkSize()}return n}while(!e.lines);for(var a=0;a<e.lines.length;++a){var l=e.lines[a].height;if(t<l)break;t-=l}return n+a}function Qe(e,t){return t>=e.first&&t<e.first+e.size}function Je(e,t){return String(e.lineNumberFormatter(t+e.firstLineNumber))}function et(e,t,n){if(void 0===n&&(n=null),!(this instanceof et))return new et(e,t,n);this.line=e,this.ch=t,this.sticky=n}function tt(e,t){return e.line-t.line||e.ch-t.ch}function nt(e,t){return e.sticky==t.sticky&&0==tt(e,t)}function rt(e){return et(e.line,e.ch)}function it(e,t){return tt(e,t)<0?t:e}function ot(e,t){return tt(e,t)<0?e:t}function at(e,t){return Math.max(e.first,Math.min(t,e.first+e.size-1))}function lt(e,t){if(t.line<e.first)return et(e.first,0);var n=e.first+e.size-1;return t.line>n?et(n,Ke(e,n).text.length):function(e,t){var n=e.ch;return null==n||n>t?et(e.line,t):n<0?et(e.line,0):e}(t,Ke(e,t.line).text.length)}function st(e,t){for(var n=[],r=0;r<t.length;r++)n[r]=lt(e,t[r]);return n}Ve.prototype.eol=function(){return this.pos>=this.string.length},Ve.prototype.sol=function(){return this.pos==this.lineStart},Ve.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},Ve.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},Ve.prototype.eat=function(e){var t=this.string.charAt(this.pos);if("string"==typeof e?t==e:t&&(e.test?e.test(t):e(t)))return++this.pos,t},Ve.prototype.eatWhile=function(e){for(var t=this.pos;this.eat(e););return this.pos>t},Ve.prototype.eatSpace=function(){for(var e=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>e},Ve.prototype.skipToEnd=function(){this.pos=this.string.length},Ve.prototype.skipTo=function(e){var t=this.string.indexOf(e,this.pos);if(t>-1)return this.pos=t,!0},Ve.prototype.backUp=function(e){this.pos-=e},Ve.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=W(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?W(this.string,this.lineStart,this.tabSize):0)},Ve.prototype.indentation=function(){return W(this.string,null,this.tabSize)-(this.lineStart?W(this.string,this.lineStart,this.tabSize):0)},Ve.prototype.match=function(e,t,n){if("string"!=typeof e){var r=this.string.slice(this.pos).match(e);return r&&r.index>0?null:(r&&!1!==t&&(this.pos+=r[0].length),r)}var i=function(e){return n?e.toLowerCase():e};if(i(this.string.substr(this.pos,e.length))==i(e))return!1!==t&&(this.pos+=e.length),!0},Ve.prototype.current=function(){return this.string.slice(this.start,this.pos)},Ve.prototype.hideFirstChars=function(e,t){this.lineStart+=e;try{return t()}finally{this.lineStart-=e}},Ve.prototype.lookAhead=function(e){var t=this.lineOracle;return t&&t.lookAhead(e)},Ve.prototype.baseToken=function(){var e=this.lineOracle;return e&&e.baseToken(this.pos)};var ct=function(e,t){this.state=e,this.lookAhead=t},ut=function(e,t,n,r){this.state=t,this.doc=e,this.line=n,this.maxLookAhead=r||0,this.baseTokens=null,this.baseTokenPos=1};function ft(e,t,n,r){var i=[e.state.modeGen],o={};xt(e,t.text,e.doc.mode,n,(function(e,t){return i.push(e,t)}),o,r);for(var a=n.state,l=function(r){n.baseTokens=i;var l=e.state.overlays[r],s=1,c=0;n.state=!0,xt(e,t.text,l.mode,n,(function(e,t){for(var n=s;c<e;){var r=i[s];r>e&&i.splice(s,1,e,i[s+1],r),s+=2,c=Math.min(e,r)}if(t)if(l.opaque)i.splice(n,s-n,e,"overlay "+t),s=n+2;else for(;n<s;n+=2){var o=i[n+1];i[n+1]=(o?o+" ":"")+"overlay "+t}}),o),n.state=a,n.baseTokens=null,n.baseTokenPos=1},s=0;s<e.state.overlays.length;++s)l(s);return{styles:i,classes:o.bgClass||o.textClass?o:null}}function dt(e,t,n){if(!t.styles||t.styles[0]!=e.state.modeGen){var r=ht(e,Ye(t)),i=t.text.length>e.options.maxHighlightLength&&je(e.doc.mode,r.state),o=ft(e,t,r);i&&(r.state=i),t.stateAfter=r.save(!i),t.styles=o.styles,o.classes?t.styleClasses=o.classes:t.styleClasses&&(t.styleClasses=null),n===e.doc.highlightFrontier&&(e.doc.modeFrontier=Math.max(e.doc.modeFrontier,++e.doc.highlightFrontier))}return t.styles}function ht(e,t,n){var r=e.doc,i=e.display;if(!r.mode.startState)return new ut(r,!0,t);var o=function(e,t,n){for(var r,i,o=e.doc,a=n?-1:t-(e.doc.mode.innerMode?1e3:100),l=t;l>a;--l){if(l<=o.first)return o.first;var s=Ke(o,l-1),c=s.stateAfter;if(c&&(!n||l+(c instanceof ct?c.lookAhead:0)<=o.modeFrontier))return l;var u=W(s.text,null,e.options.tabSize);(null==i||r>u)&&(i=l-1,r=u)}return i}(e,t,n),a=o>r.first&&Ke(r,o-1).stateAfter,l=a?ut.fromSaved(r,a,o):new ut(r,Ue(r.mode),o);return r.iter(o,t,(function(n){pt(e,n.text,l);var r=l.line;n.stateAfter=r==t-1||r%5==0||r>=i.viewFrom&&r<i.viewTo?l.save():null,l.nextLine()})),n&&(r.modeFrontier=l.line),l}function pt(e,t,n,r){var i=e.doc.mode,o=new Ve(t,e.options.tabSize,n);for(o.start=o.pos=r||0,""==t&&mt(i,n.state);!o.eol();)gt(i,o,n.state),o.start=o.pos}function mt(e,t){if(e.blankLine)return e.blankLine(t);if(e.innerMode){var n=qe(e,t);return n.mode.blankLine?n.mode.blankLine(n.state):void 0}}function gt(e,t,n,r){for(var i=0;i<10;i++){r&&(r[0]=qe(e,n).mode);var o=e.token(t,n);if(t.pos>t.start)return o}throw new Error("Mode "+e.name+" failed to advance stream.")}ut.prototype.lookAhead=function(e){var t=this.doc.getLine(this.line+e);return null!=t&&e>this.maxLookAhead&&(this.maxLookAhead=e),t},ut.prototype.baseToken=function(e){if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=e;)this.baseTokenPos+=2;var t=this.baseTokens[this.baseTokenPos+1];return{type:t&&t.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-e}},ut.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},ut.fromSaved=function(e,t,n){return t instanceof ct?new ut(e,je(e.mode,t.state),n,t.lookAhead):new ut(e,je(e.mode,t),n)},ut.prototype.save=function(e){var t=!1!==e?je(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new ct(t,this.maxLookAhead):t};var vt=function(e,t,n){this.start=e.start,this.end=e.pos,this.string=e.current(),this.type=t||null,this.state=n};function yt(e,t,n,r){var i,o,a=e.doc,l=a.mode,s=Ke(a,(t=lt(a,t)).line),c=ht(e,t.line,n),u=new Ve(s.text,e.options.tabSize,c);for(r&&(o=[]);(r||u.pos<t.ch)&&!u.eol();)u.start=u.pos,i=gt(l,u,c.state),r&&o.push(new vt(u,i,je(a.mode,c.state)));return r?o:new vt(u,i,c.state)}function bt(e,t){if(e)for(;;){var n=e.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!n)break;e=e.slice(0,n.index)+e.slice(n.index+n[0].length);var r=n[1]?"bgClass":"textClass";null==t[r]?t[r]=n[2]:new RegExp("(?:^|\\s)"+n[2]+"(?:$|\\s)").test(t[r])||(t[r]+=" "+n[2])}return e}function xt(e,t,n,r,i,o,a){var l=n.flattenSpans;null==l&&(l=e.options.flattenSpans);var s,c=0,u=null,f=new Ve(t,e.options.tabSize,r),d=e.options.addModeClass&&[null];for(""==t&&bt(mt(n,r.state),o);!f.eol();){if(f.pos>e.options.maxHighlightLength?(l=!1,a&&pt(e,t,r,f.pos),f.pos=t.length,s=null):s=bt(gt(n,f,r.state,d),o),d){var h=d[0].name;h&&(s="m-"+(s?h+" "+s:h))}if(!l||u!=s){for(;c<f.start;)i(c=Math.min(f.start,c+5e3),u);u=s}f.start=f.pos}for(;c<f.pos;){var p=Math.min(f.pos,c+5e3);i(p,u),c=p}}var wt=!1,kt=!1;function Ct(e,t,n){this.marker=e,this.from=t,this.to=n}function St(e,t){if(e)for(var n=0;n<e.length;++n){var r=e[n];if(r.marker==t)return r}}function Tt(e,t){for(var n,r=0;r<e.length;++r)e[r]!=t&&(n||(n=[])).push(e[r]);return n}function Lt(e,t){if(t.full)return null;var n=Qe(e,t.from.line)&&Ke(e,t.from.line).markedSpans,r=Qe(e,t.to.line)&&Ke(e,t.to.line).markedSpans;if(!n&&!r)return null;var i=t.from.ch,o=t.to.ch,a=0==tt(t.from,t.to),l=function(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],a=o.marker;if(null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t)||o.from==t&&"bookmark"==a.type&&(!n||!o.marker.insertLeft)){var l=null==o.to||(a.inclusiveRight?o.to>=t:o.to>t);(r||(r=[])).push(new Ct(a,o.from,l?null:o.to))}}return r}(n,i,a),s=function(e,t,n){var r;if(e)for(var i=0;i<e.length;++i){var o=e[i],a=o.marker;if(null==o.to||(a.inclusiveRight?o.to>=t:o.to>t)||o.from==t&&"bookmark"==a.type&&(!n||o.marker.insertLeft)){var l=null==o.from||(a.inclusiveLeft?o.from<=t:o.from<t);(r||(r=[])).push(new Ct(a,l?null:o.from-t,null==o.to?null:o.to-t))}}return r}(r,o,a),c=1==t.text.length,u=G(t.text).length+(c?i:0);if(l)for(var f=0;f<l.length;++f){var d=l[f];if(null==d.to){var h=St(s,d.marker);h?c&&(d.to=null==h.to?null:h.to+u):d.to=i}}if(s)for(var p=0;p<s.length;++p){var m=s[p];null!=m.to&&(m.to+=u),null==m.from?St(l,m.marker)||(m.from=u,c&&(l||(l=[])).push(m)):(m.from+=u,c&&(l||(l=[])).push(m))}l&&(l=Mt(l)),s&&s!=l&&(s=Mt(s));var g=[l];if(!c){var v,y=t.text.length-2;if(y>0&&l)for(var b=0;b<l.length;++b)null==l[b].to&&(v||(v=[])).push(new Ct(l[b].marker,null,null));for(var x=0;x<y;++x)g.push(v);g.push(s)}return g}function Mt(e){for(var t=0;t<e.length;++t){var n=e[t];null!=n.from&&n.from==n.to&&!1!==n.marker.clearWhenEmpty&&e.splice(t--,1)}return e.length?e:null}function Ot(e){var t=e.markedSpans;if(t){for(var n=0;n<t.length;++n)t[n].marker.detachLine(e);e.markedSpans=null}}function Nt(e,t){if(t){for(var n=0;n<t.length;++n)t[n].marker.attachLine(e);e.markedSpans=t}}function At(e){return e.inclusiveLeft?-1:0}function Et(e){return e.inclusiveRight?1:0}function zt(e,t){var n=e.lines.length-t.lines.length;if(0!=n)return n;var r=e.find(),i=t.find(),o=tt(r.from,i.from)||At(e)-At(t);if(o)return-o;var a=tt(r.to,i.to)||Et(e)-Et(t);return a||t.id-e.id}function Pt(e,t){var n,r=kt&&e.markedSpans;if(r)for(var i=void 0,o=0;o<r.length;++o)(i=r[o]).marker.collapsed&&null==(t?i.from:i.to)&&(!n||zt(n,i.marker)<0)&&(n=i.marker);return n}function Dt(e){return Pt(e,!0)}function It(e){return Pt(e,!1)}function _t(e,t){var n,r=kt&&e.markedSpans;if(r)for(var i=0;i<r.length;++i){var o=r[i];o.marker.collapsed&&(null==o.from||o.from<t)&&(null==o.to||o.to>t)&&(!n||zt(n,o.marker)<0)&&(n=o.marker)}return n}function Ft(e,t,n,r,i){var o=Ke(e,t),a=kt&&o.markedSpans;if(a)for(var l=0;l<a.length;++l){var s=a[l];if(s.marker.collapsed){var c=s.marker.find(0),u=tt(c.from,n)||At(s.marker)-At(i),f=tt(c.to,r)||Et(s.marker)-Et(i);if(!(u>=0&&f<=0||u<=0&&f>=0)&&(u<=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?tt(c.to,n)>=0:tt(c.to,n)>0)||u>=0&&(s.marker.inclusiveRight&&i.inclusiveLeft?tt(c.from,r)<=0:tt(c.from,r)<0)))return!0}}}function Wt(e){for(var t;t=Dt(e);)e=t.find(-1,!0).line;return e}function Rt(e,t){var n=Ke(e,t),r=Wt(n);return n==r?t:Ye(r)}function Ht(e,t){if(t>e.lastLine())return t;var n,r=Ke(e,t);if(!Bt(e,r))return t;for(;n=It(r);)r=n.find(1,!0).line;return Ye(r)+1}function Bt(e,t){var n=kt&&t.markedSpans;if(n)for(var r=void 0,i=0;i<n.length;++i)if((r=n[i]).marker.collapsed){if(null==r.from)return!0;if(!r.marker.widgetNode&&0==r.from&&r.marker.inclusiveLeft&&jt(e,t,r))return!0}}function jt(e,t,n){if(null==n.to){var r=n.marker.find(1,!0);return jt(e,r.line,St(r.line.markedSpans,n.marker))}if(n.marker.inclusiveRight&&n.to==t.text.length)return!0;for(var i=void 0,o=0;o<t.markedSpans.length;++o)if((i=t.markedSpans[o]).marker.collapsed&&!i.marker.widgetNode&&i.from==n.to&&(null==i.to||i.to!=n.from)&&(i.marker.inclusiveLeft||n.marker.inclusiveRight)&&jt(e,t,i))return!0}function qt(e){for(var t=0,n=(e=Wt(e)).parent,r=0;r<n.lines.length;++r){var i=n.lines[r];if(i==e)break;t+=i.height}for(var o=n.parent;o;o=(n=o).parent)for(var a=0;a<o.children.length;++a){var l=o.children[a];if(l==n)break;t+=l.height}return t}function Ut(e){if(0==e.height)return 0;for(var t,n=e.text.length,r=e;t=Dt(r);){var i=t.find(0,!0);r=i.from.line,n+=i.from.ch-i.to.ch}for(r=e;t=It(r);){var o=t.find(0,!0);n-=r.text.length-o.from.ch,n+=(r=o.to.line).text.length-o.to.ch}return n}function Vt(e){var t=e.display,n=e.doc;t.maxLine=Ke(n,n.first),t.maxLineLength=Ut(t.maxLine),t.maxLineChanged=!0,n.iter((function(e){var n=Ut(e);n>t.maxLineLength&&(t.maxLineLength=n,t.maxLine=e)}))}var Kt=function(e,t,n){this.text=e,Nt(this,t),this.height=n?n(this):1};function $t(e){e.parent=null,Ot(e)}Kt.prototype.lineNo=function(){return Ye(this)},ye(Kt);var Gt={},Xt={};function Yt(e,t){if(!e||/^\s*$/.test(e))return null;var n=t.addModeClass?Xt:Gt;return n[e]||(n[e]=e.replace(/\S+/g,"cm-$&"))}function Zt(e,t){var n=A("span",null,null,s?"padding-right: .1px":null),r={pre:A("pre",[n],"CodeMirror-line"),content:n,col:0,pos:0,cm:e,trailingSpace:!1,splitSpaces:e.getOption("lineWrapping")};t.measure={};for(var i=0;i<=(t.rest?t.rest.length:0);i++){var o=i?t.rest[i-1]:t.line,a=void 0;r.pos=0,r.addToken=Jt,Ne(e.display.measure)&&(a=ce(o,e.doc.direction))&&(r.addToken=en(r.addToken,a)),r.map=[],nn(o,r,dt(e,o,t!=e.display.externalMeasured&&Ye(o))),o.styleClasses&&(o.styleClasses.bgClass&&(r.bgClass=D(o.styleClasses.bgClass,r.bgClass||"")),o.styleClasses.textClass&&(r.textClass=D(o.styleClasses.textClass,r.textClass||""))),0==r.map.length&&r.map.push(0,0,r.content.appendChild(Oe(e.display.measure))),0==i?(t.measure.map=r.map,t.measure.cache={}):((t.measure.maps||(t.measure.maps=[])).push(r.map),(t.measure.caches||(t.measure.caches=[])).push({}))}if(s){var l=r.content.lastChild;(/\bcm-tab\b/.test(l.className)||l.querySelector&&l.querySelector(".cm-tab"))&&(r.content.className="cm-tab-wrap-hack")}return pe(e,"renderLine",e,t.line,r.pre),r.pre.className&&(r.textClass=D(r.pre.className,r.textClass||"")),r}function Qt(e){var t=N("span","•","cm-invalidchar");return t.title="\\u"+e.charCodeAt(0).toString(16),t.setAttribute("aria-label",t.title),t}function Jt(e,t,n,r,i,o,s){if(t){var c,u=e.splitSpaces?function(e,t){if(e.length>1&&!/  /.test(e))return e;for(var n=t,r="",i=0;i<e.length;i++){var o=e.charAt(i);" "!=o||!n||i!=e.length-1&&32!=e.charCodeAt(i+1)||(o=" "),r+=o,n=" "==o}return r}(t,e.trailingSpace):t,f=e.cm.state.specialChars,d=!1;if(f.test(t)){c=document.createDocumentFragment();for(var h=0;;){f.lastIndex=h;var p=f.exec(t),m=p?p.index-h:t.length-h;if(m){var g=document.createTextNode(u.slice(h,h+m));a&&l<9?c.appendChild(N("span",[g])):c.appendChild(g),e.map.push(e.pos,e.pos+m,g),e.col+=m,e.pos+=m}if(!p)break;h+=m+1;var v=void 0;if("\t"==p[0]){var y=e.cm.options.tabSize,b=y-e.col%y;(v=c.appendChild(N("span",$(b),"cm-tab"))).setAttribute("role","presentation"),v.setAttribute("cm-text","\t"),e.col+=b}else"\r"==p[0]||"\n"==p[0]?((v=c.appendChild(N("span","\r"==p[0]?"�":"�","cm-invalidchar"))).setAttribute("cm-text",p[0]),e.col+=1):((v=e.cm.options.specialCharPlaceholder(p[0])).setAttribute("cm-text",p[0]),a&&l<9?c.appendChild(N("span",[v])):c.appendChild(v),e.col+=1);e.map.push(e.pos,e.pos+1,v),e.pos++}}else e.col+=t.length,c=document.createTextNode(u),e.map.push(e.pos,e.pos+t.length,c),a&&l<9&&(d=!0),e.pos+=t.length;if(e.trailingSpace=32==u.charCodeAt(t.length-1),n||r||i||d||o||s){var x=n||"";r&&(x+=r),i&&(x+=i);var w=N("span",[c],x,o);if(s)for(var k in s)s.hasOwnProperty(k)&&"style"!=k&&"class"!=k&&w.setAttribute(k,s[k]);return e.content.appendChild(w)}e.content.appendChild(c)}}function en(e,t){return function(n,r,i,o,a,l,s){i=i?i+" cm-force-border":"cm-force-border";for(var c=n.pos,u=c+r.length;;){for(var f=void 0,d=0;d<t.length&&!((f=t[d]).to>c&&f.from<=c);d++);if(f.to>=u)return e(n,r,i,o,a,l,s);e(n,r.slice(0,f.to-c),i,o,null,l,s),o=null,r=r.slice(f.to-c),c=f.to}}}function tn(e,t,n,r){var i=!r&&n.widgetNode;i&&e.map.push(e.pos,e.pos+t,i),!r&&e.cm.display.input.needsContentAttribute&&(i||(i=e.content.appendChild(document.createElement("span"))),i.setAttribute("cm-marker",n.id)),i&&(e.cm.display.input.setUneditable(i),e.content.appendChild(i)),e.pos+=t,e.trailingSpace=!1}function nn(e,t,n){var r=e.markedSpans,i=e.text,o=0;if(r)for(var a,l,s,c,u,f,d,h=i.length,p=0,m=1,g="",v=0;;){if(v==p){s=c=u=l="",d=null,f=null,v=1/0;for(var y=[],b=void 0,x=0;x<r.length;++x){var w=r[x],k=w.marker;if("bookmark"==k.type&&w.from==p&&k.widgetNode)y.push(k);else if(w.from<=p&&(null==w.to||w.to>p||k.collapsed&&w.to==p&&w.from==p)){if(null!=w.to&&w.to!=p&&v>w.to&&(v=w.to,c=""),k.className&&(s+=" "+k.className),k.css&&(l=(l?l+";":"")+k.css),k.startStyle&&w.from==p&&(u+=" "+k.startStyle),k.endStyle&&w.to==v&&(b||(b=[])).push(k.endStyle,w.to),k.title&&((d||(d={})).title=k.title),k.attributes)for(var C in k.attributes)(d||(d={}))[C]=k.attributes[C];k.collapsed&&(!f||zt(f.marker,k)<0)&&(f=w)}else w.from>p&&v>w.from&&(v=w.from)}if(b)for(var S=0;S<b.length;S+=2)b[S+1]==v&&(c+=" "+b[S]);if(!f||f.from==p)for(var T=0;T<y.length;++T)tn(t,0,y[T]);if(f&&(f.from||0)==p){if(tn(t,(null==f.to?h+1:f.to)-p,f.marker,null==f.from),null==f.to)return;f.to==p&&(f=!1)}}if(p>=h)break;for(var L=Math.min(h,v);;){if(g){var M=p+g.length;if(!f){var O=M>L?g.slice(0,L-p):g;t.addToken(t,O,a?a+s:s,u,p+O.length==v?c:"",l,d)}if(M>=L){g=g.slice(L-p),p=L;break}p=M,u=""}g=i.slice(o,o=n[m++]),a=Yt(n[m++],t.cm.options)}}else for(var N=1;N<n.length;N+=2)t.addToken(t,i.slice(o,o=n[N]),Yt(n[N+1],t.cm.options))}function rn(e,t,n){this.line=t,this.rest=function(e){for(var t,n;t=It(e);)e=t.find(1,!0).line,(n||(n=[])).push(e);return n}(t),this.size=this.rest?Ye(G(this.rest))-n+1:1,this.node=this.text=null,this.hidden=Bt(e,t)}function on(e,t,n){for(var r,i=[],o=t;o<n;o=r){var a=new rn(e.doc,Ke(e.doc,o),o);r=o+a.size,i.push(a)}return i}var an=null,ln=null;function sn(e,t){var n=de(e,t);if(n.length){var r,i=Array.prototype.slice.call(arguments,2);an?r=an.delayedCallbacks:ln?r=ln:(r=ln=[],setTimeout(cn,0));for(var o=function(e){r.push((function(){return n[e].apply(null,i)}))},a=0;a<n.length;++a)o(a)}}function cn(){var e=ln;ln=null;for(var t=0;t<e.length;++t)e[t]()}function un(e,t,n,r){for(var i=0;i<t.changes.length;i++){var o=t.changes[i];"text"==o?hn(e,t):"gutter"==o?mn(e,t,n,r):"class"==o?pn(e,t):"widget"==o&&gn(e,t,r)}t.changes=null}function fn(e){return e.node==e.text&&(e.node=N("div",null,null,"position: relative"),e.text.parentNode&&e.text.parentNode.replaceChild(e.node,e.text),e.node.appendChild(e.text),a&&l<8&&(e.node.style.zIndex=2)),e.node}function dn(e,t){var n=e.display.externalMeasured;return n&&n.line==t.line?(e.display.externalMeasured=null,t.measure=n.measure,n.built):Zt(e,t)}function hn(e,t){var n=t.text.className,r=dn(e,t);t.text==t.node&&(t.node=r.pre),t.text.parentNode.replaceChild(r.pre,t.text),t.text=r.pre,r.bgClass!=t.bgClass||r.textClass!=t.textClass?(t.bgClass=r.bgClass,t.textClass=r.textClass,pn(e,t)):n&&(t.text.className=n)}function pn(e,t){!function(e,t){var n=t.bgClass?t.bgClass+" "+(t.line.bgClass||""):t.line.bgClass;if(n&&(n+=" CodeMirror-linebackground"),t.background)n?t.background.className=n:(t.background.parentNode.removeChild(t.background),t.background=null);else if(n){var r=fn(t);t.background=r.insertBefore(N("div",null,n),r.firstChild),e.display.input.setUneditable(t.background)}}(e,t),t.line.wrapClass?fn(t).className=t.line.wrapClass:t.node!=t.text&&(t.node.className="");var n=t.textClass?t.textClass+" "+(t.line.textClass||""):t.line.textClass;t.text.className=n||""}function mn(e,t,n,r){if(t.gutter&&(t.node.removeChild(t.gutter),t.gutter=null),t.gutterBackground&&(t.node.removeChild(t.gutterBackground),t.gutterBackground=null),t.line.gutterClass){var i=fn(t);t.gutterBackground=N("div",null,"CodeMirror-gutter-background "+t.line.gutterClass,"left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px; width: "+r.gutterTotalWidth+"px"),e.display.input.setUneditable(t.gutterBackground),i.insertBefore(t.gutterBackground,t.text)}var o=t.line.gutterMarkers;if(e.options.lineNumbers||o){var a=fn(t),l=t.gutter=N("div",null,"CodeMirror-gutter-wrapper","left: "+(e.options.fixedGutter?r.fixedPos:-r.gutterTotalWidth)+"px");if(e.display.input.setUneditable(l),a.insertBefore(l,t.text),t.line.gutterClass&&(l.className+=" "+t.line.gutterClass),!e.options.lineNumbers||o&&o["CodeMirror-linenumbers"]||(t.lineNumber=l.appendChild(N("div",Je(e.options,n),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+r.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+e.display.lineNumInnerWidth+"px"))),o)for(var s=0;s<e.display.gutterSpecs.length;++s){var c=e.display.gutterSpecs[s].className,u=o.hasOwnProperty(c)&&o[c];u&&l.appendChild(N("div",[u],"CodeMirror-gutter-elt","left: "+r.gutterLeft[c]+"px; width: "+r.gutterWidth[c]+"px"))}}}function gn(e,t,n){t.alignable&&(t.alignable=null);for(var r=S("CodeMirror-linewidget"),i=t.node.firstChild,o=void 0;i;i=o)o=i.nextSibling,r.test(i.className)&&t.node.removeChild(i);yn(e,t,n)}function vn(e,t,n,r){var i=dn(e,t);return t.text=t.node=i.pre,i.bgClass&&(t.bgClass=i.bgClass),i.textClass&&(t.textClass=i.textClass),pn(e,t),mn(e,t,n,r),yn(e,t,r),t.node}function yn(e,t,n){if(bn(e,t.line,t,n,!0),t.rest)for(var r=0;r<t.rest.length;r++)bn(e,t.rest[r],t,n,!1)}function bn(e,t,n,r,i){if(t.widgets)for(var o=fn(n),a=0,l=t.widgets;a<l.length;++a){var s=l[a],c=N("div",[s.node],"CodeMirror-linewidget"+(s.className?" "+s.className:""));s.handleMouseEvents||c.setAttribute("cm-ignore-events","true"),xn(s,c,n,r),e.display.input.setUneditable(c),i&&s.above?o.insertBefore(c,n.gutter||n.text):o.appendChild(c),sn(s,"redraw")}}function xn(e,t,n,r){if(e.noHScroll){(n.alignable||(n.alignable=[])).push(t);var i=r.wrapperWidth;t.style.left=r.fixedPos+"px",e.coverGutter||(i-=r.gutterTotalWidth,t.style.paddingLeft=r.gutterTotalWidth+"px"),t.style.width=i+"px"}e.coverGutter&&(t.style.zIndex=5,t.style.position="relative",e.noHScroll||(t.style.marginLeft=-r.gutterTotalWidth+"px"))}function wn(e){if(null!=e.height)return e.height;var t=e.doc.cm;if(!t)return 0;if(!E(document.body,e.node)){var n="position: relative;";e.coverGutter&&(n+="margin-left: -"+t.display.gutters.offsetWidth+"px;"),e.noHScroll&&(n+="width: "+t.display.wrapper.clientWidth+"px;"),O(t.display.measure,N("div",[e.node],null,n))}return e.height=e.node.parentNode.offsetHeight}function kn(e,t){for(var n=Ce(t);n!=e.wrapper;n=n.parentNode)if(!n||1==n.nodeType&&"true"==n.getAttribute("cm-ignore-events")||n.parentNode==e.sizer&&n!=e.mover)return!0}function Cn(e){return e.lineSpace.offsetTop}function Sn(e){return e.mover.offsetHeight-e.lineSpace.offsetHeight}function Tn(e){if(e.cachedPaddingH)return e.cachedPaddingH;var t=O(e.measure,N("pre","x","CodeMirror-line-like")),n=window.getComputedStyle?window.getComputedStyle(t):t.currentStyle,r={left:parseInt(n.paddingLeft),right:parseInt(n.paddingRight)};return isNaN(r.left)||isNaN(r.right)||(e.cachedPaddingH=r),r}function Ln(e){return 50-e.display.nativeBarWidth}function Mn(e){return e.display.scroller.clientWidth-Ln(e)-e.display.barWidth}function On(e){return e.display.scroller.clientHeight-Ln(e)-e.display.barHeight}function Nn(e,t,n){if(e.line==t)return{map:e.measure.map,cache:e.measure.cache};for(var r=0;r<e.rest.length;r++)if(e.rest[r]==t)return{map:e.measure.maps[r],cache:e.measure.caches[r]};for(var i=0;i<e.rest.length;i++)if(Ye(e.rest[i])>n)return{map:e.measure.maps[i],cache:e.measure.caches[i],before:!0}}function An(e,t,n,r){return Pn(e,zn(e,t),n,r)}function En(e,t){if(t>=e.display.viewFrom&&t<e.display.viewTo)return e.display.view[ur(e,t)];var n=e.display.externalMeasured;return n&&t>=n.lineN&&t<n.lineN+n.size?n:void 0}function zn(e,t){var n=Ye(t),r=En(e,n);r&&!r.text?r=null:r&&r.changes&&(un(e,r,n,or(e)),e.curOp.forceUpdate=!0),r||(r=function(e,t){var n=Ye(t=Wt(t)),r=e.display.externalMeasured=new rn(e.doc,t,n);r.lineN=n;var i=r.built=Zt(e,r);return r.text=i.pre,O(e.display.lineMeasure,i.pre),r}(e,t));var i=Nn(r,t,n);return{line:t,view:r,rect:null,map:i.map,cache:i.cache,before:i.before,hasHeights:!1}}function Pn(e,t,n,r,i){t.before&&(n=-1);var o,s=n+(r||"");return t.cache.hasOwnProperty(s)?o=t.cache[s]:(t.rect||(t.rect=t.view.text.getBoundingClientRect()),t.hasHeights||(function(e,t,n){var r=e.options.lineWrapping,i=r&&Mn(e);if(!t.measure.heights||r&&t.measure.width!=i){var o=t.measure.heights=[];if(r){t.measure.width=i;for(var a=t.text.firstChild.getClientRects(),l=0;l<a.length-1;l++){var s=a[l],c=a[l+1];Math.abs(s.bottom-c.bottom)>2&&o.push((s.bottom+c.top)/2-n.top)}}o.push(n.bottom-n.top)}}(e,t.view,t.rect),t.hasHeights=!0),(o=function(e,t,n,r){var i,o=_n(t.map,n,r),s=o.node,c=o.start,u=o.end,f=o.collapse;if(3==s.nodeType){for(var d=0;d<4;d++){for(;c&&re(t.line.text.charAt(o.coverStart+c));)--c;for(;o.coverStart+u<o.coverEnd&&re(t.line.text.charAt(o.coverStart+u));)++u;if((i=a&&l<9&&0==c&&u==o.coverEnd-o.coverStart?s.parentNode.getBoundingClientRect():Fn(T(s,c,u).getClientRects(),r)).left||i.right||0==c)break;u=c,c-=1,f="right"}a&&l<11&&(i=function(e,t){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!function(e){if(null!=De)return De;var t=O(e,N("span","x")),n=t.getBoundingClientRect(),r=T(t,0,1).getBoundingClientRect();return De=Math.abs(n.left-r.left)>1}(e))return t;var n=screen.logicalXDPI/screen.deviceXDPI,r=screen.logicalYDPI/screen.deviceYDPI;return{left:t.left*n,right:t.right*n,top:t.top*r,bottom:t.bottom*r}}(e.display.measure,i))}else{var h;c>0&&(f=r="right"),i=e.options.lineWrapping&&(h=s.getClientRects()).length>1?h["right"==r?h.length-1:0]:s.getBoundingClientRect()}if(a&&l<9&&!c&&(!i||!i.left&&!i.right)){var p=s.parentNode.getClientRects()[0];i=p?{left:p.left,right:p.left+ir(e.display),top:p.top,bottom:p.bottom}:In}for(var m=i.top-t.rect.top,g=i.bottom-t.rect.top,v=(m+g)/2,y=t.view.measure.heights,b=0;b<y.length-1&&!(v<y[b]);b++);var x=b?y[b-1]:0,w=y[b],k={left:("right"==f?i.right:i.left)-t.rect.left,right:("left"==f?i.left:i.right)-t.rect.left,top:x,bottom:w};return i.left||i.right||(k.bogus=!0),e.options.singleCursorHeightPerLine||(k.rtop=m,k.rbottom=g),k}(e,t,n,r)).bogus||(t.cache[s]=o)),{left:o.left,right:o.right,top:i?o.rtop:o.top,bottom:i?o.rbottom:o.bottom}}var Dn,In={left:0,right:0,top:0,bottom:0};function _n(e,t,n){for(var r,i,o,a,l,s,c=0;c<e.length;c+=3)if(l=e[c],s=e[c+1],t<l?(i=0,o=1,a="left"):t<s?o=1+(i=t-l):(c==e.length-3||t==s&&e[c+3]>t)&&(i=(o=s-l)-1,t>=s&&(a="right")),null!=i){if(r=e[c+2],l==s&&n==(r.insertLeft?"left":"right")&&(a=n),"left"==n&&0==i)for(;c&&e[c-2]==e[c-3]&&e[c-1].insertLeft;)r=e[2+(c-=3)],a="left";if("right"==n&&i==s-l)for(;c<e.length-3&&e[c+3]==e[c+4]&&!e[c+5].insertLeft;)r=e[(c+=3)+2],a="right";break}return{node:r,start:i,end:o,collapse:a,coverStart:l,coverEnd:s}}function Fn(e,t){var n=In;if("left"==t)for(var r=0;r<e.length&&(n=e[r]).left==n.right;r++);else for(var i=e.length-1;i>=0&&(n=e[i]).left==n.right;i--);return n}function Wn(e){if(e.measure&&(e.measure.cache={},e.measure.heights=null,e.rest))for(var t=0;t<e.rest.length;t++)e.measure.caches[t]={}}function Rn(e){e.display.externalMeasure=null,M(e.display.lineMeasure);for(var t=0;t<e.display.view.length;t++)Wn(e.display.view[t])}function Hn(e){Rn(e),e.display.cachedCharWidth=e.display.cachedTextHeight=e.display.cachedPaddingH=null,e.options.lineWrapping||(e.display.maxLineChanged=!0),e.display.lineNumChars=null}function Bn(){return u&&g?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function jn(){return u&&g?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function qn(e){var t=0;if(e.widgets)for(var n=0;n<e.widgets.length;++n)e.widgets[n].above&&(t+=wn(e.widgets[n]));return t}function Un(e,t,n,r,i){if(!i){var o=qn(t);n.top+=o,n.bottom+=o}if("line"==r)return n;r||(r="local");var a=qt(t);if("local"==r?a+=Cn(e.display):a-=e.display.viewOffset,"page"==r||"window"==r){var l=e.display.lineSpace.getBoundingClientRect();a+=l.top+("window"==r?0:jn());var s=l.left+("window"==r?0:Bn());n.left+=s,n.right+=s}return n.top+=a,n.bottom+=a,n}function Vn(e,t,n){if("div"==n)return t;var r=t.left,i=t.top;if("page"==n)r-=Bn(),i-=jn();else if("local"==n||!n){var o=e.display.sizer.getBoundingClientRect();r+=o.left,i+=o.top}var a=e.display.lineSpace.getBoundingClientRect();return{left:r-a.left,top:i-a.top}}function Kn(e,t,n,r,i){return r||(r=Ke(e.doc,t.line)),Un(e,r,An(e,r,t.ch,i),n)}function $n(e,t,n,r,i,o){function a(t,a){var l=Pn(e,i,t,a?"right":"left",o);return a?l.left=l.right:l.right=l.left,Un(e,r,l,n)}r=r||Ke(e.doc,t.line),i||(i=zn(e,r));var l=ce(r,e.doc.direction),s=t.ch,c=t.sticky;if(s>=r.text.length?(s=r.text.length,c="before"):s<=0&&(s=0,c="after"),!l)return a("before"==c?s-1:s,"before"==c);function u(e,t,n){return a(n?e-1:e,1==l[t].level!=n)}var f=le(l,s,c),d=ae,h=u(s,f,"before"==c);return null!=d&&(h.other=u(s,d,"before"!=c)),h}function Gn(e,t){var n=0;t=lt(e.doc,t),e.options.lineWrapping||(n=ir(e.display)*t.ch);var r=Ke(e.doc,t.line),i=qt(r)+Cn(e.display);return{left:n,right:n,top:i,bottom:i+r.height}}function Xn(e,t,n,r,i){var o=et(e,t,n);return o.xRel=i,r&&(o.outside=r),o}function Yn(e,t,n){var r=e.doc;if((n+=e.display.viewOffset)<0)return Xn(r.first,0,null,-1,-1);var i=Ze(r,n),o=r.first+r.size-1;if(i>o)return Xn(r.first+r.size-1,Ke(r,o).text.length,null,1,1);t<0&&(t=0);for(var a=Ke(r,i);;){var l=er(e,a,i,t,n),s=_t(a,l.ch+(l.xRel>0||l.outside>0?1:0));if(!s)return l;var c=s.find(1);if(c.line==i)return c;a=Ke(r,i=c.line)}}function Zn(e,t,n,r){r-=qn(t);var i=t.text.length,o=oe((function(t){return Pn(e,n,t-1).bottom<=r}),i,0);return{begin:o,end:i=oe((function(t){return Pn(e,n,t).top>r}),o,i)}}function Qn(e,t,n,r){return n||(n=zn(e,t)),Zn(e,t,n,Un(e,t,Pn(e,n,r),"line").top)}function Jn(e,t,n,r){return!(e.bottom<=n)&&(e.top>n||(r?e.left:e.right)>t)}function er(e,t,n,r,i){i-=qt(t);var o=zn(e,t),a=qn(t),l=0,s=t.text.length,c=!0,u=ce(t,e.doc.direction);if(u){var f=(e.options.lineWrapping?nr:tr)(e,t,n,o,u,r,i);l=(c=1!=f.level)?f.from:f.to-1,s=c?f.to:f.from-1}var d,h,p=null,m=null,g=oe((function(t){var n=Pn(e,o,t);return n.top+=a,n.bottom+=a,!!Jn(n,r,i,!1)&&(n.top<=i&&n.left<=r&&(p=t,m=n),!0)}),l,s),v=!1;if(m){var y=r-m.left<m.right-r,b=y==c;g=p+(b?0:1),h=b?"after":"before",d=y?m.left:m.right}else{c||g!=s&&g!=l||g++,h=0==g?"after":g==t.text.length?"before":Pn(e,o,g-(c?1:0)).bottom+a<=i==c?"after":"before";var x=$n(e,et(n,g,h),"line",t,o);d=x.left,v=i<x.top?-1:i>=x.bottom?1:0}return Xn(n,g=ie(t.text,g,1),h,v,r-d)}function tr(e,t,n,r,i,o,a){var l=oe((function(l){var s=i[l],c=1!=s.level;return Jn($n(e,et(n,c?s.to:s.from,c?"before":"after"),"line",t,r),o,a,!0)}),0,i.length-1),s=i[l];if(l>0){var c=1!=s.level,u=$n(e,et(n,c?s.from:s.to,c?"after":"before"),"line",t,r);Jn(u,o,a,!0)&&u.top>a&&(s=i[l-1])}return s}function nr(e,t,n,r,i,o,a){var l=Zn(e,t,r,a),s=l.begin,c=l.end;/\s/.test(t.text.charAt(c-1))&&c--;for(var u=null,f=null,d=0;d<i.length;d++){var h=i[d];if(!(h.from>=c||h.to<=s)){var p=Pn(e,r,1!=h.level?Math.min(c,h.to)-1:Math.max(s,h.from)).right,m=p<o?o-p+1e9:p-o;(!u||f>m)&&(u=h,f=m)}}return u||(u=i[i.length-1]),u.from<s&&(u={from:s,to:u.to,level:u.level}),u.to>c&&(u={from:u.from,to:c,level:u.level}),u}function rr(e){if(null!=e.cachedTextHeight)return e.cachedTextHeight;if(null==Dn){Dn=N("pre",null,"CodeMirror-line-like");for(var t=0;t<49;++t)Dn.appendChild(document.createTextNode("x")),Dn.appendChild(N("br"));Dn.appendChild(document.createTextNode("x"))}O(e.measure,Dn);var n=Dn.offsetHeight/50;return n>3&&(e.cachedTextHeight=n),M(e.measure),n||1}function ir(e){if(null!=e.cachedCharWidth)return e.cachedCharWidth;var t=N("span","xxxxxxxxxx"),n=N("pre",[t],"CodeMirror-line-like");O(e.measure,n);var r=t.getBoundingClientRect(),i=(r.right-r.left)/10;return i>2&&(e.cachedCharWidth=i),i||10}function or(e){for(var t=e.display,n={},r={},i=t.gutters.clientLeft,o=t.gutters.firstChild,a=0;o;o=o.nextSibling,++a){var l=e.display.gutterSpecs[a].className;n[l]=o.offsetLeft+o.clientLeft+i,r[l]=o.clientWidth}return{fixedPos:ar(t),gutterTotalWidth:t.gutters.offsetWidth,gutterLeft:n,gutterWidth:r,wrapperWidth:t.wrapper.clientWidth}}function ar(e){return e.scroller.getBoundingClientRect().left-e.sizer.getBoundingClientRect().left}function lr(e){var t=rr(e.display),n=e.options.lineWrapping,r=n&&Math.max(5,e.display.scroller.clientWidth/ir(e.display)-3);return function(i){if(Bt(e.doc,i))return 0;var o=0;if(i.widgets)for(var a=0;a<i.widgets.length;a++)i.widgets[a].height&&(o+=i.widgets[a].height);return n?o+(Math.ceil(i.text.length/r)||1)*t:o+t}}function sr(e){var t=e.doc,n=lr(e);t.iter((function(e){var t=n(e);t!=e.height&&Xe(e,t)}))}function cr(e,t,n,r){var i=e.display;if(!n&&"true"==Ce(t).getAttribute("cm-not-content"))return null;var o,a,l=i.lineSpace.getBoundingClientRect();try{o=t.clientX-l.left,a=t.clientY-l.top}catch(e){return null}var s,c=Yn(e,o,a);if(r&&c.xRel>0&&(s=Ke(e.doc,c.line).text).length==c.ch){var u=W(s,s.length,e.options.tabSize)-s.length;c=et(c.line,Math.max(0,Math.round((o-Tn(e.display).left)/ir(e.display))-u))}return c}function ur(e,t){if(t>=e.display.viewTo)return null;if((t-=e.display.viewFrom)<0)return null;for(var n=e.display.view,r=0;r<n.length;r++)if((t-=n[r].size)<0)return r}function fr(e,t,n,r){null==t&&(t=e.doc.first),null==n&&(n=e.doc.first+e.doc.size),r||(r=0);var i=e.display;if(r&&n<i.viewTo&&(null==i.updateLineNumbers||i.updateLineNumbers>t)&&(i.updateLineNumbers=t),e.curOp.viewChanged=!0,t>=i.viewTo)kt&&Rt(e.doc,t)<i.viewTo&&hr(e);else if(n<=i.viewFrom)kt&&Ht(e.doc,n+r)>i.viewFrom?hr(e):(i.viewFrom+=r,i.viewTo+=r);else if(t<=i.viewFrom&&n>=i.viewTo)hr(e);else if(t<=i.viewFrom){var o=pr(e,n,n+r,1);o?(i.view=i.view.slice(o.index),i.viewFrom=o.lineN,i.viewTo+=r):hr(e)}else if(n>=i.viewTo){var a=pr(e,t,t,-1);a?(i.view=i.view.slice(0,a.index),i.viewTo=a.lineN):hr(e)}else{var l=pr(e,t,t,-1),s=pr(e,n,n+r,1);l&&s?(i.view=i.view.slice(0,l.index).concat(on(e,l.lineN,s.lineN)).concat(i.view.slice(s.index)),i.viewTo+=r):hr(e)}var c=i.externalMeasured;c&&(n<c.lineN?c.lineN+=r:t<c.lineN+c.size&&(i.externalMeasured=null))}function dr(e,t,n){e.curOp.viewChanged=!0;var r=e.display,i=e.display.externalMeasured;if(i&&t>=i.lineN&&t<i.lineN+i.size&&(r.externalMeasured=null),!(t<r.viewFrom||t>=r.viewTo)){var o=r.view[ur(e,t)];if(null!=o.node){var a=o.changes||(o.changes=[]);-1==H(a,n)&&a.push(n)}}}function hr(e){e.display.viewFrom=e.display.viewTo=e.doc.first,e.display.view=[],e.display.viewOffset=0}function pr(e,t,n,r){var i,o=ur(e,t),a=e.display.view;if(!kt||n==e.doc.first+e.doc.size)return{index:o,lineN:n};for(var l=e.display.viewFrom,s=0;s<o;s++)l+=a[s].size;if(l!=t){if(r>0){if(o==a.length-1)return null;i=l+a[o].size-t,o++}else i=l-t;t+=i,n+=i}for(;Rt(e.doc,n)!=n;){if(o==(r<0?0:a.length-1))return null;n+=r*a[o-(r<0?1:0)].size,o+=r}return{index:o,lineN:n}}function mr(e){for(var t=e.display.view,n=0,r=0;r<t.length;r++){var i=t[r];i.hidden||i.node&&!i.changes||++n}return n}function gr(e){e.display.input.showSelection(e.display.input.prepareSelection())}function vr(e,t){void 0===t&&(t=!0);for(var n=e.doc,r={},i=r.cursors=document.createDocumentFragment(),o=r.selection=document.createDocumentFragment(),a=0;a<n.sel.ranges.length;a++)if(t||a!=n.sel.primIndex){var l=n.sel.ranges[a];if(!(l.from().line>=e.display.viewTo||l.to().line<e.display.viewFrom)){var s=l.empty();(s||e.options.showCursorWhenSelecting)&&yr(e,l.head,i),s||xr(e,l,o)}}return r}function yr(e,t,n){var r=$n(e,t,"div",null,null,!e.options.singleCursorHeightPerLine),i=n.appendChild(N("div"," ","CodeMirror-cursor"));if(i.style.left=r.left+"px",i.style.top=r.top+"px",i.style.height=Math.max(0,r.bottom-r.top)*e.options.cursorHeight+"px",r.other){var o=n.appendChild(N("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));o.style.display="",o.style.left=r.other.left+"px",o.style.top=r.other.top+"px",o.style.height=.85*(r.other.bottom-r.other.top)+"px"}}function br(e,t){return e.top-t.top||e.left-t.left}function xr(e,t,n){var r=e.display,i=e.doc,o=document.createDocumentFragment(),a=Tn(e.display),l=a.left,s=Math.max(r.sizerWidth,Mn(e)-r.sizer.offsetLeft)-a.right,c="ltr"==i.direction;function u(e,t,n,r){t<0&&(t=0),t=Math.round(t),r=Math.round(r),o.appendChild(N("div",null,"CodeMirror-selected","position: absolute; left: "+e+"px;\n                             top: "+t+"px; width: "+(null==n?s-e:n)+"px;\n                             height: "+(r-t)+"px"))}function f(t,n,r){var o,a,f=Ke(i,t),d=f.text.length;function h(n,r){return Kn(e,et(t,n),"div",f,r)}function p(t,n,r){var i=Qn(e,f,null,t),o="ltr"==n==("after"==r)?"left":"right";return h("after"==r?i.begin:i.end-(/\s/.test(f.text.charAt(i.end-1))?2:1),o)[o]}var m=ce(f,i.direction);return function(e,t,n,r){if(!e)return r(t,n,"ltr",0);for(var i=!1,o=0;o<e.length;++o){var a=e[o];(a.from<n&&a.to>t||t==n&&a.to==t)&&(r(Math.max(a.from,t),Math.min(a.to,n),1==a.level?"rtl":"ltr",o),i=!0)}i||r(t,n,"ltr")}(m,n||0,null==r?d:r,(function(e,t,i,f){var g="ltr"==i,v=h(e,g?"left":"right"),y=h(t-1,g?"right":"left"),b=null==n&&0==e,x=null==r&&t==d,w=0==f,k=!m||f==m.length-1;if(y.top-v.top<=3){var C=(c?x:b)&&k,S=(c?b:x)&&w?l:(g?v:y).left,T=C?s:(g?y:v).right;u(S,v.top,T-S,v.bottom)}else{var L,M,O,N;g?(L=c&&b&&w?l:v.left,M=c?s:p(e,i,"before"),O=c?l:p(t,i,"after"),N=c&&x&&k?s:y.right):(L=c?p(e,i,"before"):l,M=!c&&b&&w?s:v.right,O=!c&&x&&k?l:y.left,N=c?p(t,i,"after"):s),u(L,v.top,M-L,v.bottom),v.bottom<y.top&&u(l,v.bottom,null,y.top),u(O,y.top,N-O,y.bottom)}(!o||br(v,o)<0)&&(o=v),br(y,o)<0&&(o=y),(!a||br(v,a)<0)&&(a=v),br(y,a)<0&&(a=y)})),{start:o,end:a}}var d=t.from(),h=t.to();if(d.line==h.line)f(d.line,d.ch,h.ch);else{var p=Ke(i,d.line),m=Ke(i,h.line),g=Wt(p)==Wt(m),v=f(d.line,d.ch,g?p.text.length+1:null).end,y=f(h.line,g?0:null,h.ch).start;g&&(v.top<y.top-2?(u(v.right,v.top,null,v.bottom),u(l,y.top,y.left,y.bottom)):u(v.right,v.top,y.left-v.right,v.bottom)),v.bottom<y.top&&u(l,v.bottom,null,y.top)}n.appendChild(o)}function wr(e){if(e.state.focused){var t=e.display;clearInterval(t.blinker);var n=!0;t.cursorDiv.style.visibility="",e.options.cursorBlinkRate>0?t.blinker=setInterval((function(){e.hasFocus()||Tr(e),t.cursorDiv.style.visibility=(n=!n)?"":"hidden"}),e.options.cursorBlinkRate):e.options.cursorBlinkRate<0&&(t.cursorDiv.style.visibility="hidden")}}function kr(e){e.state.focused||(e.display.input.focus(),Sr(e))}function Cr(e){e.state.delayingBlurEvent=!0,setTimeout((function(){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1,Tr(e))}),100)}function Sr(e,t){e.state.delayingBlurEvent&&(e.state.delayingBlurEvent=!1),"nocursor"!=e.options.readOnly&&(e.state.focused||(pe(e,"focus",e,t),e.state.focused=!0,P(e.display.wrapper,"CodeMirror-focused"),e.curOp||e.display.selForContextMenu==e.doc.sel||(e.display.input.reset(),s&&setTimeout((function(){return e.display.input.reset(!0)}),20)),e.display.input.receivedFocus()),wr(e))}function Tr(e,t){e.state.delayingBlurEvent||(e.state.focused&&(pe(e,"blur",e,t),e.state.focused=!1,L(e.display.wrapper,"CodeMirror-focused")),clearInterval(e.display.blinker),setTimeout((function(){e.state.focused||(e.display.shift=!1)}),150))}function Lr(e){for(var t=e.display,n=t.lineDiv.offsetTop,r=0;r<t.view.length;r++){var i=t.view[r],o=e.options.lineWrapping,s=void 0,c=0;if(!i.hidden){if(a&&l<8){var u=i.node.offsetTop+i.node.offsetHeight;s=u-n,n=u}else{var f=i.node.getBoundingClientRect();s=f.bottom-f.top,!o&&i.text.firstChild&&(c=i.text.firstChild.getBoundingClientRect().right-f.left-1)}var d=i.line.height-s;if((d>.005||d<-.005)&&(Xe(i.line,s),Mr(i.line),i.rest))for(var h=0;h<i.rest.length;h++)Mr(i.rest[h]);if(c>e.display.sizerWidth){var p=Math.ceil(c/ir(e.display));p>e.display.maxLineLength&&(e.display.maxLineLength=p,e.display.maxLine=i.line,e.display.maxLineChanged=!0)}}}}function Mr(e){if(e.widgets)for(var t=0;t<e.widgets.length;++t){var n=e.widgets[t],r=n.node.parentNode;r&&(n.height=r.offsetHeight)}}function Or(e,t,n){var r=n&&null!=n.top?Math.max(0,n.top):e.scroller.scrollTop;r=Math.floor(r-Cn(e));var i=n&&null!=n.bottom?n.bottom:r+e.wrapper.clientHeight,o=Ze(t,r),a=Ze(t,i);if(n&&n.ensure){var l=n.ensure.from.line,s=n.ensure.to.line;l<o?(o=l,a=Ze(t,qt(Ke(t,l))+e.wrapper.clientHeight)):Math.min(s,t.lastLine())>=a&&(o=Ze(t,qt(Ke(t,s))-e.wrapper.clientHeight),a=s)}return{from:o,to:Math.max(a,o+1)}}function Nr(e,t){var n=e.display,r=rr(e.display);t.top<0&&(t.top=0);var i=e.curOp&&null!=e.curOp.scrollTop?e.curOp.scrollTop:n.scroller.scrollTop,o=On(e),a={};t.bottom-t.top>o&&(t.bottom=t.top+o);var l=e.doc.height+Sn(n),s=t.top<r,c=t.bottom>l-r;if(t.top<i)a.scrollTop=s?0:t.top;else if(t.bottom>i+o){var u=Math.min(t.top,(c?l:t.bottom)-o);u!=i&&(a.scrollTop=u)}var f=e.curOp&&null!=e.curOp.scrollLeft?e.curOp.scrollLeft:n.scroller.scrollLeft,d=Mn(e)-(e.options.fixedGutter?n.gutters.offsetWidth:0),h=t.right-t.left>d;return h&&(t.right=t.left+d),t.left<10?a.scrollLeft=0:t.left<f?a.scrollLeft=Math.max(0,t.left-(h?0:10)):t.right>d+f-3&&(a.scrollLeft=t.right+(h?0:10)-d),a}function Ar(e,t){null!=t&&(Pr(e),e.curOp.scrollTop=(null==e.curOp.scrollTop?e.doc.scrollTop:e.curOp.scrollTop)+t)}function Er(e){Pr(e);var t=e.getCursor();e.curOp.scrollToPos={from:t,to:t,margin:e.options.cursorScrollMargin}}function zr(e,t,n){null==t&&null==n||Pr(e),null!=t&&(e.curOp.scrollLeft=t),null!=n&&(e.curOp.scrollTop=n)}function Pr(e){var t=e.curOp.scrollToPos;t&&(e.curOp.scrollToPos=null,Dr(e,Gn(e,t.from),Gn(e,t.to),t.margin))}function Dr(e,t,n,r){var i=Nr(e,{left:Math.min(t.left,n.left),top:Math.min(t.top,n.top)-r,right:Math.max(t.right,n.right),bottom:Math.max(t.bottom,n.bottom)+r});zr(e,i.scrollLeft,i.scrollTop)}function Ir(e,t){Math.abs(e.doc.scrollTop-t)<2||(n||si(e,{top:t}),_r(e,t,!0),n&&si(e),ri(e,100))}function _r(e,t,n){t=Math.max(0,Math.min(e.display.scroller.scrollHeight-e.display.scroller.clientHeight,t)),(e.display.scroller.scrollTop!=t||n)&&(e.doc.scrollTop=t,e.display.scrollbars.setScrollTop(t),e.display.scroller.scrollTop!=t&&(e.display.scroller.scrollTop=t))}function Fr(e,t,n,r){t=Math.max(0,Math.min(t,e.display.scroller.scrollWidth-e.display.scroller.clientWidth)),(n?t==e.doc.scrollLeft:Math.abs(e.doc.scrollLeft-t)<2)&&!r||(e.doc.scrollLeft=t,fi(e),e.display.scroller.scrollLeft!=t&&(e.display.scroller.scrollLeft=t),e.display.scrollbars.setScrollLeft(t))}function Wr(e){var t=e.display,n=t.gutters.offsetWidth,r=Math.round(e.doc.height+Sn(e.display));return{clientHeight:t.scroller.clientHeight,viewHeight:t.wrapper.clientHeight,scrollWidth:t.scroller.scrollWidth,clientWidth:t.scroller.clientWidth,viewWidth:t.wrapper.clientWidth,barLeft:e.options.fixedGutter?n:0,docHeight:r,scrollHeight:r+Ln(e)+t.barHeight,nativeBarWidth:t.nativeBarWidth,gutterWidth:n}}var Rr=function(e,t,n){this.cm=n;var r=this.vert=N("div",[N("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),i=this.horiz=N("div",[N("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");r.tabIndex=i.tabIndex=-1,e(r),e(i),fe(r,"scroll",(function(){r.clientHeight&&t(r.scrollTop,"vertical")})),fe(i,"scroll",(function(){i.clientWidth&&t(i.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,a&&l<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};Rr.prototype.update=function(e){var t=e.scrollWidth>e.clientWidth+1,n=e.scrollHeight>e.clientHeight+1,r=e.nativeBarWidth;if(n){this.vert.style.display="block",this.vert.style.bottom=t?r+"px":"0";var i=e.viewHeight-(t?r:0);this.vert.firstChild.style.height=Math.max(0,e.scrollHeight-e.clientHeight+i)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(t){this.horiz.style.display="block",this.horiz.style.right=n?r+"px":"0",this.horiz.style.left=e.barLeft+"px";var o=e.viewWidth-e.barLeft-(n?r:0);this.horiz.firstChild.style.width=Math.max(0,e.scrollWidth-e.clientWidth+o)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&e.clientHeight>0&&(0==r&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:n?r:0,bottom:t?r:0}},Rr.prototype.setScrollLeft=function(e){this.horiz.scrollLeft!=e&&(this.horiz.scrollLeft=e),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},Rr.prototype.setScrollTop=function(e){this.vert.scrollTop!=e&&(this.vert.scrollTop=e),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},Rr.prototype.zeroWidthHack=function(){var e=y&&!h?"12px":"18px";this.horiz.style.height=this.vert.style.width=e,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new R,this.disableVert=new R},Rr.prototype.enableZeroWidthBar=function(e,t,n){e.style.pointerEvents="auto",t.set(1e3,(function r(){var i=e.getBoundingClientRect();("vert"==n?document.elementFromPoint(i.right-1,(i.top+i.bottom)/2):document.elementFromPoint((i.right+i.left)/2,i.bottom-1))!=e?e.style.pointerEvents="none":t.set(1e3,r)}))},Rr.prototype.clear=function(){var e=this.horiz.parentNode;e.removeChild(this.horiz),e.removeChild(this.vert)};var Hr=function(){};function Br(e,t){t||(t=Wr(e));var n=e.display.barWidth,r=e.display.barHeight;jr(e,t);for(var i=0;i<4&&n!=e.display.barWidth||r!=e.display.barHeight;i++)n!=e.display.barWidth&&e.options.lineWrapping&&Lr(e),jr(e,Wr(e)),n=e.display.barWidth,r=e.display.barHeight}function jr(e,t){var n=e.display,r=n.scrollbars.update(t);n.sizer.style.paddingRight=(n.barWidth=r.right)+"px",n.sizer.style.paddingBottom=(n.barHeight=r.bottom)+"px",n.heightForcer.style.borderBottom=r.bottom+"px solid transparent",r.right&&r.bottom?(n.scrollbarFiller.style.display="block",n.scrollbarFiller.style.height=r.bottom+"px",n.scrollbarFiller.style.width=r.right+"px"):n.scrollbarFiller.style.display="",r.bottom&&e.options.coverGutterNextToScrollbar&&e.options.fixedGutter?(n.gutterFiller.style.display="block",n.gutterFiller.style.height=r.bottom+"px",n.gutterFiller.style.width=t.gutterWidth+"px"):n.gutterFiller.style.display=""}Hr.prototype.update=function(){return{bottom:0,right:0}},Hr.prototype.setScrollLeft=function(){},Hr.prototype.setScrollTop=function(){},Hr.prototype.clear=function(){};var qr={native:Rr,null:Hr};function Ur(e){e.display.scrollbars&&(e.display.scrollbars.clear(),e.display.scrollbars.addClass&&L(e.display.wrapper,e.display.scrollbars.addClass)),e.display.scrollbars=new qr[e.options.scrollbarStyle]((function(t){e.display.wrapper.insertBefore(t,e.display.scrollbarFiller),fe(t,"mousedown",(function(){e.state.focused&&setTimeout((function(){return e.display.input.focus()}),0)})),t.setAttribute("cm-not-content","true")}),(function(t,n){"horizontal"==n?Fr(e,t):Ir(e,t)}),e),e.display.scrollbars.addClass&&P(e.display.wrapper,e.display.scrollbars.addClass)}var Vr=0;function Kr(e){var t;e.curOp={cm:e,viewChanged:!1,startHeight:e.doc.height,forceUpdate:!1,updateInput:0,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Vr},t=e.curOp,an?an.ops.push(t):t.ownsGroup=an={ops:[t],delayedCallbacks:[]}}function $r(e){var t=e.curOp;t&&function(e,t){var n=e.ownsGroup;if(n)try{!function(e){var t=e.delayedCallbacks,n=0;do{for(;n<t.length;n++)t[n].call(null);for(var r=0;r<e.ops.length;r++){var i=e.ops[r];if(i.cursorActivityHandlers)for(;i.cursorActivityCalled<i.cursorActivityHandlers.length;)i.cursorActivityHandlers[i.cursorActivityCalled++].call(null,i.cm)}}while(n<t.length)}(n)}finally{an=null,t(n)}}(t,(function(e){for(var t=0;t<e.ops.length;t++)e.ops[t].cm.curOp=null;!function(e){for(var t=e.ops,n=0;n<t.length;n++)Gr(t[n]);for(var r=0;r<t.length;r++)Xr(t[r]);for(var i=0;i<t.length;i++)Yr(t[i]);for(var o=0;o<t.length;o++)Zr(t[o]);for(var a=0;a<t.length;a++)Qr(t[a])}(e)}))}function Gr(e){var t=e.cm,n=t.display;!function(e){var t=e.display;!t.scrollbarsClipped&&t.scroller.offsetWidth&&(t.nativeBarWidth=t.scroller.offsetWidth-t.scroller.clientWidth,t.heightForcer.style.height=Ln(e)+"px",t.sizer.style.marginBottom=-t.nativeBarWidth+"px",t.sizer.style.borderRightWidth=Ln(e)+"px",t.scrollbarsClipped=!0)}(t),e.updateMaxLine&&Vt(t),e.mustUpdate=e.viewChanged||e.forceUpdate||null!=e.scrollTop||e.scrollToPos&&(e.scrollToPos.from.line<n.viewFrom||e.scrollToPos.to.line>=n.viewTo)||n.maxLineChanged&&t.options.lineWrapping,e.update=e.mustUpdate&&new oi(t,e.mustUpdate&&{top:e.scrollTop,ensure:e.scrollToPos},e.forceUpdate)}function Xr(e){e.updatedDisplay=e.mustUpdate&&ai(e.cm,e.update)}function Yr(e){var t=e.cm,n=t.display;e.updatedDisplay&&Lr(t),e.barMeasure=Wr(t),n.maxLineChanged&&!t.options.lineWrapping&&(e.adjustWidthTo=An(t,n.maxLine,n.maxLine.text.length).left+3,t.display.sizerWidth=e.adjustWidthTo,e.barMeasure.scrollWidth=Math.max(n.scroller.clientWidth,n.sizer.offsetLeft+e.adjustWidthTo+Ln(t)+t.display.barWidth),e.maxScrollLeft=Math.max(0,n.sizer.offsetLeft+e.adjustWidthTo-Mn(t))),(e.updatedDisplay||e.selectionChanged)&&(e.preparedSelection=n.input.prepareSelection())}function Zr(e){var t=e.cm;null!=e.adjustWidthTo&&(t.display.sizer.style.minWidth=e.adjustWidthTo+"px",e.maxScrollLeft<t.doc.scrollLeft&&Fr(t,Math.min(t.display.scroller.scrollLeft,e.maxScrollLeft),!0),t.display.maxLineChanged=!1);var n=e.focus&&e.focus==z();e.preparedSelection&&t.display.input.showSelection(e.preparedSelection,n),(e.updatedDisplay||e.startHeight!=t.doc.height)&&Br(t,e.barMeasure),e.updatedDisplay&&ui(t,e.barMeasure),e.selectionChanged&&wr(t),t.state.focused&&e.updateInput&&t.display.input.reset(e.typing),n&&kr(e.cm)}function Qr(e){var t=e.cm,n=t.display,r=t.doc;e.updatedDisplay&&li(t,e.update),null==n.wheelStartX||null==e.scrollTop&&null==e.scrollLeft&&!e.scrollToPos||(n.wheelStartX=n.wheelStartY=null),null!=e.scrollTop&&_r(t,e.scrollTop,e.forceScroll),null!=e.scrollLeft&&Fr(t,e.scrollLeft,!0,!0),e.scrollToPos&&function(e,t){if(!me(e,"scrollCursorIntoView")){var n=e.display,r=n.sizer.getBoundingClientRect(),i=null;if(t.top+r.top<0?i=!0:t.bottom+r.top>(window.innerHeight||document.documentElement.clientHeight)&&(i=!1),null!=i&&!p){var o=N("div","​",null,"position: absolute;\n                         top: "+(t.top-n.viewOffset-Cn(e.display))+"px;\n                         height: "+(t.bottom-t.top+Ln(e)+n.barHeight)+"px;\n                         left: "+t.left+"px; width: "+Math.max(2,t.right-t.left)+"px;");e.display.lineSpace.appendChild(o),o.scrollIntoView(i),e.display.lineSpace.removeChild(o)}}}(t,function(e,t,n,r){var i;null==r&&(r=0),e.options.lineWrapping||t!=n||(n="before"==(t=t.ch?et(t.line,"before"==t.sticky?t.ch-1:t.ch,"after"):t).sticky?et(t.line,t.ch+1,"before"):t);for(var o=0;o<5;o++){var a=!1,l=$n(e,t),s=n&&n!=t?$n(e,n):l,c=Nr(e,i={left:Math.min(l.left,s.left),top:Math.min(l.top,s.top)-r,right:Math.max(l.left,s.left),bottom:Math.max(l.bottom,s.bottom)+r}),u=e.doc.scrollTop,f=e.doc.scrollLeft;if(null!=c.scrollTop&&(Ir(e,c.scrollTop),Math.abs(e.doc.scrollTop-u)>1&&(a=!0)),null!=c.scrollLeft&&(Fr(e,c.scrollLeft),Math.abs(e.doc.scrollLeft-f)>1&&(a=!0)),!a)break}return i}(t,lt(r,e.scrollToPos.from),lt(r,e.scrollToPos.to),e.scrollToPos.margin));var i=e.maybeHiddenMarkers,o=e.maybeUnhiddenMarkers;if(i)for(var a=0;a<i.length;++a)i[a].lines.length||pe(i[a],"hide");if(o)for(var l=0;l<o.length;++l)o[l].lines.length&&pe(o[l],"unhide");n.wrapper.offsetHeight&&(r.scrollTop=t.display.scroller.scrollTop),e.changeObjs&&pe(t,"changes",t,e.changeObjs),e.update&&e.update.finish()}function Jr(e,t){if(e.curOp)return t();Kr(e);try{return t()}finally{$r(e)}}function ei(e,t){return function(){if(e.curOp)return t.apply(e,arguments);Kr(e);try{return t.apply(e,arguments)}finally{$r(e)}}}function ti(e){return function(){if(this.curOp)return e.apply(this,arguments);Kr(this);try{return e.apply(this,arguments)}finally{$r(this)}}}function ni(e){return function(){var t=this.cm;if(!t||t.curOp)return e.apply(this,arguments);Kr(t);try{return e.apply(this,arguments)}finally{$r(t)}}}function ri(e,t){e.doc.highlightFrontier<e.display.viewTo&&e.state.highlight.set(t,_(ii,e))}function ii(e){var t=e.doc;if(!(t.highlightFrontier>=e.display.viewTo)){var n=+new Date+e.options.workTime,r=ht(e,t.highlightFrontier),i=[];t.iter(r.line,Math.min(t.first+t.size,e.display.viewTo+500),(function(o){if(r.line>=e.display.viewFrom){var a=o.styles,l=o.text.length>e.options.maxHighlightLength?je(t.mode,r.state):null,s=ft(e,o,r,!0);l&&(r.state=l),o.styles=s.styles;var c=o.styleClasses,u=s.classes;u?o.styleClasses=u:c&&(o.styleClasses=null);for(var f=!a||a.length!=o.styles.length||c!=u&&(!c||!u||c.bgClass!=u.bgClass||c.textClass!=u.textClass),d=0;!f&&d<a.length;++d)f=a[d]!=o.styles[d];f&&i.push(r.line),o.stateAfter=r.save(),r.nextLine()}else o.text.length<=e.options.maxHighlightLength&&pt(e,o.text,r),o.stateAfter=r.line%5==0?r.save():null,r.nextLine();if(+new Date>n)return ri(e,e.options.workDelay),!0})),t.highlightFrontier=r.line,t.modeFrontier=Math.max(t.modeFrontier,r.line),i.length&&Jr(e,(function(){for(var t=0;t<i.length;t++)dr(e,i[t],"text")}))}}var oi=function(e,t,n){var r=e.display;this.viewport=t,this.visible=Or(r,e.doc,t),this.editorIsHidden=!r.wrapper.offsetWidth,this.wrapperHeight=r.wrapper.clientHeight,this.wrapperWidth=r.wrapper.clientWidth,this.oldDisplayWidth=Mn(e),this.force=n,this.dims=or(e),this.events=[]};function ai(e,t){var n=e.display,r=e.doc;if(t.editorIsHidden)return hr(e),!1;if(!t.force&&t.visible.from>=n.viewFrom&&t.visible.to<=n.viewTo&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo)&&n.renderedView==n.view&&0==mr(e))return!1;di(e)&&(hr(e),t.dims=or(e));var i=r.first+r.size,o=Math.max(t.visible.from-e.options.viewportMargin,r.first),a=Math.min(i,t.visible.to+e.options.viewportMargin);n.viewFrom<o&&o-n.viewFrom<20&&(o=Math.max(r.first,n.viewFrom)),n.viewTo>a&&n.viewTo-a<20&&(a=Math.min(i,n.viewTo)),kt&&(o=Rt(e.doc,o),a=Ht(e.doc,a));var l=o!=n.viewFrom||a!=n.viewTo||n.lastWrapHeight!=t.wrapperHeight||n.lastWrapWidth!=t.wrapperWidth;!function(e,t,n){var r=e.display;0==r.view.length||t>=r.viewTo||n<=r.viewFrom?(r.view=on(e,t,n),r.viewFrom=t):(r.viewFrom>t?r.view=on(e,t,r.viewFrom).concat(r.view):r.viewFrom<t&&(r.view=r.view.slice(ur(e,t))),r.viewFrom=t,r.viewTo<n?r.view=r.view.concat(on(e,r.viewTo,n)):r.viewTo>n&&(r.view=r.view.slice(0,ur(e,n)))),r.viewTo=n}(e,o,a),n.viewOffset=qt(Ke(e.doc,n.viewFrom)),e.display.mover.style.top=n.viewOffset+"px";var c=mr(e);if(!l&&0==c&&!t.force&&n.renderedView==n.view&&(null==n.updateLineNumbers||n.updateLineNumbers>=n.viewTo))return!1;var u=function(e){if(e.hasFocus())return null;var t=z();if(!t||!E(e.display.lineDiv,t))return null;var n={activeElt:t};if(window.getSelection){var r=window.getSelection();r.anchorNode&&r.extend&&E(e.display.lineDiv,r.anchorNode)&&(n.anchorNode=r.anchorNode,n.anchorOffset=r.anchorOffset,n.focusNode=r.focusNode,n.focusOffset=r.focusOffset)}return n}(e);return c>4&&(n.lineDiv.style.display="none"),function(e,t,n){var r=e.display,i=e.options.lineNumbers,o=r.lineDiv,a=o.firstChild;function l(t){var n=t.nextSibling;return s&&y&&e.display.currentWheelTarget==t?t.style.display="none":t.parentNode.removeChild(t),n}for(var c=r.view,u=r.viewFrom,f=0;f<c.length;f++){var d=c[f];if(d.hidden);else if(d.node&&d.node.parentNode==o){for(;a!=d.node;)a=l(a);var h=i&&null!=t&&t<=u&&d.lineNumber;d.changes&&(H(d.changes,"gutter")>-1&&(h=!1),un(e,d,u,n)),h&&(M(d.lineNumber),d.lineNumber.appendChild(document.createTextNode(Je(e.options,u)))),a=d.node.nextSibling}else{var p=vn(e,d,u,n);o.insertBefore(p,a)}u+=d.size}for(;a;)a=l(a)}(e,n.updateLineNumbers,t.dims),c>4&&(n.lineDiv.style.display=""),n.renderedView=n.view,function(e){if(e&&e.activeElt&&e.activeElt!=z()&&(e.activeElt.focus(),!/^(INPUT|TEXTAREA)$/.test(e.activeElt.nodeName)&&e.anchorNode&&E(document.body,e.anchorNode)&&E(document.body,e.focusNode))){var t=window.getSelection(),n=document.createRange();n.setEnd(e.anchorNode,e.anchorOffset),n.collapse(!1),t.removeAllRanges(),t.addRange(n),t.extend(e.focusNode,e.focusOffset)}}(u),M(n.cursorDiv),M(n.selectionDiv),n.gutters.style.height=n.sizer.style.minHeight=0,l&&(n.lastWrapHeight=t.wrapperHeight,n.lastWrapWidth=t.wrapperWidth,ri(e,400)),n.updateLineNumbers=null,!0}function li(e,t){for(var n=t.viewport,r=!0;;r=!1){if(r&&e.options.lineWrapping&&t.oldDisplayWidth!=Mn(e))r&&(t.visible=Or(e.display,e.doc,n));else if(n&&null!=n.top&&(n={top:Math.min(e.doc.height+Sn(e.display)-On(e),n.top)}),t.visible=Or(e.display,e.doc,n),t.visible.from>=e.display.viewFrom&&t.visible.to<=e.display.viewTo)break;if(!ai(e,t))break;Lr(e);var i=Wr(e);gr(e),Br(e,i),ui(e,i),t.force=!1}t.signal(e,"update",e),e.display.viewFrom==e.display.reportedViewFrom&&e.display.viewTo==e.display.reportedViewTo||(t.signal(e,"viewportChange",e,e.display.viewFrom,e.display.viewTo),e.display.reportedViewFrom=e.display.viewFrom,e.display.reportedViewTo=e.display.viewTo)}function si(e,t){var n=new oi(e,t);if(ai(e,n)){Lr(e),li(e,n);var r=Wr(e);gr(e),Br(e,r),ui(e,r),n.finish()}}function ci(e){var t=e.gutters.offsetWidth;e.sizer.style.marginLeft=t+"px"}function ui(e,t){e.display.sizer.style.minHeight=t.docHeight+"px",e.display.heightForcer.style.top=t.docHeight+"px",e.display.gutters.style.height=t.docHeight+e.display.barHeight+Ln(e)+"px"}function fi(e){var t=e.display,n=t.view;if(t.alignWidgets||t.gutters.firstChild&&e.options.fixedGutter){for(var r=ar(t)-t.scroller.scrollLeft+e.doc.scrollLeft,i=t.gutters.offsetWidth,o=r+"px",a=0;a<n.length;a++)if(!n[a].hidden){e.options.fixedGutter&&(n[a].gutter&&(n[a].gutter.style.left=o),n[a].gutterBackground&&(n[a].gutterBackground.style.left=o));var l=n[a].alignable;if(l)for(var s=0;s<l.length;s++)l[s].style.left=o}e.options.fixedGutter&&(t.gutters.style.left=r+i+"px")}}function di(e){if(!e.options.lineNumbers)return!1;var t=e.doc,n=Je(e.options,t.first+t.size-1),r=e.display;if(n.length!=r.lineNumChars){var i=r.measure.appendChild(N("div",[N("div",n)],"CodeMirror-linenumber CodeMirror-gutter-elt")),o=i.firstChild.offsetWidth,a=i.offsetWidth-o;return r.lineGutter.style.width="",r.lineNumInnerWidth=Math.max(o,r.lineGutter.offsetWidth-a)+1,r.lineNumWidth=r.lineNumInnerWidth+a,r.lineNumChars=r.lineNumInnerWidth?n.length:-1,r.lineGutter.style.width=r.lineNumWidth+"px",ci(e.display),!0}return!1}function hi(e,t){for(var n=[],r=!1,i=0;i<e.length;i++){var o=e[i],a=null;if("string"!=typeof o&&(a=o.style,o=o.className),"CodeMirror-linenumbers"==o){if(!t)continue;r=!0}n.push({className:o,style:a})}return t&&!r&&n.push({className:"CodeMirror-linenumbers",style:null}),n}function pi(e){var t=e.gutters,n=e.gutterSpecs;M(t),e.lineGutter=null;for(var r=0;r<n.length;++r){var i=n[r],o=i.className,a=i.style,l=t.appendChild(N("div",null,"CodeMirror-gutter "+o));a&&(l.style.cssText=a),"CodeMirror-linenumbers"==o&&(e.lineGutter=l,l.style.width=(e.lineNumWidth||1)+"px")}t.style.display=n.length?"":"none",ci(e)}function mi(e){pi(e.display),fr(e),fi(e)}function gi(e,t,r,i){var o=this;this.input=r,o.scrollbarFiller=N("div",null,"CodeMirror-scrollbar-filler"),o.scrollbarFiller.setAttribute("cm-not-content","true"),o.gutterFiller=N("div",null,"CodeMirror-gutter-filler"),o.gutterFiller.setAttribute("cm-not-content","true"),o.lineDiv=A("div",null,"CodeMirror-code"),o.selectionDiv=N("div",null,null,"position: relative; z-index: 1"),o.cursorDiv=N("div",null,"CodeMirror-cursors"),o.measure=N("div",null,"CodeMirror-measure"),o.lineMeasure=N("div",null,"CodeMirror-measure"),o.lineSpace=A("div",[o.measure,o.lineMeasure,o.selectionDiv,o.cursorDiv,o.lineDiv],null,"position: relative; outline: none");var c=A("div",[o.lineSpace],"CodeMirror-lines");o.mover=N("div",[c],null,"position: relative"),o.sizer=N("div",[o.mover],"CodeMirror-sizer"),o.sizerWidth=null,o.heightForcer=N("div",null,null,"position: absolute; height: 50px; width: 1px;"),o.gutters=N("div",null,"CodeMirror-gutters"),o.lineGutter=null,o.scroller=N("div",[o.sizer,o.heightForcer,o.gutters],"CodeMirror-scroll"),o.scroller.setAttribute("tabIndex","-1"),o.wrapper=N("div",[o.scrollbarFiller,o.gutterFiller,o.scroller],"CodeMirror"),a&&l<8&&(o.gutters.style.zIndex=-1,o.scroller.style.paddingRight=0),s||n&&v||(o.scroller.draggable=!0),e&&(e.appendChild?e.appendChild(o.wrapper):e(o.wrapper)),o.viewFrom=o.viewTo=t.first,o.reportedViewFrom=o.reportedViewTo=t.first,o.view=[],o.renderedView=null,o.externalMeasured=null,o.viewOffset=0,o.lastWrapHeight=o.lastWrapWidth=0,o.updateLineNumbers=null,o.nativeBarWidth=o.barHeight=o.barWidth=0,o.scrollbarsClipped=!1,o.lineNumWidth=o.lineNumInnerWidth=o.lineNumChars=null,o.alignWidgets=!1,o.cachedCharWidth=o.cachedTextHeight=o.cachedPaddingH=null,o.maxLine=null,o.maxLineLength=0,o.maxLineChanged=!1,o.wheelDX=o.wheelDY=o.wheelStartX=o.wheelStartY=null,o.shift=!1,o.selForContextMenu=null,o.activeTouch=null,o.gutterSpecs=hi(i.gutters,i.lineNumbers),pi(o),r.init(o)}oi.prototype.signal=function(e,t){ve(e,t)&&this.events.push(arguments)},oi.prototype.finish=function(){for(var e=0;e<this.events.length;e++)pe.apply(null,this.events[e])};var vi=0,yi=null;function bi(e){var t=e.wheelDeltaX,n=e.wheelDeltaY;return null==t&&e.detail&&e.axis==e.HORIZONTAL_AXIS&&(t=e.detail),null==n&&e.detail&&e.axis==e.VERTICAL_AXIS?n=e.detail:null==n&&(n=e.wheelDelta),{x:t,y:n}}function xi(e){var t=bi(e);return t.x*=yi,t.y*=yi,t}function wi(e,t){var r=bi(t),i=r.x,o=r.y,a=e.display,l=a.scroller,c=l.scrollWidth>l.clientWidth,u=l.scrollHeight>l.clientHeight;if(i&&c||o&&u){if(o&&y&&s)e:for(var d=t.target,h=a.view;d!=l;d=d.parentNode)for(var p=0;p<h.length;p++)if(h[p].node==d){e.display.currentWheelTarget=d;break e}if(i&&!n&&!f&&null!=yi)return o&&u&&Ir(e,Math.max(0,l.scrollTop+o*yi)),Fr(e,Math.max(0,l.scrollLeft+i*yi)),(!o||o&&u)&&be(t),void(a.wheelStartX=null);if(o&&null!=yi){var m=o*yi,g=e.doc.scrollTop,v=g+a.wrapper.clientHeight;m<0?g=Math.max(0,g+m-50):v=Math.min(e.doc.height,v+m+50),si(e,{top:g,bottom:v})}vi<20&&(null==a.wheelStartX?(a.wheelStartX=l.scrollLeft,a.wheelStartY=l.scrollTop,a.wheelDX=i,a.wheelDY=o,setTimeout((function(){if(null!=a.wheelStartX){var e=l.scrollLeft-a.wheelStartX,t=l.scrollTop-a.wheelStartY,n=t&&a.wheelDY&&t/a.wheelDY||e&&a.wheelDX&&e/a.wheelDX;a.wheelStartX=a.wheelStartY=null,n&&(yi=(yi*vi+n)/(vi+1),++vi)}}),200)):(a.wheelDX+=i,a.wheelDY+=o))}}a?yi=-.53:n?yi=15:u?yi=-.7:d&&(yi=-1/3);var ki=function(e,t){this.ranges=e,this.primIndex=t};ki.prototype.primary=function(){return this.ranges[this.primIndex]},ki.prototype.equals=function(e){if(e==this)return!0;if(e.primIndex!=this.primIndex||e.ranges.length!=this.ranges.length)return!1;for(var t=0;t<this.ranges.length;t++){var n=this.ranges[t],r=e.ranges[t];if(!nt(n.anchor,r.anchor)||!nt(n.head,r.head))return!1}return!0},ki.prototype.deepCopy=function(){for(var e=[],t=0;t<this.ranges.length;t++)e[t]=new Ci(rt(this.ranges[t].anchor),rt(this.ranges[t].head));return new ki(e,this.primIndex)},ki.prototype.somethingSelected=function(){for(var e=0;e<this.ranges.length;e++)if(!this.ranges[e].empty())return!0;return!1},ki.prototype.contains=function(e,t){t||(t=e);for(var n=0;n<this.ranges.length;n++){var r=this.ranges[n];if(tt(t,r.from())>=0&&tt(e,r.to())<=0)return n}return-1};var Ci=function(e,t){this.anchor=e,this.head=t};function Si(e,t,n){var r=e&&e.options.selectionsMayTouch,i=t[n];t.sort((function(e,t){return tt(e.from(),t.from())})),n=H(t,i);for(var o=1;o<t.length;o++){var a=t[o],l=t[o-1],s=tt(l.to(),a.from());if(r&&!a.empty()?s>0:s>=0){var c=ot(l.from(),a.from()),u=it(l.to(),a.to()),f=l.empty()?a.from()==a.head:l.from()==l.head;o<=n&&--n,t.splice(--o,2,new Ci(f?u:c,f?c:u))}}return new ki(t,n)}function Ti(e,t){return new ki([new Ci(e,t||e)],0)}function Li(e){return e.text?et(e.from.line+e.text.length-1,G(e.text).length+(1==e.text.length?e.from.ch:0)):e.to}function Mi(e,t){if(tt(e,t.from)<0)return e;if(tt(e,t.to)<=0)return Li(t);var n=e.line+t.text.length-(t.to.line-t.from.line)-1,r=e.ch;return e.line==t.to.line&&(r+=Li(t).ch-t.to.ch),et(n,r)}function Oi(e,t){for(var n=[],r=0;r<e.sel.ranges.length;r++){var i=e.sel.ranges[r];n.push(new Ci(Mi(i.anchor,t),Mi(i.head,t)))}return Si(e.cm,n,e.sel.primIndex)}function Ni(e,t,n){return e.line==t.line?et(n.line,e.ch-t.ch+n.ch):et(n.line+(e.line-t.line),e.ch)}function Ai(e){e.doc.mode=Re(e.options,e.doc.modeOption),Ei(e)}function Ei(e){e.doc.iter((function(e){e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null)})),e.doc.modeFrontier=e.doc.highlightFrontier=e.doc.first,ri(e,100),e.state.modeGen++,e.curOp&&fr(e)}function zi(e,t){return 0==t.from.ch&&0==t.to.ch&&""==G(t.text)&&(!e.cm||e.cm.options.wholeLineUpdateBefore)}function Pi(e,t,n,r){function i(e){return n?n[e]:null}function o(e,n,i){!function(e,t,n,r){e.text=t,e.stateAfter&&(e.stateAfter=null),e.styles&&(e.styles=null),null!=e.order&&(e.order=null),Ot(e),Nt(e,n);var i=r?r(e):1;i!=e.height&&Xe(e,i)}(e,n,i,r),sn(e,"change",e,t)}function a(e,t){for(var n=[],o=e;o<t;++o)n.push(new Kt(c[o],i(o),r));return n}var l=t.from,s=t.to,c=t.text,u=Ke(e,l.line),f=Ke(e,s.line),d=G(c),h=i(c.length-1),p=s.line-l.line;if(t.full)e.insert(0,a(0,c.length)),e.remove(c.length,e.size-c.length);else if(zi(e,t)){var m=a(0,c.length-1);o(f,f.text,h),p&&e.remove(l.line,p),m.length&&e.insert(l.line,m)}else if(u==f)if(1==c.length)o(u,u.text.slice(0,l.ch)+d+u.text.slice(s.ch),h);else{var g=a(1,c.length-1);g.push(new Kt(d+u.text.slice(s.ch),h,r)),o(u,u.text.slice(0,l.ch)+c[0],i(0)),e.insert(l.line+1,g)}else if(1==c.length)o(u,u.text.slice(0,l.ch)+c[0]+f.text.slice(s.ch),i(0)),e.remove(l.line+1,p);else{o(u,u.text.slice(0,l.ch)+c[0],i(0)),o(f,d+f.text.slice(s.ch),h);var v=a(1,c.length-1);p>1&&e.remove(l.line+1,p-1),e.insert(l.line+1,v)}sn(e,"change",e,t)}function Di(e,t,n){!function e(r,i,o){if(r.linked)for(var a=0;a<r.linked.length;++a){var l=r.linked[a];if(l.doc!=i){var s=o&&l.sharedHist;n&&!s||(t(l.doc,s),e(l.doc,r,s))}}}(e,null,!0)}function Ii(e,t){if(t.cm)throw new Error("This document is already in use.");e.doc=t,t.cm=e,sr(e),Ai(e),_i(e),e.options.lineWrapping||Vt(e),e.options.mode=t.modeOption,fr(e)}function _i(e){("rtl"==e.doc.direction?P:L)(e.display.lineDiv,"CodeMirror-rtl")}function Fi(e){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=e||1}function Wi(e,t){var n={from:rt(t.from),to:Li(t),text:$e(e,t.from,t.to)};return qi(e,n,t.from.line,t.to.line+1),Di(e,(function(e){return qi(e,n,t.from.line,t.to.line+1)}),!0),n}function Ri(e){for(;e.length&&G(e).ranges;)e.pop()}function Hi(e,t,n,r){var i=e.history;i.undone.length=0;var o,a,l=+new Date;if((i.lastOp==r||i.lastOrigin==t.origin&&t.origin&&("+"==t.origin.charAt(0)&&i.lastModTime>l-(e.cm?e.cm.options.historyEventDelay:500)||"*"==t.origin.charAt(0)))&&(o=function(e,t){return t?(Ri(e.done),G(e.done)):e.done.length&&!G(e.done).ranges?G(e.done):e.done.length>1&&!e.done[e.done.length-2].ranges?(e.done.pop(),G(e.done)):void 0}(i,i.lastOp==r)))a=G(o.changes),0==tt(t.from,t.to)&&0==tt(t.from,a.to)?a.to=Li(t):o.changes.push(Wi(e,t));else{var s=G(i.done);for(s&&s.ranges||ji(e.sel,i.done),o={changes:[Wi(e,t)],generation:i.generation},i.done.push(o);i.done.length>i.undoDepth;)i.done.shift(),i.done[0].ranges||i.done.shift()}i.done.push(n),i.generation=++i.maxGeneration,i.lastModTime=i.lastSelTime=l,i.lastOp=i.lastSelOp=r,i.lastOrigin=i.lastSelOrigin=t.origin,a||pe(e,"historyAdded")}function Bi(e,t,n,r){var i=e.history,o=r&&r.origin;n==i.lastSelOp||o&&i.lastSelOrigin==o&&(i.lastModTime==i.lastSelTime&&i.lastOrigin==o||function(e,t,n,r){var i=t.charAt(0);return"*"==i||"+"==i&&n.ranges.length==r.ranges.length&&n.somethingSelected()==r.somethingSelected()&&new Date-e.history.lastSelTime<=(e.cm?e.cm.options.historyEventDelay:500)}(e,o,G(i.done),t))?i.done[i.done.length-1]=t:ji(t,i.done),i.lastSelTime=+new Date,i.lastSelOrigin=o,i.lastSelOp=n,r&&!1!==r.clearRedo&&Ri(i.undone)}function ji(e,t){var n=G(t);n&&n.ranges&&n.equals(e)||t.push(e)}function qi(e,t,n,r){var i=t["spans_"+e.id],o=0;e.iter(Math.max(e.first,n),Math.min(e.first+e.size,r),(function(n){n.markedSpans&&((i||(i=t["spans_"+e.id]={}))[o]=n.markedSpans),++o}))}function Ui(e){if(!e)return null;for(var t,n=0;n<e.length;++n)e[n].marker.explicitlyCleared?t||(t=e.slice(0,n)):t&&t.push(e[n]);return t?t.length?t:null:e}function Vi(e,t){var n=function(e,t){var n=t["spans_"+e.id];if(!n)return null;for(var r=[],i=0;i<t.text.length;++i)r.push(Ui(n[i]));return r}(e,t),r=Lt(e,t);if(!n)return r;if(!r)return n;for(var i=0;i<n.length;++i){var o=n[i],a=r[i];if(o&&a)e:for(var l=0;l<a.length;++l){for(var s=a[l],c=0;c<o.length;++c)if(o[c].marker==s.marker)continue e;o.push(s)}else a&&(n[i]=a)}return n}function Ki(e,t,n){for(var r=[],i=0;i<e.length;++i){var o=e[i];if(o.ranges)r.push(n?ki.prototype.deepCopy.call(o):o);else{var a=o.changes,l=[];r.push({changes:l});for(var s=0;s<a.length;++s){var c=a[s],u=void 0;if(l.push({from:c.from,to:c.to,text:c.text}),t)for(var f in c)(u=f.match(/^spans_(\d+)$/))&&H(t,Number(u[1]))>-1&&(G(l)[f]=c[f],delete c[f])}}}return r}function $i(e,t,n,r){if(r){var i=e.anchor;if(n){var o=tt(t,i)<0;o!=tt(n,i)<0?(i=t,t=n):o!=tt(t,n)<0&&(t=n)}return new Ci(i,t)}return new Ci(n||t,t)}function Gi(e,t,n,r,i){null==i&&(i=e.cm&&(e.cm.display.shift||e.extend)),Ji(e,new ki([$i(e.sel.primary(),t,n,i)],0),r)}function Xi(e,t,n){for(var r=[],i=e.cm&&(e.cm.display.shift||e.extend),o=0;o<e.sel.ranges.length;o++)r[o]=$i(e.sel.ranges[o],t[o],null,i);Ji(e,Si(e.cm,r,e.sel.primIndex),n)}function Yi(e,t,n,r){var i=e.sel.ranges.slice(0);i[t]=n,Ji(e,Si(e.cm,i,e.sel.primIndex),r)}function Zi(e,t,n,r){Ji(e,Ti(t,n),r)}function Qi(e,t,n){var r=e.history.done,i=G(r);i&&i.ranges?(r[r.length-1]=t,eo(e,t,n)):Ji(e,t,n)}function Ji(e,t,n){eo(e,t,n),Bi(e,e.sel,e.cm?e.cm.curOp.id:NaN,n)}function eo(e,t,n){(ve(e,"beforeSelectionChange")||e.cm&&ve(e.cm,"beforeSelectionChange"))&&(t=function(e,t,n){var r={ranges:t.ranges,update:function(t){this.ranges=[];for(var n=0;n<t.length;n++)this.ranges[n]=new Ci(lt(e,t[n].anchor),lt(e,t[n].head))},origin:n&&n.origin};return pe(e,"beforeSelectionChange",e,r),e.cm&&pe(e.cm,"beforeSelectionChange",e.cm,r),r.ranges!=t.ranges?Si(e.cm,r.ranges,r.ranges.length-1):t}(e,t,n));var r=n&&n.bias||(tt(t.primary().head,e.sel.primary().head)<0?-1:1);to(e,ro(e,t,r,!0)),n&&!1===n.scroll||!e.cm||Er(e.cm)}function to(e,t){t.equals(e.sel)||(e.sel=t,e.cm&&(e.cm.curOp.updateInput=1,e.cm.curOp.selectionChanged=!0,ge(e.cm)),sn(e,"cursorActivity",e))}function no(e){to(e,ro(e,e.sel,null,!1))}function ro(e,t,n,r){for(var i,o=0;o<t.ranges.length;o++){var a=t.ranges[o],l=t.ranges.length==e.sel.ranges.length&&e.sel.ranges[o],s=oo(e,a.anchor,l&&l.anchor,n,r),c=oo(e,a.head,l&&l.head,n,r);(i||s!=a.anchor||c!=a.head)&&(i||(i=t.ranges.slice(0,o)),i[o]=new Ci(s,c))}return i?Si(e.cm,i,t.primIndex):t}function io(e,t,n,r,i){var o=Ke(e,t.line);if(o.markedSpans)for(var a=0;a<o.markedSpans.length;++a){var l=o.markedSpans[a],s=l.marker,c="selectLeft"in s?!s.selectLeft:s.inclusiveLeft,u="selectRight"in s?!s.selectRight:s.inclusiveRight;if((null==l.from||(c?l.from<=t.ch:l.from<t.ch))&&(null==l.to||(u?l.to>=t.ch:l.to>t.ch))){if(i&&(pe(s,"beforeCursorEnter"),s.explicitlyCleared)){if(o.markedSpans){--a;continue}break}if(!s.atomic)continue;if(n){var f=s.find(r<0?1:-1),d=void 0;if((r<0?u:c)&&(f=ao(e,f,-r,f&&f.line==t.line?o:null)),f&&f.line==t.line&&(d=tt(f,n))&&(r<0?d<0:d>0))return io(e,f,t,r,i)}var h=s.find(r<0?-1:1);return(r<0?c:u)&&(h=ao(e,h,r,h.line==t.line?o:null)),h?io(e,h,t,r,i):null}}return t}function oo(e,t,n,r,i){var o=r||1,a=io(e,t,n,o,i)||!i&&io(e,t,n,o,!0)||io(e,t,n,-o,i)||!i&&io(e,t,n,-o,!0);return a||(e.cantEdit=!0,et(e.first,0))}function ao(e,t,n,r){return n<0&&0==t.ch?t.line>e.first?lt(e,et(t.line-1)):null:n>0&&t.ch==(r||Ke(e,t.line)).text.length?t.line<e.first+e.size-1?et(t.line+1,0):null:new et(t.line,t.ch+n)}function lo(e){e.setSelection(et(e.firstLine(),0),et(e.lastLine()),j)}function so(e,t,n){var r={canceled:!1,from:t.from,to:t.to,text:t.text,origin:t.origin,cancel:function(){return r.canceled=!0}};return n&&(r.update=function(t,n,i,o){t&&(r.from=lt(e,t)),n&&(r.to=lt(e,n)),i&&(r.text=i),void 0!==o&&(r.origin=o)}),pe(e,"beforeChange",e,r),e.cm&&pe(e.cm,"beforeChange",e.cm,r),r.canceled?(e.cm&&(e.cm.curOp.updateInput=2),null):{from:r.from,to:r.to,text:r.text,origin:r.origin}}function co(e,t,n){if(e.cm){if(!e.cm.curOp)return ei(e.cm,co)(e,t,n);if(e.cm.state.suppressEdits)return}if(!(ve(e,"beforeChange")||e.cm&&ve(e.cm,"beforeChange"))||(t=so(e,t,!0))){var r=wt&&!n&&function(e,t,n){var r=null;if(e.iter(t.line,n.line+1,(function(e){if(e.markedSpans)for(var t=0;t<e.markedSpans.length;++t){var n=e.markedSpans[t].marker;!n.readOnly||r&&-1!=H(r,n)||(r||(r=[])).push(n)}})),!r)return null;for(var i=[{from:t,to:n}],o=0;o<r.length;++o)for(var a=r[o],l=a.find(0),s=0;s<i.length;++s){var c=i[s];if(!(tt(c.to,l.from)<0||tt(c.from,l.to)>0)){var u=[s,1],f=tt(c.from,l.from),d=tt(c.to,l.to);(f<0||!a.inclusiveLeft&&!f)&&u.push({from:c.from,to:l.from}),(d>0||!a.inclusiveRight&&!d)&&u.push({from:l.to,to:c.to}),i.splice.apply(i,u),s+=u.length-3}}return i}(e,t.from,t.to);if(r)for(var i=r.length-1;i>=0;--i)uo(e,{from:r[i].from,to:r[i].to,text:i?[""]:t.text,origin:t.origin});else uo(e,t)}}function uo(e,t){if(1!=t.text.length||""!=t.text[0]||0!=tt(t.from,t.to)){var n=Oi(e,t);Hi(e,t,n,e.cm?e.cm.curOp.id:NaN),po(e,t,n,Lt(e,t));var r=[];Di(e,(function(e,n){n||-1!=H(r,e.history)||(yo(e.history,t),r.push(e.history)),po(e,t,null,Lt(e,t))}))}}function fo(e,t,n){var r=e.cm&&e.cm.state.suppressEdits;if(!r||n){for(var i,o=e.history,a=e.sel,l="undo"==t?o.done:o.undone,s="undo"==t?o.undone:o.done,c=0;c<l.length&&(i=l[c],n?!i.ranges||i.equals(e.sel):i.ranges);c++);if(c!=l.length){for(o.lastOrigin=o.lastSelOrigin=null;;){if(!(i=l.pop()).ranges){if(r)return void l.push(i);break}if(ji(i,s),n&&!i.equals(e.sel))return void Ji(e,i,{clearRedo:!1});a=i}var u=[];ji(a,s),s.push({changes:u,generation:o.generation}),o.generation=i.generation||++o.maxGeneration;for(var f=ve(e,"beforeChange")||e.cm&&ve(e.cm,"beforeChange"),d=function(n){var r=i.changes[n];if(r.origin=t,f&&!so(e,r,!1))return l.length=0,{};u.push(Wi(e,r));var o=n?Oi(e,r):G(l);po(e,r,o,Vi(e,r)),!n&&e.cm&&e.cm.scrollIntoView({from:r.from,to:Li(r)});var a=[];Di(e,(function(e,t){t||-1!=H(a,e.history)||(yo(e.history,r),a.push(e.history)),po(e,r,null,Vi(e,r))}))},h=i.changes.length-1;h>=0;--h){var p=d(h);if(p)return p.v}}}}function ho(e,t){if(0!=t&&(e.first+=t,e.sel=new ki(X(e.sel.ranges,(function(e){return new Ci(et(e.anchor.line+t,e.anchor.ch),et(e.head.line+t,e.head.ch))})),e.sel.primIndex),e.cm)){fr(e.cm,e.first,e.first-t,t);for(var n=e.cm.display,r=n.viewFrom;r<n.viewTo;r++)dr(e.cm,r,"gutter")}}function po(e,t,n,r){if(e.cm&&!e.cm.curOp)return ei(e.cm,po)(e,t,n,r);if(t.to.line<e.first)ho(e,t.text.length-1-(t.to.line-t.from.line));else if(!(t.from.line>e.lastLine())){if(t.from.line<e.first){var i=t.text.length-1-(e.first-t.from.line);ho(e,i),t={from:et(e.first,0),to:et(t.to.line+i,t.to.ch),text:[G(t.text)],origin:t.origin}}var o=e.lastLine();t.to.line>o&&(t={from:t.from,to:et(o,Ke(e,o).text.length),text:[t.text[0]],origin:t.origin}),t.removed=$e(e,t.from,t.to),n||(n=Oi(e,t)),e.cm?function(e,t,n){var r=e.doc,i=e.display,o=t.from,a=t.to,l=!1,s=o.line;e.options.lineWrapping||(s=Ye(Wt(Ke(r,o.line))),r.iter(s,a.line+1,(function(e){if(e==i.maxLine)return l=!0,!0}))),r.sel.contains(t.from,t.to)>-1&&ge(e),Pi(r,t,n,lr(e)),e.options.lineWrapping||(r.iter(s,o.line+t.text.length,(function(e){var t=Ut(e);t>i.maxLineLength&&(i.maxLine=e,i.maxLineLength=t,i.maxLineChanged=!0,l=!1)})),l&&(e.curOp.updateMaxLine=!0)),function(e,t){if(e.modeFrontier=Math.min(e.modeFrontier,t),!(e.highlightFrontier<t-10)){for(var n=e.first,r=t-1;r>n;r--){var i=Ke(e,r).stateAfter;if(i&&(!(i instanceof ct)||r+i.lookAhead<t)){n=r+1;break}}e.highlightFrontier=Math.min(e.highlightFrontier,n)}}(r,o.line),ri(e,400);var c=t.text.length-(a.line-o.line)-1;t.full?fr(e):o.line!=a.line||1!=t.text.length||zi(e.doc,t)?fr(e,o.line,a.line+1,c):dr(e,o.line,"text");var u=ve(e,"changes"),f=ve(e,"change");if(f||u){var d={from:o,to:a,text:t.text,removed:t.removed,origin:t.origin};f&&sn(e,"change",e,d),u&&(e.curOp.changeObjs||(e.curOp.changeObjs=[])).push(d)}e.display.selForContextMenu=null}(e.cm,t,r):Pi(e,t,r),eo(e,n,j),e.cantEdit&&oo(e,et(e.firstLine(),0))&&(e.cantEdit=!1)}}function mo(e,t,n,r,i){var o;r||(r=n),tt(r,n)<0&&(n=(o=[r,n])[0],r=o[1]),"string"==typeof t&&(t=e.splitLines(t)),co(e,{from:n,to:r,text:t,origin:i})}function go(e,t,n,r){n<e.line?e.line+=r:t<e.line&&(e.line=t,e.ch=0)}function vo(e,t,n,r){for(var i=0;i<e.length;++i){var o=e[i],a=!0;if(o.ranges){o.copied||((o=e[i]=o.deepCopy()).copied=!0);for(var l=0;l<o.ranges.length;l++)go(o.ranges[l].anchor,t,n,r),go(o.ranges[l].head,t,n,r)}else{for(var s=0;s<o.changes.length;++s){var c=o.changes[s];if(n<c.from.line)c.from=et(c.from.line+r,c.from.ch),c.to=et(c.to.line+r,c.to.ch);else if(t<=c.to.line){a=!1;break}}a||(e.splice(0,i+1),i=0)}}}function yo(e,t){var n=t.from.line,r=t.to.line,i=t.text.length-(r-n)-1;vo(e.done,n,r,i),vo(e.undone,n,r,i)}function bo(e,t,n,r){var i=t,o=t;return"number"==typeof t?o=Ke(e,at(e,t)):i=Ye(t),null==i?null:(r(o,i)&&e.cm&&dr(e.cm,i,n),o)}function xo(e){this.lines=e,this.parent=null;for(var t=0,n=0;n<e.length;++n)e[n].parent=this,t+=e[n].height;this.height=t}function wo(e){this.children=e;for(var t=0,n=0,r=0;r<e.length;++r){var i=e[r];t+=i.chunkSize(),n+=i.height,i.parent=this}this.size=t,this.height=n,this.parent=null}Ci.prototype.from=function(){return ot(this.anchor,this.head)},Ci.prototype.to=function(){return it(this.anchor,this.head)},Ci.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch},xo.prototype={chunkSize:function(){return this.lines.length},removeInner:function(e,t){for(var n=e,r=e+t;n<r;++n){var i=this.lines[n];this.height-=i.height,$t(i),sn(i,"delete")}this.lines.splice(e,t)},collapse:function(e){e.push.apply(e,this.lines)},insertInner:function(e,t,n){this.height+=n,this.lines=this.lines.slice(0,e).concat(t).concat(this.lines.slice(e));for(var r=0;r<t.length;++r)t[r].parent=this},iterN:function(e,t,n){for(var r=e+t;e<r;++e)if(n(this.lines[e]))return!0}},wo.prototype={chunkSize:function(){return this.size},removeInner:function(e,t){this.size-=t;for(var n=0;n<this.children.length;++n){var r=this.children[n],i=r.chunkSize();if(e<i){var o=Math.min(t,i-e),a=r.height;if(r.removeInner(e,o),this.height-=a-r.height,i==o&&(this.children.splice(n--,1),r.parent=null),0==(t-=o))break;e=0}else e-=i}if(this.size-t<25&&(this.children.length>1||!(this.children[0]instanceof xo))){var l=[];this.collapse(l),this.children=[new xo(l)],this.children[0].parent=this}},collapse:function(e){for(var t=0;t<this.children.length;++t)this.children[t].collapse(e)},insertInner:function(e,t,n){this.size+=t.length,this.height+=n;for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<=o){if(i.insertInner(e,t,n),i.lines&&i.lines.length>50){for(var a=i.lines.length%25+25,l=a;l<i.lines.length;){var s=new xo(i.lines.slice(l,l+=25));i.height-=s.height,this.children.splice(++r,0,s),s.parent=this}i.lines=i.lines.slice(0,a),this.maybeSpill()}break}e-=o}},maybeSpill:function(){if(!(this.children.length<=10)){var e=this;do{var t=new wo(e.children.splice(e.children.length-5,5));if(e.parent){e.size-=t.size,e.height-=t.height;var n=H(e.parent.children,e);e.parent.children.splice(n+1,0,t)}else{var r=new wo(e.children);r.parent=e,e.children=[r,t],e=r}t.parent=e.parent}while(e.children.length>10);e.parent.maybeSpill()}},iterN:function(e,t,n){for(var r=0;r<this.children.length;++r){var i=this.children[r],o=i.chunkSize();if(e<o){var a=Math.min(t,o-e);if(i.iterN(e,a,n))return!0;if(0==(t-=a))break;e=0}else e-=o}}};var ko=function(e,t,n){if(n)for(var r in n)n.hasOwnProperty(r)&&(this[r]=n[r]);this.doc=e,this.node=t};function Co(e,t,n){qt(t)<(e.curOp&&e.curOp.scrollTop||e.doc.scrollTop)&&Ar(e,n)}ko.prototype.clear=function(){var e=this.doc.cm,t=this.line.widgets,n=this.line,r=Ye(n);if(null!=r&&t){for(var i=0;i<t.length;++i)t[i]==this&&t.splice(i--,1);t.length||(n.widgets=null);var o=wn(this);Xe(n,Math.max(0,n.height-o)),e&&(Jr(e,(function(){Co(e,n,-o),dr(e,r,"widget")})),sn(e,"lineWidgetCleared",e,this,r))}},ko.prototype.changed=function(){var e=this,t=this.height,n=this.doc.cm,r=this.line;this.height=null;var i=wn(this)-t;i&&(Bt(this.doc,r)||Xe(r,r.height+i),n&&Jr(n,(function(){n.curOp.forceUpdate=!0,Co(n,r,i),sn(n,"lineWidgetChanged",n,e,Ye(r))})))},ye(ko);var So=0,To=function(e,t){this.lines=[],this.type=t,this.doc=e,this.id=++So};function Lo(e,t,n,r,i){if(r&&r.shared)return function(e,t,n,r,i){(r=F(r)).shared=!1;var o=[Lo(e,t,n,r,i)],a=o[0],l=r.widgetNode;return Di(e,(function(e){l&&(r.widgetNode=l.cloneNode(!0)),o.push(Lo(e,lt(e,t),lt(e,n),r,i));for(var s=0;s<e.linked.length;++s)if(e.linked[s].isParent)return;a=G(o)})),new Mo(o,a)}(e,t,n,r,i);if(e.cm&&!e.cm.curOp)return ei(e.cm,Lo)(e,t,n,r,i);var o=new To(e,i),a=tt(t,n);if(r&&F(r,o,!1),a>0||0==a&&!1!==o.clearWhenEmpty)return o;if(o.replacedWith&&(o.collapsed=!0,o.widgetNode=A("span",[o.replacedWith],"CodeMirror-widget"),r.handleMouseEvents||o.widgetNode.setAttribute("cm-ignore-events","true"),r.insertLeft&&(o.widgetNode.insertLeft=!0)),o.collapsed){if(Ft(e,t.line,t,n,o)||t.line!=n.line&&Ft(e,n.line,t,n,o))throw new Error("Inserting collapsed marker partially overlapping an existing one");kt=!0}o.addToHistory&&Hi(e,{from:t,to:n,origin:"markText"},e.sel,NaN);var l,s=t.line,c=e.cm;if(e.iter(s,n.line+1,(function(e){c&&o.collapsed&&!c.options.lineWrapping&&Wt(e)==c.display.maxLine&&(l=!0),o.collapsed&&s!=t.line&&Xe(e,0),function(e,t){e.markedSpans=e.markedSpans?e.markedSpans.concat([t]):[t],t.marker.attachLine(e)}(e,new Ct(o,s==t.line?t.ch:null,s==n.line?n.ch:null)),++s})),o.collapsed&&e.iter(t.line,n.line+1,(function(t){Bt(e,t)&&Xe(t,0)})),o.clearOnEnter&&fe(o,"beforeCursorEnter",(function(){return o.clear()})),o.readOnly&&(wt=!0,(e.history.done.length||e.history.undone.length)&&e.clearHistory()),o.collapsed&&(o.id=++So,o.atomic=!0),c){if(l&&(c.curOp.updateMaxLine=!0),o.collapsed)fr(c,t.line,n.line+1);else if(o.className||o.startStyle||o.endStyle||o.css||o.attributes||o.title)for(var u=t.line;u<=n.line;u++)dr(c,u,"text");o.atomic&&no(c.doc),sn(c,"markerAdded",c,o)}return o}To.prototype.clear=function(){if(!this.explicitlyCleared){var e=this.doc.cm,t=e&&!e.curOp;if(t&&Kr(e),ve(this,"clear")){var n=this.find();n&&sn(this,"clear",n.from,n.to)}for(var r=null,i=null,o=0;o<this.lines.length;++o){var a=this.lines[o],l=St(a.markedSpans,this);e&&!this.collapsed?dr(e,Ye(a),"text"):e&&(null!=l.to&&(i=Ye(a)),null!=l.from&&(r=Ye(a))),a.markedSpans=Tt(a.markedSpans,l),null==l.from&&this.collapsed&&!Bt(this.doc,a)&&e&&Xe(a,rr(e.display))}if(e&&this.collapsed&&!e.options.lineWrapping)for(var s=0;s<this.lines.length;++s){var c=Wt(this.lines[s]),u=Ut(c);u>e.display.maxLineLength&&(e.display.maxLine=c,e.display.maxLineLength=u,e.display.maxLineChanged=!0)}null!=r&&e&&this.collapsed&&fr(e,r,i+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,e&&no(e.doc)),e&&sn(e,"markerCleared",e,this,r,i),t&&$r(e),this.parent&&this.parent.clear()}},To.prototype.find=function(e,t){var n,r;null==e&&"bookmark"==this.type&&(e=1);for(var i=0;i<this.lines.length;++i){var o=this.lines[i],a=St(o.markedSpans,this);if(null!=a.from&&(n=et(t?o:Ye(o),a.from),-1==e))return n;if(null!=a.to&&(r=et(t?o:Ye(o),a.to),1==e))return r}return n&&{from:n,to:r}},To.prototype.changed=function(){var e=this,t=this.find(-1,!0),n=this,r=this.doc.cm;t&&r&&Jr(r,(function(){var i=t.line,o=Ye(t.line),a=En(r,o);if(a&&(Wn(a),r.curOp.selectionChanged=r.curOp.forceUpdate=!0),r.curOp.updateMaxLine=!0,!Bt(n.doc,i)&&null!=n.height){var l=n.height;n.height=null;var s=wn(n)-l;s&&Xe(i,i.height+s)}sn(r,"markerChanged",r,e)}))},To.prototype.attachLine=function(e){if(!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;t.maybeHiddenMarkers&&-1!=H(t.maybeHiddenMarkers,this)||(t.maybeUnhiddenMarkers||(t.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(e)},To.prototype.detachLine=function(e){if(this.lines.splice(H(this.lines,e),1),!this.lines.length&&this.doc.cm){var t=this.doc.cm.curOp;(t.maybeHiddenMarkers||(t.maybeHiddenMarkers=[])).push(this)}},ye(To);var Mo=function(e,t){this.markers=e,this.primary=t;for(var n=0;n<e.length;++n)e[n].parent=this};function Oo(e){return e.findMarks(et(e.first,0),e.clipPos(et(e.lastLine())),(function(e){return e.parent}))}function No(e){for(var t=function(t){var n=e[t],r=[n.primary.doc];Di(n.primary.doc,(function(e){return r.push(e)}));for(var i=0;i<n.markers.length;i++){var o=n.markers[i];-1==H(r,o.doc)&&(o.parent=null,n.markers.splice(i--,1))}},n=0;n<e.length;n++)t(n)}Mo.prototype.clear=function(){if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var e=0;e<this.markers.length;++e)this.markers[e].clear();sn(this,"clear")}},Mo.prototype.find=function(e,t){return this.primary.find(e,t)},ye(Mo);var Ao=0,Eo=function(e,t,n,r,i){if(!(this instanceof Eo))return new Eo(e,t,n,r,i);null==n&&(n=0),wo.call(this,[new xo([new Kt("",null)])]),this.first=n,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=n;var o=et(n,0);this.sel=Ti(o),this.history=new Fi(null),this.id=++Ao,this.modeOption=t,this.lineSep=r,this.direction="rtl"==i?"rtl":"ltr",this.extend=!1,"string"==typeof e&&(e=this.splitLines(e)),Pi(this,{from:o,to:o,text:e}),Ji(this,Ti(o),j)};Eo.prototype=Z(wo.prototype,{constructor:Eo,iter:function(e,t,n){n?this.iterN(e-this.first,t-e,n):this.iterN(this.first,this.first+this.size,e)},insert:function(e,t){for(var n=0,r=0;r<t.length;++r)n+=t[r].height;this.insertInner(e-this.first,t,n)},remove:function(e,t){this.removeInner(e-this.first,t)},getValue:function(e){var t=Ge(this,this.first,this.first+this.size);return!1===e?t:t.join(e||this.lineSeparator())},setValue:ni((function(e){var t=et(this.first,0),n=this.first+this.size-1;co(this,{from:t,to:et(n,Ke(this,n).text.length),text:this.splitLines(e),origin:"setValue",full:!0},!0),this.cm&&zr(this.cm,0,0),Ji(this,Ti(t),j)})),replaceRange:function(e,t,n,r){mo(this,e,t=lt(this,t),n=n?lt(this,n):t,r)},getRange:function(e,t,n){var r=$e(this,lt(this,e),lt(this,t));return!1===n?r:r.join(n||this.lineSeparator())},getLine:function(e){var t=this.getLineHandle(e);return t&&t.text},getLineHandle:function(e){if(Qe(this,e))return Ke(this,e)},getLineNumber:function(e){return Ye(e)},getLineHandleVisualStart:function(e){return"number"==typeof e&&(e=Ke(this,e)),Wt(e)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(e){return lt(this,e)},getCursor:function(e){var t=this.sel.primary();return null==e||"head"==e?t.head:"anchor"==e?t.anchor:"end"==e||"to"==e||!1===e?t.to():t.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:ni((function(e,t,n){Zi(this,lt(this,"number"==typeof e?et(e,t||0):e),null,n)})),setSelection:ni((function(e,t,n){Zi(this,lt(this,e),lt(this,t||e),n)})),extendSelection:ni((function(e,t,n){Gi(this,lt(this,e),t&&lt(this,t),n)})),extendSelections:ni((function(e,t){Xi(this,st(this,e),t)})),extendSelectionsBy:ni((function(e,t){Xi(this,st(this,X(this.sel.ranges,e)),t)})),setSelections:ni((function(e,t,n){if(e.length){for(var r=[],i=0;i<e.length;i++)r[i]=new Ci(lt(this,e[i].anchor),lt(this,e[i].head));null==t&&(t=Math.min(e.length-1,this.sel.primIndex)),Ji(this,Si(this.cm,r,t),n)}})),addSelection:ni((function(e,t,n){var r=this.sel.ranges.slice(0);r.push(new Ci(lt(this,e),lt(this,t||e))),Ji(this,Si(this.cm,r,r.length-1),n)})),getSelection:function(e){for(var t,n=this.sel.ranges,r=0;r<n.length;r++){var i=$e(this,n[r].from(),n[r].to());t=t?t.concat(i):i}return!1===e?t:t.join(e||this.lineSeparator())},getSelections:function(e){for(var t=[],n=this.sel.ranges,r=0;r<n.length;r++){var i=$e(this,n[r].from(),n[r].to());!1!==e&&(i=i.join(e||this.lineSeparator())),t[r]=i}return t},replaceSelection:function(e,t,n){for(var r=[],i=0;i<this.sel.ranges.length;i++)r[i]=e;this.replaceSelections(r,t,n||"+input")},replaceSelections:ni((function(e,t,n){for(var r=[],i=this.sel,o=0;o<i.ranges.length;o++){var a=i.ranges[o];r[o]={from:a.from(),to:a.to(),text:this.splitLines(e[o]),origin:n}}for(var l=t&&"end"!=t&&function(e,t,n){for(var r=[],i=et(e.first,0),o=i,a=0;a<t.length;a++){var l=t[a],s=Ni(l.from,i,o),c=Ni(Li(l),i,o);if(i=l.to,o=c,"around"==n){var u=e.sel.ranges[a],f=tt(u.head,u.anchor)<0;r[a]=new Ci(f?c:s,f?s:c)}else r[a]=new Ci(s,s)}return new ki(r,e.sel.primIndex)}(this,r,t),s=r.length-1;s>=0;s--)co(this,r[s]);l?Qi(this,l):this.cm&&Er(this.cm)})),undo:ni((function(){fo(this,"undo")})),redo:ni((function(){fo(this,"redo")})),undoSelection:ni((function(){fo(this,"undo",!0)})),redoSelection:ni((function(){fo(this,"redo",!0)})),setExtending:function(e){this.extend=e},getExtending:function(){return this.extend},historySize:function(){for(var e=this.history,t=0,n=0,r=0;r<e.done.length;r++)e.done[r].ranges||++t;for(var i=0;i<e.undone.length;i++)e.undone[i].ranges||++n;return{undo:t,redo:n}},clearHistory:function(){var e=this;this.history=new Fi(this.history.maxGeneration),Di(this,(function(t){return t.history=e.history}),!0)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(e){return e&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(e){return this.history.generation==(e||this.cleanGeneration)},getHistory:function(){return{done:Ki(this.history.done),undone:Ki(this.history.undone)}},setHistory:function(e){var t=this.history=new Fi(this.history.maxGeneration);t.done=Ki(e.done.slice(0),null,!0),t.undone=Ki(e.undone.slice(0),null,!0)},setGutterMarker:ni((function(e,t,n){return bo(this,e,"gutter",(function(e){var r=e.gutterMarkers||(e.gutterMarkers={});return r[t]=n,!n&&te(r)&&(e.gutterMarkers=null),!0}))})),clearGutter:ni((function(e){var t=this;this.iter((function(n){n.gutterMarkers&&n.gutterMarkers[e]&&bo(t,n,"gutter",(function(){return n.gutterMarkers[e]=null,te(n.gutterMarkers)&&(n.gutterMarkers=null),!0}))}))})),lineInfo:function(e){var t;if("number"==typeof e){if(!Qe(this,e))return null;if(t=e,!(e=Ke(this,e)))return null}else if(null==(t=Ye(e)))return null;return{line:t,handle:e,text:e.text,gutterMarkers:e.gutterMarkers,textClass:e.textClass,bgClass:e.bgClass,wrapClass:e.wrapClass,widgets:e.widgets}},addLineClass:ni((function(e,t,n){return bo(this,e,"gutter"==t?"gutter":"class",(function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass";if(e[r]){if(S(n).test(e[r]))return!1;e[r]+=" "+n}else e[r]=n;return!0}))})),removeLineClass:ni((function(e,t,n){return bo(this,e,"gutter"==t?"gutter":"class",(function(e){var r="text"==t?"textClass":"background"==t?"bgClass":"gutter"==t?"gutterClass":"wrapClass",i=e[r];if(!i)return!1;if(null==n)e[r]=null;else{var o=i.match(S(n));if(!o)return!1;var a=o.index+o[0].length;e[r]=i.slice(0,o.index)+(o.index&&a!=i.length?" ":"")+i.slice(a)||null}return!0}))})),addLineWidget:ni((function(e,t,n){return function(e,t,n,r){var i=new ko(e,n,r),o=e.cm;return o&&i.noHScroll&&(o.display.alignWidgets=!0),bo(e,t,"widget",(function(t){var n=t.widgets||(t.widgets=[]);if(null==i.insertAt?n.push(i):n.splice(Math.min(n.length-1,Math.max(0,i.insertAt)),0,i),i.line=t,o&&!Bt(e,t)){var r=qt(t)<e.scrollTop;Xe(t,t.height+wn(i)),r&&Ar(o,i.height),o.curOp.forceUpdate=!0}return!0})),o&&sn(o,"lineWidgetAdded",o,i,"number"==typeof t?t:Ye(t)),i}(this,e,t,n)})),removeLineWidget:function(e){e.clear()},markText:function(e,t,n){return Lo(this,lt(this,e),lt(this,t),n,n&&n.type||"range")},setBookmark:function(e,t){var n={replacedWith:t&&(null==t.nodeType?t.widget:t),insertLeft:t&&t.insertLeft,clearWhenEmpty:!1,shared:t&&t.shared,handleMouseEvents:t&&t.handleMouseEvents};return Lo(this,e=lt(this,e),e,n,"bookmark")},findMarksAt:function(e){var t=[],n=Ke(this,(e=lt(this,e)).line).markedSpans;if(n)for(var r=0;r<n.length;++r){var i=n[r];(null==i.from||i.from<=e.ch)&&(null==i.to||i.to>=e.ch)&&t.push(i.marker.parent||i.marker)}return t},findMarks:function(e,t,n){e=lt(this,e),t=lt(this,t);var r=[],i=e.line;return this.iter(e.line,t.line+1,(function(o){var a=o.markedSpans;if(a)for(var l=0;l<a.length;l++){var s=a[l];null!=s.to&&i==e.line&&e.ch>=s.to||null==s.from&&i!=e.line||null!=s.from&&i==t.line&&s.from>=t.ch||n&&!n(s.marker)||r.push(s.marker.parent||s.marker)}++i})),r},getAllMarks:function(){var e=[];return this.iter((function(t){var n=t.markedSpans;if(n)for(var r=0;r<n.length;++r)null!=n[r].from&&e.push(n[r].marker)})),e},posFromIndex:function(e){var t,n=this.first,r=this.lineSeparator().length;return this.iter((function(i){var o=i.text.length+r;if(o>e)return t=e,!0;e-=o,++n})),lt(this,et(n,t))},indexFromPos:function(e){var t=(e=lt(this,e)).ch;if(e.line<this.first||e.ch<0)return 0;var n=this.lineSeparator().length;return this.iter(this.first,e.line,(function(e){t+=e.text.length+n})),t},copy:function(e){var t=new Eo(Ge(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return t.scrollTop=this.scrollTop,t.scrollLeft=this.scrollLeft,t.sel=this.sel,t.extend=!1,e&&(t.history.undoDepth=this.history.undoDepth,t.setHistory(this.getHistory())),t},linkedDoc:function(e){e||(e={});var t=this.first,n=this.first+this.size;null!=e.from&&e.from>t&&(t=e.from),null!=e.to&&e.to<n&&(n=e.to);var r=new Eo(Ge(this,t,n),e.mode||this.modeOption,t,this.lineSep,this.direction);return e.sharedHist&&(r.history=this.history),(this.linked||(this.linked=[])).push({doc:r,sharedHist:e.sharedHist}),r.linked=[{doc:this,isParent:!0,sharedHist:e.sharedHist}],function(e,t){for(var n=0;n<t.length;n++){var r=t[n],i=r.find(),o=e.clipPos(i.from),a=e.clipPos(i.to);if(tt(o,a)){var l=Lo(e,o,a,r.primary,r.primary.type);r.markers.push(l),l.parent=r}}}(r,Oo(this)),r},unlinkDoc:function(e){if(e instanceof Ma&&(e=e.doc),this.linked)for(var t=0;t<this.linked.length;++t)if(this.linked[t].doc==e){this.linked.splice(t,1),e.unlinkDoc(this),No(Oo(this));break}if(e.history==this.history){var n=[e.id];Di(e,(function(e){return n.push(e.id)}),!0),e.history=new Fi(null),e.history.done=Ki(this.history.done,n),e.history.undone=Ki(this.history.undone,n)}},iterLinkedDocs:function(e){Di(this,e)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(e){return this.lineSep?e.split(this.lineSep):Ee(e)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:ni((function(e){var t;"rtl"!=e&&(e="ltr"),e!=this.direction&&(this.direction=e,this.iter((function(e){return e.order=null})),this.cm&&Jr(t=this.cm,(function(){_i(t),fr(t)})))}))}),Eo.prototype.eachLine=Eo.prototype.iter;var zo=0;function Po(e){var t=this;if(Do(t),!me(t,e)&&!kn(t.display,e)){be(e),a&&(zo=+new Date);var n=cr(t,e,!0),r=e.dataTransfer.files;if(n&&!t.isReadOnly())if(r&&r.length&&window.FileReader&&window.File)for(var i=r.length,o=Array(i),l=0,s=function(){++l==i&&ei(t,(function(){var e={from:n=lt(t.doc,n),to:n,text:t.doc.splitLines(o.filter((function(e){return null!=e})).join(t.doc.lineSeparator())),origin:"paste"};co(t.doc,e),Qi(t.doc,Ti(lt(t.doc,n),lt(t.doc,Li(e))))}))()},c=function(e,n){if(t.options.allowDropFileTypes&&-1==H(t.options.allowDropFileTypes,e.type))s();else{var r=new FileReader;r.onerror=function(){return s()},r.onload=function(){var e=r.result;/[\x00-\x08\x0e-\x1f]{2}/.test(e)||(o[n]=e),s()},r.readAsText(e)}},u=0;u<r.length;u++)c(r[u],u);else{if(t.state.draggingText&&t.doc.sel.contains(n)>-1)return t.state.draggingText(e),void setTimeout((function(){return t.display.input.focus()}),20);try{var f=e.dataTransfer.getData("Text");if(f){var d;if(t.state.draggingText&&!t.state.draggingText.copy&&(d=t.listSelections()),eo(t.doc,Ti(n,n)),d)for(var h=0;h<d.length;++h)mo(t.doc,"",d[h].anchor,d[h].head,"drag");t.replaceSelection(f,"around","paste"),t.display.input.focus()}}catch(e){}}}}function Do(e){e.display.dragCursor&&(e.display.lineSpace.removeChild(e.display.dragCursor),e.display.dragCursor=null)}function Io(e){if(document.getElementsByClassName){for(var t=document.getElementsByClassName("CodeMirror"),n=[],r=0;r<t.length;r++){var i=t[r].CodeMirror;i&&n.push(i)}n.length&&n[0].operation((function(){for(var t=0;t<n.length;t++)e(n[t])}))}}var _o=!1;function Fo(){var e;_o||(fe(window,"resize",(function(){null==e&&(e=setTimeout((function(){e=null,Io(Wo)}),100))})),fe(window,"blur",(function(){return Io(Tr)})),_o=!0)}function Wo(e){var t=e.display;t.cachedCharWidth=t.cachedTextHeight=t.cachedPaddingH=null,t.scrollbarsClipped=!1,e.setSize()}for(var Ro={3:"Pause",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",145:"ScrollLock",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",224:"Mod",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},Ho=0;Ho<10;Ho++)Ro[Ho+48]=Ro[Ho+96]=String(Ho);for(var Bo=65;Bo<=90;Bo++)Ro[Bo]=String.fromCharCode(Bo);for(var jo=1;jo<=12;jo++)Ro[jo+111]=Ro[jo+63235]="F"+jo;var qo={};function Uo(e){var t,n,r,i,o=e.split(/-(?!$)/);e=o[o.length-1];for(var a=0;a<o.length-1;a++){var l=o[a];if(/^(cmd|meta|m)$/i.test(l))i=!0;else if(/^a(lt)?$/i.test(l))t=!0;else if(/^(c|ctrl|control)$/i.test(l))n=!0;else{if(!/^s(hift)?$/i.test(l))throw new Error("Unrecognized modifier name: "+l);r=!0}}return t&&(e="Alt-"+e),n&&(e="Ctrl-"+e),i&&(e="Cmd-"+e),r&&(e="Shift-"+e),e}function Vo(e){var t={};for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];if(/^(name|fallthrough|(de|at)tach)$/.test(n))continue;if("..."==r){delete e[n];continue}for(var i=X(n.split(" "),Uo),o=0;o<i.length;o++){var a=void 0,l=void 0;o==i.length-1?(l=i.join(" "),a=r):(l=i.slice(0,o+1).join(" "),a="...");var s=t[l];if(s){if(s!=a)throw new Error("Inconsistent bindings for "+l)}else t[l]=a}delete e[n]}for(var c in t)e[c]=t[c];return e}function Ko(e,t,n,r){var i=(t=Yo(t)).call?t.call(e,r):t[e];if(!1===i)return"nothing";if("..."===i)return"multi";if(null!=i&&n(i))return"handled";if(t.fallthrough){if("[object Array]"!=Object.prototype.toString.call(t.fallthrough))return Ko(e,t.fallthrough,n,r);for(var o=0;o<t.fallthrough.length;o++){var a=Ko(e,t.fallthrough[o],n,r);if(a)return a}}}function $o(e){var t="string"==typeof e?e:Ro[e.keyCode];return"Ctrl"==t||"Alt"==t||"Shift"==t||"Mod"==t}function Go(e,t,n){var r=e;return t.altKey&&"Alt"!=r&&(e="Alt-"+e),(k?t.metaKey:t.ctrlKey)&&"Ctrl"!=r&&(e="Ctrl-"+e),(k?t.ctrlKey:t.metaKey)&&"Mod"!=r&&(e="Cmd-"+e),!n&&t.shiftKey&&"Shift"!=r&&(e="Shift-"+e),e}function Xo(e,t){if(f&&34==e.keyCode&&e.char)return!1;var n=Ro[e.keyCode];return null!=n&&!e.altGraphKey&&(3==e.keyCode&&e.code&&(n=e.code),Go(n,e,t))}function Yo(e){return"string"==typeof e?qo[e]:e}function Zo(e,t){for(var n=e.doc.sel.ranges,r=[],i=0;i<n.length;i++){for(var o=t(n[i]);r.length&&tt(o.from,G(r).to)<=0;){var a=r.pop();if(tt(a.from,o.from)<0){o.from=a.from;break}}r.push(o)}Jr(e,(function(){for(var t=r.length-1;t>=0;t--)mo(e.doc,"",r[t].from,r[t].to,"+delete");Er(e)}))}function Qo(e,t,n){var r=ie(e.text,t+n,n);return r<0||r>e.text.length?null:r}function Jo(e,t,n){var r=Qo(e,t.ch,n);return null==r?null:new et(t.line,r,n<0?"after":"before")}function ea(e,t,n,r,i){if(e){"rtl"==t.doc.direction&&(i=-i);var o=ce(n,t.doc.direction);if(o){var a,l=i<0?G(o):o[0],s=i<0==(1==l.level)?"after":"before";if(l.level>0||"rtl"==t.doc.direction){var c=zn(t,n);a=i<0?n.text.length-1:0;var u=Pn(t,c,a).top;a=oe((function(e){return Pn(t,c,e).top==u}),i<0==(1==l.level)?l.from:l.to-1,a),"before"==s&&(a=Qo(n,a,1))}else a=i<0?l.to:l.from;return new et(r,a,s)}}return new et(r,i<0?n.text.length:0,i<0?"before":"after")}qo.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},qo.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},qo.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},qo.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},qo.default=y?qo.macDefault:qo.pcDefault;var ta={selectAll:lo,singleSelection:function(e){return e.setSelection(e.getCursor("anchor"),e.getCursor("head"),j)},killLine:function(e){return Zo(e,(function(t){if(t.empty()){var n=Ke(e.doc,t.head.line).text.length;return t.head.ch==n&&t.head.line<e.lastLine()?{from:t.head,to:et(t.head.line+1,0)}:{from:t.head,to:et(t.head.line,n)}}return{from:t.from(),to:t.to()}}))},deleteLine:function(e){return Zo(e,(function(t){return{from:et(t.from().line,0),to:lt(e.doc,et(t.to().line+1,0))}}))},delLineLeft:function(e){return Zo(e,(function(e){return{from:et(e.from().line,0),to:e.from()}}))},delWrappedLineLeft:function(e){return Zo(e,(function(t){var n=e.charCoords(t.head,"div").top+5;return{from:e.coordsChar({left:0,top:n},"div"),to:t.from()}}))},delWrappedLineRight:function(e){return Zo(e,(function(t){var n=e.charCoords(t.head,"div").top+5,r=e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div");return{from:t.from(),to:r}}))},undo:function(e){return e.undo()},redo:function(e){return e.redo()},undoSelection:function(e){return e.undoSelection()},redoSelection:function(e){return e.redoSelection()},goDocStart:function(e){return e.extendSelection(et(e.firstLine(),0))},goDocEnd:function(e){return e.extendSelection(et(e.lastLine()))},goLineStart:function(e){return e.extendSelectionsBy((function(t){return na(e,t.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(e){return e.extendSelectionsBy((function(t){return ra(e,t.head)}),{origin:"+move",bias:1})},goLineEnd:function(e){return e.extendSelectionsBy((function(t){return function(e,t){var n=Ke(e.doc,t),r=function(e){for(var t;t=It(e);)e=t.find(1,!0).line;return e}(n);return r!=n&&(t=Ye(r)),ea(!0,e,n,t,-1)}(e,t.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:e.display.lineDiv.offsetWidth+100,top:n},"div")}),U)},goLineLeft:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5;return e.coordsChar({left:0,top:n},"div")}),U)},goLineLeftSmart:function(e){return e.extendSelectionsBy((function(t){var n=e.cursorCoords(t.head,"div").top+5,r=e.coordsChar({left:0,top:n},"div");return r.ch<e.getLine(r.line).search(/\S/)?ra(e,t.head):r}),U)},goLineUp:function(e){return e.moveV(-1,"line")},goLineDown:function(e){return e.moveV(1,"line")},goPageUp:function(e){return e.moveV(-1,"page")},goPageDown:function(e){return e.moveV(1,"page")},goCharLeft:function(e){return e.moveH(-1,"char")},goCharRight:function(e){return e.moveH(1,"char")},goColumnLeft:function(e){return e.moveH(-1,"column")},goColumnRight:function(e){return e.moveH(1,"column")},goWordLeft:function(e){return e.moveH(-1,"word")},goGroupRight:function(e){return e.moveH(1,"group")},goGroupLeft:function(e){return e.moveH(-1,"group")},goWordRight:function(e){return e.moveH(1,"word")},delCharBefore:function(e){return e.deleteH(-1,"codepoint")},delCharAfter:function(e){return e.deleteH(1,"char")},delWordBefore:function(e){return e.deleteH(-1,"word")},delWordAfter:function(e){return e.deleteH(1,"word")},delGroupBefore:function(e){return e.deleteH(-1,"group")},delGroupAfter:function(e){return e.deleteH(1,"group")},indentAuto:function(e){return e.indentSelection("smart")},indentMore:function(e){return e.indentSelection("add")},indentLess:function(e){return e.indentSelection("subtract")},insertTab:function(e){return e.replaceSelection("\t")},insertSoftTab:function(e){for(var t=[],n=e.listSelections(),r=e.options.tabSize,i=0;i<n.length;i++){var o=n[i].from(),a=W(e.getLine(o.line),o.ch,r);t.push($(r-a%r))}e.replaceSelections(t)},defaultTab:function(e){e.somethingSelected()?e.indentSelection("add"):e.execCommand("insertTab")},transposeChars:function(e){return Jr(e,(function(){for(var t=e.listSelections(),n=[],r=0;r<t.length;r++)if(t[r].empty()){var i=t[r].head,o=Ke(e.doc,i.line).text;if(o)if(i.ch==o.length&&(i=new et(i.line,i.ch-1)),i.ch>0)i=new et(i.line,i.ch+1),e.replaceRange(o.charAt(i.ch-1)+o.charAt(i.ch-2),et(i.line,i.ch-2),i,"+transpose");else if(i.line>e.doc.first){var a=Ke(e.doc,i.line-1).text;a&&(i=new et(i.line,1),e.replaceRange(o.charAt(0)+e.doc.lineSeparator()+a.charAt(a.length-1),et(i.line-1,a.length-1),i,"+transpose"))}n.push(new Ci(i,i))}e.setSelections(n)}))},newlineAndIndent:function(e){return Jr(e,(function(){for(var t=e.listSelections(),n=t.length-1;n>=0;n--)e.replaceRange(e.doc.lineSeparator(),t[n].anchor,t[n].head,"+input");t=e.listSelections();for(var r=0;r<t.length;r++)e.indentLine(t[r].from().line,null,!0);Er(e)}))},openLine:function(e){return e.replaceSelection("\n","start")},toggleOverwrite:function(e){return e.toggleOverwrite()}};function na(e,t){var n=Ke(e.doc,t),r=Wt(n);return r!=n&&(t=Ye(r)),ea(!0,e,r,t,1)}function ra(e,t){var n=na(e,t.line),r=Ke(e.doc,n.line),i=ce(r,e.doc.direction);if(!i||0==i[0].level){var o=Math.max(n.ch,r.text.search(/\S/)),a=t.line==n.line&&t.ch<=o&&t.ch;return et(n.line,a?0:o,n.sticky)}return n}function ia(e,t,n){if("string"==typeof t&&!(t=ta[t]))return!1;e.display.input.ensurePolled();var r=e.display.shift,i=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),n&&(e.display.shift=!1),i=t(e)!=B}finally{e.display.shift=r,e.state.suppressEdits=!1}return i}var oa=new R;function aa(e,t,n,r){var i=e.state.keySeq;if(i){if($o(t))return"handled";if(/\'$/.test(t)?e.state.keySeq=null:oa.set(50,(function(){e.state.keySeq==i&&(e.state.keySeq=null,e.display.input.reset())})),la(e,i+" "+t,n,r))return!0}return la(e,t,n,r)}function la(e,t,n,r){var i=function(e,t,n){for(var r=0;r<e.state.keyMaps.length;r++){var i=Ko(t,e.state.keyMaps[r],n,e);if(i)return i}return e.options.extraKeys&&Ko(t,e.options.extraKeys,n,e)||Ko(t,e.options.keyMap,n,e)}(e,t,r);return"multi"==i&&(e.state.keySeq=t),"handled"==i&&sn(e,"keyHandled",e,t,n),"handled"!=i&&"multi"!=i||(be(n),wr(e)),!!i}function sa(e,t){var n=Xo(t,!0);return!!n&&(t.shiftKey&&!e.state.keySeq?aa(e,"Shift-"+n,t,(function(t){return ia(e,t,!0)}))||aa(e,n,t,(function(t){if("string"==typeof t?/^go[A-Z]/.test(t):t.motion)return ia(e,t)})):aa(e,n,t,(function(t){return ia(e,t)})))}var ca=null;function ua(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField()||(t.curOp.focus=z(),me(t,e)))){a&&l<11&&27==e.keyCode&&(e.returnValue=!1);var r=e.keyCode;t.display.shift=16==r||e.shiftKey;var i=sa(t,e);f&&(ca=i?r:null,i||88!=r||Pe||!(y?e.metaKey:e.ctrlKey)||t.replaceSelection("",null,"cut")),n&&!y&&!i&&46==r&&e.shiftKey&&!e.ctrlKey&&document.execCommand&&document.execCommand("cut"),18!=r||/\bCodeMirror-crosshair\b/.test(t.display.lineDiv.className)||function(e){var t=e.display.lineDiv;function n(e){18!=e.keyCode&&e.altKey||(L(t,"CodeMirror-crosshair"),he(document,"keyup",n),he(document,"mouseover",n))}P(t,"CodeMirror-crosshair"),fe(document,"keyup",n),fe(document,"mouseover",n)}(t)}}function fa(e){16==e.keyCode&&(this.doc.sel.shift=!1),me(this,e)}function da(e){var t=this;if(!(e.target&&e.target!=t.display.input.getField()||kn(t.display,e)||me(t,e)||e.ctrlKey&&!e.altKey||y&&e.metaKey)){var n=e.keyCode,r=e.charCode;if(f&&n==ca)return ca=null,void be(e);if(!f||e.which&&!(e.which<10)||!sa(t,e)){var i=String.fromCharCode(null==r?n:r);"\b"!=i&&(function(e,t,n){return aa(e,"'"+n+"'",t,(function(t){return ia(e,t,!0)}))}(t,e,i)||t.display.input.onKeyPress(e))}}}var ha,pa,ma=function(e,t,n){this.time=e,this.pos=t,this.button=n};function ga(e){var t=this,n=t.display;if(!(me(t,e)||n.activeTouch&&n.input.supportsTouch()))if(n.input.ensurePolled(),n.shift=e.shiftKey,kn(n,e))s||(n.scroller.draggable=!1,setTimeout((function(){return n.scroller.draggable=!0}),100));else if(!ba(t,e)){var r=cr(t,e),i=Se(e),o=r?function(e,t){var n=+new Date;return pa&&pa.compare(n,e,t)?(ha=pa=null,"triple"):ha&&ha.compare(n,e,t)?(pa=new ma(n,e,t),ha=null,"double"):(ha=new ma(n,e,t),pa=null,"single")}(r,i):"single";window.focus(),1==i&&t.state.selectingText&&t.state.selectingText(e),r&&function(e,t,n,r,i){var o="Click";return"double"==r?o="Double"+o:"triple"==r&&(o="Triple"+o),aa(e,Go(o=(1==t?"Left":2==t?"Middle":"Right")+o,i),i,(function(t){if("string"==typeof t&&(t=ta[t]),!t)return!1;var r=!1;try{e.isReadOnly()&&(e.state.suppressEdits=!0),r=t(e,n)!=B}finally{e.state.suppressEdits=!1}return r}))}(t,i,r,o,e)||(1==i?r?function(e,t,n,r){a?setTimeout(_(kr,e),0):e.curOp.focus=z();var i,o=function(e,t,n){var r=e.getOption("configureMouse"),i=r?r(e,t,n):{};if(null==i.unit){var o=b?n.shiftKey&&n.metaKey:n.altKey;i.unit=o?"rectangle":"single"==t?"char":"double"==t?"word":"line"}return(null==i.extend||e.doc.extend)&&(i.extend=e.doc.extend||n.shiftKey),null==i.addNew&&(i.addNew=y?n.metaKey:n.ctrlKey),null==i.moveOnDrag&&(i.moveOnDrag=!(y?n.altKey:n.ctrlKey)),i}(e,n,r),c=e.doc.sel;e.options.dragDrop&&Me&&!e.isReadOnly()&&"single"==n&&(i=c.contains(t))>-1&&(tt((i=c.ranges[i]).from(),t)<0||t.xRel>0)&&(tt(i.to(),t)>0||t.xRel<0)?function(e,t,n,r){var i=e.display,o=!1,c=ei(e,(function(t){s&&(i.scroller.draggable=!1),e.state.draggingText=!1,he(i.wrapper.ownerDocument,"mouseup",c),he(i.wrapper.ownerDocument,"mousemove",u),he(i.scroller,"dragstart",f),he(i.scroller,"drop",c),o||(be(t),r.addNew||Gi(e.doc,n,null,null,r.extend),s&&!d||a&&9==l?setTimeout((function(){i.wrapper.ownerDocument.body.focus({preventScroll:!0}),i.input.focus()}),20):i.input.focus())})),u=function(e){o=o||Math.abs(t.clientX-e.clientX)+Math.abs(t.clientY-e.clientY)>=10},f=function(){return o=!0};s&&(i.scroller.draggable=!0),e.state.draggingText=c,c.copy=!r.moveOnDrag,i.scroller.dragDrop&&i.scroller.dragDrop(),fe(i.wrapper.ownerDocument,"mouseup",c),fe(i.wrapper.ownerDocument,"mousemove",u),fe(i.scroller,"dragstart",f),fe(i.scroller,"drop",c),Cr(e),setTimeout((function(){return i.input.focus()}),20)}(e,r,t,o):function(e,t,n,r){var i=e.display,o=e.doc;be(t);var a,l,s=o.sel,c=s.ranges;if(r.addNew&&!r.extend?(l=o.sel.contains(n),a=l>-1?c[l]:new Ci(n,n)):(a=o.sel.primary(),l=o.sel.primIndex),"rectangle"==r.unit)r.addNew||(a=new Ci(n,n)),n=cr(e,t,!0,!0),l=-1;else{var u=va(e,n,r.unit);a=r.extend?$i(a,u.anchor,u.head,r.extend):u}r.addNew?-1==l?(l=c.length,Ji(o,Si(e,c.concat([a]),l),{scroll:!1,origin:"*mouse"})):c.length>1&&c[l].empty()&&"char"==r.unit&&!r.extend?(Ji(o,Si(e,c.slice(0,l).concat(c.slice(l+1)),0),{scroll:!1,origin:"*mouse"}),s=o.sel):Yi(o,l,a,q):(l=0,Ji(o,new ki([a],0),q),s=o.sel);var f=n;function d(t){if(0!=tt(f,t))if(f=t,"rectangle"==r.unit){for(var i=[],c=e.options.tabSize,u=W(Ke(o,n.line).text,n.ch,c),d=W(Ke(o,t.line).text,t.ch,c),h=Math.min(u,d),p=Math.max(u,d),m=Math.min(n.line,t.line),g=Math.min(e.lastLine(),Math.max(n.line,t.line));m<=g;m++){var v=Ke(o,m).text,y=V(v,h,c);h==p?i.push(new Ci(et(m,y),et(m,y))):v.length>y&&i.push(new Ci(et(m,y),et(m,V(v,p,c))))}i.length||i.push(new Ci(n,n)),Ji(o,Si(e,s.ranges.slice(0,l).concat(i),l),{origin:"*mouse",scroll:!1}),e.scrollIntoView(t)}else{var b,x=a,w=va(e,t,r.unit),k=x.anchor;tt(w.anchor,k)>0?(b=w.head,k=ot(x.from(),w.anchor)):(b=w.anchor,k=it(x.to(),w.head));var C=s.ranges.slice(0);C[l]=function(e,t){var n=t.anchor,r=t.head,i=Ke(e.doc,n.line);if(0==tt(n,r)&&n.sticky==r.sticky)return t;var o=ce(i);if(!o)return t;var a=le(o,n.ch,n.sticky),l=o[a];if(l.from!=n.ch&&l.to!=n.ch)return t;var s,c=a+(l.from==n.ch==(1!=l.level)?0:1);if(0==c||c==o.length)return t;if(r.line!=n.line)s=(r.line-n.line)*("ltr"==e.doc.direction?1:-1)>0;else{var u=le(o,r.ch,r.sticky),f=u-a||(r.ch-n.ch)*(1==l.level?-1:1);s=u==c-1||u==c?f<0:f>0}var d=o[c+(s?-1:0)],h=s==(1==d.level),p=h?d.from:d.to,m=h?"after":"before";return n.ch==p&&n.sticky==m?t:new Ci(new et(n.line,p,m),r)}(e,new Ci(lt(o,k),b)),Ji(o,Si(e,C,l),q)}}var h=i.wrapper.getBoundingClientRect(),p=0;function m(t){e.state.selectingText=!1,p=1/0,t&&(be(t),i.input.focus()),he(i.wrapper.ownerDocument,"mousemove",g),he(i.wrapper.ownerDocument,"mouseup",v),o.history.lastSelOrigin=null}var g=ei(e,(function(t){0!==t.buttons&&Se(t)?function t(n){var a=++p,l=cr(e,n,!0,"rectangle"==r.unit);if(l)if(0!=tt(l,f)){e.curOp.focus=z(),d(l);var s=Or(i,o);(l.line>=s.to||l.line<s.from)&&setTimeout(ei(e,(function(){p==a&&t(n)})),150)}else{var c=n.clientY<h.top?-20:n.clientY>h.bottom?20:0;c&&setTimeout(ei(e,(function(){p==a&&(i.scroller.scrollTop+=c,t(n))})),50)}}(t):m(t)})),v=ei(e,m);e.state.selectingText=v,fe(i.wrapper.ownerDocument,"mousemove",g),fe(i.wrapper.ownerDocument,"mouseup",v)}(e,r,t,o)}(t,r,o,e):Ce(e)==n.scroller&&be(e):2==i?(r&&Gi(t.doc,r),setTimeout((function(){return n.input.focus()}),20)):3==i&&(C?t.display.input.onContextMenu(e):Cr(t)))}}function va(e,t,n){if("char"==n)return new Ci(t,t);if("word"==n)return e.findWordAt(t);if("line"==n)return new Ci(et(t.line,0),lt(e.doc,et(t.line+1,0)));var r=n(e,t);return new Ci(r.from,r.to)}function ya(e,t,n,r){var i,o;if(t.touches)i=t.touches[0].clientX,o=t.touches[0].clientY;else try{i=t.clientX,o=t.clientY}catch(e){return!1}if(i>=Math.floor(e.display.gutters.getBoundingClientRect().right))return!1;r&&be(t);var a=e.display,l=a.lineDiv.getBoundingClientRect();if(o>l.bottom||!ve(e,n))return we(t);o-=l.top-a.viewOffset;for(var s=0;s<e.display.gutterSpecs.length;++s){var c=a.gutters.childNodes[s];if(c&&c.getBoundingClientRect().right>=i)return pe(e,n,e,Ze(e.doc,o),e.display.gutterSpecs[s].className,t),we(t)}}function ba(e,t){return ya(e,t,"gutterClick",!0)}function xa(e,t){kn(e.display,t)||function(e,t){return!!ve(e,"gutterContextMenu")&&ya(e,t,"gutterContextMenu",!1)}(e,t)||me(e,t,"contextmenu")||C||e.display.input.onContextMenu(t)}function wa(e){e.display.wrapper.className=e.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+e.options.theme.replace(/(^|\s)\s*/g," cm-s-"),Hn(e)}ma.prototype.compare=function(e,t,n){return this.time+400>e&&0==tt(t,this.pos)&&n==this.button};var ka={toString:function(){return"CodeMirror.Init"}},Ca={},Sa={};function Ta(e,t,n){if(!t!=!(n&&n!=ka)){var r=e.display.dragFunctions,i=t?fe:he;i(e.display.scroller,"dragstart",r.start),i(e.display.scroller,"dragenter",r.enter),i(e.display.scroller,"dragover",r.over),i(e.display.scroller,"dragleave",r.leave),i(e.display.scroller,"drop",r.drop)}}function La(e){e.options.lineWrapping?(P(e.display.wrapper,"CodeMirror-wrap"),e.display.sizer.style.minWidth="",e.display.sizerWidth=null):(L(e.display.wrapper,"CodeMirror-wrap"),Vt(e)),sr(e),fr(e),Hn(e),setTimeout((function(){return Br(e)}),100)}function Ma(e,t){var n=this;if(!(this instanceof Ma))return new Ma(e,t);this.options=t=t?F(t):{},F(Ca,t,!1);var r=t.value;"string"==typeof r?r=new Eo(r,t.mode,null,t.lineSeparator,t.direction):t.mode&&(r.modeOption=t.mode),this.doc=r;var i=new Ma.inputStyles[t.inputStyle](this),o=this.display=new gi(e,r,i,t);for(var c in o.wrapper.CodeMirror=this,wa(this),t.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),Ur(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:-1,cutIncoming:-1,selectingText:!1,draggingText:!1,highlight:new R,keySeq:null,specialChars:null},t.autofocus&&!v&&o.input.focus(),a&&l<11&&setTimeout((function(){return n.display.input.reset(!0)}),20),function(e){var t=e.display;fe(t.scroller,"mousedown",ei(e,ga)),fe(t.scroller,"dblclick",a&&l<11?ei(e,(function(t){if(!me(e,t)){var n=cr(e,t);if(n&&!ba(e,t)&&!kn(e.display,t)){be(t);var r=e.findWordAt(n);Gi(e.doc,r.anchor,r.head)}}})):function(t){return me(e,t)||be(t)}),fe(t.scroller,"contextmenu",(function(t){return xa(e,t)})),fe(t.input.getField(),"contextmenu",(function(n){t.scroller.contains(n.target)||xa(e,n)}));var n,r={end:0};function i(){t.activeTouch&&(n=setTimeout((function(){return t.activeTouch=null}),1e3),(r=t.activeTouch).end=+new Date)}function o(e,t){if(null==t.left)return!0;var n=t.left-e.left,r=t.top-e.top;return n*n+r*r>400}fe(t.scroller,"touchstart",(function(i){if(!me(e,i)&&!function(e){if(1!=e.touches.length)return!1;var t=e.touches[0];return t.radiusX<=1&&t.radiusY<=1}(i)&&!ba(e,i)){t.input.ensurePolled(),clearTimeout(n);var o=+new Date;t.activeTouch={start:o,moved:!1,prev:o-r.end<=300?r:null},1==i.touches.length&&(t.activeTouch.left=i.touches[0].pageX,t.activeTouch.top=i.touches[0].pageY)}})),fe(t.scroller,"touchmove",(function(){t.activeTouch&&(t.activeTouch.moved=!0)})),fe(t.scroller,"touchend",(function(n){var r=t.activeTouch;if(r&&!kn(t,n)&&null!=r.left&&!r.moved&&new Date-r.start<300){var a,l=e.coordsChar(t.activeTouch,"page");a=!r.prev||o(r,r.prev)?new Ci(l,l):!r.prev.prev||o(r,r.prev.prev)?e.findWordAt(l):new Ci(et(l.line,0),lt(e.doc,et(l.line+1,0))),e.setSelection(a.anchor,a.head),e.focus(),be(n)}i()})),fe(t.scroller,"touchcancel",i),fe(t.scroller,"scroll",(function(){t.scroller.clientHeight&&(Ir(e,t.scroller.scrollTop),Fr(e,t.scroller.scrollLeft,!0),pe(e,"scroll",e))})),fe(t.scroller,"mousewheel",(function(t){return wi(e,t)})),fe(t.scroller,"DOMMouseScroll",(function(t){return wi(e,t)})),fe(t.wrapper,"scroll",(function(){return t.wrapper.scrollTop=t.wrapper.scrollLeft=0})),t.dragFunctions={enter:function(t){me(e,t)||ke(t)},over:function(t){me(e,t)||(function(e,t){var n=cr(e,t);if(n){var r=document.createDocumentFragment();yr(e,n,r),e.display.dragCursor||(e.display.dragCursor=N("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),e.display.lineSpace.insertBefore(e.display.dragCursor,e.display.cursorDiv)),O(e.display.dragCursor,r)}}(e,t),ke(t))},start:function(t){return function(e,t){if(a&&(!e.state.draggingText||+new Date-zo<100))ke(t);else if(!me(e,t)&&!kn(e.display,t)&&(t.dataTransfer.setData("Text",e.getSelection()),t.dataTransfer.effectAllowed="copyMove",t.dataTransfer.setDragImage&&!d)){var n=N("img",null,null,"position: fixed; left: 0; top: 0;");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",f&&(n.width=n.height=1,e.display.wrapper.appendChild(n),n._top=n.offsetTop),t.dataTransfer.setDragImage(n,0,0),f&&n.parentNode.removeChild(n)}}(e,t)},drop:ei(e,Po),leave:function(t){me(e,t)||Do(e)}};var s=t.input.getField();fe(s,"keyup",(function(t){return fa.call(e,t)})),fe(s,"keydown",ei(e,ua)),fe(s,"keypress",ei(e,da)),fe(s,"focus",(function(t){return Sr(e,t)})),fe(s,"blur",(function(t){return Tr(e,t)}))}(this),Fo(),Kr(this),this.curOp.forceUpdate=!0,Ii(this,r),t.autofocus&&!v||this.hasFocus()?setTimeout((function(){n.hasFocus()&&!n.state.focused&&Sr(n)}),20):Tr(this),Sa)Sa.hasOwnProperty(c)&&Sa[c](this,t[c],ka);di(this),t.finishInit&&t.finishInit(this);for(var u=0;u<Oa.length;++u)Oa[u](this);$r(this),s&&t.lineWrapping&&"optimizelegibility"==getComputedStyle(o.lineDiv).textRendering&&(o.lineDiv.style.textRendering="auto")}Ma.defaults=Ca,Ma.optionHandlers=Sa;var Oa=[];function Na(e,t,n,r){var i,o=e.doc;null==n&&(n="add"),"smart"==n&&(o.mode.indent?i=ht(e,t).state:n="prev");var a=e.options.tabSize,l=Ke(o,t),s=W(l.text,null,a);l.stateAfter&&(l.stateAfter=null);var c,u=l.text.match(/^\s*/)[0];if(r||/\S/.test(l.text)){if("smart"==n&&((c=o.mode.indent(i,l.text.slice(u.length),l.text))==B||c>150)){if(!r)return;n="prev"}}else c=0,n="not";"prev"==n?c=t>o.first?W(Ke(o,t-1).text,null,a):0:"add"==n?c=s+e.options.indentUnit:"subtract"==n?c=s-e.options.indentUnit:"number"==typeof n&&(c=s+n),c=Math.max(0,c);var f="",d=0;if(e.options.indentWithTabs)for(var h=Math.floor(c/a);h;--h)d+=a,f+="\t";if(d<c&&(f+=$(c-d)),f!=u)return mo(o,f,et(t,0),et(t,u.length),"+input"),l.stateAfter=null,!0;for(var p=0;p<o.sel.ranges.length;p++){var m=o.sel.ranges[p];if(m.head.line==t&&m.head.ch<u.length){var g=et(t,u.length);Yi(o,p,new Ci(g,g));break}}}Ma.defineInitHook=function(e){return Oa.push(e)};var Aa=null;function Ea(e){Aa=e}function za(e,t,n,r,i){var o=e.doc;e.display.shift=!1,r||(r=o.sel);var a=+new Date-200,l="paste"==i||e.state.pasteIncoming>a,s=Ee(t),c=null;if(l&&r.ranges.length>1)if(Aa&&Aa.text.join("\n")==t){if(r.ranges.length%Aa.text.length==0){c=[];for(var u=0;u<Aa.text.length;u++)c.push(o.splitLines(Aa.text[u]))}}else s.length==r.ranges.length&&e.options.pasteLinesPerSelection&&(c=X(s,(function(e){return[e]})));for(var f=e.curOp.updateInput,d=r.ranges.length-1;d>=0;d--){var h=r.ranges[d],p=h.from(),m=h.to();h.empty()&&(n&&n>0?p=et(p.line,p.ch-n):e.state.overwrite&&!l?m=et(m.line,Math.min(Ke(o,m.line).text.length,m.ch+G(s).length)):l&&Aa&&Aa.lineWise&&Aa.text.join("\n")==s.join("\n")&&(p=m=et(p.line,0)));var g={from:p,to:m,text:c?c[d%c.length]:s,origin:i||(l?"paste":e.state.cutIncoming>a?"cut":"+input")};co(e.doc,g),sn(e,"inputRead",e,g)}t&&!l&&Da(e,t),Er(e),e.curOp.updateInput<2&&(e.curOp.updateInput=f),e.curOp.typing=!0,e.state.pasteIncoming=e.state.cutIncoming=-1}function Pa(e,t){var n=e.clipboardData&&e.clipboardData.getData("Text");if(n)return e.preventDefault(),t.isReadOnly()||t.options.disableInput||Jr(t,(function(){return za(t,n,0,null,"paste")})),!0}function Da(e,t){if(e.options.electricChars&&e.options.smartIndent)for(var n=e.doc.sel,r=n.ranges.length-1;r>=0;r--){var i=n.ranges[r];if(!(i.head.ch>100||r&&n.ranges[r-1].head.line==i.head.line)){var o=e.getModeAt(i.head),a=!1;if(o.electricChars){for(var l=0;l<o.electricChars.length;l++)if(t.indexOf(o.electricChars.charAt(l))>-1){a=Na(e,i.head.line,"smart");break}}else o.electricInput&&o.electricInput.test(Ke(e.doc,i.head.line).text.slice(0,i.head.ch))&&(a=Na(e,i.head.line,"smart"));a&&sn(e,"electricInput",e,i.head.line)}}}function Ia(e){for(var t=[],n=[],r=0;r<e.doc.sel.ranges.length;r++){var i=e.doc.sel.ranges[r].head.line,o={anchor:et(i,0),head:et(i+1,0)};n.push(o),t.push(e.getRange(o.anchor,o.head))}return{text:t,ranges:n}}function _a(e,t,n,r){e.setAttribute("autocorrect",n?"":"off"),e.setAttribute("autocapitalize",r?"":"off"),e.setAttribute("spellcheck",!!t)}function Fa(){var e=N("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),t=N("div",[e],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return s?e.style.width="1000px":e.setAttribute("wrap","off"),m&&(e.style.border="1px solid black"),_a(e),t}function Wa(e,t,n,r,i){var o=t,a=n,l=Ke(e,t.line),s=i&&"rtl"==e.direction?-n:n;function c(o){var a,c;if("codepoint"==r){var u=l.text.charCodeAt(t.ch+(r>0?0:-1));a=isNaN(u)?null:new et(t.line,Math.max(0,Math.min(l.text.length,t.ch+n*(u>=55296&&u<56320?2:1))),-n)}else a=i?function(e,t,n,r){var i=ce(t,e.doc.direction);if(!i)return Jo(t,n,r);n.ch>=t.text.length?(n.ch=t.text.length,n.sticky="before"):n.ch<=0&&(n.ch=0,n.sticky="after");var o=le(i,n.ch,n.sticky),a=i[o];if("ltr"==e.doc.direction&&a.level%2==0&&(r>0?a.to>n.ch:a.from<n.ch))return Jo(t,n,r);var l,s=function(e,n){return Qo(t,e instanceof et?e.ch:e,n)},c=function(n){return e.options.lineWrapping?(l=l||zn(e,t),Qn(e,t,l,n)):{begin:0,end:t.text.length}},u=c("before"==n.sticky?s(n,-1):n.ch);if("rtl"==e.doc.direction||1==a.level){var f=1==a.level==r<0,d=s(n,f?1:-1);if(null!=d&&(f?d<=a.to&&d<=u.end:d>=a.from&&d>=u.begin)){var h=f?"before":"after";return new et(n.line,d,h)}}var p=function(e,t,r){for(var o=function(e,t){return t?new et(n.line,s(e,1),"before"):new et(n.line,e,"after")};e>=0&&e<i.length;e+=t){var a=i[e],l=t>0==(1!=a.level),c=l?r.begin:s(r.end,-1);if(a.from<=c&&c<a.to)return o(c,l);if(c=l?a.from:s(a.to,-1),r.begin<=c&&c<r.end)return o(c,l)}},m=p(o+r,r,u);if(m)return m;var g=r>0?u.end:s(u.begin,-1);return null==g||r>0&&g==t.text.length||!(m=p(r>0?0:i.length-1,r,c(g)))?null:m}(e.cm,l,t,n):Jo(l,t,n);if(null==a){if(o||(c=t.line+s)<e.first||c>=e.first+e.size||(t=new et(c,t.ch,t.sticky),!(l=Ke(e,c))))return!1;t=ea(i,e.cm,l,t.line,s)}else t=a;return!0}if("char"==r||"codepoint"==r)c();else if("column"==r)c(!0);else if("word"==r||"group"==r)for(var u=null,f="group"==r,d=e.cm&&e.cm.getHelper(t,"wordChars"),h=!0;!(n<0)||c(!h);h=!1){var p=l.text.charAt(t.ch)||"\n",m=ee(p,d)?"w":f&&"\n"==p?"n":!f||/\s/.test(p)?null:"p";if(!f||h||m||(m="s"),u&&u!=m){n<0&&(n=1,c(),t.sticky="after");break}if(m&&(u=m),n>0&&!c(!h))break}var g=oo(e,t,o,a,!0);return nt(o,g)&&(g.hitSide=!0),g}function Ra(e,t,n,r){var i,o,a=e.doc,l=t.left;if("page"==r){var s=Math.min(e.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),c=Math.max(s-.5*rr(e.display),3);i=(n>0?t.bottom:t.top)+n*c}else"line"==r&&(i=n>0?t.bottom+3:t.top-3);for(;(o=Yn(e,l,i)).outside;){if(n<0?i<=0:i>=a.height){o.hitSide=!0;break}i+=5*n}return o}var Ha=function(e){this.cm=e,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new R,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};function Ba(e,t){var n=En(e,t.line);if(!n||n.hidden)return null;var r=Ke(e.doc,t.line),i=Nn(n,r,t.line),o=ce(r,e.doc.direction),a="left";o&&(a=le(o,t.ch)%2?"right":"left");var l=_n(i.map,t.ch,a);return l.offset="right"==l.collapse?l.end:l.start,l}function ja(e,t){return t&&(e.bad=!0),e}function qa(e,t,n){var r;if(t==e.display.lineDiv){if(!(r=e.display.lineDiv.childNodes[n]))return ja(e.clipPos(et(e.display.viewTo-1)),!0);t=null,n=0}else for(r=t;;r=r.parentNode){if(!r||r==e.display.lineDiv)return null;if(r.parentNode&&r.parentNode==e.display.lineDiv)break}for(var i=0;i<e.display.view.length;i++){var o=e.display.view[i];if(o.node==r)return Ua(o,t,n)}}function Ua(e,t,n){var r=e.text.firstChild,i=!1;if(!t||!E(r,t))return ja(et(Ye(e.line),0),!0);if(t==r&&(i=!0,t=r.childNodes[n],n=0,!t)){var o=e.rest?G(e.rest):e.line;return ja(et(Ye(o),o.text.length),i)}var a=3==t.nodeType?t:null,l=t;for(a||1!=t.childNodes.length||3!=t.firstChild.nodeType||(a=t.firstChild,n&&(n=a.nodeValue.length));l.parentNode!=r;)l=l.parentNode;var s=e.measure,c=s.maps;function u(t,n,r){for(var i=-1;i<(c?c.length:0);i++)for(var o=i<0?s.map:c[i],a=0;a<o.length;a+=3){var l=o[a+2];if(l==t||l==n){var u=Ye(i<0?e.line:e.rest[i]),f=o[a]+r;return(r<0||l!=t)&&(f=o[a+(r?1:0)]),et(u,f)}}}var f=u(a,l,n);if(f)return ja(f,i);for(var d=l.nextSibling,h=a?a.nodeValue.length-n:0;d;d=d.nextSibling){if(f=u(d,d.firstChild,0))return ja(et(f.line,f.ch-h),i);h+=d.textContent.length}for(var p=l.previousSibling,m=n;p;p=p.previousSibling){if(f=u(p,p.firstChild,-1))return ja(et(f.line,f.ch+m),i);m+=p.textContent.length}}Ha.prototype.init=function(e){var t=this,n=this,r=n.cm,i=n.div=e.lineDiv;function o(e){for(var t=e.target;t;t=t.parentNode){if(t==i)return!0;if(/\bCodeMirror-(?:line)?widget\b/.test(t.className))break}return!1}function a(e){if(o(e)&&!me(r,e)){if(r.somethingSelected())Ea({lineWise:!1,text:r.getSelections()}),"cut"==e.type&&r.replaceSelection("",null,"cut");else{if(!r.options.lineWiseCopyCut)return;var t=Ia(r);Ea({lineWise:!0,text:t.text}),"cut"==e.type&&r.operation((function(){r.setSelections(t.ranges,0,j),r.replaceSelection("",null,"cut")}))}if(e.clipboardData){e.clipboardData.clearData();var a=Aa.text.join("\n");if(e.clipboardData.setData("Text",a),e.clipboardData.getData("Text")==a)return void e.preventDefault()}var l=Fa(),s=l.firstChild;r.display.lineSpace.insertBefore(l,r.display.lineSpace.firstChild),s.value=Aa.text.join("\n");var c=document.activeElement;I(s),setTimeout((function(){r.display.lineSpace.removeChild(l),c.focus(),c==i&&n.showPrimarySelection()}),50)}}_a(i,r.options.spellcheck,r.options.autocorrect,r.options.autocapitalize),fe(i,"paste",(function(e){!o(e)||me(r,e)||Pa(e,r)||l<=11&&setTimeout(ei(r,(function(){return t.updateFromDOM()})),20)})),fe(i,"compositionstart",(function(e){t.composing={data:e.data,done:!1}})),fe(i,"compositionupdate",(function(e){t.composing||(t.composing={data:e.data,done:!1})})),fe(i,"compositionend",(function(e){t.composing&&(e.data!=t.composing.data&&t.readFromDOMSoon(),t.composing.done=!0)})),fe(i,"touchstart",(function(){return n.forceCompositionEnd()})),fe(i,"input",(function(){t.composing||t.readFromDOMSoon()})),fe(i,"copy",a),fe(i,"cut",a)},Ha.prototype.screenReaderLabelChanged=function(e){e?this.div.setAttribute("aria-label",e):this.div.removeAttribute("aria-label")},Ha.prototype.prepareSelection=function(){var e=vr(this.cm,!1);return e.focus=document.activeElement==this.div,e},Ha.prototype.showSelection=function(e,t){e&&this.cm.display.view.length&&((e.focus||t)&&this.showPrimarySelection(),this.showMultipleSelections(e))},Ha.prototype.getSelection=function(){return this.cm.display.wrapper.ownerDocument.getSelection()},Ha.prototype.showPrimarySelection=function(){var e=this.getSelection(),t=this.cm,r=t.doc.sel.primary(),i=r.from(),o=r.to();if(t.display.viewTo==t.display.viewFrom||i.line>=t.display.viewTo||o.line<t.display.viewFrom)e.removeAllRanges();else{var a=qa(t,e.anchorNode,e.anchorOffset),l=qa(t,e.focusNode,e.focusOffset);if(!a||a.bad||!l||l.bad||0!=tt(ot(a,l),i)||0!=tt(it(a,l),o)){var s=t.display.view,c=i.line>=t.display.viewFrom&&Ba(t,i)||{node:s[0].measure.map[2],offset:0},u=o.line<t.display.viewTo&&Ba(t,o);if(!u){var f=s[s.length-1].measure,d=f.maps?f.maps[f.maps.length-1]:f.map;u={node:d[d.length-1],offset:d[d.length-2]-d[d.length-3]}}if(c&&u){var h,p=e.rangeCount&&e.getRangeAt(0);try{h=T(c.node,c.offset,u.offset,u.node)}catch(e){}h&&(!n&&t.state.focused?(e.collapse(c.node,c.offset),h.collapsed||(e.removeAllRanges(),e.addRange(h))):(e.removeAllRanges(),e.addRange(h)),p&&null==e.anchorNode?e.addRange(p):n&&this.startGracePeriod()),this.rememberSelection()}else e.removeAllRanges()}}},Ha.prototype.startGracePeriod=function(){var e=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){e.gracePeriod=!1,e.selectionChanged()&&e.cm.operation((function(){return e.cm.curOp.selectionChanged=!0}))}),20)},Ha.prototype.showMultipleSelections=function(e){O(this.cm.display.cursorDiv,e.cursors),O(this.cm.display.selectionDiv,e.selection)},Ha.prototype.rememberSelection=function(){var e=this.getSelection();this.lastAnchorNode=e.anchorNode,this.lastAnchorOffset=e.anchorOffset,this.lastFocusNode=e.focusNode,this.lastFocusOffset=e.focusOffset},Ha.prototype.selectionInEditor=function(){var e=this.getSelection();if(!e.rangeCount)return!1;var t=e.getRangeAt(0).commonAncestorContainer;return E(this.div,t)},Ha.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()&&document.activeElement==this.div||this.showSelection(this.prepareSelection(),!0),this.div.focus())},Ha.prototype.blur=function(){this.div.blur()},Ha.prototype.getField=function(){return this.div},Ha.prototype.supportsTouch=function(){return!0},Ha.prototype.receivedFocus=function(){var e=this;this.selectionInEditor()?this.pollSelection():Jr(this.cm,(function(){return e.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,(function t(){e.cm.state.focused&&(e.pollSelection(),e.polling.set(e.cm.options.pollInterval,t))}))},Ha.prototype.selectionChanged=function(){var e=this.getSelection();return e.anchorNode!=this.lastAnchorNode||e.anchorOffset!=this.lastAnchorOffset||e.focusNode!=this.lastFocusNode||e.focusOffset!=this.lastFocusOffset},Ha.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var e=this.getSelection(),t=this.cm;if(g&&u&&this.cm.display.gutterSpecs.length&&function(e){for(var t=e;t;t=t.parentNode)if(/CodeMirror-gutter-wrapper/.test(t.className))return!0;return!1}(e.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var n=qa(t,e.anchorNode,e.anchorOffset),r=qa(t,e.focusNode,e.focusOffset);n&&r&&Jr(t,(function(){Ji(t.doc,Ti(n,r),j),(n.bad||r.bad)&&(t.curOp.selectionChanged=!0)}))}}},Ha.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var e,t,n,r=this.cm,i=r.display,o=r.doc.sel.primary(),a=o.from(),l=o.to();if(0==a.ch&&a.line>r.firstLine()&&(a=et(a.line-1,Ke(r.doc,a.line-1).length)),l.ch==Ke(r.doc,l.line).text.length&&l.line<r.lastLine()&&(l=et(l.line+1,0)),a.line<i.viewFrom||l.line>i.viewTo-1)return!1;a.line==i.viewFrom||0==(e=ur(r,a.line))?(t=Ye(i.view[0].line),n=i.view[0].node):(t=Ye(i.view[e].line),n=i.view[e-1].node.nextSibling);var s,c,u=ur(r,l.line);if(u==i.view.length-1?(s=i.viewTo-1,c=i.lineDiv.lastChild):(s=Ye(i.view[u+1].line)-1,c=i.view[u+1].node.previousSibling),!n)return!1;for(var f=r.doc.splitLines(function(e,t,n,r,i){var o="",a=!1,l=e.doc.lineSeparator(),s=!1;function c(){a&&(o+=l,s&&(o+=l),a=s=!1)}function u(e){e&&(c(),o+=e)}function f(t){if(1==t.nodeType){var n=t.getAttribute("cm-text");if(n)return void u(n);var o,d=t.getAttribute("cm-marker");if(d){var h=e.findMarks(et(r,0),et(i+1,0),(g=+d,function(e){return e.id==g}));return void(h.length&&(o=h[0].find(0))&&u($e(e.doc,o.from,o.to).join(l)))}if("false"==t.getAttribute("contenteditable"))return;var p=/^(pre|div|p|li|table|br)$/i.test(t.nodeName);if(!/^br$/i.test(t.nodeName)&&0==t.textContent.length)return;p&&c();for(var m=0;m<t.childNodes.length;m++)f(t.childNodes[m]);/^(pre|p)$/i.test(t.nodeName)&&(s=!0),p&&(a=!0)}else 3==t.nodeType&&u(t.nodeValue.replace(/\u200b/g,"").replace(/\u00a0/g," "));var g}for(;f(t),t!=n;)t=t.nextSibling,s=!1;return o}(r,n,c,t,s)),d=$e(r.doc,et(t,0),et(s,Ke(r.doc,s).text.length));f.length>1&&d.length>1;)if(G(f)==G(d))f.pop(),d.pop(),s--;else{if(f[0]!=d[0])break;f.shift(),d.shift(),t++}for(var h=0,p=0,m=f[0],g=d[0],v=Math.min(m.length,g.length);h<v&&m.charCodeAt(h)==g.charCodeAt(h);)++h;for(var y=G(f),b=G(d),x=Math.min(y.length-(1==f.length?h:0),b.length-(1==d.length?h:0));p<x&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)++p;if(1==f.length&&1==d.length&&t==a.line)for(;h&&h>a.ch&&y.charCodeAt(y.length-p-1)==b.charCodeAt(b.length-p-1);)h--,p++;f[f.length-1]=y.slice(0,y.length-p).replace(/^\u200b+/,""),f[0]=f[0].slice(h).replace(/\u200b+$/,"");var w=et(t,h),k=et(s,d.length?G(d).length-p:0);return f.length>1||f[0]||tt(w,k)?(mo(r.doc,f,w,k,"+input"),!0):void 0},Ha.prototype.ensurePolled=function(){this.forceCompositionEnd()},Ha.prototype.reset=function(){this.forceCompositionEnd()},Ha.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},Ha.prototype.readFromDOMSoon=function(){var e=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout((function(){if(e.readDOMTimeout=null,e.composing){if(!e.composing.done)return;e.composing=null}e.updateFromDOM()}),80))},Ha.prototype.updateFromDOM=function(){var e=this;!this.cm.isReadOnly()&&this.pollContent()||Jr(this.cm,(function(){return fr(e.cm)}))},Ha.prototype.setUneditable=function(e){e.contentEditable="false"},Ha.prototype.onKeyPress=function(e){0==e.charCode||this.composing||(e.preventDefault(),this.cm.isReadOnly()||ei(this.cm,za)(this.cm,String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),0))},Ha.prototype.readOnlyChanged=function(e){this.div.contentEditable=String("nocursor"!=e)},Ha.prototype.onContextMenu=function(){},Ha.prototype.resetPosition=function(){},Ha.prototype.needsContentAttribute=!0;var Va=function(e){this.cm=e,this.prevInput="",this.pollingFast=!1,this.polling=new R,this.hasSelection=!1,this.composing=null};Va.prototype.init=function(e){var t=this,n=this,r=this.cm;this.createField(e);var i=this.textarea;function o(e){if(!me(r,e)){if(r.somethingSelected())Ea({lineWise:!1,text:r.getSelections()});else{if(!r.options.lineWiseCopyCut)return;var t=Ia(r);Ea({lineWise:!0,text:t.text}),"cut"==e.type?r.setSelections(t.ranges,null,j):(n.prevInput="",i.value=t.text.join("\n"),I(i))}"cut"==e.type&&(r.state.cutIncoming=+new Date)}}e.wrapper.insertBefore(this.wrapper,e.wrapper.firstChild),m&&(i.style.width="0px"),fe(i,"input",(function(){a&&l>=9&&t.hasSelection&&(t.hasSelection=null),n.poll()})),fe(i,"paste",(function(e){me(r,e)||Pa(e,r)||(r.state.pasteIncoming=+new Date,n.fastPoll())})),fe(i,"cut",o),fe(i,"copy",o),fe(e.scroller,"paste",(function(t){if(!kn(e,t)&&!me(r,t)){if(!i.dispatchEvent)return r.state.pasteIncoming=+new Date,void n.focus();var o=new Event("paste");o.clipboardData=t.clipboardData,i.dispatchEvent(o)}})),fe(e.lineSpace,"selectstart",(function(t){kn(e,t)||be(t)})),fe(i,"compositionstart",(function(){var e=r.getCursor("from");n.composing&&n.composing.range.clear(),n.composing={start:e,range:r.markText(e,r.getCursor("to"),{className:"CodeMirror-composing"})}})),fe(i,"compositionend",(function(){n.composing&&(n.poll(),n.composing.range.clear(),n.composing=null)}))},Va.prototype.createField=function(e){this.wrapper=Fa(),this.textarea=this.wrapper.firstChild},Va.prototype.screenReaderLabelChanged=function(e){e?this.textarea.setAttribute("aria-label",e):this.textarea.removeAttribute("aria-label")},Va.prototype.prepareSelection=function(){var e=this.cm,t=e.display,n=e.doc,r=vr(e);if(e.options.moveInputWithCursor){var i=$n(e,n.sel.primary().head,"div"),o=t.wrapper.getBoundingClientRect(),a=t.lineDiv.getBoundingClientRect();r.teTop=Math.max(0,Math.min(t.wrapper.clientHeight-10,i.top+a.top-o.top)),r.teLeft=Math.max(0,Math.min(t.wrapper.clientWidth-10,i.left+a.left-o.left))}return r},Va.prototype.showSelection=function(e){var t=this.cm.display;O(t.cursorDiv,e.cursors),O(t.selectionDiv,e.selection),null!=e.teTop&&(this.wrapper.style.top=e.teTop+"px",this.wrapper.style.left=e.teLeft+"px")},Va.prototype.reset=function(e){if(!this.contextMenuPending&&!this.composing){var t=this.cm;if(t.somethingSelected()){this.prevInput="";var n=t.getSelection();this.textarea.value=n,t.state.focused&&I(this.textarea),a&&l>=9&&(this.hasSelection=n)}else e||(this.prevInput=this.textarea.value="",a&&l>=9&&(this.hasSelection=null))}},Va.prototype.getField=function(){return this.textarea},Va.prototype.supportsTouch=function(){return!1},Va.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!v||z()!=this.textarea))try{this.textarea.focus()}catch(e){}},Va.prototype.blur=function(){this.textarea.blur()},Va.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},Va.prototype.receivedFocus=function(){this.slowPoll()},Va.prototype.slowPoll=function(){var e=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,(function(){e.poll(),e.cm.state.focused&&e.slowPoll()}))},Va.prototype.fastPoll=function(){var e=!1,t=this;t.pollingFast=!0,t.polling.set(20,(function n(){t.poll()||e?(t.pollingFast=!1,t.slowPoll()):(e=!0,t.polling.set(60,n))}))},Va.prototype.poll=function(){var e=this,t=this.cm,n=this.textarea,r=this.prevInput;if(this.contextMenuPending||!t.state.focused||ze(n)&&!r&&!this.composing||t.isReadOnly()||t.options.disableInput||t.state.keySeq)return!1;var i=n.value;if(i==r&&!t.somethingSelected())return!1;if(a&&l>=9&&this.hasSelection===i||y&&/[\uf700-\uf7ff]/.test(i))return t.display.input.reset(),!1;if(t.doc.sel==t.display.selForContextMenu){var o=i.charCodeAt(0);if(8203!=o||r||(r="​"),8666==o)return this.reset(),this.cm.execCommand("undo")}for(var s=0,c=Math.min(r.length,i.length);s<c&&r.charCodeAt(s)==i.charCodeAt(s);)++s;return Jr(t,(function(){za(t,i.slice(s),r.length-s,null,e.composing?"*compose":null),i.length>1e3||i.indexOf("\n")>-1?n.value=e.prevInput="":e.prevInput=i,e.composing&&(e.composing.range.clear(),e.composing.range=t.markText(e.composing.start,t.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},Va.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},Va.prototype.onKeyPress=function(){a&&l>=9&&(this.hasSelection=null),this.fastPoll()},Va.prototype.onContextMenu=function(e){var t=this,n=t.cm,r=n.display,i=t.textarea;t.contextMenuPending&&t.contextMenuPending();var o=cr(n,e),c=r.scroller.scrollTop;if(o&&!f){n.options.resetSelectionOnContextMenu&&-1==n.doc.sel.contains(o)&&ei(n,Ji)(n.doc,Ti(o),j);var u,d=i.style.cssText,h=t.wrapper.style.cssText,p=t.wrapper.offsetParent.getBoundingClientRect();if(t.wrapper.style.cssText="position: static",i.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(e.clientY-p.top-5)+"px; left: "+(e.clientX-p.left-5)+"px;\n      z-index: 1000; background: "+(a?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);",s&&(u=window.scrollY),r.input.focus(),s&&window.scrollTo(null,u),r.input.reset(),n.somethingSelected()||(i.value=t.prevInput=" "),t.contextMenuPending=v,r.selForContextMenu=n.doc.sel,clearTimeout(r.detectingSelectAll),a&&l>=9&&g(),C){ke(e);var m=function(){he(window,"mouseup",m),setTimeout(v,20)};fe(window,"mouseup",m)}else setTimeout(v,50)}function g(){if(null!=i.selectionStart){var e=n.somethingSelected(),o="​"+(e?i.value:"");i.value="⇚",i.value=o,t.prevInput=e?"":"​",i.selectionStart=1,i.selectionEnd=o.length,r.selForContextMenu=n.doc.sel}}function v(){if(t.contextMenuPending==v&&(t.contextMenuPending=!1,t.wrapper.style.cssText=h,i.style.cssText=d,a&&l<9&&r.scrollbars.setScrollTop(r.scroller.scrollTop=c),null!=i.selectionStart)){(!a||a&&l<9)&&g();var e=0,o=function(){r.selForContextMenu==n.doc.sel&&0==i.selectionStart&&i.selectionEnd>0&&"​"==t.prevInput?ei(n,lo)(n):e++<10?r.detectingSelectAll=setTimeout(o,500):(r.selForContextMenu=null,r.input.reset())};r.detectingSelectAll=setTimeout(o,200)}}},Va.prototype.readOnlyChanged=function(e){e||this.reset(),this.textarea.disabled="nocursor"==e,this.textarea.readOnly=!!e},Va.prototype.setUneditable=function(){},Va.prototype.needsContentAttribute=!1,function(e){var t=e.optionHandlers;function n(n,r,i,o){e.defaults[n]=r,i&&(t[n]=o?function(e,t,n){n!=ka&&i(e,t,n)}:i)}e.defineOption=n,e.Init=ka,n("value","",(function(e,t){return e.setValue(t)}),!0),n("mode",null,(function(e,t){e.doc.modeOption=t,Ai(e)}),!0),n("indentUnit",2,Ai,!0),n("indentWithTabs",!1),n("smartIndent",!0),n("tabSize",4,(function(e){Ei(e),Hn(e),fr(e)}),!0),n("lineSeparator",null,(function(e,t){if(e.doc.lineSep=t,t){var n=[],r=e.doc.first;e.doc.iter((function(e){for(var i=0;;){var o=e.text.indexOf(t,i);if(-1==o)break;i=o+t.length,n.push(et(r,o))}r++}));for(var i=n.length-1;i>=0;i--)mo(e.doc,t,n[i],et(n[i].line,n[i].ch+t.length))}})),n("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g,(function(e,t,n){e.state.specialChars=new RegExp(t.source+(t.test("\t")?"":"|\t"),"g"),n!=ka&&e.refresh()})),n("specialCharPlaceholder",Qt,(function(e){return e.refresh()}),!0),n("electricChars",!0),n("inputStyle",v?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),n("spellcheck",!1,(function(e,t){return e.getInputField().spellcheck=t}),!0),n("autocorrect",!1,(function(e,t){return e.getInputField().autocorrect=t}),!0),n("autocapitalize",!1,(function(e,t){return e.getInputField().autocapitalize=t}),!0),n("rtlMoveVisually",!x),n("wholeLineUpdateBefore",!0),n("theme","default",(function(e){wa(e),mi(e)}),!0),n("keyMap","default",(function(e,t,n){var r=Yo(t),i=n!=ka&&Yo(n);i&&i.detach&&i.detach(e,r),r.attach&&r.attach(e,i||null)})),n("extraKeys",null),n("configureMouse",null),n("lineWrapping",!1,La,!0),n("gutters",[],(function(e,t){e.display.gutterSpecs=hi(t,e.options.lineNumbers),mi(e)}),!0),n("fixedGutter",!0,(function(e,t){e.display.gutters.style.left=t?ar(e.display)+"px":"0",e.refresh()}),!0),n("coverGutterNextToScrollbar",!1,(function(e){return Br(e)}),!0),n("scrollbarStyle","native",(function(e){Ur(e),Br(e),e.display.scrollbars.setScrollTop(e.doc.scrollTop),e.display.scrollbars.setScrollLeft(e.doc.scrollLeft)}),!0),n("lineNumbers",!1,(function(e,t){e.display.gutterSpecs=hi(e.options.gutters,t),mi(e)}),!0),n("firstLineNumber",1,mi,!0),n("lineNumberFormatter",(function(e){return e}),mi,!0),n("showCursorWhenSelecting",!1,gr,!0),n("resetSelectionOnContextMenu",!0),n("lineWiseCopyCut",!0),n("pasteLinesPerSelection",!0),n("selectionsMayTouch",!1),n("readOnly",!1,(function(e,t){"nocursor"==t&&(Tr(e),e.display.input.blur()),e.display.input.readOnlyChanged(t)})),n("screenReaderLabel",null,(function(e,t){t=""===t?null:t,e.display.input.screenReaderLabelChanged(t)})),n("disableInput",!1,(function(e,t){t||e.display.input.reset()}),!0),n("dragDrop",!0,Ta),n("allowDropFileTypes",null),n("cursorBlinkRate",530),n("cursorScrollMargin",0),n("cursorHeight",1,gr,!0),n("singleCursorHeightPerLine",!0,gr,!0),n("workTime",100),n("workDelay",100),n("flattenSpans",!0,Ei,!0),n("addModeClass",!1,Ei,!0),n("pollInterval",100),n("undoDepth",200,(function(e,t){return e.doc.history.undoDepth=t})),n("historyEventDelay",1250),n("viewportMargin",10,(function(e){return e.refresh()}),!0),n("maxHighlightLength",1e4,Ei,!0),n("moveInputWithCursor",!0,(function(e,t){t||e.display.input.resetPosition()})),n("tabindex",null,(function(e,t){return e.display.input.getField().tabIndex=t||""})),n("autofocus",null),n("direction","ltr",(function(e,t){return e.doc.setDirection(t)}),!0),n("phrases",null)}(Ma),function(e){var t=e.optionHandlers,n=e.helpers={};e.prototype={constructor:e,focus:function(){window.focus(),this.display.input.focus()},setOption:function(e,n){var r=this.options,i=r[e];r[e]==n&&"mode"!=e||(r[e]=n,t.hasOwnProperty(e)&&ei(this,t[e])(this,n,i),pe(this,"optionChange",this,e))},getOption:function(e){return this.options[e]},getDoc:function(){return this.doc},addKeyMap:function(e,t){this.state.keyMaps[t?"push":"unshift"](Yo(e))},removeKeyMap:function(e){for(var t=this.state.keyMaps,n=0;n<t.length;++n)if(t[n]==e||t[n].name==e)return t.splice(n,1),!0},addOverlay:ti((function(t,n){var r=t.token?t:e.getMode(this.options,t);if(r.startState)throw new Error("Overlays may not be stateful.");!function(e,t,n){for(var r=0,i=n(t);r<e.length&&n(e[r])<=i;)r++;e.splice(r,0,t)}(this.state.overlays,{mode:r,modeSpec:t,opaque:n&&n.opaque,priority:n&&n.priority||0},(function(e){return e.priority})),this.state.modeGen++,fr(this)})),removeOverlay:ti((function(e){for(var t=this.state.overlays,n=0;n<t.length;++n){var r=t[n].modeSpec;if(r==e||"string"==typeof e&&r.name==e)return t.splice(n,1),this.state.modeGen++,void fr(this)}})),indentLine:ti((function(e,t,n){"string"!=typeof t&&"number"!=typeof t&&(t=null==t?this.options.smartIndent?"smart":"prev":t?"add":"subtract"),Qe(this.doc,e)&&Na(this,e,t,n)})),indentSelection:ti((function(e){for(var t=this.doc.sel.ranges,n=-1,r=0;r<t.length;r++){var i=t[r];if(i.empty())i.head.line>n&&(Na(this,i.head.line,e,!0),n=i.head.line,r==this.doc.sel.primIndex&&Er(this));else{var o=i.from(),a=i.to(),l=Math.max(n,o.line);n=Math.min(this.lastLine(),a.line-(a.ch?0:1))+1;for(var s=l;s<n;++s)Na(this,s,e);var c=this.doc.sel.ranges;0==o.ch&&t.length==c.length&&c[r].from().ch>0&&Yi(this.doc,r,new Ci(o,c[r].to()),j)}}})),getTokenAt:function(e,t){return yt(this,e,t)},getLineTokens:function(e,t){return yt(this,et(e),t,!0)},getTokenTypeAt:function(e){e=lt(this.doc,e);var t,n=dt(this,Ke(this.doc,e.line)),r=0,i=(n.length-1)/2,o=e.ch;if(0==o)t=n[2];else for(;;){var a=r+i>>1;if((a?n[2*a-1]:0)>=o)i=a;else{if(!(n[2*a+1]<o)){t=n[2*a+2];break}r=a+1}}var l=t?t.indexOf("overlay "):-1;return l<0?t:0==l?null:t.slice(0,l-1)},getModeAt:function(t){var n=this.doc.mode;return n.innerMode?e.innerMode(n,this.getTokenAt(t).state).mode:n},getHelper:function(e,t){return this.getHelpers(e,t)[0]},getHelpers:function(e,t){var r=[];if(!n.hasOwnProperty(t))return r;var i=n[t],o=this.getModeAt(e);if("string"==typeof o[t])i[o[t]]&&r.push(i[o[t]]);else if(o[t])for(var a=0;a<o[t].length;a++){var l=i[o[t][a]];l&&r.push(l)}else o.helperType&&i[o.helperType]?r.push(i[o.helperType]):i[o.name]&&r.push(i[o.name]);for(var s=0;s<i._global.length;s++){var c=i._global[s];c.pred(o,this)&&-1==H(r,c.val)&&r.push(c.val)}return r},getStateAfter:function(e,t){var n=this.doc;return ht(this,(e=at(n,null==e?n.first+n.size-1:e))+1,t).state},cursorCoords:function(e,t){var n=this.doc.sel.primary();return $n(this,null==e?n.head:"object"==typeof e?lt(this.doc,e):e?n.from():n.to(),t||"page")},charCoords:function(e,t){return Kn(this,lt(this.doc,e),t||"page")},coordsChar:function(e,t){return Yn(this,(e=Vn(this,e,t||"page")).left,e.top)},lineAtHeight:function(e,t){return e=Vn(this,{top:e,left:0},t||"page").top,Ze(this.doc,e+this.display.viewOffset)},heightAtLine:function(e,t,n){var r,i=!1;if("number"==typeof e){var o=this.doc.first+this.doc.size-1;e<this.doc.first?e=this.doc.first:e>o&&(e=o,i=!0),r=Ke(this.doc,e)}else r=e;return Un(this,r,{top:0,left:0},t||"page",n||i).top+(i?this.doc.height-qt(r):0)},defaultTextHeight:function(){return rr(this.display)},defaultCharWidth:function(){return ir(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(e,t,n,r,i){var o,a,l,s=this.display,c=(e=$n(this,lt(this.doc,e))).bottom,u=e.left;if(t.style.position="absolute",t.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(t),s.sizer.appendChild(t),"over"==r)c=e.top;else if("above"==r||"near"==r){var f=Math.max(s.wrapper.clientHeight,this.doc.height),d=Math.max(s.sizer.clientWidth,s.lineSpace.clientWidth);("above"==r||e.bottom+t.offsetHeight>f)&&e.top>t.offsetHeight?c=e.top-t.offsetHeight:e.bottom+t.offsetHeight<=f&&(c=e.bottom),u+t.offsetWidth>d&&(u=d-t.offsetWidth)}t.style.top=c+"px",t.style.left=t.style.right="","right"==i?(u=s.sizer.clientWidth-t.offsetWidth,t.style.right="0px"):("left"==i?u=0:"middle"==i&&(u=(s.sizer.clientWidth-t.offsetWidth)/2),t.style.left=u+"px"),n&&(o=this,a={left:u,top:c,right:u+t.offsetWidth,bottom:c+t.offsetHeight},null!=(l=Nr(o,a)).scrollTop&&Ir(o,l.scrollTop),null!=l.scrollLeft&&Fr(o,l.scrollLeft))},triggerOnKeyDown:ti(ua),triggerOnKeyPress:ti(da),triggerOnKeyUp:fa,triggerOnMouseDown:ti(ga),execCommand:function(e){if(ta.hasOwnProperty(e))return ta[e].call(null,this)},triggerElectric:ti((function(e){Da(this,e)})),findPosH:function(e,t,n,r){var i=1;t<0&&(i=-1,t=-t);for(var o=lt(this.doc,e),a=0;a<t&&!(o=Wa(this.doc,o,i,n,r)).hitSide;++a);return o},moveH:ti((function(e,t){var n=this;this.extendSelectionsBy((function(r){return n.display.shift||n.doc.extend||r.empty()?Wa(n.doc,r.head,e,t,n.options.rtlMoveVisually):e<0?r.from():r.to()}),U)})),deleteH:ti((function(e,t){var n=this.doc.sel,r=this.doc;n.somethingSelected()?r.replaceSelection("",null,"+delete"):Zo(this,(function(n){var i=Wa(r,n.head,e,t,!1);return e<0?{from:i,to:n.head}:{from:n.head,to:i}}))})),findPosV:function(e,t,n,r){var i=1,o=r;t<0&&(i=-1,t=-t);for(var a=lt(this.doc,e),l=0;l<t;++l){var s=$n(this,a,"div");if(null==o?o=s.left:s.left=o,(a=Ra(this,s,i,n)).hitSide)break}return a},moveV:ti((function(e,t){var n=this,r=this.doc,i=[],o=!this.display.shift&&!r.extend&&r.sel.somethingSelected();if(r.extendSelectionsBy((function(a){if(o)return e<0?a.from():a.to();var l=$n(n,a.head,"div");null!=a.goalColumn&&(l.left=a.goalColumn),i.push(l.left);var s=Ra(n,l,e,t);return"page"==t&&a==r.sel.primary()&&Ar(n,Kn(n,s,"div").top-l.top),s}),U),i.length)for(var a=0;a<r.sel.ranges.length;a++)r.sel.ranges[a].goalColumn=i[a]})),findWordAt:function(e){var t=Ke(this.doc,e.line).text,n=e.ch,r=e.ch;if(t){var i=this.getHelper(e,"wordChars");"before"!=e.sticky&&r!=t.length||!n?++r:--n;for(var o=t.charAt(n),a=ee(o,i)?function(e){return ee(e,i)}:/\s/.test(o)?function(e){return/\s/.test(e)}:function(e){return!/\s/.test(e)&&!ee(e)};n>0&&a(t.charAt(n-1));)--n;for(;r<t.length&&a(t.charAt(r));)++r}return new Ci(et(e.line,n),et(e.line,r))},toggleOverwrite:function(e){null!=e&&e==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?P(this.display.cursorDiv,"CodeMirror-overwrite"):L(this.display.cursorDiv,"CodeMirror-overwrite"),pe(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==z()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:ti((function(e,t){zr(this,e,t)})),getScrollInfo:function(){var e=this.display.scroller;return{left:e.scrollLeft,top:e.scrollTop,height:e.scrollHeight-Ln(this)-this.display.barHeight,width:e.scrollWidth-Ln(this)-this.display.barWidth,clientHeight:On(this),clientWidth:Mn(this)}},scrollIntoView:ti((function(e,t){null==e?(e={from:this.doc.sel.primary().head,to:null},null==t&&(t=this.options.cursorScrollMargin)):"number"==typeof e?e={from:et(e,0),to:null}:null==e.from&&(e={from:e,to:null}),e.to||(e.to=e.from),e.margin=t||0,null!=e.from.line?function(e,t){Pr(e),e.curOp.scrollToPos=t}(this,e):Dr(this,e.from,e.to,e.margin)})),setSize:ti((function(e,t){var n=this,r=function(e){return"number"==typeof e||/^\d+$/.test(String(e))?e+"px":e};null!=e&&(this.display.wrapper.style.width=r(e)),null!=t&&(this.display.wrapper.style.height=r(t)),this.options.lineWrapping&&Rn(this);var i=this.display.viewFrom;this.doc.iter(i,this.display.viewTo,(function(e){if(e.widgets)for(var t=0;t<e.widgets.length;t++)if(e.widgets[t].noHScroll){dr(n,i,"widget");break}++i})),this.curOp.forceUpdate=!0,pe(this,"refresh",this)})),operation:function(e){return Jr(this,e)},startOperation:function(){return Kr(this)},endOperation:function(){return $r(this)},refresh:ti((function(){var e=this.display.cachedTextHeight;fr(this),this.curOp.forceUpdate=!0,Hn(this),zr(this,this.doc.scrollLeft,this.doc.scrollTop),ci(this.display),(null==e||Math.abs(e-rr(this.display))>.5||this.options.lineWrapping)&&sr(this),pe(this,"refresh",this)})),swapDoc:ti((function(e){var t=this.doc;return t.cm=null,this.state.selectingText&&this.state.selectingText(),Ii(this,e),Hn(this),this.display.input.reset(),zr(this,e.scrollLeft,e.scrollTop),this.curOp.forceScroll=!0,sn(this,"swapDoc",this,t),t})),phrase:function(e){var t=this.options.phrases;return t&&Object.prototype.hasOwnProperty.call(t,e)?t[e]:e},getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},ye(e),e.registerHelper=function(t,r,i){n.hasOwnProperty(t)||(n[t]=e[t]={_global:[]}),n[t][r]=i},e.registerGlobalHelper=function(t,r,i,o){e.registerHelper(t,r,o),n[t]._global.push({pred:i,val:o})}}(Ma);var Ka="iter insert remove copy getEditor constructor".split(" ");for(var $a in Eo.prototype)Eo.prototype.hasOwnProperty($a)&&H(Ka,$a)<0&&(Ma.prototype[$a]=function(e){return function(){return e.apply(this.doc,arguments)}}(Eo.prototype[$a]));return ye(Eo),Ma.inputStyles={textarea:Va,contenteditable:Ha},Ma.defineMode=function(e){Ma.defaults.mode||"null"==e||(Ma.defaults.mode=e),Fe.apply(this,arguments)},Ma.defineMIME=function(e,t){_e[e]=t},Ma.defineMode("null",(function(){return{token:function(e){return e.skipToEnd()}}})),Ma.defineMIME("text/plain","null"),Ma.defineExtension=function(e,t){Ma.prototype[e]=t},Ma.defineDocExtension=function(e,t){Eo.prototype[e]=t},Ma.fromTextArea=function(e,t){if((t=t?F(t):{}).value=e.value,!t.tabindex&&e.tabIndex&&(t.tabindex=e.tabIndex),!t.placeholder&&e.placeholder&&(t.placeholder=e.placeholder),null==t.autofocus){var n=z();t.autofocus=n==e||null!=e.getAttribute("autofocus")&&n==document.body}function r(){e.value=l.getValue()}var i;if(e.form&&(fe(e.form,"submit",r),!t.leaveSubmitMethodAlone)){var o=e.form;i=o.submit;try{var a=o.submit=function(){r(),o.submit=i,o.submit(),o.submit=a}}catch(e){}}t.finishInit=function(n){n.save=r,n.getTextArea=function(){return e},n.toTextArea=function(){n.toTextArea=isNaN,r(),e.parentNode.removeChild(n.getWrapperElement()),e.style.display="",e.form&&(he(e.form,"submit",r),t.leaveSubmitMethodAlone||"function"!=typeof e.form.submit||(e.form.submit=i))}},e.style.display="none";var l=Ma((function(t){return e.parentNode.insertBefore(t,e.nextSibling)}),t);return l},function(e){e.off=he,e.on=fe,e.wheelEventPixels=xi,e.Doc=Eo,e.splitLines=Ee,e.countColumn=W,e.findColumn=V,e.isWordChar=J,e.Pass=B,e.signal=pe,e.Line=Kt,e.changeEnd=Li,e.scrollbarModel=qr,e.Pos=et,e.cmpPos=tt,e.modes=Ie,e.mimeModes=_e,e.resolveMode=We,e.getMode=Re,e.modeExtensions=He,e.extendMode=Be,e.copyState=je,e.startState=Ue,e.innerMode=qe,e.commands=ta,e.keyMap=qo,e.keyName=Xo,e.isModifierKey=$o,e.lookupKey=Ko,e.normalizeKeyMap=Vo,e.StringStream=Ve,e.SharedTextMarker=Mo,e.TextMarker=To,e.LineWidget=ko,e.e_preventDefault=be,e.e_stopPropagation=xe,e.e_stop=ke,e.addClass=P,e.contains=E,e.rmClass=L,e.keyNames=Ro}(Ma),Ma.version="5.58.1",Ma}()},function(e,t,n){!function(e){"use strict";e.defineMode("javascript",(function(t,n){var r,i,o=t.indentUnit,a=n.statementIndent,l=n.jsonld,s=n.json||l,c=n.typescript,u=n.wordCharacters||/[\w$\xa1-\uffff]/,f=function(){function e(e){return{type:e,style:"keyword"}}var t=e("keyword a"),n=e("keyword b"),r=e("keyword c"),i=e("keyword d"),o=e("operator"),a={type:"atom",style:"atom"};return{if:e("if"),while:t,with:t,else:n,do:n,try:n,finally:n,return:i,break:i,continue:i,new:e("new"),delete:r,void:r,throw:r,debugger:e("debugger"),var:e("var"),const:e("var"),let:e("var"),function:e("function"),catch:e("catch"),for:e("for"),switch:e("switch"),case:e("case"),default:e("default"),in:o,typeof:o,instanceof:o,true:a,false:a,null:a,undefined:a,NaN:a,Infinity:a,this:e("this"),class:e("class"),super:e("atom"),yield:r,export:e("export"),import:e("import"),extends:r,await:r}}(),d=/[+\-*&%=<>!?|~^@]/,h=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;function p(e,t,n){return r=e,i=n,t}function m(e,t){var n,r=e.next();if('"'==r||"'"==r)return t.tokenize=(n=r,function(e,t){var r,i=!1;if(l&&"@"==e.peek()&&e.match(h))return t.tokenize=m,p("jsonld-keyword","meta");for(;null!=(r=e.next())&&(r!=n||i);)i=!i&&"\\"==r;return i||(t.tokenize=m),p("string","string")}),t.tokenize(e,t);if("."==r&&e.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/))return p("number","number");if("."==r&&e.match(".."))return p("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(r))return p(r);if("="==r&&e.eat(">"))return p("=>","operator");if("0"==r&&e.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/))return p("number","number");if(/\d/.test(r))return e.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/),p("number","number");if("/"==r)return e.eat("*")?(t.tokenize=g,g(e,t)):e.eat("/")?(e.skipToEnd(),p("comment","comment")):$e(e,t,1)?(function(e){for(var t,n=!1,r=!1;null!=(t=e.next());){if(!n){if("/"==t&&!r)return;"["==t?r=!0:r&&"]"==t&&(r=!1)}n=!n&&"\\"==t}}(e),e.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/),p("regexp","string-2")):(e.eat("="),p("operator","operator",e.current()));if("`"==r)return t.tokenize=v,v(e,t);if("#"==r&&"!"==e.peek())return e.skipToEnd(),p("meta","meta");if("#"==r&&e.eatWhile(u))return p("variable","property");if("<"==r&&e.match("!--")||"-"==r&&e.match("->")&&!/\S/.test(e.string.slice(0,e.start)))return e.skipToEnd(),p("comment","comment");if(d.test(r))return">"==r&&t.lexical&&">"==t.lexical.type||(e.eat("=")?"!"!=r&&"="!=r||e.eat("="):/[<>*+\-|&?]/.test(r)&&(e.eat(r),">"==r&&e.eat(r))),"?"==r&&e.eat(".")?p("."):p("operator","operator",e.current());if(u.test(r)){e.eatWhile(u);var i=e.current();if("."!=t.lastType){if(f.propertyIsEnumerable(i)){var o=f[i];return p(o.type,o.style,i)}if("async"==i&&e.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/,!1))return p("async","keyword",i)}return p("variable","variable",i)}}function g(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=m;break}r="*"==n}return p("comment","comment")}function v(e,t){for(var n,r=!1;null!=(n=e.next());){if(!r&&("`"==n||"$"==n&&e.eat("{"))){t.tokenize=m;break}r=!r&&"\\"==n}return p("quasi","string-2",e.current())}function y(e,t){t.fatArrowAt&&(t.fatArrowAt=null);var n=e.string.indexOf("=>",e.start);if(!(n<0)){if(c){var r=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(e.string.slice(e.start,n));r&&(n=r.index)}for(var i=0,o=!1,a=n-1;a>=0;--a){var l=e.string.charAt(a),s="([{}])".indexOf(l);if(s>=0&&s<3){if(!i){++a;break}if(0==--i){"("==l&&(o=!0);break}}else if(s>=3&&s<6)++i;else if(u.test(l))o=!0;else if(/["'\/`]/.test(l))for(;;--a){if(0==a)return;if(e.string.charAt(a-1)==l&&"\\"!=e.string.charAt(a-2)){a--;break}}else if(o&&!i){++a;break}}o&&!i&&(t.fatArrowAt=a)}}var b={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0};function x(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.prev=i,this.info=o,null!=r&&(this.align=r)}function w(e,t){for(var n=e.localVars;n;n=n.next)if(n.name==t)return!0;for(var r=e.context;r;r=r.prev)for(n=r.vars;n;n=n.next)if(n.name==t)return!0}var k={state:null,column:null,marked:null,cc:null};function C(){for(var e=arguments.length-1;e>=0;e--)k.cc.push(arguments[e])}function S(){return C.apply(null,arguments),!0}function T(e,t){for(var n=t;n;n=n.next)if(n.name==e)return!0;return!1}function L(e){var t=k.state;if(k.marked="def",t.context)if("var"==t.lexical.info&&t.context&&t.context.block){var r=function e(t,n){if(n){if(n.block){var r=e(t,n.prev);return r?r==n.prev?n:new O(r,n.vars,!0):null}return T(t,n.vars)?n:new O(n.prev,new N(t,n.vars),!1)}return null}(e,t.context);if(null!=r)return void(t.context=r)}else if(!T(e,t.localVars))return void(t.localVars=new N(e,t.localVars));n.globalVars&&!T(e,t.globalVars)&&(t.globalVars=new N(e,t.globalVars))}function M(e){return"public"==e||"private"==e||"protected"==e||"abstract"==e||"readonly"==e}function O(e,t,n){this.prev=e,this.vars=t,this.block=n}function N(e,t){this.name=e,this.next=t}var A=new N("this",new N("arguments",null));function E(){k.state.context=new O(k.state.context,k.state.localVars,!1),k.state.localVars=A}function z(){k.state.context=new O(k.state.context,k.state.localVars,!0),k.state.localVars=null}function P(){k.state.localVars=k.state.context.vars,k.state.context=k.state.context.prev}function D(e,t){var n=function(){var n=k.state,r=n.indented;if("stat"==n.lexical.type)r=n.lexical.indented;else for(var i=n.lexical;i&&")"==i.type&&i.align;i=i.prev)r=i.indented;n.lexical=new x(r,k.stream.column(),e,null,n.lexical,t)};return n.lex=!0,n}function I(){var e=k.state;e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function _(e){return function t(n){return n==e?S():";"==e||"}"==n||")"==n||"]"==n?C():S(t)}}function F(e,t){return"var"==e?S(D("vardef",t),ye,_(";"),I):"keyword a"==e?S(D("form"),B,F,I):"keyword b"==e?S(D("form"),F,I):"keyword d"==e?k.stream.match(/^\s*$/,!1)?S():S(D("stat"),q,_(";"),I):"debugger"==e?S(_(";")):"{"==e?S(D("}"),z,oe,I,P):";"==e?S():"if"==e?("else"==k.state.lexical.info&&k.state.cc[k.state.cc.length-1]==I&&k.state.cc.pop()(),S(D("form"),B,F,I,Se)):"function"==e?S(Oe):"for"==e?S(D("form"),Te,F,I):"class"==e||c&&"interface"==t?(k.marked="keyword",S(D("form","class"==e?e:t),Pe,I)):"variable"==e?c&&"declare"==t?(k.marked="keyword",S(F)):c&&("module"==t||"enum"==t||"type"==t)&&k.stream.match(/^\s*\w/,!1)?(k.marked="keyword","enum"==t?S(Ve):"type"==t?S(Ae,_("operator"),ue,_(";")):S(D("form"),be,_("{"),D("}"),oe,I,I)):c&&"namespace"==t?(k.marked="keyword",S(D("form"),R,F,I)):c&&"abstract"==t?(k.marked="keyword",S(F)):S(D("stat"),Q):"switch"==e?S(D("form"),B,_("{"),D("}","switch"),z,oe,I,I,P):"case"==e?S(R,_(":")):"default"==e?S(_(":")):"catch"==e?S(D("form"),E,W,F,I,P):"export"==e?S(D("stat"),Fe,I):"import"==e?S(D("stat"),Re,I):"async"==e?S(F):"@"==t?S(R,F):C(D("stat"),R,_(";"),I)}function W(e){if("("==e)return S(Ee,_(")"))}function R(e,t){return j(e,t,!1)}function H(e,t){return j(e,t,!0)}function B(e){return"("!=e?C():S(D(")"),q,_(")"),I)}function j(e,t,n){if(k.state.fatArrowAt==k.stream.start){var r=n?X:G;if("("==e)return S(E,D(")"),re(Ee,")"),I,_("=>"),r,P);if("variable"==e)return C(E,be,_("=>"),r,P)}var i=n?V:U;return b.hasOwnProperty(e)?S(i):"function"==e?S(Oe,i):"class"==e||c&&"interface"==t?(k.marked="keyword",S(D("form"),ze,I)):"keyword c"==e||"async"==e?S(n?H:R):"("==e?S(D(")"),q,_(")"),I,i):"operator"==e||"spread"==e?S(n?H:R):"["==e?S(D("]"),Ue,I,i):"{"==e?ie(ee,"}",null,i):"quasi"==e?C(K,i):"new"==e?S(function(e){return function(t){return"."==t?S(e?Z:Y):"variable"==t&&c?S(me,e?V:U):C(e?H:R)}}(n)):"import"==e?S(R):S()}function q(e){return e.match(/[;\}\)\],]/)?C():C(R)}function U(e,t){return","==e?S(q):V(e,t,!1)}function V(e,t,n){var r=0==n?U:V,i=0==n?R:H;return"=>"==e?S(E,n?X:G,P):"operator"==e?/\+\+|--/.test(t)||c&&"!"==t?S(r):c&&"<"==t&&k.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/,!1)?S(D(">"),re(ue,">"),I,r):"?"==t?S(R,_(":"),i):S(i):"quasi"==e?C(K,r):";"!=e?"("==e?ie(H,")","call",r):"."==e?S(J,r):"["==e?S(D("]"),q,_("]"),I,r):c&&"as"==t?(k.marked="keyword",S(ue,r)):"regexp"==e?(k.state.lastType=k.marked="operator",k.stream.backUp(k.stream.pos-k.stream.start-1),S(i)):void 0:void 0}function K(e,t){return"quasi"!=e?C():"${"!=t.slice(t.length-2)?S(K):S(R,$)}function $(e){if("}"==e)return k.marked="string-2",k.state.tokenize=v,S(K)}function G(e){return y(k.stream,k.state),C("{"==e?F:R)}function X(e){return y(k.stream,k.state),C("{"==e?F:H)}function Y(e,t){if("target"==t)return k.marked="keyword",S(U)}function Z(e,t){if("target"==t)return k.marked="keyword",S(V)}function Q(e){return":"==e?S(I,F):C(U,_(";"),I)}function J(e){if("variable"==e)return k.marked="property",S()}function ee(e,t){return"async"==e?(k.marked="property",S(ee)):"variable"==e||"keyword"==k.style?(k.marked="property","get"==t||"set"==t?S(te):(c&&k.state.fatArrowAt==k.stream.start&&(n=k.stream.match(/^\s*:\s*/,!1))&&(k.state.fatArrowAt=k.stream.pos+n[0].length),S(ne))):"number"==e||"string"==e?(k.marked=l?"property":k.style+" property",S(ne)):"jsonld-keyword"==e?S(ne):c&&M(t)?(k.marked="keyword",S(ee)):"["==e?S(R,ae,_("]"),ne):"spread"==e?S(H,ne):"*"==t?(k.marked="keyword",S(ee)):":"==e?C(ne):void 0;var n}function te(e){return"variable"!=e?C(ne):(k.marked="property",S(Oe))}function ne(e){return":"==e?S(H):"("==e?C(Oe):void 0}function re(e,t,n){function r(i,o){if(n?n.indexOf(i)>-1:","==i){var a=k.state.lexical;return"call"==a.info&&(a.pos=(a.pos||0)+1),S((function(n,r){return n==t||r==t?C():C(e)}),r)}return i==t||o==t?S():n&&n.indexOf(";")>-1?C(e):S(_(t))}return function(n,i){return n==t||i==t?S():C(e,r)}}function ie(e,t,n){for(var r=3;r<arguments.length;r++)k.cc.push(arguments[r]);return S(D(t,n),re(e,t),I)}function oe(e){return"}"==e?S():C(F,oe)}function ae(e,t){if(c){if(":"==e)return S(ue);if("?"==t)return S(ae)}}function le(e,t){if(c&&(":"==e||"in"==t))return S(ue)}function se(e){if(c&&":"==e)return k.stream.match(/^\s*\w+\s+is\b/,!1)?S(R,ce,ue):S(ue)}function ce(e,t){if("is"==t)return k.marked="keyword",S()}function ue(e,t){return"keyof"==t||"typeof"==t||"infer"==t?(k.marked="keyword",S("typeof"==t?H:ue)):"variable"==e||"void"==t?(k.marked="type",S(pe)):"|"==t||"&"==t?S(ue):"string"==e||"number"==e||"atom"==e?S(pe):"["==e?S(D("]"),re(ue,"]",","),I,pe):"{"==e?S(D("}"),re(de,"}",",;"),I,pe):"("==e?S(re(he,")"),fe,pe):"<"==e?S(re(ue,">"),ue):void 0}function fe(e){if("=>"==e)return S(ue)}function de(e,t){return"variable"==e||"keyword"==k.style?(k.marked="property",S(de)):"?"==t||"number"==e||"string"==e?S(de):":"==e?S(ue):"["==e?S(_("variable"),le,_("]"),de):"("==e?C(Ne,de):void 0}function he(e,t){return"variable"==e&&k.stream.match(/^\s*[?:]/,!1)||"?"==t?S(he):":"==e?S(ue):"spread"==e?S(he):C(ue)}function pe(e,t){return"<"==t?S(D(">"),re(ue,">"),I,pe):"|"==t||"."==e||"&"==t?S(ue):"["==e?S(ue,_("]"),pe):"extends"==t||"implements"==t?(k.marked="keyword",S(ue)):"?"==t?S(ue,_(":"),ue):void 0}function me(e,t){if("<"==t)return S(D(">"),re(ue,">"),I,pe)}function ge(){return C(ue,ve)}function ve(e,t){if("="==t)return S(ue)}function ye(e,t){return"enum"==t?(k.marked="keyword",S(Ve)):C(be,ae,ke,Ce)}function be(e,t){return c&&M(t)?(k.marked="keyword",S(be)):"variable"==e?(L(t),S()):"spread"==e?S(be):"["==e?ie(we,"]"):"{"==e?ie(xe,"}"):void 0}function xe(e,t){return"variable"!=e||k.stream.match(/^\s*:/,!1)?("variable"==e&&(k.marked="property"),"spread"==e?S(be):"}"==e?C():"["==e?S(R,_("]"),_(":"),xe):S(_(":"),be,ke)):(L(t),S(ke))}function we(){return C(be,ke)}function ke(e,t){if("="==t)return S(H)}function Ce(e){if(","==e)return S(ye)}function Se(e,t){if("keyword b"==e&&"else"==t)return S(D("form","else"),F,I)}function Te(e,t){return"await"==t?S(Te):"("==e?S(D(")"),Le,I):void 0}function Le(e){return"var"==e?S(ye,Me):"variable"==e?S(Me):C(Me)}function Me(e,t){return")"==e?S():";"==e?S(Me):"in"==t||"of"==t?(k.marked="keyword",S(R,Me)):C(R,Me)}function Oe(e,t){return"*"==t?(k.marked="keyword",S(Oe)):"variable"==e?(L(t),S(Oe)):"("==e?S(E,D(")"),re(Ee,")"),I,se,F,P):c&&"<"==t?S(D(">"),re(ge,">"),I,Oe):void 0}function Ne(e,t){return"*"==t?(k.marked="keyword",S(Ne)):"variable"==e?(L(t),S(Ne)):"("==e?S(E,D(")"),re(Ee,")"),I,se,P):c&&"<"==t?S(D(">"),re(ge,">"),I,Ne):void 0}function Ae(e,t){return"keyword"==e||"variable"==e?(k.marked="type",S(Ae)):"<"==t?S(D(">"),re(ge,">"),I):void 0}function Ee(e,t){return"@"==t&&S(R,Ee),"spread"==e?S(Ee):c&&M(t)?(k.marked="keyword",S(Ee)):c&&"this"==e?S(ae,ke):C(be,ae,ke)}function ze(e,t){return"variable"==e?Pe(e,t):De(e,t)}function Pe(e,t){if("variable"==e)return L(t),S(De)}function De(e,t){return"<"==t?S(D(">"),re(ge,">"),I,De):"extends"==t||"implements"==t||c&&","==e?("implements"==t&&(k.marked="keyword"),S(c?ue:R,De)):"{"==e?S(D("}"),Ie,I):void 0}function Ie(e,t){return"async"==e||"variable"==e&&("static"==t||"get"==t||"set"==t||c&&M(t))&&k.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(k.marked="keyword",S(Ie)):"variable"==e||"keyword"==k.style?(k.marked="property",S(_e,Ie)):"number"==e||"string"==e?S(_e,Ie):"["==e?S(R,ae,_("]"),_e,Ie):"*"==t?(k.marked="keyword",S(Ie)):c&&"("==e?C(Ne,Ie):";"==e||","==e?S(Ie):"}"==e?S():"@"==t?S(R,Ie):void 0}function _e(e,t){if("?"==t)return S(_e);if(":"==e)return S(ue,ke);if("="==t)return S(H);var n=k.state.lexical.prev;return C(n&&"interface"==n.info?Ne:Oe)}function Fe(e,t){return"*"==t?(k.marked="keyword",S(qe,_(";"))):"default"==t?(k.marked="keyword",S(R,_(";"))):"{"==e?S(re(We,"}"),qe,_(";")):C(F)}function We(e,t){return"as"==t?(k.marked="keyword",S(_("variable"))):"variable"==e?C(H,We):void 0}function Re(e){return"string"==e?S():"("==e?C(R):C(He,Be,qe)}function He(e,t){return"{"==e?ie(He,"}"):("variable"==e&&L(t),"*"==t&&(k.marked="keyword"),S(je))}function Be(e){if(","==e)return S(He,Be)}function je(e,t){if("as"==t)return k.marked="keyword",S(He)}function qe(e,t){if("from"==t)return k.marked="keyword",S(R)}function Ue(e){return"]"==e?S():C(re(H,"]"))}function Ve(){return C(D("form"),be,_("{"),D("}"),re(Ke,"}"),I,I)}function Ke(){return C(be,ke)}function $e(e,t,n){return t.tokenize==m&&/^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(t.lastType)||"quasi"==t.lastType&&/\{\s*$/.test(e.string.slice(0,e.pos-(n||0)))}return P.lex=!0,I.lex=!0,{startState:function(e){var t={tokenize:m,lastType:"sof",cc:[],lexical:new x((e||0)-o,0,"block",!1),localVars:n.localVars,context:n.localVars&&new O(null,null,!1),indented:e||0};return n.globalVars&&"object"==typeof n.globalVars&&(t.globalVars=n.globalVars),t},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation(),y(e,t)),t.tokenize!=g&&e.eatSpace())return null;var n=t.tokenize(e,t);return"comment"==r?n:(t.lastType="operator"!=r||"++"!=i&&"--"!=i?r:"incdec",function(e,t,n,r,i){var o=e.cc;for(k.state=e,k.stream=i,k.marked=null,k.cc=o,k.style=t,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((o.length?o.pop():s?R:F)(n,r)){for(;o.length&&o[o.length-1].lex;)o.pop()();return k.marked?k.marked:"variable"==n&&w(e,r)?"variable-2":t}}(t,n,r,i,e))},indent:function(t,r){if(t.tokenize==g||t.tokenize==v)return e.Pass;if(t.tokenize!=m)return 0;var i,l=r&&r.charAt(0),s=t.lexical;if(!/^\s*else\b/.test(r))for(var c=t.cc.length-1;c>=0;--c){var u=t.cc[c];if(u==I)s=s.prev;else if(u!=Se)break}for(;("stat"==s.type||"form"==s.type)&&("}"==l||(i=t.cc[t.cc.length-1])&&(i==U||i==V)&&!/^[,\.=+\-*:?[\(]/.test(r));)s=s.prev;a&&")"==s.type&&"stat"==s.prev.type&&(s=s.prev);var f=s.type,h=l==f;return"vardef"==f?s.indented+("operator"==t.lastType||","==t.lastType?s.info.length+1:0):"form"==f&&"{"==l?s.indented:"form"==f?s.indented+o:"stat"==f?s.indented+(function(e,t){return"operator"==e.lastType||","==e.lastType||d.test(t.charAt(0))||/[,.]/.test(t.charAt(0))}(t,r)?a||o:0):"switch"!=s.info||h||0==n.doubleIndentSwitch?s.align?s.column+(h?0:1):s.indented+(h?0:o):s.indented+(/^(?:case|default)\b/.test(r)?o:2*o)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:s?null:"/*",blockCommentEnd:s?null:"*/",blockCommentContinue:s?null:" * ",lineComment:s?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:s?"json":"javascript",jsonldMode:l,jsonMode:s,expressionAllowed:$e,skipExpression:function(e){var t=e.cc[e.cc.length-1];t!=R&&t!=H||e.cc.pop()}}})),e.registerHelper("wordChars","javascript",/[\w$]/),e.defineMIME("text/javascript","javascript"),e.defineMIME("text/ecmascript","javascript"),e.defineMIME("application/javascript","javascript"),e.defineMIME("application/x-javascript","javascript"),e.defineMIME("application/ecmascript","javascript"),e.defineMIME("application/json",{name:"javascript",json:!0}),e.defineMIME("application/x-json",{name:"javascript",json:!0}),e.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),e.defineMIME("text/typescript",{name:"javascript",typescript:!0}),e.defineMIME("application/typescript",{name:"javascript",typescript:!0})}(n(0))},function(e,t,n){!function(e){"use strict";var t={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},n={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,allowMissingTagName:!1,caseFold:!1};e.defineMode("xml",(function(r,i){var o,a,l=r.indentUnit,s={},c=i.htmlMode?t:n;for(var u in c)s[u]=c[u];for(var u in i)s[u]=i[u];function f(e,t){function n(n){return t.tokenize=n,n(e,t)}var r=e.next();return"<"==r?e.eat("!")?e.eat("[")?e.match("CDATA[")?n(h("atom","]]>")):null:e.match("--")?n(h("comment","--\x3e")):e.match("DOCTYPE",!0,!0)?(e.eatWhile(/[\w\._\-]/),n(function e(t){return function(n,r){for(var i;null!=(i=n.next());){if("<"==i)return r.tokenize=e(t+1),r.tokenize(n,r);if(">"==i){if(1==t){r.tokenize=f;break}return r.tokenize=e(t-1),r.tokenize(n,r)}}return"meta"}}(1))):null:e.eat("?")?(e.eatWhile(/[\w\._\-]/),t.tokenize=h("meta","?>"),"meta"):(o=e.eat("/")?"closeTag":"openTag",t.tokenize=d,"tag bracket"):"&"==r?(e.eat("#")?e.eat("x")?e.eatWhile(/[a-fA-F\d]/)&&e.eat(";"):e.eatWhile(/[\d]/)&&e.eat(";"):e.eatWhile(/[\w\.\-:]/)&&e.eat(";"))?"atom":"error":(e.eatWhile(/[^&<]/),null)}function d(e,t){var n,r,i=e.next();if(">"==i||"/"==i&&e.eat(">"))return t.tokenize=f,o=">"==i?"endTag":"selfcloseTag","tag bracket";if("="==i)return o="equals",null;if("<"==i){t.tokenize=f,t.state=v,t.tagName=t.tagStart=null;var a=t.tokenize(e,t);return a?a+" tag error":"tag error"}return/[\'\"]/.test(i)?(t.tokenize=(n=i,(r=function(e,t){for(;!e.eol();)if(e.next()==n){t.tokenize=d;break}return"string"}).isInAttribute=!0,r),t.stringStartCol=e.column(),t.tokenize(e,t)):(e.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function h(e,t){return function(n,r){for(;!n.eol();){if(n.match(t)){r.tokenize=f;break}n.next()}return e}}function p(e,t,n){this.prev=e.context,this.tagName=t,this.indent=e.indented,this.startOfLine=n,(s.doNotIndent.hasOwnProperty(t)||e.context&&e.context.noIndent)&&(this.noIndent=!0)}function m(e){e.context&&(e.context=e.context.prev)}function g(e,t){for(var n;;){if(!e.context)return;if(n=e.context.tagName,!s.contextGrabbers.hasOwnProperty(n)||!s.contextGrabbers[n].hasOwnProperty(t))return;m(e)}}function v(e,t,n){return"openTag"==e?(n.tagStart=t.column(),y):"closeTag"==e?b:v}function y(e,t,n){return"word"==e?(n.tagName=t.current(),a="tag",k):s.allowMissingTagName&&"endTag"==e?(a="tag bracket",k(e,0,n)):(a="error",y)}function b(e,t,n){if("word"==e){var r=t.current();return n.context&&n.context.tagName!=r&&s.implicitlyClosed.hasOwnProperty(n.context.tagName)&&m(n),n.context&&n.context.tagName==r||!1===s.matchClosing?(a="tag",x):(a="tag error",w)}return s.allowMissingTagName&&"endTag"==e?(a="tag bracket",x(e,0,n)):(a="error",w)}function x(e,t,n){return"endTag"!=e?(a="error",x):(m(n),v)}function w(e,t,n){return a="error",x(e,0,n)}function k(e,t,n){if("word"==e)return a="attribute",C;if("endTag"==e||"selfcloseTag"==e){var r=n.tagName,i=n.tagStart;return n.tagName=n.tagStart=null,"selfcloseTag"==e||s.autoSelfClosers.hasOwnProperty(r)?g(n,r):(g(n,r),n.context=new p(n,r,i==n.indented)),v}return a="error",k}function C(e,t,n){return"equals"==e?S:(s.allowMissing||(a="error"),k(e,0,n))}function S(e,t,n){return"string"==e?T:"word"==e&&s.allowUnquoted?(a="string",k):(a="error",k(e,0,n))}function T(e,t,n){return"string"==e?T:k(e,0,n)}return f.isInText=!0,{startState:function(e){var t={tokenize:f,state:v,indented:e||0,tagName:null,tagStart:null,context:null};return null!=e&&(t.baseIndent=e),t},token:function(e,t){if(!t.tagName&&e.sol()&&(t.indented=e.indentation()),e.eatSpace())return null;o=null;var n=t.tokenize(e,t);return(n||o)&&"comment"!=n&&(a=null,t.state=t.state(o||n,e,t),a&&(n="error"==a?n+" error":a)),n},indent:function(t,n,r){var i=t.context;if(t.tokenize.isInAttribute)return t.tagStart==t.indented?t.stringStartCol+1:t.indented+l;if(i&&i.noIndent)return e.Pass;if(t.tokenize!=d&&t.tokenize!=f)return r?r.match(/^(\s*)/)[0].length:0;if(t.tagName)return!1!==s.multilineTagIndentPastTag?t.tagStart+t.tagName.length+2:t.tagStart+l*(s.multilineTagIndentFactor||1);if(s.alignCDATA&&/<!\[CDATA\[/.test(n))return 0;var o=n&&/^<(\/)?([\w_:\.-]*)/.exec(n);if(o&&o[1])for(;i;){if(i.tagName==o[2]){i=i.prev;break}if(!s.implicitlyClosed.hasOwnProperty(i.tagName))break;i=i.prev}else if(o)for(;i;){var a=s.contextGrabbers[i.tagName];if(!a||!a.hasOwnProperty(o[2]))break;i=i.prev}for(;i&&i.prev&&!i.startOfLine;)i=i.prev;return i?i.indent+l:t.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"\x3c!--",blockCommentEnd:"--\x3e",configuration:s.htmlMode?"html":"xml",helperType:s.htmlMode?"html":"xml",skipAttribute:function(e){e.state==S&&(e.state=k)},xmlCurrentTag:function(e){return e.tagName?{name:e.tagName,close:"closeTag"==e.type}:null},xmlCurrentContext:function(e){for(var t=[],n=e.context;n;n=n.prev)n.tagName&&t.push(n.tagName);return t.reverse()}}})),e.defineMIME("text/xml","xml"),e.defineMIME("application/xml","xml"),e.mimeModes.hasOwnProperty("text/html")||e.defineMIME("text/html",{name:"xml",htmlMode:!0})}(n(0))},function(e,t,n){!function(e){function t(t,n,r){var i,o=t.getWrapperElement();return(i=o.appendChild(document.createElement("div"))).className=r?"CodeMirror-dialog CodeMirror-dialog-bottom":"CodeMirror-dialog CodeMirror-dialog-top","string"==typeof n?i.innerHTML=n:i.appendChild(n),e.addClass(o,"dialog-opened"),i}function n(e,t){e.state.currentNotificationClose&&e.state.currentNotificationClose(),e.state.currentNotificationClose=t}e.defineExtension("openDialog",(function(r,i,o){o||(o={}),n(this,null);var a=t(this,r,o.bottom),l=!1,s=this;function c(t){if("string"==typeof t)f.value=t;else{if(l)return;l=!0,e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a),s.focus(),o.onClose&&o.onClose(a)}}var u,f=a.getElementsByTagName("input")[0];return f?(f.focus(),o.value&&(f.value=o.value,!1!==o.selectValueOnOpen&&f.select()),o.onInput&&e.on(f,"input",(function(e){o.onInput(e,f.value,c)})),o.onKeyUp&&e.on(f,"keyup",(function(e){o.onKeyUp(e,f.value,c)})),e.on(f,"keydown",(function(t){o&&o.onKeyDown&&o.onKeyDown(t,f.value,c)||((27==t.keyCode||!1!==o.closeOnEnter&&13==t.keyCode)&&(f.blur(),e.e_stop(t),c()),13==t.keyCode&&i(f.value,t))})),!1!==o.closeOnBlur&&e.on(f,"blur",c)):(u=a.getElementsByTagName("button")[0])&&(e.on(u,"click",(function(){c(),s.focus()})),!1!==o.closeOnBlur&&e.on(u,"blur",c),u.focus()),c})),e.defineExtension("openConfirm",(function(r,i,o){n(this,null);var a=t(this,r,o&&o.bottom),l=a.getElementsByTagName("button"),s=!1,c=this,u=1;function f(){s||(s=!0,e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a),c.focus())}l[0].focus();for(var d=0;d<l.length;++d){var h=l[d];!function(t){e.on(h,"click",(function(n){e.e_preventDefault(n),f(),t&&t(c)}))}(i[d]),e.on(h,"blur",(function(){--u,setTimeout((function(){u<=0&&f()}),200)})),e.on(h,"focus",(function(){++u}))}})),e.defineExtension("openNotification",(function(r,i){n(this,c);var o,a=t(this,r,i&&i.bottom),l=!1,s=i&&void 0!==i.duration?i.duration:5e3;function c(){l||(l=!0,clearTimeout(o),e.rmClass(a.parentNode,"dialog-opened"),a.parentNode.removeChild(a))}return e.on(a,"click",(function(t){e.e_preventDefault(t),c()})),s&&(o=setTimeout(c,s)),c}))}(n(0))},function(e,t,n){!function(e){"use strict";var t,n,r=e.Pos;function i(e,t){for(var n=function(e){var t=e.flags;return null!=t?t:(e.ignoreCase?"i":"")+(e.global?"g":"")+(e.multiline?"m":"")}(e),r=n,i=0;i<t.length;i++)-1==r.indexOf(t.charAt(i))&&(r+=t.charAt(i));return n==r?e:new RegExp(e.source,r)}function o(e,t,n){t=i(t,"g");for(var o=n.line,a=n.ch,l=e.lastLine();o<=l;o++,a=0){t.lastIndex=a;var s=e.getLine(o),c=t.exec(s);if(c)return{from:r(o,c.index),to:r(o,c.index+c[0].length),match:c}}}function a(e,t,n){if(!function(e){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(e.source)}(t))return o(e,t,n);t=i(t,"gm");for(var a,l=1,s=n.line,c=e.lastLine();s<=c;){for(var u=0;u<l&&!(s>c);u++){var f=e.getLine(s++);a=null==a?f:a+"\n"+f}l*=2,t.lastIndex=n.ch;var d=t.exec(a);if(d){var h=a.slice(0,d.index).split("\n"),p=d[0].split("\n"),m=n.line+h.length-1,g=h[h.length-1].length;return{from:r(m,g),to:r(m+p.length-1,1==p.length?g+p[0].length:p[p.length-1].length),match:d}}}}function l(e,t){for(var n,r=0;;){t.lastIndex=r;var i=t.exec(e);if(!i)return n;if((r=(n=i).index+(n[0].length||1))==e.length)return n}}function s(e,t,n){t=i(t,"g");for(var o=n.line,a=n.ch,s=e.firstLine();o>=s;o--,a=-1){var c=e.getLine(o);a>-1&&(c=c.slice(0,a));var u=l(c,t);if(u)return{from:r(o,u.index),to:r(o,u.index+u[0].length),match:u}}}function c(e,t,n){t=i(t,"gm");for(var o,a=1,s=n.line,c=e.firstLine();s>=c;){for(var u=0;u<a;u++){var f=e.getLine(s--);o=null==o?f.slice(0,n.ch):f+"\n"+o}a*=2;var d=l(o,t);if(d){var h=o.slice(0,d.index).split("\n"),p=d[0].split("\n"),m=s+h.length,g=h[h.length-1].length;return{from:r(m,g),to:r(m+p.length-1,1==p.length?g+p[0].length:p[p.length-1].length),match:d}}}}function u(e,t,n,r){if(e.length==t.length)return n;for(var i=0,o=n+Math.max(0,e.length-t.length);;){if(i==o)return i;var a=i+o>>1,l=r(e.slice(0,a)).length;if(l==n)return a;l>n?o=a:i=a+1}}function f(e,i,o,a){if(!i.length)return null;var l=a?t:n,s=l(i).split(/\r|\n\r?/);e:for(var c=o.line,f=o.ch,d=e.lastLine()+1-s.length;c<=d;c++,f=0){var h=e.getLine(c).slice(f),p=l(h);if(1==s.length){var m=p.indexOf(s[0]);if(-1==m)continue e;return o=u(h,p,m,l)+f,{from:r(c,u(h,p,m,l)+f),to:r(c,u(h,p,m+s[0].length,l)+f)}}var g=p.length-s[0].length;if(p.slice(g)==s[0]){for(var v=1;v<s.length-1;v++)if(l(e.getLine(c+v))!=s[v])continue e;var y=e.getLine(c+s.length-1),b=l(y),x=s[s.length-1];if(b.slice(0,x.length)==x)return{from:r(c,u(h,p,g,l)+f),to:r(c+s.length-1,u(y,b,x.length,l))}}}}function d(e,i,o,a){if(!i.length)return null;var l=a?t:n,s=l(i).split(/\r|\n\r?/);e:for(var c=o.line,f=o.ch,d=e.firstLine()-1+s.length;c>=d;c--,f=-1){var h=e.getLine(c);f>-1&&(h=h.slice(0,f));var p=l(h);if(1==s.length){var m=p.lastIndexOf(s[0]);if(-1==m)continue e;return{from:r(c,u(h,p,m,l)),to:r(c,u(h,p,m+s[0].length,l))}}var g=s[s.length-1];if(p.slice(0,g.length)==g){var v=1;for(o=c-s.length+1;v<s.length-1;v++)if(l(e.getLine(o+v))!=s[v])continue e;var y=e.getLine(c+1-s.length),b=l(y);if(b.slice(b.length-s[0].length)==s[0])return{from:r(c+1-s.length,u(y,b,y.length-s[0].length,l)),to:r(c,u(h,p,g.length,l))}}}}function h(e,t,n,l){var u;this.atOccurrence=!1,this.doc=e,n=n?e.clipPos(n):r(0,0),this.pos={from:n,to:n},"object"==typeof l?u=l.caseFold:(u=l,l=null),"string"==typeof t?(null==u&&(u=!1),this.matches=function(n,r){return(n?d:f)(e,t,r,u)}):(t=i(t,"gm"),l&&!1===l.multiline?this.matches=function(n,r){return(n?s:o)(e,t,r)}:this.matches=function(n,r){return(n?c:a)(e,t,r)})}String.prototype.normalize?(t=function(e){return e.normalize("NFD").toLowerCase()},n=function(e){return e.normalize("NFD")}):(t=function(e){return e.toLowerCase()},n=function(e){return e}),h.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(t){for(var n=this.matches(t,this.doc.clipPos(t?this.pos.from:this.pos.to));n&&0==e.cmpPos(n.from,n.to);)t?n.from.ch?n.from=r(n.from.line,n.from.ch-1):n=n.from.line==this.doc.firstLine()?null:this.matches(t,this.doc.clipPos(r(n.from.line-1))):n.to.ch<this.doc.getLine(n.to.line).length?n.to=r(n.to.line,n.to.ch+1):n=n.to.line==this.doc.lastLine()?null:this.matches(t,r(n.to.line+1,0));if(n)return this.pos=n,this.atOccurrence=!0,this.pos.match||!0;var i=r(t?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:i,to:i},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(t,n){if(this.atOccurrence){var i=e.splitLines(t);this.doc.replaceRange(i,this.pos.from,this.pos.to,n),this.pos.to=r(this.pos.from.line+i.length-1,i[i.length-1].length+(1==i.length?this.pos.from.ch:0))}}},e.defineExtension("getSearchCursor",(function(e,t,n){return new h(this.doc,e,t,n)})),e.defineDocExtension("getSearchCursor",(function(e,t,n){return new h(this,e,t,n)})),e.defineExtension("selectMatches",(function(t,n){for(var r=[],i=this.getSearchCursor(t,this.getCursor("from"),n);i.findNext()&&!(e.cmpPos(i.to(),this.getCursor("to"))>0);)r.push({anchor:i.from(),head:i.to()});r.length&&this.setSelections(r,0)}))}(n(0))},function(e,t,n){!function(e){"use strict";function t(e){for(var t={},n=0;n<e.length;++n)t[e[n].toLowerCase()]=!0;return t}e.defineMode("css",(function(t,n){var r=n.inline;n.propertyKeywords||(n=e.resolveMode("text/css"));var i,o,a=t.indentUnit,l=n.tokenHooks,s=n.documentTypes||{},c=n.mediaTypes||{},u=n.mediaFeatures||{},f=n.mediaValueKeywords||{},d=n.propertyKeywords||{},h=n.nonStandardPropertyKeywords||{},p=n.fontProperties||{},m=n.counterDescriptors||{},g=n.colorKeywords||{},v=n.valueKeywords||{},y=n.allowNested,b=n.lineComment,x=!0===n.supportsAtComponent;function w(e,t){return i=t,e}function k(e,t){var n=e.next();if(l[n]){var r=l[n](e,t);if(!1!==r)return r}return"@"==n?(e.eatWhile(/[\w\\\-]/),w("def",e.current())):"="==n||("~"==n||"|"==n)&&e.eat("=")?w(null,"compare"):'"'==n||"'"==n?(t.tokenize=C(n),t.tokenize(e,t)):"#"==n?(e.eatWhile(/[\w\\\-]/),w("atom","hash")):"!"==n?(e.match(/^\s*\w*/),w("keyword","important")):/\d/.test(n)||"."==n&&e.eat(/\d/)?(e.eatWhile(/[\w.%]/),w("number","unit")):"-"!==n?/[,+>*\/]/.test(n)?w(null,"select-op"):"."==n&&e.match(/^-?[_a-z][_a-z0-9-]*/i)?w("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(n)?w(null,n):e.match(/[\w-.]+(?=\()/)?(/^(url(-prefix)?|domain|regexp)$/.test(e.current().toLowerCase())&&(t.tokenize=S),w("variable callee","variable")):/[\w\\\-]/.test(n)?(e.eatWhile(/[\w\\\-]/),w("property","word")):w(null,null):/[\d.]/.test(e.peek())?(e.eatWhile(/[\w.%]/),w("number","unit")):e.match(/^-[\w\\\-]*/)?(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?w("variable-2","variable-definition"):w("variable-2","variable")):e.match(/^\w+-/)?w("meta","meta"):void 0}function C(e){return function(t,n){for(var r,i=!1;null!=(r=t.next());){if(r==e&&!i){")"==e&&t.backUp(1);break}i=!i&&"\\"==r}return(r==e||!i&&")"!=e)&&(n.tokenize=null),w("string","string")}}function S(e,t){return e.next(),e.match(/\s*[\"\')]/,!1)?t.tokenize=null:t.tokenize=C(")"),w(null,"(")}function T(e,t,n){this.type=e,this.indent=t,this.prev=n}function L(e,t,n,r){return e.context=new T(n,t.indentation()+(!1===r?0:a),e.context),n}function M(e){return e.context.prev&&(e.context=e.context.prev),e.context.type}function O(e,t,n){return E[n.context.type](e,t,n)}function N(e,t,n,r){for(var i=r||1;i>0;i--)n.context=n.context.prev;return O(e,t,n)}function A(e){var t=e.current().toLowerCase();o=v.hasOwnProperty(t)?"atom":g.hasOwnProperty(t)?"keyword":"variable"}var E={top:function(e,t,n){if("{"==e)return L(n,t,"block");if("}"==e&&n.context.prev)return M(n);if(x&&/@component/i.test(e))return L(n,t,"atComponentBlock");if(/^@(-moz-)?document$/i.test(e))return L(n,t,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/i.test(e))return L(n,t,"atBlock");if(/^@(font-face|counter-style)/i.test(e))return n.stateArg=e,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(e))return"keyframes";if(e&&"@"==e.charAt(0))return L(n,t,"at");if("hash"==e)o="builtin";else if("word"==e)o="tag";else{if("variable-definition"==e)return"maybeprop";if("interpolation"==e)return L(n,t,"interpolation");if(":"==e)return"pseudo";if(y&&"("==e)return L(n,t,"parens")}return n.context.type},block:function(e,t,n){if("word"==e){var r=t.current().toLowerCase();return d.hasOwnProperty(r)?(o="property","maybeprop"):h.hasOwnProperty(r)?(o="string-2","maybeprop"):y?(o=t.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(o+=" error","maybeprop")}return"meta"==e?"block":y||"hash"!=e&&"qualifier"!=e?E.top(e,t,n):(o="error","block")},maybeprop:function(e,t,n){return":"==e?L(n,t,"prop"):O(e,t,n)},prop:function(e,t,n){if(";"==e)return M(n);if("{"==e&&y)return L(n,t,"propBlock");if("}"==e||"{"==e)return N(e,t,n);if("("==e)return L(n,t,"parens");if("hash"!=e||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(t.current())){if("word"==e)A(t);else if("interpolation"==e)return L(n,t,"interpolation")}else o+=" error";return"prop"},propBlock:function(e,t,n){return"}"==e?M(n):"word"==e?(o="property","maybeprop"):n.context.type},parens:function(e,t,n){return"{"==e||"}"==e?N(e,t,n):")"==e?M(n):"("==e?L(n,t,"parens"):"interpolation"==e?L(n,t,"interpolation"):("word"==e&&A(t),"parens")},pseudo:function(e,t,n){return"meta"==e?"pseudo":"word"==e?(o="variable-3",n.context.type):O(e,t,n)},documentTypes:function(e,t,n){return"word"==e&&s.hasOwnProperty(t.current())?(o="tag",n.context.type):E.atBlock(e,t,n)},atBlock:function(e,t,n){if("("==e)return L(n,t,"atBlock_parens");if("}"==e||";"==e)return N(e,t,n);if("{"==e)return M(n)&&L(n,t,y?"block":"top");if("interpolation"==e)return L(n,t,"interpolation");if("word"==e){var r=t.current().toLowerCase();o="only"==r||"not"==r||"and"==r||"or"==r?"keyword":c.hasOwnProperty(r)?"attribute":u.hasOwnProperty(r)?"property":f.hasOwnProperty(r)?"keyword":d.hasOwnProperty(r)?"property":h.hasOwnProperty(r)?"string-2":v.hasOwnProperty(r)?"atom":g.hasOwnProperty(r)?"keyword":"error"}return n.context.type},atComponentBlock:function(e,t,n){return"}"==e?N(e,t,n):"{"==e?M(n)&&L(n,t,y?"block":"top",!1):("word"==e&&(o="error"),n.context.type)},atBlock_parens:function(e,t,n){return")"==e?M(n):"{"==e||"}"==e?N(e,t,n,2):E.atBlock(e,t,n)},restricted_atBlock_before:function(e,t,n){return"{"==e?L(n,t,"restricted_atBlock"):"word"==e&&"@counter-style"==n.stateArg?(o="variable","restricted_atBlock_before"):O(e,t,n)},restricted_atBlock:function(e,t,n){return"}"==e?(n.stateArg=null,M(n)):"word"==e?(o="@font-face"==n.stateArg&&!p.hasOwnProperty(t.current().toLowerCase())||"@counter-style"==n.stateArg&&!m.hasOwnProperty(t.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},keyframes:function(e,t,n){return"word"==e?(o="variable","keyframes"):"{"==e?L(n,t,"top"):O(e,t,n)},at:function(e,t,n){return";"==e?M(n):"{"==e||"}"==e?N(e,t,n):("word"==e?o="tag":"hash"==e&&(o="builtin"),"at")},interpolation:function(e,t,n){return"}"==e?M(n):"{"==e||";"==e?N(e,t,n):("word"==e?o="variable":"variable"!=e&&"("!=e&&")"!=e&&(o="error"),"interpolation")}};return{startState:function(e){return{tokenize:null,state:r?"block":"top",stateArg:null,context:new T(r?"block":"top",e||0,null)}},token:function(e,t){if(!t.tokenize&&e.eatSpace())return null;var n=(t.tokenize||k)(e,t);return n&&"object"==typeof n&&(i=n[1],n=n[0]),o=n,"comment"!=i&&(t.state=E[t.state](i,e,t)),o},indent:function(e,t){var n=e.context,r=t&&t.charAt(0),i=n.indent;return"prop"!=n.type||"}"!=r&&")"!=r||(n=n.prev),n.prev&&("}"!=r||"block"!=n.type&&"top"!=n.type&&"interpolation"!=n.type&&"restricted_atBlock"!=n.type?(")"!=r||"parens"!=n.type&&"atBlock_parens"!=n.type)&&("{"!=r||"at"!=n.type&&"atBlock"!=n.type)||(i=Math.max(0,n.indent-a)):i=(n=n.prev).indent),i},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:b,fold:"brace"}}));var n=["domain","regexp","url","url-prefix"],r=t(n),i=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],o=t(i),a=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],l=t(a),s=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],c=t(s),u=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","mix-blend-mode","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],f=t(u),d=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],h=t(d),p=t(["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"]),m=t(["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"]),g=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],v=t(g),y=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],b=t(y),x=n.concat(i).concat(a).concat(s).concat(u).concat(d).concat(g).concat(y);function w(e,t){for(var n,r=!1;null!=(n=e.next());){if(r&&"/"==n){t.tokenize=null;break}r="*"==n}return["comment","comment"]}e.registerHelper("hintWords","css",x),e.defineMIME("text/css",{documentTypes:r,mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,fontProperties:p,counterDescriptors:m,colorKeywords:v,valueKeywords:b,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=w,w(e,t))}},name:"css"}),e.defineMIME("text/x-scss",{mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,colorKeywords:v,valueKeywords:b,fontProperties:p,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=w,w(e,t)):["operator","operator"]},":":function(e){return!!e.match(/\s*\{/,!1)&&[null,null]},$:function(e){return e.match(/^[\w-]+/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(e){return!!e.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),e.defineMIME("text/x-less",{mediaTypes:o,mediaFeatures:l,mediaValueKeywords:c,propertyKeywords:f,nonStandardPropertyKeywords:h,colorKeywords:v,valueKeywords:b,fontProperties:p,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(e,t){return e.eat("/")?(e.skipToEnd(),["comment","comment"]):e.eat("*")?(t.tokenize=w,w(e,t)):["operator","operator"]},"@":function(e){return e.eat("{")?[null,"interpolation"]:!e.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i,!1)&&(e.eatWhile(/[\w\\\-]/),e.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),e.defineMIME("text/x-gss",{documentTypes:r,mediaTypes:o,mediaFeatures:l,propertyKeywords:f,nonStandardPropertyKeywords:h,fontProperties:p,counterDescriptors:m,colorKeywords:v,valueKeywords:b,supportsAtComponent:!0,tokenHooks:{"/":function(e,t){return!!e.eat("*")&&(t.tokenize=w,w(e,t))}},name:"css",helperType:"gss"})}(n(0))},function(e,t,n){!function(e){"use strict";function t(t,n,i,o){if(i&&i.call){var a=i;i=null}else a=r(t,i,"rangeFinder");"number"==typeof n&&(n=e.Pos(n,0));var l=r(t,i,"minFoldSize");function s(e){var r=a(t,n);if(!r||r.to.line-r.from.line<l)return null;for(var i=t.findMarksAt(r.from),s=0;s<i.length;++s)if(i[s].__isFold&&"fold"!==o){if(!e)return null;r.cleared=!0,i[s].clear()}return r}var c=s(!0);if(r(t,i,"scanUp"))for(;!c&&n.line>t.firstLine();)n=e.Pos(n.line-1,0),c=s(!1);if(c&&!c.cleared&&"unfold"!==o){var u=function(e,t){var n=r(e,t,"widget");if("string"==typeof n){var i=document.createTextNode(n);(n=document.createElement("span")).appendChild(i),n.className="CodeMirror-foldmarker"}else n&&(n=n.cloneNode(!0));return n}(t,i);e.on(u,"mousedown",(function(t){f.clear(),e.e_preventDefault(t)}));var f=t.markText(c.from,c.to,{replacedWith:u,clearOnEnter:r(t,i,"clearOnEnter"),__isFold:!0});f.on("clear",(function(n,r){e.signal(t,"unfold",t,n,r)})),e.signal(t,"fold",t,c.from,c.to)}}e.newFoldFunction=function(e,n){return function(r,i){t(r,i,{rangeFinder:e,widget:n})}},e.defineExtension("foldCode",(function(e,n,r){t(this,e,n,r)})),e.defineExtension("isFolded",(function(e){for(var t=this.findMarksAt(e),n=0;n<t.length;++n)if(t[n].__isFold)return!0})),e.commands.toggleFold=function(e){e.foldCode(e.getCursor())},e.commands.fold=function(e){e.foldCode(e.getCursor(),null,"fold")},e.commands.unfold=function(e){e.foldCode(e.getCursor(),null,"unfold")},e.commands.foldAll=function(t){t.operation((function(){for(var n=t.firstLine(),r=t.lastLine();n<=r;n++)t.foldCode(e.Pos(n,0),null,"fold")}))},e.commands.unfoldAll=function(t){t.operation((function(){for(var n=t.firstLine(),r=t.lastLine();n<=r;n++)t.foldCode(e.Pos(n,0),null,"unfold")}))},e.registerHelper("fold","combine",(function(){var e=Array.prototype.slice.call(arguments,0);return function(t,n){for(var r=0;r<e.length;++r){var i=e[r](t,n);if(i)return i}}})),e.registerHelper("fold","auto",(function(e,t){for(var n=e.getHelpers(t,"fold"),r=0;r<n.length;r++){var i=n[r](e,t);if(i)return i}}));var n={rangeFinder:e.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};function r(e,t,r){if(t&&void 0!==t[r])return t[r];var i=e.options.foldOptions;return i&&void 0!==i[r]?i[r]:n[r]}e.defineOption("foldOptions",null),e.defineExtension("foldOption",(function(e,t){return r(this,e,t)}))}(n(0))},function(e,t,n){n(3),n(4),n(8),n(9),n(10),n(11),n(12),n(1),n(2),n(5),n(13),n(14),n(15),n(16),n(17),n(18),n(19),n(20),n(22),n(23),n(24),n(6),n(25),n(26),n(27),n(28),n(29),n(30),e.exports=n(0)},function(e,t,n){!function(e){"use strict";function t(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function n(e){return e.state.search||(e.state.search=new t)}function r(e){return"string"==typeof e&&e==e.toLowerCase()}function i(e,t,n){return e.getSearchCursor(t,n,{caseFold:r(t),multiline:!0})}function o(e,t,n,r,i){e.openDialog?e.openDialog(t,i,{value:r,selectValueOnOpen:!0}):i(prompt(n,r))}function a(e){return e.replace(/\\([nrt\\])/g,(function(e,t){return"n"==t?"\n":"r"==t?"\r":"t"==t?"\t":"\\"==t?"\\":e}))}function l(e){var t=e.match(/^\/(.*)\/([a-z]*)$/);if(t)try{e=new RegExp(t[1],-1==t[2].indexOf("i")?"":"i")}catch(e){}else e=a(e);return("string"==typeof e?""==e:e.test(""))&&(e=/x^/),e}var s;function c(e,t,n){t.queryText=n,t.query=l(n),e.removeOverlay(t.overlay,r(t.query)),t.overlay=function(e,t){return"string"==typeof e?e=new RegExp(e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),t?"gi":"g"):e.global||(e=new RegExp(e.source,e.ignoreCase?"gi":"g")),{token:function(t){e.lastIndex=t.pos;var n=e.exec(t.string);if(n&&n.index==t.pos)return t.pos+=n[0].length||1,"searching";n?t.pos=n.index:t.skipToEnd()}}}(t.query,r(t.query)),e.addOverlay(t.overlay),e.showMatchesOnScrollbar&&(t.annotate&&(t.annotate.clear(),t.annotate=null),t.annotate=e.showMatchesOnScrollbar(t.query,r(t.query)))}function u(t,r,i,a){if(!s){let e=t.getWrapperElement().ownerDocument,n=e.createElement("input");n.type="search",n.placeholder=t.l10n("findCmd.promptMessage"),n.style.marginInlineStart="1em",n.style.marginInlineEnd="1em",n.style.flexGrow="1",n.addEventListener("focus",()=>n.select()),(s=e.createElement("div")).appendChild(n),s.style.display="flex"}var l=n(t);if(l.query)return f(t,r);var u=t.getSelection()||l.lastQuery;if(u instanceof RegExp&&"x^"==u.source&&(u=null),i&&t.openDialog){var h=null,p=function(n,r){e.e_stop(r),n&&(n!=l.queryText&&(c(t,l,n),l.posFrom=l.posTo=t.getCursor()),h&&(h.style.opacity=1),f(t,r.shiftKey,(function(e,n){var r;n.line<3&&document.querySelector&&(r=t.display.wrapper.querySelector(".CodeMirror-dialog"))&&r.getBoundingClientRect().bottom-4>t.cursorCoords(n,"window").top&&((h=r).style.opacity=.4)})))};!function(e,t,n,r,i){e.openDialog(t,r,{value:n,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){d(e)},onKeyDown:i})}(t,s,u,p,(function(r,i){var o=e.keyName(r),a=t.getOption("extraKeys"),l=a&&a[o]||e.keyMap[t.getOption("keyMap")][o];"findNext"==l||"findPrev"==l||"findPersistentNext"==l||"findPersistentPrev"==l?(e.e_stop(r),c(t,n(t),i),t.execCommand(l)):"find"!=l&&"findPersistent"!=l||(e.e_stop(r),p(i,r))})),a&&u&&(c(t,l,u),f(t,r))}else o(t,s,"Search for:",u,(function(e){e&&!l.query&&t.operation((function(){c(t,l,e),l.posFrom=l.posTo=t.getCursor(),f(t,r)}))}))}function f(t,r,o){t.operation((function(){var a=n(t),l=i(t,a.query,r?a.posFrom:a.posTo);(l.find(r)||(l=i(t,a.query,r?e.Pos(t.lastLine()):e.Pos(t.firstLine(),0))).find(r))&&(t.setSelection(l.from(),l.to()),t.scrollIntoView({from:l.from(),to:l.to()},20),a.posFrom=l.from(),a.posTo=l.to(),o&&o(l.from(),l.to()))}))}function d(e){e.operation((function(){var t=n(e);t.lastQuery=t.query,t.query&&(t.query=t.queryText=null,e.removeOverlay(t.overlay),t.annotate&&(t.annotate.clear(),t.annotate=null))}))}function h(e,t,n){e.operation((function(){for(var r=i(e,t);r.findNext();)if("string"!=typeof t){var o=e.getRange(r.from(),r.to()).match(t);r.replace(n.replace(/\$(\d)/g,(function(e,t){return o[t]})))}else r.replace(n)}))}function p(e,t){if(e.getOption("readOnly"))return;var r=e.getSelection()||n(e).lastQuery;let s=e.getWrapperElement().ownerDocument,c=s.createElement("span");c.classList.add("CodeMirror-search-label"),c.textContent=t?"Replace all:":"Replace:";let u=s.createDocumentFragment();u.appendChild(c.cloneNode(!0));let f=s.createElement("input");f.setAttribute("type","text"),f.setAttribute("style","width: 10em"),f.classList.add("CodeMirror-search-field"),u.appendChild(f);let p=s.createElement("span");p.setAttribute("style","color: #888"),p.classList.add("CodeMirror-search-hint"),p.textContent="(Use /re/ syntax for regexp search)",u.appendChild(p),o(e,u,c,r,(function(n){if(!n)return;n=l(n);let r=s.createDocumentFragment(),u=c.cloneNode(!1);u.textContent="With:",r.appendChild(u);let f=s.createElement("input");f.setAttribute("type","text"),f.setAttribute("style","width: 10em"),f.classList.add("CodeMirror-search-field"),r.appendChild(f),o(e,r,"Replace with:","",(function(r){if(r=a(r),t)h(e,n,r);else{d(e);var o=i(e,n,e.getCursor("from")),l=function(){var t,a=o.from();if(!(t=o.findNext())&&(o=i(e,n),!(t=o.findNext())||a&&o.from().line==a.line&&o.from().ch==a.ch))return;e.setSelection(o.from(),o.to()),e.scrollIntoView({from:o.from(),to:o.to()});let f=s.createDocumentFragment(),d=c.cloneNode(!1);d.textContent="Replace?",f.appendChild(d);let p=s.createElement("button");p.textContent="Yes",f.appendChild(p);let m=s.createElement("button");m.textContent="No",f.appendChild(m);let g=s.createElement("button");g.textContent="All",f.appendChild(g);let v=s.createElement("button");v.textContent="Stop",f.appendChild(v),function(e,t,n,r){e.openConfirm?e.openConfirm(t,r):confirm(n)&&r[0]()}(e,f,"Replace?",[function(){u(t)},l,function(){h(e,n,r)}])},u=function(e){o.replace("string"==typeof n?r:r.replace(/\$(\d)/g,(function(t,n){return e[n]}))),l()};l()}}))}))}e.commands.find=function(e){d(e),u(e)},e.commands.findPersistent=function(e){d(e),u(e,!1,!0)},e.commands.findPersistentNext=function(e){u(e,!1,!0,!0)},e.commands.findPersistentPrev=function(e){u(e,!0,!0,!0)},e.commands.findNext=u,e.commands.findPrev=function(e){u(e,!0)},e.commands.clearSearch=d,e.commands.replace=p,e.commands.replaceAll=function(e){p(e,!0)}}(n(0),n(4),n(3))},function(e,t,n){!function(e){var t=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),n=e.Pos,r={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<","<":">>",">":"<<"};function i(e){return e&&e.bracketRegex||/[(){}[\]]/}function o(e,t,o){var l=e.getLineHandle(t.line),s=t.ch-1,c=o&&o.afterCursor;null==c&&(c=/(^| )cm-fat-cursor($| )/.test(e.getWrapperElement().className));var u=i(o),f=!c&&s>=0&&u.test(l.text.charAt(s))&&r[l.text.charAt(s)]||u.test(l.text.charAt(s+1))&&r[l.text.charAt(++s)];if(!f)return null;var d=">"==f.charAt(1)?1:-1;if(o&&o.strict&&d>0!=(s==t.ch))return null;var h=e.getTokenTypeAt(n(t.line,s+1)),p=a(e,n(t.line,s+(d>0?1:0)),d,h||null,o);return null==p?null:{from:n(t.line,s),to:p&&p.pos,match:p&&p.ch==f.charAt(0),forward:d>0}}function a(e,t,o,a,l){for(var s=l&&l.maxScanLineLength||1e4,c=l&&l.maxScanLines||1e3,u=[],f=i(l),d=o>0?Math.min(t.line+c,e.lastLine()+1):Math.max(e.firstLine()-1,t.line-c),h=t.line;h!=d;h+=o){var p=e.getLine(h);if(p){var m=o>0?0:p.length-1,g=o>0?p.length:-1;if(!(p.length>s))for(h==t.line&&(m=t.ch-(o<0?1:0));m!=g;m+=o){var v=p.charAt(m);if(f.test(v)&&(void 0===a||e.getTokenTypeAt(n(h,m+1))==a)){var y=r[v];if(y&&">"==y.charAt(1)==o>0)u.push(v);else{if(!u.length)return{pos:n(h,m),ch:v};u.pop()}}}}}return h-o!=(o>0?e.lastLine():e.firstLine())&&null}function l(e,r,i){for(var a=e.state.matchBrackets.maxHighlightLineLength||1e3,l=[],s=e.listSelections(),c=0;c<s.length;c++){var u=s[c].empty()&&o(e,s[c].head,i);if(u&&e.getLine(u.from.line).length<=a){var f=u.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";l.push(e.markText(u.from,n(u.from.line,u.from.ch+1),{className:f})),u.to&&e.getLine(u.to.line).length<=a&&l.push(e.markText(u.to,n(u.to.line,u.to.ch+1),{className:f}))}}if(l.length){t&&e.state.focused&&e.focus();var d=function(){e.operation((function(){for(var e=0;e<l.length;e++)l[e].clear()}))};if(!r)return d;setTimeout(d,800)}}function s(e){e.operation((function(){e.state.matchBrackets.currentlyHighlighted&&(e.state.matchBrackets.currentlyHighlighted(),e.state.matchBrackets.currentlyHighlighted=null),e.state.matchBrackets.currentlyHighlighted=l(e,!1,e.state.matchBrackets)}))}e.defineOption("matchBrackets",!1,(function(t,n,r){r&&r!=e.Init&&(t.off("cursorActivity",s),t.state.matchBrackets&&t.state.matchBrackets.currentlyHighlighted&&(t.state.matchBrackets.currentlyHighlighted(),t.state.matchBrackets.currentlyHighlighted=null)),n&&(t.state.matchBrackets="object"==typeof n?n:{},t.on("cursorActivity",s))})),e.defineExtension("matchBrackets",(function(){l(this,!0)})),e.defineExtension("findMatchingBracket",(function(e,t,n){return(n||"boolean"==typeof t)&&(n?(n.strict=t,t=n):t=t?{strict:!0}:null),o(this,e,t)})),e.defineExtension("scanForBracket",(function(e,t,n,r){return a(this,e,t,n,r)}))}(n(0))},function(e,t,n){!function(e){var t={pairs:"()[]{}''\"\"",closeBefore:")]}'\":;>",triples:"",explode:"[]{}"},n=e.Pos;function r(e,n){return"pairs"==n&&"string"==typeof e?e:"object"==typeof e&&null!=e[n]?e[n]:t[n]}e.defineOption("autoCloseBrackets",!1,(function(t,n,a){a&&a!=e.Init&&(t.removeKeyMap(i),t.state.closeBrackets=null),n&&(o(r(n,"pairs")),t.state.closeBrackets=n,t.addKeyMap(i))}));var i={Backspace:function(t){var i=l(t);if(!i||t.getOption("disableInput"))return e.Pass;for(var o=r(i,"pairs"),a=t.listSelections(),c=0;c<a.length;c++){if(!a[c].empty())return e.Pass;var u=s(t,a[c].head);if(!u||o.indexOf(u)%2!=0)return e.Pass}for(c=a.length-1;c>=0;c--){var f=a[c].head;t.replaceRange("",n(f.line,f.ch-1),n(f.line,f.ch+1),"+delete")}},Enter:function(t){var n=l(t),i=n&&r(n,"explode");if(!i||t.getOption("disableInput"))return e.Pass;for(var o=t.listSelections(),a=0;a<o.length;a++){if(!o[a].empty())return e.Pass;var c=s(t,o[a].head);if(!c||i.indexOf(c)%2!=0)return e.Pass}t.operation((function(){var e=t.lineSeparator()||"\n";t.replaceSelection(e+e,null),t.execCommand("goCharLeft"),o=t.listSelections();for(var n=0;n<o.length;n++){var r=o[n].head.line;t.indentLine(r,null,!0),t.indentLine(r+1,null,!0)}}))}};function o(e){for(var t=0;t<e.length;t++){var n=e.charAt(t),r="'"+n+"'";i[r]||(i[r]=a(n))}}function a(t){return function(i){return function(t,i){var o=l(t);if(!o||t.getOption("disableInput"))return e.Pass;var a=r(o,"pairs"),s=a.indexOf(i);if(-1==s)return e.Pass;for(var u,f=r(o,"closeBefore"),d=r(o,"triples"),h=a.charAt(s+1)==i,p=t.listSelections(),m=s%2==0,g=0;g<p.length;g++){var v,y=p[g],b=y.head,x=t.getRange(b,n(b.line,b.ch+1));if(m&&!y.empty())v="surround";else if(!h&&m||x!=i)if(h&&b.ch>1&&d.indexOf(i)>=0&&t.getRange(n(b.line,b.ch-2),b)==i+i){if(b.ch>2&&/\bstring/.test(t.getTokenTypeAt(n(b.line,b.ch-2))))return e.Pass;v="addFour"}else if(h){var w=0==b.ch?" ":t.getRange(n(b.line,b.ch-1),b);if(e.isWordChar(x)||w==i||e.isWordChar(w))return e.Pass;v="both"}else{if(!m||!(0===x.length||/\s/.test(x)||f.indexOf(x)>-1))return e.Pass;v="both"}else v=h&&c(t,b)?"both":d.indexOf(i)>=0&&t.getRange(b,n(b.line,b.ch+3))==i+i+i?"skipThree":"skip";if(u){if(u!=v)return e.Pass}else u=v}var k=s%2?a.charAt(s-1):i,C=s%2?i:a.charAt(s+1);t.operation((function(){if("skip"==u)t.execCommand("goCharRight");else if("skipThree"==u)for(var r=0;r<3;r++)t.execCommand("goCharRight");else if("surround"==u){var i=t.getSelections();for(r=0;r<i.length;r++)i[r]=k+i[r]+C;for(t.replaceSelections(i,"around"),i=t.listSelections().slice(),r=0;r<i.length;r++)i[r]=(o=i[r],a=void 0,a=e.cmpPos(o.anchor,o.head)>0,{anchor:new n(o.anchor.line,o.anchor.ch+(a?-1:1)),head:new n(o.head.line,o.head.ch+(a?1:-1))});t.setSelections(i)}else"both"==u?(t.replaceSelection(k+C,null),t.triggerElectric(k+C),t.execCommand("goCharLeft")):"addFour"==u&&(t.replaceSelection(k+k+k+k,"before"),t.execCommand("goCharRight"));var o,a}))}(i,t)}}function l(e){var t=e.state.closeBrackets;return!t||t.override?t:e.getModeAt(e.getCursor()).closeBrackets||t}function s(e,t){var r=e.getRange(n(t.line,t.ch-1),n(t.line,t.ch+1));return 2==r.length?r:null}function c(e,t){var r=e.getTokenAt(n(t.line,t.ch+1));return/\bstring/.test(r.type)&&r.start==t.ch&&(0==t.ch||!/\bstring/.test(e.getTokenTypeAt(t)))}o(t.pairs+"`")}(n(0))},function(e,t,n){!function(e){"use strict";var t={},n=/[^\s\u00a0]/,r=e.Pos;function i(e){var t=e.search(n);return-1==t?0:t}function o(e,t){var n=e.getMode();return!1!==n.useInnerComments&&n.innerMode?e.getModeAt(t):n}e.commands.toggleComment=function(e){e.toggleComment()},e.defineExtension("toggleComment",(function(e){e||(e=t);for(var n=1/0,i=this.listSelections(),o=null,a=i.length-1;a>=0;a--){var l=i[a].from(),s=i[a].to();l.line>=n||(s.line>=n&&(s=r(n,0)),n=l.line,null==o?this.uncomment(l,s,e)?o="un":(this.lineComment(l,s,e),o="line"):"un"==o?this.uncomment(l,s,e):this.lineComment(l,s,e))}})),e.defineExtension("lineComment",(function(e,a,l){l||(l=t);var s=this,c=o(s,e),u=s.getLine(e.line);if(null!=u&&(f=e,d=u,!/\bstring\b/.test(s.getTokenTypeAt(r(f.line,0)))||/^[\'\"\`]/.test(d))){var f,d,h=l.lineComment||c.lineComment;if(h){var p=Math.min(0!=a.ch||a.line==e.line?a.line+1:a.line,s.lastLine()+1),m=null==l.padding?" ":l.padding,g=l.commentBlankLines||e.line==a.line;s.operation((function(){if(l.indent){for(var t=null,o=e.line;o<p;++o){var a=(c=s.getLine(o)).slice(0,i(c));(null==t||t.length>a.length)&&(t=a)}for(o=e.line;o<p;++o){var c=s.getLine(o),u=t.length;(g||n.test(c))&&(c.slice(0,u)!=t&&(u=i(c)),s.replaceRange(t+h+m,r(o,0),r(o,u)))}}else for(o=e.line;o<p;++o)(g||n.test(s.getLine(o)))&&s.replaceRange(h+m,r(o,0))}))}else(l.blockCommentStart||c.blockCommentStart)&&(l.fullLines=!0,s.blockComment(e,a,l))}})),e.defineExtension("blockComment",(function(e,i,a){a||(a=t);var l=this,s=o(l,e),c=a.blockCommentStart||s.blockCommentStart,u=a.blockCommentEnd||s.blockCommentEnd;if(c&&u){if(!/\bcomment\b/.test(l.getTokenTypeAt(r(e.line,0)))){var f=Math.min(i.line,l.lastLine());f!=e.line&&0==i.ch&&n.test(l.getLine(f))&&--f;var d=null==a.padding?" ":a.padding;e.line>f||l.operation((function(){if(0!=a.fullLines){var t=n.test(l.getLine(f));l.replaceRange(d+u,r(f)),l.replaceRange(c+d,r(e.line,0));var o=a.blockCommentLead||s.blockCommentLead;if(null!=o)for(var h=e.line+1;h<=f;++h)(h!=f||t)&&l.replaceRange(o+d,r(h,0))}else l.replaceRange(u,i),l.replaceRange(c,e)}))}}else(a.lineComment||s.lineComment)&&0!=a.fullLines&&l.lineComment(e,i,a)})),e.defineExtension("uncomment",(function(e,i,a){a||(a=t);var l,s=this,c=o(s,e),u=Math.min(0!=i.ch||i.line==e.line?i.line:i.line-1,s.lastLine()),f=Math.min(e.line,u),d=a.lineComment||c.lineComment,h=[],p=null==a.padding?" ":a.padding;e:if(d){for(var m=f;m<=u;++m){var g=s.getLine(m),v=g.indexOf(d);if(v>-1&&!/comment/.test(s.getTokenTypeAt(r(m,v+1)))&&(v=-1),-1==v&&n.test(g))break e;if(v>-1&&n.test(g.slice(0,v)))break e;h.push(g)}if(s.operation((function(){for(var e=f;e<=u;++e){var t=h[e-f],n=t.indexOf(d),i=n+d.length;n<0||(t.slice(i,i+p.length)==p&&(i+=p.length),l=!0,s.replaceRange("",r(e,n),r(e,i)))}})),l)return!0}var y=a.blockCommentStart||c.blockCommentStart,b=a.blockCommentEnd||c.blockCommentEnd;if(!y||!b)return!1;var x=a.blockCommentLead||c.blockCommentLead,w=s.getLine(f),k=w.indexOf(y);if(-1==k)return!1;var C=u==f?w:s.getLine(u),S=C.indexOf(b,u==f?k+y.length:0),T=r(f,k+1),L=r(u,S+1);if(-1==S||!/comment/.test(s.getTokenTypeAt(T))||!/comment/.test(s.getTokenTypeAt(L))||s.getRange(T,L,"\n").indexOf(b)>-1)return!1;var M=w.lastIndexOf(y,e.ch),O=-1==M?-1:w.slice(0,e.ch).indexOf(b,M+y.length);if(-1!=M&&-1!=O&&O+b.length!=e.ch)return!1;O=C.indexOf(b,i.ch);var N=C.slice(i.ch).lastIndexOf(y,O-i.ch);return M=-1==O||-1==N?-1:i.ch+N,(-1==O||-1==M||M==i.ch)&&(s.operation((function(){s.replaceRange("",r(u,S-(p&&C.slice(S-p.length,S)==p?p.length:0)),r(u,S+b.length));var e=k+y.length;if(p&&w.slice(e,e+p.length)==p&&(e+=p.length),s.replaceRange("",r(f,k),r(f,e)),x)for(var t=f+1;t<=u;++t){var i=s.getLine(t),o=i.indexOf(x);if(-1!=o&&!n.test(i.slice(0,o))){var a=o+x.length;p&&i.slice(a,a+p.length)==p&&(a+=p.length),s.replaceRange("",r(t,o),r(t,a))}}})),!0)}))}(n(0))},function(e,t,n){!function(e){e.inputStyles.accessibleTextArea=class extends e.inputStyles.textarea{init(e){super.init(e),this.textarea.addEventListener("compositionstart",this._onCompositionStart.bind(this))}_onCompositionStart(){if(this.textarea.selectionEnd===this.textarea.value.length)return;this.textarea.value=this.textarea.value.substring(0,this.textarea.selectionEnd);const e=this.textarea.value.length;this.textarea.setSelectionRange(e,e),this.prevInput=this.textarea.value}reset(e){if(e||this.contextMenuPending||this.composing||this.cm.somethingSelected())return void super.reset(e);const t=this.cm.getCursor();let n,r;if(this.cm.options.lineWrapping){const e=this.cm.charCoords(t,"page").top;n=this.cm.coordsChar({left:-1/0,top:e}),r=this.cm.coordsChar({left:1/0,top:e})}else{const e=1e3*Math.floor(t.ch/1e3);n={ch:e,line:t.line},r={ch:e+1e3,line:t.line}}this.textarea.value=this.cm.getRange(n,r);const i=t.ch-n.ch;this.textarea.setSelectionRange(i,i),this.prevInput=this.textarea.value}poll(){if(this.contextMenuPending||this.composing)return super.poll();const e=this.textarea.value;let t=0;const n=Math.min(this.prevInput.length,e.length);for(;t<n&&this.prevInput[t]===e[t];)++t;let r=0;for(;r<n-t&&this.prevInput[this.prevInput.length-r-1]===e[e.length-r-1];)++r;const i=this.textarea;this.textarea=document.createElement("textarea"),this.textarea.value=e.substring(t,e.length-r),this.textarea.setSelectionRange(i.selectionStart-t,i.selectionEnd-t),this.prevInput="";const o=super.poll();return this.prevInput=e,this.textarea=i,o}}}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("clojure",(function(t){var n=["false","nil","true"],r=[".","catch","def","do","if","monitor-enter","monitor-exit","new","quote","recur","set!","throw","try","var"],i=["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","cast","cat","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"];e.registerHelper("hintWords","clojure",[].concat(n,r,i));var o=g(n),a=g(r),l=g(i),s=g(["->","->>","as->","binding","bound-fn","case","catch","comment","cond","cond->","cond->>","condp","def","definterface","defmethod","defn","defmacro","defprotocol","defrecord","defstruct","deftype","do","doseq","dotimes","doto","extend","extend-protocol","extend-type","fn","for","future","if","if-let","if-not","if-some","let","letfn","locking","loop","ns","proxy","reify","struct-map","some->","some->>","try","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn"]),c=/^(?:[\\\[\]\s"(),;@^`{}~]|$)/,u=/^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/,f=/^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/,d=/^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;function h(e,t){if(e.eatSpace()||e.eat(","))return["space",null];if(e.match(u))return[null,"number"];if(e.match(f))return[null,"string-2"];if(e.eat(/^"/))return(t.tokenize=p)(e,t);if(e.eat(/^[(\[{]/))return["open","bracket"];if(e.eat(/^[)\]}]/))return["close","bracket"];if(e.eat(/^;/))return e.skipToEnd(),["space","comment"];if(e.eat(/^[#'@^`~]/))return[null,"meta"];var n=e.match(d),r=n&&n[0];return r?"comment"===r&&"("===t.lastToken?(t.tokenize=m)(e,t):v(r,o)||":"===r.charAt(0)?["symbol","atom"]:v(r,a)||v(r,l)?["symbol","keyword"]:"("===t.lastToken?["symbol","builtin"]:["symbol","variable"]:(e.next(),e.eatWhile((function(e){return!v(e,c)})),[null,"error"])}function p(e,t){for(var n,r=!1;n=e.next();){if('"'===n&&!r){t.tokenize=h;break}r=!r&&"\\"===n}return[null,"string"]}function m(e,t){for(var n,r=1;n=e.next();)if(")"===n&&r--,"("===n&&r++,0===r){e.backUp(1),t.tokenize=h;break}return["space","comment"]}function g(e){for(var t={},n=0;n<e.length;++n)t[e[n]]=!0;return t}function v(e,t){return t instanceof RegExp?t.test(e):t instanceof Object?t.propertyIsEnumerable(e):void 0}return{startState:function(){return{ctx:{prev:null,start:0,indentTo:0},lastToken:null,tokenize:h}},token:function(e,n){e.sol()&&"number"!=typeof n.ctx.indentTo&&(n.ctx.indentTo=n.ctx.start+1);var r=n.tokenize(e,n),i=r[0],o=r[1],a=e.current();return"space"!==i&&("("===n.lastToken&&null===n.ctx.indentTo?"symbol"===i&&v(a,s)?n.ctx.indentTo=n.ctx.start+t.indentUnit:n.ctx.indentTo="next":"next"===n.ctx.indentTo&&(n.ctx.indentTo=e.column()),n.lastToken=a),"open"===i?n.ctx={prev:n.ctx,start:e.column(),indentTo:null}:"close"===i&&(n.ctx=n.ctx.prev||n.ctx),o},indent:function(e){var t=e.ctx.indentTo;return"number"==typeof t?t:e.ctx.start+1},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),e.defineMIME("text/x-clojure","clojure"),e.defineMIME("text/x-clojurescript","clojure"),e.defineMIME("application/edn","clojure")}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("haxe",(function(e,t){var n=e.indentUnit;function r(e){return{type:e,style:"keyword"}}var i,o=r("keyword a"),a=r("keyword b"),l=r("keyword c"),s=r("operator"),c={type:"atom",style:"atom"},u={type:"attribute",style:"attribute"},f=r("typedef"),d={if:o,while:o,else:a,do:a,try:a,return:l,break:l,continue:l,new:l,throw:l,var:r("var"),inline:u,static:u,using:r("import"),public:u,private:u,cast:r("cast"),import:r("import"),macro:r("macro"),function:r("function"),catch:r("catch"),untyped:r("untyped"),callback:r("cb"),for:r("for"),switch:r("switch"),case:r("case"),default:r("default"),in:s,never:r("property_access"),trace:r("trace"),class:f,abstract:f,enum:f,interface:f,typedef:f,extends:f,implements:f,dynamic:f,true:c,false:c,null:c},h=/[+\-*&%=<>!?|]/;function p(e,t,n){return t.tokenize=n,n(e,t)}function m(e,t){for(var n,r=!1;null!=(n=e.next());){if(n==t&&!r)return!0;r=!r&&"\\"==n}}function g(e,t,n){return f=e,i=n,t}function v(e,t){var n=e.next();if('"'==n||"'"==n)return p(e,t,(r=n,function(e,t){return m(e,r)&&(t.tokenize=v),g("string","string")}));if(/[\[\]{}\(\),;\:\.]/.test(n))return g(n);if("0"==n&&e.eat(/x/i))return e.eatWhile(/[\da-f]/i),g("number","number");if(/\d/.test(n)||"-"==n&&e.eat(/\d/))return e.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/),g("number","number");if(t.reAllowed&&"~"==n&&e.eat(/\//))return m(e,"/"),e.eatWhile(/[gimsu]/),g("regexp","string-2");if("/"==n)return e.eat("*")?p(e,t,y):e.eat("/")?(e.skipToEnd(),g("comment","comment")):(e.eatWhile(h),g("operator",null,e.current()));if("#"==n)return e.skipToEnd(),g("conditional","meta");if("@"==n)return e.eat(/:/),e.eatWhile(/[\w_]/),g("metadata","meta");if(h.test(n))return e.eatWhile(h),g("operator",null,e.current());if(/[A-Z]/.test(n))return e.eatWhile(/[\w_<>]/),g("type","variable-3",i=e.current());e.eatWhile(/[\w_]/);var r,i=e.current(),o=d.propertyIsEnumerable(i)&&d[i];return o&&t.kwAllowed?g(o.type,o.style,i):g("variable","variable",i)}function y(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=v;break}r="*"==n}return g("comment","comment")}var b={atom:!0,number:!0,variable:!0,string:!0,regexp:!0};function x(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.prev=i,this.info=o,null!=r&&(this.align=r)}function w(e,t){for(var n=e.localVars;n;n=n.next)if(n.name==t)return!0}function k(e,t){if(/[a-z]/.test(t.charAt(0)))return!1;for(var n=e.importedtypes.length,r=0;r<n;r++)if(e.importedtypes[r]==t)return!0}function C(e){for(var t=S.state,n=t.importedtypes;n;n=n.next)if(n.name==e)return;t.importedtypes={name:e,next:t.importedtypes}}var S={state:null,column:null,marked:null,cc:null};function T(){for(var e=arguments.length-1;e>=0;e--)S.cc.push(arguments[e])}function L(){return T.apply(null,arguments),!0}function M(e,t){for(var n=t;n;n=n.next)if(n.name==e)return!0;return!1}function O(e){var t=S.state;if(t.context){if(S.marked="def",M(e,t.localVars))return;t.localVars={name:e,next:t.localVars}}else if(t.globalVars){if(M(e,t.globalVars))return;t.globalVars={name:e,next:t.globalVars}}}var N={name:"this",next:null};function A(){S.state.context||(S.state.localVars=N),S.state.context={prev:S.state.context,vars:S.state.localVars}}function E(){S.state.localVars=S.state.context.vars,S.state.context=S.state.context.prev}function z(e,t){var n=function(){var n=S.state;n.lexical=new x(n.indented,S.stream.column(),e,null,n.lexical,t)};return n.lex=!0,n}function P(){var e=S.state;e.lexical.prev&&(")"==e.lexical.type&&(e.indented=e.lexical.indented),e.lexical=e.lexical.prev)}function D(e){return function t(n){return n==e?L():";"==e?T():L(t)}}function I(e){return"@"==e?L(H):"var"==e?L(z("vardef"),X,D(";"),P):"keyword a"==e?L(z("form"),_,I,P):"keyword b"==e?L(z("form"),I,P):"{"==e?L(z("}"),A,G,P,E):";"==e?L():"attribute"==e?L(R):"function"==e?L(J):"for"==e?L(z("form"),D("("),z(")"),Z,D(")"),P,I,P):"variable"==e?L(z("stat"),U):"switch"==e?L(z("form"),_,z("}","switch"),D("{"),G,P,P):"case"==e?L(_,D(":")):"default"==e?L(D(":")):"catch"==e?L(z("form"),A,D("("),re,D(")"),I,P,E):"import"==e?L(j,D(";")):"typedef"==e?L(q):T(z("stat"),_,D(";"),P)}function _(e){return b.hasOwnProperty(e)||"type"==e?L(W):"function"==e?L(J):"keyword c"==e?L(F):"("==e?L(z(")"),F,D(")"),P,W):"operator"==e?L(_):"["==e?L(z("]"),$(F,"]"),P,W):"{"==e?L(z("}"),$(K,"}"),P,W):L()}function F(e){return e.match(/[;\}\)\],]/)?T():T(_)}function W(e,t){return"operator"==e&&/\+\+|--/.test(t)?L(W):"operator"==e||":"==e?L(_):";"!=e?"("==e?L(z(")"),$(_,")"),P,W):"."==e?L(V,W):"["==e?L(z("]"),_,D("]"),P,W):void 0:void 0}function R(e){return"attribute"==e?L(R):"function"==e?L(J):"var"==e?L(X):void 0}function H(e){return":"==e||"variable"==e?L(H):"("==e?L(z(")"),$(B,")"),P,I):void 0}function B(e){if("variable"==e)return L()}function j(e,t){return"variable"==e&&/[A-Z]/.test(t.charAt(0))?(C(t),L()):"variable"==e||"property"==e||"."==e||"*"==t?L(j):void 0}function q(e,t){return"variable"==e&&/[A-Z]/.test(t.charAt(0))?(C(t),L()):"type"==e&&/[A-Z]/.test(t.charAt(0))?L():void 0}function U(e){return":"==e?L(P,I):T(W,D(";"),P)}function V(e){if("variable"==e)return S.marked="property",L()}function K(e){if("variable"==e&&(S.marked="property"),b.hasOwnProperty(e))return L(D(":"),_)}function $(e,t){function n(r){return","==r?L(e,n):r==t?L():L(D(t))}return function(r){return r==t?L():T(e,n)}}function G(e){return"}"==e?L():T(I,G)}function X(e,t){return"variable"==e?(O(t),L(ee,Y)):L()}function Y(e,t){return"="==t?L(_,Y):","==e?L(X):void 0}function Z(e,t){return"variable"==e?(O(t),L(Q,_)):T()}function Q(e,t){if("in"==t)return L()}function J(e,t){return"variable"==e||"type"==e?(O(t),L(J)):"new"==t?L(J):"("==e?L(z(")"),A,$(re,")"),P,ee,I,E):void 0}function ee(e){if(":"==e)return L(te)}function te(e){return"type"==e||"variable"==e?L():"{"==e?L(z("}"),$(ne,"}"),P):void 0}function ne(e){if("variable"==e)return L(ee)}function re(e,t){if("variable"==e)return O(t),L(ee)}return E.lex=!0,P.lex=!0,{startState:function(e){var r={tokenize:v,reAllowed:!0,kwAllowed:!0,cc:[],lexical:new x((e||0)-n,0,"block",!1),localVars:t.localVars,importedtypes:["Int","Float","String","Void","Std","Bool","Dynamic","Array"],context:t.localVars&&{vars:t.localVars},indented:0};return t.globalVars&&"object"==typeof t.globalVars&&(r.globalVars=t.globalVars),r},token:function(e,t){if(e.sol()&&(t.lexical.hasOwnProperty("align")||(t.lexical.align=!1),t.indented=e.indentation()),e.eatSpace())return null;var n=t.tokenize(e,t);return"comment"==f?n:(t.reAllowed=!("operator"!=f&&"keyword c"!=f&&!f.match(/^[\[{}\(,;:]$/)),t.kwAllowed="."!=f,function(e,t,n,r,i){var o=e.cc;for(S.state=e,S.stream=i,S.marked=null,S.cc=o,e.lexical.hasOwnProperty("align")||(e.lexical.align=!0);;)if((o.length?o.pop():I)(n,r)){for(;o.length&&o[o.length-1].lex;)o.pop()();return S.marked?S.marked:"variable"==n&&w(e,r)?"variable-2":"variable"==n&&k(e,r)?"variable-3":t}}(t,n,f,i,e))},indent:function(e,t){if(e.tokenize!=v)return 0;var r=t&&t.charAt(0),i=e.lexical;"stat"==i.type&&"}"==r&&(i=i.prev);var o=i.type,a=r==o;return"vardef"==o?i.indented+4:"form"==o&&"{"==r?i.indented:"stat"==o||"form"==o?i.indented+n:"switch"!=i.info||a?i.align?i.column+(a?0:1):i.indented+(a?0:n):i.indented+(/^(?:case|default)\b/.test(t)?n:2*n)},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),e.defineMIME("text/x-haxe","haxe"),e.defineMode("hxml",(function(){return{startState:function(){return{define:!1,inString:!1}},token:function(e,t){var n=e.peek(),r=e.sol();if("#"==n)return e.skipToEnd(),"comment";if(r&&"-"==n){var i="variable-2";return e.eat(/-/),"-"==e.peek()&&(e.eat(/-/),i="keyword a"),"D"==e.peek()&&(e.eat(/[D]/),i="keyword c",t.define=!0),e.eatWhile(/[A-Z]/i),i}return n=e.peek(),0==t.inString&&"'"==n&&(t.inString=!0,e.next()),1==t.inString?(e.skipTo("'")||e.skipToEnd(),"'"==e.peek()&&(e.next(),t.inString=!1),"string"):(e.next(),null)},lineComment:"#"}})),e.defineMIME("text/x-hxml","hxml")}(n(0))},function(e,t,n){!function(e){"use strict";var t={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]},n={};function r(e,t){var r=e.match(function(e){var t=n[e];return t||(n[e]=new RegExp("\\s+"+e+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*"))}(t));return r?/^\s*(.*?)\s*$/.exec(r[2])[1]:""}function i(e,t){return new RegExp((t?"^":"")+"</s*"+e+"s*>","i")}function o(e,t){for(var n in e)for(var r=t[n]||(t[n]=[]),i=e[n],o=i.length-1;o>=0;o--)r.unshift(i[o])}e.defineMode("htmlmixed",(function(n,a){var l=e.getMode(n,{name:"xml",htmlMode:!0,multilineTagIndentFactor:a.multilineTagIndentFactor,multilineTagIndentPastTag:a.multilineTagIndentPastTag}),s={},c=a&&a.tags,u=a&&a.scriptTypes;if(o(t,s),c&&o(c,s),u)for(var f=u.length-1;f>=0;f--)s.script.unshift(["type",u[f].matches,u[f].mode]);function d(t,o){var a,c=l.token(t,o.htmlState),u=/\btag\b/.test(c);if(u&&!/[<>\s\/]/.test(t.current())&&(a=o.htmlState.tagName&&o.htmlState.tagName.toLowerCase())&&s.hasOwnProperty(a))o.inTag=a+" ";else if(o.inTag&&u&&/>$/.test(t.current())){var f=/^([\S]+) (.*)/.exec(o.inTag);o.inTag=null;var h=">"==t.current()&&function(e,t){for(var n=0;n<e.length;n++){var i=e[n];if(!i[0]||i[1].test(r(t,i[0])))return i[2]}}(s[f[1]],f[2]),p=e.getMode(n,h),m=i(f[1],!0),g=i(f[1],!1);o.token=function(e,t){return e.match(m,!1)?(t.token=d,t.localState=t.localMode=null,null):function(e,t,n){var r=e.current(),i=r.search(t);return i>-1?e.backUp(r.length-i):r.match(/<\/?$/)&&(e.backUp(r.length),e.match(t,!1)||e.match(r)),n}(e,g,t.localMode.token(e,t.localState))},o.localMode=p,o.localState=e.startState(p,l.indent(o.htmlState,"",""))}else o.inTag&&(o.inTag+=t.current(),t.eol()&&(o.inTag+=" "));return c}return{startState:function(){return{token:d,inTag:null,localMode:null,localState:null,htmlState:e.startState(l)}},copyState:function(t){var n;return t.localState&&(n=e.copyState(t.localMode,t.localState)),{token:t.token,inTag:t.inTag,localMode:t.localMode,localState:n,htmlState:e.copyState(l,t.htmlState)}},token:function(e,t){return t.token(e,t)},indent:function(t,n,r){return!t.localMode||/^\s*<\//.test(n)?l.indent(t.htmlState,n,r):t.localMode.indent?t.localMode.indent(t.localState,n,r):e.Pass},innerMode:function(e){return{state:e.localState||e.htmlState,mode:e.localMode||l}}}}),"xml","javascript","css"),e.defineMIME("text/html","htmlmixed")}(n(0),n(2),n(1),n(5))},function(e,t,n){!function(e){"use strict";function t(e,t,n,r){this.state=e,this.mode=t,this.depth=n,this.prev=r}function n(r){return new t(e.copyState(r.mode,r.state),r.mode,r.depth,r.prev&&n(r.prev))}e.defineMode("jsx",(function(r,i){var o=e.getMode(r,{name:"xml",allowMissing:!0,multilineTagIndentPastTag:!1,allowMissingTagName:!0}),a=e.getMode(r,i&&i.base||"javascript");function l(e){var t=e.tagName;e.tagName=null;var n=o.indent(e,"","");return e.tagName=t,n}function s(n,i){return i.context.mode==o?function(n,i,c){if(2==c.depth)return n.match(/^.*?\*\//)?c.depth=1:n.skipToEnd(),"comment";if("{"==n.peek()){o.skipAttribute(c.state);var u=l(c.state),f=c.state.context;if(f&&n.match(/^[^>]*>\s*$/,!1)){for(;f.prev&&!f.startOfLine;)f=f.prev;f.startOfLine?u-=r.indentUnit:c.prev.state.lexical&&(u=c.prev.state.lexical.indented)}else 1==c.depth&&(u+=r.indentUnit);return i.context=new t(e.startState(a,u),a,0,i.context),null}if(1==c.depth){if("<"==n.peek())return o.skipAttribute(c.state),i.context=new t(e.startState(o,l(c.state)),o,0,i.context),null;if(n.match("//"))return n.skipToEnd(),"comment";if(n.match("/*"))return c.depth=2,s(n,i)}var d,h=o.token(n,c.state),p=n.current();return/\btag\b/.test(h)?/>$/.test(p)?c.state.context?c.depth=0:i.context=i.context.prev:/^</.test(p)&&(c.depth=1):!h&&(d=p.indexOf("{"))>-1&&n.backUp(p.length-d),h}(n,i,i.context):function(n,r,i){if("<"==n.peek()&&a.expressionAllowed(n,i.state))return a.skipExpression(i.state),r.context=new t(e.startState(o,a.indent(i.state,"","")),o,0,r.context),null;var l=a.token(n,i.state);if(!l&&null!=i.depth){var s=n.current();"{"==s?i.depth++:"}"==s&&0==--i.depth&&(r.context=r.context.prev)}return l}(n,i,i.context)}return{startState:function(){return{context:new t(e.startState(a),a)}},copyState:function(e){return{context:n(e.context)}},token:s,indent:function(e,t,n){return e.context.mode.indent(e.context.state,t,n)},innerMode:function(e){return e.context}}}),"xml","javascript"),e.defineMIME("text/jsx","jsx"),e.defineMIME("text/typescript-jsx",{name:"jsx",base:{name:"javascript",typescript:!0}})}(n(0),n(2),n(1))},function(e,t,n){!function(e){"use strict";e.defineMode("coffeescript",(function(e,t){function n(e){return new RegExp("^(("+e.join(")|(")+"))\\b")}var r=/^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/,i=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/,o=/^[_A-Za-z$][_A-Za-z$0-9]*/,a=/^@[_A-Za-z$][_A-Za-z$0-9]*/,l=n(["and","or","not","is","isnt","in","instanceof","typeof"]),s=["for","while","loop","if","unless","else","switch","try","catch","finally","class"],c=n(s.concat(["break","by","continue","debugger","delete","do","in","of","new","return","then","this","@","throw","when","until","extends"]));s=n(s);var u=/^('{3}|\"{3}|['\"])/,f=/^(\/{3}|\/)/,d=n(["Infinity","NaN","undefined","null","true","false","on","off","yes","no"]);function h(e,t){if(e.sol()){null===t.scope.align&&(t.scope.align=!1);var n=t.scope.offset;if(e.eatSpace()){var s=e.indentation();return s>n&&"coffee"==t.scope.type?"indent":s<n?"dedent":null}n>0&&v(e,t)}if(e.eatSpace())return null;var h=e.peek();if(e.match("####"))return e.skipToEnd(),"comment";if(e.match("###"))return t.tokenize=m,t.tokenize(e,t);if("#"===h)return e.skipToEnd(),"comment";if(e.match(/^-?[0-9\.]/,!1)){var g=!1;if(e.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)&&(g=!0),e.match(/^-?\d+\.\d*/)&&(g=!0),e.match(/^-?\.\d+/)&&(g=!0),g)return"."==e.peek()&&e.backUp(1),"number";var y=!1;if(e.match(/^-?0x[0-9a-f]+/i)&&(y=!0),e.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)&&(y=!0),e.match(/^-?0(?![\dx])/i)&&(y=!0),y)return"number"}if(e.match(u))return t.tokenize=p(e.current(),!1,"string"),t.tokenize(e,t);if(e.match(f)){if("/"!=e.current()||e.match(/^.*\//,!1))return t.tokenize=p(e.current(),!0,"string-2"),t.tokenize(e,t);e.backUp(1)}return e.match(r)||e.match(l)?"operator":e.match(i)?"punctuation":e.match(d)?"atom":e.match(a)||t.prop&&e.match(o)?"property":e.match(c)?"keyword":e.match(o)?"variable":(e.next(),"error")}function p(e,n,r){return function(i,o){for(;!i.eol();)if(i.eatWhile(/[^'"\/\\]/),i.eat("\\")){if(i.next(),n&&i.eol())return r}else{if(i.match(e))return o.tokenize=h,r;i.eat(/['"\/]/)}return n&&(t.singleLineStringErrors?r="error":o.tokenize=h),r}}function m(e,t){for(;!e.eol();){if(e.eatWhile(/[^#]/),e.match("###")){t.tokenize=h;break}e.eatWhile("#")}return"comment"}function g(t,n,r){r=r||"coffee";for(var i=0,o=!1,a=null,l=n.scope;l;l=l.prev)if("coffee"===l.type||"}"==l.type){i=l.offset+e.indentUnit;break}"coffee"!==r?(o=null,a=t.column()+t.current().length):n.scope.align&&(n.scope.align=!1),n.scope={offset:i,type:r,prev:n.scope,align:o,alignOffset:a}}function v(e,t){if(t.scope.prev){if("coffee"===t.scope.type){for(var n=e.indentation(),r=!1,i=t.scope;i;i=i.prev)if(n===i.offset){r=!0;break}if(!r)return!0;for(;t.scope.prev&&t.scope.offset!==n;)t.scope=t.scope.prev;return!1}return t.scope=t.scope.prev,!1}}return{startState:function(e){return{tokenize:h,scope:{offset:e||0,type:"coffee",prev:null,align:!1},prop:!1,dedent:0}},token:function(e,t){var n=null===t.scope.align&&t.scope;n&&e.sol()&&(n.align=!1);var r=function(e,t){var n=t.tokenize(e,t),r=e.current();"return"===r&&(t.dedent=!0),(("->"===r||"=>"===r)&&e.eol()||"indent"===n)&&g(e,t);var i="[({".indexOf(r);if(-1!==i&&g(e,t,"])}".slice(i,i+1)),s.exec(r)&&g(e,t),"then"==r&&v(e,t),"dedent"===n&&v(e,t))return"error";if(-1!==(i="])}".indexOf(r))){for(;"coffee"==t.scope.type&&t.scope.prev;)t.scope=t.scope.prev;t.scope.type==r&&(t.scope=t.scope.prev)}return t.dedent&&e.eol()&&("coffee"==t.scope.type&&t.scope.prev&&(t.scope=t.scope.prev),t.dedent=!1),n}(e,t);return r&&"comment"!=r&&(n&&(n.align=!0),t.prop="punctuation"==r&&"."==e.current()),r},indent:function(e,t){if(e.tokenize!=h)return 0;var n=e.scope,r=t&&"])}".indexOf(t.charAt(0))>-1;if(r)for(;"coffee"==n.type&&n.prev;)n=n.prev;var i=r&&n.type===t.charAt(0);return n.align?n.alignOffset-(i?1:0):(i?n.prev:n).offset},lineComment:"#",fold:"indent"}})),e.defineMIME("application/vnd.coffeescript","coffeescript"),e.defineMIME("text/x-coffeescript","coffeescript"),e.defineMIME("text/coffeescript","coffeescript")}(n(0))},function(e,t,n){!function(e){"use strict";e.defineMode("elm",(function(){function e(e,t,n){return t(n),n(e,t)}var t=/[a-z_]/,n=/[A-Z]/,r=/[0-9]/,i=/[0-9A-Fa-f]/,o=/[0-7]/,a=/[a-z_A-Z0-9\']/,l=/[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/,s=/[(),;[\]`{}]/,c=/[ \t\v\f]/;function u(){return function(d,h){if(d.eatWhile(c))return null;var p=d.next();if(s.test(p)){if("{"==p&&d.eat("-")){var m="comment";return d.eat("#")&&(m="meta"),e(d,h,function e(t,n){return 0==n?u():function(r,i){for(var o=n;!r.eol();){var a=r.next();if("{"==a&&r.eat("-"))++o;else if("-"==a&&r.eat("}")&&0==--o)return i(u()),t}return i(e(t,o)),t}}(m,1))}return null}if("'"==p)return d.eat("\\"),d.next(),d.eat("'")?"string":"error";if('"'==p)return e(d,h,f);if(n.test(p))return d.eatWhile(a),d.eat(".")?"qualifier":"variable-2";if(t.test(p)){var g=1===d.pos;return d.eatWhile(a),g?"type":"variable"}if(r.test(p)){if("0"==p){if(d.eat(/[xX]/))return d.eatWhile(i),"integer";if(d.eat(/[oO]/))return d.eatWhile(o),"number"}return d.eatWhile(r),m="number",d.eat(".")&&(m="number",d.eatWhile(r)),d.eat(/[eE]/)&&(m="number",d.eat(/[-+]/),d.eatWhile(r)),m}return l.test(p)?"-"==p&&d.eat(/-/)&&(d.eatWhile(/-/),!d.eat(l))?(d.skipToEnd(),"comment"):(d.eatWhile(l),"builtin"):"error"}}function f(e,t){for(;!e.eol();){var n=e.next();if('"'==n)return t(u()),"string";if("\\"==n){if(e.eol()||e.eat(c))return t(d),"string";e.eat("&")||e.next()}}return t(u()),"error"}function d(t,n){return t.eat("\\")?e(t,n,f):(t.next(),n(u()),"error")}var h=function(){for(var e={},t=["case","of","as","if","then","else","let","in","infix","infixl","infixr","type","alias","input","output","foreign","loopback","module","where","import","exposing","_","..","|",":","=","\\",'"',"->","<-"],n=t.length;n--;)e[t[n]]="keyword";return e}();return{startState:function(){return{f:u()}},copyState:function(e){return{f:e.f}},token:function(e,t){var n=t.f(e,(function(e){t.f=e})),r=e.current();return h.hasOwnProperty(r)?h[r]:n}}})),e.defineMIME("text/x-elm","elm")}(n(0))},function(e,t,n){!function(e){"use strict";function t(e,t,n,r,i,o){this.indented=e,this.column=t,this.type=n,this.info=r,this.align=i,this.prev=o}function n(e,n,r,i){var o=e.indented;return e.context&&"statement"==e.context.type&&"statement"!=r&&(o=e.context.indented),e.context=new t(o,n,r,i,null,e.context)}function r(e){var t=e.context.type;return")"!=t&&"]"!=t&&"}"!=t||(e.indented=e.context.indented),e.context=e.context.prev}function i(e,t,n){return"variable"==t.prevToken||"type"==t.prevToken||!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(e.string.slice(0,n))||!(!t.typeAtEndOfLine||e.column()!=e.indentation())||void 0}function o(e){for(;;){if(!e||"top"==e.type)return!0;if("}"==e.type&&"namespace"!=e.prev.info)return!1;e=e.prev}}function a(e){for(var t={},n=e.split(" "),r=0;r<n.length;++r)t[n[r]]=!0;return t}function l(e,t){return"function"==typeof e?e(t):e.propertyIsEnumerable(t)}e.defineMode("clike",(function(a,s){var c,u,f=a.indentUnit,d=s.statementIndentUnit||f,h=s.dontAlignCalls,p=s.keywords||{},m=s.types||{},g=s.builtin||{},v=s.blockKeywords||{},y=s.defKeywords||{},b=s.atoms||{},x=s.hooks||{},w=s.multiLineStrings,k=!1!==s.indentStatements,C=!1!==s.indentSwitch,S=s.namespaceSeparator,T=s.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,L=s.numberStart||/[\d\.]/,M=s.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,O=s.isOperatorChar||/[+\-*&%=<>!?|\/]/,N=s.isIdentifierChar||/[\w\$_\xa1-\uffff]/,A=s.isReservedIdentifier||!1;function E(e,t){var n,r=e.next();if(x[r]){var i=x[r](e,t);if(!1!==i)return i}if('"'==r||"'"==r)return t.tokenize=(n=r,function(e,t){for(var r,i=!1,o=!1;null!=(r=e.next());){if(r==n&&!i){o=!0;break}i=!i&&"\\"==r}return(o||!i&&!w)&&(t.tokenize=null),"string"}),t.tokenize(e,t);if(T.test(r))return c=r,null;if(L.test(r)){if(e.backUp(1),e.match(M))return"number";e.next()}if("/"==r){if(e.eat("*"))return t.tokenize=z,z(e,t);if(e.eat("/"))return e.skipToEnd(),"comment"}if(O.test(r)){for(;!e.match(/^\/[\/*]/,!1)&&e.eat(O););return"operator"}if(e.eatWhile(N),S)for(;e.match(S);)e.eatWhile(N);var o=e.current();return l(p,o)?(l(v,o)&&(c="newstatement"),l(y,o)&&(u=!0),"keyword"):l(m,o)?"type":l(g,o)||A&&A(o)?(l(v,o)&&(c="newstatement"),"builtin"):l(b,o)?"atom":"variable"}function z(e,t){for(var n,r=!1;n=e.next();){if("/"==n&&r){t.tokenize=null;break}r="*"==n}return"comment"}function P(e,t){s.typeFirstDefinitions&&e.eol()&&o(t.context)&&(t.typeAtEndOfLine=i(e,t,e.pos))}return{startState:function(e){return{tokenize:null,context:new t((e||0)-f,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(e,t){var a=t.context;if(e.sol()&&(null==a.align&&(a.align=!1),t.indented=e.indentation(),t.startOfLine=!0),e.eatSpace())return P(e,t),null;c=u=null;var l=(t.tokenize||E)(e,t);if("comment"==l||"meta"==l)return l;if(null==a.align&&(a.align=!0),";"==c||":"==c||","==c&&e.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==t.context.type;)r(t);else if("{"==c)n(t,e.column(),"}");else if("["==c)n(t,e.column(),"]");else if("("==c)n(t,e.column(),")");else if("}"==c){for(;"statement"==a.type;)a=r(t);for("}"==a.type&&(a=r(t));"statement"==a.type;)a=r(t)}else c==a.type?r(t):k&&(("}"==a.type||"top"==a.type)&&";"!=c||"statement"==a.type&&"newstatement"==c)&&n(t,e.column(),"statement",e.current());if("variable"==l&&("def"==t.prevToken||s.typeFirstDefinitions&&i(e,t,e.start)&&o(t.context)&&e.match(/^\s*\(/,!1))&&(l="def"),x.token){var f=x.token(e,t,l);void 0!==f&&(l=f)}return"def"==l&&!1===s.styleDefs&&(l="variable"),t.startOfLine=!1,t.prevToken=u?"def":l||c,P(e,t),l},indent:function(t,n){if(t.tokenize!=E&&null!=t.tokenize||t.typeAtEndOfLine)return e.Pass;var r=t.context,i=n&&n.charAt(0),o=i==r.type;if("statement"==r.type&&"}"==i&&(r=r.prev),s.dontIndentStatements)for(;"statement"==r.type&&s.dontIndentStatements.test(r.info);)r=r.prev;if(x.indent){var a=x.indent(t,r,n,f);if("number"==typeof a)return a}var l=r.prev&&"switch"==r.prev.info;if(s.allmanIndentation&&/[{(]/.test(i)){for(;"top"!=r.type&&"}"!=r.type;)r=r.prev;return r.indented}return"statement"==r.type?r.indented+("{"==i?0:d):!r.align||h&&")"==r.type?")"!=r.type||o?r.indented+(o?0:f)+(o||!l||/^(?:case|default)\b/.test(n)?0:f):r.indented+d:r.column+(o?0:1)},electricInput:C?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:"//",fold:"brace"}}));var s="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile inline restrict asm fortran",c=a("int long char short double float unsigned signed void bool"),u=a("SEL instancetype id Class Protocol BOOL");function f(e){return l(c,e)||/.+_t$/.test(e)}var d="case do else for if switch while struct enum union";function h(e,t){if(!t.startOfLine)return!1;for(var n,r=null;n=e.peek();){if("\\"==n&&e.match(/^.$/)){r=h;break}if("/"==n&&e.match(/^\/[\/\*]/,!1))break;e.next()}return t.tokenize=r,"meta"}function p(e,t){return"type"==t.prevToken&&"type"}function m(e){return!(!e||e.length<2||"_"!=e[0]||"_"!=e[1]&&e[1]===e[1].toLowerCase())}function g(e){return e.eatWhile(/[\w\.']/),"number"}function v(e,t){if(e.backUp(1),e.match(/(R|u8R|uR|UR|LR)/)){var n=e.match(/"([^\s\\()]{0,16})\(/);return!!n&&(t.cpp11RawStringDelim=n[1],t.tokenize=b,b(e,t))}return e.match(/(u8|u|U|L)/)?!!e.match(/["']/,!1)&&"string":(e.next(),!1)}function y(e,t){for(var n;null!=(n=e.next());)if('"'==n&&!e.eat('"')){t.tokenize=null;break}return"string"}function b(e,t){var n=t.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&");return e.match(new RegExp(".*?\\)"+n+'"'))?t.tokenize=null:e.skipToEnd(),"string"}function x(t,n){"string"==typeof t&&(t=[t]);var r=[];function i(e){if(e)for(var t in e)e.hasOwnProperty(t)&&r.push(t)}i(n.keywords),i(n.types),i(n.builtin),i(n.atoms),r.length&&(n.helperType=t[0],e.registerHelper("hintWords",t[0],r));for(var o=0;o<t.length;++o)e.defineMIME(t[o],n)}function w(e,t){for(var n=!1;!e.eol();){if(!n&&e.match('"""')){t.tokenize=null;break}n="\\"==e.next()&&!n}return"string"}function k(e){return function(t,n){for(var r;r=t.next();){if("*"==r&&t.eat("/")){if(1==e){n.tokenize=null;break}return n.tokenize=k(e-1),n.tokenize(t,n)}if("/"==r&&t.eat("*"))return n.tokenize=k(e+1),n.tokenize(t,n)}return"comment"}}x(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:a(s),types:f,blockKeywords:a(d),defKeywords:a("struct enum union"),typeFirstDefinitions:!0,atoms:a("NULL true false"),isReservedIdentifier:m,hooks:{"#":h,"*":p},modeProps:{fold:["brace","include"]}}),x(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:a(s+"alignas alignof and and_eq audit axiom bitand bitor catch class compl concept constexpr const_cast decltype delete dynamic_cast explicit export final friend import module mutable namespace new noexcept not not_eq operator or or_eq override private protected public reinterpret_cast requires static_assert static_cast template this thread_local throw try typeid typename using virtual xor xor_eq"),types:f,blockKeywords:a(d+" class try catch"),defKeywords:a("struct enum union class namespace"),typeFirstDefinitions:!0,atoms:a("true false NULL nullptr"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,isReservedIdentifier:m,hooks:{"#":h,"*":p,u:v,U:v,L:v,R:v,0:g,1:g,2:g,3:g,4:g,5:g,6:g,7:g,8:g,9:g,token:function(e,t,n){if("variable"==n&&"("==e.peek()&&(";"==t.prevToken||null==t.prevToken||"}"==t.prevToken)&&(r=e.current(),(i=/(\w+)::~?(\w+)$/.exec(r))&&i[1]==i[2]))return"def";var r,i}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),x("text/x-java",{name:"clike",keywords:a("abstract assert break case catch class const continue default do else enum extends final finally for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:a("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:a("catch class do else finally for if switch try while"),defKeywords:a("class interface enum @interface"),typeFirstDefinitions:!0,atoms:a("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(e){return!e.match("interface",!1)&&(e.eatWhile(/[\w\$_]/),"meta")}},modeProps:{fold:["brace","import"]}}),x("text/x-csharp",{name:"clike",keywords:a("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:a("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:a("catch class do else finally for foreach if struct switch try while"),defKeywords:a("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:a("true false null"),hooks:{"@":function(e,t){return e.eat('"')?(t.tokenize=y,y(e,t)):(e.eatWhile(/[\w\$_]/),"meta")}}}),x("text/x-scala",{name:"clike",keywords:a("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:a("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:a("catch class enum do else finally for forSome if match switch try while"),defKeywords:a("class enum def object package trait type val var"),atoms:a("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},'"':function(e,t){return!!e.match('""')&&(t.tokenize=w,t.tokenize(e,t))},"'":function(e){return e.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"=":function(e,n){var r=n.context;return!("}"!=r.type||!r.align||!e.eat(">"))&&(n.context=new t(r.indented,r.column,r.type,r.info,null,r.prev),"operator")},"/":function(e,t){return!!e.eat("*")&&(t.tokenize=k(1),t.tokenize(e,t))}},modeProps:{closeBrackets:{pairs:'()[]{}""',triples:'"'}}}),x("text/x-kotlin",{name:"clike",keywords:a("package as typealias class interface this super val operator var fun for is in This throw return annotation break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend actual expect setparam"),types:a("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy LazyThreadSafetyMode LongArray Nothing ShortArray Unit"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:a("catch class do else finally for if where try while enum"),defKeywords:a("class val var object interface fun"),atoms:a("true false null this"),hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},"*":function(e,t){return"."==t.prevToken?"variable":"operator"},'"':function(e,t){var n;return t.tokenize=(n=e.match('""'),function(e,t){for(var r,i=!1,o=!1;!e.eol();){if(!n&&!i&&e.match('"')){o=!0;break}if(n&&e.match('"""')){o=!0;break}r=e.next(),!i&&"$"==r&&e.match("{")&&e.skipTo("}"),i=!i&&"\\"==r&&!n}return!o&&n||(t.tokenize=null),"string"}),t.tokenize(e,t)},"/":function(e,t){return!!e.eat("*")&&(t.tokenize=k(1),t.tokenize(e,t))},indent:function(e,t,n,r){var i=n&&n.charAt(0);return"}"!=e.prevToken&&")"!=e.prevToken||""!=n?"operator"==e.prevToken&&"}"!=n&&"}"!=e.context.type||"variable"==e.prevToken&&"."==i||("}"==e.prevToken||")"==e.prevToken)&&"."==i?2*r+t.indented:t.align&&"}"==t.type?t.indented+(e.context.type==(n||"").charAt(0)?0:r):void 0:e.indented}},modeProps:{closeBrackets:{triples:'"'}}}),x(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:a("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:a("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:a("for while do if else struct"),builtin:a("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:a("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":h},modeProps:{fold:["brace","include"]}}),x("text/x-nesc",{name:"clike",keywords:a(s+" as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:f,blockKeywords:a(d),atoms:a("null true false"),hooks:{"#":h},modeProps:{fold:["brace","include"]}}),x("text/x-objectivec",{name:"clike",keywords:a(s+" bycopy byref in inout oneway out self super atomic nonatomic retain copy readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd @interface @implementation @end @protocol @encode @property @synthesize @dynamic @class @public @package @private @protected @required @optional @try @catch @finally @import @selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),types:function(e){return f(e)||l(u,e)},builtin:a("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"),blockKeywords:a(d+" @synthesize @try @catch @finally @autoreleasepool @synchronized"),defKeywords:a("struct enum union @interface @implementation @protocol @class"),dontIndentStatements:/^@.*$/,typeFirstDefinitions:!0,atoms:a("YES NO NULL Nil nil true false nullptr"),isReservedIdentifier:m,hooks:{"#":h,"*":p},modeProps:{fold:["brace","include"]}}),x("text/x-squirrel",{name:"clike",keywords:a("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:f,blockKeywords:a("case catch class else for foreach if switch try while"),defKeywords:a("function local class"),typeFirstDefinitions:!0,atoms:a("true false null"),hooks:{"#":h},modeProps:{fold:["brace","include"]}});var C=null;x("text/x-ceylon",{name:"clike",keywords:a("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(e){var t=e.charAt(0);return t===t.toUpperCase()&&t!==t.toLowerCase()},blockKeywords:a("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:a("class dynamic function interface module object package value"),builtin:a("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:a("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(e){return e.eatWhile(/[\w\$_]/),"meta"},'"':function(e,t){return t.tokenize=function e(t){return function(n,r){for(var i,o=!1,a=!1;!n.eol();){if(!o&&n.match('"')&&("single"==t||n.match('""'))){a=!0;break}if(!o&&n.match("``")){C=e(t),a=!0;break}i=n.next(),o="single"==t&&!o&&"\\"==i}return a&&(r.tokenize=null),"string"}}(e.match('""')?"triple":"single"),t.tokenize(e,t)},"`":function(e,t){return!(!C||!e.match("`"))&&(t.tokenize=C,C=null,t.tokenize(e,t))},"'":function(e){return e.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(e,t,n){if(("variable"==n||"type"==n)&&"."==t.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})}(n(0))},function(e,t,n){!function(e){"use strict";e.defineSimpleMode("rust",{start:[{regex:/b?"/,token:"string",next:"string"},{regex:/b?r"/,token:"string",next:"string_raw"},{regex:/b?r#+"/,token:"string",next:"string_raw_hash"},{regex:/'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/,token:"string-2"},{regex:/b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/,token:"string-2"},{regex:/(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,token:"number"},{regex:/(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,token:"keyword"},{regex:/\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/,token:"atom"},{regex:/\b(?:true|false|Some|None|Ok|Err)\b/,token:"builtin"},{regex:/\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/#!?\[.*\]/,token:"meta"},{regex:/\/\/.*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/[a-zA-Z_]\w*!/,token:"variable-3"},{regex:/[a-zA-Z_]\w*/,token:"variable"},{regex:/[\{\[\(]/,indent:!0},{regex:/[\}\]\)]/,dedent:!0}],string:[{regex:/"/,token:"string",next:"start"},{regex:/(?:[^\\"]|\\(?:.|$))*/,token:"string"}],string_raw:[{regex:/"/,token:"string",next:"start"},{regex:/[^"]*/,token:"string"}],string_raw_hash:[{regex:/"#+/,token:"string",next:"start"},{regex:/(?:[^"]|"(?!#))*/,token:"string"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{dontIndentStates:["comment"],electricInput:/^\s*\}$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}),e.defineMIME("text/x-rustsrc","rust"),e.defineMIME("text/rust","rust")}(n(0),n(21))},function(e,t,n){!function(e){"use strict";function t(e,t){if(!e.hasOwnProperty(t))throw new Error("Undefined state "+t+" in simple mode")}function n(e,t){if(!e)return/(?:)/;var n="";return e instanceof RegExp?(e.ignoreCase&&(n="i"),e=e.source):e=String(e),new RegExp((!1===t?"":"^")+"(?:"+e+")",n)}function r(e,r){(e.next||e.push)&&t(r,e.next||e.push),this.regex=n(e.regex),this.token=function(e){if(!e)return null;if(e.apply)return e;if("string"==typeof e)return e.replace(/\./g," ");for(var t=[],n=0;n<e.length;n++)t.push(e[n]&&e[n].replace(/\./g," "));return t}(e.token),this.data=e}function i(e,t){return function(n,r){if(r.pending){var i=r.pending.shift();return 0==r.pending.length&&(r.pending=null),n.pos+=i.text.length,i.token}if(r.local){if(r.local.end&&n.match(r.local.end)){var o=r.local.endToken||null;return r.local=r.localState=null,o}var l;return o=r.local.mode.token(n,r.localState),r.local.endScan&&(l=r.local.endScan.exec(n.current()))&&(n.pos=n.start+l.index),o}for(var s=e[r.state],c=0;c<s.length;c++){var u=s[c],f=(!u.data.sol||n.sol())&&n.match(u.regex);if(f){u.data.next?r.state=u.data.next:u.data.push?((r.stack||(r.stack=[])).push(r.state),r.state=u.data.push):u.data.pop&&r.stack&&r.stack.length&&(r.state=r.stack.pop()),u.data.mode&&a(t,r,u.data.mode,u.token),u.data.indent&&r.indent.push(n.indentation()+t.indentUnit),u.data.dedent&&r.indent.pop();var d=u.token;if(d&&d.apply&&(d=d(f)),f.length>2&&u.token&&"string"!=typeof u.token){r.pending=[];for(var h=2;h<f.length;h++)f[h]&&r.pending.push({text:f[h],token:u.token[h-1]});return n.backUp(f[0].length-(f[1]?f[1].length:0)),d[0]}return d&&d.join?d[0]:d}}return n.next(),null}}function o(e,t){if(e===t)return!0;if(!e||"object"!=typeof e||!t||"object"!=typeof t)return!1;var n=0;for(var r in e)if(e.hasOwnProperty(r)){if(!t.hasOwnProperty(r)||!o(e[r],t[r]))return!1;n++}for(var r in t)t.hasOwnProperty(r)&&n--;return 0==n}function a(t,r,i,a){var l;if(i.persistent)for(var s=r.persistentStates;s&&!l;s=s.next)(i.spec?o(i.spec,s.spec):i.mode==s.mode)&&(l=s);var c=l?l.mode:i.mode||e.getMode(t,i.spec),u=l?l.state:e.startState(c);i.persistent&&!l&&(r.persistentStates={mode:c,spec:i.spec,state:u,next:r.persistentStates}),r.localState=u,r.local={mode:c,end:i.end&&n(i.end),endScan:i.end&&!1!==i.forceEnd&&n(i.end,!1),endToken:a&&a.join?a[a.length-1]:a}}function l(t,n){return function(r,i,o){if(r.local&&r.local.mode.indent)return r.local.mode.indent(r.localState,i,o);if(null==r.indent||r.local||n.dontIndentStates&&function(e,t){for(var n=0;n<t.length;n++)if(t[n]===e)return!0}(r.state,n.dontIndentStates)>-1)return e.Pass;var a=r.indent.length-1,l=t[r.state];e:for(;;){for(var s=0;s<l.length;s++){var c=l[s];if(c.data.dedent&&!1!==c.data.dedentIfLineStart){var u=c.regex.exec(i);if(u&&u[0]){a--,(c.next||c.push)&&(l=t[c.next||c.push]),i=i.slice(u[0].length);continue e}}}break}return a<0?0:r.indent[a]}}e.defineSimpleMode=function(t,n){e.defineMode(t,(function(t){return e.simpleMode(t,n)}))},e.simpleMode=function(n,o){t(o,"start");var a={},s=o.meta||{},c=!1;for(var u in o)if(u!=s&&o.hasOwnProperty(u))for(var f=a[u]=[],d=o[u],h=0;h<d.length;h++){var p=d[h];f.push(new r(p,o)),(p.indent||p.dedent)&&(c=!0)}var m={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:c?[]:null}},copyState:function(t){var n={state:t.state,pending:t.pending,local:t.local,localState:null,indent:t.indent&&t.indent.slice(0)};t.localState&&(n.localState=e.copyState(t.local.mode,t.localState)),t.stack&&(n.stack=t.stack.slice(0));for(var r=t.persistentStates;r;r=r.next)n.persistentStates={mode:r.mode,spec:r.spec,state:r.state==t.localState?n.localState:e.copyState(r.mode,r.state),next:n.persistentStates};return n},token:i(a,n),innerMode:function(e){return e.local&&{mode:e.local.mode,state:e.localState}},indent:l(a,s)};if(s)for(var g in s)s.hasOwnProperty(g)&&(m[g]=s[g]);return m}}(n(0))},function(e,t,n){var r,i,o;i=[n(0)],void 0===(o="function"==typeof(r=function(e){"use strict";var t=/[\w\$_\.\\\/@]/;function n(e){var t=Object.create(null);return e.forEach((function(e){t[e]=!0})),t}e.defineMode("wasm",(function(){var e=n(["function","import","export","table","memory","segment","as","type","of","from","typeof","br","br_if","loop","br_table","if","else","call","call_import","call_indirect","nop","unreachable","var","align","select","return"]),r=n(["i32:8","i32:8u","i32:8s","i32:16","i32:16u","i32:16s","i64:8","i64:8u","i64:8s","i64:16","i64:16u","i64:16s","i64:32","i64:32u","i64:32s","i32.add","i32.sub","i32.mul","i32.div_s","i32.div_u","i32.rem_s","i32.rem_u","i32.and","i32.or","i32.xor","i32.shl","i32.shr_u","i32.shr_s","i32.rotr","i32.rotl","i32.eq","i32.ne","i32.lt_s","i32.le_s","i32.lt_u","i32.le_u","i32.gt_s","i32.ge_s","i32.gt_u","i32.ge_u","i32.clz","i32.ctz","i32.popcnt","i32.eqz","i64.add","i64.sub","i64.mul","i64.div_s","i64.div_u","i64.rem_s","i64.rem_u","i64.and","i64.or","i64.xor","i64.shl","i64.shr_u","i64.shr_s","i64.rotr","i64.rotl","i64.eq","i64.ne","i64.lt_s","i64.le_s","i64.lt_u","i64.le_u","i64.gt_s","i64.ge_s","i64.gt_u","i64.ge_u","i64.clz","i64.ctz","i64.popcnt","i64.eqz","f32.add","f32.sub","f32.mul","f32.div","f32.min","f32.max","f32.abs","f32.neg","f32.copysign","f32.ceil","f32.floor","f32.trunc","f32.nearest","f32.sqrt","f32.eq","f32.ne","f32.lt","f32.le","f32.gt","f32.ge","f64.add","f64.sub","f64.mul","f64.div","f64.min","f64.max","f64.abs","f64.neg","f64.copysign","f64.ceil","f64.floor","f64.trunc","f64.nearest","f64.sqrt","f64.eq","f64.ne","f64.lt","f64.le","f64.gt","f64.ge","i32.trunc_s/f32","i32.trunc_s/f64","i32.trunc_u/f32","i32.trunc_u/f64","i32.wrap/i64","i64.trunc_s/f32","i64.trunc_s/f64","i64.trunc_u/f32","i64.trunc_u/f64","i64.extend_s/i32","i64.extend_u/i32","f32.convert_s/i32","f32.convert_u/i32","f32.convert_s/i64","f32.convert_u/i64","f32.demote/f64","f32.reinterpret/i32","f64.convert_s/i32","f64.convert_u/i32","f64.convert_s/i64","f64.convert_u/i64","f64.promote/f32","f64.reinterpret/i64","i32.reinterpret/f32","i64.reinterpret/f64"]),i=n(["i32","i64","f32","f64"]),o=/[\-!]/,a=n(["+","-","*","/","/s","/u","%","%s","%u","<<",">>u",">>s",">=","<=","==","!=","<s","<u","<=s","<=u",">=s",">=u",">s",">u","<",">","=","&","|","^","!"]);function l(n,l){var u,f=n.next();if("$"===f)return n.eatWhile(t),"variable";if("@"===f)return n.eatWhile(t),"meta";if('"'===f)return l.tokenize=(u=f,function(e,t){for(var n,r=!1;null!=(n=e.next());){if(n==u&&!r)return t.tokenize=null,"string";r=!r&&"\\"===n}return"string"}),l.tokenize(n,l);if("/"==f){if(n.eat("*"))return l.tokenize=s,s(n,l);if(n.eat("/"))return n.skipToEnd(),"comment"}if(/\d/.test(f)||("-"===f||"+"===f)&&/\d/.test(n.peek()))return n.eatWhile(/[\w\._\-+]/),"number";if(/[\[\]\(\)\{\},:]/.test(f))return null;if(o.test(f))return"operator";n.eatWhile(t);var d=n.current();if(d in a)return"operator";if(d in e)return"keyword";if(d in i){if(!n.eat(":"))return"builtin";n.eatWhile(t),d=n.current()}return d in r?"builtin":"Temporary"===d?(l.tokenize=c,l.tokenize(n,l)):null}function s(e,t){var n;for(t.commentDepth=1;null!=(n=e.next());){if("*"===n&&e.eat("/")&&0==--t.commentDepth)return t.tokenize=null,"comment";"/"===n&&e.eat("*")&&t.commentDepth++}return"comment"}function c(e,t){for(var n,r=t.commentState;null!=(n=e.next());)if(0===r&&"t"===n)r=1;else if(1===r&&":"===n)return t.tokenize=null,t.commentState=0,r=2,"comment";return t.commentState=r,"comment"}return{startState:function(){return{tokenize:null,commentState:0,commentDepth:0}},token:function(e,t){return e.eatSpace()?null:(t.tokenize||l)(e,t)}}})),e.registerHelper("wordChars","wasm",t),e.defineMIME("text/wasm","wasm")})?r.apply(t,i):r)||(e.exports=o)},function(e,t,n){!function(e){"use strict";var t="CodeMirror-activeline-background";function n(e){for(var n=0;n<e.state.activeLines.length;n++)e.removeLineClass(e.state.activeLines[n],"wrap","CodeMirror-activeline"),e.removeLineClass(e.state.activeLines[n],"background",t),e.removeLineClass(e.state.activeLines[n],"gutter","CodeMirror-activeline-gutter")}function r(e,r){for(var i=[],o=0;o<r.length;o++){var a=r[o],l=e.getOption("styleActiveLine");if("object"==typeof l&&l.nonEmpty?a.anchor.line==a.head.line:a.empty()){var s=e.getLineHandleVisualStart(a.head.line);i[i.length-1]!=s&&i.push(s)}}(function(e,t){if(e.length!=t.length)return!1;for(var n=0;n<e.length;n++)if(e[n]!=t[n])return!1;return!0})(e.state.activeLines,i)||e.operation((function(){n(e);for(var r=0;r<i.length;r++)e.addLineClass(i[r],"wrap","CodeMirror-activeline"),e.addLineClass(i[r],"background",t),e.addLineClass(i[r],"gutter","CodeMirror-activeline-gutter");e.state.activeLines=i}))}function i(e,t){r(e,t.ranges)}e.defineOption("styleActiveLine",!1,(function(t,o,a){var l=a!=e.Init&&a;o!=l&&(l&&(t.off("beforeSelectionChange",i),n(t),delete t.state.activeLines),o&&(t.state.activeLines=[],r(t,t.listSelections()),t.on("beforeSelectionChange",i)))}))}(n(0))},function(e,t,n){!function(e){e.defineOption("showTrailingSpace",!1,(function(t,n,r){r==e.Init&&(r=!1),r&&!n?t.removeOverlay("trailingspace"):!r&&n&&t.addOverlay({token:function(e){for(var t=e.string.length,n=t;n&&/\s/.test(e.string.charAt(n-1));--n);return n>e.pos?(e.pos=n,null):(e.pos=t,"trailingspace")},name:"trailingspace"})}))}(n(0))},function(e,t,n){!function(e){"use strict";e.registerHelper("fold","brace",(function(t,n){var r,i=n.line,o=t.getLine(i);function a(a){for(var l=n.ch,s=0;;){var c=l<=0?-1:o.lastIndexOf(a,l-1);if(-1!=c){if(1==s&&c<n.ch)break;if(r=t.getTokenTypeAt(e.Pos(i,c+1)),!/^(comment|string)/.test(r))return c+1;l=c-1}else{if(1==s)break;s=1,l=o.length}}}var l="{",s="}",c=a("{");if(null==c&&(l="[",s="]",c=a("[")),null!=c){var u,f,d=1,h=t.lastLine();e:for(var p=i;p<=h;++p)for(var m=t.getLine(p),g=p==i?c:0;;){var v=m.indexOf(l,g),y=m.indexOf(s,g);if(v<0&&(v=m.length),y<0&&(y=m.length),(g=Math.min(v,y))==m.length)break;if(t.getTokenTypeAt(e.Pos(p,g+1))==r)if(g==v)++d;else if(!--d){u=p,f=g;break e}++g}if(null!=u&&i!=u)return{from:e.Pos(i,c),to:e.Pos(u,f)}}})),e.registerHelper("fold","import",(function(t,n){function r(n){if(n<t.firstLine()||n>t.lastLine())return null;var r=t.getTokenAt(e.Pos(n,1));if(/\S/.test(r.string)||(r=t.getTokenAt(e.Pos(n,r.end+1))),"keyword"!=r.type||"import"!=r.string)return null;for(var i=n,o=Math.min(t.lastLine(),n+10);i<=o;++i){var a=t.getLine(i).indexOf(";");if(-1!=a)return{startCh:r.end,end:e.Pos(i,a)}}}var i,o=n.line,a=r(o);if(!a||r(o-1)||(i=r(o-2))&&i.end.line==o-1)return null;for(var l=a.end;;){var s=r(l.line+1);if(null==s)break;l=s.end}return{from:t.clipPos(e.Pos(o,a.startCh+1)),to:l}})),e.registerHelper("fold","include",(function(t,n){function r(n){if(n<t.firstLine()||n>t.lastLine())return null;var r=t.getTokenAt(e.Pos(n,1));return/\S/.test(r.string)||(r=t.getTokenAt(e.Pos(n,r.end+1))),"meta"==r.type&&"#include"==r.string.slice(0,8)?r.start+8:void 0}var i=n.line,o=r(i);if(null==o||null!=r(i-1))return null;for(var a=i;null!=r(a+1);)++a;return{from:e.Pos(i,o+1),to:t.clipPos(e.Pos(a))}}))}(n(0))},function(e,t,n){!function(e){"use strict";e.registerGlobalHelper("fold","comment",(function(e){return e.blockCommentStart&&e.blockCommentEnd}),(function(t,n){var r=t.getModeAt(n),i=r.blockCommentStart,o=r.blockCommentEnd;if(i&&o){for(var a,l=n.line,s=t.getLine(l),c=n.ch,u=0;;){var f=c<=0?-1:s.lastIndexOf(i,c-1);if(-1!=f){if(1==u&&f<n.ch)return;if(/comment/.test(t.getTokenTypeAt(e.Pos(l,f+1)))&&(0==f||s.slice(f-o.length,f)==o||!/comment/.test(t.getTokenTypeAt(e.Pos(l,f))))){a=f+i.length;break}c=f-1}else{if(1==u)return;u=1,c=s.length}}var d,h,p=1,m=t.lastLine();e:for(var g=l;g<=m;++g)for(var v=t.getLine(g),y=g==l?a:0;;){var b=v.indexOf(i,y),x=v.indexOf(o,y);if(b<0&&(b=v.length),x<0&&(x=v.length),(y=Math.min(b,x))==v.length)break;if(y==b)++p;else if(!--p){d=g,h=y;break e}++y}if(null!=d&&(l!=d||h!=a))return{from:e.Pos(l,a),to:e.Pos(d,h)}}}))}(n(0))},function(e,t,n){!function(e){"use strict";var t=e.Pos;function n(e,t){return e.line-t.line||e.ch-t.ch}var r="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",i=new RegExp("<(/?)(["+r+"]["+r+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040]*)","g");function o(e,t,n,r){this.line=t,this.ch=n,this.cm=e,this.text=e.getLine(t),this.min=r?Math.max(r.from,e.firstLine()):e.firstLine(),this.max=r?Math.min(r.to-1,e.lastLine()):e.lastLine()}function a(e,n){var r=e.cm.getTokenTypeAt(t(e.line,n));return r&&/\btag\b/.test(r)}function l(e){if(!(e.line>=e.max))return e.ch=0,e.text=e.cm.getLine(++e.line),!0}function s(e){if(!(e.line<=e.min))return e.text=e.cm.getLine(--e.line),e.ch=e.text.length,!0}function c(e){for(;;){var t=e.text.indexOf(">",e.ch);if(-1==t){if(l(e))continue;return}if(a(e,t+1)){var n=e.text.lastIndexOf("/",t),r=n>-1&&!/\S/.test(e.text.slice(n+1,t));return e.ch=t+1,r?"selfClose":"regular"}e.ch=t+1}}function u(e){for(;;){var t=e.ch?e.text.lastIndexOf("<",e.ch-1):-1;if(-1==t){if(s(e))continue;return}if(a(e,t+1)){i.lastIndex=t,e.ch=t;var n=i.exec(e.text);if(n&&n.index==t)return n}else e.ch=t}}function f(e){for(;;){i.lastIndex=e.ch;var t=i.exec(e.text);if(!t){if(l(e))continue;return}if(a(e,t.index+1))return e.ch=t.index+t[0].length,t;e.ch=t.index+1}}function d(e){for(;;){var t=e.ch?e.text.lastIndexOf(">",e.ch-1):-1;if(-1==t){if(s(e))continue;return}if(a(e,t+1)){var n=e.text.lastIndexOf("/",t),r=n>-1&&!/\S/.test(e.text.slice(n+1,t));return e.ch=t+1,r?"selfClose":"regular"}e.ch=t}}function h(e,n){for(var r=[];;){var i,o=f(e),a=e.line,l=e.ch-(o?o[0].length:0);if(!o||!(i=c(e)))return;if("selfClose"!=i)if(o[1]){for(var s=r.length-1;s>=0;--s)if(r[s]==o[2]){r.length=s;break}if(s<0&&(!n||n==o[2]))return{tag:o[2],from:t(a,l),to:t(e.line,e.ch)}}else r.push(o[2])}}function p(e,n){for(var r=[];;){var i=d(e);if(!i)return;if("selfClose"!=i){var o=e.line,a=e.ch,l=u(e);if(!l)return;if(l[1])r.push(l[2]);else{for(var s=r.length-1;s>=0;--s)if(r[s]==l[2]){r.length=s;break}if(s<0&&(!n||n==l[2]))return{tag:l[2],from:t(e.line,e.ch),to:t(o,a)}}}else u(e)}}e.registerHelper("fold","xml",(function(e,r){for(var i=new o(e,r.line,0);;){var a=f(i);if(!a||i.line!=r.line)return;var l=c(i);if(!l)return;if(!a[1]&&"selfClose"!=l){var s=t(i.line,i.ch),u=h(i,a[2]);return u&&n(u.from,s)>0?{from:s,to:u.from}:null}}})),e.findMatchingTag=function(e,r,i){var a=new o(e,r.line,r.ch,i);if(-1!=a.text.indexOf(">")||-1!=a.text.indexOf("<")){var l=c(a),s=l&&t(a.line,a.ch),f=l&&u(a);if(l&&f&&!(n(a,r)>0)){var d={from:t(a.line,a.ch),to:s,tag:f[2]};return"selfClose"==l?{open:d,close:null,at:"open"}:f[1]?{open:p(a,f[2]),close:d,at:"close"}:{open:d,close:h(a=new o(e,s.line,s.ch,i),f[2]),at:"open"}}}},e.findEnclosingTag=function(e,t,n,r){for(var i=new o(e,t.line,t.ch,n);;){var a=p(i,r);if(!a)break;var l=h(new o(e,t.line,t.ch,n),a.tag);if(l)return{open:a,close:l}}},e.scanForClosingTag=function(e,t,n,r){return h(new o(e,t.line,t.ch,r?{from:0,to:r}:null),n)}}(n(0))},function(e,t,n){!function(e){"use strict";e.defineOption("foldGutter",!1,(function(t,r,i){var o;i&&i!=e.Init&&(t.clearGutter(t.state.foldGutter.options.gutter),t.state.foldGutter=null,t.off("gutterClick",l),t.off("changes",s),t.off("viewportChange",c),t.off("fold",u),t.off("unfold",u),t.off("swapDoc",s)),r&&(t.state.foldGutter=new n((!0===(o=r)&&(o={}),null==o.gutter&&(o.gutter="CodeMirror-foldgutter"),null==o.indicatorOpen&&(o.indicatorOpen="CodeMirror-foldgutter-open"),null==o.indicatorFolded&&(o.indicatorFolded="CodeMirror-foldgutter-folded"),o)),a(t),t.on("gutterClick",l),t.on("changes",s),t.on("viewportChange",c),t.on("fold",u),t.on("unfold",u),t.on("swapDoc",s))}));var t=e.Pos;function n(e){this.options=e,this.from=this.to=0}function r(e,n){for(var r=e.findMarks(t(n,0),t(n+1,0)),i=0;i<r.length;++i)if(r[i].__isFold){var o=r[i].find(-1);if(o&&o.line===n)return r[i]}}function i(e){if("string"==typeof e){var t=document.createElement("div");return t.className=e+" CodeMirror-guttermarker-subtle",t}return e.cloneNode(!0)}function o(e,n,o){var a=e.state.foldGutter.options,l=n,s=e.foldOption(a,"minFoldSize"),c=e.foldOption(a,"rangeFinder");e.eachLine(n,o,(function(n){var o=null;if(r(e,l))o=i(a.indicatorFolded);else{var u=t(l,0),f=c&&c(e,u);f&&f.to.line-f.from.line>=s&&(o=i(a.indicatorOpen))}e.setGutterMarker(n,a.gutter,o),++l}))}function a(e){var t=e.getViewport(),n=e.state.foldGutter;n&&(e.operation((function(){o(e,t.from,t.to)})),n.from=t.from,n.to=t.to)}function l(e,n,i){var o=e.state.foldGutter;if(o){var a=o.options;if(i==a.gutter){var l=r(e,n);l?l.clear():e.foldCode(t(n,0),a)}}}function s(e){var t=e.state.foldGutter;if(t){var n=t.options;t.from=t.to=0,clearTimeout(t.changeUpdate),t.changeUpdate=setTimeout((function(){a(e)}),n.foldOnChangeTimeSpan||600)}}function c(e){var t=e.state.foldGutter;if(t){var n=t.options;clearTimeout(t.changeUpdate),t.changeUpdate=setTimeout((function(){var n=e.getViewport();t.from==t.to||n.from-t.to>20||t.from-n.to>20?a(e):e.operation((function(){n.from<t.from&&(o(e,n.from,t.from),t.from=n.from),n.to>t.to&&(o(e,t.to,n.to),t.to=n.to)}))}),n.updateViewportTimeSpan||400)}}function u(e,t){var n=e.state.foldGutter;if(n){var r=t.line;r>=n.from&&r<n.to&&o(e,r,r+1)}}}(n(0),n(6))},function(e,t,n){!function(e){"use strict";e.runMode=function(t,n,r,i){var o=e.getMode(e.defaults,n),a=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<9);if(r.appendChild){var l=i&&i.tabSize||e.defaults.tabSize,s=r,c=0;s.innerHTML="",r=function(e,t){if("\n"==e)return s.appendChild(document.createTextNode(a?"\r":e)),void(c=0);for(var n="",r=0;;){var i=e.indexOf("\t",r);if(-1==i){n+=e.slice(r),c+=e.length-r;break}c+=i-r,n+=e.slice(r,i);var o=l-c%l;c+=o;for(var u=0;u<o;++u)n+=" ";r=i+1}if(t){var f=s.appendChild(document.createElement("span"));f.className="cm-"+t.replace(/ +/g," cm-"),f.appendChild(document.createTextNode(n))}else s.appendChild(document.createTextNode(n))}}for(var u=e.splitLines(t),f=i&&i.state||e.startState(o),d=0,h=u.length;d<h;++d){d&&r("\n");var p=new e.StringStream(u[d]);for(!p.string&&o.blankLine&&o.blankLine(f);!p.eol();){var m=o.token(p,f);r(p.current(),m,d,p.start,f),p.start=p.pos}}}}(n(0))},function(e,t,n){!function(e){function t(e){e.state.placeholder&&(e.state.placeholder.parentNode.removeChild(e.state.placeholder),e.state.placeholder=null)}function n(e){t(e);var n=e.state.placeholder=document.createElement("pre");n.style.cssText="height: 0; overflow: visible",n.style.direction=e.getOption("direction"),n.className="CodeMirror-placeholder CodeMirror-line-like";var r=e.getOption("placeholder");"string"==typeof r&&(r=document.createTextNode(r)),n.appendChild(r),e.display.lineSpace.insertBefore(n,e.display.lineSpace.firstChild)}function r(e){o(e)&&n(e)}function i(e){var r=e.getWrapperElement(),i=o(e);r.className=r.className.replace(" CodeMirror-empty","")+(i?" CodeMirror-empty":""),i?n(e):t(e)}function o(e){return 1===e.lineCount()&&""===e.getLine(0)}e.defineOption("placeholder","",(function(n,o,a){var l=a&&a!=e.Init;if(o&&!l)n.on("blur",r),n.on("change",i),n.on("swapDoc",i),i(n);else if(!o&&l){n.off("blur",r),n.off("change",i),n.off("swapDoc",i),t(n);var s=n.getWrapperElement();s.className=s.className.replace(" CodeMirror-empty","")}o&&!n.hasFocus()&&r(n)}))}(n(0))}]);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/devtools/client/shared/sourceeditor/codemirror/mode/javascript/javascript.js firefox-85.0+build1/devtools/client/shared/sourceeditor/codemirror/mode/javascript/javascript.js
--- firefox-84.0.2+build1/devtools/client/shared/sourceeditor/codemirror/mode/javascript/javascript.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/sourceeditor/codemirror/mode/javascript/javascript.js	2021-01-18 19:58:08.000000000 +0000
@@ -98,21 +98,25 @@
     } else if (ch == "`") {
       state.tokenize = tokenQuasi;
       return tokenQuasi(stream, state);
-    } else if (ch == "#") {
+    } else if (ch == "#" && stream.peek() == "!") {
       stream.skipToEnd();
-      return ret("error", "error");
-    } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+      return ret("meta", "meta");
+    } else if (ch == "#" && stream.eatWhile(wordRE)) {
+      return ret("variable", "property")
+    } else if (ch == "<" && stream.match("!--") ||
+               (ch == "-" && stream.match("->") && !/\S/.test(stream.string.slice(0, stream.start)))) {
       stream.skipToEnd()
       return ret("comment", "comment")
     } else if (isOperatorChar.test(ch)) {
       if (ch != ">" || !state.lexical || state.lexical.type != ">") {
         if (stream.eat("=")) {
           if (ch == "!" || ch == "=") stream.eat("=")
-        } else if (/[<>*+\-]/.test(ch)) {
+        } else if (/[<>*+\-|&?]/.test(ch)) {
           stream.eat(ch)
           if (ch == ">") stream.eat(ch)
         }
       }
+      if (ch == "?" && stream.eat(".")) return ret(".")
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
@@ -122,7 +126,7 @@
           var kw = keywords[word]
           return ret(kw.type, kw.style, word)
         }
-        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+        if (word == "async" && stream.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/, false))
           return ret("async", "keyword", word)
       }
       return ret("variable", "variable", word)
@@ -417,7 +421,7 @@
   }
   function parenExpr(type) {
     if (type != "(") return pass()
-    return cont(pushlex(")"), expression, expect(")"), poplex)
+    return cont(pushlex(")"), maybeexpression, expect(")"), poplex)
   }
   function expressionInner(type, value, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {
@@ -446,7 +450,7 @@
   }
 
   function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
+    if (type == ",") return cont(maybeexpression);
     return maybeoperatorNoComma(type, value, false);
   }
   function maybeoperatorNoComma(type, value, noComma) {
@@ -455,7 +459,7 @@
     if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
-      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+      if (isTS && value == "<" && cx.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/, false))
         return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
@@ -757,11 +761,11 @@
     }
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
-      return cont(isTS ? classfield : functiondef, classBody);
+      return cont(classfield, classBody);
     }
-    if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
+    if (type == "number" || type == "string") return cont(classfield, classBody);
     if (type == "[")
-      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+      return cont(expression, maybetype, expect("]"), classfield, classBody)
     if (value == "*") {
       cx.marked = "keyword";
       return cont(classBody);
@@ -864,7 +868,7 @@
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
+      if (state.tokenize == tokenComment || state.tokenize == tokenQuasi) return CodeMirror.Pass;
       if (state.tokenize != tokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
       // Kludge to prevent 'maybelse' from blocking lexical scope pops
diff -Nru firefox-84.0.2+build1/devtools/client/shared/test/browser_dbg_debugger-statement.js firefox-85.0+build1/devtools/client/shared/test/browser_dbg_debugger-statement.js
--- firefox-84.0.2+build1/devtools/client/shared/test/browser_dbg_debugger-statement.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/test/browser_dbg_debugger-statement.js	2021-01-18 19:58:08.000000000 +0000
@@ -48,8 +48,8 @@
     // We have to use the watcher in order to create the frame target
     // and also have to attach to it in order to later be able to
     // create the thread front
-    const watcher = await target.getWatcher();
-    await watcher.watchTargets("frame");
+    const watcherFront = await target.getWatcherFront();
+    await watcherFront.watchTargets("frame");
     const iframeTarget = await target.getBrowsingContextTarget(
       iframeBrowsingContext.id
     );
diff -Nru firefox-84.0.2+build1/devtools/client/shared/test/helper_addons.js firefox-85.0+build1/devtools/client/shared/test/helper_addons.js
--- firefox-84.0.2+build1/devtools/client/shared/test/helper_addons.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/test/helper_addons.js	2021-01-18 19:58:08.000000000 +0000
@@ -32,22 +32,20 @@
 }
 
 function removeAddon(addon) {
-  info("Removing addon.");
+  return new Promise(resolve => {
+    info("Removing addon.");
 
-  const defer = require("devtools/shared/defer");
-  const deferred = defer();
+    const listener = {
+      onUninstalled: function(uninstalledAddon) {
+        if (uninstalledAddon != addon) {
+          return;
+        }
+        AddonManager.removeAddonListener(listener);
+        resolve();
+      },
+    };
 
-  const listener = {
-    onUninstalled: function(uninstalledAddon) {
-      if (uninstalledAddon != addon) {
-        return;
-      }
-      AddonManager.removeAddonListener(listener);
-      deferred.resolve();
-    },
-  };
-  AddonManager.addAddonListener(listener);
-  addon.uninstall();
-
-  return deferred.promise;
+    AddonManager.addAddonListener(listener);
+    addon.uninstall();
+  });
 }
diff -Nru firefox-84.0.2+build1/devtools/client/shared/test/shared-head.js firefox-85.0+build1/devtools/client/shared/test/shared-head.js
--- firefox-84.0.2+build1/devtools/client/shared/test/shared-head.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/test/shared-head.js	2021-01-18 19:58:08.000000000 +0000
@@ -482,7 +482,7 @@
     null,
     isErrorPage
   );
-  await BrowserTestUtils.loadURI(browser, uri);
+  BrowserTestUtils.loadURI(browser, uri);
 
   info(`Waiting for page to be loaded…`);
   await onBrowserLoaded;
diff -Nru firefox-84.0.2+build1/devtools/client/shared/toolbarbutton.css firefox-85.0+build1/devtools/client/shared/toolbarbutton.css
--- firefox-84.0.2+build1/devtools/client/shared/toolbarbutton.css	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/toolbarbutton.css	2021-01-18 19:58:08.000000000 +0000
@@ -59,11 +59,11 @@
 
 /* Selectable button which is unchecked. */
 
-.devtools-toolbarbutton[label]:not(:is([checked=true],[disabled])):hover {
+.devtools-toolbarbutton[label]:not([checked=true],[disabled]):hover {
   background-color: var(--toolbarbutton-hover-background);
 }
 
-.devtools-toolbarbutton:not(:is([checked=true],[disabled]))[label]:focus {
+.devtools-toolbarbutton:not([checked=true],[disabled])[label]:focus {
   background-color: var(--toolbarbutton-focus-background);
   color: var(--toolbarbutton-focus-color);
 }
diff -Nru firefox-84.0.2+build1/devtools/client/shared/undo.js firefox-85.0+build1/devtools/client/shared/undo.js
--- firefox-84.0.2+build1/devtools/client/shared/undo.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/shared/undo.js	2021-01-18 19:58:08.000000000 +0000
@@ -79,7 +79,6 @@
     this._stack.push(entry);
     this._index = this._stack.length;
     entry.do();
-    this._change();
   },
 
   /**
@@ -111,7 +110,6 @@
       return false;
     }
     this._stack[--this._index].undo();
-    this._change();
     return true;
   },
 
@@ -132,17 +130,9 @@
       return false;
     }
     this._stack[this._index++].do();
-    this._change();
     return true;
   },
 
-  _change: function() {
-    if (this._controllerWindow) {
-      this._controllerWindow.goUpdateCommand("cmd_undo");
-      this._controllerWindow.goUpdateCommand("cmd_redo");
-    }
-  },
-
   /**
    * ViewController implementation for undo/redo.
    */
diff -Nru firefox-84.0.2+build1/devtools/client/styleeditor/StyleEditorUI.jsm firefox-85.0+build1/devtools/client/styleeditor/StyleEditorUI.jsm
--- firefox-84.0.2+build1/devtools/client/styleeditor/StyleEditorUI.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/styleeditor/StyleEditorUI.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -477,21 +477,7 @@
           const stylesheetsFront = await this.currentTarget.getFront(
             "stylesheets"
           );
-
-          const traits = await stylesheetsFront.getTraits();
-          if (traits.isFileNameSupported) {
-            // FF81+ addStyleSheet of StyleSheetsFront supports file name parameter.
-            stylesheetsFront.addStyleSheet(source, selectedFile.path);
-          } else {
-            const styleSheet = await stylesheetsFront.addStyleSheet(source);
-            styleSheet.isNew = true;
-            const editor = await this._addStyleSheet({ styleSheet });
-            if (editor) {
-              editor.savedFile = selectedFile;
-            }
-            // Just for testing purposes.
-            this.emit("test:editor-updated", editor);
-          }
+          stylesheetsFront.addStyleSheet(source, selectedFile.path);
         }
       );
     };
diff -Nru firefox-84.0.2+build1/devtools/client/styleeditor/StyleSheetEditor.jsm firefox-85.0+build1/devtools/client/styleeditor/StyleSheetEditor.jsm
--- firefox-84.0.2+build1/devtools/client/styleeditor/StyleSheetEditor.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/styleeditor/StyleSheetEditor.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -276,16 +276,12 @@
    */
   async _getSourceTextAndPrettify() {
     const styleSheetsFront = await this._getStyleSheetsFront();
-    const traits = await styleSheetsFront.getTraits();
 
     let longStr = null;
     if (this.styleSheet.isOriginalSource) {
       // If the stylesheet is OriginalSource, we should get the texts from SourceMapService.
       // So, for now, we use OriginalSource.getText() as it is.
       longStr = await this.styleSheet.getText();
-    } else if (!traits.supportResourceRequests) {
-      // Backward compat, can be removed when FF 81 hits release.
-      longStr = await this.styleSheet.getText();
     } else {
       longStr = await styleSheetsFront.getText(this.resourceId);
     }
@@ -556,13 +552,7 @@
    */
   async toggleDisabled() {
     const styleSheetsFront = await this._getStyleSheetsFront();
-    const traits = await styleSheetsFront.getTraits();
-
-    if (traits.supportResourceRequests) {
-      styleSheetsFront.toggleDisabled(this.resourceId).catch(console.error);
-    } else {
-      this.styleSheet.toggleDisabled().catch(console.error);
-    }
+    styleSheetsFront.toggleDisabled(this.resourceId).catch(console.error);
   },
 
   /**
@@ -608,17 +598,12 @@
 
     try {
       const styleSheetsFront = await this._getStyleSheetsFront();
-      const traits = await styleSheetsFront.getTraits();
+      await styleSheetsFront.update(
+        this.resourceId,
+        this._state.text,
+        this.transitionsEnabled
+      );
 
-      if (traits.supportResourceRequests) {
-        await styleSheetsFront.update(
-          this.resourceId,
-          this._state.text,
-          this.transitionsEnabled
-        );
-      } else {
-        await this.styleSheet.update(this._state.text, this.transitionsEnabled);
-      }
       // Clear any existing mappings from automatic CSS prettification
       // because they were likely invalided by manually editing the stylesheet.
       this._mappings = null;
@@ -823,18 +808,12 @@
       this._isUpdating = true;
 
       const styleSheetsFront = await this._getStyleSheetsFront();
-      const traits = await styleSheetsFront.getTraits();
 
-      if (traits.supportResourceRequests) {
-        await styleSheetsFront.update(
-          this.resourceId,
-          text,
-          this.transitionsEnabled
-        );
-      } else {
-        const relatedSheet = this.styleSheet.relatedStyleSheet;
-        await relatedSheet.update(text, this.transitionsEnabled);
-      }
+      await styleSheetsFront.update(
+        this.resourceId,
+        text,
+        this.transitionsEnabled
+      );
     }, this.markLinkedFileBroken);
   },
 
diff -Nru firefox-84.0.2+build1/devtools/client/themes/tooltips.css firefox-85.0+build1/devtools/client/themes/tooltips.css
--- firefox-84.0.2+build1/devtools/client/themes/tooltips.css	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/themes/tooltips.css	2021-01-18 19:58:08.000000000 +0000
@@ -485,7 +485,7 @@
   width: 100%;
 }
 
-.tooltip-container[type="doorhanger"] .menuitem > .command:not(:is([disabled],[open],:active)):is(:hover,:focus) {
+.tooltip-container[type="doorhanger"] .menuitem > .command:not([disabled],[open],:active):is(:hover,:focus) {
   background-color: var(--theme-arrowpanel-dimmed);
 }
 
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/actions/input.js firefox-85.0+build1/devtools/client/webconsole/actions/input.js
--- firefox-84.0.2+build1/devtools/client/webconsole/actions/input.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/actions/input.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
   EVALUATE_EXPRESSION,
   SET_TERMINAL_INPUT,
   SET_TERMINAL_EAGER_RESULT,
+  EDITOR_PRETTY_PRINT,
 } = require("devtools/client/webconsole/constants");
 const { getAllPrefs } = require("devtools/client/webconsole/selectors/prefs");
 const {
@@ -110,13 +111,7 @@
       })
       .then(onSettled, onSettled);
 
-    // Before Firefox 77, the response did not have a `startTime` property, so we're using
-    // the `resultID`, which does contain the server time at which the evaluation started
-    // (its shape is `${timestamp}-${someId}`).
-    const serverConsoleCommandTimestamp =
-      response.startTime ||
-      (response.resultID && Number(response.resultID.replace(/\-\d*$/, ""))) ||
-      null;
+    const serverConsoleCommandTimestamp = response.startTime;
 
     // In case of remote debugging, it might happen that the debuggee page does not have
     // the exact same clock time as the client. This could cause some ordering issues
@@ -364,10 +359,17 @@
   return result;
 }
 
+function prettyPrintEditor() {
+  return {
+    type: EDITOR_PRETTY_PRINT,
+  };
+}
+
 module.exports = {
   evaluateExpression,
   focusInput,
   setInputValue,
   terminalInputChanged,
   updateInstantEvaluationResultForCurrentExpression,
+  prettyPrintEditor,
 };
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/actions/toolbox.js firefox-85.0+build1/devtools/client/webconsole/actions/toolbox.js
--- firefox-84.0.2+build1/devtools/client/webconsole/actions/toolbox.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/actions/toolbox.js	2021-01-18 19:58:08.000000000 +0000
@@ -34,9 +34,9 @@
   };
 }
 
-function openNodeInInspector(actor) {
+function openNodeInInspector(contentDomReference) {
   return ({ hud }) => {
-    hud.openNodeInInspector({ actor: actor });
+    hud.openNodeInInspector({ contentDomReference });
   };
 }
 
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/components/App.css firefox-85.0+build1/devtools/client/webconsole/components/App.css
--- firefox-84.0.2+build1/devtools/client/webconsole/components/App.css	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/components/App.css	2021-01-18 19:58:08.000000000 +0000
@@ -197,11 +197,8 @@
   /* Let the reverse search buttons wrap to the next line */
   flex-wrap: wrap;
   justify-content: end;
-  border-top: 1px solid var(--theme-splitter-color);
-  border-inline-end: 1px solid var(--theme-splitter-color);
 }
 
-
 .sidebar {
   display: grid;
   grid-area: sidebar;
@@ -304,16 +301,18 @@
      * The following elements are going to be present in the toolbar:
      *   - The run button
      *   - The evaluation selector button
+     *   - The pretty print button
+     *   - A separator
      *   - The history nav
      *   - A separator
      *   - The close button
      *
      * +-------------------------------------------+
-     * | ▶︎ Run  Top↕                    ˄ ˅ � | ✕ |
+     * | ▶︎ Run  Top↕               {} | ˄ ˅ � | ✕ |
      * +-------------------------------------------+
      *
      */
-  grid-template-columns: auto auto 1fr auto auto auto auto auto;
+  grid-template-columns: auto auto 1fr auto auto auto auto auto auto auto;
   height: unset;
 }
 
@@ -335,6 +334,14 @@
   margin-inline-end: 2px;
 }
 
+.jsterm-editor .webconsole-editor-toolbar .webconsole-editor-toolbar-prettyPrintButton {
+  grid-column: -7 / -8;
+}
+
+.jsterm-editor .webconsole-editor-toolbar .webconsole-editor-toolbar-prettyPrintSeparator {
+  grid-column: -6 / -7;
+}
+
 .jsterm-editor .webconsole-editor-toolbar .webconsole-editor-toolbar-history-prevExpressionButton {
   grid-column: -5 / -6;
 }
@@ -355,6 +362,12 @@
   grid-column: -1 / -2;
 }
 
+.jsterm-editor .webconsole-editor-toolbar .webconsole-editor-toolbar-prettyPrintButton::before {
+  mask-image: url("chrome://devtools/content/debugger/images/prettyPrint.svg");
+  background-size: 16px;
+  background-color: var(--theme-icon-color);
+}
+
 .jsterm-editor .webconsole-editor-toolbar .webconsole-editor-toolbar-history-prevExpressionButton::before {
   background-image: url("chrome://devtools/skin/images/arrowhead-up.svg");
   background-size: 16px;
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/components/Input/EditorToolbar.js firefox-85.0+build1/devtools/client/webconsole/components/Input/EditorToolbar.js
--- firefox-84.0.2+build1/devtools/client/webconsole/components/Input/EditorToolbar.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/components/Input/EditorToolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -105,6 +105,18 @@
       this.renderEvaluationContextSelector(),
       dom.button({
         className:
+          "devtools-button webconsole-editor-toolbar-prettyPrintButton",
+        title: l10n.getStr(
+          "webconsole.editor.toolbar.prettyPrintButton.tooltip"
+        ),
+        onClick: () => dispatch(actions.prettyPrintEditor()),
+      }),
+      dom.div({
+        className:
+          "devtools-separator webconsole-editor-toolbar-prettyPrintSeparator",
+      }),
+      dom.button({
+        className:
           "devtools-button webconsole-editor-toolbar-history-prevExpressionButton",
         title: l10n.getStr(
           "webconsole.editor.toolbar.history.prevExpressionButton.tooltip"
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/components/Input/JSTerm.js firefox-85.0+build1/devtools/client/webconsole/components/Input/JSTerm.js
--- firefox-84.0.2+build1/devtools/client/webconsole/components/Input/JSTerm.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/components/Input/JSTerm.js	2021-01-18 19:58:08.000000000 +0000
@@ -45,6 +45,11 @@
   true
 );
 loader.lazyRequireGetter(this, "saveAs", "devtools/shared/DevToolsUtils", true);
+loader.lazyRequireGetter(
+  this,
+  "beautify",
+  "devtools/shared/jsbeautify/beautify"
+);
 
 // React & Redux
 const {
@@ -113,6 +118,7 @@
       // Is the input in editor mode.
       editorMode: PropTypes.bool,
       editorWidth: PropTypes.number,
+      editorPrettifiedAt: PropTypes.number,
       showEditorOnboarding: PropTypes.bool,
       autocomplete: PropTypes.bool,
       showEvaluationContextSelector: PropTypes.bool,
@@ -596,6 +602,23 @@
     ) {
       this.autocompletePopup.position = nextProps.autocompletePopupPosition;
     }
+
+    if (
+      nextProps.editorPrettifiedAt &&
+      nextProps.editorPrettifiedAt !== this.props.editorPrettifiedAt
+    ) {
+      this._setValue(
+        beautify.js(this._getValue(), {
+          // Read directly from prefs because this.editor.config.indentUnit and
+          // this.editor.getOption('indentUnit') are not really synced with
+          // prefs.
+          indent_size: Services.prefs.getIntPref("devtools.editor.tabsize"),
+          indent_with_tabs: !Services.prefs.getBoolPref(
+            "devtools.editor.expandtab"
+          ),
+        })
+      );
+    }
   }
 
   /**
@@ -1548,6 +1571,7 @@
     showEditorOnboarding: state.ui.showEditorOnboarding,
     showEvaluationContextSelector: state.ui.showEvaluationContextSelector,
     autocompletePopupPosition: state.prefs.eagerEvaluation ? "top" : "bottom",
+    editorPrettifiedAt: state.ui.editorPrettifiedAt,
   };
 }
 
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/components/Input/ReverseSearchInput.css firefox-85.0+build1/devtools/client/webconsole/components/Input/ReverseSearchInput.css
--- firefox-84.0.2+build1/devtools/client/webconsole/components/Input/ReverseSearchInput.css	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/components/Input/ReverseSearchInput.css	2021-01-18 19:58:08.000000000 +0000
@@ -10,19 +10,23 @@
   padding-block-start: 2px;
   align-items: baseline;
   border: 1px solid transparent;
+  border-top-color: var(--theme-splitter-color);
   transition: border-color 0.2s ease-in-out;
 }
 
+.jsterm-editor .reverse-search {
+  border-inline-end-color: var(--theme-splitter-color);
+}
 
 /* Add a border radius match the borders of the window on Mac OS
  * and hide the border radius on the right if the sidebar or editor
  * is open. */
 :root[platform="mac"] .webconsole-app .reverse-search {
-  border-bottom-left-radius: 5px;
+  border-end-start-radius: 5px;
 }
 :root[platform="mac"] .webconsole-app:not(.jsterm-editor):not(.sidebar-visible) .reverse-search
 {
-  border-bottom-right-radius: 5px;
+  border-end-end-radius: 5px;
 }
 
 .reverse-search:focus-within {
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/constants.js firefox-85.0+build1/devtools/client/webconsole/constants.js
--- firefox-84.0.2+build1/devtools/client/webconsole/constants.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/constants.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,7 @@
   CLEAR_HISTORY: "CLEAR_HISTORY",
   EDITOR_TOGGLE: "EDITOR_TOGGLE",
   EDITOR_ONBOARDING_DISMISS: "EDITOR_ONBOARDING_DISMISS",
+  EDITOR_PRETTY_PRINT: "EDITOR_PRETTY_PRINT",
   EVALUATE_EXPRESSION: "EVALUATE_EXPRESSION",
   SET_TERMINAL_INPUT: "SET_TERMINAL_INPUT",
   SET_TERMINAL_EAGER_RESULT: "SET_TERMINAL_EAGER_RESULT",
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/reducers/ui.js firefox-85.0+build1/devtools/client/webconsole/reducers/ui.js
--- firefox-84.0.2+build1/devtools/client/webconsole/reducers/ui.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/reducers/ui.js	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,7 @@
   FILTERBAR_DISPLAY_MODES,
   EDITOR_ONBOARDING_DISMISS,
   EDITOR_TOGGLE,
+  EDITOR_PRETTY_PRINT,
   EDITOR_SET_WIDTH,
 } = require("devtools/client/webconsole/constants");
 
@@ -39,6 +40,7 @@
         reverseSearchInitialValue: "",
         editor: false,
         editorWidth: null,
+        editorPrettifiedAt: null,
         showEditorOnboarding: false,
         filterBarDisplayMode: FILTERBAR_DISPLAY_MODES.WIDE,
       },
@@ -99,6 +101,11 @@
         ...state,
         editorWidth: action.width,
       };
+    case EDITOR_PRETTY_PRINT:
+      return {
+        ...state,
+        editorPrettifiedAt: Date.now(),
+      };
   }
 
   return state;
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_jsterm_editor_toolbar.js	2021-01-18 19:58:08.000000000 +0000
@@ -98,6 +98,67 @@
   nextHistoryButton.click();
   is(getInputValue(hud), "");
 
+  info("Test that clicking the pretty print button works as expected");
+  const expressionToPrettyPrint = [
+    // [raw, prettified, prettifiedWithTab, prettifiedWith4Spaces]
+    ["fn=n=>n*n", "fn = n => n * n", "fn = n => n * n", "fn = n => n * n"],
+    [
+      "{x:1, y:2}",
+      "{\n  x: 1,\n  y: 2\n}",
+      "{\n\tx: 1,\n\ty: 2\n}",
+      "{\n    x: 1,\n    y: 2\n}",
+    ],
+    [
+      "async function test() {await new Promise(res => {})}",
+      "async function test() {\n  await new Promise(res => {})\n}",
+      "async function test() {\n\tawait new Promise(res => {})\n}",
+      "async function test() {\n    await new Promise(res => {})\n}",
+    ],
+  ];
+
+  const prettyPrintButton = toolbar.querySelector(
+    ".webconsole-editor-toolbar-prettyPrintButton"
+  );
+  ok(prettyPrintButton, "The pretty print button is displayed in editor mode");
+  for (const [
+    input,
+    output,
+    outputWithTab,
+    outputWith4Spaces,
+  ] of expressionToPrettyPrint) {
+    // Setting the input value.
+    setInputValue(hud, input);
+    await pushPref("devtools.editor.tabsize", 2);
+    prettyPrintButton.click();
+    is(
+      getInputValue(hud),
+      output,
+      `Pretty print works for expression ${input}`
+    );
+    // Turn on indent with tab.
+    await pushPref("devtools.editor.expandtab", false);
+    prettyPrintButton.click();
+    is(
+      getInputValue(hud),
+      outputWithTab,
+      `Pretty print works for expression ${input} when expandtab is false`
+    );
+    await pushPref("devtools.editor.expandtab", true);
+    // Set indent size to 4.
+    await pushPref("devtools.editor.tabsize", 4);
+    prettyPrintButton.click();
+    is(
+      getInputValue(hud),
+      outputWith4Spaces,
+      `Pretty print works for expression ${input} when tabsize is 4`
+    );
+    await pushPref("devtools.editor.tabsize", 2);
+    ok(
+      isInputFocused(hud),
+      "input is still focused after clicking the pretty print button"
+    );
+  }
+
   info("Test that clicking the close button works as expected");
   const closeButton = toolbar.querySelector(
     ".webconsole-editor-toolbar-closeButton"
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_cors_errors.js	2021-01-18 19:58:08.000000000 +0000
@@ -40,14 +40,14 @@
   await checkCorsMessage(message, "CORSDisabled");
   await pushPref("content.cors.disable", false);
 
-  info("Test CORSPreflightDidNotSucceed2");
+  info("Test CORSPreflightDidNotSucceed");
   onCorsMessage = waitForMessage(
     hud,
     `CORS preflight response did not succeed`
   );
-  makeFaultyCorsCall("CORSPreflightDidNotSucceed2");
+  makeFaultyCorsCall("CORSPreflightDidNotSucceed");
   message = await onCorsMessage;
-  await checkCorsMessage(message, "CORSPreflightDidNotSucceed2");
+  await checkCorsMessage(message, "CORSPreflightDidNotSucceed");
 
   info("Test CORS did not succeed");
   onCorsMessage = waitForMessage(hud, "Reason: CORS request did not succeed");
@@ -146,7 +146,7 @@
   message = await onCorsMessage;
   await checkCorsMessage(message, "CORSInvalidAllowHeader");
 
-  info("Test CORSMissingAllowHeaderFromPreflight2");
+  info("Test CORSMissingAllowHeaderFromPreflight");
   onCorsMessage = waitForMessage(
     hud,
     `Reason: header ${quote("xyz")} is not allowed according to ` +
@@ -154,9 +154,9 @@
         "Access-Control-Allow-Headers"
       )} from CORS preflight response`
   );
-  makeFaultyCorsCall("CORSMissingAllowHeaderFromPreflight2");
+  makeFaultyCorsCall("CORSMissingAllowHeaderFromPreflight");
   message = await onCorsMessage;
-  await checkCorsMessage(message, "CORSMissingAllowHeaderFromPreflight2");
+  await checkCorsMessage(message, "CORSMissingAllowHeaderFromPreflight");
 
   // See Bug 1480671.
   // XXX: how to make Origin to not be included in the request ?
@@ -216,7 +216,7 @@
         options.credentials = "include";
       }
 
-      if (category === "CORSMissingAllowHeaderFromPreflight2") {
+      if (category === "CORSMissingAllowHeaderFromPreflight") {
         options.headers = new content.Headers({ xyz: true });
       }
 
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_document_focus.js	2021-01-18 19:58:08.000000000 +0000
@@ -69,7 +69,7 @@
   await SpecialPowers.spawn(firstTab.linkedBrowser, [], async () => {
     // For some reason, there is no blur event fired on the document
     await ContentTaskUtils.waitForCondition(
-      () => !docShell.isActive && !content.document.hasFocus(),
+      () => !content.browsingContext.isActive && !content.document.hasFocus(),
       "Waiting for first tab to become inactive"
     );
     content.onFocus = new Promise(resolve => {
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_object_inspector_nested_promise.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,85 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Check evaluating and expanding promises in the console.
+const TEST_URI =
+  "data:text/html;charset=utf8," +
+  "<h1>Object Inspector on deeply nested promises</h1>";
+
+add_task(async function testExpandNestedPromise() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+
+  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], function() {
+    let nestedPromise = Promise.resolve({});
+    for (let i = 0; i < 5; ++i) {
+      Object.setPrototypeOf(nestedPromise, null);
+      nestedPromise = Promise.resolve(nestedPromise);
+    }
+    content.wrappedJSObject.console.log("oi-test", nestedPromise);
+  });
+
+  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const oi = node.querySelector(".tree");
+  const [promiseNode] = getObjectInspectorNodes(oi);
+
+  expandObjectInspectorNode(promiseNode);
+  await waitFor(() => getObjectInspectorNodes(oi).length > 1);
+  checkChildren(promiseNode, [`<state>`, `<value>`]);
+
+  const valueNode = findObjectInspectorNode(oi, "<value>");
+  expandObjectInspectorNode(valueNode);
+  await waitFor(() => getObjectInspectorChildrenNodes(valueNode).length > 0);
+  checkChildren(valueNode, [`<state>`, `<value>`]);
+});
+
+add_task(async function testExpandCyclicPromise() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+
+  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], function() {
+    let resolve;
+    const cyclicPromise = new Promise(r => {
+      resolve = r;
+    });
+    Object.setPrototypeOf(cyclicPromise, null);
+    const otherPromise = Promise.reject(cyclicPromise);
+    otherPromise.catch(() => {});
+    Object.setPrototypeOf(otherPromise, null);
+    resolve(otherPromise);
+    content.wrappedJSObject.console.log("oi-test", cyclicPromise);
+  });
+
+  const node = await waitFor(() => findMessage(hud, "oi-test"));
+  const oi = node.querySelector(".tree");
+  const [promiseNode] = getObjectInspectorNodes(oi);
+
+  expandObjectInspectorNode(promiseNode);
+  await waitFor(() => getObjectInspectorNodes(oi).length > 1);
+  checkChildren(promiseNode, [`<state>`, `<value>`]);
+
+  const valueNode = findObjectInspectorNode(oi, "<value>");
+  expandObjectInspectorNode(valueNode);
+  await waitFor(() => getObjectInspectorChildrenNodes(valueNode).length > 0);
+  checkChildren(valueNode, [`<state>`, `<reason>`]);
+
+  const reasonNode = findObjectInspectorNode(oi, "<reason>");
+  expandObjectInspectorNode(reasonNode);
+  await waitFor(() => getObjectInspectorChildrenNodes(reasonNode).length > 0);
+  checkChildren(reasonNode, [`<state>`, `<value>`]);
+});
+
+function checkChildren(node, expectedChildren) {
+  const children = getObjectInspectorChildrenNodes(node);
+  is(
+    children.length,
+    expectedChildren.length,
+    "There is the expected number of children"
+  );
+  children.forEach((child, index) => {
+    ok(
+      child.textContent.includes(expectedChildren[index]),
+      `Expected "${expectedChildren[index]}" child`
+    );
+  });
+}
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_output_order.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,22 +15,36 @@
 
   const evaluationResultMessage = await executeAndWaitForMessage(
     hud,
-    "console.log('foo', 'bar')",
+    `for (let i = 0; i < 5; i++) { console.log("item-" + i); }`,
     "undefined",
     ".result"
   );
-  const commandMessage = findMessage(hud, "console.log");
-  const logMessage = findMessage(hud, "foo bar");
 
+  info("Wait for all the log messages to be displayed");
+  // Console messages are batched by the Resource watcher API and might be rendered after
+  // the result message.
+  const logMessages = await waitFor(() => {
+    const messages = findMessages(hud, "item-", ".log.message:not(.command)");
+    return messages.length === 5 ? messages : null;
+  });
+
+  const commandMessage = findMessage(hud, "", ".command");
   is(
     commandMessage.nextElementSibling,
-    logMessage,
-    "console.log() is followed by 'foo' 'bar'"
+    logMessages[0],
+    `the command message is followed by the first log message ( Got "${commandMessage.nextElementSibling.textContent}")`
   );
 
+  for (let i = 0; i < logMessages.length; i++) {
+    ok(
+      logMessages[i].textContent.includes(`item-${i}`),
+      `The log message item-${i} is at the expected position ( Got "${logMessages[i].textContent}")`
+    );
+  }
+
   is(
-    logMessage.nextElementSibling,
+    logMessages[logMessages.length - 1].nextElementSibling,
     evaluationResultMessage.node,
-    "'foo bar' is followed by undefined"
+    "The evaluation result is after the last log message"
   );
 });
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_warn_about_replaced_api.js	2021-01-18 19:58:08.000000000 +0000
@@ -21,7 +21,7 @@
   const onBrowserLoaded = BrowserTestUtils.browserLoaded(
     gBrowser.selectedBrowser
   );
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI_REPLACED);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI_REPLACED);
   await onBrowserLoaded;
 
   const toolbox = await openToolboxForTab(gBrowser.selectedTab, "webconsole");
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_wasm_errors.js firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_wasm_errors.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/browser_webconsole_wasm_errors.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/browser_webconsole_wasm_errors.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,51 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that WASM errors are reported to the console.
+
+"use strict";
+
+const TEST_URI = `data:text/html;charset=utf-8,Wasm errors`;
+
+add_task(async function() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+
+  const onCompileError = waitForMessage(
+    hud,
+    `Uncaught (in promise) CompileError: wasm validation error: at offset 0: failed to match magic number`,
+    ".error"
+  );
+  execute(hud, `WebAssembly.instantiate(new Uint8Array())`);
+  await onCompileError;
+  ok(true, "The expected error message is displayed for CompileError");
+
+  const onLinkError = waitForMessage(
+    hud,
+    `Uncaught (in promise) LinkError: import object field 'f' is not a Function`,
+    ".error"
+  );
+  execute(
+    hud,
+    `WebAssembly.instantiate(
+      new Uint8Array([0,97,115,109,1,0,0,0,1,4,1,96,0,0,2,7,1,1,109,1,102,0,0]),
+      { m: { f: 3 } }
+    )`
+  );
+  await onLinkError;
+  ok(true, "The expected error message is displayed for LinkError");
+
+  const onRuntimeError = waitForMessage(
+    hud,
+    "Uncaught RuntimeError: unreachable executed",
+    ".error"
+  );
+  execute(
+    hud,
+    `
+    const uintArray = new Uint8Array([0,97,115,109,1,0,0,0,1,4,1,96,0,0,3,2,1,0,7,7,1,3,114,117,110,0,0,10,5,1,3,0,0,11]);
+    const module = new WebAssembly.Module(uintArray);
+    new WebAssembly.Instance(module).exports.run()`
+  );
+  await onRuntimeError;
+  ok(true, "The expected error message is displayed for RuntimeError");
+});
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/sjs_cors-test-server.sjs firefox-85.0+build1/devtools/client/webconsole/test/browser/sjs_cors-test-server.sjs
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/sjs_cors-test-server.sjs	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/sjs_cors-test-server.sjs	2021-01-18 19:58:08.000000000 +0000
@@ -47,8 +47,8 @@
     case "CORSMissingAllowCredentials":
       corsMissingAllowCredentials(request, response);
       break;
-    case "CORSPreflightDidNotSucceed2":
-      corsPreflightDidNotSucceed2(request, response);
+    case "CORSPreflightDidNotSucceed":
+      corsPreflightDidNotSucceed(request, response);
       break;
     case "CORSInvalidAllowMethod":
       corsInvalidAllowMethod(request, response);
@@ -56,8 +56,8 @@
     case "CORSInvalidAllowHeader":
       corsInvalidAllowHeader(request, response);
       break;
-    case "CORSMissingAllowHeaderFromPreflight2":
-      corsMissingAllowHeaderFromPreflight2(request, response);
+    case "CORSMissingAllowHeaderFromPreflight":
+      corsMissingAllowHeaderFromPreflight(request, response);
       break;
   }
 }
@@ -94,12 +94,20 @@
 }
 
 function corsAllowOriginNotMatchingOrigin(request, response) {
-  response.setStatusLine(request.httpVersion, 200, "corsAllowOriginNotMatchingOrigin");
+  response.setStatusLine(
+    request.httpVersion,
+    200,
+    "corsAllowOriginNotMatchingOrigin"
+  );
   response.setHeader("Access-Control-Allow-Origin", "mochi.test");
 }
 
 function corsNotSupportingCredentials(request, response) {
-  response.setStatusLine(request.httpVersion, 200, "corsNotSupportingCredentials");
+  response.setStatusLine(
+    request.httpVersion,
+    200,
+    "corsNotSupportingCredentials"
+  );
   response.setHeader("Access-Control-Allow-Origin", "*");
 }
 
@@ -111,12 +119,16 @@
 }
 
 function corsMissingAllowCredentials(request, response) {
-  response.setStatusLine(request.httpVersion, 200, "corsMissingAllowCredentials");
+  response.setStatusLine(
+    request.httpVersion,
+    200,
+    "corsMissingAllowCredentials"
+  );
   // Need to set an explicit origin (i.e. not "*") to make the request fail.
   response.setHeader("Access-Control-Allow-Origin", "http://example.com");
 }
 
-function corsPreflightDidNotSucceed2(request, response) {
+function corsPreflightDidNotSucceed(request, response) {
   const isPreflight = request.method == "OPTIONS";
   if (isPreflight) {
     response.setStatusLine(request.httpVersion, 500, "Preflight fail");
@@ -137,8 +149,12 @@
   response.setHeader("Access-Control-Allow-Headers", "xyz;");
 }
 
-function corsMissingAllowHeaderFromPreflight2(request, response) {
-  response.setStatusLine(request.httpVersion, 200, "corsMissingAllowHeaderFromPreflight2");
+function corsMissingAllowHeaderFromPreflight(request, response) {
+  response.setStatusLine(
+    request.httpVersion,
+    200,
+    "corsMissingAllowHeaderFromPreflight"
+  );
   response.setHeader("Access-Control-Allow-Origin", "*");
   response.setHeader("Access-Control-Allow-Methods", "PUT");
 }
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/browser/_webconsole.ini firefox-85.0+build1/devtools/client/webconsole/test/browser/_webconsole.ini
--- firefox-84.0.2+build1/devtools/client/webconsole/test/browser/_webconsole.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/browser/_webconsole.ini	2021-01-18 19:58:08.000000000 +0000
@@ -307,6 +307,7 @@
 [browser_webconsole_object_inspector_getters_shadowed.js]
 [browser_webconsole_object_inspector_key_sorting.js]
 [browser_webconsole_object_inspector_local_session_storage.js]
+[browser_webconsole_object_inspector_nested_promise.js]
 [browser_webconsole_object_inspector_nested_proxy.js]
 [browser_webconsole_object_inspector_selected_text.js]
 [browser_webconsole_object_inspector_scroll.js]
@@ -388,6 +389,7 @@
 [browser_webconsole_warning_group_multiples.js]
 [browser_webconsole_warning_groups_outside_console_group.js]
 [browser_webconsole_warning_groups_toggle.js]
+[browser_webconsole_wasm_errors.js]
 [browser_webconsole_warning_groups.js]
 [browser_webconsole_websocket.js]
 [browser_webconsole_worker_error.js]
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/test/node/mocha-test-setup.js firefox-85.0+build1/devtools/client/webconsole/test/node/mocha-test-setup.js
--- firefox-84.0.2+build1/devtools/client/webconsole/test/node/mocha-test-setup.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/test/node/mocha-test-setup.js	2021-01-18 19:58:09.000000000 +0000
@@ -107,6 +107,8 @@
 const requireHacker = require("require-hacker");
 requireHacker.global_hook("default", (path, module) => {
   const paths = {
+    "acorn/acorn": () => getModule("devtools/shared/acorn/acorn"),
+
     // For Enzyme
     "react-dom": () => getModule("devtools/client/shared/vendor/react-dom"),
     "react-dom/server": () =>
diff -Nru firefox-84.0.2+build1/devtools/client/webconsole/utils/context-menu.js firefox-85.0+build1/devtools/client/webconsole/utils/context-menu.js
--- firefox-84.0.2+build1/devtools/client/webconsole/utils/context-menu.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/client/webconsole/utils/context-menu.js	2021-01-18 19:58:08.000000000 +0000
@@ -144,14 +144,24 @@
   );
 
   // Open DOM node in the Inspector panel.
-  if (isConnectedElement) {
+  const contentDomReferenceEl = target.closest(
+    "[data-link-content-dom-reference]"
+  );
+  if (isConnectedElement && contentDomReferenceEl) {
+    const contentDomReference = contentDomReferenceEl.getAttribute(
+      "data-link-content-dom-reference"
+    );
+
     menu.append(
       new MenuItem({
         id: "console-menu-open-node",
         label: l10n.getStr("webconsole.menu.openNodeInInspector.label"),
         accesskey: l10n.getStr("webconsole.menu.openNodeInInspector.accesskey"),
         disabled: false,
-        click: () => dispatch(actions.openNodeInInspector(actor)),
+        click: () =>
+          dispatch(
+            actions.openNodeInInspector(JSON.parse(contentDomReference))
+          ),
       })
     );
   }
diff -Nru firefox-84.0.2+build1/devtools/docs/backend/backward-compatibility.md firefox-85.0+build1/devtools/docs/backend/backward-compatibility.md
--- firefox-84.0.2+build1/devtools/docs/backend/backward-compatibility.md	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/docs/backend/backward-compatibility.md	2021-01-18 19:58:08.000000000 +0000
@@ -26,6 +26,17 @@
 
 The easiest way to test this is to check your work against a Firefox for Android device on release channel to ensure existing features in the area you are changing continue to function. That doesn't cover every case, but it's a great start.
 
+Alternatively, you can connect to a Firefox release server. This can be done in multiple steps:
+
+1. Start Firefox release from the command line, specifying the `--start-debugger-server` with an available port (e.g. `/Applications/Firefox.app/Contents/MacOS/firefox --start-debugger-server 6081`)
+2. Navigate to a page where you can check that the part of DevTools which is impacted by the patch still works.
+3. Build and run Firefox locally with the patch you want to check
+4. In this build, open an `about:debugging` tab
+5. On the `Network Location` section, fill in the host with localhost and the debugger server port you started the Firefox release instance with (e.g. `localhost:6081`) and hit Enter (or the `Add` button)
+6. A new item will appear in the sidebar, click on its `Connect` button.
+7. Accept the `Incoming connection` popup that appears
+8. Click on the on sidebar item again. You will now see a list of the tabs and workers running in the Firefox release instance. Click on the `Inspect` button next to them to open a toolbox that is connected to the older server.
+
 ## Feature Detection
 
 Starting with Firefox 36 (thanks to [bug 1069673](https://bugzilla.mozilla.org/show_bug.cgi?id=1069673)), you can use actor feature detection to determine which actors exist.
@@ -47,10 +58,12 @@
 Traits need to be forwarded to the client, and stored or used by the corresponding Front. There is no unique way of exposing traits, but there are still a few typical patterns found in the codebase.
 
 For Actors using a "form()" method, for which the Front is automatically created by protocol.js, the usual pattern is to add a "traits" property to the form, that contains all the traits for the actor. The Front can then read the traits in its corresponding "form()" method. Example:
+
 - [NodeActor form method](https://searchfox.org/mozilla-central/rev/e75e8e5b980ef18f4596a783fbc8a36621de7d1e/devtools/server/actors/inspector/node.js#209)
 - [NodeFront form method](https://searchfox.org/mozilla-central/rev/e75e8e5b980ef18f4596a783fbc8a36621de7d1e/devtools/client/fronts/node.js#145)
 
 For other Actors, there are two options. First option is to define the trait on the Root actor. Those traits will be available both via TargetMixin::getTrait(), and on DevToolsClient.traits. The second option is to implement a "getTraits()" method on the Actor, which will return the traits for the Actor. Example:
+
 - [CompatibilityActor getTraits method](https://searchfox.org/mozilla-central/rev/e75e8e5b980ef18f4596a783fbc8a36621de7d1e/devtools/shared/specs/compatibility.js#40)
 - [CompatibilitySpec getTraits definition](https://searchfox.org/mozilla-central/rev/e75e8e5b980ef18f4596a783fbc8a36621de7d1e/devtools/shared/specs/compatibility.js#40-43)
 - [CompatibilityFront getTraits method](https://searchfox.org/mozilla-central/rev/e75e8e5b980ef18f4596a783fbc8a36621de7d1e/devtools/client/fronts/compatibility.js#41-47)
@@ -59,10 +72,19 @@
 
 Whenever traits are added, make sure to add a relevant backward compatibility comment so that we know when the trait can be removed.
 
-## Removing old backward compatibility code
+## Maintaining backward compatibility code
 
-We used to support old Firefox OS servers (back to Gecko 28), we don't anymore. Does this mean we can remove compatibility traits for it?
+When introducing backward compatibility code, a comment should be added for extra information.
+In order to simplify future code cleanups, the comment should follow the following syntax:
+`// @backward-compat { version XX } Detailed comment`, where `XX` is the Firefox version this code was added in.
 
-Maybe. Keep in mind that we still want to support Firefox for Android back to release channel, so we still want to keep traits in general. That's a much smaller time window than we supported for Firefox OS, so it should allow for some simplification.
+Below is a made-up example of what it should look like:
+
+```js
+// @backward-compat { version 85 } For older server which don't have the AwesomeActor,
+//                                 we have to do this another way.
+if (!toolbox.target.hasActor("awesome")) {
+```
 
-The type of compatibility that could now be removed are things where the protocol semantics changed in some Gecko older than release channel and the trait is not useful for saying "I don't support feature X".
+Backward compatibility code can be safely removed when the revision it was added in reaches the release channel.
+So if something landed in Firefox Nightly 85, it can be removed when Firefox 85 is released, i.e. when Firefox Nightly is 87. Search for the corresponding `@backward-compat` entries to retrieve all the code that can be removed.
diff -Nru firefox-84.0.2+build1/devtools/platform/nsJSInspector.cpp firefox-85.0+build1/devtools/platform/nsJSInspector.cpp
--- firefox-84.0.2+build1/devtools/platform/nsJSInspector.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/platform/nsJSInspector.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,9 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsJSInspector.h"
-#include "nsThreadUtils.h"
 #include "jsfriendapi.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsServiceManagerUtils.h"
 #include "nsMemory.h"
diff -Nru firefox-84.0.2+build1/devtools/server/actors/accessibility/accessibility.js firefox-85.0+build1/devtools/server/actors/accessibility/accessibility.js
--- firefox-84.0.2+build1/devtools/server/actors/accessibility/accessibility.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/accessibility/accessibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -47,8 +47,7 @@
     // The traits are used to know if accessibility actors support particular
     // API on the server side.
     return {
-      // Backward compatibility: can be removed when FF84 is on release.
-      // Fixed on the server by Bug 1654956.
+      // @backward-compat { version 84 } Fixed on the server by Bug 1654956.
       tabbingOrder: true,
     };
   },
diff -Nru firefox-84.0.2+build1/devtools/server/actors/compatibility/compatibility.js firefox-85.0+build1/devtools/server/actors/compatibility/compatibility.js
--- firefox-84.0.2+build1/devtools/server/actors/compatibility/compatibility.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/compatibility/compatibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -48,12 +48,7 @@
 
   getTraits() {
     return {
-      traits: {
-        // Indicates the function for compatibility check exists
-        // This is to preserve backwards compatibility and can be
-        // removed once FF82 hits release channel
-        declarationBlockIssueComputationEnabled: true,
-      },
+      traits: {},
     };
   },
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/descriptors/process.js firefox-85.0+build1/devtools/server/actors/descriptors/process.js
--- firefox-84.0.2+build1/devtools/server/actors/descriptors/process.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/descriptors/process.js	2021-01-18 19:58:08.000000000 +0000
@@ -154,7 +154,7 @@
       id: this.id,
       isParent: this.isParent,
       traits: {
-        // FF77+ supports the Watcher actor
+        // Supports the Watcher actor. Can be removed as part of Bug 1680280.
         watcher: true,
       },
     };
diff -Nru firefox-84.0.2+build1/devtools/server/actors/descriptors/tab.js firefox-85.0+build1/devtools/server/actors/descriptors/tab.js
--- firefox-84.0.2+build1/devtools/server/actors/descriptors/tab.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/descriptors/tab.js	2021-01-18 19:58:08.000000000 +0000
@@ -60,15 +60,7 @@
       selected: this.selected,
       title: this._getTitle(),
       traits: {
-        // Backward compatibility for FF75 or older.
-        // Remove when FF76 is on the release channel.
-        getFavicon: true,
-        // Backward compatibility for FF76 or older.
-        // Remove when FF77 is on the release channel.
-        // This trait indicates that meta data such as title, url and
-        // outerWindowID are directly available on the TabDescriptor.
-        hasTabInfo: true,
-        // FF77+ supports the Watcher actor
+        // Supports the Watcher actor. Can be removed as part of Bug 1680280.
         watcher: true,
       },
       url: this._getUrl(),
diff -Nru firefox-84.0.2+build1/devtools/server/actors/errordocs.js firefox-85.0+build1/devtools/server/actors/errordocs.js
--- firefox-84.0.2+build1/devtools/server/actors/errordocs.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/errordocs.js	2021-01-18 19:58:09.000000000 +0000
@@ -155,10 +155,10 @@
   CORSNotSupportingCredentials: "CORSNotSupportingCredentials",
   CORSMethodNotFound: "CORSMethodNotFound",
   CORSMissingAllowCredentials: "CORSMissingAllowCredentials",
-  CORSPreflightDidNotSucceed2: "CORSPreflightDidNotSucceed2",
+  CORSPreflightDidNotSucceed2: "CORSPreflightDidNotSucceed",
   CORSInvalidAllowMethod: "CORSInvalidAllowMethod",
   CORSInvalidAllowHeader: "CORSInvalidAllowHeader",
-  CORSMissingAllowHeaderFromPreflight2: "CORSMissingAllowHeaderFromPreflight2",
+  CORSMissingAllowHeaderFromPreflight2: "CORSMissingAllowHeaderFromPreflight",
 };
 
 const baseStorageAccessPolicyErrorUrl =
diff -Nru firefox-84.0.2+build1/devtools/server/actors/highlighters/paused-debugger.js firefox-85.0+build1/devtools/server/actors/highlighters/paused-debugger.js
--- firefox-84.0.2+build1/devtools/server/actors/highlighters/paused-debugger.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/highlighters/paused-debugger.js	2021-01-18 19:58:08.000000000 +0000
@@ -201,21 +201,19 @@
     return this.markup.getElement(this.ID_CLASS_PREFIX + id);
   },
 
-  show(node, options = {}) {
-    if (this.env.isXUL || !options.reason) {
+  show(reason) {
+    if (this.env.isXUL || !reason) {
       return false;
     }
 
-    let reason;
     try {
-      reason = L10N.getStr(`whyPaused.${options.reason}`);
+      reason = L10N.getStr(`whyPaused.${reason}`);
     } catch (e) {
-      // This is a temporary workaround to be uplifted to Firefox 71.
+      // This is a temporary workaround (See Bug 1591025).
       // This actors relies on a client side properties file. This file will not
       // be available when debugging Firefox for Android / Gecko View.
       // The highlighter also shows buttons that use client only images and are
       // therefore invisible when remote debugging a mobile Firefox.
-      // Should be fixed in Bug 1591025.
       return false;
     }
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/inspector/node.js firefox-85.0+build1/devtools/server/actors/inspector/node.js
--- firefox-84.0.2+build1/devtools/server/actors/inspector/node.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/inspector/node.js	2021-01-18 19:58:08.000000000 +0000
@@ -205,9 +205,7 @@
         this.rawNode.ownerDocument &&
         this.rawNode.ownerDocument.contentType === "text/html",
       hasEventListeners: this._hasEventListeners,
-      traits: {
-        supportsIsTopLevelDocument: true,
-      },
+      traits: {},
     };
 
     if (this.isDocumentElement()) {
diff -Nru firefox-84.0.2+build1/devtools/server/actors/inspector/walker.js firefox-85.0+build1/devtools/server/actors/inspector/walker.js
--- firefox-84.0.2+build1/devtools/server/actors/inspector/walker.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/inspector/walker.js	2021-01-18 19:58:08.000000000 +0000
@@ -320,12 +320,7 @@
     return {
       actor: this.actorID,
       root: this.rootNode.form(),
-      traits: {
-        // Walker implements node picker starting with Firefox 80
-        supportsNodePicker: true,
-        // Walker implements overflow debugging support starting with Firefox 83
-        supportsOverflowDebugging2: true,
-      },
+      traits: {},
     };
   },
 
@@ -2626,33 +2621,6 @@
   },
 
   /**
-   * Given an ObjectActor (identified by its ID), commonly used in the debugger,
-   * webconsole and variablesView, return the corresponding inspector's
-   * NodeActor
-   */
-  getNodeActorFromObjectActor: function(objectActorID) {
-    const actor = this.conn.getActor(objectActorID);
-    if (!actor) {
-      return null;
-    }
-
-    const debuggerObject = this.conn.getActor(objectActorID).obj;
-    let rawNode = debuggerObject.unsafeDereference();
-
-    if (!this._isInDOMTree(rawNode)) {
-      return null;
-    }
-
-    // This is a special case for the document object whereby it is considered
-    // as document.documentElement (the <html> node)
-    if (rawNode.defaultView && rawNode === rawNode.defaultView.document) {
-      rawNode = rawNode.documentElement;
-    }
-
-    return this.attachElement(rawNode);
-  },
-
-  /**
    * Given a windowID return the NodeActor for the corresponding frameElement,
    * unless it's the root window
    */
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/moz.build firefox-85.0+build1/devtools/server/actors/network-monitor/moz.build
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -11,13 +11,13 @@
 DevToolsModules(
     "channel-event-sink.js",
     "eventsource-actor.js",
+    "network-content.js",
     "network-event-actor.js",
     "network-event.js",
     "network-monitor.js",
     "network-observer.js",
+    "network-parent.js",
     "network-response-listener.js",
-    "network.js",
     "stack-trace-collector.js",
-    "stack-traces-actor.js",
     "websocket-actor.js",
 )
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-content.js firefox-85.0+build1/devtools/server/actors/network-monitor/network-content.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/network-content.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,146 @@
+/* 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 { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
+const { networkContentSpec } = require("devtools/shared/specs/network-content");
+
+const { Cc, Ci } = require("chrome");
+
+loader.lazyRequireGetter(
+  this,
+  "NetUtil",
+  "resource://gre/modules/NetUtil.jsm",
+  true
+);
+
+loader.lazyRequireGetter(
+  this,
+  "stringToCauseType",
+  "devtools/server/actors/network-monitor/network-observer",
+  true
+);
+
+loader.lazyRequireGetter(
+  this,
+  "WebConsoleUtils",
+  "devtools/server/actors/webconsole/utils",
+  true
+);
+
+const {
+  TYPES: { NETWORK_EVENT_STACKTRACE },
+  getResourceWatcher,
+} = require("devtools/server/actors/resources/index");
+
+/**
+ * This actor manages all network functionality runnning
+ * in the content process.
+ *
+ * @constructor
+ *
+ */
+const NetworkContentActor = ActorClassWithSpec(networkContentSpec, {
+  initialize(conn, targetActor) {
+    Actor.prototype.initialize.call(this, conn);
+    this.targetActor = targetActor;
+  },
+
+  destroy(conn) {
+    Actor.prototype.destroy.call(this, conn);
+  },
+
+  get networkEventStackTraceWatcher() {
+    return getResourceWatcher(this.targetActor, NETWORK_EVENT_STACKTRACE);
+  },
+
+  /**
+   *  Send an HTTP request
+   *
+   * @param {Object} request
+   *        The details of the HTTP Request.
+   * @return {Number}
+   *        The channel id for the request
+   */
+  async sendHTTPRequest(request) {
+    const { url, method, headers, body, cause } = request;
+    // Set the loadingNode and loadGroup to the target document - otherwise the
+    // request won't show up in the opened netmonitor.
+    const doc = this.targetActor.window.document;
+
+    const channel = NetUtil.newChannel({
+      uri: NetUtil.newURI(url),
+      loadingNode: doc,
+      securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL,
+      contentPolicyType:
+        stringToCauseType(cause.type) || Ci.nsIContentPolicy.TYPE_OTHER,
+    });
+
+    channel.QueryInterface(Ci.nsIHttpChannel);
+
+    channel.loadGroup = doc.documentLoadGroup;
+    channel.loadFlags |=
+      Ci.nsIRequest.LOAD_BYPASS_CACHE |
+      Ci.nsIRequest.INHIBIT_CACHING |
+      Ci.nsIRequest.LOAD_ANONYMOUS;
+
+    channel.requestMethod = method;
+    if (headers) {
+      for (const { name, value } of headers) {
+        if (name.toLowerCase() == "referer") {
+          // The referer header and referrerInfo object should always match. So
+          // if we want to set the header from privileged context, we should set
+          // referrerInfo. The referrer header will get set internally.
+          channel.setNewReferrerInfo(
+            value,
+            Ci.nsIReferrerInfo.UNSAFE_URL,
+            true
+          );
+        } else {
+          channel.setRequestHeader(name, value, false);
+        }
+      }
+    }
+
+    if (body) {
+      channel.QueryInterface(Ci.nsIUploadChannel2);
+      const bodyStream = Cc[
+        "@mozilla.org/io/string-input-stream;1"
+      ].createInstance(Ci.nsIStringInputStream);
+      bodyStream.setData(body, body.length);
+      channel.explicitSetUploadStream(bodyStream, null, -1, method, false);
+    }
+
+    return new Promise(resolve => {
+      // Make sure the fetch has completed before sending the channel id,
+      // so that there is a higher possibilty that the request get into the
+      // redux store beforehand (but this does not gurantee that).
+      NetUtil.asyncFetch(channel, () =>
+        resolve({ channelId: channel.channelId })
+      );
+    });
+  },
+
+  /**
+   * Gets the stacktrace for the specified network resource.
+   *  @param {Number} resourceId
+   *         The id for the network resource
+   * @return {Object}
+   *         The response packet - stack trace.
+   */
+  getStackTrace(resourceId) {
+    if (!this.networkEventStackTraceWatcher) {
+      throw new Error("Not listening for network event stacktraces");
+    }
+    const stacktrace = this.networkEventStackTraceWatcher.getStackTrace(
+      resourceId
+    );
+    return {
+      stacktrace: WebConsoleUtils.removeFramesAboveDebuggerEval(stacktrace),
+    };
+  },
+});
+
+exports.NetworkContentActor = NetworkContentActor;
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-event-actor.js firefox-85.0+build1/devtools/server/actors/network-monitor/network-event-actor.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-event-actor.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/network-event-actor.js	2021-01-18 19:58:08.000000000 +0000
@@ -97,20 +97,18 @@
   asResource() {
     return {
       resourceType: NETWORK_EVENT,
-      // The browsingContextID is used by the ResourceWatcher on the client to find the related Target Front.
+      // The browsingContextID is used by the ResourceWatcher on the client
+      // to find the related Target Front.
       browsingContextID: this.networkEventWatcher.watcherActor.browserElement
         .browsingContext.id,
       resourceId: this._channelId,
       actor: this.actorID,
       startedDateTime: this._startedDateTime,
       timeStamp: Date.parse(this._startedDateTime),
-      request: {
-        url: this._request.url,
-        method: this._request.method,
-      },
+      url: this._request.url,
+      method: this._request.method,
       isXHR: this._isXHR,
       cause: this._cause,
-      response: {},
       timings: {},
       fromCache: this._fromCache,
       fromServiceWorker: this._fromServiceWorker,
@@ -122,7 +120,6 @@
       // For websocket requests the serial is used instead of the channel id.
       stacktraceResourceId:
         this._cause.type == "websocket" ? this._serial : this._channelId,
-      updates: [],
     };
   },
 
@@ -333,12 +330,9 @@
     // bug 1462561 - Use "json" type and manually manage/marshall actors to woraround
     // protocol.js performance issue
     this.manage(postData.text);
-    const dataSize = postData.size;
     postData.text = postData.text.form();
 
-    this._onEventUpdate("requestPostData", {
-      dataSize,
-    });
+    this._onEventUpdate("requestPostData", {});
   },
 
   /**
@@ -369,7 +363,7 @@
     // Consider as not discarded if info.discardResponseBody is undefined
     this._discardResponseBody = !!info.discardResponseBody;
 
-    this._onEventUpdate("responseStart", { response: info });
+    this._onEventUpdate("responseStart", { ...info });
   },
 
   /**
@@ -462,7 +456,6 @@
     this._onEventUpdate("responseContent", {
       mimeType: content.mimeType,
       contentSize: content.size,
-      encoding: content.encoding,
       transferredSize: content.transferredSize,
       blockedReason,
       blockingExtension,
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/network.js firefox-85.0+build1/devtools/server/actors/network-monitor/network.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/network.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/network.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
-const { networkSpec } = require("devtools/shared/specs/network");
-
-const {
-  TYPES: { NETWORK_EVENT },
-  getResourceWatcher,
-} = require("devtools/server/actors/resources/index");
-
-/**
- * This actor implements capabilities for handling and supporting
- * Network requests.
- *
- * @constructor
- *
- */
-const NetworkActor = ActorClassWithSpec(networkSpec, {
-  initialize(watcherActor) {
-    this.watcherActor = watcherActor;
-    Actor.prototype.initialize.call(this, this.watcherActor.conn);
-  },
-
-  destroy(conn) {
-    Actor.prototype.destroy.call(this, conn);
-  },
-
-  get networkEventWatcher() {
-    return getResourceWatcher(this.watcherActor, NETWORK_EVENT);
-  },
-
-  /**
-   * Sets the urls to block.
-   *
-   * @param Array urls
-   *         The response packet - stack trace.
-   */
-  setBlockedUrls(urls) {
-    if (!this.networkEventWatcher) {
-      throw new Error("Not listening for network events");
-    }
-    this.networkEventWatcher.setBlockedUrls(urls);
-    return {};
-  },
-
-  /**
-   * Returns the urls that are block
-   */
-  getBlockedUrls() {
-    if (!this.networkEventWatcher) {
-      throw new Error("Not listening for network events");
-    }
-    return this.networkEventWatcher.getBlockedUrls();
-  },
-});
-
-exports.NetworkActor = NetworkActor;
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-parent.js firefox-85.0+build1/devtools/server/actors/network-monitor/network-parent.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/network-parent.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/network-parent.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,124 @@
+/* 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 { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
+const { networkParentSpec } = require("devtools/shared/specs/network-parent");
+
+const {
+  TYPES: { NETWORK_EVENT },
+  getResourceWatcher,
+} = require("devtools/server/actors/resources/index");
+
+/**
+ * This actor manages all network functionality running
+ * in the parent process.
+ *
+ * @constructor
+ *
+ */
+const NetworkParentActor = ActorClassWithSpec(networkParentSpec, {
+  initialize(watcherActor) {
+    this.watcherActor = watcherActor;
+    Actor.prototype.initialize.call(this, this.watcherActor.conn);
+  },
+
+  // Caches the throttling data so that on clearing the
+  // current network throttling it can be reset to the previous.
+  defaultThrottleData: undefined,
+
+  isEqual(next, current) {
+    // If both objects, check all entries
+    if (current && next && next == current) {
+      return Object.entries(current).every(([k, v]) => {
+        return next[k] === v;
+      });
+    }
+    return false;
+  },
+
+  destroy(conn) {
+    Actor.prototype.destroy.call(this, conn);
+  },
+
+  get networkEventWatcher() {
+    return getResourceWatcher(this.watcherActor, NETWORK_EVENT);
+  },
+
+  setNetworkThrottling(throttleData) {
+    if (!this.networkEventWatcher) {
+      throw new Error("Not listening for network events");
+    }
+
+    if (throttleData !== null) {
+      throttleData = {
+        latencyMean: throttleData.latency,
+        latencyMax: throttleData.latency,
+        downloadBPSMean: throttleData.downloadThroughput,
+        downloadBPSMax: throttleData.downloadThroughput,
+        uploadBPSMean: throttleData.uploadThroughput,
+        uploadBPSMax: throttleData.uploadThroughput,
+      };
+    }
+
+    const currentThrottleData = this.networkEventWatcher.getThrottleData();
+    if (this.isEqual(throttleData, currentThrottleData)) {
+      return;
+    }
+
+    if (this.defaultThrottleData === undefined) {
+      this.defaultThrottleData = currentThrottleData;
+    }
+
+    this.networkEventWatcher.setThrottleData(throttleData);
+  },
+
+  getNetworkThrottling() {
+    if (!this.networkEventWatcher) {
+      throw new Error("Not listening for network events");
+    }
+    const throttleData = this.networkEventWatcher.getThrottleData();
+    if (!throttleData) {
+      return null;
+    }
+    return {
+      downloadThroughput: throttleData.downloadBPSMax,
+      uploadThroughput: throttleData.uploadBPSMax,
+      latency: throttleData.latencyMax,
+    };
+  },
+
+  clearNetworkThrottling() {
+    if (this.defaultThrottleData !== undefined) {
+      this.setNetworkThrottling(this.defaultThrottleData);
+    }
+  },
+
+  /**
+   * Sets the urls to block.
+   *
+   * @param Array urls
+   *         The response packet - stack trace.
+   */
+  setBlockedUrls(urls) {
+    if (!this.networkEventWatcher) {
+      throw new Error("Not listening for network events");
+    }
+    this.networkEventWatcher.setBlockedUrls(urls);
+    return {};
+  },
+
+  /**
+   * Returns the urls that are block
+   */
+  getBlockedUrls() {
+    if (!this.networkEventWatcher) {
+      throw new Error("Not listening for network events");
+    }
+    return this.networkEventWatcher.getBlockedUrls();
+  },
+});
+
+exports.NetworkParentActor = NetworkParentActor;
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/stack-traces-actor.js firefox-85.0+build1/devtools/server/actors/network-monitor/stack-traces-actor.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/stack-traces-actor.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/stack-traces-actor.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
-const { stackTracesSpec } = require("devtools/shared/specs/stacktraces");
-
-loader.lazyRequireGetter(
-  this,
-  "WebConsoleUtils",
-  "devtools/server/actors/webconsole/utils",
-  true
-);
-
-const {
-  TYPES: { NETWORK_EVENT_STACKTRACE },
-  getResourceWatcher,
-} = require("devtools/server/actors/resources/index");
-
-/**
- * Manages the stacktraces of the network
- *
- * @constructor
- *
- */
-const StackTracesActor = ActorClassWithSpec(stackTracesSpec, {
-  initialize(conn, targetActor) {
-    Actor.prototype.initialize.call(this, conn);
-    this.targetActor = targetActor;
-  },
-
-  destroy(conn) {
-    Actor.prototype.destroy.call(this, conn);
-  },
-
-  /**
-   * The "getStackTrace" packet type handler.
-   *
-   * @return object
-   *         The response packet - stack trace.
-   */
-  getStackTrace(resourceId) {
-    const networkEventStackTraceWatcher = getResourceWatcher(
-      this.targetActor,
-      NETWORK_EVENT_STACKTRACE
-    );
-    if (!networkEventStackTraceWatcher) {
-      throw new Error("Not listening for network event stacktraces");
-    }
-    const stacktrace = networkEventStackTraceWatcher.getStackTrace(resourceId);
-    return {
-      stacktrace: WebConsoleUtils.removeFramesAboveDebuggerEval(stacktrace),
-    };
-  },
-});
-
-exports.StackTracesActor = StackTracesActor;
diff -Nru firefox-84.0.2+build1/devtools/server/actors/network-monitor/utils/error-codes.js firefox-85.0+build1/devtools/server/actors/network-monitor/utils/error-codes.js
--- firefox-84.0.2+build1/devtools/server/actors/network-monitor/utils/error-codes.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/network-monitor/utils/error-codes.js	2021-01-18 19:58:08.000000000 +0000
@@ -471,7 +471,6 @@
   NS_ERROR_STORAGE_CONSTRAINT: 0x80630003,
   NS_ERROR_DOM_FILE_NOT_FOUND_ERR: 0x80650000,
   NS_ERROR_DOM_FILE_NOT_READABLE_ERR: 0x80650001,
-  NS_ERROR_DOM_FILE_ABORT_ERR: 0x80650002,
   NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR: 0x80660001,
   NS_ERROR_DOM_INDEXEDDB_NOT_FOUND_ERR: 0x80660003,
   NS_ERROR_DOM_INDEXEDDB_CONSTRAINT_ERR: 0x80660004,
diff -Nru firefox-84.0.2+build1/devtools/server/actors/object/previewers.js firefox-85.0+build1/devtools/server/actors/object/previewers.js
--- firefox-84.0.2+build1/devtools/server/actors/object/previewers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/object/previewers.js	2021-01-18 19:58:08.000000000 +0000
@@ -360,6 +360,35 @@
     },
   ],
 
+  Promise: [
+    function({ obj, hooks }, grip, rawObj) {
+      const { state, value, reason } = ObjectUtils.getPromiseState(obj);
+      const ownProperties = Object.create(null);
+      ownProperties["<state>"] = { value: state };
+      let ownPropertiesLength = 1;
+
+      // Only expose <value> or <reason> in top-level promises, to avoid recursion.
+      // <state> is not problematic because it's a string.
+      if (hooks.getGripDepth() === 1) {
+        if (state == "fulfilled") {
+          ownProperties["<value>"] = { value: hooks.createValueGrip(value) };
+          ++ownPropertiesLength;
+        } else if (state == "rejected") {
+          ownProperties["<reason>"] = { value: hooks.createValueGrip(reason) };
+          ++ownPropertiesLength;
+        }
+      }
+
+      grip.preview = {
+        kind: "Object",
+        ownProperties,
+        ownPropertiesLength,
+      };
+
+      return true;
+    },
+  ],
+
   Proxy: [
     function({ obj, hooks }, grip, rawObj) {
       // Only preview top-level proxies, avoiding recursion. Otherwise, since both the
@@ -564,6 +593,12 @@
       case "SyntaxError":
       case "TypeError":
       case "URIError":
+      case "InternalError":
+      case "AggregateError":
+      case "CompileError":
+      case "DebuggeeWouldRun":
+      case "LinkError":
+      case "RuntimeError":
         const name = DevToolsUtils.getProperty(obj, "name");
         const msg = DevToolsUtils.getProperty(obj, "message");
         const stack = DevToolsUtils.getProperty(obj, "stack");
diff -Nru firefox-84.0.2+build1/devtools/server/actors/object/property-iterator.js firefox-85.0+build1/devtools/server/actors/object/property-iterator.js
--- firefox-84.0.2+build1/devtools/server/actors/object/property-iterator.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/object/property-iterator.js	2021-01-18 19:58:08.000000000 +0000
@@ -95,9 +95,7 @@
       for (const idx of indexes) {
         list.push(this.iterator.propertyName(idx));
       }
-      return {
-        names: indexes,
-      };
+      return indexes;
     },
 
     slice({ start, count }) {
diff -Nru firefox-84.0.2+build1/devtools/server/actors/object.js firefox-85.0+build1/devtools/server/actors/object.js
--- firefox-84.0.2+build1/devtools/server/actors/object.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/object.js	2021-01-18 19:58:08.000000000 +0000
@@ -165,10 +165,6 @@
 
     this.hooks.incrementGripDepth();
 
-    if (g.class == "Promise") {
-      g.promiseState = this._createPromiseState();
-    }
-
     if (g.class == "Function") {
       g.isClassConstructor = this.obj.isClassConstructor;
     }
@@ -192,8 +188,6 @@
   },
 
   _getOwnPropertyLength: function() {
-    // FF40+: Allow to know how many properties an object has to lazily display them
-    // when there is a bunch.
     if (isTypedArray(this.obj)) {
       // Bug 1348761: getOwnPropertyNames is unnecessary slow on TypedArrays
       return getArrayLength(this.obj);
@@ -250,7 +244,7 @@
   /**
    * Returns an object exposing the internal Promise state.
    */
-  _createPromiseState: function() {
+  promiseState: function() {
     const { state, value, reason } = getPromiseState(this.obj);
     const promiseState = { state };
 
@@ -267,7 +261,7 @@
       promiseState.timeToSettle = this.obj.promiseTimeToResolution;
     }
 
-    return promiseState;
+    return { promiseState };
   },
 
   /**
diff -Nru firefox-84.0.2+build1/devtools/server/actors/page-style.js firefox-85.0+build1/devtools/server/actors/page-style.js
--- firefox-84.0.2+build1/devtools/server/actors/page-style.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/page-style.js	2021-01-18 19:58:08.000000000 +0000
@@ -178,8 +178,6 @@
         // expected support of font-stretch at CSS Fonts Level 4.
         fontWeightLevel4:
           CSS.supports("font-weight: 1") && CSS.supports("font-stretch: 100%"),
-        // Introduced in Firefox 80.
-        getAttributesInOwnerDocument: true,
       },
     };
   },
diff -Nru firefox-84.0.2+build1/devtools/server/actors/perf.js firefox-85.0+build1/devtools/server/actors/perf.js
--- firefox-84.0.2+build1/devtools/server/actors/perf.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/perf.js	2021-01-18 19:58:08.000000000 +0000
@@ -58,6 +58,5 @@
   isActive: actorBridgeWithSpec("isActive"),
   isSupportedPlatform: actorBridgeWithSpec("isSupportedPlatform"),
   isLockedForPrivateBrowsing: actorBridgeWithSpec("isLockedForPrivateBrowsing"),
-  // Added in Firefox 72.
   getSupportedFeatures: actorBridgeWithSpec("getSupportedFeatures"),
 });
diff -Nru firefox-84.0.2+build1/devtools/server/actors/preference.js firefox-85.0+build1/devtools/server/actors/preference.js
--- firefox-84.0.2+build1/devtools/server/actors/preference.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/preference.js	2021-01-18 19:58:09.000000000 +0000
@@ -33,14 +33,7 @@
     // specific preferences are fixed on the server or if the client should set
     // default values for them. See the about:debugging module
     // runtime-default-preferences.js
-    return {
-      // Backward compatibility: can be removed when FF81 is on release.
-      // Fixed on the server by Bug 1659866.
-      overflowDebuggingPref: true,
-      // Backward compatibility: can be removed when FF82 is on release.
-      // Fixed on the server by Bug 1662058.
-      targetBrowsersPref: true,
-    };
+    return {};
   },
 
   getBoolPref: function(name) {
diff -Nru firefox-84.0.2+build1/devtools/server/actors/resources/index.js firefox-85.0+build1/devtools/server/actors/resources/index.js
--- firefox-84.0.2+build1/devtools/server/actors/resources/index.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/resources/index.js	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,7 @@
   SESSION_STORAGE: "session-storage",
   STYLESHEET: "stylesheet",
   NETWORK_EVENT_STACKTRACE: "network-event-stacktrace",
+  SOURCE: "source",
 };
 exports.TYPES = TYPES;
 
@@ -61,6 +62,9 @@
   [TYPES.NETWORK_EVENT_STACKTRACE]: {
     path: "devtools/server/actors/resources/network-events-stacktraces",
   },
+  [TYPES.SOURCE]: {
+    path: "devtools/server/actors/resources/sources",
+  },
 });
 const ProcessTargetResources = augmentResourceDictionary({
   [TYPES.CONSOLE_MESSAGE]: {
@@ -75,6 +79,9 @@
   [TYPES.PLATFORM_MESSAGE]: {
     path: "devtools/server/actors/resources/platform-messages",
   },
+  [TYPES.SOURCE]: {
+    path: "devtools/server/actors/resources/sources",
+  },
 });
 
 // We'll only support a few resource types in Workers (console-message, source,
@@ -85,6 +92,9 @@
   [TYPES.CONSOLE_MESSAGE]: {
     path: "devtools/server/actors/resources/console-messages",
   },
+  [TYPES.SOURCE]: {
+    path: "devtools/server/actors/resources/sources",
+  },
 });
 
 const ParentProcessResources = augmentResourceDictionary({
diff -Nru firefox-84.0.2+build1/devtools/server/actors/resources/moz.build firefox-85.0+build1/devtools/server/actors/resources/moz.build
--- firefox-84.0.2+build1/devtools/server/actors/resources/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/resources/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,7 @@
     "network-events-stacktraces.js",
     "network-events.js",
     "platform-messages.js",
+    "sources.js",
     "storage-local-storage.js",
     "storage-session-storage.js",
     "stylesheets.js",
diff -Nru firefox-84.0.2+build1/devtools/server/actors/resources/network-events.js firefox-85.0+build1/devtools/server/actors/resources/network-events.js
--- firefox-84.0.2+build1/devtools/server/actors/resources/network-events.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/resources/network-events.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,7 +23,8 @@
    * Start watching for all network events related to a given Watcher Actor.
    *
    * @param WatcherActor watcherActor
-   *        The watcher actor from which we should observe network events
+   *        The watcher actor in the parent process from which we should
+   *        observe network events.
    * @param Object options
    *        Dictionary object with following attributes:
    *        - onAvailable: mandatory function
@@ -33,6 +34,7 @@
    */
   async watch(watcherActor, { onAvailable, onUpdated }) {
     this.networkEvents = new Map();
+
     this.watcherActor = watcherActor;
     this.onNetworkEventAvailable = onAvailable;
     this.onNetworkEventUpdated = onUpdated;
@@ -41,10 +43,31 @@
       { browserId: watcherActor.browserId },
       { onNetworkEvent: this.onNetworkEvent.bind(this) }
     );
+
     this.listener.init();
   }
 
   /**
+   * Gets the throttle settings
+   *
+   * @return {*} data
+   *
+   */
+  getThrottleData() {
+    return this.listener.throttleData;
+  }
+
+  /**
+   * Sets the throttle data
+   *
+   * @param {*} data
+   *
+   */
+  setThrottleData(data) {
+    this.listener.throttleData = data;
+  }
+
+  /**
    * Calls the listener to set blocked urls
    *
    * @param {Array} urls
@@ -68,7 +91,8 @@
 
   onNetworkEvent(event) {
     const { channelId } = event;
-    if (this.networkEvents.get(channelId)) {
+
+    if (this.networkEvents.has(channelId)) {
       throw new Error(
         `Got notified about channel ${channelId} more than once.`
       );
@@ -84,78 +108,89 @@
     this.watcherActor.manage(actor);
 
     const resource = actor.asResource();
-    this.networkEvents.set(resource.resourceId, resource);
+
+    this.networkEvents.set(resource.resourceId, {
+      resourceId: resource.resourceId,
+      resourceType: resource.resourceType,
+      isBlocked: !!resource.blockedReason,
+      types: [],
+      resourceUpdates: {},
+    });
+
     this.onNetworkEventAvailable([resource]);
     return actor;
   }
 
   onNetworkEventUpdate(updateResource) {
-    const currentResource = this.networkEvents.get(updateResource.resourceId);
-    if (!currentResource) {
+    const networkEvent = this.networkEvents.get(updateResource.resourceId);
+
+    if (!networkEvent) {
       return;
     }
-    const resourceUpdates = {
-      updates: [...currentResource.updates, updateResource.updateType],
-    };
+
+    const {
+      resourceId,
+      resourceType,
+      resourceUpdates,
+      types,
+      isBlocked,
+    } = networkEvent;
 
     switch (updateResource.updateType) {
-      case "requestHeaders":
-        resourceUpdates.request = Object.assign(currentResource.request, {
-          headersSize: updateResource.headersSize,
-        });
-        break;
-      case "requestPostData":
-        resourceUpdates.discardRequestBody = updateResource.discardRequestBody;
-        resourceUpdates.request = Object.assign(currentResource.request, {
-          bodySize: updateResource.dataSize,
-        });
-        break;
       case "responseStart":
-        resourceUpdates.response = Object.assign(currentResource.response, {
-          httpVersion: updateResource.response.httpVersion,
-          status: updateResource.response.status,
-          statusText: updateResource.response.statusText,
-          headersSize: updateResource.response.headersSize,
-          remoteAddress: updateResource.response.remoteAddress,
-          remotePort: updateResource.response.remotePort,
-          content: {
-            mimeType: updateResource.response.mimeType,
-          },
-          waitingTime: updateResource.response.waitingTime,
-        });
-        resourceUpdates.discardResponseBody =
-          updateResource.response.discardResponseBody;
+        resourceUpdates.httpVersion = updateResource.httpVersion;
+        resourceUpdates.status = updateResource.status;
+        resourceUpdates.statusText = updateResource.statusText;
+        resourceUpdates.remoteAddress = updateResource.remoteAddress;
+        resourceUpdates.remotePort = updateResource.remotePort;
+        // The mimetype is only set when then the contentType is available
+        // in the _onResponseHeader and not for cached/service worker requests
+        // in _httpResponseExaminer.
+        resourceUpdates.mimeType = updateResource.mimeType;
+        resourceUpdates.waitingTime = updateResource.waitingTime;
         break;
       case "responseContent":
-        resourceUpdates.response = Object.assign(currentResource.response, {
-          content: { mimeType: updateResource.mimeType },
-          bodySize: updateResource.contentSize,
-          transferredSize: updateResource.transferredSize,
-        });
-        resourceUpdates.discardResponseBody =
-          updateResource.discardResponseBody;
+        resourceUpdates.contentSize = updateResource.contentSize;
+        resourceUpdates.transferredSize = updateResource.transferredSize;
+        resourceUpdates.mimeType = updateResource.mimeType;
+        resourceUpdates.blockingExtension = updateResource.blockingExtension;
+        resourceUpdates.blockedReason = updateResource.blockedReason;
         break;
       case "eventTimings":
         resourceUpdates.totalTime = updateResource.totalTime;
         break;
       case "securityInfo":
         resourceUpdates.securityState = updateResource.state;
-        break;
-      case "responseCache":
-        resourceUpdates.response = Object.assign(currentResource.response, {
-          responseCache: updateResource.responseCache,
-        });
+        resourceUpdates.isRacing = updateResource.isRacing;
         break;
     }
 
-    Object.assign(currentResource, resourceUpdates);
+    resourceUpdates[`${updateResource.updateType}Available`] = true;
+    types.push(updateResource.updateType);
+
+    if (isBlocked) {
+      // Blocked requests
+      if (
+        !types.includes("requestHeaders") ||
+        !types.includes("requestCookies")
+      ) {
+        return;
+      }
+    } else if (
+      // Un-blocked requests
+      !types.includes("requestHeaders") ||
+      !types.includes("requestCookies") ||
+      !types.includes("eventTimings") ||
+      !types.includes("responseContent")
+    ) {
+      return;
+    }
 
     this.onNetworkEventUpdated([
       {
-        resourceType: currentResource.resourceType,
-        resourceId: updateResource.resourceId,
+        resourceType,
+        resourceId,
         resourceUpdates,
-        updateType: updateResource.updateType,
       },
     ]);
   }
diff -Nru firefox-84.0.2+build1/devtools/server/actors/resources/sources.js firefox-85.0+build1/devtools/server/actors/resources/sources.js
--- firefox-84.0.2+build1/devtools/server/actors/resources/sources.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/resources/sources.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,69 @@
+/* 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 {
+  TYPES: { SOURCE },
+} = require("devtools/server/actors/resources/index");
+
+/**
+ * Start watching for all JS sources related to a given Target Actor.
+ * This will notify about existing sources, but also the ones created in future.
+ *
+ * @param TargetActor targetActor
+ *        The target actor from which we should observe sources
+ * @param Object options
+ *        Dictionary object with following attributes:
+ *        - onAvailable: mandatory function
+ *          This will be called for each resource.
+ */
+class SourceWatcher {
+  constructor() {
+    this.onNewSource = this.onNewSource.bind(this);
+  }
+
+  async watch(targetActor, { onAvailable }) {
+    // Force attaching the target in order to ensure it instantiates the ThreadActor
+    targetActor.attach();
+
+    const { threadActor } = targetActor;
+    this.threadActor = threadActor;
+    this.onAvailable = onAvailable;
+
+    // Disable `ThreadActor.newSource` RDP event in order to avoid unnecessary traffic
+    threadActor.disableNewSourceEvents();
+
+    threadActor.sourcesManager.on("newSource", this.onNewSource);
+
+    // Before fetching all sources, process existing ones.
+    // The ThreadActor is already up and running before this code runs
+    // and have sources already registered and for which newSource event already fired.
+    onAvailable(
+      threadActor.sourcesManager.iter().map(s => {
+        const resource = s.form();
+        resource.resourceType = SOURCE;
+        return resource;
+      })
+    );
+
+    // Requesting all sources should end up emitting newSource on threadActor.sourcesManager
+    threadActor.addAllSources();
+  }
+
+  /**
+   * Stop watching for sources
+   */
+  destroy() {
+    this.threadActor.sourcesManager.off("newSource", this.onNewSource);
+  }
+
+  onNewSource(source) {
+    const resource = source.form();
+    resource.resourceType = SOURCE;
+    this.onAvailable([resource]);
+  }
+}
+
+module.exports = SourceWatcher;
diff -Nru firefox-84.0.2+build1/devtools/server/actors/root.js firefox-85.0+build1/devtools/server/actors/root.js
--- firefox-84.0.2+build1/devtools/server/actors/root.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/root.js	2021-01-18 19:58:08.000000000 +0000
@@ -125,11 +125,7 @@
     this.applicationType = "browser";
 
     this.traits = {
-      sources: true,
       networkMonitor: true,
-      // Whether the storage inspector actor to inspect cookies, etc.
-      storageInspector: true,
-      bulk: true,
       // Whether root actor exposes chrome target actors and access to any window.
       // If allowChromeProcess is true, you can:
       // * get a ParentProcessTargetActor instance to debug chrome and any non-content
@@ -142,19 +138,8 @@
       get allowChromeProcess() {
         return DevToolsServer.allowChromeProcess;
       },
-      // Whether or not the MemoryActor's heap snapshot abilities are
-      // fully equipped to handle heap snapshots for the memory tool. Fx44+
-      heapSnapshots: true,
-      // Version of perf actor. Fx65+
-      // Version 1 - Firefox 65: Introduces a duration-based buffer. It can be controlled
-      // by adding a `duration` property (in seconds) to the options passed to
-      // `front.startProfiler`. This is an optional parameter but it will throw an error if
-      // the profiled Firefox doesn't accept it.
-      perfActorVersion: 1,
-      // Supports watchpoints in the server for Fx71+
-      watchpoints: true,
-      // Added in Fx84 to expose the pref value to the client. Services.prefs is undefined
-      // in xpcshell tests.
+      // @backward-compat { version 84 } Expose the pref value to the client.
+      // Services.prefs is undefined in xpcshell tests.
       workerConsoleApiMessagesDispatchedToMainThread: Services.prefs
         ? Services.prefs.getBoolPref(
             "dom.worker.console.dispatch_events_to_main_thread"
diff -Nru firefox-84.0.2+build1/devtools/server/actors/storage.js firefox-85.0+build1/devtools/server/actors/storage.js
--- firefox-84.0.2+build1/devtools/server/actors/storage.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/storage.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,6 @@
 const { LongStringActor } = require("devtools/server/actors/string");
 const { DevToolsServer } = require("devtools/server/devtools-server");
 const Services = require("Services");
-const defer = require("devtools/shared/defer");
 const { isWindowIncluded } = require("devtools/shared/layout/utils");
 const specs = require("devtools/shared/specs/storage");
 const { parseItemValue } = require("devtools/shared/storage/utils");
@@ -1626,10 +1625,10 @@
     switch (msg.json.method) {
       case "backToChild": {
         const [func, rv] = msg.json.args;
-        const deferred = this.unresolvedPromises.get(func);
-        if (deferred) {
+        const resolve = this.unresolvedPromises.get(func);
+        if (resolve) {
           this.unresolvedPromises.delete(func);
-          deferred.resolve(rv);
+          resolve(rv);
         }
         break;
       }
@@ -1652,9 +1651,9 @@
   },
 
   callParentProcessAsync(methodName, ...args) {
-    const deferred = defer();
-
-    this.unresolvedPromises.set(methodName, deferred);
+    const promise = new Promise(resolve => {
+      this.unresolvedPromises.set(methodName, resolve);
+    });
 
     this.ppmm.sendAsyncMessage(
       "debug:storage-extensionStorage-request-parent",
@@ -1664,7 +1663,7 @@
       }
     );
 
-    return deferred.promise;
+    return promise;
   },
 };
 
@@ -2699,10 +2698,10 @@
         switch (msg.json.method) {
           case "backToChild": {
             const [func, rv] = msg.json.args;
-            const deferred = unresolvedPromises.get(func);
-            if (deferred) {
+            const resolve = unresolvedPromises.get(func);
+            if (resolve) {
               unresolvedPromises.delete(func);
-              deferred.resolve(rv);
+              resolve(rv);
             }
             break;
           }
@@ -2715,16 +2714,16 @@
 
       const unresolvedPromises = new Map();
       function callParentProcessAsync(methodName, ...args) {
-        const deferred = defer();
-
-        unresolvedPromises.set(methodName, deferred);
+        const promise = new Promise(resolve => {
+          unresolvedPromises.set(methodName, resolve);
+        });
 
         mm.sendAsyncMessage("debug:storage-indexedDB-request-parent", {
           method: methodName,
           args: args,
         });
 
-        return deferred.promise;
+        return promise;
       }
     },
 
@@ -3403,13 +3402,31 @@
     // Fetch all the inner iframe windows in this tab.
     this.fetchChildWindows(this.parentActor.docShell);
 
+    // Skip initializing storage actors already instanced as Resources
+    // by the watcher. This happens when the target is a tab.
+    const isAddonTarget = !!this.parentActor.addonId;
+    const isWatcherEnabled = !isAddonTarget && !this.parentActor.isRootActor;
+    const shallUseLegacyActors = Services.prefs.getBoolPref(
+      "devtools.storage.test.forceLegacyActors",
+      false
+    );
+    const resourcesInWatcher = {
+      localStorage: isWatcherEnabled,
+      sessionStorage: isWatcherEnabled,
+    };
+
     // Initialize the registered store types
     for (const [store, ActorConstructor] of storageTypePool) {
       // Only create the extensionStorage actor when the debugging target
       // is an extension.
-      if (store === "extensionStorage" && !this.parentActor.addonId) {
+      if (store === "extensionStorage" && !isAddonTarget) {
         continue;
       }
+      // Skip resource actors
+      if (resourcesInWatcher[store] && !shallUseLegacyActors) {
+        continue;
+      }
+
       this.childActorPool.set(store, new ActorConstructor(this));
     }
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/style-rule.js firefox-85.0+build1/devtools/server/actors/style-rule.js
--- firefox-84.0.2+build1/devtools/server/actors/style-rule.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/style-rule.js	2021-01-18 19:58:08.000000000 +0000
@@ -309,9 +309,6 @@
         // Indicates whether StyleRuleActor implements and can use the setRuleText method.
         // It cannot use it if the stylesheet was programmatically mutated via the CSSOM.
         canSetRuleText: this.canSetRuleText,
-        // Indicates that StyleRuleActor emits the "rule-updated" event.
-        // Added in Firefox 72.
-        emitsRuleUpdatedEvent: true,
       },
     };
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/style-sheets.js firefox-85.0+build1/devtools/server/actors/style-sheets.js
--- firefox-84.0.2+build1/devtools/server/actors/style-sheets.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/style-sheets.js	2021-01-18 19:58:08.000000000 +0000
@@ -55,12 +55,7 @@
 
   getTraits() {
     return {
-      traits: {
-        // FF81+ addStyleSheet supports file name parameter.
-        isFileNameSupported: true,
-        // FF81+ resource requesting supports.
-        supportResourceRequests: true,
-      },
+      traits: {},
     };
   },
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/targets/browsing-context.js firefox-85.0+build1/devtools/server/actors/targets/browsing-context.js
--- firefox-84.0.2+build1/devtools/server/actors/targets/browsing-context.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/targets/browsing-context.js	2021-01-18 19:58:08.000000000 +0000
@@ -291,7 +291,9 @@
       frames: true,
       // Supports the logInPage request.
       logInPage: true,
-      // Supports watchpoints in the server for Fx71+
+      // Supports watchpoints in the server. We need to keep this trait because target
+      // actors that don't extend BrowsingContextTargetActor (Worker, ContentProcess, …)
+      // might not support watchpoints.
       watchpoints: true,
       // Supports back and forward navigation
       navigation: true,
@@ -391,12 +393,16 @@
     return null;
   },
 
+  get browsingContext() {
+    return this.docShell?.browsingContext;
+  },
+
   get browsingContextID() {
-    return this.docShell && this.docShell.browsingContext.id;
+    return this.browsingContext?.id;
   },
 
   get browserId() {
-    return this.docShell && this.docShell.browsingContext.browserId;
+    return this.browsingContext?.browserId;
   },
 
   /**
@@ -526,8 +532,8 @@
       actor: this.actorID,
       browsingContextID: this.browsingContextID,
       traits: {
-        // FF64+ exposes a new trait to help identify BrowsingContextActor's inherited
-        // actors from the client side.
+        // @backward-compat { version 64 } Exposes a new trait to help identify
+        // BrowsingContextActor's inherited actors from the client side.
         isBrowsingContext: true,
       },
     };
@@ -1082,7 +1088,6 @@
     return {};
   },
 
-  // Added in Firefox 79
   goForward() {
     // Wait a tick so that the response packet can be dispatched before the
     // subsequent navigation event packet.
@@ -1101,7 +1106,6 @@
     return {};
   },
 
-  // Added in Firefox 79
   goBack() {
     // Wait a tick so that the response packet can be dispatched before the
     // subsequent navigation event packet.
@@ -1275,7 +1279,7 @@
     this._setServiceWorkersTestingEnabled(false);
     this._setPaintFlashingEnabled(false);
 
-    if (this._restoreFocus && this.window.docShell.isActive) {
+    if (this._restoreFocus && this.browsingContext?.isActive) {
       this.window.focus();
     }
   },
diff -Nru firefox-84.0.2+build1/devtools/server/actors/thread.js firefox-85.0+build1/devtools/server/actors/thread.js
--- firefox-84.0.2+build1/devtools/server/actors/thread.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/thread.js	2021-01-18 19:58:08.000000000 +0000
@@ -498,7 +498,13 @@
     ) {
       const reason = this._priorPause.why.type;
       await this.pauseOverlay.isReady;
-      this.pauseOverlay.show(null, { reason });
+
+      // we might not be paused anymore.
+      if (!this.isPaused()) {
+        return;
+      }
+
+      this.pauseOverlay.show(reason);
     }
   },
 
@@ -1486,9 +1492,7 @@
     // overhead of an RDP packet for every source right now. Let the default
     // timeout flush the buffered packets.
 
-    return {
-      sources: this.sourcesManager.iter().map(s => s.form()),
-    };
+    return this.sourcesManager.iter().map(s => s.form());
   },
 
   /**
@@ -2018,6 +2022,14 @@
    * @param {SourceActor} source
    */
   onNewSourceEvent(source) {
+    // When this target is supported by the Watcher Actor,
+    // and we listen to SOURCE, we avoid emitting the newSource RDP event
+    // as it would be duplicated with the Resource/watchResources API.
+    // Could probably be removed once bug 1680280 is fixed.
+    if (!this._shouldEmitNewSource) {
+      return;
+    }
+
     // Bug 1516197: New sources are likely detected due to either user
     // interaction on the page, or devtools requests sent to the server.
     // We use executeSoon because we don't want to block those operations
@@ -2032,6 +2044,13 @@
     });
   },
 
+  // API used by the Watcher Actor to disable the newSource events
+  // Could probably be removed once bug 1680280 is fixed.
+  _shouldEmitNewSource: true,
+  disableNewSourceEvents() {
+    this._shouldEmitNewSource = false;
+  },
+
   /**
    * Add the provided source to the server cache.
    *
diff -Nru firefox-84.0.2+build1/devtools/server/actors/utils/actor-registry.js firefox-85.0+build1/devtools/server/actors/utils/actor-registry.js
--- firefox-84.0.2+build1/devtools/server/actors/utils/actor-registry.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/utils/actor-registry.js	2021-01-18 19:58:08.000000000 +0000
@@ -276,10 +276,10 @@
       type: { target: true },
     });
     this.registerModule(
-      "devtools/server/actors/network-monitor/stack-traces-actor",
+      "devtools/server/actors/network-monitor/network-content",
       {
-        prefix: "stacktraces",
-        constructor: "StackTracesActor",
+        prefix: "networkContent",
+        constructor: "NetworkContentActor",
         type: { target: true },
       }
     );
diff -Nru firefox-84.0.2+build1/devtools/server/actors/utils/inactive-property-helper.js firefox-85.0+build1/devtools/server/actors/utils/inactive-property-helper.js
--- firefox-84.0.2+build1/devtools/server/actors/utils/inactive-property-helper.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/utils/inactive-property-helper.js	2021-01-18 19:58:08.000000000 +0000
@@ -43,6 +43,8 @@
   "column-rule-color",
   "outline",
   "outline-color",
+  "text-decoration-color",
+  "text-emphasis-color",
 ]);
 
 class InactivePropertyHelper {
@@ -297,6 +299,20 @@
         msgId: "inactive-text-overflow-when-no-overflow",
         numFixProps: 1,
       },
+      // -moz-outline-radius doesn't apply when outline-style is auto or none.
+      {
+        invalidProperties: [
+          "-moz-outline-radius",
+          "-moz-outline-radius-topleft",
+          "-moz-outline-radius-topright",
+          "-moz-outline-radius-bottomleft",
+          "-moz-outline-radius-bottomright",
+        ],
+        when: () => this.checkComputedStyle("outline-style", ["auto", "none"]),
+        fixId: "inactive-outline-radius-when-outline-style-auto-or-none-fix",
+        msgId: "inactive-outline-radius-when-outline-style-auto-or-none",
+        numFixProps: 1,
+      },
     ];
   }
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/watcher/moz.build firefox-85.0+build1/devtools/server/actors/watcher/moz.build
--- firefox-84.0.2+build1/devtools/server/actors/watcher/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/watcher/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -9,5 +9,6 @@
 ]
 
 DevToolsModules(
+    "WatchedDataHelpers.jsm",
     "WatcherRegistry.jsm",
 )
diff -Nru firefox-84.0.2+build1/devtools/server/actors/watcher/WatchedDataHelpers.jsm firefox-85.0+build1/devtools/server/actors/watcher/WatchedDataHelpers.jsm
--- firefox-84.0.2+build1/devtools/server/actors/watcher/WatchedDataHelpers.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/watcher/WatchedDataHelpers.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,66 @@
+/* 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";
+
+/**
+ * Helper module alongside WatcherRegistry, which focus on updating the "watchedData" object.
+ * This object is shared across processes and threads and have to be maintained in all these runtimes.
+ */
+
+var EXPORTED_SYMBOLS = ["WatchedDataHelpers"];
+
+// List of all arrays stored in `watchedData`, which are replicated across processes and threads
+const SUPPORTED_DATA = {
+  TARGETS: "targets",
+  RESOURCES: "resources",
+};
+
+const WatchedDataHelpers = {
+  SUPPORTED_DATA,
+
+  /**
+   * Add new values to the shared "watchedData" object.
+   *
+   * @param Object watchedData
+   *               The data object to update.
+   * @param string type
+   *               The type of data to be added
+   * @param Array<Object> entries
+   *               The values to be added to this type of data
+   */
+  addWatchedDataEntry(watchedData, type, entries) {
+    for (const entry of entries) {
+      if (watchedData[type].includes(entry)) {
+        throw new Error(`'${type}:${entry} already exists`);
+      }
+    }
+
+    for (const entry of entries) {
+      watchedData[type].push(entry);
+    }
+  },
+
+  /**
+   * Remove values from the shared "watchedData" object.
+   *
+   * @param Object watchedData
+   *               The data object to update.
+   * @param string type
+   *               The type of data to be remove
+   * @param Array<Object> entries
+   *               The values to be removed from this type of data
+   */
+  removeWatchedDataEntry(watchedData, type, entries) {
+    let includesAtLeastOne = false;
+    for (const entry of entries) {
+      const idx = watchedData[type].indexOf(entry);
+      if (idx !== -1) {
+        watchedData[type].splice(idx, 1);
+        includesAtLeastOne = true;
+      }
+    }
+    return includesAtLeastOne;
+  },
+};
diff -Nru firefox-84.0.2+build1/devtools/server/actors/watcher/WatcherRegistry.jsm firefox-85.0+build1/devtools/server/actors/watcher/WatcherRegistry.jsm
--- firefox-84.0.2+build1/devtools/server/actors/watcher/WatcherRegistry.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/watcher/WatcherRegistry.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -32,6 +32,10 @@
 const { ActorManagerParent } = ChromeUtils.import(
   "resource://gre/modules/ActorManagerParent.jsm"
 );
+const { WatchedDataHelpers } = ChromeUtils.import(
+  "resource://devtools/server/actors/watcher/WatchedDataHelpers.jsm"
+);
+const { SUPPORTED_DATA } = WatchedDataHelpers;
 
 // Define the Map that will be saved in `sharedData`.
 // It is keyed by WatcherActor ID and values contains following attributes:
@@ -56,12 +60,6 @@
 // Name of the attribute into which we save this Map in `sharedData` object.
 const SHARED_DATA_KEY_NAME = "DevTools:watchedPerWatcher";
 
-// List of all arrays stored in `sharedData` which are replicated across processes and threads
-const SUPPORTED_DATA = {
-  TARGETS: "targets",
-  RESOURCES: "resources",
-};
-
 /**
  * Use `sharedData` to allow processes, early during their creation,
  * to know which resources should be listened to. This will be read
@@ -162,21 +160,11 @@
       throw new Error(`Unsupported watcher data type: ${type}`);
     }
 
-    for (const entry of entries) {
-      if (watchedData[type].includes(entry)) {
-        throw new Error(
-          `'${type}:${entry} already exists for Watcher Actor ${watcher.actorID}`
-        );
-      }
-    }
+    WatchedDataHelpers.addWatchedDataEntry(watchedData, type, entries);
 
     // Register the JS Window Actor the first time we start watching for something (e.g. resource, target, …).
     registerJSWindowActor();
 
-    for (const entry of entries) {
-      watchedData[type].push(entry);
-    }
-
     persistMapToSharedData();
   },
 
@@ -198,15 +186,9 @@
       throw new Error(`Unsupported watcher data type: ${type}`);
     }
 
-    let includesAtLeastOne = false;
-    for (const entry of entries) {
-      const idx = watchedData[type].indexOf(entry);
-      if (idx !== -1) {
-        watchedData[type].splice(idx, 1);
-        includesAtLeastOne = true;
-      }
-    }
-    if (!includesAtLeastOne) {
+    if (
+      !WatchedDataHelpers.removeWatchedDataEntry(watchedData, type, entries)
+    ) {
       return false;
     }
 
diff -Nru firefox-84.0.2+build1/devtools/server/actors/watcher.js firefox-85.0+build1/devtools/server/actors/watcher.js
--- firefox-84.0.2+build1/devtools/server/actors/watcher.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/watcher.js	2021-01-18 19:58:09.000000000 +0000
@@ -35,8 +35,8 @@
 
 loader.lazyRequireGetter(
   this,
-  "NetworkActor",
-  "devtools/server/actors/network-monitor/network",
+  "NetworkParentActor",
+  "devtools/server/actors/network-monitor/network-parent",
   true
 );
 
@@ -108,15 +108,14 @@
 
     return {
       actor: this.actorID,
+      // The resources and target traits should be removed all at the same time since the
+      // client has generic ways to deal with all of them (See Bug 1680280).
       traits: {
-        // FF77+ supports frames in Watcher actor
         [Targets.TYPES.FRAME]: true,
-        // FF84+ supports processes
         [Targets.TYPES.PROCESS]: true,
-        // FF84+ supports workers in Watcher actor for content toolbox.
         [Targets.TYPES.WORKER]: hasBrowserElement,
         resources: {
-          // FF81+ (bug 1642295) added support for:
+          // In Firefox 81 we added support for:
           // - CONSOLE_MESSAGE
           // - CSS_CHANGE
           // - CSS_MESSAGE
@@ -144,6 +143,7 @@
             enableServerWatcher && hasBrowserElement,
           [Resources.TYPES.STYLESHEET]:
             enableServerWatcher && hasBrowserElement,
+          [Resources.TYPES.SOURCE]: hasBrowserElement,
         },
       },
     };
@@ -425,7 +425,7 @@
    * @return {Object} actor
    *        The network actor.
    */
-  getNetworkActor() {
-    return new NetworkActor(this);
+  getNetworkParentActor() {
+    return new NetworkParentActor(this);
   },
 });
diff -Nru firefox-84.0.2+build1/devtools/server/actors/webconsole.js firefox-85.0+build1/devtools/server/actors/webconsole.js
--- firefox-84.0.2+build1/devtools/server/actors/webconsole.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/actors/webconsole.js	2021-01-18 19:58:08.000000000 +0000
@@ -1008,8 +1008,11 @@
         // Wait for any potential returned Promise.
         response = await this._maybeWaitForResponseResult(response);
         // Set the timestamp only now, so any messages logged in the expression will come
-        // before the result.
-        response.timestamp = Date.now();
+        // before the result. Add an extra millisecond so the result has a different timestamp
+        // than the console message it might have emitted (unlike the evaluation result,
+        // console api messages are throttled before being handled by the webconsole client,
+        // which might cause some ordering issue).
+        response.timestamp = Date.now() + 1;
         // Finally, emit an unsolicited evaluationResult packet with the evaluation result.
         this.emit("evaluationResult", {
           type: "evaluationResult",
diff -Nru firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm
--- firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -41,15 +41,23 @@
   const window = Services.wm.getCurrentInnerWindowWithId(
     windowGlobal.innerWindowId
   );
-  // For some unknown reason, the print preview of PDFs generates an about:blank document,
-  // which, on the parent process, has windowGlobal.documentURI.spec set to the pdf's URL.
-  // So that Frame target helper accept this WindowGlobal and instantiate a target for it.
+
+  // For some unknown reason, the print preview of PDFs generates an about:blank
+  // document, which, on the parent process, has windowGlobal.documentURI.spec
+  // set to the pdf's URL. So that Frame target helper accepts this WindowGlobal
+  // and instantiates a target for it.
   // Which is great as this is a valuable document to debug.
-  // But at the end of the day, in the content process, this ends up being an about:blank document,
-  // and hasLoadedNonBlankURI is always false.
-  // As print preview uses a dialog, check for `opener` being set. It is hard to find
-  // any very good differenciator...
-  if (!window.docShell.hasLoadedNonBlankURI && !browsingContext.opener) {
+  // But in the content process, this ends up being an about:blank document, and
+  // hasLoadedNonBlankURI is always false. Nonetheless, this isn't a real empty
+  // about:blank. We end up loading resource://pdf.js/web/viewer.html.
+  // But `window.location` is set to about:blank, while `document.documentURI`
+  // is set to the pretty printed PDF...
+  // So we end up checking the documentURI in order to see if that's a special
+  // not-really-blank about:blank document!
+  if (
+    !window.docShell.hasLoadedNonBlankURI &&
+    window.document?.documentURI === "about:blank"
+  ) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsFrameParent.jsm firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsFrameParent.jsm
--- firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsFrameParent.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsFrameParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -54,18 +54,29 @@
    * Request the content process to create the Frame Target if there is one
    * already available that matches the Browsing Context ID
    */
-  instantiateTarget({
+  async instantiateTarget({
     watcherActorID,
     connectionPrefix,
     browserId,
     watchedData,
   }) {
-    return this.sendQuery("DevToolsFrameParent:instantiate-already-available", {
-      watcherActorID,
-      connectionPrefix,
-      browserId,
-      watchedData,
-    });
+    try {
+      await this.sendQuery(
+        "DevToolsFrameParent:instantiate-already-available",
+        {
+          watcherActorID,
+          connectionPrefix,
+          browserId,
+          watchedData,
+        }
+      );
+    } catch (e) {
+      console.warn(
+        "Failed to create DevTools Frame target for browsingContext",
+        this.browsingContext.id
+      );
+      console.warn(e);
+    }
   }
 
   destroyTarget({ watcherActorID, browserId }) {
@@ -78,13 +89,21 @@
   /**
    * Communicate to the content process that some data have been added.
    */
-  addWatcherDataEntry({ watcherActorID, browserId, type, entries }) {
-    return this.sendQuery("DevToolsFrameParent:addWatcherDataEntry", {
-      watcherActorID,
-      browserId,
-      type,
-      entries,
-    });
+  async addWatcherDataEntry({ watcherActorID, browserId, type, entries }) {
+    try {
+      await this.sendQuery("DevToolsFrameParent:addWatcherDataEntry", {
+        watcherActorID,
+        browserId,
+        type,
+        entries,
+      });
+    } catch (e) {
+      console.warn(
+        "Failed to add watcher data entry for frame targets in browsing context",
+        this.browsingContext.id
+      );
+      console.warn(e);
+    }
   }
 
   /**
@@ -196,17 +215,6 @@
    * JsWindowActor API
    */
 
-  async sendQuery(msg, args) {
-    try {
-      const res = await super.sendQuery(msg, args);
-      return res;
-    } catch (e) {
-      console.error("Failed to sendQuery in DevToolsFrameParent", msg);
-      console.error(e.toString());
-      throw e;
-    }
-  }
-
   receiveMessage(message) {
     switch (message.name) {
       case "DevToolsFrameChild:connectFromContent":
diff -Nru firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm
--- firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerChild.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -28,6 +28,10 @@
 XPCOMUtils.defineLazyGetter(this, "DevToolsUtils", () =>
   Loader.require("devtools/shared/DevToolsUtils")
 );
+XPCOMUtils.defineLazyModuleGetters(this, {
+  WatchedDataHelpers:
+    "resource://devtools/server/actors/watcher/WatchedDataHelpers.jsm",
+});
 
 // Name of the attribute into which we save data in `sharedData` object.
 const SHARED_DATA_KEY_NAME = "DevTools:watchedPerWatcher";
@@ -444,10 +448,11 @@
       return;
     }
 
-    if (!watcherConnectionData.watchedData[type]) {
-      watcherConnectionData.watchedData[type] = [];
-    }
-    watcherConnectionData.watchedData[type].push(...entries);
+    WatchedDataHelpers.addWatchedDataEntry(
+      watcherConnectionData.watchedData,
+      type,
+      entries
+    );
 
     const promises = [];
     for (const {
@@ -473,13 +478,11 @@
       return;
     }
 
-    if (watcherConnectionData.watchedData[type]) {
-      watcherConnectionData.watchedData[
-        type
-      ] = watcherConnectionData.watchedData[type].filter(
-        entry => !entries.includes(entry)
-      );
-    }
+    WatchedDataHelpers.removeWatchedDataEntry(
+      watcherConnectionData.watchedData,
+      type,
+      entries
+    );
 
     for (const {
       dbg,
diff -Nru firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerParent.jsm firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerParent.jsm
--- firefox-84.0.2+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerParent.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/connectors/js-window-actor/DevToolsWorkerParent.jsm	2021-01-18 19:58:08.000000000 +0000
@@ -51,21 +51,31 @@
    * Request the content process to create Worker Targets if workers matching the browserId
    * are already available.
    */
-  instantiateWorkerTargets({
+  async instantiateWorkerTargets({
     watcherActorID,
     connectionPrefix,
     browserId,
     watchedData,
   }) {
-    return this.sendQuery(
-      "DevToolsWorkerParent:instantiate-already-available",
-      {
-        watcherActorID,
-        connectionPrefix,
-        browserId,
-        watchedData,
-      }
-    );
+    try {
+      await this.sendQuery(
+        "DevToolsWorkerParent:instantiate-already-available",
+        {
+          watcherActorID,
+          connectionPrefix,
+          browserId,
+          watchedData,
+        }
+      );
+    } catch (e) {
+      console.warn(
+        "Failed to create DevTools Worker target for browsingContext",
+        this.browsingContext.id,
+        "and watcher actor id",
+        watcherActorID
+      );
+      console.warn(e);
+    }
   }
 
   destroyWorkerTargets({ watcher, browserId }) {
@@ -78,12 +88,22 @@
   /**
    * Communicate to the content process that some data have been added.
    */
-  addWatcherDataEntry({ watcherActorID, type, entries }) {
-    return this.sendQuery("DevToolsWorkerParent:addWatcherDataEntry", {
-      watcherActorID,
-      type,
-      entries,
-    });
+  async addWatcherDataEntry({ watcherActorID, type, entries }) {
+    try {
+      await this.sendQuery("DevToolsWorkerParent:addWatcherDataEntry", {
+        watcherActorID,
+        type,
+        entries,
+      });
+    } catch (e) {
+      console.warn(
+        "Failed to add watcher data entry for worker targets in browsing context",
+        this.browsingContext.id,
+        "and watcher actor id",
+        watcherActorID
+      );
+      console.warn(e);
+    }
   }
 
   /**
diff -Nru firefox-84.0.2+build1/devtools/server/tests/browser/browser_navigateEvents.js firefox-85.0+build1/devtools/server/tests/browser/browser_navigateEvents.js
--- firefox-84.0.2+build1/devtools/server/tests/browser/browser_navigateEvents.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/browser/browser_navigateEvents.js	2021-01-18 19:58:08.000000000 +0000
@@ -177,7 +177,7 @@
   const onBrowserLoaded = BrowserTestUtils.browserLoaded(
     gBrowser.selectedBrowser
   );
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, URL2);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, URL2);
   await onBrowserLoaded;
 
   // Wait for all events to be received
diff -Nru firefox-84.0.2+build1/devtools/server/tests/browser/browser_storage_updates.js firefox-85.0+build1/devtools/server/tests/browser/browser_storage_updates.js
--- firefox-84.0.2+build1/devtools/server/tests/browser/browser_storage_updates.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/browser/browser_storage_updates.js	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,12 @@
 
 "use strict";
 
+/* import-globals-from storage-helpers.js */
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/devtools/server/tests/browser/storage-helpers.js",
+  this
+);
+
 const TESTS = [
   // index 0
   {
@@ -190,8 +196,9 @@
 ];
 
 add_task(async function() {
-  const target = await addTabTarget(MAIN_DOMAIN + "storage-updates.html");
-  const front = await target.getFront("storage");
+  const { target, front } = await openTabAndSetupStorage(
+    MAIN_DOMAIN + "storage-updates.html"
+  );
 
   for (let i = 0; i < TESTS.length; i++) {
     const test = TESTS[i];
diff -Nru firefox-84.0.2+build1/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js firefox-85.0+build1/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js
--- firefox-84.0.2+build1/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,29 +3,53 @@
 
 "use strict";
 
-// Test that StyleSheetActor.getText handles empty text correctly.
+// Test that StyleSheetsActor.getText handles empty text correctly.
 
-const CONTENT = "<style>body { background-color: #f06; }</style>";
-const TEST_URI = "data:text/html;charset=utf-8," + encodeURIComponent(CONTENT);
+const CSS_CONTENT = "body { background-color: #f06; }";
+const TEST_URI = `data:text/html;charset=utf-8,<style>${encodeURIComponent(
+  CSS_CONTENT
+)}</style>`;
 
 add_task(async function() {
   const target = await addTabTarget(TEST_URI);
-  const front = await target.getFront("stylesheets");
-  ok(front, "The StyleSheetsFront was created.");
 
-  const sheets = await front.getStyleSheets();
-  ok(sheets, "getStyleSheets() succeeded");
+  const {
+    ResourceWatcher,
+  } = require("devtools/shared/resources/resource-watcher");
+  const { TargetList } = require("devtools/shared/resources/target-list");
+
+  const targetList = new TargetList(target.client.mainRoot, target);
+  await targetList.startListening();
+  const resourceWatcher = new ResourceWatcher(targetList);
+
+  const styleSheetsFront = await target.getFront("stylesheets");
+  ok(styleSheetsFront, "The StyleSheetsFront was created.");
+
+  const sheets = [];
+  await resourceWatcher.watchResources([ResourceWatcher.TYPES.STYLESHEET], {
+    onAvailable: resources => sheets.push(...resources),
+  });
+  is(sheets.length, 1, "watchResources returned the correct number of sheets");
+
+  const { resourceId } = sheets[0];
+
   is(
-    sheets.length,
-    1,
-    "getStyleSheets() returned the correct number of sheets"
+    await getStyleSheetText(styleSheetsFront, resourceId),
+    CSS_CONTENT,
+    "The stylesheet has expected initial text"
+  );
+  info("Update stylesheet content via the styleSheetsFront");
+  await styleSheetsFront.update(resourceId, "", false);
+  is(
+    await getStyleSheetText(styleSheetsFront, resourceId),
+    "",
+    "Stylesheet is now empty, as expected"
   );
-
-  const sheet = sheets[0];
-  await sheet.update("", false);
-  const longStr = await sheet.getText();
-  const source = await longStr.string();
-  is(source, "", "text is empty");
 
   await target.destroy();
 });
+
+async function getStyleSheetText(styleSheetsFront, resourceId) {
+  const longStringFront = await styleSheetsFront.getText(resourceId);
+  return longStringFront.string();
+}
diff -Nru firefox-84.0.2+build1/devtools/server/tests/browser/browser_watcher-watchTargets-frames.js firefox-85.0+build1/devtools/server/tests/browser/browser_watcher-watchTargets-frames.js
--- firefox-84.0.2+build1/devtools/server/tests/browser/browser_watcher-watchTargets-frames.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/browser/browser_watcher-watchTargets-frames.js	2021-01-18 19:58:08.000000000 +0000
@@ -61,7 +61,7 @@
 
   const parentProcessTarget = await processDescriptor.getTarget();
   is(
-    await parentProcessTarget.getWatcher(),
+    await parentProcessTarget.getWatcherFront(),
     watcher,
     "Parent process target getWatcher returns the same watcher"
   );
@@ -91,7 +91,7 @@
   const watcher = await tabDescriptor.getWatcher();
 
   is(
-    await tabTarget.getWatcher(),
+    await tabTarget.getWatcherFront(),
     watcher,
     "Tab target getWatcher returns the same watcher"
   );
@@ -138,7 +138,7 @@
       "The iframe target BrowsingContextID is correct"
     );
     is(
-      await existingIframeTarget.getWatcher(),
+      await existingIframeTarget.getWatcherFront(),
       watcher,
       "Iframe target getWatcher returns the same watcher"
     );
diff -Nru firefox-84.0.2+build1/devtools/server/tests/browser/storage-helpers.js firefox-85.0+build1/devtools/server/tests/browser/storage-helpers.js
--- firefox-84.0.2+build1/devtools/server/tests/browser/storage-helpers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/browser/storage-helpers.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,8 @@
 
 "use strict";
 
+const LEGACY_ACTORS_PREF = "devtools.storage.test.forceLegacyActors";
+
 /**
  * This generator function opens the given url in a new tab, then sets up the
  * page by waiting for all cookies, indexedDB items etc. to be created.
@@ -17,6 +19,11 @@
  * @return {Promise} A promise that resolves after storage inspector is ready
  */
 async function openTabAndSetupStorage(url) {
+  // Enable testing prefs
+  SpecialPowers.pushPrefEnv({
+    set: [[LEGACY_ACTORS_PREF, true]],
+  });
+
   const content = await addTab(url);
 
   // Setup the async storages in main window and for all its iframes
diff -Nru firefox-84.0.2+build1/devtools/server/tests/chrome/inactive-property-helper/outline-radius.js firefox-85.0+build1/devtools/server/tests/chrome/inactive-property-helper/outline-radius.js
--- firefox-84.0.2+build1/devtools/server/tests/chrome/inactive-property-helper/outline-radius.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/chrome/inactive-property-helper/outline-radius.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,28 @@
+/* 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/. */
+
+// InactivePropertyHelper `outline-radius` test cases.
+export default [
+  {
+    info: "-moz-outline-radius is inactive when outline-style is auto",
+    property: "-moz-outline-radius",
+    tagName: "div",
+    rules: ["div { outline: 10px auto; -moz-outline-radius: 10px; }"],
+    isActive: false,
+  },
+  {
+    info: "-moz-outline-radius is inactive when outline-style is none",
+    property: "-moz-outline-radius",
+    tagName: "div",
+    rules: ["div { -moz-outline-radius: 10px; }"],
+    isActive: false,
+  },
+  {
+    info: "-moz-outline-radius is active when outline-style is not auto",
+    property: "-moz-outline-radius",
+    tagName: "div",
+    rules: ["div { outline: 10px solid; -moz-outline-radius: 10px; }"],
+    isActive: true,
+  },
+];
diff -Nru firefox-84.0.2+build1/devtools/server/tests/chrome/test_highlighter_paused_debugger.html firefox-85.0+build1/devtools/server/tests/chrome/test_highlighter_paused_debugger.html
--- firefox-84.0.2+build1/devtools/server/tests/chrome/test_highlighter_paused_debugger.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/chrome/test_highlighter_paused_debugger.html	2021-01-18 19:58:09.000000000 +0000
@@ -54,7 +54,7 @@
   ok(isHidden("root"), "The highlighter is hidden");
 
   info("Show the highlighter with overlay and toolbar");
-  let didShow = highlighter.show(null, { "reason": "breakpoint" });
+  let didShow = highlighter.show("breakpoint");
   ok(didShow, "Calling show returned true");
   ok(!isHidden("root"), "The highlighter is shown");
   ok(isOverlayShown(), "The overlay is shown");
@@ -65,7 +65,7 @@
   );
 
   info("Call show again with another reason");
-  didShow = highlighter.show(null, {"reason": "debuggerStatement"});
+  didShow = highlighter.show("debuggerStatement");
   ok(didShow, "Calling show returned true too");
   ok(!isHidden("root"), "The highlighter is still shown");
   is(getReason(), "Paused on debugger statement",
diff -Nru firefox-84.0.2+build1/devtools/server/tests/chrome/test_inspector-inactive-property-helper.html firefox-85.0+build1/devtools/server/tests/chrome/test_inspector-inactive-property-helper.html
--- firefox-84.0.2+build1/devtools/server/tests/chrome/test_inspector-inactive-property-helper.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/chrome/test_inspector-inactive-property-helper.html	2021-01-18 19:58:08.000000000 +0000
@@ -51,7 +51,8 @@
     "place-items-content.js",
     "positioned.js",
     "vertical-align.js",
-    "text-overflow.js"
+    "text-overflow.js",
+    "outline-radius.js",
   ].map(file => `${FOLDER}/${file}`);
 
   // Import all the test cases
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/testactors.js firefox-85.0+build1/devtools/server/tests/xpcshell/testactors.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/testactors.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/testactors.js	2021-01-18 19:58:08.000000000 +0000
@@ -128,10 +128,7 @@
   form() {
     const form = {
       actor: this.actorID,
-      traits: {
-        getFavicon: true,
-        hasTabInfo: true,
-      },
+      traits: {},
       selected: this.selected,
       title: this._targetActor.title,
       url: this._targetActor.url,
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_objectgrips-nested-promise.js firefox-85.0+build1/devtools/server/tests/xpcshell/test_objectgrips-nested-promise.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_objectgrips-nested-promise.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/test_objectgrips-nested-promise.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,57 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable no-shadow, max-nested-callbacks */
+
+"use strict";
+
+Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
+registerCleanupFunction(() => {
+  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
+});
+
+add_task(
+  threadFrontTest(async ({ threadFront, debuggee }) => {
+    const packet = await executeOnNextTickAndWaitForPause(
+      () => evalCode(debuggee),
+      threadFront
+    );
+
+    const [grip1, grip2] = packet.frame.arguments;
+    strictEqual(grip1.class, "Promise", "promise1 has a promise grip.");
+    strictEqual(grip2.class, "Promise", "promise2 has a promise grip.");
+
+    const objClient1 = threadFront.pauseGrip(grip1);
+    const objClient2 = threadFront.pauseGrip(grip2);
+    const { promiseState: state1 } = await objClient1.getPromiseState();
+    const { promiseState: state2 } = await objClient2.getPromiseState();
+
+    strictEqual(state1.state, "fulfilled", "promise1 was fulfilled.");
+    strictEqual(state1.value, objClient2, "promise1 fulfilled with promise2.");
+    ok(!state1.hasOwnProperty("reason"), "promise1 has no rejection reason.");
+
+    strictEqual(state2.state, "rejected", "promise2 was rejected.");
+    strictEqual(state2.reason, objClient1, "promise2 rejected with promise1.");
+    ok(!state2.hasOwnProperty("value"), "promise2 has no resolution value.");
+
+    await threadFront.resume();
+  })
+);
+
+function evalCode(debuggee) {
+  debuggee.eval(
+    function stopMe(arg) {
+      debugger;
+    }.toString()
+  );
+
+  debuggee.eval(`
+    var resolve;
+    var promise1 = new Promise(r => {resolve = r});
+    Object.setPrototypeOf(promise1, null);
+    var promise2 = Promise.reject(promise1);
+    promise2.catch(() => {});
+    Object.setPrototypeOf(promise2, null);
+    resolve(promise2);
+    stopMe(promise1, promise2);
+  `);
+}
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-01.js firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-01.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-01.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-01.js	2021-01-18 19:58:09.000000000 +0000
@@ -17,11 +17,15 @@
     );
 
     const environment = await packet.frame.getEnvironment();
-    const grip = environment.bindings.variables.p;
+    const grip = environment.bindings.variables.p.value;
 
-    ok(grip.value.preview);
-    equal(grip.value.class, "Promise");
-    equal(grip.value.promiseState.state, "pending");
+    ok(grip.preview);
+    equal(grip.class, "Promise");
+    equal(grip.preview.ownProperties["<state>"].value, "pending");
+
+    const objClient = threadFront.pauseGrip(grip);
+    const { promiseState } = await objClient.getPromiseState();
+    equal(promiseState.state, "pending");
   })
 );
 
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-02.js firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-02.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-02.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-02.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,16 +17,26 @@
     );
 
     const environment = await packet.frame.getEnvironment();
-    const grip = environment.bindings.variables.p;
+    const grip = environment.bindings.variables.p.value;
 
-    ok(grip.value.preview);
-    equal(grip.value.class, "Promise");
-    equal(grip.value.promiseState.state, "fulfilled");
+    ok(grip.preview);
+    equal(grip.class, "Promise");
+    equal(grip.preview.ownProperties["<state>"].value, "fulfilled");
     equal(
-      grip.value.promiseState.value.actorID,
+      grip.preview.ownProperties["<value>"].value.actorID,
       packet.frame.arguments[0].actorID,
-      "The promise's fulfilled state value should be the same value passed " +
-        "to the then function"
+      "The promise's fulfilled state value in the preview should be the same " +
+        "value passed to the then function"
+    );
+
+    const objClient = threadFront.pauseGrip(grip);
+    const { promiseState } = await objClient.getPromiseState();
+    equal(promiseState.state, "fulfilled");
+    equal(
+      promiseState.value.getGrip().actorID,
+      packet.frame.arguments[0].actorID,
+      "The promise's fulfilled state value in getPromiseState() should be " +
+        "the same value passed to the then function"
     );
   })
 );
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-03.js firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-03.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_promise_state-03.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/test_promise_state-03.js	2021-01-18 19:58:08.000000000 +0000
@@ -17,15 +17,25 @@
     );
 
     const environment = await packet.frame.getEnvironment();
-    const grip = environment.bindings.variables.p;
-    ok(grip.value.preview);
-    equal(grip.value.class, "Promise");
-    equal(grip.value.promiseState.state, "rejected");
+    const grip = environment.bindings.variables.p.value;
+    ok(grip.preview);
+    equal(grip.class, "Promise");
+    equal(grip.preview.ownProperties["<state>"].value, "rejected");
     equal(
-      grip.value.promiseState.reason.actorID,
+      grip.preview.ownProperties["<reason>"].value.actorID,
       packet.frame.arguments[0].actorID,
-      "The promise's rejected state reason should be the same value passed " +
-        "to the then function"
+      "The promise's rejected state reason in the preview should be the same " +
+        "value passed to the then function"
+    );
+
+    const objClient = threadFront.pauseGrip(grip);
+    const { promiseState } = await objClient.getPromiseState();
+    equal(promiseState.state, "rejected");
+    equal(
+      promiseState.reason.getGrip().actorID,
+      packet.frame.arguments[0].actorID,
+      "The promise's rejected state value in getPromiseState() should be " +
+        "the same value passed to the then function"
     );
   })
 );
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_watchedDataHelpers.js firefox-85.0+build1/devtools/server/tests/xpcshell/test_watchedDataHelpers.js
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/test_watchedDataHelpers.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/test_watchedDataHelpers.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,79 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test WatchedDataHelpers.
+ */
+
+"use strict";
+
+const { WatchedDataHelpers } = ChromeUtils.import(
+  "resource://devtools/server/actors/watcher/WatchedDataHelpers.jsm"
+);
+const { SUPPORTED_DATA } = WatchedDataHelpers;
+const { TARGETS } = SUPPORTED_DATA;
+
+function run_test() {
+  const watchedData = {
+    [TARGETS]: [],
+  };
+
+  WatchedDataHelpers.addWatchedDataEntry(watchedData, TARGETS, [
+    "frame",
+    "worker",
+  ]);
+  deepEqual(
+    watchedData[TARGETS],
+    ["frame", "worker"],
+    "the two elements were added"
+  );
+
+  Assert.throws(
+    () =>
+      WatchedDataHelpers.addWatchedDataEntry(watchedData, TARGETS, ["frame"]),
+    /targets:frame already exists/,
+    "addWatchedDataEntry should throw on duplicates"
+  );
+
+  WatchedDataHelpers.addWatchedDataEntry(watchedData, TARGETS, ["process"]);
+  deepEqual(
+    watchedData[TARGETS],
+    ["frame", "worker", "process"],
+    "the third element is added"
+  );
+
+  let removed = WatchedDataHelpers.removeWatchedDataEntry(
+    watchedData,
+    TARGETS,
+    ["process"]
+  );
+  ok(removed, "removedWatchedDataEntry returned true as it removed an element");
+  deepEqual(
+    watchedData[TARGETS],
+    ["frame", "worker"],
+    "the element has been remove"
+  );
+
+  removed = WatchedDataHelpers.removeWatchedDataEntry(watchedData, TARGETS, [
+    "not-existing",
+  ]);
+  ok(
+    !removed,
+    "removedWatchedDataEntry returned false as no element has been removed"
+  );
+  deepEqual(
+    watchedData[TARGETS],
+    ["frame", "worker"],
+    "no change made to the array"
+  );
+
+  removed = WatchedDataHelpers.removeWatchedDataEntry(watchedData, TARGETS, [
+    "frame",
+    "worker",
+  ]);
+  ok(
+    removed,
+    "removedWatchedDataEntry returned true as elements have been removed"
+  );
+  deepEqual(watchedData[TARGETS], [], "all elements were removed");
+}
diff -Nru firefox-84.0.2+build1/devtools/server/tests/xpcshell/xpcshell.ini firefox-85.0+build1/devtools/server/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/devtools/server/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/server/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:09.000000000 +0000
@@ -160,6 +160,7 @@
 [test_objectgrips-fn-apply-01.js]
 [test_objectgrips-fn-apply-02.js]
 [test_objectgrips-fn-apply-03.js]
+[test_objectgrips-nested-promise.js]
 [test_objectgrips-nested-proxy.js]
 [test_promise_state-01.js]
 [test_promise_state-02.js]
@@ -239,3 +240,4 @@
 [test_webext_apis.js]
 [test_restartFrame-01.js]
 [test_connection_closes_all_pools.js]
+[test_watchedDataHelpers.js]
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/bin/update.js firefox-85.0+build1/devtools/shared/compatibility/bin/update.js
--- firefox-84.0.2+build1/devtools/shared/compatibility/bin/update.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/bin/update.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,41 @@
+/* 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/>. */
+
+// The Compatibility panel detects issues by comparing against official MDN compatibility data
+// at https://github.com/mdn/browser-compat-data). It uses a local snapshot of the dataset.
+// This dataset needs to be manually synchronized periodically
+
+// The subsets from the dataset required by the Compatibility panel are:
+// * browsers: https://github.com/mdn/browser-compat-data/tree/master/browsers
+// * css.properties: https://github.com/mdn/browser-compat-data/tree/master/css
+
+// The MDN compatibility data is available as a node package ("@mdn/browser-compat-data").
+// This node script downloads `browsers.json` and `css-properties.json` and updates the relevant files.
+
+/* global __dirname */
+
+"use strict";
+
+const compatData = require("@mdn/browser-compat-data");
+exportData(compatData.css.properties, "css-properties.json");
+exportData(compatData.browsers, "browsers.json");
+
+function exportData(data, fileName) {
+  const fs = require("fs");
+  const path = require("path");
+
+  const content = `${JSON.stringify(data)}`;
+
+  fs.writeFile(
+    path.resolve(__dirname, "../dataset", fileName),
+    content,
+    err => {
+      if (err) {
+        console.error(err);
+      } else {
+        console.log(`${fileName} downloaded`);
+      }
+    }
+  );
+}
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/dataset/browsers.json firefox-85.0+build1/devtools/shared/compatibility/dataset/browsers.json
--- firefox-84.0.2+build1/devtools/shared/compatibility/dataset/browsers.json	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/dataset/browsers.json	2021-01-18 19:58:09.000000000 +0000
@@ -1 +1 @@
-{"chrome":{"name":"Chrome","pref_url":"chrome://flags","releases":{"1":{"release_date":"2008-12-11","release_notes":"https://chromereleases.googleblog.com/2008/12/stable-release-google-chrome-is-out-of.html","status":"retired","engine":"WebKit","engine_version":"528"},"2":{"release_date":"2009-05-21","release_notes":"https://chromereleases.googleblog.com/2009/05/stable-update-google-chrome-2017228.html","status":"retired","engine":"WebKit","engine_version":"530"},"3":{"release_date":"2009-09-15","release_notes":"https://chromereleases.googleblog.com/2009/09/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"532"},"4":{"release_date":"2010-01-25","release_notes":"https://chromereleases.googleblog.com/2010/01/stable-channel-update_25.html","status":"retired","engine":"WebKit","engine_version":"532.5"},"5":{"release_date":"2010-05-25","release_notes":"https://chromereleases.googleblog.com/2010/05/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"533"},"6":{"release_date":"2010-09-02","release_notes":"https://chromereleases.googleblog.com/2010/09/stable-and-beta-channel-updates.html","status":"retired","engine":"WebKit","engine_version":"534.3"},"7":{"release_date":"2010-10-19","release_notes":"https://chromereleases.googleblog.com/2010/10/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"534.7"},"8":{"release_date":"2010-12-02","release_notes":"https://chromereleases.googleblog.com/2010/12/stable-beta-channel-updates.html","status":"retired","engine":"WebKit","engine_version":"534.10"},"9":{"release_date":"2011-02-03","release_notes":"https://chromereleases.googleblog.com/2011/02/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"534.13"},"10":{"release_date":"2011-03-08","release_notes":"https://chromereleases.googleblog.com/2011/03/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"534.16"},"11":{"release_date":"2011-04-27","release_notes":"https://chromereleases.googleblog.com/2011/04/chrome-stable-update.html","status":"retired","engine":"WebKit","engine_version":"534.24"},"12":{"release_date":"2011-06-07","release_notes":"https://chromereleases.googleblog.com/2011/06/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"534.30"},"13":{"release_date":"2011-08-02","release_notes":"https://chromereleases.googleblog.com/2011/08/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.1"},"14":{"release_date":"2011-09-16","release_notes":"https://chromereleases.googleblog.com/2011/09/stable-channel-update_16.html","status":"retired","engine":"WebKit","engine_version":"535.1"},"15":{"release_date":"2011-10-25","release_notes":"https://chromereleases.googleblog.com/2011/10/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"535.2"},"16":{"release_date":"2011-12-13","release_notes":"https://chromereleases.googleblog.com/2011/12/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.7"},"17":{"release_date":"2012-02-08","release_notes":"https://chromereleases.googleblog.com/2012/02/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.11"},"18":{"release_date":"2012-03-28","release_notes":"https://chromereleases.googleblog.com/2012/03/stable-channel-release-and-beta-channel.html","status":"retired","engine":"WebKit","engine_version":"535.19"},"19":{"release_date":"2012-05-15","release_notes":"https://chromereleases.googleblog.com/2012/05/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"536.5"},"20":{"release_date":"2012-06-26","release_notes":"https://chromereleases.googleblog.com/2012/06/stable-channel-update_26.html","status":"retired","engine":"WebKit","engine_version":"536.10"},"21":{"release_date":"2012-07-31","release_notes":"https://chromereleases.googleblog.com/2012/07/stable-channel-release.html","status":"retired","engine":"WebKit","engine_version":"537.1"},"22":{"release_date":"2012-09-25","release_notes":"https://chromereleases.googleblog.com/2012/09/stable-channel-update_25.html","status":"retired","engine":"WebKit","engine_version":"537.4"},"23":{"release_date":"2012-11-06","release_notes":"https://chromereleases.googleblog.com/2012/11/stable-channel-release-and-beta-channel.html","status":"retired","engine":"WebKit","engine_version":"537.11"},"24":{"release_date":"2013-01-10","release_notes":"https://chromereleases.googleblog.com/2013/01/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"537.17"},"25":{"release_date":"2013-02-21","release_notes":"https://chromereleases.googleblog.com/2013/02/stable-channel-update_21.html","status":"retired","engine":"WebKit","engine_version":"537.22"},"26":{"release_date":"2013-03-26","release_notes":"https://chromereleases.googleblog.com/2013/03/stable-channel-update_26.html","status":"retired","engine":"WebKit","engine_version":"537.31"},"27":{"release_date":"2013-05-21","release_notes":"https://chromereleases.googleblog.com/2013/05/stable-channel-release.html","status":"retired","engine":"WebKit","engine_version":"537.36"},"28":{"release_date":"2013-07-09","release_notes":"https://chromereleases.googleblog.com/2013/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"28"},"29":{"release_date":"2013-08-20","release_notes":"https://chromereleases.googleblog.com/2013/08/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"29"},"30":{"release_date":"2013-10-01","release_notes":"https://chromereleases.googleblog.com/2013/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"30"},"31":{"release_date":"2013-11-12","release_notes":"https://chromereleases.googleblog.com/2013/11/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"31"},"32":{"release_date":"2014-01-14","release_notes":"https://chromereleases.googleblog.com/2014/01/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"32"},"33":{"release_date":"2014-02-20","release_notes":"https://chromereleases.googleblog.com/2014/02/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"33"},"34":{"release_date":"2014-04-08","release_notes":"https://chromereleases.googleblog.com/2014/04/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"34"},"35":{"release_date":"2014-05-20","release_notes":"https://chromereleases.googleblog.com/2014/05/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"35"},"36":{"release_date":"2014-07-16","release_notes":"https://chromereleases.googleblog.com/2014/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"36"},"37":{"release_date":"2014-08-26","release_notes":"https://chromereleases.googleblog.com/2014/08/stable-channel-update_26.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-07","release_notes":"https://chromereleases.googleblog.com/2014/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-18","release_notes":"https://chromereleases.googleblog.com/2014/11/stable-channel-update_18.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/stable-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-03","release_notes":"https://chromereleases.googleblog.com/2015/03/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-14","release_notes":"https://chromereleases.googleblog.com/2015/04/stable-channel-update_14.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-19","release_notes":"https://chromereleases.googleblog.com/2015/05/stable-channel-update_19.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-21","release_notes":"https://chromereleases.googleblog.com/2015/07/stable-channel-update_21.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-13","release_notes":"https://chromereleases.googleblog.com/2015/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-01","release_notes":"https://chromereleases.googleblog.com/2015/12/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-20","release_notes":"https://chromereleases.googleblog.com/2016/01/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-02","release_notes":"https://chromereleases.googleblog.com/2016/03/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","release_notes":"https://chromereleases.googleblog.com/2016/04/stable-channel-update_13.html","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-05-25","release_notes":"https://chromereleases.googleblog.com/2016/05/stable-channel-update_25.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-20","release_notes":"https://chromereleases.googleblog.com/2016/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-08-31","release_notes":"https://chromereleases.googleblog.com/2016/08/stable-channel-update-for-desktop_31.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-12","release_notes":"https://chromereleases.googleblog.com/2016/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-01","release_notes":"https://chromereleases.googleblog.com/2016/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-01-25","release_notes":"https://chromereleases.googleblog.com/2017/01/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-09","release_notes":"https://chromereleases.googleblog.com/2017/03/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-19","release_notes":"https://chromereleases.googleblog.com/2017/04/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-05","release_notes":"https://chromereleases.googleblog.com/2017/06/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-07-25","release_notes":"https://chromereleases.googleblog.com/2017/07/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-17","release_notes":"https://chromereleases.googleblog.com/2017/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-06","release_notes":"https://chromereleases.googleblog.com/2017/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/stable-channel-update-for-desktop_24.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2018-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2018-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-29","release_notes":"https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop_58.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-16","release_notes":"https://chromereleases.googleblog.com/2018/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/stable-channel-update-for-desktop_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-23","release_notes":"https://chromereleases.googleblog.com/2019/04/stable-channel-update-for-desktop_23.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/stable-channel-update-for-desktop_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/stable-channel-update-for-desktop_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-10","release_notes":"https://chromereleases.googleblog.com/2019/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_7.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/stable-channel-update-for-desktop_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop_25.html","status":"current","engine":"Blink","engine_version":"85"},"86":{"status":"beta","engine":"Blink","engine_version":"86"},"87":{"status":"nightly","engine":"Blink","engine_version":"87"}}},"chrome_android":{"name":"Chrome Android","pref_url":"chrome://flags","releases":{"18":{"release_date":"2012-06-27","release_notes":"https://chromereleases.googleblog.com/2012/06/chrome-for-android-out-of-beta.html","status":"retired","engine":"WebKit","engine_version":"535.19"},"25":{"release_date":"2013-02-27","release_notes":"https://chromereleases.googleblog.com/2013/02/chrome-for-android-update.html","status":"retired","engine":"WebKit","engine_version":"537.22"},"26":{"release_date":"2013-04-03","release_notes":"https://chromereleases.googleblog.com/2013/04/chrome-for-android-stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"537.31"},"27":{"release_date":"2013-05-22","release_notes":"https://chromereleases.googleblog.com/2013/05/chrome-for-android-update.html","status":"retired","engine":"WebKit","engine_version":"537.36"},"28":{"release_date":"2013-07-10","release_notes":"https://chromereleases.googleblog.com/2013/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"28"},"29":{"release_date":"2013-08-21","release_notes":"https://chromereleases.googleblog.com/2013/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"29"},"30":{"release_date":"2013-10-02","release_notes":"https://chromereleases.googleblog.com/2013/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"30"},"31":{"release_date":"2013-11-14","release_notes":"https://chromereleases.googleblog.com/2013/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"31"},"32":{"release_date":"2014-01-15","release_notes":"https://chromereleases.googleblog.com/2014/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"32"},"33":{"release_date":"2014-02-26","release_notes":"https://chromereleases.googleblog.com/2014/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"33"},"34":{"release_date":"2014-04-02","release_notes":"https://chromereleases.googleblog.com/2014/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"34"},"35":{"release_date":"2014-05-20","release_notes":"https://chromereleases.googleblog.com/2014/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"35"},"36":{"release_date":"2014-07-16","release_notes":"https://chromereleases.googleblog.com/2014/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"36"},"37":{"release_date":"2014-09-03","release_notes":"https://chromereleases.googleblog.com/2014/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-08","release_notes":"https://chromereleases.googleblog.com/2014/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-12","release_notes":"https://chromereleases.googleblog.com/2014/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-11","release_notes":"https://chromereleases.googleblog.com/2015/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-15","release_notes":"https://chromereleases.googleblog.com/2015/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-27","release_notes":"https://chromereleases.googleblog.com/2015/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-29","release_notes":"https://chromereleases.googleblog.com/2015/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-14","release_notes":"https://chromereleases.googleblog.com/2015/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-02","release_notes":"https://chromereleases.googleblog.com/2015/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-26","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-09","release_notes":"https://chromereleases.googleblog.com/2016/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-06-08","release_notes":"https://chromereleases.googleblog.com/2016/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-27","release_notes":"https://chromereleases.googleblog.com/2016/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-09-07","release_notes":"https://chromereleases.googleblog.com/2016/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-19","release_notes":"https://chromereleases.googleblog.com/2016/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-06","release_notes":"https://chromereleases.googleblog.com/2016/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-02-01","release_notes":"https://chromereleases.googleblog.com/2017/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-16","release_notes":"https://chromereleases.googleblog.com/2017/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-25","release_notes":"https://chromereleases.googleblog.com/2017/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-06","release_notes":"https://chromereleases.googleblog.com/2017/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-08-01","release_notes":"https://chromereleases.googleblog.com/2017/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-24","release_notes":"https://chromereleases.googleblog.com/2017/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-05","release_notes":"https://chromereleases.googleblog.com/2017/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2018-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2018-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-31","release_notes":"https://chromereleases.googleblog.com/2018/05/chrome-for-android-update_31.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-17","release_notes":"https://chromereleases.googleblog.com/2018/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/chrome-for-android-update_29.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/chrome-for-android-update_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-24","release_notes":"https://chromereleases.googleblog.com/2019/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/chrome-for-android-update_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/chrome-for-android-update_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-17","release_notes":"https://chromereleases.googleblog.com/2019/12/chrome-for-android-update_17.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/chrome-for-android-update_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/chrome-for-android-update_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/chrome-for-android-update.html","status":"current","engine":"Blink","engine_version":"85"},"86":{"status":"beta","engine":"Blink","engine_version":"86"},"87":{"status":"nightly","engine":"Blink","engine_version":"87"}}},"edge":{"name":"Edge","pref_url":"about:flags","releases":{"12":{"release_date":"2015-07-28","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-12","status":"retired","engine":"EdgeHTML","engine_version":"12"},"13":{"release_date":"2015-11-12","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-13","status":"retired","engine":"EdgeHTML","engine_version":"13"},"14":{"release_date":"2016-08-02","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-14","status":"retired","engine":"EdgeHTML","engine_version":"14"},"15":{"release_date":"2017-04-05","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-15","status":"retired","engine":"EdgeHTML","engine_version":"15"},"16":{"release_date":"2017-10-17","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-16","status":"retired","engine":"EdgeHTML","engine_version":"16"},"17":{"release_date":"2018-04-30","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-17","status":"retired","engine":"EdgeHTML","engine_version":"17"},"18":{"release_date":"2018-10-02","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new","status":"retired","engine":"EdgeHTML","engine_version":"18"},"79":{"release_date":"2020-01-15","release_notes":"https://blogs.windows.com/windowsexperience/2020/01/15/new-year-new-browser-the-new-microsoft-edge-is-out-of-preview-and-now-available-for-download/","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-07","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-80036148-february-7","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-13","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-81041653-april-13","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-21","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-83047837-may-21","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-16","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-84052240-july-16","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-27","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-85056441-august-27","status":"current","engine":"Blink","engine_version":"85"},"86":{"status":"beta","engine":"Blink","engine_version":"86"},"87":{"status":"nightly","engine":"Blink","engine_version":"87"}}},"firefox":{"name":"Firefox","pref_url":"about:config","releases":{"1":{"release_date":"2004-11-09","release_notes":"http://website-archive.mozilla.org/www.mozilla.org/firefox_releasenotes/en-US/firefox/releases/1.0.html","status":"retired","engine":"Gecko","engine_version":"1.7"},"2":{"release_date":"2006-10-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/2","status":"retired","engine":"Gecko","engine_version":"1.8.1"},"3":{"release_date":"2008-06-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3","status":"retired","engine":"Gecko","engine_version":"1.9"},"4":{"release_date":"2011-03-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/4","status":"retired","engine":"Gecko","engine_version":"2"},"5":{"release_date":"2011-06-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/5","status":"retired","engine":"Gecko","engine_version":"5"},"6":{"release_date":"2011-08-16","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/6","status":"retired","engine":"Gecko","engine_version":"6"},"7":{"release_date":"2011-09-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/7","status":"retired","engine":"Gecko","engine_version":"7"},"8":{"release_date":"2011-11-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/8","status":"retired","engine":"Gecko","engine_version":"8"},"9":{"release_date":"2011-12-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/9","status":"retired","engine":"Gecko","engine_version":"9"},"10":{"release_date":"2012-01-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/10","status":"retired","engine":"Gecko","engine_version":"10"},"11":{"release_date":"2012-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/11","status":"retired","engine":"Gecko","engine_version":"11"},"12":{"release_date":"2012-04-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/12","status":"retired","engine":"Gecko","engine_version":"12"},"13":{"release_date":"2012-06-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/13","status":"retired","engine":"Gecko","engine_version":"13"},"14":{"release_date":"2012-07-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/14","status":"retired","engine":"Gecko","engine_version":"14"},"15":{"release_date":"2012-08-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/15","status":"retired","engine":"Gecko","engine_version":"15"},"16":{"release_date":"2012-10-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/16","status":"retired","engine":"Gecko","engine_version":"16"},"17":{"release_date":"2012-11-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/17","status":"retired","engine":"Gecko","engine_version":"17"},"18":{"release_date":"2013-01-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/18","status":"retired","engine":"Gecko","engine_version":"18"},"19":{"release_date":"2013-02-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/19","status":"retired","engine":"Gecko","engine_version":"19"},"20":{"release_date":"2013-04-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/20","status":"retired","engine":"Gecko","engine_version":"20"},"21":{"release_date":"2013-05-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/21","status":"retired","engine":"Gecko","engine_version":"21"},"22":{"release_date":"2013-06-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/22","status":"retired","engine":"Gecko","engine_version":"22"},"23":{"release_date":"2013-08-06","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/23","status":"retired","engine":"Gecko","engine_version":"23"},"24":{"release_date":"2013-09-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/24","status":"retired","engine":"Gecko","engine_version":"24"},"25":{"release_date":"2013-10-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/25","status":"retired","engine":"Gecko","engine_version":"25"},"26":{"release_date":"2013-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/26","status":"retired","engine":"Gecko","engine_version":"26"},"27":{"release_date":"2014-02-04","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/27","status":"retired","engine":"Gecko","engine_version":"27"},"28":{"release_date":"2014-03-18","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/28","status":"retired","engine":"Gecko","engine_version":"28"},"29":{"release_date":"2014-04-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/29","status":"retired","engine":"Gecko","engine_version":"29"},"30":{"release_date":"2014-06-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/30","status":"retired","engine":"Gecko","engine_version":"30"},"31":{"release_date":"2014-07-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/31","status":"retired","engine":"Gecko","engine_version":"31"},"32":{"release_date":"2014-09-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/32","status":"retired","engine":"Gecko","engine_version":"32"},"33":{"release_date":"2014-10-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/33","status":"retired","engine":"Gecko","engine_version":"33"},"34":{"release_date":"2014-12-01","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/34","status":"retired","engine":"Gecko","engine_version":"34"},"35":{"release_date":"2015-01-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/35","status":"retired","engine":"Gecko","engine_version":"35"},"36":{"release_date":"2015-02-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/36","status":"retired","engine":"Gecko","engine_version":"36"},"37":{"release_date":"2015-03-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/37","status":"retired","engine":"Gecko","engine_version":"37"},"38":{"release_date":"2015-05-12","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/38","status":"retired","engine":"Gecko","engine_version":"38"},"39":{"release_date":"2015-07-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/39","status":"retired","engine":"Gecko","engine_version":"39"},"40":{"release_date":"2015-08-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/40","status":"retired","engine":"Gecko","engine_version":"40"},"41":{"release_date":"2015-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/41","status":"retired","engine":"Gecko","engine_version":"41"},"42":{"release_date":"2015-11-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/42","status":"retired","engine":"Gecko","engine_version":"42"},"43":{"release_date":"2015-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/43","status":"retired","engine":"Gecko","engine_version":"43"},"44":{"release_date":"2016-01-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/44","status":"retired","engine":"Gecko","engine_version":"44"},"45":{"release_date":"2016-03-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/45","status":"retired","engine":"Gecko","engine_version":"45"},"46":{"release_date":"2016-04-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/46","status":"retired","engine":"Gecko","engine_version":"46"},"47":{"release_date":"2016-06-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/47","status":"retired","engine":"Gecko","engine_version":"47"},"48":{"release_date":"2016-08-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/48","status":"retired","engine":"Gecko","engine_version":"48"},"49":{"release_date":"2016-09-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/49","status":"retired","engine":"Gecko","engine_version":"49"},"50":{"release_date":"2016-11-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/50","status":"retired","engine":"Gecko","engine_version":"50"},"51":{"release_date":"2017-01-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/51","status":"retired","engine":"Gecko","engine_version":"51"},"52":{"release_date":"2017-03-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/52","status":"retired","engine":"Gecko","engine_version":"52"},"53":{"release_date":"2017-04-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/53","status":"retired","engine":"Gecko","engine_version":"53"},"54":{"release_date":"2017-06-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/54","status":"retired","engine":"Gecko","engine_version":"54"},"55":{"release_date":"2017-08-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/55","status":"retired","engine":"Gecko","engine_version":"55"},"56":{"release_date":"2017-09-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/56","status":"retired","engine":"Gecko","engine_version":"56"},"57":{"release_date":"2017-11-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/57","status":"retired","engine":"Gecko","engine_version":"57"},"58":{"release_date":"2018-01-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/58","status":"retired","engine":"Gecko","engine_version":"58"},"59":{"release_date":"2018-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/59","status":"retired","engine":"Gecko","engine_version":"59"},"60":{"release_date":"2018-05-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/60","status":"esr","engine":"Gecko","engine_version":"60"},"61":{"release_date":"2018-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/61","status":"retired","engine":"Gecko","engine_version":"61"},"62":{"release_date":"2018-09-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/62","status":"retired","engine":"Gecko","engine_version":"62"},"63":{"release_date":"2018-10-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/63","status":"retired","engine":"Gecko","engine_version":"63"},"64":{"release_date":"2018-12-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/64","status":"retired","engine":"Gecko","engine_version":"64"},"65":{"release_date":"2019-01-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/65","status":"retired","engine":"Gecko","engine_version":"65"},"66":{"release_date":"2019-03-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/66","status":"retired","engine":"Gecko","engine_version":"66"},"67":{"release_date":"2019-05-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/67","status":"retired","engine":"Gecko","engine_version":"67"},"68":{"release_date":"2019-07-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/68","status":"retired","engine":"Gecko","engine_version":"68"},"69":{"release_date":"2019-09-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/69","status":"retired","engine":"Gecko","engine_version":"69"},"70":{"release_date":"2019-10-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/70","status":"retired","engine":"Gecko","engine_version":"70"},"71":{"release_date":"2019-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/71","status":"retired","engine":"Gecko","engine_version":"71"},"72":{"release_date":"2020-01-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72","status":"retired","engine":"Gecko","engine_version":"72"},"73":{"release_date":"2020-02-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/73","status":"retired","engine":"Gecko","engine_version":"73"},"74":{"release_date":"2020-03-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/74","status":"retired","engine":"Gecko","engine_version":"74"},"75":{"release_date":"2020-04-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75","status":"retired","engine":"Gecko","engine_version":"75"},"76":{"release_date":"2020-05-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/76","status":"retired","engine":"Gecko","engine_version":"76"},"77":{"release_date":"2020-06-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/77","status":"retired","engine":"Gecko","engine_version":"77"},"78":{"release_date":"2020-06-30","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/78","status":"retired","engine":"Gecko","engine_version":"78"},"79":{"release_date":"2020-07-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/79","status":"retired","engine":"Gecko","engine_version":"79"},"80":{"release_date":"2020-08-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/80","status":"current","engine":"Gecko","engine_version":"80"},"81":{"release_date":"2020-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/81","status":"beta","engine":"Gecko","engine_version":"81"},"82":{"release_date":"2020-10-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/82","status":"nightly","engine":"Gecko","engine_version":"82"},"83":{"release_date":"2020-11-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/83","status":"planned","engine":"Gecko","engine_version":"83"},"84":{"release_date":"2020-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/84","status":"planned","engine":"Gecko","engine_version":"84"},"1.5":{"release_date":"2005-11-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/1.5","status":"retired","engine":"Gecko","engine_version":"1.8"},"3.5":{"release_date":"2009-06-30","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3.5","status":"retired","engine":"Gecko","engine_version":"1.9.1"},"3.6":{"release_date":"2010-01-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3.6","status":"retired","engine":"Gecko","engine_version":"1.9.2"},"3.6.9":{"release_date":"2010-09-07","release_notes":"https://website-archive.mozilla.org/www.mozilla.org/firefox_releasenotes/en-US/firefox/3.6.9/releasenotes/","status":"retired","engine":"Gecko","engine_version":"1.9.2"}}},"firefox_android":{"name":"Firefox Android","pref_url":"about:config","releases":{"4":{"release_date":"2011-03-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/4","status":"retired","engine":"Gecko","engine_version":"2"},"5":{"release_date":"2011-06-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/5","status":"retired","engine":"Gecko","engine_version":"5"},"6":{"release_date":"2011-08-16","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/6","status":"retired","engine":"Gecko","engine_version":"6"},"7":{"release_date":"2011-09-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/7","status":"retired","engine":"Gecko","engine_version":"7"},"8":{"release_date":"2011-11-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/8","status":"retired","engine":"Gecko","engine_version":"8"},"9":{"release_date":"2011-12-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/9","status":"retired","engine":"Gecko","engine_version":"9"},"10":{"release_date":"2012-01-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/10","status":"retired","engine":"Gecko","engine_version":"10"},"14":{"release_date":"2012-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/14","status":"retired","engine":"Gecko","engine_version":"14"},"15":{"release_date":"2012-08-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/15","status":"retired","engine":"Gecko","engine_version":"15"},"16":{"release_date":"2012-10-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/16","status":"retired","engine":"Gecko","engine_version":"16"},"17":{"release_date":"2012-11-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/17","status":"retired","engine":"Gecko","engine_version":"17"},"18":{"release_date":"2013-01-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/18","status":"retired","engine":"Gecko","engine_version":"18"},"19":{"release_date":"2013-02-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/19","status":"retired","engine":"Gecko","engine_version":"19"},"20":{"release_date":"2013-04-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/20","status":"retired","engine":"Gecko","engine_version":"20"},"21":{"release_date":"2013-05-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/21","status":"retired","engine":"Gecko","engine_version":"21"},"22":{"release_date":"2013-06-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/22","status":"retired","engine":"Gecko","engine_version":"22"},"23":{"release_date":"2013-08-06","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/23","status":"retired","engine":"Gecko","engine_version":"23"},"24":{"release_date":"2013-09-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/24","status":"retired","engine":"Gecko","engine_version":"24"},"25":{"release_date":"2013-10-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/25","status":"retired","engine":"Gecko","engine_version":"25"},"26":{"release_date":"2013-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/26","status":"retired","engine":"Gecko","engine_version":"26"},"27":{"release_date":"2014-02-04","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/27","status":"retired","engine":"Gecko","engine_version":"27"},"28":{"release_date":"2014-03-18","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/28","status":"retired","engine":"Gecko","engine_version":"28"},"29":{"release_date":"2014-04-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/29","status":"retired","engine":"Gecko","engine_version":"29"},"30":{"release_date":"2014-06-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/30","status":"retired","engine":"Gecko","engine_version":"30"},"31":{"release_date":"2014-07-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/31","status":"retired","engine":"Gecko","engine_version":"31"},"32":{"release_date":"2014-09-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/32","status":"retired","engine":"Gecko","engine_version":"32"},"33":{"release_date":"2014-10-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/33","status":"retired","engine":"Gecko","engine_version":"33"},"34":{"release_date":"2014-12-01","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/34","status":"retired","engine":"Gecko","engine_version":"34"},"35":{"release_date":"2015-01-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/35","status":"retired","engine":"Gecko","engine_version":"35"},"36":{"release_date":"2015-02-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/36","status":"retired","engine":"Gecko","engine_version":"36"},"37":{"release_date":"2015-03-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/37","status":"retired","engine":"Gecko","engine_version":"37"},"38":{"release_date":"2015-05-12","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/38","status":"retired","engine":"Gecko","engine_version":"38"},"39":{"release_date":"2015-07-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/39","status":"retired","engine":"Gecko","engine_version":"39"},"40":{"release_date":"2015-08-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/40","status":"retired","engine":"Gecko","engine_version":"40"},"41":{"release_date":"2015-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/41","status":"retired","engine":"Gecko","engine_version":"41"},"42":{"release_date":"2015-11-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/42","status":"retired","engine":"Gecko","engine_version":"42"},"43":{"release_date":"2015-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/43","status":"retired","engine":"Gecko","engine_version":"43"},"44":{"release_date":"2016-01-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/44","status":"retired","engine":"Gecko","engine_version":"44"},"45":{"release_date":"2016-03-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/45","status":"retired","engine":"Gecko","engine_version":"45"},"46":{"release_date":"2016-04-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/46","status":"retired","engine":"Gecko","engine_version":"46"},"47":{"release_date":"2016-06-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/47","status":"retired","engine":"Gecko","engine_version":"47"},"48":{"release_date":"2016-08-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/48","status":"retired","engine":"Gecko","engine_version":"48"},"49":{"release_date":"2016-09-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/49","status":"retired","engine":"Gecko","engine_version":"49"},"50":{"release_date":"2016-11-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/50","status":"retired","engine":"Gecko","engine_version":"50"},"51":{"release_date":"2017-01-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/51","status":"retired","engine":"Gecko","engine_version":"51"},"52":{"release_date":"2017-03-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/52","status":"retired","engine":"Gecko","engine_version":"52"},"53":{"release_date":"2017-04-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/53","status":"retired","engine":"Gecko","engine_version":"53"},"54":{"release_date":"2017-06-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/54","status":"retired","engine":"Gecko","engine_version":"54"},"55":{"release_date":"2017-08-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/55","status":"retired","engine":"Gecko","engine_version":"55"},"56":{"release_date":"2017-09-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/56","status":"retired","engine":"Gecko","engine_version":"56"},"57":{"release_date":"2017-11-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/57","status":"retired","engine":"Gecko","engine_version":"57"},"58":{"release_date":"2018-01-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/58","status":"retired","engine":"Gecko","engine_version":"58"},"59":{"release_date":"2018-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/59","status":"retired","engine":"Gecko","engine_version":"59"},"60":{"release_date":"2018-05-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/60","status":"retired","engine":"Gecko","engine_version":"60"},"61":{"release_date":"2018-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/61","status":"retired","engine":"Gecko","engine_version":"61"},"62":{"release_date":"2018-09-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/62","status":"retired","engine":"Gecko","engine_version":"62"},"63":{"release_date":"2018-10-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/63","status":"retired","engine":"Gecko","engine_version":"63"},"64":{"release_date":"2018-12-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/64","status":"retired","engine":"Gecko","engine_version":"64"},"65":{"release_date":"2019-01-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/65","status":"retired","engine":"Gecko","engine_version":"65"},"66":{"release_date":"2019-03-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/66","status":"retired","engine":"Gecko","engine_version":"66"},"67":{"release_date":"2019-05-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/67","status":"retired","engine":"Gecko","engine_version":"67"},"68":{"release_date":"2019-07-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/68","status":"retired","engine":"Gecko","engine_version":"68"},"79":{"release_date":"2020-07-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/79","status":"retired","engine":"Gecko","engine_version":"79"},"80":{"release_date":"2020-08-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/80","status":"retired","engine":"Gecko","engine_version":"80"},"81":{"release_date":"2020-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/81","status":"current","engine":"Gecko","engine_version":"81"},"82":{"status":"beta","engine":"Gecko","engine_version":"82"},"83":{"status":"nightly","engine":"Gecko","engine_version":"83"}}},"ie":{"name":"Internet Explorer","releases":{"1":{"release_date":"1995-08-16","status":"retired"},"2":{"release_date":"1995-11-22","status":"retired"},"3":{"release_date":"1996-08-13","status":"retired"},"4":{"release_date":"1997-09-30","status":"retired"},"5":{"release_date":"1999-03-18","status":"retired"},"6":{"release_date":"2001-08-27","status":"retired"},"7":{"release_date":"2006-10-18","status":"retired"},"8":{"release_date":"2009-03-19","status":"retired","engine":"Trident","engine_version":"4.0"},"9":{"release_date":"2011-03-14","status":"retired","engine":"Trident","engine_version":"5.0"},"10":{"release_date":"2012-10-26","status":"retired","engine":"Trident","engine_version":"6.0"},"11":{"release_date":"2013-10-17","status":"current","engine":"Trident","engine_version":"7.0"},"5.5":{"release_date":"2000-07-06","status":"retired"}}},"nodejs":{"name":"Node.js","releases":{"0.1.100":{"release_date":"2010-07-03","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.100/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.1.101":{"release_date":"2010-07-16","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.101/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.1.104":{"release_date":"2010-08-13","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.104/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.9.1":{"release_date":"2012-08-28","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.9.1/ChangeLog","status":"retired","engine":"V8","engine_version":"3.11"},"0.10":{"release_date":"2013-03-11","release_notes":"https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V010.md","status":"retired","engine":"V8","engine_version":"3.14"},"0.12":{"release_date":"2015-02-06","release_notes":"https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V012.md","status":"retired","engine":"V8","engine_version":"3.28"},"4.0.0":{"release_date":"2015-09-08","release_notes":"https://nodejs.org/en/blog/release/v4.0.0/","status":"retired","engine":"V8","engine_version":"4.5"},"5.0.0":{"release_date":"2015-10-29","release_notes":"https://nodejs.org/en/blog/release/v5.0.0/","status":"retired","engine":"V8","engine_version":"4.6"},"6.0.0":{"release_date":"2016-04-26","release_notes":"https://nodejs.org/en/blog/release/v6.0.0/","status":"retired","engine":"V8","engine_version":"5"},"6.5.0":{"release_date":"2016-08-26","release_notes":"https://nodejs.org/en/blog/release/v6.5.0/","status":"retired","engine":"V8","engine_version":"5.1"},"7.0.0":{"release_date":"2016-10-25","release_notes":"https://nodejs.org/en/blog/release/v7.0.0/","status":"retired","engine":"V8","engine_version":"5.4"},"7.5.0":{"release_date":"2017-01-31","release_notes":"https://nodejs.org/en/blog/release/v7.5.0/","status":"retired","engine":"V8","engine_version":"5.4"},"7.6.0":{"release_date":"2017-02-21","release_notes":"https://nodejs.org/en/blog/release/v7.6.0/","status":"retired","engine":"V8","engine_version":"5.5"},"7.7.0":{"release_date":"2017-02-28","release_notes":"https://nodejs.org/en/blog/release/v7.7.0/","status":"retired","engine":"V8","engine_version":"5.5"},"7.10.0":{"release_date":"2017-05-02","release_notes":"https://nodejs.org/en/blog/release/v7.10.0/","status":"retired","engine":"V8","engine_version":"5.5"},"8.0.0":{"release_date":"2017-05-30","release_notes":"https://nodejs.org/en/blog/release/v8.0.0/","status":"retired","engine":"V8","engine_version":"5.8"},"8.3.0":{"release_date":"2017-08-09","release_notes":"https://nodejs.org/en/blog/release/v8.3.0/","status":"retired","engine":"V8","engine_version":"6.0"},"8.5.0":{"release_date":"2017-09-12","release_notes":"https://nodejs.org/en/blog/release/v8.5.0/","status":"retired","engine":"V8","engine_version":"6.0"},"8.7.0":{"release_date":"2017-10-11","release_notes":"https://nodejs.org/en/blog/release/v8.7.0/","status":"retired","engine":"V8","engine_version":"6.1"},"8.10.0":{"release_date":"2018-03-06","release_notes":"https://nodejs.org/en/blog/release/v8.10.0/","status":"retired","engine":"V8","engine_version":"6.2"},"9.3.0":{"release_date":"2017-12-12","release_notes":"https://nodejs.org/en/blog/release/v9.3.0/","status":"retired","engine":"V8","engine_version":"6.2"},"10.0.0":{"release_date":"2018-04-24","release_notes":"https://nodejs.org/en/blog/release/v10.0.0/","status":"retired","engine":"V8","engine_version":"6.6"},"10.4.0":{"release_date":"2018-06-06","release_notes":"https://nodejs.org/en/blog/release/v10.4.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.5.0":{"release_date":"2018-06-20","release_notes":"https://nodejs.org/en/blog/release/v10.5.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.7.0":{"release_date":"2018-07-18","release_notes":"https://nodejs.org/en/blog/release/v10.7.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.9.0":{"release_date":"2018-08-16","release_notes":"https://nodejs.org/en/blog/release/v10.9.0/","status":"esr","engine":"V8","engine_version":"6.8"},"11.0.0":{"release_date":"2018-10-23","release_notes":"https://nodejs.org/en/blog/release/v11.0.0/","status":"retired","engine":"V8","engine_version":"7.0"},"11.7.0":{"release_date":"2019-01-18","release_notes":"https://nodejs.org/en/blog/release/v11.7.0/","status":"retired","engine":"V8","engine_version":"7.0"},"12.0.0":{"release_date":"2019-04-23","release_notes":"https://nodejs.org/en/blog/release/v12.0.0/","status":"retired","engine":"V8","engine_version":"7.4"},"12.5.0":{"release_date":"2019-06-27","release_notes":"https://nodejs.org/en/blog/release/v12.5.0/","status":"retired","engine":"V8","engine_version":"7.5"},"12.9.0":{"release_date":"2019-08-20","release_notes":"https://nodejs.org/en/blog/release/v12.9.0/","status":"retired","engine":"V8","engine_version":"7.6"},"12.11.0":{"release_date":"2019-09-25","release_notes":"https://nodejs.org/en/blog/release/v12.11.0/","status":"esr","engine":"V8","engine_version":"7.7"},"12.17.0":{"release_date":"2020-05-26","release_notes":"https://nodejs.org/en/blog/release/v12.17.0/","status":"esr","engine":"V8","engine_version":"7.8"},"13.0.0":{"release_date":"2019-10-10","release_notes":"https://nodejs.org/en/blog/release/v13.0.0/","status":"retired","engine":"V8","engine_version":"7.8"},"13.2.0":{"release_date":"2019-11-21","release_notes":"https://nodejs.org/en/blog/release/v13.2.0/","status":"current","engine":"V8","engine_version":"7.9"},"14.0.0":{"release_date":"2020-04-21","release_notes":"https://nodejs.org/en/blog/release/v14.0.0/","status":"retired","engine":"V8","engine_version":"8.1"},"14.6.0":{"release_date":"2020-07-21","release_notes":"https://nodejs.org/en/blog/release/v14.6.0/","status":"current","engine":"V8","engine_version":"8.4"}}},"opera":{"name":"Opera","releases":{"2":{"release_date":"1996-07-14","status":"retired"},"3":{"release_date":"1997-12-01","status":"retired"},"4":{"release_date":"2000-06-28","status":"retired"},"5":{"release_date":"2000-12-06","status":"retired"},"6":{"release_date":"2001-12-18","status":"retired"},"7":{"release_date":"2003-01-28","status":"retired","engine":"Presto","engine_version":"1"},"8":{"release_date":"2005-04-19","status":"retired","engine":"Presto","engine_version":"1"},"9":{"release_date":"2006-06-20","status":"retired","engine":"Presto","engine_version":"2"},"10":{"release_date":"2009-09-01","release_notes":"https://dev.opera.com/blog/opera-10-weve-only-just-begun/","status":"retired","engine":"Presto","engine_version":"2.2"},"11":{"release_date":"2010-12-16","release_notes":"https://dev.opera.com/blog/new-html5-features-in-opera-11/","status":"retired","engine":"Presto","engine_version":"2.7"},"12":{"release_date":"2012-06-14","release_notes":"https://dev.opera.com/blog/hello-opera-12/","status":"retired","engine":"Presto","engine_version":"2.10"},"15":{"release_date":"2013-07-02","release_notes":"https://dev.opera.com/blog/introducing-opera-15-for-desktop-and-a-fast-release-cycle/","status":"retired","engine":"Blink","engine_version":"28"},"16":{"release_date":"2013-08-27","release_notes":"https://dev.opera.com/blog/opera-16-released-in-the-wild/","status":"retired","engine":"Blink","engine_version":"29"},"17":{"release_date":"2013-10-08","release_notes":"https://dev.opera.com/blog/opera-desktop-17-released/","status":"retired","engine":"Blink","engine_version":"30"},"18":{"release_date":"2013-11-19","release_notes":"https://dev.opera.com/blog/opera-desktop-18-released/","status":"retired","engine":"Blink","engine_version":"31"},"19":{"release_date":"2014-01-28","release_notes":"https://dev.opera.com/blog/opera-19/","status":"retired","engine":"Blink","engine_version":"32"},"20":{"release_date":"2014-03-04","release_notes":"https://dev.opera.com/blog/opera-20/","status":"retired","engine":"Blink","engine_version":"33"},"21":{"release_date":"2014-05-06","release_notes":"https://dev.opera.com/blog/opera-21/","status":"retired","engine":"Blink","engine_version":"34"},"22":{"release_date":"2014-06-03","release_notes":"https://dev.opera.com/blog/opera-22/","status":"retired","engine":"Blink","engine_version":"35"},"23":{"release_date":"2014-07-22","release_notes":"https://dev.opera.com/blog/opera-23/","status":"retired","engine":"Blink","engine_version":"36"},"24":{"release_date":"2014-09-02","release_notes":"https://dev.opera.com/blog/opera-24/","status":"retired","engine":"Blink","engine_version":"37"},"25":{"release_date":"2014-10-15","release_notes":"https://dev.opera.com/blog/opera-25/","status":"retired","engine":"Blink","engine_version":"38"},"26":{"release_date":"2014-12-03","release_notes":"https://dev.opera.com/blog/opera-26/","status":"retired","engine":"Blink","engine_version":"39"},"27":{"release_date":"2015-01-27","release_notes":"https://dev.opera.com/blog/opera-27/","status":"retired","engine":"Blink","engine_version":"40"},"28":{"release_date":"2015-03-10","release_notes":"https://dev.opera.com/blog/opera-28/","status":"retired","engine":"Blink","engine_version":"41"},"29":{"release_date":"2015-04-28","release_notes":"https://dev.opera.com/blog/opera-29/","status":"retired","engine":"Blink","engine_version":"42"},"30":{"release_date":"2015-06-09","release_notes":"https://dev.opera.com/blog/opera-30/","status":"retired","engine":"Blink","engine_version":"43"},"31":{"release_date":"2015-08-04","release_notes":"https://dev.opera.com/blog/opera-31/","status":"retired","engine":"Blink","engine_version":"44"},"32":{"release_date":"2015-09-15","release_notes":"https://dev.opera.com/blog/opera-32/","status":"retired","engine":"Blink","engine_version":"45"},"33":{"release_date":"2015-10-27","release_notes":"https://dev.opera.com/blog/opera-33/","status":"retired","engine":"Blink","engine_version":"46"},"34":{"release_date":"2015-12-08","release_notes":"https://dev.opera.com/blog/opera-34/","status":"retired","engine":"Blink","engine_version":"47"},"35":{"release_date":"2016-02-02","release_notes":"https://dev.opera.com/blog/opera-35/","status":"retired","engine":"Blink","engine_version":"48"},"36":{"release_date":"2016-03-15","release_notes":"https://dev.opera.com/blog/opera-36/","status":"retired","engine":"Blink","engine_version":"49"},"37":{"release_date":"2016-05-04","release_notes":"https://dev.opera.com/blog/opera-37/","status":"retired","engine":"Blink","engine_version":"50"},"38":{"release_date":"2016-06-08","release_notes":"https://dev.opera.com/blog/opera-38/","status":"retired","engine":"Blink","engine_version":"51"},"39":{"release_date":"2016-08-02","release_notes":"https://dev.opera.com/blog/opera-39/","status":"retired","engine":"Blink","engine_version":"52"},"40":{"release_date":"2016-09-20","release_notes":"https://dev.opera.com/blog/opera-40/","status":"retired","engine":"Blink","engine_version":"53"},"41":{"release_date":"2016-10-25","release_notes":"https://dev.opera.com/blog/opera-41/","status":"retired","engine":"Blink","engine_version":"54"},"42":{"release_date":"2016-12-13","release_notes":"https://dev.opera.com/blog/opera-42/","status":"retired","engine":"Blink","engine_version":"55"},"43":{"release_date":"2017-02-07","release_notes":"https://dev.opera.com/blog/opera-43/","status":"retired","engine":"Blink","engine_version":"56"},"44":{"release_date":"2017-03-21","release_notes":"https://dev.opera.com/blog/opera-44/","status":"retired","engine":"Blink","engine_version":"57"},"45":{"release_date":"2017-05-10","release_notes":"https://dev.opera.com/blog/opera-45/","status":"retired","engine":"Blink","engine_version":"58"},"46":{"release_date":"2017-06-22","release_notes":"https://dev.opera.com/blog/opera-46/","status":"retired","engine":"Blink","engine_version":"59"},"47":{"release_date":"2017-08-09","release_notes":"https://dev.opera.com/blog/opera-47/","status":"retired","engine":"Blink","engine_version":"60"},"48":{"release_date":"2017-09-27","status":"retired","engine":"Blink","engine_version":"61"},"49":{"release_date":"2017-11-08","release_notes":"https://dev.opera.com/blog/opera-49/","status":"retired","engine":"Blink","engine_version":"62"},"50":{"release_date":"2018-01-04","release_notes":"https://dev.opera.com/blog/opera-50/","status":"retired","engine":"Blink","engine_version":"63"},"51":{"release_date":"2018-02-07","release_notes":"https://dev.opera.com/blog/opera-51/","status":"retired","engine":"Blink","engine_version":"64"},"52":{"release_date":"2018-03-22","release_notes":"https://dev.opera.com/blog/opera-52/","status":"retired","engine":"Blink","engine_version":"65"},"53":{"release_date":"2018-05-10","release_notes":"https://dev.opera.com/blog/opera-53/","status":"retired","engine":"Blink","engine_version":"66"},"54":{"release_date":"2018-06-28","release_notes":"https://dev.opera.com/blog/opera-54/","status":"retired","engine":"Blink","engine_version":"67"},"55":{"release_date":"2018-08-16","release_notes":"https://blogs.opera.com/desktop/2018/08/opera-55-offers-better-control-web-pages-accessible-bookmarks/","status":"retired","engine":"Blink","engine_version":"68"},"56":{"release_date":"2018-09-25","release_notes":"https://dev.opera.com/blog/opera-56/","status":"retired","engine":"Blink","engine_version":"69"},"57":{"release_date":"2018-11-28","release_notes":"https://dev.opera.com/blog/opera-57/","status":"retired","engine":"Blink","engine_version":"70"},"58":{"release_date":"2019-01-23","release_notes":"https://dev.opera.com/blog/opera-58/","status":"retired","engine":"Blink","engine_version":"71"},"60":{"release_date":"2019-04-09","release_notes":"https://blogs.opera.com/desktop/2019/04/opera-60-reborn-3-web-3-0-vpn-ad-blocker/","status":"retired","engine":"Blink","engine_version":"73"},"62":{"release_date":"2019-06-27","release_notes":"https://blogs.opera.com/desktop/2019/06/opera-62-comes-with-design-updates-to-reborn-3/","status":"retired","engine":"Blink","engine_version":"75"},"63":{"release_date":"2019-08-20","release_notes":"https://blogs.opera.com/desktop/2019/08/opera-63-initial-release/","status":"retired","engine":"Blink","engine_version":"76"},"64":{"release_date":"2019-10-07","release_notes":"https://blogs.opera.com/desktop/2019/10/opera-64-faster-more-private-more-fun/","status":"retired","engine":"Blink","engine_version":"77"},"65":{"release_date":"2019-11-13","release_notes":"https://blogs.opera.com/desktop/2019/11/opera-65-comes-with-an-improved-tracker-blocker-and-redesigned-address-bar/","status":"retired","engine":"Blink","engine_version":"78"},"66":{"release_date":"2020-01-07","release_notes":"https://blogs.opera.com/desktop/2020/01/opera-66-initial-release-makes-it-easier-to-reopen-closed-tabs-and-to-access-extensions/","status":"retired","engine":"Blink","engine_version":"79"},"67":{"release_date":"2020-03-03","release_notes":"https://blogs.opera.com/desktop/2020/03/opera-67-3575-53-stable-update/","status":"retired","engine":"Blink","engine_version":"80"},"68":{"release_date":"2020-04-22","release_notes":"https://blogs.opera.com/desktop/2020/04/opera-68-is-here-with-built-in-instagram-in-the-sidebar/","status":"retired","engine":"Blink","engine_version":"81"},"69":{"release_date":"2020-06-24","release_notes":"https://blogs.opera.com/desktop/2020/06/opera-69-comes-with-built-in-twitter/","status":"retired","engine":"Blink","engine_version":"83"},"70":{"release_date":"2020-07-27","release_notes":"https://blogs.opera.com/desktop/2020/07/opera-70-comes-with-easier-access-to-closed-tabs-simpler-searches-and-new-workspace-icons/","status":"retired","engine":"Blink","engine_version":"84"},"71":{"release_date":"2020-09-15","release_notes":"https://blogs.opera.com/desktop/2020/09/opera-71-update/","status":"current","engine":"Blink","engine_version":"85"},"72":{"status":"beta","engine":"Blink","engine_version":"86"},"73":{"status":"nightly","engine":"Blink","engine_version":"87"},"3.5":{"release_date":"1998-11-18","status":"retired"},"3.6":{"release_date":"1999-05-06","status":"retired"},"5.1":{"release_date":"2001-04-10","status":"retired"},"7.1":{"release_date":"2003-04-11","status":"retired","engine":"Presto","engine_version":"1"},"7.2":{"release_date":"2003-09-23","status":"retired","engine":"Presto","engine_version":"1"},"7.5":{"release_date":"2004-05-12","status":"retired","engine":"Presto","engine_version":"1"},"8.5":{"release_date":"2005-09-20","status":"retired","engine":"Presto","engine_version":"1"},"9.1":{"release_date":"2006-12-18","status":"retired","engine":"Presto","engine_version":"2"},"9.2":{"release_date":"2007-04-11","status":"retired","engine":"Presto","engine_version":"2"},"9.5":{"release_date":"2008-06-12","status":"retired","engine":"Presto","engine_version":"2.1"},"9.6":{"release_date":"2008-10-08","release_notes":"https://dev.opera.com/blog/a-look-under-the-hood-of-opera-9-6/","status":"retired","engine":"Presto","engine_version":"2.1"},"10.1":{"release_date":"2009-11-23","release_notes":"https://dev.opera.com/blog/opera-10-10-and-10-2-alpha/","status":"retired","engine":"Presto","engine_version":"2.2"},"10.5":{"release_date":"2010-03-02","release_notes":"https://dev.opera.com/blog/opera-10-50-final-for-windows-is-out/","status":"retired","engine":"Presto","engine_version":"2.5"},"10.6":{"release_date":"2010-07-01","release_notes":"https://dev.opera.com/blog/hello-opera-10-60/","status":"retired","engine":"Presto","engine_version":"2.6"},"11.1":{"release_date":"2011-04-12","release_notes":"https://dev.opera.com/blog/unveiling-opera-11-10-final/","status":"retired","engine":"Presto","engine_version":"2.8"},"11.5":{"release_date":"2011-06-28","release_notes":"https://dev.opera.com/blog/opera-11-50-released-speed-dial-extensions-improved-standards-support/","status":"retired","engine":"Presto","engine_version":"2.9"},"11.6":{"release_date":"2011-12-06","release_notes":"https://dev.opera.com/blog/hello-opera-11-60/","status":"retired","engine":"Presto","engine_version":"2.10"},"12.1":{"release_date":"2012-11-20","release_notes":"https://dev.opera.com/blog/opera-12-10-is-out/","status":"retired","engine":"Presto","engine_version":"2.12"}}},"opera_android":{"name":"Opera Android","releases":{"11":{"release_date":"2011-03-22","release_notes":"https://dev.opera.com/blog/opera-mobile-11-for-maemo-meego-windows/","status":"retired","engine":"Presto","engine_version":"2.7"},"12":{"release_date":"2012-02-25","release_notes":"https://dev.opera.com/blog/opera-mobile-12-and-introducing-opera-mini-next/","status":"retired","engine":"Presto","engine_version":"2.10"},"14":{"release_date":"2013-05-21","release_notes":"https://dev.opera.com/blog/opera-14-for-android-is-out/","status":"retired","engine":"Blink","engine_version":"26"},"15":{"release_date":"2013-07-08","release_notes":"https://blogs.opera.com/news/2013/07/opera-15-for-android/","status":"retired","engine":"Blink","engine_version":"28"},"16":{"release_date":"2013-09-18","status":"retired","engine":"Blink","engine_version":"29"},"18":{"release_date":"2013-11-20","release_notes":"https://blogs.opera.com/news/2013/11/opera-18-android-tablet/","status":"retired","engine":"Blink","engine_version":"31"},"19":{"release_date":"2014-01-28","release_notes":"https://dev.opera.com/blog/opera-19/","status":"retired","engine":"Blink","engine_version":"32"},"20":{"release_date":"2014-03-06","release_notes":"https://forums.opera.com/topic/1081/opera-20-final-release","status":"retired","engine":"Blink","engine_version":"33"},"21":{"release_date":"2014-04-22","release_notes":"https://forums.opera.com/topic/2211/opera-21-final-release","status":"retired","engine":"Blink","engine_version":"34"},"22":{"release_date":"2014-06-17","release_notes":"https://forums.opera.com/topic/3446/opera-22","status":"retired","engine":"Blink","engine_version":"35"},"24":{"release_date":"2014-09-10","release_notes":"https://forums.opera.com/topic/5022/opera-24-final-release","status":"retired","engine":"Blink","engine_version":"37"},"25":{"release_date":"2014-10-16","release_notes":"https://forums.opera.com/topic/5715/opera-25-final-release","status":"retired","engine":"Blink","engine_version":"38"},"26":{"release_date":"2014-12-02","release_notes":"https://forums.opera.com/topic/6800/opera-26-final-release","status":"retired","engine":"Blink","engine_version":"39"},"27":{"release_date":"2015-01-29","release_notes":"https://forums.opera.com/topic/7871/opera-27-final-release","status":"retired","engine":"Blink","engine_version":"40"},"28":{"release_date":"2015-03-10","release_notes":"https://forums.opera.com/topic/8556/synced-bookmarks-and-improved-memory-usage-in-opera-28-for-android","status":"retired","engine":"Blink","engine_version":"41"},"29":{"release_date":"2015-04-28","release_notes":"https://dev.opera.com/blog/opera-29/","status":"retired","engine":"Blink","engine_version":"42"},"30":{"release_date":"2015-06-10","release_notes":"https://blogs.opera.com/mobile/2015/06/opera-30-android-sync-speeddials/","status":"retired","engine":"Blink","engine_version":"43"},"32":{"release_date":"2015-09-23","release_notes":"https://blogs.opera.com/mobile/2015/09/opera-32-add-to-home-screen/","status":"retired","engine":"Blink","engine_version":"45"},"33":{"release_date":"2015-11-03","release_notes":"https://forums.opera.com/topic/12480/opera-33-now-featuring-video-optimization-and-brand-new-icons","status":"retired","engine":"Blink","engine_version":"46"},"34":{"release_date":"2015-12-16","release_notes":"https://forums.opera.com/topic/13085/opera-34-for-android-released","status":"retired","engine":"Blink","engine_version":"47"},"35":{"release_date":"2016-02-04","release_notes":"https://blogs.opera.com/mobile/2016/02/save-space-on-your-android-phone-with-web-apps/","status":"retired","engine":"Blink","engine_version":"48"},"36":{"release_date":"2016-03-31","release_notes":"https://forums.opera.com/topic/14514/opera-36-released","status":"retired","engine":"Blink","engine_version":"49"},"37":{"release_date":"2016-06-16","release_notes":"https://forums.opera.com/topic/15753/opera-37-released","status":"retired","engine":"Blink","engine_version":"50"},"41":{"release_date":"2016-10-25","status":"retired","engine":"Blink","engine_version":"54"},"42":{"release_date":"2017-01-21","release_notes":"https://forums.opera.com/topic/18950/opera-for-android-42","status":"retired","engine":"Blink","engine_version":"55"},"43":{"release_date":"2017-09-27","release_notes":"https://forums.opera.com/topic/22708/opera-for-android-43","status":"retired","engine":"Blink","engine_version":"59"},"44":{"release_date":"2017-12-11","release_notes":"https://forums.opera.com/topic/23860/opera-for-android-44","status":"retired","engine":"Blink","engine_version":"60"},"45":{"release_date":"2018-02-15","release_notes":"https://forums.opera.com/topic/25124/opera-for-android-45","status":"retired","engine":"Blink","engine_version":"61"},"46":{"release_date":"2018-05-14","release_notes":"https://forums.opera.com/topic/26662/opera-for-android-46","status":"retired","engine":"Blink","engine_version":"63"},"47":{"release_date":"2018-07-23","release_notes":"https://forums.opera.com/topic/27794/opera-for-android-47","status":"retired","engine":"Blink","engine_version":"66"},"48":{"release_date":"2018-11-08","release_notes":"https://forums.opera.com/topic/29525/opera-for-android-48","status":"retired","engine":"Blink","engine_version":"69"},"49":{"release_date":"2018-12-07","release_notes":"https://forums.opera.com/topic/29983/opera-for-android-49","status":"retired","engine":"Blink","engine_version":"70"},"50":{"release_date":"2019-02-18","release_notes":"https://forums.opera.com/topic/31003/opera-for-android-50","status":"retired","engine":"Blink","engine_version":"71"},"51":{"release_date":"2019-03-21","release_notes":"https://forums.opera.com/topic/31467/opera-for-android-51-built-in-vpn","status":"retired","engine":"Blink","engine_version":"72"},"52":{"release_date":"2019-05-17","release_notes":"https://forums.opera.com/topic/32516/opera-for-android-52","status":"retired","engine":"Blink","engine_version":"73"},"53":{"release_date":"2019-07-11","release_notes":"https://forums.opera.com/topic/33558/opera-for-android-53","status":"retired","engine":"Blink","engine_version":"74"},"54":{"release_date":"2019-10-18","release_notes":"https://forums.opera.com/topic/35853/opera-for-android-54","status":"retired","engine":"Blink","engine_version":"76"},"55":{"release_date":"2019-12-03","release_notes":"https://forums.opera.com/topic/36858/opera-for-android-55","status":"retired","engine":"Blink","engine_version":"77"},"56":{"release_date":"2020-02-06","release_notes":"https://blogs.opera.com/mobile/2020/02/easy-reading-in-opera-for-android/","status":"retired","engine":"Blink","engine_version":"78"},"57":{"release_date":"2020-03-30","release_notes":"https://blogs.opera.com/mobile/2020/03/introducing-new-features-in-opera-for-android-57/","status":"retired","engine":"Blink","engine_version":"80"},"58":{"release_date":"2020-05-13","release_notes":"https://blogs.opera.com/mobile/2020/05/opera-for-android-58-handle-notifications-easily-and-group-speed-dials-for-a-cleaner-appearance/","status":"retired","engine":"Blink","engine_version":"81"},"59":{"release_date":"2020-06-30","release_notes":"https://blogs.opera.com/mobile/2020/06/opera-for-android-59/","status":"retired","engine":"Blink","engine_version":"83"},"60":{"release_date":"2020-09-23","release_notes":"https://blogs.opera.com/mobile/2020/09/keep-in-sync-with-opera-for-android-60/","status":"current","engine":"Blink","engine_version":"85"},"10.1":{"release_date":"2010-11-09","release_notes":"https://dev.opera.com/blog/opera-mobile-10-1-beta-for-android-is-here/","status":"retired","engine":"Presto","engine_version":"2.5"},"11.1":{"release_date":"2011-06-30","release_notes":"https://dev.opera.com/blog/opera-mobile-11-1-new-features-and-additions/","status":"retired","engine":"Presto","engine_version":"2.8"},"11.5":{"release_date":"2011-10-12","status":"retired","engine":"Presto","engine_version":"2.9"},"12.1":{"release_date":"2012-10-09","release_notes":"https://dev.opera.com/blog/opera-mobile-12-1-with-spdy-web-sockets-flexbox-and-more/","status":"retired","engine":"Presto","engine_version":"2.11"}}},"qq_android":{"name":"QQ Browser","releases":{"8":{"release_date":"2017-11-22","status":"retired"},"7.2.1":{"release_date":"2017-01-18","status":"retired"},"7.3.1":{"release_date":"2017-03-08","status":"retired"},"7.5":{"release_date":"2017-05-08","status":"retired"},"7.5.1":{"release_date":"2017-05-18","status":"retired"},"7.6.1":{"release_date":"2017-06-16","status":"retired"},"7.8":{"release_date":"2017-08-21","status":"retired"},"8.1.3":{"release_date":"2018-01-11","status":"retired"},"8.2":{"release_date":"2018-02-01","status":"current"}}},"safari":{"name":"Safari","releases":{"1":{"release_date":"2003-06-23","status":"retired","engine":"WebKit","engine_version":"85"},"2":{"release_date":"2005-04-29","status":"retired","engine":"WebKit","engine_version":"412"},"3":{"release_date":"2007-11-14","status":"retired","engine":"WebKit","engine_version":"522.11"},"4":{"release_date":"2009-06-08","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_4_0.html","status":"retired","engine":"WebKit","engine_version":"530.17"},"5":{"release_date":"2010-06-07","status":"retired","engine":"WebKit","engine_version":"533.16"},"6":{"release_date":"2012-07-25","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_6_0.html","status":"retired","engine":"WebKit","engine_version":"536.25"},"7":{"release_date":"2013-10-22","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_7_0.html","status":"retired","engine":"WebKit","engine_version":"537.71"},"8":{"release_date":"2014-10-16","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_8_0.html","status":"retired","engine":"WebKit","engine_version":"538.35"},"9":{"release_date":"2015-09-30","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_9_0.html","status":"retired","engine":"WebKit","engine_version":"601.1.56"},"10":{"release_date":"2016-09-20","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_10_0.html","status":"retired","engine":"WebKit","engine_version":"602.1.50"},"11":{"release_date":"2017-09-19","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Safari_11_0/Safari_11_0.html","status":"retired","engine":"WebKit","engine_version":"604.2.4"},"12":{"release_date":"2018-09-24","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_release_notes","status":"retired","engine":"WebKit","engine_version":"606.1.36"},"13":{"release_date":"2019-09-19","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_13_release_notes","status":"retired","engine":"WebKit","engine_version":"608.2.11"},"14":{"release_date":"2020-09-16","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-14-beta-release-notes","status":"current","engine":"WebKit","engine_version":"610.1.28"},"1.1":{"release_date":"2003-10-24","status":"retired","engine":"WebKit","engine_version":"100"},"1.2":{"release_date":"2004-02-02","status":"retired","engine":"WebKit","engine_version":"125"},"1.3":{"release_date":"2005-04-15","status":"retired","engine":"WebKit","engine_version":"312"},"3.1":{"release_date":"2008-03-18","status":"retired","engine":"WebKit","engine_version":"525.13"},"3.2":{"release_date":"2008-11-13","status":"retired","engine":"WebKit","engine_version":"525.26"},"5.1":{"release_date":"2011-07-20","status":"retired","engine":"WebKit","engine_version":"534.48"},"6.1":{"release_date":"2013-06-11","status":"retired","engine":"WebKit","engine_version":"537.43"},"9.1":{"release_date":"2016-03-21","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_9_1.html","status":"retired","engine":"WebKit","engine_version":"601.5.17"},"10.1":{"release_date":"2017-03-27","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_10_1.html","status":"retired","engine":"WebKit","engine_version":"603.2.1"},"11.1":{"release_date":"2018-04-12","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_11_1.html","status":"retired","engine":"WebKit","engine_version":"605.1.33"},"12.1":{"release_date":"2019-03-25","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_1_release_notes","status":"retired","engine":"WebKit","engine_version":"607.1.40"},"13.1":{"release_date":"2020-03-24","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-13_1-release_notes","status":"current","engine":"WebKit","engine_version":"609.1.20"}}},"safari_ios":{"name":"iOS Safari","releases":{"1":{"status":"retired","engine":"WebKit","engine_version":"522.11","release_date":"2007-06-29"},"2":{"status":"retired","engine":"WebKit","engine_version":"525.18","release_date":"2008-07-11"},"3":{"status":"retired","engine":"WebKit","engine_version":"528.18","release_date":"2009-06-17"},"4":{"status":"retired","engine":"WebKit","engine_version":"532.9","release_date":"2010-06-21"},"5":{"status":"retired","engine":"WebKit","engine_version":"534.46","release_date":"2011-10-12"},"6":{"status":"retired","engine":"WebKit","engine_version":"536.26","release_date":"2012-09-10"},"7":{"status":"retired","engine":"WebKit","engine_version":"537.51","release_date":"2013-09-18"},"8":{"status":"retired","engine":"WebKit","engine_version":"600.1.4","release_date":"2014-09-17"},"9":{"status":"retired","engine":"WebKit","engine_version":"601.1.56","release_date":"2015-09-16"},"10":{"status":"retired","engine":"WebKit","engine_version":"602.1.50","release_date":"2016-09-13"},"11":{"status":"retired","engine":"WebKit","engine_version":"604.2.4","release_date":"2017-09-19"},"12":{"release_date":"2018-09-17","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_release_notes","status":"retired","engine":"WebKit","engine_version":"606.1.36"},"13":{"release_date":"2019-09-19","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_13_release_notes","status":"retired","engine":"WebKit","engine_version":"608.2.11"},"14":{"release_date":"2020-09-16","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-14-beta-release-notes","status":"current","engine":"WebKit","engine_version":"610.1.28"},"3.1":{"status":"retired","engine":"WebKit","engine_version":"528.18","release_date":"2009-09-09"},"3.2":{"status":"retired","engine":"WebKit","engine_version":"531.21","release_date":"2010-04-03"},"4.2":{"status":"retired","engine":"WebKit","engine_version":"533.17","release_date":"2010-11-22"},"4.3":{"status":"retired","engine":"WebKit","engine_version":"533.17","release_date":"2011-03-09"},"5.1":{"status":"retired","engine":"WebKit","engine_version":"534.46","release_date":"2012-03-07"},"6.1":{"status":"retired","engine":"WebKit","engine_version":"536.26","release_date":"2013-01-28"},"9.3":{"status":"retired","engine":"WebKit","engine_version":"601.5.17","release_date":"2016-03-21"},"10.3":{"status":"retired","engine":"WebKit","engine_version":"603.2.1","release_date":"2017-03-27"},"11.3":{"status":"retired","engine":"WebKit","engine_version":"605.1.33","release_date":"2018-03-29"},"12.2":{"release_date":"2019-03-25","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_1_release_notes","status":"retired","engine":"WebKit","engine_version":"607.1.40"},"13.3":{"release_date":"2019-12-10","release_notes":"https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-13_3-release-notes","status":"retired","engine":"WebKit","engine_version":"608.4.9"},"13.4":{"release_date":"2020-03-24","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-13_1-release_notes","status":"current","engine":"WebKit","engine_version":"609.1.20"}}},"samsunginternet_android":{"name":"Samsung Internet","releases":{"1.0":{"release_date":"2013-04-27","status":"retired","engine":"WebKit","engine_version":"535.19"},"1.5":{"release_date":"2013-09-25","status":"retired","engine":"Blink","engine_version":"28"},"1.6":{"release_date":"2014-04-11","status":"retired","engine":"Blink","engine_version":"28"},"2.0":{"release_date":"2014-10-17","status":"retired","engine":"Blink","engine_version":"34"},"2.1":{"release_date":"2015-01-07","status":"retired","engine":"Blink","engine_version":"34"},"3.0":{"release_date":"2015-04-10","status":"retired","engine":"Blink","engine_version":"38"},"3.2":{"release_date":"2015-08-24","status":"retired","engine":"Blink","engine_version":"38"},"4.0":{"release_date":"2016-03-11","status":"retired","engine":"Blink","engine_version":"44"},"4.2":{"release_date":"2016-08-02","status":"retired","engine":"Blink","engine_version":"44"},"5.0":{"release_date":"2016-12-15","status":"retired","engine":"Blink","engine_version":"51"},"5.2":{"release_date":"2017-04-21","status":"retired","engine":"Blink","engine_version":"51"},"5.4":{"release_date":"2017-05-17","status":"retired","engine":"Blink","engine_version":"51"},"6.0":{"release_date":"2017-08-23","status":"retired","engine":"Blink","engine_version":"56"},"6.2":{"release_date":"2017-10-26","status":"retired","engine":"Blink","engine_version":"56"},"6.4":{"release_date":"2018-02-19","status":"retired","engine":"Blink","engine_version":"56"},"7.0":{"release_date":"2018-03-16","status":"retired","engine":"Blink","engine_version":"59"},"7.2":{"release_date":"2018-06-20","status":"retired","engine":"Blink","engine_version":"59"},"7.4":{"release_date":"2018-09-12","status":"retired","engine":"Blink","engine_version":"59"},"8.0":{"release_date":"2018-07-18","status":"retired","engine":"Blink","engine_version":"63"},"8.2":{"release_date":"2018-12-21","status":"retired","engine":"Blink","engine_version":"63"},"9.0":{"release_date":"2018-09-15","status":"retired","engine":"Blink","engine_version":"67"},"9.2":{"release_date":"2019-04-02","status":"retired","engine":"Blink","engine_version":"67"},"9.4":{"release_date":"2019-07-25","status":"retired","engine":"Blink","engine_version":"67"},"10.0":{"release_date":"2019-08-22","status":"retired","engine":"Blink","engine_version":"71"},"10.2":{"release_date":"2019-10-09","status":"retired","engine":"Blink","engine_version":"71"},"11.0":{"release_date":"2019-12-05","status":"retired","engine":"Blink","engine_version":"75"},"11.2":{"release_date":"2020-03-22","status":"retired","engine":"Blink","engine_version":"75"},"12.0":{"release_date":"2020-06-19","status":"retired","engine":"Blink","engine_version":"79"},"12.1":{"release_date":"2020-07-07","status":"current","engine":"Blink","engine_version":"79"},"13.0":{"status":"beta","engine":"Blink","engine_version":"83"}}},"uc_android":{"name":"UC Browser","releases":{"8.6.1.262":{"release_date":"2013-01-31","status":"retired"},"9.0.1.275":{"release_date":"2013-04-24","status":"retired"},"9.0.2.299":{"release_date":"2013-05-29","status":"retired"},"9.1.0.297":{"release_date":"2013-06-26","status":"retired"},"9.2.0.308":{"release_date":"2013-07-25","status":"retired"},"9.2.2.323":{"release_date":"2013-08-07","status":"retired"},"9.2.3.324":{"release_date":"2013-08-27","status":"retired"},"9.3.0.321":{"release_date":"2013-09-18","status":"retired"},"9.3.1.344":{"release_date":"2013-09-30","status":"retired"},"9.3.2.349":{"release_date":"2013-10-14","status":"retired"},"9.4.0.347":{"release_date":"2013-11-15","status":"retired"},"9.5.0.360":{"release_date":"2014-01-06","status":"retired"},"9.6.0.378":{"release_date":"2014-02-26","status":"retired"},"9.7.0.398":{"release_date":"2014-04-02","status":"retired"},"9.7.5.418":{"release_date":"2014-04-23","status":"retired"},"9.7.8.425":{"release_date":"2014-05-22","status":"retired"},"9.8.0.435":{"release_date":"2014-06-10","status":"retired"},"9.8.5.442":{"release_date":"2014-06-20","status":"retired"},"9.8.9.457":{"release_date":"2014-07-09","status":"retired"},"9.9.0.459":{"release_date":"2014-07-18","status":"retired"},"9.9.2.467":{"release_date":"2014-08-11","status":"retired"},"9.9.3.478":{"release_date":"2014-08-22","status":"retired"},"9.9.4.484":{"release_date":"2014-09-26","status":"retired"},"9.9.6.495":{"release_date":"2014-10-17","status":"retired"},"10.0.0.488":{"release_date":"2014-11-04","status":"retired"},"10.0.1.512":{"release_date":"2014-11-18","status":"retired"},"10.0.2.523":{"release_date":"2014-12-31","status":"retired"},"10.1.0.527":{"release_date":"2015-01-27","status":"retired"},"10.2.0.535":{"release_date":"2015-03-03","status":"retired"},"10.3.0.552":{"release_date":"2015-03-16","status":"retired"},"10.4.1.565":{"release_date":"2015-05-13","status":"retired"},"10.5.0.575":{"release_date":"2015-05-30","status":"retired"},"10.5.1.581":{"release_date":"2015-05-18","status":"retired"},"10.5.2.582":{"release_date":"2015-06-26","status":"retired"},"10.6.0.586":{"release_date":"2015-07-14","status":"retired"},"10.6.2.599":{"release_date":"2015-08-06","status":"retired"},"10.6.5.623":{"release_date":"2015-08-20","status":"retired"},"10.7.0.636":{"release_date":"2015-09-06","status":"retired"},"10.7.2.645":{"release_date":"2015-09-29","status":"retired"},"10.7.5.658":{"release_date":"2015-11-03","status":"retired"},"10.7.8.675":{"release_date":"2015-12-01","status":"retired"},"10.8.0.718":{"release_date":"2016-01-09","status":"retired"},"10.8.5.725":{"release_date":"2016-01-26","status":"retired"},"10.8.8.730":{"release_date":"2016-02-23","status":"retired"},"10.9.0.731":{"release_date":"2016-03-16","status":"retired"},"10.9.5.735":{"release_date":"2016-04-08","status":"retired"},"10.9.8.770":{"release_date":"2016-05-05","status":"retired"},"10.10.0.796":{"release_date":"2016-06-03","status":"retired"},"10.10.5.809":{"release_date":"2016-06-30","status":"retired"},"10.10.9.821":{"release_date":"2016-07-20","status":"retired"},"10.10.8.820":{"release_date":"2016-08-04","status":"retired"},"11.0.0.828":{"release_date":"2016-09-01","status":"retired"},"11.0.5.850":{"release_date":"2016-09-22","status":"retired"},"11.0.8.855":{"release_date":"2016-11-10","status":"retired"},"11.1.0.882":{"release_date":"2016-11-29","status":"retired"},"11.1.5.890":{"release_date":"2016-12-30","status":"retired"},"11.2.0.915":{"release_date":"2017-01-18","status":"retired"},"11.2.8.945":{"release_date":"2017-03-23","status":"retired"},"11.3.0.950":{"release_date":"2017-04-27","status":"retired"},"11.3.2.960":{"release_date":"2017-05-22","status":"retired"},"11.3.5.972":{"release_date":"2017-06-12","status":"retired"},"11.4.2.995":{"release_date":"2017-08-14","status":"retired"},"11.4.5.1005":{"release_date":"2017-09-11","status":"retired"},"11.4.8.1012":{"release_date":"2017-11-07","status":"retired"},"11.5.0.1015":{"release_date":"2017-12-13","status":"retired"},"12.0.0.1088":{"release_date":"2018-01-30","status":"retired"},"12.2.0.1089":{"release_date":"2018-03-09","status":"retired"},"12.2.1.1108":{"release_date":"2018-03-28","status":"retired"},"12.2.5.1102":{"release_date":"2018-04-03","status":"retired"},"12.5.0.1109":{"release_date":"2018-05-04","status":"current"}}},"uc_chinese_android":{"name":"Chinese UC Browser","releases":{"10.10.0.800":{"release_date":"2016-05-26","status":"retired"},"10.10.1.812":{"release_date":"2016-06-03","status":"retired"},"10.10.3.810":{"release_date":"2016-06-15","status":"retired"},"10.10.5.811":{"release_date":"2016-07-12","status":"retired"},"10.10.8.822":{"release_date":"2016-07-26","status":"retired"},"11.0.0.818":{"release_date":"2016-08-03","status":"retired"},"11.0.2.840":{"release_date":"2016-08-22","status":"retired"},"11.0.3.845":{"release_date":"2016-08-23","status":"retired"},"11.0.4.846":{"release_date":"2016-08-24","status":"retired"},"11.0.5.841":{"release_date":"2016-09-06","status":"retired"},"11.0.8.858":{"release_date":"2016-09-21","status":"retired"},"11.1.0.870":{"release_date":"2016-10-14","status":"retired"},"11.1.5.871":{"release_date":"2016-11-02","status":"retired"},"11.2.0.880":{"release_date":"2016-11-18","status":"retired"},"11.2.1.888":{"release_date":"2016-11-23","status":"retired"},"11.2.5.884":{"release_date":"2016-11-30","status":"retired"},"11.2.8.885":{"release_date":"2016-12-22","status":"retired"},"11.3.0.907":{"release_date":"2017-01-03","status":"retired"},"11.3.5.908":{"release_date":"2017-01-20","status":"retired"},"11.3.8.909":{"release_date":"2017-02-08","status":"retired"},"11.4.0.921":{"release_date":"2017-02-20","status":"retired"},"11.4.1.939":{"release_date":"2017-02-23","status":"retired"},"11.4.2.936":{"release_date":"2017-03-08","status":"retired"},"11.4.5.937":{"release_date":"2017-03-30","status":"retired"},"11.4.8.938":{"release_date":"2017-04-08","status":"retired"},"11.4.9.941":{"release_date":"2017-04-10","status":"retired"},"11.5.0.939":{"release_date":"2017-04-25","status":"retired"},"11.5.1.944":{"release_date":"2017-05-05","status":"retired"},"11.5.2.942":{"release_date":"2017-05-30","status":"retired"},"11.5.5.943":{"release_date":"2017-06-09","status":"retired"},"11.5.6.946":{"release_date":"2017-06-14","status":"retired"},"11.5.8.945":{"release_date":"2017-06-27","status":"retired"},"11.6.0.947":{"release_date":"2017-07-11","status":"retired"},"11.6.1.949":{"release_date":"2017-07-13","status":"retired"},"11.6.2.948":{"release_date":"2017-07-25","status":"retired"},"11.6.4.950":{"release_date":"2017-08-07","status":"retired"},"11.6.6.951":{"release_date":"2017-08-21","status":"retired"},"11.6.8.952":{"release_date":"2017-09-05","status":"retired"},"11.7.0.953":{"release_date":"2017-09-30","status":"retired"},"11.7.2.954":{"release_date":"2017-10-10","status":"retired"},"11.7.5.955":{"release_date":"2017-10-30","status":"retired"},"11.7.8.958":{"release_date":"2017-11-18","status":"retired"},"11.8.0.960":{"release_date":"2017-12-07","status":"retired"},"11.8.2.962":{"release_date":"2017-12-25","status":"retired"},"11.8.3.963":{"release_date":"2018-01-17","status":"retired"},"11.8.4.964":{"release_date":"2018-01-23","status":"retired"},"11.8.6.966":{"release_date":"2018-01-31","status":"retired"},"11.8.8.968":{"release_date":"2018-02-06","status":"retired"},"11.9.0.970":{"release_date":"2018-03-13","status":"retired"},"11.9.2.972":{"release_date":"2018-03-21","status":"retired"},"11.9.3.973":{"release_date":"2018-03-28","status":"retired"},"11.9.4.974":{"release_date":"2018-04-11","status":"retired"},"11.9.6.976":{"release_date":"2018-05-04","status":"current"}}},"webview_android":{"name":"WebView Android","releases":{"1":{"release_date":"2008-09-23","release_notes":"https://en.wikipedia.org/wiki/Android_version_history#Android_1.0_(API_1)","status":"retired"},"2":{"release_date":"2009-10-26","release_notes":"https://en.wikipedia.org/wiki/Android_Eclair","status":"retired","engine":"WebKit","engine_version":"530.17"},"3":{"release_date":"2011-02-22","release_notes":"https://en.wikipedia.org/wiki/Android_Honeycomb","status":"retired","engine":"WebKit","engine_version":"534.13"},"4":{"release_date":"2011-10-18","release_notes":"https://en.wikipedia.org/wiki/Android_Ice_Cream_Sandwich","status":"retired","engine":"WebKit","engine_version":"534.30"},"37":{"release_date":"2014-09-03","release_notes":"https://chromereleases.googleblog.com/2014/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-08","release_notes":"https://chromereleases.googleblog.com/2014/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-12","release_notes":"https://chromereleases.googleblog.com/2014/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-11","release_notes":"https://chromereleases.googleblog.com/2015/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-15","release_notes":"https://chromereleases.googleblog.com/2015/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-27","release_notes":"https://chromereleases.googleblog.com/2015/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-29","release_notes":"https://chromereleases.googleblog.com/2015/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-14","release_notes":"https://chromereleases.googleblog.com/2015/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-02","release_notes":"https://chromereleases.googleblog.com/2015/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-26","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-09","release_notes":"https://chromereleases.googleblog.com/2016/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-06-08","release_notes":"https://chromereleases.googleblog.com/2016/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-27","release_notes":"https://chromereleases.googleblog.com/2016/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-09-07","release_notes":"https://chromereleases.googleblog.com/2016/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-19","release_notes":"https://chromereleases.googleblog.com/2016/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-06","release_notes":"https://chromereleases.googleblog.com/2016/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-02-01","release_notes":"https://chromereleases.googleblog.com/2017/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-16","release_notes":"https://chromereleases.googleblog.com/2017/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-25","release_notes":"https://chromereleases.googleblog.com/2017/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-06","release_notes":"https://chromereleases.googleblog.com/2017/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-08-01","release_notes":"https://chromereleases.googleblog.com/2017/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-24","release_notes":"https://chromereleases.googleblog.com/2017/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-05","release_notes":"https://chromereleases.googleblog.com/2017/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2017-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2017-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-31","release_notes":"https://chromereleases.googleblog.com/2018/05/chrome-for-android-update_31.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-17","release_notes":"https://chromereleases.googleblog.com/2018/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/chrome-for-android-update_29.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/chrome-for-android-update_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-24","release_notes":"https://chromereleases.googleblog.com/2019/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/chrome-for-android-update_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/chrome-for-android-update_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-17","release_notes":"https://chromereleases.googleblog.com/2019/12/chrome-for-android-update_17.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/chrome-for-android-update_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/chrome-for-android-update_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/chrome-for-android-update.html","status":"current","engine":"Blink","engine_version":"85"},"86":{"status":"beta","engine":"Blink","engine_version":"86"},"87":{"status":"nightly","engine":"Blink","engine_version":"87"},"1.1":{"release_date":"2009-02-09","release_notes":"https://en.wikipedia.org/wiki/Android_version_history#Android_1.1_(API_2)","status":"retired"},"1.5":{"release_date":"2009-04-27","release_notes":"https://en.wikipedia.org/wiki/Android_Cupcake","status":"retired"},"1.6":{"release_date":"2009-09-15","release_notes":"https://en.wikipedia.org/wiki/Android_Donut","status":"retired"},"2.2":{"release_date":"2010-05-20","release_notes":"https://en.wikipedia.org/wiki/Android_Froyo","status":"retired","engine":"WebKit","engine_version":"533.1"},"2.3":{"release_date":"2010-12-06","release_notes":"https://en.wikipedia.org/wiki/Android_Gingerbread","status":"retired","engine":"WebKit","engine_version":"533.1"},"4.1":{"release_date":"2012-07-09","release_notes":"https://en.wikipedia.org/wiki/Android_Jelly_Bean","status":"retired","engine":"WebKit","engine_version":"534.30"},"4.2":{"release_date":"2013-07-24","release_notes":"https://en.wikipedia.org/wiki/Android_Jelly_Bean","status":"retired","engine":"WebKit","engine_version":"534.30"},"4.4":{"release_date":"2013-12-09","release_notes":"https://chromereleases.googleblog.com/2013/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"30"},"4.4.3":{"release_date":"2014-06-02","release_notes":"https://chromereleases.googleblog.com/2014/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"33"}}}}
\ No newline at end of file
+{"chrome":{"name":"Chrome","pref_url":"chrome://flags","releases":{"1":{"release_date":"2008-12-11","release_notes":"https://chromereleases.googleblog.com/2008/12/stable-release-google-chrome-is-out-of.html","status":"retired","engine":"WebKit","engine_version":"528"},"2":{"release_date":"2009-05-21","release_notes":"https://chromereleases.googleblog.com/2009/05/stable-update-google-chrome-2017228.html","status":"retired","engine":"WebKit","engine_version":"530"},"3":{"release_date":"2009-09-15","release_notes":"https://chromereleases.googleblog.com/2009/09/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"532"},"4":{"release_date":"2010-01-25","release_notes":"https://chromereleases.googleblog.com/2010/01/stable-channel-update_25.html","status":"retired","engine":"WebKit","engine_version":"532.5"},"5":{"release_date":"2010-05-25","release_notes":"https://chromereleases.googleblog.com/2010/05/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"533"},"6":{"release_date":"2010-09-02","release_notes":"https://chromereleases.googleblog.com/2010/09/stable-and-beta-channel-updates.html","status":"retired","engine":"WebKit","engine_version":"534.3"},"7":{"release_date":"2010-10-19","release_notes":"https://chromereleases.googleblog.com/2010/10/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"534.7"},"8":{"release_date":"2010-12-02","release_notes":"https://chromereleases.googleblog.com/2010/12/stable-beta-channel-updates.html","status":"retired","engine":"WebKit","engine_version":"534.10"},"9":{"release_date":"2011-02-03","release_notes":"https://chromereleases.googleblog.com/2011/02/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"534.13"},"10":{"release_date":"2011-03-08","release_notes":"https://chromereleases.googleblog.com/2011/03/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"534.16"},"11":{"release_date":"2011-04-27","release_notes":"https://chromereleases.googleblog.com/2011/04/chrome-stable-update.html","status":"retired","engine":"WebKit","engine_version":"534.24"},"12":{"release_date":"2011-06-07","release_notes":"https://chromereleases.googleblog.com/2011/06/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"534.30"},"13":{"release_date":"2011-08-02","release_notes":"https://chromereleases.googleblog.com/2011/08/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.1"},"14":{"release_date":"2011-09-16","release_notes":"https://chromereleases.googleblog.com/2011/09/stable-channel-update_16.html","status":"retired","engine":"WebKit","engine_version":"535.1"},"15":{"release_date":"2011-10-25","release_notes":"https://chromereleases.googleblog.com/2011/10/chrome-stable-release.html","status":"retired","engine":"WebKit","engine_version":"535.2"},"16":{"release_date":"2011-12-13","release_notes":"https://chromereleases.googleblog.com/2011/12/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.7"},"17":{"release_date":"2012-02-08","release_notes":"https://chromereleases.googleblog.com/2012/02/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"535.11"},"18":{"release_date":"2012-03-28","release_notes":"https://chromereleases.googleblog.com/2012/03/stable-channel-release-and-beta-channel.html","status":"retired","engine":"WebKit","engine_version":"535.19"},"19":{"release_date":"2012-05-15","release_notes":"https://chromereleases.googleblog.com/2012/05/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"536.5"},"20":{"release_date":"2012-06-26","release_notes":"https://chromereleases.googleblog.com/2012/06/stable-channel-update_26.html","status":"retired","engine":"WebKit","engine_version":"536.10"},"21":{"release_date":"2012-07-31","release_notes":"https://chromereleases.googleblog.com/2012/07/stable-channel-release.html","status":"retired","engine":"WebKit","engine_version":"537.1"},"22":{"release_date":"2012-09-25","release_notes":"https://chromereleases.googleblog.com/2012/09/stable-channel-update_25.html","status":"retired","engine":"WebKit","engine_version":"537.4"},"23":{"release_date":"2012-11-06","release_notes":"https://chromereleases.googleblog.com/2012/11/stable-channel-release-and-beta-channel.html","status":"retired","engine":"WebKit","engine_version":"537.11"},"24":{"release_date":"2013-01-10","release_notes":"https://chromereleases.googleblog.com/2013/01/stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"537.17"},"25":{"release_date":"2013-02-21","release_notes":"https://chromereleases.googleblog.com/2013/02/stable-channel-update_21.html","status":"retired","engine":"WebKit","engine_version":"537.22"},"26":{"release_date":"2013-03-26","release_notes":"https://chromereleases.googleblog.com/2013/03/stable-channel-update_26.html","status":"retired","engine":"WebKit","engine_version":"537.31"},"27":{"release_date":"2013-05-21","release_notes":"https://chromereleases.googleblog.com/2013/05/stable-channel-release.html","status":"retired","engine":"WebKit","engine_version":"537.36"},"28":{"release_date":"2013-07-09","release_notes":"https://chromereleases.googleblog.com/2013/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"28"},"29":{"release_date":"2013-08-20","release_notes":"https://chromereleases.googleblog.com/2013/08/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"29"},"30":{"release_date":"2013-10-01","release_notes":"https://chromereleases.googleblog.com/2013/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"30"},"31":{"release_date":"2013-11-12","release_notes":"https://chromereleases.googleblog.com/2013/11/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"31"},"32":{"release_date":"2014-01-14","release_notes":"https://chromereleases.googleblog.com/2014/01/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"32"},"33":{"release_date":"2014-02-20","release_notes":"https://chromereleases.googleblog.com/2014/02/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"33"},"34":{"release_date":"2014-04-08","release_notes":"https://chromereleases.googleblog.com/2014/04/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"34"},"35":{"release_date":"2014-05-20","release_notes":"https://chromereleases.googleblog.com/2014/05/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"35"},"36":{"release_date":"2014-07-16","release_notes":"https://chromereleases.googleblog.com/2014/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"36"},"37":{"release_date":"2014-08-26","release_notes":"https://chromereleases.googleblog.com/2014/08/stable-channel-update_26.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-07","release_notes":"https://chromereleases.googleblog.com/2014/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-18","release_notes":"https://chromereleases.googleblog.com/2014/11/stable-channel-update_18.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/stable-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-03","release_notes":"https://chromereleases.googleblog.com/2015/03/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-14","release_notes":"https://chromereleases.googleblog.com/2015/04/stable-channel-update_14.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-19","release_notes":"https://chromereleases.googleblog.com/2015/05/stable-channel-update_19.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-21","release_notes":"https://chromereleases.googleblog.com/2015/07/stable-channel-update_21.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-13","release_notes":"https://chromereleases.googleblog.com/2015/10/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-01","release_notes":"https://chromereleases.googleblog.com/2015/12/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-20","release_notes":"https://chromereleases.googleblog.com/2016/01/stable-channel-update_20.html","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-02","release_notes":"https://chromereleases.googleblog.com/2016/03/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","release_notes":"https://chromereleases.googleblog.com/2016/04/stable-channel-update_13.html","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-05-25","release_notes":"https://chromereleases.googleblog.com/2016/05/stable-channel-update_25.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-20","release_notes":"https://chromereleases.googleblog.com/2016/07/stable-channel-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-08-31","release_notes":"https://chromereleases.googleblog.com/2016/08/stable-channel-update-for-desktop_31.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-12","release_notes":"https://chromereleases.googleblog.com/2016/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-01","release_notes":"https://chromereleases.googleblog.com/2016/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-01-25","release_notes":"https://chromereleases.googleblog.com/2017/01/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-09","release_notes":"https://chromereleases.googleblog.com/2017/03/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-19","release_notes":"https://chromereleases.googleblog.com/2017/04/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-05","release_notes":"https://chromereleases.googleblog.com/2017/06/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-07-25","release_notes":"https://chromereleases.googleblog.com/2017/07/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-17","release_notes":"https://chromereleases.googleblog.com/2017/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-06","release_notes":"https://chromereleases.googleblog.com/2017/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/stable-channel-update-for-desktop_24.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2018-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2018-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-29","release_notes":"https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop_58.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-16","release_notes":"https://chromereleases.googleblog.com/2018/10/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/stable-channel-update-for-desktop_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-23","release_notes":"https://chromereleases.googleblog.com/2019/04/stable-channel-update-for-desktop_23.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/stable-channel-update-for-desktop_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/stable-channel-update-for-desktop_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-10","release_notes":"https://chromereleases.googleblog.com/2019/12/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_7.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/stable-channel-update-for-desktop_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/stable-channel-update-for-desktop_25.html","status":"retired","engine":"Blink","engine_version":"85"},"86":{"release_date":"2020-10-20","release_notes":"https://chromereleases.googleblog.com/2020/10/stable-channel-update-for-desktop_20.html","status":"current","engine":"Blink","engine_version":"86"},"87":{"status":"beta","engine":"Blink","engine_version":"87"},"88":{"status":"nightly","engine":"Blink","engine_version":"88"}}},"chrome_android":{"name":"Chrome Android","pref_url":"chrome://flags","releases":{"18":{"release_date":"2012-06-27","release_notes":"https://chromereleases.googleblog.com/2012/06/chrome-for-android-out-of-beta.html","status":"retired","engine":"WebKit","engine_version":"535.19"},"25":{"release_date":"2013-02-27","release_notes":"https://chromereleases.googleblog.com/2013/02/chrome-for-android-update.html","status":"retired","engine":"WebKit","engine_version":"537.22"},"26":{"release_date":"2013-04-03","release_notes":"https://chromereleases.googleblog.com/2013/04/chrome-for-android-stable-channel-update.html","status":"retired","engine":"WebKit","engine_version":"537.31"},"27":{"release_date":"2013-05-22","release_notes":"https://chromereleases.googleblog.com/2013/05/chrome-for-android-update.html","status":"retired","engine":"WebKit","engine_version":"537.36"},"28":{"release_date":"2013-07-10","release_notes":"https://chromereleases.googleblog.com/2013/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"28"},"29":{"release_date":"2013-08-21","release_notes":"https://chromereleases.googleblog.com/2013/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"29"},"30":{"release_date":"2013-10-02","release_notes":"https://chromereleases.googleblog.com/2013/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"30"},"31":{"release_date":"2013-11-14","release_notes":"https://chromereleases.googleblog.com/2013/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"31"},"32":{"release_date":"2014-01-15","release_notes":"https://chromereleases.googleblog.com/2014/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"32"},"33":{"release_date":"2014-02-26","release_notes":"https://chromereleases.googleblog.com/2014/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"33"},"34":{"release_date":"2014-04-02","release_notes":"https://chromereleases.googleblog.com/2014/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"34"},"35":{"release_date":"2014-05-20","release_notes":"https://chromereleases.googleblog.com/2014/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"35"},"36":{"release_date":"2014-07-16","release_notes":"https://chromereleases.googleblog.com/2014/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"36"},"37":{"release_date":"2014-09-03","release_notes":"https://chromereleases.googleblog.com/2014/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-08","release_notes":"https://chromereleases.googleblog.com/2014/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-12","release_notes":"https://chromereleases.googleblog.com/2014/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-11","release_notes":"https://chromereleases.googleblog.com/2015/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-15","release_notes":"https://chromereleases.googleblog.com/2015/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-27","release_notes":"https://chromereleases.googleblog.com/2015/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-29","release_notes":"https://chromereleases.googleblog.com/2015/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-14","release_notes":"https://chromereleases.googleblog.com/2015/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-02","release_notes":"https://chromereleases.googleblog.com/2015/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-26","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-09","release_notes":"https://chromereleases.googleblog.com/2016/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-06-08","release_notes":"https://chromereleases.googleblog.com/2016/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-27","release_notes":"https://chromereleases.googleblog.com/2016/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-09-07","release_notes":"https://chromereleases.googleblog.com/2016/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-19","release_notes":"https://chromereleases.googleblog.com/2016/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-06","release_notes":"https://chromereleases.googleblog.com/2016/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-02-01","release_notes":"https://chromereleases.googleblog.com/2017/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-16","release_notes":"https://chromereleases.googleblog.com/2017/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-25","release_notes":"https://chromereleases.googleblog.com/2017/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-06","release_notes":"https://chromereleases.googleblog.com/2017/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-08-01","release_notes":"https://chromereleases.googleblog.com/2017/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-24","release_notes":"https://chromereleases.googleblog.com/2017/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-05","release_notes":"https://chromereleases.googleblog.com/2017/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2018-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2018-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-31","release_notes":"https://chromereleases.googleblog.com/2018/05/chrome-for-android-update_31.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-17","release_notes":"https://chromereleases.googleblog.com/2018/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/chrome-for-android-update_29.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/chrome-for-android-update_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-24","release_notes":"https://chromereleases.googleblog.com/2019/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/chrome-for-android-update_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/chrome-for-android-update_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-17","release_notes":"https://chromereleases.googleblog.com/2019/12/chrome-for-android-update_17.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/chrome-for-android-update_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/chrome-for-android-update_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"85"},"86":{"release_date":"2020-10-20","release_notes":"https://chromereleases.googleblog.com/2020/10/chrome-for-android-update_20.html","status":"current","engine":"Blink","engine_version":"86"},"87":{"status":"beta","engine":"Blink","engine_version":"87"},"88":{"status":"nightly","engine":"Blink","engine_version":"88"}}},"edge":{"name":"Edge","pref_url":"about:flags","releases":{"12":{"release_date":"2015-07-28","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-12","status":"retired","engine":"EdgeHTML","engine_version":"12"},"13":{"release_date":"2015-11-12","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-13","status":"retired","engine":"EdgeHTML","engine_version":"13"},"14":{"release_date":"2016-08-02","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-14","status":"retired","engine":"EdgeHTML","engine_version":"14"},"15":{"release_date":"2017-04-05","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-15","status":"retired","engine":"EdgeHTML","engine_version":"15"},"16":{"release_date":"2017-10-17","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-16","status":"retired","engine":"EdgeHTML","engine_version":"16"},"17":{"release_date":"2018-04-30","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new/edgehtml-17","status":"retired","engine":"EdgeHTML","engine_version":"17"},"18":{"release_date":"2018-10-02","release_notes":"https://docs.microsoft.com/en-us/microsoft-edge/dev-guide/whats-new","status":"retired","engine":"EdgeHTML","engine_version":"18"},"79":{"release_date":"2020-01-15","release_notes":"https://blogs.windows.com/windowsexperience/2020/01/15/new-year-new-browser-the-new-microsoft-edge-is-out-of-preview-and-now-available-for-download/","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-07","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-80036148-february-7","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-13","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-81041653-april-13","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-21","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-83047837-may-21","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-16","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-84052240-july-16","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-27","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-85056441-august-27","status":"retired","engine":"Blink","engine_version":"85"},"86":{"release_date":"2020-10-09","release_notes":"https://docs.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel#version-86062238-october-9","status":"current","engine":"Blink","engine_version":"86"},"87":{"status":"beta","engine":"Blink","engine_version":"87"},"88":{"status":"nightly","engine":"Blink","engine_version":"88"}}},"firefox":{"name":"Firefox","pref_url":"about:config","releases":{"1":{"release_date":"2004-11-09","release_notes":"http://website-archive.mozilla.org/www.mozilla.org/firefox_releasenotes/en-US/firefox/releases/1.0.html","status":"retired","engine":"Gecko","engine_version":"1.7"},"2":{"release_date":"2006-10-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/2","status":"retired","engine":"Gecko","engine_version":"1.8.1"},"3":{"release_date":"2008-06-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3","status":"retired","engine":"Gecko","engine_version":"1.9"},"4":{"release_date":"2011-03-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/4","status":"retired","engine":"Gecko","engine_version":"2"},"5":{"release_date":"2011-06-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/5","status":"retired","engine":"Gecko","engine_version":"5"},"6":{"release_date":"2011-08-16","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/6","status":"retired","engine":"Gecko","engine_version":"6"},"7":{"release_date":"2011-09-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/7","status":"retired","engine":"Gecko","engine_version":"7"},"8":{"release_date":"2011-11-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/8","status":"retired","engine":"Gecko","engine_version":"8"},"9":{"release_date":"2011-12-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/9","status":"retired","engine":"Gecko","engine_version":"9"},"10":{"release_date":"2012-01-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/10","status":"retired","engine":"Gecko","engine_version":"10"},"11":{"release_date":"2012-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/11","status":"retired","engine":"Gecko","engine_version":"11"},"12":{"release_date":"2012-04-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/12","status":"retired","engine":"Gecko","engine_version":"12"},"13":{"release_date":"2012-06-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/13","status":"retired","engine":"Gecko","engine_version":"13"},"14":{"release_date":"2012-07-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/14","status":"retired","engine":"Gecko","engine_version":"14"},"15":{"release_date":"2012-08-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/15","status":"retired","engine":"Gecko","engine_version":"15"},"16":{"release_date":"2012-10-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/16","status":"retired","engine":"Gecko","engine_version":"16"},"17":{"release_date":"2012-11-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/17","status":"retired","engine":"Gecko","engine_version":"17"},"18":{"release_date":"2013-01-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/18","status":"retired","engine":"Gecko","engine_version":"18"},"19":{"release_date":"2013-02-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/19","status":"retired","engine":"Gecko","engine_version":"19"},"20":{"release_date":"2013-04-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/20","status":"retired","engine":"Gecko","engine_version":"20"},"21":{"release_date":"2013-05-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/21","status":"retired","engine":"Gecko","engine_version":"21"},"22":{"release_date":"2013-06-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/22","status":"retired","engine":"Gecko","engine_version":"22"},"23":{"release_date":"2013-08-06","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/23","status":"retired","engine":"Gecko","engine_version":"23"},"24":{"release_date":"2013-09-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/24","status":"retired","engine":"Gecko","engine_version":"24"},"25":{"release_date":"2013-10-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/25","status":"retired","engine":"Gecko","engine_version":"25"},"26":{"release_date":"2013-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/26","status":"retired","engine":"Gecko","engine_version":"26"},"27":{"release_date":"2014-02-04","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/27","status":"retired","engine":"Gecko","engine_version":"27"},"28":{"release_date":"2014-03-18","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/28","status":"retired","engine":"Gecko","engine_version":"28"},"29":{"release_date":"2014-04-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/29","status":"retired","engine":"Gecko","engine_version":"29"},"30":{"release_date":"2014-06-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/30","status":"retired","engine":"Gecko","engine_version":"30"},"31":{"release_date":"2014-07-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/31","status":"retired","engine":"Gecko","engine_version":"31"},"32":{"release_date":"2014-09-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/32","status":"retired","engine":"Gecko","engine_version":"32"},"33":{"release_date":"2014-10-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/33","status":"retired","engine":"Gecko","engine_version":"33"},"34":{"release_date":"2014-12-01","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/34","status":"retired","engine":"Gecko","engine_version":"34"},"35":{"release_date":"2015-01-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/35","status":"retired","engine":"Gecko","engine_version":"35"},"36":{"release_date":"2015-02-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/36","status":"retired","engine":"Gecko","engine_version":"36"},"37":{"release_date":"2015-03-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/37","status":"retired","engine":"Gecko","engine_version":"37"},"38":{"release_date":"2015-05-12","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/38","status":"retired","engine":"Gecko","engine_version":"38"},"39":{"release_date":"2015-07-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/39","status":"retired","engine":"Gecko","engine_version":"39"},"40":{"release_date":"2015-08-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/40","status":"retired","engine":"Gecko","engine_version":"40"},"41":{"release_date":"2015-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/41","status":"retired","engine":"Gecko","engine_version":"41"},"42":{"release_date":"2015-11-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/42","status":"retired","engine":"Gecko","engine_version":"42"},"43":{"release_date":"2015-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/43","status":"retired","engine":"Gecko","engine_version":"43"},"44":{"release_date":"2016-01-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/44","status":"retired","engine":"Gecko","engine_version":"44"},"45":{"release_date":"2016-03-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/45","status":"retired","engine":"Gecko","engine_version":"45"},"46":{"release_date":"2016-04-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/46","status":"retired","engine":"Gecko","engine_version":"46"},"47":{"release_date":"2016-06-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/47","status":"retired","engine":"Gecko","engine_version":"47"},"48":{"release_date":"2016-08-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/48","status":"retired","engine":"Gecko","engine_version":"48"},"49":{"release_date":"2016-09-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/49","status":"retired","engine":"Gecko","engine_version":"49"},"50":{"release_date":"2016-11-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/50","status":"retired","engine":"Gecko","engine_version":"50"},"51":{"release_date":"2017-01-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/51","status":"retired","engine":"Gecko","engine_version":"51"},"52":{"release_date":"2017-03-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/52","status":"retired","engine":"Gecko","engine_version":"52"},"53":{"release_date":"2017-04-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/53","status":"retired","engine":"Gecko","engine_version":"53"},"54":{"release_date":"2017-06-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/54","status":"retired","engine":"Gecko","engine_version":"54"},"55":{"release_date":"2017-08-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/55","status":"retired","engine":"Gecko","engine_version":"55"},"56":{"release_date":"2017-09-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/56","status":"retired","engine":"Gecko","engine_version":"56"},"57":{"release_date":"2017-11-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/57","status":"retired","engine":"Gecko","engine_version":"57"},"58":{"release_date":"2018-01-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/58","status":"retired","engine":"Gecko","engine_version":"58"},"59":{"release_date":"2018-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/59","status":"retired","engine":"Gecko","engine_version":"59"},"60":{"release_date":"2018-05-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/60","status":"esr","engine":"Gecko","engine_version":"60"},"61":{"release_date":"2018-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/61","status":"retired","engine":"Gecko","engine_version":"61"},"62":{"release_date":"2018-09-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/62","status":"retired","engine":"Gecko","engine_version":"62"},"63":{"release_date":"2018-10-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/63","status":"retired","engine":"Gecko","engine_version":"63"},"64":{"release_date":"2018-12-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/64","status":"retired","engine":"Gecko","engine_version":"64"},"65":{"release_date":"2019-01-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/65","status":"retired","engine":"Gecko","engine_version":"65"},"66":{"release_date":"2019-03-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/66","status":"retired","engine":"Gecko","engine_version":"66"},"67":{"release_date":"2019-05-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/67","status":"retired","engine":"Gecko","engine_version":"67"},"68":{"release_date":"2019-07-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/68","status":"retired","engine":"Gecko","engine_version":"68"},"69":{"release_date":"2019-09-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/69","status":"retired","engine":"Gecko","engine_version":"69"},"70":{"release_date":"2019-10-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/70","status":"retired","engine":"Gecko","engine_version":"70"},"71":{"release_date":"2019-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/71","status":"retired","engine":"Gecko","engine_version":"71"},"72":{"release_date":"2020-01-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72","status":"retired","engine":"Gecko","engine_version":"72"},"73":{"release_date":"2020-02-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/73","status":"retired","engine":"Gecko","engine_version":"73"},"74":{"release_date":"2020-03-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/74","status":"retired","engine":"Gecko","engine_version":"74"},"75":{"release_date":"2020-04-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/75","status":"retired","engine":"Gecko","engine_version":"75"},"76":{"release_date":"2020-05-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/76","status":"retired","engine":"Gecko","engine_version":"76"},"77":{"release_date":"2020-06-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/77","status":"retired","engine":"Gecko","engine_version":"77"},"78":{"release_date":"2020-06-30","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/78","status":"retired","engine":"Gecko","engine_version":"78"},"79":{"release_date":"2020-07-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/79","status":"retired","engine":"Gecko","engine_version":"79"},"80":{"release_date":"2020-08-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/80","status":"retired","engine":"Gecko","engine_version":"80"},"81":{"release_date":"2020-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/81","status":"retired","engine":"Gecko","engine_version":"81"},"82":{"release_date":"2020-10-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/82","status":"current","engine":"Gecko","engine_version":"82"},"83":{"release_date":"2020-11-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/83","status":"beta","engine":"Gecko","engine_version":"83"},"84":{"release_date":"2020-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/84","status":"nightly","engine":"Gecko","engine_version":"84"},"1.5":{"release_date":"2005-11-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/1.5","status":"retired","engine":"Gecko","engine_version":"1.8"},"3.5":{"release_date":"2009-06-30","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3.5","status":"retired","engine":"Gecko","engine_version":"1.9.1"},"3.6":{"release_date":"2010-01-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/3.6","status":"retired","engine":"Gecko","engine_version":"1.9.2"},"3.6.9":{"release_date":"2010-09-07","release_notes":"https://website-archive.mozilla.org/www.mozilla.org/firefox_releasenotes/en-US/firefox/3.6.9/releasenotes/","status":"retired","engine":"Gecko","engine_version":"1.9.2"}}},"firefox_android":{"name":"Firefox Android","pref_url":"about:config","releases":{"4":{"release_date":"2011-03-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/4","status":"retired","engine":"Gecko","engine_version":"2"},"5":{"release_date":"2011-06-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/5","status":"retired","engine":"Gecko","engine_version":"5"},"6":{"release_date":"2011-08-16","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/6","status":"retired","engine":"Gecko","engine_version":"6"},"7":{"release_date":"2011-09-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/7","status":"retired","engine":"Gecko","engine_version":"7"},"8":{"release_date":"2011-11-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/8","status":"retired","engine":"Gecko","engine_version":"8"},"9":{"release_date":"2011-12-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/9","status":"retired","engine":"Gecko","engine_version":"9"},"10":{"release_date":"2012-01-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/10","status":"retired","engine":"Gecko","engine_version":"10"},"14":{"release_date":"2012-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/14","status":"retired","engine":"Gecko","engine_version":"14"},"15":{"release_date":"2012-08-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/15","status":"retired","engine":"Gecko","engine_version":"15"},"16":{"release_date":"2012-10-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/16","status":"retired","engine":"Gecko","engine_version":"16"},"17":{"release_date":"2012-11-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/17","status":"retired","engine":"Gecko","engine_version":"17"},"18":{"release_date":"2013-01-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/18","status":"retired","engine":"Gecko","engine_version":"18"},"19":{"release_date":"2013-02-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/19","status":"retired","engine":"Gecko","engine_version":"19"},"20":{"release_date":"2013-04-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/20","status":"retired","engine":"Gecko","engine_version":"20"},"21":{"release_date":"2013-05-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/21","status":"retired","engine":"Gecko","engine_version":"21"},"22":{"release_date":"2013-06-25","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/22","status":"retired","engine":"Gecko","engine_version":"22"},"23":{"release_date":"2013-08-06","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/23","status":"retired","engine":"Gecko","engine_version":"23"},"24":{"release_date":"2013-09-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/24","status":"retired","engine":"Gecko","engine_version":"24"},"25":{"release_date":"2013-10-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/25","status":"retired","engine":"Gecko","engine_version":"25"},"26":{"release_date":"2013-12-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/26","status":"retired","engine":"Gecko","engine_version":"26"},"27":{"release_date":"2014-02-04","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/27","status":"retired","engine":"Gecko","engine_version":"27"},"28":{"release_date":"2014-03-18","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/28","status":"retired","engine":"Gecko","engine_version":"28"},"29":{"release_date":"2014-04-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/29","status":"retired","engine":"Gecko","engine_version":"29"},"30":{"release_date":"2014-06-10","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/30","status":"retired","engine":"Gecko","engine_version":"30"},"31":{"release_date":"2014-07-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/31","status":"retired","engine":"Gecko","engine_version":"31"},"32":{"release_date":"2014-09-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/32","status":"retired","engine":"Gecko","engine_version":"32"},"33":{"release_date":"2014-10-14","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/33","status":"retired","engine":"Gecko","engine_version":"33"},"34":{"release_date":"2014-12-01","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/34","status":"retired","engine":"Gecko","engine_version":"34"},"35":{"release_date":"2015-01-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/35","status":"retired","engine":"Gecko","engine_version":"35"},"36":{"release_date":"2015-02-27","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/36","status":"retired","engine":"Gecko","engine_version":"36"},"37":{"release_date":"2015-03-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/37","status":"retired","engine":"Gecko","engine_version":"37"},"38":{"release_date":"2015-05-12","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/38","status":"retired","engine":"Gecko","engine_version":"38"},"39":{"release_date":"2015-07-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/39","status":"retired","engine":"Gecko","engine_version":"39"},"40":{"release_date":"2015-08-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/40","status":"retired","engine":"Gecko","engine_version":"40"},"41":{"release_date":"2015-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/41","status":"retired","engine":"Gecko","engine_version":"41"},"42":{"release_date":"2015-11-03","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/42","status":"retired","engine":"Gecko","engine_version":"42"},"43":{"release_date":"2015-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/43","status":"retired","engine":"Gecko","engine_version":"43"},"44":{"release_date":"2016-01-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/44","status":"retired","engine":"Gecko","engine_version":"44"},"45":{"release_date":"2016-03-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/45","status":"retired","engine":"Gecko","engine_version":"45"},"46":{"release_date":"2016-04-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/46","status":"retired","engine":"Gecko","engine_version":"46"},"47":{"release_date":"2016-06-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/47","status":"retired","engine":"Gecko","engine_version":"47"},"48":{"release_date":"2016-08-02","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/48","status":"retired","engine":"Gecko","engine_version":"48"},"49":{"release_date":"2016-09-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/49","status":"retired","engine":"Gecko","engine_version":"49"},"50":{"release_date":"2016-11-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/50","status":"retired","engine":"Gecko","engine_version":"50"},"51":{"release_date":"2017-01-24","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/51","status":"retired","engine":"Gecko","engine_version":"51"},"52":{"release_date":"2017-03-07","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/52","status":"retired","engine":"Gecko","engine_version":"52"},"53":{"release_date":"2017-04-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/53","status":"retired","engine":"Gecko","engine_version":"53"},"54":{"release_date":"2017-06-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/54","status":"retired","engine":"Gecko","engine_version":"54"},"55":{"release_date":"2017-08-08","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/55","status":"retired","engine":"Gecko","engine_version":"55"},"56":{"release_date":"2017-09-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/56","status":"retired","engine":"Gecko","engine_version":"56"},"57":{"release_date":"2017-11-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/57","status":"retired","engine":"Gecko","engine_version":"57"},"58":{"release_date":"2018-01-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/58","status":"retired","engine":"Gecko","engine_version":"58"},"59":{"release_date":"2018-03-13","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/59","status":"retired","engine":"Gecko","engine_version":"59"},"60":{"release_date":"2018-05-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/60","status":"retired","engine":"Gecko","engine_version":"60"},"61":{"release_date":"2018-06-26","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/61","status":"retired","engine":"Gecko","engine_version":"61"},"62":{"release_date":"2018-09-05","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/62","status":"retired","engine":"Gecko","engine_version":"62"},"63":{"release_date":"2018-10-23","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/63","status":"retired","engine":"Gecko","engine_version":"63"},"64":{"release_date":"2018-12-11","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/64","status":"retired","engine":"Gecko","engine_version":"64"},"65":{"release_date":"2019-01-29","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/65","status":"retired","engine":"Gecko","engine_version":"65"},"66":{"release_date":"2019-03-19","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/66","status":"retired","engine":"Gecko","engine_version":"66"},"67":{"release_date":"2019-05-21","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/67","status":"retired","engine":"Gecko","engine_version":"67"},"68":{"release_date":"2019-07-09","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/68","status":"retired","engine":"Gecko","engine_version":"68"},"79":{"release_date":"2020-07-28","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/79","status":"retired","engine":"Gecko","engine_version":"79"},"80":{"release_date":"2020-08-31","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/80","status":"retired","engine":"Gecko","engine_version":"80"},"81":{"release_date":"2020-09-22","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/81","status":"retired","engine":"Gecko","engine_version":"81"},"82":{"release_date":"2020-10-20","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/82","status":"current","engine":"Gecko","engine_version":"82"},"83":{"release_date":"2020-11-17","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/83","status":"beta","engine":"Gecko","engine_version":"83"},"84":{"release_date":"2020-12-15","release_notes":"https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/84","status":"nightly","engine":"Gecko","engine_version":"84"}}},"ie":{"name":"Internet Explorer","releases":{"1":{"release_date":"1995-08-16","status":"retired"},"2":{"release_date":"1995-11-22","status":"retired"},"3":{"release_date":"1996-08-13","status":"retired"},"4":{"release_date":"1997-09-30","status":"retired"},"5":{"release_date":"1999-03-18","status":"retired"},"6":{"release_date":"2001-08-27","status":"retired"},"7":{"release_date":"2006-10-18","status":"retired"},"8":{"release_date":"2009-03-19","status":"retired","engine":"Trident","engine_version":"4.0"},"9":{"release_date":"2011-03-14","status":"retired","engine":"Trident","engine_version":"5.0"},"10":{"release_date":"2012-10-26","status":"retired","engine":"Trident","engine_version":"6.0"},"11":{"release_date":"2013-10-17","status":"current","engine":"Trident","engine_version":"7.0"},"5.5":{"release_date":"2000-07-06","status":"retired"}}},"nodejs":{"name":"Node.js","releases":{"0.1.100":{"release_date":"2010-07-03","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.100/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.1.101":{"release_date":"2010-07-16","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.101/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.1.104":{"release_date":"2010-08-13","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.1.104/ChangeLog","status":"retired","engine":"V8","engine_version":"2.2"},"0.8.0":{"release_date":"2012-06-25","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.8.0/ChangeLog","status":"retired","engine":"V8","engine_version":"3.11"},"0.9.1":{"release_date":"2012-08-28","release_notes":"https://github.com/nodejs/node-v0.x-archive/blob/v0.9.1/ChangeLog","status":"retired","engine":"V8","engine_version":"3.11"},"0.10":{"release_date":"2013-03-11","release_notes":"https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V010.md","status":"retired","engine":"V8","engine_version":"3.14"},"0.12":{"release_date":"2015-02-06","release_notes":"https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V012.md","status":"retired","engine":"V8","engine_version":"3.28"},"4.0.0":{"release_date":"2015-09-08","release_notes":"https://nodejs.org/en/blog/release/v4.0.0/","status":"retired","engine":"V8","engine_version":"4.5"},"5.0.0":{"release_date":"2015-10-29","release_notes":"https://nodejs.org/en/blog/release/v5.0.0/","status":"retired","engine":"V8","engine_version":"4.6"},"6.0.0":{"release_date":"2016-04-26","release_notes":"https://nodejs.org/en/blog/release/v6.0.0/","status":"retired","engine":"V8","engine_version":"5"},"6.5.0":{"release_date":"2016-08-26","release_notes":"https://nodejs.org/en/blog/release/v6.5.0/","status":"retired","engine":"V8","engine_version":"5.1"},"7.0.0":{"release_date":"2016-10-25","release_notes":"https://nodejs.org/en/blog/release/v7.0.0/","status":"retired","engine":"V8","engine_version":"5.4"},"7.5.0":{"release_date":"2017-01-31","release_notes":"https://nodejs.org/en/blog/release/v7.5.0/","status":"retired","engine":"V8","engine_version":"5.4"},"7.6.0":{"release_date":"2017-02-21","release_notes":"https://nodejs.org/en/blog/release/v7.6.0/","status":"retired","engine":"V8","engine_version":"5.5"},"7.7.0":{"release_date":"2017-02-28","release_notes":"https://nodejs.org/en/blog/release/v7.7.0/","status":"retired","engine":"V8","engine_version":"5.5"},"7.10.0":{"release_date":"2017-05-02","release_notes":"https://nodejs.org/en/blog/release/v7.10.0/","status":"retired","engine":"V8","engine_version":"5.5"},"8.0.0":{"release_date":"2017-05-30","release_notes":"https://nodejs.org/en/blog/release/v8.0.0/","status":"retired","engine":"V8","engine_version":"5.8"},"8.3.0":{"release_date":"2017-08-09","release_notes":"https://nodejs.org/en/blog/release/v8.3.0/","status":"retired","engine":"V8","engine_version":"6.0"},"8.5.0":{"release_date":"2017-09-12","release_notes":"https://nodejs.org/en/blog/release/v8.5.0/","status":"retired","engine":"V8","engine_version":"6.0"},"8.7.0":{"release_date":"2017-10-11","release_notes":"https://nodejs.org/en/blog/release/v8.7.0/","status":"retired","engine":"V8","engine_version":"6.1"},"8.10.0":{"release_date":"2018-03-06","release_notes":"https://nodejs.org/en/blog/release/v8.10.0/","status":"retired","engine":"V8","engine_version":"6.2"},"9.3.0":{"release_date":"2017-12-12","release_notes":"https://nodejs.org/en/blog/release/v9.3.0/","status":"retired","engine":"V8","engine_version":"6.2"},"10.0.0":{"release_date":"2018-04-24","release_notes":"https://nodejs.org/en/blog/release/v10.0.0/","status":"retired","engine":"V8","engine_version":"6.6"},"10.4.0":{"release_date":"2018-06-06","release_notes":"https://nodejs.org/en/blog/release/v10.4.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.5.0":{"release_date":"2018-06-20","release_notes":"https://nodejs.org/en/blog/release/v10.5.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.7.0":{"release_date":"2018-07-18","release_notes":"https://nodejs.org/en/blog/release/v10.7.0/","status":"retired","engine":"V8","engine_version":"6.7"},"10.9.0":{"release_date":"2018-08-16","release_notes":"https://nodejs.org/en/blog/release/v10.9.0/","status":"esr","engine":"V8","engine_version":"6.8"},"11.0.0":{"release_date":"2018-10-23","release_notes":"https://nodejs.org/en/blog/release/v11.0.0/","status":"retired","engine":"V8","engine_version":"7.0"},"11.7.0":{"release_date":"2019-01-18","release_notes":"https://nodejs.org/en/blog/release/v11.7.0/","status":"retired","engine":"V8","engine_version":"7.0"},"12.0.0":{"release_date":"2019-04-23","release_notes":"https://nodejs.org/en/blog/release/v12.0.0/","status":"retired","engine":"V8","engine_version":"7.4"},"12.5.0":{"release_date":"2019-06-27","release_notes":"https://nodejs.org/en/blog/release/v12.5.0/","status":"retired","engine":"V8","engine_version":"7.5"},"12.9.0":{"release_date":"2019-08-20","release_notes":"https://nodejs.org/en/blog/release/v12.9.0/","status":"retired","engine":"V8","engine_version":"7.6"},"12.11.0":{"release_date":"2019-09-25","release_notes":"https://nodejs.org/en/blog/release/v12.11.0/","status":"retired","engine":"V8","engine_version":"7.7"},"12.17.0":{"release_date":"2020-05-26","release_notes":"https://nodejs.org/en/blog/release/v12.17.0/","status":"esr","engine":"V8","engine_version":"7.8"},"13.0.0":{"release_date":"2019-10-10","release_notes":"https://nodejs.org/en/blog/release/v13.0.0/","status":"retired","engine":"V8","engine_version":"7.8"},"13.2.0":{"release_date":"2019-11-21","release_notes":"https://nodejs.org/en/blog/release/v13.2.0/","status":"retired","engine":"V8","engine_version":"7.9"},"14.0.0":{"release_date":"2020-04-21","release_notes":"https://nodejs.org/en/blog/release/v14.0.0/","status":"retired","engine":"V8","engine_version":"8.1"},"14.3.0":{"release_date":"2020-05-19","release_notes":"https://nodejs.org/en/blog/release/v14.3.0/","status":"retired","engine":"V8","engine_version":"8.3"},"14.5.0":{"release_date":"2020-06-30","release_notes":"https://nodejs.org/en/blog/release/v14.5.0/","status":"retired","engine":"V8","engine_version":"8.3"},"14.6.0":{"release_date":"2020-07-21","release_notes":"https://nodejs.org/en/blog/release/v14.6.0/","status":"retired","engine":"V8","engine_version":"8.4"},"14.8.0":{"release_date":"2020-08-11","release_notes":"https://nodejs.org/en/blog/release/v14.8.0/","status":"esr","engine":"V8","engine_version":"8.4"},"15.0.0":{"release_date":"2020-10-20","release_notes":"https://nodejs.org/en/blog/release/v15.0.0/","status":"current","engine":"V8","engine_version":"8.6"}}},"opera":{"name":"Opera","releases":{"2":{"release_date":"1996-07-14","status":"retired"},"3":{"release_date":"1997-12-01","status":"retired"},"4":{"release_date":"2000-06-28","status":"retired"},"5":{"release_date":"2000-12-06","status":"retired"},"6":{"release_date":"2001-12-18","status":"retired"},"7":{"release_date":"2003-01-28","status":"retired","engine":"Presto","engine_version":"1"},"8":{"release_date":"2005-04-19","status":"retired","engine":"Presto","engine_version":"1"},"9":{"release_date":"2006-06-20","status":"retired","engine":"Presto","engine_version":"2"},"10":{"release_date":"2009-09-01","release_notes":"https://dev.opera.com/blog/opera-10-weve-only-just-begun/","status":"retired","engine":"Presto","engine_version":"2.2"},"11":{"release_date":"2010-12-16","release_notes":"https://dev.opera.com/blog/new-html5-features-in-opera-11/","status":"retired","engine":"Presto","engine_version":"2.7"},"12":{"release_date":"2012-06-14","release_notes":"https://dev.opera.com/blog/hello-opera-12/","status":"retired","engine":"Presto","engine_version":"2.10"},"15":{"release_date":"2013-07-02","release_notes":"https://dev.opera.com/blog/introducing-opera-15-for-desktop-and-a-fast-release-cycle/","status":"retired","engine":"Blink","engine_version":"28"},"16":{"release_date":"2013-08-27","release_notes":"https://dev.opera.com/blog/opera-16-released-in-the-wild/","status":"retired","engine":"Blink","engine_version":"29"},"17":{"release_date":"2013-10-08","release_notes":"https://dev.opera.com/blog/opera-desktop-17-released/","status":"retired","engine":"Blink","engine_version":"30"},"18":{"release_date":"2013-11-19","release_notes":"https://dev.opera.com/blog/opera-desktop-18-released/","status":"retired","engine":"Blink","engine_version":"31"},"19":{"release_date":"2014-01-28","release_notes":"https://dev.opera.com/blog/opera-19/","status":"retired","engine":"Blink","engine_version":"32"},"20":{"release_date":"2014-03-04","release_notes":"https://dev.opera.com/blog/opera-20/","status":"retired","engine":"Blink","engine_version":"33"},"21":{"release_date":"2014-05-06","release_notes":"https://dev.opera.com/blog/opera-21/","status":"retired","engine":"Blink","engine_version":"34"},"22":{"release_date":"2014-06-03","release_notes":"https://dev.opera.com/blog/opera-22/","status":"retired","engine":"Blink","engine_version":"35"},"23":{"release_date":"2014-07-22","release_notes":"https://dev.opera.com/blog/opera-23/","status":"retired","engine":"Blink","engine_version":"36"},"24":{"release_date":"2014-09-02","release_notes":"https://dev.opera.com/blog/opera-24/","status":"retired","engine":"Blink","engine_version":"37"},"25":{"release_date":"2014-10-15","release_notes":"https://dev.opera.com/blog/opera-25/","status":"retired","engine":"Blink","engine_version":"38"},"26":{"release_date":"2014-12-03","release_notes":"https://dev.opera.com/blog/opera-26/","status":"retired","engine":"Blink","engine_version":"39"},"27":{"release_date":"2015-01-27","release_notes":"https://dev.opera.com/blog/opera-27/","status":"retired","engine":"Blink","engine_version":"40"},"28":{"release_date":"2015-03-10","release_notes":"https://dev.opera.com/blog/opera-28/","status":"retired","engine":"Blink","engine_version":"41"},"29":{"release_date":"2015-04-28","release_notes":"https://dev.opera.com/blog/opera-29/","status":"retired","engine":"Blink","engine_version":"42"},"30":{"release_date":"2015-06-09","release_notes":"https://dev.opera.com/blog/opera-30/","status":"retired","engine":"Blink","engine_version":"43"},"31":{"release_date":"2015-08-04","release_notes":"https://dev.opera.com/blog/opera-31/","status":"retired","engine":"Blink","engine_version":"44"},"32":{"release_date":"2015-09-15","release_notes":"https://dev.opera.com/blog/opera-32/","status":"retired","engine":"Blink","engine_version":"45"},"33":{"release_date":"2015-10-27","release_notes":"https://dev.opera.com/blog/opera-33/","status":"retired","engine":"Blink","engine_version":"46"},"34":{"release_date":"2015-12-08","release_notes":"https://dev.opera.com/blog/opera-34/","status":"retired","engine":"Blink","engine_version":"47"},"35":{"release_date":"2016-02-02","release_notes":"https://dev.opera.com/blog/opera-35/","status":"retired","engine":"Blink","engine_version":"48"},"36":{"release_date":"2016-03-15","release_notes":"https://dev.opera.com/blog/opera-36/","status":"retired","engine":"Blink","engine_version":"49"},"37":{"release_date":"2016-05-04","release_notes":"https://dev.opera.com/blog/opera-37/","status":"retired","engine":"Blink","engine_version":"50"},"38":{"release_date":"2016-06-08","release_notes":"https://dev.opera.com/blog/opera-38/","status":"retired","engine":"Blink","engine_version":"51"},"39":{"release_date":"2016-08-02","release_notes":"https://dev.opera.com/blog/opera-39/","status":"retired","engine":"Blink","engine_version":"52"},"40":{"release_date":"2016-09-20","release_notes":"https://dev.opera.com/blog/opera-40/","status":"retired","engine":"Blink","engine_version":"53"},"41":{"release_date":"2016-10-25","release_notes":"https://dev.opera.com/blog/opera-41/","status":"retired","engine":"Blink","engine_version":"54"},"42":{"release_date":"2016-12-13","release_notes":"https://dev.opera.com/blog/opera-42/","status":"retired","engine":"Blink","engine_version":"55"},"43":{"release_date":"2017-02-07","release_notes":"https://dev.opera.com/blog/opera-43/","status":"retired","engine":"Blink","engine_version":"56"},"44":{"release_date":"2017-03-21","release_notes":"https://dev.opera.com/blog/opera-44/","status":"retired","engine":"Blink","engine_version":"57"},"45":{"release_date":"2017-05-10","release_notes":"https://dev.opera.com/blog/opera-45/","status":"retired","engine":"Blink","engine_version":"58"},"46":{"release_date":"2017-06-22","release_notes":"https://dev.opera.com/blog/opera-46/","status":"retired","engine":"Blink","engine_version":"59"},"47":{"release_date":"2017-08-09","release_notes":"https://dev.opera.com/blog/opera-47/","status":"retired","engine":"Blink","engine_version":"60"},"48":{"release_date":"2017-09-27","status":"retired","engine":"Blink","engine_version":"61"},"49":{"release_date":"2017-11-08","release_notes":"https://dev.opera.com/blog/opera-49/","status":"retired","engine":"Blink","engine_version":"62"},"50":{"release_date":"2018-01-04","release_notes":"https://dev.opera.com/blog/opera-50/","status":"retired","engine":"Blink","engine_version":"63"},"51":{"release_date":"2018-02-07","release_notes":"https://dev.opera.com/blog/opera-51/","status":"retired","engine":"Blink","engine_version":"64"},"52":{"release_date":"2018-03-22","release_notes":"https://dev.opera.com/blog/opera-52/","status":"retired","engine":"Blink","engine_version":"65"},"53":{"release_date":"2018-05-10","release_notes":"https://dev.opera.com/blog/opera-53/","status":"retired","engine":"Blink","engine_version":"66"},"54":{"release_date":"2018-06-28","release_notes":"https://dev.opera.com/blog/opera-54/","status":"retired","engine":"Blink","engine_version":"67"},"55":{"release_date":"2018-08-16","release_notes":"https://blogs.opera.com/desktop/2018/08/opera-55-offers-better-control-web-pages-accessible-bookmarks/","status":"retired","engine":"Blink","engine_version":"68"},"56":{"release_date":"2018-09-25","release_notes":"https://dev.opera.com/blog/opera-56/","status":"retired","engine":"Blink","engine_version":"69"},"57":{"release_date":"2018-11-28","release_notes":"https://dev.opera.com/blog/opera-57/","status":"retired","engine":"Blink","engine_version":"70"},"58":{"release_date":"2019-01-23","release_notes":"https://dev.opera.com/blog/opera-58/","status":"retired","engine":"Blink","engine_version":"71"},"60":{"release_date":"2019-04-09","release_notes":"https://blogs.opera.com/desktop/2019/04/opera-60-reborn-3-web-3-0-vpn-ad-blocker/","status":"retired","engine":"Blink","engine_version":"73"},"62":{"release_date":"2019-06-27","release_notes":"https://blogs.opera.com/desktop/2019/06/opera-62-comes-with-design-updates-to-reborn-3/","status":"retired","engine":"Blink","engine_version":"75"},"63":{"release_date":"2019-08-20","release_notes":"https://blogs.opera.com/desktop/2019/08/opera-63-initial-release/","status":"retired","engine":"Blink","engine_version":"76"},"64":{"release_date":"2019-10-07","release_notes":"https://blogs.opera.com/desktop/2019/10/opera-64-faster-more-private-more-fun/","status":"retired","engine":"Blink","engine_version":"77"},"65":{"release_date":"2019-11-13","release_notes":"https://blogs.opera.com/desktop/2019/11/opera-65-comes-with-an-improved-tracker-blocker-and-redesigned-address-bar/","status":"retired","engine":"Blink","engine_version":"78"},"66":{"release_date":"2020-01-07","release_notes":"https://blogs.opera.com/desktop/2020/01/opera-66-initial-release-makes-it-easier-to-reopen-closed-tabs-and-to-access-extensions/","status":"retired","engine":"Blink","engine_version":"79"},"67":{"release_date":"2020-03-03","release_notes":"https://blogs.opera.com/desktop/2020/03/opera-67-3575-53-stable-update/","status":"retired","engine":"Blink","engine_version":"80"},"68":{"release_date":"2020-04-22","release_notes":"https://blogs.opera.com/desktop/2020/04/opera-68-is-here-with-built-in-instagram-in-the-sidebar/","status":"retired","engine":"Blink","engine_version":"81"},"69":{"release_date":"2020-06-24","release_notes":"https://blogs.opera.com/desktop/2020/06/opera-69-comes-with-built-in-twitter/","status":"retired","engine":"Blink","engine_version":"83"},"70":{"release_date":"2020-07-27","release_notes":"https://blogs.opera.com/desktop/2020/07/opera-70-comes-with-easier-access-to-closed-tabs-simpler-searches-and-new-workspace-icons/","status":"retired","engine":"Blink","engine_version":"84"},"71":{"release_date":"2020-09-15","release_notes":"https://blogs.opera.com/desktop/2020/09/opera-71-update/","status":"retired","engine":"Blink","engine_version":"85"},"72":{"release_date":"2020-10-21","release_notes":"https://blogs.opera.com/desktop/2020/10/opera-72-update/","status":"current","engine":"Blink","engine_version":"86"},"73":{"status":"beta","engine":"Blink","engine_version":"87"},"74":{"status":"nightly","engine":"Blink","engine_version":"88"},"3.5":{"release_date":"1998-11-18","status":"retired"},"3.6":{"release_date":"1999-05-06","status":"retired"},"5.1":{"release_date":"2001-04-10","status":"retired"},"7.1":{"release_date":"2003-04-11","status":"retired","engine":"Presto","engine_version":"1"},"7.2":{"release_date":"2003-09-23","status":"retired","engine":"Presto","engine_version":"1"},"7.5":{"release_date":"2004-05-12","status":"retired","engine":"Presto","engine_version":"1"},"8.5":{"release_date":"2005-09-20","status":"retired","engine":"Presto","engine_version":"1"},"9.1":{"release_date":"2006-12-18","status":"retired","engine":"Presto","engine_version":"2"},"9.2":{"release_date":"2007-04-11","status":"retired","engine":"Presto","engine_version":"2"},"9.5":{"release_date":"2008-06-12","status":"retired","engine":"Presto","engine_version":"2.1"},"9.6":{"release_date":"2008-10-08","release_notes":"https://dev.opera.com/blog/a-look-under-the-hood-of-opera-9-6/","status":"retired","engine":"Presto","engine_version":"2.1"},"10.1":{"release_date":"2009-11-23","release_notes":"https://dev.opera.com/blog/opera-10-10-and-10-2-alpha/","status":"retired","engine":"Presto","engine_version":"2.2"},"10.5":{"release_date":"2010-03-02","release_notes":"https://dev.opera.com/blog/opera-10-50-final-for-windows-is-out/","status":"retired","engine":"Presto","engine_version":"2.5"},"10.6":{"release_date":"2010-07-01","release_notes":"https://dev.opera.com/blog/hello-opera-10-60/","status":"retired","engine":"Presto","engine_version":"2.6"},"11.1":{"release_date":"2011-04-12","release_notes":"https://dev.opera.com/blog/unveiling-opera-11-10-final/","status":"retired","engine":"Presto","engine_version":"2.8"},"11.5":{"release_date":"2011-06-28","release_notes":"https://dev.opera.com/blog/opera-11-50-released-speed-dial-extensions-improved-standards-support/","status":"retired","engine":"Presto","engine_version":"2.9"},"11.6":{"release_date":"2011-12-06","release_notes":"https://dev.opera.com/blog/hello-opera-11-60/","status":"retired","engine":"Presto","engine_version":"2.10"},"12.1":{"release_date":"2012-11-20","release_notes":"https://dev.opera.com/blog/opera-12-10-is-out/","status":"retired","engine":"Presto","engine_version":"2.12"}}},"opera_android":{"name":"Opera Android","releases":{"11":{"release_date":"2011-03-22","release_notes":"https://dev.opera.com/blog/opera-mobile-11-for-maemo-meego-windows/","status":"retired","engine":"Presto","engine_version":"2.7"},"12":{"release_date":"2012-02-25","release_notes":"https://dev.opera.com/blog/opera-mobile-12-and-introducing-opera-mini-next/","status":"retired","engine":"Presto","engine_version":"2.10"},"14":{"release_date":"2013-05-21","release_notes":"https://dev.opera.com/blog/opera-14-for-android-is-out/","status":"retired","engine":"Blink","engine_version":"26"},"15":{"release_date":"2013-07-08","release_notes":"https://blogs.opera.com/news/2013/07/opera-15-for-android/","status":"retired","engine":"Blink","engine_version":"28"},"16":{"release_date":"2013-09-18","status":"retired","engine":"Blink","engine_version":"29"},"18":{"release_date":"2013-11-20","release_notes":"https://blogs.opera.com/news/2013/11/opera-18-android-tablet/","status":"retired","engine":"Blink","engine_version":"31"},"19":{"release_date":"2014-01-28","release_notes":"https://dev.opera.com/blog/opera-19/","status":"retired","engine":"Blink","engine_version":"32"},"20":{"release_date":"2014-03-06","release_notes":"https://forums.opera.com/topic/1081/opera-20-final-release","status":"retired","engine":"Blink","engine_version":"33"},"21":{"release_date":"2014-04-22","release_notes":"https://forums.opera.com/topic/2211/opera-21-final-release","status":"retired","engine":"Blink","engine_version":"34"},"22":{"release_date":"2014-06-17","release_notes":"https://forums.opera.com/topic/3446/opera-22","status":"retired","engine":"Blink","engine_version":"35"},"24":{"release_date":"2014-09-10","release_notes":"https://forums.opera.com/topic/5022/opera-24-final-release","status":"retired","engine":"Blink","engine_version":"37"},"25":{"release_date":"2014-10-16","release_notes":"https://forums.opera.com/topic/5715/opera-25-final-release","status":"retired","engine":"Blink","engine_version":"38"},"26":{"release_date":"2014-12-02","release_notes":"https://forums.opera.com/topic/6800/opera-26-final-release","status":"retired","engine":"Blink","engine_version":"39"},"27":{"release_date":"2015-01-29","release_notes":"https://forums.opera.com/topic/7871/opera-27-final-release","status":"retired","engine":"Blink","engine_version":"40"},"28":{"release_date":"2015-03-10","release_notes":"https://forums.opera.com/topic/8556/synced-bookmarks-and-improved-memory-usage-in-opera-28-for-android","status":"retired","engine":"Blink","engine_version":"41"},"29":{"release_date":"2015-04-28","release_notes":"https://dev.opera.com/blog/opera-29/","status":"retired","engine":"Blink","engine_version":"42"},"30":{"release_date":"2015-06-10","release_notes":"https://blogs.opera.com/mobile/2015/06/opera-30-android-sync-speeddials/","status":"retired","engine":"Blink","engine_version":"43"},"32":{"release_date":"2015-09-23","release_notes":"https://blogs.opera.com/mobile/2015/09/opera-32-add-to-home-screen/","status":"retired","engine":"Blink","engine_version":"45"},"33":{"release_date":"2015-11-03","release_notes":"https://forums.opera.com/topic/12480/opera-33-now-featuring-video-optimization-and-brand-new-icons","status":"retired","engine":"Blink","engine_version":"46"},"34":{"release_date":"2015-12-16","release_notes":"https://forums.opera.com/topic/13085/opera-34-for-android-released","status":"retired","engine":"Blink","engine_version":"47"},"35":{"release_date":"2016-02-04","release_notes":"https://blogs.opera.com/mobile/2016/02/save-space-on-your-android-phone-with-web-apps/","status":"retired","engine":"Blink","engine_version":"48"},"36":{"release_date":"2016-03-31","release_notes":"https://forums.opera.com/topic/14514/opera-36-released","status":"retired","engine":"Blink","engine_version":"49"},"37":{"release_date":"2016-06-16","release_notes":"https://forums.opera.com/topic/15753/opera-37-released","status":"retired","engine":"Blink","engine_version":"50"},"41":{"release_date":"2016-10-25","status":"retired","engine":"Blink","engine_version":"54"},"42":{"release_date":"2017-01-21","release_notes":"https://forums.opera.com/topic/18950/opera-for-android-42","status":"retired","engine":"Blink","engine_version":"55"},"43":{"release_date":"2017-09-27","release_notes":"https://forums.opera.com/topic/22708/opera-for-android-43","status":"retired","engine":"Blink","engine_version":"59"},"44":{"release_date":"2017-12-11","release_notes":"https://forums.opera.com/topic/23860/opera-for-android-44","status":"retired","engine":"Blink","engine_version":"60"},"45":{"release_date":"2018-02-15","release_notes":"https://forums.opera.com/topic/25124/opera-for-android-45","status":"retired","engine":"Blink","engine_version":"61"},"46":{"release_date":"2018-05-14","release_notes":"https://forums.opera.com/topic/26662/opera-for-android-46","status":"retired","engine":"Blink","engine_version":"63"},"47":{"release_date":"2018-07-23","release_notes":"https://forums.opera.com/topic/27794/opera-for-android-47","status":"retired","engine":"Blink","engine_version":"66"},"48":{"release_date":"2018-11-08","release_notes":"https://forums.opera.com/topic/29525/opera-for-android-48","status":"retired","engine":"Blink","engine_version":"69"},"49":{"release_date":"2018-12-07","release_notes":"https://forums.opera.com/topic/29983/opera-for-android-49","status":"retired","engine":"Blink","engine_version":"70"},"50":{"release_date":"2019-02-18","release_notes":"https://forums.opera.com/topic/31003/opera-for-android-50","status":"retired","engine":"Blink","engine_version":"71"},"51":{"release_date":"2019-03-21","release_notes":"https://forums.opera.com/topic/31467/opera-for-android-51-built-in-vpn","status":"retired","engine":"Blink","engine_version":"72"},"52":{"release_date":"2019-05-17","release_notes":"https://forums.opera.com/topic/32516/opera-for-android-52","status":"retired","engine":"Blink","engine_version":"73"},"53":{"release_date":"2019-07-11","release_notes":"https://forums.opera.com/topic/33558/opera-for-android-53","status":"retired","engine":"Blink","engine_version":"74"},"54":{"release_date":"2019-10-18","release_notes":"https://forums.opera.com/topic/35853/opera-for-android-54","status":"retired","engine":"Blink","engine_version":"76"},"55":{"release_date":"2019-12-03","release_notes":"https://forums.opera.com/topic/36858/opera-for-android-55","status":"retired","engine":"Blink","engine_version":"77"},"56":{"release_date":"2020-02-06","release_notes":"https://blogs.opera.com/mobile/2020/02/easy-reading-in-opera-for-android/","status":"retired","engine":"Blink","engine_version":"78"},"57":{"release_date":"2020-03-30","release_notes":"https://blogs.opera.com/mobile/2020/03/introducing-new-features-in-opera-for-android-57/","status":"retired","engine":"Blink","engine_version":"80"},"58":{"release_date":"2020-05-13","release_notes":"https://blogs.opera.com/mobile/2020/05/opera-for-android-58-handle-notifications-easily-and-group-speed-dials-for-a-cleaner-appearance/","status":"retired","engine":"Blink","engine_version":"81"},"59":{"release_date":"2020-06-30","release_notes":"https://blogs.opera.com/mobile/2020/06/opera-for-android-59/","status":"retired","engine":"Blink","engine_version":"83"},"60":{"release_date":"2020-09-23","release_notes":"https://blogs.opera.com/mobile/2020/09/keep-in-sync-with-opera-for-android-60/","status":"current","engine":"Blink","engine_version":"85"},"10.1":{"release_date":"2010-11-09","release_notes":"https://dev.opera.com/blog/opera-mobile-10-1-beta-for-android-is-here/","status":"retired","engine":"Presto","engine_version":"2.5"},"11.1":{"release_date":"2011-06-30","release_notes":"https://dev.opera.com/blog/opera-mobile-11-1-new-features-and-additions/","status":"retired","engine":"Presto","engine_version":"2.8"},"11.5":{"release_date":"2011-10-12","status":"retired","engine":"Presto","engine_version":"2.9"},"12.1":{"release_date":"2012-10-09","release_notes":"https://dev.opera.com/blog/opera-mobile-12-1-with-spdy-web-sockets-flexbox-and-more/","status":"retired","engine":"Presto","engine_version":"2.11"}}},"qq_android":{"name":"QQ Browser","releases":{"8":{"release_date":"2017-11-22","status":"retired"},"7.2.1":{"release_date":"2017-01-18","status":"retired"},"7.3.1":{"release_date":"2017-03-08","status":"retired"},"7.5":{"release_date":"2017-05-08","status":"retired"},"7.5.1":{"release_date":"2017-05-18","status":"retired"},"7.6.1":{"release_date":"2017-06-16","status":"retired"},"7.8":{"release_date":"2017-08-21","status":"retired"},"8.1.3":{"release_date":"2018-01-11","status":"retired"},"8.2":{"release_date":"2018-02-01","status":"current"}}},"safari":{"name":"Safari","releases":{"1":{"release_date":"2003-06-23","status":"retired","engine":"WebKit","engine_version":"85"},"2":{"release_date":"2005-04-29","status":"retired","engine":"WebKit","engine_version":"412"},"3":{"release_date":"2007-11-14","status":"retired","engine":"WebKit","engine_version":"522.11"},"4":{"release_date":"2009-06-08","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_4_0.html","status":"retired","engine":"WebKit","engine_version":"530.17"},"5":{"release_date":"2010-06-07","status":"retired","engine":"WebKit","engine_version":"533.16"},"6":{"release_date":"2012-07-25","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_6_0.html","status":"retired","engine":"WebKit","engine_version":"536.25"},"7":{"release_date":"2013-10-22","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_7_0.html","status":"retired","engine":"WebKit","engine_version":"537.71"},"8":{"release_date":"2014-10-16","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_8_0.html","status":"retired","engine":"WebKit","engine_version":"538.35"},"9":{"release_date":"2015-09-30","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_9_0.html","status":"retired","engine":"WebKit","engine_version":"601.1.56"},"10":{"release_date":"2016-09-20","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_10_0.html","status":"retired","engine":"WebKit","engine_version":"602.1.50"},"11":{"release_date":"2017-09-19","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Safari_11_0/Safari_11_0.html","status":"retired","engine":"WebKit","engine_version":"604.2.4"},"12":{"release_date":"2018-09-24","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_release_notes","status":"retired","engine":"WebKit","engine_version":"606.1.36"},"13":{"release_date":"2019-09-19","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_13_release_notes","status":"retired","engine":"WebKit","engine_version":"608.2.11"},"14":{"release_date":"2020-09-16","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-14-release-notes","status":"current","engine":"WebKit","engine_version":"610.1.28"},"1.1":{"release_date":"2003-10-24","status":"retired","engine":"WebKit","engine_version":"100"},"1.2":{"release_date":"2004-02-02","status":"retired","engine":"WebKit","engine_version":"125"},"1.3":{"release_date":"2005-04-15","status":"retired","engine":"WebKit","engine_version":"312"},"3.1":{"release_date":"2008-03-18","status":"retired","engine":"WebKit","engine_version":"525.13"},"3.2":{"release_date":"2008-11-13","status":"retired","engine":"WebKit","engine_version":"525.26"},"5.1":{"release_date":"2011-07-20","status":"retired","engine":"WebKit","engine_version":"534.48"},"6.1":{"release_date":"2013-06-11","status":"retired","engine":"WebKit","engine_version":"537.43"},"9.1":{"release_date":"2016-03-21","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_9_1.html","status":"retired","engine":"WebKit","engine_version":"601.5.17"},"10.1":{"release_date":"2017-03-27","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_10_1.html","status":"retired","engine":"WebKit","engine_version":"603.2.1"},"11.1":{"release_date":"2018-04-12","release_notes":"https://developer.apple.com/library/content/releasenotes/General/WhatsNewInSafari/Articles/Safari_11_1.html","status":"retired","engine":"WebKit","engine_version":"605.1.33"},"12.1":{"release_date":"2019-03-25","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_1_release_notes","status":"retired","engine":"WebKit","engine_version":"607.1.40"},"13.1":{"release_date":"2020-03-24","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-13_1-release_notes","status":"retired","engine":"WebKit","engine_version":"609.1.20"}}},"safari_ios":{"name":"iOS Safari","releases":{"1":{"status":"retired","engine":"WebKit","engine_version":"522.11","release_date":"2007-06-29"},"2":{"status":"retired","engine":"WebKit","engine_version":"525.18","release_date":"2008-07-11"},"3":{"status":"retired","engine":"WebKit","engine_version":"528.18","release_date":"2009-06-17"},"4":{"status":"retired","engine":"WebKit","engine_version":"532.9","release_date":"2010-06-21"},"5":{"status":"retired","engine":"WebKit","engine_version":"534.46","release_date":"2011-10-12"},"6":{"status":"retired","engine":"WebKit","engine_version":"536.26","release_date":"2012-09-10"},"7":{"status":"retired","engine":"WebKit","engine_version":"537.51","release_date":"2013-09-18"},"8":{"status":"retired","engine":"WebKit","engine_version":"600.1.4","release_date":"2014-09-17"},"9":{"status":"retired","engine":"WebKit","engine_version":"601.1.56","release_date":"2015-09-16"},"10":{"status":"retired","engine":"WebKit","engine_version":"602.1.50","release_date":"2016-09-13"},"11":{"status":"retired","engine":"WebKit","engine_version":"604.2.4","release_date":"2017-09-19"},"12":{"release_date":"2018-09-17","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_release_notes","status":"retired","engine":"WebKit","engine_version":"606.1.36"},"13":{"release_date":"2019-09-19","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_13_release_notes","status":"retired","engine":"WebKit","engine_version":"608.2.11"},"14":{"release_date":"2020-09-16","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-14-release-notes","status":"current","engine":"WebKit","engine_version":"610.1.28"},"3.1":{"status":"retired","engine":"WebKit","engine_version":"528.18","release_date":"2009-09-09"},"3.2":{"status":"retired","engine":"WebKit","engine_version":"531.21","release_date":"2010-04-03"},"4.2":{"status":"retired","engine":"WebKit","engine_version":"533.17","release_date":"2010-11-22"},"4.3":{"status":"retired","engine":"WebKit","engine_version":"533.17","release_date":"2011-03-09"},"5.1":{"status":"retired","engine":"WebKit","engine_version":"534.46","release_date":"2012-03-07"},"6.1":{"status":"retired","engine":"WebKit","engine_version":"536.26","release_date":"2013-01-28"},"9.3":{"status":"retired","engine":"WebKit","engine_version":"601.5.17","release_date":"2016-03-21"},"10.3":{"status":"retired","engine":"WebKit","engine_version":"603.2.1","release_date":"2017-03-27"},"11.3":{"status":"retired","engine":"WebKit","engine_version":"605.1.33","release_date":"2018-03-29"},"12.2":{"release_date":"2019-03-25","release_notes":"https://developer.apple.com/documentation/safari_release_notes/safari_12_1_release_notes","status":"retired","engine":"WebKit","engine_version":"607.1.40"},"13.3":{"release_date":"2019-12-10","release_notes":"https://developer.apple.com/documentation/ios-ipados-release-notes/ios-ipados-13_3-release-notes","status":"retired","engine":"WebKit","engine_version":"608.4.9"},"13.4":{"release_date":"2020-03-24","release_notes":"https://developer.apple.com/documentation/safari-release-notes/safari-13_1-release_notes","status":"retired","engine":"WebKit","engine_version":"609.1.20"}}},"samsunginternet_android":{"name":"Samsung Internet","releases":{"1.0":{"release_date":"2013-04-27","status":"retired","engine":"WebKit","engine_version":"535.19"},"1.5":{"release_date":"2013-09-25","status":"retired","engine":"Blink","engine_version":"28"},"1.6":{"release_date":"2014-04-11","status":"retired","engine":"Blink","engine_version":"28"},"2.0":{"release_date":"2014-10-17","status":"retired","engine":"Blink","engine_version":"34"},"2.1":{"release_date":"2015-01-07","status":"retired","engine":"Blink","engine_version":"34"},"3.0":{"release_date":"2015-04-10","status":"retired","engine":"Blink","engine_version":"38"},"3.2":{"release_date":"2015-08-24","status":"retired","engine":"Blink","engine_version":"38"},"4.0":{"release_date":"2016-03-11","status":"retired","engine":"Blink","engine_version":"44"},"4.2":{"release_date":"2016-08-02","status":"retired","engine":"Blink","engine_version":"44"},"5.0":{"release_date":"2016-12-15","status":"retired","engine":"Blink","engine_version":"51"},"5.2":{"release_date":"2017-04-21","status":"retired","engine":"Blink","engine_version":"51"},"5.4":{"release_date":"2017-05-17","status":"retired","engine":"Blink","engine_version":"51"},"6.0":{"release_date":"2017-08-23","status":"retired","engine":"Blink","engine_version":"56"},"6.2":{"release_date":"2017-10-26","status":"retired","engine":"Blink","engine_version":"56"},"6.4":{"release_date":"2018-02-19","status":"retired","engine":"Blink","engine_version":"56"},"7.0":{"release_date":"2018-03-16","status":"retired","engine":"Blink","engine_version":"59"},"7.2":{"release_date":"2018-06-20","status":"retired","engine":"Blink","engine_version":"59"},"7.4":{"release_date":"2018-09-12","status":"retired","engine":"Blink","engine_version":"59"},"8.0":{"release_date":"2018-07-18","status":"retired","engine":"Blink","engine_version":"63"},"8.2":{"release_date":"2018-12-21","status":"retired","engine":"Blink","engine_version":"63"},"9.0":{"release_date":"2018-09-15","status":"retired","engine":"Blink","engine_version":"67"},"9.2":{"release_date":"2019-04-02","status":"retired","engine":"Blink","engine_version":"67"},"9.4":{"release_date":"2019-07-25","status":"retired","engine":"Blink","engine_version":"67"},"10.0":{"release_date":"2019-08-22","status":"retired","engine":"Blink","engine_version":"71"},"10.2":{"release_date":"2019-10-09","status":"retired","engine":"Blink","engine_version":"71"},"11.0":{"release_date":"2019-12-05","status":"retired","engine":"Blink","engine_version":"75"},"11.2":{"release_date":"2020-03-22","status":"retired","engine":"Blink","engine_version":"75"},"12.0":{"release_date":"2020-06-19","status":"retired","engine":"Blink","engine_version":"79"},"12.1":{"release_date":"2020-07-07","status":"current","engine":"Blink","engine_version":"79"},"13.0":{"status":"beta","engine":"Blink","engine_version":"83"}}},"uc_android":{"name":"UC Browser","releases":{"8.6.1.262":{"release_date":"2013-01-31","status":"retired"},"9.0.1.275":{"release_date":"2013-04-24","status":"retired"},"9.0.2.299":{"release_date":"2013-05-29","status":"retired"},"9.1.0.297":{"release_date":"2013-06-26","status":"retired"},"9.2.0.308":{"release_date":"2013-07-25","status":"retired"},"9.2.2.323":{"release_date":"2013-08-07","status":"retired"},"9.2.3.324":{"release_date":"2013-08-27","status":"retired"},"9.3.0.321":{"release_date":"2013-09-18","status":"retired"},"9.3.1.344":{"release_date":"2013-09-30","status":"retired"},"9.3.2.349":{"release_date":"2013-10-14","status":"retired"},"9.4.0.347":{"release_date":"2013-11-15","status":"retired"},"9.5.0.360":{"release_date":"2014-01-06","status":"retired"},"9.6.0.378":{"release_date":"2014-02-26","status":"retired"},"9.7.0.398":{"release_date":"2014-04-02","status":"retired"},"9.7.5.418":{"release_date":"2014-04-23","status":"retired"},"9.7.8.425":{"release_date":"2014-05-22","status":"retired"},"9.8.0.435":{"release_date":"2014-06-10","status":"retired"},"9.8.5.442":{"release_date":"2014-06-20","status":"retired"},"9.8.9.457":{"release_date":"2014-07-09","status":"retired"},"9.9.0.459":{"release_date":"2014-07-18","status":"retired"},"9.9.2.467":{"release_date":"2014-08-11","status":"retired"},"9.9.3.478":{"release_date":"2014-08-22","status":"retired"},"9.9.4.484":{"release_date":"2014-09-26","status":"retired"},"9.9.6.495":{"release_date":"2014-10-17","status":"retired"},"10.0.0.488":{"release_date":"2014-11-04","status":"retired"},"10.0.1.512":{"release_date":"2014-11-18","status":"retired"},"10.0.2.523":{"release_date":"2014-12-31","status":"retired"},"10.1.0.527":{"release_date":"2015-01-27","status":"retired"},"10.2.0.535":{"release_date":"2015-03-03","status":"retired"},"10.3.0.552":{"release_date":"2015-03-16","status":"retired"},"10.4.1.565":{"release_date":"2015-05-13","status":"retired"},"10.5.0.575":{"release_date":"2015-05-30","status":"retired"},"10.5.1.581":{"release_date":"2015-05-18","status":"retired"},"10.5.2.582":{"release_date":"2015-06-26","status":"retired"},"10.6.0.586":{"release_date":"2015-07-14","status":"retired"},"10.6.2.599":{"release_date":"2015-08-06","status":"retired"},"10.6.5.623":{"release_date":"2015-08-20","status":"retired"},"10.7.0.636":{"release_date":"2015-09-06","status":"retired"},"10.7.2.645":{"release_date":"2015-09-29","status":"retired"},"10.7.5.658":{"release_date":"2015-11-03","status":"retired"},"10.7.8.675":{"release_date":"2015-12-01","status":"retired"},"10.8.0.718":{"release_date":"2016-01-09","status":"retired"},"10.8.5.725":{"release_date":"2016-01-26","status":"retired"},"10.8.8.730":{"release_date":"2016-02-23","status":"retired"},"10.9.0.731":{"release_date":"2016-03-16","status":"retired"},"10.9.5.735":{"release_date":"2016-04-08","status":"retired"},"10.9.8.770":{"release_date":"2016-05-05","status":"retired"},"10.10.0.796":{"release_date":"2016-06-03","status":"retired"},"10.10.5.809":{"release_date":"2016-06-30","status":"retired"},"10.10.9.821":{"release_date":"2016-07-20","status":"retired"},"10.10.8.820":{"release_date":"2016-08-04","status":"retired"},"11.0.0.828":{"release_date":"2016-09-01","status":"retired"},"11.0.5.850":{"release_date":"2016-09-22","status":"retired"},"11.0.8.855":{"release_date":"2016-11-10","status":"retired"},"11.1.0.882":{"release_date":"2016-11-29","status":"retired"},"11.1.5.890":{"release_date":"2016-12-30","status":"retired"},"11.2.0.915":{"release_date":"2017-01-18","status":"retired"},"11.2.8.945":{"release_date":"2017-03-23","status":"retired"},"11.3.0.950":{"release_date":"2017-04-27","status":"retired"},"11.3.2.960":{"release_date":"2017-05-22","status":"retired"},"11.3.5.972":{"release_date":"2017-06-12","status":"retired"},"11.4.2.995":{"release_date":"2017-08-14","status":"retired"},"11.4.5.1005":{"release_date":"2017-09-11","status":"retired"},"11.4.8.1012":{"release_date":"2017-11-07","status":"retired"},"11.5.0.1015":{"release_date":"2017-12-13","status":"retired"},"12.0.0.1088":{"release_date":"2018-01-30","status":"retired"},"12.2.0.1089":{"release_date":"2018-03-09","status":"retired"},"12.2.1.1108":{"release_date":"2018-03-28","status":"retired"},"12.2.5.1102":{"release_date":"2018-04-03","status":"retired"},"12.5.0.1109":{"release_date":"2018-05-04","status":"current"}}},"uc_chinese_android":{"name":"Chinese UC Browser","releases":{"10.10.0.800":{"release_date":"2016-05-26","status":"retired"},"10.10.1.812":{"release_date":"2016-06-03","status":"retired"},"10.10.3.810":{"release_date":"2016-06-15","status":"retired"},"10.10.5.811":{"release_date":"2016-07-12","status":"retired"},"10.10.8.822":{"release_date":"2016-07-26","status":"retired"},"11.0.0.818":{"release_date":"2016-08-03","status":"retired"},"11.0.2.840":{"release_date":"2016-08-22","status":"retired"},"11.0.3.845":{"release_date":"2016-08-23","status":"retired"},"11.0.4.846":{"release_date":"2016-08-24","status":"retired"},"11.0.5.841":{"release_date":"2016-09-06","status":"retired"},"11.0.8.858":{"release_date":"2016-09-21","status":"retired"},"11.1.0.870":{"release_date":"2016-10-14","status":"retired"},"11.1.5.871":{"release_date":"2016-11-02","status":"retired"},"11.2.0.880":{"release_date":"2016-11-18","status":"retired"},"11.2.1.888":{"release_date":"2016-11-23","status":"retired"},"11.2.5.884":{"release_date":"2016-11-30","status":"retired"},"11.2.8.885":{"release_date":"2016-12-22","status":"retired"},"11.3.0.907":{"release_date":"2017-01-03","status":"retired"},"11.3.5.908":{"release_date":"2017-01-20","status":"retired"},"11.3.8.909":{"release_date":"2017-02-08","status":"retired"},"11.4.0.921":{"release_date":"2017-02-20","status":"retired"},"11.4.1.939":{"release_date":"2017-02-23","status":"retired"},"11.4.2.936":{"release_date":"2017-03-08","status":"retired"},"11.4.5.937":{"release_date":"2017-03-30","status":"retired"},"11.4.8.938":{"release_date":"2017-04-08","status":"retired"},"11.4.9.941":{"release_date":"2017-04-10","status":"retired"},"11.5.0.939":{"release_date":"2017-04-25","status":"retired"},"11.5.1.944":{"release_date":"2017-05-05","status":"retired"},"11.5.2.942":{"release_date":"2017-05-30","status":"retired"},"11.5.5.943":{"release_date":"2017-06-09","status":"retired"},"11.5.6.946":{"release_date":"2017-06-14","status":"retired"},"11.5.8.945":{"release_date":"2017-06-27","status":"retired"},"11.6.0.947":{"release_date":"2017-07-11","status":"retired"},"11.6.1.949":{"release_date":"2017-07-13","status":"retired"},"11.6.2.948":{"release_date":"2017-07-25","status":"retired"},"11.6.4.950":{"release_date":"2017-08-07","status":"retired"},"11.6.6.951":{"release_date":"2017-08-21","status":"retired"},"11.6.8.952":{"release_date":"2017-09-05","status":"retired"},"11.7.0.953":{"release_date":"2017-09-30","status":"retired"},"11.7.2.954":{"release_date":"2017-10-10","status":"retired"},"11.7.5.955":{"release_date":"2017-10-30","status":"retired"},"11.7.8.958":{"release_date":"2017-11-18","status":"retired"},"11.8.0.960":{"release_date":"2017-12-07","status":"retired"},"11.8.2.962":{"release_date":"2017-12-25","status":"retired"},"11.8.3.963":{"release_date":"2018-01-17","status":"retired"},"11.8.4.964":{"release_date":"2018-01-23","status":"retired"},"11.8.6.966":{"release_date":"2018-01-31","status":"retired"},"11.8.8.968":{"release_date":"2018-02-06","status":"retired"},"11.9.0.970":{"release_date":"2018-03-13","status":"retired"},"11.9.2.972":{"release_date":"2018-03-21","status":"retired"},"11.9.3.973":{"release_date":"2018-03-28","status":"retired"},"11.9.4.974":{"release_date":"2018-04-11","status":"retired"},"11.9.6.976":{"release_date":"2018-05-04","status":"current"}}},"webview_android":{"name":"WebView Android","releases":{"1":{"release_date":"2008-09-23","release_notes":"https://en.wikipedia.org/wiki/Android_version_history#Android_1.0_(API_1)","status":"retired"},"2":{"release_date":"2009-10-26","release_notes":"https://en.wikipedia.org/wiki/Android_Eclair","status":"retired","engine":"WebKit","engine_version":"530.17"},"3":{"release_date":"2011-02-22","release_notes":"https://en.wikipedia.org/wiki/Android_Honeycomb","status":"retired","engine":"WebKit","engine_version":"534.13"},"4":{"release_date":"2011-10-18","release_notes":"https://en.wikipedia.org/wiki/Android_Ice_Cream_Sandwich","status":"retired","engine":"WebKit","engine_version":"534.30"},"37":{"release_date":"2014-09-03","release_notes":"https://chromereleases.googleblog.com/2014/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"37"},"38":{"release_date":"2014-10-08","release_notes":"https://chromereleases.googleblog.com/2014/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"38"},"39":{"release_date":"2014-11-12","release_notes":"https://chromereleases.googleblog.com/2014/11/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"39"},"40":{"release_date":"2015-01-21","release_notes":"https://chromereleases.googleblog.com/2015/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"40"},"41":{"release_date":"2015-03-11","release_notes":"https://chromereleases.googleblog.com/2015/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"41"},"42":{"release_date":"2015-04-15","release_notes":"https://chromereleases.googleblog.com/2015/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"42"},"43":{"release_date":"2015-05-27","release_notes":"https://chromereleases.googleblog.com/2015/05/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"43"},"44":{"release_date":"2015-07-29","release_notes":"https://chromereleases.googleblog.com/2015/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"44"},"45":{"release_date":"2015-09-01","release_notes":"https://chromereleases.googleblog.com/2015/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"45"},"46":{"release_date":"2015-10-14","release_notes":"https://chromereleases.googleblog.com/2015/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"46"},"47":{"release_date":"2015-12-02","release_notes":"https://chromereleases.googleblog.com/2015/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"47"},"48":{"release_date":"2016-01-26","status":"retired","engine":"Blink","engine_version":"48"},"49":{"release_date":"2016-03-09","release_notes":"https://chromereleases.googleblog.com/2016/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"49"},"50":{"release_date":"2016-04-13","status":"retired","engine":"Blink","engine_version":"50"},"51":{"release_date":"2016-06-08","release_notes":"https://chromereleases.googleblog.com/2016/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"51"},"52":{"release_date":"2016-07-27","release_notes":"https://chromereleases.googleblog.com/2016/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"52"},"53":{"release_date":"2016-09-07","release_notes":"https://chromereleases.googleblog.com/2016/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"53"},"54":{"release_date":"2016-10-19","release_notes":"https://chromereleases.googleblog.com/2016/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"54"},"55":{"release_date":"2016-12-06","release_notes":"https://chromereleases.googleblog.com/2016/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"55"},"56":{"release_date":"2017-02-01","release_notes":"https://chromereleases.googleblog.com/2017/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"56"},"57":{"release_date":"2017-03-16","release_notes":"https://chromereleases.googleblog.com/2017/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"57"},"58":{"release_date":"2017-04-25","release_notes":"https://chromereleases.googleblog.com/2017/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"58"},"59":{"release_date":"2017-06-06","release_notes":"https://chromereleases.googleblog.com/2017/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"59"},"60":{"release_date":"2017-08-01","release_notes":"https://chromereleases.googleblog.com/2017/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"60"},"61":{"release_date":"2017-09-05","release_notes":"https://chromereleases.googleblog.com/2017/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"61"},"62":{"release_date":"2017-10-24","release_notes":"https://chromereleases.googleblog.com/2017/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"62"},"63":{"release_date":"2017-12-05","release_notes":"https://chromereleases.googleblog.com/2017/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"63"},"64":{"release_date":"2018-01-23","release_notes":"https://chromereleases.googleblog.com/2018/01/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"64"},"65":{"release_date":"2017-03-06","release_notes":"https://chromereleases.googleblog.com/2018/03/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"65"},"66":{"release_date":"2017-04-17","release_notes":"https://chromereleases.googleblog.com/2018/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"66"},"67":{"release_date":"2018-05-31","release_notes":"https://chromereleases.googleblog.com/2018/05/chrome-for-android-update_31.html","status":"retired","engine":"Blink","engine_version":"67"},"68":{"release_date":"2018-07-24","release_notes":"https://chromereleases.googleblog.com/2018/07/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"68"},"69":{"release_date":"2018-09-04","release_notes":"https://chromereleases.googleblog.com/2018/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"69"},"70":{"release_date":"2018-10-17","release_notes":"https://chromereleases.googleblog.com/2018/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"70"},"71":{"release_date":"2018-12-04","release_notes":"https://chromereleases.googleblog.com/2018/12/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"71"},"72":{"release_date":"2019-01-29","release_notes":"https://chromereleases.googleblog.com/2019/01/chrome-for-android-update_29.html","status":"retired","engine":"Blink","engine_version":"72"},"73":{"release_date":"2019-03-12","release_notes":"https://chromereleases.googleblog.com/2019/03/chrome-for-android-update_12.html","status":"retired","engine":"Blink","engine_version":"73"},"74":{"release_date":"2019-04-24","release_notes":"https://chromereleases.googleblog.com/2019/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"74"},"75":{"release_date":"2019-06-04","release_notes":"https://chromereleases.googleblog.com/2019/06/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"75"},"76":{"release_date":"2019-07-30","release_notes":"https://chromereleases.googleblog.com/2019/07/chrome-for-android-update_30.html","status":"retired","engine":"Blink","engine_version":"76"},"77":{"release_date":"2019-09-10","release_notes":"https://chromereleases.googleblog.com/2019/09/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"77"},"78":{"release_date":"2019-10-22","release_notes":"https://chromereleases.googleblog.com/2019/10/chrome-for-android-update_22.html","status":"retired","engine":"Blink","engine_version":"78"},"79":{"release_date":"2019-12-17","release_notes":"https://chromereleases.googleblog.com/2019/12/chrome-for-android-update_17.html","status":"retired","engine":"Blink","engine_version":"79"},"80":{"release_date":"2020-02-04","release_notes":"https://chromereleases.googleblog.com/2020/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"80"},"81":{"release_date":"2020-04-07","release_notes":"https://chromereleases.googleblog.com/2020/04/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"81"},"83":{"release_date":"2020-05-19","release_notes":"https://chromereleases.googleblog.com/2020/05/chrome-for-android-update_19.html","status":"retired","engine":"Blink","engine_version":"83"},"84":{"release_date":"2020-07-27","release_notes":"https://chromereleases.googleblog.com/2020/07/chrome-for-android-update_27.html","status":"retired","engine":"Blink","engine_version":"84"},"85":{"release_date":"2020-08-25","release_notes":"https://chromereleases.googleblog.com/2020/08/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"85"},"86":{"release_date":"2020-10-20","release_notes":"https://chromereleases.googleblog.com/2020/10/chrome-for-android-update_20.html","status":"current","engine":"Blink","engine_version":"86"},"87":{"status":"beta","engine":"Blink","engine_version":"87"},"88":{"status":"nightly","engine":"Blink","engine_version":"88"},"1.1":{"release_date":"2009-02-09","release_notes":"https://en.wikipedia.org/wiki/Android_version_history#Android_1.1_(API_2)","status":"retired"},"1.5":{"release_date":"2009-04-27","release_notes":"https://en.wikipedia.org/wiki/Android_Cupcake","status":"retired"},"1.6":{"release_date":"2009-09-15","release_notes":"https://en.wikipedia.org/wiki/Android_Donut","status":"retired"},"2.2":{"release_date":"2010-05-20","release_notes":"https://en.wikipedia.org/wiki/Android_Froyo","status":"retired","engine":"WebKit","engine_version":"533.1"},"2.3":{"release_date":"2010-12-06","release_notes":"https://en.wikipedia.org/wiki/Android_Gingerbread","status":"retired","engine":"WebKit","engine_version":"533.1"},"4.1":{"release_date":"2012-07-09","release_notes":"https://en.wikipedia.org/wiki/Android_Jelly_Bean","status":"retired","engine":"WebKit","engine_version":"534.30"},"4.2":{"release_date":"2013-07-24","release_notes":"https://en.wikipedia.org/wiki/Android_Jelly_Bean","status":"retired","engine":"WebKit","engine_version":"534.30"},"4.4":{"release_date":"2013-12-09","release_notes":"https://chromereleases.googleblog.com/2013/10/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"30"},"4.4.3":{"release_date":"2014-06-02","release_notes":"https://chromereleases.googleblog.com/2014/02/chrome-for-android-update.html","status":"retired","engine":"Blink","engine_version":"33"}}}}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/dataset/css-properties.json firefox-85.0+build1/devtools/shared/compatibility/dataset/css-properties.json
--- firefox-84.0.2+build1/devtools/shared/compatibility/dataset/css-properties.json	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/dataset/css-properties.json	2021-01-18 19:58:08.000000000 +0000
@@ -1 +1 @@
-{"-moz-binding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-binding","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"67","notes":["XBL is deprecated and being removed. See <a href='https://bugzil.la/1397874'>bug 1397874</a>.","Available only in chrome and UA style sheets."]},"firefox_android":{"version_added":"4","version_removed":"67","notes":"Available only in chrome and UA style sheets."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-context-properties":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-context-properties","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55","flags":[{"type":"preference","name":"svg.context-properties.content.enabled","value_to_set":"true"}],"notes":"With the preference set to <code>false</code>, the property still works with SVGs via <code>chrome://</code> or <code>resource://</code> URLs"},"firefox_android":{"version_added":"55","flags":[{"type":"preference","name":"svg.context-properties.content.enabled","value_to_set":"true"}],"notes":"With the preference set to <code>false</code>, the property still works with SVGs via <code>chrome://</code> or <code>resource://</code> URLs"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"-moz-float-edge":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-float-edge","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-force-broken-image-icon":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-force-broken-image-icon","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-image-region":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-image-region","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-moz-orient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-orient","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"6"},"firefox_android":{"version_added":"6"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"21","version_removed":"40","notes":"The <code>auto</code> value was equivalent to <code>horizontal</code>."},"firefox_android":{"version_added":"21","version_removed":"40","notes":"The <code>auto</code> value was equivalent to <code>horizontal</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"inline_and_block":{"__compat":{"description":"<code>inline</code> and <code>block</code> values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"40"},"firefox_android":{"version_added":"40"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"-moz-outline-radius-bottomleft":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-bottomleft","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-bottomright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-bottomright","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-topleft":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-topleft","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-topright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-topright","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-user-focus":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-user-focus","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-moz-user-input":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-user-input","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}},"auto":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"disabled":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"60"},"firefox_android":{"version_added":"4","version_removed":"60"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"enabled":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"60"},"firefox_android":{"version_added":"4","version_removed":"60"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"none":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"-ms-grid-column-align":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-column-span":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-column":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row-align":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row-span":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-scrollbar-track-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-ms-scrollbar-track-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5","alternative_name":"scrollbar-track-color"},{"version_added":"8"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"-webkit-border-before":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-border-before","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-box-reflect":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-box-reflect","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-line-clamp":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-line-clamp","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"17"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"-webkit-mask-attachment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment","support":{"chrome":{"version_added":"1","version_removed":"24"},"chrome_android":{"version_added":"18","version_removed":"25"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"1.5"},"webview_android":{"version_added":"≤37","version_removed":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-box-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-box-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-composite":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-position-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-position-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-position-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-position-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-repeat-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-repeat-x","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-repeat-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-repeat-y","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-overflow-scrolling":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-overflow-scrolling","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-print-color-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-print-color-adjust","support":{"chrome":{"version_added":"17","notes":["Chrome does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"chrome_android":{"version_added":"18","notes":["Chrome does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"edge":{"version_added":"79","notes":"Edge does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Opera does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"opera_android":{"version_added":"15","notes":"Opera does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"safari":{"version_added":"6","notes":"Safari does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"safari_ios":{"version_added":"6","notes":"Safari does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"samsunginternet_android":{"version_added":"1.0","notes":["Samsung Internet does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"webview_android":{"version_added":"37","notes":"WebView does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-tap-highlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-tap-highlight-color","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"≤15"},"opera_android":{"version_added":"≤14"},"safari":{"version_added":false},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-fill-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-fill-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-security":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-security","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"38"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-touch-callout":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-touch-callout","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"align-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-content","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"52","version_removed":"60","notes":"<code>align-content</code> no longer accepts the <code>left</code> and <code>right</code> values"},"firefox_android":{"version_added":"52","version_removed":"60","notes":"<code>align-content</code> no longer accepts the <code>left</code> and <code>right</code> values"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space-evenly":{"__compat":{"description":"<code>space-evenly</code>","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-content","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"align-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-items","support":{"chrome":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Multi-line flexbox has been supported since Firefox 28."},{"prefix":"-webkit-","version_added":"49"},{"version_removed":"20","version_added":"18","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Multi-line flexbox has been supported since Firefox 28."},{"prefix":"-webkit-","version_added":"49"},{"version_removed":"20","version_added":"18","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"In Internet Explorer 10 and 11, if column flex items have <code>align-items: center;</code> set on them and their content is too large, then they will overflow the bounds of their container. See <a href='https://github.com/philipwalton/flexbugs#2-column-flex-items-set-to-align-itemscenter-overflow-their-container'>Flexbug #2</a>."},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"6.0"},{"version_added":"2.0","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Samsung Internet 6.0."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"52"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-items","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"align-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-self","support":{"chrome":[{"version_added":"36"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"36"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Before Firefox 27, only single-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Before Firefox 27, only single-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"3.0"},{"version_added":"2.0","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Samsung Internet 6.0."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"37"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer 10 and 11 have the property <code>-ms-grid-row-align</code>, which acts in a similar way to <code>align-self</code>."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"all":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/all","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":{"version_added":"27"},"firefox_android":{"version_added":"27"},"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"revert":{"__compat":{"description":"<code>revert</code>","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"67"},"firefox_android":{"version_added":"67"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"alt":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/alt","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"animation-delay":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-delay","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"16","notes":"Before Firefox 57, Firefox does not repaint elements outside the viewport that are animated into the viewport with a delay. This bug affects only some platforms, such as Windows."},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-direction","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alternate-reverse":{"__compat":{"description":"<code>alternate-reverse</code>","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"reverse":{"__compat":{"description":"<code>reverse</code>","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"animation-duration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-duration","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10","partial_implementation":true,"notes":"Once the element has loaded, changing the value of this property has no effect."},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-fill-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-fill-mode","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-iteration-count":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-iteration-count","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-name":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-name","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-play-state":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-play-state","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-timing-function":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-timing-function","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"jump":{"__compat":{"description":"<code>jump-</code> keywords for <code>steps()</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"2","notes":"The <a href='https://developer.mozilla.org/docs/Web/CSS/animation-fill-mode'><code>animation-fill-mode</code></a> property is not supported in Android browsers below 2.3."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"appearance":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/appearance","support":{"chrome":[{"version_added":"84"},{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"}],"chrome_android":[{"version_added":"84"},{"version_added":"18","partial_implementation":true,"prefix":"-webkit-"}],"edge":[{"version_added":"84"},{"version_added":"12","partial_implementation":true,"prefix":"-webkit-"}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true,"prefix":"-moz-"},{"version_added":"64","partial_implementation":true,"prefix":"-webkit-"},{"version_added":"62","partial_implementation":true,"prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.webkit-appearance.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true,"prefix":"-moz-"},{"version_added":"64","partial_implementation":true,"prefix":"-webkit-"},{"version_added":"62","partial_implementation":true,"prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.webkit-appearance.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"70"},{"version_added":"15","partial_implementation":true,"prefix":"-webkit-"}],"opera_android":[{"version_added":"60"},{"version_added":"14","partial_implementation":true,"prefix":"-webkit-"}],"safari":{"version_added":"3","partial_implementation":true,"prefix":"-webkit-"},"safari_ios":{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true,"prefix":"-webkit-"},"webview_android":[{"version_added":"84"},{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"support":{"chrome":{"version_added":"83"},"chrome_android":{"version_added":"83"},"edge":{"version_added":"83"},"firefox":{"version_added":"80"},"firefox_android":{"version_added":"80"},"ie":{"version_added":false},"opera":{"version_added":"69"},"opera_android":{"version_added":"59"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"83"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"compat-auto":{"__compat":{"description":"<code>&lt;compat-auto&gt;</code> (compatibility values <code>searchfield</code>, <code>textarea</code>, <code>push-button</code>, <code>slider-horizontal</code>, <code>checkbox</code>, <code>radio</code>, <code>square-button</code>, <code>menulist</code>, <code>listbox</code>, <code>meter</code>, <code>progress-bar</code>, <code>button</code>)","support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"menulist-button":{"__compat":{"description":"<code>menulist-button</code>","support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true,"notes":"See <a href='https://bugzil.la/1481615'>bug 1481615</a>."}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true,"notes":"See <a href='https://bugzil.la/1481615'>bug 1481615</a>."}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"54"},{"version_added":"1","partial_implementation":true,"notes":"Doesn't work with <code>&lt;input type=\"checkbox\"&gt;</code> and <code>&lt;input type=\"radio\"&gt;</code>."}],"firefox_android":[{"version_added":"54"},{"version_added":"4","partial_implementation":true,"notes":"Doesn't work with <code>&lt;input type=\"checkbox\"&gt;</code> and <code>&lt;input type=\"radio\"&gt;</code>."}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"textfield":{"__compat":{"support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"aspect-ratio":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/aspect-ratio","support":{"chrome":{"version_added":"79","partial_implementation":true,"notes":"Chrome 79 adds internal support only for mapped values"},"chrome_android":{"version_added":"79","partial_implementation":true,"notes":"Chrome 79 adds internal support only for mapped values"},"edge":{"version_added":"79","partial_implementation":true,"notes":"Edge 79 adds internal support only for mapped values"},"firefox":[{"version_added":"71","partial_implementation":true,"notes":"Firefox 71 adds internal support only for mapped values"},{"version_added":"69","version_removed":"71","partial_implementation":true,"notes":"Firefox 69 adds internal support only for mapped values","flags":[{"type":"preference","name":"layout.css.width-and-height-map-to-aspect-ratio.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"14","partial_implementation":true,"notes":"Safari 14 adds internal support only for mapped values"},"safari_ios":{"version_added":"14","partial_implementation":true,"notes":"Safari 14 adds internal support only for mapped values"},"samsunginternet_android":{"version_added":"12.0","partial_implementation":true,"notes":"Samsung Internet 12.0 adds internal support only for mapped values"},"webview_android":{"version_added":"79","partial_implementation":true,"notes":"Webview 79 adds internal support only for mapped values"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"internal-value":{"__compat":{"description":"Internal mapping of width and height","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":[{"version_added":"71"},{"version_added":"69","version_removed":"71","flags":[{"type":"preference","name":"layout.css.width-and-height-map-to-aspect-ratio.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"azimuth":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/azimuth","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"backdrop-filter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/backdrop-filter","support":{"chrome":[{"version_added":"76"},{"version_added":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"chrome_android":[{"version_added":"76"},{"version_added":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"edge":{"version_added":"17"},"firefox":{"version_added":"70","flags":[{"type":"preference","name":"layout.css.backdrop-filter.enabled","value_to_set":"true"},{"type":"preference","name":"gfx.webrender.all","value_to_set":"true"}]},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1178765'>bug 1178765</a>."},"ie":{"version_added":false},"opera":{"version_added":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]},"opera_android":[{"version_added":"54"},{"version_added":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"safari":{"prefix":"-webkit-","version_added":"9"},"safari_ios":{"prefix":"-webkit-","version_added":"9"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"76"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"backface-visibility":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/backface-visibility","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":{"prefix":"-webkit-","version_added":"5.1"},"safari_ios":{"prefix":"-webkit-","version_added":"5"},"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-attachment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-attachment","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"local":{"__compat":{"description":"<code>local</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"25"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-blend-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-blend-mode","support":{"chrome":{"version_added":"35"},"chrome_android":{"version_added":"35"},"edge":{"version_added":"79"},"firefox":{"version_added":"30"},"firefox_android":{"version_added":"30"},"ie":{"version_added":false},"opera":{"version_added":"22"},"opera_android":{"version_added":"22"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-clip","support":{"chrome":[{"version_added":"1"},{"version_added":"1","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"1","version_removed":"4","partial_implementation":true,"prefix":"-moz-","notes":"Used the <code>-moz-background-clip: padding | border</code> syntax."}],"firefox_android":[{"version_added":"14"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9","notes":"In IE 7 and IE 8 of Internet Explorer, this property always behaved like <code>background-clip: padding</code> when <code>overflow</code> was <code>hidden</code>, <code>auto</code>, or <code>scroll</code>."},"opera":[{"version_added":"10.5"},{"version_added":"15","version_removed":"51","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"opera_android":[{"version_added":"11"},{"version_added":"14","version_removed":"47","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari":{"version_added":"3","prefix":"-webkit-","notes":"Safari accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."},"safari_ios":{"version_added":"1","prefix":"-webkit-","notes":"Safari accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."},"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"9.0","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"webview_android":[{"version_added":"4.1"},{"version_added":"≤37","version_removed":"64","prefix":"-webkit-","notes":"WebView accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"content-box":{"__compat":{"description":"<code>content-box</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9","notes":"In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"3","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"chrome_android":{"version_added":"18","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"edge":[{"version_added":"15"},{"version_added":"12","partial_implementation":true,"notes":"Before Edge 15, this value was supported with the prefixed version of the property only."}],"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.background-clip-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.background-clip-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"opera_android":{"version_added":"14","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"safari":{"version_added":"4","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"safari_ios":{"version_added":"3.2","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"webview_android":{"version_added":"≤37","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"In Internet Explorer 8 and 9, there is a bug where a computed <code>background-color</code> of <code>transparent</code> causes <code>click</code> events to not get fired on overlaid elements."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."},"firefox_android":{"version_added":"4","notes":"If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"element":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/element","description":"<code>element()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"4","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradients":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gradient","description":"Gradients","support":{"chrome":{"version_added":"1","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"chrome_android":{"version_added":"18","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6","notes":"Some versions support only experimental gradients prefixed with <code>-moz</code>."},"firefox_android":{"version_added":"4","notes":"Some versions support only experimental gradients prefixed with <code>-moz</code>."},"ie":{"version_added":"10"},"opera":{"version_added":"11","notes":"Some versions support only experimental gradients prefixed with <code>-o</code>."},"opera_android":{"version_added":"14","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"safari":{"version_added":"4","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"safari_ios":{"version_added":"3.2","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"samsunginternet_android":{"version_added":"1.0","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"webview_android":{"version_added":"≤37","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image-rect":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-image-rect","description":"<code>image-rect()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"prefix":"-moz-","version_added":"4"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image-set":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-set","description":"<code>image-set()</code>","support":{"chrome":{"prefix":"-webkit-","version_added":"21"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1107646'>bug 1107646</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1107646'>bug 1107646</a>."},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"6","partial_implementation":true,"notes":"Support for <code>url</code> images only and <code>x</code> is the only supported resolution unit. See <a href='https://webkit.org/b/160934'>bug 160934</a>."},"safari_ios":{"prefix":"-webkit-","version_added":"6","partial_implementation":true,"notes":"Support for <code>url</code> images only and <code>x</code> is the only supported resolution unit. See <a href='https://webkit.org/b/160934'>bug 160934</a>."},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_images":{"__compat":{"description":"SVG images","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5","notes":"Support of SVG in CSS background is incomplete."},"safari_ios":{"version_added":"5","notes":"Support of SVG in CSS background is incomplete."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-origin","support":{"chrome":[{"version_added":"1"},{"version_added":"1","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"1","version_removed":"4","partial_implementation":true,"prefix":"-moz-","notes":"Used the <code>-moz-background-clip: padding | border</code> syntax."}],"firefox_android":[{"version_added":"14"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9","notes":"In IE 7 and before, Internet explorer was behaving as if <code>background-origin: border-box</code> was set. In Internet Explorer 8, as if <code>background-origin: padding-box</code>, the regular default value, was set."},"opera":[{"version_added":"10.5"},{"version_added":"15","version_removed":"51","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"opera_android":[{"version_added":"11"},{"version_added":"14","version_removed":"47","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari":[{"version_added":"3"},{"version_added":"3","prefix":"-webkit-","notes":"Webkit accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari_ios":[{"version_added":"1"},{"version_added":"1","prefix":"-webkit-","notes":"Webkit accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"9.0","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"webview_android":[{"version_added":"4.1"},{"version_added":"4.1","version_removed":"64","prefix":"-webkit-","notes":"WebView accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"content-box":{"__compat":{"description":"<code>content-box</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9","notes":"In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>."},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"18"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"two_value_syntax":{"__compat":{"description":"Two-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"2_value_syntax":{"__compat":{"description":"Two-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"4_value_syntax":{"__compat":{"description":"Four-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-repeat","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"round_space":{"__compat":{"description":"<code>round</code> and <code>space</code> keywords","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":[{"version_added":"17"},{"version_added":"10.5","version_removed":"15"}],"opera_android":{"version_added":"18"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"2-value":{"__compat":{"description":"Two-value syntax (different values for x & y directions)","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-size","support":{"chrome":[{"version_added":"3"},{"version_added":"1","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-moz-","version_added":"3.6","version_removed":"4"}],"firefox_android":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10"},{"version_added":"15","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."},{"version_added":"9.5","version_removed":"15","prefix":"-o-","notes":"Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."}],"opera_android":[{"version_added":"10.1"},{"version_added":"14","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."},{"version_added":"10.1","version_removed":"14","prefix":"-o-","notes":"Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"webview_android":[{"version_added":"2.3"},{"version_added":"≤37","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contain_and_cover":{"__compat":{"description":"<code>contain</code> and <code>cover</code>","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"SVG_image_as_background":{"__compat":{"description":"SVG image as background","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-clip":{"__compat":{"description":"Values of <code>background-clip</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"22"},"firefox_android":{"version_added":"22"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-origin":{"__compat":{"description":"Values of <code>background-origin</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"22"},"firefox_android":{"version_added":"22"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-size":{"__compat":{"description":"Values of <code>background-size</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"18"},"ie":{"version_added":"9"},"opera":{"version_added":"21"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"41"},"firefox_android":{"prefix":"-moz-","version_added":"41"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-block-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-color","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a> CSS property that sets the bottom border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a> CSS property that sets the bottom border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-left-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-left-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomleft","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomleft","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-bottomleft</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-bottom-right-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-right-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomright","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomright","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-bottomright</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-bottom-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-collapse":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-collapse","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the following non-standard CSS properties to set the border sides to multiple colors: <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a>"},"firefox_android":{"version_added":"4","notes":"Firefox also supports the following non-standard CSS properties to set the border sides to multiple colors: <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a>"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-end-end-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-end-end-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-end-start-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-end-start-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-outset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-outset","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-repeat","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"round":{"__compat":{"description":"<code>round</code>","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space":{"__compat":{"description":"<code>space</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"12"},"firefox":{"version_added":"50"},"firefox_android":{"version_added":"50"},"ie":{"version_added":"11"},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-image-slice":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-slice","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},"firefox_android":{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"4.1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-source":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-source","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-width","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image","support":{"chrome":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"7"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},{"version_added":"3.5","prefix":"-moz-","notes":"An earlier version of the specification was implemented, prefixed, in Firefox versions prior to 15."},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},{"version_added":"4","prefix":"-moz-","notes":"An earlier version of the specification was implemented, prefixed, in Firefox versions prior to 15."},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":[{"version_added":"11"},{"version_added":"10.5","version_removed":"15","prefix":"-o-"}],"opera_android":[{"version_added":"11"},{"version_added":"11","version_removed":"14","prefix":"-o-"}],"safari":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fill":{"__compat":{"support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradient":{"__compat":{"description":"<code>&lt;gradient&gt;</code>","support":{"chrome":{"version_added":"7"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"29"},"firefox_android":{"version_added":"29"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"optional_border_image_slice":{"__compat":{"description":"optional <code>&lt;border-image-slice&gt;</code>","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-inline-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-color"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-color"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-style"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-style"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-width"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-width"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-start-color"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-start-color"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-start-style"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-start-style"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a> CSS property that sets the bottom border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a> CSS property that sets the bottom border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"14","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-radius","support":{"chrome":[{"version_added":"4","notes":"Chrome ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":{"version_added":"18"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":["Prior to Firefox 50, border styles of rounded corners (with <code>border-radius</code>) were always rendered as if <code>border-style</code> was <code>solid</code>. This has been fixed in Firefox 50.","To conform to the CSS3 standard, Firefox 4 changes the handling of <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> values to match the specification. You can specify an ellipse as a border on an arbitrary sized element with <code>border-radius: 50%;</code>. Firefox 4 also makes rounded corners clip content and images if <a href='https://developer.mozilla.org/docs/Web/CSS/overflow'><code>overflow</code></a><code>: visible</code> is not set."]},{"prefix":"-moz-","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <code>border-radius</code>) were always rendered as if <code>border-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":{"version_added":"10.5","notes":"Before Opera 11.60, replaced elements with <code>border-radius</code> do not have rounded corners."},"opera_android":{"version_added":"11"},"safari":[{"version_added":"5","notes":"Safari ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2","notes":"Safari ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":{"version_added":"1.0"},"webview_android":[{"version_added":"≤37"},{"version_added":"2","prefix":"-webkit-"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_borders":{"__compat":{"description":"Elliptical borders","support":{"chrome":{"version_added":"1","notes":"Before Chrome 4, the slash <code>/</code> notation is unsupported. If two values are specified, then an elliptical border is drawn on all four corners. <code>-webkit-border-radius: 40px 10px;</code> is equivalent to <code>border-radius: 40px / 10px;</code>."},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3","notes":"Before Safari 5, the slash <code>/</code> notation is unsupported. If two values are specified, then an elliptical border is drawn on all four corners. <code>-webkit-border-radius: 40px 10px;</code> is equivalent to <code>border-radius: 40px / 10px;</code>."},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4","notes":"<code>&lt;percentage&gt;</code> values are implemented in a non-standard way prior to Firefox 4. Both horizontal and vertical radii were relative to the width of the border box."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"11.5","notes":"The implementation of <code>&lt;percentage&gt;</code> values was buggy in Opera prior to 11.50."},"opera_android":{"version_added":"11.5"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"4_values_for_4_corners":{"__compat":{"description":"4 values for 4 corners","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-right-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a> CSS property that sets the right border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a> CSS property that sets the right border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"14","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-start-end-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-start-end-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-start-start-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-start-start-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a> CSS property that sets the top border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a> CSS property that sets the top border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-left-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-left-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topleft","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topleft","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-topleft</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-top-right-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-right-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topright","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topright","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-topright</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-top-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-top-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-top-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5","notes":"In Internet Explorer versions before 7, when both <code>top</code> and <code>bottom</code> are specified, the element position is overconstrained and the <code>top</code> property has precedence; the computed value of <code>bottom</code> is set to <code>-top</code>, while its specified value is ignored."},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"box-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-align","support":{"chrome":{"version_added":"1","prefix":"-webkit-"},"chrome_android":{"version_added":"18","prefix":"-webkit-"},"edge":{"version_added":"12","prefix":"-webkit-"},"firefox":[{"version_added":"1","prefix":"-moz-"},{"version_added":"49","prefix":"-webkit-"}],"firefox_android":[{"version_added":"4","prefix":"-moz-"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":false},"opera":{"version_added":"15","prefix":"-webkit-"},"opera_android":{"version_added":"14","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-decoration-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-decoration-break","support":{"chrome":{"prefix":"-webkit-","version_added":"22","notes":"This property is only supported for inline elements."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"This property is only supported for inline elements."},"edge":{"prefix":"-webkit-","version_added":"79","notes":"This property is only supported for inline elements."},"firefox":[{"version_added":"32"},{"alternative_name":"-moz-background-inline-policy","version_added":"1","version_removed":"32"}],"firefox_android":[{"version_added":"32"},{"alternative_name":"-moz-background-inline-policy","version_added":"4","version_removed":"32"}],"ie":{"version_added":false},"opera":[{"prefix":"-webkit-","version_added":"15"},{"version_added":"11.5","version_removed":"15"}],"opera_android":[{"prefix":"-webkit-","version_added":"14"},{"version_added":"11.5","version_removed":"14"}],"safari":{"version_added":"6.1","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"safari_ios":{"version_added":"7","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"webview_android":{"prefix":"-webkit-","version_added":"≤37","notes":"This property is only supported for inline elements."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"box-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-direction","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-flex-group":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-flex-group","support":{"chrome":{"version_added":"1","version_removed":"67","prefix":"-webkit-"},"chrome_android":{"version_added":"18","version_removed":"67","prefix":"-webkit-"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"54","prefix":"-webkit-"},"opera_android":{"version_added":"14","version_removed":"48","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","version_removed":"9.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","version_removed":"67","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-flex":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-flex","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-lines":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-lines","support":{"chrome":{"version_added":"1","version_removed":"67","prefix":"-webkit-"},"chrome_android":{"version_added":"18","version_removed":"67","prefix":"-webkit-"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"54","prefix":"-webkit-"},"opera_android":{"version_added":"14","version_removed":"48","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","version_removed":"9.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","version_removed":"67","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-ordinal-group":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-ordinal-group","support":{"chrome":{"version_added":"1","prefix":"-webkit-"},"chrome_android":{"version_added":"18","prefix":"-webkit-"},"edge":{"version_added":"12","prefix":"-webkit-"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15","prefix":"-webkit-"},"opera_android":{"version_added":"14","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-orient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-orient","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-pack":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-pack","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-shadow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-shadow","support":{"chrome":[{"version_added":"10","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-moz-","version_added":"4","version_removed":"14"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"9","notes":["To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>.","Since version 5.5, Internet Explorer supports Microsoft's <a href='http://msdn.microsoft.com/en-us/library/ms532985%28VS.85,loband%29.aspx'>DropShadow</a> and <a href='http://msdn.microsoft.com/en-us/library/ms533086%28VS.85,loband%29.aspx'>Shadow Filter</a>. You can use this proprietary extension to cast a drop shadow (though the syntax and the effect are different from CSS3)"]},"opera":{"version_added":"10.5","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},"opera_android":[{"version_added":"14","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"5","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"inset":{"__compat":{"description":"<code>inset</code>","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","partial_implementation":true,"notes":["To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>.","<code>inset</code> must be the last keyword in the declaration."]},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_shadows":{"__compat":{"description":"Multiple shadows","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","notes":"To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>."},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"spread_radius":{"__compat":{"description":"Spread radius","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","notes":"To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>."},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"box-sizing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-sizing","support":{"chrome":[{"version_added":"10","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"29"},{"prefix":"-moz-","version_added":"1","notes":"Before Firefox 23, <code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"29"},{"prefix":"-moz-","version_added":"4","notes":"Before Firefox 23, <code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"8","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},"opera":{"version_added":"7"},"opera_android":[{"version_added":"14","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"4","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"padding-box":{"__compat":{"description":"<code>padding-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"50"},"firefox_android":{"version_added":"4","version_removed":"50"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"break-after":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-after","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"avoid-column":{"__compat":{"description":"<code>avoid-column</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column":{"__compat":{"description":"<code>column</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":[{"version_added":"11.1","version_removed":"15"},{"version_added":"37"}],"opera_android":[{"version_added":"11.1","version_removed":"14"},{"version_added":"37"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-after","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"recto":{"__compat":{"description":"<code>recto</code> and <code>verso</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"region_context":{"__compat":{"description":"Supported in CSS Regions","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-after","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"break-before":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-before","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"avoid-column":{"__compat":{"description":"<code>avoid-column</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column":{"__compat":{"description":"<code>column</code>","support":{"chrome":{"version_added":"51"},"chrome_android":{"version_added":"51"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"38"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"51"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-before","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"recto":{"__compat":{"description":"<code>recto</code> and <code>verso</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"region_context":{"__compat":{"description":"Supported in CSS Regions","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-before","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"break-inside":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-inside","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"column":{"__compat":{"description":"<code>column</code> and <code>avoid-column</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"37"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-inside","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"51"},"chrome_android":{"version_added":"51"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"38"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"41"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"51"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"region_context":{"__compat":{"description":"Supported in CSS Regions","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-inside","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"caption-side":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/caption-side","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"non_standard_values":{"__compat":{"description":"Non-standard values <code>left</code>, <code>right</code>, <code>top-outside</code>, and <code>bottom-outside</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"writing-mode_relative_values":{"__compat":{"description":"<code>top</code> and <code>bottom</code> are relative to the <code>writing-mode</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"42"},"firefox_android":{"version_added":"42"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"caret-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/caret-color","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"clear":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clear","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"flow_relative_values":{"__compat":{"description":"Flow-relative values <code>inline-start</code> and <code>inline-end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55"},"firefox_android":{"version_added":"55"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"clip-path":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clip-path","support":{"chrome":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"23"}],"chrome_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12","notes":"Edge only supports clip paths defined by <code>url()</code>."},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10","notes":"Internet Explorer only supports clip paths defined by <code>url()</code>."},"opera":[{"version_added":"42"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"42"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animations":{"__compat":{"description":"Animations","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"42"},"opera_android":{"version_added":"42"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"basic_shape":{"__compat":{"description":"<code>&lt;basic-shape&gt;</code>","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":[{"version_added":"54"},{"version_added":"47","version_removed":"54","flags":[{"type":"preference","name":"layout.css.clip-path-shapes.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"54"},{"version_added":"47","version_removed":"54","flags":[{"type":"preference","name":"layout.css.clip-path-shapes.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fill_and_stroke_box":{"__compat":{"description":"<code>fill-box</code> and <code>stroke-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"51","notes":"This value was supported before Firefox 51, but as an alias to <code>border-box</code>."},"firefox_android":{"version_added":"51","notes":"This value was supported before Firefox 51, but as an alias to <code>border-box</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"html":{"__compat":{"description":"On HTML elements","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"path":{"__compat":{"description":"<code>path()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.clip-path-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"63","flags":[{"type":"preference","name":"layout.css.clip-path-path.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clip","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"Before Internet Explorer 7, Internet Explorer incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1","notes":"Safari incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"safari_ios":{"version_added":"1","notes":"Safari incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"color-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/color-adjust","support":{"chrome":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"},"chrome_android":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"},"edge":{"version_added":"79","alternative_name":"-webkit-print-color-adjust"},"firefox":{"version_added":"48"},"firefox_android":{"version_added":"48"},"ie":{"version_added":false},"opera":{"version_added":"15","alternative_name":"-webkit-print-color-adjust"},"opera_android":{"version_added":"36","alternative_name":"-webkit-print-color-adjust"},"safari":{"version_added":"6","alternative_name":"-webkit-print-color-adjust"},"safari_ios":{"version_added":"6","alternative_name":"-webkit-print-color-adjust"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-print-color-adjust"},"webview_android":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-count":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-count","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-fill":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-fill","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"13","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"14"}],"ie":{"version_added":"10"},"opera":{"version_added":"37"},"opera_android":{"version_added":"37"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"balance-all":{"__compat":{"description":"<code>balance-all</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"column-gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"},{"version_added":"29","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"},{"version_added":"29","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-column-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-column-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-column-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-column-gap"},{"version_added":"28","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-column-gap"},{"version_added":"28","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"12.1"},{"version_added":"10.1","alternative_name":"grid-column-gap"}],"safari_ios":[{"version_added":"12"},{"version_added":"10.3","alternative_name":"grid-column-gap"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-column-gap","version_added":"6.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Before Firefox 3, the default value for the <code>normal</code> keyword was <code>0</code> and not <code>1em</code>."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"11.1","version_removed":"15"}],"opera_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"11.1","version_removed":"14"}],"qq_android":{"version_added":null},"safari":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"3"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"calc_values":{"__compat":{"description":"<code>calc()</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentage_values":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"column-rule-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-color","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-style","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-width","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74","notes":"Before Firefox 3, the default value for the <code>normal</code> keyword was <code>0</code> and not <code>1em</code>."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-span":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-span","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"6"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"71"},{"version_added":"65","flags":[{"type":"preference","name":"layout.css.column-span.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"65","flags":[{"type":"preference","name":"layout.css.column-span.enabled","value_to_set":"true"}]},"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-width","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"4","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"intrinsic_sizes":{"__compat":{"description":"Intrinsic sizes","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/columns","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"50"}],"chrome_android":{"version_added":"50"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"9","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"22","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"contain":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/contain","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"69","notes":"Firefox does not support the <code>style</code> value."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.contain.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"41","flags":[{"type":"preference","name":"layout.css.contain.enabled","value_to_set":"true"}],"notes":"Firefox does not support the <code>style</code> value."},"ie":{"version_added":false},"opera":{"version_added":"40"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/content","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alt_text":{"__compat":{"description":"Alternative text after <code>/</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"element_replacement":{"__compat":{"description":"Element replacement","support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/url","description":"<code>url()</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"counter-increment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-increment","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"counter-reset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-reset","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"counter-set":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-set","support":{"chrome":{"version_added":"85"},"chrome_android":{"version_added":"85"},"edge":{"version_added":"85"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"71"},"opera_android":{"version_added":"60"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"85"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cursor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/cursor","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Starting in Firefox 67, the maximum size allowed for custom cursors is 32x32 pixels due to cursors being misused by certain malicious sites."},"firefox_android":{"version_added":false},"ie":{"version_added":"4","notes":"In Internet Explorer 11, when <code>cursor</code> is applied to an element and this element is underneath an open <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a> menu and the user hovers over a <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a> menu item that's on top of said element, the cursor for said element will be displayed rather than the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a>'s normal cursor. See <a href='https://developer.microsoft.com/microsoft-edge/platform/issues/817822/'>bug 817822</a>."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alias":{"__compat":{"description":"<code>alias</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"all-scroll":{"__compat":{"description":"<code>all-scroll</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bidirectional_resize":{"__compat":{"description":"Bidirectional resize cursors (<code>ew-resize</code>, <code>nesw-resize</code>, <code>ns-resize</code>, and <code>nwse-resize</code>)","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cell":{"__compat":{"description":"<code>cell</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"col-resize":{"__compat":{"description":"<code>col-resize</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"context-menu":{"__compat":{"description":"<code>context-menu</code>","support":{"chrome":{"version_added":"1","notes":"This cursor is only supported on macOS and Linux."},"chrome_android":{"version_added":"18","notes":"This cursor is only supported on macOS and Linux."},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5","notes":"This cursor is only supported on macOS and Linux."},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14","notes":"This cursor is only supported on macOS and Linux."},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0","notes":"This cursor is only supported on macOS and Linux."},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"copy":{"__compat":{"description":"<code>copy</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"crosshair":{"__compat":{"description":"<code>crosshair</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"default":{"__compat":{"description":"<code>default</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grab":{"__compat":{"description":"Grab cursors (<code>grab</code> and <code>grabbing</code>)","support":{"chrome":[{"version_added":"68","notes":"Chrome also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"1","notes":"Chrome 22 added Windows support."}],"chrome_android":[{"version_added":"68","notes":"Chrome also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"18","notes":"Chrome 22 added Windows support."}],"edge":{"version_added":"14"},"firefox":[{"version_added":"27"},{"prefix":"-moz-","version_added":"1.5"}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"55","notes":"Opera also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"15","notes":"Opera 22 added Windows support."}],"opera_android":[{"version_added":"48","notes":"Opera also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"14","notes":"Opera 22 added Windows support."}],"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":[{"version_added":"10.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"help":{"__compat":{"description":"<code>help</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inherit":{"__compat":{"description":"<code>inherit</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"move":{"__compat":{"description":"<code>move</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"no-drop":{"__compat":{"description":"<code>no-drop</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"description":"<code>none</code>","support":{"chrome":{"version_added":"5"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"not-allowed":{"__compat":{"description":"<code>not-allowed</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pointer":{"__compat":{"description":"<code>pointer</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"progress":{"__compat":{"description":"<code>progress</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"row-resize":{"__compat":{"description":"<code>row-resize</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unidirectional_resize":{"__compat":{"description":"Unidirectional resize cursors (<code>n-resize</code>, <code>e-resize</code>, <code>s-resize</code>, <code>w-resize</code>, <code>ne-resize</code>, <code>nw-resize</code>, <code>se-resize</code>, and <code>sw-resize</code>)","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url":{"__compat":{"description":"<code>url()</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5","notes":"Firefox 4 added macOS support."},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url_positioning_syntax":{"__compat":{"description":"<code>url()</code> positioning syntax","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1.5","notes":"Firefox 4 added macOS support."},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"vertical-text":{"__compat":{"description":"<code>vertical-text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"wait":{"__compat":{"description":"<code>wait</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"zoom":{"__compat":{"description":"Zoom cursors (<code>zoom-in</code> and <code>zoom-out</code>)","support":{"chrome":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"24"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"15","version_removed":"23"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14","version_removed":"24"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"custom-property":{"__compat":{"description":"--*","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/--*","support":{"chrome":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"15"},"firefox":[{"version_added":"31"},{"version_added":"29","version_removed":"55","partial_implementation":true,"notes":"From Firefox 29 until Firefox 31, this feature was implemented by the <code>var-variablename</code> syntax.","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"31"},{"version_added":"29","version_removed":"55","partial_implementation":true,"notes":"From Firefox 29 until Firefox 31, this feature was implemented by the <code>var-variablename</code> syntax.","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"49"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"env":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/env","description":"<code>env()</code>","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":[{"version_added":"11.1"},{"version_added":"11","version_removed":"11.1","alternative_name":"constant"}],"safari_ios":[{"version_added":"11.3"},{"version_added":"11","version_removed":"11.3","alternative_name":"constant"}],"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"var":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/var","description":"<code>var()</code>","support":{"chrome":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"15"},"firefox":[{"version_added":"31"},{"version_added":"29","version_removed":"55","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"31"},{"version_added":"29","version_removed":"55","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/direction","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"display":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/display","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contents":{"__compat":{"support":{"chrome":[{"version_added":"65"},{"version_added":"58","version_removed":"65","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"65"},{"version_added":"58","version_removed":"65","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"79"},"firefox":[{"version_added":"37"},{"version_added":"36","version_removed":"53","flags":[{"type":"preference","name":"layout.css.display-contents.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"57"},"ie":{"version_added":false},"opera":[{"version_added":"52"},{"version_added":"45","version_removed":"52","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","version_removed":"47","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"65"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contents_unusual":{"__compat":{"description":"Specific behavior of <a href='https://drafts.csswg.org/css-display/#unbox'>unusual elements</a> when <code>display: contents</code> is applied to them","support":{"chrome":{"version_added":"58"},"chrome_android":{"version_added":"58"},"edge":{"version_added":"79"},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"45"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"65"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"display-outside":{"__compat":{"description":"<code>&lt;display-outside&gt;</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/display-outside","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"run-in":{"__compat":{"support":{"chrome":{"version_added":"1","version_removed":"32","notes":"Before Chrome 4, <code>run-in</code> was not supported before inline elements."},"chrome_android":{"version_added":"18","version_removed":"32"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"7","version_removed":"19"},"opera_android":{"version_added":"10.1","version_removed":"19"},"safari":{"version_added":"1","version_removed":"8","notes":"Before Safari 5, <code>run-in</code> was not supported before inline elements."},"safari_ios":{"version_added":"1","version_removed":"8","notes":"Before Safari 5, <code>run-in</code> was not supported before inline elements."},"samsunginternet_android":{"version_added":"1.0","version_removed":"2.0"},"webview_android":{"version_added":"≤37","version_removed":"≤37"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"flex":{"__compat":{"support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11","partial_implementation":true,"notes":"IE incorrectly positions inline block content inside flex containers. See the <a href='https://answers.microsoft.com/en-us/ie/forum/ie11-iewindows_10/inline-block-content-in-a-flex-container-not/deea64e2-933b-4bd2-a98c-62be16d04b57'>discussion on Microsoft Answers</a>."},{"alternative_name":"-ms-flexbox","version_added":"8","partial_implementation":true,"notes":"IE incorrectly positions inline block content inside flex containers. See the <a href='https://answers.microsoft.com/en-us/ie/forum/ie11-iewindows_10/inline-block-content-in-a-flex-container-not/deea64e2-933b-4bd2-a98c-62be16d04b57'>discussion on Microsoft Answers</a>."}],"opera":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"}],"opera_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flow-root":{"__compat":{"support":{"chrome":{"version_added":"58"},"chrome_android":{"version_added":"58"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"45"},"opera_android":{"version_added":"43"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"58"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid":{"__compat":{"support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":[{"version_added":"16"},{"prefix":"-ms-","version_added":"12"}],"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer implements an older version of the specification."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"notes":"Samsung Internet added this earlier than the corresponding Chrome version would indicate.","version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-block":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"8"},{"version_added":"6","partial_implementation":true,"notes":"Until Internet Explorer 8, <code>inline-block</code> is only for natural inline elements."}],"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-flex":{"__compat":{"support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"alternative_name":"-ms-inline-flexbox","version_added":"8"}],"opera":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-grid":{"__compat":{"support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":[{"version_added":"16"},{"prefix":"-ms-","version_added":"12"}],"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer implements an older version of the specification."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"notes":"Samsung Internet added this earlier than the corresponding Chrome version would indicate.","version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-table":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-item":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"legend-support":{"__compat":{"description":"Supported on <code>&lt;legend&gt;</code>","support":{"chrome":{"version_added":"71"},"chrome_android":{"version_added":"71"},"edge":{"version_added":"79"},"firefox":{"version_added":"64"},"firefox_android":{"version_added":"64"},"ie":{"version_added":false},"opera":{"version_added":"58"},"opera_android":{"version_added":"50"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"71"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"multi-keyword_values":{"__compat":{"description":"Multi-keyword values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"chrome_android":{"version_added":"18","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7","notes":"Opera 52 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"opera_android":{"version_added":"10.1","notes":"Opera Android 47 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"webview_android":{"version_added":"≤37","notes":"WebView 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ruby_values":{"__compat":{"description":"<code>ruby</code>, <code>ruby-base</code>, <code>ruby-base-container</code>, <code>ruby-text</code>, and <code>ruby-text-container</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":[{"version_added":"38"},{"version_added":"34","version_removed":"38","flags":[{"type":"preference","name":"layout.css.ruby.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"38"},{"version_added":"34","version_removed":"38","flags":[{"type":"preference","name":"layout.css.ruby.enabled","value_to_set":"true"}]}],"ie":{"version_added":"7"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"table_values":{"__compat":{"description":"<code>table</code>, <code>table-cell</code>, <code>table-column</code>, <code>table-column-group</code>, <code>table-footer-group</code>, <code>table-header-group</code>, <code>table-row</code>, and <code>table-row-group</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"xul_box_values":{"__compat":{"description":"<code>-moz-box</code> and <code>-moz-inline-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"64","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-box-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"64","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-box-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_deck_values":{"__compat":{"description":"<code>-moz-deck</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_grid_values":{"__compat":{"description":"<code>-moz-grid</code>, <code>-moz-grid-group</code>, and <code>-moz-grid-line</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_inline_grid_stack":{"__compat":{"description":"<code>-moz-inline-grid</code> and <code>-moz-inline-stack</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"Available to Firefox UI code."},{"version_added":"62","version_removed":"70","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_popup_values":{"__compat":{"description":"<code>-moz-popup</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_stack_value":{"__compat":{"description":"<code>-moz-stack</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"empty-cells":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/empty-cells","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"filter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/filter","support":{"chrome":[{"version_added":"53"},{"prefix":"-webkit-","version_added":"18","notes":"In Chrome 18 to 19, the <code>saturate()</code> function only takes integers instead of decimal or percentage values. From Chrome 20, this bug is fixed."}],"chrome_android":{"version_added":"53"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"35"},{"partial_implementation":true,"version_added":"34","flags":[{"type":"preference","name":"layout.css.filters.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"46","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"35"},{"partial_implementation":true,"version_added":"34","flags":[{"type":"preference","name":"layout.css.filters.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"46","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false,"notes":"Internet Explorer 4 to 9 implemented a non-standard <code>filter</code> property. The syntax was completely different from this one and is not documented here."},"opera":[{"version_added":"40"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"41"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"6"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"6"}],"samsunginternet_android":{"version_added":"6.0"},"webview_android":[{"version_added":"53"},{"prefix":"-webkit-","version_added":"4.4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"flex-basis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-basis","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"22","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"22","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"When a non-<code>auto</code> <code>flex-basis</code> is specified, Internet Explorer 10 and 11 always uses a <code>content-box</code> box model to calculate the size of a flex item, even if <a href='https://developer.mozilla.org/docs/Web/CSS/box-sizing'><code>box-sizing: border-box</code></a> is applied to the element. See <a href='https://github.com/philipwalton/flexbugs#7-flex-basis-doesnt-account-for-box-sizingborder-box'>Flexbug #7</a> for more info."},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"22"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"18"},"firefox_android":{"version_added":"18"},"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"content":{"__compat":{"description":"<code>content</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"flex-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-direction","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","partial_implementation":true,"notes":["Since Firefox 28, multi-line flexbox is supported.","Does not support overflow when using <code>*-reverse</code>. See <a href='https://bugzil.la/1042151'>bug 1042151</a> for more info."]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","partial_implementation":true,"notes":["Since Firefox 28, multi-line flexbox is supported.","Does not support overflow when using <code>*-reverse</code>. See <a href='https://bugzil.la/1042151'>bug 1042151</a> for more info."]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-flow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-flow","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-grow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-grow","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","alternative_name":"-ms-flex-positive"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"less_than_zero_animate":{"__compat":{"description":"<0 animate","support":{"chrome":{"version_added":"49"},"chrome_android":{"version_added":"49"},"edge":{"version_added":"79"},"firefox":{"version_added":"32","notes":"Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."},"firefox_android":{"version_added":"32","notes":"Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."},"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"49"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"flex-shrink":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-shrink","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","notes":"Internet Explorer 10 uses <code>0</code> instead of <code>1</code> as the initial value for the <code>flex-shrink</code> property. A workaround is to always set an explicit value for <code>flex-shrink</code>. See <a href='https://github.com/philipwalton/flexbugs#6-the-default-flex-value-has-changed'>Flexbug #6</a> for more info."},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-wrap","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"11","partial_implementation":true,"notes":"Partial support due to large number of bugs present. See <a href='https://github.com/philipwalton/flexbugs'>Flexbugs</a>."},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>.","Until Firefox 61, flex items that are sized according to their content are sized using <a href='https://drafts.csswg.org/css-sizing-3/#column-sizing'><code>fit-content</code>, not <code>max-content</code></a>."]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>.","Until Firefox 61, flex items that are sized according to their content are sized using <a href='https://drafts.csswg.org/css-sizing-3/#column-sizing'>fit-content, not max-content</a>."]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"11","notes":["Internet Explorer 11 ignores uses of <a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> in the <code>flex-basis</code> part of the <code>flex</code> syntax. This can be worked around by using the longhand properties instead of the shorthand. See <a href='https://github.com/philipwalton/flexbugs#8-flex-basis-doesnt-support-calc'>Flexbug #8</a> for more info.","Internet Explorer 11 considers a unitless value in the <code>flex-basis</code> part to be syntactically invalid (and will thus be ignored). A workaround is to always include a unit in the <code>flex-basis</code> part of the <code>flex</code> shorthand value. See <a href='https://github.com/philipwalton/flexbugs#4-flex-shorthand-declarations-with-unitless-flex-basis-values-are-ignored'>Flexbug #4</a> for more info."]},{"prefix":"-ms-","version_added":"10","notes":["Internet Explorer 10 and 11 ignore uses of <a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> in the <code>flex-basis</code> part of the <code>flex</code> syntax. This can be worked around by using the longhand properties instead of the shorthand. See <a href='https://github.com/philipwalton/flexbugs#8-flex-basis-doesnt-support-calc'>Flexbug #8</a> for more info.","Internet Explorer 10 and 11 consider a unitless value in the <code>flex-basis</code> part to be syntactically invalid (and will thus be ignored). A workaround is to always include a unit in the <code>flex-basis</code> part of the <code>flex</code> shorthand value. See <a href='https://github.com/philipwalton/flexbugs#4-flex-shorthand-declarations-with-unitless-flex-basis-values-are-ignored'>Flexbug #4</a> for more info."]}],"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"float":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/float","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"flow_relative_values":{"__compat":{"description":"Flow-relative values <code>inline-start</code> and <code>inline-end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55"},"firefox_android":{"version_added":"55"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-family":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-family","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Not supported on <code>option</code> elements. See <a href='https://bugzil.la/1536148'>bug 1536148</a>."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"system_ui":{"__compat":{"description":"<code>system-ui</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"79"},"firefox":[{"version_added":false},{"alternative_name":"-apple-system","version_added":"43","notes":"Supported on macOS only."}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"alternative_name":"-apple-system","version_added":"9","notes":"Supported since macOS 10.11."},"safari_ios":{"alternative_name":"-apple-system","version_added":"9"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-feature-settings":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-feature-settings","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"16"}],"chrome_android":{"version_added":"48"},"edge":{"version_added":"15"},"firefox":[{"version_added":"34","notes":"The <a href='http://mpeg.chiariglione.org/standards/mpeg-4/open-font-format/text-isoiec-cd-14496-22-3rd-edition' >ISO/IEC CD 14496-22 3rd edition</a> suggests using the <code>ssty</code> feature to provide glyph variants more suitable for use in scripts (for example primes used as superscripts). Starting with Firefox 29, this is done automatically by the <a href='https://developer.mozilla.org/docs/Web/MathML'>MathML</a> rendering engine. The ISO/IEC CD 14496-22 3rd edition also suggests applying the <code>dtls</code> feature to letters when placing mathematical accents to get dotless forms (for example dotless i, j with a hat). Starting with Firefox 35, this is done automatically by the MathML rendering engine. You can override the default values determined by the MathML rendering engine with CSS."},{"prefix":"-moz-","version_added":"15","notes":"From Firefox 4 to Firefox 14 (inclusive), Firefox supported an older, slightly different syntax. See <a href='http://hacks.mozilla.org/2010/11/firefox-4-font-feature-support/'>OpenType Font Feature support in Firefox 4</a>."}],"firefox_android":[{"version_added":"34","notes":"The <a href='http://mpeg.chiariglione.org/standards/mpeg-4/open-font-format/text-isoiec-cd-14496-22-3rd-edition' >ISO/IEC CD 14496-22 3rd edition</a> suggests using the <code>ssty</code> feature to provide glyph variants more suitable for use in scripts (for example primes used as superscripts). Starting with Firefox 29, this is done automatically by the <a href='https://developer.mozilla.org/docs/Web/MathML'>MathML</a> rendering engine. The ISO/IEC CD 14496-22 3rd edition also suggests applying the <code>dtls</code> feature to letters when placing mathematical accents to get dotless forms (for example dotless i, j with a hat). Starting with Firefox 35, this is done automatically by the MathML rendering engine. You can override the default values determined by the MathML rendering engine with CSS."},{"prefix":"-moz-","version_added":"15","notes":"From Firefox 4 to Firefox 14 (inclusive), Firefox supported an older, slightly different syntax. See <a href='http://hacks.mozilla.org/2010/11/firefox-4-font-feature-support/'>OpenType Font Feature support in Firefox 4</a>."}],"ie":{"version_added":"10"},"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"partial_implementation":true,"version_added":"4","version_removed":"6"}],"safari_ios":[{"version_added":"9.3"},{"partial_implementation":true,"version_added":"3.2","version_removed":"6.1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-kerning":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-kerning","support":{"chrome":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"29","version_removed":"33"}],"chrome_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"29","version_removed":"33"}],"edge":{"version_added":"79"},"firefox":[{"version_added":"32"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"32"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"20"},{"prefix":"-webkit-","version_added":"16","version_removed":"20"}],"opera_android":[{"version_added":"20"},{"prefix":"-webkit-","version_added":"16","version_removed":"20"}],"safari":[{"version_added":"9"},{"version_added":"6","prefix":"-webkit-"}],"safari_ios":[{"version_added":"9"},{"version_added":"6","prefix":"-webkit-"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"2.0"}],"webview_android":[{"version_added":"4.4.3"},{"prefix":"-webkit-","version_added":"4.4","version_removed":"4.4.3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-language-override":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-language-override","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"4"}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-optical-sizing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-optical-sizing","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"17"},"firefox":[{"version_added":"62"},{"version_added":"60","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"60","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"66"},"opera_android":{"version_added":false},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-size-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-size-adjust","support":{"chrome":{"version_added":"43","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"chrome_android":{"version_added":"43","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"firefox":[{"version_added":"40"},{"version_added":"3","notes":"Before Firefox 40, <code>font-size-adjust: 0</code> was incorrectly interpreted as <code>font-size-adjust: none</code> (<a href='https://bugzil.la/1144885'>bug 1144885</a>)."},{"version_added":"1","notes":"Before Firefox 3, <code>font-size-adjust</code> was supported on Windows only."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"30","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"opera_android":{"version_added":"30","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-size","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"rem_values":{"__compat":{"description":"<code>rem</code> values","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"42"},"edge":{"version_added":"12"},"firefox":{"version_added":"31","notes":["Before Firefox 57, animations using em units are not affected by changes to the <code>font-size</code> of the animated element's parent (<a href='https://bugzil.la/1254424'>bug 1254424</a>).","Before Firefox 57, some language settings' inherited <code>font-size</code> is smaller than expected (<a href='https://bugzil.la/1391341'>bug 1391341</a>)."]},"firefox_android":{"version_added":"31"},"ie":[{"version_added":"11"},{"partial_implementation":true,"version_added":"9","version_removed":"10"}],"opera":{"version_added":"28"},"opera_android":{"version_added":"28"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"xxx-large":{"__compat":{"description":"<code>xxx-large</code> keyword","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-smooth":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-smooth","support":{"chrome":{"version_added":"5","alternative_name":"-webkit-font-smoothing"},"chrome_android":{"version_added":"18","alternative_name":"-webkit-font-smoothing"},"edge":{"version_added":"79","alternative_name":"-webkit-font-smoothing"},"firefox":{"version_added":"25","alternative_name":"-moz-osx-font-smoothing","notes":"Only works on macOS."},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","alternative_name":"-webkit-font-smoothing"},"opera_android":{"version_added":"14","alternative_name":"-webkit-font-smoothing"},"safari":{"version_added":"4","alternative_name":"-webkit-font-smoothing"},"safari_ios":{"version_added":"3.2","alternative_name":"-webkit-font-smoothing"},"samsunginternet_android":{"alternative_name":"-webkit-font-smoothing","version_added":"1.0"},"webview_android":{"version_added":"≤37","alternative_name":"-webkit-font-smoothing"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"font-stretch":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-stretch","support":{"chrome":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"chrome_android":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"edge":{"version_added":"12"},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":"9"},"opera":{"version_added":"47","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"opera_android":{"version_added":"44","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"webview_android":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"<code>&lt;percentage&gt;</code> syntax","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"18"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 44, <code>oblique</code> was not distinguished from <code>italic</code>."},"firefox_android":{"version_added":"4","notes":"Before Firefox 44, <code>oblique</code> was not distinguished from <code>italic</code>."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"oblique-angle":{"__compat":{"description":"<code>oblique</code> can accept an <code>&lt;angle&gt;</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-synthesis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-synthesis","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"34"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-alternates":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}},"annotation":{"__compat":{"description":"<code>annotation()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#annotation()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"character_variant":{"__compat":{"description":"<code>character-variant()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#character-variant()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"ornaments":{"__compat":{"description":"<code>ornaments()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#ornaments()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"styleset":{"__compat":{"description":"<code>styleset()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#styleset()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"stylistic":{"__compat":{"description":"<code>stylistic()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#stylistic()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"swash":{"__compat":{"description":"<code>swash()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#swash()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"font-variant-caps":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-caps","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-east-asian":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-east-asian","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-ligatures":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-ligatures","support":{"chrome":[{"version_added":"34"},{"prefix":"-webkit-","version_added":"31"}],"chrome_android":{"version_added":"34"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"21"},{"prefix":"-webkit-","version_added":"19"}],"opera_android":[{"version_added":"21"},{"prefix":"-webkit-","version_added":"19"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"version_added":"2.0"},"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"4.4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-numeric":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-numeric","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-position","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"css_fonts_shorthand":{"__compat":{"description":"CSS Fonts Module Level 3 shorthand","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"greek_accented_characters":{"__compat":{"description":"Greek accented characters","support":{"chrome":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"chrome_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"edge":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"firefox":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"firefox_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"opera_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"webview_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkic_is":{"__compat":{"description":"<code>i</code> → <code>İ</code> and <code>ı</code> → <code>I</code>","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"18"},"opera_android":{"version_added":"18"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"uppercase_eszett":{"__compat":{"description":"<code>ß</code> → <code>SS</code>","support":{"chrome":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"chrome_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"edge":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"firefox":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"firefox_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"opera_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"webview_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-variation-settings":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variation-settings","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"17"},"firefox":[{"version_added":"62"},{"version_added":"53","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"53","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11","notes":"Requires macOS 10.13 High Sierra or later."},"safari_ios":{"version_added":"11","notes":"Requires iOS 11 or later."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-weight":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-weight","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"number":{"__compat":{"description":"<code>&lt;number&gt;</code> syntax","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"17"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"font_stretch_support":{"__compat":{"description":"Support for <code>font-stretch</code> values in shorthand","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"system_fonts":{"__compat":{"description":"System fonts","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"},{"version_added":"29","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"},{"version_added":"29","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-gap"},{"version_added":"28","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-gap"},{"version_added":"28","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"10.1","alternative_name":"grid-gap"},{"version_added":"12"}],"safari_ios":[{"version_added":"10.3","alternative_name":"grid-gap"},{"version_added":"12"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-gap","version_added":"7.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"calc_values":{"__compat":{"description":"<code>calc()</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentage_values":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-area":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-area","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-columns","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"12","alternative_name":"-ms-grid-columns"}],"firefox":[{"version_added":"70"},{"version_added":"52","version_removed":"70","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-columns"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-flow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-flow","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-rows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-rows","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"12","alternative_name":"-ms-grid-rows"}],"firefox":[{"version_added":"70"},{"version_added":"52","version_removed":"70","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-rows"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column-end","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column-start","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row-end","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row-start","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-template-areas":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-areas","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-template-columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-columns","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"alternative_name":"-ms-grid-rows","version_added":"12","version_removed":"79"}],"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-columns"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-columns","description":"Animation of tracks","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/fit-content","description":"<code>fit-content()</code>","support":{"chrome":{"version_added":"29"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"51"},"firefox_android":{"version_added":"51"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"minmax":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/minmax","description":"<code>minmax()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/repeat","description":"<code>repeat()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"57","notes":"<code>repeat(auto-fill, ...)</code> and <code>repeat(auto-fit, ...)</code> only support one repeated column (see <a href='https://bugzil.la/1341507'>bug 1341507</a>).","partial_implementation":true},{"version_added":"52","version_removed":"57","notes":"<a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> doesn't work in <code>repeat()</code> (see <a href='https://bugzil.la/1350069'>bug 1350069</a>).","partial_implementation":true},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"subgrid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/CSS_Grid_Layout/Subgrid","description":"<code>subgrid</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"69","notes":"Enabled by default in Firefox Nightly.","flags":[{"type":"preference","name":"layout.css.grid-template-subgrid-value.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-template-rows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-rows","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"alternative_name":"-ms-grid-rows","version_added":"12","version_removed":"79"}],"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-rows"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-rows","description":"Animation of tracks","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/fit-content","description":"<code>fit-content()</code>","support":{"chrome":{"version_added":"29"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"51"},"firefox_android":{"version_added":"51"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"minmax":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/minmax","description":"<code>minmax()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/repeat","description":"<code>repeat()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"57","notes":"<code>repeat(auto-fill, ...)</code> and <code>repeat(auto-fit, ...)</code> only support one repeated column (see <a href='https://bugzil.la/1341507'>bug 1341507</a>).","partial_implementation":true},{"version_added":"52","version_removed":"57","notes":"<a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> doesn't work in <code>repeat()</code> (see <a href='https://bugzil.la/1350069'>bug 1350069</a>).","partial_implementation":true},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"subgrid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/CSS_Grid_Layout/Subgrid","description":"<code>subgrid</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"69","notes":"Enabled by default in Firefox Nightly.","flags":[{"type":"preference","name":"layout.css.grid-template-subgrid-value.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-template":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0","notes":"This was added early so is out of sync with the equivalent Chromium version."},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hanging-punctuation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/hanging-punctuation","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"10","partial_implementation":true,"notes":"The <code>force-end</code> keyword is recognized but has no effect."},"safari_ios":{"version_added":"10","partial_implementation":true,"notes":"The <code>force-end</code> keyword is recognized but has no effect."},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"33"},"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"9"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"9"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"hyphens":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/hyphens","support":{"chrome":[{"partial_implementation":true,"version_added":"55","notes":"<code>auto</code> value is only supported on macOS and Android and for languages the OS provides hyphenation for."},{"prefix":"-webkit-","version_added":"13","notes":"Only <code>-webkit-hyphens: none</code> is supported."}],"chrome_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"prefix":"-ms-","version_added":"12","partial_implementation":true,"notes":"Only works if the specified language is the same as the language of the underlying OS."},"firefox":[{"version_added":"43"},{"prefix":"-moz-","version_added":"6","notes":"Automatic hyphenation only works for languages with hyphenation dictionaries that are integrated into Firefox."}],"firefox_android":[{"version_added":"43"},{"prefix":"-moz-","version_added":"6","notes":"Automatic hyphenation only works for languages with hyphenation dictionaries that are integrated into Firefox."}],"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Only works if the specified language is the same as the language of the underlying OS."},"opera":{"version_added":"44","partial_implementation":true,"notes":"<code>auto</code> value is only supported on macOS and Android."},"opera_android":{"version_added":"43"},"safari":{"prefix":"-webkit-","version_added":"5.1"},"safari_ios":{"prefix":"-webkit-","version_added":"4.2"},"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"afrikaans":{"__compat":{"description":"Hyphenation dictionary for Afrikaans (af, af-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bosnian":{"__compat":{"description":"Hyphenation dictionary for Bosnian, Serbian, and Serbo-Croatian (sh, sh-*, sr, sr-*, bs, bs-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bulgarian":{"__compat":{"description":"Hyphenation dictionary for Bulgarian (bg, bg-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"catalan":{"__compat":{"description":"Hyphenation dictionary for Catalan (ca, ca-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"croatian":{"__compat":{"description":"Hyphenation dictionary for Croatian (hr, hr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"czech":{"__compat":{"description":"Hyphenation dictionary for Czech (cs, cs-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"danish":{"__compat":{"description":"Hyphenation dictionary for Danish (da, da-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"dutch":{"__compat":{"description":"Hyphenation dictionary for Dutch (nl, nl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"english":{"__compat":{"description":"Hyphenation dictionary for English (en, en-*)","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"12"},"firefox":{"version_added":"6","notes":"For English, Firefox uses an en-US dictionary"},"firefox_android":{"version_added":"6","notes":"For English, Firefox uses an en-US dictionary"},"ie":{"version_added":"10"},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"5.1","notes":"For English, Safari uses different en-GB and en-US dictionaries."},"safari_ios":{"version_added":"6","notes":"For English, Safari uses different en-GB and en-US dictionaries."},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"esperanto":{"__compat":{"description":"Hyphenation dictionary for Esperanto (eo, eo-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"estonian":{"__compat":{"description":"Hyphenation dictionary for Estonian (et, et-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"finish":{"__compat":{"description":"Hyphenation dictionary for Finnish (fi, fi-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"french":{"__compat":{"description":"Hyphenation dictionary for French (fr, fr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"galician":{"__compat":{"description":"Hyphenation dictionary for Galician (gl, gl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_reformed_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Reformed Orthography of 1996 (de, de-1996, de-DE, de-AT, de-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_swiss_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Swiss Orthography (de-CH, de-CH-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_traditional_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Traditional Orthography of 1901 (de-1901, de-AT-1901, de-DE-1901)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hungarian":{"__compat":{"description":"Hyphenation dictionary for Hungarian (hu, hu-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"icelandic":{"__compat":{"description":"Hyphenation dictionary for Icelandic (is, is-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"interlingua":{"__compat":{"description":"Hyphenation dictionary for Interlingua (ia, ia-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"italian":{"__compat":{"description":"Hyphenation dictionary for Italian (it, it-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"kurmanji":{"__compat":{"description":"Hyphenation dictionary for Kurmanji (kmr, kmr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"latin":{"__compat":{"description":"Hyphenation dictionary for Latin (la, la-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lithuanian":{"__compat":{"description":"Hyphenation dictionary for Lithuanian (lt, lt-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mongolian":{"__compat":{"description":"Hyphenation dictionary for Mongolian (mn, mn-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"norwegian_nn":{"__compat":{"description":"Hyphenation dictionary for Norwegian (Nynorsk) (nn, nn-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"norwegian_no":{"__compat":{"description":"Hyphenation dictionary for Norwegian (Bokmål) (no, no-*, nb, nb-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"polish":{"__compat":{"description":"Hyphenation dictionary for Polish (pl, pl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"31"},"firefox_android":{"version_added":"31"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"portuguese":{"__compat":{"description":"Hyphenation dictionary for Portuguese (pt, pt-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"portuguese_brazillian":{"__compat":{"description":"Hyphenation dictionary for Brazilian Portuguese (pt-BR)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8","notes":"For Brazilian Portuguese, Firefox uses a Portuguese dictionary."},"firefox_android":{"version_added":"8","notes":"For Brazilian Portuguese, Firefox uses a Portuguese dictionary."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"russian":{"__compat":{"description":"Hyphenation dictionary for Russian (ru, ru-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"slovenian":{"__compat":{"description":"Hyphenation dictionary for Slovenian (sl, sl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"spanish":{"__compat":{"description":"Hyphenation dictionary for Spanish (es, es-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"swedish":{"__compat":{"description":"Hyphenation dictionary for Swedish (sv, sv-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkish":{"__compat":{"description":"Hyphenation dictionary for Turkish (tr, tr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ukrainian":{"__compat":{"description":"Hyphenation dictionary for Ukrainian (uk, uk-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper_sorbian":{"__compat":{"description":"Hyphenation dictionary for Upper Sorbian (hsb, hsb-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"welsh":{"__compat":{"description":"Hyphenation dictionary for Welsh (cy, cy-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"image-orientation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-orientation","support":{"chrome":{"version_added":"81"},"chrome_android":{"version_added":"81"},"edge":{"version_added":"81"},"firefox":{"version_added":"26"},"firefox_android":{"version_added":"26"},"ie":{"version_added":false},"opera":{"version_added":"67"},"opera_android":{"version_added":false},"safari":{"version_added":"13.1"},"safari_ios":{"version_added":"13.4"},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"81"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"flip_and_angle":{"__compat":{"description":"<code>flip</code> &amp; <code>&lt;angle&gt;</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"26","version_removed":"63"},"firefox_android":{"version_added":"26","version_removed":"63"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"image-rendering":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-rendering","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"crisp-edges":{"__compat":{"support":{"chrome":{"alternative_name":"-webkit-optimize-contrast","version_added":"13"},"chrome_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"18"},"edge":{"alternative_name":"-webkit-optimize-contrast","version_added":"79"},"firefox":[{"version_added":"65"},{"prefix":"-moz-","version_added":"3.6"}],"firefox_android":[{"version_added":"65"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-optimize-contrast","version_added":"15"},"opera_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"14"},"safari":{"alternative_name":"-webkit-optimize-contrast","version_added":"6"},"safari_ios":{"alternative_name":"-webkit-optimize-contrast","version_added":"6"},"samsunginternet_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"1.0"},"webview_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"optimizeQuality":{"__compat":{"support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"optimizeSpeed":{"__compat":{"support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"pixelated":{"__compat":{"support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"26"},"opera_android":{"version_added":"26"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"ime-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ime-mode","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":[{"version_added":"12","version_removed":"79"},{"prefix":"-ms-","version_added":"12","version_removed":"79"}],"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"initial-letter-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/initial-letter-align","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"initial-letter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/initial-letter","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1223880'>bug 1223880</a>"},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1223880'>bug 1223880</a>"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"38"},"firefox_android":{"prefix":"-moz-","version_added":"38"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"inset-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block-end","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block-start","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline-end","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline-start","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"isolation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/isolation","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":{"version_added":"30"},"opera_android":{"version_added":"30"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"justify-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-content","support":{"chrome":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Before Firefox 27, Firefox supported only single-line flexbox."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Before Firefox 27, Firefox supported only single-line flexbox."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"6.0"},{"partial_implementation":true,"version_added":"2.0","notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"52"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"firefox_android":{"version_added":"45","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"firefox_android":{"version_added":"52","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space-evenly":{"__compat":{"description":"<code>space-evenly</code>","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-content","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"justify-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-items","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"12"},"firefox":{"version_added":"20"},"firefox_android":{"version_added":"20"},"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-items","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"justify-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer 10 and 11 have the property <code>-ms-grid-column-align</code>, which acts in a similar way to <code>justify-self</code>."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"letter-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/letter-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"SVG support","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"72"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"line-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-break","support":{"chrome":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"14"},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":[{"version_added":"5.5"},{"prefix":"-ms-","version_added":"8"}],"opera":[{"version_added":"45"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"11"},{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":[{"version_added":"11"},{"version_added":"1","prefix":"-webkit-"}],"samsunginternet_android":[{"version_added":"7.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"line-height-step":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-height-step","support":{"chrome":{"version_added":"60","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"chrome_android":{"version_added":"60","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"edge":{"version_added":"79","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"47","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"opera_android":{"version_added":"44","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"line-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"-moz-block-height":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"list-style-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-style-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-style-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-type","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"afar":{"__compat":{"description":"<code>afar</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"amharic":{"__compat":{"description":"<code>amaric</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"amharic-abegede":{"__compat":{"description":"<code>amaric-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"arabic-indic":{"__compat":{"description":"<code>arabic-indic</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"armenian":{"__compat":{"description":"<code>armenian</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"asterisks":{"__compat":{"description":"<code>asterisks</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bengali":{"__compat":{"description":"<code>bengali</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"binary":{"__compat":{"description":"<code>binary</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cambodian":{"__compat":{"description":"<code>cambodian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"circle":{"__compat":{"description":"<code>circle</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-decimal":{"__compat":{"description":"<code>cjk-decimal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-earthly-branch":{"__compat":{"description":"<code>cjk-earthly-branch</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-heavenly-stem":{"__compat":{"description":"<code>cjk-heavenly-stem</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-ideographic":{"__compat":{"description":"<code>cjk-ideographic</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":[{"version_added":"15"},{"version_added":"7","partial_implementation":true,"notes":"Until version 15, only decimal numbers display."}],"opera_android":[{"version_added":"14"},{"version_added":"10.1","partial_implementation":true,"notes":"Until version 15, only decimal numbers display."}],"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"decimal":{"__compat":{"description":"<code>decimal</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"decimal-leading-zero":{"__compat":{"description":"<code>decimal-leading-zero</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"8"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"devanagari":{"__compat":{"description":"<code>devanagari</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disc":{"__compat":{"description":"<code>disc</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disclosure-closed":{"__compat":{"description":"<code>disclosure-closed</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disclosure-open":{"__compat":{"description":"<code>disclosure-open</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic":{"__compat":{"description":"<code>ethiopic</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede":{"__compat":{"description":"<code>ethiopic-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-am-et":{"__compat":{"description":"<code>ethiopic-abegede-am-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-gez":{"__compat":{"description":"<code>ethiopic-abegede-gez</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-ti-er":{"__compat":{"description":"<code>ethiopic-abegede-ti-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-ti-et":{"__compat":{"description":"<code>ethiopic-abegede-ti-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame":{"__compat":{"description":"<code>ethiopic-halehame</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-aa-er":{"__compat":{"description":"<code>ethiopic-halehame-aa-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-aa-et":{"__compat":{"description":"<code>ethiopic-halehame-aa-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-am":{"__compat":{"description":"<code>ethiopic-halehame-am</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-am-et":{"__compat":{"description":"<code>ethiopic-halehame-am-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-gez":{"__compat":{"description":"<code>ethiopic-halehame-gez</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-om-et":{"__compat":{"description":"<code>ethiopic-halehame-om-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-sid-et":{"__compat":{"description":"<code>ethiopic-halehame-sid-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-so-et":{"__compat":{"description":"<code>ethiopic-halehame-so-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-ti-er":{"__compat":{"description":"<code>ethiopic-halehame-ti-er</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-ti-et":{"__compat":{"description":"<code>ethiopic-halehame-ti-et</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-tig":{"__compat":{"description":"<code>ethiopic-halehame-tig</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-numeric":{"__compat":{"description":"<code>ethiopic-numeric</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"33","notes":"Before Firefox 38, Firefox added a dot as suffix of the number for <code>ethiopic-numeric</code> (for example, �. instead of �). The specification later defined the absence of a suffix, which Firefox 38 followed."},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33","notes":"Before Firefox 38, Firefox added a dot as suffix of the number for <code>ethiopic-numeric</code> (for example, �. instead of �). The specification later defined the absence of a suffix, which Firefox 38 followed."},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"footnotes":{"__compat":{"description":"<code>footnotes</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"georgian":{"__compat":{"description":"<code>georgian</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gujarati":{"__compat":{"description":"<code>gujarati</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gurmukhi":{"__compat":{"description":"<code>gurmukhi</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hangul":{"__compat":{"description":"<code>hangul</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hangul-consonant":{"__compat":{"description":"<code>hangul-consonant</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hebrew":{"__compat":{"description":"<code>hebrew</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hiragana":{"__compat":{"description":"<code>hiragana</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hiragana-iroha":{"__compat":{"description":"<code>hiragana-iroha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"japanese-formal":{"__compat":{"description":"<code>japanese-formal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"japanese-informal":{"__compat":{"description":"<code>japanese-informal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"kannada":{"__compat":{"description":"<code>kannada</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"katakana":{"__compat":{"description":"<code>katakana</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"katakana-iroha":{"__compat":{"description":"<code>katakana-iroha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"khmer":{"__compat":{"description":"<code>khmer</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hangul-formal":{"__compat":{"description":"<code>korean-hangul-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hanja-formal":{"__compat":{"description":"<code>korean-hanja-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hanja-informal":{"__compat":{"description":"<code>korean-hanja-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lao":{"__compat":{"description":"<code>lao</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-alpha":{"__compat":{"description":"<code>lower-alpha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-armenian":{"__compat":{"description":"<code>lower-armenian</code>","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-greek":{"__compat":{"description":"<code>lower-greek</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-hexadecimal":{"__compat":{"description":"<code>lower-hexadecimal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-latin":{"__compat":{"description":"<code>lower-latin</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-norwegian":{"__compat":{"description":"<code>lower-norwegian</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-roman":{"__compat":{"description":"<code>lower-roman</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"malayalam":{"__compat":{"description":"<code>malayalam</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mongolian":{"__compat":{"description":"<code>mongolian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"myanmar":{"__compat":{"description":"<code>myanmar</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"octal":{"__compat":{"description":"<code>octal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"oriya":{"__compat":{"description":"<code>oriya</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"oromo":{"__compat":{"description":"<code>oromo</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"persian":{"__compat":{"description":"<code>persian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sidama":{"__compat":{"description":"<code>sidama</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"simp-chinese-formal":{"__compat":{"description":"<code>simp-chinese-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"simp-chinese-informal":{"__compat":{"description":"<code>simp-chinese-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"somali":{"__compat":{"description":"<code>somali</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"square":{"__compat":{"description":"<code>square</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"<code>&lt;string&gt;</code>","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":{"version_added":"39"},"firefox_android":{"version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":"66"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"symbols":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/symbols","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tamil":{"__compat":{"description":"<code>tamil</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"telugu":{"__compat":{"description":"<code>telugu</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"thai":{"__compat":{"description":"<code>thai</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tibetan":{"__compat":{"description":"<code>tibetan</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigre":{"__compat":{"description":"<code>tigre</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-er":{"__compat":{"description":"<code>tigrinya-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-er-abegede":{"__compat":{"description":"<code>tigrinya-er-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-et":{"__compat":{"description":"<code>tigrinya-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-et-abegede":{"__compat":{"description":"<code>tigrinya-et-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"trad-chinese-formal":{"__compat":{"description":"<code>trad-chinese-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"trad-chinese-informal":{"__compat":{"description":"<code>trad-chinese-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-alpha":{"__compat":{"description":"<code>upper-alpha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-armenian":{"__compat":{"description":"<code>upper-armenian</code>","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-greek":{"__compat":{"description":"<code>upper-greek</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-hexadecimal":{"__compat":{"description":"<code>upper-hexadecimal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-latin":{"__compat":{"description":"<code>upper-latin</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-norwegian":{"__compat":{"description":"<code>upper-norwegian</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-roman":{"__compat":{"description":"<code>upper-roman</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"urdu":{"__compat":{"description":"<code>urdu</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"33"},"firefox_android":{"prefix":"-moz-","version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"list-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"symbols":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/symbols","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline-end","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-end"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-margin-end"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-margin-end"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-margin-end"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-margin-end"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-margin-end"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-margin-end"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-margin-end"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-margin-end"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-margin-end","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-end"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline-start","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-start"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-margin-start"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-margin-start"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-margin-start"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-margin-start"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-margin-start"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-margin-start"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-margin-start"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-margin-start"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-margin-start","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-start"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-trim":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-trim","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1506241'>bug 1506241</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1506241'>bug 1506241</a>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-clip","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"border":{"__compat":{"description":"<code>border<code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"content":{"__compat":{"description":"<code>content</content>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"padding":{"__compat":{"description":"<code>padding</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"mask-composite":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-composite","support":{"chrome":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"chrome_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"edge":{"version_added":"18","version_removed":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"opera_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"safari":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"safari_ios":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"samsunginternet_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"webview_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-image","support":{"chrome":{"prefix":"-webkit-","version_added":"1","notes":"From version 8, Chrome added support for gradient values. Initially, Chrome supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"From version 8, Chrome added support for gradient values. Initially, Chrome supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"edge":{"version_added":"16"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4","notes":"Initially, Safari supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"safari_ios":{"prefix":"-webkit-","version_added":"3.2","notes":"Initially, Safari supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"2","notes":"Initially, Android supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_mask_images":{"__compat":{"description":"Multiple mask images","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_masks":{"__compat":{"description":"SVG masks","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-mode","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-origin","support":{"chrome":{"prefix":"-webkit-","version_added":"1","notes":"The <code>margin-box</code> value is unsupported."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"The <code>margin-box</code> value is unsupported."},"edge":{"prefix":"-webkit-","version_added":"79","notes":"The <code>margin-box</code> value is unsupported."},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15","notes":"The <code>margin-box</code> value is unsupported."},"opera_android":{"prefix":"-webkit-","version_added":"14","notes":"The <code>margin-box</code> value is unsupported."},"safari":{"prefix":"-webkit-","version_added":"4","notes":"The <code>margin-box</code> value is unsupported."},"safari_ios":{"prefix":"-webkit-","version_added":"3.2","notes":"The <code>margin-box</code> value is unsupported."},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0","notes":"The <code>margin-box</code> value is unsupported."},"webview_android":{"prefix":"-webkit-","version_added":"2","notes":"The <code>margin-box</code> value is unsupported."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fill-box":{"__compat":{"description":"<code>fill-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"non_standard_values":{"__compat":{"description":"Non-standard values <code>content</code>, <code>padding</code>, <code>border</code>","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"stroke-box":{"__compat":{"description":"<code>stroke-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"view-box":{"__compat":{"description":"<code>view-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-position","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":{"prefix":"-webkit-","version_added":"1","version_removed":"68"},"chrome_android":{"prefix":"-webkit-","version_added":"18","version_removed":"68"},"edge":{"version_added":"18","version_removed":"79"},"firefox":[{"version_added":"53","version_removed":"70"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15","version_removed":"55"},"opera_android":{"prefix":"-webkit-","version_added":"14","version_removed":"48"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0","version_removed":"10.0"},"webview_android":{"prefix":"-webkit-","version_added":"2","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-repeat","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-size","support":{"chrome":{"prefix":"-webkit-","version_added":"4"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-type","support":{"chrome":{"version_added":"24"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":[{"version_added":"35"},{"version_added":"20","version_removed":"52","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"35"},{"version_added":"20","version_removed":"52","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask","support":{"chrome":[{"version_added":"1","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"1","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"chrome_android":[{"version_added":"18","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"18","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"edge":{"version_added":"12"},"firefox":{"version_added":"2","notes":"From Firefox 10, the default color space when handling masks is sRGB. Previously, the default and only supported color space was linear RGB. This changes the appearance of mask effects, but brings Firefox into compliance with the second edition of the SVG 1.1 specification."},"firefox_android":{"version_added":"4","notes":"From Firefox 10, the default color space when handling masks is sRGB. Previously, the default and only supported color space was linear RGB. This changes the appearance of mask effects, but brings Firefox into compliance with the second edition of the SVG 1.1 specification."},"ie":{"version_added":false},"opera":[{"version_added":"15","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"15","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"opera_android":[{"version_added":"14","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"14","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"safari":[{"version_added":"3.2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"3.2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"safari_ios":[{"version_added":"3.2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"3.2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"samsunginternet_android":[{"version_added":"1.0","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"1.0","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"webview_android":[{"version_added":"2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"max-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-height","support":{"chrome":{"version_added":"18"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>max-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-height</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"7"},"opera":{"version_added":"7","notes":"CSS 2.1 leaves the behavior of <code>max-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>max-height</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"partial_implementation":true,"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"partial_implementation":true,"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"max-inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"10.1"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"10.3"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"38"},"firefox_android":{"prefix":"-moz-","version_added":"38"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"max-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-width</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-width</code> to <code>table</code> elements."},"ie":{"version_added":"7"},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>max-width</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"partial_implementation":true,"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"partial_implementation":true,"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"min-block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"min-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-height</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-height</code> to <code>table</code> elements."},"ie":{"version_added":"7","notes":"In Internet Explorer 10 and 11, a <code>min-height</code> declaration on a column-direction flex container doesn't apply to the container's flex items. See <a href='https://github.com/philipwalton/flexbugs#3-min-height-on-a-column-flex-container-wont-apply-to-its-flex-items'>Flexbug #3</a> for more info."},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>min-height</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later used <code>auto</code> as the initial value for <code>min-height</code>."},"firefox_android":{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later used <code>auto</code> as the initial value for <code>min-height</code>."},"ie":{"version_added":false},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"9"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"9"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"1.5"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"min-inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"41"},"firefox_android":{"prefix":"-moz-","version_added":"41"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"min-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-width</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-width</code> to <code>table</code> elements."},"ie":{"version_added":"7"},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>min-width</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"21","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."},"chrome_android":{"version_added":"25","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."},"edge":{"version_added":"12","notes":"Edge uses <code>auto</code> as the initial value for <code>min-width</code>."},"firefox":[{"version_added":"34"},{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later (until the value was removed), used <code>auto</code> as the initial value for <code>min-width</code>."}],"firefox_android":[{"version_added":"34"},{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later (until the value was removed), used <code>auto</code> as the initial value for <code>min-width</code>."}],"ie":{"version_added":false},"opera":{"version_added":"12.1","notes":"Opera uses <code>auto</code> as the initial value for <code>min-width</code>."},"opera_android":{"version_added":"14","notes":"Opera uses <code>auto</code> as the initial value for <code>min-width</code>."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","notes":"Samsung Internet uses <code>auto</code> as the initial value for <code>min-width</code>."},"webview_android":{"version_added":"37","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"min-intrinsic","version_added":"25","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"min-intrinsic","version_added":"25","version_removed":"48"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"≤15"},{"alternative_name":"min-intrinsic","version_added":"≤15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"≤14"},{"alternative_name":"min-intrinsic","version_added":"≤14","version_removed":"35"}],"safari":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"},{"alternative_name":"min-intrinsic","version_added":"1.5","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"},{"alternative_name":"min-intrinsic","version_added":"≤37","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"mix-blend-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mix-blend-mode","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":"32"},"firefox_android":{"version_added":"32"},"ie":{"version_added":false},"opera":{"version_added":"28"},"opera_android":{"version_added":"28"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":false},"edge":{"version_added":"79"},"firefox":{"version_added":"32"},"firefox_android":{"version_added":"32"},"ie":{"version_added":false},"opera":{"version_added":"28"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"object-fit":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/object-fit","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"16","notes":"Edge supports <code>object-fit</code> on <code>img</code> elements only. <a href='https://developer.microsoft.com/microsoft-edge/platform/issues/13603873/#comment-0'>See Edge issue 13603873 for details</a>."},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"object-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/object-position","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"16"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":{"version_added":"31","version_removed":"68"},"chrome_android":{"version_added":"31","version_removed":"68"},"edge":{"version_added":"16","version_removed":"79"},"firefox":{"version_added":"36","version_removed":"70"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19","version_removed":"55"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19","version_removed":"48"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0","version_removed":"10.0"},"webview_android":{"version_added":"4.4.3","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"offset-anchor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-anchor","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":[{"version_added":"72"},{"version_added":"70","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset-distance":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-distance","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion-distance","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"69","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"42"},{"alternative_name":"motion-distance","version_added":"33"}],"opera_android":[{"version_added":"42"},{"alternative_name":"motion-distance","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"motion-distance","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset-path":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-path","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion-path","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"63","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"63","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":[{"version_added":"45"},{"alternative_name":"motion-path","version_added":"32"}],"opera_android":[{"version_added":"43"},{"alternative_name":"motion-path","version_added":"32"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0","notes":"<code>path()</code> is the only value type supported."},{"alternative_name":"motion-path","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"path-support":{"__compat":{"description":"Supports the <code>path()</code> function as a value","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ray-support":{"__compat":{"description":"Supports the <code>ray()</code> function as a value","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"71","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"offset-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-position","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"offset-rotate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-rotate","support":{"chrome":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}],"chrome_android":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"offset-rotation","version_added":"79"},{"alternative_name":"motion-rotation","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"69","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"43"},{"alternative_name":"offset-rotation","version_added":"42"},{"alternative_name":"motion-rotation","version_added":"33"}],"opera_android":[{"version_added":"43"},{"alternative_name":"offset-rotation","version_added":"42"},{"alternative_name":"motion-rotation","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"offset-rotation","version_added":"6.0"},{"alternative_name":"motion-rotation","version_added":"5.0"}],"webview_android":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"71","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"42"},{"alternative_name":"motion","version_added":"33"}],"opera_android":[{"version_added":"42"},{"alternative_name":"motion","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"motion","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"opacity":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/opacity","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1"},{"prefix":"-moz-","version_added":"1","version_removed":"3.5"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9"},"opera_android":{"version_added":"10.1"},"safari":[{"version_added":"2"},{"version_added":"1.1","version_removed":"2","prefix":"-khtml-"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"Support for percentage opacity values","support":{"chrome":{"version_added":"78"},"chrome_android":{"version_added":"78"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"78"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"order":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/order","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"prefix":"-ms-","version_added":"10"}],"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"orphans":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/orphans","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"invert":{"__compat":{"description":"<code>invert</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_removed":"3","version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"7","version_removed":"15"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"outline-offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-offset","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"outline-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5","notes":"Firefox includes absolutely positioned elements inside the outline (see <a href='https://bugzil.la/687311'>bug 687311</a>)."},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-anchor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-anchor","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-block","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-clip-box-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box-block","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"overflow-clip-box-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"overflow-clip-box":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"29"},"firefox_android":{"version_added":"29"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"shorthand":{"__compat":{"description":"Two values; property as shorthand","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"overflow-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-wrap","support":{"chrome":[{"version_added":"23"},{"alternative_name":"word-wrap","version_added":"1"}],"chrome_android":[{"version_added":"25"},{"alternative_name":"word-wrap","version_added":"18"}],"edge":[{"version_added":"18"},{"alternative_name":"word-wrap","version_added":"12"}],"firefox":[{"version_added":"49"},{"alternative_name":"word-wrap","version_added":"3.5"}],"firefox_android":[{"version_added":"49"},{"alternative_name":"word-wrap","version_added":"4"}],"ie":{"alternative_name":"word-wrap","version_added":"5.5"},"opera":[{"version_added":"12.1"},{"alternative_name":"word-wrap","version_added":"10.5"}],"opera_android":[{"version_added":"12.1"},{"alternative_name":"word-wrap","version_added":"11"}],"safari":[{"version_added":"6.1"},{"alternative_name":"word-wrap","version_added":"1"}],"safari_ios":[{"version_added":"7"},{"alternative_name":"word-wrap","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.5"},{"alternative_name":"word-wrap","version_added":"1.0"}],"webview_android":[{"version_added":"4.4"},{"alternative_name":"word-wrap","version_added":"1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"anywhere":{"__compat":{"description":"<code>anywhere</code>","support":{"chrome":{"version_added":"80"},"chrome_android":{"version_added":"80"},"edge":{"version_added":"80"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"67"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"80"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"break-word":{"__compat":{"description":"<code>break-word</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"overflow-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"3.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"overflow-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"3.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"overflow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"After Firefox 3.6, the <code>overflow</code> property is correctly applied to table group elements (<code>&lt;thead&gt;</code>, <code>&lt;tbody&gt;</code>, <code>&lt;tfoot&gt;</code>)."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"From version 4 to 6, Internet Explorer enlarges an element with <code>overflow: visible</code> (default value) to fit the content inside it. <code>height</code> and <code>width</code> behave like <code>min-height</code> and <code>min-width</code>, respectively."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"1.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"multiple_keywords":{"__compat":{"description":"Multiple keyword syntax for <code>overflow-x</code> and <code>overflow-y</code>","support":{"chrome":{"version_added":"68"},"chrome_android":{"version_added":"68"},"edge":{"version_added":"79"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"55"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"overscroll-behavior-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-block","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"73"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-inline","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"73"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-x","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-y","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline-end","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-end"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-padding-end"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-padding-end"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-padding-end"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-padding-end"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-padding-end"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-padding-end"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-padding-end"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-padding-end"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-padding-end","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-end"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline-start","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-start"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-padding-start"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-padding-start"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-padding-start"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-padding-start"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-padding-start"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-padding-start"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-padding-start"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-padding-start"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-padding-start","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-start"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline","support":{"chrome":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"chrome_android":{"version_added":"69","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Experimental Web Platform features","value_to_set":"Enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-after":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-after","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"firefox_android":{"version_added":"4","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-before":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-before","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"firefox_android":{"version_added":"4","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-inside":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-inside","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"19","notes":"Until Firefox 25, <code>page-break-inside</code><code>: avoid</code> did not work with the height of a block."},"firefox_android":{"version_added":"19","notes":"Until Firefox 25, <code>page-break-inside</code><code>: avoid</code> did not work with the height of a block."},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"paint-order":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/paint-order","support":{"chrome":{"version_added":"35"},"chrome_android":{"version_added":"35"},"edge":{"version_added":"17"},"firefox":{"version_added":"60"},"firefox_android":{"version_added":"60"},"ie":{"version_added":false},"opera":{"version_added":"22"},"opera_android":{"version_added":"22"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"perspective-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/perspective-origin","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":[{"version_added":"36","version_removed":"68"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36","version_removed":"68"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12","version_removed":"79"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16","version_removed":"70"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":{"prefix":"-webkit-","version_added":"15","version_removed":"55"},"opera_android":{"prefix":"-webkit-","version_added":"14","version_removed":"48"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0","version_removed":"10.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37","version_removed":"68"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"perspective":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/perspective","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"place-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-content","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"firefox_android":{"version_added":"45","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-content","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"53","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"firefox_android":{"version_added":"53","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"place-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-items","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-items","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"place-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-self","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-self","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"pointer-events":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/pointer-events","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"11"},"opera":{"version_added":"9"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"html_elements":{"__compat":{"description":"Applies to HTML elements","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":["Before Firefox 57, absolute positioning did not work correctly when applied to elements inside tables that have <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> applied to them (<a href='https://bugzil.la/1379306'>bug 1379306</a>).","Before Firefox 30, absolute positioning of table rows and row groups was not supported (<a href='https://bugzil.la/63895'>bug 63895</a>)."]},"firefox_android":{"version_added":"4","notes":["Before Firefox 57, absolute positioning did not work correctly when applied to elements inside tables that have <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> applied to them (<a href='https://bugzil.la/1379306'>bug 1379306</a>).","Before Firefox 30, absolute positioning of table rows and row groups was not supported (<a href='https://bugzil.la/63895'>bug 63895</a>)."]},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"absolutely_positioned_flex_children":{"__compat":{"description":"Absolutely-positioned flex children","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"12"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"10"},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fixed":{"__compat":{"description":"<code>fixed</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 44, <code>position: fixed</code> didn't create a stacking context in most cases. Firefox and the specification have been modified to mimic Chrome and Safari's long-time behavior."},"firefox_android":{"version_added":"4","notes":"Before Firefox 44, <code>position: fixed</code> didn't create a stacking context in most cases. Firefox and the specification have been modified to mimic Chrome and Safari's long-time behavior."},"ie":{"version_added":"7","notes":"In Internet Explorer, fixed positioning doesn't work if the document is in <a href='https://developer.mozilla.org/docs/Web/HTML/Quirks_Mode_and_Standards_Mode'>quirks mode</a>."},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"position_sticky_table_elements":{"__compat":{"description":"Table elements as <code>sticky</code> positioning containers","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"16"},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sticky":{"__compat":{"description":"<code>sticky</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"16"},"firefox":[{"version_added":"32"},{"version_added":"26","version_removed":"48","flags":[{"type":"preference","name":"layout.css.sticky.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"32"},{"version_added":"26","version_removed":"48","flags":[{"type":"preference","name":"layout.css.sticky.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"prefix":"-webkit-","version_added":"6.1"},"safari_ios":{"prefix":"-webkit-","version_added":"6.1"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"quotes":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/quotes","support":{"chrome":{"version_added":"11"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"quotes_auto":{"__compat":{"description":"<code>auto</code> keyword","support":{"chrome":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"chrome_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"edge":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"opera":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"opera_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"safari":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"safari_ios":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"samsunginternet_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"webview_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"resize":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/resize","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"block_level_support":{"__compat":{"description":"Support on block level, replaced, table cell, or inline block elements","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"5","notes":"<code>resize</code> doesn't have any effect on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/iframe'><code>&lt;iframe&gt;</code></a>. See <a href='https://bugzil.la/680823'>bug 680823</a>)"},"firefox_android":{"version_added":"5","notes":"<code>resize</code> doesn't have any effect on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/iframe'><code>&lt;iframe&gt;</code></a>. See <a href='https://bugzil.la/680823'>bug 680823</a>)"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flow_relative_support":{"__compat":{"description":"Support for flow-relative values <code>block</code> and <code>inline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"rotate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/rotate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"x_y_z_angle":{"__compat":{"description":"x, y, or z axis name plus angle value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"65","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"65","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"row-gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/row-gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/row-gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"},{"version_added":"29","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-row-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-row-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-row-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-row-gap"},{"version_added":"28","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-row-gap"},{"version_added":"28","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"12.1"},{"version_added":"10.1","alternative_name":"grid-row-gap"}],"safari_ios":[{"version_added":"12"},{"version_added":"10.3","alternative_name":"grid-row-gap"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-row-gap","version_added":"6.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"ruby-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ruby-align","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"38"},"firefox_android":{"version_added":"38"},"ie":{"version_added":false,"notes":"Internet Explorer 9 and later supports an earlier draft of CSS Ruby with non-standard values for this property: <code>auto</code>, <code>left</code>, <code>center</code>, <code>right</code>, <code>distribute-letter</code>, <code>distribute-space</code>, and <code>line-edge</code>."},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"ruby-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ruby-position","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"38"},"firefox_android":{"version_added":"38"},"ie":{"version_added":false,"notes":"Internet Explorer 9 and later support an old draft values: <code>inline</code> (equivalent of having <code>display: inline</code> on the ruby), and <code>above</code> (synonym of the modern <code>over</code>)."},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false,"notes":"Safari implements a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."},"safari_ios":{"version_added":false,"notes":"Safari implements a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"inter-character":{"__compat":{"description":"<code>inter-character</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"scale":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scale","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-behavior":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-behavior","support":{"chrome":{"version_added":"61"},"chrome_android":{"version_added":"61"},"edge":{"version_added":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":{"version_added":"48"},"opera_android":{"version_added":"45"},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"61"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-bottom","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-bottom","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-bottom","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-left","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-left","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-left","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-right","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-right","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-right","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-top","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-top","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-top","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-bottom","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-left","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-right","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-top","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-align","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-coordinate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-coordinate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-destination":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-destination","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-points-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-points-x","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9","prefix":"-webkit-"},"safari_ios":{"version_added":"9","prefix":"-webkit-"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-points-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-points-y","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9","prefix":"-webkit-"},"safari_ios":{"version_added":"9","prefix":"-webkit-"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-stop":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-stop","support":{"chrome":{"version_added":"75"},"chrome_android":{"version_added":"75"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"62"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"11.0"},"webview_android":{"version_added":"75"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-type-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type-x","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-type-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type-y","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"12","prefix":"-ms-","notes":"Edge supports an earlier draft of CSS Scroll Snap without axis values."},"firefox":[{"version_added":"68"},{"version_added":"39","version_removed":"68","notes":"An earlier draft of CSS Scroll Snap without axis values."}],"firefox_android":[{"version_added":"68"},{"version_added":"39","version_removed":"68","notes":"An earlier draft of CSS Scroll Snap without axis values."}],"ie":{"version_added":"10","prefix":"-ms-","notes":"Internet Explorer supports an earlier draft of CSS Scroll Snap without axis values."},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-","notes":"Older Safari versions support an earlier draft of CSS Scroll Snap without axis values."}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-","notes":"Older Safari versions support an earlier draft of CSS Scroll Snap without axis values."}],"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scrollbar-3dlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-3dlight-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-arrow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-arrow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-base-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-base-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"64","notes":"On macOS, you need to set the <em>General</em> > <em>Show scroll bars</em> setting in System Preferences to \"Always\" for this property to have any effect."},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-color.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-color.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scrollbar-darkshadow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-darkshadow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-face-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-face-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-highlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-highlight-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-shadow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-shadow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-width","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-width.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-width.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"shape-image-threshold":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-image-threshold","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"Support for percentage opacity values","support":{"chrome":{"version_added":"78"},"chrome_android":{"version_added":"78"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"78"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"shape-margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-margin","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":[{"version_added":"10.1"},{"prefix":"-webkit-","version_added":"10.1"}],"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"shape-outside":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-outside","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"circle":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#circle()","description":"<code>circle()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gradient","description":"<code>&lt;gradient&gt;</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image","description":"<code>&lt;image&gt;</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#inset()","description":"<code>inset()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"polygon":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#polygon()","description":"<code>polygon()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position in circle and ellipse","support":{"chrome":{"version_added":"37","version_removed":"68"},"chrome_android":{"version_added":"37","version_removed":"68"},"edge":{"version_added":false},"firefox":[{"version_added":"62","version_removed":"70"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24","version_removed":"55"},"opera_android":{"version_added":"24","version_removed":"48"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0","version_removed":"10.0"},"webview_android":{"version_added":"37","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"tab-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/tab-size","support":{"chrome":{"version_added":"21","notes":"This property is not yet animatable."},"chrome_android":{"version_added":"25","notes":"This property is not yet animatable."},"edge":{"version_added":"79","notes":"This property is not yet animatable."},"firefox":{"prefix":"-moz-","version_added":"4","notes":["See <a href='https://bugzil.la/737785'>bug 737785</a> for the status of unprefixing this property.","Before Firefox 53, this property was not animatable."]},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":["See <a href='https://bugzil.la/737785'>bug 737785</a> for the status of unprefixing this property.","Before Firefox 53, this property was not animatable."]},"ie":{"version_added":false},"opera":[{"version_added":"15"},{"prefix":"-o-","version_added":"10.5"}],"opera_android":[{"version_added":"14"},{"prefix":"-o-","version_added":"11"}],"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5","notes":"This property is not yet animatable."},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"length":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/length","description":"<code>&lt;length&gt;</code>","support":{"chrome":{"version_added":"42"},"chrome_android":{"version_added":"42"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"29"},"opera_android":{"version_added":"29"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"table-layout":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/table-layout","support":{"chrome":{"version_added":"14"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1.5"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-align-last":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-align-last","support":{"chrome":[{"version_added":"47"},{"version_added":"35","version_removed":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"chrome_android":[{"version_added":"47"},{"version_added":"35","version_removed":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"edge":{"version_added":"12"},"firefox":[{"version_added":"49"},{"prefix":"-moz-","version_added":"12","version_removed":"53"}],"firefox_android":[{"version_added":"49"},{"prefix":"-moz-","version_added":"14","version_removed":"53"}],"ie":{"version_added":"5.5","partial_implementation":true,"notes":["IE only supports <code>text-align-last</code> when <code>text-align</code> is set to <code>justify</code>.","The <code>start</code> and <code>end</code> values are not supported."]},"opera":[{"version_added":"34"},{"version_added":"23","version_removed":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"opera_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"safari":{"version_added":false,"notes":"See WebKit <a href='https://webkit.org/b/76173'>bug 76173</a>."},"safari_ios":{"version_added":false,"notes":"See WebKit <a href='https://webkit.org/b/76173'>bug 76173</a>."},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"47"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-align","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"block_alignment_values":{"__compat":{"description":"Prefixed <code>center</code>, <code>left</code>, and <code>right</code> values for block alignment","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"1"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"1.3"},{"prefix":"-khtml-","version_added":"1"}],"safari_ios":[{"prefix":"-webkit-","version_added":"1"},{"prefix":"-khtml-","version_added":"1"}],"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"flow_relative_values_start_and_end":{"__compat":{"description":"Flow-relative values <code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"justify-all":{"__compat":{"description":"<code>justify-all</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"match-parent":{"__compat":{"description":"<code>match-parent</code>","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"40"},"firefox_android":{"version_added":"40"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"Character-based alignment in a table column (<code>&lt;string&gt;</code> value)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"text-combine-upright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-combine-upright","support":{"chrome":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"9","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"chrome_android":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"18","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"edge":{"version_added":"12","alternative_name":"-ms-text-combine-horizontal"},"firefox":[{"version_added":"48","notes":"Before version 48, Firefox did not implement layout support for tate-chū-yoko."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.text-combine-upright.enabled","value_to_set":"true"}]},{"version_added":"31","version_removed":"41","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"26","version_removed":"31","alternative_name":"text-combine-horizontal","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"48","notes":"Before version 48, Firefox did not implement layout support for tate-chū-yoko."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.text-combine-upright.enabled","value_to_set":"true"}]},{"version_added":"31","version_removed":"41","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"26","version_removed":"31","alternative_name":"text-combine-horizontal","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","alternative_name":"-ms-text-combine-horizontal"},"opera":[{"version_added":"35"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"15","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"opera_android":[{"version_added":"35"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"14","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"safari":{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"5.1","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."},"safari_ios":{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"5","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."},"samsunginternet_android":[{"version_added":"5.0"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"1.0","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"webview_android":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"≤37","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"digits":{"__compat":{"description":"<code>digits</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"48","flags":[{"type":"preference","name":"layout.css.text-combine-upright-digits.enabled","value_to_set":"true"}],"notes":"Firefox recognizes this value but does not yet implement layout support for tate-chū-yoko (see <a href='https://bugzil.la/1258635'>bug 1258635</a>)."},"firefox_android":{"version_added":"48","flags":[{"type":"preference","name":"layout.css.text-combine-upright-digits.enabled","value_to_set":"true"}],"notes":"Firefox recognizes this value but does not yet implement layout support for tate-chū-yoko (see <a href='https://bugzil.la/1258635'>bug 1258635</a>)."},"ie":{"version_added":"11"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-color","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-decoration-line":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-line","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"blink":{"__compat":{"description":"<code>blink</code>","support":{"chrome":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."},"chrome_android":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."},"edge":{"version_added":"79","notes":"The <code>blink</code> value does not have any effect."},"firefox":{"version_added":"26","notes":"The <code>blink</code> value does not have any effect."},"firefox_android":{"version_added":"26","notes":"The <code>blink</code> value does not have any effect."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"7.0","notes":"The <code>blink</code> value does not have any effect."},"webview_android":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"text-decoration-skip-ink":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-skip-ink","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"all":{"__compat":{"description":"<code>all</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"75"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-skip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-skip","support":{"chrome":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."},"chrome_android":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44","version_removed":"50","notes":"Only supports the deprecated <code>ink</code> value."},"opera_android":{"version_added":"43","version_removed":"46","notes":"Only supports the deprecated <code>ink</code> value."},"safari":[{"version_added":"12.1","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."},{"version_added":"8","prefix":"-webkit-","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."}],"safari_ios":[{"version_added":"12.2","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."},{"version_added":"8","prefix":"-webkit-","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."}],"samsunginternet_android":{"version_added":"7.0","version_removed":"9.0","notes":"Only supports the deprecated <code>ink</code> value."},"webview_android":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"text-decoration-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-style","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"wavy":{"__compat":{"description":"<code>wavy</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"6"},"firefox_android":{"version_added":"6"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-thickness":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-thickness","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"70"},{"version_added":"69","alternative_name":"text-decoration-width","flags":[{"type":"preference","name":"layout.css.text-decoration-width.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"percentage values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"blink":{"__compat":{"description":"<code>blink</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"23"},"firefox_android":{"version_added":"4","version_removed":"23"},"ie":{"version_added":false},"opera":{"version_added":"4","version_removed":"15"},"opera_android":{"version_added":"10.1","version_removed":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"shorthand":{"__compat":{"description":"Shorthand","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"partial_implementation":true,"version_added":"6"}],"firefox_android":[{"version_added":"36"},{"partial_implementation":true,"version_added":"6"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"prefix":"-webkit-","version_added":"8"},"safari_ios":{"prefix":"-webkit-","version_added":"8"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-decoration-thickness":{"__compat":{"description":"<code>text-decoration-thickness</code> included in shorthand","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}}},"text-emphasis-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-color","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-emphasis-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-position","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"left_and_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"79"},"firefox":{"version_added":"46"},"firefox_android":{"version_added":"46"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-emphasis-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-style","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-emphasis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-indent":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-indent","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"each-line":{"__compat":{"description":"<code>each-line</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hanging":{"__compat":{"description":"<code>hanging</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-justify":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-justify","support":{"chrome":{"version_added":"32","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"chrome_android":{"version_added":"32","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"edge":{"version_added":"12","notes":"Standard values <code>inter-character</code> and <code>none</code> are supported. The deprecated <code>distribute</code> value is also supported."},"firefox":[{"version_added":"55"},{"version_added":"54","flags":[{"type":"preference","name":"layout.css.text-justify.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"55"},{"version_added":"54","flags":[{"type":"preference","name":"layout.css.text-justify.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"Standard values <code>inter-character</code> and <code>none</code> are supported. The deprecated <code>distribute</code> value is also supported."},"opera":{"version_added":"19","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"opera_android":{"version_added":"19","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/99945'>bug 9945</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/99945'>bug 9945</a>."},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-orientation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-orientation","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"11"}],"chrome_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"5"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"sideways":{"__compat":{"description":"<code>sideways</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"44","notes":"<code>sideways-right</code> has become an alias of <code>sideways</code>."},"firefox_android":{"version_added":"44","notes":"<code>sideways-right</code> has become an alias of <code>sideways</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-overflow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-overflow","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"7","notes":"Until Firefox 10, handling of <code>text-overflow</code> on blocks with inline overflow on both horizontal sides was incorrect. Before Firefox 10, if only one value was specified (such as <code>text-overflow: ellipsis;</code>), text was ellipsed on both sides of the block, instead of only the end edge based on the block's text direction."},"firefox_android":{"version_added":"7","notes":"Until Firefox 10, handling of <code>text-overflow</code> on blocks with inline overflow on both horizontal sides was incorrect. Before Firefox 10, if only one value was specified (such as <code>text-overflow: ellipsis;</code>), text was ellipsed on both sides of the block, instead of only the end edge based on the block's text direction."},"ie":[{"version_added":"6"},{"prefix":"-ms-","version_added":"8"}],"opera":[{"version_added":"11"},{"prefix":"-o-","version_added":"9"}],"opera_android":[{"version_added":"11"},{"prefix":"-o-","version_added":"10.1"}],"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fade_function":{"__compat":{"description":"<code>fade()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"fade_value":{"__compat":{"description":"<code>fade</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"&lt;string&gt;","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"two_value_syntax":{"__compat":{"description":"Two-value syntax","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-rendering":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-rendering","support":{"chrome":{"version_added":"4","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"chrome_android":{"version_added":"18","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"edge":{"version_added":"79","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"firefox":{"version_added":"1","notes":["This property is only supported on Windows and Linux.","The <code>optimizeSpeed</code> option has no effect on Firefox 4 because the standard code for text rendering is already fast and there is not a faster code path at this time. See <a href='https://bugzil.la/595688'>bug 595688</a> for details."]},"firefox_android":{"version_added":"46"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","notes":"This property is only supported on Windows and Linux. Samsung Internet is not on Windows or Linux."},"webview_android":{"version_added":"3","notes":"From version 3 to 4.3, there is a serious bug where <code>text-rendering: optimizeLegibility</code> causes custom web fonts to not render. This was fixed in version 4.4."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"4","notes":"Chrome treats <code>auto</code> as <code>optimizeSpeed</code>."},"chrome_android":{"version_added":"18","notes":"Chrome treats <code>auto</code> as <code>optimizeSpeed</code>."},"edge":{"version_added":"79","notes":"Edge treats <code>auto</code> as <code>optimizeSpeed</code>."},"firefox":{"version_added":"1","notes":"If the font size is 20 pixels or higher, Firefox treats <code>auto</code> as <code>optimizeLegibility</code>. For smaller text, Firefox treats <code>auto</code> as <code>optimizeSpeed</code>. The 20-pixel threshold can be changed with the <code>browser.display.auto_quality_min_font_size</code> preference."},"firefox_android":{"version_added":"46","notes":"If the font size is 20 pixels or higher, Firefox treats <code>auto</code> as <code>optimizeLegibility</code>. For smaller text, Firefox treats <code>auto</code> as <code>optimizeSpeed</code>. The 20-pixel threshold can be changed with the <code>browser.display.auto_quality_min_font_size</code> preference."},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Opera treats <code>auto</code> as <code>optimizeSpeed</code>."},"opera_android":{"version_added":"14","notes":"Opera treats <code>auto</code> as <code>optimizeSpeed</code>."},"safari":{"version_added":"5","notes":"Safari treats <code>auto</code> as <code>optimizeSpeed</code>. See <a href='https://webkit.org/b/41363'>WebKit bug 41363</a>."},"safari_ios":{"version_added":"4.2","notes":"Safari treats <code>auto</code> as <code>optimizeSpeed</code>. See <a href='https://webkit.org/b/41363'>WebKit bug 41363</a>."},"samsunginternet_android":{"version_added":"1.0","notes":"Samsung Internet treats <code>auto</code> as <code>optimizeSpeed</code>."},"webview_android":{"version_added":"≤37","notes":"WebView treats <code>auto</code> as <code>optimizeSpeed</code>."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"geometricPrecision":{"__compat":{"description":"<code>geometricPrecision</code>","support":{"chrome":{"version_added":"13","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"chrome_android":{"version_added":"18","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"edge":{"version_added":"79","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"firefox":{"version_added":"1","notes":"Firefox treats <code>geometricPrecision</code> the same as <code>optimizeLegibility</code>."},"firefox_android":{"version_added":"46","notes":"Firefox treats <code>geometricPrecision</code> the same as <code>optimizeLegibility</code>."},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"opera_android":{"version_added":"14","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"webview_android":{"version_added":"37","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"text-shadow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-shadow","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5","notes":["Firefox versions before 57 have a bug whereby <a href='https://developer.mozilla.org/docs/Web/CSS/transition'><code>transition</code></a>s will not work when transitioning from a <code>text-shadow</code> with a color specified to a <code>text-shadow</code> without a color specified (<a href='https://bugzil.la/726550'>bug 726550</a>).","From Firefox 4, the blur radius is capped at 300 for performance reasons.","Firefox theoretically supports infinite text-shadows (don't try it).","If the <code>&lt;color&gt;</code> value is unspecified, then Firefox uses the value of the element's <a href='https://developer.mozilla.org/docs/Web/CSS/color'><code>color</code></a> property."]},"firefox_android":{"version_added":"4","notes":["Firefox versions before 57 have a bug whereby <a href='https://developer.mozilla.org/docs/Web/CSS/transition'><code>transition</code></a>s will not work when transitioning from a <code>text-shadow</code> with a color specified to a <code>text-shadow</code> without a color specified (<a href='https://bugzil.la/726550'>bug 726550</a>).","From Firefox 4, the blur radius is capped at 300 for performance reasons.","Firefox theoretically supports infinite text-shadows (don't try it).","If the <code>&lt;color&gt;</code> value is unspecified, then Firefox uses the value of the element's <a href='https://developer.mozilla.org/docs/Web/CSS/color'><code>color</code></a> property."]},"ie":{"version_added":"10"},"opera":{"version_added":"9.5","notes":["Opera supports a maximum of 6-9 text-shadows for performance reasons. The blur radius is limited to 100px.","Opera 9.5 to 10.1 adheres to the old, reverse painting order (in CSS2, the first specified shadow is on the bottom)."]},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.1","notes":["In Safari, any shadows that do not explicitly specify a color are transparent.","Safari 1.1 to 3.2 only supports one text-shadow (displays the first shadow of a comma-separated list and ignores the rest). Safari 4.0 (WebKit 528) and later support multiple text-shadows."]},"safari_ios":{"version_added":"1","notes":["In Safari, any shadows that do not explicitly specify a color are transparent.","Safari iOS 1 and 2 only support one text-shadow (displays the first shadow of a comma-separated list and ignores the rest). Safari iOS 3 (WebKit 528) and later support multiple text-shadows."]},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-size-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-size-adjust","support":{"chrome":[{"version_added":"54"},{"prefix":"-webkit-","version_added":false,"notes":"Instead of ignoring the <code>-webkit-text-size-adjust</code> property, a bug prevents desktop Chrome users from zooming in or out. The bug was fixed after Chrome 26."}],"chrome_android":{"version_added":"54"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"12","version_removed":"79"}],"firefox":{"version_added":false},"firefox_android":[{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"14"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"41"},"opera_android":{"version_added":"41"},"safari":[{"version_added":false},{"prefix":"-webkit-","version_added":false,"notes":"Instead of ignoring the <code>-webkit-text-size-adjust</code> property, a bug prevents desktop Safari users from zooming in or out. The bug was fixed after Safari 5."}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"54"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"<code>&lt;percentage&gt;</code>","support":{"chrome":{"version_added":"54"},"chrome_android":{"version_added":"54"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"41"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"54"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"text-transform":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-transform","support":{"chrome":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"chrome_android":{"version_added":"18","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7","notes":"Since Opera 15, the <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"opera_android":{"version_added":"11"},"safari":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (also not for the old one-colon syntax). See <a href='https://webkit.org/b/3409'>WebKit bug 3409</a>."},"safari_ios":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (also not for the old one-colon syntax). See <a href='https://webkit.org/b/3409'>WebKit bug 3409</a>."},"samsunginternet_android":{"version_added":"1.0","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"webview_android":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"capitalize":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 14, some punctuation characters could interfere with correct capitalization. See <a href='https://bugzil.la/731536'>bug 731536</a>."},"firefox_android":{"version_added":"4","notes":"Before Firefox 14, some punctuation characters could interfere with correct capitalization. See <a href='https://bugzil.la/731536'>bug 731536</a>."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"dutch_ij_digraph":{"__compat":{"description":"Dutch <code>IJ</code> digraph","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"full-size-kana":{"__compat":{"description":"<code>full-size-kana</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"64"},"firefox_android":{"version_added":"64"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"full-width":{"__compat":{"description":"<code>full-width</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"19"},"firefox_android":{"version_added":"19"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"greek_accented_characters":{"__compat":{"description":"Greek accented letters","support":{"chrome":{"version_added":"34"},"chrome_android":{"version_added":"34"},"edge":{"version_added":"79"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":false},"opera":{"version_added":"21"},"opera_android":{"version_added":"21"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lowercase_sigma":{"__compat":{"description":"<code>Σ</code> → <code>σ</code> or word-final <code>ς</code>","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkic_is":{"__compat":{"description":"<code>i</code> → <code>İ</code> and <code>ı</code> → <code>I</code>","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"18"},"opera_android":{"version_added":"18"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"uppercase_eszett":{"__compat":{"description":"<code>ß</code> → <code>SS</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"7"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-underline-offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-underline-offset","support":{"chrome":{"version_added":false,"notes":"See Chrome Platform Status entry for <a href='https://chromestatus.com/feature/5747636764147712'>text-decoration-thickness, text-underline-offset and from-font keyword for text-underline-position</a>."},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"70"},{"version_added":"69","flags":[{"type":"preference","name":"layout.css.text-underline-offset.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"percentage values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-underline-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-underline-position","support":{"chrome":{"version_added":"33"},"chrome_android":{"version_added":"33"},"edge":{"version_added":"12"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"20"},"opera_android":{"version_added":"20"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"9"}],"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"above_below":{"__compat":{"description":"<code>above</code> and <code>below</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"auto-pos":{"__compat":{"description":"<code>auto-pos</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"from-font":{"__compat":{"description":"<code>from-font</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":"71"},"chrome_android":{"version_added":"71"},"edge":{"version_added":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"58"},"opera_android":{"version_added":"50"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"71"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"under":{"__compat":{"description":"<code>under</code>","support":{"chrome":{"version_added":"33"},"chrome_android":{"version_added":"33"},"edge":{"version_added":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"20"},"opera_android":{"version_added":"20"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5","notes":"In Internet Explorer versions before 7, when both <code>top</code> and <code>bottom</code> are specified, the element position is overconstrained and the <code>top</code> property has precedence; the computed value of <code>bottom</code> is set to <code>-top</code>, while its specified value is ignored."},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"touch-action":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/touch-action","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"axis-pan":{"__compat":{"description":"<code>pan-x</code> and <code>pan-y</code>","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"double-tap-zoom":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"manipulation":{"__compat":{"support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pinch-zoom":{"__compat":{"support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"12"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unidirectional-pan":{"__compat":{"description":"<code>pan-up</code>, <code>pan-down</code>, <code>pan-left</code> and <code>pan-right</code>","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"79"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"ie":{"version_added":false},"opera":{"version_added":"42"},"opera_android":{"version_added":"42"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transform-box":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-box","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":[{"version_added":"55"},{"version_added":"43","flags":[{"type":"preference","name":"svg.transform-box.enabled","value_to_set":"true"}]},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"55"},{"version_added":"43","flags":[{"type":"preference","name":"svg.transform-box.enabled","value_to_set":"true"}]},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transform-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-origin","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"3.5"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"9"}],"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"10.5"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"11"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"support_in_svg":{"__compat":{"description":"Support in SVG","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"17"},"firefox":[{"version_added":"43","notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}],"notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."}],"firefox_android":[{"version_added":"43","notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}],"notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6","notes":"Only supported for transformations applied using the CSS <code>transform</code> property (e.g. <code>.className { transform: rotate(45deg); transform-origin: center; }</code>). It has no effect on transformations applied using the <code>transform</code> SVG attribute (e.g. <code>&lt;rect style=&quot;transform-origin: center;&quot; transform=&quot;rotate(45)&quot; /&gt;</code>)."},"safari_ios":{"version_added":"6","notes":"Only supported for transformations applied using the CSS <code>transform</code> property (e.g. <code>.className { transform: rotate(45deg); transform-origin: center; }</code>). It has no effect on transformations applied using the <code>transform</code> SVG attribute (e.g. <code>&lt;rect style=&quot;transform-origin: center;&quot; transform=&quot;rotate(45)&quot; /&gt;</code>)."},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"three_value_syntax":{"__compat":{"description":"Three-value syntax","matches":{"regex_value":"^([\\d\\w%-]+|calc\\(.+\\))\\s+([\\d\\w%-]+|calc\\(.+\\))\\s+([\\d\\w-]+|calc\\(.+\\))$"},"support":{"chrome":{"version_added":"12"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"10"},"firefox_android":{"version_added":"10"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transform-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-style","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transform":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10","notes":"Internet Explorer does not support the global values <code>initial</code> and <code>unset</code>."},{"prefix":"-webkit-","version_added":"11"},{"prefix":"-ms-","version_added":"9","notes":"Internet Explorer 5.5 or later supports a proprietary <a href='https://msdn.microsoft.com/en-us/library/ms533014(VS.85,loband).aspx'>Matrix Filter</a> which can be used to achieve a similar effect."}],"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"10.5","version_removed":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"11","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"2","notes":"Android 2.3 has a bug where input forms will \"jump\" when typing, if any container element has a <code>-webkit-transform</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"3d":{"__compat":{"description":"3D support","matches":{"keywords":["matrix3d","translate3d","translateZ","scale3d","scaleZ","rotate3d","rotateX","rotateY","rotateZ","perspective"]},"support":{"chrome":{"version_added":"12"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10","notes":"Internet Explorer 9.0 or earlier has no support for 3D transforms. Mixing 3D and 2D transform functions, such as <code>-ms-transform:rotate(10deg) translateZ(0);</code>, will prevent the entire property from being applied."},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition-delay":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-delay","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transition-duration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-duration","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"10","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"10.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transition-property":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-property","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"IDENT_value":{"__compat":{"description":"<code>IDENT</code> value","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition-timing-function":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-timing-function","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"jump":{"__compat":{"description":"<code>jump-</code> keywords for <code>steps()</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16","notes":["Before Firefox 57, transitions do not work when transitioning from a <a href='https://developer.mozilla.org/docs/Web/CSS/text-shadow'><code>text-shadow</code></a> with a color specified to a <code>text-shadow</code> without a color specified (see <A href='https://bugzil.la/726550'>bug 726550</a>).","Before Firefox 57, cancelling a filling animation (for example, with <code>animation-fill-mode: forwards</code> set) can trigger a transition set on the same element, although only once (see <a href='https://bugzil.la/1192592'>bug 1192592</a> and <a href='https://bug1192592.bmoattachments.org/attachment.cgi?id=8843824'>these test cases</a> for more information).","Before Firefox 57, the <a href='https://developer.mozilla.org/docs/Web/CSS/background-position'><code>background-position</code></a> property can't be transitioned between two values containing different numbers of <a href='https://developer.mozilla.org/docs/Web/CSS/position_value'><code>&lt;position&gt;</code></a> values, for example <code>background-position: 10px 10px;</code> and <code>background-position: 20px 20px, 30px 30px;</code> (see <a href='https://bugzil.la/1390446'>bug 1390446</a>)."]},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16","notes":["Before Firefox 57, transitions do not work when transitioning from a <a href='https://developer.mozilla.org/docs/Web/CSS/text-shadow'><code>text-shadow</code></a> with a color specified to a <code>text-shadow</code> without a color specified (see <A href='https://bugzil.la/726550'>bug 726550</a>).","Before Firefox 57, cancelling a filling animation (for example, with <code>animation-fill-mode: forwards</code> set) can trigger a transition set on the same element, although only once (see <a href='https://bugzil.la/1192592'>bug 1192592</a> and <a href='https://bug1192592.bmoattachments.org/attachment.cgi?id=8843824'>these test cases</a> for more information).","Before Firefox 57, the <a href='https://developer.mozilla.org/docs/Web/CSS/background-position'><code>background-position</code></a> property can't be transitioned between two values containing different numbers of <a href='https://developer.mozilla.org/docs/Web/CSS/position_value'><code>&lt;position&gt;</code></a> values, for example <code>background-position: 10px 10px;</code> and <code>background-position: 20px 20px, 30px 30px;</code> (see <a href='https://bugzil.la/1390446'>bug 1390446</a>)."]},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"10.1","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"10.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"gradients":{"__compat":{"description":"Gradients","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"translate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/translate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unicode-bidi":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/unicode-bidi","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"isolate":{"__compat":{"description":"<code>isolate</code>","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"16","notes":["Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47).","Since Chrome 19, the syntax from a previous version of the specification, where the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, is allowed."]}],"chrome_android":{"version_added":"48"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":"From Firefox 10 to Firefox 16 (inclusive), the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, which was the syntax from a previous version of the specification. From Firefox 17, only one value is allowed. Use <code>isolate-override</code> instead the previous <code>isolate bidi-override</code>."}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":"From Firefox 10 to Firefox 16 (inclusive), the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, which was the syntax from a previous version of the specification. From Firefox 17, only one value is allowed. Use <code>isolate-override</code> instead the previous <code>isolate bidi-override</code>."}],"ie":{"version_added":false},"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15","notes":["Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Opera (up to version 34).","The syntax from a previous version of the specification, where the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, is allowed."]}],"opera_android":{"version_added":"35"},"safari":{"prefix":"-webkit-","version_added":"6","notes":"Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47)."},"safari_ios":{"prefix":"-webkit-","version_added":"6","notes":"Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47)."},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"isolate-override":{"__compat":{"description":"<code>isolate-override</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"17","version_removed":"54"}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"17","version_removed":"54"}],"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"plaintext":{"__compat":{"description":"<code>plaintext</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":["Before Firefox 50, the <code>plaintext</code> value was ignored for vertical writing modes (<a href='https://bugzil.la/1302734'>bug 1302734</a>).","Before Firefox 15, <code>plaintext</code> didn't do anything to an inline element. The specification changed and the implementation was changed in Firefox 15."]}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":["Before Firefox 50, the <code>plaintext</code> value was ignored for vertical writing modes (<a href='https://bugzil.la/1302734'>bug 1302734</a>).","Before Firefox 15, <code>plaintext</code> didn't do anything to an inline element. The specification changed and the implementation was changed in Firefox 15."]}],"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"user-modify":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/user-modify","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":{"prefix":"-moz-","version_added":"1","partial_implementation":true,"notes":["While the CSS property is parsed and accepted, it does not have any effect.","Scheduled for removal (see <a href='https://bugzil.la/1388910'>bug 1388910</a>)."]},"firefox_android":{"prefix":"-moz-","version_added":"4","partial_implementation":true,"notes":["While the CSS property is parsed and accepted, it does not have any effect.","Scheduled for removal (see <a href='https://bugzil.la/1388910'>bug 1388910</a>)."]},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"5","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}},"read-write-plaintext-only":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"user-select":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/user-select","support":{"chrome":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"prefix":"-ms-","version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"69"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"prefix":"-ms-","version_added":"10"},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"prefix":"-webkit-","version_added":"3"},"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"all":{"__compat":{"support":{"chrome":{"version_added":"53"},"chrome_android":{"version_added":"53"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"40"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"53"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"auto":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"contain":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"alternative_name":"element","version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"alternative_name":"element","version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"21"},{"version_added":"1","version_removed":"65","prefix":"-moz-"}],"firefox_android":[{"version_added":"21"},{"version_added":"4","version_removed":"65","prefix":"-moz-"}],"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2","partial_implementation":true,"notes":"Allows typing in the <code>&lt;html&gt;</code> container."},"safari_ios":{"version_added":"3","partial_implementation":true,"notes":"Allows typing in the <code>&lt;html&gt;</code> container."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"vertical-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/vertical-align","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"visibility":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/visibility","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":["Internet Explorer doesn't support <code>visibility: initial</code>.","Up to Internet Explorer 7, descendants of <code>hidden</code> elements will still be invisible even if they have <code>visibility</code> set to <code>visible</code>."]},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"collapse":{"__compat":{"description":"<code>collapse</code>","support":{"chrome":{"version_added":"1","notes":["Chrome treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Chrome supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"chrome_android":{"version_added":"18","notes":["Chrome treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Chrome supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox doesn't hide borders when hiding <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements if <code>border-collapse: collapse</code> is set."},"firefox_android":{"version_added":"4","notes":"Firefox doesn't hide borders when hiding <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements if <code>border-collapse: collapse</code> is set."},"ie":{"version_added":"10"},"opera":{"version_added":"4","notes":["Opera treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Opera supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"opera_android":{"version_added":"10.1","notes":["Opera treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Opera supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"safari":{"version_added":"1.3","notes":["Safari treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Safari supports the collapse value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"safari_ios":{"version_added":"1","notes":["Safari treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Safari supports the collapse value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"samsunginternet_android":{"version_added":"1.0","notes":["Samsung Internet treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Samsung Internet supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"webview_android":{"version_added":"≤37","notes":["WebView treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","WebView supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"white-space":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/white-space","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"break-spaces":{"__compat":{"description":"<code>break-spaces</code>","support":{"chrome":{"version_added":"76"},"chrome_android":{"version_added":"76"},"edge":{"version_added":"79"},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"62"},"opera_android":{"version_added":"54"},"safari":{"version_added":"13.1"},"safari_ios":{"version_added":"13.4"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"76"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"nowrap":{"__compat":{"description":"<code>nowrap</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre":{"__compat":{"description":"<code>pre</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre-line":{"__compat":{"description":"<code>pre-line</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre-wrap":{"__compat":{"description":"<code>pre-wrap</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"3"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8","notes":"From Internet Explorer 5.5 to 7, <code>word-wrap: break-word;</code> can be used for line breaks in <code>pre</code> elements."},"opera":{"version_added":"8"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_support":{"__compat":{"description":"Support in SVG","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"textarea_support":{"__compat":{"description":"Support on <code>&lt;textarea&gt;</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"widows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/widows","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animatable":{"__compat":{"description":"Animatable","support":{"chrome":{"version_added":"26"},"chrome_android":{"version_added":"26"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fill":{"__compat":{"description":"<code>fill</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"33"},"opera_android":{"version_added":"33"},"safari":{"version_added":"12"},"safari_ios":{"version_added":"12"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"},{"alternative_name":"intrinsic","version_added":"1","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"intrinsic","version_added":"18","version_removed":"48"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"},{"alternative_name":"intrinsic","version_added":"15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"14"},{"alternative_name":"intrinsic","version_added":"14","version_removed":"35"}],"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"},{"alternative_name":"intrinsic","version_added":"1.0","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"},{"alternative_name":"intrinsic","version_added":"1","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"1","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"18","version_removed":"48"}],"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"alternative_name":"min-intrinsic","version_added":"15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"alternative_name":"min-intrinsic","version_added":"14","version_removed":"35"}],"safari":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"alternative_name":"min-intrinsic","version_added":"1.0","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"1","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"alternative_name":"-moz-available","version_added":"3"},"firefox_android":{"alternative_name":"-moz-available","version_added":"4"},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"6.1"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"6.1"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"will-change":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/will-change","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36","notes":"Before Firefox 43, Firefox supported <code>will-change: will-change</code>, which is invalid by the specification."},{"version_added":"31","version_removed":"36","flags":[{"type":"preference","name":"layout.css.will-change.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"36","notes":"Before Firefox 43, Firefox supported <code>will-change: will-change</code>, which is invalid by the specification."},{"version_added":"31","version_removed":"36","flags":[{"type":"preference","name":"layout.css.will-change.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"word-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/word-break","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":[{"version_added":"5.5","notes":"No version of Internet Explorer supports the <code>initial</code> value."},{"prefix":"-ms-","version_added":"8","notes":"Don't use <code>-ms-word-break</code>, which is a synonym for <code>word-break</code>."}],"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"break-word":{"__compat":{"description":"<code>break-word</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"67"},"firefox_android":{"version_added":"67"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"keep-all":{"__compat":{"description":"<code>keep-all</code>","support":{"chrome":{"version_added":"44"},"chrome_android":{"version_added":"44"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"5.5"},"opera":{"version_added":"31"},"opera_android":{"version_added":"32"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"44"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"word-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/word-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg":{"__compat":{"description":"SVG support","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"72"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"word-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-wrap","support":{"chrome":[{"alternative_name":"overflow-wrap","version_added":"23"},{"version_added":"1"}],"chrome_android":[{"alternative_name":"overflow-wrap","version_added":"25"},{"version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"alternative_name":"overflow-wrap","version_added":"49"},{"version_added":"3.5"}],"firefox_android":[{"alternative_name":"overflow-wrap","version_added":"49"},{"version_added":"4"}],"ie":{"version_added":"5.5"},"opera":[{"alternative_name":"overflow-wrap","version_added":"15"},{"version_added":"10.5"}],"opera_android":[{"alternative_name":"overflow-wrap","version_added":"14"},{"version_added":"11"}],"safari":[{"alternative_name":"overflow-wrap","version_added":"6.1"},{"version_added":"2"}],"safari_ios":[{"alternative_name":"overflow-wrap","version_added":"7"},{"version_added":"1"}],"samsunginternet_android":[{"alternative_name":"overflow-wrap","version_added":"1.5"},{"version_added":"1.0"}],"webview_android":[{"alternative_name":"overflow-wrap","version_added":"≤37"},{"version_added":"1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"writing-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/writing-mode","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"8"}],"chrome_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"41","notes":"Firefox 42 added support for bidirectional and RTL scripts in vertical modes."},{"version_added":"36","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41","notes":"Firefox 42 added support for bidirectional and RTL scripts in vertical modes."},{"version_added":"36","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"9","notes":"Internet Explorer's implementation differs from the specification."},{"prefix":"-ms-","version_added":"9","notes":"Internet Explorer's implementation differs from the specification."}],"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"10.1"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"10.3"},{"prefix":"-webkit-","version_added":"5.1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"horizontal_vertical_values":{"__compat":{"description":"<code>horizontal-tb</code>, <code>vertical-lr</code>, and <code>vertical-rl</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sideways_values":{"__compat":{"description":"<code>sideways-lr</code> and <code>sideways-rl</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_values":{"__compat":{"description":"<code>lr</code>, <code>lr-tb</code>, <code>rl</code>, <code>rl-tb</code>, <code>tb</code>, and <code>tb-rl</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"12"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":"9"},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"z-index":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/z-index","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"negative_values":{"__compat":{"description":"Negative values","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"zoom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/zoom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/390936'>bug 390936</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/390936'>bug 390936</a>."},"ie":{"version_added":"5.5"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"reset":{"__compat":{"description":"The <code>reset</code> value","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/zoom#Values","support":{"chrome":{"version_added":"1","version_removed":"59"},"chrome_android":{"version_added":"18","version_removed":"59"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"46"},"opera_android":{"version_added":"14","version_removed":"43"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0","version_removed":"7.0"},"webview_android":{"version_added":"≤37","version_removed":"59"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}}}
\ No newline at end of file
+{"-moz-binding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-binding","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"67","notes":["XBL is deprecated and being removed. See <a href='https://bugzil.la/1397874'>bug 1397874</a>.","Available only in chrome and UA style sheets."]},"firefox_android":{"version_added":"4","version_removed":"67","notes":"Available only in chrome and UA style sheets."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-context-properties":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-context-properties","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55","flags":[{"type":"preference","name":"svg.context-properties.content.enabled","value_to_set":"true"}],"notes":"With the preference set to <code>false</code>, the property still works with SVGs via <code>chrome://</code> or <code>resource://</code> URLs"},"firefox_android":{"version_added":"55","flags":[{"type":"preference","name":"svg.context-properties.content.enabled","value_to_set":"true"}],"notes":"With the preference set to <code>false</code>, the property still works with SVGs via <code>chrome://</code> or <code>resource://</code> URLs"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"-moz-float-edge":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-float-edge","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-force-broken-image-icon":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-force-broken-image-icon","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-image-region":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-image-region","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-moz-orient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-orient","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"6"},"firefox_android":{"version_added":"6"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"21","version_removed":"40","notes":"The <code>auto</code> value was equivalent to <code>horizontal</code>."},"firefox_android":{"version_added":"21","version_removed":"40","notes":"The <code>auto</code> value was equivalent to <code>horizontal</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"inline_and_block":{"__compat":{"description":"<code>inline</code> and <code>block</code> values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"40"},"firefox_android":{"version_added":"40"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"-moz-outline-radius-bottomleft":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-bottomleft","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-bottomright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-bottomright","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-topleft":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-topleft","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius-topright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius-topright","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-outline-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-outline-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-moz-user-focus":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-user-focus","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-moz-user-input":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-user-input","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}},"auto":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"disabled":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"60"},"firefox_android":{"version_added":"4","version_removed":"60"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"enabled":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"60"},"firefox_android":{"version_added":"4","version_removed":"60"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"none":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"-ms-grid-column-align":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-column-span":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-column":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row-align":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row-span":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-grid-row":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"16"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"-ms-scrollbar-track-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-ms-scrollbar-track-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5","alternative_name":"scrollbar-track-color"},{"version_added":"8"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"-webkit-border-before":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-border-before","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-box-reflect":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-box-reflect","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-line-clamp":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-line-clamp","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"17"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"-webkit-mask-attachment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment","support":{"chrome":{"version_added":"1","version_removed":"24"},"chrome_android":{"version_added":"18","version_removed":"25"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"1.5"},"webview_android":{"version_added":"≤37","version_removed":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-box-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-box-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-composite":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-position-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-position-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-position-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-position-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.2"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-repeat-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-repeat-x","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-mask-repeat-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-repeat-y","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-overflow-scrolling":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-overflow-scrolling","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-print-color-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-print-color-adjust","support":{"chrome":{"version_added":"17","notes":["Chrome does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"chrome_android":{"version_added":"18","notes":["Chrome does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"edge":{"version_added":"79","notes":"Edge does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Opera does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"opera_android":{"version_added":"15","notes":"Opera does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"safari":{"version_added":"6","notes":"Safari does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"safari_ios":{"version_added":"6","notes":"Safari does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."},"samsunginternet_android":{"version_added":"1.0","notes":["Samsung Internet does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants.","Before Chrome 26, if background images are clipped (for example, when using <code>background-image</code> sprites) and <code>-webkit-print-color-adjust</code> is set to <code>exact</code>, then backgrounds will appear distorted when printed. Solid backgrounds and background images that are not clipped (i.e., backgrounds that have narrower and shorter than the element to which they are applied) are printed correctly. See <a href='https://crbug.com/131054'>Chromium bug 131054</a>."]},"webview_android":{"version_added":"37","notes":"WebView does not print backgrounds of the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/body'><code>&lt;body&gt;</code></a> element. If this property is set to <code>exact</code> for the <code>&lt;body&gt;</code> element, it will apply only to its descendants."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-tap-highlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-tap-highlight-color","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"≤15"},"opera_android":{"version_added":"≤14"},"safari":{"version_added":false},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-fill-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-fill-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-security":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-security","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"15"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"38"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-text-stroke":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-text-stroke","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"-webkit-touch-callout":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-webkit-touch-callout","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"align-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-content","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"52","version_removed":"60","notes":"<code>align-content</code> no longer accepts the <code>left</code> and <code>right</code> values"},"firefox_android":{"version_added":"52","version_removed":"60","notes":"<code>align-content</code> no longer accepts the <code>left</code> and <code>right</code> values"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space-evenly":{"__compat":{"description":"<code>space-evenly</code>","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-content","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"align-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-items","support":{"chrome":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Multi-line flexbox has been supported since Firefox 28."},{"prefix":"-webkit-","version_added":"49"},{"version_removed":"20","version_added":"18","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Multi-line flexbox has been supported since Firefox 28."},{"prefix":"-webkit-","version_added":"49"},{"version_removed":"20","version_added":"18","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"In Internet Explorer 10 and 11, if column flex items have <code>align-items: center;</code> set on them and their content is too large, then they will overflow the bounds of their container. See <a href='https://github.com/philipwalton/flexbugs#2-column-flex-items-set-to-align-itemscenter-overflow-their-container'>Flexbug #2</a>."},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"6.0"},{"version_added":"2.0","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Samsung Internet 6.0."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"52"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-items","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"align-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-self","support":{"chrome":[{"version_added":"36"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"36"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Before Firefox 27, only single-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Before Firefox 27, only single-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"3.0"},{"version_added":"2.0","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Samsung Internet 6.0."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"37"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/align-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer 10 and 11 have the property <code>-ms-grid-row-align</code>, which acts in a similar way to <code>align-self</code>."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"all":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/all","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":{"version_added":"27"},"firefox_android":{"version_added":"27"},"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"revert":{"__compat":{"description":"<code>revert</code>","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"67"},"firefox_android":{"version_added":"67"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"alt":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/alt","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"animation-delay":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-delay","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"16","notes":"Before Firefox 57, Firefox does not repaint elements outside the viewport that are animated into the viewport with a delay. This bug affects only some platforms, such as Windows."},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-direction","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alternate-reverse":{"__compat":{"description":"<code>alternate-reverse</code>","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"reverse":{"__compat":{"description":"<code>reverse</code>","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"animation-duration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-duration","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10","partial_implementation":true,"notes":"Once the element has loaded, changing the value of this property has no effect."},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-fill-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-fill-mode","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-iteration-count":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-iteration-count","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-name":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-name","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-play-state":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-play-state","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"animation-timing-function":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation-timing-function","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"jump":{"__compat":{"description":"<code>jump-</code> keywords for <code>steps()</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/animation","support":{"chrome":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"3"}],"chrome_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"firefox_android":[{"version_added":"16"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"44","prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"5"}],"ie":{"version_added":"10"},"opera":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"12","version_removed":"15"}],"opera_android":[{"version_added":"30"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"4.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"2","notes":"The <a href='https://developer.mozilla.org/docs/Web/CSS/animation-fill-mode'><code>animation-fill-mode</code></a> property is not supported in Android browsers below 2.3."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"appearance":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/appearance","support":{"chrome":[{"version_added":"84"},{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"}],"chrome_android":[{"version_added":"84"},{"version_added":"18","partial_implementation":true,"prefix":"-webkit-"}],"edge":[{"version_added":"84"},{"version_added":"12","partial_implementation":true,"prefix":"-webkit-"}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true,"prefix":"-moz-"},{"version_added":"64","partial_implementation":true,"prefix":"-webkit-"},{"version_added":"62","partial_implementation":true,"prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.webkit-appearance.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true,"prefix":"-moz-"},{"version_added":"64","partial_implementation":true,"prefix":"-webkit-"},{"version_added":"62","partial_implementation":true,"prefix":"-webkit-","flags":[{"type":"preference","name":"layout.css.webkit-appearance.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"70"},{"version_added":"15","partial_implementation":true,"prefix":"-webkit-"}],"opera_android":[{"version_added":"60"},{"version_added":"14","partial_implementation":true,"prefix":"-webkit-"}],"safari":{"version_added":"3","partial_implementation":true,"prefix":"-webkit-"},"safari_ios":{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true,"prefix":"-webkit-"},"webview_android":[{"version_added":"84"},{"version_added":"1","partial_implementation":true,"prefix":"-webkit-"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"support":{"chrome":{"version_added":"83"},"chrome_android":{"version_added":"83"},"edge":{"version_added":"83"},"firefox":{"version_added":"80"},"firefox_android":{"version_added":"80"},"ie":{"version_added":false},"opera":{"version_added":"69"},"opera_android":{"version_added":"59"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"83"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"compat-auto":{"__compat":{"description":"<code>&lt;compat-auto&gt;</code> (compatibility values <code>searchfield</code>, <code>textarea</code>, <code>push-button</code>, <code>slider-horizontal</code>, <code>checkbox</code>, <code>radio</code>, <code>square-button</code>, <code>menulist</code>, <code>listbox</code>, <code>meter</code>, <code>progress-bar</code>, <code>button</code>)","support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"menulist-button":{"__compat":{"description":"<code>menulist-button</code>","support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true,"notes":"See <a href='https://bugzil.la/1481615'>bug 1481615</a>."}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true,"notes":"See <a href='https://bugzil.la/1481615'>bug 1481615</a>."}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"54"},{"version_added":"1","partial_implementation":true,"notes":"Doesn't work with <code>&lt;input type=\"checkbox\"&gt;</code> and <code>&lt;input type=\"radio\"&gt;</code>."}],"firefox_android":[{"version_added":"54"},{"version_added":"4","partial_implementation":true,"notes":"Doesn't work with <code>&lt;input type=\"checkbox\"&gt;</code> and <code>&lt;input type=\"radio\"&gt;</code>."}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"textfield":{"__compat":{"support":{"chrome":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}],"chrome_android":[{"version_added":"83"},{"version_added":"18","partial_implementation":true}],"edge":[{"version_added":"83"},{"version_added":"12","partial_implementation":true}],"firefox":[{"version_added":"80"},{"version_added":"1","partial_implementation":true}],"firefox_android":[{"version_added":"80"},{"version_added":"4","partial_implementation":true}],"ie":{"version_added":false},"opera":[{"version_added":"69"},{"version_added":"15","partial_implementation":true}],"opera_android":[{"version_added":"59"},{"version_added":"14","partial_implementation":true}],"safari":{"version_added":"3","partial_implementation":true},"safari_ios":{"version_added":"1","partial_implementation":true},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true},"webview_android":[{"version_added":"83"},{"version_added":"1","partial_implementation":true}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"aspect-ratio":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/aspect-ratio","support":{"chrome":{"version_added":"84","flags":[{"type":"preference","name":"#enable-experimental-web-platform-features","value_to_set":"Enabled"}]},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"83","partial_implementation":true,"notes":"Firefox 83 implements aspect-ratio for flex items.","flags":[{"type":"preference","name":"layout.css.aspect-ratio.enabled","value_to_set":"true"}]},{"version_added":"81","partial_implementation":true,"notes":"Firefox 81 implements aspect-ratio for blocks and replaced elements.","flags":[{"type":"preference","name":"layout.css.aspect-ratio.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"backdrop-filter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/backdrop-filter","support":{"chrome":[{"version_added":"76"},{"version_added":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"chrome_android":[{"version_added":"76"},{"version_added":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"edge":{"version_added":"17"},"firefox":{"version_added":"70","flags":[{"type":"preference","name":"layout.css.backdrop-filter.enabled","value_to_set":"true"},{"type":"preference","name":"gfx.webrender.all","value_to_set":"true"}]},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1178765'>bug 1178765</a>."},"ie":{"version_added":false},"opera":{"version_added":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]},"opera_android":[{"version_added":"54"},{"version_added":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features"}]}],"safari":{"prefix":"-webkit-","version_added":"9"},"safari_ios":{"prefix":"-webkit-","version_added":"9"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"76"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"backface-visibility":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/backface-visibility","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":{"prefix":"-webkit-","version_added":"5.1"},"safari_ios":{"prefix":"-webkit-","version_added":"5"},"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-attachment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-attachment","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"local":{"__compat":{"description":"<code>local</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"25"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-blend-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-blend-mode","support":{"chrome":{"version_added":"35"},"chrome_android":{"version_added":"35"},"edge":{"version_added":"79"},"firefox":{"version_added":"30"},"firefox_android":{"version_added":"30"},"ie":{"version_added":false},"opera":{"version_added":"22"},"opera_android":{"version_added":"22"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-clip","support":{"chrome":[{"version_added":"1"},{"version_added":"1","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"1","version_removed":"4","partial_implementation":true,"prefix":"-moz-","notes":"Used the <code>-moz-background-clip: padding | border</code> syntax."}],"firefox_android":[{"version_added":"14"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9","notes":"In IE 7 and IE 8 of Internet Explorer, this property always behaved like <code>background-clip: padding</code> when <code>overflow</code> was <code>hidden</code>, <code>auto</code>, or <code>scroll</code>."},"opera":[{"version_added":"10.5"},{"version_added":"15","version_removed":"51","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"opera_android":[{"version_added":"11"},{"version_added":"14","version_removed":"47","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari":{"version_added":"3","prefix":"-webkit-","notes":"Safari accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."},"safari_ios":{"version_added":"1","prefix":"-webkit-","notes":"Safari accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."},"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"9.0","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"webview_android":[{"version_added":"4.1"},{"version_added":"≤37","version_removed":"64","prefix":"-webkit-","notes":"WebView accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"content-box":{"__compat":{"description":"<code>content-box</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9","notes":"In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"3","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"chrome_android":{"version_added":"18","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"edge":[{"version_added":"15"},{"version_added":"12","partial_implementation":true,"notes":"Before Edge 15, this value was supported with the prefixed version of the property only."}],"firefox":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.background-clip-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"layout.css.background-clip-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"opera_android":{"version_added":"14","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"safari":{"version_added":"4","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"safari_ios":{"version_added":"3.2","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"samsunginternet_android":{"version_added":"1.0","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]},"webview_android":{"version_added":"≤37","partial_implementation":true,"notes":["This value is supported with the prefixed version of the property only.","According to the <a href='https://webkit.org/blog/164/background-clip-text/'>WebKit blog</a>, text decorations or shadows are not included in the clipping."]}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"In Internet Explorer 8 and 9, there is a bug where a computed <code>background-color</code> of <code>transparent</code> causes <code>click</code> events to not get fired on overlaid elements."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."},"firefox_android":{"version_added":"4","notes":"If the <code>browser.display.use_document_colors</code> user preference in <code>about:config</code> is set to <code>false</code>, background images will not be displayed."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"element":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/element","description":"<code>element()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"4","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradients":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gradient","description":"Gradients","support":{"chrome":{"version_added":"1","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"chrome_android":{"version_added":"18","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6","notes":"Some versions support only experimental gradients prefixed with <code>-moz</code>."},"firefox_android":{"version_added":"4","notes":"Some versions support only experimental gradients prefixed with <code>-moz</code>."},"ie":{"version_added":"10"},"opera":{"version_added":"11","notes":"Some versions support only experimental gradients prefixed with <code>-o</code>."},"opera_android":{"version_added":"14","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"safari":{"version_added":"4","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"safari_ios":{"version_added":"3.2","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"samsunginternet_android":{"version_added":"1.0","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."},"webview_android":{"version_added":"≤37","notes":"Some versions support only experimental gradients prefixed with <code>-webkit</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image-rect":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/-moz-image-rect","description":"<code>image-rect()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"prefix":"-moz-","version_added":"4"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image-set":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-set","description":"<code>image-set()</code>","support":{"chrome":{"prefix":"-webkit-","version_added":"21"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1107646'>bug 1107646</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1107646'>bug 1107646</a>."},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"6","partial_implementation":true,"notes":"Support for <code>url</code> images only and <code>x</code> is the only supported resolution unit. See <a href='https://webkit.org/b/160934'>bug 160934</a>."},"safari_ios":{"prefix":"-webkit-","version_added":"6","partial_implementation":true,"notes":"Support for <code>url</code> images only and <code>x</code> is the only supported resolution unit. See <a href='https://webkit.org/b/160934'>bug 160934</a>."},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_images":{"__compat":{"description":"SVG images","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5","notes":"Support of SVG in CSS background is incomplete."},"safari_ios":{"version_added":"5","notes":"Support of SVG in CSS background is incomplete."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-origin","support":{"chrome":[{"version_added":"1"},{"version_added":"1","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","version_removed":"64","prefix":"-webkit-","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"version_added":"1","version_removed":"4","partial_implementation":true,"prefix":"-moz-","notes":"Used the <code>-moz-background-clip: padding | border</code> syntax."}],"firefox_android":[{"version_added":"14"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9","notes":"In IE 7 and before, Internet explorer was behaving as if <code>background-origin: border-box</code> was set. In Internet Explorer 8, as if <code>background-origin: padding-box</code>, the regular default value, was set."},"opera":[{"version_added":"10.5"},{"version_added":"15","version_removed":"51","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"opera_android":[{"version_added":"11"},{"version_added":"14","version_removed":"47","prefix":"-webkit-","notes":"Opera accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari":[{"version_added":"3"},{"version_added":"3","prefix":"-webkit-","notes":"Webkit accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"safari_ios":[{"version_added":"1"},{"version_added":"1","prefix":"-webkit-","notes":"Webkit accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"9.0","notes":"Chrome accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}],"webview_android":[{"version_added":"4.1"},{"version_added":"4.1","version_removed":"64","prefix":"-webkit-","notes":"WebView accepts alternate synonyms to its values: <code>padding</code>, <code>border</code>, and <code>content</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"content-box":{"__compat":{"description":"<code>content-box</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9","notes":"In IE 7 and IE 9 of Internet Explorer, it always behaved like <code>background-clip: padding</code> if <code>overflow: hidden | auto | scroll</code>."},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"18"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"two_value_syntax":{"__compat":{"description":"Two-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"2_value_syntax":{"__compat":{"description":"Two-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"4_value_syntax":{"__compat":{"description":"Four-value syntax (support for offsets from any edge)","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-repeat","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"round_space":{"__compat":{"description":"<code>round</code> and <code>space</code> keywords","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":"9"},"opera":[{"version_added":"17"},{"version_added":"10.5","version_removed":"15"}],"opera_android":{"version_added":"18"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"2-value":{"__compat":{"description":"Two-value syntax (different values for x & y directions)","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background-size","support":{"chrome":[{"version_added":"3"},{"version_added":"1","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"chrome_android":[{"version_added":"18"},{"version_added":"18","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-moz-","version_added":"3.6","version_removed":"4"}],"firefox_android":[{"version_added":"4"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10"},{"version_added":"15","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."},{"version_added":"9.5","version_removed":"15","prefix":"-o-","notes":"Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."}],"opera_android":[{"version_added":"10.1"},{"version_added":"14","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."},{"version_added":"10.1","version_removed":"14","prefix":"-o-","notes":"Opera 9.5's computation of the background positioning area is incorrect for fixed backgrounds. Opera 9.5 also interprets the two-value form as a horizontal scaling factor and, from appearances, a vertical clipping dimension. This has been fixed in Opera 10."}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}],"webview_android":[{"version_added":"2.3"},{"version_added":"≤37","prefix":"-webkit-","notes":"WebKit-based browsers originally implemented an older draft of CSS3 <code>background-size</code> in which an omitted second value is treated as duplicating the first value; this draft does not include the <code>contain</code> or <code>cover</code> keywords."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contain_and_cover":{"__compat":{"description":"<code>contain</code> and <code>cover</code>","support":{"chrome":{"version_added":"3"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"background":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/background","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"SVG_image_as_background":{"__compat":{"description":"SVG image as background","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-clip":{"__compat":{"description":"Values of <code>background-clip</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"22"},"firefox_android":{"version_added":"22"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-origin":{"__compat":{"description":"Values of <code>background-origin</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"22"},"firefox_android":{"version_added":"22"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"background-size":{"__compat":{"description":"Values of <code>background-size</code> longhand","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"18"},"ie":{"version_added":"9"},"opera":{"version_added":"21"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"4"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_backgrounds":{"__compat":{"description":"Multiple backgrounds","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"41"},"firefox_android":{"prefix":"-moz-","version_added":"41"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-block-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-color","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"Experimental Web Platform Features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-style","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block-width","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-block","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a> CSS property that sets the bottom border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a> CSS property that sets the bottom border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-left-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-left-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomleft","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomleft","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-bottomleft</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-bottom-right-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-right-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomright","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-bottomright","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-bottomright</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-bottom-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-collapse":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-collapse","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the following non-standard CSS properties to set the border sides to multiple colors: <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a>"},"firefox_android":{"version_added":"4","notes":"Firefox also supports the following non-standard CSS properties to set the border sides to multiple colors: <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-bottom-colors'><code>-moz-border-bottom-colors</code></a>, <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a>"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-end-end-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-end-end-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-end-start-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-end-start-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-outset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-outset","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-repeat","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"round":{"__compat":{"description":"<code>round</code>","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space":{"__compat":{"description":"<code>space</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"12"},"firefox":{"version_added":"50"},"firefox_android":{"version_added":"50"},"ie":{"version_added":"11"},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-image-slice":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-slice","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},"firefox_android":{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"4.1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-source":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-source","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image-width","support":{"chrome":{"version_added":"15"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"13"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-image","support":{"chrome":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"7"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},{"version_added":"3.5","prefix":"-moz-","notes":"An earlier version of the specification was implemented, prefixed, in Firefox versions prior to 15."},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"15","notes":["Small SVGs are incorrectly stretched, because percentages in <a href='https://developer.mozilla.org/docs/Web/CSS/border-image-slice'><code>border-image-slice</code></a> are computed to integers instead of floats (<a href='https://bugzil.la/1284797'>bug 1284797</a>).","Until Firefox 47, SVGs without viewport were not sliced correctly (<a href='https://bugzil.la/619500'>bug 619500</a>).","From Firefox 48 until Firefox 49, SVGs without viewport are displayed the same as SVGs with viewport, but if the slices are not exactly 50%, they are incorrectly stretched (<a href='https://bugzil.la/1264809' >bug 1264809</a>).","Until Firefox 57, an issue persisted for SVGs without viewport when <a href='https://wiki.mozilla.org/Electrolysis'>e10s</a> was disabled (<a href='https://bugzil.la/1290782'>bug 1290782</a>)."]},{"version_added":"4","prefix":"-moz-","notes":"An earlier version of the specification was implemented, prefixed, in Firefox versions prior to 15."},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":[{"version_added":"11"},{"version_added":"10.5","version_removed":"15","prefix":"-o-"}],"opera_android":[{"version_added":"11"},{"version_added":"11","version_removed":"14","prefix":"-o-"}],"safari":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fill":{"__compat":{"support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradient":{"__compat":{"description":"<code>&lt;gradient&gt;</code>","support":{"chrome":{"version_added":"7"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"29"},"firefox_android":{"version_added":"29"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"optional_border_image_slice":{"__compat":{"description":"optional <code>&lt;border-image-slice&gt;</code>","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-inline-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-color","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-color"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-color"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-style"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-style"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-end-width"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-end-width"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-color","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-start-color"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-start-color"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-style","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"3","alternative_name":"-moz-border-start-style"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."},{"version_added":"4","alternative_name":"-moz-border-start-style"}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start-width","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}],"notes":"Enabled by default since Firefox 41."}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-style","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline-width","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-inline","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a> CSS property that sets the bottom border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-left-colors'><code>-moz-border-left-colors</code></a> CSS property that sets the bottom border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"14","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-radius","support":{"chrome":[{"version_added":"4","notes":"Chrome ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":{"version_added":"18"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":["Prior to Firefox 50, border styles of rounded corners (with <code>border-radius</code>) were always rendered as if <code>border-style</code> was <code>solid</code>. This has been fixed in Firefox 50.","To conform to the CSS3 standard, Firefox 4 changes the handling of <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> values to match the specification. You can specify an ellipse as a border on an arbitrary sized element with <code>border-radius: 50%;</code>. Firefox 4 also makes rounded corners clip content and images if <a href='https://developer.mozilla.org/docs/Web/CSS/overflow'><code>overflow</code></a><code>: visible</code> is not set."]},{"prefix":"-moz-","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <code>border-radius</code>) were always rendered as if <code>border-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":{"version_added":"10.5","notes":"Before Opera 11.60, replaced elements with <code>border-radius</code> do not have rounded corners."},"opera_android":{"version_added":"11"},"safari":[{"version_added":"5","notes":"Safari ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2","notes":"Safari ignores <code>border-radius</code> on <code>&lt;select&gt;</code> elements unless <code>-webkit-appearance</code> is overridden to an appropriate value."},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":{"version_added":"1.0"},"webview_android":[{"version_added":"≤37"},{"version_added":"2","prefix":"-webkit-"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_borders":{"__compat":{"description":"Elliptical borders","support":{"chrome":{"version_added":"1","notes":"Before Chrome 4, the slash <code>/</code> notation is unsupported. If two values are specified, then an elliptical border is drawn on all four corners. <code>-webkit-border-radius: 40px 10px;</code> is equivalent to <code>border-radius: 40px / 10px;</code>."},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"3","notes":"Before Safari 5, the slash <code>/</code> notation is unsupported. If two values are specified, then an elliptical border is drawn on all four corners. <code>-webkit-border-radius: 40px 10px;</code> is equivalent to <code>border-radius: 40px / 10px;</code>."},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4","notes":"<code>&lt;percentage&gt;</code> values are implemented in a non-standard way prior to Firefox 4. Both horizontal and vertical radii were relative to the width of the border box."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"11.5","notes":"The implementation of <code>&lt;percentage&gt;</code> values was buggy in Opera prior to 11.50."},"opera_android":{"version_added":"11.5"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"4_values_for_4_corners":{"__compat":{"description":"4 values for 4 corners","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-right-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a> CSS property that sets the right border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-right-colors'><code>-moz-border-right-colors</code></a> CSS property that sets the right border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"14","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-bottom-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-start-end-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-start-end-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-start-start-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-start-start-radius","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a> CSS property that sets the top border to multiple colors."},"firefox_android":{"version_added":"4","notes":"Firefox also supports the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-moz-border-top-colors'><code>-moz-border-top-colors</code></a> CSS property that sets the top border to multiple colors."},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-left-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-left-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topleft","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topleft","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-topleft</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-top-right-radius":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-right-radius","support":{"chrome":[{"version_added":"4"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topright","version_added":"1","version_removed":"12"}],"firefox_android":[{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners were always rendered as if <code>border-style</code> was solid. This has been fixed in Firefox 50."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"alternative_name":"-moz-border-radius-topright","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9"},"opera":[{"version_added":"10.5"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"4.2"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"elliptical_corners":{"__compat":{"description":"Elliptical corners","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentages":{"__compat":{"description":"Percentages","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"version_added":"1","notes":"Before Firefox 4, the <a href='https://developer.mozilla.org/docs/Web/CSS/percentage'><code>&lt;percentage&gt;</code></a> was relative to the width of the box even when specifying the radius for a height. This implied that <code>-moz-border-radius-topright</code> was always drawing an arc of circle, and never an ellipse, when followed by a single value."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"border-top-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-top-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"firefox_android":{"version_added":"4","notes":"Prior to Firefox 50, border styles of rounded corners (with <a href='https://developer.mozilla.org/docs/Web/CSS/border-radius'><code>border-radius</code></a>) were always rendered as if <code>border-top-style</code> was <code>solid</code>. This has been fixed in Firefox 50."},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"border":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/border","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5","notes":"In Internet Explorer versions before 7, when both <code>top</code> and <code>bottom</code> are specified, the element position is overconstrained and the <code>top</code> property has precedence; the computed value of <code>bottom</code> is set to <code>-top</code>, while its specified value is ignored."},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"box-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-align","support":{"chrome":{"version_added":"1","prefix":"-webkit-"},"chrome_android":{"version_added":"18","prefix":"-webkit-"},"edge":{"version_added":"12","prefix":"-webkit-"},"firefox":[{"version_added":"1","prefix":"-moz-"},{"version_added":"49","prefix":"-webkit-"}],"firefox_android":[{"version_added":"4","prefix":"-moz-"},{"version_added":"49","prefix":"-webkit-"}],"ie":{"version_added":false},"opera":{"version_added":"15","prefix":"-webkit-"},"opera_android":{"version_added":"14","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-decoration-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-decoration-break","support":{"chrome":{"prefix":"-webkit-","version_added":"22","notes":"This property is only supported for inline elements."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"This property is only supported for inline elements."},"edge":{"prefix":"-webkit-","version_added":"79","notes":"This property is only supported for inline elements."},"firefox":[{"version_added":"32"},{"alternative_name":"-moz-background-inline-policy","version_added":"1","version_removed":"32"}],"firefox_android":[{"version_added":"32"},{"alternative_name":"-moz-background-inline-policy","version_added":"4","version_removed":"32"}],"ie":{"version_added":false},"opera":[{"prefix":"-webkit-","version_added":"15"},{"version_added":"11.5","version_removed":"15"}],"opera_android":[{"prefix":"-webkit-","version_added":"14"},{"version_added":"11.5","version_removed":"14"}],"safari":{"version_added":"6.1","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"safari_ios":{"version_added":"7","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-","notes":"This property is only supported for inline elements."},"webview_android":{"prefix":"-webkit-","version_added":"≤37","notes":"This property is only supported for inline elements."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"box-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-direction","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-flex-group":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-flex-group","support":{"chrome":{"version_added":"1","version_removed":"67","prefix":"-webkit-"},"chrome_android":{"version_added":"18","version_removed":"67","prefix":"-webkit-"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"54","prefix":"-webkit-"},"opera_android":{"version_added":"14","version_removed":"48","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","version_removed":"9.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","version_removed":"67","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-flex":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-flex","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-lines":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-lines","support":{"chrome":{"version_added":"1","version_removed":"67","prefix":"-webkit-"},"chrome_android":{"version_added":"18","version_removed":"67","prefix":"-webkit-"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"54","prefix":"-webkit-"},"opera_android":{"version_added":"14","version_removed":"48","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","version_removed":"9.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","version_removed":"67","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-ordinal-group":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-ordinal-group","support":{"chrome":{"version_added":"1","prefix":"-webkit-"},"chrome_android":{"version_added":"18","prefix":"-webkit-"},"edge":{"version_added":"12","prefix":"-webkit-"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15","prefix":"-webkit-"},"opera_android":{"version_added":"14","prefix":"-webkit-"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"1.1","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"1","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"version_added":"≤37","prefix":"-webkit-"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-orient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-orient","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-pack":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-pack","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":[{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"3"},{"prefix":"-khtml-","version_added":"1.1","version_removed":"3"}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"box-shadow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-shadow","support":{"chrome":[{"version_added":"10","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-moz-","version_added":"4","version_removed":"14"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"9","notes":["To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>.","Since version 5.5, Internet Explorer supports Microsoft's <a href='http://msdn.microsoft.com/en-us/library/ms532985%28VS.85,loband%29.aspx'>DropShadow</a> and <a href='http://msdn.microsoft.com/en-us/library/ms533086%28VS.85,loband%29.aspx'>Shadow Filter</a>. You can use this proprietary extension to cast a drop shadow (though the syntax and the effect are different from CSS3)"]},"opera":{"version_added":"10.5","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},"opera_android":[{"version_added":"14","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"5","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37","notes":"Shadows affect layout in this browser. For example, if you cast an outer shadow to a box with a <code>width</code> of <code>100%</code>, then you'll see a scrollbar."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"inset":{"__compat":{"description":"<code>inset</code>","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","partial_implementation":true,"notes":["To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>.","<code>inset</code> must be the last keyword in the declaration."]},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multiple_shadows":{"__compat":{"description":"Multiple shadows","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","notes":"To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>."},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"spread_radius":{"__compat":{"description":"Spread radius","support":{"chrome":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"4"},{"prefix":"-moz-","version_added":"3.5","version_removed":"13"}],"firefox_android":[{"version_added":"4"},{"prefix":"-moz-","version_added":"4","version_removed":"14"}],"ie":{"version_added":"9","notes":"To use <code>box-shadow</code> in Internet Explorer 9 or later, you must set <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> to <code>separate</code>."},"opera":{"version_added":"10.5"},"opera_android":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"5"}],"safari_ios":[{"version_added":"5"},{"prefix":"-webkit-","version_added":"4.2"}],"samsunginternet_android":[{"version_added":"1.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"box-sizing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/box-sizing","support":{"chrome":[{"version_added":"10","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"18","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"29"},{"prefix":"-moz-","version_added":"1","notes":"Before Firefox 23, <code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"29"},{"prefix":"-moz-","version_added":"4","notes":"Before Firefox 23, <code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"8","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},"opera":{"version_added":"7"},"opera_android":[{"version_added":"14","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"5.1"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"6"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.0","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"4","notes":"<code>box-sizing</code> is not respected when the height is calculated from <a href='https://developer.mozilla.org/docs/Web/API/Window/getComputedStyle'><code>window.getComputedStyle()</code></a>."},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"padding-box":{"__compat":{"description":"<code>padding-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"50"},"firefox_android":{"version_added":"4","version_removed":"50"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"break-after":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-after","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"firefox_android":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"firefox_android":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"avoid-column":{"__compat":{"description":"<code>avoid-column</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column":{"__compat":{"description":"<code>column</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":[{"version_added":"11.1","version_removed":"15"},{"version_added":"37"}],"opera_android":[{"version_added":"11.1","version_removed":"14"},{"version_added":"37"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-after","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"recto":{"__compat":{"description":"<code>recto</code> and <code>verso</code>","support":{"chrome":{"version_added":false,"notes":"See <a href='https://crbug.com/538475'>bug 538475</a>."},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"break-before":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-before","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"firefox_android":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"firefox_android":{"version_added":"65","partial_implementation":true,"notes":"Only supported in print mode. See <a href='https://bugzil.la/1675322'>bug 1675322</a>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"avoid-column":{"__compat":{"description":"<code>avoid-column</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column":{"__compat":{"description":"<code>column</code>","support":{"chrome":{"version_added":"51"},"chrome_android":{"version_added":"51"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"38"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"51"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-before","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"always":{"__compat":{"description":"<code>always</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":{"version_added":"11.1","version_removed":"12.1"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"recto":{"__compat":{"description":"<code>recto</code> and <code>verso</code>","support":{"chrome":{"version_added":false,"notes":"See <a href='https://crbug.com/538475'>bug 538475</a>."},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"break-inside":{"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-inside","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"column":{"__compat":{"description":"<code>column</code> and <code>avoid-column</code>","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"37"},"opera_android":{"version_added":"37"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"paged_context":{"__compat":{"description":"Supported in Paged Media","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/break-inside","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"37"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"page":{"__compat":{"description":"<code>page</code> and <code>avoid-page</code>","support":{"chrome":{"version_added":"51"},"chrome_android":{"version_added":"51"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"38"},{"version_added":"11.1","version_removed":"12.1"}],"opera_android":[{"version_added":"41"},{"version_added":"11.1","version_removed":"12.1"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"51"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"caption-side":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/caption-side","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"non_standard_values":{"__compat":{"description":"Non-standard values <code>left</code>, <code>right</code>, <code>top-outside</code>, and <code>bottom-outside</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"writing-mode_relative_values":{"__compat":{"description":"<code>top</code> and <code>bottom</code> are relative to the <code>writing-mode</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"42"},"firefox_android":{"version_added":"42"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"caret-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/caret-color","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"clear":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clear","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"flow_relative_values":{"__compat":{"description":"Flow-relative values <code>inline-start</code> and <code>inline-end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55"},"firefox_android":{"version_added":"55"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"clip-path":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clip-path","support":{"chrome":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"23"}],"chrome_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12","notes":"Edge only supports clip paths defined by <code>url()</code>."},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10","notes":"Internet Explorer only supports clip paths defined by <code>url()</code>."},"opera":[{"version_added":"42"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"42"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animations":{"__compat":{"description":"Animations","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"79"},"firefox":{"version_added":"49"},"firefox_android":{"version_added":"49"},"ie":{"version_added":false},"opera":{"version_added":"42"},"opera_android":{"version_added":"42"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"basic_shape":{"__compat":{"description":"<code>&lt;basic-shape&gt;</code>","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":[{"version_added":"54"},{"version_added":"47","version_removed":"54","flags":[{"type":"preference","name":"layout.css.clip-path-shapes.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"54"},{"version_added":"47","version_removed":"54","flags":[{"type":"preference","name":"layout.css.clip-path-shapes.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fill_and_stroke_box":{"__compat":{"description":"<code>fill-box</code> and <code>stroke-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"51","notes":"This value was supported before Firefox 51, but as an alias to <code>border-box</code>."},"firefox_android":{"version_added":"51","notes":"This value was supported before Firefox 51, but as an alias to <code>border-box</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"html":{"__compat":{"description":"On HTML elements","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"path":{"__compat":{"description":"<code>path()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.clip-path-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"63","flags":[{"type":"preference","name":"layout.css.clip-path-path.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":"23"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/clip","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"Before Internet Explorer 7, Internet Explorer incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1","notes":"Safari incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"safari_ios":{"version_added":"1","notes":"Safari incorrectly interprets <code>clip: auto</code> as <code>clip: rect(auto, auto, auto, auto)</code>."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"color-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/color-adjust","support":{"chrome":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"},"chrome_android":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"},"edge":{"version_added":"79","alternative_name":"-webkit-print-color-adjust"},"firefox":{"version_added":"48"},"firefox_android":{"version_added":"48"},"ie":{"version_added":false},"opera":{"version_added":"15","alternative_name":"-webkit-print-color-adjust"},"opera_android":{"version_added":"36","alternative_name":"-webkit-print-color-adjust"},"safari":{"version_added":"6","alternative_name":"-webkit-print-color-adjust"},"safari_ios":{"version_added":"6","alternative_name":"-webkit-print-color-adjust"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-print-color-adjust"},"webview_android":{"version_added":"49","alternative_name":"-webkit-print-color-adjust"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"color-scheme":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/color-scheme","spec_url":"https://drafts.csswg.org/css-color-adjust/#color-scheme-prop","support":{"chrome":{"version_added":"81"},"chrome_android":{"version_added":"81"},"edge":{"version_added":"81"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"68"},"opera_android":{"version_added":"58"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"81"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"only_dark":{"__compat":{"description":"<code>only dark</code> keyword","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"only_light":{"__compat":{"description":"<code>only light</code> keyword","support":{"chrome":{"version_added":"81","version_removed":"85"},"chrome_android":{"version_added":"81","version_removed":"85"},"edge":{"version_added":"81","version_removed":"85"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"68","version_removed":"71"},"opera_android":{"version_added":"58","version_removed":"60"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-count":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-count","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-fill":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-fill","support":{"chrome":{"version_added":"50"},"chrome_android":{"version_added":"50"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"13","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"14"}],"ie":{"version_added":"10"},"opera":{"version_added":"37"},"opera_android":{"version_added":"37"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"balance-all":{"__compat":{"description":"<code>balance-all</code>","support":{"chrome":{"version_added":false,"notes":"See <a href='https://crbug.com/909596'>bug 909596</a>"},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"column-gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"},{"version_added":"29","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"},{"version_added":"29","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-column-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-column-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-column-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-column-gap"},{"version_added":"28","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-column-gap"},{"version_added":"28","alternative_name":"grid-column-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"12.1"},{"version_added":"10.1","alternative_name":"grid-column-gap"}],"safari_ios":[{"version_added":"12"},{"version_added":"10.3","alternative_name":"grid-column-gap"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-column-gap","version_added":"6.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-column-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-gap","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Before Firefox 3, the default value for the <code>normal</code> keyword was <code>0</code> and not <code>1em</code>."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"11.1","version_removed":"15"}],"opera_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"11.1","version_removed":"14"}],"qq_android":{"version_added":null},"safari":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"10"},{"prefix":"-webkit-","version_added":"3"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"calc_values":{"__compat":{"description":"<code>calc()</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentage_values":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}}},"column-rule-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-color","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-style","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule-width","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74"}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-rule":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-rule","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"3.5","version_removed":"74","notes":"Before Firefox 3, the default value for the <code>normal</code> keyword was <code>0</code> and not <code>1em</code>."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-span":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-span","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"6"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"71"},{"version_added":"65","flags":[{"type":"preference","name":"layout.css.column-span.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"65","flags":[{"type":"preference","name":"layout.css.column-span.enabled","value_to_set":"true"}]},"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"5"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"column-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/column-width","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"1.5","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"4","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"intrinsic_sizes":{"__compat":{"description":"Intrinsic sizes","support":{"chrome":{"version_added":false,"notes":"See <a href='https://crbug.com/964183'>bug 964183</a>"},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/columns","support":{"chrome":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"50"}],"chrome_android":{"version_added":"50"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"52"},{"prefix":"-moz-","version_added":"9","version_removed":"74","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"firefox_android":[{"version_added":"52"},{"prefix":"-moz-","version_added":"22","notes":"Prior to version 37, multiple columns didn't work with <code>display: table-caption</code> elements."}],"ie":{"version_added":"10"},"opera":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"11.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"50"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"contain-intrinsic-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/contain-intrinsic-size","support":{"chrome":{"version_added":"83"},"chrome_android":{"version_added":"83"},"edge":{"version_added":"83"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"69"},"opera_android":{"version_added":"59"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"83"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"contain":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/contain","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"69","notes":"Firefox does not support the <code>style</code> value."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.contain.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"41","flags":[{"type":"preference","name":"layout.css.contain.enabled","value_to_set":"true"}],"notes":"Firefox does not support the <code>style</code> value."},"ie":{"version_added":false},"opera":{"version_added":"40"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"content-visibility":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/content-visibility","support":{"chrome":{"version_added":"85"},"chrome_android":{"version_added":"85"},"edge":{"version_added":"85"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"71"},"opera_android":{"version_added":"60"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"85"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/content","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alt_text":{"__compat":{"description":"Alternative text after <code>/</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"element_replacement":{"__compat":{"description":"Element replacement","support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/url","description":"<code>url()</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"counter-increment":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-increment","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"counter-reset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-reset","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"25"},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"counter-set":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/counter-set","support":{"chrome":{"version_added":"85"},"chrome_android":{"version_added":"85"},"edge":{"version_added":"85"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"71"},"opera_android":{"version_added":"60"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"85"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cursor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/cursor","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Starting in Firefox 67, the maximum size allowed for custom cursors is 32x32 pixels due to cursors being misused by certain malicious sites."},"firefox_android":{"version_added":false},"ie":{"version_added":"4","notes":"In Internet Explorer 11, when <code>cursor</code> is applied to an element and this element is underneath an open <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a> menu and the user hovers over a <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a> menu item that's on top of said element, the cursor for said element will be displayed rather than the <a href='https://developer.mozilla.org/docs/Web/HTML/Element/select'><code>&lt;select&gt;</code></a>'s normal cursor. See <a href='https://developer.microsoft.com/microsoft-edge/platform/issues/817822/'>bug 817822</a>."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"alias":{"__compat":{"description":"<code>alias</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"all-scroll":{"__compat":{"description":"<code>all-scroll</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bidirectional_resize":{"__compat":{"description":"Bidirectional resize cursors (<code>ew-resize</code>, <code>nesw-resize</code>, <code>ns-resize</code>, and <code>nwse-resize</code>)","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cell":{"__compat":{"description":"<code>cell</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"col-resize":{"__compat":{"description":"<code>col-resize</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"context-menu":{"__compat":{"description":"<code>context-menu</code>","support":{"chrome":{"version_added":"1","notes":"This cursor is only supported on macOS and Linux."},"chrome_android":{"version_added":"18","notes":"This cursor is only supported on macOS and Linux."},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5","notes":"This cursor is only supported on macOS and Linux."},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14","notes":"This cursor is only supported on macOS and Linux."},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0","notes":"This cursor is only supported on macOS and Linux."},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"copy":{"__compat":{"description":"<code>copy</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"crosshair":{"__compat":{"description":"<code>crosshair</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"default":{"__compat":{"description":"<code>default</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grab":{"__compat":{"description":"Grab cursors (<code>grab</code> and <code>grabbing</code>)","support":{"chrome":[{"version_added":"68","notes":"Chrome also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"1","notes":"Chrome 22 added Windows support."}],"chrome_android":[{"version_added":"68","notes":"Chrome also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"18","notes":"Chrome 22 added Windows support."}],"edge":{"version_added":"14"},"firefox":[{"version_added":"27"},{"prefix":"-moz-","version_added":"1.5"}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"55","notes":"Opera also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"15","notes":"Opera 22 added Windows support."}],"opera_android":[{"version_added":"48","notes":"Opera also continues to support the prefixed versions."},{"prefix":"-webkit-","version_added":"14","notes":"Opera 22 added Windows support."}],"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":[{"version_added":"10.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"help":{"__compat":{"description":"<code>help</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inherit":{"__compat":{"description":"<code>inherit</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"move":{"__compat":{"description":"<code>move</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"no-drop":{"__compat":{"description":"<code>no-drop</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"description":"<code>none</code>","support":{"chrome":{"version_added":"5"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"not-allowed":{"__compat":{"description":"<code>not-allowed</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pointer":{"__compat":{"description":"<code>pointer</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"progress":{"__compat":{"description":"<code>progress</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"row-resize":{"__compat":{"description":"<code>row-resize</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unidirectional_resize":{"__compat":{"description":"Unidirectional resize cursors (<code>n-resize</code>, <code>e-resize</code>, <code>s-resize</code>, <code>w-resize</code>, <code>ne-resize</code>, <code>nw-resize</code>, <code>se-resize</code>, and <code>sw-resize</code>)","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url":{"__compat":{"description":"<code>url()</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5","notes":"Firefox 4 added macOS support."},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"url_positioning_syntax":{"__compat":{"description":"<code>url()</code> positioning syntax","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1.5","notes":"Firefox 4 added macOS support."},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"vertical-text":{"__compat":{"description":"<code>vertical-text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"10.6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"wait":{"__compat":{"description":"<code>wait</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"zoom":{"__compat":{"description":"Zoom cursors (<code>zoom-in</code> and <code>zoom-out</code>)","support":{"chrome":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"24"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"15","version_removed":"23"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14","version_removed":"24"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"custom-property":{"__compat":{"description":"--*","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/--*","support":{"chrome":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"15"},"firefox":[{"version_added":"31"},{"version_added":"29","version_removed":"55","partial_implementation":true,"notes":"From Firefox 29 until Firefox 31, this feature was implemented by the <code>var-variablename</code> syntax.","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"31"},{"version_added":"29","version_removed":"55","partial_implementation":true,"notes":"From Firefox 29 until Firefox 31, this feature was implemented by the <code>var-variablename</code> syntax.","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"49"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"env":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/env","description":"<code>env()</code>","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":[{"version_added":"11.1"},{"version_added":"11","version_removed":"11.1","alternative_name":"constant"}],"safari_ios":[{"version_added":"11.3"},{"version_added":"11","version_removed":"11.3","alternative_name":"constant"}],"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"var":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/var","description":"<code>var()</code>","support":{"chrome":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"49"},{"version_added":"48","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"15"},"firefox":[{"version_added":"31"},{"version_added":"29","version_removed":"55","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"31"},{"version_added":"29","version_removed":"55","flags":[{"type":"preference","name":"layout.css.variables.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"50"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/direction","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"display":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/display","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contents":{"__compat":{"support":{"chrome":[{"version_added":"65"},{"version_added":"58","version_removed":"65","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"65"},{"version_added":"58","version_removed":"65","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"79"},"firefox":[{"version_added":"37"},{"version_added":"36","version_removed":"53","flags":[{"type":"preference","name":"layout.css.display-contents.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"57"},"ie":{"version_added":false},"opera":[{"version_added":"52"},{"version_added":"45","version_removed":"52","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","version_removed":"47","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"65"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"contents_unusual":{"__compat":{"description":"Specific behavior of unusual elements when <code>display: contents</code> is applied to them","support":{"chrome":{"version_added":"58"},"chrome_android":{"version_added":"58"},"edge":{"version_added":"79"},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"45"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"65"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"display-outside":{"__compat":{"description":"<code>&lt;display-outside&gt;</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/display-outside","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"run-in":{"__compat":{"support":{"chrome":{"version_added":"1","version_removed":"32","notes":"Before Chrome 4, <code>run-in</code> was not supported before inline elements."},"chrome_android":{"version_added":"18","version_removed":"32"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"7","version_removed":"19"},"opera_android":{"version_added":"10.1","version_removed":"19"},"safari":{"version_added":"1","version_removed":"8","notes":"Before Safari 5, <code>run-in</code> was not supported before inline elements."},"safari_ios":{"version_added":"1","version_removed":"8","notes":"Before Safari 5, <code>run-in</code> was not supported before inline elements."},"samsunginternet_android":{"version_added":"1.0","version_removed":"2.0"},"webview_android":{"version_added":"≤37","version_removed":"≤37"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"flex":{"__compat":{"support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11","partial_implementation":true,"notes":"IE incorrectly positions inline block content inside flex containers. See the <a href='https://answers.microsoft.com/en-us/ie/forum/ie11-iewindows_10/inline-block-content-in-a-flex-container-not/deea64e2-933b-4bd2-a98c-62be16d04b57'>discussion on Microsoft Answers</a>."},{"alternative_name":"-ms-flexbox","version_added":"8","partial_implementation":true,"notes":"IE incorrectly positions inline block content inside flex containers. See the <a href='https://answers.microsoft.com/en-us/ie/forum/ie11-iewindows_10/inline-block-content-in-a-flex-container-not/deea64e2-933b-4bd2-a98c-62be16d04b57'>discussion on Microsoft Answers</a>."}],"opera":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"}],"opera_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flow-root":{"__compat":{"support":{"chrome":{"version_added":"58"},"chrome_android":{"version_added":"58"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"45"},"opera_android":{"version_added":"43"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"58"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid":{"__compat":{"support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":[{"version_added":"16"},{"prefix":"-ms-","version_added":"12"}],"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer implements an older version of the specification."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"notes":"Samsung Internet added this earlier than the corresponding Chrome version would indicate.","version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-block":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"8"},{"version_added":"6","partial_implementation":true,"notes":"Until Internet Explorer 8, <code>inline-block</code> is only for natural inline elements."}],"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-flex":{"__compat":{"support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Firefox 28 added multi-line flexbox support."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"alternative_name":"-ms-inline-flexbox","version_added":"8"}],"opera":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-grid":{"__compat":{"support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":[{"version_added":"16"},{"prefix":"-ms-","version_added":"12"}],"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer implements an older version of the specification."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"notes":"Samsung Internet added this earlier than the corresponding Chrome version would indicate.","version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inline-table":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-item":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"legend-support":{"__compat":{"description":"Supported on <code>&lt;legend&gt;</code>","support":{"chrome":{"version_added":"71"},"chrome_android":{"version_added":"71"},"edge":{"version_added":"79"},"firefox":{"version_added":"64"},"firefox_android":{"version_added":"64"},"ie":{"version_added":false},"opera":{"version_added":"58"},"opera_android":{"version_added":"50"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"71"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"multi-keyword_values":{"__compat":{"description":"Multi-keyword values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"chrome_android":{"version_added":"18","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7","notes":"Opera 52 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"opera_android":{"version_added":"10.1","notes":"Opera Android 47 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0","notes":"Chrome 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."},"webview_android":{"version_added":"≤37","notes":"WebView 65 stopped creating layout objects for elements inside an <code>&lt;iframe&gt;</code> with <code>display:none</code> applied."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ruby_values":{"__compat":{"description":"<code>ruby</code>, <code>ruby-base</code>, <code>ruby-base-container</code>, <code>ruby-text</code>, and <code>ruby-text-container</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":[{"version_added":"38"},{"version_added":"34","version_removed":"38","flags":[{"type":"preference","name":"layout.css.ruby.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"38"},{"version_added":"34","version_removed":"38","flags":[{"type":"preference","name":"layout.css.ruby.enabled","value_to_set":"true"}]}],"ie":{"version_added":"7"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"table_values":{"__compat":{"description":"<code>table</code>, <code>table-cell</code>, <code>table-column</code>, <code>table-column-group</code>, <code>table-footer-group</code>, <code>table-header-group</code>, <code>table-row</code>, and <code>table-row-group</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"xul_box_values":{"__compat":{"description":"<code>-moz-box</code> and <code>-moz-inline-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"64","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-box-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"64","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-box-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_deck_values":{"__compat":{"description":"<code>-moz-deck</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_grid_values":{"__compat":{"description":"<code>-moz-grid</code>, <code>-moz-grid-group</code>, and <code>-moz-grid-line</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_inline_grid_stack":{"__compat":{"description":"<code>-moz-inline-grid</code> and <code>-moz-inline-stack</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"Available to Firefox UI code."},{"version_added":"62","version_removed":"70","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_popup_values":{"__compat":{"description":"<code>-moz-popup</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"xul_stack_value":{"__compat":{"description":"<code>-moz-stack</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"1","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"firefox_android":[{"version_added":"4","version_removed":"62","notes":"This is still available to Firefox UI code."},{"version_added":"62","flags":[{"name":"layout.css.xul-display-values.content.enabled","type":"preference","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"empty-cells":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/empty-cells","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"filter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/filter","support":{"chrome":[{"version_added":"53"},{"prefix":"-webkit-","version_added":"18","notes":"In Chrome 18 to 19, the <code>saturate()</code> function only takes integers instead of decimal or percentage values. From Chrome 20, this bug is fixed."}],"chrome_android":{"version_added":"53"},"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"35"},{"partial_implementation":true,"version_added":"34","flags":[{"type":"preference","name":"layout.css.filters.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"46","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"35"},{"partial_implementation":true,"version_added":"34","flags":[{"type":"preference","name":"layout.css.filters.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"46","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false,"notes":"Internet Explorer 4 to 9 implemented a non-standard <code>filter</code> property. The syntax was completely different from this one and is not documented here."},"opera":[{"version_added":"40"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"41"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"6"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"6"}],"samsunginternet_android":{"version_added":"6.0"},"webview_android":[{"version_added":"53"},{"prefix":"-webkit-","version_added":"4.4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"flex-basis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-basis","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"22","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"22","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"When a non-<code>auto</code> <code>flex-basis</code> is specified, Internet Explorer 10 and 11 always uses a <code>content-box</code> box model to calculate the size of a flex item, even if <a href='https://developer.mozilla.org/docs/Web/CSS/box-sizing'><code>box-sizing: border-box</code></a> is applied to the element. See <a href='https://github.com/philipwalton/flexbugs#7-flex-basis-doesnt-account-for-box-sizingborder-box'>Flexbug #7</a> for more info."},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"22"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":"18"},"firefox_android":{"version_added":"18"},"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"content":{"__compat":{"description":"<code>content</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"22","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"flex-direction":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-direction","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","partial_implementation":true,"notes":["Since Firefox 28, multi-line flexbox is supported.","Does not support overflow when using <code>*-reverse</code>. See <a href='https://bugzil.la/1042151'>bug 1042151</a> for more info."]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","partial_implementation":true,"notes":["Since Firefox 28, multi-line flexbox is supported.","Does not support overflow when using <code>*-reverse</code>. See <a href='https://bugzil.la/1042151'>bug 1042151</a> for more info."]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-flow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-flow","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"28"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-grow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-grow","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","alternative_name":"-ms-flex-positive"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"less_than_zero_animate":{"__compat":{"description":"<0 animate","support":{"chrome":{"version_added":"49"},"chrome_android":{"version_added":"49"},"edge":{"version_added":"79"},"firefox":{"version_added":"32","notes":"Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."},"firefox_android":{"version_added":"32","notes":"Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."},"ie":{"version_added":false},"opera":{"version_added":"36"},"opera_android":{"version_added":"36"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"49"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"flex-shrink":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-shrink","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>."]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","notes":"Internet Explorer 10 uses <code>0</code> instead of <code>1</code> as the initial value for the <code>flex-shrink</code> property. A workaround is to always set an explicit value for <code>flex-shrink</code>. See <a href='https://github.com/philipwalton/flexbugs#6-the-default-flex-value-has-changed'>Flexbug #6</a> for more info."},"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex-wrap","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":{"version_added":"12"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"11","partial_implementation":true,"notes":"Partial support due to large number of bugs present. See <a href='https://github.com/philipwalton/flexbugs'>Flexbugs</a>."},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flex":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/flex","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>.","Until Firefox 61, flex items that are sized according to their content are sized using <a href='https://drafts.csswg.org/css-sizing-3/#column-sizing'><code>fit-content</code>, not <code>max-content</code></a>."]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":["Since Firefox 28, multi-line flexbox is supported.","Before Firefox 32, Firefox wasn't able to animate values starting or stopping at <code>0</code>.","Until Firefox 61, flex items that are sized according to their content are sized using <a href='https://drafts.csswg.org/css-sizing-3/#column-sizing'>fit-content, not max-content</a>."]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"11","notes":["Internet Explorer 11 ignores uses of <a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> in the <code>flex-basis</code> part of the <code>flex</code> syntax. This can be worked around by using the longhand properties instead of the shorthand. See <a href='https://github.com/philipwalton/flexbugs#8-flex-basis-doesnt-support-calc'>Flexbug #8</a> for more info.","Internet Explorer 11 considers a unitless value in the <code>flex-basis</code> part to be syntactically invalid (and will thus be ignored). A workaround is to always include a unit in the <code>flex-basis</code> part of the <code>flex</code> shorthand value. See <a href='https://github.com/philipwalton/flexbugs#4-flex-shorthand-declarations-with-unitless-flex-basis-values-are-ignored'>Flexbug #4</a> for more info."]},{"prefix":"-ms-","version_added":"10","notes":["Internet Explorer 10 and 11 ignore uses of <a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> in the <code>flex-basis</code> part of the <code>flex</code> syntax. This can be worked around by using the longhand properties instead of the shorthand. See <a href='https://github.com/philipwalton/flexbugs#8-flex-basis-doesnt-support-calc'>Flexbug #8</a> for more info.","Internet Explorer 10 and 11 consider a unitless value in the <code>flex-basis</code> part to be syntactically invalid (and will thus be ignored). A workaround is to always include a unit in the <code>flex-basis</code> part of the <code>flex</code> shorthand value. See <a href='https://github.com/philipwalton/flexbugs#4-flex-shorthand-declarations-with-unitless-flex-basis-values-are-ignored'>Flexbug #4</a> for more info."]}],"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"float":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/float","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"flow_relative_values":{"__compat":{"description":"Flow-relative values <code>inline-start</code> and <code>inline-end</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"55"},"firefox_android":{"version_added":"55"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-family":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-family","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Not supported on <code>option</code> elements. See <a href='https://bugzil.la/1536148'>bug 1536148</a>."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"system_ui":{"__compat":{"description":"<code>system-ui</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"79"},"firefox":[{"version_added":false},{"alternative_name":"-apple-system","version_added":"43","notes":"Supported on macOS only."}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"alternative_name":"-apple-system","version_added":"9","notes":"Supported since macOS 10.11."},"safari_ios":{"alternative_name":"-apple-system","version_added":"9"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-feature-settings":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-feature-settings","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"16"}],"chrome_android":{"version_added":"48"},"edge":{"version_added":"15"},"firefox":[{"version_added":"34","notes":"The <a href='http://mpeg.chiariglione.org/standards/mpeg-4/open-font-format/text-isoiec-cd-14496-22-3rd-edition' >ISO/IEC CD 14496-22 3rd edition</a> suggests using the <code>ssty</code> feature to provide glyph variants more suitable for use in scripts (for example primes used as superscripts). Starting with Firefox 29, this is done automatically by the <a href='https://developer.mozilla.org/docs/Web/MathML'>MathML</a> rendering engine. The ISO/IEC CD 14496-22 3rd edition also suggests applying the <code>dtls</code> feature to letters when placing mathematical accents to get dotless forms (for example dotless i, j with a hat). Starting with Firefox 35, this is done automatically by the MathML rendering engine. You can override the default values determined by the MathML rendering engine with CSS."},{"prefix":"-moz-","version_added":"15","notes":"From Firefox 4 to Firefox 14 (inclusive), Firefox supported an older, slightly different syntax. See <a href='http://hacks.mozilla.org/2010/11/firefox-4-font-feature-support/'>OpenType Font Feature support in Firefox 4</a>."}],"firefox_android":[{"version_added":"34","notes":"The <a href='http://mpeg.chiariglione.org/standards/mpeg-4/open-font-format/text-isoiec-cd-14496-22-3rd-edition' >ISO/IEC CD 14496-22 3rd edition</a> suggests using the <code>ssty</code> feature to provide glyph variants more suitable for use in scripts (for example primes used as superscripts). Starting with Firefox 29, this is done automatically by the <a href='https://developer.mozilla.org/docs/Web/MathML'>MathML</a> rendering engine. The ISO/IEC CD 14496-22 3rd edition also suggests applying the <code>dtls</code> feature to letters when placing mathematical accents to get dotless forms (for example dotless i, j with a hat). Starting with Firefox 35, this is done automatically by the MathML rendering engine. You can override the default values determined by the MathML rendering engine with CSS."},{"prefix":"-moz-","version_added":"15","notes":"From Firefox 4 to Firefox 14 (inclusive), Firefox supported an older, slightly different syntax. See <a href='http://hacks.mozilla.org/2010/11/firefox-4-font-feature-support/'>OpenType Font Feature support in Firefox 4</a>."}],"ie":{"version_added":"10"},"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9.1"},{"partial_implementation":true,"version_added":"4","version_removed":"6"}],"safari_ios":[{"version_added":"9.3"},{"partial_implementation":true,"version_added":"3.2","version_removed":"6.1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-kerning":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-kerning","support":{"chrome":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"29","version_removed":"33"}],"chrome_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"29","version_removed":"33"}],"edge":{"version_added":"79"},"firefox":[{"version_added":"32"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"32"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"20"},{"prefix":"-webkit-","version_added":"16","version_removed":"20"}],"opera_android":[{"version_added":"20"},{"prefix":"-webkit-","version_added":"16","version_removed":"20"}],"safari":[{"version_added":"9"},{"version_added":"6","prefix":"-webkit-"}],"safari_ios":[{"version_added":"9"},{"version_added":"6","prefix":"-webkit-"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.0","version_removed":"2.0"}],"webview_android":[{"version_added":"4.4.3"},{"prefix":"-webkit-","version_added":"4.4","version_removed":"4.4.3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-language-override":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-language-override","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"4"}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-optical-sizing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-optical-sizing","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"17"},"firefox":[{"version_added":"62"},{"version_added":"60","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"60","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"66"},"opera_android":{"version_added":false},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-size-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-size-adjust","support":{"chrome":{"version_added":"43","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"chrome_android":{"version_added":"43","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"edge":{"version_added":"79","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"firefox":[{"version_added":"40"},{"version_added":"3","notes":"Before Firefox 40, <code>font-size-adjust: 0</code> was incorrectly interpreted as <code>font-size-adjust: none</code> (<a href='https://bugzil.la/1144885'>bug 1144885</a>)."},{"version_added":"1","notes":"Before Firefox 3, <code>font-size-adjust</code> was supported on Windows only."}],"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"30","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"opera_android":{"version_added":"30","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-size","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"rem_values":{"__compat":{"description":"<code>rem</code> values","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"42"},"edge":{"version_added":"12"},"firefox":{"version_added":"31","notes":["Before Firefox 57, animations using em units are not affected by changes to the <code>font-size</code> of the animated element's parent (<a href='https://bugzil.la/1254424'>bug 1254424</a>).","Before Firefox 57, some language settings' inherited <code>font-size</code> is smaller than expected (<a href='https://bugzil.la/1391341'>bug 1391341</a>)."]},"firefox_android":{"version_added":"31"},"ie":[{"version_added":"11"},{"partial_implementation":true,"version_added":"9","version_removed":"10"}],"opera":{"version_added":"28"},"opera_android":{"version_added":"28"},"safari":{"version_added":"7"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"4.1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"xxx-large":{"__compat":{"description":"<code>xxx-large</code> keyword","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-smooth":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-smooth","support":{"chrome":{"version_added":"5","alternative_name":"-webkit-font-smoothing"},"chrome_android":{"version_added":"18","alternative_name":"-webkit-font-smoothing"},"edge":{"version_added":"79","alternative_name":"-webkit-font-smoothing"},"firefox":{"version_added":"25","alternative_name":"-moz-osx-font-smoothing","notes":"Only works on macOS."},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","alternative_name":"-webkit-font-smoothing"},"opera_android":{"version_added":"14","alternative_name":"-webkit-font-smoothing"},"safari":{"version_added":"4","alternative_name":"-webkit-font-smoothing"},"safari_ios":{"version_added":"3.2","alternative_name":"-webkit-font-smoothing"},"samsunginternet_android":{"alternative_name":"-webkit-font-smoothing","version_added":"1.0"},"webview_android":{"version_added":"≤37","alternative_name":"-webkit-font-smoothing"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"font-stretch":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-stretch","support":{"chrome":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"chrome_android":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"edge":{"version_added":"12"},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":"9"},"opera":{"version_added":"47","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"opera_android":{"version_added":"44","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."},"webview_android":{"version_added":"60","notes":"A <code>font-stretch</code> definition must be added to the <code>@font-face</code> before this property will function."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"<code>&lt;percentage&gt;</code> syntax","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"18"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11.1"},"safari_ios":{"version_added":"11.3"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 44, <code>oblique</code> was not distinguished from <code>italic</code>."},"firefox_android":{"version_added":"4","notes":"Before Firefox 44, <code>oblique</code> was not distinguished from <code>italic</code>."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"oblique-angle":{"__compat":{"description":"<code>oblique</code> can accept an <code>&lt;angle&gt;</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-synthesis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-synthesis","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"34"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-alternates":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}},"annotation":{"__compat":{"description":"<code>annotation()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#annotation()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"character_variant":{"__compat":{"description":"<code>character-variant()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#character-variant()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"ornaments":{"__compat":{"description":"<code>ornaments()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#ornaments()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"styleset":{"__compat":{"description":"<code>styleset()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#styleset()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"stylistic":{"__compat":{"description":"<code>stylistic()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#stylistic()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"swash":{"__compat":{"description":"<code>swash()</code>","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-alternates#swash()","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"font-variant-caps":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-caps","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-east-asian":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-east-asian","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-ligatures":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-ligatures","support":{"chrome":[{"version_added":"34"},{"prefix":"-webkit-","version_added":"31"}],"chrome_android":{"version_added":"34"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"21"},{"prefix":"-webkit-","version_added":"19"}],"opera_android":[{"version_added":"21"},{"prefix":"-webkit-","version_added":"19"}],"safari":[{"version_added":"9.1"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9.3"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"version_added":"2.0"},"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"4.4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-numeric":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-numeric","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant-position","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-variant":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variant","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"css_fonts_shorthand":{"__compat":{"description":"CSS Fonts Module Level 3 shorthand","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"79"},"firefox":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"34"},{"version_added":"33","version_removed":"34","flags":[{"type":"preference","name":"layout.css.font-features.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"greek_accented_characters":{"__compat":{"description":"Greek accented characters","support":{"chrome":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"chrome_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"edge":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"firefox":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"firefox_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"opera_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek text."},"webview_android":{"version_added":false,"notes":"Some operating systems may correctly omit accents in all-uppercase Greek."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkic_is":{"__compat":{"description":"<code>i</code> → <code>İ</code> and <code>ı</code> → <code>I</code>","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"18"},"opera_android":{"version_added":"18"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"uppercase_eszett":{"__compat":{"description":"<code>ß</code> → <code>SS</code>","support":{"chrome":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"chrome_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"edge":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"firefox":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"firefox_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"opera_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."},"webview_android":{"version_added":false,"notes":"Some operating systems may capitalize <code>ß</code> as <code>SS</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font-variation-settings":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-variation-settings","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"17"},"firefox":[{"version_added":"62"},{"version_added":"53","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"53","version_removed":"62","flags":[{"type":"preference","name":"layout.css.font-variations.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11","notes":"Requires macOS 10.13 High Sierra or later."},"safari_ios":{"version_added":"11","notes":"Requires iOS 11 or later."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"font-weight":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font-weight","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"number":{"__compat":{"description":"<code>&lt;number&gt;</code> syntax","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"17"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"font":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/font","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"font_stretch_support":{"__compat":{"description":"Support for <code>font-stretch</code> values in shorthand","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"system_fonts":{"__compat":{"description":"System fonts","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"},{"version_added":"29","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"},{"version_added":"29","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-gap"},{"version_added":"28","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-gap"},{"version_added":"28","alternative_name":"grid-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"10.1","alternative_name":"grid-gap"},{"version_added":"12"}],"safari_ios":[{"version_added":"10.3","alternative_name":"grid-gap"},{"version_added":"12"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-gap","version_added":"7.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"calc_values":{"__compat":{"description":"<code>calc()</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"percentage_values":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"multicol_context":{"__compat":{"description":"Supported in Multi-column Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gap","support":{"chrome":{"version_added":"66"},"chrome_android":{"version_added":"66"},"edge":{"version_added":"16"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"53"},"opera_android":{"version_added":"47"},"qq_android":{"version_added":null},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":{"version_added":"66"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-area":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-area","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-columns","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"12","alternative_name":"-ms-grid-columns"}],"firefox":[{"version_added":"70"},{"version_added":"52","version_removed":"70","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"79"},{"version_added":"52","version_removed":"79","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values. See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-columns"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-flow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-flow","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-auto-rows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-auto-rows","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"12","alternative_name":"-ms-grid-rows"}],"firefox":[{"version_added":"70"},{"version_added":"52","version_removed":"70","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"79"},{"version_added":"52","version_removed":"79","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>."},{"version_added":"40","version_removed":"59","partial_implementation":true,"notes":"Does not accept multiple track-size values.  See <a href='https://bugzil.la/1339672'>bug 1339672</a>.","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-rows"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column-end","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column-start","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-column":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-column","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row-end","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row-start","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-row":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-row","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-template-areas":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-areas","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid-template-columns":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-columns","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"alternative_name":"-ms-grid-columns","version_added":"12","version_removed":"79"}],"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-columns"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-columns","description":"Animation of tracks","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/fit-content","description":"<code>fit-content()</code>","support":{"chrome":{"version_added":"29"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"51"},"firefox_android":{"version_added":"51"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"minmax":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/minmax","description":"<code>minmax()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/repeat","description":"<code>repeat()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"76"},{"version_added":"57","version_removed":"76","notes":"<code>repeat(auto-fill, ...)</code> and <code>repeat(auto-fit, ...)</code> only support one repeated column (see <a href='https://bugzil.la/1341507'>bug 1341507</a>).","partial_implementation":true},{"version_added":"52","version_removed":"57","notes":"<a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> doesn't work in <code>repeat()</code> (see <a href='https://bugzil.la/1350069'>bug 1350069</a>).","partial_implementation":true},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"subgrid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/CSS_Grid_Layout/Subgrid","description":"<code>subgrid</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"69","notes":"Enabled by default in Firefox Nightly.","flags":[{"type":"preference","name":"layout.css.grid-template-subgrid-value.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-template-rows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-rows","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"alternative_name":"-ms-grid-rows","version_added":"12","version_removed":"79"}],"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":"10","alternative_name":"-ms-grid-rows"},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template-rows","description":"Animation of tracks","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/fit-content","description":"<code>fit-content()</code>","support":{"chrome":{"version_added":"29"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"51"},"firefox_android":{"version_added":"51"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"minmax":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/minmax","description":"<code>minmax()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/repeat","description":"<code>repeat()</code>","support":{"chrome":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"38","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"76"},{"version_added":"57","version_removed":"76","notes":"<code>repeat(auto-fill, ...)</code> and <code>repeat(auto-fit, ...)</code> only support one repeated column (see <a href='https://bugzil.la/1341507'>bug 1341507</a>).","partial_implementation":true},{"version_added":"52","version_removed":"57","notes":"<a href='https://developer.mozilla.org/docs/Web/CSS/calc'><code>calc()</code></a> doesn't work in <code>repeat()</code> (see <a href='https://bugzil.la/1350069'>bug 1350069</a>).","partial_implementation":true},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"subgrid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/CSS_Grid_Layout/Subgrid","description":"<code>subgrid</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"71"},{"version_added":"69","notes":"Enabled by default in Firefox Nightly.","flags":[{"type":"preference","name":"layout.css.grid-template-subgrid-value.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid-template":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid-template","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/grid","support":{"chrome":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"57"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":{"version_added":"16"},"firefox":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"52"},{"version_added":"40","version_removed":"59","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"44"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"43"},{"version_added":"28","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0","notes":"This was added early so is out of sync with the equivalent Chromium version."},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hanging-punctuation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/hanging-punctuation","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"10","partial_implementation":true,"notes":"The <code>force-end</code> keyword is recognized but has no effect."},"safari_ios":{"version_added":"10","partial_implementation":true,"notes":"The <code>force-end</code> keyword is recognized but has no effect."},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"33"},"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"9"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"9"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"hyphens":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/hyphens","support":{"chrome":[{"partial_implementation":true,"version_added":"55","notes":"<code>auto</code> value is only supported on macOS and Android and for languages the OS provides hyphenation for."},{"prefix":"-webkit-","version_added":"13","notes":"Only <code>-webkit-hyphens: none</code> is supported."}],"chrome_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"prefix":"-ms-","version_added":"12","partial_implementation":true,"notes":"Only works if the specified language is the same as the language of the underlying OS."},"firefox":[{"version_added":"43"},{"prefix":"-moz-","version_added":"6","notes":"Automatic hyphenation only works for languages with hyphenation dictionaries that are integrated into Firefox."}],"firefox_android":[{"version_added":"43"},{"prefix":"-moz-","version_added":"6","notes":"Automatic hyphenation only works for languages with hyphenation dictionaries that are integrated into Firefox."}],"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Only works if the specified language is the same as the language of the underlying OS."},"opera":{"version_added":"44","partial_implementation":true,"notes":"<code>auto</code> value is only supported on macOS and Android."},"opera_android":{"version_added":"43"},"safari":{"prefix":"-webkit-","version_added":"5.1"},"safari_ios":{"prefix":"-webkit-","version_added":"4.2"},"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"55"},{"prefix":"-webkit-","version_added":"4"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"afrikaans":{"__compat":{"description":"Hyphenation dictionary for Afrikaans (af, af-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bosnian":{"__compat":{"description":"Hyphenation dictionary for Bosnian, Serbian, and Serbo-Croatian (sh, sh-*, sr, sr-*, bs, bs-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bulgarian":{"__compat":{"description":"Hyphenation dictionary for Bulgarian (bg, bg-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"catalan":{"__compat":{"description":"Hyphenation dictionary for Catalan (ca, ca-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"croatian":{"__compat":{"description":"Hyphenation dictionary for Croatian (hr, hr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"czech":{"__compat":{"description":"Hyphenation dictionary for Czech (cs, cs-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"danish":{"__compat":{"description":"Hyphenation dictionary for Danish (da, da-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"dutch":{"__compat":{"description":"Hyphenation dictionary for Dutch (nl, nl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"english":{"__compat":{"description":"Hyphenation dictionary for English (en, en-*)","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"12"},"firefox":{"version_added":"6","notes":"For English, Firefox uses an en-US dictionary"},"firefox_android":{"version_added":"6","notes":"For English, Firefox uses an en-US dictionary"},"ie":{"version_added":"10"},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"5.1","notes":"For English, Safari uses different en-GB and en-US dictionaries."},"safari_ios":{"version_added":"6","notes":"For English, Safari uses different en-GB and en-US dictionaries."},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"esperanto":{"__compat":{"description":"Hyphenation dictionary for Esperanto (eo, eo-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"estonian":{"__compat":{"description":"Hyphenation dictionary for Estonian (et, et-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"finish":{"__compat":{"description":"Hyphenation dictionary for Finnish (fi, fi-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"french":{"__compat":{"description":"Hyphenation dictionary for French (fr, fr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"galician":{"__compat":{"description":"Hyphenation dictionary for Galician (gl, gl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_reformed_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Reformed Orthography of 1996 (de, de-1996, de-DE, de-AT, de-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_swiss_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Swiss Orthography (de-CH, de-CH-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"german_traditional_orthography":{"__compat":{"description":"Hyphenation dictionary for German, Traditional Orthography of 1901 (de-1901, de-AT-1901, de-DE-1901)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hungarian":{"__compat":{"description":"Hyphenation dictionary for Hungarian (hu, hu-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"icelandic":{"__compat":{"description":"Hyphenation dictionary for Icelandic (is, is-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"interlingua":{"__compat":{"description":"Hyphenation dictionary for Interlingua (ia, ia-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"italian":{"__compat":{"description":"Hyphenation dictionary for Italian (it, it-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"kurmanji":{"__compat":{"description":"Hyphenation dictionary for Kurmanji (kmr, kmr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"latin":{"__compat":{"description":"Hyphenation dictionary for Latin (la, la-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lithuanian":{"__compat":{"description":"Hyphenation dictionary for Lithuanian (lt, lt-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mongolian":{"__compat":{"description":"Hyphenation dictionary for Mongolian (mn, mn-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"norwegian_nn":{"__compat":{"description":"Hyphenation dictionary for Norwegian (Nynorsk) (nn, nn-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"norwegian_no":{"__compat":{"description":"Hyphenation dictionary for Norwegian (Bokmål) (no, no-*, nb, nb-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"polish":{"__compat":{"description":"Hyphenation dictionary for Polish (pl, pl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"31"},"firefox_android":{"version_added":"31"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"portuguese":{"__compat":{"description":"Hyphenation dictionary for Portuguese (pt, pt-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"portuguese_brazillian":{"__compat":{"description":"Hyphenation dictionary for Brazilian Portuguese (pt-BR)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8","notes":"For Brazilian Portuguese, Firefox uses a Portuguese dictionary."},"firefox_android":{"version_added":"8","notes":"For Brazilian Portuguese, Firefox uses a Portuguese dictionary."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"russian":{"__compat":{"description":"Hyphenation dictionary for Russian (ru, ru-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"slovenian":{"__compat":{"description":"Hyphenation dictionary for Slovenian (sl, sl-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"spanish":{"__compat":{"description":"Hyphenation dictionary for Spanish (es, es-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"swedish":{"__compat":{"description":"Hyphenation dictionary for Swedish (sv, sv-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkish":{"__compat":{"description":"Hyphenation dictionary for Turkish (tr, tr-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ukrainian":{"__compat":{"description":"Hyphenation dictionary for Ukrainian (uk, uk-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper_sorbian":{"__compat":{"description":"Hyphenation dictionary for Upper Sorbian (hsb, hsb-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"welsh":{"__compat":{"description":"Hyphenation dictionary for Welsh (cy, cy-*)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"8"},"firefox_android":{"version_added":"8"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"image-orientation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-orientation","support":{"chrome":{"version_added":"81"},"chrome_android":{"version_added":"81"},"edge":{"version_added":"81"},"firefox":{"version_added":"26"},"firefox_android":{"version_added":"26"},"ie":{"version_added":false},"opera":{"version_added":"67"},"opera_android":{"version_added":false},"safari":{"version_added":"13.1"},"safari_ios":{"version_added":"13.4"},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"81"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"flip_and_angle":{"__compat":{"description":"<code>flip</code> &amp; <code>&lt;angle&gt;</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"26","version_removed":"63"},"firefox_android":{"version_added":"26","version_removed":"63"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"image-rendering":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image-rendering","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"crisp-edges":{"__compat":{"support":{"chrome":{"alternative_name":"-webkit-optimize-contrast","version_added":"13"},"chrome_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"18"},"edge":{"alternative_name":"-webkit-optimize-contrast","version_added":"79"},"firefox":[{"version_added":"65"},{"prefix":"-moz-","version_added":"3.6"}],"firefox_android":[{"version_added":"65"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-optimize-contrast","version_added":"15"},"opera_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"14"},"safari":{"alternative_name":"-webkit-optimize-contrast","version_added":"6"},"safari_ios":{"alternative_name":"-webkit-optimize-contrast","version_added":"6"},"samsunginternet_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"1.0"},"webview_android":{"alternative_name":"-webkit-optimize-contrast","version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"optimizeQuality":{"__compat":{"support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"optimizeSpeed":{"__compat":{"support":{"chrome":{"version_added":"28"},"chrome_android":{"version_added":"28"},"edge":{"version_added":"79"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"pixelated":{"__compat":{"support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"26"},"opera_android":{"version_added":"26"},"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"ime-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ime-mode","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":[{"version_added":"12","version_removed":"79"},{"prefix":"-ms-","version_added":"12","version_removed":"79"}],"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"initial-letter-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/initial-letter-align","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1273021'>bug 1273021</a>"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"initial-letter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/initial-letter","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1223880'>bug 1223880</a>"},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1223880'>bug 1223880</a>"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"38"},"firefox_android":{"prefix":"-moz-","version_added":"38"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"inset-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block-end","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block-start","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-block","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-block","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-block","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline-end","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline-end","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline-start","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline-start","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset-inline","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":[{"version_added":"63"},{"alternative_name":"offset-inline","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"63"},{"alternative_name":"offset-inline","version_added":"41","version_removed":"63"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/inset","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"isolation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/isolation","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":{"version_added":"30"},"opera_android":{"version_added":"30"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"justify-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-content","support":{"chrome":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"52"},{"version_added":"29","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Before Firefox 27, Firefox supported only single-line flexbox."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Before Firefox 27, Firefox supported only single-line flexbox."},{"version_added":"18","version_removed":"20","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":[{"version_added":"6.0"},{"partial_implementation":true,"version_added":"2.0","notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"52"},{"version_added":"4.4","partial_implementation":true,"notes":"Older versions of the specification treat absolute positioned children as though they are a 0 by 0 flex item. Later specification versions take the children out of the flow and set their positions based on align and justify properties. Chrome implements the new behavior beginning with Chrome 52."},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"baseline":{"__compat":{"description":"<code>baseline</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"45","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"firefox_android":{"version_added":"45","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"first_last_baseline":{"__compat":{"description":"<code>first baseline</code> and <code>last baseline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"52","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"firefox_android":{"version_added":"52","version_removed":"60","notes":"<code>justify-content</code> no longer accepts baseline values"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"safe_unsafe":{"__compat":{"description":"<code>safe</code> and <code>unsafe</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari_ios":{"version_added":false,"notes":"This value is recognized, but has no effect."},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"space-evenly":{"__compat":{"description":"<code>space-evenly</code>","support":{"chrome":{"version_added":"60"},"chrome_android":{"version_added":"60"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"47"},"opera_android":{"version_added":"44"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"60"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"start_end":{"__compat":{"description":"<code>start</code> and <code>end</code>","support":{"chrome":{"version_added":false,"notes":"This value is recognized, but has no effect."},"chrome_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"edge":{"version_added":false,"notes":"This value is recognized, but has no effect."},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"This value is recognized, but has no effect."},"opera_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false,"notes":"This value is recognized, but has no effect."},"webview_android":{"version_added":false,"notes":"This value is recognized, but has no effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-content","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"16"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.2"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"justify-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-items","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"12"},"firefox":{"version_added":"20"},"firefox_android":{"version_added":"20"},"ie":{"version_added":"11"},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-items","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"justify-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/justify-self","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"16"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"prefix":"-ms-","version_added":"10","partial_implementation":true,"notes":"Internet Explorer 10 and 11 have the property <code>-ms-grid-column-align</code>, which acts in a similar way to <code>justify-self</code>."},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"letter-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/letter-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"SVG support","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"72"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"line-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-break","support":{"chrome":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"18"}],"edge":{"version_added":"14"},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":[{"version_added":"5.5"},{"prefix":"-ms-","version_added":"8"}],"opera":[{"version_added":"45"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"43"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"11"},{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":[{"version_added":"11"},{"version_added":"1","prefix":"-webkit-"}],"samsunginternet_android":[{"version_added":"7.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"58"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"line-height-step":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-height-step","support":{"chrome":{"version_added":"60","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"chrome_android":{"version_added":"60","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"edge":{"version_added":"79","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"47","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"opera_android":{"version_added":"44","flags":[{"type":"runtime_flag","name":"--enable-blink-features=CSSSnapSize"}]},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"line-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/line-height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"-moz-block-height":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"list-style-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-image","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-style-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"list-style-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style-type","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"afar":{"__compat":{"description":"<code>afar</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"amharic":{"__compat":{"description":"<code>amaric</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"amharic-abegede":{"__compat":{"description":"<code>amaric-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"arabic-indic":{"__compat":{"description":"<code>arabic-indic</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"armenian":{"__compat":{"description":"<code>armenian</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"asterisks":{"__compat":{"description":"<code>asterisks</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"bengali":{"__compat":{"description":"<code>bengali</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"binary":{"__compat":{"description":"<code>binary</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cambodian":{"__compat":{"description":"<code>cambodian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"circle":{"__compat":{"description":"<code>circle</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-decimal":{"__compat":{"description":"<code>cjk-decimal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-earthly-branch":{"__compat":{"description":"<code>cjk-earthly-branch</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-heavenly-stem":{"__compat":{"description":"<code>cjk-heavenly-stem</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"cjk-ideographic":{"__compat":{"description":"<code>cjk-ideographic</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":[{"version_added":"15"},{"version_added":"7","partial_implementation":true,"notes":"Until version 15, only decimal numbers display."}],"opera_android":[{"version_added":"14"},{"version_added":"10.1","partial_implementation":true,"notes":"Until version 15, only decimal numbers display."}],"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"decimal":{"__compat":{"description":"<code>decimal</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"decimal-leading-zero":{"__compat":{"description":"<code>decimal-leading-zero</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"8"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"devanagari":{"__compat":{"description":"<code>devanagari</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disc":{"__compat":{"description":"<code>disc</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disclosure-closed":{"__compat":{"description":"<code>disclosure-closed</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"disclosure-open":{"__compat":{"description":"<code>disclosure-open</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic":{"__compat":{"description":"<code>ethiopic</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede":{"__compat":{"description":"<code>ethiopic-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-am-et":{"__compat":{"description":"<code>ethiopic-abegede-am-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-gez":{"__compat":{"description":"<code>ethiopic-abegede-gez</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-ti-er":{"__compat":{"description":"<code>ethiopic-abegede-ti-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-abegede-ti-et":{"__compat":{"description":"<code>ethiopic-abegede-ti-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame":{"__compat":{"description":"<code>ethiopic-halehame</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-aa-er":{"__compat":{"description":"<code>ethiopic-halehame-aa-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-aa-et":{"__compat":{"description":"<code>ethiopic-halehame-aa-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-am":{"__compat":{"description":"<code>ethiopic-halehame-am</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-am-et":{"__compat":{"description":"<code>ethiopic-halehame-am-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-gez":{"__compat":{"description":"<code>ethiopic-halehame-gez</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-om-et":{"__compat":{"description":"<code>ethiopic-halehame-om-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-sid-et":{"__compat":{"description":"<code>ethiopic-halehame-sid-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-so-et":{"__compat":{"description":"<code>ethiopic-halehame-so-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-ti-er":{"__compat":{"description":"<code>ethiopic-halehame-ti-er</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-ti-et":{"__compat":{"description":"<code>ethiopic-halehame-ti-et</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-halehame-tig":{"__compat":{"description":"<code>ethiopic-halehame-tig</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ethiopic-numeric":{"__compat":{"description":"<code>ethiopic-numeric</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"33","notes":"Before Firefox 38, Firefox added a dot as suffix of the number for <code>ethiopic-numeric</code> (for example, �. instead of �). The specification later defined the absence of a suffix, which Firefox 38 followed."},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33","notes":"Before Firefox 38, Firefox added a dot as suffix of the number for <code>ethiopic-numeric</code> (for example, �. instead of �). The specification later defined the absence of a suffix, which Firefox 38 followed."},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"footnotes":{"__compat":{"description":"<code>footnotes</code>","support":{"chrome":{"version_added":"13","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"4.4","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"georgian":{"__compat":{"description":"<code>georgian</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gujarati":{"__compat":{"description":"<code>gujarati</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gurmukhi":{"__compat":{"description":"<code>gurmukhi</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hangul":{"__compat":{"description":"<code>hangul</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hangul-consonant":{"__compat":{"description":"<code>hangul-consonant</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1","prefix":"-moz-"},"firefox_android":{"version_added":"4","prefix":"-moz-"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hebrew":{"__compat":{"description":"<code>hebrew</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hiragana":{"__compat":{"description":"<code>hiragana</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hiragana-iroha":{"__compat":{"description":"<code>hiragana-iroha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"japanese-formal":{"__compat":{"description":"<code>japanese-formal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"japanese-informal":{"__compat":{"description":"<code>japanese-informal</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"kannada":{"__compat":{"description":"<code>kannada</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"katakana":{"__compat":{"description":"<code>katakana</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"katakana-iroha":{"__compat":{"description":"<code>katakana-iroha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"khmer":{"__compat":{"description":"<code>khmer</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hangul-formal":{"__compat":{"description":"<code>korean-hangul-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hanja-formal":{"__compat":{"description":"<code>korean-hanja-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"korean-hanja-informal":{"__compat":{"description":"<code>korean-hanja-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":{"version_added":"28"},"firefox_android":{"version_added":"28"},"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lao":{"__compat":{"description":"<code>lao</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-alpha":{"__compat":{"description":"<code>lower-alpha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-armenian":{"__compat":{"description":"<code>lower-armenian</code>","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-greek":{"__compat":{"description":"<code>lower-greek</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-hexadecimal":{"__compat":{"description":"<code>lower-hexadecimal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-latin":{"__compat":{"description":"<code>lower-latin</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-norwegian":{"__compat":{"description":"<code>lower-norwegian</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lower-roman":{"__compat":{"description":"<code>lower-roman</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"malayalam":{"__compat":{"description":"<code>malayalam</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mongolian":{"__compat":{"description":"<code>mongolian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"myanmar":{"__compat":{"description":"<code>myanmar</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"octal":{"__compat":{"description":"<code>octal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"oriya":{"__compat":{"description":"<code>oriya</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"oromo":{"__compat":{"description":"<code>oromo</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"persian":{"__compat":{"description":"<code>persian</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sidama":{"__compat":{"description":"<code>sidama</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"simp-chinese-formal":{"__compat":{"description":"<code>simp-chinese-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"simp-chinese-informal":{"__compat":{"description":"<code>simp-chinese-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"somali":{"__compat":{"description":"<code>somali</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"square":{"__compat":{"description":"<code>square</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"<code>&lt;string&gt;</code>","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":{"version_added":"39"},"firefox_android":{"version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":"66"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"symbols":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/symbols","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tamil":{"__compat":{"description":"<code>tamil</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"telugu":{"__compat":{"description":"<code>telugu</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"thai":{"__compat":{"description":"<code>thai</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":[{"version_added":"33"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"33"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tibetan":{"__compat":{"description":"<code>tibetan</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigre":{"__compat":{"description":"<code>tigre</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-er":{"__compat":{"description":"<code>tigrinya-er</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-er-abegede":{"__compat":{"description":"<code>tigrinya-er-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-et":{"__compat":{"description":"<code>tigrinya-et</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"tigrinya-et-abegede":{"__compat":{"description":"<code>tigrinya-et-abegede</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"1","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"trad-chinese-formal":{"__compat":{"description":"<code>trad-chinese-formal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"trad-chinese-informal":{"__compat":{"description":"<code>trad-chinese-informal</code>","support":{"chrome":{"version_added":"45"},"chrome_android":{"version_added":"45"},"edge":{"version_added":"79"},"firefox":[{"version_added":"28"},{"prefix":"-moz-","version_added":"1"}],"firefox_android":[{"version_added":"28"},{"prefix":"-moz-","version_added":"4"}],"ie":{"version_added":false},"opera":{"version_added":"32"},"opera_android":{"version_added":"32"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-alpha":{"__compat":{"description":"<code>upper-alpha</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-armenian":{"__compat":{"description":"<code>upper-armenian</code>","support":{"chrome":{"version_added":"13"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"33"},"firefox_android":{"version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-greek":{"__compat":{"description":"<code>upper-greek</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-hexadecimal":{"__compat":{"description":"<code>upper-hexadecimal</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-latin":{"__compat":{"description":"<code>upper-latin</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-norwegian":{"__compat":{"description":"<code>upper-norwegian</code>","support":{"chrome":{"version_added":"6","version_removed":"45"},"chrome_android":{"version_added":"18","version_removed":"45"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"32"},"opera_android":{"version_added":"14","version_removed":"32"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","version_removed":"5.0"},"webview_android":{"version_added":"3","version_removed":"45"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"upper-roman":{"__compat":{"description":"<code>upper-roman</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"6"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"urdu":{"__compat":{"description":"<code>urdu</code>","support":{"chrome":{"version_added":"6"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"33"},"firefox_android":{"prefix":"-moz-","version_added":"33"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"list-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/list-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"symbols":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/symbols","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"35"},"firefox_android":{"version_added":"35"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-block","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline-end","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-end"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-margin-end"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-margin-end"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-margin-end"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-margin-end"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-margin-end"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-margin-end"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-margin-end"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-margin-end"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-margin-end","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-end"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline-start","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-start"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-margin-start"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-margin-start"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-margin-start"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-margin-start"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-margin-start"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-margin-start"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-margin-start"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-margin-start"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-margin-start","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-margin-start"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-inline","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"margin-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"margin-trim":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin-trim","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1506241'>bug 1506241</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1506241'>bug 1506241</a>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/margin","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12","notes":"The <code>auto</code> value is not supported in quirks mode."},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6","notes":"The <code>auto</code> value is not supported in quirks mode."},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-clip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-clip","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"border":{"__compat":{"description":"<code>border<code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"content":{"__compat":{"description":"<code>content</content>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"padding":{"__compat":{"description":"<code>padding</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"text":{"__compat":{"description":"<code>text</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"mask-composite":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-composite","support":{"chrome":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"chrome_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"edge":{"version_added":"18","version_removed":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"opera_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"safari":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"safari_ios":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"samsunginternet_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."},"webview_android":{"version_added":false,"notes":"See also <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-composite'><code>-webkit-mask-composite</code></a> for a similar non-standard property that uses different keywords."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-image","support":{"chrome":{"prefix":"-webkit-","version_added":"1","notes":"From version 8, Chrome added support for gradient values. Initially, Chrome supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"From version 8, Chrome added support for gradient values. Initially, Chrome supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"edge":{"version_added":"16"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4","notes":"Initially, Safari supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"safari_ios":{"prefix":"-webkit-","version_added":"3.2","notes":"Initially, Safari supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"2","notes":"Initially, Android supported only <code>-webkit-</code> prefixed values for gradients (such as <code>-webkit-linear-gradient()</code>). Later, support for unprefixed values was added."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"multiple_mask_images":{"__compat":{"description":"Multiple mask images","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_masks":{"__compat":{"description":"SVG masks","support":{"chrome":{"version_added":"8"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-mode","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-origin","support":{"chrome":{"prefix":"-webkit-","version_added":"1","notes":"The <code>margin-box</code> value is unsupported."},"chrome_android":{"prefix":"-webkit-","version_added":"18","notes":"The <code>margin-box</code> value is unsupported."},"edge":{"prefix":"-webkit-","version_added":"79","notes":"The <code>margin-box</code> value is unsupported."},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15","notes":"The <code>margin-box</code> value is unsupported."},"opera_android":{"prefix":"-webkit-","version_added":"14","notes":"The <code>margin-box</code> value is unsupported."},"safari":{"prefix":"-webkit-","version_added":"4","notes":"The <code>margin-box</code> value is unsupported."},"safari_ios":{"prefix":"-webkit-","version_added":"3.2","notes":"The <code>margin-box</code> value is unsupported."},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0","notes":"The <code>margin-box</code> value is unsupported."},"webview_android":{"prefix":"-webkit-","version_added":"2","notes":"The <code>margin-box</code> value is unsupported."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fill-box":{"__compat":{"description":"<code>fill-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"non_standard_values":{"__compat":{"description":"Non-standard values <code>content</code>, <code>padding</code>, <code>border</code>","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"stroke-box":{"__compat":{"description":"<code>stroke-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"view-box":{"__compat":{"description":"<code>view-box</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-position","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":{"prefix":"-webkit-","version_added":"1","version_removed":"68"},"chrome_android":{"prefix":"-webkit-","version_added":"18","version_removed":"68"},"edge":{"version_added":"18","version_removed":"79"},"firefox":[{"version_added":"53","version_removed":"70"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15","version_removed":"55"},"opera_android":{"prefix":"-webkit-","version_added":"14","version_removed":"48"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0","version_removed":"10.0"},"webview_android":{"prefix":"-webkit-","version_added":"2","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"mask-repeat":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-repeat","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"3.2"},"safari_ios":{"prefix":"-webkit-","version_added":"3.2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-size","support":{"chrome":{"prefix":"-webkit-","version_added":"4"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"version_added":"18"},"firefox":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"53"},{"version_added":"20","version_removed":"53","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":{"prefix":"-webkit-","version_added":"4"},"safari_ios":{"prefix":"-webkit-","version_added":"2"},"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask-type","support":{"chrome":{"version_added":"24"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":[{"version_added":"35"},{"version_added":"20","version_removed":"52","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"35"},{"version_added":"20","version_removed":"52","flags":[{"type":"preference","name":"layout.css.masking.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"mask":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mask","support":{"chrome":[{"version_added":"1","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"1","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"chrome_android":[{"version_added":"18","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"18","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"edge":{"version_added":"12"},"firefox":{"version_added":"2","notes":"From Firefox 10, the default color space when handling masks is sRGB. Previously, the default and only supported color space was linear RGB. This changes the appearance of mask effects, but brings Firefox into compliance with the second edition of the SVG 1.1 specification."},"firefox_android":{"version_added":"4","notes":"From Firefox 10, the default color space when handling masks is sRGB. Previously, the default and only supported color space was linear RGB. This changes the appearance of mask effects, but brings Firefox into compliance with the second edition of the SVG 1.1 specification."},"ie":{"version_added":false},"opera":[{"version_added":"15","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"15","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"opera_android":[{"version_added":"14","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"14","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"safari":[{"version_added":"3.2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"3.2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"safari_ios":[{"version_added":"3.2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"3.2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"samsunginternet_android":[{"version_added":"1.0","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"1.0","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}],"webview_android":[{"version_added":"2","partial_implementation":true,"notes":"While the property is recognized, values applied to it don't have any effect."},{"prefix":"-webkit-","version_added":"2","notes":"The prefixed property can be used with SVG and HTML with a slightly different syntax, which allows setting the non-standard <a href='https://developer.mozilla.org/docs/Web/CSS/-webkit-mask-attachment'><code>-webkit-mask-attachment</code></a> property."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"math-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/math-style","support":{"chrome":{"version_added":"83","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"chrome_android":{"version_added":"83","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"edge":{"version_added":false},"firefox":{"version_added":"83","flags":[{"type":"preference","name":"layout.css.math-style.enabled","value_to_set":"true"}]},"firefox_android":{"version_added":"83","flags":[{"type":"preference","name":"layout.css.math-style.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"max-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-height","support":{"chrome":{"version_added":"18"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>max-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-height</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"7"},"opera":{"version_added":"7","notes":"CSS 2.1 leaves the behavior of <code>max-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>max-height</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"partial_implementation":true,"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"partial_implementation":true,"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"max-inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"10.1"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"10.3"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"38"},"firefox_android":{"prefix":"-moz-","version_added":"38"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"max-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/max-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-width</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>max-width</code> to <code>table</code> elements."},"ie":{"version_added":"7"},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>max-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>max-width</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"partial_implementation":true,"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"partial_implementation":true,"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"min-block-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-block-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"min-height":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-height","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-height</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-height</code> to <code>table</code> elements."},"ie":{"version_added":"7","notes":"In Internet Explorer 10 and 11, a <code>min-height</code> declaration on a column-direction flex container doesn't apply to the container's flex items. See <a href='https://github.com/philipwalton/flexbugs#3-min-height-on-a-column-flex-container-wont-apply-to-its-flex-items'>Flexbug #3</a> for more info."},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-height</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>min-height</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"21"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"79"},"firefox":{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later used <code>auto</code> as the initial value for <code>min-height</code>."},"firefox_android":{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later used <code>auto</code> as the initial value for <code>min-height</code>."},"ie":{"version_added":false},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"28"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"28"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"15"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"9"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"9"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"1.5"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"min-inline-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-inline-size","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"41"},"firefox_android":{"prefix":"-moz-","version_added":"41"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"41","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"min-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/min-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-width</code> to <code>table</code> elements."},"firefox_android":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Firefox supports applying <code>min-width</code> to <code>table</code> elements."},"ie":{"version_added":"7"},"opera":{"version_added":"4","notes":"CSS 2.1 leaves the behavior of <code>min-width</code> with <a href='https://developer.mozilla.org/docs/Web/HTML/Element/table'><code>table</code></a> undefined. Opera supports applying <code>min-width</code> to <code>table</code> elements."},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"21","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."},"chrome_android":{"version_added":"25","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."},"edge":{"version_added":"12","notes":"Edge uses <code>auto</code> as the initial value for <code>min-width</code>."},"firefox":[{"version_added":"34"},{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later (until the value was removed), used <code>auto</code> as the initial value for <code>min-width</code>."}],"firefox_android":[{"version_added":"34"},{"version_added":"16","version_removed":"22","notes":"Firefox 18 and later (until the value was removed), used <code>auto</code> as the initial value for <code>min-width</code>."}],"ie":{"version_added":false},"opera":{"version_added":"12.1","notes":"Opera uses <code>auto</code> as the initial value for <code>min-width</code>."},"opera_android":{"version_added":"14","notes":"Opera uses <code>auto</code> as the initial value for <code>min-width</code>."},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","notes":"Samsung Internet uses <code>auto</code> as the initial value for <code>min-width</code>."},"webview_android":{"version_added":"37","notes":"Chrome uses <code>auto</code> as the initial value for <code>min-width</code>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":"Firefox implements the definitions given in CSS3 Basic Box. This defines <code>available</code> and not <code>fit-available</code>. Also, the definition of <code>fit-content</code> is simpler than in CSS3 Sizing."},"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"alternative_name":"-webkit-fill-available","version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":{"version_added":"33"},"safari":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"min-intrinsic","version_added":"25","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"min-intrinsic","version_added":"25","version_removed":"48"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"≤15"},{"alternative_name":"min-intrinsic","version_added":"≤15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"≤14"},{"alternative_name":"min-intrinsic","version_added":"≤14","version_removed":"35"}],"safari":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"},{"alternative_name":"min-intrinsic","version_added":"1.5","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"},{"alternative_name":"min-intrinsic","version_added":"≤37","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.5","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"mix-blend-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/mix-blend-mode","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":"41"},"edge":{"version_added":"79"},"firefox":{"version_added":"32"},"firefox_android":{"version_added":"32"},"ie":{"version_added":false},"opera":{"version_added":"28"},"opera_android":{"version_added":"28"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"41"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"svg":{"__compat":{"description":"On SVG elements","support":{"chrome":{"version_added":"41"},"chrome_android":{"version_added":false},"edge":{"version_added":"79"},"firefox":{"version_added":"32"},"firefox_android":{"version_added":"32"},"ie":{"version_added":false},"opera":{"version_added":"28"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"object-fit":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/object-fit","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"16","notes":"Edge supports <code>object-fit</code> on <code>img</code> elements only. <a href='https://developer.microsoft.com/microsoft-edge/platform/issues/13603873/#comment-0'>See Edge issue 13603873 for details</a>."},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"object-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/object-position","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"16"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":{"version_added":"31","version_removed":"68"},"chrome_android":{"version_added":"31","version_removed":"68"},"edge":{"version_added":"16","version_removed":"79"},"firefox":{"version_added":"36","version_removed":"70"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":[{"version_added":"19","version_removed":"55"},{"prefix":"-o-","version_added":"11.6"}],"opera_android":[{"version_added":"19","version_removed":"48"},{"prefix":"-o-","version_added":"12"}],"safari":{"version_added":"10"},"safari_ios":{"version_added":"10"},"samsunginternet_android":{"version_added":"2.0","version_removed":"10.0"},"webview_android":{"version_added":"4.4.3","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"offset-anchor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-anchor","support":{"chrome":{"version_added":"79"},"chrome_android":{"version_added":"79"},"edge":{"version_added":"79"},"firefox":[{"version_added":"72"},{"version_added":"70","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"79"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset-distance":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-distance","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion-distance","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"69","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"42"},{"alternative_name":"motion-distance","version_added":"33"}],"opera_android":[{"version_added":"42"},{"alternative_name":"motion-distance","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"motion-distance","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion-distance","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset-path":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-path","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion-path","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"63","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"63","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":[{"version_added":"45"},{"alternative_name":"motion-path","version_added":"32"}],"opera_android":[{"version_added":"43"},{"alternative_name":"motion-path","version_added":"32"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0","notes":"<code>path()</code> is the only value type supported."},{"alternative_name":"motion-path","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion-path","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"path-support":{"__compat":{"description":"Supports the <code>path()</code> function as a value","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"ray-support":{"__compat":{"description":"Supports the <code>ray()</code> function as a value","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"71","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"offset-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-position","support":{"chrome":{"version_added":false,"notes":"See <a href='https://crbug.com/638055'>bug 638055</a>"},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1559232'>bug 1559232</a>"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"offset-rotate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset-rotate","support":{"chrome":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}],"chrome_android":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"offset-rotation","version_added":"79"},{"alternative_name":"motion-rotation","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"69","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"43"},{"alternative_name":"offset-rotation","version_added":"42"},{"alternative_name":"motion-rotation","version_added":"33"}],"opera_android":[{"version_added":"43"},{"alternative_name":"offset-rotation","version_added":"42"},{"alternative_name":"motion-rotation","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"offset-rotation","version_added":"6.0"},{"alternative_name":"motion-rotation","version_added":"5.0"}],"webview_android":[{"version_added":"56"},{"alternative_name":"offset-rotation","version_added":"55"},{"alternative_name":"motion-rotation","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/offset","support":{"chrome":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}],"chrome_android":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}],"edge":[{"version_added":"79"},{"alternative_name":"motion","version_added":"79"}],"firefox":[{"version_added":"72"},{"version_added":"71","version_removed":"72","flags":[{"type":"preference","name":"layout.css.motion-path.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":[{"version_added":"42"},{"alternative_name":"motion","version_added":"33"}],"opera_android":[{"version_added":"42"},{"alternative_name":"motion","version_added":"33"}],"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":[{"version_added":"6.0"},{"alternative_name":"motion","version_added":"5.0"}],"webview_android":[{"version_added":"55"},{"alternative_name":"motion","version_added":"46"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"opacity":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/opacity","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1"},{"prefix":"-moz-","version_added":"1","version_removed":"3.5"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"9"},"opera":{"version_added":"9"},"opera_android":{"version_added":"10.1"},"safari":[{"version_added":"2"},{"version_added":"1.1","version_removed":"2","prefix":"-khtml-"}],"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"Support for percentage opacity values","support":{"chrome":{"version_added":"78"},"chrome_android":{"version_added":"78"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"78"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"order":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/order","support":{"chrome":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"21"}],"chrome_android":[{"version_added":"29"},{"prefix":"-webkit-","version_added":"25"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"20","notes":"Since Firefox 28, multi-line flexbox is supported."},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"48","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]},{"version_added":"18","version_removed":"28","flags":[{"type":"preference","name":"layout.css.flexbox.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"prefix":"-ms-","version_added":"10"}],"opera":{"version_added":"12.1"},"opera_android":{"version_added":"12.1"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":[{"version_added":"2.0"},{"prefix":"-webkit-","version_added":"1.5"}],"webview_android":[{"version_added":"4.4"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"orphans":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/orphans","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-color","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"invert":{"__compat":{"description":"<code>invert</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_removed":"3","version_added":"1"},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"7","version_removed":"15"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"outline-offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-offset","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"15"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-style","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"outline-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline-width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"outline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/outline","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"1.5","notes":"Firefox includes absolutely positioned elements inside the outline (see <a href='https://bugzil.la/687311'>bug 687311</a>)."},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-anchor":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-anchor","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"79"},"firefox":{"version_added":"66"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-block","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-clip-box-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box-block","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"overflow-clip-box-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"overflow-clip-box":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Mozilla/Gecko/Chrome/CSS/overflow-clip-box","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"29"},"firefox_android":{"version_added":"29"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"shorthand":{"__compat":{"description":"Two values; property as shorthand","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"overflow-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overflow-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-wrap","support":{"chrome":[{"version_added":"23"},{"alternative_name":"word-wrap","version_added":"1"}],"chrome_android":[{"version_added":"25"},{"alternative_name":"word-wrap","version_added":"18"}],"edge":[{"version_added":"18"},{"alternative_name":"word-wrap","version_added":"12"}],"firefox":[{"version_added":"49"},{"alternative_name":"word-wrap","version_added":"3.5"}],"firefox_android":[{"version_added":"49"},{"alternative_name":"word-wrap","version_added":"4"}],"ie":{"alternative_name":"word-wrap","version_added":"5.5"},"opera":[{"version_added":"12.1"},{"alternative_name":"word-wrap","version_added":"10.5"}],"opera_android":[{"version_added":"12.1"},{"alternative_name":"word-wrap","version_added":"11"}],"safari":[{"version_added":"6.1"},{"alternative_name":"word-wrap","version_added":"1"}],"safari_ios":[{"version_added":"7"},{"alternative_name":"word-wrap","version_added":"1"}],"samsunginternet_android":[{"version_added":"1.5"},{"alternative_name":"word-wrap","version_added":"1.0"}],"webview_android":[{"version_added":"4.4"},{"alternative_name":"word-wrap","version_added":"1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"anywhere":{"__compat":{"description":"<code>anywhere</code>","support":{"chrome":{"version_added":"80"},"chrome_android":{"version_added":"80"},"edge":{"version_added":"80"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"67"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"13.0"},"webview_android":{"version_added":"80"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"break-word":{"__compat":{"description":"<code>break-word</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"10.5"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"overflow-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-x","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"3.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"overflow-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-y","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":[{"version_added":"5"},{"prefix":"-ms-","version_added":"8"}],"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"3.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"overflow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"After Firefox 3.6, the <code>overflow</code> property is correctly applied to table group elements (<code>&lt;thead&gt;</code>, <code>&lt;tbody&gt;</code>, <code>&lt;tfoot&gt;</code>)."},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":"From version 4 to 6, Internet Explorer enlarges an element with <code>overflow: visible</code> (default value) to fit the content inside it. <code>height</code> and <code>width</code> behave like <code>min-height</code> and <code>min-width</code>, respectively."},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"clip":{"__compat":{"description":"<code>clip</code> value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"1.5","version_removed":"81"}],"firefox_android":[{"version_added":"81"},{"alternative_name":"-moz-hidden-unscrollable","version_added":"4","version_removed":"81"}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"multiple_keywords":{"__compat":{"description":"Multiple keyword syntax for <code>overflow-x</code> and <code>overflow-y</code>","support":{"chrome":{"version_added":"68"},"chrome_android":{"version_added":"68"},"edge":{"version_added":"79"},"firefox":{"version_added":"61"},"firefox_android":{"version_added":"61"},"ie":{"version_added":false},"opera":{"version_added":"55"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"overscroll-behavior-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-block","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"73"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-inline","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"73"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-x","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior-y","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"overscroll-behavior":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overscroll-behavior","support":{"chrome":{"version_added":"63"},"chrome_android":{"version_added":"63"},"edge":{"version_added":"18","partial_implementation":true,"notes":"Currently the <code>none</code> value incorrectly behaves as <code>contain</code> (allowing for the elastic bounce effect)."},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/176454'>bug 176454</a>."},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"63"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-block","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-bottom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline-end","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-end"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-padding-end"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-padding-end"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-padding-end"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-padding-end"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-padding-end"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-padding-end"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-padding-end"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-padding-end"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-padding-end","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-end"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline-start","support":{"chrome":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-start"}],"chrome_android":[{"version_added":"69"},{"version_added":"18","alternative_name":"-webkit-padding-start"}],"edge":[{"version_added":"79"},{"version_added":"79","alternative_name":"-webkit-padding-start"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"3","alternative_name":"-moz-padding-start"}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"4","alternative_name":"-moz-padding-start"}],"ie":{"version_added":false},"opera":[{"version_added":"56"},{"version_added":"15","alternative_name":"-webkit-padding-start"}],"opera_android":[{"version_added":"48"},{"version_added":"14","alternative_name":"-webkit-padding-start"}],"safari":[{"version_added":"12.1"},{"version_added":"3","alternative_name":"-webkit-padding-start"}],"safari_ios":[{"version_added":"12.2"},{"version_added":"3","alternative_name":"-webkit-padding-start"}],"samsunginternet_android":[{"version_added":"10.0"},{"alternative_name":"-webkit-padding-start","version_added":"1.0"}],"webview_android":[{"version_added":"69"},{"version_added":"2","alternative_name":"-webkit-padding-start"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-inline","support":{"chrome":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"chrome_android":[{"version_added":"87"},{"version_added":"69","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"edge":{"version_added":"79","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]},"firefox":{"version_added":"66"},"firefox_android":{"version_added":"66"},"ie":{"version_added":false},"opera":[{"version_added":"73"},{"version_added":"56","flags":[{"type":"preference","name":"enable-experimental-web-platform-features","value_to_set":"enabled"}]}],"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"87"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-left","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding-top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"padding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/padding","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-after":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-after","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"firefox_android":{"version_added":"4","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-before":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-before","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"firefox_android":{"version_added":"4","notes":"The values <code>avoid</code>, <code>left</code>, and <code>right</code> are unsupported."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.2"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page-break-inside":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page-break-inside","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"19","notes":"Until Firefox 25, <code>page-break-inside</code><code>: avoid</code> did not work with the height of a block."},"firefox_android":{"version_added":"19","notes":"Until Firefox 25, <code>page-break-inside</code><code>: avoid</code> did not work with the height of a block."},"ie":{"version_added":"8"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"page":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/page","spec_url":"https://drafts.csswg.org/css-page-3/#propdef-page","support":{"chrome":{"version_added":"85"},"chrome_android":{"version_added":"85"},"edge":{"version_added":"85"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"71"},"opera_android":{"version_added":"60"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":"85"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"paint-order":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/paint-order","support":{"chrome":{"version_added":"35"},"chrome_android":{"version_added":"35"},"edge":{"version_added":"17"},"firefox":{"version_added":"60"},"firefox_android":{"version_added":"60"},"ie":{"version_added":false},"opera":{"version_added":"22"},"opera_android":{"version_added":"22"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"perspective-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/perspective-origin","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position","support":{"chrome":[{"version_added":"36","version_removed":"68"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36","version_removed":"68"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12","version_removed":"79"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16","version_removed":"70"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":{"prefix":"-webkit-","version_added":"15","version_removed":"55"},"opera_android":{"prefix":"-webkit-","version_added":"14","version_removed":"48"},"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0","version_removed":"10.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37","version_removed":"68"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"perspective":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/perspective","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"45","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":"10"},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"place-content":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-content","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"firefox_android":{"version_added":"45","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-content","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"53","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"firefox_android":{"version_added":"53","notes":"Starting with version 60, you can only specify a single value if it is valid for both <code>align-content</code> and <code>justify-content</code>."},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"place-items":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-items","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-items","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"place-self":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-self","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/place-self","support":{"chrome":{"version_added":"59"},"chrome_android":{"version_added":"59"},"edge":{"version_added":"79"},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":"46"},"opera_android":{"version_added":"43"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"59"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"pointer-events":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/pointer-events","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"11"},"opera":{"version_added":"9"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"2"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"html_elements":{"__compat":{"description":"Applies to HTML elements","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.6"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/position","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":["Before Firefox 57, absolute positioning did not work correctly when applied to elements inside tables that have <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> applied to them (<a href='https://bugzil.la/1379306'>bug 1379306</a>).","Before Firefox 30, absolute positioning of table rows and row groups was not supported (<a href='https://bugzil.la/63895'>bug 63895</a>)."]},"firefox_android":{"version_added":"4","notes":["Before Firefox 57, absolute positioning did not work correctly when applied to elements inside tables that have <a href='https://developer.mozilla.org/docs/Web/CSS/border-collapse'><code>border-collapse</code></a> applied to them (<a href='https://bugzil.la/1379306'>bug 1379306</a>).","Before Firefox 30, absolute positioning of table rows and row groups was not supported (<a href='https://bugzil.la/63895'>bug 63895</a>)."]},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"absolutely_positioned_flex_children":{"__compat":{"description":"Absolutely-positioned flex children","support":{"chrome":{"version_added":"52"},"chrome_android":{"version_added":"52"},"edge":{"version_added":"12"},"firefox":{"version_added":"52"},"firefox_android":{"version_added":"52"},"ie":{"version_added":"10"},"opera":{"version_added":"39"},"opera_android":{"version_added":"41"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"52"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fixed":{"__compat":{"description":"<code>fixed</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 44, <code>position: fixed</code> didn't create a stacking context in most cases. Firefox and the specification have been modified to mimic Chrome and Safari's long-time behavior."},"firefox_android":{"version_added":"4","notes":"Before Firefox 44, <code>position: fixed</code> didn't create a stacking context in most cases. Firefox and the specification have been modified to mimic Chrome and Safari's long-time behavior."},"ie":{"version_added":"7","notes":"In Internet Explorer, fixed positioning doesn't work if the document is in <a href='https://developer.mozilla.org/docs/Web/HTML/Quirks_Mode_and_Standards_Mode'>quirks mode</a>."},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"position_sticky_table_elements":{"__compat":{"description":"Table elements as <code>sticky</code> positioning containers","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"16"},"firefox":{"version_added":"59"},"firefox_android":{"version_added":"59"},"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sticky":{"__compat":{"description":"<code>sticky</code>","support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"16"},"firefox":[{"version_added":"32"},{"version_added":"26","version_removed":"48","flags":[{"type":"preference","name":"layout.css.sticky.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"32"},{"version_added":"26","version_removed":"48","flags":[{"type":"preference","name":"layout.css.sticky.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"13"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"13"},{"prefix":"-webkit-","version_added":"6.1"}],"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"quotes":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/quotes","support":{"chrome":{"version_added":"11"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"quotes_auto":{"__compat":{"description":"<code>auto</code> keyword","support":{"chrome":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"chrome_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"edge":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"opera":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"opera_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"safari":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"safari_ios":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"samsunginternet_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"},"webview_android":{"version_added":false,"notes":"This value is not supported, but the default browser behavior is to choose appropriate quotes for the user's language setting"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"resize":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/resize","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"4"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"12.1"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"block_level_support":{"__compat":{"description":"Support on block level, replaced, table cell, or inline block elements","support":{"chrome":{"version_added":"4"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"5","notes":"<code>resize</code> doesn't have any effect on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/iframe'><code>&lt;iframe&gt;</code></a>. See <a href='https://bugzil.la/680823'>bug 680823</a>)"},"firefox_android":{"version_added":"5","notes":"<code>resize</code> doesn't have any effect on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/iframe'><code>&lt;iframe&gt;</code></a>. See <a href='https://bugzil.la/680823'>bug 680823</a>)"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"flow_relative_support":{"__compat":{"description":"Support for flow-relative values <code>block</code> and <code>inline</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/right","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"rotate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/rotate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"x_y_z_angle":{"__compat":{"description":"x, y, or z axis name plus angle value","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"65","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"65","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"row-gap":{"flex_context":{"__compat":{"description":"Supported in Flex Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/row-gap","support":{"chrome":{"version_added":"84"},"chrome_android":{"version_added":"84"},"edge":{"version_added":"84"},"firefox":{"version_added":"63"},"firefox_android":{"version_added":"63"},"ie":{"version_added":false},"opera":{"version_added":"70"},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":"84"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"grid_context":{"__compat":{"description":"Supported in Grid Layout","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/row-gap","support":{"chrome":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"},{"version_added":"29","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"chrome_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"},{"version_added":"29","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"edge":[{"version_added":"16"},{"version_added":"16","alternative_name":"grid-row-gap"}],"firefox":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-row-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"61"},{"version_added":"52","alternative_name":"grid-row-gap"},{"version_added":"40","version_removed":"59","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"layout.css.grid.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"53"},{"version_added":"44","alternative_name":"grid-row-gap"},{"version_added":"28","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"opera_android":[{"version_added":"47"},{"version_added":"43","alternative_name":"grid-row-gap"},{"version_added":"28","alternative_name":"grid-row-gap","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]}],"qq_android":{"version_added":null},"safari":[{"version_added":"12.1"},{"version_added":"10.1","alternative_name":"grid-row-gap"}],"safari_ios":[{"version_added":"12"},{"version_added":"10.3","alternative_name":"grid-row-gap"}],"samsunginternet_android":[{"version_added":"9.0"},{"alternative_name":"grid-row-gap","version_added":"6.0"}],"uc_android":{"version_added":null},"uc_chinese_android":{"version_added":null},"webview_android":[{"version_added":"66"},{"version_added":"57","alternative_name":"grid-row-gap"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"ruby-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ruby-align","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"38"},"firefox_android":{"version_added":"38"},"ie":{"version_added":false,"notes":"Internet Explorer 9 and later supports an earlier draft of CSS Ruby with non-standard values for this property: <code>auto</code>, <code>left</code>, <code>center</code>, <code>right</code>, <code>distribute-letter</code>, <code>distribute-space</code>, and <code>line-edge</code>."},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"ruby-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/ruby-position","support":{"chrome":[{"version_added":"84"},{"version_added":"1","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."}],"chrome_android":[{"version_added":"84"},{"version_added":"18","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."}],"edge":[{"version_added":"84"},{"version_added":"79","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."},{"version_added":"12","version_removed":"79"}],"firefox":{"version_added":"38"},"firefox_android":{"version_added":"38"},"ie":{"version_added":false,"notes":"Internet Explorer 9 and later support an old draft values: <code>inline</code> (equivalent of having <code>display: inline</code> on the ruby), and <code>above</code> (synonym of the modern <code>over</code>)."},"opera":[{"version_added":"70"},{"version_added":"15","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."}],"opera_android":[{"version_added":"60"},{"version_added":"14","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."}],"safari":{"version_added":"6.1","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."},"safari_ios":{"version_added":"6.1","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."},"samsunginternet_android":{"version_added":false},"webview_android":[{"version_added":"84"},{"version_added":"1","prefix":"-webkit-","notes":"Implemented as a non-standard, prefixed, version of <code>ruby-position</code>, <code>-webkit-ruby-position</code>: it has two properties: <code>before</code> and <code>after</code> (both equivalent, for ltr and rtl scripts to the standard <code>over</code> value used with <code>ruby-align: start</code>)."}]},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"inter-character":{"__compat":{"description":"<code>inter-character</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1055672'>bug 1055672</a>"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"scale":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scale","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-behavior":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-behavior","support":{"chrome":{"version_added":"61"},"chrome_android":{"version_added":"61"},"edge":{"version_added":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":false},"opera":{"version_added":"48"},"opera_android":{"version_added":"45"},"safari":{"version_added":"14","flags":[{"type":"preference","name":"CSSOM View Smooth Scrolling"}]},"safari_ios":{"version_added":"14","flags":[{"type":"preference","name":"CSSOM View Smooth Scrolling"}]},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"61"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-block","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-bottom","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-bottom","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-bottom","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-inline","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-left","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-left","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-left","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-right","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-right","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-right","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin-top","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin-top","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin-top","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-margin","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","alternative_name":"scroll-snap-margin","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"safari_ios":{"version_added":"11","alternative_name":"scroll-snap-margin","partial_implementation":true,"notes":"Scroll margin is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/189265'>bug 189265</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-block":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-block","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-bottom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-bottom","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline-end":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline-end","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline-start":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline-start","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-inline":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-inline","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-left":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-left","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-right":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-right","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding-top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding-top","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-padding":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-padding","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"safari_ios":{"version_added":"11","partial_implementation":true,"notes":"Scroll padding is not applied for scrolls to fragment target or <code>scrollIntoView()</code>, see <a href='https://webkit.org/b/179379'>bug 179379</a>."},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-align","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"79"},"firefox":{"version_added":"68"},"firefox_android":{"version_added":"68"},"ie":{"version_added":false},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-coordinate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-coordinate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-destination":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-destination","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-points-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-points-x","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9","prefix":"-webkit-"},"safari_ios":{"version_added":"9","prefix":"-webkit-"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-points-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-points-y","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9","prefix":"-webkit-"},"safari_ios":{"version_added":"9","prefix":"-webkit-"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-stop":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-stop","support":{"chrome":{"version_added":"75"},"chrome_android":{"version_added":"75"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"62"},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"11.0"},"webview_android":{"version_added":"75"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scroll-snap-type-x":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type-x","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-type-y":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type-y","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_removed":"68","version_added":"39"},"firefox_android":{"version_removed":"68","version_added":"39"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"scroll-snap-type":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scroll-snap-type","support":{"chrome":{"version_added":"69"},"chrome_android":{"version_added":"69"},"edge":{"version_added":"12","prefix":"-ms-","notes":"Edge supports an earlier draft of CSS Scroll Snap without axis values."},"firefox":[{"version_added":"68"},{"version_added":"39","version_removed":"68","notes":"An earlier draft of CSS Scroll Snap without axis values."}],"firefox_android":[{"version_added":"68"},{"version_added":"39","version_removed":"68","notes":"An earlier draft of CSS Scroll Snap without axis values."}],"ie":{"version_added":"10","prefix":"-ms-","notes":"Internet Explorer supports an earlier draft of CSS Scroll Snap without axis values."},"opera":{"version_added":"56"},"opera_android":{"version_added":"48"},"safari":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-","notes":"Older Safari versions support an earlier draft of CSS Scroll Snap without axis values."}],"safari_ios":[{"version_added":"11"},{"version_added":"9","prefix":"-webkit-","notes":"Older Safari versions support an earlier draft of CSS Scroll Snap without axis values."}],"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"69"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scrollbar-3dlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-3dlight-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-arrow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-arrow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-base-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-base-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"64","notes":"On macOS, you need to set the <em>General</em> > <em>Show scroll bars</em> setting in System Preferences to \"Always\" for this property to have any effect."},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-color.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-color.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"scrollbar-darkshadow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-darkshadow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-face-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-face-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-gutter":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-gutter","support":{"chrome":{"version_added":"88","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"chrome_android":{"version_added":"88","flags":[{"type":"preference","name":"Enable experimental Web Platform features"}]},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"scrollbar-highlight-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-highlight-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-shadow-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-shadow-color","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"5"},{"version_added":"8","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"qq_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"uc_android":{"version_added":false},"uc_chinese_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"deprecated":true,"experimental":false,"standard_track":false}}},"scrollbar-width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/scrollbar-width","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-width.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"64"},{"version_added":"63","flags":[{"type":"preference","name":"layout.css.scrollbar-width.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"shape-image-threshold":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-image-threshold","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"Support for percentage opacity values","support":{"chrome":{"version_added":"78"},"chrome_android":{"version_added":"78"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"78"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"shape-margin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-margin","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":[{"version_added":"10.1"},{"prefix":"-webkit-","version_added":"10.1"}],"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"shape-outside":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/shape-outside","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"circle":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#circle()","description":"<code>circle()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"gradient":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/gradient","description":"<code>&lt;gradient&gt;</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"image":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/image","description":"<code>&lt;image&gt;</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"inset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#inset()","description":"<code>inset()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"polygon":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/basic-shape#polygon()","description":"<code>polygon()</code>","support":{"chrome":{"version_added":"37"},"chrome_android":{"version_added":"37"},"edge":{"version_added":"79"},"firefox":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"three_value_syntax":{"__compat":{"description":"Support for three-value syntax of position in circle and ellipse","support":{"chrome":{"version_added":"37","version_removed":"68"},"chrome_android":{"version_added":"37","version_removed":"68"},"edge":{"version_added":false},"firefox":[{"version_added":"62","version_removed":"70"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"62"},{"version_added":"61","version_removed":"62","flags":[{"type":"preference","name":"layout.css.shape-outside.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24","version_removed":"55"},"opera_android":{"version_added":"24","version_removed":"48"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"3.0","version_removed":"10.0"},"webview_android":{"version_added":"37","version_removed":"68"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"tab-size":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/tab-size","support":{"chrome":{"version_added":"21","notes":"This property is not yet animatable."},"chrome_android":{"version_added":"25","notes":"This property is not yet animatable."},"edge":{"version_added":"79","notes":"This property is not yet animatable."},"firefox":{"prefix":"-moz-","version_added":"4","notes":["See <a href='https://bugzil.la/737785'>bug 737785</a> for the status of unprefixing this property.","Before Firefox 53, this property was not animatable."]},"firefox_android":{"prefix":"-moz-","version_added":"4","notes":["See <a href='https://bugzil.la/737785'>bug 737785</a> for the status of unprefixing this property.","Before Firefox 53, this property was not animatable."]},"ie":{"version_added":false},"opera":[{"version_added":"15"},{"prefix":"-o-","version_added":"10.5"}],"opera_android":[{"version_added":"14"},{"prefix":"-o-","version_added":"11"}],"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"7"},"samsunginternet_android":{"version_added":"1.5","notes":"This property is not yet animatable."},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"length":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/length","description":"<code>&lt;length&gt;</code>","support":{"chrome":{"version_added":"42"},"chrome_android":{"version_added":"42"},"edge":{"version_added":"79"},"firefox":{"version_added":"53"},"firefox_android":{"version_added":"53"},"ie":{"version_added":false},"opera":{"version_added":"29"},"opera_android":{"version_added":"29"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"table-layout":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/table-layout","support":{"chrome":{"version_added":"14"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5"},"opera":{"version_added":"7"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1.5"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-align-last":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-align-last","support":{"chrome":[{"version_added":"47"},{"version_added":"35","version_removed":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"chrome_android":[{"version_added":"47"},{"version_added":"35","version_removed":"47","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"edge":{"version_added":"12"},"firefox":[{"version_added":"49"},{"prefix":"-moz-","version_added":"12","version_removed":"53"}],"firefox_android":[{"version_added":"49"},{"prefix":"-moz-","version_added":"14","version_removed":"53"}],"ie":{"version_added":"5.5","partial_implementation":true,"notes":["IE only supports <code>text-align-last</code> when <code>text-align</code> is set to <code>justify</code>.","The <code>start</code> and <code>end</code> values are not supported."]},"opera":[{"version_added":"34"},{"version_added":"23","version_removed":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"opera_android":[{"version_added":"34"},{"version_added":"24","version_removed":"34","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}]}],"safari":{"version_added":false,"notes":"See WebKit <a href='https://webkit.org/b/76173'>bug 76173</a>."},"safari_ios":{"version_added":false,"notes":"See WebKit <a href='https://webkit.org/b/76173'>bug 76173</a>."},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"47"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-align","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"block_alignment_values":{"__compat":{"description":"Prefixed <code>center</code>, <code>left</code>, and <code>right</code> values for block alignment","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":{"prefix":"-moz-","version_added":"1"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"prefix":"-webkit-","version_added":"1.3"},{"prefix":"-khtml-","version_added":"1"}],"safari_ios":[{"prefix":"-webkit-","version_added":"1"},{"prefix":"-khtml-","version_added":"1"}],"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}},"flow_relative_values_start_and_end":{"__compat":{"description":"Flow-relative values <code>start</code> and <code>end</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"justify-all":{"__compat":{"description":"<code>justify-all</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"match-parent":{"__compat":{"description":"<code>match-parent</code>","support":{"chrome":{"version_added":"16"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"40"},"firefox_android":{"version_added":"40"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"Character-based alignment in a table column (<code>&lt;string&gt;</code> value)","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"text-combine-upright":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-combine-upright","support":{"chrome":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"9","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"chrome_android":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"18","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"edge":{"version_added":"12","alternative_name":"-ms-text-combine-horizontal"},"firefox":[{"version_added":"81","notes":"Before version 81, Firefox implemented the property as animatable. This was corrected to spec in 81."},{"version_added":"48","notes":"Before version 48, Firefox did not implement layout support for tate-chū-yoko."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.text-combine-upright.enabled","value_to_set":"true"}]},{"version_added":"31","version_removed":"41","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"26","version_removed":"31","alternative_name":"text-combine-horizontal","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"81","notes":"Before version 81, Firefox implemented the property as animatable. This was corrected to spec in 81."},{"version_added":"48","notes":"Before version 48, Firefox did not implement layout support for tate-chū-yoko."},{"version_added":"41","flags":[{"type":"preference","name":"layout.css.text-combine-upright.enabled","value_to_set":"true"}]},{"version_added":"31","version_removed":"41","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]},{"version_added":"26","version_removed":"31","alternative_name":"text-combine-horizontal","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","alternative_name":"-ms-text-combine-horizontal"},"opera":[{"version_added":"35"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"15","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"opera_android":[{"version_added":"35"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"14","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"safari":{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"5.1","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."},"safari_ios":{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"5","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."},"samsunginternet_android":[{"version_added":"5.0"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"1.0","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}],"webview_android":[{"version_added":"48"},{"partial_implementation":true,"alternative_name":"-webkit-text-combine","version_added":"≤37","notes":"This property was initially named <code>-webkit-text-combine</code> according to a <a href='http://www.w3.org/TR/2011/WD-css3-writing-modes-20110531/#text-combine'>2011 version of the CSS3 Writing Modes specification</a>, supporting the values <code>none</code> and <code>horizontal</code> without <code>digits</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"digits":{"__compat":{"description":"<code>digits</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"48","flags":[{"type":"preference","name":"layout.css.text-combine-upright-digits.enabled","value_to_set":"true"}],"notes":"Firefox recognizes this value but does not yet implement layout support for tate-chū-yoko (see <a href='https://bugzil.la/1258635'>bug 1258635</a>)."},"firefox_android":{"version_added":"48","flags":[{"type":"preference","name":"layout.css.text-combine-upright-digits.enabled","value_to_set":"true"}],"notes":"Firefox recognizes this value but does not yet implement layout support for tate-chū-yoko (see <a href='https://bugzil.la/1258635'>bug 1258635</a>)."},"ie":{"version_added":"11"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-color","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-decoration-line":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-line","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"blink":{"__compat":{"description":"<code>blink</code>","support":{"chrome":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."},"chrome_android":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."},"edge":{"version_added":"79","notes":"The <code>blink</code> value does not have any effect."},"firefox":{"version_added":"26","notes":"The <code>blink</code> value does not have any effect."},"firefox_android":{"version_added":"26","notes":"The <code>blink</code> value does not have any effect."},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"7.0","notes":"The <code>blink</code> value does not have any effect."},"webview_android":{"version_added":"57","notes":"The <code>blink</code> value does not have any effect."}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"text-decoration-skip-ink":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-skip-ink","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"50"},"opera_android":{"version_added":"46"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"all":{"__compat":{"description":"<code>all</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"75"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-skip":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-skip","support":{"chrome":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."},"chrome_android":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"44","version_removed":"50","notes":"Only supports the deprecated <code>ink</code> value."},"opera_android":{"version_added":"43","version_removed":"46","notes":"Only supports the deprecated <code>ink</code> value."},"safari":[{"version_added":"12.1","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."},{"version_added":"8","prefix":"-webkit-","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."}],"safari_ios":[{"version_added":"12.2","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."},{"version_added":"8","prefix":"-webkit-","notes":"Only supports the <code>none</code> and <code>skip</code> values; all other values behave like those two values."}],"samsunginternet_android":{"version_added":"7.0","version_removed":"9.0","notes":"Only supports the deprecated <code>ink</code> value."},"webview_android":{"version_added":"57","version_removed":"64","notes":"Only supports the deprecated <code>ink</code> value."}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"text-decoration-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-style","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"firefox_android":[{"version_added":"36"},{"prefix":"-moz-","version_added":"6","version_removed":"39"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"8"}],"safari_ios":[{"version_added":"12.2"},{"prefix":"-webkit-","version_added":"8"}],"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"wavy":{"__compat":{"description":"<code>wavy</code>","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":{"version_added":"6"},"firefox_android":{"version_added":"6"},"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration-thickness":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration-thickness","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"70"},{"version_added":"69","alternative_name":"text-decoration-width","flags":[{"type":"preference","name":"layout.css.text-decoration-width.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"percentage values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-decoration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-decoration","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"blink":{"__compat":{"description":"<code>blink</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"1","version_removed":"23"},"firefox_android":{"version_added":"4","version_removed":"23"},"ie":{"version_added":false},"opera":{"version_added":"4","version_removed":"15"},"opera_android":{"version_added":"10.1","version_removed":"14"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}},"shorthand":{"__compat":{"description":"Shorthand","support":{"chrome":{"version_added":"57"},"chrome_android":{"version_added":"57"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36"},{"partial_implementation":true,"version_added":"6"}],"firefox_android":[{"version_added":"36"},{"partial_implementation":true,"version_added":"6"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":{"prefix":"-webkit-","version_added":"8"},"safari_ios":{"prefix":"-webkit-","version_added":"8"},"samsunginternet_android":{"version_added":"7.0"},"webview_android":{"version_added":"57"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-decoration-thickness":{"__compat":{"description":"<code>text-decoration-thickness</code> included in shorthand","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"70"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}}},"text-emphasis-color":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-color","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-emphasis-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-position","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"left_and_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":"62"},"chrome_android":{"version_added":"62"},"edge":{"version_added":"79"},"firefox":{"version_added":"46"},"firefox_android":{"version_added":"46"},"ie":{"version_added":false},"opera":{"version_added":"49"},"opera_android":{"version_added":"46"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"8.0"},"webview_android":{"version_added":"62"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-emphasis-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis-style","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-emphasis":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-emphasis","support":{"chrome":{"prefix":"-webkit-","version_added":"25"},"chrome_android":{"prefix":"-webkit-","version_added":"25"},"edge":{"prefix":"-webkit-","version_added":"79"},"firefox":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"46"},{"version_added":"45","version_removed":"49","flags":[{"type":"preference","name":"layout.css.text-emphasis.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"6.1"},{"prefix":"-webkit-","version_added":"6.1"}],"safari_ios":[{"version_added":"7"},{"prefix":"-webkit-","version_added":"7"}],"samsunginternet_android":{"prefix":"-webkit-","version_added":"1.5"},"webview_android":{"prefix":"-webkit-","version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-indent":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-indent","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"3"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"each-line":{"__compat":{"description":"<code>each-line</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"hanging":{"__compat":{"description":"<code>hanging</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-justify":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-justify","support":{"chrome":{"version_added":"32","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"chrome_android":{"version_added":"32","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"edge":{"version_added":"12","notes":"Standard values <code>inter-character</code> and <code>none</code> are supported. The deprecated <code>distribute</code> value is also supported."},"firefox":[{"version_added":"55"},{"version_added":"54","flags":[{"type":"preference","name":"layout.css.text-justify.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"55"},{"version_added":"54","flags":[{"type":"preference","name":"layout.css.text-justify.enabled","value_to_set":"true"}]}],"ie":{"version_added":"11","notes":"Standard values <code>inter-character</code> and <code>none</code> are supported. The deprecated <code>distribute</code> value is also supported."},"opera":{"version_added":"19","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"opera_android":{"version_added":"19","flags":[{"type":"preference","name":"Enable Experimental Web Platform Features","value_to_set":"true"}],"notes":"<code>inter-word</code> and <code>distribute</code> (deprecated) values are supported, but <code>distribute</code> behavior is buggy."},"safari":{"version_added":false,"notes":"See <a href='https://webkit.org/b/99945'>bug 9945</a>."},"safari_ios":{"version_added":false,"notes":"See <a href='https://webkit.org/b/99945'>bug 9945</a>."},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-orientation":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-orientation","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"11"}],"chrome_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41"},{"version_added":"38","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"14"},{"prefix":"-webkit-","version_added":"5"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"sideways":{"__compat":{"description":"<code>sideways</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"44","notes":"<code>sideways-right</code> has become an alias of <code>sideways</code>."},"firefox_android":{"version_added":"44","notes":"<code>sideways-right</code> has become an alias of <code>sideways</code>."},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-overflow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-overflow","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"7","notes":"Until Firefox 10, handling of <code>text-overflow</code> on blocks with inline overflow on both horizontal sides was incorrect. Before Firefox 10, if only one value was specified (such as <code>text-overflow: ellipsis;</code>), text was ellipsed on both sides of the block, instead of only the end edge based on the block's text direction."},"firefox_android":{"version_added":"7","notes":"Until Firefox 10, handling of <code>text-overflow</code> on blocks with inline overflow on both horizontal sides was incorrect. Before Firefox 10, if only one value was specified (such as <code>text-overflow: ellipsis;</code>), text was ellipsed on both sides of the block, instead of only the end edge based on the block's text direction."},"ie":[{"version_added":"6"},{"prefix":"-ms-","version_added":"8"}],"opera":[{"version_added":"11"},{"prefix":"-o-","version_added":"9"}],"opera_android":[{"version_added":"11"},{"prefix":"-o-","version_added":"10.1"}],"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"fade_function":{"__compat":{"description":"<code>fade()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}},"fade_value":{"__compat":{"description":"<code>fade</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"string":{"__compat":{"description":"&lt;string&gt;","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"two_value_syntax":{"__compat":{"description":"Two-value syntax","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"9"},"firefox_android":{"version_added":"9"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-rendering":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-rendering","support":{"chrome":{"version_added":"4","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"chrome_android":{"version_added":"18","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"edge":{"version_added":"79","notes":["This property is only supported on Windows and Linux.","Initial versions had bugs on Windows and Linux that broke <a href='https://crbug.com/114719'>font substitition</a>, <a href='https://crbug.com/51973'>small-caps</a>, <a href='https://crbug.com/55458'>letter-spacing</a> or caused <a href='https://crbug.com/149548'>text to overlap</a>."]},"firefox":{"version_added":"1","notes":["This property is only supported on Windows and Linux.","The <code>optimizeSpeed</code> option has no effect on Firefox 4 because the standard code for text rendering is already fast and there is not a faster code path at this time. See <a href='https://bugzil.la/595688'>bug 595688</a> for details."]},"firefox_android":{"version_added":"46"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"4.2"},"samsunginternet_android":{"version_added":"1.0","notes":"This property is only supported on Windows and Linux. Samsung Internet is not on Windows or Linux."},"webview_android":{"version_added":"3","notes":"From version 3 to 4.3, there is a serious bug where <code>text-rendering: optimizeLegibility</code> causes custom web fonts to not render. This was fixed in version 4.4."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"auto":{"__compat":{"description":"<code>auto</code>","support":{"chrome":{"version_added":"4","notes":"Chrome treats <code>auto</code> as <code>optimizeSpeed</code>."},"chrome_android":{"version_added":"18","notes":"Chrome treats <code>auto</code> as <code>optimizeSpeed</code>."},"edge":{"version_added":"79","notes":"Edge treats <code>auto</code> as <code>optimizeSpeed</code>."},"firefox":{"version_added":"1","notes":"If the font size is 20 pixels or higher, Firefox treats <code>auto</code> as <code>optimizeLegibility</code>. For smaller text, Firefox treats <code>auto</code> as <code>optimizeSpeed</code>. The 20-pixel threshold can be changed with the <code>browser.display.auto_quality_min_font_size</code> preference."},"firefox_android":{"version_added":"46","notes":"If the font size is 20 pixels or higher, Firefox treats <code>auto</code> as <code>optimizeLegibility</code>. For smaller text, Firefox treats <code>auto</code> as <code>optimizeSpeed</code>. The 20-pixel threshold can be changed with the <code>browser.display.auto_quality_min_font_size</code> preference."},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Opera treats <code>auto</code> as <code>optimizeSpeed</code>."},"opera_android":{"version_added":"14","notes":"Opera treats <code>auto</code> as <code>optimizeSpeed</code>."},"safari":{"version_added":"5","notes":"Safari treats <code>auto</code> as <code>optimizeSpeed</code>. See <a href='https://webkit.org/b/41363'>WebKit bug 41363</a>."},"safari_ios":{"version_added":"4.2","notes":"Safari treats <code>auto</code> as <code>optimizeSpeed</code>. See <a href='https://webkit.org/b/41363'>WebKit bug 41363</a>."},"samsunginternet_android":{"version_added":"1.0","notes":"Samsung Internet treats <code>auto</code> as <code>optimizeSpeed</code>."},"webview_android":{"version_added":"≤37","notes":"WebView treats <code>auto</code> as <code>optimizeSpeed</code>."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"geometricPrecision":{"__compat":{"description":"<code>geometricPrecision</code>","support":{"chrome":{"version_added":"13","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"chrome_android":{"version_added":"18","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"edge":{"version_added":"79","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"firefox":{"version_added":"1","notes":"Firefox treats <code>geometricPrecision</code> the same as <code>optimizeLegibility</code>."},"firefox_android":{"version_added":"46","notes":"Firefox treats <code>geometricPrecision</code> the same as <code>optimizeLegibility</code>."},"ie":{"version_added":false},"opera":{"version_added":"15","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"opera_android":{"version_added":"14","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"1.0","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."},"webview_android":{"version_added":"37","notes":"Supports true geometric precision without rounding up or down to the nearest supported font size in the operating system."}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}},"text-shadow":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-shadow","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5","notes":["Firefox versions before 57 have a bug whereby <a href='https://developer.mozilla.org/docs/Web/CSS/transition'><code>transition</code></a>s will not work when transitioning from a <code>text-shadow</code> with a color specified to a <code>text-shadow</code> without a color specified (<a href='https://bugzil.la/726550'>bug 726550</a>).","From Firefox 4, the blur radius is capped at 300 for performance reasons.","Firefox theoretically supports infinite text-shadows (don't try it).","If the <code>&lt;color&gt;</code> value is unspecified, then Firefox uses the value of the element's <a href='https://developer.mozilla.org/docs/Web/CSS/color'><code>color</code></a> property."]},"firefox_android":{"version_added":"4","notes":["Firefox versions before 57 have a bug whereby <a href='https://developer.mozilla.org/docs/Web/CSS/transition'><code>transition</code></a>s will not work when transitioning from a <code>text-shadow</code> with a color specified to a <code>text-shadow</code> without a color specified (<a href='https://bugzil.la/726550'>bug 726550</a>).","From Firefox 4, the blur radius is capped at 300 for performance reasons.","Firefox theoretically supports infinite text-shadows (don't try it).","If the <code>&lt;color&gt;</code> value is unspecified, then Firefox uses the value of the element's <a href='https://developer.mozilla.org/docs/Web/CSS/color'><code>color</code></a> property."]},"ie":{"version_added":"10"},"opera":{"version_added":"9.5","notes":["Opera supports a maximum of 6-9 text-shadows for performance reasons. The blur radius is limited to 100px.","Opera 9.5 to 10.1 adheres to the old, reverse painting order (in CSS2, the first specified shadow is on the bottom)."]},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.1","notes":["In Safari, any shadows that do not explicitly specify a color are transparent.","Safari 1.1 to 3.2 only supports one text-shadow (displays the first shadow of a comma-separated list and ignores the rest). Safari 4.0 (WebKit 528) and later support multiple text-shadows."]},"safari_ios":{"version_added":"1","notes":["In Safari, any shadows that do not explicitly specify a color are transparent.","Safari iOS 1 and 2 only support one text-shadow (displays the first shadow of a comma-separated list and ignores the rest). Safari iOS 3 (WebKit 528) and later support multiple text-shadows."]},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text-size-adjust":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-size-adjust","support":{"chrome":[{"version_added":"54"},{"prefix":"-webkit-","version_added":false,"notes":"Instead of ignoring the <code>-webkit-text-size-adjust</code> property, a bug prevents desktop Chrome users from zooming in or out. The bug was fixed after Chrome 26."}],"chrome_android":{"version_added":"54"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"12","version_removed":"79"}],"firefox":{"version_added":false},"firefox_android":[{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"14"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"41"},"opera_android":{"version_added":"41"},"safari":[{"version_added":false},{"prefix":"-webkit-","version_added":false,"notes":"Instead of ignoring the <code>-webkit-text-size-adjust</code> property, a bug prevents desktop Safari users from zooming in or out. The bug was fixed after Safari 5."}],"safari_ios":{"prefix":"-webkit-","version_added":"1"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"54"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"<code>&lt;percentage&gt;</code>","support":{"chrome":{"version_added":"54"},"chrome_android":{"version_added":"54"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"41"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"54"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"text-transform":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-transform","support":{"chrome":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"chrome_android":{"version_added":"18","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"7","notes":"Since Opera 15, the <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"opera_android":{"version_added":"11"},"safari":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (also not for the old one-colon syntax). See <a href='https://webkit.org/b/3409'>WebKit bug 3409</a>."},"safari_ios":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (also not for the old one-colon syntax). See <a href='https://webkit.org/b/3409'>WebKit bug 3409</a>."},"samsunginternet_android":{"version_added":"1.0","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."},"webview_android":{"version_added":"1","notes":"The <code>text-transform</code> property does not work for <code>::first-line</code> pseudo-elements (nor for the one-colon syntax). See <a href='https://crbug.com/129669'>Chromium bug 129669</a>."}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"capitalize":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Before Firefox 14, some punctuation characters could interfere with correct capitalization. See <a href='https://bugzil.la/731536'>bug 731536</a>."},"firefox_android":{"version_added":"4","notes":"Before Firefox 14, some punctuation characters could interfere with correct capitalization. See <a href='https://bugzil.la/731536'>bug 731536</a>."},"ie":{"version_added":"4"},"opera":{"version_added":"7"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"dutch_ij_digraph":{"__compat":{"description":"Dutch <code>IJ</code> digraph","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"full-size-kana":{"__compat":{"description":"<code>full-size-kana</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"64"},"firefox_android":{"version_added":"64"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"full-width":{"__compat":{"description":"<code>full-width</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"19"},"firefox_android":{"version_added":"19"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"greek_accented_characters":{"__compat":{"description":"Greek accented letters","support":{"chrome":{"version_added":"34"},"chrome_android":{"version_added":"34"},"edge":{"version_added":"79"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":false},"opera":{"version_added":"21"},"opera_android":{"version_added":"21"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"lowercase_sigma":{"__compat":{"description":"<code>Σ</code> → <code>σ</code> or word-final <code>ς</code>","support":{"chrome":{"version_added":"30"},"chrome_android":{"version_added":"30"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"17"},"opera_android":{"version_added":"18"},"safari":{"version_added":"6"},"safari_ios":{"version_added":"6"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"turkic_is":{"__compat":{"description":"<code>i</code> → <code>İ</code> and <code>ı</code> → <code>I</code>","support":{"chrome":{"version_added":"31"},"chrome_android":{"version_added":"31"},"edge":{"version_added":"12"},"firefox":{"version_added":"14"},"firefox_android":{"version_added":"14"},"ie":{"version_added":"4"},"opera":{"version_added":"18"},"opera_android":{"version_added":"18"},"safari":{"version_added":"8"},"safari_ios":{"version_added":"8"},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"uppercase_eszett":{"__compat":{"description":"<code>ß</code> → <code>SS</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"18"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"7"},"opera_android":{"version_added":"11"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-underline-offset":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-underline-offset","support":{"chrome":{"version_added":false,"notes":"See Chrome Platform Status entry for <a href='https://chromestatus.com/feature/5747636764147712'>text-decoration-thickness, text-underline-offset and from-font keyword for text-underline-position</a>."},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"70"},{"version_added":"69","flags":[{"type":"preference","name":"layout.css.text-underline-offset.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":"12.2"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentage":{"__compat":{"description":"percentage values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"text-underline-position":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/text-underline-position","support":{"chrome":{"version_added":"33"},"chrome_android":{"version_added":"33"},"edge":{"version_added":"12"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":"20"},"opera_android":{"version_added":"20"},"safari":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"9"}],"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"above_below":{"__compat":{"description":"<code>above</code> and <code>below</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"auto-pos":{"__compat":{"description":"<code>auto-pos</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"6"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"from-font":{"__compat":{"description":"<code>from-font</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"left_right":{"__compat":{"description":"<code>left</code> and <code>right</code>","support":{"chrome":{"version_added":"71"},"chrome_android":{"version_added":"71"},"edge":{"version_added":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"58"},"opera_android":{"version_added":"50"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"10.0"},"webview_android":{"version_added":"71"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"under":{"__compat":{"description":"<code>under</code>","support":{"chrome":{"version_added":"33"},"chrome_android":{"version_added":"33"},"edge":{"version_added":"79"},"firefox":{"version_added":"74"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"20"},"opera_android":{"version_added":"20"},"safari":{"version_added":"12.1"},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"2.0"},"webview_android":{"version_added":"4.4.3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"top":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/top","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5","notes":"In Internet Explorer versions before 7, when both <code>top</code> and <code>bottom</code> are specified, the element position is overconstrained and the <code>top</code> property has precedence; the computed value of <code>bottom</code> is set to <code>-top</code>, while its specified value is ignored."},"opera":{"version_added":"6"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"touch-action":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/touch-action","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"axis-pan":{"__compat":{"description":"<code>pan-x</code> and <code>pan-y</code>","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"double-tap-zoom":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}},"manipulation":{"__compat":{"support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"12"},"firefox":[{"version_added":"52","notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}],"notes":"Not applicable to Firefox platforms that support neither pointer nor touch events."}],"firefox_android":[{"version_added":"52"},{"version_added":"29","flags":[{"type":"preference","name":"layout.css.touch_action.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"23"},"opera_android":{"version_added":"24"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pinch-zoom":{"__compat":{"support":{"chrome":{"version_added":"56"},"chrome_android":{"version_added":"56"},"edge":{"version_added":"12"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"ie":[{"version_added":"11"},{"version_added":"10","prefix":"-ms-"}],"opera":{"version_added":"43"},"opera_android":{"version_added":"43"},"safari":{"version_added":"13"},"safari_ios":{"version_added":"13"},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"56"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unidirectional-pan":{"__compat":{"description":"<code>pan-up</code>, <code>pan-down</code>, <code>pan-left</code> and <code>pan-right</code>","support":{"chrome":{"version_added":"55"},"chrome_android":{"version_added":"55"},"edge":{"version_added":"79"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/1285685'>bug 1285685</a>."},"ie":{"version_added":false},"opera":{"version_added":"42"},"opera_android":{"version_added":"42"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"55"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transform-box":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-box","support":{"chrome":{"version_added":"64"},"chrome_android":{"version_added":"64"},"edge":{"version_added":"79"},"firefox":[{"version_added":"55"},{"version_added":"43","flags":[{"type":"preference","name":"svg.transform-box.enabled","value_to_set":"true"}]},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"55"},{"version_added":"43","flags":[{"type":"preference","name":"svg.transform-box.enabled","value_to_set":"true"}]},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"51"},"opera_android":{"version_added":"47"},"safari":{"version_added":"11"},"safari_ios":{"version_added":"11"},"samsunginternet_android":{"version_added":"9.0"},"webview_android":{"version_added":"64"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transform-origin":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-origin","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"3.5"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"9"}],"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"10.5"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"11"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"1"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"support_in_svg":{"__compat":{"description":"Support in SVG","support":{"chrome":{"version_added":"19"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"17"},"firefox":[{"version_added":"43","notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}],"notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."}],"firefox_android":[{"version_added":"43","notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."},{"version_added":"41","version_removed":"43","flags":[{"type":"preference","name":"svg.transform-origin.enabled","value_to_set":"true"}],"notes":"Keywords and percentages refer to the canvas instead of the object itself. See <a href='https://bugzil.la/1209061'>bug 1209061</a>."}],"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6","notes":"Only supported for transformations applied using the CSS <code>transform</code> property (e.g. <code>.className { transform: rotate(45deg); transform-origin: center; }</code>). It has no effect on transformations applied using the <code>transform</code> SVG attribute (e.g. <code>&lt;rect style=&quot;transform-origin: center;&quot; transform=&quot;rotate(45)&quot; /&gt;</code>)."},"safari_ios":{"version_added":"6","notes":"Only supported for transformations applied using the CSS <code>transform</code> property (e.g. <code>.className { transform: rotate(45deg); transform-origin: center; }</code>). It has no effect on transformations applied using the <code>transform</code> SVG attribute (e.g. <code>&lt;rect style=&quot;transform-origin: center;&quot; transform=&quot;rotate(45)&quot; /&gt;</code>)."},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"three_value_syntax":{"__compat":{"description":"Three-value syntax","matches":{"regex_value":"^([\\d\\w%-]+|calc\\(.+\\))\\s+([\\d\\w%-]+|calc\\(.+\\))\\s+([\\d\\w-]+|calc\\(.+\\))$"},"support":{"chrome":{"version_added":"12"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"10"},"firefox_android":{"version_added":"10"},"ie":{"version_added":"9"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transform-style":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform-style","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"12"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"10"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transform":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transform","support":{"chrome":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"36"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10","notes":"Internet Explorer does not support the global values <code>initial</code> and <code>unset</code>."},{"prefix":"-webkit-","version_added":"11"},{"prefix":"-ms-","version_added":"9","notes":"Internet Explorer 5.5 or later supports a proprietary <a href='https://msdn.microsoft.com/en-us/library/ms533014(VS.85,loband).aspx'>Matrix Filter</a> which can be used to achieve a similar effect."}],"opera":[{"version_added":"23"},{"prefix":"-webkit-","version_added":"15"},{"version_added":"12.1","version_removed":"15"},{"prefix":"-o-","version_added":"10.5","version_removed":"15"}],"opera_android":[{"version_added":"24"},{"prefix":"-webkit-","version_added":"14"},{"version_added":"12.1","version_removed":"14"},{"prefix":"-o-","version_added":"11","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.2"}],"samsunginternet_android":[{"version_added":"3.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"37"},{"prefix":"-webkit-","version_added":"2","notes":"Android 2.3 has a bug where input forms will \"jump\" when typing, if any container element has a <code>-webkit-transform</code>."}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"3d":{"__compat":{"description":"3D support","matches":{"keywords":["matrix3d","translate3d","translateZ","scale3d","scaleZ","rotate3d","rotateX","rotateY","rotateZ","perspective"]},"support":{"chrome":{"version_added":"12"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10","notes":"Internet Explorer 9.0 or earlier has no support for 3D transforms. Mixing 3D and 2D transform functions, such as <code>-ms-transform:rotate(10deg) translateZ(0);</code>, will prevent the entire property from being applied."},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3.2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"prefix":"-webkit-","version_added":"3"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition-delay":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-delay","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"4"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transition-duration":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-duration","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"10","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"10.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"transition-property":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-property","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"IDENT_value":{"__compat":{"description":"<code>IDENT</code> value","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"4"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition-timing-function":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition-timing-function","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16"},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"11.6","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"12","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"jump":{"__compat":{"description":"<code>jump-</code> keywords for <code>steps()</code>","support":{"chrome":{"version_added":"77"},"chrome_android":{"version_added":"77"},"edge":{"version_added":"79"},"firefox":{"version_added":"65"},"firefox_android":{"version_added":"65"},"ie":{"version_added":false},"opera":{"version_added":"64"},"opera_android":{"version_added":"55"},"safari":{"version_added":"14"},"safari_ios":{"version_added":"14"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"77"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"transition":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/transition","support":{"chrome":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"26"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"16","notes":["Before Firefox 57, transitions do not work when transitioning from a <a href='https://developer.mozilla.org/docs/Web/CSS/text-shadow'><code>text-shadow</code></a> with a color specified to a <code>text-shadow</code> without a color specified (see <A href='https://bugzil.la/726550'>bug 726550</a>).","Before Firefox 57, cancelling a filling animation (for example, with <code>animation-fill-mode: forwards</code> set) can trigger a transition set on the same element, although only once (see <a href='https://bugzil.la/1192592'>bug 1192592</a> and <a href='https://bug1192592.bmoattachments.org/attachment.cgi?id=8843824'>these test cases</a> for more information).","Before Firefox 57, the <a href='https://developer.mozilla.org/docs/Web/CSS/background-position'><code>background-position</code></a> property can't be transitioned between two values containing different numbers of <a href='https://developer.mozilla.org/docs/Web/CSS/position_value'><code>&lt;position&gt;</code></a> values, for example <code>background-position: 10px 10px;</code> and <code>background-position: 20px 20px, 30px 30px;</code> (see <a href='https://bugzil.la/1390446'>bug 1390446</a>)."]},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"version_added":"16","notes":["Before Firefox 57, transitions do not work when transitioning from a <a href='https://developer.mozilla.org/docs/Web/CSS/text-shadow'><code>text-shadow</code></a> with a color specified to a <code>text-shadow</code> without a color specified (see <A href='https://bugzil.la/726550'>bug 726550</a>).","Before Firefox 57, cancelling a filling animation (for example, with <code>animation-fill-mode: forwards</code> set) can trigger a transition set on the same element, although only once (see <a href='https://bugzil.la/1192592'>bug 1192592</a> and <a href='https://bug1192592.bmoattachments.org/attachment.cgi?id=8843824'>these test cases</a> for more information).","Before Firefox 57, the <a href='https://developer.mozilla.org/docs/Web/CSS/background-position'><code>background-position</code></a> property can't be transitioned between two values containing different numbers of <a href='https://developer.mozilla.org/docs/Web/CSS/position_value'><code>&lt;position&gt;</code></a> values, for example <code>background-position: 10px 10px;</code> and <code>background-position: 20px 20px, 30px 30px;</code> (see <a href='https://bugzil.la/1390446'>bug 1390446</a>)."]},{"prefix":"-moz-","version_added":"4"},{"version_added":"49","prefix":"-webkit-"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":[{"version_added":"10"},{"prefix":"-ms-","version_added":"10"}],"opera":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"15"},{"prefix":"-o-","version_added":"10.1","version_removed":"15"}],"opera_android":[{"version_added":"12.1"},{"prefix":"-webkit-","version_added":"14"},{"prefix":"-o-","version_added":"10.1","version_removed":"14"}],"safari":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"3.1"}],"safari_ios":[{"version_added":"9"},{"prefix":"-webkit-","version_added":"2"}],"samsunginternet_android":[{"version_added":"1.5"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"≤37"},{"prefix":"-webkit-","version_added":"2"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"gradients":{"__compat":{"description":"Gradients","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"translate":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/translate","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":[{"version_added":"72"},{"version_added":"60","version_removed":"72","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]}],"firefox_android":{"version_added":"60","flags":[{"type":"preference","name":"layout.css.individual-transform.enabled","value_to_set":"true"}]},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"unicode-bidi":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/unicode-bidi","support":{"chrome":{"version_added":"2"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"3.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"isolate":{"__compat":{"description":"<code>isolate</code>","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"16","notes":["Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47).","Since Chrome 19, the syntax from a previous version of the specification, where the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, is allowed."]}],"chrome_android":{"version_added":"48"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":"From Firefox 10 to Firefox 16 (inclusive), the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, which was the syntax from a previous version of the specification. From Firefox 17, only one value is allowed. Use <code>isolate-override</code> instead the previous <code>isolate bidi-override</code>."}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":"From Firefox 10 to Firefox 16 (inclusive), the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, which was the syntax from a previous version of the specification. From Firefox 17, only one value is allowed. Use <code>isolate-override</code> instead the previous <code>isolate bidi-override</code>."}],"ie":{"version_added":false},"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15","notes":["Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Opera (up to version 34).","The syntax from a previous version of the specification, where the <code>isolate</code> keyword could be used together with <code>bidi-override</code>, is allowed."]}],"opera_android":{"version_added":"35"},"safari":{"prefix":"-webkit-","version_added":"6","notes":"Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47)."},"safari_ios":{"prefix":"-webkit-","version_added":"6","notes":"Avoiding using <code>-webkit-isolate</code>. It can lock up older versions of Safari (up to version 9) and Chrome (up to version 47)."},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"isolate-override":{"__compat":{"description":"<code>isolate-override</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"17","version_removed":"54"}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"17","version_removed":"54"}],"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"plaintext":{"__compat":{"description":"<code>plaintext</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":["Before Firefox 50, the <code>plaintext</code> value was ignored for vertical writing modes (<a href='https://bugzil.la/1302734'>bug 1302734</a>).","Before Firefox 15, <code>plaintext</code> didn't do anything to an inline element. The specification changed and the implementation was changed in Firefox 15."]}],"firefox_android":[{"version_added":"50"},{"prefix":"-moz-","version_added":"10","version_removed":"54","notes":["Before Firefox 50, the <code>plaintext</code> value was ignored for vertical writing modes (<a href='https://bugzil.la/1302734'>bug 1302734</a>).","Before Firefox 15, <code>plaintext</code> didn't do anything to an inline element. The specification changed and the implementation was changed in Firefox 15."]}],"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"user-modify":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/user-modify","support":{"chrome":{"prefix":"-webkit-","version_added":"1"},"chrome_android":{"prefix":"-webkit-","version_added":"18"},"edge":{"prefix":"-webkit-","version_added":"12"},"firefox":{"prefix":"-moz-","version_added":"1","partial_implementation":true,"notes":["While the CSS property is parsed and accepted, it does not have any effect.","Scheduled for removal (see <a href='https://bugzil.la/1388910'>bug 1388910</a>)."]},"firefox_android":{"prefix":"-moz-","version_added":"4","partial_implementation":true,"notes":["While the CSS property is parsed and accepted, it does not have any effect.","Scheduled for removal (see <a href='https://bugzil.la/1388910'>bug 1388910</a>)."]},"ie":{"version_added":false},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"version_added":"5","prefix":"-webkit-"},"samsunginternet_android":{"version_added":"1.0","prefix":"-webkit-"},"webview_android":{"prefix":"-webkit-","version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}},"read-write-plaintext-only":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"5"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":false,"deprecated":true}}}},"user-select":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/user-select","support":{"chrome":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"1"}],"chrome_android":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"prefix":"-ms-","version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"69"},{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"1"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"firefox_android":[{"prefix":"-webkit-","version_added":"49"},{"prefix":"-moz-","version_added":"4"},{"prefix":"-webkit-","version_added":"44","flags":[{"type":"preference","name":"layout.css.prefixes.webkit","value_to_set":"true"}]}],"ie":{"prefix":"-ms-","version_added":"10"},"opera":{"prefix":"-webkit-","version_added":"15"},"opera_android":{"prefix":"-webkit-","version_added":"14"},"safari":[{"version_added":"3","prefix":"-webkit-"},{"version_added":"2","version_removed":"3","prefix":"-khtml-"}],"safari_ios":{"prefix":"-webkit-","version_added":"3"},"samsunginternet_android":[{"version_added":"6.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"54"},{"prefix":"-webkit-","version_added":"≤37"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"all":{"__compat":{"support":{"chrome":{"version_added":"53"},"chrome_android":{"version_added":"53"},"edge":{"version_added":"79"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":false},"opera":{"version_added":"40"},"opera_android":{"version_added":"41"},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":"6.0"},"webview_android":{"version_added":"53"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"auto":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"contain":{"__compat":{"support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"alternative_name":"element","version_added":"12","version_removed":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"alternative_name":"element","version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"none":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"21"},{"version_added":"1","version_removed":"65","prefix":"-moz-"}],"firefox_android":[{"version_added":"21"},{"version_added":"4","version_removed":"65","prefix":"-moz-"}],"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"text":{"__compat":{"support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"10"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"2","partial_implementation":true,"notes":"Allows typing in the <code>&lt;html&gt;</code> container."},"safari_ios":{"version_added":"3","partial_implementation":true,"notes":"Allows typing in the <code>&lt;html&gt;</code> container."},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"vertical-align":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/vertical-align","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"visibility":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/visibility","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4","notes":["Internet Explorer doesn't support <code>visibility: initial</code>.","Up to Internet Explorer 7, descendants of <code>hidden</code> elements will still be invisible even if they have <code>visibility</code> set to <code>visible</code>."]},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"collapse":{"__compat":{"description":"<code>collapse</code>","support":{"chrome":{"version_added":"1","notes":["Chrome treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Chrome supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"chrome_android":{"version_added":"18","notes":["Chrome treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Chrome supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"edge":{"version_added":"12"},"firefox":{"version_added":"1","notes":"Firefox doesn't hide borders when hiding <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements if <code>border-collapse: collapse</code> is set."},"firefox_android":{"version_added":"4","notes":"Firefox doesn't hide borders when hiding <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements if <code>border-collapse: collapse</code> is set."},"ie":{"version_added":"10"},"opera":{"version_added":"4","notes":["Opera treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Opera supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"opera_android":{"version_added":"10.1","notes":["Opera treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Opera supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"safari":{"version_added":"1.3","notes":["Safari treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Safari supports the collapse value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"safari_ios":{"version_added":"1","notes":["Safari treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Safari supports the collapse value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"samsunginternet_android":{"version_added":"1.0","notes":["Samsung Internet treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","Samsung Internet supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]},"webview_android":{"version_added":"≤37","notes":["WebView treats <code>visibility: collapse</code> like <code>hidden</code>, leaving a white gap.","WebView supports the <code>collapse</code> value only on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tr'><code>&lt;tr&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/thead' ><code>&lt;thead&gt;</code></a>, <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tbody'><code>&lt;tbody&gt;</code></a>, and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/tfoot'><code>&lt;tfoot&gt;</code></a>, but not on <a href='https://developer.mozilla.org/docs/Web/HTML/Element/col'><code>&lt;col&gt;</code></a> and <a href='https://developer.mozilla.org/docs/Web/HTML/Element/colgroup'><code>&lt;colgroup&gt;</code></a> elements."]}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"white-space":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/white-space","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"break-spaces":{"__compat":{"description":"<code>break-spaces</code>","support":{"chrome":{"version_added":"76"},"chrome_android":{"version_added":"76"},"edge":{"version_added":"79"},"firefox":{"version_added":"69"},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"62"},"opera_android":{"version_added":"54"},"safari":{"version_added":"13.1"},"safari_ios":{"version_added":"13.4"},"samsunginternet_android":{"version_added":"12.0"},"webview_android":{"version_added":"76"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"nowrap":{"__compat":{"description":"<code>nowrap</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre":{"__compat":{"description":"<code>pre</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre-line":{"__compat":{"description":"<code>pre-line</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3.5"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"8"},"opera":{"version_added":"9.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"pre-wrap":{"__compat":{"description":"<code>pre-wrap</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":[{"version_added":"3"},{"prefix":"-moz-","version_added":"1","version_removed":"3.6"}],"firefox_android":{"version_added":"4"},"ie":{"version_added":"8","notes":"From Internet Explorer 5.5 to 7, <code>word-wrap: break-word;</code> can be used for line breaks in <code>pre</code> elements."},"opera":{"version_added":"8"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_support":{"__compat":{"description":"Support in SVG","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":"12","version_removed":"79"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":"10"},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"textarea_support":{"__compat":{"description":"Support on <code>&lt;textarea&gt;</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"36"},"firefox_android":{"version_added":"36"},"ie":{"version_added":"5.5"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"widows":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/widows","support":{"chrome":{"version_added":"25"},"chrome_android":{"version_added":"25"},"edge":{"version_added":"12"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":"8"},"opera":{"version_added":"9.2"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1.3"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"width":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/width","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"10.1"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"1"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"animatable":{"__compat":{"description":"Animatable","support":{"chrome":{"version_added":"26"},"chrome_android":{"version_added":"26"},"edge":{"version_added":"12"},"firefox":{"version_added":"16"},"firefox_android":{"version_added":"16"},"ie":{"version_added":"11"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":"1.5"},"webview_android":{"version_added":"4.4"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fill":{"__compat":{"description":"<code>fill</code>","support":{"chrome":{"version_added":"46"},"chrome_android":{"version_added":"46"},"edge":{"version_added":"79"},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"33"},"opera_android":{"version_added":"33"},"safari":{"version_added":"12"},"safari_ios":{"version_added":"12"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":true,"standard_track":false,"deprecated":false}}},"fit-content":{"__compat":{"description":"<code>fit-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"},{"alternative_name":"intrinsic","version_added":"1","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"25"},{"alternative_name":"intrinsic","version_added":"18","version_removed":"48"}],"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":{"prefix":"-moz-","version_added":"3"},"firefox_android":{"prefix":"-moz-","version_added":"4"},"ie":{"version_added":false},"opera":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"15"},{"alternative_name":"intrinsic","version_added":"15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"prefix":"-webkit-","version_added":"14"},{"alternative_name":"intrinsic","version_added":"14","version_removed":"35"}],"safari":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"6.1"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"prefix":"-webkit-","version_added":"7"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.5"},{"alternative_name":"intrinsic","version_added":"1.0","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"≤37"},{"alternative_name":"intrinsic","version_added":"1","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"fit-content_function":{"__compat":{"description":"<code>fit-content()</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/1312588'>bug 1312588</a>."},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"max-content":{"__compat":{"description":"<code>max-content</code>","support":{"chrome":[{"version_added":"46"},{"prefix":"-webkit-","version_added":"22"}],"chrome_android":{"version_added":"46"},"edge":[{"version_added":"79"},{"prefix":"-webkit-","version_added":"79"}],"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":{"version_added":"44"},"opera_android":{"version_added":"43"},"safari":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"intrinsic","version_added":"1"}],"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"46"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"min-content":{"__compat":{"description":"<code>min-content</code>","support":{"chrome":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"1","version_removed":"48"}],"chrome_android":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"18","version_removed":"48"}],"edge":{"version_added":"79"},"firefox":[{"version_added":"66"},{"version_added":"3","prefix":"-moz-"}],"firefox_android":[{"version_added":"66"},{"version_added":"4","prefix":"-moz-"}],"ie":{"version_added":false},"opera":[{"version_added":"33"},{"alternative_name":"min-intrinsic","version_added":"15","version_removed":"35"}],"opera_android":[{"version_added":"33"},{"alternative_name":"min-intrinsic","version_added":"14","version_removed":"35"}],"safari":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"2"}],"safari_ios":[{"version_added":"11"},{"alternative_name":"min-intrinsic","version_added":"1"}],"samsunginternet_android":[{"version_added":"5.0"},{"alternative_name":"min-intrinsic","version_added":"1.0","version_removed":"5.0"}],"webview_android":[{"version_added":"46"},{"alternative_name":"min-intrinsic","version_added":"1","version_removed":"48"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"stretch":{"__compat":{"description":"<code>stretch</code>","support":{"chrome":{"alternative_name":"-webkit-fill-available","version_added":"22"},"chrome_android":{"alternative_name":"-webkit-fill-available","version_added":"25"},"edge":{"alternative_name":"-webkit-fill-available","version_added":"79"},"firefox":{"alternative_name":"-moz-available","version_added":"3"},"firefox_android":{"alternative_name":"-moz-available","version_added":"4"},"ie":{"version_added":false},"opera":{"alternative_name":"-webkit-fill-available","version_added":"15"},"opera_android":{"alternative_name":"-webkit-fill-available","version_added":"14"},"safari":{"alternative_name":"-webkit-fill-available","version_added":"6.1"},"safari_ios":{"alternative_name":"-webkit-fill-available","version_added":"6.1"},"samsunginternet_android":{"version_added":"5.0","alternative_name":"-webkit-fill-available"},"webview_android":{"alternative_name":"-webkit-fill-available","version_added":"4.4"}},"status":{"experimental":true,"standard_track":true,"deprecated":false}}}},"will-change":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/will-change","support":{"chrome":{"version_added":"36"},"chrome_android":{"version_added":"36"},"edge":{"version_added":"79"},"firefox":[{"version_added":"36","notes":"Before Firefox 43, Firefox supported <code>will-change: will-change</code>, which is invalid by the specification."},{"version_added":"31","version_removed":"36","flags":[{"type":"preference","name":"layout.css.will-change.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"36","notes":"Before Firefox 43, Firefox supported <code>will-change: will-change</code>, which is invalid by the specification."},{"version_added":"31","version_removed":"36","flags":[{"type":"preference","name":"layout.css.will-change.enabled","value_to_set":"true"}]}],"ie":{"version_added":false},"opera":{"version_added":"24"},"opera_android":{"version_added":"24"},"safari":{"version_added":"9.1"},"safari_ios":{"version_added":"9.3"},"samsunginternet_android":{"version_added":"3.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"word-break":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/word-break","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":[{"version_added":"5.5","notes":"No version of Internet Explorer supports the <code>initial</code> value."},{"prefix":"-ms-","version_added":"8","notes":"Don't use <code>-ms-word-break</code>, which is a synonym for <code>word-break</code>."}],"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"break-word":{"__compat":{"description":"<code>break-word</code>","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"79"},"firefox":{"version_added":"67"},"firefox_android":{"version_added":"67"},"ie":{"version_added":false},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3"},"safari_ios":{"version_added":"2"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"keep-all":{"__compat":{"description":"<code>keep-all</code>","support":{"chrome":{"version_added":"44"},"chrome_android":{"version_added":"44"},"edge":{"version_added":"12"},"firefox":{"version_added":"15"},"firefox_android":{"version_added":"15"},"ie":{"version_added":"5.5"},"opera":{"version_added":"31"},"opera_android":{"version_added":"32"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"4.0"},"webview_android":{"version_added":"44"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"word-spacing":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/word-spacing","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"6"},"opera":{"version_added":"3.5"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"percentages":{"__compat":{"description":"<code>&lt;percentage&gt;</code> values","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"45"},"firefox_android":{"version_added":"45"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":"6.1"},"safari_ios":{"version_added":"6.1"},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg":{"__compat":{"description":"SVG support","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"72"},"firefox_android":{"version_added":false},"ie":{"version_added":"9"},"opera":{"version_added":"7"},"opera_android":{"version_added":"14"},"safari":{"version_added":"5.1"},"safari_ios":{"version_added":"5.1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"word-wrap":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/overflow-wrap","support":{"chrome":[{"alternative_name":"overflow-wrap","version_added":"23"},{"version_added":"1"}],"chrome_android":[{"alternative_name":"overflow-wrap","version_added":"25"},{"version_added":"18"}],"edge":{"version_added":"12"},"firefox":[{"alternative_name":"overflow-wrap","version_added":"49"},{"version_added":"3.5"}],"firefox_android":[{"alternative_name":"overflow-wrap","version_added":"49"},{"version_added":"4"}],"ie":{"version_added":"5.5"},"opera":[{"alternative_name":"overflow-wrap","version_added":"15"},{"version_added":"10.5"}],"opera_android":[{"alternative_name":"overflow-wrap","version_added":"14"},{"version_added":"11"}],"safari":[{"alternative_name":"overflow-wrap","version_added":"6.1"},{"version_added":"2"}],"safari_ios":[{"alternative_name":"overflow-wrap","version_added":"7"},{"version_added":"1"}],"samsunginternet_android":[{"alternative_name":"overflow-wrap","version_added":"1.5"},{"version_added":"1.0"}],"webview_android":[{"alternative_name":"overflow-wrap","version_added":"≤37"},{"version_added":"1"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"writing-mode":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/writing-mode","support":{"chrome":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"8"}],"chrome_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"18"}],"edge":[{"version_added":"12"},{"prefix":"-webkit-","version_added":"12"}],"firefox":[{"version_added":"41","notes":"Firefox 42 added support for bidirectional and RTL scripts in vertical modes."},{"version_added":"36","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"firefox_android":[{"version_added":"41","notes":"Firefox 42 added support for bidirectional and RTL scripts in vertical modes."},{"version_added":"36","version_removed":"51","flags":[{"type":"preference","name":"layout.css.vertical-text.enabled","value_to_set":"true"}]}],"ie":[{"version_added":"9","notes":"Internet Explorer's implementation differs from the specification."},{"prefix":"-ms-","version_added":"9","notes":"Internet Explorer's implementation differs from the specification."}],"opera":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"15"}],"opera_android":[{"version_added":"35"},{"prefix":"-webkit-","version_added":"14"}],"safari":[{"version_added":"10.1"},{"prefix":"-webkit-","version_added":"5.1"}],"safari_ios":[{"version_added":"10.3"},{"prefix":"-webkit-","version_added":"5.1"}],"samsunginternet_android":[{"version_added":"5.0"},{"prefix":"-webkit-","version_added":"1.0"}],"webview_android":[{"version_added":"48"},{"prefix":"-webkit-","version_added":"3"}]},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"horizontal_vertical_values":{"__compat":{"description":"<code>horizontal-tb</code>, <code>vertical-lr</code>, and <code>vertical-rl</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"79"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":"9"},"safari_ios":{"version_added":"9"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"sideways_values":{"__compat":{"description":"<code>sideways-lr</code> and <code>sideways-rl</code>","support":{"chrome":{"version_added":false},"chrome_android":{"version_added":false},"edge":{"version_added":false},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":false},"opera":{"version_added":false},"opera_android":{"version_added":false},"safari":{"version_added":false},"safari_ios":{"version_added":false},"samsunginternet_android":{"version_added":false},"webview_android":{"version_added":false}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}},"svg_values":{"__compat":{"description":"<code>lr</code>, <code>lr-tb</code>, <code>rl</code>, <code>rl-tb</code>, <code>tb</code>, and <code>tb-rl</code>","support":{"chrome":{"version_added":"48"},"chrome_android":{"version_added":"48"},"edge":{"version_added":"12"},"firefox":{"version_added":"43"},"firefox_android":{"version_added":"43"},"ie":{"version_added":"9"},"opera":{"version_added":"35"},"opera_android":{"version_added":"35"},"safari":{"version_added":"10.1"},"safari_ios":{"version_added":"10.3"},"samsunginternet_android":{"version_added":"5.0"},"webview_android":{"version_added":"48"}},"status":{"experimental":false,"standard_track":true,"deprecated":true}}}},"z-index":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/z-index","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"1"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}},"negative_values":{"__compat":{"description":"Negative values","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":"3"},"firefox_android":{"version_added":"4"},"ie":{"version_added":"4"},"opera":{"version_added":"4"},"opera_android":{"version_added":"14"},"safari":{"version_added":"1"},"safari_ios":{"version_added":"1"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":true,"deprecated":false}}}},"zoom":{"__compat":{"mdn_url":"https://developer.mozilla.org/docs/Web/CSS/zoom","support":{"chrome":{"version_added":"1"},"chrome_android":{"version_added":"18"},"edge":{"version_added":"12"},"firefox":{"version_added":false,"notes":"See <a href='https://bugzil.la/390936'>bug 390936</a>."},"firefox_android":{"version_added":false,"notes":"See <a href='https://bugzil.la/390936'>bug 390936</a>."},"ie":{"version_added":"5.5"},"opera":{"version_added":"15"},"opera_android":{"version_added":"14"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0"},"webview_android":{"version_added":"≤37"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}},"reset":{"__compat":{"description":"The <code>reset</code> value","mdn_url":"https://developer.mozilla.org/docs/Web/CSS/zoom#Values","support":{"chrome":{"version_added":"1","version_removed":"59"},"chrome_android":{"version_added":"18","version_removed":"59"},"edge":{"version_added":false},"firefox":{"version_added":false},"firefox_android":{"version_added":false},"ie":{"version_added":false},"opera":{"version_added":"15","version_removed":"46"},"opera_android":{"version_added":"14","version_removed":"43"},"safari":{"version_added":"3.1"},"safari_ios":{"version_added":"3"},"samsunginternet_android":{"version_added":"1.0","version_removed":"7.0"},"webview_android":{"version_added":"≤37","version_removed":"59"}},"status":{"experimental":false,"standard_track":false,"deprecated":false}}}}}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/package.json firefox-85.0+build1/devtools/shared/compatibility/package.json
--- firefox-84.0.2+build1/devtools/shared/compatibility/package.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/package.json	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,13 @@
+{
+  "name": "devtools-mdn-compat-data",
+  "version": "1.0.0",
+  "description": "Handle MDN compatibility data used by the Compatibility",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "update": "node bin/update"
+  },
+  "author": "",
+  "devDependencies": {
+    "@mdn/browser-compat-data": "^"
+  }
+}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/README.md firefox-85.0+build1/devtools/shared/compatibility/README.md
--- firefox-84.0.2+build1/devtools/shared/compatibility/README.md	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/README.md	2021-01-18 19:58:08.000000000 +0000
@@ -1,44 +1,20 @@
 # Compatibility Dataset
 
 ## How to update the MDN compatibility data
+
 The Compatibility panel detects issues by comparing against official [MDN compatibility data](https://github.com/mdn/browser-compat-data). It uses a local snapshot of the dataset. This dataset needs to be manually synchronized periodically to `devtools/shared/compatibility/dataset` (ideally with every Firefox release).
 
 The subsets from the dataset required by the Compatibility panel are:
-* browsers: [https://github.com/mdn/browser-compat-data/tree/master/browsers](https://github.com/mdn/browser-compat-data/tree/master/browsers)
-* css.properties: [https://github.com/mdn/browser-compat-data/tree/master/css](https://github.com/mdn/browser-compat-data/tree/master/css).
-
-The MDN compatibility data is available as a node package ([@mdn/browser-compat-data](https://www.npmjs.com/package/@mdn/browser-compat-data)).
-The following node program is a sample of how to download `browsers.json` and `css-properties.json` using the node package.
-
-```javascript
-'use strict';
 
-const compatData = require("@mdn/browser-compat-data")
-const fs = require("fs")
-const path = require("path")
-
-function exportData(data, fileName) {
-  const content = `${ JSON.stringify(data) }`
-
-  fs.writeFile(
-    path.resolve(
-      __dirname,
-      fileName
-    ),
-    content,
-    err => {
-      if (err) {
-        console.error(err)
-      }
-    }
-  )
-}
+- browsers: [https://github.com/mdn/browser-compat-data/tree/master/browsers](https://github.com/mdn/browser-compat-data/tree/master/browsers)
+- css.properties: [https://github.com/mdn/browser-compat-data/tree/master/css](https://github.com/mdn/browser-compat-data/tree/master/css).
 
-exportData(compatData.css.properties, "css-properties.json");
-exportData(compatData.browsers, "browsers.json");
+In order to download up-to-date data, you need to run the following commands:
 
-```
+- `cd devtools/shared/compatibility`
+- `yarn install` and select the latest package version
+- `yarn update`
 
-Save the JSON files created by the script to `devtools/shared/compatibility/dataset/`.
+This should save the JSON files directly in `devtools/shared/compatibility/dataset/`.
 
 Check that all tests still pass. It is possible that changes in the structure or contents of the latest dataset will cause tests to fail. If that is the case, fix the tests. **Do not manually change the contents or structure of the local dataset** because any changes will be overwritten by the next update from the official dataset.
diff -Nru firefox-84.0.2+build1/devtools/shared/compatibility/yarn.lock firefox-85.0+build1/devtools/shared/compatibility/yarn.lock
--- firefox-84.0.2+build1/devtools/shared/compatibility/yarn.lock	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/compatibility/yarn.lock	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@mdn/browser-compat-data@^":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3"
+  integrity sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==
+  dependencies:
+    extend "3.0.2"
+
+extend@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
diff -Nru firefox-84.0.2+build1/devtools/shared/css/constants.js firefox-85.0+build1/devtools/shared/css/constants.js
--- firefox-84.0.2+build1/devtools/shared/css/constants.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/css/constants.js	2021-01-18 19:58:08.000000000 +0000
@@ -15,8 +15,7 @@
 };
 
 /**
- * Mapping of InspectorPropertyType to old type ID.
- * Kept for backwards compatibility. Remove after Firefox 70.
+ * @backward-compat { version 70 } Mapping of InspectorPropertyType to old type ID.
  */
 exports.CSS_TYPES = {
   color: 2,
@@ -32,6 +31,7 @@
   ":hover",
   ":active",
   ":focus",
+  ":focus-visible",
   ":focus-within",
   ":visited",
 ];
diff -Nru firefox-84.0.2+build1/devtools/shared/css/generated/properties-db.js firefox-85.0+build1/devtools/shared/css/generated/properties-db.js
--- firefox-84.0.2+build1/devtools/shared/css/generated/properties-db.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/css/generated/properties-db.js	2021-01-18 19:58:08.000000000 +0000
@@ -10457,6 +10457,7 @@
       "none",
       "pan-x",
       "pan-y",
+      "pinch-zoom",
       "revert",
       "unset"
     ]
diff -Nru firefox-84.0.2+build1/devtools/shared/heapsnapshot/DominatorTree.cpp firefox-85.0+build1/devtools/shared/heapsnapshot/DominatorTree.cpp
--- firefox-84.0.2+build1/devtools/shared/heapsnapshot/DominatorTree.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/heapsnapshot/DominatorTree.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/devtools/DominatorTree.h"
 #include "mozilla/dom/DominatorTreeBinding.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace devtools {
diff -Nru firefox-84.0.2+build1/devtools/shared/heapsnapshot/DominatorTree.h firefox-85.0+build1/devtools/shared/heapsnapshot/DominatorTree.h
--- firefox-84.0.2+build1/devtools/shared/heapsnapshot/DominatorTree.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/heapsnapshot/DominatorTree.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,12 +8,13 @@
 
 #include "mozilla/devtools/HeapSnapshot.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefCounted.h"
 #include "js/UbiNodeDominatorTree.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree final : public nsISupports, public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/devtools/shared/heapsnapshot/HeapSnapshot.cpp firefox-85.0+build1/devtools/shared/heapsnapshot/HeapSnapshot.cpp
--- firefox-84.0.2+build1/devtools/shared/heapsnapshot/HeapSnapshot.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/heapsnapshot/HeapSnapshot.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -177,19 +177,16 @@
 }
 
 // Get a de-duplicated string as a Maybe<StringOrRef> from the given `msg`.
-#define GET_STRING_OR_REF_WITH_PROP_NAMES(msg, strPropertyName, \
-                                          refPropertyName)      \
-  (msg.has_##refPropertyName()                                  \
-       ? Some(StringOrRef(msg.refPropertyName()))               \
-       : msg.has_##strPropertyName()                            \
-             ? Some(StringOrRef(&msg.strPropertyName()))        \
-             : Nothing())
+#define GET_STRING_OR_REF_WITH_PROP_NAMES(msg, strPropertyName,              \
+                                          refPropertyName)                   \
+  (msg.has_##refPropertyName()   ? Some(StringOrRef(msg.refPropertyName()))  \
+   : msg.has_##strPropertyName() ? Some(StringOrRef(&msg.strPropertyName())) \
+                                 : Nothing())
 
-#define GET_STRING_OR_REF(msg, property)                           \
-  (msg.has_##property##ref()                                       \
-       ? Some(StringOrRef(msg.property##ref()))                    \
-       : msg.has_##property() ? Some(StringOrRef(&msg.property())) \
-                              : Nothing())
+#define GET_STRING_OR_REF(msg, property)                              \
+  (msg.has_##property##ref() ? Some(StringOrRef(msg.property##ref())) \
+   : msg.has_##property()    ? Some(StringOrRef(&msg.property()))     \
+                             : Nothing())
 
 bool HeapSnapshot::saveNode(const protobuf::Node& node,
                             NodeIdSet& edgeReferents) {
diff -Nru firefox-84.0.2+build1/devtools/shared/heapsnapshot/HeapSnapshot.h firefox-85.0+build1/devtools/shared/heapsnapshot/HeapSnapshot.h
--- firefox-84.0.2+build1/devtools/shared/heapsnapshot/HeapSnapshot.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/heapsnapshot/HeapSnapshot.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,6 @@
 #define mozilla_devtools_HeapSnapshot__
 
 #include "js/HashTable.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/devtools/DeserializedNode.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Nullable.h"
@@ -27,6 +26,8 @@
 #include "nsXPCOM.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree;
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/beautify.js firefox-85.0+build1/devtools/shared/jsbeautify/beautify.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/beautify.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/beautify.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,7 +1,9 @@
-var { cssBeautify } = require("devtools/shared/jsbeautify/src/beautify-css");
-var { htmlBeautify } = require("devtools/shared/jsbeautify/src/beautify-html");
-var { jsBeautify } = require("devtools/shared/jsbeautify/src/beautify-js");
+const { css_beautify } = require("devtools/shared/jsbeautify/src/beautify-css");
+const {
+  html_beautify,
+} = require("devtools/shared/jsbeautify/src/beautify-html");
+const { js_beautify } = require("devtools/shared/jsbeautify/src/beautify-js");
 
-exports.css = cssBeautify;
-exports.html = htmlBeautify;
-exports.js = jsBeautify;
+exports.css = css_beautify;
+exports.html = html_beautify;
+exports.js = js_beautify;
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/moz.build firefox-85.0+build1/devtools/shared/jsbeautify/lib/moz.build
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/lib/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-# -*- 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/.
-
-DevToolsModules(
-    'sanitytest.js',
-    'urlencode_unpacker.js',
-)
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/sanitytest.js firefox-85.0+build1/devtools/shared/jsbeautify/lib/sanitytest.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/sanitytest.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/lib/sanitytest.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-//
-// simple testing interface
-// written by Einar Lielmanis, einar@jsbeautifier.org
-//
-// usage:
-//
-// var t = new SanityTest(function (x) { return x; }, 'my function');
-// t.expect('input', 'output');
-// t.expect('a', 'a');
-// output_somewhere(t.results()); // good for <pre>, html safe-ish
-// alert(t.results_raw());        // html unescaped
-
-
-function SanityTest (func, name_of_test) {
-
-    var test_func = func || function (x) {
-        return x;
-    };
-
-    var test_name = name_of_test || '';
-
-    var n_failed = 0;
-    var n_succeeded = 0;
-
-    this.failures = [];
-    this.successes = [];
-
-    this.test_function = function(func, name) {
-        test_func = func;
-        test_name = name || '';
-    };
-
-    this.get_exitcode = function() {
-        return n_succeeded === 0 || n_failed !== 0 ? 1 : 0;
-    };
-
-    this.expect = function(parameters, expected_value) {
-        // multi-parameter calls not supported (I don't need them now).
-        var result = test_func(parameters);
-        // proper array checking is a pain. i'll maybe do it later, compare strings representations instead
-        if ((result === expected_value) || (expected_value instanceof Array && result.join(', ') == expected_value.join(', '))) {
-            n_succeeded += 1;
-            this.successes.push([test_name, parameters, expected_value, result]);
-        } else {
-            n_failed += 1;
-            this.failures.push([test_name, parameters, expected_value, result]);
-        }
-    };
-
-
-    this.results_raw = function() {
-        var results = '';
-        if (n_failed === 0) {
-            if (n_succeeded === 0) {
-                results = 'No tests run.';
-            } else {
-                results = 'All ' + n_succeeded + ' tests passed.';
-            }
-        } else {
-            for (var i = 0 ; i < this.failures.length; i++) {
-                var f = this.failures[i];
-                if (f[0]) {
-                    f[0] = f[0] + ' ';
-                }
-                results += '---- ' + f[0] + 'input -------\n' + this.prettyprint(f[1]) + '\n';
-                results += '---- ' + f[0] + 'expected ----\n' + this.prettyprint(f[2]) + '\n';
-                results += '---- ' + f[0] + 'output ------\n' + this.prettyprint(f[3]) + '\n\n';
-
-            }
-            results += n_failed + ' tests failed.\n';
-        }
-        return results;
-    };
-
-
-    this.results = function() {
-        return this.lazy_escape(this.results_raw());
-    };
-
-
-    this.prettyprint = function(something, quote_strings) {
-        var type = typeof something;
-        switch(type.toLowerCase()) {
-        case 'string':
-            if (quote_strings) {
-                return "'" + something.replace("'", "\\'") + "'";
-            } else {
-                return something;
-            }
-        case 'number':
-            return '' + something;
-        case 'boolean':
-            return something ? 'true' : 'false';
-        case 'undefined':
-            return 'undefined';
-        case 'object':
-            if (something instanceof Array) {
-                var x = [];
-                var expected_index = 0;
-                for (var k in something) {
-                    if (k == expected_index) {
-                        x.push(this.prettyprint(something[k], true));
-                        expected_index += 1;
-                    } else {
-                        x.push('\n' + k + ': ' + this.prettyprint(something[k], true));
-                    }
-                }
-                return '[' + x.join(', ') + ']';
-            } else {
-                return 'object: ' + something;
-            }
-        default:
-            return type + ': ' + something;
-        }
-    };
-
-
-    this.lazy_escape = function (str) {
-        return str.replace(/</g, '&lt;').replace(/\>/g, '&gt;').replace(/\n/g, '<br />');
-    };
-
-
-    this.log = function () {
-        if (window.console) {
-            if (console.firebug) {
-                console.log.apply(console, Array.prototype.slice.call(arguments));
-            } else {
-                console.log.call(console, Array.prototype.slice.call(arguments));
-            }
-        }
-    };
-
-}
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = SanityTest;
-}
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/urlencode_unpacker.js firefox-85.0+build1/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/lib/urlencode_unpacker.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/lib/urlencode_unpacker.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*global unescape */
-/*jshint curly: false, scripturl: true */
-//
-// trivial bookmarklet/escaped script detector for the javascript beautifier
-// written by Einar Lielmanis <einar@jsbeautifier.org>
-//
-// usage:
-//
-// if (Urlencoded.detect(some_string)) {
-//     var unpacked = Urlencoded.unpack(some_string);
-// }
-//
-//
-
-var isNode = (typeof module !== 'undefined' && module.exports);
-if (isNode) {
-    var SanityTest = require("devtools/shared/jsbeautify/lib/sanitytest");
-}
-
-var Urlencoded = {
-    detect: function (str) {
-        // the fact that script doesn't contain any space, but has %20 instead
-        // should be sufficient check for now.
-        if (!str.includes(' ')) {
-            if (str.includes('%2')) return true;
-            if (str.replace(/[^%]+/g, '').length > 3) return true;
-        }
-        return false;
-    },
-
-    unpack: function (str) {
-        if (Urlencoded.detect(str)) {
-            if (str.includes('%2B') || str.includes('%2b')) {
-                // "+" escaped as "%2B"
-                return unescape(str.replace(/\+/g, '%20'));
-            } else {
-                return unescape(str);
-            }
-        }
-        return str;
-    },
-
-
-
-    run_tests: function (sanity_test) {
-        var t = sanity_test || new SanityTest();
-        t.test_function(Urlencoded.detect, "Urlencoded.detect");
-        t.expect('', false);
-        t.expect('var a = b', false);
-        t.expect('var%20a+=+b', true);
-        t.expect('var%20a=b', true);
-        t.expect('var%20%21%22', true);
-        t.expect('javascript:(function(){var%20whatever={init:function(){alert(%22a%22+%22b%22)}};whatever.init()})();', true);
-        t.test_function(Urlencoded.unpack, 'Urlencoded.unpack');
-
-        t.expect('javascript:(function(){var%20whatever={init:function(){alert(%22a%22+%22b%22)}};whatever.init()})();',
-            'javascript:(function(){var whatever={init:function(){alert("a"+"b")}};whatever.init()})();'
-        );
-        t.expect('', '');
-        t.expect('abcd', 'abcd');
-        t.expect('var a = b', 'var a = b');
-        t.expect('var%20a=b', 'var a=b');
-        t.expect('var%20a=b+1', 'var a=b+1');
-        t.expect('var%20a=b%2b1', 'var a=b+1');
-        return t;
-    }
-
-
-};
-
-if (isNode) {
-    module.exports = Urlencoded;
-}
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/moz.build firefox-85.0+build1/devtools/shared/jsbeautify/moz.build
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -5,12 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'lib',
     'src',
 ]
 
-XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
-
 DevToolsModules(
     'beautify.js',
 )
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-css.js firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-css.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-css.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-css.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,9 +1,9 @@
-/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
+/* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
   The MIT License (MIT)
 
-  Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation files
@@ -31,20 +31,22 @@
 
     Written by Harutyun Amirjanyan, (amirjanyan@gmail.com)
 
-    Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
-        http://jsbeautifier.org/
+    Based on code initially developed by: Einar Lielmanis, <einar@beautifier.io>
+        https://beautifier.io/
 
     Usage:
         css_beautify(source_text);
         css_beautify(source_text, options);
 
     The options are (default in brackets):
-        indent_size (4)                   — indentation size,
-        indent_char (space)               — character to indent with,
-        selector_separator_newline (true) - separate selectors with newline or
-                                            not (e.g. "a,\nbr" or "a, br")
-        end_with_newline (false)          - end with a newline
-
+        indent_size (4)                         — indentation size,
+        indent_char (space)                     — character to indent with,
+        selector_separator_newline (true)       - separate selectors with newline or
+                                                  not (e.g. "a,\nbr" or "a, br")
+        end_with_newline (false)                - end with a newline
+        newline_between_rules (true)            - add a new line after every css rule
+        space_around_selector_separator (false) - ensure space around selector separators:
+                                                  '>', '+', '~' (e.g. "a>b" -> "a > b")
     e.g
 
     css_beautify(css_source_text, {
@@ -52,316 +54,1630 @@
       'indent_char': '\t',
       'selector_separator': ' ',
       'end_with_newline': false,
+      'newline_between_rules': true,
+      'space_around_selector_separator': true
     });
 */
 
 // http://www.w3.org/TR/CSS21/syndata.html#tokenization
 // http://www.w3.org/TR/css3-syntax/
 
-(function () {
-    function css_beautify(source_text, options) {
-        options = options || {};
-        var indentSize = options.indent_size || 4;
-        var indentCharacter = options.indent_char || ' ';
-        var selectorSeparatorNewline = (options.selector_separator_newline === undefined) ? true : options.selector_separator_newline;
-        var endWithNewline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
+(function() {
 
-        // compatibility
-        if (typeof indentSize === "string") {
-            indentSize = parseInt(indentSize, 10);
-        }
+/* GENERATED_BUILD_OUTPUT */
+var legacy_beautify_css =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 15);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */,
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+/*jshint node:true */
+/*
+  The MIT License (MIT)
 
-        // tokenizer
-        var whiteRe = /^\s+$/;
-        var wordRe = /[\w$\-_]/;
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
-        var pos = -1,
-            ch;
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
 
-        function next() {
-            ch = source_text.charAt(++pos);
-            return ch;
-        }
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
 
-        function peek() {
-            return source_text.charAt(pos + 1);
-        }
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
-        function eatString(endChar) {
-            var start = pos;
-            while (next()) {
-                if (ch === "\\") {
-                    next();
-                    next();
-                } else if (ch === endChar) {
-                    break;
-                } else if (ch === "\n") {
-                    break;
-                }
-            }
-            return source_text.substring(start, pos + 1);
-        }
 
-        function eatWhitespace() {
-            var start = pos;
-            while (whiteRe.test(peek())) {
-                pos++;
-            }
-            return pos !== start;
-        }
 
-        function skipWhitespace() {
-            var start = pos;
-            do {} while (whiteRe.test(next()));
-            return pos !== start + 1;
-        }
+function OutputLine(parent) {
+  this.__parent = parent;
+  this.__character_count = 0;
+  // use indent_count as a marker for this.__lines that have preserved indentation
+  this.__indent_count = -1;
+  this.__alignment_count = 0;
+  this.__wrap_point_index = 0;
+  this.__wrap_point_character_count = 0;
+  this.__wrap_point_indent_count = -1;
+  this.__wrap_point_alignment_count = 0;
+
+  this.__items = [];
+}
+
+OutputLine.prototype.clone_empty = function() {
+  var line = new OutputLine(this.__parent);
+  line.set_indent(this.__indent_count, this.__alignment_count);
+  return line;
+};
+
+OutputLine.prototype.item = function(index) {
+  if (index < 0) {
+    return this.__items[this.__items.length + index];
+  } else {
+    return this.__items[index];
+  }
+};
+
+OutputLine.prototype.has_match = function(pattern) {
+  for (var lastCheckedOutput = this.__items.length - 1; lastCheckedOutput >= 0; lastCheckedOutput--) {
+    if (this.__items[lastCheckedOutput].match(pattern)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+OutputLine.prototype.set_indent = function(indent, alignment) {
+  if (this.is_empty()) {
+    this.__indent_count = indent || 0;
+    this.__alignment_count = alignment || 0;
+    this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count);
+  }
+};
+
+OutputLine.prototype._set_wrap_point = function() {
+  if (this.__parent.wrap_line_length) {
+    this.__wrap_point_index = this.__items.length;
+    this.__wrap_point_character_count = this.__character_count;
+    this.__wrap_point_indent_count = this.__parent.next_line.__indent_count;
+    this.__wrap_point_alignment_count = this.__parent.next_line.__alignment_count;
+  }
+};
+
+OutputLine.prototype._should_wrap = function() {
+  return this.__wrap_point_index &&
+    this.__character_count > this.__parent.wrap_line_length &&
+    this.__wrap_point_character_count > this.__parent.next_line.__character_count;
+};
+
+OutputLine.prototype._allow_wrap = function() {
+  if (this._should_wrap()) {
+    this.__parent.add_new_line();
+    var next = this.__parent.current_line;
+    next.set_indent(this.__wrap_point_indent_count, this.__wrap_point_alignment_count);
+    next.__items = this.__items.slice(this.__wrap_point_index);
+    this.__items = this.__items.slice(0, this.__wrap_point_index);
+
+    next.__character_count += this.__character_count - this.__wrap_point_character_count;
+    this.__character_count = this.__wrap_point_character_count;
+
+    if (next.__items[0] === " ") {
+      next.__items.splice(0, 1);
+      next.__character_count -= 1;
+    }
+    return true;
+  }
+  return false;
+};
+
+OutputLine.prototype.is_empty = function() {
+  return this.__items.length === 0;
+};
+
+OutputLine.prototype.last = function() {
+  if (!this.is_empty()) {
+    return this.__items[this.__items.length - 1];
+  } else {
+    return null;
+  }
+};
+
+OutputLine.prototype.push = function(item) {
+  this.__items.push(item);
+  var last_newline_index = item.lastIndexOf('\n');
+  if (last_newline_index !== -1) {
+    this.__character_count = item.length - last_newline_index;
+  } else {
+    this.__character_count += item.length;
+  }
+};
+
+OutputLine.prototype.pop = function() {
+  var item = null;
+  if (!this.is_empty()) {
+    item = this.__items.pop();
+    this.__character_count -= item.length;
+  }
+  return item;
+};
+
+
+OutputLine.prototype._remove_indent = function() {
+  if (this.__indent_count > 0) {
+    this.__indent_count -= 1;
+    this.__character_count -= this.__parent.indent_size;
+  }
+};
+
+OutputLine.prototype._remove_wrap_indent = function() {
+  if (this.__wrap_point_indent_count > 0) {
+    this.__wrap_point_indent_count -= 1;
+  }
+};
+OutputLine.prototype.trim = function() {
+  while (this.last() === ' ') {
+    this.__items.pop();
+    this.__character_count -= 1;
+  }
+};
+
+OutputLine.prototype.toString = function() {
+  var result = '';
+  if (this.is_empty()) {
+    if (this.__parent.indent_empty_lines) {
+      result = this.__parent.get_indent_string(this.__indent_count);
+    }
+  } else {
+    result = this.__parent.get_indent_string(this.__indent_count, this.__alignment_count);
+    result += this.__items.join('');
+  }
+  return result;
+};
+
+function IndentStringCache(options, baseIndentString) {
+  this.__cache = [''];
+  this.__indent_size = options.indent_size;
+  this.__indent_string = options.indent_char;
+  if (!options.indent_with_tabs) {
+    this.__indent_string = new Array(options.indent_size + 1).join(options.indent_char);
+  }
+
+  // Set to null to continue support for auto detection of base indent
+  baseIndentString = baseIndentString || '';
+  if (options.indent_level > 0) {
+    baseIndentString = new Array(options.indent_level + 1).join(this.__indent_string);
+  }
+
+  this.__base_string = baseIndentString;
+  this.__base_string_length = baseIndentString.length;
+}
+
+IndentStringCache.prototype.get_indent_size = function(indent, column) {
+  var result = this.__base_string_length;
+  column = column || 0;
+  if (indent < 0) {
+    result = 0;
+  }
+  result += indent * this.__indent_size;
+  result += column;
+  return result;
+};
+
+IndentStringCache.prototype.get_indent_string = function(indent_level, column) {
+  var result = this.__base_string;
+  column = column || 0;
+  if (indent_level < 0) {
+    indent_level = 0;
+    result = '';
+  }
+  column += indent_level * this.__indent_size;
+  this.__ensure_cache(column);
+  result += this.__cache[column];
+  return result;
+};
+
+IndentStringCache.prototype.__ensure_cache = function(column) {
+  while (column >= this.__cache.length) {
+    this.__add_column();
+  }
+};
+
+IndentStringCache.prototype.__add_column = function() {
+  var column = this.__cache.length;
+  var indent = 0;
+  var result = '';
+  if (this.__indent_size && column >= this.__indent_size) {
+    indent = Math.floor(column / this.__indent_size);
+    column -= indent * this.__indent_size;
+    result = new Array(indent + 1).join(this.__indent_string);
+  }
+  if (column) {
+    result += new Array(column + 1).join(' ');
+  }
+
+  this.__cache.push(result);
+};
+
+function Output(options, baseIndentString) {
+  this.__indent_cache = new IndentStringCache(options, baseIndentString);
+  this.raw = false;
+  this._end_with_newline = options.end_with_newline;
+  this.indent_size = options.indent_size;
+  this.wrap_line_length = options.wrap_line_length;
+  this.indent_empty_lines = options.indent_empty_lines;
+  this.__lines = [];
+  this.previous_line = null;
+  this.current_line = null;
+  this.next_line = new OutputLine(this);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+  // initialize
+  this.__add_outputline();
+}
+
+Output.prototype.__add_outputline = function() {
+  this.previous_line = this.current_line;
+  this.current_line = this.next_line.clone_empty();
+  this.__lines.push(this.current_line);
+};
+
+Output.prototype.get_line_number = function() {
+  return this.__lines.length;
+};
+
+Output.prototype.get_indent_string = function(indent, column) {
+  return this.__indent_cache.get_indent_string(indent, column);
+};
+
+Output.prototype.get_indent_size = function(indent, column) {
+  return this.__indent_cache.get_indent_size(indent, column);
+};
+
+Output.prototype.is_empty = function() {
+  return !this.previous_line && this.current_line.is_empty();
+};
+
+Output.prototype.add_new_line = function(force_newline) {
+  // never newline at the start of file
+  // otherwise, newline only if we didn't just add one or we're forced
+  if (this.is_empty() ||
+    (!force_newline && this.just_added_newline())) {
+    return false;
+  }
+
+  // if raw output is enabled, don't print additional newlines,
+  // but still return True as though you had
+  if (!this.raw) {
+    this.__add_outputline();
+  }
+  return true;
+};
+
+Output.prototype.get_code = function(eol) {
+  this.trim(true);
+
+  // handle some edge cases where the last tokens
+  // has text that ends with newline(s)
+  var last_item = this.current_line.pop();
+  if (last_item) {
+    if (last_item[last_item.length - 1] === '\n') {
+      last_item = last_item.replace(/\n+$/g, '');
+    }
+    this.current_line.push(last_item);
+  }
+
+  if (this._end_with_newline) {
+    this.__add_outputline();
+  }
+
+  var sweet_code = this.__lines.join('\n');
+
+  if (eol !== '\n') {
+    sweet_code = sweet_code.replace(/[\n]/g, eol);
+  }
+  return sweet_code;
+};
+
+Output.prototype.set_wrap_point = function() {
+  this.current_line._set_wrap_point();
+};
+
+Output.prototype.set_indent = function(indent, alignment) {
+  indent = indent || 0;
+  alignment = alignment || 0;
+
+  // Next line stores alignment values
+  this.next_line.set_indent(indent, alignment);
+
+  // Never indent your first output indent at the start of the file
+  if (this.__lines.length > 1) {
+    this.current_line.set_indent(indent, alignment);
+    return true;
+  }
+
+  this.current_line.set_indent();
+  return false;
+};
+
+Output.prototype.add_raw_token = function(token) {
+  for (var x = 0; x < token.newlines; x++) {
+    this.__add_outputline();
+  }
+  this.current_line.set_indent(-1);
+  this.current_line.push(token.whitespace_before);
+  this.current_line.push(token.text);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+};
+
+Output.prototype.add_token = function(printable_token) {
+  this.__add_space_before_token();
+  this.current_line.push(printable_token);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = this.current_line._allow_wrap();
+};
+
+Output.prototype.__add_space_before_token = function() {
+  if (this.space_before_token && !this.just_added_newline()) {
+    if (!this.non_breaking_space) {
+      this.set_wrap_point();
+    }
+    this.current_line.push(' ');
+  }
+};
+
+Output.prototype.remove_indent = function(index) {
+  var output_length = this.__lines.length;
+  while (index < output_length) {
+    this.__lines[index]._remove_indent();
+    index++;
+  }
+  this.current_line._remove_wrap_indent();
+};
+
+Output.prototype.trim = function(eat_newlines) {
+  eat_newlines = (eat_newlines === undefined) ? false : eat_newlines;
+
+  this.current_line.trim();
+
+  while (eat_newlines && this.__lines.length > 1 &&
+    this.current_line.is_empty()) {
+    this.__lines.pop();
+    this.current_line = this.__lines[this.__lines.length - 1];
+    this.current_line.trim();
+  }
+
+  this.previous_line = this.__lines.length > 1 ?
+    this.__lines[this.__lines.length - 2] : null;
+};
+
+Output.prototype.just_added_newline = function() {
+  return this.current_line.is_empty();
+};
+
+Output.prototype.just_added_blankline = function() {
+  return this.is_empty() ||
+    (this.current_line.is_empty() && this.previous_line.is_empty());
+};
+
+Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
+  var index = this.__lines.length - 2;
+  while (index >= 0) {
+    var potentialEmptyLine = this.__lines[index];
+    if (potentialEmptyLine.is_empty()) {
+      break;
+    } else if (potentialEmptyLine.item(0).indexOf(starts_with) !== 0 &&
+      potentialEmptyLine.item(-1) !== ends_with) {
+      this.__lines.splice(index + 1, 0, new OutputLine(this));
+      this.previous_line = this.__lines[this.__lines.length - 2];
+      break;
+    }
+    index--;
+  }
+};
+
+module.exports.Output = Output;
+
+
+/***/ }),
+/* 3 */,
+/* 4 */,
+/* 5 */,
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Options(options, merge_child_field) {
+  this.raw_options = _mergeOpts(options, merge_child_field);
+
+  // Support passing the source text back with no change
+  this.disabled = this._get_boolean('disabled');
+
+  this.eol = this._get_characters('eol', 'auto');
+  this.end_with_newline = this._get_boolean('end_with_newline');
+  this.indent_size = this._get_number('indent_size', 4);
+  this.indent_char = this._get_characters('indent_char', ' ');
+  this.indent_level = this._get_number('indent_level');
+
+  this.preserve_newlines = this._get_boolean('preserve_newlines', true);
+  this.max_preserve_newlines = this._get_number('max_preserve_newlines', 32786);
+  if (!this.preserve_newlines) {
+    this.max_preserve_newlines = 0;
+  }
+
+  this.indent_with_tabs = this._get_boolean('indent_with_tabs', this.indent_char === '\t');
+  if (this.indent_with_tabs) {
+    this.indent_char = '\t';
+
+    // indent_size behavior changed after 1.8.6
+    // It used to be that indent_size would be
+    // set to 1 for indent_with_tabs. That is no longer needed and
+    // actually doesn't make sense - why not use spaces? Further,
+    // that might produce unexpected behavior - tabs being used
+    // for single-column alignment. So, when indent_with_tabs is true
+    // and indent_size is 1, reset indent_size to 4.
+    if (this.indent_size === 1) {
+      this.indent_size = 4;
+    }
+  }
+
+  // Backwards compat with 1.3.x
+  this.wrap_line_length = this._get_number('wrap_line_length', this._get_number('max_char'));
+
+  this.indent_empty_lines = this._get_boolean('indent_empty_lines');
+
+  // valid templating languages ['django', 'erb', 'handlebars', 'php']
+  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // other values ignored
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php'], ['auto']);
+}
+
+Options.prototype._get_array = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || [];
+  if (typeof option_value === 'object') {
+    if (option_value !== null && typeof option_value.concat === 'function') {
+      result = option_value.concat();
+    }
+  } else if (typeof option_value === 'string') {
+    result = option_value.split(/[^a-zA-Z0-9_\/\-]+/);
+  }
+  return result;
+};
+
+Options.prototype._get_boolean = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = option_value === undefined ? !!default_value : !!option_value;
+  return result;
+};
+
+Options.prototype._get_characters = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || '';
+  if (typeof option_value === 'string') {
+    result = option_value.replace(/\\r/, '\r').replace(/\\n/, '\n').replace(/\\t/, '\t');
+  }
+  return result;
+};
+
+Options.prototype._get_number = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  default_value = parseInt(default_value, 10);
+  if (isNaN(default_value)) {
+    default_value = 0;
+  }
+  var result = parseInt(option_value, 10);
+  if (isNaN(result)) {
+    result = default_value;
+  }
+  return result;
+};
+
+Options.prototype._get_selection = function(name, selection_list, default_value) {
+  var result = this._get_selection_list(name, selection_list, default_value);
+  if (result.length !== 1) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can only be one of the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result[0];
+};
+
+
+Options.prototype._get_selection_list = function(name, selection_list, default_value) {
+  if (!selection_list || selection_list.length === 0) {
+    throw new Error("Selection list cannot be empty.");
+  }
+
+  default_value = default_value || [selection_list[0]];
+  if (!this._is_valid_selection(default_value, selection_list)) {
+    throw new Error("Invalid Default Value!");
+  }
+
+  var result = this._get_array(name, default_value);
+  if (!this._is_valid_selection(result, selection_list)) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can contain only the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result;
+};
+
+Options.prototype._is_valid_selection = function(result, selection_list) {
+  return result.length && selection_list.length &&
+    !result.some(function(item) { return selection_list.indexOf(item) === -1; });
+};
+
+
+// merges child options up with the parent options object
+// Example: obj = {a: 1, b: {a: 2}}
+//          mergeOpts(obj, 'b')
+//
+//          Returns: {a: 2}
+function _mergeOpts(allOptions, childFieldName) {
+  var finalOpts = {};
+  allOptions = _normalizeOpts(allOptions);
+  var name;
+
+  for (name in allOptions) {
+    if (name !== childFieldName) {
+      finalOpts[name] = allOptions[name];
+    }
+  }
+
+  //merge in the per type settings for the childFieldName
+  if (childFieldName && allOptions[childFieldName]) {
+    for (name in allOptions[childFieldName]) {
+      finalOpts[name] = allOptions[childFieldName][name];
+    }
+  }
+  return finalOpts;
+}
+
+function _normalizeOpts(options) {
+  var convertedOpts = {};
+  var key;
+
+  for (key in options) {
+    var newKey = key.replace(/-/g, "_");
+    convertedOpts[newKey] = options[key];
+  }
+  return convertedOpts;
+}
+
+module.exports.Options = Options;
+module.exports.normalizeOpts = _normalizeOpts;
+module.exports.mergeOpts = _mergeOpts;
+
+
+/***/ }),
+/* 7 */,
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var regexp_has_sticky = RegExp.prototype.hasOwnProperty('sticky');
+
+function InputScanner(input_string) {
+  this.__input = input_string || '';
+  this.__input_length = this.__input.length;
+  this.__position = 0;
+}
+
+InputScanner.prototype.restart = function() {
+  this.__position = 0;
+};
+
+InputScanner.prototype.back = function() {
+  if (this.__position > 0) {
+    this.__position -= 1;
+  }
+};
+
+InputScanner.prototype.hasNext = function() {
+  return this.__position < this.__input_length;
+};
+
+InputScanner.prototype.next = function() {
+  var val = null;
+  if (this.hasNext()) {
+    val = this.__input.charAt(this.__position);
+    this.__position += 1;
+  }
+  return val;
+};
+
+InputScanner.prototype.peek = function(index) {
+  var val = null;
+  index = index || 0;
+  index += this.__position;
+  if (index >= 0 && index < this.__input_length) {
+    val = this.__input.charAt(index);
+  }
+  return val;
+};
+
+// This is a JavaScript only helper function (not in python)
+// Javascript doesn't have a match method
+// and not all implementation support "sticky" flag.
+// If they do not support sticky then both this.match() and this.test() method
+// must get the match and check the index of the match.
+// If sticky is supported and set, this method will use it.
+// Otherwise it will check that global is set, and fall back to the slower method.
+InputScanner.prototype.__match = function(pattern, index) {
+  pattern.lastIndex = index;
+  var pattern_match = pattern.exec(this.__input);
+
+  if (pattern_match && !(regexp_has_sticky && pattern.sticky)) {
+    if (pattern_match.index !== index) {
+      pattern_match = null;
+    }
+  }
+
+  return pattern_match;
+};
+
+InputScanner.prototype.test = function(pattern, index) {
+  index = index || 0;
+  index += this.__position;
+
+  if (index >= 0 && index < this.__input_length) {
+    return !!this.__match(pattern, index);
+  } else {
+    return false;
+  }
+};
+
+InputScanner.prototype.testChar = function(pattern, index) {
+  // test one character regex match
+  var val = this.peek(index);
+  pattern.lastIndex = 0;
+  return val !== null && pattern.test(val);
+};
+
+InputScanner.prototype.match = function(pattern) {
+  var pattern_match = this.__match(pattern, this.__position);
+  if (pattern_match) {
+    this.__position += pattern_match[0].length;
+  } else {
+    pattern_match = null;
+  }
+  return pattern_match;
+};
+
+InputScanner.prototype.read = function(starting_pattern, until_pattern, until_after) {
+  var val = '';
+  var match;
+  if (starting_pattern) {
+    match = this.match(starting_pattern);
+    if (match) {
+      val += match[0];
+    }
+  }
+  if (until_pattern && (match || !starting_pattern)) {
+    val += this.readUntil(until_pattern, until_after);
+  }
+  return val;
+};
+
+InputScanner.prototype.readUntil = function(pattern, until_after) {
+  var val = '';
+  var match_index = this.__position;
+  pattern.lastIndex = this.__position;
+  var pattern_match = pattern.exec(this.__input);
+  if (pattern_match) {
+    match_index = pattern_match.index;
+    if (until_after) {
+      match_index += pattern_match[0].length;
+    }
+  } else {
+    match_index = this.__input_length;
+  }
+
+  val = this.__input.substring(this.__position, match_index);
+  this.__position = match_index;
+  return val;
+};
+
+InputScanner.prototype.readUntilAfter = function(pattern) {
+  return this.readUntil(pattern, true);
+};
+
+InputScanner.prototype.get_regexp = function(pattern, match_from) {
+  var result = null;
+  var flags = 'g';
+  if (match_from && regexp_has_sticky) {
+    flags = 'y';
+  }
+  // strings are converted to regexp
+  if (typeof pattern === "string" && pattern !== '') {
+    // result = new RegExp(pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), flags);
+    result = new RegExp(pattern, flags);
+  } else if (pattern) {
+    result = new RegExp(pattern.source, flags);
+  }
+  return result;
+};
+
+InputScanner.prototype.get_literal_regexp = function(literal_string) {
+  return RegExp(literal_string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'));
+};
+
+/* css beautifier legacy helpers */
+InputScanner.prototype.peekUntilAfter = function(pattern) {
+  var start = this.__position;
+  var val = this.readUntilAfter(pattern);
+  this.__position = start;
+  return val;
+};
+
+InputScanner.prototype.lookBack = function(testVal) {
+  var start = this.__position - 1;
+  return start >= testVal.length && this.__input.substring(start - testVal.length, start)
+    .toLowerCase() === testVal;
+};
+
+module.exports.InputScanner = InputScanner;
+
+
+/***/ }),
+/* 9 */,
+/* 10 */,
+/* 11 */,
+/* 12 */,
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
-        function eatComment(singleLine) {
-            var start = pos;
-            next();
-            while (next()) {
-                if (ch === "*" && peek() === "/") {
-                    pos++;
-                    break;
-                } else if (singleLine && ch === "\n") {
-                    break;
-                }
-            }
 
-            return source_text.substring(start, pos + 1);
+
+function Directives(start_block_pattern, end_block_pattern) {
+  start_block_pattern = typeof start_block_pattern === 'string' ? start_block_pattern : start_block_pattern.source;
+  end_block_pattern = typeof end_block_pattern === 'string' ? end_block_pattern : end_block_pattern.source;
+  this.__directives_block_pattern = new RegExp(start_block_pattern + / beautify( \w+[:]\w+)+ /.source + end_block_pattern, 'g');
+  this.__directive_pattern = / (\w+)[:](\w+)/g;
+
+  this.__directives_end_ignore_pattern = new RegExp(start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern, 'g');
+}
+
+Directives.prototype.get_directives = function(text) {
+  if (!text.match(this.__directives_block_pattern)) {
+    return null;
+  }
+
+  var directives = {};
+  this.__directive_pattern.lastIndex = 0;
+  var directive_match = this.__directive_pattern.exec(text);
+
+  while (directive_match) {
+    directives[directive_match[1]] = directive_match[2];
+    directive_match = this.__directive_pattern.exec(text);
+  }
+
+  return directives;
+};
+
+Directives.prototype.readIgnored = function(input) {
+  return input.readUntilAfter(this.__directives_end_ignore_pattern);
+};
+
+
+module.exports.Directives = Directives;
+
+
+/***/ }),
+/* 14 */,
+/* 15 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Beautifier = __webpack_require__(16).Beautifier,
+  Options = __webpack_require__(17).Options;
+
+function css_beautify(source_text, options) {
+  var beautifier = new Beautifier(source_text, options);
+  return beautifier.beautify();
+}
+
+module.exports = css_beautify;
+module.exports.defaultOptions = function() {
+  return new Options();
+};
+
+
+/***/ }),
+/* 16 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Options = __webpack_require__(17).Options;
+var Output = __webpack_require__(2).Output;
+var InputScanner = __webpack_require__(8).InputScanner;
+var Directives = __webpack_require__(13).Directives;
+
+var directives_core = new Directives(/\/\*/, /\*\//);
+
+var lineBreak = /\r\n|[\r\n]/;
+var allLineBreaks = /\r\n|[\r\n]/g;
+
+// tokenizer
+var whitespaceChar = /\s/;
+var whitespacePattern = /(?:\s|\n)+/g;
+var block_comment_pattern = /\/\*(?:[\s\S]*?)((?:\*\/)|$)/g;
+var comment_pattern = /\/\/(?:[^\n\r\u2028\u2029]*)/g;
+
+function Beautifier(source_text, options) {
+  this._source_text = source_text || '';
+  // Allow the setting of language/file-type specific options
+  // with inheritance of overall settings
+  this._options = new Options(options);
+  this._ch = null;
+  this._input = null;
+
+  // https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule
+  this.NESTED_AT_RULE = {
+    "@page": true,
+    "@font-face": true,
+    "@keyframes": true,
+    // also in CONDITIONAL_GROUP_RULE below
+    "@media": true,
+    "@supports": true,
+    "@document": true
+  };
+  this.CONDITIONAL_GROUP_RULE = {
+    "@media": true,
+    "@supports": true,
+    "@document": true
+  };
+
+}
+
+Beautifier.prototype.eatString = function(endChars) {
+  var result = '';
+  this._ch = this._input.next();
+  while (this._ch) {
+    result += this._ch;
+    if (this._ch === "\\") {
+      result += this._input.next();
+    } else if (endChars.indexOf(this._ch) !== -1 || this._ch === "\n") {
+      break;
+    }
+    this._ch = this._input.next();
+  }
+  return result;
+};
+
+// Skips any white space in the source text from the current position.
+// When allowAtLeastOneNewLine is true, will output new lines for each
+// newline character found; if the user has preserve_newlines off, only
+// the first newline will be output
+Beautifier.prototype.eatWhitespace = function(allowAtLeastOneNewLine) {
+  var result = whitespaceChar.test(this._input.peek());
+  var isFirstNewLine = true;
+
+  while (whitespaceChar.test(this._input.peek())) {
+    this._ch = this._input.next();
+    if (allowAtLeastOneNewLine && this._ch === '\n') {
+      if (this._options.preserve_newlines || isFirstNewLine) {
+        isFirstNewLine = false;
+        this._output.add_new_line(true);
+      }
+    }
+  }
+  return result;
+};
+
+// Nested pseudo-class if we are insideRule
+// and the next special character found opens
+// a new block
+Beautifier.prototype.foundNestedPseudoClass = function() {
+  var openParen = 0;
+  var i = 1;
+  var ch = this._input.peek(i);
+  while (ch) {
+    if (ch === "{") {
+      return true;
+    } else if (ch === '(') {
+      // pseudoclasses can contain ()
+      openParen += 1;
+    } else if (ch === ')') {
+      if (openParen === 0) {
+        return false;
+      }
+      openParen -= 1;
+    } else if (ch === ";" || ch === "}") {
+      return false;
+    }
+    i++;
+    ch = this._input.peek(i);
+  }
+  return false;
+};
+
+Beautifier.prototype.print_string = function(output_string) {
+  this._output.set_indent(this._indentLevel);
+  this._output.non_breaking_space = true;
+  this._output.add_token(output_string);
+};
+
+Beautifier.prototype.preserveSingleSpace = function(isAfterSpace) {
+  if (isAfterSpace) {
+    this._output.space_before_token = true;
+  }
+};
+
+Beautifier.prototype.indent = function() {
+  this._indentLevel++;
+};
+
+Beautifier.prototype.outdent = function() {
+  if (this._indentLevel > 0) {
+    this._indentLevel--;
+  }
+};
+
+/*_____________________--------------------_____________________*/
+
+Beautifier.prototype.beautify = function() {
+  if (this._options.disabled) {
+    return this._source_text;
+  }
+
+  var source_text = this._source_text;
+  var eol = this._options.eol;
+  if (eol === 'auto') {
+    eol = '\n';
+    if (source_text && lineBreak.test(source_text || '')) {
+      eol = source_text.match(lineBreak)[0];
+    }
+  }
+
+
+  // HACK: newline parsing inconsistent. This brute force normalizes the this._input.
+  source_text = source_text.replace(allLineBreaks, '\n');
+
+  // reset
+  var baseIndentString = source_text.match(/^[\t ]*/)[0];
+
+  this._output = new Output(this._options, baseIndentString);
+  this._input = new InputScanner(source_text);
+  this._indentLevel = 0;
+  this._nestedLevel = 0;
+
+  this._ch = null;
+  var parenLevel = 0;
+
+  var insideRule = false;
+  // This is the value side of a property value pair (blue in the following ex)
+  // label { content: blue }
+  var insidePropertyValue = false;
+  var enteringConditionalGroup = false;
+  var insideAtExtend = false;
+  var insideAtImport = false;
+  var topCharacter = this._ch;
+  var whitespace;
+  var isAfterSpace;
+  var previous_ch;
+
+  while (true) {
+    whitespace = this._input.read(whitespacePattern);
+    isAfterSpace = whitespace !== '';
+    previous_ch = topCharacter;
+    this._ch = this._input.next();
+    if (this._ch === '\\' && this._input.hasNext()) {
+      this._ch += this._input.next();
+    }
+    topCharacter = this._ch;
+
+    if (!this._ch) {
+      break;
+    } else if (this._ch === '/' && this._input.peek() === '*') {
+      // /* css comment */
+      // Always start block comments on a new line.
+      // This handles scenarios where a block comment immediately
+      // follows a property definition on the same line or where
+      // minified code is being beautified.
+      this._output.add_new_line();
+      this._input.back();
+
+      var comment = this._input.read(block_comment_pattern);
+
+      // Handle ignore directive
+      var directives = directives_core.get_directives(comment);
+      if (directives && directives.ignore === 'start') {
+        comment += directives_core.readIgnored(this._input);
+      }
+
+      this.print_string(comment);
+
+      // Ensures any new lines following the comment are preserved
+      this.eatWhitespace(true);
+
+      // Block comments are followed by a new line so they don't
+      // share a line with other properties
+      this._output.add_new_line();
+    } else if (this._ch === '/' && this._input.peek() === '/') {
+      // // single line comment
+      // Preserves the space before a comment
+      // on the same line as a rule
+      this._output.space_before_token = true;
+      this._input.back();
+      this.print_string(this._input.read(comment_pattern));
+
+      // Ensures any new lines following the comment are preserved
+      this.eatWhitespace(true);
+    } else if (this._ch === '@') {
+      this.preserveSingleSpace(isAfterSpace);
+
+      // deal with less propery mixins @{...}
+      if (this._input.peek() === '{') {
+        this.print_string(this._ch + this.eatString('}'));
+      } else {
+        this.print_string(this._ch);
+
+        // strip trailing space, if present, for hash property checks
+        var variableOrRule = this._input.peekUntilAfter(/[: ,;{}()[\]\/='"]/g);
+
+        if (variableOrRule.match(/[ :]$/)) {
+          // we have a variable or pseudo-class, add it and insert one space before continuing
+          variableOrRule = this.eatString(": ").replace(/\s$/, '');
+          this.print_string(variableOrRule);
+          this._output.space_before_token = true;
         }
 
+        variableOrRule = variableOrRule.replace(/\s$/, '');
 
-        function lookBack(str) {
-            return source_text.substring(pos - str.length, pos).toLowerCase() ===
-                str;
+        if (variableOrRule === 'extend') {
+          insideAtExtend = true;
+        } else if (variableOrRule === 'import') {
+          insideAtImport = true;
         }
 
-        function isCommentOnLine() {
-            var endOfLine = source_text.indexOf('\n', pos);
-            if (endOfLine === -1) {
-                return false;
-            }
-            var restOfLine = source_text.substring(pos, endOfLine);
-            return restOfLine.includes('//');
+        // might be a nesting at-rule
+        if (variableOrRule in this.NESTED_AT_RULE) {
+          this._nestedLevel += 1;
+          if (variableOrRule in this.CONDITIONAL_GROUP_RULE) {
+            enteringConditionalGroup = true;
+          }
+          // might be less variable
+        } else if (!insideRule && parenLevel === 0 && variableOrRule.indexOf(':') !== -1) {
+          insidePropertyValue = true;
+          this.indent();
         }
+      }
+    } else if (this._ch === '#' && this._input.peek() === '{') {
+      this.preserveSingleSpace(isAfterSpace);
+      this.print_string(this._ch + this.eatString('}'));
+    } else if (this._ch === '{') {
+      if (insidePropertyValue) {
+        insidePropertyValue = false;
+        this.outdent();
+      }
+
+      // when entering conditional groups, only rulesets are allowed
+      if (enteringConditionalGroup) {
+        enteringConditionalGroup = false;
+        insideRule = (this._indentLevel >= this._nestedLevel);
+      } else {
+        // otherwise, declarations are also allowed
+        insideRule = (this._indentLevel >= this._nestedLevel - 1);
+      }
+      if (this._options.newline_between_rules && insideRule) {
+        if (this._output.previous_line && this._output.previous_line.item(-1) !== '{') {
+          this._output.ensure_empty_line_above('/', ',');
+        }
+      }
 
-        // printer
-        var indentString = source_text.match(/^[\r\n]*[\t ]*/)[0];
-        var singleIndent = new Array(indentSize + 1).join(indentCharacter);
-        var indentLevel = 0;
-        var nestedLevel = 0;
+      this._output.space_before_token = true;
 
-        function indent() {
-            indentLevel++;
-            indentString += singleIndent;
+      // The difference in print_string and indent order is necessary to indent the '{' correctly
+      if (this._options.brace_style === 'expand') {
+        this._output.add_new_line();
+        this.print_string(this._ch);
+        this.indent();
+        this._output.set_indent(this._indentLevel);
+      } else {
+        this.indent();
+        this.print_string(this._ch);
+      }
+
+      this.eatWhitespace(true);
+      this._output.add_new_line();
+    } else if (this._ch === '}') {
+      this.outdent();
+      this._output.add_new_line();
+      if (previous_ch === '{') {
+        this._output.trim(true);
+      }
+      insideAtImport = false;
+      insideAtExtend = false;
+      if (insidePropertyValue) {
+        this.outdent();
+        insidePropertyValue = false;
+      }
+      this.print_string(this._ch);
+      insideRule = false;
+      if (this._nestedLevel) {
+        this._nestedLevel--;
+      }
+
+      this.eatWhitespace(true);
+      this._output.add_new_line();
+
+      if (this._options.newline_between_rules && !this._output.just_added_blankline()) {
+        if (this._input.peek() !== '}') {
+          this._output.add_new_line(true);
         }
-
-        function outdent() {
-            indentLevel--;
-            indentString = indentString.slice(0, -indentSize);
+      }
+    } else if (this._ch === ":") {
+      if ((insideRule || enteringConditionalGroup) && !(this._input.lookBack("&") || this.foundNestedPseudoClass()) && !this._input.lookBack("(") && !insideAtExtend && parenLevel === 0) {
+        // 'property: value' delimiter
+        // which could be in a conditional group query
+        this.print_string(':');
+        if (!insidePropertyValue) {
+          insidePropertyValue = true;
+          this._output.space_before_token = true;
+          this.eatWhitespace(true);
+          this.indent();
+        }
+      } else {
+        // sass/less parent reference don't use a space
+        // sass nested pseudo-class don't use a space
+
+        // preserve space before pseudoclasses/pseudoelements, as it means "in any child"
+        if (this._input.lookBack(" ")) {
+          this._output.space_before_token = true;
+        }
+        if (this._input.peek() === ":") {
+          // pseudo-element
+          this._ch = this._input.next();
+          this.print_string("::");
+        } else {
+          // pseudo-class
+          this.print_string(':');
         }
+      }
+    } else if (this._ch === '"' || this._ch === '\'') {
+      this.preserveSingleSpace(isAfterSpace);
+      this.print_string(this._ch + this.eatString(this._ch));
+      this.eatWhitespace(true);
+    } else if (this._ch === ';') {
+      if (parenLevel === 0) {
+        if (insidePropertyValue) {
+          this.outdent();
+          insidePropertyValue = false;
+        }
+        insideAtExtend = false;
+        insideAtImport = false;
+        this.print_string(this._ch);
+        this.eatWhitespace(true);
+
+        // This maintains single line comments on the same
+        // line. Block comments are also affected, but
+        // a new line is always output before one inside
+        // that section
+        if (this._input.peek() !== '/') {
+          this._output.add_new_line();
+        }
+      } else {
+        this.print_string(this._ch);
+        this.eatWhitespace(true);
+        this._output.space_before_token = true;
+      }
+    } else if (this._ch === '(') { // may be a url
+      if (this._input.lookBack("url")) {
+        this.print_string(this._ch);
+        this.eatWhitespace();
+        parenLevel++;
+        this.indent();
+        this._ch = this._input.next();
+        if (this._ch === ')' || this._ch === '"' || this._ch === '\'') {
+          this._input.back();
+        } else if (this._ch) {
+          this.print_string(this._ch + this.eatString(')'));
+          if (parenLevel) {
+            parenLevel--;
+            this.outdent();
+          }
+        }
+      } else {
+        this.preserveSingleSpace(isAfterSpace);
+        this.print_string(this._ch);
+        this.eatWhitespace();
+        parenLevel++;
+        this.indent();
+      }
+    } else if (this._ch === ')') {
+      if (parenLevel) {
+        parenLevel--;
+        this.outdent();
+      }
+      this.print_string(this._ch);
+    } else if (this._ch === ',') {
+      this.print_string(this._ch);
+      this.eatWhitespace(true);
+      if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport) {
+        this._output.add_new_line();
+      } else {
+        this._output.space_before_token = true;
+      }
+    } else if ((this._ch === '>' || this._ch === '+' || this._ch === '~') && !insidePropertyValue && parenLevel === 0) {
+      //handle combinator spacing
+      if (this._options.space_around_combinator) {
+        this._output.space_before_token = true;
+        this.print_string(this._ch);
+        this._output.space_before_token = true;
+      } else {
+        this.print_string(this._ch);
+        this.eatWhitespace();
+        // squash extra whitespace
+        if (this._ch && whitespaceChar.test(this._ch)) {
+          this._ch = '';
+        }
+      }
+    } else if (this._ch === ']') {
+      this.print_string(this._ch);
+    } else if (this._ch === '[') {
+      this.preserveSingleSpace(isAfterSpace);
+      this.print_string(this._ch);
+    } else if (this._ch === '=') { // no whitespace before or after
+      this.eatWhitespace();
+      this.print_string('=');
+      if (whitespaceChar.test(this._ch)) {
+        this._ch = '';
+      }
+    } else if (this._ch === '!' && !this._input.lookBack("\\")) { // !important
+      this.print_string(' ');
+      this.print_string(this._ch);
+    } else {
+      this.preserveSingleSpace(isAfterSpace);
+      this.print_string(this._ch);
+    }
+  }
 
-        var print = {};
-        print["{"] = function (ch) {
-            print.singleSpace();
-            output.push(ch);
-            print.newLine();
-        };
-        print["}"] = function (ch) {
-            print.newLine();
-            output.push(ch);
-            print.newLine();
-        };
+  var sweetCode = this._output.get_code(eol);
 
-        print._lastCharWhitespace = function () {
-            return whiteRe.test(output[output.length - 1]);
-        };
+  return sweetCode;
+};
 
-        print.newLine = function (keepWhitespace) {
-            if (!keepWhitespace) {
-                while (print._lastCharWhitespace()) {
-                    output.pop();
-                }
-            }
-
-            if (output.length) {
-                output.push('\n');
-            }
-            if (indentString) {
-                output.push(indentString);
-            }
-        };
-        print.singleSpace = function () {
-            if (output.length && !print._lastCharWhitespace()) {
-                output.push(' ');
-            }
+module.exports.Beautifier = Beautifier;
+
+
+/***/ }),
+/* 17 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var BaseOptions = __webpack_require__(6).Options;
+
+function Options(options) {
+  BaseOptions.call(this, options, 'css');
+
+  this.selector_separator_newline = this._get_boolean('selector_separator_newline', true);
+  this.newline_between_rules = this._get_boolean('newline_between_rules', true);
+  var space_around_selector_separator = this._get_boolean('space_around_selector_separator');
+  this.space_around_combinator = this._get_boolean('space_around_combinator') || space_around_selector_separator;
+
+  var brace_style_split = this._get_selection_list('brace_style', ['collapse', 'expand', 'end-expand', 'none', 'preserve-inline']);
+  this.brace_style = 'collapse';
+  for (var bs = 0; bs < brace_style_split.length; bs++) {
+    if (brace_style_split[bs] !== 'expand') {
+      // default to collapse, as only collapse|expand is implemented for now
+      this.brace_style = 'collapse';
+    } else {
+      this.brace_style = brace_style_split[bs];
+    }
+  }
+}
+Options.prototype = new BaseOptions();
+
+
+
+module.exports.Options = Options;
+
+
+/***/ })
+/******/ ]);
+var css_beautify = legacy_beautify_css;
+/* Footer */
+if (typeof define === "function" && define.amd) {
+    // Add support for AMD ( https://github.com/amdjs/amdjs-api/wiki/AMD#defineamd-property- )
+    define([], function() {
+        return {
+            css_beautify: css_beautify
         };
-        var output = [];
-        if (indentString) {
-            output.push(indentString);
-        }
-        /*_____________________--------------------_____________________*/
-
-        var insideRule = false;
-        var enteringConditionalGroup = false;
-
-        while (true) {
-            var isAfterSpace = skipWhitespace();
-
-            if (!ch) {
-                break;
-            } else if (ch === '/' && peek() === '*') { /* css comment */
-                print.newLine();
-                output.push(eatComment(), "\n", indentString);
-                var header = lookBack("");
-                if (header) {
-                    print.newLine();
-                }
-            } else if (ch === '/' && peek() === '/') { // single line comment
-                output.push(eatComment(true), indentString);
-            } else if (ch === '@') {
-                // strip trailing space, if present, for hash property checks
-                var atRule = eatString(" ").replace(/ $/, '');
-
-                // pass along the space we found as a separate item
-                output.push(atRule, ch);
-
-                // might be a nesting at-rule
-                if (atRule in css_beautify.NESTED_AT_RULE) {
-                    nestedLevel += 1;
-                    if (atRule in css_beautify.CONDITIONAL_GROUP_RULE) {
-                        enteringConditionalGroup = true;
-                    }
-                }
-            } else if (ch === '{') {
-                eatWhitespace();
-                if (peek() === '}') {
-                    next();
-                    output.push(" {}");
-                } else {
-                    indent();
-                    print["{"](ch);
-                    // when entering conditional groups, only rulesets are allowed
-                    if (enteringConditionalGroup) {
-                        enteringConditionalGroup = false;
-                        insideRule = (indentLevel > nestedLevel);
-                    } else {
-                        // otherwise, declarations are also allowed
-                        insideRule = (indentLevel >= nestedLevel);
-                    }
-                }
-            } else if (ch === '}') {
-                outdent();
-                print["}"](ch);
-                insideRule = false;
-                if (nestedLevel) {
-                    nestedLevel--;
-                }
-            } else if (ch === ":") {
-                eatWhitespace();
-                if (insideRule || enteringConditionalGroup) {
-                    // 'property: value' delimiter
-                    // which could be in a conditional group query
-                    output.push(ch, " ");
-                } else {
-                    if (peek() === ":") {
-                        // pseudo-element
-                        next();
-                        output.push("::");
-                    } else {
-                        // pseudo-class
-                        output.push(ch);
-                    }
-                }
-            } else if (ch === '"' || ch === '\'') {
-                output.push(eatString(ch));
-            } else if (ch === ';') {
-                if (isCommentOnLine()) {
-                    var beforeComment = eatString('/');
-                    var comment = eatComment(true);
-                    output.push(beforeComment, comment.substring(1, comment.length - 1), '\n', indentString);
-                } else {
-                    output.push(ch, '\n', indentString);
-                }
-            } else if (ch === '(') { // may be a url
-                if (lookBack("url")) {
-                    output.push(ch);
-                    eatWhitespace();
-                    if (next()) {
-                        if (ch !== ')' && ch !== '"' && ch !== '\'') {
-                            output.push(eatString(')'));
-                        } else {
-                            pos--;
-                        }
-                    }
-                } else {
-                    if (isAfterSpace) {
-                        print.singleSpace();
-                    }
-                    output.push(ch);
-                    eatWhitespace();
-                }
-            } else if (ch === ')') {
-                output.push(ch);
-            } else if (ch === ',') {
-                eatWhitespace();
-                output.push(ch);
-                if (!insideRule && selectorSeparatorNewline) {
-                    print.newLine();
-                } else {
-                    print.singleSpace();
-                }
-            } else if (ch === ']') {
-                output.push(ch);
-            } else if (ch === '[') {
-                if (isAfterSpace) {
-                    print.singleSpace();
-                }
-                output.push(ch);
-            } else if (ch === '=') { // no whitespace before or after
-                eatWhitespace();
-                output.push(ch);
-            } else {
-                if (isAfterSpace) {
-                    print.singleSpace();
-                }
-
-                output.push(ch);
-            }
-        }
-
-
-        var sweetCode = output.join('').replace(/[\n ]+$/, '');
-
-        // establish end_with_newline
-        var should = endWithNewline;
-        var actually = /\n$/.test(sweetCode);
-        if (should && !actually) {
-            sweetCode += "\n";
-        } else if (!should && actually) {
-            sweetCode = sweetCode.slice(0, -1);
-        }
-
-        return sweetCode;
-    }
-
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule
-    css_beautify.NESTED_AT_RULE = {
-        "@page": true,
-        "@font-face": true,
-        "@keyframes": true,
-        // also in CONDITIONAL_GROUP_RULE below
-        "@media": true,
-        "@supports": true,
-        "@document": true
-    };
-    css_beautify.CONDITIONAL_GROUP_RULE = {
-        "@media": true,
-        "@supports": true,
-        "@document": true
-    };
+    });
+} else if (typeof exports !== "undefined") {
+    // Add support for CommonJS. Just put this file somewhere on your require.paths
+    // and you will be able to `var html_beautify = require("beautify").html_beautify`.
+    exports.css_beautify = css_beautify;
+} else if (typeof window !== "undefined") {
+    // If we're running a web page and don't have either of the above, add our one global
+    window.css_beautify = css_beautify;
+} else if (typeof global !== "undefined") {
+    // If we don't even have window, try global.
+    global.css_beautify = css_beautify;
+}
 
-    exports.cssBeautify = css_beautify;
 }());
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-html.js firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-html.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-html.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-html.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,9 +1,9 @@
-/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
+/* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
   The MIT License (MIT)
 
-  Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation files
@@ -31,8 +31,8 @@
 
   Written by Nochum Sossonko, (nsossonko@hotmail.com)
 
-  Based on code initially developed by: Einar Lielmanis, <einar@jsbeautifier.org>
-    http://jsbeautifier.org/
+  Based on code initially developed by: Einar Lielmanis, <einar@beautifier.io>
+    https://beautifier.io/
 
   Usage:
     style_html(html_source);
@@ -44,14 +44,18 @@
     indent_size (default 4)          — indentation size,
     indent_char (default space)      — character to indent with,
     wrap_line_length (default 250)            -  maximum amount of characters per line (0 = disable)
-    brace_style (default "collapse") - "collapse" | "expand" | "end-expand"
-            put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
+    brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none"
+            put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line, or attempt to keep them where they are.
+    inline (defaults to inline tags) - list of tags to be considered inline tags
     unformatted (defaults to inline tags) - list of tags, that shouldn't be reformatted
+    content_unformatted (defaults to ["pre", "textarea"] tags) - list of tags, whose content shouldn't be reformatted
     indent_scripts (default normal)  - "keep"|"separate"|"normal"
     preserve_newlines (default true) - whether existing line breaks before elements should be preserved
                                         Only works before elements, not inside tags or for text.
     max_preserve_newlines (default unlimited) - maximum number of line breaks to be preserved in one chunk
     indent_handlebars (default false) - format and indent {{#foo}} and {{/foo}}
+    end_with_newline (false)          - end with a newline
+    extra_liners (default [head,body,/html]) -List of tags that should have an extra newline before them.
 
     e.g.
 
@@ -61,762 +65,3102 @@
       'indent_char': ' ',
       'wrap_line_length': 78,
       'brace_style': 'expand',
-      'unformatted': ['a', 'sub', 'sup', 'b', 'i', 'u'],
       'preserve_newlines': true,
       'max_preserve_newlines': 5,
-      'indent_handlebars': false
+      'indent_handlebars': false,
+      'extra_liners': ['/html']
     });
 */
 
 (function() {
 
-    function trim(s) {
-        return s.replace(/^\s+|\s+$/g, '');
+/* GENERATED_BUILD_OUTPUT */
+var legacy_beautify_html =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 18);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */,
+/* 1 */,
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function OutputLine(parent) {
+  this.__parent = parent;
+  this.__character_count = 0;
+  // use indent_count as a marker for this.__lines that have preserved indentation
+  this.__indent_count = -1;
+  this.__alignment_count = 0;
+  this.__wrap_point_index = 0;
+  this.__wrap_point_character_count = 0;
+  this.__wrap_point_indent_count = -1;
+  this.__wrap_point_alignment_count = 0;
+
+  this.__items = [];
+}
+
+OutputLine.prototype.clone_empty = function() {
+  var line = new OutputLine(this.__parent);
+  line.set_indent(this.__indent_count, this.__alignment_count);
+  return line;
+};
+
+OutputLine.prototype.item = function(index) {
+  if (index < 0) {
+    return this.__items[this.__items.length + index];
+  } else {
+    return this.__items[index];
+  }
+};
+
+OutputLine.prototype.has_match = function(pattern) {
+  for (var lastCheckedOutput = this.__items.length - 1; lastCheckedOutput >= 0; lastCheckedOutput--) {
+    if (this.__items[lastCheckedOutput].match(pattern)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+OutputLine.prototype.set_indent = function(indent, alignment) {
+  if (this.is_empty()) {
+    this.__indent_count = indent || 0;
+    this.__alignment_count = alignment || 0;
+    this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count);
+  }
+};
+
+OutputLine.prototype._set_wrap_point = function() {
+  if (this.__parent.wrap_line_length) {
+    this.__wrap_point_index = this.__items.length;
+    this.__wrap_point_character_count = this.__character_count;
+    this.__wrap_point_indent_count = this.__parent.next_line.__indent_count;
+    this.__wrap_point_alignment_count = this.__parent.next_line.__alignment_count;
+  }
+};
+
+OutputLine.prototype._should_wrap = function() {
+  return this.__wrap_point_index &&
+    this.__character_count > this.__parent.wrap_line_length &&
+    this.__wrap_point_character_count > this.__parent.next_line.__character_count;
+};
+
+OutputLine.prototype._allow_wrap = function() {
+  if (this._should_wrap()) {
+    this.__parent.add_new_line();
+    var next = this.__parent.current_line;
+    next.set_indent(this.__wrap_point_indent_count, this.__wrap_point_alignment_count);
+    next.__items = this.__items.slice(this.__wrap_point_index);
+    this.__items = this.__items.slice(0, this.__wrap_point_index);
+
+    next.__character_count += this.__character_count - this.__wrap_point_character_count;
+    this.__character_count = this.__wrap_point_character_count;
+
+    if (next.__items[0] === " ") {
+      next.__items.splice(0, 1);
+      next.__character_count -= 1;
+    }
+    return true;
+  }
+  return false;
+};
+
+OutputLine.prototype.is_empty = function() {
+  return this.__items.length === 0;
+};
+
+OutputLine.prototype.last = function() {
+  if (!this.is_empty()) {
+    return this.__items[this.__items.length - 1];
+  } else {
+    return null;
+  }
+};
+
+OutputLine.prototype.push = function(item) {
+  this.__items.push(item);
+  var last_newline_index = item.lastIndexOf('\n');
+  if (last_newline_index !== -1) {
+    this.__character_count = item.length - last_newline_index;
+  } else {
+    this.__character_count += item.length;
+  }
+};
+
+OutputLine.prototype.pop = function() {
+  var item = null;
+  if (!this.is_empty()) {
+    item = this.__items.pop();
+    this.__character_count -= item.length;
+  }
+  return item;
+};
+
+
+OutputLine.prototype._remove_indent = function() {
+  if (this.__indent_count > 0) {
+    this.__indent_count -= 1;
+    this.__character_count -= this.__parent.indent_size;
+  }
+};
+
+OutputLine.prototype._remove_wrap_indent = function() {
+  if (this.__wrap_point_indent_count > 0) {
+    this.__wrap_point_indent_count -= 1;
+  }
+};
+OutputLine.prototype.trim = function() {
+  while (this.last() === ' ') {
+    this.__items.pop();
+    this.__character_count -= 1;
+  }
+};
+
+OutputLine.prototype.toString = function() {
+  var result = '';
+  if (this.is_empty()) {
+    if (this.__parent.indent_empty_lines) {
+      result = this.__parent.get_indent_string(this.__indent_count);
+    }
+  } else {
+    result = this.__parent.get_indent_string(this.__indent_count, this.__alignment_count);
+    result += this.__items.join('');
+  }
+  return result;
+};
+
+function IndentStringCache(options, baseIndentString) {
+  this.__cache = [''];
+  this.__indent_size = options.indent_size;
+  this.__indent_string = options.indent_char;
+  if (!options.indent_with_tabs) {
+    this.__indent_string = new Array(options.indent_size + 1).join(options.indent_char);
+  }
+
+  // Set to null to continue support for auto detection of base indent
+  baseIndentString = baseIndentString || '';
+  if (options.indent_level > 0) {
+    baseIndentString = new Array(options.indent_level + 1).join(this.__indent_string);
+  }
+
+  this.__base_string = baseIndentString;
+  this.__base_string_length = baseIndentString.length;
+}
+
+IndentStringCache.prototype.get_indent_size = function(indent, column) {
+  var result = this.__base_string_length;
+  column = column || 0;
+  if (indent < 0) {
+    result = 0;
+  }
+  result += indent * this.__indent_size;
+  result += column;
+  return result;
+};
+
+IndentStringCache.prototype.get_indent_string = function(indent_level, column) {
+  var result = this.__base_string;
+  column = column || 0;
+  if (indent_level < 0) {
+    indent_level = 0;
+    result = '';
+  }
+  column += indent_level * this.__indent_size;
+  this.__ensure_cache(column);
+  result += this.__cache[column];
+  return result;
+};
+
+IndentStringCache.prototype.__ensure_cache = function(column) {
+  while (column >= this.__cache.length) {
+    this.__add_column();
+  }
+};
+
+IndentStringCache.prototype.__add_column = function() {
+  var column = this.__cache.length;
+  var indent = 0;
+  var result = '';
+  if (this.__indent_size && column >= this.__indent_size) {
+    indent = Math.floor(column / this.__indent_size);
+    column -= indent * this.__indent_size;
+    result = new Array(indent + 1).join(this.__indent_string);
+  }
+  if (column) {
+    result += new Array(column + 1).join(' ');
+  }
+
+  this.__cache.push(result);
+};
+
+function Output(options, baseIndentString) {
+  this.__indent_cache = new IndentStringCache(options, baseIndentString);
+  this.raw = false;
+  this._end_with_newline = options.end_with_newline;
+  this.indent_size = options.indent_size;
+  this.wrap_line_length = options.wrap_line_length;
+  this.indent_empty_lines = options.indent_empty_lines;
+  this.__lines = [];
+  this.previous_line = null;
+  this.current_line = null;
+  this.next_line = new OutputLine(this);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+  // initialize
+  this.__add_outputline();
+}
+
+Output.prototype.__add_outputline = function() {
+  this.previous_line = this.current_line;
+  this.current_line = this.next_line.clone_empty();
+  this.__lines.push(this.current_line);
+};
+
+Output.prototype.get_line_number = function() {
+  return this.__lines.length;
+};
+
+Output.prototype.get_indent_string = function(indent, column) {
+  return this.__indent_cache.get_indent_string(indent, column);
+};
+
+Output.prototype.get_indent_size = function(indent, column) {
+  return this.__indent_cache.get_indent_size(indent, column);
+};
+
+Output.prototype.is_empty = function() {
+  return !this.previous_line && this.current_line.is_empty();
+};
+
+Output.prototype.add_new_line = function(force_newline) {
+  // never newline at the start of file
+  // otherwise, newline only if we didn't just add one or we're forced
+  if (this.is_empty() ||
+    (!force_newline && this.just_added_newline())) {
+    return false;
+  }
+
+  // if raw output is enabled, don't print additional newlines,
+  // but still return True as though you had
+  if (!this.raw) {
+    this.__add_outputline();
+  }
+  return true;
+};
+
+Output.prototype.get_code = function(eol) {
+  this.trim(true);
+
+  // handle some edge cases where the last tokens
+  // has text that ends with newline(s)
+  var last_item = this.current_line.pop();
+  if (last_item) {
+    if (last_item[last_item.length - 1] === '\n') {
+      last_item = last_item.replace(/\n+$/g, '');
+    }
+    this.current_line.push(last_item);
+  }
+
+  if (this._end_with_newline) {
+    this.__add_outputline();
+  }
+
+  var sweet_code = this.__lines.join('\n');
+
+  if (eol !== '\n') {
+    sweet_code = sweet_code.replace(/[\n]/g, eol);
+  }
+  return sweet_code;
+};
+
+Output.prototype.set_wrap_point = function() {
+  this.current_line._set_wrap_point();
+};
+
+Output.prototype.set_indent = function(indent, alignment) {
+  indent = indent || 0;
+  alignment = alignment || 0;
+
+  // Next line stores alignment values
+  this.next_line.set_indent(indent, alignment);
+
+  // Never indent your first output indent at the start of the file
+  if (this.__lines.length > 1) {
+    this.current_line.set_indent(indent, alignment);
+    return true;
+  }
+
+  this.current_line.set_indent();
+  return false;
+};
+
+Output.prototype.add_raw_token = function(token) {
+  for (var x = 0; x < token.newlines; x++) {
+    this.__add_outputline();
+  }
+  this.current_line.set_indent(-1);
+  this.current_line.push(token.whitespace_before);
+  this.current_line.push(token.text);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+};
+
+Output.prototype.add_token = function(printable_token) {
+  this.__add_space_before_token();
+  this.current_line.push(printable_token);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = this.current_line._allow_wrap();
+};
+
+Output.prototype.__add_space_before_token = function() {
+  if (this.space_before_token && !this.just_added_newline()) {
+    if (!this.non_breaking_space) {
+      this.set_wrap_point();
+    }
+    this.current_line.push(' ');
+  }
+};
+
+Output.prototype.remove_indent = function(index) {
+  var output_length = this.__lines.length;
+  while (index < output_length) {
+    this.__lines[index]._remove_indent();
+    index++;
+  }
+  this.current_line._remove_wrap_indent();
+};
+
+Output.prototype.trim = function(eat_newlines) {
+  eat_newlines = (eat_newlines === undefined) ? false : eat_newlines;
+
+  this.current_line.trim();
+
+  while (eat_newlines && this.__lines.length > 1 &&
+    this.current_line.is_empty()) {
+    this.__lines.pop();
+    this.current_line = this.__lines[this.__lines.length - 1];
+    this.current_line.trim();
+  }
+
+  this.previous_line = this.__lines.length > 1 ?
+    this.__lines[this.__lines.length - 2] : null;
+};
+
+Output.prototype.just_added_newline = function() {
+  return this.current_line.is_empty();
+};
+
+Output.prototype.just_added_blankline = function() {
+  return this.is_empty() ||
+    (this.current_line.is_empty() && this.previous_line.is_empty());
+};
+
+Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
+  var index = this.__lines.length - 2;
+  while (index >= 0) {
+    var potentialEmptyLine = this.__lines[index];
+    if (potentialEmptyLine.is_empty()) {
+      break;
+    } else if (potentialEmptyLine.item(0).indexOf(starts_with) !== 0 &&
+      potentialEmptyLine.item(-1) !== ends_with) {
+      this.__lines.splice(index + 1, 0, new OutputLine(this));
+      this.previous_line = this.__lines[this.__lines.length - 2];
+      break;
+    }
+    index--;
+  }
+};
+
+module.exports.Output = Output;
+
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Token(type, text, newlines, whitespace_before) {
+  this.type = type;
+  this.text = text;
+
+  // comments_before are
+  // comments that have a new line before them
+  // and may or may not have a newline after
+  // this is a set of comments before
+  this.comments_before = null; /* inline comment*/
+
+
+  // this.comments_after =  new TokenStream(); // no new line before and newline after
+  this.newlines = newlines || 0;
+  this.whitespace_before = whitespace_before || '';
+  this.parent = null;
+  this.next = null;
+  this.previous = null;
+  this.opened = null;
+  this.closed = null;
+  this.directives = null;
+}
+
+
+module.exports.Token = Token;
+
+
+/***/ }),
+/* 4 */,
+/* 5 */,
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Options(options, merge_child_field) {
+  this.raw_options = _mergeOpts(options, merge_child_field);
+
+  // Support passing the source text back with no change
+  this.disabled = this._get_boolean('disabled');
+
+  this.eol = this._get_characters('eol', 'auto');
+  this.end_with_newline = this._get_boolean('end_with_newline');
+  this.indent_size = this._get_number('indent_size', 4);
+  this.indent_char = this._get_characters('indent_char', ' ');
+  this.indent_level = this._get_number('indent_level');
+
+  this.preserve_newlines = this._get_boolean('preserve_newlines', true);
+  this.max_preserve_newlines = this._get_number('max_preserve_newlines', 32786);
+  if (!this.preserve_newlines) {
+    this.max_preserve_newlines = 0;
+  }
+
+  this.indent_with_tabs = this._get_boolean('indent_with_tabs', this.indent_char === '\t');
+  if (this.indent_with_tabs) {
+    this.indent_char = '\t';
+
+    // indent_size behavior changed after 1.8.6
+    // It used to be that indent_size would be
+    // set to 1 for indent_with_tabs. That is no longer needed and
+    // actually doesn't make sense - why not use spaces? Further,
+    // that might produce unexpected behavior - tabs being used
+    // for single-column alignment. So, when indent_with_tabs is true
+    // and indent_size is 1, reset indent_size to 4.
+    if (this.indent_size === 1) {
+      this.indent_size = 4;
+    }
+  }
+
+  // Backwards compat with 1.3.x
+  this.wrap_line_length = this._get_number('wrap_line_length', this._get_number('max_char'));
+
+  this.indent_empty_lines = this._get_boolean('indent_empty_lines');
+
+  // valid templating languages ['django', 'erb', 'handlebars', 'php']
+  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // other values ignored
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php'], ['auto']);
+}
+
+Options.prototype._get_array = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || [];
+  if (typeof option_value === 'object') {
+    if (option_value !== null && typeof option_value.concat === 'function') {
+      result = option_value.concat();
+    }
+  } else if (typeof option_value === 'string') {
+    result = option_value.split(/[^a-zA-Z0-9_\/\-]+/);
+  }
+  return result;
+};
+
+Options.prototype._get_boolean = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = option_value === undefined ? !!default_value : !!option_value;
+  return result;
+};
+
+Options.prototype._get_characters = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || '';
+  if (typeof option_value === 'string') {
+    result = option_value.replace(/\\r/, '\r').replace(/\\n/, '\n').replace(/\\t/, '\t');
+  }
+  return result;
+};
+
+Options.prototype._get_number = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  default_value = parseInt(default_value, 10);
+  if (isNaN(default_value)) {
+    default_value = 0;
+  }
+  var result = parseInt(option_value, 10);
+  if (isNaN(result)) {
+    result = default_value;
+  }
+  return result;
+};
+
+Options.prototype._get_selection = function(name, selection_list, default_value) {
+  var result = this._get_selection_list(name, selection_list, default_value);
+  if (result.length !== 1) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can only be one of the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result[0];
+};
+
+
+Options.prototype._get_selection_list = function(name, selection_list, default_value) {
+  if (!selection_list || selection_list.length === 0) {
+    throw new Error("Selection list cannot be empty.");
+  }
+
+  default_value = default_value || [selection_list[0]];
+  if (!this._is_valid_selection(default_value, selection_list)) {
+    throw new Error("Invalid Default Value!");
+  }
+
+  var result = this._get_array(name, default_value);
+  if (!this._is_valid_selection(result, selection_list)) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can contain only the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result;
+};
+
+Options.prototype._is_valid_selection = function(result, selection_list) {
+  return result.length && selection_list.length &&
+    !result.some(function(item) { return selection_list.indexOf(item) === -1; });
+};
+
+
+// merges child options up with the parent options object
+// Example: obj = {a: 1, b: {a: 2}}
+//          mergeOpts(obj, 'b')
+//
+//          Returns: {a: 2}
+function _mergeOpts(allOptions, childFieldName) {
+  var finalOpts = {};
+  allOptions = _normalizeOpts(allOptions);
+  var name;
+
+  for (name in allOptions) {
+    if (name !== childFieldName) {
+      finalOpts[name] = allOptions[name];
+    }
+  }
+
+  //merge in the per type settings for the childFieldName
+  if (childFieldName && allOptions[childFieldName]) {
+    for (name in allOptions[childFieldName]) {
+      finalOpts[name] = allOptions[childFieldName][name];
+    }
+  }
+  return finalOpts;
+}
+
+function _normalizeOpts(options) {
+  var convertedOpts = {};
+  var key;
+
+  for (key in options) {
+    var newKey = key.replace(/-/g, "_");
+    convertedOpts[newKey] = options[key];
+  }
+  return convertedOpts;
+}
+
+module.exports.Options = Options;
+module.exports.normalizeOpts = _normalizeOpts;
+module.exports.mergeOpts = _mergeOpts;
+
+
+/***/ }),
+/* 7 */,
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var regexp_has_sticky = RegExp.prototype.hasOwnProperty('sticky');
+
+function InputScanner(input_string) {
+  this.__input = input_string || '';
+  this.__input_length = this.__input.length;
+  this.__position = 0;
+}
+
+InputScanner.prototype.restart = function() {
+  this.__position = 0;
+};
+
+InputScanner.prototype.back = function() {
+  if (this.__position > 0) {
+    this.__position -= 1;
+  }
+};
+
+InputScanner.prototype.hasNext = function() {
+  return this.__position < this.__input_length;
+};
+
+InputScanner.prototype.next = function() {
+  var val = null;
+  if (this.hasNext()) {
+    val = this.__input.charAt(this.__position);
+    this.__position += 1;
+  }
+  return val;
+};
+
+InputScanner.prototype.peek = function(index) {
+  var val = null;
+  index = index || 0;
+  index += this.__position;
+  if (index >= 0 && index < this.__input_length) {
+    val = this.__input.charAt(index);
+  }
+  return val;
+};
+
+// This is a JavaScript only helper function (not in python)
+// Javascript doesn't have a match method
+// and not all implementation support "sticky" flag.
+// If they do not support sticky then both this.match() and this.test() method
+// must get the match and check the index of the match.
+// If sticky is supported and set, this method will use it.
+// Otherwise it will check that global is set, and fall back to the slower method.
+InputScanner.prototype.__match = function(pattern, index) {
+  pattern.lastIndex = index;
+  var pattern_match = pattern.exec(this.__input);
+
+  if (pattern_match && !(regexp_has_sticky && pattern.sticky)) {
+    if (pattern_match.index !== index) {
+      pattern_match = null;
+    }
+  }
+
+  return pattern_match;
+};
+
+InputScanner.prototype.test = function(pattern, index) {
+  index = index || 0;
+  index += this.__position;
+
+  if (index >= 0 && index < this.__input_length) {
+    return !!this.__match(pattern, index);
+  } else {
+    return false;
+  }
+};
+
+InputScanner.prototype.testChar = function(pattern, index) {
+  // test one character regex match
+  var val = this.peek(index);
+  pattern.lastIndex = 0;
+  return val !== null && pattern.test(val);
+};
+
+InputScanner.prototype.match = function(pattern) {
+  var pattern_match = this.__match(pattern, this.__position);
+  if (pattern_match) {
+    this.__position += pattern_match[0].length;
+  } else {
+    pattern_match = null;
+  }
+  return pattern_match;
+};
+
+InputScanner.prototype.read = function(starting_pattern, until_pattern, until_after) {
+  var val = '';
+  var match;
+  if (starting_pattern) {
+    match = this.match(starting_pattern);
+    if (match) {
+      val += match[0];
+    }
+  }
+  if (until_pattern && (match || !starting_pattern)) {
+    val += this.readUntil(until_pattern, until_after);
+  }
+  return val;
+};
+
+InputScanner.prototype.readUntil = function(pattern, until_after) {
+  var val = '';
+  var match_index = this.__position;
+  pattern.lastIndex = this.__position;
+  var pattern_match = pattern.exec(this.__input);
+  if (pattern_match) {
+    match_index = pattern_match.index;
+    if (until_after) {
+      match_index += pattern_match[0].length;
+    }
+  } else {
+    match_index = this.__input_length;
+  }
+
+  val = this.__input.substring(this.__position, match_index);
+  this.__position = match_index;
+  return val;
+};
+
+InputScanner.prototype.readUntilAfter = function(pattern) {
+  return this.readUntil(pattern, true);
+};
+
+InputScanner.prototype.get_regexp = function(pattern, match_from) {
+  var result = null;
+  var flags = 'g';
+  if (match_from && regexp_has_sticky) {
+    flags = 'y';
+  }
+  // strings are converted to regexp
+  if (typeof pattern === "string" && pattern !== '') {
+    // result = new RegExp(pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), flags);
+    result = new RegExp(pattern, flags);
+  } else if (pattern) {
+    result = new RegExp(pattern.source, flags);
+  }
+  return result;
+};
+
+InputScanner.prototype.get_literal_regexp = function(literal_string) {
+  return RegExp(literal_string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'));
+};
+
+/* css beautifier legacy helpers */
+InputScanner.prototype.peekUntilAfter = function(pattern) {
+  var start = this.__position;
+  var val = this.readUntilAfter(pattern);
+  this.__position = start;
+  return val;
+};
+
+InputScanner.prototype.lookBack = function(testVal) {
+  var start = this.__position - 1;
+  return start >= testVal.length && this.__input.substring(start - testVal.length, start)
+    .toLowerCase() === testVal;
+};
+
+module.exports.InputScanner = InputScanner;
+
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var InputScanner = __webpack_require__(8).InputScanner;
+var Token = __webpack_require__(3).Token;
+var TokenStream = __webpack_require__(10).TokenStream;
+var WhitespacePattern = __webpack_require__(11).WhitespacePattern;
+
+var TOKEN = {
+  START: 'TK_START',
+  RAW: 'TK_RAW',
+  EOF: 'TK_EOF'
+};
+
+var Tokenizer = function(input_string, options) {
+  this._input = new InputScanner(input_string);
+  this._options = options || {};
+  this.__tokens = null;
+
+  this._patterns = {};
+  this._patterns.whitespace = new WhitespacePattern(this._input);
+};
+
+Tokenizer.prototype.tokenize = function() {
+  this._input.restart();
+  this.__tokens = new TokenStream();
+
+  this._reset();
+
+  var current;
+  var previous = new Token(TOKEN.START, '');
+  var open_token = null;
+  var open_stack = [];
+  var comments = new TokenStream();
+
+  while (previous.type !== TOKEN.EOF) {
+    current = this._get_next_token(previous, open_token);
+    while (this._is_comment(current)) {
+      comments.add(current);
+      current = this._get_next_token(previous, open_token);
+    }
+
+    if (!comments.isEmpty()) {
+      current.comments_before = comments;
+      comments = new TokenStream();
+    }
+
+    current.parent = open_token;
+
+    if (this._is_opening(current)) {
+      open_stack.push(open_token);
+      open_token = current;
+    } else if (open_token && this._is_closing(current, open_token)) {
+      current.opened = open_token;
+      open_token.closed = current;
+      open_token = open_stack.pop();
+      current.parent = open_token;
+    }
+
+    current.previous = previous;
+    previous.next = current;
+
+    this.__tokens.add(current);
+    previous = current;
+  }
+
+  return this.__tokens;
+};
+
+
+Tokenizer.prototype._is_first_token = function() {
+  return this.__tokens.isEmpty();
+};
+
+Tokenizer.prototype._reset = function() {};
+
+Tokenizer.prototype._get_next_token = function(previous_token, open_token) { // jshint unused:false
+  this._readWhitespace();
+  var resulting_string = this._input.read(/.+/g);
+  if (resulting_string) {
+    return this._create_token(TOKEN.RAW, resulting_string);
+  } else {
+    return this._create_token(TOKEN.EOF, '');
+  }
+};
+
+Tokenizer.prototype._is_comment = function(current_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._is_opening = function(current_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._is_closing = function(current_token, open_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._create_token = function(type, text) {
+  var token = new Token(type, text,
+    this._patterns.whitespace.newline_count,
+    this._patterns.whitespace.whitespace_before_token);
+  return token;
+};
+
+Tokenizer.prototype._readWhitespace = function() {
+  return this._patterns.whitespace.read();
+};
+
+
+
+module.exports.Tokenizer = Tokenizer;
+module.exports.TOKEN = TOKEN;
+
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function TokenStream(parent_token) {
+  // private
+  this.__tokens = [];
+  this.__tokens_length = this.__tokens.length;
+  this.__position = 0;
+  this.__parent_token = parent_token;
+}
+
+TokenStream.prototype.restart = function() {
+  this.__position = 0;
+};
+
+TokenStream.prototype.isEmpty = function() {
+  return this.__tokens_length === 0;
+};
+
+TokenStream.prototype.hasNext = function() {
+  return this.__position < this.__tokens_length;
+};
+
+TokenStream.prototype.next = function() {
+  var val = null;
+  if (this.hasNext()) {
+    val = this.__tokens[this.__position];
+    this.__position += 1;
+  }
+  return val;
+};
+
+TokenStream.prototype.peek = function(index) {
+  var val = null;
+  index = index || 0;
+  index += this.__position;
+  if (index >= 0 && index < this.__tokens_length) {
+    val = this.__tokens[index];
+  }
+  return val;
+};
+
+TokenStream.prototype.add = function(token) {
+  if (this.__parent_token) {
+    token.parent = this.__parent_token;
+  }
+  this.__tokens.push(token);
+  this.__tokens_length += 1;
+};
+
+module.exports.TokenStream = TokenStream;
+
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Pattern = __webpack_require__(12).Pattern;
+
+function WhitespacePattern(input_scanner, parent) {
+  Pattern.call(this, input_scanner, parent);
+  if (parent) {
+    this._line_regexp = this._input.get_regexp(parent._line_regexp);
+  } else {
+    this.__set_whitespace_patterns('', '');
+  }
+
+  this.newline_count = 0;
+  this.whitespace_before_token = '';
+}
+WhitespacePattern.prototype = new Pattern();
+
+WhitespacePattern.prototype.__set_whitespace_patterns = function(whitespace_chars, newline_chars) {
+  whitespace_chars += '\\t ';
+  newline_chars += '\\n\\r';
+
+  this._match_pattern = this._input.get_regexp(
+    '[' + whitespace_chars + newline_chars + ']+', true);
+  this._newline_regexp = this._input.get_regexp(
+    '\\r\\n|[' + newline_chars + ']');
+};
+
+WhitespacePattern.prototype.read = function() {
+  this.newline_count = 0;
+  this.whitespace_before_token = '';
+
+  var resulting_string = this._input.read(this._match_pattern);
+  if (resulting_string === ' ') {
+    this.whitespace_before_token = ' ';
+  } else if (resulting_string) {
+    var matches = this.__split(this._newline_regexp, resulting_string);
+    this.newline_count = matches.length - 1;
+    this.whitespace_before_token = matches[this.newline_count];
+  }
+
+  return resulting_string;
+};
+
+WhitespacePattern.prototype.matching = function(whitespace_chars, newline_chars) {
+  var result = this._create();
+  result.__set_whitespace_patterns(whitespace_chars, newline_chars);
+  result._update();
+  return result;
+};
+
+WhitespacePattern.prototype._create = function() {
+  return new WhitespacePattern(this._input, this);
+};
+
+WhitespacePattern.prototype.__split = function(regexp, input_string) {
+  regexp.lastIndex = 0;
+  var start_index = 0;
+  var result = [];
+  var next_match = regexp.exec(input_string);
+  while (next_match) {
+    result.push(input_string.substring(start_index, next_match.index));
+    start_index = next_match.index + next_match[0].length;
+    next_match = regexp.exec(input_string);
+  }
+
+  if (start_index < input_string.length) {
+    result.push(input_string.substring(start_index, input_string.length));
+  } else {
+    result.push('');
+  }
+
+  return result;
+};
+
+
+
+module.exports.WhitespacePattern = WhitespacePattern;
+
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Pattern(input_scanner, parent) {
+  this._input = input_scanner;
+  this._starting_pattern = null;
+  this._match_pattern = null;
+  this._until_pattern = null;
+  this._until_after = false;
+
+  if (parent) {
+    this._starting_pattern = this._input.get_regexp(parent._starting_pattern, true);
+    this._match_pattern = this._input.get_regexp(parent._match_pattern, true);
+    this._until_pattern = this._input.get_regexp(parent._until_pattern);
+    this._until_after = parent._until_after;
+  }
+}
+
+Pattern.prototype.read = function() {
+  var result = this._input.read(this._starting_pattern);
+  if (!this._starting_pattern || result) {
+    result += this._input.read(this._match_pattern, this._until_pattern, this._until_after);
+  }
+  return result;
+};
+
+Pattern.prototype.read_match = function() {
+  return this._input.match(this._match_pattern);
+};
+
+Pattern.prototype.until_after = function(pattern) {
+  var result = this._create();
+  result._until_after = true;
+  result._until_pattern = this._input.get_regexp(pattern);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.until = function(pattern) {
+  var result = this._create();
+  result._until_after = false;
+  result._until_pattern = this._input.get_regexp(pattern);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.starting_with = function(pattern) {
+  var result = this._create();
+  result._starting_pattern = this._input.get_regexp(pattern, true);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.matching = function(pattern) {
+  var result = this._create();
+  result._match_pattern = this._input.get_regexp(pattern, true);
+  result._update();
+  return result;
+};
+
+Pattern.prototype._create = function() {
+  return new Pattern(this._input, this);
+};
+
+Pattern.prototype._update = function() {};
+
+module.exports.Pattern = Pattern;
+
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Directives(start_block_pattern, end_block_pattern) {
+  start_block_pattern = typeof start_block_pattern === 'string' ? start_block_pattern : start_block_pattern.source;
+  end_block_pattern = typeof end_block_pattern === 'string' ? end_block_pattern : end_block_pattern.source;
+  this.__directives_block_pattern = new RegExp(start_block_pattern + / beautify( \w+[:]\w+)+ /.source + end_block_pattern, 'g');
+  this.__directive_pattern = / (\w+)[:](\w+)/g;
+
+  this.__directives_end_ignore_pattern = new RegExp(start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern, 'g');
+}
+
+Directives.prototype.get_directives = function(text) {
+  if (!text.match(this.__directives_block_pattern)) {
+    return null;
+  }
+
+  var directives = {};
+  this.__directive_pattern.lastIndex = 0;
+  var directive_match = this.__directive_pattern.exec(text);
+
+  while (directive_match) {
+    directives[directive_match[1]] = directive_match[2];
+    directive_match = this.__directive_pattern.exec(text);
+  }
+
+  return directives;
+};
+
+Directives.prototype.readIgnored = function(input) {
+  return input.readUntilAfter(this.__directives_end_ignore_pattern);
+};
+
+
+module.exports.Directives = Directives;
+
+
+/***/ }),
+/* 14 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Pattern = __webpack_require__(12).Pattern;
+
+
+var template_names = {
+  django: false,
+  erb: false,
+  handlebars: false,
+  php: false
+};
+
+// This lets templates appear anywhere we would do a readUntil
+// The cost is higher but it is pay to play.
+function TemplatablePattern(input_scanner, parent) {
+  Pattern.call(this, input_scanner, parent);
+  this.__template_pattern = null;
+  this._disabled = Object.assign({}, template_names);
+  this._excluded = Object.assign({}, template_names);
+
+  if (parent) {
+    this.__template_pattern = this._input.get_regexp(parent.__template_pattern);
+    this._excluded = Object.assign(this._excluded, parent._excluded);
+    this._disabled = Object.assign(this._disabled, parent._disabled);
+  }
+  var pattern = new Pattern(input_scanner);
+  this.__patterns = {
+    handlebars_comment: pattern.starting_with(/{{!--/).until_after(/--}}/),
+    handlebars_unescaped: pattern.starting_with(/{{{/).until_after(/}}}/),
+    handlebars: pattern.starting_with(/{{/).until_after(/}}/),
+    php: pattern.starting_with(/<\?(?:[=]|php)/).until_after(/\?>/),
+    erb: pattern.starting_with(/<%[^%]/).until_after(/[^%]%>/),
+    // django coflicts with handlebars a bit.
+    django: pattern.starting_with(/{%/).until_after(/%}/),
+    django_value: pattern.starting_with(/{{/).until_after(/}}/),
+    django_comment: pattern.starting_with(/{#/).until_after(/#}/)
+  };
+}
+TemplatablePattern.prototype = new Pattern();
+
+TemplatablePattern.prototype._create = function() {
+  return new TemplatablePattern(this._input, this);
+};
+
+TemplatablePattern.prototype._update = function() {
+  this.__set_templated_pattern();
+};
+
+TemplatablePattern.prototype.disable = function(language) {
+  var result = this._create();
+  result._disabled[language] = true;
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.read_options = function(options) {
+  var result = this._create();
+  for (var language in template_names) {
+    result._disabled[language] = options.templating.indexOf(language) === -1;
+  }
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.exclude = function(language) {
+  var result = this._create();
+  result._excluded[language] = true;
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.read = function() {
+  var result = '';
+  if (this._match_pattern) {
+    result = this._input.read(this._starting_pattern);
+  } else {
+    result = this._input.read(this._starting_pattern, this.__template_pattern);
+  }
+  var next = this._read_template();
+  while (next) {
+    if (this._match_pattern) {
+      next += this._input.read(this._match_pattern);
+    } else {
+      next += this._input.readUntil(this.__template_pattern);
+    }
+    result += next;
+    next = this._read_template();
+  }
+
+  if (this._until_after) {
+    result += this._input.readUntilAfter(this._until_pattern);
+  }
+  return result;
+};
+
+TemplatablePattern.prototype.__set_templated_pattern = function() {
+  var items = [];
+
+  if (!this._disabled.php) {
+    items.push(this.__patterns.php._starting_pattern.source);
+  }
+  if (!this._disabled.handlebars) {
+    items.push(this.__patterns.handlebars._starting_pattern.source);
+  }
+  if (!this._disabled.erb) {
+    items.push(this.__patterns.erb._starting_pattern.source);
+  }
+  if (!this._disabled.django) {
+    items.push(this.__patterns.django._starting_pattern.source);
+    items.push(this.__patterns.django_value._starting_pattern.source);
+    items.push(this.__patterns.django_comment._starting_pattern.source);
+  }
+
+  if (this._until_pattern) {
+    items.push(this._until_pattern.source);
+  }
+  this.__template_pattern = this._input.get_regexp('(?:' + items.join('|') + ')');
+};
+
+TemplatablePattern.prototype._read_template = function() {
+  var resulting_string = '';
+  var c = this._input.peek();
+  if (c === '<') {
+    var peek1 = this._input.peek(1);
+    //if we're in a comment, do something special
+    // We treat all comments as literals, even more than preformatted tags
+    // we just look for the appropriate close tag
+    if (!this._disabled.php && !this._excluded.php && peek1 === '?') {
+      resulting_string = resulting_string ||
+        this.__patterns.php.read();
+    }
+    if (!this._disabled.erb && !this._excluded.erb && peek1 === '%') {
+      resulting_string = resulting_string ||
+        this.__patterns.erb.read();
+    }
+  } else if (c === '{') {
+    if (!this._disabled.handlebars && !this._excluded.handlebars) {
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars_comment.read();
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars_unescaped.read();
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars.read();
+    }
+    if (!this._disabled.django) {
+      // django coflicts with handlebars a bit.
+      if (!this._excluded.django && !this._excluded.handlebars) {
+        resulting_string = resulting_string ||
+          this.__patterns.django_value.read();
+      }
+      if (!this._excluded.django) {
+        resulting_string = resulting_string ||
+          this.__patterns.django_comment.read();
+        resulting_string = resulting_string ||
+          this.__patterns.django.read();
+      }
+    }
+  }
+  return resulting_string;
+};
+
+
+module.exports.TemplatablePattern = TemplatablePattern;
+
+
+/***/ }),
+/* 15 */,
+/* 16 */,
+/* 17 */,
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Beautifier = __webpack_require__(19).Beautifier,
+  Options = __webpack_require__(20).Options;
+
+function style_html(html_source, options, js_beautify, css_beautify) {
+  var beautifier = new Beautifier(html_source, options, js_beautify, css_beautify);
+  return beautifier.beautify();
+}
+
+module.exports = style_html;
+module.exports.defaultOptions = function() {
+  return new Options();
+};
+
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Options = __webpack_require__(20).Options;
+var Output = __webpack_require__(2).Output;
+var Tokenizer = __webpack_require__(21).Tokenizer;
+var TOKEN = __webpack_require__(21).TOKEN;
+
+var lineBreak = /\r\n|[\r\n]/;
+var allLineBreaks = /\r\n|[\r\n]/g;
+
+var Printer = function(options, base_indent_string) { //handles input/output and some other printing functions
+
+  this.indent_level = 0;
+  this.alignment_size = 0;
+  this.max_preserve_newlines = options.max_preserve_newlines;
+  this.preserve_newlines = options.preserve_newlines;
+
+  this._output = new Output(options, base_indent_string);
+
+};
+
+Printer.prototype.current_line_has_match = function(pattern) {
+  return this._output.current_line.has_match(pattern);
+};
+
+Printer.prototype.set_space_before_token = function(value, non_breaking) {
+  this._output.space_before_token = value;
+  this._output.non_breaking_space = non_breaking;
+};
+
+Printer.prototype.set_wrap_point = function() {
+  this._output.set_indent(this.indent_level, this.alignment_size);
+  this._output.set_wrap_point();
+};
+
+
+Printer.prototype.add_raw_token = function(token) {
+  this._output.add_raw_token(token);
+};
+
+Printer.prototype.print_preserved_newlines = function(raw_token) {
+  var newlines = 0;
+  if (raw_token.type !== TOKEN.TEXT && raw_token.previous.type !== TOKEN.TEXT) {
+    newlines = raw_token.newlines ? 1 : 0;
+  }
+
+  if (this.preserve_newlines) {
+    newlines = raw_token.newlines < this.max_preserve_newlines + 1 ? raw_token.newlines : this.max_preserve_newlines + 1;
+  }
+  for (var n = 0; n < newlines; n++) {
+    this.print_newline(n > 0);
+  }
+
+  return newlines !== 0;
+};
+
+Printer.prototype.traverse_whitespace = function(raw_token) {
+  if (raw_token.whitespace_before || raw_token.newlines) {
+    if (!this.print_preserved_newlines(raw_token)) {
+      this._output.space_before_token = true;
+    }
+    return true;
+  }
+  return false;
+};
+
+Printer.prototype.previous_token_wrapped = function() {
+  return this._output.previous_token_wrapped;
+};
+
+Printer.prototype.print_newline = function(force) {
+  this._output.add_new_line(force);
+};
+
+Printer.prototype.print_token = function(token) {
+  if (token.text) {
+    this._output.set_indent(this.indent_level, this.alignment_size);
+    this._output.add_token(token.text);
+  }
+};
+
+Printer.prototype.indent = function() {
+  this.indent_level++;
+};
+
+Printer.prototype.get_full_indent = function(level) {
+  level = this.indent_level + (level || 0);
+  if (level < 1) {
+    return '';
+  }
+
+  return this._output.get_indent_string(level);
+};
+
+var get_type_attribute = function(start_token) {
+  var result = null;
+  var raw_token = start_token.next;
+
+  // Search attributes for a type attribute
+  while (raw_token.type !== TOKEN.EOF && start_token.closed !== raw_token) {
+    if (raw_token.type === TOKEN.ATTRIBUTE && raw_token.text === 'type') {
+      if (raw_token.next && raw_token.next.type === TOKEN.EQUALS &&
+        raw_token.next.next && raw_token.next.next.type === TOKEN.VALUE) {
+        result = raw_token.next.next.text;
+      }
+      break;
+    }
+    raw_token = raw_token.next;
+  }
+
+  return result;
+};
+
+var get_custom_beautifier_name = function(tag_check, raw_token) {
+  var typeAttribute = null;
+  var result = null;
+
+  if (!raw_token.closed) {
+    return null;
+  }
+
+  if (tag_check === 'script') {
+    typeAttribute = 'text/javascript';
+  } else if (tag_check === 'style') {
+    typeAttribute = 'text/css';
+  }
+
+  typeAttribute = get_type_attribute(raw_token) || typeAttribute;
+
+  // For script and style tags that have a type attribute, only enable custom beautifiers for matching values
+  // For those without a type attribute use default;
+  if (typeAttribute.search('text/css') > -1) {
+    result = 'css';
+  } else if (typeAttribute.search(/module|((text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect))/) > -1) {
+    result = 'javascript';
+  } else if (typeAttribute.search(/(text|application|dojo)\/(x-)?(html)/) > -1) {
+    result = 'html';
+  } else if (typeAttribute.search(/test\/null/) > -1) {
+    // Test only mime-type for testing the beautifier when null is passed as beautifing function
+    result = 'null';
+  }
+
+  return result;
+};
+
+function in_array(what, arr) {
+  return arr.indexOf(what) !== -1;
+}
+
+function TagFrame(parent, parser_token, indent_level) {
+  this.parent = parent || null;
+  this.tag = parser_token ? parser_token.tag_name : '';
+  this.indent_level = indent_level || 0;
+  this.parser_token = parser_token || null;
+}
+
+function TagStack(printer) {
+  this._printer = printer;
+  this._current_frame = null;
+}
+
+TagStack.prototype.get_parser_token = function() {
+  return this._current_frame ? this._current_frame.parser_token : null;
+};
+
+TagStack.prototype.record_tag = function(parser_token) { //function to record a tag and its parent in this.tags Object
+  var new_frame = new TagFrame(this._current_frame, parser_token, this._printer.indent_level);
+  this._current_frame = new_frame;
+};
+
+TagStack.prototype._try_pop_frame = function(frame) { //function to retrieve the opening tag to the corresponding closer
+  var parser_token = null;
+
+  if (frame) {
+    parser_token = frame.parser_token;
+    this._printer.indent_level = frame.indent_level;
+    this._current_frame = frame.parent;
+  }
+
+  return parser_token;
+};
+
+TagStack.prototype._get_frame = function(tag_list, stop_list) { //function to retrieve the opening tag to the corresponding closer
+  var frame = this._current_frame;
+
+  while (frame) { //till we reach '' (the initial value);
+    if (tag_list.indexOf(frame.tag) !== -1) { //if this is it use it
+      break;
+    } else if (stop_list && stop_list.indexOf(frame.tag) !== -1) {
+      frame = null;
+      break;
+    }
+    frame = frame.parent;
+  }
+
+  return frame;
+};
+
+TagStack.prototype.try_pop = function(tag, stop_list) { //function to retrieve the opening tag to the corresponding closer
+  var frame = this._get_frame([tag], stop_list);
+  return this._try_pop_frame(frame);
+};
+
+TagStack.prototype.indent_to_tag = function(tag_list) {
+  var frame = this._get_frame(tag_list);
+  if (frame) {
+    this._printer.indent_level = frame.indent_level;
+  }
+};
+
+function Beautifier(source_text, options, js_beautify, css_beautify) {
+  //Wrapper function to invoke all the necessary constructors and deal with the output.
+  this._source_text = source_text || '';
+  options = options || {};
+  this._js_beautify = js_beautify;
+  this._css_beautify = css_beautify;
+  this._tag_stack = null;
+
+  // Allow the setting of language/file-type specific options
+  // with inheritance of overall settings
+  var optionHtml = new Options(options, 'html');
+
+  this._options = optionHtml;
+
+  this._is_wrap_attributes_force = this._options.wrap_attributes.substr(0, 'force'.length) === 'force';
+  this._is_wrap_attributes_force_expand_multiline = (this._options.wrap_attributes === 'force-expand-multiline');
+  this._is_wrap_attributes_force_aligned = (this._options.wrap_attributes === 'force-aligned');
+  this._is_wrap_attributes_aligned_multiple = (this._options.wrap_attributes === 'aligned-multiple');
+  this._is_wrap_attributes_preserve = this._options.wrap_attributes.substr(0, 'preserve'.length) === 'preserve';
+  this._is_wrap_attributes_preserve_aligned = (this._options.wrap_attributes === 'preserve-aligned');
+}
+
+Beautifier.prototype.beautify = function() {
+
+  // if disabled, return the input unchanged.
+  if (this._options.disabled) {
+    return this._source_text;
+  }
+
+  var source_text = this._source_text;
+  var eol = this._options.eol;
+  if (this._options.eol === 'auto') {
+    eol = '\n';
+    if (source_text && lineBreak.test(source_text)) {
+      eol = source_text.match(lineBreak)[0];
+    }
+  }
+
+  // HACK: newline parsing inconsistent. This brute force normalizes the input.
+  source_text = source_text.replace(allLineBreaks, '\n');
+
+  var baseIndentString = source_text.match(/^[\t ]*/)[0];
+
+  var last_token = {
+    text: '',
+    type: ''
+  };
+
+  var last_tag_token = new TagOpenParserToken();
+
+  var printer = new Printer(this._options, baseIndentString);
+  var tokens = new Tokenizer(source_text, this._options).tokenize();
+
+  this._tag_stack = new TagStack(printer);
+
+  var parser_token = null;
+  var raw_token = tokens.next();
+  while (raw_token.type !== TOKEN.EOF) {
+
+    if (raw_token.type === TOKEN.TAG_OPEN || raw_token.type === TOKEN.COMMENT) {
+      parser_token = this._handle_tag_open(printer, raw_token, last_tag_token, last_token);
+      last_tag_token = parser_token;
+    } else if ((raw_token.type === TOKEN.ATTRIBUTE || raw_token.type === TOKEN.EQUALS || raw_token.type === TOKEN.VALUE) ||
+      (raw_token.type === TOKEN.TEXT && !last_tag_token.tag_complete)) {
+      parser_token = this._handle_inside_tag(printer, raw_token, last_tag_token, tokens);
+    } else if (raw_token.type === TOKEN.TAG_CLOSE) {
+      parser_token = this._handle_tag_close(printer, raw_token, last_tag_token);
+    } else if (raw_token.type === TOKEN.TEXT) {
+      parser_token = this._handle_text(printer, raw_token, last_tag_token);
+    } else {
+      // This should never happen, but if it does. Print the raw token
+      printer.add_raw_token(raw_token);
+    }
+
+    last_token = parser_token;
+
+    raw_token = tokens.next();
+  }
+  var sweet_code = printer._output.get_code(eol);
+
+  return sweet_code;
+};
+
+Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_token) {
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
+  printer.alignment_size = 0;
+  last_tag_token.tag_complete = true;
+
+  printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true);
+  if (last_tag_token.is_unformatted) {
+    printer.add_raw_token(raw_token);
+  } else {
+    if (last_tag_token.tag_start_char === '<') {
+      printer.set_space_before_token(raw_token.text[0] === '/', true); // space before />, no space before >
+      if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.has_wrapped_attrs) {
+        printer.print_newline(false);
+      }
+    }
+    printer.print_token(raw_token);
+
+  }
+
+  if (last_tag_token.indent_content &&
+    !(last_tag_token.is_unformatted || last_tag_token.is_content_unformatted)) {
+    printer.indent();
+
+    // only indent once per opened tag
+    last_tag_token.indent_content = false;
+  }
+
+  if (!last_tag_token.is_inline_element &&
+    !(last_tag_token.is_unformatted || last_tag_token.is_content_unformatted)) {
+    printer.set_wrap_point();
+  }
+
+  return parser_token;
+};
+
+Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_token, tokens) {
+  var wrapped = last_tag_token.has_wrapped_attrs;
+  var parser_token = {
+    text: raw_token.text,
+    type: raw_token.type
+  };
+
+  printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true);
+  if (last_tag_token.is_unformatted) {
+    printer.add_raw_token(raw_token);
+  } else if (last_tag_token.tag_start_char === '{' && raw_token.type === TOKEN.TEXT) {
+    // For the insides of handlebars allow newlines or a single space between open and contents
+    if (printer.print_preserved_newlines(raw_token)) {
+      raw_token.newlines = 0;
+      printer.add_raw_token(raw_token);
+    } else {
+      printer.print_token(raw_token);
+    }
+  } else {
+    if (raw_token.type === TOKEN.ATTRIBUTE) {
+      printer.set_space_before_token(true);
+      last_tag_token.attr_count += 1;
+    } else if (raw_token.type === TOKEN.EQUALS) { //no space before =
+      printer.set_space_before_token(false);
+    } else if (raw_token.type === TOKEN.VALUE && raw_token.previous.type === TOKEN.EQUALS) { //no space before value
+      printer.set_space_before_token(false);
     }
 
-    function ltrim(s) {
-        return s.replace(/^\s+/g, '');
+    if (raw_token.type === TOKEN.ATTRIBUTE && last_tag_token.tag_start_char === '<') {
+      if (this._is_wrap_attributes_preserve || this._is_wrap_attributes_preserve_aligned) {
+        printer.traverse_whitespace(raw_token);
+        wrapped = wrapped || raw_token.newlines !== 0;
+      }
+
+
+      if (this._is_wrap_attributes_force) {
+        var force_attr_wrap = last_tag_token.attr_count > 1;
+        if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.attr_count === 1) {
+          var is_only_attribute = true;
+          var peek_index = 0;
+          var peek_token;
+          do {
+            peek_token = tokens.peek(peek_index);
+            if (peek_token.type === TOKEN.ATTRIBUTE) {
+              is_only_attribute = false;
+              break;
+            }
+            peek_index += 1;
+          } while (peek_index < 4 && peek_token.type !== TOKEN.EOF && peek_token.type !== TOKEN.TAG_CLOSE);
+
+          force_attr_wrap = !is_only_attribute;
+        }
+
+        if (force_attr_wrap) {
+          printer.print_newline(false);
+          wrapped = true;
+        }
+      }
+    }
+    printer.print_token(raw_token);
+    wrapped = wrapped || printer.previous_token_wrapped();
+    last_tag_token.has_wrapped_attrs = wrapped;
+  }
+  return parser_token;
+};
+
+Beautifier.prototype._handle_text = function(printer, raw_token, last_tag_token) {
+  var parser_token = {
+    text: raw_token.text,
+    type: 'TK_CONTENT'
+  };
+  if (last_tag_token.custom_beautifier_name) { //check if we need to format javascript
+    this._print_custom_beatifier_text(printer, raw_token, last_tag_token);
+  } else if (last_tag_token.is_unformatted || last_tag_token.is_content_unformatted) {
+    printer.add_raw_token(raw_token);
+  } else {
+    printer.traverse_whitespace(raw_token);
+    printer.print_token(raw_token);
+  }
+  return parser_token;
+};
+
+Beautifier.prototype._print_custom_beatifier_text = function(printer, raw_token, last_tag_token) {
+  var local = this;
+  if (raw_token.text !== '') {
+
+    var text = raw_token.text,
+      _beautifier,
+      script_indent_level = 1,
+      pre = '',
+      post = '';
+    if (last_tag_token.custom_beautifier_name === 'javascript' && typeof this._js_beautify === 'function') {
+      _beautifier = this._js_beautify;
+    } else if (last_tag_token.custom_beautifier_name === 'css' && typeof this._css_beautify === 'function') {
+      _beautifier = this._css_beautify;
+    } else if (last_tag_token.custom_beautifier_name === 'html') {
+      _beautifier = function(html_source, options) {
+        var beautifier = new Beautifier(html_source, options, local._js_beautify, local._css_beautify);
+        return beautifier.beautify();
+      };
+    }
+
+    if (this._options.indent_scripts === "keep") {
+      script_indent_level = 0;
+    } else if (this._options.indent_scripts === "separate") {
+      script_indent_level = -printer.indent_level;
     }
 
-    function style_html(html_source, options, js_beautify, css_beautify) {
-        //Wrapper function to invoke all the necessary constructors and deal with the output.
-
-        var multi_parser,
-            indent_inner_html,
-            indent_size,
-            indent_character,
-            wrap_line_length,
-            brace_style,
-            unformatted,
-            preserve_newlines,
-            max_preserve_newlines,
-            indent_handlebars;
-
-        options = options || {};
-
-        // backwards compatibility to 1.3.4
-        if ((options.wrap_line_length === undefined || parseInt(options.wrap_line_length, 10) === 0) &&
-                (options.max_char !== undefined && parseInt(options.max_char, 10) !== 0)) {
-            options.wrap_line_length = options.max_char;
+    var indentation = printer.get_full_indent(script_indent_level);
+
+    // if there is at least one empty line at the end of this text, strip it
+    // we'll be adding one back after the text but before the containing tag.
+    text = text.replace(/\n[ \t]*$/, '');
+
+    // Handle the case where content is wrapped in a comment or cdata.
+    if (last_tag_token.custom_beautifier_name !== 'html' &&
+      text[0] === '<' && text.match(/^(<!--|<!\[CDATA\[)/)) {
+      var matched = /^(<!--[^\n]*|<!\[CDATA\[)(\n?)([ \t\n]*)([\s\S]*)(-->|]]>)$/.exec(text);
+
+      // if we start to wrap but don't finish, print raw
+      if (!matched) {
+        printer.add_raw_token(raw_token);
+        return;
+      }
+
+      pre = indentation + matched[1] + '\n';
+      text = matched[4];
+      if (matched[5]) {
+        post = indentation + matched[5];
+      }
+
+      // if there is at least one empty line at the end of this text, strip it
+      // we'll be adding one back after the text but before the containing tag.
+      text = text.replace(/\n[ \t]*$/, '');
+
+      if (matched[2] || matched[3].indexOf('\n') !== -1) {
+        // if the first line of the non-comment text has spaces
+        // use that as the basis for indenting in null case.
+        matched = matched[3].match(/[ \t]+$/);
+        if (matched) {
+          raw_token.whitespace_before = matched[0];
         }
+      }
+    }
 
-        indent_inner_html = (options.indent_inner_html === undefined) ? false : options.indent_inner_html;
-        indent_size = (options.indent_size === undefined) ? 4 : parseInt(options.indent_size, 10);
-        indent_character = (options.indent_char === undefined) ? ' ' : options.indent_char;
-        brace_style = (options.brace_style === undefined) ? 'collapse' : options.brace_style;
-        wrap_line_length =  parseInt(options.wrap_line_length, 10) === 0 ? 32786 : parseInt(options.wrap_line_length || 250, 10);
-        unformatted = options.unformatted || ['a', 'span', 'bdo', 'em', 'strong', 'dfn', 'code', 'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'q', 'sub', 'sup', 'tt', 'i', 'b', 'big', 'small', 'u', 's', 'strike', 'font', 'ins', 'del', 'pre', 'address', 'dt', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
-        preserve_newlines = (options.preserve_newlines === undefined) ? true : options.preserve_newlines;
-        max_preserve_newlines = preserve_newlines ?
-            (isNaN(parseInt(options.max_preserve_newlines, 10)) ? 32786 : parseInt(options.max_preserve_newlines, 10))
-            : 0;
-        indent_handlebars = (options.indent_handlebars === undefined) ? false : options.indent_handlebars;
-
-        function Parser() {
-
-            this.pos = 0; //Parser position
-            this.token = '';
-            this.current_mode = 'CONTENT'; //reflects the current Parser mode: TAG/CONTENT
-            this.tags = { //An object to hold tags, their position, and their parent-tags, initiated with default values
-                parent: 'parent1',
-                parentcount: 1,
-                parent1: ''
-            };
-            this.tag_type = '';
-            this.token_text = this.last_token = this.last_text = this.token_type = '';
-            this.newlines = 0;
-            this.indent_content = indent_inner_html;
-
-            this.Utils = { //Uilities made available to the various functions
-                whitespace: "\n\r\t ".split(''),
-                single_token: 'br,input,link,meta,!doctype,basefont,base,area,hr,wbr,param,img,isindex,?xml,embed,?php,?,?='.split(','), //all the single tags for HTML
-                extra_liners: 'head,body,/html'.split(','), //for tags that need a line of whitespace before them
-                in_array: function(what, arr) {
-                    for (var i = 0; i < arr.length; i++) {
-                        if (what === arr[i]) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            };
-
-            this.traverse_whitespace = function() {
-                var input_char = '';
-
-                input_char = this.input.charAt(this.pos);
-                if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
-                    this.newlines = 0;
-                    while (this.Utils.in_array(input_char, this.Utils.whitespace)) {
-                        if (preserve_newlines && input_char === '\n' && this.newlines <= max_preserve_newlines) {
-                            this.newlines += 1;
-                        }
-
-                        this.pos++;
-                        input_char = this.input.charAt(this.pos);
-                    }
-                    return true;
-                }
-                return false;
-            };
-
-            this.get_content = function() { //function to capture regular content between tags
-
-                var input_char = '',
-                    content = [],
-                    space = false; //if a space is needed
-
-                while (this.input.charAt(this.pos) !== '<') {
-                    if (this.pos >= this.input.length) {
-                        return content.length ? content.join('') : ['', 'TK_EOF'];
-                    }
-
-                    if (this.traverse_whitespace()) {
-                        if (content.length) {
-                            space = true;
-                        }
-                        continue; //don't want to insert unnecessary space
-                    }
-
-                    if (indent_handlebars) {
-                        // Handlebars parsing is complicated.
-                        // {{#foo}} and {{/foo}} are formatted tags.
-                        // {{something}} should get treated as content, except:
-                        // {{else}} specifically behaves like {{#if}} and {{/if}}
-                        var peek3 = this.input.substr(this.pos, 3);
-                        if (peek3 === '{{#' || peek3 === '{{/') {
-                            // These are tags and not content.
-                            break;
-                        } else if (this.input.substr(this.pos, 2) === '{{') {
-                            if (this.get_tag(true) === '{{else}}') {
-                                break;
-                            }
-                        }
-                    }
-
-                    input_char = this.input.charAt(this.pos);
-                    this.pos++;
-
-                    if (space) {
-                        if (this.line_char_count >= this.wrap_line_length) { //insert a line when the wrap_line_length is reached
-                            this.print_newline(false, content);
-                            this.print_indentation(content);
-                        } else {
-                            this.line_char_count++;
-                            content.push(' ');
-                        }
-                        space = false;
-                    }
-                    this.line_char_count++;
-                    content.push(input_char); //letter at-a-time (or string) inserted to an array
-                }
-                return content.length ? content.join('') : '';
-            };
-
-            this.get_contents_to = function(name) { //get the full content of a script or style to pass to js_beautify
-                if (this.pos === this.input.length) {
-                    return ['', 'TK_EOF'];
-                }
-                var input_char = '';
-                var content = '';
-                var reg_match = new RegExp('</' + name + '\\s*>', 'igm');
-                reg_match.lastIndex = this.pos;
-                var reg_array = reg_match.exec(this.input);
-                var end_script = reg_array ? reg_array.index : this.input.length; //absolute end of script
-                if (this.pos < end_script) { //get everything in between the script tags
-                    content = this.input.substring(this.pos, end_script);
-                    this.pos = end_script;
-                }
-                return content;
-            };
-
-            this.record_tag = function(tag) { //function to record a tag and its parent in this.tags Object
-                if (this.tags[tag + 'count']) { //check for the existence of this tag type
-                    this.tags[tag + 'count']++;
-                    this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
-                } else { //otherwise initialize this tag type
-                    this.tags[tag + 'count'] = 1;
-                    this.tags[tag + this.tags[tag + 'count']] = this.indent_level; //and record the present indent level
-                }
-                this.tags[tag + this.tags[tag + 'count'] + 'parent'] = this.tags.parent; //set the parent (i.e. in the case of a div this.tags.div1parent)
-                this.tags.parent = tag + this.tags[tag + 'count']; //and make this the current parent (i.e. in the case of a div 'div1')
-            };
-
-            this.retrieve_tag = function(tag) { //function to retrieve the opening tag to the corresponding closer
-                if (this.tags[tag + 'count']) { //if the openener is not in the Object we ignore it
-                    var temp_parent = this.tags.parent; //check to see if it's a closable tag.
-                    while (temp_parent) { //till we reach '' (the initial value);
-                        if (tag + this.tags[tag + 'count'] === temp_parent) { //if this is it use it
-                            break;
-                        }
-                        temp_parent = this.tags[temp_parent + 'parent']; //otherwise keep on climbing up the DOM Tree
-                    }
-                    if (temp_parent) { //if we caught something
-                        this.indent_level = this.tags[tag + this.tags[tag + 'count']]; //set the indent_level accordingly
-                        this.tags.parent = this.tags[temp_parent + 'parent']; //and set the current parent
-                    }
-                    delete this.tags[tag + this.tags[tag + 'count'] + 'parent']; //delete the closed tags parent reference...
-                    delete this.tags[tag + this.tags[tag + 'count']]; //...and the tag itself
-                    if (this.tags[tag + 'count'] === 1) {
-                        delete this.tags[tag + 'count'];
-                    } else {
-                        this.tags[tag + 'count']--;
-                    }
-                }
-            };
-
-            this.indent_to_tag = function(tag) {
-                // Match the indentation level to the last use of this tag, but don't remove it.
-                if (!this.tags[tag + 'count']) {
-                    return;
-                }
-                var temp_parent = this.tags.parent;
-                while (temp_parent) {
-                    if (tag + this.tags[tag + 'count'] === temp_parent) {
-                        break;
-                    }
-                    temp_parent = this.tags[temp_parent + 'parent'];
-                }
-                if (temp_parent) {
-                    this.indent_level = this.tags[tag + this.tags[tag + 'count']];
-                }
-            };
-
-            this.get_tag = function(peek) { //function to get a full tag and parse its type
-                var input_char = '',
-                    content = [],
-                    comment = '',
-                    space = false,
-                    tag_start, tag_end,
-                    tag_start_char,
-                    orig_pos = this.pos,
-                    orig_line_char_count = this.line_char_count;
-
-                peek = peek !== undefined ? peek : false;
-
-                do {
-                    if (this.pos >= this.input.length) {
-                        if (peek) {
-                            this.pos = orig_pos;
-                            this.line_char_count = orig_line_char_count;
-                        }
-                        return content.length ? content.join('') : ['', 'TK_EOF'];
-                    }
-
-                    input_char = this.input.charAt(this.pos);
-                    this.pos++;
-
-                    if (this.Utils.in_array(input_char, this.Utils.whitespace)) { //don't want to insert unnecessary space
-                        space = true;
-                        continue;
-                    }
-
-                    if (input_char === "'" || input_char === '"') {
-                        input_char += this.get_unformatted(input_char);
-                        space = true;
-
-                    }
-
-                    if (input_char === '=') { //no space before =
-                        space = false;
-                    }
-
-                    if (content.length && content[content.length - 1] !== '=' && input_char !== '>' && space) {
-                        //no space after = or before >
-                        if (this.line_char_count >= this.wrap_line_length) {
-                            this.print_newline(false, content);
-                            this.print_indentation(content);
-                        } else {
-                            content.push(' ');
-                            this.line_char_count++;
-                        }
-                        space = false;
-                    }
-
-                    if (indent_handlebars && tag_start_char === '<') {
-                        // When inside an angle-bracket tag, put spaces around
-                        // handlebars not inside of strings.
-                        if ((input_char + this.input.charAt(this.pos)) === '{{') {
-                            input_char += this.get_unformatted('}}');
-                            if (content.length && content[content.length - 1] !== ' ' && content[content.length - 1] !== '<') {
-                                input_char = ' ' + input_char;
-                            }
-                            space = true;
-                        }
-                    }
-
-                    if (input_char === '<' && !tag_start_char) {
-                        tag_start = this.pos - 1;
-                        tag_start_char = '<';
-                    }
-
-                    if (indent_handlebars && !tag_start_char) {
-                        if (content.length >= 2 && content[content.length - 1] === '{' && content[content.length - 2] == '{') {
-                            if (input_char === '#' || input_char === '/') {
-                                tag_start = this.pos - 3;
-                            } else {
-                                tag_start = this.pos - 2;
-                            }
-                            tag_start_char = '{';
-                        }
-                    }
-
-                    this.line_char_count++;
-                    content.push(input_char); //inserts character at-a-time (or string)
-
-                    if (content[1] && content[1] === '!') { //if we're in a comment, do something special
-                        // We treat all comments as literals, even more than preformatted tags
-                        // we just look for the appropriate close tag
-                        content = [this.get_comment(tag_start)];
-                        break;
-                    }
-
-                    if (indent_handlebars && tag_start_char === '{' && content.length > 2 && content[content.length - 2] === '}' && content[content.length - 1] === '}') {
-                        break;
-                    }
-                } while (input_char !== '>');
-
-                var tag_complete = content.join('');
-                var tag_index;
-                var tag_offset;
-
-                if (tag_complete.includes(' ')) { //if there's whitespace, thats where the tag name ends
-                    tag_index = tag_complete.indexOf(' ');
-                } else if (tag_complete[0] === '{') {
-                    tag_index = tag_complete.indexOf('}');
-                } else { //otherwise go with the tag ending
-                    tag_index = tag_complete.indexOf('>');
-                }
-                if (tag_complete[0] === '<' || !indent_handlebars) {
-                    tag_offset = 1;
-                } else {
-                    tag_offset = tag_complete[2] === '#' ? 3 : 2;
-                }
-                var tag_check = tag_complete.substring(tag_offset, tag_index).toLowerCase();
-                if (tag_complete.charAt(tag_complete.length - 2) === '/' ||
-                    this.Utils.in_array(tag_check, this.Utils.single_token)) { //if this tag name is a single tag type (either in the list or has a closing /)
-                    if (!peek) {
-                        this.tag_type = 'SINGLE';
-                    }
-                } else if (indent_handlebars && tag_complete[0] === '{' && tag_check === 'else') {
-                    if (!peek) {
-                        this.indent_to_tag('if');
-                        this.tag_type = 'HANDLEBARS_ELSE';
-                        this.indent_content = true;
-                        this.traverse_whitespace();
-                    }
-                } else if (tag_check === 'script' &&
-                    (tag_complete.search('type') === -1 ||
-                    (tag_complete.search('type') > -1 &&
-                    tag_complete.search(/\b(text|application)\/(x-)?(javascript|ecmascript|jscript|livescript)/) > -1))) {
-                    if (!peek) {
-                        this.record_tag(tag_check);
-                        this.tag_type = 'SCRIPT';
-                    }
-                } else if (tag_check === 'style' &&
-                    (tag_complete.search('type') === -1 ||
-                    (tag_complete.search('type') > -1 && tag_complete.search('text/css') > -1))) {
-                    if (!peek) {
-                        this.record_tag(tag_check);
-                        this.tag_type = 'STYLE';
-                    }
-                } else if (this.is_unformatted(tag_check, unformatted)) { // do not reformat the "unformatted" tags
-                    comment = this.get_unformatted('</' + tag_check + '>', tag_complete); //...delegate to get_unformatted function
-                    content.push(comment);
-                    // Preserve collapsed whitespace either before or after this tag.
-                    if (tag_start > 0 && this.Utils.in_array(this.input.charAt(tag_start - 1), this.Utils.whitespace)) {
-                        content.splice(0, 0, this.input.charAt(tag_start - 1));
-                    }
-                    tag_end = this.pos - 1;
-                    if (this.Utils.in_array(this.input.charAt(tag_end + 1), this.Utils.whitespace)) {
-                        content.push(this.input.charAt(tag_end + 1));
-                    }
-                    this.tag_type = 'SINGLE';
-                } else if (tag_check.charAt(0) === '!') { //peek for <! comment
-                    // for comments content is already correct.
-                    if (!peek) {
-                        this.tag_type = 'SINGLE';
-                        this.traverse_whitespace();
-                    }
-                } else if (!peek) {
-                    if (tag_check.charAt(0) === '/') { //this tag is a double tag so check for tag-ending
-                        this.retrieve_tag(tag_check.substring(1)); //remove it and all ancestors
-                        this.tag_type = 'END';
-                        this.traverse_whitespace();
-                    } else { //otherwise it's a start-tag
-                        this.record_tag(tag_check); //push it on the tag stack
-                        if (tag_check.toLowerCase() !== 'html') {
-                            this.indent_content = true;
-                        }
-                        this.tag_type = 'START';
-
-                        // Allow preserving of newlines after a start tag
-                        this.traverse_whitespace();
-                    }
-                    if (this.Utils.in_array(tag_check, this.Utils.extra_liners)) { //check if this double needs an extra line
-                        this.print_newline(false, this.output);
-                        if (this.output.length && this.output[this.output.length - 2] !== '\n') {
-                            this.print_newline(true, this.output);
-                        }
-                    }
-                }
-
-                if (peek) {
-                    this.pos = orig_pos;
-                    this.line_char_count = orig_line_char_count;
-                }
-
-                return content.join(''); //returns fully formatted tag
-            };
-
-            this.get_comment = function(start_pos) { //function to return comment content in its entirety
-                // this is will have very poor perf, but will work for now.
-                var comment = '',
-                    delimiter = '>',
-                    matched = false;
-
-                this.pos = start_pos;
-                input_char = this.input.charAt(this.pos);
-                this.pos++;
-
-                while (this.pos <= this.input.length) {
-                    comment += input_char;
-
-                    // only need to check for the delimiter if the last chars match
-                    if (comment[comment.length - 1] === delimiter[delimiter.length - 1] &&
-                        comment.includes(delimiter)) {
-                        break;
-                    }
-
-                    // only need to search for custom delimiter for the first few characters
-                    if (!matched && comment.length < 10) {
-                        if (comment.indexOf('<![if') === 0) { //peek for <![if conditional comment
-                            delimiter = '<![endif]>';
-                            matched = true;
-                        } else if (comment.indexOf('<![cdata[') === 0) { //if it's a <[cdata[ comment...
-                            delimiter = ']]>';
-                            matched = true;
-                        } else if (comment.indexOf('<![') === 0) { // some other ![ comment? ...
-                            delimiter = ']>';
-                            matched = true;
-                        } else if (comment.indexOf('<!--') === 0) { // <!-- comment ...
-                            delimiter = '-->';
-                            matched = true;
-                        }
-                    }
-
-                    input_char = this.input.charAt(this.pos);
-                    this.pos++;
-                }
-
-                return comment;
-            };
-
-            this.get_unformatted = function(delimiter, orig_tag) { //function to return unformatted content in its entirety
-
-                if (orig_tag && orig_tag.toLowerCase().includes(delimiter)) {
-                    return '';
-                }
-                var input_char = '';
-                var content = '';
-                var min_index = 0;
-                var space = true;
-                do {
-
-                    if (this.pos >= this.input.length) {
-                        return content;
-                    }
-
-                    input_char = this.input.charAt(this.pos);
-                    this.pos++;
-
-                    if (this.Utils.in_array(input_char, this.Utils.whitespace)) {
-                        if (!space) {
-                            this.line_char_count--;
-                            continue;
-                        }
-                        if (input_char === '\n' || input_char === '\r') {
-                            content += '\n';
-                            /*  Don't change tab indention for unformatted blocks.  If using code for html editing, this will greatly affect <pre> tags if they are specified in the 'unformatted array'
-                for (var i=0; i<this.indent_level; i++) {
-                  content += this.indent_string;
-                }
-                space = false; //...and make sure other indentation is erased
-                */
-                            this.line_char_count = 0;
-                            continue;
-                        }
-                    }
-                    content += input_char;
-                    this.line_char_count++;
-                    space = true;
-
-                    if (indent_handlebars && input_char === '{' && content.length && content[content.length - 2] === '{') {
-                        // Handlebars expressions in strings should also be unformatted.
-                        content += this.get_unformatted('}}');
-                        // These expressions are opaque.  Ignore delimiters found in them.
-                        min_index = content.length;
-                    }
-                } while (!content.toLowerCase().includes(delimiter, min_index));
-                return content;
-            };
-
-            this.get_token = function() { //initial handler for token-retrieval
-                var token;
-
-                if (this.last_token === 'TK_TAG_SCRIPT' || this.last_token === 'TK_TAG_STYLE') { //check if we need to format javascript
-                    var type = this.last_token.substr(7);
-                    token = this.get_contents_to(type);
-                    if (typeof token !== 'string') {
-                        return token;
-                    }
-                    return [token, 'TK_' + type];
-                }
-                if (this.current_mode === 'CONTENT') {
-                    token = this.get_content();
-                    if (typeof token !== 'string') {
-                        return token;
-                    } else {
-                        return [token, 'TK_CONTENT'];
-                    }
-                }
-
-                if (this.current_mode === 'TAG') {
-                    token = this.get_tag();
-                    if (typeof token !== 'string') {
-                        return token;
-                    } else {
-                        var tag_name_type = 'TK_TAG_' + this.tag_type;
-                        return [token, tag_name_type];
-                    }
-                }
-            };
-
-            this.get_full_indent = function(level) {
-                level = this.indent_level + level || 0;
-                if (level < 1) {
-                    return '';
-                }
-
-                return Array(level + 1).join(this.indent_string);
-            };
-
-            this.is_unformatted = function(tag_check, unformatted) {
-                //is this an HTML5 block-level link?
-                if (!this.Utils.in_array(tag_check, unformatted)) {
-                    return false;
-                }
-
-                if (tag_check.toLowerCase() !== 'a' || !this.Utils.in_array('a', unformatted)) {
-                    return true;
-                }
-
-                //at this point we have an  tag; is its first child something we want to remain
-                //unformatted?
-                var next_tag = this.get_tag(true /* peek. */ );
-
-                // test next_tag to see if it is just html tag (no external content)
-                var tag = (next_tag || "").match(/^\s*<\s*\/?([a-z]*)\s*[^>]*>\s*$/);
-
-                // if next_tag comes back but is not an isolated tag, then
-                // let's treat the 'a' tag as having content
-                // and respect the unformatted option
-                if (!tag || this.Utils.in_array(tag, unformatted)) {
-                    return true;
-                } else {
-                    return false;
-                }
-            };
-
-            this.printer = function(js_source, indent_character, indent_size, wrap_line_length, brace_style) { //handles input/output and some other printing functions
-
-                this.input = js_source || ''; //gets the input for the Parser
-                this.output = [];
-                this.indent_character = indent_character;
-                this.indent_string = '';
-                this.indent_size = indent_size;
-                this.brace_style = brace_style;
-                this.indent_level = 0;
-                this.wrap_line_length = wrap_line_length;
-                this.line_char_count = 0; //count to see if wrap_line_length was exceeded
-
-                for (var i = 0; i < this.indent_size; i++) {
-                    this.indent_string += this.indent_character;
-                }
-
-                this.print_newline = function(force, arr) {
-                    this.line_char_count = 0;
-                    if (!arr || !arr.length) {
-                        return;
-                    }
-                    if (force || (arr[arr.length - 1] !== '\n')) { //we might want the extra line
-                        arr.push('\n');
-                    }
-                };
-
-                this.print_indentation = function(arr) {
-                    for (var i = 0; i < this.indent_level; i++) {
-                        arr.push(this.indent_string);
-                        this.line_char_count += this.indent_string.length;
-                    }
-                };
-
-                this.print_token = function(text) {
-                    if (text || text !== '') {
-                        if (this.output.length && this.output[this.output.length - 1] === '\n') {
-                            this.print_indentation(this.output);
-                            text = ltrim(text);
-                        }
-                    }
-                    this.print_token_raw(text);
-                };
-
-                this.print_token_raw = function(text) {
-                    if (text && text !== '') {
-                        if (text.length > 1 && text[text.length - 1] === '\n') {
-                            // unformatted tags can grab newlines as their last character
-                            this.output.push(text.slice(0, -1));
-                            this.print_newline(false, this.output);
-                        } else {
-                            this.output.push(text);
-                        }
-                    }
-
-                    for (var n = 0; n < this.newlines; n++) {
-                        this.print_newline(n > 0, this.output);
-                    }
-                    this.newlines = 0;
-                };
-
-                this.indent = function() {
-                    this.indent_level++;
-                };
-
-                this.unindent = function() {
-                    if (this.indent_level > 0) {
-                        this.indent_level--;
-                    }
-                };
-            };
-            return this;
+    if (text) {
+      if (_beautifier) {
+
+        // call the Beautifier if avaliable
+        var Child_options = function() {
+          this.eol = '\n';
+        };
+        Child_options.prototype = this._options.raw_options;
+        var child_options = new Child_options();
+        text = _beautifier(indentation + text, child_options);
+      } else {
+        // simply indent the string otherwise
+        var white = raw_token.whitespace_before;
+        if (white) {
+          text = text.replace(new RegExp('\n(' + white + ')?', 'g'), '\n');
         }
 
-        /*_____________________--------------------_____________________*/
+        text = indentation + text.replace(/\n/g, '\n' + indentation);
+      }
+    }
 
-        multi_parser = new Parser(); //wrapping functions Parser
-        multi_parser.printer(html_source, indent_character, indent_size, wrap_line_length, brace_style); //initialize starting values
+    if (pre) {
+      if (!text) {
+        text = pre + post;
+      } else {
+        text = pre + text + '\n' + post;
+      }
+    }
 
-        while (true) {
-            var t = multi_parser.get_token();
-            multi_parser.token_text = t[0];
-            multi_parser.token_type = t[1];
+    printer.print_newline(false);
+    if (text) {
+      raw_token.text = text;
+      raw_token.whitespace_before = '';
+      raw_token.newlines = 0;
+      printer.add_raw_token(raw_token);
+      printer.print_newline(true);
+    }
+  }
+};
 
-            if (multi_parser.token_type === 'TK_EOF') {
-                break;
-            }
+Beautifier.prototype._handle_tag_open = function(printer, raw_token, last_tag_token, last_token) {
+  var parser_token = this._get_tag_open_token(raw_token);
 
-            switch (multi_parser.token_type) {
-                case 'TK_TAG_START':
-                    multi_parser.print_newline(false, multi_parser.output);
-                    multi_parser.print_token(multi_parser.token_text);
-                    if (multi_parser.indent_content) {
-                        multi_parser.indent();
-                        multi_parser.indent_content = false;
-                    }
-                    multi_parser.current_mode = 'CONTENT';
-                    break;
-                case 'TK_TAG_STYLE':
-                case 'TK_TAG_SCRIPT':
-                    multi_parser.print_newline(false, multi_parser.output);
-                    multi_parser.print_token(multi_parser.token_text);
-                    multi_parser.current_mode = 'CONTENT';
-                    break;
-                case 'TK_TAG_END':
-                    //Print new line only if the tag has no content and has child
-                    if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
-                        var tag_name = multi_parser.token_text.match(/\w+/)[0];
-                        var tag_extracted_from_last_output = null;
-                        if (multi_parser.output.length) {
-                            tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length - 1].match(/(?:<|{{#)\s*(\w+)/);
-                        }
-                        if (tag_extracted_from_last_output === null ||
-                            tag_extracted_from_last_output[1] !== tag_name) {
-                            multi_parser.print_newline(false, multi_parser.output);
-                        }
-                    }
-                    multi_parser.print_token(multi_parser.token_text);
-                    multi_parser.current_mode = 'CONTENT';
-                    break;
-                case 'TK_TAG_SINGLE':
-                    // Don't add a newline before elements that should remain unformatted.
-                    var tag_check = multi_parser.token_text.match(/^\s*<([a-z]+)/i);
-                    if (!tag_check || !multi_parser.Utils.in_array(tag_check[1], unformatted)) {
-                        multi_parser.print_newline(false, multi_parser.output);
-                    }
-                    multi_parser.print_token(multi_parser.token_text);
-                    multi_parser.current_mode = 'CONTENT';
-                    break;
-                case 'TK_TAG_HANDLEBARS_ELSE':
-                    multi_parser.print_token(multi_parser.token_text);
-                    if (multi_parser.indent_content) {
-                        multi_parser.indent();
-                        multi_parser.indent_content = false;
-                    }
-                    multi_parser.current_mode = 'CONTENT';
-                    break;
-                case 'TK_CONTENT':
-                    multi_parser.print_token(multi_parser.token_text);
-                    multi_parser.current_mode = 'TAG';
-                    break;
-                case 'TK_STYLE':
-                case 'TK_SCRIPT':
-                    if (multi_parser.token_text !== '') {
-                        multi_parser.print_newline(false, multi_parser.output);
-                        var text = multi_parser.token_text,
-                            _beautifier,
-                            script_indent_level = 1;
-                        if (multi_parser.token_type === 'TK_SCRIPT') {
-                            _beautifier = typeof js_beautify === 'function' && js_beautify;
-                        } else if (multi_parser.token_type === 'TK_STYLE') {
-                            _beautifier = typeof css_beautify === 'function' && css_beautify;
-                        }
-
-                        if (options.indent_scripts === "keep") {
-                            script_indent_level = 0;
-                        } else if (options.indent_scripts === "separate") {
-                            script_indent_level = -multi_parser.indent_level;
-                        }
-
-                        var indentation = multi_parser.get_full_indent(script_indent_level);
-                        if (_beautifier) {
-                            // call the Beautifier if avaliable
-                            text = _beautifier(text.replace(/^\s*/, indentation), options);
-                        } else {
-                            // simply indent the string otherwise
-                            var white = text.match(/^\s*/)[0];
-                            var _level = white.match(/[^\n\r]*$/)[0].split(multi_parser.indent_string).length - 1;
-                            var reindent = multi_parser.get_full_indent(script_indent_level - _level);
-                            text = text.replace(/^\s*/, indentation)
-                                .replace(/\r\n|\r|\n/g, '\n' + reindent)
-                                .replace(/\s+$/, '');
-                        }
-                        if (text) {
-                            multi_parser.print_token_raw(indentation + trim(text));
-                            multi_parser.print_newline(false, multi_parser.output);
-                        }
-                    }
-                    multi_parser.current_mode = 'TAG';
-                    break;
-            }
-            multi_parser.last_token = multi_parser.token_type;
-            multi_parser.last_text = multi_parser.token_text;
+  if ((last_tag_token.is_unformatted || last_tag_token.is_content_unformatted) &&
+    !last_tag_token.is_empty_element &&
+    raw_token.type === TOKEN.TAG_OPEN && raw_token.text.indexOf('</') === 0) {
+    // End element tags for unformatted or content_unformatted elements
+    // are printed raw to keep any newlines inside them exactly the same.
+    printer.add_raw_token(raw_token);
+    parser_token.start_tag_token = this._tag_stack.try_pop(parser_token.tag_name);
+  } else {
+    printer.traverse_whitespace(raw_token);
+    this._set_tag_position(printer, raw_token, parser_token, last_tag_token, last_token);
+    if (!parser_token.is_inline_element) {
+      printer.set_wrap_point();
+    }
+    printer.print_token(raw_token);
+  }
+
+  //indent attributes an auto, forced, aligned or forced-align line-wrap
+  if (this._is_wrap_attributes_force_aligned || this._is_wrap_attributes_aligned_multiple || this._is_wrap_attributes_preserve_aligned) {
+    parser_token.alignment_size = raw_token.text.length + 1;
+  }
+
+  if (!parser_token.tag_complete && !parser_token.is_unformatted) {
+    printer.alignment_size = parser_token.alignment_size;
+  }
+
+  return parser_token;
+};
+
+var TagOpenParserToken = function(parent, raw_token) {
+  this.parent = parent || null;
+  this.text = '';
+  this.type = 'TK_TAG_OPEN';
+  this.tag_name = '';
+  this.is_inline_element = false;
+  this.is_unformatted = false;
+  this.is_content_unformatted = false;
+  this.is_empty_element = false;
+  this.is_start_tag = false;
+  this.is_end_tag = false;
+  this.indent_content = false;
+  this.multiline_content = false;
+  this.custom_beautifier_name = null;
+  this.start_tag_token = null;
+  this.attr_count = 0;
+  this.has_wrapped_attrs = false;
+  this.alignment_size = 0;
+  this.tag_complete = false;
+  this.tag_start_char = '';
+  this.tag_check = '';
+
+  if (!raw_token) {
+    this.tag_complete = true;
+  } else {
+    var tag_check_match;
+
+    this.tag_start_char = raw_token.text[0];
+    this.text = raw_token.text;
+
+    if (this.tag_start_char === '<') {
+      tag_check_match = raw_token.text.match(/^<([^\s>]*)/);
+      this.tag_check = tag_check_match ? tag_check_match[1] : '';
+    } else {
+      tag_check_match = raw_token.text.match(/^{{(?:[\^]|#\*?)?([^\s}]+)/);
+      this.tag_check = tag_check_match ? tag_check_match[1] : '';
+
+      // handle "{{#> myPartial}}
+      if (raw_token.text === '{{#>' && this.tag_check === '>' && raw_token.next !== null) {
+        this.tag_check = raw_token.next.text;
+      }
+    }
+    this.tag_check = this.tag_check.toLowerCase();
+
+    if (raw_token.type === TOKEN.COMMENT) {
+      this.tag_complete = true;
+    }
+
+    this.is_start_tag = this.tag_check.charAt(0) !== '/';
+    this.tag_name = !this.is_start_tag ? this.tag_check.substr(1) : this.tag_check;
+    this.is_end_tag = !this.is_start_tag ||
+      (raw_token.closed && raw_token.closed.text === '/>');
+
+    // handlebars tags that don't start with # or ^ are single_tags, and so also start and end.
+    this.is_end_tag = this.is_end_tag ||
+      (this.tag_start_char === '{' && (this.text.length < 3 || (/[^#\^]/.test(this.text.charAt(2)))));
+  }
+};
+
+Beautifier.prototype._get_tag_open_token = function(raw_token) { //function to get a full tag and parse its type
+  var parser_token = new TagOpenParserToken(this._tag_stack.get_parser_token(), raw_token);
+
+  parser_token.alignment_size = this._options.wrap_attributes_indent_size;
+
+  parser_token.is_end_tag = parser_token.is_end_tag ||
+    in_array(parser_token.tag_check, this._options.void_elements);
+
+  parser_token.is_empty_element = parser_token.tag_complete ||
+    (parser_token.is_start_tag && parser_token.is_end_tag);
+
+  parser_token.is_unformatted = !parser_token.tag_complete && in_array(parser_token.tag_check, this._options.unformatted);
+  parser_token.is_content_unformatted = !parser_token.is_empty_element && in_array(parser_token.tag_check, this._options.content_unformatted);
+  parser_token.is_inline_element = in_array(parser_token.tag_name, this._options.inline) || parser_token.tag_start_char === '{';
+
+  return parser_token;
+};
+
+Beautifier.prototype._set_tag_position = function(printer, raw_token, parser_token, last_tag_token, last_token) {
+
+  if (!parser_token.is_empty_element) {
+    if (parser_token.is_end_tag) { //this tag is a double tag so check for tag-ending
+      parser_token.start_tag_token = this._tag_stack.try_pop(parser_token.tag_name); //remove it and all ancestors
+    } else { // it's a start-tag
+      // check if this tag is starting an element that has optional end element
+      // and do an ending needed
+      if (this._do_optional_end_element(parser_token)) {
+        if (!parser_token.is_inline_element) {
+          printer.print_newline(false);
+        }
+      }
+
+      this._tag_stack.record_tag(parser_token); //push it on the tag stack
+
+      if ((parser_token.tag_name === 'script' || parser_token.tag_name === 'style') &&
+        !(parser_token.is_unformatted || parser_token.is_content_unformatted)) {
+        parser_token.custom_beautifier_name = get_custom_beautifier_name(parser_token.tag_check, raw_token);
+      }
+    }
+  }
+
+  if (in_array(parser_token.tag_check, this._options.extra_liners)) { //check if this double needs an extra line
+    printer.print_newline(false);
+    if (!printer._output.just_added_blankline()) {
+      printer.print_newline(true);
+    }
+  }
+
+  if (parser_token.is_empty_element) { //if this tag name is a single tag type (either in the list or has a closing /)
+
+    // if you hit an else case, reset the indent level if you are inside an:
+    // 'if', 'unless', or 'each' block.
+    if (parser_token.tag_start_char === '{' && parser_token.tag_check === 'else') {
+      this._tag_stack.indent_to_tag(['if', 'unless', 'each']);
+      parser_token.indent_content = true;
+      // Don't add a newline if opening {{#if}} tag is on the current line
+      var foundIfOnCurrentLine = printer.current_line_has_match(/{{#if/);
+      if (!foundIfOnCurrentLine) {
+        printer.print_newline(false);
+      }
+    }
+
+    // Don't add a newline before elements that should remain where they are.
+    if (parser_token.tag_name === '!--' && last_token.type === TOKEN.TAG_CLOSE &&
+      last_tag_token.is_end_tag && parser_token.text.indexOf('\n') === -1) {
+      //Do nothing. Leave comments on same line.
+    } else {
+      if (!(parser_token.is_inline_element || parser_token.is_unformatted)) {
+        printer.print_newline(false);
+      }
+      this._calcluate_parent_multiline(printer, parser_token);
+    }
+  } else if (parser_token.is_end_tag) { //this tag is a double tag so check for tag-ending
+    var do_end_expand = false;
+
+    // deciding whether a block is multiline should not be this hard
+    do_end_expand = parser_token.start_tag_token && parser_token.start_tag_token.multiline_content;
+    do_end_expand = do_end_expand || (!parser_token.is_inline_element &&
+      !(last_tag_token.is_inline_element || last_tag_token.is_unformatted) &&
+      !(last_token.type === TOKEN.TAG_CLOSE && parser_token.start_tag_token === last_tag_token) &&
+      last_token.type !== 'TK_CONTENT'
+    );
+
+    if (parser_token.is_content_unformatted || parser_token.is_unformatted) {
+      do_end_expand = false;
+    }
+
+    if (do_end_expand) {
+      printer.print_newline(false);
+    }
+  } else { // it's a start-tag
+    parser_token.indent_content = !parser_token.custom_beautifier_name;
+
+    if (parser_token.tag_start_char === '<') {
+      if (parser_token.tag_name === 'html') {
+        parser_token.indent_content = this._options.indent_inner_html;
+      } else if (parser_token.tag_name === 'head') {
+        parser_token.indent_content = this._options.indent_head_inner_html;
+      } else if (parser_token.tag_name === 'body') {
+        parser_token.indent_content = this._options.indent_body_inner_html;
+      }
+    }
+
+    if (!(parser_token.is_inline_element || parser_token.is_unformatted) &&
+      (last_token.type !== 'TK_CONTENT' || parser_token.is_content_unformatted)) {
+      printer.print_newline(false);
+    }
+
+    this._calcluate_parent_multiline(printer, parser_token);
+  }
+};
+
+Beautifier.prototype._calcluate_parent_multiline = function(printer, parser_token) {
+  if (parser_token.parent && printer._output.just_added_newline() &&
+    !((parser_token.is_inline_element || parser_token.is_unformatted) && parser_token.parent.is_inline_element)) {
+    parser_token.parent.multiline_content = true;
+  }
+};
+
+//To be used for <p> tag special case:
+var p_closers = ['address', 'article', 'aside', 'blockquote', 'details', 'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'main', 'nav', 'ol', 'p', 'pre', 'section', 'table', 'ul'];
+var p_parent_excludes = ['a', 'audio', 'del', 'ins', 'map', 'noscript', 'video'];
+
+Beautifier.prototype._do_optional_end_element = function(parser_token) {
+  var result = null;
+  // NOTE: cases of "if there is no more content in the parent element"
+  // are handled automatically by the beautifier.
+  // It assumes parent or ancestor close tag closes all children.
+  // https://www.w3.org/TR/html5/syntax.html#optional-tags
+  if (parser_token.is_empty_element || !parser_token.is_start_tag || !parser_token.parent) {
+    return;
+
+  }
+
+  if (parser_token.tag_name === 'body') {
+    // A head element’s end tag may be omitted if the head element is not immediately followed by a space character or a comment.
+    result = result || this._tag_stack.try_pop('head');
+
+    //} else if (parser_token.tag_name === 'body') {
+    // DONE: A body element’s end tag may be omitted if the body element is not immediately followed by a comment.
+
+  } else if (parser_token.tag_name === 'li') {
+    // An li element’s end tag may be omitted if the li element is immediately followed by another li element or if there is no more content in the parent element.
+    result = result || this._tag_stack.try_pop('li', ['ol', 'ul']);
+
+  } else if (parser_token.tag_name === 'dd' || parser_token.tag_name === 'dt') {
+    // A dd element’s end tag may be omitted if the dd element is immediately followed by another dd element or a dt element, or if there is no more content in the parent element.
+    // A dt element’s end tag may be omitted if the dt element is immediately followed by another dt element or a dd element.
+    result = result || this._tag_stack.try_pop('dt', ['dl']);
+    result = result || this._tag_stack.try_pop('dd', ['dl']);
+
+
+  } else if (parser_token.parent.tag_name === 'p' && p_closers.indexOf(parser_token.tag_name) !== -1) {
+    // IMPORTANT: this else-if works because p_closers has no overlap with any other element we look for in this method
+    // check for the parent element is an HTML element that is not an <a>, <audio>, <del>, <ins>, <map>, <noscript>, or <video> element,  or an autonomous custom element.
+    // To do this right, this needs to be coded as an inclusion of the inverse of the exclusion above.
+    // But to start with (if we ignore "autonomous custom elements") the exclusion would be fine.
+    var p_parent = parser_token.parent.parent;
+    if (!p_parent || p_parent_excludes.indexOf(p_parent.tag_name) === -1) {
+      result = result || this._tag_stack.try_pop('p');
+    }
+  } else if (parser_token.tag_name === 'rp' || parser_token.tag_name === 'rt') {
+    // An rt element’s end tag may be omitted if the rt element is immediately followed by an rt or rp element, or if there is no more content in the parent element.
+    // An rp element’s end tag may be omitted if the rp element is immediately followed by an rt or rp element, or if there is no more content in the parent element.
+    result = result || this._tag_stack.try_pop('rt', ['ruby', 'rtc']);
+    result = result || this._tag_stack.try_pop('rp', ['ruby', 'rtc']);
+
+  } else if (parser_token.tag_name === 'optgroup') {
+    // An optgroup element’s end tag may be omitted if the optgroup element is immediately followed by another optgroup element, or if there is no more content in the parent element.
+    // An option element’s end tag may be omitted if the option element is immediately followed by another option element, or if it is immediately followed by an optgroup element, or if there is no more content in the parent element.
+    result = result || this._tag_stack.try_pop('optgroup', ['select']);
+    //result = result || this._tag_stack.try_pop('option', ['select']);
+
+  } else if (parser_token.tag_name === 'option') {
+    // An option element’s end tag may be omitted if the option element is immediately followed by another option element, or if it is immediately followed by an optgroup element, or if there is no more content in the parent element.
+    result = result || this._tag_stack.try_pop('option', ['select', 'datalist', 'optgroup']);
+
+  } else if (parser_token.tag_name === 'colgroup') {
+    // DONE: A colgroup element’s end tag may be omitted if the colgroup element is not immediately followed by a space character or a comment.
+    // A caption element's end tag may be ommitted if a colgroup, thead, tfoot, tbody, or tr element is started.
+    result = result || this._tag_stack.try_pop('caption', ['table']);
+
+  } else if (parser_token.tag_name === 'thead') {
+    // A colgroup element's end tag may be ommitted if a thead, tfoot, tbody, or tr element is started.
+    // A caption element's end tag may be ommitted if a colgroup, thead, tfoot, tbody, or tr element is started.
+    result = result || this._tag_stack.try_pop('caption', ['table']);
+    result = result || this._tag_stack.try_pop('colgroup', ['table']);
+
+    //} else if (parser_token.tag_name === 'caption') {
+    // DONE: A caption element’s end tag may be omitted if the caption element is not immediately followed by a space character or a comment.
+
+  } else if (parser_token.tag_name === 'tbody' || parser_token.tag_name === 'tfoot') {
+    // A thead element’s end tag may be omitted if the thead element is immediately followed by a tbody or tfoot element.
+    // A tbody element’s end tag may be omitted if the tbody element is immediately followed by a tbody or tfoot element, or if there is no more content in the parent element.
+    // A colgroup element's end tag may be ommitted if a thead, tfoot, tbody, or tr element is started.
+    // A caption element's end tag may be ommitted if a colgroup, thead, tfoot, tbody, or tr element is started.
+    result = result || this._tag_stack.try_pop('caption', ['table']);
+    result = result || this._tag_stack.try_pop('colgroup', ['table']);
+    result = result || this._tag_stack.try_pop('thead', ['table']);
+    result = result || this._tag_stack.try_pop('tbody', ['table']);
+
+    //} else if (parser_token.tag_name === 'tfoot') {
+    // DONE: A tfoot element’s end tag may be omitted if there is no more content in the parent element.
+
+  } else if (parser_token.tag_name === 'tr') {
+    // A tr element’s end tag may be omitted if the tr element is immediately followed by another tr element, or if there is no more content in the parent element.
+    // A colgroup element's end tag may be ommitted if a thead, tfoot, tbody, or tr element is started.
+    // A caption element's end tag may be ommitted if a colgroup, thead, tfoot, tbody, or tr element is started.
+    result = result || this._tag_stack.try_pop('caption', ['table']);
+    result = result || this._tag_stack.try_pop('colgroup', ['table']);
+    result = result || this._tag_stack.try_pop('tr', ['table', 'thead', 'tbody', 'tfoot']);
+
+  } else if (parser_token.tag_name === 'th' || parser_token.tag_name === 'td') {
+    // A td element’s end tag may be omitted if the td element is immediately followed by a td or th element, or if there is no more content in the parent element.
+    // A th element’s end tag may be omitted if the th element is immediately followed by a td or th element, or if there is no more content in the parent element.
+    result = result || this._tag_stack.try_pop('td', ['table', 'thead', 'tbody', 'tfoot', 'tr']);
+    result = result || this._tag_stack.try_pop('th', ['table', 'thead', 'tbody', 'tfoot', 'tr']);
+  }
+
+  // Start element omission not handled currently
+  // A head element’s start tag may be omitted if the element is empty, or if the first thing inside the head element is an element.
+  // A tbody element’s start tag may be omitted if the first thing inside the tbody element is a tr element, and if the element is not immediately preceded by a tbody, thead, or tfoot element whose end tag has been omitted. (It can’t be omitted if the element is empty.)
+  // A colgroup element’s start tag may be omitted if the first thing inside the colgroup element is a col element, and if the element is not immediately preceded by another colgroup element whose end tag has been omitted. (It can’t be omitted if the element is empty.)
+
+  // Fix up the parent of the parser token
+  parser_token.parent = this._tag_stack.get_parser_token();
+
+  return result;
+};
+
+module.exports.Beautifier = Beautifier;
+
+
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var BaseOptions = __webpack_require__(6).Options;
+
+function Options(options) {
+  BaseOptions.call(this, options, 'html');
+  if (this.templating.length === 1 && this.templating[0] === 'auto') {
+    this.templating = ['django', 'erb', 'handlebars', 'php'];
+  }
+
+  this.indent_inner_html = this._get_boolean('indent_inner_html');
+  this.indent_body_inner_html = this._get_boolean('indent_body_inner_html', true);
+  this.indent_head_inner_html = this._get_boolean('indent_head_inner_html', true);
+
+  this.indent_handlebars = this._get_boolean('indent_handlebars', true);
+  this.wrap_attributes = this._get_selection('wrap_attributes',
+    ['auto', 'force', 'force-aligned', 'force-expand-multiline', 'aligned-multiple', 'preserve', 'preserve-aligned']);
+  this.wrap_attributes_indent_size = this._get_number('wrap_attributes_indent_size', this.indent_size);
+  this.extra_liners = this._get_array('extra_liners', ['head', 'body', '/html']);
+
+  // Block vs inline elements
+  // https://developer.mozilla.org/en-US/docs/Web/HTML/Block-level_elements
+  // https://developer.mozilla.org/en-US/docs/Web/HTML/Inline_elements
+  // https://www.w3.org/TR/html5/dom.html#phrasing-content
+  this.inline = this._get_array('inline', [
+    'a', 'abbr', 'area', 'audio', 'b', 'bdi', 'bdo', 'br', 'button', 'canvas', 'cite',
+    'code', 'data', 'datalist', 'del', 'dfn', 'em', 'embed', 'i', 'iframe', 'img',
+    'input', 'ins', 'kbd', 'keygen', 'label', 'map', 'mark', 'math', 'meter', 'noscript',
+    'object', 'output', 'progress', 'q', 'ruby', 's', 'samp', /* 'script', */ 'select', 'small',
+    'span', 'strong', 'sub', 'sup', 'svg', 'template', 'textarea', 'time', 'u', 'var',
+    'video', 'wbr', 'text',
+    // obsolete inline tags
+    'acronym', 'big', 'strike', 'tt'
+  ]);
+  this.void_elements = this._get_array('void_elements', [
+    // HTLM void elements - aka self-closing tags - aka singletons
+    // https://www.w3.org/html/wg/drafts/html/master/syntax.html#void-elements
+    'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
+    'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
+    // NOTE: Optional tags are too complex for a simple list
+    // they are hard coded in _do_optional_end_element
+
+    // Doctype and xml elements
+    '!doctype', '?xml',
+
+    // obsolete tags
+    // basefont: https://www.computerhope.com/jargon/h/html-basefont-tag.htm
+    // isndex: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/isindex
+    'basefont', 'isindex'
+  ]);
+  this.unformatted = this._get_array('unformatted', []);
+  this.content_unformatted = this._get_array('content_unformatted', [
+    'pre', 'textarea'
+  ]);
+  this.unformatted_content_delimiter = this._get_characters('unformatted_content_delimiter');
+  this.indent_scripts = this._get_selection('indent_scripts', ['normal', 'keep', 'separate']);
+
+}
+Options.prototype = new BaseOptions();
+
+
+
+module.exports.Options = Options;
+
+
+/***/ }),
+/* 21 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var BaseTokenizer = __webpack_require__(9).Tokenizer;
+var BASETOKEN = __webpack_require__(9).TOKEN;
+var Directives = __webpack_require__(13).Directives;
+var TemplatablePattern = __webpack_require__(14).TemplatablePattern;
+var Pattern = __webpack_require__(12).Pattern;
+
+var TOKEN = {
+  TAG_OPEN: 'TK_TAG_OPEN',
+  TAG_CLOSE: 'TK_TAG_CLOSE',
+  ATTRIBUTE: 'TK_ATTRIBUTE',
+  EQUALS: 'TK_EQUALS',
+  VALUE: 'TK_VALUE',
+  COMMENT: 'TK_COMMENT',
+  TEXT: 'TK_TEXT',
+  UNKNOWN: 'TK_UNKNOWN',
+  START: BASETOKEN.START,
+  RAW: BASETOKEN.RAW,
+  EOF: BASETOKEN.EOF
+};
+
+var directives_core = new Directives(/<\!--/, /-->/);
+
+var Tokenizer = function(input_string, options) {
+  BaseTokenizer.call(this, input_string, options);
+  this._current_tag_name = '';
+
+  // Words end at whitespace or when a tag starts
+  // if we are indenting handlebars, they are considered tags
+  var templatable_reader = new TemplatablePattern(this._input).read_options(this._options);
+  var pattern_reader = new Pattern(this._input);
+
+  this.__patterns = {
+    word: templatable_reader.until(/[\n\r\t <]/),
+    single_quote: templatable_reader.until_after(/'/),
+    double_quote: templatable_reader.until_after(/"/),
+    attribute: templatable_reader.until(/[\n\r\t =>]|\/>/),
+    element_name: templatable_reader.until(/[\n\r\t >\/]/),
+
+    handlebars_comment: pattern_reader.starting_with(/{{!--/).until_after(/--}}/),
+    handlebars: pattern_reader.starting_with(/{{/).until_after(/}}/),
+    handlebars_open: pattern_reader.until(/[\n\r\t }]/),
+    handlebars_raw_close: pattern_reader.until(/}}/),
+    comment: pattern_reader.starting_with(/<!--/).until_after(/-->/),
+    cdata: pattern_reader.starting_with(/<!\[CDATA\[/).until_after(/]]>/),
+    // https://en.wikipedia.org/wiki/Conditional_comment
+    conditional_comment: pattern_reader.starting_with(/<!\[/).until_after(/]>/),
+    processing: pattern_reader.starting_with(/<\?/).until_after(/\?>/)
+  };
+
+  if (this._options.indent_handlebars) {
+    this.__patterns.word = this.__patterns.word.exclude('handlebars');
+  }
+
+  this._unformatted_content_delimiter = null;
+
+  if (this._options.unformatted_content_delimiter) {
+    var literal_regexp = this._input.get_literal_regexp(this._options.unformatted_content_delimiter);
+    this.__patterns.unformatted_content_delimiter =
+      pattern_reader.matching(literal_regexp)
+      .until_after(literal_regexp);
+  }
+};
+Tokenizer.prototype = new BaseTokenizer();
+
+Tokenizer.prototype._is_comment = function(current_token) { // jshint unused:false
+  return false; //current_token.type === TOKEN.COMMENT || current_token.type === TOKEN.UNKNOWN;
+};
+
+Tokenizer.prototype._is_opening = function(current_token) {
+  return current_token.type === TOKEN.TAG_OPEN;
+};
+
+Tokenizer.prototype._is_closing = function(current_token, open_token) {
+  return current_token.type === TOKEN.TAG_CLOSE &&
+    (open_token && (
+      ((current_token.text === '>' || current_token.text === '/>') && open_token.text[0] === '<') ||
+      (current_token.text === '}}' && open_token.text[0] === '{' && open_token.text[1] === '{')));
+};
+
+Tokenizer.prototype._reset = function() {
+  this._current_tag_name = '';
+};
+
+Tokenizer.prototype._get_next_token = function(previous_token, open_token) { // jshint unused:false
+  var token = null;
+  this._readWhitespace();
+  var c = this._input.peek();
+
+  if (c === null) {
+    return this._create_token(TOKEN.EOF, '');
+  }
+
+  token = token || this._read_open_handlebars(c, open_token);
+  token = token || this._read_attribute(c, previous_token, open_token);
+  token = token || this._read_close(c, open_token);
+  token = token || this._read_raw_content(c, previous_token, open_token);
+  token = token || this._read_content_word(c);
+  token = token || this._read_comment_or_cdata(c);
+  token = token || this._read_processing(c);
+  token = token || this._read_open(c, open_token);
+  token = token || this._create_token(TOKEN.UNKNOWN, this._input.next());
+
+  return token;
+};
+
+Tokenizer.prototype._read_comment_or_cdata = function(c) { // jshint unused:false
+  var token = null;
+  var resulting_string = null;
+  var directives = null;
+
+  if (c === '<') {
+    var peek1 = this._input.peek(1);
+    // We treat all comments as literals, even more than preformatted tags
+    // we only look for the appropriate closing marker
+    if (peek1 === '!') {
+      resulting_string = this.__patterns.comment.read();
+
+      // only process directive on html comments
+      if (resulting_string) {
+        directives = directives_core.get_directives(resulting_string);
+        if (directives && directives.ignore === 'start') {
+          resulting_string += directives_core.readIgnored(this._input);
+        }
+      } else {
+        resulting_string = this.__patterns.cdata.read();
+      }
+    }
+
+    if (resulting_string) {
+      token = this._create_token(TOKEN.COMMENT, resulting_string);
+      token.directives = directives;
+    }
+  }
+
+  return token;
+};
+
+Tokenizer.prototype._read_processing = function(c) { // jshint unused:false
+  var token = null;
+  var resulting_string = null;
+  var directives = null;
+
+  if (c === '<') {
+    var peek1 = this._input.peek(1);
+    if (peek1 === '!' || peek1 === '?') {
+      resulting_string = this.__patterns.conditional_comment.read();
+      resulting_string = resulting_string || this.__patterns.processing.read();
+    }
+
+    if (resulting_string) {
+      token = this._create_token(TOKEN.COMMENT, resulting_string);
+      token.directives = directives;
+    }
+  }
+
+  return token;
+};
+
+Tokenizer.prototype._read_open = function(c, open_token) {
+  var resulting_string = null;
+  var token = null;
+  if (!open_token) {
+    if (c === '<') {
+
+      resulting_string = this._input.next();
+      if (this._input.peek() === '/') {
+        resulting_string += this._input.next();
+      }
+      resulting_string += this.__patterns.element_name.read();
+      token = this._create_token(TOKEN.TAG_OPEN, resulting_string);
+    }
+  }
+  return token;
+};
+
+Tokenizer.prototype._read_open_handlebars = function(c, open_token) {
+  var resulting_string = null;
+  var token = null;
+  if (!open_token) {
+    if (this._options.indent_handlebars && c === '{' && this._input.peek(1) === '{') {
+      if (this._input.peek(2) === '!') {
+        resulting_string = this.__patterns.handlebars_comment.read();
+        resulting_string = resulting_string || this.__patterns.handlebars.read();
+        token = this._create_token(TOKEN.COMMENT, resulting_string);
+      } else {
+        resulting_string = this.__patterns.handlebars_open.read();
+        token = this._create_token(TOKEN.TAG_OPEN, resulting_string);
+      }
+    }
+  }
+  return token;
+};
+
+
+Tokenizer.prototype._read_close = function(c, open_token) {
+  var resulting_string = null;
+  var token = null;
+  if (open_token) {
+    if (open_token.text[0] === '<' && (c === '>' || (c === '/' && this._input.peek(1) === '>'))) {
+      resulting_string = this._input.next();
+      if (c === '/') { //  for close tag "/>"
+        resulting_string += this._input.next();
+      }
+      token = this._create_token(TOKEN.TAG_CLOSE, resulting_string);
+    } else if (open_token.text[0] === '{' && c === '}' && this._input.peek(1) === '}') {
+      this._input.next();
+      this._input.next();
+      token = this._create_token(TOKEN.TAG_CLOSE, '}}');
+    }
+  }
+
+  return token;
+};
+
+Tokenizer.prototype._read_attribute = function(c, previous_token, open_token) {
+  var token = null;
+  var resulting_string = '';
+  if (open_token && open_token.text[0] === '<') {
+
+    if (c === '=') {
+      token = this._create_token(TOKEN.EQUALS, this._input.next());
+    } else if (c === '"' || c === "'") {
+      var content = this._input.next();
+      if (c === '"') {
+        content += this.__patterns.double_quote.read();
+      } else {
+        content += this.__patterns.single_quote.read();
+      }
+      token = this._create_token(TOKEN.VALUE, content);
+    } else {
+      resulting_string = this.__patterns.attribute.read();
+
+      if (resulting_string) {
+        if (previous_token.type === TOKEN.EQUALS) {
+          token = this._create_token(TOKEN.VALUE, resulting_string);
+        } else {
+          token = this._create_token(TOKEN.ATTRIBUTE, resulting_string);
         }
-        return multi_parser.output.join('');
+      }
+    }
+  }
+  return token;
+};
+
+Tokenizer.prototype._is_content_unformatted = function(tag_name) {
+  // void_elements have no content and so cannot have unformatted content
+  // script and style tags should always be read as unformatted content
+  // finally content_unformatted and unformatted element contents are unformatted
+  return this._options.void_elements.indexOf(tag_name) === -1 &&
+    (this._options.content_unformatted.indexOf(tag_name) !== -1 ||
+      this._options.unformatted.indexOf(tag_name) !== -1);
+};
+
+
+Tokenizer.prototype._read_raw_content = function(c, previous_token, open_token) { // jshint unused:false
+  var resulting_string = '';
+  if (open_token && open_token.text[0] === '{') {
+    resulting_string = this.__patterns.handlebars_raw_close.read();
+  } else if (previous_token.type === TOKEN.TAG_CLOSE &&
+    previous_token.opened.text[0] === '<' && previous_token.text[0] !== '/') {
+    // ^^ empty tag has no content 
+    var tag_name = previous_token.opened.text.substr(1).toLowerCase();
+    if (tag_name === 'script' || tag_name === 'style') {
+      // Script and style tags are allowed to have comments wrapping their content
+      // or just have regular content.
+      var token = this._read_comment_or_cdata(c);
+      if (token) {
+        token.type = TOKEN.TEXT;
+        return token;
+      }
+      resulting_string = this._input.readUntil(new RegExp('</' + tag_name + '[\\n\\r\\t ]*?>', 'ig'));
+    } else if (this._is_content_unformatted(tag_name)) {
+
+      resulting_string = this._input.readUntil(new RegExp('</' + tag_name + '[\\n\\r\\t ]*?>', 'ig'));
+    }
+  }
+
+  if (resulting_string) {
+    return this._create_token(TOKEN.TEXT, resulting_string);
+  }
+
+  return null;
+};
+
+Tokenizer.prototype._read_content_word = function(c) {
+  var resulting_string = '';
+  if (this._options.unformatted_content_delimiter) {
+    if (c === this._options.unformatted_content_delimiter[0]) {
+      resulting_string = this.__patterns.unformatted_content_delimiter.read();
     }
+  }
 
-    var beautify = require('devtools/shared/jsbeautify/beautify');
+  if (!resulting_string) {
+    resulting_string = this.__patterns.word.read();
+  }
+  if (resulting_string) {
+    return this._create_token(TOKEN.TEXT, resulting_string);
+  }
+};
+
+module.exports.Tokenizer = Tokenizer;
+module.exports.TOKEN = TOKEN;
+
+
+/***/ })
+/******/ ]);
+var style_html = legacy_beautify_html;
+/* Footer */
+if (typeof define === "function" && define.amd) {
+    // Add support for AMD ( https://github.com/amdjs/amdjs-api/wiki/AMD#defineamd-property- )
+    define(["require", "./beautify", "./beautify-css"], function(requireamd) {
+        var js_beautify = requireamd("./beautify");
+        var css_beautify = requireamd("./beautify-css");
+
+        return {
+            html_beautify: function(html_source, options) {
+                return style_html(html_source, options, js_beautify.js_beautify, css_beautify.css_beautify);
+            }
+        };
+    });
+} else if (typeof exports !== "undefined") {
+    // Add support for CommonJS. Just put this file somewhere on your require.paths
+    // and you will be able to `var html_beautify = require("beautify").html_beautify`.
+    var js_beautify = require('./beautify-js.js');
+    var css_beautify = require('./beautify-css.js');
 
-    exports.htmlBeautify = function(html_source, options) {
-        return style_html(html_source, options, beautify.js, beautify.css);
+    exports.html_beautify = function(html_source, options) {
+        return style_html(html_source, options, js_beautify.js_beautify, css_beautify.css_beautify);
+    };
+} else if (typeof window !== "undefined") {
+    // If we're running a web page and don't have either of the above, add our one global
+    window.html_beautify = function(html_source, options) {
+        return style_html(html_source, options, window.js_beautify, window.css_beautify);
     };
+} else if (typeof global !== "undefined") {
+    // If we don't even have window, try global.
+    global.html_beautify = function(html_source, options) {
+        return style_html(html_source, options, global.js_beautify, global.css_beautify);
+    };
+}
+
 }());
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-js.js firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-js.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-js.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-js.js	2021-01-18 19:58:08.000000000 +0000
@@ -1,14 +1,9 @@
-/*jshint curly:true, eqeqeq:true, laxbreak:true, noempty:false */
-
-"use strict";
-
-const acorn = require("acorn/acorn");
-
+/* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
   The MIT License (MIT)
 
-  Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation files
@@ -34,12 +29,12 @@
 ---------------
 
 
-  Written by Einar Lielmanis, <einar@jsbeautifier.org>
-      http://jsbeautifier.org/
+  Written by Einar Lielmanis, <einar@beautifier.io>
+      https://beautifier.io/
 
   Originally converted to javascript by Vital, <vital76@gmail.com>
   "End braces on own line" added by Chris J. Shull, <chrisjshull@gmail.com>
-  Parsing improvements for brace-less statements by Liam Newman <bitwiseman@gmail.com>
+  Parsing improvements for brace-less statements by Liam Newman <bitwiseman@beautifier.io>
 
 
   Usage:
@@ -54,12 +49,21 @@
 
     jslint_happy (default false) - if true, then jslint-stricter mode is enforced.
 
-            jslint_happy       !jslint_happy
+            jslint_happy        !jslint_happy
             ---------------------------------
-            function ()        function()
+            function ()         function()
 
-    brace_style (default "collapse") - "collapse" | "expand" | "end-expand"
-            put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line.
+            switch () {         switch() {
+            case 1:               case 1:
+              break;                break;
+            }                   }
+
+    space_after_anon_function (default false) - should the space before an anonymous function's parens be added, "function()" vs "function ()",
+          NOTE: This option is overriden by jslint_happy (i.e. if jslint_happy is true, space_after_anon_function is true by design)
+
+    brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none" | any of the former + ",preserve-inline"
+            put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line, or attempt to keep them where they are.
+            preserve-inline will try to preserve inline blocks of curly braces
 
     space_before_conditional (default true) - should the space before conditional statement be added, "if(true)" vs "if (true)",
 
@@ -69,6 +73,9 @@
           NOTE: This is not a hard limit. Lines will continue until a point where a newline would
                 be preserved if it were present.
 
+    end_with_newline (default false)  - end output with a newline
+
+
     e.g
 
     js_beautify(js_source_text, {
@@ -78,1584 +85,3961 @@
 
 */
 
-var js_beautify = function js_beautify(js_source_text, options) {
-    var beautifier = new Beautifier(js_source_text, options);
-    return beautifier.beautify();
-};
-
-exports.jsBeautify = js_beautify;
-
-function Beautifier(js_source_text, options) {
-    var input, output_lines;
-    var token_text, token_type, last_type, last_last_text, indent_string;
-    var flags, previous_flags, flag_store;
-    var whitespace, wordchar, punct, parser_pos, line_starters, reserved_words, digits;
-    var prefix;
-    var input_wanted_newline;
-    var output_space_before_token;
-    var input_length, n_newlines, whitespace_before_token;
-    var handlers, MODE, opt;
-    var preindent_string = '';
-
-
-
-    whitespace = "\n\r\t ".split('');
-    wordchar = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$'.split('');
-    digits = '0123456789'.split('');
-
-    punct = '+ - * / % & ++ -- = += -= *= /= %= == === != !== > < >= <= >> << >>> >>>= >>= <<= && &= | || ! ~ , : ? ^ ^= |= :: =>';
-    punct += ' <%= <% %> <?= <? ?>'; // try to be a good boy and try not to break the markup language identifiers
-    punct = punct.split(' ');
-
-    // words which should always start on new line.
-    line_starters = 'continue,try,throw,return,var,let,const,if,switch,case,default,for,while,break,function,yield'.split(',');
-    reserved_words = line_starters.concat(['do', 'in', 'else', 'get', 'set', 'new', 'catch', 'finally', 'typeof']);
-
-
-    MODE = {
-        BlockStatement: 'BlockStatement', // 'BLOCK'
-        Statement: 'Statement', // 'STATEMENT'
-        ObjectLiteral: 'ObjectLiteral', // 'OBJECT',
-        ArrayLiteral: 'ArrayLiteral', //'[EXPRESSION]',
-        ForInitializer: 'ForInitializer', //'(FOR-EXPRESSION)',
-        Conditional: 'Conditional', //'(COND-EXPRESSION)',
-        Expression: 'Expression' //'(EXPRESSION)'
-    };
-
-    handlers = {
-        'TK_START_EXPR': handle_start_expr,
-        'TK_END_EXPR': handle_end_expr,
-        'TK_START_BLOCK': handle_start_block,
-        'TK_END_BLOCK': handle_end_block,
-        'TK_WORD': handle_word,
-        'TK_RESERVED': handle_word,
-        'TK_SEMICOLON': handle_semicolon,
-        'TK_STRING': handle_string,
-        'TK_EQUALS': handle_equals,
-        'TK_OPERATOR': handle_operator,
-        'TK_COMMA': handle_comma,
-        'TK_BLOCK_COMMENT': handle_block_comment,
-        'TK_INLINE_COMMENT': handle_inline_comment,
-        'TK_COMMENT': handle_comment,
-        'TK_DOT': handle_dot,
-        'TK_UNKNOWN': handle_unknown
-    };
-
-    function create_flags(flags_base, mode) {
-        var next_indent_level = 0;
-        if (flags_base) {
-            next_indent_level = flags_base.indentation_level;
-            if (!just_added_newline() &&
-                flags_base.line_indent_level > next_indent_level) {
-                next_indent_level = flags_base.line_indent_level;
-            }
-        }
-
-        var next_flags = {
-            mode: mode,
-            parent: flags_base,
-            last_text: flags_base ? flags_base.last_text : '', // last token text
-            last_word: flags_base ? flags_base.last_word : '', // last 'TK_WORD' passed
-            declaration_statement: false,
-            declaration_assignment: false,
-            in_html_comment: false,
-            multiline_frame: false,
-            if_block: false,
-            else_block: false,
-            do_block: false,
-            do_while: false,
-            in_case_statement: false, // switch(..){ INSIDE HERE }
-            in_case: false, // we're on the exact line with "case 0:"
-            case_body: false, // the indented case-action block
-            indentation_level: next_indent_level,
-            line_indent_level: flags_base ? flags_base.line_indent_level : next_indent_level,
-            start_line_index: output_lines.length,
-            had_comment: false,
-            ternary_depth: 0
-        };
-        return next_flags;
-    }
-
-    // Using object instead of string to allow for later expansion of info about each line
-
-    function create_output_line() {
-        return {
-            text: []
-        };
-    }
-
-    // Some interpreters have unexpected results with foo = baz || bar;
-    options = options ? options : {};
-    opt = {};
-
-    // compatibility
-    if (options.space_after_anon_function !== undefined && options.jslint_happy === undefined) {
-        options.jslint_happy = options.space_after_anon_function;
-    }
-    if (options.braces_on_own_line !== undefined) { //graceful handling of deprecated option
-        opt.brace_style = options.braces_on_own_line ? "expand" : "collapse";
-    }
-    opt.brace_style = options.brace_style ? options.brace_style : (opt.brace_style ? opt.brace_style : "collapse");
-
-    // graceful handling of deprecated option
-    if (opt.brace_style === "expand-strict") {
-        opt.brace_style = "expand";
-    }
-
-
-    opt.indent_size = options.indent_size ? parseInt(options.indent_size, 10) : 4;
-    opt.indent_char = options.indent_char ? options.indent_char : ' ';
-    opt.preserve_newlines = (options.preserve_newlines === undefined) ? true : options.preserve_newlines;
-    opt.break_chained_methods = (options.break_chained_methods === undefined) ? false : options.break_chained_methods;
-    opt.max_preserve_newlines = (options.max_preserve_newlines === undefined) ? 0 : parseInt(options.max_preserve_newlines, 10);
-    opt.space_in_paren = (options.space_in_paren === undefined) ? false : options.space_in_paren;
-    opt.space_in_empty_paren = (options.space_in_empty_paren === undefined) ? false : options.space_in_empty_paren;
-    opt.jslint_happy = (options.jslint_happy === undefined) ? false : options.jslint_happy;
-    opt.keep_array_indentation = (options.keep_array_indentation === undefined) ? false : options.keep_array_indentation;
-    opt.space_before_conditional = (options.space_before_conditional === undefined) ? true : options.space_before_conditional;
-    opt.unescape_strings = (options.unescape_strings === undefined) ? false : options.unescape_strings;
-    opt.wrap_line_length = (options.wrap_line_length === undefined) ? 0 : parseInt(options.wrap_line_length, 10);
-    opt.e4x = (options.e4x === undefined) ? false : options.e4x;
-
-    if(options.indent_with_tabs){
-        opt.indent_char = '\t';
-        opt.indent_size = 1;
-    }
-
-    //----------------------------------
-    indent_string = '';
-    while (opt.indent_size > 0) {
-        indent_string += opt.indent_char;
-        opt.indent_size -= 1;
-    }
-
-    while (js_source_text && (js_source_text.charAt(0) === ' ' || js_source_text.charAt(0) === '\t')) {
-        preindent_string += js_source_text.charAt(0);
-        js_source_text = js_source_text.substring(1);
-    }
-    input = js_source_text;
-    // cache the source's length.
-    input_length = js_source_text.length;
-
-    last_type = 'TK_START_BLOCK'; // last token type
-    last_last_text = ''; // pre-last token text
-    output_lines = [create_output_line()];
-    output_space_before_token = false;
-    whitespace_before_token = [];
-
-    // Stack of parsing/formatting states, including MODE.
-    // We tokenize, parse, and output in an almost purely a forward-only stream of token input
-    // and formatted output.  This makes the beautifier less accurate than full parsers
-    // but also far more tolerant of syntax errors.
-    //
-    // For example, the default mode is MODE.BlockStatement. If we see a '{' we push a new frame of type
-    // MODE.BlockStatement on the the stack, even though it could be object literal.  If we later
-    // encounter a ":", we'll switch to to MODE.ObjectLiteral.  If we then see a ";",
-    // most full parsers would die, but the beautifier gracefully falls back to
-    // MODE.BlockStatement and continues on.
-    flag_store = [];
-    set_mode(MODE.BlockStatement);
-
-    parser_pos = 0;
-
-    this.beautify = function() {
-        /*jshint onevar:true */
-        var t, i, keep_whitespace, sweet_code;
-
-        while (true) {
-            t = get_next_token();
-            token_text = t[0];
-            token_type = t[1];
-
-            if (token_type === 'TK_EOF') {
-                // Unwind any open statements
-                while (flags.mode === MODE.Statement) {
-                    restore_mode();
-                }
-                break;
-            }
-
-            keep_whitespace = opt.keep_array_indentation && is_array(flags.mode);
-            input_wanted_newline = n_newlines > 0;
-
-            if (keep_whitespace) {
-                for (i = 0; i < n_newlines; i += 1) {
-                    print_newline(i > 0);
-                }
-            } else {
-                if (opt.max_preserve_newlines && n_newlines > opt.max_preserve_newlines) {
-                    n_newlines = opt.max_preserve_newlines;
-                }
-
-                if (opt.preserve_newlines) {
-                    if (n_newlines > 1) {
-                        print_newline();
-                        for (i = 1; i < n_newlines; i += 1) {
-                            print_newline(true);
-                        }
-                    }
-                }
-            }
-
-            handlers[token_type]();
-
-            // The cleanest handling of inline comments is to treat them as though they aren't there.
-            // Just continue formatting and the behavior should be logical.
-            // Also ignore unknown tokens.  Again, this should result in better behavior.
-            if (token_type !== 'TK_INLINE_COMMENT' && token_type !== 'TK_COMMENT' &&
-                token_type !== 'TK_BLOCK_COMMENT' && token_type !== 'TK_UNKNOWN') {
-                last_last_text = flags.last_text;
-                last_type = token_type;
-                flags.last_text = token_text;
-            }
-            flags.had_comment = (token_type === 'TK_INLINE_COMMENT' || token_type === 'TK_COMMENT'
-                || token_type === 'TK_BLOCK_COMMENT');
-        }
+(function() {
 
+/* GENERATED_BUILD_OUTPUT */
+var legacy_beautify_js =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// define __esModule on exports
+/******/ 	__webpack_require__.r = function(exports) {
+/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 		}
+/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 	};
+/******/
+/******/ 	// create a fake namespace object
+/******/ 	// mode & 1: value is a module id, require it
+/******/ 	// mode & 2: merge all properties of value into the ns
+/******/ 	// mode & 4: return value when already ns object
+/******/ 	// mode & 8|1: behave like require
+/******/ 	__webpack_require__.t = function(value, mode) {
+/******/ 		if(mode & 1) value = __webpack_require__(value);
+/******/ 		if(mode & 8) return value;
+/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
+/******/ 		var ns = Object.create(null);
+/******/ 		__webpack_require__.r(ns);
+/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
+/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
+/******/ 		return ns;
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        sweet_code = output_lines[0].text.join('');
-        for (var line_index = 1; line_index < output_lines.length; line_index++) {
-            sweet_code += '\n' + output_lines[line_index].text.join('');
-        }
-        sweet_code = sweet_code.replace(/[\r\n ]+$/, '');
-        return sweet_code;
-    };
-
-    function trim_output(eat_newlines) {
-        eat_newlines = (eat_newlines === undefined) ? false : eat_newlines;
-
-        if (output_lines.length) {
-            trim_output_line(output_lines[output_lines.length - 1], eat_newlines);
-
-            while (eat_newlines && output_lines.length > 1 &&
-                output_lines[output_lines.length - 1].text.length === 0) {
-                output_lines.pop();
-                trim_output_line(output_lines[output_lines.length - 1], eat_newlines);
-            }
-        }
-    }
+"use strict";
+/*jshint node:true */
+/*
 
-    function trim_output_line(line) {
-        while (line.text.length &&
-            (line.text[line.text.length - 1] === ' ' ||
-                line.text[line.text.length - 1] === indent_string ||
-                line.text[line.text.length - 1] === preindent_string)) {
-            line.text.pop();
-        }
-    }
+  The MIT License (MIT)
 
-    function trim(s) {
-        return s.replace(/^\s+|\s+$/g, '');
-    }
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
-    // we could use just string.split, but
-    // IE doesn't like returning empty strings
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
 
-    function split_newlines(s) {
-        //return s.split(/\x0d\x0a|\x0a/);
-
-        s = s.replace(/\x0d/g, '');
-        var out = [],
-            idx = s.indexOf("\n");
-        while (idx !== -1) {
-            out.push(s.substring(0, idx));
-            s = s.substring(idx + 1);
-            idx = s.indexOf("\n");
-        }
-        if (s.length) {
-            out.push(s);
-        }
-        return out;
-    }
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
 
-    function just_added_newline() {
-        var line = output_lines[output_lines.length - 1];
-        return line.text.length === 0;
-    }
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
-    function just_added_blankline() {
-        if (just_added_newline()) {
-            if (output_lines.length === 1) {
-                return true; // start of the file and newline = blank
-            }
 
-            var line = output_lines[output_lines.length - 2];
-            return line.text.length === 0;
-        }
-        return false;
-    }
 
-    function allow_wrap_or_preserved_newline(force_linewrap) {
-        force_linewrap = (force_linewrap === undefined) ? false : force_linewrap;
-        if (opt.wrap_line_length && !force_linewrap) {
-            var line = output_lines[output_lines.length - 1];
-            var proposed_line_length = 0;
-            // never wrap the first token of a line.
-            if (line.text.length > 0) {
-                proposed_line_length = line.text.join('').length + token_text.length +
-                    (output_space_before_token ? 1 : 0);
-                if (proposed_line_length >= opt.wrap_line_length) {
-                    force_linewrap = true;
-                }
-            }
-        }
-        if (((opt.preserve_newlines && input_wanted_newline) || force_linewrap) && !just_added_newline()) {
-            print_newline(false, true);
+var Beautifier = __webpack_require__(1).Beautifier,
+  Options = __webpack_require__(5).Options;
 
-        }
-    }
+function js_beautify(js_source_text, options) {
+  var beautifier = new Beautifier(js_source_text, options);
+  return beautifier.beautify();
+}
 
-    function print_newline(force_newline, preserve_statement_flags) {
-        output_space_before_token = false;
+module.exports = js_beautify;
+module.exports.defaultOptions = function() {
+  return new Options();
+};
 
-        if (!preserve_statement_flags) {
-            if (flags.last_text !== ';' && flags.last_text !== ',' && flags.last_text !== '=' && last_type !== 'TK_OPERATOR') {
-                while (flags.mode === MODE.Statement && !flags.if_block && !flags.do_block) {
-                    restore_mode();
-                }
-            }
-        }
 
-        if (output_lines.length === 1 && just_added_newline()) {
-            return; // no newline on start of file
-        }
+/***/ }),
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (force_newline || !just_added_newline()) {
-            flags.multiline_frame = true;
-            output_lines.push(create_output_line());
-        }
-    }
+"use strict";
+/*jshint node:true */
+/*
 
-    function print_token_line_indentation() {
-        if (just_added_newline()) {
-            var line = output_lines[output_lines.length - 1];
-            if (opt.keep_array_indentation && is_array(flags.mode) && input_wanted_newline) {
-                // prevent removing of this whitespace as redundant
-                line.text.push('');
-                for (var i = 0; i < whitespace_before_token.length; i += 1) {
-                    line.text.push(whitespace_before_token[i]);
-                }
-            } else {
-                if (preindent_string) {
-                    line.text.push(preindent_string);
-                }
+  The MIT License (MIT)
 
-                print_indent_string(flags.indentation_level);
-            }
-        }
-    }
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
-    function print_indent_string(level) {
-        // Never indent your first output indent at the start of the file
-        if (output_lines.length > 1) {
-            var line = output_lines[output_lines.length - 1];
-
-            flags.line_indent_level = level;
-            for (var i = 0; i < level; i += 1) {
-                line.text.push(indent_string);
-            }
-        }
-    }
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
 
-    function print_token_space_before() {
-        var line = output_lines[output_lines.length - 1];
-        if (output_space_before_token && line.text.length) {
-            var last_output = line.text[line.text.length - 1];
-            if (last_output !== ' ' && last_output !== indent_string) { // prevent occassional duplicate space
-                line.text.push(' ');
-            }
-        }
-    }
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
 
-    function print_token(printable_token) {
-        printable_token = printable_token || token_text;
-        print_token_line_indentation();
-        print_token_space_before();
-        output_space_before_token = false;
-        output_lines[output_lines.length - 1].text.push(printable_token);
-    }
-
-    function indent() {
-        flags.indentation_level += 1;
-    }
-
-    function deindent() {
-        if (flags.indentation_level > 0 &&
-            ((!flags.parent) || flags.indentation_level > flags.parent.indentation_level))
-            flags.indentation_level -= 1;
-    }
-
-    function remove_redundant_indentation(frame) {
-        // This implementation is effective but has some issues:
-        //     - less than great performance due to array splicing
-        //     - can cause line wrap to happen too soon due to indent removal
-        //           after wrap points are calculated
-        // These issues are minor compared to ugly indentation.
-
-        if (frame.multiline_frame) return;
-
-        // remove one indent from each line inside this section
-        var index = frame.start_line_index;
-        var splice_index = 0;
-        var line;
-
-        while (index < output_lines.length) {
-            line = output_lines[index];
-            index++;
-
-            // skip empty lines
-            if (line.text.length === 0) {
-                continue;
-            }
-
-            // skip the preindent string if present
-            if (preindent_string && line.text[0] === preindent_string) {
-                splice_index = 1;
-            } else {
-                splice_index = 0;
-            }
-
-            // remove one indent, if present
-            if (line.text[splice_index] === indent_string) {
-                line.text.splice(splice_index, 1);
-            }
-        }
-    }
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
-    function set_mode(mode) {
-        if (flags) {
-            flag_store.push(flags);
-            previous_flags = flags;
-        } else {
-            previous_flags = create_flags(null, mode);
-        }
 
-        flags = create_flags(previous_flags, mode);
-    }
 
-    function is_array(mode) {
-        return mode === MODE.ArrayLiteral;
-    }
+var Output = __webpack_require__(2).Output;
+var Token = __webpack_require__(3).Token;
+var acorn = __webpack_require__(4);
+var Options = __webpack_require__(5).Options;
+var Tokenizer = __webpack_require__(7).Tokenizer;
+var line_starters = __webpack_require__(7).line_starters;
+var positionable_operators = __webpack_require__(7).positionable_operators;
+var TOKEN = __webpack_require__(7).TOKEN;
 
-    function is_expression(mode) {
-        return in_array(mode, [MODE.Expression, MODE.ForInitializer, MODE.Conditional]);
-    }
 
-    function restore_mode() {
-        if (flag_store.length > 0) {
-            previous_flags = flags;
-            flags = flag_store.pop();
-            if (previous_flags.mode === MODE.Statement) {
-                remove_redundant_indentation(previous_flags);
-            }
-        }
-    }
+function in_array(what, arr) {
+  return arr.indexOf(what) !== -1;
+}
 
-    function start_of_object_property() {
-        return flags.parent.mode === MODE.ObjectLiteral && flags.mode === MODE.Statement && flags.last_text === ':' &&
-            flags.ternary_depth === 0;
-    }
-
-    function start_of_statement() {
-        if (
-                (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const']) && token_type === 'TK_WORD') ||
-                (last_type === 'TK_RESERVED' && flags.last_text === 'do') ||
-                (last_type === 'TK_RESERVED' && flags.last_text === 'return' && !input_wanted_newline) ||
-                (last_type === 'TK_RESERVED' && flags.last_text === 'else' && !(token_type === 'TK_RESERVED' && token_text === 'if')) ||
-                (last_type === 'TK_END_EXPR' && (previous_flags.mode === MODE.ForInitializer || previous_flags.mode === MODE.Conditional)) ||
-                (last_type === 'TK_WORD' && flags.mode === MODE.BlockStatement
-                    && !flags.in_case
-                    && !(token_text === '--' || token_text === '++')
-                    && token_type !== 'TK_WORD' && token_type !== 'TK_RESERVED') ||
-                (flags.mode === MODE.ObjectLiteral && flags.last_text === ':' && flags.ternary_depth === 0)
-
-            ) {
-
-            set_mode(MODE.Statement);
-            indent();
-
-            if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const']) && token_type === 'TK_WORD') {
-                flags.declaration_statement = true;
-            }
-
-            // Issue #276:
-            // If starting a new statement with [if, for, while, do], push to a new line.
-            // if (a) if (b) if(c) d(); else e(); else f();
-            if (!start_of_object_property()) {
-                allow_wrap_or_preserved_newline(
-                    token_type === 'TK_RESERVED' && in_array(token_text, ['do', 'for', 'if', 'while']));
-            }
+function ltrim(s) {
+  return s.replace(/^\s+/g, '');
+}
 
-            return true;
-        }
-        return false;
-    }
+function generateMapFromStrings(list) {
+  var result = {};
+  for (var x = 0; x < list.length; x++) {
+    // make the mapped names underscored instead of dash
+    result[list[x].replace(/-/g, '_')] = list[x];
+  }
+  return result;
+}
 
-    function all_lines_start_with(lines, c) {
-        for (var i = 0; i < lines.length; i++) {
-            var line = trim(lines[i]);
-            if (line.charAt(0) !== c) {
-                return false;
-            }
-        }
-        return true;
-    }
+function reserved_word(token, word) {
+  return token && token.type === TOKEN.RESERVED && token.text === word;
+}
 
-    function each_line_matches_indent(lines, indent) {
-        var i = 0,
-            len = lines.length,
-            line;
-        for (; i < len; i++) {
-            line = lines[i];
-            // allow empty lines to pass through
-            if (line && line.indexOf(indent) !== 0) {
-                return false;
-            }
-        }
-        return true;
-    }
+function reserved_array(token, words) {
+  return token && token.type === TOKEN.RESERVED && in_array(token.text, words);
+}
+// Unsure of what they mean, but they work. Worth cleaning up in future.
+var special_words = ['case', 'return', 'do', 'if', 'throw', 'else', 'await', 'break', 'continue', 'async'];
 
-    function is_special_word(word) {
-        return in_array(word, ['case', 'return', 'do', 'if', 'throw', 'else']);
-    }
+var validPositionValues = ['before-newline', 'after-newline', 'preserve-newline'];
 
-    function in_array(what, arr) {
-        for (var i = 0; i < arr.length; i += 1) {
-            if (arr[i] === what) {
-                return true;
-            }
-        }
-        return false;
-    }
+// Generate map from array
+var OPERATOR_POSITION = generateMapFromStrings(validPositionValues);
 
-    function unescape_string(s) {
-        var esc = false,
-            out = '',
-            pos = 0,
-            s_hex = '',
-            escaped = 0,
-            c;
-
-        while (esc || pos < s.length) {
-
-            c = s.charAt(pos);
-            pos++;
-
-            if (esc) {
-                esc = false;
-                if (c === 'x') {
-                    // simple hex-escape \x24
-                    s_hex = s.substr(pos, 2);
-                    pos += 2;
-                } else if (c === 'u') {
-                    // unicode-escape, \u2134
-                    s_hex = s.substr(pos, 4);
-                    pos += 4;
-                } else {
-                    // some common escape, e.g \n
-                    out += '\\' + c;
-                    continue;
-                }
-                if (!s_hex.match(/^[0123456789abcdefABCDEF]+$/)) {
-                    // some weird escaping, bail out,
-                    // leaving whole string intact
-                    return s;
-                }
-
-                escaped = parseInt(s_hex, 16);
-
-                if (escaped >= 0x00 && escaped < 0x20) {
-                    // leave 0x00...0x1f escaped
-                    if (c === 'x') {
-                        out += '\\x' + s_hex;
-                    } else {
-                        out += '\\u' + s_hex;
-                    }
-                    continue;
-                } else if (escaped === 0x22 || escaped === 0x27 || escaped === 0x5c) {
-                    // single-quote, apostrophe, backslash - escape these
-                    out += '\\' + String.fromCharCode(escaped);
-                } else if (c === 'x' && escaped > 0x7e && escaped <= 0xff) {
-                    // we bail out on \x7f..\xff,
-                    // leaving whole string escaped,
-                    // as it's probably completely binary
-                    return s;
-                } else {
-                    out += String.fromCharCode(escaped);
-                }
-            } else if (c === '\\') {
-                esc = true;
-            } else {
-                out += c;
-            }
-        }
-        return out;
-    }
+var OPERATOR_POSITION_BEFORE_OR_PRESERVE = [OPERATOR_POSITION.before_newline, OPERATOR_POSITION.preserve_newline];
+
+var MODE = {
+  BlockStatement: 'BlockStatement', // 'BLOCK'
+  Statement: 'Statement', // 'STATEMENT'
+  ObjectLiteral: 'ObjectLiteral', // 'OBJECT',
+  ArrayLiteral: 'ArrayLiteral', //'[EXPRESSION]',
+  ForInitializer: 'ForInitializer', //'(FOR-EXPRESSION)',
+  Conditional: 'Conditional', //'(COND-EXPRESSION)',
+  Expression: 'Expression' //'(EXPRESSION)'
+};
 
-    function is_next(find) {
-        var local_pos = parser_pos;
-        var c = input.charAt(local_pos);
-        while (in_array(c, whitespace) && c !== find) {
-            local_pos++;
-            if (local_pos >= input_length) {
-                return false;
-            }
-            c = input.charAt(local_pos);
-        }
-        return c === find;
-    }
+function remove_redundant_indentation(output, frame) {
+  // This implementation is effective but has some issues:
+  //     - can cause line wrap to happen too soon due to indent removal
+  //           after wrap points are calculated
+  // These issues are minor compared to ugly indentation.
+
+  if (frame.multiline_frame ||
+    frame.mode === MODE.ForInitializer ||
+    frame.mode === MODE.Conditional) {
+    return;
+  }
 
-    function get_next_token() {
-        var i, resulting_string;
+  // remove one indent from each line inside this section
+  output.remove_indent(frame.start_line_index);
+}
 
-        n_newlines = 0;
+// we could use just string.split, but
+// IE doesn't like returning empty strings
+function split_linebreaks(s) {
+  //return s.split(/\x0d\x0a|\x0a/);
+
+  s = s.replace(acorn.allLineBreaks, '\n');
+  var out = [],
+    idx = s.indexOf("\n");
+  while (idx !== -1) {
+    out.push(s.substring(0, idx));
+    s = s.substring(idx + 1);
+    idx = s.indexOf("\n");
+  }
+  if (s.length) {
+    out.push(s);
+  }
+  return out;
+}
 
-        if (parser_pos >= input_length) {
-            return ['', 'TK_EOF'];
-        }
+function is_array(mode) {
+  return mode === MODE.ArrayLiteral;
+}
 
-        input_wanted_newline = false;
-        whitespace_before_token = [];
+function is_expression(mode) {
+  return in_array(mode, [MODE.Expression, MODE.ForInitializer, MODE.Conditional]);
+}
 
-        var c = input.charAt(parser_pos);
-        parser_pos += 1;
+function all_lines_start_with(lines, c) {
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i].trim();
+    if (line.charAt(0) !== c) {
+      return false;
+    }
+  }
+  return true;
+}
 
-        while (in_array(c, whitespace)) {
+function each_line_matches_indent(lines, indent) {
+  var i = 0,
+    len = lines.length,
+    line;
+  for (; i < len; i++) {
+    line = lines[i];
+    // allow empty lines to pass through
+    if (line && line.indexOf(indent) !== 0) {
+      return false;
+    }
+  }
+  return true;
+}
 
-            if (c === '\n') {
-                n_newlines += 1;
-                whitespace_before_token = [];
-            } else if (n_newlines) {
-                if (c === indent_string) {
-                    whitespace_before_token.push(indent_string);
-                } else if (c !== '\r') {
-                    whitespace_before_token.push(' ');
-                }
-            }
-
-            if (parser_pos >= input_length) {
-                return ['', 'TK_EOF'];
-            }
 
-            c = input.charAt(parser_pos);
-            parser_pos += 1;
-        }
+function Beautifier(source_text, options) {
+  options = options || {};
+  this._source_text = source_text || '';
+
+  this._output = null;
+  this._tokens = null;
+  this._last_last_text = null;
+  this._flags = null;
+  this._previous_flags = null;
 
-        // NOTE: because beautifier doesn't fully parse, it doesn't use acorn.isIdentifierStart.
-        // It just treats all identifiers and numbers and such the same.
-        if (acorn.isIdentifierChar(input.charCodeAt(parser_pos-1))) {
-            if (parser_pos < input_length) {
-                while (acorn.isIdentifierChar(input.charCodeAt(parser_pos))) {
-                    c += input.charAt(parser_pos);
-                    parser_pos += 1;
-                    if (parser_pos === input_length) {
-                        break;
-                    }
-                }
-            }
-
-            // small and surprisingly unugly hack for 1E-10 representation
-            if (parser_pos !== input_length && c.match(/^[0-9]+[Ee]$/) && (input.charAt(parser_pos) === '-' || input.charAt(parser_pos) === '+')) {
-
-                var sign = input.charAt(parser_pos);
-                parser_pos += 1;
-
-                var t = get_next_token();
-                c += sign + t[0];
-                return [c, 'TK_WORD'];
-            }
-
-            if (!(last_type === 'TK_DOT' ||
-                    (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['set', 'get'])))
-                && in_array(c, reserved_words)) {
-                if (c === 'in') { // hack for 'in' operator
-                    return [c, 'TK_OPERATOR'];
-                }
-                return [c, 'TK_RESERVED'];
-            }
-            return [c, 'TK_WORD'];
-        }
+  this._flag_store = null;
+  this._options = new Options(options);
+}
 
-        if (c === '(' || c === '[') {
-            return [c, 'TK_START_EXPR'];
-        }
+Beautifier.prototype.create_flags = function(flags_base, mode) {
+  var next_indent_level = 0;
+  if (flags_base) {
+    next_indent_level = flags_base.indentation_level;
+    if (!this._output.just_added_newline() &&
+      flags_base.line_indent_level > next_indent_level) {
+      next_indent_level = flags_base.line_indent_level;
+    }
+  }
+
+  var next_flags = {
+    mode: mode,
+    parent: flags_base,
+    last_token: flags_base ? flags_base.last_token : new Token(TOKEN.START_BLOCK, ''), // last token text
+    last_word: flags_base ? flags_base.last_word : '', // last TOKEN.WORD passed
+    declaration_statement: false,
+    declaration_assignment: false,
+    multiline_frame: false,
+    inline_frame: false,
+    if_block: false,
+    else_block: false,
+    do_block: false,
+    do_while: false,
+    import_block: false,
+    in_case_statement: false, // switch(..){ INSIDE HERE }
+    in_case: false, // we're on the exact line with "case 0:"
+    case_body: false, // the indented case-action block
+    indentation_level: next_indent_level,
+    alignment: 0,
+    line_indent_level: flags_base ? flags_base.line_indent_level : next_indent_level,
+    start_line_index: this._output.get_line_number(),
+    ternary_depth: 0
+  };
+  return next_flags;
+};
 
-        if (c === ')' || c === ']') {
-            return [c, 'TK_END_EXPR'];
-        }
+Beautifier.prototype._reset = function(source_text) {
+  var baseIndentString = source_text.match(/^[\t ]*/)[0];
 
-        if (c === '{') {
-            return [c, 'TK_START_BLOCK'];
-        }
+  this._last_last_text = ''; // pre-last token text
+  this._output = new Output(this._options, baseIndentString);
 
-        if (c === '}') {
-            return [c, 'TK_END_BLOCK'];
-        }
+  // If testing the ignore directive, start with output disable set to true
+  this._output.raw = this._options.test_output_raw;
 
-        if (c === ';') {
-            return [c, 'TK_SEMICOLON'];
-        }
 
-        if (c === '/') {
-            var comment = '';
-            // peek for comment /* ... */
-            var inline_comment = true;
-            if (input.charAt(parser_pos) === '*') {
-                parser_pos += 1;
-                if (parser_pos < input_length) {
-                    while (parser_pos < input_length && !(input.charAt(parser_pos) === '*' && input.charAt(parser_pos + 1) && input.charAt(parser_pos + 1) === '/')) {
-                        c = input.charAt(parser_pos);
-                        comment += c;
-                        if (c === "\n" || c === "\r") {
-                            inline_comment = false;
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            break;
-                        }
-                    }
-                }
-                parser_pos += 2;
-                if (inline_comment && n_newlines === 0) {
-                    return ['/*' + comment + '*/', 'TK_INLINE_COMMENT'];
-                } else {
-                    return ['/*' + comment + '*/', 'TK_BLOCK_COMMENT'];
-                }
-            }
-            // peek for comment // ...
-            if (input.charAt(parser_pos) === '/') {
-                comment = c;
-                while (input.charAt(parser_pos) !== '\r' && input.charAt(parser_pos) !== '\n') {
-                    comment += input.charAt(parser_pos);
-                    parser_pos += 1;
-                    if (parser_pos >= input_length) {
-                        break;
-                    }
-                }
-                return [comment, 'TK_COMMENT'];
-            }
+  // Stack of parsing/formatting states, including MODE.
+  // We tokenize, parse, and output in an almost purely a forward-only stream of token input
+  // and formatted output.  This makes the beautifier less accurate than full parsers
+  // but also far more tolerant of syntax errors.
+  //
+  // For example, the default mode is MODE.BlockStatement. If we see a '{' we push a new frame of type
+  // MODE.BlockStatement on the the stack, even though it could be object literal.  If we later
+  // encounter a ":", we'll switch to to MODE.ObjectLiteral.  If we then see a ";",
+  // most full parsers would die, but the beautifier gracefully falls back to
+  // MODE.BlockStatement and continues on.
+  this._flag_store = [];
+  this.set_mode(MODE.BlockStatement);
+  var tokenizer = new Tokenizer(source_text, this._options);
+  this._tokens = tokenizer.tokenize();
+  return source_text;
+};
 
-        }
+Beautifier.prototype.beautify = function() {
+  // if disabled, return the input unchanged.
+  if (this._options.disabled) {
+    return this._source_text;
+  }
 
+  var sweet_code;
+  var source_text = this._reset(this._source_text);
 
-        if (c === '`' || c === "'" || c === '"' || // string
-            (
-                (c === '/') || // regexp
-                (opt.e4x && c === "<" && input.slice(parser_pos - 1).match(/^<([-a-zA-Z:0-9_.]+|{[^{}]*}|!\[CDATA\[[\s\S]*?\]\])\s*([-a-zA-Z:0-9_.]+=('[^']*'|"[^"]*"|{[^{}]*})\s*)*\/?\s*>/)) // xml
-            ) && ( // regex and xml can only appear in specific locations during parsing
-                (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) ||
-                (last_type === 'TK_END_EXPR' && in_array(previous_flags.mode, [MODE.Conditional, MODE.ForInitializer])) ||
-                (in_array(last_type, ['TK_COMMENT', 'TK_START_EXPR', 'TK_START_BLOCK',
-                    'TK_END_BLOCK', 'TK_OPERATOR', 'TK_EQUALS', 'TK_EOF', 'TK_SEMICOLON', 'TK_COMMA'
-                ]))
-            )) {
-
-            var sep = c,
-                esc = false,
-                has_char_escapes = false;
-
-            resulting_string = c;
-
-            if (parser_pos < input_length) {
-                if (sep === '/') {
-                    //
-                    // handle regexp
-                    //
-                    var in_char_class = false;
-                    while (esc || in_char_class || input.charAt(parser_pos) !== sep) {
-                        resulting_string += input.charAt(parser_pos);
-                        if (!esc) {
-                            esc = input.charAt(parser_pos) === '\\';
-                            if (input.charAt(parser_pos) === '[') {
-                                in_char_class = true;
-                            } else if (input.charAt(parser_pos) === ']') {
-                                in_char_class = false;
-                            }
-                        } else {
-                            esc = false;
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            // incomplete string/rexp when end-of-file reached.
-                            // bail out with what had been received so far.
-                            return [resulting_string, 'TK_STRING'];
-                        }
-                    }
-                } else if (opt.e4x && sep === '<') {
-                    //
-                    // handle e4x xml literals
-                    //
-                    var xmlRegExp = /<(\/?)([-a-zA-Z:0-9_.]+|{[^{}]*}|!\[CDATA\[[\s\S]*?\]\])\s*([-a-zA-Z:0-9_.]+=('[^']*'|"[^"]*"|{[^{}]*})\s*)*(\/?)\s*>/g;
-                    var xmlStr = input.slice(parser_pos - 1);
-                    var match = xmlRegExp.exec(xmlStr);
-                    if (match && match.index === 0) {
-                        var rootTag = match[2];
-                        var depth = 0;
-                        while (match) {
-                            var isEndTag = !! match[1];
-                            var tagName = match[2];
-                            var isSingletonTag = ( !! match[match.length - 1]) || (tagName.slice(0, 8) === "![CDATA[");
-                            if (tagName === rootTag && !isSingletonTag) {
-                                if (isEndTag) {
-                                    --depth;
-                                } else {
-                                    ++depth;
-                                }
-                            }
-                            if (depth <= 0) {
-                                break;
-                            }
-                            match = xmlRegExp.exec(xmlStr);
-                        }
-                        var xmlLength = match ? match.index + match[0].length : xmlStr.length;
-                        parser_pos += xmlLength - 1;
-                        return [xmlStr.slice(0, xmlLength), "TK_STRING"];
-                    }
-                } else {
-                    //
-                    // handle string
-                    //
-                    while (esc || input.charAt(parser_pos) !== sep) {
-                        resulting_string += input.charAt(parser_pos);
-                        if (esc) {
-                            if (input.charAt(parser_pos) === 'x' || input.charAt(parser_pos) === 'u') {
-                                has_char_escapes = true;
-                            }
-                            esc = false;
-                        } else {
-                            esc = input.charAt(parser_pos) === '\\';
-                        }
-                        parser_pos += 1;
-                        if (parser_pos >= input_length) {
-                            // incomplete string/rexp when end-of-file reached.
-                            // bail out with what had been received so far.
-                            return [resulting_string, 'TK_STRING'];
-                        }
-                    }
-
-                }
-            }
-
-            parser_pos += 1;
-            resulting_string += sep;
-
-            if (has_char_escapes && opt.unescape_strings) {
-                resulting_string = unescape_string(resulting_string);
-            }
-
-            if (sep === '/') {
-                // regexps may have modifiers /regexp/MOD , so fetch those, too
-                while (parser_pos < input_length && in_array(input.charAt(parser_pos), wordchar)) {
-                    resulting_string += input.charAt(parser_pos);
-                    parser_pos += 1;
-                }
-            }
-            return [resulting_string, 'TK_STRING'];
-        }
+  var eol = this._options.eol;
+  if (this._options.eol === 'auto') {
+    eol = '\n';
+    if (source_text && acorn.lineBreak.test(source_text || '')) {
+      eol = source_text.match(acorn.lineBreak)[0];
+    }
+  }
 
-        if (c === '#') {
+  var current_token = this._tokens.next();
+  while (current_token) {
+    this.handle_token(current_token);
 
+    this._last_last_text = this._flags.last_token.text;
+    this._flags.last_token = current_token;
 
-            if (output_lines.length === 1 && output_lines[0].text.length === 0 &&
-                input.charAt(parser_pos) === '!') {
-                // shebang
-                resulting_string = c;
-                while (parser_pos < input_length && c !== '\n') {
-                    c = input.charAt(parser_pos);
-                    resulting_string += c;
-                    parser_pos += 1;
-                }
-                return [trim(resulting_string) + '\n', 'TK_UNKNOWN'];
-            }
+    current_token = this._tokens.next();
+  }
 
+  sweet_code = this._output.get_code(eol);
 
+  return sweet_code;
+};
 
-            // Spidermonkey-specific sharp variables for circular references
-            // https://developer.mozilla.org/En/Sharp_variables_in_JavaScript
-            var sharp = '#';
-            if (parser_pos < input_length && in_array(input.charAt(parser_pos), digits)) {
-                do {
-                    c = input.charAt(parser_pos);
-                    sharp += c;
-                    parser_pos += 1;
-                } while (parser_pos < input_length && c !== '#' && c !== '=');
-                if (c === '#') {
-                    //
-                } else if (input.charAt(parser_pos) === '[' && input.charAt(parser_pos + 1) === ']') {
-                    sharp += '[]';
-                    parser_pos += 2;
-                } else if (input.charAt(parser_pos) === '{' && input.charAt(parser_pos + 1) === '}') {
-                    sharp += '{}';
-                    parser_pos += 2;
-                }
-                return [sharp, 'TK_WORD'];
-            }
-        }
+Beautifier.prototype.handle_token = function(current_token, preserve_statement_flags) {
+  if (current_token.type === TOKEN.START_EXPR) {
+    this.handle_start_expr(current_token);
+  } else if (current_token.type === TOKEN.END_EXPR) {
+    this.handle_end_expr(current_token);
+  } else if (current_token.type === TOKEN.START_BLOCK) {
+    this.handle_start_block(current_token);
+  } else if (current_token.type === TOKEN.END_BLOCK) {
+    this.handle_end_block(current_token);
+  } else if (current_token.type === TOKEN.WORD) {
+    this.handle_word(current_token);
+  } else if (current_token.type === TOKEN.RESERVED) {
+    this.handle_word(current_token);
+  } else if (current_token.type === TOKEN.SEMICOLON) {
+    this.handle_semicolon(current_token);
+  } else if (current_token.type === TOKEN.STRING) {
+    this.handle_string(current_token);
+  } else if (current_token.type === TOKEN.EQUALS) {
+    this.handle_equals(current_token);
+  } else if (current_token.type === TOKEN.OPERATOR) {
+    this.handle_operator(current_token);
+  } else if (current_token.type === TOKEN.COMMA) {
+    this.handle_comma(current_token);
+  } else if (current_token.type === TOKEN.BLOCK_COMMENT) {
+    this.handle_block_comment(current_token, preserve_statement_flags);
+  } else if (current_token.type === TOKEN.COMMENT) {
+    this.handle_comment(current_token, preserve_statement_flags);
+  } else if (current_token.type === TOKEN.DOT) {
+    this.handle_dot(current_token);
+  } else if (current_token.type === TOKEN.EOF) {
+    this.handle_eof(current_token);
+  } else if (current_token.type === TOKEN.UNKNOWN) {
+    this.handle_unknown(current_token, preserve_statement_flags);
+  } else {
+    this.handle_unknown(current_token, preserve_statement_flags);
+  }
+};
 
-        if (c === '<' && input.substring(parser_pos - 1, parser_pos + 3) === '<!--') {
-            parser_pos += 3;
-            c = '<!--';
-            while (input.charAt(parser_pos) !== '\n' && parser_pos < input_length) {
-                c += input.charAt(parser_pos);
-                parser_pos++;
-            }
-            flags.in_html_comment = true;
-            return [c, 'TK_COMMENT'];
+Beautifier.prototype.handle_whitespace_and_comments = function(current_token, preserve_statement_flags) {
+  var newlines = current_token.newlines;
+  var keep_whitespace = this._options.keep_array_indentation && is_array(this._flags.mode);
+
+  if (current_token.comments_before) {
+    var comment_token = current_token.comments_before.next();
+    while (comment_token) {
+      // The cleanest handling of inline comments is to treat them as though they aren't there.
+      // Just continue formatting and the behavior should be logical.
+      // Also ignore unknown tokens.  Again, this should result in better behavior.
+      this.handle_whitespace_and_comments(comment_token, preserve_statement_flags);
+      this.handle_token(comment_token, preserve_statement_flags);
+      comment_token = current_token.comments_before.next();
+    }
+  }
+
+  if (keep_whitespace) {
+    for (var i = 0; i < newlines; i += 1) {
+      this.print_newline(i > 0, preserve_statement_flags);
+    }
+  } else {
+    if (this._options.max_preserve_newlines && newlines > this._options.max_preserve_newlines) {
+      newlines = this._options.max_preserve_newlines;
+    }
+
+    if (this._options.preserve_newlines) {
+      if (newlines > 1) {
+        this.print_newline(false, preserve_statement_flags);
+        for (var j = 1; j < newlines; j += 1) {
+          this.print_newline(true, preserve_statement_flags);
         }
+      }
+    }
+  }
 
-        if (c === '-' && flags.in_html_comment && input.substring(parser_pos - 1, parser_pos + 2) === '-->') {
-            flags.in_html_comment = false;
-            parser_pos += 2;
-            return ['-->', 'TK_COMMENT'];
-        }
+};
 
-        if (c === '.') {
-            return [c, 'TK_DOT'];
-        }
+var newline_restricted_tokens = ['async', 'break', 'continue', 'return', 'throw', 'yield'];
 
-        if (in_array(c, punct)) {
-            while (parser_pos < input_length && in_array(c + input.charAt(parser_pos), punct)) {
-                c += input.charAt(parser_pos);
-                parser_pos += 1;
-                if (parser_pos >= input_length) {
-                    break;
-                }
-            }
-
-            if (c === ',') {
-                return [c, 'TK_COMMA'];
-            } else if (c === '=') {
-                return [c, 'TK_EQUALS'];
-            } else {
-                return [c, 'TK_OPERATOR'];
-            }
-        }
+Beautifier.prototype.allow_wrap_or_preserved_newline = function(current_token, force_linewrap) {
+  force_linewrap = (force_linewrap === undefined) ? false : force_linewrap;
 
-        return [c, 'TK_UNKNOWN'];
+  // Never wrap the first token on a line
+  if (this._output.just_added_newline()) {
+    return;
+  }
+
+  var shouldPreserveOrForce = (this._options.preserve_newlines && current_token.newlines) || force_linewrap;
+  var operatorLogicApplies = in_array(this._flags.last_token.text, positionable_operators) ||
+    in_array(current_token.text, positionable_operators);
+
+  if (operatorLogicApplies) {
+    var shouldPrintOperatorNewline = (
+        in_array(this._flags.last_token.text, positionable_operators) &&
+        in_array(this._options.operator_position, OPERATOR_POSITION_BEFORE_OR_PRESERVE)
+      ) ||
+      in_array(current_token.text, positionable_operators);
+    shouldPreserveOrForce = shouldPreserveOrForce && shouldPrintOperatorNewline;
+  }
+
+  if (shouldPreserveOrForce) {
+    this.print_newline(false, true);
+  } else if (this._options.wrap_line_length) {
+    if (reserved_array(this._flags.last_token, newline_restricted_tokens)) {
+      // These tokens should never have a newline inserted
+      // between them and the following expression.
+      return;
     }
+    this._output.set_wrap_point();
+  }
+};
 
-    function handle_start_expr() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-        }
+Beautifier.prototype.print_newline = function(force_newline, preserve_statement_flags) {
+  if (!preserve_statement_flags) {
+    if (this._flags.last_token.text !== ';' && this._flags.last_token.text !== ',' && this._flags.last_token.text !== '=' && (this._flags.last_token.type !== TOKEN.OPERATOR || this._flags.last_token.text === '--' || this._flags.last_token.text === '++')) {
+      var next_token = this._tokens.peek();
+      while (this._flags.mode === MODE.Statement &&
+        !(this._flags.if_block && reserved_word(next_token, 'else')) &&
+        !this._flags.do_block) {
+        this.restore_mode();
+      }
+    }
+  }
+
+  if (this._output.add_new_line(force_newline)) {
+    this._flags.multiline_frame = true;
+  }
+};
 
-        var next_mode = MODE.Expression;
-        if (token_text === '[') {
+Beautifier.prototype.print_token_line_indentation = function(current_token) {
+  if (this._output.just_added_newline()) {
+    if (this._options.keep_array_indentation &&
+      current_token.newlines &&
+      (current_token.text === '[' || is_array(this._flags.mode))) {
+      this._output.current_line.set_indent(-1);
+      this._output.current_line.push(current_token.whitespace_before);
+      this._output.space_before_token = false;
+    } else if (this._output.set_indent(this._flags.indentation_level, this._flags.alignment)) {
+      this._flags.line_indent_level = this._flags.indentation_level;
+    }
+  }
+};
 
-            if (last_type === 'TK_WORD' || flags.last_text === ')') {
-                // this is array index specifier, break immediately
-                // a[x], fn()[x]
-                if (last_type === 'TK_RESERVED' && in_array(flags.last_text, line_starters)) {
-                    output_space_before_token = true;
-                }
-                set_mode(next_mode);
-                print_token();
-                indent();
-                if (opt.space_in_paren) {
-                    output_space_before_token = true;
-                }
-                return;
-            }
-
-            next_mode = MODE.ArrayLiteral;
-            if (is_array(flags.mode)) {
-                if (flags.last_text === '[' ||
-                    (flags.last_text === ',' && (last_last_text === ']' || last_last_text === '}'))) {
-                    // ], [ goes to new line
-                    // }, [ goes to new line
-                    if (!opt.keep_array_indentation) {
-                        print_newline();
-                    }
-                }
-            }
+Beautifier.prototype.print_token = function(current_token) {
+  if (this._output.raw) {
+    this._output.add_raw_token(current_token);
+    return;
+  }
+
+  if (this._options.comma_first && current_token.previous && current_token.previous.type === TOKEN.COMMA &&
+    this._output.just_added_newline()) {
+    if (this._output.previous_line.last() === ',') {
+      var popped = this._output.previous_line.pop();
+      // if the comma was already at the start of the line,
+      // pull back onto that line and reprint the indentation
+      if (this._output.previous_line.is_empty()) {
+        this._output.previous_line.push(popped);
+        this._output.trim(true);
+        this._output.current_line.pop();
+        this._output.trim();
+      }
+
+      // add the comma in front of the next token
+      this.print_token_line_indentation(current_token);
+      this._output.add_token(',');
+      this._output.space_before_token = true;
+    }
+  }
+
+  this.print_token_line_indentation(current_token);
+  this._output.non_breaking_space = true;
+  this._output.add_token(current_token.text);
+  if (this._output.previous_token_wrapped) {
+    this._flags.multiline_frame = true;
+  }
+};
 
-        } else {
-            if (last_type === 'TK_RESERVED' && flags.last_text === 'for') {
-                next_mode = MODE.ForInitializer;
-            } else if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['if', 'while'])) {
-                next_mode = MODE.Conditional;
-            } else {
-                // next_mode = MODE.Expression;
-            }
-        }
+Beautifier.prototype.indent = function() {
+  this._flags.indentation_level += 1;
+  this._output.set_indent(this._flags.indentation_level, this._flags.alignment);
+};
 
-        if (flags.last_text === ';' || last_type === 'TK_START_BLOCK') {
-            print_newline();
-        } else if (last_type === 'TK_END_EXPR' || last_type === 'TK_START_EXPR' || last_type === 'TK_END_BLOCK' || flags.last_text === '.') {
-            // TODO: Consider whether forcing this is required.  Review failing tests when removed.
-            allow_wrap_or_preserved_newline(input_wanted_newline);
-            // do nothing on (( and )( and ][ and ]( and .(
-        } else if (!(last_type === 'TK_RESERVED' && token_text === '(') && last_type !== 'TK_WORD' && last_type !== 'TK_OPERATOR') {
-            output_space_before_token = true;
-        } else if ((last_type === 'TK_RESERVED' && (flags.last_word === 'function' || flags.last_word === 'typeof')) ||
-            (flags.last_text === '*' && last_last_text === 'function')) {
-            // function() vs function ()
-            if (opt.jslint_happy) {
-                output_space_before_token = true;
-            }
-        } else if (last_type === 'TK_RESERVED' && (in_array(flags.last_text, line_starters) || flags.last_text === 'catch')) {
-            if (opt.space_before_conditional) {
-                output_space_before_token = true;
-            }
-        }
+Beautifier.prototype.deindent = function() {
+  if (this._flags.indentation_level > 0 &&
+    ((!this._flags.parent) || this._flags.indentation_level > this._flags.parent.indentation_level)) {
+    this._flags.indentation_level -= 1;
+    this._output.set_indent(this._flags.indentation_level, this._flags.alignment);
+  }
+};
 
-        // Support of this kind of newline preservation.
-        // a = (b &&
-        //     (c || d));
-        if (token_text === '(') {
-            if (last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') {
-                if (!start_of_object_property()) {
-                    allow_wrap_or_preserved_newline();
-                }
-            }
-        }
+Beautifier.prototype.set_mode = function(mode) {
+  if (this._flags) {
+    this._flag_store.push(this._flags);
+    this._previous_flags = this._flags;
+  } else {
+    this._previous_flags = this.create_flags(null, mode);
+  }
+
+  this._flags = this.create_flags(this._previous_flags, mode);
+  this._output.set_indent(this._flags.indentation_level, this._flags.alignment);
+};
 
-        set_mode(next_mode);
-        print_token();
-        if (opt.space_in_paren) {
-            output_space_before_token = true;
-        }
 
-        // In all cases, if we newline while inside an expression it should be indented.
-        indent();
+Beautifier.prototype.restore_mode = function() {
+  if (this._flag_store.length > 0) {
+    this._previous_flags = this._flags;
+    this._flags = this._flag_store.pop();
+    if (this._previous_flags.mode === MODE.Statement) {
+      remove_redundant_indentation(this._output, this._previous_flags);
     }
+    this._output.set_indent(this._flags.indentation_level, this._flags.alignment);
+  }
+};
 
-    function handle_end_expr() {
-        // statements inside expressions are not valid syntax, but...
-        // statements must all be closed when their container closes
-        while (flags.mode === MODE.Statement) {
-            restore_mode();
-        }
+Beautifier.prototype.start_of_object_property = function() {
+  return this._flags.parent.mode === MODE.ObjectLiteral && this._flags.mode === MODE.Statement && (
+    (this._flags.last_token.text === ':' && this._flags.ternary_depth === 0) || (reserved_array(this._flags.last_token, ['get', 'set'])));
+};
 
-        if (flags.multiline_frame) {
-            allow_wrap_or_preserved_newline(token_text === ']' && is_array(flags.mode) && !opt.keep_array_indentation);
-        }
+Beautifier.prototype.start_of_statement = function(current_token) {
+  var start = false;
+  start = start || reserved_array(this._flags.last_token, ['var', 'let', 'const']) && current_token.type === TOKEN.WORD;
+  start = start || reserved_word(this._flags.last_token, 'do');
+  start = start || (!(this._flags.parent.mode === MODE.ObjectLiteral && this._flags.mode === MODE.Statement)) && reserved_array(this._flags.last_token, newline_restricted_tokens) && !current_token.newlines;
+  start = start || reserved_word(this._flags.last_token, 'else') &&
+    !(reserved_word(current_token, 'if') && !current_token.comments_before);
+  start = start || (this._flags.last_token.type === TOKEN.END_EXPR && (this._previous_flags.mode === MODE.ForInitializer || this._previous_flags.mode === MODE.Conditional));
+  start = start || (this._flags.last_token.type === TOKEN.WORD && this._flags.mode === MODE.BlockStatement &&
+    !this._flags.in_case &&
+    !(current_token.text === '--' || current_token.text === '++') &&
+    this._last_last_text !== 'function' &&
+    current_token.type !== TOKEN.WORD && current_token.type !== TOKEN.RESERVED);
+  start = start || (this._flags.mode === MODE.ObjectLiteral && (
+    (this._flags.last_token.text === ':' && this._flags.ternary_depth === 0) || reserved_array(this._flags.last_token, ['get', 'set'])));
+
+  if (start) {
+    this.set_mode(MODE.Statement);
+    this.indent();
+
+    this.handle_whitespace_and_comments(current_token, true);
+
+    // Issue #276:
+    // If starting a new statement with [if, for, while, do], push to a new line.
+    // if (a) if (b) if(c) d(); else e(); else f();
+    if (!this.start_of_object_property()) {
+      this.allow_wrap_or_preserved_newline(current_token,
+        reserved_array(current_token, ['do', 'for', 'if', 'while']));
+    }
+    return true;
+  }
+  return false;
+};
 
-        if (opt.space_in_paren) {
-            if (last_type === 'TK_START_EXPR' && ! opt.space_in_empty_paren) {
-                // () [] no inner space in empty parens like these, ever, ref #320
-                trim_output();
-                output_space_before_token = false;
-            } else {
-                output_space_before_token = true;
-            }
-        }
-        if (token_text === ']' && opt.keep_array_indentation) {
-            print_token();
-            restore_mode();
-        } else {
-            restore_mode();
-            print_token();
-        }
-        remove_redundant_indentation(previous_flags);
+Beautifier.prototype.handle_start_expr = function(current_token) {
+  // The conditional starts the statement if appropriate.
+  if (!this.start_of_statement(current_token)) {
+    this.handle_whitespace_and_comments(current_token);
+  }
+
+  var next_mode = MODE.Expression;
+  if (current_token.text === '[') {
+
+    if (this._flags.last_token.type === TOKEN.WORD || this._flags.last_token.text === ')') {
+      // this is array index specifier, break immediately
+      // a[x], fn()[x]
+      if (reserved_array(this._flags.last_token, line_starters)) {
+        this._output.space_before_token = true;
+      }
+      this.print_token(current_token);
+      this.set_mode(next_mode);
+      this.indent();
+      if (this._options.space_in_paren) {
+        this._output.space_before_token = true;
+      }
+      return;
+    }
+
+    next_mode = MODE.ArrayLiteral;
+    if (is_array(this._flags.mode)) {
+      if (this._flags.last_token.text === '[' ||
+        (this._flags.last_token.text === ',' && (this._last_last_text === ']' || this._last_last_text === '}'))) {
+        // ], [ goes to new line
+        // }, [ goes to new line
+        if (!this._options.keep_array_indentation) {
+          this.print_newline();
+        }
+      }
+    }
+
+    if (!in_array(this._flags.last_token.type, [TOKEN.START_EXPR, TOKEN.END_EXPR, TOKEN.WORD, TOKEN.OPERATOR])) {
+      this._output.space_before_token = true;
+    }
+  } else {
+    if (this._flags.last_token.type === TOKEN.RESERVED) {
+      if (this._flags.last_token.text === 'for') {
+        this._output.space_before_token = this._options.space_before_conditional;
+        next_mode = MODE.ForInitializer;
+      } else if (in_array(this._flags.last_token.text, ['if', 'while'])) {
+        this._output.space_before_token = this._options.space_before_conditional;
+        next_mode = MODE.Conditional;
+      } else if (in_array(this._flags.last_word, ['await', 'async'])) {
+        // Should be a space between await and an IIFE, or async and an arrow function
+        this._output.space_before_token = true;
+      } else if (this._flags.last_token.text === 'import' && current_token.whitespace_before === '') {
+        this._output.space_before_token = false;
+      } else if (in_array(this._flags.last_token.text, line_starters) || this._flags.last_token.text === 'catch') {
+        this._output.space_before_token = true;
+      }
+    } else if (this._flags.last_token.type === TOKEN.EQUALS || this._flags.last_token.type === TOKEN.OPERATOR) {
+      // Support of this kind of newline preservation.
+      // a = (b &&
+      //     (c || d));
+      if (!this.start_of_object_property()) {
+        this.allow_wrap_or_preserved_newline(current_token);
+      }
+    } else if (this._flags.last_token.type === TOKEN.WORD) {
+      this._output.space_before_token = false;
+
+      // function name() vs function name ()
+      // function* name() vs function* name ()
+      // async name() vs async name ()
+      // In ES6, you can also define the method properties of an object
+      // var obj = {a: function() {}}
+      // It can be abbreviated
+      // var obj = {a() {}}
+      // var obj = { a() {}} vs var obj = { a () {}}
+      // var obj = { * a() {}} vs var obj = { * a () {}}
+      var peek_back_two = this._tokens.peek(-3);
+      if (this._options.space_after_named_function && peek_back_two) {
+        // peek starts at next character so -1 is current token
+        var peek_back_three = this._tokens.peek(-4);
+        if (reserved_array(peek_back_two, ['async', 'function']) ||
+          (peek_back_two.text === '*' && reserved_array(peek_back_three, ['async', 'function']))) {
+          this._output.space_before_token = true;
+        } else if (this._flags.mode === MODE.ObjectLiteral) {
+          if ((peek_back_two.text === '{' || peek_back_two.text === ',') ||
+            (peek_back_two.text === '*' && (peek_back_three.text === '{' || peek_back_three.text === ','))) {
+            this._output.space_before_token = true;
+          }
+        }
+      }
+    } else {
+      // Support preserving wrapped arrow function expressions
+      // a.b('c',
+      //     () => d.e
+      // )
+      this.allow_wrap_or_preserved_newline(current_token);
+    }
+
+    // function() vs function ()
+    // yield*() vs yield* ()
+    // function*() vs function* ()
+    if ((this._flags.last_token.type === TOKEN.RESERVED && (this._flags.last_word === 'function' || this._flags.last_word === 'typeof')) ||
+      (this._flags.last_token.text === '*' &&
+        (in_array(this._last_last_text, ['function', 'yield']) ||
+          (this._flags.mode === MODE.ObjectLiteral && in_array(this._last_last_text, ['{', ',']))))) {
+      this._output.space_before_token = this._options.space_after_anon_function;
+    }
+  }
+
+  if (this._flags.last_token.text === ';' || this._flags.last_token.type === TOKEN.START_BLOCK) {
+    this.print_newline();
+  } else if (this._flags.last_token.type === TOKEN.END_EXPR || this._flags.last_token.type === TOKEN.START_EXPR || this._flags.last_token.type === TOKEN.END_BLOCK || this._flags.last_token.text === '.' || this._flags.last_token.type === TOKEN.COMMA) {
+    // do nothing on (( and )( and ][ and ]( and .(
+    // TODO: Consider whether forcing this is required.  Review failing tests when removed.
+    this.allow_wrap_or_preserved_newline(current_token, current_token.newlines);
+  }
+
+  this.print_token(current_token);
+  this.set_mode(next_mode);
+  if (this._options.space_in_paren) {
+    this._output.space_before_token = true;
+  }
 
-        // do {} while () // no statement required after
-        if (flags.do_while && previous_flags.mode === MODE.Conditional) {
-            previous_flags.mode = MODE.Expression;
-            flags.do_block = false;
-            flags.do_while = false;
+  // In all cases, if we newline while inside an expression it should be indented.
+  this.indent();
+};
 
-        }
-    }
+Beautifier.prototype.handle_end_expr = function(current_token) {
+  // statements inside expressions are not valid syntax, but...
+  // statements must all be closed when their container closes
+  while (this._flags.mode === MODE.Statement) {
+    this.restore_mode();
+  }
+
+  this.handle_whitespace_and_comments(current_token);
+
+  if (this._flags.multiline_frame) {
+    this.allow_wrap_or_preserved_newline(current_token,
+      current_token.text === ']' && is_array(this._flags.mode) && !this._options.keep_array_indentation);
+  }
+
+  if (this._options.space_in_paren) {
+    if (this._flags.last_token.type === TOKEN.START_EXPR && !this._options.space_in_empty_paren) {
+      // () [] no inner space in empty parens like these, ever, ref #320
+      this._output.trim();
+      this._output.space_before_token = false;
+    } else {
+      this._output.space_before_token = true;
+    }
+  }
+  this.deindent();
+  this.print_token(current_token);
+  this.restore_mode();
+
+  remove_redundant_indentation(this._output, this._previous_flags);
+
+  // do {} while () // no statement required after
+  if (this._flags.do_while && this._previous_flags.mode === MODE.Conditional) {
+    this._previous_flags.mode = MODE.Expression;
+    this._flags.do_block = false;
+    this._flags.do_while = false;
 
-    function handle_start_block() {
-        set_mode(MODE.BlockStatement);
+  }
+};
 
-        var empty_braces = is_next('}');
-        var empty_anonymous_function = empty_braces && flags.last_word === 'function' &&
-            last_type === 'TK_END_EXPR';
-
-        if (opt.brace_style === "expand") {
-            if (last_type !== 'TK_OPERATOR' &&
-                (empty_anonymous_function ||
-                    last_type === 'TK_EQUALS' ||
-                    (last_type === 'TK_RESERVED' && is_special_word(flags.last_text) && flags.last_text !== 'else'))) {
-                output_space_before_token = true;
-            } else {
-                print_newline(false, true);
-            }
-        } else { // collapse
-            if (last_type !== 'TK_OPERATOR' && last_type !== 'TK_START_EXPR') {
-                if (last_type === 'TK_START_BLOCK') {
-                    print_newline();
-                } else {
-                    output_space_before_token = true;
-                }
-            } else {
-                // if TK_OPERATOR or TK_START_EXPR
-                if (is_array(previous_flags.mode) && flags.last_text === ',') {
-                    if (last_last_text === '}') {
-                        // }, { in array context
-                        output_space_before_token = true;
-                    } else {
-                        print_newline(); // [a, b, c, {
-                    }
-                }
-            }
-        }
-        print_token();
-        indent();
-    }
+Beautifier.prototype.handle_start_block = function(current_token) {
+  this.handle_whitespace_and_comments(current_token);
 
-    function handle_end_block() {
-        // statements must all be closed when their container closes
-        while (flags.mode === MODE.Statement) {
-            restore_mode();
-        }
-        var empty_braces = last_type === 'TK_START_BLOCK';
+  // Check if this is should be treated as a ObjectLiteral
+  var next_token = this._tokens.peek();
+  var second_token = this._tokens.peek(1);
+  if (this._flags.last_word === 'switch' && this._flags.last_token.type === TOKEN.END_EXPR) {
+    this.set_mode(MODE.BlockStatement);
+    this._flags.in_case_statement = true;
+  } else if (this._flags.case_body) {
+    this.set_mode(MODE.BlockStatement);
+  } else if (second_token && (
+      (in_array(second_token.text, [':', ',']) && in_array(next_token.type, [TOKEN.STRING, TOKEN.WORD, TOKEN.RESERVED])) ||
+      (in_array(next_token.text, ['get', 'set', '...']) && in_array(second_token.type, [TOKEN.WORD, TOKEN.RESERVED]))
+    )) {
+    // We don't support TypeScript,but we didn't break it for a very long time.
+    // We'll try to keep not breaking it.
+    if (!in_array(this._last_last_text, ['class', 'interface'])) {
+      this.set_mode(MODE.ObjectLiteral);
+    } else {
+      this.set_mode(MODE.BlockStatement);
+    }
+  } else if (this._flags.last_token.type === TOKEN.OPERATOR && this._flags.last_token.text === '=>') {
+    // arrow function: (param1, paramN) => { statements }
+    this.set_mode(MODE.BlockStatement);
+  } else if (in_array(this._flags.last_token.type, [TOKEN.EQUALS, TOKEN.START_EXPR, TOKEN.COMMA, TOKEN.OPERATOR]) ||
+    reserved_array(this._flags.last_token, ['return', 'throw', 'import', 'default'])
+  ) {
+    // Detecting shorthand function syntax is difficult by scanning forward,
+    //     so check the surrounding context.
+    // If the block is being returned, imported, export default, passed as arg,
+    //     assigned with = or assigned in a nested object, treat as an ObjectLiteral.
+    this.set_mode(MODE.ObjectLiteral);
+  } else {
+    this.set_mode(MODE.BlockStatement);
+  }
+
+  var empty_braces = !next_token.comments_before && next_token.text === '}';
+  var empty_anonymous_function = empty_braces && this._flags.last_word === 'function' &&
+    this._flags.last_token.type === TOKEN.END_EXPR;
+
+  if (this._options.brace_preserve_inline) // check for inline, set inline_frame if so
+  {
+    // search forward for a newline wanted inside this block
+    var index = 0;
+    var check_token = null;
+    this._flags.inline_frame = true;
+    do {
+      index += 1;
+      check_token = this._tokens.peek(index - 1);
+      if (check_token.newlines) {
+        this._flags.inline_frame = false;
+        break;
+      }
+    } while (check_token.type !== TOKEN.EOF &&
+      !(check_token.type === TOKEN.END_BLOCK && check_token.opened === current_token));
+  }
+
+  if ((this._options.brace_style === "expand" ||
+      (this._options.brace_style === "none" && current_token.newlines)) &&
+    !this._flags.inline_frame) {
+    if (this._flags.last_token.type !== TOKEN.OPERATOR &&
+      (empty_anonymous_function ||
+        this._flags.last_token.type === TOKEN.EQUALS ||
+        (reserved_array(this._flags.last_token, special_words) && this._flags.last_token.text !== 'else'))) {
+      this._output.space_before_token = true;
+    } else {
+      this.print_newline(false, true);
+    }
+  } else { // collapse || inline_frame
+    if (is_array(this._previous_flags.mode) && (this._flags.last_token.type === TOKEN.START_EXPR || this._flags.last_token.type === TOKEN.COMMA)) {
+      if (this._flags.last_token.type === TOKEN.COMMA || this._options.space_in_paren) {
+        this._output.space_before_token = true;
+      }
+
+      if (this._flags.last_token.type === TOKEN.COMMA || (this._flags.last_token.type === TOKEN.START_EXPR && this._flags.inline_frame)) {
+        this.allow_wrap_or_preserved_newline(current_token);
+        this._previous_flags.multiline_frame = this._previous_flags.multiline_frame || this._flags.multiline_frame;
+        this._flags.multiline_frame = false;
+      }
+    }
+    if (this._flags.last_token.type !== TOKEN.OPERATOR && this._flags.last_token.type !== TOKEN.START_EXPR) {
+      if (this._flags.last_token.type === TOKEN.START_BLOCK && !this._flags.inline_frame) {
+        this.print_newline();
+      } else {
+        this._output.space_before_token = true;
+      }
+    }
+  }
+  this.print_token(current_token);
+  this.indent();
+
+  // Except for specific cases, open braces are followed by a new line.
+  if (!empty_braces && !(this._options.brace_preserve_inline && this._flags.inline_frame)) {
+    this.print_newline();
+  }
+};
 
-        if (opt.brace_style === "expand") {
-            if (!empty_braces) {
-                print_newline();
-            }
+Beautifier.prototype.handle_end_block = function(current_token) {
+  // statements must all be closed when their container closes
+  this.handle_whitespace_and_comments(current_token);
+
+  while (this._flags.mode === MODE.Statement) {
+    this.restore_mode();
+  }
+
+  var empty_braces = this._flags.last_token.type === TOKEN.START_BLOCK;
+
+  if (this._flags.inline_frame && !empty_braces) { // try inline_frame (only set if this._options.braces-preserve-inline) first
+    this._output.space_before_token = true;
+  } else if (this._options.brace_style === "expand") {
+    if (!empty_braces) {
+      this.print_newline();
+    }
+  } else {
+    // skip {}
+    if (!empty_braces) {
+      if (is_array(this._flags.mode) && this._options.keep_array_indentation) {
+        // we REALLY need a newline here, but newliner would skip that
+        this._options.keep_array_indentation = false;
+        this.print_newline();
+        this._options.keep_array_indentation = true;
+
+      } else {
+        this.print_newline();
+      }
+    }
+  }
+  this.restore_mode();
+  this.print_token(current_token);
+};
+
+Beautifier.prototype.handle_word = function(current_token) {
+  if (current_token.type === TOKEN.RESERVED) {
+    if (in_array(current_token.text, ['set', 'get']) && this._flags.mode !== MODE.ObjectLiteral) {
+      current_token.type = TOKEN.WORD;
+    } else if (current_token.text === 'import' && this._tokens.peek().text === '(') {
+      current_token.type = TOKEN.WORD;
+    } else if (in_array(current_token.text, ['as', 'from']) && !this._flags.import_block) {
+      current_token.type = TOKEN.WORD;
+    } else if (this._flags.mode === MODE.ObjectLiteral) {
+      var next_token = this._tokens.peek();
+      if (next_token.text === ':') {
+        current_token.type = TOKEN.WORD;
+      }
+    }
+  }
+
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+    if (reserved_array(this._flags.last_token, ['var', 'let', 'const']) && current_token.type === TOKEN.WORD) {
+      this._flags.declaration_statement = true;
+    }
+  } else if (current_token.newlines && !is_expression(this._flags.mode) &&
+    (this._flags.last_token.type !== TOKEN.OPERATOR || (this._flags.last_token.text === '--' || this._flags.last_token.text === '++')) &&
+    this._flags.last_token.type !== TOKEN.EQUALS &&
+    (this._options.preserve_newlines || !reserved_array(this._flags.last_token, ['var', 'let', 'const', 'set', 'get']))) {
+    this.handle_whitespace_and_comments(current_token);
+    this.print_newline();
+  } else {
+    this.handle_whitespace_and_comments(current_token);
+  }
+
+  if (this._flags.do_block && !this._flags.do_while) {
+    if (reserved_word(current_token, 'while')) {
+      // do {} ## while ()
+      this._output.space_before_token = true;
+      this.print_token(current_token);
+      this._output.space_before_token = true;
+      this._flags.do_while = true;
+      return;
+    } else {
+      // do {} should always have while as the next word.
+      // if we don't see the expected while, recover
+      this.print_newline();
+      this._flags.do_block = false;
+    }
+  }
+
+  // if may be followed by else, or not
+  // Bare/inline ifs are tricky
+  // Need to unwind the modes correctly: if (a) if (b) c(); else d(); else e();
+  if (this._flags.if_block) {
+    if (!this._flags.else_block && reserved_word(current_token, 'else')) {
+      this._flags.else_block = true;
+    } else {
+      while (this._flags.mode === MODE.Statement) {
+        this.restore_mode();
+      }
+      this._flags.if_block = false;
+      this._flags.else_block = false;
+    }
+  }
+
+  if (this._flags.in_case_statement && reserved_array(current_token, ['case', 'default'])) {
+    this.print_newline();
+    if (this._flags.last_token.type !== TOKEN.END_BLOCK && (this._flags.case_body || this._options.jslint_happy)) {
+      // switch cases following one another
+      this.deindent();
+    }
+    this._flags.case_body = false;
+
+    this.print_token(current_token);
+    this._flags.in_case = true;
+    return;
+  }
+
+  if (this._flags.last_token.type === TOKEN.COMMA || this._flags.last_token.type === TOKEN.START_EXPR || this._flags.last_token.type === TOKEN.EQUALS || this._flags.last_token.type === TOKEN.OPERATOR) {
+    if (!this.start_of_object_property()) {
+      this.allow_wrap_or_preserved_newline(current_token);
+    }
+  }
+
+  if (reserved_word(current_token, 'function')) {
+    if (in_array(this._flags.last_token.text, ['}', ';']) ||
+      (this._output.just_added_newline() && !(in_array(this._flags.last_token.text, ['(', '[', '{', ':', '=', ',']) || this._flags.last_token.type === TOKEN.OPERATOR))) {
+      // make sure there is a nice clean space of at least one blank line
+      // before a new function definition
+      if (!this._output.just_added_blankline() && !current_token.comments_before) {
+        this.print_newline();
+        this.print_newline(true);
+      }
+    }
+    if (this._flags.last_token.type === TOKEN.RESERVED || this._flags.last_token.type === TOKEN.WORD) {
+      if (reserved_array(this._flags.last_token, ['get', 'set', 'new', 'export']) ||
+        reserved_array(this._flags.last_token, newline_restricted_tokens)) {
+        this._output.space_before_token = true;
+      } else if (reserved_word(this._flags.last_token, 'default') && this._last_last_text === 'export') {
+        this._output.space_before_token = true;
+      } else if (this._flags.last_token.text === 'declare') {
+        // accomodates Typescript declare function formatting
+        this._output.space_before_token = true;
+      } else {
+        this.print_newline();
+      }
+    } else if (this._flags.last_token.type === TOKEN.OPERATOR || this._flags.last_token.text === '=') {
+      // foo = function
+      this._output.space_before_token = true;
+    } else if (!this._flags.multiline_frame && (is_expression(this._flags.mode) || is_array(this._flags.mode))) {
+      // (function
+    } else {
+      this.print_newline();
+    }
+
+    this.print_token(current_token);
+    this._flags.last_word = current_token.text;
+    return;
+  }
+
+  var prefix = 'NONE';
+
+  if (this._flags.last_token.type === TOKEN.END_BLOCK) {
+
+    if (this._previous_flags.inline_frame) {
+      prefix = 'SPACE';
+    } else if (!reserved_array(current_token, ['else', 'catch', 'finally', 'from'])) {
+      prefix = 'NEWLINE';
+    } else {
+      if (this._options.brace_style === "expand" ||
+        this._options.brace_style === "end-expand" ||
+        (this._options.brace_style === "none" && current_token.newlines)) {
+        prefix = 'NEWLINE';
+      } else {
+        prefix = 'SPACE';
+        this._output.space_before_token = true;
+      }
+    }
+  } else if (this._flags.last_token.type === TOKEN.SEMICOLON && this._flags.mode === MODE.BlockStatement) {
+    // TODO: Should this be for STATEMENT as well?
+    prefix = 'NEWLINE';
+  } else if (this._flags.last_token.type === TOKEN.SEMICOLON && is_expression(this._flags.mode)) {
+    prefix = 'SPACE';
+  } else if (this._flags.last_token.type === TOKEN.STRING) {
+    prefix = 'NEWLINE';
+  } else if (this._flags.last_token.type === TOKEN.RESERVED || this._flags.last_token.type === TOKEN.WORD ||
+    (this._flags.last_token.text === '*' &&
+      (in_array(this._last_last_text, ['function', 'yield']) ||
+        (this._flags.mode === MODE.ObjectLiteral && in_array(this._last_last_text, ['{', ',']))))) {
+    prefix = 'SPACE';
+  } else if (this._flags.last_token.type === TOKEN.START_BLOCK) {
+    if (this._flags.inline_frame) {
+      prefix = 'SPACE';
+    } else {
+      prefix = 'NEWLINE';
+    }
+  } else if (this._flags.last_token.type === TOKEN.END_EXPR) {
+    this._output.space_before_token = true;
+    prefix = 'NEWLINE';
+  }
+
+  if (reserved_array(current_token, line_starters) && this._flags.last_token.text !== ')') {
+    if (this._flags.inline_frame || this._flags.last_token.text === 'else' || this._flags.last_token.text === 'export') {
+      prefix = 'SPACE';
+    } else {
+      prefix = 'NEWLINE';
+    }
+
+  }
+
+  if (reserved_array(current_token, ['else', 'catch', 'finally'])) {
+    if ((!(this._flags.last_token.type === TOKEN.END_BLOCK && this._previous_flags.mode === MODE.BlockStatement) ||
+        this._options.brace_style === "expand" ||
+        this._options.brace_style === "end-expand" ||
+        (this._options.brace_style === "none" && current_token.newlines)) &&
+      !this._flags.inline_frame) {
+      this.print_newline();
+    } else {
+      this._output.trim(true);
+      var line = this._output.current_line;
+      // If we trimmed and there's something other than a close block before us
+      // put a newline back in.  Handles '} // comment' scenario.
+      if (line.last() !== '}') {
+        this.print_newline();
+      }
+      this._output.space_before_token = true;
+    }
+  } else if (prefix === 'NEWLINE') {
+    if (reserved_array(this._flags.last_token, special_words)) {
+      // no newline between 'return nnn'
+      this._output.space_before_token = true;
+    } else if (this._flags.last_token.text === 'declare' && reserved_array(current_token, ['var', 'let', 'const'])) {
+      // accomodates Typescript declare formatting
+      this._output.space_before_token = true;
+    } else if (this._flags.last_token.type !== TOKEN.END_EXPR) {
+      if ((this._flags.last_token.type !== TOKEN.START_EXPR || !reserved_array(current_token, ['var', 'let', 'const'])) && this._flags.last_token.text !== ':') {
+        // no need to force newline on 'var': for (var x = 0...)
+        if (reserved_word(current_token, 'if') && reserved_word(current_token.previous, 'else')) {
+          // no newline for } else if {
+          this._output.space_before_token = true;
         } else {
-            // skip {}
-            if (!empty_braces) {
-                if (is_array(flags.mode) && opt.keep_array_indentation) {
-                    // we REALLY need a newline here, but newliner would skip that
-                    opt.keep_array_indentation = false;
-                    print_newline();
-                    opt.keep_array_indentation = true;
-
-                } else {
-                    print_newline();
-                }
-            }
+          this.print_newline();
         }
-        restore_mode();
-        print_token();
+      }
+    } else if (reserved_array(current_token, line_starters) && this._flags.last_token.text !== ')') {
+      this.print_newline();
+    }
+  } else if (this._flags.multiline_frame && is_array(this._flags.mode) && this._flags.last_token.text === ',' && this._last_last_text === '}') {
+    this.print_newline(); // }, in lists get a newline treatment
+  } else if (prefix === 'SPACE') {
+    this._output.space_before_token = true;
+  }
+  if (current_token.previous && (current_token.previous.type === TOKEN.WORD || current_token.previous.type === TOKEN.RESERVED)) {
+    this._output.space_before_token = true;
+  }
+  this.print_token(current_token);
+  this._flags.last_word = current_token.text;
+
+  if (current_token.type === TOKEN.RESERVED) {
+    if (current_token.text === 'do') {
+      this._flags.do_block = true;
+    } else if (current_token.text === 'if') {
+      this._flags.if_block = true;
+    } else if (current_token.text === 'import') {
+      this._flags.import_block = true;
+    } else if (this._flags.import_block && reserved_word(current_token, 'from')) {
+      this._flags.import_block = false;
     }
+  }
+};
 
-    function handle_word() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-        } else if (input_wanted_newline && !is_expression(flags.mode) &&
-            (last_type !== 'TK_OPERATOR' || (flags.last_text === '--' || flags.last_text === '++')) &&
-            last_type !== 'TK_EQUALS' &&
-            (opt.preserve_newlines || !(last_type === 'TK_RESERVED' && in_array(flags.last_text, ['var', 'let', 'const', 'set', 'get'])))) {
-
-            print_newline();
-        }
+Beautifier.prototype.handle_semicolon = function(current_token) {
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+    // Semicolon can be the start (and end) of a statement
+    this._output.space_before_token = false;
+  } else {
+    this.handle_whitespace_and_comments(current_token);
+  }
+
+  var next_token = this._tokens.peek();
+  while (this._flags.mode === MODE.Statement &&
+    !(this._flags.if_block && reserved_word(next_token, 'else')) &&
+    !this._flags.do_block) {
+    this.restore_mode();
+  }
+
+  // hacky but effective for the moment
+  if (this._flags.import_block) {
+    this._flags.import_block = false;
+  }
+  this.print_token(current_token);
+};
 
-        if (flags.do_block && !flags.do_while) {
-            if (token_type === 'TK_RESERVED' && token_text === 'while') {
-                // do {} ## while ()
-                output_space_before_token = true;
-                print_token();
-                output_space_before_token = true;
-                flags.do_while = true;
-                return;
-            } else {
-                // do {} should always have while as the next word.
-                // if we don't see the expected while, recover
-                print_newline();
-                flags.do_block = false;
-            }
-        }
+Beautifier.prototype.handle_string = function(current_token) {
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+    // One difference - strings want at least a space before
+    this._output.space_before_token = true;
+  } else {
+    this.handle_whitespace_and_comments(current_token);
+    if (this._flags.last_token.type === TOKEN.RESERVED || this._flags.last_token.type === TOKEN.WORD || this._flags.inline_frame) {
+      this._output.space_before_token = true;
+    } else if (this._flags.last_token.type === TOKEN.COMMA || this._flags.last_token.type === TOKEN.START_EXPR || this._flags.last_token.type === TOKEN.EQUALS || this._flags.last_token.type === TOKEN.OPERATOR) {
+      if (!this.start_of_object_property()) {
+        this.allow_wrap_or_preserved_newline(current_token);
+      }
+    } else {
+      this.print_newline();
+    }
+  }
+  this.print_token(current_token);
+};
 
-        // if may be followed by else, or not
-        // Bare/inline ifs are tricky
-        // Need to unwind the modes correctly: if (a) if (b) c(); else d(); else e();
-        if (flags.if_block) {
-            if (!flags.else_block && (token_type === 'TK_RESERVED' && token_text === 'else')) {
-                flags.else_block = true;
-            } else {
-                while (flags.mode === MODE.Statement) {
-                    restore_mode();
-                }
-                flags.if_block = false;
-                flags.else_block = false;
-            }
-        }
+Beautifier.prototype.handle_equals = function(current_token) {
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+  } else {
+    this.handle_whitespace_and_comments(current_token);
+  }
+
+  if (this._flags.declaration_statement) {
+    // just got an '=' in a var-line, different formatting/line-breaking, etc will now be done
+    this._flags.declaration_assignment = true;
+  }
+  this._output.space_before_token = true;
+  this.print_token(current_token);
+  this._output.space_before_token = true;
+};
 
-        if (token_type === 'TK_RESERVED' && (token_text === 'case' || (token_text === 'default' && flags.in_case_statement))) {
-            print_newline();
-            if (flags.case_body || opt.jslint_happy) {
-                // switch cases following one another
-                deindent();
-                flags.case_body = false;
-            }
-            print_token();
-            flags.in_case = true;
-            flags.in_case_statement = true;
-            return;
-        }
+Beautifier.prototype.handle_comma = function(current_token) {
+  this.handle_whitespace_and_comments(current_token, true);
 
-        if (token_type === 'TK_RESERVED' && token_text === 'function') {
-            if (in_array(flags.last_text, ['}', ';']) || (just_added_newline() && ! in_array(flags.last_text, ['{', ':', '=', ',']))) {
-                // make sure there is a nice clean space of at least one blank line
-                // before a new function definition
-                if ( ! just_added_blankline() && ! flags.had_comment) {
-                    print_newline();
-                    print_newline(true);
-                }
-            }
-            if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD') {
-                if (last_type === 'TK_RESERVED' && in_array(flags.last_text, ['get', 'set', 'new', 'return'])) {
-                    output_space_before_token = true;
-                } else {
-                    print_newline();
-                }
-            } else if (last_type === 'TK_OPERATOR' || flags.last_text === '=') {
-                // foo = function
-                output_space_before_token = true;
-            } else if (is_expression(flags.mode)) {
-                // (function
-            } else {
-                print_newline();
-            }
-        }
+  this.print_token(current_token);
+  this._output.space_before_token = true;
+  if (this._flags.declaration_statement) {
+    if (is_expression(this._flags.parent.mode)) {
+      // do not break on comma, for(var a = 1, b = 2)
+      this._flags.declaration_assignment = false;
+    }
+
+    if (this._flags.declaration_assignment) {
+      this._flags.declaration_assignment = false;
+      this.print_newline(false, true);
+    } else if (this._options.comma_first) {
+      // for comma-first, we want to allow a newline before the comma
+      // to turn into a newline after the comma, which we will fixup later
+      this.allow_wrap_or_preserved_newline(current_token);
+    }
+  } else if (this._flags.mode === MODE.ObjectLiteral ||
+    (this._flags.mode === MODE.Statement && this._flags.parent.mode === MODE.ObjectLiteral)) {
+    if (this._flags.mode === MODE.Statement) {
+      this.restore_mode();
+    }
+
+    if (!this._flags.inline_frame) {
+      this.print_newline();
+    }
+  } else if (this._options.comma_first) {
+    // EXPR or DO_BLOCK
+    // for comma-first, we want to allow a newline before the comma
+    // to turn into a newline after the comma, which we will fixup later
+    this.allow_wrap_or_preserved_newline(current_token);
+  }
+};
 
-        if (last_type === 'TK_COMMA' || last_type === 'TK_START_EXPR' || last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') {
-            if (!start_of_object_property()) {
-                allow_wrap_or_preserved_newline();
-            }
+Beautifier.prototype.handle_operator = function(current_token) {
+  var isGeneratorAsterisk = current_token.text === '*' &&
+    (reserved_array(this._flags.last_token, ['function', 'yield']) ||
+      (in_array(this._flags.last_token.type, [TOKEN.START_BLOCK, TOKEN.COMMA, TOKEN.END_BLOCK, TOKEN.SEMICOLON]))
+    );
+  var isUnary = in_array(current_token.text, ['-', '+']) && (
+    in_array(this._flags.last_token.type, [TOKEN.START_BLOCK, TOKEN.START_EXPR, TOKEN.EQUALS, TOKEN.OPERATOR]) ||
+    in_array(this._flags.last_token.text, line_starters) ||
+    this._flags.last_token.text === ','
+  );
+
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+  } else {
+    var preserve_statement_flags = !isGeneratorAsterisk;
+    this.handle_whitespace_and_comments(current_token, preserve_statement_flags);
+  }
+
+  if (reserved_array(this._flags.last_token, special_words)) {
+    // "return" had a special handling in TK_WORD. Now we need to return the favor
+    this._output.space_before_token = true;
+    this.print_token(current_token);
+    return;
+  }
+
+  // hack for actionscript's import .*;
+  if (current_token.text === '*' && this._flags.last_token.type === TOKEN.DOT) {
+    this.print_token(current_token);
+    return;
+  }
+
+  if (current_token.text === '::') {
+    // no spaces around exotic namespacing syntax operator
+    this.print_token(current_token);
+    return;
+  }
+
+  // Allow line wrapping between operators when operator_position is
+  //   set to before or preserve
+  if (this._flags.last_token.type === TOKEN.OPERATOR && in_array(this._options.operator_position, OPERATOR_POSITION_BEFORE_OR_PRESERVE)) {
+    this.allow_wrap_or_preserved_newline(current_token);
+  }
+
+  if (current_token.text === ':' && this._flags.in_case) {
+    this.print_token(current_token);
+
+    this._flags.in_case = false;
+    this._flags.case_body = true;
+    if (this._tokens.peek().type !== TOKEN.START_BLOCK) {
+      this.indent();
+      this.print_newline();
+    } else {
+      this._output.space_before_token = true;
+    }
+    return;
+  }
+
+  var space_before = true;
+  var space_after = true;
+  var in_ternary = false;
+  if (current_token.text === ':') {
+    if (this._flags.ternary_depth === 0) {
+      // Colon is invalid javascript outside of ternary and object, but do our best to guess what was meant.
+      space_before = false;
+    } else {
+      this._flags.ternary_depth -= 1;
+      in_ternary = true;
+    }
+  } else if (current_token.text === '?') {
+    this._flags.ternary_depth += 1;
+  }
+
+  // let's handle the operator_position option prior to any conflicting logic
+  if (!isUnary && !isGeneratorAsterisk && this._options.preserve_newlines && in_array(current_token.text, positionable_operators)) {
+    var isColon = current_token.text === ':';
+    var isTernaryColon = (isColon && in_ternary);
+    var isOtherColon = (isColon && !in_ternary);
+
+    switch (this._options.operator_position) {
+      case OPERATOR_POSITION.before_newline:
+        // if the current token is : and it's not a ternary statement then we set space_before to false
+        this._output.space_before_token = !isOtherColon;
+
+        this.print_token(current_token);
+
+        if (!isColon || isTernaryColon) {
+          this.allow_wrap_or_preserved_newline(current_token);
+        }
+
+        this._output.space_before_token = true;
+        return;
+
+      case OPERATOR_POSITION.after_newline:
+        // if the current token is anything but colon, or (via deduction) it's a colon and in a ternary statement,
+        //   then print a newline.
+
+        this._output.space_before_token = true;
+
+        if (!isColon || isTernaryColon) {
+          if (this._tokens.peek().newlines) {
+            this.print_newline(false, true);
+          } else {
+            this.allow_wrap_or_preserved_newline(current_token);
+          }
+        } else {
+          this._output.space_before_token = false;
         }
 
-        if (token_type === 'TK_RESERVED' && token_text === 'function') {
-            print_token();
-            flags.last_word = token_text;
-            return;
-        }
+        this.print_token(current_token);
 
-        prefix = 'NONE';
+        this._output.space_before_token = true;
+        return;
 
-        if (last_type === 'TK_END_BLOCK') {
-            if (!(token_type === 'TK_RESERVED' && in_array(token_text, ['else', 'catch', 'finally']))) {
-                prefix = 'NEWLINE';
-            } else {
-                if (opt.brace_style === "expand" || opt.brace_style === "end-expand") {
-                    prefix = 'NEWLINE';
-                } else {
-                    prefix = 'SPACE';
-                    output_space_before_token = true;
-                }
-            }
-        } else if (last_type === 'TK_SEMICOLON' && flags.mode === MODE.BlockStatement) {
-            // TODO: Should this be for STATEMENT as well?
-            prefix = 'NEWLINE';
-        } else if (last_type === 'TK_SEMICOLON' && is_expression(flags.mode)) {
-            prefix = 'SPACE';
-        } else if (last_type === 'TK_STRING') {
-            prefix = 'NEWLINE';
-        } else if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD' ||
-            (flags.last_text === '*' && last_last_text === 'function')) {
-            prefix = 'SPACE';
-        } else if (last_type === 'TK_START_BLOCK') {
-            prefix = 'NEWLINE';
-        } else if (last_type === 'TK_END_EXPR') {
-            output_space_before_token = true;
-            prefix = 'NEWLINE';
+      case OPERATOR_POSITION.preserve_newline:
+        if (!isOtherColon) {
+          this.allow_wrap_or_preserved_newline(current_token);
         }
 
-        if (token_type === 'TK_RESERVED' && in_array(token_text, line_starters) && flags.last_text !== ')') {
-            if (flags.last_text === 'else') {
-                prefix = 'SPACE';
-            } else {
-                prefix = 'NEWLINE';
-            }
+        // if we just added a newline, or the current token is : and it's not a ternary statement,
+        //   then we set space_before to false
+        space_before = !(this._output.just_added_newline() || isOtherColon);
 
-        }
+        this._output.space_before_token = space_before;
+        this.print_token(current_token);
+        this._output.space_before_token = true;
+        return;
+    }
+  }
 
-        if (token_type === 'TK_RESERVED' && in_array(token_text, ['else', 'catch', 'finally'])) {
-            if (last_type !== 'TK_END_BLOCK' || opt.brace_style === "expand" || opt.brace_style === "end-expand") {
-                print_newline();
-            } else {
-                trim_output(true);
-                var line = output_lines[output_lines.length - 1];
-                // If we trimmed and there's something other than a close block before us
-                // put a newline back in.  Handles '} // comment' scenario.
-                if (line.text[line.text.length - 1] !== '}') {
-                    print_newline();
-                }
-                output_space_before_token = true;
-            }
-        } else if (prefix === 'NEWLINE') {
-            if (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) {
-                // no newline between 'return nnn'
-                output_space_before_token = true;
-            } else if (last_type !== 'TK_END_EXPR') {
-                if ((last_type !== 'TK_START_EXPR' || !(token_type === 'TK_RESERVED' && in_array(token_text, ['var', 'let', 'const']))) && flags.last_text !== ':') {
-                    // no need to force newline on 'var': for (var x = 0...)
-                    if (token_type === 'TK_RESERVED' && token_text === 'if' && flags.last_word === 'else' && flags.last_text !== '{') {
-                        // no newline for } else if {
-                        output_space_before_token = true;
-                    } else {
-                        print_newline();
-                    }
-                }
-            } else if (token_type === 'TK_RESERVED' && in_array(token_text, line_starters) && flags.last_text !== ')') {
-                print_newline();
-            }
-        } else if (is_array(flags.mode) && flags.last_text === ',' && last_last_text === '}') {
-            print_newline(); // }, in lists get a newline treatment
-        } else if (prefix === 'SPACE') {
-            output_space_before_token = true;
-        }
-        print_token();
-        flags.last_word = token_text;
+  if (isGeneratorAsterisk) {
+    this.allow_wrap_or_preserved_newline(current_token);
+    space_before = false;
+    var next_token = this._tokens.peek();
+    space_after = next_token && in_array(next_token.type, [TOKEN.WORD, TOKEN.RESERVED]);
+  } else if (current_token.text === '...') {
+    this.allow_wrap_or_preserved_newline(current_token);
+    space_before = this._flags.last_token.type === TOKEN.START_BLOCK;
+    space_after = false;
+  } else if (in_array(current_token.text, ['--', '++', '!', '~']) || isUnary) {
+    // unary operators (and binary +/- pretending to be unary) special cases
+    if (this._flags.last_token.type === TOKEN.COMMA || this._flags.last_token.type === TOKEN.START_EXPR) {
+      this.allow_wrap_or_preserved_newline(current_token);
+    }
 
-        if (token_type === 'TK_RESERVED' && token_text === 'do') {
-            flags.do_block = true;
-        }
+    space_before = false;
+    space_after = false;
 
-        if (token_type === 'TK_RESERVED' && token_text === 'if') {
-            flags.if_block = true;
-        }
+    // http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1
+    // if there is a newline between -- or ++ and anything else we should preserve it.
+    if (current_token.newlines && (current_token.text === '--' || current_token.text === '++')) {
+      this.print_newline(false, true);
     }
 
-    function handle_semicolon() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-            // Semicolon can be the start (and end) of a statement
-            output_space_before_token = false;
-        }
-        while (flags.mode === MODE.Statement && !flags.if_block && !flags.do_block) {
-            restore_mode();
-        }
-        print_token();
-        if (flags.mode === MODE.ObjectLiteral) {
-            // if we're in OBJECT mode and see a semicolon, its invalid syntax
-            // recover back to treating this as a BLOCK
-            flags.mode = MODE.BlockStatement;
-        }
+    if (this._flags.last_token.text === ';' && is_expression(this._flags.mode)) {
+      // for (;; ++i)
+      //        ^^^
+      space_before = true;
     }
 
-    function handle_string() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-            // One difference - strings want at least a space before
-            output_space_before_token = true;
-        } else if (last_type === 'TK_RESERVED' || last_type === 'TK_WORD') {
-            output_space_before_token = true;
-        } else if (last_type === 'TK_COMMA' || last_type === 'TK_START_EXPR' || last_type === 'TK_EQUALS' || last_type === 'TK_OPERATOR') {
-            if (!start_of_object_property()) {
-                allow_wrap_or_preserved_newline();
-            }
-        } else {
-            print_newline();
-        }
-        print_token();
+    if (this._flags.last_token.type === TOKEN.RESERVED) {
+      space_before = true;
+    } else if (this._flags.last_token.type === TOKEN.END_EXPR) {
+      space_before = !(this._flags.last_token.text === ']' && (current_token.text === '--' || current_token.text === '++'));
+    } else if (this._flags.last_token.type === TOKEN.OPERATOR) {
+      // a++ + ++b;
+      // a - -b
+      space_before = in_array(current_token.text, ['--', '-', '++', '+']) && in_array(this._flags.last_token.text, ['--', '-', '++', '+']);
+      // + and - are not unary when preceeded by -- or ++ operator
+      // a-- + b
+      // a * +b
+      // a - -b
+      if (in_array(current_token.text, ['+', '-']) && in_array(this._flags.last_token.text, ['--', '++'])) {
+        space_after = true;
+      }
     }
 
-    function handle_equals() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-        }
 
-        if (flags.declaration_statement) {
-            // just got an '=' in a var-line, different formatting/line-breaking, etc will now be done
-            flags.declaration_assignment = true;
-        }
-        output_space_before_token = true;
-        print_token();
-        output_space_before_token = true;
-    }
-
-    function handle_comma() {
-        if (flags.declaration_statement) {
-            if (is_expression(flags.parent.mode)) {
-                // do not break on comma, for(var a = 1, b = 2)
-                flags.declaration_assignment = false;
-            }
-
-            print_token();
-
-            if (flags.declaration_assignment) {
-                flags.declaration_assignment = false;
-                print_newline(false, true);
-            } else {
-                output_space_before_token = true;
-            }
-            return;
-        }
+    if (((this._flags.mode === MODE.BlockStatement && !this._flags.inline_frame) || this._flags.mode === MODE.Statement) &&
+      (this._flags.last_token.text === '{' || this._flags.last_token.text === ';')) {
+      // { foo; --i }
+      // foo(); --bar;
+      this.print_newline();
+    }
+  }
 
-        print_token();
-        if (flags.mode === MODE.ObjectLiteral ||
-            (flags.mode === MODE.Statement && flags.parent.mode === MODE.ObjectLiteral)) {
-            if (flags.mode === MODE.Statement) {
-                restore_mode();
-            }
-            print_newline();
-        } else {
-            // EXPR or DO_BLOCK
-            output_space_before_token = true;
-        }
+  this._output.space_before_token = this._output.space_before_token || space_before;
+  this.print_token(current_token);
+  this._output.space_before_token = space_after;
+};
 
-    }
+Beautifier.prototype.handle_block_comment = function(current_token, preserve_statement_flags) {
+  if (this._output.raw) {
+    this._output.add_raw_token(current_token);
+    if (current_token.directives && current_token.directives.preserve === 'end') {
+      // If we're testing the raw output behavior, do not allow a directive to turn it off.
+      this._output.raw = this._options.test_output_raw;
+    }
+    return;
+  }
+
+  if (current_token.directives) {
+    this.print_newline(false, preserve_statement_flags);
+    this.print_token(current_token);
+    if (current_token.directives.preserve === 'start') {
+      this._output.raw = true;
+    }
+    this.print_newline(false, true);
+    return;
+  }
+
+  // inline block
+  if (!acorn.newline.test(current_token.text) && !current_token.newlines) {
+    this._output.space_before_token = true;
+    this.print_token(current_token);
+    this._output.space_before_token = true;
+    return;
+  } else {
+    this.print_block_commment(current_token, preserve_statement_flags);
+  }
+};
 
-    function handle_operator() {
-        // Check if this is a BlockStatement that should be treated as a ObjectLiteral
-        if (token_text === ':' && flags.mode === MODE.BlockStatement &&
-                last_last_text === '{' &&
-                (last_type === 'TK_WORD' || last_type === 'TK_RESERVED')){
-            flags.mode = MODE.ObjectLiteral;
-        }
+Beautifier.prototype.print_block_commment = function(current_token, preserve_statement_flags) {
+  var lines = split_linebreaks(current_token.text);
+  var j; // iterator for this case
+  var javadoc = false;
+  var starless = false;
+  var lastIndent = current_token.whitespace_before;
+  var lastIndentLength = lastIndent.length;
+
+  // block comment starts with a new line
+  this.print_newline(false, preserve_statement_flags);
+
+  // first line always indented
+  this.print_token_line_indentation(current_token);
+  this._output.add_token(lines[0]);
+  this.print_newline(false, preserve_statement_flags);
+
+
+  if (lines.length > 1) {
+    lines = lines.slice(1);
+    javadoc = all_lines_start_with(lines, '*');
+    starless = each_line_matches_indent(lines, lastIndent);
+
+    if (javadoc) {
+      this._flags.alignment = 1;
+    }
+
+    for (j = 0; j < lines.length; j++) {
+      if (javadoc) {
+        // javadoc: reformat and re-indent
+        this.print_token_line_indentation(current_token);
+        this._output.add_token(ltrim(lines[j]));
+      } else if (starless && lines[j]) {
+        // starless: re-indent non-empty content, avoiding trim
+        this.print_token_line_indentation(current_token);
+        this._output.add_token(lines[j].substring(lastIndentLength));
+      } else {
+        // normal comments output raw
+        this._output.current_line.set_indent(-1);
+        this._output.add_token(lines[j]);
+      }
 
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-        }
+      // for comments on their own line or  more than one line, make sure there's a new line after
+      this.print_newline(false, preserve_statement_flags);
+    }
 
-        var space_before = true;
-        var space_after = true;
-        if (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) {
-            // "return" had a special handling in TK_WORD. Now we need to return the favor
-            output_space_before_token = true;
-            print_token();
-            return;
-        }
+    this._flags.alignment = 0;
+  }
+};
 
-        // hack for actionscript's import .*;
-        if (token_text === '*' && last_type === 'TK_DOT' && !last_last_text.match(/^\d+$/)) {
-            print_token();
-            return;
-        }
 
-        if (token_text === ':' && flags.in_case) {
-            flags.case_body = true;
-            indent();
-            print_token();
-            print_newline();
-            flags.in_case = false;
-            return;
-        }
+Beautifier.prototype.handle_comment = function(current_token, preserve_statement_flags) {
+  if (current_token.newlines) {
+    this.print_newline(false, preserve_statement_flags);
+  } else {
+    this._output.trim(true);
+  }
+
+  this._output.space_before_token = true;
+  this.print_token(current_token);
+  this.print_newline(false, preserve_statement_flags);
+};
 
-        if (token_text === '::') {
-            // no spaces around exotic namespacing syntax operator
-            print_token();
-            return;
-        }
+Beautifier.prototype.handle_dot = function(current_token) {
+  if (this.start_of_statement(current_token)) {
+    // The conditional starts the statement if appropriate.
+  } else {
+    this.handle_whitespace_and_comments(current_token, true);
+  }
+
+  if (reserved_array(this._flags.last_token, special_words)) {
+    this._output.space_before_token = false;
+  } else {
+    // allow preserved newlines before dots in general
+    // force newlines on dots after close paren when break_chained - for bar().baz()
+    this.allow_wrap_or_preserved_newline(current_token,
+      this._flags.last_token.text === ')' && this._options.break_chained_methods);
+  }
+
+  // Only unindent chained method dot if this dot starts a new line.
+  // Otherwise the automatic extra indentation removal will handle the over indent
+  if (this._options.unindent_chained_methods && this._output.just_added_newline()) {
+    this.deindent();
+  }
 
-        // http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1
-        // if there is a newline between -- or ++ and anything else we should preserve it.
-        if (input_wanted_newline && (token_text === '--' || token_text === '++')) {
-            print_newline();
-        }
+  this.print_token(current_token);
+};
 
-        // Allow line wrapping between operators
-        if (last_type === 'TK_OPERATOR') {
-            allow_wrap_or_preserved_newline();
-        }
+Beautifier.prototype.handle_unknown = function(current_token, preserve_statement_flags) {
+  this.print_token(current_token);
 
-        if (in_array(token_text, ['--', '++', '!', '~']) || (in_array(token_text, ['-', '+']) && (in_array(last_type, ['TK_START_BLOCK', 'TK_START_EXPR', 'TK_EQUALS', 'TK_OPERATOR']) || in_array(flags.last_text, line_starters) || flags.last_text === ','))) {
-            // unary operators (and binary +/- pretending to be unary) special cases
+  if (current_token.text[current_token.text.length - 1] === '\n') {
+    this.print_newline(false, preserve_statement_flags);
+  }
+};
 
-            space_before = false;
-            space_after = false;
+Beautifier.prototype.handle_eof = function(current_token) {
+  // Unwind any open statements
+  while (this._flags.mode === MODE.Statement) {
+    this.restore_mode();
+  }
+  this.handle_whitespace_and_comments(current_token);
+};
 
-            if (flags.last_text === ';' && is_expression(flags.mode)) {
-                // for (;; ++i)
-                //        ^^^
-                space_before = true;
-            }
-
-            if (last_type === 'TK_RESERVED') {
-                space_before = true;
-            }
-
-            if ((flags.mode === MODE.BlockStatement || flags.mode === MODE.Statement) && (flags.last_text === '{' || flags.last_text === ';')) {
-                // { foo; --i }
-                // foo(); --bar;
-                print_newline();
-            }
-        } else if (token_text === ':') {
-            if (flags.ternary_depth === 0) {
-                if (flags.mode === MODE.BlockStatement) {
-                    flags.mode = MODE.ObjectLiteral;
-                }
-                space_before = false;
-            } else {
-                flags.ternary_depth -= 1;
-            }
-        } else if (token_text === '?') {
-            flags.ternary_depth += 1;
-        } else if (token_text === '*' && last_type === 'TK_RESERVED' && flags.last_text === 'function') {
-            space_before = false;
-            space_after = false;
-        }
-        output_space_before_token = output_space_before_token || space_before;
-        print_token();
-        output_space_before_token = space_after;
-    }
-
-    function handle_block_comment() {
-        var lines = split_newlines(token_text);
-        var j; // iterator for this case
-        var javadoc = false;
-        var starless = false;
-        var lastIndent = whitespace_before_token.join('');
-        var lastIndentLength = lastIndent.length;
-
-        // block comment starts with a new line
-        print_newline(false, true);
-        if (lines.length > 1) {
-            if (all_lines_start_with(lines.slice(1), '*')) {
-                javadoc = true;
-            }
-            else if (each_line_matches_indent(lines.slice(1), lastIndent)) {
-                starless = true;
-            }
-        }
+module.exports.Beautifier = Beautifier;
 
-        // first line always indented
-        print_token(lines[0]);
-        for (j = 1; j < lines.length; j++) {
-            print_newline(false, true);
-            if (javadoc) {
-                // javadoc: reformat and re-indent
-                print_token(' ' + trim(lines[j]));
-            } else if (starless && lines[j].length > lastIndentLength) {
-                // starless: re-indent non-empty content, avoiding trim
-                print_token(lines[j].substring(lastIndentLength));
-            } else {
-                // normal comments output raw
-                output_lines[output_lines.length - 1].text.push(lines[j]);
-            }
-        }
 
-        // for comments of more than one line, make sure there's a new line after
-        print_newline(false, true);
-    }
+/***/ }),
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function handle_inline_comment() {
-        output_space_before_token = true;
-        print_token();
-        output_space_before_token = true;
-    }
+"use strict";
+/*jshint node:true */
+/*
+  The MIT License (MIT)
 
-    function handle_comment() {
-        if (input_wanted_newline) {
-            print_newline(false, true);
-        } else {
-            trim_output(true);
-        }
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
 
-        output_space_before_token = true;
-        print_token();
-        print_newline(false, true);
-    }
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
 
-    function handle_dot() {
-        if (start_of_statement()) {
-            // The conditional starts the statement if appropriate.
-        }
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
 
-        if (last_type === 'TK_RESERVED' && is_special_word(flags.last_text)) {
-            output_space_before_token = true;
-        } else {
-            // allow preserved newlines before dots in general
-            // force newlines on dots after close paren when break_chained - for bar().baz()
-            allow_wrap_or_preserved_newline(flags.last_text === ')' && opt.break_chained_methods);
-        }
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
 
-        print_token();
-    }
 
-    function handle_unknown() {
-        print_token();
 
-        if (token_text[token_text.length - 1] === '\n') {
-            print_newline();
-        }
-    }
+function OutputLine(parent) {
+  this.__parent = parent;
+  this.__character_count = 0;
+  // use indent_count as a marker for this.__lines that have preserved indentation
+  this.__indent_count = -1;
+  this.__alignment_count = 0;
+  this.__wrap_point_index = 0;
+  this.__wrap_point_character_count = 0;
+  this.__wrap_point_indent_count = -1;
+  this.__wrap_point_alignment_count = 0;
+
+  this.__items = [];
 }
+
+OutputLine.prototype.clone_empty = function() {
+  var line = new OutputLine(this.__parent);
+  line.set_indent(this.__indent_count, this.__alignment_count);
+  return line;
+};
+
+OutputLine.prototype.item = function(index) {
+  if (index < 0) {
+    return this.__items[this.__items.length + index];
+  } else {
+    return this.__items[index];
+  }
+};
+
+OutputLine.prototype.has_match = function(pattern) {
+  for (var lastCheckedOutput = this.__items.length - 1; lastCheckedOutput >= 0; lastCheckedOutput--) {
+    if (this.__items[lastCheckedOutput].match(pattern)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+OutputLine.prototype.set_indent = function(indent, alignment) {
+  if (this.is_empty()) {
+    this.__indent_count = indent || 0;
+    this.__alignment_count = alignment || 0;
+    this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count);
+  }
+};
+
+OutputLine.prototype._set_wrap_point = function() {
+  if (this.__parent.wrap_line_length) {
+    this.__wrap_point_index = this.__items.length;
+    this.__wrap_point_character_count = this.__character_count;
+    this.__wrap_point_indent_count = this.__parent.next_line.__indent_count;
+    this.__wrap_point_alignment_count = this.__parent.next_line.__alignment_count;
+  }
+};
+
+OutputLine.prototype._should_wrap = function() {
+  return this.__wrap_point_index &&
+    this.__character_count > this.__parent.wrap_line_length &&
+    this.__wrap_point_character_count > this.__parent.next_line.__character_count;
+};
+
+OutputLine.prototype._allow_wrap = function() {
+  if (this._should_wrap()) {
+    this.__parent.add_new_line();
+    var next = this.__parent.current_line;
+    next.set_indent(this.__wrap_point_indent_count, this.__wrap_point_alignment_count);
+    next.__items = this.__items.slice(this.__wrap_point_index);
+    this.__items = this.__items.slice(0, this.__wrap_point_index);
+
+    next.__character_count += this.__character_count - this.__wrap_point_character_count;
+    this.__character_count = this.__wrap_point_character_count;
+
+    if (next.__items[0] === " ") {
+      next.__items.splice(0, 1);
+      next.__character_count -= 1;
+    }
+    return true;
+  }
+  return false;
+};
+
+OutputLine.prototype.is_empty = function() {
+  return this.__items.length === 0;
+};
+
+OutputLine.prototype.last = function() {
+  if (!this.is_empty()) {
+    return this.__items[this.__items.length - 1];
+  } else {
+    return null;
+  }
+};
+
+OutputLine.prototype.push = function(item) {
+  this.__items.push(item);
+  var last_newline_index = item.lastIndexOf('\n');
+  if (last_newline_index !== -1) {
+    this.__character_count = item.length - last_newline_index;
+  } else {
+    this.__character_count += item.length;
+  }
+};
+
+OutputLine.prototype.pop = function() {
+  var item = null;
+  if (!this.is_empty()) {
+    item = this.__items.pop();
+    this.__character_count -= item.length;
+  }
+  return item;
+};
+
+
+OutputLine.prototype._remove_indent = function() {
+  if (this.__indent_count > 0) {
+    this.__indent_count -= 1;
+    this.__character_count -= this.__parent.indent_size;
+  }
+};
+
+OutputLine.prototype._remove_wrap_indent = function() {
+  if (this.__wrap_point_indent_count > 0) {
+    this.__wrap_point_indent_count -= 1;
+  }
+};
+OutputLine.prototype.trim = function() {
+  while (this.last() === ' ') {
+    this.__items.pop();
+    this.__character_count -= 1;
+  }
+};
+
+OutputLine.prototype.toString = function() {
+  var result = '';
+  if (this.is_empty()) {
+    if (this.__parent.indent_empty_lines) {
+      result = this.__parent.get_indent_string(this.__indent_count);
+    }
+  } else {
+    result = this.__parent.get_indent_string(this.__indent_count, this.__alignment_count);
+    result += this.__items.join('');
+  }
+  return result;
+};
+
+function IndentStringCache(options, baseIndentString) {
+  this.__cache = [''];
+  this.__indent_size = options.indent_size;
+  this.__indent_string = options.indent_char;
+  if (!options.indent_with_tabs) {
+    this.__indent_string = new Array(options.indent_size + 1).join(options.indent_char);
+  }
+
+  // Set to null to continue support for auto detection of base indent
+  baseIndentString = baseIndentString || '';
+  if (options.indent_level > 0) {
+    baseIndentString = new Array(options.indent_level + 1).join(this.__indent_string);
+  }
+
+  this.__base_string = baseIndentString;
+  this.__base_string_length = baseIndentString.length;
+}
+
+IndentStringCache.prototype.get_indent_size = function(indent, column) {
+  var result = this.__base_string_length;
+  column = column || 0;
+  if (indent < 0) {
+    result = 0;
+  }
+  result += indent * this.__indent_size;
+  result += column;
+  return result;
+};
+
+IndentStringCache.prototype.get_indent_string = function(indent_level, column) {
+  var result = this.__base_string;
+  column = column || 0;
+  if (indent_level < 0) {
+    indent_level = 0;
+    result = '';
+  }
+  column += indent_level * this.__indent_size;
+  this.__ensure_cache(column);
+  result += this.__cache[column];
+  return result;
+};
+
+IndentStringCache.prototype.__ensure_cache = function(column) {
+  while (column >= this.__cache.length) {
+    this.__add_column();
+  }
+};
+
+IndentStringCache.prototype.__add_column = function() {
+  var column = this.__cache.length;
+  var indent = 0;
+  var result = '';
+  if (this.__indent_size && column >= this.__indent_size) {
+    indent = Math.floor(column / this.__indent_size);
+    column -= indent * this.__indent_size;
+    result = new Array(indent + 1).join(this.__indent_string);
+  }
+  if (column) {
+    result += new Array(column + 1).join(' ');
+  }
+
+  this.__cache.push(result);
+};
+
+function Output(options, baseIndentString) {
+  this.__indent_cache = new IndentStringCache(options, baseIndentString);
+  this.raw = false;
+  this._end_with_newline = options.end_with_newline;
+  this.indent_size = options.indent_size;
+  this.wrap_line_length = options.wrap_line_length;
+  this.indent_empty_lines = options.indent_empty_lines;
+  this.__lines = [];
+  this.previous_line = null;
+  this.current_line = null;
+  this.next_line = new OutputLine(this);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+  // initialize
+  this.__add_outputline();
+}
+
+Output.prototype.__add_outputline = function() {
+  this.previous_line = this.current_line;
+  this.current_line = this.next_line.clone_empty();
+  this.__lines.push(this.current_line);
+};
+
+Output.prototype.get_line_number = function() {
+  return this.__lines.length;
+};
+
+Output.prototype.get_indent_string = function(indent, column) {
+  return this.__indent_cache.get_indent_string(indent, column);
+};
+
+Output.prototype.get_indent_size = function(indent, column) {
+  return this.__indent_cache.get_indent_size(indent, column);
+};
+
+Output.prototype.is_empty = function() {
+  return !this.previous_line && this.current_line.is_empty();
+};
+
+Output.prototype.add_new_line = function(force_newline) {
+  // never newline at the start of file
+  // otherwise, newline only if we didn't just add one or we're forced
+  if (this.is_empty() ||
+    (!force_newline && this.just_added_newline())) {
+    return false;
+  }
+
+  // if raw output is enabled, don't print additional newlines,
+  // but still return True as though you had
+  if (!this.raw) {
+    this.__add_outputline();
+  }
+  return true;
+};
+
+Output.prototype.get_code = function(eol) {
+  this.trim(true);
+
+  // handle some edge cases where the last tokens
+  // has text that ends with newline(s)
+  var last_item = this.current_line.pop();
+  if (last_item) {
+    if (last_item[last_item.length - 1] === '\n') {
+      last_item = last_item.replace(/\n+$/g, '');
+    }
+    this.current_line.push(last_item);
+  }
+
+  if (this._end_with_newline) {
+    this.__add_outputline();
+  }
+
+  var sweet_code = this.__lines.join('\n');
+
+  if (eol !== '\n') {
+    sweet_code = sweet_code.replace(/[\n]/g, eol);
+  }
+  return sweet_code;
+};
+
+Output.prototype.set_wrap_point = function() {
+  this.current_line._set_wrap_point();
+};
+
+Output.prototype.set_indent = function(indent, alignment) {
+  indent = indent || 0;
+  alignment = alignment || 0;
+
+  // Next line stores alignment values
+  this.next_line.set_indent(indent, alignment);
+
+  // Never indent your first output indent at the start of the file
+  if (this.__lines.length > 1) {
+    this.current_line.set_indent(indent, alignment);
+    return true;
+  }
+
+  this.current_line.set_indent();
+  return false;
+};
+
+Output.prototype.add_raw_token = function(token) {
+  for (var x = 0; x < token.newlines; x++) {
+    this.__add_outputline();
+  }
+  this.current_line.set_indent(-1);
+  this.current_line.push(token.whitespace_before);
+  this.current_line.push(token.text);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = false;
+};
+
+Output.prototype.add_token = function(printable_token) {
+  this.__add_space_before_token();
+  this.current_line.push(printable_token);
+  this.space_before_token = false;
+  this.non_breaking_space = false;
+  this.previous_token_wrapped = this.current_line._allow_wrap();
+};
+
+Output.prototype.__add_space_before_token = function() {
+  if (this.space_before_token && !this.just_added_newline()) {
+    if (!this.non_breaking_space) {
+      this.set_wrap_point();
+    }
+    this.current_line.push(' ');
+  }
+};
+
+Output.prototype.remove_indent = function(index) {
+  var output_length = this.__lines.length;
+  while (index < output_length) {
+    this.__lines[index]._remove_indent();
+    index++;
+  }
+  this.current_line._remove_wrap_indent();
+};
+
+Output.prototype.trim = function(eat_newlines) {
+  eat_newlines = (eat_newlines === undefined) ? false : eat_newlines;
+
+  this.current_line.trim();
+
+  while (eat_newlines && this.__lines.length > 1 &&
+    this.current_line.is_empty()) {
+    this.__lines.pop();
+    this.current_line = this.__lines[this.__lines.length - 1];
+    this.current_line.trim();
+  }
+
+  this.previous_line = this.__lines.length > 1 ?
+    this.__lines[this.__lines.length - 2] : null;
+};
+
+Output.prototype.just_added_newline = function() {
+  return this.current_line.is_empty();
+};
+
+Output.prototype.just_added_blankline = function() {
+  return this.is_empty() ||
+    (this.current_line.is_empty() && this.previous_line.is_empty());
+};
+
+Output.prototype.ensure_empty_line_above = function(starts_with, ends_with) {
+  var index = this.__lines.length - 2;
+  while (index >= 0) {
+    var potentialEmptyLine = this.__lines[index];
+    if (potentialEmptyLine.is_empty()) {
+      break;
+    } else if (potentialEmptyLine.item(0).indexOf(starts_with) !== 0 &&
+      potentialEmptyLine.item(-1) !== ends_with) {
+      this.__lines.splice(index + 1, 0, new OutputLine(this));
+      this.previous_line = this.__lines[this.__lines.length - 2];
+      break;
+    }
+    index--;
+  }
+};
+
+module.exports.Output = Output;
+
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Token(type, text, newlines, whitespace_before) {
+  this.type = type;
+  this.text = text;
+
+  // comments_before are
+  // comments that have a new line before them
+  // and may or may not have a newline after
+  // this is a set of comments before
+  this.comments_before = null; /* inline comment*/
+
+
+  // this.comments_after =  new TokenStream(); // no new line before and newline after
+  this.newlines = newlines || 0;
+  this.whitespace_before = whitespace_before || '';
+  this.parent = null;
+  this.next = null;
+  this.previous = null;
+  this.opened = null;
+  this.closed = null;
+  this.directives = null;
+}
+
+
+module.exports.Token = Token;
+
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* jshint node: true, curly: false */
+// Parts of this section of code is taken from acorn.
+//
+// Acorn was written by Marijn Haverbeke and released under an MIT
+// license. The Unicode regexps (for identifiers and whitespace) were
+// taken from [Esprima](http://esprima.org) by Ariya Hidayat.
+//
+// Git repositories for Acorn are available at
+//
+//     http://marijnhaverbeke.nl/git/acorn
+//     https://github.com/marijnh/acorn.git
+
+// ## Character categories
+
+
+
+
+// acorn used char codes to squeeze the last bit of performance out
+// Beautifier is okay without that, so we're using regex
+// permit # (23), $ (36), and @ (64). @ is used in ES7 decorators.
+// 65 through 91 are uppercase letters.
+// permit _ (95).
+// 97 through 123 are lowercase letters.
+var baseASCIIidentifierStartChars = "\\x23\\x24\\x40\\x41-\\x5a\\x5f\\x61-\\x7a";
+
+// inside an identifier @ is not allowed but 0-9 are.
+var baseASCIIidentifierChars = "\\x24\\x30-\\x39\\x41-\\x5a\\x5f\\x61-\\x7a";
+
+// Big ugly regular expressions that match characters in the
+// whitespace, identifier, and identifier-start categories. These
+// are only applied when a character is found to actually have a
+// code point above 128.
+var nonASCIIidentifierStartChars = "\\xaa\\xb5\\xba\\xc0-\\xd6\\xd8-\\xf6\\xf8-\\u02c1\\u02c6-\\u02d1\\u02e0-\\u02e4\\u02ec\\u02ee\\u0370-\\u0374\\u0376\\u0377\\u037a-\\u037d\\u0386\\u0388-\\u038a\\u038c\\u038e-\\u03a1\\u03a3-\\u03f5\\u03f7-\\u0481\\u048a-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05d0-\\u05ea\\u05f0-\\u05f2\\u0620-\\u064a\\u066e\\u066f\\u0671-\\u06d3\\u06d5\\u06e5\\u06e6\\u06ee\\u06ef\\u06fa-\\u06fc\\u06ff\\u0710\\u0712-\\u072f\\u074d-\\u07a5\\u07b1\\u07ca-\\u07ea\\u07f4\\u07f5\\u07fa\\u0800-\\u0815\\u081a\\u0824\\u0828\\u0840-\\u0858\\u08a0\\u08a2-\\u08ac\\u0904-\\u0939\\u093d\\u0950\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097f\\u0985-\\u098c\\u098f\\u0990\\u0993-\\u09a8\\u09aa-\\u09b0\\u09b2\\u09b6-\\u09b9\\u09bd\\u09ce\\u09dc\\u09dd\\u09df-\\u09e1\\u09f0\\u09f1\\u0a05-\\u0a0a\\u0a0f\\u0a10\\u0a13-\\u0a28\\u0a2a-\\u0a30\\u0a32\\u0a33\\u0a35\\u0a36\\u0a38\\u0a39\\u0a59-\\u0a5c\\u0a5e\\u0a72-\\u0a74\\u0a85-\\u0a8d\\u0a8f-\\u0a91\\u0a93-\\u0aa8\\u0aaa-\\u0ab0\\u0ab2\\u0ab3\\u0ab5-\\u0ab9\\u0abd\\u0ad0\\u0ae0\\u0ae1\\u0b05-\\u0b0c\\u0b0f\\u0b10\\u0b13-\\u0b28\\u0b2a-\\u0b30\\u0b32\\u0b33\\u0b35-\\u0b39\\u0b3d\\u0b5c\\u0b5d\\u0b5f-\\u0b61\\u0b71\\u0b83\\u0b85-\\u0b8a\\u0b8e-\\u0b90\\u0b92-\\u0b95\\u0b99\\u0b9a\\u0b9c\\u0b9e\\u0b9f\\u0ba3\\u0ba4\\u0ba8-\\u0baa\\u0bae-\\u0bb9\\u0bd0\\u0c05-\\u0c0c\\u0c0e-\\u0c10\\u0c12-\\u0c28\\u0c2a-\\u0c33\\u0c35-\\u0c39\\u0c3d\\u0c58\\u0c59\\u0c60\\u0c61\\u0c85-\\u0c8c\\u0c8e-\\u0c90\\u0c92-\\u0ca8\\u0caa-\\u0cb3\\u0cb5-\\u0cb9\\u0cbd\\u0cde\\u0ce0\\u0ce1\\u0cf1\\u0cf2\\u0d05-\\u0d0c\\u0d0e-\\u0d10\\u0d12-\\u0d3a\\u0d3d\\u0d4e\\u0d60\\u0d61\\u0d7a-\\u0d7f\\u0d85-\\u0d96\\u0d9a-\\u0db1\\u0db3-\\u0dbb\\u0dbd\\u0dc0-\\u0dc6\\u0e01-\\u0e30\\u0e32\\u0e33\\u0e40-\\u0e46\\u0e81\\u0e82\\u0e84\\u0e87\\u0e88\\u0e8a\\u0e8d\\u0e94-\\u0e97\\u0e99-\\u0e9f\\u0ea1-\\u0ea3\\u0ea5\\u0ea7\\u0eaa\\u0eab\\u0ead-\\u0eb0\\u0eb2\\u0eb3\\u0ebd\\u0ec0-\\u0ec4\\u0ec6\\u0edc-\\u0edf\\u0f00\\u0f40-\\u0f47\\u0f49-\\u0f6c\\u0f88-\\u0f8c\\u1000-\\u102a\\u103f\\u1050-\\u1055\\u105a-\\u105d\\u1061\\u1065\\u1066\\u106e-\\u1070\\u1075-\\u1081\\u108e\\u10a0-\\u10c5\\u10c7\\u10cd\\u10d0-\\u10fa\\u10fc-\\u1248\\u124a-\\u124d\\u1250-\\u1256\\u1258\\u125a-\\u125d\\u1260-\\u1288\\u128a-\\u128d\\u1290-\\u12b0\\u12b2-\\u12b5\\u12b8-\\u12be\\u12c0\\u12c2-\\u12c5\\u12c8-\\u12d6\\u12d8-\\u1310\\u1312-\\u1315\\u1318-\\u135a\\u1380-\\u138f\\u13a0-\\u13f4\\u1401-\\u166c\\u166f-\\u167f\\u1681-\\u169a\\u16a0-\\u16ea\\u16ee-\\u16f0\\u1700-\\u170c\\u170e-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176c\\u176e-\\u1770\\u1780-\\u17b3\\u17d7\\u17dc\\u1820-\\u1877\\u1880-\\u18a8\\u18aa\\u18b0-\\u18f5\\u1900-\\u191c\\u1950-\\u196d\\u1970-\\u1974\\u1980-\\u19ab\\u19c1-\\u19c7\\u1a00-\\u1a16\\u1a20-\\u1a54\\u1aa7\\u1b05-\\u1b33\\u1b45-\\u1b4b\\u1b83-\\u1ba0\\u1bae\\u1baf\\u1bba-\\u1be5\\u1c00-\\u1c23\\u1c4d-\\u1c4f\\u1c5a-\\u1c7d\\u1ce9-\\u1cec\\u1cee-\\u1cf1\\u1cf5\\u1cf6\\u1d00-\\u1dbf\\u1e00-\\u1f15\\u1f18-\\u1f1d\\u1f20-\\u1f45\\u1f48-\\u1f4d\\u1f50-\\u1f57\\u1f59\\u1f5b\\u1f5d\\u1f5f-\\u1f7d\\u1f80-\\u1fb4\\u1fb6-\\u1fbc\\u1fbe\\u1fc2-\\u1fc4\\u1fc6-\\u1fcc\\u1fd0-\\u1fd3\\u1fd6-\\u1fdb\\u1fe0-\\u1fec\\u1ff2-\\u1ff4\\u1ff6-\\u1ffc\\u2071\\u207f\\u2090-\\u209c\\u2102\\u2107\\u210a-\\u2113\\u2115\\u2119-\\u211d\\u2124\\u2126\\u2128\\u212a-\\u212d\\u212f-\\u2139\\u213c-\\u213f\\u2145-\\u2149\\u214e\\u2160-\\u2188\\u2c00-\\u2c2e\\u2c30-\\u2c5e\\u2c60-\\u2ce4\\u2ceb-\\u2cee\\u2cf2\\u2cf3\\u2d00-\\u2d25\\u2d27\\u2d2d\\u2d30-\\u2d67\\u2d6f\\u2d80-\\u2d96\\u2da0-\\u2da6\\u2da8-\\u2dae\\u2db0-\\u2db6\\u2db8-\\u2dbe\\u2dc0-\\u2dc6\\u2dc8-\\u2dce\\u2dd0-\\u2dd6\\u2dd8-\\u2dde\\u2e2f\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303c\\u3041-\\u3096\\u309d-\\u309f\\u30a1-\\u30fa\\u30fc-\\u30ff\\u3105-\\u312d\\u3131-\\u318e\\u31a0-\\u31ba\\u31f0-\\u31ff\\u3400-\\u4db5\\u4e00-\\u9fcc\\ua000-\\ua48c\\ua4d0-\\ua4fd\\ua500-\\ua60c\\ua610-\\ua61f\\ua62a\\ua62b\\ua640-\\ua66e\\ua67f-\\ua697\\ua6a0-\\ua6ef\\ua717-\\ua71f\\ua722-\\ua788\\ua78b-\\ua78e\\ua790-\\ua793\\ua7a0-\\ua7aa\\ua7f8-\\ua801\\ua803-\\ua805\\ua807-\\ua80a\\ua80c-\\ua822\\ua840-\\ua873\\ua882-\\ua8b3\\ua8f2-\\ua8f7\\ua8fb\\ua90a-\\ua925\\ua930-\\ua946\\ua960-\\ua97c\\ua984-\\ua9b2\\ua9cf\\uaa00-\\uaa28\\uaa40-\\uaa42\\uaa44-\\uaa4b\\uaa60-\\uaa76\\uaa7a\\uaa80-\\uaaaf\\uaab1\\uaab5\\uaab6\\uaab9-\\uaabd\\uaac0\\uaac2\\uaadb-\\uaadd\\uaae0-\\uaaea\\uaaf2-\\uaaf4\\uab01-\\uab06\\uab09-\\uab0e\\uab11-\\uab16\\uab20-\\uab26\\uab28-\\uab2e\\uabc0-\\uabe2\\uac00-\\ud7a3\\ud7b0-\\ud7c6\\ud7cb-\\ud7fb\\uf900-\\ufa6d\\ufa70-\\ufad9\\ufb00-\\ufb06\\ufb13-\\ufb17\\ufb1d\\ufb1f-\\ufb28\\ufb2a-\\ufb36\\ufb38-\\ufb3c\\ufb3e\\ufb40\\ufb41\\ufb43\\ufb44\\ufb46-\\ufbb1\\ufbd3-\\ufd3d\\ufd50-\\ufd8f\\ufd92-\\ufdc7\\ufdf0-\\ufdfb\\ufe70-\\ufe74\\ufe76-\\ufefc\\uff21-\\uff3a\\uff41-\\uff5a\\uff66-\\uffbe\\uffc2-\\uffc7\\uffca-\\uffcf\\uffd2-\\uffd7\\uffda-\\uffdc";
+var nonASCIIidentifierChars = "\\u0300-\\u036f\\u0483-\\u0487\\u0591-\\u05bd\\u05bf\\u05c1\\u05c2\\u05c4\\u05c5\\u05c7\\u0610-\\u061a\\u0620-\\u0649\\u0672-\\u06d3\\u06e7-\\u06e8\\u06fb-\\u06fc\\u0730-\\u074a\\u0800-\\u0814\\u081b-\\u0823\\u0825-\\u0827\\u0829-\\u082d\\u0840-\\u0857\\u08e4-\\u08fe\\u0900-\\u0903\\u093a-\\u093c\\u093e-\\u094f\\u0951-\\u0957\\u0962-\\u0963\\u0966-\\u096f\\u0981-\\u0983\\u09bc\\u09be-\\u09c4\\u09c7\\u09c8\\u09d7\\u09df-\\u09e0\\u0a01-\\u0a03\\u0a3c\\u0a3e-\\u0a42\\u0a47\\u0a48\\u0a4b-\\u0a4d\\u0a51\\u0a66-\\u0a71\\u0a75\\u0a81-\\u0a83\\u0abc\\u0abe-\\u0ac5\\u0ac7-\\u0ac9\\u0acb-\\u0acd\\u0ae2-\\u0ae3\\u0ae6-\\u0aef\\u0b01-\\u0b03\\u0b3c\\u0b3e-\\u0b44\\u0b47\\u0b48\\u0b4b-\\u0b4d\\u0b56\\u0b57\\u0b5f-\\u0b60\\u0b66-\\u0b6f\\u0b82\\u0bbe-\\u0bc2\\u0bc6-\\u0bc8\\u0bca-\\u0bcd\\u0bd7\\u0be6-\\u0bef\\u0c01-\\u0c03\\u0c46-\\u0c48\\u0c4a-\\u0c4d\\u0c55\\u0c56\\u0c62-\\u0c63\\u0c66-\\u0c6f\\u0c82\\u0c83\\u0cbc\\u0cbe-\\u0cc4\\u0cc6-\\u0cc8\\u0cca-\\u0ccd\\u0cd5\\u0cd6\\u0ce2-\\u0ce3\\u0ce6-\\u0cef\\u0d02\\u0d03\\u0d46-\\u0d48\\u0d57\\u0d62-\\u0d63\\u0d66-\\u0d6f\\u0d82\\u0d83\\u0dca\\u0dcf-\\u0dd4\\u0dd6\\u0dd8-\\u0ddf\\u0df2\\u0df3\\u0e34-\\u0e3a\\u0e40-\\u0e45\\u0e50-\\u0e59\\u0eb4-\\u0eb9\\u0ec8-\\u0ecd\\u0ed0-\\u0ed9\\u0f18\\u0f19\\u0f20-\\u0f29\\u0f35\\u0f37\\u0f39\\u0f41-\\u0f47\\u0f71-\\u0f84\\u0f86-\\u0f87\\u0f8d-\\u0f97\\u0f99-\\u0fbc\\u0fc6\\u1000-\\u1029\\u1040-\\u1049\\u1067-\\u106d\\u1071-\\u1074\\u1082-\\u108d\\u108f-\\u109d\\u135d-\\u135f\\u170e-\\u1710\\u1720-\\u1730\\u1740-\\u1750\\u1772\\u1773\\u1780-\\u17b2\\u17dd\\u17e0-\\u17e9\\u180b-\\u180d\\u1810-\\u1819\\u1920-\\u192b\\u1930-\\u193b\\u1951-\\u196d\\u19b0-\\u19c0\\u19c8-\\u19c9\\u19d0-\\u19d9\\u1a00-\\u1a15\\u1a20-\\u1a53\\u1a60-\\u1a7c\\u1a7f-\\u1a89\\u1a90-\\u1a99\\u1b46-\\u1b4b\\u1b50-\\u1b59\\u1b6b-\\u1b73\\u1bb0-\\u1bb9\\u1be6-\\u1bf3\\u1c00-\\u1c22\\u1c40-\\u1c49\\u1c5b-\\u1c7d\\u1cd0-\\u1cd2\\u1d00-\\u1dbe\\u1e01-\\u1f15\\u200c\\u200d\\u203f\\u2040\\u2054\\u20d0-\\u20dc\\u20e1\\u20e5-\\u20f0\\u2d81-\\u2d96\\u2de0-\\u2dff\\u3021-\\u3028\\u3099\\u309a\\ua640-\\ua66d\\ua674-\\ua67d\\ua69f\\ua6f0-\\ua6f1\\ua7f8-\\ua800\\ua806\\ua80b\\ua823-\\ua827\\ua880-\\ua881\\ua8b4-\\ua8c4\\ua8d0-\\ua8d9\\ua8f3-\\ua8f7\\ua900-\\ua909\\ua926-\\ua92d\\ua930-\\ua945\\ua980-\\ua983\\ua9b3-\\ua9c0\\uaa00-\\uaa27\\uaa40-\\uaa41\\uaa4c-\\uaa4d\\uaa50-\\uaa59\\uaa7b\\uaae0-\\uaae9\\uaaf2-\\uaaf3\\uabc0-\\uabe1\\uabec\\uabed\\uabf0-\\uabf9\\ufb20-\\ufb28\\ufe00-\\ufe0f\\ufe20-\\ufe26\\ufe33\\ufe34\\ufe4d-\\ufe4f\\uff10-\\uff19\\uff3f";
+//var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+//var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+
+var identifierStart = "(?:\\\\u[0-9a-fA-F]{4}|[" + baseASCIIidentifierStartChars + nonASCIIidentifierStartChars + "])";
+var identifierChars = "(?:\\\\u[0-9a-fA-F]{4}|[" + baseASCIIidentifierChars + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "])*";
+
+exports.identifier = new RegExp(identifierStart + identifierChars, 'g');
+exports.identifierStart = new RegExp(identifierStart);
+exports.identifierMatch = new RegExp("(?:\\\\u[0-9a-fA-F]{4}|[" + baseASCIIidentifierChars + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "])+");
+
+var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/; // jshint ignore:line
+
+// Whether a single character denotes a newline.
+
+exports.newline = /[\n\r\u2028\u2029]/;
+
+// Matches a whole line break (where CRLF is considered a single
+// line break). Used to count lines.
+
+// in javascript, these two differ
+// in python they are the same, different methods are called on them
+exports.lineBreak = new RegExp('\r\n|' + exports.newline.source);
+exports.allLineBreaks = new RegExp(exports.lineBreak.source, 'g');
+
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var BaseOptions = __webpack_require__(6).Options;
+
+var validPositionValues = ['before-newline', 'after-newline', 'preserve-newline'];
+
+function Options(options) {
+  BaseOptions.call(this, options, 'js');
+
+  // compatibility, re
+  var raw_brace_style = this.raw_options.brace_style || null;
+  if (raw_brace_style === "expand-strict") { //graceful handling of deprecated option
+    this.raw_options.brace_style = "expand";
+  } else if (raw_brace_style === "collapse-preserve-inline") { //graceful handling of deprecated option
+    this.raw_options.brace_style = "collapse,preserve-inline";
+  } else if (this.raw_options.braces_on_own_line !== undefined) { //graceful handling of deprecated option
+    this.raw_options.brace_style = this.raw_options.braces_on_own_line ? "expand" : "collapse";
+    // } else if (!raw_brace_style) { //Nothing exists to set it
+    //   raw_brace_style = "collapse";
+  }
+
+  //preserve-inline in delimited string will trigger brace_preserve_inline, everything
+  //else is considered a brace_style and the last one only will have an effect
+
+  var brace_style_split = this._get_selection_list('brace_style', ['collapse', 'expand', 'end-expand', 'none', 'preserve-inline']);
+
+  this.brace_preserve_inline = false; //Defaults in case one or other was not specified in meta-option
+  this.brace_style = "collapse";
+
+  for (var bs = 0; bs < brace_style_split.length; bs++) {
+    if (brace_style_split[bs] === "preserve-inline") {
+      this.brace_preserve_inline = true;
+    } else {
+      this.brace_style = brace_style_split[bs];
+    }
+  }
+
+  this.unindent_chained_methods = this._get_boolean('unindent_chained_methods');
+  this.break_chained_methods = this._get_boolean('break_chained_methods');
+  this.space_in_paren = this._get_boolean('space_in_paren');
+  this.space_in_empty_paren = this._get_boolean('space_in_empty_paren');
+  this.jslint_happy = this._get_boolean('jslint_happy');
+  this.space_after_anon_function = this._get_boolean('space_after_anon_function');
+  this.space_after_named_function = this._get_boolean('space_after_named_function');
+  this.keep_array_indentation = this._get_boolean('keep_array_indentation');
+  this.space_before_conditional = this._get_boolean('space_before_conditional', true);
+  this.unescape_strings = this._get_boolean('unescape_strings');
+  this.e4x = this._get_boolean('e4x');
+  this.comma_first = this._get_boolean('comma_first');
+  this.operator_position = this._get_selection('operator_position', validPositionValues);
+
+  // For testing of beautify preserve:start directive
+  this.test_output_raw = this._get_boolean('test_output_raw');
+
+  // force this._options.space_after_anon_function to true if this._options.jslint_happy
+  if (this.jslint_happy) {
+    this.space_after_anon_function = true;
+  }
+
+}
+Options.prototype = new BaseOptions();
+
+
+
+module.exports.Options = Options;
+
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Options(options, merge_child_field) {
+  this.raw_options = _mergeOpts(options, merge_child_field);
+
+  // Support passing the source text back with no change
+  this.disabled = this._get_boolean('disabled');
+
+  this.eol = this._get_characters('eol', 'auto');
+  this.end_with_newline = this._get_boolean('end_with_newline');
+  this.indent_size = this._get_number('indent_size', 4);
+  this.indent_char = this._get_characters('indent_char', ' ');
+  this.indent_level = this._get_number('indent_level');
+
+  this.preserve_newlines = this._get_boolean('preserve_newlines', true);
+  this.max_preserve_newlines = this._get_number('max_preserve_newlines', 32786);
+  if (!this.preserve_newlines) {
+    this.max_preserve_newlines = 0;
+  }
+
+  this.indent_with_tabs = this._get_boolean('indent_with_tabs', this.indent_char === '\t');
+  if (this.indent_with_tabs) {
+    this.indent_char = '\t';
+
+    // indent_size behavior changed after 1.8.6
+    // It used to be that indent_size would be
+    // set to 1 for indent_with_tabs. That is no longer needed and
+    // actually doesn't make sense - why not use spaces? Further,
+    // that might produce unexpected behavior - tabs being used
+    // for single-column alignment. So, when indent_with_tabs is true
+    // and indent_size is 1, reset indent_size to 4.
+    if (this.indent_size === 1) {
+      this.indent_size = 4;
+    }
+  }
+
+  // Backwards compat with 1.3.x
+  this.wrap_line_length = this._get_number('wrap_line_length', this._get_number('max_char'));
+
+  this.indent_empty_lines = this._get_boolean('indent_empty_lines');
+
+  // valid templating languages ['django', 'erb', 'handlebars', 'php']
+  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // other values ignored
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php'], ['auto']);
+}
+
+Options.prototype._get_array = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || [];
+  if (typeof option_value === 'object') {
+    if (option_value !== null && typeof option_value.concat === 'function') {
+      result = option_value.concat();
+    }
+  } else if (typeof option_value === 'string') {
+    result = option_value.split(/[^a-zA-Z0-9_\/\-]+/);
+  }
+  return result;
+};
+
+Options.prototype._get_boolean = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = option_value === undefined ? !!default_value : !!option_value;
+  return result;
+};
+
+Options.prototype._get_characters = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  var result = default_value || '';
+  if (typeof option_value === 'string') {
+    result = option_value.replace(/\\r/, '\r').replace(/\\n/, '\n').replace(/\\t/, '\t');
+  }
+  return result;
+};
+
+Options.prototype._get_number = function(name, default_value) {
+  var option_value = this.raw_options[name];
+  default_value = parseInt(default_value, 10);
+  if (isNaN(default_value)) {
+    default_value = 0;
+  }
+  var result = parseInt(option_value, 10);
+  if (isNaN(result)) {
+    result = default_value;
+  }
+  return result;
+};
+
+Options.prototype._get_selection = function(name, selection_list, default_value) {
+  var result = this._get_selection_list(name, selection_list, default_value);
+  if (result.length !== 1) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can only be one of the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result[0];
+};
+
+
+Options.prototype._get_selection_list = function(name, selection_list, default_value) {
+  if (!selection_list || selection_list.length === 0) {
+    throw new Error("Selection list cannot be empty.");
+  }
+
+  default_value = default_value || [selection_list[0]];
+  if (!this._is_valid_selection(default_value, selection_list)) {
+    throw new Error("Invalid Default Value!");
+  }
+
+  var result = this._get_array(name, default_value);
+  if (!this._is_valid_selection(result, selection_list)) {
+    throw new Error(
+      "Invalid Option Value: The option '" + name + "' can contain only the following values:\n" +
+      selection_list + "\nYou passed in: '" + this.raw_options[name] + "'");
+  }
+
+  return result;
+};
+
+Options.prototype._is_valid_selection = function(result, selection_list) {
+  return result.length && selection_list.length &&
+    !result.some(function(item) { return selection_list.indexOf(item) === -1; });
+};
+
+
+// merges child options up with the parent options object
+// Example: obj = {a: 1, b: {a: 2}}
+//          mergeOpts(obj, 'b')
+//
+//          Returns: {a: 2}
+function _mergeOpts(allOptions, childFieldName) {
+  var finalOpts = {};
+  allOptions = _normalizeOpts(allOptions);
+  var name;
+
+  for (name in allOptions) {
+    if (name !== childFieldName) {
+      finalOpts[name] = allOptions[name];
+    }
+  }
+
+  //merge in the per type settings for the childFieldName
+  if (childFieldName && allOptions[childFieldName]) {
+    for (name in allOptions[childFieldName]) {
+      finalOpts[name] = allOptions[childFieldName][name];
+    }
+  }
+  return finalOpts;
+}
+
+function _normalizeOpts(options) {
+  var convertedOpts = {};
+  var key;
+
+  for (key in options) {
+    var newKey = key.replace(/-/g, "_");
+    convertedOpts[newKey] = options[key];
+  }
+  return convertedOpts;
+}
+
+module.exports.Options = Options;
+module.exports.normalizeOpts = _normalizeOpts;
+module.exports.mergeOpts = _mergeOpts;
+
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var InputScanner = __webpack_require__(8).InputScanner;
+var BaseTokenizer = __webpack_require__(9).Tokenizer;
+var BASETOKEN = __webpack_require__(9).TOKEN;
+var Directives = __webpack_require__(13).Directives;
+var acorn = __webpack_require__(4);
+var Pattern = __webpack_require__(12).Pattern;
+var TemplatablePattern = __webpack_require__(14).TemplatablePattern;
+
+
+function in_array(what, arr) {
+  return arr.indexOf(what) !== -1;
+}
+
+
+var TOKEN = {
+  START_EXPR: 'TK_START_EXPR',
+  END_EXPR: 'TK_END_EXPR',
+  START_BLOCK: 'TK_START_BLOCK',
+  END_BLOCK: 'TK_END_BLOCK',
+  WORD: 'TK_WORD',
+  RESERVED: 'TK_RESERVED',
+  SEMICOLON: 'TK_SEMICOLON',
+  STRING: 'TK_STRING',
+  EQUALS: 'TK_EQUALS',
+  OPERATOR: 'TK_OPERATOR',
+  COMMA: 'TK_COMMA',
+  BLOCK_COMMENT: 'TK_BLOCK_COMMENT',
+  COMMENT: 'TK_COMMENT',
+  DOT: 'TK_DOT',
+  UNKNOWN: 'TK_UNKNOWN',
+  START: BASETOKEN.START,
+  RAW: BASETOKEN.RAW,
+  EOF: BASETOKEN.EOF
+};
+
+
+var directives_core = new Directives(/\/\*/, /\*\//);
+
+var number_pattern = /0[xX][0123456789abcdefABCDEF]*|0[oO][01234567]*|0[bB][01]*|\d+n|(?:\.\d+|\d+\.?\d*)(?:[eE][+-]?\d+)?/;
+
+var digit = /[0-9]/;
+
+// Dot "." must be distinguished from "..." and decimal
+var dot_pattern = /[^\d\.]/;
+
+var positionable_operators = (
+  ">>> === !== " +
+  "<< && >= ** != == <= >> || ?? |> " +
+  "< / - + > : & % ? ^ | *").split(' ');
+
+// IMPORTANT: this must be sorted longest to shortest or tokenizing many not work.
+// Also, you must update possitionable operators separately from punct
+var punct =
+  ">>>= " +
+  "... >>= <<= === >>> !== **= " +
+  "=> ^= :: /= << <= == && -= >= >> != -- += ** || ?? ++ %= &= *= |= |> " +
+  "= ! ? > < : / ^ - + * & % ~ |";
+
+punct = punct.replace(/[-[\]{}()*+?.,\\^$|#]/g, "\\$&");
+// ?. but not if followed by a number 
+punct = '\\?\\.(?!\\d) ' + punct;
+punct = punct.replace(/ /g, '|');
+
+var punct_pattern = new RegExp(punct);
+
+// words which should always start on new line.
+var line_starters = 'continue,try,throw,return,var,let,const,if,switch,case,default,for,while,break,function,import,export'.split(',');
+var reserved_words = line_starters.concat(['do', 'in', 'of', 'else', 'get', 'set', 'new', 'catch', 'finally', 'typeof', 'yield', 'async', 'await', 'from', 'as']);
+var reserved_word_pattern = new RegExp('^(?:' + reserved_words.join('|') + ')$');
+
+// var template_pattern = /(?:(?:<\?php|<\?=)[\s\S]*?\?>)|(?:<%[\s\S]*?%>)/g;
+
+var in_html_comment;
+
+var Tokenizer = function(input_string, options) {
+  BaseTokenizer.call(this, input_string, options);
+
+  this._patterns.whitespace = this._patterns.whitespace.matching(
+    /\u00A0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff/.source,
+    /\u2028\u2029/.source);
+
+  var pattern_reader = new Pattern(this._input);
+  var templatable = new TemplatablePattern(this._input)
+    .read_options(this._options);
+
+  this.__patterns = {
+    template: templatable,
+    identifier: templatable.starting_with(acorn.identifier).matching(acorn.identifierMatch),
+    number: pattern_reader.matching(number_pattern),
+    punct: pattern_reader.matching(punct_pattern),
+    // comment ends just before nearest linefeed or end of file
+    comment: pattern_reader.starting_with(/\/\//).until(/[\n\r\u2028\u2029]/),
+    //  /* ... */ comment ends with nearest */ or end of file
+    block_comment: pattern_reader.starting_with(/\/\*/).until_after(/\*\//),
+    html_comment_start: pattern_reader.matching(/<!--/),
+    html_comment_end: pattern_reader.matching(/-->/),
+    include: pattern_reader.starting_with(/#include/).until_after(acorn.lineBreak),
+    shebang: pattern_reader.starting_with(/#!/).until_after(acorn.lineBreak),
+    xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\])(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
+    single_quote: templatable.until(/['\\\n\r\u2028\u2029]/),
+    double_quote: templatable.until(/["\\\n\r\u2028\u2029]/),
+    template_text: templatable.until(/[`\\$]/),
+    template_expression: templatable.until(/[`}\\]/)
+  };
+
+};
+Tokenizer.prototype = new BaseTokenizer();
+
+Tokenizer.prototype._is_comment = function(current_token) {
+  return current_token.type === TOKEN.COMMENT || current_token.type === TOKEN.BLOCK_COMMENT || current_token.type === TOKEN.UNKNOWN;
+};
+
+Tokenizer.prototype._is_opening = function(current_token) {
+  return current_token.type === TOKEN.START_BLOCK || current_token.type === TOKEN.START_EXPR;
+};
+
+Tokenizer.prototype._is_closing = function(current_token, open_token) {
+  return (current_token.type === TOKEN.END_BLOCK || current_token.type === TOKEN.END_EXPR) &&
+    (open_token && (
+      (current_token.text === ']' && open_token.text === '[') ||
+      (current_token.text === ')' && open_token.text === '(') ||
+      (current_token.text === '}' && open_token.text === '{')));
+};
+
+Tokenizer.prototype._reset = function() {
+  in_html_comment = false;
+};
+
+Tokenizer.prototype._get_next_token = function(previous_token, open_token) { // jshint unused:false
+  var token = null;
+  this._readWhitespace();
+  var c = this._input.peek();
+
+  if (c === null) {
+    return this._create_token(TOKEN.EOF, '');
+  }
+
+  token = token || this._read_non_javascript(c);
+  token = token || this._read_string(c);
+  token = token || this._read_word(previous_token);
+  token = token || this._read_singles(c);
+  token = token || this._read_comment(c);
+  token = token || this._read_regexp(c, previous_token);
+  token = token || this._read_xml(c, previous_token);
+  token = token || this._read_punctuation();
+  token = token || this._create_token(TOKEN.UNKNOWN, this._input.next());
+
+  return token;
+};
+
+Tokenizer.prototype._read_word = function(previous_token) {
+  var resulting_string;
+  resulting_string = this.__patterns.identifier.read();
+  if (resulting_string !== '') {
+    resulting_string = resulting_string.replace(acorn.allLineBreaks, '\n');
+    if (!(previous_token.type === TOKEN.DOT ||
+        (previous_token.type === TOKEN.RESERVED && (previous_token.text === 'set' || previous_token.text === 'get'))) &&
+      reserved_word_pattern.test(resulting_string)) {
+      if (resulting_string === 'in' || resulting_string === 'of') { // hack for 'in' and 'of' operators
+        return this._create_token(TOKEN.OPERATOR, resulting_string);
+      }
+      return this._create_token(TOKEN.RESERVED, resulting_string);
+    }
+    return this._create_token(TOKEN.WORD, resulting_string);
+  }
+
+  resulting_string = this.__patterns.number.read();
+  if (resulting_string !== '') {
+    return this._create_token(TOKEN.WORD, resulting_string);
+  }
+};
+
+Tokenizer.prototype._read_singles = function(c) {
+  var token = null;
+  if (c === '(' || c === '[') {
+    token = this._create_token(TOKEN.START_EXPR, c);
+  } else if (c === ')' || c === ']') {
+    token = this._create_token(TOKEN.END_EXPR, c);
+  } else if (c === '{') {
+    token = this._create_token(TOKEN.START_BLOCK, c);
+  } else if (c === '}') {
+    token = this._create_token(TOKEN.END_BLOCK, c);
+  } else if (c === ';') {
+    token = this._create_token(TOKEN.SEMICOLON, c);
+  } else if (c === '.' && dot_pattern.test(this._input.peek(1))) {
+    token = this._create_token(TOKEN.DOT, c);
+  } else if (c === ',') {
+    token = this._create_token(TOKEN.COMMA, c);
+  }
+
+  if (token) {
+    this._input.next();
+  }
+  return token;
+};
+
+Tokenizer.prototype._read_punctuation = function() {
+  var resulting_string = this.__patterns.punct.read();
+
+  if (resulting_string !== '') {
+    if (resulting_string === '=') {
+      return this._create_token(TOKEN.EQUALS, resulting_string);
+    } else if (resulting_string === '?.') {
+      return this._create_token(TOKEN.DOT, resulting_string);
+    } else {
+      return this._create_token(TOKEN.OPERATOR, resulting_string);
+    }
+  }
+};
+
+Tokenizer.prototype._read_non_javascript = function(c) {
+  var resulting_string = '';
+
+  if (c === '#') {
+    if (this._is_first_token()) {
+      resulting_string = this.__patterns.shebang.read();
+
+      if (resulting_string) {
+        return this._create_token(TOKEN.UNKNOWN, resulting_string.trim() + '\n');
+      }
+    }
+
+    // handles extendscript #includes
+    resulting_string = this.__patterns.include.read();
+
+    if (resulting_string) {
+      return this._create_token(TOKEN.UNKNOWN, resulting_string.trim() + '\n');
+    }
+
+    c = this._input.next();
+
+    // Spidermonkey-specific sharp variables for circular references. Considered obsolete.
+    var sharp = '#';
+    if (this._input.hasNext() && this._input.testChar(digit)) {
+      do {
+        c = this._input.next();
+        sharp += c;
+      } while (this._input.hasNext() && c !== '#' && c !== '=');
+      if (c === '#') {
+        //
+      } else if (this._input.peek() === '[' && this._input.peek(1) === ']') {
+        sharp += '[]';
+        this._input.next();
+        this._input.next();
+      } else if (this._input.peek() === '{' && this._input.peek(1) === '}') {
+        sharp += '{}';
+        this._input.next();
+        this._input.next();
+      }
+      return this._create_token(TOKEN.WORD, sharp);
+    }
+
+    this._input.back();
+
+  } else if (c === '<' && this._is_first_token()) {
+    resulting_string = this.__patterns.html_comment_start.read();
+    if (resulting_string) {
+      while (this._input.hasNext() && !this._input.testChar(acorn.newline)) {
+        resulting_string += this._input.next();
+      }
+      in_html_comment = true;
+      return this._create_token(TOKEN.COMMENT, resulting_string);
+    }
+  } else if (in_html_comment && c === '-') {
+    resulting_string = this.__patterns.html_comment_end.read();
+    if (resulting_string) {
+      in_html_comment = false;
+      return this._create_token(TOKEN.COMMENT, resulting_string);
+    }
+  }
+
+  return null;
+};
+
+Tokenizer.prototype._read_comment = function(c) {
+  var token = null;
+  if (c === '/') {
+    var comment = '';
+    if (this._input.peek(1) === '*') {
+      // peek for comment /* ... */
+      comment = this.__patterns.block_comment.read();
+      var directives = directives_core.get_directives(comment);
+      if (directives && directives.ignore === 'start') {
+        comment += directives_core.readIgnored(this._input);
+      }
+      comment = comment.replace(acorn.allLineBreaks, '\n');
+      token = this._create_token(TOKEN.BLOCK_COMMENT, comment);
+      token.directives = directives;
+    } else if (this._input.peek(1) === '/') {
+      // peek for comment // ...
+      comment = this.__patterns.comment.read();
+      token = this._create_token(TOKEN.COMMENT, comment);
+    }
+  }
+  return token;
+};
+
+Tokenizer.prototype._read_string = function(c) {
+  if (c === '`' || c === "'" || c === '"') {
+    var resulting_string = this._input.next();
+    this.has_char_escapes = false;
+
+    if (c === '`') {
+      resulting_string += this._read_string_recursive('`', true, '${');
+    } else {
+      resulting_string += this._read_string_recursive(c);
+    }
+
+    if (this.has_char_escapes && this._options.unescape_strings) {
+      resulting_string = unescape_string(resulting_string);
+    }
+
+    if (this._input.peek() === c) {
+      resulting_string += this._input.next();
+    }
+
+    resulting_string = resulting_string.replace(acorn.allLineBreaks, '\n');
+
+    return this._create_token(TOKEN.STRING, resulting_string);
+  }
+
+  return null;
+};
+
+Tokenizer.prototype._allow_regexp_or_xml = function(previous_token) {
+  // regex and xml can only appear in specific locations during parsing
+  return (previous_token.type === TOKEN.RESERVED && in_array(previous_token.text, ['return', 'case', 'throw', 'else', 'do', 'typeof', 'yield'])) ||
+    (previous_token.type === TOKEN.END_EXPR && previous_token.text === ')' &&
+      previous_token.opened.previous.type === TOKEN.RESERVED && in_array(previous_token.opened.previous.text, ['if', 'while', 'for'])) ||
+    (in_array(previous_token.type, [TOKEN.COMMENT, TOKEN.START_EXPR, TOKEN.START_BLOCK, TOKEN.START,
+      TOKEN.END_BLOCK, TOKEN.OPERATOR, TOKEN.EQUALS, TOKEN.EOF, TOKEN.SEMICOLON, TOKEN.COMMA
+    ]));
+};
+
+Tokenizer.prototype._read_regexp = function(c, previous_token) {
+
+  if (c === '/' && this._allow_regexp_or_xml(previous_token)) {
+    // handle regexp
+    //
+    var resulting_string = this._input.next();
+    var esc = false;
+
+    var in_char_class = false;
+    while (this._input.hasNext() &&
+      ((esc || in_char_class || this._input.peek() !== c) &&
+        !this._input.testChar(acorn.newline))) {
+      resulting_string += this._input.peek();
+      if (!esc) {
+        esc = this._input.peek() === '\\';
+        if (this._input.peek() === '[') {
+          in_char_class = true;
+        } else if (this._input.peek() === ']') {
+          in_char_class = false;
+        }
+      } else {
+        esc = false;
+      }
+      this._input.next();
+    }
+
+    if (this._input.peek() === c) {
+      resulting_string += this._input.next();
+
+      // regexps may have modifiers /regexp/MOD , so fetch those, too
+      // Only [gim] are valid, but if the user puts in garbage, do what we can to take it.
+      resulting_string += this._input.read(acorn.identifier);
+    }
+    return this._create_token(TOKEN.STRING, resulting_string);
+  }
+  return null;
+};
+
+Tokenizer.prototype._read_xml = function(c, previous_token) {
+
+  if (this._options.e4x && c === "<" && this._allow_regexp_or_xml(previous_token)) {
+    var xmlStr = '';
+    var match = this.__patterns.xml.read_match();
+    // handle e4x xml literals
+    //
+    if (match) {
+      // Trim root tag to attempt to
+      var rootTag = match[2].replace(/^{\s+/, '{').replace(/\s+}$/, '}');
+      var isCurlyRoot = rootTag.indexOf('{') === 0;
+      var depth = 0;
+      while (match) {
+        var isEndTag = !!match[1];
+        var tagName = match[2];
+        var isSingletonTag = (!!match[match.length - 1]) || (tagName.slice(0, 8) === "![CDATA[");
+        if (!isSingletonTag &&
+          (tagName === rootTag || (isCurlyRoot && tagName.replace(/^{\s+/, '{').replace(/\s+}$/, '}')))) {
+          if (isEndTag) {
+            --depth;
+          } else {
+            ++depth;
+          }
+        }
+        xmlStr += match[0];
+        if (depth <= 0) {
+          break;
+        }
+        match = this.__patterns.xml.read_match();
+      }
+      // if we didn't close correctly, keep unformatted.
+      if (!match) {
+        xmlStr += this._input.match(/[\s\S]*/g)[0];
+      }
+      xmlStr = xmlStr.replace(acorn.allLineBreaks, '\n');
+      return this._create_token(TOKEN.STRING, xmlStr);
+    }
+  }
+
+  return null;
+};
+
+function unescape_string(s) {
+  // You think that a regex would work for this
+  // return s.replace(/\\x([0-9a-f]{2})/gi, function(match, val) {
+  //         return String.fromCharCode(parseInt(val, 16));
+  //     })
+  // However, dealing with '\xff', '\\xff', '\\\xff' makes this more fun.
+  var out = '',
+    escaped = 0;
+
+  var input_scan = new InputScanner(s);
+  var matched = null;
+
+  while (input_scan.hasNext()) {
+    // Keep any whitespace, non-slash characters
+    // also keep slash pairs.
+    matched = input_scan.match(/([\s]|[^\\]|\\\\)+/g);
+
+    if (matched) {
+      out += matched[0];
+    }
+
+    if (input_scan.peek() === '\\') {
+      input_scan.next();
+      if (input_scan.peek() === 'x') {
+        matched = input_scan.match(/x([0-9A-Fa-f]{2})/g);
+      } else if (input_scan.peek() === 'u') {
+        matched = input_scan.match(/u([0-9A-Fa-f]{4})/g);
+      } else {
+        out += '\\';
+        if (input_scan.hasNext()) {
+          out += input_scan.next();
+        }
+        continue;
+      }
+
+      // If there's some error decoding, return the original string
+      if (!matched) {
+        return s;
+      }
+
+      escaped = parseInt(matched[1], 16);
+
+      if (escaped > 0x7e && escaped <= 0xff && matched[0].indexOf('x') === 0) {
+        // we bail out on \x7f..\xff,
+        // leaving whole string escaped,
+        // as it's probably completely binary
+        return s;
+      } else if (escaped >= 0x00 && escaped < 0x20) {
+        // leave 0x00...0x1f escaped
+        out += '\\' + matched[0];
+        continue;
+      } else if (escaped === 0x22 || escaped === 0x27 || escaped === 0x5c) {
+        // single-quote, apostrophe, backslash - escape these
+        out += '\\' + String.fromCharCode(escaped);
+      } else {
+        out += String.fromCharCode(escaped);
+      }
+    }
+  }
+
+  return out;
+}
+
+// handle string
+//
+Tokenizer.prototype._read_string_recursive = function(delimiter, allow_unescaped_newlines, start_sub) {
+  var current_char;
+  var pattern;
+  if (delimiter === '\'') {
+    pattern = this.__patterns.single_quote;
+  } else if (delimiter === '"') {
+    pattern = this.__patterns.double_quote;
+  } else if (delimiter === '`') {
+    pattern = this.__patterns.template_text;
+  } else if (delimiter === '}') {
+    pattern = this.__patterns.template_expression;
+  }
+
+  var resulting_string = pattern.read();
+  var next = '';
+  while (this._input.hasNext()) {
+    next = this._input.next();
+    if (next === delimiter ||
+      (!allow_unescaped_newlines && acorn.newline.test(next))) {
+      this._input.back();
+      break;
+    } else if (next === '\\' && this._input.hasNext()) {
+      current_char = this._input.peek();
+
+      if (current_char === 'x' || current_char === 'u') {
+        this.has_char_escapes = true;
+      } else if (current_char === '\r' && this._input.peek(1) === '\n') {
+        this._input.next();
+      }
+      next += this._input.next();
+    } else if (start_sub) {
+      if (start_sub === '${' && next === '$' && this._input.peek() === '{') {
+        next += this._input.next();
+      }
+
+      if (start_sub === next) {
+        if (delimiter === '`') {
+          next += this._read_string_recursive('}', allow_unescaped_newlines, '`');
+        } else {
+          next += this._read_string_recursive('`', allow_unescaped_newlines, '${');
+        }
+        if (this._input.hasNext()) {
+          next += this._input.next();
+        }
+      }
+    }
+    next += pattern.read();
+    resulting_string += next;
+  }
+
+  return resulting_string;
+};
+
+module.exports.Tokenizer = Tokenizer;
+module.exports.TOKEN = TOKEN;
+module.exports.positionable_operators = positionable_operators.slice();
+module.exports.line_starters = line_starters.slice();
+
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var regexp_has_sticky = RegExp.prototype.hasOwnProperty('sticky');
+
+function InputScanner(input_string) {
+  this.__input = input_string || '';
+  this.__input_length = this.__input.length;
+  this.__position = 0;
+}
+
+InputScanner.prototype.restart = function() {
+  this.__position = 0;
+};
+
+InputScanner.prototype.back = function() {
+  if (this.__position > 0) {
+    this.__position -= 1;
+  }
+};
+
+InputScanner.prototype.hasNext = function() {
+  return this.__position < this.__input_length;
+};
+
+InputScanner.prototype.next = function() {
+  var val = null;
+  if (this.hasNext()) {
+    val = this.__input.charAt(this.__position);
+    this.__position += 1;
+  }
+  return val;
+};
+
+InputScanner.prototype.peek = function(index) {
+  var val = null;
+  index = index || 0;
+  index += this.__position;
+  if (index >= 0 && index < this.__input_length) {
+    val = this.__input.charAt(index);
+  }
+  return val;
+};
+
+// This is a JavaScript only helper function (not in python)
+// Javascript doesn't have a match method
+// and not all implementation support "sticky" flag.
+// If they do not support sticky then both this.match() and this.test() method
+// must get the match and check the index of the match.
+// If sticky is supported and set, this method will use it.
+// Otherwise it will check that global is set, and fall back to the slower method.
+InputScanner.prototype.__match = function(pattern, index) {
+  pattern.lastIndex = index;
+  var pattern_match = pattern.exec(this.__input);
+
+  if (pattern_match && !(regexp_has_sticky && pattern.sticky)) {
+    if (pattern_match.index !== index) {
+      pattern_match = null;
+    }
+  }
+
+  return pattern_match;
+};
+
+InputScanner.prototype.test = function(pattern, index) {
+  index = index || 0;
+  index += this.__position;
+
+  if (index >= 0 && index < this.__input_length) {
+    return !!this.__match(pattern, index);
+  } else {
+    return false;
+  }
+};
+
+InputScanner.prototype.testChar = function(pattern, index) {
+  // test one character regex match
+  var val = this.peek(index);
+  pattern.lastIndex = 0;
+  return val !== null && pattern.test(val);
+};
+
+InputScanner.prototype.match = function(pattern) {
+  var pattern_match = this.__match(pattern, this.__position);
+  if (pattern_match) {
+    this.__position += pattern_match[0].length;
+  } else {
+    pattern_match = null;
+  }
+  return pattern_match;
+};
+
+InputScanner.prototype.read = function(starting_pattern, until_pattern, until_after) {
+  var val = '';
+  var match;
+  if (starting_pattern) {
+    match = this.match(starting_pattern);
+    if (match) {
+      val += match[0];
+    }
+  }
+  if (until_pattern && (match || !starting_pattern)) {
+    val += this.readUntil(until_pattern, until_after);
+  }
+  return val;
+};
+
+InputScanner.prototype.readUntil = function(pattern, until_after) {
+  var val = '';
+  var match_index = this.__position;
+  pattern.lastIndex = this.__position;
+  var pattern_match = pattern.exec(this.__input);
+  if (pattern_match) {
+    match_index = pattern_match.index;
+    if (until_after) {
+      match_index += pattern_match[0].length;
+    }
+  } else {
+    match_index = this.__input_length;
+  }
+
+  val = this.__input.substring(this.__position, match_index);
+  this.__position = match_index;
+  return val;
+};
+
+InputScanner.prototype.readUntilAfter = function(pattern) {
+  return this.readUntil(pattern, true);
+};
+
+InputScanner.prototype.get_regexp = function(pattern, match_from) {
+  var result = null;
+  var flags = 'g';
+  if (match_from && regexp_has_sticky) {
+    flags = 'y';
+  }
+  // strings are converted to regexp
+  if (typeof pattern === "string" && pattern !== '') {
+    // result = new RegExp(pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), flags);
+    result = new RegExp(pattern, flags);
+  } else if (pattern) {
+    result = new RegExp(pattern.source, flags);
+  }
+  return result;
+};
+
+InputScanner.prototype.get_literal_regexp = function(literal_string) {
+  return RegExp(literal_string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'));
+};
+
+/* css beautifier legacy helpers */
+InputScanner.prototype.peekUntilAfter = function(pattern) {
+  var start = this.__position;
+  var val = this.readUntilAfter(pattern);
+  this.__position = start;
+  return val;
+};
+
+InputScanner.prototype.lookBack = function(testVal) {
+  var start = this.__position - 1;
+  return start >= testVal.length && this.__input.substring(start - testVal.length, start)
+    .toLowerCase() === testVal;
+};
+
+module.exports.InputScanner = InputScanner;
+
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var InputScanner = __webpack_require__(8).InputScanner;
+var Token = __webpack_require__(3).Token;
+var TokenStream = __webpack_require__(10).TokenStream;
+var WhitespacePattern = __webpack_require__(11).WhitespacePattern;
+
+var TOKEN = {
+  START: 'TK_START',
+  RAW: 'TK_RAW',
+  EOF: 'TK_EOF'
+};
+
+var Tokenizer = function(input_string, options) {
+  this._input = new InputScanner(input_string);
+  this._options = options || {};
+  this.__tokens = null;
+
+  this._patterns = {};
+  this._patterns.whitespace = new WhitespacePattern(this._input);
+};
+
+Tokenizer.prototype.tokenize = function() {
+  this._input.restart();
+  this.__tokens = new TokenStream();
+
+  this._reset();
+
+  var current;
+  var previous = new Token(TOKEN.START, '');
+  var open_token = null;
+  var open_stack = [];
+  var comments = new TokenStream();
+
+  while (previous.type !== TOKEN.EOF) {
+    current = this._get_next_token(previous, open_token);
+    while (this._is_comment(current)) {
+      comments.add(current);
+      current = this._get_next_token(previous, open_token);
+    }
+
+    if (!comments.isEmpty()) {
+      current.comments_before = comments;
+      comments = new TokenStream();
+    }
+
+    current.parent = open_token;
+
+    if (this._is_opening(current)) {
+      open_stack.push(open_token);
+      open_token = current;
+    } else if (open_token && this._is_closing(current, open_token)) {
+      current.opened = open_token;
+      open_token.closed = current;
+      open_token = open_stack.pop();
+      current.parent = open_token;
+    }
+
+    current.previous = previous;
+    previous.next = current;
+
+    this.__tokens.add(current);
+    previous = current;
+  }
+
+  return this.__tokens;
+};
+
+
+Tokenizer.prototype._is_first_token = function() {
+  return this.__tokens.isEmpty();
+};
+
+Tokenizer.prototype._reset = function() {};
+
+Tokenizer.prototype._get_next_token = function(previous_token, open_token) { // jshint unused:false
+  this._readWhitespace();
+  var resulting_string = this._input.read(/.+/g);
+  if (resulting_string) {
+    return this._create_token(TOKEN.RAW, resulting_string);
+  } else {
+    return this._create_token(TOKEN.EOF, '');
+  }
+};
+
+Tokenizer.prototype._is_comment = function(current_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._is_opening = function(current_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._is_closing = function(current_token, open_token) { // jshint unused:false
+  return false;
+};
+
+Tokenizer.prototype._create_token = function(type, text) {
+  var token = new Token(type, text,
+    this._patterns.whitespace.newline_count,
+    this._patterns.whitespace.whitespace_before_token);
+  return token;
+};
+
+Tokenizer.prototype._readWhitespace = function() {
+  return this._patterns.whitespace.read();
+};
+
+
+
+module.exports.Tokenizer = Tokenizer;
+module.exports.TOKEN = TOKEN;
+
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function TokenStream(parent_token) {
+  // private
+  this.__tokens = [];
+  this.__tokens_length = this.__tokens.length;
+  this.__position = 0;
+  this.__parent_token = parent_token;
+}
+
+TokenStream.prototype.restart = function() {
+  this.__position = 0;
+};
+
+TokenStream.prototype.isEmpty = function() {
+  return this.__tokens_length === 0;
+};
+
+TokenStream.prototype.hasNext = function() {
+  return this.__position < this.__tokens_length;
+};
+
+TokenStream.prototype.next = function() {
+  var val = null;
+  if (this.hasNext()) {
+    val = this.__tokens[this.__position];
+    this.__position += 1;
+  }
+  return val;
+};
+
+TokenStream.prototype.peek = function(index) {
+  var val = null;
+  index = index || 0;
+  index += this.__position;
+  if (index >= 0 && index < this.__tokens_length) {
+    val = this.__tokens[index];
+  }
+  return val;
+};
+
+TokenStream.prototype.add = function(token) {
+  if (this.__parent_token) {
+    token.parent = this.__parent_token;
+  }
+  this.__tokens.push(token);
+  this.__tokens_length += 1;
+};
+
+module.exports.TokenStream = TokenStream;
+
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Pattern = __webpack_require__(12).Pattern;
+
+function WhitespacePattern(input_scanner, parent) {
+  Pattern.call(this, input_scanner, parent);
+  if (parent) {
+    this._line_regexp = this._input.get_regexp(parent._line_regexp);
+  } else {
+    this.__set_whitespace_patterns('', '');
+  }
+
+  this.newline_count = 0;
+  this.whitespace_before_token = '';
+}
+WhitespacePattern.prototype = new Pattern();
+
+WhitespacePattern.prototype.__set_whitespace_patterns = function(whitespace_chars, newline_chars) {
+  whitespace_chars += '\\t ';
+  newline_chars += '\\n\\r';
+
+  this._match_pattern = this._input.get_regexp(
+    '[' + whitespace_chars + newline_chars + ']+', true);
+  this._newline_regexp = this._input.get_regexp(
+    '\\r\\n|[' + newline_chars + ']');
+};
+
+WhitespacePattern.prototype.read = function() {
+  this.newline_count = 0;
+  this.whitespace_before_token = '';
+
+  var resulting_string = this._input.read(this._match_pattern);
+  if (resulting_string === ' ') {
+    this.whitespace_before_token = ' ';
+  } else if (resulting_string) {
+    var matches = this.__split(this._newline_regexp, resulting_string);
+    this.newline_count = matches.length - 1;
+    this.whitespace_before_token = matches[this.newline_count];
+  }
+
+  return resulting_string;
+};
+
+WhitespacePattern.prototype.matching = function(whitespace_chars, newline_chars) {
+  var result = this._create();
+  result.__set_whitespace_patterns(whitespace_chars, newline_chars);
+  result._update();
+  return result;
+};
+
+WhitespacePattern.prototype._create = function() {
+  return new WhitespacePattern(this._input, this);
+};
+
+WhitespacePattern.prototype.__split = function(regexp, input_string) {
+  regexp.lastIndex = 0;
+  var start_index = 0;
+  var result = [];
+  var next_match = regexp.exec(input_string);
+  while (next_match) {
+    result.push(input_string.substring(start_index, next_match.index));
+    start_index = next_match.index + next_match[0].length;
+    next_match = regexp.exec(input_string);
+  }
+
+  if (start_index < input_string.length) {
+    result.push(input_string.substring(start_index, input_string.length));
+  } else {
+    result.push('');
+  }
+
+  return result;
+};
+
+
+
+module.exports.WhitespacePattern = WhitespacePattern;
+
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Pattern(input_scanner, parent) {
+  this._input = input_scanner;
+  this._starting_pattern = null;
+  this._match_pattern = null;
+  this._until_pattern = null;
+  this._until_after = false;
+
+  if (parent) {
+    this._starting_pattern = this._input.get_regexp(parent._starting_pattern, true);
+    this._match_pattern = this._input.get_regexp(parent._match_pattern, true);
+    this._until_pattern = this._input.get_regexp(parent._until_pattern);
+    this._until_after = parent._until_after;
+  }
+}
+
+Pattern.prototype.read = function() {
+  var result = this._input.read(this._starting_pattern);
+  if (!this._starting_pattern || result) {
+    result += this._input.read(this._match_pattern, this._until_pattern, this._until_after);
+  }
+  return result;
+};
+
+Pattern.prototype.read_match = function() {
+  return this._input.match(this._match_pattern);
+};
+
+Pattern.prototype.until_after = function(pattern) {
+  var result = this._create();
+  result._until_after = true;
+  result._until_pattern = this._input.get_regexp(pattern);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.until = function(pattern) {
+  var result = this._create();
+  result._until_after = false;
+  result._until_pattern = this._input.get_regexp(pattern);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.starting_with = function(pattern) {
+  var result = this._create();
+  result._starting_pattern = this._input.get_regexp(pattern, true);
+  result._update();
+  return result;
+};
+
+Pattern.prototype.matching = function(pattern) {
+  var result = this._create();
+  result._match_pattern = this._input.get_regexp(pattern, true);
+  result._update();
+  return result;
+};
+
+Pattern.prototype._create = function() {
+  return new Pattern(this._input, this);
+};
+
+Pattern.prototype._update = function() {};
+
+module.exports.Pattern = Pattern;
+
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+function Directives(start_block_pattern, end_block_pattern) {
+  start_block_pattern = typeof start_block_pattern === 'string' ? start_block_pattern : start_block_pattern.source;
+  end_block_pattern = typeof end_block_pattern === 'string' ? end_block_pattern : end_block_pattern.source;
+  this.__directives_block_pattern = new RegExp(start_block_pattern + / beautify( \w+[:]\w+)+ /.source + end_block_pattern, 'g');
+  this.__directive_pattern = / (\w+)[:](\w+)/g;
+
+  this.__directives_end_ignore_pattern = new RegExp(start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern, 'g');
+}
+
+Directives.prototype.get_directives = function(text) {
+  if (!text.match(this.__directives_block_pattern)) {
+    return null;
+  }
+
+  var directives = {};
+  this.__directive_pattern.lastIndex = 0;
+  var directive_match = this.__directive_pattern.exec(text);
+
+  while (directive_match) {
+    directives[directive_match[1]] = directive_match[2];
+    directive_match = this.__directive_pattern.exec(text);
+  }
+
+  return directives;
+};
+
+Directives.prototype.readIgnored = function(input) {
+  return input.readUntilAfter(this.__directives_end_ignore_pattern);
+};
+
+
+module.exports.Directives = Directives;
+
+
+/***/ }),
+/* 14 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*jshint node:true */
+/*
+
+  The MIT License (MIT)
+
+  Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors.
+
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation files
+  (the "Software"), to deal in the Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, sublicense, and/or sell copies of the Software,
+  and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+
+
+var Pattern = __webpack_require__(12).Pattern;
+
+
+var template_names = {
+  django: false,
+  erb: false,
+  handlebars: false,
+  php: false
+};
+
+// This lets templates appear anywhere we would do a readUntil
+// The cost is higher but it is pay to play.
+function TemplatablePattern(input_scanner, parent) {
+  Pattern.call(this, input_scanner, parent);
+  this.__template_pattern = null;
+  this._disabled = Object.assign({}, template_names);
+  this._excluded = Object.assign({}, template_names);
+
+  if (parent) {
+    this.__template_pattern = this._input.get_regexp(parent.__template_pattern);
+    this._excluded = Object.assign(this._excluded, parent._excluded);
+    this._disabled = Object.assign(this._disabled, parent._disabled);
+  }
+  var pattern = new Pattern(input_scanner);
+  this.__patterns = {
+    handlebars_comment: pattern.starting_with(/{{!--/).until_after(/--}}/),
+    handlebars_unescaped: pattern.starting_with(/{{{/).until_after(/}}}/),
+    handlebars: pattern.starting_with(/{{/).until_after(/}}/),
+    php: pattern.starting_with(/<\?(?:[=]|php)/).until_after(/\?>/),
+    erb: pattern.starting_with(/<%[^%]/).until_after(/[^%]%>/),
+    // django coflicts with handlebars a bit.
+    django: pattern.starting_with(/{%/).until_after(/%}/),
+    django_value: pattern.starting_with(/{{/).until_after(/}}/),
+    django_comment: pattern.starting_with(/{#/).until_after(/#}/)
+  };
+}
+TemplatablePattern.prototype = new Pattern();
+
+TemplatablePattern.prototype._create = function() {
+  return new TemplatablePattern(this._input, this);
+};
+
+TemplatablePattern.prototype._update = function() {
+  this.__set_templated_pattern();
+};
+
+TemplatablePattern.prototype.disable = function(language) {
+  var result = this._create();
+  result._disabled[language] = true;
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.read_options = function(options) {
+  var result = this._create();
+  for (var language in template_names) {
+    result._disabled[language] = options.templating.indexOf(language) === -1;
+  }
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.exclude = function(language) {
+  var result = this._create();
+  result._excluded[language] = true;
+  result._update();
+  return result;
+};
+
+TemplatablePattern.prototype.read = function() {
+  var result = '';
+  if (this._match_pattern) {
+    result = this._input.read(this._starting_pattern);
+  } else {
+    result = this._input.read(this._starting_pattern, this.__template_pattern);
+  }
+  var next = this._read_template();
+  while (next) {
+    if (this._match_pattern) {
+      next += this._input.read(this._match_pattern);
+    } else {
+      next += this._input.readUntil(this.__template_pattern);
+    }
+    result += next;
+    next = this._read_template();
+  }
+
+  if (this._until_after) {
+    result += this._input.readUntilAfter(this._until_pattern);
+  }
+  return result;
+};
+
+TemplatablePattern.prototype.__set_templated_pattern = function() {
+  var items = [];
+
+  if (!this._disabled.php) {
+    items.push(this.__patterns.php._starting_pattern.source);
+  }
+  if (!this._disabled.handlebars) {
+    items.push(this.__patterns.handlebars._starting_pattern.source);
+  }
+  if (!this._disabled.erb) {
+    items.push(this.__patterns.erb._starting_pattern.source);
+  }
+  if (!this._disabled.django) {
+    items.push(this.__patterns.django._starting_pattern.source);
+    items.push(this.__patterns.django_value._starting_pattern.source);
+    items.push(this.__patterns.django_comment._starting_pattern.source);
+  }
+
+  if (this._until_pattern) {
+    items.push(this._until_pattern.source);
+  }
+  this.__template_pattern = this._input.get_regexp('(?:' + items.join('|') + ')');
+};
+
+TemplatablePattern.prototype._read_template = function() {
+  var resulting_string = '';
+  var c = this._input.peek();
+  if (c === '<') {
+    var peek1 = this._input.peek(1);
+    //if we're in a comment, do something special
+    // We treat all comments as literals, even more than preformatted tags
+    // we just look for the appropriate close tag
+    if (!this._disabled.php && !this._excluded.php && peek1 === '?') {
+      resulting_string = resulting_string ||
+        this.__patterns.php.read();
+    }
+    if (!this._disabled.erb && !this._excluded.erb && peek1 === '%') {
+      resulting_string = resulting_string ||
+        this.__patterns.erb.read();
+    }
+  } else if (c === '{') {
+    if (!this._disabled.handlebars && !this._excluded.handlebars) {
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars_comment.read();
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars_unescaped.read();
+      resulting_string = resulting_string ||
+        this.__patterns.handlebars.read();
+    }
+    if (!this._disabled.django) {
+      // django coflicts with handlebars a bit.
+      if (!this._excluded.django && !this._excluded.handlebars) {
+        resulting_string = resulting_string ||
+          this.__patterns.django_value.read();
+      }
+      if (!this._excluded.django) {
+        resulting_string = resulting_string ||
+          this.__patterns.django_comment.read();
+        resulting_string = resulting_string ||
+          this.__patterns.django.read();
+      }
+    }
+  }
+  return resulting_string;
+};
+
+
+module.exports.TemplatablePattern = TemplatablePattern;
+
+
+/***/ })
+/******/ ]);
+var js_beautify = legacy_beautify_js;
+/* Footer */
+if (typeof define === "function" && define.amd) {
+    // Add support for AMD ( https://github.com/amdjs/amdjs-api/wiki/AMD#defineamd-property- )
+    define([], function() {
+        return { js_beautify: js_beautify };
+    });
+} else if (typeof exports !== "undefined") {
+    // Add support for CommonJS. Just put this file somewhere on your require.paths
+    // and you will be able to `var js_beautify = require("beautify").js_beautify`.
+    exports.js_beautify = js_beautify;
+} else if (typeof window !== "undefined") {
+    // If we're running a web page and don't have either of the above, add our one global
+    window.js_beautify = js_beautify;
+} else if (typeof global !== "undefined") {
+    // If we don't even have window, try global.
+    global.js_beautify = js_beautify;
+}
+
+}());
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-tests.js firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-tests.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/src/beautify-tests.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/src/beautify-tests.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2096 +0,0 @@
-/*global js_beautify: true */
-
-function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_beautify)
-{
-
-    var opts = {
-        indent_size: 4,
-        indent_char: ' ',
-        preserve_newlines: true,
-        jslint_happy: false,
-        keep_array_indentation: false,
-        brace_style: 'collapse',
-        space_before_conditional: true,
-        break_chained_methods: false,
-        selector_separator: '\n',
-        end_with_newline: true
-    };
-
-    function test_js_beautifier(input)
-    {
-        return js_beautify(input, opts);
-    }
-
-    function test_html_beautifier(input)
-    {
-        return html_beautify(input, opts);
-    }
-
-    function test_css_beautifier(input)
-    {
-        return css_beautify(input, opts);
-    }
-
-    var sanitytest;
-
-    // test the input on beautifier with the current flag settings
-    // does not check the indentation / surroundings as bt() does
-    function test_fragment(input, expected)
-    {
-        expected = expected || input;
-        sanitytest.expect(input, expected);
-        // if the expected is different from input, run it again
-        // expected output should be unchanged when run twice.
-        if (expected != input) {
-            sanitytest.expect(expected, expected);
-        }
-    }
-
-
-
-    // test the input on beautifier with the current flag settings
-    // test both the input as well as { input } wrapping
-    function bt(input, expectation)
-    {
-        var wrapped_input, wrapped_expectation;
-
-        expectation = expectation || input;
-        sanitytest.test_function(test_js_beautifier, 'js_beautify');
-        test_fragment(input, expectation);
-
-        // test also the returned indentation
-        // e.g if input = "asdf();"
-        // then test that this remains properly formatted as well:
-        // {
-        //     asdf();
-        //     indent;
-        // }
-
-        if (opts.indent_size === 4 && input) {
-            wrapped_input = '{\n' + input.replace(/^(.+)$/mg, '    $1') + '\n    foo = bar;\n}';
-            wrapped_expectation = '{\n' + expectation.replace(/^(.+)$/mg, '    $1') + '\n    foo = bar;\n}';
-            test_fragment(wrapped_input, wrapped_expectation);
-        }
-
-    }
-
-    // test html
-    function bth(input, expectation)
-    {
-        var wrapped_input, wrapped_expectation, field_input, field_expectation;
-
-        expectation = expectation || input;
-        sanitytest.test_function(test_html_beautifier, 'html_beautify');
-        test_fragment(input, expectation);
-
-        if (opts.indent_size === 4 && input) {
-            wrapped_input = '<div>\n' + input.replace(/^(.+)$/mg, '    $1') + '\n    <span>inline</span>\n</div>';
-            wrapped_expectation = '<div>\n' + expectation.replace(/^(.+)$/mg, '    $1') + '\n    <span>inline</span>\n</div>';
-            test_fragment(wrapped_input, wrapped_expectation);
-        }
-
-        // Test that handlebars non-block {{}} tags act as content and do not
-        // get any spacing or line breaks.
-        if (input.includes('content')) {
-            // Just {{field}}
-            field_input = input.replace(/content/g, '{{field}}');
-            field_expectation = expectation.replace(/content/g, '{{field}}');
-            test_fragment(field_input, field_expectation);
-
-            // handlebars comment
-            field_input = input.replace(/content/g, '{{! comment}}');
-            field_expectation = expectation.replace(/content/g, '{{! comment}}');
-            test_fragment(field_input, field_expectation);
-
-            // mixed {{field}} and content
-            field_input = input.replace(/content/g, 'pre{{field1}} {{field2}} {{field3}}post');
-            field_expectation = expectation.replace(/content/g, 'pre{{field1}} {{field2}} {{field3}}post');
-            test_fragment(field_input, field_expectation);
-        }
-    }
-
-    // test css
-    function btc(input, expectation)
-    {
-        var wrapped_input, wrapped_expectation;
-
-        expectation = expectation || input;
-        sanitytest.test_function(test_css_beautifier, 'css_beautify');
-        test_fragment(input, expectation);
-    }
-
-    // test the input on beautifier with the current flag settings,
-    // but dont't
-    function bt_braces(input, expectation)
-    {
-        var braces_ex = opts.brace_style;
-        opts.brace_style = 'expand';
-        bt(input, expectation);
-        opts.brace_style = braces_ex;
-    }
-
-    function beautifier_tests()
-    {
-        sanitytest = test_obj;
-
-        opts.indent_size       = 4;
-        opts.indent_char       = ' ';
-        opts.preserve_newlines = true;
-        opts.jslint_happy      = false;
-        opts.keep_array_indentation = false;
-        opts.brace_style       = "collapse";
-
-
-        // unicode support
-        bt('var ' + String.fromCharCode(3232) + '_' + String.fromCharCode(3232) + ' = "hi";');
-        bt('var ' + String.fromCharCode(228) + 'x = {\n    ' + String.fromCharCode(228) + 'rgerlich: true\n};');
-
-        bt('');
-        bt('return .5');
-        test_fragment('   return .5');
-        test_fragment('   return .5;\n   a();');
-        bt('a        =          1', 'a = 1');
-        bt('a=1', 'a = 1');
-        bt("a();\n\nb();", "a();\n\nb();");
-        bt('var a = 1 var b = 2', "var a = 1\nvar b = 2");
-        bt('var a=1, b=c[d], e=6;', 'var a = 1,\n    b = c[d],\n    e = 6;');
-        bt('var a,\n    b,\n    c;');
-        bt('let a = 1 let b = 2', "let a = 1\nlet b = 2");
-        bt('let a=1, b=c[d], e=6;', 'let a = 1,\n    b = c[d],\n    e = 6;');
-        bt('let a,\n    b,\n    c;');
-        bt('const a = 1 const b = 2', "const a = 1\nconst b = 2");
-        bt('const a=1, b=c[d], e=6;', 'const a = 1,\n    b = c[d],\n    e = 6;');
-        bt('const a,\n    b,\n    c;');
-        bt('a = " 12345 "');
-        bt("a = ' 12345 '");
-        bt('if (a == 1) b = 2;', "if (a == 1) b = 2;");
-        bt('if(1){2}else{3}', "if (1) {\n    2\n} else {\n    3\n}");
-        bt('if(1||2);', 'if (1 || 2);');
-        bt('(a==1)||(b==2)', '(a == 1) || (b == 2)');
-        bt('var a = 1 if (2) 3;', "var a = 1\nif (2) 3;");
-        bt('a = a + 1');
-        bt('a = a == 1');
-        bt('/12345[^678]*9+/.match(a)');
-        bt('a /= 5');
-        bt('a = 0.5 * 3');
-        bt('a *= 10.55');
-        bt('a < .5');
-        bt('a <= .5');
-        bt('a<.5', 'a < .5');
-        bt('a<=.5', 'a <= .5');
-        bt('a = 0xff;');
-        bt('a=0xff+4', 'a = 0xff + 4');
-        bt('a = [1, 2, 3, 4]');
-        bt('F*(g/=f)*g+b', 'F * (g /= f) * g + b');
-        bt('a.b({c:d})', 'a.b({\n    c: d\n})');
-        bt('a.b\n(\n{\nc:\nd\n}\n)', 'a.b({\n    c: d\n})');
-        bt('a.b({c:"d"})', 'a.b({\n    c: "d"\n})');
-        bt('a.b\n(\n{\nc:\n"d"\n}\n)', 'a.b({\n    c: "d"\n})');
-        bt('a=!b', 'a = !b');
-        bt('a=!!b', 'a = !!b');
-        bt('a?b:c', 'a ? b : c');
-        bt('a?1:2', 'a ? 1 : 2');
-        bt('a?(b):c', 'a ? (b) : c');
-        bt('x={a:1,b:w=="foo"?x:y,c:z}', 'x = {\n    a: 1,\n    b: w == "foo" ? x : y,\n    c: z\n}');
-        bt('x=a?b?c?d:e:f:g;', 'x = a ? b ? c ? d : e : f : g;');
-        bt('x=a?b?c?d:{e1:1,e2:2}:f:g;', 'x = a ? b ? c ? d : {\n    e1: 1,\n    e2: 2\n} : f : g;');
-        bt('function void(void) {}');
-        bt('if(!a)foo();', 'if (!a) foo();');
-        bt('a=~a', 'a = ~a');
-        bt('a;/*comment*/b;', "a; /*comment*/\nb;");
-        bt('a;/* comment */b;', "a; /* comment */\nb;");
-        test_fragment('a;/*\ncomment\n*/b;', "a;\n/*\ncomment\n*/\nb;"); // simple comments don't get touched at all
-        bt('a;/**\n* javadoc\n*/b;', "a;\n/**\n * javadoc\n */\nb;");
-        test_fragment('a;/**\n\nno javadoc\n*/b;', "a;\n/**\n\nno javadoc\n*/\nb;");
-        bt('a;/*\n* javadoc\n*/b;', "a;\n/*\n * javadoc\n */\nb;"); // comment blocks detected and reindented even w/o javadoc starter
-        bt('if(a)break;', "if (a) break;");
-        bt('if(a){break}', "if (a) {\n    break\n}");
-        bt('if((a))foo();', 'if ((a)) foo();');
-        bt('for(var i=0;;) a', 'for (var i = 0;;) a');
-        bt('for(var i=0;;)\na', 'for (var i = 0;;)\n    a');
-        bt('a++;', 'a++;');
-        bt('for(;;i++)a()', 'for (;; i++) a()');
-        bt('for(;;i++)\na()', 'for (;; i++)\n    a()');
-        bt('for(;;++i)a', 'for (;; ++i) a');
-        bt('return(1)', 'return (1)');
-        bt('try{a();}catch(b){c();}finally{d();}', "try {\n    a();\n} catch (b) {\n    c();\n} finally {\n    d();\n}");
-        bt('(xx)()'); // magic function call
-        bt('a[1]()'); // another magic function call
-        bt('if(a){b();}else if(c) foo();', "if (a) {\n    b();\n} else if (c) foo();");
-        bt('switch(x) {case 0: case 1: a(); break; default: break}', "switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}");
-        bt('switch(x){case -1:break;case !y:break;}', 'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}');
-        bt('a !== b');
-        bt('if (a) b(); else c();', "if (a) b();\nelse c();");
-        bt("// comment\n(function something() {})"); // typical greasemonkey start
-        bt("{\n\n    x();\n\n}"); // was: duplicating newlines
-        bt('if (a in b) foo();');
-        bt('var a, b;');
-        //  bt('var a, b');
-        bt('{a:1, b:2}', "{\n    a: 1,\n    b: 2\n}");
-        bt('a={1:[-1],2:[+1]}', 'a = {\n    1: [-1],\n    2: [+1]\n}');
-        bt('var l = {\'a\':\'1\', \'b\':\'2\'}', "var l = {\n    'a': '1',\n    'b': '2'\n}");
-        bt('if (template.user[n] in bk) foo();');
-        bt('{{}/z/}', "{\n    {}\n    /z/\n}");
-        bt('return 45', "return 45");
-        bt('return this.prevObject ||\n\n    this.constructor(null);');
-        bt('If[1]', "If[1]");
-        bt('Then[1]', "Then[1]");
-        bt('a = 1e10', "a = 1e10");
-        bt('a = 1.3e10', "a = 1.3e10");
-        bt('a = 1.3e-10', "a = 1.3e-10");
-        bt('a = -1.3e-10', "a = -1.3e-10");
-        bt('a = 1e-10', "a = 1e-10");
-        bt('a = e - 10', "a = e - 10");
-        bt('a = 11-10', "a = 11 - 10");
-        bt("a = 1;// comment", "a = 1; // comment");
-        bt("a = 1; // comment", "a = 1; // comment");
-        bt("a = 1;\n // comment", "a = 1;\n// comment");
-        bt('a = [-1, -1, -1]');
-
-        // The exact formatting these should have is open for discussion, but they are at least reasonable
-        bt('a = [ // comment\n    -1, -1, -1\n]');
-        bt('var a = [ // comment\n    -1, -1, -1\n]');
-        bt('a = [ // comment\n    -1, // comment\n    -1, -1\n]');
-        bt('var a = [ // comment\n    -1, // comment\n    -1, -1\n]');
-
-        bt('o = [{a:b},{c:d}]', 'o = [{\n    a: b\n}, {\n    c: d\n}]');
-
-        bt("if (a) {\n    do();\n}"); // was: extra space appended
-
-        bt("if (a) {\n// comment\n}else{\n// comment\n}", "if (a) {\n    // comment\n} else {\n    // comment\n}"); // if/else statement with empty body
-        bt("if (a) {\n// comment\n// comment\n}", "if (a) {\n    // comment\n    // comment\n}"); // multiple comments indentation
-        bt("if (a) b() else c();", "if (a) b()\nelse c();");
-        bt("if (a) b() else if c() d();", "if (a) b()\nelse if c() d();");
-
-        bt("{}");
-        bt("{\n\n}");
-        bt("do { a(); } while ( 1 );", "do {\n    a();\n} while (1);");
-        bt("do {} while (1);");
-        bt("do {\n} while (1);", "do {} while (1);");
-        bt("do {\n\n} while (1);");
-        bt("var a = x(a, b, c)");
-        bt("delete x if (a) b();", "delete x\nif (a) b();");
-        bt("delete x[x] if (a) b();", "delete x[x]\nif (a) b();");
-        bt("for(var a=1,b=2)d", "for (var a = 1, b = 2) d");
-        bt("for(var a=1,b=2,c=3) d", "for (var a = 1, b = 2, c = 3) d");
-        bt("for(var a=1,b=2,c=3;d<3;d++)\ne", "for (var a = 1, b = 2, c = 3; d < 3; d++)\n    e");
-        bt("function x(){(a||b).c()}", "function x() {\n    (a || b).c()\n}");
-        bt("function x(){return - 1}", "function x() {\n    return -1\n}");
-        bt("function x(){return ! a}", "function x() {\n    return !a\n}");
-        bt("x => x", "x => x");
-        bt("(x) => x", "(x) => x");
-        bt("x => { x }", "x => {\n    x\n}");
-        bt("(x) => { x }", "(x) => {\n    x\n}");
-
-        // a common snippet in jQuery plugins
-        bt("settings = $.extend({},defaults,settings);", "settings = $.extend({}, defaults, settings);");
-
-        // reserved words used as property names
-        bt("$http().then().finally().default()", "$http().then().finally().default()");
-        bt("$http()\n.then()\n.finally()\n.default()", "$http()\n    .then()\n    .finally()\n    .default()");
-        bt("$http().when.in.new.catch().throw()", "$http().when.in.new.catch().throw()");
-        bt("$http()\n.when\n.in\n.new\n.catch()\n.throw()", "$http()\n    .when\n    .in\n    .new\n    .catch()\n    .throw()");
-
-        bt('{xxx;}()', '{\n    xxx;\n}()');
-
-        bt("a = 'a'\nb = 'b'");
-        bt("a = /reg/exp");
-        bt("a = /reg/");
-        bt('/abc/.test()');
-        bt('/abc/i.test()');
-        bt("{/abc/i.test()}", "{\n    /abc/i.test()\n}");
-        bt('var x=(a)/a;', 'var x = (a) / a;');
-
-        bt('x != -1', 'x != -1');
-
-        bt('for (; s-->0;)t', 'for (; s-- > 0;) t');
-        bt('for (; s++>0;)u', 'for (; s++ > 0;) u');
-        bt('a = s++>s--;', 'a = s++ > s--;');
-        bt('a = s++>--s;', 'a = s++ > --s;');
-
-        bt('{x=#1=[]}', '{\n    x = #1=[]\n}');
-        bt('{a:#1={}}', '{\n    a: #1={}\n}');
-        bt('{a:#1#}', '{\n    a: #1#\n}');
-
-        test_fragment('"incomplete-string');
-        test_fragment("'incomplete-string");
-        test_fragment('/incomplete-regex');
-        test_fragment('`incomplete-template-string');
-
-        test_fragment('{a:1},{a:2}', '{\n    a: 1\n}, {\n    a: 2\n}');
-        test_fragment('var ary=[{a:1}, {a:2}];', 'var ary = [{\n    a: 1\n}, {\n    a: 2\n}];');
-
-        test_fragment('{a:#1', '{\n    a: #1'); // incomplete
-        test_fragment('{a:#', '{\n    a: #'); // incomplete
-
-        test_fragment('}}}', '}\n}\n}'); // incomplete
-
-        test_fragment('<!--\nvoid();\n// -->', '<!--\nvoid();\n// -->');
-
-        test_fragment('a=/regexp', 'a = /regexp'); // incomplete regexp
-
-        bt('{a:#1=[],b:#1#,c:#999999#}', '{\n    a: #1=[],\n    b: #1#,\n    c: #999999#\n}');
-
-        bt("a = 1e+2");
-        bt("a = 1e-2");
-        bt("do{x()}while(a>1)", "do {\n    x()\n} while (a > 1)");
-
-        bt("x(); /reg/exp.match(something)", "x();\n/reg/exp.match(something)");
-
-        test_fragment("something();(", "something();\n(");
-        test_fragment("#!she/bangs, she bangs\nf=1", "#!she/bangs, she bangs\n\nf = 1");
-        test_fragment("#!she/bangs, she bangs\n\nf=1", "#!she/bangs, she bangs\n\nf = 1");
-        test_fragment("#!she/bangs, she bangs\n\n/* comment */", "#!she/bangs, she bangs\n\n/* comment */");
-        test_fragment("#!she/bangs, she bangs\n\n\n/* comment */", "#!she/bangs, she bangs\n\n\n/* comment */");
-        test_fragment("#", "#");
-        test_fragment("#!", "#!");
-
-        bt("function namespace::something()");
-
-        test_fragment("<!--\nsomething();\n-->", "<!--\nsomething();\n-->");
-        test_fragment("<!--\nif(i<0){bla();}\n-->", "<!--\nif (i < 0) {\n    bla();\n}\n-->");
-
-        bt('{foo();--bar;}', '{\n    foo();\n    --bar;\n}');
-        bt('{foo();++bar;}', '{\n    foo();\n    ++bar;\n}');
-        bt('{--bar;}', '{\n    --bar;\n}');
-        bt('{++bar;}', '{\n    ++bar;\n}');
-
-        // Handling of newlines around unary ++ and -- operators
-        bt('{foo\n++bar;}', '{\n    foo\n    ++bar;\n}');
-        bt('{foo++\nbar;}', '{\n    foo++\n    bar;\n}');
-
-        // This is invalid, but harder to guard against. Issue #203.
-        bt('{foo\n++\nbar;}', '{\n    foo\n    ++\n    bar;\n}');
-
-
-        // regexps
-        bt('a(/abc\\/\\/def/);b()', "a(/abc\\/\\/def/);\nb()");
-        bt('a(/a[b\\[\\]c]d/);b()', "a(/a[b\\[\\]c]d/);\nb()");
-        test_fragment('a(/a[b\\[', "a(/a[b\\["); // incomplete char class
-        // allow unescaped / in char classes
-        bt('a(/[a/b]/);b()', "a(/[a/b]/);\nb()");
-
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}');
-        bt('a=[[1,2],[4,5],[7,8]]', "a = [\n    [1, 2],\n    [4, 5],\n    [7, 8]\n]");
-        bt('a=[[1,2],[4,5],function(){},[7,8]]',
-            "a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]");
-        bt('a=[[1,2],[4,5],function(){},function(){},[7,8]]',
-            "a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    function() {},\n    [7, 8]\n]");
-        bt('a=[[1,2],[4,5],function(){},[7,8]]',
-            "a = [\n    [1, 2],\n    [4, 5],\n    function() {},\n    [7, 8]\n]");
-        bt('a=[b,c,function(){},function(){},d]',
-            "a = [b, c,\n    function() {},\n    function() {},\n    d\n]");
-        bt('a=[a[1],b[4],c[d[7]]]', "a = [a[1], b[4], c[d[7]]]");
-        bt('[1,2,[3,4,[5,6],7],8]', "[1, 2, [3, 4, [5, 6], 7], 8]");
-
-        bt('[[["1","2"],["3","4"]],[["5","6","7"],["8","9","0"]],[["1","2","3"],["4","5","6","7"],["8","9","0"]]]',
-            '[\n    [\n        ["1", "2"],\n        ["3", "4"]\n    ],\n    [\n        ["5", "6", "7"],\n        ["8", "9", "0"]\n    ],\n    [\n        ["1", "2", "3"],\n        ["4", "5", "6", "7"],\n        ["8", "9", "0"]\n    ]\n]');
-
-        bt('{[x()[0]];indent;}', '{\n    [x()[0]];\n    indent;\n}');
-
-        bt('return ++i', 'return ++i');
-        bt('return !!x', 'return !!x');
-        bt('return !x', 'return !x');
-        bt('return [1,2]', 'return [1, 2]');
-        bt('return;', 'return;');
-        bt('return\nfunc', 'return\nfunc');
-        bt('catch(e)', 'catch (e)');
-        bt('yield [1, 2]');
-
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},c=4;',
-            'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    }, c = 4;');
-        bt('var a=1,b={foo:2,bar:3},{baz:4,wham:5},\nc=4;',
-            'var a = 1,\n    b = {\n        foo: 2,\n        bar: 3\n    },\n    {\n        baz: 4,\n        wham: 5\n    },\n    c = 4;');
-
-
-        // inline comment
-        bt('function x(/*int*/ start, /*string*/ foo)', 'function x( /*int*/ start, /*string*/ foo)');
-
-        // javadoc comment
-        bt('/**\n* foo\n*/', '/**\n * foo\n */');
-        bt('{\n/**\n* foo\n*/\n}', '{\n    /**\n     * foo\n     */\n}');
-
-        // starless block comment
-        bt('/**\nfoo\n*/');
-        bt('/**\nfoo\n**/');
-        bt('/**\nfoo\nbar\n**/');
-        bt('/**\nfoo\n\nbar\n**/');
-        bt('/**\nfoo\n    bar\n**/');
-        bt('{\n/**\nfoo\n*/\n}', '{\n    /**\n    foo\n    */\n}');
-        bt('{\n/**\nfoo\n**/\n}', '{\n    /**\n    foo\n    **/\n}');
-        bt('{\n/**\nfoo\nbar\n**/\n}', '{\n    /**\n    foo\n    bar\n    **/\n}');
-        bt('{\n/**\nfoo\n\nbar\n**/\n}', '{\n    /**\n    foo\n\n    bar\n    **/\n}');
-        bt('{\n/**\nfoo\n    bar\n**/\n}', '{\n    /**\n    foo\n        bar\n    **/\n}');
-        bt('{\n    /**\n    foo\nbar\n    **/\n}');
-
-        bt('var a,b,c=1,d,e,f=2;', 'var a, b, c = 1,\n    d, e, f = 2;');
-        bt('var a,b,c=[],d,e,f=2;', 'var a, b, c = [],\n    d, e, f = 2;');
-        bt('function() {\n    var a, b, c, d, e = [],\n        f;\n}');
-
-        bt('do/regexp/;\nwhile(1);', 'do /regexp/;\nwhile (1);'); // hmmm
-
-        bt('var a = a,\na;\nb = {\nb\n}', 'var a = a,\n    a;\nb = {\n    b\n}');
-
-        bt('var a = a,\n    /* c */\n    b;');
-        bt('var a = a,\n    // c\n    b;');
-
-        bt('foo.("bar");'); // weird element referencing
-
-
-        bt('if (a) a()\nelse b()\nnewline()');
-        bt('if (a) a()\nnewline()');
-        bt('a=typeof(x)', 'a = typeof(x)');
-
-        bt('var a = function() {\n        return null;\n    },\n    b = false;');
-
-        bt('var a = function() {\n    func1()\n}');
-        bt('var a = function() {\n    func1()\n}\nvar b = function() {\n    func2()\n}');
-
-        // code with and without semicolons
-        bt( 'var whatever = require("whatever");\nfunction() {\n    a = 6;\n}',
-            'var whatever = require("whatever");\n\nfunction() {\n    a = 6;\n}');
-        bt( 'var whatever = require("whatever")\nfunction() {\n    a = 6\n}',
-            'var whatever = require("whatever")\n\nfunction() {\n    a = 6\n}');
-
-
-        opts.jslint_happy = true;
-
-        bt('a=typeof(x)', 'a = typeof (x)');
-        bt('x();\n\nfunction(){}', 'x();\n\nfunction () {}');
-        bt('function () {\n    var a, b, c, d, e = [],\n        f;\n}');
-        bt('switch(x) {case 0: case 1: a(); break; default: break}',
-            "switch (x) {\ncase 0:\ncase 1:\n    a();\n    break;\ndefault:\n    break\n}");
-        bt('switch(x){case -1:break;case !y:break;}',
-            'switch (x) {\ncase -1:\n    break;\ncase !y:\n    break;\n}');
-        test_fragment("// comment 1\n(function()", "// comment 1\n(function ()"); // typical greasemonkey start
-        bt('var o1=$.extend(a);function(){alert(x);}', 'var o1 = $.extend(a);\n\nfunction () {\n    alert(x);\n}');
-        bt('function* () {\n    yield 1;\n}');
-
-        opts.jslint_happy = false;
-
-        bt('switch(x) {case 0: case 1: a(); break; default: break}',
-            "switch (x) {\n    case 0:\n    case 1:\n        a();\n        break;\n    default:\n        break\n}");
-        bt('switch(x){case -1:break;case !y:break;}',
-            'switch (x) {\n    case -1:\n        break;\n    case !y:\n        break;\n}');
-        test_fragment("// comment 2\n(function()", "// comment 2\n(function()"); // typical greasemonkey start
-        bt("var a2, b2, c2, d2 = 0, c = function() {}, d = '';", "var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = '';");
-        bt("var a2, b2, c2, d2 = 0, c = function() {},\nd = '';", "var a2, b2, c2, d2 = 0,\n    c = function() {},\n    d = '';");
-        bt('var o2=$.extend(a);function(){alert(x);}', 'var o2 = $.extend(a);\n\nfunction() {\n    alert(x);\n}');
-        bt('function*() {\n    yield 1;\n}');
-
-        bt('function* x() {\n    yield 1;\n}');
-
-        bt('{"x":[{"a":1,"b":3},7,8,8,8,8,{"b":99},{"a":11}]}', '{\n    "x": [{\n            "a": 1,\n            "b": 3\n        },\n        7, 8, 8, 8, 8, {\n            "b": 99\n        }, {\n            "a": 11\n        }\n    ]\n}');
-
-        bt('{"1":{"1a":"1b"},"2"}', '{\n    "1": {\n        "1a": "1b"\n    },\n    "2"\n}');
-        bt('{a:{a:b},c}', '{\n    a: {\n        a: b\n    },\n    c\n}');
-
-        bt('{[y[a]];keep_indent;}', '{\n    [y[a]];\n    keep_indent;\n}');
-
-        bt('if (x) {y} else { if (x) {y}}', 'if (x) {\n    y\n} else {\n    if (x) {\n        y\n    }\n}');
-
-        bt('if (foo) one()\ntwo()\nthree()');
-        bt('if (1 + foo() && bar(baz()) / 2) one()\ntwo()\nthree()');
-        bt('if (1 + foo() && bar(baz()) / 2) one();\ntwo();\nthree();');
-
-        opts.indent_size = 1;
-        opts.indent_char = ' ';
-        bt('{ one_char() }', "{\n one_char()\n}");
-
-        bt('var a,b=1,c=2', 'var a, b = 1,\n c = 2');
-
-        opts.indent_size = 4;
-        opts.indent_char = ' ';
-        bt('{ one_char() }', "{\n    one_char()\n}");
-
-        opts.indent_size = 1;
-        opts.indent_char = "\t";
-        bt('{ one_char() }', "{\n\tone_char()\n}");
-        bt('x = a ? b : c; x;', 'x = a ? b : c;\nx;');
-
-        //set to something else than it should change to, but with tabs on, should override
-        opts.indent_size = 5;
-        opts.indent_char = ' ';
-        opts.indent_with_tabs = true;
-
-        bt('{ one_char() }', "{\n\tone_char()\n}");
-        bt('x = a ? b : c; x;', 'x = a ? b : c;\nx;');
-
-        opts.indent_size = 4;
-        opts.indent_char = ' ';
-        opts.indent_with_tabs = false;
-
-        opts.preserve_newlines = false;
-
-        bt('var\na=dont_preserve_newlines;', 'var a = dont_preserve_newlines;');
-
-        // make sure the blank line between function definitions stays
-        // even when preserve_newlines = false
-        bt('function foo() {\n    return 1;\n}\n\nfunction foo() {\n    return 1;\n}');
-        bt('function foo() {\n    return 1;\n}\nfunction foo() {\n    return 1;\n}',
-           'function foo() {\n    return 1;\n}\n\nfunction foo() {\n    return 1;\n}'
-          );
-        bt('function foo() {\n    return 1;\n}\n\n\nfunction foo() {\n    return 1;\n}',
-           'function foo() {\n    return 1;\n}\n\nfunction foo() {\n    return 1;\n}'
-          );
-
-        opts.preserve_newlines = true;
-        bt('var\na=do_preserve_newlines;', 'var\n    a = do_preserve_newlines;');
-        bt('// a\n// b\n\n// c\n// d');
-        bt('if (foo) //  comment\n{\n    bar();\n}');
-
-
-        opts.keep_array_indentation = false;
-        bt("a = ['a', 'b', 'c',\n   'd', 'e', 'f']",
-            "a = ['a', 'b', 'c',\n    'd', 'e', 'f'\n]");
-        bt("a = ['a', 'b', 'c',\n   'd', 'e', 'f',\n        'g', 'h', 'i']",
-            "a = ['a', 'b', 'c',\n    'd', 'e', 'f',\n    'g', 'h', 'i'\n]");
-        bt("a = ['a', 'b', 'c',\n       'd', 'e', 'f',\n            'g', 'h', 'i']",
-            "a = ['a', 'b', 'c',\n    'd', 'e', 'f',\n    'g', 'h', 'i'\n]");
-        bt('var x = [{}\n]', 'var x = [{}]');
-        bt('var x = [{foo:bar}\n]', 'var x = [{\n    foo: bar\n}]');
-        bt("a = ['something',\n    'completely',\n    'different'];\nif (x);",
-            "a = ['something',\n    'completely',\n    'different'\n];\nif (x);");
-        bt("a = ['a','b','c']", "a = ['a', 'b', 'c']");
-
-        bt("a = ['a',   'b','c']", "a = ['a', 'b', 'c']");
-        bt("x = [{'a':0}]",
-            "x = [{\n    'a': 0\n}]");
-        bt('{a([[a1]], {b;});}',
-            '{\n    a([\n        [a1]\n    ], {\n        b;\n    });\n}');
-        bt("a();\n   [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();",
-            "a();\n[\n    ['sdfsdfsd'],\n    ['sdfsdfsdf']\n].toString();");
-        bt("a();\na = [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();",
-            "a();\na = [\n    ['sdfsdfsd'],\n    ['sdfsdfsdf']\n].toString();");
-        bt("function() {\n    Foo([\n        ['sdfsdfsd'],\n        ['sdfsdfsdf']\n    ]);\n}",
-            "function() {\n    Foo([\n        ['sdfsdfsd'],\n        ['sdfsdfsdf']\n    ]);\n}");
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}');
-        // 4 spaces per indent input, processed with 4-spaces per indent
-        bt( "function foo() {\n" +
-            "    return [\n" +
-            "        {\n" +
-            "            one: 'x',\n" +
-            "            two: [\n" +
-            "                {\n" +
-            "                    id: 'a',\n" +
-            "                    name: 'apple'\n" +
-            "                }, {\n" +
-            "                    id: 'b',\n" +
-            "                    name: 'banana'\n" +
-            "                }\n" +
-            "            ]\n" +
-            "        }\n" +
-            "    ];\n" +
-            "}",
-            "function foo() {\n" +
-            "    return [{\n" +
-            "        one: 'x',\n" +
-            "        two: [{\n" +
-            "            id: 'a',\n" +
-            "            name: 'apple'\n" +
-            "        }, {\n" +
-            "            id: 'b',\n" +
-            "            name: 'banana'\n" +
-            "        }]\n" +
-            "    }];\n" +
-            "}");
-        // 3 spaces per indent input, processed with 4-spaces per indent
-        bt( "function foo() {\n" +
-            "   return [\n" +
-            "      {\n" +
-            "         one: 'x',\n" +
-            "         two: [\n" +
-            "            {\n" +
-            "               id: 'a',\n" +
-            "               name: 'apple'\n" +
-            "            }, {\n" +
-            "               id: 'b',\n" +
-            "               name: 'banana'\n" +
-            "            }\n" +
-            "         ]\n" +
-            "      }\n" +
-            "   ];\n" +
-            "}",
-            "function foo() {\n" +
-            "    return [{\n" +
-            "        one: 'x',\n" +
-            "        two: [{\n" +
-            "            id: 'a',\n" +
-            "            name: 'apple'\n" +
-            "        }, {\n" +
-            "            id: 'b',\n" +
-            "            name: 'banana'\n" +
-            "        }]\n" +
-            "    }];\n" +
-            "}");
-
-        opts.keep_array_indentation = true;
-        bt("a = ['a', 'b', 'c',\n   'd', 'e', 'f']");
-        bt("a = ['a', 'b', 'c',\n   'd', 'e', 'f',\n        'g', 'h', 'i']");
-        bt("a = ['a', 'b', 'c',\n       'd', 'e', 'f',\n            'g', 'h', 'i']");
-        bt('var x = [{}\n]', 'var x = [{}\n]');
-        bt('var x = [{foo:bar}\n]', 'var x = [{\n        foo: bar\n    }\n]');
-        bt("a = ['something',\n    'completely',\n    'different'];\nif (x);");
-        bt("a = ['a','b','c']", "a = ['a', 'b', 'c']");
-        bt("a = ['a',   'b','c']", "a = ['a', 'b', 'c']");
-        bt("x = [{'a':0}]",
-            "x = [{\n    'a': 0\n}]");
-        bt('{a([[a1]], {b;});}',
-            '{\n    a([[a1]], {\n        b;\n    });\n}');
-        bt("a();\n   [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();",
-            "a();\n   [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();");
-        bt("a();\na = [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();",
-            "a();\na = [\n   ['sdfsdfsd'],\n        ['sdfsdfsdf']\n   ].toString();");
-        bt("function() {\n    Foo([\n        ['sdfsdfsd'],\n        ['sdfsdfsdf']\n    ]);\n}",
-            "function() {\n    Foo([\n        ['sdfsdfsd'],\n        ['sdfsdfsdf']\n    ]);\n}");
-        bt('function foo() {\n    return [\n        "one",\n        "two"\n    ];\n}');
-        // 4 spaces per indent input, processed with 4-spaces per indent
-        bt( "function foo() {\n" +
-            "    return [\n" +
-            "        {\n" +
-            "            one: 'x',\n" +
-            "            two: [\n" +
-            "                {\n" +
-            "                    id: 'a',\n" +
-            "                    name: 'apple'\n" +
-            "                }, {\n" +
-            "                    id: 'b',\n" +
-            "                    name: 'banana'\n" +
-            "                }\n" +
-            "            ]\n" +
-            "        }\n" +
-            "    ];\n" +
-            "}");
-        // 3 spaces per indent input, processed with 4-spaces per indent
-        // Should be unchanged, but is not - #445
-//         bt( "function foo() {\n" +
-//             "   return [\n" +
-//             "      {\n" +
-//             "         one: 'x',\n" +
-//             "         two: [\n" +
-//             "            {\n" +
-//             "               id: 'a',\n" +
-//             "               name: 'apple'\n" +
-//             "            }, {\n" +
-//             "               id: 'b',\n" +
-//             "               name: 'banana'\n" +
-//             "            }\n" +
-//             "         ]\n" +
-//             "      }\n" +
-//             "   ];\n" +
-//             "}");
-
-
-        opts.keep_array_indentation = false;
-
-
-        bt('a = //comment\n    /regex/;');
-
-        test_fragment('/*\n * X\n */');
-        test_fragment('/*\r\n * X\r\n */', '/*\n * X\n */');
-
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}', 'if (a) {\n    b;\n} else {\n    c;\n}');
-
-
-        opts.brace_style = 'expand';
-
-        bt('//case 1\nif (a == 1)\n{}\n//case 2\nelse if (a == 2)\n{}');
-        bt('if(1){2}else{3}', "if (1)\n{\n    2\n}\nelse\n{\n    3\n}");
-        bt('try{a();}catch(b){c();}catch(d){}finally{e();}',
-            "try\n{\n    a();\n}\ncatch (b)\n{\n    c();\n}\ncatch (d)\n{}\nfinally\n{\n    e();\n}");
-        bt('if(a){b();}else if(c) foo();',
-            "if (a)\n{\n    b();\n}\nelse if (c) foo();");
-        bt('if(X)if(Y)a();else b();else c();',
-            "if (X)\n    if (Y) a();\n    else b();\nelse c();");
-        bt("if (a) {\n// comment\n}else{\n// comment\n}",
-            "if (a)\n{\n    // comment\n}\nelse\n{\n    // comment\n}"); // if/else statement with empty body
-        bt('if (x) {y} else { if (x) {y}}',
-            'if (x)\n{\n    y\n}\nelse\n{\n    if (x)\n    {\n        y\n    }\n}');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}',
-            'if (a)\n{\n    b;\n}\nelse\n{\n    c;\n}');
-        test_fragment('    /*\n* xx\n*/\n// xx\nif (foo) {\n    bar();\n}',
-                      '    /*\n     * xx\n     */\n    // xx\n    if (foo)\n    {\n        bar();\n    }');
-        bt('if (foo)\n{}\nelse /regex/.test();');
-        bt('if (foo) /regex/.test();');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}', 'if (a)\n{\n    b;\n}\nelse\n{\n    c;\n}');
-        test_fragment('if (foo) {', 'if (foo)\n{');
-        test_fragment('foo {', 'foo\n{');
-        test_fragment('return {', 'return {'); // return needs the brace.
-        test_fragment('return /* inline */ {', 'return /* inline */ {');
-        // test_fragment('return\n{', 'return\n{'); // can't support this?, but that's an improbable and extreme case anyway.
-        test_fragment('return;\n{', 'return;\n{');
-        bt("throw {}");
-        bt("throw {\n    foo;\n}");
-        bt('var foo = {}');
-        bt('if (foo) bar();\nelse break');
-        bt('function x() {\n    foo();\n}zzz', 'function x()\n{\n    foo();\n}\nzzz');
-        bt('a: do {} while (); xxx', 'a: do {} while ();\nxxx');
-        bt('var a = new function();');
-        bt('var a = new function() {};');
-        bt('var a = new function()\n{};', 'var a = new function() {};');
-        bt('var a = new function a()\n{};');
-        bt('var a = new function a()\n    {},\n    b = new function b()\n    {};');
-        test_fragment('new function');
-        bt("foo({\n    'a': 1\n},\n10);",
-            "foo(\n    {\n        'a': 1\n    },\n    10);");
-        bt('(["foo","bar"]).each(function(i) {return i;});',
-            '(["foo", "bar"]).each(function(i)\n{\n    return i;\n});');
-        bt('(function(i) {return i;})();',
-            '(function(i)\n{\n    return i;\n})();');
-        bt( "test( /*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/\n" +
-            "    {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test(\n" +
-            "/*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "},\n" +
-            "/*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test(\n" +
-            "    /*Argument 1*/\n" +
-            "    {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test( /*Argument 1*/\n" +
-            "{\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */\n" +
-            "{\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/\n" +
-            "    {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-
-        opts.brace_style = 'collapse';
-
-        bt('//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
-        bt('if(1){2}else{3}', "if (1) {\n    2\n} else {\n    3\n}");
-        bt('try{a();}catch(b){c();}catch(d){}finally{e();}',
-             "try {\n    a();\n} catch (b) {\n    c();\n} catch (d) {} finally {\n    e();\n}");
-        bt('if(a){b();}else if(c) foo();',
-            "if (a) {\n    b();\n} else if (c) foo();");
-        bt("if (a) {\n// comment\n}else{\n// comment\n}",
-            "if (a) {\n    // comment\n} else {\n    // comment\n}"); // if/else statement with empty body
-        bt('if (x) {y} else { if (x) {y}}',
-            'if (x) {\n    y\n} else {\n    if (x) {\n        y\n    }\n}');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}',
-            'if (a) {\n    b;\n} else {\n    c;\n}');
-        test_fragment('    /*\n* xx\n*/\n// xx\nif (foo) {\n    bar();\n}',
-                      '    /*\n     * xx\n     */\n    // xx\n    if (foo) {\n        bar();\n    }');
-        bt('if (foo) {} else /regex/.test();');
-        bt('if (foo) /regex/.test();');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}', 'if (a) {\n    b;\n} else {\n    c;\n}');
-        test_fragment('if (foo) {', 'if (foo) {');
-        test_fragment('foo {', 'foo {');
-        test_fragment('return {', 'return {'); // return needs the brace.
-        test_fragment('return /* inline */ {', 'return /* inline */ {');
-        // test_fragment('return\n{', 'return\n{'); // can't support this?, but that's an improbable and extreme case anyway.
-        test_fragment('return;\n{', 'return; {');
-        bt("throw {}");
-        bt("throw {\n    foo;\n}");
-        bt('var foo = {}');
-        bt('if (foo) bar();\nelse break');
-        bt('function x() {\n    foo();\n}zzz', 'function x() {\n    foo();\n}\nzzz');
-        bt('a: do {} while (); xxx', 'a: do {} while ();\nxxx');
-        bt('var a = new function();');
-        bt('var a = new function() {};');
-        bt('var a = new function a() {};');
-        test_fragment('new function');
-        bt("foo({\n    'a': 1\n},\n10);",
-            "foo({\n        'a': 1\n    },\n    10);");
-        bt('(["foo","bar"]).each(function(i) {return i;});',
-            '(["foo", "bar"]).each(function(i) {\n    return i;\n});');
-        bt('(function(i) {return i;})();',
-            '(function(i) {\n    return i;\n})();');
-        bt( "test( /*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/ {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test(\n" +
-            "/*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "},\n" +
-            "/*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test(\n" +
-            "    /*Argument 1*/\n" +
-            "    {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test( /*Argument 1*/\n" +
-            "{\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */\n" +
-            "{\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/ {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-
-        opts.brace_style = "end-expand";
-
-        bt('//case 1\nif (a == 1) {}\n//case 2\nelse if (a == 2) {}');
-        bt('if(1){2}else{3}', "if (1) {\n    2\n}\nelse {\n    3\n}");
-        bt('try{a();}catch(b){c();}catch(d){}finally{e();}',
-            "try {\n    a();\n}\ncatch (b) {\n    c();\n}\ncatch (d) {}\nfinally {\n    e();\n}");
-        bt('if(a){b();}else if(c) foo();',
-            "if (a) {\n    b();\n}\nelse if (c) foo();");
-        bt("if (a) {\n// comment\n}else{\n// comment\n}",
-            "if (a) {\n    // comment\n}\nelse {\n    // comment\n}"); // if/else statement with empty body
-        bt('if (x) {y} else { if (x) {y}}',
-            'if (x) {\n    y\n}\nelse {\n    if (x) {\n        y\n    }\n}');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}',
-            'if (a) {\n    b;\n}\nelse {\n    c;\n}');
-        test_fragment('    /*\n* xx\n*/\n// xx\nif (foo) {\n    bar();\n}',
-                      '    /*\n     * xx\n     */\n    // xx\n    if (foo) {\n        bar();\n    }');
-        bt('if (foo) {}\nelse /regex/.test();');
-        bt('if (foo) /regex/.test();');
-        bt('if (a)\n{\nb;\n}\nelse\n{\nc;\n}', 'if (a) {\n    b;\n}\nelse {\n    c;\n}');
-        test_fragment('if (foo) {', 'if (foo) {');
-        test_fragment('foo {', 'foo {');
-        test_fragment('return {', 'return {'); // return needs the brace.
-        test_fragment('return /* inline */ {', 'return /* inline */ {');
-        // test_fragment('return\n{', 'return\n{'); // can't support this?, but that's an improbable and extreme case anyway.
-        test_fragment('return;\n{', 'return; {');
-        bt("throw {}");
-        bt("throw {\n    foo;\n}");
-        bt('var foo = {}');
-        bt('if (foo) bar();\nelse break');
-        bt('function x() {\n    foo();\n}zzz', 'function x() {\n    foo();\n}\nzzz');
-        bt('a: do {} while (); xxx', 'a: do {} while ();\nxxx');
-        bt('var a = new function();');
-        bt('var a = new function() {};');
-        bt('var a = new function a() {};');
-        test_fragment('new function');
-        bt("foo({\n    'a': 1\n},\n10);",
-            "foo({\n        'a': 1\n    },\n    10);");
-        bt('(["foo","bar"]).each(function(i) {return i;});',
-            '(["foo", "bar"]).each(function(i) {\n    return i;\n});');
-        bt('(function(i) {return i;})();',
-            '(function(i) {\n    return i;\n})();');
-        bt( "test( /*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/ {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test(\n" +
-            "/*Argument 1*/ {\n" +
-            "    'Value1': '1'\n" +
-            "},\n" +
-            "/*Argument 2\n" +
-            " */ {\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test(\n" +
-            "    /*Argument 1*/\n" +
-            "    {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-        bt( "test( /*Argument 1*/\n" +
-            "{\n" +
-            "    'Value1': '1'\n" +
-            "}, /*Argument 2\n" +
-            " */\n" +
-            "{\n" +
-            "    'Value2': '2'\n" +
-            "});",
-            // expected
-            "test( /*Argument 1*/ {\n" +
-            "        'Value1': '1'\n" +
-            "    },\n" +
-            "    /*Argument 2\n" +
-            "     */\n" +
-            "    {\n" +
-            "        'Value2': '2'\n" +
-            "    });");
-
-        opts.brace_style = 'collapse';
-
-
-        bt('a = <?= external() ?> ;'); // not the most perfect thing in the world, but you're the weirdo beaufifying php mix-ins with javascript beautifier
-        bt('a = <%= external() %> ;');
-
-        bt('// func-comment\n\nfunction foo() {}\n\n// end-func-comment');
-
-        test_fragment('roo = {\n    /*\n    ****\n      FOO\n    ****\n    */\n    BAR: 0\n};');
-
-        bt('"foo""bar""baz"', '"foo"\n"bar"\n"baz"');
-        bt("'foo''bar''baz'", "'foo'\n'bar'\n'baz'");
-
-
-        test_fragment("if (zz) {\n    // ....\n}\n(function");
-
-        bt("{\n    get foo() {}\n}");
-        bt("{\n    var a = get\n    foo();\n}");
-        bt("{\n    set foo() {}\n}");
-        bt("{\n    var a = set\n    foo();\n}");
-        bt("var x = {\n    get function()\n}");
-        bt("var x = {\n    set function()\n}");
-        bt("var x = set\n\na() {}", "var x = set\n\n    a() {}");
-        bt("var x = set\n\nfunction() {}", "var x = set\n\n    function() {}");
-
-        bt('<!-- foo\nbar();\n-->');
-        bt('<!-- dont crash');
-        bt('for () /abc/.test()');
-        bt('if (k) /aaa/m.test(v) && l();');
-        bt('switch (true) {\n    case /swf/i.test(foo):\n        bar();\n}');
-        bt('createdAt = {\n    type: Date,\n    default: Date.now\n}');
-        bt('switch (createdAt) {\n    case a:\n        Date,\n    default:\n        Date.now\n}');
-        opts.space_before_conditional = false;
-        bt('if(a) b()');
-        opts.space_before_conditional = true;
-
-
-        opts.preserve_newlines = true;
-        bt('var a = 42; // foo\n\nvar b;');
-        bt('var a = 42; // foo\n\n\nvar b;');
-        bt("var a = 'foo' +\n    'bar';");
-        bt("var a = \"foo\" +\n    \"bar\";");
-        bt('this.oa = new OAuth(\n' +
-           '    _requestToken,\n' +
-           '    _accessToken,\n' +
-           '    consumer_key\n' +
-           ');');
-
-
-        opts.unescape_strings = false;
-        test_fragment('"\\x22\\x27", \'\\x22\\x27\', "\\x5c", \'\\x5c\', "\\xff and \\xzz", "unicode \\u0000 \\u0022 \\u0027 \\u005c \\uffff \\uzzzz"');
-        opts.unescape_strings = true;
-        test_fragment('"\\x20\\x40\\x4a"', '" @J"');
-        test_fragment('"\\xff\\x40\\x4a"');
-        test_fragment('"\\u0072\\u016B\\u0137\\u012B\\u0074\\u0069\\u0073"', '"rūķītis"');
-        test_fragment('"Google Chrome est\\u00E1 actualizado."', '"Google Chrome está actualizado."');
-        /*
-        bt('"\\x22\\x27",\'\\x22\\x27\',"\\x5c",\'\\x5c\',"\\xff and \\xzz","unicode \\u0000 \\u0022 \\u0027 \\u005c \\uffff \\uzzzz"',
-           '"\\"\'", \'"\\\'\', "\\\\", \'\\\\\', "\\xff and \\xzz", "unicode \\u0000 \\" \' \\\\ \\uffff \\uzzzz"');
-        */
-        opts.unescape_strings = false;
-
-        bt('return function();');
-        bt('var a = function();');
-        bt('var a = 5 + function();');
-
-        bt('3.*7;', '3. * 7;');
-        bt('import foo.*;', 'import foo.*;'); // actionscript's import
-        test_fragment('function f(a: a, b: b)'); // actionscript
-
-        bt('{\n    foo // something\n    ,\n    bar // something\n    baz\n}');
-        bt('function a(a) {} function b(b) {} function c(c) {}', 'function a(a) {}\n\nfunction b(b) {}\n\nfunction c(c) {}');
-        bt('foo(a, function() {})');
-
-        bt('foo(a, /regex/)');
-
-        bt('/* foo */\n"x"');
-
-        opts.break_chained_methods = false;
-        opts.preserve_newlines = false;
-        bt('foo\n.bar()\n.baz().cucumber(fat)', 'foo.bar().baz().cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat); foo.bar().baz().cucumber(fat)', 'foo.bar().baz().cucumber(fat);\nfoo.bar().baz().cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat)\n foo.bar().baz().cucumber(fat)', 'foo.bar().baz().cucumber(fat)\nfoo.bar().baz().cucumber(fat)');
-        bt('this\n.something = foo.bar()\n.baz().cucumber(fat)', 'this.something = foo.bar().baz().cucumber(fat)');
-        bt('this.something.xxx = foo.moo.bar()');
-        bt('this\n.something\n.xxx = foo.moo\n.bar()', 'this.something.xxx = foo.moo.bar()');
-
-        opts.break_chained_methods = false;
-        opts.preserve_newlines = true;
-        bt('foo\n.bar()\n.baz().cucumber(fat)', 'foo\n    .bar()\n    .baz().cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat); foo.bar().baz().cucumber(fat)', 'foo\n    .bar()\n    .baz().cucumber(fat);\nfoo.bar().baz().cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat)\n foo.bar().baz().cucumber(fat)', 'foo\n    .bar()\n    .baz().cucumber(fat)\nfoo.bar().baz().cucumber(fat)');
-        bt('this\n.something = foo.bar()\n.baz().cucumber(fat)', 'this\n    .something = foo.bar()\n    .baz().cucumber(fat)');
-        bt('this.something.xxx = foo.moo.bar()');
-        bt('this\n.something\n.xxx = foo.moo\n.bar()', 'this\n    .something\n    .xxx = foo.moo\n    .bar()');
-
-        opts.break_chained_methods = true;
-        opts.preserve_newlines = false;
-        bt('foo\n.bar()\n.baz().cucumber(fat)', 'foo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat); foo.bar().baz().cucumber(fat)', 'foo.bar()\n    .baz()\n    .cucumber(fat);\nfoo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat)\n foo.bar().baz().cucumber(fat)', 'foo.bar()\n    .baz()\n    .cucumber(fat)\nfoo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('this\n.something = foo.bar()\n.baz().cucumber(fat)', 'this.something = foo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('this.something.xxx = foo.moo.bar()');
-        bt('this\n.something\n.xxx = foo.moo\n.bar()', 'this.something.xxx = foo.moo.bar()');
-
-        opts.break_chained_methods = true;
-        opts.preserve_newlines = true;
-        bt('foo\n.bar()\n.baz().cucumber(fat)', 'foo\n    .bar()\n    .baz()\n    .cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat); foo.bar().baz().cucumber(fat)', 'foo\n    .bar()\n    .baz()\n    .cucumber(fat);\nfoo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('foo\n.bar()\n.baz().cucumber(fat)\n foo.bar().baz().cucumber(fat)', 'foo\n    .bar()\n    .baz()\n    .cucumber(fat)\nfoo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('this\n.something = foo.bar()\n.baz().cucumber(fat)', 'this\n    .something = foo.bar()\n    .baz()\n    .cucumber(fat)');
-        bt('this.something.xxx = foo.moo.bar()');
-        bt('this\n.something\n.xxx = foo.moo\n.bar()', 'this\n    .something\n    .xxx = foo.moo\n    .bar()');
-
-        opts.break_chained_methods = false;
-
-        // Line wrap test intputs
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        wrap_input_1=('foo.bar().baz().cucumber((fat && "sassy") || (leans\n&& mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n.but_this_can\n' +
-                      'if (wraps_can_occur && inside_an_if_block) that_is_\n.okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap + but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '}');
-
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        wrap_input_2=('{\n' +
-                      '    foo.bar().baz().cucumber((fat && "sassy") || (leans\n&& mean));\n' +
-                      '    Test_very_long_variable_name_this_should_never_wrap\n.but_this_can\n' +
-                      '    if (wraps_can_occur && inside_an_if_block) that_is_\n.okay();\n' +
-                      '    object_literal = {\n' +
-                      '        property: first_token_should_never_wrap + but_this_can,\n' +
-                      '        propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '        proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '    }' +
-                      '}');
-
-        opts.preserve_newlines = false;
-        opts.wrap_line_length = 0;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap.but_this_can\n' +
-                      'if (wraps_can_occur && inside_an_if_block) that_is_.okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap + but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 70;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap.but_this_can\n' +
-                      'if (wraps_can_occur && inside_an_if_block) that_is_.okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap + but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 40;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat &&\n' +
-                      '    "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur &&\n' +
-                      '    inside_an_if_block) that_is_.okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap +\n' +
-                      '        but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap +\n' +
-                      '        !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" +\n' +
-                      '        "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 41;
-        // NOTE: wrap is only best effort - line continues until next wrap point is found.
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") ||\n' +
-                      '    (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur &&\n' +
-                      '    inside_an_if_block) that_is_.okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap +\n' +
-                      '        but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap +\n' +
-                      '        !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" +\n' +
-                      '        "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 45;
-        // NOTE: wrap is only best effort - line continues until next wrap point is found.
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_2,
-                      /* expected */
-                      '{\n' +
-                      '    foo.bar().baz().cucumber((fat && "sassy") ||\n' +
-                      '        (leans && mean));\n' +
-                      '    Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '        .but_this_can\n' +
-                      '    if (wraps_can_occur &&\n' +
-                      '        inside_an_if_block) that_is_.okay();\n' +
-                      '    object_literal = {\n' +
-                      '        property: first_token_should_never_wrap +\n' +
-                      '            but_this_can,\n' +
-                      '        propertz: first_token_should_never_wrap +\n' +
-                      '            !but_this_can,\n' +
-                      '        proper: "first_token_should_never_wrap" +\n' +
-                      '            "but_this_can"\n' +
-                      '    }\n'+
-                      '}');
-
-        opts.preserve_newlines = true;
-        opts.wrap_line_length = 0;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur && inside_an_if_block) that_is_\n' +
-                      '    .okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap + but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 70;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur && inside_an_if_block) that_is_\n' +
-                      '    .okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap + but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap + !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" + "but_this_can"\n' +
-                      '}');
-
-
-        opts.wrap_line_length = 40;
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat &&\n' +
-                      '    "sassy") || (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur &&\n' +
-                      '    inside_an_if_block) that_is_\n' +
-                      '    .okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap +\n' +
-                      '        but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap +\n' +
-                      '        !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" +\n' +
-                      '        "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 41;
-        // NOTE: wrap is only best effort - line continues until next wrap point is found.
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_1,
-                      /* expected */
-                      'foo.bar().baz().cucumber((fat && "sassy") ||\n' +
-                      '    (leans && mean));\n' +
-                      'Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '    .but_this_can\n' +
-                      'if (wraps_can_occur &&\n' +
-                      '    inside_an_if_block) that_is_\n' +
-                      '    .okay();\n' +
-                      'object_literal = {\n' +
-                      '    property: first_token_should_never_wrap +\n' +
-                      '        but_this_can,\n' +
-                      '    propertz: first_token_should_never_wrap +\n' +
-                      '        !but_this_can,\n' +
-                      '    proper: "first_token_should_never_wrap" +\n' +
-                      '        "but_this_can"\n' +
-                      '}');
-
-        opts.wrap_line_length = 45;
-        // NOTE: wrap is only best effort - line continues until next wrap point is found.
-        //.............---------1---------2---------3---------4---------5---------6---------7
-        //.............1234567890123456789012345678901234567890123456789012345678901234567890
-        test_fragment(wrap_input_2,
-                      /* expected */
-                      '{\n' +
-                      '    foo.bar().baz().cucumber((fat && "sassy") ||\n' +
-                      '        (leans && mean));\n' +
-                      '    Test_very_long_variable_name_this_should_never_wrap\n' +
-                      '        .but_this_can\n' +
-                      '    if (wraps_can_occur &&\n' +
-                      '        inside_an_if_block) that_is_\n' +
-                      '        .okay();\n' +
-                      '    object_literal = {\n' +
-                      '        property: first_token_should_never_wrap +\n' +
-                      '            but_this_can,\n' +
-                      '        propertz: first_token_should_never_wrap +\n' +
-                      '            !but_this_can,\n' +
-                      '        proper: "first_token_should_never_wrap" +\n' +
-                      '            "but_this_can"\n' +
-                      '    }\n'+
-                      '}');
-
-        opts.wrap_line_length = 0;
-
-        opts.preserve_newlines = false;
-        bt('if (foo) // comment\n    bar();');
-        bt('if (foo) // comment\n    (bar());');
-        bt('if (foo) // comment\n    (bar());');
-        bt('if (foo) // comment\n    /asdf/;');
-        bt('this.oa = new OAuth(\n' +
-           '    _requestToken,\n' +
-           '    _accessToken,\n' +
-           '    consumer_key\n' +
-           ');',
-           'this.oa = new OAuth(_requestToken, _accessToken, consumer_key);');
-        bt('foo = {\n    x: y, // #44\n    w: z // #44\n}');
-        bt('switch (x) {\n    case "a":\n        // comment on newline\n        break;\n    case "b": // comment on same line\n        break;\n}');
-        bt('this.type =\n    this.options =\n    // comment\n    this.enabled null;',
-           'this.type = this.options =\n    // comment\n    this.enabled null;');
-        bt('someObj\n    .someFunc1()\n    // This comment should not break the indent\n    .someFunc2();',
-           'someObj.someFunc1()\n    // This comment should not break the indent\n    .someFunc2();');
-
-        bt('if (true ||\n!true) return;', 'if (true || !true) return;');
-
-        // these aren't ready yet.
-        //bt('if (foo) // comment\n    bar() /*i*/ + baz() /*j\n*/ + asdf();');
-        bt('if\n(foo)\nif\n(bar)\nif\n(baz)\nwhee();\na();',
-            'if (foo)\n    if (bar)\n        if (baz) whee();\na();');
-        bt('if\n(foo)\nif\n(bar)\nif\n(baz)\nwhee();\nelse\na();',
-            'if (foo)\n    if (bar)\n        if (baz) whee();\n        else a();');
-        bt('if (foo)\nbar();\nelse\ncar();',
-            'if (foo) bar();\nelse car();');
-
-        bt('if (foo) if (bar) if (baz);\na();',
-            'if (foo)\n    if (bar)\n        if (baz);\na();');
-        bt('if (foo) if (bar) if (baz) whee();\na();',
-            'if (foo)\n    if (bar)\n        if (baz) whee();\na();');
-        bt('if (foo) a()\nif (bar) if (baz) whee();\na();',
-            'if (foo) a()\nif (bar)\n    if (baz) whee();\na();');
-        bt('if (foo);\nif (bar) if (baz) whee();\na();',
-            'if (foo);\nif (bar)\n    if (baz) whee();\na();');
-        bt('if (options)\n' +
-           '    for (var p in options)\n' +
-           '        this[p] = options[p];',
-           'if (options)\n'+
-           '    for (var p in options) this[p] = options[p];');
-        bt('if (options) for (var p in options) this[p] = options[p];',
-           'if (options)\n    for (var p in options) this[p] = options[p];');
-
-        bt('if (options) do q(); while (b());',
-           'if (options)\n    do q(); while (b());');
-        bt('if (options) while (b()) q();',
-           'if (options)\n    while (b()) q();');
-        bt('if (options) do while (b()) q(); while (a());',
-           'if (options)\n    do\n        while (b()) q(); while (a());');
-
-        bt('function f(a, b, c,\nd, e) {}',
-            'function f(a, b, c, d, e) {}');
-
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
-            'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
-        bt('function f(a,b) {if(a) b()}\n\n\n\nfunction g(a,b) {if(!a) b()}',
-            'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
-
-        // This is not valid syntax, but still want to behave reasonably and not side-effect
-        bt('(if(a) b())(if(a) b())',
-            '(\n    if (a) b())(\n    if (a) b())');
-        bt('(if(a) b())\n\n\n(if(a) b())',
-            '(\n    if (a) b())\n(\n    if (a) b())');
-
-
-
-        bt("if\n(a)\nb();", "if (a) b();");
-        bt('var a =\nfoo', 'var a = foo');
-        bt('var a = {\n"a":1,\n"b":2}', "var a = {\n    \"a\": 1,\n    \"b\": 2\n}");
-        bt("var a = {\n'a':1,\n'b':2}", "var a = {\n    'a': 1,\n    'b': 2\n}");
-        bt('var a = /*i*/ "b";');
-        bt('var a = /*i*/\n"b";', 'var a = /*i*/ "b";');
-        bt('var a = /*i*/\nb;', 'var a = /*i*/ b;');
-        bt('{\n\n\n"x"\n}', '{\n    "x"\n}');
-        bt('if(a &&\nb\n||\nc\n||d\n&&\ne) e = f', 'if (a && b || c || d && e) e = f');
-        bt('if(a &&\n(b\n||\nc\n||d)\n&&\ne) e = f', 'if (a && (b || c || d) && e) e = f');
-        test_fragment('\n\n"x"', '"x"');
-        bt('a = 1;\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nb = 2;',
-                'a = 1;\nb = 2;');
-
-        opts.preserve_newlines = true;
-        bt('if (foo) // comment\n    bar();');
-        bt('if (foo) // comment\n    (bar());');
-        bt('if (foo) // comment\n    (bar());');
-        bt('if (foo) // comment\n    /asdf/;');
-        bt('foo = {\n    x: y, // #44\n    w: z // #44\n}');
-        bt('switch (x) {\n    case "a":\n        // comment on newline\n        break;\n    case "b": // comment on same line\n        break;\n}');
-        bt('this.type =\n    this.options =\n    // comment\n    this.enabled null;');
-        bt('someObj\n    .someFunc1()\n    // This comment should not break the indent\n    .someFunc2();');
-
-        bt('if (true ||\n!true) return;', 'if (true ||\n    !true) return;');
-
-        // these aren't ready yet.
-        // bt('if (foo) // comment\n    bar() /*i*/ + baz() /*j\n*/ + asdf();');
-        bt('if\n(foo)\nif\n(bar)\nif\n(baz)\nwhee();\na();',
-            'if (foo)\n    if (bar)\n        if (baz)\n            whee();\na();');
-        bt('if\n(foo)\nif\n(bar)\nif\n(baz)\nwhee();\nelse\na();',
-            'if (foo)\n    if (bar)\n        if (baz)\n            whee();\n        else\n            a();');
-        bt('if (foo) bar();\nelse\ncar();',
-            'if (foo) bar();\nelse\n    car();');
-
-        bt('if (foo) if (bar) if (baz);\na();',
-            'if (foo)\n    if (bar)\n        if (baz);\na();');
-        bt('if (foo) if (bar) if (baz) whee();\na();',
-            'if (foo)\n    if (bar)\n        if (baz) whee();\na();');
-        bt('if (foo) a()\nif (bar) if (baz) whee();\na();',
-            'if (foo) a()\nif (bar)\n    if (baz) whee();\na();');
-        bt('if (foo);\nif (bar) if (baz) whee();\na();',
-            'if (foo);\nif (bar)\n    if (baz) whee();\na();');
-        bt('if (options)\n' +
-           '    for (var p in options)\n' +
-           '        this[p] = options[p];');
-        bt('if (options) for (var p in options) this[p] = options[p];',
-           'if (options)\n    for (var p in options) this[p] = options[p];');
-
-        bt('if (options) do q(); while (b());',
-           'if (options)\n    do q(); while (b());');
-        bt('if (options) do; while (b());',
-           'if (options)\n    do; while (b());');
-        bt('if (options) while (b()) q();',
-           'if (options)\n    while (b()) q();');
-        bt('if (options) do while (b()) q(); while (a());',
-           'if (options)\n    do\n        while (b()) q(); while (a());');
-
-        bt('function f(a, b, c,\nd, e) {}',
-            'function f(a, b, c,\n    d, e) {}');
-
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
-            'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
-        bt('function f(a,b) {if(a) b()}\n\n\n\nfunction g(a,b) {if(!a) b()}',
-            'function f(a, b) {\n    if (a) b()\n}\n\n\n\nfunction g(a, b) {\n    if (!a) b()\n}');
-        // This is not valid syntax, but still want to behave reasonably and not side-effect
-        bt('(if(a) b())(if(a) b())',
-            '(\n    if (a) b())(\n    if (a) b())');
-        bt('(if(a) b())\n\n\n(if(a) b())',
-            '(\n    if (a) b())\n\n\n(\n    if (a) b())');
-
-        // space between functions
-        bt('/*\n * foo\n */\nfunction foo() {}');
-        bt('// a nice function\nfunction foo() {}');
-        bt('function foo() {}\nfunction foo() {}',
-            'function foo() {}\n\nfunction foo() {}'
-        );
-
-
-
-        bt("if\n(a)\nb();", "if (a)\n    b();");
-        bt('var a =\nfoo', 'var a =\n    foo');
-        bt('var a = {\n"a":1,\n"b":2}', "var a = {\n    \"a\": 1,\n    \"b\": 2\n}");
-        bt("var a = {\n'a':1,\n'b':2}", "var a = {\n    'a': 1,\n    'b': 2\n}");
-        bt('var a = /*i*/ "b";');
-        bt('var a = /*i*/\n"b";', 'var a = /*i*/\n    "b";');
-        bt('var a = /*i*/\nb;', 'var a = /*i*/\n    b;');
-        bt('{\n\n\n"x"\n}', '{\n\n\n    "x"\n}');
-        bt('if(a &&\nb\n||\nc\n||d\n&&\ne) e = f', 'if (a &&\n    b ||\n    c || d &&\n    e) e = f');
-        bt('if(a &&\n(b\n||\nc\n||d)\n&&\ne) e = f', 'if (a &&\n    (b ||\n        c || d) &&\n    e) e = f');
-        test_fragment('\n\n"x"', '"x"');
-
-        // this beavior differs between js and python, defaults to unlimited in js, 10 in python
-        bt('a = 1;\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nb = 2;',
-            'a = 1;\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nb = 2;');
-        opts.max_preserve_newlines = 8;
-        bt('a = 1;\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nb = 2;',
-            'a = 1;\n\n\n\n\n\n\n\nb = 2;');
-
-        // Test the option to have spaces within parens
-        opts.space_in_paren = false;
-        bt('if(p) foo(a,b)', 'if (p) foo(a, b)');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
-           'try {\n    while (true) {\n        willThrow()\n    }\n} catch (result) switch (result) {\n    case 1:\n        ++result\n}');
-        bt('((e/((a+(b)*c)-d))^2)*5;', '((e / ((a + (b) * c) - d)) ^ 2) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
-            'function f(a, b) {\n    if (a) b()\n}\n\nfunction g(a, b) {\n    if (!a) b()\n}');
-        bt('a=[];',
-            'a = [];');
-        bt('a=[b,c,d];',
-            'a = [b, c, d];');
-        bt('a= f[b];',
-            'a = f[b];');
-        opts.space_in_paren = true;
-        bt('if(p) foo(a,b)', 'if ( p ) foo( a, b )');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
-           'try {\n    while ( true ) {\n        willThrow()\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}');
-        bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
-            'function f( a, b ) {\n    if ( a ) b()\n}\n\nfunction g( a, b ) {\n    if ( !a ) b()\n}');
-        bt('a=[];',
-            'a = [];');
-        bt('a=[b,c,d];',
-            'a = [ b, c, d ];');
-        bt('a= f[b];',
-            'a = f[ b ];');
-        opts.space_in_empty_paren = true;
-        bt('if(p) foo(a,b)', 'if ( p ) foo( a, b )');
-        bt('try{while(true){willThrow()}}catch(result)switch(result){case 1:++result }',
-           'try {\n    while ( true ) {\n        willThrow( )\n    }\n} catch ( result ) switch ( result ) {\n    case 1:\n        ++result\n}');
-        bt('((e/((a+(b)*c)-d))^2)*5;', '( ( e / ( ( a + ( b ) * c ) - d ) ) ^ 2 ) * 5;');
-        bt('function f(a,b) {if(a) b()}function g(a,b) {if(!a) b()}',
-            'function f( a, b ) {\n    if ( a ) b( )\n}\n\nfunction g( a, b ) {\n    if ( !a ) b( )\n}');
-        bt('a=[];',
-            'a = [ ];');
-        bt('a=[b,c,d];',
-            'a = [ b, c, d ];');
-        bt('a= f[b];',
-            'a = f[ b ];');
-        opts.space_in_empty_paren = false;
-        opts.space_in_paren = false;
-
-        // Test template strings
-        bt('`This is a ${template} string.`', '`This is a ${template} string.`');
-        bt('`This\n  is\n  a\n  ${template}\n  string.`', '`This\n  is\n  a\n  ${template}\n  string.`');
-
-        // Test that e4x literals passed through when e4x-option is enabled
-        bt('xml=<a b="c"><d/><e>\n foo</e>x</a>;', 'xml = < a b = "c" > < d / > < e >\n    foo < /e>x</a > ;');
-        opts.e4x = true;
-        bt('xml=<a b="c"><d/><e>\n foo</e>x</a>;', 'xml = <a b="c"><d/><e>\n foo</e>x</a>;');
-        bt('<a b=\'This is a quoted "c".\'/>', '<a b=\'This is a quoted "c".\'/>');
-        bt('<a b="This is a quoted \'c\'."/>', '<a b="This is a quoted \'c\'."/>');
-        bt('<a b="A quote \' inside string."/>', '<a b="A quote \' inside string."/>');
-        bt('<a b=\'A quote " inside string.\'/>', '<a b=\'A quote " inside string.\'/>');
-        bt('<a b=\'Some """ quotes ""  inside string.\'/>', '<a b=\'Some """ quotes ""  inside string.\'/>');
-        // Handles inline expressions
-        bt('xml=<{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;', 'xml = <{a} b="c"><d/><e v={z}>\n foo</e>x</{a}>;');
-        // xml literals with special characters in elem names
-        // see http://www.w3.org/TR/REC-xml/#NT-NameChar
-        bt('xml = <_:.valid.xml- _:.valid.xml-="123"/>;', 'xml = <_:.valid.xml- _:.valid.xml-="123"/>;');
-        // Handles CDATA
-        bt('xml=<![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;', 'xml = <![CDATA[ b="c"><d/><e v={z}>\n foo</e>x/]]>;');
-        bt('xml=<![CDATA[]]>;', 'xml = <![CDATA[]]>;');
-        bt('xml=<a b="c"><![CDATA[d/></a></{}]]></a>;', 'xml = <a b="c"><![CDATA[d/></a></{}]]></a>;');
-
-        // Handles messed up tags, as long as it isn't the same name
-        // as the root tag. Also handles tags of same name as root tag
-        // as long as nesting matches.
-        bt('xml=<a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;',
-         'xml = <a x="jn"><c></b></f><a><d jnj="jnn"><f></a ></nj></a>;');
-        // If xml is not terminated, the remainder of the file is treated
-        // as part of the xml-literal (passed through unaltered)
-        test_fragment('xml=<a></b>\nc<b;', 'xml = <a></b>\nc<b;');
-        opts.e4x = false;
-
-        // START tests for issue 241
-        bt('obj\n' +
-           '    .last({\n' +
-           '        foo: 1,\n' +
-           '        bar: 2\n' +
-           '    });\n' +
-           'var test = 1;');
-
-        bt('obj\n' +
-           '    .last(a, function() {\n' +
-           '        var test;\n' +
-           '    });\n' +
-           'var test = 1;');
-
-        bt('obj.first()\n' +
-           '    .second()\n' +
-           '    .last(function(err, response) {\n' +
-           '        console.log(err);\n' +
-           '    });');
-
-        // END tests for issue 241
-
-
-        // START tests for issue 268 and 275
-        bt('obj.last(a, function() {\n' +
-           '    var test;\n' +
-           '});\n' +
-           'var test = 1;');
-        bt('obj.last(a,\n' +
-           '    function() {\n' +
-           '        var test;\n' +
-           '    });\n' +
-           'var test = 1;');
-
-        bt('(function() {if (!window.FOO) window.FOO || (window.FOO = function() {var b = {bar: "zort"};});})();',
-           '(function() {\n' +
-           '    if (!window.FOO) window.FOO || (window.FOO = function() {\n' +
-           '        var b = {\n' +
-           '            bar: "zort"\n' +
-           '        };\n' +
-           '    });\n' +
-           '})();');
-        // END tests for issue 268 and 275
-
-        // START tests for issue 281
-        bt('define(["dojo/_base/declare", "my/Employee", "dijit/form/Button",\n' +
-           '    "dojo/_base/lang", "dojo/Deferred"\n' +
-           '], function(declare, Employee, Button, lang, Deferred) {\n' +
-           '    return declare(Employee, {\n' +
-           '        constructor: function() {\n' +
-           '            new Button({\n' +
-           '                onClick: lang.hitch(this, function() {\n' +
-           '                    new Deferred().then(lang.hitch(this, function() {\n' +
-           '                        this.salary * 0.25;\n' +
-           '                    }));\n' +
-           '                })\n' +
-           '            });\n' +
-           '        }\n' +
-           '    });\n' +
-           '});');
-
-        bt('define(["dojo/_base/declare", "my/Employee", "dijit/form/Button",\n' +
-           '        "dojo/_base/lang", "dojo/Deferred"\n' +
-           '    ],\n' +
-           '    function(declare, Employee, Button, lang, Deferred) {\n' +
-           '        return declare(Employee, {\n' +
-           '            constructor: function() {\n' +
-           '                new Button({\n' +
-           '                    onClick: lang.hitch(this, function() {\n' +
-           '                        new Deferred().then(lang.hitch(this, function() {\n' +
-           '                            this.salary * 0.25;\n' +
-           '                        }));\n' +
-           '                    })\n' +
-           '                });\n' +
-           '            }\n' +
-           '        });\n' +
-           '    });');
-        // END tests for issue 281
-
-        // START tests for issue 459
-        bt( '(function() {\n' +
-            '    return {\n' +
-            '        foo: function() {\n' +
-            '            return "bar";\n' +
-            '        },\n' +
-            '        bar: ["bar"]\n' +
-            '    };\n' +
-            '}());');
-        // END tests for issue 459
-
-        bt('var a=1,b={bang:2},c=3;',
-            'var a = 1,\n    b = {\n        bang: 2\n    },\n    c = 3;');
-        bt('var a={bing:1},b=2,c=3;',
-            'var a = {\n        bing: 1\n    },\n    b = 2,\n    c = 3;');
-        Urlencoded.run_tests(sanitytest);
-
-        bth('');
-        bth('<div></div>');
-        bth('<div>content</div>');
-        bth('<div><div></div></div>',
-            '<div>\n' +
-            '    <div></div>\n' +
-            '</div>');
-        bth('<div><div>content</div></div>',
-            '<div>\n' +
-            '    <div>content</div>\n' +
-            '</div>');
-        bth('<div>\n' +
-            '    <span>content</span>\n' +
-            '</div>');
-        bth('<div>\n' +
-            '</div>');
-        bth('<div>\n' +
-            '    content\n' +
-            '</div>');
-        bth('<div>\n' +
-            '    </div>',
-            '<div>\n' +
-            '</div>');
-        bth('    <div>\n' +
-            '    </div>',
-            '<div>\n' +
-            '</div>');
-        bth('    <div>\n' +
-            '</div>',
-            '<div>\n' +
-            '</div>');
-        bth('<div        >content</div>',
-            '<div>content</div>');
-        bth('<div     thinger="preserve  space  here"   ></div  >',
-            '<div thinger="preserve  space  here"></div>');
-        bth('content\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            'content',
-            'content\n' +
-            '<div>\n' +
-            '</div>\n' +
-            'content');
-        bth('<li>\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '</li>');
-        bth('<li>\n' +
-            '<div>\n' +
-            '</div>\n' +
-            '</li>',
-            '<li>\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '</li>');
-        bth('<li>\n' +
-            '    content\n' +
-            '</li>\n' +
-            '<li>\n' +
-            '    content\n' +
-            '</li>');
-    
-    // START tests for issue 453
-    bth('<script type="text/unknown"><div></div></script>',
-      '<script type="text/unknown">\n' +
-      '    <div></div>\n' +
-      '</script>');
-    bth('<script type="text/javascript"><div></div></script>',
-      '<script type="text/javascript">\n' +
-      '    < div > < /div>\n' +
-      '</script>');
-    bth('<script><div></div></script>',
-      '<script>\n' +
-      '    < div > < /div>\n' +
-      '</script>');
-    bth('<script type="text/javascript">var foo = "bar";</script>',
-      '<script type="text/javascript">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');     
-    bth('<script type="application/javascript">var foo = "bar";</script>',
-      '<script type="application/javascript">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');
-    bth('<script type="application/javascript">var foo = "bar";</script>',
-      '<script type="application/javascript">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');
-    bth('<script type="application/x-javascript">var foo = "bar";</script>',
-      '<script type="application/x-javascript">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');
-    bth('<script type="application/ecmascript">var foo = "bar";</script>',
-      '<script type="application/ecmascript">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');
-    bth('<script type="text/javascript1.5">var foo = "bar";</script>',
-      '<script type="text/javascript1.5">\n' +
-      '    var foo = "bar";\n' +
-      '</script>');
-    bth('<script>var foo = "bar";</script>',
-      '<script>\n' +
-      '    var foo = "bar";\n' +
-      '</script>');         
-          
-    bth('<style type="text/unknown"><tag></tag></style>',
-      '<style type="text/unknown">\n' +
-      '    <tag></tag>\n' +
-      '</style>');  
-    bth('<style type="text/css"><tag></tag></style>',
-      '<style type="text/css">\n' +
-      '    <tag></tag>\n' +
-      '</style>');    
-    bth('<style><tag></tag></style>',
-      '<style>\n' +
-      '    <tag></tag>\n' +
-      '</style>');        
-    bth('<style type="text/css">.selector {font-size:12px;}</style>',
-      '<style type="text/css">\n' +
-      '    .selector {\n' +
-      '        font-size: 12px;\n' +
-      '    }\n'+
-      '</style>');
-    bth('<style>.selector {font-size:12px;}</style>',
-      '<style>\n' +
-      '    .selector {\n' +
-      '        font-size: 12px;\n' +
-      '    }\n'+
-      '</style>');      
-    // END tests for issue 453
-      
-        // Tests that don't pass, but probably should.
-        // bth('<div><span>content</span></div>');
-
-        // Handlebars tests
-        // Without the indent option on, handlebars are treated as content.
-        opts.indent_handlebars = false;
-        bth('{{#if 0}}\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '{{/if}}',
-            '{{#if 0}}\n' +
-            '<div>\n' +
-            '</div>\n' +
-            '{{/if}}');
-        bth('<div>\n' +
-            '{{#each thing}}\n' +
-            '    {{name}}\n' +
-            '{{/each}}\n' +
-            '</div>',
-            '<div>\n' +
-            '    {{#each thing}} {{name}} {{/each}}\n' +
-            '</div>');
-
-        opts.indent_handlebars = true;
-        bth('{{#if 0}}{{/if}}');
-        bth('{{#if 0}}content{{/if}}');
-        bth('{{#if 0}}\n' +
-            '{{/if}}');
-        bth('{{#if     words}}{{/if}}',
-            '{{#if words}}{{/if}}');
-        bth('{{#if     words}}content{{/if}}',
-            '{{#if words}}content{{/if}}');
-        bth('{{#if     words}}content{{/if}}',
-            '{{#if words}}content{{/if}}');
-        bth('{{#if 1}}\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '{{/if}}');
-        bth('{{#if 1}}\n' +
-            '<div>\n' +
-            '</div>\n' +
-            '{{/if}}',
-            '{{#if 1}}\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '{{/if}}');
-        bth('<div>\n' +
-            '    {{#if 1}}\n' +
-            '    {{/if}}\n' +
-            '</div>');
-        bth('<div>\n' +
-            '{{#if 1}}\n' +
-            '{{/if}}\n' +
-            '</div>',
-            '<div>\n' +
-            '    {{#if 1}}\n' +
-            '    {{/if}}\n' +
-            '</div>');
-        bth('{{#if}}\n' +
-            '{{#each}}\n' +
-            '{{#if}}\n' +
-            'content\n' +
-            '{{/if}}\n' +
-            '{{#if}}\n' +
-            'content\n' +
-            '{{/if}}\n' +
-            '{{/each}}\n' +
-            '{{/if}}',
-            '{{#if}}\n' +
-            '    {{#each}}\n' +
-            '        {{#if}}\n' +
-            '            content\n' +
-            '        {{/if}}\n' +
-            '        {{#if}}\n' +
-            '            content\n' +
-            '        {{/if}}\n' +
-            '    {{/each}}\n' +
-            '{{/if}}');
-        bth('{{#if 1}}\n' +
-            '    <div>\n' +
-            '    </div>\n' +
-            '{{/if}}');
-
-        // Test {{else}} aligned with {{#if}} and {{/if}}
-        bth('{{#if 1}}\n' +
-            '    content\n' +
-            '    {{else}}\n' +
-            '    content\n' +
-            '{{/if}}',
-            '{{#if 1}}\n' +
-            '    content\n' +
-            '{{else}}\n' +
-            '    content\n' +
-            '{{/if}}');
-        bth('{{#if 1}}\n' +
-            '    {{else}}\n' +
-            '    {{/if}}',
-            '{{#if 1}}\n' +
-            '{{else}}\n' +
-            '{{/if}}');
-        bth('{{#if thing}}\n' +
-            '{{#if otherthing}}\n' +
-            '    content\n' +
-            '    {{else}}\n' +
-            'content\n' +
-            '    {{/if}}\n' +
-            '       {{else}}\n'+
-            'content\n' +
-            '{{/if}}',
-            '{{#if thing}}\n' +
-            '    {{#if otherthing}}\n' +
-            '        content\n' +
-            '    {{else}}\n' +
-            '        content\n' +
-            '    {{/if}}\n' +
-            '{{else}}\n'+
-            '    content\n' +
-            '{{/if}}');
-
-        // Test {{}} inside of <> tags, which should be separated by spaces
-        // for readability, unless they are inside a string.
-        bth('<div{{somestyle}}></div>',
-            '<div {{somestyle}}></div>');
-        bth('<div{{#if test}}class="foo"{{/if}}>content</div>',
-            '<div {{#if test}} class="foo" {{/if}}>content</div>');
-        bth('<div{{#if thing}}{{somestyle}}class="{{class}}"{{else}}class="{{class2}}"{{/if}}>content</div>',
-            '<div {{#if thing}} {{somestyle}} class="{{class}}" {{else}} class="{{class2}}" {{/if}}>content</div>');
-        bth('<span{{#if condition}}class="foo"{{/if}}>content</span>',
-            '<span {{#if condition}} class="foo" {{/if}}>content</span>');
-        bth('<div unformatted="{{#if}}content{{/if}}">content</div>');
-        bth('<div unformatted="{{#if  }}    content{{/if}}">content</div>');
-
-        // Quotes found inside of Handlebars expressions inside of quoted
-        // strings themselves should not be considered string delimiters.
-        bth('<div class="{{#if thingIs "value"}}content{{/if}}"></div>');
-        bth('<div class="{{#if thingIs \'value\'}}content{{/if}}"></div>');
-        bth('<div class=\'{{#if thingIs "value"}}content{{/if}}\'></div>');
-        bth('<div class=\'{{#if thingIs \'value\'}}content{{/if}}\'></div>');
-
-        opts.wrap_line_length = 0;
-        //...---------1---------2---------3---------4---------5---------6---------7
-        //...1234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some text that should not wrap at all.</div>',
-            /* expected */
-            '<div>Some text that should not wrap at all.</div>');
-
-        // A value of 0 means no max line length, and should not wrap.
-        //...---------1---------2---------3---------4---------5---------6---------7---------8---------9--------10--------11--------12--------13--------14--------15--------16--------17--------18--------19--------20--------21--------22--------23--------24--------25--------26--------27--------28--------29
-        //...12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all.</div>',
-            /* expected */
-            '<div>Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all.</div>');
-
-        opts.wrap_line_length = "0";
-        //...---------1---------2---------3---------4---------5---------6---------7
-        //...1234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some text that should not wrap at all.</div>',
-            /* expected */
-            '<div>Some text that should not wrap at all.</div>');
-
-        // A value of "0" means no max line length, and should not wrap
-        //...---------1---------2---------3---------4---------5---------6---------7---------8---------9--------10--------11--------12--------13--------14--------15--------16--------17--------18--------19--------20--------21--------22--------23--------24--------25--------26--------27--------28--------29
-        //...12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all.</div>',
-            /* expected */
-            '<div>Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all. Some text that should not wrap at all.</div>');
-
-        //BUGBUG: This should wrap before 40 not after.
-        opts.wrap_line_length = 40;
-        //...---------1---------2---------3---------4---------5---------6---------7
-        //...1234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some test text that should wrap_inside_this section here.</div>',
-            /* expected */
-            '<div>Some test text that should wrap_inside_this\n' +
-            '    section here.</div>');
-
-        opts.wrap_line_length = "40";
-        //...---------1---------2---------3---------4---------5---------6---------7
-        //...1234567890123456789012345678901234567890123456789012345678901234567890
-        bth('<div>Some test text that should wrap_inside_this section here.</div>',
-            /* expected */
-            '<div>Some test text that should wrap_inside_this\n' +
-            '    section here.</div>');
-
-        opts.indent_size = 1;
-        opts.indent_char = '\t';
-        opts.preserve_newlines = false;
-        bth('<div>\n\tfoo\n</div>', '<div>foo</div>');
-
-        opts.preserve_newlines = true;
-        bth('<div>\n\tfoo\n</div>');
-
-
-
-        // test preserve_newlines and max_preserve_newlines
-        opts.preserve_newlines = false;
-        test_fragment('<div>Should not</div>\n\n\n' +
-                      '<div>preserve newlines</div>',
-                      '<div>Should not</div>\n' +
-                      '<div>preserve newlines</div>');
-
-        opts.preserve_newlines = true;
-        opts.max_preserve_newlines  = 0;
-        test_fragment('<div>Should</div>\n\n\n' +
-                      '<div>preserve zero newlines</div>',
-                      '<div>Should</div>\n' +
-                      '<div>preserve zero newlines</div>');
-
-        opts.max_preserve_newlines  = 1;
-        test_fragment('<div>Should</div>\n\n\n' +
-                      '<div>preserve one newline</div>',
-                      '<div>Should</div>\n\n' +
-                      '<div>preserve one newline</div>');
-
-        opts.max_preserve_newlines  = null;
-        test_fragment('<div>Should</div>\n\n\n' +
-                      '<div>preserve one newline</div>',
-                      '<div>Should</div>\n\n\n' +
-                      '<div>preserve one newline</div>');
-        // css beautifier
-        opts.indent_size = 1;
-        opts.indent_char = '\t';
-        opts.selector_separator_newline = true;
-        opts.end_with_newline = true;
-
-        // test basic css beautifier
-        btc('', '\n');
-        btc(".tabs{}", ".tabs {}\n");
-        btc(".tabs{color:red;}", ".tabs {\n\tcolor: red;\n}\n");
-        btc(".tabs{color:rgb(255, 255, 0)}", ".tabs {\n\tcolor: rgb(255, 255, 0)\n}\n");
-        btc(".tabs{background:url('back.jpg')}", ".tabs {\n\tbackground: url('back.jpg')\n}\n");
-        btc("#bla, #foo{color:red}", "#bla,\n#foo {\n\tcolor: red\n}\n");
-        btc("@media print {.tab{}}", "@media print {\n\t.tab {}\n}\n");
-        btc("@media print {.tab{background-image:url(foo@2x.png)}}", "@media print {\n\t.tab {\n\t\tbackground-image: url(foo@2x.png)\n\t}\n}\n");
-
-        // comments
-        btc("/* test */", "/* test */\n");
-        btc(".tabs{/* test */}", ".tabs {\n\t/* test */\n}\n");
-        btc("/* header */.tabs {}", "/* header */\n\n.tabs {}\n");
-
-        //single line comment support (less/sass)
-        btc(".tabs{\n// comment\nwidth:10px;\n}", ".tabs {\n\t// comment\n\twidth: 10px;\n}\n");
-        btc(".tabs{// comment\nwidth:10px;\n}", ".tabs {\n\t// comment\n\twidth: 10px;\n}\n");
-        btc("//comment\n.tabs{width:10px;}", "//comment\n.tabs {\n\twidth: 10px;\n}\n");
-        btc(".tabs{//comment\n//2nd single line comment\nwidth:10px;}", ".tabs {\n\t//comment\n\t//2nd single line comment\n\twidth: 10px;\n}\n");
-        btc(".tabs{width:10px;//end of line comment\n}", ".tabs {\n\twidth: 10px;//end of line comment\n}\n");
-        btc(".tabs{width:10px;//end of line comment\nheight:10px;}", ".tabs {\n\twidth: 10px;//end of line comment\n\theight: 10px;\n}\n");
-        btc(".tabs{width:10px;//end of line comment\nheight:10px;//another\n}", ".tabs {\n\twidth: 10px;//end of line comment\n\theight: 10px;//another\n}\n");
-
-        // separate selectors
-        btc("#bla, #foo{color:red}", "#bla,\n#foo {\n\tcolor: red\n}\n");
-        btc("a, img {padding: 0.2px}", "a,\nimg {\n\tpadding: 0.2px\n}\n");
-
-        // block nesting
-        btc("#foo {\n\tbackground-image: url(foo@2x.png);\n\t@font-face {\n\t\tfont-family: 'Bitstream Vera Serif Bold';\n\t\tsrc: url('http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf');\n\t}\n}\n");
-        btc("@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo@2x.png);\n\t}\n\t@font-face {\n\t\tfont-family: 'Bitstream Vera Serif Bold';\n\t\tsrc: url('http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf');\n\t}\n}\n");
-/*
-@font-face {
-    font-family: 'Bitstream Vera Serif Bold';
-    src: url('http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf');
-}
-@media screen {
-    #foo:hover {
-        background-image: url(foo.png);
-    }
-    @media screen and (min-device-pixel-ratio: 2) {
-        @font-face {
-            font-family: 'Helvetica Neue'
-        }
-        #foo:hover {
-            background-image: url(foo@2x.png);
-        }
-    }
-}
-*/
-        btc("@font-face {\n\tfont-family: 'Bitstream Vera Serif Bold';\n\tsrc: url('http://developer.mozilla.org/@api/deki/files/2934/=VeraSeBd.ttf');\n}\n@media screen {\n\t#foo:hover {\n\t\tbackground-image: url(foo.png);\n\t}\n\t@media screen and (min-device-pixel-ratio: 2) {\n\t\t@font-face {\n\t\t\tfont-family: 'Helvetica Neue'\n\t\t}\n\t\t#foo:hover {\n\t\t\tbackground-image: url(foo@2x.png);\n\t\t}\n\t}\n}\n");
-
-        // test options
-        opts.indent_size = 2;
-        opts.indent_char = ' ';
-        opts.selector_separator_newline = false;
-
-        btc("#bla, #foo{color:green}", "#bla, #foo {\n  color: green\n}\n");
-        btc("@media print {.tab{}}", "@media print {\n  .tab {}\n}\n");
-        btc("@media print {.tab,.bat{}}", "@media print {\n  .tab, .bat {}\n}\n");
-        btc("#bla, #foo{color:black}", "#bla, #foo {\n  color: black\n}\n");
-
-        // pseudo-classes and pseudo-elements
-        btc("#foo:hover {\n  background-image: url(foo@2x.png)\n}\n");
-        btc("#foo *:hover {\n  color: purple\n}\n");
-        btc("::selection {\n  color: #ff0000;\n}\n");
-
-        // TODO: don't break nested pseduo-classes
-        btc("@media screen {.tab,.bat:hover {color:red}}", "@media screen {\n  .tab, .bat:hover {\n    color: red\n  }\n}\n");
-
-        // particular edge case with braces and semicolons inside tags that allows custom text
-        btc("a:not(\"foobar\\\";{}omg\"){\ncontent: 'example\\';{} text';\ncontent: \"example\\\";{} text\";}",
-            "a:not(\"foobar\\\";{}omg\") {\n  content: 'example\\';{} text';\n  content: \"example\\\";{} text\";\n}\n");
-
-        btc('html.js [data-custom="123"] {\n  opacity: 1.00;\n}\n'); // may not eat the space before "["
-        btc('html.js *[data-custom="123"] {\n  opacity: 1.00;\n}\n');
-
-        return sanitytest;
-    }
-
-    return beautifier_tests();
-}
-
-if (typeof exports !== "undefined") {
-    exports.run_beautifier_tests = run_beautifier_tests;
-}
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/src/moz.build firefox-85.0+build1/devtools/shared/jsbeautify/src/moz.build
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/src/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/src/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,5 @@
 DevToolsModules(
     'beautify-css.js',
     'beautify-html.js',
-    'beautify-js.js',
-    'beautify-tests.js'
+    'beautify-js.js'
 )
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-
-var beautify = require("devtools/shared/jsbeautify/beautify");
-var SanityTest = require('devtools/shared/jsbeautify/lib/sanitytest');
-var Urlencoded = require('devtools/shared/jsbeautify/lib/urlencode_unpacker');
-var {run_beautifier_tests} = require('devtools/shared/jsbeautify/src/beautify-tests');
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/test.js firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/test.js
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/test.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function run_test() {
-  var sanityTest = new SanityTest();
-  var results = run_beautifier_tests(sanityTest,
-                                     Urlencoded,
-                                     beautify.js,
-                                     beautify.html,
-                                     beautify.css);
-
-  for (let [test_name, parameters, expected_value, result] of sanityTest.successes) {
-    equal(result, expected_value, "actual result matches expected");
-  }
-
-  for (let [test_name, parameters, expected_value, result] of sanityTest.failures) {
-    equal(result, expected_value, "actual result matches expected");
-  }
-}
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[DEFAULT]
-tags = devtools
-head = head_jsbeautify.js
-firefox-appdir = browser
-skip-if = toolkit == 'android'
-
-[test.js]
diff -Nru firefox-84.0.2+build1/devtools/shared/jsbeautify/UPGRADING.md firefox-85.0+build1/devtools/shared/jsbeautify/UPGRADING.md
--- firefox-84.0.2+build1/devtools/shared/jsbeautify/UPGRADING.md	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/jsbeautify/UPGRADING.md	2021-01-18 19:58:08.000000000 +0000
@@ -2,36 +2,35 @@
 
 1. `git clone https://github.com/beautify-web/js-beautify.git`
 
-2. Copy `js/lib/beautify.js` to `devtools/shared/jsbeautify/src/beautify-js.js`
+2. `cd js-beautify`
 
-3. Remove the acorn section from the file and add the following to the top:
+3. Retrieve the latest tag with
 
- ```
- const acorn = require("acorn/acorn");
- ```
+```
+git describe --tags `git rev-list --tags --max-count=1`
+```
 
-4. Just above `function Beautifier(js_source_text, options) {` add:
+4. Move to the latest tag `git checkout ${latestTag}` (`${latestTag}` should be replaced with
+   what was printed at step 3).
 
- ```
- exports.jsBeautify = js_beautify;
- ```
+5. `npm install`
 
-5. Copy `beautify-html.js` to `devtools/shared/jsbeautify/src/beautify-html.js`
+6. `npx webpack`
 
-6. Replace the require blocks at the bottom of the file with:
+7. Copy `js/lib/beautify.js` to `devtools/shared/jsbeautify/src/beautify-js.js`
 
- ```
- var beautify = require('devtools/shared/jsbeautify/beautify');
+8. Copy `js/lib/beautify-html.js` to `devtools/shared/jsbeautify/src/beautify-html.js`
 
- exports.htmlBeautify = function(html_source, options) {
-    return style_html(html_source, options, beautify.js, beautify.css);
- };
- ```
+9. Replace the following line at the bottom of the file:
 
-7. Copy `beautify-css.js` to `devtools/shared/jsbeautify/src/beautify-css.js`
+```
+var js_beautify = require('./beautify.js');
+```
 
-8. Replace the global define block at the bottom of the file with:
- ```
- exports.cssBeautify = css_beautify;
- ```
-9. Copy `js/test/beautify-tests.js` to `devtools/shared/jsbeautify/src/beautify-tests.js`
+with (changing `beautify.js` into `beautify-js.js`):
+
+```
+var js_beautify = require('./beautify-js.js');
+```
+
+10. Copy `js/lib/beautify-css.js` to `devtools/shared/jsbeautify/src/beautify-css.js`
diff -Nru firefox-84.0.2+build1/devtools/shared/performance-new/gecko-profiler-interface.js firefox-85.0+build1/devtools/shared/performance-new/gecko-profiler-interface.js
--- firefox-84.0.2+build1/devtools/shared/performance-new/gecko-profiler-interface.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/performance-new/gecko-profiler-interface.js	2021-01-18 19:58:09.000000000 +0000
@@ -89,8 +89,6 @@
     // to be tweaked or made configurable as needed.
     const settings = {
       entries: options.entries || 1000000,
-      // Window length should be Infinite if nothing's been passed.
-      // options.duration is supported for `perfActorVersion > 0`.
       duration: options.duration || 0,
       interval: options.interval || 1,
       features: options.features || [
diff -Nru firefox-84.0.2+build1/devtools/shared/protocol/Response.js firefox-85.0+build1/devtools/shared/protocol/Response.js
--- firefox-84.0.2+build1/devtools/shared/protocol/Response.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/protocol/Response.js	2021-01-18 19:58:08.000000000 +0000
@@ -16,6 +16,10 @@
  */
 var Response = function(template = {}) {
   this.template = template;
+  if (this.template instanceof RetVal && this.template.isArrayType()) {
+    throw Error("Arrays should be wrapped in objects");
+  }
+
   const placeholders = findPlaceholders(template, RetVal);
   if (placeholders.length > 1) {
     throw Error("More than one RetVal specified in response");
@@ -83,6 +87,7 @@
  *    The return value should be marshalled as this type.
  */
 var RetVal = function(type) {
+  this._type = type;
   // Prevent force loading all RetVal types by accessing it only when needed
   loader.lazyGetter(this, "type", function() {
     return types.getType(type);
@@ -97,6 +102,12 @@
   read: function(v, ctx) {
     return this.type.read(v, ctx);
   },
+
+  isArrayType: function() {
+    // `_type` should always be a string, but a few incorrect RetVal calls
+    // pass `0`. See Bug 1677703.
+    return typeof this._type === "string" && this._type.startsWith("array:");
+  },
 };
 
 // Outside of protocol.js, RetVal is called as factory method, without the new keyword.
diff -Nru firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_children.js firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_children.js
--- firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_children.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_children.js	2021-01-18 19:58:08.000000000 +0000
@@ -76,7 +76,9 @@
     },
     getIntArray: {
       request: { inputArray: Arg(0, "array:number") },
-      response: RetVal("array:number"),
+      response: {
+        intArray: RetVal("array:number"),
+      },
     },
     getSibling: {
       request: { id: Arg(0) },
diff -Nru firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_invalid_response.js firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_invalid_response.js
--- firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_invalid_response.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/test_protocol_invalid_response.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const protocol = require("devtools/shared/protocol");
+const { RetVal } = protocol;
+
+// Test invalid response specs throw when generating the Actor specification.
+
+// Test top level array response
+add_task(async function() {
+  Assert.throws(() => {
+    protocol.generateActorSpec({
+      typeName: "invalidArrayResponse",
+      methods: {
+        invalidMethod: {
+          response: RetVal("array:string"),
+        },
+      },
+    });
+  }, /Arrays should be wrapped in objects/);
+
+  protocol.generateActorSpec({
+    typeName: "validArrayResponse",
+    methods: {
+      validMethod: {
+        response: {
+          someArray: RetVal("array:string"),
+        },
+      },
+    },
+  });
+  ok(true, "Arrays wrapped in object are valid response packets");
+});
+
+// Test response with several placeholders
+add_task(async function() {
+  Assert.throws(() => {
+    protocol.generateActorSpec({
+      typeName: "tooManyPlaceholdersResponse",
+      methods: {
+        invalidMethod: {
+          response: {
+            prop1: RetVal("json"),
+            prop2: RetVal("json"),
+          },
+        },
+      },
+    });
+  }, /More than one RetVal specified in response/);
+});
diff -Nru firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/xpcshell.ini firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/devtools/shared/protocol/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/protocol/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 [test_protocol_async.js]
 [test_protocol_children.js]
 [test_protocol_index.js]
+[test_protocol_invalid_response.js]
 [test_protocol_longstring.js]
 [test_protocol_simple.js]
 [test_protocol_stack.js]
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/console-messages.js firefox-85.0+build1/devtools/shared/resources/legacy-listeners/console-messages.js
--- firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/console-messages.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/legacy-listeners/console-messages.js	2021-01-18 19:58:08.000000000 +0000
@@ -39,20 +39,11 @@
 
   // Fetch already existing messages
   // /!\ The actor implementation requires to call startListeners(ConsoleAPI) first /!\
-  let { messages } = await webConsoleFront.getCachedMessages(["ConsoleAPI"]);
+  const { messages } = await webConsoleFront.getCachedMessages(["ConsoleAPI"]);
 
-  messages = messages.map(message => {
-    // Handling cached messages for servers older than Firefox 78.
-    // Wrap the message into a `message` attribute, to match `consoleAPICall` behavior
-    if (message._type) {
-      return {
-        message,
-        resourceType: ResourceWatcher.TYPES.CONSOLE_MESSAGE,
-      };
-    }
+  for (const message of messages) {
     message.resourceType = ResourceWatcher.TYPES.CONSOLE_MESSAGE;
-    return message;
-  });
+  }
   onAvailable(messages);
 
   // Forward new message events
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/css-messages.js firefox-85.0+build1/devtools/shared/resources/legacy-listeners/css-messages.js
--- firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/css-messages.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/legacy-listeners/css-messages.js	2021-01-18 19:58:08.000000000 +0000
@@ -34,18 +34,11 @@
   const { messages } = await webConsoleFront.getCachedMessages(["PageError"]);
 
   const cachedMessages = [];
-  for (let message of messages) {
+  for (const message of messages) {
     if (message.pageError?.category !== MESSAGE_CATEGORY.CSS_PARSER) {
       continue;
     }
 
-    // Handling cached messages for servers older than Firefox 78.
-    // Wrap the message into a `pageError` attribute, to match `pageError` behavior
-    if (message._type) {
-      message = {
-        pageError: message,
-      };
-    }
     message.resourceType = ResourceWatcher.TYPES.CSS_MESSAGE;
     message.cssSelectors = message.pageError.cssSelectors;
     delete message.pageError.cssSelectors;
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/network-events.js firefox-85.0+build1/devtools/shared/resources/legacy-listeners/network-events.js
--- firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/network-events.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/legacy-listeners/network-events.js	2021-01-18 19:58:08.000000000 +0000
@@ -86,9 +86,6 @@
     } = resource;
 
     switch (packet.updateType) {
-      case "requestPostData":
-        resourceUpdates.contentSize = packet.dataSize;
-        break;
       case "responseStart":
         resourceUpdates.httpVersion = packet.response.httpVersion;
         resourceUpdates.status = packet.response.status;
@@ -112,9 +109,6 @@
         resourceUpdates.securityState = packet.state;
         resourceUpdates.isRacing = packet.isRacing;
         break;
-      case "responseCache":
-        resourceUpdates.responseCache = packet.responseCache;
-        break;
     }
 
     resourceUpdates[`${packet.updateType}Available`] = true;
@@ -145,8 +139,6 @@
         resourceUpdates,
       },
     ]);
-
-    resources.delete(resource.actor);
   }
 
   webConsoleFront.on("serverNetworkEvent", onNetworkEvent);
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/platform-messages.js firefox-85.0+build1/devtools/shared/resources/legacy-listeners/platform-messages.js
--- firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/platform-messages.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/legacy-listeners/platform-messages.js	2021-01-18 19:58:08.000000000 +0000
@@ -35,10 +35,6 @@
   const { messages } = await webConsoleFront.getCachedMessages(["LogMessage"]);
 
   for (const message of messages) {
-    // Handling cached messages for servers older than Firefox 78.
-    if (message._type) {
-      delete message._type;
-    }
     message.resourceType = ResourceWatcher.TYPES.PLATFORM_MESSAGE;
   }
   onAvailable(messages);
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/source.js firefox-85.0+build1/devtools/shared/resources/legacy-listeners/source.js
--- firefox-84.0.2+build1/devtools/shared/resources/legacy-listeners/source.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/legacy-listeners/source.js	2021-01-18 19:58:09.000000000 +0000
@@ -67,7 +67,7 @@
   // So ignore any error if this request failed on destruction.
   let sources;
   try {
-    ({ sources } = await threadFront.sources());
+    sources = await threadFront.sources();
   } catch (e) {
     if (threadFront.isDestroyed()) {
       return;
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/resource-watcher.js firefox-85.0+build1/devtools/shared/resources/resource-watcher.js
--- firefox-84.0.2+build1/devtools/shared/resources/resource-watcher.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/resource-watcher.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,7 +22,6 @@
 
   constructor(targetList) {
     this.targetList = targetList;
-    this.descriptorFront = targetList.descriptorFront;
 
     this._onTargetAvailable = this._onTargetAvailable.bind(this);
     this._onTargetDestroyed = this._onTargetDestroyed.bind(this);
@@ -45,6 +44,10 @@
     this._throttledNotifyWatchers = throttle(this._notifyWatchers, 100);
   }
 
+  get watcherFront() {
+    return this.targetList.watcherFront;
+  }
+
   /**
    * Return all specified resources cached in this watcher.
    *
@@ -103,27 +106,27 @@
       );
     }
 
-    // Cache the Watcher once for all, the first time we call `watch()`.
-    // This `watcher` attribute may be then used in any function of the ResourceWatcher after this.
-    if (!this.watcher) {
-      const supportsWatcher = this.descriptorFront?.traits?.watcher;
-      if (supportsWatcher) {
-        this.watcher = await this.descriptorFront.getWatcher();
-        // Resources watched from the parent process will be emitted on the Watcher Actor.
-        // So that we also have to listen for this event on it, in addition to all targets.
-        this.watcher.on(
-          "resource-available-form",
-          this._onResourceAvailable.bind(this, { watcherFront: this.watcher })
-        );
-        this.watcher.on(
-          "resource-updated-form",
-          this._onResourceUpdated.bind(this, { watcherFront: this.watcher })
-        );
-        this.watcher.on(
-          "resource-destroyed-form",
-          this._onResourceDestroyed.bind(this, { watcherFront: this.watcher })
-        );
-      }
+    // Bug 1675763: Watcher actor is not available in all situations yet.
+    if (!this._listenerRegistered && this.watcherFront) {
+      this._listenerRegistered = true;
+      // Resources watched from the parent process will be emitted on the Watcher Actor.
+      // So that we also have to listen for this event on it, in addition to all targets.
+      this.watcherFront.on(
+        "resource-available-form",
+        this._onResourceAvailable.bind(this, {
+          watcherFront: this.watcherFront,
+        })
+      );
+      this.watcherFront.on(
+        "resource-updated-form",
+        this._onResourceUpdated.bind(this, { watcherFront: this.watcherFront })
+      );
+      this.watcherFront.on(
+        "resource-destroyed-form",
+        this._onResourceDestroyed.bind(this, {
+          watcherFront: this.watcherFront,
+        })
+      );
     }
 
     // First ensuring enabling listening to targets.
@@ -267,7 +270,11 @@
       // Watcher actor, we have to unregister and re-register the resource
       // types. This will force calling `Resources.watchResources` on the new top
       // level target.
-      for (const resourceType of this._listenerCount.keys()) {
+      for (const resourceType of Object.values(ResourceWatcher.TYPES)) {
+        // ...which has at least one listener...
+        if (!this._listenerCount.get(resourceType)) {
+          continue;
+        }
         await this._stopListening(resourceType, { bypassListenerCount: true });
         resources.push(resourceType);
       }
@@ -291,9 +298,6 @@
         // ...request existing resource and new one to come from this one target
         // *but* only do that for backward compat, where we don't have the watcher API
         // (See bug 1626647)
-        if (this.hasWatcherSupport(resourceType)) {
-          continue;
-        }
         await this._watchResourcesForTarget(targetFront, resourceType);
       }
     }
@@ -370,7 +374,7 @@
           resource,
           targetList: this.targetList,
           targetFront,
-          watcher: this.watcher,
+          watcherFront: this.watcherFront,
         });
       }
 
@@ -598,7 +602,7 @@
       );
       return null;
     }
-    return this.watcher.getBrowsingContextTarget(browsingContextID);
+    return this.watcherFront.getBrowsingContextTarget(browsingContextID);
   }
 
   _onWillNavigate(targetFront) {
@@ -612,8 +616,31 @@
     );
   }
 
-  hasWatcherSupport(resourceType) {
-    return this.watcher?.traits?.resources?.[resourceType];
+  /**
+   * Tells if the server supports listening to the given resource type
+   * via the watcher actor's watchResources method.
+   *
+   * @return {Boolean} True, if the server supports this type.
+   */
+  hasResourceWatcherSupport(resourceType) {
+    return this.watcherFront?.traits?.resources?.[resourceType];
+  }
+
+  /**
+   * Tells if the server supports listening to the given resource type
+   * via the watcher actor's watchResources method, and that, for a specific
+   * target.
+   *
+   * @return {Boolean} True, if the server supports this type.
+   */
+  _hasResourceWatcherSupportForTarget(resourceType, targetFront) {
+    // First check if the watcher supports this target type.
+    // If it doesn't, no resource type can be listened via the Watcher actor for this target.
+    if (!this.targetList.hasTargetWatcherSupport(targetFront.targetType)) {
+      return false;
+    }
+
+    return this.hasResourceWatcherSupport(resourceType);
   }
 
   /**
@@ -643,9 +670,21 @@
 
     // If the server supports the Watcher API and the Watcher supports
     // this resource type, use this API
-    if (this.hasWatcherSupport(resourceType)) {
-      await this.watcher.watchResources([resourceType]);
-      return;
+    if (this.hasResourceWatcherSupport(resourceType)) {
+      await this.watcherFront.watchResources([resourceType]);
+
+      // Bug 1678385: In order to support watching for JS Source resource
+      // for service workers and parent process workers, which aren't supported yet
+      // by the watcher actor, we do not bail out here and allow to execute
+      // the legacy listener for these targets.
+      // Once bug 1608848 is fixed, we can remove this and always return.
+      // If this isn't fixed soon, we may add other resources we want to see
+      // being fetched from these targets.
+      const shouldRunLegacyListeners =
+        resourceType == ResourceWatcher.TYPES.SOURCE;
+      if (!shouldRunLegacyListeners) {
+        return;
+      }
     }
     // Otherwise, fallback on backward compat mode and use LegacyListeners.
 
@@ -674,6 +713,12 @@
    * type of resource from a given target.
    */
   _watchResourcesForTarget(targetFront, resourceType) {
+    if (this._hasResourceWatcherSupportForTarget(resourceType, targetFront)) {
+      // This resource / target pair should already be handled by the watcher,
+      // no need to start legacy listeners.
+      return Promise.resolve();
+    }
+
     if (targetFront.isDestroyed()) {
       return Promise.resolve();
     }
@@ -722,9 +767,15 @@
 
     // If the server supports the Watcher API and the Watcher supports
     // this resource type, use this API
-    if (this.hasWatcherSupport(resourceType)) {
-      this.watcher.unwatchResources([resourceType]);
-      return;
+    if (this.hasResourceWatcherSupport(resourceType)) {
+      this.watcherFront.unwatchResources([resourceType]);
+
+      // See comment in `_startListening`
+      const shouldRunLegacyListeners =
+        resourceType == ResourceWatcher.TYPES.SOURCE;
+      if (!shouldRunLegacyListeners) {
+        return;
+      }
     }
     // Otherwise, fallback on backward compat mode and use LegacyListeners.
 
@@ -740,6 +791,10 @@
    * Backward compatibility code, reverse of _watchResourcesForTarget.
    */
   _unwatchResourcesForTarget(targetFront, resourceType) {
+    if (this._hasResourceWatcherSupportForTarget(resourceType, targetFront)) {
+      // This resource / target pair should already be handled by the watcher,
+      // no need to stop legacy listeners.
+    }
     // Is there really a point in:
     // - unregistering `onAvailable` RDP event callbacks from target-scoped actors?
     // - calling `stopListeners()` as we are most likely closing the toolbox and destroying everything?
@@ -844,8 +899,6 @@
   [ResourceWatcher.TYPES
     .LOCAL_STORAGE]: require("devtools/shared/resources/transformers/storage-local-storage.js"),
   [ResourceWatcher.TYPES
-    .ROOT_NODE]: require("devtools/shared/resources/transformers/root-node"),
-  [ResourceWatcher.TYPES
     .SESSION_STORAGE]: require("devtools/shared/resources/transformers/storage-session-storage.js"),
   [ResourceWatcher.TYPES
     .NETWORK_EVENT]: require("devtools/shared/resources/transformers/network-events"),
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/target-list.js firefox-85.0+build1/devtools/shared/resources/target-list.js
--- firefox-84.0.2+build1/devtools/shared/resources/target-list.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/target-list.js	2021-01-18 19:58:08.000000000 +0000
@@ -229,6 +229,10 @@
     return this._listenersStarted.has(type);
   }
 
+  hasTargetWatcherSupport(type) {
+    return !!this.watcherFront?.traits[type];
+  }
+
   /**
    * Start listening for targets from the server
    *
@@ -245,6 +249,16 @@
    *        but still register listeners set via Legacy Listeners.
    */
   async startListening({ onlyLegacy = false } = {}) {
+    // Cache the Watcher once for all, the first time we call `startListening()`.
+    // This `watcherFront` attribute may be then used in any function in TargetList or ResourceWatcher after this.
+    if (!this.watcherFront) {
+      // Bug 1675763: Watcher actor is not available in all situations yet.
+      const supportsWatcher = this.descriptorFront?.traits?.watcher;
+      if (supportsWatcher) {
+        this.watcherFront = await this.descriptorFront.getWatcher();
+      }
+    }
+
     let types = [];
     if (this.targetFront.isParentProcess) {
       const fissionBrowserToolboxEnabled = Services.prefs.getBoolPref(
@@ -282,25 +296,22 @@
       }
       this._setListening(type, true);
 
-      // Starting with FF77, we support frames watching via watchTargets for Tab and Process descriptors
-      const supportsWatcher = this.descriptorFront?.traits?.watcher;
-      if (supportsWatcher) {
-        const watcher = await this.descriptorFront.getWatcher();
-        if (watcher.traits[type]) {
-          // When we switch to a new top level target, we don't have to stop and restart
-          // Watcher listener as it is independant from the top level target.
-          // This isn't the case for some Legacy Listeners, which fetch targets from the top level target
-          if (onlyLegacy) {
-            continue;
-          }
-          if (!this._startedListeningToWatcher) {
-            this._startedListeningToWatcher = true;
-            watcher.on("target-available", this._onTargetAvailable);
-            watcher.on("target-destroyed", this._onTargetDestroyed);
-          }
-          await watcher.watchTargets(type);
+      // Only a few top level targets support the watcher actor at the moment (see WatcherActor
+      // traits in the _form method). Bug 1675763 tracks watcher actor support for all targets.
+      if (this.hasTargetWatcherSupport(type)) {
+        // When we switch to a new top level target, we don't have to stop and restart
+        // Watcher listener as it is independant from the top level target.
+        // This isn't the case for some Legacy Listeners, which fetch targets from the top level target
+        if (onlyLegacy) {
           continue;
         }
+        if (!this._startedListeningToWatcher) {
+          this._startedListeningToWatcher = true;
+          this.watcherFront.on("target-available", this._onTargetAvailable);
+          this.watcherFront.on("target-destroyed", this._onTargetDestroyed);
+        }
+        await this.watcherFront.watchTargets(type);
+        continue;
       }
       if (this.legacyImplementation[type]) {
         await this.legacyImplementation[type].listen();
@@ -325,19 +336,16 @@
       }
       this._setListening(type, false);
 
-      // Starting with FF77, we support frames watching via watchTargets for Tab and Process descriptors
-      const supportsWatcher = this.descriptorFront?.traits?.watcher;
-      if (supportsWatcher) {
-        const watcher = this.descriptorFront.getCachedWatcher();
-        if (watcher && watcher.traits[type]) {
-          // When we switch to a new top level target, we don't have to stop and restart
-          // Watcher listener as it is independant from the top level target.
-          // This isn't the case for some Legacy Listeners, which fetch targets from the top level target
-          if (!onlyLegacy) {
-            watcher.unwatchTargets(type);
-          }
-          continue;
+      // Only a few top level targets support the watcher actor at the moment (see WatcherActor
+      // traits in the _form method). Bug 1675763 tracks watcher actor support for all targets.
+      if (this.hasTargetWatcherSupport(type)) {
+        // When we switch to a new top level target, we don't have to stop and restart
+        // Watcher listener as it is independant from the top level target.
+        // This isn't the case for some Legacy Listeners, which fetch targets from the top level target
+        if (!onlyLegacy) {
+          this.watcherFront.unwatchTargets(type);
         }
+        continue;
       }
       if (this.legacyImplementation[type]) {
         this.legacyImplementation[type].unlisten();
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser.ini firefox-85.0+build1/devtools/shared/resources/tests/browser.ini
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
   early_console_document.html
   fission_document.html
   fission_iframe.html
+  service-worker-sources.js
   sources.html
   sources.js
   style_document.css
@@ -43,6 +44,7 @@
 skip-if = fission # Disable frequent fission intermittents Bug 1675020
 [browser_resources_target_destroy.js]
 [browser_resources_target_resources_race.js]
+[browser_resources_target_switching.js]
 [browser_resources_websocket.js]
 [browser_target_list_browser_workers.js]
 [browser_target_list_frames.js]
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_console_messages.js firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_console_messages.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_console_messages.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_console_messages.js	2021-01-18 19:58:08.000000000 +0000
@@ -102,6 +102,12 @@
 
   targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 async function testTabConsoleMessagesResourcesWithIgnoreExistingResources(
@@ -163,6 +169,12 @@
 
   await targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 async function logExistingMessages(browser, executeInIframe) {
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_console_messages_workers.js firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_console_messages_workers.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_console_messages_workers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_console_messages_workers.js	2021-01-18 19:58:08.000000000 +0000
@@ -213,6 +213,12 @@
 
   targetList.destroy();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 function checkStartWorkerLogMessage(resource, expectedUrl) {
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_sources.js firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_sources.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_sources.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_sources.js	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,7 @@
   ResourceWatcher,
 } = require("devtools/shared/resources/resource-watcher");
 
-const TEST_URL = URL_ROOT + "sources.html";
+const TEST_URL = URL_ROOT_SSL + "sources.html";
 
 add_task(async function() {
   const tab = await addTab(TEST_URL);
@@ -23,6 +23,7 @@
 
   // Force the target list to cover workers
   targetList.listenForWorkers = true;
+  targetList.listenForServiceWorkers = true;
   await targetList.startListening();
 
   const targets = [];
@@ -31,7 +32,7 @@
   }) {
     targets.push(targetFront);
   });
-  is(targets.length, 2, "Got expected number of targets");
+  is(targets.length, 3, "Got expected number of targets");
 
   info("Check already available resources");
   const availableResources = [];
@@ -45,9 +46,9 @@
       sourceForm: {
         introductionType: "scriptElement",
         sourceMapBaseURL:
-          "http://example.com/browser/devtools/shared/resources/tests/sources.js",
+          "https://example.com/browser/devtools/shared/resources/tests/sources.js",
         url:
-          "http://example.com/browser/devtools/shared/resources/tests/sources.js",
+          "https://example.com/browser/devtools/shared/resources/tests/sources.js",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -62,7 +63,7 @@
       sourceForm: {
         introductionType: "eval",
         sourceMapBaseURL:
-          "http://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
         url: null,
         isBlackBoxed: false,
         sourceMapURL: null,
@@ -78,9 +79,9 @@
       sourceForm: {
         introductionType: "scriptElement",
         sourceMapBaseURL:
-          "http://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
         url:
-          "http://example.com/browser/devtools/shared/resources/tests/sources.html",
+          "https://example.com/browser/devtools/shared/resources/tests/sources.html",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -95,9 +96,9 @@
       sourceForm: {
         introductionType: undefined,
         sourceMapBaseURL:
-          "http://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
+          "https://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
         url:
-          "http://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
+          "https://example.com/browser/devtools/shared/resources/tests/worker-sources.js",
         isBlackBoxed: false,
         sourceMapURL: null,
         extensionName: null,
@@ -107,11 +108,34 @@
         source: "/* eslint-disable */\nfunction workerSource() {}\n",
       },
     },
+    {
+      description: "service worker script",
+      sourceForm: {
+        introductionType: undefined,
+        sourceMapBaseURL:
+          "https://example.com/browser/devtools/shared/resources/tests/service-worker-sources.js",
+        url:
+          "https://example.com/browser/devtools/shared/resources/tests/service-worker-sources.js",
+        isBlackBoxed: false,
+        sourceMapURL: null,
+        extensionName: null,
+      },
+      sourceContent: {
+        contentType: "text/javascript",
+        source: "/* eslint-disable */\nfunction serviceWorkerSource() {}\n",
+      },
+    },
   ];
   await assertResources(availableResources, expectedExistingResources);
 
   await targetList.stopListening();
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 async function assertResources(resources, expected) {
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_target_switching.js firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_target_switching.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_resources_target_switching.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_resources_target_switching.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,101 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test the behavior of ResourceWatcher when the top level target changes
+
+const {
+  ResourceWatcher,
+} = require("devtools/shared/resources/resource-watcher");
+const { CONSOLE_MESSAGE, SOURCE } = ResourceWatcher.TYPES;
+
+const TEST_URI =
+  "data:text/html;charset=utf-8,<script>console.log('foo');</script>";
+
+add_task(async function() {
+  const tab = await addTab(TEST_URI);
+
+  const { client, resourceWatcher, targetList } = await initResourceWatcher(
+    tab
+  );
+
+  info("Check the resources gotten from getAllResources at initial");
+  is(
+    resourceWatcher.getAllResources(CONSOLE_MESSAGE).length,
+    0,
+    "There is no resources before calling watchResources"
+  );
+
+  info(
+    "Start to watch the available resources in order to compare with resources gotten from getAllResources"
+  );
+  const availableResources = [];
+  const onAvailable = resources => {
+    // Ignore message coming from shared worker started by previous tests and
+    // logging late a console message
+    resources
+      .filter(r => {
+        return !r.message.arguments[0].startsWith("[WORKER] started");
+      })
+      .map(r => availableResources.push(r));
+  };
+  await resourceWatcher.watchResources([CONSOLE_MESSAGE], { onAvailable });
+
+  is(availableResources.length, 1, "Got the page message");
+  is(
+    availableResources[0].message.arguments[0],
+    "foo",
+    "Got the expected page message"
+  );
+
+  // Register another listener before unregistering the console listener
+  // otherwise the resource watcher stop watching for targets
+  const onSourceAvailable = () => {};
+  await resourceWatcher.watchResources([SOURCE], {
+    onAvailable: onSourceAvailable,
+  });
+
+  info(
+    "Unregister the console listener and check that we no longer listen for console messages"
+  );
+  resourceWatcher.unwatchResources([CONSOLE_MESSAGE], {
+    onAvailable,
+  });
+
+  let onSwitched = targetList.once("switched-target");
+  info("Navigate to another process");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:robots");
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  await onSwitched;
+
+  is(
+    availableResources.length,
+    1,
+    "about:robots doesn't fire any new message, so we should have a new one"
+  );
+
+  info("Navigate back to data: URI");
+  onSwitched = targetList.once("switched-target");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, TEST_URI);
+  await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  await onSwitched;
+
+  is(
+    availableResources.length,
+    1,
+    "the data:URI fired a message, but we are no longer listening to it, so no new one should be notified"
+  );
+  is(
+    resourceWatcher.getAllResources(CONSOLE_MESSAGE).length,
+    0,
+    "As we are no longer listening to CONSOLE message, we should not collect any"
+  );
+
+  resourceWatcher.unwatchResources([SOURCE], {
+    onAvailable: onSourceAvailable,
+  });
+
+  await targetList.destroy();
+  await client.close();
+});
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_browser_workers.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_browser_workers.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_browser_workers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_browser_workers.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,7 +23,7 @@
 
   const client = await createLocalClient();
   const mainRoot = client.mainRoot;
-  await addTab(FISSION_TEST_URL);
+  const tab = await addTab(FISSION_TEST_URL);
 
   info("Test TargetList against workers via the parent process target");
 
@@ -182,6 +182,12 @@
   await unregisterAllServiceWorkers(client);
 
   await client.close();
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
 
 function sortFronts(f1, f2) {
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_frames.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_frames.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_frames.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_frames.js	2021-01-18 19:58:08.000000000 +0000
@@ -159,5 +159,10 @@
   targetList.destroy();
   await waitForAllTargetsToBeAttached(targetList);
 
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
   BrowserTestUtils.removeTab(tab);
 }
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_getAllTargets.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_getAllTargets.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_getAllTargets.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_getAllTargets.js	2021-01-18 19:58:09.000000000 +0000
@@ -23,7 +23,7 @@
   const client = await createLocalClient();
   const mainRoot = client.mainRoot;
 
-  await addTab(FISSION_TEST_URL);
+  const tab = await addTab(FISSION_TEST_URL);
 
   // Instantiate a worker in the parent process
   // eslint-disable-next-line no-unused-vars
@@ -100,4 +100,9 @@
   await waitForAllTargetsToBeAttached(targetList);
 
   await client.close();
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 });
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_service_workers.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_service_workers.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_service_workers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_service_workers.js	2021-01-18 19:58:08.000000000 +0000
@@ -63,10 +63,10 @@
   );
 
   info("Unregister the worker and wait until onDestroyed is called.");
-  SpecialPowers.spawn(tab.linkedBrowser, [], function() {
-    const win = content.wrappedJSObject;
-    // win.registration is set by the test page.
-    win.registration.unregister();
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
   });
   await waitUntil(() => targets.length === 0);
 
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_service_workers_navigation.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_service_workers_navigation.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_service_workers_navigation.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_service_workers_navigation.js	2021-01-18 19:58:08.000000000 +0000
@@ -65,7 +65,7 @@
   });
 
   info("Go to .org page, wait for onAvailable to be called");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
   await checkHooks(hooks, {
     available: 2,
     destroyed: 0,
@@ -91,7 +91,7 @@
   });
 
   info("Go back to page 1");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
   await checkHooks(hooks, {
     available: 2,
     destroyed: 1,
@@ -150,7 +150,7 @@
   });
 
   info("Go to .org page, wait for onAvailable to be called");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
   await checkHooks(hooks, {
     available: 2,
     destroyed: 1,
@@ -170,7 +170,7 @@
   await checkHooks(hooks, { available: 3, destroyed: 3, targets: [] });
 
   info("Go back to page 1, wait for onDestroyed and onAvailable to be called");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
   await checkHooks(hooks, {
     available: 4,
     destroyed: 3,
@@ -241,7 +241,7 @@
   await waitForRegistrationReady(tab, COM_PAGE_URL);
 
   info("Navigate to another page");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, ORG_PAGE_URL);
 
   // Avoid TV failures, where target list still starts thinking that the
   // current domain is .com .
@@ -267,7 +267,7 @@
   await checkHooks(hooks, { available: 1, destroyed: 1, targets: [] });
 
   info("Go back .com page, wait for onAvailable to be called");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, COM_PAGE_URL);
   await checkHooks(hooks, {
     available: 2,
     destroyed: 1,
@@ -348,10 +348,11 @@
 
 async function unregisterServiceWorker(tab, expectedPageUrl) {
   await waitForRegistrationReady(tab, expectedPageUrl);
-  await SpecialPowers.spawn(tab.linkedBrowser, [], () =>
-    // win.registration is set by the test page.
-    content.wrappedJSObject.registration.unregister()
-  );
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async () => {
+    // registrationPromise is set by the test page.
+    const registration = await content.wrappedJSObject.registrationPromise;
+    registration.unregister();
+  });
 }
 
 /**
@@ -363,7 +364,7 @@
       try {
         const win = content.wrappedJSObject;
         const isExpectedUrl = win.location.href === _url;
-        const hasRegistration = !!win.registration;
+        const hasRegistration = !!win.registrationPromise;
         return isExpectedUrl && hasRegistration;
       } catch (e) {
         return false;
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_tab_workers.js firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_tab_workers.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/browser_target_list_tab_workers.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/browser_target_list_tab_workers.js	2021-01-18 19:58:08.000000000 +0000
@@ -284,7 +284,7 @@
   );
 
   info("Check that navigating away does destroy all targets");
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     tab.linkedBrowser,
     "data:text/html,<meta charset=utf8>Away"
   );
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/fission_document.html firefox-85.0+build1/devtools/shared/resources/tests/fission_document.html
--- firefox-84.0.2+build1/devtools/shared/resources/tests/fission_document.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/fission_document.html	2021-01-18 19:58:08.000000000 +0000
@@ -17,10 +17,8 @@
   const sharedWorker = new SharedWorker("https://example.com/browser/devtools/shared/resources/tests/test_worker.js#shared-worker");
 
   if (!params.has("noServiceWorker")) {
-    (async function () {
-      // Expose a reference to the registration so that tests can unregister it.
-      window.registration = await navigator.serviceWorker.register("https://example.com/browser/devtools/shared/resources/tests/test_service_worker.js#service-worker");
-    })();
+    // Expose a reference to the registration so that tests can unregister it.
+    window.registrationPromise = navigator.serviceWorker.register("https://example.com/browser/devtools/shared/resources/tests/test_service_worker.js#service-worker");
   }
 
   /* exported logMessageInWorker */
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/service-worker-sources.js firefox-85.0+build1/devtools/shared/resources/tests/service-worker-sources.js
--- firefox-84.0.2+build1/devtools/shared/resources/tests/service-worker-sources.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/service-worker-sources.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,2 @@
+/* eslint-disable */
+function serviceWorkerSource() {}
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/sources.html firefox-85.0+build1/devtools/shared/resources/tests/sources.html
--- firefox-84.0.2+build1/devtools/shared/resources/tests/sources.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/sources.html	2021-01-18 19:58:08.000000000 +0000
@@ -15,6 +15,7 @@
       // Assign the worker to a global variable in order to avoid
       // having it be GCed.
       this.worker = new Worker("worker-sources.js");
+      window.registrationPromise = navigator.serviceWorker.register("service-worker-sources.js");
     </script>
      <script src="sources.js"></script>
   </body>
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/tests/test_sw_page.html firefox-85.0+build1/devtools/shared/resources/tests/test_sw_page.html
--- firefox-84.0.2+build1/devtools/shared/resources/tests/test_sw_page.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/tests/test_sw_page.html	2021-01-18 19:58:08.000000000 +0000
@@ -12,10 +12,8 @@
 <script>
 "use strict";
 
-(async function () {
-  // Expose a reference to the registration so that tests can unregister it.
-  window.registration = await navigator.serviceWorker.register("test_sw_page_worker.js");
-})();
+// Expose a reference to the registration so that tests can unregister it.
+window.registrationPromise = navigator.serviceWorker.register("test_sw_page_worker.js");
 </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/transformers/moz.build firefox-85.0+build1/devtools/shared/resources/transformers/moz.build
--- firefox-84.0.2+build1/devtools/shared/resources/transformers/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/transformers/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -6,7 +6,6 @@
     "console-messages.js",
     "error-messages.js",
     "network-events.js",
-    "root-node.js",
     "storage-local-storage.js",
     "storage-session-storage.js",
 )
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/transformers/root-node.js firefox-85.0+build1/devtools/shared/resources/transformers/root-node.js
--- firefox-84.0.2+build1/devtools/shared/resources/transformers/root-node.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/transformers/root-node.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/**
- * Transformer for the root node resource.
- *
- * @param {NodeFront} resource
- * @param {TargetFront} targetFront
- * @return {NodeFront} the updated resource
- */
-module.exports = function({ resource, targetFront }) {
-  if (!resource.traits.supportsIsTopLevelDocument) {
-    // When `supportsIsTopLevelDocument` is false, a root-node resource is
-    // necessarily top level, se we can fallback to true.
-    resource.isTopLevelDocument = true;
-  }
-  return resource;
-};
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/transformers/storage-local-storage.js firefox-85.0+build1/devtools/shared/resources/transformers/storage-local-storage.js
--- firefox-84.0.2+build1/devtools/shared/resources/transformers/storage-local-storage.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/transformers/storage-local-storage.js	2021-01-18 19:58:09.000000000 +0000
@@ -10,8 +10,8 @@
 
 const { Front, types } = require("devtools/shared/protocol.js");
 
-module.exports = function({ resource, watcher, targetFront }) {
-  if (!(resource instanceof Front) && watcher) {
+module.exports = function({ resource, watcherFront, targetFront }) {
+  if (!(resource instanceof Front) && watcherFront) {
     // instantiate front for local storage
     resource = types.getType("localStorage").read(resource, targetFront);
     resource.resourceType = LOCAL_STORAGE;
diff -Nru firefox-84.0.2+build1/devtools/shared/resources/transformers/storage-session-storage.js firefox-85.0+build1/devtools/shared/resources/transformers/storage-session-storage.js
--- firefox-84.0.2+build1/devtools/shared/resources/transformers/storage-session-storage.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/resources/transformers/storage-session-storage.js	2021-01-18 19:58:08.000000000 +0000
@@ -10,8 +10,8 @@
 
 const { Front, types } = require("devtools/shared/protocol.js");
 
-module.exports = function({ resource, watcher, targetFront }) {
-  if (!(resource instanceof Front) && watcher) {
+module.exports = function({ resource, watcherFront, targetFront }) {
+  if (!(resource instanceof Front) && watcherFront) {
     // instantiate front for session storage
     resource = types.getType("sessionStorage").read(resource, targetFront);
     resource.resourceType = SESSION_STORAGE;
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/compatibility.js firefox-85.0+build1/devtools/shared/specs/compatibility.js
--- firefox-84.0.2+build1/devtools/shared/specs/compatibility.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/compatibility.js	2021-01-18 19:58:08.000000000 +0000
@@ -37,6 +37,9 @@
   typeName: "compatibility",
 
   methods: {
+    // While not being used on the client at the moment, keep this method in case
+    // we need traits again to support backwards compatibility for the Compatibility
+    // actor.
     getTraits: {
       request: {},
       response: { traits: RetVal("json") },
@@ -46,14 +49,18 @@
         declarationBlock: Arg(0, "array:declaration"),
         targetBrowsers: Arg(1, "array:browsertype"),
       },
-      response: RetVal("array:compatibilityissues"),
+      response: {
+        compatibilityIssues: RetVal("array:compatibilityissues"),
+      },
     },
     getNodeCssIssues: {
       request: {
         node: Arg(0, "domnode"),
         targetBrowsers: Arg(1, "array:browsertype"),
       },
-      response: RetVal("array:compatibilityissues"),
+      response: {
+        compatibilityIssues: RetVal("array:compatibilityissues"),
+      },
     },
   },
 });
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/descriptors/webextension.js firefox-85.0+build1/devtools/shared/specs/descriptors/webextension.js
--- firefox-84.0.2+build1/devtools/shared/specs/descriptors/webextension.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/descriptors/webextension.js	2021-01-18 19:58:08.000000000 +0000
@@ -14,7 +14,7 @@
       response: { addon: RetVal("json") },
     },
 
-    // FF70+ The method is now called getTarget`
+    // @backward-compat { version 70 } The method is now called getTarget
     connect: {
       request: {},
       response: { form: RetVal("json") },
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/descriptors/worker.js firefox-85.0+build1/devtools/shared/specs/descriptors/worker.js
--- firefox-84.0.2+build1/devtools/shared/specs/descriptors/worker.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/descriptors/worker.js	2021-01-18 19:58:08.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-const { Arg, RetVal, generateActorSpec } = require("devtools/shared/protocol");
+const { RetVal, generateActorSpec } = require("devtools/shared/protocol");
 
 const workerDescriptorSpec = generateActorSpec({
   typeName: "workerDescriptor",
@@ -17,14 +17,6 @@
       request: {},
       response: RetVal("json"),
     },
-    // Backwards compatibility for FF82 servers and below.
-    // Can be deleted once FF83 is merged into release.
-    connect: {
-      request: {
-        options: Arg(0, "json"),
-      },
-      response: RetVal("json"),
-    },
     getTarget: {
       request: {},
       response: RetVal("json"),
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/index.js firefox-85.0+build1/devtools/shared/specs/index.js
--- firefox-84.0.2+build1/devtools/shared/specs/index.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/index.js	2021-01-18 19:58:09.000000000 +0000
@@ -144,15 +144,20 @@
     front: "devtools/client/fronts/memory",
   },
   {
-    types: ["network"],
-    spec: "devtools/shared/specs/network",
-    front: "devtools/client/fronts/network",
+    types: ["networkContent"],
+    spec: "devtools/shared/specs/network-content",
+    front: "devtools/client/fronts/network-content",
   },
   {
     types: ["netEvent"],
     spec: "devtools/shared/specs/network-event",
     front: null,
   },
+  {
+    types: ["networkParent"],
+    spec: "devtools/shared/specs/network-parent",
+    front: "devtools/client/fronts/network-parent",
+  },
   /* imageData isn't an actor but just a DictType */
   {
     types: ["imageData", "disconnectedNode", "disconnectedNodeArray"],
@@ -225,11 +230,6 @@
     front: "devtools/client/fronts/source",
   },
   {
-    types: ["stacktraces"],
-    spec: "devtools/shared/specs/stacktraces",
-    front: "devtools/client/fronts/stacktraces",
-  },
-  {
     types: [
       "cookies",
       "localStorage",
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/moz.build firefox-85.0+build1/devtools/shared/specs/moz.build
--- firefox-84.0.2+build1/devtools/shared/specs/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/moz.build	2021-01-18 19:58:08.000000000 +0000
@@ -33,9 +33,10 @@
     "manifest.js",
     "media-rule.js",
     "memory.js",
+    "network-content.js",
     "network-event.js",
     "network-monitor.js",
-    "network.js",
+    "network-parent.js",
     "node.js",
     "object.js",
     "page-style.js",
@@ -49,7 +50,6 @@
     "root.js",
     "screenshot.js",
     "source.js",
-    "stacktraces.js",
     "storage.js",
     "string.js",
     "style-rule.js",
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/network-content.js firefox-85.0+build1/devtools/shared/specs/network-content.js
--- firefox-84.0.2+build1/devtools/shared/specs/network-content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/network-content.js	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,26 @@
+/* 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 { generateActorSpec, RetVal, Arg } = require("devtools/shared/protocol");
+
+const networkContentSpec = generateActorSpec({
+  typeName: "networkContent",
+  methods: {
+    sendHTTPRequest: {
+      request: {
+        request: Arg(0, "json"),
+      },
+      response: RetVal("number"),
+    },
+    getStackTrace: {
+      request: { resourceId: Arg(0) },
+      // stacktrace is an "array:string", but not always.
+      response: RetVal("json"),
+    },
+  },
+});
+
+exports.networkContentSpec = networkContentSpec;
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/network.js firefox-85.0+build1/devtools/shared/specs/network.js
--- firefox-84.0.2+build1/devtools/shared/specs/network.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/network.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { generateActorSpec, Arg, RetVal } = require("devtools/shared/protocol");
-
-const networkSpec = generateActorSpec({
-  typeName: "network",
-
-  methods: {
-    setBlockedUrls: {
-      request: {
-        urls: Arg(0, "array:string"),
-      },
-    },
-    getBlockedUrls: {
-      request: {},
-      response: {
-        urls: RetVal("array:string"),
-      },
-    },
-  },
-});
-
-exports.networkSpec = networkSpec;
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/network-parent.js firefox-85.0+build1/devtools/shared/specs/network-parent.js
--- firefox-84.0.2+build1/devtools/shared/specs/network-parent.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/network-parent.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,43 @@
+/* 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 { generateActorSpec, Arg, RetVal } = require("devtools/shared/protocol");
+
+const networkParentSpec = generateActorSpec({
+  typeName: "networkParent",
+
+  methods: {
+    setNetworkThrottling: {
+      request: {
+        options: Arg(0, "json"),
+      },
+      response: {},
+    },
+    getNetworkThrottling: {
+      request: {},
+      response: {
+        state: RetVal("json"),
+      },
+    },
+    clearNetworkThrottling: {
+      request: {},
+      response: {},
+    },
+    setBlockedUrls: {
+      request: {
+        urls: Arg(0, "array:string"),
+      },
+    },
+    getBlockedUrls: {
+      request: {},
+      response: {
+        urls: RetVal("array:string"),
+      },
+    },
+  },
+});
+
+exports.networkParentSpec = networkParentSpec;
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/object.js firefox-85.0+build1/devtools/shared/specs/object.js
--- firefox-84.0.2+build1/devtools/shared/specs/object.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/object.js	2021-01-18 19:58:09.000000000 +0000
@@ -92,6 +92,14 @@
   functionDisplayName: "string",
 });
 
+types.addDictType("object.promiseState", {
+  state: "string",
+  value: "nullable:object.descriptor",
+  reason: "nullable:object.descriptor",
+  creationTimestamp: "number",
+  timeToSettle: "nullable:number",
+});
+
 types.addDictType("object.proxySlots", {
   proxyTarget: "object.descriptor",
   proxyHandler: "object.descriptor",
@@ -188,6 +196,10 @@
         rejectionStack: RetVal("array:object.originalSourceLocation"),
       },
     },
+    promiseState: {
+      request: {},
+      response: RetVal("object.promiseState"),
+    },
     proxySlots: {
       request: {},
       response: RetVal("object.proxySlots"),
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/perf.js firefox-85.0+build1/devtools/shared/specs/perf.js
--- firefox-84.0.2+build1/devtools/shared/specs/perf.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/perf.js	2021-01-18 19:58:08.000000000 +0000
@@ -20,14 +20,13 @@
       interval: Arg(1, "number"),
       features: Arg(2, "number"),
       duration: Arg(3, "nullable:number"),
-      // Firefox 72 introduces `activeBrowsingContextID` property on the options
-      // passed to `profiler_start`. It's used to determine the active tab when
-      // user starts the profiler. This is a parameter that is generated on the
+      // The `activeBrowsingContextID` option passed to `profiler_start` is used to
+      // determine the active tab when user starts the profiler.
+      // This is a parameter that is generated on the
       // server, that's why we don't need to pass anything on `startProfiler`
       // actor method. But we return this in "profiler-started" event because
-      // client may want to use that value. It's not a nullable value but we set
-      // it nullable here to not fail on older Firefox versions.
-      activeBrowsingContextID: Arg(4, "nullable:number"),
+      // client may want to use that value.
+      activeBrowsingContextID: Arg(4, "number"),
     },
     "profiler-stopped": {
       type: "profiler-stopped",
@@ -88,7 +87,6 @@
       response: { value: RetVal("boolean") },
     },
 
-    // Added in Firefox 72.
     getSupportedFeatures: {
       request: {},
       response: { value: RetVal("array:string") },
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/property-iterator.js firefox-85.0+build1/devtools/shared/specs/property-iterator.js
--- firefox-84.0.2+build1/devtools/shared/specs/property-iterator.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/property-iterator.js	2021-01-18 19:58:08.000000000 +0000
@@ -23,7 +23,9 @@
       request: {
         indexes: Option(0, "array:number"),
       },
-      response: RetVal("array:string"),
+      response: {
+        names: RetVal("array:string"),
+      },
     },
     slice: {
       request: {
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/root.js firefox-85.0+build1/devtools/shared/specs/root.js
--- firefox-84.0.2+build1/devtools/shared/specs/root.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/root.js	2021-01-18 19:58:08.000000000 +0000
@@ -28,11 +28,7 @@
     },
 
     listTabs: {
-      request: {
-        // Backward compatibility: this is only used for FF75 or older.
-        // The argument can be dropped when FF76 hits the release channel.
-        favicons: Option(0, "boolean"),
-      },
+      request: {},
       response: {
         tabs: RetVal("array:tabDescriptor"),
       },
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/source.js firefox-85.0+build1/devtools/shared/specs/source.js
--- firefox-84.0.2+build1/devtools/shared/specs/source.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/source.js	2021-01-18 19:58:08.000000000 +0000
@@ -74,8 +74,6 @@
       },
     },
     source: {
-      // we are sending the type "source" to be compatible
-      // with FF67 and older
       request: {},
       response: RetVal("source.onsource"),
     },
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/stacktraces.js firefox-85.0+build1/devtools/shared/specs/stacktraces.js
--- firefox-84.0.2+build1/devtools/shared/specs/stacktraces.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/stacktraces.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { generateActorSpec, RetVal, Arg } = require("devtools/shared/protocol");
-
-const stackTracesSpec = generateActorSpec({
-  typeName: "stacktraces",
-  methods: {
-    getStackTrace: {
-      request: { resourceId: Arg(0) },
-      // stacktrace is an "array:string", but not always.
-      response: RetVal("json"),
-    },
-  },
-});
-
-exports.stackTracesSpec = stackTracesSpec;
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/style-sheet.js firefox-85.0+build1/devtools/shared/specs/style-sheet.js
--- firefox-84.0.2+build1/devtools/shared/specs/style-sheet.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/style-sheet.js	2021-01-18 19:58:09.000000000 +0000
@@ -36,11 +36,10 @@
   },
 
   methods: {
-    // Backward-compatibility: remove when FF81 hits release.
-    toggleDisabled: {
-      response: { disabled: RetVal("boolean") },
-    },
-    // Backward-compatibility: remove when FF81 hits release.
+    // This is only called from StyleSheetFront#guessIndentation, which is only called
+    // from RuleRewriter#getDefaultIndentation when the rule's parent stylesheet isn't
+    // a resource. Once we support StyleSheet resource everywhere, this method can be
+    // removed (See Bug 1672090 for more information).
     getText: {
       response: {
         text: RetVal("longstring"),
@@ -52,13 +51,6 @@
         mediaRules: RetVal("nullable:array:mediarule"),
       },
     },
-    // Backward-compatibility: remove when FF81 hits release.
-    update: {
-      request: {
-        text: Arg(0, "string"),
-        transition: Arg(1, "boolean"),
-      },
-    },
   },
 });
 
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/thread.js firefox-85.0+build1/devtools/shared/specs/thread.js
--- firefox-84.0.2+build1/devtools/shared/specs/thread.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/thread.js	2021-01-18 19:58:08.000000000 +0000
@@ -98,7 +98,9 @@
       },
     },
     sources: {
-      response: RetVal("array:json"),
+      response: {
+        sources: RetVal("array:json"),
+      },
     },
     skipBreakpoints: {
       request: {
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/walker.js firefox-85.0+build1/devtools/shared/specs/walker.js
--- firefox-84.0.2+build1/devtools/shared/specs/walker.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/walker.js	2021-01-18 19:58:09.000000000 +0000
@@ -287,14 +287,6 @@
       request: { node: Arg(0, "domnode") },
       response: { attached: RetVal("boolean") },
     },
-    getNodeActorFromObjectActor: {
-      request: {
-        objectActorID: Arg(0, "string"),
-      },
-      response: {
-        nodeFront: RetVal("nullable:disconnectedNode"),
-      },
-    },
     getNodeActorFromWindowID: {
       request: {
         windowID: Arg(0, "string"),
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/watcher.js firefox-85.0+build1/devtools/shared/specs/watcher.js
--- firefox-84.0.2+build1/devtools/shared/specs/watcher.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/watcher.js	2021-01-18 19:58:08.000000000 +0000
@@ -46,10 +46,10 @@
       oneway: true,
     },
 
-    getNetworkActor: {
+    getNetworkParentActor: {
       request: {},
       response: {
-        network: RetVal("network"),
+        network: RetVal("networkParent"),
       },
     },
   },
diff -Nru firefox-84.0.2+build1/devtools/shared/specs/webconsole.js firefox-85.0+build1/devtools/shared/specs/webconsole.js
--- firefox-84.0.2+build1/devtools/shared/specs/webconsole.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/specs/webconsole.js	2021-01-18 19:58:08.000000000 +0000
@@ -22,6 +22,10 @@
   traits: "console.traits",
 });
 
+types.addDictType("console.stoplisteners", {
+  stoppedListeners: "array:string",
+});
+
 types.addDictType("console.autocomplete", {
   matches: "array:string",
   matchProp: "string",
@@ -128,7 +132,7 @@
       request: {
         listeners: Arg(0, "nullable:array:string"),
       },
-      response: RetVal("array:string"),
+      response: RetVal("console.stoplisteners"),
     },
     /**
      * Retrieve the cached messages from the server.
@@ -248,7 +252,9 @@
     },
     getBlockedUrls: {
       request: {},
-      response: RetVal("array:string"),
+      response: {
+        blockedUrls: RetVal("array:string"),
+      },
     },
   },
 };
diff -Nru firefox-84.0.2+build1/devtools/shared/test-helpers/.eslintrc.js firefox-85.0+build1/devtools/shared/test-helpers/.eslintrc.js
--- firefox-84.0.2+build1/devtools/shared/test-helpers/.eslintrc.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/test-helpers/.eslintrc.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 module.exports = {
diff -Nru firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js
--- firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-const { RootActor } = require("devtools/server/actors/root");
-const {
-  ActorRegistry,
-} = require("devtools/server/actors/utils/actor-registry");
-
-/**
- * Root actor that doesn't have the bulk trait.
- */
-exports.createRootActor = function createRootActor(connection) {
-  const root = new RootActor(connection, {
-    globalActorFactories: ActorRegistry.globalActorFactories,
-  });
-  root.applicationType = "xpcshell-tests";
-  root.traits = {
-    bulk: false,
-  };
-  return root;
-};
diff -Nru firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_bulk_error.js firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_bulk_error.js
--- firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_bulk_error.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_bulk_error.js	2021-01-18 19:58:08.000000000 +0000
@@ -53,19 +53,12 @@
   const transport = await transportFactory();
 
   const client = new DevToolsClient(transport);
-  return client
-    .connect()
-    .then(([app, traits]) => {
-      Assert.equal(traits.bulk, true);
-      return client.mainRoot.rootForm;
-    })
-    .then(response => {
-      return onReady(client, response);
-    })
-    .then(() => {
-      client.close();
-      transport.close();
-    });
+  await client.connect();
+  const response = await client.mainRoot.rootForm;
+
+  await onReady(client, response);
+  client.close();
+  transport.close();
 };
 
 /** * Reply Types ***/
diff -Nru firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js
--- firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js	2021-01-18 19:58:08.000000000 +0000
@@ -170,8 +170,7 @@
   const transport = await transportFactory();
 
   const client = new DevToolsClient(transport);
-  client.connect().then(([app, traits]) => {
-    Assert.equal(traits.bulk, true);
+  client.connect().then(() => {
     client.mainRoot.rootForm.then(clientResolve);
   });
 
@@ -240,8 +239,7 @@
   const transport = await transportFactory();
 
   const client = new DevToolsClient(transport);
-  const [, traits] = await client.connect();
-  Assert.equal(traits.bulk, true);
+  await client.connect();
   client.mainRoot.rootForm.then(clientResolve);
 
   clientDeferred
diff -Nru firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_no_bulk.js firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_no_bulk.js
--- firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/test_no_bulk.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/test_no_bulk.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-function run_test() {
-  const { createRootActor } = require("xpcshell-test/testactors-no-bulk");
-  DevToolsServer.setRootActor(createRootActor);
-  // Allow incoming connections.
-  DevToolsServer.init();
-
-  add_task(async function() {
-    await test_bulk_send_error(socket_transport);
-    await test_bulk_send_error(local_transport);
-    DevToolsServer.destroy();
-  });
-
-  run_next_test();
-}
-
-/** * Tests ***/
-
-var test_bulk_send_error = async function(transportFactory) {
-  const transport = await transportFactory();
-
-  const client = new DevToolsClient(transport);
-  return client.connect().then(([app, traits]) => {
-    Assert.ok(!traits.bulk);
-
-    try {
-      client.startBulkRequest();
-      do_throw(new Error("Can't use bulk since server doesn't support it"));
-    } catch (e) {
-      Assert.ok(true);
-    }
-  });
-};
diff -Nru firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/xpcshell.ini firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/devtools/shared/transport/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/transport/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:08.000000000 +0000
@@ -6,14 +6,12 @@
 
 support-files =
   testactors.js
-  testactors-no-bulk.js
 
 [test_bulk_error.js]
 [test_client_server_bulk.js]
 [test_dbgsocket.js]
 [test_dbgsocket_connection_drop.js]
 [test_delimited_read.js]
-[test_no_bulk.js]
 [test_packet.js]
 [test_queue.js]
 [test_transport_bulk.js]
diff -Nru firefox-84.0.2+build1/devtools/shared/webconsole/js-property-provider.js firefox-85.0+build1/devtools/shared/webconsole/js-property-provider.js
--- firefox-84.0.2+build1/devtools/shared/webconsole/js-property-provider.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/webconsole/js-property-provider.js	2021-01-18 19:58:09.000000000 +0000
@@ -404,7 +404,9 @@
 const STATE_QUOTE = Symbol("STATE_QUOTE");
 const STATE_DQUOTE = Symbol("STATE_DQUOTE");
 const STATE_TEMPLATE_LITERAL = Symbol("STATE_TEMPLATE_LITERAL");
-const STATE_ESCAPE = Symbol("STATE_ESCAPE");
+const STATE_ESCAPE_QUOTE = Symbol("STATE_ESCAPE_QUOTE");
+const STATE_ESCAPE_DQUOTE = Symbol("STATE_ESCAPE_DQUOTE");
+const STATE_ESCAPE_TEMPLATE_LITERAL = Symbol("STATE_ESCAPE_TEMPLATE_LITERAL");
 const STATE_SLASH = Symbol("STATE_SLASH");
 const STATE_INLINE_COMMENT = Symbol("STATE_INLINE_COMMENT");
 const STATE_MULTILINE_COMMENT = Symbol("STATE_MULTILINE_COMMENT");
@@ -557,14 +559,20 @@
         break;
 
       // Escaped quote
-      case STATE_ESCAPE:
-        state = STATE_NORMAL;
+      case STATE_ESCAPE_QUOTE:
+        state = STATE_QUOTE;
+        break;
+      case STATE_ESCAPE_DQUOTE:
+        state = STATE_DQUOTE;
+        break;
+      case STATE_ESCAPE_TEMPLATE_LITERAL:
+        state = STATE_TEMPLATE_LITERAL;
         break;
 
       // Double quote state > " <
       case STATE_DQUOTE:
         if (c == "\\") {
-          state = STATE_ESCAPE;
+          state = STATE_ESCAPE_DQUOTE;
         } else if (c == "\n") {
           return {
             err: "unterminated string literal",
@@ -577,7 +585,7 @@
       // Template literal state > ` <
       case STATE_TEMPLATE_LITERAL:
         if (c == "\\") {
-          state = STATE_ESCAPE;
+          state = STATE_ESCAPE_TEMPLATE_LITERAL;
         } else if (c == "`") {
           state = STATE_NORMAL;
         }
@@ -586,7 +594,7 @@
       // Single quote state > ' <
       case STATE_QUOTE:
         if (c == "\\") {
-          state = STATE_ESCAPE;
+          state = STATE_ESCAPE_QUOTE;
         } else if (c == "\n") {
           return {
             err: "unterminated string literal",
@@ -671,7 +679,9 @@
       state === STATE_DQUOTE ||
       state === STATE_QUOTE ||
       state === STATE_TEMPLATE_LITERAL ||
-      state === STATE_ESCAPE
+      state === STATE_ESCAPE_QUOTE ||
+      state === STATE_ESCAPE_DQUOTE ||
+      state === STATE_ESCAPE_TEMPLATE_LITERAL
     ) {
       state = STATE_NORMAL;
     }
diff -Nru firefox-84.0.2+build1/devtools/shared/webconsole/test/xpcshell/test_analyze_input_string.js firefox-85.0+build1/devtools/shared/webconsole/test/xpcshell/test_analyze_input_string.js
--- firefox-84.0.2+build1/devtools/shared/webconsole/test/xpcshell/test_analyze_input_string.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/webconsole/test/xpcshell/test_analyze_input_string.js	2021-01-18 19:58:08.000000000 +0000
@@ -142,6 +142,68 @@
       },
     },
     {
+      desc: "string literal",
+      input: `"abc".`,
+      expected: {
+        isElementAccess: false,
+        isPropertyAccess: true,
+        expressionBeforePropertyAccess: `"abc"`,
+        lastStatement: `"abc".`,
+        mainExpression: `"abc"`,
+        matchProp: ``,
+      },
+    },
+    {
+      desc: "string literal containing backslash",
+      input: `"\\n".`,
+      expected: {
+        isElementAccess: false,
+        isPropertyAccess: true,
+        expressionBeforePropertyAccess: `"\\n"`,
+        lastStatement: `"\\n".`,
+        mainExpression: `"\\n"`,
+        matchProp: ``,
+      },
+    },
+    {
+      desc: "single quote string literal containing backslash",
+      input: `'\\r'.`,
+      expected: {
+        isElementAccess: false,
+        isPropertyAccess: true,
+        expressionBeforePropertyAccess: `'\\r'`,
+        lastStatement: `'\\r'.`,
+        mainExpression: `'\\r'`,
+        matchProp: ``,
+      },
+    },
+    {
+      desc: "template string literal containing backslash",
+      input: "`\\\\`.",
+      expected: {
+        isElementAccess: false,
+        isPropertyAccess: true,
+        expressionBeforePropertyAccess: "`\\\\`",
+        lastStatement: "`\\\\`.",
+        mainExpression: "`\\\\`",
+        matchProp: ``,
+      },
+    },
+    {
+      desc: "unterminated double quote string literal",
+      input: `"\n`,
+      expected: {
+        err: "unterminated string literal",
+      },
+    },
+    {
+      desc: "unterminated single quote string literal",
+      input: `'\n`,
+      expected: {
+        err: "unterminated string literal",
+      },
+    },
+    {
       desc: "optional chaining operator with spaces",
       input: `test  ?.    ["propA"]  ?.   [0]  ?.   ["propB"]  ?.  ['to`,
       expected: {
diff -Nru firefox-84.0.2+build1/devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js firefox-85.0+build1/devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js
--- firefox-84.0.2+build1/devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js	2021-01-18 19:58:09.000000000 +0000
@@ -217,6 +217,12 @@
   test_has_result(results, "hello");
   results = propertyProvider("'foo'.hello.w");
   test_has_result(results, "world");
+  results = propertyProvider(`"\\n".`);
+  test_has_result(results, "charAt");
+  results = propertyProvider(`'\\r'.`);
+  test_has_result(results, "charAt");
+  results = propertyProvider("`\\\\`.");
+  test_has_result(results, "charAt");
 
   info("Test that suggestions are not given for syntax errors.");
   results = propertyProvider("'foo\"");
diff -Nru firefox-84.0.2+build1/docs/bug-mgmt/guides/severity.rst firefox-85.0+build1/docs/bug-mgmt/guides/severity.rst
--- firefox-84.0.2+build1/docs/bug-mgmt/guides/severity.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/bug-mgmt/guides/severity.rst	2021-01-18 19:58:08.000000000 +0000
@@ -9,10 +9,6 @@
 
 The field is display alongside the bug's priority.
 
-.. image:: screenshot-severity.png
-   :alt: Screenshot of severity field
-
-
 Values
 ------
 
diff -Nru firefox-84.0.2+build1/docs/bug-mgmt/policies/triage-bugzilla.rst firefox-85.0+build1/docs/bug-mgmt/policies/triage-bugzilla.rst
--- firefox-84.0.2+build1/docs/bug-mgmt/policies/triage-bugzilla.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/bug-mgmt/policies/triage-bugzilla.rst	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,7 @@
 
 The new definition of Triaged will be Firefox-related bugs of type
 ``defect`` where the component is not
-``UNTRIAGED``, and a non-default value not equal to ``--`` or ``N/A``.
+``UNTRIAGED``, and a severity value not equal to ``--`` or ``N/A``.
 
 Bugs of type Task or Enhancement may have a severity of ``N/A``,
 but defects must have a severity that is neither ``--`` or
diff -Nru firefox-84.0.2+build1/docs/code-quality/lint/linters/clippy.rst firefox-85.0+build1/docs/code-quality/lint/linters/clippy.rst
--- firefox-84.0.2+build1/docs/code-quality/lint/linters/clippy.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/code-quality/lint/linters/clippy.rst	2021-01-18 19:58:08.000000000 +0000
@@ -23,6 +23,17 @@
 To enable clippy on new directory, add the path to the include
 section in the `clippy.yml <https://searchfox.org/mozilla-central/source/tools/lint/clippy.yml>`_ file.
 
+Autofix
+-------
+
+This linter provides a ``--fix`` option. It requires using nightly
+which can be installed with:
+
+.. code-block:: shell
+
+   $ rustup component add clippy --toolchain nightly-x86_64-unknown-linux-gnu
+
+
 
 Sources
 -------
diff -Nru firefox-84.0.2+build1/docs/config.yml firefox-85.0+build1/docs/config.yml
--- firefox-84.0.2+build1/docs/config.yml	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/config.yml	2021-01-18 19:58:09.000000000 +0000
@@ -25,6 +25,7 @@
         - widget/cocoa
         - code-quality
         - writing-rust-code
+        - tools/profiler
     build_doc:
         - mach
         - tools/try
@@ -33,6 +34,7 @@
         - tools/moztreedocs
     testing_doc:
         - testing/testing-policy
+        - testing/ci-configs
         - testing/marionette
         - testing/geckodriver
         - web-platform
diff -Nru firefox-84.0.2+build1/docs/contributing/contribution_quickref.rst firefox-85.0+build1/docs/contributing/contribution_quickref.rst
--- firefox-84.0.2+build1/docs/contributing/contribution_quickref.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/contributing/contribution_quickref.rst	2021-01-18 19:58:08.000000000 +0000
@@ -131,6 +131,19 @@
 
 :ref:`More information <Mercurial Overview>`
 
+To make sure the change follows the coding style
+------------------------------------------------
+
+To detect coding style violations, use mach lint:
+
+.. code-block:: shell
+
+    $ ./mach lint path/to/the/file/or/directory/you/changed
+
+    # To get the autofix, add --fix:
+    $ ./mach lint path/to/the/file/or/directory/you/changed --fix
+
+:ref:`More information <Code quality>`
 
 To test a change locally
 ------------------------
diff -Nru firefox-84.0.2+build1/docs/contributing/debugging/understanding_crash_reports.rst firefox-85.0+build1/docs/contributing/debugging/understanding_crash_reports.rst
--- firefox-84.0.2+build1/docs/contributing/debugging/understanding_crash_reports.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/contributing/debugging/understanding_crash_reports.rst	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,7 @@
 crash report but also has a signature, classifications, and a number of
 improved fields (e.g. OS, product, version). Many of the fields in both
 the raw crash report and the processed crash report are viewable and
-searchable on `crash-stats <https://crash-stats.mozilla.com/>`__.
+searchable on `crash-stats <https://crash-stats.mozilla.org/>`__.
 Although there are two distinct crash reports, the raw and the
 processed, people typically talk about a single "crash report" because
 crash-stats mostly presents them in a combined way.
@@ -28,8 +28,8 @@
 privacy-sensitive parts of it are only available to users who are logged
 in and have "minidump access". A relatively small number of users have
 minidump access, and they are required to follow certain rules. For
-access, see the `Memory Dump Access docs on Crash
-Stats <https://crash-stats.mozilla.com/documentation/memory_dump_access/>`__.
+access, see the `Protected Data Access docs on Crash Stats
+<https://crash-stats.mozilla.org/documentation/protected_data_access/>`__.
 
 Each crash report has the following tabs: Details, Metadata, Modules,
 Raw Dump, Extensions, and (optional) Correlations.
@@ -57,9 +57,9 @@
 not always similar to the search key. E.g. the field "Adapter Device ID"
 has the search key "adapter_device_id".) These descriptions are shown in
 the `SuperSearchFields
-API <https://crash-stats.mozilla.com/api/SuperSearchFields/>`__ and can
-be `modified by crash-stats
-superusers <http://adrian.gaudebert.fr/blog/post/2014/12/02/socorro-super-search-fields-guide>`__.
+API <https://crash-stats.mozilla.org/api/SuperSearchFields/>`__ and can be
+`modified in super_search_fields.py <https://github.com/mozilla-services/socorro/blob/main/socorro/external/es/super_search_fields.py>`__
+or by writing up a `bug in Socorro <https://bugzilla.mozilla.org/enter_bug.cgi?format=__standard__&product=Socorro>`__.
 
 The fields present in this tab vary depending on the crash kind. Not all
 fields are always present.
diff -Nru firefox-84.0.2+build1/docs/crash-reporting/index.rst firefox-85.0+build1/docs/crash-reporting/index.rst
--- firefox-84.0.2+build1/docs/crash-reporting/index.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/crash-reporting/index.rst	2021-01-18 19:58:08.000000000 +0000
@@ -16,7 +16,7 @@
 ---------------------------------
 
 Crash data submitted using the Mozilla Crash Reporter is located on
-`crash-stats <https://crash-stats.mozilla.com/>`__. If you want to find
+`crash-stats <https://crash-stats.mozilla.org/>`__. If you want to find
 a specific crash that you submitted, you first need to find the Crash ID
 that the server has assigned your crash. Type ``about:crashes`` into
 your location bar to get a page listing both submitted and unsubmitted
@@ -41,7 +41,7 @@
 
 -  :ref:`Understanding crash reports`
 -  :ref:`A guide to searching crash reports`
--  `crash-stats <https://crash-stats.mozilla.com/>`__
+-  `crash-stats <https://crash-stats.mozilla.org/>`__
 -  `Crash pings (Telemetry) and crash reports (Socorro/Crash
    Stats) <https://bluesock.org/~willkg/blog/mozilla/crash_pings_crash_reports.html>`__
 -  :ref:`Building with Debug Symbols`
diff -Nru firefox-84.0.2+build1/docs/crash-reporting/searching_crash_reports.rst firefox-85.0+build1/docs/crash-reporting/searching_crash_reports.rst
--- firefox-84.0.2+build1/docs/crash-reporting/searching_crash_reports.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/crash-reporting/searching_crash_reports.rst	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
    reports <Understanding crash reports>` before reading
    this page.
 
-The Mozilla `crash-stats <https://crash-stats.mozilla.com/>`__ site
+The Mozilla `crash-stats <https://crash-stats.mozilla.org/>`__ site
 provides facilities for investigating large numbers of Firefox `crash
 reports <Understanding crash reports>`__. This guide to
 searching through crash reports may help you locate the crash reports
@@ -33,7 +33,7 @@
 ~~~~~~~~~~~~~~~
 
 You can get to the `search
-page <https://crash-stats.mozilla.com/search/?product=Firefox&_dont_run=1>`__
+page <https://crash-stats.mozilla.org/search/?product=Firefox&_dont_run=1>`__
 by clicking on the "Super Search" link near the toolbar at the top right
 of any page in crash-stats. This brings up a search form like the one in
 the following screenshot.
@@ -49,7 +49,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you click on the "Search" button, you will get
-`results <https://crash-stats.mozilla.com/search/?product=Firefox&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-signature>`__
+`results <https://crash-stats.mozilla.org/search/?product=Firefox&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-signature>`__
 like the ones in the following screenshot.
 
 |Results of a default search in crash-stats|
@@ -80,7 +80,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you switch to the "Crash Reports" tab you will see
-`results <https://crash-stats.mozilla.com/search/?product=Firefox&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#crash-reports>`__
+`results <https://crash-stats.mozilla.org/search/?product=Firefox&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#crash-reports>`__
 like the ones in the following screenshot.
 
 |Results of a default search in crash-stats (crash reports tab)|
@@ -119,7 +119,7 @@
 |crash-stats Super Search form with additional criteria|
 
 After clicking on "Search" we get
-`results <https://crash-stats.mozilla.com/search/?is_garbage_collecting=__true__&product=Firefox&platform=Mac%20OS%20X&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform>`__
+`results <https://crash-stats.mozilla.org/search/?is_garbage_collecting=__true__&product=Firefox&platform=Mac%20OS%20X&_sort=-date&_facets=signature&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform>`__
 like those in the following screenshot.
 
 |Results of a narrower search in crash-stats|
@@ -177,7 +177,7 @@
 in the past week, but then replace the "signature" facet with "platform"
 and "moz crash reason", we get search results with two facet tabs. The
 first of these is a "Platform facet" tab, with
-`results <https://crash-stats.mozilla.com/search/?product=Firefox&_sort=-date&_facets=platform&_facets=moz_crash_reason&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-platform>`__
+`results <https://crash-stats.mozilla.org/search/?product=Firefox&_sort=-date&_facets=platform&_facets=moz_crash_reason&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-platform>`__
 like those shown in the following screenshot.
 
 |Results of a faceted search in crash-stats|
@@ -193,7 +193,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The second facet tab is a "Moz crash reason facet" tab, with
-`results <https://crash-stats.mozilla.com/search/?product=Firefox&_sort=-date&_facets=platform&_facets=moz_crash_reason&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-moz_crash_reason>`__
+`results <https://crash-stats.mozilla.org/search/?product=Firefox&_sort=-date&_facets=platform&_facets=moz_crash_reason&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-moz_crash_reason>`__
 like those shown in the following screenshot.
 
 |Results of a faceted search in crash-stats (moz crash reason tab)|
@@ -211,7 +211,7 @@
 fields that can have many possible values (such as numeric fields) often
 don't group well. For example, if we do a default search grouped by
 uptime we get
-`results <https://crash-stats.mozilla.com/search/?product=Firefox&_sort=-date&_facets=uptime&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-uptime>`__
+`results <https://crash-stats.mozilla.org/search/?product=Firefox&_sort=-date&_facets=uptime&_columns=date&_columns=signature&_columns=product&_columns=version&_columns=build_id&_columns=platform#facet-uptime>`__
 like those in the following screenshot.
 
 |Results of a faceted search in crash-stats (uptime)|
@@ -238,11 +238,11 @@
 note that all fields shown in the Details tab of an individual crash
 report have a tool-tip that indicates its key for search. Alternatively,
 you can browse the `complete
-list <https://crash-stats.mozilla.com/documentation/supersearch/api/#section-filters>`__.
+list <https://crash-stats.mozilla.org/documentation/supersearch/api/#section-filters>`__.
 
 There is also an API through which searches can be performed
 programmatically. See the `API
-documentation <https://crash-stats.mozilla.com/documentation/supersearch/>`__
+documentation <https://crash-stats.mozilla.org/documentation/supersearch/>`__
 for full details; note that it uses the term "aggregation" for
 grouping/faceting.
 
diff -Nru firefox-84.0.2+build1/docs/crash-reporting/uploading_symbol.rst firefox-85.0+build1/docs/crash-reporting/uploading_symbol.rst
--- firefox-84.0.2+build1/docs/crash-reporting/uploading_symbol.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/crash-reporting/uploading_symbol.rst	2021-01-18 19:58:09.000000000 +0000
@@ -5,7 +5,7 @@
 consider uploading debug symbols from the builds to Mozilla's symbol
 server. If you have not disabled crash reporting in your builds, crash
 reports will be submitted to `Mozilla's crash reporting
-server <https://crash-stats.mozilla.com/>`__. Without the debug symbols
+server <https://crash-stats.mozilla.org/>`__. Without the debug symbols
 that match your build the crash reports will not contain actionable
 information.
 
diff -Nru firefox-84.0.2+build1/docs/setup/configuring_build_options.rst firefox-85.0+build1/docs/setup/configuring_build_options.rst
--- firefox-84.0.2+build1/docs/setup/configuring_build_options.rst	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docs/setup/configuring_build_options.rst	2021-01-18 19:58:08.000000000 +0000
@@ -244,11 +244,17 @@
 ``ac_add_options --disable-optimize``
    Disables compiler optimization. This makes it much easier to step
    through code in a debugger.
+``ac_add_options --enable-release``
+   Enables more conservative, release engineering-oriented options. This may
+   slow down builds. This also turns on full optimizations for Rust. Note this
+   is the default when building release/beta/esr.
 ``ac_add_options --enable-debug-js-modules``
    Enable only JavaScript assertions. This is useful when working
    locally on JavaScript-powered components like the DevTools. This will
    help catch any errors introduced into the JS code, with less of a
    performance impact compared to the ``--enable-debug`` option.
+``export RUSTC_OPT_LEVEL=2``
+   Enable full optimizations for Rust code.
 
 You can make an optimized build with debugging symbols. See :ref:`Building
 with Debug Symbols <Building with Debug Symbols>`.
diff -Nru firefox-84.0.2+build1/docshell/base/BaseHistory.cpp firefox-85.0+build1/docshell/base/BaseHistory.cpp
--- firefox-84.0.2+build1/docshell/base/BaseHistory.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BaseHistory.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,19 +10,44 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Link.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_layout.h"
 
 namespace mozilla {
 
 using mozilla::dom::ContentParent;
-using mozilla::dom::Document;
-using mozilla::dom::Element;
 using mozilla::dom::Link;
 
 BaseHistory::BaseHistory() : mTrackedURIs(kTrackedUrisInitialSize) {}
 
 BaseHistory::~BaseHistory() = default;
 
+static constexpr nsLiteralCString kDisallowedSchemes[] = {
+    "about"_ns,         "blob"_ns,       "data"_ns,     "chrome"_ns,
+    "imap"_ns,          "javascript"_ns, "mailbox"_ns,  "moz-anno"_ns,
+    "news"_ns,          "page-icon"_ns,  "resource"_ns, "view-source"_ns,
+    "moz-extension"_ns,
+};
+
+bool BaseHistory::CanStore(nsIURI* aURI) {
+  nsAutoCString scheme;
+  if (NS_WARN_IF(NS_FAILED(aURI->GetScheme(scheme)))) {
+    return false;
+  }
+
+  if (!scheme.EqualsLiteral("http") && !scheme.EqualsLiteral("https")) {
+    for (const nsLiteralCString& disallowed : kDisallowedSchemes) {
+      if (scheme.Equals(disallowed)) {
+        return false;
+      }
+    }
+  }
+
+  nsAutoCString spec;
+  aURI->GetSpec(spec);
+  return spec.Length() <= StaticPrefs::browser_history_maxUrlLength();
+}
+
 void BaseHistory::ScheduleVisitedQuery(nsIURI* aURI) {
   mPendingQueries.PutEntry(aURI);
   if (mStartPendingVisitedQueriesScheduled) {
@@ -54,6 +79,13 @@
     MOZ_ASSERT(aLink, "Must pass a non-null Link!");
   }
 
+  if (!CanStore(aURI)) {
+    if (aLink) {
+      aLink->VisitedQueryFinished(/* visited = */ false);
+    }
+    return;
+  }
+
   // Obtain our array of observers for this URI.
   auto entry = mTrackedURIs.LookupForAdd(aURI);
   MOZ_DIAGNOSTIC_ASSERT(!entry || !entry.Data().mLinks.IsEmpty(),
@@ -112,7 +144,9 @@
   // Get the array, and remove the item from it.
   auto entry = mTrackedURIs.Lookup(aURI);
   if (!entry) {
-    MOZ_ASSERT_UNREACHABLE("Trying to unregister URI that wasn't registered!");
+    MOZ_ASSERT(!CanStore(aURI),
+               "Trying to unregister URI that wasn't registered, "
+               "and that could be visited!");
     return;
   }
 
diff -Nru firefox-84.0.2+build1/docshell/base/BaseHistory.h firefox-85.0+build1/docshell/base/BaseHistory.h
--- firefox-84.0.2+build1/docshell/base/BaseHistory.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BaseHistory.h	2021-01-18 19:58:08.000000000 +0000
@@ -18,6 +18,10 @@
   void UnregisterVisitedCallback(nsIURI*, dom::Link*) final;
   void NotifyVisited(nsIURI*, VisitedStatus) final;
 
+  // Some URIs like data-uris are never going to be stored in history, so we can
+  // avoid doing IPC roundtrips for them or what not.
+  static bool CanStore(nsIURI*);
+
  protected:
   void NotifyVisitedInThisProcess(nsIURI*, VisitedStatus);
   void NotifyVisitedFromParent(nsIURI*, VisitedStatus);
diff -Nru firefox-84.0.2+build1/docshell/base/BrowsingContext.cpp firefox-85.0+build1/docshell/base/BrowsingContext.cpp
--- firefox-84.0.2+build1/docshell/base/BrowsingContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BrowsingContext.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,17 @@
 
 #include "ipc/IPCMessageUtils.h"
 
+#ifdef ACCESSIBILITY
+#  include "mozilla/a11y/DocAccessibleParent.h"
+#  include "mozilla/a11y/Platform.h"
+#  include "mozilla/a11y/ProxyAccessibleBase.h"
+#  include "nsAccessibilityService.h"
+#  if defined(XP_WIN)
+#    include "mozilla/a11y/AccessibleWrap.h"
+#    include "mozilla/a11y/Compatibility.h"
+#    include "mozilla/a11y/nsWinUtils.h"
+#  endif
+#endif
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
@@ -50,6 +61,7 @@
 #include "nsIXULRuntime.h"
 
 #include "nsDocShell.h"
+#include "nsDocShellLoadState.h"
 #include "nsFocusManager.h"
 #include "nsGlobalWindowOuter.h"
 #include "nsIObserverService.h"
@@ -85,6 +97,13 @@
                                       mozilla::dom::DisplayMode::Browser,
                                       mozilla::dom::DisplayMode::EndGuard_> {};
 
+template <>
+struct ParamTraits<mozilla::dom::ExplicitActiveStatus>
+    : public ContiguousEnumSerializer<
+          mozilla::dom::ExplicitActiveStatus,
+          mozilla::dom::ExplicitActiveStatus::None,
+          mozilla::dom::ExplicitActiveStatus::EndGuard_> {};
+
 // Allow serialization and deserialization of TouchEventsOverride over IPC
 template <>
 struct ParamTraits<mozilla::dom::TouchEventsOverride>
@@ -326,7 +345,8 @@
   }
 
   nsContentUtils::GenerateUUIDInPlace(fields.mHistoryID);
-  fields.mIsActive = true;
+  fields.mExplicitActive =
+      parentBC ? ExplicitActiveStatus::None : ExplicitActiveStatus::Active;
 
   fields.mFullZoom = parentBC ? parentBC->FullZoom() : 1.0f;
   fields.mTextZoom = parentBC ? parentBC->TextZoom() : 1.0f;
@@ -542,6 +562,38 @@
   js::RemapRemoteWindowProxies(aCx, &cb, aOuter);
 }
 
+bool BrowsingContext::IsActive() const {
+  const BrowsingContext* current = this;
+  do {
+    auto explicit_ = current->GetExplicitActive();
+    if (explicit_ != ExplicitActiveStatus::None) {
+      return explicit_ == ExplicitActiveStatus::Active;
+    }
+    if (current->IsCached()) {
+      return false;
+    }
+  } while ((current = current->GetParent()));
+
+  return false;
+}
+
+bool BrowsingContext::GetIsActiveBrowserWindow() {
+  if (!XRE_IsParentProcess()) {
+    return Top()->GetIsActiveBrowserWindowInternal();
+  }
+
+  // chrome:// urls loaded in the parent won't receive
+  // their own activation so we defer to the top chrome
+  // Browsing Context when in the parent process.
+  RefPtr<CanonicalBrowsingContext> chromeTop =
+      Canonical()->TopCrossChromeBoundary();
+  return chromeTop->GetIsActiveBrowserWindowInternal();
+}
+
+void BrowsingContext::SetIsActiveBrowserWindow(bool aActive) {
+  Unused << SetIsActiveBrowserWindowInternal(aActive);
+}
+
 bool BrowsingContext::FullscreenAllowed() const {
   for (auto* current = this; current; current = current->GetParent()) {
     if (!current->GetFullscreenAllowedByOwner()) {
@@ -664,6 +716,11 @@
       Canonical()->mWebProgress = new BrowsingContextWebProgress();
     }
   }
+
+  if (nsCOMPtr<nsIObserverService> obs = services::GetObserverService()) {
+    obs->NotifyWhenScriptSafe(ToSupports(this), "browsing-context-attached",
+                              nullptr);
+  }
 }
 
 void BrowsingContext::Detach(bool aFromIPC) {
@@ -793,11 +850,11 @@
   MOZ_ASSERT(!mWindowProxy);
 }
 
-bool BrowsingContext::IsCached() {
+bool BrowsingContext::IsCached() const {
   return mParentWindow && mParentWindow->IsCached();
 }
 
-bool BrowsingContext::IsTargetable() {
+bool BrowsingContext::IsTargetable() const {
   return !GetClosed() && !mIsDiscarded && !IsCached();
 }
 
@@ -1788,7 +1845,7 @@
 
   const auto& sourceBC = aLoadState->SourceBrowsingContext();
   bool isActive =
-      sourceBC && sourceBC->GetIsActive() && !GetIsActive() &&
+      sourceBC && sourceBC->IsActive() && !IsActive() &&
       !Preferences::GetBool("browser.tabs.loadDivertedInBackground", false);
   if (mDocShell) {
     nsresult rv = nsDocShell::Cast(mDocShell)->InternalLoad(aLoadState);
@@ -2171,11 +2228,49 @@
              "browsing context");
 }
 
-void BrowsingContext::DidSet(FieldIndex<IDX_IsActive>, bool aOldValue) {
-  if (!IsTop() || aOldValue == GetIsActive()) {
+void BrowsingContext::DidSet(FieldIndex<IDX_ExplicitActive>,
+                             ExplicitActiveStatus aOldValue) {
+  const bool isActive = IsActive();
+  const bool wasActive = [&] {
+    if (aOldValue != ExplicitActiveStatus::None) {
+      return aOldValue == ExplicitActiveStatus::Active;
+    }
+    return GetParent() && GetParent()->IsActive();
+  }();
+
+  if (isActive == wasActive) {
     return;
   }
-  Group()->UpdateToplevelsSuspendedIfNeeded();
+
+  if (IsTop()) {
+    Group()->UpdateToplevelsSuspendedIfNeeded();
+
+#if defined(XP_WIN) && defined(ACCESSIBILITY)
+    if (XRE_IsParentProcess() && a11y::Compatibility::IsDolphin()) {
+      // update active accessible documents on windows
+      if (BrowserParent* bp = Canonical()->GetBrowserParent()) {
+        if (a11y::DocAccessibleParent* tabDoc =
+                bp->GetTopLevelDocAccessible()) {
+          HWND window = tabDoc->GetEmulatedWindowHandle();
+          MOZ_ASSERT(window);
+          if (window) {
+            if (isActive) {
+              a11y::nsWinUtils::ShowNativeWindow(window);
+            } else {
+              a11y::nsWinUtils::HideNativeWindow(window);
+            }
+          }
+        }
+      }
+    }
+#endif
+  }
+
+  PreOrderWalk([&](BrowsingContext* aContext) {
+    if (nsCOMPtr<nsIDocShell> ds = aContext->GetDocShell()) {
+      nsDocShell::Cast(ds)->ActivenessMaybeChanged();
+    }
+  });
 }
 
 bool BrowsingContext::CanSet(FieldIndex<IDX_HasMainMediaController>,
@@ -2199,7 +2294,7 @@
   // media controller. Having a main controller in context means it might be
   // playing media, or waiting media keys to control media (could be not playing
   // anything currently)
-  return !GetIsActive() && !GetHasMainMediaController();
+  return !IsActive() && !GetHasMainMediaController();
 }
 
 bool BrowsingContext::CanSet(
@@ -2306,6 +2401,36 @@
   return true;
 }
 
+bool BrowsingContext::CanSet(FieldIndex<IDX_IsActiveBrowserWindowInternal>,
+                             const bool& aValue, ContentParent* aSource) {
+  // Should only be set in the parent process.
+  return XRE_IsParentProcess() && !aSource && IsTop();
+}
+
+void BrowsingContext::DidSet(FieldIndex<IDX_IsActiveBrowserWindowInternal>,
+                             bool aOldValue) {
+  bool isActivateEvent = GetIsActiveBrowserWindowInternal();
+  // The browser window containing this context has changed
+  // activation state so update window inactive document states
+  // for all in-process documents.
+  PreOrderWalk([isActivateEvent](BrowsingContext* aContext) {
+    if (RefPtr<Document> doc = aContext->GetExtantDocument()) {
+      doc->UpdateDocumentStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE, true);
+
+      if (XRE_IsContentProcess() &&
+          (!aContext->GetParent() || !aContext->GetParent()->IsInProcess())) {
+        // Send the inner window an activate/deactivate event if
+        // the context is the top of a sub-tree of in-process
+        // contexts.
+        nsContentUtils::DispatchEventOnlyToChrome(
+            doc, doc->GetWindow()->GetCurrentInnerWindow(),
+            isActivateEvent ? u"activate"_ns : u"deactivate"_ns,
+            CanBubble::eYes, Cancelable::eYes, nullptr);
+      }
+    }
+  });
+}
+
 bool BrowsingContext::CanSet(FieldIndex<IDX_AllowContentRetargeting>,
                              const bool& aAllowContentRetargeting,
                              ContentParent* aSource) {
@@ -2335,8 +2460,8 @@
   return CheckOnlyEmbedderCanSet(aSource);
 }
 
-mozilla::dom::TouchEventsOverride BrowsingContext::TouchEventsOverride() {
-  BrowsingContext* bc = this;
+mozilla::dom::TouchEventsOverride BrowsingContext::TouchEventsOverride() const {
+  const BrowsingContext* bc = this;
   while (bc) {
     mozilla::dom::TouchEventsOverride tev =
         bc->GetTouchEventsOverrideInternal();
@@ -2352,19 +2477,6 @@
 
 void BrowsingContext::SetTouchEventsOverride(
     const enum TouchEventsOverride aTouchEventsOverride, ErrorResult& aRv) {
-  // Clear overrides from descendents first.
-  for (BrowsingContext* child : Children()) {
-    child->PreOrderWalk([](BrowsingContext* aContext) {
-      if (aContext->GetTouchEventsOverrideInternal() !=
-          mozilla::dom::TouchEventsOverride::None) {
-        // Ignore failed sets because the override of a discarded
-        // descendent shouldn't matter.
-        Unused << aContext->SetTouchEventsOverrideInternal(
-            mozilla::dom::TouchEventsOverride::None);
-      }
-    });
-  }
-
   SetTouchEventsOverrideInternal(aTouchEventsOverride, aRv);
 }
 
@@ -2860,15 +2972,17 @@
 }
 
 void BrowsingContext::HistoryGo(int32_t aOffset, uint64_t aHistoryEpoch,
+                                bool aRequireUserInteraction,
                                 std::function<void(int32_t&&)>&& aResolver) {
   if (XRE_IsContentProcess()) {
     ContentChild::GetSingleton()->SendHistoryGo(
-        this, aOffset, aHistoryEpoch, std::move(aResolver),
+        this, aOffset, aHistoryEpoch, aRequireUserInteraction,
+        std::move(aResolver),
         [](mozilla::ipc::
                ResponseRejectReason) { /* FIXME Is ignoring this fine? */ });
   } else {
     Canonical()->HistoryGo(
-        aOffset, aHistoryEpoch,
+        aOffset, aHistoryEpoch, aRequireUserInteraction,
         Canonical()->GetContentParent()
             ? Some(Canonical()->GetContentParent()->ChildID())
             : Nothing(),
diff -Nru firefox-84.0.2+build1/docshell/base/BrowsingContextGroup.cpp firefox-85.0+build1/docshell/base/BrowsingContextGroup.cpp
--- firefox-84.0.2+build1/docshell/base/BrowsingContextGroup.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BrowsingContextGroup.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -228,10 +228,16 @@
   mDestroyed = true;
 #endif
 
-  mHosts.Clear();
+  // Make sure to call `RemoveBrowsingContextGroup` for every entry in both
+  // `mHosts` and `mSubscribers`. This will visit most entries twice, but
+  // `RemoveBrowsingContextGroup` is safe to call multiple times.
+  for (auto& entry : mHosts) {
+    entry.GetData()->RemoveBrowsingContextGroup(this);
+  }
   for (auto& entry : mSubscribers) {
     entry.GetKey()->RemoveBrowsingContextGroup(this);
   }
+  mHosts.Clear();
   mSubscribers.Clear();
 
   if (sBrowsingContextGroups) {
diff -Nru firefox-84.0.2+build1/docshell/base/BrowsingContext.h firefox-85.0+build1/docshell/base/BrowsingContext.h
--- firefox-84.0.2+build1/docshell/base/BrowsingContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BrowsingContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,13 +8,13 @@
 #define mozilla_dom_BrowsingContext_h
 
 #include "GVAutoplayRequestUtils.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/HalScreenConfiguration.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/Span.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/LocationBase.h"
@@ -74,6 +74,13 @@
 struct WindowPostMessageOptions;
 class WindowProxyHolder;
 
+enum class ExplicitActiveStatus : uint8_t {
+  None,
+  Active,
+  Inactive,
+  EndGuard_,
+};
+
 // Fields are, by default, settable by any process and readable by any process.
 // Racy sets will be resolved as-if they occurred in the order the parent
 // process finds out about them.
@@ -89,13 +96,17 @@
 #define MOZ_EACH_BC_FIELD(FIELD)                                             \
   FIELD(Name, nsString)                                                      \
   FIELD(Closed, bool)                                                        \
-  FIELD(IsActive, bool)                                                      \
+  FIELD(ExplicitActive, ExplicitActiveStatus)                                \
   /* Top()-only. If true, new-playing media will be suspended when in an     \
    * inactive browsing context. */                                           \
   FIELD(SuspendMediaWhenInactive, bool)                                      \
   /* If true, we're within the nested event loop in window.open, and this    \
    * context may not be used as the target of a load */                      \
   FIELD(PendingInitialization, bool)                                         \
+  /* Indicates if the browser window is active for the purpose of the        \
+   * :-moz-window-inactive pseudoclass. Only read from or set on the         \
+   * top BrowsingContext. */                                                 \
+  FIELD(IsActiveBrowserWindowInternal, bool)                                 \
   FIELD(OpenerPolicy, nsILoadInfo::CrossOriginOpenerPolicy)                  \
   /* Current opener for the BrowsingContext. Weak reference */               \
   FIELD(OpenerId, uint64_t)                                                  \
@@ -105,15 +116,13 @@
   FIELD(CurrentInnerWindowId, uint64_t)                                      \
   FIELD(HadOriginalOpener, bool)                                             \
   FIELD(IsPopupSpam, bool)                                                   \
-  /* Controls whether the BrowsingContext is currently considered to be      \
-   * activated by a gesture */                                               \
-  FIELD(UserActivationState, UserActivation::State)                          \
   /* Hold the audio muted state and should be used on top level browsing     \
    * contexts only */                                                        \
   FIELD(Muted, bool)                                                         \
   FIELD(FeaturePolicy, RefPtr<mozilla::dom::FeaturePolicy>)                  \
   /* See nsSandboxFlags.h for the possible flags. */                         \
   FIELD(SandboxFlags, uint32_t)                                              \
+  FIELD(InitialSandboxFlags, uint32_t)                                       \
   /* A non-zero unique identifier for the browser element that is hosting    \
    * this                                                                    \
    * BrowsingContext tree. Every BrowsingContext in the element's tree will  \
@@ -287,6 +296,9 @@
   Document* GetDocument() const {
     return mDocShell ? mDocShell->GetDocument() : nullptr;
   }
+  Document* GetExtantDocument() const {
+    return mDocShell ? mDocShell->GetExtantDocument() : nullptr;
+  }
 
   // This cleans up remote outer window proxies that might have been left behind
   // when the browsing context went from being remote to local. It does this by
@@ -340,11 +352,11 @@
   void DisplayLoadError(const nsAString& aURI);
 
   // Determine if the current BrowsingContext is in the BFCache.
-  bool IsCached();
+  bool IsCached() const;
 
   // Check that this browsing context is targetable for navigations (i.e. that
   // it is neither closed, cached, nor discarded).
-  bool IsTargetable();
+  bool IsTargetable() const;
 
   // True if this browsing context is inactive and is able to be suspended.
   bool InactiveForSuspend() const;
@@ -463,7 +475,7 @@
   bool WatchedByDevTools();
   void SetWatchedByDevTools(bool aWatchedByDevTools, ErrorResult& aRv);
 
-  mozilla::dom::TouchEventsOverride TouchEventsOverride();
+  mozilla::dom::TouchEventsOverride TouchEventsOverride() const;
   void SetTouchEventsOverride(
       const enum TouchEventsOverride aTouchEventsOverride, ErrorResult& aRv);
   MOZ_MUST_USE nsresult
@@ -478,12 +490,23 @@
     return GetSuspendMediaWhenInactive();
   }
 
+  bool IsActive() const;
+  void SetIsActive(bool aIsActive, mozilla::ErrorResult& aRv) {
+    SetExplicitActive(aIsActive ? ExplicitActiveStatus::Active
+                                : ExplicitActiveStatus::Inactive,
+                      aRv);
+  }
+
   bool AuthorStyleDisabledDefault() const {
     return GetAuthorStyleDisabledDefault();
   }
 
   bool UseGlobalHistory() const { return GetUseGlobalHistory(); }
 
+  bool GetIsActiveBrowserWindow();
+
+  void SetIsActiveBrowserWindow(bool aActive);
+
   uint64_t BrowserId() const { return GetBrowserId(); }
 
   bool IsLoading();
@@ -733,6 +756,7 @@
   GetTriggeringAndInheritPrincipalsForCurrentLoad();
 
   void HistoryGo(int32_t aOffset, uint64_t aHistoryEpoch,
+                 bool aRequireUserInteraction,
                  std::function<void(int32_t&&)>&& aResolver);
 
   bool ShouldUpdateSessionHistory(uint32_t aLoadType);
@@ -849,7 +873,11 @@
               ContentParent* aSource);
   void DidSet(FieldIndex<IDX_DisplayMode>, enum DisplayMode aOldValue);
 
-  void DidSet(FieldIndex<IDX_IsActive>, bool aOldValue);
+  void DidSet(FieldIndex<IDX_ExplicitActive>, ExplicitActiveStatus aOldValue);
+
+  bool CanSet(FieldIndex<IDX_IsActiveBrowserWindowInternal>, const bool& aValue,
+              ContentParent* aSource);
+  void DidSet(FieldIndex<IDX_IsActiveBrowserWindowInternal>, bool aOldValue);
 
   // Ensure that we only set the flag on the top level browsingContext.
   // And then, we do a pre-order walk in the tree to refresh the
diff -Nru firefox-84.0.2+build1/docshell/base/BrowsingContextWebProgress.cpp firefox-85.0+build1/docshell/base/BrowsingContextWebProgress.cpp
--- firefox-84.0.2+build1/docshell/base/BrowsingContextWebProgress.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BrowsingContextWebProgress.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -104,6 +104,44 @@
                                           nsIRequest* aRequest,
                                           uint32_t aStateFlags,
                                           nsresult aStatus) {
+  const uint32_t startDocumentFlags =
+      nsIWebProgressListener::STATE_START |
+      nsIWebProgressListener::STATE_IS_DOCUMENT |
+      nsIWebProgressListener::STATE_IS_REQUEST |
+      nsIWebProgressListener::STATE_IS_WINDOW |
+      nsIWebProgressListener::STATE_IS_NETWORK;
+  bool isTopLevel = false;
+  nsresult rv = aWebProgress->GetIsTopLevel(&isTopLevel);
+  NS_ENSURE_SUCCESS(rv, rv);
+  bool isTopLevelStartDocumentEvent =
+      (aStateFlags & startDocumentFlags) == startDocumentFlags && isTopLevel;
+  // If we receive a matching STATE_START for a top-level document event,
+  // and we are currently not suspending this event, start suspending all
+  // further matching STATE_START events after this one.
+  if (isTopLevelStartDocumentEvent && !mSuspendOnStateStartChangeEvents) {
+    mSuspendOnStateStartChangeEvents = true;
+  } else if (mSuspendOnStateStartChangeEvents) {
+    // If we are currently suspending matching STATE_START events, check if this
+    // is a corresponding STATE_STOP event.
+    const uint32_t stopWindowFlags = nsIWebProgressListener::STATE_STOP |
+                                     nsIWebProgressListener::STATE_IS_WINDOW;
+    bool isTopLevelStopWindowEvent =
+        (aStateFlags & stopWindowFlags) == stopWindowFlags && isTopLevel;
+    if (isTopLevelStopWindowEvent) {
+      // If this is a STATE_STOP event corresponding to the initial STATE_START
+      // event, stop suspending matching STATE_START events.
+      mSuspendOnStateStartChangeEvents = false;
+    } else if (isTopLevelStartDocumentEvent) {
+      // We have received a matching STATE_START event at least twice, but
+      // haven't received the corresponding STATE_STOP event for the first one.
+      // Don't let this event through. This is probably a duplicate event from
+      // the new BrowserParent due to a process switch.
+      return NS_OK;
+    }
+    // Allow all other progress events that don't match top-level start document
+    // flags.
+  }
+
   UpdateAndNotifyListeners(
       ((aStateFlags >> 16) & nsIWebProgress::NOTIFY_STATE_ALL),
       [&](nsIWebProgressListener* listener) {
diff -Nru firefox-84.0.2+build1/docshell/base/BrowsingContextWebProgress.h firefox-85.0+build1/docshell/base/BrowsingContextWebProgress.h
--- firefox-84.0.2+build1/docshell/base/BrowsingContextWebProgress.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/BrowsingContextWebProgress.h	2021-01-18 19:58:09.000000000 +0000
@@ -49,6 +49,17 @@
 
   using ListenerArray = nsAutoTObserverArray<ListenerInfo, 4>;
   ListenerArray mListenerInfoList;
+
+  // This indicates whether we are currently suspending onStateChange top level
+  // STATE_START events for a document. We start suspending whenever we receive
+  // the first STATE_START event with the matching flags (see
+  // ::RecvOnStateChange for details), until we get a corresponding STATE_STOP
+  // event. In the meantime, if there other onStateChange events, this flag does
+  // not affect them. We do this to avoid duplicate onStateChange STATE_START
+  // events that happen during process switch. With this flag, we allow
+  // onStateChange STATE_START event from the old BrowserParent, but not the
+  // same event from the new BrowserParent during a process switch.
+  bool mSuspendOnStateStartChangeEvents = false;
 };
 
 }  // namespace dom
diff -Nru firefox-84.0.2+build1/docshell/base/CanonicalBrowsingContext.cpp firefox-85.0+build1/docshell/base/CanonicalBrowsingContext.cpp
--- firefox-84.0.2+build1/docshell/base/CanonicalBrowsingContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/CanonicalBrowsingContext.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -158,6 +158,7 @@
 void CanonicalBrowsingContext::ReplacedBy(
     CanonicalBrowsingContext* aNewContext) {
   MOZ_ASSERT(!aNewContext->EverAttached());
+  MOZ_ASSERT(IsTop() && aNewContext->IsTop());
   if (mStatusFilter) {
     mStatusFilter->RemoveProgressListener(mWebProgress);
     mStatusFilter = nullptr;
@@ -173,6 +174,10 @@
     aNewContext->SetChildSHistory(childSHistory);
   }
 
+  if (mozilla::SessionHistoryInParent()) {
+    BackgroundSessionStorageManager::PropagateManager(Id(), aNewContext->Id());
+  }
+
   MOZ_ASSERT(aNewContext->mLoadingEntries.IsEmpty());
   mLoadingEntries.SwapElements(aNewContext->mLoadingEntries);
   MOZ_ASSERT(!aNewContext->mActiveEntry);
@@ -263,12 +268,18 @@
   return nullptr;
 }
 
-Nullable<WindowProxyHolder> CanonicalBrowsingContext::GetTopChromeWindow() {
+already_AddRefed<CanonicalBrowsingContext>
+CanonicalBrowsingContext::TopCrossChromeBoundary() {
   RefPtr<CanonicalBrowsingContext> bc(this);
   while (RefPtr<CanonicalBrowsingContext> parent =
              bc->GetParentCrossChromeBoundary()) {
     bc = parent.forget();
   }
+  return bc.forget();
+}
+
+Nullable<WindowProxyHolder> CanonicalBrowsingContext::GetTopChromeWindow() {
+  RefPtr<CanonicalBrowsingContext> bc = TopCrossChromeBoundary();
   if (bc->IsChrome()) {
     return WindowProxyHolder(bc.forget());
   }
@@ -428,6 +439,34 @@
   return MakeUnique<LoadingSessionHistoryInfo>(newEntry, aInfo->mLoadId);
 }
 
+void CanonicalBrowsingContext::CallOnAllTopDescendants(
+    const std::function<mozilla::CallState(CanonicalBrowsingContext*)>&
+        aCallback) {
+#ifdef DEBUG
+  RefPtr<CanonicalBrowsingContext> parent = GetParentCrossChromeBoundary();
+  MOZ_ASSERT(!parent, "Should only call on top chrome BC");
+#endif
+
+  nsTArray<RefPtr<BrowsingContextGroup>> groups;
+  BrowsingContextGroup::GetAllGroups(groups);
+  for (auto& browsingContextGroup : groups) {
+    for (auto& bc : browsingContextGroup->Toplevels()) {
+      if (bc == this) {
+        // Cannot be a descendent of myself so skip.
+        continue;
+      }
+
+      RefPtr<CanonicalBrowsingContext> top =
+          bc->Canonical()->TopCrossChromeBoundary();
+      if (top == this) {
+        if (aCallback(bc->Canonical()) == CallState::Stop) {
+          return;
+        }
+      }
+    }
+  }
+}
+
 void CanonicalBrowsingContext::SessionHistoryCommit(uint64_t aLoadId,
                                                     const nsID& aChangeID,
                                                     uint32_t aLoadType) {
@@ -535,6 +574,8 @@
         }
       }
 
+      ResetSHEntryHasUserInteractionCache();
+
       HistoryCommitIndexAndLength(aChangeID, caller);
 
       return;
@@ -650,6 +691,9 @@
           UseRemoteSubframes());
     }
   }
+
+  ResetSHEntryHasUserInteractionCache();
+
   // FIXME Need to do the equivalent of EvictContentViewersOrReplaceEntry.
   HistoryCommitIndexAndLength(aChangeID, caller);
 }
@@ -667,6 +711,9 @@
     shistory->NotifyOnHistoryReplaceEntry();
     shistory->UpdateRootBrowsingContextState();
   }
+
+  ResetSHEntryHasUserInteractionCache();
+
   // FIXME Need to do the equivalent of EvictContentViewersOrReplaceEntry.
 }
 
@@ -702,8 +749,15 @@
 }
 
 void CanonicalBrowsingContext::HistoryGo(
-    int32_t aOffset, uint64_t aHistoryEpoch, Maybe<ContentParentId> aContentId,
+    int32_t aOffset, uint64_t aHistoryEpoch, bool aRequireUserInteraction,
+    Maybe<ContentParentId> aContentId,
     std::function<void(int32_t&&)>&& aResolver) {
+  if (aRequireUserInteraction && aOffset != -1 && aOffset != 1) {
+    NS_ERROR(
+        "aRequireUserInteraction may only be used with an offset of -1 or 1");
+    return;
+  }
+
   nsSHistory* shistory = static_cast<nsSHistory*>(GetSessionHistory());
   if (!shistory) {
     return;
@@ -716,13 +770,25 @@
           ("HistoryGo(%d->%d) epoch %" PRIu64 "/id %" PRIu64, aOffset,
            (index + aOffset).value(), aHistoryEpoch,
            (uint64_t)(aContentId.isSome() ? aContentId.value() : 0)));
-  index += aOffset;
-  if (!index.isValid()) {
-    MOZ_LOG(gSHLog, LogLevel::Debug, ("Invalid index"));
-    return;
-  }
 
-  // FIXME userinteraction bits may needs tweaks here.
+  while (true) {
+    index += aOffset;
+    if (!index.isValid()) {
+      MOZ_LOG(gSHLog, LogLevel::Debug, ("Invalid index"));
+      return;
+    }
+
+    // Check for user interaction if desired, except for the first and last
+    // history entries. We compare with >= to account for the case where
+    // aOffset >= length.
+    if (!aRequireUserInteraction || index.value() >= shistory->Length() - 1 ||
+        index.value() <= 0) {
+      break;
+    }
+    if (shistory->HasUserInteractionAtIndex(index.value())) {
+      break;
+    }
+  }
 
   // Implement aborting additional history navigations from within the same
   // event spin of the content process.
@@ -1253,6 +1319,13 @@
              "should've already been Cancel() or Complete()-ed");
 }
 
+BrowserParent* CanonicalBrowsingContext::GetBrowserParent() const {
+  if (auto* wg = GetCurrentWindowGlobal()) {
+    return wg->GetBrowserParent();
+  }
+  return nullptr;
+}
+
 RefPtr<CanonicalBrowsingContext::RemotenessPromise>
 CanonicalBrowsingContext::ChangeRemoteness(const nsACString& aRemoteType,
                                            uint64_t aPendingSwitchId,
@@ -1303,7 +1376,7 @@
       embedderWindowGlobal->GetBrowserParent();
   // Switching to local. No new process, so perform switch sync.
   if (embedderBrowser &&
-      aRemoteType.Equals(embedderBrowser->Manager()->GetRemoteType())) {
+      aRemoteType == embedderBrowser->Manager()->GetRemoteType()) {
     MOZ_DIAGNOSTIC_ASSERT(
         aPendingSwitchId,
         "We always have a PendingSwitchId, except for print-preview loads, "
@@ -1505,6 +1578,12 @@
     return false;
   }
 
+  // Session-history-in-parent implementation relies currently on getting a
+  // round trip through a child process.
+  if (aLoadState->LoadIsFromSessionHistory()) {
+    return false;
+  }
+
   // If we successfully open the DocumentChannel, then it'll register
   // itself using aLoadIdentifier and be kept alive until it completes
   // loading.
@@ -1539,6 +1618,13 @@
   }
 }
 
+void CanonicalBrowsingContext::ResetSHEntryHasUserInteractionCache() {
+  WindowContext* topWc = GetTopWindowContext();
+  if (topWc && !topWc->IsDiscarded()) {
+    MOZ_ALWAYS_SUCCEEDS(topWc->SetSHEntryHasUserInteraction(false));
+  }
+}
+
 void CanonicalBrowsingContext::HistoryCommitIndexAndLength() {
   nsID changeID = {};
   CallerWillNotifyHistoryIndexAndLengthChanges caller(nullptr);
diff -Nru firefox-84.0.2+build1/docshell/base/CanonicalBrowsingContext.h firefox-85.0+build1/docshell/base/CanonicalBrowsingContext.h
--- firefox-84.0.2+build1/docshell/base/CanonicalBrowsingContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/CanonicalBrowsingContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -21,12 +21,15 @@
 #include "nsISecureBrowserUI.h"
 
 class nsISHistory;
+class nsIWidget;
 class nsSHistory;
 class nsBrowserStatusFilter;
 class nsSecureBrowserUI;
 class CallerWillNotifyHistoryIndexAndLengthChanges;
 
 namespace mozilla {
+enum class CallState;
+
 namespace net {
 class DocumentLoadListener;
 }
@@ -102,6 +105,7 @@
 
   already_AddRefed<CanonicalBrowsingContext> GetParentCrossChromeBoundary();
 
+  already_AddRefed<CanonicalBrowsingContext> TopCrossChromeBoundary();
   Nullable<WindowProxyHolder> GetTopChromeWindow();
 
   nsISHistory* GetSessionHistory();
@@ -113,6 +117,13 @@
   UniquePtr<LoadingSessionHistoryInfo> ReplaceLoadingSessionHistoryEntryForLoad(
       LoadingSessionHistoryInfo* aInfo, nsIChannel* aChannel);
 
+  // Call the given callback on all top-level descendant BrowsingContexts.
+  // Return Callstate::Stop from the callback to stop calling
+  // further children.
+  void CallOnAllTopDescendants(
+      const std::function<mozilla::CallState(CanonicalBrowsingContext*)>&
+          aCallback);
+
   void SessionHistoryCommit(uint64_t aLoadId, const nsID& aChangeID,
                             uint32_t aLoadType);
 
@@ -140,6 +151,7 @@
   void RemoveFromSessionHistory();
 
   void HistoryGo(int32_t aIndex, uint64_t aHistoryEpoch,
+                 bool aRequireUserInteraction,
                  Maybe<ContentParentId> aContentId,
                  std::function<void(int32_t&&)>&& aResolver);
 
@@ -184,6 +196,8 @@
   void Reload(uint32_t aReloadFlags);
   void Stop(uint32_t aStopFlags);
 
+  BrowserParent* GetBrowserParent() const;
+
   // Internal method to change which process a BrowsingContext is being loaded
   // in. The returned promise will resolve when the process switch is completed.
   //
@@ -324,6 +338,12 @@
 
   uint64_t mCrossGroupOpenerId = 0;
 
+  // This function will make the top window context reset its
+  // "SHEntryHasUserInteraction" cache that prevents documents from repeatedly
+  // setting user interaction on SH entries. Should be called anytime SH
+  // entries are added or replaced.
+  void ResetSHEntryHasUserInteractionCache();
+
   // The current remoteness change which is in a pending state.
   RefPtr<PendingRemotenessChange> mPendingRemotenessChange;
 
diff -Nru firefox-84.0.2+build1/docshell/base/LoadContext.h firefox-85.0+build1/docshell/base/LoadContext.h
--- firefox-84.0.2+build1/docshell/base/LoadContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/LoadContext.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,10 +11,13 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/BasePrincipal.h"
 #include "nsIWeakReferenceUtils.h"
-#include "mozilla/dom/Element.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 
+namespace mozilla::dom {
+class Element;
+}
+
 namespace mozilla {
 
 /**
diff -Nru firefox-84.0.2+build1/docshell/base/nsDocShell.cpp firefox-85.0+build1/docshell/base/nsDocShell.cpp
--- firefox-84.0.2+build1/docshell/base/nsDocShell.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsDocShell.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -28,10 +28,12 @@
 #include "mozilla/LoadInfo.h"
 #include "mozilla/Logging.h"
 #include "mozilla/MediaFeatureChange.h"
+#include "mozilla/ObservedDocShell.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ScrollTypes.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_browser.h"
@@ -118,6 +120,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsILayoutHistoryState.h"
 #include "nsILoadInfo.h"
+#include "nsILoadURIDelegate.h"
 #include "nsIMultiPartChannel.h"
 #include "nsINestedURI.h"
 #include "nsINetworkPredictor.h"
@@ -244,10 +247,6 @@
 #  include "nsIWebBrowserPrint.h"
 #endif
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::net;
@@ -352,7 +351,7 @@
     return true;
   }
 
-  return aBrowsingContext->GetIsActive();
+  return aBrowsingContext->IsActive();
 }
 
 nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
@@ -1219,7 +1218,7 @@
   }
 
   mTiming->NotifyNavigationStart(
-      mBrowsingContext->GetIsActive()
+      mBrowsingContext->IsActive()
           ? nsDOMNavigationTiming::DocShellState::eActive
           : nsDOMNavigationTiming::DocShellState::eInactive);
 
@@ -2588,9 +2587,6 @@
         NS_SUCCEEDED(parentAsDocShell->GetAllowWindowControl(&value))) {
       SetAllowWindowControl(value);
     }
-    if (NS_SUCCEEDED(parentAsDocShell->GetIsActive(&value))) {
-      SetIsActive(value);
-    }
     if (NS_FAILED(parentAsDocShell->GetAllowDNSPrefetch(&value))) {
       value = false;
     }
@@ -3331,7 +3327,7 @@
   NS_ENSURE_TRUE(rootSH, NS_ERROR_FAILURE);
 
   ErrorResult rv;
-  rootSH->GotoIndex(aIndex, aIndex - rootSH->Index(), rv);
+  rootSH->GotoIndex(aIndex, aIndex - rootSH->Index(), false, rv);
   return rv.StealNSResult();
 }
 
@@ -4777,28 +4773,21 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDocShell::SetIsActive(bool aIsActive) {
-  // Keep track ourselves.
-  // Changing the activeness on a discarded browsing context has no effect.
-  Unused << mBrowsingContext->SetIsActive(aIsActive);
-
-  // Tell the PresShell about it.
+void nsDocShell::ActivenessMaybeChanged() {
+  bool isActive = mBrowsingContext->IsActive();
   if (RefPtr<PresShell> presShell = GetPresShell()) {
-    presShell->SetIsActive(aIsActive);
+    presShell->SetIsActive(isActive);
   }
 
   // Tell the window about it
   if (mScriptGlobal) {
-    mScriptGlobal->SetIsBackground(!aIsActive);
+    mScriptGlobal->SetIsBackground(!isActive);
     if (RefPtr<Document> doc = mScriptGlobal->GetExtantDoc()) {
       // Update orientation when the top-level browsing context becomes active.
-      if (aIsActive) {
-        if (mBrowsingContext->IsTop()) {
-          // We only care about the top-level browsing context.
-          uint16_t orientation = mBrowsingContext->GetOrientationLock();
-          ScreenOrientation::UpdateActiveOrientationLock(orientation);
-        }
+      if (isActive && mBrowsingContext->IsTop()) {
+        // We only care about the top-level browsing context.
+        uint16_t orientation = mBrowsingContext->GetOrientationLock();
+        ScreenOrientation::UpdateActiveOrientationLock(orientation);
       }
 
       doc->PostVisibilityUpdateEvent();
@@ -4814,37 +4803,18 @@
   }
   if (timing) {
     timing->NotifyDocShellStateChanged(
-        aIsActive ? nsDOMNavigationTiming::DocShellState::eActive
-                  : nsDOMNavigationTiming::DocShellState::eInactive);
-  }
-
-  // Recursively tell all of our children, but don't tell <iframe mozbrowser>
-  // children; they handle their state separately.
-  for (auto* child : mChildList.ForwardRange()) {
-    nsCOMPtr<nsIDocShell> docshell = do_QueryObject(child);
-    if (!docshell) {
-      continue;
-    }
-
-    docshell->SetIsActive(aIsActive);
+        isActive ? nsDOMNavigationTiming::DocShellState::eActive
+                 : nsDOMNavigationTiming::DocShellState::eInactive);
   }
 
   // Restart or stop meta refresh timers if necessary
   if (mDisableMetaRefreshWhenInactive) {
-    if (mBrowsingContext->GetIsActive()) {
+    if (isActive) {
       ResumeRefreshURIs();
     } else {
       SuspendRefreshURIs();
     }
   }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocShell::GetIsActive(bool* aIsActive) {
-  *aIsActive = mBrowsingContext->GetIsActive();
-  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -5111,7 +5081,7 @@
   }
 
   if (busyFlags & BUSY_FLAGS_BUSY ||
-      (!mBrowsingContext->GetIsActive() && mDisableMetaRefreshWhenInactive)) {
+      (!mBrowsingContext->IsActive() && mDisableMetaRefreshWhenInactive)) {
     // We don't  want to create the timer right now. Instead queue up the
     // request and trigger the timer in EndPageLoad() or whenever we become
     // active.
@@ -6452,7 +6422,7 @@
 
   // if there's a refresh header in the channel, this method
   // will set it up for us.
-  if (mBrowsingContext->GetIsActive() || !mDisableMetaRefreshWhenInactive)
+  if (mBrowsingContext->IsActive() || !mDisableMetaRefreshWhenInactive)
     RefreshURIFromQueue();
 
   // Test whether this is the top frame or a subframe
@@ -6656,7 +6626,10 @@
 
   if (docFactory) {
     nsCOMPtr<nsIPrincipal> principal, partitionedPrincipal;
-    uint32_t sandboxFlags = mBrowsingContext->GetSandboxFlags();
+    const uint32_t sandboxFlags =
+        mBrowsingContext->GetHasLoadedNonInitialDocument()
+            ? mBrowsingContext->GetSandboxFlags()
+            : mBrowsingContext->GetInitialSandboxFlags();
     // If we're sandboxed, then create a new null principal. We skip
     // this if we're being created from WindowGlobalChild, since in
     // that case we already have a null principal if required.
@@ -6842,6 +6815,38 @@
 }
 
 void nsDocShell::ReportBFCacheComboTelemetry(uint16_t aCombo) {
+  // There are 11 possible reasons to make a request fails to use BFCache
+  // (see BFCacheStatus in dom/base/Document.h), and we'd like to record
+  // the common combinations for reasons which make requests fail to use
+  // BFCache. These combinations are generated based on some local browsings,
+  // we need to adjust them when necessary.
+  enum BFCacheStatusCombo : uint16_t {
+    BFCACHE_SUCCESS,
+    SUCCESS_NOT_ONLY_TOPLEVEL =
+        mozilla::dom::BFCacheStatus::NOT_ONLY_TOPLEVEL_IN_BCG,
+    UNLOAD = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER,
+    UNLOAD_REQUEST = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
+                     mozilla::dom::BFCacheStatus::REQUEST,
+    REQUEST = mozilla::dom::BFCacheStatus::REQUEST,
+    UNLOAD_REQUEST_PEER = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
+                          mozilla::dom::BFCacheStatus::REQUEST |
+                          mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
+    UNLOAD_REQUEST_PEER_MSE =
+        mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
+        mozilla::dom::BFCacheStatus::REQUEST |
+        mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION |
+        mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
+    UNLOAD_REQUEST_MSE = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
+                         mozilla::dom::BFCacheStatus::REQUEST |
+                         mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
+    SUSPENDED_UNLOAD_REQUEST_PEER =
+        mozilla::dom::BFCacheStatus::SUSPENDED |
+        mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
+        mozilla::dom::BFCacheStatus::REQUEST |
+        mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
+    REMOTE_SUBFRAMES = mozilla::dom::BFCacheStatus::CONTAINS_REMOTE_SUBFRAMES
+  };
+
   switch (aCombo) {
     case BFCACHE_SUCCESS:
       Telemetry::AccumulateCategorical(
@@ -8221,14 +8226,11 @@
 //*****************************************************************************
 
 void nsDocShell::CopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
-                             nsIPrincipal* aLoadingPrincipal,
                              bool aInPrivateBrowsing) {
   if (XRE_IsContentProcess()) {
     dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
     if (contentChild) {
-      contentChild->SendCopyFavicon(aOldURI, aNewURI,
-                                    IPC::Principal(aLoadingPrincipal),
-                                    aInPrivateBrowsing);
+      contentChild->SendCopyFavicon(aOldURI, aNewURI, aInPrivateBrowsing);
     }
     return;
   }
@@ -8944,8 +8946,7 @@
 
   // Inform the favicon service that the favicon for oldURI also
   // applies to aLoadState->URI().
-  CopyFavicon(currentURI, aLoadState->URI(), doc->NodePrincipal(),
-              UsePrivateBrowsing());
+  CopyFavicon(currentURI, aLoadState->URI(), UsePrivateBrowsing());
 
   RefPtr<nsGlobalWindowOuter> scriptGlobal = mScriptGlobal;
   RefPtr<nsGlobalWindowInner> win =
@@ -9239,7 +9240,7 @@
     MOZ_ASSERT(mBrowsingContext->IsTop());
     MOZ_ALWAYS_SUCCEEDS(
         mBrowsingContext->SetOrientationLock(hal::eScreenOrientation_None));
-    if (mBrowsingContext->GetIsActive()) {
+    if (mBrowsingContext->IsActive()) {
       ScreenOrientation::UpdateActiveOrientationLock(
           hal::eScreenOrientation_None);
     }
@@ -9908,33 +9909,60 @@
                           nsIProtocolHandler::URI_DOES_NOT_RETURN_DATA,
                           &doesNotReturnData);
       if (doesNotReturnData) {
-        bool popupBlocked = true;
+        WindowContext* parentContext =
+            mBrowsingContext->GetParentWindowContext();
+        MOZ_ASSERT(parentContext);
+        const bool popupBlocked = [&] {
+          const bool active = mBrowsingContext->IsActive();
 
-        // Let's consider external protocols as popups and let's check if the
-        // page is allowed to open them without abuse regardless of allowed
-        // events
-        if (PopupBlocker::GetPopupControlState() <= PopupBlocker::openBlocked) {
-          // This use-case of GetFrameElementInternal is fission safe,
-          // because PopupBlocker::TryUsePopupOpeningToken only uses
-          // the principal if it is the system principal, otherwise it
-          // only considers the popup token.
-          nsCOMPtr<nsINode> loadingNode =
-              mScriptGlobal->GetFrameElementInternal();
-          popupBlocked = !PopupBlocker::TryUsePopupOpeningToken(
-              loadingNode ? loadingNode->NodePrincipal() : nullptr);
-        } else if (mBrowsingContext->GetIsActive() &&
-                   PopupBlocker::ConsumeTimerTokenForExternalProtocolIframe()) {
-          popupBlocked = false;
-        } else {
-          // Check if the parent context of the frame allows popups.
-          WindowContext* parentContext =
-              mBrowsingContext->GetParentWindowContext();
-          MOZ_ASSERT(parentContext);
-          popupBlocked = !parentContext->CanShowPopup();
-        }
+          // For same-origin-with-top windows, we grant a single free popup
+          // without user activation, see bug 1680721.
+          //
+          // We consume the flag now even if there's no user activation.
+          const bool hasFreePass = [&] {
+            if (!active || !parentContext->SameOriginWithTop()) {
+              return false;
+            }
+            nsGlobalWindowInner* win =
+                parentContext->TopWindowContext()->GetInnerWindow();
+            return win && win->TryOpenExternalProtocolIframe();
+          }();
+
+          if (parentContext->ConsumeTransientUserGestureActivation()) {
+            // If the user has interacted with the page, consume it.
+            return false;
+          }
+
+          // TODO(emilio): Can we remove this check? It seems like what prompted
+          // this code (bug 1514547) should be covered by transient user
+          // activation, see bug 1514547.
+          if (active &&
+              PopupBlocker::ConsumeTimerTokenForExternalProtocolIframe()) {
+            return false;
+          }
+
+          if (parentContext->CanShowPopup()) {
+            return false;
+          }
+
+          if (hasFreePass) {
+            return false;
+          }
+
+          return true;
+        }();
 
         // No error must be returned when iframes are blocked.
         if (popupBlocked) {
+          nsAutoString message;
+          nsresult rv = nsContentUtils::GetLocalizedString(
+              nsContentUtils::eDOM_PROPERTIES,
+              "ExternalProtocolFrameBlockedNoUserActivation", message);
+          if (NS_SUCCEEDED(rv)) {
+            nsContentUtils::ReportToConsoleByWindowID(
+                message, nsIScriptError::warningFlag, "DOM"_ns,
+                parentContext->InnerWindowId());
+          }
           return NS_OK;
         }
       }
@@ -11215,8 +11243,7 @@
 
     // Inform the favicon service that our old favicon applies to this new
     // URI.
-    CopyFavicon(aCurrentURI, aNewURI, aDocument->NodePrincipal(),
-                UsePrivateBrowsing());
+    CopyFavicon(aCurrentURI, aNewURI, UsePrivateBrowsing());
   } else {
     FireDummyOnLocationChange();
   }
@@ -13046,7 +13073,7 @@
   if (mContentViewer) {
     RefPtr<Document> doc = mContentViewer->GetDocument();
     if (doc) {
-      doc->WarnOnceAbout(Document::DeprecatedOperations(aWarning), aAsError);
+      doc->WarnOnceAbout(DeprecatedOperations(aWarning), aAsError);
     }
   }
   return NS_OK;
diff -Nru firefox-84.0.2+build1/docshell/base/nsDocShellEditorData.h firefox-85.0+build1/docshell/base/nsDocShellEditorData.h
--- firefox-84.0.2+build1/docshell/base/nsDocShellEditorData.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsDocShellEditorData.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,13 +10,16 @@
 #  include "nsCOMPtr.h"
 #endif
 
-#include "mozilla/HTMLEditor.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/Document.h"
 
 class nsIDocShell;
 class nsEditingSession;
 
+namespace mozilla {
+class HTMLEditor;
+}
+
 class nsDocShellEditorData {
  public:
   explicit nsDocShellEditorData(nsIDocShell* aOwningDocShell);
diff -Nru firefox-84.0.2+build1/docshell/base/nsDocShell.h firefox-85.0+build1/docshell/base/nsDocShell.h
--- firefox-84.0.2+build1/docshell/base/nsDocShell.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsDocShell.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,33 +7,16 @@
 #ifndef nsDocShell_h__
 #define nsDocShell_h__
 
-#include <utility>
-
-#include "GeckoProfiler.h"
 #include "Units.h"
-#include "jsapi.h"
-#include "mozilla/BasePrincipal.h"
-#include "mozilla/HalScreenConfiguration.h"
-#include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/ObservedDocShell.h"
 #include "mozilla/ScrollbarPreferences.h"
-#include "mozilla/StaticPrefs_browser.h"
-#include "mozilla/TimeStamp.h"
 #include "mozilla/TimelineConsumers.h"
-#include "mozilla/TimelineMarker.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ChildSHistory.h"
-#include "mozilla/dom/ProfileTimelineMarkerBinding.h"
 #include "mozilla/dom/WindowProxyHolder.h"
-#include "mozilla/gfx/Matrix.h"
 #include "nsCOMPtr.h"
-#include "nsCRT.h"
 #include "nsCharsetSource.h"
-#include "nsContentPolicyUtils.h"
-#include "nsContentUtils.h"
 #include "nsDocLoader.h"
 #include "nsIAuthPromptProvider.h"
 #include "nsIBaseWindow.h"
@@ -42,7 +25,6 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
-#include "nsILoadURIDelegate.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIRefreshURI.h"
 #include "nsIWebNavigation.h"
@@ -59,6 +41,7 @@
 namespace mozilla {
 class Encoding;
 class HTMLEditor;
+class ObservedDocShell;
 enum class TaskCategory;
 namespace dom {
 class ClientInfo;
@@ -80,8 +63,6 @@
 class nsIMutableArray;
 class nsIPrompt;
 class nsIScrollableFrame;
-class nsISecureBrowserUI;
-class nsISHistory;
 class nsIStringBundle;
 class nsIURIFixup;
 class nsIURIFixupInfo;
@@ -91,11 +72,9 @@
 class nsIReferrerInfo;
 
 class nsCommandManager;
-class nsDocShell;
 class nsDocShellEditorData;
 class nsDOMNavigationTiming;
 class nsDSURIContentListener;
-class nsGlobalWindowInner;
 class nsGlobalWindowOuter;
 
 class FramingChecker;
@@ -383,7 +362,6 @@
 
   // Tell the favicon service that aNewURI has the same favicon as aOldURI.
   static void CopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
-                          nsIPrincipal* aLoadingPrincipal,
                           bool aInPrivateBrowsing);
 
   static nsDocShell* Cast(nsIDocShell* aDocShell) {
@@ -407,8 +385,9 @@
    * `aCacheKey` gets passed to DoURILoad call.
    */
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  nsresult InternalLoad(nsDocShellLoadState* aLoadState,
-                        Maybe<uint32_t> aCacheKey = mozilla::Nothing());
+  nsresult InternalLoad(
+      nsDocShellLoadState* aLoadState,
+      mozilla::Maybe<uint32_t> aCacheKey = mozilla::Nothing());
 
   // Clear the document's storage access flag if needed.
   void MaybeClearStorageAccessFlag();
@@ -513,7 +492,7 @@
       const mozilla::dom::LoadingSessionHistoryInfo& aLoadingInfo);
 
   already_AddRefed<nsIInputStream> GetPostDataFromCurrentEntry() const;
-  Maybe<uint32_t> GetCacheKeyFromCurrentEntry() const;
+  mozilla::Maybe<uint32_t> GetCacheKeyFromCurrentEntry() const;
 
   // Loading and/or active entries are only set when pref
   // fission.sessionHistoryInParent is on.
@@ -598,7 +577,7 @@
   nsresult CreateAboutBlankContentViewer(
       nsIPrincipal* aPrincipal, nsIPrincipal* aPartitionedPrincipal,
       nsIContentSecurityPolicy* aCSP, nsIURI* aBaseURI,
-      const Maybe<nsILoadInfo::CrossOriginEmbedderPolicy>& aCOEP =
+      const mozilla::Maybe<nsILoadInfo::CrossOriginEmbedderPolicy>& aCOEP =
           mozilla::Nothing(),
       bool aTryToSaveOldPresentation = true, bool aCheckPermitUnload = true,
       mozilla::dom::WindowGlobalChild* aActor = nullptr);
@@ -663,8 +642,8 @@
 
   // This method calls SetHistoryEntry and updates mOSHE and mLSHE in BC to be
   // the same as in docshell
-  void SetHistoryEntryAndUpdateBC(const Maybe<nsISHEntry*>& aLSHE,
-                                  const Maybe<nsISHEntry*>& aOSHE);
+  void SetHistoryEntryAndUpdateBC(const mozilla::Maybe<nsISHEntry*>& aLSHE,
+                                  const mozilla::Maybe<nsISHEntry*>& aOSHE);
 
   static nsresult ReloadDocument(
       nsDocShell* aDocShell, mozilla::dom::Document* aDocument,
@@ -689,8 +668,8 @@
   // will be set as the originalURI. If LoadReplace is true, LOAD_REPLACE flag
   // will be set on the nsIChannel.
   // If `aCacheKey` is supplied, use it for the session history entry.
-  nsresult DoURILoad(nsDocShellLoadState* aLoadState, Maybe<uint32_t> aCacheKey,
-                     nsIRequest** aRequest);
+  nsresult DoURILoad(nsDocShellLoadState* aLoadState,
+                     mozilla::Maybe<uint32_t> aCacheKey, nsIRequest** aRequest);
 
   static nsresult AddHeadersToChannel(nsIInputStream* aHeadersData,
                                       nsIChannel* aChannel);
@@ -873,38 +852,6 @@
   bool CanSavePresentation(uint32_t aLoadType, nsIRequest* aNewRequest,
                            mozilla::dom::Document* aNewDocument);
 
-  // There are 11 possible reasons to make a request fails to use BFCache
-  // (see BFCacheStatus in dom/base/Document.h), and we'd like to record
-  // the common combinations for reasons which make requests fail to use
-  // BFCache. These combinations are generated based on some local browsings,
-  // we need to adjust them when necessary.
-  enum BFCacheStatusCombo : uint16_t {
-    BFCACHE_SUCCESS,
-    SUCCESS_NOT_ONLY_TOPLEVEL =
-        mozilla::dom::BFCacheStatus::NOT_ONLY_TOPLEVEL_IN_BCG,
-    UNLOAD = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER,
-    UNLOAD_REQUEST = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
-                     mozilla::dom::BFCacheStatus::REQUEST,
-    REQUEST = mozilla::dom::BFCacheStatus::REQUEST,
-    UNLOAD_REQUEST_PEER = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
-                          mozilla::dom::BFCacheStatus::REQUEST |
-                          mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
-    UNLOAD_REQUEST_PEER_MSE =
-        mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
-        mozilla::dom::BFCacheStatus::REQUEST |
-        mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION |
-        mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
-    UNLOAD_REQUEST_MSE = mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
-                         mozilla::dom::BFCacheStatus::REQUEST |
-                         mozilla::dom::BFCacheStatus::CONTAINS_MSE_CONTENT,
-    SUSPENDED_UNLOAD_REQUEST_PEER =
-        mozilla::dom::BFCacheStatus::SUSPENDED |
-        mozilla::dom::BFCacheStatus::UNLOAD_LISTENER |
-        mozilla::dom::BFCacheStatus::REQUEST |
-        mozilla::dom::BFCacheStatus::ACTIVE_PEER_CONNECTION,
-    REMOTE_SUBFRAMES = mozilla::dom::BFCacheStatus::CONTAINS_REMOTE_SUBFRAMES
-  };
-
   void ReportBFCacheComboTelemetry(uint16_t aCombo);
 
   // Captures the state of the supporting elements of the presentation
@@ -1105,6 +1052,8 @@
   // (directly or over IPC).
   void MoveLoadingToActiveEntry();
 
+  void ActivenessMaybeChanged();
+
  private:  // data members
   nsString mTitle;
   nsCString mOriginalUriString;
diff -Nru firefox-84.0.2+build1/docshell/base/nsDocShellTreeOwner.cpp firefox-85.0+build1/docshell/base/nsDocShellTreeOwner.cpp
--- firefox-84.0.2+build1/docshell/base/nsDocShellTreeOwner.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsDocShellTreeOwner.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsContentUtils.h"
 #include "nsSize.h"
 #include "mozilla/ReflowInput.h"
+#include "mozilla/ScopeExit.h"
 #include "nsComponentManagerUtils.h"
 #include "nsString.h"
 #include "nsAtom.h"
@@ -24,6 +25,7 @@
 #include "nsITooltipListener.h"
 #include "nsINode.h"
 #include "Link.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/MouseEvent.h"
 #include "mozilla/dom/SVGTitleElement.h"
@@ -39,6 +41,7 @@
 #include "nsRect.h"
 #include "nsIWebBrowserChromeFocus.h"
 #include "nsIContent.h"
+#include "nsServiceManagerUtils.h"
 #include "nsViewManager.h"
 #include "nsView.h"
 #include "nsIConstraintValidation.h"
@@ -1272,7 +1275,7 @@
       }
     }
 
-    if (!widget || !docShell || !docShell->GetIsActive()) {
+    if (!widget || !docShell || !docShell->GetBrowsingContext()->IsActive()) {
       return;
     }
 
diff -Nru firefox-84.0.2+build1/docshell/base/nsIDocShell.idl firefox-85.0+build1/docshell/base/nsIDocShell.idl
--- firefox-84.0.2+build1/docshell/base/nsIDocShell.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsIDocShell.idl	2021-01-18 19:58:09.000000000 +0000
@@ -490,13 +490,6 @@
   [infallible] readonly attribute boolean canExecuteScripts;
 
   /**
-   * Sets whether a docshell is active. An active docshell is one that is
-   * visible, and thus is not a good candidate for certain optimizations
-   * like image frame discarding. Docshells are active unless told otherwise.
-   */
-  [infallible] attribute boolean isActive;
-
-  /**
    * The ID of the docshell in the session history.
    */
   readonly attribute nsIDRef historyID;
diff -Nru firefox-84.0.2+build1/docshell/base/nsILoadContext.idl firefox-85.0+build1/docshell/base/nsILoadContext.idl
--- firefox-84.0.2+build1/docshell/base/nsILoadContext.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsILoadContext.idl	2021-01-18 19:58:09.000000000 +0000
@@ -14,7 +14,9 @@
 
 %{C++
 #ifdef MOZILLA_INTERNAL_API
-#include "mozilla/BasePrincipal.h" // for OriginAttributes
+namespace mozilla {
+class OriginAttributes;
+}
 #endif
 %}
 
diff -Nru firefox-84.0.2+build1/docshell/base/nsIURIFixup.idl firefox-85.0+build1/docshell/base/nsIURIFixup.idl
--- firefox-84.0.2+build1/docshell/base/nsIURIFixup.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsIURIFixup.idl	2021-01-18 19:58:09.000000000 +0000
@@ -123,7 +123,7 @@
 
     /**
      * Convert load flags from nsIWebNavigation to URI fixup flags for use in
-     * createFixupURI or getFixupURIInfo.
+     * getFixupURIInfo.
      *
      * @param aURIText       Candidate URI; used for determining whether to
      *                       allow keyword lookups.
diff -Nru firefox-84.0.2+build1/docshell/base/nsIWebNavigation.idl firefox-85.0+build1/docshell/base/nsIWebNavigation.idl
--- firefox-84.0.2+build1/docshell/base/nsIWebNavigation.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsIWebNavigation.idl	2021-01-18 19:58:08.000000000 +0000
@@ -28,8 +28,12 @@
  * It provides methods and attributes to direct an object to navigate to a new
  * location, stop or restart an in process load, or determine where the object
  * has previously gone.
+ *
+ * Even though this is builtinclass, most of the interface is also implemented
+ * in RemoteWebNavigation, so if this interface changes, the implementation
+ * there may also need to change.
  */
-[scriptable, uuid(3ade79d4-8cb9-4952-b18d-4f9b63ca0d31)]
+[scriptable, builtinclass, uuid(3ade79d4-8cb9-4952-b18d-4f9b63ca0d31)]
 interface nsIWebNavigation : nsISupports
 {
   /**
diff -Nru firefox-84.0.2+build1/docshell/base/nsPingListener.cpp firefox-85.0+build1/docshell/base/nsPingListener.cpp
--- firefox-84.0.2+build1/docshell/base/nsPingListener.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/nsPingListener.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/Document.h"
 
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIInputStream.h"
 #include "nsIProtocolHandler.h"
diff -Nru firefox-84.0.2+build1/docshell/base/SerializedLoadContext.h firefox-85.0+build1/docshell/base/SerializedLoadContext.h
--- firefox-84.0.2+build1/docshell/base/SerializedLoadContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/SerializedLoadContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/BasePrincipal.h"
 
 class nsILoadContext;
diff -Nru firefox-84.0.2+build1/docshell/base/SyncedContext.h firefox-85.0+build1/docshell/base/SyncedContext.h
--- firefox-84.0.2+build1/docshell/base/SyncedContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/SyncedContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,11 +7,16 @@
 #ifndef mozilla_dom_SyncedContext_h
 #define mozilla_dom_SyncedContext_h
 
-#include "mozilla/EnumSet.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Tuple.h"
+#include <array>
+#include <type_traits>
 #include <utility>
+#include "mozilla/Attributes.h"
+#include "mozilla/EnumSet.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
+
+// Referenced via macro definitions
+#include "mozilla/ErrorResult.h"
 
 class PickleIterator;
 
@@ -30,6 +35,8 @@
 namespace dom {
 class ContentParent;
 class ContentChild;
+template <typename T>
+class MaybeDiscarded;
 
 namespace syncedcontext {
 
diff -Nru firefox-84.0.2+build1/docshell/base/timeline/TimelineConsumers.cpp firefox-85.0+build1/docshell/base/timeline/TimelineConsumers.cpp
--- firefox-84.0.2+build1/docshell/base/timeline/TimelineConsumers.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/timeline/TimelineConsumers.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,9 +7,12 @@
 #include "TimelineConsumers.h"
 
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Services.h"
 #include "jsapi.h"
 #include "nsAppRunner.h"  // for XRE_IsContentProcess, XRE_IsParentProcess
+#include "nsCRT.h"
 #include "nsDocShell.h"
+#include "nsIObserverService.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/docshell/base/URIFixup.jsm firefox-85.0+build1/docshell/base/URIFixup.jsm
--- firefox-84.0.2+build1/docshell/base/URIFixup.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/URIFixup.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -67,6 +67,12 @@
   "browser.fixup.alternate.enabled",
   true
 );
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "alternateProtocol",
+  "browser.fixup.alternate.protocol",
+  "https"
+);
 
 const {
   FIXUP_FLAG_NONE,
@@ -133,7 +139,7 @@
 XPCOMUtils.defineLazyGetter(
   this,
   "possibleProtocolRegex",
-  () => /^([a-z][a-z0-9.+\t-]*):/i
+  () => /^([a-z][a-z0-9.+\t-]*)(:|;)?(\/\/)?/i
 );
 
 // Regex used to match IPs. Note that these are not made to validate IPs, but
@@ -272,7 +278,14 @@
 
     let info = new URIFixupInfo(uriString);
 
-    let scheme = extractScheme(uriString);
+    const {
+      scheme,
+      fixedSchemeUriString,
+      fixupChangedProtocol,
+    } = extractScheme(uriString, fixupFlags);
+    uriString = fixedSchemeUriString;
+    info.fixupChangedProtocol = fixupChangedProtocol;
+
     if (scheme == "view-source") {
       let { preferredURI, postData } = fixupViewSource(uriString, fixupFlags);
       info.preferredURI = info.fixedURI = preferredURI;
@@ -291,34 +304,7 @@
       }
     }
 
-    // Fix up common scheme typos.
-    // TODO: Use levenshtein distance here?
-    let isCommonProtocol = COMMON_PROTOCOLS.includes(scheme);
-    if (
-      fixupSchemeTypos &&
-      fixupFlags & FIXUP_FLAG_FIX_SCHEME_TYPOS &&
-      scheme &&
-      !isCommonProtocol
-    ) {
-      info.fixupChangedProtocol = [
-        ["ttp", "http"],
-        ["htp", "http"],
-        ["ttps", "https"],
-        ["tps", "https"],
-        ["ps", "https"],
-        ["htps", "https"],
-        ["ile", "file"],
-        ["le", "file"],
-      ].some(([typo, fixed]) => {
-        if (uriString.startsWith(typo + ":")) {
-          scheme = fixed;
-          uriString = scheme + uriString.substring(typo.length);
-          isCommonProtocol = true;
-          return true;
-        }
-        return false;
-      });
-    }
+    const isCommonProtocol = COMMON_PROTOCOLS.includes(scheme);
 
     let canHandleProtocol =
       scheme &&
@@ -397,6 +383,16 @@
       }
     }
 
+    // Handle "www.<something>" as a URI.
+    const asciiHost = info.fixedURI?.asciiHost;
+    if (
+      asciiHost?.length > 4 &&
+      asciiHost?.startsWith("www.") &&
+      asciiHost?.lastIndexOf(".") == 3
+    ) {
+      return info;
+    }
+
     // Memoize the public suffix check, since it may be expensive and should
     // only run once when necessary.
     let suffixInfo;
@@ -776,9 +772,9 @@
   if (numDots == 0) {
     newHost = prefix + oldHost + suffix;
   } else if (numDots == 1) {
-    if (prefix && oldHost.toLowerCase() == prefix) {
+    if (prefix && oldHost == prefix) {
       newHost = oldHost + suffix;
-    } else if (suffix) {
+    } else if (suffix && !oldHost.startsWith(prefix)) {
       newHost = prefix + oldHost;
     }
   }
@@ -790,6 +786,7 @@
   try {
     info.fixedURI = uri
       .mutate()
+      .setScheme(alternateProtocol)
       .setHost(newHost)
       .finalize();
   } catch (ex) {
@@ -936,12 +933,73 @@
 
 /**
  * Mimics the logic in Services.io.extractScheme, but avoids crossing XPConnect.
+ * This also tries to fixup the scheme if it was clearly mistyped.
  * @param {string} uriString the string to examine
- * @returns {string} a scheme or empty string if one could not be identified
+ * @param {integer} fixupFlags The original fixup flags
+ * @returns {object}
+ *          scheme: a typo fixed scheme or empty string if one could not be identified
+ *          fixedSchemeUriString: uri string with a typo fixed scheme
+ *          fixupChangedProtocol: true if the scheme is fixed up
  */
-function extractScheme(uriString) {
-  let matches = uriString.match(possibleProtocolRegex);
-  return matches ? matches[1].replace("\t", "").toLowerCase() : "";
+function extractScheme(uriString, fixupFlags = FIXUP_FLAG_NONE) {
+  const matches = uriString.match(possibleProtocolRegex);
+  const hasColon = matches?.[2] === ":";
+  const hasSlash2 = matches?.[3] === "//";
+
+  const isFixupSchemeTypos =
+    fixupSchemeTypos && fixupFlags & FIXUP_FLAG_FIX_SCHEME_TYPOS;
+
+  if (
+    !matches ||
+    (!hasColon && !hasSlash2) ||
+    (!hasColon && !isFixupSchemeTypos)
+  ) {
+    return {
+      scheme: "",
+      fixedSchemeUriString: uriString,
+      fixupChangedProtocol: false,
+    };
+  }
+
+  let scheme = matches[1].replace("\t", "").toLowerCase();
+  let fixedSchemeUriString = uriString;
+
+  if (isFixupSchemeTypos && hasSlash2) {
+    // Fix up typos for string that user would have intented as protocol.
+    const afterProtocol = uriString.substring(matches[0].length);
+    fixedSchemeUriString = `${scheme}://${afterProtocol}`;
+  }
+
+  let fixupChangedProtocol = false;
+
+  if (isFixupSchemeTypos) {
+    // Fix up common scheme typos.
+    // TODO: Use levenshtein distance here?
+    fixupChangedProtocol = [
+      ["ttp", "http"],
+      ["htp", "http"],
+      ["ttps", "https"],
+      ["tps", "https"],
+      ["ps", "https"],
+      ["htps", "https"],
+      ["ile", "file"],
+      ["le", "file"],
+    ].some(([typo, fixed]) => {
+      if (scheme === typo) {
+        scheme = fixed;
+        fixedSchemeUriString =
+          scheme + fixedSchemeUriString.substring(typo.length);
+        return true;
+      }
+      return false;
+    });
+  }
+
+  return {
+    scheme,
+    fixedSchemeUriString,
+    fixupChangedProtocol,
+  };
 }
 
 /**
@@ -965,7 +1023,7 @@
   let innerURIString = uriString.substring(12).trim();
 
   // Prevent recursion.
-  let innerScheme = extractScheme(innerURIString);
+  const { scheme: innerScheme } = extractScheme(innerURIString);
   if (innerScheme == "view-source") {
     throw new Components.Exception(
       "Prevent view-source recursion",
diff -Nru firefox-84.0.2+build1/docshell/base/WindowContext.cpp firefox-85.0+build1/docshell/base/WindowContext.cpp
--- firefox-84.0.2+build1/docshell/base/WindowContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/WindowContext.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/SyncedContextInlines.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/PermissionDelegateIPCUtils.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/ClearOnShutdown.h"
@@ -93,6 +94,10 @@
 
 bool WindowContext::IsTop() const { return mBrowsingContext->IsTop(); }
 
+bool WindowContext::SameOriginWithTop() const {
+  return mBrowsingContext->SameOriginWithTop();
+}
+
 nsIGlobalObject* WindowContext::GetParentObject() const {
   return xpc::NativeGlobal(xpc::PrivilegedJunkScope());
 }
@@ -242,6 +247,22 @@
   return CheckOnlyOwningProcessCanSet(aSource);
 }
 
+void WindowContext::DidSet(FieldIndex<IDX_SHEntryHasUserInteraction>,
+                           bool aOldValue) {
+  MOZ_ASSERT(
+      TopWindowContext() == this,
+      "SHEntryHasUserInteraction can only be set on the top window context");
+  // This field is set when the child notifies us of new user interaction, so we
+  // also set the currently active shentry in the parent as having interaction.
+  if (XRE_IsParentProcess() && mBrowsingContext) {
+    SessionHistoryEntry* activeEntry =
+        mBrowsingContext->Canonical()->GetActiveSessionHistoryEntry();
+    if (activeEntry && GetSHEntryHasUserInteraction()) {
+      activeEntry->SetHasUserInteraction(true);
+    }
+  }
+}
+
 void WindowContext::DidSet(FieldIndex<IDX_UserActivationState>) {
   MOZ_ASSERT_IF(!mInProcess, mUserGestureStart.IsNull());
   USER_ACTIVATION_LOG("Set user gesture activation %" PRIu8
diff -Nru firefox-84.0.2+build1/docshell/base/WindowContext.h firefox-85.0+build1/docshell/base/WindowContext.h
--- firefox-84.0.2+build1/docshell/base/WindowContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/base/WindowContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/PermissionDelegateHandler.h"
 #include "mozilla/Span.h"
-#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/dom/SyncedContext.h"
 #include "mozilla/dom/UserActivation.h"
@@ -27,6 +26,7 @@
 
 class WindowGlobalParent;
 class WindowGlobalInit;
+class BrowsingContext;
 class BrowsingContextGroup;
 
 #define MOZ_EACH_WC_FIELD(FIELD)                                       \
@@ -112,6 +112,8 @@
   WindowContext* GetParentWindowContext();
   WindowContext* TopWindowContext();
 
+  bool SameOriginWithTop() const;
+
   bool IsTop() const;
 
   Span<RefPtr<BrowsingContext>> Children() { return mChildren; }
@@ -251,6 +253,8 @@
 
   void DidSet(FieldIndex<IDX_HasReportedShadowDOMUsage>, bool aOldValue);
 
+  void DidSet(FieldIndex<IDX_SHEntryHasUserInteraction>, bool aOldValue);
+
   // Overload `DidSet` to get notifications for a particular field being set.
   //
   // You can also overload the variant that gets the old value if you need it.
diff -Nru firefox-84.0.2+build1/docshell/shistory/ChildSHistory.cpp firefox-85.0+build1/docshell/shistory/ChildSHistory.cpp
--- firefox-84.0.2+build1/docshell/shistory/ChildSHistory.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/shistory/ChildSHistory.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -154,17 +154,6 @@
       return;
     }
 
-    // See Bug 1650095.
-    if (mozilla::SessionHistoryInParent() && !mPendingEpoch) {
-      mPendingEpoch = true;
-      RefPtr<ChildSHistory> self(this);
-      NS_DispatchToCurrentThread(
-          NS_NewRunnableFunction("UpdateEpochRunnable", [self] {
-            self->mHistoryEpoch++;
-            self->mPendingEpoch = false;
-          }));
-    }
-
     // Check for user interaction if desired, except for the first and last
     // history entries. We compare with >= to account for the case where
     // aOffset >= Count().
@@ -177,7 +166,17 @@
     }
   }
 
-  GotoIndex(index.value(), aOffset, aRv);
+  if (mozilla::SessionHistoryInParent() && !mPendingEpoch) {
+    mPendingEpoch = true;
+    RefPtr<ChildSHistory> self(this);
+    NS_DispatchToCurrentThread(
+        NS_NewRunnableFunction("UpdateEpochRunnable", [self] {
+          self->mHistoryEpoch++;
+          self->mPendingEpoch = false;
+        }));
+  }
+
+  GotoIndex(index.value(), aOffset, aRequireUserInteraction, aRv);
 }
 
 void ChildSHistory::AsyncGo(int32_t aOffset, bool aRequireUserInteraction,
@@ -200,14 +199,15 @@
 }
 
 void ChildSHistory::GotoIndex(int32_t aIndex, int32_t aOffset,
-                              ErrorResult& aRv) {
+                              bool aRequireUserInteraction, ErrorResult& aRv) {
   MOZ_LOG(gSHLog, LogLevel::Debug,
           ("ChildSHistory::GotoIndex(%d, %d), epoch %" PRIu64, aIndex, aOffset,
            mHistoryEpoch));
   if (mozilla::SessionHistoryInParent()) {
     nsCOMPtr<nsISHistory> shistory = mHistory;
     mBrowsingContext->HistoryGo(
-        aOffset, mHistoryEpoch, [shistory](int32_t&& aRequestedIndex) {
+        aOffset, mHistoryEpoch, aRequireUserInteraction,
+        [shistory](int32_t&& aRequestedIndex) {
           // FIXME Should probably only do this for non-fission.
           if (shistory) {
             shistory->InternalSetRequestedIndex(aRequestedIndex);
diff -Nru firefox-84.0.2+build1/docshell/shistory/ChildSHistory.h firefox-85.0+build1/docshell/shistory/ChildSHistory.h
--- firefox-84.0.2+build1/docshell/shistory/ChildSHistory.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/shistory/ChildSHistory.h	2021-01-18 19:58:08.000000000 +0000
@@ -20,9 +20,10 @@
 #define mozilla_dom_ChildSHistory_h
 
 #include "nsCOMPtr.h"
-#include "mozilla/ErrorResult.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "nsWrapperCache.h"
 #include "nsThreadUtils.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "nsID.h"
 
@@ -71,7 +72,8 @@
                CallerType aCallerType, ErrorResult& aRv);
 
   // aIndex is the new index, and aOffset is the offset between new and current.
-  void GotoIndex(int32_t aIndex, int32_t aOffset, ErrorResult& aRv);
+  void GotoIndex(int32_t aIndex, int32_t aOffset, bool aRequireUserInteraction,
+                 ErrorResult& aRv);
 
   void RemovePendingHistoryNavigations();
 
diff -Nru firefox-84.0.2+build1/docshell/shistory/nsSHEntry.cpp firefox-85.0+build1/docshell/shistory/nsSHEntry.cpp
--- firefox-84.0.2+build1/docshell/shistory/nsSHEntry.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/shistory/nsSHEntry.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -300,13 +300,14 @@
 
 NS_IMETHODIMP
 nsSHEntry::GetHasUserInteraction(bool* aFlag) {
-  // We can't assert that this getter isn't accessed only on root
-  // entries because there's JS code that will iterate over entries
-  // for serialization etc., so let's assert the next best thing.
-  MOZ_ASSERT(!mParent || !mHasUserInteraction,
-             "User interaction can only be set on root entries");
-
-  *aFlag = mHasUserInteraction;
+  // The back button and menulist deal with root/top-level
+  // session history entries, thus we annotate only the root entry.
+  if (!mParent) {
+    *aFlag = mHasUserInteraction;
+  } else {
+    nsCOMPtr<nsISHEntry> root = nsSHistory::GetRootSHEntry(this);
+    root->GetHasUserInteraction(aFlag);
+  }
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/docshell/shistory/SessionHistoryEntry.cpp firefox-85.0+build1/docshell/shistory/SessionHistoryEntry.cpp
--- firefox-84.0.2+build1/docshell/shistory/SessionHistoryEntry.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/shistory/SessionHistoryEntry.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,13 +6,17 @@
 
 #include "SessionHistoryEntry.h"
 #include "nsDocShellLoadState.h"
+#include "nsIHttpChannel.h"
 #include "nsSHEntryShared.h"
 #include "nsStructuredCloneContainer.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/PresState.h"
 #include "mozilla/Tuple.h"
+#include "mozilla/dom/CSPMessageUtils.h"
 #include "mozilla/dom/nsCSPContext.h"
+#include "mozilla/dom/ReferrerInfoUtils.h"
 #include "mozilla/ipc/IPDLParamTraits.h"
+#include "mozilla/ipc/URIUtils.h"
 
 extern mozilla::LazyLogModule gSHLog;
 
@@ -24,7 +28,6 @@
     : mURI(aLoadState->URI()),
       mOriginalURI(aLoadState->OriginalURI()),
       mResultPrincipalURI(aLoadState->ResultPrincipalURI()),
-      mReferrerInfo(aLoadState->GetReferrerInfo()),
       mPostData(aLoadState->PostDataStream()),
       mLoadType(aLoadState->LoadType()),
       mSrcdocData(aLoadState->SrcdocData()),
@@ -32,11 +35,16 @@
       mLoadReplace(aLoadState->LoadReplace()),
       /* FIXME Should this be aLoadState->IsSrcdocLoad()? */
       mIsSrcdocEntry(!aLoadState->SrcdocData().IsEmpty()),
+      mHasUserInteraction(false),
       mSharedState(SharedState::Create(
           aLoadState->TriggeringPrincipal(), aLoadState->PrincipalToInherit(),
           aLoadState->PartitionedPrincipalToInherit(), aLoadState->Csp(),
           /* FIXME Is this correct? */
           aLoadState->TypeHint())) {
+  if (nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aChannel)) {
+    mReferrerInfo = httpChannel->GetReferrerInfo();
+  }
+
   MaybeUpdateTitleFromURI();
 }
 
@@ -126,6 +134,7 @@
   mIsSrcdocEntry = false;
   mScrollRestorationIsManual = false;
   mPersist = false;
+  mHasUserInteraction = false;
 
   mSharedState.Get()->mTriggeringPrincipal = aTriggeringPrincipal;
   mSharedState.Get()->mPrincipalToInherit = aPrincipalToInherit;
@@ -500,14 +509,27 @@
 
 NS_IMETHODIMP
 SessionHistoryEntry::GetHasUserInteraction(bool* aFlag) {
-  NS_WARNING("Not implemented in the parent process!");
-  *aFlag = true;
+  // The back button and menulist deal with root/top-level
+  // session history entries, thus we annotate only the root entry.
+  if (!mParent) {
+    *aFlag = mInfo->mHasUserInteraction;
+  } else {
+    nsCOMPtr<nsISHEntry> root = nsSHistory::GetRootSHEntry(this);
+    root->GetHasUserInteraction(aFlag);
+  }
   return NS_OK;
 }
 
 NS_IMETHODIMP
 SessionHistoryEntry::SetHasUserInteraction(bool aFlag) {
-  NS_WARNING("Not implemented in the parent process!");
+  // The back button and menulist deal with root/top-level
+  // session history entries, thus we annotate only the root entry.
+  if (!mParent) {
+    mInfo->mHasUserInteraction = aFlag;
+  } else {
+    nsCOMPtr<nsISHEntry> root = nsSHistory::GetRootSHEntry(this);
+    root->SetHasUserInteraction(aFlag);
+  }
   return NS_OK;
 }
 
@@ -954,7 +976,7 @@
   entry->mInfo->mScrollPositionY = 0;
   entry->mInfo->mScrollRestorationIsManual = false;
 
-  // entry->mInfo->mHasUserInteraction = false;
+  entry->mInfo->mHasUserInteraction = false;
 
   entry.forget(aEntry);
 
@@ -1361,6 +1383,7 @@
   WriteIPDLParam(aMsg, aActor, aParam.mIsSrcdocEntry);
   WriteIPDLParam(aMsg, aActor, aParam.mScrollRestorationIsManual);
   WriteIPDLParam(aMsg, aActor, aParam.mPersist);
+  WriteIPDLParam(aMsg, aActor, aParam.mHasUserInteraction);
   WriteIPDLParam(aMsg, aActor, aParam.mSharedState.Get()->mId);
   WriteIPDLParam(aMsg, aActor, aParam.mSharedState.Get()->mTriggeringPrincipal);
   WriteIPDLParam(aMsg, aActor, aParam.mSharedState.Get()->mPrincipalToInherit);
@@ -1397,6 +1420,7 @@
       !ReadIPDLParam(aMsg, aIter, aActor,
                      &aResult->mScrollRestorationIsManual) ||
       !ReadIPDLParam(aMsg, aIter, aActor, &aResult->mPersist) ||
+      !ReadIPDLParam(aMsg, aIter, aActor, &aResult->mHasUserInteraction) ||
       !ReadIPDLParam(aMsg, aIter, aActor, &sharedId)) {
     aActor->FatalError("Error reading fields for SessionHistoryInfo");
     return false;
diff -Nru firefox-84.0.2+build1/docshell/shistory/SessionHistoryEntry.h firefox-85.0+build1/docshell/shistory/SessionHistoryEntry.h
--- firefox-84.0.2+build1/docshell/shistory/SessionHistoryEntry.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/shistory/SessionHistoryEntry.h	2021-01-18 19:58:09.000000000 +0000
@@ -101,6 +101,11 @@
   }
   bool GetURIWasModified() const { return mURIWasModified; }
 
+  void SetHasUserInteraction(bool aHasUserInteraction) {
+    mHasUserInteraction = aHasUserInteraction;
+  }
+  bool GetHasUserInteraction() const { return mHasUserInteraction; }
+
   uint64_t SharedId() const;
 
   nsILayoutHistoryState* GetLayoutHistoryState();
@@ -152,6 +157,7 @@
   bool mIsSrcdocEntry = false;
   bool mScrollRestorationIsManual = false;
   bool mPersist = true;
+  bool mHasUserInteraction = false;
 
   union SharedState {
     SharedState();
@@ -292,6 +298,8 @@
 
 namespace ipc {
 
+class IProtocol;
+
 // Allow sending SessionHistoryInfo objects over IPC.
 template <>
 struct IPDLParamTraits<dom::SessionHistoryInfo> {
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_browsing_context_attached.js firefox-85.0+build1/docshell/test/browser/browser_browsing_context_attached.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_browsing_context_attached.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_browsing_context_attached.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,139 @@
+"use strict";
+
+const TEST_PATH =
+  getRootDirectory(gTestPath).replace(
+    "chrome://mochitests/content",
+    "http://example.com"
+  ) + "dummy_page.html";
+
+const TOPIC = "browsing-context-attached";
+
+async function observeAttached(callback) {
+  let attached = [];
+  function observer(subject, topic) {
+    is(topic, TOPIC, "observing correct topic");
+    ok(subject instanceof BrowsingContext, "subject to be a BrowsingContext");
+    info(`*** bc id: ${subject.id}`);
+    attached.push(subject);
+  }
+  Services.obs.addObserver(observer, TOPIC);
+  try {
+    await callback();
+    return attached;
+  } finally {
+    Services.obs.removeObserver(observer, TOPIC);
+  }
+}
+
+add_task(async function toplevelForNewWindow() {
+  let win;
+
+  let attached = await observeAttached(async () => {
+    win = await BrowserTestUtils.openNewBrowserWindow();
+  });
+
+  ok(
+    attached.includes(win.browsingContext),
+    "got notification for window's chrome browsing context"
+  );
+  ok(
+    attached.includes(win.gBrowser.selectedBrowser.browsingContext),
+    "got notification for toplevel browsing context"
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+});
+
+add_task(async function toplevelForNewTab() {
+  let tab;
+
+  let attached = await observeAttached(async () => {
+    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  });
+
+  ok(
+    !attached.includes(window.browsingContext),
+    "no notification for the current window's chrome browsing context"
+  );
+  ok(
+    attached.includes(tab.linkedBrowser.browsingContext),
+    "got notification for toplevel browsing context"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function subframe() {
+  let browsingContext;
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  let attached = await observeAttached(async () => {
+    browsingContext = await SpecialPowers.spawn(tab.linkedBrowser, [], () => {
+      let iframe = content.document.createElement("iframe");
+      content.document.body.appendChild(iframe);
+      iframe.contentWindow.location = "https://example.com/";
+      return iframe.browsingContext;
+    });
+  });
+
+  ok(
+    !attached.includes(window.browsingContext),
+    "no notification for the current window's chrome browsing context"
+  );
+  ok(
+    !attached.includes(tab.linkedBrowser.browsingContext),
+    "no notification for toplevel browsing context"
+  );
+  ok(
+    attached.includes(browsingContext),
+    "got notification for frame's browsing context"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function toplevelReplacedBy() {
+  let tab;
+
+  let attached = await observeAttached(async () => {
+    tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "about:robots");
+  });
+
+  const firstContext = tab.linkedBrowser.browsingContext;
+  ok(
+    attached.includes(firstContext),
+    "got notification for initial toplevel browsing context"
+  );
+
+  attached = await observeAttached(async () => {
+    await loadURI(TEST_PATH);
+  });
+  const secondContext = tab.linkedBrowser.browsingContext;
+  ok(
+    attached.includes(secondContext),
+    "got notification for replaced toplevel browsing context"
+  );
+  isnot(secondContext, firstContext, "browsing context to be replaced");
+  is(
+    secondContext.browserId,
+    firstContext.browserId,
+    "browserId has been kept"
+  );
+
+  attached = await observeAttached(async () => {
+    await loadURI("about:robots");
+  });
+  const thirdContext = tab.linkedBrowser.browsingContext;
+  ok(
+    attached.includes(thirdContext),
+    "got notification for replaced toplevel browsing context"
+  );
+  isnot(thirdContext, secondContext, "browsing context to be replaced");
+  is(
+    thirdContext.browserId,
+    secondContext.browserId,
+    "browserId has been kept"
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_browsing_context_discarded.js firefox-85.0+build1/docshell/test/browser/browser_browsing_context_discarded.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_browsing_context_discarded.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_browsing_context_discarded.js	2021-01-18 19:58:09.000000000 +0000
@@ -2,35 +2,64 @@
 
 const TOPIC = "browsing-context-discarded";
 
-add_task(async function toplevel() {
-  let win = await BrowserTestUtils.openNewBrowserWindow();
-  let bc = await SpecialPowers.spawn(
-    win.gBrowser.selectedBrowser,
-    [],
-    () => content.docShell.browsingContext
-  );
+async function observeDiscarded(browsingContexts, callback) {
+  let discarded = [];
+
+  let promise = BrowserUtils.promiseObserved(TOPIC, subject => {
+    ok(subject instanceof BrowsingContext, "subject to be a BrowsingContext");
+    discarded.push(subject);
 
-  let promise = BrowserUtils.promiseObserved(TOPIC, subject => subject === bc);
-  await BrowserTestUtils.closeWindow(win);
+    return browsingContexts.every(item => discarded.includes(item));
+  });
+  await callback();
   await promise;
 
-  // If we make it here, then we've received the notification.
-  ok(true, "got top-level notification");
+  return discarded;
+}
+
+add_task(async function toplevelForNewWindow() {
+  let win = await BrowserTestUtils.openNewBrowserWindow();
+  let browsingContext = win.gBrowser.selectedBrowser.browsingContext;
+
+  await observeDiscarded([win.browsingContext, browsingContext], async () => {
+    await BrowserTestUtils.closeWindow(win);
+  });
+});
+
+add_task(async function toplevelForNewTab() {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  let browsingContext = tab.linkedBrowser.browsingContext;
+
+  let discarded = await observeDiscarded([browsingContext], () => {
+    BrowserTestUtils.removeTab(tab);
+  });
+
+  ok(
+    !discarded.includes(window.browsingContext),
+    "no notification for the current window's chrome browsing context"
+  );
 });
 
 add_task(async function subframe() {
-  let win = await BrowserTestUtils.openNewBrowserWindow();
-  let bc = await SpecialPowers.spawn(win.gBrowser.selectedBrowser, [], () => {
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  let browsingContext = await SpecialPowers.spawn(tab.linkedBrowser, [], () => {
     let iframe = content.document.createElement("iframe");
     content.document.body.appendChild(iframe);
     iframe.contentWindow.location = "https://example.com/";
     return iframe.browsingContext;
   });
 
-  let promise = BrowserUtils.promiseObserved(TOPIC, subject => subject === bc);
-  await BrowserTestUtils.closeWindow(win);
-  await promise;
+  let discarded = await observeDiscarded([browsingContext], async () => {
+    await SpecialPowers.spawn(tab.linkedBrowser, [], () => {
+      let iframe = content.document.querySelector("iframe");
+      iframe.remove();
+    });
+  });
+
+  ok(
+    !discarded.includes(tab.browsingContext),
+    "no notification for toplevel browsing context"
+  );
 
-  // If we make it here, then we've received the notification.
-  ok(true, "got subframe notification");
+  BrowserTestUtils.removeTab(tab);
 });
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_bug349769.js firefox-85.0+build1/docshell/test/browser/browser_bug349769.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_bug349769.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_bug349769.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,7 +26,7 @@
   for (var uri of uris) {
     await BrowserTestUtils.withNewTab({ gBrowser }, async function(newBrowser) {
       let loadedPromise = BrowserTestUtils.browserLoaded(newBrowser);
-      await BrowserTestUtils.loadURI(newBrowser, uri);
+      BrowserTestUtils.loadURI(newBrowser, uri);
 
       var prin = newBrowser.contentPrincipal;
       isnot(
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_bug420605.js firefox-85.0+build1/docshell/test/browser/browser_bug420605.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_bug420605.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_bug420605.js	2021-01-18 19:58:09.000000000 +0000
@@ -2,29 +2,26 @@
  * https://bugzilla.mozilla.org/show_bug.cgi?id=420605
  */
 
-function test() {
-  waitForExplicitFinish();
+const { PlacesTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PlacesTestUtils.jsm"
+);
 
+add_task(async function test() {
   var pageurl =
     "http://mochi.test:8888/browser/docshell/test/browser/file_bug420605.html";
   var fragmenturl =
     "http://mochi.test:8888/browser/docshell/test/browser/file_bug420605.html#firefox";
 
-  var historyService = Cc[
-    "@mozilla.org/browser/nav-history-service;1"
-  ].getService(Ci.nsINavHistoryService);
-
   /* Queries nsINavHistoryService and returns a single history entry
    * for a given URI */
   function getNavHistoryEntry(aURI) {
-    var options = historyService.getNewQueryOptions();
+    var options = PlacesUtils.history.getNewQueryOptions();
     options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY;
     options.maxResults = 1;
 
-    var query = historyService.getNewQuery();
+    var query = PlacesUtils.history.getNewQuery();
     query.uri = aURI;
-
-    var result = historyService.executeQuery(query, options);
+    var result = PlacesUtils.history.executeQuery(query, options);
     result.root.containerOpen = true;
 
     if (!result.root.childCount) {
@@ -40,9 +37,9 @@
   // Control flow in this test is a bit complicated.
   //
   // When the page loads, onPageLoad (the DOMContentLoaded handler) and
-  // historyObserver::onPageChanged are both called, in some order.  Once
+  // favicon-changed are both called, in some order.  Once
   // they've both run, we click a fragment link in the content page
-  // (clickLinkIfReady), which should trigger another onPageChanged event,
+  // (clickLinkIfReady), which should trigger another favicon-changed event,
   // this time for the fragment's URL.
 
   var _clickLinkTimes = 0;
@@ -57,62 +54,63 @@
     }
   }
 
-  /* Global history observer that triggers for the two test URLs above. */
-  var historyObserver = {
-    onBeginUpdateBatch() {},
-    onEndUpdateBatch() {},
-    onTitleChanged(aURI, aPageTitle) {},
-    onDeleteURI(aURI) {},
-    onClearHistory() {},
-    onPageChanged(aURI, aWhat, aValue) {
-      if (aWhat != Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
-        return;
-      }
-      aURI = aURI.spec;
-      switch (aURI) {
-        case pageurl:
-          ok(aValue, "Favicon value is not null for page without fragment.");
-          originalFavicon = aValue;
+  function onPageLoad() {
+    clickLinkIfReady();
+  }
+
+  // Make sure neither of the test pages haven't been loaded before.
+  var info = getNavHistoryEntry(makeURI(pageurl));
+  ok(!info, "The test page must not have been visited already.");
+  info = getNavHistoryEntry(makeURI(fragmenturl));
+  ok(!info, "The fragment test page must not have been visited already.");
+
+  let promiseIcon1 = PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events =>
+      events.some(e => {
+        if (e.url == pageurl) {
+          ok(
+            e.faviconUrl,
+            "Favicon value is not null for page without fragment."
+          );
+          originalFavicon = e.faviconUrl;
 
           // Now that the favicon has loaded, click on fragment link.
           // This should trigger the |case fragmenturl| below.
           clickLinkIfReady();
-
-          return;
-        case fragmenturl:
+          return true;
+        }
+        return false;
+      }),
+    "places"
+  );
+  let promiseIcon2 = PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events =>
+      events.some(e => {
+        if (e.url == fragmenturl) {
           // If the fragment URL's favicon isn't set, this branch won't
           // be called and the test will time out.
-
           is(
-            aValue,
+            e.faviconUrl,
             originalFavicon,
             "New favicon should be same as original favicon."
           );
+          ok(
+            e.faviconUrl,
+            "Favicon value is not null for page without fragment."
+          );
+          originalFavicon = e.faviconUrl;
 
-          // Let's explicitly check that we can get the favicon
-          // from nsINavHistoryService now.
-          let info = getNavHistoryEntry(makeURI(aURI));
-          ok(info, "There must be a history entry for the fragment.");
-          ok(info.icon, "The history entry must have an associated favicon.");
-          historyService.removeObserver(historyObserver, false);
-          gBrowser.removeCurrentTab();
-          finish();
-      }
-    },
-    onPageExpired(aURI, aVisitTime, aWholeEntry) {},
-    QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
-  };
-  historyService.addObserver(historyObserver);
-
-  function onPageLoad() {
-    clickLinkIfReady();
-  }
-
-  // Make sure neither of the test pages haven't been loaded before.
-  var info = getNavHistoryEntry(makeURI(pageurl));
-  ok(!info, "The test page must not have been visited already.");
-  info = getNavHistoryEntry(makeURI(fragmenturl));
-  ok(!info, "The fragment test page must not have been visited already.");
+          // Now that the favicon has loaded, click on fragment link.
+          // This should trigger the |case fragmenturl| below.
+          clickLinkIfReady();
+          return true;
+        }
+        return false;
+      }),
+    "places"
+  );
 
   // Now open the test page in a new tab.
   gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
@@ -122,4 +120,14 @@
     true
   ).then(onPageLoad);
   BrowserTestUtils.loadURI(gBrowser.selectedBrowser, pageurl);
-}
+
+  await promiseIcon1;
+  await promiseIcon2;
+
+  // Let's explicitly check that we can get the favicon
+  // from nsINavHistoryService now.
+  info = getNavHistoryEntry(makeURI(fragmenturl));
+  ok(info, "There must be a history entry for the fragment.");
+  ok(info.icon, "The history entry must have an associated favicon.");
+  gBrowser.removeCurrentTab();
+});
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_bug503832.js firefox-85.0+build1/docshell/test/browser/browser_bug503832.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_bug503832.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_bug503832.js	2021-01-18 19:58:08.000000000 +0000
@@ -35,7 +35,6 @@
       },
       onDeleteURI(aURI) {},
       onClearHistory() {},
-      onPageChanged(aURI, aWhat, aValue) {},
       onDeleteVisits() {},
       QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
     };
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_bug655270.js firefox-85.0+build1/docshell/test/browser/browser_bug655270.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_bug655270.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_bug655270.js	2021-01-18 19:58:08.000000000 +0000
@@ -8,53 +8,57 @@
  * old favicon with the new URI.
  */
 
-function test() {
+const { PlacesTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PlacesTestUtils.jsm"
+);
+
+add_task(async function test() {
   const testDir = "http://mochi.test:8888/browser/docshell/test/browser/";
   const origURL = testDir + "file_bug655270.html";
   const newURL = origURL + "?new_page";
 
   const faviconURL = testDir + "favicon_bug655270.ico";
 
-  waitForExplicitFinish();
-
-  let tab = BrowserTestUtils.addTab(gBrowser, origURL);
+  let icon1;
+  let promiseIcon1 = PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events =>
+      events.some(e => {
+        if (e.url == origURL) {
+          icon1 = e.faviconUrl;
+          return true;
+        }
+        return false;
+      }),
+    "places"
+  );
+  let icon2;
+  let promiseIcon2 = PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events =>
+      events.some(e => {
+        if (e.url == newURL) {
+          icon2 = e.faviconUrl;
+          return true;
+        }
+        return false;
+      }),
+    "places"
+  );
 
   // The page at origURL has a <link rel='icon'>, so we should get a call into
   // our observer below when it loads.  Once we verify that we have the right
-  // favicon URI, we call pushState, which should trigger another onPageChange
+  // favicon URI, we call pushState, which should trigger another favicon change
   // event, this time for the URI after pushState.
-
-  let observer = {
-    onPageChanged(aURI, aWhat, aValue) {
-      if (aWhat != Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
-        return;
-      }
-
-      if (aURI.spec == origURL) {
-        is(aValue, faviconURL, "FaviconURL for original URI");
-        // Ignore the promise returned here and wait for the next
-        // onPageChanged notification.
-        SpecialPowers.spawn(tab.linkedBrowser, [], function() {
-          content.history.pushState("", "", "?new_page");
-        });
-      }
-
-      if (aURI.spec == newURL) {
-        is(aValue, faviconURL, "FaviconURL for new URI");
-        gBrowser.removeTab(tab);
-        PlacesUtils.history.removeObserver(this);
-        finish();
-      }
-    },
-
-    onBeginUpdateBatch() {},
-    onEndUpdateBatch() {},
-    onTitleChanged() {},
-    onDeleteURI() {},
-    onClearHistory() {},
-    onDeleteVisits() {},
-    QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
-  };
-
-  PlacesUtils.history.addObserver(observer);
-}
+  let tab = BrowserTestUtils.addTab(gBrowser, origURL);
+  await promiseIcon1;
+  is(icon1, faviconURL, "FaviconURL for original URI");
+  // Ignore the promise returned here and wait for the next
+  // onPageChanged notification.
+  SpecialPowers.spawn(tab.linkedBrowser, [], function() {
+    content.history.pushState("", "", "?new_page");
+  });
+  await promiseIcon2;
+  is(icon2, faviconURL, "FaviconURL for new URI");
+  gBrowser.removeTab(tab);
+});
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_bug670318.js firefox-85.0+build1/docshell/test/browser/browser_bug670318.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_bug670318.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_bug670318.js	2021-01-18 19:58:08.000000000 +0000
@@ -26,8 +26,15 @@
             testDone.resolve = resolve;
           });
 
-          let listener = {
+          // Since listener implements nsISupportsWeakReference, we are
+          // responsible for keeping it alive so that the GC doesn't clear
+          // it before the test completes. We do this by anchoring the listener
+          // to the message manager, and clearing it just before the test
+          // completes.
+          this._testListener = {
+            owner: this,
             OnHistoryNewEntry(aNewURI) {
+              info("OnHistoryNewEntry " + aNewURI.spec + ", " + count);
               if (aNewURI.spec == URL && 5 == ++count) {
                 addEventListener(
                   "load",
@@ -41,8 +48,11 @@
                   { capture: true, once: true }
                 );
 
-                history.legacySHistory.removeSHistoryListener(listener);
-                delete content._testListener;
+                history.legacySHistory.removeSHistoryListener(
+                  this.owner._testListener
+                );
+                delete this.owner._testListener;
+                this.owner = null;
                 content.setTimeout(() => {
                   content.location.reload();
                 }, 0);
@@ -65,13 +75,7 @@
             ]),
           };
 
-          history.legacySHistory.addSHistoryListener(listener);
-          // Since listener implements nsISupportsWeakReference, we are
-          // responsible for keeping it alive so that the GC doesn't clear
-          // it before the test completes. We do this by anchoring the listener
-          // to the content global window, and clearing it just before the test
-          // completes.
-          content._testListener = listener;
+          history.legacySHistory.addSHistoryListener(this._testListener);
           content.location = URL;
 
           await testDone.promise;
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser.ini firefox-85.0+build1/docshell/test/browser/browser.ini
--- firefox-84.0.2+build1/docshell/test/browser/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -72,9 +72,7 @@
 [browser_backforward_userinteraction.js]
 support-files =
   dummy_iframe_page.html
-skip-if = fission # bug 1666515
 [browser_backforward_userinteraction_about.js]
-skip-if = fission
 [browser_bug1543077-1.js]
 [browser_bug1543077-2.js]
 [browser_bug1543077-3.js]
@@ -92,6 +90,9 @@
   file_bug1622420.html
   Bug1622420Child.jsm
 [browser_bug1673702.js]
+skip-if =
+    os == "linux" && bits == 64 && os_version == "18.04" && debug # Bug 1674513
+    os == "win" # Bug 1674513
 support-files =
   file_bug1673702.json
   file_bug1673702.json^headers^
@@ -119,9 +120,7 @@
 [browser_bug655270.js]
 [browser_bug655273.js]
 [browser_bug670318.js]
-skip-if = fission
 [browser_bug673467.js]
-skip-if = fission
 [browser_bug852909.js]
 skip-if = (verify && debug && (os == 'win'))
 [browser_bug92473.js]
@@ -169,7 +168,12 @@
 skip-if = !e10s # e10s specific test.
 [browser_tab_replace_while_loading.js]
 skip-if = (os == 'linux' && bits == 64 && os_version == '18.04') || (os == "win") # Bug 1604237, Bug 1671794
+[browser_browsing_context_attached.js]
 [browser_browsing_context_discarded.js]
 [browser_fall_back_to_https.js]
 skip-if = (os == 'mac')
 [browser_badCertDomainFixup.js]
+[browser_viewsource_chrome_to_content.js]
+[browser_viewsource_multipart.js]
+support-files =
+  file_basic_multipart.sjs
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_tab_touch_events.js firefox-85.0+build1/docshell/test/browser/browser_tab_touch_events.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_tab_touch_events.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_tab_touch_events.js	2021-01-18 19:58:08.000000000 +0000
@@ -48,9 +48,19 @@
     "Newly created frames should use the new touchEventsOverride flag"
   );
 
-  newFrameWin.location.reload();
-  await ContentTaskUtils.waitForEvent(newFrameWin, "load");
+  // Wait for the non-transient about:blank to load.
+  await ContentTaskUtils.waitForEvent(newFrame, "load");
+  newFrameWin = newFrame.contentWindow;
+  bc = newFrameWin.browsingContext;
+  is(
+    bc.touchEventsOverride,
+    "disabled",
+    "Newly created frames should use the new touchEventsOverride flag"
+  );
 
+  newFrameWin.location.reload();
+  await ContentTaskUtils.waitForEvent(newFrame, "load");
+  newFrameWin = newFrame.contentWindow;
   bc = newFrameWin.browsingContext;
   is(
     bc.touchEventsOverride,
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_viewsource_chrome_to_content.js firefox-85.0+build1/docshell/test/browser/browser_viewsource_chrome_to_content.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_viewsource_chrome_to_content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_viewsource_chrome_to_content.js	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,20 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+const TEST_PATH = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "http://example.com"
+);
+const TEST_URI = `view-source:${TEST_PATH}dummy_page.html`;
+
+add_task(async function chrome_to_content_view_source() {
+  await BrowserTestUtils.withNewTab("about:mozilla", async browser => {
+    is(browser.documentURI.spec, "about:mozilla");
+
+    // This process switch would previously crash in debug builds due to assertion failures.
+    BrowserTestUtils.loadURI(browser, TEST_URI);
+    await BrowserTestUtils.browserLoaded(browser);
+    is(browser.documentURI.spec, TEST_URI);
+  });
+});
diff -Nru firefox-84.0.2+build1/docshell/test/browser/browser_viewsource_multipart.js firefox-85.0+build1/docshell/test/browser/browser_viewsource_multipart.js
--- firefox-84.0.2+build1/docshell/test/browser/browser_viewsource_multipart.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/browser_viewsource_multipart.js	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+const TEST_PATH = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "http://example.com"
+);
+const MULTIPART_URI = `${TEST_PATH}file_basic_multipart.sjs`;
+
+add_task(async function viewsource_multipart_uri() {
+  await BrowserTestUtils.withNewTab("about:blank", async browser => {
+    BrowserTestUtils.loadURI(browser, MULTIPART_URI);
+    await BrowserTestUtils.browserLoaded(browser);
+    is(browser.currentURI.spec, MULTIPART_URI);
+
+    // Continue probing the URL until we find the h1 we're expecting. This
+    // should handle cases where we somehow beat the second document having
+    // loaded.
+    await TestUtils.waitForCondition(async () => {
+      let value = await SpecialPowers.spawn(browser, [], async () => {
+        let headers = content.document.querySelectorAll("h1");
+        is(headers.length, 1, "only one h1 should be present");
+        return headers[0].textContent;
+      });
+
+      ok(value == "First" || value == "Second", "some other value was found?");
+      return value == "Second";
+    });
+
+    // Load a view-source version of the page, which should show the full
+    // content, not handling multipart.
+    BrowserTestUtils.loadURI(browser, `view-source:${MULTIPART_URI}`);
+    await BrowserTestUtils.browserLoaded(browser);
+
+    let viewSourceContent = await SpecialPowers.spawn(browser, [], async () => {
+      return content.document.body.textContent;
+    });
+
+    ok(viewSourceContent.includes("<h1>First</h1>"), "first header");
+    ok(viewSourceContent.includes("<h1>Second</h1>"), "second header");
+    ok(viewSourceContent.includes("BOUNDARY"), "boundary");
+  });
+});
diff -Nru firefox-84.0.2+build1/docshell/test/browser/file_basic_multipart.sjs firefox-85.0+build1/docshell/test/browser/file_basic_multipart.sjs
--- firefox-84.0.2+build1/docshell/test/browser/file_basic_multipart.sjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/browser/file_basic_multipart.sjs	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,24 @@
+"use strict";
+
+function handleRequest(request, response) {
+  response.setHeader(
+    "Content-Type",
+    "multipart/x-mixed-replace;boundary=BOUNDARY",
+    false
+  );
+  response.setStatusLine(request.httpVersion, 200, "OK");
+
+  response.write(`--BOUNDARY
+Content-Type: text/html
+
+<h1>First</h1>
+Will be replaced
+--BOUNDARY
+Content-Type: text/html
+
+<h1>Second</h1>
+This will stick around
+--BOUNDARY
+--BOUNDARY--
+`);
+}
diff -Nru firefox-84.0.2+build1/docshell/test/chrome/bug293235_window.xhtml firefox-85.0+build1/docshell/test/chrome/bug293235_window.xhtml
--- firefox-84.0.2+build1/docshell/test/chrome/bug293235_window.xhtml	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/chrome/bug293235_window.xhtml	2021-01-18 19:58:09.000000000 +0000
@@ -29,26 +29,6 @@
       let testURI = NetUtil.newURI(getHttpUrl("bug293235_p2.html"));
       let os = Cc["@mozilla.org/observer-service;1"].
                getService(Ci.nsIObserverService);
-      const URI_VISITED_RESOLUTION_TOPIC = "visited-status-resolution";
-      let observer = {
-        notified: false,
-        observe: function(aSubject, aTopic, aData)
-        {
-          if (!testURI.equals(aSubject.QueryInterface(Ci.nsIURI))) {
-            return;
-          }
-          is(aTopic, URI_VISITED_RESOLUTION_TOPIC, "Unexpected topic");
-          this.notified = true;
-
-          // Cleanup after ourselves...
-          os.removeObserver(this, URI_VISITED_RESOLUTION_TOPIC);
-        },
-      };
-      os.addObserver(observer, URI_VISITED_RESOLUTION_TOPIC);
-      function notified() {
-        return observer.notified;
-      }
-
       // Load a test page containing a link that should be initially
       // blue, per the :link style.
       await new Promise(resolve => {
@@ -58,11 +38,6 @@
         });
       });
 
-      // Before we go any further, make sure our link has been notified.
-      await new Promise(resolve => {
-        waitForTrue(notified, resolve);
-      });
-
       // Now that we've been notified, we can check our link color.
       // Since we can't use getComputedStyle() for this because
       // getComputedStyle lies about styles that result from :visited,
@@ -89,7 +64,7 @@
             resolve();
         }
 
-        // Because adding visits is async, we will not be notified imemdiately.
+        // Because adding visits is async, we will not be notified immediately.
         let visitObserver = {
           observe: function(aSubject, aTopic, aData)
           {
diff -Nru firefox-84.0.2+build1/docshell/test/chrome/test_bug909218.html firefox-85.0+build1/docshell/test/chrome/test_bug909218.html
--- firefox-84.0.2+build1/docshell/test/chrome/test_bug909218.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/chrome/test_bug909218.html	2021-01-18 19:58:09.000000000 +0000
@@ -92,7 +92,7 @@
     // have the flag, so we just ignore them.
     // We also see, eg, resource://gre-resources/loading-image.png, so
     // skip resource:// URLs too.
-    // We may also see, eg, chrome://browser/skin/chevron.svg, so
+    // We may also see, eg, chrome://global/skin/icons/chevron.svg, so
     // skip chrome:// URLs too.
     if (req.name.startsWith("about:") || req.name.startsWith("resource:") ||
         req.name.startsWith("chrome:") || req.name.startsWith("documentchannel:")) {
diff -Nru firefox-84.0.2+build1/docshell/test/mochitest/mochitest.ini firefox-85.0+build1/docshell/test/mochitest/mochitest.ini
--- firefox-84.0.2+build1/docshell/test/mochitest/mochitest.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/mochitest/mochitest.ini	2021-01-18 19:58:08.000000000 +0000
@@ -63,7 +63,6 @@
   bug1422334_redirect.html^headers^
   !/docshell/test/navigation/blank.html
 [test_bug385434.html]
-skip-if = fission # Hangs, JavaScript error: http://mochi.test:8888/tests/docshell/test/mochitest/test_bug385434.html?currentTestURL=docshell%2Ftest%2Fmochitest%2Ftest_bug385434.html&closeWhenDone=undefined&showTestReport=true&expected=pass, line 132: NS_ERROR_FAILURE:; Bug 1668809
 [test_bug387979.html]
 [test_bug402210.html]
 [test_bug404548.html]
@@ -100,11 +99,9 @@
 [test_bug668513.html]
 support-files = file_bug668513.html
 [test_bug669671.html]
-skip-if = fission # Bug 1674519
 [test_bug675587.html]
 support-files = file_bug675587.html
 [test_bug680257.html]
-skip-if = fission
 [test_bug691547.html]
 [test_bug694612.html]
 [test_bug703855.html]
diff -Nru firefox-84.0.2+build1/docshell/test/mochitest/test_bug680257.html firefox-85.0+build1/docshell/test/mochitest/test_bug680257.html
--- firefox-84.0.2+build1/docshell/test/mochitest/test_bug680257.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/mochitest/test_bug680257.html	2021-01-18 19:58:09.000000000 +0000
@@ -19,7 +19,8 @@
 
 var gTestContinuation = null;
 function continueAsync() {
-  setTimeout(function() { gTestContinuation.next(); })
+  popup.addEventListener("hashchange",
+    function(e) { gTestContinuation.next(); }, { once: true });
 }
 
 // The popup will call into popupLoaded() once it loads.
@@ -38,6 +39,8 @@
   checkPopupLinkStyle(false, "Initial");
 
   popup.location.hash = "a";
+  continueAsync();
+  yield;
   checkPopupLinkStyle(true, "After setting hash");
 
   popup.history.back();
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/browser_bug343515.js firefox-85.0+build1/docshell/test/navigation/browser_bug343515.js
--- firefox-84.0.2+build1/docshell/test/navigation/browser_bug343515.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/browser_bug343515.js	2021-01-18 19:58:09.000000000 +0000
@@ -63,16 +63,13 @@
     Assert.equal(content.frames.length, 2, "Tab 2 should have 2 iframes");
     for (var i = 0; i < content.frames.length; i++) {
       info("step 3, frame " + i + " info: " + content.frames[i].location);
-      let docShell = content.frames[i].docShell;
-      Assert.ok(!docShell.isActive, `Tab2 iframe ${i} should be inactive`);
+      let bc = content.frames[i].browsingContext;
+      Assert.ok(!bc.isActive, `Tab2 iframe ${i} should be inactive`);
     }
   });
 
   // Navigate tab 2 to a different page
-  await BrowserTestUtils.loadURI(
-    ctx.tab2Browser,
-    testPath + "bug343515_pg3.html"
-  );
+  BrowserTestUtils.loadURI(ctx.tab2Browser, testPath + "bug343515_pg3.html");
 
   await BrowserTestUtils.browserLoaded(ctx.tab2Browser);
 
@@ -84,7 +81,8 @@
     ) {
       function isActive(aWindow) {
         var docshell = aWindow.docShell;
-        return docshell.isActive;
+        info(`checking ${docshell.browsingContext.id}`);
+        return docshell.browsingContext.isActive;
       }
 
       let active = expected ? "active" : "inactive";
@@ -160,8 +158,8 @@
 
   await SpecialPowers.spawn(ctx.tab2Browser, [], async function() {
     for (var i = 0; i < content.frames.length; i++) {
-      let docShell = content.frames[i].docShell;
-      Assert.ok(docShell.isActive, `Tab2 iframe ${i} should be active`);
+      let bc = content.frames[i].browsingContext;
+      Assert.ok(bc.isActive, `Tab2 iframe ${i} should be active`);
     }
   });
 
@@ -169,10 +167,7 @@
   await BrowserTestUtils.switchTab(gBrowser, ctx.tab1);
 
   // Navigate to page 3
-  await BrowserTestUtils.loadURI(
-    ctx.tab1Browser,
-    testPath + "bug343515_pg3.html"
-  );
+  BrowserTestUtils.loadURI(ctx.tab1Browser, testPath + "bug343515_pg3.html");
 
   await BrowserTestUtils.browserLoaded(ctx.tab1Browser);
 
@@ -190,7 +185,8 @@
   await SpecialPowers.spawn(ctx.tab1Browser, [], async function() {
     function isActive(aWindow) {
       var docshell = aWindow.docShell;
-      return docshell.isActive;
+      info(`checking ${docshell.browsingContext.id}`);
+      return docshell.browsingContext.isActive;
     }
 
     Assert.ok(isActive(content.frames[0]), "Tab1 iframe 0 should be active");
@@ -205,8 +201,8 @@
 
   await SpecialPowers.spawn(ctx.tab2Browser, [], async function() {
     for (var i = 0; i < content.frames.length; i++) {
-      let docShell = content.frames[i].docShell;
-      Assert.ok(!docShell.isActive, `Tab2 iframe ${i} should be inactive`);
+      let bc = content.frames[i].browsingContext;
+      Assert.ok(!bc.isActive, `Tab2 iframe ${i} should be inactive`);
     }
   });
 
@@ -228,7 +224,8 @@
     }) {
       function isActive(aWindow) {
         var docshell = aWindow.docShell;
-        return docshell.isActive;
+        info(`checking ${docshell.browsingContext.id}`);
+        return docshell.browsingContext.isActive;
       }
 
       let activestr = active ? "active" : "inactive";
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/browser_test_bfcache_eviction.js firefox-85.0+build1/docshell/test/navigation/browser_test_bfcache_eviction.js
--- firefox-84.0.2+build1/docshell/test/navigation/browser_test_bfcache_eviction.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/browser_test_bfcache_eviction.js	2021-01-18 19:58:09.000000000 +0000
@@ -84,7 +84,7 @@
     for (var i = 0; i < 4; i++) {
       testPage = `data:text/html,<html id='html1'><body id='body1'>${i}</body></html>`;
       let pagePromise = BrowserTestUtils.browserLoaded(browser);
-      await BrowserTestUtils.loadURI(browser, testPage);
+      BrowserTestUtils.loadURI(browser, testPage);
       await pagePromise;
     }
     // 7. Wait for 'content viewer evicted' event to go off
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug1300461.html firefox-85.0+build1/docshell/test/navigation/file_bug1300461.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug1300461.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug1300461.html	2021-01-18 19:58:08.000000000 +0000
@@ -46,8 +46,7 @@
           opener.is(shistory.index, 0, "check history index");
           opener.ok(webNav.canGoForward, "check canGoForward");
           opener.info("file_bug1300461.html tests finished");
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         },
       ];
 
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug1326251.html firefox-85.0+build1/docshell/test/navigation/file_bug1326251.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug1326251.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug1326251.html	2021-01-18 19:58:08.000000000 +0000
@@ -141,8 +141,7 @@
         innerStaticFrame = staticFrame.contentDocument.getElementById("staticFrame");
         opener.is(innerStaticFrame.contentDocument.location.href, BASE_URL + "frame1.html", "innerStaticFrame location");
         opener.ok(!staticFrame.contentDocument.getElementById("dynamicFrame"), "innerDynamicFrame should not exist");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       },
     ];
 
@@ -177,13 +176,6 @@
 
     function test() {
       if (opener) {
-        // Disable the subtest for now since it relies on the bfcache.
-        if (opener.SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-          opener.nextTest();
-          window.close();
-          return;
-        }
-
         // Ensure the tests are not executed in onload hander.
         setTimeout(testSteps[opener.testCount++], 0);
       }
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug1379762-1.html firefox-85.0+build1/docshell/test/navigation/file_bug1379762-1.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug1379762-1.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug1379762-1.html	2021-01-18 19:58:09.000000000 +0000
@@ -20,8 +20,7 @@
         // Do this async so our load event gets a chance to fire if it plans to
         // do it.
         setTimeout(function() {
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         });
       }
     };
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug1609475.html firefox-85.0+build1/docshell/test/navigation/file_bug1609475.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug1609475.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug1609475.html	2021-01-18 19:58:09.000000000 +0000
@@ -14,8 +14,7 @@
           var doc2URI = document.getElementById("i2").contentDocument.documentURI;
           opener.ok(doc2URI.includes("frame1.html"),
                     "Should have loaded the initial page to the second iframe. Got " + doc2URI);
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         }, 1000);
       } else if (loadCount > 2) {
         opener.ok(false, "Too many load events");
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug508537_1.html firefox-85.0+build1/docshell/test/navigation/file_bug508537_1.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug508537_1.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug508537_1.html	2021-01-18 19:58:08.000000000 +0000
@@ -10,8 +10,7 @@
         if (opener && ++opener.testCount == 1) {
           window.location = "goback.html";
         } else {
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         }
       }
 
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_bug534178.html firefox-85.0+build1/docshell/test/navigation/file_bug534178.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_bug534178.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_bug534178.html	2021-01-18 19:58:08.000000000 +0000
@@ -13,8 +13,7 @@
         }
         document.body.textContent = isOK ? "PASSED" : "FAILED";
         opener.ok(isOK, "Duplicate session history entries should have been removed!");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
       function ifrload() {
         setTimeout(testDone, 0);
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_document_write_1.html firefox-85.0+build1/docshell/test/navigation/file_document_write_1.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_document_write_1.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_document_write_1.html	2021-01-18 19:58:08.000000000 +0000
@@ -8,8 +8,7 @@
         document.close();
         opener.is(history.length, length,
                   "document.open/close should not change history");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
     </script>
   </head>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_fragment_handling_during_load.html firefox-85.0+build1/docshell/test/navigation/file_fragment_handling_during_load.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_fragment_handling_during_load.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_fragment_handling_during_load.html	2021-01-18 19:58:09.000000000 +0000
@@ -9,8 +9,7 @@
           return;
         }
         opener.ok(true, "Have loaded a new document.");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
       function test() {
         // Test that executing back() before load has started doesn't interrupt
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_nested_frames.html firefox-85.0+build1/docshell/test/navigation/file_nested_frames.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_nested_frames.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_nested_frames.html	2021-01-18 19:58:08.000000000 +0000
@@ -15,8 +15,7 @@
         d.write("test");
         d.close();
         opener.is(window.history.length, 1, "Unexpected history length");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
     </script>
   </head>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_scrollRestoration.html firefox-85.0+build1/docshell/test/navigation/file_scrollRestoration.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_scrollRestoration.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_scrollRestoration.html	2021-01-18 19:58:08.000000000 +0000
@@ -4,13 +4,6 @@
       var oldHistoryObject = null;
 
       function test(event) {
-        // Disable the subtest for now since it relies on the bfcache.
-        if (opener.SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-          opener.nextTest();
-          window.close();
-          return;
-        }
-
         if (!opener.scrollRestorationTest) {
           opener.scrollRestorationTest = 0;
         }
@@ -139,8 +132,7 @@
             } catch (ex) {
               opener.isnot(ex, null, "Did get an exception");
             }
-            opener.nextTest();
-            window.close();
+            opener.finishTest();
             break;
           }
         }
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_shiftReload_and_pushState.html firefox-85.0+build1/docshell/test/navigation/file_shiftReload_and_pushState.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_shiftReload_and_pushState.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_shiftReload_and_pushState.html	2021-01-18 19:58:08.000000000 +0000
@@ -13,8 +13,7 @@
           window.location.reload(true);
         } else {
           opener.ok(true, "Did run history.push");
-          opener.nextTest();
-          window.close();
+          opener.finishTest();
         }
       }
 
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/file_static_and_dynamic_1.html firefox-85.0+build1/docshell/test/navigation/file_static_and_dynamic_1.html
--- firefox-84.0.2+build1/docshell/test/navigation/file_static_and_dynamic_1.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/file_static_and_dynamic_1.html	2021-01-18 19:58:08.000000000 +0000
@@ -17,8 +17,7 @@
         var staticFrame = document.getElementById("staticframe");
         opener.ok(String(staticFrame.contentWindow.location).includes(staticFrame.src),
                   "Wrong document loaded!");
-        opener.nextTest();
-        window.close();
+        opener.finishTest();
       }
     }
     </script>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/mochitest.ini firefox-85.0+build1/docshell/test/navigation/mochitest.ini
--- firefox-84.0.2+build1/docshell/test/navigation/mochitest.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/mochitest.ini	2021-01-18 19:58:08.000000000 +0000
@@ -60,6 +60,7 @@
   file_bug1375833-frame2.html
   test_bug145971.html
   file_bug1609475.html
+  file_bug1379762-1.html
 
 [test_aboutblank_change_process.html]
 [test_bug13871.html]
@@ -90,8 +91,24 @@
 [test_performance_navigation.html]
 skip-if = fission # bug 1666602
 [test_sessionhistory.html]
-skip-if = toolkit == 'android' || fission # RANDOM on android
-support-files = file_bug1379762-1.html
+skip-if = verify && (os == 'mac') && debug && webrender # Hit MOZ_CRASH(Shutdown too long, probably frozen, causing a crash.) bug 1677545
+[test_dynamic_frame_forward_back.html]
+[test_sessionhistory_document_write.html]
+[test_session_history_entry_cleanup.html]
+[test_fragment_handling_during_load.html]
+[test_nested_frames.html]
+[test_shiftReload_and_pushState.html]
+[test_scrollRestoration.html]
+skip-if = fission # It relies on the bfcache
+[test_bug1609475.html]
+[test_bug1300461.html]
+skip-if = fission
+[test_bug1326251.html]
+skip-if = toolkit == 'android' || fission # It relies on the bfcache
+[test_bug1379762.html]
+skip-if = fission # It relies on the bfcache
+[test_static_and_dynamic.html]
+skip-if = true # This was disabled for a few years now anyway, bug 1677544
 [test_sibling-matching-parent.html]
 [test_sibling-off-domain.html]
 [test_triggeringprincipal_frame_nav.html]
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_bug1300461.html firefox-85.0+build1/docshell/test/navigation/test_bug1300461.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_bug1300461.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_bug1300461.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1300461</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1300461">Mozilla Bug 1300461</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+
+    let chromeScript = null;
+    if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
+      chromeScript = SpecialPowers.loadChromeScript(() => {
+        const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+        function doSend(message, fn) {
+          try {
+            // eslint-disable-next-line no-undef
+            sendAsyncMessage(message, {success: true, value: fn()});
+          } catch(_) {
+            // eslint-disable-next-line no-undef
+            sendAsyncMessage(message, {success: false});
+          }
+        }
+
+        // eslint-disable-next-line no-undef
+        addMessageListener("requestedIndex", () => {
+          doSend("requestedIndex", () => {
+            let win = Services.wm.getMostRecentWindow("navigator:browser");
+            let shistory = win.gBrowser.selectedBrowser.browsingContext.sessionHistory;
+            return shistory.requestedIndex;
+          })
+        });
+      });
+    }
+
+    async function getSHRequestedIndex() {
+      let p = chromeScript.promiseOneMessage("requestedIndex");
+      chromeScript.sendAsyncMessage("requestedIndex");
+      let result = await p;
+      ok(result.success, "Got requested index from parent");
+      return result.value;
+    }
+
+    var testCount = 0;
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_bug1300461.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      if (chromeScript) {
+        chromeScript.destroy();
+      }
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_bug1326251.html firefox-85.0+build1/docshell/test/navigation/test_bug1326251.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_bug1326251.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_bug1326251.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1326251</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1326251">Mozilla Bug 1326251</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+
+    let chromeScript = null;
+    if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
+      chromeScript = SpecialPowers.loadChromeScript(() => {
+        const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+        function doSend(message, fn) {
+          try {
+            // eslint-disable-next-line no-undef
+            sendAsyncMessage(message, {success: true, value: fn()});
+          } catch(_) {
+            // eslint-disable-next-line no-undef
+            sendAsyncMessage(message, {success: false});
+          }
+        }
+
+        // eslint-disable-next-line no-undef
+        addMessageListener("evictAllContentViewers", _ => {
+          doSend("evictAllContentViewers", () => {
+            let win = Services.wm.getMostRecentWindow("navigator:browser");
+            let shistory = win.gBrowser.selectedBrowser.browsingContext.sessionHistory;
+            return shistory.evictAllContentViewers();
+          })
+        });
+      });
+    }
+
+    async function evictAllContentViewers() {
+      let p = chromeScript.promiseOneMessage("evictAllContentViewers");
+      chromeScript.sendAsyncMessage("evictAllContentViewers");
+      let result = await p;
+      ok(result.success, "Called evictAllContentViewers from parent");
+    }
+
+    var testCount = 0;
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_bug1326251.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      if (chromeScript) {
+        chromeScript.destroy();
+      }
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_bug1379762.html firefox-85.0+build1/docshell/test/navigation/test_bug1379762.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_bug1379762.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_bug1379762.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1379762</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1379762">Mozilla Bug 1379762</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    var testCount = 0; // Used by the test files.
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_bug1379762-1.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_bug1609475.html firefox-85.0+build1/docshell/test/navigation/test_bug1609475.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_bug1609475.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_bug1609475.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1609475</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1609475">Mozilla Bug 1609475</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_bug1609475.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_dynamic_frame_forward_back.html firefox-85.0+build1/docshell/test/navigation/test_dynamic_frame_forward_back.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_dynamic_frame_forward_back.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_dynamic_frame_forward_back.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 508537</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=508537">Mozilla Bug 508537</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_bug508537_1.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_fragment_handling_during_load.html firefox-85.0+build1/docshell/test/navigation/test_fragment_handling_during_load.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_fragment_handling_during_load.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_fragment_handling_during_load.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for fragment navigation during load</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=978408">Mozilla Bug 978408</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_fragment_handling_during_load.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_nested_frames.html firefox-85.0+build1/docshell/test/navigation/test_nested_frames.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_nested_frames.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_nested_frames.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1090918</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1090918">Mozilla Bug 1090918</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_nested_frames.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close()
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_scrollRestoration.html firefox-85.0+build1/docshell/test/navigation/test_scrollRestoration.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_scrollRestoration.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_scrollRestoration.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1155730</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1155730">Mozilla Bug 1155730</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+    SimpleTest.requestFlakyTimeout("untriaged");
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_scrollRestoration.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    async function case3WaitForBlank() {
+      let loaded = SimpleTest.promiseWaitForCondition(() => {
+        return testWindow.location.href == "about:blank";
+      });
+      await loaded;
+      SpecialPowers.wrap(testWindow).history.back();
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_sessionhistory_document_write.html firefox-85.0+build1/docshell/test/navigation/test_sessionhistory_document_write.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_sessionhistory_document_write.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_sessionhistory_document_write.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Session history + document.write</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_document_write_1.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_session_history_entry_cleanup.html firefox-85.0+build1/docshell/test/navigation/test_session_history_entry_cleanup.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_session_history_entry_cleanup.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_session_history_entry_cleanup.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 534178</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=534178">Mozilla Bug 534178</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_bug534178.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_sessionhistory.html firefox-85.0+build1/docshell/test/navigation/test_sessionhistory.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_sessionhistory.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_sessionhistory.html	2021-01-18 19:58:08.000000000 +0000
@@ -4,92 +4,26 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=
 -->
 <head>
-  <title>Test for Bug </title>
+  <title>Test for Bug 462076</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body onload="nextTest()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=462076">Mozilla Bug 462076</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
   <script type="application/javascript">
-
-    let chromeScript = null;
-    if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-      chromeScript = SpecialPowers.loadChromeScript(() => {
-        const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-        function doSend(message, fn) {
-          try {
-            // eslint-disable-next-line no-undef
-            sendAsyncMessage(message, {success: true, value: fn()});
-          } catch(_) {
-            // eslint-disable-next-line no-undef
-            sendAsyncMessage(message, {success: false});
-          }
-        }
-
-        // eslint-disable-next-line no-undef
-        addMessageListener("requestedIndex", () => {
-          doSend("requestedIndex", () => {
-            let win = Services.wm.getMostRecentWindow("navigator:browser");
-            let shistory = win.gBrowser.selectedBrowser.browsingContext.sessionHistory;
-            return shistory.requestedIndex;
-          })
-        });
-
-        // eslint-disable-next-line no-undef
-        addMessageListener("evictAllContentViewers", _ => {
-          doSend("evictAllContentViewers", () => {
-            let win = Services.wm.getMostRecentWindow("navigator:browser");
-            let shistory = win.gBrowser.selectedBrowser.browsingContext.sessionHistory;
-            return shistory.evictAllContentViewers();
-          })
-        });
-      });
-    }
-
-    async function getSHRequestedIndex() {
-      let p = chromeScript.promiseOneMessage("requestedIndex");
-      chromeScript.sendAsyncMessage("requestedIndex");
-      let result = await p;
-      ok(result.success, "Got requested index from parent");
-      return result.value;
-    }
-
-    async function evictAllContentViewers() {
-      let p = chromeScript.promiseOneMessage("evictAllContentViewers");
-      chromeScript.sendAsyncMessage("evictAllContentViewers");
-      let result = await p;
-      ok(result.success, "Called evictAllContentViewers from parent");
-    }
-
-    /** Test for Bug  **/
-
     var testFiles =
       [ "file_bug462076_1.html",         // Dynamic frames before onload
         "file_bug462076_2.html",         // Dynamic frames when handling onload
         "file_bug462076_3.html",         // Dynamic frames after onload
-        "file_bug508537_1.html",         // Dynamic frames and forward-back
-        "file_document_write_1.html",    // Session history + document.write
-        // "file_static_and_dynamic_1.html",// Static and dynamic frames and forward-back
-        "file_bug534178.html",           // Session history entry clean-up.
-        "file_fragment_handling_during_load.html",
-        "file_nested_frames.html",
-        "file_shiftReload_and_pushState.html",
-        "file_scrollRestoration.html",
-        "file_bug1300461.html",
-        "file_bug1326251.html",
-        "file_bug1379762-1.html",
-        "file_bug1609475.html",
       ];
     var testCount = 0; // Used by the test files.
 
     SimpleTest.waitForExplicitFinish();
-    SimpleTest.requestFlakyTimeout("untriaged");
 
     var testWindow;
     function nextTest_() {
@@ -100,21 +34,10 @@
         testWindow = window.open(nextFile, "", "width=360,height=480");
         testWindow.onunload = function() { }; // to prevent bfcache
       } else {
-        if (chromeScript) {
-          chromeScript.destroy();
-        }
         SimpleTest.finish();
       }
     }
 
-    async function case3WaitForBlank() {
-      let loaded = SimpleTest.promiseWaitForCondition(() => {
-        return testWindow.location.href == "about:blank";
-      });
-      await loaded;
-      SpecialPowers.wrap(testWindow).history.back();
-    }
-
     function nextTest() {
       setTimeout(nextTest_, 0);
     }
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_shiftReload_and_pushState.html firefox-85.0+build1/docshell/test/navigation/test_shiftReload_and_pushState.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_shiftReload_and_pushState.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_shiftReload_and_pushState.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for Bug 1003100</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1003100">Mozilla Bug 1003100</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+        testWindow = window.open("file_shiftReload_and_pushState.html", "", "width=360,height=480");
+        testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/navigation/test_static_and_dynamic.html firefox-85.0+build1/docshell/test/navigation/test_static_and_dynamic.html
--- firefox-84.0.2+build1/docshell/test/navigation/test_static_and_dynamic.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/docshell/test/navigation/test_static_and_dynamic.html	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=
+-->
+<head>
+  <title>Test for static and dynamic frames and forward-back </title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body onload="runTest()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+  <script type="application/javascript">
+    var testCount = 0; // Used by the test files.
+
+    SimpleTest.waitForExplicitFinish();
+
+    var testWindow;
+    function runTest() {
+      testWindow = window.open("file_static_and_dynamic_1.html", "", "width=360,height=480");
+      testWindow.onunload = function() { }; // to prevent bfcache
+    }
+
+    function finishTest() {
+      testWindow.close();
+      SimpleTest.finish();
+    }
+  </script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/docshell/test/unit/test_URIFixup_info.js firefox-85.0+build1/docshell/test/unit/test_URIFixup_info.js
--- firefox-84.0.2+build1/docshell/test/unit/test_URIFixup_info.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/unit/test_URIFixup_info.js	2021-01-18 19:58:08.000000000 +0000
@@ -59,12 +59,12 @@
   {
     input: "http://mozilla/",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
   },
   {
     input: "http://test./",
     fixedURI: "http://test./",
-    alternateURI: "http://www.test./",
+    alternateURI: "https://www.test./",
   },
   {
     input: "127.0.0.1",
@@ -234,13 +234,13 @@
   {
     input: "whitelisted/foo.txt",
     fixedURI: "http://whitelisted/foo.txt",
-    alternateURI: "http://www.whitelisted.com/foo.txt",
+    alternateURI: "https://www.whitelisted.com/foo.txt",
     protocolChange: true,
   },
   {
     input: "mozilla",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -248,7 +248,7 @@
   {
     input: "test.",
     fixedURI: "http://test./",
-    alternateURI: "http://www.test./",
+    alternateURI: "https://www.test./",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -256,7 +256,7 @@
   {
     input: ".test",
     fixedURI: "http://.test/",
-    alternateURI: "http://www..test/",
+    alternateURI: "https://www..test/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -284,7 +284,7 @@
   {
     input: "mozilla ",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -292,7 +292,7 @@
   {
     input: "   mozilla  ",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -312,7 +312,7 @@
   {
     input: "mozilla\n",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -320,7 +320,7 @@
   {
     input: "mozilla \r\n",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -328,7 +328,7 @@
   {
     input: "moz\r\nfirefox\nos\r",
     fixedURI: "http://mozfirefoxos/",
-    alternateURI: "http://www.mozfirefoxos.com/",
+    alternateURI: "https://www.mozfirefoxos.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -348,27 +348,27 @@
   {
     input: "http://whitelisted/",
     fixedURI: "http://whitelisted/",
-    alternateURI: "http://www.whitelisted.com/",
+    alternateURI: "https://www.whitelisted.com/",
     inWhitelist: true,
   },
   {
     input: "whitelisted",
     fixedURI: "http://whitelisted/",
-    alternateURI: "http://www.whitelisted.com/",
+    alternateURI: "https://www.whitelisted.com/",
     protocolChange: true,
     inWhitelist: true,
   },
   {
     input: "whitelisted.",
     fixedURI: "http://whitelisted./",
-    alternateURI: "http://www.whitelisted./",
+    alternateURI: "https://www.whitelisted./",
     protocolChange: true,
     inWhitelist: true,
   },
   {
     input: "mochi.test",
     fixedURI: "http://mochi.test/",
-    alternateURI: "http://www.mochi.test/",
+    alternateURI: "https://www.mochi.test/",
     protocolChange: true,
     inWhitelist: true,
   },
@@ -383,7 +383,7 @@
   {
     input: "some.domain",
     fixedURI: "http://some.domain/",
-    alternateURI: "http://www.some.domain/",
+    alternateURI: "https://www.some.domain/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -391,13 +391,13 @@
   {
     input: "café.com",
     fixedURI: "http://xn--caf-dma.com/",
-    alternateURI: "http://www.xn--caf-dma.com/",
+    alternateURI: "https://www.xn--caf-dma.com/",
     protocolChange: true,
   },
   {
     input: "mozilla.nonexistent",
     fixedURI: "http://mozilla.nonexistent/",
-    alternateURI: "http://www.mozilla.nonexistent/",
+    alternateURI: "https://www.mozilla.nonexistent/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -405,7 +405,7 @@
   {
     input: "mochi.ocm",
     fixedURI: "http://mochi.com/",
-    alternateURI: "http://www.mochi.com/",
+    alternateURI: "https://www.mochi.com/",
     protocolChange: true,
   },
   {
@@ -439,7 +439,7 @@
   {
     input: "5+2",
     fixedURI: "http://5+2/",
-    alternateURI: "http://www.5+2.com/",
+    alternateURI: "https://www.5+2.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -458,13 +458,13 @@
   {
     input: "mozilla.com/?q=search",
     fixedURI: "http://mozilla.com/?q=search",
-    alternateURI: "http://www.mozilla.com/?q=search",
+    alternateURI: "https://www.mozilla.com/?q=search",
     protocolChange: true,
   },
   {
     input: "mozilla.com?q=search",
     fixedURI: "http://mozilla.com/?q=search",
-    alternateURI: "http://www.mozilla.com/?q=search",
+    alternateURI: "https://www.mozilla.com/?q=search",
     protocolChange: true,
   },
   {
@@ -479,7 +479,7 @@
   {
     input: "mozilla.com'?q=search",
     fixedURI: "http://mozilla.com/?q=search",
-    alternateURI: "http://www.mozilla.com/?q=search",
+    alternateURI: "https://www.mozilla.com/?q=search",
     protocolChange: true,
   },
   {
@@ -493,7 +493,7 @@
   {
     input: "':?",
     fixedURI: "http://'/?",
-    alternateURI: "http://www.'.com/?",
+    alternateURI: "https://www.'.com/?",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -501,7 +501,7 @@
   {
     input: "whitelisted?.com",
     fixedURI: "http://whitelisted/?.com",
-    alternateURI: "http://www.whitelisted.com/?.com",
+    alternateURI: "https://www.whitelisted.com/?.com",
     protocolChange: true,
   },
   {
@@ -523,13 +523,13 @@
   {
     input: "mozilla/",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     protocolChange: true,
   },
   {
     input: "mozilla",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     protocolChange: true,
     keywordLookup: true,
     affectedByDNSForSingleWordHosts: true,
@@ -537,7 +537,7 @@
   {
     input: "mozilla5/2",
     fixedURI: "http://mozilla5/2",
-    alternateURI: "http://www.mozilla5.com/2",
+    alternateURI: "https://www.mozilla5.com/2",
     protocolChange: true,
     keywordLookup: true,
     affectedByDNSForSingleWordHosts: true,
@@ -545,7 +545,7 @@
   {
     input: "mozilla/foo",
     fixedURI: "http://mozilla/foo",
-    alternateURI: "http://www.mozilla.com/foo",
+    alternateURI: "https://www.mozilla.com/foo",
     protocolChange: true,
     keywordLookup: true,
     affectedByDNSForSingleWordHosts: true,
@@ -553,7 +553,7 @@
   {
     input: "mozilla\\",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -588,7 +588,7 @@
   {
     input: "plonk/ #",
     fixedURI: "http://plonk/%20#",
-    alternateURI: "http://www.plonk.com/%20#",
+    alternateURI: "https://www.plonk.com/%20#",
     protocolChange: true,
     keywordLookup: false,
   },
@@ -601,13 +601,13 @@
     input:
       "\u10E0\u10D4\u10D2\u10D8\u10E1\u10E2\u10E0\u10D0\u10EA\u10D8\u10D0.\u10D2\u10D4",
     fixedURI: "http://xn--lodaehvb5cdik4g.xn--node/",
-    alternateURI: "http://www.xn--lodaehvb5cdik4g.xn--node/",
+    alternateURI: "https://www.xn--lodaehvb5cdik4g.xn--node/",
     protocolChange: true,
   },
   {
     input: " \t mozilla.org/\t \t ",
     fixedURI: "http://mozilla.org/",
-    alternateURI: "http://www.mozilla.org/",
+    alternateURI: "https://www.mozilla.org/",
     protocolChange: true,
   },
   {
@@ -617,13 +617,13 @@
   {
     input: "mozilla/",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     protocolChange: true,
   },
   {
     input: "mozilla/ test /",
     fixedURI: "http://mozilla/%20test%20/",
-    alternateURI: "http://www.mozilla.com/%20test%20/",
+    alternateURI: "https://www.mozilla.com/%20test%20/",
     protocolChange: true,
   },
   {
@@ -635,6 +635,35 @@
     fixedURI: "http://pserver:8080/",
     protocolChange: true,
   },
+  {
+    input: "http;mozilla",
+    fixedURI: "http://http;mozilla/",
+    alternateURI: "https://www.http;mozilla.com/",
+    keywordLookup: true,
+    protocolChange: true,
+    affectedByDNSForSingleWordHosts: true,
+  },
+  {
+    input: "http//mozilla.org",
+    fixedURI: "http://mozilla.org/",
+    shouldRunTest: flags =>
+      flags & Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS,
+  },
+  {
+    input: "http//mozilla.org",
+    fixedURI: "http://http//mozilla.org",
+    alternateURI: "https://www.http.com//mozilla.org",
+    keywordLookup: true,
+    protocolChange: true,
+    affectedByDNSForSingleWordHosts: true,
+    shouldRunTest: flags =>
+      !(flags & Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS),
+  },
+  {
+    input: "www.mozilla",
+    fixedURI: "http://www.mozilla/",
+    protocolChange: true,
+  },
 ];
 
 if (AppConstants.platform == "win") {
@@ -646,13 +675,13 @@
   testcases.push({
     input: "//mozilla",
     fixedURI: "http://mozilla/",
-    alternateURI: "http://www.mozilla.com/",
+    alternateURI: "https://www.mozilla.com/",
     protocolChange: true,
   });
   testcases.push({
     input: "/a",
     fixedURI: "http://a/",
-    alternateURI: "http://www.a.com/",
+    alternateURI: "https://www.a.com/",
     keywordLookup: true,
     protocolChange: true,
     affectedByDNSForSingleWordHosts: true,
@@ -752,6 +781,7 @@
     protocolChange: expectProtocolChange,
     inWhitelist: inWhitelist,
     affectedByDNSForSingleWordHosts: affectedByDNSForSingleWordHosts,
+    shouldRunTest,
   } of relevantTests) {
     // Explicitly force these into a boolean
     expectKeywordLookup = !!expectKeywordLookup;
@@ -774,6 +804,10 @@
           ")"
       );
 
+      if (shouldRunTest && !shouldRunTest(flags)) {
+        continue;
+      }
+
       let URIInfo;
       try {
         URIInfo = Services.uriFixup.getFixupURIInfo(testInput, flags);
diff -Nru firefox-84.0.2+build1/docshell/test/unit/test_URIFixup.js firefox-85.0+build1/docshell/test/unit/test_URIFixup.js
--- firefox-84.0.2+build1/docshell/test/unit/test_URIFixup.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/docshell/test/unit/test_URIFixup.js	2021-01-18 19:58:08.000000000 +0000
@@ -42,6 +42,24 @@
     fixed: "file:///this/is/a/test.html",
   },
   {
+    // Replace ';' with ':'.
+    wrong: "http;//www.example.com/",
+    fixed: "http://www.example.com/",
+    noPrefValue: "http://http;//www.example.com/",
+  },
+  {
+    // Missing ':'.
+    wrong: "https//www.example.com/",
+    fixed: "https://www.example.com/",
+    noPrefValue: "http://https//www.example.com/",
+  },
+  {
+    // Missing ':' for file scheme.
+    wrong: "file///this/is/a/test.html",
+    fixed: "file:///this/is/a/test.html",
+    noPrefValue: "http://file///this/is/a/test.html",
+  },
+  {
     // Valid should not be changed.
     wrong: "https://example.com/this/is/a/test.html",
     fixed: "https://example.com/this/is/a/test.html",
@@ -86,7 +104,7 @@
       item.wrong,
       Services.uriFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS
     );
-    Assert.equal(preferredURI.spec, item.wrong);
+    Assert.equal(preferredURI.spec, item.noPrefValue || item.wrong);
   }
 });
 
diff -Nru firefox-84.0.2+build1/dom/abort/AbortController.h firefox-85.0+build1/dom/abort/AbortController.h
--- firefox-84.0.2+build1/dom/abort/AbortController.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/abort/AbortController.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,13 +8,15 @@
 #define mozilla_dom_AbortController_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class AbortSignal;
diff -Nru firefox-84.0.2+build1/dom/abort/AbortSignal.cpp firefox-85.0+build1/dom/abort/AbortSignal.cpp
--- firefox-84.0.2+build1/dom/abort/AbortSignal.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/abort/AbortSignal.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "AbortSignal.h"
 
 #include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventBinding.h"
 #include "mozilla/dom/AbortSignalBinding.h"
 #include "mozilla/RefPtr.h"
 
diff -Nru firefox-84.0.2+build1/dom/animation/Animation.cpp firefox-85.0+build1/dom/animation/Animation.cpp
--- firefox-84.0.2+build1/dom/animation/Animation.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/Animation.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -14,9 +14,11 @@
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/DocumentTimeline.h"
 #include "mozilla/dom/MutationObservers.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/AnimationEventDispatcher.h"
 #include "mozilla/AnimationTarget.h"
 #include "mozilla/AutoRestore.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DeclarationBlock.h"
 #include "mozilla/Maybe.h"  // For Maybe
 #include "mozilla/StaticPrefs_dom.h"
@@ -79,6 +81,11 @@
 //
 // ---------------------------------------------------------------------------
 
+Animation::Animation(nsIGlobalObject* aGlobal)
+    : DOMEventTargetHelper(aGlobal), mAnimationIndex(sNextAnimationIndex++) {}
+
+Animation::~Animation() = default;
+
 /* static */
 already_AddRefed<Animation> Animation::ClonePausedAnimation(
     nsIGlobalObject* aGlobal, const Animation& aOther, AnimationEffect& aEffect,
@@ -1856,4 +1863,39 @@
          mEffect->AsKeyframeEffect()->IsRunningOnCompositor();
 }
 
+bool Animation::HasCurrentEffect() const {
+  return GetEffect() && GetEffect()->IsCurrent();
+}
+
+bool Animation::IsInEffect() const {
+  return GetEffect() && GetEffect()->IsInEffect();
+}
+
+StickyTimeDuration Animation::IntervalStartTime(
+    const StickyTimeDuration& aActiveDuration) const {
+  MOZ_ASSERT(AsCSSTransition() || AsCSSAnimation(),
+             "Should be called for CSS animations or transitions");
+  static constexpr StickyTimeDuration zeroDuration = StickyTimeDuration();
+  return std::max(
+      std::min(StickyTimeDuration(-mEffect->SpecifiedTiming().Delay()),
+               aActiveDuration),
+      zeroDuration);
+}
+
+// Later side of the elapsed time range reported in CSS Animations and CSS
+// Transitions events.
+//
+// https://drafts.csswg.org/css-animations-2/#interval-end
+// https://drafts.csswg.org/css-transitions-2/#interval-end
+StickyTimeDuration Animation::IntervalEndTime(
+    const StickyTimeDuration& aActiveDuration) const {
+  MOZ_ASSERT(AsCSSTransition() || AsCSSAnimation(),
+             "Should be called for CSS animations or transitions");
+
+  static constexpr StickyTimeDuration zeroDuration = StickyTimeDuration();
+  return std::max(std::min((EffectEnd() - mEffect->SpecifiedTiming().Delay()),
+                           aActiveDuration),
+                  zeroDuration);
+}
+
 }  // namespace mozilla::dom
diff -Nru firefox-84.0.2+build1/dom/animation/AnimationEffect.cpp firefox-85.0+build1/dom/animation/AnimationEffect.cpp
--- firefox-84.0.2+build1/dom/animation/AnimationEffect.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/AnimationEffect.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -41,6 +41,10 @@
 
 AnimationEffect::~AnimationEffect() = default;
 
+nsISupports* AnimationEffect::GetParentObject() const {
+  return ToSupports(mDocument);
+}
+
 // https://drafts.csswg.org/web-animations/#current
 bool AnimationEffect::IsCurrent() const {
   if (!mAnimation || mAnimation->PlayState() == AnimationPlayState::Finished) {
diff -Nru firefox-84.0.2+build1/dom/animation/AnimationEffect.h firefox-85.0+build1/dom/animation/AnimationEffect.h
--- firefox-84.0.2+build1/dom/animation/AnimationEffect.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/AnimationEffect.h	2021-01-18 19:58:08.000000000 +0000
@@ -34,7 +34,7 @@
 
   virtual KeyframeEffect* AsKeyframeEffect() { return nullptr; }
 
-  nsISupports* GetParentObject() const { return ToSupports(mDocument); }
+  nsISupports* GetParentObject() const;
 
   bool IsCurrent() const;
   bool IsInEffect() const;
diff -Nru firefox-84.0.2+build1/dom/animation/Animation.h firefox-85.0+build1/dom/animation/Animation.h
--- firefox-84.0.2+build1/dom/animation/Animation.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/Animation.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,47 +8,45 @@
 #define mozilla_dom_Animation_h
 
 #include "X11UndefineNone.h"
-#include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/AnimationPerformanceWarning.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/EffectCompositor.h"  // For EffectCompositor::CascadeLevel
 #include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PostRestyleMode.h"
+#include "mozilla/StickyTimeDuration.h"
 #include "mozilla/TimeStamp.h"             // for TimeStamp, TimeDuration
 #include "mozilla/dom/AnimationBinding.h"  // for AnimationPlayState
-#include "mozilla/dom/AnimationEffect.h"
 #include "mozilla/dom/AnimationTimeline.h"
-#include "mozilla/dom/Promise.h"
-#include "nsCSSPropertyID.h"
-#include "nsIGlobalObject.h"
 
 struct JSContext;
 class nsCSSPropertyIDSet;
 class nsIFrame;
+class nsIGlobalObject;
 
 namespace mozilla {
 
 struct AnimationRule;
+class MicroTaskRunnable;
 
 namespace dom {
 
+class AnimationEffect;
 class AsyncFinishNotification;
 class CSSAnimation;
 class CSSTransition;
 class Document;
+class Promise;
 
 class Animation : public DOMEventTargetHelper,
                   public LinkedListElement<Animation> {
  protected:
-  virtual ~Animation() = default;
+  virtual ~Animation();
 
  public:
-  explicit Animation(nsIGlobalObject* aGlobal)
-      : DOMEventTargetHelper(aGlobal), mAnimationIndex(sNextAnimationIndex++) {}
+  explicit Animation(nsIGlobalObject* aGlobal);
 
   // Constructs a copy of |aOther| with a new effect and timeline.
   // This is only intended to be used while making a static clone of a document
@@ -316,10 +314,8 @@
     return PlayState() == AnimationPlayState::Paused;
   }
 
-  bool HasCurrentEffect() const {
-    return GetEffect() && GetEffect()->IsCurrent();
-  }
-  bool IsInEffect() const { return GetEffect() && GetEffect()->IsInEffect(); }
+  bool HasCurrentEffect() const;
+  bool IsInEffect() const;
 
   bool IsPlaying() const {
     return mPlaybackRate != 0.0 && mTimeline &&
@@ -540,15 +536,7 @@
   // https://drafts.csswg.org/css-animations-2/#interval-start
   // https://drafts.csswg.org/css-transitions-2/#interval-start
   StickyTimeDuration IntervalStartTime(
-      const StickyTimeDuration& aActiveDuration) const {
-    MOZ_ASSERT(AsCSSTransition() || AsCSSAnimation(),
-               "Should be called for CSS animations or transitions");
-    static constexpr StickyTimeDuration zeroDuration = StickyTimeDuration();
-    return std::max(
-        std::min(StickyTimeDuration(-mEffect->SpecifiedTiming().Delay()),
-                 aActiveDuration),
-        zeroDuration);
-  }
+      const StickyTimeDuration& aActiveDuration) const;
 
   // Later side of the elapsed time range reported in CSS Animations and CSS
   // Transitions events.
@@ -556,15 +544,7 @@
   // https://drafts.csswg.org/css-animations-2/#interval-end
   // https://drafts.csswg.org/css-transitions-2/#interval-end
   StickyTimeDuration IntervalEndTime(
-      const StickyTimeDuration& aActiveDuration) const {
-    MOZ_ASSERT(AsCSSTransition() || AsCSSAnimation(),
-               "Should be called for CSS animations or transitions");
-
-    static constexpr StickyTimeDuration zeroDuration = StickyTimeDuration();
-    return std::max(std::min((EffectEnd() - mEffect->SpecifiedTiming().Delay()),
-                             aActiveDuration),
-                    zeroDuration);
-  }
+      const StickyTimeDuration& aActiveDuration) const;
 
   TimeStamp GetTimelineCurrentTimeAsTimeStamp() const {
     return mTimeline ? mTimeline->GetCurrentTimeAsTimeStamp() : TimeStamp();
diff -Nru firefox-84.0.2+build1/dom/animation/AnimationUtils.h firefox-85.0+build1/dom/animation/AnimationUtils.h
--- firefox-84.0.2+build1/dom/animation/AnimationUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/AnimationUtils.h	2021-01-18 19:58:08.000000000 +0000
@@ -25,7 +25,8 @@
 
 namespace dom {
 class Document;
-}
+class Element;
+}  // namespace dom
 
 class AnimationUtils {
  public:
diff -Nru firefox-84.0.2+build1/dom/animation/CSSPseudoElement.h firefox-85.0+build1/dom/animation/CSSPseudoElement.h
--- firefox-84.0.2+build1/dom/animation/CSSPseudoElement.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/CSSPseudoElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,9 +9,7 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/RefPtr.h"
 #include "nsCSSPseudoElements.h"
 #include "nsWrapperCache.h"
@@ -49,10 +47,7 @@
     aRetVal.Append(
         nsDependentAtomString(nsCSSPseudoElements::GetPseudoAtom(mPseudoType)));
   }
-  already_AddRefed<dom::Element> Element() const {
-    RefPtr<dom::Element> retVal(mOriginatingElement);
-    return retVal.forget();
-  }
+  dom::Element* Element() const { return mOriginatingElement.get(); }
 
   // Given an element:pseudoType pair, returns the CSSPseudoElement stored as a
   // property on |aElement|. If there is no CSSPseudoElement for the specified
diff -Nru firefox-84.0.2+build1/dom/animation/CSSTransition.h firefox-85.0+build1/dom/animation/CSSTransition.h
--- firefox-84.0.2+build1/dom/animation/CSSTransition.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/CSSTransition.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_CSSTransition_h
 #define mozilla_dom_CSSTransition_h
 
+#include "mozilla/ComputedTiming.h"
 #include "mozilla/dom/Animation.h"
 #include "mozilla/StyleAnimationValue.h"
 #include "AnimationCommon.h"
diff -Nru firefox-84.0.2+build1/dom/animation/DocumentTimeline.cpp firefox-85.0+build1/dom/animation/DocumentTimeline.cpp
--- firefox-84.0.2+build1/dom/animation/DocumentTimeline.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/DocumentTimeline.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -5,7 +5,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DocumentTimeline.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/DocumentTimelineBinding.h"
 #include "AnimationUtils.h"
@@ -41,6 +40,26 @@
 NS_IMPL_ADDREF_INHERITED(DocumentTimeline, AnimationTimeline)
 NS_IMPL_RELEASE_INHERITED(DocumentTimeline, AnimationTimeline)
 
+DocumentTimeline::DocumentTimeline(Document* aDocument,
+                                   const TimeDuration& aOriginTime)
+    : AnimationTimeline(aDocument->GetParentObject()),
+      mDocument(aDocument),
+      mIsObservingRefreshDriver(false),
+      mOriginTime(aOriginTime) {
+  if (mDocument) {
+    mDocument->Timelines().insertBack(this);
+  }
+}
+
+DocumentTimeline::~DocumentTimeline() {
+  MOZ_ASSERT(!mIsObservingRefreshDriver,
+             "Timeline should have disassociated"
+             " from the refresh driver before being destroyed");
+  if (isInList()) {
+    remove();
+  }
+}
+
 JSObject* DocumentTimeline::WrapObject(JSContext* aCx,
                                        JS::Handle<JSObject*> aGivenProto) {
   return DocumentTimeline_Binding::Wrap(aCx, this, aGivenProto);
diff -Nru firefox-84.0.2+build1/dom/animation/DocumentTimeline.h firefox-85.0+build1/dom/animation/DocumentTimeline.h
--- firefox-84.0.2+build1/dom/animation/DocumentTimeline.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/DocumentTimeline.h	2021-01-18 19:58:09.000000000 +0000
@@ -26,25 +26,10 @@
                                public nsATimerAdjustmentObserver,
                                public LinkedListElement<DocumentTimeline> {
  public:
-  DocumentTimeline(Document* aDocument, const TimeDuration& aOriginTime)
-      : AnimationTimeline(aDocument->GetParentObject()),
-        mDocument(aDocument),
-        mIsObservingRefreshDriver(false),
-        mOriginTime(aOriginTime) {
-    if (mDocument) {
-      mDocument->Timelines().insertBack(this);
-    }
-  }
+  DocumentTimeline(Document* aDocument, const TimeDuration& aOriginTime);
 
  protected:
-  virtual ~DocumentTimeline() {
-    MOZ_ASSERT(!mIsObservingRefreshDriver,
-               "Timeline should have disassociated"
-               " from the refresh driver before being destroyed");
-    if (isInList()) {
-      remove();
-    }
-  }
+  virtual ~DocumentTimeline();
 
  public:
   NS_DECL_ISUPPORTS_INHERITED
diff -Nru firefox-84.0.2+build1/dom/animation/KeyframeEffect.h firefox-85.0+build1/dom/animation/KeyframeEffect.h
--- firefox-84.0.2+build1/dom/animation/KeyframeEffect.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/KeyframeEffect.h	2021-01-18 19:58:08.000000000 +0000
@@ -29,7 +29,6 @@
 #include "mozilla/StyleAnimationValue.h"
 #include "mozilla/dom/AnimationEffect.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/Element.h"
 
 struct JSContext;
 class JSObject;
@@ -47,6 +46,7 @@
 class PresShell;
 
 namespace dom {
+class Element;
 class GlobalObject;
 class UnrestrictedDoubleOrKeyframeAnimationOptions;
 class UnrestrictedDoubleOrKeyframeEffectOptions;
@@ -142,10 +142,7 @@
       const UnrestrictedDoubleOrKeyframeAnimationOptions& aOptions,
       ErrorResult& aRv);
 
-  already_AddRefed<Element> GetTarget() const {
-    RefPtr<Element> ret = mTarget.mElement;
-    return ret.forget();
-  }
+  Element* GetTarget() const { return mTarget.mElement.get(); }
   NonOwningAnimationTarget GetAnimationTarget() const {
     return NonOwningAnimationTarget(mTarget.mElement, mTarget.mPseudoType);
   }
diff -Nru firefox-84.0.2+build1/dom/animation/KeyframeUtils.h firefox-85.0+build1/dom/animation/KeyframeUtils.h
--- firefox-84.0.2+build1/dom/animation/KeyframeUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/KeyframeUtils.h	2021-01-18 19:58:08.000000000 +0000
@@ -14,11 +14,12 @@
 
 struct JSContext;
 class JSObject;
-class ComputedStyle;
 struct RawServoDeclarationBlock;
 
 namespace mozilla {
 struct AnimationProperty;
+class ComputedStyle;
+
 enum class PseudoStyleType : uint8_t;
 class ErrorResult;
 struct Keyframe;
diff -Nru firefox-84.0.2+build1/dom/animation/PendingAnimationTracker.cpp firefox-85.0+build1/dom/animation/PendingAnimationTracker.cpp
--- firefox-84.0.2+build1/dom/animation/PendingAnimationTracker.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/PendingAnimationTracker.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "PendingAnimationTracker.h"
 
 #include "mozilla/PresShell.h"
+#include "mozilla/dom/AnimationEffect.h"
 #include "mozilla/dom/AnimationTimeline.h"
 #include "mozilla/dom/Nullable.h"
 #include "nsIFrame.h"
@@ -22,6 +23,9 @@
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(PendingAnimationTracker, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(PendingAnimationTracker, Release)
 
+PendingAnimationTracker::PendingAnimationTracker(dom::Document* aDocument)
+    : mDocument(aDocument) {}
+
 void PendingAnimationTracker::AddPending(dom::Animation& aAnimation,
                                          AnimationSet& aSet) {
   aSet.PutEntry(&aAnimation);
diff -Nru firefox-84.0.2+build1/dom/animation/PendingAnimationTracker.h firefox-85.0+build1/dom/animation/PendingAnimationTracker.h
--- firefox-84.0.2+build1/dom/animation/PendingAnimationTracker.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/PendingAnimationTracker.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_PendingAnimationTracker_h
 
 #include "mozilla/dom/Animation.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/TypedEnumBits.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsTHashtable.h"
@@ -23,8 +22,7 @@
 
 class PendingAnimationTracker final {
  public:
-  explicit PendingAnimationTracker(dom::Document* aDocument)
-      : mDocument(aDocument) {}
+  explicit PendingAnimationTracker(dom::Document* aDocument);
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PendingAnimationTracker)
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(PendingAnimationTracker)
diff -Nru firefox-84.0.2+build1/dom/animation/TimingParams.h firefox-85.0+build1/dom/animation/TimingParams.h
--- firefox-84.0.2+build1/dom/animation/TimingParams.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/animation/TimingParams.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_TimingParams_h
 #define mozilla_TimingParams_h
 
+#include "X11UndefineNone.h"
 #include "nsPrintfCString.h"
 #include "nsStringFwd.h"
 #include "nsPrintfCString.h"
diff -Nru firefox-84.0.2+build1/dom/audiochannel/AudioChannelService.cpp firefox-85.0+build1/dom/audiochannel/AudioChannelService.cpp
--- firefox-84.0.2+build1/dom/audiochannel/AudioChannelService.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/audiochannel/AudioChannelService.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
+#include "mozilla/dom/Document.h"
 
 #include "nsContentUtils.h"
 #include "nsISupportsPrimitives.h"
diff -Nru firefox-84.0.2+build1/dom/base/AbstractRange.cpp firefox-85.0+build1/dom/base/AbstractRange.cpp
--- firefox-84.0.2+build1/dom/base/AbstractRange.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/AbstractRange.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/RangeUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/StaticRange.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
@@ -81,6 +82,8 @@
   Init(aNode);
 }
 
+AbstractRange::~AbstractRange() = default;
+
 void AbstractRange::Init(nsINode* aNode) {
   MOZ_ASSERT(aNode, "range isn't in a document!");
   mOwner = aNode->OwnerDoc();
@@ -202,9 +205,20 @@
   return NS_OK;
 }
 
+nsINode* AbstractRange::GetParentObject() const { return mOwner; }
+
 JSObject* AbstractRange::WrapObject(JSContext* aCx,
                                     JS::Handle<JSObject*> aGivenProto) {
   MOZ_CRASH("Must be overridden");
 }
 
+void AbstractRange::ClearForReuse() {
+  mOwner = nullptr;
+  mStart = RangeBoundary();
+  mEnd = RangeBoundary();
+  mIsPositioned = false;
+  mIsGenerated = false;
+  mCalledByJS = false;
+}
+
 }  // namespace mozilla::dom
diff -Nru firefox-84.0.2+build1/dom/base/AbstractRange.h firefox-85.0+build1/dom/base/AbstractRange.h
--- firefox-84.0.2+build1/dom/base/AbstractRange.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/AbstractRange.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,19 +7,31 @@
 #ifndef mozilla_dom_AbstractRange_h
 #define mozilla_dom_AbstractRange_h
 
+#include <cstdint>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/RangeBoundary.h"
-#include "mozilla/dom/Document.h"
-#include "nsIContent.h"
-#include "nsINode.h"
+#include "mozilla/RefPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
 #include "nsWrapperCache.h"
 
+class JSObject;
+class nsIContent;
+class nsINode;
+struct JSContext;
+
 namespace mozilla {
 namespace dom {
 
+class Document;
+
 class AbstractRange : public nsISupports, public nsWrapperCache {
  protected:
   explicit AbstractRange(nsINode* aNode);
-  virtual ~AbstractRange() = default;
+  virtual ~AbstractRange();
 
  public:
   AbstractRange() = delete;
@@ -75,7 +87,7 @@
                               StartOffset() == EndOffset());
   }
 
-  nsINode* GetParentObject() const { return mOwner; }
+  nsINode* GetParentObject() const;
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) override;
 
@@ -96,14 +108,7 @@
   void Init(nsINode* aNode);
 
  private:
-  void ClearForReuse() {
-    mOwner = nullptr;
-    mStart = RangeBoundary();
-    mEnd = RangeBoundary();
-    mIsPositioned = false;
-    mIsGenerated = false;
-    mCalledByJS = false;
-  }
+  void ClearForReuse();
 
  protected:
   RefPtr<Document> mOwner;
diff -Nru firefox-84.0.2+build1/dom/base/AnonymousContent.h firefox-85.0+build1/dom/base/AnonymousContent.h
--- firefox-84.0.2+build1/dom/base/AnonymousContent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/AnonymousContent.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_AnonymousContent_h
 
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupportsImpl.h"
 
 class nsIPrincipal;
 
diff -Nru firefox-84.0.2+build1/dom/base/AttrArray.cpp firefox-85.0+build1/dom/base/AttrArray.cpp
--- firefox-84.0.2+build1/dom/base/AttrArray.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/AttrArray.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/dom/Document.h"
 
 #include "nsMappedAttributeElement.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/dom/base/Attr.cpp firefox-85.0+build1/dom/base/Attr.cpp
--- firefox-84.0.2+build1/dom/base/Attr.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Attr.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/InternalMutationEvent.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsError.h"
 #include "nsUnicharUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/AutoSuppressEventHandlingAndSuspend.h firefox-85.0+build1/dom/base/AutoSuppressEventHandlingAndSuspend.h
--- firefox-84.0.2+build1/dom/base/AutoSuppressEventHandlingAndSuspend.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/AutoSuppressEventHandlingAndSuspend.h	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,41 @@
+/* -*- 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 dom_base_AutoSuppressEventHandlingAndSuspend_h
+#define dom_base_AutoSuppressEventHandlingAndSuspend_h
+
+#include "mozilla/dom/Document.h"
+#include "nsCOMPtr.h"
+#include "nsPIDOMWindow.h"
+#include "nsTArray.h"
+
+namespace mozilla::dom {
+
+class BrowsingContext;
+class BrowsingContextGroup;
+
+/**
+ * Suppresses event handling and suspends the active inner window for all
+ * in-process documents in a BrowsingContextGroup. This should be used while
+ * spinning the event loop for a synchronous operation (like `window.open()`)
+ * which affects operations in any other window in the same BrowsingContext
+ * group.
+ */
+
+class MOZ_RAII AutoSuppressEventHandlingAndSuspend {
+ public:
+  explicit AutoSuppressEventHandlingAndSuspend(BrowsingContextGroup* aGroup);
+  ~AutoSuppressEventHandlingAndSuspend();
+
+ private:
+  void SuppressBrowsingContext(BrowsingContext* aBC);
+
+  AutoTArray<RefPtr<Document>, 16> mDocuments;
+  AutoTArray<nsCOMPtr<nsPIDOMWindowInner>, 16> mWindows;
+};
+}  // namespace mozilla::dom
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/base/BindContext.cpp firefox-85.0+build1/dom/base/BindContext.cpp
--- firefox-84.0.2+build1/dom/base/BindContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BindContext.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,11 @@
 #include "mozilla/dom/BindContext.h"
 #include "mozilla/dom/BrowsingContext.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/StaticPrefs_browser.h"
+#include "nsContentUtils.h"
+#include "nsError.h"
+#include "nsPIDOMWindow.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/BindContext.h firefox-85.0+build1/dom/base/BindContext.h
--- firefox-84.0.2+build1/dom/base/BindContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BindContext.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,13 +10,15 @@
 #define mozilla_dom_BindContext_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ShadowRoot.h"
+#include "nsINode.h"
 
 namespace mozilla {
 namespace dom {
 
+class Document;
+
 struct MOZ_STACK_CLASS BindContext final {
   // The document that owns the tree we're getting bound to.
   //
diff -Nru firefox-84.0.2+build1/dom/base/BodyConsumer.cpp firefox-85.0+build1/dom/base/BodyConsumer.cpp
--- firefox-84.0.2+build1/dom/base/BodyConsumer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyConsumer.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "BodyConsumer.h"
 
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/BodyUtil.h"
 #include "mozilla/dom/File.h"
@@ -21,8 +22,12 @@
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
+#include "mozilla/ScopeExit.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIFile.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsIStreamLoader.h"
+#include "nsNetUtil.h"
 #include "nsProxyRelease.h"
 
 // Undefine the macro of CreateFile to avoid FileCreatorHelper#CreateFile being
@@ -290,9 +295,14 @@
     WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
     MOZ_ASSERT(workerPrivate);
 
-    RefPtr<StrongWorkerRef> strongWorkerRef = StrongWorkerRef::Create(
-        workerPrivate, "BodyConsumer",
-        [consumer]() { consumer->ShutDownMainThreadConsuming(); });
+    RefPtr<StrongWorkerRef> strongWorkerRef =
+        StrongWorkerRef::Create(workerPrivate, "BodyConsumer", [consumer]() {
+          consumer->mConsumePromise = nullptr;
+          consumer->mBodyConsumed = true;
+          consumer->mShuttingDown = true;
+          consumer->ReleaseObject();
+          consumer->ShutDownMainThreadConsuming();
+        });
     if (NS_WARN_IF(!strongWorkerRef)) {
       aRv.Throw(NS_ERROR_FAILURE);
       return nullptr;
@@ -501,7 +511,7 @@
     // file, then generate and return a File blob.
     nsCOMPtr<nsIFile> file;
     rv = GetBodyLocalFile(getter_AddRefs(file));
-    if (!NS_WARN_IF(NS_FAILED(rv)) && file) {
+    if (!NS_WARN_IF(NS_FAILED(rv)) && file && !aWorkerRef) {
       ChromeFilePropertyBag bag;
       CopyUTF8toUTF16(mBodyMimeType, bag.mType);
 
diff -Nru firefox-84.0.2+build1/dom/base/BodyConsumer.h firefox-85.0+build1/dom/base/BodyConsumer.h
--- firefox-84.0.2+build1/dom/base/BodyConsumer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyConsumer.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/dom/AbortSignal.h"
 #include "mozilla/dom/MutableBlobStorage.h"
 #include "nsIInputStreamPump.h"
-#include "nsNetUtil.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 
diff -Nru firefox-84.0.2+build1/dom/base/BodyStream.cpp firefox-85.0+build1/dom/base/BodyStream.cpp
--- firefox-84.0.2+build1/dom/base/BodyStream.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 #include "nsProxyRelease.h"
 #include "nsStreamUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/BodyStream.h firefox-85.0+build1/dom/base/BodyStream.h
--- firefox-84.0.2+build1/dom/base/BodyStream.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyStream.h	2021-01-18 19:58:08.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsISupportsImpl.h"
 #include "nsNetCID.h"
 #include "nsWeakReference.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Mutex.h"
 
 class nsIGlobalObject;
@@ -23,6 +22,8 @@
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyStream;
diff -Nru firefox-84.0.2+build1/dom/base/BodyUtil.cpp firefox-85.0+build1/dom/base/BodyUtil.cpp
--- firefox-84.0.2+build1/dom/base/BodyUtil.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyUtil.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsIGlobalObject.h"
 #include "mozilla/Encoding.h"
 
+#include "nsCRT.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsDOMString.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/dom/base/BodyUtil.h firefox-85.0+build1/dom/base/BodyUtil.h
--- firefox-84.0.2+build1/dom/base/BodyUtil.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/BodyUtil.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,11 +10,12 @@
 #include "nsString.h"
 #include "nsError.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyUtil final {
diff -Nru firefox-84.0.2+build1/dom/base/CCGCScheduler.h firefox-85.0+build1/dom/base/CCGCScheduler.h
--- firefox-84.0.2+build1/dom/base/CCGCScheduler.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/CCGCScheduler.h	2021-01-18 19:58:08.000000000 +0000
@@ -3,9 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "js/SliceBudget.h"
-#include "mozilla/TimeStamp.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/MainThreadIdlePeriod.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TimeStamp.h"
 #include "nsCycleCollector.h"
+#include "nsJSEnvironment.h"
+
+namespace mozilla {
 
 static const mozilla::TimeDuration kOneMinute =
     mozilla::TimeDuration::FromSeconds(60.0f);
@@ -57,19 +63,35 @@
 // Trigger a CC if the purple buffer exceeds this size when we check it.
 static const uint32_t kCCPurpleLimit = 200;
 
-// if you add statics here, add them to the list in StartupJSEnvironment
+enum class CCRunnerAction {
+  None,
+  ForgetSkippable,
+  CleanupContentUnbinder,
+  CleanupDeferred,
+  CycleCollect,
+  StopRunning
+};
 
-namespace mozilla {
+enum CCRunnerYield { Continue, Yield };
 
-MOZ_ALWAYS_INLINE
-static TimeDuration TimeBetween(TimeStamp aStart, TimeStamp aEnd) {
-  MOZ_ASSERT(aEnd >= aStart);
-  return aEnd - aStart;
-}
+enum CCRunnerForgetSkippableRemoveChildless {
+  KeepChildless = false,
+  RemoveChildless = true
+};
 
-static inline js::SliceBudget BudgetFromDuration(TimeDuration aDuration) {
-  return js::SliceBudget(js::TimeBudget(aDuration.ToMilliseconds()));
-}
+struct CCRunnerStep {
+  // The action to scheduler is instructing the caller to perform.
+  CCRunnerAction mAction;
+
+  // Whether to stop processing actions for this invocation of the timer
+  // callback.
+  CCRunnerYield mYield;
+
+  // If the action is ForgetSkippable, then whether to remove childless nodes
+  // or not. (ForgetSkippable is the only action requiring a parameter; if
+  // that changes, this will become a union.)
+  CCRunnerForgetSkippableRemoveChildless mRemoveChildless;
+};
 
 class CCGCScheduler {
  public:
@@ -81,12 +103,10 @@
 
   // State retrieval
 
-  Maybe<TimeDuration> GetCCBlockedTime(TimeStamp now) const {
-    MOZ_ASSERT_IF(mCCBlockStart.IsNull(), !mInIncrementalGC);
-    if (mCCBlockStart.IsNull()) {
-      return {};
-    }
-    return Some(now - mCCBlockStart);
+  TimeDuration GetCCBlockedTime(TimeStamp aNow) const {
+    MOZ_ASSERT(mInIncrementalGC);
+    MOZ_ASSERT(!mCCBlockStart.IsNull());
+    return aNow - mCCBlockStart;
   }
 
   bool InIncrementalGC() const { return mInIncrementalGC; }
@@ -97,9 +117,19 @@
     return mCleanupsSinceLastGC < aN;
   }
 
+  bool NeedsFullGC() const { return mNeedsFullGC; }
+
   // State modification
 
-  void SetNeedsFullCC() { mNeedsFullCC = true; }
+  void SetNeedsFullGC(bool aNeedGC = true) { mNeedsFullGC = aNeedGC; }
+
+  // Ensure that the current runner does a cycle collection, and trigger a GC
+  // after it finishes.
+  void EnsureCCThenGC() {
+    MOZ_ASSERT(mCCRunnerState != CCRunnerState::Inactive);
+    mNeedsFullCC = true;
+    mNeedsGCAfterCC = true;
+  }
 
   void NoteGCBegin() {
     // Treat all GC as incremental here; non-incremental GC will just appear to
@@ -108,24 +138,25 @@
   }
 
   void NoteGCEnd() {
+    mInIncrementalGC = false;
     mCCBlockStart = TimeStamp();
-    mCleanupsSinceLastGC = 0;
     mInIncrementalGC = false;
+    mNeedsFullCC = true;
+    mHasRunGC = true;
+
+    mCleanupsSinceLastGC = 0;
+    mCCollectedWaitingForGC = 0;
+    mCCollectedZonesWaitingForGC = 0;
+    mLikelyShortLivingObjectsNeedingGC = 0;
   }
 
   // When we decide to do a cycle collection but we're in the middle of an
   // incremental GC, the CC is "locked out" until the GC completes -- unless
   // the wait is too long, and we decide to finish the incremental GC early.
-  enum IsStartingCCLockout { StartingLockout = true, AlreadyLockedOut = false };
-  IsStartingCCLockout EnsureCCIsBlocked(TimeStamp aNow) {
+  void BlockCC(TimeStamp aNow) {
     MOZ_ASSERT(mInIncrementalGC);
-
-    if (mCCBlockStart) {
-      return AlreadyLockedOut;
-    }
-
+    MOZ_ASSERT(mCCBlockStart.IsNull());
     mCCBlockStart = aNow;
-    return StartingLockout;
   }
 
   void UnblockCC() { mCCBlockStart = TimeStamp(); }
@@ -140,9 +171,23 @@
     return aSuspectedBeforeForgetSkippable - suspected;
   }
 
+  // After collecting cycles, record the results that are used in scheduling
+  // decisions.
+  void NoteCycleCollected(const CycleCollectorResults& aResults) {
+    mCCollectedWaitingForGC += aResults.mFreedGCed;
+    mCCollectedZonesWaitingForGC += aResults.mFreedJSZones;
+  }
+
+  // This is invoked when the whole process of collection is done -- i.e., CC
+  // preparation (eg ForgetSkippables), the CC itself, and the optional
+  // followup GC. There really ought to be a separate name for the overall CC
+  // as opposed to the actual cycle collection portion.
   void NoteCCEnd(TimeStamp aWhen) {
     mLastCCEndTime = aWhen;
     mNeedsFullCC = false;
+
+    // The GC for this CC has already been requested.
+    mNeedsGCAfterCC = false;
   }
 
   // The CC was abandoned without running a slice, so we only did forget
@@ -151,75 +196,22 @@
     mLastForgetSkippableCycleEndTime = TimeStamp::Now();
   }
 
-  // Scheduling
+  void Shutdown() { mDidShutdown = true; }
 
-  TimeDuration ComputeInterSliceGCBudget(TimeStamp aDeadline) const {
-    // We use longer budgets when the CC has been locked out but the CC has
-    // tried to run since that means we may have a significant amount of
-    // garbage to collect and it's better to GC in several longer slices than
-    // in a very long one.
-    TimeDuration budget = aDeadline.IsNull() ? mActiveIntersliceGCBudget * 2
-                                             : aDeadline - TimeStamp::Now();
-    if (!mCCBlockStart) {
-      return budget;
-    }
-
-    TimeDuration blockedTime = TimeStamp::Now() - mCCBlockStart;
-    TimeDuration maxSliceGCBudget = mActiveIntersliceGCBudget * 10;
-    double percentOfBlockedTime =
-        std::min(blockedTime / kMaxCCLockedoutTime, 1.0);
-    return std::max(budget, maxSliceGCBudget.MultDouble(percentOfBlockedTime));
-  }
+  // Scheduling
 
   // Return a budget along with a boolean saying whether to prefer to run short
   // slices and stop rather than continuing to the next phase of cycle
   // collection.
-  js::SliceBudget ComputeCCSliceBudget(TimeStamp aDeadline,
-                                       TimeStamp aCCBeginTime,
-                                       TimeStamp aPrevSliceEndTime,
-                                       bool* aPreferShorterSlices) const {
-    TimeStamp now = TimeStamp::Now();
-
-    *aPreferShorterSlices =
-        aDeadline.IsNull() || (aDeadline - now) < kICCSliceBudget;
-
-    TimeDuration baseBudget =
-        aDeadline.IsNull() ? kICCSliceBudget : aDeadline - now;
-
-    if (aCCBeginTime.IsNull()) {
-      // If no CC is in progress, use the standard slice time.
-      return BudgetFromDuration(baseBudget);
-    }
-
-    // Only run a limited slice if we're within the max running time.
-    TimeDuration runningTime = TimeBetween(aCCBeginTime, now);
-    if (runningTime >= kMaxICCDuration) {
-      return js::SliceBudget::unlimited();
-    }
-
-    const TimeDuration maxSlice = TimeDuration::FromMilliseconds(
-        MainThreadIdlePeriod::GetLongIdlePeriod());
+  inline js::SliceBudget ComputeCCSliceBudget(TimeStamp aDeadline,
+                                              TimeStamp aCCBeginTime,
+                                              TimeStamp aPrevSliceEndTime,
+                                              bool* aPreferShorterSlices) const;
 
-    // Try to make up for a delay in running this slice.
-    double sliceDelayMultiplier =
-        TimeBetween(aPrevSliceEndTime, now) / kICCIntersliceDelay;
-    TimeDuration delaySliceBudget =
-        std::min(baseBudget.MultDouble(sliceDelayMultiplier), maxSlice);
-
-    // Increase slice budgets up to |maxSlice| as we approach
-    // half way through the ICC, to avoid large sync CCs.
-    double percentToHalfDone =
-        std::min(2.0 * (runningTime / kMaxICCDuration), 1.0);
-    TimeDuration laterSliceBudget = maxSlice.MultDouble(percentToHalfDone);
-
-    // Note: We may have already overshot the deadline, in which case
-    // baseBudget will be negative and we will end up returning
-    // laterSliceBudget.
-    return BudgetFromDuration(
-        std::max({delaySliceBudget, laterSliceBudget, baseBudget}));
-  }
+  inline TimeDuration ComputeInterSliceGCBudget(TimeStamp aDeadline,
+                                                TimeStamp aNow) const;
 
-  bool ShouldFireForgetSkippable(uint32_t aSuspected) const {
+  bool ShouldForgetSkippable(uint32_t aSuspected) const {
     // Only do a forget skippable if there are more than a few new objects
     // or we're doing the initial forget skippables.
     return ((mPreviousSuspectedCount + 100) <= aSuspected) ||
@@ -237,262 +229,64 @@
             aNow - mLastCCEndTime > kCCForced);
   }
 
-  bool ShouldScheduleCC() const {
-    TimeStamp now = TimeStamp::Now();
+  inline bool ShouldScheduleCC() const;
 
-    // Don't run consecutive CCs too often.
-    if (mCleanupsSinceLastGC && !mLastCCEndTime.IsNull()) {
-      if (now - mLastCCEndTime < kCCDelay) {
-        return false;
-      }
-    }
-
-    // If GC hasn't run recently and forget skippable only cycle was run,
-    // don't start a new cycle too soon.
-    if ((mCleanupsSinceLastGC > kMajorForgetSkippableCalls) &&
-        !mLastForgetSkippableCycleEndTime.IsNull()) {
-      if (now - mLastForgetSkippableCycleEndTime <
-          kTimeBetweenForgetSkippableCycles) {
-        return false;
-      }
-    }
-
-    return IsCCNeeded(nsCycleCollector_suspectedCount(), now);
+  // If we collected a substantial amount of cycles, poke the GC since more
+  // objects might be unreachable now.
+  bool NeedsGCAfterCC() const {
+    return mCCollectedWaitingForGC > 250 || mCCollectedZonesWaitingForGC > 0 ||
+           mLikelyShortLivingObjectsNeedingGC > 2500 || mNeedsGCAfterCC;
   }
 
-  bool IsLastEarlyCCTimer(int32_t aCurrentFireCount) {
+  bool IsLastEarlyCCTimer(int32_t aCurrentFireCount) const {
     int32_t numEarlyTimerFires =
         std::max(int32_t(mCCDelay / kCCSkippableDelay) - 2, 1);
 
     return aCurrentFireCount >= numEarlyTimerFires;
   }
 
-  enum class CCRunnerAction {
-    None,
-    ForgetSkippable,
-    CleanupContentUnbinder,
-    CleanupDeferred,
-    CycleCollect,
-    StopRunning
-  };
-
   enum class CCRunnerState {
     Inactive,
     ReducePurple,
     CleanupChildless,
     CleanupContentUnbinder,
     CleanupDeferred,
-    CycleCollect
-  };
-
-  enum CCRunnerYield { Continue, Yield };
-
-  enum CCRunnerForgetSkippableRemoveChildless {
-    KeepChildless = false,
-    RemoveChildless = true
-  };
-
-  struct CCRunnerStep {
-    // The action to scheduler is instructing the caller to perform.
-    CCRunnerAction mAction;
-
-    // Whether to stop processing actions for this invocation of the timer
-    // callback.
-    CCRunnerYield mYield;
-
-    // If the action is ForgetSkippable, then whether to remove childless nodes
-    // or not. (ForgetSkippable is the only action requiring a parameter; if
-    // that changes, this will become a union.)
-    CCRunnerForgetSkippableRemoveChildless mRemoveChildless;
+    StartCycleCollection,
+    CycleCollecting,
+    Canceled,
+    NumStates
   };
 
-  void ActivateCCRunner() {
-    MOZ_ASSERT(mCCRunnerState == CCRunnerState::Inactive);
-    mCCRunnerState = CCRunnerState::ReducePurple;
-    mCCDelay = kCCDelay;
-    mCCRunnerEarlyFireCount = 0;
+  void InitCCRunnerStateMachine(CCRunnerState initialState) {
+    // The state machine should always have been deactivated after the previous
+    // collection, however far that collection may have gone.
+    MOZ_ASSERT(mCCRunnerState == CCRunnerState::Inactive,
+               "DeactivateCCRunner should have been called");
+    mCCRunnerState = initialState;
+
+    // Currently, there are only two entry points to the non-Inactive part of
+    // the state machine.
+    if (initialState == CCRunnerState::ReducePurple) {
+      mCCDelay = kCCDelay;
+      mCCRunnerEarlyFireCount = 0;
+    } else if (initialState == CCRunnerState::CycleCollecting) {
+      // Nothing needed.
+    } else {
+      MOZ_CRASH("Invalid initial state");
+    }
   }
 
   void DeactivateCCRunner() { mCCRunnerState = CCRunnerState::Inactive; }
 
-  CCRunnerStep GetNextCCRunnerAction(TimeStamp aDeadline, uint32_t aSuspected) {
-    if (mCCRunnerState == CCRunnerState::Inactive) {
-      // When we cancel a cycle, there may have been a final ForgetSkippable.
-      return {CCRunnerAction::StopRunning, Yield};
-    }
-
-    TimeStamp now = TimeStamp::Now();
-
-    if (InIncrementalGC()) {
-      if (EnsureCCIsBlocked(now) == StartingLockout) {
-        // Reset our state so that we run forgetSkippable often enough before
-        // CC. Because of reduced mCCDelay forgetSkippable will be called just
-        // a few times. kMaxCCLockedoutTime limit guarantees that we end up
-        // calling forgetSkippable and CycleCollectNow eventually.
-        mCCRunnerState = CCRunnerState::ReducePurple;
-        mCCRunnerEarlyFireCount = 0;
-        mCCDelay = kCCDelay / int64_t(3);
-        return {CCRunnerAction::None, Yield};
-      }
-
-      if (GetCCBlockedTime(now).value() < kMaxCCLockedoutTime) {
-        return {CCRunnerAction::None, Yield};
-      }
-
-      // Locked out for too long, so proceed and finish the incremental GC
-      // synchronously.
-    }
-
-    // For states that aren't just continuations of previous states, check
-    // whether a CC is still needed (after doing various things to reduce the
-    // purple buffer).
-    switch (mCCRunnerState) {
-      case CCRunnerState::ReducePurple:
-      case CCRunnerState::CleanupDeferred:
-        break;
-
-      default:
-        // If we don't pass the threshold for wanting to cycle collect, stop
-        // now (after possibly doing a final ForgetSkippable).
-        if (!IsCCNeeded(aSuspected, now)) {
-          mCCRunnerState = CCRunnerState::Inactive;
-          NoteForgetSkippableOnlyCycle();
-
-          // Preserve the previous code's idea of when to check whether a
-          // ForgetSkippable should be fired.
-          if (mCCRunnerState != CCRunnerState::CleanupContentUnbinder &&
-              ShouldFireForgetSkippable(aSuspected)) {
-            // The Inactive state will make us StopRunning after this action is
-            // performed (see conditional at top of function).
-            return {CCRunnerAction::ForgetSkippable, Yield, KeepChildless};
-          }
-          return {CCRunnerAction::StopRunning, Yield};
-        }
-    }
-
-    switch (mCCRunnerState) {
-      // ReducePurple: a GC ran (or we otherwise decided to try CC'ing). Wait
-      // for some amount of time (kCCDelay, or less if incremental GC blocked
-      // this CC) while firing regular ForgetSkippable actions before
-      // continuing on.
-      case CCRunnerState::ReducePurple:
-        ++mCCRunnerEarlyFireCount;
-        if (IsLastEarlyCCTimer(mCCRunnerEarlyFireCount)) {
-          mCCRunnerState = CCRunnerState::CleanupChildless;
-        }
-
-        if (ShouldFireForgetSkippable(aSuspected)) {
-          return {CCRunnerAction::ForgetSkippable, Yield, KeepChildless};
-        }
-
-        if (aDeadline.IsNull()) {
-          return {CCRunnerAction::None, Yield};
-        }
-
-        // If we're called during idle time, try to find some work to do by
-        // advancing to the next state, effectively bypassing some possible
-        // forget skippable calls.
-        mCCRunnerState = CCRunnerState::CleanupChildless;
-
-        // Continue on to CleanupChildless, but only after checking IsCCNeeded
-        // again.
-        return GetNextCCRunnerAction(aDeadline, aSuspected);
-
-      // CleanupChildless: do a stronger ForgetSkippable that removes nodes
-      // with no children in the cycle collector graph. This state is split
-      // into 3 parts; the other Cleanup* actions will happen within the same
-      // callback (unless the ForgetSkippable shrinks the purple buffer enough
-      // for the CC to be skipped entirely.)
-      case CCRunnerState::CleanupChildless:
-        mCCRunnerState = CCRunnerState::CleanupContentUnbinder;
-        return {CCRunnerAction::ForgetSkippable, Yield, RemoveChildless};
-
-      // CleanupContentUnbinder: continuing cleanup, clear out the content
-      // unbinder.
-      case CCRunnerState::CleanupContentUnbinder:
-        if (aDeadline.IsNull()) {
-          // Non-idle (waiting) callbacks skip the rest of the cleanup, but
-          // still wait for another fire before the actual CC.
-          mCCRunnerState = CCRunnerState::CycleCollect;
-          return {CCRunnerAction::None, Yield};
-        }
-
-        // Running in an idle callback.
-
-        // The deadline passed, so go straight to CC in the next slice.
-        if (now >= aDeadline) {
-          mCCRunnerState = CCRunnerState::CycleCollect;
-          return {CCRunnerAction::None, Yield};
-        }
-
-        mCCRunnerState = CCRunnerState::CleanupDeferred;
-        return {CCRunnerAction::CleanupContentUnbinder, Continue};
-
-      // CleanupDeferred: continuing cleanup, do deferred deletion.
-      case CCRunnerState::CleanupDeferred:
-        MOZ_ASSERT(!aDeadline.IsNull(),
-                   "Should only be in CleanupDeferred state when idle");
-
-        // Our efforts to avoid a CC have failed. Let the timer fire once more
-        // to trigger a CC.
-        mCCRunnerState = CCRunnerState::CycleCollect;
-        if (now >= aDeadline) {
-          // The deadline passed, go straight to CC in the next slice.
-          return {CCRunnerAction::None, Yield};
-        }
-
-        return {CCRunnerAction::CleanupDeferred, Yield};
-
-      // CycleCollect: the final state where we actually do a slice of cycle
-      // collection and reset the timer.
-      case CCRunnerState::CycleCollect:
-        // We are in the final timer fire and still meet the conditions for
-        // triggering a CC. Let RunCycleCollectorSlice finish the current IGC
-        // if any, because that will allow us to include the GC time in the CC
-        // pause.
-        mCCRunnerState = CCRunnerState::Inactive;
-        return {CCRunnerAction::CycleCollect, Yield};
-
-      default:
-        MOZ_CRASH("Unexpected CCRunner state");
-    };
-  }
+  inline CCRunnerStep GetNextCCRunnerAction(TimeStamp aDeadline,
+                                            uint32_t aSuspected);
 
   // aStartTimeStamp : when the ForgetSkippable timer fired. This may be some
   // time ago, if an incremental GC needed to be finished.
   js::SliceBudget ComputeForgetSkippableBudget(TimeStamp aStartTimeStamp,
-                                               TimeStamp aDeadline) {
-    if (mForgetSkippableFrequencyStartTime.IsNull()) {
-      mForgetSkippableFrequencyStartTime = aStartTimeStamp;
-    } else if (aStartTimeStamp - mForgetSkippableFrequencyStartTime >
-               kOneMinute) {
-      TimeStamp startPlusMinute =
-          mForgetSkippableFrequencyStartTime + kOneMinute;
-
-      // If we had forget skippables only at the beginning of the interval, we
-      // still want to use the whole time, minute or more, for frequency
-      // calculation. mLastForgetSkippableEndTime is needed if forget skippable
-      // takes enough time to push the interval to be over a minute.
-      TimeStamp endPoint =
-          std::max(startPlusMinute, mLastForgetSkippableEndTime);
-
-      // Duration in minutes.
-      double duration =
-          (endPoint - mForgetSkippableFrequencyStartTime).ToSeconds() / 60;
-      uint32_t frequencyPerMinute =
-          uint32_t(mForgetSkippableCounter / duration);
-      Telemetry::Accumulate(Telemetry::FORGET_SKIPPABLE_FREQUENCY,
-                            frequencyPerMinute);
-      mForgetSkippableCounter = 0;
-      mForgetSkippableFrequencyStartTime = aStartTimeStamp;
-    }
-    ++mForgetSkippableCounter;
-
-    TimeDuration budgetTime = aDeadline ? (aDeadline - aStartTimeStamp)
-                                        : kForgetSkippableSliceDuration;
-    return BudgetFromDuration(budgetTime);
-  }
+                                               TimeStamp aDeadline);
 
+ private:
   // State
 
   // An incremental GC is in progress, which blocks the CC from running for its
@@ -502,6 +296,9 @@
   // When the CC started actually waiting for the GC to finish. This will be
   // set to non-null at a later time than mCCLockedOut.
   TimeStamp mCCBlockStart;
+
+  bool mDidShutdown = false;
+
   TimeStamp mLastForgetSkippableEndTime;
   uint32_t mForgetSkippableCounter = 0;
   TimeStamp mForgetSkippableFrequencyStartTime;
@@ -511,14 +308,330 @@
   CCRunnerState mCCRunnerState = CCRunnerState::Inactive;
   int32_t mCCRunnerEarlyFireCount = 0;
   TimeDuration mCCDelay = kCCDelay;
+
+  // Prevent the very first CC from running before we have GC'd and set the
+  // gray bits.
+  bool mHasRunGC = false;
+
   bool mNeedsFullCC = false;
+  bool mNeedsFullGC = true;
+  bool mNeedsGCAfterCC = false;
   uint32_t mPreviousSuspectedCount = 0;
 
   uint32_t mCleanupsSinceLastGC = UINT32_MAX;
 
+ public:
+  uint32_t mCCollectedWaitingForGC = 0;
+  uint32_t mCCollectedZonesWaitingForGC = 0;
+  uint32_t mLikelyShortLivingObjectsNeedingGC = 0;
+
   // Configuration parameters
 
   TimeDuration mActiveIntersliceGCBudget = TimeDuration::FromMilliseconds(5);
 };
 
+js::SliceBudget CCGCScheduler::ComputeCCSliceBudget(
+    TimeStamp aDeadline, TimeStamp aCCBeginTime, TimeStamp aPrevSliceEndTime,
+    bool* aPreferShorterSlices) const {
+  TimeStamp now = TimeStamp::Now();
+
+  *aPreferShorterSlices =
+      aDeadline.IsNull() || (aDeadline - now) < kICCSliceBudget;
+
+  TimeDuration baseBudget =
+      aDeadline.IsNull() ? kICCSliceBudget : aDeadline - now;
+
+  if (aCCBeginTime.IsNull()) {
+    // If no CC is in progress, use the standard slice time.
+    return js::SliceBudget(baseBudget);
+  }
+
+  // Only run a limited slice if we're within the max running time.
+  MOZ_ASSERT(now >= aCCBeginTime);
+  TimeDuration runningTime = now - aCCBeginTime;
+  if (runningTime >= kMaxICCDuration) {
+    return js::SliceBudget::unlimited();
+  }
+
+  const TimeDuration maxSlice =
+      TimeDuration::FromMilliseconds(MainThreadIdlePeriod::GetLongIdlePeriod());
+
+  // Try to make up for a delay in running this slice.
+  MOZ_ASSERT(now >= aPrevSliceEndTime);
+  double sliceDelayMultiplier = (now - aPrevSliceEndTime) / kICCIntersliceDelay;
+  TimeDuration delaySliceBudget =
+      std::min(baseBudget.MultDouble(sliceDelayMultiplier), maxSlice);
+
+  // Increase slice budgets up to |maxSlice| as we approach
+  // half way through the ICC, to avoid large sync CCs.
+  double percentToHalfDone =
+      std::min(2.0 * (runningTime / kMaxICCDuration), 1.0);
+  TimeDuration laterSliceBudget = maxSlice.MultDouble(percentToHalfDone);
+
+  // Note: We may have already overshot the deadline, in which case
+  // baseBudget will be negative and we will end up returning
+  // laterSliceBudget.
+  return js::SliceBudget(std::max({delaySliceBudget, laterSliceBudget, baseBudget}));
+}
+
+inline TimeDuration CCGCScheduler::ComputeInterSliceGCBudget(
+    TimeStamp aDeadline, TimeStamp aNow) const {
+  // We use longer budgets when the CC has been locked out but the CC has
+  // tried to run since that means we may have a significant amount of
+  // garbage to collect and it's better to GC in several longer slices than
+  // in a very long one.
+  TimeDuration budget =
+      aDeadline.IsNull() ? mActiveIntersliceGCBudget * 2 : aDeadline - aNow;
+  if (!mCCBlockStart) {
+    return budget;
+  }
+
+  TimeDuration blockedTime = aNow - mCCBlockStart;
+  TimeDuration maxSliceGCBudget = mActiveIntersliceGCBudget * 10;
+  double percentOfBlockedTime =
+      std::min(blockedTime / kMaxCCLockedoutTime, 1.0);
+  return std::max(budget, maxSliceGCBudget.MultDouble(percentOfBlockedTime));
+}
+
+bool CCGCScheduler::ShouldScheduleCC() const {
+  if (!mHasRunGC) {
+    return false;
+  }
+
+  TimeStamp now = TimeStamp::Now();
+
+  // Don't run consecutive CCs too often.
+  if (mCleanupsSinceLastGC && !mLastCCEndTime.IsNull()) {
+    if (now - mLastCCEndTime < kCCDelay) {
+      return false;
+    }
+  }
+
+  // If GC hasn't run recently and forget skippable only cycle was run,
+  // don't start a new cycle too soon.
+  if ((mCleanupsSinceLastGC > kMajorForgetSkippableCalls) &&
+      !mLastForgetSkippableCycleEndTime.IsNull()) {
+    if (now - mLastForgetSkippableCycleEndTime <
+        kTimeBetweenForgetSkippableCycles) {
+      return false;
+    }
+  }
+
+  return IsCCNeeded(nsCycleCollector_suspectedCount(), now);
+}
+
+CCRunnerStep CCGCScheduler::GetNextCCRunnerAction(TimeStamp aDeadline,
+                                                  uint32_t aSuspected) {
+  struct StateDescriptor {
+    // When in this state, should we first check to see if we still have
+    // enough reason to CC?
+    bool mCanAbortCC;
+
+    // If we do decide to abort the CC, should we still try to forget
+    // skippables one more time?
+    bool mTryFinalForgetSkippable;
+  };
+
+  // The state descriptors for Inactive and Canceled will never actually be
+  // used. We will never call this function while Inactive, and Canceled is
+  // handled specially at the beginning.
+  constexpr StateDescriptor stateDescriptors[] = {
+      {false, false},  /* CCRunnerState::Inactive */
+      {false, false},  /* CCRunnerState::ReducePurple */
+      {true, true},    /* CCRunnerState::CleanupChildless */
+      {true, false},   /* CCRunnerState::CleanupContentUnbinder */
+      {false, false},  /* CCRunnerState::CleanupDeferred */
+      {false, false},  /* CCRunnerState::StartCycleCollection */
+      {false, false},  /* CCRunnerState::CycleCollecting */
+      {false, false}}; /* CCRunnerState::Canceled */
+  static_assert(mozilla::ArrayLength(stateDescriptors) ==
+                    size_t(CCRunnerState::NumStates),
+                "need one state descriptor per state");
+  const StateDescriptor& desc = stateDescriptors[int(mCCRunnerState)];
+
+  // Make sure we initialized the state machine.
+  MOZ_ASSERT(mCCRunnerState != CCRunnerState::Inactive);
+
+  if (mDidShutdown) {
+    return {CCRunnerAction::StopRunning, Yield};
+  }
+
+  if (mCCRunnerState == CCRunnerState::Canceled) {
+    // When we cancel a cycle, there may have been a final ForgetSkippable.
+    return {CCRunnerAction::StopRunning, Yield};
+  }
+
+  TimeStamp now = TimeStamp::Now();
+
+  if (InIncrementalGC()) {
+    if (mCCBlockStart.IsNull()) {
+      BlockCC(now);
+
+      // If we have reached the CycleCollecting state, then ignore CC timer
+      // fires while incremental GC is running. (Running ICC during an IGC
+      // would cause us to synchronously finish the GC, which is bad.)
+      //
+      // If we have not yet started cycle collecting, then reset our state so
+      // that we run forgetSkippable often enough before CC. Because of reduced
+      // mCCDelay, forgetSkippable will be called just a few times.
+      //
+      // The kMaxCCLockedoutTime limit guarantees that we end up calling
+      // forgetSkippable and CycleCollectNow eventually.
+
+      if (mCCRunnerState != CCRunnerState::CycleCollecting) {
+        mCCRunnerState = CCRunnerState::ReducePurple;
+        mCCRunnerEarlyFireCount = 0;
+        mCCDelay = kCCDelay / int64_t(3);
+      }
+      return {CCRunnerAction::None, Yield};
+    }
+
+    if (GetCCBlockedTime(now) < kMaxCCLockedoutTime) {
+      return {CCRunnerAction::None, Yield};
+    }
+
+    // Locked out for too long, so proceed and finish the incremental GC
+    // synchronously.
+  }
+
+  // For states that aren't just continuations of previous states, check
+  // whether a CC is still needed (after doing various things to reduce the
+  // purple buffer).
+  if (desc.mCanAbortCC && !IsCCNeeded(aSuspected, now)) {
+    // If we don't pass the threshold for wanting to cycle collect, stop now
+    // (after possibly doing a final ForgetSkippable).
+    mCCRunnerState = CCRunnerState::Canceled;
+    NoteForgetSkippableOnlyCycle();
+
+    // Preserve the previous code's idea of when to check whether a
+    // ForgetSkippable should be fired.
+    if (desc.mTryFinalForgetSkippable && ShouldForgetSkippable(aSuspected)) {
+      // The Canceled state will make us StopRunning after this action is
+      // performed (see conditional at top of function).
+      return {CCRunnerAction::ForgetSkippable, Yield, KeepChildless};
+    }
+
+    return {CCRunnerAction::StopRunning, Yield};
+  }
+
+  switch (mCCRunnerState) {
+      // ReducePurple: a GC ran (or we otherwise decided to try CC'ing). Wait
+      // for some amount of time (kCCDelay, or less if incremental GC blocked
+      // this CC) while firing regular ForgetSkippable actions before continuing
+      // on.
+    case CCRunnerState::ReducePurple:
+      ++mCCRunnerEarlyFireCount;
+      if (IsLastEarlyCCTimer(mCCRunnerEarlyFireCount)) {
+        mCCRunnerState = CCRunnerState::CleanupChildless;
+      }
+
+      if (ShouldForgetSkippable(aSuspected)) {
+        return {CCRunnerAction::ForgetSkippable, Yield, KeepChildless};
+      }
+
+      if (aDeadline.IsNull()) {
+        return {CCRunnerAction::None, Yield};
+      }
+
+      // If we're called during idle time, try to find some work to do by
+      // advancing to the next state, effectively bypassing some possible forget
+      // skippable calls.
+      mCCRunnerState = CCRunnerState::CleanupChildless;
+
+      // Continue on to CleanupChildless, but only after checking IsCCNeeded
+      // again.
+      return {CCRunnerAction::None, Continue};
+
+      // CleanupChildless: do a stronger ForgetSkippable that removes nodes with
+      // no children in the cycle collector graph. This state is split into 3
+      // parts; the other Cleanup* actions will happen within the same callback
+      // (unless the ForgetSkippable shrinks the purple buffer enough for the CC
+      // to be skipped entirely.)
+    case CCRunnerState::CleanupChildless:
+      mCCRunnerState = CCRunnerState::CleanupContentUnbinder;
+      return {CCRunnerAction::ForgetSkippable, Yield, RemoveChildless};
+
+      // CleanupContentUnbinder: continuing cleanup, clear out the content
+      // unbinder.
+    case CCRunnerState::CleanupContentUnbinder:
+      if (aDeadline.IsNull()) {
+        // Non-idle (waiting) callbacks skip the rest of the cleanup, but still
+        // wait for another fire before the actual CC.
+        mCCRunnerState = CCRunnerState::StartCycleCollection;
+        return {CCRunnerAction::None, Yield};
+      }
+
+      // Running in an idle callback.
+
+      // The deadline passed, so go straight to CC in the next slice.
+      if (now >= aDeadline) {
+        mCCRunnerState = CCRunnerState::StartCycleCollection;
+        return {CCRunnerAction::None, Yield};
+      }
+
+      mCCRunnerState = CCRunnerState::CleanupDeferred;
+      return {CCRunnerAction::CleanupContentUnbinder, Continue};
+
+      // CleanupDeferred: continuing cleanup, do deferred deletion.
+    case CCRunnerState::CleanupDeferred:
+      MOZ_ASSERT(!aDeadline.IsNull(),
+                 "Should only be in CleanupDeferred state when idle");
+
+      // Our efforts to avoid a CC have failed. Let the timer fire once more
+      // to trigger a CC.
+      mCCRunnerState = CCRunnerState::StartCycleCollection;
+      if (now >= aDeadline) {
+        // The deadline passed, go straight to CC in the next slice.
+        return {CCRunnerAction::None, Yield};
+      }
+
+      return {CCRunnerAction::CleanupDeferred, Yield};
+
+      // StartCycleCollection: start actually doing cycle collection slices.
+    case CCRunnerState::StartCycleCollection:
+      // We are in the final timer fire and still meet the conditions for
+      // triggering a CC. Let RunCycleCollectorSlice finish the current IGC if
+      // any, because that will allow us to include the GC time in the CC pause.
+      mCCRunnerState = CCRunnerState::CycleCollecting;
+      [[fallthrough]];
+
+      // CycleCollecting: continue running slices until done.
+    case CCRunnerState::CycleCollecting:
+      return {CCRunnerAction::CycleCollect, Yield};
+
+    default:
+      MOZ_CRASH("Unexpected CCRunner state");
+  };
+}
+
+js::SliceBudget CCGCScheduler::ComputeForgetSkippableBudget(
+    TimeStamp aStartTimeStamp, TimeStamp aDeadline) {
+  if (mForgetSkippableFrequencyStartTime.IsNull()) {
+    mForgetSkippableFrequencyStartTime = aStartTimeStamp;
+  } else if (aStartTimeStamp - mForgetSkippableFrequencyStartTime >
+             kOneMinute) {
+    TimeStamp startPlusMinute = mForgetSkippableFrequencyStartTime + kOneMinute;
+
+    // If we had forget skippables only at the beginning of the interval, we
+    // still want to use the whole time, minute or more, for frequency
+    // calculation. mLastForgetSkippableEndTime is needed if forget skippable
+    // takes enough time to push the interval to be over a minute.
+    TimeStamp endPoint = std::max(startPlusMinute, mLastForgetSkippableEndTime);
+
+    // Duration in minutes.
+    double duration =
+        (endPoint - mForgetSkippableFrequencyStartTime).ToSeconds() / 60;
+    uint32_t frequencyPerMinute = uint32_t(mForgetSkippableCounter / duration);
+    Telemetry::Accumulate(Telemetry::FORGET_SKIPPABLE_FREQUENCY,
+                          frequencyPerMinute);
+    mForgetSkippableCounter = 0;
+    mForgetSkippableFrequencyStartTime = aStartTimeStamp;
+  }
+  ++mForgetSkippableCounter;
+
+  TimeDuration budgetTime =
+      aDeadline ? (aDeadline - aStartTimeStamp) : kForgetSkippableSliceDuration;
+  return js::SliceBudget(budgetTime);
+}
+
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/base/CharacterData.cpp firefox-85.0+build1/dom/base/CharacterData.cpp
--- firefox-84.0.2+build1/dom/base/CharacterData.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/CharacterData.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -30,6 +30,7 @@
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "nsCCUncollectableMarker.h"
 #include "mozAutoDocUpdate.h"
+#include "nsIContentInlines.h"
 #include "nsTextNode.h"
 #include "nsBidiUtils.h"
 #include "PLDHashTable.h"
@@ -61,6 +62,10 @@
   }
 }
 
+Element* CharacterData::GetNameSpaceElement() {
+  return Element::FromNodeOrNull(GetParentNode());
+}
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(CharacterData)
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(CharacterData)
@@ -120,6 +125,14 @@
 
 // Implementation of CharacterData
 
+void CharacterData::SetTextContentInternal(const nsAString& aTextContent,
+                                           nsIPrincipal* aSubjectPrincipal,
+                                           ErrorResult& aError) {
+  // Batch possible DOMSubtreeModified events.
+  mozAutoSubtreeModified subtree(OwnerDoc(), nullptr);
+  return SetNodeValue(aTextContent, aError);
+}
+
 void CharacterData::GetData(nsAString& aData) const {
   if (mText.Is2b()) {
     aData.Truncate();
diff -Nru firefox-84.0.2+build1/dom/base/CharacterData.h firefox-85.0+build1/dom/base/CharacterData.h
--- firefox-84.0.2+build1/dom/base/CharacterData.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/CharacterData.h	2021-01-18 19:58:08.000000000 +0000
@@ -17,13 +17,13 @@
 
 #include "nsTextFragment.h"
 #include "nsError.h"
-#include "mozilla/dom/Element.h"
 #include "nsCycleCollectionParticipant.h"
 
 #include "mozilla/dom/ShadowRoot.h"
 
 namespace mozilla {
 namespace dom {
+class Element;
 class HTMLSlotElement;
 }  // namespace dom
 }  // namespace mozilla
@@ -105,11 +105,7 @@
 
   void SetTextContentInternal(const nsAString& aTextContent,
                               nsIPrincipal* aSubjectPrincipal,
-                              ErrorResult& aError) final {
-    // Batch possible DOMSubtreeModified events.
-    mozAutoSubtreeModified subtree(OwnerDoc(), nullptr);
-    return SetNodeValue(aTextContent, aError);
-  }
+                              ErrorResult& aError) final;
 
   // Implementation for nsIContent
   nsresult BindToTree(BindContext&, nsINode& aParent) override;
@@ -219,9 +215,7 @@
  protected:
   virtual ~CharacterData();
 
-  Element* GetNameSpaceElement() final {
-    return Element::FromNodeOrNull(GetParentNode());
-  }
+  Element* GetNameSpaceElement() final;
 
   nsresult SetTextInternal(
       uint32_t aOffset, uint32_t aCount, const char16_t* aBuffer,
diff -Nru firefox-84.0.2+build1/dom/base/ChildProcessMessageManager.h firefox-85.0+build1/dom/base/ChildProcessMessageManager.h
--- firefox-84.0.2+build1/dom/base/ChildProcessMessageManager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ChildProcessMessageManager.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/SyncMessageSender.h"
 #include "mozilla/dom/MessageManagerBinding.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/base/ChromeNodeList.cpp firefox-85.0+build1/dom/base/ChromeNodeList.cpp
--- firefox-84.0.2+build1/dom/base/ChromeNodeList.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ChromeNodeList.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -5,7 +5,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/ChromeNodeList.h"
+
+#include <new>
+#include <utility>
+#include "mozilla/ErrorResult.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeNodeListBinding.h"
+#include "mozilla/dom/Document.h"
+#include "nsCOMPtr.h"
+#include "nsINode.h"
+#include "nsISupports.h"
+#include "nsPIDOMWindow.h"
+#include "nsString.h"
+#include "nsTArray.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/ChromeNodeList.h firefox-85.0+build1/dom/base/ChromeNodeList.h
--- firefox-84.0.2+build1/dom/base/ChromeNodeList.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ChromeNodeList.h	2021-01-18 19:58:08.000000000 +0000
@@ -4,10 +4,13 @@
  * 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 "Document.h"
-#include "nsCOMArray.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "nsContentList.h"
-#include "nsPIDOMWindow.h"
+
+class JSObject;
+class nsINode;
+struct JSContext;
 
 namespace mozilla {
 class ErrorResult;
diff -Nru firefox-84.0.2+build1/dom/base/ChromeUtils.cpp firefox-85.0+build1/dom/base/ChromeUtils.cpp
--- firefox-84.0.2+build1/dom/base/ChromeUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ChromeUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,47 +13,36 @@
 #include "WrapperFactory.h"
 
 #include "mozilla/Base64.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/PerformanceMetricsCollector.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProcInfo.h"
-#include "mozilla/RDDProcessManager.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/SharedStyleSheetCache.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/IdleDeadline.h"
 #include "mozilla/dom/InProcessParent.h"
-#include "mozilla/dom/InProcessChild.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/dom/MediaMetadata.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/PBrowserParent.h"
-#include "mozilla/dom/PWindowGlobalParent.h"
 #include "mozilla/dom/Performance.h"
+#include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/ReportingHeader.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/WindowBinding.h"  // For IdleRequestCallback/Options
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
-#include "mozilla/net/SocketProcessHost.h"
 #include "IOActivityMonitor.h"
-#include "nsIOService.h"
 #include "nsThreadUtils.h"
 #include "mozJSComponentLoader.h"
 #include "GeckoProfiler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "nsIException.h"
 
 namespace mozilla::dom {
@@ -196,12 +185,37 @@
 /* static */
 void ChromeUtils::AddProfilerMarker(
     GlobalObject& aGlobal, const nsACString& aName,
-    const Optional<DOMHighResTimeStamp>& aStartTime,
+    const ProfilerMarkerOptionsOrDouble& aOptions,
     const Optional<nsACString>& aText) {
 #ifdef MOZ_GECKO_PROFILER
   MarkerOptions options;
+  MarkerCategory category = ::geckoprofiler::category::JS;
+
+  DOMHighResTimeStamp startTime = 0;
+  if (aOptions.IsDouble()) {
+    startTime = aOptions.GetAsDouble();
+  } else {
+    const ProfilerMarkerOptions& opt = aOptions.GetAsProfilerMarkerOptions();
+    startTime = opt.mStartTime;
 
-  if (aStartTime.WasPassed()) {
+    if (opt.mCaptureStack) {
+      options.Set(MarkerStack::Capture());
+    }
+#  define BEGIN_CATEGORY(name, labelAsString, color) \
+    if (opt.mCategory.Equals(labelAsString)) {       \
+      category = ::geckoprofiler::category::name;    \
+    } else
+#  define SUBCATEGORY(supercategory, name, labelAsString)
+#  define END_CATEGORY
+    MOZ_PROFILING_CATEGORY_LIST(BEGIN_CATEGORY, SUBCATEGORY, END_CATEGORY)
+#  undef BEGIN_CATEGORY
+#  undef SUBCATEGORY
+#  undef END_CATEGORY
+    {
+      category = ::geckoprofiler::category::OTHER;
+    }
+  }
+  if (startTime) {
     RefPtr<Performance> performance;
 
     if (NS_IsMainThread()) {
@@ -221,18 +235,23 @@
     if (performance) {
       options.Set(MarkerTiming::IntervalUntilNowFrom(
           performance->CreationTimeStamp() +
-          TimeDuration::FromMilliseconds(aStartTime.Value())));
+          TimeDuration::FromMilliseconds(startTime)));
     } else {
       options.Set(MarkerTiming::IntervalUntilNowFrom(
           TimeStamp::ProcessCreation() +
-          TimeDuration::FromMilliseconds(aStartTime.Value())));
+          TimeDuration::FromMilliseconds(startTime)));
     }
   }
 
-  if (aText.WasPassed()) {
-    PROFILER_MARKER_TEXT(aName, JS, std::move(options), aText.Value());
-  } else {
-    PROFILER_MARKER_UNTYPED(aName, JS, std::move(options));
+  {
+    AUTO_PROFILER_STATS(ChromeUtils::AddProfilerMarker);
+    if (aText.WasPassed()) {
+      profiler_add_marker(aName, category, std::move(options),
+                          ::geckoprofiler::markers::TextMarker{},
+                          aText.Value());
+    } else {
+      profiler_add_marker(aName, category, std::move(options));
+    }
   }
 #endif  // MOZ_GECKO_PROFILER
 }
@@ -1261,11 +1280,6 @@
 }
 
 /* static */
-bool ChromeUtils::IsPopupTokenUnused(GlobalObject& aGlobal) {
-  return PopupBlocker::IsPopupOpeningTokenUnused();
-}
-
-/* static */
 double ChromeUtils::LastExternalProtocolIframeAllowed(GlobalObject& aGlobal) {
   TimeStamp when = PopupBlocker::WhenLastExternalProtocolIframeAllowed();
   if (when.IsNull()) {
diff -Nru firefox-84.0.2+build1/dom/base/ChromeUtils.h firefox-85.0+build1/dom/base/ChromeUtils.h
--- firefox-84.0.2+build1/dom/base/ChromeUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ChromeUtils.h	2021-01-18 19:58:08.000000000 +0000
@@ -11,13 +11,14 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeUtilsBinding.h"
 #include "mozilla/dom/Exceptions.h"
-#include "mozilla/ErrorResult.h"
 #include "nsDOMNavigationTiming.h"  // for DOMHighResTimeStamp
 #include "nsIDOMProcessChild.h"
 #include "nsIDOMProcessParent.h"
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace devtools {
 class HeapSnapshot;
 }  // namespace devtools
@@ -83,7 +84,7 @@
                             const nsAString& aMessage);
 
   static void AddProfilerMarker(GlobalObject& aGlobal, const nsACString& aName,
-                                const Optional<DOMHighResTimeStamp>& aStartTime,
+                                const ProfilerMarkerOptionsOrDouble& aOptions,
                                 const Optional<nsACString>& text);
 
   static void OriginAttributesToSuffix(
@@ -191,8 +192,6 @@
 
   static PopupBlockerState GetPopupControlState(GlobalObject& aGlobal);
 
-  static bool IsPopupTokenUnused(GlobalObject& aGlobal);
-
   static double LastExternalProtocolIframeAllowed(GlobalObject& aGlobal);
 
   static void ResetLastExternalProtocolIframeAllowed(GlobalObject& aGlobal);
diff -Nru firefox-84.0.2+build1/dom/base/Comment.cpp firefox-85.0+build1/dom/base/Comment.cpp
--- firefox-84.0.2+build1/dom/base/Comment.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Comment.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -11,7 +11,9 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Comment.h"
 #include "mozilla/dom/CommentBinding.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "nsPIDOMWindow.h"
 
 using namespace mozilla;
 using namespace dom;
diff -Nru firefox-84.0.2+build1/dom/base/ContentFrameMessageManager.cpp firefox-85.0+build1/dom/base/ContentFrameMessageManager.cpp
--- firefox-84.0.2+build1/dom/base/ContentFrameMessageManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ContentFrameMessageManager.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ContentFrameMessageManager.h"
 #include "js/RootingAPI.h"
+#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ScriptSettings.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/base/ContentIterator.cpp firefox-85.0+build1/dom/base/ContentIterator.cpp
--- firefox-84.0.2+build1/dom/base/ContentIterator.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ContentIterator.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -113,9 +113,32 @@
   return ComparePostMode(aStart, aEnd, *aNode);
 }
 
+// Each concreate class of ContentIteratorBase may be owned by another class
+// which may be owned by JS.  Therefore, all of them should be in the cycle
+// collection.  However, we cannot make non-refcountable classes only with the
+// macros.  So, we need to make them cycle collectable without the macros.
+void ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
+                                 ContentIteratorBase& aField, const char* aName,
+                                 uint32_t aFlags = 0) {
+  ImplCycleCollectionTraverse(aCallback, aField.mCurNode, aName, aFlags);
+  ImplCycleCollectionTraverse(aCallback, aField.mFirst, aName, aFlags);
+  ImplCycleCollectionTraverse(aCallback, aField.mLast, aName, aFlags);
+  ImplCycleCollectionTraverse(aCallback, aField.mClosestCommonInclusiveAncestor,
+                              aName, aFlags);
+}
+
+void ImplCycleCollectionUnlink(ContentIteratorBase& aField) {
+  ImplCycleCollectionUnlink(aField.mCurNode);
+  ImplCycleCollectionUnlink(aField.mFirst);
+  ImplCycleCollectionUnlink(aField.mLast);
+  ImplCycleCollectionUnlink(aField.mClosestCommonInclusiveAncestor);
+}
+
 ContentIteratorBase::ContentIteratorBase(Order aOrder)
     : mIsDone(false), mOrder(aOrder) {}
 
+ContentIteratorBase::~ContentIteratorBase() = default;
+
 /******************************************************
  * Init routines
  ******************************************************/
diff -Nru firefox-84.0.2+build1/dom/base/ContentIterator.h firefox-85.0+build1/dom/base/ContentIterator.h
--- firefox-84.0.2+build1/dom/base/ContentIterator.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ContentIterator.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,10 +10,12 @@
 #include "mozilla/RangeBoundary.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIContent.h"
 #include "nsRange.h"
 #include "nsTArray.h"
 
+class nsIContent;
+class nsINode;
+
 namespace mozilla {
 
 /**
@@ -27,7 +29,7 @@
   ContentIteratorBase() = delete;
   ContentIteratorBase(const ContentIteratorBase&) = delete;
   ContentIteratorBase& operator=(const ContentIteratorBase&) = delete;
-  virtual ~ContentIteratorBase() = default;
+  virtual ~ContentIteratorBase();
 
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(ContentIteratorBase)
 
@@ -110,27 +112,6 @@
   friend void ImplCycleCollectionUnlink(ContentIteratorBase&);
 };
 
-// Each concreate class of ContentIteratorBase may be owned by another class
-// which may be owned by JS.  Therefore, all of them should be in the cycle
-// collection.  However, we cannot make non-refcountable classes only with the
-// macros.  So, we need to make them cycle collectable without the macros.
-inline void ImplCycleCollectionTraverse(
-    nsCycleCollectionTraversalCallback& aCallback, ContentIteratorBase& aField,
-    const char* aName, uint32_t aFlags = 0) {
-  ImplCycleCollectionTraverse(aCallback, aField.mCurNode, aName, aFlags);
-  ImplCycleCollectionTraverse(aCallback, aField.mFirst, aName, aFlags);
-  ImplCycleCollectionTraverse(aCallback, aField.mLast, aName, aFlags);
-  ImplCycleCollectionTraverse(aCallback, aField.mClosestCommonInclusiveAncestor,
-                              aName, aFlags);
-}
-
-inline void ImplCycleCollectionUnlink(ContentIteratorBase& aField) {
-  ImplCycleCollectionUnlink(aField.mCurNode);
-  ImplCycleCollectionUnlink(aField.mFirst);
-  ImplCycleCollectionUnlink(aField.mLast);
-  ImplCycleCollectionUnlink(aField.mClosestCommonInclusiveAncestor);
-}
-
 /**
  * A simple iterator class for traversing the content in "close tag" order.
  */
diff -Nru firefox-84.0.2+build1/dom/base/ContentProcessMessageManager.cpp firefox-85.0+build1/dom/base/ContentProcessMessageManager.cpp
--- firefox-84.0.2+build1/dom/base/ContentProcessMessageManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ContentProcessMessageManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/ParentProcessMessageManager.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/ipc/SharedMap.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/ContentProcessMessageManager.h firefox-85.0+build1/dom/base/ContentProcessMessageManager.h
--- firefox-84.0.2+build1/dom/base/ContentProcessMessageManager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ContentProcessMessageManager.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,8 +9,8 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/MessageManagerGlobal.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "nsCOMPtr.h"
-#include "nsFrameMessageManager.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptContext.h"
 #include "nsServiceManagerUtils.h"
@@ -18,6 +18,8 @@
 #include "nsWrapperCache.h"
 #include "xpcpublic.h"
 
+class nsFrameMessageManager;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/Crypto.cpp firefox-85.0+build1/dom/base/Crypto.cpp
--- firefox-84.0.2+build1/dom/base/Crypto.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Crypto.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,19 +4,15 @@
  * 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 "Crypto.h"
-#include "jsfriendapi.h"
+#include "js/ScalarType.h"
 #include "js/experimental/TypedData.h"  // JS_GetArrayBufferViewType
 #include "nsCOMPtr.h"
 #include "nsIRandomGenerator.h"
-#include "MainThreadUtils.h"
-#include "nsXULAppAPI.h"
 
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/CryptoBinding.h"
+#include "mozilla/dom/SubtleCrypto.h"
 #include "nsServiceManagerUtils.h"
 
-using mozilla::dom::ContentChild;
-
 namespace mozilla::dom {
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Crypto)
diff -Nru firefox-84.0.2+build1/dom/base/CustomElementRegistry.cpp firefox-85.0+build1/dom/base/CustomElementRegistry.cpp
--- firefox-84.0.2+build1/dom/base/CustomElementRegistry.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/CustomElementRegistry.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/dom/CustomEvent.h"
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/AutoRestore.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsHTMLTags.h"
 #include "jsapi.h"
 #include "js/ForOfIterator.h"  // JS::ForOfIterator
@@ -103,25 +104,25 @@
 
 void CustomElementCallback::Call() {
   switch (mType) {
-    case Document::eConnected:
+    case ElementCallbackType::eConnected:
       static_cast<LifecycleConnectedCallback*>(mCallback.get())
           ->Call(mThisObject);
       break;
-    case Document::eDisconnected:
+    case ElementCallbackType::eDisconnected:
       static_cast<LifecycleDisconnectedCallback*>(mCallback.get())
           ->Call(mThisObject);
       break;
-    case Document::eAdopted:
+    case ElementCallbackType::eAdopted:
       static_cast<LifecycleAdoptedCallback*>(mCallback.get())
           ->Call(mThisObject, mAdoptedCallbackArgs.mOldDocument,
                  mAdoptedCallbackArgs.mNewDocument);
       break;
-    case Document::eAttributeChanged:
+    case ElementCallbackType::eAttributeChanged:
       static_cast<LifecycleAttributeChangedCallback*>(mCallback.get())
           ->Call(mThisObject, mArgs.name, mArgs.oldValue, mArgs.newValue,
                  mArgs.namespaceURI);
       break;
-    case Document::eGetCustomInterface:
+    case ElementCallbackType::eGetCustomInterface:
       MOZ_ASSERT_UNREACHABLE("Don't call GetCustomInterface through callback");
       break;
   }
@@ -154,7 +155,7 @@
 }
 
 CustomElementCallback::CustomElementCallback(
-    Element* aThisObject, Document::ElementCallbackType aCallbackType,
+    Element* aThisObject, ElementCallbackType aCallbackType,
     mozilla::dom::CallbackFunction* aCallback)
     : mThisObject(aThisObject), mCallback(aCallback), mType(aCallbackType) {}
 
@@ -439,7 +440,7 @@
 /* static */
 UniquePtr<CustomElementCallback>
 CustomElementRegistry::CreateCustomElementCallback(
-    Document::ElementCallbackType aType, Element* aCustomElement,
+    ElementCallbackType aType, Element* aCustomElement,
     LifecycleCallbackArgs* aArgs,
     LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs,
     CustomElementDefinition* aDefinition) {
@@ -450,31 +451,31 @@
   // Let CALLBACK be the callback associated with the key NAME in CALLBACKS.
   CallbackFunction* func = nullptr;
   switch (aType) {
-    case Document::eConnected:
+    case ElementCallbackType::eConnected:
       if (aDefinition->mCallbacks->mConnectedCallback.WasPassed()) {
         func = aDefinition->mCallbacks->mConnectedCallback.Value();
       }
       break;
 
-    case Document::eDisconnected:
+    case ElementCallbackType::eDisconnected:
       if (aDefinition->mCallbacks->mDisconnectedCallback.WasPassed()) {
         func = aDefinition->mCallbacks->mDisconnectedCallback.Value();
       }
       break;
 
-    case Document::eAdopted:
+    case ElementCallbackType::eAdopted:
       if (aDefinition->mCallbacks->mAdoptedCallback.WasPassed()) {
         func = aDefinition->mCallbacks->mAdoptedCallback.Value();
       }
       break;
 
-    case Document::eAttributeChanged:
+    case ElementCallbackType::eAttributeChanged:
       if (aDefinition->mCallbacks->mAttributeChangedCallback.WasPassed()) {
         func = aDefinition->mCallbacks->mAttributeChangedCallback.Value();
       }
       break;
 
-    case Document::eGetCustomInterface:
+    case ElementCallbackType::eGetCustomInterface:
       MOZ_ASSERT_UNREACHABLE("Don't call GetCustomInterface through callback");
       break;
   }
@@ -501,7 +502,7 @@
 // https://html.spec.whatwg.org/commit-snapshots/65f39c6fc0efa92b0b2b23b93197016af6ac0de6/#enqueue-a-custom-element-callback-reaction
 /* static */
 void CustomElementRegistry::EnqueueLifecycleCallback(
-    Document::ElementCallbackType aType, Element* aCustomElement,
+    ElementCallbackType aType, Element* aCustomElement,
     LifecycleCallbackArgs* aArgs,
     LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs,
     CustomElementDefinition* aDefinition) {
@@ -530,7 +531,7 @@
     return;
   }
 
-  if (aType == Document::eAttributeChanged) {
+  if (aType == ElementCallbackType::eAttributeChanged) {
     RefPtr<nsAtom> attrName = NS_Atomize(aArgs->name);
     if (definition->mObservedAttributes.IsEmpty() ||
         !definition->mObservedAttributes.Contains(attrName)) {
@@ -1188,15 +1189,17 @@
             nsDependentAtomString(attrName), VoidString(), attrValue,
             (namespaceURI.IsEmpty() ? VoidString() : namespaceURI)};
         nsContentUtils::EnqueueLifecycleCallback(
-            Document::eAttributeChanged, aElement, &args, nullptr, aDefinition);
+            ElementCallbackType::eAttributeChanged, aElement, &args, nullptr,
+            aDefinition);
       }
     }
   }
 
   // Step 5.
   if (aElement->IsInComposedDoc()) {
-    nsContentUtils::EnqueueLifecycleCallback(Document::eConnected, aElement,
-                                             nullptr, nullptr, aDefinition);
+    nsContentUtils::EnqueueLifecycleCallback(ElementCallbackType::eConnected,
+                                             aElement, nullptr, nullptr,
+                                             aDefinition);
   }
 
   // Step 6.
diff -Nru firefox-84.0.2+build1/dom/base/CustomElementRegistry.h firefox-85.0+build1/dom/base/CustomElementRegistry.h
--- firefox-84.0.2+build1/dom/base/CustomElementRegistry.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/CustomElementRegistry.h	2021-01-18 19:58:08.000000000 +0000
@@ -11,9 +11,9 @@
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSContext.h"  // for MicroTaskRunnable
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CustomElementRegistryBinding.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/WebComponentsBinding.h"
 #include "nsCycleCollectionParticipant.h"
@@ -22,6 +22,8 @@
 #include "nsContentUtils.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct CustomElementData;
@@ -31,6 +33,14 @@
 class DocGroup;
 class Promise;
 
+enum class ElementCallbackType {
+  eConnected,
+  eDisconnected,
+  eAdopted,
+  eAttributeChanged,
+  eGetCustomInterface
+};
+
 struct LifecycleCallbackArgs {
   nsString name;
   nsString oldValue;
@@ -47,21 +57,20 @@
 
 class CustomElementCallback {
  public:
-  CustomElementCallback(Element* aThisObject,
-                        Document::ElementCallbackType aCallbackType,
+  CustomElementCallback(Element* aThisObject, ElementCallbackType aCallbackType,
                         CallbackFunction* aCallback);
   void Traverse(nsCycleCollectionTraversalCallback& aCb) const;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
   void Call();
   void SetArgs(LifecycleCallbackArgs& aArgs) {
-    MOZ_ASSERT(mType == Document::eAttributeChanged,
+    MOZ_ASSERT(mType == ElementCallbackType::eAttributeChanged,
                "Arguments are only used by attribute changed callback.");
     mArgs = aArgs;
   }
 
   void SetAdoptedCallbackArgs(
       LifecycleAdoptedCallbackArgs& aAdoptedCallbackArgs) {
-    MOZ_ASSERT(mType == Document::eAdopted,
+    MOZ_ASSERT(mType == ElementCallbackType::eAdopted,
                "Arguments are only used by adopted callback.");
     mAdoptedCallbackArgs = aAdoptedCallbackArgs;
   }
@@ -71,7 +80,7 @@
   RefPtr<Element> mThisObject;
   RefPtr<CallbackFunction> mCallback;
   // The type of callback (eCreated, eAttached, etc.)
-  Document::ElementCallbackType mType;
+  ElementCallbackType mType;
   // Arguments to be passed to the callback,
   // used by the attribute changed callback.
   LifecycleCallbackArgs mArgs;
@@ -399,7 +408,7 @@
       JSContext* aCx, JSObject* aConstructor) const;
 
   static void EnqueueLifecycleCallback(
-      Document::ElementCallbackType aType, Element* aCustomElement,
+      ElementCallbackType aType, Element* aCustomElement,
       LifecycleCallbackArgs* aArgs,
       LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs,
       CustomElementDefinition* aDefinition);
@@ -481,7 +490,7 @@
                            nsTArray<RefPtr<nsAtom>>& aArray, ErrorResult& aRv);
 
   static UniquePtr<CustomElementCallback> CreateCustomElementCallback(
-      Document::ElementCallbackType aType, Element* aCustomElement,
+      ElementCallbackType aType, Element* aCustomElement,
       LifecycleCallbackArgs* aArgs,
       LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs,
       CustomElementDefinition* aDefinition);
diff -Nru firefox-84.0.2+build1/dom/base/DocGroup.cpp firefox-85.0+build1/dom/base/DocGroup.cpp
--- firefox-84.0.2+build1/dom/base/DocGroup.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DocGroup.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -12,8 +12,11 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/ThrottledEventQueue.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/DOMTypes.h"
 #include "mozilla/dom/JSExecutionManager.h"
+#include "mozilla/dom/WindowContext.h"
 #include "nsDOMMutationObserver.h"
 #include "nsIDirectTaskDispatcher.h"
 #include "nsProxyRelease.h"
@@ -148,6 +151,16 @@
   mExecutionManager = aManager;
 }
 
+mozilla::dom::CustomElementReactionsStack*
+DocGroup::CustomElementReactionsStack() {
+  MOZ_ASSERT(NS_IsMainThread());
+  if (!mReactionsStack) {
+    mReactionsStack = new mozilla::dom::CustomElementReactionsStack();
+  }
+
+  return mReactionsStack;
+}
+
 void DocGroup::AddDocument(Document* aDocument) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mDocuments.Contains(aDocument));
@@ -209,38 +222,40 @@
   uint64_t windowID = 0;
   uint16_t count = 0;
   uint64_t duration = 0;
-  bool isTopLevel = false;
   nsCString host;
-  nsCOMPtr<nsPIDOMWindowOuter> top;
-  RefPtr<AbstractThread> mainThread;
+  bool isTopLevel = false;
+  RefPtr<BrowsingContext> top;
+  RefPtr<AbstractThread> mainThread =
+      AbstractMainThreadFor(TaskCategory::Performance);
 
-  // iterating on documents until we find the top window
   for (const auto& document : *this) {
-    nsCOMPtr<Document> doc = document;
-    MOZ_ASSERT(doc);
-    nsCOMPtr<nsIURI> docURI = doc->GetDocumentURI();
-    if (!docURI) {
-      continue;
-    }
-    docURI->GetHost(host);
-    // If the host is empty, using the url
     if (host.IsEmpty()) {
-      host = docURI->GetSpecOrDefault();
+      nsCOMPtr<nsIURI> docURI = document->GetDocumentURI();
+      if (!docURI) {
+        continue;
+      }
+
+      docURI->GetHost(host);
+      if (host.IsEmpty()) {
+        host = docURI->GetSpecOrDefault();
+      }
     }
-    // looking for the top level document URI
-    nsPIDOMWindowOuter* win = doc->GetWindow();
-    if (!win) {
+
+    BrowsingContext* context = document->GetBrowsingContext();
+    if (!context) {
       continue;
     }
-    top = win->GetInProcessTop();
-    if (!top) {
+
+    top = context->Top();
+
+    if (!top || !top->GetCurrentWindowContext()) {
       continue;
     }
-    windowID = top->WindowID();
-    isTopLevel = win->GetBrowsingContext()->IsTop();
-    mainThread = AbstractMainThreadFor(TaskCategory::Performance);
+
+    isTopLevel = context->IsTop();
+    windowID = top->GetCurrentWindowContext()->OuterWindowId();
     break;
-  }
+  };
 
   MOZ_ASSERT(!host.IsEmpty());
   duration = mPerformanceCounter->GetExecutionDuration();
@@ -257,7 +272,7 @@
     }
   }
 
-  if (!isTopLevel) {
+  if (!isTopLevel && top && top->IsInProcess()) {
     return PerformanceInfoPromise::CreateAndResolve(
         PerformanceInfo(host, pid, windowID, duration,
                         mPerformanceCounter->GetID(), false, isTopLevel,
@@ -268,8 +283,8 @@
 
   MOZ_ASSERT(mainThread);
   RefPtr<DocGroup> self = this;
-
-  return CollectMemoryInfo(top, mainThread)
+  return (isTopLevel ? CollectMemoryInfo(top, mainThread)
+                     : CollectMemoryInfo(self, mainThread))
       ->Then(
           mainThread, __func__,
           [self, host, pid, windowID, duration, isTopLevel,
diff -Nru firefox-84.0.2+build1/dom/base/DocGroup.h firefox-85.0+build1/dom/base/DocGroup.h
--- firefox-84.0.2+build1/dom/base/DocGroup.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DocGroup.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsString.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
-#include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/HTMLSlotElement.h"
 #include "mozilla/PerformanceCounter.h"
 #include "mozilla/PerformanceTypes.h"
@@ -23,6 +22,9 @@
 class AbstractThread;
 namespace dom {
 
+class CustomElementReactionsStack;
+class JSExecutionManager;
+
 // Two browsing contexts are considered "related" if they are reachable from one
 // another through window.opener, window.parent, or window.frames. This is the
 // spec concept of a browsing context group.
@@ -68,14 +70,7 @@
 
   mozilla::dom::DOMArena* ArenaAllocator() { return mArena; }
 
-  mozilla::dom::CustomElementReactionsStack* CustomElementReactionsStack() {
-    MOZ_ASSERT(NS_IsMainThread());
-    if (!mReactionsStack) {
-      mReactionsStack = new mozilla::dom::CustomElementReactionsStack();
-    }
-
-    return mReactionsStack;
-  }
+  mozilla::dom::CustomElementReactionsStack* CustomElementReactionsStack();
 
   // Adding documents to a DocGroup should be done through
   // BrowsingContextGroup::AddDocument (which in turn calls
diff -Nru firefox-84.0.2+build1/dom/base/Document.cpp firefox-85.0+build1/dom/base/Document.cpp
--- firefox-84.0.2+build1/dom/base/Document.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Document.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,31 +8,106 @@
  * Base class for all our document implementations.
  */
 
-#include "AudioChannelService.h"
 #include "mozilla/dom/Document.h"
-#include "DocumentInlines.h"
+#include "mozilla/dom/DocumentInlines.h"
+
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <initializer_list>
+#include <iterator>
+#include <limits>
+#include <type_traits>
+#include "Attr.h"
+#include "AutoplayPolicy.h"
+#include "ErrorList.h"
+#include "ExpandedPrincipal.h"
+#include "MainThreadUtils.h"
+#include "MobileViewportManager.h"
+#include "NodeUbiReporting.h"
+#include "PLDHashTable.h"
+#include "StorageAccessPermissionRequest.h"
+#include "ThirdPartyUtil.h"
+#include "domstubs.h"
+#include "gfxPlatform.h"
+#include "imgIContainer.h"
+#include "imgLoader.h"
+#include "imgRequestProxy.h"
+#include "js/Value.h"
+#include "jsapi.h"
+#include "mozAutoDocUpdate.h"
+#include "mozIDOMWindow.h"
+#include "mozIThirdPartyUtil.h"
+#include "mozilla/AbstractTimelineMarker.h"
 #include "mozilla/AntiTrackingUtils.h"
+#include "mozilla/ArrayIterator.h"
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/AutoRestore.h"
-#include "mozilla/BinarySearch.h"
+#include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/Base64.h"
+#include "mozilla/BasePrincipal.h"
+#include "mozilla/CSSEnabledState.h"
 #include "mozilla/ContentBlocking.h"
 #include "mozilla/ContentBlockingAllowList.h"
+#include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
-#include "mozilla/CSSEnabledState.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/DocLoadingTimelineMarker.h"
+#include "mozilla/DocumentStyleRootIterator.h"
 #include "mozilla/EditorCommands.h"
-#include "mozilla/EffectSet.h"
-#include "mozilla/EnumSet.h"
+#include "mozilla/Encoding.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/EventQueue.h"
+#include "mozilla/EventStateManager.h"
+#include "mozilla/ExtensionPolicyService.h"
+#include "mozilla/FullscreenChange.h"
+#include "mozilla/GlobalStyleSheetCache.h"
 #include "mozilla/HTMLEditor.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/IdentifierMapEntry.h"
 #include "mozilla/IntegerRange.h"
-#include "mozilla/MemoryReporting.h"
+#include "mozilla/InternalMutationEvent.h"
 #include "mozilla/Likely.h"
-#include "mozilla/LoadInfo.h"
+#include "mozilla/Logging.h"
+#include "mozilla/LookAndFeel.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/MediaFeatureChange.h"
+#include "mozilla/MediaManager.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/NullPrincipal.h"
+#include "mozilla/OriginAttributes.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/PendingAnimationTracker.h"
+#include "mozilla/PendingFullscreenEvent.h"
+#include "mozilla/PermissionDelegateHandler.h"
+#include "mozilla/PermissionManager.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PreloadHashKey.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/PresShellForwards.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/PseudoStyleType.h"
+#include "mozilla/RefCountType.h"
+#include "mozilla/RelativeTo.h"
 #include "mozilla/RestyleManager.h"
+#include "mozilla/ReverseIterator.h"
+#include "mozilla/SMILAnimationController.h"
+#include "mozilla/SMILTimeContainer.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/Services.h"
+#include "mozilla/ServoCSSPropList.h"
+#include "mozilla/ServoStyleConsts.h"
+#include "mozilla/ServoStyleSet.h"
+#include "mozilla/ServoTypes.h"
+#include "mozilla/SizeOfState.h"
+#include "mozilla/Span.h"
+#include "mozilla/Sprintf.h"
+#include "mozilla/StaticAnalysisFunctions.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_dom.h"
@@ -47,279 +122,293 @@
 #include "mozilla/StaticPresData.h"
 #include "mozilla/StorageAccess.h"
 #include "mozilla/StoragePrincipalHelper.h"
+#include "mozilla/StyleSheet.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TelemetryScalarEnums.h"
 #include "mozilla/TextControlElement.h"
 #include "mozilla/TextEditor.h"
+#include "mozilla/TimelineConsumers.h"
+#include "mozilla/TypedEnumBits.h"
 #include "mozilla/URLDecorationStripper.h"
 #include "mozilla/URLExtraData.h"
-#include "mozilla/Base64.h"
-#include "mozilla/BasePrincipal.h"
-#include <algorithm>
-
-#include "mozilla/Logging.h"
-#include "plstr.h"
-#include "mozilla/Sprintf.h"
-
-#include "mozilla/Telemetry.h"
-#include "nsIApplicationCache.h"
-#include "nsIInlineSpellChecker.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsILoadContext.h"
-#include "nsITextControlFrame.h"
-#include "nsCommandManager.h"
-#include "nsCommandParams.h"
-#include "nsUnicharUtils.h"
-#include "nsContentList.h"
-#include "nsCSSPseudoElements.h"
-#include "nsIObserver.h"
-#include "nsIBaseWindow.h"
-#include "nsILayoutHistoryState.h"
-#include "nsIXULRuntime.h"
-#include "mozilla/GlobalStyleSheetCache.h"
-#include "mozilla/css/Loader.h"
+#include "mozilla/Unused.h"
 #include "mozilla/css/ImageLoader.h"
-#include "nsDocShell.h"
-#include "nsDocShellLoadTypes.h"
-#include "nsIDocShellTreeItem.h"
-#include "nsCOMArray.h"
-#include "nsQueryObject.h"
-#include "mozilla/Services.h"
-#include "nsScreen.h"
-#include "ChildIterator.h"
-#include "nsSerializationHelper.h"
-#include "nsICertOverrideService.h"
-#include "nsXULElement.h"
-#include "nsIX509Cert.h"
-#include "nsIX509CertValidity.h"
-#include "nsITransportSecurityInfo.h"
-#include "nsINSSErrorsService.h"
-#include "nsISocketProvider.h"
-#include "nsISiteSecurityService.h"
-#include "nsISHEntry.h"
-#include "nsSHistory.h"
-#include "mozilla/PermissionDelegateHandler.h"
-
-#include "mozilla/AsyncEventDispatcher.h"
-#include "mozilla/BasicEvents.h"
-#include "mozilla/EventListenerManager.h"
-#include "mozilla/EventStateManager.h"
-#include "mozilla/FullscreenChange.h"
-#include "mozilla/PendingAnimationTracker.h"
-#include "mozilla/intl/LocaleService.h"
-
-#include "mozilla/dom/Attr.h"
-#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/css/Loader.h"
+#include "mozilla/css/Rule.h"
+#include "mozilla/css/SheetParsingMode.h"
+#include "mozilla/dom/AnonymousContent.h"
+#include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ContentChild.h"
-#include "mozilla/dom/CSSImportRule.h"
+#include "mozilla/dom/BrowsingContextGroup.h"
+#include "mozilla/dom/CDATASection.h"
 #include "mozilla/dom/CSPDictionariesBinding.h"
+#include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/dom/ChromeObserver.h"
+#include "mozilla/dom/ClientInfo.h"
+#include "mozilla/dom/ClientState.h"
+#include "mozilla/dom/Comment.h"
+#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/DOMImplementation.h"
 #include "mozilla/dom/DOMIntersectionObserver.h"
-#include "mozilla/dom/Element.h"
+#include "mozilla/dom/DOMStringList.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/DocumentBinding.h"
+#include "mozilla/dom/DocumentFragment.h"
+#include "mozilla/dom/DocumentL10n.h"
+#include "mozilla/dom/DocumentTimeline.h"
+#include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/ElementBinding.h"
 #include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventListenerBinding.h"
 #include "mozilla/dom/FailedCertSecurityInfoBinding.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
+#include "mozilla/dom/FontFaceSet.h"
+#include "mozilla/dom/FromParser.h"
 #include "mozilla/dom/HTMLAllCollection.h"
+#include "mozilla/dom/HTMLBodyElement.h"
+#include "mozilla/dom/HTMLCollectionBinding.h"
+#include "mozilla/dom/HTMLDialogElement.h"
+#include "mozilla/dom/HTMLFormElement.h"
+#include "mozilla/dom/HTMLIFrameElement.h"
+#include "mozilla/dom/HTMLImageElement.h"
+#include "mozilla/dom/HTMLInputElement.h"
+#include "mozilla/dom/HTMLLinkElement.h"
+#include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/HTMLMetaElement.h"
 #include "mozilla/dom/HTMLSharedElement.h"
-#include "mozilla/dom/HTMLDialogElement.h"
-#include "mozilla/dom/MediaStatusManager.h"
+#include "mozilla/dom/HTMLTextAreaElement.h"
+#include "mozilla/dom/ImageTracker.h"
+#include "mozilla/dom/Link.h"
+#include "mozilla/dom/MediaQueryList.h"
+#include "mozilla/dom/MediaSource.h"
 #include "mozilla/dom/MutationObservers.h"
+#include "mozilla/dom/NameSpaceConstants.h"
 #include "mozilla/dom/Navigator.h"
 #include "mozilla/dom/NetErrorInfoBinding.h"
+#include "mozilla/dom/NodeInfo.h"
+#include "mozilla/dom/NodeIterator.h"
+#include "mozilla/dom/PContentChild.h"
+#include "mozilla/dom/PWindowGlobalChild.h"
+#include "mozilla/dom/PageTransitionEvent.h"
+#include "mozilla/dom/PageTransitionEventBinding.h"
 #include "mozilla/dom/Performance.h"
-#include "mozilla/dom/TreeOrderedArrayInlines.h"
-#include "mozilla/dom/ResizeObserver.h"
+#include "mozilla/dom/PermissionMessageUtils.h"
+#include "mozilla/dom/PostMessageEvent.h"
+#include "mozilla/dom/ProcessingInstruction.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/PromiseNativeHandler.h"
 #include "mozilla/dom/ResizeObserverController.h"
-#include "mozilla/dom/ServiceWorkerContainer.h"
+#include "mozilla/dom/SVGElement.h"
+#include "mozilla/dom/SVGSVGElement.h"
+#include "mozilla/dom/SVGUseElement.h"
 #include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/Selection.h"
+#include "mozilla/dom/ServiceWorkerContainer.h"
+#include "mozilla/dom/ServiceWorkerDescriptor.h"
+#include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/dom/ShadowIncludingTreeIterator.h"
+#include "mozilla/dom/ShadowRoot.h"
+#include "mozilla/dom/StyleSheetApplicableStateChangeEvent.h"
+#include "mozilla/dom/StyleSheetApplicableStateChangeEventBinding.h"
 #include "mozilla/dom/StyleSheetList.h"
-#include "mozilla/dom/SVGUseElement.h"
+#include "mozilla/dom/TimeoutManager.h"
+#include "mozilla/dom/Touch.h"
+#include "mozilla/dom/TouchEvent.h"
+#include "mozilla/dom/TreeOrderedArray.h"
+#include "mozilla/dom/TreeOrderedArrayInlines.h"
+#include "mozilla/dom/TreeWalker.h"
+#include "mozilla/dom/URL.h"
 #include "mozilla/dom/UserActivation.h"
-#include "mozilla/net/CookieJarSettings.h"
-#include "nsGenericHTMLElement.h"
-#include "mozilla/dom/CDATASection.h"
-#include "mozilla/dom/ProcessingInstruction.h"
-#include "mozilla/dom/PostMessageEvent.h"
+#include "mozilla/dom/WindowBinding.h"
+#include "mozilla/dom/WindowContext.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "mozilla/dom/WindowProxyHolder.h"
+#include "mozilla/dom/XPathEvaluator.h"
+#include "mozilla/dom/nsCSPContext.h"
+#include "mozilla/dom/nsCSPUtils.h"
+#include "mozilla/extensions/WebExtensionPolicy.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/BaseCoord.h"
+#include "mozilla/gfx/BaseSize.h"
+#include "mozilla/gfx/Coord.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/ScaleFactor.h"
+#include "mozilla/intl/LocaleService.h"
 #include "mozilla/ipc/IdleSchedulerChild.h"
-#include "nsDOMString.h"
-#include "nsLayoutUtils.h"  // for GetFrameForPoint
-#include "nsIFrame.h"
-#include "nsIBrowserChild.h"
-#include "nsImportModule.h"
-
-#include "nsRange.h"
-#include "mozilla/dom/DocumentType.h"
-#include "mozilla/dom/NodeIterator.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/PromiseNativeHandler.h"
-#include "mozilla/dom/TreeWalker.h"
-
-#include "mozilla/dom/ServiceWorkerManager.h"
-#include "imgLoader.h"
-
+#include "mozilla/ipc/MessageChannel.h"
+#include "mozilla/net/ChannelEventQueue.h"
+#include "mozilla/net/CookieJarSettings.h"
+#include "mozilla/net/NeckoChannelParams.h"
+#include "mozilla/net/RequestContextService.h"
 #include "nsAboutProtocolUtils.h"
+#include "nsAlgorithm.h"
+#include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
+#include "nsBaseHashtable.h"
+#include "nsBidiUtils.h"
+#include "nsCRT.h"
+#include "nsCSSPropertyID.h"
+#include "nsCSSProps.h"
+#include "nsCSSPseudoElements.h"
 #include "nsCanvasFrame.h"
-#include "nsContentCID.h"
+#include "nsCaseTreatment.h"
+#include "nsCharsetSource.h"
+#include "nsCommandManager.h"
+#include "nsCommandParams.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsContentList.h"
+#include "nsContentPermissionHelper.h"
 #include "nsContentSecurityUtils.h"
+#include "nsContentUtils.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionTraversalCallback.h"
+#include "nsDOMAttributeMap.h"
+#include "nsDOMCaretPosition.h"
+#include "nsDOMNavigationTiming.h"
+#include "nsDOMString.h"
+#include "nsDeviceContext.h"
+#include "nsDocShell.h"
 #include "nsError.h"
-#include "nsPresContext.h"
-#include "nsThreadUtils.h"
-#include "nsNodeInfoManager.h"
+#include "nsEscape.h"
+#include "nsFocusManager.h"
+#include "nsFrameLoader.h"
+#include "nsFrameLoaderOwner.h"
+#include "nsGenericHTMLElement.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
+#include "nsHTMLCSSStyleSheet.h"
+#include "nsHTMLDocument.h"
+#include "nsHTMLStyleSheet.h"
+#include "nsHtml5Module.h"
+#include "nsHtml5Parser.h"
+#include "nsHtml5TreeOpExecutor.h"
+#include "nsIApplicationCache.h"
+#include "nsIAsyncShutdown.h"
+#include "nsIAuthPrompt.h"
+#include "nsIAuthPrompt2.h"
+#include "nsIBFCacheEntry.h"
+#include "nsIBaseWindow.h"
+#include "nsIBrowserChild.h"
 #include "nsIBrowserUsage.h"
+#include "nsICSSLoaderObserver.h"
+#include "nsICategoryManager.h"
+#include "nsICertOverrideService.h"
+#include "nsIContent.h"
+#include "nsIContentPolicy.h"
+#include "nsIContentSecurityPolicy.h"
+#include "nsIContentSink.h"
+#include "nsICookieJarSettings.h"
+#include "nsICookieService.h"
+#include "nsIDOMXULCommandDispatcher.h"
+#include "nsIDocShell.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDocumentActivity.h"
+#include "nsIDocumentEncoder.h"
+#include "nsIDocumentLoader.h"
+#include "nsIDocumentLoaderFactory.h"
+#include "nsIDocumentObserver.h"
 #include "nsIEditingSession.h"
+#include "nsIEditor.h"
+#include "nsIEffectiveTLDService.h"
+#include "nsIFile.h"
 #include "nsIFileChannel.h"
+#include "nsIFrame.h"
+#include "nsIGlobalObject.h"
+#include "nsIHTMLCollection.h"
+#include "nsIHttpChannel.h"
+#include "nsIHttpChannelInternal.h"
+#include "nsIIOService.h"
+#include "nsIImageLoadingContent.h"
+#include "nsIInlineSpellChecker.h"
+#include "nsIInputStreamChannel.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsILayoutHistoryState.h"
 #include "nsIMultiPartChannel.h"
+#include "nsIMutationObserver.h"
+#include "nsINSSErrorsService.h"
+#include "nsINamed.h"
+#include "nsINodeList.h"
+#include "nsIObjectLoadingContent.h"
+#include "nsIObserverService.h"
+#include "nsIPermission.h"
+#include "nsIPrompt.h"
+#include "nsIPropertyBag2.h"
+#include "nsIReferrerInfo.h"
 #include "nsIRefreshURI.h"
-#include "nsIWebNavigation.h"
-#include "nsIScriptError.h"
-#include "nsISimpleEnumerator.h"
+#include "nsIRequest.h"
 #include "nsIRequestContext.h"
-#include "nsStyleSheetService.h"
-
-#include "nsNetUtil.h"  // for NS_NewURI
-#include "nsIInputStreamChannel.h"
-#include "nsIAuthPrompt.h"
-#include "nsIAuthPrompt2.h"
-
-#include "mozilla/PermissionManager.h"
+#include "nsIRunnable.h"
+#include "nsISHEntry.h"
+#include "nsIScriptElement.h"
+#include "nsIScriptError.h"
+#include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsIPermission.h"
-#include "nsIPrincipal.h"
-#include "nsIPrivateBrowsingChannel.h"
-#include "ExpandedPrincipal.h"
-#include "mozilla/NullPrincipal.h"
-
-#include "nsPIDOMWindow.h"
-#include "nsFocusManager.h"
-#include "nsICookieService.h"
-
-#include "nsBidiUtils.h"
-
-#include "nsContentCreatorFunctions.h"
-
-#include "nsIScriptContext.h"
-#include "nsHTMLDocument.h"
-#include "nsIRequest.h"
-#include "mozilla/dom/BlobURLProtocolHandler.h"
-
-#include "nsCharsetSource.h"
-#include "nsIParser.h"
-#include "nsIContentSink.h"
-
-#include "mozilla/EventDispatcher.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/InternalMutationEvent.h"
-#include "nsDOMCID.h"
-
-#include "jsapi.h"
-#include "xpcpublic.h"
-#include "nsCCUncollectableMarker.h"
-#include "nsIContentPolicy.h"
-#include "nsContentPolicyUtils.h"
-#include "nsICategoryManager.h"
-#include "nsIDocumentLoaderFactory.h"
-#include "nsIDocumentLoader.h"
-#include "nsIContentViewer.h"
+#include "nsISecurityConsoleMessage.h"
+#include "nsISelectionController.h"
+#include "nsISerialEventTarget.h"
+#include "nsISerializable.h"
+#include "nsISimpleEnumerator.h"
+#include "nsISiteSecurityService.h"
+#include "nsISocketProvider.h"
+#include "nsISpeculativeConnect.h"
+#include "nsIStructuredCloneContainer.h"
+#include "nsIThread.h"
+#include "nsITimedChannel.h"
+#include "nsITimer.h"
+#include "nsITransportSecurityInfo.h"
+#include "nsIURIMutator.h"
+#include "nsIVariant.h"
+#include "nsIWeakReference.h"
+#include "nsIWebNavigation.h"
+#include "nsIWidget.h"
+#include "nsIX509Cert.h"
+#include "nsIX509CertValidity.h"
 #include "nsIXMLContentSink.h"
-#include "nsIPrompt.h"
-#include "nsIPropertyBag2.h"
-#include "mozilla/dom/PageTransitionEvent.h"
-#include "mozilla/dom/StyleSheetApplicableStateChangeEvent.h"
-#include "nsJSUtils.h"
-#include "nsFrameLoader.h"
-#include "nsEscape.h"
+#include "nsIXULRuntime.h"
+#include "nsImageLoadingContent.h"
+#include "nsImportModule.h"
+#include "nsLanguageAtomService.h"
+#include "nsLayoutUtils.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsNodeInfoManager.h"
 #include "nsObjectLoadingContent.h"
-#include "nsHtml5TreeOpExecutor.h"
-#include "mozilla/dom/HTMLFormElement.h"
-#include "mozilla/dom/HTMLLinkElement.h"
-#include "mozilla/dom/HTMLMediaElement.h"
-#include "mozilla/dom/HTMLIFrameElement.h"
-#include "mozilla/dom/HTMLImageElement.h"
-#include "mozilla/dom/HTMLTextAreaElement.h"
-#include "mozilla/dom/MediaSource.h"
-
-#include "mozAutoDocUpdate.h"
-#include "nsGlobalWindow.h"
-#include "mozilla/Encoding.h"
-#include "nsDOMNavigationTiming.h"
-
-#include "mozilla/SMILAnimationController.h"
-#include "imgIContainer.h"
-
+#include "nsPIDOMWindowInlines.h"
+#include "nsPIWindowRoot.h"
+#include "nsPoint.h"
+#include "nsPointerHashKeys.h"
+#include "nsPresContext.h"
+#include "nsQueryFrame.h"
+#include "nsQueryObject.h"
+#include "nsRange.h"
+#include "nsRect.h"
 #include "nsRefreshDriver.h"
-
-// FOR CSP (autogenerated by xpidl)
-#include "nsIContentSecurityPolicy.h"
-#include "mozilla/dom/nsCSPContext.h"
-#include "mozilla/dom/nsCSPService.h"
-#include "mozilla/dom/nsCSPUtils.h"
-#include "nsHTMLStyleSheet.h"
-#include "nsHTMLCSSStyleSheet.h"
-#include "mozilla/dom/DOMImplementation.h"
-#include "mozilla/dom/ShadowRoot.h"
-#include "mozilla/dom/Comment.h"
+#include "nsSandboxFlags.h"
+#include "nsSerializationHelper.h"
+#include "nsServiceManagerUtils.h"
+#include "nsStringFlags.h"
+#include "nsStringIterator.h"
+#include "nsStyleSheetService.h"
+#include "nsStyleStruct.h"
 #include "nsTextNode.h"
-#include "mozilla/dom/Link.h"
-#include "mozilla/dom/HTMLCollectionBinding.h"
-#include "mozilla/dom/HTMLElementBinding.h"
+#include "nsUnicharUtils.h"
+#include "nsWrapperCache.h"
+#include "nsWrapperCacheInlines.h"
+#include "nsXPCOMCID.h"
 #include "nsXULAppAPI.h"
-#include "mozilla/dom/Touch.h"
-#include "mozilla/dom/TouchEvent.h"
+#include "prthread.h"
+#include "prtime.h"
+#include "prtypes.h"
+#include "xpcpublic.h"
 
-#include "mozilla/Preferences.h"
+// XXX Must be included after mozilla/Encoding.h
+#include "encoding_rs.h"
 
-#include "imgRequestProxy.h"
-#include "nsWrapperCacheInlines.h"
-#include "nsSandboxFlags.h"
-#include "mozilla/dom/AnimatableBinding.h"
-#include "mozilla/dom/AnonymousContent.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/ClientInfo.h"
-#include "mozilla/dom/ClientState.h"
-#include "mozilla/dom/DocumentFragment.h"
-#include "mozilla/dom/DocumentTimeline.h"
-#include "mozilla/dom/Event.h"
-#include "mozilla/dom/HTMLBodyElement.h"
-#include "mozilla/dom/HTMLInputElement.h"
-#include "mozilla/dom/ImageTracker.h"
-#include "mozilla/dom/MediaQueryList.h"
-#include "mozilla/dom/NodeFilterBinding.h"
-#include "mozilla/OwningNonNull.h"
-#include "mozilla/dom/BrowserChild.h"
-#include "mozilla/dom/WebComponentsBinding.h"
-#include "mozilla/dom/CustomElementRegistryBinding.h"
-#include "mozilla/dom/CustomElementRegistry.h"
-#include "mozilla/dom/ServiceWorkerDescriptor.h"
-#include "mozilla/dom/TimeoutManager.h"
-#include "mozilla/dom/DocumentL10n.h"
-#include "mozilla/ExtensionPolicyService.h"
-#include "nsIFrame.h"
-#include "nsDOMCaretPosition.h"
-#include "nsViewportInfo.h"
-#include "mozilla/StaticPtr.h"
-#include "nsIHttpChannelInternal.h"
-#include "nsISecurityConsoleMessage.h"
-#include "nsCharSeparatedTokenizer.h"
-#include "mozilla/dom/XPathEvaluator.h"
-#include "mozilla/dom/XPathNSResolverBinding.h"
-#include "mozilla/dom/XPathResult.h"
-#include "nsIDocumentEncoder.h"
-#include "nsIDocumentActivity.h"
-#include "nsIStructuredCloneContainer.h"
-#include "mozilla/dom/DOMStringList.h"
-#include "nsWindowSizes.h"
-#include "mozilla/dom/Location.h"
-#include "mozilla/dom/FontFaceSet.h"
-#include "mozilla/ServoStyleSet.h"
-#include "mozilla/StyleSheet.h"
-#include "mozilla/StyleSheetInlines.h"
-#include "mozilla/dom/SVGDocument.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include "mozilla/dom/DocGroup.h"
-#include "mozilla/dom/ChromeObserver.h"
 #ifdef MOZ_XUL
 #  include "mozilla/dom/XULBroadcastManager.h"
 #  include "mozilla/dom/XULPersist.h"
@@ -330,34 +419,6 @@
 #  include "nsIDocShellTreeOwner.h"
 #endif
 
-#include "mozilla/DocLoadingTimelineMarker.h"
-
-#include "mozilla/dom/WindowGlobalChild.h"
-
-#include "nsISpeculativeConnect.h"
-
-#include "mozilla/MediaManager.h"
-
-#include "AutoplayPolicy.h"
-#include "nsIURIMutator.h"
-#include "mozilla/DocumentStyleRootIterator.h"
-#include "mozilla/PendingFullscreenEvent.h"
-#include "mozilla/RestyleManager.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/ResultExtensions.h"
-#include "nsHTMLTags.h"
-#include "MobileViewportManager.h"
-#include "NodeUbiReporting.h"
-#include "nsICookieService.h"
-#include "mozilla/net/ChannelEventQueue.h"
-#include "mozilla/net/RequestContextService.h"
-#include "StorageAccessPermissionRequest.h"
-#include "mozilla/dom/WindowProxyHolder.h"
-#include "ThirdPartyUtil.h"
-#include "nsHtml5Module.h"
-#include "nsHtml5Parser.h"
-#include "nsTableWrapperFrame.h"
-
 #define XML_DECLARATION_BITS_DECLARATION_EXISTS (1 << 0)
 #define XML_DECLARATION_BITS_ENCODING_EXISTS (1 << 1)
 #define XML_DECLARATION_BITS_STANDALONE_EXISTS (1 << 2)
@@ -1931,11 +1992,39 @@
     return;
   }
 
+  nsCString http3Key;
+  nsCOMPtr<nsIHttpChannelInternal> httpChannel =
+      do_QueryInterface(GetChannel());
+  if (httpChannel) {
+    uint32_t major;
+    uint32_t minor;
+    if (NS_SUCCEEDED(httpChannel->GetResponseVersion(&major, &minor))) {
+      if (major == 3) {
+        http3Key = "http3"_ns;
+      } else if (major == 2) {
+        bool supportHttp3 = false;
+        if (NS_FAILED(httpChannel->GetSupportsHTTP3(&supportHttp3))) {
+          supportHttp3 = false;
+        }
+        if (supportHttp3) {
+          http3Key = "supports_http3"_ns;
+        }
+      }
+    }
+  }
+
   // First Contentful Paint
   if (TimeStamp firstContentfulPaint =
           GetNavigationTiming()->GetFirstContentfulPaintTimeStamp()) {
     Telemetry::AccumulateTimeDelta(Telemetry::PERF_FIRST_CONTENTFUL_PAINT_MS,
                                    navigationStart, firstContentfulPaint);
+
+    if (!http3Key.IsEmpty()) {
+      Telemetry::AccumulateTimeDelta(
+          Telemetry::HTTP3_PERF_FIRST_CONTENTFUL_PAINT_MS, http3Key,
+          navigationStart, firstContentfulPaint);
+    }
+
     Telemetry::AccumulateTimeDelta(
         Telemetry::PERF_FIRST_CONTENTFUL_PAINT_FROM_RESPONSESTART_MS,
         responseStart, firstContentfulPaint);
@@ -1956,6 +2045,11 @@
           GetNavigationTiming()->GetLoadEventStartTimeStamp()) {
     Telemetry::AccumulateTimeDelta(Telemetry::PERF_PAGE_LOAD_TIME_MS,
                                    navigationStart, loadEventStart);
+    if (!http3Key.IsEmpty()) {
+      Telemetry::AccumulateTimeDelta(Telemetry::HTTP3_PERF_PAGE_LOAD_TIME_MS,
+                                     http3Key, navigationStart, loadEventStart);
+    }
+
     Telemetry::AccumulateTimeDelta(
         Telemetry::PERF_PAGE_LOAD_TIME_FROM_RESPONSESTART_MS, responseStart,
         loadEventStart);
@@ -3129,7 +3223,6 @@
   if (aSandboxFlags != SANDBOXED_NONE &&
       !(aSandboxFlags & SANDBOXED_TOPLEVEL_NAVIGATION) &&
       !(aSandboxFlags & SANDBOXED_TOPLEVEL_NAVIGATION_USER_ACTIVATION)) {
-    nsCOMPtr<nsIURI> iframeUri;
     nsContentUtils::ReportToConsole(
         nsIScriptError::warningFlag, "Iframe Sandbox"_ns,
         aDocShell->GetDocument(), nsContentUtils::eSECURITY_PROPERTIES,
@@ -3603,7 +3696,12 @@
 
   if (needNewNullPrincipal) {
     principal = NullPrincipal::CreateWithInheritedAttributes(principal);
-    SetPrincipals(principal, principal);
+    // Skip setting the content blocking allowlist principal to NullPrincipal.
+    // The principal is only used to enable/disable trackingprotection via
+    // permission and can be shared with the top level sandboxed site.
+    // See Bug 1654546.
+    SetPrincipals(principal, principal,
+                  /* aSetContentBlockingAllowListPrincipal = */ false);
   }
 
   ApplySettingsFromCSP(false);
@@ -3902,8 +4000,33 @@
   }
 }
 
+void Document::UpdateReferrerInfoFromMeta(const nsAString& aMetaReferrer,
+                                          bool aPreload) {
+  ReferrerPolicyEnum policy =
+      ReferrerInfo::ReferrerPolicyFromMetaString(aMetaReferrer);
+  // The empty string "" corresponds to no referrer policy, causing a fallback
+  // to a referrer policy defined elsewhere.
+  if (policy == ReferrerPolicy::_empty) {
+    return;
+  }
+
+  MOZ_ASSERT(mReferrerInfo);
+  MOZ_ASSERT(mPreloadReferrerInfo);
+
+  if (aPreload) {
+    mPreloadReferrerInfo =
+        static_cast<mozilla::dom::ReferrerInfo*>((mPreloadReferrerInfo).get())
+            ->CloneWithNewPolicy(policy);
+  } else {
+    mReferrerInfo =
+        static_cast<mozilla::dom::ReferrerInfo*>((mReferrerInfo).get())
+            ->CloneWithNewPolicy(policy);
+  }
+}
+
 void Document::SetPrincipals(nsIPrincipal* aNewPrincipal,
-                             nsIPrincipal* aNewPartitionedPrincipal) {
+                             nsIPrincipal* aNewPartitionedPrincipal,
+                             bool aSetContentBlockingAllowListPrincipal) {
   MOZ_ASSERT(!!aNewPrincipal == !!aNewPartitionedPrincipal);
   if (aNewPrincipal && mAllowDNSPrefetch &&
       StaticPrefs::network_dns_disablePrefetchFromHTTPS()) {
@@ -3919,8 +4042,10 @@
 
   mCSSLoader->RegisterInSheetCache();
 
-  ContentBlockingAllowList::ComputePrincipal(
-      aNewPrincipal, getter_AddRefs(mContentBlockingAllowListPrincipal));
+  if (aSetContentBlockingAllowListPrincipal) {
+    ContentBlockingAllowList::ComputePrincipal(
+        aNewPrincipal, getter_AddRefs(mContentBlockingAllowListPrincipal));
+  }
 
 #ifdef DEBUG
   // Validate that the docgroup is set correctly by calling its getter and
@@ -4066,9 +4191,10 @@
 DocumentL10n* Document::GetL10n() { return mDocumentL10n; }
 
 bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) {
+  JS::Rooted<JSObject*> object(aCx, aObject);
   nsCOMPtr<nsIPrincipal> callerPrincipal =
       nsContentUtils::SubjectPrincipal(aCx);
-  nsGlobalWindowInner* win = xpc::WindowOrNull(aObject);
+  nsGlobalWindowInner* win = xpc::WindowOrNull(object);
   bool allowed = false;
   callerPrincipal->IsL10nAllowed(win ? win->GetDocumentURI() : nullptr,
                                  &allowed);
@@ -6033,9 +6159,13 @@
   }
 }
 
-void Document::CaptureEvents() { WarnOnceAbout(Document::eUseOfCaptureEvents); }
+void Document::CaptureEvents() {
+  WarnOnceAbout(DeprecatedOperations::eUseOfCaptureEvents);
+}
 
-void Document::ReleaseEvents() { WarnOnceAbout(Document::eUseOfReleaseEvents); }
+void Document::ReleaseEvents() {
+  WarnOnceAbout(DeprecatedOperations::eUseOfReleaseEvents);
+}
 
 HTMLAllCollection* Document::All() {
   if (!mAll) {
@@ -6427,6 +6557,12 @@
     return false;  // Can't do anything smarter.
   }
 
+  if (!mPresShell->IsActive()) {
+    // The pres shell is not active (we're an invisible OOP iframe or such), so
+    // throttle.
+    return true;
+  }
+
   nsIFrame* frame = mPresShell->GetRootFrame();
   if (!frame) {
     return false;  // Can't do anything smarter.
@@ -6931,19 +7067,11 @@
 }
 
 bool Document::ContainsEMEContent() {
-  bool containsEME = false;
-
-  auto check = [&containsEME](nsISupports* aSupports) {
-    nsCOMPtr<nsIContent> content(do_QueryInterface(aSupports));
-    if (auto* mediaElem = HTMLMediaElement::FromNodeOrNull(content)) {
-      if (mediaElem->GetMediaKeys()) {
-        containsEME = true;
-      }
-    }
-  };
-
-  EnumerateActivityObservers(check);
-  return containsEME;
+  nsPIDOMWindowInner* win = GetInnerWindow();
+  // Note this case is different from checking just media elements in that
+  // it covers when we've created MediaKeys but not associated them with a
+  // media element.
+  return win && win->HasActiveMediaKeysInstance();
 }
 
 bool Document::ContainsMSEContent() {
@@ -6990,19 +7118,11 @@
 }
 
 bool Document::IsTopLevelWindowInactive() const {
-  nsCOMPtr<nsIDocShellTreeItem> treeItem = GetDocShell();
-  if (!treeItem) {
-    return false;
-  }
-
-  nsCOMPtr<nsIDocShellTreeItem> rootItem;
-  treeItem->GetInProcessRootTreeItem(getter_AddRefs(rootItem));
-  if (!rootItem) {
-    return false;
+  if (BrowsingContext* bc = GetBrowsingContext()) {
+    return !bc->GetIsActiveBrowserWindow();
   }
 
-  nsCOMPtr<nsPIDOMWindowOuter> domWindow = rootItem->GetWindow();
-  return domWindow && !domWindow->IsActive();
+  return false;
 }
 
 void Document::SetContainer(nsDocShell* aContainer) {
@@ -12638,11 +12758,10 @@
     nullptr};
 #undef DOCUMENT_WARNING
 
-static UseCounter OperationToUseCounter(
-    Document::DeprecatedOperations aOperation) {
+static UseCounter OperationToUseCounter(DeprecatedOperations aOperation) {
   switch (aOperation) {
-#define DEPRECATED_OPERATION(_op) \
-  case Document::e##_op:          \
+#define DEPRECATED_OPERATION(_op)    \
+  case DeprecatedOperations::e##_op: \
     return eUseCounter_##_op;
 #include "nsDeprecatedOperationList.h"
 #undef DEPRECATED_OPERATION
@@ -12652,7 +12771,7 @@
 }
 
 bool Document::HasWarnedAbout(DeprecatedOperations aOperation) const {
-  return mDeprecationWarnedAbout[aOperation];
+  return mDeprecationWarnedAbout[static_cast<size_t>(aOperation)];
 }
 
 void Document::WarnOnceAbout(
@@ -12662,7 +12781,7 @@
   if (HasWarnedAbout(aOperation)) {
     return;
   }
-  mDeprecationWarnedAbout[aOperation] = true;
+  mDeprecationWarnedAbout[static_cast<size_t>(aOperation)] = true;
   // Don't count deprecated operations for about pages since those pages
   // are almost in our control, and we always need to remove uses there
   // before we remove the operation itself anyway.
@@ -12672,9 +12791,9 @@
   }
   uint32_t flags =
       asError ? nsIScriptError::errorFlag : nsIScriptError::warningFlag;
-  nsContentUtils::ReportToConsole(flags, "DOM Core"_ns, this,
-                                  nsContentUtils::eDOM_PROPERTIES,
-                                  kDeprecationWarnings[aOperation], aParams);
+  nsContentUtils::ReportToConsole(
+      flags, "DOM Core"_ns, this, nsContentUtils::eDOM_PROPERTIES,
+      kDeprecationWarnings[static_cast<size_t>(aOperation)], aParams);
 }
 
 bool Document::HasWarnedAbout(DocumentWarnings aWarning) const {
@@ -12822,8 +12941,8 @@
 
   nsIFrame* ptFrame = nsLayoutUtils::GetFrameForPoint(
       RelativeTo{rootFrame}, pt,
-      {FrameForPointOption::IgnorePaintSuppression,
-       FrameForPointOption::IgnoreCrossDoc});
+      {{FrameForPointOption::IgnorePaintSuppression,
+        FrameForPointOption::IgnoreCrossDoc}});
   if (!ptFrame) {
     return nullptr;
   }
@@ -14010,14 +14129,12 @@
 
 // Returns true if aDoc is in the focused tab in the active window.
 bool IsInActiveTab(Document* aDoc) {
-  nsCOMPtr<nsIDocShell> docshell = aDoc->GetDocShell();
-  if (!docshell) {
+  BrowsingContext* bc = aDoc->GetBrowsingContext();
+  if (!bc) {
     return false;
   }
 
-  bool isActive = false;
-  docshell->GetIsActive(&isActive);
-  if (!isActive) {
+  if (!bc->IsActive()) {
     return false;
   }
 
@@ -14029,7 +14146,10 @@
   if (XRE_IsParentProcess()) {
     // Keep dom/tests/mochitest/chrome/test_MozDomFullscreen_event.xhtml happy
     // by retaining the old code path for the parent process.
-
+    nsIDocShell* docshell = aDoc->GetDocShell();
+    if (!docshell) {
+      return false;
+    }
     nsCOMPtr<nsIDocShellTreeItem> rootItem;
     docshell->GetInProcessRootTreeItem(getter_AddRefs(rootItem));
     if (!rootItem) {
@@ -14049,17 +14169,7 @@
     return activeWindow == rootWin;
   }
 
-  BrowsingContext* bc = aDoc->GetBrowsingContext();
-  if (!bc) {
-    return false;
-  }
-
-  BrowsingContext* activeBrowsingContext = fm->GetActiveBrowsingContext();
-  if (!activeBrowsingContext) {
-    return false;
-  }
-
-  return activeBrowsingContext == bc->Top();
+  return fm->GetActiveBrowsingContext() == bc->Top();
 }
 
 void Document::RemoteFrameFullscreenChanged(Element* aFrameElement) {
@@ -14510,7 +14620,7 @@
   BrowsingContext* bc = ownerDoc->GetBrowsingContext();
   BrowsingContext* topBC = bc ? bc->Top() : nullptr;
   WindowContext* topWC = ownerDoc->GetTopLevelWindowContext();
-  if (!topBC || !topBC->GetIsActive() || !topWC ||
+  if (!topBC || !topBC->IsActive() || !topWC ||
       topWC != topBC->GetCurrentWindowContext()) {
     return "PointerLockDeniedHidden";
   }
@@ -14555,48 +14665,19 @@
   DispatchPointerLockChange(aDocument);
 }
 
-MOZ_CAN_RUN_SCRIPT_BOUNDARY static void StartSetPointerLock(
-    Element* aElement, Document* aDocument, bool aUserInputOrChromeCaller) {
-  const char* error = nullptr;
-  if (!aElement || !aDocument || !aElement->GetComposedDoc()) {
-    error = "PointerLockDeniedNotInDocument";
-  } else if (aElement->GetComposedDoc() != aDocument) {
-    error = "PointerLockDeniedMovedDocument";
-  }
-  if (!error) {
-    nsCOMPtr<Element> pointerLockedElement =
-        do_QueryReferent(EventStateManager::sPointerLockedElement);
-    if (aElement == pointerLockedElement) {
-      DispatchPointerLockChange(aDocument);
-      return;
-    }
-    // Note, we must bypass focus change, so pass true as the last parameter!
-    error = GetPointerLockError(aElement, pointerLockedElement, true);
-    // Another element in the same document is requesting pointer lock,
-    // just grant it without user input check.
-    if (!error && pointerLockedElement) {
-      ChangePointerLockedElement(aElement, aDocument, pointerLockedElement);
-      return;
-    }
-  }
-  // If it is neither user input initiated, nor requested in fullscreen,
-  // it should be rejected.
-  if (!error && !aUserInputOrChromeCaller &&
-      !aDocument->GetUnretargetedFullScreenElement()) {
-    error = "PointerLockDeniedNotInputDriven";
-  }
-  if (!error && !aDocument->SetPointerLock(aElement, StyleCursorKind::None)) {
-    error = "PointerLockDeniedFailedToLock";
-  }
-  if (error) {
-    DispatchPointerLockError(aDocument, error);
-    return;
+MOZ_CAN_RUN_SCRIPT_BOUNDARY static bool StartSetPointerLock(
+    Element* aElement, Document* aDocument) {
+  if (!aDocument->SetPointerLock(aElement, StyleCursorKind::None)) {
+    DispatchPointerLockError(aDocument, "PointerLockDeniedFailedToLock");
+    return false;
   }
 
   ChangePointerLockedElement(aElement, aDocument, nullptr);
   nsContentUtils::DispatchEventOnlyToChrome(
       aDocument, ToSupports(aElement), u"MozDOMPointerLock:Entered"_ns,
       CanBubble::eYes, Cancelable::eNo, /* DefaultAction */ nullptr);
+
+  return true;
 }
 
 class PointerLockRequest final : public Runnable {
@@ -14605,14 +14686,109 @@
       : mozilla::Runnable("PointerLockRequest"),
         mElement(do_GetWeakReference(aElement)),
         mDocument(do_GetWeakReference(aElement->OwnerDoc())),
-        mUserInputOrChromeCaller(aUserInputOrChromeCaller) {
-    MOZ_ASSERT(XRE_IsParentProcess());
-  }
+        mUserInputOrChromeCaller(aUserInputOrChromeCaller) {}
 
   NS_IMETHOD Run() final {
     nsCOMPtr<Element> element = do_QueryReferent(mElement);
     nsCOMPtr<Document> document = do_QueryReferent(mDocument);
-    StartSetPointerLock(element, document, mUserInputOrChromeCaller);
+
+    const char* error = nullptr;
+    if (!element || !document || !element->GetComposedDoc()) {
+      error = "PointerLockDeniedNotInDocument";
+    } else if (element->GetComposedDoc() != document) {
+      error = "PointerLockDeniedMovedDocument";
+    }
+    if (!error) {
+      nsCOMPtr<Element> pointerLockedElement =
+          do_QueryReferent(EventStateManager::sPointerLockedElement);
+      if (element == pointerLockedElement) {
+        DispatchPointerLockChange(document);
+        return NS_OK;
+      }
+      // Note, we must bypass focus change, so pass true as the last parameter!
+      error = GetPointerLockError(element, pointerLockedElement, true);
+      // Another element in the same document is requesting pointer lock,
+      // just grant it without user input check.
+      if (!error && pointerLockedElement) {
+        ChangePointerLockedElement(element, document, pointerLockedElement);
+        return NS_OK;
+      }
+    }
+    // If it is neither user input initiated, nor requested in fullscreen,
+    // it should be rejected.
+    if (!error && !mUserInputOrChromeCaller &&
+        !document->GetUnretargetedFullScreenElement()) {
+      error = "PointerLockDeniedNotInputDriven";
+    }
+
+    if (error) {
+      DispatchPointerLockError(document, error);
+      return NS_OK;
+    }
+
+    if (BrowserChild* browserChild =
+            BrowserChild::GetFrom(document->GetDocShell())) {
+      nsWeakPtr e = do_GetWeakReference(element);
+      nsWeakPtr doc = do_GetWeakReference(element->OwnerDoc());
+      nsWeakPtr bc = do_GetWeakReference(browserChild);
+      browserChild->SendRequestPointerLock(
+          [e, doc, bc](const nsCString& aError) {
+            nsCOMPtr<Document> document = do_QueryReferent(doc);
+            if (!aError.IsEmpty()) {
+              DispatchPointerLockError(document, aError.get());
+              return;
+            }
+
+            const char* error = nullptr;
+            auto autoCleanup = MakeScopeExit([&] {
+              if (error) {
+                DispatchPointerLockError(document, error);
+                // If we are failed to set pointer lock, notify parent to stop
+                // redirect mouse event to this process.
+                if (nsCOMPtr<nsIBrowserChild> browserChild =
+                        do_QueryReferent(bc)) {
+                  static_cast<BrowserChild*>(browserChild.get())
+                      ->SendReleasePointerLock();
+                }
+              }
+            });
+
+            nsCOMPtr<Element> element = do_QueryReferent(e);
+            if (!element || !document || !element->GetComposedDoc()) {
+              error = "PointerLockDeniedNotInDocument";
+              return;
+            }
+
+            if (element->GetComposedDoc() != document) {
+              error = "PointerLockDeniedMovedDocument";
+              return;
+            }
+
+            nsCOMPtr<Element> pointerLockedElement =
+                do_QueryReferent(EventStateManager::sPointerLockedElement);
+            error = GetPointerLockError(element, pointerLockedElement, true);
+            if (error) {
+              return;
+            }
+
+            if (!StartSetPointerLock(element, document)) {
+              error = "PointerLockDeniedFailedToLock";
+              return;
+            }
+          },
+          [doc](mozilla::ipc::ResponseRejectReason) {
+            // IPC layer error
+            nsCOMPtr<Document> document = do_QueryReferent(doc);
+            if (!document) {
+              return;
+            }
+
+            DispatchPointerLockError(document, "PointerLockDeniedFailedToLock");
+          });
+    } else {
+      StartSetPointerLock(element, document);
+    }
+
     return NS_OK;
   };
 
@@ -14640,30 +14816,9 @@
 
   bool userInputOrSystemCaller = HasValidTransientUserGestureActivation() ||
                                  aCallerType == CallerType::System;
-  if (BrowserChild* browserChild = BrowserChild::GetFrom(GetDocShell())) {
-    nsWeakPtr e = do_GetWeakReference(aElement);
-    nsWeakPtr doc = do_GetWeakReference(aElement->OwnerDoc());
-    browserChild->SendRequestPointerLock(
-        [e, doc, userInputOrSystemCaller](const nsCString& aError) {
-          nsCOMPtr<Document> document = do_QueryReferent(doc);
-          if (!aError.IsEmpty()) {
-            DispatchPointerLockError(document, aError.get());
-            return;
-          }
-
-          nsCOMPtr<Element> element = do_QueryReferent(e);
-          StartSetPointerLock(element, document, userInputOrSystemCaller);
-        },
-        [doc](mozilla::ipc::ResponseRejectReason) {
-          // IPC layer error
-          nsCOMPtr<Document> document = do_QueryReferent(doc);
-          DispatchPointerLockError(document, "PointerLockDeniedFailedToLock");
-        });
-  } else {
-    nsCOMPtr<nsIRunnable> request =
-        new PointerLockRequest(aElement, userInputOrSystemCaller);
-    Dispatch(TaskCategory::Other, request.forget());
-  }
+  nsCOMPtr<nsIRunnable> request =
+      new PointerLockRequest(aElement, userInputOrSystemCaller);
+  Dispatch(TaskCategory::Other, request.forget());
 }
 
 bool Document::SetPointerLock(Element* aElement, StyleCursorKind aCursorStyle) {
diff -Nru firefox-84.0.2+build1/dom/base/DocumentFragment.h firefox-85.0+build1/dom/base/DocumentFragment.h
--- firefox-84.0.2+build1/dom/base/DocumentFragment.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DocumentFragment.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,9 @@
 #include "mozilla/dom/FragmentOrElement.h"
 #include "nsStringFwd.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file.
+#include "mozilla/dom/Element.h"
+
 class nsAtom;
 class nsIContent;
 
diff -Nru firefox-84.0.2+build1/dom/base/Document.h firefox-85.0+build1/dom/base/Document.h
--- firefox-84.0.2+build1/dom/base/Document.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Document.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,62 +7,105 @@
 #ifndef mozilla_dom_Document_h___
 #define mozilla_dom_Document_h___
 
-#include "mozilla/EventStates.h"  // for EventStates
-#include "mozilla/FlushType.h"    // for enum
-#include "mozilla/MozPromise.h"   // for MozPromise
-#include "mozilla/FunctionRef.h"  // for FunctionRef
-#include "nsCOMArray.h"           // for member
-#include "nsCompatibility.h"      // for member
-#include "nsCOMPtr.h"             // for member
-#include "nsGkAtoms.h"            // for static class members
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <new>
+#include <utility>
+#include "ErrorList.h"
+#include "MainThreadUtils.h"
+#include "ReferrerInfo.h"
+#include "Units.h"
+#include "imgIRequest.h"
+#include "js/RootingAPI.h"
+#include "js/friend/DOMProxy.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/BitSet.h"
+#include "mozilla/CORSMode.h"
+#include "mozilla/CallState.h"
+#include "mozilla/EventStates.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/FunctionRef.h"
+#include "mozilla/HashTable.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MozPromise.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/PreloadService.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
+#include "mozilla/SegmentedVector.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/UseCounter.h"
+#include "mozilla/WeakPtr.h"
+#include "mozilla/dom/DispatcherTrait.h"
+#include "mozilla/dom/DocumentOrShadowRoot.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/Nullable.h"
+#include "mozilla/dom/ViewportMetaData.h"
+#include "nsAtom.h"
+#include "nsCOMArray.h"
+#include "nsCOMPtr.h"
+#include "nsClassHashtable.h"
+#include "nsCompatibility.h"
+#include "nsContentListDeclarations.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsExpirationTracker.h"
+#include "nsGkAtoms.h"
+#include "nsHashKeys.h"
 #include "nsIApplicationCacheContainer.h"
+#include "nsIChannel.h"
+#include "nsIChannelEventSink.h"
 #include "nsIContentViewer.h"
+#include "nsID.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
-#include "nsILoadGroup.h"  // for member (in nsCOMPtr)
-#include "nsINode.h"       // for base class
+#include "nsILoadGroup.h"
+#include "nsILoadInfo.h"
+#include "nsINode.h"
+#include "nsIObserver.h"
 #include "nsIParser.h"
-#include "nsIChannelEventSink.h"
+#include "nsIPrincipal.h"
 #include "nsIProgressEventSink.h"
 #include "nsIRadioGroupContainer.h"
-#include "nsIScriptGlobalObject.h"
+#include "nsIReferrerInfo.h"
+#include "nsIRequestObserver.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "nsIURI.h"                 // for use in inline functions
-#include "nsIWeakReferenceUtils.h"  // for nsWeakPtr
-#include "nsPIDOMWindow.h"          // for use in inline functions
-#include "nsPropertyTable.h"        // for member
-#include "nsStringFwd.h"
+#include "nsIStreamListener.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsIURI.h"
+#include "nsIWeakReferenceUtils.h"
+#include "nsLiteralString.h"
+#include "nsPIDOMWindow.h"
+#include "nsPropertyTable.h"
+#include "nsRefPtrHashtable.h"
+#include "nsString.h"
 #include "nsStubMutationObserver.h"
-#include "nsTHashtable.h"  // for member
+#include "nsTArray.h"
+#include "nsTHashtable.h"
+#include "nsTLiteralString.h"
+#include "nsTObserverArray.h"
+#include "nsThreadUtils.h"
 #include "nsURIHashKey.h"
-#include "mozilla/UseCounter.h"
-#include "mozilla/WeakPtr.h"
-#include "Units.h"
-#include "nsContentListDeclarations.h"
-#include "nsExpirationTracker.h"
-#include "nsClassHashtable.h"
+#include "nsViewportInfo.h"
+#include "nsWeakReference.h"
 #include "nsWindowSizes.h"
-#include "ReferrerInfo.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/CallState.h"
-#include "mozilla/CORSMode.h"
-#include "mozilla/dom/DispatcherTrait.h"
-#include "mozilla/dom/DocumentOrShadowRoot.h"
-#include "mozilla/dom/ViewportMetaData.h"
-#include "mozilla/HashTable.h"
-#include "mozilla/LinkedList.h"
-#include "mozilla/NotNull.h"
-#include "mozilla/PreloadService.h"
-#include "mozilla/SegmentedVector.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/UniquePtr.h"
-#include <bitset>                // for member
-#include "js/friend/DOMProxy.h"  // JS::ExpandoAndGeneration
+#include "nsXULElement.h"
+#include "nscore.h"
 
 // XXX We need to include this here to ensure that DefaultDeleter for Servo
 // types is specialized before the template is instantiated. Probably, this
 // should be included at some other place already that's generated by cbindgen.
-#include "mozilla/ServoStyleConsts.h"
+#include "mozilla/ServoBindingTypes.h"
 
 // windows.h #defines CreateEvent
 #ifdef CreateEvent
@@ -79,51 +122,68 @@
 }  // namespace mozilla
 #endif  // MOZILLA_INTERNAL_API
 
+class InfallibleAllocPolicy;
+class JSObject;
+class JSTracer;
+class PLDHashTable;
 class gfxUserFontSet;
-class imgIRequest;
+class mozIDOMWindowProxy;
 class nsCachableElementsByNameNodeList;
 class nsCommandManager;
 class nsContentList;
-class nsDocShell;
+class nsCycleCollectionTraversalCallback;
+class nsDOMCaretPosition;
 class nsDOMNavigationTiming;
+class nsDocShell;
 class nsFrameLoader;
 class nsFrameLoaderOwner;
+class nsGenericHTMLElement;
 class nsGlobalWindowInner;
-class nsHtml5TreeOpExecutor;
 class nsHTMLCSSStyleSheet;
 class nsHTMLDocument;
 class nsHTMLStyleSheet;
-class nsGenericHTMLElement;
+class nsHtml5TreeOpExecutor;
+class nsIAppWindow;
+class nsIApplicationCache;
+class nsIAsyncVerifyRedirectCallback;
 class nsIBFCacheEntry;
 class nsIContent;
+class nsIContentSecurityPolicy;
 class nsIContentSink;
+class nsICookieJarSettings;
+class nsIDOMXULCommandDispatcher;
 class nsIDocShell;
 class nsIDocShellTreeItem;
 class nsIDocumentEncoder;
 class nsIDocumentObserver;
-class nsIDOMXULCommandDispatcher;
+class nsIEventTarget;
+class nsIFrame;
+class nsIGlobalObject;
 class nsIHTMLCollection;
+class nsIInputStream;
 class nsILayoutHistoryState;
 class nsIObjectLoadingContent;
+class nsIPermissionDelegateHandler;
+class nsIRadioVisitor;
 class nsIRequest;
 class nsIRunnable;
+class nsIScriptGlobalObject;
 class nsISecurityConsoleMessage;
+class nsISerialEventTarget;
 class nsIStructuredCloneContainer;
 class nsIVariant;
-class nsViewManager;
+class nsNodeInfoManager;
+class nsPIWindowRoot;
 class nsPresContext;
 class nsRange;
 class nsSimpleContentList;
 class nsTextNode;
-class nsDOMCaretPosition;
-class nsViewportInfo;
-class nsIGlobalObject;
-class nsIAppWindow;
+class nsViewManager;
 class nsXULPrototypeDocument;
-class nsXULPrototypeElement;
-class nsIPermissionDelegateHandler;
-struct nsFont;
+struct JSContext;
+struct RawServoSelectorList;
 struct StyleUseCounters;
+struct nsFont;
 
 namespace mozilla {
 class AbstractThread;
@@ -143,6 +203,7 @@
 class SMILAnimationController;
 enum class StyleCursorKind : uint8_t;
 enum class StylePrefersColorScheme : uint8_t;
+enum class StyleRuleChangeKind : uint32_t;
 template <typename>
 class OwningNonNull;
 struct URLExtraData;
@@ -164,7 +225,6 @@
 class CDATASection;
 class Comment;
 class CSSImportRule;
-struct CustomElementDefinition;
 class DocumentL10n;
 class DocumentFragment;
 class DocumentTimeline;
@@ -172,8 +232,8 @@
 class DOMImplementation;
 class DOMIntersectionObserver;
 class DOMStringList;
-class Element;
 class Event;
+class EventListener;
 struct FailedCertSecurityInfo;
 class FeaturePolicy;
 class FontFaceSet;
@@ -181,6 +241,7 @@
 class ImageTracker;
 class HTMLAllCollection;
 class HTMLBodyElement;
+class HTMLInputElement;
 class HTMLMetaElement;
 class HTMLDialogElement;
 class HTMLSharedElement;
@@ -191,6 +252,7 @@
 class MediaQueryList;
 struct NetErrorInfo;
 class NodeFilter;
+class NodeInfo;
 class NodeIterator;
 enum class OrientationType : uint8_t;
 class ProcessingInstruction;
@@ -198,6 +260,7 @@
 class ScriptLoader;
 class Selection;
 class ServiceWorkerDescriptor;
+class ShadowRoot;
 class SVGDocument;
 class SVGElement;
 class SVGSVGElement;
@@ -206,6 +269,9 @@
 class TouchList;
 class TreeWalker;
 enum class ViewportFitType : uint8_t;
+class WindowContext;
+class WindowGlobalChild;
+class WindowProxyHolder;
 class XPathEvaluator;
 class XPathExpression;
 class XPathNSResolver;
@@ -262,6 +328,13 @@
 class ResizeObserverController;
 class PostMessageEvent;
 
+#define DEPRECATED_OPERATION(_op) e##_op,
+enum class DeprecatedOperations : uint16_t {
+#include "nsDeprecatedOperationList.h"
+  eDeprecatedOperationCount
+};
+#undef DEPRECATED_OPERATION
+
 // Document states
 
 // RTL locale: specific to the XUL localedir attribute
@@ -819,35 +892,18 @@
    * header. So override the old ReferrerInfo if we get one from meta
    */
   void UpdateReferrerInfoFromMeta(const nsAString& aMetaReferrer,
-                                  bool aPreload) {
-    ReferrerPolicyEnum policy =
-        ReferrerInfo::ReferrerPolicyFromMetaString(aMetaReferrer);
-    // The empty string "" corresponds to no referrer policy, causing a fallback
-    // to a referrer policy defined elsewhere.
-    if (policy == ReferrerPolicy::_empty) {
-      return;
-    }
-
-    MOZ_ASSERT(mReferrerInfo);
-    MOZ_ASSERT(mPreloadReferrerInfo);
-
-    if (aPreload) {
-      mPreloadReferrerInfo =
-          static_cast<mozilla::dom::ReferrerInfo*>((mPreloadReferrerInfo).get())
-              ->CloneWithNewPolicy(policy);
-    } else {
-      mReferrerInfo =
-          static_cast<mozilla::dom::ReferrerInfo*>((mReferrerInfo).get())
-              ->CloneWithNewPolicy(policy);
-    }
-  }
+                                  bool aPreload);
 
   /**
    * Set the principals responsible for this document.  Chances are, you do not
    * want to be using this.
+   * Set aSetContentBlockingAllowListPrincipal to false to skip updating the
+   * content blocking allowlist principal. Currently used to prevent setting it
+   * to a NullPrincipal for sandboxed documents.
    */
   void SetPrincipals(nsIPrincipal* aPrincipal,
-                     nsIPrincipal* aPartitionedPrincipal);
+                     nsIPrincipal* aPartitionedPrincipal,
+                     bool aSetContentBlockingAllowListPrincipal = true);
 
   /**
    * Returns true if exempt from HTTPS-Only Mode upgrade.
@@ -2785,9 +2841,9 @@
    * use non-builtin XBL bindings.
    */
   bool AllowXULXBL() {
-    return mAllowXULXBL == eTriTrue
-               ? true
-               : mAllowXULXBL == eTriFalse ? false : InternalAllowXULXBL();
+    return mAllowXULXBL == eTriTrue    ? true
+           : mAllowXULXBL == eTriFalse ? false
+                                       : InternalAllowXULXBL();
   }
 
   /**
@@ -3139,12 +3195,6 @@
   // Update state on links in mLinksToUpdate.
   void FlushPendingLinkUpdates();
 
-#define DEPRECATED_OPERATION(_op) e##_op,
-  enum DeprecatedOperations {
-#include "nsDeprecatedOperationList.h"
-    eDeprecatedOperationCount
-  };
-#undef DEPRECATED_OPERATION
   bool HasWarnedAbout(DeprecatedOperations aOperation) const;
   void WarnOnceAbout(
       DeprecatedOperations aOperation, bool asError = false,
@@ -3231,14 +3281,6 @@
   // GetDoctype defined above
   Element* GetDocumentElement() const { return GetRootElement(); }
 
-  enum ElementCallbackType {
-    eConnected,
-    eDisconnected,
-    eAdopted,
-    eAttributeChanged,
-    eGetCustomInterface
-  };
-
   WindowContext* GetTopLevelWindowContext() const;
 
   Document* GetTopLevelContentDocument();
@@ -4164,7 +4206,9 @@
       InternalCommandDataHashtable;
   static InternalCommandDataHashtable* sInternalCommandDataHashtable;
 
-  mutable std::bitset<eDeprecatedOperationCount> mDeprecationWarnedAbout;
+  mutable std::bitset<static_cast<size_t>(
+      DeprecatedOperations::eDeprecatedOperationCount)>
+      mDeprecationWarnedAbout;
   mutable std::bitset<eDocumentWarningCount> mDocWarningWarnedAbout;
 
   // Lazy-initialization to have mDocGroup initialized in prior to the
@@ -5263,26 +5307,6 @@
 
 inline nsINode* nsINode::OwnerDocAsNode() const { return OwnerDoc(); }
 
-inline bool ShouldUseNACScope(const nsINode* aNode) {
-  return aNode->IsInNativeAnonymousSubtree();
-}
-
-inline bool ShouldUseUAWidgetScope(const nsINode* aNode) {
-  return aNode->HasBeenInUAWidget();
-}
-
-inline mozilla::dom::ParentObject nsINode::GetParentObject() const {
-  mozilla::dom::ParentObject p(OwnerDoc());
-  // Note that mReflectionScope is a no-op for chrome, and other places
-  // where we don't check this value.
-  if (ShouldUseNACScope(this)) {
-    p.mReflectionScope = mozilla::dom::ReflectionScope::NAC;
-  } else if (ShouldUseUAWidgetScope(this)) {
-    p.mReflectionScope = mozilla::dom::ReflectionScope::UAWidget;
-  }
-  return p;
-}
-
 inline mozilla::dom::Document* nsINode::AsDocument() {
   MOZ_ASSERT(IsDocument());
   return static_cast<mozilla::dom::Document*>(this);
diff -Nru firefox-84.0.2+build1/dom/base/DocumentOrShadowRoot.cpp firefox-85.0+build1/dom/base/DocumentOrShadowRoot.cpp
--- firefox-84.0.2+build1/dom/base/DocumentOrShadowRoot.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DocumentOrShadowRoot.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -332,6 +332,7 @@
 namespace {
 
 using FrameForPointOption = nsLayoutUtils::FrameForPointOption;
+using FrameForPointOptions = nsLayoutUtils::FrameForPointOptions;
 
 // Whether only one node or multiple nodes is requested.
 enum class Multiple {
@@ -360,7 +361,7 @@
 
 template <typename NodeOrElement>
 static void QueryNodesFromRect(DocumentOrShadowRoot& aRoot, const nsRect& aRect,
-                               EnumSet<FrameForPointOption> aOptions,
+                               FrameForPointOptions aOptions,
                                FlushLayout aShouldFlushLayout,
                                Multiple aMultiple, ViewportType aViewportType,
                                nsTArray<RefPtr<NodeOrElement>>& aNodes) {
@@ -390,8 +391,8 @@
     return;  // return null to premature XUL callers as a reminder to wait
   }
 
-  aOptions += FrameForPointOption::IgnorePaintSuppression;
-  aOptions += FrameForPointOption::IgnoreCrossDoc;
+  aOptions.mBits += FrameForPointOption::IgnorePaintSuppression;
+  aOptions.mBits += FrameForPointOption::IgnoreCrossDoc;
 
   AutoTArray<nsIFrame*, 8> frames;
   nsLayoutUtils::GetFramesForArea({rootFrame, aViewportType}, aRect, frames,
@@ -436,12 +437,12 @@
 
 template <typename NodeOrElement>
 static void QueryNodesFromPoint(DocumentOrShadowRoot& aRoot, float aX, float aY,
-                                EnumSet<FrameForPointOption> aOptions,
+                                FrameForPointOptions aOptions,
                                 FlushLayout aShouldFlushLayout,
                                 Multiple aMultiple, ViewportType aViewportType,
                                 nsTArray<RefPtr<NodeOrElement>>& aNodes) {
   // As per the spec, we return null if either coord is negative.
-  if (!aOptions.contains(FrameForPointOption::IgnoreRootScrollFrame) &&
+  if (!aOptions.mBits.contains(FrameForPointOption::IgnoreRootScrollFrame) &&
       (aX < 0 || aY < 0)) {
     return;
   }
@@ -499,6 +500,7 @@
                                          float aLeftSize,
                                          bool aIgnoreRootScrollFrame,
                                          bool aFlushLayout, bool aOnlyVisible,
+                                         float aVisibleThreshold,
                                          nsTArray<RefPtr<nsINode>>& aReturn) {
   // Following the same behavior of elementFromPoint,
   // we don't return anything if either coord is negative
@@ -513,12 +515,13 @@
 
   nsRect rect(x, y, w, h);
 
-  EnumSet<FrameForPointOption> options;
+  FrameForPointOptions options;
   if (aIgnoreRootScrollFrame) {
-    options += FrameForPointOption::IgnoreRootScrollFrame;
+    options.mBits += FrameForPointOption::IgnoreRootScrollFrame;
   }
   if (aOnlyVisible) {
-    options += FrameForPointOption::OnlyVisible;
+    options.mBits += FrameForPointOption::OnlyVisible;
+    options.mVisibleThreshold = aVisibleThreshold;
   }
 
   auto flush = aFlushLayout ? FlushLayout::Yes : FlushLayout::No;
diff -Nru firefox-84.0.2+build1/dom/base/DocumentOrShadowRoot.h firefox-85.0+build1/dom/base/DocumentOrShadowRoot.h
--- firefox-84.0.2+build1/dom/base/DocumentOrShadowRoot.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DocumentOrShadowRoot.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/NameSpaceConstants.h"
 #include "mozilla/IdentifierMapEntry.h"
 #include "mozilla/RelativeTo.h"
+#include "mozilla/ReverseIterator.h"
 #include "nsClassHashtable.h"
 #include "nsContentListDeclarations.h"
 #include "nsTArray.h"
@@ -142,7 +143,8 @@
   void NodesFromRect(float aX, float aY, float aTopSize, float aRightSize,
                      float aBottomSize, float aLeftSize,
                      bool aIgnoreRootScrollFrame, bool aFlushLayout,
-                     bool aOnlyVisible, nsTArray<RefPtr<nsINode>>&);
+                     bool aOnlyVisible, float aVisibleThreshold,
+                     nsTArray<RefPtr<nsINode>>&);
 
   /**
    * This gets fired when the element that an id refers to changes.
diff -Nru firefox-84.0.2+build1/dom/base/DOMException.h firefox-85.0+build1/dom/base/DOMException.h
--- firefox-84.0.2+build1/dom/base/DOMException.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMException.h	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 #endif
 
 #include <stdint.h>
+#include "js/Value.h"
 #include "jspubtd.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
diff -Nru firefox-84.0.2+build1/dom/base/DOMImplementation.cpp firefox-85.0+build1/dom/base/DOMImplementation.cpp
--- firefox-84.0.2+build1/dom/base/DOMImplementation.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMImplementation.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/DOMImplementationBinding.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentType.h"
 #include "nsTextNode.h"
 
@@ -26,6 +27,18 @@
 NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMImplementation)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation)
 
+DOMImplementation::DOMImplementation(Document* aOwner,
+                                     nsIGlobalObject* aScriptObject,
+                                     nsIURI* aDocumentURI, nsIURI* aBaseURI)
+    : mOwner(aOwner),
+      mScriptObject(do_GetWeakReference(aScriptObject)),
+      mDocumentURI(aDocumentURI),
+      mBaseURI(aBaseURI) {
+  MOZ_ASSERT(aOwner);
+}
+
+DOMImplementation::~DOMImplementation() = default;
+
 JSObject* DOMImplementation::WrapObject(JSContext* aCx,
                                         JS::Handle<JSObject*> aGivenProto) {
   return DOMImplementation_Binding::Wrap(aCx, this, aGivenProto);
diff -Nru firefox-84.0.2+build1/dom/base/DOMImplementation.h firefox-85.0+build1/dom/base/DOMImplementation.h
--- firefox-84.0.2+build1/dom/base/DOMImplementation.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMImplementation.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,32 +10,28 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/Document.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIURI.h"
 #include "nsIWeakReferenceUtils.h"
 #include "nsString.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class Document;
 class DocumentType;
+template <typename T>
+class Optional;
 
 class DOMImplementation final : public nsISupports, public nsWrapperCache {
-  ~DOMImplementation() = default;
+  ~DOMImplementation();
 
  public:
   DOMImplementation(Document* aOwner, nsIGlobalObject* aScriptObject,
-                    nsIURI* aDocumentURI, nsIURI* aBaseURI)
-      : mOwner(aOwner),
-        mScriptObject(do_GetWeakReference(aScriptObject)),
-        mDocumentURI(aDocumentURI),
-        mBaseURI(aBaseURI) {
-    MOZ_ASSERT(aOwner);
-  }
+                    nsIURI* aDocumentURI, nsIURI* aBaseURI);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMImplementation)
diff -Nru firefox-84.0.2+build1/dom/base/DOMIntersectionObserver.cpp firefox-85.0+build1/dom/base/DOMIntersectionObserver.cpp
--- firefox-84.0.2+build1/dom/base/DOMIntersectionObserver.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMIntersectionObserver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsCSSPropertyID.h"
 #include "nsIFrame.h"
 #include "nsContainerFrame.h"
+#include "nsIScrollableFrame.h"
 #include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsRefreshDriver.h"
@@ -75,6 +76,14 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mQueuedEntries)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+DOMIntersectionObserver::DOMIntersectionObserver(
+    already_AddRefed<nsPIDOMWindowInner>&& aOwner,
+    dom::IntersectionCallback& aCb)
+    : mOwner(aOwner),
+      mDocument(mOwner->GetExtantDoc()),
+      mCallback(RefPtr<dom::IntersectionCallback>(&aCb)),
+      mConnected(false) {}
+
 already_AddRefed<DOMIntersectionObserver> DOMIntersectionObserver::Constructor(
     const GlobalObject& aGlobal, dom::IntersectionCallback& aCb,
     ErrorResult& aRv) {
@@ -184,6 +193,8 @@
   return Servo_IntersectionObserverRootMargin_Parse(&aString, &mRootMargin);
 }
 
+nsISupports* DOMIntersectionObserver::GetParentObject() const { return mOwner; }
+
 void DOMIntersectionObserver::GetRootMargin(DOMString& aRetVal) {
   nsString& retVal = aRetVal;
   Servo_IntersectionObserverRootMargin_ToString(&mRootMargin, &retVal);
diff -Nru firefox-84.0.2+build1/dom/base/DOMIntersectionObserver.h firefox-85.0+build1/dom/base/DOMIntersectionObserver.h
--- firefox-84.0.2+build1/dom/base/DOMIntersectionObserver.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMIntersectionObserver.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/IntersectionObserverBinding.h"
 #include "mozilla/ServoStyleConsts.h"
 #include "mozilla/Variant.h"
+#include "nsDOMNavigationTiming.h"
 #include "nsTArray.h"
 
 namespace mozilla {
@@ -89,11 +90,7 @@
 
  public:
   DOMIntersectionObserver(already_AddRefed<nsPIDOMWindowInner>&& aOwner,
-                          dom::IntersectionCallback& aCb)
-      : mOwner(aOwner),
-        mDocument(mOwner->GetExtantDoc()),
-        mCallback(RefPtr<dom::IntersectionCallback>(&aCb)),
-        mConnected(false) {}
+                          dom::IntersectionCallback& aCb);
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMIntersectionObserver)
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOM_INTERSECTION_OBSERVER_IID)
@@ -109,7 +106,7 @@
     return IntersectionObserver_Binding::Wrap(aCx, this, aGivenProto);
   }
 
-  nsISupports* GetParentObject() const { return mOwner; }
+  nsISupports* GetParentObject() const;
 
   nsINode* GetRoot() const { return mRoot; }
 
diff -Nru firefox-84.0.2+build1/dom/base/DOMMatrix.cpp firefox-85.0+build1/dom/base/DOMMatrix.cpp
--- firefox-84.0.2+build1/dom/base/DOMMatrix.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMMatrix.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,21 +6,34 @@
 
 #include "mozilla/dom/DOMMatrix.h"
 
-#include "mozilla/dom/BindingUtils.h"
+#include <cmath>
+#include <cstdint>
+#include <new>
+#include "ErrorList.h"
+#include "js/Conversions.h"
+#include "js/Equality.h"
+#include "js/StructuredClone.h"
+#include "js/Value.h"
+#include "mozilla/Casting.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/ServoCSSParser.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMMatrixBinding.h"
 #include "mozilla/dom/DOMPoint.h"
 #include "mozilla/dom/DOMPointBinding.h"
-#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ToJSValue.h"
-#include "mozilla/ServoCSSParser.h"
-#include "nsGlobalWindowInner.h"
-#include "nsStyleTransformMatrix.h"
-#include "nsGlobalWindowInner.h"
-
-#include <math.h>
-
-#include "js/Conversions.h"  // JS::NumberToString
-#include "js/Equality.h"     // JS::SameValueZero
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/BasePoint4D.h"
+#include "mozilla/gfx/Point.h"
+#include "nsIGlobalObject.h"
+#include "nsPIDOMWindow.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/DOMMatrix.h firefox-85.0+build1/dom/base/DOMMatrix.h
--- firefox-84.0.2+build1/dom/base/DOMMatrix.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMMatrix.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,26 +7,36 @@
 #ifndef MOZILLA_DOM_DOMMATRIX_H_
 #define MOZILLA_DOM_DOMMATRIX_H_
 
-#include "js/StructuredClone.h"
-#include "nsWrapperCache.h"
-#include "nsISupports.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
+#include <cstring>
+#include <utility>
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/UniquePtr.h"
-#include "nsCOMPtr.h"
-#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/TypedArray.h"
-#include "mozilla/gfx/Matrix.h"  // for Matrix4x4Double
+#include "mozilla/gfx/Matrix.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsWrapperCache.h"
 
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class GlobalObject;
 class DOMMatrix;
 class DOMPoint;
+template <typename T>
+class Optional;
 class UTF8StringOrUnrestrictedDoubleSequenceOrDOMMatrixReadOnly;
 struct DOMPointInit;
 struct DOMMatrixInit;
diff -Nru firefox-84.0.2+build1/dom/base/DOMParser.cpp firefox-85.0+build1/dom/base/DOMParser.cpp
--- firefox-84.0.2+build1/dom/base/DOMParser.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMParser.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsDOMString.h"
 #include "MainThreadUtils.h"
 #include "SystemPrincipal.h"
+#include "nsIScriptGlobalObject.h"
 #include "nsIStreamListener.h"
 #include "nsStringStream.h"
 #include "nsCRT.h"
@@ -23,6 +24,7 @@
 #include "mozilla/NullPrincipal.h"
 #include "NullPrincipalURI.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ScriptSettings.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/base/DOMParser.h firefox-85.0+build1/dom/base/DOMParser.h
--- firefox-84.0.2+build1/dom/base/DOMParser.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMParser.h	2021-01-18 19:58:08.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Span.h"
 #include "mozilla/dom/DOMParserBinding.h"
 #include "mozilla/dom/TypedArray.h"
@@ -18,6 +17,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DOMParser final : public nsISupports, public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/dom/base/DOMPoint.cpp firefox-85.0+build1/dom/base/DOMPoint.cpp
--- firefox-84.0.2+build1/dom/base/DOMPoint.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMPoint.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,8 +6,16 @@
 
 #include "mozilla/dom/DOMPoint.h"
 
-#include "mozilla/dom/DOMPointBinding.h"
+#include <cstdint>
+#include "js/StructuredClone.h"
+#include "mozilla/Casting.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/DOMMatrix.h"
+#include "mozilla/dom/DOMPointBinding.h"
+#include "nsIGlobalObject.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/DOMPoint.h firefox-85.0+build1/dom/base/DOMPoint.h
--- firefox-84.0.2+build1/dom/base/DOMPoint.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMPoint.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,20 +7,23 @@
 #ifndef MOZILLA_DOMPOINT_H_
 #define MOZILLA_DOMPOINT_H_
 
-#include "js/StructuredClone.h"
-#include "DOMMatrix.h"
-#include "nsWrapperCache.h"
-#include "nsIGlobalObject.h"
-#include "nsISupports.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "nsCOMPtr.h"
-#include "mozilla/dom/BindingDeclarations.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsWrapperCache.h"
 
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class GlobalObject;
diff -Nru firefox-84.0.2+build1/dom/base/DOMQuad.cpp firefox-85.0+build1/dom/base/DOMQuad.cpp
--- firefox-84.0.2+build1/dom/base/DOMQuad.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMQuad.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,11 +6,17 @@
 
 #include "mozilla/dom/DOMQuad.h"
 
+#include <algorithm>
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMPoint.h"
 #include "mozilla/dom/DOMQuadBinding.h"
 #include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/DOMRectBinding.h"
-#include "mozilla/FloatingPoint.h"
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/MatrixFwd.h"
+#include "nsIGlobalObject.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/DOMQuad.h firefox-85.0+build1/dom/base/DOMQuad.h
--- firefox-84.0.2+build1/dom/base/DOMQuad.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMQuad.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,24 +7,29 @@
 #ifndef MOZILLA_DOMQUAD_H_
 #define MOZILLA_DOMQUAD_H_
 
-#include "js/StructuredClone.h"
-#include "nsWrapperCache.h"
-#include "nsISupports.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
-#include "nsCOMPtr.h"
-#include "nsIGlobalObject.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
+#include <cstdint>
 #include "Units.h"
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsWrapperCache.h"
 
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
 namespace dom {
 
 class DOMRectReadOnly;
 class DOMPoint;
+class GlobalObject;
 struct DOMPointInit;
 struct DOMQuadInit;
 struct DOMRectInit;
diff -Nru firefox-84.0.2+build1/dom/base/DOMRect.cpp firefox-85.0+build1/dom/base/DOMRect.cpp
--- firefox-84.0.2+build1/dom/base/DOMRect.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMRect.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,9 +6,16 @@
 
 #include "mozilla/dom/DOMRect.h"
 
-#include "nsPresContext.h"
-#include "mozilla/dom/DOMRectListBinding.h"
+#include <cmath>
+#include "js/StructuredClone.h"
+#include "mozilla/AppUnits.h"
+#include "mozilla/Casting.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMRectBinding.h"
+#include "mozilla/dom/DOMRectListBinding.h"
+#include "nsIGlobalObject.h"
+#include "nsRect.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/DOMRect.h firefox-85.0+build1/dom/base/DOMRect.h
--- firefox-84.0.2+build1/dom/base/DOMRect.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMRect.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,22 +7,32 @@
 #ifndef MOZILLA_DOMRECT_H_
 #define MOZILLA_DOMRECT_H_
 
-#include "js/StructuredClone.h"
-#include "nsTArray.h"
+#include <algorithm>
+#include <cstdint>
+#include <new>
+#include <utility>
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
-#include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/FloatingPoint.h"
+#include "nsISupports.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
 
-struct nsRect;
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+struct nsRect;
 
 namespace mozilla {
 namespace dom {
 
+class GlobalObject;
 struct DOMRectInit;
 
 class DOMRectReadOnly : public nsISupports, public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/dom/base/DOMRequest.cpp firefox-85.0+build1/dom/base/DOMRequest.cpp
--- firefox-84.0.2+build1/dom/base/DOMRequest.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/DOMRequest.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "DOMException.h"
 #include "nsThreadUtils.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/Promise.h"
diff -Nru firefox-84.0.2+build1/dom/base/Element.cpp firefox-85.0+build1/dom/base/Element.cpp
--- firefox-84.0.2+build1/dom/base/Element.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Element.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,140 +10,128 @@
  * utility methods for subclasses, and so forth.
  */
 
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementInlines.h"
 
-#include "AnimationCommon.h"
+#include <inttypes.h>
+#include <initializer_list>
+#include <new>
+#include "DOMIntersectionObserver.h"
+#include "DOMMatrix.h"
 #include "ExpandedPrincipal.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/StaticPrefs_layout.h"
-#include "mozilla/StaticPrefs_full_screen_api.h"
-#include "mozilla/dom/Animation.h"
-#include "mozilla/dom/Attr.h"
-#include "mozilla/dom/BindContext.h"
-#include "mozilla/dom/Flex.h"
-#include "mozilla/dom/Grid.h"
-#include "mozilla/dom/Link.h"
-#include "mozilla/dom/MutationObservers.h"
-#include "mozilla/dom/ScriptLoader.h"
-#include "mozilla/dom/Text.h"
-#include "mozilla/dom/nsCSPContext.h"
-#include "mozilla/gfx/Matrix.h"
-#include "nsAtom.h"
-#include "nsDocShell.h"
-#include "nsDOMAttributeMap.h"
-#include "nsIContentInlines.h"
-#include "mozilla/dom/NodeInfo.h"
-#include "mozilla/dom/DocumentTimeline.h"
-#include "nsFlexContainerFrame.h"
-#include "nsFocusManager.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsContainerFrame.h"
-#include "nsIAnonymousContentCreator.h"
-#include "nsPresContext.h"
-#include "nsStyleConsts.h"
-#include "nsString.h"
-#include "nsUnicharUtils.h"
-#include "nsDOMCID.h"
-#include "nsDOMCSSAttrDeclaration.h"
-#include "nsNameSpaceManager.h"
-#include "nsContentList.h"
-#include "nsVariant.h"
-#include "nsDOMTokenList.h"
-#include "nsError.h"
-#include "nsDOMString.h"
-#include "mozilla/dom/AnimatableBinding.h"
-#include "mozilla/dom/FeaturePolicyUtils.h"
-#include "mozilla/dom/HTMLDivElement.h"
-#include "mozilla/dom/HTMLParagraphElement.h"
-#include "mozilla/dom/HTMLPreElement.h"
-#include "mozilla/dom/HTMLSpanElement.h"
-#include "mozilla/dom/HTMLTableCellElement.h"
-#include "mozilla/dom/KeyframeAnimationOptionsBinding.h"
-#include "mozilla/dom/MutationEventBinding.h"
+#include "PresShellInlines.h"
+#include "jsapi.h"
+#include "mozAutoDocUpdate.h"
 #include "mozilla/AnimationComparator.h"
+#include "mozilla/AnimationTarget.h"
 #include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/CORSMode.h"
+#include "mozilla/ComputedStyle.h"
 #include "mozilla/ContentEvents.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/DeclarationBlock.h"
+#include "mozilla/EffectCompositor.h"
 #include "mozilla/EffectSet.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/EventStates.h"
+#include "mozilla/FloatingPoint.h"
 #include "mozilla/FullscreenChange.h"
 #include "mozilla/InternalMutationEvent.h"
+#include "mozilla/Likely.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/LookAndFeel.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/NotNull.h"
 #include "mozilla/PresShell.h"
-#include "mozilla/RestyleManager.h"
+#include "mozilla/PresShellForwards.h"
+#include "mozilla/ReflowOutput.h"
+#include "mozilla/RelativeTo.h"
+#include "mozilla/ScrollOrigin.h"
 #include "mozilla/ScrollTypes.h"
+#include "mozilla/ServoStyleConsts.h"
+#include "mozilla/ServoStyleConstsInlines.h"
 #include "mozilla/SizeOfState.h"
+#include "mozilla/StaticAnalysisFunctions.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StaticPrefs_full_screen_api.h"
 #include "mozilla/TextControlElement.h"
-#include "mozilla/TextEditor.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/TypedEnumBits.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/AnimatableBinding.h"
+#include "mozilla/dom/Animation.h"
+#include "mozilla/dom/Attr.h"
+#include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/CustomElementRegistry.h"
+#include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "mozilla/dom/Document.h"
-#include "mozilla/dom/DocumentInlines.h"
-#include "nsAttrValueOrString.h"
-#include "nsAttrValueInlines.h"
-#include "nsCSSPseudoElements.h"
-#include "nsWindowSizes.h"
-#ifdef MOZ_XUL
-#  include "nsXULElement.h"
-#endif /* MOZ_XUL */
-#include "SVGElement.h"
-#include "nsFrameSelection.h"
-#ifdef DEBUG
-#  include "nsRange.h"
-#endif
-
-#include "nsPIDOMWindow.h"
-#include "mozilla/dom/DOMRect.h"
-#include "nsLayoutUtils.h"
-#include "nsGkAtoms.h"
-#include "ChildIterator.h"
-
-#include "nsIWidget.h"
-
-#include "nsNodeInfoManager.h"
-#include "nsGenericHTMLElement.h"
-#include "nsContentCreatorFunctions.h"
-#include "nsView.h"
-#include "nsViewManager.h"
-#include "nsIScrollableFrame.h"
-#include "nsTextNode.h"
-
-#include "nsCycleCollectionParticipant.h"
-#include "nsCCUncollectableMarker.h"
-
-#include "mozAutoDocUpdate.h"
-
-#include "nsDOMMutationObserver.h"
-#include "nsWrapperCacheInlines.h"
-#include "xpcpublic.h"
-#include "nsIScriptError.h"
-#include "mozilla/Telemetry.h"
-
-#include "mozilla/CORSMode.h"
-#include "mozilla/dom/ShadowRoot.h"
-#include "mozilla/dom/NodeListBinding.h"
-
-#include "nsStyledElement.h"
-#include "nsITextControlFrame.h"
-#include "nsISupportsImpl.h"
-#include "mozilla/dom/CSSPseudoElement.h"
 #include "mozilla/dom/DocumentFragment.h"
+#include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/DocumentTimeline.h"
 #include "mozilla/dom/ElementBinding.h"
-#include "mozilla/dom/KeyframeEffectBinding.h"
+#include "mozilla/dom/ElementInlines.h"
+#include "mozilla/dom/Flex.h"
+#include "mozilla/dom/FromParser.h"
+#include "mozilla/dom/Grid.h"
+#include "mozilla/dom/HTMLDivElement.h"
+#include "mozilla/dom/HTMLParagraphElement.h"
+#include "mozilla/dom/HTMLPreElement.h"
+#include "mozilla/dom/HTMLSpanElement.h"
+#include "mozilla/dom/HTMLTableCellElement.h"
+#include "mozilla/dom/KeyframeAnimationOptionsBinding.h"
 #include "mozilla/dom/KeyframeEffect.h"
 #include "mozilla/dom/MouseEventBinding.h"
+#include "mozilla/dom/MutationEventBinding.h"
+#include "mozilla/dom/MutationObservers.h"
+#include "mozilla/dom/NodeInfo.h"
+#include "mozilla/dom/PointerEventHandler.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/SVGElement.h"
+#include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/dom/ShadowRoot.h"
+#include "mozilla/dom/Text.h"
 #include "mozilla/dom/WindowBinding.h"
-#include "mozilla/dom/VRDisplay.h"
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Preferences.h"
-#include "nsComputedDOMStyle.h"
+#include "mozilla/dom/nsCSPContext.h"
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/BaseRect.h"
+#include "mozilla/gfx/BaseSize.h"
+#include "mozilla/gfx/Matrix.h"
+#include "nsAtom.h"
+#include "nsAttrName.h"
+#include "nsAttrValueInlines.h"
+#include "nsAttrValueOrString.h"
+#include "nsBaseHashtable.h"
+#include "nsBlockFrame.h"
+#include "nsCOMPtr.h"
+#include "nsContentUtils.h"
+#include "nsCSSPseudoElements.h"
+#include "nsCompatibility.h"
+#include "nsContainerFrame.h"
+#include "nsContentList.h"
+#include "nsContentListDeclarations.h"
+#include "nsCoord.h"
+#include "nsDOMAttributeMap.h"
+#include "nsDOMCSSAttrDeclaration.h"
+#include "nsDOMMutationObserver.h"
+#include "nsDOMString.h"
 #include "nsDOMStringMap.h"
-#include "DOMIntersectionObserver.h"
-
+#include "nsDOMTokenList.h"
+#include "nsDocShell.h"
+#include "nsError.h"
+#include "nsFlexContainerFrame.h"
+#include "nsFocusManager.h"
+#include "nsFrameState.h"
+#include "nsGenericHTMLElement.h"
+#include "nsGkAtoms.h"
+#include "nsGridContainerFrame.h"
+#include "nsIAutoCompletePopup.h"
+#include "nsIBrowser.h"
+#include "nsIContentInlines.h"
 #include "nsIDOMXULButtonElement.h"
 #include "nsIDOMXULContainerElement.h"
 #include "nsIDOMXULControlElement.h"
@@ -151,16 +139,49 @@
 #include "nsIDOMXULMultSelectCntrlEl.h"
 #include "nsIDOMXULRadioGroupElement.h"
 #include "nsIDOMXULRelatedElement.h"
-#include "nsIDOMXULMultSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
-#include "nsIBrowser.h"
-#include "nsIAutoCompletePopup.h"
-
+#include "nsIDocShell.h"
+#include "nsIFocusManager.h"
+#include "nsIFrame.h"
+#include "nsIGlobalObject.h"
+#include "nsIIOService.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIMemoryReporter.h"
+#include "nsIPrincipal.h"
+#include "nsIScriptError.h"
+#include "nsIScrollableFrame.h"
 #include "nsISpeculativeConnect.h"
-#include "nsBlockFrame.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsIURI.h"
+#include "nsLayoutUtils.h"
+#include "nsLineBox.h"
+#include "nsNameSpaceManager.h"
+#include "nsNodeInfoManager.h"
+#include "nsPIDOMWindow.h"
+#include "nsPoint.h"
+#include "nsPresContext.h"
+#include "nsQueryFrame.h"
+#include "nsRefPtrHashtable.h"
+#include "nsSize.h"
+#include "nsString.h"
+#include "nsStyleConsts.h"
+#include "nsStyleStruct.h"
+#include "nsStyledElement.h"
+#include "nsTArray.h"
+#include "nsTextNode.h"
+#include "nsThreadUtils.h"
+#include "nsViewManager.h"
+#include "nsWindowSizes.h"
 
-#include "DOMMatrix.h"
+#ifdef MOZ_XUL
+#  include "nsXULElement.h"
+#endif /* MOZ_XUL */
+
+#ifdef DEBUG
+#  include "nsRange.h"
+#endif
 
 #ifdef ACCESSIBILITY
 #  include "nsAccessibilityService.h"
@@ -233,6 +254,68 @@
 
 namespace mozilla::dom {
 
+nsDOMAttributeMap* Element::Attributes() {
+  nsDOMSlots* slots = DOMSlots();
+  if (!slots->mAttributeMap) {
+    slots->mAttributeMap = new nsDOMAttributeMap(this);
+  }
+
+  return slots->mAttributeMap;
+}
+
+void Element::SetPointerCapture(int32_t aPointerId, ErrorResult& aError) {
+  if (nsContentUtils::ShouldResistFingerprinting(GetComposedDoc()) &&
+      aPointerId != PointerEventHandler::GetSpoofedPointerIdForRFP()) {
+    aError.ThrowNotFoundError("Invalid pointer id");
+    return;
+  }
+  const PointerInfo* pointerInfo =
+      PointerEventHandler::GetPointerInfo(aPointerId);
+  if (!pointerInfo) {
+    aError.ThrowNotFoundError("Invalid pointer id");
+    return;
+  }
+  if (!IsInComposedDoc()) {
+    aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return;
+  }
+  if (OwnerDoc()->GetPointerLockElement()) {
+    // Throw an exception 'InvalidStateError' while the page has a locked
+    // element.
+    aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return;
+  }
+  if (!pointerInfo->mActiveState ||
+      pointerInfo->mActiveDocument != OwnerDoc()) {
+    return;
+  }
+  PointerEventHandler::RequestPointerCaptureById(aPointerId, this);
+}
+
+void Element::ReleasePointerCapture(int32_t aPointerId, ErrorResult& aError) {
+  if (nsContentUtils::ShouldResistFingerprinting(GetComposedDoc()) &&
+      aPointerId != PointerEventHandler::GetSpoofedPointerIdForRFP()) {
+    aError.ThrowNotFoundError("Invalid pointer id");
+    return;
+  }
+  if (!PointerEventHandler::GetPointerInfo(aPointerId)) {
+    aError.ThrowNotFoundError("Invalid pointer id");
+    return;
+  }
+  if (HasPointerCapture(aPointerId)) {
+    PointerEventHandler::ReleasePointerCaptureById(aPointerId);
+  }
+}
+
+bool Element::HasPointerCapture(long aPointerId) {
+  PointerCaptureInfo* pointerCaptureInfo =
+      PointerEventHandler::GetPointerCaptureInfo(aPointerId);
+  if (pointerCaptureInfo && pointerCaptureInfo->mPendingElement == this) {
+    return true;
+  }
+  return false;
+}
+
 const nsAttrValue* Element::GetSVGAnimatedClass() const {
   MOZ_ASSERT(MayHaveClass() && IsSVGElement(), "Unexpected call");
   return static_cast<const SVGElement*>(this)->GetAnimatedClassName();
@@ -356,7 +439,7 @@
 
 void Element::Focus(const FocusOptions& aOptions, CallerType aCallerType,
                     ErrorResult& aError) {
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
   if (!fm) {
     return;
   }
@@ -817,7 +900,7 @@
   }
 
   nsRect paddingRect = aFrame->GetPaddingRectRelativeToSelf();
-  nsOverflowAreas overflowAreas(paddingRect, paddingRect);
+  OverflowAreas overflowAreas(paddingRect, paddingRect);
   // Add the scrollable overflow areas of children (if any) to the paddingRect.
   // It's important to start with the paddingRect, otherwise if there are no
   // children the overflow rect will be 0,0,0,0 which will force the point 0,0
@@ -1623,7 +1706,8 @@
     // connected.
     if (CustomElementData* data = GetCustomElementData()) {
       if (data->mState == CustomElementData::State::eCustom) {
-        nsContentUtils::EnqueueLifecycleCallback(Document::eConnected, this);
+        nsContentUtils::EnqueueLifecycleCallback(
+            ElementCallbackType::eConnected, this);
       } else {
         // Step 7.7.2.2 https://dom.spec.whatwg.org/#concept-node-insert
         nsContentUtils::TryToUpgradeElement(this);
@@ -1857,7 +1941,8 @@
     CustomElementData* data = GetCustomElementData();
     if (data) {
       if (data->mState == CustomElementData::State::eCustom) {
-        nsContentUtils::EnqueueLifecycleCallback(Document::eDisconnected, this);
+        nsContentUtils::EnqueueLifecycleCallback(
+            ElementCallbackType::eDisconnected, this);
       } else {
         // Remove an unresolved custom element that is a candidate for upgrade
         // when a custom element is disconnected.
@@ -1891,6 +1976,11 @@
   MOZ_ASSERT(!document || document->GetServoRestyleRoot() != this);
 }
 
+UniquePtr<SMILAttr> Element::GetAnimatedAttr(int32_t aNamespaceID,
+                                             nsAtom* aName) {
+  return nullptr;
+}
+
 nsDOMCSSAttributeDeclaration* Element::SMILOverrideStyle() {
   Element::nsExtendedDOMSlots* slots = ExtendedDOMSlots();
 
@@ -2407,7 +2497,8 @@
                                     (ns.IsEmpty() ? VoidString() : ns)};
 
       nsContentUtils::EnqueueLifecycleCallback(
-          Document::eAttributeChanged, this, &args, nullptr, definition);
+          ElementCallbackType::eAttributeChanged, this, &args, nullptr,
+          definition);
     }
   }
 
@@ -2589,7 +2680,8 @@
                                     (ns.IsEmpty() ? VoidString() : ns)};
 
       nsContentUtils::EnqueueLifecycleCallback(
-          Document::eAttributeChanged, this, &args, nullptr, definition);
+          ElementCallbackType::eAttributeChanged, this, &args, nullptr,
+          definition);
     }
   }
 
@@ -2701,7 +2793,8 @@
           VoidString(), (ns.IsEmpty() ? VoidString() : ns)};
 
       nsContentUtils::EnqueueLifecycleCallback(
-          Document::eAttributeChanged, this, &args, nullptr, definition);
+          ElementCallbackType::eAttributeChanged, this, &args, nullptr,
+          definition);
     }
   }
 
@@ -2952,7 +3045,7 @@
         aVisitor.mEvent->mFlags.mMultipleActionsPrevented = true;
 
         if (IsInComposedDoc()) {
-          if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
+          if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
             RefPtr<Element> kungFuDeathGrip(this);
             fm->SetFocus(kungFuDeathGrip, nsIFocusManager::FLAG_BYMOUSE |
                                               nsIFocusManager::FLAG_NOSCROLL);
diff -Nru firefox-84.0.2+build1/dom/base/Element.h firefox-85.0+build1/dom/base/Element.h
--- firefox-84.0.2+build1/dom/base/Element.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Element.h	2021-01-18 19:58:08.000000000 +0000
@@ -13,42 +13,67 @@
 #ifndef mozilla_dom_Element_h__
 #define mozilla_dom_Element_h__
 
+#include <cstdio>
+#include <cstdint>
+#include <cstdlib>
+#include <utility>
 #include "AttrArray.h"
-#include "nsAttrValue.h"
-#include "nsAttrValueInlines.h"
-#include "nsChangeHint.h"
-#include "nsContentUtils.h"
-#include "nsDOMAttributeMap.h"
-#include "nsRect.h"
+#include "ErrorList.h"
 #include "Units.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/CORSMode.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/FlushType.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/PseudoStyleType.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/RustCell.h"
-#include "mozilla/SMILAttr.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BorrowedAttrInfo.h"
+#include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "mozilla/dom/FragmentOrElement.h"
-#include "mozilla/dom/PointerEventHandler.h"
+#include "mozilla/dom/NameSpaceConstants.h"
+#include "mozilla/dom/NodeInfo.h"
 #include "mozilla/dom/ShadowRootBinding.h"
+#include "nsAtom.h"
+#include "nsAttrValue.h"
+#include "nsAttrValueInlines.h"
+#include "nsCaseTreatment.h"
+#include "nsChangeHint.h"
+#include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsGkAtoms.h"
+#include "nsHashKeys.h"
+#include "nsIContent.h"
+#include "nsID.h"
+#include "nsINode.h"
+#include "nsLiteralString.h"
+#include "nsRect.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsTLiteralString.h"
+#include "nscore.h"
 
+class JSObject;
 class mozAutoDocUpdate;
-class nsIFrame;
-class nsIMozBrowserFrame;
-class nsIScrollableFrame;
-class nsIURI;
+class nsAttrName;
 class nsAttrValueOrString;
 class nsContentList;
+class nsDOMAttributeMap;
+class nsDOMCSSAttributeDeclaration;
+class nsDOMStringMap;
 class nsDOMTokenList;
 class nsFocusManager;
 class nsGlobalWindowInner;
 class nsGlobalWindowOuter;
-class nsDOMCSSAttributeDeclaration;
-class nsDOMStringMap;
-struct ServoNodeData;
-
+class nsIAutoCompletePopup;
+class nsIBrowser;
 class nsIDOMXULButtonElement;
 class nsIDOMXULContainerElement;
 class nsIDOMXULContainerItemElement;
@@ -59,30 +84,54 @@
 class nsIDOMXULRelatedElement;
 class nsIDOMXULSelectControlElement;
 class nsIDOMXULSelectControlItemElement;
-class nsIBrowser;
-class nsIAutoCompletePopup;
+class nsIFrame;
+class nsIHTMLCollection;
+class nsIMozBrowserFrame;
+class nsIPrincipal;
+class nsIScrollableFrame;
+class nsIURI;
+class nsMappedAttributes;
+class nsPresContext;
+class nsWindowSizes;
+struct JSContext;
+struct ServoNodeData;
+template <class E>
+class nsTArray;
+template <class T>
+class nsGetterAddRefs;
 
 namespace mozilla {
 class DeclarationBlock;
+class ErrorResult;
+class OOMReporter;
+class SMILAttr;
 struct MutationClosureData;
 class TextEditor;
 namespace css {
 struct URLValue;
 }  // namespace css
 namespace dom {
+struct CustomElementData;
 struct GetAnimationsOptions;
 struct ScrollIntoViewOptions;
 struct ScrollToOptions;
 struct FocusOptions;
 struct ShadowRootInit;
 struct ScrollOptions;
+class Attr;
 class BooleanOrScrollIntoViewOptions;
+class Document;
 class DOMIntersectionObserver;
 class DOMMatrixReadOnly;
 class Element;
 class ElementOrCSSPseudoElement;
+class Promise;
+class ShadowRoot;
 class UnrestrictedDoubleOrKeyframeAnimationOptions;
+template <typename T>
+class Optional;
 enum class CallerType : uint32_t;
+enum class ReferrerPolicy : uint8_t;
 typedef nsDataHashtable<nsRefPtrHashKey<DOMIntersectionObserver>, int32_t>
     IntersectionObserverList;
 }  // namespace dom
@@ -245,8 +294,9 @@
   /**
    * Make focus on this element.
    */
-  virtual void Focus(const FocusOptions& aOptions, const CallerType aCallerType,
-                     ErrorResult& aError);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual void Focus(const FocusOptions& aOptions,
+                                                 const CallerType aCallerType,
+                                                 ErrorResult& aError);
 
   /**
    * Show blur and clear focus.
@@ -354,9 +404,7 @@
    * attribute on this element.
    */
   virtual UniquePtr<SMILAttr> GetAnimatedAttr(int32_t aNamespaceID,
-                                              nsAtom* aName) {
-    return nullptr;
-  }
+                                              nsAtom* aName);
 
   /**
    * Get the SMIL override style for this element. This is a style declaration
@@ -1087,14 +1135,7 @@
   nsDOMTokenList* ClassList();
   nsDOMTokenList* Part();
 
-  nsDOMAttributeMap* Attributes() {
-    nsDOMSlots* slots = DOMSlots();
-    if (!slots->mAttributeMap) {
-      slots->mAttributeMap = new nsDOMAttributeMap(this);
-    }
-
-    return slots->mAttributeMap;
-  }
+  nsDOMAttributeMap* Attributes();
 
   void GetAttributeNames(nsTArray<nsString>& aResult);
 
@@ -1196,56 +1237,9 @@
   void InsertAdjacentText(const nsAString& aWhere, const nsAString& aData,
                           ErrorResult& aError);
 
-  void SetPointerCapture(int32_t aPointerId, ErrorResult& aError) {
-    if (nsContentUtils::ShouldResistFingerprinting(GetComposedDoc()) &&
-        aPointerId != PointerEventHandler::GetSpoofedPointerIdForRFP()) {
-      aError.ThrowNotFoundError("Invalid pointer id");
-      return;
-    }
-    const PointerInfo* pointerInfo =
-        PointerEventHandler::GetPointerInfo(aPointerId);
-    if (!pointerInfo) {
-      aError.ThrowNotFoundError("Invalid pointer id");
-      return;
-    }
-    if (!IsInComposedDoc()) {
-      aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-      return;
-    }
-    if (OwnerDoc()->GetPointerLockElement()) {
-      // Throw an exception 'InvalidStateError' while the page has a locked
-      // element.
-      aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-      return;
-    }
-    if (!pointerInfo->mActiveState ||
-        pointerInfo->mActiveDocument != OwnerDoc()) {
-      return;
-    }
-    PointerEventHandler::RequestPointerCaptureById(aPointerId, this);
-  }
-  void ReleasePointerCapture(int32_t aPointerId, ErrorResult& aError) {
-    if (nsContentUtils::ShouldResistFingerprinting(GetComposedDoc()) &&
-        aPointerId != PointerEventHandler::GetSpoofedPointerIdForRFP()) {
-      aError.ThrowNotFoundError("Invalid pointer id");
-      return;
-    }
-    if (!PointerEventHandler::GetPointerInfo(aPointerId)) {
-      aError.ThrowNotFoundError("Invalid pointer id");
-      return;
-    }
-    if (HasPointerCapture(aPointerId)) {
-      PointerEventHandler::ReleasePointerCaptureById(aPointerId);
-    }
-  }
-  bool HasPointerCapture(long aPointerId) {
-    PointerCaptureInfo* pointerCaptureInfo =
-        PointerEventHandler::GetPointerCaptureInfo(aPointerId);
-    if (pointerCaptureInfo && pointerCaptureInfo->mPendingElement == this) {
-      return true;
-    }
-    return false;
-  }
+  void SetPointerCapture(int32_t aPointerId, ErrorResult& aError);
+  void ReleasePointerCapture(int32_t aPointerId, ErrorResult& aError);
+  bool HasPointerCapture(long aPointerId);
   void SetCapture(bool aRetargetToElement);
 
   void SetCaptureAlways(bool aRetargetToElement);
diff -Nru firefox-84.0.2+build1/dom/base/EventSource.cpp firefox-85.0+build1/dom/base/EventSource.cpp
--- firefox-84.0.2+build1/dom/base/EventSource.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/EventSource.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -20,10 +20,12 @@
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/dom/EventSourceEventService.h"
 #include "mozilla/UniquePtrExtensions.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIThreadRetargetableStreamListener.h"
 #include "nsNetUtil.h"
 #include "nsIAuthPrompt.h"
 #include "nsIAuthPrompt2.h"
+#include "nsIHttpChannel.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsMimeTypes.h"
diff -Nru firefox-84.0.2+build1/dom/base/FormData.h firefox-85.0+build1/dom/base/FormData.h
--- firefox-84.0.2+build1/dom/base/FormData.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/FormData.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_FormData_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLFormSubmission.h"
 #include "mozilla/dom/File.h"
@@ -17,6 +16,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class HTMLFormElement;
diff -Nru firefox-84.0.2+build1/dom/base/FragmentOrElement.cpp firefox-85.0+build1/dom/base/FragmentOrElement.cpp
--- firefox-84.0.2+build1/dom/base/FragmentOrElement.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/FragmentOrElement.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -34,8 +34,10 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/TouchEvent.h"
+#include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
+#include "nsIControllers.h"
 #include "nsIDocumentEncoder.h"
 #include "nsFocusManager.h"
 #include "nsIScriptGlobalObject.h"
diff -Nru firefox-84.0.2+build1/dom/base/FuzzingFunctions.cpp firefox-85.0+build1/dom/base/FuzzingFunctions.cpp
--- firefox-84.0.2+build1/dom/base/FuzzingFunctions.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/FuzzingFunctions.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -28,10 +28,22 @@
 }
 
 /* static */
+void FuzzingFunctions::GarbageCollectCompacting(const GlobalObject&) {
+  nsJSContext::GarbageCollectNow(JS::GCReason::COMPONENT_UTILS,
+                                 nsJSContext::NonIncrementalGC,
+                                 nsJSContext::ShrinkingGC);
+}
+
+/* static */
 void FuzzingFunctions::CycleCollect(const GlobalObject&) {
   nsJSContext::CycleCollectNow();
 }
 
+void FuzzingFunctions::MemoryPressure(const GlobalObject&) {
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
+  os->NotifyObservers(nullptr, "memory-pressure", u"heap-minimize");
+}
+
 /* static */
 void FuzzingFunctions::EnableAccessibility(const GlobalObject&,
                                            ErrorResult& aRv) {
diff -Nru firefox-84.0.2+build1/dom/base/FuzzingFunctions.h firefox-85.0+build1/dom/base/FuzzingFunctions.h
--- firefox-84.0.2+build1/dom/base/FuzzingFunctions.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/FuzzingFunctions.h	2021-01-18 19:58:09.000000000 +0000
@@ -25,8 +25,12 @@
  public:
   static void GarbageCollect(const GlobalObject&);
 
+  static void GarbageCollectCompacting(const GlobalObject&);
+
   static void CycleCollect(const GlobalObject&);
 
+  static void MemoryPressure(const GlobalObject&);
+
   static void EnableAccessibility(const GlobalObject&, ErrorResult& aRv);
 
   static void SynthesizeKeyboardEvents(const GlobalObject& aGlobalObject,
diff -Nru firefox-84.0.2+build1/dom/base/IdleDeadline.cpp firefox-85.0+build1/dom/base/IdleDeadline.cpp
--- firefox-84.0.2+build1/dom/base/IdleDeadline.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/IdleDeadline.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,9 +4,11 @@
  * 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/IdleDeadline.h"
+
 #include <algorithm>
 
-#include "mozilla/dom/IdleDeadline.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/IdleDeadlineBinding.h"
 #include "mozilla/dom/Performance.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/dom/base/IdleDeadline.h firefox-85.0+build1/dom/base/IdleDeadline.h
--- firefox-84.0.2+build1/dom/base/IdleDeadline.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/IdleDeadline.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/dom/base/IDTracker.cpp firefox-85.0+build1/dom/base/IDTracker.cpp
--- firefox-84.0.2+build1/dom/base/IDTracker.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/IDTracker.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,7 +7,9 @@
 #include "IDTracker.h"
 
 #include "mozilla/Encoding.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentOrShadowRoot.h"
+#include "mozilla/dom/ShadowRoot.h"
 #include "nsAtom.h"
 #include "nsContentUtils.h"
 #include "nsIURI.h"
@@ -49,6 +51,10 @@
   return aContent.OwnerDoc();
 }
 
+IDTracker::IDTracker() = default;
+
+IDTracker::~IDTracker() { Unlink(); }
+
 void IDTracker::ResetToURIFragmentID(nsIContent* aFromContent, nsIURI* aURI,
                                      nsIReferrerInfo* aReferrerInfo,
                                      bool aWatch, bool aReferenceImage) {
@@ -182,6 +188,8 @@
   mReferencingImage = false;
 }
 
+void IDTracker::ElementChanged(Element* aFrom, Element* aTo) { mElement = aTo; }
+
 bool IDTracker::Observe(Element* aOldElement, Element* aNewElement,
                         void* aData) {
   IDTracker* p = static_cast<IDTracker*>(aData);
@@ -202,6 +210,23 @@
   return keepTracking;
 }
 
+IDTracker::ChangeNotification::ChangeNotification(IDTracker* aTarget,
+                                                  Element* aFrom, Element* aTo)
+    : mozilla::Runnable("IDTracker::ChangeNotification"),
+      Notification(aTarget),
+      mFrom(aFrom),
+      mTo(aTo) {}
+
+IDTracker::ChangeNotification::~ChangeNotification() = default;
+
+void IDTracker::ChangeNotification::SetTo(Element* aTo) { mTo = aTo; }
+
+void IDTracker::ChangeNotification::Clear() {
+  Notification::Clear();
+  mFrom = nullptr;
+  mTo = nullptr;
+}
+
 NS_IMPL_ISUPPORTS_INHERITED0(IDTracker::ChangeNotification, mozilla::Runnable)
 NS_IMPL_ISUPPORTS(IDTracker::DocumentLoadNotification, nsIObserver)
 
@@ -223,4 +248,16 @@
   return NS_OK;
 }
 
+DocumentOrShadowRoot* IDTracker::GetWatchDocOrShadowRoot() const {
+  if (!mWatchDocumentOrShadowRoot) {
+    return nullptr;
+  }
+  MOZ_ASSERT(mWatchDocumentOrShadowRoot->IsDocument() ||
+             mWatchDocumentOrShadowRoot->IsShadowRoot());
+  if (ShadowRoot* shadow = ShadowRoot::FromNode(*mWatchDocumentOrShadowRoot)) {
+    return shadow;
+  }
+  return mWatchDocumentOrShadowRoot->AsDocument();
+}
+
 }  // namespace mozilla::dom
diff -Nru firefox-84.0.2+build1/dom/base/IDTracker.h firefox-85.0+build1/dom/base/IDTracker.h
--- firefox-84.0.2+build1/dom/base/IDTracker.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/IDTracker.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,19 +8,22 @@
 #define mozilla_dom_IDTracker_h_
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/ShadowRoot.h"
-#include "nsAtom.h"
-#include "mozilla/dom/Document.h"
+#include "nsIObserver.h"
 #include "nsThreadUtils.h"
-#include "plstr.h"
 
+class nsAtom;
+class nsIContent;
+class nsINode;
 class nsIURI;
 class nsIReferrerInfo;
 
 namespace mozilla {
 namespace dom {
 
+class Document;
+class DocumentOrShadowRoot;
+class Element;
+
 /**
  * Class to track what element is referenced by a given ID.
  *
@@ -42,9 +45,9 @@
  public:
   typedef mozilla::dom::Element Element;
 
-  IDTracker() = default;
+  IDTracker();
 
-  ~IDTracker() { Unlink(); }
+  ~IDTracker();
 
   /**
    * Find which element, if any, is referenced.
@@ -93,7 +96,7 @@
    * to call this superclass method to change mElement. This is called
    * at script-runnable time.
    */
-  virtual void ElementChanged(Element* aFrom, Element* aTo) { mElement = aTo; }
+  virtual void ElementChanged(Element* aFrom, Element* aTo);
 
   /**
    * Override this to convert from a single-shot notification to
@@ -126,11 +129,7 @@
 
   class ChangeNotification : public mozilla::Runnable, public Notification {
    public:
-    ChangeNotification(IDTracker* aTarget, Element* aFrom, Element* aTo)
-        : mozilla::Runnable("IDTracker::ChangeNotification"),
-          Notification(aTarget),
-          mFrom(aFrom),
-          mTo(aTo) {}
+    ChangeNotification(IDTracker* aTarget, Element* aFrom, Element* aTo);
 
     // We need to actually declare all of nsISupports, because
     // Notification inherits from it but doesn't declare it.
@@ -142,15 +141,11 @@
       }
       return NS_OK;
     }
-    virtual void SetTo(Element* aTo) override { mTo = aTo; }
-    virtual void Clear() override {
-      Notification::Clear();
-      mFrom = nullptr;
-      mTo = nullptr;
-    }
+    void SetTo(Element* aTo) override;
+    void Clear() override;
 
    protected:
-    virtual ~ChangeNotification() = default;
+    virtual ~ChangeNotification();
 
     RefPtr<Element> mFrom;
     RefPtr<Element> mTo;
@@ -177,18 +172,7 @@
   };
   friend class DocumentLoadNotification;
 
-  DocumentOrShadowRoot* GetWatchDocOrShadowRoot() const {
-    if (!mWatchDocumentOrShadowRoot) {
-      return nullptr;
-    }
-    MOZ_ASSERT(mWatchDocumentOrShadowRoot->IsDocument() ||
-               mWatchDocumentOrShadowRoot->IsShadowRoot());
-    if (ShadowRoot* shadow =
-            ShadowRoot::FromNode(*mWatchDocumentOrShadowRoot)) {
-      return shadow;
-    }
-    return mWatchDocumentOrShadowRoot->AsDocument();
-  }
+  DocumentOrShadowRoot* GetWatchDocOrShadowRoot() const;
 
   RefPtr<nsAtom> mWatchID;
   nsCOMPtr<nsINode>
diff -Nru firefox-84.0.2+build1/dom/base/ImageEncoder.cpp firefox-85.0+build1/dom/base/ImageEncoder.cpp
--- firefox-84.0.2+build1/dom/base/ImageEncoder.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ImageEncoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/Unused.h"
 #include "gfxUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsXPCOMCIDInternal.h"
@@ -74,13 +75,13 @@
   return helper->GetDataSurfaceSafe();
 }
 
-class EncodingCompleteEvent : public CancelableRunnable {
+class EncodingCompleteEvent : public Runnable {
   virtual ~EncodingCompleteEvent() = default;
 
  public:
   explicit EncodingCompleteEvent(
       EncodeCompleteCallback* aEncodeCompleteCallback)
-      : CancelableRunnable("EncodingCompleteEvent"),
+      : Runnable("EncodingCompleteEvent"),
         mImgSize(0),
         mType(),
         mImgData(nullptr),
diff -Nru firefox-84.0.2+build1/dom/base/InProcessBrowserChildMessageManager.cpp firefox-85.0+build1/dom/base/InProcessBrowserChildMessageManager.cpp
--- firefox-84.0.2+build1/dom/base/InProcessBrowserChildMessageManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/InProcessBrowserChildMessageManager.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -16,11 +16,13 @@
 #include "nsIMozBrowserFrame.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/ChromeMessageSender.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MessageManagerBinding.h"
 #include "mozilla/dom/SameProcessMessageQueue.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "mozilla/dom/JSActorService.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/InProcessBrowserChildMessageManager.h firefox-85.0+build1/dom/base/InProcessBrowserChildMessageManager.h
--- firefox-84.0.2+build1/dom/base/InProcessBrowserChildMessageManager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/InProcessBrowserChildMessageManager.h	2021-01-18 19:58:08.000000000 +0000
@@ -11,8 +11,8 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/ContentFrameMessageManager.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "nsCOMPtr.h"
-#include "nsFrameMessageManager.h"
 #include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptContext.h"
@@ -20,6 +20,8 @@
 #include "nsCOMArray.h"
 #include "nsWeakReference.h"
 
+class nsFrameMessageManager;
+
 namespace mozilla {
 class EventChainPreVisitor;
 
diff -Nru firefox-84.0.2+build1/dom/base/JSExecutionContext.cpp firefox-85.0+build1/dom/base/JSExecutionContext.cpp
--- firefox-84.0.2+build1/dom/base/JSExecutionContext.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/JSExecutionContext.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,336 @@
+/* -*- 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/. */
+
+/**
+ * This is not a generated file. It contains common utility functions
+ * invoked from the JavaScript code generated from IDL interfaces.
+ * The goal of the utility functions is to cut down on the size of
+ * the generated code itself.
+ */
+
+#include "mozilla/dom/JSExecutionContext.h"
+
+#include <utility>
+#include "MainThreadUtils.h"
+#include "js/CompilationAndEvaluation.h"
+#include "js/CompileOptions.h"
+#include "js/Conversions.h"
+#include "js/HeapAPI.h"
+#include "js/OffThreadScriptCompilation.h"
+#include "js/ProfilingCategory.h"
+#include "js/Promise.h"
+#include "js/SourceText.h"
+#include "js/Transcoding.h"
+#include "js/Value.h"
+#include "js/Wrapper.h"
+#include "jsapi.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/Likely.h"
+#include "nsContentUtils.h"
+#include "nsTPromiseFlatString.h"
+#include "xpcpublic.h"
+
+#if !defined(DEBUG) && !defined(MOZ_ENABLE_JS_DUMP)
+#  include "mozilla/StaticPrefs_browser.h"
+#endif
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+static nsresult EvaluationExceptionToNSResult(JSContext* aCx) {
+  if (JS_IsExceptionPending(aCx)) {
+    return NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW;
+  }
+  return NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE;
+}
+
+JSExecutionContext::JSExecutionContext(JSContext* aCx,
+                                       JS::Handle<JSObject*> aGlobal)
+    :
+#ifdef MOZ_GECKO_PROFILER
+      mAutoProfilerLabel("JSExecutionContext",
+                         /* dynamicStr */ nullptr,
+                         JS::ProfilingCategoryPair::JS),
+#endif
+      mCx(aCx),
+      mRealm(aCx, aGlobal),
+      mRetValue(aCx),
+      mScopeChain(aCx),
+      mScript(aCx),
+      mRv(NS_OK),
+      mSkip(false),
+      mCoerceToString(false),
+      mEncodeBytecode(false)
+#ifdef DEBUG
+      ,
+      mWantsReturnValue(false),
+      mExpectScopeChain(false),
+      mScriptUsed(false)
+#endif
+{
+  MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(CycleCollectedJSContext::Get() &&
+             CycleCollectedJSContext::Get()->MicroTaskLevel());
+  MOZ_ASSERT(mRetValue.isUndefined());
+
+  MOZ_ASSERT(JS_IsGlobalObject(aGlobal));
+  if (MOZ_UNLIKELY(!xpc::Scriptability::Get(aGlobal).Allowed())) {
+    mSkip = true;
+    mRv = NS_OK;
+  }
+}
+
+void JSExecutionContext::SetScopeChain(
+    JS::HandleVector<JSObject*> aScopeChain) {
+  if (mSkip) {
+    return;
+  }
+
+#ifdef DEBUG
+  mExpectScopeChain = true;
+#endif
+  // Now make sure to wrap the scope chain into the right compartment.
+  if (!mScopeChain.reserve(aScopeChain.length())) {
+    mSkip = true;
+    mRv = NS_ERROR_OUT_OF_MEMORY;
+    return;
+  }
+
+  for (size_t i = 0; i < aScopeChain.length(); ++i) {
+    JS::ExposeObjectToActiveJS(aScopeChain[i]);
+    mScopeChain.infallibleAppend(aScopeChain[i]);
+    if (!JS_WrapObject(mCx, mScopeChain[i])) {
+      mSkip = true;
+      mRv = NS_ERROR_OUT_OF_MEMORY;
+      return;
+    }
+  }
+}
+
+nsresult JSExecutionContext::JoinCompile(JS::OffThreadToken** aOffThreadToken) {
+  if (mSkip) {
+    return mRv;
+  }
+
+  MOZ_ASSERT(!mWantsReturnValue);
+  MOZ_ASSERT(!mExpectScopeChain);
+  MOZ_ASSERT(!mScript);
+
+  if (mEncodeBytecode) {
+    mScript.set(JS::FinishOffThreadScriptAndStartIncrementalEncoding(
+        mCx, *aOffThreadToken));
+  } else {
+    mScript.set(JS::FinishOffThreadScript(mCx, *aOffThreadToken));
+  }
+  *aOffThreadToken = nullptr;  // Mark the token as having been finished.
+  if (!mScript) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+  return NS_OK;
+}
+
+template <typename Unit>
+nsresult JSExecutionContext::InternalCompile(
+    JS::CompileOptions& aCompileOptions, JS::SourceText<Unit>& aSrcBuf) {
+  if (mSkip) {
+    return mRv;
+  }
+
+  MOZ_ASSERT(aSrcBuf.get());
+  MOZ_ASSERT(mRetValue.isUndefined());
+#ifdef DEBUG
+  mWantsReturnValue = !aCompileOptions.noScriptRval;
+#endif
+
+  MOZ_ASSERT(!mScript);
+
+  if (mScopeChain.length() != 0) {
+    aCompileOptions.setNonSyntacticScope(true);
+  }
+
+  if (mEncodeBytecode) {
+    mScript =
+        JS::CompileAndStartIncrementalEncoding(mCx, aCompileOptions, aSrcBuf);
+  } else {
+    mScript = JS::Compile(mCx, aCompileOptions, aSrcBuf);
+  }
+
+  if (!mScript) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+  return NS_OK;
+}
+
+nsresult JSExecutionContext::Compile(JS::CompileOptions& aCompileOptions,
+                                     JS::SourceText<char16_t>& aSrcBuf) {
+  return InternalCompile(aCompileOptions, aSrcBuf);
+}
+
+nsresult JSExecutionContext::Compile(JS::CompileOptions& aCompileOptions,
+                                     JS::SourceText<Utf8Unit>& aSrcBuf) {
+  return InternalCompile(aCompileOptions, aSrcBuf);
+}
+
+nsresult JSExecutionContext::Compile(JS::CompileOptions& aCompileOptions,
+                                     const nsAString& aScript) {
+  if (mSkip) {
+    return mRv;
+  }
+
+  const nsPromiseFlatString& flatScript = PromiseFlatString(aScript);
+  JS::SourceText<char16_t> srcBuf;
+  if (!srcBuf.init(mCx, flatScript.get(), flatScript.Length(),
+                   JS::SourceOwnership::Borrowed)) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+  return Compile(aCompileOptions, srcBuf);
+}
+
+nsresult JSExecutionContext::Decode(JS::CompileOptions& aCompileOptions,
+                                    mozilla::Vector<uint8_t>& aBytecodeBuf,
+                                    size_t aBytecodeIndex) {
+  if (mSkip) {
+    return mRv;
+  }
+
+  MOZ_ASSERT(!mWantsReturnValue);
+  JS::TranscodeResult tr = JS::DecodeScriptMaybeStencil(
+      mCx, aCompileOptions, aBytecodeBuf, &mScript, aBytecodeIndex);
+  // These errors are external parameters which should be handled before the
+  // decoding phase, and which are the only reasons why you might want to
+  // fallback on decoding failures.
+  MOZ_ASSERT(tr != JS::TranscodeResult_Failure_BadBuildId &&
+             tr != JS::TranscodeResult_Failure_WrongCompileOption);
+  if (tr != JS::TranscodeResult_Ok) {
+    mSkip = true;
+    mRv = NS_ERROR_DOM_JS_DECODING_ERROR;
+    return mRv;
+  }
+
+  return mRv;
+}
+
+nsresult JSExecutionContext::JoinDecode(JS::OffThreadToken** aOffThreadToken) {
+  if (mSkip) {
+    return mRv;
+  }
+
+  MOZ_ASSERT(!mWantsReturnValue);
+  MOZ_ASSERT(!mExpectScopeChain);
+  mScript.set(JS::FinishOffThreadScriptDecoder(mCx, *aOffThreadToken));
+  *aOffThreadToken = nullptr;  // Mark the token as having been finished.
+  if (!mScript) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+  return NS_OK;
+}
+
+nsresult JSExecutionContext::JoinDecodeBinAST(
+    JS::OffThreadToken** aOffThreadToken) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult JSExecutionContext::DecodeBinAST(JS::CompileOptions& aCompileOptions,
+                                          const uint8_t* aBuf, size_t aLength) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+JSScript* JSExecutionContext::GetScript() {
+#ifdef DEBUG
+  MOZ_ASSERT(!mSkip);
+  MOZ_ASSERT(mScript);
+  mScriptUsed = true;
+#endif
+
+  return MaybeGetScript();
+}
+
+JSScript* JSExecutionContext::MaybeGetScript() { return mScript; }
+
+nsresult JSExecutionContext::ExecScript() {
+  if (mSkip) {
+    return mRv;
+  }
+
+  MOZ_ASSERT(mScript);
+
+  if (!JS_ExecuteScript(mCx, mScopeChain, mScript)) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+  return NS_OK;
+}
+
+static bool IsPromiseValue(JSContext* aCx, JS::Handle<JS::Value> aValue) {
+  if (!aValue.isObject()) {
+    return false;
+  }
+
+  // We only care about Promise here, so CheckedUnwrapStatic is fine.
+  JS::Rooted<JSObject*> obj(aCx, js::CheckedUnwrapStatic(&aValue.toObject()));
+  if (!obj) {
+    return false;
+  }
+
+  return JS::IsPromiseObject(obj);
+}
+
+nsresult JSExecutionContext::ExecScript(
+    JS::MutableHandle<JS::Value> aRetValue) {
+  if (mSkip) {
+    aRetValue.setUndefined();
+    return mRv;
+  }
+
+  MOZ_ASSERT(mScript);
+  MOZ_ASSERT(mWantsReturnValue);
+
+  if (!JS_ExecuteScript(mCx, mScopeChain, mScript, aRetValue)) {
+    mSkip = true;
+    mRv = EvaluationExceptionToNSResult(mCx);
+    return mRv;
+  }
+
+#ifdef DEBUG
+  mWantsReturnValue = false;
+#endif
+  if (mCoerceToString && IsPromiseValue(mCx, aRetValue)) {
+    // We're a javascript: url and we should treat Promise return values as
+    // undefined.
+    //
+    // Once bug 1477821 is fixed this code might be able to go away, or will
+    // become enshrined in the spec, depending.
+    aRetValue.setUndefined();
+  }
+
+  if (mCoerceToString && !aRetValue.isUndefined()) {
+    JSString* str = JS::ToString(mCx, aRetValue);
+    if (!str) {
+      // ToString can be a function call, so an exception can be raised while
+      // executing the function.
+      mSkip = true;
+      return EvaluationExceptionToNSResult(mCx);
+    }
+    aRetValue.set(JS::StringValue(str));
+  }
+
+  return NS_OK;
+}
diff -Nru firefox-84.0.2+build1/dom/base/JSExecutionContext.h firefox-85.0+build1/dom/base/JSExecutionContext.h
--- firefox-84.0.2+build1/dom/base/JSExecutionContext.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/JSExecutionContext.h	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,171 @@
+/* -*- 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 DOM_BASE_JSEXECUTIONCONTEXT_H_
+#define DOM_BASE_JSEXECUTIONCONTEXT_H_
+
+#include "GeckoProfiler.h"
+#include "js/GCVector.h"
+#include "js/TypeDecls.h"
+#include "jsapi.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/Vector.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
+
+class nsIScriptContext;
+class nsIScriptElement;
+class nsIScriptGlobalObject;
+class nsXBLPrototypeBinding;
+
+namespace mozilla {
+union Utf8Unit;
+
+namespace dom {
+
+class MOZ_STACK_CLASS JSExecutionContext final {
+#ifdef MOZ_GECKO_PROFILER
+  // Register stack annotations for the Gecko profiler.
+  mozilla::AutoProfilerLabel mAutoProfilerLabel;
+#endif
+
+  JSContext* mCx;
+
+  // Handles switching to our global's realm.
+  JSAutoRealm mRealm;
+
+  // Set to a valid handle if a return value is expected.
+  JS::Rooted<JS::Value> mRetValue;
+
+  // Scope chain in which the execution takes place.
+  JS::RootedVector<JSObject*> mScopeChain;
+
+  // The compiled script.
+  JS::Rooted<JSScript*> mScript;
+
+  // returned value forwarded when we have to interupt the execution eagerly
+  // with mSkip.
+  nsresult mRv;
+
+  // Used to skip upcoming phases in case of a failure.  In such case the
+  // result is carried by mRv.
+  bool mSkip;
+
+  // Should the result be serialized before being returned.
+  bool mCoerceToString;
+
+  // Encode the bytecode before it is being executed.
+  bool mEncodeBytecode;
+
+#ifdef DEBUG
+  // Should we set the return value.
+  bool mWantsReturnValue;
+
+  bool mExpectScopeChain;
+
+  bool mScriptUsed;
+#endif
+
+ private:
+  // Compile a script contained in a SourceText.
+  template <typename Unit>
+  nsresult InternalCompile(JS::CompileOptions& aCompileOptions,
+                           JS::SourceText<Unit>& aSrcBuf);
+
+ public:
+  // Enter compartment in which the code would be executed.  The JSContext
+  // must come from an AutoEntryScript.
+  JSExecutionContext(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
+
+  JSExecutionContext(const JSExecutionContext&) = delete;
+  JSExecutionContext(JSExecutionContext&&) = delete;
+
+  ~JSExecutionContext() {
+    // This flag is reset when the returned value is extracted.
+    MOZ_ASSERT_IF(!mSkip, !mWantsReturnValue);
+
+    // If encoding was started we expect the script to have been
+    // used when ending the encoding.
+    MOZ_ASSERT_IF(mEncodeBytecode && mScript && mRv == NS_OK, mScriptUsed);
+  }
+
+  // The returned value would be converted to a string if the
+  // |aCoerceToString| is flag set.
+  JSExecutionContext& SetCoerceToString(bool aCoerceToString) {
+    mCoerceToString = aCoerceToString;
+    return *this;
+  }
+
+  // When set, this flag records and encodes the bytecode as soon as it is
+  // being compiled, and before it is being executed. The bytecode can then be
+  // requested by using |JS::FinishIncrementalEncoding| with the mutable
+  // handle |aScript| argument of |CompileAndExec| or |JoinAndExec|.
+  JSExecutionContext& SetEncodeBytecode(bool aEncodeBytecode) {
+    mEncodeBytecode = aEncodeBytecode;
+    return *this;
+  }
+
+  // Set the scope chain in which the code should be executed.
+  void SetScopeChain(JS::HandleVector<JSObject*> aScopeChain);
+
+  // After getting a notification that an off-thread compilation terminated,
+  // this function will take the result of the parser and move it to the main
+  // thread.
+  MOZ_MUST_USE nsresult JoinCompile(JS::OffThreadToken** aOffThreadToken);
+
+  // Compile a script contained in a SourceText.
+  nsresult Compile(JS::CompileOptions& aCompileOptions,
+                   JS::SourceText<char16_t>& aSrcBuf);
+  nsresult Compile(JS::CompileOptions& aCompileOptions,
+                   JS::SourceText<mozilla::Utf8Unit>& aSrcBuf);
+
+  // Compile a script contained in a string.
+  nsresult Compile(JS::CompileOptions& aCompileOptions,
+                   const nsAString& aScript);
+
+  // Decode a script contained in a buffer.
+  nsresult Decode(JS::CompileOptions& aCompileOptions,
+                  mozilla::Vector<uint8_t>& aBytecodeBuf,
+                  size_t aBytecodeIndex);
+
+  // After getting a notification that an off-thread decoding terminated, this
+  // function will get the result of the decoder and move it to the main
+  // thread.
+  nsresult JoinDecode(JS::OffThreadToken** aOffThreadToken);
+
+  nsresult JoinDecodeBinAST(JS::OffThreadToken** aOffThreadToken);
+
+  // Decode a BinAST encoded script contained in a buffer.
+  nsresult DecodeBinAST(JS::CompileOptions& aCompileOptions,
+                        const uint8_t* aBuf, size_t aLength);
+
+  // Get a successfully compiled script.
+  JSScript* GetScript();
+
+  // Get the compiled script if present, or nullptr.
+  JSScript* MaybeGetScript();
+
+  // Execute the compiled script and ignore the return value.
+  MOZ_MUST_USE nsresult ExecScript();
+
+  // Execute the compiled script a get the return value.
+  //
+  // Copy the returned value into the mutable handle argument. In case of a
+  // evaluation failure either during the execution or the conversion of the
+  // result to a string, the nsresult is be set to the corresponding result
+  // code and the mutable handle argument remains unchanged.
+  //
+  // The value returned in the mutable handle argument is part of the
+  // compartment given as argument to the JSExecutionContext constructor. If the
+  // caller is in a different compartment, then the out-param value should be
+  // wrapped by calling |JS_WrapValue|.
+  MOZ_MUST_USE nsresult ExecScript(JS::MutableHandle<JS::Value> aRetValue);
+};
+}  // namespace dom
+}  // namespace mozilla
+
+#endif /* DOM_BASE_JSEXECUTIONCONTEXT_H_ */
diff -Nru firefox-84.0.2+build1/dom/base/LinkStyle.cpp firefox-85.0+build1/dom/base/LinkStyle.cpp
--- firefox-84.0.2+build1/dom/base/LinkStyle.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/LinkStyle.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/dom/SRILogHelper.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Document.h"
 #include "nsUnicharUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/LocationBase.h firefox-85.0+build1/dom/base/LocationBase.h
--- firefox-84.0.2+build1/dom/base/LocationBase.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/LocationBase.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_LocationBase_h
 #define mozilla_dom_LocationBase_h
 
-#include "mozilla/ErrorResult.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "nsStringFwd.h"
 
 class nsIDocShell;
@@ -16,6 +16,8 @@
 class nsDocShellLoadState;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class BrowsingContext;
 
diff -Nru firefox-84.0.2+build1/dom/base/Location.cpp firefox-85.0+build1/dom/base/Location.cpp
--- firefox-84.0.2+build1/dom/base/Location.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Location.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -27,6 +27,8 @@
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Components.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/ServoStyleConsts.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
diff -Nru firefox-84.0.2+build1/dom/base/Location.h firefox-85.0+build1/dom/base/Location.h
--- firefox-84.0.2+build1/dom/base/Location.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Location.h	2021-01-18 19:58:08.000000000 +0000
@@ -12,14 +12,13 @@
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/LocationBase.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIWeakReferenceUtils.h"
-#include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsWrapperCache.h"
 
 class nsIDocShell;
+class nsIPrincipal;
 class nsIURI;
-class nsDocShellLoadState;
+class nsPIDOMWindowInner;
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/base/MessageManagerCallback.h firefox-85.0+build1/dom/base/MessageManagerCallback.h
--- firefox-84.0.2+build1/dom/base/MessageManagerCallback.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/MessageManagerCallback.h	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,69 @@
+/* -*- 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 dom_base_MessageManagerCallback_h__
+#define dom_base_MessageManagerCallback_h__
+
+#include "nsStringFwd.h"
+#include "nsTArrayForwardDeclare.h"
+
+namespace mozilla {
+namespace dom {
+
+class ProcessMessageManager;
+
+namespace ipc {
+
+class StructuredCloneData;
+
+class MessageManagerCallback {
+ public:
+  virtual ~MessageManagerCallback() = default;
+
+  virtual bool DoLoadMessageManagerScript(const nsAString& aURL,
+                                          bool aRunInGlobalScope) {
+    return true;
+  }
+
+  virtual bool DoSendBlockingMessage(const nsAString& aMessage,
+                                     StructuredCloneData& aData,
+                                     nsTArray<StructuredCloneData>* aRetVal) {
+    return true;
+  }
+
+  virtual nsresult DoSendAsyncMessage(const nsAString& aMessage,
+                                      StructuredCloneData& aData) {
+    return NS_OK;
+  }
+
+  virtual mozilla::dom::ProcessMessageManager* GetProcessMessageManager()
+      const {
+    return nullptr;
+  }
+
+  virtual void DoGetRemoteType(nsACString& aRemoteType,
+                               ErrorResult& aError) const;
+
+ protected:
+  bool BuildClonedMessageDataForParent(ContentParent* aParent,
+                                       StructuredCloneData& aData,
+                                       ClonedMessageData& aClonedData);
+  bool BuildClonedMessageDataForChild(ContentChild* aChild,
+                                      StructuredCloneData& aData,
+                                      ClonedMessageData& aClonedData);
+};
+
+void UnpackClonedMessageDataForParent(const ClonedMessageData& aClonedData,
+                                      StructuredCloneData& aData);
+
+void UnpackClonedMessageDataForChild(const ClonedMessageData& aClonedData,
+                                     StructuredCloneData& aData);
+
+}  // namespace ipc
+}  // namespace dom
+}  // namespace mozilla
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/base/moz.build firefox-85.0+build1/dom/base/moz.build
--- firefox-84.0.2+build1/dom/base/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/moz.build	2021-01-18 19:58:09.000000000 +0000
@@ -15,7 +15,6 @@
 XPIDL_SOURCES += [
     "mozIDOMWindow.idl",
     "nsIContentPolicy.idl",
-    "nsIDocumentEncoder.idl",
     "nsIDOMRequestService.idl",
     "nsIDroppedLinkHandler.idl",
     "nsIEventSourceEventService.idl",
@@ -75,7 +74,6 @@
     "nsIAnimationObserver.h",
     "nsIContent.h",
     "nsIContentInlines.h",
-    "nsIContentSerializer.h",
     "nsIDocumentObserver.h",
     "nsIGlobalObject.h",
     "nsImageLoadingContent.h",
@@ -142,6 +140,7 @@
     "AnonymousContent.h",
     "Attr.h",
     "AutoPrintEventDispatcher.h",
+    "AutoSuppressEventHandlingAndSuspend.h",
     "BarProps.h",
     "BindContext.h",
     "BodyConsumer.h",
@@ -195,6 +194,7 @@
     "ImageEncoder.h",
     "ImageTracker.h",
     "IntlUtils.h",
+    "JSExecutionContext.h",
     "Link.h",
     "LinkStyle.h",
     "Location.h",
@@ -202,6 +202,7 @@
     "MaybeCrossOriginObject.h",
     "MessageBroadcaster.h",
     "MessageListenerManager.h",
+    "MessageManagerCallback.h",
     "MessageManagerGlobal.h",
     "MessageSender.h",
     "MimeType.h",
@@ -217,6 +218,7 @@
     "PlacesBookmarkAddition.h",
     "PlacesBookmarkRemoved.h",
     "PlacesEvent.h",
+    "PlacesFavicon.h",
     "PlacesObservers.h",
     "PlacesVisit.h",
     "PlacesWeakCallbackWrapper.h",
@@ -317,6 +319,7 @@
     "ImageTracker.cpp",
     "InProcessBrowserChildMessageManager.cpp",
     "IntlUtils.cpp",
+    "JSExecutionContext.cpp",
     "Link.cpp",
     "LinkStyle.cpp",
     "Location.cpp",
@@ -344,19 +347,16 @@
     "nsContentTypeParser.cpp",
     "nsCopySupport.cpp",
     "nsDataDocumentContentPolicy.cpp",
-    "nsDocumentEncoder.cpp",
     "nsDOMAttributeMap.cpp",
     "nsDOMCaretPosition.cpp",
     "nsDOMMutationObserver.cpp",
     "nsDOMNavigationTiming.cpp",
-    "nsDOMSerializer.cpp",
     "nsDOMTokenList.cpp",
     "nsFocusManager.cpp",
     "nsFrameLoader.cpp",
     "nsFrameLoaderOwner.cpp",
     "nsGlobalWindowCommands.cpp",
     "nsHistory.cpp",
-    "nsHTMLContentSerializer.cpp",
     "nsIGlobalObject.cpp",
     "nsINode.cpp",
     "nsJSEnvironment.cpp",
@@ -369,7 +369,6 @@
     "nsNoDataProtocolContentPolicy.cpp",
     "nsNodeInfoManager.cpp",
     "nsOpenURIInFrameParams.cpp",
-    "nsPlainTextSerializer.cpp",
     "nsPropertyTable.cpp",
     "nsQueryContentEventResult.cpp",
     "nsRange.cpp",
@@ -388,8 +387,6 @@
     "nsWindowMemoryReporter.cpp",
     "nsWindowRoot.cpp",
     "nsWrapperCache.cpp",
-    "nsXHTMLContentSerializer.cpp",
-    "nsXMLContentSerializer.cpp",
     "ParentProcessMessageManager.cpp",
     "PopupBlocker.cpp",
     "Pose.cpp",
diff -Nru firefox-84.0.2+build1/dom/base/MozQueryInterface.cpp firefox-85.0+build1/dom/base/MozQueryInterface.cpp
--- firefox-84.0.2+build1/dom/base/MozQueryInterface.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/MozQueryInterface.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "jsapi.h"
 
+#include "mozilla/ErrorResult.h"
 #include "xpcpublic.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/base/MozQueryInterface.h firefox-85.0+build1/dom/base/MozQueryInterface.h
--- firefox-84.0.2+build1/dom/base/MozQueryInterface.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/MozQueryInterface.h	2021-01-18 19:58:09.000000000 +0000
@@ -21,10 +21,11 @@
 
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/ErrorResult.h"
 #include "nsID.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MozQueryInterface final : public NonRefcountedDOMObject {
diff -Nru firefox-84.0.2+build1/dom/base/MutationObservers.h firefox-85.0+build1/dom/base/MutationObservers.h
--- firefox-84.0.2+build1/dom/base/MutationObservers.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/MutationObservers.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,16 +7,18 @@
 #ifndef DOM_BASE_MUTATIONOBSERVERS_H_
 #define DOM_BASE_MUTATIONOBSERVERS_H_
 
-#include "nsIContent.h"  // for use in inline function (ParentChainChanged)
-#include "nsIMutationObserver.h"  // for use in inline function (ParentChainChanged)
-#include "mozilla/dom/Document.h"
-#include "js/TypeDecls.h"
-#include "nsContentUtils.h"
+#include "nsIContent.h"  // for use in inline function (NotifyParentChainChanged)
+#include "nsIMutationObserver.h"  // for use in inline function (NotifyParentChainChanged)
+#include "nsINode.h"
+#include "nsTObserverArray.h"
+
+class nsAtom;
+class nsAttrValue;
 
-struct CharacterDataChangeInfo;
 namespace mozilla {
 namespace dom {
 class Animation;
+class Element;
 
 class MutationObservers {
  public:
diff -Nru firefox-84.0.2+build1/dom/base/Navigator.cpp firefox-85.0+build1/dom/base/Navigator.cpp
--- firefox-84.0.2+build1/dom/base/Navigator.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Navigator.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1275,40 +1275,45 @@
                                 CallerType aCallerType, ErrorResult& aRv) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  if (!mWindow || !mWindow->GetOuterWindow() ||
-      mWindow->GetOuterWindow()->GetCurrentInnerWindow() != mWindow) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
+  if (!mWindow || !mWindow->IsFullyActive()) {
+    aRv.ThrowInvalidStateError("The document is not fully active.");
     return;
   }
-
+  RefPtr<MediaManager::StreamPromise> sp;
+  if (!MediaManager::IsOn(aConstraints.mVideo) &&
+      !MediaManager::IsOn(aConstraints.mAudio)) {
+    sp = MediaManager::StreamPromise::CreateAndReject(
+        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
+                                  "audio and/or video is required"),
+        __func__);
+  } else {
+    sp = MediaManager::Get()->GetUserMedia(mWindow, aConstraints, aCallerType);
+  }
   RefPtr<NavigatorUserMediaSuccessCallback> onsuccess(&aOnSuccess);
   RefPtr<NavigatorUserMediaErrorCallback> onerror(&aOnError);
 
   nsWeakPtr weakWindow = nsWeakPtr(do_GetWeakReference(mWindow));
-
-  MediaManager::Get()
-      ->GetUserMedia(mWindow, aConstraints, aCallerType)
-      ->Then(
-          GetMainThreadSerialEventTarget(), __func__,
-          [weakWindow, onsuccess = std::move(onsuccess)](
-              const RefPtr<DOMMediaStream>& aStream) MOZ_CAN_RUN_SCRIPT {
-            nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(weakWindow);
-            if (!window || !window->GetOuterWindow() ||
-                window->GetOuterWindow()->GetCurrentInnerWindow() != window) {
-              return;  // Leave Promise pending after navigation by design.
-            }
-            MediaManager::CallOnSuccess(*onsuccess, *aStream);
-          },
-          [weakWindow, onerror = std::move(onerror)](
-              const RefPtr<MediaMgrError>& aError) MOZ_CAN_RUN_SCRIPT {
-            nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(weakWindow);
-            if (!window || !window->GetOuterWindow() ||
-                window->GetOuterWindow()->GetCurrentInnerWindow() != window) {
-              return;  // Leave Promise pending after navigation by design.
-            }
-            auto error = MakeRefPtr<MediaStreamError>(window, *aError);
-            MediaManager::CallOnError(*onerror, *error);
-          });
+  sp->Then(
+      GetMainThreadSerialEventTarget(), __func__,
+      [weakWindow, onsuccess = std::move(onsuccess)](
+          const RefPtr<DOMMediaStream>& aStream) MOZ_CAN_RUN_SCRIPT {
+        nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(weakWindow);
+        if (!window || !window->GetOuterWindow() ||
+            window->GetOuterWindow()->GetCurrentInnerWindow() != window) {
+          return;  // Leave Promise pending after navigation by design.
+        }
+        MediaManager::CallOnSuccess(*onsuccess, *aStream);
+      },
+      [weakWindow, onerror = std::move(onerror)](
+          const RefPtr<MediaMgrError>& aError) MOZ_CAN_RUN_SCRIPT {
+        nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(weakWindow);
+        if (!window || !window->GetOuterWindow() ||
+            window->GetOuterWindow()->GetCurrentInnerWindow() != window) {
+          return;  // Leave Promise pending after navigation by design.
+        }
+        auto error = MakeRefPtr<MediaStreamError>(window, *aError);
+        MediaManager::CallOnError(*onerror, *error);
+      });
 }
 
 void Navigator::MozGetUserMediaDevices(
diff -Nru firefox-84.0.2+build1/dom/base/Navigator.h firefox-85.0+build1/dom/base/Navigator.h
--- firefox-84.0.2+build1/dom/base/Navigator.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Navigator.h	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/Nullable.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "nsHashKeys.h"
 #include "nsInterfaceHashtable.h"
@@ -28,6 +27,8 @@
 class nsIURI;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class AddonManager;
 class BodyExtractorBase;
diff -Nru firefox-84.0.2+build1/dom/base/NodeIterator.cpp firefox-85.0+build1/dom/base/NodeIterator.cpp
--- firefox-84.0.2+build1/dom/base/NodeIterator.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/NodeIterator.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -187,7 +187,7 @@
 
 void NodeIterator::Detach() {
   if (mRoot) {
-    mRoot->OwnerDoc()->WarnOnceAbout(Document::eNodeIteratorDetach);
+    mRoot->OwnerDoc()->WarnOnceAbout(DeprecatedOperations::eNodeIteratorDetach);
   }
 }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsAttrValue.cpp firefox-85.0+build1/dom/base/nsAttrValue.cpp
--- firefox-84.0.2+build1/dom/base/nsAttrValue.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsAttrValue.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/ServoBindingTypes.h"
 #include "mozilla/ServoUtils.h"
 #include "mozilla/ShadowParts.h"
+#include "mozilla/SVGAttrValueWrapper.h"
 #include "mozilla/DeclarationBlock.h"
 #include "mozilla/dom/CSSRuleBinding.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsAttrValue.h firefox-85.0+build1/dom/base/nsAttrValue.h
--- firefox-84.0.2+build1/dom/base/nsAttrValue.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsAttrValue.h	2021-01-18 19:58:08.000000000 +0000
@@ -37,6 +37,10 @@
 namespace mozilla {
 class DeclarationBlock;
 class ShadowParts;
+
+namespace dom {
+class DOMString;
+}
 }  // namespace mozilla
 
 #define NS_ATTRVALUE_MAX_STRINGLENGTH_ATOM 12
diff -Nru firefox-84.0.2+build1/dom/base/nsAttrValueInlines.h firefox-85.0+build1/dom/base/nsAttrValueInlines.h
--- firefox-84.0.2+build1/dom/base/nsAttrValueInlines.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsAttrValueInlines.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ServoUtils.h"
+#include "mozilla/dom/DOMString.h"
 
 namespace mozilla {
 class ShadowParts;
diff -Nru firefox-84.0.2+build1/dom/base/nsContentList.h firefox-85.0+build1/dom/base/nsContentList.h
--- firefox-84.0.2+build1/dom/base/nsContentList.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsContentList.h	2021-01-18 19:58:09.000000000 +0000
@@ -30,6 +30,9 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/NameSpaceConstants.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file.
+#include "nsIContent.h"
+
 namespace mozilla {
 namespace dom {
 class Element;
@@ -49,10 +52,13 @@
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(nsBaseContentList)
 
   void AppendElement(nsIContent* aContent) {
+    MOZ_ASSERT(aContent);
     mElements.AppendElement(aContent);
   }
   void MaybeAppendElement(nsIContent* aContent) {
-    if (aContent) AppendElement(aContent);
+    if (aContent) {
+      AppendElement(aContent);
+    }
   }
 
   /**
diff -Nru firefox-84.0.2+build1/dom/base/nsContentPermissionHelper.cpp firefox-85.0+build1/dom/base/nsContentPermissionHelper.cpp
--- firefox-84.0.2+build1/dom/base/nsContentPermissionHelper.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsContentPermissionHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -653,9 +653,7 @@
   return NS_OK;
 }
 
-void nsContentPermissionRequestProxy::OnParentDestroyed() {
-  mParent = nullptr;
-}
+void nsContentPermissionRequestProxy::OnParentDestroyed() { mParent = nullptr; }
 
 NS_IMPL_ISUPPORTS(nsContentPermissionRequestProxy, nsIContentPermissionRequest)
 
@@ -796,8 +794,10 @@
 
 RemotePermissionRequest::RemotePermissionRequest(
     nsIContentPermissionRequest* aRequest, nsPIDOMWindowInner* aWindow)
-    : mRequest(aRequest), mWindow(aWindow), mIPCOpen(false), mDestroyed(false) {
-}
+    : mRequest(aRequest),
+      mWindow(aWindow),
+      mIPCOpen(false),
+      mDestroyed(false) {}
 
 RemotePermissionRequest::~RemotePermissionRequest() {
   MOZ_ASSERT(
diff -Nru firefox-84.0.2+build1/dom/base/nsContentUtils.cpp firefox-85.0+build1/dom/base/nsContentUtils.cpp
--- firefox-84.0.2+build1/dom/base/nsContentUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsContentUtils.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,186 +8,296 @@
 
 #include "nsContentUtils.h"
 
-#include <algorithm>
-#include <math.h>
+// nsNPAPIPluginInstance must be included before mozilla/dom/Document.h, which
+// is included in mozAutoDocUpdate.h.
+#include "nsNPAPIPluginInstance.h"
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <functional>
+#include <new>
+#include <utility>
+#include "BrowserChild.h"
 #include "DecoderTraits.h"
+#include "ErrorList.h"
+#include "ImageOps.h"
+#include "InProcessBrowserChildMessageManager.h"
+#include "Layers.h"
+#include "MainThreadUtils.h"
+#include "PLDHashTable.h"
+#include "ReferrerInfo.h"
+#include "ThirdPartyUtil.h"
+#include "Units.h"
+#include "chrome/common/ipc_message.h"
+#include "gfxDrawable.h"
 #include "harfbuzz/hb.h"
 #include "imgICache.h"
 #include "imgIContainer.h"
-#include "imgINotificationObserver.h"
+#include "imgILoader.h"
+#include "imgIRequest.h"
 #include "imgLoader.h"
-#include "imgRequestProxy.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
-#include "js/Array.h"  // JS::NewArrayObject
+#include "js/Array.h"
+#include "js/ArrayBuffer.h"
 #include "js/BuildId.h"
-#include "js/ArrayBuffer.h"  // JS::{GetArrayBufferData,IsArrayBufferObject,NewArrayBuffer}
+#include "js/GCAPI.h"
+#include "js/Id.h"
 #include "js/JSON.h"
-#include "js/RegExp.h"  // JS::ExecuteRegExpNoStatics, JS::NewUCRegExpObject, JS::RegExpFlags
+#include "js/PropertyDescriptor.h"
+#include "js/Realm.h"
+#include "js/RegExp.h"
+#include "js/RegExpFlags.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "js/Value.h"
-#include "Layers.h"
-#include "nsAppRunner.h"
-// nsNPAPIPluginInstance must be included before mozilla/dom/Document.h, which
-// is included in mozAutoDocUpdate.h.
-#include "nsNPAPIPluginInstance.h"
-#include "gfxDrawable.h"
-#include "ImageOps.h"
+#include "js/Wrapper.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
 #include "mozAutoDocUpdate.h"
-#include "mozilla/net/UrlClassifierCommon.h"
+#include "mozIDOMWindow.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/ArrayIterator.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/AtomArray.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/AutoTimelineMarker.h"
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/Base64.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/BloomFilter.h"
+#include "mozilla/CORSMode.h"
+#include "mozilla/CallState.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/Components.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/EventQueue.h"
+#include "mozilla/EventStateManager.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/HTMLEditor.h"
+#include "mozilla/HangAnnotations.h"
+#include "mozilla/IMEStateManager.h"
+#include "mozilla/InputEventOptions.h"
+#include "mozilla/InternalMutationEvent.h"
+#include "mozilla/Latin1.h"
+#include "mozilla/Likely.h"
 #include "mozilla/LoadInfo.h"
+#include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/ManualNAC.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/NullPrincipal.h"
+#include "mozilla/OriginAttributes.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/RangeBoundary.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
+#include "mozilla/ResultExtensions.h"
+#include "mozilla/ScrollbarPreferences.h"
+#include "mozilla/Services.h"
+#include "mozilla/Span.h"
+#include "mozilla/StaticAnalysisFunctions.h"
+#include "mozilla/StaticPrefs_dom.h"
+#ifdef FUZZING
+#  include "mozilla/StaticPrefs_fuzzing.h"
+#endif
+#include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StaticPrefs_test.h"
+#include "mozilla/StaticPrefs_ui.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/TextControlState.h"
+#include "mozilla/TextEditor.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/Unused.h"
+#include "mozilla/Variant.h"
+#include "mozilla/ViewportUtils.h"
 #include "mozilla/dom/AncestorIterator.h"
+#include "mozilla/dom/AutocompleteInfoBinding.h"
+#include "mozilla/dom/AutoSuppressEventHandlingAndSuspend.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
+#include "mozilla/dom/BorrowedAttrInfo.h"
+#include "mozilla/dom/BrowserBridgeParent.h"
+#include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
-#include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/CallbackFunction.h"
+#include "mozilla/dom/CallbackObject.h"
+#include "mozilla/dom/ChromeMessageBroadcaster.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/ContentFrameMessageManager.h"
+#include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/CustomElementRegistry.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/DocumentInlines.h"
-#include "mozilla/dom/MessageBroadcaster.h"
-#include "mozilla/dom/DocumentFragment.h"
+#include "mozilla/dom/CustomElementRegistryBinding.h"
+#include "mozilla/dom/DOMArena.h"
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/DOMExceptionBinding.h"
 #include "mozilla/dom/DOMSecurityMonitor.h"
 #include "mozilla/dom/DOMTypes.h"
+#include "mozilla/dom/DataTransfer.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/DocumentFragment.h"
+#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementBinding.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/FileSystemSecurity.h"
+#include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/FileBlobImpl.h"
+#include "mozilla/dom/FileSystemSecurity.h"
+#include "mozilla/dom/FilteredNodeIterator.h"
 #include "mozilla/dom/FontTableURIProtocolHandler.h"
+#include "mozilla/dom/FragmentOrElement.h"
+#include "mozilla/dom/FromParser.h"
+#include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/dom/HTMLInputElement.h"
-#include "mozilla/dom/HTMLSlotElement.h"
-#include "mozilla/dom/HTMLTemplateElement.h"
 #include "mozilla/dom/HTMLTextAreaElement.h"
-#include "mozilla/dom/IDTracker.h"
-#include "mozilla/dom/MouseEventBinding.h"
-#include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/dom/IPCBlob.h"
 #include "mozilla/dom/IPCBlobUtils.h"
+#include "mozilla/dom/MessageBroadcaster.h"
+#include "mozilla/dom/MessageListenerManager.h"
+#include "mozilla/dom/MouseEventBinding.h"
+#include "mozilla/dom/NameSpaceConstants.h"
 #include "mozilla/dom/NodeBinding.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/BrowserBridgeChild.h"
+#include "mozilla/dom/NodeInfo.h"
+#include "mozilla/dom/PBrowser.h"
+#include "mozilla/dom/PContentChild.h"
+#include "mozilla/dom/PrototypeList.h"
+#include "mozilla/dom/ReferrerPolicyBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/BrowserParent.h"
-#include "mozilla/dom/Text.h"
-#include "mozilla/dom/TouchEvent.h"
+#include "mozilla/dom/Selection.h"
 #include "mozilla/dom/ShadowRoot.h"
-#include "mozilla/dom/XULCommandEvent.h"
+#include "mozilla/dom/Text.h"
 #include "mozilla/dom/UserActivation.h"
+#include "mozilla/dom/WindowContext.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/extensions/WebExtensionPolicy.h"
-#include "mozilla/net/CookieJarSettings.h"
-#include "mozilla/EventDispatcher.h"
-#include "mozilla/EventListenerManager.h"
-#include "mozilla/EventStateManager.h"
+#include "mozilla/dom/XULCommandEvent.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/BaseMargin.h"
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/BaseSize.h"
 #include "mozilla/gfx/DataSurfaceHelpers.h"
-#include "mozilla/HTMLEditor.h"
-#include "mozilla/IMEStateManager.h"
-#include "mozilla/InputEventOptions.h"
-#include "mozilla/InternalMutationEvent.h"
-#include "mozilla/Likely.h"
-#include "mozilla/ManualNAC.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/ResultExtensions.h"
-#include "mozilla/dom/Selection.h"
-#include "mozilla/Services.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/StaticPrefs_full_screen_api.h"
-#ifdef FUZZING
-#  include "mozilla/StaticPrefs_fuzzing.h"
-#endif
-#include "mozilla/StaticPrefs_privacy.h"
-#include "mozilla/StaticPrefs_test.h"
-#include "mozilla/StaticPrefs_ui.h"
-#include "mozilla/StoragePrincipalHelper.h"
-#include "mozilla/TextControlState.h"
-#include "mozilla/TextEditor.h"
-#include "mozilla/TextEvents.h"
-#include "mozilla/ViewportUtils.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/Types.h"
+#include "mozilla/intl/LineBreaker.h"
+#include "mozilla/intl/WordBreaker.h"
+#include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ipc/SharedMemory.h"
+#include "mozilla/ipc/Shmem.h"
+#include "mozilla/net/UrlClassifierCommon.h"
+#include "mozilla/widget/IMEData.h"
+#include "nsAboutProtocolUtils.h"
+#include "nsAlgorithm.h"
 #include "nsArrayUtils.h"
-#include "nsAString.h"
+#include "nsAtom.h"
 #include "nsAttrName.h"
 #include "nsAttrValue.h"
 #include "nsAttrValueInlines.h"
-#include "nsCanvasFrame.h"
-#include "nsCaret.h"
+#include "nsBaseHashtable.h"
 #include "nsCCUncollectableMarker.h"
-#include "nsCharSeparatedTokenizer.h"
 #include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsCRTGlue.h"
+#include "nsCanvasFrame.h"
+#include "nsCaseTreatment.h"
+#include "nsCharSeparatedTokenizer.h"
+#include "nsCharTraits.h"
+#include "nsCompatibility.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContainerFrame.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentDLF.h"
 #include "nsContentList.h"
+#include "nsContentListDeclarations.h"
 #include "nsContentPolicyUtils.h"
-#include "nsContentSecurityManager.h"
-#include "nsCRT.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsCycleCollector.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsDOMMutationObserver.h"
+#include "nsDOMString.h"
 #include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsDocShell.h"
 #include "nsDocShellCID.h"
-#include "nsDOMCID.h"
-#include "mozilla/dom/DataTransfer.h"
-#include "nsDOMJSUtils.h"
-#include "nsDOMMutationObserver.h"
 #include "nsError.h"
 #include "nsFocusManager.h"
+#include "nsFrameList.h"
+#include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsGenericHTMLElement.h"
-#include "nsGenericHTMLFrameElement.h"
 #include "nsGkAtoms.h"
-#include "nsHtml5Module.h"
-#include "nsHtml5StringParser.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsHTMLDocument.h"
 #include "nsHTMLTags.h"
+#include "nsHashKeys.h"
+#include "nsHtml5StringParser.h"
+#include "nsIAboutModule.h"
 #include "nsIAnonymousContentCreator.h"
+#include "nsIArray.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIBidiKeyboard.h"
+#include "nsIBrowser.h"
 #include "nsICacheInfoChannel.h"
 #include "nsICategoryManager.h"
+#include "nsIChannel.h"
 #include "nsIChannelEventSink.h"
+#include "nsIClassifiedChannel.h"
 #include "nsIConsoleService.h"
 #include "nsIContent.h"
 #include "nsIContentInlines.h"
+#include "nsIContentPolicy.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIContentSink.h"
 #include "nsIContentViewer.h"
+#include "nsID.h"
+#include "nsIDOMWindowUtils.h"
 #include "nsIDocShell.h"
-#include "nsIDocShellTreeOwner.h"
-#include "mozilla/dom/Document.h"
+#include "nsIDocShellTreeItem.h"
 #include "nsIDocumentEncoder.h"
-#include "nsIDOMWindowUtils.h"
+#include "nsIDocumentLoaderFactory.h"
 #include "nsIDragService.h"
+#include "nsIDragSession.h"
+#include "nsIFile.h"
+#include "nsIFocusManager.h"
 #include "nsIFormControl.h"
-#include "nsIForm.h"
 #include "nsIFragmentContentSink.h"
-#include "nsContainerFrame.h"
-#include "nsIClassifiedChannel.h"
+#include "nsIFrame.h"
+#include "nsIGlobalObject.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
-#include "nsIUserIdleService.h"
+#include "nsIIOService.h"
 #include "nsIImageLoadingContent.h"
+#include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIIOService.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"
-#include "nsIMemoryReporter.h"
+#include "nsILoadInfo.h"
 #include "nsIMIMEService.h"
+#include "nsIMemoryReporter.h"
+#include "nsINetUtil.h"
 #include "nsINode.h"
-#include "mozilla/dom/NodeInfo.h"
-#include "mozilla/NullPrincipal.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
@@ -195,70 +305,95 @@
 #include "nsIParser.h"
 #include "nsIParserUtils.h"
 #include "nsIPermissionManager.h"
+#include "nsIPluginTag.h"
+#include "nsIPrincipal.h"
+#include "nsIProperties.h"
+#include "nsIProtocolHandler.h"
 #include "nsIRequest.h"
 #include "nsIRunnable.h"
-#include "nsIScriptContext.h"
+#include "nsIScreen.h"
 #include "nsIScriptError.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsISerialEventTarget.h"
 #include "nsIStreamConverter.h"
 #include "nsIStreamConverterService.h"
 #include "nsIStringBundle.h"
+#include "nsISupports.h"
+#include "nsISupportsPrimitives.h"
+#include "nsISupportsUtils.h"
+#include "nsITransferable.h"
 #include "nsIURI.h"
 #include "nsIURIMutator.h"
-#include "nsIURIWithSpecialOrigin.h"
+#if defined(MOZ_THUNDERBIRD) || defined(MOZ_SUITE)
+#  include "nsIURIWithSpecialOrigin.h"
+#endif
 #include "nsIUUIDGenerator.h"
+#include "nsIUserIdleService.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIWebNavigation.h"
+#include "nsIWebNavigationInfo.h"
 #include "nsIWidget.h"
 #include "nsIWindowMediator.h"
 #include "nsIXPConnect.h"
+#include "nsJSPrincipals.h"
 #include "nsJSUtils.h"
 #include "nsLayoutUtils.h"
+#include "nsLiteralString.h"
 #include "nsMappedAttributes.h"
+#include "nsMargin.h"
+#include "nsMimeTypes.h"
+#include "nsNPAPIPluginInstance.h"
+#include "nsNameSpaceManager.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsNodeInfoManager.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
 #include "nsParserCIID.h"
 #include "nsParserConstants.h"
-#include "nsPIDOMWindow.h"
+#include "nsPluginHost.h"
+#include "nsPoint.h"
+#include "nsPointerHashKeys.h"
 #include "nsPresContext.h"
-#include "nsPrintfCString.h"
+#include "nsQueryFrame.h"
 #include "nsQueryObject.h"
+#include "nsRFPService.h"
+#include "nsRange.h"
+#include "nsRefPtrHashtable.h"
 #include "nsSandboxFlags.h"
 #include "nsScriptSecurityManager.h"
-#include "nsSerializationHelper.h"
+#include "nsServiceManagerUtils.h"
 #include "nsStreamUtils.h"
+#include "nsString.h"
+#include "nsStringBuffer.h"
+#include "nsStringFlags.h"
+#include "nsStringFwd.h"
+#include "nsStringIterator.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTPromiseFlatString.h"
+#include "nsTStringRepr.h"
 #include "nsTextFragment.h"
 #include "nsTextNode.h"
+#include "nsThreadManager.h"
 #include "nsThreadUtils.h"
 #include "nsTreeSanitizer.h"
-#include "nsUnicodeProperties.h"
+#include "nsUGenCategory.h"
 #include "nsURLHelper.h"
+#include "nsUnicodeProperties.h"
+#include "nsView.h"
 #include "nsViewManager.h"
-#include "nsViewportInfo.h"
-#include "nsWidgetsCID.h"
-#include "nsWrapperCacheInlines.h"
-#include "nsXULPopupManager.h"
-#include "xpcprivate.h"  // nsXPConnect
-#include "HTMLSplitOnSpacesTokenizer.h"
-#include "InProcessBrowserChildMessageManager.h"
-#include "nsContentTypeParser.h"
-#include "ThirdPartyUtil.h"
-#include "mozilla/EnumSet.h"
-#include "mozilla/BloomFilter.h"
-#include "BrowserChild.h"
-#include "mozilla/dom/DocGroup.h"
-#include "nsIWebNavigationInfo.h"
-#include "nsPluginHost.h"
-#include "nsIBrowser.h"
-#include "mozilla/HangAnnotations.h"
-#include "mozilla/Encoding.h"
+#include "nsXPCOM.h"
+#include "nsXPCOMCID.h"
+#include "nsXULAppAPI.h"
 #include "nsXULElement.h"
-#include "nsThreadManager.h"
-#include "nsIBidiKeyboard.h"
-#include "ReferrerInfo.h"
-#include "nsAboutProtocolUtils.h"
+#include "nsXULPopupManager.h"
+#include "nscore.h"
+#include "prinrval.h"
+#include "xpcprivate.h"
+#include "xpcpublic.h"
 
 #if defined(XP_WIN)
 // Undefine LoadImage to prevent naming conflict with Windows.
@@ -270,9 +405,6 @@
 extern "C" int MOZ_XMLCheckQName(const char* ptr, const char* end, int ns_aware,
                                  const char** colon);
 
-class imgLoader;
-class nsAtom;
-
 using namespace mozilla::dom;
 using namespace mozilla::ipc;
 using namespace mozilla::gfx;
@@ -3857,6 +3989,10 @@
   sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get());
 }
 
+bool nsContentUtils::IsChromeDoc(const Document* aDocument) {
+  return aDocument && aDocument->NodePrincipal() == sSystemPrincipal;
+}
+
 bool nsContentUtils::IsChildOfSameType(Document* aDoc) {
   if (BrowsingContext* bc = aDoc->GetBrowsingContext()) {
     return bc->GetParent();
@@ -3888,6 +4024,10 @@
          aContentType.EqualsLiteral(TEXT_VTT);
 }
 
+bool nsContentUtils::IsInChromeDocshell(const Document* aDocument) {
+  return aDocument && aDocument->IsInChromeDocShell();
+}
+
 // static
 nsIContentPolicy* nsContentUtils::GetContentPolicy() {
   if (!sTriedToGetContentPolicy) {
@@ -5017,21 +5157,8 @@
   return encoder->EncodeToString(aResultBuffer);
 }
 
-/* static */
-already_AddRefed<Document> nsContentUtils::CreateInertXMLDocument(
-    const Document* aTemplate) {
-  return nsContentUtils::CreateInertDocument(aTemplate, DocumentFlavorXML);
-}
-
-/* static */
-already_AddRefed<Document> nsContentUtils::CreateInertHTMLDocument(
-    const Document* aTemplate) {
-  return nsContentUtils::CreateInertDocument(aTemplate, DocumentFlavorHTML);
-}
-
-/* static */
-already_AddRefed<Document> nsContentUtils::CreateInertDocument(
-    const Document* aTemplate, DocumentFlavor aFlavor) {
+static already_AddRefed<Document> CreateInertDocument(const Document* aTemplate,
+                                                      DocumentFlavor aFlavor) {
   if (aTemplate) {
     bool hasHad = true;
     nsIScriptGlobalObject* sgo = aTemplate->GetScriptHandlingObject(hasHad);
@@ -5070,6 +5197,18 @@
 }
 
 /* static */
+already_AddRefed<Document> nsContentUtils::CreateInertXMLDocument(
+    const Document* aTemplate) {
+  return CreateInertDocument(aTemplate, DocumentFlavorXML);
+}
+
+/* static */
+already_AddRefed<Document> nsContentUtils::CreateInertHTMLDocument(
+    const Document* aTemplate) {
+  return CreateInertDocument(aTemplate, DocumentFlavorHTML);
+}
+
+/* static */
 nsresult nsContentUtils::SetNodeTextContent(nsIContent* aContent,
                                             const nsAString& aValue,
                                             bool aTryReuse) {
@@ -5267,6 +5406,11 @@
   return !!ep;
 }
 
+bool nsContentUtils::IsSystemOrExpandedPrincipal(nsIPrincipal* aPrincipal) {
+  return (aPrincipal && aPrincipal->IsSystemPrincipal()) ||
+         IsExpandedPrincipal(aPrincipal);
+}
+
 nsIPrincipal* nsContentUtils::GetSystemPrincipal() {
   MOZ_ASSERT(IsInitialized());
   return sSystemPrincipal;
@@ -5504,6 +5648,12 @@
   AddScriptRunner(runnable.forget());
 }
 
+/* static */ bool nsContentUtils::IsSafeToRunScript() {
+  MOZ_ASSERT(NS_IsMainThread(),
+             "This static variable only makes sense on the main thread!");
+  return sScriptBlockerCount == 0;
+}
+
 /* static */
 void nsContentUtils::RunInStableState(already_AddRefed<nsIRunnable> aRunnable) {
   MOZ_ASSERT(CycleCollectedJSContext::Get(), "Must be on a script thread!");
@@ -5803,6 +5953,22 @@
 }
 
 /* static */
+bool nsContentUtils::EqualsIgnoreASCIICase(nsAtom* aAtom1, nsAtom* aAtom2) {
+  if (aAtom1 == aAtom2) {
+    return true;
+  }
+
+  // If both are ascii lowercase already, we know that the slow comparison
+  // below is going to return false.
+  if (aAtom1->IsAsciiLowercase() && aAtom2->IsAsciiLowercase()) {
+    return false;
+  }
+
+  return EqualsIgnoreASCIICase(nsDependentAtomString(aAtom1),
+                               nsDependentAtomString(aAtom2));
+}
+
+/* static */
 bool nsContentUtils::EqualsIgnoreASCIICase(const nsAString& aStr1,
                                            const nsAString& aStr2) {
   uint32_t len = aStr1.Length();
@@ -6305,6 +6471,15 @@
   aBuf->ToString(stringLen, aResultString);
 }
 
+already_AddRefed<nsContentList> nsContentUtils::GetElementsByClassName(
+    nsINode* aRootNode, const nsAString& aClasses) {
+  MOZ_ASSERT(aRootNode, "Must have root node");
+
+  return GetFuncStringContentList<nsCacheableFuncStringHTMLCollection>(
+      aRootNode, MatchClassNames, DestroyClassNameArray, AllocClassMatchingInfo,
+      aClasses);
+}
+
 PresShell* nsContentUtils::FindPresShellForDocument(const Document* aDocument) {
   const Document* doc = aDocument;
   Document* displayDoc = doc->GetDisplayDocument();
@@ -7967,7 +8142,8 @@
   event.mButton = aButton;
   event.mButtons = aButtons != nsIDOMWindowUtils::MOUSE_BUTTONS_NOT_SPECIFIED
                        ? aButtons
-                       : msg == eMouseUp ? 0 : GetButtonsFlagForButton(aButton);
+                   : msg == eMouseUp ? 0
+                                     : GetButtonsFlagForButton(aButton);
   event.mPressure = aPressure;
   event.mInputSource = aInputSourceArg;
   event.mClickCount = aClickCount;
@@ -9425,7 +9601,7 @@
 
 /* static */
 void nsContentUtils::EnqueueLifecycleCallback(
-    Document::ElementCallbackType aType, Element* aCustomElement,
+    ElementCallbackType aType, Element* aCustomElement,
     LifecycleCallbackArgs* aArgs,
     LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs,
     CustomElementDefinition* aDefinition) {
@@ -9735,18 +9911,11 @@
     return nsIObjectLoadingContent::TYPE_DOCUMENT;
   }
 
-  RefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
-  if (pluginHost) {
-    nsCOMPtr<nsIPluginTag> tag = PluginTagForType(aMIMEType, aNoFakePlugin);
-    if (tag) {
-      if (!aNoFakePlugin &&
-          nsCOMPtr<nsIFakePluginTag>(do_QueryInterface(tag))) {
-        return nsIObjectLoadingContent::TYPE_FAKE_PLUGIN;
-      }
-
-      // ShouldPlay will handle checking for disabled plugins
-      return nsIObjectLoadingContent::TYPE_PLUGIN;
-    }
+  bool isPlugin = nsPluginHost::GetSpecialType(aMIMEType) !=
+                  nsPluginHost::eSpecialType_None;
+  if (isPlugin) {
+    // ShouldPlay will handle checking for disabled plugins
+    return nsIObjectLoadingContent::TYPE_PLUGIN;
   }
 
   return nsIObjectLoadingContent::TYPE_NULL;
@@ -9872,7 +10041,6 @@
       case mozilla::dom::PBrowser::Msg_RealDragEvent__ID:
       case mozilla::dom::PBrowser::Msg_UpdateDimensions__ID:
       case mozilla::dom::PBrowser::Msg_MouseEvent__ID:
-      case mozilla::dom::PBrowser::Msg_SetDocShellIsActive__ID:
         return true;
     }
   }
diff -Nru firefox-84.0.2+build1/dom/base/nsContentUtils.h firefox-85.0+build1/dom/base/nsContentUtils.h
--- firefox-84.0.2+build1/dom/base/nsContentUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsContentUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -17,36 +17,41 @@
 #  include <ieeefp.h>
 #endif
 
-#include "js/TypeDecls.h"
-#include "js/Value.h"
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <utility>
+#include "ErrorList.h"
+#include "Units.h"
+#include "js/Id.h"
 #include "js/RootingAPI.h"
-#include "mozilla/dom/FromParser.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/BasicEvents.h"
-#include "mozilla/CallState.h"
 #include "mozilla/CORSMode.h"
-#include "mozilla/EventForwards.h"
-#include "mozilla/StaticPtr.h"
+#include "mozilla/CallState.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/TaskCategory.h"
 #include "mozilla/TimeStamp.h"
-#include "nsContentListDeclarations.h"
-#include "nsMathUtils.h"
-#include "nsTArrayForwardDeclare.h"
-#include "Units.h"
-#include "mozilla/dom/AutocompleteInfoBinding.h"
-#include "mozilla/dom/BindingDeclarations.h"  // For CallerType
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/FloatingPoint.h"
-#include "mozilla/intl/LineBreaker.h"
-#include "mozilla/intl/WordBreaker.h"
-#include "mozilla/Logging.h"
-#include "mozilla/NotNull.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/RangeBoundary.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/FromParser.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/Point.h"
+#include "nsCOMPtr.h"
 #include "nsIContentPolicy.h"
+#include "nsID.h"
+#include "nsINode.h"
 #include "nsIScriptError.h"
-#include "mozilla/dom/Document.h"
+#include "nsIThread.h"
+#include "nsLiteralString.h"
+#include "nsMargin.h"
 #include "nsPIDOMWindow.h"
-#include "nsRFPService.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
 #include "prtime.h"
 
 #if defined(XP_WIN)
@@ -54,85 +59,109 @@
 #  undef LoadImage
 #endif
 
+class JSObject;
 class imgICache;
 class imgIContainer;
 class imgINotificationObserver;
 class imgIRequest;
 class imgLoader;
 class imgRequestProxy;
+class nsAtom;
+class nsAttrValue;
 class nsAutoScriptBlockerSuppressNodeRemoved;
-class nsCacheableFuncStringHTMLCollection;
+class nsContentList;
+class nsCycleCollectionTraversalCallback;
+class nsGlobalWindowInner;
 class nsHtml5StringParser;
-class nsAtom;
+class nsIArray;
+class nsIBidiKeyboard;
 class nsIChannel;
 class nsIConsoleService;
 class nsIContent;
-class nsIContentPolicy;
-class nsIContentSecurityPolicy;
+class nsIDocShell;
 class nsIDocShellTreeItem;
 class nsIDocumentLoaderFactory;
 class nsIDragSession;
-class nsIEventTarget;
+class nsIFile;
 class nsIFragmentContentSink;
 class nsIFrame;
+class nsIHttpChannel;
+class nsIIOService;
 class nsIImageLoadingContent;
 class nsIInterfaceRequestor;
-class nsIIOService;
-class nsILoadInfo;
 class nsILoadGroup;
-class nsNameSpaceManager;
+class nsILoadInfo;
 class nsIObserver;
 class nsIParser;
 class nsIPluginTag;
 class nsIPrincipal;
+class nsIReferrerInfo;
 class nsIRequest;
 class nsIRunnable;
+class nsIScreen;
 class nsIScriptContext;
 class nsIScriptSecurityManager;
+class nsISerialEventTarget;
 class nsIStringBundle;
 class nsIStringBundleService;
-class nsISupportsHashKey;
+class nsISupports;
+class nsITransferable;
 class nsIURI;
 class nsIUUIDGenerator;
 class nsIWidget;
 class nsIXPConnect;
+class nsNameSpaceManager;
 class nsNodeInfoManager;
-class nsPIDOMWindowInner;
-class nsPIDOMWindowOuter;
+class nsPIWindowRoot;
 class nsPresContext;
 class nsStringBuffer;
 class nsStringHashKey;
 class nsTextFragment;
 class nsView;
-class nsViewportInfo;
 class nsWrapperCache;
-class nsAttrValue;
-class nsITransferable;
-class nsPIWindowRoot;
-class nsIReferrerInfo;
 
-struct JSRuntime;
+struct JSContext;
+struct nsPoint;
 
-template <class E>
-class nsCOMArray;
 template <class K, class V>
 class nsDataHashtable;
-template <class K, class V>
-class nsRefPtrHashtable;
 template <class T>
-class nsReadingIterator;
+class nsRefPtrHashKey;
+
+namespace IPC {
+class Message;
+}
+
+namespace JS {
+class Value;
+
+struct PropertyDescriptor;
+}  // namespace JS
 
 namespace mozilla {
 class Dispatcher;
 class ErrorResult;
 class EventListenerManager;
 class HTMLEditor;
+class LazyLogModule;
+class LogModule;
 class PresShell;
 class TextEditor;
+class WidgetDragEvent;
+class WidgetKeyboardEvent;
 
 struct InputEventOptions;
 
+template <typename ParentType, typename RefType>
+class RangeBoundaryBase;
+
+template <typename T>
+class NotNull;
+template <class T>
+class StaticRefPtr;
+
 namespace dom {
+struct AutocompleteInfo;
 class BrowserChild;
 class BrowserParent;
 class BrowsingContext;
@@ -141,8 +170,11 @@
 class ContentFrameMessageManager;
 class ContentParent;
 struct CustomElementDefinition;
+class CustomElementRegistry;
 class DataTransfer;
+class Document;
 class DocumentFragment;
+class DOMArena;
 class Element;
 class Event;
 class EventTarget;
@@ -154,10 +186,16 @@
 class MessageBroadcaster;
 class NodeInfo;
 class Selection;
-class StaticRange;
 class WorkerPrivate;
+enum class ElementCallbackType;
+enum class ReferrerPolicy : uint8_t;
 }  // namespace dom
 
+namespace intl {
+class LineBreaker;
+class WordBreaker;
+}  // namespace intl
+
 namespace ipc {
 class Shmem;
 class IShmemAllocator;
@@ -165,6 +203,7 @@
 
 namespace gfx {
 class DataSourceSurface;
+enum class SurfaceFormat : int8_t;
 }  // namespace gfx
 
 namespace layers {
@@ -173,8 +212,6 @@
 
 }  // namespace mozilla
 
-class nsIBidiKeyboard;
-
 extern const char kLoadAsData[];
 
 // Stolen from nsReadableUtils, but that's OK, since we can declare the same
@@ -506,11 +543,11 @@
    *          0 if point1 == point2.
    *          `Nothing` if the two nodes aren't in the same connected subtree.
    */
-  static Maybe<int32_t> ComparePoints(
+  static mozilla::Maybe<int32_t> ComparePoints(
       const nsINode* aParent1, int32_t aOffset1, const nsINode* aParent2,
       int32_t aOffset2, ComparePointsCache* aParent1Cache = nullptr);
   template <typename FPT, typename FRT, typename SPT, typename SRT>
-  static Maybe<int32_t> ComparePoints(
+  static mozilla::Maybe<int32_t> ComparePoints(
       const mozilla::RangeBoundaryBase<FPT, FRT>& aFirstBoundary,
       const mozilla::RangeBoundaryBase<SPT, SRT>& aSecondBoundary);
 
@@ -1283,9 +1320,7 @@
   /**
    * Returns true if aDocument is a chrome document
    */
-  static bool IsChromeDoc(const Document* aDocument) {
-    return aDocument && aDocument->NodePrincipal() == sSystemPrincipal;
-  }
+  static bool IsChromeDoc(const Document* aDocument);
 
   /**
    * Returns true if aDocument is in a docshell whose parent is the same type
@@ -1308,9 +1343,7 @@
    * display purposes.  Returns false for null documents or documents
    * which do not belong to a docshell.
    */
-  static bool IsInChromeDocshell(const Document* aDocument) {
-    return aDocument && aDocument->IsInChromeDocShell();
-  }
+  static bool IsInChromeDocshell(const Document* aDocument);
 
   /**
    * Return the content policy service
@@ -1571,8 +1604,9 @@
    * Helper to dispatch a "framefocusrequested" event to chrome, which will only
    * bring the window to the foreground and switch tabs if aCanRaise is true.
    */
-  static void RequestFrameFocus(Element& aFrameElement, bool aCanRaise,
-                                mozilla::dom::CallerType aCallerType);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY static void RequestFrameFocus(
+      Element& aFrameElement, bool aCanRaise,
+      mozilla::dom::CallerType aCallerType);
 
   /**
    * This method creates and dispatches a trusted event.
@@ -1845,10 +1879,6 @@
   static already_AddRefed<Document> CreateInertXMLDocument(
       const Document* aTemplate);
 
- private:
-  static already_AddRefed<Document> CreateInertDocument(
-      const Document* aTemplate, DocumentFlavor aFlavor);
-
  public:
   /**
    * Sets the text contents of a node by replacing all existing children
@@ -1942,10 +1972,7 @@
   /**
    * Returns true if aPrincipal is the system or an ExpandedPrincipal.
    */
-  static bool IsSystemOrExpandedPrincipal(nsIPrincipal* aPrincipal) {
-    return (aPrincipal && aPrincipal->IsSystemPrincipal()) ||
-           IsExpandedPrincipal(aPrincipal);
-  }
+  static bool IsSystemOrExpandedPrincipal(nsIPrincipal* aPrincipal);
 
   /**
    * Gets the system principal from the security manager.
@@ -2108,11 +2135,7 @@
    * The only known case where this lies is mutation events. They run, and can
    * run anything else, when this function returns false, but this is ok.
    */
-  static bool IsSafeToRunScript() {
-    MOZ_ASSERT(NS_IsMainThread(),
-               "This static variable only makes sense on the main thread!");
-    return sScriptBlockerCount == 0;
-  }
+  static bool IsSafeToRunScript();
 
   // Returns the browser window with the most recent time stamp that is
   // not in private browsing mode.
@@ -2156,20 +2179,7 @@
   /**
    * Case insensitive comparison between two atoms.
    */
-  static bool EqualsIgnoreASCIICase(nsAtom* aAtom1, nsAtom* aAtom2) {
-    if (aAtom1 == aAtom2) {
-      return true;
-    }
-
-    // If both are ascii lowercase already, we know that the slow comparison
-    // below is going to return false.
-    if (aAtom1->IsAsciiLowercase() && aAtom2->IsAsciiLowercase()) {
-      return false;
-    }
-
-    return EqualsIgnoreASCIICase(nsDependentAtomString(aAtom1),
-                                 nsDependentAtomString(aAtom2));
-  }
+  static bool EqualsIgnoreASCIICase(nsAtom* aAtom1, nsAtom* aAtom2);
 
   /**
    * Case insensitive comparison between two strings. However it only ignores
@@ -2315,13 +2325,7 @@
    * document or element), which getElementsByClassName was called on.
    */
   static already_AddRefed<nsContentList> GetElementsByClassName(
-      nsINode* aRootNode, const nsAString& aClasses) {
-    MOZ_ASSERT(aRootNode, "Must have root node");
-
-    return GetFuncStringContentList<nsCacheableFuncStringHTMLCollection>(
-        aRootNode, MatchClassNames, DestroyClassNameArray,
-        AllocClassMatchingInfo, aClasses);
-  }
+      nsINode* aRootNode, const nsAString& aClasses);
 
   /**
    * Returns a presshell for this document, if there is one. This will be
@@ -3049,7 +3053,7 @@
       Element* aElement, mozilla::dom::CustomElementDefinition* aDefinition);
 
   static void EnqueueLifecycleCallback(
-      Document::ElementCallbackType aType, Element* aCustomElement,
+      mozilla::dom::ElementCallbackType aType, Element* aCustomElement,
       mozilla::dom::LifecycleCallbackArgs* aArgs = nullptr,
       mozilla::dom::LifecycleAdoptedCallbackArgs* aAdoptedCallbackArgs =
           nullptr,
@@ -3282,7 +3286,7 @@
 
   struct SubresourceCacheValidationInfo {
     // The expiration time, in seconds, if known.
-    Maybe<uint32_t> mExpirationTime;
+    mozilla::Maybe<uint32_t> mExpirationTime;
     bool mMustRevalidate = false;
   };
 
@@ -3526,26 +3530,6 @@
 namespace mozilla {
 namespace dom {
 
-/**
- * Suppresses event handling and suspends the active inner window for all
- * in-process documents in a BrowsingContextGroup. This should be used while
- * spinning the event loop for a synchronous operation (like `window.open()`)
- * which affects operations in any other window in the same BrowsingContext
- * group.
- */
-
-class MOZ_RAII AutoSuppressEventHandlingAndSuspend {
- public:
-  explicit AutoSuppressEventHandlingAndSuspend(BrowsingContextGroup* aGroup);
-  ~AutoSuppressEventHandlingAndSuspend();
-
- private:
-  void SuppressBrowsingContext(BrowsingContext* aBC);
-
-  AutoTArray<RefPtr<Document>, 16> mDocuments;
-  AutoTArray<nsCOMPtr<nsPIDOMWindowInner>, 16> mWindows;
-};
-
 class TreeOrderComparator {
  public:
   bool Equals(nsINode* aElem1, nsINode* aElem2) const {
diff -Nru firefox-84.0.2+build1/dom/base/nsCopySupport.cpp firefox-85.0+build1/dom/base/nsCopySupport.cpp
--- firefox-84.0.2+build1/dom/base/nsCopySupport.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsCopySupport.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -16,8 +16,11 @@
 #include "nsRange.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"
+#include "nsComponentManagerUtils.h"
 #include "nsFocusManager.h"
 #include "nsFrameSelection.h"
+#include "nsServiceManagerUtils.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/DataTransfer.h"
 
 #include "nsIDocShell.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsCopySupport.h firefox-85.0+build1/dom/base/nsCopySupport.h
--- firefox-84.0.2+build1/dom/base/nsCopySupport.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsCopySupport.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,14 +6,15 @@
 #ifndef nsCopySupport_h__
 #define nsCopySupport_h__
 
-#include "nsError.h"
-#include "mozilla/dom/Document.h"
+#include <cstdint>
+#include "ErrorList.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/BasicEvents.h"
 #include "nsStringFwd.h"
-#include "mozilla/EventForwards.h"
 
 class nsINode;
 class nsIImageLoadingContent;
-class nsIContent;
 class nsITransferable;
 class nsILoadContext;
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDocumentEncoder.cpp firefox-85.0+build1/dom/base/nsDocumentEncoder.cpp
--- firefox-84.0.2+build1/dom/base/nsDocumentEncoder.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDocumentEncoder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,2103 +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/. */
-
-/*
- * Object that can be used to serialize selections, ranges, or nodes
- * to strings in a gazillion different ways.
- */
-
-#include "nsIDocumentEncoder.h"
-
-#include <utility>
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "mozilla/dom/Document.h"
-#include "nsCOMPtr.h"
-#include "nsIContentSerializer.h"
-#include "mozilla/Encoding.h"
-#include "nsIOutputStream.h"
-#include "nsRange.h"
-#include "nsGkAtoms.h"
-#include "nsHTMLDocument.h"
-#include "nsIContent.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptGlobalObject.h"
-#include "mozilla/dom/Selection.h"
-#include "nsContentUtils.h"
-#include "nsElementTable.h"
-#include "nsUnicharUtils.h"
-#include "nsReadableUtils.h"
-#include "nsTArray.h"
-#include "nsIFrame.h"
-#include "nsStringBuffer.h"
-#include "mozilla/dom/Comment.h"
-#include "mozilla/dom/DocumentType.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/HTMLBRElement.h"
-#include "mozilla/dom/ProcessingInstruction.h"
-#include "mozilla/dom/ShadowRoot.h"
-#include "mozilla/dom/Text.h"
-#include "nsLayoutUtils.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/UniquePtr.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-
-enum nsRangeIterationDirection { kDirectionOut = -1, kDirectionIn = 1 };
-
-class TextStreamer {
- public:
-  /**
-   * @param aStream Will be kept alive by the TextStreamer.
-   * @param aUnicodeEncoder Needs to be non-nullptr.
-   */
-  TextStreamer(nsIOutputStream& aStream, UniquePtr<Encoder> aUnicodeEncoder,
-               bool aIsPlainText, nsAString& aOutputBuffer);
-
-  /**
-   * String will be truncated if it is written to stream.
-   */
-  nsresult FlushIfStringLongEnough();
-
-  /**
-   * String will be truncated.
-   */
-  nsresult ForceFlush();
-
- private:
-  const static uint32_t kMaxLengthBeforeFlush = 1024;
-
-  const static uint32_t kEncoderBufferSizeInBytes = 4096;
-
-  nsresult EncodeAndWrite();
-
-  nsresult EncodeAndWriteAndTruncate();
-
-  const nsCOMPtr<nsIOutputStream> mStream;
-  const UniquePtr<Encoder> mUnicodeEncoder;
-  const bool mIsPlainText;
-  nsAString& mOutputBuffer;
-};
-
-TextStreamer::TextStreamer(nsIOutputStream& aStream,
-                           UniquePtr<Encoder> aUnicodeEncoder,
-                           bool aIsPlainText, nsAString& aOutputBuffer)
-    : mStream{&aStream},
-      mUnicodeEncoder(std::move(aUnicodeEncoder)),
-      mIsPlainText(aIsPlainText),
-      mOutputBuffer(aOutputBuffer) {
-  MOZ_ASSERT(mUnicodeEncoder);
-}
-
-nsresult TextStreamer::FlushIfStringLongEnough() {
-  nsresult rv = NS_OK;
-
-  if (mOutputBuffer.Length() > kMaxLengthBeforeFlush) {
-    rv = EncodeAndWriteAndTruncate();
-  }
-
-  return rv;
-}
-
-nsresult TextStreamer::ForceFlush() { return EncodeAndWriteAndTruncate(); }
-
-nsresult TextStreamer::EncodeAndWrite() {
-  if (mOutputBuffer.IsEmpty()) {
-    return NS_OK;
-  }
-
-  uint8_t buffer[kEncoderBufferSizeInBytes];
-  auto src = Span(mOutputBuffer);
-  auto bufferSpan = Span(buffer);
-  // Reserve space for terminator
-  auto dst = bufferSpan.To(bufferSpan.Length() - 1);
-  for (;;) {
-    uint32_t result;
-    size_t read;
-    size_t written;
-    bool hadErrors;
-    if (mIsPlainText) {
-      Tie(result, read, written) =
-          mUnicodeEncoder->EncodeFromUTF16WithoutReplacement(src, dst, false);
-      if (result != kInputEmpty && result != kOutputFull) {
-        // There's always room for one byte in the case of
-        // an unmappable character, because otherwise
-        // we'd have gotten `kOutputFull`.
-        dst[written++] = '?';
-      }
-    } else {
-      Tie(result, read, written, hadErrors) =
-          mUnicodeEncoder->EncodeFromUTF16(src, dst, false);
-    }
-    Unused << hadErrors;
-    src = src.From(read);
-    // Sadly, we still have test cases that implement nsIOutputStream in JS, so
-    // the buffer needs to be zero-terminated for XPConnect to do its thing.
-    // See bug 170416.
-    bufferSpan[written] = 0;
-    uint32_t streamWritten;
-    nsresult rv = mStream->Write(reinterpret_cast<char*>(dst.Elements()),
-                                 written, &streamWritten);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-    if (result == kInputEmpty) {
-      return NS_OK;
-    }
-  }
-}
-
-nsresult TextStreamer::EncodeAndWriteAndTruncate() {
-  const nsresult rv = EncodeAndWrite();
-  mOutputBuffer.Truncate();
-  return rv;
-}
-
-/**
- * The scope may be limited to either a selection, range, or node.
- */
-class EncodingScope {
- public:
-  /**
-   * @return true, iff the scope is limited to a selection, range or node.
-   */
-  bool IsLimited() const;
-
-  RefPtr<Selection> mSelection;
-  RefPtr<nsRange> mRange;
-  nsCOMPtr<nsINode> mNode;
-  bool mNodeIsContainer = false;
-};
-
-bool EncodingScope::IsLimited() const { return mSelection || mRange || mNode; }
-
-struct RangeBoundariesInclusiveAncestorsAndOffsets {
-  /**
-   * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
-   */
-  using InclusiveAncestors = AutoTArray<nsIContent*, 8>;
-
-  /**
-   * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
-   */
-  using InclusiveAncestorsOffsets = AutoTArray<int32_t, 8>;
-
-  // The first node is the range's boundary node, the following ones the
-  // ancestors.
-  InclusiveAncestors mInclusiveAncestorsOfStart;
-  // The first offset represents where at the boundary node the range starts.
-  // Each other offset is the index of the child relative to its parent.
-  InclusiveAncestorsOffsets mInclusiveAncestorsOffsetsOfStart;
-
-  // The first node is the range's boundary node, the following one the
-  // ancestors.
-  InclusiveAncestors mInclusiveAncestorsOfEnd;
-  // The first offset represents where at the boundary node the range ends.
-  // Each other offset is the index of the child relative to its parent.
-  InclusiveAncestorsOffsets mInclusiveAncestorsOffsetsOfEnd;
-};
-
-struct ContextInfoDepth {
-  uint32_t mStart = 0;
-  uint32_t mEnd = 0;
-};
-
-class nsDocumentEncoder : public nsIDocumentEncoder {
- protected:
-  class RangeNodeContext {
-   public:
-    virtual ~RangeNodeContext() = default;
-
-    virtual bool IncludeInContext(nsINode& aNode) const { return false; }
-
-    virtual int32_t GetImmediateContextCount(
-        const nsTArray<nsINode*>& aAncestorArray) const {
-      return -1;
-    }
-  };
-
- public:
-  nsDocumentEncoder();
-
- protected:
-  /**
-   * @param aRangeNodeContext has to be non-null.
-   */
-  explicit nsDocumentEncoder(UniquePtr<RangeNodeContext> aRangeNodeContext);
-
- public:
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS(nsDocumentEncoder)
-  NS_DECL_NSIDOCUMENTENCODER
-
- protected:
-  virtual ~nsDocumentEncoder();
-
-  void Initialize(bool aClearCachedSerializer = true);
-
-  /**
-   * @param aMaxLength As described at
-   * `nsIDocumentEncodder.encodeToStringWithMaxLength`.
-   */
-  nsresult SerializeDependingOnScope(uint32_t aMaxLength);
-
-  nsresult SerializeSelection();
-
-  nsresult SerializeNode();
-
-  /**
-   * @param aMaxLength As described at
-   * `nsIDocumentEncodder.encodeToStringWithMaxLength`.
-   */
-  nsresult SerializeWholeDocument(uint32_t aMaxLength);
-
-  /**
-   * @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.o
-   */
-  static bool IsInvisibleNodeAndShouldBeSkipped(const nsINode& aNode,
-                                                const uint32_t aFlags) {
-    if (aFlags & SkipInvisibleContent) {
-      // Treat the visibility of the ShadowRoot as if it were
-      // the host content.
-      //
-      // FIXME(emilio): I suspect instead of this a bunch of the GetParent()
-      // calls here should be doing GetFlattenedTreeParent, then this condition
-      // should be unreachable...
-      const nsINode* node{&aNode};
-      if (const ShadowRoot* shadowRoot = ShadowRoot::FromNode(node)) {
-        node = shadowRoot->GetHost();
-      }
-
-      if (node->IsContent()) {
-        nsIFrame* frame = node->AsContent()->GetPrimaryFrame();
-        if (!frame) {
-          if (node->IsElement() && node->AsElement()->IsDisplayContents()) {
-            return false;
-          }
-          if (node->IsText()) {
-            // We have already checked that our parent is visible.
-            //
-            // FIXME(emilio): Text not assigned to a <slot> in Shadow DOM should
-            // probably return false...
-            return false;
-          }
-          if (node->IsHTMLElement(nsGkAtoms::rp)) {
-            // Ruby parentheses are part of ruby structure, hence
-            // shouldn't be stripped out even if it is not displayed.
-            return false;
-          }
-          return true;
-        }
-        bool isVisible = frame->StyleVisibility()->IsVisible();
-        if (!isVisible && node->IsText()) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  void ReleaseDocumentReferenceAndInitialize(bool aClearCachedSerializer);
-
-  class MOZ_STACK_CLASS AutoReleaseDocumentIfNeeded final {
-   public:
-    explicit AutoReleaseDocumentIfNeeded(nsDocumentEncoder* aEncoder)
-        : mEncoder(aEncoder) {}
-
-    ~AutoReleaseDocumentIfNeeded() {
-      if (mEncoder->mFlags & RequiresReinitAfterOutput) {
-        const bool clearCachedSerializer = false;
-        mEncoder->ReleaseDocumentReferenceAndInitialize(clearCachedSerializer);
-      }
-    }
-
-   private:
-    nsDocumentEncoder* mEncoder;
-  };
-
-  nsCOMPtr<Document> mDocument;
-  EncodingScope mEncodingScope;
-  nsCOMPtr<nsIContentSerializer> mSerializer;
-
-  Maybe<TextStreamer> mTextStreamer;
-  nsCOMPtr<nsIDocumentEncoderNodeFixup> mNodeFixup;
-
-  nsString mMimeType;
-  const Encoding* mEncoding;
-  // Multiple of the flags defined in nsIDocumentEncoder.idl.
-  uint32_t mFlags;
-  uint32_t mWrapColumn;
-  // Whether the serializer cares about being notified to scan elements to
-  // keep track of whether they are preformatted.  This stores the out
-  // argument of nsIContentSerializer::Init().
-  bool mNeedsPreformatScanning;
-  bool mIsCopying;  // Set to true only while copying
-  nsStringBuffer* mCachedBuffer;
-
-  class NodeSerializer {
-   public:
-    /**
-     * @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.
-     */
-    NodeSerializer(const bool& aNeedsPreformatScanning,
-                   const nsCOMPtr<nsIContentSerializer>& aSerializer,
-                   const uint32_t& aFlags,
-                   const nsCOMPtr<nsIDocumentEncoderNodeFixup>& aNodeFixup,
-                   Maybe<TextStreamer>& aTextStreamer)
-        : mNeedsPreformatScanning{aNeedsPreformatScanning},
-          mSerializer{aSerializer},
-          mFlags{aFlags},
-          mNodeFixup{aNodeFixup},
-          mTextStreamer{aTextStreamer} {}
-
-    nsresult SerializeNodeStart(nsINode& aOriginalNode, int32_t aStartOffset,
-                                int32_t aEndOffset,
-                                nsINode* aFixupNode = nullptr) const;
-
-    enum class SerializeRoot { eYes, eNo };
-
-    nsresult SerializeToStringRecursive(nsINode* aNode,
-                                        SerializeRoot aSerializeRoot,
-                                        uint32_t aMaxLength = 0) const;
-
-    nsresult SerializeNodeEnd(nsINode& aOriginalNode,
-                              nsINode* aFixupNode = nullptr) const;
-
-    [[nodiscard]] nsresult SerializeTextNode(nsINode& aNode,
-                                             int32_t aStartOffset,
-                                             int32_t aEndOffset) const;
-
-    nsresult SerializeToStringIterative(nsINode* aNode) const;
-
-   private:
-    const bool& mNeedsPreformatScanning;
-    const nsCOMPtr<nsIContentSerializer>& mSerializer;
-    // Multiple of the flags defined in nsIDocumentEncoder.idl.
-    const uint32_t& mFlags;
-    const nsCOMPtr<nsIDocumentEncoderNodeFixup>& mNodeFixup;
-    Maybe<TextStreamer>& mTextStreamer;
-  };
-
-  NodeSerializer mNodeSerializer;
-
-  const UniquePtr<RangeNodeContext> mRangeNodeContext;
-
-  struct RangeContextSerializer final {
-    RangeContextSerializer(const RangeNodeContext& aRangeNodeContext,
-                           const NodeSerializer& aNodeSerializer)
-        : mDisableContextSerialize{false},
-          mRangeNodeContext{aRangeNodeContext},
-          mNodeSerializer{aNodeSerializer} {}
-
-    nsresult SerializeRangeContextStart(
-        const nsTArray<nsINode*>& aAncestorArray);
-    nsresult SerializeRangeContextEnd();
-
-    // Used when context has already been serialized for
-    // table cell selections (where parent is <tr>)
-    bool mDisableContextSerialize;
-    AutoTArray<AutoTArray<nsINode*, 8>, 8> mRangeContexts;
-
-    const RangeNodeContext& mRangeNodeContext;
-
-   private:
-    const NodeSerializer& mNodeSerializer;
-  };
-
-  RangeContextSerializer mRangeContextSerializer;
-
-  struct RangeSerializer {
-    // @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.
-    RangeSerializer(const uint32_t& aFlags,
-                    const NodeSerializer& aNodeSerializer,
-                    RangeContextSerializer& aRangeContextSerializer)
-        : mStartRootIndex{0},
-          mEndRootIndex{0},
-          mHaltRangeHint{false},
-          mFlags{aFlags},
-          mNodeSerializer{aNodeSerializer},
-          mRangeContextSerializer{aRangeContextSerializer} {}
-
-    void Initialize();
-
-    /**
-     * @param aDepth the distance (number of `GetParent` calls) from aNode to
-     *               aRange's closest common inclusive ancestor.
-     */
-    nsresult SerializeRangeNodes(const nsRange* aRange, nsINode* aNode,
-                                 int32_t aDepth);
-
-    /**
-     * Serialize aContent's children from aStartOffset to aEndOffset.
-     *
-     * @param aDepth the distance (number of `GetParent` calls) from aContent to
-     *               aRange's closest common inclusive ancestor.
-     */
-    [[nodiscard]] nsresult SerializeChildrenOfContent(nsIContent& aContent,
-                                                      int32_t aStartOffset,
-                                                      int32_t aEndOffset,
-                                                      const nsRange* aRange,
-                                                      int32_t aDepth);
-
-    nsresult SerializeRangeToString(const nsRange* aRange);
-
-    /**
-     * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
-     */
-    nsCOMPtr<nsINode> mClosestCommonInclusiveAncestorOfRange;
-
-    /**
-     * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
-     */
-    AutoTArray<nsINode*, 8> mCommonInclusiveAncestors;
-
-    ContextInfoDepth mContextInfoDepth;
-
-   private:
-    struct StartAndEndContent {
-      nsCOMPtr<nsIContent> mStart;
-      nsCOMPtr<nsIContent> mEnd;
-    };
-
-    StartAndEndContent GetStartAndEndContentForRecursionLevel(
-        int32_t aDepth) const;
-
-    bool HasInvisibleParentAndShouldBeSkipped(nsINode& aNode) const;
-
-    nsresult SerializeNodePartiallyContainedInRange(
-        nsINode& aNode, nsIContent& aContent,
-        const StartAndEndContent& aStartAndEndContent, const nsRange& aRange,
-        int32_t aDepth);
-
-    nsresult SerializeTextNode(nsINode& aNode, const nsIContent& aContent,
-                               const StartAndEndContent& aStartAndEndContent,
-                               const nsRange& aRange) const;
-
-    RangeBoundariesInclusiveAncestorsAndOffsets
-        mRangeBoundariesInclusiveAncestorsAndOffsets;
-    int32_t mStartRootIndex;
-    int32_t mEndRootIndex;
-    bool mHaltRangeHint;
-
-    // Multiple of the flags defined in nsIDocumentEncoder.idl.
-    const uint32_t& mFlags;
-
-    const NodeSerializer& mNodeSerializer;
-    RangeContextSerializer& mRangeContextSerializer;
-  };
-
-  RangeSerializer mRangeSerializer;
-};
-
-void nsDocumentEncoder::RangeSerializer::Initialize() {
-  mContextInfoDepth = {};
-  mStartRootIndex = 0;
-  mEndRootIndex = 0;
-  mHaltRangeHint = false;
-  mClosestCommonInclusiveAncestorOfRange = nullptr;
-  mRangeBoundariesInclusiveAncestorsAndOffsets = {};
-}
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDocumentEncoder)
-NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_LAST_RELEASE(
-    nsDocumentEncoder, ReleaseDocumentReferenceAndInitialize(true))
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocumentEncoder)
-  NS_INTERFACE_MAP_ENTRY(nsIDocumentEncoder)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_CYCLE_COLLECTION(
-    nsDocumentEncoder, mDocument, mEncodingScope.mSelection,
-    mEncodingScope.mRange, mEncodingScope.mNode, mSerializer,
-    mRangeSerializer.mClosestCommonInclusiveAncestorOfRange)
-
-nsDocumentEncoder::nsDocumentEncoder(
-    UniquePtr<RangeNodeContext> aRangeNodeContext)
-    : mEncoding(nullptr),
-      mIsCopying(false),
-      mCachedBuffer(nullptr),
-      mNodeSerializer(mNeedsPreformatScanning, mSerializer, mFlags, mNodeFixup,
-                      mTextStreamer),
-      mRangeNodeContext(std::move(aRangeNodeContext)),
-      mRangeContextSerializer(*mRangeNodeContext, mNodeSerializer),
-      mRangeSerializer(mFlags, mNodeSerializer, mRangeContextSerializer) {
-  MOZ_ASSERT(mRangeNodeContext);
-
-  Initialize();
-  mMimeType.AssignLiteral("text/plain");
-}
-
-nsDocumentEncoder::nsDocumentEncoder()
-    : nsDocumentEncoder(MakeUnique<RangeNodeContext>()) {}
-
-void nsDocumentEncoder::Initialize(bool aClearCachedSerializer) {
-  mFlags = 0;
-  mWrapColumn = 72;
-  mRangeSerializer.Initialize();
-  mNeedsPreformatScanning = false;
-  mRangeContextSerializer.mDisableContextSerialize = false;
-  mEncodingScope = {};
-  mNodeFixup = nullptr;
-  if (aClearCachedSerializer) {
-    mSerializer = nullptr;
-  }
-}
-
-static bool ParentIsTR(nsIContent* aContent) {
-  mozilla::dom::Element* parent = aContent->GetParentElement();
-  if (!parent) {
-    return false;
-  }
-  return parent->IsHTMLElement(nsGkAtoms::tr);
-}
-
-nsresult nsDocumentEncoder::SerializeDependingOnScope(uint32_t aMaxLength) {
-  nsresult rv = NS_OK;
-  if (mEncodingScope.mSelection) {
-    rv = SerializeSelection();
-  } else if (nsRange* range = mEncodingScope.mRange) {
-    rv = mRangeSerializer.SerializeRangeToString(range);
-  } else if (mEncodingScope.mNode) {
-    rv = SerializeNode();
-  } else {
-    rv = SerializeWholeDocument(aMaxLength);
-  }
-
-  mEncodingScope = {};
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::SerializeSelection() {
-  NS_ENSURE_TRUE(mEncodingScope.mSelection, NS_ERROR_FAILURE);
-
-  nsresult rv = NS_OK;
-  const Selection* selection = mEncodingScope.mSelection;
-  uint32_t count = selection->RangeCount();
-
-  nsCOMPtr<nsINode> node;
-  nsCOMPtr<nsINode> prevNode;
-  uint32_t firstRangeStartDepth = 0;
-  for (uint32_t i = 0; i < count; ++i) {
-    RefPtr<const nsRange> range = selection->GetRangeAt(i);
-
-    // Bug 236546: newlines not added when copying table cells into clipboard
-    // Each selected cell shows up as a range containing a row with a single
-    // cell get the row, compare it to previous row and emit </tr><tr> as
-    // needed Bug 137450: Problem copying/pasting a table from a web page to
-    // Excel. Each separate block of <tr></tr> produced above will be wrapped
-    // by the immediate context. This assumes that you can't select cells that
-    // are multiple selections from two tables simultaneously.
-    node = range->GetStartContainer();
-    NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
-    if (node != prevNode) {
-      if (prevNode) {
-        rv = mNodeSerializer.SerializeNodeEnd(*prevNode);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-      nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(node);
-      if (content && content->IsHTMLElement(nsGkAtoms::tr) &&
-          !ParentIsTR(content)) {
-        if (!prevNode) {
-          // Went from a non-<tr> to a <tr>
-          mRangeSerializer.mCommonInclusiveAncestors.Clear();
-          nsContentUtils::GetInclusiveAncestors(
-              node->GetParentNode(),
-              mRangeSerializer.mCommonInclusiveAncestors);
-          rv = mRangeContextSerializer.SerializeRangeContextStart(
-              mRangeSerializer.mCommonInclusiveAncestors);
-          NS_ENSURE_SUCCESS(rv, rv);
-          // Don't let SerializeRangeToString serialize the context again
-          mRangeContextSerializer.mDisableContextSerialize = true;
-        }
-
-        rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
-        NS_ENSURE_SUCCESS(rv, rv);
-        prevNode = node;
-      } else if (prevNode) {
-        // Went from a <tr> to a non-<tr>
-        mRangeContextSerializer.mDisableContextSerialize = false;
-
-        // `mCommonInclusiveAncestors` is used in `EncodeToStringWithContext`
-        // too. Update it here to mimic the old behavior.
-        mRangeSerializer.mCommonInclusiveAncestors.Clear();
-        nsContentUtils::GetInclusiveAncestors(
-            prevNode->GetParentNode(),
-            mRangeSerializer.mCommonInclusiveAncestors);
-
-        rv = mRangeContextSerializer.SerializeRangeContextEnd();
-        NS_ENSURE_SUCCESS(rv, rv);
-        prevNode = nullptr;
-      }
-    }
-
-    rv = mRangeSerializer.SerializeRangeToString(range);
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (i == 0) {
-      firstRangeStartDepth = mRangeSerializer.mContextInfoDepth.mStart;
-    }
-  }
-  mRangeSerializer.mContextInfoDepth.mStart = firstRangeStartDepth;
-
-  if (prevNode) {
-    rv = mNodeSerializer.SerializeNodeEnd(*prevNode);
-    NS_ENSURE_SUCCESS(rv, rv);
-    mRangeContextSerializer.mDisableContextSerialize = false;
-
-    // `mCommonInclusiveAncestors` is used in `EncodeToStringWithContext`
-    // too. Update it here to mimic the old behavior.
-    mRangeSerializer.mCommonInclusiveAncestors.Clear();
-    nsContentUtils::GetInclusiveAncestors(
-        prevNode->GetParentNode(), mRangeSerializer.mCommonInclusiveAncestors);
-
-    rv = mRangeContextSerializer.SerializeRangeContextEnd();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  // Just to be safe
-  mRangeContextSerializer.mDisableContextSerialize = false;
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::SerializeNode() {
-  NS_ENSURE_TRUE(mEncodingScope.mNode, NS_ERROR_FAILURE);
-
-  nsresult rv = NS_OK;
-  nsINode* node = mEncodingScope.mNode;
-  const bool nodeIsContainer = mEncodingScope.mNodeIsContainer;
-  if (!mNodeFixup && !(mFlags & SkipInvisibleContent) && !mTextStreamer &&
-      nodeIsContainer) {
-    rv = mNodeSerializer.SerializeToStringIterative(node);
-  } else {
-    rv = mNodeSerializer.SerializeToStringRecursive(
-        node, nodeIsContainer ? NodeSerializer::SerializeRoot::eNo
-                              : NodeSerializer::SerializeRoot::eYes);
-  }
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::SerializeWholeDocument(uint32_t aMaxLength) {
-  NS_ENSURE_FALSE(mEncodingScope.mSelection, NS_ERROR_FAILURE);
-  NS_ENSURE_FALSE(mEncodingScope.mRange, NS_ERROR_FAILURE);
-  NS_ENSURE_FALSE(mEncodingScope.mNode, NS_ERROR_FAILURE);
-
-  nsresult rv = mSerializer->AppendDocumentStart(mDocument);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mNodeSerializer.SerializeToStringRecursive(
-      mDocument, NodeSerializer::SerializeRoot::eYes, aMaxLength);
-  return rv;
-}
-
-nsDocumentEncoder::~nsDocumentEncoder() {
-  if (mCachedBuffer) {
-    mCachedBuffer->Release();
-  }
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::Init(Document* aDocument, const nsAString& aMimeType,
-                        uint32_t aFlags) {
-  return NativeInit(aDocument, aMimeType, aFlags);
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::NativeInit(Document* aDocument, const nsAString& aMimeType,
-                              uint32_t aFlags) {
-  if (!aDocument) return NS_ERROR_INVALID_ARG;
-
-  Initialize(!mMimeType.Equals(aMimeType));
-
-  mDocument = aDocument;
-
-  mMimeType = aMimeType;
-
-  mFlags = aFlags;
-  mIsCopying = false;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetWrapColumn(uint32_t aWC) {
-  mWrapColumn = aWC;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetSelection(Selection* aSelection) {
-  mEncodingScope.mSelection = aSelection;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetRange(nsRange* aRange) {
-  mEncodingScope.mRange = aRange;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetNode(nsINode* aNode) {
-  mEncodingScope.mNodeIsContainer = false;
-  mEncodingScope.mNode = aNode;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetContainerNode(nsINode* aContainer) {
-  mEncodingScope.mNodeIsContainer = true;
-  mEncodingScope.mNode = aContainer;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetCharset(const nsACString& aCharset) {
-  const Encoding* encoding = Encoding::ForLabel(aCharset);
-  if (!encoding) {
-    return NS_ERROR_UCONV_NOCONV;
-  }
-  mEncoding = encoding->OutputEncoding();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::GetMimeType(nsAString& aMimeType) {
-  aMimeType = mMimeType;
-  return NS_OK;
-}
-
-class FixupNodeDeterminer {
- public:
-  FixupNodeDeterminer(nsIDocumentEncoderNodeFixup* aNodeFixup,
-                      nsINode* aFixupNode, nsINode& aOriginalNode)
-      : mIsSerializationOfFixupChildrenNeeded{false},
-        mNodeFixup(aNodeFixup),
-        mOriginalNode(aOriginalNode) {
-    if (mNodeFixup) {
-      if (aFixupNode) {
-        mFixupNode = aFixupNode;
-      } else {
-        mNodeFixup->FixupNode(&mOriginalNode,
-                              &mIsSerializationOfFixupChildrenNeeded,
-                              getter_AddRefs(mFixupNode));
-      }
-    }
-  }
-
-  bool IsSerializationOfFixupChildrenNeeded() const {
-    return mIsSerializationOfFixupChildrenNeeded;
-  }
-
-  /**
-   * @return The fixup node, if available, otherwise the original node. The
-   * former is kept alive by this object.
-   */
-  nsINode& GetFixupNodeFallBackToOriginalNode() const {
-    return mFixupNode ? *mFixupNode : mOriginalNode;
-  }
-
- private:
-  bool mIsSerializationOfFixupChildrenNeeded;
-  nsIDocumentEncoderNodeFixup* mNodeFixup;
-  nsCOMPtr<nsINode> mFixupNode;
-  nsINode& mOriginalNode;
-};
-
-nsresult nsDocumentEncoder::NodeSerializer::SerializeNodeStart(
-    nsINode& aOriginalNode, int32_t aStartOffset, int32_t aEndOffset,
-    nsINode* aFixupNode) const {
-  if (mNeedsPreformatScanning) {
-    if (aOriginalNode.IsElement()) {
-      mSerializer->ScanElementForPreformat(aOriginalNode.AsElement());
-    } else if (aOriginalNode.IsText()) {
-      const nsCOMPtr<nsINode> parent = aOriginalNode.GetParent();
-      if (parent && parent->IsElement()) {
-        mSerializer->ScanElementForPreformat(parent->AsElement());
-      }
-    }
-  }
-
-  if (IsInvisibleNodeAndShouldBeSkipped(aOriginalNode, mFlags)) {
-    return NS_OK;
-  }
-
-  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, aFixupNode,
-                                          aOriginalNode};
-  nsINode* node = &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
-
-  nsresult rv = NS_OK;
-
-  if (node->IsElement()) {
-    if ((mFlags & (nsIDocumentEncoder::OutputPreformatted |
-                   nsIDocumentEncoder::OutputDropInvisibleBreak)) &&
-        nsLayoutUtils::IsInvisibleBreak(node)) {
-      return rv;
-    }
-    rv = mSerializer->AppendElementStart(node->AsElement(),
-                                         aOriginalNode.AsElement());
-    return rv;
-  }
-
-  switch (node->NodeType()) {
-    case nsINode::TEXT_NODE: {
-      rv = mSerializer->AppendText(static_cast<nsIContent*>(node), aStartOffset,
-                                   aEndOffset);
-      break;
-    }
-    case nsINode::CDATA_SECTION_NODE: {
-      rv = mSerializer->AppendCDATASection(static_cast<nsIContent*>(node),
-                                           aStartOffset, aEndOffset);
-      break;
-    }
-    case nsINode::PROCESSING_INSTRUCTION_NODE: {
-      rv = mSerializer->AppendProcessingInstruction(
-          static_cast<ProcessingInstruction*>(node), aStartOffset, aEndOffset);
-      break;
-    }
-    case nsINode::COMMENT_NODE: {
-      rv = mSerializer->AppendComment(static_cast<Comment*>(node), aStartOffset,
-                                      aEndOffset);
-      break;
-    }
-    case nsINode::DOCUMENT_TYPE_NODE: {
-      rv = mSerializer->AppendDoctype(static_cast<DocumentType*>(node));
-      break;
-    }
-  }
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::NodeSerializer::SerializeNodeEnd(
-    nsINode& aOriginalNode, nsINode* aFixupNode) const {
-  if (mNeedsPreformatScanning) {
-    if (aOriginalNode.IsElement()) {
-      mSerializer->ForgetElementForPreformat(aOriginalNode.AsElement());
-    } else if (aOriginalNode.IsText()) {
-      const nsCOMPtr<nsINode> parent = aOriginalNode.GetParent();
-      if (parent && parent->IsElement()) {
-        mSerializer->ForgetElementForPreformat(parent->AsElement());
-      }
-    }
-  }
-
-  if (IsInvisibleNodeAndShouldBeSkipped(aOriginalNode, mFlags)) {
-    return NS_OK;
-  }
-
-  nsresult rv = NS_OK;
-
-  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, aFixupNode,
-                                          aOriginalNode};
-  nsINode* node = &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
-
-  if (node->IsElement()) {
-    rv = mSerializer->AppendElementEnd(node->AsElement(),
-                                       aOriginalNode.AsElement());
-  }
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::NodeSerializer::SerializeToStringRecursive(
-    nsINode* aNode, SerializeRoot aSerializeRoot, uint32_t aMaxLength) const {
-  uint32_t outputLength{0};
-  nsresult rv = mSerializer->GetOutputLength(outputLength);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (aMaxLength > 0 && outputLength >= aMaxLength) {
-    return NS_OK;
-  }
-
-  NS_ENSURE_TRUE(aNode, NS_ERROR_NULL_POINTER);
-
-  if (IsInvisibleNodeAndShouldBeSkipped(*aNode, mFlags)) {
-    return NS_OK;
-  }
-
-  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, nullptr, *aNode};
-  nsINode* maybeFixedNode =
-      &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
-
-  if (mFlags & SkipInvisibleContent) {
-    if (aNode->IsContent()) {
-      if (nsIFrame* frame = aNode->AsContent()->GetPrimaryFrame()) {
-        if (!frame->IsSelectable(nullptr)) {
-          aSerializeRoot = SerializeRoot::eNo;
-        }
-      }
-    }
-  }
-
-  if (aSerializeRoot == SerializeRoot::eYes) {
-    int32_t endOffset = -1;
-    if (aMaxLength > 0) {
-      MOZ_ASSERT(aMaxLength >= outputLength);
-      endOffset = aMaxLength - outputLength;
-    }
-    rv = SerializeNodeStart(*aNode, 0, endOffset, maybeFixedNode);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  nsINode* node = fixupNodeDeterminer.IsSerializationOfFixupChildrenNeeded()
-                      ? maybeFixedNode
-                      : aNode;
-
-  for (nsINode* child = node->GetFirstChildOfTemplateOrNode(); child;
-       child = child->GetNextSibling()) {
-    rv = SerializeToStringRecursive(child, SerializeRoot::eYes, aMaxLength);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  if (aSerializeRoot == SerializeRoot::eYes) {
-    rv = SerializeNodeEnd(*aNode, maybeFixedNode);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  if (mTextStreamer) {
-    rv = mTextStreamer->FlushIfStringLongEnough();
-  }
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::NodeSerializer::SerializeToStringIterative(
-    nsINode* aNode) const {
-  nsresult rv;
-
-  nsINode* node = aNode->GetFirstChildOfTemplateOrNode();
-  while (node) {
-    nsINode* current = node;
-    rv = SerializeNodeStart(*current, 0, -1, current);
-    NS_ENSURE_SUCCESS(rv, rv);
-    node = current->GetFirstChildOfTemplateOrNode();
-    while (!node && current && current != aNode) {
-      rv = SerializeNodeEnd(*current);
-      NS_ENSURE_SUCCESS(rv, rv);
-      // Check if we have siblings.
-      node = current->GetNextSibling();
-      if (!node) {
-        // Perhaps parent node has siblings.
-        current = current->GetParentNode();
-
-        // Handle template element. If the parent is a template's content,
-        // then adjust the parent to be the template element.
-        if (current && current != aNode && current->IsDocumentFragment()) {
-          nsIContent* host = current->AsDocumentFragment()->GetHost();
-          if (host && host->IsHTMLElement(nsGkAtoms::_template)) {
-            current = host;
-          }
-        }
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-static bool IsTextNode(nsINode* aNode) { return aNode && aNode->IsText(); }
-
-nsresult nsDocumentEncoder::NodeSerializer::SerializeTextNode(
-    nsINode& aNode, int32_t aStartOffset, int32_t aEndOffset) const {
-  MOZ_ASSERT(IsTextNode(&aNode));
-
-  nsresult rv = SerializeNodeStart(aNode, aStartOffset, aEndOffset);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = SerializeNodeEnd(aNode);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return rv;
-}
-
-nsDocumentEncoder::RangeSerializer::StartAndEndContent
-nsDocumentEncoder::RangeSerializer::GetStartAndEndContentForRecursionLevel(
-    const int32_t aDepth) const {
-  StartAndEndContent result;
-
-  const auto& inclusiveAncestorsOfStart =
-      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfStart;
-  const auto& inclusiveAncestorsOfEnd =
-      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfEnd;
-  int32_t start = mStartRootIndex - aDepth;
-  if (start >= 0 && (uint32_t)start <= inclusiveAncestorsOfStart.Length()) {
-    result.mStart = inclusiveAncestorsOfStart[start];
-  }
-
-  int32_t end = mEndRootIndex - aDepth;
-  if (end >= 0 && (uint32_t)end <= inclusiveAncestorsOfEnd.Length()) {
-    result.mEnd = inclusiveAncestorsOfEnd[end];
-  }
-
-  return result;
-}
-
-nsresult nsDocumentEncoder::RangeSerializer::SerializeTextNode(
-    nsINode& aNode, const nsIContent& aContent,
-    const StartAndEndContent& aStartAndEndContent,
-    const nsRange& aRange) const {
-  const int32_t startOffset =
-      (aStartAndEndContent.mStart == &aContent) ? aRange.StartOffset() : 0;
-  const int32_t endOffset =
-      (aStartAndEndContent.mEnd == &aContent) ? aRange.EndOffset() : -1;
-  return mNodeSerializer.SerializeTextNode(aNode, startOffset, endOffset);
-}
-
-nsresult nsDocumentEncoder::RangeSerializer::SerializeRangeNodes(
-    const nsRange* const aRange, nsINode* const aNode, const int32_t aDepth) {
-  MOZ_ASSERT(aDepth >= 0);
-  MOZ_ASSERT(aRange);
-
-  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aNode);
-  NS_ENSURE_TRUE(content, NS_ERROR_FAILURE);
-
-  if (nsDocumentEncoder::IsInvisibleNodeAndShouldBeSkipped(*aNode, mFlags)) {
-    return NS_OK;
-  }
-
-  nsresult rv = NS_OK;
-
-  StartAndEndContent startAndEndContent =
-      GetStartAndEndContentForRecursionLevel(aDepth);
-
-  if (startAndEndContent.mStart != content &&
-      startAndEndContent.mEnd != content) {
-    // node is completely contained in range.  Serialize the whole subtree
-    // rooted by this node.
-    rv = mNodeSerializer.SerializeToStringRecursive(
-        aNode, NodeSerializer::SerializeRoot::eYes);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    rv = SerializeNodePartiallyContainedInRange(
-        *aNode, *content, startAndEndContent, *aRange, aDepth);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-  return NS_OK;
-}
-
-nsresult
-nsDocumentEncoder::RangeSerializer::SerializeNodePartiallyContainedInRange(
-    nsINode& aNode, nsIContent& aContent,
-    const StartAndEndContent& aStartAndEndContent, const nsRange& aRange,
-    const int32_t aDepth) {
-  // due to implementation it is impossible for text node to be both start and
-  // end of range.  We would have handled that case without getting here.
-  // XXXsmaug What does this all mean?
-  if (IsTextNode(&aNode)) {
-    nsresult rv =
-        SerializeTextNode(aNode, aContent, aStartAndEndContent, aRange);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    if (&aNode != mClosestCommonInclusiveAncestorOfRange) {
-      if (mRangeContextSerializer.mRangeNodeContext.IncludeInContext(aNode)) {
-        // halt the incrementing of mContextInfoDepth.  This
-        // is so paste client will include this node in paste.
-        mHaltRangeHint = true;
-      }
-      if ((aStartAndEndContent.mStart == &aContent) && !mHaltRangeHint) {
-        ++mContextInfoDepth.mStart;
-      }
-      if ((aStartAndEndContent.mEnd == &aContent) && !mHaltRangeHint) {
-        ++mContextInfoDepth.mEnd;
-      }
-
-      // serialize the start of this node
-      nsresult rv = mNodeSerializer.SerializeNodeStart(aNode, 0, -1);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    const auto& inclusiveAncestorsOffsetsOfStart =
-        mRangeBoundariesInclusiveAncestorsAndOffsets
-            .mInclusiveAncestorsOffsetsOfStart;
-    const auto& inclusiveAncestorsOffsetsOfEnd =
-        mRangeBoundariesInclusiveAncestorsAndOffsets
-            .mInclusiveAncestorsOffsetsOfEnd;
-    // do some calculations that will tell us which children of this
-    // node are in the range.
-    int32_t startOffset = 0, endOffset = -1;
-    if (aStartAndEndContent.mStart == &aContent && mStartRootIndex >= aDepth) {
-      startOffset = inclusiveAncestorsOffsetsOfStart[mStartRootIndex - aDepth];
-    }
-    if (aStartAndEndContent.mEnd == &aContent && mEndRootIndex >= aDepth) {
-      endOffset = inclusiveAncestorsOffsetsOfEnd[mEndRootIndex - aDepth];
-    }
-    // generated aContent will cause offset values of -1 to be returned.
-    uint32_t childCount = aContent.GetChildCount();
-
-    if (startOffset == -1) startOffset = 0;
-    if (endOffset == -1)
-      endOffset = childCount;
-    else {
-      // if we are at the "tip" of the selection, endOffset is fine.
-      // otherwise, we need to add one.  This is because of the semantics
-      // of the offset list created by GetInclusiveAncestorsAndOffsets().  The
-      // intermediate points on the list use the endOffset of the
-      // location of the ancestor, rather than just past it.  So we need
-      // to add one here in order to include it in the children we serialize.
-      if (&aNode != aRange.GetEndContainer()) {
-        endOffset++;
-      }
-    }
-
-    if (endOffset) {
-      nsresult rv = SerializeChildrenOfContent(aContent, startOffset, endOffset,
-                                               &aRange, aDepth);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-    // serialize the end of this node
-    if (&aNode != mClosestCommonInclusiveAncestorOfRange) {
-      nsresult rv = mNodeSerializer.SerializeNodeEnd(aNode);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
-    nsIContent& aContent, int32_t aStartOffset, int32_t aEndOffset,
-    const nsRange* aRange, int32_t aDepth) {
-  // serialize the children of this node that are in the range
-  nsIContent* childAsNode = aContent.GetFirstChild();
-  int32_t j = 0;
-
-  for (; j < aStartOffset && childAsNode; ++j) {
-    childAsNode = childAsNode->GetNextSibling();
-  }
-
-  MOZ_ASSERT(j == aStartOffset);
-
-  for (; childAsNode && j < aEndOffset; ++j) {
-    nsresult rv{NS_OK};
-    if ((j == aStartOffset) || (j == aEndOffset - 1)) {
-      rv = SerializeRangeNodes(aRange, childAsNode, aDepth + 1);
-    } else {
-      rv = mNodeSerializer.SerializeToStringRecursive(
-          childAsNode, NodeSerializer::SerializeRoot::eYes);
-    }
-
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    childAsNode = childAsNode->GetNextSibling();
-  }
-
-  return NS_OK;
-}
-
-nsresult nsDocumentEncoder::RangeContextSerializer::SerializeRangeContextStart(
-    const nsTArray<nsINode*>& aAncestorArray) {
-  if (mDisableContextSerialize) {
-    return NS_OK;
-  }
-
-  AutoTArray<nsINode*, 8>* serializedContext = mRangeContexts.AppendElement();
-
-  int32_t i = aAncestorArray.Length(), j;
-  nsresult rv = NS_OK;
-
-  // currently only for table-related elements; see Bug 137450
-  j = mRangeNodeContext.GetImmediateContextCount(aAncestorArray);
-
-  while (i > 0) {
-    nsINode* node = aAncestorArray.ElementAt(--i);
-    if (!node) break;
-
-    // Either a general inclusion or as immediate context
-    if (mRangeNodeContext.IncludeInContext(*node) || i < j) {
-      rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
-      serializedContext->AppendElement(node);
-      if (NS_FAILED(rv)) break;
-    }
-  }
-
-  return rv;
-}
-
-nsresult nsDocumentEncoder::RangeContextSerializer::SerializeRangeContextEnd() {
-  if (mDisableContextSerialize) {
-    return NS_OK;
-  }
-
-  MOZ_RELEASE_ASSERT(!mRangeContexts.IsEmpty(),
-                     "Tried to end context without starting one.");
-  AutoTArray<nsINode*, 8>& serializedContext = mRangeContexts.LastElement();
-
-  nsresult rv = NS_OK;
-  for (nsINode* node : Reversed(serializedContext)) {
-    rv = mNodeSerializer.SerializeNodeEnd(*node);
-
-    if (NS_FAILED(rv)) break;
-  }
-
-  mRangeContexts.RemoveLastElement();
-  return rv;
-}
-
-bool nsDocumentEncoder::RangeSerializer::HasInvisibleParentAndShouldBeSkipped(
-    nsINode& aNode) const {
-  if (!(mFlags & SkipInvisibleContent)) {
-    return false;
-  }
-
-  // Check that the parent is visible if we don't a frame.
-  // IsInvisibleNodeAndShouldBeSkipped() will do it when there's a frame.
-  nsCOMPtr<nsIContent> content = nsIContent::FromNode(aNode);
-  if (content && !content->GetPrimaryFrame()) {
-    nsIContent* parent = content->GetParent();
-    return !parent || IsInvisibleNodeAndShouldBeSkipped(*parent, mFlags);
-  }
-
-  return false;
-}
-
-nsresult nsDocumentEncoder::RangeSerializer::SerializeRangeToString(
-    const nsRange* aRange) {
-  if (!aRange || aRange->Collapsed()) return NS_OK;
-
-  mClosestCommonInclusiveAncestorOfRange =
-      aRange->GetClosestCommonInclusiveAncestor();
-
-  if (!mClosestCommonInclusiveAncestorOfRange) {
-    return NS_OK;
-  }
-
-  nsINode* startContainer = aRange->GetStartContainer();
-  NS_ENSURE_TRUE(startContainer, NS_ERROR_FAILURE);
-  int32_t startOffset = aRange->StartOffset();
-
-  nsINode* endContainer = aRange->GetEndContainer();
-  NS_ENSURE_TRUE(endContainer, NS_ERROR_FAILURE);
-  int32_t endOffset = aRange->EndOffset();
-
-  mContextInfoDepth = {};
-  mCommonInclusiveAncestors.Clear();
-
-  mRangeBoundariesInclusiveAncestorsAndOffsets = {};
-  auto& inclusiveAncestorsOfStart =
-      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfStart;
-  auto& inclusiveAncestorsOffsetsOfStart =
-      mRangeBoundariesInclusiveAncestorsAndOffsets
-          .mInclusiveAncestorsOffsetsOfStart;
-  auto& inclusiveAncestorsOfEnd =
-      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfEnd;
-  auto& inclusiveAncestorsOffsetsOfEnd =
-      mRangeBoundariesInclusiveAncestorsAndOffsets
-          .mInclusiveAncestorsOffsetsOfEnd;
-
-  nsContentUtils::GetInclusiveAncestors(mClosestCommonInclusiveAncestorOfRange,
-                                        mCommonInclusiveAncestors);
-  nsContentUtils::GetInclusiveAncestorsAndOffsets(
-      startContainer, startOffset, &inclusiveAncestorsOfStart,
-      &inclusiveAncestorsOffsetsOfStart);
-  nsContentUtils::GetInclusiveAncestorsAndOffsets(
-      endContainer, endOffset, &inclusiveAncestorsOfEnd,
-      &inclusiveAncestorsOffsetsOfEnd);
-
-  nsCOMPtr<nsIContent> commonContent =
-      nsIContent::FromNodeOrNull(mClosestCommonInclusiveAncestorOfRange);
-  mStartRootIndex = inclusiveAncestorsOfStart.IndexOf(commonContent);
-  mEndRootIndex = inclusiveAncestorsOfEnd.IndexOf(commonContent);
-
-  nsresult rv = NS_OK;
-
-  rv = mRangeContextSerializer.SerializeRangeContextStart(
-      mCommonInclusiveAncestors);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (startContainer == endContainer && IsTextNode(startContainer)) {
-    if (HasInvisibleParentAndShouldBeSkipped(*startContainer)) {
-      return NS_OK;
-    }
-    rv = mNodeSerializer.SerializeTextNode(*startContainer, startOffset,
-                                           endOffset);
-    NS_ENSURE_SUCCESS(rv, rv);
-  } else {
-    rv = SerializeRangeNodes(aRange, mClosestCommonInclusiveAncestorOfRange, 0);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  rv = mRangeContextSerializer.SerializeRangeContextEnd();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return rv;
-}
-
-void nsDocumentEncoder::ReleaseDocumentReferenceAndInitialize(
-    bool aClearCachedSerializer) {
-  mDocument = nullptr;
-
-  Initialize(aClearCachedSerializer);
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::EncodeToString(nsAString& aOutputString) {
-  return EncodeToStringWithMaxLength(0, aOutputString);
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
-                                               nsAString& aOutputString) {
-  MOZ_ASSERT(mRangeContextSerializer.mRangeContexts.IsEmpty(),
-             "Re-entrant call to nsDocumentEncoder.");
-  auto rangeContextGuard =
-      MakeScopeExit([&] { mRangeContextSerializer.mRangeContexts.Clear(); });
-
-  if (!mDocument) return NS_ERROR_NOT_INITIALIZED;
-
-  AutoReleaseDocumentIfNeeded autoReleaseDocument(this);
-
-  aOutputString.Truncate();
-
-  nsString output;
-  static const size_t kStringBufferSizeInBytes = 2048;
-  if (!mCachedBuffer) {
-    mCachedBuffer = nsStringBuffer::Alloc(kStringBufferSizeInBytes).take();
-    if (NS_WARN_IF(!mCachedBuffer)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  NS_ASSERTION(
-      !mCachedBuffer->IsReadonly(),
-      "nsIDocumentEncoder shouldn't keep reference to non-readonly buffer!");
-  static_cast<char16_t*>(mCachedBuffer->Data())[0] = char16_t(0);
-  mCachedBuffer->ToString(0, output, true);
-  // output owns the buffer now!
-  mCachedBuffer = nullptr;
-
-  if (!mSerializer) {
-    nsAutoCString progId(NS_CONTENTSERIALIZER_CONTRACTID_PREFIX);
-    AppendUTF16toUTF8(mMimeType, progId);
-
-    mSerializer = do_CreateInstance(progId.get());
-    NS_ENSURE_TRUE(mSerializer, NS_ERROR_NOT_IMPLEMENTED);
-  }
-
-  nsresult rv = NS_OK;
-
-  bool rewriteEncodingDeclaration =
-      !mEncodingScope.IsLimited() &&
-      !(mFlags & OutputDontRewriteEncodingDeclaration);
-  mSerializer->Init(mFlags, mWrapColumn, mEncoding, mIsCopying,
-                    rewriteEncodingDeclaration, &mNeedsPreformatScanning,
-                    output);
-
-  rv = SerializeDependingOnScope(aMaxLength);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = mSerializer->FlushAndFinish();
-
-  mCachedBuffer = nsStringBuffer::FromString(output);
-  // We have to be careful how we set aOutputString, because we don't
-  // want it to end up sharing mCachedBuffer if we plan to reuse it.
-  bool setOutput = false;
-  // Try to cache the buffer.
-  if (mCachedBuffer) {
-    if ((mCachedBuffer->StorageSize() == kStringBufferSizeInBytes) &&
-        !mCachedBuffer->IsReadonly()) {
-      mCachedBuffer->AddRef();
-    } else {
-      if (NS_SUCCEEDED(rv)) {
-        mCachedBuffer->ToString(output.Length(), aOutputString);
-        setOutput = true;
-      }
-      mCachedBuffer = nullptr;
-    }
-  }
-
-  if (!setOutput && NS_SUCCEEDED(rv)) {
-    aOutputString.Append(output.get(), output.Length());
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::EncodeToStream(nsIOutputStream* aStream) {
-  MOZ_ASSERT(mRangeContextSerializer.mRangeContexts.IsEmpty(),
-             "Re-entrant call to nsDocumentEncoder.");
-  auto rangeContextGuard =
-      MakeScopeExit([&] { mRangeContextSerializer.mRangeContexts.Clear(); });
-  NS_ENSURE_ARG_POINTER(aStream);
-
-  nsresult rv = NS_OK;
-
-  if (!mDocument) return NS_ERROR_NOT_INITIALIZED;
-
-  if (!mEncoding) {
-    return NS_ERROR_UCONV_NOCONV;
-  }
-
-  nsAutoString buf;
-  const bool isPlainText = mMimeType.LowerCaseEqualsLiteral(kTextMime);
-  mTextStreamer.emplace(*aStream, mEncoding->NewEncoder(), isPlainText, buf);
-
-  rv = EncodeToString(buf);
-
-  // Force a flush of the last chunk of data.
-  rv = mTextStreamer->ForceFlush();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mTextStreamer.reset();
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::EncodeToStringWithContext(nsAString& aContextString,
-                                             nsAString& aInfoString,
-                                             nsAString& aEncodedString) {
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDocumentEncoder::SetNodeFixup(nsIDocumentEncoderNodeFixup* aFixup) {
-  mNodeFixup = aFixup;
-  return NS_OK;
-}
-
-bool do_getDocumentTypeSupportedForEncoding(const char* aContentType) {
-  if (!nsCRT::strcmp(aContentType, "text/xml") ||
-      !nsCRT::strcmp(aContentType, "application/xml") ||
-      !nsCRT::strcmp(aContentType, "application/xhtml+xml") ||
-      !nsCRT::strcmp(aContentType, "image/svg+xml") ||
-      !nsCRT::strcmp(aContentType, "text/html") ||
-      !nsCRT::strcmp(aContentType, "text/plain")) {
-    return true;
-  }
-  return false;
-}
-
-already_AddRefed<nsIDocumentEncoder> do_createDocumentEncoder(
-    const char* aContentType) {
-  if (do_getDocumentTypeSupportedForEncoding(aContentType)) {
-    return do_AddRef(new nsDocumentEncoder);
-  }
-  return nullptr;
-}
-
-class nsHTMLCopyEncoder : public nsDocumentEncoder {
- private:
-  class RangeNodeContext final : public nsDocumentEncoder::RangeNodeContext {
-    bool IncludeInContext(nsINode& aNode) const final;
-
-    int32_t GetImmediateContextCount(
-        const nsTArray<nsINode*>& aAncestorArray) const final;
-  };
-
- public:
-  nsHTMLCopyEncoder();
-  ~nsHTMLCopyEncoder();
-
-  NS_IMETHOD Init(Document* aDocument, const nsAString& aMimeType,
-                  uint32_t aFlags) override;
-
-  // overridden methods from nsDocumentEncoder
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  NS_IMETHOD SetSelection(Selection* aSelection) override;
-  NS_IMETHOD EncodeToStringWithContext(nsAString& aContextString,
-                                       nsAString& aInfoString,
-                                       nsAString& aEncodedString) override;
-  NS_IMETHOD EncodeToString(nsAString& aOutputString) override;
-
- protected:
-  enum Endpoint { kStart, kEnd };
-
-  nsresult PromoteRange(nsRange* inRange);
-  nsresult PromoteAncestorChain(nsCOMPtr<nsINode>* ioNode,
-                                int32_t* ioStartOffset, int32_t* ioEndOffset);
-  nsresult GetPromotedPoint(Endpoint aWhere, nsINode* aNode, int32_t aOffset,
-                            nsCOMPtr<nsINode>* outNode, int32_t* outOffset,
-                            nsINode* aCommon);
-  static nsCOMPtr<nsINode> GetChildAt(nsINode* aParent, int32_t aOffset);
-  static bool IsMozBR(Element* aNode);
-  static nsresult GetNodeLocation(nsINode* inChild,
-                                  nsCOMPtr<nsINode>* outParent,
-                                  int32_t* outOffset);
-  bool IsRoot(nsINode* aNode);
-  static bool IsFirstNode(nsINode* aNode);
-  static bool IsLastNode(nsINode* aNode);
-
-  bool mIsTextWidget;
-};
-
-nsHTMLCopyEncoder::nsHTMLCopyEncoder()
-    : nsDocumentEncoder{MakeUnique<nsHTMLCopyEncoder::RangeNodeContext>()} {
-  mIsTextWidget = false;
-}
-
-nsHTMLCopyEncoder::~nsHTMLCopyEncoder() = default;
-
-NS_IMETHODIMP
-nsHTMLCopyEncoder::Init(Document* aDocument, const nsAString& aMimeType,
-                        uint32_t aFlags) {
-  if (!aDocument) return NS_ERROR_INVALID_ARG;
-
-  mIsTextWidget = false;
-  Initialize();
-
-  mIsCopying = true;
-  mDocument = aDocument;
-
-  // Hack, hack! Traditionally, the caller passes text/unicode, which is
-  // treated as "guess text/html or text/plain" in this context. (It has a
-  // different meaning in other contexts. Sigh.) From now on, "text/plain"
-  // means forcing text/plain instead of guessing.
-  if (aMimeType.EqualsLiteral("text/plain")) {
-    mMimeType.AssignLiteral("text/plain");
-  } else {
-    mMimeType.AssignLiteral("text/html");
-  }
-
-  // Make all links absolute when copying
-  // (see related bugs #57296, #41924, #58646, #32768)
-  mFlags = aFlags | OutputAbsoluteLinks;
-
-  if (!mDocument->IsScriptEnabled()) mFlags |= OutputNoScriptContent;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLCopyEncoder::SetSelection(Selection* aSelection) {
-  // check for text widgets: we need to recognize these so that
-  // we don't tweak the selection to be outside of the magic
-  // div that ender-lite text widgets are embedded in.
-
-  if (!aSelection) return NS_ERROR_NULL_POINTER;
-
-  uint32_t rangeCount = aSelection->RangeCount();
-
-  // if selection is uninitialized return
-  if (!rangeCount) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // we'll just use the common parent of the first range.  Implicit assumption
-  // here that multi-range selections are table cell selections, in which case
-  // the common parent is somewhere in the table and we don't really care where.
-  //
-  // FIXME(emilio, bug 1455894): This assumption is already wrong, and will
-  // probably be more wrong in a Shadow DOM world...
-  //
-  // We should be able to write this as "Find the common ancestor of the
-  // selection, then go through the flattened tree and serialize the selected
-  // nodes", effectively serializing the composed tree.
-  RefPtr<nsRange> range = aSelection->GetRangeAt(0);
-  nsINode* commonParent = range->GetClosestCommonInclusiveAncestor();
-
-  for (nsCOMPtr<nsIContent> selContent(
-           nsIContent::FromNodeOrNull(commonParent));
-       selContent; selContent = selContent->GetParent()) {
-    // checking for selection inside a plaintext form widget
-    if (selContent->IsAnyOfHTMLElements(nsGkAtoms::input,
-                                        nsGkAtoms::textarea)) {
-      mIsTextWidget = true;
-      break;
-    }
-  }
-
-  // normalize selection if we are not in a widget
-  if (mIsTextWidget) {
-    mEncodingScope.mSelection = aSelection;
-    mMimeType.AssignLiteral("text/plain");
-    return NS_OK;
-  }
-
-  // XXX We should try to get rid of the Selection object here.
-  // XXX bug 1245883
-
-  // also consider ourselves in a text widget if we can't find an html document
-  if (!(mDocument && mDocument->IsHTMLDocument())) {
-    mIsTextWidget = true;
-    mEncodingScope.mSelection = aSelection;
-    // mMimeType is set to text/plain when encoding starts.
-    return NS_OK;
-  }
-
-  // there's no Clone() for selection! fix...
-  // nsresult rv = aSelection->Clone(getter_AddRefs(mSelection);
-  // NS_ENSURE_SUCCESS(rv, rv);
-  mEncodingScope.mSelection = new Selection(SelectionType::eNormal, nullptr);
-
-  // loop thru the ranges in the selection
-  for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
-    range = aSelection->GetRangeAt(rangeIdx);
-    NS_ENSURE_TRUE(range, NS_ERROR_FAILURE);
-    RefPtr<nsRange> myRange = range->CloneRange();
-    MOZ_ASSERT(myRange);
-
-    // adjust range to include any ancestors who's children are entirely
-    // selected
-    nsresult rv = PromoteRange(myRange);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    ErrorResult result;
-    RefPtr<Selection> selection(mEncodingScope.mSelection);
-    RefPtr<Document> document(mDocument);
-    selection->AddRangeAndSelectFramesAndNotifyListeners(*myRange, document,
-                                                         result);
-    rv = result.StealNSResult();
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLCopyEncoder::EncodeToString(nsAString& aOutputString) {
-  if (mIsTextWidget) {
-    mMimeType.AssignLiteral("text/plain");
-  }
-  return nsDocumentEncoder::EncodeToString(aOutputString);
-}
-
-NS_IMETHODIMP
-nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString,
-                                             nsAString& aInfoString,
-                                             nsAString& aEncodedString) {
-  nsresult rv = EncodeToString(aEncodedString);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // do not encode any context info or range hints if we are in a text widget.
-  if (mIsTextWidget) return NS_OK;
-
-  // now encode common ancestors into aContextString.  Note that the common
-  // ancestors will be for the last range in the selection in the case of
-  // multirange selections. encoding ancestors every range in a multirange
-  // selection in a way that could be understood by the paste code would be a
-  // lot more work to do.  As a practical matter, selections are single range,
-  // and the ones that aren't are table cell selections where all the cells are
-  // in the same table.
-
-  mSerializer->Init(mFlags, mWrapColumn, mEncoding, mIsCopying, false,
-                    &mNeedsPreformatScanning, aContextString);
-
-  // leaf of ancestors might be text node.  If so discard it.
-  int32_t count = mRangeSerializer.mCommonInclusiveAncestors.Length();
-  int32_t i;
-  nsCOMPtr<nsINode> node;
-  if (count > 0) {
-    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(0);
-  }
-
-  if (node && IsTextNode(node)) {
-    mRangeSerializer.mCommonInclusiveAncestors.RemoveElementAt(0);
-    if (mRangeSerializer.mContextInfoDepth.mStart) {
-      --mRangeSerializer.mContextInfoDepth.mStart;
-    }
-    if (mRangeSerializer.mContextInfoDepth.mEnd) {
-      --mRangeSerializer.mContextInfoDepth.mEnd;
-    }
-    count--;
-  }
-
-  i = count;
-  while (i > 0) {
-    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(--i);
-    rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  // i = 0; guaranteed by above
-  while (i < count) {
-    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(i++);
-    rv = mNodeSerializer.SerializeNodeEnd(*node);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  mSerializer->Finish();
-
-  // encode range info : the start and end depth of the selection, where the
-  // depth is distance down in the parent hierarchy.  Later we will need to add
-  // leading/trailing whitespace info to this.
-  nsAutoString infoString;
-  infoString.AppendInt(mRangeSerializer.mContextInfoDepth.mStart);
-  infoString.Append(char16_t(','));
-  infoString.AppendInt(mRangeSerializer.mContextInfoDepth.mEnd);
-  aInfoString = infoString;
-
-  return rv;
-}
-
-bool nsHTMLCopyEncoder::RangeNodeContext::IncludeInContext(
-    nsINode& aNode) const {
-  nsCOMPtr<nsIContent> content(nsIContent::FromNodeOrNull(&aNode));
-
-  if (!content) return false;
-
-  return content->IsAnyOfHTMLElements(
-      nsGkAtoms::b, nsGkAtoms::i, nsGkAtoms::u, nsGkAtoms::a, nsGkAtoms::tt,
-      nsGkAtoms::s, nsGkAtoms::big, nsGkAtoms::small, nsGkAtoms::strike,
-      nsGkAtoms::em, nsGkAtoms::strong, nsGkAtoms::dfn, nsGkAtoms::code,
-      nsGkAtoms::cite, nsGkAtoms::var, nsGkAtoms::abbr, nsGkAtoms::font,
-      nsGkAtoms::script, nsGkAtoms::span, nsGkAtoms::pre, nsGkAtoms::h1,
-      nsGkAtoms::h2, nsGkAtoms::h3, nsGkAtoms::h4, nsGkAtoms::h5,
-      nsGkAtoms::h6);
-}
-
-nsresult nsHTMLCopyEncoder::PromoteRange(nsRange* inRange) {
-  if (!inRange->IsPositioned()) {
-    return NS_ERROR_UNEXPECTED;
-  }
-  nsCOMPtr<nsINode> startNode = inRange->GetStartContainer();
-  uint32_t startOffset = inRange->StartOffset();
-  nsCOMPtr<nsINode> endNode = inRange->GetEndContainer();
-  uint32_t endOffset = inRange->EndOffset();
-  nsCOMPtr<nsINode> common = inRange->GetClosestCommonInclusiveAncestor();
-
-  nsCOMPtr<nsINode> opStartNode;
-  nsCOMPtr<nsINode> opEndNode;
-  int32_t opStartOffset, opEndOffset;
-
-  // examine range endpoints.
-  nsresult rv =
-      GetPromotedPoint(kStart, startNode, static_cast<int32_t>(startOffset),
-                       address_of(opStartNode), &opStartOffset, common);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = GetPromotedPoint(kEnd, endNode, static_cast<int32_t>(endOffset),
-                        address_of(opEndNode), &opEndOffset, common);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // if both range endpoints are at the common ancestor, check for possible
-  // inclusion of ancestors
-  if (opStartNode == common && opEndNode == common) {
-    rv = PromoteAncestorChain(address_of(opStartNode), &opStartOffset,
-                              &opEndOffset);
-    NS_ENSURE_SUCCESS(rv, rv);
-    opEndNode = opStartNode;
-  }
-
-  // set the range to the new values
-  ErrorResult err;
-  inRange->SetStart(*opStartNode, static_cast<uint32_t>(opStartOffset), err);
-  if (NS_WARN_IF(err.Failed())) {
-    return err.StealNSResult();
-  }
-  inRange->SetEnd(*opEndNode, static_cast<uint32_t>(opEndOffset), err);
-  if (NS_WARN_IF(err.Failed())) {
-    return err.StealNSResult();
-  }
-  return NS_OK;
-}
-
-// PromoteAncestorChain will promote a range represented by
-// [{*ioNode,*ioStartOffset} , {*ioNode,*ioEndOffset}] The promotion is
-// different from that found in getPromotedPoint: it will only promote one
-// endpoint if it can promote the other.  Thus, instead of having a
-// startnode/endNode, there is just the one ioNode.
-nsresult nsHTMLCopyEncoder::PromoteAncestorChain(nsCOMPtr<nsINode>* ioNode,
-                                                 int32_t* ioStartOffset,
-                                                 int32_t* ioEndOffset) {
-  if (!ioNode || !ioStartOffset || !ioEndOffset) return NS_ERROR_NULL_POINTER;
-
-  nsresult rv = NS_OK;
-  bool done = false;
-
-  nsCOMPtr<nsINode> frontNode, endNode, parent;
-  int32_t frontOffset, endOffset;
-
-  // save the editable state of the ioNode, so we don't promote an ancestor if
-  // it has different editable state
-  nsCOMPtr<nsINode> node = *ioNode;
-  bool isEditable = node->IsEditable();
-
-  // loop for as long as we can promote both endpoints
-  while (!done) {
-    node = *ioNode;
-    parent = node->GetParentNode();
-    if (!parent) {
-      done = true;
-    } else {
-      // passing parent as last param to GetPromotedPoint() allows it to promote
-      // only one level up the hierarchy.
-      rv = GetPromotedPoint(kStart, *ioNode, *ioStartOffset,
-                            address_of(frontNode), &frontOffset, parent);
-      NS_ENSURE_SUCCESS(rv, rv);
-      // then we make the same attempt with the endpoint
-      rv = GetPromotedPoint(kEnd, *ioNode, *ioEndOffset, address_of(endNode),
-                            &endOffset, parent);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      // if both endpoints were promoted one level and isEditable is the same as
-      // the original node, keep looping - otherwise we are done.
-      if ((frontNode != parent) || (endNode != parent) ||
-          (frontNode->IsEditable() != isEditable))
-        done = true;
-      else {
-        *ioNode = frontNode;
-        *ioStartOffset = frontOffset;
-        *ioEndOffset = endOffset;
-      }
-    }
-  }
-  return rv;
-}
-
-nsresult nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsINode* aNode,
-                                             int32_t aOffset,
-                                             nsCOMPtr<nsINode>* outNode,
-                                             int32_t* outOffset,
-                                             nsINode* common) {
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsINode> node = aNode;
-  nsCOMPtr<nsINode> parent = aNode;
-  int32_t offset = aOffset;
-  bool bResetPromotion = false;
-
-  // default values
-  *outNode = node;
-  *outOffset = offset;
-
-  if (common == node) return NS_OK;
-
-  if (aWhere == kStart) {
-    // some special casing for text nodes
-    if (auto nodeAsText = aNode->GetAsText()) {
-      // if not at beginning of text node, we are done
-      if (offset > 0) {
-        // unless everything before us in just whitespace.  NOTE: we need a more
-        // general solution that truly detects all cases of non-significant
-        // whitesace with no false alarms.
-        nsAutoString text;
-        nodeAsText->SubstringData(0, offset, text, IgnoreErrors());
-        text.CompressWhitespace();
-        if (!text.IsEmpty()) return NS_OK;
-        bResetPromotion = true;
-      }
-      // else
-      rv = GetNodeLocation(aNode, address_of(parent), &offset);
-      NS_ENSURE_SUCCESS(rv, rv);
-    } else {
-      node = GetChildAt(parent, offset);
-    }
-    if (!node) node = parent;
-
-    // finding the real start for this point.  look up the tree for as long as
-    // we are the first node in the container, and as long as we haven't hit the
-    // body node.
-    if (!IsRoot(node) && (parent != common)) {
-      rv = GetNodeLocation(node, address_of(parent), &offset);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (offset == -1) return NS_OK;  // we hit generated content; STOP
-      while ((IsFirstNode(node)) && (!IsRoot(parent)) && (parent != common)) {
-        if (bResetPromotion) {
-          nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(parent);
-          if (content && content->IsHTMLElement()) {
-            if (nsHTMLElement::IsBlock(
-                    nsHTMLTags::AtomTagToId(content->NodeInfo()->NameAtom()))) {
-              bResetPromotion = false;
-            }
-          }
-        }
-
-        node = parent;
-        rv = GetNodeLocation(node, address_of(parent), &offset);
-        NS_ENSURE_SUCCESS(rv, rv);
-        if (offset == -1)  // we hit generated content; STOP
-        {
-          // back up a bit
-          parent = node;
-          offset = 0;
-          break;
-        }
-      }
-      if (bResetPromotion) {
-        *outNode = aNode;
-        *outOffset = aOffset;
-      } else {
-        *outNode = parent;
-        *outOffset = offset;
-      }
-      return rv;
-    }
-  }
-
-  if (aWhere == kEnd) {
-    // some special casing for text nodes
-    if (auto nodeAsText = aNode->GetAsText()) {
-      // if not at end of text node, we are done
-      uint32_t len = aNode->Length();
-      if (offset < (int32_t)len) {
-        // unless everything after us in just whitespace.  NOTE: we need a more
-        // general solution that truly detects all cases of non-significant
-        // whitespace with no false alarms.
-        nsAutoString text;
-        nodeAsText->SubstringData(offset, len - offset, text, IgnoreErrors());
-        text.CompressWhitespace();
-        if (!text.IsEmpty()) return NS_OK;
-        bResetPromotion = true;
-      }
-      rv = GetNodeLocation(aNode, address_of(parent), &offset);
-      NS_ENSURE_SUCCESS(rv, rv);
-    } else {
-      if (offset) offset--;  // we want node _before_ offset
-      node = GetChildAt(parent, offset);
-    }
-    if (!node) node = parent;
-
-    // finding the real end for this point.  look up the tree for as long as we
-    // are the last node in the container, and as long as we haven't hit the
-    // body node.
-    if (!IsRoot(node) && (parent != common)) {
-      rv = GetNodeLocation(node, address_of(parent), &offset);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (offset == -1) return NS_OK;  // we hit generated content; STOP
-      while ((IsLastNode(node)) && (!IsRoot(parent)) && (parent != common)) {
-        if (bResetPromotion) {
-          nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(parent);
-          if (content && content->IsHTMLElement()) {
-            if (nsHTMLElement::IsBlock(
-                    nsHTMLTags::AtomTagToId(content->NodeInfo()->NameAtom()))) {
-              bResetPromotion = false;
-            }
-          }
-        }
-
-        node = parent;
-        rv = GetNodeLocation(node, address_of(parent), &offset);
-        NS_ENSURE_SUCCESS(rv, rv);
-        if (offset == -1)  // we hit generated content; STOP
-        {
-          // back up a bit
-          parent = node;
-          offset = 0;
-          break;
-        }
-      }
-      if (bResetPromotion) {
-        *outNode = aNode;
-        *outOffset = aOffset;
-      } else {
-        *outNode = parent;
-        offset++;  // add one since this in an endpoint - want to be AFTER node.
-        *outOffset = offset;
-      }
-      return rv;
-    }
-  }
-
-  return rv;
-}
-
-nsCOMPtr<nsINode> nsHTMLCopyEncoder::GetChildAt(nsINode* aParent,
-                                                int32_t aOffset) {
-  nsCOMPtr<nsINode> resultNode;
-
-  if (!aParent) return resultNode;
-
-  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aParent);
-  MOZ_ASSERT(content, "null content in nsHTMLCopyEncoder::GetChildAt");
-
-  resultNode = content->GetChildAt_Deprecated(aOffset);
-
-  return resultNode;
-}
-
-bool nsHTMLCopyEncoder::IsMozBR(Element* aElement) {
-  HTMLBRElement* brElement = HTMLBRElement::FromNodeOrNull(aElement);
-  return brElement && brElement->IsPaddingForEmptyLastLine();
-}
-
-nsresult nsHTMLCopyEncoder::GetNodeLocation(nsINode* inChild,
-                                            nsCOMPtr<nsINode>* outParent,
-                                            int32_t* outOffset) {
-  NS_ASSERTION((inChild && outParent && outOffset), "bad args");
-  if (inChild && outParent && outOffset) {
-    nsCOMPtr<nsIContent> child = nsIContent::FromNodeOrNull(inChild);
-    if (!child) {
-      return NS_ERROR_NULL_POINTER;
-    }
-
-    nsIContent* parent = child->GetParent();
-    if (!parent) {
-      return NS_ERROR_NULL_POINTER;
-    }
-
-    *outParent = parent;
-    *outOffset = parent->ComputeIndexOf(child);
-    return NS_OK;
-  }
-  return NS_ERROR_NULL_POINTER;
-}
-
-bool nsHTMLCopyEncoder::IsRoot(nsINode* aNode) {
-  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aNode);
-  if (!content) {
-    return false;
-  }
-
-  if (mIsTextWidget) {
-    return content->IsHTMLElement(nsGkAtoms::div);
-  }
-
-  return content->IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::td,
-                                      nsGkAtoms::th);
-}
-
-bool nsHTMLCopyEncoder::IsFirstNode(nsINode* aNode) {
-  // need to check if any nodes before us are really visible.
-  // Mike wrote something for me along these lines in nsSelectionController,
-  // but I don't think it's ready for use yet - revisit.
-  // HACK: for now, simply consider all whitespace text nodes to be
-  // invisible formatting nodes.
-  for (nsIContent* sibling = aNode->GetPreviousSibling(); sibling;
-       sibling = sibling->GetPreviousSibling()) {
-    if (!sibling->TextIsOnlyWhitespace()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool nsHTMLCopyEncoder::IsLastNode(nsINode* aNode) {
-  // need to check if any nodes after us are really visible.
-  // Mike wrote something for me along these lines in nsSelectionController,
-  // but I don't think it's ready for use yet - revisit.
-  // HACK: for now, simply consider all whitespace text nodes to be
-  // invisible formatting nodes.
-  for (nsIContent* sibling = aNode->GetNextSibling(); sibling;
-       sibling = sibling->GetNextSibling()) {
-    if (sibling->IsElement() && IsMozBR(sibling->AsElement())) {
-      // we ignore trailing moz BRs.
-      continue;
-    }
-    if (!sibling->TextIsOnlyWhitespace()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-already_AddRefed<nsIDocumentEncoder> do_createHTMLCopyEncoder() {
-  return do_AddRef(new nsHTMLCopyEncoder);
-}
-
-int32_t nsHTMLCopyEncoder::RangeNodeContext::GetImmediateContextCount(
-    const nsTArray<nsINode*>& aAncestorArray) const {
-  int32_t i = aAncestorArray.Length(), j = 0;
-  while (j < i) {
-    nsINode* node = aAncestorArray.ElementAt(j);
-    if (!node) {
-      break;
-    }
-    nsCOMPtr<nsIContent> content(nsIContent::FromNodeOrNull(node));
-    if (!content || !content->IsAnyOfHTMLElements(
-                        nsGkAtoms::tr, nsGkAtoms::thead, nsGkAtoms::tbody,
-                        nsGkAtoms::tfoot, nsGkAtoms::table)) {
-      break;
-    }
-    ++j;
-  }
-  return j;
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMAttributeMap.h firefox-85.0+build1/dom/base/nsDOMAttributeMap.h
--- firefox-84.0.2+build1/dom/base/nsDOMAttributeMap.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMAttributeMap.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,6 @@
 #define nsDOMAttributeMap_h
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
@@ -22,6 +21,8 @@
 class nsINode;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class Attr;
 class DocGroup;
@@ -172,9 +173,4 @@
   Attr* GetAttribute(mozilla::dom::NodeInfo* aNodeInfo);
 };
 
-// XXX khuey yes this is crazy.  The bindings code needs to see this include,
-// but if we pull it in at the top of the file we get a circular include
-// problem.
-#include "mozilla/dom/Element.h"
-
 #endif /* nsDOMAttributeMap_h */
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMDataChannel.cpp firefox-85.0+build1/dom/base/nsDOMDataChannel.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMDataChannel.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMDataChannel.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,15 +12,18 @@
 #include "nsDOMDataChannelDeclarations.h"
 #include "nsDOMDataChannel.h"
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/EventListenerManager.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/MessageEvent.h"
 #include "mozilla/dom/MessageEventBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/Blob.h"
 
 #include "nsError.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsIScriptContext.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsProxyRelease.h"
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMJSUtils.h firefox-85.0+build1/dom/base/nsDOMJSUtils.h
--- firefox-84.0.2+build1/dom/base/nsDOMJSUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMJSUtils.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,8 +7,8 @@
 #ifndef nsDOMJSUtils_h__
 #define nsDOMJSUtils_h__
 
-#include "nsIScriptContext.h"
-#include "jsapi.h"
+#include "js/TypeDecls.h"
+#include "nscore.h"
 
 class nsIJSArgArray;
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMMutationObserver.cpp firefox-85.0+build1/dom/base/nsDOMMutationObserver.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMMutationObserver.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMMutationObserver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsDOMMutationObserver.h"
 
 #include "mozilla/AnimationTarget.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/OwningNonNull.h"
 
@@ -71,6 +72,36 @@
          (Observer()->IsChrome() || !aContent->IsInNativeAnonymousSubtree());
 }
 
+bool nsMutationReceiverBase::ObservesAttr(nsINode* aRegisterTarget,
+                                          mozilla::dom::Element* aElement,
+                                          int32_t aNameSpaceID, nsAtom* aAttr) {
+  if (mParent) {
+    return mParent->ObservesAttr(aRegisterTarget, aElement, aNameSpaceID,
+                                 aAttr);
+  }
+  if (!Attributes() || (!Subtree() && aElement != Target()) ||
+      (Subtree() &&
+       aRegisterTarget->SubtreeRoot() != aElement->SubtreeRoot()) ||
+      !IsObservable(aElement)) {
+    return false;
+  }
+  if (AllAttributes()) {
+    return true;
+  }
+
+  if (aNameSpaceID != kNameSpaceID_None) {
+    return false;
+  }
+
+  nsTArray<RefPtr<nsAtom>>& filters = AttributeFilter();
+  for (size_t i = 0; i < filters.Length(); ++i) {
+    if (filters[i] == aAttr) {
+      return true;
+    }
+  }
+  return false;
+}
+
 NS_IMPL_ADDREF(nsMutationReceiver)
 NS_IMPL_RELEASE(nsMutationReceiver)
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMMutationObserver.h firefox-85.0+build1/dom/base/nsDOMMutationObserver.h
--- firefox-84.0.2+build1/dom/base/nsDOMMutationObserver.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMMutationObserver.h	2021-01-18 19:58:08.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/Animation.h"
 #include "mozilla/dom/Document.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/MutationObserverBinding.h"
 #include "mozilla/dom/Nullable.h"
@@ -34,6 +33,10 @@
 class nsDOMMutationObserver;
 using mozilla::dom::MutationObservingInfo;
 
+namespace mozilla::dom {
+class Element;
+}
+
 class nsDOMMutationRecord final : public nsISupports, public nsWrapperCache {
   virtual ~nsDOMMutationRecord() = default;
 
@@ -247,33 +250,7 @@
   bool IsObservable(nsIContent* aContent);
 
   bool ObservesAttr(nsINode* aRegisterTarget, mozilla::dom::Element* aElement,
-                    int32_t aNameSpaceID, nsAtom* aAttr) {
-    if (mParent) {
-      return mParent->ObservesAttr(aRegisterTarget, aElement, aNameSpaceID,
-                                   aAttr);
-    }
-    if (!Attributes() || (!Subtree() && aElement != Target()) ||
-        (Subtree() &&
-         aRegisterTarget->SubtreeRoot() != aElement->SubtreeRoot()) ||
-        !IsObservable(aElement)) {
-      return false;
-    }
-    if (AllAttributes()) {
-      return true;
-    }
-
-    if (aNameSpaceID != kNameSpaceID_None) {
-      return false;
-    }
-
-    nsTArray<RefPtr<nsAtom>>& filters = AttributeFilter();
-    for (size_t i = 0; i < filters.Length(); ++i) {
-      if (filters[i] == aAttr) {
-        return true;
-      }
-    }
-    return false;
-  }
+                    int32_t aNameSpaceID, nsAtom* aAttr);
 
   // The target for the MutationObserver.observe() method.
   nsINode* mTarget;
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMNavigationTiming.cpp firefox-85.0+build1/dom/base/nsDOMNavigationTiming.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMNavigationTiming.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMNavigationTiming.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/PerformanceNavigation.h"
 #include "mozilla/dom/WindowGlobalChild.h"
 #include "mozilla/ipc/IPDLParamTraits.h"
@@ -25,7 +26,7 @@
 #include "nsPrintfCString.h"
 #include "prtime.h"
 #ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
+#  include "mozilla/ProfilerMarkerTypes.h"
 #endif
 
 using namespace mozilla;
@@ -116,14 +117,18 @@
 
 void nsDOMNavigationTiming::NotifyUnloadEventStart() {
   mUnloadStart = TimeStamp::Now();
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "Unload", NETWORK,
-                                   TRACING_INTERVAL_START, mDocShell);
+  PROFILER_MARKER("Unload", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalStart(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 }
 
 void nsDOMNavigationTiming::NotifyUnloadEventEnd() {
   mUnloadEnd = TimeStamp::Now();
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "Unload", NETWORK,
-                                   TRACING_INTERVAL_END, mDocShell);
+  PROFILER_MARKER("Unload", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalEnd(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 }
 
 void nsDOMNavigationTiming::NotifyLoadEventStart() {
@@ -132,8 +137,10 @@
   }
   mLoadEventStart = TimeStamp::Now();
 
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "Load", NETWORK,
-                                   TRACING_INTERVAL_START, mDocShell);
+  PROFILER_MARKER("Load", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalStart(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 
   if (IsTopLevelContentDocumentInContentProcess()) {
     mLoadEventStartForTelemetry = TimeStamp::Now();
@@ -163,8 +170,10 @@
   }
   mLoadEventEnd = TimeStamp::Now();
 
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "Load", NETWORK,
-                                   TRACING_INTERVAL_END, mDocShell);
+  PROFILER_MARKER("Load", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalEnd(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 
   if (IsTopLevelContentDocumentInContentProcess()) {
 #ifdef MOZ_GECKO_PROFILER
@@ -179,10 +188,13 @@
           "Document %s loaded after %dms, load event duration %dms", spec.get(),
           int(elapsed.ToMilliseconds()), int(duration.ToMilliseconds()));
       PAGELOAD_LOG(("%s", marker.get()));
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          "DocumentLoad", DOM, TextMarkerPayload,
-          (marker, mNavigationStart, mLoadEventEnd,
-           profiler_get_inner_window_id_from_docshell(mDocShell)));
+      PROFILER_MARKER_TEXT(
+          "DocumentLoad", DOM,
+          MarkerOptions(
+              MarkerTiming::Interval(mNavigationStart, mLoadEventEnd),
+              MarkerInnerWindowId(
+                  profiler_get_inner_window_id_from_docshell(mDocShell))),
+          marker);
     }
 #endif
     TimeStamp loadEventEnd = TimeStamp::Now();
@@ -241,8 +253,10 @@
   mLoadedURI = aURI;
   mDOMContentLoadedEventStart = TimeStamp::Now();
 
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "DOMContentLoaded", NETWORK,
-                                   TRACING_INTERVAL_START, mDocShell);
+  PROFILER_MARKER("DOMContentLoaded", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalStart(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 
   if (IsTopLevelContentDocumentInContentProcess()) {
     TimeStamp now = TimeStamp::Now();
@@ -273,8 +287,10 @@
   mLoadedURI = aURI;
   mDOMContentLoadedEventEnd = TimeStamp::Now();
 
-  PROFILER_TRACING_MARKER_DOCSHELL("Navigation", "DOMContentLoaded", NETWORK,
-                                   TRACING_INTERVAL_END, mDocShell);
+  PROFILER_MARKER("DOMContentLoaded", NETWORK,
+                  MarkerOptions(MarkerTiming::IntervalEnd(),
+                                MarkerInnerWindowIdFromDocShell(mDocShell)),
+                  Tracing, "Navigation");
 
   if (IsTopLevelContentDocumentInContentProcess()) {
     Telemetry::AccumulateTimeDelta(Telemetry::TIME_TO_DOM_CONTENT_LOADED_END_MS,
@@ -377,10 +393,13 @@
                            int(elapsed.ToMilliseconds()),
                            int(elapsedLongTask.ToMilliseconds()), spec.get());
 
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "TimeToFirstInteractive (TTFI)", DOM, TextMarkerPayload,
-        (marker, mNavigationStart, mTTFI,
-         profiler_get_inner_window_id_from_docshell(mDocShell)));
+    PROFILER_MARKER_TEXT(
+        "TimeToFirstInteractive (TTFI)", DOM,
+        MarkerOptions(
+            MarkerTiming::Interval(mNavigationStart, mTTFI),
+            MarkerInnerWindowId(
+                profiler_get_inner_window_id_from_docshell(mDocShell))),
+        marker);
   }
 #endif
 }
@@ -410,10 +429,13 @@
             : "this tab was inactive some of the time between navigation start "
               "and first non-blank paint");
     PAGELOAD_LOG(("%s", marker.get()));
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "FirstNonBlankPaint", DOM, TextMarkerPayload,
-        (marker, mNavigationStart, mNonBlankPaint,
-         profiler_get_inner_window_id_from_docshell(mDocShell)));
+    PROFILER_MARKER_TEXT(
+        "FirstNonBlankPaint", DOM,
+        MarkerOptions(
+            MarkerTiming::Interval(mNavigationStart, mNonBlankPaint),
+            MarkerInnerWindowId(
+                profiler_get_inner_window_id_from_docshell(mDocShell))),
+        marker);
   }
 #endif
 
@@ -459,10 +481,13 @@
             : "this tab was inactive some of the time between navigation start "
               "and first non-blank paint");
     PAGELOAD_LOG(("%s", marker.get()));
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "FirstContentfulPaint", DOM, TextMarkerPayload,
-        (marker, mNavigationStart, mContentfulPaint,
-         profiler_get_inner_window_id_from_docshell(mDocShell)));
+    PROFILER_MARKER_TEXT(
+        "FirstContentfulPaint", DOM,
+        MarkerOptions(
+            MarkerTiming::Interval(mNavigationStart, mContentfulPaint),
+            MarkerInnerWindowId(
+                profiler_get_inner_window_id_from_docshell(mDocShell))),
+        marker);
   }
 #endif
 
@@ -508,10 +533,13 @@
             : "this tab was inactive some of the time between navigation start "
               "and DOMContentFlushed");
     PAGELOAD_LOG(("%s", marker.get()));
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "DOMContentFlushed", DOM, TextMarkerPayload,
-        (marker, mNavigationStart, mDOMContentFlushed,
-         profiler_get_inner_window_id_from_docshell(mDocShell)));
+    PROFILER_MARKER_TEXT(
+        "DOMContentFlushed", DOM,
+        MarkerOptions(
+            MarkerTiming::Interval(mNavigationStart, mDOMContentFlushed),
+            MarkerInnerWindowId(
+                profiler_get_inner_window_id_from_docshell(mDocShell))),
+        marker);
   }
 #endif
 }
@@ -562,7 +590,7 @@
 
   if (const ContentChild* cc = ContentChild::GetSingleton();
       cc && !(IsWebRemoteType(cc->GetRemoteType()) ||
-              IsPriviligedMozillaRemoteType(cc->GetRemoteType()))) {
+              IsPrivilegedMozillaRemoteType(cc->GetRemoteType()))) {
     return;
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMSerializer.cpp firefox-85.0+build1/dom/base/nsDOMSerializer.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMSerializer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +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 "nsDOMSerializer.h"
-
-#include "mozilla/Encoding.h"
-#include "mozilla/dom/Document.h"
-#include "nsIDocumentEncoder.h"
-#include "nsComponentManagerUtils.h"
-#include "nsContentCID.h"
-#include "nsContentUtils.h"
-#include "nsError.h"
-#include "nsINode.h"
-
-using namespace mozilla;
-
-nsDOMSerializer::nsDOMSerializer() = default;
-
-static already_AddRefed<nsIDocumentEncoder> SetUpEncoder(
-    nsINode& aRoot, const nsAString& aCharset, ErrorResult& aRv) {
-  nsCOMPtr<nsIDocumentEncoder> encoder =
-      do_createDocumentEncoder("application/xhtml+xml");
-  if (!encoder) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return nullptr;
-  }
-
-  dom::Document* doc = aRoot.OwnerDoc();
-  bool entireDocument = (doc == &aRoot);
-
-  // This method will fail if no document
-  nsresult rv = encoder->NativeInit(
-      doc, u"application/xhtml+xml"_ns,
-      nsIDocumentEncoder::OutputRaw |
-          nsIDocumentEncoder::OutputDontRewriteEncodingDeclaration);
-
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return nullptr;
-  }
-
-  NS_ConvertUTF16toUTF8 charset(aCharset);
-  if (charset.IsEmpty()) {
-    doc->GetDocumentCharacterSet()->Name(charset);
-  }
-  rv = encoder->SetCharset(charset);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return nullptr;
-  }
-
-  // If we are working on the entire document we do not need to
-  // specify which part to serialize
-  if (!entireDocument) {
-    rv = encoder->SetNode(&aRoot);
-  }
-
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return nullptr;
-  }
-
-  return encoder.forget();
-}
-
-void nsDOMSerializer::SerializeToString(nsINode& aRoot, nsAString& aStr,
-                                        ErrorResult& aRv) {
-  aStr.Truncate();
-
-  if (!nsContentUtils::CanCallerAccess(&aRoot)) {
-    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
-    return;
-  }
-
-  nsCOMPtr<nsIDocumentEncoder> encoder = SetUpEncoder(aRoot, u""_ns, aRv);
-  if (aRv.Failed()) {
-    return;
-  }
-
-  nsresult rv = encoder->EncodeToString(aStr);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-  }
-}
-
-void nsDOMSerializer::SerializeToStream(nsINode& aRoot,
-                                        nsIOutputStream* aStream,
-                                        const nsAString& aCharset,
-                                        ErrorResult& aRv) {
-  if (NS_WARN_IF(!aStream)) {
-    aRv.Throw(NS_ERROR_INVALID_ARG);
-    return;
-  }
-
-  // The charset arg can be empty, in which case we get the document's
-  // charset and use that when serializing.
-
-  // No point doing a CanCallerAccess check, because we can only be
-  // called by system JS or C++.
-  nsCOMPtr<nsIDocumentEncoder> encoder = SetUpEncoder(aRoot, aCharset, aRv);
-  if (aRv.Failed()) {
-    return;
-  }
-
-  nsresult rv = encoder->EncodeToStream(aStream);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-  }
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMSerializer.h firefox-85.0+build1/dom/base/nsDOMSerializer.h
--- firefox-84.0.2+build1/dom/base/nsDOMSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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 nsDOMSerializer_h_
-#define nsDOMSerializer_h_
-
-#include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/XMLSerializerBinding.h"
-
-class nsINode;
-class nsIOutputStream;
-
-class nsDOMSerializer final : public mozilla::dom::NonRefcountedDOMObject {
- public:
-  nsDOMSerializer();
-
-  // WebIDL API
-  static nsDOMSerializer* Constructor(
-      const mozilla::dom::GlobalObject& aOwner) {
-    return new nsDOMSerializer();
-  }
-
-  void SerializeToString(nsINode& aRoot, nsAString& aStr,
-                         mozilla::ErrorResult& rv);
-
-  void SerializeToStream(nsINode& aRoot, nsIOutputStream* aStream,
-                         const nsAString& aCharset, mozilla::ErrorResult& aRv);
-
-  bool WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto,
-                  JS::MutableHandle<JSObject*> aReflector) {
-    return mozilla::dom::XMLSerializer_Binding::Wrap(aCx, this, aGivenProto,
-                                                     aReflector);
-  }
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMTokenList.cpp firefox-85.0+build1/dom/base/nsDOMTokenList.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMTokenList.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMTokenList.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsDataHashtable.h"
 #include "nsError.h"
 #include "nsHashKeys.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/DOMTokenListBinding.h"
 #include "mozilla/BloomFilter.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMTokenList.h firefox-85.0+build1/dom/base/nsDOMTokenList.h
--- firefox-84.0.2+build1/dom/base/nsDOMTokenList.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMTokenList.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsDOMString.h"
 #include "nsWhitespaceTokenizer.h"
 #include "nsWrapperCache.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMTokenListSupportedTokens.h"
 
@@ -24,6 +23,7 @@
 class ErrorResult;
 namespace dom {
 class DocGroup;
+class Element;
 }  // namespace dom
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/dom/base/nsDOMWindowUtils.cpp firefox-85.0+build1/dom/base/nsDOMWindowUtils.cpp
--- firefox-84.0.2+build1/dom/base/nsDOMWindowUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsDOMWindowUtils.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/LayerTransactionChild.h"
 #include "nsPresContext.h"
+#include "nsCaret.h"
 #include "nsContentList.h"
 #include "nsError.h"
 #include "nsQueryContentEventResult.h"
@@ -178,6 +179,37 @@
   nsSize mSize;
 };
 
+/**
+ * Return the layer that all display items of aFrame were assigned to in the
+ * last paint, or nullptr if there was no single layer assigned to all of the
+ * frame's display items (i.e. zero, or more than one).
+ * This function is for testing purposes and not performance sensitive.
+ */
+template <class T>
+T* mozilla::FrameLayerBuilder::GetDebugSingleOldLayerForFrame(
+    nsIFrame* aFrame) {
+  SmallPointerArray<DisplayItemData>& array = aFrame->DisplayItemData();
+
+  Layer* layer = nullptr;
+  for (DisplayItemData* data : array) {
+    DisplayItemData::AssertDisplayItemData(data);
+    if (data->mLayer->GetType() != T::Type()) {
+      continue;
+    }
+    if (layer && layer != data->mLayer) {
+      // More than one layer assigned, bail.
+      return nullptr;
+    }
+    layer = data->mLayer;
+  }
+
+  if (!layer) {
+    return nullptr;
+  }
+
+  return static_cast<T*>(layer);
+}
+
 namespace {
 
 class NativeInputRunnable final : public PrioritizableRunnable {
@@ -1207,15 +1239,23 @@
                                 float aRightSize, float aBottomSize,
                                 float aLeftSize, bool aIgnoreRootScrollFrame,
                                 bool aFlushLayout, bool aOnlyVisible,
+                                float aVisibleThreshold,
                                 nsINodeList** aReturn) {
   RefPtr<Document> doc = GetDocument();
   NS_ENSURE_STATE(doc);
 
   auto list = MakeRefPtr<nsSimpleContentList>(doc);
 
+  // The visible threshold was omitted or given a zero value (which makes no
+  // sense), so give a reasonable default.
+  if (aVisibleThreshold == 0.0f) {
+    aVisibleThreshold = 1.0f;
+  }
+
   AutoTArray<RefPtr<nsINode>, 8> nodes;
   doc->NodesFromRect(aX, aY, aTopSize, aRightSize, aBottomSize, aLeftSize,
-                     aIgnoreRootScrollFrame, aFlushLayout, aOnlyVisible, nodes);
+                     aIgnoreRootScrollFrame, aFlushLayout, aOnlyVisible,
+                     aVisibleThreshold, nodes);
   list->SetCapacity(nodes.Length());
   for (auto& node : nodes) {
     list->AppendElement(node->AsContent());
@@ -2024,7 +2064,7 @@
   nsresult rv = targetWidget->DispatchEvent(&queryEvent, status);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  auto* result = new nsQueryContentEventResult(queryEvent);
+  auto* result = new nsQueryContentEventResult(std::move(queryEvent));
   result->SetEventResult(widget);
   NS_ADDREF(*aResult = result);
   return NS_OK;
@@ -2709,8 +2749,28 @@
     return NS_OK;
   }
 
-  CSSRect bounds =
-      nsLayoutUtils::GetBoundingContentRect(element, rootScrollFrame);
+  CSSRect bounds;
+  if (element->IsHTMLElement(nsGkAtoms::input)) {
+    bounds = nsLayoutUtils::GetBoundingContentRect(element, rootScrollFrame);
+  } else {
+    // When focused elment is content editable or <textarea> element,
+    // focused element will have multi-line content.
+    nsIFrame* frame = element->GetPrimaryFrame();
+    if (frame) {
+      RefPtr<nsCaret> caret = frame->PresShell()->GetCaret();
+      if (caret && caret->IsVisible()) {
+        nsRect rect;
+        if (nsIFrame* frame = caret->GetGeometry(&rect)) {
+          bounds = nsLayoutUtils::GetBoundingFrameRect(frame, rootScrollFrame);
+        }
+      }
+    }
+    if (bounds.IsEmpty()) {
+      // Fallback if no caret frame.
+      bounds = nsLayoutUtils::GetBoundingContentRect(element, rootScrollFrame);
+    }
+  }
+
   if (bounds.IsEmpty()) {
     // Do not zoom on empty bounds. Bail out.
     return NS_OK;
diff -Nru firefox-84.0.2+build1/dom/base/nsFocusManager.cpp firefox-85.0+build1/dom/base/nsFocusManager.cpp
--- firefox-84.0.2+build1/dom/base/nsFocusManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFocusManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -167,6 +167,7 @@
 StaticRefPtr<nsFocusManager> nsFocusManager::sInstance;
 bool nsFocusManager::sMouseFocusesFormControl = false;
 bool nsFocusManager::sTestMode = false;
+uint64_t nsFocusManager::sFocusActionCounter = 0;
 
 static const char* kObservedPrefs[] = {
     "accessibility.browsewithcaret", "accessibility.tabfocus_applies_to_xul",
@@ -174,7 +175,8 @@
     nullptr};
 
 nsFocusManager::nsFocusManager()
-    : mActiveBrowsingContextInContentSetFromOtherProcess(false),
+    : mActionIdForActiveBrowsingContextInContent(0),
+      mActiveBrowsingContextInContentSetFromOtherProcess(false),
       mEventHandlingNeedsFlush(false) {}
 
 nsFocusManager::~nsFocusManager() {
@@ -241,6 +243,7 @@
   if (!nsCRT::strcmp(aTopic, "xpcom-shutdown")) {
     mActiveWindow = nullptr;
     mActiveBrowsingContextInContent = nullptr;
+    mActionIdForActiveBrowsingContextInContent = 0;
     mActiveBrowsingContextInChrome = nullptr;
     mFocusedWindow = nullptr;
     mFocusedBrowsingContextInContent = nullptr;
@@ -287,17 +290,8 @@
 Element* nsFocusManager::GetFocusedDescendant(
     nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
     nsPIDOMWindowOuter** aFocusedWindow) {
-  bool ignored;
-  return GetFocusedDescendant(aWindow, aSearchRange, &ignored, aFocusedWindow);
-}
-
-// static
-Element* nsFocusManager::GetFocusedDescendant(
-    nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
-    bool* aFocusIsOutOfProcess, nsPIDOMWindowOuter** aFocusedWindow) {
   NS_ENSURE_TRUE(aWindow, nullptr);
 
-  *aFocusIsOutOfProcess = false;
   *aFocusedWindow = nullptr;
 
   Element* currentElement = nullptr;
@@ -311,16 +305,6 @@
 
     window = GetContentWindow(currentElement);
     if (!window) {
-      if (RefPtr<nsFrameLoaderOwner> flo = do_QueryObject(currentElement)) {
-        // Only look at pre-existing browsing contexts. If this function is
-        // called during reflow, calling GetBrowsingContext() could cause frame
-        // loader initialization at a time when it isn't safe.
-        if (BrowsingContext* bc = flo->GetExtantBrowsingContext()) {
-          if (!bc->IsInProcess()) {
-            *aFocusIsOutOfProcess = true;
-          }
-        }
-      }
       break;
     }
 
@@ -395,7 +379,8 @@
 void nsFocusManager::FocusWindow(nsPIDOMWindowOuter* aWindow,
                                  CallerType aCallerType) {
   if (sInstance) {
-    sInstance->SetFocusedWindowWithCallerType(aWindow, aCallerType);
+    sInstance->SetFocusedWindowWithCallerType(
+        aWindow, aCallerType, sInstance->GenerateFocusActionId());
   }
 }
 
@@ -405,8 +390,19 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsFocusManager::GetFocusedContentBrowsingContext(
+    BrowsingContext** aBrowsingContext) {
+  MOZ_DIAGNOSTIC_ASSERT(
+      XRE_IsParentProcess(),
+      "We only have use cases for this in the parent process");
+  NS_IF_ADDREF(*aBrowsingContext = GetFocusedBrowsingContextInChrome());
+  return NS_OK;
+}
+
 nsresult nsFocusManager::SetFocusedWindowWithCallerType(
-    mozIDOMWindowProxy* aWindowToFocus, CallerType aCallerType) {
+    mozIDOMWindowProxy* aWindowToFocus, CallerType aCallerType,
+    uint64_t aActionId) {
   LOGFOCUS(("<<SetFocusedWindow begin>>"));
 
   nsCOMPtr<nsPIDOMWindowOuter> windowToFocus =
@@ -417,7 +413,7 @@
   if (frameElement) {
     // pass false for aFocusChanged so that the caret does not get updated
     // and scrolling does not occur.
-    SetFocusInner(frameElement, 0, false, true);
+    SetFocusInner(frameElement, 0, false, true, aActionId);
   } else {
     // this is a top-level window. If the window has a child frame focused,
     // clear the focus. Otherwise, focus should already be in this frame, or
@@ -432,7 +428,7 @@
 
   nsCOMPtr<nsPIDOMWindowOuter> rootWindow = windowToFocus->GetPrivateRoot();
   if (rootWindow) {
-    RaiseWindow(rootWindow, aCallerType);
+    RaiseWindow(rootWindow, aCallerType, aActionId);
   }
 
   LOGFOCUS(("<<SetFocusedWindow end>>"));
@@ -442,7 +438,8 @@
 
 NS_IMETHODIMP nsFocusManager::SetFocusedWindow(
     mozIDOMWindowProxy* aWindowToFocus) {
-  return SetFocusedWindowWithCallerType(aWindowToFocus, CallerType::System);
+  return SetFocusedWindowWithCallerType(aWindowToFocus, CallerType::System,
+                                        GenerateFocusActionId());
 }
 
 NS_IMETHODIMP
@@ -477,7 +474,7 @@
 
   NS_ENSURE_ARG(aElement);
 
-  SetFocusInner(aElement, aFlags, true, true);
+  SetFocusInner(aElement, aFlags, true, true, GenerateFocusActionId());
 
   LOGFOCUS(("<<SetFocus end>>"));
 
@@ -494,7 +491,7 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
+MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHODIMP
 nsFocusManager::MoveFocus(mozIDOMWindowProxy* aWindow, Element* aStartElement,
                           uint32_t aType, uint32_t aFlags, Element** aElement) {
   *aElement = nullptr;
@@ -547,7 +544,7 @@
     // would be a problem because the caret would move to the beginning of the
     // focused link making it impossible to navigate the caret over a link.
     SetFocusInner(MOZ_KnownLive(newFocus->AsElement()), aFlags,
-                  aType != MOVEFOCUS_CARET, true);
+                  aType != MOVEFOCUS_CARET, true, GenerateFocusActionId());
     *aElement = do_AddRef(newFocus->AsElement()).take();
   } else if (aType == MOVEFOCUS_ROOT || aType == MOVEFOCUS_CARET) {
     // no content was found, so clear the focus for these two types.
@@ -572,11 +569,12 @@
   if (IsSameOrAncestor(window, GetFocusedBrowsingContext())) {
     BrowsingContext* bc = window->GetBrowsingContext();
     bool isAncestor = (GetFocusedBrowsingContext() != bc);
-    if (Blur(bc, nullptr, isAncestor, true)) {
+    uint64_t actionId = GenerateFocusActionId();
+    if (Blur(bc, nullptr, isAncestor, true, actionId)) {
       // if we are clearing the focus on an ancestor of the focused window,
       // the ancestor will become the new focused window, so focus it
       if (isAncestor) {
-        Focus(window, nullptr, 0, true, false, false, true, false);
+        Focus(window, nullptr, 0, true, false, false, true, actionId);
       }
     }
   } else {
@@ -647,7 +645,8 @@
   return NS_OK;
 }
 
-void nsFocusManager::WindowRaised(mozIDOMWindowProxy* aWindow) {
+void nsFocusManager::WindowRaised(mozIDOMWindowProxy* aWindow,
+                                  uint64_t aActionId) {
   if (!aWindow) {
     return;
   }
@@ -687,7 +686,7 @@
 
     // lower the existing window, if any. This shouldn't happen usually.
     if (mActiveWindow) {
-      WindowLowered(mActiveWindow);
+      WindowLowered(mActiveWindow, aActionId);
     }
   } else if (bc->IsTop()) {
     BrowsingContext* active = GetActiveBrowsingContext();
@@ -699,7 +698,7 @@
 
     if (active && active != bc) {
       if (active->IsInProcess()) {
-        WindowLowered(active->GetDOMWindow());
+        WindowLowered(active->GetDOMWindow(), aActionId);
       }
       // No else, because trying to lower other-process windows
       // from here can result in the BrowsingContext no longer
@@ -719,7 +718,7 @@
   if (XRE_IsParentProcess()) {
     mActiveWindow = window;
   } else if (bc->IsTop()) {
-    SetActiveBrowsingContextInContent(bc);
+    SetActiveBrowsingContextInContent(bc, aActionId);
   }
 
   // ensure that the window is enabled and visible
@@ -735,9 +734,6 @@
     baseWindow->SetVisibility(true);
   }
 
-  // If this is a parent or single process window, send the activate event.
-  // Events for child process windows will be sent when ParentActivated
-  // is called.
   if (XRE_IsParentProcess()) {
     // Unsetting top-level focus upon lowering was inhibited to accommodate
     // ATOK, so we need to do it here.
@@ -747,17 +743,8 @@
 
   // retrieve the last focused element within the window that was raised
   nsCOMPtr<nsPIDOMWindowOuter> currentWindow;
-  bool focusInOtherContentProcess = false;
   RefPtr<Element> currentFocus = GetFocusedDescendant(
-      window, eIncludeAllDescendants, &focusInOtherContentProcess,
-      getter_AddRefs(currentWindow));
-
-  // Keep mochitest-browser-chrome harness happy by ignoring
-  // focusInOtherContentProcess in the chrome process, because
-  // the harness expects that.
-  if (XRE_IsParentProcess()) {
-    focusInOtherContentProcess = false;
-  }
+      window, eIncludeAllDescendants, getter_AddRefs(currentWindow));
 
   NS_ASSERTION(currentWindow, "window raised with no window current");
   if (!currentWindow) {
@@ -765,12 +752,18 @@
   }
 
   nsCOMPtr<nsIAppWindow> appWin(do_GetInterface(baseWindow));
-  Focus(currentWindow, currentFocus, 0,
-        currentWindow->GetBrowsingContext() != GetFocusedBrowsingContext(),
-        false, appWin != nullptr, true, focusInOtherContentProcess);
+  // We use mFocusedWindow here is basically for the case that iframe navigate
+  // from a.com to b.com for example, so it ends up being loaded in a different
+  // process after Fission, but
+  // currentWindow->GetBrowsingContext() == GetFocusedBrowsingContext() would
+  // still be true because focused browsing context is synced, and we won't
+  // fire a focus event while focusing if we use it as condition.
+  Focus(currentWindow, currentFocus, 0, currentWindow != mFocusedWindow, false,
+        appWin != nullptr, true, aActionId);
 }
 
-void nsFocusManager::WindowLowered(mozIDOMWindowProxy* aWindow) {
+void nsFocusManager::WindowLowered(mozIDOMWindowProxy* aWindow,
+                                   uint64_t aActionId) {
   if (!aWindow) {
     return;
   }
@@ -821,9 +814,6 @@
     }
   }
 
-  // If this is a parent or single process window, send the deactivate event.
-  // Events for child process windows will be sent when ParentActivated
-  // is called.
   if (XRE_IsParentProcess()) {
     ActivateOrDeactivate(window, false);
   }
@@ -837,12 +827,12 @@
   } else {
     BrowsingContext* bc = window->GetBrowsingContext();
     if (bc == bc->Top()) {
-      SetActiveBrowsingContextInContent(nullptr);
+      SetActiveBrowsingContextInContent(nullptr, aActionId);
     }
   }
 
   if (mFocusedWindow) {
-    Blur(nullptr, nullptr, true, true);
+    Blur(nullptr, nullptr, true, true, aActionId);
   }
 
   mWindowBeingLowered = nullptr;
@@ -955,10 +945,11 @@
     }
   }
 
-  if (nsIDocShell* docShell = window->GetDocShell()) {
-    if (nsCOMPtr<nsIBrowserChild> child = docShell->GetBrowserChild()) {
-      bool active = static_cast<BrowserChild*>(child.get())->ParentIsActive();
-      ActivateOrDeactivate(window, active);
+  if (XRE_IsParentProcess()) {
+    if (BrowsingContext* bc = window->GetBrowsingContext()) {
+      if (bc->IsTop()) {
+        bc->SetIsActiveBrowserWindow(bc->GetIsActiveBrowserWindow());
+      }
     }
   }
 
@@ -968,21 +959,12 @@
 
   if (aNeedsFocus) {
     nsCOMPtr<nsPIDOMWindowOuter> currentWindow;
-    bool focusInOtherContentProcess = false;
     RefPtr<Element> currentFocus = GetFocusedDescendant(
-        window, eIncludeAllDescendants, &focusInOtherContentProcess,
-        getter_AddRefs(currentWindow));
-
-    // Keep mochitest-browser-chrome harness happy by ignoring
-    // focusInOtherContentProcess in the chrome process, because
-    // the harness expects that.
-    if (XRE_IsParentProcess()) {
-      focusInOtherContentProcess = false;
-    }
+        window, eIncludeAllDescendants, getter_AddRefs(currentWindow));
 
     if (currentWindow) {
       Focus(currentWindow, currentFocus, 0, true, false, false, true,
-            focusInOtherContentProcess);
+            GenerateFocusActionId());
     }
   } else {
     // Sometimes, an element in a window can be focused before the window is
@@ -992,7 +974,8 @@
   }
 }
 
-void nsFocusManager::WindowHidden(mozIDOMWindowProxy* aWindow) {
+void nsFocusManager::WindowHidden(mozIDOMWindowProxy* aWindow,
+                                  uint64_t aActionId) {
   // if there is no window or it is not the same or an ancestor of the
   // currently focused window, just return, as the current focus will not
   // be affected.
@@ -1087,7 +1070,7 @@
 
     if (XRE_IsParentProcess()) {
       if (mActiveWindow == mFocusedWindow || mActiveWindow == window) {
-        WindowLowered(mActiveWindow);
+        WindowLowered(mActiveWindow, aActionId);
       } else {
         ClearFocus(mActiveWindow);
       }
@@ -1099,7 +1082,7 @@
           if ((mFocusedWindow &&
                mFocusedWindow->GetBrowsingContext() == active) ||
               (window->GetBrowsingContext() == active)) {
-            WindowLowered(activeWindow);
+            WindowLowered(activeWindow, aActionId);
           } else {
             ClearFocus(activeWindow);
           }
@@ -1163,20 +1146,10 @@
 
 nsresult nsFocusManager::FocusPlugin(Element* aPlugin) {
   NS_ENSURE_ARG(aPlugin);
-  SetFocusInner(aPlugin, 0, true, false);
+  SetFocusInner(aPlugin, 0, true, false, GenerateFocusActionId());
   return NS_OK;
 }
 
-void nsFocusManager::ParentActivated(mozIDOMWindowProxy* aWindow,
-                                     bool aActive) {
-  nsCOMPtr<nsPIDOMWindowOuter> window = nsPIDOMWindowOuter::From(aWindow);
-  if (!window) {
-    return;
-  }
-
-  ActivateOrDeactivate(window, aActive);
-}
-
 nsFocusManager::BlurredElementInfo::BlurredElementInfo(Element& aElement)
     : mElement(aElement),
       mHadRing(aElement.State().HasState(NS_EVENT_STATE_FOCUSRING)) {}
@@ -1336,29 +1309,32 @@
 
 void nsFocusManager::ActivateOrDeactivate(nsPIDOMWindowOuter* aWindow,
                                           bool aActive) {
+  MOZ_ASSERT(XRE_IsParentProcess());
   if (!aWindow) {
     return;
   }
 
-  // Inform the DOM window that it has activated or deactivated, so that
-  // the active attribute is updated on the window.
-  aWindow->ActivateOrDeactivate(aActive);
+  if (BrowsingContext* bc = aWindow->GetBrowsingContext()) {
+    MOZ_ASSERT(bc->IsTop());
+
+    RefPtr<CanonicalBrowsingContext> chromeTop =
+        bc->Canonical()->TopCrossChromeBoundary();
+    MOZ_ASSERT(bc == chromeTop);
+
+    chromeTop->SetIsActiveBrowserWindow(aActive);
+    chromeTop->CallOnAllTopDescendants(
+        [aActive](CanonicalBrowsingContext* aBrowsingContext) -> CallState {
+          aBrowsingContext->SetIsActiveBrowserWindow(aActive);
+          return CallState::Continue;
+        });
+  }
 
-  // Send the activate event.
   if (aWindow->GetExtantDoc()) {
     nsContentUtils::DispatchEventOnlyToChrome(
         aWindow->GetExtantDoc(), aWindow->GetCurrentInnerWindow(),
         aActive ? u"activate"_ns : u"deactivate"_ns, CanBubble::eYes,
         Cancelable::eYes, nullptr);
   }
-
-  // Look for any remote child frames, iterate over them and send the activation
-  // notification.
-  nsContentUtils::CallOnAllRemoteChildren(
-      aWindow, [&aActive](BrowserParent* aBrowserParent) -> CallState {
-        Unused << aBrowserParent->SendParentActivated(aActive);
-        return CallState::Continue;
-      });
 }
 
 // Retrieves innerWindowId of the window of the last focused element to
@@ -1393,7 +1369,8 @@
 }
 
 void nsFocusManager::SetFocusInner(Element* aNewContent, int32_t aFlags,
-                                   bool aFocusChanged, bool aAdjustWidget) {
+                                   bool aFocusChanged, bool aAdjustWidget,
+                                   uint64_t aActionId) {
   // if the element is not focusable, just return and leave the focus as is
   RefPtr<Element> elementToFocus =
       FlushAndCheckIfFocusable(aNewContent, aFlags);
@@ -1409,21 +1386,12 @@
   // within the frame is retrieved and that will be focused instead.
   nsCOMPtr<nsPIDOMWindowOuter> newWindow;
   nsCOMPtr<nsPIDOMWindowOuter> subWindow = GetContentWindow(elementToFocus);
-  bool focusInOtherContentProcess = false;
   if (subWindow) {
     // XXX What if this is an out-of-process iframe?
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1613054
     elementToFocus = GetFocusedDescendant(subWindow, eIncludeAllDescendants,
-                                          &focusInOtherContentProcess,
                                           getter_AddRefs(newWindow));
 
-    // Keep mochitest-browser-chrome harness happy by ignoring
-    // focusInOtherContentProcess in the chrome process, because
-    // the harness expects that.
-    if (XRE_IsParentProcess()) {
-      focusInOtherContentProcess = false;
-    }
-
     // since a window is being refocused, clear aFocusChanged so that the
     // caret position isn't updated.
     aFocusChanged = false;
@@ -1449,6 +1417,16 @@
 
   MOZ_ASSERT(newBrowsingContext);
 
+  BrowsingContext* browsingContextToFocus = newBrowsingContext;
+  if (RefPtr<nsFrameLoaderOwner> flo = do_QueryObject(elementToFocus)) {
+    // Only look at pre-existing browsing contexts. If this function is
+    // called during reflow, calling GetBrowsingContext() could cause frame
+    // loader initialization at a time when it isn't safe.
+    if (BrowsingContext* bc = flo->GetExtantBrowsingContext()) {
+      browsingContextToFocus = bc;
+    }
+  }
+
   // don't allow focus to be placed in docshells or descendants of docshells
   // that are being destroyed. Also, ensure that the page hasn't been
   // unloaded. The prevents content from being refocused during an unload event.
@@ -1490,64 +1468,46 @@
     }
   }
 
-  // if the new element is in the same window as the currently focused element
-  bool isElementInFocusedWindow =
-      (focusedBrowsingContext == newBrowsingContext);
+  bool focusMovesToDifferentBC =
+      (focusedBrowsingContext != browsingContextToFocus);
 
-  if (!isElementInFocusedWindow && newWindow &&
-      nsContentUtils::IsHandlingKeyBoardEvent()) {
-    if (XRE_IsParentProcess()) {
-      nsIPrincipal* focusedPrincipal = nullptr;
-      nsIPrincipal* newPrincipal = nullptr;
+  if (focusedBrowsingContext && focusMovesToDifferentBC &&
+      nsContentUtils::IsHandlingKeyBoardEvent() &&
+      !nsContentUtils::LegacyIsCallerChromeOrNativeCode()) {
+    MOZ_ASSERT(browsingContextToFocus,
+               "BrowsingContext to focus should be non-null.");
 
-      WindowGlobalParent* focusedWindowGlobalParent = nullptr;
-      if (focusedBrowsingContext) {
-        focusedWindowGlobalParent =
-            focusedBrowsingContext->Canonical()->GetCurrentWindowGlobal();
-      }
-      MOZ_ASSERT(newBrowsingContext, "Should still be non-null.");
-      WindowGlobalParent* newWindowGlobalParent =
-          newBrowsingContext->Canonical()->GetCurrentWindowGlobal();
+    nsIPrincipal* focusedPrincipal = nullptr;
+    nsIPrincipal* newPrincipal = nullptr;
 
-      if (focusedWindowGlobalParent) {
+    if (XRE_IsParentProcess()) {
+      if (WindowGlobalParent* focusedWindowGlobalParent =
+              focusedBrowsingContext->Canonical()->GetCurrentWindowGlobal()) {
         focusedPrincipal = focusedWindowGlobalParent->DocumentPrincipal();
       }
-      if (newWindowGlobalParent) {
-        newPrincipal = newWindowGlobalParent->DocumentPrincipal();
-      }
 
-      if (!focusedPrincipal || !newPrincipal) {
-        return;
-      }
-      bool subsumes = false;
-      focusedPrincipal->Subsumes(newPrincipal, &subsumes);
-      if (!subsumes && !nsContentUtils::LegacyIsCallerChromeOrNativeCode()) {
-        NS_WARNING("Not allowed to focus the new window!");
-        return;
+      if (WindowGlobalParent* newWindowGlobalParent =
+              browsingContextToFocus->Canonical()->GetCurrentWindowGlobal()) {
+        newPrincipal = newWindowGlobalParent->DocumentPrincipal();
       }
-    } else if (focusedBrowsingContext &&
-               focusedBrowsingContext->IsInProcess()) {
-      nsCOMPtr<nsPIDOMWindowOuter> focusedWindow =
-          focusedBrowsingContext->GetDOMWindow();
-      MOZ_ASSERT(focusedWindow,
-                 "BrowsingContext should always have a window here.");
+    } else if (focusedBrowsingContext->IsInProcess() &&
+               browsingContextToFocus->IsInProcess()) {
       nsCOMPtr<nsIScriptObjectPrincipal> focused =
-          do_QueryInterface(focusedWindow);
+          do_QueryInterface(focusedBrowsingContext->GetDOMWindow());
       nsCOMPtr<nsIScriptObjectPrincipal> newFocus =
-          do_QueryInterface(newWindow);
-      nsIPrincipal* focusedPrincipal = focused->GetPrincipal();
-      nsIPrincipal* newPrincipal = newFocus->GetPrincipal();
-      if (!focusedPrincipal || !newPrincipal) {
-        return;
-      }
-      bool subsumes = false;
-      focusedPrincipal->Subsumes(newPrincipal, &subsumes);
-      if (!subsumes && !nsContentUtils::LegacyIsCallerChromeOrNativeCode()) {
-        NS_WARNING("Not allowed to focus the new window!");
-        return;
-      }
-    } else if (focusedBrowsingContext &&
-               !nsContentUtils::LegacyIsCallerChromeOrNativeCode()) {
+          do_QueryInterface(browsingContextToFocus->GetDOMWindow());
+      MOZ_ASSERT(focused && newFocus,
+                 "BrowsingContext should always have a window here.");
+      focusedPrincipal = focused->GetPrincipal();
+      newPrincipal = newFocus->GetPrincipal();
+    }
+
+    if (!focusedPrincipal || !newPrincipal) {
+      return;
+    }
+
+    if (!focusedPrincipal->Subsumes(newPrincipal)) {
+      NS_WARNING("Not allowed to focus the new window!");
       return;
     }
   }
@@ -1654,8 +1614,10 @@
   LOGFOCUS((" Flags: %x Current Window: %p New Window: %p Current Element: %p",
             aFlags, mFocusedWindow.get(), newWindow.get(),
             mFocusedElement.get()));
-  LOGFOCUS((" In Active Window: %d In Focused Window: %d SendFocus: %d",
-            isElementInActiveWindow, isElementInFocusedWindow, sendFocusEvent));
+  LOGFOCUS(
+      (" In Active Window: %d Moves to different BrowsingContext: %d "
+       "SendFocus: %d",
+       isElementInActiveWindow, focusMovesToDifferentBC, sendFocusEvent));
 
   if (sendFocusEvent) {
     Maybe<BlurredElementInfo> blurredInfo;
@@ -1684,21 +1646,21 @@
       // to clear out the focus in A, otherwise A would still maintain that B
       // was focused, and B that D was focused.
       RefPtr<BrowsingContext> commonAncestor;
-      if (!isElementInFocusedWindow) {
+      if (focusMovesToDifferentBC) {
         commonAncestor = GetCommonAncestor(newWindow, focusedBrowsingContext);
       }
 
       if (!Blur(
               currentIsSameOrAncestor ? focusedBrowsingContext.get() : nullptr,
               commonAncestor ? commonAncestor.get() : nullptr,
-              !isElementInFocusedWindow, aAdjustWidget, elementToFocus)) {
+              focusMovesToDifferentBC, aAdjustWidget, aActionId,
+              elementToFocus)) {
         return;
       }
     }
 
-    Focus(newWindow, elementToFocus, aFlags, !isElementInFocusedWindow,
-          aFocusChanged, false, aAdjustWidget, focusInOtherContentProcess,
-          blurredInfo);
+    Focus(newWindow, elementToFocus, aFlags, focusMovesToDifferentBC,
+          aFocusChanged, false, aAdjustWidget, aActionId, blurredInfo);
   } else {
     // otherwise, for inactive windows and when the caller cannot steal the
     // focus, update the node in the window, and  raise the window if desired.
@@ -1731,7 +1693,8 @@
         if (XRE_IsParentProcess() || newRootBrowsingContext->IsInProcess()) {
           RaiseWindow(newRootBrowsingContext->GetDOMWindow(),
                       aFlags & FLAG_NONSYSTEMCALLER ? CallerType::NonSystem
-                                                    : CallerType::System);
+                                                    : CallerType::System,
+                      aActionId);
         } else {
           mozilla::dom::ContentChild* contentChild =
               mozilla::dom::ContentChild::GetSingleton();
@@ -1739,7 +1702,8 @@
           contentChild->SendRaiseWindow(newRootBrowsingContext,
                                         aFlags & FLAG_NONSYSTEMCALLER
                                             ? CallerType::NonSystem
-                                            : CallerType::System);
+                                            : CallerType::System,
+                                        aActionId);
         }
       }
     }
@@ -2026,7 +1990,18 @@
       if (BrowsingContext* bc = flo->GetExtantBrowsingContext()) {
         // This call may create a contentViewer-created about:blank.
         // That's intentional, so we can move focus there.
-        if (!bc->GetDocument()) {
+        Document* subdoc = bc->GetDocument();
+        if (!subdoc) {
+          return aElement;
+        }
+        nsIPrincipal* framerPrincipal = doc->GetPrincipal();
+        nsIPrincipal* frameePrincipal = subdoc->GetPrincipal();
+        if (framerPrincipal && frameePrincipal &&
+            !framerPrincipal->Equals(frameePrincipal)) {
+          // Assume focusability of different-origin iframes even in the
+          // in-process case for consistency with the OOP case.
+          // This is likely already the case anyway, but in case not,
+          // this makes it explicitly so.
           return aElement;
         }
       }
@@ -2055,10 +2030,11 @@
 bool nsFocusManager::Blur(BrowsingContext* aBrowsingContextToClear,
                           BrowsingContext* aAncestorBrowsingContextToFocus,
                           bool aIsLeavingDocument, bool aAdjustWidget,
-                          Element* aElementToFocus) {
+                          uint64_t aActionId, Element* aElementToFocus) {
   if (XRE_IsParentProcess()) {
     return BlurImpl(aBrowsingContextToClear, aAncestorBrowsingContextToFocus,
-                    aIsLeavingDocument, aAdjustWidget, aElementToFocus);
+                    aIsLeavingDocument, aAdjustWidget, aElementToFocus,
+                    aActionId);
   }
   mozilla::dom::ContentChild* contentChild =
       mozilla::dom::ContentChild::GetSingleton();
@@ -2101,7 +2077,8 @@
                                           true);
     }
     return BlurImpl(aBrowsingContextToClear, aAncestorBrowsingContextToFocus,
-                    aIsLeavingDocument, aAdjustWidget, aElementToFocus);
+                    aIsLeavingDocument, aAdjustWidget, aElementToFocus,
+                    aActionId);
   }
   if (aBrowsingContextToClear && aBrowsingContextToClear->IsInProcess()) {
     nsPIDOMWindowOuter* windowToClear = aBrowsingContextToClear->GetDOMWindow();
@@ -2124,7 +2101,7 @@
   contentChild->SendBlurToParent(
       focusedBrowsingContext, aBrowsingContextToClear,
       aAncestorBrowsingContextToFocus, aIsLeavingDocument, aAdjustWidget,
-      windowToClearHandled, ancestorWindowToFocusHandled);
+      windowToClearHandled, ancestorWindowToFocusHandled, aActionId);
   return true;
 }
 
@@ -2132,18 +2109,18 @@
     mozilla::dom::BrowsingContext* aFocusedBrowsingContext,
     mozilla::dom::BrowsingContext* aBrowsingContextToClear,
     mozilla::dom::BrowsingContext* aAncestorBrowsingContextToFocus,
-    bool aIsLeavingDocument, bool aAdjustWidget) {
+    bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId) {
   if (aFocusedBrowsingContext != GetFocusedBrowsingContext()) {
     return;
   }
   BlurImpl(aBrowsingContextToClear, aAncestorBrowsingContextToFocus,
-           aIsLeavingDocument, aAdjustWidget, nullptr);
+           aIsLeavingDocument, aAdjustWidget, nullptr, aActionId);
 }
 
 bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
                               BrowsingContext* aAncestorBrowsingContextToFocus,
                               bool aIsLeavingDocument, bool aAdjustWidget,
-                              Element* aElementToFocus) {
+                              Element* aElementToFocus, uint64_t aActionId) {
   LOGFOCUS(("<<Blur begin>>"));
 
   // hold a reference to the focused content, which may be null
@@ -2268,7 +2245,7 @@
                 aContext->Canonical()->GetCurrentWindowGlobal()) {
           if (RefPtr<BrowserParent> browserParent =
                   windowGlobalParent->GetBrowserParent()) {
-            browserParent->Deactivate(windowBeingLowered);
+            browserParent->Deactivate(windowBeingLowered, aActionId);
             LOGFOCUS(("%s remote browser deactivated %p, %d",
                       aContext == topLevelBrowsingContext ? "Top-level"
                                                           : "OOP iframe",
@@ -2280,7 +2257,7 @@
 
     // Same as above but for out-of-process iframes
     if (BrowserBridgeChild* bbc = BrowserBridgeChild::GetFrom(element)) {
-      bbc->Deactivate(windowBeingLowered);
+      bbc->Deactivate(windowBeingLowered, aActionId);
       LOGFOCUS(("Out-of-process iframe deactivated %p, %d", bbc,
                 windowBeingLowered));
     }
@@ -2363,15 +2340,16 @@
   return result;
 }
 
-void nsFocusManager::ActivateRemoteFrameIfNeeded(Element& aElement) {
+void nsFocusManager::ActivateRemoteFrameIfNeeded(Element& aElement,
+                                                 uint64_t aActionId) {
   if (BrowserParent* remote = BrowserParent::GetFrom(&aElement)) {
-    remote->Activate();
+    remote->Activate(aActionId);
     LOGFOCUS(("Remote browser activated %p", remote));
   }
 
   // Same as above but for out-of-process iframes
   if (BrowserBridgeChild* bbc = BrowserBridgeChild::GetFrom(&aElement)) {
-    bbc->Activate();
+    bbc->Activate(aActionId);
     LOGFOCUS(("Out-of-process iframe activated %p", bbc));
   }
 }
@@ -2379,7 +2357,7 @@
 void nsFocusManager::Focus(
     nsPIDOMWindowOuter* aWindow, Element* aElement, uint32_t aFlags,
     bool aIsNewDocument, bool aFocusChanged, bool aWindowRaised,
-    bool aAdjustWidget, bool aFocusInOtherContentProcess,
+    bool aAdjustWidget, uint64_t aActionId,
     const Maybe<BlurredElementInfo>& aBlurredElementInfo) {
   LOGFOCUS(("<<Focus begin>>"));
 
@@ -2404,6 +2382,21 @@
     return;
   }
 
+  bool focusInOtherContentProcess = false;
+  // Keep mochitest-browser-chrome harness happy by ignoring
+  // focusInOtherContentProcess in the chrome process, because the harness
+  // expects that.
+  if (!XRE_IsParentProcess()) {
+    if (RefPtr<nsFrameLoaderOwner> flo = do_QueryObject(aElement)) {
+      // Only look at pre-existing browsing contexts. If this function is
+      // called during reflow, calling GetBrowsingContext() could cause frame
+      // loader initialization at a time when it isn't safe.
+      if (BrowsingContext* bc = flo->GetExtantBrowsingContext()) {
+        focusInOtherContentProcess = !bc->IsInProcess();
+      }
+    }
+  }
+
   // If the focus actually changed, set the focus method (mouse, keyboard, etc).
   // Otherwise, just get the current focus method and use that. This ensures
   // that the method is set during the document and window focus events.
@@ -2489,12 +2482,12 @@
       IMEStateManager::OnChangeFocus(presShell->GetPresContext(), nullptr,
                                      GetFocusMoveActionCause(aFlags));
     }
-    if (doc && !aFocusInOtherContentProcess) {
+    if (doc && !focusInOtherContentProcess) {
       SendFocusOrBlurEvent(eFocus, presShell, doc, ToSupports(doc),
                            aFlags & FOCUSMETHOD_MASK, aWindowRaised);
     }
     if (GetFocusedBrowsingContext() == aWindow->GetBrowsingContext() &&
-        !mFocusedElement && !aFocusInOtherContentProcess) {
+        !mFocusedElement && !focusInOtherContentProcess) {
       SendFocusOrBlurEvent(eFocus, presShell, doc,
                            aWindow->GetCurrentInnerWindow(),
                            aFlags & FOCUSMETHOD_MASK, aWindowRaised);
@@ -2539,7 +2532,7 @@
 
         // if the object being focused is a remote browser, activate remote
         // content
-        ActivateRemoteFrameIfNeeded(*aElement);
+        ActivateRemoteFrameIfNeeded(*aElement, aActionId);
       }
 
       IMEStateManager::OnChangeFocus(presContext, aElement,
@@ -2552,7 +2545,10 @@
         aWindow->UpdateCommands(u"focus"_ns, nullptr, 0);
       }
 
-      if (!aFocusInOtherContentProcess) {
+      // XXX Bug 1675484, We should consider the possibility that something
+      // expects the event to fire on iframe element as in Blink compat-wise by
+      // now.
+      if (aFocusChanged || !focusInOtherContentProcess) {
         SendFocusOrBlurEvent(
             eFocus, presShell, aElement->GetComposedDoc(), aElement,
             aFlags & FOCUSMETHOD_MASK, aWindowRaised, isRefocus,
@@ -2805,7 +2801,7 @@
 }
 
 void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
-                                 CallerType aCallerType) {
+                                 CallerType aCallerType, uint64_t aActionId) {
   // don't raise windows that are already raised or are in the process of
   // being lowered
 
@@ -2838,11 +2834,23 @@
     nsCOMPtr<nsPIDOMWindowOuter> window(aWindow);
     RefPtr<nsFocusManager> self(this);
     NS_DispatchToCurrentThread(NS_NewRunnableFunction(
-        "nsFocusManager::RaiseWindow",
-        [self, window]() -> void { self->WindowRaised(window); }));
+        "nsFocusManager::RaiseWindow", [self, window, aActionId]() -> void {
+          self->WindowRaised(window, aActionId);
+        }));
     return;
   }
 
+  if (XRE_IsContentProcess()) {
+    BrowsingContext* bc = aWindow->GetBrowsingContext();
+    if (!bc->IsTop()) {
+      // Assume the raise below will succeed and run the raising synchronously
+      // in this process to make the focus event that is observable in this
+      // process fire in the right order relative to mouseup when we are here
+      // thanks to a mousedown.
+      WindowRaised(aWindow, aActionId);
+    }
+  }
+
 #if defined(XP_WIN)
   // Windows would rather we focus the child widget, otherwise, the toplevel
   // widget will always end up being focused. Fortunately, focusing the child
@@ -3539,7 +3547,8 @@
         if (tookFocus) {
           nsCOMPtr<nsPIDOMWindowOuter> window = docShell->GetWindow();
           if (window->GetFocusedElement() == mFocusedElement) {
-            Blur(GetFocusedBrowsingContext(), nullptr, true, true);
+            Blur(GetFocusedBrowsingContext(), nullptr, true, true,
+                 GenerateFocusActionId());
           } else {
             window->SetFocusedElement(nullptr);
           }
@@ -4758,6 +4767,10 @@
     // an iframe in that process became an out-of-process
     // iframe while the IPC broadcast that we're receiving
     // was in-flight. Let's just ignore this.
+    LOGFOCUS(
+        ("Ignored an attempt to set an in-process BrowsingContext [%p] as "
+         "focused from another process.",
+         aContext));
     return;
   }
   mFocusedBrowsingContextInContent = aContext;
@@ -4783,15 +4796,16 @@
 }
 
 void nsFocusManager::SetActiveBrowsingContextInContent(
-    mozilla::dom::BrowsingContext* aContext) {
+    mozilla::dom::BrowsingContext* aContext, uint64_t aActionId) {
   MOZ_ASSERT(!XRE_IsParentProcess());
   MOZ_ASSERT(!aContext || aContext->IsInProcess());
   mozilla::dom::ContentChild* contentChild =
       mozilla::dom::ContentChild::GetSingleton();
   MOZ_ASSERT(contentChild);
+
   if (aContext != mActiveBrowsingContextInContent) {
     if (aContext) {
-      contentChild->SendSetActiveBrowsingContext(aContext);
+      contentChild->SendSetActiveBrowsingContext(aContext, aActionId);
     } else if (mActiveBrowsingContextInContent) {
       // We want to sync this over only if this isn't happening
       // due to the active BrowsingContext switching processes,
@@ -4807,7 +4821,7 @@
             RefPtr<BrowserChild> browserChild = globalChild->GetBrowserChild();
             if (browserChild && !browserChild->IsDestroyed()) {
               contentChild->SendUnsetActiveBrowsingContext(
-                  mActiveBrowsingContextInContent);
+                  mActiveBrowsingContextInContent, aActionId);
             }
           }
         }
@@ -4816,6 +4830,7 @@
   }
   mActiveBrowsingContextInContentSetFromOtherProcess = false;
   mActiveBrowsingContextInContent = aContext;
+  mActionIdForActiveBrowsingContextInContent = aActionId;
   MaybeUnlockPointer(aContext);
 }
 
@@ -4830,10 +4845,15 @@
     // an iframe in that process became an out-of-process
     // iframe while the IPC broadcast that we're receiving
     // was in-flight. Let's just ignore this.
+    LOGFOCUS(
+        ("Ignored an attempt to set an in-process BrowsingContext [%p] as "
+         "active from another process.",
+         aContext));
     return;
   }
   mActiveBrowsingContextInContentSetFromOtherProcess = true;
   mActiveBrowsingContextInContent = aContext;
+  mActionIdForActiveBrowsingContextInContent = 0;
   MaybeUnlockPointer(aContext);
 }
 
@@ -4843,19 +4863,83 @@
   MOZ_ASSERT(aContext);
   if (mActiveBrowsingContextInContent == aContext) {
     mActiveBrowsingContextInContent = nullptr;
+    mActionIdForActiveBrowsingContextInContent = 0;
     MaybeUnlockPointer(nullptr);
+  } else {
+    LOGFOCUS(
+        ("Ignored an attempt to unset the active BrowsingContext [%p] from "
+         "another process.",
+         aContext));
   }
 }
 
-void nsFocusManager::SetActiveBrowsingContextInChrome(
-    mozilla::dom::BrowsingContext* aContext) {
-  mActiveBrowsingContextInChrome = aContext;
+void nsFocusManager::ReviseActiveBrowsingContext(
+    mozilla::dom::BrowsingContext* aContext, uint64_t aActionId) {
+  MOZ_ASSERT(XRE_IsContentProcess());
+  if (mActionIdForActiveBrowsingContextInContent == aActionId) {
+    mActiveBrowsingContextInContent = aContext;
+  } else {
+    LOGFOCUS(
+        ("Ignored a stale attempt to revise the active BrowsingContext [%p].",
+         aContext));
+  }
+}
+
+bool nsFocusManager::SetActiveBrowsingContextInChrome(
+    mozilla::dom::BrowsingContext* aContext, uint64_t aActionId) {
+  MOZ_ASSERT(aActionId);
+  if (ProcessPendingActiveBrowsingContextActionId(aActionId, aContext)) {
+    mActiveBrowsingContextInChrome = aContext;
+    return true;
+  }
+  return false;
 }
 
 BrowsingContext* nsFocusManager::GetActiveBrowsingContextInChrome() {
   return mActiveBrowsingContextInChrome;
 }
 
+void nsFocusManager::InsertNewFocusActionId(uint64_t aActionId) {
+  MOZ_ASSERT(XRE_IsParentProcess());
+  MOZ_ASSERT(!mPendingActiveBrowsingContextActions.Contains(aActionId));
+  mPendingActiveBrowsingContextActions.AppendElement(aActionId);
+}
+
+bool nsFocusManager::ProcessPendingActiveBrowsingContextActionId(
+    uint64_t aActionId, bool aSettingToNonNull) {
+  MOZ_ASSERT(XRE_IsParentProcess());
+  auto index = mPendingActiveBrowsingContextActions.IndexOf(aActionId);
+  if (index == nsTArray<uint64_t>::NoIndex) {
+    return false;
+  }
+  // When aSettingToNonNull is true, we need to remove one more
+  // element to remove the action id itself in addition to
+  // removing the older ones.
+  if (aSettingToNonNull) {
+    index++;
+  }
+  mPendingActiveBrowsingContextActions.RemoveElementsAt(0, index);
+  return true;
+}
+
+// static
+uint64_t nsFocusManager::GenerateFocusActionId() {
+  uint64_t id =
+      nsContentUtils::GenerateProcessSpecificId(++sFocusActionCounter);
+  if (XRE_IsParentProcess()) {
+    nsFocusManager* fm = GetFocusManager();
+    if (fm) {
+      fm->InsertNewFocusActionId(id);
+    }
+  } else {
+    mozilla::dom::ContentChild* contentChild =
+        mozilla::dom::ContentChild::GetSingleton();
+    MOZ_ASSERT(contentChild);
+    contentChild->SendInsertNewFocusActionId(id);
+  }
+  return id;
+}
+
 static bool IsInPointerLockContext(nsPIDOMWindowOuter* aWin) {
   return nsContentUtils::IsInPointerLockContext(
       aWin ? aWin->GetBrowsingContext() : nullptr);
diff -Nru firefox-84.0.2+build1/dom/base/nsFocusManager.h firefox-85.0+build1/dom/base/nsFocusManager.h
--- firefox-84.0.2+build1/dom/base/nsFocusManager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFocusManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/dom/Document.h"
 #include "nsIFocusManager.h"
 #include "nsIObserver.h"
-#include "nsIWidget.h"
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"
@@ -182,9 +181,6 @@
   };
   static mozilla::dom::Element* GetFocusedDescendant(
       nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
-      bool* aFocusIsOutOfProcess, nsPIDOMWindowOuter** aFocusedWindow);
-  static mozilla::dom::Element* GetFocusedDescendant(
-      nsPIDOMWindowOuter* aWindow, SearchRange aSearchRange,
       nsPIDOMWindowOuter** aFocusedWindow);
 
   /**
@@ -211,30 +207,31 @@
   /**
    * Setter for focusedWindow with CallerType
    */
-  nsresult SetFocusedWindowWithCallerType(mozIDOMWindowProxy* aWindowToFocus,
-                                          mozilla::dom::CallerType aCallerType);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult SetFocusedWindowWithCallerType(
+      mozIDOMWindowProxy* aWindowToFocus, mozilla::dom::CallerType aCallerType,
+      uint64_t aActionId);
 
   /**
    * Given an element, which must be the focused element, activate the remote
    * frame it embeds, if any.
    */
-  void ActivateRemoteFrameIfNeeded(mozilla::dom::Element&);
+  void ActivateRemoteFrameIfNeeded(mozilla::dom::Element&, uint64_t aActionId);
 
   /**
    * Raises the top-level window aWindow at the widget level.
    */
   void RaiseWindow(nsPIDOMWindowOuter* aWindow,
-                   mozilla::dom::CallerType aCallerType);
+                   mozilla::dom::CallerType aCallerType, uint64_t aActionId);
 
   /**
    * Called when a window has been raised.
    */
-  void WindowRaised(mozIDOMWindowProxy* aWindow);
+  void WindowRaised(mozIDOMWindowProxy* aWindow, uint64_t aActionId);
 
   /**
    * Called when a window has been lowered.
    */
-  void WindowLowered(mozIDOMWindowProxy* aWindow);
+  void WindowLowered(mozIDOMWindowProxy* aWindow, uint64_t aActionId);
 
   /**
    * Called when a new document in a window is shown.
@@ -248,7 +245,7 @@
    * Called when a document in a window has been hidden or otherwise can no
    * longer accept focus.
    */
-  void WindowHidden(mozIDOMWindowProxy* aWindow);
+  void WindowHidden(mozIDOMWindowProxy* aWindow, uint64_t aActionId);
 
   /**
    * Fire any events that have been delayed due to synchronized actions.
@@ -256,17 +253,12 @@
   void FireDelayedEvents(Document* aDocument);
 
   /**
-   * Used in a child process to indicate that the parent window is now
-   * active or deactive.
-   */
-  void ParentActivated(mozIDOMWindowProxy* aWindow, bool aActive);
-
-  /**
    * Indicate that a plugin wishes to take the focus. This is similar to a
    * normal focus except that the widget focus is not changed. Updating the
    * widget focus state is the responsibility of the caller.
    */
-  nsresult FocusPlugin(mozilla::dom::Element* aPlugin);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult
+  FocusPlugin(mozilla::dom::Element* aPlugin);
 
   static uint32_t FocusOptionsToFocusManagerFlags(
       const mozilla::dom::FocusOptions& aOptions);
@@ -333,9 +325,9 @@
    * All actual focus changes must use this method to do so. (as opposed
    * to those that update the focus in an inactive window for instance).
    */
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  void SetFocusInner(mozilla::dom::Element* aNewContent, int32_t aFlags,
-                     bool aFocusChanged, bool aAdjustWidget);
+  MOZ_CAN_RUN_SCRIPT void SetFocusInner(mozilla::dom::Element* aNewContent,
+                                        int32_t aFlags, bool aFocusChanged,
+                                        bool aAdjustWidget, uint64_t aActionId);
 
   /**
    * Returns true if aPossibleAncestor is the same as aWindow or an
@@ -422,19 +414,19 @@
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   bool Blur(mozilla::dom::BrowsingContext* aBrowsingContextToClear,
             mozilla::dom::BrowsingContext* aAncestorBrowsingContextToFocus,
-            bool aIsLeavingDocument, bool aAdjustWidget,
+            bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId,
             mozilla::dom::Element* aElementToFocus = nullptr);
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   void BlurFromOtherProcess(
       mozilla::dom::BrowsingContext* aFocusedBrowsingContext,
       mozilla::dom::BrowsingContext* aBrowsingContextToClear,
       mozilla::dom::BrowsingContext* aAncestorBrowsingContextToFocus,
-      bool aIsLeavingDocument, bool aAdjustWidget);
+      bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId);
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   bool BlurImpl(mozilla::dom::BrowsingContext* aBrowsingContextToClear,
                 mozilla::dom::BrowsingContext* aAncestorBrowsingContextToFocus,
                 bool aIsLeavingDocument, bool aAdjustWidget,
-                mozilla::dom::Element* aElementToFocus);
+                mozilla::dom::Element* aElementToFocus, uint64_t aActionId);
 
   /**
    * Focus an element in the active window and child frame.
@@ -465,8 +457,7 @@
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   void Focus(nsPIDOMWindowOuter* aWindow, mozilla::dom::Element* aContent,
              uint32_t aFlags, bool aIsNewDocument, bool aFocusChanged,
-             bool aWindowRaised, bool aAdjustWidget,
-             bool aFocusInOtherContentProcess,
+             bool aWindowRaised, bool aAdjustWidget, uint64_t aActionId,
              const mozilla::Maybe<BlurredElementInfo>& = mozilla::Nothing());
 
   /**
@@ -781,6 +772,11 @@
   void SetFocusedBrowsingContextInChrome(
       mozilla::dom::BrowsingContext* aContext);
 
+  void InsertNewFocusActionId(uint64_t aActionId);
+
+  bool ProcessPendingActiveBrowsingContextActionId(uint64_t aActionId,
+                                                   bool aSettingToNonNull);
+
  public:
   // Chrome-only
   // Gets the chrome process notion of what BrowsingContext is focused
@@ -797,7 +793,7 @@
   // Sets the BrowsingContext corresponding to top-level Web content
   // in the frontmost tab if focus is in Web content.
   void SetActiveBrowsingContextInContent(
-      mozilla::dom::BrowsingContext* aContext);
+      mozilla::dom::BrowsingContext* aContext, uint64_t aActionId);
 
   // Content-only
   // Receives notification of another process setting the top-level Web
@@ -812,12 +808,24 @@
   void UnsetActiveBrowsingContextFromOtherProcess(
       mozilla::dom::BrowsingContext* aContext);
 
+  // Content-only
+  // Receives a notification from parent that this content process's
+  // attempt to set the active browsing context was late and the
+  // prevailing browsing context is instead the first argument of
+  // this method call. This should be ignored if the second argument
+  // doesn't match the latest action id associated with setting the
+  // active browsing context in this process, because in that case,
+  // this revision is late.
+  void ReviseActiveBrowsingContext(mozilla::dom::BrowsingContext* aContext,
+                                   uint64_t aActionId);
+
   // Chrome-only
   // Sets the chrome process notion of what content believes to be
   // the top-level BrowsingContext in the frontmost tab when focus
   // is in Web content.
-  void SetActiveBrowsingContextInChrome(
-      mozilla::dom::BrowsingContext* aContext);
+  // Returns true if set and false if ignored.
+  bool SetActiveBrowsingContextInChrome(mozilla::dom::BrowsingContext* aContext,
+                                        uint64_t aActionId);
 
  public:
   // Chrome-only
@@ -826,19 +834,37 @@
   // is in Web content.
   mozilla::dom::BrowsingContext* GetActiveBrowsingContextInChrome();
 
+  static uint64_t GenerateFocusActionId();
+
  private:
   // In the chrome process, the currently active and front-most top-most
   // window. Not supposed to be used in a meaningful way in content
-  // processes.
+  // processes. For legacy reasons, this exists as a separate field
+  // instead of being derived from mFocusedWindow when needed, because
+  // the defined relation that mActiveWindow is supposed to be the same
+  // as or ancestor of mFocusedWindow is temporarily broken when a
+  // window is being raised or lowered.
   nsCOMPtr<nsPIDOMWindowOuter> mActiveWindow;
 
   // In a content process, the BrowsingContext corresponding to top-level
   // Web content in the active tab or nullptr if focus is not in a
   // BrowsingContextGroup that this process participates in. Synced
-  // across processes in a BrowsingContextGroup.
+  // across processes in a BrowsingContextGroup. This field exists
+  // separately from mFocusedBrowsingContextInContent instead of being being
+  // derived from it, because for legacy reasons the relation
+  // mFocusedBrowsingContextInContent->Top() == mActiveBrowsingContextInContent
+  // is temporarily broken when a window is being raised or lowered.
   // Not supposed to be used in a meaningful way in the chrome process.
   RefPtr<mozilla::dom::BrowsingContext> mActiveBrowsingContextInContent;
 
+  // If this content process set mActiveBrowsingContextInContent, this
+  // field holds the corresponding actionId so that
+  // mActiveBrowsingContextInContent can be revised of the parent rejects
+  // the update. This field is used for accepting revisions only if nothing
+  // else has updated mActiveBrowsingContextInContent before the revision
+  // arrives.
+  uint64_t mActionIdForActiveBrowsingContextInContent;
+
   // Whether or not mActiveBrowsingContextInContent was set from another process
   // or from this process.
   bool mActiveBrowsingContextInContentSetFromOtherProcess;
@@ -887,12 +913,74 @@
   // and fire them later.
   nsTArray<nsDelayedBlurOrFocusEvent> mDelayedBlurFocusEvents;
 
+  // Array of focus action ids for which we haven't seen an active browsing
+  // context set yet. As set is allowed to overwrite an unset. Therefore,
+  // an unset removes earlier ids but not the matching id. A set removes
+  // earlier ids and the matching id.
+  //
+  // Conceptually, active browsing context shouldn't have to exist as a
+  // field, because it should be possible to always derive it from the
+  // focused browsing context. Unfortunately, for legacy reasons, this
+  // is not the case while a window is being raised or lowered.
+  //
+  // Conceptually, it should be possible for the parent to manage the
+  // active browsing context. Unfortunately, for legacy reasons, the
+  // code for setting the active browsing context needs to reside in
+  // the content process to retain the existing and test-passing code
+  // flow.
+  //
+  // This, obviously, raises the issue of content processes racing to
+  // set the active browsing context. In particular, there is a pattern
+  // that the parent initiates actions that cause multiple content
+  // processes to mutate the active browsing context at almost the
+  // same time. When two native browser windows change order, the
+  // lowering isn't distinguished from the case of lowering the
+  // entire app. For this reason, the owner of the previous active
+  // browsing context tries to unset it and at almost the same time
+  // the another content process sets a new active browsing context.
+  // If the IPC messages for these unset and set actions were to
+  // arrive in the wrong order, this could get in the wrong state.
+  //
+  // To address this issue, the parent manages an authortative order
+  // of attempts to (un)set the active browsing context using the
+  // array mPendingActiveBrowsingContextActions.
+  //
+  // A process reserves a slot in the order by calling
+  // GenerateFocusActionId(). Per one call to GenerateFocusActionId(),
+  // there may be at most one action to set the active browsing context
+  // to a new value. There may be logically prior attempts to unset it
+  // (i.e. set it to nullptr). That is, if there are both attempts to
+  // unset and set the active browsing context with the same action id,
+  // the attempt to set to a non-null value wins.
+  //
+  // The completion of an action from reserting the slot in the order
+  // and actually performing the setting of the active browsing context
+  // may span multiple processes and IPC messages.
+  //
+  // The at-most-once property is not asserted, because the process
+  // claiming the position in the order and the process setting the
+  // active browsing context with that actionId may be different, and
+  // the act of using an actionId to set the active browsing context
+  // is used to delete stale items from the array to avoid excessive
+  // growth of the array.
+  //
+  // This arrangement raises the obvious question: Shouldn't
+  // out-of-order attempts to set the focused browsing context
+  // also have an array of actionIds ensuring a coherent global
+  // ordering? Probably yes, but a concrete need has not been
+  // demonstrated, yet.
+  nsTArray<uint64_t> mPendingActiveBrowsingContextActions;
+
   // If set to true, layout of the document of the event target should be
   // flushed before handling focus depending events.
   bool mEventHandlingNeedsFlush;
 
   static bool sTestMode;
 
+  // Process-specific counter for maintaining the prosess-specific
+  // uniqueness of actionIds.
+  static uint64_t sFocusActionCounter;
+
   // the single focus manager
   static mozilla::StaticRefPtr<nsFocusManager> sInstance;
 };
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameLoader.cpp firefox-85.0+build1/dom/base/nsFrameLoader.cpp
--- firefox-84.0.2+build1/dom/base/nsFrameLoader.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameLoader.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,8 @@
  * handling of loads in it, recursion-checking).
  */
 
+#include "nsFrameLoader.h"
+
 #include "base/basictypes.h"
 
 #include "prenv.h"
@@ -30,7 +32,6 @@
 #include "nsUnicharUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsIFrame.h"
 #include "nsIScrollableFrame.h"
@@ -53,6 +54,7 @@
 #include "nsIURI.h"
 #include "nsIXULRuntime.h"
 #include "nsNetUtil.h"
+#include "nsFocusManager.h"
 
 #include "nsGkAtoms.h"
 #include "nsNameSpaceManager.h"
@@ -76,6 +78,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_fission.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ChromeMessageSender.h"
@@ -891,15 +894,6 @@
   return true;
 }
 
-static bool ParentWindowIsActive(Document* aDoc) {
-  nsCOMPtr<nsPIWindowRoot> root = nsContentUtils::GetWindowRoot(aDoc);
-  if (root) {
-    nsPIDOMWindowOuter* rootWin = root->GetWindow();
-    return rootWin && rootWin->IsActive();
-  }
-  return false;
-}
-
 void nsFrameLoader::MaybeShowFrame() {
   nsIFrame* frame = GetPrimaryFrameOfOwningContent();
   if (frame) {
@@ -1089,15 +1083,20 @@
       return false;
     }
 
+    if (BrowserHost* bh = mRemoteBrowser->AsBrowserHost()) {
+      RefPtr<BrowsingContext> bc = bh->GetBrowsingContext()->Top();
+
+      // Set to the current activation of the window.
+      bc->SetIsActiveBrowserWindow(bc->GetIsActiveBrowserWindow());
+    }
+
     nsCOMPtr<nsISupports> container = mOwnerContent->OwnerDoc()->GetContainer();
     nsCOMPtr<nsIBaseWindow> baseWindow = do_QueryInterface(container);
     nsCOMPtr<nsIWidget> mainWidget;
     baseWindow->GetMainWidget(getter_AddRefs(mainWidget));
     nsSizeMode sizeMode =
         mainWidget ? mainWidget->SizeMode() : nsSizeMode_Normal;
-    OwnerShowInfo info(size, GetScrollbarPreference(mOwnerContent),
-                       ParentWindowIsActive(mOwnerContent->OwnerDoc()),
-                       sizeMode);
+    OwnerShowInfo info(size, GetScrollbarPreference(mOwnerContent), sizeMode);
     if (!mRemoteBrowser->Show(info)) {
       return false;
     }
@@ -1318,10 +1317,14 @@
   otherBrowserParent->SetOwnerElement(ourContent);
 
   // Update window activation state for the swapped owner content.
-  Unused << browserParent->SendParentActivated(
-      ParentWindowIsActive(otherContent->OwnerDoc()));
-  Unused << otherBrowserParent->SendParentActivated(
-      ParentWindowIsActive(ourContent->OwnerDoc()));
+  bool ourActive = otherBc->GetIsActiveBrowserWindow();
+  bool otherActive = ourBc->GetIsActiveBrowserWindow();
+  if (ourBc->IsTop()) {
+    ourBc->SetIsActiveBrowserWindow(otherActive);
+  }
+  if (otherBc->IsTop()) {
+    otherBc->SetIsActiveBrowserWindow(ourActive);
+  }
 
   MaybeUpdatePrimaryBrowserParent(eBrowserParentChanged);
   aOther->MaybeUpdatePrimaryBrowserParent(eBrowserParentChanged);
@@ -1854,7 +1857,7 @@
     if (aForProcessSwitch) {
       // This should suspend all future progress events from this BrowserParent,
       // since we're going to tear it down after stopping the docshell in it.
-      browserParent->SuspendProgressEventsUntilAfterNextLoadStarts();
+      browserParent->SuspendProgressEvents();
     }
   }
 
@@ -2063,6 +2066,8 @@
   return browserFrame ? browserFrame->GetReallyIsBrowser() : false;
 }
 
+nsIContent* nsFrameLoader::GetParentObject() const { return mOwnerContent; }
+
 void nsFrameLoader::AssertSafeToInit() {
   MOZ_DIAGNOSTIC_ASSERT(nsContentUtils::IsSafeToRunScript() ||
                             mOwnerContent->OwnerDoc()->IsStaticDocument(),
@@ -2211,6 +2216,8 @@
     sandboxFlags = iframe->GetSandboxFlags();
   }
   ApplySandboxFlags(sandboxFlags);
+  MOZ_ALWAYS_SUCCEEDS(mPendingBrowsingContext->SetInitialSandboxFlags(
+      mPendingBrowsingContext->GetSandboxFlags()));
 
   if (OwnerIsMozBrowserFrame()) {
     // For inproc frames, set the docshell properties.
@@ -2666,6 +2673,14 @@
   return false;
 }
 
+nsIFrame* nsFrameLoader::GetPrimaryFrameOfOwningContent() const {
+  return mOwnerContent ? mOwnerContent->GetPrimaryFrame() : nullptr;
+}
+
+Document* nsFrameLoader::GetOwnerDoc() const {
+  return mOwnerContent ? mOwnerContent->OwnerDoc() : nullptr;
+}
+
 bool nsFrameLoader::IsRemoteFrame() {
   if (mIsRemoteFrame) {
     MOZ_ASSERT(!GetDocShell(), "Found a remote frame with a DocShell");
@@ -2713,7 +2728,7 @@
     return;
   }
 
-  browserParent->Activate();
+  browserParent->Activate(nsFocusManager::GenerateFocusActionId());
 }
 
 void nsFrameLoader::DeactivateRemoteFrame(ErrorResult& aRv) {
@@ -2723,7 +2738,7 @@
     return;
   }
 
-  browserParent->Deactivate(false);
+  browserParent->Deactivate(false, nsFocusManager::GenerateFocusActionId());
 }
 
 void nsFrameLoader::SendCrossProcessMouseEvent(const nsAString& aType, float aX,
@@ -3225,6 +3240,8 @@
       info.mSheetCount = aInfo.sheetCount();
       info.mTotalPageCount = aInfo.totalPageCount();
       info.mHasSelection = aInfo.hasSelection();
+      info.mHasSelfSelection = aInfo.hasSelfSelection();
+      info.mIsEmpty = aInfo.isEmpty();
       promise->MaybeResolve(info);
     } else {
       promise->MaybeRejectWithUnknownError("Print preview failed");
@@ -3474,6 +3491,10 @@
   if (!context->GetDocShell() && XRE_IsParentProcess()) {
     CanonicalBrowsingContext* canonical =
         CanonicalBrowsingContext::Cast(context);
+    if (!canonical->GetCurrentWindowGlobal()) {
+      aRecv->OnError(NS_ERROR_NO_CONTENT);
+      return;
+    }
     RefPtr<BrowserParent> browserParent =
         canonical->GetCurrentWindowGlobal()->GetBrowserParent();
     browserParent->StartPersistence(canonical, aRecv, aRv);
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameLoader.h firefox-85.0+build1/dom/base/nsFrameLoader.h
--- firefox-84.0.2+build1/dom/base/nsFrameLoader.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameLoader.h	2021-01-18 19:58:09.000000000 +0000
@@ -21,8 +21,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/WindowProxyHolder.h"
@@ -30,7 +28,7 @@
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDocShell.h"
-#include "nsFrameMessageManager.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "nsID.h"
 #include "nsIFrame.h"
 #include "nsIMutationObserver.h"
@@ -61,6 +59,8 @@
 namespace dom {
 class ChromeMessageSender;
 class ContentParent;
+class Document;
+class Element;
 class TabListener;
 class InProcessBrowserChildMessageManager;
 class MessageSender;
@@ -262,7 +262,7 @@
    */
   bool OwnerIsMozBrowserFrame();
 
-  nsIContent* GetParentObject() const { return mOwnerContent; }
+  nsIContent* GetParentObject() const;
 
   /**
    * MessageManagerCallback methods that we override.
@@ -313,17 +313,13 @@
    * Return the primary frame for our owning content, or null if it
    * can't be found.
    */
-  nsIFrame* GetPrimaryFrameOfOwningContent() const {
-    return mOwnerContent ? mOwnerContent->GetPrimaryFrame() : nullptr;
-  }
+  nsIFrame* GetPrimaryFrameOfOwningContent() const;
 
   /**
    * Return the document that owns this, or null if we don't have
    * an owner.
    */
-  Document* GetOwnerDoc() const {
-    return mOwnerContent ? mOwnerContent->OwnerDoc() : nullptr;
-  }
+  Document* GetOwnerDoc() const;
 
   /**
    * Returns whether this frame is a remote frame.
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameLoaderOwner.cpp firefox-85.0+build1/dom/base/nsFrameLoaderOwner.cpp
--- firefox-84.0.2+build1/dom/base/nsFrameLoaderOwner.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameLoaderOwner.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsFrameLoaderOwner.h"
 #include "nsFrameLoader.h"
 #include "nsFocusManager.h"
+#include "nsNetUtil.h"
 #include "nsSubDocumentFrame.h"
 #include "nsQueryObject.h"
 #include "mozilla/AsyncEventDispatcher.h"
@@ -151,14 +152,6 @@
     }
   }
 
-  // If we're switching process for an in progress load, then suppress
-  // progress events from the new BrowserParent to prevent duplicate
-  // events for the new initial about:blank and the new 'start' event.
-  if (aSwitchingInProgressLoad && mFrameLoader->GetBrowserParent()) {
-    mFrameLoader->GetBrowserParent()
-        ->SuspendProgressEventsUntilAfterNextLoadStarts();
-  }
-
   // Now that we've got a new FrameLoader, we need to reset our
   // nsSubDocumentFrame to use the new FrameLoader.
   if (nsSubDocumentFrame* ourFrame = do_QueryFrame(owner->GetPrimaryFrame())) {
@@ -169,7 +162,8 @@
   // we need to update that state for the new BrowserParent too.
   if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
     if (fm->GetFocusedElement() == owner) {
-      fm->ActivateRemoteFrameIfNeeded(*owner);
+      fm->ActivateRemoteFrameIfNeeded(*owner,
+                                      nsFocusManager::GenerateFocusActionId());
     }
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameLoaderOwner.h firefox-85.0+build1/dom/base/nsFrameLoaderOwner.h
--- firefox-84.0.2+build1/dom/base/nsFrameLoaderOwner.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameLoaderOwner.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,9 +8,9 @@
 #define nsFrameLoaderOwner_h_
 
 #include <functional>
+#include "nsFrameLoader.h"
 #include "nsISupports.h"
 
-class nsFrameLoader;
 namespace mozilla {
 class ErrorResult;
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameMessageManager.cpp firefox-85.0+build1/dom/base/nsFrameMessageManager.cpp
--- firefox-84.0.2+build1/dom/base/nsFrameMessageManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameMessageManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,59 +4,109 @@
  * 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 "base/basictypes.h"
-
 #include "nsFrameMessageManager.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <new>
+#include <utility>
 #include "ContentChild.h"
+#include "ErrorList.h"
 #include "GeckoProfiler.h"
-#include "nsASCIIMask.h"
-#include "nsContentUtils.h"
-#include "nsError.h"
-#include "nsIXPConnect.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
-#include "nsJSUtils.h"
-#include "nsJSPrincipals.h"
-#include "nsNetUtil.h"
-#include "mozilla/dom/ScriptLoader.h"
-#include "nsFrameLoader.h"
-#include "nsIInputStream.h"
-#include "nsIScriptError.h"
-#include "nsIConsoleService.h"
-#include "nsIMemoryReporter.h"
-#include "nsIProtocolHandler.h"
-#include "xpcpublic.h"
+#include "base/process_util.h"
+#include "chrome/common/ipc_channel.h"
 #include "js/CompilationAndEvaluation.h"
 #include "js/JSON.h"
 #include "js/SourceText.h"
+#include "js/StructuredClone.h"
+#include "js/Wrapper.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/CycleCollectedJSContext.h"
-#include "mozilla/Preferences.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/ScriptPreloader.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/TypedEnumBits.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/CallbackObject.h"
 #include "mozilla/dom/ChildProcessMessageManager.h"
 #include "mozilla/dom/ChromeMessageBroadcaster.h"
-#include "mozilla/dom/File.h"
+#include "mozilla/dom/ContentProcessMessageManager.h"
+#include "mozilla/dom/DOMTypes.h"
+#include "mozilla/dom/MessageBroadcaster.h"
+#include "mozilla/dom/MessageListenerManager.h"
 #include "mozilla/dom/MessageManagerBinding.h"
 #include "mozilla/dom/MessagePort.h"
-#include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/ContentProcessMessageManager.h"
 #include "mozilla/dom/ParentProcessMessageManager.h"
-#include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/ProcessMessageManager.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/SameProcessMessageQueue.h"
+#include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/ToJSValue.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "mozilla/dom/ipc/SharedMap.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
-#include "mozilla/dom/DOMStringList.h"
+#include "nsASCIIMask.h"
+#include "nsBaseHashtable.h"
+#include "nsCOMPtr.h"
+#include "nsClassHashtable.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContentUtils.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsFrameMessageManager.h"
+#include "nsHashKeys.h"
+#include "nsIChannel.h"
+#include "nsIConsoleService.h"
+#include "nsIContentPolicy.h"
+#include "nsIInputStream.h"
+#include "nsILoadInfo.h"
+#include "nsIMemoryReporter.h"
+#include "nsIMessageManager.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIProtocolHandler.h"
+#include "nsIScriptError.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsIURI.h"
+#include "nsIWeakReferenceUtils.h"
+#include "nsIXPConnect.h"
+#include "nsJSUtils.h"
+#include "nsLiteralString.h"
+#include "nsNetUtil.h"
 #include "nsPrintfCString.h"
-#include "nsXULAppAPI.h"
 #include "nsQueryObject.h"
-#include "xpcprivate.h"
-#include <algorithm>
-#include "chrome/common/ipc_channel.h"  // for IPC::Channel::kMaximumMessageSize
+#include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTObserverArray.h"
+#include "nsTPromiseFlatString.h"
+#include "nsTStringRepr.h"
+#include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
+#include "nscore.h"
+#include "xpcpublic.h"
 
 #ifdef XP_WIN
 #  if defined(SendMessage)
diff -Nru firefox-84.0.2+build1/dom/base/nsFrameMessageManager.h firefox-85.0+build1/dom/base/nsFrameMessageManager.h
--- firefox-84.0.2+build1/dom/base/nsFrameMessageManager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsFrameMessageManager.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,43 +7,45 @@
 #ifndef nsFrameMessageManager_h__
 #define nsFrameMessageManager_h__
 
-#include "nsIMessageManager.h"
-#include "nsIObserver.h"
+#include <cstdint>
+#include <string.h>
+#include <utility>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
+#include "js/Value.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/TypedEnumBits.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/ipc/StructuredCloneData.h"
 #include "nsCOMPtr.h"
-#include "nsCOMArray.h"
-#include "nsTArray.h"
-#include "nsAtom.h"
+#include "nsClassHashtable.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsTArray.h"
-#include "nsIPrincipal.h"
 #include "nsDataHashtable.h"
-#include "nsClassHashtable.h"
-#include "mozilla/Services.h"
-#include "mozilla/StaticPtr.h"
+#include "nsHashKeys.h"
+#include "nsIMessageManager.h"
+#include "nsIObserver.h"
 #include "nsIObserverService.h"
-#include "nsThreadUtils.h"
+#include "nsISupports.h"
 #include "nsIWeakReferenceUtils.h"
-#include "mozilla/Attributes.h"
-#include "js/RootingAPI.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
 #include "nsTObserverArray.h"
-#include "mozilla/TypedEnumBits.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/dom/CallbackObject.h"
-#include "mozilla/dom/SameProcessMessageQueue.h"
-#include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "nscore.h"
 
 class nsFrameLoader;
+class nsIRunnable;
 
 namespace mozilla {
 
-namespace ipc {
-class FileDescriptor;
-}
+class ErrorResult;
 
 namespace dom {
 
-class ContentParent;
-class ContentChild;
 class ChildProcessMessageManager;
 class ChromeMessageBroadcaster;
 class ClonedMessageData;
@@ -51,13 +53,12 @@
 class MessageListener;
 class MessageListenerManager;
 class MessageManagerReporter;
-template <typename T>
-class Optional;
 class ParentProcessMessageManager;
 class ProcessMessageManager;
 
 namespace ipc {
 
+class MessageManagerCallback;
 class WritableSharedMap;
 
 // Note: we round the time we spend to the nearest millisecond. So a min value
@@ -74,43 +75,6 @@
 };
 MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(MessageManagerFlags);
 
-class MessageManagerCallback {
- public:
-  virtual ~MessageManagerCallback() = default;
-
-  virtual bool DoLoadMessageManagerScript(const nsAString& aURL,
-                                          bool aRunInGlobalScope) {
-    return true;
-  }
-
-  virtual bool DoSendBlockingMessage(const nsAString& aMessage,
-                                     StructuredCloneData& aData,
-                                     nsTArray<StructuredCloneData>* aRetVal) {
-    return true;
-  }
-
-  virtual nsresult DoSendAsyncMessage(const nsAString& aMessage,
-                                      StructuredCloneData& aData) {
-    return NS_OK;
-  }
-
-  virtual mozilla::dom::ProcessMessageManager* GetProcessMessageManager()
-      const {
-    return nullptr;
-  }
-
-  virtual void DoGetRemoteType(nsACString& aRemoteType,
-                               ErrorResult& aError) const;
-
- protected:
-  bool BuildClonedMessageDataForParent(ContentParent* aParent,
-                                       StructuredCloneData& aData,
-                                       ClonedMessageData& aClonedData);
-  bool BuildClonedMessageDataForChild(ContentChild* aChild,
-                                      StructuredCloneData& aData,
-                                      ClonedMessageData& aClonedData);
-};
-
 void UnpackClonedMessageDataForParent(const ClonedMessageData& aClonedData,
                                       StructuredCloneData& aData);
 
diff -Nru firefox-84.0.2+build1/dom/base/nsGlobalWindowCommands.cpp firefox-85.0+build1/dom/base/nsGlobalWindowCommands.cpp
--- firefox-84.0.2+build1/dom/base/nsGlobalWindowCommands.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsGlobalWindowCommands.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/TextEvents.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Selection.h"
+#include "mozilla/intl/WordBreaker.h"
 #include "mozilla/layers/KeyboardMap.h"
 
 using namespace mozilla;
@@ -946,34 +947,37 @@
     return NS_ERROR_FAILURE;
   }
 
-  WidgetQueryContentEvent charAt(true, eQueryCharacterAtPoint, widget);
-  charAt.mRefPoint.x = x;
-  charAt.mRefPoint.y = y;
+  WidgetQueryContentEvent queryCharAtPointEvent(true, eQueryCharacterAtPoint,
+                                                widget);
+  queryCharAtPointEvent.mRefPoint.x = x;
+  queryCharAtPointEvent.mRefPoint.y = y;
   ContentEventHandler handler(presContext);
-  handler.OnQueryCharacterAtPoint(&charAt);
+  handler.OnQueryCharacterAtPoint(&queryCharAtPointEvent);
 
-  if (NS_WARN_IF(!charAt.mSucceeded) ||
-      charAt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND) {
+  if (NS_WARN_IF(queryCharAtPointEvent.Failed()) ||
+      queryCharAtPointEvent.DidNotFindChar()) {
     return NS_ERROR_FAILURE;
   }
 
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, widget);
-  handler.OnQuerySelectedText(&selection);
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 widget);
+  handler.OnQuerySelectedText(&querySelectedTextEvent);
+  if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection())) {
+    return NS_ERROR_FAILURE;
+  }
 
-  bool useSelection = false;
-  uint32_t offset = charAt.mReply.mOffset;
+  uint32_t offset = queryCharAtPointEvent.mReply->StartOffset();
   uint32_t begin, length;
 
   // macOS prioritizes user selected text if the current point falls within the
   // selection range. So we check the selection first.
-  if (selection.mSucceeded) {
-    begin = selection.mReply.mOffset;
-    length = selection.mReply.mString.Length();
-    useSelection = (offset >= begin && offset < (begin + length));
-  }
-
-  if (!useSelection) {
-    WidgetQueryContentEvent textContent(true, eQueryTextContent, widget);
+  if (querySelectedTextEvent.FoundSelection() &&
+      querySelectedTextEvent.mReply->IsOffsetInRange(offset)) {
+    begin = querySelectedTextEvent.mReply->StartOffset();
+    length = querySelectedTextEvent.mReply->DataLength();
+  } else {
+    WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent,
+                                                  widget);
     // OSX 10.7 queries 50 characters before/after current point.  So we fetch
     // same length.
     if (offset > 50) {
@@ -981,10 +985,10 @@
     } else {
       offset = 0;
     }
-    textContent.InitForQueryTextContent(offset, 100);
-    handler.OnQueryTextContent(&textContent);
-    if (NS_WARN_IF(!textContent.mSucceeded ||
-                   textContent.mReply.mString.IsEmpty())) {
+    queryTextContentEvent.InitForQueryTextContent(offset, 100);
+    handler.OnQueryTextContent(&queryTextContentEvent);
+    if (NS_WARN_IF(queryTextContentEvent.Failed()) ||
+        NS_WARN_IF(queryTextContentEvent.mReply->IsDataEmpty())) {
       return NS_ERROR_FAILURE;
     }
 
@@ -997,8 +1001,9 @@
     }
 
     mozilla::intl::WordRange range = wordBreaker->FindWord(
-        textContent.mReply.mString.get(), textContent.mReply.mString.Length(),
-        charAt.mReply.mOffset - offset);
+        queryTextContentEvent.mReply->DataRef().get(),
+        queryTextContentEvent.mReply->DataLength(),
+        queryCharAtPointEvent.mReply->StartOffset() - offset);
     if (range.mEnd == range.mBegin) {
       return NS_ERROR_FAILURE;
     }
@@ -1006,26 +1011,27 @@
     length = range.mEnd - range.mBegin;
   }
 
-  WidgetQueryContentEvent lookUpContent(true, eQueryTextContent, widget);
-  lookUpContent.InitForQueryTextContent(begin, length);
-  lookUpContent.RequestFontRanges();
-  handler.OnQueryTextContent(&lookUpContent);
-  if (NS_WARN_IF(!lookUpContent.mSucceeded ||
-                 lookUpContent.mReply.mString.IsEmpty())) {
+  WidgetQueryContentEvent queryLookUpContentEvent(true, eQueryTextContent,
+                                                  widget);
+  queryLookUpContentEvent.InitForQueryTextContent(begin, length);
+  queryLookUpContentEvent.RequestFontRanges();
+  handler.OnQueryTextContent(&queryLookUpContentEvent);
+  if (NS_WARN_IF(queryLookUpContentEvent.Failed()) ||
+      NS_WARN_IF(queryLookUpContentEvent.mReply->IsDataEmpty())) {
     return NS_ERROR_FAILURE;
   }
 
-  WidgetQueryContentEvent charRect(true, eQueryTextRect, widget);
-  charRect.InitForQueryTextRect(begin, length);
-  handler.OnQueryTextRect(&charRect);
-  if (NS_WARN_IF(!charRect.mSucceeded)) {
+  WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, widget);
+  queryTextRectEvent.InitForQueryTextRect(begin, length);
+  handler.OnQueryTextRect(&queryTextRectEvent);
+  if (NS_WARN_IF(queryTextRectEvent.Failed())) {
     return NS_ERROR_FAILURE;
   }
 
-  widget->LookUpDictionary(lookUpContent.mReply.mString,
-                           lookUpContent.mReply.mFontRanges,
-                           charRect.mReply.mWritingMode.IsVertical(),
-                           charRect.mReply.mRect.TopLeft());
+  widget->LookUpDictionary(queryLookUpContentEvent.mReply->DataRef(),
+                           queryLookUpContentEvent.mReply->mFontRanges,
+                           queryTextRectEvent.mReply->mWritingMode.IsVertical(),
+                           queryTextRectEvent.mReply->mRect.TopLeft());
 
   return NS_OK;
 }
diff -Nru firefox-84.0.2+build1/dom/base/nsGlobalWindowInner.cpp firefox-85.0+build1/dom/base/nsGlobalWindowInner.cpp
--- firefox-84.0.2+build1/dom/base/nsGlobalWindowInner.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsGlobalWindowInner.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,166 +4,306 @@
  * 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 "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
 
-#include <algorithm>
-
-#include "mozilla/MemoryReporting.h"
-
-// Local Includes
+#include <inttypes.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <cstdint>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include "AudioChannelService.h"
 #include "AutoplayPolicy.h"
+#include "Crypto.h"
+#include "GeckoProfiler.h"
+#include "MainThreadUtils.h"
 #include "Navigator.h"
-#include "nsContentSecurityManager.h"
-#include "nsScreen.h"
-#include "nsHistory.h"
-#include "nsDOMNavigationTiming.h"
-#include "nsIDOMStorageManager.h"
+#include "PaintWorkletImpl.h"
+#include "SessionStorageCache.h"
+#include "Units.h"
+#include "VRManagerChild.h"
+#include "WindowDestroyedEvent.h"
+#include "WindowNamedPropertiesHandler.h"
+#include "js/ComparisonOperators.h"
+#include "js/CompileOptions.h"
+#include "js/Id.h"
+#include "js/PropertyDescriptor.h"
+#include "js/RealmOptions.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
+#include "js/Value.h"
+#include "js/Warnings.h"
+#include "js/shadow/String.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
+#include "mozIDOMWindow.h"
+#include "moz_external_vr.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/BaseProfilerMarkersPrerequisites.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/CallState.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/EventQueue.h"
+#include "mozilla/FloatingPoint.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/Likely.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/PermissionDelegateHandler.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/ProcessHangMonitor.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/ScrollOrigin.h"
+#include "mozilla/ScrollTypes.h"
+#include "mozilla/Services.h"
+#include "mozilla/SizeOfState.h"
+#include "mozilla/Span.h"
+#include "mozilla/SpinEventLoopUntil.h"
+#include "mozilla/Sprintf.h"
+#include "mozilla/StaticPrefs_browser.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StorageAccess.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/AudioContext.h"
+#include "mozilla/dom/BarProps.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/CSPEvalChecker.h"
 #include "mozilla/dom/CallbackDebuggerNotification.h"
-#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/ChromeMessageBroadcaster.h"
+#include "mozilla/dom/ClientInfo.h"
+#include "mozilla/dom/ClientManager.h"
+#include "mozilla/dom/ClientSource.h"
+#include "mozilla/dom/ClientState.h"
+#include "mozilla/dom/ClientsBinding.h"
+#include "mozilla/dom/Console.h"
 #include "mozilla/dom/ContentFrameMessageManager.h"
 #include "mozilla/dom/ContentMediaController.h"
-#include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/CSPEvalChecker.h"
+#include "mozilla/dom/CustomElementRegistry.h"
+#include "mozilla/dom/DOMJSProxyHandler.h"
 #include "mozilla/dom/DebuggerNotification.h"
+#include "mozilla/dom/DebuggerNotificationBinding.h"
+#include "mozilla/dom/DebuggerNotificationManager.h"
+#include "mozilla/dom/DispatcherTrait.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
-#include "mozilla/dom/DOMJSProxyHandler.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/Fetch.h"
+#include "mozilla/dom/Gamepad.h"
+#include "mozilla/dom/GamepadManager.h"
+#include "mozilla/dom/HashChangeEvent.h"
+#include "mozilla/dom/HashChangeEventBinding.h"
+#include "mozilla/dom/IDBFactory.h"
+#include "mozilla/dom/IdleRequest.h"
+#include "mozilla/dom/ImageBitmap.h"
+#include "mozilla/dom/ImageBitmapSource.h"
+#include "mozilla/dom/InstallTriggerBinding.h"
+#include "mozilla/dom/IntlUtils.h"
+#include "mozilla/dom/JSExecutionContext.h"
+#include "mozilla/dom/LSObject.h"
+#include "mozilla/dom/LoadedScript.h"
 #include "mozilla/dom/LocalStorage.h"
 #include "mozilla/dom/LocalStorageCommon.h"
-#include "mozilla/dom/LSObject.h"
+#include "mozilla/dom/Location.h"
+#include "mozilla/dom/MediaKeys.h"
+#include "mozilla/dom/NavigatorBinding.h"
+#include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PartitionedLocalStorage.h"
-#include "mozilla/dom/Storage.h"
-#include "mozilla/dom/IdleRequest.h"
 #include "mozilla/dom/Performance.h"
+#include "mozilla/dom/PopStateEvent.h"
+#include "mozilla/dom/PopStateEventBinding.h"
+#include "mozilla/dom/PopupBlocker.h"
+#include "mozilla/dom/PrimitiveConversions.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ScriptLoader.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/ServiceWorker.h"
+#include "mozilla/dom/ServiceWorkerDescriptor.h"
+#include "mozilla/dom/ServiceWorkerRegistration.h"
 #include "mozilla/dom/SessionStorageManager.h"
+#include "mozilla/dom/SharedWorker.h"
+#include "mozilla/dom/Storage.h"
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/StorageNotifierService.h"
 #include "mozilla/dom/StorageUtils.h"
+#include "mozilla/dom/TabMessageTypes.h"
 #include "mozilla/dom/Timeout.h"
 #include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/dom/TimeoutManager.h"
+#include "mozilla/dom/ToJSValue.h"
+#include "mozilla/dom/U2F.h"
+#include "mozilla/dom/VRDisplay.h"
+#include "mozilla/dom/VRDisplayEvent.h"
+#include "mozilla/dom/VRDisplayEventBinding.h"
+#include "mozilla/dom/VREventObserver.h"
 #include "mozilla/dom/VisualViewport.h"
-#include "mozilla/dom/WindowProxyHolder.h"
-#ifdef MOZ_GLEAN
-#  include "mozilla/glean/Glean.h"
-#endif
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Result.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#  include "mozilla/dom/WindowOrientationObserver.h"
-#endif
-#include "nsDOMOfflineResourceList.h"
-#include "nsICookieService.h"
-#include "nsError.h"
-#include "nsISizeOfEventTarget.h"
-#include "nsDOMJSUtils.h"
-#include "nsArrayUtils.h"
 #include "mozilla/dom/WakeLock.h"
-#include "mozilla/dom/power/PowerManagerService.h"
-#include "nsIContentSecurityPolicy.h"
-#include "nsIDocShellTreeOwner.h"
-#include "nsIDocumentLoader.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIScriptContext.h"
-#include "nsIController.h"
-#include "nsISlowScriptDebug.h"
-#include "nsWindowMemoryReporter.h"
-#include "nsWindowSizes.h"
-#include "WindowNamedPropertiesHandler.h"
-#include "nsFrameSelection.h"
-#include "nsNetUtil.h"
-#include "nsVariant.h"
-#include "nsPrintfCString.h"
+#include "mozilla/dom/WebIDLGlobalNameHash.h"
+#include "mozilla/dom/WindowBinding.h"
+#include "mozilla/dom/WindowContext.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "mozilla/dom/WindowProxyHolder.h"
+#include "mozilla/dom/WorkerCommon.h"
+#include "mozilla/dom/Worklet.h"
+#include "mozilla/dom/XRPermissionRequest.h"
+#include "mozilla/dom/cache/CacheStorage.h"
+#include "mozilla/dom/cache/Types.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/BasePoint.h"
+#include "mozilla/gfx/BaseRect.h"
+#include "mozilla/gfx/BaseSize.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/intl/LocaleService.h"
-#include "WindowDestroyedEvent.h"
-
-// Helper Classes
-#include "nsJSUtils.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
-#include "js/Warnings.h"  // JS::WarnASCII
-#include "js/Wrapper.h"
-#include "nsCharSeparatedTokenizer.h"
-#include "nsReadableUtils.h"
-#include "nsJSEnvironment.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Likely.h"
-#include "mozilla/Sprintf.h"
-#include "mozilla/StorageAccess.h"
-#include "mozilla/Unused.h"
-
-// Other Classes
-#include "mozilla/dom/BarProps.h"
-#include "nsContentCID.h"
-#include "nsLayoutStatics.h"
+#include "mozilla/net/CookieJarSettings.h"
+#include "nsAtom.h"
+#include "nsBaseHashtable.h"
 #include "nsCCUncollectableMarker.h"
-#include "mozilla/dom/WorkerCommon.h"
-#include "mozilla/dom/ToJSValue.h"
-#include "nsJSPrincipals.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/Debug.h"
-#include "mozilla/EventListenerManager.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/MouseEvents.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/ProcessHangMonitor.h"
-#include "mozilla/ScrollTypes.h"
-#include "mozilla/ThrottledEventQueue.h"
-#include "AudioChannelService.h"
-#include "nsAboutProtocolUtils.h"
-#include "nsCharTraits.h"  // NS_IS_HIGH/LOW_SURROGATE
-#include "PostMessageEvent.h"
-#include "mozilla/dom/DocGroup.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "PaintWorkletImpl.h"
-
-// Interfaces Needed
-#include "nsIFrame.h"
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsCRTGlue.h"
 #include "nsCanvasFrame.h"
-#include "nsIWidget.h"
-#include "nsIWidgetListener.h"
+#include "nsCharTraits.h"
+#include "nsCheapSets.h"
+#include "nsContentUtils.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionTraversalCallback.h"
+#include "nsDOMNavigationTiming.h"
+#include "nsDOMOfflineResourceList.h"
+#include "nsDebug.h"
+#include "nsDocShell.h"
+#include "nsFocusManager.h"
+#include "nsFrameMessageManager.h"
+#include "nsGkAtoms.h"
+#include "nsGlobalWindowOuter.h"
+#include "nsHashKeys.h"
+#include "nsHistory.h"
+#include "nsIAddonPolicyService.h"
+#include "nsIArray.h"
 #include "nsIBaseWindow.h"
+#include "nsIBrowserChild.h"
+#include "nsICancelableRunnable.h"
+#include "nsIChannel.h"
+#include "nsIContentSecurityPolicy.h"
+#include "nsIControllers.h"
+#include "nsICookieJarSettings.h"
+#include "nsICookieService.h"
+#include "nsID.h"
+#include "nsIDOMStorageManager.h"
 #include "nsIDeviceSensors.h"
-#include "nsIContent.h"
 #include "nsIDocShell.h"
-#include "mozilla/dom/Document.h"
-#include "Crypto.h"
-#include "nsDOMString.h"
-#include "nsThreadUtils.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDocShellTreeOwner.h"
+#include "nsIDocumentLoader.h"
+#include "nsIDragService.h"
+#include "nsIFocusManager.h"
+#include "nsIFrame.h"
+#include "nsIGlobalObject.h"
+#include "nsIIOService.h"
+#include "nsIIdleRunnable.h"
+#include "nsIInterfaceRequestorUtils.h"
 #include "nsILoadContext.h"
-#include "nsIScrollableFrame.h"
-#include "nsView.h"
-#include "nsViewManager.h"
+#include "nsILoadGroup.h"
+#include "nsILoadInfo.h"
+#include "nsINamed.h"
+#include "nsINode.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIPermission.h"
+#include "nsIPermissionManager.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrincipal.h"
 #include "nsIPrompt.h"
-#include "nsIAddonPolicyService.h"
-#include "nsIWebNavigation.h"
+#include "nsIRunnable.h"
+#include "nsIScreen.h"
+#include "nsIScreenManager.h"
+#include "nsIScriptContext.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsIScrollableFrame.h"
+#include "nsISerialEventTarget.h"
+#include "nsISimpleEnumerator.h"
+#include "nsISizeOfEventTarget.h"
+#include "nsISlowScriptDebug.h"
+#include "nsISupportsUtils.h"
+#include "nsIThread.h"
+#include "nsITimedChannel.h"
+#include "nsIURI.h"
+#include "nsIVariant.h"
+#include "nsIWeakReference.h"
 #include "nsIWebBrowserChrome.h"
-#include "nsDOMCID.h"
-#include "nsDOMWindowUtils.h"
-#include "nsIControllers.h"
-#include "nsGlobalWindowCommands.h"
+#include "nsIWebNavigation.h"
+#include "nsIWebProgressListener.h"
+#include "nsIWidget.h"
+#include "nsIWidgetListener.h"
+#include "nsJSPrincipals.h"
+#include "nsJSUtils.h"
+#include "nsLayoutStatics.h"
+#include "nsLiteralString.h"
+#include "nsNetUtil.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
+#include "nsPIWindowRoot.h"
+#include "nsPoint.h"
+#include "nsPresContext.h"
 #include "nsQueryObject.h"
-#include "nsContentUtils.h"
-#include "nsCSSProps.h"
-#include "mozilla/EventDispatcher.h"
-#include "mozilla/EventStateManager.h"
-#include "nsIObserverService.h"
-#include "nsFocusManager.h"
-#include "nsITimedChannel.h"
+#include "nsRefPtrHashtable.h"
+#include "nsSandboxFlags.h"
+#include "nsScreen.h"
 #include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTObserverArray.h"
+#include "nsTStringRepr.h"
+#include "nsThreadUtils.h"
+#include "nsWeakReference.h"
+#include "nsWindowMemoryReporter.h"
+#include "nsWindowSizes.h"
+#include "nsWrapperCache.h"
+#include "nsWrapperCacheInlines.h"
+#include "nsXULAppAPI.h"
+#include "nsrootidl.h"
+#include "prclist.h"
+#include "prtypes.h"
+#include "xpcprivate.h"
+#include "xpcpublic.h"
+
 #ifdef MOZ_XUL
 #  include "nsIDOMXULControlElement.h"
 #  include "nsMenuPopupFrame.h"
 #endif
-#include "mozilla/dom/CustomEvent.h"
-#include "nsIScreenManager.h"
-#include "nsICSSDeclaration.h"
-#include "nsIPermission.h"
-
-#include "xpcprivate.h"
 
 #ifdef NS_PRINTING
 #  include "nsIPrintSettings.h"
@@ -171,72 +311,6 @@
 #  include "nsIWebBrowserPrint.h"
 #endif
 
-#include "nsWindowRoot.h"
-#include "nsNetCID.h"
-#include "nsIArray.h"
-
-#include "nsIDragService.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/Selection.h"
-#include "nsFrameLoader.h"
-#include "nsXPCOMCID.h"
-#include "mozilla/Logging.h"
-#include "prenv.h"
-
-#include "mozilla/dom/IDBFactory.h"
-#include "mozilla/dom/MessageChannel.h"
-#include "mozilla/dom/Promise.h"
-
-#include "mozilla/dom/Gamepad.h"
-#include "mozilla/dom/GamepadManager.h"
-
-#include "gfxVR.h"
-#include "mozilla/dom/VRDisplay.h"
-#include "mozilla/dom/VRDisplayEvent.h"
-#include "mozilla/dom/VRDisplayEventBinding.h"
-#include "mozilla/dom/VREventObserver.h"
-#include "mozilla/dom/XRPermissionRequest.h"
-
-#include "nsRefreshDriver.h"
-#include "Layers.h"
-
-#include "mozilla/BasePrincipal.h"
-#include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
-#include "mozilla/dom/Location.h"
-#include "nsHTMLDocument.h"
-#include "nsWrapperCacheInlines.h"
-#include "mozilla/DOMEventTargetHelper.h"
-#include "prrng.h"
-#include "nsSandboxFlags.h"
-#include "mozilla/dom/AudioContext.h"
-#include "mozilla/dom/BrowserElementDictionariesBinding.h"
-#include "mozilla/dom/cache/CacheStorage.h"
-#include "mozilla/dom/Console.h"
-#include "mozilla/dom/Fetch.h"
-#include "mozilla/dom/FunctionBinding.h"
-#include "mozilla/dom/HashChangeEvent.h"
-#include "mozilla/dom/IntlUtils.h"
-#include "mozilla/dom/PopStateEvent.h"
-#include "mozilla/dom/PopupBlocker.h"
-#include "mozilla/dom/PopupBlockedEvent.h"
-#include "mozilla/dom/PrimitiveConversions.h"
-#include "mozilla/dom/WindowBinding.h"
-#include "nsIBrowserChild.h"
-#include "mozilla/dom/LoadedScript.h"
-#include "mozilla/dom/MediaQueryList.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/dom/NavigatorBinding.h"
-#include "mozilla/dom/ImageBitmap.h"
-#include "mozilla/dom/ImageBitmapBinding.h"
-#include "mozilla/dom/InstallTriggerBinding.h"
-#include "mozilla/dom/SharedWorker.h"
-#include "mozilla/dom/ServiceWorker.h"
-#include "mozilla/dom/ServiceWorkerRegistration.h"
-#include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
-#include "mozilla/dom/U2F.h"
-#include "mozilla/dom/WebIDLGlobalNameHash.h"
-#include "mozilla/dom/Worklet.h"
 #ifdef HAVE_SIDEBAR
 #  include "mozilla/dom/ExternalBinding.h"
 #endif
@@ -245,23 +319,16 @@
 #  include "mozilla/dom/SpeechSynthesis.h"
 #endif
 
-#include "mozilla/dom/ClientManager.h"
-#include "mozilla/dom/ClientSource.h"
-#include "mozilla/dom/ClientState.h"
-
-#include "mozilla/dom/WindowGlobalChild.h"
-#include "mozilla/dom/BrowserChild.h"
-
-#include "mozilla/net/CookieJarSettings.h"
-
-#include "AccessCheck.h"
-#include "SessionStorageCache.h"
-
 #ifdef ANDROID
 #  include <android/log.h>
 #endif
 
+#ifdef MOZ_WIDGET_ANDROID
+#  include "mozilla/dom/WindowOrientationObserver.h"
+#endif
+
 #ifdef XP_WIN
+#  include "mozilla/Debug.h"
 #  include <process.h>
 #  define getpid _getpid
 #else
@@ -858,6 +925,7 @@
       mWasCurrentInnerWindow(false),
       mHasSeenGamepadInput(false),
       mHintedWasLoading(false),
+      mHasOpenedExternalProtocolFrame(false),
       mSuspendDepth(0),
       mFreezeDepth(0),
 #ifdef DEBUG
@@ -1160,6 +1228,11 @@
   }
   mAudioContexts.Clear();
 
+  for (MediaKeys* mediaKeys : mMediaKeysInstances) {
+    mediaKeys->OnInnerWindowDestroy();
+  }
+  mMediaKeysInstances.Clear();
+
   DisableGamepadUpdates();
   mHasGamepad = false;
   mGamepads.Clear();
@@ -2517,6 +2590,10 @@
   mTopInnerWindow->UpdateWebSocketCount(-(int32_t)mNumOfOpenWebSockets);
 }
 
+bool nsGlobalWindowInner::IsInSyncOperation() {
+  return GetExtantDoc() && GetExtantDoc()->IsInSyncOperation();
+}
+
 bool nsGlobalWindowInner::IsSharedMemoryAllowed() const {
   MOZ_ASSERT(NS_IsMainThread());
 
@@ -2557,6 +2634,21 @@
                          : mActivePeerConnections;
 }
 
+void nsPIDOMWindowInner::AddMediaKeysInstance(MediaKeys* aMediaKeys) {
+  MOZ_ASSERT(NS_IsMainThread());
+  mMediaKeysInstances.AppendElement(aMediaKeys);
+}
+
+void nsPIDOMWindowInner::RemoveMediaKeysInstance(MediaKeys* aMediaKeys) {
+  MOZ_ASSERT(NS_IsMainThread());
+  mMediaKeysInstances.RemoveElement(aMediaKeys);
+}
+
+bool nsPIDOMWindowInner::HasActiveMediaKeysInstance() {
+  MOZ_ASSERT(NS_IsMainThread());
+  return !mMediaKeysInstances.IsEmpty();
+}
+
 bool nsPIDOMWindowInner::IsPlayingAudio() {
   for (uint32_t i = 0; i < mAudioContexts.Length(); i++) {
     if (mAudioContexts[i]->IsRunning()) {
@@ -2885,7 +2977,7 @@
   // Warn once.
   nsCOMPtr<Document> doc = GetExtantDoc();
   if (doc) {
-    doc->WarnOnceAbout(Document::eComponents, /* asError = */ true);
+    doc->WarnOnceAbout(DeprecatedOperations::eComponents, /* asError = */ true);
   }
 
   // Create a fake Components object.
@@ -2987,7 +3079,8 @@
       !xpc::IsXrayWrapper(aObj) &&
       !nsContentUtils::ObjectPrincipal(aObj)->IsSystemPrincipal()) {
     if (GetExtantDoc()) {
-      GetExtantDoc()->WarnOnceAbout(Document::eWindow_Cc_ontrollers);
+      GetExtantDoc()->WarnOnceAbout(
+          DeprecatedOperations::eWindow_Cc_ontrollers);
     }
     const JSClass* clazz;
     if (aId ==
@@ -3871,13 +3964,13 @@
 
 void nsGlobalWindowInner::CaptureEvents() {
   if (mDoc) {
-    mDoc->WarnOnceAbout(Document::eUseOfCaptureEvents);
+    mDoc->WarnOnceAbout(DeprecatedOperations::eUseOfCaptureEvents);
   }
 }
 
 void nsGlobalWindowInner::ReleaseEvents() {
   if (mDoc) {
-    mDoc->WarnOnceAbout(Document::eUseOfReleaseEvents);
+    mDoc->WarnOnceAbout(DeprecatedOperations::eUseOfReleaseEvents);
   }
 }
 
@@ -4083,6 +4176,12 @@
   return retval;
 }
 
+mozilla::Maybe<mozilla::dom::EventCallbackDebuggerNotificationType>
+nsGlobalWindowInner::GetDebuggerNotificationType() const {
+  return mozilla::Some(
+      mozilla::dom::EventCallbackDebuggerNotificationType::Global);
+}
+
 bool nsGlobalWindowInner::ComputeDefaultWantsUntrusted(ErrorResult& aRv) {
   return !nsContentUtils::IsChromeDoc(mDoc);
 }
@@ -4259,7 +4358,8 @@
 uint32_t nsGlobalWindowInner::GetFocusMethod() { return mFocusMethod; }
 
 bool nsGlobalWindowInner::ShouldShowFocusRing() {
-  if (mFocusByKeyOccurred) {
+  if (mFocusByKeyOccurred &&
+      StaticPrefs::browser_display_always_show_rings_after_key_focus()) {
     return true;
   }
 
@@ -4310,7 +4410,7 @@
 
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm) {
-    fm->WindowHidden(GetOuterWindow());
+    fm->WindowHidden(GetOuterWindow(), nsFocusManager::GenerateFocusActionId());
   }
 
   mNeedsFocus = true;
@@ -5901,7 +6001,7 @@
   options.setIntroductionType("domTimer");
   JS::Rooted<JSObject*> global(aes.cx(), mGlobal->GetGlobalJSObject());
   {
-    nsJSUtils::ExecutionContext exec(aes.cx(), global);
+    JSExecutionContext exec(aes.cx(), global);
     nsresult rv = exec.Compile(options, mExpr);
 
     JS::Rooted<JSScript*> script(aes.cx(), exec.MaybeGetScript());
diff -Nru firefox-84.0.2+build1/dom/base/nsGlobalWindowInner.h firefox-85.0+build1/dom/base/nsGlobalWindowInner.h
--- firefox-84.0.2+build1/dom/base/nsGlobalWindowInner.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsGlobalWindowInner.h	2021-01-18 19:58:09.000000000 +0000
@@ -35,18 +35,17 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeMessageBroadcaster.h"
 #include "mozilla/dom/DebuggerNotificationManager.h"
+#include "mozilla/dom/Location.h"
 #include "mozilla/dom/NavigatorBinding.h"
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/CallState.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/TimeStamp.h"
 #include "nsWrapperCacheInlines.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "mozilla/dom/WindowProxyHolder.h"
@@ -74,6 +73,7 @@
 class nsIScriptContext;
 class nsIScriptTimeoutHandler;
 class nsIBrowserChild;
+class nsIPrintSettings;
 class nsITimeoutHandler;
 class nsIWebBrowserChrome;
 class nsIWebProgressListener;
@@ -97,6 +97,8 @@
 
 namespace mozilla {
 class AbstractThread;
+class ErrorResult;
+
 namespace dom {
 class BarProp;
 class BrowsingContext;
@@ -116,7 +118,6 @@
 class IncrementalRunnable;
 class InstallTriggerImpl;
 class IntlUtils;
-class Location;
 class MediaQueryList;
 class OwningExternalOrWindowProxy;
 class Promise;
@@ -289,10 +290,7 @@
   virtual mozilla::EventListenerManager* GetOrCreateListenerManager() override;
 
   mozilla::Maybe<mozilla::dom::EventCallbackDebuggerNotificationType>
-  GetDebuggerNotificationType() const override {
-    return mozilla::Some(
-        mozilla::dom::EventCallbackDebuggerNotificationType::Global);
-  }
+  GetDebuggerNotificationType() const override;
 
   bool ComputeDefaultWantsUntrusted(mozilla::ErrorResult& aRv) final;
 
@@ -947,9 +945,7 @@
 
   void UpdateTopInnerWindow();
 
-  virtual bool IsInSyncOperation() override {
-    return GetExtantDoc() && GetExtantDoc()->IsInSyncOperation();
-  }
+  virtual bool IsInSyncOperation() override;
 
   bool IsSharedMemoryAllowed() const override;
 
@@ -1253,9 +1249,16 @@
   // Hint to the JS engine whether we are currently loading.
   void HintIsLoading(bool aIsLoading);
 
- public:
   mozilla::dom::ContentMediaController* GetContentMediaController();
 
+  bool TryOpenExternalProtocolIframe() {
+    if (mHasOpenedExternalProtocolFrame) {
+      return false;
+    }
+    mHasOpenedExternalProtocolFrame = true;
+    return true;
+  }
+
  private:
   RefPtr<mozilla::dom::ContentMediaController> mContentMediaController;
 
@@ -1323,6 +1326,10 @@
   // Whether we told the JS engine that we were in pageload.
   bool mHintedWasLoading : 1;
 
+  // Whether this window has opened an external-protocol iframe without user
+  // activation once already. Only relevant for top windows.
+  bool mHasOpenedExternalProtocolFrame : 1;
+
   nsCheapSet<nsUint32HashKey> mGamepadIndexSet;
   nsRefPtrHashtable<nsUint32HashKey, mozilla::dom::Gamepad> mGamepads;
 
diff -Nru firefox-84.0.2+build1/dom/base/nsGlobalWindowOuter.cpp firefox-85.0+build1/dom/base/nsGlobalWindowOuter.cpp
--- firefox-84.0.2+build1/dom/base/nsGlobalWindowOuter.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsGlobalWindowOuter.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 
 // Local Includes
 #include "Navigator.h"
+#include "mozilla/Encoding.h"
 #include "nsContentSecurityManager.h"
 #include "nsScreen.h"
 #include "nsHistory.h"
@@ -87,6 +88,7 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Likely.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/Unused.h"
 
@@ -2649,9 +2651,7 @@
     }
   }
 
-  bool docShellActive;
-  mDocShell->GetIsActive(&docShellActive);
-  SetIsBackgroundInternal(!docShellActive);
+  SetIsBackgroundInternal(!mBrowsingContext->IsActive());
 }
 
 void nsGlobalWindowOuter::DetachFromDocShell(bool aIsBeingDiscarded) {
@@ -3344,7 +3344,7 @@
   nsCOMPtr<nsIDocShellTreeItem> primaryContent;
   if (aCallerType != CallerType::System) {
     if (mDoc) {
-      mDoc->WarnOnceAbout(Document::eWindowContentUntrusted);
+      mDoc->WarnOnceAbout(DeprecatedOperations::eWindowContentUntrusted);
     }
     // If we're called by non-chrome code, make sure we don't return
     // the primary content window if the calling tab is hidden. In
@@ -5134,14 +5134,18 @@
       parent = bc->Canonical()->GetParentCrossChromeBoundary();
     }
   }
+  uint64_t actionId = nsFocusManager::GenerateFocusActionId();
   if (parent) {
     if (!parent->IsInProcess()) {
       if (isActive) {
-        fm->WindowRaised(this);
+        fm->WindowRaised(this, actionId);
+        // XXX we still need to notify framer about the focus moves to OOP
+        // iframe to generate corresponding blur event for bug 1677474.
+      } else {
+        ContentChild* contentChild = ContentChild::GetSingleton();
+        MOZ_ASSERT(contentChild);
+        contentChild->SendFinalizeFocusOuter(bc, canFocus, aCallerType);
       }
-      ContentChild* contentChild = ContentChild::GetSingleton();
-      MOZ_ASSERT(contentChild);
-      contentChild->SendFinalizeFocusOuter(bc, canFocus, aCallerType);
       return;
     }
     nsCOMPtr<Document> parentdoc = parent->GetDocument();
@@ -5159,7 +5163,7 @@
     // if there is no parent, this must be a toplevel window, so raise the
     // window if canFocus is true. If this is a child process, the raise
     // window request will get forwarded to the parent by the puppet widget.
-    fm->RaiseWindow(this, aCallerType);
+    fm->RaiseWindow(this, aCallerType, actionId);
   }
 }
 
@@ -5755,12 +5759,36 @@
     }
   }
 
+  // HACK: Some pages using bogus library + UA sniffing call window.open() from
+  // a blank iframe, only on Firefox, see bug 1685056.
+  //
+  // This is a hack-around to preserve behavior in that particular and specific
+  // case, by consuming activation on the parent document, so we don't care
+  // about the InProcessParent bits not being fission-safe or what not.
+  auto ConsumeTransientUserActivationForMultiplePopupBlocking = [&]() -> bool {
+    if (mDoc->ConsumeTransientUserGestureActivation()) {
+      return true;
+    }
+    if (!mDoc->IsInitialDocument()) {
+      return false;
+    }
+    Document* parentDoc = mDoc->GetInProcessParentDocument();
+    if (!parentDoc ||
+        !parentDoc->NodePrincipal()->Equals(mDoc->NodePrincipal())) {
+      return false;
+    }
+    return parentDoc->ConsumeTransientUserGestureActivation();
+  };
+
   // If this popup is allowed, let's block any other for this event, forcing
   // PopupBlocker::openBlocked state.
   if ((abuse == PopupBlocker::openAllowed ||
        abuse == PopupBlocker::openControlled) &&
       StaticPrefs::dom_block_multiple_popups() && !IsPopupAllowed() &&
-      !PopupBlocker::TryUsePopupOpeningToken(mDoc->NodePrincipal())) {
+      !ConsumeTransientUserActivationForMultiplePopupBlocking()) {
+    nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, "DOM"_ns, mDoc,
+                                    nsContentUtils::eDOM_PROPERTIES,
+                                    "MultiplePopupsBlockedNoUserActivation");
     abuse = PopupBlocker::openBlocked;
   }
 
@@ -6750,79 +6778,6 @@
   FORWARD_TO_INNER(Location, (), nullptr);
 }
 
-void nsGlobalWindowOuter::ActivateOrDeactivate(bool aActivate) {
-  if (!mDoc) {
-    return;
-  }
-
-  // Set / unset mIsActive on the top level window, which is used for the
-  // :-moz-window-inactive pseudoclass, and its sheet (if any).
-  nsCOMPtr<nsIWidget> mainWidget = GetMainWidget();
-  nsCOMPtr<nsIWidget> topLevelWidget;
-  if (mainWidget) {
-    // Get the top level widget (if the main widget is a sheet, this will
-    // be the sheet's top (non-sheet) parent).
-    topLevelWidget = mainWidget->GetSheetWindowParent();
-    if (!topLevelWidget) {
-      topLevelWidget = mainWidget;
-    }
-  }
-
-  SetActive(aActivate);
-
-  if (mainWidget != topLevelWidget) {
-    // This is a workaround for the following problem:
-    // When a window with an open sheet gains or loses focus, only the sheet
-    // window receives the NS_ACTIVATE/NS_DEACTIVATE event.  However the
-    // styling of the containing top level window also needs to change.  We
-    // get around this by calling nsPIDOMWindow::SetActive() on both windows.
-
-    // Get the top level widget's nsGlobalWindowOuter
-    nsCOMPtr<nsPIDOMWindowOuter> topLevelWindow;
-
-    // widgetListener should be an AppWindow
-    nsIWidgetListener* listener = topLevelWidget->GetWidgetListener();
-    if (listener) {
-      nsCOMPtr<nsIAppWindow> window = listener->GetAppWindow();
-      nsCOMPtr<nsIInterfaceRequestor> req(do_QueryInterface(window));
-      topLevelWindow = do_GetInterface(req);
-    }
-
-    if (topLevelWindow) {
-      topLevelWindow->SetActive(aActivate);
-    }
-  }
-}
-
-static CallState NotifyDocumentTree(Document& aDocument) {
-  aDocument.EnumerateSubDocuments(NotifyDocumentTree);
-  aDocument.UpdateDocumentStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE, true);
-  return CallState::Continue;
-}
-
-void nsGlobalWindowOuter::SetActive(bool aActive) {
-  nsPIDOMWindowOuter::SetActive(aActive);
-  if (mDoc) {
-    NotifyDocumentTree(*mDoc);
-  }
-}
-
-bool nsGlobalWindowOuter::IsTopLevelWindowActive() {
-  nsCOMPtr<nsIDocShellTreeItem> treeItem(GetDocShell());
-  if (!treeItem) {
-    return false;
-  }
-
-  nsCOMPtr<nsIDocShellTreeItem> rootItem;
-  treeItem->GetInProcessRootTreeItem(getter_AddRefs(rootItem));
-  if (!rootItem) {
-    return false;
-  }
-
-  nsCOMPtr<nsPIDOMWindowOuter> domWindow = rootItem->GetWindow();
-  return domWindow && domWindow->IsActive();
-}
-
 void nsGlobalWindowOuter::SetIsBackground(bool aIsBackground) {
   bool changed = aIsBackground != IsBackground();
   SetIsBackgroundInternal(aIsBackground);
@@ -7463,14 +7418,11 @@
 
   // if a link is focused, refocus with the FLAG_SHOWRING flag set. This makes
   // it easy to tell which link was last clicked when going back a page.
-  Element* focusedElement = inner->GetFocusedElement();
+  RefPtr<Element> focusedElement = inner->GetFocusedElement();
   if (nsContentUtils::ContentIsLink(focusedElement)) {
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
-      // XXXbz Do we need the stack strong ref here?
-      RefPtr<Element> kungFuDeathGrip(focusedElement);
-      fm->SetFocus(kungFuDeathGrip, nsIFocusManager::FLAG_NOSCROLL |
-                                        nsIFocusManager::FLAG_SHOWRING);
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
+      fm->SetFocus(focusedElement, nsIFocusManager::FLAG_NOSCROLL |
+                                       nsIFocusManager::FLAG_SHOWRING);
     }
   }
 
@@ -7509,6 +7461,10 @@
   return mWindowUtils;
 }
 
+bool nsGlobalWindowOuter::IsInSyncOperation() {
+  return GetExtantDoc() && GetExtantDoc()->IsInSyncOperation();
+}
+
 // Note: This call will lock the cursor, it will not change as it moves.
 // To unlock, the cursor must be set back to Auto.
 void nsGlobalWindowOuter::SetCursorOuter(const nsACString& aCursor,
@@ -7790,7 +7746,6 @@
 nsPIDOMWindowOuter::nsPIDOMWindowOuter(uint64_t aWindowID)
     : mFrameElement(nullptr),
       mModalStateDepth(0),
-      mIsActive(false),
       mIsBackground(false),
       mMediaSuspend(StaticPrefs::media_block_autoplay_until_in_foreground()
                         ? nsISuspendedTypes::SUSPENDED_BLOCK
diff -Nru firefox-84.0.2+build1/dom/base/nsGlobalWindowOuter.h firefox-85.0+build1/dom/base/nsGlobalWindowOuter.h
--- firefox-84.0.2+build1/dom/base/nsGlobalWindowOuter.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsGlobalWindowOuter.h	2021-01-18 19:58:09.000000000 +0000
@@ -39,11 +39,9 @@
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/dom/UnionTypes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/LinkedList.h"
 #include "nsWrapperCacheInlines.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/WindowBinding.h"
 #include "Units.h"
@@ -63,6 +61,7 @@
 class nsIDOMWindowUtils;
 class nsIScrollableFrame;
 class nsIControllers;
+class nsIPrintSettings;
 class nsIScriptContext;
 class nsIScriptTimeoutHandler;
 class nsIBrowserChild;
@@ -84,6 +83,7 @@
 namespace mozilla {
 class AbstractThread;
 class DOMEventTargetHelper;
+class ErrorResult;
 class ThrottledEventQueue;
 namespace dom {
 class BarProp;
@@ -92,6 +92,7 @@
 class Crypto;
 class CustomElementRegistry;
 class DocGroup;
+class Document;
 class External;
 class Function;
 class Gamepad;
@@ -290,9 +291,6 @@
   virtual nsPIDOMWindowOuter* GetPrivateRoot() override;
 
   // Outer windows only.
-  virtual void ActivateOrDeactivate(bool aActivate) override;
-  virtual void SetActive(bool aActive) override;
-  virtual bool IsTopLevelWindowActive() override;
   virtual void SetIsBackground(bool aIsBackground) override;
   virtual void SetChromeEventHandler(
       mozilla::dom::EventTarget* aChromeEventHandler) override;
@@ -300,10 +298,12 @@
   // Outer windows only.
   virtual void SetInitialPrincipalToSubject(
       nsIContentSecurityPolicy* aCSP,
-      const Maybe<nsILoadInfo::CrossOriginEmbedderPolicy>& aCoep) override;
+      const mozilla::Maybe<nsILoadInfo::CrossOriginEmbedderPolicy>& aCoep)
+      override;
 
   virtual already_AddRefed<nsISupports> SaveWindowState() override;
-  virtual nsresult RestoreWindowState(nsISupports* aState) override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual nsresult RestoreWindowState(
+      nsISupports* aState) override;
 
   virtual bool IsSuspended() const override;
   virtual bool IsFrozen() const override;
@@ -675,9 +675,7 @@
 
   nsIDOMWindowUtils* WindowUtils();
 
-  virtual bool IsInSyncOperation() override {
-    return GetExtantDoc() && GetExtantDoc()->IsInSyncOperation();
-  }
+  virtual bool IsInSyncOperation() override;
 
   void ParentWindowChanged() {
     // Reset our storage access permission flag when we get reparented.
@@ -859,7 +857,8 @@
                     mozilla::dom::CallerType aCallerType,
                     mozilla::ErrorResult& aError);
   nsRect GetInnerScreenRect();
-  static Maybe<mozilla::CSSIntSize> GetRDMDeviceSize(const Document& aDocument);
+  static mozilla::Maybe<mozilla::CSSIntSize> GetRDMDeviceSize(
+      const Document& aDocument);
 
   // Outer windows only.
   // If aLookForCallerOnJSStack is true, this method will look at the JS stack
@@ -1010,7 +1009,7 @@
       mozilla::dom::BrowsingContext** aSource, nsAString& aOrigin,
       nsIURI** aTargetOriginURI, nsIPrincipal** aCallerPrincipal,
       nsGlobalWindowInner** aCallerInnerWindow, nsIURI** aCallerURI,
-      Maybe<nsID>* aCallerAgentClusterId, nsACString* aScriptLocation,
+      mozilla::Maybe<nsID>* aCallerAgentClusterId, nsACString* aScriptLocation,
       mozilla::ErrorResult& aError);
 
   // Ask the user if further dialogs should be blocked, if dialogs are currently
diff -Nru firefox-84.0.2+build1/dom/base/nsHistory.h firefox-85.0+build1/dom/base/nsHistory.h
--- firefox-84.0.2+build1/dom/base/nsHistory.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsHistory.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #define nsHistory_h___
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/HistoryBinding.h"
 #include "mozilla/dom/ChildSHistory.h"
 #include "nsCOMPtr.h"
@@ -22,6 +21,10 @@
 class nsIWeakReference;
 class nsPIDOMWindowInner;
 
+namespace mozilla {
+class ErrorResult;
+}
+
 // Script "History" object
 class nsHistory final : public nsISupports, public nsWrapperCache {
  public:
diff -Nru firefox-84.0.2+build1/dom/base/nsHTMLContentSerializer.cpp firefox-85.0+build1/dom/base/nsHTMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/base/nsHTMLContentSerializer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsHTMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,441 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an HTML (not XHTML!) DOM to an HTML
- * string that could be parsed into more or less the original DOM.
- */
-
-#include "nsHTMLContentSerializer.h"
-
-#include "nsIContent.h"
-#include "mozilla/dom/Document.h"
-#include "nsElementTable.h"
-#include "nsNameSpaceManager.h"
-#include "nsString.h"
-#include "nsUnicharUtils.h"
-#include "nsIDocumentEncoder.h"
-#include "nsGkAtoms.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsEscape.h"
-#include "nsCRT.h"
-#include "nsContentUtils.h"
-#include "nsIScriptElement.h"
-#include "nsAttrName.h"
-#include "mozilla/dom/Element.h"
-#include "nsParserConstants.h"
-
-using namespace mozilla::dom;
-
-nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer) {
-  RefPtr<nsHTMLContentSerializer> it = new nsHTMLContentSerializer();
-  it.forget(aSerializer);
-  return NS_OK;
-}
-
-nsHTMLContentSerializer::nsHTMLContentSerializer() { mIsHTMLSerializer = true; }
-
-nsHTMLContentSerializer::~nsHTMLContentSerializer() = default;
-
-NS_IMETHODIMP
-nsHTMLContentSerializer::AppendDocumentStart(Document* aDocument) {
-  return NS_OK;
-}
-
-bool nsHTMLContentSerializer::SerializeHTMLAttributes(
-    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
-    const nsAString& aTagNamespaceURI, nsAtom* aTagName, int32_t aNamespace,
-    nsAString& aStr) {
-  MaybeSerializeIsValue(aElement, aStr);
-
-  int32_t count = aElement->GetAttrCount();
-  if (!count) return true;
-
-  nsresult rv;
-  nsAutoString valueStr;
-
-  for (int32_t index = 0; index < count; index++) {
-    const nsAttrName* name = aElement->GetAttrNameAt(index);
-    int32_t namespaceID = name->NamespaceID();
-    nsAtom* attrName = name->LocalName();
-
-    // Filter out any attribute starting with [-|_]moz
-    nsDependentAtomString attrNameStr(attrName);
-    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
-        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
-      continue;
-    }
-    aElement->GetAttr(namespaceID, attrName, valueStr);
-
-    if (mIsCopying && mIsFirstChildOfOL && aTagName == nsGkAtoms::li &&
-        aNamespace == kNameSpaceID_XHTML && attrName == nsGkAtoms::value &&
-        namespaceID == kNameSpaceID_None) {
-      // This is handled separately in SerializeLIValueAttribute()
-      continue;
-    }
-    bool isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
-
-    if (((attrName == nsGkAtoms::href && (namespaceID == kNameSpaceID_None ||
-                                          namespaceID == kNameSpaceID_XLink)) ||
-         (attrName == nsGkAtoms::src && namespaceID == kNameSpaceID_None))) {
-      // Make all links absolute when converting only the selection:
-      if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
-        // Would be nice to handle OBJECT tags, but that gets more complicated
-        // since we have to search the tag list for CODEBASE as well. For now,
-        // just leave them relative.
-        nsIURI* uri = aElement->GetBaseURI();
-        if (uri) {
-          nsAutoString absURI;
-          rv = NS_MakeAbsoluteURI(absURI, valueStr, uri);
-          if (NS_SUCCEEDED(rv)) {
-            valueStr = absURI;
-          }
-        }
-      }
-    }
-
-    if (mRewriteEncodingDeclaration && aTagName == nsGkAtoms::meta &&
-        aNamespace == kNameSpaceID_XHTML && attrName == nsGkAtoms::content &&
-        namespaceID == kNameSpaceID_None) {
-      // If we're serializing a <meta http-equiv="content-type">,
-      // use the proper value, rather than what's in the document.
-      nsAutoString header;
-      aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv, header);
-      if (header.LowerCaseEqualsLiteral("content-type")) {
-        valueStr = u"text/html; charset="_ns + NS_ConvertASCIItoUTF16(mCharset);
-      }
-    }
-
-    nsDependentAtomString nameStr(attrName);
-    nsAutoString prefix;
-    if (namespaceID == kNameSpaceID_XML) {
-      prefix.AssignLiteral(u"xml");
-    } else if (namespaceID == kNameSpaceID_XLink) {
-      prefix.AssignLiteral(u"xlink");
-    }
-
-    // Expand shorthand attribute.
-    if (aNamespace == kNameSpaceID_XHTML && namespaceID == kNameSpaceID_None &&
-        IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) {
-      valueStr = nameStr;
-    }
-    NS_ENSURE_TRUE(SerializeAttr(prefix, nameStr, valueStr, aStr, !isJS),
-                   false);
-  }
-
-  return true;
-}
-
-NS_IMETHODIMP
-nsHTMLContentSerializer::AppendElementStart(Element* aElement,
-                                            Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-  NS_ENSURE_STATE(mOutput);
-
-  bool forceFormat = false;
-  nsresult rv = NS_OK;
-  if (!CheckElementStart(aElement, forceFormat, *mOutput, rv)) {
-    // When we go to AppendElementEnd for this element, we're going to
-    // MaybeLeaveFromPreContent().  So make sure to MaybeEnterInPreContent()
-    // now, so our PreLevel() doesn't get confused.
-    MaybeEnterInPreContent(aElement);
-    return rv;
-  }
-
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAtom* name = aElement->NodeInfo()->NameAtom();
-  int32_t ns = aElement->GetNameSpaceID();
-
-  bool lineBreakBeforeOpen = LineBreakBeforeOpen(ns, name);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    if (mColPos && lineBreakBeforeOpen) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else {
-      NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-    if (!mColPos) {
-      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else if (mAddSpace) {
-      bool result = AppendToString(char16_t(' '), *mOutput);
-      mAddSpace = false;
-      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
-    }
-  } else if (mAddSpace) {
-    bool result = AppendToString(char16_t(' '), *mOutput);
-    mAddSpace = false;
-    NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-  // Always reset to avoid false newlines in case MaybeAddNewlineForRootNode
-  // wasn't called
-  mAddNewlineForRootNode = false;
-
-  NS_ENSURE_TRUE(AppendToString(kLessThan, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ENSURE_TRUE(AppendToString(nsDependentAtomString(name), *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  MaybeEnterInPreContent(aElement);
-
-  // for block elements, we increase the indentation
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel())
-    NS_ENSURE_TRUE(IncrIndentation(name), NS_ERROR_OUT_OF_MEMORY);
-
-  // Need to keep track of OL and LI elements in order to get ordinal number
-  // for the LI.
-  if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML) {
-    // We are copying and current node is an OL;
-    // Store its start attribute value in olState->startVal.
-    nsAutoString start;
-    int32_t startAttrVal = 0;
-
-    aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::start, start);
-    if (!start.IsEmpty()) {
-      nsresult rv = NS_OK;
-      startAttrVal = start.ToInteger(&rv);
-      // If OL has "start" attribute, first LI element has to start with that
-      // value Therefore subtracting 1 as all the LI elements are incrementing
-      // it before using it; In failure of ToInteger(), default StartAttrValue
-      // to 0.
-      if (NS_SUCCEEDED(rv))
-        startAttrVal--;
-      else
-        startAttrVal = 0;
-    }
-    mOLStateStack.AppendElement(olState(startAttrVal, true));
-  }
-
-  if (mIsCopying && name == nsGkAtoms::li && ns == kNameSpaceID_XHTML) {
-    mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement);
-    if (mIsFirstChildOfOL) {
-      // If OL is parent of this LI, serialize attributes in different manner.
-      NS_ENSURE_TRUE(SerializeLIValueAttribute(aElement, *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-  }
-
-  // Even LI passed above have to go through this
-  // for serializing attributes other than "value".
-  nsAutoString dummyPrefix;
-  NS_ENSURE_TRUE(
-      SerializeHTMLAttributes(aElement, aOriginalElement, dummyPrefix, u""_ns,
-                              name, ns, *mOutput),
-      NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  if (ns == kNameSpaceID_XHTML &&
-      (name == nsGkAtoms::script || name == nsGkAtoms::style ||
-       name == nsGkAtoms::noscript || name == nsGkAtoms::noframes)) {
-    ++mDisableEntityEncoding;
-  }
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
-      LineBreakAfterOpen(ns, name)) {
-    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  NS_ENSURE_TRUE(AfterElementStart(aElement, aOriginalElement, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
-                                          Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-  NS_ENSURE_STATE(mOutput);
-
-  nsAtom* name = aElement->NodeInfo()->NameAtom();
-  int32_t ns = aElement->GetNameSpaceID();
-
-  if (ns == kNameSpaceID_XHTML &&
-      (name == nsGkAtoms::script || name == nsGkAtoms::style ||
-       name == nsGkAtoms::noscript || name == nsGkAtoms::noframes)) {
-    --mDisableEntityEncoding;
-  }
-
-  bool forceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
-                     aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    DecrIndentation(name);
-  }
-
-  if (name == nsGkAtoms::script) {
-    nsCOMPtr<nsIScriptElement> script = do_QueryInterface(aElement);
-
-    if (ShouldMaintainPreLevel() && script && script->IsMalformed()) {
-      // We're looking at a malformed script tag. This means that the end tag
-      // was missing in the source. Imitate that here by not serializing the end
-      // tag.
-      --PreLevel();
-      return NS_OK;
-    }
-  } else if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML) {
-    NS_ASSERTION((!mOLStateStack.IsEmpty()), "Cannot have an empty OL Stack");
-    /* Though at this point we must always have an state to be deleted as all
-    the OL opening tags are supposed to push an olState object to the stack*/
-    if (!mOLStateStack.IsEmpty()) {
-      mOLStateStack.RemoveLastElement();
-    }
-  }
-
-  if (ns == kNameSpaceID_XHTML) {
-    bool isContainer =
-        nsHTMLElement::IsContainer(nsHTMLTags::CaseSensitiveAtomTagToId(name));
-    if (!isContainer) {
-      // Keep this in sync with the cleanup at the end of this method.
-      MOZ_ASSERT(name != nsGkAtoms::body);
-      MaybeLeaveFromPreContent(aElement);
-      return NS_OK;
-    }
-  }
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    bool lineBreakBeforeClose = LineBreakBeforeClose(ns, name);
-
-    if (mColPos && lineBreakBeforeClose) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    }
-    if (!mColPos) {
-      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else if (mAddSpace) {
-      bool result = AppendToString(char16_t(' '), *mOutput);
-      mAddSpace = false;
-      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
-    }
-  } else if (mAddSpace) {
-    bool result = AppendToString(char16_t(' '), *mOutput);
-    mAddSpace = false;
-    NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  NS_ENSURE_TRUE(AppendToString(kEndTag, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(AppendToString(nsDependentAtomString(name), *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  // Keep this cleanup in sync with the IsContainer() early return above.
-  MaybeLeaveFromPreContent(aElement);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
-      LineBreakAfterClose(ns, name)) {
-    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    MaybeFlagNewlineForRootNode(aElement);
-  }
-
-  if (name == nsGkAtoms::body && ns == kNameSpaceID_XHTML) {
-    --mInBody;
-  }
-
-  return NS_OK;
-}
-
-static const uint16_t kValNBSP = 160;
-
-#define _ 0
-
-// This table indexes into kEntityStrings[].
-static const uint8_t kEntities[] = {
-    // clang-format off
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, 2, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  3, _, 4, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  5
-    // clang-format on
-};
-
-// This table indexes into kEntityStrings[].
-static const uint8_t kAttrEntities[] = {
-    // clang-format off
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, 1, _, _, _, 2, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  3, _, 4, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  5
-    // clang-format on
-};
-
-#undef _
-
-static const char* const kEntityStrings[] = {
-    /* 0 */ nullptr,
-    /* 1 */ "&quot;",
-    /* 2 */ "&amp;",
-    /* 3 */ "&lt;",
-    /* 4 */ "&gt;",
-    /* 5 */ "&nbsp;"};
-
-bool nsHTMLContentSerializer::AppendAndTranslateEntities(
-    const nsAString& aStr, nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-
-  if (mDisableEntityEncoding) {
-    return aOutputStr.Append(aStr, mozilla::fallible);
-  }
-
-  if (mFlags & (nsIDocumentEncoder::OutputEncodeBasicEntities)) {
-    // Per the API documentation, encode &nbsp;, &amp;, &lt;, &gt;, and &quot;
-    if (mInAttribute) {
-      return nsXMLContentSerializer::AppendAndTranslateEntities<kValNBSP>(
-          aStr, aOutputStr, kAttrEntities, kEntityStrings);
-    }
-
-    return nsXMLContentSerializer::AppendAndTranslateEntities<kValNBSP>(
-        aStr, aOutputStr, kEntities, kEntityStrings);
-  }
-
-  // We don't want to call into our superclass 2-arg version of
-  // AppendAndTranslateEntities, because it wants to encode more characters
-  // than we do.  Use our tables, but avoid encoding &nbsp; by passing in a
-  // smaller max index.  This will only encode &amp;, &lt;, &gt;, and &quot;.
-  if (mInAttribute) {
-    return nsXMLContentSerializer::AppendAndTranslateEntities<kGTVal>(
-        aStr, aOutputStr, kAttrEntities, kEntityStrings);
-  }
-
-  return nsXMLContentSerializer::AppendAndTranslateEntities<kGTVal>(
-      aStr, aOutputStr, kEntities, kEntityStrings);
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsHTMLContentSerializer.h firefox-85.0+build1/dom/base/nsHTMLContentSerializer.h
--- firefox-84.0.2+build1/dom/base/nsHTMLContentSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsHTMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an HTML (not XHTML!) DOM to an HTML
- * string that could be parsed into more or less the original DOM.
- */
-
-#ifndef nsHTMLContentSerializer_h__
-#define nsHTMLContentSerializer_h__
-
-#include "mozilla/Attributes.h"
-#include "nsXHTMLContentSerializer.h"
-#include "nsString.h"
-
-class nsAtom;
-
-class nsHTMLContentSerializer final : public nsXHTMLContentSerializer {
- public:
-  nsHTMLContentSerializer();
-  virtual ~nsHTMLContentSerializer();
-
-  NS_IMETHOD AppendElementStart(
-      mozilla::dom::Element* aElement,
-      mozilla::dom::Element* aOriginalElement) override;
-
-  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
-                              mozilla::dom::Element* aOriginalElement) override;
-
-  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
-
- protected:
-  MOZ_MUST_USE
-  virtual bool SerializeHTMLAttributes(mozilla::dom::Element* aContent,
-                                       mozilla::dom::Element* aOriginalElement,
-                                       nsAString& aTagPrefix,
-                                       const nsAString& aTagNamespaceURI,
-                                       nsAtom* aTagName, int32_t aNamespace,
-                                       nsAString& aStr);
-
-  MOZ_MUST_USE
-  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
-                                          nsAString& aOutputStr) override;
-};
-
-nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer);
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/base/nsIContent.h firefox-85.0+build1/dom/base/nsIContent.h
--- firefox-84.0.2+build1/dom/base/nsIContent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsIContent.h	2021-01-18 19:58:09.000000000 +0000
@@ -329,8 +329,8 @@
    *                          execution is trusted.
    * @return true if the focus was changed.
    */
-  virtual bool PerformAccesskey(bool aKeyCausesActivation,
-                                bool aIsTrustedEvent) {
+  MOZ_CAN_RUN_SCRIPT virtual bool PerformAccesskey(bool aKeyCausesActivation,
+                                                   bool aIsTrustedEvent) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsIContentSerializer.h firefox-85.0+build1/dom/base/nsIContentSerializer.h
--- firefox-84.0.2+build1/dom/base/nsIContentSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsIContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +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 nsIContentSerializer_h
-#define nsIContentSerializer_h
-
-#include "nsISupports.h"
-#include "nsStringFwd.h"
-
-class nsIContent;
-
-namespace mozilla {
-class Encoding;
-namespace dom {
-class Comment;
-class Document;
-class DocumentType;
-class Element;
-class ProcessingInstruction;
-}  // namespace dom
-}  // namespace mozilla
-
-#define NS_ICONTENTSERIALIZER_IID                    \
-  {                                                  \
-    0xb1ee32f2, 0xb8c4, 0x49b9, {                    \
-      0x93, 0xdf, 0xb6, 0xfa, 0xb5, 0xd5, 0x46, 0x88 \
-    }                                                \
-  }
-
-class nsIContentSerializer : public nsISupports {
- public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTSERIALIZER_IID)
-
-  /**
-   * @param aOutput The `Append*` methods will append to this string. The
-   *        reference to it will be dropped with `Finish`.
-   */
-  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
-                  const mozilla::Encoding* aEncoding, bool aIsCopying,
-                  bool aIsWholeDocument, bool* aNeedsPerformatScanning,
-                  nsAString& aOutput) = 0;
-
-  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
-                        int32_t aEndOffset) = 0;
-
-  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
-                                int32_t aEndOffset) = 0;
-
-  NS_IMETHOD AppendProcessingInstruction(
-      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
-      int32_t aEndOffset) = 0;
-
-  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
-                           int32_t aStartOffset, int32_t aEndOffset) = 0;
-
-  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) = 0;
-
-  NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
-                                mozilla::dom::Element* aOriginalElement) = 0;
-
-  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
-                              mozilla::dom::Element* aOriginalElement) = 0;
-
-  NS_IMETHOD FlushAndFinish() = 0;
-
-  /**
-   * Drops the reference to the output buffer.
-   */
-  NS_IMETHOD Finish() = 0;
-
-  NS_IMETHOD GetOutputLength(uint32_t& aLength) const = 0;
-
-  /**
-   * Append any items in the beginning of the document that won't be
-   * serialized by other methods. XML declaration is the most likely
-   * thing this method can produce.
-   */
-  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) = 0;
-
-  // If Init() sets *aNeedsPerformatScanning to true, then these methods are
-  // called when elements are started and ended, before AppendElementStart
-  // and AppendElementEnd, respectively.  They are supposed to be used to
-  // allow the implementer to keep track of whether the element is
-  // preformatted.
-  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) = 0;
-  NS_IMETHOD ForgetElementForPreformat(mozilla::dom::Element* aElement) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentSerializer, NS_ICONTENTSERIALIZER_IID)
-
-#define NS_CONTENTSERIALIZER_CONTRACTID_PREFIX \
-  "@mozilla.org/layout/contentserializer;1?mimetype="
-
-#endif /* nsIContentSerializer_h */
diff -Nru firefox-84.0.2+build1/dom/base/nsIDocumentEncoder.idl firefox-85.0+build1/dom/base/nsIDocumentEncoder.idl
--- firefox-84.0.2+build1/dom/base/nsIDocumentEncoder.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsIDocumentEncoder.idl	1970-01-01 00:00:00.000000000 +0000
@@ -1,354 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIOutputStream;
-
-webidl Document;
-webidl Node;
-webidl Range;
-webidl Selection;
-
-%{ C++
-class nsINode;
-
-%}
-[ptr] native nsINodePtr(nsINode);
-
-[scriptable, uuid(3d9371d8-a2ad-403e-8b0e-8885ad3562e3)]
-interface nsIDocumentEncoderNodeFixup : nsISupports
-{
-  /**
-   * Create a fixed up version of a node. This method is called before
-   * each node in a document is about to be persisted. The implementor
-   * may return a new node with fixed up attributes or null. If null is
-   * returned the node should be used as-is.
-   * @param aNode Node to fixup.
-   * @param [OUT] aSerializeCloneKids True if the document encoder should
-   * apply recursive serialization to the children of the fixed up node
-   * instead of the children of the original node.
-   * @return The resulting fixed up node.
-   */
-  Node fixupNode(in Node aNode, out boolean aSerializeCloneKids);
-};
-
-[scriptable, uuid(21f112df-d96f-47da-bfcb-5331273003d1)]
-interface nsIDocumentEncoder : nsISupports
-{
-  // Output methods flag bits. There are a frightening number of these,
-  // because everyone wants something a little bit different
-
-
-  /**
-   * Output only the selection (as opposed to the whole document).
-   */
-  const unsigned long OutputSelectionOnly = (1 << 0);
-
-  /** Plaintext output: Convert html to plaintext that looks like the html.
-    * Can't be used in conjunction with `OutputPreformatted`.
-    * Implies wrap (except inside <pre>), since html wraps.
-    * HTML, XHTML and XML output: do prettyprinting, ignoring existing formatting.
-    * XML output : it doesn't implicitly wrap
-    */
-  const unsigned long OutputFormatted     = (1 << 1);
-
-  /** Don't do prettyprinting. Don't do any wrapping that's not in the existing
-   * HTML/XML source. This option overrides OutputFormatted if both are set.
-   * HTML/XHTML output: If neither are set, there won't be prettyprinting too, but
-   * long lines will be wrapped.
-   * Supported also in XML and Plaintext output.
-   * @note This option does not affect entity conversion.
-   */
-  const unsigned long OutputRaw           = (1 << 2);
-
-  /**
-   * Do not print html head tags.
-   * XHTML/HTML output only.
-   */
-  const unsigned long OutputBodyOnly      = (1 << 3);
-
-  /**
-   * Output as though the content is preformatted
-   * (e.g. maybe it's wrapped in a PRE or PRE_WRAP style tag)
-   * Plaintext output only.
-   * Can't be used together with `OutputFormatted`/`OutputFormatFlowed`.
-   * XXXbz How does this interact with OutputRaw?
-   */
-  const unsigned long OutputPreformatted  = (1 << 4);
-
-  /**
-   * Wrap even if we're not doing formatted output (e.g. for text fields).
-   * Supported in XML, XHTML, HTML and Plaintext output.
-   * Set implicitly in HTML/XHTML output when no OutputRaw.
-   * Ignored when OutputRaw.
-   * XXXLJ: set implicitly in HTML/XHTML output, to keep compatible behaviors
-   *        for old callers of this interface
-   * XXXbz How does this interact with OutputFormatFlowed?
-   */
-  const unsigned long OutputWrap          = (1 << 5);
-
-  /**
-   * Output for format flowed (RFC 2646). This is used when converting
-   * to text for mail sending. This differs just slightly
-   * but in an important way from normal formatted, and that is that
-   * lines are space stuffed. This can't (correctly) be done later.
-   * PlainText output only.
-   * If this flag is set, `OutputFormat` has to be set too.
-   * XXXbz How does this interact with OutputRaw/OutputWrap?
-   */
-  const unsigned long OutputFormatFlowed  = (1 << 6);
-
-  /**
-   * Convert links, image src, and script src to absolute URLs when possible.
-   * XHTML/HTML output only.
-   */
-  const unsigned long OutputAbsoluteLinks = (1 << 7);
-
-  /**
-   * LineBreak processing: if this flag is set than CR line breaks will
-   * be written. If neither this nor OutputLFLineBreak is set, then we
-   * will use platform line breaks. The combination of the two flags will
-   * cause CRLF line breaks to be written.
-   */
-  const unsigned long OutputCRLineBreak = (1 << 9);
-
-  /**
-   * LineBreak processing: if this flag is set than LF line breaks will
-   * be written. If neither this nor OutputCRLineBreak is set, then we
-   * will use platform line breaks. The combination of the two flags will
-   * cause CRLF line breaks to be written.
-   */
-  const unsigned long OutputLFLineBreak = (1 << 10);
-
-  /**
-   * Output the content of noscript elements (only for serializing
-   * to plaintext).
-   */
-  const unsigned long OutputNoScriptContent = (1 << 11);
-
-  /**
-   * Output the content of noframes elements (only for serializing
-   * to plaintext). (Used only internally in the plain text serializer;
-   * ignored if passed by the caller.)
-   */
-  const unsigned long OutputNoFramesContent = (1 << 12);
-
-  /**
-   * Don't allow any formatting nodes (e.g. <br>, <b>) inside a <pre>.
-   * This is used primarily by mail. XHTML/HTML output only.
-   */
-  const unsigned long OutputNoFormattingInPre = (1 << 13);
-
-  /**
-   * Encode entities when outputting to a string.
-   * E.g. If set, we'll output &nbsp; if clear, we'll output 0xa0.
-   * The basic set is just &nbsp; &amp; &lt; &gt; &quot; for interoperability
-   * with older products that don't support &alpha; and friends.
-   * HTML output only.
-   */
-  const unsigned long OutputEncodeBasicEntities = (1 << 14);
-
-  /**
-   * Normally &nbsp; is replaced with a space character when
-   * encoding data as plain text, set this flag if that's
-   * not desired.
-   * Plaintext output only.
-   */
-  const unsigned long OutputPersistNBSP = (1 << 17);
-
-  /**
-   * Normally when serializing the whole document using the HTML or
-   * XHTML serializer, the encoding declaration is rewritten to match.
-   * This flag suppresses that behavior.
-   */
-  const unsigned long OutputDontRewriteEncodingDeclaration = (1 << 18);
-
-  /**
-   * When using the HTML or XHTML serializer, skip elements that are not
-   * visible when this flag is set.  Elements are not visible when they
-   * have CSS style display:none or visibility:collapse, for example.
-   */
-  const unsigned long SkipInvisibleContent = (1 << 19);
-
-  /**
-   * Output for delsp=yes (RFC 3676). This is used with OutputFormatFlowed
-   * when converting to text for mail sending.
-   * PlainText output only.
-   */
-  const unsigned long OutputFormatDelSp  = (1 << 20);
-
-  /**
-   * Drop <br> elements considered "invisible" by the editor. OutputPreformatted
-   * implies this flag.
-   */
-  const unsigned long OutputDropInvisibleBreak = (1 << 21);
-
-  /**
-   * Don't check for _moz_dirty attributes when deciding whether to
-   * pretty-print if this flag is set (bug 599983).
-   */
-  const unsigned long OutputIgnoreMozDirty = (1 << 22);
-
-  /**
-   * Serialize in a way that is suitable for copying a plaintext version of the
-   * document to the clipboard.  This can for example cause line endings to be
-   * injected at preformatted block element boundaries.
-   */
-  const unsigned long OutputForPlainTextClipboardCopy = (1 << 25);
-
-  /**
-   * Include ruby annotations and ruby parentheses in the output.
-   * PlainText output only.
-   */
-  const unsigned long OutputRubyAnnotation = (1 << 26);
-
-  /**
-   * Disallow breaking of long character strings. This is important
-   * for serializing e-mail which contains CJK strings. These must
-   * not be broken just as "normal" longs strings aren't broken.
-   */
-  const unsigned long OutputDisallowLineBreaking = (1 << 27);
-
-  /**
-   * Release reference of Document after using encodeTo* method to recycle
-   * this encoder without holding Document. To use this encoder again,
-   * we have to call init again.
-   */
-  const unsigned long RequiresReinitAfterOutput = (1 << 28);
-
-  /**
-   * Initialize with a pointer to the document and the mime type.
-   * Resets wrap column to 72 and resets node fixup.
-   * @param aDocument Document to encode.
-   * @param aMimeType MimeType to use. May also be set by SetMimeType.
-   * @param aFlags Flags to use while encoding. May also be set by SetFlags.
-   */
-  void init(in Document aDocument,
-            in AString aMimeType,
-            in unsigned long aFlags);
-  [noscript] void nativeInit(in Document aDocument,
-                             in AString aMimeType,
-                             in unsigned long aFlags);
-
-  /**
-   *  If the selection is set to a non-null value, then the
-   *  selection is used for encoding, otherwise the entire
-   *  document is encoded.
-   * @param aSelection The selection to encode.
-   */
-  void setSelection(in Selection aSelection);
-
-  /**
-   *  If the range is set to a non-null value, then the
-   *  range is used for encoding, otherwise the entire
-   *  document or selection is encoded.
-   * @param aRange The range to encode.
-   */
-  void setRange(in Range aRange);
-
-  /**
-   *  If the node is set to a non-null value, then the
-   *  node is used for encoding, otherwise the entire
-   *  document or range or selection is encoded.
-   * @param aNode The node to encode.
-   */
-  void setNode(in Node aNode);
-
-  /**
-   *  If the container is set to a non-null value, then its
-   *  child nodes are used for encoding, otherwise the entire
-   *  document or range or selection or node is encoded.
-   *  @param aContainer The node which child nodes will be encoded.
-   */
-  void setContainerNode(in Node aContainer);
-
-  /**
-   *  Documents typically have an intrinsic character set,
-   *  but if no intrinsic value is found, the platform character set
-   *  is used. This function overrides both the intrinisc and platform
-   *  charset.
-   *  @param aCharset Overrides the both the intrinsic or platform
-   *  character set when encoding the document.
-   *
-   *  Possible result codes: NS_ERROR_NO_CHARSET_CONVERTER
-   */
-  void setCharset(in ACString aCharset);
-
-  /**
-   *  Set a wrap column.  This may have no effect in some types of encoders.
-   * @param aWrapColumn Column to which to wrap. If 0, wrapping is disabled.
-   */
-  void setWrapColumn(in unsigned long aWrapColumn);
-
-  /**
-   *  The mime type preferred by the encoder.  This piece of api was
-   *  added because the copy encoder may need to switch mime types on you
-   *  if you ask it to copy html that really represents plaintext content.
-   *  Call this AFTER Init() and SetSelection() have both been called.
-   */
-  readonly attribute AString mimeType;
-
-  /**
-   *  Encode the document and send the result to the nsIOutputStream.
-   *
-   *  Possible result codes are the stream errors which might have
-   *  been encountered.
-   * @param aStream Stream into which to encode.
-   */
-  void encodeToStream(in nsIOutputStream aStream);
-
-  /**
-   * Encode the document into a string.
-   *
-   * @return The document encoded into a string.
-   */
-  AString encodeToString();
-
-  /**
-   * Encode the document into a string. Stores the extra context information
-   * into the two arguments.
-   * @param [OUT] aContextString The string where the parent hierarchy
-   *              information will be stored.
-   * @param [OUT] aInfoString The string where extra context info will
-   *              be stored.
-   * @return The document encoded as a string.
-   *
-   */
-  AString encodeToStringWithContext( out AString aContextString,
-                                     out AString aInfoString);
-
-  /**
-   * Encode the document into a string of limited size.
-   * @param aMaxLength After aMaxLength characters, the encoder will stop
-   *                   encoding new data.
-   *                   Only values > 0 will be considered.
-   *                   The returned string may be slightly larger than
-   *                   aMaxLength because some serializers (eg. HTML)
-   *                   may need to close some tags after they stop
-   *                   encoding new data, or finish a line (72 columns
-   *                   by default for the plain text serializer).
-   *
-   * @return The document encoded into a string.
-   */
-  AString encodeToStringWithMaxLength(in unsigned long aMaxLength);
-
-  /**
-   * Set the fixup object associated with node persistence.
-   * @param aFixup The fixup object.
-   */
-  void setNodeFixup(in nsIDocumentEncoderNodeFixup aFixup);
-};
-
-%{ C++
-template<class T> struct already_AddRefed;
-
-bool
-do_getDocumentTypeSupportedForEncoding(const char* aContentType);
-already_AddRefed<nsIDocumentEncoder>
-do_createDocumentEncoder(const char* aContentType);
-already_AddRefed<nsIDocumentEncoder>
-do_createHTMLCopyEncoder();
-%}
diff -Nru firefox-84.0.2+build1/dom/base/nsIDocumentObserver.h firefox-85.0+build1/dom/base/nsIDocumentObserver.h
--- firefox-84.0.2+build1/dom/base/nsIDocumentObserver.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsIDocumentObserver.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,13 +6,13 @@
 #ifndef nsIDocumentObserver_h___
 #define nsIDocumentObserver_h___
 
-#include "mozilla/EventStates.h"
-#include "mozilla/StyleSheet.h"
 #include "nsISupports.h"
 #include "nsIMutationObserver.h"
 
 class nsIContent;
 namespace mozilla {
+class EventStates;
+
 namespace dom {
 class Document;
 }
diff -Nru firefox-84.0.2+build1/dom/base/nsImageLoadingContent.cpp firefox-85.0+build1/dom/base/nsImageLoadingContent.cpp
--- firefox-84.0.2+build1/dom/base/nsImageLoadingContent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsImageLoadingContent.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -53,6 +53,8 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 
+#include "Orientation.h"
+
 #ifdef LoadImage
 // Undefine LoadImage to prevent naming conflict with Windows.
 #  undef LoadImage
diff -Nru firefox-84.0.2+build1/dom/base/nsImageLoadingContent.h firefox-85.0+build1/dom/base/nsImageLoadingContent.h
--- firefox-84.0.2+build1/dom/base/nsImageLoadingContent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsImageLoadingContent.h	2021-01-18 19:58:08.000000000 +0000
@@ -18,13 +18,15 @@
 #include "mozilla/EventStates.h"
 #include "mozilla/TimeStamp.h"
 #include "nsCOMPtr.h"
+#include "nsIContentPolicy.h"
 #include "nsIImageLoadingContent.h"
 #include "nsIRequest.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Promise.h"
 #include "nsAttrValue.h"
+#include "Units.h"
 
+class nsINode;
 class nsIURI;
 class nsPresContext;
 class nsIContent;
@@ -32,6 +34,8 @@
 
 namespace mozilla {
 class AsyncEventDispatcher;
+class ErrorResult;
+
 namespace dom {
 struct BindContext;
 class Document;
diff -Nru firefox-84.0.2+build1/dom/base/nsINode.cpp firefox-85.0+build1/dom/base/nsINode.cpp
--- firefox-84.0.2+build1/dom/base/nsINode.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsINode.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -31,6 +31,8 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/BindContext.h"
 #include "mozilla/dom/CharacterData.h"
+#include "mozilla/dom/CustomElementRegistry.h"
+#include "mozilla/dom/DebuggerNotificationBinding.h"
 #include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
@@ -116,6 +118,14 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
+static bool ShouldUseNACScope(const nsINode* aNode) {
+  return aNode->IsInNativeAnonymousSubtree();
+}
+
+static bool ShouldUseUAWidgetScope(const nsINode* aNode) {
+  return aNode->HasBeenInUAWidget();
+}
+
 void* nsINode::operator new(size_t aSize, nsNodeInfoManager* aManager) {
   if (StaticPrefs::dom_arena_allocator_enabled_AtStartup()) {
     MOZ_ASSERT(aManager, "nsNodeInfoManager needs to be initialized");
@@ -1257,6 +1267,12 @@
   }
 }
 
+mozilla::Maybe<mozilla::dom::EventCallbackDebuggerNotificationType>
+nsINode::GetDebuggerNotificationType() const {
+  return mozilla::Some(
+      mozilla::dom::EventCallbackDebuggerNotificationType::Node);
+}
+
 bool nsINode::ComputeDefaultWantsUntrusted(ErrorResult& aRv) {
   return !nsContentUtils::IsChromeDoc(OwnerDoc());
 }
@@ -3188,8 +3204,8 @@
       CustomElementData* data = elem->GetCustomElementData();
       if (data && data->mState == CustomElementData::State::eCustom) {
         LifecycleAdoptedCallbackArgs args = {oldDoc, newDoc};
-        nsContentUtils::EnqueueLifecycleCallback(Document::eAdopted, elem,
-                                                 nullptr, &args);
+        nsContentUtils::EnqueueLifecycleCallback(ElementCallbackType::eAdopted,
+                                                 elem, nullptr, &args);
       }
     }
 
@@ -3437,6 +3453,18 @@
   return GetFlattenedTreeParentNode();
 }
 
+ParentObject nsINode::GetParentObject() const {
+  ParentObject p(OwnerDoc());
+  // Note that mReflectionScope is a no-op for chrome, and other places
+  // where we don't check this value.
+  if (ShouldUseNACScope(this)) {
+    p.mReflectionScope = ReflectionScope::NAC;
+  } else if (ShouldUseUAWidgetScope(this)) {
+    p.mReflectionScope = ReflectionScope::UAWidget;
+  }
+  return p;
+}
+
 NS_IMPL_ISUPPORTS(nsNodeWeakReference, nsIWeakReference)
 
 nsNodeWeakReference::nsNodeWeakReference(nsINode* aNode)
diff -Nru firefox-84.0.2+build1/dom/base/nsINode.h firefox-85.0+build1/dom/base/nsINode.h
--- firefox-84.0.2+build1/dom/base/nsINode.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsINode.h	2021-01-18 19:58:08.000000000 +0000
@@ -1030,10 +1030,7 @@
   virtual mozilla::EventListenerManager* GetOrCreateListenerManager() override;
 
   mozilla::Maybe<mozilla::dom::EventCallbackDebuggerNotificationType>
-  GetDebuggerNotificationType() const override {
-    return mozilla::Some(
-        mozilla::dom::EventCallbackDebuggerNotificationType::Node);
-  }
+  GetDebuggerNotificationType() const override;
 
   bool ComputeDefaultWantsUntrusted(mozilla::ErrorResult& aRv) final;
 
diff -Nru firefox-84.0.2+build1/dom/base/nsINodeList.h firefox-85.0+build1/dom/base/nsINodeList.h
--- firefox-84.0.2+build1/dom/base/nsINodeList.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsINodeList.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,7 +8,7 @@
 #define nsINodeList_h___
 
 #include "nsWrapperCache.h"
-#include "nsIContent.h"
+#include "nsISupports.h"
 
 // IID for the nsINodeList interface
 #define NS_INODELIST_IID                             \
diff -Nru firefox-84.0.2+build1/dom/base/nsIObjectLoadingContent.idl firefox-85.0+build1/dom/base/nsIObjectLoadingContent.idl
--- firefox-84.0.2+build1/dom/base/nsIObjectLoadingContent.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsIObjectLoadingContent.idl	2021-01-18 19:58:08.000000000 +0000
@@ -65,6 +65,9 @@
   const unsigned long PLUGIN_VULNERABLE_NO_UPDATE = 10;
   // The plugin is click-to-play, but the user won't see overlays
   const unsigned long PLUGIN_CLICK_TO_PLAY_QUIET  = 11;
+  // Plugins are no longer supported.  The plugin should not load and should
+  // be represented by a transparent element.
+  const unsigned long PLUGIN_BLOCK_ALL            = 12;
 
   // Plugins-specific permission indicating that we want to prompt the user
   // to decide whether they want to allow a plugin, but to do so in a less
diff -Nru firefox-84.0.2+build1/dom/base/nsISelectionController.idl firefox-85.0+build1/dom/base/nsISelectionController.idl
--- firefox-84.0.2+build1/dom/base/nsISelectionController.idl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsISelectionController.idl	2021-01-18 19:58:09.000000000 +0000
@@ -276,10 +276,6 @@
    */
     void scrollCharacter(in boolean right);
 
-  /** SelectAll will select the whole page
-   */
-    void selectAll();
-
   /** CheckVisibility will return true if textnode and offsets are actually rendered
    *  in the current precontext.
    *  @param aNode textNode to test
diff -Nru firefox-84.0.2+build1/dom/base/nsJSEnvironment.cpp firefox-85.0+build1/dom/base/nsJSEnvironment.cpp
--- firefox-84.0.2+build1/dom/base/nsJSEnvironment.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsJSEnvironment.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -27,9 +27,11 @@
 #include "nsAtom.h"
 #include "nsContentUtils.h"
 #include "mozilla/EventDispatcher.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsIContent.h"
 #include "nsCycleCollector.h"
 #include "nsXPCOMCIDInternal.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTextFormatter.h"
 #ifdef XP_WIN
 #  include <process.h>
@@ -92,27 +94,14 @@
 static nsITimer* sGCTimer;
 static nsITimer* sShrinkingGCTimer;
 static StaticRefPtr<IdleTaskRunner> sCCRunner;
-static StaticRefPtr<IdleTaskRunner> sICCRunner;
 static nsITimer* sFullGCTimer;
 static StaticRefPtr<IdleTaskRunner> sInterSliceGCRunner;
 
-static TimeStamp sCurrentGCStartTime;
-
 static JS::GCSliceCallback sPrevGCSliceCallback;
 
-static bool sHasRunGC;
-
-static uint32_t sCCollectedWaitingForGC;
-static uint32_t sCCollectedZonesWaitingForGC;
-static uint32_t sLikelyShortLivingObjectsNeedingGC;
-static bool sNeedsFullGC = false;
-static bool sNeedsGCAfterCC = false;
 static bool sIncrementalCC = false;
 
-static TimeStamp sFirstCollectionTime;
-
 static bool sIsInitialized;
-static bool sDidShutdown;
 static bool sShuttingDown;
 
 // nsJSEnvironmentObserver observes the user-interaction-inactive notifications
@@ -279,6 +268,7 @@
 } /* namespace xpc */
 
 static TimeDuration GetCollectionTimeDelta() {
+  static TimeStamp sFirstCollectionTime;
   TimeStamp now = TimeStamp::Now();
   if (sFirstCollectionTime) {
     return now - sFirstCollectionTime;
@@ -291,18 +281,10 @@
   nsJSContext::KillGCTimer();
   nsJSContext::KillShrinkingGCTimer();
   nsJSContext::KillCCRunner();
-  nsJSContext::KillICCRunner();
   nsJSContext::KillFullGCTimer();
   nsJSContext::KillInterSliceGCRunner();
 }
 
-// If we collected a substantial amount of cycles, poke the GC since more
-// objects might be unreachable now.
-static bool NeedsGCAfterCC() {
-  return sCCollectedWaitingForGC > 250 || sCCollectedZonesWaitingForGC > 0 ||
-         sLikelyShortLivingObjectsNeedingGC > 2500 || sNeedsGCAfterCC;
-}
-
 class nsJSEnvironmentObserver final : public nsIObserver {
   ~nsJSEnvironmentObserver() = default;
 
@@ -335,7 +317,7 @@
                                      nsJSContext::NonIncrementalGC,
                                      nsJSContext::ShrinkingGC);
       nsJSContext::CycleCollectNow();
-      if (NeedsGCAfterCC()) {
+      if (sScheduler.NeedsGCAfterCC()) {
         nsJSContext::GarbageCollectNow(JS::GCReason::MEM_PRESSURE,
                                        nsJSContext::NonIncrementalGC,
                                        nsJSContext::ShrinkingGC);
@@ -1111,10 +1093,10 @@
 
   if (aIncremental == NonIncrementalGC ||
       aReason == JS::GCReason::FULL_GC_TIMER) {
-    sNeedsFullGC = true;
+    sScheduler.SetNeedsFullGC();
   }
 
-  if (sNeedsFullGC) {
+  if (sScheduler.NeedsFullGC()) {
     JS::PrepareForFullGC(cx);
   }
 
@@ -1178,6 +1160,12 @@
   }
 }
 
+MOZ_ALWAYS_INLINE
+static TimeDuration TimeBetween(TimeStamp aStart, TimeStamp aEnd) {
+  MOZ_ASSERT(aEnd >= aStart);
+  return aEnd - aStart;
+}
+
 static TimeDuration TimeUntilNow(TimeStamp start) {
   if (start.IsNull()) {
     return TimeDuration();
@@ -1328,10 +1316,11 @@
       ProcessNameForCollectorLog(), getpid(), mMaxSliceTime.ToMilliseconds(),
       mTotalSliceTime.ToMilliseconds(), aResults.mNumSlices, mSuspected,
       aResults.mVisitedRefCounted, aResults.mVisitedGCed, mergeMsg.get(),
-      aResults.mFreedRefCounted, aResults.mFreedGCed, sCCollectedWaitingForGC,
-      sCCollectedZonesWaitingForGC, sLikelyShortLivingObjectsNeedingGC,
-      gcMsg.get(), mForgetSkippableBeforeCC,
-      mMinForgetSkippableTime.ToMilliseconds(),
+      aResults.mFreedRefCounted, aResults.mFreedGCed,
+      sScheduler.mCCollectedWaitingForGC,
+      sScheduler.mCCollectedZonesWaitingForGC,
+      sScheduler.mLikelyShortLivingObjectsNeedingGC, gcMsg.get(),
+      mForgetSkippableBeforeCC, mMinForgetSkippableTime.ToMilliseconds(),
       mMaxForgetSkippableTime.ToMilliseconds(),
       mTotalForgetSkippableTime.ToMilliseconds() / aCleanups,
       mTotalForgetSkippableTime.ToMilliseconds(),
@@ -1388,10 +1377,11 @@
       mMaxSliceTime.ToMilliseconds(), mTotalSliceTime.ToMilliseconds(),
       mMaxGCDuration.ToMilliseconds(), mMaxSkippableDuration.ToMilliseconds(),
       mSuspected, aResults.mVisitedRefCounted, aResults.mVisitedGCed,
-      aResults.mFreedRefCounted, aResults.mFreedGCed, sCCollectedWaitingForGC,
-      sCCollectedZonesWaitingForGC, sLikelyShortLivingObjectsNeedingGC,
-      aResults.mForcedGC, mForgetSkippableBeforeCC,
-      mMinForgetSkippableTime.ToMilliseconds(),
+      aResults.mFreedRefCounted, aResults.mFreedGCed,
+      sScheduler.mCCollectedWaitingForGC,
+      sScheduler.mCCollectedZonesWaitingForGC,
+      sScheduler.mLikelyShortLivingObjectsNeedingGC, aResults.mForcedGC,
+      mForgetSkippableBeforeCC, mMinForgetSkippableTime.ToMilliseconds(),
       mMaxForgetSkippableTime.ToMilliseconds(),
       mTotalForgetSkippableTime.ToMilliseconds() / aCleanups,
       mTotalForgetSkippableTime.ToMilliseconds(), mRemovedPurples);
@@ -1482,26 +1472,6 @@
   return sCCStats.mMaxSliceTimeSinceClear.ToMilliseconds();
 }
 
-static bool ICCRunnerFired(TimeStamp aDeadline) {
-  if (sDidShutdown) {
-    return false;
-  }
-
-  // Ignore ICC timer fires during IGC. Running ICC during an IGC will cause us
-  // to synchronously finish the GC, which is bad.
-
-  if (sScheduler.InIncrementalGC()) {
-    TimeStamp now = TimeStamp::Now();
-    sScheduler.EnsureCCIsBlocked(now);
-    if (sScheduler.GetCCBlockedTime(now).value() < kMaxCCLockedoutTime) {
-      return false;
-    }
-  }
-
-  nsJSContext::RunCycleCollectorSlice(aDeadline);
-  return true;
-}
-
 // static
 void nsJSContext::BeginCycleCollectionCallback() {
   MOZ_ASSERT(NS_IsMainThread());
@@ -1511,8 +1481,6 @@
       sCCStats.mBeginSliceTime.IsNull() ? startTime : sCCStats.mBeginSliceTime;
   sCCStats.mSuspected = nsCycleCollector_suspectedCount();
 
-  KillCCRunner();
-
   // Run forgetSkippable synchronously to reduce the size of the CC graph. This
   // is particularly useful if we recently finished a GC.
   if (sScheduler.IsEarlyForgetSkippable()) {
@@ -1523,45 +1491,38 @@
     sCCStats.AfterSyncForgetSkippable(startTime);
   }
 
-  MOZ_ASSERT(!sICCRunner,
-             "Tried to create a new ICC timer when one already existed.");
-
   if (sShuttingDown) {
     return;
   }
 
-  // Create an ICC timer even if ICC is globally disabled, because we could be
-  // manually triggering an incremental collection, and we want to be sure to
-  // finish it.
-  sICCRunner = IdleTaskRunner::Create(
-      ICCRunnerFired, "BeginCycleCollectionCallback::ICCRunnerFired",
-      kICCIntersliceDelay.ToMilliseconds(),
-      kIdleICCSliceBudget.ToMilliseconds(), true, [] { return sShuttingDown; });
+  if (!sCCRunner) {
+    sScheduler.InitCCRunnerStateMachine(
+        mozilla::CCGCScheduler::CCRunnerState::CycleCollecting);
+  }
+  EnsureCCRunner(kICCIntersliceDelay, kIdleICCSliceBudget);
 }
 
 // static
 void nsJSContext::EndCycleCollectionCallback(CycleCollectorResults& aResults) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  nsJSContext::KillICCRunner();
+  nsJSContext::KillCCRunner();
 
   // Update timing information for the current slice before we log it, if
   // we previously called PrepareForCycleCollectionSlice(). During shutdown
   // CCs, this won't happen.
   sCCStats.AfterCycleCollectionSlice();
-
-  sCCollectedWaitingForGC += aResults.mFreedGCed;
-  sCCollectedZonesWaitingForGC += aResults.mFreedJSZones;
+  sScheduler.NoteCycleCollected(aResults);
 
   TimeStamp endCCTimeStamp = TimeStamp::Now();
   TimeDuration ccNowDuration = TimeBetween(sCCStats.mBeginTime, endCCTimeStamp);
 
-  if (NeedsGCAfterCC()) {
+  if (sScheduler.NeedsGCAfterCC()) {
     MOZ_ASSERT(StaticPrefs::javascript_options_gc_delay() >
                    kMaxICCDuration.ToMilliseconds(),
                "A max duration ICC shouldn't reduce GC delay to 0");
 
-    PokeGC(JS::GCReason::CC_WAITING, nullptr,
+    PokeGC(JS::GCReason::CC_FINISHED, nullptr,
            StaticPrefs::javascript_options_gc_delay() -
                std::min(ccNowDuration, kMaxICCDuration).ToMilliseconds());
   }
@@ -1578,15 +1539,15 @@
 
   // Update global state to indicate we have just run a cycle collection.
   sScheduler.NoteCCEnd(endCCTimeStamp);
-  sNeedsGCAfterCC = false;
   sCCStats.Clear();
 }
 
 // static
 bool InterSliceGCRunnerFired(TimeStamp aDeadline, void* aData) {
   MOZ_ASSERT(sScheduler.mActiveIntersliceGCBudget);
-  TimeDuration budget = sScheduler.ComputeInterSliceGCBudget(aDeadline);
   TimeStamp startTimeStamp = TimeStamp::Now();
+  TimeDuration budget =
+      sScheduler.ComputeInterSliceGCBudget(aDeadline, startTimeStamp);
   TimeDuration duration = sGCUnnotifiedTotalTime;
   uintptr_t reason = reinterpret_cast<uintptr_t>(aData);
   nsJSContext::GarbageCollectNow(
@@ -1656,23 +1617,15 @@
 }
 
 static bool CCRunnerFired(TimeStamp aDeadline) {
-  if (sDidShutdown) {
-    return false;
-  }
-
   bool didDoWork = false;
 
-  using CCRunnerAction = CCGCScheduler::CCRunnerAction;
-  using CCRunnerStep = CCGCScheduler::CCRunnerStep;
-
   // The CC/GC scheduler (sScheduler) decides what action(s) to take during
   // this invocation of the CC runner.
   //
   // This may be zero, one, or multiple actions. (Zero is when CC is blocked by
   // incremental GC, or when the scheduler determined that a CC is no longer
-  // needed.) Loop until an action is requested that finishes this invocation,
-  // or the scheduler decides that this invocation should finish by returning
-  // `Yield`.
+  // needed.) Loop until the scheduler finishes this invocation by returning
+  // `Yield` in step.mYield.
   CCRunnerStep step;
   do {
     uint32_t suspected = nsCycleCollector_suspectedCount();
@@ -1711,12 +1664,29 @@
     if (step.mAction != CCRunnerAction::None) {
       didDoWork = true;
     }
-  } while (step.mYield == CCGCScheduler::CCRunnerYield::Continue);
+  } while (step.mYield == CCRunnerYield::Continue);
 
   return didDoWork;
 }
 
 // static
+void nsJSContext::EnsureCCRunner(TimeDuration aDelay, TimeDuration aBudget) {
+  MOZ_ASSERT(!sShuttingDown);
+
+  if (!sCCRunner) {
+    sCCRunner = IdleTaskRunner::Create(
+        CCRunnerFired, "EnsureCCRunner::CCRunnerFired", aDelay.ToMilliseconds(),
+        aBudget.ToMilliseconds(), true, [] { return sShuttingDown; });
+  } else {
+    sCCRunner->SetBudget(aBudget.ToMilliseconds());
+    nsIEventTarget* target = mozilla::GetCurrentEventTarget();
+    if (target) {
+      sCCRunner->SetTimer(aDelay.ToMilliseconds(), target);
+    }
+  }
+}
+
+// static
 bool nsJSContext::HasHadCleanupSinceLastGC() {
   return sScheduler.IsEarlyForgetSkippable(1);
 }
@@ -1736,7 +1706,7 @@
     if (aReason == JS::GCReason::DOM_WINDOW_UTILS) {
       // Force full GCs when called from reftests so that we collect dead zones
       // that have not been scheduled for collection.
-      sNeedsFullGC = true;
+      sScheduler.SetNeedsFullGC();
     }
     GCTimerFired(nullptr, reinterpret_cast<void*>(aReason));
     return;
@@ -1754,14 +1724,8 @@
         "Don't check the CC timers if the CC is locked out during an iGC.");
 
     if (sCCRunner) {
-      MOZ_ASSERT(!sICCRunner,
-                 "Shouldn't have both sCCRunner and sICCRunner active at the "
-                 "same time");
       sCCRunner->SetDeadline(aDeadline);
       runnable = sCCRunner;
-    } else if (sICCRunner) {
-      sICCRunner->SetDeadline(aDeadline);
-      runnable = sICCRunner;
     }
   }
 
@@ -1838,8 +1802,8 @@
   if (aObj) {
     JS::Zone* zone = JS::GetObjectZone(aObj);
     CycleCollectedJSRuntime::Get()->AddZoneWaitingForGC(zone);
-  } else if (aReason != JS::GCReason::CC_WAITING) {
-    sNeedsFullGC = true;
+  } else if (aReason != JS::GCReason::CC_FINISHED) {
+    sScheduler.SetNeedsFullGC();
   }
 
   if (sGCTimer || sInterSliceGCRunner) {
@@ -1848,17 +1812,9 @@
   }
 
   if (sCCRunner) {
-    // Make sure CC is called...
-    sScheduler.SetNeedsFullCC();
-    // and GC after it.
-    sNeedsGCAfterCC = true;
-    return;
-  }
-
-  if (sICCRunner) {
-    // Make sure GC is called after the current CC completes.
-    // No need to SetNeedsFullCC because we are currently running a CC.
-    sNeedsGCAfterCC = true;
+    // Make sure CC is called regardless of the size of the purple buffer, and
+    // GC after it.
+    sScheduler.EnsureCCThenGC();
     return;
   }
 
@@ -1888,7 +1844,7 @@
 
 // static
 void nsJSContext::MaybePokeCC() {
-  if (sCCRunner || sICCRunner || !sHasRunGC || sShuttingDown) {
+  if (sCCRunner || sShuttingDown) {
     return;
   }
 
@@ -1896,12 +1852,11 @@
     // We can kill some objects before running forgetSkippable.
     nsCycleCollector_dispatchDeferredDeletion();
 
-    sScheduler.ActivateCCRunner();
-    sCCRunner =
-        IdleTaskRunner::Create(CCRunnerFired, "MaybePokeCC::CCRunnerFired",
-                               kCCSkippableDelay.ToMilliseconds(),
-                               kForgetSkippableSliceDuration.ToMilliseconds(),
-                               true, [] { return sShuttingDown; });
+    if (!sCCRunner) {
+      sScheduler.InitCCRunnerStateMachine(
+          mozilla::CCGCScheduler::CCRunnerState::ReducePurple);
+    }
+    EnsureCCRunner(kCCSkippableDelay, kForgetSkippableSliceDuration);
   }
 }
 
@@ -1945,20 +1900,12 @@
   }
 }
 
-// static
-void nsJSContext::KillICCRunner() {
-  sScheduler.UnblockCC();
-
-  if (sICCRunner) {
-    sICCRunner->Cancel();
-    sICCRunner = nullptr;
-  }
-}
-
 static void DOMGCSliceCallback(JSContext* aCx, JS::GCProgress aProgress,
                                const JS::GCDescription& aDesc) {
   NS_ASSERTION(NS_IsMainThread(), "GCs must run on the main thread");
 
+  static TimeStamp sCurrentGCStartTime;
+
   switch (aProgress) {
     case JS::GC_CYCLE_BEGIN: {
       // Prevent cycle collections and shrinking during incremental GC.
@@ -1991,11 +1938,6 @@
       // May need to kill the inter-slice GC runner
       nsJSContext::KillInterSliceGCRunner();
 
-      sCCollectedWaitingForGC = 0;
-      sCCollectedZonesWaitingForGC = 0;
-      sLikelyShortLivingObjectsNeedingGC = 0;
-      sScheduler.SetNeedsFullCC();
-      sHasRunGC = true;
       nsJSContext::MaybePokeCC();
 
       if (aDesc.isZone_) {
@@ -2007,16 +1949,13 @@
         }
       } else {
         nsJSContext::KillFullGCTimer();
+        sScheduler.SetNeedsFullGC(false);
       }
 
       if (sScheduler.IsCCNeeded(nsCycleCollector_suspectedCount())) {
         nsCycleCollector_dispatchDeferredDeletion();
       }
 
-      if (!aDesc.isZone_) {
-        sNeedsFullGC = false;
-      }
-
       Telemetry::Accumulate(Telemetry::GC_IN_PROGRESS_MS,
                             TimeUntilNow(sCurrentGCStartTime).ToMilliseconds());
       break;
@@ -2081,20 +2020,13 @@
 JSObject* nsJSContext::GetWindowProxy() { return mWindowProxy; }
 
 void nsJSContext::LikelyShortLivingObjectCreated() {
-  ++sLikelyShortLivingObjectsNeedingGC;
+  ++sScheduler.mLikelyShortLivingObjectsNeedingGC;
 }
 
 void mozilla::dom::StartupJSEnvironment() {
   // initialize all our statics, so that we can restart XPCOM
   sGCTimer = sShrinkingGCTimer = sFullGCTimer = nullptr;
-  sHasRunGC = false;
-  sCCollectedWaitingForGC = 0;
-  sCCollectedZonesWaitingForGC = 0;
-  sLikelyShortLivingObjectsNeedingGC = 0;
-  sNeedsFullGC = true;
-  sNeedsGCAfterCC = false;
   sIsInitialized = false;
-  sDidShutdown = false;
   sShuttingDown = false;
   new (&sScheduler) CCGCScheduler();  // Reset the scheduler state.
   sCCStats.Init();
@@ -2390,7 +2322,7 @@
   KillTimers();
 
   sShuttingDown = true;
-  sDidShutdown = true;
+  sScheduler.Shutdown();
 }
 
 AsyncErrorReporter::AsyncErrorReporter(xpc::ErrorReport* aReport)
diff -Nru firefox-84.0.2+build1/dom/base/nsJSEnvironment.h firefox-85.0+build1/dom/base/nsJSEnvironment.h
--- firefox-84.0.2+build1/dom/base/nsJSEnvironment.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsJSEnvironment.h	2021-01-18 19:58:08.000000000 +0000
@@ -108,8 +108,9 @@
   static void KillShrinkingGCTimer();
 
   static void MaybePokeCC();
+  static void EnsureCCRunner(mozilla::TimeDuration aDelay,
+                             mozilla::TimeDuration aBudget);
   static void KillCCRunner();
-  static void KillICCRunner();
   static void KillFullGCTimer();
   static void KillInterSliceGCRunner();
 
diff -Nru firefox-84.0.2+build1/dom/base/nsJSUtils.cpp firefox-85.0+build1/dom/base/nsJSUtils.cpp
--- firefox-84.0.2+build1/dom/base/nsJSUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsJSUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,29 +12,37 @@
  */
 
 #include "nsJSUtils.h"
-#include "jsapi.h"
-#include "jsfriendapi.h"
+
+#include <utility>
+#include "GeckoProfiler.h"
+#include "MainThreadUtils.h"
+#include "js/ComparisonOperators.h"
 #include "js/CompilationAndEvaluation.h"
+#include "js/CompileOptions.h"
 #include "js/Date.h"
-#include "js/Modules.h"  // JS::CompileModule, JS::GetModuleScript, JS::Module{Instantiate,Evaluate}
-#include "js/OffThreadScriptCompilation.h"
+#include "js/GCVector.h"
+#include "js/HeapAPI.h"
+#include "js/Modules.h"
+#include "js/RootingAPI.h"
 #include "js/SourceText.h"
-#include "nsIScriptContext.h"
-#include "nsIScriptElement.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsCOMPtr.h"
-#include "nsPIDOMWindow.h"
-#include "GeckoProfiler.h"
-#include "nsJSPrincipals.h"
-#include "xpcpublic.h"
-#include "nsContentUtils.h"
-#include "nsGlobalWindow.h"
+#include "js/TypeDecls.h"
+#include "jsfriendapi.h"
 #include "mozilla/CycleCollectedJSContext.h"
-#include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/Utf8.h"  // mozilla::Utf8Unit
+#include "mozilla/fallible.h"
+#include "nsContentUtils.h"
+#include "nsDebug.h"
+#include "nsGlobalWindowInner.h"
+#include "nsINode.h"
+#include "nsString.h"
+#include "nsTPromiseFlatString.h"
+#include "nscore.h"
+
+#if !defined(DEBUG) && !defined(MOZ_ENABLE_JS_DUMP)
+#  include "mozilla/StaticPrefs_browser.h"
+#endif
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -104,303 +112,6 @@
   return NS_OK;
 }
 
-static nsresult EvaluationExceptionToNSResult(JSContext* aCx) {
-  if (JS_IsExceptionPending(aCx)) {
-    return NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW;
-  }
-  return NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE;
-}
-
-nsJSUtils::ExecutionContext::ExecutionContext(JSContext* aCx,
-                                              JS::Handle<JSObject*> aGlobal)
-    :
-#ifdef MOZ_GECKO_PROFILER
-      mAutoProfilerLabel("nsJSUtils::ExecutionContext",
-                         /* dynamicStr */ nullptr,
-                         JS::ProfilingCategoryPair::JS),
-#endif
-      mCx(aCx),
-      mRealm(aCx, aGlobal),
-      mRetValue(aCx),
-      mScopeChain(aCx),
-      mScript(aCx),
-      mRv(NS_OK),
-      mSkip(false),
-      mCoerceToString(false),
-      mEncodeBytecode(false)
-#ifdef DEBUG
-      ,
-      mWantsReturnValue(false),
-      mExpectScopeChain(false),
-      mScriptUsed(false)
-#endif
-{
-  MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(CycleCollectedJSContext::Get() &&
-             CycleCollectedJSContext::Get()->MicroTaskLevel());
-  MOZ_ASSERT(mRetValue.isUndefined());
-
-  MOZ_ASSERT(JS_IsGlobalObject(aGlobal));
-  if (MOZ_UNLIKELY(!xpc::Scriptability::Get(aGlobal).Allowed())) {
-    mSkip = true;
-    mRv = NS_OK;
-  }
-}
-
-void nsJSUtils::ExecutionContext::SetScopeChain(
-    JS::HandleVector<JSObject*> aScopeChain) {
-  if (mSkip) {
-    return;
-  }
-
-#ifdef DEBUG
-  mExpectScopeChain = true;
-#endif
-  // Now make sure to wrap the scope chain into the right compartment.
-  if (!mScopeChain.reserve(aScopeChain.length())) {
-    mSkip = true;
-    mRv = NS_ERROR_OUT_OF_MEMORY;
-    return;
-  }
-
-  for (size_t i = 0; i < aScopeChain.length(); ++i) {
-    JS::ExposeObjectToActiveJS(aScopeChain[i]);
-    mScopeChain.infallibleAppend(aScopeChain[i]);
-    if (!JS_WrapObject(mCx, mScopeChain[i])) {
-      mSkip = true;
-      mRv = NS_ERROR_OUT_OF_MEMORY;
-      return;
-    }
-  }
-}
-
-nsresult nsJSUtils::ExecutionContext::JoinCompile(
-    JS::OffThreadToken** aOffThreadToken) {
-  if (mSkip) {
-    return mRv;
-  }
-
-  MOZ_ASSERT(!mWantsReturnValue);
-  MOZ_ASSERT(!mExpectScopeChain);
-  MOZ_ASSERT(!mScript);
-
-  if (mEncodeBytecode) {
-    mScript.set(JS::FinishOffThreadScriptAndStartIncrementalEncoding(
-        mCx, *aOffThreadToken));
-  } else {
-    mScript.set(JS::FinishOffThreadScript(mCx, *aOffThreadToken));
-  }
-  *aOffThreadToken = nullptr;  // Mark the token as having been finished.
-  if (!mScript) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-  return NS_OK;
-}
-
-template <typename Unit>
-nsresult nsJSUtils::ExecutionContext::InternalCompile(
-    JS::CompileOptions& aCompileOptions, JS::SourceText<Unit>& aSrcBuf) {
-  if (mSkip) {
-    return mRv;
-  }
-
-  MOZ_ASSERT(aSrcBuf.get());
-  MOZ_ASSERT(mRetValue.isUndefined());
-#ifdef DEBUG
-  mWantsReturnValue = !aCompileOptions.noScriptRval;
-#endif
-
-  MOZ_ASSERT(!mScript);
-
-  if (mScopeChain.length() != 0) {
-    aCompileOptions.setNonSyntacticScope(true);
-  }
-
-  if (mEncodeBytecode) {
-    mScript =
-        JS::CompileAndStartIncrementalEncoding(mCx, aCompileOptions, aSrcBuf);
-  } else {
-    mScript = JS::Compile(mCx, aCompileOptions, aSrcBuf);
-  }
-
-  if (!mScript) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-  return NS_OK;
-}
-
-nsresult nsJSUtils::ExecutionContext::Compile(
-    JS::CompileOptions& aCompileOptions, JS::SourceText<char16_t>& aSrcBuf) {
-  return InternalCompile(aCompileOptions, aSrcBuf);
-}
-
-nsresult nsJSUtils::ExecutionContext::Compile(
-    JS::CompileOptions& aCompileOptions, JS::SourceText<Utf8Unit>& aSrcBuf) {
-  return InternalCompile(aCompileOptions, aSrcBuf);
-}
-
-nsresult nsJSUtils::ExecutionContext::Compile(
-    JS::CompileOptions& aCompileOptions, const nsAString& aScript) {
-  if (mSkip) {
-    return mRv;
-  }
-
-  const nsPromiseFlatString& flatScript = PromiseFlatString(aScript);
-  JS::SourceText<char16_t> srcBuf;
-  if (!srcBuf.init(mCx, flatScript.get(), flatScript.Length(),
-                   JS::SourceOwnership::Borrowed)) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-  return Compile(aCompileOptions, srcBuf);
-}
-
-nsresult nsJSUtils::ExecutionContext::Decode(
-    JS::CompileOptions& aCompileOptions, mozilla::Vector<uint8_t>& aBytecodeBuf,
-    size_t aBytecodeIndex) {
-  if (mSkip) {
-    return mRv;
-  }
-
-  MOZ_ASSERT(!mWantsReturnValue);
-  JS::TranscodeResult tr = JS::DecodeScriptMaybeStencil(
-      mCx, aCompileOptions, aBytecodeBuf, &mScript, aBytecodeIndex);
-  // These errors are external parameters which should be handled before the
-  // decoding phase, and which are the only reasons why you might want to
-  // fallback on decoding failures.
-  MOZ_ASSERT(tr != JS::TranscodeResult_Failure_BadBuildId &&
-             tr != JS::TranscodeResult_Failure_WrongCompileOption);
-  if (tr != JS::TranscodeResult_Ok) {
-    mSkip = true;
-    mRv = NS_ERROR_DOM_JS_DECODING_ERROR;
-    return mRv;
-  }
-
-  return mRv;
-}
-
-nsresult nsJSUtils::ExecutionContext::JoinDecode(
-    JS::OffThreadToken** aOffThreadToken) {
-  if (mSkip) {
-    return mRv;
-  }
-
-  MOZ_ASSERT(!mWantsReturnValue);
-  MOZ_ASSERT(!mExpectScopeChain);
-  mScript.set(JS::FinishOffThreadScriptDecoder(mCx, *aOffThreadToken));
-  *aOffThreadToken = nullptr;  // Mark the token as having been finished.
-  if (!mScript) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-  return NS_OK;
-}
-
-nsresult nsJSUtils::ExecutionContext::JoinDecodeBinAST(
-    JS::OffThreadToken** aOffThreadToken) {
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsresult nsJSUtils::ExecutionContext::DecodeBinAST(
-    JS::CompileOptions& aCompileOptions, const uint8_t* aBuf, size_t aLength) {
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-JSScript* nsJSUtils::ExecutionContext::GetScript() {
-#ifdef DEBUG
-  MOZ_ASSERT(!mSkip);
-  MOZ_ASSERT(mScript);
-  mScriptUsed = true;
-#endif
-
-  return MaybeGetScript();
-}
-
-JSScript* nsJSUtils::ExecutionContext::MaybeGetScript() { return mScript; }
-
-nsresult nsJSUtils::ExecutionContext::ExecScript() {
-  if (mSkip) {
-    return mRv;
-  }
-
-  MOZ_ASSERT(mScript);
-
-  if (!JS_ExecuteScript(mCx, mScopeChain, mScript)) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-  return NS_OK;
-}
-
-static bool IsPromiseValue(JSContext* aCx, JS::Handle<JS::Value> aValue) {
-  if (!aValue.isObject()) {
-    return false;
-  }
-
-  // We only care about Promise here, so CheckedUnwrapStatic is fine.
-  JS::Rooted<JSObject*> obj(aCx, js::CheckedUnwrapStatic(&aValue.toObject()));
-  if (!obj) {
-    return false;
-  }
-
-  return JS::IsPromiseObject(obj);
-}
-
-nsresult nsJSUtils::ExecutionContext::ExecScript(
-    JS::MutableHandle<JS::Value> aRetValue) {
-  if (mSkip) {
-    aRetValue.setUndefined();
-    return mRv;
-  }
-
-  MOZ_ASSERT(mScript);
-  MOZ_ASSERT(mWantsReturnValue);
-
-  if (!JS_ExecuteScript(mCx, mScopeChain, mScript, aRetValue)) {
-    mSkip = true;
-    mRv = EvaluationExceptionToNSResult(mCx);
-    return mRv;
-  }
-
-#ifdef DEBUG
-  mWantsReturnValue = false;
-#endif
-  if (mCoerceToString && IsPromiseValue(mCx, aRetValue)) {
-    // We're a javascript: url and we should treat Promise return values as
-    // undefined.
-    //
-    // Once bug 1477821 is fixed this code might be able to go away, or will
-    // become enshrined in the spec, depending.
-    aRetValue.setUndefined();
-  }
-
-  if (mCoerceToString && !aRetValue.isUndefined()) {
-    JSString* str = JS::ToString(mCx, aRetValue);
-    if (!str) {
-      // ToString can be a function call, so an exception can be raised while
-      // executing the function.
-      mSkip = true;
-      return EvaluationExceptionToNSResult(mCx);
-    }
-    aRetValue.set(JS::StringValue(str));
-  }
-
-  return NS_OK;
-}
-
 template <typename Unit>
 static nsresult CompileJSModule(JSContext* aCx, JS::SourceText<Unit>& aSrcBuf,
                                 JS::Handle<JSObject*> aEvaluationGlobal,
@@ -463,7 +174,8 @@
 }
 
 nsresult nsJSUtils::ModuleEvaluate(JSContext* aCx,
-                                   JS::Handle<JSObject*> aModule) {
+                                   JS::Handle<JSObject*> aModule,
+                                   JS::MutableHandle<JS::Value> aResult) {
   AUTO_PROFILER_LABEL("nsJSUtils::ModuleEvaluate", JS);
 
   MOZ_ASSERT(aCx == nsContentUtils::GetCurrentJSContext());
@@ -473,7 +185,7 @@
 
   NS_ENSURE_TRUE(xpc::Scriptability::Get(aModule).Allowed(), NS_OK);
 
-  if (!JS::ModuleEvaluate(aCx, aModule)) {
+  if (!JS::ModuleEvaluate(aCx, aModule, aResult)) {
     return NS_ERROR_FAILURE;
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsJSUtils.h firefox-85.0+build1/dom/base/nsJSUtils.h
--- firefox-84.0.2+build1/dom/base/nsJSUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsJSUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -15,15 +15,9 @@
  */
 
 #include "mozilla/Assertions.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "mozilla/Utf8.h"  // mozilla::Utf8Unit
 
-#include "GeckoProfiler.h"
 #include "jsapi.h"
-#include "jsfriendapi.h"
 #include "js/Conversions.h"
-#include "js/SourceText.h"
-#include "js/StableStringChars.h"
 #include "js/String.h"  // JS::{,Lossy}CopyLinearStringChars, JS::CopyStringChars, JS::Get{,Linear}StringLength, JS::MaxStringLength, JS::StringHasLatin1Chars
 #include "nsString.h"
 #include "xpcpublic.h"
@@ -34,6 +28,8 @@
 class nsXBLPrototypeBinding;
 
 namespace mozilla {
+union Utf8Unit;
+
 namespace dom {
 class AutoJSAPI;
 class Element;
@@ -67,146 +63,6 @@
                                   const nsAString& aBody,
                                   JSObject** aFunctionObject);
 
-  // ExecutionContext is used to switch compartment.
-  class MOZ_STACK_CLASS ExecutionContext {
-#ifdef MOZ_GECKO_PROFILER
-    // Register stack annotations for the Gecko profiler.
-    mozilla::AutoProfilerLabel mAutoProfilerLabel;
-#endif
-
-    JSContext* mCx;
-
-    // Handles switching to our global's realm.
-    JSAutoRealm mRealm;
-
-    // Set to a valid handle if a return value is expected.
-    JS::Rooted<JS::Value> mRetValue;
-
-    // Scope chain in which the execution takes place.
-    JS::RootedVector<JSObject*> mScopeChain;
-
-    // The compiled script.
-    JS::Rooted<JSScript*> mScript;
-
-    // returned value forwarded when we have to interupt the execution eagerly
-    // with mSkip.
-    nsresult mRv;
-
-    // Used to skip upcoming phases in case of a failure.  In such case the
-    // result is carried by mRv.
-    bool mSkip;
-
-    // Should the result be serialized before being returned.
-    bool mCoerceToString;
-
-    // Encode the bytecode before it is being executed.
-    bool mEncodeBytecode;
-
-#ifdef DEBUG
-    // Should we set the return value.
-    bool mWantsReturnValue;
-
-    bool mExpectScopeChain;
-
-    bool mScriptUsed;
-#endif
-
-   private:
-    // Compile a script contained in a SourceText.
-    template <typename Unit>
-    nsresult InternalCompile(JS::CompileOptions& aCompileOptions,
-                             JS::SourceText<Unit>& aSrcBuf);
-
-   public:
-    // Enter compartment in which the code would be executed.  The JSContext
-    // must come from an AutoEntryScript.
-    ExecutionContext(JSContext* aCx, JS::Handle<JSObject*> aGlobal);
-
-    ExecutionContext(const ExecutionContext&) = delete;
-    ExecutionContext(ExecutionContext&&) = delete;
-
-    ~ExecutionContext() {
-      // This flag is reset when the returned value is extracted.
-      MOZ_ASSERT_IF(!mSkip, !mWantsReturnValue);
-
-      // If encoding was started we expect the script to have been
-      // used when ending the encoding.
-      MOZ_ASSERT_IF(mEncodeBytecode && mScript && mRv == NS_OK, mScriptUsed);
-    }
-
-    // The returned value would be converted to a string if the
-    // |aCoerceToString| is flag set.
-    ExecutionContext& SetCoerceToString(bool aCoerceToString) {
-      mCoerceToString = aCoerceToString;
-      return *this;
-    }
-
-    // When set, this flag records and encodes the bytecode as soon as it is
-    // being compiled, and before it is being executed. The bytecode can then be
-    // requested by using |JS::FinishIncrementalEncoding| with the mutable
-    // handle |aScript| argument of |CompileAndExec| or |JoinAndExec|.
-    ExecutionContext& SetEncodeBytecode(bool aEncodeBytecode) {
-      mEncodeBytecode = aEncodeBytecode;
-      return *this;
-    }
-
-    // Set the scope chain in which the code should be executed.
-    void SetScopeChain(JS::HandleVector<JSObject*> aScopeChain);
-
-    // After getting a notification that an off-thread compilation terminated,
-    // this function will take the result of the parser and move it to the main
-    // thread.
-    MOZ_MUST_USE nsresult JoinCompile(JS::OffThreadToken** aOffThreadToken);
-
-    // Compile a script contained in a SourceText.
-    nsresult Compile(JS::CompileOptions& aCompileOptions,
-                     JS::SourceText<char16_t>& aSrcBuf);
-    nsresult Compile(JS::CompileOptions& aCompileOptions,
-                     JS::SourceText<mozilla::Utf8Unit>& aSrcBuf);
-
-    // Compile a script contained in a string.
-    nsresult Compile(JS::CompileOptions& aCompileOptions,
-                     const nsAString& aScript);
-
-    // Decode a script contained in a buffer.
-    nsresult Decode(JS::CompileOptions& aCompileOptions,
-                    mozilla::Vector<uint8_t>& aBytecodeBuf,
-                    size_t aBytecodeIndex);
-
-    // After getting a notification that an off-thread decoding terminated, this
-    // function will get the result of the decoder and move it to the main
-    // thread.
-    nsresult JoinDecode(JS::OffThreadToken** aOffThreadToken);
-
-    nsresult JoinDecodeBinAST(JS::OffThreadToken** aOffThreadToken);
-
-    // Decode a BinAST encoded script contained in a buffer.
-    nsresult DecodeBinAST(JS::CompileOptions& aCompileOptions,
-                          const uint8_t* aBuf, size_t aLength);
-
-    // Get a successfully compiled script.
-    JSScript* GetScript();
-
-    // Get the compiled script if present, or nullptr.
-    JSScript* MaybeGetScript();
-
-    // Execute the compiled script and ignore the return value.
-    MOZ_MUST_USE nsresult ExecScript();
-
-    // Execute the compiled script a get the return value.
-    //
-    // Copy the returned value into the mutable handle argument. In case of a
-    // evaluation failure either during the execution or the conversion of the
-    // result to a string, the nsresult is be set to the corresponding result
-    // code and the mutable handle argument remains unchanged.
-    //
-    // The value returned in the mutable handle argument is part of the
-    // compartment given as argument to the ExecutionContext constructor. If the
-    // caller is in a different compartment, then the out-param value should be
-    // wrapped by calling |JS_WrapValue|.
-    MOZ_MUST_USE nsresult ExecScript(JS::MutableHandle<JS::Value> aRetValue);
-  };
-
   static bool BinASTEncodingEnabled() { return false; }
 
   static nsresult CompileModule(JSContext* aCx,
@@ -224,7 +80,21 @@
   static nsresult ModuleInstantiate(JSContext* aCx,
                                     JS::Handle<JSObject*> aModule);
 
-  static nsresult ModuleEvaluate(JSContext* aCx, JS::Handle<JSObject*> aModule);
+  /*
+   * Wrapper for JSAPI ModuleEvaluate function.
+   *
+   * @param JSContext aCx
+   *        The JSContext where this is executed.
+   * @param JS::Handle<JSObject*> aModule
+   *        The module to be evaluated.
+   * @param JS::Handle<Value*> aResult
+   *        If Top level await is enabled:
+   *          The evaluation promise returned from evaluating the module.
+   *        Otherwise:
+   *          Undefined
+   */
+  static nsresult ModuleEvaluate(JSContext* aCx, JS::Handle<JSObject*> aModule,
+                                 JS::MutableHandle<JS::Value> aResult);
 
   // Returns false if an exception got thrown on aCx.  Passing a null
   // aElement is allowed; that wil produce an empty aScopeChain.
diff -Nru firefox-84.0.2+build1/dom/base/nsNodeInfoManager.cpp firefox-85.0+build1/dom/base/nsNodeInfoManager.cpp
--- firefox-84.0.2+build1/dom/base/nsNodeInfoManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsNodeInfoManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/dom/NodeInfoInlines.h"
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsAtom.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsObjectLoadingContent.cpp firefox-85.0+build1/dom/base/nsObjectLoadingContent.cpp
--- firefox-84.0.2+build1/dom/base/nsObjectLoadingContent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsObjectLoadingContent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -26,6 +26,7 @@
 #include "nsIPermissionManager.h"
 #include "nsPluginHost.h"
 #include "nsPluginInstanceOwner.h"
+#include "nsIHttpChannel.h"
 #include "nsJSNPRuntime.h"
 #include "nsINestedURI.h"
 #include "nsScriptSecurityManager.h"
@@ -96,6 +97,7 @@
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_security.h"
 #include "nsChannelClassifier.h"
 #include "nsFocusManager.h"
@@ -1292,6 +1294,8 @@
           return NS_EVENT_STATE_VULNERABLE_UPDATABLE;
         case eFallbackVulnerableNoUpdate:
           return NS_EVENT_STATE_VULNERABLE_NO_UPDATE;
+        case eFallbackBlockAllPlugins:
+          return NS_EVENT_STATE_HANDLER_NOPLUGINS;
       }
   }
   MOZ_ASSERT_UNREACHABLE("unknown type?");
@@ -2081,11 +2085,11 @@
   // reason click-to-play instead. Items resolved as Image/Document
   // will not be checked for previews, as well as invalid plugins
   // (they will not have the mContentType set).
-  FallbackType clickToPlayReason;
-  if (!mActivated && IsPluginType(mType) && !ShouldPlay(clickToPlayReason)) {
-    LOG(("OBJLC [%p]: Marking plugin as click-to-play", this));
+  FallbackType noPlayReason;
+  if (!mActivated && IsPluginType(mType) && !ShouldPlay(noPlayReason)) {
+    LOG(("OBJLC [%p]: Marking plugin as do-not-play", this));
     mType = eType_Null;
-    fallbackType = clickToPlayReason;
+    fallbackType = noPlayReason;
   }
 
   if (!mActivated && IsPluginType(mType)) {
@@ -2233,8 +2237,9 @@
     NS_ASSERTION(!mFrameLoader && !mInstanceOwner,
                  "switched to type null but also loaded something");
 
-    // Don't fire error events if we're falling back to click-to-play; instead
-    // pretend like this is a really slow-loading plug-in instead.
+    // Don't fire error events if we're falling back to click-to-play or if we
+    // are blocking all plugins; pretend like this is a really slow-loading
+    // plug-in instead.
     if (fallbackType != eFallbackClickToPlay &&
         fallbackType != eFallbackClickToPlayQuiet) {
       MaybeFireErrorEvent();
@@ -2604,11 +2609,11 @@
     }
 
     // Create/destroy plugin problem UAWidget.
-    const EventStates pluginProblemState = NS_EVENT_STATE_HANDLER_BLOCKED |
-                                           NS_EVENT_STATE_HANDLER_CRASHED |
-                                           NS_EVENT_STATE_TYPE_CLICK_TO_PLAY |
-                                           NS_EVENT_STATE_VULNERABLE_UPDATABLE |
-                                           NS_EVENT_STATE_VULNERABLE_NO_UPDATE;
+    const EventStates pluginProblemState =
+        NS_EVENT_STATE_HANDLER_BLOCKED | NS_EVENT_STATE_HANDLER_CRASHED |
+        NS_EVENT_STATE_TYPE_CLICK_TO_PLAY |
+        NS_EVENT_STATE_VULNERABLE_UPDATABLE |
+        NS_EVENT_STATE_VULNERABLE_NO_UPDATE | NS_EVENT_STATE_HANDLER_NOPLUGINS;
 
     bool hadProblemState = !(aOldState & pluginProblemState).IsEmpty();
     bool hasProblemState = !(newState & pluginProblemState).IsEmpty();
@@ -2617,6 +2622,14 @@
       thisEl->NotifyUAWidgetTeardown();
     } else if (!hadProblemState && hasProblemState) {
       thisEl->AttachAndSetUAShadowRoot();
+      // When blocking all plugins, we do not want the element to have focus
+      // so relinquish focus if we are in that state.
+      if (PluginFallbackType() == eFallbackBlockAllPlugins) {
+        nsFocusManager* fm = nsFocusManager::GetFocusManager();
+        if (fm && fm->GetFocusedElement() == thisEl) {
+          fm->ClearFocus(doc->GetWindow());
+        }
+      }
     }
   } else if (aOldType != mType) {
     // If our state changed, then we already recreated frames
@@ -2769,7 +2782,8 @@
   // an event.  Fallback types >= eFallbackClickToPlay are plugin-replacement
   // types, see header.
   if (callerIsContentJS && !mScriptRequested && InActiveDocument(thisContent) &&
-      mType == eType_Null && mFallbackType >= eFallbackClickToPlay) {
+      mType == eType_Null && mFallbackType >= eFallbackClickToPlay &&
+      mFallbackType <= eFallbackClickToPlayQuiet) {
     nsCOMPtr<nsIRunnable> ev =
         new nsSimplePluginEvent(thisContent, u"PluginScripted"_ns);
     nsresult rv = NS_DispatchToCurrentThread(ev);
@@ -2875,7 +2889,8 @@
   nsTArray<nsINodeList*> childNodes;
   if (thisContent->IsHTMLElement(nsGkAtoms::object) &&
       (aType == eFallbackUnsupported || aType == eFallbackDisabled ||
-       aType == eFallbackBlocklisted || aType == eFallbackAlternate)) {
+       aType == eFallbackBlocklisted || aType == eFallbackAlternate ||
+       aType == eFallbackBlockAllPlugins)) {
     for (nsIContent* child = thisContent->GetFirstChild(); child;) {
       // When we advance to our next child, we don't want to traverse subtrees
       // under descendant <object> and <embed> elements; those will handle
@@ -3024,7 +3039,8 @@
   // If we're in a click-to-play state, reload.
   // Fallback types >= eFallbackClickToPlay are plugin-replacement types, see
   // header
-  if (mType == eType_Null && mFallbackType >= eFallbackClickToPlay) {
+  if (mType == eType_Null && mFallbackType >= eFallbackClickToPlay &&
+      mFallbackType <= eFallbackClickToPlayQuiet) {
     aRv = LoadObject(true, true);
   }
 }
@@ -3131,162 +3147,11 @@
 }
 
 bool nsObjectLoadingContent::ShouldPlay(FallbackType& aReason) {
-  nsresult rv;
-
-  if (BrowserTabsRemoteAutostart() && XRE_IsParentProcess()) {
-    // We no longer support loading plugins in the parent process.
-    aReason = eFallbackDisabled;
-    return false;
-  }
-
-  RefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
-
-  // Order of checks:
-  // * Assume a default of click-to-play
-  // * If globally disabled, per-site permissions cannot override.
-  // * If blocklisted, override the reason with the blocklist reason
-  // * Check if the flash blocking status for this page denies flash from
-  // loading.
-  // * Check per-site permissions and follow those if specified.
-  // * Honor per-plugin disabled permission
-  // * Blocklisted plugins are forced to CtP
-  // * Check per-plugin permission and follow that.
-
-  aReason = eFallbackClickToPlay;
-
-  uint32_t enabledState = nsIPluginTag::STATE_DISABLED;
-  pluginHost->GetStateForType(mContentType, nsPluginHost::eExcludeNone,
-                              &enabledState);
-  if (nsIPluginTag::STATE_DISABLED == enabledState) {
-    aReason = eFallbackDisabled;
-    return false;
-  }
-
-  // Before we check permissions, get the blocklist state of this plugin to set
-  // the fallback reason correctly. In the content process this will involve
-  // an ipc call to chrome.
-  uint32_t blocklistState = nsIBlocklistService::STATE_BLOCKED;
-  pluginHost->GetBlocklistStateForType(mContentType, nsPluginHost::eExcludeNone,
-                                       &blocklistState);
-  if (blocklistState == nsIBlocklistService::STATE_BLOCKED) {
-    // no override possible
-    aReason = eFallbackBlocklisted;
-    return false;
-  }
-
-  if (blocklistState ==
-      nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE) {
-    aReason = eFallbackVulnerableUpdatable;
-  } else if (blocklistState ==
-             nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
-    aReason = eFallbackVulnerableNoUpdate;
-  }
-
-  // Document and window lookup
-  nsCOMPtr<nsIContent> thisContent =
-      do_QueryInterface(static_cast<nsIObjectLoadingContent*>(this));
-  MOZ_ASSERT(thisContent);
-  Document* ownerDoc = thisContent->OwnerDoc();
-
-  nsCOMPtr<nsPIDOMWindowOuter> window = ownerDoc->GetWindow();
-  if (!window) {
-    return false;
-  }
-  nsCOMPtr<nsPIDOMWindowOuter> topWindow = window->GetInProcessTop();
-  NS_ENSURE_TRUE(topWindow, false);
-  nsCOMPtr<Document> topDoc = topWindow->GetDoc();
-  NS_ENSURE_TRUE(topDoc, false);
-
-  // Check the flash blocking status for this page (this applies to Flash only)
-  FlashClassification documentClassification = FlashClassification::Unknown;
-  if (IsFlashMIME(mContentType)) {
-    documentClassification = ownerDoc->DocumentFlashClassification();
-  }
-  if (documentClassification == FlashClassification::Denied) {
-    aReason = eFallbackDisabled;
-    return false;
-  }
-
-  // Check the permission manager for permission based on the principal of
-  // the toplevel content.
-  nsCOMPtr<nsIPermissionManager> permissionManager =
-      services::GetPermissionManager();
-  NS_ENSURE_TRUE(permissionManager, false);
-
-  // For now we always say that the system principal uses click-to-play since
-  // that maintains current behavior and we have tests that expect this.  What
-  // we really should do is disable plugins entirely in pages that use the
-  // system principal, i.e. in chrome pages. That way the click-to-play code
-  // here wouldn't matter at all. Bug 775301 is tracking this.
-  if (!topDoc->NodePrincipal()->IsSystemPrincipal()) {
-    nsAutoCString permissionString;
-    rv = pluginHost->GetPermissionStringForType(
-        mContentType, nsPluginHost::eExcludeNone, permissionString);
-    NS_ENSURE_SUCCESS(rv, false);
-    uint32_t permission;
-    rv = permissionManager->TestPermissionFromPrincipal(
-        topDoc->NodePrincipal(), permissionString, &permission);
-    NS_ENSURE_SUCCESS(rv, false);
-    switch (permission) {
-      case nsIPermissionManager::ALLOW_ACTION:
-        if (PreferFallback(false /* isPluginClickToPlay */)) {
-          aReason = eFallbackAlternate;
-          return false;
-        }
-
-        return true;
-      case nsIPermissionManager::DENY_ACTION:
-        aReason = eFallbackDisabled;
-        return false;
-      case PLUGIN_PERMISSION_PROMPT_ACTION_QUIET:
-        if (PreferFallback(true /* isPluginClickToPlay */)) {
-          aReason = eFallbackAlternate;
-        } else {
-          aReason = eFallbackClickToPlayQuiet;
-        }
+  MOZ_ASSERT(!BrowserTabsRemoteAutostart() || !XRE_IsParentProcess());
 
-        return false;
-      case nsIPermissionManager::PROMPT_ACTION:
-        if (PreferFallback(true /* isPluginClickToPlay */)) {
-          // False is already returned in this case, but
-          // it's important to correctly set aReason too.
-          aReason = eFallbackAlternate;
-        }
-
-        return false;
-      case nsIPermissionManager::UNKNOWN_ACTION:
-        break;
-      default:
-        MOZ_ASSERT(false);
-        return false;
-    }
-  }
-
-  // No site-specific permissions. Vulnerable plugins are automatically CtP
-  if (blocklistState ==
-          nsIBlocklistService::STATE_VULNERABLE_UPDATE_AVAILABLE ||
-      blocklistState == nsIBlocklistService::STATE_VULNERABLE_NO_UPDATE) {
-    return false;
-  }
-
-  if (PreferFallback(enabledState == nsIPluginTag::STATE_CLICKTOPLAY)) {
-    aReason = eFallbackAlternate;
-    return false;
-  }
-
-  // On the following switch we don't need to handle the case where
-  // documentClassification is FlashClassification::Denied because
-  // that's already handled above.
-  switch (enabledState) {
-    case nsIPluginTag::STATE_ENABLED:
-      return true;
-    case nsIPluginTag::STATE_CLICKTOPLAY:
-      if (documentClassification == FlashClassification::Allowed) {
-        return true;
-      }
-      return false;
-  }
-  MOZ_CRASH("Unexpected enabledState");
+  // We no longer support plugins.  Always fall back to our placeholder.
+  aReason = eFallbackBlockAllPlugins;
+  return false;
 }
 
 bool nsObjectLoadingContent::FavorFallbackMode(bool aIsPluginClickToPlay) {
@@ -3680,6 +3545,25 @@
   return false;
 }
 
+void nsObjectLoadingContent::SubdocumentIntrinsicSizeOrRatioChanged(
+    const Maybe<IntrinsicSize>& aIntrinsicSize,
+    const Maybe<AspectRatio>& aIntrinsicRatio) {
+  if (aIntrinsicSize == mSubdocumentIntrinsicSize &&
+      aIntrinsicRatio == mSubdocumentIntrinsicRatio) {
+    return;
+  }
+
+  mSubdocumentIntrinsicSize = aIntrinsicSize;
+  mSubdocumentIntrinsicRatio = aIntrinsicRatio;
+
+  nsCOMPtr<nsIContent> thisContent =
+      do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
+
+  if (nsSubDocumentFrame* sdf = do_QueryFrame(thisContent->GetPrimaryFrame())) {
+    sdf->SubdocumentIntrinsicSizeOrRatioChanged();
+  }
+}
+
 // SetupProtoChainRunner implementation
 nsObjectLoadingContent::SetupProtoChainRunner::SetupProtoChainRunner(
     nsObjectLoadingContent* aContent)
diff -Nru firefox-84.0.2+build1/dom/base/nsObjectLoadingContent.h firefox-85.0+build1/dom/base/nsObjectLoadingContent.h
--- firefox-84.0.2+build1/dom/base/nsObjectLoadingContent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsObjectLoadingContent.h	2021-01-18 19:58:08.000000000 +0000
@@ -14,6 +14,7 @@
 #define NSOBJECTLOADINGCONTENT_H_
 
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsIFrame.h"  // for WeakFrame only
 #include "nsImageLoadingContent.h"
@@ -104,6 +105,8 @@
     // The plugin is click-to-play, but the user won't see overlays
     eFallbackClickToPlayQuiet =
         nsIObjectLoadingContent::PLUGIN_CLICK_TO_PLAY_QUIET,
+    // Plugins are no longer supported.  Content is just a transparent rect.
+    eFallbackBlockAllPlugins = nsIObjectLoadingContent::PLUGIN_BLOCK_ALL,
   };
 
   nsObjectLoadingContent();
@@ -233,6 +236,20 @@
                               mozilla::dom::WindowProxyHolder>& aOpenerWindow,
                           mozilla::ErrorResult& aRv);
 
+  const mozilla::Maybe<mozilla::IntrinsicSize>& GetSubdocumentIntrinsicSize()
+      const {
+    return mSubdocumentIntrinsicSize;
+  }
+
+  const mozilla::Maybe<mozilla::AspectRatio>& GetSubdocumentIntrinsicRatio()
+      const {
+    return mSubdocumentIntrinsicRatio;
+  }
+
+  void SubdocumentIntrinsicSizeOrRatioChanged(
+      const mozilla::Maybe<mozilla::IntrinsicSize>& aIntrinsicSize,
+      const mozilla::Maybe<mozilla::AspectRatio>& aIntrinsicRatio);
+
  protected:
   /**
    * Begins loading the object when called
@@ -691,6 +708,16 @@
   RefPtr<nsPluginInstanceOwner> mInstanceOwner;
   nsTArray<mozilla::dom::MozPluginParameter> mCachedAttributes;
   nsTArray<mozilla::dom::MozPluginParameter> mCachedParameters;
+
+  // The intrinsic size and aspect ratio from a child SVG document that
+  // we should use.  These are only set when we are an <object> or <embed>
+  // and the inner document is SVG.
+  //
+  // We store these here rather than on nsSubDocumentFrame since we are
+  // sometimes notified of our child's intrinsics before we've constructed
+  // our own frame.
+  mozilla::Maybe<mozilla::IntrinsicSize> mSubdocumentIntrinsicSize;
+  mozilla::Maybe<mozilla::AspectRatio> mSubdocumentIntrinsicRatio;
 };
 
 #endif
diff -Nru firefox-84.0.2+build1/dom/base/nsPIDOMWindow.h firefox-85.0+build1/dom/base/nsPIDOMWindow.h
--- firefox-84.0.2+build1/dom/base/nsPIDOMWindow.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsPIDOMWindow.h	2021-01-18 19:58:08.000000000 +0000
@@ -61,6 +61,7 @@
 class Document;
 class Element;
 class Location;
+class MediaKeys;
 class Navigator;
 class Performance;
 class Selection;
@@ -168,6 +169,21 @@
 
   void SetAudioCapture(bool aCapture);
 
+  /**
+   * Associate this inner window with a MediaKeys instance.
+   */
+  void AddMediaKeysInstance(mozilla::dom::MediaKeys* aMediaKeysInstance);
+
+  /**
+   * Remove an association between this inner window and a MediaKeys instance.
+   */
+  void RemoveMediaKeysInstance(mozilla::dom::MediaKeys* aMediaKeysInstance);
+
+  /**
+   * Return if any MediaKeys instances are associated with this window.
+   */
+  bool HasActiveMediaKeysInstance();
+
   mozilla::dom::Performance* GetPerformance();
 
   void QueuePerformanceNavigationTiming();
@@ -641,6 +657,11 @@
   // The AudioContexts created for the current document, if any.
   nsTArray<mozilla::dom::AudioContext*> mAudioContexts;  // Weak
 
+  // Instances of MediaKeys created in this inner window. Storing these allows
+  // us to shutdown MediaKeys when an inner windows is destroyed. We can also
+  // use the presence of MediaKeys to assess if a window has EME activity.
+  nsTArray<mozilla::dom::MediaKeys*> mMediaKeysInstances;  // Weak
+
   RefPtr<mozilla::dom::BrowsingContext> mBrowsingContext;
 
   // A unique (as long as our 64-bit counter doesn't roll over) id for
@@ -736,8 +757,6 @@
   mozilla::dom::Element* GetFrameElementInternal() const;
   void SetFrameElementInternal(mozilla::dom::Element* aFrameElement);
 
-  bool IsActive() { return mIsActive; }
-
   void SetDesktopModeViewport(bool aDesktopModeViewport) {
     mDesktopModeViewport = aDesktopModeViewport;
   }
@@ -766,8 +785,6 @@
 
   virtual nsPIDOMWindowOuter* GetPrivateRoot() = 0;
 
-  virtual void ActivateOrDeactivate(bool aActivate) = 0;
-
   /**
    * |top| gets the root of the window hierarchy.
    *
@@ -794,10 +811,6 @@
    */
   virtual nsPIDOMWindowOuter* GetInProcessScriptableParentOrNull() = 0;
 
-  virtual bool IsTopLevelWindowActive() = 0;
-
-  virtual void SetActive(bool aActive) { mIsActive = aActive; }
-
   virtual void SetIsBackground(bool aIsBackground) = 0;
 
   mozilla::dom::EventTarget* GetChromeEventHandler() const {
@@ -1091,9 +1104,6 @@
 
   uint32_t mModalStateDepth;
 
-  // Tracks activation state that's used for :-moz-window-inactive.
-  bool mIsActive;
-
   // Tracks whether our docshell is active.  If it is, mIsBackground
   // is false.  Too bad we have so many different concepts of
   // "active".
diff -Nru firefox-84.0.2+build1/dom/base/nsPIDOMWindowInlines.h firefox-85.0+build1/dom/base/nsPIDOMWindowInlines.h
--- firefox-84.0.2+build1/dom/base/nsPIDOMWindowInlines.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsPIDOMWindowInlines.h	2021-01-18 19:58:08.000000000 +0000
@@ -4,7 +4,10 @@
  * 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/. */
 
-bool nsPIDOMWindowOuter::IsLoading() const {
+#ifndef dom_base_nsPIDOMWindowInlines_h___
+#define dom_base_nsPIDOMWindowInlines_h___
+
+inline bool nsPIDOMWindowOuter::IsLoading() const {
   auto* win = GetCurrentInnerWindow();
 
   if (!win) {
@@ -16,7 +19,7 @@
   return win->IsLoading();
 }
 
-bool nsPIDOMWindowInner::IsLoading() const {
+inline bool nsPIDOMWindowInner::IsLoading() const {
   if (!mOuterWindow) {
     NS_ERROR("IsLoading() called on orphan inner window!");
 
@@ -26,7 +29,7 @@
   return !mIsDocumentLoaded;
 }
 
-bool nsPIDOMWindowOuter::IsHandlingResizeEvent() const {
+inline bool nsPIDOMWindowOuter::IsHandlingResizeEvent() const {
   auto* win = GetCurrentInnerWindow();
 
   if (!win) {
@@ -38,7 +41,7 @@
   return win->IsHandlingResizeEvent();
 }
 
-bool nsPIDOMWindowInner::IsHandlingResizeEvent() const {
+inline bool nsPIDOMWindowInner::IsHandlingResizeEvent() const {
   if (!mOuterWindow) {
     NS_ERROR("IsHandlingResizeEvent() called on orphan inner window!");
 
@@ -48,30 +51,38 @@
   return mIsHandlingResizeEvent;
 }
 
-bool nsPIDOMWindowInner::HasActiveDocument() { return IsCurrentInnerWindow(); }
+inline bool nsPIDOMWindowInner::HasActiveDocument() {
+  return IsCurrentInnerWindow();
+}
 
-bool nsPIDOMWindowInner::IsTopInnerWindow() const {
+inline bool nsPIDOMWindowInner::IsTopInnerWindow() const {
   return mTopInnerWindow == this;
 }
 
-nsIDocShell* nsPIDOMWindowOuter::GetDocShell() const { return mDocShell; }
+inline nsIDocShell* nsPIDOMWindowOuter::GetDocShell() const {
+  return mDocShell;
+}
 
-nsIDocShell* nsPIDOMWindowInner::GetDocShell() const {
+inline nsIDocShell* nsPIDOMWindowInner::GetDocShell() const {
   return mOuterWindow ? mOuterWindow->GetDocShell() : nullptr;
 }
 
-mozilla::dom::BrowsingContext* nsPIDOMWindowOuter::GetBrowsingContext() const {
+inline mozilla::dom::BrowsingContext* nsPIDOMWindowOuter::GetBrowsingContext()
+    const {
   return mBrowsingContext;
 }
 
-mozilla::dom::BrowsingContext* nsPIDOMWindowInner::GetBrowsingContext() const {
+inline mozilla::dom::BrowsingContext* nsPIDOMWindowInner::GetBrowsingContext()
+    const {
   return mBrowsingContext;
 }
 
-mozilla::dom::Element* nsPIDOMWindowOuter::GetFocusedElement() const {
+inline mozilla::dom::Element* nsPIDOMWindowOuter::GetFocusedElement() const {
   return mInnerWindow ? mInnerWindow->GetFocusedElement() : nullptr;
 }
 
-mozilla::dom::Element* nsPIDOMWindowInner::GetFocusedElement() const {
+inline mozilla::dom::Element* nsPIDOMWindowInner::GetFocusedElement() const {
   return mFocusedElement;
 }
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/base/nsPlainTextSerializer.cpp firefox-85.0+build1/dom/base/nsPlainTextSerializer.cpp
--- firefox-84.0.2+build1/dom/base/nsPlainTextSerializer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsPlainTextSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1906 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert a DOM into plaintext in a nice way
- * (eg for copy/paste as plaintext).
- */
-
-#include "nsPlainTextSerializer.h"
-
-#include <limits>
-
-#include "nsPrintfCString.h"
-#include "nsDebug.h"
-#include "nsGkAtoms.h"
-#include "nsNameSpaceManager.h"
-#include "nsTextFragment.h"
-#include "nsContentUtils.h"
-#include "nsReadableUtils.h"
-#include "nsUnicharUtils.h"
-#include "nsCRT.h"
-#include "mozilla/EditorUtils.h"
-#include "mozilla/dom/CharacterData.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/HTMLBRElement.h"
-#include "mozilla/dom/Text.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/StaticPrefs_converter.h"
-#include "mozilla/BinarySearch.h"
-#include "nsComputedDOMStyle.h"
-
-namespace mozilla {
-class Encoding;
-}
-
-using namespace mozilla;
-using namespace mozilla::dom;
-
-#define PREF_STRUCTS "converter.html2txt.structs"
-#define PREF_HEADER_STRATEGY "converter.html2txt.header_strategy"
-
-static const int32_t kTabSize = 4;
-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>
-static const char16_t kNBSP = 160;
-static const char16_t kSPACE = ' ';
-
-constexpr int32_t kNoFlags = 0;
-
-static int32_t HeaderLevel(const nsAtom* aTag);
-static int32_t GetUnicharWidth(char16_t ucs);
-static int32_t GetUnicharStringWidth(const nsString& aString);
-
-// Someday may want to make this non-const:
-static const uint32_t TagStackSize = 500;
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPlainTextSerializer)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPlainTextSerializer)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsPlainTextSerializer)
-  NS_INTERFACE_MAP_ENTRY(nsIContentSerializer)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-NS_IMPL_CYCLE_COLLECTION(nsPlainTextSerializer, mElement)
-
-nsresult NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer) {
-  RefPtr<nsPlainTextSerializer> it = new nsPlainTextSerializer();
-  it.forget(aSerializer);
-  return NS_OK;
-}
-
-// @param aFlags As defined in nsIDocumentEncoder.idl.
-static void DetermineLineBreak(const int32_t aFlags, nsAString& aLineBreak) {
-  // Set the line break character:
-  if ((aFlags & nsIDocumentEncoder::OutputCRLineBreak) &&
-      (aFlags & nsIDocumentEncoder::OutputLFLineBreak)) {
-    // Windows
-    aLineBreak.AssignLiteral(u"\r\n");
-  } else if (aFlags & nsIDocumentEncoder::OutputCRLineBreak) {
-    // Mac
-    aLineBreak.AssignLiteral(u"\r");
-  } else if (aFlags & nsIDocumentEncoder::OutputLFLineBreak) {
-    // Unix/DOM
-    aLineBreak.AssignLiteral(u"\n");
-  } else {
-    // Platform/default
-    aLineBreak.AssignLiteral(NS_ULINEBREAK);
-  }
-}
-
-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.
-    mContent.ReplaceChar(kNBSP, kSPACE);
-  }
-}
-
-void nsPlainTextSerializer::CurrentLine::ResetContentAndIndentationHeader() {
-  mContent.Truncate();
-  mIndentation.mHeader.Truncate();
-}
-
-int32_t nsPlainTextSerializer::CurrentLine::FindWrapIndexForContent(
-    const uint32_t aWrapColumn, const uint32_t aContentWidth,
-    mozilla::intl::LineBreaker* aLineBreaker) const {
-  MOZ_ASSERT(aContentWidth < std::numeric_limits<int32_t>::max());
-  MOZ_ASSERT(static_cast<int32_t>(aContentWidth) ==
-             GetUnicharStringWidth(mContent));
-
-  const uint32_t prefixwidth = DeterminePrefixWidth();
-  int32_t goodSpace = mContent.Length();
-
-  if (aLineBreaker) {
-    // We go from the end removing one letter at a time until
-    // we have a reasonable width
-    uint32_t width = aContentWidth;
-    while (goodSpace > 0 && (width + prefixwidth > aWrapColumn)) {
-      goodSpace--;
-      width -= GetUnicharWidth(mContent[goodSpace]);
-    }
-
-    goodSpace++;
-
-    goodSpace =
-        aLineBreaker->Prev(mContent.get(), mContent.Length(), goodSpace);
-    if (goodSpace != NS_LINEBREAKER_NEED_MORE_TEXT &&
-        nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace - 1))) {
-      --goodSpace;  // adjust the position since line breaker returns a
-                    // position next to space
-    }
-  } else {
-    // In this case we don't want strings, especially CJK-ones, to be split.
-    // See
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=333064 for more
-    // information.
-
-    if (mContent.IsEmpty() || aWrapColumn < prefixwidth) {
-      goodSpace = NS_LINEBREAKER_NEED_MORE_TEXT;
-    } else {
-      goodSpace = std::min(aWrapColumn - prefixwidth, mContent.Length() - 1);
-      while (goodSpace >= 0 &&
-             !nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace))) {
-        goodSpace--;
-      }
-    }
-  }
-
-  if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT) {
-    // If we didn't find a good place to break, accept long line and
-    // try to find another place to break
-    goodSpace =
-        (prefixwidth > aWrapColumn + 1) ? 1 : aWrapColumn - prefixwidth + 1;
-    if (aLineBreaker) {
-      if ((uint32_t)goodSpace < mContent.Length())
-        goodSpace =
-            aLineBreaker->Next(mContent.get(), mContent.Length(), goodSpace);
-      if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT)
-        goodSpace = mContent.Length();
-    } else {
-      // In this case we don't want strings, especially CJK-ones, to be
-      // split. See
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=333064 for more
-      // information.
-      goodSpace = (prefixwidth > aWrapColumn) ? 1 : aWrapColumn - prefixwidth;
-      const int32_t contentLength = mContent.Length();
-      while (goodSpace < contentLength &&
-             !nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace))) {
-        goodSpace++;
-      }
-    }
-  }
-  return goodSpace;
-}
-
-nsPlainTextSerializer::OutputManager::OutputManager(const int32_t aFlags,
-                                                    nsAString& aOutput)
-    : mFlags{aFlags}, mOutput{aOutput}, mAtFirstColumn{true} {
-  MOZ_ASSERT(aOutput.IsEmpty());
-
-  DetermineLineBreak(mFlags, mLineBreak);
-}
-
-void nsPlainTextSerializer::OutputManager::Append(
-    const CurrentLine& aCurrentLine,
-    const StripTrailingWhitespaces aStripTrailingWhitespaces) {
-  if (IsAtFirstColumn()) {
-    nsAutoString quotesAndIndent;
-    aCurrentLine.CreateQuotesAndIndent(quotesAndIndent);
-
-    if ((aStripTrailingWhitespaces == StripTrailingWhitespaces::kMaybe)) {
-      const bool stripTrailingSpaces = aCurrentLine.mContent.IsEmpty();
-      if (stripTrailingSpaces) {
-        quotesAndIndent.Trim(" ", false, true, false);
-      }
-    }
-
-    Append(quotesAndIndent);
-  }
-
-  Append(aCurrentLine.mContent);
-}
-
-void nsPlainTextSerializer::OutputManager::Append(const nsAString& aString) {
-  if (!aString.IsEmpty()) {
-    mOutput.Append(aString);
-    mAtFirstColumn = false;
-  }
-}
-
-void nsPlainTextSerializer::OutputManager::AppendLineBreak() {
-  mOutput.Append(mLineBreak);
-  mAtFirstColumn = true;
-}
-
-uint32_t nsPlainTextSerializer::OutputManager::GetOutputLength() const {
-  return mOutput.Length();
-}
-
-nsPlainTextSerializer::nsPlainTextSerializer()
-    : mFloatingLines(-1),
-      mLineBreakDue(false),
-      kSpace(u" "_ns)  // Init of "constant"
-{
-  mHeadLevel = 0;
-  mHasWrittenCiteBlockquote = false;
-  mSpanLevel = 0;
-  for (int32_t i = 0; i <= 6; i++) {
-    mHeaderCounter[i] = 0;
-  }
-
-  // Flow
-  mEmptyLines = 1;  // The start of the document is an "empty line" in itself,
-  mInWhitespace = false;
-  mPreFormattedMail = false;
-
-  mPreformattedBlockBoundary = false;
-
-  // initialize the tag stack to zero:
-  // The stack only ever contains pointers to static atoms, so they don't
-  // need refcounting.
-  mTagStack = new const nsAtom*[TagStackSize];
-  mTagStackIndex = 0;
-  mIgnoreAboveIndex = (uint32_t)kNotFound;
-
-  mULCount = 0;
-
-  mIgnoredChildNodeLevel = 0;
-}
-
-nsPlainTextSerializer::~nsPlainTextSerializer() {
-  delete[] mTagStack;
-  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,
-                                           const uint32_t aWrapColumn) {
-  mFlags = aFlags;
-
-  if (mFlags & nsIDocumentEncoder::OutputFormatted) {
-    // Get some prefs that controls how we do formatted output
-    mStructs = Preferences::GetBool(PREF_STRUCTS, mStructs);
-
-    int32_t headerStrategy =
-        Preferences::GetInt(PREF_HEADER_STRATEGY, kDefaultHeaderStrategy);
-    mHeaderStrategy = Convert(headerStrategy);
-  }
-
-  mWithRubyAnnotation = StaticPrefs::converter_html2txt_always_include_ruby() ||
-                        (mFlags & nsIDocumentEncoder::OutputRubyAnnotation);
-
-  // XXX We should let the caller decide whether to do this or not
-  mFlags &= ~nsIDocumentEncoder::OutputNoFramesContent;
-
-  mWrapColumn = aWrapColumn;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::Init(const uint32_t aFlags, uint32_t aWrapColumn,
-                            const Encoding* aEncoding, bool aIsCopying,
-                            bool aIsWholeDocument,
-                            bool* aNeedsPreformatScanning, nsAString& aOutput) {
-#ifdef DEBUG
-  // Check if the major control flags are set correctly.
-  if (aFlags & nsIDocumentEncoder::OutputFormatFlowed) {
-    NS_ASSERTION(aFlags & nsIDocumentEncoder::OutputFormatted,
-                 "If you want format=flowed, you must combine it with "
-                 "nsIDocumentEncoder::OutputFormatted");
-  }
-
-  if (aFlags & nsIDocumentEncoder::OutputFormatted) {
-    NS_ASSERTION(
-        !(aFlags & nsIDocumentEncoder::OutputPreformatted),
-        "Can't do formatted and preformatted output at the same time!");
-  }
-#endif
-  MOZ_ASSERT(!(aFlags & nsIDocumentEncoder::OutputFormatDelSp) ||
-             (aFlags & nsIDocumentEncoder::OutputFormatFlowed));
-
-  *aNeedsPreformatScanning = true;
-  mSettings.Init(aFlags, aWrapColumn);
-  mOutputManager.emplace(mSettings.GetFlags(), aOutput);
-
-  if (mSettings.MayWrap() && mSettings.MayBreakLines()) {
-    mLineBreaker = nsContentUtils::LineBreaker();
-  }
-
-  mLineBreakDue = false;
-  mFloatingLines = -1;
-
-  mPreformattedBlockBoundary = false;
-
-  MOZ_ASSERT(mOLStack.IsEmpty());
-
-  return NS_OK;
-}
-
-bool nsPlainTextSerializer::GetLastBool(const nsTArray<bool>& aStack) {
-  uint32_t size = aStack.Length();
-  if (size == 0) {
-    return false;
-  }
-  return aStack.ElementAt(size - 1);
-}
-
-void nsPlainTextSerializer::SetLastBool(nsTArray<bool>& aStack, bool aValue) {
-  uint32_t size = aStack.Length();
-  if (size > 0) {
-    aStack.ElementAt(size - 1) = aValue;
-  } else {
-    NS_ERROR("There is no \"Last\" value");
-  }
-}
-
-void nsPlainTextSerializer::PushBool(nsTArray<bool>& aStack, bool aValue) {
-  aStack.AppendElement(bool(aValue));
-}
-
-bool nsPlainTextSerializer::PopBool(nsTArray<bool>& aStack) {
-  return aStack.Length() ? aStack.PopLastElement() : false;
-}
-
-bool nsPlainTextSerializer::IsIgnorableRubyAnnotation(
-    const nsAtom* aTag) const {
-  if (mSettings.GetWithRubyAnnotation()) {
-    return false;
-  }
-
-  return aTag == nsGkAtoms::rp || aTag == nsGkAtoms::rt ||
-         aTag == nsGkAtoms::rtc;
-}
-
-// Return true if aElement has 'display:none' or if we just don't know.
-static bool IsDisplayNone(Element* aElement) {
-  RefPtr<ComputedStyle> computedStyle =
-      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
-  return !computedStyle ||
-         computedStyle->StyleDisplay()->mDisplay == StyleDisplay::None;
-}
-
-static bool IsIgnorableScriptOrStyle(Element* aElement) {
-  return aElement->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style) &&
-         IsDisplayNone(aElement);
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
-                                  int32_t aEndOffset) {
-  if (mIgnoreAboveIndex != (uint32_t)kNotFound) {
-    return NS_OK;
-  }
-
-  NS_ASSERTION(aStartOffset >= 0, "Negative start offset for text fragment!");
-  if (aStartOffset < 0) return NS_ERROR_INVALID_ARG;
-
-  NS_ENSURE_ARG(aText);
-
-  nsresult rv = NS_OK;
-
-  nsIContent* content = aText;
-  const nsTextFragment* frag;
-  if (!content || !(frag = content->GetText())) {
-    return NS_ERROR_FAILURE;
-  }
-
-  int32_t fragLength = frag->GetLength();
-  int32_t endoffset =
-      (aEndOffset == -1) ? fragLength : std::min(aEndOffset, fragLength);
-  NS_ASSERTION(aStartOffset <= endoffset,
-               "A start offset is beyond the end of the text fragment!");
-
-  int32_t length = endoffset - aStartOffset;
-  if (length <= 0) {
-    return NS_OK;
-  }
-
-  nsAutoString textstr;
-  if (frag->Is2b()) {
-    textstr.Assign(frag->Get2b() + aStartOffset, length);
-  } else {
-    // AssignASCII is for 7-bit character only, so don't use it
-    const char* data = frag->Get1b();
-    CopyASCIItoUTF16(Substring(data + aStartOffset, data + endoffset), textstr);
-  }
-
-  // Mask the text if the text node is in a password field.
-  if (content->HasFlag(NS_MAYBE_MASKED)) {
-    EditorUtils::MaskString(textstr, content->AsText(), 0, aStartOffset);
-  }
-
-  // We have to split the string across newlines
-  // to match parser behavior
-  int32_t start = 0;
-  int32_t offset = textstr.FindCharInSet("\n\r");
-  while (offset != kNotFound) {
-    if (offset > start) {
-      // Pass in the line
-      DoAddText(false, Substring(textstr, start, offset - start));
-    }
-
-    // Pass in a newline
-    DoAddText();
-
-    start = offset + 1;
-    offset = textstr.FindCharInSet("\n\r", start);
-  }
-
-  // Consume the last bit of the string if there's any left
-  if (start < length) {
-    if (start) {
-      DoAddText(false, Substring(textstr, start, length - start));
-    } else {
-      DoAddText(false, textstr);
-    }
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::AppendCDATASection(nsIContent* aCDATASection,
-                                          int32_t aStartOffset,
-                                          int32_t aEndOffset) {
-  return AppendText(aCDATASection, aStartOffset, aEndOffset);
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::ScanElementForPreformat(Element* aElement) {
-  mPreformatStack.push(IsElementPreformatted(aElement));
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::ForgetElementForPreformat(Element* aElement) {
-  MOZ_RELEASE_ASSERT(!mPreformatStack.empty(),
-                     "Tried to pop without previous push.");
-  mPreformatStack.pop();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::AppendElementStart(Element* aElement,
-                                          Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-
-  mElement = aElement;
-
-  nsresult rv;
-  nsAtom* id = GetIdForContent(mElement);
-
-  bool isContainer = !FragmentOrElement::IsHTMLVoid(id);
-
-  if (isContainer) {
-    rv = DoOpenContainer(id);
-  } else {
-    rv = DoAddLeaf(id);
-  }
-
-  mElement = nullptr;
-
-  if (id == nsGkAtoms::head) {
-    ++mHeadLevel;
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::AppendElementEnd(Element* aElement,
-                                        Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-
-  mElement = aElement;
-
-  nsresult rv;
-  nsAtom* id = GetIdForContent(mElement);
-
-  bool isContainer = !FragmentOrElement::IsHTMLVoid(id);
-
-  rv = NS_OK;
-  if (isContainer) {
-    rv = DoCloseContainer(id);
-  }
-
-  mElement = nullptr;
-
-  if (id == nsGkAtoms::head) {
-    NS_ASSERTION(mHeadLevel != 0, "mHeadLevel being decremented below 0");
-    --mHeadLevel;
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::FlushAndFinish() {
-  MOZ_ASSERT(mOutputManager);
-
-  mOutputManager->Flush(mCurrentLine);
-  return Finish();
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::Finish() {
-  mOutputManager.reset();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::GetOutputLength(uint32_t& aLength) const {
-  MOZ_ASSERT(mOutputManager);
-
-  aLength = mOutputManager->GetOutputLength();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsPlainTextSerializer::AppendDocumentStart(Document* aDocument) {
-  return NS_OK;
-}
-
-constexpr int32_t kOlStackDummyValue = 0;
-
-nsresult nsPlainTextSerializer::DoOpenContainer(const nsAtom* aTag) {
-  if (IsIgnorableRubyAnnotation(aTag)) {
-    // Ignorable ruby annotation shouldn't be replaced by a placeholder
-    // character, neither any of its descendants.
-    mIgnoredChildNodeLevel++;
-    return NS_OK;
-  }
-  if (IsIgnorableScriptOrStyle(mElement)) {
-    mIgnoredChildNodeLevel++;
-    return NS_OK;
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputForPlainTextClipboardCopy)) {
-    if (mPreformattedBlockBoundary && DoOutput()) {
-      // Should always end a line, but get no more whitespace
-      if (mFloatingLines < 0) mFloatingLines = 0;
-      mLineBreakDue = true;
-    }
-    mPreformattedBlockBoundary = false;
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputRaw)) {
-    // Raw means raw.  Don't even think about doing anything fancy
-    // here like indenting, adding line breaks or any other
-    // characters such as list item bullets, quote characters
-    // around <q>, etc.
-
-    return NS_OK;
-  }
-
-  if (mTagStackIndex < TagStackSize) {
-    mTagStack[mTagStackIndex++] = aTag;
-  }
-
-  if (mIgnoreAboveIndex != (uint32_t)kNotFound) {
-    return NS_OK;
-  }
-
-  // Reset this so that <blockquote type=cite> doesn't affect the whitespace
-  // above random <pre>s below it.
-  mHasWrittenCiteBlockquote =
-      mHasWrittenCiteBlockquote && aTag == nsGkAtoms::pre;
-
-  bool isInCiteBlockquote = false;
-
-  // XXX special-case <blockquote type=cite> so that we don't add additional
-  // newlines before the text.
-  if (aTag == nsGkAtoms::blockquote) {
-    nsAutoString value;
-    nsresult rv = GetAttributeValue(nsGkAtoms::type, value);
-    isInCiteBlockquote = NS_SUCCEEDED(rv) && value.EqualsIgnoreCase("cite");
-  }
-
-  if (mLineBreakDue && !isInCiteBlockquote) EnsureVerticalSpace(mFloatingLines);
-
-  // Check if this tag's content that should not be output
-  if ((aTag == nsGkAtoms::noscript &&
-       !mSettings.HasFlag(nsIDocumentEncoder::OutputNoScriptContent)) ||
-      ((aTag == nsGkAtoms::iframe || aTag == nsGkAtoms::noframes) &&
-       !mSettings.HasFlag(nsIDocumentEncoder::OutputNoFramesContent))) {
-    // Ignore everything that follows the current tag in
-    // question until a matching end tag is encountered.
-    mIgnoreAboveIndex = mTagStackIndex - 1;
-    return NS_OK;
-  }
-
-  if (aTag == nsGkAtoms::body) {
-    // Try to figure out here whether we have a
-    // preformatted style attribute set by Thunderbird.
-    //
-    // Trigger on the presence of a "pre-wrap" in the
-    // style attribute. That's a very simplistic way to do
-    // it, but better than nothing.
-    nsAutoString style;
-    int32_t whitespace;
-    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::style, style)) &&
-        (kNotFound != (whitespace = style.Find("white-space:")))) {
-      if (kNotFound != style.Find("pre-wrap", true, whitespace)) {
-#ifdef DEBUG_preformatted
-        printf("Set mPreFormattedMail based on style pre-wrap\n");
-#endif
-        mPreFormattedMail = true;
-      } else if (kNotFound != style.Find("pre", true, whitespace)) {
-#ifdef DEBUG_preformatted
-        printf("Set mPreFormattedMail based on style pre\n");
-#endif
-        mPreFormattedMail = true;
-      }
-    } else {
-      /* See comment at end of function. */
-      mInWhitespace = true;
-      mPreFormattedMail = false;
-    }
-
-    return NS_OK;
-  }
-
-  // Keep this in sync with DoCloseContainer!
-  if (!DoOutput()) {
-    return NS_OK;
-  }
-
-  if (aTag == nsGkAtoms::p)
-    EnsureVerticalSpace(1);
-  else if (aTag == nsGkAtoms::pre) {
-    if (GetLastBool(mIsInCiteBlockquote))
-      EnsureVerticalSpace(0);
-    else if (mHasWrittenCiteBlockquote) {
-      EnsureVerticalSpace(0);
-      mHasWrittenCiteBlockquote = false;
-    } else
-      EnsureVerticalSpace(1);
-  } else if (aTag == nsGkAtoms::tr) {
-    PushBool(mHasWrittenCellsForRow, false);
-  } else if (aTag == nsGkAtoms::td || aTag == nsGkAtoms::th) {
-    // We must make sure that the content of two table cells get a
-    // space between them.
-
-    // To make the separation between cells most obvious and
-    // importable, we use a TAB.
-    if (mHasWrittenCellsForRow.IsEmpty()) {
-      // We don't always see a <tr> (nor a <table>) before the <td> if we're
-      // copying part of a table
-      PushBool(mHasWrittenCellsForRow, true);  // will never be popped
-    } else if (GetLastBool(mHasWrittenCellsForRow)) {
-      // Bypass |Write| so that the TAB isn't compressed away.
-      AddToLine(u"\t", 1);
-      mInWhitespace = true;
-    } else {
-      SetLastBool(mHasWrittenCellsForRow, true);
-    }
-  } else if (aTag == nsGkAtoms::ul) {
-    // Indent here to support nested lists, which aren't included in li :-(
-    EnsureVerticalSpace(IsInOlOrUl() ? 0 : 1);
-    // Must end the current line before we change indention
-    mCurrentLine.mIndentation.mLength += kIndentSizeList;
-    mULCount++;
-  } else if (aTag == nsGkAtoms::ol) {
-    EnsureVerticalSpace(IsInOlOrUl() ? 0 : 1);
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-      // Must end the current line before we change indention
-      nsAutoString startAttr;
-      int32_t startVal = 1;
-      if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::start, startAttr))) {
-        nsresult rv = NS_OK;
-        startVal = startAttr.ToInteger(&rv);
-        if (NS_FAILED(rv)) {
-          startVal = 1;
-        }
-      }
-      mOLStack.AppendElement(startVal);
-    } else {
-      mOLStack.AppendElement(kOlStackDummyValue);
-    }
-    mCurrentLine.mIndentation.mLength += kIndentSizeList;  // see ul
-  } else if (aTag == nsGkAtoms::li &&
-             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-    if (mTagStackIndex > 1 && IsInOL()) {
-      if (!mOLStack.IsEmpty()) {
-        nsAutoString valueAttr;
-        if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::value, valueAttr))) {
-          nsresult rv = NS_OK;
-          int32_t valueAttrVal = valueAttr.ToInteger(&rv);
-          if (NS_SUCCEEDED(rv)) {
-            mOLStack.LastElement() = valueAttrVal;
-          }
-        }
-        // This is what nsBulletFrame does for OLs:
-        mCurrentLine.mIndentation.mHeader.AppendInt(mOLStack.LastElement(), 10);
-        mOLStack.LastElement()++;
-      } else {
-        mCurrentLine.mIndentation.mHeader.Append(char16_t('#'));
-      }
-
-      mCurrentLine.mIndentation.mHeader.Append(char16_t('.'));
-
-    } else {
-      static const char bulletCharArray[] = "*o+#";
-      uint32_t index = mULCount > 0 ? (mULCount - 1) : 3;
-      char bulletChar = bulletCharArray[index % 4];
-      mCurrentLine.mIndentation.mHeader.Append(char16_t(bulletChar));
-    }
-
-    mCurrentLine.mIndentation.mHeader.Append(char16_t(' '));
-  } else if (aTag == nsGkAtoms::dl) {
-    EnsureVerticalSpace(1);
-  } else if (aTag == nsGkAtoms::dt) {
-    EnsureVerticalSpace(0);
-  } else if (aTag == nsGkAtoms::dd) {
-    EnsureVerticalSpace(0);
-    mCurrentLine.mIndentation.mLength += kIndentSizeDD;
-  } else if (aTag == nsGkAtoms::span) {
-    ++mSpanLevel;
-  } else if (aTag == nsGkAtoms::blockquote) {
-    // Push
-    PushBool(mIsInCiteBlockquote, isInCiteBlockquote);
-    if (isInCiteBlockquote) {
-      EnsureVerticalSpace(0);
-      mCurrentLine.mCiteQuoteLevel++;
-    } else {
-      EnsureVerticalSpace(1);
-      mCurrentLine.mIndentation.mLength +=
-          kTabSize;  // Check for some maximum value?
-    }
-  } else if (aTag == nsGkAtoms::q) {
-    Write(u"\""_ns);
-  }
-
-  // Else make sure we'll separate block level tags,
-  // even if we're about to leave, before doing any other formatting.
-  else if (IsCssBlockLevelElement(mElement)) {
-    EnsureVerticalSpace(0);
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-    OpenContainerForOutputFormatted(aTag);
-  }
-  return NS_OK;
-}
-
-void nsPlainTextSerializer::OpenContainerForOutputFormatted(
-    const nsAtom* aTag) {
-  const bool currentNodeIsConverted = IsCurrentNodeConverted();
-
-  if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
-      aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
-    EnsureVerticalSpace(2);
-    if (mSettings.GetHeaderStrategy() ==
-        Settings::HeaderStrategy::kNumberHeadingsAndIndentSlightly) {
-      mCurrentLine.mIndentation.mLength += kIndentSizeHeaders;
-      // Caching
-      int32_t level = HeaderLevel(aTag);
-      // Increase counter for current level
-      mHeaderCounter[level]++;
-      // Reset all lower levels
-      int32_t i;
-
-      for (i = level + 1; i <= 6; i++) {
-        mHeaderCounter[i] = 0;
-      }
-
-      // Construct numbers
-      nsAutoString leadup;
-      for (i = 1; i <= level; i++) {
-        leadup.AppendInt(mHeaderCounter[i]);
-        leadup.Append(char16_t('.'));
-      }
-      leadup.Append(char16_t(' '));
-      Write(leadup);
-    } 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.mLength += kIndentIncrementHeaders;
-      }
-    }
-  } else if (aTag == nsGkAtoms::sup && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"^"_ns);
-  } else if (aTag == nsGkAtoms::sub && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"_"_ns);
-  } else if (aTag == nsGkAtoms::code && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"|"_ns);
-  } else if ((aTag == nsGkAtoms::strong || aTag == nsGkAtoms::b) &&
-             mSettings.GetStructs() && !currentNodeIsConverted) {
-    Write(u"*"_ns);
-  } else if ((aTag == nsGkAtoms::em || aTag == nsGkAtoms::i) &&
-             mSettings.GetStructs() && !currentNodeIsConverted) {
-    Write(u"/"_ns);
-  } else if (aTag == nsGkAtoms::u && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"_"_ns);
-  }
-
-  /* Container elements are always block elements, so we shouldn't
-     output any whitespace immediately after the container tag even if
-     there's extra whitespace there because the HTML is pretty-printed
-     or something. To ensure that happens, tell the serializer we're
-     already in whitespace so it won't output more. */
-  mInWhitespace = true;
-}
-
-nsresult nsPlainTextSerializer::DoCloseContainer(const nsAtom* aTag) {
-  if (IsIgnorableRubyAnnotation(aTag)) {
-    mIgnoredChildNodeLevel--;
-    return NS_OK;
-  }
-  if (IsIgnorableScriptOrStyle(mElement)) {
-    mIgnoredChildNodeLevel--;
-    return NS_OK;
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputForPlainTextClipboardCopy)) {
-    if (DoOutput() && IsElementPreformatted() &&
-        IsCssBlockLevelElement(mElement)) {
-      // If we're closing a preformatted block element, output a line break
-      // when we find a new container.
-      mPreformattedBlockBoundary = true;
-    }
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputRaw)) {
-    // Raw means raw.  Don't even think about doing anything fancy
-    // here like indenting, adding line breaks or any other
-    // characters such as list item bullets, quote characters
-    // around <q>, etc.
-
-    return NS_OK;
-  }
-
-  if (mTagStackIndex > 0) {
-    --mTagStackIndex;
-  }
-
-  if (mTagStackIndex >= mIgnoreAboveIndex) {
-    if (mTagStackIndex == mIgnoreAboveIndex) {
-      // We're dealing with the close tag whose matching
-      // open tag had set the mIgnoreAboveIndex value.
-      // Reset mIgnoreAboveIndex before discarding this tag.
-      mIgnoreAboveIndex = (uint32_t)kNotFound;
-    }
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(mOutputManager);
-
-  // End current line if we're ending a block level tag
-  if ((aTag == nsGkAtoms::body) || (aTag == nsGkAtoms::html)) {
-    // We want the output to end with a new line,
-    // but in preformatted areas like text fields,
-    // we can't emit newlines that weren't there.
-    // So add the newline only in the case of formatted output.
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-      EnsureVerticalSpace(0);
-    } else {
-      mOutputManager->Flush(mCurrentLine);
-    }
-    // We won't want to do anything with these in formatted mode either,
-    // so just return now:
-    return NS_OK;
-  }
-
-  // Keep this in sync with DoOpenContainer!
-  if (!DoOutput()) {
-    return NS_OK;
-  }
-
-  if (aTag == nsGkAtoms::tr) {
-    PopBool(mHasWrittenCellsForRow);
-    // Should always end a line, but get no more whitespace
-    if (mFloatingLines < 0) mFloatingLines = 0;
-    mLineBreakDue = true;
-  } else if (((aTag == nsGkAtoms::li) || (aTag == nsGkAtoms::dt)) &&
-             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-    // Items that should always end a line, but get no more whitespace
-    if (mFloatingLines < 0) mFloatingLines = 0;
-    mLineBreakDue = true;
-  } else if (aTag == nsGkAtoms::pre) {
-    mFloatingLines = GetLastBool(mIsInCiteBlockquote) ? 0 : 1;
-    mLineBreakDue = true;
-  } else if (aTag == nsGkAtoms::ul) {
-    mOutputManager->Flush(mCurrentLine);
-    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
-    --mULCount;
-    if (!IsInOlOrUl()) {
-      mFloatingLines = 1;
-      mLineBreakDue = true;
-    }
-  } else if (aTag == nsGkAtoms::ol) {
-    mOutputManager->Flush(mCurrentLine);  // Doing this after decreasing
-                                          // OLStackIndex would be wrong.
-    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
-    MOZ_ASSERT(!mOLStack.IsEmpty(), "Wrong OLStack level!");
-    mOLStack.RemoveLastElement();
-    if (!IsInOlOrUl()) {
-      mFloatingLines = 1;
-      mLineBreakDue = true;
-    }
-  } else if (aTag == nsGkAtoms::dl) {
-    mFloatingLines = 1;
-    mLineBreakDue = true;
-  } else if (aTag == nsGkAtoms::dd) {
-    mOutputManager->Flush(mCurrentLine);
-    mCurrentLine.mIndentation.mLength -= kIndentSizeDD;
-  } else if (aTag == nsGkAtoms::span) {
-    NS_ASSERTION(mSpanLevel, "Span level will be negative!");
-    --mSpanLevel;
-  } else if (aTag == nsGkAtoms::div) {
-    if (mFloatingLines < 0) mFloatingLines = 0;
-    mLineBreakDue = true;
-  } else if (aTag == nsGkAtoms::blockquote) {
-    mOutputManager->Flush(mCurrentLine);  // Is this needed?
-
-    // Pop
-    bool isInCiteBlockquote = PopBool(mIsInCiteBlockquote);
-
-    if (isInCiteBlockquote) {
-      NS_ASSERTION(mCurrentLine.mCiteQuoteLevel,
-                   "CiteQuote level will be negative!");
-      mCurrentLine.mCiteQuoteLevel--;
-      mFloatingLines = 0;
-      mHasWrittenCiteBlockquote = true;
-    } else {
-      mCurrentLine.mIndentation.mLength -= kTabSize;
-      mFloatingLines = 1;
-    }
-    mLineBreakDue = true;
-  } else if (aTag == nsGkAtoms::q) {
-    Write(u"\""_ns);
-  } else if (IsCssBlockLevelElement(mElement)) {
-    // All other blocks get 1 vertical space after them
-    // in formatted mode, otherwise 0.
-    // This is hard. Sometimes 0 is a better number, but
-    // how to know?
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-      EnsureVerticalSpace(1);
-    } else {
-      if (mFloatingLines < 0) mFloatingLines = 0;
-      mLineBreakDue = true;
-    }
-  }
-
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-    CloseContainerForOutputFormatted(aTag);
-  }
-
-  return NS_OK;
-}
-
-void nsPlainTextSerializer::CloseContainerForOutputFormatted(
-    const nsAtom* aTag) {
-  const bool currentNodeIsConverted = IsCurrentNodeConverted();
-
-  if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
-      aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
-    using HeaderStrategy = Settings::HeaderStrategy;
-    if ((mSettings.GetHeaderStrategy() ==
-         HeaderStrategy::kIndentIncreasedWithHeaderLevel) ||
-        (mSettings.GetHeaderStrategy() ==
-         HeaderStrategy::kNumberHeadingsAndIndentSlightly)) {
-      mCurrentLine.mIndentation.mLength -= kIndentSizeHeaders;
-    }
-    if (mSettings.GetHeaderStrategy() ==
-        HeaderStrategy::kIndentIncreasedWithHeaderLevel) {
-      for (int32_t i = HeaderLevel(aTag); i > 1; i--) {
-        // for h(x), run x-1 times
-        mCurrentLine.mIndentation.mLength -= kIndentIncrementHeaders;
-      }
-    }
-    EnsureVerticalSpace(1);
-  } else if (aTag == nsGkAtoms::a && !currentNodeIsConverted) {
-    nsAutoString url;
-    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::href, url)) &&
-        !url.IsEmpty()) {
-      nsAutoString temp;
-      temp.AssignLiteral(" <");
-      temp += url;
-      temp.Append(char16_t('>'));
-      Write(temp);
-    }
-  } else if ((aTag == nsGkAtoms::sup || aTag == nsGkAtoms::sub) &&
-             mSettings.GetStructs() && !currentNodeIsConverted) {
-    Write(kSpace);
-  } else if (aTag == nsGkAtoms::code && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"|"_ns);
-  } else if ((aTag == nsGkAtoms::strong || aTag == nsGkAtoms::b) &&
-             mSettings.GetStructs() && !currentNodeIsConverted) {
-    Write(u"*"_ns);
-  } else if ((aTag == nsGkAtoms::em || aTag == nsGkAtoms::i) &&
-             mSettings.GetStructs() && !currentNodeIsConverted) {
-    Write(u"/"_ns);
-  } else if (aTag == nsGkAtoms::u && mSettings.GetStructs() &&
-             !currentNodeIsConverted) {
-    Write(u"_"_ns);
-  }
-}
-
-bool nsPlainTextSerializer::MustSuppressLeaf() const {
-  if (mIgnoredChildNodeLevel > 0) {
-    return true;
-  }
-
-  if ((mTagStackIndex > 1 &&
-       mTagStack[mTagStackIndex - 2] == nsGkAtoms::select) ||
-      (mTagStackIndex > 0 &&
-       mTagStack[mTagStackIndex - 1] == nsGkAtoms::select)) {
-    // Don't output the contents of SELECT elements;
-    // Might be nice, eventually, to output just the selected element.
-    // Read more in bug 31994.
-    return true;
-  }
-
-  return false;
-}
-
-void nsPlainTextSerializer::DoAddText() { DoAddText(true, u""_ns); }
-
-void nsPlainTextSerializer::DoAddText(bool aIsLineBreak,
-                                      const nsAString& aText) {
-  // If we don't want any output, just return
-  if (!DoOutput()) {
-    return;
-  }
-
-  if (!aIsLineBreak) {
-    // Make sure to reset this, since it's no longer true.
-    mHasWrittenCiteBlockquote = false;
-  }
-
-  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
-
-  if (MustSuppressLeaf()) {
-    return;
-  }
-
-  if (aIsLineBreak) {
-    // The only times we want to pass along whitespace from the original
-    // html source are if we're forced into preformatted mode via flags,
-    // or if we're prettyprinting and we're inside a <pre>.
-    // Otherwise, either we're collapsing to minimal text, or we're
-    // prettyprinting to mimic the html format, and in neither case
-    // does the formatting of the html source help us.
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted) ||
-        (mPreFormattedMail && !mSettings.GetWrapColumn()) ||
-        IsElementPreformatted()) {
-      EnsureVerticalSpace(mEmptyLines + 1);
-    } else if (!mInWhitespace) {
-      Write(kSpace);
-      mInWhitespace = true;
-    }
-    return;
-  }
-
-  Write(aText);
-}
-
-void CreateLineOfDashes(nsAString& aResult, const uint32_t aWrapColumn) {
-  MOZ_ASSERT(aResult.IsEmpty());
-
-  const uint32_t width = (aWrapColumn > 0 ? aWrapColumn : 25);
-  while (aResult.Length() < width) {
-    aResult.Append(char16_t('-'));
-  }
-}
-
-nsresult nsPlainTextSerializer::DoAddLeaf(const nsAtom* aTag) {
-  mPreformattedBlockBoundary = false;
-
-  if (!DoOutput()) {
-    return NS_OK;
-  }
-
-  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
-
-  if (MustSuppressLeaf()) {
-    return NS_OK;
-  }
-
-  if (aTag == nsGkAtoms::br) {
-    // Another egregious editor workaround, see bug 38194:
-    // ignore the bogus br tags that the editor sticks here and there.
-    // FYI: `brElement` may be `nullptr` if the element is <br> element
-    //      of non-HTML element.
-    // XXX Do we need to call `EnsureVerticalSpace()` when the <br> element
-    //     is not an HTML element?
-    HTMLBRElement* brElement = HTMLBRElement::FromNodeOrNull(mElement);
-    if (!brElement || !brElement->IsPaddingForEmptyLastLine()) {
-      EnsureVerticalSpace(mEmptyLines + 1);
-    }
-  } else if (aTag == nsGkAtoms::hr &&
-             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
-    EnsureVerticalSpace(0);
-
-    // Make a line of dashes as wide as the wrap width
-    // XXX honoring percentage would be nice
-    nsAutoString line;
-    CreateLineOfDashes(line, mSettings.GetWrapColumn());
-    Write(line);
-
-    EnsureVerticalSpace(0);
-  } else if (aTag == nsGkAtoms::img) {
-    /* Output (in decreasing order of preference)
-       alt, title or nothing */
-    // See <http://www.w3.org/TR/REC-html40/struct/objects.html#edef-IMG>
-    nsAutoString imageDescription;
-    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::alt, imageDescription))) {
-      // If the alt attribute has an empty value (|alt=""|), output nothing
-    } else if (NS_SUCCEEDED(
-                   GetAttributeValue(nsGkAtoms::title, imageDescription)) &&
-               !imageDescription.IsEmpty()) {
-      imageDescription = u" ["_ns + imageDescription + u"] "_ns;
-    }
-
-    Write(imageDescription);
-  }
-
-  return NS_OK;
-}
-
-/**
- * Adds as many newline as necessary to get |aNumberOfRows| empty lines
- *
- * aNumberOfRows = -1    :   Being in the middle of some line of text
- * aNumberOfRows =  0    :   Being at the start of a line
- * aNumberOfRows =  n>0  :   Having n empty lines before the current line.
- */
-void nsPlainTextSerializer::EnsureVerticalSpace(const int32_t aNumberOfRows) {
-  // If we have something in the indent we probably want to output
-  // it and it's not included in the count for empty lines so we don't
-  // realize that we should start a new line.
-  if (aNumberOfRows >= 0 && !mCurrentLine.mIndentation.mHeader.IsEmpty()) {
-    EndLine(false);
-    mInWhitespace = true;
-  }
-
-  while (mEmptyLines < aNumberOfRows) {
-    EndLine(false);
-    mInWhitespace = true;
-  }
-  mLineBreakDue = false;
-  mFloatingLines = -1;
-}
-
-void nsPlainTextSerializer::OutputManager::Flush(CurrentLine& aCurrentLine) {
-  if (!aCurrentLine.mContent.IsEmpty()) {
-    aCurrentLine.MaybeReplaceNbspsInContent(mFlags);
-
-    Append(aCurrentLine, StripTrailingWhitespaces::kNo);
-
-    aCurrentLine.ResetContentAndIndentationHeader();
-  }
-}
-
-static bool IsSpaceStuffable(const char16_t* s) {
-  return (s[0] == '>' || s[0] == ' ' || s[0] == kNBSP ||
-          NS_strncmp(s, u"From ", 5) == 0);
-}
-
-void nsPlainTextSerializer::MaybeWrapAndOutputCompleteLines() {
-  if (!mSettings.MayWrap()) {
-    return;
-  }
-
-  const uint32_t prefixwidth = mCurrentLine.DeterminePrefixWidth();
-
-  // The width of the line as it will appear on the screen (approx.).
-  uint32_t currentLineContentWidth =
-      GetUnicharStringWidth(mCurrentLine.mContent);
-
-  // Yes, wrap!
-  // The "+4" is to avoid wrap lines that only would be a couple
-  // of letters too long. We give this bonus only if the
-  // wrapcolumn is more than 20.
-  const uint32_t wrapColumn = mSettings.GetWrapColumn();
-  uint32_t bonuswidth = (wrapColumn > 20) ? 4 : 0;
-
-  while (currentLineContentWidth + prefixwidth > wrapColumn + bonuswidth) {
-    const int32_t goodSpace = mCurrentLine.FindWrapIndexForContent(
-        wrapColumn, currentLineContentWidth, mLineBreaker);
-
-    const int32_t contentLength = mCurrentLine.mContent.Length();
-    if ((goodSpace < contentLength) && (goodSpace > 0)) {
-      // Found a place to break
-
-      // -1 (trim a char at the break position)
-      // only if the line break was a space.
-      nsAutoString restOfContent;
-      if (nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace))) {
-        mCurrentLine.mContent.Right(restOfContent,
-                                    contentLength - goodSpace - 1);
-      } else {
-        mCurrentLine.mContent.Right(restOfContent, contentLength - goodSpace);
-      }
-      // if breaker was U+0020, it has to consider for delsp=yes support
-      const bool breakBySpace = mCurrentLine.mContent.CharAt(goodSpace) == ' ';
-      mCurrentLine.mContent.Truncate(goodSpace);
-      EndLine(true, breakBySpace);
-      mCurrentLine.mContent.Truncate();
-      // Space stuff new line?
-      if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
-        if (!restOfContent.IsEmpty() && IsSpaceStuffable(restOfContent.get()) &&
-            mCurrentLine.mCiteQuoteLevel ==
-                0  // We space-stuff quoted lines anyway
-        ) {
-          // Space stuffing a la RFC 2646 (format=flowed).
-          mCurrentLine.mContent.Append(char16_t(' '));
-          // XXX doesn't seem to work correctly for ' '
-        }
-      }
-      mCurrentLine.mContent.Append(restOfContent);
-      currentLineContentWidth = GetUnicharStringWidth(mCurrentLine.mContent);
-      mEmptyLines = -1;
-    } else {
-      // Nothing to do. Hopefully we get more data later
-      // to use for a place to break line
-      break;
-    }
-  }
-}
-
-/**
- * This function adds a piece of text to the current stored line. If we are
- * wrapping text and the stored line will become too long, a suitable
- * location to wrap will be found and the line that's complete will be
- * output.
- */
-void nsPlainTextSerializer::AddToLine(const char16_t* aLineFragment,
-                                      int32_t aLineFragmentLength) {
-  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
-
-  if (mCurrentLine.mContent.IsEmpty()) {
-    if (0 == aLineFragmentLength) {
-      return;
-    }
-
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
-      if (IsSpaceStuffable(aLineFragment) &&
-          mCurrentLine.mCiteQuoteLevel ==
-              0  // We space-stuff quoted lines anyway
-      ) {
-        // Space stuffing a la RFC 2646 (format=flowed).
-        mCurrentLine.mContent.Append(char16_t(' '));
-      }
-    }
-    mEmptyLines = -1;
-  }
-
-  mCurrentLine.mContent.Append(aLineFragment, aLineFragmentLength);
-
-  MaybeWrapAndOutputCompleteLines();
-}
-
-// The signature separator (RFC 2646).
-const char kSignatureSeparator[] = "-- ";
-
-// The OpenPGP dash-escaped signature separator in inline
-// signed messages according to the OpenPGP standard (RFC 2440).
-const char kDashEscapedSignatureSeparator[] = "- -- ";
-
-static bool IsSignatureSeparator(const nsAString& aString) {
-  return aString.EqualsLiteral(kSignatureSeparator) ||
-         aString.EqualsLiteral(kDashEscapedSignatureSeparator);
-}
-
-/**
- * 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.IsEmpty()) {
-    // No meaning
-    return;
-  }
-
-  /* In non-preformatted mode, remove spaces from the end of the line for
-   * format=flowed compatibility. Don't do this for these special cases:
-   * "-- ", the signature separator (RFC 2646) shouldn't be touched and
-   * "- -- ", the OpenPGP dash-escaped signature separator in inline
-   * signed messages according to the OpenPGP standard (RFC 2440).
-   */
-  if (!mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted) &&
-      (aSoftLineBreak || !IsSignatureSeparator(mCurrentLine.mContent))) {
-    mCurrentLine.mContent.Trim(" ", false, true, false);
-  }
-
-  if (aSoftLineBreak &&
-      mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed) &&
-      (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.
-
-    // If breaker character is ASCII space with RFC 3676 support (delsp=yes),
-    // add twice space.
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatDelSp) &&
-        aBreakBySpace) {
-      mCurrentLine.mContent.AppendLiteral("  ");
-    } else {
-      mCurrentLine.mContent.Append(char16_t(' '));
-    }
-  }
-
-  if (aSoftLineBreak) {
-    mEmptyLines = 0;
-  } else {
-    // Hard break
-    if (mCurrentLine.HasContentOrIndentationHeader()) {
-      mEmptyLines = 0;
-    } else {
-      mEmptyLines++;
-    }
-  }
-
-  MOZ_ASSERT(mOutputManager);
-
-  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
-  // would trick a format=flowed-aware receiver.
-  mOutputManager->Append(mCurrentLine,
-                         OutputManager::StripTrailingWhitespaces::kMaybe);
-  mOutputManager->AppendLineBreak();
-  mCurrentLine.ResetContentAndIndentationHeader();
-  mInWhitespace = true;
-  mLineBreakDue = false;
-  mFloatingLines = -1;
-}
-
-/**
- * Creates the calculated and stored indent and text in the indentation. That is
- * quote chars and numbers for numbered lists and such.
- */
-void nsPlainTextSerializer::CurrentLine::CreateQuotesAndIndent(
-    nsAString& aResult) const {
-  // Put the mail quote "> " chars in, if appropriate:
-  if (mCiteQuoteLevel > 0) {
-    nsAutoString quotes;
-    for (int i = 0; i < mCiteQuoteLevel; i++) {
-      quotes.Append(char16_t('>'));
-    }
-    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
-         with the following one, so the empty line may be lost completely.) */
-      quotes.Append(char16_t(' '));
-    }
-    aResult = quotes;
-  }
-
-  // Indent if necessary
-  int32_t indentwidth = mIndentation.mLength - mIndentation.mHeader.Length();
-  if (indentwidth > 0 && HasContentOrIndentationHeader()
-      // Don't make empty lines look flowed
-  ) {
-    nsAutoString spaces;
-    for (int i = 0; i < indentwidth; ++i) spaces.Append(char16_t(' '));
-    aResult += spaces;
-  }
-
-  if (!mIndentation.mHeader.IsEmpty()) {
-    aResult += mIndentation.mHeader;
-  }
-}
-
-static bool IsLineFeedCarriageReturnBlankOrTab(char16_t c) {
-  return ('\n' == c || '\r' == c || ' ' == c || '\t' == c);
-}
-
-static void ReplaceVisiblyTrailingNbsps(nsAString& aString) {
-  const int32_t totLen = aString.Length();
-  for (int32_t i = totLen - 1; i >= 0; i--) {
-    char16_t c = aString[i];
-    if (IsLineFeedCarriageReturnBlankOrTab(c)) {
-      continue;
-    }
-    if (kNBSP == c) {
-      aString.Replace(i, 1, ' ');
-    } else {
-      break;
-    }
-  }
-}
-
-void nsPlainTextSerializer::ConvertToLinesAndOutput(const nsAString& aString) {
-  const int32_t totLen = aString.Length();
-  int32_t newline{0};
-
-  // Put the mail quote "> " chars in, if appropriate.
-  // Have to put it in before every line.
-  int32_t bol = 0;
-  while (bol < totLen) {
-    bool outputLineBreak = false;
-    bool spacesOnly = true;
-
-    // Find one of '\n' or '\r' using iterators since nsAString
-    // doesn't have the old FindCharInSet function.
-    nsAString::const_iterator iter;
-    aString.BeginReading(iter);
-    nsAString::const_iterator done_searching;
-    aString.EndReading(done_searching);
-    iter.advance(bol);
-    int32_t new_newline = bol;
-    newline = kNotFound;
-    while (iter != done_searching) {
-      if ('\n' == *iter || '\r' == *iter) {
-        newline = new_newline;
-        break;
-      }
-      if (' ' != *iter) {
-        spacesOnly = false;
-      }
-      ++new_newline;
-      ++iter;
-    }
-
-    // Done searching
-    nsAutoString stringpart;
-    if (newline == kNotFound) {
-      // No new lines.
-      stringpart.Assign(Substring(aString, bol, totLen - bol));
-      if (!stringpart.IsEmpty()) {
-        char16_t lastchar = stringpart.Last();
-        mInWhitespace = IsLineFeedCarriageReturnBlankOrTab(lastchar);
-      }
-      mEmptyLines = -1;
-      bol = totLen;
-    } else {
-      // There is a newline
-      stringpart.Assign(Substring(aString, bol, newline - bol));
-      mInWhitespace = true;
-      outputLineBreak = true;
-      mEmptyLines = 0;
-      bol = newline + 1;
-      if ('\r' == *iter && bol < totLen && '\n' == *++iter) {
-        // There was a CRLF in the input. This used to be illegal and
-        // stripped by the parser. Apparently not anymore. Let's skip
-        // over the LF.
-        bol++;
-      }
-    }
-
-    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
-      if ((outputLineBreak || !spacesOnly) &&  // bugs 261467,125928
-          !IsQuotedLine(stringpart) && !IsSignatureSeparator(stringpart)) {
-        stringpart.Trim(" ", false, true, true);
-      }
-      if (IsSpaceStuffable(stringpart.get()) && !IsQuotedLine(stringpart)) {
-        mCurrentLine.mContent.Append(char16_t(' '));
-      }
-    }
-    mCurrentLine.mContent.Append(stringpart);
-
-    mCurrentLine.MaybeReplaceNbspsInContent(mSettings.GetFlags());
-
-    mOutputManager->Append(mCurrentLine,
-                           OutputManager::StripTrailingWhitespaces::kNo);
-    if (outputLineBreak) {
-      mOutputManager->AppendLineBreak();
-    }
-
-    mCurrentLine.ResetContentAndIndentationHeader();
-  }
-
-#ifdef DEBUG_wrapping
-  printf("No wrapping: newline is %d, totLen is %d\n", newline, totLen);
-#endif
-}
-
-/**
- * Write a string. This is the highlevel function to use to get text output.
- * By using AddToLine, Output, EndLine and other functions it handles quotation,
- * line wrapping, indentation, whitespace compression and other things.
- */
-void nsPlainTextSerializer::Write(const nsAString& aStr) {
-  // XXX Copy necessary to use nsString methods and gain
-  // access to underlying buffer
-  nsAutoString str(aStr);
-
-#ifdef DEBUG_wrapping
-  printf("Write(%s): wrap col = %d\n", NS_ConvertUTF16toUTF8(str).get(),
-         mSettings.GetWrapColumn());
-#endif
-
-  const int32_t totLen = str.Length();
-
-  // If the string is empty, do nothing:
-  if (totLen <= 0) return;
-
-  // For Flowed text change nbsp-ses to spaces at end of lines to allow them
-  // to be cut off along with usual spaces if required. (bug #125928)
-  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
-    ReplaceVisiblyTrailingNbsps(str);
-  }
-
-  // We have two major codepaths here. One that does preformatted text and one
-  // that does normal formatted text. The one for preformatted text calls
-  // Output directly while the other code path goes through AddToLine.
-  if ((mPreFormattedMail && !mSettings.GetWrapColumn()) ||
-      (IsElementPreformatted() && !mPreFormattedMail) ||
-      (mSpanLevel > 0 && mEmptyLines >= 0 && IsQuotedLine(str))) {
-    // No intelligent wrapping.
-
-    // 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.IsEmpty()) {
-      mOutputManager->Flush(mCurrentLine);
-    }
-
-    ConvertToLinesAndOutput(str);
-    return;
-  }
-
-  // Intelligent handling of text
-  // If needed, strip out all "end of lines"
-  // and multiple whitespace between words
-  int32_t nextpos;
-  const char16_t* offsetIntoBuffer = nullptr;
-
-  int32_t bol = 0;
-  while (bol < totLen) {  // Loop over lines
-    // Find a place where we may have to do whitespace compression
-    nextpos = str.FindCharInSet(" \t\n\r", bol);
-#ifdef DEBUG_wrapping
-    nsAutoString remaining;
-    str.Right(remaining, totLen - bol);
-    foo = ToNewCString(remaining);
-    // printf("Next line: bol = %d, newlinepos = %d, totLen = %d, "
-    //        "string = '%s'\n", bol, nextpos, totLen, foo);
-    free(foo);
-#endif
-
-    if (nextpos == kNotFound) {
-      // The rest of the string
-      offsetIntoBuffer = str.get() + bol;
-      AddToLine(offsetIntoBuffer, totLen - bol);
-      bol = totLen;
-      mInWhitespace = false;
-    } else {
-      // There's still whitespace left in the string
-      if (nextpos != 0 && (nextpos + 1) < totLen) {
-        offsetIntoBuffer = str.get() + nextpos;
-        // skip '\n' if it is between CJ chars
-        if (offsetIntoBuffer[0] == '\n' && IS_CJ_CHAR(offsetIntoBuffer[-1]) &&
-            IS_CJ_CHAR(offsetIntoBuffer[1])) {
-          offsetIntoBuffer = str.get() + bol;
-          AddToLine(offsetIntoBuffer, nextpos - bol);
-          bol = nextpos + 1;
-          continue;
-        }
-      }
-      // If we're already in whitespace and not preformatted, just skip it:
-      if (mInWhitespace && (nextpos == bol) && !mPreFormattedMail &&
-          !mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted)) {
-        // Skip whitespace
-        bol++;
-        continue;
-      }
-
-      if (nextpos == bol) {
-        // Note that we are in whitespace.
-        mInWhitespace = true;
-        offsetIntoBuffer = str.get() + nextpos;
-        AddToLine(offsetIntoBuffer, 1);
-        bol++;
-        continue;
-      }
-
-      mInWhitespace = true;
-
-      offsetIntoBuffer = str.get() + bol;
-      if (mPreFormattedMail ||
-          mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted)) {
-        // Preserve the real whitespace character
-        nextpos++;
-        AddToLine(offsetIntoBuffer, nextpos - bol);
-        bol = nextpos;
-      } else {
-        // Replace the whitespace with a space
-        AddToLine(offsetIntoBuffer, nextpos - bol);
-        AddToLine(kSpace.get(), 1);
-        bol = nextpos + 1;  // Let's eat the whitespace
-      }
-    }
-  }  // Continue looping over the string
-}
-
-/**
- * Gets the value of an attribute in a string. If the function returns
- * NS_ERROR_NOT_AVAILABLE, there was none such attribute specified.
- */
-nsresult nsPlainTextSerializer::GetAttributeValue(const nsAtom* aName,
-                                                  nsString& aValueRet) const {
-  if (mElement) {
-    if (mElement->GetAttr(kNameSpaceID_None, aName, aValueRet)) {
-      return NS_OK;
-    }
-  }
-
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-/**
- * Returns true, if the element was inserted by Moz' TXT->HTML converter.
- * In this case, we should ignore it.
- */
-bool nsPlainTextSerializer::IsCurrentNodeConverted() const {
-  nsAutoString value;
-  nsresult rv = GetAttributeValue(nsGkAtoms::_class, value);
-  return (NS_SUCCEEDED(rv) && (value.EqualsIgnoreCase("moz-txt", 7) ||
-                               value.EqualsIgnoreCase("\"moz-txt", 8)));
-}
-
-// static
-nsAtom* nsPlainTextSerializer::GetIdForContent(nsIContent* aContent) {
-  if (!aContent->IsHTMLElement()) {
-    return nullptr;
-  }
-
-  nsAtom* localName = aContent->NodeInfo()->NameAtom();
-  return localName->IsStatic() ? localName : nullptr;
-}
-
-bool nsPlainTextSerializer::IsElementPreformatted() const {
-  return !mPreformatStack.empty() && mPreformatStack.top();
-}
-
-bool nsPlainTextSerializer::IsElementPreformatted(Element* aElement) {
-  RefPtr<ComputedStyle> computedStyle =
-      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
-  if (computedStyle) {
-    const nsStyleText* textStyle = computedStyle->StyleText();
-    return textStyle->WhiteSpaceOrNewlineIsSignificant();
-  }
-  // Fall back to looking at the tag, in case there is no style information.
-  return GetIdForContent(aElement) == nsGkAtoms::pre;
-}
-
-bool nsPlainTextSerializer::IsCssBlockLevelElement(Element* aElement) {
-  RefPtr<ComputedStyle> computedStyle =
-      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
-  if (computedStyle) {
-    const nsStyleDisplay* displayStyle = computedStyle->StyleDisplay();
-    return displayStyle->IsBlockOutsideStyle();
-  }
-  // Fall back to looking at the tag, in case there is no style information.
-  return nsContentUtils::IsHTMLBlockLevelElement(aElement);
-}
-
-/**
- * This method is required only to identify LI's inside OL.
- * Returns TRUE if we are inside an OL tag and FALSE otherwise.
- */
-bool nsPlainTextSerializer::IsInOL() const {
-  int32_t i = mTagStackIndex;
-  while (--i >= 0) {
-    if (mTagStack[i] == nsGkAtoms::ol) return true;
-    if (mTagStack[i] == nsGkAtoms::ul) {
-      // If a UL is reached first, LI belongs the UL nested in OL.
-      return false;
-    }
-  }
-  // We may reach here for orphan LI's.
-  return false;
-}
-
-bool nsPlainTextSerializer::IsInOlOrUl() const {
-  return (mULCount > 0) || !mOLStack.IsEmpty();
-}
-
-/*
-  @return 0 = no header, 1 = h1, ..., 6 = h6
-*/
-int32_t HeaderLevel(const nsAtom* aTag) {
-  if (aTag == nsGkAtoms::h1) {
-    return 1;
-  }
-  if (aTag == nsGkAtoms::h2) {
-    return 2;
-  }
-  if (aTag == nsGkAtoms::h3) {
-    return 3;
-  }
-  if (aTag == nsGkAtoms::h4) {
-    return 4;
-  }
-  if (aTag == nsGkAtoms::h5) {
-    return 5;
-  }
-  if (aTag == nsGkAtoms::h6) {
-    return 6;
-  }
-  return 0;
-}
-
-/*
- * This is an implementation of GetUnicharWidth() and
- * GetUnicharStringWidth() as defined in
- * "The Single UNIX Specification, Version 2, The Open Group, 1997"
- * <http://www.UNIX-systems.org/online.html>
- *
- * Markus Kuhn -- 2000-02-08 -- public domain
- *
- * Minor alterations to fit Mozilla's data types by Daniel Bratell
- */
-
-/* These functions define the column width of an ISO 10646 character
- * as follows:
- *
- *    - The null character (U+0000) has a column width of 0.
- *
- *    - Other C0/C1 control characters and DEL will lead to a return
- *      value of -1.
- *
- *    - Non-spacing and enclosing combining characters (general
- *      category code Mn or Me in the Unicode database) have a
- *      column width of 0.
- *
- *    - Spacing characters in the East Asian Wide (W) or East Asian
- *      FullWidth (F) category as defined in Unicode Technical
- *      Report #11 have a column width of 2.
- *
- *    - All remaining characters (including all printable
- *      ISO 8859-1 and WGL4 characters, Unicode control characters,
- *      etc.) have a column width of 1.
- *
- * This implementation assumes that wchar_t characters are encoded
- * in ISO 10646.
- */
-
-namespace {
-
-struct interval {
-  uint16_t first;
-  uint16_t last;
-};
-
-struct CombiningComparator {
-  const char16_t mUcs;
-  explicit CombiningComparator(char16_t aUcs) : mUcs(aUcs) {}
-  int operator()(const interval& combining) const {
-    if (mUcs > combining.last) return 1;
-    if (mUcs < combining.first) return -1;
-
-    MOZ_ASSERT(combining.first <= mUcs);
-    MOZ_ASSERT(mUcs <= combining.last);
-    return 0;
-  }
-};
-
-}  // namespace
-
-int32_t GetUnicharWidth(char16_t ucs) {
-  /* sorted list of non-overlapping intervals of non-spacing characters */
-  static const interval combining[] = {
-      {0x0300, 0x034E}, {0x0360, 0x0362}, {0x0483, 0x0486}, {0x0488, 0x0489},
-      {0x0591, 0x05A1}, {0x05A3, 0x05B9}, {0x05BB, 0x05BD}, {0x05BF, 0x05BF},
-      {0x05C1, 0x05C2}, {0x05C4, 0x05C4}, {0x064B, 0x0655}, {0x0670, 0x0670},
-      {0x06D6, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED}, {0x0711, 0x0711},
-      {0x0730, 0x074A}, {0x07A6, 0x07B0}, {0x0901, 0x0902}, {0x093C, 0x093C},
-      {0x0941, 0x0948}, {0x094D, 0x094D}, {0x0951, 0x0954}, {0x0962, 0x0963},
-      {0x0981, 0x0981}, {0x09BC, 0x09BC}, {0x09C1, 0x09C4}, {0x09CD, 0x09CD},
-      {0x09E2, 0x09E3}, {0x0A02, 0x0A02}, {0x0A3C, 0x0A3C}, {0x0A41, 0x0A42},
-      {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D}, {0x0A70, 0x0A71}, {0x0A81, 0x0A82},
-      {0x0ABC, 0x0ABC}, {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8}, {0x0ACD, 0x0ACD},
-      {0x0B01, 0x0B01}, {0x0B3C, 0x0B3C}, {0x0B3F, 0x0B3F}, {0x0B41, 0x0B43},
-      {0x0B4D, 0x0B4D}, {0x0B56, 0x0B56}, {0x0B82, 0x0B82}, {0x0BC0, 0x0BC0},
-      {0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48}, {0x0C4A, 0x0C4D},
-      {0x0C55, 0x0C56}, {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6}, {0x0CCC, 0x0CCD},
-      {0x0D41, 0x0D43}, {0x0D4D, 0x0D4D}, {0x0DCA, 0x0DCA}, {0x0DD2, 0x0DD4},
-      {0x0DD6, 0x0DD6}, {0x0E31, 0x0E31}, {0x0E34, 0x0E3A}, {0x0E47, 0x0E4E},
-      {0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC}, {0x0EC8, 0x0ECD},
-      {0x0F18, 0x0F19}, {0x0F35, 0x0F35}, {0x0F37, 0x0F37}, {0x0F39, 0x0F39},
-      {0x0F71, 0x0F7E}, {0x0F80, 0x0F84}, {0x0F86, 0x0F87}, {0x0F90, 0x0F97},
-      {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030}, {0x1032, 0x1032},
-      {0x1036, 0x1037}, {0x1039, 0x1039}, {0x1058, 0x1059}, {0x17B7, 0x17BD},
-      {0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x18A9, 0x18A9}, {0x20D0, 0x20E3},
-      {0x302A, 0x302F}, {0x3099, 0x309A}, {0xFB1E, 0xFB1E}, {0xFE20, 0xFE23}};
-
-  /* test for 8-bit control characters */
-  if (ucs == 0) return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return -1;
-
-  /* first quick check for Latin-1 etc. characters */
-  if (ucs < combining[0].first) return 1;
-
-  /* binary search in table of non-spacing characters */
-  size_t idx;
-  if (BinarySearchIf(combining, 0, ArrayLength(combining),
-                     CombiningComparator(ucs), &idx)) {
-    return 0;
-  }
-
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
-  /* fast test for majority of non-wide scripts */
-  if (ucs < 0x1100) return 1;
-
-  return 1 +
-         ((ucs >= 0x1100 && ucs <= 0x115f) || /* Hangul Jamo */
-          (ucs >= 0x2e80 && ucs <= 0xa4cf && (ucs & ~0x0011) != 0x300a &&
-           ucs != 0x303f) ||                  /* CJK ... Yi */
-          (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-          (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-          (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-          (ucs >= 0xff00 && ucs <= 0xff5f) || /* Fullwidth Forms */
-          (ucs >= 0xffe0 && ucs <= 0xffe6));
-}
-
-int32_t GetUnicharStringWidth(const nsString& aString) {
-  const char16_t* pwcs = aString.get();
-  int32_t n = aString.Length();
-
-  int32_t w, width = 0;
-
-  for (; *pwcs && n-- > 0; pwcs++)
-    if ((w = GetUnicharWidth(*pwcs)) < 0)
-      ++width;  // Taking 1 as the width of non-printable character, for bug#
-                // 94475.
-    else
-      width += w;
-
-  return width;
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsPlainTextSerializer.h firefox-85.0+build1/dom/base/nsPlainTextSerializer.h
--- firefox-84.0.2+build1/dom/base/nsPlainTextSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsPlainTextSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert a DOM into plaintext in a nice way
- * (eg for copy/paste as plaintext).
- */
-
-#ifndef nsPlainTextSerializer_h__
-#define nsPlainTextSerializer_h__
-
-#include "mozilla/Attributes.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/intl/LineBreaker.h"
-#include "nsCOMPtr.h"
-#include "nsAtom.h"
-#include "nsCycleCollectionParticipant.h"
-#include "nsIContentSerializer.h"
-#include "nsIDocumentEncoder.h"
-#include "nsString.h"
-#include "nsTArray.h"
-
-#include <stack>
-
-class nsIContent;
-
-namespace mozilla {
-namespace dom {
-class DocumentType;
-class Element;
-}  // namespace dom
-}  // namespace mozilla
-
-class nsPlainTextSerializer final : public nsIContentSerializer {
- public:
-  nsPlainTextSerializer();
-
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS(nsPlainTextSerializer)
-
-  // nsIContentSerializer
-  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
-                  const mozilla::Encoding* aEncoding, bool aIsCopying,
-                  bool aIsWholeDocument, bool* aNeedsPreformatScanning,
-                  nsAString& aOutput) override;
-
-  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
-                        int32_t aEndOffset) override;
-  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
-                                int32_t aEndOffset) override;
-  NS_IMETHOD AppendProcessingInstruction(
-      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
-      int32_t aEndOffset) override {
-    return NS_OK;
-  }
-  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
-                           int32_t aStartOffset, int32_t aEndOffset) override {
-    return NS_OK;
-  }
-  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) override {
-    return NS_OK;
-  }
-  NS_IMETHOD AppendElementStart(
-      mozilla::dom::Element* aElement,
-      mozilla::dom::Element* aOriginalElement) override;
-  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
-                              mozilla::dom::Element* aOriginalElement) override;
-
-  NS_IMETHOD FlushAndFinish() override;
-
-  NS_IMETHOD Finish() override;
-
-  NS_IMETHOD GetOutputLength(uint32_t& aLength) const override;
-
-  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
-
-  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) override;
-  NS_IMETHOD ForgetElementForPreformat(
-      mozilla::dom::Element* aElement) override;
-
- private:
-  ~nsPlainTextSerializer();
-
-  nsresult GetAttributeValue(const nsAtom* aName, nsString& aValueRet) const;
-  void AddToLine(const char16_t* aStringToAdd, int32_t aLength);
-
-  void MaybeWrapAndOutputCompleteLines();
-
-  // @param aSoftLineBreak A soft line break is a space followed by a linebreak
-  // (cf. https://www.ietf.org/rfc/rfc3676.txt, section 4.2).
-  void EndLine(bool aSoftLineBreak, bool aBreakBySpace = false);
-
-  void EnsureVerticalSpace(int32_t noOfRows);
-
-  void ConvertToLinesAndOutput(const nsAString& aString);
-
-  void Write(const nsAString& aString);
-
-  // @return true, iff the elements' whitespace and newline characters have to
-  //         be preserved according to its style or because it's a `<pre>`
-  //         element.
-  bool IsElementPreformatted() const;
-  bool IsInOL() const;
-  bool IsInOlOrUl() const;
-  bool IsCurrentNodeConverted() const;
-  bool MustSuppressLeaf() const;
-
-  /**
-   * Returns the local name of the element as an atom if the element is an
-   * HTML element and the atom is a static atom. Otherwise, nullptr is returned.
-   */
-  static nsAtom* GetIdForContent(nsIContent* aContent);
-  nsresult DoOpenContainer(const nsAtom* aTag);
-  void OpenContainerForOutputFormatted(const nsAtom* aTag);
-  nsresult DoCloseContainer(const nsAtom* aTag);
-  void CloseContainerForOutputFormatted(const nsAtom* aTag);
-  nsresult DoAddLeaf(const nsAtom* aTag);
-
-  void DoAddText();
-  // @param aText Ignored if aIsLineBreak is true.
-  void DoAddText(bool aIsLineBreak, const nsAString& aText);
-
-  inline bool DoOutput() const { return mHeadLevel == 0; }
-
-  static inline bool IsQuotedLine(const nsAString& aLine) {
-    return !aLine.IsEmpty() && aLine.First() == char16_t('>');
-  }
-
-  // Stack handling functions
-  bool GetLastBool(const nsTArray<bool>& aStack);
-  void SetLastBool(nsTArray<bool>& aStack, bool aValue);
-  void PushBool(nsTArray<bool>& aStack, bool aValue);
-  bool PopBool(nsTArray<bool>& aStack);
-
-  bool IsIgnorableRubyAnnotation(const nsAtom* aTag) const;
-
-  // @return true, iff the elements' whitespace and newline characters have to
-  //         be preserved according to its style or because it's a `<pre>`
-  //         element.
-  static bool IsElementPreformatted(mozilla::dom::Element* aElement);
-
-  // https://drafts.csswg.org/css-display/#block-level
-  static bool IsCssBlockLevelElement(mozilla::dom::Element* aElement);
-
- private:
-  uint32_t mHeadLevel;
-
-  class Settings {
-   public:
-    enum class HeaderStrategy {
-      kNoIndentation,
-      kIndentIncreasedWithHeaderLevel,
-      kNumberHeadingsAndIndentSlightly
-    };
-
-    // May adapt the flags.
-    //
-    // @param aFlags As defined in nsIDocumentEncoder.idl.
-    void Init(int32_t aFlags, uint32_t aWrapColumn);
-
-    // Pref: converter.html2txt.structs.
-    bool GetStructs() const { return mStructs; }
-
-    // Pref: converter.html2txt.header_strategy.
-    HeaderStrategy GetHeaderStrategy() const { return mHeaderStrategy; }
-
-    // @return As defined in nsIDocumentEncoder.idl.
-    int32_t GetFlags() const { return mFlags; }
-
-    // @param aFlag As defined in nsIDocumentEncoder.idl. May consist of
-    // multiple bitwise or'd flags.
-    bool HasFlag(int32_t aFlag) const { return mFlags & aFlag; }
-
-    // Whether the output should include ruby annotations.
-    bool GetWithRubyAnnotation() const { return mWithRubyAnnotation; }
-
-    uint32_t GetWrapColumn() const { return mWrapColumn; }
-
-    bool MayWrap() const {
-      return GetWrapColumn() && HasFlag(nsIDocumentEncoder::OutputFormatted |
-                                        nsIDocumentEncoder::OutputWrap);
-    }
-
-    bool MayBreakLines() const {
-      return !HasFlag(nsIDocumentEncoder::OutputDisallowLineBreaking);
-    }
-
-   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.
-    HeaderStrategy mHeaderStrategy =
-        HeaderStrategy::kIndentIncreasedWithHeaderLevel;
-
-    // Flags defined in nsIDocumentEncoder.idl.
-    int32_t mFlags = 0;
-
-    // Whether the output should include ruby annotations.
-    bool mWithRubyAnnotation = false;
-
-    // The wrap column is how many fixed-pitch narrow
-    // (https://unicode.org/reports/tr11/) (e.g. Latin) characters
-    // should be allowed on a line. There could be less chars if the chars
-    // are wider than latin chars of more if the chars are more narrow.
-    uint32_t mWrapColumn = 0;
-  };
-
-  Settings mSettings;
-
-  struct Indentation {
-    // 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;
-  };
-
-  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.IsEmpty() || !mIndentation.mHeader.IsEmpty();
-    }
-
-    // @param aContentWidth Has to be the unichar string width of mContent.
-    // @param aLineBreaker May be nullptr.
-    int32_t FindWrapIndexForContent(
-        uint32_t aWrapColumn, uint32_t aContentWidth,
-        mozilla::intl::LineBreaker* aLineBreaker) const;
-
-    // @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.mLength;
-    }
-
-    Indentation mIndentation;
-
-    // The number of '>' characters.
-    int32_t mCiteQuoteLevel = 0;
-
-    // Excludes indentation and quotes.
-    nsString mContent;
-  };
-
-  CurrentLine mCurrentLine;
-
-  class OutputManager {
-   public:
-    /**
-     *  @param aFlags As defined in nsIDocumentEncoder.idl.
-     *  @param aOutput An empty string.
-     */
-    OutputManager(int32_t aFlags, nsAString& aOutput);
-
-    enum class StripTrailingWhitespaces { kMaybe, kNo };
-
-    void Append(const CurrentLine& aCurrentLine,
-                StripTrailingWhitespaces aStripTrailingWhitespaces);
-
-    void AppendLineBreak();
-
-    /**
-     * This empties the current line cache without adding a NEWLINE.
-     * Should not be used if line wrapping is of importance since
-     * this function destroys the cache information.
-     *
-     * It will also write indentation and quotes if we believe us to be
-     * at the start of the line.
-     */
-    void Flush(CurrentLine& aCurrentLine);
-
-    bool IsAtFirstColumn() const { return mAtFirstColumn; }
-
-    uint32_t GetOutputLength() const;
-
-   private:
-    /**
-     * @param aString Last character is expected to not be a line break.
-     */
-    void Append(const nsAString& aString);
-
-    // As defined in nsIDocumentEncoder.idl.
-    const int32_t mFlags;
-
-    nsAString& mOutput;
-
-    bool mAtFirstColumn;
-
-    nsString mLineBreak;
-  };
-
-  mozilla::Maybe<OutputManager> mOutputManager;
-
-  // If we've just written out a cite blockquote, we need to remember it
-  // so we don't duplicate spaces before a <pre wrap> (which mail uses to quote
-  // old messages).
-  bool mHasWrittenCiteBlockquote;
-
-  int32_t mFloatingLines;  // To store the number of lazy line breaks
-
-  // Treat quoted text as though it's preformatted -- don't wrap it.
-  // Having it on a pref is a temporary measure, See bug 69638.
-  int32_t mSpanLevel;
-
-  int32_t mEmptyLines;  // Will be the number of empty lines before
-                        // the current. 0 if we are starting a new
-                        // line and -1 if we are in a line.
-
-  bool mInWhitespace;
-  bool mPreFormattedMail;  // we're dealing with special DOM
-                           // used by Thunderbird code.
-
-  // While handling a new tag, this variable should remind if any line break
-  // is due because of a closing tag. Setting it to "TRUE" while closing the
-  // tags. Hence opening tags are guaranteed to start with appropriate line
-  // breaks.
-  bool mLineBreakDue;
-
-  bool mPreformattedBlockBoundary;
-
-  int32_t mHeaderCounter[7]; /* For header-numbering:
-                                Number of previous headers of
-                                the same depth and in the same
-                                section.
-                                mHeaderCounter[1] for <h1> etc. */
-
-  RefPtr<mozilla::dom::Element> mElement;
-
-  // For handling table rows
-  AutoTArray<bool, 8> mHasWrittenCellsForRow;
-
-  // Values gotten in OpenContainer that is (also) needed in CloseContainer
-  AutoTArray<bool, 8> mIsInCiteBlockquote;
-
-  // The tag stack: the stack of tags we're operating on, so we can nest.
-  // The stack only ever points to static atoms, so they don't need to be
-  // refcounted.
-  const nsAtom** mTagStack;
-  uint32_t mTagStackIndex;
-
-  // The stack indicating whether the elements we've been operating on are
-  // CSS preformatted elements, so that we can tell if the text inside them
-  // should be formatted.
-  std::stack<bool> mPreformatStack;
-
-  // Content in the stack above this index should be ignored:
-  uint32_t mIgnoreAboveIndex;
-
-  // The stack for ordered lists
-  AutoTArray<int32_t, 100> mOLStack;
-
-  uint32_t mULCount;
-
-  RefPtr<mozilla::intl::LineBreaker> mLineBreaker;
-
-  // Conveniance constant. It would be nice to have it as a const static
-  // variable, but that causes issues with OpenBSD and module unloading.
-  const nsString kSpace;
-
-  // mIgnoredChildNodeLevel is used to tell if current node is an ignorable
-  // child node. The initial value of mIgnoredChildNodeLevel is 0. When
-  // serializer enters those specific nodes, mIgnoredChildNodeLevel increases
-  // and is greater than 0. Otherwise when serializer leaves those nodes,
-  // mIgnoredChildNodeLevel decreases.
-  uint32_t mIgnoredChildNodeLevel;
-};
-
-nsresult NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer);
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/base/nsPluginArray.cpp firefox-85.0+build1/dom/base/nsPluginArray.cpp
--- firefox-84.0.2+build1/dom/base/nsPluginArray.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsPluginArray.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsPluginTags.h"
 #include "nsIObserverService.h"
 #include "nsIWeakReference.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsQueryContentEventResult.cpp firefox-85.0+build1/dom/base/nsQueryContentEventResult.cpp
--- firefox-84.0.2+build1/dom/base/nsQueryContentEventResult.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsQueryContentEventResult.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -49,21 +49,21 @@
 NS_IMPL_RELEASE(nsQueryContentEventResult)
 
 nsQueryContentEventResult::nsQueryContentEventResult(
-    mozilla::WidgetQueryContentEvent& aEvent)
+    mozilla::WidgetQueryContentEvent&& aEvent)
     : mEventMessage(aEvent.mMessage),
-      mOffset(aEvent.mReply.mOffset),
-      mTentativeCaretOffset(aEvent.mReply.mTentativeCaretOffset),
-      mString(aEvent.mReply.mString),
-      mRect(aEvent.mReply.mRect),
-      mRectArray(std::move(aEvent.mReply.mRectArray)),
-      mSucceeded(aEvent.mSucceeded),
-      mReversed(aEvent.mReply.mReversed) {
+      mSucceeded(aEvent.Succeeded()),
+      mReversed(false) {
+  if (mSucceeded) {
+    mOffsetAndData = std::move(aEvent.mReply->mOffsetAndData);
+    mTentativeCaretOffset = std::move(aEvent.mReply->mTentativeCaretOffset);
+    mRect = std::move(aEvent.mReply->mRect);
+    mRectArray = std::move(aEvent.mReply->mRectArray);
+    mReversed = aEvent.mReply->mReversed;
+  }
   // Mark as result that is longer used.
-  aEvent.mSucceeded = false;
+  aEvent.mReply.reset();
 }
 
-nsQueryContentEventResult::~nsQueryContentEventResult() = default;
-
 NS_IMETHODIMP
 nsQueryContentEventResult::GetOffset(uint32_t* aOffset) {
   if (NS_WARN_IF(!mSucceeded)) {
@@ -91,7 +91,7 @@
     }
   }
 
-  *aOffset = mOffset;
+  *aOffset = mOffsetAndData->StartOffset();
   return NS_OK;
 }
 
@@ -105,7 +105,7 @@
   if (NS_WARN_IF(notFound)) {
     return NS_ERROR_NOT_AVAILABLE;
   }
-  *aOffset = mTentativeCaretOffset;
+  *aOffset = mTentativeCaretOffset.value();
   return NS_OK;
 }
 
@@ -160,7 +160,8 @@
                      mEventMessage == eQueryTextContent ||
                      mEventMessage == eQueryTextRect,
                  NS_ERROR_NOT_AVAILABLE);
-  aText = mString;
+  NS_ENSURE_TRUE(mOffsetAndData.isSome(), NS_ERROR_NOT_AVAILABLE);
+  aText = mOffsetAndData->DataRef();
   return NS_OK;
 }
 
@@ -177,7 +178,7 @@
       NS_WARN_IF(!IsNotFoundPropertyAvailable(mEventMessage))) {
     return NS_ERROR_NOT_AVAILABLE;
   }
-  *aNotFound = (mOffset == WidgetQueryContentEvent::NOT_FOUND);
+  *aNotFound = mOffsetAndData.isNothing();
   return NS_OK;
 }
 
@@ -189,7 +190,7 @@
   if (NS_WARN_IF(mEventMessage != eQueryCharacterAtPoint)) {
     return NS_ERROR_NOT_AVAILABLE;
   }
-  *aNotFound = (mTentativeCaretOffset == WidgetQueryContentEvent::NOT_FOUND);
+  *aNotFound = mTentativeCaretOffset.isNothing();
   return NS_OK;
 }
 
@@ -200,7 +201,7 @@
   NS_ENSURE_TRUE(mSucceeded, NS_ERROR_NOT_AVAILABLE);
   NS_ENSURE_TRUE(mEventMessage == eQueryTextRectArray, NS_ERROR_NOT_AVAILABLE);
 
-  if (NS_WARN_IF(mRectArray.Length() <= static_cast<uint32_t>(aOffset))) {
+  if (NS_WARN_IF(mRectArray.Length() <= static_cast<size_t>(aOffset))) {
     return NS_ERROR_FAILURE;
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/nsQueryContentEventResult.h firefox-85.0+build1/dom/base/nsQueryContentEventResult.h
--- firefox-84.0.2+build1/dom/base/nsQueryContentEventResult.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsQueryContentEventResult.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,30 +10,32 @@
 #include "nsIQueryContentEventResult.h"
 #include "nsString.h"
 #include "nsRect.h"
+#include "nsTArray.h"
 #include "Units.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/widget/IMEData.h"
 
 class nsIWidget;
 
 class nsQueryContentEventResult final : public nsIQueryContentEventResult {
  public:
-  explicit nsQueryContentEventResult(mozilla::WidgetQueryContentEvent& aEvent);
+  explicit nsQueryContentEventResult(mozilla::WidgetQueryContentEvent&& aEvent);
   NS_DECL_ISUPPORTS
   NS_DECL_NSIQUERYCONTENTEVENTRESULT
 
   void SetEventResult(nsIWidget* aWidget);
 
  protected:
-  ~nsQueryContentEventResult();
+  ~nsQueryContentEventResult() = default;
 
   mozilla::EventMessage mEventMessage;
 
-  uint32_t mOffset;
-  uint32_t mTentativeCaretOffset;
-  nsString mString;
+  mozilla::Maybe<mozilla::OffsetAndData<uint32_t>> mOffsetAndData;
+  mozilla::Maybe<uint32_t> mTentativeCaretOffset;
   mozilla::LayoutDeviceIntRect mRect;
-  nsTArray<mozilla::LayoutDeviceIntRect> mRectArray;
+  CopyableTArray<mozilla::LayoutDeviceIntRect> mRectArray;
 
   bool mSucceeded;
   bool mReversed;
diff -Nru firefox-84.0.2+build1/dom/base/nsRange.h firefox-85.0+build1/dom/base/nsRange.h
--- firefox-84.0.2+build1/dom/base/nsRange.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsRange.h	2021-01-18 19:58:09.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/RangeBoundary.h"
+#include "mozilla/WeakPtr.h"
 
 namespace mozilla {
 class RectCallback;
diff -Nru firefox-84.0.2+build1/dom/base/nsStructuredCloneContainer.cpp firefox-85.0+build1/dom/base/nsStructuredCloneContainer.cpp
--- firefox-84.0.2+build1/dom/base/nsStructuredCloneContainer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsStructuredCloneContainer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,17 +6,24 @@
 
 #include "nsStructuredCloneContainer.h"
 
+#include <cstddef>
+#include <utility>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
+#include "js/StructuredClone.h"
+#include "js/Value.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Base64.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/fallible.h"
 #include "nsCOMPtr.h"
-#include "nsIGlobalObject.h"
+#include "nsDebug.h"
+#include "nsError.h"
 #include "nsIVariant.h"
 #include "nsIXPConnect.h"
-#include "nsServiceManagerUtils.h"
-#include "nsContentUtils.h"
-#include "jsapi.h"
-#include "xpcpublic.h"
-
-#include "mozilla/Base64.h"
-#include "mozilla/dom/ScriptSettings.h"
+#include "nsString.h"
+#include "nscore.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/nsStructuredCloneContainer.h firefox-85.0+build1/dom/base/nsStructuredCloneContainer.h
--- firefox-84.0.2+build1/dom/base/nsStructuredCloneContainer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsStructuredCloneContainer.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,9 +7,12 @@
 #ifndef nsStructuredCloneContainer_h__
 #define nsStructuredCloneContainer_h__
 
-#include "nsIStructuredCloneContainer.h"
-#include "mozilla/Attributes.h"
+#include <cstdint>
 #include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "nsIStructuredCloneContainer.h"
+#include "nsISupports.h"
+
+class nsIVariant;
 
 #define NS_STRUCTUREDCLONECONTAINER_CONTRACTID \
   "@mozilla.org/docshell/structured-clone-container;1"
diff -Nru firefox-84.0.2+build1/dom/base/nsStubDocumentObserver.cpp firefox-85.0+build1/dom/base/nsStubDocumentObserver.cpp
--- firefox-84.0.2+build1/dom/base/nsStubDocumentObserver.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsStubDocumentObserver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,8 @@
 
 #include "nsStubDocumentObserver.h"
 
+#include "mozilla/EventStates.h"
+
 NS_IMPL_NSIDOCUMENTOBSERVER_CORE_STUB(nsStubDocumentObserver)
 NS_IMPL_NSIDOCUMENTOBSERVER_LOAD_STUB(nsStubDocumentObserver)
 NS_IMPL_NSIDOCUMENTOBSERVER_STATE_STUB(nsStubDocumentObserver)
diff -Nru firefox-84.0.2+build1/dom/base/nsStyledElement.cpp firefox-85.0+build1/dom/base/nsStyledElement.cpp
--- firefox-84.0.2+build1/dom/base/nsStyledElement.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsStyledElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsGkAtoms.h"
 #include "nsAttrValue.h"
 #include "nsAttrValueInlines.h"
+#include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/MutationObservers.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsStyledElement.h firefox-85.0+build1/dom/base/nsStyledElement.h
--- firefox-84.0.2+build1/dom/base/nsStyledElement.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsStyledElement.h	2021-01-18 19:58:08.000000000 +0000
@@ -14,11 +14,12 @@
 #define __NS_STYLEDELEMENT_H_
 
 #include "mozilla/Attributes.h"
-#include "nsString.h"
 #include "mozilla/dom/Element.h"
+#include "nsString.h"
 
 namespace mozilla {
 class DeclarationBlock;
+struct MutationClosureData;
 }  // namespace mozilla
 
 // IID for nsStyledElement interface
diff -Nru firefox-84.0.2+build1/dom/base/nsSyncLoadService.cpp firefox-85.0+build1/dom/base/nsSyncLoadService.cpp
--- firefox-84.0.2+build1/dom/base/nsSyncLoadService.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsSyncLoadService.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsString.h"
 #include "nsWeakReference.h"
 #include "mozilla/dom/Document.h"
+#include "nsIHttpChannel.h"
 #include "nsIPrincipal.h"
 #include "nsContentUtils.h"  // for kLoadAsData
 #include "nsThreadUtils.h"
diff -Nru firefox-84.0.2+build1/dom/base/nsTextFragmentVMX.cpp firefox-85.0+build1/dom/base/nsTextFragmentVMX.cpp
--- firefox-84.0.2+build1/dom/base/nsTextFragmentVMX.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsTextFragmentVMX.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nscore.h"
 #include "nsAlgorithm.h"
 #include "nsTextFragmentImpl.h"
+#include <algorithm>
 #include <altivec.h>
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/base/nsTraversal.h firefox-85.0+build1/dom/base/nsTraversal.h
--- firefox-84.0.2+build1/dom/base/nsTraversal.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsTraversal.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,11 +13,14 @@
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/CallbackObject.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/NodeFilterBinding.h"
 
 class nsINode;
 
+namespace mozilla {
+class ErrorResult;
+}
+
 class nsTraversal {
  public:
   nsTraversal(nsINode* aRoot, uint32_t aWhatToShow,
diff -Nru firefox-84.0.2+build1/dom/base/nsTreeSanitizer.cpp firefox-85.0+build1/dom/base/nsTreeSanitizer.cpp
--- firefox-84.0.2+build1/dom/base/nsTreeSanitizer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsTreeSanitizer.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsTreeSanitizer.h"
 
+#include "mozilla/Algorithm.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/BindingStyleRule.h"
 #include "mozilla/DeclarationBlock.h"
@@ -27,6 +28,8 @@
 #include "mozilla/dom/Document.h"
 #include "nsQueryObject.h"
 
+#include <iterator>
+
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -380,7 +383,7 @@
     // vkern
     nullptr};
 
-const nsStaticAtom* const kAttributesSVG[] = {
+constexpr const nsStaticAtom* const kAttributesSVG[] = {
     // accent-height
     nsGkAtoms::accumulate,          // accumulate
     nsGkAtoms::additive,            // additive
@@ -454,6 +457,7 @@
     nsGkAtoms::gradientTransform,  // gradientTransform
     nsGkAtoms::gradientUnits,      // gradientUnits
     nsGkAtoms::height,             // height
+    nsGkAtoms::href,
     // horiz-adv-x
     // horiz-origin-x
     // horiz-origin-y
@@ -613,7 +617,17 @@
     nsGkAtoms::zoomAndPan,        // zoomAndPan
     nullptr};
 
-const nsStaticAtom* const kURLAttributesSVG[] = {nsGkAtoms::href, nullptr};
+constexpr const nsStaticAtom* const kURLAttributesSVG[] = {nsGkAtoms::href,
+                                                           nullptr};
+
+static_assert(AllOf(std::begin(kURLAttributesSVG), std::end(kURLAttributesSVG),
+                    [](auto aURLAttributeSVG) {
+                      return AnyOf(std::begin(kAttributesSVG),
+                                   std::end(kAttributesSVG),
+                                   [&](auto aAttributeSVG) {
+                                     return aAttributeSVG == aURLAttributeSVG;
+                                   });
+                    }));
 
 const nsStaticAtom* const kElementsMathML[] = {
     nsGkAtoms::abs_,                  // abs
diff -Nru firefox-84.0.2+build1/dom/base/nsTreeSanitizer.h firefox-85.0+build1/dom/base/nsTreeSanitizer.h
--- firefox-84.0.2+build1/dom/base/nsTreeSanitizer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsTreeSanitizer.h	2021-01-18 19:58:08.000000000 +0000
@@ -5,10 +5,22 @@
 #ifndef nsTreeSanitizer_h_
 #define nsTreeSanitizer_h_
 
+#include "nsAtom.h"
+#include "nsHashKeys.h"
 #include "nsIPrincipal.h"
-#include "mozilla/dom/Element.h"
+#include "nsTHashtable.h"
 
 class nsIContent;
+class nsINode;
+
+namespace mozilla {
+class DeclarationBlock;
+}
+
+namespace mozilla::dom {
+class DocumentFragment;
+class Element;
+}  // namespace mozilla::dom
 
 /**
  * See the documentation of nsIParserUtils::sanitize for documentation
diff -Nru firefox-84.0.2+build1/dom/base/nsWrapperCache.cpp firefox-85.0+build1/dom/base/nsWrapperCache.cpp
--- firefox-84.0.2+build1/dom/base/nsWrapperCache.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsWrapperCache.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsWrapperCacheInlines.h"
 
+#include "jsfriendapi.h"
 #include "js/Class.h"
 #include "js/Proxy.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
@@ -52,6 +53,12 @@
 
 #ifdef DEBUG
 
+void nsWrapperCache::AssertUpdatedWrapperZone(const JSObject* aNewObject,
+                                              const JSObject* aOldObject) {
+  MOZ_ASSERT(js::GetObjectZoneFromAnyThread(aNewObject) ==
+             js::GetObjectZoneFromAnyThread(aOldObject));
+}
+
 class DebugWrapperTraversalCallback
     : public nsCycleCollectionTraversalCallback {
  public:
diff -Nru firefox-84.0.2+build1/dom/base/nsWrapperCache.h firefox-85.0+build1/dom/base/nsWrapperCache.h
--- firefox-84.0.2+build1/dom/base/nsWrapperCache.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsWrapperCache.h	2021-01-18 19:58:08.000000000 +0000
@@ -9,11 +9,11 @@
 
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Assertions.h"
-#include "js/Id.h"     // must come before js/RootingAPI.h
-#include "js/Value.h"  // must come before js/RootingAPI.h
-#include "js/RootingAPI.h"
+#include "js/HeapAPI.h"
 #include "js/TracingAPI.h"
-#include "jsfriendapi.h"
+#include "js/TypeDecls.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -143,6 +143,9 @@
  private:
   static bool HasJSObjectMovedOp(JSObject* aWrapper);
 
+  static void AssertUpdatedWrapperZone(const JSObject* aNewObject,
+                                       const JSObject* aOldObject);
+
  public:
 #endif
 
@@ -191,8 +194,9 @@
    * any wrapper cached object.
    */
   void UpdateWrapper(JSObject* aNewObject, const JSObject* aOldObject) {
-    MOZ_ASSERT(js::GetObjectZoneFromAnyThread(aNewObject) ==
-               js::GetObjectZoneFromAnyThread(aOldObject));
+#ifdef DEBUG
+    AssertUpdatedWrapperZone(aNewObject, aOldObject);
+#endif
     if (mWrapper) {
       MOZ_ASSERT(mWrapper == aOldObject);
       mWrapper = aNewObject;
diff -Nru firefox-84.0.2+build1/dom/base/nsWrapperCacheInlines.h firefox-85.0+build1/dom/base/nsWrapperCacheInlines.h
--- firefox-84.0.2+build1/dom/base/nsWrapperCacheInlines.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsWrapperCacheInlines.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #define nsWrapperCacheInline_h___
 
 #include "nsWrapperCache.h"
+#include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
 
 inline JSObject* nsWrapperCache::GetWrapperPreserveColor() const {
diff -Nru firefox-84.0.2+build1/dom/base/nsXHTMLContentSerializer.cpp firefox-85.0+build1/dom/base/nsXHTMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/base/nsXHTMLContentSerializer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsXHTMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,731 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an XHTML (not HTML!) DOM to an XHTML
- * string that could be parsed into more or less the original DOM.
- */
-
-#include "nsXHTMLContentSerializer.h"
-
-#include "mozilla/dom/Element.h"
-#include "nsIContent.h"
-#include "mozilla/dom/Document.h"
-#include "nsElementTable.h"
-#include "nsNameSpaceManager.h"
-#include "nsString.h"
-#include "nsUnicharUtils.h"
-#include "nsIDocumentEncoder.h"
-#include "nsGkAtoms.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsEscape.h"
-#include "nsCRT.h"
-#include "nsContentUtils.h"
-#include "nsIScriptElement.h"
-#include "nsStubMutationObserver.h"
-#include "nsAttrName.h"
-#include "nsComputedDOMStyle.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-
-static const int32_t kLongLineLen = 128;
-
-#define kXMLNS "xmlns"
-
-nsresult NS_NewXHTMLContentSerializer(nsIContentSerializer** aSerializer) {
-  RefPtr<nsXHTMLContentSerializer> it = new nsXHTMLContentSerializer();
-  it.forget(aSerializer);
-  return NS_OK;
-}
-
-nsXHTMLContentSerializer::nsXHTMLContentSerializer()
-    : mIsHTMLSerializer(false),
-      mIsCopying(false),
-      mDisableEntityEncoding(0),
-      mRewriteEncodingDeclaration(false),
-      mIsFirstChildOfOL(false) {}
-
-nsXHTMLContentSerializer::~nsXHTMLContentSerializer() {
-  NS_ASSERTION(mOLStateStack.IsEmpty(), "Expected OL State stack to be empty");
-}
-
-NS_IMETHODIMP
-nsXHTMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,
-                               const Encoding* aEncoding, bool aIsCopying,
-                               bool aRewriteEncodingDeclaration,
-                               bool* aNeedsPreformatScanning,
-                               nsAString& aOutput) {
-  // The previous version of the HTML serializer did implicit wrapping
-  // when there is no flags, so we keep wrapping in order to keep
-  // compatibility with the existing calling code
-  // XXXLJ perhaps should we remove this default settings later ?
-  if (aFlags & nsIDocumentEncoder::OutputFormatted) {
-    aFlags = aFlags | nsIDocumentEncoder::OutputWrap;
-  }
-
-  nsresult rv;
-  rv = nsXMLContentSerializer::Init(aFlags, aWrapColumn, aEncoding, aIsCopying,
-                                    aRewriteEncodingDeclaration,
-                                    aNeedsPreformatScanning, aOutput);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mRewriteEncodingDeclaration = aRewriteEncodingDeclaration;
-  mIsCopying = aIsCopying;
-  mIsFirstChildOfOL = false;
-  mInBody = 0;
-  mDisableEntityEncoding = 0;
-  mBodyOnly = (mFlags & nsIDocumentEncoder::OutputBodyOnly);
-
-  return NS_OK;
-}
-
-// See if the string has any lines longer than longLineLen:
-// if so, we presume formatting is wonky (e.g. the node has been edited)
-// and we'd better rewrap the whole text node.
-bool nsXHTMLContentSerializer::HasLongLines(const nsString& text,
-                                            int32_t& aLastNewlineOffset) {
-  uint32_t start = 0;
-  uint32_t theLen = text.Length();
-  bool rv = false;
-  aLastNewlineOffset = kNotFound;
-  for (start = 0; start < theLen;) {
-    int32_t eol = text.FindChar('\n', start);
-    if (eol < 0) {
-      eol = text.Length();
-    } else {
-      aLastNewlineOffset = eol;
-    }
-    if (int32_t(eol - start) > kLongLineLen) rv = true;
-    start = eol + 1;
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsXHTMLContentSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
-                                     int32_t aEndOffset) {
-  NS_ENSURE_ARG(aText);
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString data;
-  nsresult rv;
-
-  rv = AppendTextData(aText, aStartOffset, aEndOffset, data, true);
-  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoFormat) {
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    int32_t lastNewlineOffset = kNotFound;
-    if (HasLongLines(data, lastNewlineOffset)) {
-      // We have long lines, rewrap
-      mDoWrap = true;
-      bool result = AppendToStringWrapped(data, *mOutput);
-      mDoWrap = false;
-      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
-    } else {
-      NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-  }
-
-  return NS_OK;
-}
-
-bool nsXHTMLContentSerializer::SerializeAttributes(
-    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
-    const nsAString& aTagNamespaceURI, nsAtom* aTagName, nsAString& aStr,
-    uint32_t aSkipAttr, bool aAddNSAttr) {
-  nsresult rv;
-  uint32_t index, count;
-  nsAutoString prefixStr, uriStr, valueStr;
-  nsAutoString xmlnsStr;
-  xmlnsStr.AssignLiteral(kXMLNS);
-
-  int32_t contentNamespaceID = aElement->GetNameSpaceID();
-
-  MaybeSerializeIsValue(aElement, aStr);
-
-  // this method is not called by nsHTMLContentSerializer
-  // so we don't have to check HTML element, just XHTML
-
-  if (mIsCopying && kNameSpaceID_XHTML == contentNamespaceID) {
-    // Need to keep track of OL and LI elements in order to get ordinal number
-    // for the LI.
-    if (aTagName == nsGkAtoms::ol) {
-      // We are copying and current node is an OL;
-      // Store its start attribute value in olState->startVal.
-      nsAutoString start;
-      int32_t startAttrVal = 0;
-      aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::start, start);
-      if (!start.IsEmpty()) {
-        nsresult rv = NS_OK;
-        startAttrVal = start.ToInteger(&rv);
-        // If OL has "start" attribute, first LI element has to start with that
-        // value Therefore subtracting 1 as all the LI elements are incrementing
-        // it before using it; In failure of ToInteger(), default StartAttrValue
-        // to 0.
-        if (NS_SUCCEEDED(rv))
-          --startAttrVal;
-        else
-          startAttrVal = 0;
-      }
-      olState state(startAttrVal, true);
-      mOLStateStack.AppendElement(state);
-    } else if (aTagName == nsGkAtoms::li) {
-      mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement);
-      if (mIsFirstChildOfOL) {
-        // If OL is parent of this LI, serialize attributes in different manner.
-        NS_ENSURE_TRUE(SerializeLIValueAttribute(aElement, aStr), false);
-      }
-    }
-  }
-
-  // If we had to add a new namespace declaration, serialize
-  // and push it on the namespace stack
-  if (aAddNSAttr) {
-    if (aTagPrefix.IsEmpty()) {
-      // Serialize default namespace decl
-      NS_ENSURE_TRUE(
-          SerializeAttr(u""_ns, xmlnsStr, aTagNamespaceURI, aStr, true), false);
-    } else {
-      // Serialize namespace decl
-      NS_ENSURE_TRUE(
-          SerializeAttr(xmlnsStr, aTagPrefix, aTagNamespaceURI, aStr, true),
-          false);
-    }
-    PushNameSpaceDecl(aTagPrefix, aTagNamespaceURI, aOriginalElement);
-  }
-
-  count = aElement->GetAttrCount();
-
-  // Now serialize each of the attributes
-  // XXX Unfortunately we need a namespace manager to get
-  // attribute URIs.
-  for (index = 0; index < count; index++) {
-    if (aSkipAttr == index) {
-      continue;
-    }
-
-    dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
-    const nsAttrName* name = info.mName;
-
-    int32_t namespaceID = name->NamespaceID();
-    nsAtom* attrName = name->LocalName();
-    nsAtom* attrPrefix = name->GetPrefix();
-
-    // Filter out any attribute starting with [-|_]moz
-    nsDependentAtomString attrNameStr(attrName);
-    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
-        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
-      continue;
-    }
-
-    if (attrPrefix) {
-      attrPrefix->ToString(prefixStr);
-    } else {
-      prefixStr.Truncate();
-    }
-
-    bool addNSAttr = false;
-    if (kNameSpaceID_XMLNS != namespaceID) {
-      nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, uriStr);
-      addNSAttr = ConfirmPrefix(prefixStr, uriStr, aOriginalElement, true);
-    }
-
-    info.mValue->ToString(valueStr);
-
-    nsDependentAtomString nameStr(attrName);
-    bool isJS = false;
-
-    if (kNameSpaceID_XHTML == contentNamespaceID) {
-      if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsGkAtoms::li) &&
-          (attrName == nsGkAtoms::value)) {
-        // This is handled separately in SerializeLIValueAttribute()
-        continue;
-      }
-
-      isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
-
-      if (namespaceID == kNameSpaceID_None &&
-          ((attrName == nsGkAtoms::href) || (attrName == nsGkAtoms::src))) {
-        // Make all links absolute when converting only the selection:
-        if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
-          // Would be nice to handle OBJECT tags,
-          // but that gets more complicated since we have to
-          // search the tag list for CODEBASE as well.
-          // For now, just leave them relative.
-          nsIURI* uri = aElement->GetBaseURI();
-          if (uri) {
-            nsAutoString absURI;
-            rv = NS_MakeAbsoluteURI(absURI, valueStr, uri);
-            if (NS_SUCCEEDED(rv)) {
-              valueStr = absURI;
-            }
-          }
-        }
-      }
-
-      if (mRewriteEncodingDeclaration && aTagName == nsGkAtoms::meta &&
-          attrName == nsGkAtoms::content) {
-        // If we're serializing a <meta http-equiv="content-type">,
-        // use the proper value, rather than what's in the document.
-        nsAutoString header;
-        aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv, header);
-        if (header.LowerCaseEqualsLiteral("content-type")) {
-          valueStr =
-              u"text/html; charset="_ns + NS_ConvertASCIItoUTF16(mCharset);
-        }
-      }
-
-      // Expand shorthand attribute.
-      if (namespaceID == kNameSpaceID_None &&
-          IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) {
-        valueStr = nameStr;
-      }
-    } else {
-      isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
-    }
-
-    NS_ENSURE_TRUE(SerializeAttr(prefixStr, nameStr, valueStr, aStr, !isJS),
-                   false);
-
-    if (addNSAttr) {
-      NS_ASSERTION(!prefixStr.IsEmpty(),
-                   "Namespaced attributes must have a prefix");
-      NS_ENSURE_TRUE(SerializeAttr(xmlnsStr, prefixStr, uriStr, aStr, true),
-                     false);
-      PushNameSpaceDecl(prefixStr, uriStr, aOriginalElement);
-    }
-  }
-
-  return true;
-}
-
-bool nsXHTMLContentSerializer::AfterElementStart(nsIContent* aContent,
-                                                 nsIContent* aOriginalElement,
-                                                 nsAString& aStr) {
-  if (mRewriteEncodingDeclaration && aContent->IsHTMLElement(nsGkAtoms::head)) {
-    // Check if there already are any content-type meta children.
-    // If there are, they will be modified to use the correct charset.
-    // If there aren't, we'll insert one here.
-    bool hasMeta = false;
-    for (nsIContent* child = aContent->GetFirstChild(); child;
-         child = child->GetNextSibling()) {
-      if (child->IsHTMLElement(nsGkAtoms::meta) &&
-          child->AsElement()->HasAttr(kNameSpaceID_None, nsGkAtoms::content)) {
-        nsAutoString header;
-        child->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv,
-                                    header);
-
-        if (header.LowerCaseEqualsLiteral("content-type")) {
-          hasMeta = true;
-          break;
-        }
-      }
-    }
-
-    if (!hasMeta) {
-      NS_ENSURE_TRUE(AppendNewLineToString(aStr), false);
-      if (mDoFormat) {
-        NS_ENSURE_TRUE(AppendIndentation(aStr), false);
-      }
-      NS_ENSURE_TRUE(
-          AppendToString(u"<meta http-equiv=\"content-type\""_ns, aStr), false);
-      NS_ENSURE_TRUE(AppendToString(u" content=\"text/html; charset="_ns, aStr),
-                     false);
-      NS_ENSURE_TRUE(AppendToString(NS_ConvertASCIItoUTF16(mCharset), aStr),
-                     false);
-      if (mIsHTMLSerializer) {
-        NS_ENSURE_TRUE(AppendToString(u"\">"_ns, aStr), false);
-      } else {
-        NS_ENSURE_TRUE(AppendToString(u"\" />"_ns, aStr), false);
-      }
-    }
-  }
-
-  return true;
-}
-
-void nsXHTMLContentSerializer::AfterElementEnd(nsIContent* aContent,
-                                               nsAString& aStr) {
-  NS_ASSERTION(!mIsHTMLSerializer,
-               "nsHTMLContentSerializer shouldn't call this method !");
-
-  // this method is not called by nsHTMLContentSerializer
-  // so we don't have to check HTML element, just XHTML
-  if (aContent->IsHTMLElement(nsGkAtoms::body)) {
-    --mInBody;
-  }
-}
-
-NS_IMETHODIMP
-nsXHTMLContentSerializer::AppendDocumentStart(Document* aDocument) {
-  if (!mBodyOnly) {
-    return nsXMLContentSerializer::AppendDocumentStart(aDocument);
-  }
-
-  return NS_OK;
-}
-
-bool nsXHTMLContentSerializer::CheckElementStart(Element* aElement,
-                                                 bool& aForceFormat,
-                                                 nsAString& aStr,
-                                                 nsresult& aResult) {
-  aResult = NS_OK;
-
-  // The _moz_dirty attribute is emitted by the editor to
-  // indicate that this element should be pretty printed
-  // even if we're not in pretty printing mode
-  aForceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
-                 aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
-
-  if (aElement->IsHTMLElement(nsGkAtoms::br) &&
-      (mFlags & nsIDocumentEncoder::OutputNoFormattingInPre) &&
-      PreLevel() > 0) {
-    aResult = AppendNewLineToString(aStr) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-    return false;
-  }
-
-  if (aElement->IsHTMLElement(nsGkAtoms::body)) {
-    ++mInBody;
-  }
-
-  return true;
-}
-
-bool nsXHTMLContentSerializer::CheckElementEnd(Element* aElement,
-                                               Element* aOriginalElement,
-                                               bool& aForceFormat,
-                                               nsAString& aStr) {
-  NS_ASSERTION(!mIsHTMLSerializer,
-               "nsHTMLContentSerializer shouldn't call this method !");
-
-  aForceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
-                 aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
-
-  if (mIsCopying && aElement->IsHTMLElement(nsGkAtoms::ol)) {
-    NS_ASSERTION((!mOLStateStack.IsEmpty()), "Cannot have an empty OL Stack");
-    /* Though at this point we must always have an state to be deleted as all
-       the OL opening tags are supposed to push an olState object to the stack*/
-    if (!mOLStateStack.IsEmpty()) {
-      mOLStateStack.RemoveLastElement();
-    }
-  }
-
-  bool dummyFormat;
-  return nsXMLContentSerializer::CheckElementEnd(aElement, aOriginalElement,
-                                                 dummyFormat, aStr);
-}
-
-bool nsXHTMLContentSerializer::AppendAndTranslateEntities(
-    const nsAString& aStr, nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-
-  if (mDisableEntityEncoding) {
-    return aOutputStr.Append(aStr, fallible);
-  }
-
-  return nsXMLContentSerializer::AppendAndTranslateEntities(aStr, aOutputStr);
-}
-
-bool nsXHTMLContentSerializer::IsShorthandAttr(const nsAtom* aAttrName,
-                                               const nsAtom* aElementName) {
-  // checked
-  if ((aAttrName == nsGkAtoms::checked) && (aElementName == nsGkAtoms::input)) {
-    return true;
-  }
-
-  // compact
-  if ((aAttrName == nsGkAtoms::compact) &&
-      (aElementName == nsGkAtoms::dir || aElementName == nsGkAtoms::dl ||
-       aElementName == nsGkAtoms::menu || aElementName == nsGkAtoms::ol ||
-       aElementName == nsGkAtoms::ul)) {
-    return true;
-  }
-
-  // declare
-  if ((aAttrName == nsGkAtoms::declare) &&
-      (aElementName == nsGkAtoms::object)) {
-    return true;
-  }
-
-  // defer
-  if ((aAttrName == nsGkAtoms::defer) && (aElementName == nsGkAtoms::script)) {
-    return true;
-  }
-
-  // disabled
-  if ((aAttrName == nsGkAtoms::disabled) &&
-      (aElementName == nsGkAtoms::button || aElementName == nsGkAtoms::input ||
-       aElementName == nsGkAtoms::optgroup ||
-       aElementName == nsGkAtoms::option || aElementName == nsGkAtoms::select ||
-       aElementName == nsGkAtoms::textarea)) {
-    return true;
-  }
-
-  // ismap
-  if ((aAttrName == nsGkAtoms::ismap) &&
-      (aElementName == nsGkAtoms::img || aElementName == nsGkAtoms::input)) {
-    return true;
-  }
-
-  // multiple
-  if ((aAttrName == nsGkAtoms::multiple) &&
-      (aElementName == nsGkAtoms::select)) {
-    return true;
-  }
-
-  // noresize
-  if ((aAttrName == nsGkAtoms::noresize) &&
-      (aElementName == nsGkAtoms::frame)) {
-    return true;
-  }
-
-  // noshade
-  if ((aAttrName == nsGkAtoms::noshade) && (aElementName == nsGkAtoms::hr)) {
-    return true;
-  }
-
-  // nowrap
-  if ((aAttrName == nsGkAtoms::nowrap) &&
-      (aElementName == nsGkAtoms::td || aElementName == nsGkAtoms::th)) {
-    return true;
-  }
-
-  // readonly
-  if ((aAttrName == nsGkAtoms::readonly) &&
-      (aElementName == nsGkAtoms::input ||
-       aElementName == nsGkAtoms::textarea)) {
-    return true;
-  }
-
-  // selected
-  if ((aAttrName == nsGkAtoms::selected) &&
-      (aElementName == nsGkAtoms::option)) {
-    return true;
-  }
-
-  // autoplay and controls
-  if ((aElementName == nsGkAtoms::video || aElementName == nsGkAtoms::audio) &&
-      (aAttrName == nsGkAtoms::autoplay || aAttrName == nsGkAtoms::muted ||
-       aAttrName == nsGkAtoms::controls)) {
-    return true;
-  }
-
-  return false;
-}
-
-bool nsXHTMLContentSerializer::LineBreakBeforeOpen(int32_t aNamespaceID,
-                                                   nsAtom* aName) {
-  if (aNamespaceID != kNameSpaceID_XHTML) {
-    return mAddSpace;
-  }
-
-  if (aName == nsGkAtoms::title || aName == nsGkAtoms::meta ||
-      aName == nsGkAtoms::link || aName == nsGkAtoms::style ||
-      aName == nsGkAtoms::select || aName == nsGkAtoms::option ||
-      aName == nsGkAtoms::script || aName == nsGkAtoms::html) {
-    return true;
-  }
-
-  return nsHTMLElement::IsBlock(nsHTMLTags::CaseSensitiveAtomTagToId(aName));
-}
-
-bool nsXHTMLContentSerializer::LineBreakAfterOpen(int32_t aNamespaceID,
-                                                  nsAtom* aName) {
-  if (aNamespaceID != kNameSpaceID_XHTML) {
-    return false;
-  }
-
-  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
-      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::ul) ||
-      (aName == nsGkAtoms::ol) || (aName == nsGkAtoms::dl) ||
-      (aName == nsGkAtoms::table) || (aName == nsGkAtoms::tbody) ||
-      (aName == nsGkAtoms::tr) || (aName == nsGkAtoms::br) ||
-      (aName == nsGkAtoms::meta) || (aName == nsGkAtoms::link) ||
-      (aName == nsGkAtoms::script) || (aName == nsGkAtoms::select) ||
-      (aName == nsGkAtoms::map) || (aName == nsGkAtoms::area) ||
-      (aName == nsGkAtoms::style)) {
-    return true;
-  }
-
-  return false;
-}
-
-bool nsXHTMLContentSerializer::LineBreakBeforeClose(int32_t aNamespaceID,
-                                                    nsAtom* aName) {
-  if (aNamespaceID != kNameSpaceID_XHTML) {
-    return false;
-  }
-
-  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
-      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::ul) ||
-      (aName == nsGkAtoms::ol) || (aName == nsGkAtoms::dl) ||
-      (aName == nsGkAtoms::select) || (aName == nsGkAtoms::table) ||
-      (aName == nsGkAtoms::tbody)) {
-    return true;
-  }
-  return false;
-}
-
-bool nsXHTMLContentSerializer::LineBreakAfterClose(int32_t aNamespaceID,
-                                                   nsAtom* aName) {
-  if (aNamespaceID != kNameSpaceID_XHTML) {
-    return false;
-  }
-
-  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
-      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::tr) ||
-      (aName == nsGkAtoms::th) || (aName == nsGkAtoms::td) ||
-      (aName == nsGkAtoms::title) || (aName == nsGkAtoms::dt) ||
-      (aName == nsGkAtoms::dd) || (aName == nsGkAtoms::select) ||
-      (aName == nsGkAtoms::option) || (aName == nsGkAtoms::map)) {
-    return true;
-  }
-
-  return nsHTMLElement::IsBlock(nsHTMLTags::CaseSensitiveAtomTagToId(aName));
-}
-
-void nsXHTMLContentSerializer::MaybeEnterInPreContent(nsIContent* aNode) {
-  if (!ShouldMaintainPreLevel() || !aNode->IsHTMLElement()) {
-    return;
-  }
-
-  if (IsElementPreformatted(aNode) ||
-      aNode->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style,
-                                 nsGkAtoms::noscript, nsGkAtoms::noframes)) {
-    PreLevel()++;
-  }
-}
-
-void nsXHTMLContentSerializer::MaybeLeaveFromPreContent(nsIContent* aNode) {
-  if (!ShouldMaintainPreLevel() || !aNode->IsHTMLElement()) {
-    return;
-  }
-
-  if (IsElementPreformatted(aNode) ||
-      aNode->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style,
-                                 nsGkAtoms::noscript, nsGkAtoms::noframes)) {
-    --PreLevel();
-  }
-}
-
-bool nsXHTMLContentSerializer::IsElementPreformatted(nsIContent* aNode) {
-  MOZ_ASSERT(ShouldMaintainPreLevel(),
-             "We should not be calling this needlessly");
-
-  if (!aNode->IsElement()) {
-    return false;
-  }
-  RefPtr<ComputedStyle> computedStyle =
-      nsComputedDOMStyle::GetComputedStyleNoFlush(aNode->AsElement(), nullptr);
-  if (computedStyle) {
-    const nsStyleText* textStyle = computedStyle->StyleText();
-    return textStyle->WhiteSpaceOrNewlineIsSignificant();
-  }
-  return false;
-}
-
-bool nsXHTMLContentSerializer::SerializeLIValueAttribute(nsIContent* aElement,
-                                                         nsAString& aStr) {
-  // We are copying and we are at the "first" LI node of OL in selected range.
-  // It may not be the first LI child of OL but it's first in the selected
-  // range. Note that we get into this condition only once per a OL.
-  bool found = false;
-  nsAutoString valueStr;
-
-  olState state(0, false);
-
-  if (!mOLStateStack.IsEmpty()) {
-    state = mOLStateStack[mOLStateStack.Length() - 1];
-    // isFirstListItem should be true only before the serialization of the
-    // first item in the list.
-    state.isFirstListItem = false;
-    mOLStateStack[mOLStateStack.Length() - 1] = state;
-  }
-
-  int32_t startVal = state.startVal;
-  int32_t offset = 0;
-
-  // Traverse previous siblings until we find one with "value" attribute.
-  // offset keeps track of how many previous siblings we had to traverse.
-  nsIContent* currNode = aElement;
-  while (currNode && !found) {
-    if (currNode->IsHTMLElement(nsGkAtoms::li)) {
-      currNode->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::value,
-                                     valueStr);
-      if (valueStr.IsEmpty()) {
-        offset++;
-      } else {
-        found = true;
-        nsresult rv = NS_OK;
-        startVal = valueStr.ToInteger(&rv);
-      }
-    }
-    currNode = currNode->GetPreviousSibling();
-  }
-  // If LI was not having "value", Set the "value" attribute for it.
-  // Note that We are at the first LI in the selected range of OL.
-  if (offset == 0 && found) {
-    // offset = 0 => LI itself has the value attribute and we did not need to
-    // traverse back. Just serialize value attribute like other tags.
-    NS_ENSURE_TRUE(SerializeAttr(u""_ns, u"value"_ns, valueStr, aStr, false),
-                   false);
-  } else if (offset == 1 && !found) {
-    /*(offset = 1 && !found) means either LI is the first child node of OL
-    and LI is not having "value" attribute.
-    In that case we would not like to set "value" attribute to reduce the
-    changes.
-    */
-    // do nothing...
-  } else if (offset > 0) {
-    // Set value attribute.
-    nsAutoString valueStr;
-
-    // As serializer needs to use this valueAttr we are creating here,
-    valueStr.AppendInt(startVal + offset);
-    NS_ENSURE_TRUE(SerializeAttr(u""_ns, u"value"_ns, valueStr, aStr, false),
-                   false);
-  }
-
-  return true;
-}
-
-bool nsXHTMLContentSerializer::IsFirstChildOfOL(nsIContent* aElement) {
-  nsIContent* parent = aElement->GetParent();
-  if (parent && parent->NodeName().LowerCaseEqualsLiteral("ol")) {
-    if (!mOLStateStack.IsEmpty()) {
-      olState state = mOLStateStack[mOLStateStack.Length() - 1];
-      if (state.isFirstListItem) return true;
-    }
-  }
-
-  return false;
-}
-
-bool nsXHTMLContentSerializer::HasNoChildren(nsIContent* aContent) {
-  for (nsIContent* child = aContent->GetFirstChild(); child;
-       child = child->GetNextSibling()) {
-    if (!child->IsText()) return false;
-
-    if (child->TextLength()) return false;
-  }
-
-  return true;
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsXHTMLContentSerializer.h firefox-85.0+build1/dom/base/nsXHTMLContentSerializer.h
--- firefox-84.0.2+build1/dom/base/nsXHTMLContentSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsXHTMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an XHTML (not HTML!) DOM to an XHTML
- * string that could be parsed into more or less the original DOM.
- */
-
-#ifndef nsXHTMLContentSerializer_h__
-#define nsXHTMLContentSerializer_h__
-
-#include "mozilla/Attributes.h"
-#include "nsXMLContentSerializer.h"
-#include "nsString.h"
-#include "nsTArray.h"
-
-class nsIContent;
-class nsAtom;
-
-namespace mozilla {
-class Encoding;
-}
-
-class nsXHTMLContentSerializer : public nsXMLContentSerializer {
- public:
-  nsXHTMLContentSerializer();
-  virtual ~nsXHTMLContentSerializer();
-
-  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
-                  const mozilla::Encoding* aEncoding, bool aIsCopying,
-                  bool aRewriteEncodingDeclaration,
-                  bool* aNeedsPreformatScanning, nsAString& aOutput) override;
-
-  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
-                        int32_t aEndOffset) override;
-
-  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
-
- protected:
-  virtual bool CheckElementStart(mozilla::dom::Element* aElement,
-                                 bool& aForceFormat, nsAString& aStr,
-                                 nsresult& aResult) override;
-
-  MOZ_MUST_USE
-  virtual bool AfterElementStart(nsIContent* aContent,
-                                 nsIContent* aOriginalElement,
-                                 nsAString& aStr) override;
-
-  virtual bool CheckElementEnd(mozilla::dom::Element* aContent,
-                               mozilla::dom::Element* aOriginalElement,
-                               bool& aForceFormat, nsAString& aStr) override;
-
-  virtual void AfterElementEnd(nsIContent* aContent, nsAString& aStr) override;
-
-  virtual bool LineBreakBeforeOpen(int32_t aNamespaceID,
-                                   nsAtom* aName) override;
-  virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsAtom* aName) override;
-  virtual bool LineBreakBeforeClose(int32_t aNamespaceID,
-                                    nsAtom* aName) override;
-  virtual bool LineBreakAfterClose(int32_t aNamespaceID,
-                                   nsAtom* aName) override;
-
-  bool HasLongLines(const nsString& text, int32_t& aLastNewlineOffset);
-
-  // functions to check if we enter in or leave from a preformated content
-  virtual void MaybeEnterInPreContent(nsIContent* aNode) override;
-  virtual void MaybeLeaveFromPreContent(nsIContent* aNode) override;
-
-  MOZ_MUST_USE
-  virtual bool SerializeAttributes(mozilla::dom::Element* aContent,
-                                   mozilla::dom::Element* aOriginalElement,
-                                   nsAString& aTagPrefix,
-                                   const nsAString& aTagNamespaceURI,
-                                   nsAtom* aTagName, nsAString& aStr,
-                                   uint32_t aSkipAttr,
-                                   bool aAddNSAttr) override;
-
-  bool IsFirstChildOfOL(nsIContent* aElement);
-
-  MOZ_MUST_USE
-  bool SerializeLIValueAttribute(nsIContent* aElement, nsAString& aStr);
-  bool IsShorthandAttr(const nsAtom* aAttrName, const nsAtom* aElementName);
-
-  MOZ_MUST_USE
-  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
-                                          nsAString& aOutputStr) override;
-
- private:
-  bool IsElementPreformatted(nsIContent* aNode);
-
- protected:
-  /*
-   * isHTMLParser should be set to true by the HTML parser which inherits from
-   * this class. It avoids to redefine methods just for few changes.
-   */
-  bool mIsHTMLSerializer;
-
-  bool mIsCopying;  // Set to true only while copying
-
-  /*
-   * mDisableEntityEncoding is higher than 0 while the serializer is serializing
-   * the content of a element whose content is considerd CDATA by the
-   * serializer (such elements are 'script', 'style', 'noscript' and
-   * possibly others in XHTML) This doesn't have anything to do with if the
-   * element is defined as CDATA in the DTD, it simply means we'll
-   * output the content of the element without doing any entity encoding
-   * what so ever.
-   */
-  int32_t mDisableEntityEncoding;
-
-  // This is to ensure that we only do meta tag fixups when dealing with
-  // whole documents.
-  bool mRewriteEncodingDeclaration;
-
-  // To keep track of First LI child of OL in selected range
-  bool mIsFirstChildOfOL;
-
-  // To keep track of startvalue of OL and first list item for nested lists
-  struct olState {
-    olState(int32_t aStart, bool aIsFirst)
-        : startVal(aStart), isFirstListItem(aIsFirst) {}
-
-    olState(const olState& aOlState) {
-      startVal = aOlState.startVal;
-      isFirstListItem = aOlState.isFirstListItem;
-    }
-
-    // the value of the start attribute in the OL
-    int32_t startVal;
-
-    // is true only before the serialization of the first li of an ol
-    // should be false for other li in the list
-    bool isFirstListItem;
-  };
-
-  // Stack to store one olState struct per <OL>.
-  AutoTArray<olState, 8> mOLStateStack;
-
-  bool HasNoChildren(nsIContent* aContent);
-};
-
-nsresult NS_NewXHTMLContentSerializer(nsIContentSerializer** aSerializer);
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/base/nsXMLContentSerializer.cpp firefox-85.0+build1/dom/base/nsXMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/base/nsXMLContentSerializer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsXMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1781 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an XML DOM to an XML string that
- * could be parsed into more or less the original DOM.
- */
-
-#include "nsXMLContentSerializer.h"
-
-#include "nsGkAtoms.h"
-#include "nsIContent.h"
-#include "nsIContentInlines.h"
-#include "mozilla/dom/Document.h"
-#include "nsIDocumentEncoder.h"
-#include "nsElementTable.h"
-#include "nsNameSpaceManager.h"
-#include "nsTextFragment.h"
-#include "nsString.h"
-#include "mozilla/Sprintf.h"
-#include "nsUnicharUtils.h"
-#include "nsCRT.h"
-#include "nsContentUtils.h"
-#include "nsAttrName.h"
-#include "mozilla/dom/Comment.h"
-#include "mozilla/dom/CustomElementRegistry.h"
-#include "mozilla/dom/DocumentType.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/ProcessingInstruction.h"
-#include "mozilla/intl/LineBreaker.h"
-#include "nsParserConstants.h"
-#include "mozilla/Encoding.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-
-#define kXMLNS "xmlns"
-
-// to be readable, we assume that an indented line contains
-// at least this number of characters (arbitrary value here).
-// This is a limit for the indentation.
-#define MIN_INDENTED_LINE_LENGTH 15
-
-// the string used to indent.
-#define INDENT_STRING "  "
-#define INDENT_STRING_LENGTH 2
-
-nsresult NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer) {
-  RefPtr<nsXMLContentSerializer> it = new nsXMLContentSerializer();
-  it.forget(aSerializer);
-  return NS_OK;
-}
-
-nsXMLContentSerializer::nsXMLContentSerializer()
-    : mPrefixIndex(0),
-      mColPos(0),
-      mIndentOverflow(0),
-      mIsIndentationAddedOnCurrentLine(false),
-      mInAttribute(false),
-      mAddNewlineForRootNode(false),
-      mAddSpace(false),
-      mMayIgnoreLineBreakSequence(false),
-      mBodyOnly(false),
-      mInBody(0) {}
-
-nsXMLContentSerializer::~nsXMLContentSerializer() = default;
-
-NS_IMPL_ISUPPORTS(nsXMLContentSerializer, nsIContentSerializer)
-
-NS_IMETHODIMP
-nsXMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,
-                             const Encoding* aEncoding, bool aIsCopying,
-                             bool aRewriteEncodingDeclaration,
-                             bool* aNeedsPreformatScanning,
-                             nsAString& aOutput) {
-  *aNeedsPreformatScanning = false;
-  mPrefixIndex = 0;
-  mColPos = 0;
-  mIndentOverflow = 0;
-  mIsIndentationAddedOnCurrentLine = false;
-  mInAttribute = false;
-  mAddNewlineForRootNode = false;
-  mAddSpace = false;
-  mMayIgnoreLineBreakSequence = false;
-  mBodyOnly = false;
-  mInBody = 0;
-
-  if (aEncoding) {
-    aEncoding->Name(mCharset);
-  }
-  mFlags = aFlags;
-
-  // Set the line break character:
-  if ((mFlags & nsIDocumentEncoder::OutputCRLineBreak) &&
-      (mFlags & nsIDocumentEncoder::OutputLFLineBreak)) {  // Windows
-    mLineBreak.AssignLiteral("\r\n");
-  } else if (mFlags & nsIDocumentEncoder::OutputCRLineBreak) {  // Mac
-    mLineBreak.Assign('\r');
-  } else if (mFlags & nsIDocumentEncoder::OutputLFLineBreak) {  // Unix/DOM
-    mLineBreak.Assign('\n');
-  } else {
-    mLineBreak.AssignLiteral(NS_LINEBREAK);  // Platform/default
-  }
-
-  mDoRaw = !!(mFlags & nsIDocumentEncoder::OutputRaw);
-
-  mDoFormat = (mFlags & nsIDocumentEncoder::OutputFormatted && !mDoRaw);
-
-  mDoWrap = (mFlags & nsIDocumentEncoder::OutputWrap && !mDoRaw);
-
-  mAllowLineBreaking =
-      !(mFlags & nsIDocumentEncoder::OutputDisallowLineBreaking);
-
-  if (!aWrapColumn) {
-    mMaxColumn = 72;
-  } else {
-    mMaxColumn = aWrapColumn;
-  }
-
-  mOutput = &aOutput;
-  mPreLevel = 0;
-  mIsIndentationAddedOnCurrentLine = false;
-  return NS_OK;
-}
-
-nsresult nsXMLContentSerializer::AppendTextData(nsIContent* aNode,
-                                                int32_t aStartOffset,
-                                                int32_t aEndOffset,
-                                                nsAString& aStr,
-                                                bool aTranslateEntities) {
-  nsIContent* content = aNode;
-  const nsTextFragment* frag;
-  if (!content || !(frag = content->GetText())) {
-    return NS_ERROR_FAILURE;
-  }
-
-  int32_t fragLength = frag->GetLength();
-  int32_t endoffset =
-      (aEndOffset == -1) ? fragLength : std::min(aEndOffset, fragLength);
-  int32_t length = endoffset - aStartOffset;
-
-  NS_ASSERTION(aStartOffset >= 0, "Negative start offset for text fragment!");
-  NS_ASSERTION(aStartOffset <= endoffset,
-               "A start offset is beyond the end of the text fragment!");
-
-  if (length <= 0) {
-    // XXX Zero is a legal value, maybe non-zero values should be an
-    // error.
-    return NS_OK;
-  }
-
-  if (frag->Is2b()) {
-    const char16_t* strStart = frag->Get2b() + aStartOffset;
-    if (aTranslateEntities) {
-      NS_ENSURE_TRUE(AppendAndTranslateEntities(
-                         Substring(strStart, strStart + length), aStr),
-                     NS_ERROR_OUT_OF_MEMORY);
-    } else {
-      NS_ENSURE_TRUE(aStr.Append(Substring(strStart, strStart + length),
-                                 mozilla::fallible),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-  } else {
-    nsAutoString utf16;
-    if (!CopyASCIItoUTF16(Span(frag->Get1b() + aStartOffset, length), utf16,
-                          mozilla::fallible_t())) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    if (aTranslateEntities) {
-      NS_ENSURE_TRUE(AppendAndTranslateEntities(utf16, aStr),
-                     NS_ERROR_OUT_OF_MEMORY);
-    } else {
-      NS_ENSURE_TRUE(aStr.Append(utf16, mozilla::fallible),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
-                                   int32_t aEndOffset) {
-  NS_ENSURE_ARG(aText);
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString data;
-  nsresult rv;
-
-  rv = AppendTextData(aText, aStartOffset, aEndOffset, data, true);
-  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoFormat) {
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendCDATASection(nsIContent* aCDATASection,
-                                           int32_t aStartOffset,
-                                           int32_t aEndOffset) {
-  NS_ENSURE_ARG(aCDATASection);
-  NS_ENSURE_STATE(mOutput);
-
-  nsresult rv;
-
-  constexpr auto cdata = u"<![CDATA["_ns;
-
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToString(cdata, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoFormat) {
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(cdata, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(cdata, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    NS_ENSURE_TRUE(AppendToString(cdata, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  nsAutoString data;
-  rv = AppendTextData(aCDATASection, aStartOffset, aEndOffset, data, false);
-  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-  NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ENSURE_TRUE(AppendToString(u"]]>"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendProcessingInstruction(ProcessingInstruction* aPI,
-                                                    int32_t aStartOffset,
-                                                    int32_t aEndOffset) {
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString target, data, start;
-
-  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  aPI->GetTarget(target);
-
-  aPI->GetData(data);
-
-  NS_ENSURE_TRUE(start.AppendLiteral("<?", mozilla::fallible),
-                 NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(start.Append(target, mozilla::fallible),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToString(start, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoFormat) {
-    if (mAddSpace) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    }
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(start, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(start, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    NS_ENSURE_TRUE(AppendToString(start, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  if (!data.IsEmpty()) {
-    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-  NS_ENSURE_TRUE(AppendToString(u"?>"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  MaybeFlagNewlineForRootNode(aPI);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendComment(Comment* aComment, int32_t aStartOffset,
-                                      int32_t aEndOffset) {
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString data;
-  aComment->GetData(data);
-
-  int32_t dataLength = data.Length();
-  if (aStartOffset || (aEndOffset != -1 && aEndOffset < dataLength)) {
-    int32_t length =
-        (aEndOffset == -1) ? dataLength : std::min(aEndOffset, dataLength);
-    length -= aStartOffset;
-
-    nsAutoString frag;
-    if (length > 0) {
-      data.Mid(frag, aStartOffset, length);
-    }
-    data.Assign(frag);
-  }
-
-  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  constexpr auto startComment = u"<!--"_ns;
-
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToString(startComment, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoFormat) {
-    if (mAddSpace) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    }
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(startComment, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(startComment, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    NS_ENSURE_TRUE(AppendToString(startComment, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  // Even if mDoformat, we don't format the content because it
-  // could have been preformated by the author
-  NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(AppendToString(u"-->"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  MaybeFlagNewlineForRootNode(aComment);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendDoctype(DocumentType* aDocType) {
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString name, publicId, systemId;
-  aDocType->GetName(name);
-  aDocType->GetPublicId(publicId);
-  aDocType->GetSystemId(systemId);
-
-  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ENSURE_TRUE(AppendToString(u"<!DOCTYPE "_ns, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(AppendToString(name, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-  char16_t quote;
-  if (!publicId.IsEmpty()) {
-    NS_ENSURE_TRUE(AppendToString(u" PUBLIC "_ns, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-    if (publicId.FindChar(char16_t('"')) == -1) {
-      quote = char16_t('"');
-    } else {
-      quote = char16_t('\'');
-    }
-    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(publicId, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-
-    if (!systemId.IsEmpty()) {
-      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-      if (systemId.FindChar(char16_t('"')) == -1) {
-        quote = char16_t('"');
-      } else {
-        quote = char16_t('\'');
-      }
-      NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-      NS_ENSURE_TRUE(AppendToString(systemId, *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-      NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    }
-  } else if (!systemId.IsEmpty()) {
-    if (systemId.FindChar(char16_t('"')) == -1) {
-      quote = char16_t('"');
-    } else {
-      quote = char16_t('\'');
-    }
-    NS_ENSURE_TRUE(AppendToString(u" SYSTEM "_ns, *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(systemId, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-  MaybeFlagNewlineForRootNode(aDocType);
-
-  return NS_OK;
-}
-
-nsresult nsXMLContentSerializer::PushNameSpaceDecl(const nsAString& aPrefix,
-                                                   const nsAString& aURI,
-                                                   nsIContent* aOwner) {
-  NameSpaceDecl* decl = mNameSpaceStack.AppendElement();
-  if (!decl) return NS_ERROR_OUT_OF_MEMORY;
-
-  decl->mPrefix.Assign(aPrefix);
-  decl->mURI.Assign(aURI);
-  // Don't addref - this weak reference will be removed when
-  // we pop the stack
-  decl->mOwner = aOwner;
-  return NS_OK;
-}
-
-void nsXMLContentSerializer::PopNameSpaceDeclsFor(nsIContent* aOwner) {
-  int32_t index, count;
-
-  count = mNameSpaceStack.Length();
-  for (index = count - 1; index >= 0; index--) {
-    if (mNameSpaceStack[index].mOwner != aOwner) {
-      break;
-    }
-    mNameSpaceStack.RemoveLastElement();
-  }
-}
-
-bool nsXMLContentSerializer::ConfirmPrefix(nsAString& aPrefix,
-                                           const nsAString& aURI,
-                                           nsIContent* aElement,
-                                           bool aIsAttribute) {
-  if (aPrefix.EqualsLiteral(kXMLNS)) {
-    return false;
-  }
-
-  if (aURI.EqualsLiteral("http://www.w3.org/XML/1998/namespace")) {
-    // The prefix must be xml for this namespace. We don't need to declare it,
-    // so always just set the prefix to xml.
-    aPrefix.AssignLiteral("xml");
-
-    return false;
-  }
-
-  bool mustHavePrefix;
-  if (aIsAttribute) {
-    if (aURI.IsEmpty()) {
-      // Attribute in the null namespace.  This just shouldn't have a prefix.
-      // And there's no need to push any namespace decls
-      aPrefix.Truncate();
-      return false;
-    }
-
-    // Attribute not in the null namespace -- must have a prefix
-    mustHavePrefix = true;
-  } else {
-    // Not an attribute, so doesn't _have_ to have a prefix
-    mustHavePrefix = false;
-  }
-
-  // Keep track of the closest prefix that's bound to aURI and whether we've
-  // found such a thing.  closestURIMatch holds the prefix, and uriMatch
-  // indicates whether we actually have one.
-  nsAutoString closestURIMatch;
-  bool uriMatch = false;
-
-  // Also keep track of whether we've seen aPrefix already.  If we have, that
-  // means that it's already bound to a URI different from aURI, so even if we
-  // later (so in a more outer scope) see it bound to aURI we can't reuse it.
-  bool haveSeenOurPrefix = false;
-
-  int32_t count = mNameSpaceStack.Length();
-  int32_t index = count - 1;
-  while (index >= 0) {
-    NameSpaceDecl& decl = mNameSpaceStack.ElementAt(index);
-    // Check if we've found a prefix match
-    if (aPrefix.Equals(decl.mPrefix)) {
-      // If the URIs match and aPrefix is not bound to any other URI, we can
-      // use aPrefix
-      if (!haveSeenOurPrefix && aURI.Equals(decl.mURI)) {
-        // Just use our uriMatch stuff.  That will deal with an empty aPrefix
-        // the right way.  We can break out of the loop now, though.
-        uriMatch = true;
-        closestURIMatch = aPrefix;
-        break;
-      }
-
-      haveSeenOurPrefix = true;
-
-      // If they don't, and either:
-      // 1) We have a prefix (so we'd be redeclaring this prefix to point to a
-      //    different namespace) or
-      // 2) We're looking at an existing default namespace decl on aElement (so
-      //    we can't create a new default namespace decl for this URI)
-      // then generate a new prefix.  Note that we do NOT generate new prefixes
-      // if we happen to have aPrefix == decl->mPrefix == "" and mismatching
-      // URIs when |decl| doesn't have aElement as its owner.  In that case we
-      // can simply push the new namespace URI as the default namespace for
-      // aElement.
-      if (!aPrefix.IsEmpty() || decl.mOwner == aElement) {
-        NS_ASSERTION(!aURI.IsEmpty(),
-                     "Not allowed to add a xmlns attribute with an empty "
-                     "namespace name unless it declares the default "
-                     "namespace.");
-
-        GenerateNewPrefix(aPrefix);
-        // Now we need to validate our new prefix/uri combination; check it
-        // against the full namespace stack again.  Note that just restarting
-        // the while loop is ok, since we haven't changed aURI, so the
-        // closestURIMatch and uriMatch state is not affected.
-        index = count - 1;
-        haveSeenOurPrefix = false;
-        continue;
-      }
-    }
-
-    // If we've found a URI match, then record the first one
-    if (!uriMatch && aURI.Equals(decl.mURI)) {
-      // Need to check that decl->mPrefix is not declared anywhere closer to
-      // us.  If it is, we can't use it.
-      bool prefixOK = true;
-      int32_t index2;
-      for (index2 = count - 1; index2 > index && prefixOK; --index2) {
-        prefixOK = (mNameSpaceStack[index2].mPrefix != decl.mPrefix);
-      }
-
-      if (prefixOK) {
-        uriMatch = true;
-        closestURIMatch.Assign(decl.mPrefix);
-      }
-    }
-
-    --index;
-  }
-
-  // At this point the following invariants hold:
-  // 1) The prefix in closestURIMatch is mapped to aURI in our scope if
-  //    uriMatch is set.
-  // 2) There is nothing on the namespace stack that has aPrefix as the prefix
-  //    and a _different_ URI, except for the case aPrefix.IsEmpty (and
-  //    possible default namespaces on ancestors)
-
-  // So if uriMatch is set it's OK to use the closestURIMatch prefix.  The one
-  // exception is when closestURIMatch is actually empty (default namespace
-  // decl) and we must have a prefix.
-  if (uriMatch && (!mustHavePrefix || !closestURIMatch.IsEmpty())) {
-    aPrefix.Assign(closestURIMatch);
-    return false;
-  }
-
-  if (aPrefix.IsEmpty()) {
-    // At this point, aPrefix is empty (which means we never had a prefix to
-    // start with).  If we must have a prefix, just generate a new prefix and
-    // then send it back through the namespace stack checks to make sure it's
-    // OK.
-    if (mustHavePrefix) {
-      GenerateNewPrefix(aPrefix);
-      return ConfirmPrefix(aPrefix, aURI, aElement, aIsAttribute);
-    }
-
-    // One final special case.  If aPrefix is empty and we never saw an empty
-    // prefix (default namespace decl) on the namespace stack and we're in the
-    // null namespace there is no reason to output an |xmlns=""| here.  It just
-    // makes the output less readable.
-    if (!haveSeenOurPrefix && aURI.IsEmpty()) {
-      return false;
-    }
-  }
-
-  // Now just set aURI as the new default namespace URI.  Indicate that we need
-  // to create a namespace decl for the final prefix
-  return true;
-}
-
-void nsXMLContentSerializer::GenerateNewPrefix(nsAString& aPrefix) {
-  aPrefix.Assign('a');
-  aPrefix.AppendInt(mPrefixIndex++);
-}
-
-bool nsXMLContentSerializer::SerializeAttr(const nsAString& aPrefix,
-                                           const nsAString& aName,
-                                           const nsAString& aValue,
-                                           nsAString& aStr,
-                                           bool aDoEscapeEntities) {
-  nsAutoString attrString_;
-  // For innerHTML we can do faster appending without
-  // temporary strings.
-  bool rawAppend = mDoRaw && aDoEscapeEntities;
-  nsAString& attrString = (rawAppend) ? aStr : attrString_;
-
-  NS_ENSURE_TRUE(attrString.Append(char16_t(' '), mozilla::fallible), false);
-  if (!aPrefix.IsEmpty()) {
-    NS_ENSURE_TRUE(attrString.Append(aPrefix, mozilla::fallible), false);
-    NS_ENSURE_TRUE(attrString.Append(char16_t(':'), mozilla::fallible), false);
-  }
-  NS_ENSURE_TRUE(attrString.Append(aName, mozilla::fallible), false);
-
-  if (aDoEscapeEntities) {
-    // if problem characters are turned into character entity references
-    // then there will be no problem with the value delimiter characters
-    NS_ENSURE_TRUE(attrString.AppendLiteral("=\"", mozilla::fallible), false);
-
-    mInAttribute = true;
-    bool result = AppendAndTranslateEntities(aValue, attrString);
-    mInAttribute = false;
-    NS_ENSURE_TRUE(result, false);
-
-    NS_ENSURE_TRUE(attrString.Append(char16_t('"'), mozilla::fallible), false);
-    if (rawAppend) {
-      return true;
-    }
-  } else {
-    // Depending on whether the attribute value contains quotes or apostrophes
-    // we need to select the delimiter character and escape characters using
-    // character entity references, ignoring the value of aDoEscapeEntities.
-    // See http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.3.2.2 for
-    // the standard on character entity references in values.  We also have to
-    // make sure to escape any '&' characters.
-
-    bool bIncludesSingle = false;
-    bool bIncludesDouble = false;
-    nsAString::const_iterator iCurr, iEnd;
-    aValue.BeginReading(iCurr);
-    aValue.EndReading(iEnd);
-    for (; iCurr != iEnd; ++iCurr) {
-      if (*iCurr == char16_t('\'')) {
-        bIncludesSingle = true;
-        if (bIncludesDouble) {
-          break;
-        }
-      } else if (*iCurr == char16_t('"')) {
-        bIncludesDouble = true;
-        if (bIncludesSingle) {
-          break;
-        }
-      }
-    }
-
-    // Delimiter and escaping is according to the following table
-    //    bIncludesDouble   bIncludesSingle   Delimiter    Escape Double Quote
-    //    FALSE             FALSE             "            FALSE
-    //    FALSE             TRUE              "            FALSE
-    //    TRUE              FALSE             '            FALSE
-    //    TRUE              TRUE              "            TRUE
-    char16_t cDelimiter =
-        (bIncludesDouble && !bIncludesSingle) ? char16_t('\'') : char16_t('"');
-    NS_ENSURE_TRUE(attrString.Append(char16_t('='), mozilla::fallible), false);
-    NS_ENSURE_TRUE(attrString.Append(cDelimiter, mozilla::fallible), false);
-    nsAutoString sValue(aValue);
-    NS_ENSURE_TRUE(
-        sValue.ReplaceSubstring(u"&"_ns, u"&amp;"_ns, mozilla::fallible),
-        false);
-    if (bIncludesDouble && bIncludesSingle) {
-      NS_ENSURE_TRUE(
-          sValue.ReplaceSubstring(u"\""_ns, u"&quot;"_ns, mozilla::fallible),
-          false);
-    }
-    NS_ENSURE_TRUE(attrString.Append(sValue, mozilla::fallible), false);
-    NS_ENSURE_TRUE(attrString.Append(cDelimiter, mozilla::fallible), false);
-  }
-  if (mDoRaw || PreLevel() > 0) {
-    NS_ENSURE_TRUE(AppendToStringConvertLF(attrString, aStr), false);
-  } else if (mDoFormat) {
-    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(attrString, aStr), false);
-  } else if (mDoWrap) {
-    NS_ENSURE_TRUE(AppendToStringWrapped(attrString, aStr), false);
-  } else {
-    NS_ENSURE_TRUE(AppendToStringConvertLF(attrString, aStr), false);
-  }
-
-  return true;
-}
-
-uint32_t nsXMLContentSerializer::ScanNamespaceDeclarations(
-    Element* aElement, Element* aOriginalElement,
-    const nsAString& aTagNamespaceURI) {
-  uint32_t index, count;
-  nsAutoString uriStr, valueStr;
-
-  count = aElement->GetAttrCount();
-
-  // First scan for namespace declarations, pushing each on the stack
-  uint32_t skipAttr = count;
-  for (index = 0; index < count; index++) {
-    const BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
-    const nsAttrName* name = info.mName;
-
-    int32_t namespaceID = name->NamespaceID();
-    nsAtom* attrName = name->LocalName();
-
-    if (namespaceID == kNameSpaceID_XMLNS ||
-        // Also push on the stack attrs named "xmlns" in the null
-        // namespace... because once we serialize those out they'll look like
-        // namespace decls.  :(
-        // XXXbz what if we have both "xmlns" in the null namespace and "xmlns"
-        // in the xmlns namespace?
-        (namespaceID == kNameSpaceID_None && attrName == nsGkAtoms::xmlns)) {
-      info.mValue->ToString(uriStr);
-
-      if (!name->GetPrefix()) {
-        if (aTagNamespaceURI.IsEmpty() && !uriStr.IsEmpty()) {
-          // If the element is in no namespace we need to add a xmlns
-          // attribute to declare that. That xmlns attribute must not have a
-          // prefix (see http://www.w3.org/TR/REC-xml-names/#dt-prefix), ie it
-          // must declare the default namespace. We just found an xmlns
-          // attribute that declares the default namespace to something
-          // non-empty. We're going to ignore this attribute, for children we
-          // will detect that we need to add it again and attributes aren't
-          // affected by the default namespace.
-          skipAttr = index;
-        } else {
-          // Default NS attribute does not have prefix (and the name is "xmlns")
-          PushNameSpaceDecl(u""_ns, uriStr, aOriginalElement);
-        }
-      } else {
-        PushNameSpaceDecl(nsDependentAtomString(attrName), uriStr,
-                          aOriginalElement);
-      }
-    }
-  }
-  return skipAttr;
-}
-
-bool nsXMLContentSerializer::IsJavaScript(nsIContent* aContent,
-                                          nsAtom* aAttrNameAtom,
-                                          int32_t aAttrNamespaceID,
-                                          const nsAString& aValueString) {
-  bool isHtml = aContent->IsHTMLElement();
-  bool isXul = aContent->IsXULElement();
-  bool isSvg = aContent->IsSVGElement();
-
-  if (aAttrNamespaceID == kNameSpaceID_None && (isHtml || isXul || isSvg) &&
-      (aAttrNameAtom == nsGkAtoms::href || aAttrNameAtom == nsGkAtoms::src)) {
-    static const char kJavaScript[] = "javascript";
-    int32_t pos = aValueString.FindChar(':');
-    if (pos < (int32_t)(sizeof kJavaScript - 1)) return false;
-    nsAutoString scheme(Substring(aValueString, 0, pos));
-    scheme.StripWhitespace();
-    if ((scheme.Length() == (sizeof kJavaScript - 1)) &&
-        scheme.EqualsIgnoreCase(kJavaScript))
-      return true;
-    else
-      return false;
-  }
-
-  return aContent->IsEventAttributeName(aAttrNameAtom);
-}
-
-bool nsXMLContentSerializer::SerializeAttributes(
-    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
-    const nsAString& aTagNamespaceURI, nsAtom* aTagName, nsAString& aStr,
-    uint32_t aSkipAttr, bool aAddNSAttr) {
-  nsAutoString prefixStr, uriStr, valueStr;
-  nsAutoString xmlnsStr;
-  xmlnsStr.AssignLiteral(kXMLNS);
-  uint32_t index, count;
-
-  MaybeSerializeIsValue(aElement, aStr);
-
-  // If we had to add a new namespace declaration, serialize
-  // and push it on the namespace stack
-  if (aAddNSAttr) {
-    if (aTagPrefix.IsEmpty()) {
-      // Serialize default namespace decl
-      NS_ENSURE_TRUE(
-          SerializeAttr(u""_ns, xmlnsStr, aTagNamespaceURI, aStr, true), false);
-    } else {
-      // Serialize namespace decl
-      NS_ENSURE_TRUE(
-          SerializeAttr(xmlnsStr, aTagPrefix, aTagNamespaceURI, aStr, true),
-          false);
-    }
-    PushNameSpaceDecl(aTagPrefix, aTagNamespaceURI, aOriginalElement);
-  }
-
-  count = aElement->GetAttrCount();
-
-  // Now serialize each of the attributes
-  // XXX Unfortunately we need a namespace manager to get
-  // attribute URIs.
-  for (index = 0; index < count; index++) {
-    if (aSkipAttr == index) {
-      continue;
-    }
-
-    const nsAttrName* name = aElement->GetAttrNameAt(index);
-    int32_t namespaceID = name->NamespaceID();
-    nsAtom* attrName = name->LocalName();
-    nsAtom* attrPrefix = name->GetPrefix();
-
-    // Filter out any attribute starting with [-|_]moz
-    nsDependentAtomString attrNameStr(attrName);
-    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
-        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
-      continue;
-    }
-
-    if (attrPrefix) {
-      attrPrefix->ToString(prefixStr);
-    } else {
-      prefixStr.Truncate();
-    }
-
-    bool addNSAttr = false;
-    if (kNameSpaceID_XMLNS != namespaceID) {
-      nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, uriStr);
-      addNSAttr = ConfirmPrefix(prefixStr, uriStr, aOriginalElement, true);
-    }
-
-    aElement->GetAttr(namespaceID, attrName, valueStr);
-
-    nsDependentAtomString nameStr(attrName);
-    bool isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
-
-    NS_ENSURE_TRUE(SerializeAttr(prefixStr, nameStr, valueStr, aStr, !isJS),
-                   false);
-
-    if (addNSAttr) {
-      NS_ASSERTION(!prefixStr.IsEmpty(),
-                   "Namespaced attributes must have a prefix");
-      NS_ENSURE_TRUE(SerializeAttr(xmlnsStr, prefixStr, uriStr, aStr, true),
-                     false);
-      PushNameSpaceDecl(prefixStr, uriStr, aOriginalElement);
-    }
-  }
-
-  return true;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendElementStart(Element* aElement,
-                                           Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-  NS_ENSURE_STATE(mOutput);
-
-  bool forceFormat = false;
-  nsresult rv = NS_OK;
-  if (!CheckElementStart(aElement, forceFormat, *mOutput, rv)) {
-    // When we go to AppendElementEnd for this element, we're going to
-    // MaybeLeaveFromPreContent().  So make sure to MaybeEnterInPreContent()
-    // now, so our PreLevel() doesn't get confused.
-    MaybeEnterInPreContent(aElement);
-    return rv;
-  }
-
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
-  aElement->NodeInfo()->GetPrefix(tagPrefix);
-  aElement->NodeInfo()->GetName(tagLocalName);
-  aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
-
-  uint32_t skipAttr =
-      ScanNamespaceDeclarations(aElement, aOriginalElement, tagNamespaceURI);
-
-  nsAtom* name = aElement->NodeInfo()->NameAtom();
-  bool lineBreakBeforeOpen =
-      LineBreakBeforeOpen(aElement->GetNameSpaceID(), name);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    if (mColPos && lineBreakBeforeOpen) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else {
-      NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-    }
-    if (!mColPos) {
-      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else if (mAddSpace) {
-      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-      mAddSpace = false;
-    }
-  } else if (mAddSpace) {
-    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-    mAddSpace = false;
-  } else {
-    NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  // Always reset to avoid false newlines in case MaybeAddNewlineForRootNode
-  // wasn't called
-  mAddNewlineForRootNode = false;
-
-  bool addNSAttr;
-  addNSAttr =
-      ConfirmPrefix(tagPrefix, tagNamespaceURI, aOriginalElement, false);
-
-  // Serialize the qualified name of the element
-  NS_ENSURE_TRUE(AppendToString(kLessThan, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  if (!tagPrefix.IsEmpty()) {
-    NS_ENSURE_TRUE(AppendToString(tagPrefix, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(u":"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-  NS_ENSURE_TRUE(AppendToString(tagLocalName, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  MaybeEnterInPreContent(aElement);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    NS_ENSURE_TRUE(IncrIndentation(name), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  NS_ENSURE_TRUE(
-      SerializeAttributes(aElement, aOriginalElement, tagPrefix,
-                          tagNamespaceURI, name, *mOutput, skipAttr, addNSAttr),
-      NS_ERROR_OUT_OF_MEMORY);
-
-  NS_ENSURE_TRUE(AppendEndOfElementStart(aElement, aOriginalElement, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
-      LineBreakAfterOpen(aElement->GetNameSpaceID(), name)) {
-    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-
-  NS_ENSURE_TRUE(AfterElementStart(aElement, aOriginalElement, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  return NS_OK;
-}
-
-// aElement is the actual element we're outputting.  aOriginalElement is the one
-// in the original DOM, which is the one we have to test for kids.
-static bool ElementNeedsSeparateEndTag(Element* aElement,
-                                       Element* aOriginalElement) {
-  if (aOriginalElement->GetChildCount()) {
-    // We have kids, so we need a separate end tag.  This needs to be checked on
-    // aOriginalElement because that's the one that's actually in the DOM and
-    // might have kids.
-    return true;
-  }
-
-  if (!aElement->IsHTMLElement()) {
-    // Empty non-HTML elements can just skip a separate end tag.
-    return false;
-  }
-
-  // HTML container tags should have a separate end tag even if empty, per spec.
-  // See
-  // https://w3c.github.io/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
-  nsAtom* localName = aElement->NodeInfo()->NameAtom();
-  bool isHTMLContainer = nsHTMLElement::IsContainer(
-      nsHTMLTags::CaseSensitiveAtomTagToId(localName));
-  return isHTMLContainer;
-}
-
-bool nsXMLContentSerializer::AppendEndOfElementStart(Element* aElement,
-                                                     Element* aOriginalElement,
-                                                     nsAString& aStr) {
-  if (ElementNeedsSeparateEndTag(aElement, aOriginalElement)) {
-    return AppendToString(kGreaterThan, aStr);
-  }
-
-  // We don't need a separate end tag.  For HTML elements (which at this point
-  // must be non-containers), append a space before the '/', per spec.  See
-  // https://w3c.github.io/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
-  if (aOriginalElement->IsHTMLElement()) {
-    if (!AppendToString(kSpace, aStr)) {
-      return false;
-    }
-  }
-
-  return AppendToString(u"/>"_ns, aStr);
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendElementEnd(Element* aElement,
-                                         Element* aOriginalElement) {
-  NS_ENSURE_ARG(aElement);
-  NS_ENSURE_STATE(mOutput);
-
-  nsIContent* content = aElement;
-
-  bool forceFormat = false, outputElementEnd;
-  outputElementEnd =
-      CheckElementEnd(aElement, aOriginalElement, forceFormat, *mOutput);
-
-  nsAtom* name = content->NodeInfo()->NameAtom();
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    DecrIndentation(name);
-  }
-
-  if (!outputElementEnd) {
-    // Keep this in sync with the cleanup at the end of this method.
-    PopNameSpaceDeclsFor(aElement);
-    MaybeLeaveFromPreContent(content);
-    MaybeFlagNewlineForRootNode(aElement);
-    AfterElementEnd(content, *mOutput);
-    return NS_OK;
-  }
-
-  nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
-
-  aElement->NodeInfo()->GetPrefix(tagPrefix);
-  aElement->NodeInfo()->GetName(tagLocalName);
-  aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
-
-#ifdef DEBUG
-  bool debugNeedToPushNamespace =
-#endif
-      ConfirmPrefix(tagPrefix, tagNamespaceURI, aElement, false);
-  NS_ASSERTION(!debugNeedToPushNamespace,
-               "Can't push namespaces in closing tag!");
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
-    bool lineBreakBeforeClose =
-        LineBreakBeforeClose(content->GetNameSpaceID(), name);
-
-    if (mColPos && lineBreakBeforeClose) {
-      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    }
-    if (!mColPos) {
-      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-    } else if (mAddSpace) {
-      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                     NS_ERROR_OUT_OF_MEMORY);
-      mAddSpace = false;
-    }
-  } else if (mAddSpace) {
-    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
-                   NS_ERROR_OUT_OF_MEMORY);
-    mAddSpace = false;
-  }
-
-  NS_ENSURE_TRUE(AppendToString(kEndTag, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  if (!tagPrefix.IsEmpty()) {
-    NS_ENSURE_TRUE(AppendToString(tagPrefix, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-    NS_ENSURE_TRUE(AppendToString(u":"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
-  }
-  NS_ENSURE_TRUE(AppendToString(tagLocalName, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
-                 NS_ERROR_OUT_OF_MEMORY);
-
-  // Keep what follows in sync with the cleanup in the !outputElementEnd case.
-  PopNameSpaceDeclsFor(aElement);
-
-  MaybeLeaveFromPreContent(content);
-
-  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
-      LineBreakAfterClose(content->GetNameSpaceID(), name)) {
-    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
-  } else {
-    MaybeFlagNewlineForRootNode(aElement);
-  }
-
-  AfterElementEnd(content, *mOutput);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::Finish() {
-  NS_ENSURE_STATE(mOutput);
-
-  mOutput = nullptr;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::GetOutputLength(uint32_t& aLength) const {
-  NS_ENSURE_STATE(mOutput);
-
-  aLength = mOutput->Length();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXMLContentSerializer::AppendDocumentStart(Document* aDocument) {
-  NS_ENSURE_ARG_POINTER(aDocument);
-  NS_ENSURE_STATE(mOutput);
-
-  nsAutoString version, encoding, standalone;
-  aDocument->GetXMLDeclaration(version, encoding, standalone);
-
-  if (version.IsEmpty())
-    return NS_OK;  // A declaration must have version, or there is no decl
-
-  constexpr auto endQuote = u"\""_ns;
-
-  *mOutput += u"<?xml version=\""_ns + version + endQuote;
-
-  if (!mCharset.IsEmpty()) {
-    *mOutput +=
-        u" encoding=\""_ns + NS_ConvertASCIItoUTF16(mCharset) + endQuote;
-  }
-  // Otherwise just don't output an encoding attr.  Not that we expect
-  // mCharset to ever be empty.
-#ifdef DEBUG
-  else {
-    NS_WARNING("Empty mCharset?  How come?");
-  }
-#endif
-
-  if (!standalone.IsEmpty()) {
-    *mOutput += u" standalone=\""_ns + standalone + endQuote;
-  }
-
-  NS_ENSURE_TRUE(mOutput->AppendLiteral("?>", mozilla::fallible),
-                 NS_ERROR_OUT_OF_MEMORY);
-  mAddNewlineForRootNode = true;
-
-  return NS_OK;
-}
-
-bool nsXMLContentSerializer::CheckElementStart(Element*, bool& aForceFormat,
-                                               nsAString& aStr,
-                                               nsresult& aResult) {
-  aResult = NS_OK;
-  aForceFormat = false;
-  return true;
-}
-
-bool nsXMLContentSerializer::CheckElementEnd(Element* aElement,
-                                             Element* aOriginalElement,
-                                             bool& aForceFormat,
-                                             nsAString& aStr) {
-  // We don't output a separate end tag for empty element
-  aForceFormat = false;
-  return ElementNeedsSeparateEndTag(aElement, aOriginalElement);
-}
-
-bool nsXMLContentSerializer::AppendToString(const char16_t aChar,
-                                            nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-  mColPos += 1;
-  return aOutputStr.Append(aChar, mozilla::fallible);
-}
-
-bool nsXMLContentSerializer::AppendToString(const nsAString& aStr,
-                                            nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-  mColPos += aStr.Length();
-  return aOutputStr.Append(aStr, mozilla::fallible);
-}
-
-#define _ 0
-
-// This table indexes into kEntityStrings[].
-static const uint8_t kEntities[] = {
-    // clang-format off
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, 2, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  3, _, 4
-    // clang-format on
-};
-
-// This table indexes into kEntityStrings[].
-static const uint8_t kAttrEntities[] = {
-    // clang-format off
-  _, _, _, _, _, _, _, _, _, 5,
-  6, _, _, 7, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, 1, _, _, _, 2, _,
-  _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _,
-  3, _, 4
-    // clang-format on
-};
-
-#undef _
-
-static const char* const kEntityStrings[] = {
-    /* 0 */ nullptr,
-    /* 1 */ "&quot;",
-    /* 2 */ "&amp;",
-    /* 3 */ "&lt;",
-    /* 4 */ "&gt;",
-    /* 5 */ "&#9;",
-    /* 6 */ "&#xA;",
-    /* 7 */ "&#xD;",
-};
-
-bool nsXMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
-                                                        nsAString& aOutputStr) {
-  if (mInAttribute) {
-    return AppendAndTranslateEntities<kGTVal>(aStr, aOutputStr, kAttrEntities,
-                                              kEntityStrings);
-  }
-
-  return AppendAndTranslateEntities<kGTVal>(aStr, aOutputStr, kEntities,
-                                            kEntityStrings);
-}
-
-/* static */
-bool nsXMLContentSerializer::AppendAndTranslateEntities(
-    const nsAString& aStr, nsAString& aOutputStr, const uint8_t aEntityTable[],
-    uint16_t aMaxTableIndex, const char* const aStringTable[]) {
-  nsReadingIterator<char16_t> done_reading;
-  aStr.EndReading(done_reading);
-
-  // for each chunk of |aString|...
-  uint32_t advanceLength = 0;
-  nsReadingIterator<char16_t> iter;
-
-  for (aStr.BeginReading(iter); iter != done_reading;
-       iter.advance(int32_t(advanceLength))) {
-    uint32_t fragmentLength = done_reading - iter;
-    const char16_t* c = iter.get();
-    const char16_t* fragmentStart = c;
-    const char16_t* fragmentEnd = c + fragmentLength;
-    const char* entityText = nullptr;
-
-    advanceLength = 0;
-    // for each character in this chunk, check if it
-    // needs to be replaced
-    for (; c < fragmentEnd; c++, advanceLength++) {
-      char16_t val = *c;
-      if ((val <= aMaxTableIndex) && aEntityTable[val]) {
-        entityText = aStringTable[aEntityTable[val]];
-        break;
-      }
-    }
-
-    NS_ENSURE_TRUE(
-        aOutputStr.Append(fragmentStart, advanceLength, mozilla::fallible),
-        false);
-    if (entityText) {
-      NS_ENSURE_TRUE(AppendASCIItoUTF16(mozilla::MakeStringSpan(entityText),
-                                        aOutputStr, mozilla::fallible),
-                     false);
-      advanceLength++;
-    }
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::MaybeAddNewlineForRootNode(nsAString& aStr) {
-  if (mAddNewlineForRootNode) {
-    return AppendNewLineToString(aStr);
-  }
-
-  return true;
-}
-
-void nsXMLContentSerializer::MaybeFlagNewlineForRootNode(nsINode* aNode) {
-  nsINode* parent = aNode->GetParentNode();
-  if (parent) {
-    mAddNewlineForRootNode = parent->IsDocument();
-  }
-}
-
-void nsXMLContentSerializer::MaybeEnterInPreContent(nsIContent* aNode) {
-  // support of the xml:space attribute
-  nsAutoString space;
-  if (ShouldMaintainPreLevel() && aNode->IsElement() &&
-      aNode->AsElement()->GetAttr(kNameSpaceID_XML, nsGkAtoms::space, space) &&
-      space.EqualsLiteral("preserve")) {
-    ++PreLevel();
-  }
-}
-
-void nsXMLContentSerializer::MaybeLeaveFromPreContent(nsIContent* aNode) {
-  // support of the xml:space attribute
-  nsAutoString space;
-  if (ShouldMaintainPreLevel() && aNode->IsElement() &&
-      aNode->AsElement()->GetAttr(kNameSpaceID_XML, nsGkAtoms::space, space) &&
-      space.EqualsLiteral("preserve")) {
-    --PreLevel();
-  }
-}
-
-bool nsXMLContentSerializer::AppendNewLineToString(nsAString& aStr) {
-  bool result = AppendToString(mLineBreak, aStr);
-  mMayIgnoreLineBreakSequence = true;
-  mColPos = 0;
-  mAddSpace = false;
-  mIsIndentationAddedOnCurrentLine = false;
-  return result;
-}
-
-bool nsXMLContentSerializer::AppendIndentation(nsAString& aStr) {
-  mIsIndentationAddedOnCurrentLine = true;
-  bool result = AppendToString(mIndent, aStr);
-  mAddSpace = false;
-  mMayIgnoreLineBreakSequence = false;
-  return result;
-}
-
-bool nsXMLContentSerializer::IncrIndentation(nsAtom* aName) {
-  // we want to keep the source readable
-  if (mDoWrap &&
-      mIndent.Length() >= uint32_t(mMaxColumn) - MIN_INDENTED_LINE_LENGTH) {
-    ++mIndentOverflow;
-  } else {
-    return mIndent.AppendLiteral(INDENT_STRING, mozilla::fallible);
-  }
-
-  return true;
-}
-
-void nsXMLContentSerializer::DecrIndentation(nsAtom* aName) {
-  if (mIndentOverflow)
-    --mIndentOverflow;
-  else
-    mIndent.Cut(0, INDENT_STRING_LENGTH);
-}
-
-bool nsXMLContentSerializer::LineBreakBeforeOpen(int32_t aNamespaceID,
-                                                 nsAtom* aName) {
-  return mAddSpace;
-}
-
-bool nsXMLContentSerializer::LineBreakAfterOpen(int32_t aNamespaceID,
-                                                nsAtom* aName) {
-  return false;
-}
-
-bool nsXMLContentSerializer::LineBreakBeforeClose(int32_t aNamespaceID,
-                                                  nsAtom* aName) {
-  return mAddSpace;
-}
-
-bool nsXMLContentSerializer::LineBreakAfterClose(int32_t aNamespaceID,
-                                                 nsAtom* aName) {
-  return false;
-}
-
-bool nsXMLContentSerializer::AppendToStringConvertLF(const nsAString& aStr,
-                                                     nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-
-  if (mDoRaw) {
-    NS_ENSURE_TRUE(AppendToString(aStr, aOutputStr), false);
-  } else {
-    // Convert line-endings to mLineBreak
-    uint32_t start = 0;
-    uint32_t theLen = aStr.Length();
-    while (start < theLen) {
-      int32_t eol = aStr.FindChar('\n', start);
-      if (eol == kNotFound) {
-        nsDependentSubstring dataSubstring(aStr, start, theLen - start);
-        NS_ENSURE_TRUE(AppendToString(dataSubstring, aOutputStr), false);
-        start = theLen;
-        // if there was a line break before this substring
-        // AppendNewLineToString was called, so we should reverse
-        // this flag
-        mMayIgnoreLineBreakSequence = false;
-      } else {
-        nsDependentSubstring dataSubstring(aStr, start, eol - start);
-        NS_ENSURE_TRUE(AppendToString(dataSubstring, aOutputStr), false);
-        NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
-        start = eol + 1;
-      }
-    }
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::AppendFormatedWrapped_WhitespaceSequence(
-    nsAString::const_char_iterator& aPos,
-    const nsAString::const_char_iterator aEnd,
-    const nsAString::const_char_iterator aSequenceStart,
-    bool& aMayIgnoreStartOfLineWhitespaceSequence, nsAString& aOutputStr) {
-  // Handle the complete sequence of whitespace.
-  // Continue to iterate until we find the first non-whitespace char.
-  // Updates "aPos" to point to the first unhandled char.
-  // Also updates the aMayIgnoreStartOfLineWhitespaceSequence flag,
-  // as well as the other "global" state flags.
-
-  bool sawBlankOrTab = false;
-  bool leaveLoop = false;
-
-  do {
-    switch (*aPos) {
-      case ' ':
-      case '\t':
-        sawBlankOrTab = true;
-        [[fallthrough]];
-      case '\n':
-        ++aPos;
-        // do not increase mColPos,
-        // because we will reduce the whitespace to a single char
-        break;
-      default:
-        leaveLoop = true;
-        break;
-    }
-  } while (!leaveLoop && aPos < aEnd);
-
-  if (mAddSpace) {
-    // if we had previously been asked to add space,
-    // our situation has not changed
-  } else if (!sawBlankOrTab && mMayIgnoreLineBreakSequence) {
-    // nothing to do in the case where line breaks have already been added
-    // before the call of AppendToStringWrapped
-    // and only if we found line break in the sequence
-    mMayIgnoreLineBreakSequence = false;
-  } else if (aMayIgnoreStartOfLineWhitespaceSequence) {
-    // nothing to do
-    aMayIgnoreStartOfLineWhitespaceSequence = false;
-  } else {
-    if (sawBlankOrTab) {
-      if (mDoWrap && mColPos + 1 >= mMaxColumn) {
-        // no much sense in delaying, we only have one slot left,
-        // let's write a break now
-        bool result = aOutputStr.Append(mLineBreak, mozilla::fallible);
-        mColPos = 0;
-        mIsIndentationAddedOnCurrentLine = false;
-        mMayIgnoreLineBreakSequence = true;
-        NS_ENSURE_TRUE(result, false);
-      } else {
-        // do not write out yet, we may write out either a space or a linebreak
-        // let's delay writing it out until we know more
-        mAddSpace = true;
-        ++mColPos;  // eat a slot of available space
-      }
-    } else {
-      // Asian text usually does not contain spaces, therefore we should not
-      // transform a linebreak into a space.
-      // Since we only saw linebreaks, but no spaces or tabs,
-      // let's write a linebreak now.
-      NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
-    }
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::AppendWrapped_NonWhitespaceSequence(
-    nsAString::const_char_iterator& aPos,
-    const nsAString::const_char_iterator aEnd,
-    const nsAString::const_char_iterator aSequenceStart,
-    bool& aMayIgnoreStartOfLineWhitespaceSequence,
-    bool& aSequenceStartAfterAWhiteSpace, nsAString& aOutputStr) {
-  mMayIgnoreLineBreakSequence = false;
-  aMayIgnoreStartOfLineWhitespaceSequence = false;
-
-  // Handle the complete sequence of non-whitespace in this block
-  // Iterate until we find the first whitespace char or an aEnd condition
-  // Updates "aPos" to point to the first unhandled char.
-  // Also updates the aMayIgnoreStartOfLineWhitespaceSequence flag,
-  // as well as the other "global" state flags.
-
-  bool thisSequenceStartsAtBeginningOfLine = !mColPos;
-  bool onceAgainBecauseWeAddedBreakInFront = false;
-  bool foundWhitespaceInLoop;
-  uint32_t length, colPos;
-
-  do {
-    if (mColPos) {
-      colPos = mColPos;
-    } else {
-      if (mDoFormat && !mDoRaw && !PreLevel() &&
-          !onceAgainBecauseWeAddedBreakInFront) {
-        colPos = mIndent.Length();
-      } else
-        colPos = 0;
-    }
-    foundWhitespaceInLoop = false;
-    length = 0;
-    // we iterate until the next whitespace character
-    // or until we reach the maximum of character per line
-    // or until the end of the string to add.
-    do {
-      if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
-        foundWhitespaceInLoop = true;
-        break;
-      }
-
-      ++aPos;
-      ++length;
-    } while ((!mDoWrap || colPos + length < mMaxColumn) && aPos < aEnd);
-
-    // in the case we don't reached the end of the string, but we reached the
-    // maxcolumn, we see if there is a whitespace after the maxcolumn if yes,
-    // then we can append directly the string instead of appending a new line
-    // etc.
-    if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
-      foundWhitespaceInLoop = true;
-    }
-
-    if (aPos == aEnd || foundWhitespaceInLoop) {
-      // there is enough room for the complete block we found
-      if (mDoFormat && !mColPos) {
-        NS_ENSURE_TRUE(AppendIndentation(aOutputStr), false);
-      } else if (mAddSpace) {
-        bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
-        mAddSpace = false;
-        NS_ENSURE_TRUE(result, false);
-      }
-
-      mColPos += length;
-      NS_ENSURE_TRUE(aOutputStr.Append(aSequenceStart, aPos - aSequenceStart,
-                                       mozilla::fallible),
-                     false);
-
-      // We have not yet reached the max column, we will continue to
-      // fill the current line in the next outer loop iteration
-      // (this one in AppendToStringWrapped)
-      // make sure we return in this outer loop
-      onceAgainBecauseWeAddedBreakInFront = false;
-    } else {  // we reach the max column
-      if (!thisSequenceStartsAtBeginningOfLine &&
-          (mAddSpace || (!mDoFormat && aSequenceStartAfterAWhiteSpace))) {
-        // when !mDoFormat, mAddSpace is not used, mAddSpace is always false
-        // so, in the case where mDoWrap && !mDoFormat, if we want to enter in
-        // this condition...
-
-        // We can avoid to wrap. We try to add the whole block
-        // in an empty new line
-
-        NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
-        aPos = aSequenceStart;
-        thisSequenceStartsAtBeginningOfLine = true;
-        onceAgainBecauseWeAddedBreakInFront = true;
-      } else {
-        // we must wrap
-        onceAgainBecauseWeAddedBreakInFront = false;
-        bool foundWrapPosition = false;
-        int32_t wrapPosition = 0;
-
-        if (mAllowLineBreaking) {
-          mozilla::intl::LineBreaker* lineBreaker =
-              nsContentUtils::LineBreaker();
-
-          wrapPosition =
-              lineBreaker->Prev(aSequenceStart, (aEnd - aSequenceStart),
-                                (aPos - aSequenceStart) + 1);
-          if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
-            foundWrapPosition = true;
-          } else {
-            wrapPosition =
-                lineBreaker->Next(aSequenceStart, (aEnd - aSequenceStart),
-                                  (aPos - aSequenceStart));
-            if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
-              foundWrapPosition = true;
-            }
-          }
-        }
-
-        if (foundWrapPosition) {
-          if (!mColPos && mDoFormat) {
-            NS_ENSURE_TRUE(AppendIndentation(aOutputStr), false);
-          } else if (mAddSpace) {
-            bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
-            mAddSpace = false;
-            NS_ENSURE_TRUE(result, false);
-          }
-          NS_ENSURE_TRUE(aOutputStr.Append(aSequenceStart, wrapPosition,
-                                           mozilla::fallible),
-                         false);
-
-          NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
-          aPos = aSequenceStart + wrapPosition;
-          aMayIgnoreStartOfLineWhitespaceSequence = true;
-        } else {
-          // try some simple fallback logic
-          // go forward up to the next whitespace position,
-          // in the worst case this will be all the rest of the data
-
-          // we update the mColPos variable with the length of
-          // the part already parsed.
-          mColPos += length;
-
-          // now try to find the next whitespace
-          do {
-            if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
-              break;
-            }
-
-            ++aPos;
-            ++mColPos;
-          } while (aPos < aEnd);
-
-          if (mAddSpace) {
-            bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
-            mAddSpace = false;
-            NS_ENSURE_TRUE(result, false);
-          }
-          NS_ENSURE_TRUE(
-              aOutputStr.Append(aSequenceStart, aPos - aSequenceStart,
-                                mozilla::fallible),
-              false);
-        }
-      }
-      aSequenceStartAfterAWhiteSpace = false;
-    }
-  } while (onceAgainBecauseWeAddedBreakInFront);
-
-  return true;
-}
-
-bool nsXMLContentSerializer::AppendToStringFormatedWrapped(
-    const nsAString& aStr, nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-
-  nsAString::const_char_iterator pos, end, sequenceStart;
-
-  aStr.BeginReading(pos);
-  aStr.EndReading(end);
-
-  bool sequenceStartAfterAWhitespace = false;
-  if (pos < end) {
-    nsAString::const_char_iterator end2;
-    aOutputStr.EndReading(end2);
-    --end2;
-    if (*end2 == ' ' || *end2 == '\n' || *end2 == '\t') {
-      sequenceStartAfterAWhitespace = true;
-    }
-  }
-
-  // if the current line already has text on it, such as a tag,
-  // leading whitespace is significant
-  bool mayIgnoreStartOfLineWhitespaceSequence =
-      (!mColPos ||
-       (mIsIndentationAddedOnCurrentLine && sequenceStartAfterAWhitespace &&
-        uint32_t(mColPos) == mIndent.Length()));
-
-  while (pos < end) {
-    sequenceStart = pos;
-
-    // if beginning of a whitespace sequence
-    if (*pos == ' ' || *pos == '\n' || *pos == '\t') {
-      NS_ENSURE_TRUE(AppendFormatedWrapped_WhitespaceSequence(
-                         pos, end, sequenceStart,
-                         mayIgnoreStartOfLineWhitespaceSequence, aOutputStr),
-                     false);
-    } else {  // any other non-whitespace char
-      NS_ENSURE_TRUE(
-          AppendWrapped_NonWhitespaceSequence(
-              pos, end, sequenceStart, mayIgnoreStartOfLineWhitespaceSequence,
-              sequenceStartAfterAWhitespace, aOutputStr),
-          false);
-    }
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::AppendWrapped_WhitespaceSequence(
-    nsAString::const_char_iterator& aPos,
-    const nsAString::const_char_iterator aEnd,
-    const nsAString::const_char_iterator aSequenceStart,
-    nsAString& aOutputStr) {
-  // Handle the complete sequence of whitespace.
-  // Continue to iterate until we find the first non-whitespace char.
-  // Updates "aPos" to point to the first unhandled char.
-  mAddSpace = false;
-  mIsIndentationAddedOnCurrentLine = false;
-
-  bool leaveLoop = false;
-  nsAString::const_char_iterator lastPos = aPos;
-
-  do {
-    switch (*aPos) {
-      case ' ':
-      case '\t':
-        // if there are too many spaces on a line, we wrap
-        if (mColPos >= mMaxColumn) {
-          if (lastPos != aPos) {
-            NS_ENSURE_TRUE(
-                aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible),
-                false);
-          }
-          NS_ENSURE_TRUE(AppendToString(mLineBreak, aOutputStr), false);
-          mColPos = 0;
-          lastPos = aPos;
-        }
-
-        ++mColPos;
-        ++aPos;
-        break;
-      case '\n':
-        if (lastPos != aPos) {
-          NS_ENSURE_TRUE(
-              aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible),
-              false);
-        }
-        NS_ENSURE_TRUE(AppendToString(mLineBreak, aOutputStr), false);
-        mColPos = 0;
-        ++aPos;
-        lastPos = aPos;
-        break;
-      default:
-        leaveLoop = true;
-        break;
-    }
-  } while (!leaveLoop && aPos < aEnd);
-
-  if (lastPos != aPos) {
-    NS_ENSURE_TRUE(
-        aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible), false);
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::AppendToStringWrapped(const nsAString& aStr,
-                                                   nsAString& aOutputStr) {
-  if (mBodyOnly && !mInBody) {
-    return true;
-  }
-
-  nsAString::const_char_iterator pos, end, sequenceStart;
-
-  aStr.BeginReading(pos);
-  aStr.EndReading(end);
-
-  // not used in this case, but needed by AppendWrapped_NonWhitespaceSequence
-  bool mayIgnoreStartOfLineWhitespaceSequence = false;
-  mMayIgnoreLineBreakSequence = false;
-
-  bool sequenceStartAfterAWhitespace = false;
-  if (pos < end && !aOutputStr.IsEmpty()) {
-    nsAString::const_char_iterator end2;
-    aOutputStr.EndReading(end2);
-    --end2;
-    if (*end2 == ' ' || *end2 == '\n' || *end2 == '\t') {
-      sequenceStartAfterAWhitespace = true;
-    }
-  }
-
-  while (pos < end) {
-    sequenceStart = pos;
-
-    // if beginning of a whitespace sequence
-    if (*pos == ' ' || *pos == '\n' || *pos == '\t') {
-      sequenceStartAfterAWhitespace = true;
-      NS_ENSURE_TRUE(
-          AppendWrapped_WhitespaceSequence(pos, end, sequenceStart, aOutputStr),
-          false);
-    } else {  // any other non-whitespace char
-      NS_ENSURE_TRUE(
-          AppendWrapped_NonWhitespaceSequence(
-              pos, end, sequenceStart, mayIgnoreStartOfLineWhitespaceSequence,
-              sequenceStartAfterAWhitespace, aOutputStr),
-          false);
-    }
-  }
-
-  return true;
-}
-
-bool nsXMLContentSerializer::ShouldMaintainPreLevel() const {
-  // Only attempt to maintain the pre level for consumers who care about it.
-  return !mDoRaw || (mFlags & nsIDocumentEncoder::OutputNoFormattingInPre);
-}
-
-bool nsXMLContentSerializer::MaybeSerializeIsValue(Element* aElement,
-                                                   nsAString& aStr) {
-  CustomElementData* ceData = aElement->GetCustomElementData();
-  if (ceData) {
-    nsAtom* isAttr = ceData->GetIs(aElement);
-    if (isAttr && !aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::is)) {
-      NS_ENSURE_TRUE(aStr.AppendLiteral(" is=\"", mozilla::fallible), false);
-      NS_ENSURE_TRUE(
-          aStr.Append(nsDependentAtomString(isAttr), mozilla::fallible), false);
-      NS_ENSURE_TRUE(aStr.AppendLiteral("\"", mozilla::fallible), false);
-    }
-  }
-
-  return true;
-}
diff -Nru firefox-84.0.2+build1/dom/base/nsXMLContentSerializer.h firefox-85.0+build1/dom/base/nsXMLContentSerializer.h
--- firefox-84.0.2+build1/dom/base/nsXMLContentSerializer.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/nsXMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,452 +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/. */
-
-/*
- * nsIContentSerializer implementation that can be used with an
- * nsIDocumentEncoder to convert an XML DOM to an XML string that
- * could be parsed into more or less the original DOM.
- */
-
-#ifndef nsXMLContentSerializer_h__
-#define nsXMLContentSerializer_h__
-
-#include "mozilla/Attributes.h"
-#include "nsIContentSerializer.h"
-#include "nsISupportsUtils.h"
-#include "nsCOMPtr.h"
-#include "nsTArray.h"
-#include "nsString.h"
-
-#define kIndentStr u"  "_ns
-#define kEndTag u"</"_ns
-
-class nsAtom;
-class nsINode;
-
-namespace mozilla {
-class Encoding;
-}
-
-class nsXMLContentSerializer : public nsIContentSerializer {
- public:
-  nsXMLContentSerializer();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
-                  const mozilla::Encoding* aEncoding, bool aIsCopying,
-                  bool aRewriteEncodingDeclaration,
-                  bool* aNeedsPreformatScanning, nsAString& aOutput) override;
-
-  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
-                        int32_t aEndOffset) override;
-
-  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
-                                int32_t aEndOffset) override;
-
-  NS_IMETHOD AppendProcessingInstruction(
-      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
-      int32_t aEndOffset) override;
-
-  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
-                           int32_t aStartOffset, int32_t aEndOffset) override;
-
-  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) override;
-
-  NS_IMETHOD AppendElementStart(
-      mozilla::dom::Element* aElement,
-      mozilla::dom::Element* aOriginalElement) override;
-
-  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
-                              mozilla::dom::Element* aOriginalElement) override;
-
-  NS_IMETHOD FlushAndFinish() override { return NS_OK; }
-
-  NS_IMETHOD Finish() override;
-
-  NS_IMETHOD GetOutputLength(uint32_t& aLength) const override;
-
-  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
-
-  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) override {
-    return NS_OK;
-  }
-  NS_IMETHOD ForgetElementForPreformat(
-      mozilla::dom::Element* aElement) override {
-    return NS_OK;
-  }
-
- protected:
-  virtual ~nsXMLContentSerializer();
-
-  /**
-   * Appends a char16_t character and increments the column position
-   */
-  MOZ_MUST_USE
-  bool AppendToString(const char16_t aChar, nsAString& aOutputStr);
-
-  /**
-   * Appends a nsAString string and increments the column position
-   */
-  MOZ_MUST_USE
-  bool AppendToString(const nsAString& aStr, nsAString& aOutputStr);
-
-  /**
-   * Appends a string by replacing all line-endings
-   * by mLineBreak, except in the case of raw output.
-   * It increments the column position.
-   */
-  MOZ_MUST_USE
-  bool AppendToStringConvertLF(const nsAString& aStr, nsAString& aOutputStr);
-
-  /**
-   * Appends a string by wrapping it when necessary.
-   * It updates the column position.
-   */
-  MOZ_MUST_USE
-  bool AppendToStringWrapped(const nsAString& aStr, nsAString& aOutputStr);
-
-  /**
-   * Appends a string by formating and wrapping it when necessary
-   * It updates the column position.
-   */
-  MOZ_MUST_USE
-  bool AppendToStringFormatedWrapped(const nsAString& aStr,
-                                     nsAString& aOutputStr);
-
-  // used by AppendToStringWrapped
-  MOZ_MUST_USE
-  bool AppendWrapped_WhitespaceSequence(
-      nsAString::const_char_iterator& aPos,
-      const nsAString::const_char_iterator aEnd,
-      const nsAString::const_char_iterator aSequenceStart,
-      nsAString& aOutputStr);
-
-  // used by AppendToStringFormatedWrapped
-  MOZ_MUST_USE
-  bool AppendFormatedWrapped_WhitespaceSequence(
-      nsAString::const_char_iterator& aPos,
-      const nsAString::const_char_iterator aEnd,
-      const nsAString::const_char_iterator aSequenceStart,
-      bool& aMayIgnoreStartOfLineWhitespaceSequence, nsAString& aOutputStr);
-
-  // used by AppendToStringWrapped and AppendToStringFormatedWrapped
-  MOZ_MUST_USE
-  bool AppendWrapped_NonWhitespaceSequence(
-      nsAString::const_char_iterator& aPos,
-      const nsAString::const_char_iterator aEnd,
-      const nsAString::const_char_iterator aSequenceStart,
-      bool& aMayIgnoreStartOfLineWhitespaceSequence,
-      bool& aSequenceStartAfterAWhiteSpace, nsAString& aOutputStr);
-
-  /**
-   * add mLineBreak to the string
-   * It updates the column position and other flags.
-   */
-  MOZ_MUST_USE
-  bool AppendNewLineToString(nsAString& aOutputStr);
-
-  /**
-   * Appends a string by translating entities
-   * It doesn't increment the column position
-   */
-  MOZ_MUST_USE
-  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
-                                          nsAString& aOutputStr);
-
-  /**
-   * Helper for virtual AppendAndTranslateEntities that does the actualy work.
-   *
-   * Do not call this directly.  Call it via the template helper below.
-   */
- private:
-  MOZ_MUST_USE
-  static bool AppendAndTranslateEntities(const nsAString& aStr,
-                                         nsAString& aOutputStr,
-                                         const uint8_t aEntityTable[],
-                                         uint16_t aMaxTableIndex,
-                                         const char* const aStringTable[]);
-
- protected:
-  /**
-   * Helper for calling AppendAndTranslateEntities in a way that guarantees we
-   * don't mess up our aEntityTable sizing.  This is a bit more complicated than
-   * it could be, becaue sometimes we don't want to use all of aEntityTable, so
-   * we have to allow passing the amount to use independently.  But we can
-   * statically ensure it's not too big.
-   *
-   * The first integer template argument, which callers need to specify
-   * explicitly, is the index of the last entry in aEntityTable that should be
-   * considered for encoding as an entity reference.  The second integer
-   * argument will be deduced from the actual table passed in.
-   *
-   * aEntityTable contains as values indices into aStringTable.  Those represent
-   * the strings that should be used to replace the characters that are used to
-   * index into aEntityTable.  aStringTable[0] should be nullptr, and characters
-   * that do not need replacement should map to 0 in aEntityTable.
-   */
-  template <uint16_t LargestIndex, uint16_t TableLength>
-  MOZ_MUST_USE bool AppendAndTranslateEntities(
-      const nsAString& aStr, nsAString& aOutputStr,
-      const uint8_t (&aEntityTable)[TableLength],
-      const char* const aStringTable[]) {
-    static_assert(LargestIndex < TableLength,
-                  "Largest allowed index must be smaller than table length");
-    return AppendAndTranslateEntities(aStr, aOutputStr, aEntityTable,
-                                      LargestIndex, aStringTable);
-  }
-
-  /**
-   * Max index that can be used with some of our entity tables.
-   */
-  static const uint16_t kGTVal = 62;
-
-  /**
-   * retrieve the text content of the node and append it to the given string
-   * It doesn't increment the column position
-   */
-  nsresult AppendTextData(nsIContent* aNode, int32_t aStartOffset,
-                          int32_t aEndOffset, nsAString& aStr,
-                          bool aTranslateEntities);
-
-  virtual nsresult PushNameSpaceDecl(const nsAString& aPrefix,
-                                     const nsAString& aURI, nsIContent* aOwner);
-  void PopNameSpaceDeclsFor(nsIContent* aOwner);
-
-  /**
-   * The problem that ConfirmPrefix fixes is that anyone can insert nodes
-   * through the DOM that have a namespace URI and a random or empty or
-   * previously existing prefix that's totally unrelated to the prefixes
-   * declared at that point through xmlns attributes.  So what ConfirmPrefix
-   * does is ensure that we can map aPrefix to the namespace URI aURI (for
-   * example, that the prefix is not already mapped to some other namespace).
-   * aPrefix will be adjusted, if necessary, so the value of the prefix
-   * _after_ this call is what should be serialized.
-   * @param aPrefix the prefix that may need adjusting
-   * @param aURI the namespace URI we want aPrefix to point to
-   * @param aElement the element we're working with (needed for proper default
-   *                 namespace handling)
-   * @param aIsAttribute true if we're confirming a prefix for an attribute.
-   * @return true if we need to push the (prefix, uri) pair on the namespace
-   *                 stack (note that this can happen even if the prefix is
-   *                 empty).
-   */
-  bool ConfirmPrefix(nsAString& aPrefix, const nsAString& aURI,
-                     nsIContent* aElement, bool aIsAttribute);
-  /**
-   * GenerateNewPrefix generates a new prefix and writes it to aPrefix
-   */
-  void GenerateNewPrefix(nsAString& aPrefix);
-
-  uint32_t ScanNamespaceDeclarations(mozilla::dom::Element* aContent,
-                                     mozilla::dom::Element* aOriginalElement,
-                                     const nsAString& aTagNamespaceURI);
-
-  MOZ_MUST_USE
-  virtual bool SerializeAttributes(mozilla::dom::Element* aContent,
-                                   mozilla::dom::Element* aOriginalElement,
-                                   nsAString& aTagPrefix,
-                                   const nsAString& aTagNamespaceURI,
-                                   nsAtom* aTagName, nsAString& aStr,
-                                   uint32_t aSkipAttr, bool aAddNSAttr);
-
-  MOZ_MUST_USE
-  bool SerializeAttr(const nsAString& aPrefix, const nsAString& aName,
-                     const nsAString& aValue, nsAString& aStr,
-                     bool aDoEscapeEntities);
-
-  bool IsJavaScript(nsIContent* aContent, nsAtom* aAttrNameAtom,
-                    int32_t aAttrNamespaceID, const nsAString& aValueString);
-
-  /**
-   * This method can be redefined to check if the element can be serialized.
-   * It is called when the serialization of the start tag is asked
-   * (AppendElementStart)
-   * In this method you can also force the formating
-   * by setting aForceFormat to true.
-   * @return boolean  true if the element can be output
-   */
-  virtual bool CheckElementStart(mozilla::dom::Element* aElement,
-                                 bool& aForceFormat, nsAString& aStr,
-                                 nsresult& aResult);
-
-  /**
-   * This method is responsible for appending the '>' at the end of the start
-   * tag, possibly preceded by '/' and maybe a ' ' before that too.
-   *
-   * aElement and aOriginalElement are the same as the corresponding arguments
-   * to AppendElementStart.
-   */
-  MOZ_MUST_USE
-  bool AppendEndOfElementStart(mozilla::dom::Element* aEleemnt,
-                               mozilla::dom::Element* aOriginalElement,
-                               nsAString& aStr);
-
-  /**
-   * This method can be redefine to serialize additional things just after
-   * after the serialization ot the start tag.
-   * (called at the end of AppendElementStart)
-   */
-  MOZ_MUST_USE
-  virtual bool AfterElementStart(nsIContent* aContent,
-                                 nsIContent* aOriginalElement,
-                                 nsAString& aStr) {
-    return true;
-  };
-
-  /**
-   * This method can be redefined to check if the element can be serialized.
-   * It is called when the serialization of the end tag is asked
-   * (AppendElementEnd)
-   * In this method you can also force the formating
-   * by setting aForceFormat to true.
-   * @return boolean  true if the element can be output
-   */
-  virtual bool CheckElementEnd(mozilla::dom::Element* aElement,
-                               mozilla::dom::Element* aOriginalElement,
-                               bool& aForceFormat, nsAString& aStr);
-
-  /**
-   * This method can be redefine to serialize additional things just after
-   * after the serialization ot the end tag.
-   * (called at the end of AppendElementStart)
-   */
-  virtual void AfterElementEnd(nsIContent* aContent, nsAString& aStr){};
-
-  /**
-   * Returns true if a line break should be inserted before an element open tag
-   */
-  virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsAtom* aName);
-
-  /**
-   * Returns true if a line break should be inserted after an element open tag
-   */
-  virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsAtom* aName);
-
-  /**
-   * Returns true if a line break should be inserted after an element close tag
-   */
-  virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsAtom* aName);
-
-  /**
-   * Returns true if a line break should be inserted after an element close tag
-   */
-  virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsAtom* aName);
-
-  /**
-   * add intendation. Call only in the case of formating and if the current
-   * position is at 0. It updates the column position.
-   */
-  MOZ_MUST_USE
-  bool AppendIndentation(nsAString& aStr);
-
-  MOZ_MUST_USE
-  bool IncrIndentation(nsAtom* aName);
-  void DecrIndentation(nsAtom* aName);
-
-  // Functions to check for newlines that needs to be added between nodes in
-  // the root of a document. See mAddNewlineForRootNode
-  MOZ_MUST_USE
-  bool MaybeAddNewlineForRootNode(nsAString& aStr);
-  void MaybeFlagNewlineForRootNode(nsINode* aNode);
-
-  // Functions to check if we enter in or leave from a preformated content
-  virtual void MaybeEnterInPreContent(nsIContent* aNode);
-  virtual void MaybeLeaveFromPreContent(nsIContent* aNode);
-
-  bool ShouldMaintainPreLevel() const;
-  int32_t PreLevel() const {
-    MOZ_ASSERT(ShouldMaintainPreLevel());
-    return mPreLevel;
-  }
-  int32_t& PreLevel() {
-    MOZ_ASSERT(ShouldMaintainPreLevel());
-    return mPreLevel;
-  }
-
-  bool MaybeSerializeIsValue(mozilla::dom::Element* aElement, nsAString& aStr);
-
-  int32_t mPrefixIndex;
-
-  struct NameSpaceDecl {
-    nsString mPrefix;
-    nsString mURI;
-    nsIContent* mOwner;
-  };
-
-  nsTArray<NameSpaceDecl> mNameSpaceStack;
-
-  // nsIDocumentEncoder flags
-  MOZ_INIT_OUTSIDE_CTOR uint32_t mFlags;
-
-  // characters to use for line break
-  nsString mLineBreak;
-
-  // The charset that was passed to Init()
-  nsCString mCharset;
-
-  // current column position on the current line
-  uint32_t mColPos;
-
-  // true = pretty formating should be done (OutputFormated flag)
-  MOZ_INIT_OUTSIDE_CTOR bool mDoFormat;
-
-  // true = no formatting,(OutputRaw flag)
-  // no newline convertion and no rewrap long lines even if OutputWrap is set.
-  MOZ_INIT_OUTSIDE_CTOR bool mDoRaw;
-
-  // true = wrapping should be done (OutputWrap flag)
-  MOZ_INIT_OUTSIDE_CTOR bool mDoWrap;
-
-  // true = we can break lines (OutputDisallowLineBreaking flag)
-  MOZ_INIT_OUTSIDE_CTOR bool mAllowLineBreaking;
-
-  // number of maximum column in a line, in the wrap mode
-  MOZ_INIT_OUTSIDE_CTOR uint32_t mMaxColumn;
-
-  // current indent value
-  nsString mIndent;
-
-  // this is the indentation level after the indentation reached
-  // the maximum length of indentation
-  int32_t mIndentOverflow;
-
-  // says if the indentation has been already added on the current line
-  bool mIsIndentationAddedOnCurrentLine;
-
-  // the string which is currently added is in an attribute
-  bool mInAttribute;
-
-  // true = a newline character should be added. It's only
-  // useful when serializing root nodes. see MaybeAddNewlineForRootNode and
-  // MaybeFlagNewlineForRootNode
-  bool mAddNewlineForRootNode;
-
-  // Indicates that a space will be added if and only if content is
-  // continued on the same line while serializing source.  Otherwise,
-  // the newline character acts as the whitespace and no space is needed.
-  // used when mDoFormat = true
-  bool mAddSpace;
-
-  // says that if the next string to add contains a newline character at the
-  // begining, then this newline character should be ignored, because a
-  // such character has already been added into the output string
-  bool mMayIgnoreLineBreakSequence;
-
-  bool mBodyOnly;
-  int32_t mInBody;
-
-  // Non-owning.
-  nsAString* mOutput;
-
- private:
-  // number of nested elements which have preformated content
-  MOZ_INIT_OUTSIDE_CTOR int32_t mPreLevel;
-};
-
-nsresult NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer);
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/base/PlacesEvent.h firefox-85.0+build1/dom/base/PlacesEvent.h
--- firefox-84.0.2+build1/dom/base/PlacesEvent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PlacesEvent.h	2021-01-18 19:58:08.000000000 +0000
@@ -8,10 +8,11 @@
 #define mozilla_dom_PlacesEvent_h
 
 #include "mozilla/dom/PlacesEventBinding.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class PlacesEvent : public nsWrapperCache {
@@ -40,6 +41,7 @@
   virtual const PlacesBookmarkRemoved* AsPlacesBookmarkRemoved() const {
     return nullptr;
   }
+  virtual const PlacesFavicon* AsPlacesFavicon() const { return nullptr; }
 
  protected:
   virtual ~PlacesEvent() = default;
diff -Nru firefox-84.0.2+build1/dom/base/PlacesFavicon.h firefox-85.0+build1/dom/base/PlacesFavicon.h
--- firefox-84.0.2+build1/dom/base/PlacesFavicon.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/PlacesFavicon.h	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,50 @@
+/* -*- 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_PlacesFavicon_h
+#define mozilla_dom_PlacesFavicon_h
+
+#include "mozilla/dom/PlacesEvent.h"
+
+namespace mozilla {
+namespace dom {
+
+class PlacesFavicon final : public PlacesEvent {
+ public:
+  explicit PlacesFavicon() : PlacesEvent(PlacesEventType::Favicon_changed) {}
+
+  static already_AddRefed<PlacesFavicon> Constructor(
+      const GlobalObject& aGlobal, const PlacesFaviconInit& aInitDict) {
+    RefPtr<PlacesFavicon> event = new PlacesFavicon();
+    event->mUrl = aInitDict.mUrl;
+    event->mPageGuid = aInitDict.mPageGuid;
+    event->mFaviconUrl = aInitDict.mFaviconUrl;
+    return event.forget();
+  }
+
+  JSObject* WrapObject(JSContext* aCx,
+                       JS::Handle<JSObject*> aGivenProto) override {
+    return PlacesFavicon_Binding::Wrap(aCx, this, aGivenProto);
+  }
+
+  const PlacesFavicon* AsPlacesFavicon() const override { return this; }
+
+  void GetUrl(nsString& aUrl) const { aUrl = mUrl; }
+  void GetPageGuid(nsCString& aPageGuid) const { aPageGuid = mPageGuid; }
+  void GetFaviconUrl(nsString& aFaviconUrl) const { aFaviconUrl = mFaviconUrl; }
+
+  nsString mUrl;
+  nsCString mPageGuid;
+  nsString mFaviconUrl;
+
+ private:
+  ~PlacesFavicon() = default;
+};
+
+}  // namespace dom
+}  // namespace mozilla
+
+#endif  // mozilla_dom_PlacesFavicon_h
diff -Nru firefox-84.0.2+build1/dom/base/PlacesObservers.h firefox-85.0+build1/dom/base/PlacesObservers.h
--- firefox-84.0.2+build1/dom/base/PlacesObservers.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PlacesObservers.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,11 +11,11 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/PlacesObserversBinding.h"
 #include "mozilla/dom/PlacesEvent.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/places/INativePlacesEventCallback.h"
 #include "nsIWeakReferenceUtils.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/PlacesWeakCallbackWrapper.h firefox-85.0+build1/dom/base/PlacesWeakCallbackWrapper.h
--- firefox-84.0.2+build1/dom/base/PlacesWeakCallbackWrapper.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PlacesWeakCallbackWrapper.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,8 +7,9 @@
 #ifndef mozilla_dom_PlacesWeakCallbackWrapper_h
 #define mozilla_dom_PlacesWeakCallbackWrapper_h
 
+#include "mozilla/WeakPtr.h"
 #include "mozilla/dom/PlacesObserversBinding.h"
-#include "mozilla/ErrorResult.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/base/PopupBlocker.cpp firefox-85.0+build1/dom/base/PopupBlocker.cpp
--- firefox-84.0.2+build1/dom/base/PopupBlocker.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PopupBlocker.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -27,10 +27,6 @@
 
 static TimeStamp sLastAllowedExternalProtocolIFrameTimeStamp;
 
-// This token is by default set to false. When a popup/filePicker is shown, it
-// is set to true.
-static bool sUnusedPopupToken = false;
-
 static uint32_t sOpenPopupSpamCount = 0;
 
 void PopupAllowedEventsChanged() {
@@ -118,21 +114,6 @@
 }
 
 /* static */
-bool PopupBlocker::CanShowPopupByPermission(nsIPrincipal* aPrincipal) {
-  MOZ_ASSERT(aPrincipal);
-  uint32_t permit = GetPopupPermission(aPrincipal);
-
-  if (permit == nsIPermissionManager::ALLOW_ACTION) {
-    return true;
-  }
-  if (permit == nsIPermissionManager::DENY_ACTION) {
-    return false;
-  }
-
-  return !StaticPrefs::dom_disable_open_during_load();
-}
-
-/* static */
 uint32_t PopupBlocker::GetPopupPermission(nsIPrincipal* aPrincipal) {
   uint32_t permit = nsIPermissionManager::UNKNOWN_ACTION;
   nsCOMPtr<nsIPermissionManager> permissionManager =
@@ -147,34 +128,12 @@
 }
 
 /* static */
-bool PopupBlocker::TryUsePopupOpeningToken(nsIPrincipal* aPrincipal) {
-  MOZ_ASSERT(sPopupStatePusherCount);
-
-  if (!sUnusedPopupToken) {
-    sUnusedPopupToken = true;
-    return true;
-  }
-
-  if (aPrincipal && aPrincipal->IsSystemPrincipal()) {
-    return true;
-  }
-
-  return false;
-}
-
-/* static */
-bool PopupBlocker::IsPopupOpeningTokenUnused() { return sUnusedPopupToken; }
-
-/* static */
 void PopupBlocker::PopupStatePusherCreated() { ++sPopupStatePusherCount; }
 
 /* static */
 void PopupBlocker::PopupStatePusherDestroyed() {
   MOZ_ASSERT(sPopupStatePusherCount);
-
-  if (!--sPopupStatePusherCount) {
-    sUnusedPopupToken = false;
-  }
+  --sPopupStatePusherCount;
 }
 
 // static
@@ -431,6 +390,10 @@
 
 /* static */
 bool PopupBlocker::ConsumeTimerTokenForExternalProtocolIframe() {
+  if (!StaticPrefs::dom_delay_block_external_protocol_in_iframes_enabled()) {
+    return false;
+  }
+
   TimeStamp now = TimeStamp::Now();
 
   if (sLastAllowedExternalProtocolIFrameTimeStamp.IsNull()) {
@@ -439,7 +402,7 @@
   }
 
   if ((now - sLastAllowedExternalProtocolIFrameTimeStamp).ToSeconds() <
-      (StaticPrefs::dom_delay_block_external_protocol_in_iframes())) {
+      StaticPrefs::dom_delay_block_external_protocol_in_iframes()) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/dom/base/PopupBlocker.h firefox-85.0+build1/dom/base/PopupBlocker.h
--- firefox-84.0.2+build1/dom/base/PopupBlocker.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PopupBlocker.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,13 +7,17 @@
 #ifndef mozilla_dom_PopupBlocker_h
 #define mozilla_dom_PopupBlocker_h
 
-#include "Element.h"
-#include "mozilla/BasicEvents.h"
+#include <stdint.h>
+#include "mozilla/Attributes.h"
+#include "mozilla/TimeStamp.h"
 
+class AutoPopupStatePusherInternal;
 class nsIPrincipal;
 
 namespace mozilla {
+class WidgetEvent;
 namespace dom {
+class Event;
 
 class PopupBlocker final {
  public:
@@ -40,21 +44,8 @@
   static void PopupStatePusherCreated();
   static void PopupStatePusherDestroyed();
 
-  // This method checks if the principal is allowed by open popups by user
-  // permissions. In this case, the caller should not block popups.
-  static bool CanShowPopupByPermission(nsIPrincipal* aPrincipal);
-
   static uint32_t GetPopupPermission(nsIPrincipal* aPrincipal);
 
-  // This method returns true if the caller is allowed to show a popup, and it
-  // consumes the popup token for the current event. There is just 1 popup
-  // allowed per event.
-  // This method returns true if the token has been already consumed but
-  // aPrincipal is the system principal.
-  static bool TryUsePopupOpeningToken(nsIPrincipal* aPrincipal);
-
-  static bool IsPopupOpeningTokenUnused();
-
   static PopupBlocker::PopupControlState GetEventPopupControlState(
       WidgetEvent* aEvent, Event* aDOMEvent = nullptr);
 
diff -Nru firefox-84.0.2+build1/dom/base/Pose.cpp firefox-85.0+build1/dom/base/Pose.cpp
--- firefox-84.0.2+build1/dom/base/Pose.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Pose.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "js/experimental/TypedData.h"  // JS_GetFloat32ArrayData
+#include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/dom/Pose.h"
diff -Nru firefox-84.0.2+build1/dom/base/Pose.h firefox-85.0+build1/dom/base/Pose.h
--- firefox-84.0.2+build1/dom/base/Pose.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Pose.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,10 +7,11 @@
 #ifndef mozilla_dom_Pose_h
 #define mozilla_dom_Pose_h
 
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Pose : public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/dom/base/PostMessageEvent.cpp firefox-85.0+build1/dom/base/PostMessageEvent.cpp
--- firefox-84.0.2+build1/dom/base/PostMessageEvent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PostMessageEvent.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,31 +7,25 @@
 #include "PostMessageEvent.h"
 
 #include "MessageEvent.h"
-#include "mozilla/dom/BlobBinding.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/DocumentInlines.h"
-#include "mozilla/dom/File.h"
-#include "mozilla/dom/FileList.h"
-#include "mozilla/dom/FileListBinding.h"
 #include "mozilla/dom/MessageEventBinding.h"
 #include "mozilla/dom/MessagePort.h"
-#include "mozilla/dom/MessagePortBinding.h"
-#include "mozilla/dom/PMessagePort.h"
-#include "mozilla/dom/StructuredCloneTags.h"
-#include "mozilla/dom/UnionConversions.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "nsDocShell.h"
-#include "nsGlobalWindow.h"
+#include "nsGlobalWindowInner.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsIConsoleService.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptError.h"
-#include "nsNetUtil.h"
 #include "nsPresContext.h"
 #include "nsQueryObject.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/PostMessageEvent.h firefox-85.0+build1/dom/base/PostMessageEvent.h
--- firefox-84.0.2+build1/dom/base/PostMessageEvent.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/PostMessageEvent.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,25 +7,30 @@
 #ifndef mozilla_dom_PostMessageEvent_h
 #define mozilla_dom_PostMessageEvent_h
 
+#include "js/StructuredClone.h"
+#include "js/TypeDecls.h"
 #include "mozilla/dom/DOMTypes.h"
-#include "mozilla/dom/Event.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "nsCOMPtr.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MaybeOneOf.h"
 #include "mozilla/RefPtr.h"
-#include "nsContentUtils.h"
-#include "nsTArray.h"
 #include "nsThreadUtils.h"
 
 class nsGlobalWindowOuter;
 class nsGlobalWindowInner;
 class nsIPrincipal;
+class nsIURI;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BrowsingContext;
+class Event;
+class EventTarget;
 
 /**
  * Class used to represent events generated by calls to Window.postMessage,
diff -Nru firefox-84.0.2+build1/dom/base/RangeUtils.cpp firefox-85.0+build1/dom/base/RangeUtils.cpp
--- firefox-84.0.2+build1/dom/base/RangeUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/RangeUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/AbstractRange.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ShadowRoot.h"
 #include "nsContentUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/base/RangeUtils.h firefox-85.0+build1/dom/base/RangeUtils.h
--- firefox-84.0.2+build1/dom/base/RangeUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/RangeUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_RangeUtils_h
 #define mozilla_RangeUtils_h
 
-#include "Element.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RangeBoundary.h"
 #include "nsIContent.h"
diff -Nru firefox-84.0.2+build1/dom/base/ResizeObserverController.h firefox-85.0+build1/dom/base/ResizeObserverController.h
--- firefox-84.0.2+build1/dom/base/ResizeObserverController.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ResizeObserverController.h	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_ResizeObserverController_h
 #define mozilla_dom_ResizeObserverController_h
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ResizeObserver.h"
 #include "mozilla/TimeStamp.h"
 #include "nsRefreshObservers.h"
@@ -20,7 +21,6 @@
 
 namespace dom {
 
-class Document;
 class ResizeObserverController;
 
 /**
diff -Nru firefox-84.0.2+build1/dom/base/ResizeObserver.h firefox-85.0+build1/dom/base/ResizeObserver.h
--- firefox-84.0.2+build1/dom/base/ResizeObserver.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ResizeObserver.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "js/TypeDecls.h"
 #include "mozilla/AppUnits.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/WritingModes.h"
 #include "mozilla/dom/DOMRect.h"
@@ -22,7 +21,12 @@
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsPIDOMWindow.h"
+
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Element;
diff -Nru firefox-84.0.2+build1/dom/base/Selection.cpp firefox-85.0+build1/dom/base/Selection.cpp
--- firefox-84.0.2+build1/dom/base/Selection.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Selection.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -3070,7 +3070,7 @@
   if (window && !document->HasFlag(NODE_IS_EDITABLE) &&
       nsContentUtils::GetHTMLEditor(presContext)) {
     RefPtr<Element> newEditingHost = GetCommonEditingHost();
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
+    RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
     nsCOMPtr<nsPIDOMWindowOuter> focusedWindow;
     nsIContent* focusedContent = nsFocusManager::GetFocusedDescendant(
         window, nsFocusManager::eOnlyCurrentWindow,
diff -Nru firefox-84.0.2+build1/dom/base/Selection.h firefox-85.0+build1/dom/base/Selection.h
--- firefox-84.0.2+build1/dom/base/Selection.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Selection.h	2021-01-18 19:58:08.000000000 +0000
@@ -21,6 +21,7 @@
 #include "nsRange.h"
 #include "nsTArrayForwardDeclare.h"
 #include "nsThreadUtils.h"
+#include "nsWeakReference.h"
 #include "nsWrapperCache.h"
 
 struct CachedOffsetForFrame;
@@ -32,6 +33,9 @@
 struct SelectionCustomColors;
 class nsCopySupport;
 class nsHTMLCopyEncoder;
+class nsPresContext;
+struct nsPoint;
+struct nsRect;
 
 namespace mozilla {
 class AccessibleCaretEventHub;
@@ -856,7 +860,8 @@
      */
     Element* GetCommonEditingHost() const;
 
-    void MaybeFocusCommonEditingHost(PresShell* aPresShell) const;
+    MOZ_CAN_RUN_SCRIPT_BOUNDARY void MaybeFocusCommonEditingHost(
+        PresShell* aPresShell) const;
 
     static nsresult SubtractRange(StyledRange& aRange, nsRange& aSubtract,
                                   nsTArray<StyledRange>* aOutput);
diff -Nru firefox-84.0.2+build1/dom/base/SerializedStackHolder.cpp firefox-85.0+build1/dom/base/SerializedStackHolder.cpp
--- firefox-84.0.2+build1/dom/base/SerializedStackHolder.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/SerializedStackHolder.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "js/SavedFrameAPI.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "nsJSPrincipals.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/base/ShadowRoot.cpp firefox-85.0+build1/dom/base/ShadowRoot.cpp
--- firefox-84.0.2+build1/dom/base/ShadowRoot.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ShadowRoot.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/IdentifierMapEntry.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ServoStyleRuleMap.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/StyleSheetInlines.h"
diff -Nru firefox-84.0.2+build1/dom/base/StaticRange.h firefox-85.0+build1/dom/base/StaticRange.h
--- firefox-84.0.2+build1/dom/base/StaticRange.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StaticRange.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_StaticRange_h
 #define mozilla_dom_StaticRange_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RangeBoundary.h"
 #include "mozilla/dom/AbstractRange.h"
 #include "mozilla/dom/StaticRangeBinding.h"
@@ -15,6 +14,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class StaticRange final : public AbstractRange {
diff -Nru firefox-84.0.2+build1/dom/base/StructuredCloneBlob.cpp firefox-85.0+build1/dom/base/StructuredCloneBlob.cpp
--- firefox-84.0.2+build1/dom/base/StructuredCloneBlob.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StructuredCloneBlob.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "js/Utility.h"
 #include "js/Wrapper.h"
 #include "mozilla/dom/BlobImpl.h"
+#include "mozilla/dom/StructuredCloneHolderBinding.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/dom/base/StructuredCloneBlob.h firefox-85.0+build1/dom/base/StructuredCloneBlob.h
--- firefox-84.0.2+build1/dom/base/StructuredCloneBlob.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StructuredCloneBlob.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,19 +7,25 @@
 #ifndef mozilla_dom_StructuredCloneBlob_h
 #define mozilla_dom_StructuredCloneBlob_h
 
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/StructuredCloneHolder.h"
-#include "mozilla/dom/StructuredCloneHolderBinding.h"
-
-#include "jsapi.h"
-
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/StructuredCloneHolder.h"
 #include "nsIMemoryReporter.h"
 #include "nsISupports.h"
 
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+
 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {
 
+class GlobalObject;
+
 class StructuredCloneBlob final : public nsIMemoryReporter {
   MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf)
 
diff -Nru firefox-84.0.2+build1/dom/base/StructuredCloneHolder.cpp firefox-85.0+build1/dom/base/StructuredCloneHolder.cpp
--- firefox-84.0.2+build1/dom/base/StructuredCloneHolder.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StructuredCloneHolder.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -4,24 +4,41 @@
  * 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 "StructuredCloneHolder.h"
+#include "mozilla/dom/StructuredCloneHolder.h"
 
-#include "ImageContainer.h"
+#include <new>
+#include "ErrorList.h"
+#include "MainThreadUtils.h"
+#include "js/CallArgs.h"
+#include "js/Value.h"
+#include "js/WasmModule.h"
+#include "js/Wrapper.h"
+#include "jsapi.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/AutoRestore.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/Blob.h"
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/BrowsingContextBinding.h"
 #include "mozilla/dom/ClonedErrorHolder.h"
 #include "mozilla/dom/ClonedErrorHolderBinding.h"
-#include "mozilla/dom/StructuredCloneBlob.h"
-#include "mozilla/dom/DocGroup.h"
-#include "mozilla/dom/Directory.h"
 #include "mozilla/dom/DirectoryBinding.h"
+#include "mozilla/dom/DOMJSClass.h"
+#include "mozilla/dom/DOMTypes.h"
+#include "mozilla/dom/Directory.h"
+#include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FileList.h"
 #include "mozilla/dom/FileListBinding.h"
 #include "mozilla/dom/FormData.h"
+#include "mozilla/dom/FormDataBinding.h"
 #include "mozilla/dom/ImageBitmap.h"
 #include "mozilla/dom/ImageBitmapBinding.h"
 #include "mozilla/dom/JSExecutionManager.h"
@@ -29,18 +46,32 @@
 #include "mozilla/dom/MessagePortBinding.h"
 #include "mozilla/dom/OffscreenCanvas.h"
 #include "mozilla/dom/OffscreenCanvasBinding.h"
-#include "mozilla/dom/PMessagePort.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/StructuredCloneBlob.h"
+#include "mozilla/dom/StructuredCloneHolderBinding.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/WebIDLSerializable.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/fallible.h"
 #include "mozilla/gfx/2D.h"
-#include "mozilla/ipc/BackgroundChild.h"
-#include "mozilla/ipc/BackgroundUtils.h"
-#include "mozilla/ipc/PBackgroundSharedTypes.h"
-#include "MultipartBlobImpl.h"
-#include "nsQueryObject.h"
+#include "nsContentUtils.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsID.h"
+#include "nsIEventTarget.h"
+#include "nsIFile.h"
+#include "nsIGlobalObject.h"
+#include "nsIInputStream.h"
+#include "nsIPrincipal.h"
+#include "nsISupports.h"
+#include "nsJSPrincipals.h"
+#include "nsPIDOMWindow.h"
+#include "nsString.h"
+#include "nsThreadUtils.h"
+#include "nsXPCOM.h"
+#include "xpcpublic.h"
 
 using namespace mozilla::ipc;
 
diff -Nru firefox-84.0.2+build1/dom/base/StructuredCloneHolder.h firefox-85.0+build1/dom/base/StructuredCloneHolder.h
--- firefox-84.0.2+build1/dom/base/StructuredCloneHolder.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StructuredCloneHolder.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,25 +7,36 @@
 #ifndef mozilla_dom_StructuredCloneHolder_h
 #define mozilla_dom_StructuredCloneHolder_h
 
+#include <cstddef>
+#include <cstdint>
 #include <utility>
-
 #include "js/StructuredClone.h"
-#include "js/WasmModule.h"
-#include "jsapi.h"
+#include "js/TypeDecls.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/dom/BindingDeclarations.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
 #include "nsTArray.h"
 
-#ifdef DEBUG
-#  include "nsIThread.h"
-#endif
-
+class nsIEventTarget;
 class nsIGlobalObject;
 class nsIInputStream;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+
+namespace JS {
+class Value;
+struct WasmModule;
+}  // namespace JS
 
 namespace mozilla {
 class ErrorResult;
+template <class T>
+class OwningNonNull;
+
 namespace layers {
 class Image;
 }
@@ -36,6 +47,12 @@
 
 namespace dom {
 
+class BlobImpl;
+class MessagePort;
+class MessagePortIdentifier;
+template <typename T>
+class Sequence;
+
 class StructuredCloneHolderBase {
  public:
   typedef JS::StructuredCloneScope StructuredCloneScope;
diff -Nru firefox-84.0.2+build1/dom/base/StructuredCloneTester.cpp firefox-85.0+build1/dom/base/StructuredCloneTester.cpp
--- firefox-84.0.2+build1/dom/base/StructuredCloneTester.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/StructuredCloneTester.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/dom/StructuredCloneTesterBinding.h"
+#include "nsIGlobalObject.h"
 #include "xpcpublic.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/base/test/browser_bug593387.js firefox-85.0+build1/dom/base/test/browser_bug593387.js
--- firefox-84.0.2+build1/dom/base/test/browser_bug593387.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/browser_bug593387.js	2021-01-18 19:58:09.000000000 +0000
@@ -50,7 +50,7 @@
       // ---------------------------------------------------
       // Test 2: Try the same with a content top-level context)
 
-      await BrowserTestUtils.loadURI(newBrowser, "http://example.com/");
+      BrowserTestUtils.loadURI(newBrowser, "http://example.com/");
       await BrowserTestUtils.browserLoaded(newBrowser);
 
       let observerData = await SpecialPowers.spawn(
diff -Nru firefox-84.0.2+build1/dom/base/test/browser.ini firefox-85.0+build1/dom/base/test/browser.ini
--- firefox-84.0.2+build1/dom/base/test/browser.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/browser.ini	2021-01-18 19:58:08.000000000 +0000
@@ -22,7 +22,6 @@
   file_bug1303838_target_ibaz.html
   file_bug1303838_with_iframe.html
   file_messagemanager_unload.html
-  file_pluginAudio.html
   file_use_counter_bfcache.html
   file_use_counter_bfcache_helper.html
   file_use_counter_outer.html
diff -Nru firefox-84.0.2+build1/dom/base/test/browser_multiple_popups.html firefox-85.0+build1/dom/base/test/browser_multiple_popups.html
--- firefox-84.0.2+build1/dom/base/test/browser_multiple_popups.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/browser_multiple_popups.html	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
   <button onclick="openNestedPopups();" id="openNestedPopups">open tested popups</button>
   <button onclick="openPopupAndClick();" id="openPopupAndClick">open popups and click</button>
   <button onclick="closeAllWindows();" id="closeAllWindows">close all windows</button>
+  <button onclick="openPopupInFrame();" id="openPopupInFrame">open popup in frame</button>
   <input type="text" id="input" />
   <script>
 let windows = [];
@@ -29,6 +30,14 @@
   }
 }
 
+function openPopupInFrame() {
+  let iframe = document.createElement("iframe");
+  iframe.style.display = "none";
+  document.body.appendChild(iframe);
+  windows.push(iframe.contentWindow.open('empty.html', '_blank', 'width=100,height=100'));
+  iframe.remove();
+}
+
 function closeAllWindows() {
   windows.forEach(w => {
     try {
diff -Nru firefox-84.0.2+build1/dom/base/test/browser_multiple_popups.js firefox-85.0+build1/dom/base/test/browser_multiple_popups.js
--- firefox-84.0.2+build1/dom/base/test/browser_multiple_popups.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/browser_multiple_popups.js	2021-01-18 19:58:09.000000000 +0000
@@ -162,7 +162,7 @@
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#input",
-    { type: "mouseup" },
+    {},
     tab.linkedBrowser
   );
 
@@ -281,7 +281,7 @@
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#input",
-    { type: "mouseup" },
+    {},
     tab.linkedBrowser
   );
 
@@ -526,6 +526,47 @@
 
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#closeAllWindows",
+    {},
+    tab.linkedBrowser
+  );
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_bug_1685056() {
+  info(
+    "window.open() from a blank iframe window during an event dispatched at the parent page: window should be allowed"
+  );
+
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.block_multiple_popups", true],
+      ["dom.disable_open_during_load", true],
+    ],
+  });
+
+  let tab = BrowserTestUtils.addTab(
+    gBrowser,
+    TEST_DOMAIN + TEST_PATH + "browser_multiple_popups.html"
+  );
+  gBrowser.selectedTab = tab;
+
+  let browser = gBrowser.getBrowserForTab(tab);
+  await BrowserTestUtils.browserLoaded(browser);
+
+  let obs = new WindowObserver(1);
+
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    "#openPopupInFrame",
+    {},
+    tab.linkedBrowser
+  );
+
+  await obs;
+  ok(true, "We had 1 popup.");
+
+  await BrowserTestUtils.synthesizeMouseAtCenter(
+    "#closeAllWindows",
     {},
     tab.linkedBrowser
   );
diff -Nru firefox-84.0.2+build1/dom/base/test/browser_timeout_throttling_with_audio_playback.js firefox-85.0+build1/dom/base/test/browser_timeout_throttling_with_audio_playback.js
--- firefox-84.0.2+build1/dom/base/test/browser_timeout_throttling_with_audio_playback.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/browser_timeout_throttling_with_audio_playback.js	2021-01-18 19:58:08.000000000 +0000
@@ -6,11 +6,9 @@
 }
 
 const kBaseURI = "http://mochi.test:8888/browser/dom/base/test/empty.html";
-const kPluginJS = "chrome://mochitests/content/browser/dom/base/test/plugin.js";
 var testURLs = [
   "http://mochi.test:8888/browser/dom/base/test/file_audioLoop.html",
   "http://mochi.test:8888/browser/dom/base/test/file_audioLoopInIframe.html",
-  "http://mochi.test:8888/browser/dom/base/test/file_pluginAudio.html",
   "http://mochi.test:8888/browser/dom/base/test/file_webaudio_startstop.html",
 ];
 
@@ -24,8 +22,6 @@
 
 const kDelay = 10;
 
-Services.scriptloader.loadSubScript(kPluginJS, this);
-
 async function runTest(url) {
   let currentTab = gBrowser.selectedTab;
   let newTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, kBaseURI);
diff -Nru firefox-84.0.2+build1/dom/base/test/chrome/chrome.ini firefox-85.0+build1/dom/base/test/chrome/chrome.ini
--- firefox-84.0.2+build1/dom/base/test/chrome/chrome.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/chrome/chrome.ini	2021-01-18 19:58:09.000000000 +0000
@@ -69,6 +69,7 @@
   file_document-element-inserted-inner.xhtml
 [test_domparsing.xhtml]
 [test_fileconstructor.xhtml]
+[test_input_value_set_preserve_undo.xhtml]
 [test_nsITextInputProcessor.xhtml]
 [test_permission_isHandlingUserInput.xhtml]
 support-files = ../dummy.html
diff -Nru firefox-84.0.2+build1/dom/base/test/chrome/test_input_value_set_preserve_undo.xhtml firefox-85.0+build1/dom/base/test/chrome/test_input_value_set_preserve_undo.xhtml
--- firefox-84.0.2+build1/dom/base/test/chrome/test_input_value_set_preserve_undo.xhtml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/chrome/test_input_value_set_preserve_undo.xhtml	2021-01-18 19:58:08.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<window title="Bug 1676785"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+<html:body>
+  <xul:hbox>
+    <html:input id="xul" />
+  </xul:hbox>
+  <html:div>
+    <html:input id="non-xul" />
+  </html:div>
+</html:body>
+<script class="testbody">
+SimpleTest.waitForExplicitFinish();
+
+function shouldPreserveHistory(input, preserve) {
+  input.focus();
+  input.value = "abc";
+  input.value = "def";
+  let ctrl = navigator.platform.indexOf("Mac") == 0 ? { metaKey: true } : { ctrlKey: true };
+  synthesizeKey("z", ctrl);
+  (preserve ? is : isnot)(input.value, "abc", `Expected ${input.id} to ${preserve ? "" : "not "}preserve undo history when setting .value`);
+}
+
+window.onload = function() {
+  shouldPreserveHistory(document.getElementById("xul"), true);
+  shouldPreserveHistory(document.getElementById("non-xul"), false);
+
+  SimpleTest.finish();
+}
+</script>
+</window>
diff -Nru firefox-84.0.2+build1/dom/base/test/copypaste.js firefox-85.0+build1/dom/base/test/copypaste.js
--- firefox-84.0.2+build1/dom/base/test/copypaste.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/copypaste.js	2021-01-18 19:58:08.000000000 +0000
@@ -110,9 +110,9 @@
     if (navigator.platform.includes("Win")) {
       // Windows has extra content.
       var expectedValue =
-        "<html><body>\n<!--StartFragment-->" +
+        kTextHtmlPrefixClipboardDataWindows +
         expected.replace(/\n/g, "\n") +
-        "<!--EndFragment-->\n</body>\n</html>";
+        kTextHtmlSuffixClipboardDataWindows;
     }
     testClipboardValue(mime, expectedValue);
   }
diff -Nru firefox-84.0.2+build1/dom/base/test/file_pluginAudio.html firefox-85.0+build1/dom/base/test/file_pluginAudio.html
--- firefox-84.0.2+build1/dom/base/test/file_pluginAudio.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/file_pluginAudio.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<embed type="application/x-test" width="200" height="200"></embed>
-<script>
-var plugin = document.querySelector("embed");
-onload = function() {
-  plugin.startAudioPlayback();
-};
-function stopAudio() {
-  plugin.stopAudioPlayback();
-}
-function pluginMuted() {
-  return plugin.audioMuted();
-}
-function toggleMuteState(muted) {
-  return SpecialPowers.toggleMuteState(muted, window.top);
-}
-</script>
diff -Nru firefox-84.0.2+build1/dom/base/test/gtest/TestContentUtils.cpp firefox-85.0+build1/dom/base/test/gtest/TestContentUtils.cpp
--- firefox-84.0.2+build1/dom/base/test/gtest/TestContentUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/gtest/TestContentUtils.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/SimpleGlobalObject.h"
 
 struct IsURIInListMatch {
diff -Nru firefox-84.0.2+build1/dom/base/test/mochitest.ini firefox-85.0+build1/dom/base/test/mochitest.ini
--- firefox-84.0.2+build1/dom/base/test/mochitest.ini	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -201,7 +201,6 @@
   referrerHelper.js
   file_audioLoop.html
   file_webaudio_startstop.html
-  file_pluginAudio.html
   referrer_helper.js
   referrer_testserver.sjs
   script_postmessages_fileList.js
@@ -652,6 +651,7 @@
 [test_find_nac.html]
 [test_find_bug1601118.html]
 [test_find_bug1654683.html]
+[test_focus_keyboard_event.html]
 [test_focus_shadow_dom_root.html]
 [test_focus_shadow_dom.html]
 [test_focus_scrollable_input.html]
@@ -752,6 +752,8 @@
 [test_open_null_features.html]
 [test_openDialogChromeOnly.html]
 tags = openwindow
+[test_pasting_svg_image.html]
+skip-if = headless # Bug 1669923.
 [test_pdf_print.html]
 skip-if = toolkit == 'android' # We don't ship pdf.js on Android
 [test_plugin_freezing.html]
diff -Nru firefox-84.0.2+build1/dom/base/test/test_bug166235.html firefox-85.0+build1/dom/base/test/test_bug166235.html
--- firefox-84.0.2+build1/dom/base/test/test_bug166235.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/test_bug166235.html	2021-01-18 19:58:08.000000000 +0000
@@ -67,7 +67,7 @@
     var expectedValue = expected;
     // For Windows, navigator.platform returns "Win32".
     if (navigator.platform.includes("Win")) {
-      expectedValue = "<html><body>\n<!--StartFragment-->" + expected + "<!--EndFragment-->\n</body>\n</html>";
+      expectedValue = kTextHtmlPrefixClipboardDataWindows + expected + kTextHtmlSuffixClipboardDataWindows;
     }
     testClipboardValue(mime, expectedValue, test);
   }
diff -Nru firefox-84.0.2+build1/dom/base/test/test_copyimage.html firefox-85.0+build1/dom/base/test/test_copyimage.html
--- firefox-84.0.2+build1/dom/base/test/test_copyimage.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/test_copyimage.html	2021-01-18 19:58:09.000000000 +0000
@@ -69,7 +69,7 @@
   // Is the text/html data correct ?
   var expected = '<img id="logo" src="about:logo">';
   if (navigator.platform.includes("Win")) {
-    expected = "<html><body>\n<!--StartFragment-->" + expected + "<!--EndFragment-->\n</body>\n</html>";
+    expected = kTextHtmlPrefixClipboardDataWindows + expected + kTextHtmlSuffixClipboardDataWindows;
   }
   testClipboardValue('text/html', expected);
 
diff -Nru firefox-84.0.2+build1/dom/base/test/test_focus_keyboard_event.html firefox-85.0+build1/dom/base/test/test_focus_keyboard_event.html
--- firefox-84.0.2+build1/dom/base/test/test_focus_keyboard_event.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/test_focus_keyboard_event.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=552255
+-->
+<head>
+<title>Test for bug 552255</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" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=552255">Mozilla Bug 552255</a>
+<p id="display"></p>
+<input type="text"><br>
+<iframe src="http://example.org/tests/dom/base/test/file_empty.html"></iframe>
+<script>
+add_task(async function cross_origin_iframe() {
+  await SimpleTest.promiseFocus();
+
+  // Setup test in iframe
+  let iframe = document.querySelector("iframe");
+  await SpecialPowers.spawn(iframe, [], () => {
+    content.document.body.addEventListener("keydown", (e) => {
+      ok(false, `should not receive any keydown event, ${e.key}`);
+    });
+    content.addEventListener("focus", (e) => {
+      ok(false, `should not receive any focus event`);
+    });
+  });
+
+  let input = document.querySelector("input");
+  input.focus();
+
+  input.addEventListener("keydown", (e) => {
+    iframe.focus();
+  });
+
+  // Start test.
+  synthesizeKey("a");
+
+  await new Promise(SimpleTest.executeSoon);
+  ok(document.hasFocus(), "document should still have focus");
+  is(document.activeElement, input, "input should still have focus");
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/base/test/test_pasting_svg_image.html firefox-85.0+build1/dom/base/test/test_pasting_svg_image.html
--- firefox-84.0.2+build1/dom/base/test/test_pasting_svg_image.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/test_pasting_svg_image.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,99 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Test pasting &lt;svg&gt;&lt;image href&gt;</title>
+  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
+  <script>
+    const kPasteTargetId = "pasteTarget";
+    const kTestContentId = "testContent";
+
+    function selectSVG() {
+      const testContent = document.getElementById(kTestContentId);
+      document.getSelection().selectAllChildren(testContent);
+    }
+
+    async function copyToClipboard() {
+      function validatorFn(aData) {
+        const testContent = document.getElementById(kTestContentId);
+
+        let expectedData = testContent.outerHTML;
+        if (navigator.platform.includes(kPlatformWindows)) {
+          expectedData = kTextHtmlPrefixClipboardDataWindows +
+            expectedData + kTextHtmlSuffixClipboardDataWindows;
+        }
+
+        return SimpleTest.stripLinebreaksAndWhitespaceAfterTags(aData) ==
+          SimpleTest.stripLinebreaksAndWhitespaceAfterTags(expectedData);
+      }
+
+      function setupFn() {
+        synthesizeKey("c", { accelKey: true } /* aEvent */);
+      }
+
+      const flavor = "text/html";
+
+      await SimpleTest.promiseClipboardChange(validatorFn, setupFn, flavor);
+    }
+
+    async function pasteTo(aTargetElement) {
+      document.getSelection().selectAllChildren(aTargetElement);
+
+      const promiseInputEvent = new Promise(resolve => {
+        document.addEventListener("input", resolve,
+          { once: true } /* options */);
+        synthesizeKey("v", { accelKey: true } /* aEvent */);
+      });
+
+      await promiseInputEvent;
+    }
+
+    async function runTest() {
+      selectSVG();
+      await copyToClipboard();
+
+      // Get the test-content before pasting, because pasting will duplicate
+      // ids.
+      const expectedPastedInnerHTML =
+        SimpleTest.stripLinebreaksAndWhitespaceAfterTags(
+          document.getElementById(kTestContentId).outerHTML);
+
+      const pasteTargetElement = document.getElementById(kPasteTargetId);
+      await pasteTo(pasteTargetElement);
+
+      const pastedInnerHTMLWithoutLinebreaksAndWhitespaceAfterTags =
+        SimpleTest.stripLinebreaksAndWhitespaceAfterTags(
+          pasteTargetElement.innerHTML);
+
+      is(pastedInnerHTMLWithoutLinebreaksAndWhitespaceAfterTags,
+        expectedPastedInnerHTML,
+        "Pasted HTML is as expected.");
+
+      SimpleTest.finish()
+    }
+
+    function onLoad() {
+      SimpleTest.waitForExplicitFinish();
+      SimpleTest.waitForFocus(runTest);
+    };
+  </script>
+</head>
+<body onload="onLoad()">
+  <h6>
+    Test for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1669050">bug 1669050</a>
+  </h6>
+<div id="testContent">
+  foo
+  <svg>
+    <image
+     href="http://mochi.test:8888/tests/dom/base/test/name_of_some_image_file.png"
+     height="200" width="200">
+    </image>
+  </svg>
+  bar
+</div>
+<div contenteditable id="pasteTarget"/>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/base/test/test_sendQueryContentAndSelectionSetEvent.html firefox-85.0+build1/dom/base/test/test_sendQueryContentAndSelectionSetEvent.html
--- firefox-84.0.2+build1/dom/base/test/test_sendQueryContentAndSelectionSetEvent.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/test/test_sendQueryContentAndSelectionSetEvent.html	2021-01-18 19:58:09.000000000 +0000
@@ -127,25 +127,21 @@
   var top = {};
   var width = {};
   var height = {};
+  textRectArray.getCharacterRect(0, left, top, width, height);
+  is(top.value, textRect.top,
+     "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same top that returns QUERY_TEXT_RECT");
+  is(left.value, textRect.left,
+     "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same left that returns QUERY_TEXT_RECT");
+
   var left2 = {};
   var top2 = {};
   var width2 = {};
   var height2 = {};
-  textRectArray.getCharacterRect(0, left, top, width, height);
-  is(textRect.top, top.value,
-     "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same top that returns QUERY_TEXT_RECT");
-  is(textRect.left, left.value,
-     "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same left that returns QUERY_TEXT_RECT");
   textRectArray.getCharacterRect(1, left2, top2, width2, height2);
+  isfuzzy(width.value + width2.value, textRect.width, 2,
+          "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same width that QUERY_TEXT_RECT is returned for offset 1 and 2");
 
-  // XXX: Switched to from ok() to todo_is() in Bug 1467712. Follow up in 1500961
-  // jdescottes: Bug 1467712 - wrong usage of ok(). This does not pass when switching to is():
-  // "got 16, expected 17". However on some other platforms it works as expected so we cannot
-  // use todo_is().
-  // is(textRect.width, width.value + width2.value,
-  //     "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same width that QUERY_TEXT_RECT is returned for offset 1 and 2");
-
-  is(textRect.height, height.value,
+  is(height.value, textRect.height,
      "sendQueryContentEvent(QUERY_TEXT_RECT_ARRAY) should return same height that returns QUERY_TEXT_RECT");
 
   // QueryCharacterAtOffset
diff -Nru firefox-84.0.2+build1/dom/base/Text.h firefox-85.0+build1/dom/base/Text.h
--- firefox-84.0.2+build1/dom/base/Text.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Text.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,9 +8,10 @@
 #define mozilla_dom_Text_h
 
 #include "mozilla/dom/CharacterData.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Text : public CharacterData {
diff -Nru firefox-84.0.2+build1/dom/base/ThirdPartyUtil.cpp firefox-85.0+build1/dom/base/ThirdPartyUtil.cpp
--- firefox-84.0.2+build1/dom/base/ThirdPartyUtil.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ThirdPartyUtil.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,28 +5,47 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ThirdPartyUtil.h"
-#include "nsDocShell.h"
-#include "nsGlobalWindowOuter.h"
-#include "nsNetCID.h"
-#include "nsNetUtil.h"
+
+#include <cstdint>
+#include "MainThreadUtils.h"
+#include "mozIDOMWindow.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BasePrincipal.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/ContentBlocking.h"
+#include "mozilla/ContentBlockingNotifier.h"
+#include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/TextUtils.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/WindowContext.h"
+#include "mozilla/dom/WindowGlobalParent.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsEffectiveTLDService.h"
+#include "nsError.h"
+#include "nsGlobalWindowInner.h"
 #include "nsIChannel.h"
 #include "nsIClassifiedChannel.h"
+#include "nsIContentPolicy.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadContext.h"
+#include "nsILoadInfo.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIURI.h"
-#include "nsReadableUtils.h"
-#include "nsThreadUtils.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/ContentBlocking.h"
-#include "mozilla/ContentBlockingAllowList.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/Logging.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/TextUtils.h"
-#include "mozilla/Unused.h"
-#include "nsGlobalWindowOuter.h"
+#include "nsLiteralString.h"
+#include "nsNetUtil.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
+#include "nsServiceManagerUtils.h"
+#include "nsTLiteralString.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/base/ThirdPartyUtil.h firefox-85.0+build1/dom/base/ThirdPartyUtil.h
--- firefox-84.0.2+build1/dom/base/ThirdPartyUtil.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/ThirdPartyUtil.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,18 +7,26 @@
 #ifndef ThirdPartyUtil_h__
 #define ThirdPartyUtil_h__
 
+#include <cstdint>
+#include "ErrorList.h"
 #include "mozIThirdPartyUtil.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/dom/Document.h"
-#include "nsCOMPtr.h"
-#include "nsEffectiveTLDService.h"
+#include "mozilla/RefPtr.h"
+#include "nsISupports.h"
 #include "nsString.h"
-#include "nsPIDOMWindow.h"
-#include "mozilla/dom/WindowGlobalParent.h"
 
+class mozIDOMWindowProxy;
+class nsEffectiveTLDService;
+class nsIChannel;
+class nsIPrincipal;
 class nsIURI;
 class nsPIDOMWindowOuter;
 
+namespace mozilla {
+namespace dom {
+class WindowGlobalParent;
+}
+}  // namespace mozilla
+
 class ThirdPartyUtil final : public mozIThirdPartyUtil {
  public:
   NS_DECL_THREADSAFE_ISUPPORTS
diff -Nru firefox-84.0.2+build1/dom/base/TimeoutExecutor.cpp firefox-85.0+build1/dom/base/TimeoutExecutor.cpp
--- firefox-84.0.2+build1/dom/base/TimeoutExecutor.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/TimeoutExecutor.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "TimeoutExecutor.h"
 
 #include "mozilla/EventQueue.h"
+#include "mozilla/Logging.h"
 #include "mozilla/dom/TimeoutManager.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIEventTarget.h"
diff -Nru firefox-84.0.2+build1/dom/base/Timeout.h firefox-85.0+build1/dom/base/Timeout.h
--- firefox-84.0.2+build1/dom/base/Timeout.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/Timeout.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,15 +11,13 @@
 #include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/TimeStamp.h"
-#include "nsCOMPtr.h"
 #include "nsGlobalWindowInner.h"
 #include "nsCycleCollectionParticipant.h"
-#include "GeckoProfiler.h"
 #include "nsDataHashtable.h"
 
-class nsIEventTarget;
-class nsIPrincipal;
-class nsIEventTarget;
+#ifdef MOZ_GECKO_PROFILER
+#  include "mozilla/ProfileChunkedBuffer.h"
+#endif
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/base/TimeoutHandler.cpp firefox-85.0+build1/dom/base/TimeoutHandler.cpp
--- firefox-84.0.2+build1/dom/base/TimeoutHandler.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/TimeoutHandler.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -7,6 +7,7 @@
 #include "TimeoutHandler.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsJSUtils.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/base/TimeoutManager.cpp firefox-85.0+build1/dom/base/TimeoutManager.cpp
--- firefox-84.0.2+build1/dom/base/TimeoutManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/TimeoutManager.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsGlobalWindow.h"
 #include "mozilla/Logging.h"
 #include "mozilla/PerformanceCounter.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/Telemetry.h"
@@ -15,6 +16,7 @@
 #include "mozilla/TimeStamp.h"
 #include "nsINamed.h"
 #include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/TimeoutHandler.h"
@@ -22,9 +24,6 @@
 #include "TimeoutBudgetManager.h"
 #include "mozilla/net/WebSocketEventService.h"
 #include "mozilla/MediaManager.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -154,10 +153,13 @@
           int(elapsed.ToMilliseconds()), int(target.ToMilliseconds()),
           int(delta.ToMilliseconds()));
       // don't have end before start...
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          "setTimeout deferred release", DOM, TextMarkerPayload,
-          (marker, delta.ToMilliseconds() >= 0 ? timeout->When() : now, now,
-           Some(mWindow.WindowID())));
+      PROFILER_MARKER_TEXT(
+          "setTimeout deferred release", DOM,
+          MarkerOptions(
+              MarkerTiming::Interval(
+                  delta.ToMilliseconds() >= 0 ? timeout->When() : now, now),
+              MarkerInnerWindowId(mWindow.WindowID())),
+          marker);
     }
 #endif
     num++;
@@ -575,7 +577,8 @@
           ("%s(TimeoutManager=%p, timeout=%p, ID=%u)\n",
            timeout->mReason == Timeout::Reason::eIdleCallbackTimeout
                ? "CancelIdleCallback"
-               : timeout->mIsInterval ? "ClearInterval" : "ClearTimeout",
+           : timeout->mIsInterval ? "ClearInterval"
+                                  : "ClearTimeout",
            this, timeout, timeout->mTimeoutId));
 
   if (timeout->mRunning) {
@@ -905,10 +908,13 @@
               int(elapsed.ToMilliseconds()), int(target.ToMilliseconds()),
               int(delta.ToMilliseconds()), int(runtime.ToMilliseconds()));
           // don't have end before start...
-          PROFILER_ADD_MARKER_WITH_PAYLOAD(
-              "setTimeout", DOM, TextMarkerPayload,
-              (marker, delta.ToMilliseconds() >= 0 ? timeout->When() : now, now,
-               Some(mWindow.WindowID())));
+          PROFILER_MARKER_TEXT(
+              "setTimeout", DOM,
+              MarkerOptions(
+                  MarkerTiming::Interval(
+                      delta.ToMilliseconds() >= 0 ? timeout->When() : now, now),
+                  MarkerInnerWindowId(mWindow.WindowID())),
+              marker);
         }
 #endif
 
diff -Nru firefox-84.0.2+build1/dom/base/UIDirectionManager.cpp firefox-85.0+build1/dom/base/UIDirectionManager.cpp
--- firefox-84.0.2+build1/dom/base/UIDirectionManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/UIDirectionManager.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/Preferences.h"
 #include "nsIWindowMediator.h"
 #include "nsDocShell.h"
+#include "nsServiceManagerUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/SimpleEnumerator.h"
 
diff -Nru firefox-84.0.2+build1/dom/base/VisualViewport.h firefox-85.0+build1/dom/base/VisualViewport.h
--- firefox-84.0.2+build1/dom/base/VisualViewport.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/VisualViewport.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,8 @@
 #include "mozilla/dom/VisualViewportBinding.h"
 #include "Units.h"
 
+class nsPresContext;
+
 namespace mozilla {
 
 class PresShell;
diff -Nru firefox-84.0.2+build1/dom/base/WindowDestroyedEvent.cpp firefox-85.0+build1/dom/base/WindowDestroyedEvent.cpp
--- firefox-84.0.2+build1/dom/base/WindowDestroyedEvent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/WindowDestroyedEvent.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -6,15 +6,18 @@
 
 #include "WindowDestroyedEvent.h"
 
+#include "GeckoProfiler.h"
 #include "nsJSUtils.h"
 #include "jsapi.h"
 #include "js/Wrapper.h"
 #include "nsIPrincipal.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIAppStartup.h"
+#include "nsJSPrincipals.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "xpcpublic.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/base/WindowNamedPropertiesHandler.cpp firefox-85.0+build1/dom/base/WindowNamedPropertiesHandler.cpp
--- firefox-84.0.2+build1/dom/base/WindowNamedPropertiesHandler.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/base/WindowNamedPropertiesHandler.cpp	2021-01-18 19:58:08.000000000 +0000
@@ -250,13 +250,9 @@
   js::ProxyOptions options;
   options.setClass(&WindowNamedPropertiesClass.mBase);
 
-  // Note: since the scope polluter proxy lives on the window's prototype
-  // chain, it needs a singleton type to avoid polluting type information
-  // for properties on the window.
   JS::Rooted<JSObject*> gsp(
-      aCx, js::NewSingletonProxyObject(
-               aCx, WindowNamedPropertiesHandler::getInstance(),
-               JS::NullHandleValue, aProto, options));
+      aCx, js::NewProxyObject(aCx, WindowNamedPropertiesHandler::getInstance(),
+                              JS::NullHandleValue, aProto, options));
   if (!gsp) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/dom/bindings/BindingDeclarations.h firefox-85.0+build1/dom/bindings/BindingDeclarations.h
--- firefox-84.0.2+build1/dom/bindings/BindingDeclarations.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/BindingDeclarations.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,11 +14,9 @@
 #define mozilla_dom_BindingDeclarations_h__
 
 #include "js/RootingAPI.h"
-#include "js/Value.h"
+#include "js/TypeDecls.h"
 
 #include "mozilla/Maybe.h"
-#include "mozilla/RootedOwningNonNull.h"
-#include "mozilla/RootedRefPtr.h"
 
 #include "mozilla/dom/DOMString.h"
 
@@ -28,6 +26,15 @@
 
 #include <type_traits>
 
+// XXX(Bug 1674080) Remove this and let Codegen.py generate it instead when
+// needed.
+#include "js/Value.h"
+
+// XXX(Bug 1674080) Not really needed here, include should be generated by
+// Codegen.py
+#include "mozilla/RootedOwningNonNull.h"
+#include "mozilla/RootedRefPtr.h"
+
 class nsIPrincipal;
 class nsWrapperCache;
 
diff -Nru firefox-84.0.2+build1/dom/bindings/BindingIPCUtils.h firefox-85.0+build1/dom/bindings/BindingIPCUtils.h
--- firefox-84.0.2+build1/dom/bindings/BindingIPCUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/BindingIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #define _mozilla_dom_BindingIPCUtils_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 namespace IPC {
 template <>
diff -Nru firefox-84.0.2+build1/dom/bindings/BindingUtils.cpp firefox-85.0+build1/dom/bindings/BindingUtils.cpp
--- firefox-84.0.2+build1/dom/bindings/BindingUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/BindingUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,8 +11,10 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/Encoding.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
@@ -933,7 +935,7 @@
     const NativeProperties* chromeOnlyProperties,
     const char* const* unscopableNames, bool isGlobal) {
   JS::Rooted<JSObject*> ourProto(
-      cx, JS_NewObjectWithUniqueType(cx, protoClass, parentProto));
+      cx, JS_NewObjectWithGivenProto(cx, protoClass, parentProto));
   if (!ourProto ||
       // We don't try to define properties on the global's prototype; those
       // properties go on the global itself.
@@ -2498,7 +2500,7 @@
   nsCOMPtr<nsPIDOMWindowInner> window =
       do_QueryInterface(global.GetAsSupports());
   if (window && window->GetDoc()) {
-    window->GetDoc()->WarnOnceAbout(Document::eLenientThis);
+    window->GetDoc()->WarnOnceAbout(DeprecatedOperations::eLenientThis);
   }
   return true;
 }
@@ -4016,7 +4018,7 @@
 };
 
 void ReportDeprecation(nsIGlobalObject* aGlobal, nsIURI* aURI,
-                       Document::DeprecatedOperations aOperation,
+                       DeprecatedOperations aOperation,
                        const nsAString& aFileName,
                        const Nullable<uint32_t>& aLineNumber,
                        const Nullable<uint32_t>& aColumnNumber) {
@@ -4033,10 +4035,10 @@
   }
 
   nsAutoString type;
-  type.AssignASCII(kDeprecatedOperations[aOperation]);
+  type.AssignASCII(kDeprecatedOperations[static_cast<size_t>(aOperation)]);
 
   nsAutoCString key;
-  key.AssignASCII(kDeprecatedOperations[aOperation]);
+  key.AssignASCII(kDeprecatedOperations[static_cast<size_t>(aOperation)]);
   key.AppendASCII("Warning");
 
   nsAutoString msg;
@@ -4081,10 +4083,10 @@
 // console running on the main-thread.
 class DeprecationWarningRunnable final
     : public WorkerProxyToMainThreadRunnable {
-  const Document::DeprecatedOperations mOperation;
+  const DeprecatedOperations mOperation;
 
  public:
-  explicit DeprecationWarningRunnable(Document::DeprecatedOperations aOperation)
+  explicit DeprecationWarningRunnable(DeprecatedOperations aOperation)
       : mOperation(aOperation) {}
 
  private:
@@ -4109,7 +4111,7 @@
 };
 
 void MaybeShowDeprecationWarning(const GlobalObject& aGlobal,
-                                 Document::DeprecatedOperations aOperation) {
+                                 DeprecatedOperations aOperation) {
   if (NS_IsMainThread()) {
     nsCOMPtr<nsPIDOMWindowInner> window =
         do_QueryInterface(aGlobal.GetAsSupports());
@@ -4130,7 +4132,7 @@
 }
 
 void MaybeReportDeprecation(const GlobalObject& aGlobal,
-                            Document::DeprecatedOperations aOperation) {
+                            DeprecatedOperations aOperation) {
   nsCOMPtr<nsIURI> uri;
 
   if (NS_IsMainThread()) {
@@ -4176,7 +4178,7 @@
 }  // anonymous namespace
 
 void DeprecationWarning(JSContext* aCx, JSObject* aObject,
-                        Document::DeprecatedOperations aOperation) {
+                        DeprecatedOperations aOperation) {
   GlobalObject global(aCx, aObject);
   if (global.Failed()) {
     NS_ERROR("Could not create global for DeprecationWarning");
@@ -4187,7 +4189,7 @@
 }
 
 void DeprecationWarning(const GlobalObject& aGlobal,
-                        Document::DeprecatedOperations aOperation) {
+                        DeprecatedOperations aOperation) {
   MaybeShowDeprecationWarning(aGlobal, aOperation);
   MaybeReportDeprecation(aGlobal, aOperation);
 }
diff -Nru firefox-84.0.2+build1/dom/bindings/BindingUtils.h firefox-85.0+build1/dom/bindings/BindingUtils.h
--- firefox-84.0.2+build1/dom/bindings/BindingUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/BindingUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -27,16 +27,15 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMJSClass.h"
 #include "mozilla/dom/DOMJSProxyHandler.h"
+#include "mozilla/dom/JSSlots.h"
 #include "mozilla/dom/NonRefcountedDOMObject.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PrototypeList.h"
 #include "mozilla/dom/RemoteObjectProxy.h"
-#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/SegmentedVector.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/dom/Document.h"
 #include "nsIGlobalObject.h"
 #include "nsJSUtils.h"
 #include "nsISupportsImpl.h"
@@ -47,6 +46,15 @@
 
 #include "nsWrapperCacheInlines.h"
 
+// XXX(Bug 1674080) Remove this and let Codegen.py generate it instead when
+// needed.
+#include "mozilla/BasePrincipal.h"
+#include "nsJSPrincipals.h"
+
+class nsGlobalWindowInner;
+class nsGlobalWindowOuter;
+class nsIInterfaceRequestor;
+
 namespace mozilla {
 
 enum UseCounter : int16_t;
@@ -54,12 +62,16 @@
 
 namespace dom {
 class CustomElementReactionsStack;
+class Document;
+class EventTarget;
 class MessageManagerGlobal;
 class DedicatedWorkerGlobalScope;
 template <typename KeyType, typename ValueType>
 class Record;
 class WindowProxyHolder;
 
+enum class DeprecatedOperations : uint16_t;
+
 nsresult UnwrapArgImpl(JSContext* cx, JS::Handle<JSObject*> src,
                        const nsIID& iid, void** ppArg);
 
@@ -2451,6 +2463,10 @@
                                JS::MutableHandle<JSObject*> aObject,
                                ErrorResult& aRv);
 
+// XXX Avoid pulling in the whole ScriptSettings.h, however there should be a
+// unique declaration of this function somewhere else.
+JS::RootingContext* RootingCx();
+
 template <typename T>
 already_AddRefed<T> ConstructJSImplementation(const char* aContractId,
                                               nsIGlobalObject* aGlobal,
@@ -3091,10 +3107,10 @@
 
 // Warnings
 void DeprecationWarning(JSContext* aCx, JSObject* aObject,
-                        Document::DeprecatedOperations aOperation);
+                        DeprecatedOperations aOperation);
 
 void DeprecationWarning(const GlobalObject& aGlobal,
-                        Document::DeprecatedOperations aOperation);
+                        DeprecatedOperations aOperation);
 
 // A callback to perform funToString on an interface object
 JSString* InterfaceObjectToString(JSContext* aCx, JS::Handle<JSObject*> aObject,
diff -Nru firefox-84.0.2+build1/dom/bindings/CallbackObject.h firefox-85.0+build1/dom/bindings/CallbackObject.h
--- firefox-84.0.2+build1/dom/bindings/CallbackObject.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/CallbackObject.h	2021-01-18 19:58:09.000000000 +0000
@@ -17,28 +17,47 @@
 #ifndef mozilla_dom_CallbackObject_h
 #define mozilla_dom_CallbackObject_h
 
-#include "nsISupports.h"
-#include "nsISupportsImpl.h"
-#include "nsCycleCollectionParticipant.h"
+#include <cstddef>
+#include <cstdint>
+#include <utility>
+#include "js/RootingAPI.h"
 #include "js/Wrapper.h"
+#include "jsapi.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/ErrorResult.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/OwningNonNull.h"
-#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/BindingCallContext.h"
-#include "nsWrapperCache.h"
-#include "nsJSEnvironment.h"
-#include "xpcpublic.h"
-#include "jsapi.h"
-#include "js/ContextOptions.h"
-#include "js/Object.h"  // JS::GetCompartment
-#include "js/TracingAPI.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsID.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsStringFwd.h"
+
+class JSAutoRealm;
+class JSObject;
+class JSTracer;
+class nsCycleCollectionTraversalCallback;
+struct JSContext;
+
+namespace JS {
+class AutoSetAsyncStackForNewCalls;
+class Realm;
+class Value;
+}  // namespace JS
 
 namespace mozilla {
 
+class ErrorResult;
 class PromiseJobRunnable;
+template <class T>
+class OwningNonNull;
 
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/bindings/Codegen.py firefox-85.0+build1/dom/bindings/Codegen.py
--- firefox-84.0.2+build1/dom/bindings/Codegen.py	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/Codegen.py	2021-01-18 19:58:09.000000000 +0000
@@ -1650,7 +1650,8 @@
                     headers.add("mozilla/dom/ToJSValue.h")
                 elif f.isInterface():
                     if f.isSpiderMonkeyInterface():
-                        headers.add("jsfriendapi.h")
+                        headers.add("js/RootingAPI.h")
+                        headers.add("js/Value.h")
                         if f.isReadableStream():
                             headers.add("mozilla/dom/ReadableStream.h")
                         else:
@@ -1765,7 +1766,7 @@
                     headers.add("mozilla/dom/ToJSValue.h")
                 elif f.isInterface():
                     if f.isSpiderMonkeyInterface():
-                        headers.add("jsfriendapi.h")
+                        headers.add("js/RootingAPI.h")
                         if f.isReadableStream():
                             headers.add("mozilla/dom/ReadableStream.h")
                         else:
@@ -8540,7 +8541,9 @@
             return CGGeneric("nsString"), "ref", None, None, None
         return CGGeneric("DOMString"), "ref", None, None, None
     if returnType.isByteString() or returnType.isUTF8String():
-        return CGGeneric("nsCString"), "ref", None, None, None
+        if isMember:
+            return CGGeneric("nsCString"), "ref", None, None, None
+        return CGGeneric("nsAutoCString"), "ref", None, None, None
     if returnType.isEnum():
         result = CGGeneric(returnType.unroll().inner.identifier.name)
         if returnType.nullable():
@@ -9191,7 +9194,7 @@
                 CGGeneric(
                     dedent(
                         """
-                DeprecationWarning(cx, obj, Document::e%s);
+                DeprecationWarning(cx, obj, DeprecatedOperations::e%s);
                 """
                         % deprecated[0]
                     )
@@ -11483,7 +11486,7 @@
         assert all(ord(c) < 128 for c in attrName)
         return dedent(
             """
-            DeprecationWarning(cx, obj, Document::eLenientSetter);
+            DeprecationWarning(cx, obj, DeprecatedOperations::eLenientSetter);
             return true;
             """
         )
@@ -17959,7 +17962,6 @@
                 "mozilla/dom/BindingDeclarations.h",
                 "mozilla/dom/Nullable.h",
                 "mozilla/ErrorResult.h",
-                "GeckoProfiler.h",
             ),
             True,
         )
@@ -17994,6 +17996,9 @@
             for d in descriptors
         )
 
+        # XXX Not sure when we actually need this
+        bindingHeaders["GeckoProfiler.h"] = True
+
         def descriptorHasCrossOriginProperties(desc):
             def hasCrossOriginProperty(m):
                 props = memberProperties(m, desc)
@@ -18011,7 +18016,7 @@
         bindingDeclareHeaders["jsapi.h"] = any(
             descriptorHasCrossOriginProperties(d) for d in descriptors
         )
-        bindingDeclareHeaders["jspubtd.h"] = not bindingDeclareHeaders["jsapi.h"]
+        bindingDeclareHeaders["js/TypeDecls.h"] = not bindingDeclareHeaders["jsapi.h"]
         bindingDeclareHeaders["js/RootingAPI.h"] = not bindingDeclareHeaders["jsapi.h"]
 
         def descriptorHasIteratorAlias(desc):
diff -Nru firefox-84.0.2+build1/dom/bindings/DOMJSClass.h firefox-85.0+build1/dom/bindings/DOMJSClass.h
--- firefox-84.0.2+build1/dom/bindings/DOMJSClass.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/DOMJSClass.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/Object.h"  // JS::GetClass, JS::GetReservedSlot
-#include "js/PropertySpec.h"
 #include "js/Wrapper.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -19,10 +18,10 @@
 #include "mozilla/dom/PrototypeList.h"  // auto-generated
 #include "mozilla/dom/WebIDLPrefs.h"    // auto-generated
 
-#include "mozilla/dom/JSSlots.h"
-
 class nsCycleCollectionParticipant;
 class nsWrapperCache;
+struct JSFunctionSpec;
+struct JSPropertySpec;
 struct JSStructuredCloneReader;
 struct JSStructuredCloneWriter;
 class nsIGlobalObject;
diff -Nru firefox-84.0.2+build1/dom/bindings/DOMJSProxyHandler.h firefox-85.0+build1/dom/bindings/DOMJSProxyHandler.h
--- firefox-84.0.2+build1/dom/bindings/DOMJSProxyHandler.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/DOMJSProxyHandler.h	2021-01-18 19:58:09.000000000 +0000
@@ -17,6 +17,10 @@
 #include "js/String.h"  // JS::AtomToLinearString, JS::GetLinearString{CharAt,Length}
 #include "nsString.h"
 
+// XXX Avoid including this (and maybe some of those above by moving inline
+// function bodies out)
+#include "jsfriendapi.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/bindings/ErrorIPCUtils.h firefox-85.0+build1/dom/bindings/ErrorIPCUtils.h
--- firefox-84.0.2+build1/dom/bindings/ErrorIPCUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/ErrorIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include <utility>
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/ErrorResult.h"
diff -Nru firefox-84.0.2+build1/dom/bindings/ErrorResult.h firefox-85.0+build1/dom/bindings/ErrorResult.h
--- firefox-84.0.2+build1/dom/bindings/ErrorResult.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/ErrorResult.h	2021-01-18 19:58:09.000000000 +0000
@@ -35,6 +35,7 @@
 #include "js/Value.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Utf8.h"
 #include "nsISupportsImpl.h"
 #include "nsString.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/dom/bindings/Exceptions.cpp firefox-85.0+build1/dom/bindings/Exceptions.cpp
--- firefox-84.0.2+build1/dom/bindings/Exceptions.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/Exceptions.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,9 +12,11 @@
 #include "js/SavedFrameAPI.h"
 #include "xpcpublic.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "nsJSPrincipals.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
@@ -157,6 +159,7 @@
   switch (NS_ERROR_GET_MODULE(aRv)) {
     case NS_ERROR_MODULE_DOM:
     case NS_ERROR_MODULE_SVG:
+    case NS_ERROR_MODULE_DOM_FILE:
     case NS_ERROR_MODULE_DOM_XPATH:
     case NS_ERROR_MODULE_DOM_INDEXEDDB:
     case NS_ERROR_MODULE_DOM_FILEHANDLE:
diff -Nru firefox-84.0.2+build1/dom/bindings/IterableIterator.h firefox-85.0+build1/dom/bindings/IterableIterator.h
--- firefox-84.0.2+build1/dom/bindings/IterableIterator.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/IterableIterator.h	2021-01-18 19:58:09.000000000 +0000
@@ -27,14 +27,12 @@
 #ifndef mozilla_dom_IterableIterator_h
 #define mozilla_dom_IterableIterator_h
 
+#include "js/TypeDecls.h"
+#include "js/Value.h"
 #include "nsISupports.h"
-#include "nsWrapperCache.h"
-#include "nsPIDOMWindow.h"
-#include "nsCOMPtr.h"
+#include "mozilla/dom/IterableIteratorBinding.h"
 #include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ToJSValue.h"
-#include "js/Wrapper.h"
-#include "mozilla/dom/IterableIteratorBinding.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/bindings/nsScriptErrorWithStack.cpp firefox-85.0+build1/dom/bindings/nsScriptErrorWithStack.cpp
--- firefox-84.0.2+build1/dom/bindings/nsScriptErrorWithStack.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/nsScriptErrorWithStack.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsScriptError.h"
 #include "MainThreadUtils.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsGlobalWindow.h"
 #include "nsCycleCollectionParticipant.h"
diff -Nru firefox-84.0.2+build1/dom/bindings/PrimitiveConversions.h firefox-85.0+build1/dom/bindings/PrimitiveConversions.h
--- firefox-84.0.2+build1/dom/bindings/PrimitiveConversions.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/PrimitiveConversions.h	2021-01-18 19:58:09.000000000 +0000
@@ -15,10 +15,9 @@
 #include <math.h>
 #include <stdint.h>
 
-#include "jsapi.h"
 #include "js/Conversions.h"
+#include "js/RootingAPI.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/dom/BindingCallContext.h"
 
diff -Nru firefox-84.0.2+build1/dom/bindings/ReadableStream.h firefox-85.0+build1/dom/bindings/ReadableStream.h
--- firefox-84.0.2+build1/dom/bindings/ReadableStream.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/ReadableStream.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_ReadableStream_h
 #define mozilla_dom_ReadableStream_h
 
+#include "js/experimental/TypedData.h"
 #include "mozilla/dom/SpiderMonkeyInterface.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/bindings/RootedOwningNonNull.h firefox-85.0+build1/dom/bindings/RootedOwningNonNull.h
--- firefox-84.0.2+build1/dom/bindings/RootedOwningNonNull.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/RootedOwningNonNull.h	2021-01-18 19:58:09.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include "mozilla/OwningNonNull.h"
 #include "js/GCPolicyAPI.h"
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 
 namespace JS {
 template <typename T>
diff -Nru firefox-84.0.2+build1/dom/bindings/RootedRefPtr.h firefox-85.0+build1/dom/bindings/RootedRefPtr.h
--- firefox-84.0.2+build1/dom/bindings/RootedRefPtr.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/RootedRefPtr.h	2021-01-18 19:58:09.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include "mozilla/RefPtr.h"
 #include "js/GCPolicyAPI.h"
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 
 namespace JS {
 template <typename T>
diff -Nru firefox-84.0.2+build1/dom/bindings/SimpleGlobalObject.h firefox-85.0+build1/dom/bindings/SimpleGlobalObject.h
--- firefox-84.0.2+build1/dom/bindings/SimpleGlobalObject.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/SimpleGlobalObject.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsIGlobalObject.h"
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
+#include "js/Value.h"
 #include "nsISupportsImpl.h"
 #include "nsCycleCollectionParticipant.h"
 
diff -Nru firefox-84.0.2+build1/dom/bindings/SpiderMonkeyInterface.h firefox-85.0+build1/dom/bindings/SpiderMonkeyInterface.h
--- firefox-84.0.2+build1/dom/bindings/SpiderMonkeyInterface.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/SpiderMonkeyInterface.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,7 @@
 #define mozilla_dom_SpiderMonkeyInterface_h
 
 #include "jsapi.h"
-#include "jsfriendapi.h"
+#include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/bindings/test/moz.build firefox-85.0+build1/dom/bindings/test/moz.build
--- firefox-84.0.2+build1/dom/bindings/test/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/test/moz.build	2021-01-18 19:58:09.000000000 +0000
@@ -67,7 +67,7 @@
 
 # Because we don't actually link this code anywhere, we don't care about
 # their optimization level, so don't waste time on optimization.
-if CONFIG["CXX_TYPE"] == "clang-cl":
+if CONFIG["CC_TYPE"] == "clang-cl":
     CXXFLAGS += ["-Od"]
 else:
     CXXFLAGS += ["-O0"]
diff -Nru firefox-84.0.2+build1/dom/bindings/test/TestFunctions.cpp firefox-85.0+build1/dom/bindings/test/TestFunctions.cpp
--- firefox-84.0.2+build1/dom/bindings/test/TestFunctions.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/test/TestFunctions.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/TestFunctions.h"
 #include "mozilla/dom/TestFunctionsBinding.h"
 #include "mozilla/dom/WindowBinding.h"
diff -Nru firefox-84.0.2+build1/dom/bindings/test/WrapperCachedNonISupportsTestInterface.h firefox-85.0+build1/dom/bindings/test/WrapperCachedNonISupportsTestInterface.h
--- firefox-84.0.2+build1/dom/bindings/test/WrapperCachedNonISupportsTestInterface.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/test/WrapperCachedNonISupportsTestInterface.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
diff -Nru firefox-84.0.2+build1/dom/bindings/ToJSValue.h firefox-85.0+build1/dom/bindings/ToJSValue.h
--- firefox-84.0.2+build1/dom/bindings/ToJSValue.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/ToJSValue.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,24 +7,37 @@
 #ifndef mozilla_dom_ToJSValue_h
 #define mozilla_dom_ToJSValue_h
 
-#include "mozilla/Assertions.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/CallbackObject.h"
-#include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/dom/TypedArray.h"
-#include "jsapi.h"
-#include "js/Array.h"  // JS::NewArrayObject
-#include "nsISupports.h"
-#include "nsTArray.h"
-#include "nsWrapperCache.h"
-#include <type_traits>
+#include <cstddef>  // for size_t
+#include <cstdint>  // for int32_t, int64_t, uint32_t, uint64_t
+#include <type_traits>  // for is_base_of, enable_if_t, enable_if, is_pointer, is_same, void_t
+#include <utility>          // for forward
+#include "ErrorList.h"      // for nsresult
+#include "js/Array.h"       // for NewArrayObject
+#include "js/GCVector.h"    // for RootedVector, MutableWrappedPtrOperations
+#include "js/RootingAPI.h"  // for MutableHandle, Rooted, Handle, Heap
+#include "js/Value.h"       // for Value
+#include "js/ValueArray.h"  // for HandleValueArray
+#include "jsapi.h"          // for CurrentGlobalOrNull
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER1
+#include "mozilla/Attributes.h"        // for MOZ_MUST_USE
+#include "mozilla/UniquePtr.h"         // for UniquePtr
+#include "mozilla/Unused.h"            // for Unused
+#include "mozilla/dom/BindingUtils.h"  // for MaybeWrapValue, MaybeWrapObjectOrNullValue, XPCOMObjectToJsval, GetOrCreateDOMReflector
+#include "mozilla/dom/CallbackObject.h"  // for CallbackObject
+#include "nsID.h"                        // for NS_GET_TEMPLATE_IID, nsIID
+#include "nsISupports.h"                 // for nsISupports
+#include "nsStringFwd.h"                 // for nsAString
+#include "nsTArrayForwardDeclare.h"
+#include "xpcObjectHelper.h"  // for xpcObjectHelper
 
 namespace mozilla {
 namespace dom {
 
+class CallbackObject;
 class Promise;
 class WindowProxyHolder;
+template <typename TypedArrayType>
+class TypedArrayCreator;
 
 // If ToJSValue returns false, it must set an exception on the
 // JSContext.
diff -Nru firefox-84.0.2+build1/dom/bindings/TypedArray.h firefox-85.0+build1/dom/bindings/TypedArray.h
--- firefox-84.0.2+build1/dom/bindings/TypedArray.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/TypedArray.h	2021-01-18 19:58:09.000000000 +0000
@@ -45,10 +45,7 @@
         mLength(aOther.mLength),
         mShared(aOther.mShared),
         mComputed(aOther.mComputed) {
-    aOther.mData = nullptr;
-    aOther.mLength = 0;
-    aOther.mShared = false;
-    aOther.mComputed = false;
+    aOther.Reset();
   }
 
  private:
@@ -115,6 +112,18 @@
     return mData;
   }
 
+  // Return a pointer to data that will not move during a GC.
+  //
+  // For some smaller views, this will copy the data into the provided buffer
+  // and return that buffer as the pointer. Otherwise, this will return a
+  // direct pointer to the actual data with no copying. If the provided buffer
+  // is not large enough, nullptr will be returned. If bufSize is at least
+  // JS_MaxMovableTypedArraySize(), the data is guaranteed to fit.
+  inline T* FixedData(uint8_t* buffer, size_t bufSize) const {
+    MOZ_ASSERT(mComputed);
+    return JS_GetArrayBufferViewFixedData(mImplObj, buffer, bufSize);
+  }
+
   inline uint32_t Length() const {
     MOZ_ASSERT(mComputed);
     return mLength;
@@ -127,6 +136,16 @@
     mComputed = true;
   }
 
+  inline void Reset() {
+    // This method mostly exists to inform the GC rooting hazard analysis that
+    // the variable can be considered dead, at least until you do anything else
+    // with it.
+    mData = nullptr;
+    mLength = 0;
+    mShared = false;
+    mComputed = false;
+  }
+
  private:
   TypedArray_base(const TypedArray_base&) = delete;
 };
diff -Nru firefox-84.0.2+build1/dom/bindings/WebIDLGlobalNameHash.cpp firefox-85.0+build1/dom/bindings/WebIDLGlobalNameHash.cpp
--- firefox-84.0.2+build1/dom/bindings/WebIDLGlobalNameHash.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/bindings/WebIDLGlobalNameHash.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/DOMJSClass.h"
 #include "mozilla/dom/DOMJSProxyHandler.h"
+#include "mozilla/dom/Exceptions.h"
 #include "mozilla/dom/JSSlots.h"
 #include "mozilla/dom/PrototypeList.h"
 #include "mozilla/dom/RegisterBindings.h"
diff -Nru firefox-84.0.2+build1/dom/broadcastchannel/BroadcastChannel.cpp firefox-85.0+build1/dom/broadcastchannel/BroadcastChannel.cpp
--- firefox-84.0.2+build1/dom/broadcastchannel/BroadcastChannel.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/broadcastchannel/BroadcastChannel.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -43,27 +43,24 @@
 
 namespace {
 
-class CloseRunnable final : public nsIRunnable, public nsICancelableRunnable {
+class CloseRunnable final : public DiscardableRunnable {
  public:
-  NS_DECL_ISUPPORTS
-
-  explicit CloseRunnable(BroadcastChannel* aBC) : mBC(aBC) { MOZ_ASSERT(mBC); }
+  explicit CloseRunnable(BroadcastChannel* aBC)
+      : DiscardableRunnable("BroadcastChannel CloseRunnable"), mBC(aBC) {
+    MOZ_ASSERT(mBC);
+  }
 
   NS_IMETHOD Run() override {
     mBC->Shutdown();
     return NS_OK;
   }
 
-  nsresult Cancel() override { return NS_OK; }
-
  private:
   ~CloseRunnable() = default;
 
   RefPtr<BroadcastChannel> mBC;
 };
 
-NS_IMPL_ISUPPORTS(CloseRunnable, nsICancelableRunnable, nsIRunnable)
-
 class TeardownRunnable {
  protected:
   explicit TeardownRunnable(BroadcastChannelChild* aActor) : mActor(aActor) {
diff -Nru firefox-84.0.2+build1/dom/broadcastchannel/BroadcastChannelService.cpp firefox-85.0+build1/dom/broadcastchannel/BroadcastChannelService.cpp
--- firefox-84.0.2+build1/dom/broadcastchannel/BroadcastChannelService.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/broadcastchannel/BroadcastChannelService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "BroadcastChannelService.h"
 #include "BroadcastChannelParent.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/ipc/BackgroundParent.h"
diff -Nru firefox-84.0.2+build1/dom/browser-element/BrowserElementChild.js firefox-85.0+build1/dom/browser-element/BrowserElementChild.js
--- firefox-84.0.2+build1/dom/browser-element/BrowserElementChild.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/browser-element/BrowserElementChild.js	2021-01-18 19:58:09.000000000 +0000
@@ -13,10 +13,6 @@
   // dump("BrowserElementChild - " + msg + "\n");
 }
 
-// NB: this must happen before we process any messages from
-// mozbrowser API clients.
-docShell.isActive = true;
-
 var BrowserElementIsReady;
 
 debug(`Might load BE scripts: BEIR: ${BrowserElementIsReady}`);
diff -Nru firefox-84.0.2+build1/dom/browser-element/BrowserElementChildPreload.js firefox-85.0+build1/dom/browser-element/BrowserElementChildPreload.js
--- firefox-84.0.2+build1/dom/browser-element/BrowserElementChildPreload.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/browser-element/BrowserElementChildPreload.js	2021-01-18 19:58:09.000000000 +0000
@@ -120,7 +120,6 @@
 
     let mmCalls = {
       "unblock-modal-prompt": this._recvStopWaiting,
-      "owner-visibility-change": this._recvOwnerVisibilityChange,
     };
 
     if (message.data.msg_name in mmCalls) {
@@ -284,18 +283,6 @@
     win.modalReturnValue = returnValue;
     win.modalDepth--;
   },
-
-  /**
-   * Called when the window which contains this iframe becomes hidden or
-   * visible.
-   */
-  _recvOwnerVisibilityChange(data) {
-    debug("Received ownerVisibilityChange: (" + data.json.visible + ")");
-    var visible = data.json.visible;
-    if (docShell && docShell.isActive !== visible) {
-      docShell.isActive = visible;
-    }
-  },
 };
 
 var api = new BrowserElementChild();
diff -Nru firefox-84.0.2+build1/dom/browser-element/BrowserElementParent.jsm firefox-85.0+build1/dom/browser-element/BrowserElementParent.jsm
--- firefox-84.0.2+build1/dom/browser-element/BrowserElementParent.jsm	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/browser-element/BrowserElementParent.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -255,15 +255,6 @@
     });
   },
 
-  /**
-   * Called when the visibility of the window which owns this iframe changes.
-   */
-  _ownerVisibilityChange() {
-    this._sendAsyncMsg("owner-visibility-change", {
-      visible: !this._window.document.hidden,
-    });
-  },
-
   _handleOwnerEvent(evt) {
     switch (evt.type) {
       case "visibilitychange":
@@ -271,6 +262,16 @@
         break;
     }
   },
+
+  /**
+   * Called when the visibility of the window which owns this iframe changes.
+   */
+  _ownerVisibilityChange() {
+    let bc = this._frameLoader?.browsingContext;
+    if (bc) {
+      bc.isActive = !this._window.document.hidden;
+    }
+  },
 };
 
 var EXPORTED_SYMBOLS = ["BrowserElementParent"];
diff -Nru firefox-84.0.2+build1/dom/cache/CacheStorage.cpp firefox-85.0+build1/dom/cache/CacheStorage.cpp
--- firefox-84.0.2+build1/dom/cache/CacheStorage.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/CacheStorage.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/cache/CacheStorage.h"
 
+#include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/CacheBinding.h"
 #include "mozilla/dom/CacheStorageBinding.h"
diff -Nru firefox-84.0.2+build1/dom/cache/CacheTypes.ipdlh firefox-85.0+build1/dom/cache/CacheTypes.ipdlh
--- firefox-84.0.2+build1/dom/cache/CacheTypes.ipdlh	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/CacheTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -9,16 +9,19 @@
 include ChannelInfo;
 include PBackgroundSharedTypes;
 
-using HeadersGuardEnum from "mozilla/dom/FetchIPCTypes.h";
-using Namespace from "mozilla/dom/cache/IPCUtils.h";
-using OpenMode from "mozilla/dom/cache/IPCUtils.h";
-using ReferrerPolicy from "mozilla/dom/FetchIPCTypes.h";
-using RequestCredentials from "mozilla/dom/FetchIPCTypes.h";
-using RequestMode from "mozilla/dom/FetchIPCTypes.h";
-using RequestCache from "mozilla/dom/FetchIPCTypes.h";
-using RequestRedirect from "mozilla/dom/FetchIPCTypes.h";
-using ResponseType from "mozilla/dom/FetchIPCTypes.h";
-using mozilla::void_t from "ipc/IPCMessageUtils.h";
+include "mozilla/dom/cache/IPCUtils.h";
+include "mozilla/dom/FetchIPCTypes.h";
+
+using HeadersGuardEnum from "mozilla/dom/HeadersBinding.h";
+using Namespace from "mozilla/dom/cache/Types.h";
+using OpenMode from "mozilla/dom/cache/Types.h";
+using ReferrerPolicy from "mozilla/dom/ReferrerPolicyBinding.h";
+using RequestCredentials from "mozilla/dom/RequestBinding.h";
+using RequestMode from "mozilla/dom/RequestBinding.h";
+using RequestCache from "mozilla/dom/RequestBinding.h";
+using RequestRedirect from "mozilla/dom/RequestBinding.h";
+using ResponseType from "mozilla/dom/ResponseBinding.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 using struct nsID from "nsID.h";
 using nsILoadInfo::CrossOriginEmbedderPolicy from "nsILoadInfo.h";
 
diff -Nru firefox-84.0.2+build1/dom/cache/Context.cpp firefox-85.0+build1/dom/cache/Context.cpp
--- firefox-84.0.2+build1/dom/cache/Context.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/Context.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozIStorageConnection.h"
 #include "nsIPrincipal.h"
 #include "nsIRunnable.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 namespace {
@@ -42,6 +43,7 @@
 namespace mozilla::dom::cache {
 
 using mozilla::dom::quota::AssertIsOnIOThread;
+using mozilla::dom::quota::DirectoryLock;
 using mozilla::dom::quota::OpenDirectoryListener;
 using mozilla::dom::quota::PERSISTENCE_TYPE_DEFAULT;
 using mozilla::dom::quota::PersistenceType;
@@ -109,6 +111,12 @@
     MOZ_DIAGNOSTIC_ASSERT(mInitAction);
   }
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
+    NS_ASSERT_OWNINGTHREAD(QuotaInitRunnable);
+
+    return ToMaybeRef(mDirectoryLock.get());
+  }
+
   nsresult Dispatch() {
     NS_ASSERT_OWNINGTHREAD(QuotaInitRunnable);
     MOZ_DIAGNOSTIC_ASSERT(mState == STATE_INIT);
@@ -391,25 +399,36 @@
     case STATE_ENSURE_ORIGIN_INITIALIZED: {
       AssertIsOnIOThread();
 
-      if (mCanceled) {
-        resolver->Resolve(NS_ERROR_ABORT);
-        break;
-      }
+      auto res = [this]() -> Result<Ok, nsresult> {
+        if (mCanceled) {
+          return Err(NS_ERROR_ABORT);
+        }
 
-      QuotaManager* qm = QuotaManager::Get();
-      MOZ_DIAGNOSTIC_ASSERT(qm);
+        QuotaManager* quotaManager = QuotaManager::Get();
+        MOZ_DIAGNOSTIC_ASSERT(quotaManager);
 
-      auto directoryOrErr = qm->EnsureStorageAndOriginIsInitialized(
-          PERSISTENCE_TYPE_DEFAULT, mQuotaInfo, quota::Client::DOMCACHE);
-      if (directoryOrErr.isErr()) {
-        resolver->Resolve(directoryOrErr.inspectErr());
-        break;
-      }
-      mQuotaInfo.mDir = directoryOrErr.unwrap();
+        CACHE_TRY(quotaManager->EnsureStorageIsInitialized());
+
+        CACHE_TRY(quotaManager->EnsureTemporaryStorageIsInitialized());
+
+        CACHE_TRY_UNWRAP(mQuotaInfo.mDir,
+                         quotaManager
+                             ->EnsureTemporaryOriginIsInitialized(
+                                 PERSISTENCE_TYPE_DEFAULT, mQuotaInfo)
+                             .map([](const auto& res) { return res.first; }));
+
+        mState = STATE_RUN_ON_TARGET;
 
-      mState = STATE_RUN_ON_TARGET;
+        MOZ_ALWAYS_SUCCEEDS(
+            mTarget->Dispatch(this, nsIThread::DISPATCH_NORMAL));
+
+        return Ok{};
+      }();
+
+      if (res.isErr()) {
+        resolver->Resolve(res.inspectErr());
+      }
 
-      MOZ_ALWAYS_SUCCEEDS(mTarget->Dispatch(this, nsIThread::DISPATCH_NORMAL));
       break;
     }
     // -------------------
@@ -807,6 +826,25 @@
   DispatchAction(std::move(aAction));
 }
 
+Maybe<DirectoryLock&> Context::MaybeDirectoryLockRef() const {
+  NS_ASSERT_OWNINGTHREAD(Context);
+
+  if (mState == STATE_CONTEXT_PREINIT) {
+    MOZ_DIAGNOSTIC_ASSERT(!mInitRunnable);
+    MOZ_DIAGNOSTIC_ASSERT(!mDirectoryLock);
+
+    return Nothing();
+  }
+
+  if (mState == STATE_CONTEXT_INIT) {
+    MOZ_DIAGNOSTIC_ASSERT(!mDirectoryLock);
+
+    return mInitRunnable->MaybeDirectoryLockRef();
+  }
+
+  return ToMaybeRef(mDirectoryLock.get());
+}
+
 void Context::CancelAll() {
   NS_ASSERT_OWNINGTHREAD(Context);
 
diff -Nru firefox-84.0.2+build1/dom/cache/Context.h firefox-85.0+build1/dom/cache/Context.h
--- firefox-84.0.2+build1/dom/cache/Context.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/Context.h	2021-01-18 19:58:09.000000000 +0000
@@ -48,9 +48,9 @@
 //     have removed themselves as listener.  This means an idle context with
 //     no active DOM objects will close gracefully.
 //  2) The QuotaManager aborts all operations so it can delete the files.
-//     In this case the QuotaManager calls Client::AbortOperations() which
-//     in turn cancels all existing Action objects and then marks the Manager
-//     as invalid.
+//     In this case the QuotaManager calls Client::AbortOperationsForLocks()
+//     which in turn cancels all existing Action objects and then marks the
+//     Manager as invalid.
 //  3) Browser shutdown occurs and the Manager calls Context::CancelAll().
 //
 // In either case, though, the Action objects must be destroyed first to
@@ -124,6 +124,8 @@
   // Only callable from the thread that created the Context.
   void Dispatch(SafeRefPtr<Action> aAction);
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const;
+
   // Cancel any Actions running or waiting to run.  This should allow the
   // Context to be released and Listener::RemoveContext() will be called
   // when complete.
diff -Nru firefox-84.0.2+build1/dom/cache/DBAction.cpp firefox-85.0+build1/dom/cache/DBAction.cpp
--- firefox-84.0.2+build1/dom/cache/DBAction.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/DBAction.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -158,7 +158,13 @@
     return rv;
   }
 
-  return OpenDBConnection(aQuotaInfo, dbFile, aConnOut);
+  auto res = OpenDBConnection(aQuotaInfo, *dbFile);
+  if (res.isErr()) {
+    return res.inspectErr();
+  }
+
+  *aConnOut = res.unwrap().forget().take();
+  return NS_OK;
 }
 
 SyncDBAction::SyncDBAction(Mode aMode) : DBAction(aMode) {}
@@ -178,97 +184,78 @@
   aResolver->Resolve(rv);
 }
 
-// static
-nsresult OpenDBConnection(const QuotaInfo& aQuotaInfo, nsIFile* aDBFile,
-                          mozIStorageConnection** aConnOut) {
+Result<nsCOMPtr<mozIStorageConnection>, nsresult> OpenDBConnection(
+    const QuotaInfo& aQuotaInfo, nsIFile& aDBFile) {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_DIAGNOSTIC_ASSERT(aQuotaInfo.mDirectoryLockId >= -1);
-  MOZ_DIAGNOSTIC_ASSERT(aDBFile);
-  MOZ_DIAGNOSTIC_ASSERT(aConnOut);
 
   // Use our default file:// protocol handler directly to construct the database
   // URL.  This avoids any problems if a plugin registers a custom file://
   // handler.  If such a custom handler used javascript, then we would have a
   // bad time running off the main thread here.
-  RefPtr<nsFileProtocolHandler> handler = new nsFileProtocolHandler();
-  nsresult rv = handler->Init();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  auto handler = MakeRefPtr<nsFileProtocolHandler>();
+  CACHE_TRY(handler->Init());
 
-  nsCOMPtr<nsIURIMutator> mutator;
-  rv = handler->NewFileURIMutator(aDBFile, getter_AddRefs(mutator));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsCOMPtr<nsIFileURL> dbFileUrl;
+  CACHE_TRY_INSPECT(const auto& mutator,
+                    MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<nsIURIMutator>, handler,
+                                               NewFileURIMutator, &aDBFile));
 
   const nsCString directoryLockIdClause =
       aQuotaInfo.mDirectoryLockId >= 0
           ? "&directoryLockId="_ns + IntToCString(aQuotaInfo.mDirectoryLockId)
           : EmptyCString();
 
-  rv = NS_MutateURI(mutator)
-           .SetQuery("cache=private"_ns + directoryLockIdClause)
-           .Finalize(dbFileUrl);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsCOMPtr<mozIStorageService> ss =
-      do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
-  if (NS_WARN_IF(!ss)) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  nsCOMPtr<mozIStorageConnection> conn;
-  rv = ss->OpenDatabaseWithFileURL(dbFileUrl, ""_ns, getter_AddRefs(conn));
-  if (rv == NS_ERROR_FILE_CORRUPTED) {
-    NS_WARNING("Cache database corrupted. Recreating empty database.");
-
-    conn = nullptr;
-
-    // There is nothing else we can do to recover.  Also, this data can
-    // be deleted by QuotaManager at any time anyways.
-    rv = WipeDatabase(aQuotaInfo, aDBFile);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    rv = ss->OpenDatabaseWithFileURL(dbFileUrl, ""_ns, getter_AddRefs(conn));
-  }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  nsCOMPtr<nsIFileURL> dbFileUrl;
+  CACHE_TRY(NS_MutateURI(mutator)
+                .SetQuery("cache=private"_ns + directoryLockIdClause)
+                .Finalize(dbFileUrl));
+
+  CACHE_TRY_INSPECT(
+      const auto& storageService,
+      ToResultGet<nsCOMPtr<mozIStorageService>>(
+          MOZ_SELECT_OVERLOAD(do_GetService), MOZ_STORAGE_SERVICE_CONTRACTID),
+      Err(NS_ERROR_UNEXPECTED));
+
+  CACHE_TRY_UNWRAP(
+      auto conn,
+      MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<mozIStorageConnection>,
+                                 storageService, OpenDatabaseWithFileURL,
+                                 dbFileUrl, ""_ns)
+          .orElse([&aQuotaInfo, &aDBFile, &storageService,
+                   &dbFileUrl](const nsresult rv)
+                      -> Result<nsCOMPtr<mozIStorageConnection>, nsresult> {
+            if (rv == NS_ERROR_FILE_CORRUPTED) {
+              NS_WARNING(
+                  "Cache database corrupted. Recreating empty database.");
+
+              // There is nothing else we can do to recover.  Also, this data
+              // can be deleted by QuotaManager at any time anyways.
+              CACHE_TRY(WipeDatabase(aQuotaInfo, &aDBFile));
+
+              CACHE_TRY_RETURN(MOZ_TO_RESULT_INVOKE_TYPED(
+                  nsCOMPtr<mozIStorageConnection>, storageService,
+                  OpenDatabaseWithFileURL, dbFileUrl, ""_ns));
+            }
+            return Err(rv);
+          }));
 
   // Check the schema to make sure it is not too old.
-  int32_t schemaVersion = 0;
-  rv = conn->GetSchemaVersion(&schemaVersion);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const int32_t& schemaVersion,
+                    MOZ_TO_RESULT_INVOKE(conn, GetSchemaVersion));
   if (schemaVersion > 0 && schemaVersion < db::kFirstShippedSchemaVersion) {
+    // Close existing connection before wiping database.
     conn = nullptr;
-    rv = WipeDatabase(aQuotaInfo, aDBFile);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    rv = ss->OpenDatabaseWithFileURL(dbFileUrl, ""_ns, getter_AddRefs(conn));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
 
-  rv = db::InitializeConnection(*conn);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    CACHE_TRY(WipeDatabase(aQuotaInfo, &aDBFile));
+
+    CACHE_TRY_UNWRAP(conn, MOZ_TO_RESULT_INVOKE_TYPED(
+                               nsCOMPtr<mozIStorageConnection>, storageService,
+                               OpenDatabaseWithFileURL, dbFileUrl, ""_ns));
   }
 
-  conn.forget(aConnOut);
+  CACHE_TRY(db::InitializeConnection(*conn));
 
-  return rv;
+  return conn;
 }
 
 }  // namespace mozilla::dom::cache
diff -Nru firefox-84.0.2+build1/dom/cache/DBAction.h firefox-85.0+build1/dom/cache/DBAction.h
--- firefox-84.0.2+build1/dom/cache/DBAction.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/DBAction.h	2021-01-18 19:58:09.000000000 +0000
@@ -18,8 +18,8 @@
 namespace dom {
 namespace cache {
 
-nsresult OpenDBConnection(const QuotaInfo& aQuotaInfo, nsIFile* aDBFile,
-                          mozIStorageConnection** aConnOut);
+Result<nsCOMPtr<mozIStorageConnection>, nsresult> OpenDBConnection(
+    const QuotaInfo& aQuotaInfo, nsIFile& aDBFile);
 
 class DBAction : public Action {
  protected:
diff -Nru firefox-84.0.2+build1/dom/cache/DBSchema.cpp firefox-85.0+build1/dom/cache/DBSchema.cpp
--- firefox-84.0.2+build1/dom/cache/DBSchema.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/DBSchema.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -25,6 +25,7 @@
 #include "mozIStorageStatement.h"
 #include "mozStorageHelper.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsCRT.h"
 #include "nsHttp.h"
 #include "nsIContentPolicy.h"
@@ -410,21 +411,13 @@
  public:
   explicit AutoDisableForeignKeyChecking(mozIStorageConnection* aConn)
       : mConn(aConn), mForeignKeyCheckingDisabled(false) {
-    nsCOMPtr<mozIStorageStatement> state;
-    nsresult rv = mConn->CreateStatement("PRAGMA foreign_keys;"_ns,
-                                         getter_AddRefs(state));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return;
-    }
-
-    bool hasMoreData = false;
-    rv = state->ExecuteStep(&hasMoreData);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return;
-    }
+    CACHE_TRY_INSPECT(const auto& state,
+                      quota::CreateAndExecuteSingleStepStatement(
+                          *mConn, "PRAGMA foreign_keys;"_ns),
+                      QM_VOID);
 
     int32_t mode;
-    rv = state->GetInt32(0, &mode);
+    nsresult rv = state->GetInt32(0, &mode);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return;
     }
@@ -623,27 +616,21 @@
   // is very easy to put the database in a state where the auto_vacuum
   // pragma above fails silently.
 #ifdef DEBUG
-  nsCOMPtr<mozIStorageStatement> state;
-  rv = aConn.CreateStatement("PRAGMA auto_vacuum;"_ns, getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  {
+    CACHE_TRY_INSPECT(const auto& state,
+                      quota::CreateAndExecuteSingleStepStatement(
+                          aConn, "PRAGMA auto_vacuum;"_ns));
 
-  int32_t mode;
-  rv = state->GetInt32(0, &mode);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+    int32_t mode;
+    rv = state->GetInt32(0, &mode);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
 
-  // integer value 2 is incremental mode
-  if (NS_WARN_IF(mode != 2)) {
-    return NS_ERROR_UNEXPECTED;
+    // integer value 2 is incremental mode
+    if (NS_WARN_IF(mode != 2)) {
+      return NS_ERROR_UNEXPECTED;
+    }
   }
 #endif
 
@@ -658,21 +645,12 @@
     return Err(rv);
   }
 
-  nsCOMPtr<mozIStorageStatement> state;
-  rv = aConn.CreateStatement("SELECT last_insert_rowid()"_ns,
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  CACHE_TRY_INSPECT(const auto& state,
+                    quota::CreateAndExecuteSingleStepStatement<
+                        quota::SingleStepResult::ReturnNullIfNoResult>(
+                        aConn, "SELECT last_insert_rowid()"_ns));
 
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-  if (NS_WARN_IF(!hasMoreData)) {
-    return Err(NS_ERROR_UNEXPECTED);
-  }
+  CACHE_TRY(OkIf(state), Err(NS_ERROR_UNEXPECTED));
 
   CacheId id;
   rv = state->GetInt64(0, &id);
@@ -1611,45 +1589,33 @@
   // value first and then the full data.  SQLite is smart enough to use
   // the index on the hash to search the table before doing the expensive
   // comparison of the large data column.  (This was verified with EXPLAIN.)
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn.CreateStatement(
-      nsLiteralCString(
+  CACHE_TRY_INSPECT(
+      const auto& selectStmt,
+      quota::CreateAndExecuteSingleStepStatement<
+          quota::SingleStepResult::ReturnNullIfNoResult>(
+          aConn,
           // Note that hash and data are blobs, but we can use = here since the
           // columns are NOT NULL.
           "SELECT id, refcount FROM security_info WHERE hash=:hash AND "
-          "data=:data;"),
-      getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  rv = state->BindUTF8StringAsBlobByName("hash"_ns, hash);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+          "data=:data;"_ns,
+          [&hash, &aData](auto& state) -> Result<Ok, nsresult> {
+            CACHE_TRY(state.BindUTF8StringAsBlobByName("hash"_ns, hash));
+            CACHE_TRY(state.BindUTF8StringAsBlobByName("data"_ns, aData));
 
-  rv = state->BindUTF8StringAsBlobByName("data"_ns, aData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+            return Ok{};
+          }));
 
   // This security info blob is already in the database
-  if (hasMoreData) {
+  if (selectStmt) {
     int32_t id;
     // get the existing security blob id to return
-    rv = state->GetInt32(0, &id);
+    nsresult rv = selectStmt->GetInt32(0, &id);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
     int32_t refcount = -1;
-    rv = state->GetInt32(1, &refcount);
+    rv = selectStmt->GetInt32(1, &refcount);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
@@ -1657,6 +1623,7 @@
     // But first, update the refcount in the database.
     refcount += 1;
 
+    nsCOMPtr<mozIStorageStatement> state;
     rv = aConn.CreateStatement(
         nsLiteralCString(
             "UPDATE security_info SET refcount=:refcount WHERE id=:id;"),
@@ -1685,7 +1652,8 @@
 
   // This is a new security info blob.  Create a new row in the security table
   // with an initial refcount of 1.
-  rv = aConn.CreateStatement(
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = aConn.CreateStatement(
       "INSERT INTO security_info (hash, data, refcount) "
       "VALUES (:hash, :data, 1);"_ns,
       getter_AddRefs(state));
@@ -1708,54 +1676,37 @@
     return Err(rv);
   }
 
-  rv = aConn.CreateStatement("SELECT last_insert_rowid()"_ns,
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  {
+    CACHE_TRY_INSPECT(const auto& state,
+                      quota::CreateAndExecuteSingleStepStatement(
+                          aConn, "SELECT last_insert_rowid()"_ns));
 
-  hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+    int32_t id;
+    rv = state->GetInt32(0, &id);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Err(rv);
+    }
 
-  int32_t id;
-  rv = state->GetInt32(0, &id);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
+    return id;
   }
-
-  return id;
 }
 
 nsresult DeleteSecurityInfo(mozIStorageConnection& aConn, int32_t aId,
                             int32_t aCount) {
   // First, we need to determine the current refcount for this security blob.
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn.CreateStatement(
-      "SELECT refcount FROM security_info WHERE id=:id;"_ns,
-      getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = state->BindInt32ByName("id"_ns, aId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(
+      const int32_t& refcount, ([&aConn, aId]() -> Result<int32_t, nsresult> {
+        CACHE_TRY_INSPECT(
+            const auto& state,
+            quota::CreateAndExecuteSingleStepStatement(
+                aConn, "SELECT refcount FROM security_info WHERE id=:id;"_ns,
+                [aId](auto& state) -> Result<Ok, nsresult> {
+                  CACHE_TRY(state.BindInt32ByName("id"_ns, aId));
+                  return Ok{};
+                }));
 
-  int32_t refcount = -1;
-  rv = state->GetInt32(0, &refcount);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+        CACHE_TRY_RETURN(MOZ_TO_RESULT_INVOKE(*state, GetInt32, 0));
+      }()));
 
   MOZ_DIAGNOSTIC_ASSERT(refcount >= aCount);
 
@@ -1765,8 +1716,9 @@
   // If the last reference to this security blob was removed we can
   // just remove the entire row.
   if (newCount == 0) {
-    rv = aConn.CreateStatement("DELETE FROM security_info WHERE id=:id;"_ns,
-                               getter_AddRefs(state));
+    nsCOMPtr<mozIStorageStatement> state;
+    nsresult rv = aConn.CreateStatement(
+        "DELETE FROM security_info WHERE id=:id;"_ns, getter_AddRefs(state));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -1786,7 +1738,8 @@
 
   // Otherwise update the refcount in the table to reflect the reduced
   // number of references to the security blob.
-  rv = aConn.CreateStatement(
+  nsCOMPtr<mozIStorageStatement> state;
+  nsresult rv = aConn.CreateStatement(
       nsLiteralCString(
           "UPDATE security_info SET refcount=:refcount WHERE id=:id;"),
       getter_AddRefs(state));
@@ -2079,23 +2032,14 @@
     return rv;
   }
 
-  rv = aConn.CreateStatement("SELECT last_insert_rowid()"_ns,
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(
+      const int32_t& entryId, ([&aConn]() -> Result<int32_t, nsresult> {
+        CACHE_TRY_INSPECT(const auto& state,
+                          quota::CreateAndExecuteSingleStepStatement(
+                              aConn, "SELECT last_insert_rowid()"_ns));
 
-  int32_t entryId;
-  rv = state->GetInt32(0, &entryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+        CACHE_TRY_RETURN(MOZ_TO_RESULT_INVOKE(*state, GetInt32, 0));
+      }()));
 
   rv = aConn.CreateStatement(
       nsLiteralCString("INSERT INTO request_headers ("
@@ -2198,39 +2142,30 @@
 
   SavedResponse savedResponse;
 
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv = aConn.CreateStatement(
-      nsLiteralCString("SELECT "
-                       "entries.response_type, "
-                       "entries.response_status, "
-                       "entries.response_status_text, "
-                       "entries.response_headers_guard, "
-                       "entries.response_body_id, "
-                       "entries.response_principal_info, "
-                       "entries.response_padding_size, "
-                       "security_info.data "
-                       "FROM entries "
-                       "LEFT OUTER JOIN security_info "
-                       "ON entries.response_security_info_id=security_info.id "
-                       "WHERE entries.id=:id;"),
-      getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  CACHE_TRY_INSPECT(const auto& state,
+                    quota::CreateAndExecuteSingleStepStatement(
+                        aConn,
+                        "SELECT "
+                        "entries.response_type, "
+                        "entries.response_status, "
+                        "entries.response_status_text, "
+                        "entries.response_headers_guard, "
+                        "entries.response_body_id, "
+                        "entries.response_principal_info, "
+                        "entries.response_padding_size, "
+                        "security_info.data "
+                        "FROM entries "
+                        "LEFT OUTER JOIN security_info "
+                        "ON entries.response_security_info_id=security_info.id "
+                        "WHERE entries.id=:id;"_ns,
+                        [aEntryId](auto& state) -> Result<Ok, nsresult> {
+                          CACHE_TRY(state.BindInt32ByName("id"_ns, aEntryId));
 
-  rv = state->BindInt32ByName("id"_ns, aEntryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+                          return Ok{};
+                        }));
 
   int32_t type;
-  rv = state->GetInt32(0, &type);
+  nsresult rv = state->GetInt32(0, &type);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return Err(rv);
   }
@@ -2336,60 +2271,68 @@
     return Err(rv);
   }
 
-  rv = aConn.CreateStatement(nsLiteralCString("SELECT "
-                                              "name, "
-                                              "value "
-                                              "FROM response_headers "
-                                              "WHERE entry_id=:entry_id;"),
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
-    HeadersEntry header;
-
-    rv = state->GetUTF8String(0, header.name());
+  {
+    nsCOMPtr<mozIStorageStatement> state;
+    rv = aConn.CreateStatement(nsLiteralCString("SELECT "
+                                                "name, "
+                                                "value "
+                                                "FROM response_headers "
+                                                "WHERE entry_id=:entry_id;"),
+                               getter_AddRefs(state));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
-    rv = state->GetUTF8String(1, header.value());
+    rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
-    savedResponse.mValue.headers().AppendElement(header);
-  }
+    bool hasMoreData;
+    while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
+      HeadersEntry header;
 
-  rv = aConn.CreateStatement(nsLiteralCString("SELECT "
-                                              "url "
-                                              "FROM response_url_list "
-                                              "WHERE entry_id=:entry_id;"),
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+      rv = state->GetUTF8String(0, header.name());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return Err(rv);
+      }
 
-  rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
+      rv = state->GetUTF8String(1, header.value());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return Err(rv);
+      }
+
+      savedResponse.mValue.headers().AppendElement(header);
+    }
   }
 
-  while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
-    nsCString url;
+  {
+    nsCOMPtr<mozIStorageStatement> state;
+    rv = aConn.CreateStatement(nsLiteralCString("SELECT "
+                                                "url "
+                                                "FROM response_url_list "
+                                                "WHERE entry_id=:entry_id;"),
+                               getter_AddRefs(state));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return Err(rv);
+    }
 
-    rv = state->GetUTF8String(0, url);
+    rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
-    savedResponse.mValue.urlList().AppendElement(url);
+    bool hasMoreData;
+    while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
+      nsCString url;
+
+      rv = state->GetUTF8String(0, url);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return Err(rv);
+      }
+
+      savedResponse.mValue.urlList().AppendElement(url);
+    }
   }
 
   return savedResponse;
@@ -2401,42 +2344,34 @@
 
   SavedRequest savedRequest;
 
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv =
-      aConn.CreateStatement(nsLiteralCString("SELECT "
-                                             "request_method, "
-                                             "request_url_no_query, "
-                                             "request_url_query, "
-                                             "request_url_fragment, "
-                                             "request_referrer, "
-                                             "request_referrer_policy, "
-                                             "request_headers_guard, "
-                                             "request_mode, "
-                                             "request_credentials, "
-                                             "request_contentpolicytype, "
-                                             "request_cache, "
-                                             "request_redirect, "
-                                             "request_integrity, "
-                                             "request_body_id "
-                                             "FROM entries "
-                                             "WHERE id=:id;"),
-                            getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  rv = state->BindInt32ByName("id"_ns, aEntryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  CACHE_TRY_INSPECT(const auto& state,
+                    quota::CreateAndExecuteSingleStepStatement<
+                        quota::SingleStepResult::ReturnNullIfNoResult>(
+                        aConn,
+                        "SELECT "
+                        "request_method, "
+                        "request_url_no_query, "
+                        "request_url_query, "
+                        "request_url_fragment, "
+                        "request_referrer, "
+                        "request_referrer_policy, "
+                        "request_headers_guard, "
+                        "request_mode, "
+                        "request_credentials, "
+                        "request_contentpolicytype, "
+                        "request_cache, "
+                        "request_redirect, "
+                        "request_integrity, "
+                        "request_body_id "
+                        "FROM entries "
+                        "WHERE id=:id;"_ns,
+                        [aEntryId](auto& state) -> Result<Ok, nsresult> {
+                          CACHE_TRY(state.BindInt32ByName("id"_ns, aEntryId));
 
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+                          return Ok{};
+                        }));
 
-  rv = state->GetUTF8String(0, savedRequest.mValue.method());
+  nsresult rv = state->GetUTF8String(0, savedRequest.mValue.method());
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return Err(rv);
   }
@@ -2516,35 +2451,40 @@
   if (savedRequest.mHasBodyId) {
     CACHE_TRY_UNWRAP(savedRequest.mBodyId, ExtractId(*state, 13));
   }
-  rv = aConn.CreateStatement(nsLiteralCString("SELECT "
-                                              "name, "
-                                              "value "
-                                              "FROM request_headers "
-                                              "WHERE entry_id=:entry_id;"),
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
 
-  rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
-    HeadersEntry header;
-
-    rv = state->GetUTF8String(0, header.name());
+  {
+    nsCOMPtr<mozIStorageStatement> state;
+    rv = aConn.CreateStatement(nsLiteralCString("SELECT "
+                                                "name, "
+                                                "value "
+                                                "FROM request_headers "
+                                                "WHERE entry_id=:entry_id;"),
+                               getter_AddRefs(state));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
-    rv = state->GetUTF8String(1, header.value());
+    rv = state->BindInt32ByName("entry_id"_ns, aEntryId);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return Err(rv);
     }
 
-    savedRequest.mValue.headers().AppendElement(header);
+    bool hasMoreData;
+    while (NS_SUCCEEDED(state->ExecuteStep(&hasMoreData)) && hasMoreData) {
+      HeadersEntry header;
+
+      rv = state->GetUTF8String(0, header.name());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return Err(rv);
+      }
+
+      rv = state->GetUTF8String(1, header.value());
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return Err(rv);
+      }
+
+      savedRequest.mValue.headers().AppendElement(header);
+    }
   }
 
   return savedRequest;
@@ -2679,21 +2619,12 @@
 
 nsresult IncrementalVacuum(mozIStorageConnection& aConn) {
   // Determine how much free space is in the database.
-  nsCOMPtr<mozIStorageStatement> state;
-  nsresult rv =
-      aConn.CreateStatement("PRAGMA freelist_count;"_ns, getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const auto& state,
+                    quota::CreateAndExecuteSingleStepStatement(
+                        aConn, "PRAGMA freelist_count;"_ns));
 
   int32_t freePages = 0;
-  rv = state->GetInt32(0, &freePages);
+  nsresult rv = state->GetInt32(0, &freePages);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -2726,25 +2657,19 @@
 
   // Verify that our incremental vacuum actually did something
 #ifdef DEBUG
-  rv =
-      aConn.CreateStatement("PRAGMA freelist_count;"_ns, getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  {
+    CACHE_TRY_INSPECT(const auto& state,
+                      quota::CreateAndExecuteSingleStepStatement(
+                          aConn, "PRAGMA freelist_count;"_ns));
 
-  hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+    freePages = 0;
+    rv = state->GetInt32(0, &freePages);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
 
-  freePages = 0;
-  rv = state->GetInt32(0, &freePages);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    MOZ_ASSERT(freePages <= kMaxFreePages);
   }
-
-  MOZ_ASSERT(freePages <= kMaxFreePages);
 #endif
 
   return NS_OK;
@@ -2770,21 +2695,14 @@
     // (pragma_table_info is a table-valued function format variant of
     // "PRAGMA table_info" supported since SQLite 3.16.0.  Firefox 53 shipped
     // was the first release with this functionality, shipping 3.16.2.)
-    nsCOMPtr<mozIStorageStatement> stmt;
-    rv = aConn.CreateStatement(
-        nsLiteralCString("SELECT name FROM pragma_table_info('entries') WHERE "
-                         "name = 'response_padding_size'"),
-        getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return Err(rv);
-    }
-
+    //
     // If there are any result rows, then the column is present.
-    bool hasColumn = false;
-    rv = stmt->ExecuteStep(&hasColumn);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return Err(rv);
-    }
+    CACHE_TRY_INSPECT(const bool& hasColumn,
+                      quota::CreateAndExecuteSingleStepStatement<
+                          quota::SingleStepResult::ReturnNullIfNoResult>(
+                          aConn,
+                          "SELECT name FROM pragma_table_info('entries') WHERE "
+                          "name = 'response_padding_size'"_ns));
 
     if (hasColumn) {
       return kHackyPaddingSizePresentVersion;
@@ -3159,21 +3077,12 @@
 
   // Revalidate the foreign key constraints, and ensure that there are no
   // violations.
-  nsCOMPtr<mozIStorageStatement> state;
-  rv = aConn.CreateStatement("PRAGMA foreign_key_check;"_ns,
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const bool& hasResult,
+                    quota::CreateAndExecuteSingleStepStatement<
+                        quota::SingleStepResult::ReturnNullIfNoResult>(
+                        aConn, "PRAGMA foreign_key_check;"_ns));
 
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (NS_WARN_IF(hasMoreData)) {
-    return NS_ERROR_FAILURE;
-  }
+  CACHE_TRY(OkIf(!hasResult), NS_ERROR_FAILURE);
 
   rv = aConn.SetSchemaVersion(17);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -3403,21 +3312,12 @@
 
   // Revalidate the foreign key constraints, and ensure that there are no
   // violations.
-  nsCOMPtr<mozIStorageStatement> state;
-  rv = aConn.CreateStatement("PRAGMA foreign_key_check;"_ns,
-                             getter_AddRefs(state));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const bool& hasResult,
+                    quota::CreateAndExecuteSingleStepStatement<
+                        quota::SingleStepResult::ReturnNullIfNoResult>(
+                        aConn, "PRAGMA foreign_key_check;"_ns));
 
-  bool hasMoreData = false;
-  rv = state->ExecuteStep(&hasMoreData);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (NS_WARN_IF(hasMoreData)) {
-    return NS_ERROR_FAILURE;
-  }
+  CACHE_TRY(OkIf(!hasResult), NS_ERROR_FAILURE);
 
   rv = aConn.SetSchemaVersion(21);
   if (NS_WARN_IF(NS_FAILED(rv))) {
diff -Nru firefox-84.0.2+build1/dom/cache/FileUtils.cpp firefox-85.0+build1/dom/cache/FileUtils.cpp
--- firefox-84.0.2+build1/dom/cache/FileUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/FileUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -26,6 +26,7 @@
 namespace mozilla::dom::cache {
 
 using mozilla::dom::quota::Client;
+using mozilla::dom::quota::CloneFileAndAppend;
 using mozilla::dom::quota::FileInputStream;
 using mozilla::dom::quota::FileOutputStream;
 using mozilla::dom::quota::PERSISTENCE_TYPE_DEFAULT;
@@ -753,77 +754,48 @@
                                 DirPaddingFile aPaddingFileType) {
   MOZ_DIAGNOSTIC_ASSERT(aBaseDir);
 
-  nsCOMPtr<nsIFile> file;
-  nsresult rv = aBaseDir->Clone(getter_AddRefs(file));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
-  }
-
-  nsString fileName;
-  if (aPaddingFileType == DirPaddingFile::TMP_FILE) {
-    fileName = nsLiteralString(PADDING_TMP_FILE_NAME);
-  } else {
-    fileName = nsLiteralString(PADDING_FILE_NAME);
-  }
-
-  rv = file->Append(fileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
-  }
-
-  bool exists = false;
-  rv = file->Exists(&exists);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
-  }
+  CACHE_TRY_INSPECT(
+      const auto& file,
+      CloneFileAndAppend(*aBaseDir, aPaddingFileType == DirPaddingFile::TMP_FILE
+                                        ? nsLiteralString(PADDING_TMP_FILE_NAME)
+                                        : nsLiteralString(PADDING_FILE_NAME)),
+      false);
 
-  return exists;
+  CACHE_TRY_RETURN(MOZ_TO_RESULT_INVOKE(file, Exists), false);
 }
 
-// static
 nsresult LockedDirectoryPaddingGet(nsIFile* aBaseDir,
                                    int64_t* aPaddingSizeOut) {
   MOZ_DIAGNOSTIC_ASSERT(aBaseDir);
   MOZ_DIAGNOSTIC_ASSERT(aPaddingSizeOut);
-  MOZ_DIAGNOSTIC_ASSERT(
-      !DirectoryPaddingFileExists(aBaseDir, DirPaddingFile::TMP_FILE));
 
-  nsCOMPtr<nsIFile> file;
-  nsresult rv = aBaseDir->Clone(getter_AddRefs(file));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const int64_t& paddingSize,
+                    LockedDirectoryPaddingGet(*aBaseDir));
 
-  rv = file->Append(nsLiteralString(PADDING_FILE_NAME));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  *aPaddingSizeOut = paddingSize;
+  return NS_OK;
+}
 
-  nsCOMPtr<nsIInputStream> stream;
-  rv = NS_NewLocalFileInputStream(getter_AddRefs(stream), file);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+Result<int64_t, nsresult> LockedDirectoryPaddingGet(nsIFile& aBaseDir) {
+  MOZ_DIAGNOSTIC_ASSERT(
+      !DirectoryPaddingFileExists(&aBaseDir, DirPaddingFile::TMP_FILE));
 
-  nsCOMPtr<nsIInputStream> bufferedStream;
-  rv = NS_NewBufferedInputStream(getter_AddRefs(bufferedStream),
-                                 stream.forget(), 512);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(
+      const auto& file,
+      CloneFileAndAppend(aBaseDir, nsLiteralString(PADDING_FILE_NAME)));
 
-  nsCOMPtr<nsIObjectInputStream> objectStream =
-      NS_NewObjectInputStream(bufferedStream);
+  CACHE_TRY_UNWRAP(auto stream, NS_NewLocalFileInputStream(file));
 
-  uint64_t paddingSize = 0;
-  rv = objectStream->Read64(&paddingSize);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const auto& bufferedStream,
+                    NS_NewBufferedInputStream(stream.forget(), 512));
 
-  *aPaddingSizeOut = paddingSize;
+  const nsCOMPtr<nsIObjectInputStream> objectStream =
+      NS_NewObjectInputStream(bufferedStream);
 
-  return rv;
+  CACHE_TRY_RETURN(
+      MOZ_TO_RESULT_INVOKE(objectStream, Read64).map([](const uint64_t val) {
+        return int64_t(val);
+      }));
 }
 
 // static
@@ -962,38 +934,24 @@
   return rv;
 }
 
-// static
-nsresult LockedDirectoryPaddingRestore(nsIFile* aBaseDir,
-                                       mozIStorageConnection* aConn,
-                                       bool aMustRestore,
-                                       int64_t* aPaddingSizeOut) {
-  MOZ_DIAGNOSTIC_ASSERT(aBaseDir);
-  MOZ_DIAGNOSTIC_ASSERT(aConn);
-  MOZ_DIAGNOSTIC_ASSERT(aPaddingSizeOut);
-
+Result<int64_t, nsresult> LockedDirectoryPaddingRestore(
+    nsIFile& aBaseDir, mozIStorageConnection& aConn, const bool aMustRestore) {
   // The content of padding file is untrusted, so remove it here.
-  nsresult rv =
-      LockedDirectoryPaddingDeleteFile(aBaseDir, DirPaddingFile::FILE);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY(LockedDirectoryPaddingDeleteFile(&aBaseDir, DirPaddingFile::FILE));
 
-  CACHE_TRY_UNWRAP(*aPaddingSizeOut, db::FindOverallPaddingSize(*aConn));
-  MOZ_DIAGNOSTIC_ASSERT(*aPaddingSizeOut >= 0);
+  CACHE_TRY_INSPECT(const int64_t& paddingSize,
+                    db::FindOverallPaddingSize(aConn));
+  MOZ_DIAGNOSTIC_ASSERT(paddingSize >= 0);
 
-  rv = LockedDirectoryPaddingWrite(aBaseDir, DirPaddingFile::FILE,
-                                   *aPaddingSizeOut);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    // If we cannot write the correct padding size to file, just keep the
-    // temporary file and let the padding size to be recalculate in the next
-    // action
-    return aMustRestore ? rv : NS_OK;
-  }
+  CACHE_TRY(
+      LockedDirectoryPaddingWrite(&aBaseDir, DirPaddingFile::FILE, paddingSize),
+      (aMustRestore ? Err(tryTempError)
+                    : Result<int64_t, nsresult>{paddingSize}));
 
-  rv = LockedDirectoryPaddingDeleteFile(aBaseDir, DirPaddingFile::TMP_FILE);
-  Unused << NS_WARN_IF(NS_FAILED(rv));
+  CACHE_TRY(
+      LockedDirectoryPaddingDeleteFile(&aBaseDir, DirPaddingFile::TMP_FILE));
 
-  return rv;
+  return paddingSize;
 }
 
 // static
diff -Nru firefox-84.0.2+build1/dom/cache/FileUtils.h firefox-85.0+build1/dom/cache/FileUtils.h
--- firefox-84.0.2+build1/dom/cache/FileUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/FileUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -102,6 +102,10 @@
  *
  */
 
+// Returns a Result with a success value denoting the padding size.
+Result<int64_t, nsresult> LockedDirectoryPaddingGet(nsIFile& aBaseDir);
+
+// XXX Remove this overload when migrating the callers to use CACHE_TRY.
 nsresult LockedDirectoryPaddingGet(nsIFile* aBaseDir, int64_t* aPaddingSizeOut);
 
 nsresult LockedDirectoryPaddingInit(nsIFile* aBaseDir);
@@ -117,10 +121,9 @@
 
 nsresult LockedDirectoryPaddingFinalizeWrite(nsIFile* aBaseDir);
 
-nsresult LockedDirectoryPaddingRestore(nsIFile* aBaseDir,
-                                       mozIStorageConnection* aConn,
-                                       bool aMustRestore,
-                                       int64_t* aPaddingSizeOut);
+// Returns a Result with a success value denoting the padding size.
+Result<int64_t, nsresult> LockedDirectoryPaddingRestore(
+    nsIFile& aBaseDir, mozIStorageConnection& aConn, bool aMustRestore);
 
 nsresult LockedDirectoryPaddingDeleteFile(nsIFile* aBaseDir,
                                           DirPaddingFile aPaddingFileType);
diff -Nru firefox-84.0.2+build1/dom/cache/IPCUtils.h firefox-85.0+build1/dom/cache/IPCUtils.h
--- firefox-84.0.2+build1/dom/cache/IPCUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/IPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_cache_IPCUtils_h
 #define mozilla_dom_cache_IPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "mozilla/dom/cache/Types.h"
 
diff -Nru firefox-84.0.2+build1/dom/cache/Manager.cpp firefox-85.0+build1/dom/cache/Manager.cpp
--- firefox-84.0.2+build1/dom/cache/Manager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/Manager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
@@ -20,6 +21,8 @@
 #include "mozilla/dom/cache/SavedTypes.h"
 #include "mozilla/dom/cache/StreamList.h"
 #include "mozilla/dom/cache/Types.h"
+#include "mozilla/dom/quota/Client.h"
+#include "mozilla/dom/quota/QuotaManager.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozStorageHelper.h"
 #include "nsIInputStream.h"
@@ -32,6 +35,9 @@
 
 namespace mozilla::dom::cache {
 
+using mozilla::dom::quota::Client;
+using mozilla::dom::quota::DirectoryLock;
+
 namespace {
 
 /**
@@ -251,10 +257,11 @@
       // cleaning up.  We need to tell the new manager about this so
       // that it won't actually start until the old manager is done.
       SafeRefPtr<Manager> oldManager = Acquire(*aManagerId, Closing);
-      ref->Init(oldManager ? SomeRef(*oldManager) : Nothing());
+      ref->Init(oldManager.maybeDeref());
 
       MOZ_ASSERT(!sFactory->mManagerList.Contains(ref));
-      sFactory->mManagerList.AppendElement(ref.unsafeGetRawPtr());
+      sFactory->mManagerList.AppendElement(
+          WrapNotNullUnchecked(ref.unsafeGetRawPtr()));
     }
 
     return ref;
@@ -266,36 +273,29 @@
 
     MOZ_ALWAYS_TRUE(sFactory->mManagerList.RemoveElement(&aManager));
 
+    CacheQuotaClient::Get()->MaybeRecordShutdownStep("Manager removed"_ns);
+
     // clean up the factory singleton if there are no more managers
     MaybeDestroyInstance();
   }
 
-  static void Abort(const nsACString& aOrigin) {
+  static void Abort(const Client::DirectoryLockIdTable& aDirectoryLockIds) {
     mozilla::ipc::AssertIsOnBackgroundThread();
 
-    if (!sFactory) {
-      return;
-    }
-
-    MOZ_DIAGNOSTIC_ASSERT(!sFactory->mManagerList.IsEmpty());
-
-    {
-      // Note that we are synchronously calling abort code here.  If any
-      // of the shutdown code synchronously decides to delete the Factory
-      // we need to delay that delete until the end of this method.
-      AutoRestore<bool> restore(sFactory->mInSyncAbortOrShutdown);
-      sFactory->mInSyncAbortOrShutdown = true;
+    AbortMatching([&aDirectoryLockIds](const auto& manager) {
+      // Check if the Manager holds an acquired DirectoryLock. Origin clearing
+      // can't be blocked by this Manager if there is no acquired DirectoryLock.
+      // If there is an acquired DirectoryLock, check if the table contains the
+      // lock for the Manager.
+      return Client::IsLockForObjectAcquiredAndContainedInLockTable(
+          manager, aDirectoryLockIds);
+    });
+  }
 
-      for (auto* manager : sFactory->mManagerList.ForwardRange()) {
-        if (aOrigin.IsVoid() || manager->mManagerId->QuotaOrigin() == aOrigin) {
-          auto pinnedManager =
-              SafeRefPtr{manager, AcquireStrongRefFromRawPtr{}};
-          pinnedManager->Abort();
-        }
-      }
-    }
+  static void AbortAll() {
+    mozilla::ipc::AssertIsOnBackgroundThread();
 
-    MaybeDestroyInstance();
+    AbortMatching([](const auto&) { return true; });
   }
 
   static void ShutdownAll() {
@@ -314,8 +314,9 @@
       AutoRestore<bool> restore(sFactory->mInSyncAbortOrShutdown);
       sFactory->mInSyncAbortOrShutdown = true;
 
-      for (auto* manager : sFactory->mManagerList.ForwardRange()) {
-        auto pinnedManager = SafeRefPtr{manager, AcquireStrongRefFromRawPtr{}};
+      for (const auto& manager : sFactory->mManagerList.ForwardRange()) {
+        auto pinnedManager =
+            SafeRefPtr{manager.get(), AcquireStrongRefFromRawPtr{}};
         pinnedManager->Shutdown();
       }
     }
@@ -328,6 +329,35 @@
     return !sFactory;
   }
 
+  static nsCString GetShutdownStatus() {
+    mozilla::ipc::AssertIsOnBackgroundThread();
+
+    nsCString data;
+
+    if (sFactory && !sFactory->mManagerList.IsEmpty()) {
+      data.Append(
+          "Managers: "_ns +
+          IntToCString(static_cast<uint64_t>(sFactory->mManagerList.Length())) +
+          " ("_ns);
+
+      for (const auto& manager : sFactory->mManagerList.NonObservingRange()) {
+        data.Append(quota::AnonymizedOriginString(
+            manager->GetManagerId().QuotaOrigin()));
+
+        data.AppendLiteral(": ");
+
+        data.Append(manager->GetState() == State::Open ? "Open"_ns
+                                                       : "Closing"_ns);
+
+        data.AppendLiteral(", ");
+      }
+
+      data.AppendLiteral(" )");
+    }
+
+    return data;
+  }
+
  private:
   Factory() : mInSyncAbortOrShutdown(false) {
     MOZ_COUNT_CTOR(cache::Manager::Factory);
@@ -398,15 +428,44 @@
     // chains to an old Manager we want it to be the most recent one.
     const auto range = Reversed(sFactory->mManagerList.NonObservingRange());
     const auto foundIt = std::find_if(
-        range.begin(), range.end(), [aState, &aManagerId](const auto* manager) {
+        range.begin(), range.end(), [aState, &aManagerId](const auto& manager) {
           return aState == manager->GetState() &&
                  *manager->mManagerId == aManagerId;
         });
     return foundIt != range.end()
-               ? SafeRefPtr{*foundIt, AcquireStrongRefFromRawPtr{}}
+               ? SafeRefPtr{foundIt->get(), AcquireStrongRefFromRawPtr{}}
                : nullptr;
   }
 
+  template <typename Condition>
+  static void AbortMatching(const Condition& aCondition) {
+    mozilla::ipc::AssertIsOnBackgroundThread();
+
+    if (!sFactory) {
+      return;
+    }
+
+    MOZ_DIAGNOSTIC_ASSERT(!sFactory->mManagerList.IsEmpty());
+
+    {
+      // Note that we are synchronously calling abort code here.  If any
+      // of the shutdown code synchronously decides to delete the Factory
+      // we need to delay that delete until the end of this method.
+      AutoRestore<bool> restore(sFactory->mInSyncAbortOrShutdown);
+      sFactory->mInSyncAbortOrShutdown = true;
+
+      for (const auto& manager : sFactory->mManagerList.ForwardRange()) {
+        if (aCondition(*manager)) {
+          auto pinnedManager =
+              SafeRefPtr{manager.get(), AcquireStrongRefFromRawPtr{}};
+          pinnedManager->Abort();
+        }
+      }
+    }
+
+    MaybeDestroyInstance();
+  }
+
   // Singleton created on demand and deleted when last Manager is cleared
   // in Remove().
   // PBackground thread only.
@@ -422,7 +481,7 @@
   // Weak references as we don't want to keep Manager objects alive forever.
   // When a Manager is destroyed it calls Factory::Remove() to clear itself.
   // PBackground thread only.
-  nsTObserverArray<Manager*> mManagerList;
+  nsTObserverArray<NotNull<Manager*>> mManagerList;
 
   // This flag is set when we are looping through the list and calling Abort()
   // or Shutdown() on each Manager.  We need to be careful not to synchronously
@@ -1551,22 +1610,38 @@
 }
 
 // static
-void Manager::ShutdownAll() {
+void Manager::InitiateShutdown() {
   mozilla::ipc::AssertIsOnBackgroundThread();
 
   Factory::ShutdownAll();
+}
 
-  if (!mozilla::SpinEventLoopUntil(
-          []() { return Factory::IsShutdownAllComplete(); })) {
-    NS_WARNING("Something bad happened!");
-  }
+// static
+bool Manager::IsShutdownAllComplete() {
+  mozilla::ipc::AssertIsOnBackgroundThread();
+
+  return Factory::IsShutdownAllComplete();
+}
+
+// static
+nsCString Manager::GetShutdownStatus() {
+  mozilla::ipc::AssertIsOnBackgroundThread();
+
+  return Factory::GetShutdownStatus();
 }
 
 // static
-void Manager::Abort(const nsACString& aOrigin) {
+void Manager::Abort(const Client::DirectoryLockIdTable& aDirectoryLockIds) {
   mozilla::ipc::AssertIsOnBackgroundThread();
 
-  Factory::Abort(aOrigin);
+  Factory::Abort(aDirectoryLockIds);
+}
+
+// static
+void Manager::AbortAll() {
+  mozilla::ipc::AssertIsOnBackgroundThread();
+
+  Factory::AbortAll();
 }
 
 void Manager::RemoveListener(Listener* aListener) {
@@ -1939,6 +2014,13 @@
   }
 }
 
+Maybe<DirectoryLock&> Manager::MaybeDirectoryLockRef() const {
+  NS_ASSERT_OWNINGTHREAD(Manager);
+  MOZ_DIAGNOSTIC_ASSERT(mContext);
+
+  return mContext->MaybeDirectoryLockRef();
+}
+
 void Manager::Abort() {
   NS_ASSERT_OWNINGTHREAD(Manager);
   MOZ_DIAGNOSTIC_ASSERT(mContext);
diff -Nru firefox-84.0.2+build1/dom/cache/Manager.h firefox-85.0+build1/dom/cache/Manager.h
--- firefox-84.0.2+build1/dom/cache/Manager.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/Manager.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/SafeRefPtr.h"
 #include "mozilla/dom/cache/Types.h"
+#include "mozilla/dom/quota/Client.h"
 #include "CacheCommon.h"
 #include "nsCOMPtr.h"
 #include "nsISupportsImpl.h"
@@ -24,6 +25,13 @@
 class ErrorResult;
 
 namespace dom {
+
+namespace quota {
+
+class DirectoryLock;
+
+}  // namespace quota
+
 namespace cache {
 
 class CacheOpArgs;
@@ -65,6 +73,9 @@
 // is enforced by the Manager::Factory.  If content still holds references to
 // Cache DOM objects during shutdown, then all operations will begin rejecting.
 class Manager final : public SafeRefCounted<Manager> {
+  using Client = quota::Client;
+  using DirectoryLock = quota::DirectoryLock;
+
  public:
   // Callback interface implemented by clients of Manager, such as CacheParent
   // and CacheStorageParent.  In general, if you call a Manager method you
@@ -125,11 +136,17 @@
   static Result<SafeRefPtr<Manager>, nsresult> AcquireCreateIfNonExistent(
       const SafeRefPtr<ManagerId>& aManagerId);
 
-  // Synchronously shutdown.  This spins the event loop.
-  static void ShutdownAll();
+  static void InitiateShutdown();
 
-  // Cancel actions for given origin or all actions if passed string is null.
-  static void Abort(const nsACString& aOrigin);
+  static bool IsShutdownAllComplete();
+
+  static nsCString GetShutdownStatus();
+
+  // Cancel actions for given DirectoryLock ids.
+  static void Abort(const Client::DirectoryLockIdTable& aDirectoryLockIds);
+
+  // Cancel all actions.
+  static void AbortAll();
 
   // Must be called by Listener objects before they are destroyed.
   void RemoveListener(Listener* aListener);
@@ -156,6 +173,8 @@
 
   const ManagerId& GetManagerId() const;
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const;
+
   // Methods to allow a StreamList to register themselves with the Manager.
   // StreamList objects must call RemoveStreamList() before they are destroyed.
   void AddStreamList(StreamList* aStreamList);
diff -Nru firefox-84.0.2+build1/dom/cache/PCacheOp.ipdl firefox-85.0+build1/dom/cache/PCacheOp.ipdl
--- firefox-84.0.2+build1/dom/cache/PCacheOp.ipdl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/PCacheOp.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -11,7 +11,9 @@
 
 include CacheTypes;
 
-using moveonly mozilla::ErrorResult from "ipc/ErrorIPCUtils.h";
+include "ipc/ErrorIPCUtils.h";
+
+using moveonly mozilla::ErrorResult from "mozilla/ErrorResult.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/cache/QuotaClient.cpp firefox-85.0+build1/dom/cache/QuotaClient.cpp
--- firefox-84.0.2+build1/dom/cache/QuotaClient.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/QuotaClient.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -19,19 +19,11 @@
 #include "nsIFile.h"
 #include "nsThreadUtils.h"
 
-namespace {
+namespace mozilla::dom::cache {
 
-using mozilla::Atomic;
-using mozilla::MutexAutoLock;
-using mozilla::Some;
-using mozilla::Unused;
-using mozilla::dom::ContentParentId;
-using mozilla::dom::cache::DirPaddingFile;
-using mozilla::dom::cache::kCachesSQLiteFilename;
-using mozilla::dom::cache::Manager;
-using mozilla::dom::cache::QuotaInfo;
 using mozilla::dom::quota::AssertIsOnIOThread;
 using mozilla::dom::quota::Client;
+using mozilla::dom::quota::CloneFileAndAppend;
 using mozilla::dom::quota::DatabaseUsageType;
 using mozilla::dom::quota::GroupAndOrigin;
 using mozilla::dom::quota::PERSISTENCE_TYPE_DEFAULT;
@@ -40,95 +32,99 @@
 using mozilla::dom::quota::UsageInfo;
 using mozilla::ipc::AssertIsOnBackgroundThread;
 
-static nsresult GetBodyUsage(nsIFile* aMorgueDir, const Atomic<bool>& aCanceled,
-                             UsageInfo* aUsageInfo, const bool aInitializing) {
-  AssertIsOnIOThread();
-
-  nsCOMPtr<nsIDirectoryEnumerator> entries;
-  nsresult rv = aMorgueDir->GetDirectoryEntries(getter_AddRefs(entries));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+namespace {
 
-  nsCOMPtr<nsIFile> bodyDir;
-  while (NS_SUCCEEDED(rv = entries->GetNextFile(getter_AddRefs(bodyDir))) &&
-         bodyDir && !aCanceled) {
-    if (NS_WARN_IF(QuotaManager::IsShuttingDown())) {
-      return NS_ERROR_ABORT;
-    }
-    bool isDir;
-    rv = bodyDir->IsDirectory(&isDir);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    if (!isDir) {
-      QuotaInfo dummy;
-      mozilla::DebugOnly<nsresult> result =
-          RemoveNsIFile(dummy, bodyDir, /* aTrackQuota */ false);
-      // Try to remove the unexpected files, and keep moving on even if it fails
-      // because it might be created by virus or the operation system
-      MOZ_ASSERT(NS_SUCCEEDED(result));
-      continue;
-    }
-
-    const QuotaInfo dummy;
-    const auto getUsage = [&aUsageInfo](nsIFile* bodyFile,
-                                        const nsACString& leafName,
-                                        bool& fileDeleted) {
-      MOZ_DIAGNOSTIC_ASSERT(bodyFile);
-      Unused << leafName;
-
-      int64_t fileSize;
-      nsresult rv = bodyFile->GetFileSize(&fileSize);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-      MOZ_DIAGNOSTIC_ASSERT(fileSize >= 0);
-      // FIXME: Separate file usage and database usage in OriginInfo so that the
-      // workaround for treating body file size as database usage can be
-      // removed.
-      //
-      // This is needed because we want to remove the mutex lock for padding
-      // files. The lock is needed because the padding file is accessed on the
-      // QM IO thread while getting origin usage and is accessed on the Cache IO
-      // thread in normal Cache operations.
-      // Using the cached usage in QM while getting origin usage can remove the
-      // access on the QM IO thread and thus we can remove the mutex lock.
-      // However, QM only separates usage types in initialization, and the
-      // separation is gone after that. So, before extending the separation of
-      // usage types in QM, this is a workaround to avoid the file usage
-      // mismatching in our tests. Note that file usage hasn't been exposed to
-      // users yet.
-      *aUsageInfo += DatabaseUsageType(Some(fileSize));
-
-      fileDeleted = false;
-
-      return NS_OK;
-    };
-    rv = mozilla::dom::cache::BodyTraverseFiles(dummy, bodyDir, getUsage,
-                                                /* aCanRemoveFiles */
-                                                aInitializing,
-                                                /* aTrackQuota */ false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+template <typename StepFunc>
+Result<UsageInfo, nsresult> ReduceUsageInfo(nsIFile& aDir,
+                                            const Atomic<bool>& aCanceled,
+                                            const StepFunc& aStepFunc) {
+  // XXX The following loop (including the cancellation check) is very similar
+  // to QuotaClient::GetDatabaseFilenames in dom/indexedDB/ActorsParent.cpp
+  CACHE_TRY_INSPECT(const auto& entries,
+                    MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<nsIDirectoryEnumerator>,
+                                               aDir, GetDirectoryEntries));
+
+  CACHE_TRY_RETURN(ReduceEach(
+      [&entries, &aCanceled]() -> Result<nsCOMPtr<nsIFile>, nsresult> {
+        if (aCanceled) {
+          return nsCOMPtr<nsIFile>{};
+        }
 
-  return NS_OK;
-}
+        CACHE_TRY_RETURN(MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<nsIFile>, entries,
+                                                    GetNextFile));
+      },
+      UsageInfo{},
+      [&aStepFunc](UsageInfo usageInfo, const nsCOMPtr<nsIFile>& bodyDir)
+          -> Result<UsageInfo, nsresult> {
+        CACHE_TRY(OkIf(!QuotaManager::IsShuttingDown()), Err(NS_ERROR_ABORT));
+
+        CACHE_TRY_INSPECT(const auto& stepUsageInfo, aStepFunc(bodyDir));
+
+        return usageInfo + stepUsageInfo;
+      }));
+}
+
+Result<UsageInfo, nsresult> GetBodyUsage(nsIFile& aMorgueDir,
+                                         const Atomic<bool>& aCanceled,
+                                         const bool aInitializing) {
+  AssertIsOnIOThread();
 
-static nsresult LockedGetPaddingSizeFromDB(
-    nsIFile* aDir, const GroupAndOrigin& aGroupAndOrigin,
-    int64_t* aPaddingSizeOut) {
-  MOZ_DIAGNOSTIC_ASSERT(aDir);
-  MOZ_DIAGNOSTIC_ASSERT(aPaddingSizeOut);
+  CACHE_TRY_RETURN(ReduceUsageInfo(
+      aMorgueDir, aCanceled,
+      [aInitializing](
+          const nsCOMPtr<nsIFile>& bodyDir) -> Result<UsageInfo, nsresult> {
+        CACHE_TRY_INSPECT(const bool& isDir,
+                          MOZ_TO_RESULT_INVOKE(bodyDir, IsDirectory));
+
+        if (!isDir) {
+          const DebugOnly<nsresult> result =
+              RemoveNsIFile(QuotaInfo{}, bodyDir, /* aTrackQuota */ false);
+          // Try to remove the unexpected files, and keep moving on even if it
+          // fails because it might be created by virus or the operation system
+          MOZ_ASSERT(NS_SUCCEEDED(result));
+          return UsageInfo{};
+        }
 
-  *aPaddingSizeOut = 0;
+        UsageInfo usageInfo;
+        const auto getUsage = [&usageInfo](nsIFile* bodyFile,
+                                           const nsACString& leafName,
+                                           bool& fileDeleted) -> nsresult {
+          MOZ_DIAGNOSTIC_ASSERT(bodyFile);
+          Unused << leafName;
+
+          CACHE_TRY_INSPECT(const int64_t& fileSize,
+                            MOZ_TO_RESULT_INVOKE(bodyFile, GetFileSize));
+          MOZ_DIAGNOSTIC_ASSERT(fileSize >= 0);
+          // FIXME: Separate file usage and database usage in OriginInfo so that
+          // the workaround for treating body file size as database usage can be
+          // removed.
+          //
+          // This is needed because we want to remove the mutex lock for padding
+          // files. The lock is needed because the padding file is accessed on
+          // the QM IO thread while getting origin usage and is accessed on the
+          // Cache IO thread in normal Cache operations. Using the cached usage
+          // in QM while getting origin usage can remove the access on the QM IO
+          // thread and thus we can remove the mutex lock. However, QM only
+          // separates usage types in initialization, and the separation is gone
+          // after that. So, before extending the separation of usage types in
+          // QM, this is a workaround to avoid the file usage mismatching in our
+          // tests. Note that file usage hasn't been exposed to users yet.
+          usageInfo += DatabaseUsageType(Some(fileSize));
+
+          fileDeleted = false;
+
+          return NS_OK;
+        };
+        CACHE_TRY(BodyTraverseFiles(QuotaInfo{}, bodyDir, getUsage,
+                                    /* aCanRemoveFiles */
+                                    aInitializing,
+                                    /* aTrackQuota */ false));
+        return usageInfo;
+      }));
+}
 
+Result<int64_t, nsresult> LockedGetPaddingSizeFromDB(
+    nsIFile& aDir, const GroupAndOrigin& aGroupAndOrigin) {
   QuotaInfo quotaInfo;
   static_cast<GroupAndOrigin&>(quotaInfo) = aGroupAndOrigin;
   // quotaInfo.mDirectoryLockId must be -1 (which is default for new QuotaInfo)
@@ -140,65 +136,35 @@
   // for the SQLite file).
   MOZ_DIAGNOSTIC_ASSERT(quotaInfo.mDirectoryLockId == -1);
 
-  nsCOMPtr<nsIFile> dbFile;
-  nsresult rv = aDir->Clone(getter_AddRefs(dbFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = dbFile->Append(kCachesSQLiteFilename);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const auto& dbFile,
+                    CloneFileAndAppend(aDir, kCachesSQLiteFilename));
 
-  bool exists = false;
-  rv = dbFile->Exists(&exists);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const bool& exists, MOZ_TO_RESULT_INVOKE(dbFile, Exists));
 
-  // Return NS_OK with size = 0 if caches.sqlite doesn't exist.
+  // Return size = 0 if caches.sqlite doesn't exist.
   // This function is only called if the value of the padding size couldn't be
   // determined from the padding file, possibly because it doesn't exist, or a
   // leftover temporary padding file was found.
   // There is no other way to get the overall padding size of an origin.
   if (!exists) {
-    return NS_OK;
+    return 0;
   }
 
-  nsCOMPtr<mozIStorageConnection> conn;
-  rv = mozilla::dom::cache::OpenDBConnection(quotaInfo, dbFile,
-                                             getter_AddRefs(conn));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY_INSPECT(const auto& conn, OpenDBConnection(quotaInfo, *dbFile));
 
   // Make sure that the database has the latest schema before we try to read
   // from it. We have to do this because LockedGetPaddingSizeFromDB is called
   // by QuotaClient::GetUsageForOrigin which may run at any time (there's no
   // guarantee that SetupAction::RunSyncWithDBOnTarget already checked the
   // schema for the given origin).
-  rv = mozilla::dom::cache::db::CreateOrMigrateSchema(*conn);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  int64_t paddingSize = 0;
-  rv = mozilla::dom::cache::LockedDirectoryPaddingRestore(
-      aDir, conn, /* aMustRestore */ false, &paddingSize);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  CACHE_TRY(db::CreateOrMigrateSchema(*conn));
 
-  *aPaddingSizeOut = paddingSize;
-
-  return rv;
+  CACHE_TRY_RETURN(LockedDirectoryPaddingRestore(aDir, *conn,
+                                                 /* aMustRestore */ false));
 }
 
 }  // namespace
 
-namespace mozilla::dom::cache {
-
 const nsLiteralString kCachesSQLiteFilename = u"caches.sqlite"_ns;
 
 CacheQuotaClient::CacheQuotaClient()
@@ -257,10 +223,11 @@
   // automatically.
 }
 
-void CacheQuotaClient::AbortOperations(const nsACString& aOrigin) {
+void CacheQuotaClient::AbortOperationsForLocks(
+    const DirectoryLockIdTable& aDirectoryLockIds) {
   AssertIsOnBackgroundThread();
 
-  Manager::Abort(aOrigin);
+  Manager::Abort(aDirectoryLockIds);
 }
 
 void CacheQuotaClient::AbortOperationsForProcess(
@@ -276,15 +243,40 @@
   // Therefore, do nothing here.
 }
 
+void CacheQuotaClient::AbortAllOperations() {
+  AssertIsOnBackgroundThread();
+
+  Manager::AbortAll();
+}
+
 void CacheQuotaClient::StartIdleMaintenance() {}
 
 void CacheQuotaClient::StopIdleMaintenance() {}
 
-void CacheQuotaClient::ShutdownWorkThreads() {
+void CacheQuotaClient::InitiateShutdown() {
+  AssertIsOnBackgroundThread();
+
+  Manager::InitiateShutdown();
+}
+
+bool CacheQuotaClient::IsShutdownCompleted() const {
+  AssertIsOnBackgroundThread();
+
+  return Manager::IsShutdownAllComplete();
+}
+
+void CacheQuotaClient::ForceKillActors() {
+  // Currently we don't implement killing actors (are there any to kill here?).
+}
+
+nsCString CacheQuotaClient::GetShutdownStatus() const {
   AssertIsOnBackgroundThread();
 
-  // spins the event loop and synchronously shuts down all Managers
-  Manager::ShutdownAll();
+  return Manager::GetShutdownStatus();
+}
+
+void CacheQuotaClient::FinalizeShutdown() {
+  // Nothing to do here.
 }
 
 nsresult CacheQuotaClient::UpgradeStorageFrom2_0To2_1(nsIFile* aDirectory) {
@@ -293,7 +285,7 @@
 
   MutexAutoLock lock(mDirPaddingFileMutex);
 
-  nsresult rv = mozilla::dom::cache::LockedDirectoryPaddingInit(aDirectory);
+  nsresult rv = LockedDirectoryPaddingInit(aDirectory);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -307,15 +299,14 @@
   MOZ_DIAGNOSTIC_ASSERT(aBaseDir);
   MOZ_DIAGNOSTIC_ASSERT(aConn);
 
-  int64_t dummyPaddingSize;
-
   MutexAutoLock lock(mDirPaddingFileMutex);
 
-  nsresult rv = mozilla::dom::cache::LockedDirectoryPaddingRestore(
-      aBaseDir, aConn, /* aMustRestore */ true, &dummyPaddingSize);
-  Unused << NS_WARN_IF(NS_FAILED(rv));
+  CACHE_TRY_INSPECT(const int64_t& dummyPaddingSize,
+                    LockedDirectoryPaddingRestore(*aBaseDir, *aConn,
+                                                  /* aMustRestore */ true));
+  Unused << dummyPaddingSize;
 
-  return rv;
+  return NS_OK;
 }
 
 nsresult CacheQuotaClient::WipePaddingFileInternal(const QuotaInfo& aQuotaInfo,
@@ -325,17 +316,15 @@
 
   MutexAutoLock lock(mDirPaddingFileMutex);
 
-  MOZ_ASSERT(mozilla::dom::cache::DirectoryPaddingFileExists(
-      aBaseDir, DirPaddingFile::FILE));
+  MOZ_ASSERT(DirectoryPaddingFileExists(aBaseDir, DirPaddingFile::FILE));
 
   int64_t paddingSize = 0;
   bool temporaryPaddingFileExist =
-      mozilla::dom::cache::DirectoryPaddingFileExists(aBaseDir,
-                                                      DirPaddingFile::TMP_FILE);
+      DirectoryPaddingFileExists(aBaseDir, DirPaddingFile::TMP_FILE);
 
   if (temporaryPaddingFileExist ||
-      NS_WARN_IF(NS_FAILED(mozilla::dom::cache::LockedDirectoryPaddingGet(
-          aBaseDir, &paddingSize)))) {
+      NS_WARN_IF(
+          NS_FAILED(LockedDirectoryPaddingGet(aBaseDir, &paddingSize)))) {
     // XXXtt: Maybe have a method in the QuotaManager to clean the usage under
     // the quota client and the origin.
     // There is nothing we can do to recover the file.
@@ -344,23 +333,22 @@
   }
 
   if (paddingSize > 0) {
-    mozilla::dom::cache::DecreaseUsageForQuotaInfo(aQuotaInfo, paddingSize);
+    DecreaseUsageForQuotaInfo(aQuotaInfo, paddingSize);
   }
 
-  nsresult rv = mozilla::dom::cache::LockedDirectoryPaddingDeleteFile(
-      aBaseDir, DirPaddingFile::FILE);
+  nsresult rv =
+      LockedDirectoryPaddingDeleteFile(aBaseDir, DirPaddingFile::FILE);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
   // Remove temporary file if we have one.
-  rv = mozilla::dom::cache::LockedDirectoryPaddingDeleteFile(
-      aBaseDir, DirPaddingFile::TMP_FILE);
+  rv = LockedDirectoryPaddingDeleteFile(aBaseDir, DirPaddingFile::TMP_FILE);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
 
-  rv = mozilla::dom::cache::LockedDirectoryPaddingInit(aBaseDir);
+  rv = LockedDirectoryPaddingInit(aBaseDir);
   Unused << NS_WARN_IF(NS_FAILED(rv));
 
   return rv;
@@ -377,154 +365,109 @@
     PersistenceType aPersistenceType, const GroupAndOrigin& aGroupAndOrigin,
     const AtomicBool& aCanceled, const bool aInitializing) {
   AssertIsOnIOThread();
-#ifndef NIGHTLY_BUILD
-  Unused << aInitializing;
-#endif
 
-  QuotaManager* qm = QuotaManager::Get();
+  QuotaManager* const qm = QuotaManager::Get();
   MOZ_DIAGNOSTIC_ASSERT(qm);
 
-  CACHE_TRY_UNWRAP(auto dir, qm->GetDirectoryForOrigin(
-                                 aPersistenceType, aGroupAndOrigin.mOrigin));
-
-  nsresult rv =
-      dir->Append(NS_LITERAL_STRING_FROM_CSTRING(DOMCACHE_DIRECTORY_NAME));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                 Cache_Append);
-    return Err(rv);
-  }
+  CACHE_TRY_INSPECT(
+      const auto& dir,
+      qm->GetDirectoryForOrigin(aPersistenceType, aGroupAndOrigin.mOrigin));
+
+  CACHE_TRY(
+      dir->Append(NS_LITERAL_STRING_FROM_CSTRING(DOMCACHE_DIRECTORY_NAME)));
+
+  CACHE_TRY_INSPECT(
+      const auto& maybePaddingSize,
+      ([this, &dir, aInitializing,
+        &aGroupAndOrigin]() -> Result<Maybe<int64_t>, nsresult> {
+        // If the temporary file still exists after locking, it means the
+        // previous action failed, so restore the padding file.
+        MutexAutoLock lock(mDirPaddingFileMutex);
+
+        if (!DirectoryPaddingFileExists(dir, DirPaddingFile::TMP_FILE)) {
+          const auto& maybePaddingSize = [&dir]() -> Maybe<int64_t> {
+            CACHE_TRY_RETURN(LockedDirectoryPaddingGet(*dir).map(Some<int64_t>),
+                             Nothing{});
+          }();
 
-  bool useCachedValue = false;
+          if (maybePaddingSize) {
+            return maybePaddingSize;
+          }
+        }
 
-  int64_t paddingSize = 0;
-  {
-    // If the tempoary file still exists after locking, it means the previous
-    // action failed, so restore the padding file.
-    MutexAutoLock lock(mDirPaddingFileMutex);
-
-    if (mozilla::dom::cache::DirectoryPaddingFileExists(
-            dir, DirPaddingFile::TMP_FILE) ||
-        NS_WARN_IF(NS_FAILED(mozilla::dom::cache::LockedDirectoryPaddingGet(
-            dir, &paddingSize)))) {
-      if (aInitializing) {
-        rv = LockedGetPaddingSizeFromDB(dir, aGroupAndOrigin, &paddingSize);
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaInternalError,
-                                       Cache_GetPaddingSize);
-          return Err(rv);
+        if (aInitializing) {
+          CACHE_TRY_RETURN(LockedGetPaddingSizeFromDB(*dir, aGroupAndOrigin)
+                               .map(Some<int64_t>));
         }
-      } else {
+
         // We can't open the database at this point, since it can be already
-        // used by Cache IO thread. Use the cached value instead. (In theory,
-        // we could check if the database is actually used by Cache IO thread
-        // at this moment, but it's probably not worth additional complexity.)
-
-        useCachedValue = true;
-      }
-    }
-  }
+        // used by Cache IO thread. Use the cached value instead. (In
+        // theory, we could check if the database is actually used by Cache
+        // IO thread at this moment, but it's probably not worth additional
+        // complexity.)
+
+        return Maybe<int64_t>{};
+      }()));
+
+  if (!maybePaddingSize) {
+    return qm->GetUsageForClient(PERSISTENCE_TYPE_DEFAULT, aGroupAndOrigin,
+                                 Client::DOMCACHE);
+  }
+
+  CACHE_TRY_INSPECT(
+      const auto& innerUsageInfo,
+      ReduceUsageInfo(
+          *dir, aCanceled,
+          [&aCanceled, aInitializing](
+              const nsCOMPtr<nsIFile>& file) -> Result<UsageInfo, nsresult> {
+            CACHE_TRY_INSPECT(
+                const auto& leafName,
+                MOZ_TO_RESULT_INVOKE_TYPED(nsAutoString, file, GetLeafName));
+
+            CACHE_TRY_INSPECT(const bool& isDir,
+                              MOZ_TO_RESULT_INVOKE(file, IsDirectory));
+
+            if (isDir) {
+              if (leafName.EqualsLiteral("morgue")) {
+                CACHE_TRY_RETURN(GetBodyUsage(*file, aCanceled, aInitializing));
+              } else {
+                NS_WARNING("Unknown Cache directory found!");
+              }
+
+              return UsageInfo{};
+            }
+
+            // Ignore transient sqlite files and marker files
+            if (leafName.EqualsLiteral("caches.sqlite-journal") ||
+                leafName.EqualsLiteral("caches.sqlite-shm") ||
+                leafName.Find("caches.sqlite-mj"_ns, false, 0, 0) == 0 ||
+                leafName.EqualsLiteral("context_open.marker")) {
+              return UsageInfo{};
+            }
+
+            if (leafName.Equals(kCachesSQLiteFilename) ||
+                leafName.EqualsLiteral("caches.sqlite-wal")) {
+              CACHE_TRY_INSPECT(const int64_t& fileSize,
+                                MOZ_TO_RESULT_INVOKE(file, GetFileSize));
+              MOZ_DIAGNOSTIC_ASSERT(fileSize >= 0);
+
+              return UsageInfo{DatabaseUsageType(Some(fileSize))};
+            }
+
+            // Ignore directory padding file
+            if (leafName.EqualsLiteral(PADDING_FILE_NAME) ||
+                leafName.EqualsLiteral(PADDING_TMP_FILE_NAME)) {
+              return UsageInfo{};
+            }
 
-  UsageInfo usageInfo;
+            NS_WARNING("Unknown Cache file found!");
 
-  if (useCachedValue) {
-    uint64_t usage;
-    if (qm->GetUsageForClient(PERSISTENCE_TYPE_DEFAULT, aGroupAndOrigin,
-                              Client::DOMCACHE, usage)) {
-      usageInfo += DatabaseUsageType(Some(usage));
-    }
-
-    return usageInfo;
-  }
+            return UsageInfo{};
+          }));
 
   // FIXME: Separate file usage and database usage in OriginInfo so that the
   // workaround for treating padding file size as database usage can be removed.
-  usageInfo += DatabaseUsageType(Some(paddingSize));
-
-  nsCOMPtr<nsIDirectoryEnumerator> entries;
-  rv = dir->GetDirectoryEntries(getter_AddRefs(entries));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                 Cache_GetDirEntries);
-    return Err(rv);
-  }
-
-  nsCOMPtr<nsIFile> file;
-  while (NS_SUCCEEDED(rv = entries->GetNextFile(getter_AddRefs(file))) &&
-         file && !aCanceled) {
-    if (NS_WARN_IF(QuotaManager::IsShuttingDown())) {
-      return Err(NS_ERROR_ABORT);
-    }
-
-    nsAutoString leafName;
-    rv = file->GetLeafName(leafName);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                   Cache_GetLeafName);
-      return Err(rv);
-    }
-
-    bool isDir;
-    rv = file->IsDirectory(&isDir);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                   Cache_IsDirectory);
-      return Err(rv);
-    }
-
-    if (isDir) {
-      if (leafName.EqualsLiteral("morgue")) {
-        rv = GetBodyUsage(file, aCanceled, &usageInfo, aInitializing);
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          if (rv != NS_ERROR_ABORT) {
-            REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                         Cache_GetBodyUsage);
-          }
-          return Err(rv);
-        }
-      } else {
-        NS_WARNING("Unknown Cache directory found!");
-      }
-
-      continue;
-    }
-
-    // Ignore transient sqlite files and marker files
-    if (leafName.EqualsLiteral("caches.sqlite-journal") ||
-        leafName.EqualsLiteral("caches.sqlite-shm") ||
-        leafName.Find("caches.sqlite-mj"_ns, false, 0, 0) == 0 ||
-        leafName.EqualsLiteral("context_open.marker")) {
-      continue;
-    }
-
-    if (leafName.Equals(kCachesSQLiteFilename) ||
-        leafName.EqualsLiteral("caches.sqlite-wal")) {
-      int64_t fileSize;
-      rv = file->GetFileSize(&fileSize);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                     Cache_GetFileSize);
-        return Err(rv);
-      }
-      MOZ_DIAGNOSTIC_ASSERT(fileSize >= 0);
-
-      usageInfo += DatabaseUsageType(Some(fileSize));
-      continue;
-    }
-
-    // Ignore directory padding file
-    if (leafName.EqualsLiteral(PADDING_FILE_NAME) ||
-        leafName.EqualsLiteral(PADDING_TMP_FILE_NAME)) {
-      continue;
-    }
-
-    NS_WARNING("Unknown Cache file found!");
-  }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  return usageInfo;
+  return UsageInfo{DatabaseUsageType(maybePaddingSize)} + innerUsageInfo;
 }
 
 // static
@@ -566,4 +509,5 @@
 
   return rv;
 }
+
 }  // namespace mozilla::dom::cache
diff -Nru firefox-84.0.2+build1/dom/cache/QuotaClientImpl.h firefox-85.0+build1/dom/cache/QuotaClientImpl.h
--- firefox-84.0.2+build1/dom/cache/QuotaClientImpl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/QuotaClientImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -45,17 +45,18 @@
 
   virtual void ReleaseIOThreadObjects() override;
 
-  virtual void AbortOperations(const nsACString& aOrigin) override;
+  void AbortOperationsForLocks(
+      const DirectoryLockIdTable& aDirectoryLockIds) override;
 
   virtual void AbortOperationsForProcess(
       ContentParentId aContentParentId) override;
 
+  virtual void AbortAllOperations() override;
+
   virtual void StartIdleMaintenance() override;
 
   virtual void StopIdleMaintenance() override;
 
-  virtual void ShutdownWorkThreads() override;
-
   nsresult UpgradeStorageFrom2_0To2_1(nsIFile* aDirectory) override;
 
   template <typename Callable>
@@ -132,6 +133,12 @@
  private:
   ~CacheQuotaClient();
 
+  void InitiateShutdown() override;
+  bool IsShutdownCompleted() const override;
+  nsCString GetShutdownStatus() const override;
+  void ForceKillActors() override;
+  void FinalizeShutdown() override;
+
   Result<UsageInfo, nsresult> GetUsageForOriginInternal(
       PersistenceType aPersistenceType, const GroupAndOrigin& aGroupAndOrigin,
       const AtomicBool& aCanceled, bool aInitializing);
diff -Nru firefox-84.0.2+build1/dom/cache/ReadStream.cpp firefox-85.0+build1/dom/cache/ReadStream.cpp
--- firefox-84.0.2+build1/dom/cache/ReadStream.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/ReadStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/SnappyUncompressInputStream.h"
 #include "nsIAsyncInputStream.h"
+#include "nsIThread.h"
 #include "nsStringStream.h"
 #include "nsTArray.h"
 
diff -Nru firefox-84.0.2+build1/dom/cache/ReadStream.h firefox-85.0+build1/dom/cache/ReadStream.h
--- firefox-84.0.2+build1/dom/cache/ReadStream.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/ReadStream.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_cache_ReadStream_h
 #define mozilla_dom_cache_ReadStream_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/SafeRefPtr.h"
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/RefPtr.h"
@@ -18,6 +17,8 @@
 #include "nsTArrayForwardDeclare.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace ipc {
 class AutoIPCStream;
 }  // namespace ipc
diff -Nru firefox-84.0.2+build1/dom/cache/test/xpcshell/head.js firefox-85.0+build1/dom/cache/test/xpcshell/head.js
--- firefox-84.0.2+build1/dom/cache/test/xpcshell/head.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/test/xpcshell/head.js	2021-01-18 19:58:09.000000000 +0000
@@ -75,10 +75,16 @@
   Services.prefs.clearUserPref("dom.quotaManager.testing");
 }
 
-function reset() {
-  let request = Services.qms.reset();
+function initStorage() {
+  return Services.qms.init();
+}
 
-  return request;
+function initTemporaryStorage() {
+  return Services.qms.initTemporaryStorage();
+}
+
+function initTemporaryOrigin(principal) {
+  return Services.qms.initializeTemporaryOrigin("default", principal);
 }
 
 function clearOrigin(principal) {
@@ -87,14 +93,8 @@
   return request;
 }
 
-function initStorageAndOrigin(principal) {
-  let request = Services.qms.initStorageAndOrigin(
-    principal,
-    "default",
-    "cache"
-  );
-
-  return request;
+function reset() {
+  return Services.qms.reset();
 }
 
 async function requestFinished(request) {
diff -Nru firefox-84.0.2+build1/dom/cache/test/xpcshell/test_originInit.js firefox-85.0+build1/dom/cache/test/xpcshell/test_originInit.js
--- firefox-84.0.2+build1/dom/cache/test/xpcshell/test_originInit.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/cache/test/xpcshell/test_originInit.js	2021-01-18 19:58:09.000000000 +0000
@@ -116,7 +116,13 @@
       removeFile(cachesDatabase);
     }
 
-    let request = initStorageAndOrigin(principal);
+    let request = initStorage();
+    await requestFinished(request);
+
+    request = initTemporaryStorage();
+    await requestFinished(request);
+
+    request = initTemporaryOrigin(principal);
     await requestFinished(request);
 
     // After the origin is initialized, ".padding-tmp" should have always been
diff -Nru firefox-84.0.2+build1/dom/canvas/CacheInvalidator.h firefox-85.0+build1/dom/canvas/CacheInvalidator.h
--- firefox-84.0.2+build1/dom/canvas/CacheInvalidator.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CacheInvalidator.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,24 +13,6 @@
 #include <unordered_set>
 #include <vector>
 
-namespace std {  // You know it's going to be good with this at the top of the
-                 // file.
-
-// The STL is lazy and doesn't provide these:
-template <typename T>
-struct hash<const T*> {
-  auto operator()(const T* const x) const {
-    return hash<T*>()(const_cast<T*>(x));
-  }
-};
-
-template <typename T>
-struct hash<const T> {
-  auto operator()(const T x) const { return hash<T>()(const_cast<T>(x)); }
-};
-
-}  // namespace std
-
 // -
 
 namespace mozilla {
@@ -131,7 +113,7 @@
 
   struct DerefHash final {
     size_t operator()(const KeyT* const a) const {
-      return std::hash<const KeyT>()(*a);
+      return std::hash<KeyT>()(*a);
     }
   };
   struct DerefEqual final {
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasPath.h firefox-85.0+build1/dom/canvas/CanvasPath.h
--- firefox-84.0.2+build1/dom/canvas/CanvasPath.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasPath.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,9 +10,10 @@
 #include "nsWrapperCache.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 enum class CanvasWindingRule : uint8_t;
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasRenderingContext2D.cpp firefox-85.0+build1/dom/canvas/CanvasRenderingContext2D.cpp
--- firefox-84.0.2+build1/dom/canvas/CanvasRenderingContext2D.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasRenderingContext2D.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -75,6 +75,8 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/dom/CanvasGradient.h"
+#include "mozilla/dom/CanvasPattern.h"
 #include "mozilla/dom/DOMMatrix.h"
 #include "mozilla/dom/ImageBitmap.h"
 #include "mozilla/dom/ImageData.h"
@@ -715,8 +717,7 @@
 void CanvasGradient::AddColorStop(float aOffset, const nsACString& aColorstr,
                                   ErrorResult& aRv) {
   if (aOffset < 0.0 || aOffset > 1.0) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aRv.ThrowIndexSizeError("Offset out of 0-1.0 range");
   }
 
   PresShell* presShell = mContext ? mContext->GetPresShell() : nullptr;
@@ -726,8 +727,7 @@
   bool ok = ServoCSSParser::ComputeColor(styleSet, NS_RGB(0, 0, 0), aColorstr,
                                          &color);
   if (!ok) {
-    aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
-    return;
+    return aRv.ThrowSyntaxError("Invalid color");
   }
 
   mStops = nullptr;
@@ -912,6 +912,25 @@
 
 CanvasRenderingContext2D::ContextState::~ContextState() = default;
 
+void CanvasRenderingContext2D::ContextState::SetColorStyle(Style aWhichStyle,
+                                                           nscolor aColor) {
+  colorStyles[aWhichStyle] = aColor;
+  gradientStyles[aWhichStyle] = nullptr;
+  patternStyles[aWhichStyle] = nullptr;
+}
+
+void CanvasRenderingContext2D::ContextState::SetPatternStyle(
+    Style aWhichStyle, CanvasPattern* aPat) {
+  gradientStyles[aWhichStyle] = nullptr;
+  patternStyles[aWhichStyle] = aPat;
+}
+
+void CanvasRenderingContext2D::ContextState::SetGradientStyle(
+    Style aWhichStyle, CanvasGradient* aGrad) {
+  gradientStyles[aWhichStyle] = aGrad;
+  patternStyles[aWhichStyle] = nullptr;
+}
+
 /**
  ** CanvasRenderingContext2D impl
  **/
@@ -1445,6 +1464,16 @@
   return true;
 }
 
+PresShell* CanvasRenderingContext2D::GetPresShell() {
+  if (mCanvasElement) {
+    return mCanvasElement->OwnerDoc()->GetPresShell();
+  }
+  if (mDocShell) {
+    return mDocShell->GetPresShell();
+  }
+  return nullptr;
+}
+
 NS_IMETHODIMP
 CanvasRenderingContext2D::SetDimensions(int32_t aWidth, int32_t aHeight) {
   // Zero sized surfaces can cause problems.
@@ -2023,7 +2052,7 @@
     double aX0, double aY0, double aR0, double aX1, double aY1, double aR1,
     ErrorResult& aError) {
   if (aR0 < 0.0 || aR1 < 0.0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    aError.ThrowIndexSizeError("Negative radius");
     return nullptr;
   }
 
@@ -2047,7 +2076,7 @@
   } else if (aRepeat.EqualsLiteral("no-repeat")) {
     repeatMode = CanvasPattern::RepeatMode::NOREPEAT;
   } else {
-    aError.Throw(NS_ERROR_DOM_SYNTAX_ERR);
+    aError.ThrowSyntaxError("Invalid pattern keyword");
     return nullptr;
   }
 
@@ -2073,13 +2102,9 @@
       // This might not be an Azure canvas!
       RefPtr<SourceSurface> srcSurf = srcCanvas->GetSurfaceSnapshot();
       if (!srcSurf) {
-        JSContext* context = nsContentUtils::GetCurrentJSContext();
-        if (context) {
-          JS::WarnASCII(context,
-                        "CanvasRenderingContext2D.createPattern() failed to "
-                        "snapshot source canvas.");
-        }
-        aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+        aError.ThrowInvalidStateError(
+            "CanvasRenderingContext2D.createPattern() failed to snapshot source"
+            "canvas.");
         return nullptr;
       }
 
@@ -2926,8 +2951,7 @@
                                      double aY2, double aRadius,
                                      ErrorResult& aError) {
   if (aRadius < 0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsureWritablePath();
@@ -3000,8 +3024,7 @@
                                    double aStartAngle, double aEndAngle,
                                    bool aAnticlockwise, ErrorResult& aError) {
   if (aR < 0.0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsureWritablePath();
@@ -3039,8 +3062,7 @@
                                        bool aAnticlockwise,
                                        ErrorResult& aError) {
   if (aRadiusX < 0.0 || aRadiusY < 0.0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsureWritablePath();
@@ -3363,16 +3385,13 @@
   }
 
   if (!path) {
-    aError.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return;
+    return aError.ThrowNotSupportedError("Invalid path");
   }
 
   // get the bounds of the current path. They are relative to the canvas
   gfx::Rect bounds(path->GetBounds(mTarget->GetTransform()));
   if ((bounds.width == 0) || (bounds.height == 0) || !bounds.IsFinite()) {
-    // The specified region has no pixels.
-    aError.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return;
+    return aError.ThrowNotSupportedError("The specified region has no pixels");
   }
 
   // remove old hit region first
@@ -4407,8 +4426,7 @@
     element = canvas;
     nsIntSize size = canvas->GetSize();
     if (size.width == 0 || size.height == 0) {
-      aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-      return;
+      return aError.ThrowInvalidStateError("Passed-in canvas is empty");
     }
 
     if (canvas->IsWriteOnly()) {
@@ -4420,7 +4438,7 @@
 
     if (!srcSurf) {
       if (imageBitmap.IsClosed()) {
-        aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+        aError.ThrowInvalidStateError("Passed-in ImageBitmap is closed");
       }
       return;
     }
@@ -4470,7 +4488,7 @@
       //   - The image is bad, but it's not in the broken state (i.e., we could
       //     decode the headers and get the size).
       if (!res.mIsStillLoading && !res.mHasSize) {
-        aError.Throw(NS_ERROR_NOT_AVAILABLE);
+        aError.ThrowInvalidStateError("Passed-in image is \"broken\"");
       }
       return;
     }
@@ -4524,7 +4542,7 @@
   // the image. Nearest sampling when down-scaling is rarely desirable and
   // smoothing when down-scaling matches chromium's behavior.
   // If any dimension is up-scaled, we consider the image as being up-scaled.
-  auto scale = mTarget->GetTransform().ScaleFactors(true);
+  auto scale = mTarget->GetTransform().ScaleFactors();
   bool isDownScale =
       aDw * Abs(scale.width) < aSw && aDh * Abs(scale.height) < aSh;
 
@@ -4605,7 +4623,7 @@
   // for context shadow.
   Matrix matrix = tempTarget->GetTransform();
   gfxMatrix contextMatrix = ThebesMatrix(matrix);
-  gfxSize contextScale(contextMatrix.ScaleFactors(true));
+  gfxSize contextScale(contextMatrix.ScaleFactors());
 
   // Scale the dest rect to include the context scale.
   aDest.Scale(contextScale.width, contextScale.height);
@@ -5103,9 +5121,8 @@
   DebugOnly<bool> inited = arr.Init(aImageData.GetDataObject());
   MOZ_ASSERT(inited);
 
-  aError = PutImageData_explicit(JS::ToInt32(aDx), JS::ToInt32(aDy),
-                                 aImageData.Width(), aImageData.Height(), &arr,
-                                 false, 0, 0, 0, 0);
+  PutImageData_explicit(JS::ToInt32(aDx), JS::ToInt32(aDy), aImageData.Width(),
+                        aImageData.Height(), &arr, false, 0, 0, 0, 0, aError);
 }
 
 void CanvasRenderingContext2D::PutImageData(ImageData& aImageData, double aDx,
@@ -5117,19 +5134,19 @@
   DebugOnly<bool> inited = arr.Init(aImageData.GetDataObject());
   MOZ_ASSERT(inited);
 
-  aError = PutImageData_explicit(JS::ToInt32(aDx), JS::ToInt32(aDy),
-                                 aImageData.Width(), aImageData.Height(), &arr,
-                                 true, JS::ToInt32(aDirtyX),
-                                 JS::ToInt32(aDirtyY), JS::ToInt32(aDirtyWidth),
-                                 JS::ToInt32(aDirtyHeight));
+  PutImageData_explicit(JS::ToInt32(aDx), JS::ToInt32(aDy), aImageData.Width(),
+                        aImageData.Height(), &arr, true, JS::ToInt32(aDirtyX),
+                        JS::ToInt32(aDirtyY), JS::ToInt32(aDirtyWidth),
+                        JS::ToInt32(aDirtyHeight), aError);
 }
 
-nsresult CanvasRenderingContext2D::PutImageData_explicit(
+void CanvasRenderingContext2D::PutImageData_explicit(
     int32_t aX, int32_t aY, uint32_t aW, uint32_t aH,
     dom::Uint8ClampedArray* aArray, bool aHasDirtyRect, int32_t aDirtyX,
-    int32_t aDirtyY, int32_t aDirtyWidth, int32_t aDirtyHeight) {
+    int32_t aDirtyY, int32_t aDirtyWidth, int32_t aDirtyHeight,
+    ErrorResult& aRv) {
   if (aW == 0 || aH == 0) {
-    return NS_ERROR_DOM_INVALID_STATE_ERR;
+    return aRv.ThrowInvalidStateError("Passed-in image is empty");
   }
 
   IntRect dirtyRect;
@@ -5138,22 +5155,30 @@
   if (aHasDirtyRect) {
     // fix up negative dimensions
     if (aDirtyWidth < 0) {
-      NS_ENSURE_TRUE(aDirtyWidth != INT_MIN, NS_ERROR_DOM_INDEX_SIZE_ERR);
+      if (aDirtyWidth == INT_MIN) {
+        return aRv.ThrowInvalidStateError("Dirty width is invalid");
+      }
 
       CheckedInt32 checkedDirtyX = CheckedInt32(aDirtyX) + aDirtyWidth;
 
-      if (!checkedDirtyX.isValid()) return NS_ERROR_DOM_INDEX_SIZE_ERR;
+      if (!checkedDirtyX.isValid()) {
+        return aRv.ThrowInvalidStateError("Dirty width is invalid");
+      }
 
       aDirtyX = checkedDirtyX.value();
       aDirtyWidth = -aDirtyWidth;
     }
 
     if (aDirtyHeight < 0) {
-      NS_ENSURE_TRUE(aDirtyHeight != INT_MIN, NS_ERROR_DOM_INDEX_SIZE_ERR);
+      if (aDirtyHeight == INT_MIN) {
+        return aRv.ThrowInvalidStateError("Dirty height is invalid");
+      }
 
       CheckedInt32 checkedDirtyY = CheckedInt32(aDirtyY) + aDirtyHeight;
 
-      if (!checkedDirtyY.isValid()) return NS_ERROR_DOM_INDEX_SIZE_ERR;
+      if (!checkedDirtyY.isValid()) {
+        return aRv.ThrowInvalidStateError("Dirty height is invalid");
+      }
 
       aDirtyY = checkedDirtyY.value();
       aDirtyHeight = -aDirtyHeight;
@@ -5163,7 +5188,9 @@
     dirtyRect = imageDataRect.Intersect(
         IntRect(aDirtyX, aDirtyY, aDirtyWidth, aDirtyHeight));
 
-    if (dirtyRect.Width() <= 0 || dirtyRect.Height() <= 0) return NS_OK;
+    if (dirtyRect.Width() <= 0 || dirtyRect.Height() <= 0) {
+      return;
+    }
   } else {
     dirtyRect = imageDataRect;
   }
@@ -5172,7 +5199,7 @@
   dirtyRect = IntRect(0, 0, mWidth, mHeight).Intersect(dirtyRect);
 
   if (dirtyRect.Width() <= 0 || dirtyRect.Height() <= 0) {
-    return NS_OK;
+    return;
   }
 
   aArray->ComputeState();
@@ -5181,7 +5208,7 @@
 
   uint32_t len = aW * aH * 4;
   if (dataLen != len) {
-    return NS_ERROR_DOM_INVALID_STATE_ERR;
+    return aRv.ThrowInvalidStateError("Invalid width or height");
   }
 
   // The canvas spec says that the current path, transformation matrix, shadow
@@ -5191,7 +5218,7 @@
   EnsureTarget(&putRect);
 
   if (!IsTargetValid()) {
-    return NS_ERROR_FAILURE;
+    return aRv.Throw(NS_ERROR_FAILURE);
   }
 
   DataSourceSurface::MappedSurface map;
@@ -5212,15 +5239,15 @@
     // investigation hasn't been done to determine the underlying cause.  We
     // will just handle the failure to allocate the surface to avoid a crash.
     if (!sourceSurface) {
-      return NS_ERROR_FAILURE;
+      return aRv.Throw(NS_ERROR_FAILURE);
     }
     if (!sourceSurface->Map(DataSourceSurface::READ_WRITE, &map)) {
-      return NS_ERROR_FAILURE;
+      return aRv.Throw(NS_ERROR_FAILURE);
     }
 
     dstData = map.mData;
     if (!dstData) {
-      return NS_ERROR_OUT_OF_MEMORY;
+      return aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     }
     dstStride = map.mStride;
     dstFormat = sourceSurface->GetFormat();
@@ -5244,8 +5271,6 @@
 
   Redraw(
       gfx::Rect(dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height));
-
-  return NS_OK;
 }
 
 static already_AddRefed<ImageData> CreateImageData(
@@ -5256,26 +5281,25 @@
 
   CheckedInt<uint32_t> len = CheckedInt<uint32_t>(aW) * aH * 4;
   if (!len.isValid()) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    aError.ThrowIndexSizeError("Invalid width or height");
     return nullptr;
   }
 
   // Create the fast typed array; it's initialized to 0 by default.
   JSObject* darray = Uint8ClampedArray::Create(aCx, aContext, len.value());
   if (!darray) {
+    // TODO: Should use OOMReporter.
     aError.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
 
-  RefPtr<mozilla::dom::ImageData> imageData =
-      new mozilla::dom::ImageData(aW, aH, *darray);
-  return imageData.forget();
+  return do_AddRef(new ImageData(aW, aH, *darray));
 }
 
 already_AddRefed<ImageData> CanvasRenderingContext2D::CreateImageData(
     JSContext* aCx, double aSw, double aSh, ErrorResult& aError) {
   if (!aSw || !aSh) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    aError.ThrowIndexSizeError("Invalid width or height");
     return nullptr;
   }
 
@@ -5432,6 +5456,31 @@
   return !aManager->CanUseCanvasLayerForSize(GetSize());
 }
 
+void CanvasRenderingContext2D::GetAppUnitsValues(int32_t* aPerDevPixel,
+                                                 int32_t* aPerCSSPixel) {
+  // If we don't have a canvas element, we just return something generic.
+  if (aPerDevPixel) {
+    *aPerDevPixel = 60;
+  }
+  if (aPerCSSPixel) {
+    *aPerCSSPixel = 60;
+  }
+  PresShell* presShell = GetPresShell();
+  if (!presShell) {
+    return;
+  }
+  nsPresContext* presContext = presShell->GetPresContext();
+  if (!presContext) {
+    return;
+  }
+  if (aPerDevPixel) {
+    *aPerDevPixel = presContext->AppUnitsPerDevPixel();
+  }
+  if (aPerCSSPixel) {
+    *aPerCSSPixel = AppUnitsPerCSSPixel();
+  }
+}
+
 void CanvasRenderingContext2D::SetWriteOnly() {
   mWriteOnly = true;
   if (mCanvasElement) {
@@ -5530,8 +5579,7 @@
 void CanvasPath::ArcTo(double aX1, double aY1, double aX2, double aY2,
                        double aRadius, ErrorResult& aError) {
   if (aRadius < 0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsurePathBuilder();
@@ -5601,8 +5649,7 @@
                      double aEndAngle, bool aAnticlockwise,
                      ErrorResult& aError) {
   if (aRadius < 0.0) {
-    aError.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsurePathBuilder();
@@ -5613,10 +5660,9 @@
 
 void CanvasPath::Ellipse(double x, double y, double radiusX, double radiusY,
                          double rotation, double startAngle, double endAngle,
-                         bool anticlockwise, ErrorResult& error) {
+                         bool anticlockwise, ErrorResult& aError) {
   if (radiusX < 0.0 || radiusY < 0.0) {
-    error.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return;
+    return aError.ThrowIndexSizeError("Negative radius");
   }
 
   EnsurePathBuilder();
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasRenderingContext2D.h firefox-85.0+build1/dom/canvas/CanvasRenderingContext2D.h
--- firefox-84.0.2+build1/dom/canvas/CanvasRenderingContext2D.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasRenderingContext2D.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,24 +7,17 @@
 
 #include <vector>
 #include "mozilla/dom/BasicRenderingContext2D.h"
-#include "mozilla/dom/CanvasGradient.h"
-#include "mozilla/dom/CanvasPattern.h"
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/dom/HTMLVideoElement.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EnumeratedArray.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/PresShell.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SurfaceFromElementResult.h"
-#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/UniquePtr.h"
 #include "FilterDescription.h"
 #include "gfx2DGlue.h"
-#include "Layers.h"
 #include "nsICanvasRenderingContextInternal.h"
 #include "nsBidi.h"
 #include "nsColor.h"
@@ -34,10 +27,18 @@
 class nsXULElement;
 
 namespace mozilla {
+class ErrorResult;
+class PresShell;
+
 namespace gl {
 class SourceSurface;
 }  // namespace gl
 
+namespace layers {
+class PersistentBufferProvider;
+enum class LayersBackend : int8_t;
+}  // namespace layers
+
 namespace dom {
 class
     HTMLImageElementOrSVGImageElementOrHTMLCanvasElementOrHTMLVideoElementOrImageBitmap;
@@ -48,7 +49,9 @@
 class StringOrCanvasGradientOrCanvasPattern;
 class OwningStringOrCanvasGradientOrCanvasPattern;
 class TextMetrics;
+class CanvasGradient;
 class CanvasPath;
+class CanvasPattern;
 
 extern const mozilla::gfx::Float SIGMA_MAX;
 
@@ -403,15 +406,7 @@
   /**
    * Gets the pres shell from either the canvas element or the doc shell
    */
-  PresShell* GetPresShell() final {
-    if (mCanvasElement) {
-      return mCanvasElement->OwnerDoc()->GetPresShell();
-    }
-    if (mDocShell) {
-      return mDocShell->GetPresShell();
-    }
-    return nullptr;
-  }
+  PresShell* GetPresShell() final;
   NS_IMETHOD SetDimensions(int32_t aWidth, int32_t aHeight) override;
   NS_IMETHOD InitializeWithDrawTarget(
       nsIDocShell* aShell, NotNull<gfx::DrawTarget*> aTarget) override;
@@ -519,11 +514,11 @@
                              nsIPrincipal& aSubjectPrincipal,
                              JSObject** aRetval);
 
-  nsresult PutImageData_explicit(int32_t aX, int32_t aY, uint32_t aW,
-                                 uint32_t aH, dom::Uint8ClampedArray* aArray,
-                                 bool aHasDirtyRect, int32_t aDirtyX,
-                                 int32_t aDirtyY, int32_t aDirtyWidth,
-                                 int32_t aDirtyHeight);
+  void PutImageData_explicit(int32_t aX, int32_t aY, uint32_t aW, uint32_t aH,
+                             dom::Uint8ClampedArray* aArray, bool aHasDirtyRect,
+                             int32_t aDirtyX, int32_t aDirtyY,
+                             int32_t aDirtyWidth, int32_t aDirtyHeight,
+                             ErrorResult&);
 
   bool CopyBufferProvider(layers::PersistentBufferProvider& aOld,
                           gfx::DrawTarget& aTarget, gfx::IntRect aCopyRect);
@@ -905,21 +900,9 @@
     ContextState(const ContextState& aOther);
     ~ContextState();
 
-    void SetColorStyle(Style aWhichStyle, nscolor aColor) {
-      colorStyles[aWhichStyle] = aColor;
-      gradientStyles[aWhichStyle] = nullptr;
-      patternStyles[aWhichStyle] = nullptr;
-    }
-
-    void SetPatternStyle(Style aWhichStyle, CanvasPattern* aPat) {
-      gradientStyles[aWhichStyle] = nullptr;
-      patternStyles[aWhichStyle] = aPat;
-    }
-
-    void SetGradientStyle(Style aWhichStyle, CanvasGradient* aGrad) {
-      gradientStyles[aWhichStyle] = aGrad;
-      patternStyles[aWhichStyle] = nullptr;
-    }
+    void SetColorStyle(Style aWhichStyle, nscolor aColor);
+    void SetPatternStyle(Style aWhichStyle, CanvasPattern* aPat);
+    void SetGradientStyle(Style aWhichStyle, CanvasGradient* aGrad);
 
     /**
      * returns true iff the given style is a solid color.
@@ -1010,29 +993,7 @@
   friend class AdjustedTargetForFilter;
 
   // other helpers
-  void GetAppUnitsValues(int32_t* aPerDevPixel, int32_t* aPerCSSPixel) {
-    // If we don't have a canvas element, we just return something generic.
-    if (aPerDevPixel) {
-      *aPerDevPixel = 60;
-    }
-    if (aPerCSSPixel) {
-      *aPerCSSPixel = 60;
-    }
-    PresShell* presShell = GetPresShell();
-    if (!presShell) {
-      return;
-    }
-    nsPresContext* presContext = presShell->GetPresContext();
-    if (!presContext) {
-      return;
-    }
-    if (aPerDevPixel) {
-      *aPerDevPixel = presContext->AppUnitsPerDevPixel();
-    }
-    if (aPerCSSPixel) {
-      *aPerCSSPixel = AppUnitsPerCSSPixel();
-    }
-  }
+  void GetAppUnitsValues(int32_t* aPerDevPixel, int32_t* aPerCSSPixel);
 
   friend struct CanvasBidiProcessor;
   friend class CanvasDrawObserver;
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasRenderingContextHelper.cpp firefox-85.0+build1/dom/canvas/CanvasRenderingContextHelper.cpp
--- firefox-84.0.2+build1/dom/canvas/CanvasRenderingContextHelper.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasRenderingContextHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "GLContext.h"
 #include "ImageBitmapRenderingContext.h"
 #include "ImageEncoder.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/CanvasRenderingContext2D.h"
 #include "mozilla/GfxMessageUtils.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasUtils.cpp firefox-85.0+build1/dom/canvas/CanvasUtils.cpp
--- firefox-84.0.2+build1/dom/canvas/CanvasUtils.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,9 +9,11 @@
 #include "nsICanvasRenderingContextInternal.h"
 #include "nsIHTMLCollection.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/UserActivation.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPrefs_webgl.h"
 #include "nsIPrincipal.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/CanvasUtils.h firefox-85.0+build1/dom/canvas/CanvasUtils.h
--- firefox-84.0.2+build1/dom/canvas/CanvasUtils.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/CanvasUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include "CanvasRenderingContextHelper.h"
 #include "mozilla/CheckedInt.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "jsapi.h"
 #include "js/Array.h"  // JS::GetArrayLength
@@ -19,6 +18,7 @@
 namespace mozilla {
 
 namespace dom {
+class Document;
 class HTMLCanvasElement;
 }  // namespace dom
 
diff -Nru firefox-84.0.2+build1/dom/canvas/ClientWebGLContext.cpp firefox-85.0+build1/dom/canvas/ClientWebGLContext.cpp
--- firefox-84.0.2+build1/dom/canvas/ClientWebGLContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ClientWebGLContext.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,9 +6,11 @@
 #include "ClientWebGLContext.h"
 
 #include "ClientWebGLExtensions.h"
+#include "Layers.h"
 #include "gfxCrashReporterUtils.h"
 #include "HostWebGLContext.h"
 #include "js/ScalarType.h"  // js::Scalar::Type
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/WebGLContextEvent.h"
 #include "mozilla/dom/WorkerCommon.h"
@@ -580,6 +582,11 @@
   return useOop;
 }
 
+static inline bool StartsWith(const std::string& haystack,
+                              const std::string& needle) {
+  return haystack.find(needle) == 0;
+}
+
 bool ClientWebGLContext::CreateHostContext(const uvec2& requestedSize) {
   const auto pNotLost = std::make_shared<webgl::NotLostData>(*this);
   auto& notLost = *pNotLost;
@@ -690,7 +697,13 @@
     return Ok();
   }();
   if (!res.isOk()) {
-    notLost.info.error = res.unwrapErr();
+    auto str = res.unwrapErr();
+    if (StartsWith(str, "failIfMajorPerformanceCaveat")) {
+      str +=
+          " (about:config override available:"
+          " webgl.disable-fail-if-major-performance-caveat)";
+    }
+    notLost.info.error = str;
   }
   if (!notLost.info.error.empty()) {
     ThrowEvent_WebGLContextCreationError(notLost.info.error);
@@ -3887,9 +3900,12 @@
     const auto bytesPerRowStride =
         RoundUpToMultipleOf(bytesPerRowUnaligned, unpacking.mUnpackAlignment);
 
-    const auto bytesPerImageStride = bytesPerRowStride * unpacking.mUnpackImageHeight;
-    // SKIP_IMAGES is ignored for 2D targets, but at worst this just makes our shrinking less accurate.
-    const auto images = CheckedInt<size_t>(unpacking.mUnpackSkipImages) + size.z;
+    const auto bytesPerImageStride =
+        bytesPerRowStride * unpacking.mUnpackImageHeight;
+    // SKIP_IMAGES is ignored for 2D targets, but at worst this just makes our
+    // shrinking less accurate.
+    const auto images =
+        CheckedInt<size_t>(unpacking.mUnpackSkipImages) + size.z;
     const auto bytesUpperBound = bytesPerImageStride * images;
 
     if (bytesUpperBound.isValid()) {
@@ -3918,6 +3934,10 @@
 
   // -
 
+  // Demarcate the region within which GC is disallowed. Typed arrays can move
+  // their data during a GC, so this will allow the rooting hazard analysis to
+  // report if a GC is possible while any data pointers extracted from the
+  // typed array are still live.
   dom::Uint8ClampedArray scopedArr;
 
   // -
@@ -3991,7 +4011,10 @@
     return Some(webgl::TexUnpackBlobDesc{
         imageTarget, explicitSize, gfxAlphaType::NonPremult, {}, {}});
   }();
-  if (!desc) return;
+  if (!desc) {
+    scopedArr.Reset();
+    return;
+  }
 
   // -
   // Further, for uploads from TexImageSource, implied UNPACK_ROW_LENGTH and
@@ -4025,6 +4048,7 @@
       EnqueueError(LOCAL_GL_INVALID_OPERATION,
                    "Non-DOM-Element uploads with alpha-premult"
                    " or y-flip do not support subrect selection.");
+      scopedArr.Reset(); // (For the hazard analysis) Done with the data.
       return;
     }
   }
@@ -4036,6 +4060,7 @@
   desc->Shrink(pi);
   Run<RPROC(TexImage)>(static_cast<uint32_t>(level), respecFormat,
                        CastUvec3(offset), pi, std::move(*desc));
+  scopedArr.Reset(); // (For the hazard analysis) Done with the data.
 }
 
 void ClientWebGLContext::CompressedTexImage(bool sub, uint8_t funcDims,
@@ -4257,11 +4282,6 @@
   const FuncScope funcScope(*this, "uniform setter");
   if (IsContextLost()) return;
 
-  if (!mIsWebGL2 && transpose) {
-    EnqueueError(LOCAL_GL_INVALID_VALUE, "`transpose`:true requires WebGL 2.");
-    return;
-  }
-
   const auto& activeLinkResult = GetActiveLinkResult();
   if (!activeLinkResult) {
     EnqueueError(LOCAL_GL_INVALID_OPERATION, "No active linked Program.");
@@ -4287,56 +4307,57 @@
 
   // -
 
-  if (!loc) {
-    // We need to catch INVALID_VALUEs from bad-sized `bytes`. :S
-    // For non-null `loc`, the Host side handles this safely.
-    const auto lengthInType = bytes.length() / sizeof(float);
-    const auto channels = ElemTypeComponents(funcElemType);
-    if (!lengthInType || lengthInType % channels != 0) {
-      EnqueueError(LOCAL_GL_INVALID_VALUE,
-                   "`values` length (%u) must be a positive integer multiple "
-                   "of size of %s.",
-                   lengthInType, EnumString(funcElemType).c_str());
-      return;
-    }
-    return;  // All that validation for a no-op!
+  const auto channels = ElemTypeComponents(funcElemType);
+  if (!availCount || availCount % channels != 0) {
+    EnqueueError(LOCAL_GL_INVALID_VALUE,
+                 "`values` length (%u) must be a positive "
+                 "integer multiple of size of %s.",
+                 availCount, EnumString(funcElemType).c_str());
+    return;
   }
-  if (!loc->ValidateUsable(*this, "location")) return;
 
   // -
 
-  const auto& reqLinkInfo = loc->mParent.lock();
-  if (reqLinkInfo.get() != activeLinkResult) {
-    EnqueueError(LOCAL_GL_INVALID_OPERATION,
-                 "UniformLocation is not from the current active Program.");
-    return;
-  }
+  uint32_t locId = -1;
+  if (MOZ_LIKELY(loc)) {
+    locId = loc->mLocation;
+    if (!loc->ValidateUsable(*this, "location")) return;
 
-  // -
+    // -
 
-  bool funcMatchesLocation = false;
-  for (const auto allowed : loc->mValidUploadElemTypes) {
-    funcMatchesLocation |= (funcElemType == allowed);
-  }
-  if (MOZ_UNLIKELY(!funcMatchesLocation)) {
-    std::string validSetters;
+    const auto& reqLinkInfo = loc->mParent.lock();
+    if (reqLinkInfo.get() != activeLinkResult) {
+      EnqueueError(LOCAL_GL_INVALID_OPERATION,
+                   "UniformLocation is not from the current active Program.");
+      return;
+    }
+
+    // -
+
+    bool funcMatchesLocation = false;
     for (const auto allowed : loc->mValidUploadElemTypes) {
-      validSetters += EnumString(allowed);
-      validSetters += '/';
+      funcMatchesLocation |= (funcElemType == allowed);
     }
-    validSetters.pop_back();  // Cheekily discard the extra trailing '/'.
+    if (MOZ_UNLIKELY(!funcMatchesLocation)) {
+      std::string validSetters;
+      for (const auto allowed : loc->mValidUploadElemTypes) {
+        validSetters += EnumString(allowed);
+        validSetters += '/';
+      }
+      validSetters.pop_back();  // Cheekily discard the extra trailing '/'.
 
-    EnqueueError(LOCAL_GL_INVALID_OPERATION,
-                 "Uniform's `type` requires uniform setter of type %s.",
-                 validSetters.c_str());
-    return;
+      EnqueueError(LOCAL_GL_INVALID_OPERATION,
+                   "Uniform's `type` requires uniform setter of type %s.",
+                   validSetters.c_str());
+      return;
+    }
   }
 
   // -
 
   const auto ptr = bytes.begin().get() + (elemOffset * sizeof(float));
   const auto range = Range<const uint8_t>{ptr, availCount * sizeof(float)};
-  Run<RPROC(UniformData)>(loc->mLocation, transpose, RawBuffer<>(range));
+  Run<RPROC(UniformData)>(locId, transpose, RawBuffer<>(range));
 }
 
 // -
diff -Nru firefox-84.0.2+build1/dom/canvas/ImageBitmap.cpp firefox-85.0+build1/dom/canvas/ImageBitmap.cpp
--- firefox-84.0.2+build1/dom/canvas/ImageBitmap.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ImageBitmap.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,8 +6,10 @@
 
 #include "mozilla/dom/ImageBitmap.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/CanvasRenderingContext2D.h"
 #include "mozilla/dom/CanvasUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/HTMLMediaElementBinding.h"
@@ -21,6 +23,7 @@
 #include "mozilla/dom/WorkerRef.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/Swizzle.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/ScopeExit.h"
@@ -353,13 +356,7 @@
               bgraDataSurface->GetSize());
 
   // Create an Image from the BGRA SourceSurface.
-  RefPtr<layers::Image> image = CreateImageFromSurface(bgraDataSurface);
-
-  if (NS_WARN_IF(!image)) {
-    return nullptr;
-  }
-
-  return image.forget();
+  return CreateImageFromSurface(bgraDataSurface);
 }
 
 /*
@@ -710,12 +707,6 @@
 
   // Create ImageBitmap.
   RefPtr<layers::Image> data = CreateImageFromSurface(surface);
-
-  if (NS_WARN_IF(!data)) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
-    return nullptr;
-  }
-
   RefPtr<ImageBitmap> ret = new ImageBitmap(aGlobal, data, writeOnly);
 
   // Set the picture rectangle.
@@ -743,12 +734,6 @@
 
   // Create ImageBitmap.
   RefPtr<layers::Image> data = CreateImageFromSurface(surface);
-
-  if (NS_WARN_IF(!data)) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
-    return nullptr;
-  }
-
   RefPtr<ImageBitmap> ret = new ImageBitmap(aGlobal, data, writeOnly);
 
   // Set the picture rectangle.
@@ -852,12 +837,6 @@
 
   // Create an Image from the SourceSurface.
   RefPtr<layers::Image> data = CreateImageFromSurface(croppedSurface);
-
-  if (NS_WARN_IF(!data)) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return nullptr;
-  }
-
   RefPtr<ImageBitmap> ret = new ImageBitmap(aGlobal, data, writeOnly);
 
   if (needToReportMemoryAllocation) {
@@ -877,7 +856,7 @@
     nsIGlobalObject* aGlobal, ImageData& aImageData,
     const Maybe<IntRect>& aCropRect, ErrorResult& aRv) {
   // Copy data into SourceSurface.
-  dom::Uint8ClampedArray array;
+  RootedSpiderMonkeyInterface<Uint8ClampedArray> array(RootingCx());
   DebugOnly<bool> inited = array.Init(aImageData.GetDataObject());
   MOZ_ASSERT(inited);
 
@@ -901,13 +880,26 @@
 
   // Create and Crop the raw data into a layers::Image
   RefPtr<layers::Image> data;
+
+  // If the data could move during a GC, copy it out into a local buffer that
+  // lives until a CreateImageFromRawData lower in the stack copies it.
+  // Reassure the static analysis that we know what we're doing.
+  size_t maxInline = JS_MaxMovableTypedArraySize();
+  uint8_t inlineDataBuffer[maxInline];
+  uint8_t* fixedData = array.FixedData(inlineDataBuffer, maxInline);
+
+  // Lie to the hazard analysis and say that we're done with everything that
+  // `array` was using (safe because the data buffer is fixed, and the holding
+  // JSObject is being kept alive elsewhere.)
+  array.Reset();
+
   if (NS_IsMainThread()) {
-    data = CreateImageFromRawData(imageSize, imageStride, FORMAT, array.Data(),
-                                  dataLength, aCropRect);
+    data = CreateImageFromRawData(imageSize, imageStride, FORMAT,
+                                  fixedData, dataLength, aCropRect);
   } else {
     RefPtr<CreateImageFromRawDataInMainThreadSyncTask> task =
         new CreateImageFromRawDataInMainThreadSyncTask(
-            array.Data(), dataLength, imageStride, FORMAT, imageSize, aCropRect,
+            fixedData, dataLength, imageStride, FORMAT, imageSize, aCropRect,
             getter_AddRefs(data));
     task->Dispatch(Canceling, aRv);
   }
@@ -917,7 +909,7 @@
     return nullptr;
   }
 
-  // Create an ImageBimtap.
+  // Create an ImageBitmap.
   RefPtr<ImageBitmap> ret =
       new ImageBitmap(aGlobal, data, false /* write-only */, alphaType);
 
@@ -941,7 +933,7 @@
   }
 
   window->GetExtantDoc()->WarnOnceAbout(
-      Document::eCreateImageBitmapCanvasRenderingContext2D);
+      DeprecatedOperations::eCreateImageBitmapCanvasRenderingContext2D);
 
   // Check write-only mode.
   bool writeOnly =
@@ -961,12 +953,6 @@
   }
 
   RefPtr<layers::Image> data = CreateImageFromSurface(surface);
-
-  if (NS_WARN_IF(!data)) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
-    return nullptr;
-  }
-
   RefPtr<ImageBitmap> ret = new ImageBitmap(aGlobal, data, writeOnly);
 
   ret->mAllocatedImageData = true;
@@ -1057,7 +1043,7 @@
 
 class CreateImageBitmapFromBlobRunnable;
 
-class CreateImageBitmapFromBlob final : public CancelableRunnable,
+class CreateImageBitmapFromBlob final : public DiscardableRunnable,
                                         public imgIContainerCallback,
                                         public nsIInputStreamCallback {
   friend class CreateImageBitmapFromBlobRunnable;
@@ -1090,7 +1076,7 @@
                             already_AddRefed<nsIInputStream> aInputStream,
                             const Maybe<IntRect>& aCropRect,
                             nsIEventTarget* aMainThreadEventTarget)
-      : CancelableRunnable("dom::CreateImageBitmapFromBlob"),
+      : DiscardableRunnable("dom::CreateImageBitmapFromBlob"),
         mMutex("dom::CreateImageBitmapFromBlob::mMutex"),
         mPromise(aPromise),
         mGlobalObject(aGlobal),
@@ -1150,7 +1136,7 @@
   void* mThread;
 };
 
-NS_IMPL_ISUPPORTS_INHERITED(CreateImageBitmapFromBlob, CancelableRunnable,
+NS_IMPL_ISUPPORTS_INHERITED(CreateImageBitmapFromBlob, DiscardableRunnable,
                             imgIContainerCallback, nsIInputStreamCallback)
 
 class CreateImageBitmapFromBlobRunnable : public WorkerRunnable {
diff -Nru firefox-84.0.2+build1/dom/canvas/ImageBitmapRenderingContext.cpp firefox-85.0+build1/dom/canvas/ImageBitmapRenderingContext.cpp
--- firefox-84.0.2+build1/dom/canvas/ImageBitmapRenderingContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ImageBitmapRenderingContext.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "ImageBitmapRenderingContext.h"
 #include "mozilla/dom/ImageBitmapRenderingContextBinding.h"
+#include "nsComponentManagerUtils.h"
 #include "ImageContainer.h"
 #include "ImageLayers.h"
 
diff -Nru firefox-84.0.2+build1/dom/canvas/ImageData.cpp firefox-85.0+build1/dom/canvas/ImageData.cpp
--- firefox-84.0.2+build1/dom/canvas/ImageData.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ImageData.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,11 +6,18 @@
 
 #include "mozilla/dom/ImageData.h"
 
+#include "ErrorList.h"
+#include "js/StructuredClone.h"
+#include "js/Value.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ImageDataBinding.h"
-
-#include "jsapi.h"
+#include "nsCycleCollectionNoteChild.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/canvas/ImageData.h firefox-85.0+build1/dom/canvas/ImageData.h
--- firefox-84.0.2+build1/dom/canvas/ImageData.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ImageData.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,20 +10,27 @@
 #include <cstdint>
 #include <utility>
 #include "js/RootingAPI.h"
-#include "js/StructuredClone.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/TypedArray.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupports.h"
 
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
 class ErrorResult;
 
 namespace dom {
 
+class GlobalObject;
+template <typename T>
+class Optional;
+
 class ImageData final : public nsISupports {
   ~ImageData() { DropData(); }
 
diff -Nru firefox-84.0.2+build1/dom/canvas/IpdlQueue.h firefox-85.0+build1/dom/canvas/IpdlQueue.h
--- firefox-84.0.2+build1/dom/canvas/IpdlQueue.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/IpdlQueue.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,12 +12,14 @@
 #include <tuple>
 #include <vector>
 #include <unordered_map>
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/dom/QueueParamTraits.h"
 #include "mozilla/ipc/SharedMemoryBasic.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/ipc/Shmem.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/Logging.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/TypeTraits.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/nsICanvasRenderingContextInternal.cpp firefox-85.0+build1/dom/canvas/nsICanvasRenderingContextInternal.cpp
--- firefox-84.0.2+build1/dom/canvas/nsICanvasRenderingContextInternal.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/nsICanvasRenderingContextInternal.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,8 @@
 
 #include "nsICanvasRenderingContextInternal.h"
 
+#include "mozilla/dom/Document.h"
+#include "mozilla/PresShell.h"
 #include "nsRefreshDriver.h"
 
 nsICanvasRenderingContextInternal::nsICanvasRenderingContextInternal()
@@ -14,6 +16,13 @@
 nsICanvasRenderingContextInternal::~nsICanvasRenderingContextInternal() =
     default;
 
+mozilla::PresShell* nsICanvasRenderingContextInternal::GetPresShell() {
+  if (mCanvasElement) {
+    return mCanvasElement->OwnerDoc()->GetPresShell();
+  }
+  return nullptr;
+}
+
 void nsICanvasRenderingContextInternal::RemovePostRefreshObserver() {
   if (mRefreshDriver) {
     mRefreshDriver->RemovePostRefreshObserver(this);
diff -Nru firefox-84.0.2+build1/dom/canvas/nsICanvasRenderingContextInternal.h firefox-85.0+build1/dom/canvas/nsICanvasRenderingContextInternal.h
--- firefox-84.0.2+build1/dom/canvas/nsICanvasRenderingContextInternal.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/nsICanvasRenderingContextInternal.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,13 +8,14 @@
 
 #include <memory>
 
+#include "gfxRect.h"
 #include "mozilla/gfx/2D.h"
 #include "nsISupports.h"
 #include "nsIInputStream.h"
 #include "nsIDocShell.h"
+#include "nsRefreshObservers.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/OffscreenCanvas.h"
-#include "mozilla/PresShell.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/NotNull.h"
@@ -71,12 +72,7 @@
     AddPostRefreshObserverIfNecessary();
   }
 
-  virtual mozilla::PresShell* GetPresShell() {
-    if (mCanvasElement) {
-      return mCanvasElement->OwnerDoc()->GetPresShell();
-    }
-    return nullptr;
-  }
+  virtual mozilla::PresShell* GetPresShell();
 
   void RemovePostRefreshObserver();
 
diff -Nru firefox-84.0.2+build1/dom/canvas/OffscreenCanvas.cpp firefox-85.0+build1/dom/canvas/OffscreenCanvas.cpp
--- firefox-84.0.2+build1/dom/canvas/OffscreenCanvas.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/OffscreenCanvas.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,7 +6,9 @@
 
 #include "OffscreenCanvas.h"
 
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/OffscreenCanvasBinding.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/layers/CanvasRenderer.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/OffscreenCanvas.h firefox-85.0+build1/dom/canvas/OffscreenCanvas.h
--- firefox-84.0.2+build1/dom/canvas/OffscreenCanvas.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/OffscreenCanvas.h	2021-01-18 19:58:09.000000000 +0000
@@ -21,6 +21,10 @@
 
 class ErrorResult;
 
+namespace gfx {
+class SourceSurface;
+}
+
 namespace layers {
 class CanvasClient;
 class CanvasRenderer;
diff -Nru firefox-84.0.2+build1/dom/canvas/ProducerConsumerQueue.h firefox-85.0+build1/dom/canvas/ProducerConsumerQueue.h
--- firefox-84.0.2+build1/dom/canvas/ProducerConsumerQueue.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/ProducerConsumerQueue.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/dom/QueueParamTraits.h"
+#include "mozilla/ipc/ShmemMessageUtils.h"
 #include "CrossProcessSemaphore.h"
 #include "nsThreadUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/canvas/PWebGL.ipdl firefox-85.0+build1/dom/canvas/PWebGL.ipdl
--- firefox-84.0.2+build1/dom/canvas/PWebGL.ipdl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/PWebGL.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,7 @@
 
 using mozilla::layers::CompositableHandle from "mozilla/layers/LayersTypes.h";
 using mozilla::layers::SurfaceDescriptor from "mozilla/layers/LayersTypes.h";
-using std::string from "ipc/IPCMessageUtils.h";
+using std::string from "string";
 using mozilla::uvec2 from "mozilla/dom/WebGLIpdl.h";
 using mozilla::webgl::Int32Vector from "mozilla/dom/WebGLIpdl.h";
 using mozilla::webgl::CompileResult from "mozilla/dom/WebGLIpdl.h";
diff -Nru firefox-84.0.2+build1/dom/canvas/QueueParamTraits.h firefox-85.0+build1/dom/canvas/QueueParamTraits.h
--- firefox-84.0.2+build1/dom/canvas/QueueParamTraits.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/QueueParamTraits.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #ifndef _QUEUEPARAMTRAITS_H_
 #define _QUEUEPARAMTRAITS_H_ 1
 
+#include "ipc/EnumSerializer.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/IntegerRange.h"
@@ -17,6 +18,7 @@
 #include "mozilla/Logging.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/TypeTraits.h"
+#include "nsExceptionHandler.h"
 #include "nsString.h"
 #include "WebGLTypes.h"
 
diff -Nru firefox-84.0.2+build1/dom/canvas/test/reftest/reftest.list firefox-85.0+build1/dom/canvas/test/reftest/reftest.list
--- firefox-84.0.2+build1/dom/canvas/test/reftest/reftest.list	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/reftest/reftest.list	2021-01-18 19:58:09.000000000 +0000
@@ -25,7 +25,7 @@
 # Check that captureStream() displays in a local video element
 skip-if(Android) == webgl-capturestream-test.html?preserve wrapper.html?green.png
 
-# Some of the failure conditions are a little crazy. I'm (jgilbert) setting these based on
+# Some of the failure conditions are a little weird. I'm (jgilbert) setting these based on
 # failures encountered when running on Try, and then targetting the Try config by
 # differences in the `sandbox` contents. That is, I'm labeling based on symptoms rather
 # than cause.
diff -Nru firefox-84.0.2+build1/dom/canvas/test/test_canvas_focusring.html firefox-85.0+build1/dom/canvas/test/test_canvas_focusring.html
--- firefox-84.0.2+build1/dom/canvas/test/test_canvas_focusring.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/test_canvas_focusring.html	2021-01-18 19:58:09.000000000 +0000
@@ -5,11 +5,7 @@
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <body>
 <script>
-
 SimpleTest.waitForExplicitFinish();
-const Cc = SpecialPowers.Cc;
-const Cr = SpecialPowers.Cr;
-SpecialPowers.setBoolPref("canvas.focusring.enabled", true);
 </script>
 
 <p>Canvas test: drawFocusIfNeeded</p>
@@ -59,6 +55,12 @@
 <script>
 
 async function runTests() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["canvas.focusring.enabled", true],
+      ["browser.display.always_show_rings_after_key_focus", true],
+    ]
+  });
   await SimpleTest.promiseFocus();
   synthesizeKey("KEY_Tab"); // Trigger keyboard navigation so outlines are shown.
   synthesizeKey("KEY_Tab", { shiftKey: true }); // And now undo the focus move.
@@ -69,7 +71,6 @@
     throw e;
   }
 
- SpecialPowers.setBoolPref("canvas.focusring.enabled", false);
  SimpleTest.finish();
 }
 
diff -Nru firefox-84.0.2+build1/dom/canvas/test/test_canvas.html firefox-85.0+build1/dom/canvas/test/test_canvas.html
--- firefox-84.0.2+build1/dom/canvas/test/test_canvas.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/test_canvas.html	2021-01-18 19:58:09.000000000 +0000
@@ -11345,7 +11345,7 @@
 <!-- [[[ test_2d.path.arc.shape.5.html ]]] -->
 
 <p>Canvas test: 2d.path.arc.shape.5</p>
-<!-- Testing: arc() from 0 to 5pi does not draw crazy things -->
+<!-- Testing: arc() from 0 to 5pi does not draw strange things -->
 <canvas id="c351" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
 
@@ -22098,7 +22098,7 @@
 <!-- [[[ test_2d.path.ellipse.shape.4.html ]]] -->
 
 <p>Canvas test: 2d.path.ellipse.shape.4</p>
-<!-- Testing: ellipse() from 0 to 5pi does not draw crazy things -->
+<!-- Testing: ellipse() from 0 to 5pi does not draw strange things -->
 <canvas id="c708" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 <script>
 
diff -Nru firefox-84.0.2+build1/dom/canvas/test/webgl-conf/checkout/conformance/ogles/ogles-utils.js firefox-85.0+build1/dom/canvas/test/webgl-conf/checkout/conformance/ogles/ogles-utils.js
--- firefox-84.0.2+build1/dom/canvas/test/webgl-conf/checkout/conformance/ogles/ogles-utils.js	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/webgl-conf/checkout/conformance/ogles/ogles-utils.js	2021-01-18 19:58:09.000000000 +0000
@@ -33,7 +33,7 @@
       return true;
     }
 
-    // TODO: Implement crazy check that's used in OpenGL ES 2.0 conformance tests.
+    // TODO: Implement check that's used in OpenGL ES 2.0 conformance tests.
     // NOTE: on Desktop things seem to be working. Maybe the more complex check
     // is needed for embedded systems?
     return false;
diff -Nru firefox-84.0.2+build1/dom/canvas/test/webgl-conf/generated-mochitest.ini firefox-85.0+build1/dom/canvas/test/webgl-conf/generated-mochitest.ini
--- firefox-84.0.2+build1/dom/canvas/test/webgl-conf/generated-mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/webgl-conf/generated-mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -5392,7 +5392,6 @@
 subsuite = webgl2-core
 [generated/test_2_conformance2__rendering__instanced-arrays.html]
 subsuite = webgl2-core
-fail-if = 1
 [generated/test_2_conformance2__rendering__instanced-rendering-bug.html]
 subsuite = webgl2-core
 [generated/test_2_conformance2__rendering__instanced-rendering-large-divisor.html]
@@ -7674,6 +7673,7 @@
 subsuite = webgl2-ext
 [generated/test_2_conformance__glsl__bugs__long-expressions-should-not-crash.html]
 subsuite = webgl2-ext
+skip-if = (os == 'linux' && !asan)
 [generated/test_2_conformance__glsl__bugs__loop-if-loop-gradient.html]
 subsuite = webgl2-ext
 [generated/test_2_conformance__glsl__bugs__modulo-arithmetic-accuracy.html]
@@ -8015,7 +8015,7 @@
 subsuite = webgl2-ext
 [generated/test_2_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
 subsuite = webgl2-ext
-skip-if = (os == 'win' && os_version == '6.1' && debug)
+skip-if = (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && !asan)
 [generated/test_2_conformance__glsl__misc__shader-varying-packing-restrictions.html]
 subsuite = webgl2-ext
 [generated/test_2_conformance__glsl__misc__shader-with-256-character-define.html]
@@ -11068,7 +11068,7 @@
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]
 subsuite = webgl1-ext
-skip-if = (os == 'android')
+skip-if = (os == 'android') || (os == 'linux' && !asan)
 [generated/test_conformance__glsl__bugs__loop-if-loop-gradient.html]
 subsuite = webgl1-ext
 [generated/test_conformance__glsl__bugs__modulo-arithmetic-accuracy.html]
@@ -11425,7 +11425,7 @@
 subsuite = webgl1-ext
 [generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
 subsuite = webgl1-ext
-skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug)
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug) || (os == 'linux' && !asan)
 [generated/test_conformance__glsl__misc__shader-varying-packing-restrictions.html]
 subsuite = webgl1-ext
 [generated/test_conformance__glsl__misc__shader-with-256-character-define.html]
diff -Nru firefox-84.0.2+build1/dom/canvas/test/webgl-conf/mochitest-errata.ini firefox-85.0+build1/dom/canvas/test/webgl-conf/mochitest-errata.ini
--- firefox-84.0.2+build1/dom/canvas/test/webgl-conf/mochitest-errata.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/test/webgl-conf/mochitest-errata.ini	2021-01-18 19:58:09.000000000 +0000
@@ -170,8 +170,6 @@
 [generated/test_2_conformance2__rendering__blitframebuffer-resolve-to-back-buffer.html]
 # ABORT_ON_ERROR
 skip-if = 1
-[generated/test_2_conformance2__rendering__instanced-arrays.html]
-fail-if = 1
 [generated/test_2_conformance2__rendering__vertex-id.html]
 fail-if = 1
 [generated/test_2_conformance2__transform_feedback__too-small-buffers.html]
@@ -291,6 +289,23 @@
 # Asserts on linux debug. Crashes on Android.
 skip-if = (os == 'linux') || (os == 'android')
 
+[generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]
+# Android: Crashes sometimes
+# Linux w/o ASAN: perma-crash (ASAN doesn't crash)
+skip-if = (os == 'android') || (os == 'linux' && !asan)
+[generated/test_2_conformance__glsl__bugs__long-expressions-should-not-crash.html]
+# Linux w/o ASAN: perma-crash (ASAN doesn't crash)
+skip-if = (os == 'linux' && !asan)
+
+[generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
+# Frequent timeout on win7 and linux debug.
+# Linux w/o ASAN: perma-crash (ASAN doesn't crash)
+skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug) || (os == 'linux' && !asan)
+[generated/test_2_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
+# win7/debug: Failures on oct 20th, 2017, bug 1410306
+# Linux w/o ASAN: perma-crash (ASAN doesn't crash)
+skip-if = (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && !asan)
+
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec3.html]
 # Crashes from libglsl.so
 # application crashed [@ jemalloc_crash] on Android
@@ -495,9 +510,6 @@
 # Frequent orange crash.
 skip-if = (os == 'android')
 
-[generated/test_conformance__glsl__bugs__long-expressions-should-not-crash.html]
-# Crashes sometimes
-skip-if = (os == 'android')
 [generated/test_conformance__canvas__drawingbuffer-hd-dpi-test.html]
 # Crashes
 skip-if = (os == 'android')
@@ -620,9 +632,6 @@
 skip-if = (os == 'android')
 [generated/test_conformance__context__context-release-with-workers.html]
 skip-if = (os == 'android')
-[generated/test_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
-# Frequent timeout on win7 and linux debug.
-skip-if = (os == 'android') || (os == 'win' && os_version == '6.1' && debug) || (os == 'linux' && debug)
 [generated/test_conformance__glsl__bugs__complex-glsl-does-not-crash.html]
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__misc__shader-with-non-reserved-words.html]
@@ -1192,9 +1201,6 @@
 [generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
-[generated/test_2_conformance__glsl__misc__shader-uniform-packing-restrictions.html]
-# Failures on win7/debug on oct 20th, 2017, bug 1410306
-skip-if = (os == 'win' && os_version == '6.1' && debug)
 [generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
 # Failure on win7 but got passed on win7 vm
 skip-if = (os == 'win' && os_version == '6.1')
diff -Nru firefox-84.0.2+build1/dom/canvas/TexUnpackBlob.cpp firefox-85.0+build1/dom/canvas/TexUnpackBlob.cpp
--- firefox-84.0.2+build1/dom/canvas/TexUnpackBlob.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/TexUnpackBlob.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "GLContext.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "nsLayoutUtils.h"
 #include "WebGLBuffer.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/TexUnpackBlob.h firefox-85.0+build1/dom/canvas/TexUnpackBlob.h
--- firefox-84.0.2+build1/dom/canvas/TexUnpackBlob.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/TexUnpackBlob.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,8 @@
 #include "WebGLStrongTypes.h"
 #include "WebGLTypes.h"
 
+#include <memory>
+
 namespace mozilla {
 
 class UniqueBuffer;
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLContext.cpp firefox-85.0+build1/dom/canvas/WebGLContext.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLContext.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLContext.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -28,6 +28,7 @@
 #include "Layers.h"
 #include "LayerUserData.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/HTMLVideoElement.h"
 #include "mozilla/dom/ImageData.h"
@@ -551,7 +552,7 @@
       if (webgl->gl->GetContextType() == gl::GLContextType::WGL &&
           !gl::sWGLLib.HasDXInterop2()) {
         failureId = "FEATURE_FAILURE_WEBGL_DXGL_INTEROP2"_ns;
-        return Err("Caveat: WGL without DXGLInterop2.");
+        return Err("failIfMajorPerformanceCaveat: WGL without DXGLInterop2.");
       }
 #endif
     }
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLContextGL.cpp firefox-85.0+build1/dom/canvas/WebGLContextGL.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLContextGL.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLContextGL.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1288,11 +1288,22 @@
 void WebGLContext::UniformData(const uint32_t loc, const bool transpose,
                                const Range<const uint8_t>& data) const {
   const FuncScope funcScope(*this, "uniform setter");
+
+  if (!IsWebGL2() && transpose) {
+    GenerateError(LOCAL_GL_INVALID_VALUE, "`transpose`:true requires WebGL 2.");
+    return;
+  }
+
+  // -
+
   const auto& link = mActiveProgramLinkInfo;
   if (!link) return;
 
   const auto locInfo = MaybeFind(link->locationMap, loc);
-  if (!locInfo) return;
+  if (!locInfo) {
+    // Null WebGLUniformLocations become -1, which will end up here.
+    return;
+  }
 
   const auto& validationInfo = locInfo->info;
   const auto& activeInfo = validationInfo.info;
@@ -1302,20 +1313,11 @@
   // -
 
   const auto lengthInType = data.length() / sizeof(float);
-  if (!lengthInType || lengthInType % channels != 0) {
-    GenerateError(LOCAL_GL_INVALID_VALUE,
-                  "(uniform %s) `values` length (%u) must be a positive "
-                  "integer multiple of "
-                  "size of %s.",
-                  activeInfo.name.c_str(), lengthInType,
-                  EnumString(activeInfo.elemType).c_str());
-    return;
-  }
   const auto elemCount = lengthInType / channels;
   if (elemCount > 1 && !validationInfo.isArray) {
     GenerateError(
         LOCAL_GL_INVALID_OPERATION,
-        "(uniform %s) `values` length (%u) must exactle match size of %s.",
+        "(uniform %s) `values` length (%u) must exactly match size of %s.",
         activeInfo.name.c_str(), lengthInType,
         EnumString(activeInfo.elemType).c_str());
     return;
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLContext.h firefox-85.0+build1/dom/canvas/WebGLContext.h
--- firefox-84.0.2+build1/dom/canvas/WebGLContext.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLContext.h	2021-01-18 19:58:09.000000000 +0000
@@ -20,7 +20,6 @@
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/EnumeratedArray.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLFramebuffer.cpp firefox-85.0+build1/dom/canvas/WebGLFramebuffer.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLFramebuffer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLFramebuffer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "GLScreenBuffer.h"
 #include "MozFramebuffer.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "mozilla/IntegerRange.h"
 #include "nsPrintfCString.h"
 #include "WebGLContext.h"
 #include "WebGLContextUtils.h"
@@ -1517,8 +1518,9 @@
   // -
   // Mutually constrain src and dst rects for eldritch blits.
 
-  [&]{
-    using fvec2 = avec2<float>; // Switch to float, because there's no perfect solution anyway.
+  [&] {
+    using fvec2 = avec2<float>;  // Switch to float, because there's no perfect
+                                 // solution anyway.
 
     const auto zero2f = fvec2{0, 0};
     const auto srcSizef = AsVec(srcSize).StaticCast<fvec2>();
@@ -1534,7 +1536,7 @@
 
     // Skip if zero-sized.
     if (!srcRectDiff.x || !srcRectDiff.y || !dstRectDiff.x || !dstRectDiff.y) {
-      srcP0 = srcP1 = dstP0 = dstP1 = {0,0};
+      srcP0 = srcP1 = dstP0 = dstP1 = {0, 0};
       return;
     }
 
@@ -1574,12 +1576,13 @@
   }();
 
   bool inBounds = true;
-  inBounds &= ( srcP0 == srcP0.Clamp({0,0}, AsVec(srcSize)) );
-  inBounds &= ( srcP1 == srcP1.Clamp({0,0}, AsVec(srcSize)) );
-  inBounds &= ( dstP0 == dstP0.Clamp({0,0}, AsVec(dstSize)) );
-  inBounds &= ( dstP1 == dstP1.Clamp({0,0}, AsVec(dstSize)) );
+  inBounds &= (srcP0 == srcP0.Clamp({0, 0}, AsVec(srcSize)));
+  inBounds &= (srcP1 == srcP1.Clamp({0, 0}, AsVec(srcSize)));
+  inBounds &= (dstP0 == dstP0.Clamp({0, 0}, AsVec(dstSize)));
+  inBounds &= (dstP1 == dstP1.Clamp({0, 0}, AsVec(dstSize)));
   if (!inBounds) {
-    webgl->ErrorImplementationBug("Subrects still not within src and dst after constraining.");
+    webgl->ErrorImplementationBug(
+        "Subrects still not within src and dst after constraining.");
     return;
   }
 
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLIpdl.h firefox-85.0+build1/dom/canvas/WebGLIpdl.h
--- firefox-84.0.2+build1/dom/canvas/WebGLIpdl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLIpdl.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef WEBGLIPDL_H_
 #define WEBGLIPDL_H_
 
+#include "ipc/EnumSerializer.h"
 #include "mozilla/layers/LayersSurfaces.h"
 #include "WebGLTypes.h"
 
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLParent.cpp firefox-85.0+build1/dom/canvas/WebGLParent.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLParent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -31,8 +31,8 @@
       },
       desc, out);
 
-  if (!mHost) {
-    return IPC_FAIL(this, "Failed to create HostWebGLContext");
+  if (!mHost && !out->error.size()) {
+    return IPC_FAIL(this, "Abnormally failed to create HostWebGLContext.");
   }
 
   return IPC_OK();
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLProgram.cpp firefox-85.0+build1/dom/canvas/WebGLProgram.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLProgram.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLProgram.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "nsPrintfCString.h"
 #include "WebGLBuffer.h"
@@ -681,7 +682,7 @@
     }
   }
 
-  if (hasActiveAttrib && !hasActiveDivisor0) {
+  if (!webgl->IsWebGL2() && hasActiveAttrib && !hasActiveDivisor0) {
     webgl->ErrorInvalidOperation(
         "One active vertex attrib (if any are active)"
         " must have a divisor of 0.");
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLQueueParamTraits.h firefox-85.0+build1/dom/canvas/WebGLQueueParamTraits.h
--- firefox-84.0.2+build1/dom/canvas/WebGLQueueParamTraits.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLQueueParamTraits.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <type_traits>
 
+#include "ipc/EnumSerializer.h"
 #include "mozilla/dom/ProducerConsumerQueue.h"
 #include "TexUnpackBlob.h"
 #include "WebGLContext.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLTexelConversions.h firefox-85.0+build1/dom/canvas/WebGLTexelConversions.h
--- firefox-84.0.2+build1/dom/canvas/WebGLTexelConversions.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLTexelConversions.h	2021-01-18 19:58:09.000000000 +0000
@@ -335,11 +335,10 @@
 
 template <WebGLTexelFormat Format>
 struct IntermediateFormat {
-  static const WebGLTexelFormat Value = IsFloatFormat<Format>::Value
-                                            ? WebGLTexelFormat::RGBA32F
-                                            : IsHalfFloatFormat<Format>::Value
-                                                  ? WebGLTexelFormat::RGBA16F
-                                                  : WebGLTexelFormat::RGBA8;
+  static const WebGLTexelFormat Value =
+      IsFloatFormat<Format>::Value       ? WebGLTexelFormat::RGBA32F
+      : IsHalfFloatFormat<Format>::Value ? WebGLTexelFormat::RGBA16F
+                                         : WebGLTexelFormat::RGBA8;
 };
 
 inline size_t TexelBytesForFormat(WebGLTexelFormat format) {
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLTexture.cpp firefox-85.0+build1/dom/canvas/WebGLTexture.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLTexture.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLTexture.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,8 +10,10 @@
 #include "mozilla/Casting.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include "mozilla/gfx/Logging.h"
+#include "mozilla/IntegerRange.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Scoped.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 #include "ScopedGLHelpers.h"
 #include "WebGLContext.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLTextureUpload.cpp firefox-85.0+build1/dom/canvas/WebGLTextureUpload.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLTextureUpload.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLTextureUpload.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,12 +14,14 @@
 #include "GLContext.h"
 #include "mozilla/Casting.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/HTMLVideoElement.h"
 #include "mozilla/dom/ImageBitmap.h"
 #include "mozilla/dom/ImageData.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Scoped.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_webgl.h"
 #include "mozilla/Unused.h"
 #include "nsLayoutUtils.h"
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLTypes.h firefox-85.0+build1/dom/canvas/WebGLTypes.h
--- firefox-84.0.2+build1/dom/canvas/WebGLTypes.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLTypes.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,13 +12,17 @@
 #include <vector>
 
 #include "GLDefs.h"
+#include "ImageContainer.h"
 #include "mozilla/Casting.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Range.h"
 #include "mozilla/RefCounted.h"
+#include "mozilla/ResultVariant.h"
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/BuildConstants.h"
 #include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Rect.h"
 #include "mozilla/ipc/Shmem.h"
 #include "gfxTypes.h"
 
@@ -441,12 +445,12 @@
   }
 };
 
-template<typename T>
+template <typename T>
 avec2<T> MinExtents(const avec2<T>& a, const avec2<T>& b) {
   return {std::min(a.x, b.x), std::min(a.y, b.y)};
 }
 
-template<typename T>
+template <typename T>
 avec2<T> MaxExtents(const avec2<T>& a, const avec2<T>& b) {
   return {std::max(a.x, b.x), std::max(a.y, b.y)};
 }
diff -Nru firefox-84.0.2+build1/dom/canvas/WebGLValidateStrings.cpp firefox-85.0+build1/dom/canvas/WebGLValidateStrings.cpp
--- firefox-84.0.2+build1/dom/canvas/WebGLValidateStrings.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/WebGLValidateStrings.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include <regex>
 
 #include "WebGLTypes.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/canvas/XRWebGLLayer.cpp firefox-85.0+build1/dom/canvas/XRWebGLLayer.cpp
--- firefox-84.0.2+build1/dom/canvas/XRWebGLLayer.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/canvas/XRWebGLLayer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/XRView.h"
 #include "mozilla/dom/XRViewport.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "WebGLFramebuffer.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_webgl.h"
@@ -17,6 +18,7 @@
 #include "MozFramebuffer.h"
 #include "VRDisplayClient.h"
 #include "ClientWebGLContext.h"
+#include "nsContentUtils.h"
 #include "nsIScriptError.h"
 
 using namespace mozilla::gl;
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/BrowsingContext.webidl firefox-85.0+build1/dom/chrome-webidl/BrowsingContext.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/BrowsingContext.webidl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/BrowsingContext.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -110,6 +110,8 @@
    */
   [SetterThrows] attribute unsigned long sandboxFlags;
 
+  [SetterThrows] attribute boolean isActive;
+
   // The inRDMPane flag indicates whether or not Responsive Design Mode is
   // active for the browsing context.
   [SetterThrows] attribute boolean inRDMPane;
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/ChromeUtils.webidl firefox-85.0+build1/dom/chrome-webidl/ChromeUtils.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/ChromeUtils.webidl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/ChromeUtils.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -25,6 +25,30 @@
 };
 
 /**
+ * Options for a marker created with the addProfilerMarker method.
+ * All fields are optional.
+ */
+dictionary ProfilerMarkerOptions {
+  // A timestamp to use as the start time of the marker.
+  // If no start time is provided, the marker will have no duration.
+  // In window and ChromeWorker contexts, use a timestamp from
+  // `performance.now()`.
+  // In JS modules, use `Cu.now()` to get a timestamp.
+  DOMHighResTimeStamp startTime = 0;
+
+  // If captureStack is true, a profiler stack will be captured and associated
+  // with the marker.
+  boolean captureStack = false;
+
+  // Markers are created by default in the JavaScript category, but this can be
+  // overridden.
+  // Examples of correct values: "JavaScript", "Test", "Other", ...
+  // See ProfilingCategoryList.h for the complete list of valid values.
+  // Using an unrecognized value will set the category to "Other".
+  ByteString category = "JavaScript";
+};
+
+/**
  * A collection of static utility methods that are only exposed to system code.
  * This is exposed in all the system globals where we can expose stuff by
  * default, so should only include methods that are **thread-safe**.
@@ -171,15 +195,18 @@
    * add a marker for the current thread. No-op otherwise.
    *
    * @param name              The name of the marker.
-   * @param startTime         The timestamp to use as the start of the marker.
-   *                          If omitted, the marker will have no duration.
+   * @param options           Either a timestamp to use as the start time of the
+   *                          marker, or a ProfilerMarkerOptions object that can
+   *                          contain startTime, captureStack or category fields.
+   *                          If this parameter is omitted, the marker will have
+   *                           no duration.
    *                          In window and ChromeWorker contexts, use a
    *                          timestamp from `performance.now()`.
    *                          In JS modules, use `Cu.now()` to get a timestamp.
    * @param text              Text to associate with the marker.
    */
   void addProfilerMarker(UTF8String name,
-                         optional DOMHighResTimeStamp startTime,
+                         optional (ProfilerMarkerOptions or DOMHighResTimeStamp) options = {},
                          optional UTF8String text);
 
   /**
@@ -428,9 +455,6 @@
   [ChromeOnly]
   PopupBlockerState getPopupControlState();
 
-  [ChromeOnly]
-  boolean isPopupTokenUnused();
-
   /**
    * Milliseconds from the last iframe loading an external protocol.
    */
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/FrameLoader.webidl firefox-85.0+build1/dom/chrome-webidl/FrameLoader.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/FrameLoader.webidl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/FrameLoader.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -249,9 +249,20 @@
   unsigned long totalPageCount = 0;
 
   /**
-   * Whether the document has a selection that can be printed.
+   * Whether the preview is empty because of page range selection.
+   */
+  boolean isEmpty = false;
+
+  /**
+   * Whether the document or any subdocument has a selection that can be
+   * printed.
    */
   boolean hasSelection = false;
+
+  /**
+   * Whether the previewed document has a selection itself.
+   */
+  boolean hasSelfSelection = false;
 };
 
 FrameLoader includes WebBrowserPersistable;
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/IOUtils.webidl firefox-85.0+build1/dom/chrome-webidl/IOUtils.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/IOUtils.webidl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/IOUtils.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -59,10 +59,10 @@
    * @return Resolves with the number of bytes successfully written to the file,
    *         otherwise rejects with a DOMException.
    */
-  Promise<unsigned long long> writeAtomic(DOMString path, Uint8Array data, optional WriteAtomicOptions options = {});
+  Promise<unsigned long long> write(DOMString path, Uint8Array data, optional WriteOptions options = {});
   /**
    * Attempts to encode |string| to UTF-8, then safely write the result to a
-   * file at |path|. Works exactly like |writeAtomic|.
+   * file at |path|. Works exactly like |write|.
    *
    * @param path      An absolute file path.
    * @param string    A string to encode to UTF-8 and write to the file at path.
@@ -70,7 +70,7 @@
    * @return Resolves with the number of bytes successfully written to the file,
    *         otherwise rejects with a DOMException.
    */
-  Promise<unsigned long long> writeAtomicUTF8(DOMString path, DOMString string, optional WriteAtomicOptions options = {});
+  Promise<unsigned long long> writeUTF8(DOMString path, DOMString string, optional WriteOptions options = {});
   /**
    * Moves the file from |sourcePath| to |destPath|, creating necessary parents.
    * If |destPath| is a directory, then the source file will be moved into the
@@ -155,6 +155,30 @@
    *         DOMException.
    */
   Promise<sequence<DOMString>> getChildren(DOMString path);
+  /**
+   * Set the permissions of the file at |path|.
+   *
+   * Windows does not make a distinction between user, group, and other
+   * permissions like UNICES do. If a permission flag is set for any of user,
+   * group, or other has a permission, then all users will have that
+   * permission. Additionally, Windows does not support setting the
+   * "executable" permission.
+   *
+   * @param path        An absolute file path
+   * @param permissions The UNIX file mode representing the permissions.
+   *
+   * @return Resolves if the permissions were set successfully, otherwise
+   *         rejects with a DOMException.
+   */
+  Promise<void> setPermissions(DOMString path, unsigned long permissions);
+  /**
+   * Return whether or not the file exists at the given path.
+   *
+   * @param path An absolute file path.
+   *
+   * @return A promise that resolves to whether or not the given file exists.
+   */
+  Promise<boolean> exists(DOMString path);
 };
 
 /**
@@ -181,10 +205,10 @@
 };
 
 /**
- * Options to be passed to the |IOUtils.writeAtomic| and |writeAtomicUTF8|
+ * Options to be passed to the |IOUtils.write| and |writeUTF8|
  * methods.
  */
-dictionary WriteAtomicOptions {
+dictionary WriteOptions {
   /**
    * If specified, backup the destination file to this path before writing.
    */
@@ -252,6 +276,13 @@
    * Otherwise, fail if the directory already exists.
    */
   boolean ignoreExisting = true;
+  /**
+   * The file mode to create the directory with.
+   *
+   * This is ignored on Windows.
+   */
+  unsigned long permissions = 0755;
+
 };
 
 /**
@@ -297,4 +328,20 @@
    * since Epoch (1970-01-01T00:00:00.000Z).
    */
   long long lastModified;
+
+  /**
+   * The timestamp of file creation, represented in milliseconds since Epoch
+   * (1970-01-01T00:00:00.000Z).
+   *
+   * This is only available on MacOS and Windows.
+   */
+  long long creationTime;
+  /**
+   * The permissions of the file, expressed as a UNIX file mode.
+   *
+   * NB: Windows does not make a distinction between user, group, and other
+   * permissions like UNICES do. The user, group, and other parts will always
+   * be identical on Windows.
+   */
+  unsigned long permissions;
 };
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/moz.build firefox-85.0+build1/dom/chrome-webidl/moz.build
--- firefox-84.0.2+build1/dom/chrome-webidl/moz.build	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/moz.build	2021-01-18 19:58:09.000000000 +0000
@@ -65,6 +65,7 @@
     "MozStorageAsyncStatementParams.webidl",
     "MozStorageStatementParams.webidl",
     "MozStorageStatementRow.webidl",
+    "NetDashboard.webidl",
     "PathUtils.webidl",
     "PrecompiledScript.webidl",
     "PromiseDebugging.webidl",
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/NetDashboard.webidl firefox-85.0+build1/dom/chrome-webidl/NetDashboard.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/NetDashboard.webidl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/NetDashboard.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,149 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// This file defines dictionaries used by about:networking page.
+
+dictionary SocketElement {
+  DOMString host = "";
+  unsigned long port = 0;
+  boolean active = false;
+  boolean tcp = false;
+  double sent = 0;
+  double received = 0;
+};
+
+[GenerateConversionToJS]
+dictionary SocketsDict {
+  sequence<SocketElement> sockets;
+  double sent = 0;
+  double received = 0;
+};
+
+dictionary HttpConnInfo {
+  unsigned long rtt = 0;
+  unsigned long ttl = 0;
+  DOMString protocolVersion = "";
+};
+
+dictionary HalfOpenInfoDict {
+  boolean speculative = false;
+};
+
+dictionary HttpConnectionElement {
+  DOMString host = "";
+  unsigned long port = 0;
+  DOMString httpVersion = "";
+  boolean ssl = false;
+  sequence<HttpConnInfo> active;
+  sequence<HttpConnInfo> idle;
+  sequence<HalfOpenInfoDict> halfOpens;
+};
+
+[GenerateConversionToJS]
+dictionary HttpConnDict {
+  sequence<HttpConnectionElement> connections;
+};
+
+dictionary WebSocketElement {
+  DOMString hostport = "";
+  unsigned long msgsent = 0;
+  unsigned long msgreceived = 0;
+  double sentsize = 0;
+  double receivedsize = 0;
+  boolean encrypted = false;
+};
+
+[GenerateConversionToJS]
+dictionary WebSocketDict {
+  sequence<WebSocketElement> websockets;
+};
+
+dictionary DnsCacheEntry {
+  DOMString hostname = "";
+  sequence<DOMString> hostaddr;
+  DOMString family = "";
+  double expiration = 0;
+  boolean trr = false;
+  DOMString originAttributesSuffix = "";
+};
+
+[GenerateConversionToJS]
+dictionary DNSCacheDict {
+  sequence<DnsCacheEntry> entries;
+};
+
+[GenerateConversionToJS]
+dictionary DNSLookupDict {
+  sequence<DOMString> address;
+  DOMString error = "";
+  boolean answer = false;
+};
+
+dictionary SVCParam {
+  unsigned short type = 0;
+};
+
+dictionary SVCParamAlpn : SVCParam {
+  DOMString alpn = "";
+};
+
+dictionary SVCParamNoDefaultAlpn : SVCParam {
+};
+
+dictionary SVCParamPort : SVCParam {
+  unsigned short port = 0;
+};
+
+dictionary SVCParamIPv4Hint : SVCParam {
+  sequence<DOMString> address;
+};
+
+dictionary SVCParamIPv6Hint : SVCParam {
+  sequence<DOMString> address;
+};
+
+dictionary SVCParamEchConfig : SVCParam {
+  DOMString echConfig = "";
+};
+
+dictionary HTTPSRecord {
+  unsigned short priority = 0;
+  DOMString targetName = "";
+  SVCParamAlpn alpn;
+  SVCParamNoDefaultAlpn noDefaultAlpn;
+  SVCParamPort port;
+  SVCParamIPv4Hint ipv4Hint;
+  SVCParamIPv6Hint ipv6Hint;
+  SVCParamEchConfig echConfig;
+};
+
+[GenerateConversionToJS]
+dictionary HTTPSRRLookupDict {
+  DOMString error = "";
+  boolean answer = false;
+  sequence<HTTPSRecord> records;
+};
+
+[GenerateConversionToJS]
+dictionary ConnStatusDict {
+  DOMString status = "";
+};
+
+dictionary RcwnPerfStats {
+  unsigned long avgShort = 0;
+  unsigned long avgLong = 0;
+  unsigned long stddevLong = 0;
+};
+
+[GenerateConversionToJS]
+dictionary RcwnStatus {
+  unsigned long totalNetworkRequests = 0;
+  unsigned long rcwnCacheWonCount = 0;
+  unsigned long rcwnNetWonCount = 0;
+  unsigned long cacheSlowCount = 0;
+  unsigned long cacheNotSlowCount = 0;
+  // Sequence is indexed by CachePerfStats::EDataType
+  sequence<RcwnPerfStats> perfStats;
+};
diff -Nru firefox-84.0.2+build1/dom/chrome-webidl/PlacesEvent.webidl firefox-85.0+build1/dom/chrome-webidl/PlacesEvent.webidl
--- firefox-84.0.2+build1/dom/chrome-webidl/PlacesEvent.webidl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/chrome-webidl/PlacesEvent.webidl	2021-01-18 19:58:09.000000000 +0000
@@ -15,6 +15,10 @@
    * (or a bookmark folder/separator) is created.
    */
   "bookmark-removed",
+  /**
+   * data: PlacesFavicon. Fired whenever a favicon changes.
+   */
+  "favicon-changed",
 };
 
 [ChromeOnly, Exposed=Window]
@@ -186,3 +190,29 @@
    */
   readonly attribute boolean isDescendantRemoval;
 };
+
+dictionary PlacesFaviconInit {
+  required DOMString url;
+  required ByteString pageGuid;
+  required DOMString faviconUrl;
+};
+
+[ChromeOnly, Exposed=Window]
+interface PlacesFavicon : PlacesEvent {
+  constructor(PlacesFaviconInit initDict);
+
+  /**
+   * The URI of the changed page.
+   */
+  readonly attribute DOMString url;
+
+  /**
+   * The unique id associated with the page.
+   */
+  readonly attribute ByteString pageGuid;
+
+  /**
+   * The URI of the new favicon.
+   */
+  readonly attribute DOMString faviconUrl;
+};
diff -Nru firefox-84.0.2+build1/dom/clients/api/ClientDOMUtil.h firefox-85.0+build1/dom/clients/api/ClientDOMUtil.h
--- firefox-84.0.2+build1/dom/clients/api/ClientDOMUtil.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/clients/api/ClientDOMUtil.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/dom/ClientOpPromise.h"
 #include "mozilla/dom/DOMMozPromiseRequestHolder.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/ErrorResult.h"
 
 class nsIGlobalObject;
 
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientChannelHelper.cpp firefox-85.0+build1/dom/clients/manager/ClientChannelHelper.cpp
--- firefox-84.0.2+build1/dom/clients/manager/ClientChannelHelper.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientChannelHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "ClientManager.h"
 #include "ClientSource.h"
 #include "MainThreadUtils.h"
+#include "mozilla/dom/ClientsBinding.h"
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientHandle.h firefox-85.0+build1/dom/clients/manager/ClientHandle.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientHandle.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientHandle.h	2021-01-18 19:58:09.000000000 +0000
@@ -24,6 +24,7 @@
 class ClientOpConstructorArgs;
 class PClientManagerChild;
 class ServiceWorkerDescriptor;
+enum class CallerType : uint32_t;
 
 namespace ipc {
 class StructuredCloneData;
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientHandleParent.h firefox-85.0+build1/dom/clients/manager/ClientHandleParent.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientHandleParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientHandleParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #define _mozilla_dom_ClientHandleParent_h
 
 #include "mozilla/dom/PClientHandleParent.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientInfo.h firefox-85.0+build1/dom/clients/manager/ClientInfo.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientInfo.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientInfo.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,9 +8,14 @@
 #define _mozilla_dom_ClientInfo_h
 
 #include "X11UndefineNone.h"
-#include "mozilla/dom/ClientBinding.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+
+class nsIPrincipal;
+struct nsID;
 
 namespace mozilla {
 
@@ -22,6 +27,8 @@
 namespace dom {
 
 class IPCClientInfo;
+enum class FrameType : uint8_t;
+enum class ClientType : uint8_t;
 
 // This class provides a simple structure that represents a global living
 // in the system.  Its thread safe and can be transferred across process
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientIPCTypes.ipdlh firefox-85.0+build1/dom/clients/manager/ClientIPCTypes.ipdlh
--- firefox-84.0.2+build1/dom/clients/manager/ClientIPCTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientIPCTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -7,13 +7,18 @@
 include PBackgroundSharedTypes;
 include IPCServiceWorkerDescriptor;
 include ProtocolTypes;
+
+include "mozilla/dom/BindingIPCUtils.h";
+include "mozilla/dom/ClientIPCUtils.h";
+include "ipc/ErrorIPCUtils.h";
+
 using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using ClientType from "mozilla/dom/ClientIPCUtils.h";
-using FrameType from "mozilla/dom/ClientIPCUtils.h";
-using mozilla::StorageAccess from "mozilla/dom/ClientIPCUtils.h";
-using VisibilityState from "mozilla/dom/ClientIPCUtils.h";
-using CallerType from "mozilla/dom/BindingIPCUtils.h";
-using mozilla::CopyableErrorResult from "ipc/ErrorIPCUtils.h";
+using ClientType from "mozilla/dom/ClientsBinding.h";
+using FrameType from "mozilla/dom/ClientBinding.h";
+using mozilla::StorageAccess from "mozilla/StorageAccess.h";
+using VisibilityState from "mozilla/dom/DocumentBinding.h";
+using CallerType from "mozilla/dom/BindingDeclarations.h";
+using mozilla::CopyableErrorResult from "mozilla/ErrorResult.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientIPCUtils.h firefox-85.0+build1/dom/clients/manager/ClientIPCUtils.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientIPCUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef _mozilla_dom_ClientIPCUtils_h
 #define _mozilla_dom_ClientIPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "X11UndefineNone.h"
 #include "mozilla/dom/ClientBinding.h"
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientManagerChild.cpp firefox-85.0+build1/dom/clients/manager/ClientManagerChild.cpp
--- firefox-84.0.2+build1/dom/clients/manager/ClientManagerChild.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientManagerChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "ClientNavigateOpChild.h"
 #include "ClientSourceChild.h"
 
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientManagerService.cpp firefox-85.0+build1/dom/clients/manager/ClientManagerService.cpp
--- firefox-84.0.2+build1/dom/clients/manager/ClientManagerService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientManagerService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "jsfriendapi.h"
 #include "nsIAsyncShutdown.h"
 #include "nsIXULRuntime.h"
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientNavigateOpChild.cpp firefox-85.0+build1/dom/clients/manager/ClientNavigateOpChild.cpp
--- firefox-84.0.2+build1/dom/clients/manager/ClientNavigateOpChild.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientNavigateOpChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "ClientState.h"
 #include "ClientSource.h"
 #include "ClientSourceChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/Unused.h"
 #include "nsIDocShell.h"
 #include "nsDocShellLoadState.h"
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientOpenWindowUtils.cpp firefox-85.0+build1/dom/clients/manager/ClientOpenWindowUtils.cpp
--- firefox-84.0.2+build1/dom/clients/manager/ClientOpenWindowUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientOpenWindowUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/ResultExtensions.h"
 #include "nsContentUtils.h"
 #include "nsDocShell.h"
+#include "nsDocShellLoadState.h"
 #include "nsFocusManager.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsIDocShell.h"
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientOpPromise.h firefox-85.0+build1/dom/clients/manager/ClientOpPromise.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientOpPromise.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientOpPromise.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,10 +6,11 @@
 #ifndef _mozilla_dom_ClientOpPromise_h
 #define _mozilla_dom_ClientOpPromise_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/MozPromise.h"
 
 namespace mozilla {
+class CopyableErrorResult;
+
 namespace dom {
 
 class ClientOpResult;
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientSource.h firefox-85.0+build1/dom/clients/manager/ClientSource.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientSource.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientSource.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,7 @@
 #include "mozilla/dom/ClientOpPromise.h"
 #include "mozilla/dom/ClientThing.h"
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Variant.h"
 
 #ifdef XP_WIN
@@ -24,6 +24,8 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class ClientClaimArgs;
diff -Nru firefox-84.0.2+build1/dom/clients/manager/ClientState.h firefox-85.0+build1/dom/clients/manager/ClientState.h
--- firefox-84.0.2+build1/dom/clients/manager/ClientState.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/ClientState.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/StorageAccess.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/Variant.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/clients/manager/PClientHandle.ipdl firefox-85.0+build1/dom/clients/manager/PClientHandle.ipdl
--- firefox-84.0.2+build1/dom/clients/manager/PClientHandle.ipdl	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/clients/manager/PClientHandle.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,8 @@
 include protocol PRemoteLazyInputStream;
 include ClientIPCTypes;
 
+include "mozilla/ipc/ProtocolMessageUtils.h";
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/console/Console.cpp firefox-85.0+build1/dom/console/Console.cpp
--- firefox-84.0.2+build1/dom/console/Console.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/console/Console.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "js/Array.h"  // JS::GetArrayLength, JS::NewArrayObject
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Exceptions.h"
 #include "mozilla/dom/File.h"
@@ -27,8 +28,11 @@
 #include "mozilla/dom/WorkletImpl.h"
 #include "mozilla/dom/WorkletThread.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/JSObjectHolder.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/StaticPrefs_devtools.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsGlobalWindow.h"
diff -Nru firefox-84.0.2+build1/dom/console/Console.h firefox-85.0+build1/dom/console/Console.h
--- firefox-84.0.2+build1/dom/console/Console.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/console/Console.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,19 +7,18 @@
 #ifndef mozilla_dom_Console_h
 #define mozilla_dom_Console_h
 
+#include "domstubs.h"
 #include "mozilla/dom/ConsoleBinding.h"
-#include "mozilla/JSObjectHolder.h"
 #include "mozilla/TimeStamp.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
-#include "nsDOMNavigationTiming.h"
-#include "nsPIDOMWindow.h"
 
 class nsIConsoleAPIStorage;
-class nsIPrincipal;
+class nsIGlobalObject;
+class nsPIDOMWindowInner;
 class nsIStackFrame;
 
 namespace mozilla {
@@ -28,7 +27,6 @@
 class AnyCallback;
 class ConsoleCallData;
 class ConsoleInstance;
-class ConsoleInstanceDumpCallback;
 class ConsoleRunnable;
 class ConsoleCallDataRunnable;
 class ConsoleProfileRunnable;
diff -Nru firefox-84.0.2+build1/dom/console/ConsoleInstance.cpp firefox-85.0+build1/dom/console/ConsoleInstance.cpp
--- firefox-84.0.2+build1/dom/console/ConsoleInstance.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/console/ConsoleInstance.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/ConsoleInstance.h"
 #include "mozilla/dom/ConsoleBinding.h"
+#include "mozilla/Preferences.h"
 #include "ConsoleCommon.h"
 #include "ConsoleUtils.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/console/ConsoleReportCollector.cpp firefox-85.0+build1/dom/console/ConsoleReportCollector.cpp
--- firefox-84.0.2+build1/dom/console/ConsoleReportCollector.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/console/ConsoleReportCollector.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/ConsoleReportCollector.h"
+
+#include "mozilla/dom/Document.h"
 #include "mozilla/net/NeckoChannelParams.h"
 
 #include "ConsoleUtils.h"
diff -Nru firefox-84.0.2+build1/dom/console/ConsoleUtils.cpp firefox-85.0+build1/dom/console/ConsoleUtils.cpp
--- firefox-84.0.2+build1/dom/console/ConsoleUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/console/ConsoleUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsContentUtils.h"
 #include "nsIConsoleAPIStorage.h"
 #include "nsIXPConnect.h"
+#include "nsServiceManagerUtils.h"
 
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/NullPrincipal.h"
diff -Nru firefox-84.0.2+build1/dom/crypto/CryptoKey.cpp firefox-85.0+build1/dom/crypto/CryptoKey.cpp
--- firefox-84.0.2+build1/dom/crypto/CryptoKey.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/crypto/CryptoKey.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,15 +4,44 @@
  * 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 "CryptoKey.h"
+#include "mozilla/dom/CryptoKey.h"
 
-#include "cryptohi.h"
+#include <cstddef>
+#include <cstring>
+#include <memory>
+#include <new>
+#include <utility>
+#include "blapit.h"
+#include "certt.h"
+#include "js/StructuredClone.h"
+#include "js/TypeDecls.h"
+#include "keyhi.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/dom/KeyAlgorithmBinding.h"
 #include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/SubtleCryptoBinding.h"
 #include "mozilla/dom/ToJSValue.h"
+#include "mozilla/dom/WebCryptoCommon.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsLiteralString.h"
 #include "nsNSSComponent.h"
+#include "nsStringFlags.h"
+#include "nsTArray.h"
 #include "pk11pub.h"
+#include "pkcs11t.h"
+#include "plarena.h"
+#include "prtypes.h"
+#include "secasn1.h"
+#include "secasn1t.h"
+#include "seccomon.h"
+#include "secdert.h"
+#include "secitem.h"
+#include "secmodt.h"
+#include "secoid.h"
+#include "secoidt.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/crypto/CryptoKey.h firefox-85.0+build1/dom/crypto/CryptoKey.h
--- firefox-84.0.2+build1/dom/crypto/CryptoKey.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/crypto/CryptoKey.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,23 +7,36 @@
 #ifndef mozilla_dom_CryptoKey_h
 #define mozilla_dom_CryptoKey_h
 
-#include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
-#include "nsIGlobalObject.h"
-#include "pk11pub.h"
-#include "keyhi.h"
+#include <cstdint>
+#include "ErrorList.h"
 #include "ScopedNSSTypes.h"
-#include "mozilla/ErrorResult.h"
+#include "js/RootingAPI.h"
+#include "keythi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CryptoBuffer.h"
 #include "mozilla/dom/KeyAlgorithmProxy.h"
-#include "js/StructuredClone.h"
-#include "js/TypeDecls.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArrayForwardDeclare.h"
+#include "nsWrapperCache.h"
 
 #define CRYPTOKEY_SC_VERSION 0x00000001
 
+class JSObject;
 class nsIGlobalObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {
 
 /*
diff -Nru firefox-84.0.2+build1/dom/crypto/KeyAlgorithmProxy.cpp firefox-85.0+build1/dom/crypto/KeyAlgorithmProxy.cpp
--- firefox-84.0.2+build1/dom/crypto/KeyAlgorithmProxy.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/crypto/KeyAlgorithmProxy.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/KeyAlgorithmProxy.h"
+
+#include "js/StructuredClone.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/dom/WebCryptoCommon.h"
 
diff -Nru firefox-84.0.2+build1/dom/crypto/KeyAlgorithmProxy.h firefox-85.0+build1/dom/crypto/KeyAlgorithmProxy.h
--- firefox-84.0.2+build1/dom/crypto/KeyAlgorithmProxy.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/crypto/KeyAlgorithmProxy.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,10 +7,21 @@
 #ifndef mozilla_dom_KeyAlgorithmProxy_h
 #define mozilla_dom_KeyAlgorithmProxy_h
 
-#include "pk11pub.h"
-#include "js/StructuredClone.h"
+#include <cstdint>
+#include <utility>
+#include "js/RootingAPI.h"
+#include "mozilla/dom/CryptoBuffer.h"
 #include "mozilla/dom/KeyAlgorithmBinding.h"
+#include "mozilla/dom/TypedArray.h"
 #include "mozilla/dom/WebCryptoCommon.h"
+#include "nsLiteralString.h"
+#include "nsStringFwd.h"
+#include "pkcs11t.h"
+
+class JSObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 #define KEY_ALGORITHM_SC_VERSION 0x00000001
 
diff -Nru firefox-84.0.2+build1/dom/crypto/WebCryptoCommon.h firefox-85.0+build1/dom/crypto/WebCryptoCommon.h
--- firefox-84.0.2+build1/dom/crypto/WebCryptoCommon.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/crypto/WebCryptoCommon.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,12 +7,29 @@
 #ifndef mozilla_dom_WebCryptoCommon_h
 #define mozilla_dom_WebCryptoCommon_h
 
+// XXX Several of these dependencies could be removed by moving implementations
+// to the cpp file.
+
+#include <cstdint>
+#include <cstring>
 #include "js/StructuredClone.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/dom/CryptoBuffer.h"
+#include "mozilla/fallible.h"
 #include "nsContentUtils.h"
-#include "nsString.h"
-#include "pk11pub.h"
+#include "nsLiteralString.h"
+#include "nsStringFwd.h"
+#include "pkcs11t.h"
+#include "plarena.h"
+#include "secasn1t.h"
+#include "seccomon.h"
+#include "secitem.h"
+#include "secoid.h"
+#include "secoidt.h"
+
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 // WebCrypto algorithm names
 #define WEBCRYPTO_ALG_AES_CBC "AES-CBC"
diff -Nru firefox-84.0.2+build1/dom/debugger/DebuggerNotificationManager.cpp firefox-85.0+build1/dom/debugger/DebuggerNotificationManager.cpp
--- firefox-84.0.2+build1/dom/debugger/DebuggerNotificationManager.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/debugger/DebuggerNotificationManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "DebuggerNotificationManager.h"
 
-#include "mozilla/ScopeExit.h"
 #include "nsIGlobalObject.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/encoding/TextDecoder.h firefox-85.0+build1/dom/encoding/TextDecoder.h
--- firefox-84.0.2+build1/dom/encoding/TextDecoder.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/encoding/TextDecoder.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,12 +11,10 @@
 #include "mozilla/dom/TextDecoderBinding.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/Encoding.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
-
-class ErrorResult;
-
 namespace dom {
 
 class ArrayBufferViewOrArrayBuffer;
diff -Nru firefox-84.0.2+build1/dom/encoding/TextEncoder.cpp firefox-85.0+build1/dom/encoding/TextEncoder.cpp
--- firefox-84.0.2+build1/dom/encoding/TextEncoder.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/encoding/TextEncoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/TextEncoder.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsReadableUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/events/Clipboard.cpp firefox-85.0+build1/dom/events/Clipboard.cpp
--- firefox-84.0.2+build1/dom/events/Clipboard.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/Clipboard.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,10 +12,12 @@
 #include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/DataTransferItemList.h"
 #include "mozilla/dom/DataTransferItem.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "nsIClipboard.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
+#include "nsServiceManagerUtils.h"
 #include "nsITransferable.h"
 #include "nsArrayUtils.h"
 
@@ -114,7 +116,8 @@
       !nsContentUtils::IsCutCopyAllowed(doc, aSubjectPrincipal)) {
     MOZ_LOG(GetClipboardLog(), LogLevel::Debug,
             ("Clipboard, Write, Not allowed to write to clipboard\n"));
-    p->MaybeRejectWithUndefined();
+    p->MaybeRejectWithNotAllowedError(
+        "Clipboard write was blocked due to lack of user activation.");
     return p.forget();
   }
 
diff -Nru firefox-84.0.2+build1/dom/events/ClipboardEvent.cpp firefox-85.0+build1/dom/events/ClipboardEvent.cpp
--- firefox-84.0.2+build1/dom/events/ClipboardEvent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/ClipboardEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/ClipboardEvent.h"
 #include "mozilla/ContentEvents.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/DataTransfer.h"
 #include "nsIClipboard.h"
 
diff -Nru firefox-84.0.2+build1/dom/events/ContentEventHandler.cpp firefox-85.0+build1/dom/events/ContentEventHandler.cpp
--- firefox-84.0.2+build1/dom/events/ContentEventHandler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/ContentEventHandler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -417,11 +417,15 @@
     }
   }
 
-  aEvent->mSucceeded = false;
+  // Ideally, we should emplace only when we return succeeded event.
+  // However, we need to emplace here since it's hard to store the various
+  // result.  Intead, `HandleQueryContentEvent()` will reset `mReply` if
+  // corresponding handler returns error.
+  aEvent->EmplaceReply();
 
-  aEvent->mReply.mContentsRoot = mRootContent.get();
+  aEvent->mReply->mContentsRoot = mRootContent.get();
 
-  aEvent->mReply.mHasSelection = !mSelection->IsCollapsed();
+  aEvent->mReply->mHasSelection = !mSelection->IsCollapsed();
 
   nsRect r;
   nsIFrame* frame = nsCaret::GetGeometry(mSelection, &r);
@@ -431,7 +435,7 @@
       return NS_ERROR_FAILURE;
     }
   }
-  aEvent->mReply.mFocusedWidget = frame->GetNearestWidget();
+  aEvent->mReply->mFocusedWidget = frame->GetNearestWidget();
 
   return NS_OK;
 }
@@ -482,12 +486,11 @@
     resultRect.UnionRect(resultRect, frameRect);
   }
 
-  aEvent->mReply.mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
+  aEvent->mReply->mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
       resultRect, presContext->AppUnitsPerDevPixel());
   // Returning empty rect may cause native IME confused, let's make sure to
   // return non-empty rect.
-  EnsureNonEmptyRect(aEvent->mReply.mRect);
-  aEvent->mSucceeded = true;
+  EnsureNonEmptyRect(aEvent->mReply->mRect);
 
   return NS_OK;
 }
@@ -1264,30 +1267,47 @@
 
 nsresult ContentEventHandler::HandleQueryContentEvent(
     WidgetQueryContentEvent* aEvent) {
+  nsresult rv = NS_ERROR_NOT_IMPLEMENTED;
   switch (aEvent->mMessage) {
     case eQuerySelectedText:
-      return OnQuerySelectedText(aEvent);
+      rv = OnQuerySelectedText(aEvent);
+      break;
     case eQueryTextContent:
-      return OnQueryTextContent(aEvent);
+      rv = OnQueryTextContent(aEvent);
+      break;
     case eQueryCaretRect:
-      return OnQueryCaretRect(aEvent);
+      rv = OnQueryCaretRect(aEvent);
+      break;
     case eQueryTextRect:
-      return OnQueryTextRect(aEvent);
+      rv = OnQueryTextRect(aEvent);
+      break;
     case eQueryTextRectArray:
-      return OnQueryTextRectArray(aEvent);
+      rv = OnQueryTextRectArray(aEvent);
+      break;
     case eQueryEditorRect:
-      return OnQueryEditorRect(aEvent);
+      rv = OnQueryEditorRect(aEvent);
+      break;
     case eQueryContentState:
-      return OnQueryContentState(aEvent);
+      rv = OnQueryContentState(aEvent);
+      break;
     case eQuerySelectionAsTransferable:
-      return OnQuerySelectionAsTransferable(aEvent);
+      rv = OnQuerySelectionAsTransferable(aEvent);
+      break;
     case eQueryCharacterAtPoint:
-      return OnQueryCharacterAtPoint(aEvent);
+      rv = OnQueryCharacterAtPoint(aEvent);
+      break;
     case eQueryDOMWidgetHittest:
-      return OnQueryDOMWidgetHittest(aEvent);
+      rv = OnQueryDOMWidgetHittest(aEvent);
+      break;
     default:
-      return NS_ERROR_NOT_IMPLEMENTED;
+      break;
+  }
+  if (NS_FAILED(rv)) {
+    aEvent->mReply.reset();  // Mark the query failed.
+    return rv;
   }
+
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -1310,12 +1330,15 @@
     return rv;
   }
 
+  MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
+
   if (!mFirstSelectedRawRange.IsPositioned()) {
     MOZ_ASSERT(aEvent->mInput.mSelectionType != SelectionType::eNormal);
-    MOZ_ASSERT(aEvent->mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND);
-    MOZ_ASSERT(aEvent->mReply.mString.IsEmpty());
-    MOZ_ASSERT(!aEvent->mReply.mHasSelection);
-    aEvent->mSucceeded = true;
+    MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
+    MOZ_ASSERT(!aEvent->mReply->mHasSelection);
+    // This is special case that `mReply` is emplaced, but mOffsetAndData is
+    // not emplaced but treated as succeeded because of no selection ranges
+    // is a usual case.
     return NS_OK;
   }
 
@@ -1328,82 +1351,74 @@
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  NS_ASSERTION(aEvent->mReply.mString.IsEmpty(),
-               "The reply string must be empty");
-
   LineBreakType lineBreakType = GetLineBreakType(aEvent);
-  rv = GetStartOffset(mFirstSelectedRawRange, &aEvent->mReply.mOffset,
-                      lineBreakType);
-  NS_ENSURE_SUCCESS(rv, rv);
+  uint32_t startOffset = 0;
+  if (NS_WARN_IF(NS_FAILED(GetStartOffset(mFirstSelectedRawRange, &startOffset,
+                                          lineBreakType)))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  const RangeBoundary& anchorRef = mSelection->RangeCount() > 0
+                                       ? mSelection->AnchorRef()
+                                       : mFirstSelectedRawRange.Start();
+  const RangeBoundary& focusRef = mSelection->RangeCount() > 0
+                                      ? mSelection->FocusRef()
+                                      : mFirstSelectedRawRange.End();
+  if (NS_WARN_IF(!anchorRef.IsSet()) || NS_WARN_IF(!focusRef.IsSet())) {
+    return NS_ERROR_FAILURE;
+  }
 
-  nsCOMPtr<nsINode> anchorNode, focusNode;
-  int32_t anchorOffset = 0, focusOffset = 0;
   if (mSelection->RangeCount()) {
     // If there is only one selection range, the anchor/focus node and offset
     // are the information of the range.  Therefore, we have the direction
     // information.
     if (mSelection->RangeCount() == 1) {
-      anchorNode = mSelection->GetAnchorNode();
-      focusNode = mSelection->GetFocusNode();
-      if (NS_WARN_IF(!anchorNode) || NS_WARN_IF(!focusNode)) {
-        return NS_ERROR_FAILURE;
-      }
-      anchorOffset = static_cast<int32_t>(mSelection->AnchorOffset());
-      focusOffset = static_cast<int32_t>(mSelection->FocusOffset());
-      if (NS_WARN_IF(anchorOffset < 0) || NS_WARN_IF(focusOffset < 0)) {
-        return NS_ERROR_FAILURE;
-      }
-
       // The selection's points should always be comparable, independent of the
       // selection (see nsISelectionController.idl).
-      int16_t compare = *nsContentUtils::ComparePoints(anchorNode, anchorOffset,
-                                                       focusNode, focusOffset);
+      Maybe<int32_t> compare =
+          nsContentUtils::ComparePoints(anchorRef, focusRef);
+      if (compare.isNothing()) {
+        return NS_ERROR_FAILURE;
+      }
 
-      aEvent->mReply.mReversed = compare > 0;
+      aEvent->mReply->mReversed = compare.value() > 0;
     }
     // However, if there are 2 or more selection ranges, we have no information
     // of that.
     else {
-      aEvent->mReply.mReversed = false;
+      aEvent->mReply->mReversed = false;
     }
 
-    if (!mFirstSelectedRawRange.Collapsed()) {
-      rv = GenerateFlatTextContent(mFirstSelectedRawRange,
-                                   aEvent->mReply.mString, lineBreakType);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-    } else {
-      aEvent->mReply.mString.Truncate();
+    nsString selectedString;
+    if (!mFirstSelectedRawRange.Collapsed() &&
+        NS_WARN_IF(NS_FAILED(GenerateFlatTextContent(
+            mFirstSelectedRawRange, selectedString, lineBreakType)))) {
+      return NS_ERROR_FAILURE;
     }
+    aEvent->mReply->mOffsetAndData.emplace(startOffset, selectedString,
+                                           OffsetAndDataFor::SelectedString);
   } else {
-    NS_ASSERTION(mFirstSelectedRawRange.Collapsed(),
+    NS_ASSERTION(anchorRef == focusRef,
                  "When mSelection doesn't have selection, "
-                 "mFirstSelectedRawRange must be "
-                 "collapsed");
-    anchorNode = focusNode = mFirstSelectedRawRange.GetStartContainer();
-    if (NS_WARN_IF(!anchorNode)) {
-      return NS_ERROR_FAILURE;
-    }
-    anchorOffset = focusOffset =
-        static_cast<int32_t>(mFirstSelectedRawRange.StartOffset());
-    if (NS_WARN_IF(anchorOffset < 0)) {
-      return NS_ERROR_FAILURE;
-    }
+                 "mFirstSelectedRawRange must be collapsed");
 
-    aEvent->mReply.mReversed = false;
-    aEvent->mReply.mString.Truncate();
+    aEvent->mReply->mReversed = false;
+    aEvent->mReply->mOffsetAndData.emplace(startOffset, EmptyString(),
+                                           OffsetAndDataFor::SelectedString);
   }
 
   nsIFrame* frame = nullptr;
-  rv = GetFrameForTextRect(focusNode, focusOffset, true, &frame);
+  rv = GetFrameForTextRect(
+      focusRef.Container(),
+      focusRef.Offset(RangeBoundary::OffsetFilter::kValidOffsets).valueOr(0),
+      true, &frame);
   if (NS_SUCCEEDED(rv) && frame) {
-    aEvent->mReply.mWritingMode = frame->GetWritingMode();
+    aEvent->mReply->mWritingMode = frame->GetWritingMode();
   } else {
-    aEvent->mReply.mWritingMode = WritingMode();
+    aEvent->mReply->mWritingMode = WritingMode();
   }
 
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -1414,34 +1429,40 @@
     return rv;
   }
 
-  NS_ASSERTION(aEvent->mReply.mString.IsEmpty(),
-               "The reply string must be empty");
+  MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
 
   LineBreakType lineBreakType = GetLineBreakType(aEvent);
 
   RawRange rawRange;
-  rv = SetRawRangeFromFlatTextOffset(&rawRange, aEvent->mInput.mOffset,
-                                     aEvent->mInput.mLength, lineBreakType,
-                                     false, &aEvent->mReply.mOffset);
-  NS_ENSURE_SUCCESS(rv, rv);
+  uint32_t startOffset = 0;
+  if (NS_WARN_IF(NS_FAILED(SetRawRangeFromFlatTextOffset(
+          &rawRange, aEvent->mInput.mOffset, aEvent->mInput.mLength,
+          lineBreakType, false, &startOffset)))) {
+    return NS_ERROR_FAILURE;
+  }
 
-  rv = GenerateFlatTextContent(rawRange, aEvent->mReply.mString, lineBreakType);
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsString textInRange;
+  if (NS_WARN_IF(NS_FAILED(
+          GenerateFlatTextContent(rawRange, textInRange, lineBreakType)))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aEvent->mReply->mOffsetAndData.emplace(startOffset, textInRange,
+                                         OffsetAndDataFor::EditorString);
 
   if (aEvent->mWithFontRanges) {
     uint32_t fontRangeLength;
-    rv = GenerateFlatFontRanges(rawRange, aEvent->mReply.mFontRanges,
-                                fontRangeLength, lineBreakType);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+    if (NS_WARN_IF(NS_FAILED(
+            GenerateFlatFontRanges(rawRange, aEvent->mReply->mFontRanges,
+                                   fontRangeLength, lineBreakType)))) {
+      return NS_ERROR_FAILURE;
     }
 
-    MOZ_ASSERT(fontRangeLength == aEvent->mReply.mString.Length(),
+    MOZ_ASSERT(fontRangeLength == aEvent->mReply->DataLength(),
                "Font ranges doesn't match the string");
   }
 
-  aEvent->mSucceeded = true;
-
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -1803,6 +1824,8 @@
     return rv;
   }
 
+  MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
+
   LineBreakType lineBreakType = GetLineBreakType(aEvent);
   const uint32_t kBRLength = GetBRLength(lineBreakType);
 
@@ -2037,7 +2060,7 @@
       // return non-empty rect.
       EnsureNonEmptyRect(rect);
 
-      aEvent->mReply.mRectArray.AppendElement(rect);
+      aEvent->mReply->mRectArray.AppendElement(rect);
       offset++;
 
       // If it's not a line breaker or the line breaker length is same as
@@ -2066,7 +2089,7 @@
       // append same rect for "\n" too because querying rect of "\r" and "\n"
       // should return same rect.  E.g., IME may query previous character's
       // rect of first character of a line.
-      aEvent->mReply.mRectArray.AppendElement(rect);
+      aEvent->mReply->mRectArray.AppendElement(rect);
       offset++;
     }
   }
@@ -2077,12 +2100,12 @@
   // deciding the position of a popup window (e.g., suggest window for next
   // word).  Note that when this method hasn't appended character rects, it
   // means that the offset is too large or the query range is collapsed.
-  if (offset < kEndOffset || aEvent->mReply.mRectArray.IsEmpty()) {
+  if (offset < kEndOffset || aEvent->mReply->mRectArray.IsEmpty()) {
     // If we've already retrieved some character rects before current offset,
     // we can guess the last rect from the last character's rect unless it's a
     // line breaker.  (If it's a line breaker, the caret rect is in next line.)
-    if (!aEvent->mReply.mRectArray.IsEmpty() && !wasLineBreaker) {
-      rect = aEvent->mReply.mRectArray.LastElement();
+    if (!aEvent->mReply->mRectArray.IsEmpty() && !wasLineBreaker) {
+      rect = aEvent->mReply->mRectArray.LastElement();
       if (isVertical) {
         rect.y = rect.YMost() + 1;
         rect.height = 1;
@@ -2092,57 +2115,64 @@
         rect.width = 1;
         MOZ_ASSERT(rect.height);
       }
-      aEvent->mReply.mRectArray.AppendElement(rect);
+      aEvent->mReply->mRectArray.AppendElement(rect);
     } else {
       // Note that don't use eQueryCaretRect here because if caret is at the
       // end of the content, it returns actual caret rect instead of computing
       // the rect itself.  It means that the result depends on caret position.
       // So, we shouldn't use it for consistency result in automated tests.
-      WidgetQueryContentEvent queryTextRect(eQueryTextRect, *aEvent);
+      WidgetQueryContentEvent queryTextRectEvent(eQueryTextRect, *aEvent);
       WidgetQueryContentEvent::Options options(*aEvent);
-      queryTextRect.InitForQueryTextRect(offset, 1, options);
-      rv = OnQueryTextRect(&queryTextRect);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-      if (NS_WARN_IF(!queryTextRect.mSucceeded)) {
+      queryTextRectEvent.InitForQueryTextRect(offset, 1, options);
+      if (NS_WARN_IF(NS_FAILED(OnQueryTextRect(&queryTextRectEvent))) ||
+          NS_WARN_IF(queryTextRectEvent.Failed())) {
         return NS_ERROR_FAILURE;
       }
-      MOZ_ASSERT(!queryTextRect.mReply.mRect.IsEmpty());
-      if (queryTextRect.mReply.mWritingMode.IsVertical()) {
-        queryTextRect.mReply.mRect.height = 1;
+      if (queryTextRectEvent.mReply->mWritingMode.IsVertical()) {
+        queryTextRectEvent.mReply->mRect.height = 1;
       } else {
-        queryTextRect.mReply.mRect.width = 1;
+        queryTextRectEvent.mReply->mRect.width = 1;
       }
-      aEvent->mReply.mRectArray.AppendElement(queryTextRect.mReply.mRect);
+      aEvent->mReply->mRectArray.AppendElement(
+          queryTextRectEvent.mReply->mRect);
     }
   }
 
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
 nsresult ContentEventHandler::OnQueryTextRect(WidgetQueryContentEvent* aEvent) {
-  nsresult rv = Init(aEvent);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
   // If mLength is 0 (this may be caused by bug of native IME), we should
   // redirect this event to OnQueryCaretRect().
   if (!aEvent->mInput.mLength) {
     return OnQueryCaretRect(aEvent);
   }
 
+  nsresult rv = Init(aEvent);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
+
   LineBreakType lineBreakType = GetLineBreakType(aEvent);
   RawRange rawRange;
   nsCOMPtr<nsIContent> lastTextContent;
-  rv = SetRawRangeFromFlatTextOffset(
-      &rawRange, aEvent->mInput.mOffset, aEvent->mInput.mLength, lineBreakType,
-      true, &aEvent->mReply.mOffset, getter_AddRefs(lastTextContent));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = GenerateFlatTextContent(rawRange, aEvent->mReply.mString, lineBreakType);
-  NS_ENSURE_SUCCESS(rv, rv);
+  uint32_t startOffset = 0;
+  if (NS_WARN_IF(NS_FAILED(SetRawRangeFromFlatTextOffset(
+          &rawRange, aEvent->mInput.mOffset, aEvent->mInput.mLength,
+          lineBreakType, true, &startOffset,
+          getter_AddRefs(lastTextContent))))) {
+    return NS_ERROR_FAILURE;
+  }
+  nsString string;
+  if (NS_WARN_IF(NS_FAILED(
+          GenerateFlatTextContent(rawRange, string, lineBreakType)))) {
+    return NS_ERROR_FAILURE;
+  }
+  aEvent->mReply->mOffsetAndData.emplace(startOffset, string,
+                                         OffsetAndDataFor::EditorString);
 
   // used to iterate over all contents and their frames
   PostContentIterator postOrderIter;
@@ -2209,7 +2239,7 @@
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
-      aEvent->mReply.mWritingMode = lastFrame->GetWritingMode();
+      aEvent->mReply->mWritingMode = lastFrame->GetWritingMode();
     }
     // Otherwise, if there are no contents in mRootContent, guess caret rect in
     // its frame (with its font height and content box).
@@ -2228,19 +2258,19 @@
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
-      aEvent->mReply.mWritingMode = rootContentFrame->GetWritingMode();
+      aEvent->mReply->mWritingMode = rootContentFrame->GetWritingMode();
     }
-    aEvent->mReply.mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
+    aEvent->mReply->mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
         rect, presContext->AppUnitsPerDevPixel());
     if (nsPresContext* rootContext =
             presContext->GetInProcessRootContentDocumentPresContext()) {
-      aEvent->mReply.mRect =
+      aEvent->mReply->mRect =
           RoundedOut(ViewportUtils::DocumentRelativeLayoutToVisual(
-              aEvent->mReply.mRect, rootContext->PresShell()));
+              aEvent->mReply->mRect, rootContext->PresShell()));
     }
+    EnsureNonEmptyRect(aEvent->mReply->mRect);
 
-    EnsureNonEmptyRect(aEvent->mReply.mRect);
-    aEvent->mSucceeded = true;
+    MOZ_ASSERT(aEvent->Succeeded());
     return NS_OK;
   }
 
@@ -2420,19 +2450,20 @@
   }
 
   nsPresContext* presContext = lastFrame->PresContext();
-  aEvent->mReply.mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
+  aEvent->mReply->mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
       rect, presContext->AppUnitsPerDevPixel());
   if (nsPresContext* rootContext =
           presContext->GetInProcessRootContentDocumentPresContext()) {
-    aEvent->mReply.mRect =
+    aEvent->mReply->mRect =
         RoundedOut(ViewportUtils::DocumentRelativeLayoutToVisual(
-            aEvent->mReply.mRect, rootContext->PresShell()));
+            aEvent->mReply->mRect, rootContext->PresShell()));
   }
   // Returning empty rect may cause native IME confused, let's make sure to
   // return non-empty rect.
-  EnsureNonEmptyRect(aEvent->mReply.mRect);
-  aEvent->mReply.mWritingMode = lastFrame->GetWritingMode();
-  aEvent->mSucceeded = true;
+  EnsureNonEmptyRect(aEvent->mReply->mRect);
+  aEvent->mReply->mWritingMode = lastFrame->GetWritingMode();
+
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -2444,9 +2475,13 @@
   }
 
   nsIContent* focusedContent = GetFocusedContent();
-  rv = QueryContentRect(
-      IsPlugin(focusedContent) ? focusedContent : mRootContent.get(), aEvent);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_WARN_IF(NS_FAILED(QueryContentRect(
+          IsPlugin(focusedContent) ? focusedContent : mRootContent.get(),
+          aEvent)))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -2471,20 +2506,23 @@
         rv = ConvertToRootRelativeOffset(caretFrame, caretRect);
         NS_ENSURE_SUCCESS(rv, rv);
         nsPresContext* presContext = caretFrame->PresContext();
-        aEvent->mReply.mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
+        aEvent->mReply->mRect = LayoutDeviceIntRect::FromAppUnitsToOutside(
             caretRect, presContext->AppUnitsPerDevPixel());
         if (nsPresContext* rootContext =
                 presContext->GetInProcessRootContentDocumentPresContext()) {
-          aEvent->mReply.mRect =
+          aEvent->mReply->mRect =
               RoundedOut(ViewportUtils::DocumentRelativeLayoutToVisual(
-                  aEvent->mReply.mRect, rootContext->PresShell()));
+                  aEvent->mReply->mRect, rootContext->PresShell()));
         }
         // Returning empty rect may cause native IME confused, let's make sure
         // to return non-empty rect.
-        EnsureNonEmptyRect(aEvent->mReply.mRect);
-        aEvent->mReply.mWritingMode = caretFrame->GetWritingMode();
-        aEvent->mReply.mOffset = aEvent->mInput.mOffset;
-        aEvent->mSucceeded = true;
+        EnsureNonEmptyRect(aEvent->mReply->mRect);
+        aEvent->mReply->mWritingMode = caretFrame->GetWritingMode();
+        aEvent->mReply->mOffsetAndData.emplace(
+            aEvent->mInput.mOffset, EmptyString(),
+            OffsetAndDataFor::SelectedString);
+
+        MOZ_ASSERT(aEvent->Succeeded());
         return NS_OK;
       }
     }
@@ -2494,30 +2532,33 @@
   WidgetQueryContentEvent queryTextRectEvent(eQueryTextRect, *aEvent);
   WidgetQueryContentEvent::Options options(*aEvent);
   queryTextRectEvent.InitForQueryTextRect(aEvent->mInput.mOffset, 1, options);
-  rv = OnQueryTextRect(&queryTextRectEvent);
-  if (NS_WARN_IF(NS_FAILED(rv)) || NS_WARN_IF(!queryTextRectEvent.mSucceeded)) {
+  if (NS_WARN_IF(NS_FAILED(OnQueryTextRect(&queryTextRectEvent))) ||
+      NS_WARN_IF(queryTextRectEvent.Failed())) {
     return NS_ERROR_FAILURE;
   }
-  queryTextRectEvent.mReply.mString.Truncate();
-  aEvent->mReply = queryTextRectEvent.mReply;
-  if (aEvent->GetWritingMode().IsVertical()) {
-    aEvent->mReply.mRect.height = 1;
+  queryTextRectEvent.mReply->TruncateData();
+  aEvent->mReply->mOffsetAndData =
+      std::move(queryTextRectEvent.mReply->mOffsetAndData);
+  aEvent->mReply->mRect = std::move(queryTextRectEvent.mReply->mRect);
+  aEvent->mReply->mWritingMode =
+      std::move(queryTextRectEvent.mReply->mWritingMode);
+  if (aEvent->mReply->WritingModeRef().IsVertical()) {
+    aEvent->mReply->mRect.height = 1;
   } else {
-    aEvent->mReply.mRect.width = 1;
+    aEvent->mReply->mRect.width = 1;
   }
-  // Returning empty rect may cause native IME confused, let's make sure to
-  // return non-empty rect.
-  aEvent->mSucceeded = true;
+
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
 nsresult ContentEventHandler::OnQueryContentState(
     WidgetQueryContentEvent* aEvent) {
-  nsresult rv = Init(aEvent);
-  if (NS_FAILED(rv)) {
-    return rv;
+  if (NS_FAILED(Init(aEvent))) {
+    return NS_ERROR_FAILURE;
   }
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->mReply.isSome());
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -2528,17 +2569,20 @@
     return rv;
   }
 
-  if (!aEvent->mReply.mHasSelection) {
-    aEvent->mSucceeded = true;
-    aEvent->mReply.mTransferable = nullptr;
+  MOZ_ASSERT(aEvent->mReply.isSome());
+
+  if (!aEvent->mReply->mHasSelection) {
+    MOZ_ASSERT(!aEvent->mReply->mTransferable);
     return NS_OK;
   }
 
-  rv = nsCopySupport::GetTransferableForSelection(
-      mSelection, mDocument, getter_AddRefs(aEvent->mReply.mTransferable));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (NS_WARN_IF(NS_FAILED(nsCopySupport::GetTransferableForSelection(
+          mSelection, mDocument,
+          getter_AddRefs(aEvent->mReply->mTransferable))))) {
+    return NS_ERROR_FAILURE;
+  }
 
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -2549,8 +2593,8 @@
     return rv;
   }
 
-  aEvent->mReply.mOffset = aEvent->mReply.mTentativeCaretOffset =
-      WidgetQueryContentEvent::NOT_FOUND;
+  MOZ_ASSERT(aEvent->mReply->mOffsetAndData.isNothing());
+  MOZ_ASSERT(aEvent->mReply->mTentativeCaretOffset.isNothing());
 
   PresShell* presShell = mDocument->GetPresShell();
   NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
@@ -2571,22 +2615,25 @@
     NS_ENSURE_TRUE(rootWidget, NS_ERROR_FAILURE);
   }
 
-  WidgetQueryContentEvent eventOnRoot(true, eQueryCharacterAtPoint, rootWidget);
-  eventOnRoot.mUseNativeLineBreak = aEvent->mUseNativeLineBreak;
-  eventOnRoot.mRefPoint = aEvent->mRefPoint;
+  WidgetQueryContentEvent queryCharAtPointOnRootWidgetEvent(
+      true, eQueryCharacterAtPoint, rootWidget);
+  queryCharAtPointOnRootWidgetEvent.mUseNativeLineBreak =
+      aEvent->mUseNativeLineBreak;
+  queryCharAtPointOnRootWidgetEvent.mRefPoint = aEvent->mRefPoint;
   if (rootWidget != aEvent->mWidget) {
-    eventOnRoot.mRefPoint += aEvent->mWidget->WidgetToScreenOffset() -
-                             rootWidget->WidgetToScreenOffset();
+    queryCharAtPointOnRootWidgetEvent.mRefPoint +=
+        aEvent->mWidget->WidgetToScreenOffset() -
+        rootWidget->WidgetToScreenOffset();
   }
   nsPoint ptInRoot = nsLayoutUtils::GetEventCoordinatesRelativeTo(
-      &eventOnRoot, RelativeTo{rootFrame});
+      &queryCharAtPointOnRootWidgetEvent, RelativeTo{rootFrame});
 
   nsIFrame* targetFrame =
       nsLayoutUtils::GetFrameForPoint(RelativeTo{rootFrame}, ptInRoot);
   if (!targetFrame || !targetFrame->GetContent() ||
       !targetFrame->GetContent()->IsInclusiveDescendantOf(mRootContent)) {
     // There is no character at the point.
-    aEvent->mSucceeded = true;
+    MOZ_ASSERT(aEvent->Succeeded());
     return NS_OK;
   }
   nsPoint ptInTarget = ptInRoot + rootFrame->GetOffsetToCrossDoc(targetFrame);
@@ -2599,53 +2646,49 @@
   if (!tentativeCaretOffsets.content ||
       !tentativeCaretOffsets.content->IsInclusiveDescendantOf(mRootContent)) {
     // There is no character nor tentative caret point at the point.
-    aEvent->mSucceeded = true;
+    MOZ_ASSERT(aEvent->Succeeded());
     return NS_OK;
   }
 
-  rv = GetFlatTextLengthInRange(
-      NodePosition(mRootContent, 0), NodePosition(tentativeCaretOffsets),
-      mRootContent, &aEvent->mReply.mTentativeCaretOffset,
-      GetLineBreakType(aEvent));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+  uint32_t tentativeCaretOffset = 0;
+  if (NS_WARN_IF(NS_FAILED(GetFlatTextLengthInRange(
+          NodePosition(mRootContent, 0), NodePosition(tentativeCaretOffsets),
+          mRootContent, &tentativeCaretOffset, GetLineBreakType(aEvent))))) {
+    return NS_ERROR_FAILURE;
   }
 
+  aEvent->mReply->mTentativeCaretOffset.emplace(tentativeCaretOffset);
   if (!targetFrame->IsTextFrame()) {
     // There is no character at the point but there is tentative caret point.
-    aEvent->mSucceeded = true;
+    MOZ_ASSERT(aEvent->Succeeded());
     return NS_OK;
   }
 
-  MOZ_ASSERT(aEvent->mReply.mTentativeCaretOffset !=
-                 WidgetQueryContentEvent::NOT_FOUND,
-             "The point is inside a character bounding box.  Why tentative "
-             "caret point "
-             "hasn't been found?");
-
   nsTextFrame* textframe = static_cast<nsTextFrame*>(targetFrame);
   nsIFrame::ContentOffsets contentOffsets =
       textframe->GetCharacterOffsetAtFramePoint(ptInTarget);
   NS_ENSURE_TRUE(contentOffsets.content, NS_ERROR_FAILURE);
-  uint32_t offset;
-  rv = GetFlatTextLengthInRange(NodePosition(mRootContent, 0),
-                                NodePosition(contentOffsets), mRootContent,
-                                &offset, GetLineBreakType(aEvent));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+  uint32_t offset = 0;
+  if (NS_WARN_IF(NS_FAILED(GetFlatTextLengthInRange(
+          NodePosition(mRootContent, 0), NodePosition(contentOffsets),
+          mRootContent, &offset, GetLineBreakType(aEvent))))) {
+    return NS_ERROR_FAILURE;
   }
 
-  WidgetQueryContentEvent textRect(true, eQueryTextRect, aEvent->mWidget);
+  WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect,
+                                             aEvent->mWidget);
   WidgetQueryContentEvent::Options options(*aEvent);
-  textRect.InitForQueryTextRect(offset, 1, options);
-  rv = OnQueryTextRect(&textRect);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(textRect.mSucceeded, NS_ERROR_FAILURE);
+  queryTextRectEvent.InitForQueryTextRect(offset, 1, options);
+  if (NS_WARN_IF(NS_FAILED(OnQueryTextRect(&queryTextRectEvent))) ||
+      NS_WARN_IF(queryTextRectEvent.Failed())) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aEvent->mReply->mOffsetAndData =
+      std::move(queryTextRectEvent.mReply->mOffsetAndData);
+  aEvent->mReply->mRect = queryTextRectEvent.mReply->mRect;
 
-  // currently, we don't need to get the actual text.
-  aEvent->mReply.mOffset = offset;
-  aEvent->mReply.mRect = textRect.mReply.mRect;
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
@@ -2658,8 +2701,7 @@
     return rv;
   }
 
-  aEvent->mSucceeded = false;
-  aEvent->mReply.mWidgetIsHit = false;
+  aEvent->mReply->mWidgetIsHit = false;
 
   NS_ENSURE_TRUE(aEvent->mWidget, NS_ERROR_FAILURE);
 
@@ -2689,11 +2731,11 @@
       targetWidget = targetFrame->GetNearestWidget();
     }
     if (aEvent->mWidget == targetWidget) {
-      aEvent->mReply.mWidgetIsHit = true;
+      aEvent->mReply->mWidgetIsHit = true;
     }
   }
 
-  aEvent->mSucceeded = true;
+  MOZ_ASSERT(aEvent->Succeeded());
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/dom/events/CustomEvent.cpp firefox-85.0+build1/dom/events/CustomEvent.cpp
--- firefox-84.0.2+build1/dom/events/CustomEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/CustomEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/CustomEventBinding.h"
 
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsContentUtils.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/events/CustomEvent.h firefox-85.0+build1/dom/events/CustomEvent.h
--- firefox-84.0.2+build1/dom/events/CustomEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/CustomEvent.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef CustomEvent_h__
 #define CustomEvent_h__
 
+#include "js/Value.h"
 #include "mozilla/dom/Event.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/events/DataTransfer.cpp firefox-85.0+build1/dom/events/DataTransfer.cpp
--- firefox-84.0.2+build1/dom/events/DataTransfer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/DataTransfer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -41,6 +41,7 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/OSFileSystem.h"
 #include "mozilla/dom/Promise.h"
+#include "nsComponentManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/events/DataTransferItem.cpp firefox-85.0+build1/dom/events/DataTransferItem.cpp
--- firefox-84.0.2+build1/dom/events/DataTransferItem.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/DataTransferItem.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,18 +11,23 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/DataTransferItemBinding.h"
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/FileSystem.h"
 #include "mozilla/dom/FileSystemDirectoryEntry.h"
 #include "mozilla/dom/FileSystemFileEntry.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIClipboard.h"
+#include "nsIFile.h"
+#include "nsIInputStream.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsNetUtil.h"
 #include "nsQueryObject.h"
 #include "nsContentUtils.h"
+#include "nsThreadUtils.h"
 #include "nsVariant.h"
 
 namespace {
diff -Nru firefox-84.0.2+build1/dom/events/DataTransferItem.h firefox-85.0+build1/dom/events/DataTransferItem.h
--- firefox-84.0.2+build1/dom/events/DataTransferItem.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/DataTransferItem.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,12 +7,13 @@
 #ifndef mozilla_dom_DataTransferItem_h
 #define mozilla_dom_DataTransferItem_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/File.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystemEntry;
diff -Nru firefox-84.0.2+build1/dom/events/DOMEventTargetHelper.cpp firefox-85.0+build1/dom/events/DOMEventTargetHelper.cpp
--- firefox-84.0.2+build1/dom/events/DOMEventTargetHelper.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/DOMEventTargetHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,13 +7,12 @@
 #include "nsContentUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/Sprintf.h"
-#include "nsGlobalWindow.h"
 #include "mozilla/dom/Event.h"
-#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/Likely.h"
+#include "MainThreadUtils.h"
 
 namespace mozilla {
 
@@ -87,6 +86,42 @@
 NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_LAST_RELEASE(DOMEventTargetHelper,
                                                    LastRelease())
 
+DOMEventTargetHelper::DOMEventTargetHelper()
+    : mParentObject(nullptr),
+      mOwnerWindow(nullptr),
+      mHasOrHasHadOwnerWindow(false),
+      mIsKeptAlive(false) {}
+
+DOMEventTargetHelper::DOMEventTargetHelper(nsPIDOMWindowInner* aWindow)
+    : mParentObject(nullptr),
+      mOwnerWindow(nullptr),
+      mHasOrHasHadOwnerWindow(false),
+      mIsKeptAlive(false) {
+  nsIGlobalObject* global = aWindow ? aWindow->AsGlobal() : nullptr;
+  BindToOwner(global);
+}
+
+DOMEventTargetHelper::DOMEventTargetHelper(nsIGlobalObject* aGlobalObject)
+    : mParentObject(nullptr),
+      mOwnerWindow(nullptr),
+      mHasOrHasHadOwnerWindow(false),
+      mIsKeptAlive(false) {
+  BindToOwner(aGlobalObject);
+}
+
+DOMEventTargetHelper::DOMEventTargetHelper(DOMEventTargetHelper* aOther)
+    : mParentObject(nullptr),
+      mOwnerWindow(nullptr),
+      mHasOrHasHadOwnerWindow(false),
+      mIsKeptAlive(false) {
+  if (!aOther) {
+    BindToOwner(static_cast<nsIGlobalObject*>(nullptr));
+    return;
+  }
+  BindToOwner(aOther->GetParentObject());
+  mHasOrHasHadOwnerWindow = aOther->HasOrHasHadOwner();
+}
+
 DOMEventTargetHelper::~DOMEventTargetHelper() {
   if (mParentObject) {
     mParentObject->RemoveEventTargetObject(this);
@@ -310,4 +345,12 @@
   return NS_OK;
 }
 
+bool DOMEventTargetHelper::HasListenersFor(const nsAString& aType) const {
+  return mListenerManager && mListenerManager->HasListenersFor(aType);
+}
+
+bool DOMEventTargetHelper::HasListenersFor(nsAtom* aTypeWithOn) const {
+  return mListenerManager && mListenerManager->HasListenersFor(aTypeWithOn);
+}
+
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/events/DOMEventTargetHelper.h firefox-85.0+build1/dom/events/DOMEventTargetHelper.h
--- firefox-84.0.2+build1/dom/events/DOMEventTargetHelper.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/DOMEventTargetHelper.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,21 +7,33 @@
 #ifndef mozilla_DOMEventTargetHelper_h_
 #define mozilla_DOMEventTargetHelper_h_
 
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/EventTarget.h"
+#include "mozilla/LinkedList.h"
+#include "mozilla/RefPtr.h"
+#include "nsAtom.h"
 #include "nsCOMPtr.h"
-#include "nsGkAtoms.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsPIDOMWindow.h"
+#include "nsDebug.h"
+#include "nsGkAtoms.h"
+#include "nsID.h"
+#include "nsIGlobalObject.h"
 #include "nsIScriptGlobalObject.h"
-#include "nsIScriptContext.h"
-#include "MainThreadUtils.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/EventListenerManager.h"
-#include "mozilla/LinkedList.h"
-#include "mozilla/dom/EventTarget.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+#include "nsPIDOMWindow.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+
+class nsCycleCollectionTraversalCallback;
 
 namespace mozilla {
 
 class ErrorResult;
+class EventChainPostVisitor;
+class EventChainPreVisitor;
+class EventListenerManager;
 
 namespace dom {
 class Document;
@@ -38,38 +50,10 @@
 class DOMEventTargetHelper : public dom::EventTarget,
                              public LinkedListElement<DOMEventTargetHelper> {
  public:
-  DOMEventTargetHelper()
-      : mParentObject(nullptr),
-        mOwnerWindow(nullptr),
-        mHasOrHasHadOwnerWindow(false),
-        mIsKeptAlive(false) {}
-  explicit DOMEventTargetHelper(nsPIDOMWindowInner* aWindow)
-      : mParentObject(nullptr),
-        mOwnerWindow(nullptr),
-        mHasOrHasHadOwnerWindow(false),
-        mIsKeptAlive(false) {
-    nsIGlobalObject* global = aWindow ? aWindow->AsGlobal() : nullptr;
-    BindToOwner(global);
-  }
-  explicit DOMEventTargetHelper(nsIGlobalObject* aGlobalObject)
-      : mParentObject(nullptr),
-        mOwnerWindow(nullptr),
-        mHasOrHasHadOwnerWindow(false),
-        mIsKeptAlive(false) {
-    BindToOwner(aGlobalObject);
-  }
-  explicit DOMEventTargetHelper(DOMEventTargetHelper* aOther)
-      : mParentObject(nullptr),
-        mOwnerWindow(nullptr),
-        mHasOrHasHadOwnerWindow(false),
-        mIsKeptAlive(false) {
-    if (!aOther) {
-      BindToOwner(static_cast<nsIGlobalObject*>(nullptr));
-      return;
-    }
-    BindToOwner(aOther->GetParentObject());
-    mHasOrHasHadOwnerWindow = aOther->HasOrHasHadOwner();
-  }
+  DOMEventTargetHelper();
+  explicit DOMEventTargetHelper(nsPIDOMWindowInner* aWindow);
+  explicit DOMEventTargetHelper(nsIGlobalObject* aGlobalObject);
+  explicit DOMEventTargetHelper(DOMEventTargetHelper* aOther);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(DOMEventTargetHelper)
@@ -113,13 +97,9 @@
     return static_cast<DOMEventTargetHelper*>(target);
   }
 
-  bool HasListenersFor(const nsAString& aType) const {
-    return mListenerManager && mListenerManager->HasListenersFor(aType);
-  }
+  bool HasListenersFor(const nsAString& aType) const;
 
-  bool HasListenersFor(nsAtom* aTypeWithOn) const {
-    return mListenerManager && mListenerManager->HasListenersFor(aTypeWithOn);
-  }
+  bool HasListenersFor(nsAtom* aTypeWithOn) const;
 
   virtual nsPIDOMWindowOuter* GetOwnerGlobalForBindingsInternal() override {
     return nsPIDOMWindowOuter::GetFromCurrentInner(GetOwner());
diff -Nru firefox-84.0.2+build1/dom/events/EventDispatcher.cpp firefox-85.0+build1/dom/events/EventDispatcher.cpp
--- firefox-84.0.2+build1/dom/events/EventDispatcher.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventDispatcher.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -894,10 +894,10 @@
 
   // Create visitor object and start event dispatching.
   // GetEventTargetParent for the original target.
-  nsEventStatus status =
-      aDOMEvent && aDOMEvent->DefaultPrevented()
-          ? nsEventStatus_eConsumeNoDefault
-          : aEventStatus ? *aEventStatus : nsEventStatus_eIgnore;
+  nsEventStatus status = aDOMEvent && aDOMEvent->DefaultPrevented()
+                             ? nsEventStatus_eConsumeNoDefault
+                         : aEventStatus ? *aEventStatus
+                                        : nsEventStatus_eIgnore;
   nsCOMPtr<EventTarget> targetForPreVisitor = aEvent->mTarget;
   EventChainPreVisitor preVisitor(aPresContext, aEvent, aDOMEvent, status,
                                   isInAnon, targetForPreVisitor);
@@ -1039,10 +1039,6 @@
 
           struct DOMEventMarker {
             static constexpr Span<const char> MarkerTypeName() {
-              // Note: DOMEventMarkerPayload was originally a sub-class of
-              // TracingMarkerPayload, so it uses the same payload type.
-              // TODO: Change to its own distinct type, but this will require
-              // front-end changes.
               return MakeStringSpan("DOMEvent");
             }
             static void StreamJSONMarkerData(
@@ -1099,14 +1095,10 @@
           if (aPresContext && aPresContext->GetRootPresContext()) {
             nsRefreshDriver* driver =
                 aPresContext->GetRootPresContext()->RefreshDriver();
-            if (driver && driver->ViewManagerFlushIsPending()) {
-              nsIWidget* widget = aPresContext->GetRootWidget();
-              layers::LayerManager* lm =
-                  widget ? widget->GetLayerManager() : nullptr;
-              if (lm) {
-                lm->RegisterPayload({layers::CompositionPayloadType::eKeyPress,
-                                     aEvent->mTimeStamp});
-              }
+            if (driver && driver->HasPendingTick()) {
+              driver->RegisterCompositionPayload(
+                  {layers::CompositionPayloadType::eKeyPress,
+                   aEvent->mTimeStamp});
             }
           }
         }
diff -Nru firefox-84.0.2+build1/dom/events/Event.h firefox-85.0+build1/dom/events/Event.h
--- firefox-84.0.2+build1/dom/events/Event.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/Event.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,24 +7,33 @@
 #ifndef mozilla_dom_Event_h_
 #define mozilla_dom_Event_h_
 
+#include <cstdint>
+#include "Units.h"
+#include "js/TypeDecls.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/BasicEvents.h"
-#include "nsISupports.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "nsCOMPtr.h"
-#include "nsPIDOMWindow.h"
-#include "nsPoint.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/EventBinding.h"
-#include "mozilla/dom/PopupBlocker.h"
-#include "nsIScriptGlobalObject.h"
-#include "Units.h"
-#include "js/TypeDecls.h"
-#include "nsIGlobalObject.h"
+#include "nsID.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsWrapperCache.h"
+
+// XXX(Bug 1674080) Remove this and let Codegen.py generate it instead when
+// needed.
+#include "mozilla/HoldDropJSObjects.h"
 
+class PickleIterator;
+class nsCycleCollectionTraversalCallback;
 class nsIContent;
+class nsIGlobalObject;
+class nsIPrincipal;
+class nsPIDOMWindowInner;
 class nsPresContext;
-class PickleIterator;
 
 namespace IPC {
 class Message;
@@ -35,6 +44,7 @@
 
 class BeforeUnloadEvent;
 class CustomEvent;
+class Document;
 class DragEvent;
 class EventTarget;
 class EventMessageAutoOverride;
@@ -47,6 +57,8 @@
 class UIEvent;
 class WantsPopupControlCheck;
 class XULCommandEvent;
+struct EventInit;
+
 #define GENERATED_EVENT(EventClass_) class EventClass_;
 #include "mozilla/dom/GeneratedEventList.h"
 #undef GENERATED_EVENT
diff -Nru firefox-84.0.2+build1/dom/events/EventListenerManager.cpp firefox-85.0+build1/dom/events/EventListenerManager.cpp
--- firefox-84.0.2+build1/dom/events/EventListenerManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventListenerManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -30,6 +30,7 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/TouchEvent.h"
 #include "mozilla/dom/UserActivation.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/TimelineConsumers.h"
 #include "mozilla/EventTimelineMarker.h"
 #include "mozilla/TimeStamp.h"
@@ -277,7 +278,7 @@
       if (doc &&
           !(aFlags.mInSystemGroup &&
             doc->DontWarnAboutMutationEventsAndAllowSlowDOMMutations())) {
-        doc->WarnOnceAbout(Document::eMutationEvent);
+        doc->WarnOnceAbout(DeprecatedOperations::eMutationEvent);
       }
       // If aEventMessage is eLegacySubtreeModified, we need to listen all
       // mutations. nsContentUtils::HasMutationListeners relies on this.
diff -Nru firefox-84.0.2+build1/dom/events/EventListenerService.cpp firefox-85.0+build1/dom/events/EventListenerService.cpp
--- firefox-84.0.2+build1/dom/events/EventListenerService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventListenerService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,12 +8,15 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/JSEventHandler.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventListenerBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsArrayUtils.h"
 #include "nsCOMArray.h"
+#include "nsINode.h"
 #include "nsJSUtils.h"
 #include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/events/EventStateManager.cpp firefox-85.0+build1/dom/events/EventStateManager.cpp
--- firefox-84.0.2+build1/dom/events/EventStateManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventStateManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ScrollTypes.h"
 #include "mozilla/TextComposition.h"
 #include "mozilla/TextEditor.h"
@@ -32,11 +33,13 @@
 #include "mozilla/dom/FrameLoaderBinding.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/PointerEventHandler.h"
 #include "mozilla/dom/UIEvent.h"
 #include "mozilla/dom/UIEventBinding.h"
 #include "mozilla/dom/UserActivation.h"
 #include "mozilla/dom/WheelEventBinding.h"
 #include "mozilla/StaticPrefs_accessibility.h"
+#include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/StaticPrefs_mousewheel.h"
@@ -854,11 +857,14 @@
         // If the event is trusted event, set the selected text to data of
         // composition event.
         WidgetCompositionEvent* compositionEvent = aEvent->AsCompositionEvent();
-        WidgetQueryContentEvent selectedText(true, eQuerySelectedText,
-                                             compositionEvent->mWidget);
-        HandleQueryContentEvent(&selectedText);
-        NS_ASSERTION(selectedText.mSucceeded, "Failed to get selected text");
-        compositionEvent->mData = selectedText.mReply.mString;
+        WidgetQueryContentEvent querySelectedTextEvent(
+            true, eQuerySelectedText, compositionEvent->mWidget);
+        HandleQueryContentEvent(&querySelectedTextEvent);
+        if (querySelectedTextEvent.FoundSelection()) {
+          compositionEvent->mData = querySelectedTextEvent.mReply->DataRef();
+        }
+        NS_ASSERTION(querySelectedTextEvent.Succeeded(),
+                     "Failed to get selected text");
       }
       break;
     case eTouchStart:
@@ -1080,7 +1086,8 @@
         if (shouldActivate) {
           focusChanged =
               element->PerformAccesskey(shouldActivate, aIsTrustedEvent);
-        } else if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
+        } else if (RefPtr<nsFocusManager> fm =
+                       nsFocusManager::GetFocusManager()) {
           fm->SetFocus(element, nsIFocusManager::FLAG_BYKEY);
           focusChanged = true;
         }
@@ -3342,8 +3349,7 @@
 
         MOZ_ASSERT_IF(newFocus, newFocus->IsElement());
 
-        nsFocusManager* fm = nsFocusManager::GetFocusManager();
-        if (fm) {
+        if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
           // if something was found to focus, focus it. Otherwise, if the
           // element that was clicked doesn't have -moz-user-focus: ignore,
           // clear the existing focus. For -moz-user-focus: ignore, the focus
@@ -3364,7 +3370,7 @@
                 MouseEvent_Binding::MOZ_SOURCE_TOUCH) {
               flags |= nsIFocusManager::FLAG_BYTOUCH;
             }
-            fm->SetFocus(newFocus->AsElement(), flags);
+            fm->SetFocus(MOZ_KnownLive(newFocus->AsElement()), flags);
           } else if (!suppressBlur) {
             // clear the focus within the frame and then set it as the
             // focused frame
@@ -4411,21 +4417,19 @@
                                        nsIContent* aMovingInto) {
   RefPtr<OverOutElementsWrapper> wrapper = GetWrapperByEventID(aMouseEvent);
 
-  if (!wrapper || !wrapper->mLastOverElement) return;
+  if (!wrapper || !wrapper->mLastOverElement) {
+    return;
+  }
   // Before firing mouseout, check for recursion
-  if (wrapper->mLastOverElement == wrapper->mFirstOutEventElement) return;
-
-  if (wrapper->mLastOverFrame) {
-    // if the frame is associated with a subdocument,
-    // tell the subdocument that we're moving out of it
-    nsSubDocumentFrame* subdocFrame =
-        do_QueryFrame(wrapper->mLastOverFrame.GetFrame());
-    if (subdocFrame) {
-      nsIDocShell* docshell = subdocFrame->GetDocShell();
-      if (docshell) {
-        RefPtr<nsPresContext> presContext = docshell->GetPresContext();
+  if (wrapper->mLastOverElement == wrapper->mFirstOutEventElement) {
+    return;
+  }
 
-        if (presContext) {
+  if (RefPtr<nsFrameLoaderOwner> flo =
+          do_QueryObject(wrapper->mLastOverElement)) {
+    if (BrowsingContext* bc = flo->GetExtantBrowsingContext()) {
+      if (nsIDocShell* docshell = bc->GetDocShell()) {
+        if (RefPtr<nsPresContext> presContext = docshell->GetPresContext()) {
           EventStateManager* kidESM = presContext->EventStateManager();
           // Not moving into any element in this subdocument
           kidESM->NotifyMouseOut(aMouseEvent, nullptr);
@@ -4435,7 +4439,9 @@
   }
   // That could have caused DOM events which could wreak havoc. Reverify
   // things and be careful.
-  if (!wrapper->mLastOverElement) return;
+  if (!wrapper->mLastOverElement) {
+    return;
+  }
 
   // Store the first mouseOut event we fire and don't refire mouseOut
   // to that element while the first mouseOut is still ongoing.
diff -Nru firefox-84.0.2+build1/dom/events/EventStateManager.h firefox-85.0+build1/dom/events/EventStateManager.h
--- firefox-84.0.2+build1/dom/events/EventStateManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventStateManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsRefPtrHashtable.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/layers/APZPublicUtils.h"
 #include "Units.h"
@@ -37,6 +38,7 @@
 class EventStates;
 class IMEContentObserver;
 class ScrollbarsForWheel;
+class TextEditor;
 class WheelTransaction;
 
 namespace dom {
@@ -566,9 +568,9 @@
    *                    false.  I.e., when this returns true and aExecute
    *                    is true, a target is executed or focused.
    */
-  bool LookForAccessKeyAndExecute(nsTArray<uint32_t>& aAccessCharCodes,
-                                  bool aIsTrustedEvent, bool aIsRepeat,
-                                  bool aExecute);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY bool LookForAccessKeyAndExecute(
+      nsTArray<uint32_t>& aAccessCharCodes, bool aIsTrustedEvent,
+      bool aIsRepeat, bool aExecute);
 
   //---------------------------------------------
   // DocShell Focus Traversal Methods
diff -Nru firefox-84.0.2+build1/dom/events/EventStates.h firefox-85.0+build1/dom/events/EventStates.h
--- firefox-84.0.2+build1/dom/events/EventStates.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventStates.h	2021-01-18 19:58:09.000000000 +0000
@@ -294,6 +294,9 @@
 #define NS_EVENT_STATE_MOZINERT NS_DEFINE_EVENT_STATE_MACRO(54)
 // Topmost Modal <dialog> element in top layer
 #define NS_EVENT_STATE_TOPMOST_MODAL_DIALOG NS_DEFINE_EVENT_STATE_MACRO(55)
+// Handler for empty element that represents plugin instances in builds
+// where plugin support is removed..
+#define NS_EVENT_STATE_HANDLER_NOPLUGINS NS_DEFINE_EVENT_STATE_MACRO(56)
 /**
  * NOTE: do not go over 63 without updating EventStates::InternalType!
  */
diff -Nru firefox-84.0.2+build1/dom/events/EventTarget.h firefox-85.0+build1/dom/events/EventTarget.h
--- firefox-84.0.2+build1/dom/events/EventTarget.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/EventTarget.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_EventTarget_h_
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/DebuggerNotificationBinding.h"
 #include "mozilla/dom/Nullable.h"
 #include "nsISupports.h"
 #include "nsWrapperCache.h"
@@ -36,6 +35,7 @@
 class EventHandlerNonNull;
 class GlobalObject;
 class WindowProxyHolder;
+enum class EventCallbackDebuggerNotificationType : uint8_t;
 
 // IID for the dom::EventTarget interface
 #define NS_EVENTTARGET_IID                           \
diff -Nru firefox-84.0.2+build1/dom/events/IMEContentObserver.cpp firefox-85.0+build1/dom/events/IMEContentObserver.cpp
--- firefox-84.0.2+build1/dom/events/IMEContentObserver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/IMEContentObserver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -647,17 +647,18 @@
                                    !mNeedsToNotifyIMEOfSelectionChange;
   if (isSelectionCacheAvailable && aEvent->mMessage == eQuerySelectedText &&
       aEvent->mInput.mSelectionType == SelectionType::eNormal) {
-    aEvent->mReply.mContentsRoot = mRootContent;
-    aEvent->mReply.mHasSelection = !mSelectionData.IsCollapsed();
-    aEvent->mReply.mOffset = mSelectionData.mOffset;
-    aEvent->mReply.mString = mSelectionData.String();
-    aEvent->mReply.mWritingMode = mSelectionData.GetWritingMode();
-    aEvent->mReply.mReversed = mSelectionData.mReversed;
-    aEvent->mSucceeded = true;
+    aEvent->EmplaceReply();
+    aEvent->mReply->mOffsetAndData.emplace(mSelectionData.mOffset,
+                                           mSelectionData.String(),
+                                           OffsetAndDataFor::SelectedString);
+    aEvent->mReply->mContentsRoot = mRootContent;
+    aEvent->mReply->mHasSelection = !mSelectionData.IsCollapsed();
+    aEvent->mReply->mWritingMode = mSelectionData.GetWritingMode();
+    aEvent->mReply->mReversed = mSelectionData.mReversed;
     MOZ_LOG(sIMECOLog, LogLevel::Debug,
             ("0x%p IMEContentObserver::HandleQueryContentEvent(aEvent={ "
-             "mMessage=%s })",
-             this, ToChar(aEvent->mMessage)));
+             "mMessage=%s, mReply=%s })",
+             this, ToChar(aEvent->mMessage), ToString(aEvent->mReply).c_str()));
     return NS_OK;
   }
 
@@ -699,7 +700,7 @@
   if (NS_WARN_IF(Destroyed())) {
     // If this has already destroyed during querying the content, the query
     // is outdated even if it's succeeded.  So, make the query fail.
-    aEvent->mSucceeded = false;
+    aEvent->mReply.reset();
     MOZ_LOG(sIMECOLog, LogLevel::Warning,
             ("0x%p IMEContentObserver::HandleQueryContentEvent(), WARNING, "
              "IMEContentObserver has been destroyed during the query, "
@@ -708,10 +709,10 @@
     return rv;
   }
 
-  if (!IsInitializedWithPlugin() &&
-      NS_WARN_IF(aEvent->mReply.mContentsRoot != mRootContent)) {
+  if (aEvent->Succeeded() && !IsInitializedWithPlugin() &&
+      NS_WARN_IF(aEvent->mReply->mContentsRoot != mRootContent)) {
     // Focus has changed unexpectedly, so make the query fail.
-    aEvent->mSucceeded = false;
+    aEvent->mReply.reset();
   }
   return rv;
 }
@@ -740,13 +741,13 @@
 
   RefPtr<IMEContentObserver> kungFuDeathGrip(this);
 
-  WidgetQueryContentEvent charAtPt(true, eQueryCharacterAtPoint,
-                                   aMouseEvent->mWidget);
-  charAtPt.mRefPoint = aMouseEvent->mRefPoint;
+  WidgetQueryContentEvent queryCharAtPointEvent(true, eQueryCharacterAtPoint,
+                                                aMouseEvent->mWidget);
+  queryCharAtPointEvent.mRefPoint = aMouseEvent->mRefPoint;
   ContentEventHandler handler(aPresContext);
-  handler.OnQueryCharacterAtPoint(&charAtPt);
-  if (NS_WARN_IF(!charAtPt.mSucceeded) ||
-      charAtPt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND) {
+  handler.OnQueryCharacterAtPoint(&queryCharAtPointEvent);
+  if (NS_WARN_IF(queryCharAtPointEvent.Failed()) ||
+      queryCharAtPointEvent.DidNotFindChar()) {
     return false;
   }
 
@@ -760,23 +761,26 @@
   // We should notify it with offset in the widget.
   nsIWidget* topLevelWidget = mWidget->GetTopLevelWidget();
   if (topLevelWidget && topLevelWidget != mWidget) {
-    charAtPt.mReply.mRect.MoveBy(topLevelWidget->WidgetToScreenOffset() -
-                                 mWidget->WidgetToScreenOffset());
+    queryCharAtPointEvent.mReply->mRect.MoveBy(
+        topLevelWidget->WidgetToScreenOffset() -
+        mWidget->WidgetToScreenOffset());
   }
   // The refPt is relative to its widget.
   // We should notify it with offset in the widget.
   if (aMouseEvent->mWidget != mWidget) {
-    charAtPt.mRefPoint += aMouseEvent->mWidget->WidgetToScreenOffset() -
-                          mWidget->WidgetToScreenOffset();
+    queryCharAtPointEvent.mRefPoint +=
+        aMouseEvent->mWidget->WidgetToScreenOffset() -
+        mWidget->WidgetToScreenOffset();
   }
 
   IMENotification notification(NOTIFY_IME_OF_MOUSE_BUTTON_EVENT);
   notification.mMouseButtonEventData.mEventMessage = aMouseEvent->mMessage;
-  notification.mMouseButtonEventData.mOffset = charAtPt.mReply.mOffset;
+  notification.mMouseButtonEventData.mOffset =
+      queryCharAtPointEvent.mReply->StartOffset();
   notification.mMouseButtonEventData.mCursorPos.Set(
-      charAtPt.mRefPoint.ToUnknownPoint());
+      queryCharAtPointEvent.mRefPoint.ToUnknownPoint());
   notification.mMouseButtonEventData.mCharRect.Set(
-      charAtPt.mReply.mRect.ToUnknownRect());
+      queryCharAtPointEvent.mReply->mRect.ToUnknownRect());
   notification.mMouseButtonEventData.mButton = aMouseEvent->mButton;
   notification.mMouseButtonEventData.mButtons = aMouseEvent->mButtons;
   notification.mMouseButtonEventData.mModifiers = aMouseEvent->mModifiers;
@@ -1311,20 +1315,24 @@
 
   // XXX Cannot we cache some information for reducing the cost to compute
   //     selection offset and writing mode?
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, mWidget);
-  selection.mNeedsToFlushLayout = aRequireFlush;
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 mWidget);
+  querySelectedTextEvent.mNeedsToFlushLayout = aRequireFlush;
   ContentEventHandler handler(GetPresContext());
-  handler.OnQuerySelectedText(&selection);
-  if (NS_WARN_IF(!selection.mSucceeded) ||
-      NS_WARN_IF(selection.mReply.mContentsRoot != mRootContent)) {
+  handler.OnQuerySelectedText(&querySelectedTextEvent);
+  if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection()) ||
+      NS_WARN_IF(querySelectedTextEvent.mReply->mContentsRoot !=
+                 mRootContent)) {
     return false;
   }
-
-  mFocusedWidget = selection.mReply.mFocusedWidget;
-  mSelectionData.mOffset = selection.mReply.mOffset;
-  *mSelectionData.mString = selection.mReply.mString;
-  mSelectionData.SetWritingMode(selection.GetWritingMode());
-  mSelectionData.mReversed = selection.mReply.mReversed;
+  MOZ_ASSERT(querySelectedTextEvent.mReply->mOffsetAndData.isSome());
+
+  mFocusedWidget = querySelectedTextEvent.mReply->mFocusedWidget;
+  mSelectionData.mOffset = querySelectedTextEvent.mReply->StartOffset();
+  *mSelectionData.mString = querySelectedTextEvent.mReply->DataRef();
+  mSelectionData.SetWritingMode(
+      querySelectedTextEvent.mReply->WritingModeRef());
+  mSelectionData.mReversed = querySelectedTextEvent.mReply->mReversed;
 
   // WARNING: Don't modify the reason of selection change here.
 
diff -Nru firefox-84.0.2+build1/dom/events/IMEStateManager.cpp firefox-85.0+build1/dom/events/IMEStateManager.cpp
--- firefox-84.0.2+build1/dom/events/IMEStateManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/IMEStateManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -79,6 +79,9 @@
 bool IMEStateManager::sInstalledMenuKeyboardListener = false;
 bool IMEStateManager::sIsGettingNewIMEState = false;
 bool IMEStateManager::sCleaningUpForStoppingIMEStateManagement = false;
+bool IMEStateManager::sIsActive = false;
+Maybe<IMEStateManager::PendingFocusedBrowserSwitchingData>
+    IMEStateManager::sPendingFocusedBrowserSwitchingData;
 
 // static
 void IMEStateManager::Init() {
@@ -91,9 +94,12 @@
 void IMEStateManager::Shutdown() {
   MOZ_LOG(
       sISMLog, LogLevel::Info,
-      ("Shutdown(), sTextCompositions=0x%p, sTextCompositions->Length()=%zu",
-       sTextCompositions, sTextCompositions ? sTextCompositions->Length() : 0));
+      ("Shutdown(), sTextCompositions=0x%p, sTextCompositions->Length()=%zu, "
+       "sPendingFocusedBrowserSwitchingData.isSome()=%s",
+       sTextCompositions, sTextCompositions ? sTextCompositions->Length() : 0,
+       GetBoolName(sPendingFocusedBrowserSwitchingData.isSome())));
 
+  sPendingFocusedBrowserSwitchingData.reset();
   MOZ_ASSERT(!sTextCompositions || !sTextCompositions->Length());
   delete sTextCompositions;
   sTextCompositions = nullptr;
@@ -108,6 +114,43 @@
   MOZ_ASSERT(aBlur != aFocus);
   MOZ_ASSERT(XRE_IsParentProcess());
 
+  if (sPendingFocusedBrowserSwitchingData.isSome()) {
+    MOZ_ASSERT(aBlur ==
+               sPendingFocusedBrowserSwitchingData.ref().mBrowserParentFocused);
+    // If focus is not changed between browsers actually, we need to do
+    // nothing here.  Let's cancel handling what this method does.
+    if (sPendingFocusedBrowserSwitchingData.ref().mBrowserParentBlurred ==
+        aFocus) {
+      sPendingFocusedBrowserSwitchingData.reset();
+      MOZ_LOG(sISMLog, LogLevel::Info,
+              ("  OnFocusMovedBetweenBrowsers(), canceled all pending focus "
+               "moves between browsers"));
+      return;
+    }
+    aBlur = sPendingFocusedBrowserSwitchingData.ref().mBrowserParentBlurred;
+    sPendingFocusedBrowserSwitchingData.ref().mBrowserParentFocused = aFocus;
+    MOZ_ASSERT(aBlur != aFocus);
+  }
+
+  // If application was inactive, but is now activated, and the last focused
+  // this is called by BrowserParent::UnsetTopLevelWebFocusAll() from
+  // nsFocusManager::WindowRaised().  If a content has focus in a remote
+  // process and it has composition, it may get focus back later and the
+  // composition shouldn't be commited now.  Therefore, we should put off to
+  // handle this until getting another call of this method or a call of
+  //`OnFocusChangeInternal()`.
+  if (aBlur && !aFocus && !sIsActive && sWidget && sTextCompositions &&
+      sTextCompositions->GetCompositionFor(sWidget)) {
+    if (sPendingFocusedBrowserSwitchingData.isNothing()) {
+      sPendingFocusedBrowserSwitchingData.emplace(aBlur, aFocus);
+    }
+    MOZ_LOG(sISMLog, LogLevel::Debug,
+            ("  OnFocusMovedBetweenBrowsers(), put off to handle it until "
+             "next OnFocusChangeInternal() call"));
+    return;
+  }
+  sPendingFocusedBrowserSwitchingData.reset();
+
   nsCOMPtr<nsIWidget> oldWidget = sWidget;
   nsCOMPtr<nsIWidget> newWidget =
       aFocus ? aFocus->GetTextInputHandlingWidget() : nullptr;
@@ -221,6 +264,7 @@
   sActiveInputContextWidget = nullptr;
   sPresContext = nullptr;
   sContent = nullptr;
+  sIsActive = false;
   DestroyIMEContentObserver();
 }
 
@@ -388,6 +432,15 @@
                                                 nsIContent* aContent,
                                                 InputContextAction aAction) {
   bool remoteHasFocus = EventStateManager::IsRemoteTarget(aContent);
+  // If we've handled focused content, we were inactive but now active,
+  // a remote process has focus, and setting focus to same content in the main
+  // process, it means that we're restoring focus without changing DOM focus
+  // both in the main process and the remote process.
+  const bool restoringContextForRemoteContent =
+      XRE_IsParentProcess() && remoteHasFocus && !sIsActive && aPresContext &&
+      sPresContext && sContent && sPresContext.get() == aPresContext &&
+      sContent.get() == aContent &&
+      aAction.mFocusChange != InputContextAction::MENU_GOT_PSEUDO_FOCUS;
 
   MOZ_LOG(sISMLog, LogLevel::Info,
           ("OnChangeFocusInternal(aPresContext=0x%p (available: %s), "
@@ -395,14 +448,40 @@
            "mFocusChange=%s }), "
            "sPresContext=0x%p (available: %s), sContent=0x%p, "
            "sWidget=0x%p (available: %s), BrowserParent::GetFocused()=0x%p, "
-           "sActiveIMEContentObserver=0x%p, sInstalledMenuKeyboardListener=%s",
+           "sActiveIMEContentObserver=0x%p, sInstalledMenuKeyboardListener=%s, "
+           "sIsActive=%s, restoringContextForRemoteContent=%s",
            aPresContext, GetBoolName(CanHandleWith(aPresContext)), aContent,
            GetBoolName(remoteHasFocus), ToString(aAction.mCause).c_str(),
            ToString(aAction.mFocusChange).c_str(), sPresContext.get(),
            GetBoolName(CanHandleWith(sPresContext)), sContent.get(), sWidget,
            GetBoolName(sWidget && !sWidget->Destroyed()),
            BrowserParent::GetFocused(), sActiveIMEContentObserver.get(),
-           GetBoolName(sInstalledMenuKeyboardListener)));
+           GetBoolName(sInstalledMenuKeyboardListener), GetBoolName(sIsActive),
+           GetBoolName(restoringContextForRemoteContent)));
+
+  sIsActive = !!aPresContext;
+  if (sPendingFocusedBrowserSwitchingData.isSome()) {
+    MOZ_ASSERT(XRE_IsParentProcess());
+    nsCOMPtr<nsIContent> currentContent = sContent.get();
+    RefPtr<nsPresContext> currentPresContext = sPresContext.get();
+    RefPtr<BrowserParent> browserParentBlurred =
+        sPendingFocusedBrowserSwitchingData.ref().mBrowserParentBlurred;
+    RefPtr<BrowserParent> browserParentFocused =
+        sPendingFocusedBrowserSwitchingData.ref().mBrowserParentFocused;
+    OnFocusMovedBetweenBrowsers(browserParentBlurred, browserParentFocused);
+    // If another call of this method happens during the
+    // OnFocusMovedBetweenBrowsers call, we shouldn't take back focus to
+    // the old one.
+    if (currentContent != sContent.get() ||
+        currentPresContext != sPresContext.get()) {
+      MOZ_LOG(sISMLog, LogLevel::Debug,
+              ("  OnChangeFocusInternal(aPresContext=0x%p, aContent=0x%p) "
+               "stoped handling it because the focused content was changed to "
+               "sPresContext=0x%p, sContent=0x%p by another call",
+               aPresContext, aContent, sPresContext.get(), sContent.get()));
+      return NS_OK;
+    }
+  }
 
   // If new aPresShell has been destroyed, this should handle the focus change
   // as nobody is getting focus.
@@ -420,7 +499,7 @@
   bool focusActuallyChanging =
       (sContent != aContent || sPresContext != aPresContext ||
        oldWidget != newWidget ||
-       (remoteHasFocus &&
+       (remoteHasFocus && !restoringContextForRemoteContent &&
         (aAction.mFocusChange != InputContextAction::MENU_GOT_PSEUDO_FOCUS)));
 
   // If old widget has composition, we may need to commit composition since
@@ -467,15 +546,14 @@
 
   if (!aPresContext) {
     MOZ_LOG(sISMLog, LogLevel::Debug,
-            ("  OnChangeFocusInternal(), "
-             "no nsPresContext is being activated"));
+            ("  OnChangeFocusInternal(), no nsPresContext is being activated"));
     return NS_OK;
   }
 
   if (NS_WARN_IF(!newWidget)) {
     MOZ_LOG(sISMLog, LogLevel::Error,
-            ("  OnChangeFocusInternal(), FAILED due to "
-             "no widget to manage its IME state"));
+            ("  OnChangeFocusInternal(), FAILED due to no widget to manage its "
+             "IME state"));
     return NS_OK;
   }
 
@@ -512,18 +590,17 @@
           context.mOrigin == InputContext::ORIGIN_CONTENT) {
         setIMEState = false;
         MOZ_LOG(sISMLog, LogLevel::Debug,
-                ("  OnChangeFocusInternal(), doesn't set IME "
-                 "state because focused element (or document) is in a child "
-                 "process "
-                 "and the IME state is already disabled by a remote process"));
+                ("  OnChangeFocusInternal(), doesn't set IME state because "
+                 "focused element (or document) is in a child process and the "
+                 "IME state is already disabled by a remote process"));
       } else {
         // When new remote process gets focus, we should forget input context
         // coming from old focused remote process.
         ResetActiveChildInputContext();
         MOZ_LOG(sISMLog, LogLevel::Debug,
-                ("  OnChangeFocusInternal(), will disable IME "
-                 "until new focused element (or document) in the child process "
-                 "will get focus actually"));
+                ("  OnChangeFocusInternal(), will disable IME until new "
+                 "focused element (or document) in the child process will get "
+                 "focus actually"));
       }
     } else if (newWidget->GetInputContext().mOrigin !=
                InputContext::ORIGIN_MAIN) {
@@ -533,11 +610,10 @@
       // composition.  Then, we shouldn't commit the composition with making
       // IME state disabled.
       setIMEState = false;
-      MOZ_LOG(sISMLog, LogLevel::Debug,
-              ("  OnChangeFocusInternal(), doesn't set IME "
-               "state because focused element (or document) is already in the "
-               "child "
-               "process"));
+      MOZ_LOG(
+          sISMLog, LogLevel::Debug,
+          ("  OnChangeFocusInternal(), doesn't set IME state because focused "
+           "element (or document) is already in the child process"));
     }
   } else {
     // When this process gets focus, we should forget input context coming
@@ -552,8 +628,8 @@
       InputContext context = newWidget->GetInputContext();
       if (context.mIMEState.mEnabled == newState.mEnabled) {
         MOZ_LOG(sISMLog, LogLevel::Debug,
-                ("  OnChangeFocusInternal(), "
-                 "neither focus nor IME state is changing"));
+                ("  OnChangeFocusInternal(), neither focus nor IME state is "
+                 "changing"));
         return NS_OK;
       }
       aAction.mFocusChange = InputContextAction::FOCUS_NOT_CHANGED;
@@ -594,11 +670,10 @@
   if (newState.mEnabled == IMEState::PLUGIN) {
     CreateIMEContentObserver(nullptr);
     if (sActiveIMEContentObserver) {
-      MOZ_LOG(
-          sISMLog, LogLevel::Debug,
-          ("  OnChangeFocusInternal(), an "
-           "IMEContentObserver instance is created for plugin and trying to "
-           "flush its pending notifications..."));
+      MOZ_LOG(sISMLog, LogLevel::Debug,
+              ("  OnChangeFocusInternal(), an IMEContentObserver instance is "
+               "created for plugin and trying to flush its pending "
+               "notifications..."));
       sActiveIMEContentObserver->TryToFlushPendingNotifications(false);
     }
   }
@@ -818,7 +893,10 @@
     return;
   }
 
-  if (!UserActivation::IsHandlingUserInput()) {
+  MOZ_ASSERT(&aContent == sContent.get());
+
+  if (!UserActivation::IsHandlingUserInput() ||
+      UserActivation::IsHandlingKeyboardInput()) {
     return;
   }
 
diff -Nru firefox-84.0.2+build1/dom/events/IMEStateManager.h firefox-85.0+build1/dom/events/IMEStateManager.h
--- firefox-84.0.2+build1/dom/events/IMEStateManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/IMEStateManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_IMEStateManager_h_
 
 #include "mozilla/EventForwards.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "nsIWidget.h"
@@ -391,6 +392,50 @@
   // only while `IMEStateManager::StopIMEStateManagement()`.
   static bool sCleaningUpForStoppingIMEStateManagement;
 
+  // Set to true when:
+  // - In the main process, a window belonging to this app is active in the
+  //   desktop.
+  // - In a content process, the process has focus.
+  //
+  // This is updated by `OnChangeFocusInternal()` is called in the main
+  // process.  Therefore, this indicates the active state which
+  // `IMEStateManager` notified the focus change, there is timelag from
+  // the `nsFocusManager`'s status update.  This allows that all methods
+  // to handle something specially when they are called while the process
+  // is being activated or inactivated.  E.g., `OnFocusMovedBetweenBrowsers()`
+  // is called twice before `OnChangeFocusInternal()` when the main process
+  // becomes active.  In this case, it wants to wait a following call of
+  // `OnChangeFocusInternal()` to keep active composition.  See also below.
+  static bool sIsActive;
+
+  // While the application is being activated, `OnFocusMovedBetweenBrowsers()`
+  // are called twice before `OnChangeFocusInternal()`.  First time, aBlur is
+  // the last focused `BrowserParent` at deactivating and aFocus is always
+  // `nullptr`.  Then, it'll be called again with actually focused
+  // `BrowserParent` when a content in a remote process has focus.  If we need
+  // to keep active composition while all windows are deactivated, we shouldn't
+  // commit it at the first call since usually, the second call's aFocus
+  // and the first call's aBlur are same `BrowserParent`.  For solving this
+  // issue, we need to merge the given `BrowserParent`s of multiple calls of
+  // `OnFocusMovedBetweenBrowsers()`. The following struct is the data for
+  // calling `OnFocusMovedBetweenBrowsers()` later from
+  // `OnChangeFocusInternal()`.  Note that focus can be moved even while the
+  // main process is not active because JS can change focus.  In such case,
+  // composition is committed at that time.  Therefore, this is required only
+  // when the main process is activated and there is a composition in a remote
+  // process.
+  struct PendingFocusedBrowserSwitchingData final {
+    RefPtr<BrowserParent> mBrowserParentBlurred;
+    RefPtr<BrowserParent> mBrowserParentFocused;
+
+    PendingFocusedBrowserSwitchingData() = delete;
+    explicit PendingFocusedBrowserSwitchingData(BrowserParent* aBlur,
+                                                BrowserParent* aFocus)
+        : mBrowserParentBlurred(aBlur), mBrowserParentFocused(aFocus) {}
+  };
+  static Maybe<PendingFocusedBrowserSwitchingData>
+      sPendingFocusedBrowserSwitchingData;
+
   class MOZ_STACK_CLASS GettingNewIMEStateBlocker final {
    public:
     GettingNewIMEStateBlocker()
diff -Nru firefox-84.0.2+build1/dom/events/KeyboardEvent.cpp firefox-85.0+build1/dom/events/KeyboardEvent.cpp
--- firefox-84.0.2+build1/dom/events/KeyboardEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/KeyboardEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,8 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/KeyboardEvent.h"
+
 #include "mozilla/TextEvents.h"
+#include "mozilla/dom/Document.h"
 #include "nsContentUtils.h"
+#include "nsRFPService.h"
 #include "prtime.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/events/KeyboardEvent.h firefox-85.0+build1/dom/events/KeyboardEvent.h
--- firefox-84.0.2+build1/dom/events/KeyboardEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/KeyboardEvent.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/dom/UIEvent.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
 #include "mozilla/EventForwards.h"
-#include "nsRFPService.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/events/NotifyPaintEvent.h firefox-85.0+build1/dom/events/NotifyPaintEvent.h
--- firefox-84.0.2+build1/dom/events/NotifyPaintEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/NotifyPaintEvent.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/NotifyPaintEventBinding.h"
+#include "nsDOMNavigationTiming.h"
 #include "nsPresContext.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/events/PointerEvent.cpp firefox-85.0+build1/dom/events/PointerEvent.cpp
--- firefox-84.0.2+build1/dom/events/PointerEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/PointerEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/PointerEvent.h"
 #include "mozilla/dom/PointerEventBinding.h"
+#include "mozilla/dom/PointerEventHandler.h"
 #include "mozilla/MouseEvents.h"
 #include "nsContentUtils.h"
 #include "prtime.h"
diff -Nru firefox-84.0.2+build1/dom/events/PointerEventHandler.cpp firefox-85.0+build1/dom/events/PointerEventHandler.cpp
--- firefox-84.0.2+build1/dom/events/PointerEventHandler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/PointerEventHandler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowserParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MouseEventBinding.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/events/PointerEventHandler.h firefox-85.0+build1/dom/events/PointerEventHandler.h
--- firefox-84.0.2+build1/dom/events/PointerEventHandler.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/PointerEventHandler.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,10 @@
 #include "mozilla/TouchEvents.h"
 #include "mozilla/WeakPtr.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+
 class nsIFrame;
 class nsIContent;
 
diff -Nru firefox-84.0.2+build1/dom/events/RemoteDragStartData.cpp firefox-85.0+build1/dom/events/RemoteDragStartData.cpp
--- firefox-84.0.2+build1/dom/events/RemoteDragStartData.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/RemoteDragStartData.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,8 +4,10 @@
 
 #include "nsContentAreaDragDrop.h"
 #include "RemoteDragStartData.h"
+#include "nsContentUtils.h"
 #include "nsICookieJarSettings.h"
 #include "nsVariant.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/DOMTypes.h"
diff -Nru firefox-84.0.2+build1/dom/events/SpeechRecognitionError.cpp firefox-85.0+build1/dom/events/SpeechRecognitionError.cpp
--- firefox-84.0.2+build1/dom/events/SpeechRecognitionError.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/SpeechRecognitionError.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -24,15 +24,20 @@
       new SpeechRecognitionError(t, nullptr, nullptr);
   bool trusted = e->Init(t);
   e->InitSpeechRecognitionError(aType, aParam.mBubbles, aParam.mCancelable,
-                                aParam.mError, aParam.mMessage);
+                                aParam.mError,
+                                NS_ConvertUTF16toUTF8(aParam.mMessage));
   e->SetTrusted(trusted);
   e->SetComposed(aParam.mComposed);
   return e.forget();
 }
 
+void SpeechRecognitionError::GetMessage(nsAString& aString) {
+  CopyUTF8toUTF16(mMessage, aString);
+}
+
 void SpeechRecognitionError::InitSpeechRecognitionError(
     const nsAString& aType, bool aCanBubble, bool aCancelable,
-    SpeechRecognitionErrorCode aError, const nsAString& aMessage) {
+    SpeechRecognitionErrorCode aError, const nsACString& aMessage) {
   Event::InitEvent(aType, aCanBubble, aCancelable);
   mError = aError;
   mMessage = aMessage;
diff -Nru firefox-84.0.2+build1/dom/events/SpeechRecognitionError.h firefox-85.0+build1/dom/events/SpeechRecognitionError.h
--- firefox-84.0.2+build1/dom/events/SpeechRecognitionError.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/SpeechRecognitionError.h	2021-01-18 19:58:09.000000000 +0000
@@ -29,18 +29,19 @@
                                                               aGivenProto);
   }
 
-  void GetMessage(nsAString& aString) { aString = mMessage; }
+  void GetMessage(nsAString& aString);
 
   SpeechRecognitionErrorCode Error() { return mError; }
-
+  // aMessage should be valid UTF-8, but invalid UTF-8 byte sequences are
+  // replaced with the REPLACEMENT CHARACTER on conversion to UTF-16.
   void InitSpeechRecognitionError(const nsAString& aType, bool aCanBubble,
                                   bool aCancelable,
                                   SpeechRecognitionErrorCode aError,
-                                  const nsAString& aMessage);
+                                  const nsACString& aMessage);
 
  protected:
   SpeechRecognitionErrorCode mError;
-  nsString mMessage;
+  nsCString mMessage;
 };
 
 }  // namespace dom
diff -Nru firefox-84.0.2+build1/dom/events/test/browser_alt_keyup_in_content.js firefox-85.0+build1/dom/events/test/browser_alt_keyup_in_content.js
--- firefox-84.0.2+build1/dom/events/test/browser_alt_keyup_in_content.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/browser_alt_keyup_in_content.js	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,321 @@
+"use strict";
+
+const { ContentTaskUtils } = ChromeUtils.import(
+  "resource://testing-common/ContentTaskUtils.jsm"
+);
+
+add_task(async function runTests() {
+  const menubar = document.getElementById("toolbar-menubar");
+  const autohide = menubar.getAttribute("autohide");
+  // This test requires that the window is active because of the limitation of
+  // menubar.  Therefore, we should abort if the window becomes inactive during
+  // the tests.
+  let runningTests = true;
+  function onWindowActive(aEvent) {
+    // Don't warn after timed out.
+    if (runningTests && aEvent.target === window) {
+      info(
+        "WARNING: This window shouldn't have been inactivated during tests, but received an activated event!"
+      );
+    }
+  }
+  function onWindowInactive(aEvent) {
+    // Don't warn after timed out.
+    if (runningTests && aEvent.target === window) {
+      info(
+        "WARNING: This window should be active during tests, but inactivated!"
+      );
+      window.focus();
+    }
+  }
+  let menubarActivated = false;
+  function onMenubarActive() {
+    menubarActivated = true;
+  }
+  // In this test, menu popups shouldn't be open, but this helps avoiding
+  // intermittent failure after inactivating the menubar.
+  let popupEvents = 0;
+  function getPopupInfo(aPopupEventTarget) {
+    return `<${
+      aPopupEventTarget.nodeName
+    }${aPopupEventTarget.getAttribute("id") !== null ? ` id="${aPopupEventTarget.getAttribute("id")}"` : ""}>`;
+  }
+  function onPopupShown(aEvent) {
+    // Don't warn after timed out.
+    if (!runningTests) {
+      return;
+    }
+    popupEvents++;
+    info(
+      `A popup (${getPopupInfo(
+        aEvent.target
+      )}) is shown (visible popups: ${popupEvents})`
+    );
+  }
+  function onPopupHidden(aEvent) {
+    // Don't warn after timed out.
+    if (!runningTests) {
+      return;
+    }
+    if (popupEvents === 0) {
+      info(
+        `WARNING: There are some unexpected popups which may be not cleaned up by the previous test (${getPopupInfo(
+          aEvent.target
+        )})`
+      );
+      return;
+    }
+    popupEvents--;
+    info(
+      `A popup (${getPopupInfo(
+        aEvent.target
+      )}) is hidden (visible popups: ${popupEvents})`
+    );
+  }
+  try {
+    Services.prefs.setBoolPref("ui.key.menuAccessKeyFocuses", true);
+    // If this fails, you need to replace "KEY_Alt" with a variable whose
+    // value is considered from the pref.
+    is(
+      Services.prefs.getIntPref("ui.key.menuAccessKey"),
+      18,
+      "This test assumes that Alt key activates the menubar"
+    );
+    window.addEventListener("activate", onWindowActive);
+    window.addEventListener("deactivate", onWindowInactive);
+    window.addEventListener("popupshown", onPopupShown);
+    window.addEventListener("popuphidden", onPopupHidden);
+    menubar.addEventListener("DOMMenuBarActive", onMenubarActive);
+    async function doTest(aTest) {
+      await new Promise(resolve => {
+        if (Services.focus.activeWindow === window) {
+          resolve();
+          return;
+        }
+        info(
+          `${aTest.description}: The testing window is inactive, trying to activate it...`
+        );
+        Services.focus.focusedWindow = window;
+        TestUtils.waitForCondition(() => {
+          if (Services.focus.activeWindow === window) {
+            resolve();
+            return true;
+          }
+          Services.focus.focusedWindow = window;
+          return false;
+        }, `${aTest.description}: Waiting the window is activated`);
+      });
+      info(`Start to test: ${aTest.description}...`);
+
+      async function ensureMenubarInactive() {
+        if (!menubar.querySelector("[_moz-menuactive=true]")) {
+          return;
+        }
+        info(`${aTest.description}: Inactivating the menubar...`);
+        let waitForMenuBarInactive = BrowserTestUtils.waitForEvent(
+          menubar,
+          "DOMMenuBarInactive"
+        );
+        EventUtils.synthesizeKey("KEY_Escape", {}, window);
+        await waitForMenuBarInactive;
+        await TestUtils.waitForCondition(() => {
+          return popupEvents === 0;
+        }, `${aTest.description}: Waiting for closing all popups`);
+      }
+
+      try {
+        await BrowserTestUtils.withNewTab(
+          {
+            gBrowser,
+            url: aTest.url,
+          },
+          async browser => {
+            info(`${aTest.description}: Waiting browser getting focus...`);
+            await SimpleTest.promiseFocus(browser);
+            await ensureMenubarInactive();
+            menubarActivated = false;
+
+            let keyupEventFiredInContent = false;
+            BrowserTestUtils.addContentEventListener(
+              browser,
+              "keyup",
+              () => {
+                keyupEventFiredInContent = true;
+              },
+              { capture: true },
+              event => {
+                return event.key === "Alt";
+              }
+            );
+
+            // For making sure adding the above content event listener and
+            // it'll get `keyup` event, let's run `SpecialPowers.spawn` and
+            // wait for focus in the content process.
+            info(
+              `${aTest.description}: Waiting content process getting focus...`
+            );
+            await SpecialPowers.spawn(
+              browser,
+              [aTest.description],
+              async aTestDescription => {
+                await ContentTaskUtils.waitForCondition(() => {
+                  if (
+                    content.browsingContext.isActive &&
+                    content.document.hasFocus()
+                  ) {
+                    return true;
+                  }
+                  content.window.focus();
+                  return false;
+                }, `${aTestDescription}: Waiting for content gets focus in content process`);
+              }
+            );
+
+            let waitForAllKeyUpEventsInChrome = new Promise(resolve => {
+              // Wait 2 `keyup` events in the main process.  First one is
+              // synthesized one.  The other is replay event from content.
+              let firstKeyUpEvent;
+              window.addEventListener(
+                "keyup",
+                function onKeyUpInChrome(event) {
+                  if (!firstKeyUpEvent) {
+                    firstKeyUpEvent = event;
+                    return;
+                  }
+                  window.removeEventListener("keyup", onKeyUpInChrome, {
+                    capture: true,
+                  });
+                  resolve();
+                },
+                { capture: true }
+              );
+            });
+            EventUtils.synthesizeKey("KEY_Alt", {}, window);
+            info(
+              `${aTest.description}: Waiting keyup events of Alt in chrome...`
+            );
+            await waitForAllKeyUpEventsInChrome;
+            info(`${aTest.description}: Waiting keyup event in content...`);
+            try {
+              await TestUtils.waitForCondition(() => {
+                return keyupEventFiredInContent;
+              }, `${aTest.description}: Waiting for content gets focus in chrome process`);
+            } catch (ex) {
+              ok(
+                false,
+                `${aTest.description}: Failed to synthesize Alt key press in the content process`
+              );
+              return;
+            }
+
+            if (aTest.expectMenubarActive) {
+              ok(
+                menubarActivated,
+                `${aTest.description}: Menubar should've been activated by the synthesized Alt key press`
+              );
+            } else {
+              // Wait some ticks to verify not receiving "DOMMenuBarActive" event.
+              // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+              await new Promise(resolve => setTimeout(resolve, 500));
+              ok(
+                !menubarActivated,
+                `${aTest.description}: Menubar should not have been activated by the synthesized Alt key press`
+              );
+            }
+          }
+        );
+      } catch (ex) {
+        ok(
+          false,
+          `${aTest.description}: Thrown an exception: ${ex.toString()}`
+        );
+      } finally {
+        await ensureMenubarInactive();
+        info(`End testing: ${aTest.description}`);
+      }
+    }
+
+    // Testcases for users who use collapsible menubar (by default)
+    menubar.setAttribute("autohide", "true");
+    await doTest({
+      description: "Testing menubar is shown by Alt keyup",
+      url: "data:text/html;charset=utf-8,<p>static page</p>",
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar is shown by Alt keyup when an <input> has focus",
+      url:
+        "data:text/html;charset=utf-8,<input>" +
+        '<script>document.querySelector("input").focus()</script>',
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar is shown by Alt keyup when an editing host has focus",
+      url:
+        "data:text/html;charset=utf-8,<p contenteditable></p>" +
+        '<script>document.querySelector("p[contenteditable]").focus()</script>',
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar won't be shown by Alt keyup due to suppressed by the page",
+      url:
+        "data:text/html;charset=utf-8,<p>dynamic page</p>" +
+        '<script>window.addEventListener("keyup", event => { event.preventDefault(); })</script>',
+      expectMenubarActive: false,
+    });
+
+    // Testcases for users who always show the menubar.
+    menubar.setAttribute("autohide", "false");
+    await doTest({
+      description: "Testing menubar is activated by Alt keyup",
+      url: "data:text/html;charset=utf-8,<p>static page</p>",
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar is activated by Alt keyup when an <input> has focus",
+      url:
+        "data:text/html;charset=utf-8,<input>" +
+        '<script>document.querySelector("input").focus()</script>',
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar is activated by Alt keyup when an editing host has focus",
+      url:
+        "data:text/html;charset=utf-8,<p contenteditable></p>" +
+        '<script>document.querySelector("p[contenteditable]").focus()</script>',
+      expectMenubarActive: true,
+    });
+    await doTest({
+      description:
+        "Testing menubar won't be activated by Alt keyup due to suppressed by the page",
+      url:
+        "data:text/html;charset=utf-8,<p>dynamic page</p>" +
+        '<script>window.addEventListener("keyup", event => { event.preventDefault(); })</script>',
+      expectMenubarActive: false,
+    });
+    runningTests = false;
+  } catch (ex) {
+    ok(
+      false,
+      `Aborting this test due to unexpected the exception (${ex.toString()})`
+    );
+    runningTests = false;
+  } finally {
+    if (autohide !== null) {
+      menubar.setAttribute("autohide", autohide);
+    } else {
+      menubar.removeAttribute("autohide");
+    }
+    Services.prefs.clearUserPref("ui.key.menuAccessKeyFocuses");
+    menubar.removeEventListener("DOMMenuBarActive", onMenubarActive);
+    window.removeEventListener("activate", onWindowActive);
+    window.removeEventListener("deactivate", onWindowInactive);
+    window.removeEventListener("popupshown", onPopupShown);
+    window.removeEventListener("popuphidden", onPopupHidden);
+  }
+});
diff -Nru firefox-84.0.2+build1/dom/events/test/browser.ini firefox-85.0+build1/dom/events/test/browser.ini
--- firefox-84.0.2+build1/dom/events/test/browser.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/browser.ini	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,8 @@
 [DEFAULT]
 
+[browser_alt_keyup_in_content.js]
+skip-if = (os != 'linux' && os != 'win') || skip-if = !e10s
+
 [browser_beforeinput_by_execCommand_in_contentscript.js]
 support-files =
   file_beforeinput_by_execCommand_in_contentscript.html
diff -Nru firefox-84.0.2+build1/dom/events/test/mochitest.ini firefox-85.0+build1/dom/events/test/mochitest.ini
--- firefox-84.0.2+build1/dom/events/test/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -32,7 +32,6 @@
 [test_bug1539497.html]
 [test_bug226361.xhtml]
 [test_bug238987.html]
-fail-if = (xorigin && fission)
 [test_bug288392.html]
 [test_bug299673-1.html]
 [test_bug1037990.html]
@@ -196,7 +195,6 @@
 [test_mouse_enterleave_iframe.html]
 support-files =
   file_mouse_enterleave.html
-skip-if = verify # Bug 1659940
 [test_moz_mouse_pixel_scroll_event.html]
 [test_offsetxy.html]
 [test_onerror_handler_args.html]
@@ -245,7 +243,6 @@
 support-files =
   file_focus_blur_on_click_in_cross_origin_iframe.html
 [test_focus_blur_on_click_in_deep_cross_origin_iframe.html]
-skip-if = fission # Disabled due to timeouts and non-deterministic event order https://bugzilla.mozilla.org/show_bug.cgi?id=1661227
 support-files =
   file_focus_blur_on_click_in_deep_cross_origin_iframe_inner.html
   file_focus_blur_on_click_in_deep_cross_origin_iframe_middle.html
diff -Nru firefox-84.0.2+build1/dom/events/test/pointerevents/file_pointercapture_xorigin_iframe_pointerlock.html firefox-85.0+build1/dom/events/test/pointerevents/file_pointercapture_xorigin_iframe_pointerlock.html
--- firefox-84.0.2+build1/dom/events/test/pointerevents/file_pointercapture_xorigin_iframe_pointerlock.html	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/pointerevents/file_pointercapture_xorigin_iframe_pointerlock.html	2021-01-18 19:58:09.000000000 +0000
@@ -80,6 +80,8 @@
 }
 
 add_task(async function test_pointer_capture_xorigin_iframe_pointer_lock() {
+  await SimpleTest.promiseFocus();
+
   // Request pointer capture on top-level.
   let target = document.getElementById("target");
   synthesizeMouse(target, 10, 10, { type: "mousedown" });
diff -Nru firefox-84.0.2+build1/dom/events/test/test_focus_blur_on_click_in_cross_origin_iframe.html firefox-85.0+build1/dom/events/test/test_focus_blur_on_click_in_cross_origin_iframe.html
--- firefox-84.0.2+build1/dom/events/test/test_focus_blur_on_click_in_cross_origin_iframe.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/test_focus_blur_on_click_in_cross_origin_iframe.html	2021-01-18 19:58:09.000000000 +0000
@@ -67,10 +67,9 @@
     window.addEventListener("message", function listener(event) {
       if (state == "ready") {
         if (event.data == "focus") {
-          // Non-Fission case
           state = "focusbeforeclick";
         } else if (event.data == "click") {
-          // Fission case: https://bugzilla.mozilla.org/show_bug.cgi?id=1660805
+          ok(false, "Focusing failed to complete before mouseup");
           state = "clickbeforefocus";
         } else {
           ok(false, "Unexpected event");
diff -Nru firefox-84.0.2+build1/dom/events/test/test_focus_blur_on_click_in_deep_cross_origin_iframe.html firefox-85.0+build1/dom/events/test/test_focus_blur_on_click_in_deep_cross_origin_iframe.html
--- firefox-84.0.2+build1/dom/events/test/test_focus_blur_on_click_in_deep_cross_origin_iframe.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/test/test_focus_blur_on_click_in_deep_cross_origin_iframe.html	2021-01-18 19:58:09.000000000 +0000
@@ -72,14 +72,12 @@
     window.addEventListener("message", function listener(event) {
       if (state == "ready") {
         if (event.data == "innerfocus") {
-          // Non-Fission case
           state = "innerfocusbeforeclick";
         } else if (event.data == "innerclick") {
-          // Fission case: https://bugzilla.mozilla.org/show_bug.cgi?id=1660805
+          ok(false, "Focusing failed to complete before mouseup");
           state = "innerclickbeforefocus";
         } else if (event.data == "middlefocus") {
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=1661227
-          todo(false, "Ignoring extra middlefocus.");
+          is(false, "Should not get an extra middlefocus.");
         } else {
           is(event.data, "neverthisevent", "Unexpected event (first click)");
         }
diff -Nru firefox-84.0.2+build1/dom/events/TextClause.h firefox-85.0+build1/dom/events/TextClause.h
--- firefox-84.0.2+build1/dom/events/TextClause.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/TextClause.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsPIDOMWindow.h"
diff -Nru firefox-84.0.2+build1/dom/events/TextComposition.cpp firefox-85.0+build1/dom/events/TextComposition.cpp
--- firefox-84.0.2+build1/dom/events/TextComposition.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/TextComposition.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,10 +15,10 @@
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/IMEStateManager.h"
 #include "mozilla/MiscEvents.h"
-#include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/RangeBoundary.h"
 #include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/StaticPrefs_intl.h"
 #include "mozilla/TextComposition.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/Unused.h"
@@ -71,8 +71,8 @@
       mHasDispatchedDOMTextEvent(false),
       mHasReceivedCommitEvent(false),
       mWasNativeCompositionEndEventDiscarded(false),
-      mAllowControlCharacters(Preferences::GetBool(
-          "dom.compositionevent.allow_control_characters", false)),
+      mAllowControlCharacters(
+          StaticPrefs::dom_compositionevent_allow_control_characters()),
       mWasCompositionStringEmpty(true) {
   MOZ_ASSERT(aCompositionEvent->mNativeIMEContext.IsValid());
 }
@@ -233,6 +233,18 @@
   aStr.SetLength(curDest - dest);
 }
 
+nsString TextComposition::CommitStringIfCommittedAsIs() const {
+  nsString result(mLastData);
+  if (!mAllowControlCharacters) {
+    RemoveControlCharactersFrom(result, nullptr);
+  }
+  if (StaticPrefs::intl_ime_remove_placeholder_character_at_commit() &&
+      mLastData == IDEOGRAPHIC_SPACE) {
+    return EmptyString();
+  }
+  return result;
+}
+
 void TextComposition::DispatchCompositionEvent(
     WidgetCompositionEvent* aCompositionEvent, nsEventStatus* aStatus,
     EventDispatchingCallback* aCallBack, bool aIsSynthesized) {
@@ -279,9 +291,8 @@
     aCompositionEvent->mRanges = nullptr;
     NS_ASSERTION(aCompositionEvent->mData.IsEmpty(),
                  "mData of eCompositionCommitAsIs should be empty string");
-    bool removePlaceholderCharacter = Preferences::GetBool(
-        "intl.ime.remove_placeholder_character_at_commit", false);
-    if (removePlaceholderCharacter && mLastData == IDEOGRAPHIC_SPACE) {
+    if (StaticPrefs::intl_ime_remove_placeholder_character_at_commit() &&
+        mLastData == IDEOGRAPHIC_SPACE) {
       // If the last data is an ideographic space (FullWidth space), it might be
       // a placeholder character of some Chinese IME.  So, committing with
       // this data might not be expected by users.  Let's use empty string.
@@ -437,18 +448,19 @@
 
 uint32_t TextComposition::GetSelectionStartOffset() {
   nsCOMPtr<nsIWidget> widget = mPresContext->GetRootWidget();
-  WidgetQueryContentEvent selectedTextEvent(true, eQuerySelectedText, widget);
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 widget);
   // Due to a bug of widget, mRanges may not be nullptr even though composition
   // string is empty.  So, we need to check it here for avoiding to return
   // odd start offset.
   if (!mLastData.IsEmpty() && mRanges && mRanges->HasClauses()) {
-    selectedTextEvent.InitForQuerySelectedText(
+    querySelectedTextEvent.InitForQuerySelectedText(
         ToSelectionType(mRanges->GetFirstClause()->mRangeType));
   } else {
     NS_WARNING_ASSERTION(
         !mLastData.IsEmpty() || !mRanges || !mRanges->HasClauses(),
         "Shouldn't have empty clause info when composition string is empty");
-    selectedTextEvent.InitForQuerySelectedText(SelectionType::eNormal);
+    querySelectedTextEvent.InitForQuerySelectedText(SelectionType::eNormal);
   }
 
   // The editor which has this composition is observed by active
@@ -459,7 +471,7 @@
   if (contentObserver) {
     if (contentObserver->IsManaging(this)) {
       doQuerySelection = false;
-      contentObserver->HandleQueryContentEvent(&selectedTextEvent);
+      contentObserver->HandleQueryContentEvent(&querySelectedTextEvent);
     }
     // If another editor already has focus, we cannot retrieve selection
     // in the editor which has this composition...
@@ -472,13 +484,13 @@
   // ContentEventHandler)
   if (doQuerySelection) {
     ContentEventHandler handler(mPresContext);
-    handler.HandleQueryContentEvent(&selectedTextEvent);
+    handler.HandleQueryContentEvent(&querySelectedTextEvent);
   }
 
-  if (NS_WARN_IF(!selectedTextEvent.mSucceeded)) {
+  if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection())) {
     return 0;  // XXX Is this okay?
   }
-  return selectedTextEvent.mReply.mOffset;
+  return querySelectedTextEvent.mReply->SelectionStartOffset();
 }
 
 void TextComposition::OnCompositionEventDispatched(
@@ -814,11 +826,15 @@
     case eCompositionStart: {
       WidgetCompositionEvent compStart(true, eCompositionStart, widget);
       compStart.mNativeIMEContext = mTextComposition->mNativeContext;
-      WidgetQueryContentEvent selectedText(true, eQuerySelectedText, widget);
+      WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                     widget);
       ContentEventHandler handler(presContext);
-      handler.OnQuerySelectedText(&selectedText);
-      NS_ASSERTION(selectedText.mSucceeded, "Failed to get selected text");
-      compStart.mData = selectedText.mReply.mString;
+      handler.OnQuerySelectedText(&querySelectedTextEvent);
+      NS_ASSERTION(querySelectedTextEvent.Succeeded(),
+                   "Failed to get selected text");
+      if (querySelectedTextEvent.FoundSelection()) {
+        compStart.mData = querySelectedTextEvent.mReply->DataRef();
+      }
       compStart.mFlags.mIsSynthesizedForTests =
           mTextComposition->IsSynthesizedForTests();
       IMEStateManager::DispatchCompositionEvent(
diff -Nru firefox-84.0.2+build1/dom/events/TextComposition.h firefox-85.0+build1/dom/events/TextComposition.h
--- firefox-84.0.2+build1/dom/events/TextComposition.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/events/TextComposition.h	2021-01-18 19:58:09.000000000 +0000
@@ -55,6 +55,8 @@
   // The latest CompositionEvent.data value except compositionstart event.
   // This value is modified at dispatching compositionupdate.
   const nsString& LastData() const { return mLastData; }
+  // Returns commit string if it'll be commited as-is.
+  nsString CommitStringIfCommittedAsIs() const;
   // The composition string which is already handled by the focused editor.
   // I.e., this value must be same as the composition string on the focused
   // editor.  This value is modified at a call of
diff -Nru firefox-84.0.2+build1/dom/events/UIEvent.h firefox-85.0+build1/dom/events/UIEvent.h
--- firefox-84.0.2+build1/dom/events/UIEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/UIEvent.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "nsDeviceContext.h"
 #include "nsDocShell.h"
+#include "nsIContent.h"
 #include "nsPresContext.h"
 
 class nsINode;
diff -Nru firefox-84.0.2+build1/dom/events/WheelEvent.cpp firefox-85.0+build1/dom/events/WheelEvent.cpp
--- firefox-84.0.2+build1/dom/events/WheelEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/events/WheelEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/WheelEvent.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "prtime.h"
 
 namespace mozilla::dom {
@@ -18,7 +19,6 @@
                      ? aWheelEvent
                      : new WidgetWheelEvent(false, eVoidEvent, nullptr)),
       mAppUnitsPerDevPixel(0) {
-
   if (StaticPrefs::dom_event_wheel_deltaMode_lines_always_disabled()) {
     mDeltaModeCheckingState = DeltaModeCheckingState::Unchecked;
   }
diff -Nru firefox-84.0.2+build1/dom/fetch/BodyExtractor.h firefox-85.0+build1/dom/fetch/BodyExtractor.h
--- firefox-84.0.2+build1/dom/fetch/BodyExtractor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/BodyExtractor.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_BodyExtractor_h
 #define mozilla_dom_BodyExtractor_h
 
-#include "jsapi.h"
 #include "nsString.h"
 
 class nsIInputStream;
diff -Nru firefox-84.0.2+build1/dom/fetch/ChannelInfo.cpp firefox-85.0+build1/dom/fetch/ChannelInfo.cpp
--- firefox-84.0.2+build1/dom/fetch/ChannelInfo.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/ChannelInfo.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
 #include "mozilla/dom/Document.h"
+#include "nsIGlobalObject.h"
 #include "nsIHttpChannel.h"
 #include "nsSerializationHelper.h"
 #include "mozilla/BasePrincipal.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchDriver.cpp firefox-85.0+build1/dom/fetch/FetchDriver.cpp
--- firefox-84.0.2+build1/dom/fetch/FetchDriver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchDriver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/dom/Document.h"
 #include "nsICookieJarSettings.h"
+#include "nsIFile.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsIFileChannel.h"
@@ -1564,18 +1565,6 @@
       MOZ_ASSERT(NS_SUCCEEDED(rv));
     }
   }
-
-  nsAutoCString method;
-  mRequest->GetMethod(method);
-  if (!method.EqualsLiteral("GET") && !method.EqualsLiteral("HEAD")) {
-    nsAutoString origin;
-    if (NS_SUCCEEDED(nsContentUtils::GetUTFOrigin(mPrincipal, origin))) {
-      DebugOnly<nsresult> rv = aChannel->SetRequestHeader(
-          nsDependentCString(net::nsHttp::Origin),
-          NS_ConvertUTF16toUTF8(origin), false /* merge */);
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
-    }
-  }
 }
 
 void FetchDriver::RunAbortAlgorithm() {
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchDriver.h firefox-85.0+build1/dom/fetch/FetchDriver.h
--- firefox-84.0.2+build1/dom/fetch/FetchDriver.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchDriver.h	2021-01-18 19:58:09.000000000 +0000
@@ -30,6 +30,8 @@
 class nsIPrincipal;
 
 namespace mozilla {
+class PreloaderBase;
+
 namespace dom {
 
 class Document;
diff -Nru firefox-84.0.2+build1/dom/fetch/Fetch.h firefox-85.0+build1/dom/fetch/Fetch.h
--- firefox-84.0.2+build1/dom/fetch/Fetch.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/Fetch.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsString.h"
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AbortSignal.h"
 #include "mozilla/dom/BodyConsumer.h"
 #include "mozilla/dom/BodyStream.h"
@@ -25,6 +24,8 @@
 class nsIEventTarget;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString;
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchIPCTypes.h firefox-85.0+build1/dom/fetch/FetchIPCTypes.h
--- firefox-84.0.2+build1/dom/fetch/FetchIPCTypes.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchIPCTypes.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_fetch_IPCUtils_h
 #define mozilla_dom_fetch_IPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "mozilla/dom/HeadersBinding.h"
 #include "mozilla/dom/RequestBinding.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchObserver.cpp firefox-85.0+build1/dom/fetch/FetchObserver.cpp
--- firefox-84.0.2+build1/dom/fetch/FetchObserver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchObserver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "FetchObserver.h"
 #include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventBinding.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchStreamReader.cpp firefox-85.0+build1/dom/fetch/FetchStreamReader.cpp
--- firefox-84.0.2+build1/dom/fetch/FetchStreamReader.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchStreamReader.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,8 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseBinding.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkerRef.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/TaskCategory.h"
 #include "nsContentUtils.h"
 #include "nsIAsyncInputStream.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchStreamReader.h firefox-85.0+build1/dom/fetch/FetchStreamReader.h
--- firefox-84.0.2+build1/dom/fetch/FetchStreamReader.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchStreamReader.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,8 @@
 #ifndef mozilla_dom_FetchStreamReader_h
 #define mozilla_dom_FetchStreamReader_h
 
-#include "jsapi.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/dom/FetchBinding.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "nsIAsyncOutputStream.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchTypes.ipdlh firefox-85.0+build1/dom/fetch/FetchTypes.ipdlh
--- firefox-84.0.2+build1/dom/fetch/FetchTypes.ipdlh	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -8,13 +8,15 @@
 
 include protocol PRemoteLazyInputStream;
 
-using HeadersGuardEnum from "mozilla/dom/FetchIPCTypes.h";
-using ReferrerPolicy from "mozilla/dom/FetchIPCTypes.h";
-using RequestCache from "mozilla/dom/FetchIPCTypes.h";
-using RequestCredentials from "mozilla/dom/FetchIPCTypes.h";
-using RequestMode from "mozilla/dom/FetchIPCTypes.h";
-using RequestRedirect from "mozilla/dom/FetchIPCTypes.h";
-using ResponseType from "mozilla/dom/FetchIPCTypes.h";
+include "mozilla/dom/FetchIPCTypes.h";
+
+using HeadersGuardEnum from "mozilla/dom/HeadersBinding.h";
+using ReferrerPolicy from "mozilla/dom/ReferrerPolicyBinding.h";
+using RequestCache from "mozilla/dom/RequestBinding.h";
+using RequestCredentials from "mozilla/dom/RequestBinding.h";
+using RequestMode from "mozilla/dom/RequestBinding.h";
+using RequestRedirect from "mozilla/dom/RequestBinding.h";
+using ResponseType from "mozilla/dom/ResponseBinding.h";
 using struct nsID from "nsID.h";
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchUtil.cpp firefox-85.0+build1/dom/fetch/FetchUtil.cpp
--- firefox-84.0.2+build1/dom/fetch/FetchUtil.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchUtil.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,8 @@
 #include "nsCRT.h"
 #include "nsError.h"
 #include "nsIAsyncInputStream.h"
+#include "nsIHttpChannel.h"
+#include "nsNetUtil.h"
 #include "nsStreamUtils.h"
 #include "nsString.h"
 #include "mozilla/dom/Document.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/FetchUtil.h firefox-85.0+build1/dom/fetch/FetchUtil.h
--- firefox-84.0.2+build1/dom/fetch/FetchUtil.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/FetchUtil.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsString.h"
 #include "nsError.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 
diff -Nru firefox-84.0.2+build1/dom/fetch/InternalHeaders.cpp firefox-85.0+build1/dom/fetch/InternalHeaders.cpp
--- firefox-84.0.2+build1/dom/fetch/InternalHeaders.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/InternalHeaders.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/InternalHeaders.h firefox-85.0+build1/dom/fetch/InternalHeaders.h
--- firefox-84.0.2+build1/dom/fetch/InternalHeaders.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/InternalHeaders.h	2021-01-18 19:58:09.000000000 +0000
@@ -15,6 +15,8 @@
 #include "nsClassHashtable.h"
 #include "nsWrapperCache.h"
 
+class nsIRequest;
+
 namespace mozilla {
 
 class ErrorResult;
diff -Nru firefox-84.0.2+build1/dom/fetch/InternalRequest.h firefox-85.0+build1/dom/fetch/InternalRequest.h
--- firefox-84.0.2+build1/dom/fetch/InternalRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/InternalRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/LoadTainting.h"
 #include "mozilla/UniquePtr.h"
 
+#include "nsIChannelEventSink.h"
 #include "nsIInputStream.h"
 #include "nsISupportsImpl.h"
 #ifdef DEBUG
diff -Nru firefox-84.0.2+build1/dom/fetch/Request.cpp firefox-85.0+build1/dom/fetch/Request.cpp
--- firefox-84.0.2+build1/dom/fetch/Request.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/Request.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "Request.h"
 
 #include "nsIURI.h"
+#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 
 #include "mozilla/ErrorResult.h"
diff -Nru firefox-84.0.2+build1/dom/fetch/Response.cpp firefox-85.0+build1/dom/fetch/Response.cpp
--- firefox-84.0.2+build1/dom/fetch/Response.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/fetch/Response.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,9 @@
 #include "nsPIDOMWindow.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/BodyStream.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/FetchBinding.h"
 #include "mozilla/dom/ResponseBinding.h"
 #include "mozilla/dom/Headers.h"
diff -Nru firefox-84.0.2+build1/dom/file/BaseBlobImpl.cpp firefox-85.0+build1/dom/file/BaseBlobImpl.cpp
--- firefox-84.0.2+build1/dom/file/BaseBlobImpl.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/BaseBlobImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/BaseBlobImpl.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "nsRFPService.h"
 #include "prtime.h"
 
diff -Nru firefox-84.0.2+build1/dom/file/BaseBlobImpl.h firefox-85.0+build1/dom/file/BaseBlobImpl.h
--- firefox-84.0.2+build1/dom/file/BaseBlobImpl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/BaseBlobImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_BaseBlobImpl_h
 
 #include "mozilla/dom/BlobImpl.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/file/Blob.cpp firefox-85.0+build1/dom/file/Blob.cpp
--- firefox-84.0.2+build1/dom/file/Blob.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/Blob.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/BodyStream.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "MultipartBlobImpl.h"
 #include "nsIGlobalObject.h"
 #include "nsIInputStream.h"
diff -Nru firefox-84.0.2+build1/dom/file/Blob.h firefox-85.0+build1/dom/file/Blob.h
--- firefox-84.0.2+build1/dom/file/Blob.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/Blob.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_Blob_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BodyConsumer.h"
@@ -21,6 +20,8 @@
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct BlobPropertyBag;
diff -Nru firefox-84.0.2+build1/dom/file/BlobImpl.cpp firefox-85.0+build1/dom/file/BlobImpl.cpp
--- firefox-84.0.2+build1/dom/file/BlobImpl.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/BlobImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,8 @@
 #include "BlobImpl.h"
 #include "File.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/ErrorResult.h"
+#include "nsIInputStream.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/file/BlobImpl.h firefox-85.0+build1/dom/file/BlobImpl.h
--- firefox-84.0.2+build1/dom/file/BlobImpl.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/BlobImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_BlobImpl_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsISupportsImpl.h"
 #include "nsString.h"
 
@@ -22,6 +21,8 @@
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // This is the abstract class for any File backend. It must be nsISupports
diff -Nru firefox-84.0.2+build1/dom/file/FileBlobImpl.h firefox-85.0+build1/dom/file/FileBlobImpl.h
--- firefox-84.0.2+build1/dom/file/FileBlobImpl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileBlobImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,9 +7,11 @@
 #ifndef mozilla_dom_FileBlobImpl_h
 #define mozilla_dom_FileBlobImpl_h
 
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Mutex.h"
+#include "nsCOMPtr.h"
 
 class nsIFile;
 
diff -Nru firefox-84.0.2+build1/dom/file/File.cpp firefox-85.0+build1/dom/file/File.cpp
--- firefox-84.0.2+build1/dom/file/File.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/File.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/dom/FileCreatorHelper.h"
 #include "mozilla/dom/FileSystemUtils.h"
 #include "mozilla/dom/Promise.h"
+#include "nsIFile.h"
 #include "nsXULAppAPI.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/file/FileCreatorHelper.h firefox-85.0+build1/dom/file/FileCreatorHelper.h
--- firefox-84.0.2+build1/dom/file/FileCreatorHelper.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileCreatorHelper.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_FileCreatorHelper_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "nsISupportsImpl.h"
 
@@ -22,6 +21,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ChromeFilePropertyBag;
diff -Nru firefox-84.0.2+build1/dom/file/FileList.cpp firefox-85.0+build1/dom/file/FileList.cpp
--- firefox-84.0.2+build1/dom/file/FileList.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileList.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,10 +4,25 @@
  * 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/Directory.h"
 #include "mozilla/dom/FileList.h"
-#include "mozilla/dom/FileListBinding.h"
+
+#include <new>
+#include <utility>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/File.h"
+#include "mozilla/dom/FileListBinding.h"
+#include "mozilla/fallible.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsCycleCollectionTraversalCallback.h"
+#include "nsISupports.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
 
 namespace mozilla::dom {
 
@@ -21,11 +36,31 @@
 NS_IMPL_CYCLE_COLLECTING_ADDREF(FileList)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(FileList)
 
+FileList::FileList(nsISupports* aParent) : mParent(aParent) {}
+
+FileList::~FileList() = default;
+
 JSObject* FileList::WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) {
   return mozilla::dom::FileList_Binding::Wrap(aCx, this, aGivenProto);
 }
 
+bool FileList::Append(File* aFile) {
+  MOZ_ASSERT(aFile);
+  return mFiles.AppendElement(aFile, fallible);
+}
+
+bool FileList::Remove(uint32_t aIndex) {
+  if (aIndex < mFiles.Length()) {
+    mFiles.RemoveElementAt(aIndex);
+    return true;
+  }
+
+  return false;
+}
+
+void FileList::Clear() { return mFiles.Clear(); }
+
 File* FileList::Item(uint32_t aIndex) const {
   if (aIndex >= mFiles.Length()) {
     return nullptr;
diff -Nru firefox-84.0.2+build1/dom/file/FileList.h firefox-85.0+build1/dom/file/FileList.h
--- firefox-84.0.2+build1/dom/file/FileList.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileList.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,44 +7,45 @@
 #ifndef mozilla_dom_FileList_h
 #define mozilla_dom_FileList_h
 
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/UnionTypes.h"
+#include <cstdint>
+#include "js/TypeDecls.h"
+#include "mozilla/Assertions.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsISupports.h"
+#include "nsTArray.h"
 #include "nsWrapperCache.h"
 
+class nsCycleCollectionTraversalCallback;
+template <class T>
+class RefPtr;
+
 namespace mozilla {
+class ErrorResult;
 namespace dom {
 
 class BlobImpls;
 class File;
+template <typename T>
+class Sequence;
 
 class FileList final : public nsISupports, public nsWrapperCache {
  public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(FileList)
 
-  explicit FileList(nsISupports* aParent) : mParent(aParent) {}
+  explicit FileList(nsISupports* aParent);
 
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) override;
 
   nsISupports* GetParentObject() { return mParent; }
 
-  bool Append(File* aFile) {
-    MOZ_ASSERT(aFile);
-    return mFiles.AppendElement(aFile, fallible);
-  }
-
-  bool Remove(uint32_t aIndex) {
-    if (aIndex < mFiles.Length()) {
-      mFiles.RemoveElementAt(aIndex);
-      return true;
-    }
+  bool Append(File* aFile);
 
-    return false;
-  }
+  bool Remove(uint32_t aIndex);
 
-  void Clear() { return mFiles.Clear(); }
+  void Clear();
 
   File* Item(uint32_t aIndex) const;
 
@@ -55,7 +56,7 @@
   void ToSequence(Sequence<RefPtr<File>>& aSequence, ErrorResult& aRv) const;
 
  private:
-  ~FileList() = default;
+  ~FileList();
 
   FallibleTArray<RefPtr<File>> mFiles;
   nsCOMPtr<nsISupports> mParent;
diff -Nru firefox-84.0.2+build1/dom/file/FileReader.cpp firefox-85.0+build1/dom/file/FileReader.cpp
--- firefox-84.0.2+build1/dom/file/FileReader.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileReader.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -17,16 +17,19 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FileReaderBinding.h"
 #include "mozilla/dom/ProgressEvent.h"
+#include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/Encoding.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsAlgorithm.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDOMJSUtils.h"
 #include "nsError.h"
 #include "nsNetUtil.h"
 #include "nsStreamUtils.h"
+#include "nsThreadUtils.h"
 #include "xpcpublic.h"
 #include "nsReadableUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/file/FileReader.h firefox-85.0+build1/dom/file/FileReader.h
--- firefox-84.0.2+build1/dom/file/FileReader.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileReader.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsIAsyncInputStream.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsINamed.h"
+#include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsWeakReference.h"
diff -Nru firefox-84.0.2+build1/dom/file/FileReaderSync.h firefox-85.0+build1/dom/file/FileReaderSync.h
--- firefox-84.0.2+build1/dom/file/FileReaderSync.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/FileReaderSync.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_filereadersync_h__
 
 #include "mozilla/dom/WorkerCommon.h"
+#include "nsISupports.h"
 
 class nsIInputStream;
 
diff -Nru firefox-84.0.2+build1/dom/file/ipc/BlobTypes.ipdlh firefox-85.0+build1/dom/file/ipc/BlobTypes.ipdlh
--- firefox-84.0.2+build1/dom/file/ipc/BlobTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/BlobTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -4,8 +4,9 @@
 
 include protocol PFileDescriptorSet;
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+include "mozilla/ipc/ProtocolMessageUtils.h";
+
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/file/ipc/FileCreatorChild.cpp firefox-85.0+build1/dom/file/ipc/FileCreatorChild.cpp
--- firefox-84.0.2+build1/dom/file/ipc/FileCreatorChild.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/FileCreatorChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "FileCreatorChild.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/file/ipc/FileCreatorParent.cpp firefox-85.0+build1/dom/file/ipc/FileCreatorParent.cpp
--- firefox-84.0.2+build1/dom/file/ipc/FileCreatorParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/FileCreatorParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/FileBlobImpl.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/MultipartBlobImpl.h"
+#include "nsIFile.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/file/ipc/IPCBlob.ipdlh firefox-85.0+build1/dom/file/ipc/IPCBlob.ipdlh
--- firefox-84.0.2+build1/dom/file/ipc/IPCBlob.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/IPCBlob.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -9,8 +9,7 @@
 include IPCStream;
 include ProtocolTypes;
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/file/ipc/RemoteLazyInputStreamChild.cpp firefox-85.0+build1/dom/file/ipc/RemoteLazyInputStreamChild.cpp
--- firefox-84.0.2+build1/dom/file/ipc/RemoteLazyInputStreamChild.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/RemoteLazyInputStreamChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -19,10 +19,10 @@
 
 // This runnable is used in case the last stream is forgotten on the 'wrong'
 // thread.
-class ShutdownRunnable final : public CancelableRunnable {
+class ShutdownRunnable final : public DiscardableRunnable {
  public:
   explicit ShutdownRunnable(RemoteLazyInputStreamChild* aActor)
-      : CancelableRunnable("dom::ShutdownRunnable"), mActor(aActor) {}
+      : DiscardableRunnable("dom::ShutdownRunnable"), mActor(aActor) {}
 
   NS_IMETHOD
   Run() override {
@@ -36,10 +36,10 @@
 
 // This runnable is used in case StreamNeeded() has been called on a non-owning
 // thread.
-class StreamNeededRunnable final : public CancelableRunnable {
+class StreamNeededRunnable final : public DiscardableRunnable {
  public:
   explicit StreamNeededRunnable(RemoteLazyInputStreamChild* aActor)
-      : CancelableRunnable("dom::StreamNeededRunnable"), mActor(aActor) {}
+      : DiscardableRunnable("dom::StreamNeededRunnable"), mActor(aActor) {}
 
   NS_IMETHOD
   Run() override {
@@ -58,11 +58,11 @@
 
 // When the stream has been received from the parent, we inform the
 // RemoteLazyInputStream.
-class StreamReadyRunnable final : public CancelableRunnable {
+class StreamReadyRunnable final : public DiscardableRunnable {
  public:
   StreamReadyRunnable(RemoteLazyInputStream* aDestinationStream,
                       already_AddRefed<nsIInputStream> aCreatedStream)
-      : CancelableRunnable("dom::StreamReadyRunnable"),
+      : DiscardableRunnable("dom::StreamReadyRunnable"),
         mDestinationStream(aDestinationStream),
         mCreatedStream(std::move(aCreatedStream)) {
     MOZ_ASSERT(mDestinationStream);
@@ -82,10 +82,10 @@
 
 // This runnable is used in case LengthNeeded() has been called on a non-owning
 // thread.
-class LengthNeededRunnable final : public CancelableRunnable {
+class LengthNeededRunnable final : public DiscardableRunnable {
  public:
   explicit LengthNeededRunnable(RemoteLazyInputStreamChild* aActor)
-      : CancelableRunnable("dom::LengthNeededRunnable"), mActor(aActor) {}
+      : DiscardableRunnable("dom::LengthNeededRunnable"), mActor(aActor) {}
 
   NS_IMETHOD
   Run() override {
@@ -104,10 +104,10 @@
 
 // When the stream has been received from the parent, we inform the
 // RemoteLazyInputStream.
-class LengthReadyRunnable final : public CancelableRunnable {
+class LengthReadyRunnable final : public DiscardableRunnable {
  public:
   LengthReadyRunnable(RemoteLazyInputStream* aDestinationStream, int64_t aSize)
-      : CancelableRunnable("dom::LengthReadyRunnable"),
+      : DiscardableRunnable("dom::LengthReadyRunnable"),
         mDestinationStream(aDestinationStream),
         mSize(aSize) {
     MOZ_ASSERT(mDestinationStream);
diff -Nru firefox-84.0.2+build1/dom/file/ipc/RemoteLazyInputStream.cpp firefox-85.0+build1/dom/file/ipc/RemoteLazyInputStream.cpp
--- firefox-84.0.2+build1/dom/file/ipc/RemoteLazyInputStream.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/RemoteLazyInputStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -29,7 +29,7 @@
 
 namespace {
 
-class InputStreamCallbackRunnable final : public CancelableRunnable {
+class InputStreamCallbackRunnable final : public DiscardableRunnable {
  public:
   // Note that the execution can be synchronous in case the event target is
   // null.
@@ -60,7 +60,7 @@
  private:
   InputStreamCallbackRunnable(nsIInputStreamCallback* aCallback,
                               RemoteLazyInputStream* aStream)
-      : CancelableRunnable("dom::InputStreamCallbackRunnable"),
+      : DiscardableRunnable("dom::InputStreamCallbackRunnable"),
         mCallback(aCallback),
         mStream(aStream) {
     MOZ_ASSERT(mCallback);
@@ -71,7 +71,7 @@
   RefPtr<RemoteLazyInputStream> mStream;
 };
 
-class FileMetadataCallbackRunnable final : public CancelableRunnable {
+class FileMetadataCallbackRunnable final : public DiscardableRunnable {
  public:
   static void Execute(nsIFileMetadataCallback* aCallback,
                       nsIEventTarget* aEventTarget,
@@ -97,7 +97,7 @@
  private:
   FileMetadataCallbackRunnable(nsIFileMetadataCallback* aCallback,
                                RemoteLazyInputStream* aStream)
-      : CancelableRunnable("dom::FileMetadataCallbackRunnable"),
+      : DiscardableRunnable("dom::FileMetadataCallbackRunnable"),
         mCallback(aCallback),
         mStream(aStream) {
     MOZ_ASSERT(mCallback);
@@ -849,7 +849,7 @@
 
 namespace {
 
-class InputStreamLengthCallbackRunnable final : public CancelableRunnable {
+class InputStreamLengthCallbackRunnable final : public DiscardableRunnable {
  public:
   static void Execute(nsIInputStreamLengthCallback* aCallback,
                       nsIEventTarget* aEventTarget,
@@ -876,7 +876,7 @@
   InputStreamLengthCallbackRunnable(nsIInputStreamLengthCallback* aCallback,
                                     RemoteLazyInputStream* aStream,
                                     int64_t aLength)
-      : CancelableRunnable("dom::InputStreamLengthCallbackRunnable"),
+      : DiscardableRunnable("dom::InputStreamLengthCallbackRunnable"),
         mCallback(aCallback),
         mStream(aStream),
         mLength(aLength) {
diff -Nru firefox-84.0.2+build1/dom/file/ipc/TemporaryIPCBlobChild.cpp firefox-85.0+build1/dom/file/ipc/TemporaryIPCBlobChild.cpp
--- firefox-84.0.2+build1/dom/file/ipc/TemporaryIPCBlobChild.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/TemporaryIPCBlobChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TemporaryIPCBlobChild.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/MutableBlobStorage.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include <private/pprio.h>
diff -Nru firefox-84.0.2+build1/dom/file/ipc/TemporaryIPCBlobChild.h firefox-85.0+build1/dom/file/ipc/TemporaryIPCBlobChild.h
--- firefox-84.0.2+build1/dom/file/ipc/TemporaryIPCBlobChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/ipc/TemporaryIPCBlobChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 namespace mozilla {
 namespace dom {
 
+class BlobImpl;
 class MutableBlobStorage;
 
 class TemporaryIPCBlobChildCallback {
diff -Nru firefox-84.0.2+build1/dom/file/MemoryBlobImpl.cpp firefox-85.0+build1/dom/file/MemoryBlobImpl.cpp
--- firefox-84.0.2+build1/dom/file/MemoryBlobImpl.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/MemoryBlobImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "MemoryBlobImpl.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/SHA1.h"
+#include "nsIMemoryReporter.h"
 #include "nsMemory.h"
 #include "nsPrintfCString.h"
 #include "nsRFPService.h"
diff -Nru firefox-84.0.2+build1/dom/file/MemoryBlobImpl.h firefox-85.0+build1/dom/file/MemoryBlobImpl.h
--- firefox-84.0.2+build1/dom/file/MemoryBlobImpl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/MemoryBlobImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/LinkedList.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
+#include "nsCOMPtr.h"
 #include "nsICloneableInputStream.h"
 #include "nsIInputStream.h"
 #include "nsIIPCSerializableInputStream.h"
diff -Nru firefox-84.0.2+build1/dom/file/MultipartBlobImpl.cpp firefox-85.0+build1/dom/file/MultipartBlobImpl.cpp
--- firefox-84.0.2+build1/dom/file/MultipartBlobImpl.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/MultipartBlobImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/BlobSet.h"
 #include "mozilla/dom/FileBinding.h"
 #include "mozilla/dom/UnionTypes.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIMultiplexInputStream.h"
 #include "nsRFPService.h"
 #include "nsStringStream.h"
diff -Nru firefox-84.0.2+build1/dom/file/MultipartBlobImpl.h firefox-85.0+build1/dom/file/MultipartBlobImpl.h
--- firefox-84.0.2+build1/dom/file/MultipartBlobImpl.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/MultipartBlobImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,11 +11,12 @@
 
 #include "Blob.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/BaseBlobImpl.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // This is just a sentinel value to be sure that we don't call
diff -Nru firefox-84.0.2+build1/dom/file/TemporaryFileBlobImpl.cpp firefox-85.0+build1/dom/file/TemporaryFileBlobImpl.cpp
--- firefox-84.0.2+build1/dom/file/TemporaryFileBlobImpl.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/TemporaryFileBlobImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "TemporaryFileBlobImpl.h"
 
 #include "RemoteLazyInputStreamThread.h"
+#include "mozilla/ErrorResult.h"
 #include "nsFileStreams.h"
 #include "nsIFile.h"
 #include "nsIFileStreams.h"
diff -Nru firefox-84.0.2+build1/dom/file/uri/BlobURLChannel.cpp firefox-85.0+build1/dom/file/uri/BlobURLChannel.cpp
--- firefox-84.0.2+build1/dom/file/uri/BlobURLChannel.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/uri/BlobURLChannel.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BlobURL.h"
 #include "mozilla/dom/BlobURLInputStream.h"
-#include "mozilla/ScopeExit.h"
 
 using namespace mozilla::dom;
 
@@ -72,4 +71,4 @@
   inputStream.forget(aResult);
 
   return NS_OK;
-}
\ No newline at end of file
+}
diff -Nru firefox-84.0.2+build1/dom/file/uri/BlobURLInputStream.cpp firefox-85.0+build1/dom/file/uri/BlobURLInputStream.cpp
--- firefox-84.0.2+build1/dom/file/uri/BlobURLInputStream.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/uri/BlobURLInputStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "BlobURLChannel.h"
 #include "BlobURLProtocolHandler.h"
 
+#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "nsStreamUtils.h"
diff -Nru firefox-84.0.2+build1/dom/file/uri/BlobURLInputStream.h firefox-85.0+build1/dom/file/uri/BlobURLInputStream.h
--- firefox-84.0.2+build1/dom/file/uri/BlobURLInputStream.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/file/uri/BlobURLInputStream.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/Mutex.h"
+#include "nsCOMPtr.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIInputStreamLength.h"
 
diff -Nru firefox-84.0.2+build1/dom/file/uri/BlobURLProtocolHandler.cpp firefox-85.0+build1/dom/file/uri/BlobURLProtocolHandler.cpp
--- firefox-84.0.2+build1/dom/file/uri/BlobURLProtocolHandler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/file/uri/BlobURLProtocolHandler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -23,6 +23,7 @@
 #include "mozilla/OriginAttributes.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "nsClassHashtable.h"
 #include "nsContentUtils.h"
 #include "nsError.h"
diff -Nru firefox-84.0.2+build1/dom/filehandle/ActorsParent.cpp firefox-85.0+build1/dom/filehandle/ActorsParent.cpp
--- firefox-84.0.2+build1/dom/filehandle/ActorsParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filehandle/ActorsParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,9 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/PBackgroundFileHandleParent.h"
 #include "mozilla/dom/PBackgroundFileRequestParent.h"
@@ -21,6 +23,7 @@
 #include "nsDebug.h"
 #include "nsError.h"
 #include "nsIEventTarget.h"
+#include "nsIFile.h"
 #include "nsIFileStreams.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
diff -Nru firefox-84.0.2+build1/dom/filehandle/PBackgroundFileRequest.ipdl firefox-85.0+build1/dom/filehandle/PBackgroundFileRequest.ipdl
--- firefox-84.0.2+build1/dom/filehandle/PBackgroundFileRequest.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filehandle/PBackgroundFileRequest.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -4,8 +4,7 @@
 
 include protocol PBackgroundFileHandle;
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/filehandle/SerializationHelpers.h firefox-85.0+build1/dom/filehandle/SerializationHelpers.h
--- firefox-84.0.2+build1/dom/filehandle/SerializationHelpers.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filehandle/SerializationHelpers.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_filehandle_SerializationHelpers_h
 #define mozilla_dom_filehandle_SerializationHelpers_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "mozilla/dom/FileModeBinding.h"
 
diff -Nru firefox-84.0.2+build1/dom/filesystem/compat/CallbackRunnables.h firefox-85.0+build1/dom/filesystem/compat/CallbackRunnables.h
--- firefox-84.0.2+build1/dom/filesystem/compat/CallbackRunnables.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/compat/CallbackRunnables.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "FileSystemDirectoryEntry.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
+#include "nsThreadUtils.h"
 
 class nsIGlobalObject;
 
diff -Nru firefox-84.0.2+build1/dom/filesystem/compat/FileSystemDirectoryReader.h firefox-85.0+build1/dom/filesystem/compat/FileSystemDirectoryReader.h
--- firefox-84.0.2+build1/dom/filesystem/compat/FileSystemDirectoryReader.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/compat/FileSystemDirectoryReader.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,13 +8,14 @@
 #define mozilla_dom_FileSystemDirectoryReader_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FileSystemDirectoryEntry.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Directory;
diff -Nru firefox-84.0.2+build1/dom/filesystem/compat/FileSystemEntry.h firefox-85.0+build1/dom/filesystem/compat/FileSystemEntry.h
--- firefox-84.0.2+build1/dom/filesystem/compat/FileSystemEntry.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/compat/FileSystemEntry.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_FileSystemEntry_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FileSystemBinding.h"
 #include "nsCycleCollectionParticipant.h"
@@ -16,6 +15,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystem;
diff -Nru firefox-84.0.2+build1/dom/filesystem/compat/FileSystem.h firefox-85.0+build1/dom/filesystem/compat/FileSystem.h
--- firefox-84.0.2+build1/dom/filesystem/compat/FileSystem.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/compat/FileSystem.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_FileSystem_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
diff -Nru firefox-84.0.2+build1/dom/filesystem/Directory.cpp firefox-85.0+build1/dom/filesystem/Directory.cpp
--- firefox-84.0.2+build1/dom/filesystem/Directory.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/Directory.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,9 @@
 #include "GetFilesTask.h"
 
 #include "nsCharSeparatedTokenizer.h"
+#include "nsIFile.h"
 #include "nsString.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/DirectoryBinding.h"
 #include "mozilla/dom/FileSystemBase.h"
 #include "mozilla/dom/FileSystemUtils.h"
diff -Nru firefox-84.0.2+build1/dom/filesystem/Directory.h firefox-85.0+build1/dom/filesystem/Directory.h
--- firefox-84.0.2+build1/dom/filesystem/Directory.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/Directory.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,13 +8,14 @@
 #define mozilla_dom_Directory_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/File.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class FileSystemBase;
diff -Nru firefox-84.0.2+build1/dom/filesystem/FileSystemBase.cpp firefox-85.0+build1/dom/filesystem/FileSystemBase.cpp
--- firefox-84.0.2+build1/dom/filesystem/FileSystemBase.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/FileSystemBase.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,8 +6,11 @@
 
 #include "mozilla/dom/FileSystemBase.h"
 
+#include "mozilla/ErrorResult.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/FileSystemUtils.h"
 #include "nsCharSeparatedTokenizer.h"
+#include "nsIFile.h"
 #include "OSFileSystem.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/filesystem/FileSystemRequestParent.cpp firefox-85.0+build1/dom/filesystem/FileSystemRequestParent.cpp
--- firefox-84.0.2+build1/dom/filesystem/FileSystemRequestParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/FileSystemRequestParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,11 +11,14 @@
 #include "GetFileOrDirectoryTask.h"
 #include "GetFilesTask.h"
 
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/FileSystemBase.h"
 #include "mozilla/dom/FileSystemSecurity.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/dom/OSFileSystem.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 #include "nsProxyRelease.h"
 
diff -Nru firefox-84.0.2+build1/dom/filesystem/FileSystemTaskBase.cpp firefox-85.0+build1/dom/filesystem/FileSystemTaskBase.cpp
--- firefox-84.0.2+build1/dom/filesystem/FileSystemTaskBase.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/FileSystemTaskBase.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -70,29 +70,6 @@
   return target->Dispatch(aRunnable, NS_DISPATCH_NORMAL);
 }
 
-// This runnable is used when an error value is set before doing any real
-// operation on the I/O thread. In this case we skip all and we directly
-// communicate the error.
-class ErrorRunnable final : public CancelableRunnable {
- public:
-  explicit ErrorRunnable(FileSystemTaskChildBase* aTask)
-      : CancelableRunnable("ErrorRunnable"), mTask(aTask) {
-    MOZ_ASSERT(aTask);
-  }
-
-  NS_IMETHOD
-  Run() override {
-    MOZ_ASSERT(NS_IsMainThread());
-    MOZ_ASSERT(mTask->HasError());
-
-    mTask->HandlerCallback();
-    return NS_OK;
-  }
-
- private:
-  RefPtr<FileSystemTaskChildBase> mTask;
-};
-
 }  // anonymous namespace
 
 /**
diff -Nru firefox-84.0.2+build1/dom/filesystem/FileSystemTaskBase.h firefox-85.0+build1/dom/filesystem/FileSystemTaskBase.h
--- firefox-84.0.2+build1/dom/filesystem/FileSystemTaskBase.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/FileSystemTaskBase.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,13 +7,14 @@
 #ifndef mozilla_dom_FileSystemTaskBase_h
 #define mozilla_dom_FileSystemTaskBase_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/FileSystemRequestParent.h"
 #include "mozilla/dom/PFileSystemRequestChild.h"
 #include "nsIGlobalObject.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetDirectoryListingTask.h firefox-85.0+build1/dom/filesystem/GetDirectoryListingTask.h
--- firefox-84.0.2+build1/dom/filesystem/GetDirectoryListingTask.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetDirectoryListingTask.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,9 +9,10 @@
 
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetFileOrDirectoryTask.h firefox-85.0+build1/dom/filesystem/GetFileOrDirectoryTask.h
--- firefox-84.0.2+build1/dom/filesystem/GetFileOrDirectoryTask.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetFileOrDirectoryTask.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,9 +9,10 @@
 
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetFilesHelper.cpp firefox-85.0+build1/dom/filesystem/GetFilesHelper.cpp
--- firefox-84.0.2+build1/dom/filesystem/GetFilesHelper.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetFilesHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,11 +9,13 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileBlobImpl.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "FileSystemUtils.h"
 #include "nsContentUtils.h"
+#include "nsNetCID.h"
 #include "nsProxyRelease.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetFilesHelper.h firefox-85.0+build1/dom/filesystem/GetFilesHelper.h
--- firefox-84.0.2+build1/dom/filesystem/GetFilesHelper.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetFilesHelper.h	2021-01-18 19:58:09.000000000 +0000
@@ -18,6 +18,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetFilesTask.cpp firefox-85.0+build1/dom/filesystem/GetFilesTask.cpp
--- firefox-84.0.2+build1/dom/filesystem/GetFilesTask.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetFilesTask.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "HTMLSplitOnSpacesTokenizer.h"
 #include "js/Value.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FileSystemBase.h"
 #include "mozilla/dom/FileSystemUtils.h"
diff -Nru firefox-84.0.2+build1/dom/filesystem/GetFilesTask.h firefox-85.0+build1/dom/filesystem/GetFilesTask.h
--- firefox-84.0.2+build1/dom/filesystem/GetFilesTask.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/GetFilesTask.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,9 +10,10 @@
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/FileSystemTaskBase.h"
 #include "mozilla/dom/GetFilesHelper.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BlobImpl;
diff -Nru firefox-84.0.2+build1/dom/filesystem/tests/mochitest.ini firefox-85.0+build1/dom/filesystem/tests/mochitest.ini
--- firefox-84.0.2+build1/dom/filesystem/tests/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/tests/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -6,5 +6,7 @@
 
 [test_basic.html]
 [test_webkitdirectory.html]
+skip-if = os == "android" # Bug 1674428
+support-files = script_promptHandler.js
 [test_worker_basic.html]
 [test_bug1319088.html]
diff -Nru firefox-84.0.2+build1/dom/filesystem/tests/script_promptHandler.js firefox-85.0+build1/dom/filesystem/tests/script_promptHandler.js
--- firefox-84.0.2+build1/dom/filesystem/tests/script_promptHandler.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/tests/script_promptHandler.js	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,20 @@
+/* eslint-env mozilla/frame-script */
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+let dialogObserverTopic = "common-dialog-loaded";
+
+function dialogObserver(subj, topic, data) {
+  subj.document.querySelector("dialog").acceptDialog();
+  sendAsyncMessage("promptAccepted");
+}
+
+addMessageListener("init", message => {
+  Services.obs.addObserver(dialogObserver, dialogObserverTopic);
+  sendAsyncMessage("initDone");
+});
+
+addMessageListener("cleanup", message => {
+  Services.obs.removeObserver(dialogObserver, dialogObserverTopic);
+  sendAsyncMessage("cleanupDone");
+});
diff -Nru firefox-84.0.2+build1/dom/filesystem/tests/test_webkitdirectory.html firefox-85.0+build1/dom/filesystem/tests/test_webkitdirectory.html
--- firefox-84.0.2+build1/dom/filesystem/tests/test_webkitdirectory.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/filesystem/tests/test_webkitdirectory.html	2021-01-18 19:58:09.000000000 +0000
@@ -14,25 +14,44 @@
 
 <script type="application/javascript">
 
+const { AppConstants } = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+
+let promptHandler;
+
+function waitForEvent(element, eventName) {
+  return new Promise(function(resolve) {
+    element.addEventListener(eventName, e => resolve(e.detail), { once: true });
+  });
+}
+
+function waitForPromptHandled() {
+  return new Promise(resolve => promptHandler.addMessageListener("promptAccepted", resolve));
+}
+
 function populateInputFile(aInputFile) {
   var url = SimpleTest.getTestFileURL("script_fileList.js");
   var script = SpecialPowers.loadChromeScript(url);
 
   var MockFilePicker = SpecialPowers.MockFilePicker;
-  MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen);
+  MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder);
 
-  function onOpened(message) {
+  async function onOpened(message) {
     MockFilePicker.useDirectory(message.dir);
 
-    var input = document.getElementById(aInputFile);
+    let input = document.getElementById(aInputFile);
     input.setAttribute("data-name", message.name);
-    input.addEventListener("change", function() {
-      MockFilePicker.cleanup();
-      script.destroy();
-      next();
-    }, {once: true});
+
+    let promptHandled = waitForPromptHandled();
+    let changeEvent = waitForEvent(input, "change");
 
     input.click();
+
+    await promptHandled;
+    await changeEvent;
+
+    MockFilePicker.cleanup();
+    script.destroy();
+    next();
   }
 
   script.addMessageListener("dir.opened", onOpened);
@@ -91,7 +110,8 @@
   var script = SpecialPowers.loadChromeScript(url);
 
   var MockFilePicker = SpecialPowers.MockFilePicker;
-  MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen);
+  MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder);
+  let promptHandled;
 
   // Let's start retrieving the root nsIFile object
   new Promise(function(resolve) {
@@ -105,11 +125,13 @@
   })
 
   // input.click() pointing to the root dir
-  .then(function(aDir) {
+  .then(async function(aDir) {
     MockFilePicker.cleanup();
-    MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen);
+    MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder);
     MockFilePicker.useDirectory(aDir);
     var input = document.getElementById("inputFileDirectoryChange");
+
+    promptHandled = waitForPromptHandled();
     input.click();
   })
 
@@ -128,33 +150,46 @@
   })
 
   // Now let's click again and wait for onchange.
-  .then(function(aDir) {
-    return new Promise(function(resolve) {
+  .then(async function(aDir) {
       MockFilePicker.cleanup();
-      MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen);
+      MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder);
       MockFilePicker.useDirectory(aDir);
 
-      var input = document.getElementById("inputFileDirectoryChange");
-      input.addEventListener("change", function() {
-        MockFilePicker.cleanup();
-        resolve();
-      });
+      let input = document.getElementById("inputFileDirectoryChange");
+      let changeEvent = waitForEvent(input, "change");
 
       input.click();
-    });
-  })
 
+      await promptHandled;
+      await changeEvent;
+
+      MockFilePicker.cleanup();
+  })
   .then(function() {
     test_fileList("inputFileWebkitDirectory", testDirData);
   });
 }
 
-function test_setup() {
+async function test_setup() {
+  let promptHandlerUrl = SimpleTest.getTestFileURL("script_promptHandler.js")
+  promptHandler = SpecialPowers.loadChromeScript(promptHandlerUrl);
+
+  let promptHandlerReady = new Promise(resolve => promptHandler.addMessageListener("initDone", resolve));
+  promptHandler.sendAsyncMessage("init");
+  await promptHandlerReady;
+
   SpecialPowers.pushPrefEnv({"set": [["dom.input.dirpicker", true],
                                      ["dom.filesystem.pathcheck.disabled", true],
                                      ["dom.webkitBlink.dirPicker.enabled", true]]}, next);
 }
 
+async function test_cleanup() {
+  let promptHandlerDone = new Promise(resolve => promptHandler.addMessageListener("cleanupDone", resolve));
+  promptHandler.sendAsyncMessage("cleanup");
+  await promptHandlerDone;
+  promptHandler.destroy();
+}
+
 var testDirData = [ { name: "foo.txt", path: "/foo.txt" },
                     { name: "bar.txt", path: "/subdir/bar.txt" }];
 
@@ -174,14 +209,15 @@
   test_changeDataWhileWorking,
 ];
 
-function next() {
+async function next() {
   if (!tests.length) {
+    await test_cleanup();
     SimpleTest.finish();
     return;
   }
 
   var test = tests.shift();
-  test();
+  await test();
 }
 
 SimpleTest.waitForExplicitFinish();
diff -Nru firefox-84.0.2+build1/dom/gamepad/android/AndroidGamepad.cpp firefox-85.0+build1/dom/gamepad/android/AndroidGamepad.cpp
--- firefox-84.0.2+build1/dom/gamepad/android/AndroidGamepad.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/android/AndroidGamepad.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -86,9 +86,11 @@
       java::GeckoAppShell::GetApplicationContext());
 }
 
-void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
-                                   uint32_t aLightColorIndex, uint8_t aRed,
-                                   uint8_t aGreen, uint8_t aBlue) {
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                                   const Tainted<uint32_t>& aLightColorIndex,
+                                   const Tainted<uint8_t>& aRed,
+                                   const Tainted<uint8_t>& aGreen,
+                                   const Tainted<uint8_t>& aBlue) {
   NS_WARNING("Android doesn't support gamepad light indicator.");
 }
 
diff -Nru firefox-84.0.2+build1/dom/gamepad/cocoa/CocoaGamepad.cpp firefox-85.0+build1/dom/gamepad/cocoa/CocoaGamepad.cpp
--- firefox-84.0.2+build1/dom/gamepad/cocoa/CocoaGamepad.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/cocoa/CocoaGamepad.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -207,8 +207,11 @@
 
   void Startup();
   void Shutdown();
-  void SetLightIndicatorColor(uint32_t aControllerIdx, uint32_t aLightIndex,
-                              uint8_t aRed, uint8_t aGreen, uint8_t aBlue);
+  void SetLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                              const Tainted<uint32_t>& aLightColorIndex,
+                              const Tainted<uint8_t>& aRed,
+                              const Tainted<uint8_t>& aGreen,
+                              const Tainted<uint8_t>& aBlue);
   friend class DarwinGamepadServiceStartupRunnable;
   friend class DarwinGamepadServiceShutdownRunnable;
 };
@@ -565,32 +568,35 @@
   mIsRunning = false;
 }
 
-void DarwinGamepadService::SetLightIndicatorColor(uint32_t aControllerIdx,
-                                                  uint32_t aLightColorIndex,
-                                                  uint8_t aRed, uint8_t aGreen,
-                                                  uint8_t aBlue) {
+void DarwinGamepadService::SetLightIndicatorColor(
+    const Tainted<uint32_t>& aControllerIdx,
+    const Tainted<uint32_t>& aLightColorIndex, const Tainted<uint8_t>& aRed,
+    const Tainted<uint8_t>& aGreen, const Tainted<uint8_t>& aBlue) {
   // We get aControllerIdx from GamepadPlatformService::AddGamepad(),
   // It begins from 1 and is stored at Gamepad.id.
-  const Gamepad* gamepad = nullptr;
-  for (const auto& pad : mGamepads) {
-    if (pad.mSuperIndex == aControllerIdx) {
-      gamepad = &pad;
-      break;
-    }
-  }
+  const Gamepad* gamepad = MOZ_FIND_AND_VALIDATE(
+      aControllerIdx, list_item.mSuperIndex == aControllerIdx, mGamepads);
   if (!gamepad) {
     MOZ_ASSERT(false);
     return;
   }
 
   RefPtr<GamepadRemapper> remapper = gamepad->mRemapper;
-  if (!remapper || remapper->GetLightIndicatorCount() <= aLightColorIndex) {
+  if (!remapper ||
+      MOZ_IS_VALID(aLightColorIndex,
+                   remapper->GetLightIndicatorCount() <= aLightColorIndex)) {
     MOZ_ASSERT(false);
     return;
   }
 
   std::vector<uint8_t> report;
-  remapper->GetLightColorReport(aRed, aGreen, aBlue, report);
+  remapper->GetLightColorReport(
+      MOZ_NO_VALIDATE(aRed, "uint8_t's range is the range of all valid values"),
+      MOZ_NO_VALIDATE(aGreen,
+                      "uint8_t's range is the range of all valid values"),
+      MOZ_NO_VALIDATE(aBlue,
+                      "uint8_t's range is the range of all valid values"),
+      report);
   gamepad->WriteOutputReport(report);
 }
 
@@ -619,9 +625,11 @@
   gService->Shutdown();
 }
 
-void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
-                                   uint32_t aLightColorIndex, uint8_t aRed,
-                                   uint8_t aGreen, uint8_t aBlue) {
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                                   const Tainted<uint32_t>& aLightColorIndex,
+                                   const Tainted<uint8_t>& aRed,
+                                   const Tainted<uint8_t>& aGreen,
+                                   const Tainted<uint8_t>& aBlue) {
   MOZ_ASSERT(gService);
   if (!gService) {
     return;
diff -Nru firefox-84.0.2+build1/dom/gamepad/fallback/FallbackGamepad.cpp firefox-85.0+build1/dom/gamepad/fallback/FallbackGamepad.cpp
--- firefox-84.0.2+build1/dom/gamepad/fallback/FallbackGamepad.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/fallback/FallbackGamepad.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,8 +13,11 @@
 
 void StopGamepadMonitoring() {}
 
-void SetGamepadLightIndicatorColor(uint32_t, uint32_t, uint8_t, uint8_t,
-                                   uint8_t) {}
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>&,
+                                   const Tainted<uint32_t>&,
+                                   const Tainted<uint8_t>&,
+                                   const Tainted<uint8_t>&,
+                                   const Tainted<uint8_t>&) {}
 
 }  // namespace dom
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/gamepad/Gamepad.h firefox-85.0+build1/dom/gamepad/Gamepad.h
--- firefox-84.0.2+build1/dom/gamepad/Gamepad.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/Gamepad.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_gamepad_Gamepad_h
 #define mozilla_dom_gamepad_Gamepad_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/GamepadBinding.h"
 #include "mozilla/dom/GamepadButton.h"
 #include "mozilla/dom/GamepadPose.h"
@@ -17,6 +16,7 @@
 #include "mozilla/dom/Performance.h"
 #include <stdint.h>
 #include "nsCOMPtr.h"
+#include "nsDataHashtable.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
diff -Nru firefox-84.0.2+build1/dom/gamepad/GamepadLightIndicator.cpp firefox-85.0+build1/dom/gamepad/GamepadLightIndicator.cpp
--- firefox-84.0.2+build1/dom/gamepad/GamepadLightIndicator.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/GamepadLightIndicator.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/GamepadLightIndicator.h"
 #include "mozilla/dom/GamepadManager.h"
 #include "mozilla/dom/Promise.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/gamepad/GamepadManager.cpp firefox-85.0+build1/dom/gamepad/GamepadManager.cpp
--- firefox-84.0.2+build1/dom/gamepad/GamepadManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/GamepadManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/GamepadEvent.h"
 #include "mozilla/dom/GamepadEventChannelChild.h"
 #include "mozilla/dom/GamepadMonitoring.h"
+#include "mozilla/dom/Promise.h"
 
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
diff -Nru firefox-84.0.2+build1/dom/gamepad/GamepadMonitoring.h firefox-85.0+build1/dom/gamepad/GamepadMonitoring.h
--- firefox-84.0.2+build1/dom/gamepad/GamepadMonitoring.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/GamepadMonitoring.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,9 +14,11 @@
 // (linux/LinuxGamepad.cpp, cocoa/CocoaGamepad.cpp, etc)
 void StartGamepadMonitoring();
 void StopGamepadMonitoring();
-void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
-                                   uint32_t aLightColorIndex, uint8_t aRed,
-                                   uint8_t aGreen, uint8_t aBlue);
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                                   const Tainted<uint32_t>& aLightColorIndex,
+                                   const Tainted<uint8_t>& aRed,
+                                   const Tainted<uint8_t>& aGreen,
+                                   const Tainted<uint8_t>& aBlue);
 
 }  // namespace dom
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/gamepad/GamepadServiceTest.h firefox-85.0+build1/dom/gamepad/GamepadServiceTest.h
--- firefox-84.0.2+build1/dom/gamepad/GamepadServiceTest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/GamepadServiceTest.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/dom/GamepadBinding.h"
+#include "mozilla/dom/TypedArray.h"
 #include "mozilla/WeakPtr.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/gamepad/GamepadTouch.cpp firefox-85.0+build1/dom/gamepad/GamepadTouch.cpp
--- firefox-84.0.2+build1/dom/gamepad/GamepadTouch.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/GamepadTouch.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,8 +5,11 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/GamepadTouch.h"
+
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/GamepadManager.h"
 #include "mozilla/dom/Promise.h"
+#include "mozilla/dom/TypedArray.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventChannelParent.cpp firefox-85.0+build1/dom/gamepad/ipc/GamepadEventChannelParent.cpp
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventChannelParent.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadEventChannelParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -66,12 +66,15 @@
 }
 
 mozilla::ipc::IPCResult GamepadEventChannelParent::RecvVibrateHaptic(
-    const uint32_t& aControllerIdx, const uint32_t& aHapticIndex,
-    const double& aIntensity, const double& aDuration,
-    const uint32_t& aPromiseID) {
+    const Tainted<uint32_t>& aControllerIdx,
+    const Tainted<uint32_t>& aHapticIndex, const Tainted<double>& aIntensity,
+    const Tainted<double>& aDuration, const Tainted<uint32_t>& aPromiseID) {
   // TODO: Bug 680289, implement for standard gamepads
 
-  if (SendReplyGamepadPromise(aPromiseID)) {
+  // TODO: simplify tainted validation, see 1610570
+  if (SendReplyGamepadPromise(MOZ_NO_VALIDATE(
+          aPromiseID,
+          "This value is unused aside from being passed back to the child."))) {
     return IPC_OK();
   }
 
@@ -79,19 +82,23 @@
 }
 
 mozilla::ipc::IPCResult GamepadEventChannelParent::RecvStopVibrateHaptic(
-    const uint32_t& aControllerIdx) {
+    const Tainted<uint32_t>& aControllerIdx) {
   // TODO: Bug 680289, implement for standard gamepads
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult GamepadEventChannelParent::RecvLightIndicatorColor(
-    const uint32_t& aControllerIdx, const uint32_t& aLightColorIndex,
-    const uint8_t& aRed, const uint8_t& aGreen, const uint8_t& aBlue,
-    const uint32_t& aPromiseID) {
+    const Tainted<uint32_t>& aControllerIdx,
+    const Tainted<uint32_t>& aLightColorIndex, const Tainted<uint8_t>& aRed,
+    const Tainted<uint8_t>& aGreen, const Tainted<uint8_t>& aBlue,
+    const Tainted<uint32_t>& aPromiseID) {
   SetGamepadLightIndicatorColor(aControllerIdx, aLightColorIndex, aRed, aGreen,
                                 aBlue);
 
-  if (SendReplyGamepadPromise(aPromiseID)) {
+  // TODO: simplify tainted validation, see 1610570
+  if (SendReplyGamepadPromise(MOZ_NO_VALIDATE(
+          aPromiseID,
+          "This value is unused aside from being passed back to the child."))) {
     return IPC_OK();
   }
 
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventChannelParent.h firefox-85.0+build1/dom/gamepad/ipc/GamepadEventChannelParent.h
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventChannelParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadEventChannelParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -18,16 +18,17 @@
   static already_AddRefed<GamepadEventChannelParent> Create();
   void ActorDestroy(ActorDestroyReason aWhy) override;
 
-  mozilla::ipc::IPCResult RecvVibrateHaptic(const uint32_t& aControllerIdx,
-                                            const uint32_t& aHapticIndex,
-                                            const double& aIntensity,
-                                            const double& aDuration,
-                                            const uint32_t& aPromiseID);
-  mozilla::ipc::IPCResult RecvStopVibrateHaptic(const uint32_t& aControllerIdx);
+  mozilla::ipc::IPCResult RecvVibrateHaptic(
+      const Tainted<uint32_t>& aControllerIdx,
+      const Tainted<uint32_t>& aHapticIndex, const Tainted<double>& aIntensity,
+      const Tainted<double>& aDuration, const Tainted<uint32_t>& aPromiseID);
+  mozilla::ipc::IPCResult RecvStopVibrateHaptic(
+      const Tainted<uint32_t>& aControllerIdx);
   mozilla::ipc::IPCResult RecvLightIndicatorColor(
-      const uint32_t& aControllerIdx, const uint32_t& aLightColorIndex,
-      const uint8_t& aRed, const uint8_t& aGreen, const uint8_t& aBlue,
-      const uint32_t& aPromiseID);
+      const Tainted<uint32_t>& aControllerIdx,
+      const Tainted<uint32_t>& aLightColorIndex, const Tainted<uint8_t>& aRed,
+      const Tainted<uint8_t>& aGreen, const Tainted<uint8_t>& aBlue,
+      const Tainted<uint32_t>& aPromiseID);
   void DispatchUpdateEvent(const GamepadChangeEvent& aEvent);
 
   GamepadEventChannelParent(const GamepadEventChannelParent&) = delete;
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventTypes.ipdlh firefox-85.0+build1/dom/gamepad/ipc/GamepadEventTypes.ipdlh
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadEventTypes.ipdlh	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadEventTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -2,12 +2,14 @@
  * 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/. */
 
-using mozilla::dom::GamepadServiceType from "mozilla/dom/GamepadMessageUtils.h";
-using mozilla::dom::GamepadPoseState from "mozilla/dom/GamepadMessageUtils.h";
-using mozilla::dom::GamepadTouchState from "mozilla/dom/GamepadMessageUtils.h";
-using mozilla::dom::GamepadLightIndicatorType from "mozilla/dom/GamepadMessageUtils.h";
-using mozilla::dom::GamepadMappingType from "mozilla/dom/GamepadMessageUtils.h";
-using mozilla::dom::GamepadHand from "mozilla/dom/GamepadMessageUtils.h";
+include "mozilla/dom/GamepadMessageUtils.h";
+
+using mozilla::dom::GamepadServiceType from "mozilla/dom/GamepadServiceType.h";
+using mozilla::dom::GamepadPoseState from "mozilla/dom/GamepadPoseState.h";
+using mozilla::dom::GamepadTouchState from "mozilla/dom/GamepadTouchState.h";
+using mozilla::dom::GamepadLightIndicatorType from "mozilla/dom/GamepadLightIndicatorBinding.h";
+using mozilla::dom::GamepadMappingType from "mozilla/dom/GamepadBinding.h";
+using mozilla::dom::GamepadHand from "mozilla/dom/GamepadBinding.h";
 
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadMessageUtils.h firefox-85.0+build1/dom/gamepad/ipc/GamepadMessageUtils.h
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadMessageUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_gamepad_GamepadMessageUtils_h
 #define mozilla_dom_gamepad_GamepadMessageUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/dom/GamepadBinding.h"
 #include "mozilla/dom/GamepadLightIndicatorBinding.h"
 #include "mozilla/dom/GamepadPoseState.h"
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadTestChannelChild.cpp firefox-85.0+build1/dom/gamepad/ipc/GamepadTestChannelChild.cpp
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadTestChannelChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadTestChannelChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "GamepadTestChannelChild.h"
 
+#include "mozilla/dom/GamepadServiceTest.h"
+
 namespace mozilla::dom {
 
 already_AddRefed<GamepadTestChannelChild> GamepadTestChannelChild::Create(
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/GamepadTestChannelChild.h firefox-85.0+build1/dom/gamepad/ipc/GamepadTestChannelChild.h
--- firefox-84.0.2+build1/dom/gamepad/ipc/GamepadTestChannelChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/GamepadTestChannelChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -4,12 +4,13 @@
  * 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_GamepadTestChannelChild_h_
+#define mozilla_dom_GamepadTestChannelChild_h_
+
 #include "mozilla/dom/PGamepadTestChannelChild.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/WeakPtr.h"
-
-#ifndef mozilla_dom_GamepadTestChannelChild_h_
-#  define mozilla_dom_GamepadTestChannelChild_h_
+#include "nsRefPtrHashtable.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/gamepad/ipc/PGamepadEventChannel.ipdl firefox-85.0+build1/dom/gamepad/ipc/PGamepadEventChannel.ipdl
--- firefox-84.0.2+build1/dom/gamepad/ipc/PGamepadEventChannel.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/ipc/PGamepadEventChannel.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -13,10 +13,10 @@
     async __delete__();
 
     async VibrateHaptic(uint32_t aControllerIdx, uint32_t aHapticIndex,
-                        double aIntensity, double aDuration, uint32_t aPromiseID);
-    async StopVibrateHaptic(uint32_t aControllerIdx);
+                        double aIntensity, double aDuration, uint32_t aPromiseID) tainted;
+    async StopVibrateHaptic(uint32_t aControllerIdx) tainted;
     async LightIndicatorColor(uint32_t aControllerIdx, uint32_t aLightColorIndex,
-                              uint8_t aRed, uint8_t aGreen, uint8_t aBlue, uint32_t aPromiseID);
+                              uint8_t aRed, uint8_t aGreen, uint8_t aBlue, uint32_t aPromiseID) tainted;
 
   child:
     async GamepadUpdate(GamepadChangeEvent aGamepadEvent);
diff -Nru firefox-84.0.2+build1/dom/gamepad/linux/LinuxGamepad.cpp firefox-85.0+build1/dom/gamepad/linux/LinuxGamepad.cpp
--- firefox-84.0.2+build1/dom/gamepad/linux/LinuxGamepad.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/linux/LinuxGamepad.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include "nscore.h"
 #include "mozilla/dom/GamepadPlatformService.h"
+#include "mozilla/Tainting.h"
 #include "udev.h"
 
 namespace {
@@ -342,9 +343,11 @@
   gService = nullptr;
 }
 
-void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
-                                   uint32_t aLightColorIndex, uint8_t aRed,
-                                   uint8_t aGreen, uint8_t aBlue) {
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                                   const Tainted<uint32_t>& aLightColorIndex,
+                                   const Tainted<uint8_t>& aRed,
+                                   const Tainted<uint8_t>& aGreen,
+                                   const Tainted<uint8_t>& aBlue) {
   // TODO: Bug 1523355.
   NS_WARNING("Linux doesn't support gamepad light indicator.");
 }
diff -Nru firefox-84.0.2+build1/dom/gamepad/linux/udev.h firefox-85.0+build1/dom/gamepad/linux/udev.h
--- firefox-84.0.2+build1/dom/gamepad/linux/udev.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/linux/udev.h	2021-01-18 19:58:09.000000000 +0000
@@ -68,10 +68,10 @@
 
  private:
   bool LoadSymbols() {
-#define DLSYM(s)                   \
-  do {                             \
-    s = (typeof(s))dlsym(lib, #s); \
-    if (!s) return false;          \
+#define DLSYM(s)                       \
+  do {                                 \
+    s = (__typeof__(s))dlsym(lib, #s); \
+    if (!s) return false;              \
   } while (0)
 
     DLSYM(udev_new);
diff -Nru firefox-84.0.2+build1/dom/gamepad/windows/WindowsGamepad.cpp firefox-85.0+build1/dom/gamepad/windows/WindowsGamepad.cpp
--- firefox-84.0.2+build1/dom/gamepad/windows/WindowsGamepad.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/gamepad/windows/WindowsGamepad.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -334,8 +334,11 @@
   void Shutdown();
   // Parse gamepad input from a WM_INPUT message.
   bool HandleRawInput(HRAWINPUT handle);
-  void SetLightIndicatorColor(uint32_t aControllerIdx, uint32_t aLightIndex,
-                              uint8_t aRed, uint8_t aGreen, uint8_t aBlue);
+  void SetLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                              const Tainted<uint32_t>& aLightColorIndex,
+                              const Tainted<uint8_t>& aRed,
+                              const Tainted<uint8_t>& aGreen,
+                              const Tainted<uint8_t>& aBlue);
   size_t WriteOutputReport(const std::vector<uint8_t>& aReport);
   static void XInputMessageLoopOnceCallback(nsITimer* aTimer, void* aClosure);
   static void DevicesChangeCallback(nsITimer* aTimer, void* aService);
@@ -883,32 +886,35 @@
   return true;
 }
 
-void WindowsGamepadService::SetLightIndicatorColor(uint32_t aControllerIdx,
-                                                   uint32_t aLightColorIndex,
-                                                   uint8_t aRed, uint8_t aGreen,
-                                                   uint8_t aBlue) {
+void WindowsGamepadService::SetLightIndicatorColor(
+    const Tainted<uint32_t>& aControllerIdx,
+    const Tainted<uint32_t>& aLightColorIndex, const Tainted<uint8_t>& aRed,
+    const Tainted<uint8_t>& aGreen, const Tainted<uint8_t>& aBlue) {
   // We get aControllerIdx from GamepadPlatformService::AddGamepad(),
   // It begins from 1 and is stored at Gamepad.id.
-  const Gamepad* gamepad = nullptr;
-  for (const auto& pad : mGamepads) {
-    if (pad.id == aControllerIdx) {
-      gamepad = &pad;
-      break;
-    }
-  }
+  const Gamepad* gamepad = (MOZ_FIND_AND_VALIDATE(
+      aControllerIdx, list_item.id == aControllerIdx, mGamepads));
   if (!gamepad) {
     MOZ_ASSERT(false);
     return;
   }
 
   RefPtr<GamepadRemapper> remapper = gamepad->remapper;
-  if (!remapper || remapper->GetLightIndicatorCount() <= aLightColorIndex) {
+  if (!remapper ||
+      MOZ_IS_VALID(aLightColorIndex,
+                   remapper->GetLightIndicatorCount() <= aLightColorIndex)) {
     MOZ_ASSERT(false);
     return;
   }
 
   std::vector<uint8_t> report;
-  remapper->GetLightColorReport(aRed, aGreen, aBlue, report);
+  remapper->GetLightColorReport(
+      MOZ_NO_VALIDATE(aRed, "uint8_t's range is the range of all valid values"),
+      MOZ_NO_VALIDATE(aGreen,
+                      "uint8_t's range is the range of all valid values"),
+      MOZ_NO_VALIDATE(aBlue,
+                      "uint8_t's range is the range of all valid values"),
+      report);
   WriteOutputReport(report);
 }
 
@@ -1118,9 +1124,11 @@
   gMonitorThread = nullptr;
 }
 
-void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
-                                   uint32_t aLightColorIndex, uint8_t aRed,
-                                   uint8_t aGreen, uint8_t aBlue) {
+void SetGamepadLightIndicatorColor(const Tainted<uint32_t>& aControllerIdx,
+                                   const Tainted<uint32_t>& aLightColorIndex,
+                                   const Tainted<uint8_t>& aRed,
+                                   const Tainted<uint8_t>& aGreen,
+                                   const Tainted<uint8_t>& aBlue) {
   MOZ_ASSERT(gService);
   if (!gService) {
     return;
diff -Nru firefox-84.0.2+build1/dom/geolocation/Geolocation.cpp firefox-85.0+build1/dom/geolocation/Geolocation.cpp
--- firefox-84.0.2+build1/dom/geolocation/Geolocation.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/geolocation/Geolocation.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -190,9 +190,8 @@
 nsGeolocationRequest::nsGeolocationRequest(
     Geolocation* aLocator, GeoPositionCallback aCallback,
     GeoPositionErrorCallback aErrorCallback,
-    UniquePtr<PositionOptions>&& aOptions,
-    nsIEventTarget* aMainThreadTarget, bool aWatchPositionRequest,
-    int32_t aWatchId)
+    UniquePtr<PositionOptions>&& aOptions, nsIEventTarget* aMainThreadTarget,
+    bool aWatchPositionRequest, int32_t aWatchId)
     : ContentPermissionRequestBase(
           aLocator->GetPrincipal(),
           ConvertWeakReferenceToWindow(aLocator->GetOwner()), "geo"_ns,
@@ -614,8 +613,7 @@
 
   if (XRE_IsContentProcess()) {
     ContentChild* cpc = ContentChild::GetSingleton();
-    cpc->SendAddGeolocationListener(IPC::Principal(aPrincipal),
-                                    HighAccuracyRequested());
+    cpc->SendAddGeolocationListener(HighAccuracyRequested());
     return NS_OK;
   }
 
diff -Nru firefox-84.0.2+build1/dom/grid/GridArea.h firefox-85.0+build1/dom/grid/GridArea.h
--- firefox-84.0.2+build1/dom/grid/GridArea.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/grid/GridArea.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/dom/GridBinding.h"
 #include "nsWrapperCache.h"
 
+class nsAtom;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/grid/Grid.cpp firefox-85.0+build1/dom/grid/Grid.cpp
--- firefox-84.0.2+build1/dom/grid/Grid.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/grid/Grid.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "GridArea.h"
 #include "GridDimension.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/GridBinding.h"
 #include "nsGridContainerFrame.h"
 
diff -Nru firefox-84.0.2+build1/dom/grid/Grid.h firefox-85.0+build1/dom/grid/Grid.h
--- firefox-84.0.2+build1/dom/grid/Grid.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/grid/Grid.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_Grid_h
 
 #include "GridArea.h"
-#include "mozilla/dom/Element.h"
 #include "nsGridContainerFrame.h"
 #include "nsISupports.h"
 #include "nsWrapperCache.h"
@@ -16,6 +15,7 @@
 namespace mozilla {
 namespace dom {
 
+class Element;
 class GridDimension;
 
 class Grid : public nsISupports, public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/dom/grid/GridLine.cpp firefox-85.0+build1/dom/grid/GridLine.cpp
--- firefox-84.0.2+build1/dom/grid/GridLine.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/grid/GridLine.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "GridLines.h"
 #include "mozilla/dom/GridBinding.h"
+#include "nsAtom.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/grid/GridLine.h firefox-85.0+build1/dom/grid/GridLine.h
--- firefox-84.0.2+build1/dom/grid/GridLine.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/grid/GridLine.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,8 @@
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 
+class nsAtom;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLAllCollection.cpp firefox-85.0+build1/dom/html/HTMLAllCollection.cpp
--- firefox-84.0.2+build1/dom/html/HTMLAllCollection.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLAllCollection.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/HTMLAllCollection.h"
 
+#include "jsfriendapi.h"
 #include "mozilla/dom/HTMLAllCollectionBinding.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/Document.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLAllCollection.h firefox-85.0+build1/dom/html/HTMLAllCollection.h
--- firefox-84.0.2+build1/dom/html/HTMLAllCollection.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLAllCollection.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_HTMLAllCollection_h
 #define mozilla_dom_HTMLAllCollection_h
 
+#include "js/RootingAPI.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"
 #include "nsRefPtrHashtable.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLAreaElement.cpp firefox-85.0+build1/dom/html/HTMLAreaElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLAreaElement.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLAreaElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLAnchorElement.h"
 #include "mozilla/dom/HTMLAreaElementBinding.h"
 #include "mozilla/EventDispatcher.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLCanvasElement.cpp firefox-85.0+build1/dom/html/HTMLCanvasElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLCanvasElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLCanvasElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,8 +16,10 @@
 #include "mozilla/Base64.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/PresShell.h"
 #include "mozilla/dom/CanvasCaptureMediaStream.h"
 #include "mozilla/dom/CanvasRenderingContext2D.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/GeneratePlaceholderCanvasData.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/File.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLCanvasElement.h firefox-85.0+build1/dom/html/HTMLCanvasElement.h
--- firefox-84.0.2+build1/dom/html/HTMLCanvasElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLCanvasElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -22,6 +22,7 @@
 
 class nsDisplayListBuilder;
 class nsICanvasRenderingContextInternal;
+class nsIInputStream;
 class nsITimerCallback;
 enum class gfxAlphaType;
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLDialogElement.cpp firefox-85.0+build1/dom/html/HTMLDialogElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLDialogElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLDialogElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/HTMLUnknownElement.h"
 #include "mozilla/StaticPrefs_dom.h"
 
+#include "nsContentUtils.h"
 #include "nsFocusManager.h"
 #include "nsIFrame.h"
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLEmbedElement.cpp firefox-85.0+build1/dom/html/HTMLEmbedElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLEmbedElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLEmbedElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -163,7 +163,18 @@
 
 bool HTMLEmbedElement::IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable,
                                        int32_t* aTabIndex) {
-  // Has plugin content: let the plugin decide what to do in terms of
+  // If we have decided that this is a blocked plugin then do not allow focus.
+  if ((Type() == eType_Null) &&
+      (PluginFallbackType() == eFallbackBlockAllPlugins)) {
+    if (aTabIndex) {
+      *aTabIndex = -1;
+    }
+
+    *aIsFocusable = false;
+    return false;
+  }
+
+  // Has non-plugin content: let the plugin decide what to do in terms of
   // internal focus from mouse clicks
   if (aTabIndex) {
     *aTabIndex = TabIndex();
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFontElement.cpp firefox-85.0+build1/dom/html/HTMLFontElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLFontElement.cpp	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFontElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "HTMLFontElement.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLFontElementBinding.h"
 #include "mozilla/MappedDeclarations.h"
 #include "nsAttrValueInlines.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFormControlsCollection.h firefox-85.0+build1/dom/html/HTMLFormControlsCollection.h
--- firefox-84.0.2+build1/dom/html/HTMLFormControlsCollection.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFormControlsCollection.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_HTMLFormControlsCollection_h
 #define mozilla_dom_HTMLFormControlsCollection_h
 
-#include "mozilla/dom/Element.h"  // DOMProxyHandler::getOwnPropertyDescriptor
 #include "nsIHTMLCollection.h"
 #include "nsInterfaceHashtable.h"
 #include "nsTArray.h"
@@ -20,6 +19,7 @@
 
 namespace mozilla {
 namespace dom {
+class Element;
 class HTMLFormElement;
 class HTMLImageElement;
 class OwningRadioNodeListOrElement;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFormElement.cpp firefox-85.0+build1/dom/html/HTMLFormElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLFormElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFormElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/ContentEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventStates.h"
+#include "mozilla/PresShell.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BindContext.h"
 #include "mozilla/dom/BrowsingContext.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFormElement.h firefox-85.0+build1/dom/html/HTMLFormElement.h
--- firefox-84.0.2+build1/dom/html/HTMLFormElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFormElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/PopupBlocker.h"
 #include "nsCOMPtr.h"
 #include "nsIForm.h"
 #include "nsIFormControl.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFormSubmission.cpp firefox-85.0+build1/dom/html/HTMLFormSubmission.cpp
--- firefox-84.0.2+build1/dom/html/HTMLFormSubmission.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFormSubmission.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsCOMPtr.h"
 #include "nsIForm.h"
 #include "mozilla/dom/Document.h"
+#include "nsComponentManagerUtils.h"
 #include "nsGkAtoms.h"
 #include "nsIFormControl.h"
 #include "nsError.h"
@@ -706,6 +707,17 @@
 
 // --------------------------------------------------------------------------
 
+HTMLFormSubmission::HTMLFormSubmission(
+    nsIURI* aActionURL, const nsAString& aTarget,
+    mozilla::NotNull<const mozilla::Encoding*> aEncoding, Element* aSubmitter)
+    : mActionURL(aActionURL),
+      mTarget(aTarget),
+      mEncoding(aEncoding),
+      mSubmitter(aSubmitter),
+      mInitiatedFromUserInput(UserActivation::IsHandlingUserInput()) {
+  MOZ_COUNT_CTOR(HTMLFormSubmission);
+}
+
 EncodingFormSubmission::EncodingFormSubmission(
     nsIURI* aActionURL, const nsAString& aTarget,
     NotNull<const Encoding*> aEncoding, Element* aSubmitter)
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFormSubmission.h firefox-85.0+build1/dom/html/HTMLFormSubmission.h
--- firefox-84.0.2+build1/dom/html/HTMLFormSubmission.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFormSubmission.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_HTMLFormSubmission_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/UserActivation.h"
 #include "mozilla/dom/HTMLDialogElement.h"
 #include "nsCOMPtr.h"
@@ -25,6 +24,7 @@
 
 class Blob;
 class Directory;
+class Element;
 class HTMLFormElement;
 
 /**
@@ -122,14 +122,7 @@
    */
   HTMLFormSubmission(nsIURI* aActionURL, const nsAString& aTarget,
                      mozilla::NotNull<const mozilla::Encoding*> aEncoding,
-                     Element* aSubmitter)
-      : mActionURL(aActionURL),
-        mTarget(aTarget),
-        mEncoding(aEncoding),
-        mSubmitter(aSubmitter),
-        mInitiatedFromUserInput(UserActivation::IsHandlingUserInput()) {
-    MOZ_COUNT_CTOR(HTMLFormSubmission);
-  }
+                     Element* aSubmitter);
 
   // The action url.
   nsCOMPtr<nsIURI> mActionURL;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLFrameSetElement.cpp firefox-85.0+build1/dom/html/HTMLFrameSetElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLFrameSetElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLFrameSetElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "HTMLFrameSetElement.h"
 #include "mozilla/dom/HTMLFrameSetElementBinding.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventHandlerBinding.h"
 #include "nsGlobalWindow.h"
 #include "mozilla/UniquePtrExtensions.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLIFrameElement.cpp firefox-85.0+build1/dom/html/HTMLIFrameElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLIFrameElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLIFrameElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/HTMLIFrameElement.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLIFrameElementBinding.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/MappedDeclarations.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLInputElement.cpp firefox-85.0+build1/dom/html/HTMLInputElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLInputElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLInputElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,12 +10,15 @@
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/dom/AutocompleteInfoBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/DocumentOrShadowRoot.h"
 #include "mozilla/dom/ElementBinding.h"
 #include "mozilla/dom/FileSystemUtils.h"
 #include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/HTMLFormSubmission.h"
+#include "mozilla/dom/WindowContext.h"
 #include "mozilla/dom/InputType.h"
 #include "mozilla/dom/UserActivation.h"
 #include "mozilla/dom/MutationEventBinding.h"
@@ -25,6 +28,7 @@
 #include "mozilla/TextUtils.h"
 #include "nsAttrValueInlines.h"
 #include "nsCRTGlue.h"
+#include "nsNetUtil.h"
 #include "nsQueryObject.h"
 
 #include "nsIRadioVisitor.h"
@@ -54,6 +58,7 @@
 #include "nsError.h"
 #include "nsIEditor.h"
 #include "nsAttrValueOrString.h"
+#include "nsIPromptCollection.h"
 
 #include "mozilla/PresState.h"
 #include "nsLinebreakConverter.h"  //to strip out carriage returns
@@ -482,6 +487,36 @@
     nsresult rv = mFilePicker->GetDomFileOrDirectory(getter_AddRefs(tmp));
     NS_ENSURE_SUCCESS(rv, rv);
 
+    // Show a prompt to get user confirmation before allowing folder access.
+    // This is to prevent sites from tricking the user into uploading files.
+    // See Bug 1338637.
+    if (mode == static_cast<int16_t>(nsIFilePicker::modeGetFolder)) {
+      nsCOMPtr<nsIPromptCollection> prompter =
+          do_GetService("@mozilla.org/embedcomp/prompt-collection;1");
+      if (!prompter) {
+        return NS_ERROR_NOT_AVAILABLE;
+      }
+
+      bool confirmed = false;
+      BrowsingContext* bc = mInput->OwnerDoc()->GetBrowsingContext();
+
+      // Get directory name
+      RefPtr<Directory> directory = static_cast<Directory*>(tmp.get());
+      nsAutoString directoryName;
+      ErrorResult error;
+      directory->GetName(directoryName, error);
+      if (NS_WARN_IF(error.Failed())) {
+        return error.StealNSResult();
+      }
+
+      rv = prompter->ConfirmFolderUpload(bc, directoryName, &confirmed);
+      NS_ENSURE_SUCCESS(rv, rv);
+      if (!confirmed) {
+        // User aborted upload
+        return NS_OK;
+      }
+    }
+
     RefPtr<Blob> blob = do_QueryObject(tmp);
     if (blob) {
       RefPtr<File> file = blob->ToFile();
@@ -629,19 +664,20 @@
 
 NS_IMPL_ISUPPORTS(nsColorPickerShownCallback, nsIColorPickerShownCallback)
 
-bool HTMLInputElement::IsPopupBlocked() const {
-  nsCOMPtr<nsPIDOMWindowOuter> win = OwnerDoc()->GetWindow();
-  MOZ_ASSERT(win, "window should not be null");
-  if (!win) {
-    return true;
+static bool IsPopupBlocked(Document* aDoc) {
+  if (aDoc->ConsumeTransientUserGestureActivation()) {
+    return false;
   }
 
-  // Check if page can open a popup without abuse regardless of allowed events
-  if (PopupBlocker::GetPopupControlState() <= PopupBlocker::openBlocked) {
-    return !PopupBlocker::TryUsePopupOpeningToken(OwnerDoc()->NodePrincipal());
+  WindowContext* wc = aDoc->GetWindowContext();
+  if (wc && wc->CanShowPopup()) {
+    return false;
   }
 
-  return !PopupBlocker::CanShowPopupByPermission(OwnerDoc()->NodePrincipal());
+  nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, "DOM"_ns, aDoc,
+                                  nsContentUtils::eDOM_PROPERTIES,
+                                  "InputPickerBlockedNoUserActivation");
+  return true;
 }
 
 nsresult HTMLInputElement::InitColorPicker() {
@@ -657,7 +693,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (IsPopupBlocked()) {
+  if (IsPopupBlocked(doc)) {
     return NS_OK;
   }
 
@@ -702,7 +738,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (IsPopupBlocked()) {
+  if (IsPopupBlocked(doc)) {
     return NS_OK;
   }
 
@@ -1056,8 +1092,13 @@
         nsAutoString value;
         GetNonFileValueInternal(value);
         // SetValueInternal handles setting the VALUE_CHANGED bit for us
-        rv = it->SetValueInternal(value, TextControlState::eSetValue_Notify);
-        NS_ENSURE_SUCCESS(rv, rv);
+        if (NS_WARN_IF(NS_FAILED(
+                rv = it->SetValueInternal(
+                    value,
+                    {ValueSetterOption::
+                         UpdateOverlayTextVisibilityAndInvalidateFrame})))) {
+          return rv;
+        }
       }
       break;
     case VALUE_MODE_FILENAME:
@@ -1574,9 +1615,9 @@
       // get the unsanitized value?
       nsresult rv = SetValueInternal(
           aValue, SanitizesOnValueGetter() ? nullptr : &currentValue,
-          TextControlState::eSetValue_ByContent |
-              TextControlState::eSetValue_Notify |
-              TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
+          {ValueSetterOption::ByContentAPI,
+           ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+           ValueSetterOption::MoveCursorToEndIfValueChanged});
       if (NS_FAILED(rv)) {
         aRv.Throw(rv);
         return;
@@ -1588,9 +1629,9 @@
     } else {
       nsresult rv = SetValueInternal(
           aValue,
-          TextControlState::eSetValue_ByContent |
-              TextControlState::eSetValue_Notify |
-              TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
+          {ValueSetterOption::ByContentAPI,
+           ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+           ValueSetterOption::MoveCursorToEndIfValueChanged});
       if (NS_FAILED(rv)) {
         aRv.Throw(rv);
         return;
@@ -2204,9 +2245,9 @@
       GetValueMode() == VALUE_MODE_VALUE && IsSingleLineTextControl(false);
 
   nsresult rv = SetValueInternal(
-      aValue, TextControlState::eSetValue_BySetUserInput |
-                  TextControlState::eSetValue_Notify |
-                  TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
+      aValue, {ValueSetterOption::BySetUserInputAPI,
+               ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+               ValueSetterOption::MoveCursorToEndIfValueChanged});
   NS_ENSURE_SUCCESS_VOID(rv);
 
   if (!isInputEventDispatchedByTextControlState) {
@@ -2597,19 +2638,21 @@
   }
 }
 
-nsresult HTMLInputElement::SetValueInternal(const nsAString& aValue,
-                                            const nsAString* aOldValue,
-                                            uint32_t aFlags) {
+nsresult HTMLInputElement::SetValueInternal(
+    const nsAString& aValue, const nsAString* aOldValue,
+    const ValueSetterOptions& aOptions) {
   MOZ_ASSERT(GetValueMode() != VALUE_MODE_FILENAME,
              "Don't call SetValueInternal for file inputs");
 
   // We want to remember if the SetValueInternal() call is being made for a XUL
   // element.  We do that by looking at the parent node here, and if that node
-  // is a XUL node, we consider our control a XUL control.
-  nsIContent* parent = GetParent();
-  if (parent && parent->IsXULElement()) {
-    aFlags |= TextControlState::eSetValue_ForXUL;
-  }
+  // is a XUL node, we consider our control a XUL control. XUL controls preserve
+  // edit history across value setters.
+  //
+  // TODO(emilio): Rather than doing this maybe add an attribute instead and
+  // read it only on chrome docs or something? That'd allow front-end code to
+  // move away from xul without weird side-effects.
+  const bool forcePreserveUndoHistory = mParent && mParent->IsXULElement();
 
   switch (GetValueMode()) {
     case VALUE_MODE_VALUE: {
@@ -2623,29 +2666,33 @@
       }
       // else DoneCreatingElement calls us again once mDoneCreating is true
 
-      bool setValueChanged = !!(aFlags & TextControlState::eSetValue_Notify);
+      const bool setValueChanged = aOptions.contains(
+          ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame);
       if (setValueChanged) {
         SetValueChanged(true);
       }
 
       if (IsSingleLineTextControl(false)) {
-        // Note that if aFlags includes
-        // TextControlState::eSetValue_BySetUserInput, "input" event is
-        // automatically dispatched by TextControlState::SetValue().
-        // If you'd change condition of calling this method, you need to
-        // maintain SetUserInput() too.
-        // FYI: After calling SetValue(), the input type might have been
+        // Note that if aOptions includes
+        // ValueSetterOption::BySetUserInputAPI, "input" event is automatically
+        // dispatched by TextControlState::SetValue(). If you'd change condition
+        // of calling this method, you need to maintain SetUserInput() too. FYI:
+        // After calling SetValue(), the input type might have been
         //      modified so that mInputData may not store TextControlState.
-        if (!mInputData.mState->SetValue(value, aOldValue, aFlags)) {
+        if (!mInputData.mState->SetValue(
+                value, aOldValue,
+                forcePreserveUndoHistory
+                    ? aOptions + ValueSetterOption::PreserveUndoHistory
+                    : aOptions)) {
           return NS_ERROR_OUT_OF_MEMORY;
         }
         // If the caller won't dispatch "input" event via
         // nsContentUtils::DispatchInputEvent(), we need to modify
         // validationMessage value here.
         //
-        // FIXME(emilio): eSetValue_Internal is not supposed to change state,
-        // but maybe we could run this too?
-        if (aFlags & TextControlState::eSetValue_ByContent) {
+        // FIXME(emilio): ValueSetterOption::ByInternalAPI is not supposed to
+        // change state, but maybe we could run this too?
+        if (aOptions.contains(ValueSetterOption::ByContentAPI)) {
           MaybeUpdateAllValidityStates(!mDoneCreating);
         }
       } else {
@@ -2660,7 +2707,7 @@
             frame->UpdateForValueChange();
           }
         } else if (CreatesDateTimeWidget() &&
-                   !(aFlags & TextControlState::eSetValue_BySetUserInput)) {
+                   !aOptions.contains(ValueSetterOption::BySetUserInputAPI)) {
           if (Element* dateTimeBoxElement = GetDateTimeBoxElement()) {
             AsyncEventDispatcher* dispatcher = new AsyncEventDispatcher(
                 dateTimeBoxElement, u"MozDateTimeValueChanged"_ns,
@@ -2980,17 +3027,11 @@
     return;
   }
 
-  // XXX Bug?  We have to give the input focus before contents can be
-  // selected
-
-  FocusTristate state = FocusState();
-  if (state == eUnfocusable) {
-    return;
-  }
+  TextControlState* state = GetEditorState();
+  MOZ_ASSERT(state, "Single line text controls are expected to have a state");
 
-  TextControlState* tes = GetEditorState();
-  if (tes) {
-    RefPtr<nsFrameSelection> fs = tes->GetConstFrameSelection();
+  if (FocusState() != eUnfocusable) {
+    RefPtr<nsFrameSelection> fs = state->GetConstFrameSelection();
     if (fs && fs->MouseDownRecorded()) {
       // This means that we're being called while the frame selection has a
       // mouse down event recorded to adjust the caret during the mouse up
@@ -2999,44 +3040,35 @@
       // select() call takes effect.
       fs->SetDelayedCaretData(nullptr);
     }
-  }
-
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
 
-  RefPtr<nsPresContext> presContext = GetPresContext(eForComposedDoc);
-  if (state == eInactiveWindow) {
-    if (fm) fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
-    SelectAll(presContext);
-    return;
-  }
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
+      fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
 
-  if (DispatchSelectEvent(presContext) && fm) {
-    fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
-
-    // ensure that the element is actually focused
-    if (this == fm->GetFocusedElement()) {
-      // Now Select all the text!
-      SelectAll(presContext);
+      // A focus event handler may change the type attribute, which will destroy
+      // the previous state object.
+      state = GetEditorState();
+      if (!state) {
+        return;
+      }
     }
   }
-}
 
-bool HTMLInputElement::DispatchSelectEvent(nsPresContext* aPresContext) {
-  nsEventStatus status = nsEventStatus_eIgnore;
+  // Directly call TextControlState::SetSelectionRange because
+  // HTMLInputElement::SetSelectionRange only applies to fewer types
+  state->SetSelectionRange(0, UINT32_MAX, Optional<nsAString>(), IgnoreErrors(),
+                           TextControlState::ScrollAfterSelection::No);
+}
 
+void HTMLInputElement::DispatchSelectEvent(nsPresContext* aPresContext) {
   // If already handling select event, don't dispatch a second.
   if (!mHandlingSelectEvent) {
     WidgetEvent event(true, eFormSelect);
 
     mHandlingSelectEvent = true;
     EventDispatcher::Dispatch(static_cast<nsIContent*>(this), aPresContext,
-                              &event, nullptr, &status);
+                              &event);
     mHandlingSelectEvent = false;
   }
-
-  // If the DOM event was not canceled (e.g. by a JS event handler
-  // returning false)
-  return (status == nsEventStatus_eIgnore);
 }
 
 void HTMLInputElement::SelectAll(nsPresContext* aPresContext) {
@@ -3348,8 +3380,10 @@
     mInputType->ConvertNumberToString(mRangeThumbDragStartValue, val);
     // TODO: What should we do if SetValueInternal fails?  (The allocation
     // is small, so we should be fine here.)
-    SetValueInternal(val, TextControlState::eSetValue_BySetUserInput |
-                              TextControlState::eSetValue_Notify);
+    SetValueInternal(
+        val,
+        {ValueSetterOption::BySetUserInputAPI,
+         ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
     nsRangeFrame* frame = do_QueryFrame(GetPrimaryFrame());
     if (frame) {
       frame->UpdateForValueChange();
@@ -3369,8 +3403,9 @@
   mInputType->ConvertNumberToString(aValue, val);
   // TODO: What should we do if SetValueInternal fails?  (The allocation
   // is small, so we should be fine here.)
-  SetValueInternal(val, TextControlState::eSetValue_BySetUserInput |
-                            TextControlState::eSetValue_Notify);
+  SetValueInternal(
+      val, {ValueSetterOption::BySetUserInputAPI,
+            ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
   nsRangeFrame* frame = do_QueryFrame(GetPrimaryFrame());
   if (frame) {
     frame->UpdateForValueChange();
@@ -3460,8 +3495,10 @@
   mInputType->ConvertNumberToString(newValue, newVal);
   // TODO: What should we do if SetValueInternal fails?  (The allocation
   // is small, so we should be fine here.)
-  SetValueInternal(newVal, TextControlState::eSetValue_BySetUserInput |
-                               TextControlState::eSetValue_Notify);
+  SetValueInternal(
+      newVal,
+      {ValueSetterOption::BySetUserInputAPI,
+       ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
 }
 
 static bool SelectTextFieldOnFocus() {
@@ -3735,9 +3772,8 @@
                                      nsIFocusManager::FLAG_BYMOVEFOCUS)) {
                 RefPtr<nsPresContext> presContext =
                     GetPresContext(eForComposedDoc);
-                if (DispatchSelectEvent(presContext)) {
-                  SelectAll(presContext);
-                }
+                DispatchSelectEvent(presContext);
+                SelectAll(presContext);
               }
             }
           }
@@ -4266,23 +4302,24 @@
 namespace {
 class TypeChangeSelectionRangeFlagDeterminer {
  public:
+  using ValueSetterOption = TextControlState::ValueSetterOption;
+  using ValueSetterOptions = TextControlState::ValueSetterOptions;
+
   // @param aOldType InputElementTypes
   // @param aNewType InputElementTypes
   TypeChangeSelectionRangeFlagDeterminer(uint8_t aOldType, uint8_t aNewType)
       : mOldType(aOldType), mNewType(aNewType) {}
 
-  // @return TextControlState::SetValueFlags
-  uint32_t GetFlag() const {
+  // @return TextControlState::ValueSetterOptions
+  ValueSetterOptions GetValueSetterOptions() const {
     const bool previouslySelectable = DoesSetRangeTextApply(mOldType);
     const bool nowSelectable = DoesSetRangeTextApply(mNewType);
     const bool moveCursorToBeginAndSetDirectionForward =
         !previouslySelectable && nowSelectable;
-    const uint32_t flag =
-        moveCursorToBeginAndSetDirectionForward
-            ? TextControlState::
-                  eSetValue_MoveCursorToBeginSetSelectionDirectionForward
-            : 0;
-    return flag;
+    if (moveCursorToBeginAndSetDirectionForward) {
+      return {ValueSetterOption::MoveCursorToBeginSetSelectionDirectionForward};
+    }
+    return {};
   }
 
  private:
@@ -4387,13 +4424,13 @@
 
         const TypeChangeSelectionRangeFlagDeterminer flagDeterminer(oldType,
                                                                     mType);
-        const uint32_t selectionRangeFlag = flagDeterminer.GetFlag();
+        ValueSetterOptions options(flagDeterminer.GetValueSetterOptions());
+        options += ValueSetterOption::ByInternalAPI;
 
         // TODO: What should we do if SetValueInternal fails?  (The allocation
         // may potentially be big, but most likely we've failed to allocate
         // before the type change.)
-        SetValueInternal(
-            value, TextControlState::eSetValue_Internal | selectionRangeFlag);
+        SetValueInternal(value, options);
       }
       break;
     case VALUE_MODE_FILENAME:
@@ -5414,8 +5451,10 @@
 }
 
 nsresult HTMLInputElement::SetValueFromSetRangeText(const nsAString& aValue) {
-  return SetValueInternal(aValue, TextControlState::eSetValue_ByContent |
-                                      TextControlState::eSetValue_Notify);
+  return SetValueInternal(
+      aValue,
+      {ValueSetterOption::ByContentAPI,
+       ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
 }
 
 Nullable<uint32_t> HTMLInputElement::GetSelectionStart(ErrorResult& aRv) {
@@ -5546,7 +5585,7 @@
 
   // SetValueInternal is going to sanitize the value.
   // TODO(mbrodesser): sanitizing will only happen if `mDoneCreating` is true.
-  return SetValueInternal(resetVal, TextControlState::eSetValue_Internal);
+  return SetValueInternal(resetVal, ValueSetterOption::ByInternalAPI);
 }
 
 void HTMLInputElement::SetDirectionFromValue(bool aNotify) {
@@ -5826,7 +5865,7 @@
     // TODO: What should we do if SetValueInternal fails?  (The allocation
     // may potentially be big, but most likely we've failed to allocate
     // before the type change.)
-    SetValueInternal(aValue, TextControlState::eSetValue_Internal);
+    SetValueInternal(aValue, ValueSetterOption::ByInternalAPI);
 
     if (IsDateOrTime(mType)) {
       // mFocusedValue has to be set here, so that `FireChangeEventIfNeeded` can
@@ -6004,8 +6043,9 @@
         // TODO: What should we do if SetValueInternal fails?  (The allocation
         // may potentially be big, but most likely we've failed to allocate
         // before the type change.)
-        SetValueInternal(inputState.get_TextContentData().value(),
-                         TextControlState::eSetValue_Notify);
+        SetValueInternal(
+            inputState.get_TextContentData().value(),
+            ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame);
         if (inputState.get_TextContentData().lastValueChangeWasInteractive()) {
           mLastValueChangeWasInteractive = true;
           UpdateState(true);
diff -Nru firefox-84.0.2+build1/dom/html/HTMLInputElement.h firefox-85.0+build1/dom/html/HTMLInputElement.h
--- firefox-84.0.2+build1/dom/html/HTMLInputElement.h	2021-01-06 11:23:06.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLInputElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -117,6 +117,8 @@
   using nsGenericHTMLFormElementWithState::GetForm;
   using nsGenericHTMLFormElementWithState::GetFormAction;
   using nsIConstraintValidation::GetValidationMessage;
+  using ValueSetterOption = TextControlState::ValueSetterOption;
+  using ValueSetterOptions = TextControlState::ValueSetterOptions;
 
   enum class FromClone { no, yes };
 
@@ -670,7 +672,7 @@
 
   already_AddRefed<nsINodeList> GetLabels();
 
-  void Select();
+  MOZ_CAN_RUN_SCRIPT void Select();
 
   Nullable<uint32_t> GetSelectionStart(ErrorResult& aRv);
   MOZ_CAN_RUN_SCRIPT void SetSelectionStart(const Nullable<uint32_t>& aValue,
@@ -914,15 +916,14 @@
    * @param aValue      String to set.
    * @param aOldValue   Previous value before setting aValue.
                         If previous value is unknown, aOldValue can be nullptr.
-   * @param aFlags      See TextControlState::SetValueFlags.
+   * @param aOptions    See TextControlState::ValueSetterOption.
    */
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetValueInternal(const nsAString& aValue, const nsAString* aOldValue,
-                            uint32_t aFlags);
-
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetValueInternal(const nsAString& aValue, uint32_t aFlags) {
-    return SetValueInternal(aValue, nullptr, aFlags);
+  MOZ_CAN_RUN_SCRIPT nsresult
+  SetValueInternal(const nsAString& aValue, const nsAString* aOldValue,
+                   const ValueSetterOptions& aOptions);
+  MOZ_CAN_RUN_SCRIPT nsresult SetValueInternal(
+      const nsAString& aValue, const ValueSetterOptions& aOptions) {
+    return SetValueInternal(aValue, nullptr, aOptions);
   }
 
   // Generic getter for the value that doesn't do experimental control type
@@ -965,9 +966,9 @@
   virtual void ResultForDialogSubmit(nsAString& aResult) override;
 
   /**
-   * Dispatch a select event. Returns true if the event was not cancelled.
+   * Dispatch a select event.
    */
-  bool DispatchSelectEvent(nsPresContext* aPresContext);
+  void DispatchSelectEvent(nsPresContext* aPresContext);
 
   void SelectAll(nsPresContext* aPresContext);
   bool IsImage() const {
@@ -1397,15 +1398,6 @@
   nsresult InitFilePicker(FilePickerType aType);
   nsresult InitColorPicker();
 
-  /**
-   * Use this function before trying to open a picker.
-   * It checks if the page is allowed to open a new pop-up.
-   * If it returns true, you should not create the picker.
-   *
-   * @return true if popup should be blocked, false otherwise
-   */
-  bool IsPopupBlocked() const;
-
   GetFilesHelper* GetOrCreateGetFilesHelper(bool aRecursiveFlag,
                                             ErrorResult& aRv);
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLLabelElement.cpp firefox-85.0+build1/dom/html/HTMLLabelElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLLabelElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLLabelElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -131,7 +131,7 @@
         // Only set focus on the first click of multiple clicks to prevent
         // to prevent immediate de-focus.
         if (mouseEvent->mClickCount <= 1) {
-          if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
+          if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
             // Use FLAG_BYMOVEFOCUS here so that the label is scrolled to.
             // Also, within HTMLInputElement::PostHandleEvent, inputs will
             // be selected only when focused via a key or when the navigation
diff -Nru firefox-84.0.2+build1/dom/html/HTMLLabelElement.h firefox-85.0+build1/dom/html/HTMLLabelElement.h
--- firefox-84.0.2+build1/dom/html/HTMLLabelElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLLabelElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -48,8 +48,8 @@
   // nsIContent
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   virtual nsresult PostHandleEvent(EventChainPostVisitor& aVisitor) override;
-  virtual bool PerformAccesskey(bool aKeyCausesActivation,
-                                bool aIsTrustedEvent) override;
+  MOZ_CAN_RUN_SCRIPT virtual bool PerformAccesskey(
+      bool aKeyCausesActivation, bool aIsTrustedEvent) override;
   virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override;
 
   nsGenericHTMLElement* GetLabeledElement() const;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLLinkElement.h firefox-85.0+build1/dom/html/HTMLLinkElement.h
--- firefox-84.0.2+build1/dom/html/HTMLLinkElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLLinkElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -17,6 +17,8 @@
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
+class PreloaderBase;
+
 namespace dom {
 
 // NOTE(emilio): If we stop inheriting from Link, we need to remove the
diff -Nru firefox-84.0.2+build1/dom/html/HTMLMediaElement.cpp firefox-85.0+build1/dom/html/HTMLMediaElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLMediaElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLMediaElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -56,6 +56,7 @@
 #include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/SVGObserverUtils.h"
@@ -100,10 +101,12 @@
 #include "nsIDocShell.h"
 #include "mozilla/dom/Document.h"
 #include "nsIFrame.h"
+#include "nsIHttpChannel.h"
 #include "nsIObserverService.h"
 #include "nsIRequest.h"
 #include "nsIScriptError.h"
 #include "nsISupportsPrimitives.h"
+#include "nsIThreadRetargetableStreamListener.h"
 #include "nsITimer.h"
 #include "nsJSUtils.h"
 #include "nsLayoutUtils.h"
@@ -4348,12 +4351,7 @@
   if (StaticPrefs::media_autoplay_block_event_enabled()) {
     DispatchAsyncEvent(u"blocked"_ns);
   }
-#if defined(MOZ_WIDGET_ANDROID)
-  RefPtr<AsyncEventDispatcher> asyncDispatcher =
-      new AsyncEventDispatcher(this, u"MozAutoplayMediaBlocked"_ns,
-                               CanBubble::eYes, ChromeOnlyDispatch::eYes);
-  asyncDispatcher->PostDOMEvent();
-#endif
+  DispatchBlockEventForVideoControl();
   MaybeNotifyAutoplayBlocked();
   ReportToConsole(nsIScriptError::warningFlag, "BlockAutoplayError");
   mHasEverBeenBlockedForAutoplay = true;
@@ -4368,6 +4366,20 @@
   asyncDispatcher->PostDOMEvent();
 }
 
+void HTMLMediaElement::DispatchBlockEventForVideoControl() {
+#if defined(MOZ_WIDGET_ANDROID)
+  nsVideoFrame* videoFrame = do_QueryFrame(GetPrimaryFrame());
+  if (!videoFrame || !videoFrame->GetVideoControls()) {
+    return;
+  }
+
+  RefPtr<AsyncEventDispatcher> asyncDispatcher = new AsyncEventDispatcher(
+      videoFrame->GetVideoControls(), u"MozNoControlsBlockedVideo"_ns,
+      CanBubble::eYes);
+  asyncDispatcher->PostDOMEvent();
+#endif
+}
+
 void HTMLMediaElement::PlayInternal(bool aHandlingUserInput) {
   if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE) {
     // The media load algorithm will be initiated by a user interaction.
@@ -4923,6 +4935,7 @@
                              [self = RefPtr<HTMLMediaElement>(this)]() {
                                if (!self->IsInComposedDoc()) {
                                  self->PauseInternal();
+                                 self->mMediaControlKeyListener->StopIfNeeded();
                                }
                              });
   RunInStableState(task);
@@ -6513,7 +6526,7 @@
 
 bool HTMLMediaElement::ShouldBeSuspendedByInactiveDocShell() const {
   BrowsingContext* bc = OwnerDoc()->GetBrowsingContext();
-  return bc && !bc->GetIsActive() && bc->Top()->GetSuspendMediaWhenInactive();
+  return bc && !bc->IsActive() && bc->Top()->GetSuspendMediaWhenInactive();
 }
 
 void HTMLMediaElement::NotifyOwnerDocumentActivityChanged() {
@@ -7252,10 +7265,9 @@
 }
 
 float HTMLMediaElement::ComputedVolume() const {
-  return mMuted
-             ? 0.0f
-             : mAudioChannelWrapper ? mAudioChannelWrapper->GetEffectiveVolume()
-                                    : mVolume;
+  return mMuted                 ? 0.0f
+         : mAudioChannelWrapper ? mAudioChannelWrapper->GetEffectiveVolume()
+                                : mVolume;
 }
 
 bool HTMLMediaElement::ComputedMuted() const {
diff -Nru firefox-84.0.2+build1/dom/html/HTMLMediaElement.h firefox-85.0+build1/dom/html/HTMLMediaElement.h
--- firefox-84.0.2+build1/dom/html/HTMLMediaElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLMediaElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -44,6 +44,8 @@
 typedef uint32_t SuspendTypes;
 typedef uint32_t AudibleChangedReasons;
 
+class nsIStreamListener;
+
 namespace mozilla {
 class AbstractThread;
 class ChannelMediaDecoder;
@@ -1327,6 +1329,10 @@
   // front-end side to show blocking icon.
   void MaybeNotifyAutoplayBlocked();
 
+  // Dispatch event for video control when video gets blocked in order to show
+  // the click-to-play icon.
+  void DispatchBlockEventForVideoControl();
+
   // When playing state change, we have to notify MediaControl in the chrome
   // process in order to keep its playing state correct.
   void NotifyMediaControlPlaybackStateChanged();
diff -Nru firefox-84.0.2+build1/dom/html/HTMLMenuElement.cpp firefox-85.0+build1/dom/html/HTMLMenuElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLMenuElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLMenuElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/dom/HTMLMenuItemElement.h"
 #include "nsIMenuBuilder.h"
 #include "nsAttrValueInlines.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIURI.h"
 
@@ -85,7 +86,8 @@
                                        const nsAttrValue* aOldValue,
                                        nsIPrincipal* aSubjectPrincipal,
                                        bool aNotify) {
-  if (aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::type) {
+  if (aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::type &&
+      StaticPrefs::dom_menuitem_enabled()) {
     if (aValue) {
       mType = aValue->GetEnumValue();
     } else {
@@ -101,7 +103,8 @@
                                      const nsAString& aValue,
                                      nsIPrincipal* aMaybeScriptedPrincipal,
                                      nsAttrValue& aResult) {
-  if (aNamespaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::type) {
+  if (aNamespaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::type &&
+      StaticPrefs::dom_menuitem_enabled()) {
     return aResult.ParseEnumValue(aValue, kMenuTypeTable, false,
                                   kMenuDefaultType);
   }
diff -Nru firefox-84.0.2+build1/dom/html/HTMLMenuItemElement.cpp firefox-85.0+build1/dom/html/HTMLMenuItemElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLMenuItemElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLMenuItemElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,10 +9,22 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/HTMLMenuItemElementBinding.h"
+#include "mozilla/dom/HTMLUnknownElement.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentUtils.h"
 
-NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(MenuItem)
+nsGenericHTMLElement* NS_NewHTMLMenuItemElement(
+    already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
+    mozilla::dom::FromParser aFromParser) {
+  RefPtr<mozilla::dom::NodeInfo> nodeInfo(aNodeInfo);
+  auto* nim = nodeInfo->NodeInfoManager();
+  MOZ_ASSERT(nim);
+  if (mozilla::StaticPrefs::dom_menuitem_enabled()) {
+    return new (nim)
+        mozilla::dom::HTMLMenuItemElement(nodeInfo.forget(), aFromParser);
+  }
+  return new (nim) mozilla::dom::HTMLUnknownElement(nodeInfo.forget());
+}
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLObjectElement.cpp firefox-85.0+build1/dom/html/HTMLObjectElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLObjectElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLObjectElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -289,6 +289,17 @@
     return false;
   }
 
+  // If we have decided that this is a blocked plugin then do not allow focus.
+  if ((Type() == eType_Null) &&
+      (PluginFallbackType() == eFallbackBlockAllPlugins)) {
+    if (aTabIndex) {
+      *aTabIndex = -1;
+    }
+
+    *aIsFocusable = false;
+    return false;
+  }
+
   const nsAttrValue* attrVal = mAttrs.GetAttr(nsGkAtoms::tabindex);
   bool isFocusable = attrVal && attrVal->Type() == nsAttrValue::eInteger;
 
diff -Nru firefox-84.0.2+build1/dom/html/HTMLOptionsCollection.h firefox-85.0+build1/dom/html/HTMLOptionsCollection.h
--- firefox-84.0.2+build1/dom/html/HTMLOptionsCollection.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLOptionsCollection.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,13 +11,14 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/dom/HTMLOptionElement.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsError.h"
 #include "nsGenericHTMLElement.h"
 #include "nsTArray.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DocGroup;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLSelectElement.h firefox-85.0+build1/dom/html/HTMLSelectElement.h
--- firefox-84.0.2+build1/dom/html/HTMLSelectElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLSelectElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/HTMLOptionsCollection.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCheapSets.h"
 #include "nsCOMPtr.h"
 #include "nsError.h"
@@ -27,6 +26,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 class SelectContentData;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLSlotElement.cpp firefox-85.0+build1/dom/html/HTMLSlotElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLSlotElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLSlotElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/HTMLSlotElementBinding.h"
 #include "mozilla/dom/HTMLUnknownElement.h"
 #include "mozilla/dom/ShadowRoot.h"
+#include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 
 nsGenericHTMLElement* NS_NewHTMLSlotElement(
diff -Nru firefox-84.0.2+build1/dom/html/HTMLTableCellElement.cpp firefox-85.0+build1/dom/html/HTMLTableCellElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLTableCellElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLTableCellElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/HTMLTableCellElement.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLTableElement.h"
 #include "mozilla/dom/HTMLTableRowElement.h"
 #include "mozilla/MappedDeclarations.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLTableElement.cpp firefox-85.0+build1/dom/html/HTMLTableElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLTableElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLTableElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsAttrValueInlines.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsMappedAttributes.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCollectionBinding.h"
 #include "mozilla/dom/HTMLTableElementBinding.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLTemplateElement.cpp firefox-85.0+build1/dom/html/HTMLTemplateElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLTemplateElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLTemplateElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/HTMLTemplateElement.h"
 #include "mozilla/dom/HTMLTemplateElementBinding.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/MappedDeclarations.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
diff -Nru firefox-84.0.2+build1/dom/html/HTMLTextAreaElement.cpp firefox-85.0+build1/dom/html/HTMLTextAreaElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLTextAreaElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLTextAreaElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -120,8 +120,12 @@
     GetValueInternal(value, true);
 
     // SetValueInternal handles setting mValueChanged for us
-    rv = it->SetValueInternal(value, TextControlState::eSetValue_Notify);
-    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_WARN_IF(NS_FAILED(
+            rv = it->SetValueInternal(
+                value, ValueSetterOption::
+                           UpdateOverlayTextVisibilityAndInvalidateFrame)))) {
+      return rv;
+    }
   }
 
   it->mLastValueChangeWasInteractive = mLastValueChangeWasInteractive;
@@ -132,42 +136,14 @@
 // nsIContent
 
 void HTMLTextAreaElement::Select() {
-  // XXX Bug?  We have to give the input focus before contents can be
-  // selected
-
-  FocusTristate state = FocusState();
-  if (state == eUnfocusable) {
-    return;
-  }
-
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
-
-  RefPtr<nsPresContext> presContext = GetPresContext(eForComposedDoc);
-  if (state == eInactiveWindow) {
-    if (fm) fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
-    SelectAll(presContext);
-    return;
-  }
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetGUIEvent event(true, eFormSelect, nullptr);
-  // XXXbz HTMLInputElement guards against this reentering; shouldn't we?
-  EventDispatcher::Dispatch(static_cast<nsIContent*>(this), presContext, &event,
-                            nullptr, &status);
-
-  // If the DOM event was not canceled (e.g. by a JS event handler
-  // returning false)
-  if (status == nsEventStatus_eIgnore) {
-    if (fm) {
+  if (FocusState() != eUnfocusable) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
       fm->SetFocus(this, nsIFocusManager::FLAG_NOSCROLL);
-
-      // ensure that the element is actually focused
-      if (this == fm->GetFocusedElement()) {
-        // Now Select all the text!
-        SelectAll(presContext);
-      }
     }
   }
+
+  SetSelectionRange(0, UINT32_MAX, mozilla::dom::Optional<nsAString>(),
+                    IgnoreErrors());
 }
 
 NS_IMETHODIMP
@@ -298,19 +274,20 @@
   return mState->GetPreviewVisibility();
 }
 
-nsresult HTMLTextAreaElement::SetValueInternal(const nsAString& aValue,
-                                               uint32_t aFlags) {
+nsresult HTMLTextAreaElement::SetValueInternal(
+    const nsAString& aValue, const ValueSetterOptions& aOptions) {
   MOZ_ASSERT(mState);
 
   // Need to set the value changed flag here if our value has in fact changed
-  // (i.e. if eSetValue_Notify is in aFlags), so that
-  // nsTextControlFrame::UpdateValueDisplay retrieves the correct value if
-  // needed.
-  if (aFlags & TextControlState::eSetValue_Notify) {
+  // (i.e. if ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame
+  // is in aOptions), so that nsTextControlFrame::UpdateValueDisplay retrieves
+  // the correct value if needed.
+  if (aOptions.contains(
+          ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame)) {
     SetValueChanged(true);
   }
 
-  if (!mState->SetValue(aValue, aFlags)) {
+  if (!mState->SetValue(aValue, aOptions)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
@@ -330,9 +307,9 @@
   GetValueInternal(currentValue, true);
 
   nsresult rv = SetValueInternal(
-      aValue, TextControlState::eSetValue_ByContent |
-                  TextControlState::eSetValue_Notify |
-                  TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
+      aValue, {ValueSetterOption::ByContentAPI,
+               ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+               ValueSetterOption::MoveCursorToEndIfValueChanged});
   if (NS_WARN_IF(NS_FAILED(rv))) {
     aError.Throw(rv);
     return;
@@ -346,9 +323,9 @@
 void HTMLTextAreaElement::SetUserInput(const nsAString& aValue,
                                        nsIPrincipal& aSubjectPrincipal) {
   SetValueInternal(
-      aValue, TextControlState::eSetValue_BySetUserInput |
-                  TextControlState::eSetValue_Notify |
-                  TextControlState::eSetValue_MoveCursorToEndIfValueChanged);
+      aValue, {ValueSetterOption::BySetUserInputAPI,
+               ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+               ValueSetterOption::MoveCursorToEndIfValueChanged});
 }
 
 nsresult HTMLTextAreaElement::SetValueChanged(bool aValueChanged) {
@@ -683,8 +660,10 @@
 
 nsresult HTMLTextAreaElement::SetValueFromSetRangeText(
     const nsAString& aValue) {
-  return SetValueInternal(aValue, TextControlState::eSetValue_ByContent |
-                                      TextControlState::eSetValue_Notify);
+  return SetValueInternal(
+      aValue,
+      {ValueSetterOption::ByContentAPI,
+       ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame});
 }
 
 nsresult HTMLTextAreaElement::Reset() {
@@ -692,8 +671,7 @@
   GetDefaultValue(resetVal, IgnoreErrors());
   SetValueChanged(false);
 
-  nsresult rv =
-      SetValueInternal(resetVal, TextControlState::eSetValue_Internal);
+  nsresult rv = SetValueInternal(resetVal, ValueSetterOption::ByInternalAPI);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
diff -Nru firefox-84.0.2+build1/dom/html/HTMLTextAreaElement.h firefox-85.0+build1/dom/html/HTMLTextAreaElement.h
--- firefox-84.0.2+build1/dom/html/HTMLTextAreaElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLTextAreaElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -39,6 +39,8 @@
                                   public nsIConstraintValidation {
  public:
   using nsIConstraintValidation::GetValidationMessage;
+  using ValueSetterOption = TextControlState::ValueSetterOption;
+  using ValueSetterOptions = TextControlState::ValueSetterOptions;
 
   explicit HTMLTextAreaElement(
       already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
@@ -254,7 +256,7 @@
   // via bindings.
   void SetCustomValidity(const nsAString& aError);
 
-  void Select();
+  MOZ_CAN_RUN_SCRIPT void Select();
   Nullable<uint32_t> GetSelectionStart(ErrorResult& aError);
   MOZ_CAN_RUN_SCRIPT void SetSelectionStart(
       const Nullable<uint32_t>& aSelectionStart, ErrorResult& aError);
@@ -335,10 +337,10 @@
    * Setting the value.
    *
    * @param aValue      String to set.
-   * @param aFlags      See TextControlState::SetValueFlags.
+   * @param aOptions    See TextControlState::ValueSetterOption.
    */
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetValueInternal(const nsAString& aValue, uint32_t aFlags);
+  MOZ_CAN_RUN_SCRIPT nsresult
+  SetValueInternal(const nsAString& aValue, const ValueSetterOptions& aOptions);
 
   /**
    * Common method to call from the various mutation observer methods.
diff -Nru firefox-84.0.2+build1/dom/html/HTMLVideoElement.cpp firefox-85.0+build1/dom/html/HTMLVideoElement.cpp
--- firefox-84.0.2+build1/dom/html/HTMLVideoElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/HTMLVideoElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,9 +12,11 @@
 #include "nsGkAtoms.h"
 #include "nsSize.h"
 #include "nsError.h"
+#include "nsIHttpChannel.h"
 #include "nsNodeInfoManager.h"
 #include "plbase64.h"
 #include "prlock.h"
+#include "nsRFPService.h"
 #include "nsThreadUtils.h"
 #include "ImageContainer.h"
 #include "VideoFrameContainer.h"
diff -Nru firefox-84.0.2+build1/dom/html/ImageDocument.cpp firefox-85.0+build1/dom/html/ImageDocument.cpp
--- firefox-84.0.2+build1/dom/html/ImageDocument.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/ImageDocument.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/MouseEvent.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "nsRect.h"
 #include "nsIImageLoadingContent.h"
diff -Nru firefox-84.0.2+build1/dom/html/input/InputType.cpp firefox-85.0+build1/dom/html/input/InputType.cpp
--- firefox-84.0.2+build1/dom/html/input/InputType.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/input/InputType.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -117,9 +117,10 @@
   return mInputElement->GetNonFileValueInternal(aValue);
 }
 
-nsresult InputType::SetValueInternal(const nsAString& aValue, uint32_t aFlags) {
+nsresult InputType::SetValueInternal(const nsAString& aValue,
+                                     const ValueSetterOptions& aOptions) {
   RefPtr<HTMLInputElement> inputElement(mInputElement);
-  return inputElement->SetValueInternal(aValue, aFlags);
+  return inputElement->SetValueInternal(aValue, aOptions);
 }
 
 Decimal InputType::GetStepBase() const { return mInputElement->GetStepBase(); }
diff -Nru firefox-84.0.2+build1/dom/html/input/InputType.h firefox-85.0+build1/dom/html/input/InputType.h
--- firefox-84.0.2+build1/dom/html/input/InputType.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/input/InputType.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include "mozilla/Decimal.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/TextControlState.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIConstraintValidation.h"
 #include "nsString.h"
@@ -32,6 +33,9 @@
  */
 class InputType {
  public:
+  using ValueSetterOption = TextControlState::ValueSetterOption;
+  using ValueSetterOptions = TextControlState::ValueSetterOptions;
+
   // Custom deleter for UniquePtr<InputType> to avoid freeing memory
   // pre-allocated for InputType, but we still need to call the destructor
   // explictly.
@@ -132,10 +136,10 @@
    * Setting the input element's value.
    *
    * @param aValue      String to set.
-   * @param aFlags      See TextControlState::SetValueFlags.
+   * @param aOptions    See TextControlState::ValueSetterOption.
    */
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetValueInternal(const nsAString& aValue, uint32_t aFlags);
+  MOZ_CAN_RUN_SCRIPT nsresult
+  SetValueInternal(const nsAString& aValue, const ValueSetterOptions& aOptions);
 
   /**
    * Return the base used to compute if a value matches step.
diff -Nru firefox-84.0.2+build1/dom/html/input/NumericInputTypes.cpp firefox-85.0+build1/dom/html/input/NumericInputTypes.cpp
--- firefox-84.0.2+build1/dom/html/input/NumericInputTypes.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/input/NumericInputTypes.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -179,5 +179,6 @@
   // example above were to change from 1 to -1.
   nsAutoString value;
   GetNonFileValueInternal(value);
-  return SetValueInternal(value, TextControlState::eSetValue_Internal);
+  return SetValueInternal(value,
+                          TextControlState::ValueSetterOption::ByInternalAPI);
 }
diff -Nru firefox-84.0.2+build1/dom/html/MediaDocument.cpp firefox-85.0+build1/dom/html/MediaDocument.cpp
--- firefox-84.0.2+build1/dom/html/MediaDocument.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/MediaDocument.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsNodeInfoManager.h"
 #include "nsContentUtils.h"
 #include "nsDocElementCreatedNotificationRunner.h"
+#include "mozilla/Encoding.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/Services.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/html/MediaError.cpp firefox-85.0+build1/dom/html/MediaError.cpp
--- firefox-84.0.2+build1/dom/html/MediaError.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/MediaError.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include <string>
 #include <unordered_set>
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MediaErrorBinding.h"
 #include "nsContentUtils.h"
 #include "nsIScriptError.h"
diff -Nru firefox-84.0.2+build1/dom/html/nsDOMStringMap.h firefox-85.0+build1/dom/html/nsDOMStringMap.h
--- firefox-84.0.2+build1/dom/html/nsDOMStringMap.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsDOMStringMap.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,16 +8,20 @@
 #define nsDOMStringMap_h
 
 #include "nsCycleCollectionParticipant.h"
+#include "nsStubMutationObserver.h"
 #include "nsTArray.h"
 #include "nsString.h"
 #include "nsWrapperCache.h"
-#include "mozilla/dom/Element.h"
 #include "js/friend/DOMProxy.h"  // JS::ExpandoAndGeneration
 #include "js/RootingAPI.h"       // JS::Handle
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/Element.h"
+
 namespace mozilla {
 class ErrorResult;
 namespace dom {
+class DOMString;
 class DocGroup;
 }  // namespace dom
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/html/nsGenericHTMLElement.cpp firefox-85.0+build1/dom/html/nsGenericHTMLElement.cpp
--- firefox-84.0.2+build1/dom/html/nsGenericHTMLElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsGenericHTMLElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -2416,7 +2416,7 @@
 
   // It's hard to say what HTML4 wants us to do in all cases.
   bool focused = true;
-  if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
+  if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
     fm->SetFocus(this, nsIFocusManager::FLAG_BYKEY);
 
     // Return true if the element became the current focus within its window.
diff -Nru firefox-84.0.2+build1/dom/html/nsGenericHTMLElement.h firefox-85.0+build1/dom/html/nsGenericHTMLElement.h
--- firefox-84.0.2+build1/dom/html/nsGenericHTMLElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsGenericHTMLElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,12 +13,10 @@
 #include "nsIFormControl.h"
 #include "nsGkAtoms.h"
 #include "nsContentCreatorFunctions.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/ValidityState.h"
-#include "mozilla/dom/Element.h"
 
 class nsDOMTokenList;
 class nsIFormControlFrame;
@@ -28,6 +26,7 @@
 struct nsSize;
 
 namespace mozilla {
+class ErrorResult;
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 class EventChainVisitor;
@@ -280,8 +279,8 @@
    */
   virtual bool IsHTMLFocusable(bool aWithMouse, bool* aIsFocusable,
                                int32_t* aTabIndex);
-  virtual bool PerformAccesskey(bool aKeyCausesActivation,
-                                bool aIsTrustedEvent) override;
+  MOZ_CAN_RUN_SCRIPT virtual bool PerformAccesskey(
+      bool aKeyCausesActivation, bool aIsTrustedEvent) override;
 
   /**
    * Check if an event for an anchor can be handled
diff -Nru firefox-84.0.2+build1/dom/html/nsGenericHTMLFrameElement.cpp firefox-85.0+build1/dom/html/nsGenericHTMLFrameElement.cpp
--- firefox-84.0.2+build1/dom/html/nsGenericHTMLFrameElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsGenericHTMLFrameElement.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsGenericHTMLFrameElement.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLIFrameElement.h"
 #include "mozilla/dom/XULFrameElement.h"
 #include "mozilla/dom/BrowserBridgeChild.h"
diff -Nru firefox-84.0.2+build1/dom/html/nsGenericHTMLFrameElement.h firefox-85.0+build1/dom/html/nsGenericHTMLFrameElement.h
--- firefox-84.0.2+build1/dom/html/nsGenericHTMLFrameElement.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsGenericHTMLFrameElement.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define nsGenericHTMLFrameElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/nsBrowserElement.h"
 
 #include "nsFrameLoader.h"
@@ -17,6 +16,8 @@
 #include "nsIMozBrowserFrame.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class BrowserParent;
 template <typename>
diff -Nru firefox-84.0.2+build1/dom/html/nsHTMLDNSPrefetch.cpp firefox-85.0+build1/dom/html/nsHTMLDNSPrefetch.cpp
--- firefox-84.0.2+build1/dom/html/nsHTMLDNSPrefetch.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsHTMLDNSPrefetch.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -161,17 +161,7 @@
     return rv;
   }
 
-  // Fetch ESNI keys if needed.
-  if (isHttps && StaticPrefs::network_security_esni_enabled()) {
-    nsAutoCString esniHost;
-    esniHost.Append("_esni.");
-    esniHost.Append(NS_ConvertUTF16toUTF8(hostname));
-    Unused << sDNSService->AsyncResolveNative(
-        esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-        flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, sDNSListener,
-        nullptr, aPartitionedPrincipalOriginAttributes,
-        getter_AddRefs(tmpOutstanding));
-  }
+  // TODO: Fetch HTTPS RRs in bug 1652723.
 
   return NS_OK;
 }
@@ -256,16 +246,8 @@
       flags | nsIDNSService::RESOLVE_SPECULATE,
       nullptr,  // resolverInfo
       sDNSListener, aReason, aPartitionedPrincipalOriginAttributes);
-  // Cancel fetching ESNI keys if needed.
-  if (StaticPrefs::network_security_esni_enabled() && isHttps) {
-    nsAutoCString esniHost;
-    esniHost.Append("_esni.");
-    esniHost.Append(NS_ConvertUTF16toUTF8(hostname));
-    sDNSService->CancelAsyncResolveNative(
-        esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-        flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, sDNSListener,
-        aReason, aPartitionedPrincipalOriginAttributes);
-  }
+
+  // TODO: Fetch HTTPS RRs in bug 1652723.
   return rv;
 }
 
@@ -410,18 +392,8 @@
                 mEntries[mTail].mFlags | nsIDNSService::RESOLVE_SPECULATE,
                 nullptr, sDNSListener, nullptr, oa,
                 getter_AddRefs(tmpOutstanding));
-            // Fetch ESNI keys if needed.
-            if (NS_SUCCEEDED(rv) &&
-                StaticPrefs::network_security_esni_enabled() && isHttps) {
-              nsAutoCString esniHost;
-              esniHost.Append("_esni.");
-              esniHost.Append(hostName);
-              sDNSService->AsyncResolveNative(
-                  esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-                  mEntries[mTail].mFlags | nsIDNSService::RESOLVE_SPECULATE,
-                  nullptr, sDNSListener, nullptr, oa,
-                  getter_AddRefs(tmpOutstanding));
-            }
+            // TODO: Fetch HTTPS RRs in bug 1652723.
+
             // Tell link that deferred prefetch was requested
             if (NS_SUCCEEDED(rv)) link->OnDNSPrefetchRequested();
           }
diff -Nru firefox-84.0.2+build1/dom/html/nsIConstraintValidation.cpp firefox-85.0+build1/dom/html/nsIConstraintValidation.cpp
--- firefox-84.0.2+build1/dom/html/nsIConstraintValidation.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsIConstraintValidation.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/dom/HTMLInputElement.h"
 #include "mozilla/dom/ValidityState.h"
 #include "nsIFormControl.h"
+#include "nsISimpleEnumerator.h"
 #include "nsContentUtils.h"
 
 #include "nsIFormSubmitObserver.h"
diff -Nru firefox-84.0.2+build1/dom/html/nsIHTMLCollection.h firefox-85.0+build1/dom/html/nsIHTMLCollection.h
--- firefox-84.0.2+build1/dom/html/nsIHTMLCollection.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/nsIHTMLCollection.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,7 +11,6 @@
 #include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 #include "nsWrapperCache.h"
-#include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
 
 class nsINode;
diff -Nru firefox-84.0.2+build1/dom/html/test/browser_content_contextmenu_userinput.js firefox-85.0+build1/dom/html/test/browser_content_contextmenu_userinput.js
--- firefox-84.0.2+build1/dom/html/test/browser_content_contextmenu_userinput.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/browser_content_contextmenu_userinput.js	2021-01-18 19:58:09.000000000 +0000
@@ -4,6 +4,9 @@
   "http://example.org/browser/" + "dom/html/test/file_content_contextmenu.html";
 
 add_task(async function() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.menuitem.enabled", true]],
+  });
   await BrowserTestUtils.withNewTab(
     {
       gBrowser,
diff -Nru firefox-84.0.2+build1/dom/html/test/browser_fullscreen-api-keys.js firefox-85.0+build1/dom/html/test/browser_fullscreen-api-keys.js
--- firefox-84.0.2+build1/dom/html/test/browser_fullscreen-api-keys.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/browser_fullscreen-api-keys.js	2021-01-18 19:58:09.000000000 +0000
@@ -71,11 +71,11 @@
   registerCleanupFunction(() => gBrowser.removeTab(tab));
   await waitForDocLoadComplete();
 
-  // Wait for the document being actived, so that
+  // Wait for the document being activated, so that
   // fullscreen request won't be denied.
   await SpecialPowers.spawn(browser, [], () => {
     return ContentTaskUtils.waitForCondition(
-      () => docShell.isActive && content.document.hasFocus(),
+      () => content.browsingContext.isActive && content.document.hasFocus(),
       "document is active"
     );
   });
diff -Nru firefox-84.0.2+build1/dom/html/test/browser_fullscreen-contextmenu-esc.js firefox-85.0+build1/dom/html/test/browser_fullscreen-contextmenu-esc.js
--- firefox-84.0.2+build1/dom/html/test/browser_fullscreen-contextmenu-esc.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/browser_fullscreen-contextmenu-esc.js	2021-01-18 19:58:09.000000000 +0000
@@ -15,7 +15,7 @@
 function waitForDocActivated(aBrowser) {
   return SpecialPowers.spawn(aBrowser, [], () => {
     return ContentTaskUtils.waitForCondition(
-      () => docShell.isActive && content.document.hasFocus()
+      () => content.browsingContext.isActive && content.document.hasFocus()
     );
   });
 }
@@ -38,7 +38,7 @@
   // the fullscreen request won't be denied.
   await SpecialPowers.spawn(browser, [], () => {
     return ContentTaskUtils.waitForCondition(
-      () => docShell.isActive && content.document.hasFocus()
+      () => content.browsingContext.isActive && content.document.hasFocus()
     );
   });
 
diff -Nru firefox-84.0.2+build1/dom/html/test/file_fullscreen-plugins.html firefox-85.0+build1/dom/html/test/file_fullscreen-plugins.html
--- firefox-84.0.2+build1/dom/html/test/file_fullscreen-plugins.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/file_fullscreen-plugins.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=545812
-
-Test plugins with DOM full-screen API:
-* Request for full-screen is denied when windowed plugin in current doc is present.
-* Request for full-screen is denied when windowed plugin in subdocument is present.
-* Request for full-screen is not denied when the only plugin present is windowless.
-* Adding an existing (out-of-doc) windowed plugin to a full-screen document causes document to exit full-screen.
-* Create windowed plugin and adding it to full-screen document caused exit from full-screen.
-* On non-Windows, plugins can only be windowless, so the presence of plugins
-  should have no effect on request for full-screen.
-
--->
-<head>
-  <title>Test for Bug 545812</title>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <script type="application/javascript" src="file_fullscreen-utils.js"></script>
-  <style>
-  body:fullscreen, div:fullscreen {
-    background-color: red;
-  }
-  </style>
-</head>
-<body>
-
-
-<!-- Windowed plugin, focusing should revoke full-screen. -->
-<embed id="windowed-plugin" type="application/x-test" style="width:200px;height:100px;" wmode="window"></embed>
-
-<!-- Windowless plugin, focusing should not revoke full-screen. -->
-<embed id="windowless-plugin" type="application/x-test" style="width:200px;height:100px;"></embed>
-
-
-<!-- iframe contents:
-
-<html><body><embed id='windowed-plugin' type='application/x-test' style='width:200px;height:100px;' wmode='window'></embed></body></html>
-
--->
-
-<iframe id="subdoc-plugin" srcdoc="<html><body><embed id='windowed-plugin' type='application/x-test' style='width:200px;height:100px;' wmode='window'></embed></body></html>"></iframe>
-
-<script type="application/javascript">
-
-/** Test for Bug 545812 **/
-
-function ok(condition, msg) {
-  opener.ok(condition, "[plugins] " + msg);
-}
-
-function is(a, b, msg) {
-  opener.is(a, b, "[plugins] " + msg);
-}
-
-function e(id) {
-  return document.getElementById(id);
-}
-
-function removeElement(element) {
-  element.remove();
-}
-
-const supportsWindowedMode = navigator.appVersion.includes("Windows");
-
-var windowedPlugin = null;
-
-function begin() {
-  // Delay test startup long enough for the windowed plugin in the subframe to
-  // start up and create its window.
-  opener.SimpleTest.executeSoon(function() {
-    opener.SimpleTest.executeSoon(function() {
-      startTest();
-    })
-  });
-}
-
-function startTest() {
-  ok(!document.fullscreenElement, "Should not be in full-screen mode initially");
-  document.body.requestFullscreen();
-
-  // Focus the windowed plugin. On non-Windows we should still enter
-  // full-screen mode, on Windows the pending request for full-screen should
-  // be denied.
-  e("windowed-plugin").focus();
-
-  if (!supportsWindowedMode) {
-    // If all plugins are effectively windowless, request for full-screen should be granted.
-    // Continue test in the "fullscreenchange" handler.
-    addFullscreenChangeContinuation("enter", windowlessFullScreenChange1);
-  } else {
-    // On Windows, request should be denied, carry on the test after receiving error event.
-    addFullscreenErrorContinuation(windowsTest);
-  }
-}
-
-function windowsTest() {
-  ok(!document.fullscreenElement, "Request for full-screen with focused windowed plugin should be denied.");
-
-  // Focus a regular html element, and re-request full-screen, request should be granted.
-  e("windowless-plugin").focus();
-  addFullscreenChangeContinuation("enter", windowsTest2);
-  document.body.requestFullscreen();
-}
-
-function windowsTest2() {
-  ok(document.fullscreenElement, "Request for full-screen with non-plugin focused should be granted.");
-  // Focus a windowed plugin, full-screen should be revoked.
-  addFullscreenChangeContinuation("exit", windowsTest3);
-  e("windowed-plugin").focus();
-}
-
-function windowsTest3() {
-  ok(!document.fullscreenElement, "Full-screen should have been revoked when windowed-plugin was focused.");
-  // Remove windowed plugins before closing the window
-  // to work around bug 1237853.
-  removeElement(e("windowed-plugin"));
-  removeElement(e("subdoc-plugin").contentDocument.getElementById("windowed-plugin"));
-  opener.nextTest();
-}
-
-var fullScreenChangeCount = 0;
-
-function createWindowedPlugin() {
-  var p = document.createElement("embed");
-  p.setAttribute("type", "application/x-test");
-  p.setAttribute("wmode", "window");
-  return p;
-}
-
-function windowlessFullScreenChange1(event) {
-  ok(document.fullscreenElement, "Requests for full-screen with focused windowed plugins should be granted on non-Windows");
-
-  // Create a new windowed plugin, and add that to the document. Should *not* exit full-screen mode on MacOS/Linux.
-  windowedPlugin = createWindowedPlugin();
-  document.body.appendChild(windowedPlugin);
-
-  // Focus windowed plugin. Should not exit full-screen mode on MacOS/Linux.
-  windowedPlugin.focus();
-
-  setTimeout(
-    function() {
-      ok(document.fullscreenElement, "Adding & focusing a windowed plugin to document should not cause full-screen to exit on MacOS/Linux.");
-      addFullscreenChangeContinuation("exit", windowlessFullScreenChange2);
-      document.exitFullscreen();
-    }, 0);
-}
-
-function windowlessFullScreenChange2(event) {
-  ok(!document.fullscreenElement, "Should have left full-screen mode after calling document.exitFullscreen().");
-  opener.nextTest();
-}
-
-</script>
-</pre>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if1.html firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if1.html
--- firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if1.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 341604</title>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-I have 2 plugin instances embedded in me.
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-<object type="application/x-test" width="200" height="200"></object>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if2.html firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if2.html
--- firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if2.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 341604</title>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-  I am a document that should be handled by a plugin load.
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if2.html^headers^ firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if2.html^headers^
--- firefox-84.0.2+build1/dom/html/test/file_iframe_sandbox_f_if2.html^headers^	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/file_iframe_sandbox_f_if2.html^headers^	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Type: application/x-test
diff -Nru firefox-84.0.2+build1/dom/html/test/mochitest.ini firefox-85.0+build1/dom/html/test/mochitest.ini
--- firefox-84.0.2+build1/dom/html/test/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 prefs =
   plugin.load_flash_only=false
+  dom.menuitem.enabled=true # only for test_bug617528.html
 support-files =
   347174transform.xsl
   347174transformable.xml
@@ -125,9 +126,6 @@
   file_iframe_sandbox_e_if7.html
   file_iframe_sandbox_e_if8.html
   file_iframe_sandbox_e_if9.html
-  file_iframe_sandbox_f_if1.html
-  file_iframe_sandbox_f_if2.html
-  file_iframe_sandbox_f_if2.html^headers^
   file_iframe_sandbox_fail.js
   file_iframe_sandbox_form_fail.html
   file_iframe_sandbox_form_pass.html
@@ -460,7 +458,6 @@
   file_fullscreen-navigation.html
   file_fullscreen-nested.html
   file_fullscreen-prefixed.html
-  file_fullscreen-plugins.html
   file_fullscreen-rollback.html
   file_fullscreen-scrollbar.html
   file_fullscreen-selector.html
@@ -486,8 +483,6 @@
 tags = openwindow
 [test_iframe_sandbox_navigation2.html]
 tags = openwindow
-[test_iframe_sandbox_plugins.html]
-skip-if = (toolkit == 'android') || debug # plugins not supported on android, bug 1388764 for debug
 [test_iframe_sandbox_popups.html]
 tags = openwindow
 [test_iframe_sandbox_popups_inheritance.html]
@@ -509,8 +504,7 @@
 [test_named_options.html]
 [test_nested_invalid_fieldsets.html]
 [test_object_attributes_reflection.html]
-[test_object_plugin_nav.html]
-skip-if = (toolkit == 'android') || ((os == 'win' || os == 'linux') && debug) # plugins not supported on android, bug 1388764 for debug
+[test_object_nav.html]
 [test_ol_attributes_reflection.html]
 [test_option_defaultSelected.html]
 [test_option_selected_state.html]
diff -Nru firefox-84.0.2+build1/dom/html/test/test_external_protocol_iframe.html firefox-85.0+build1/dom/html/test/test_external_protocol_iframe.html
--- firefox-84.0.2+build1/dom/html/test/test_external_protocol_iframe.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_external_protocol_iframe.html	2021-01-18 19:58:09.000000000 +0000
@@ -16,8 +16,7 @@
 }
 
 function test_noUserInteraction() {
-  is(ChromeUtils.getPopupControlState(), "openAbused", "No user-interaction means: abuse state");
-  ok(!ChromeUtils.isPopupTokenUnused(), "Popup token has not been used yet");
+  ok(!SpecialPowers.wrap(document).hasValidTransientUserGestureActivation, "No user interaction yet");
   is(ChromeUtils.lastExternalProtocolIframeAllowed(), 0, "No iframe loaded before this test!");
 
   for (let i = 0; i < 10; ++i) {
@@ -26,7 +25,6 @@
     document.body.appendChild(ifr);
 
     is(ChromeUtils.getPopupControlState(), "openAbused", "No user-interaction means: abuse state");
-    ok(!ChromeUtils.isPopupTokenUnused(), "Popup token has been used!");
     ok(ChromeUtils.lastExternalProtocolIframeAllowed() != 0, "We have 1 iframe loaded");
   }
 
@@ -36,16 +34,14 @@
 function test_userInteraction() {
   let foo = document.getElementById('foo');
   foo.addEventListener('click', _ => {
-    is(ChromeUtils.getPopupControlState(), "openAllowed", "Click events allow popups");
-    ok(!ChromeUtils.isPopupTokenUnused(), "Popup token has not been used yet");
+    ok(SpecialPowers.wrap(document).hasValidTransientUserGestureActivation, "User should've interacted");
 
     for (let i = 0; i < 10; ++i) {
       let ifr = document.createElement('iframe');
       ifr.src = "foo+bar:all_good";
       document.body.appendChild(ifr);
 
-      is(ChromeUtils.getPopupControlState(), "openAllowed", "Click events allow popups");
-      ok(ChromeUtils.isPopupTokenUnused(), "Popup token has been used!");
+      ok(!SpecialPowers.wrap(document).hasValidTransientUserGestureActivation, "User interaction should've been consumed");
     }
 
     next();
@@ -53,7 +49,7 @@
   }, {once: true});
 
   setTimeout(_ => {
-    sendMouseEvent({type:'click'}, 'foo');
+    synthesizeMouseAtCenter(foo, {});
   }, 0);
 }
 
@@ -75,6 +71,7 @@
 
 SpecialPowers.pushPrefEnv({'set': [
   ['dom.block_external_protocol_in_iframes', true],
+  ['dom.delay.block_external_protocol_in_iframes.enabled', true],
 ]}, next);
 
 SimpleTest.waitForExplicitFinish();
diff -Nru firefox-84.0.2+build1/dom/html/test/test_fullscreen-api.html firefox-85.0+build1/dom/html/test/test_fullscreen-api.html
--- firefox-84.0.2+build1/dom/html/test/test_fullscreen-api.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_fullscreen-api.html	2021-01-18 19:58:09.000000000 +0000
@@ -35,7 +35,6 @@
   { test: "file_fullscreen-esc-exit.html" },
   { test: "file_fullscreen-denied.html" },
   { test: "file_fullscreen-api.html" },
-  { test: "file_fullscreen-plugins.html" },
   { test: "file_fullscreen-hidden.html" },
   { test: "file_fullscreen-svg-element.html" },
   { test: "file_fullscreen-navigation.html" },
@@ -76,38 +75,6 @@
   }
 }
 
-var gHeadlessSkipList = [
-  { test: "file_fullscreen-plugins.html", reason: "bug 1409805" },
-];
-
-var gLinuxE10sSkipList = [
-  { "test": "file_fullscreen-plugins.html", "reason": "bug 1330553" },
-];
-
-function shouldSkipTest(test) {
-  function checkList(list) {
-    for (let item of list) {
-      if (item.test == test) {
-        todo(false, `${test} skipped due to ${item.reason}`);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  if (SpecialPowers.Cc["@mozilla.org/gfx/info;1"].getService(SpecialPowers.Ci.nsIGfxInfo).isHeadless &&
-      checkList(gHeadlessSkipList)) {
-    return true;
-  }
-
-  if (!SpecialPowers.isMainProcess() &&
-      navigator.platform.includes('Linux') &&
-      checkList(gLinuxE10sSkipList)) {
-    return true;
-  }
-  return false;
-}
-
 function waitForEvent(eventTarget, eventName, checkFn, callback) {
   eventTarget.addEventListener(eventName, function listener(event) {
     if (checkFn && !checkFn(event)) {
@@ -121,38 +88,33 @@
 function runNextTest() {
   if (gTestIndex < gTestWindows.length) {
     let test = gTestWindows[gTestIndex];
-    if (shouldSkipTest(test.test)) {
-      info(`Skip test ${test.test}`);
-      SimpleTest.executeSoon(runNextTest);
-    } else {
-      let promise = ("prefs" in test)
-                      ? SpecialPowers.pushPrefEnv({"set": test.prefs})
-                      : Promise.resolve();
-      promise.then(function() {
-        info(`Run test ${test.test}`);
-        testWindow = window.open(test.test, "", "width=500,height=500,scrollbars=yes");
-        // We'll wait for the window to load, then make sure our window is refocused
-        // before starting the test, which will get kicked off on "focus".
-        // This ensures that we're essentially back on the primary "desktop" on
-        // OS X Lion before we run the test.
-        waitForLoadAndPaint(testWindow, function() {
-          SimpleTest.waitForFocus(function() {
-            info("Were focused");
-            // For the platforms that support reporting occlusion state (e.g. Mac),
-            // we should wait until the docshell has been activated again,
-            // otherwise, the fullscreen request might be denied.
-            if (testWindow.document.hidden) {
-              info("Waiting for document to unhide");
-              waitForEvent(testWindow.document, "visibilitychange", (event) => {
-                return !testWindow.document.hidden;
-              }, testWindow.begin);
-              return;
-            }
-            testWindow.begin();
-          }, testWindow);
-        });
+    let promise = ("prefs" in test)
+                    ? SpecialPowers.pushPrefEnv({"set": test.prefs})
+                    : Promise.resolve();
+    promise.then(function() {
+      info(`Run test ${test.test}`);
+      testWindow = window.open(test.test, "", "width=500,height=500,scrollbars=yes");
+      // We'll wait for the window to load, then make sure our window is refocused
+      // before starting the test, which will get kicked off on "focus".
+      // This ensures that we're essentially back on the primary "desktop" on
+      // OS X Lion before we run the test.
+      waitForLoadAndPaint(testWindow, function() {
+        SimpleTest.waitForFocus(function() {
+          info("Were focused");
+          // For the platforms that support reporting occlusion state (e.g. Mac),
+          // we should wait until the docshell has been activated again,
+          // otherwise, the fullscreen request might be denied.
+          if (testWindow.document.hidden) {
+            info("Waiting for document to unhide");
+            waitForEvent(testWindow.document, "visibilitychange", (event) => {
+              return !testWindow.document.hidden;
+            }, testWindow.begin);
+            return;
+          }
+          testWindow.begin();
+        }, testWindow);
       });
-    }
+    });
     gTestIndex++;
   } else {
     SimpleTest.finish();
diff -Nru firefox-84.0.2+build1/dom/html/test/test_iframe_sandbox_plugins.html firefox-85.0+build1/dom/html/test/test_iframe_sandbox_plugins.html
--- firefox-84.0.2+build1/dom/html/test/test_iframe_sandbox_plugins.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_iframe_sandbox_plugins.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=341604
-Implement HTML5 sandbox attribute for IFRAMEs
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 341604 - plugins</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<script type="application/javascript">
-/** Test for Bug 341604 - Implement HTML5 sandbox attribute for IFRAMEs **/
-/** Plugin tests **/
-SimpleTest.waitForExplicitFinish();
-
-function doTest() {
-  // 1) test that a plugin can't be loaded with <embed> inside a sandboxed <iframe>
-  // (done by file_iframe_sandbox_f_if1.html loaded in if1 below)
-  // 2) test that a plugin can't be loaded with <object> inside a sandboxed <iframe>
-  // (done by file_iframe_sandbox_f_if1.html loaded in if1 below)
-  // 3) test that plugin can't be loaded by a sandboxed <iframe> with src pointing to
-  // a document that is handled by a plugin (done by if_2 below)
-  // 4) test that when a plugin is loaded in an unsandboxed iframe, a sandbox attribute
-  // is then added to the iframe and the document containing the plugin is reloaded,
-  // the plugin does not load in the sandboxed iframe (done with if_3 below)
-  // 5) test that when when a sandboxed iframe's sandbox attribute is removed,
-  // and a new document is loaded into the iframe, the plugin loads
-  // (done with if_4 below)
-
-  // these are all handled by checking how many instances of the test plugin are loaded
-  // when this script runs as the onload handler - there should be two instances,
-  // initially the one loaded directly by this page itself, and the one loaded during
-  // test #4 above.
-  var p = document.getElementById('plugin1');
-  var if_1 = document.getElementById('if_1');
-  p.startWatchingInstanceCount();
-
-  if_1.src = 'file_iframe_sandbox_f_if1.html';
-}
-
-function if_1_load() {
-  var if_1 = document.getElementById('if_1');
-
-  if (if_1.src == "about:blank")
-    return;
-
-  // need to wait for plugin to load, if the test fails...
-  SimpleTest.executeSoon(if_1_continue);
-}
-
-function if_1_continue() {
-  // instance count should be 0 (tests #1 and #2 above)
-  var p = document.getElementById('plugin1');
-  is(p.getInstanceCount(), 0, "plugins should not be loaded via <object> or <embed> by a sandboxed iframe");
-
-  var if_2 = document.getElementById('if_2');
-  if_2.src = 'file_iframe_sandbox_f_if2.html';
-
-  SimpleTest.executeSoon(if_2_continue);
-}
-
-function if_2_continue() {
-  // instance count should be 0 (test #3 above)
-  var p = document.getElementById('plugin1');
-
-  is(p.getInstanceCount(), 0, "plugins should not be loaded via a document of a type that requires a plugin embedded in a sandboxed iframe");
-
-  SimpleTest.executeSoon(if_3_test);
-}
-
-function if_3_test() {
-  var if_3 = document.getElementById('if_3');
-  // add sandbox attribute
-  if_3.sandbox = '';
-  if_3.src = 'file_iframe_sandbox_f_if1.html';
-}
-
-function if_3_load() {
-  if (if_3.src == "about:blank")
-    return;
-
-  SimpleTest.executeSoon(if_3_continue);
-}
-
-function if_3_continue() {
-  var p = document.getElementById('plugin1');
-  is(p.getInstanceCount(), 0, "plugins should not be loaded when a sandbox attribute is added" +
-     "to an iframe and a document containing a plugin is then loaded into the iframe");
-
-  SimpleTest.executeSoon(if_4_test);
-}
-
-function if_4_test() {
-  var if_4 = document.getElementById('if_4');
-  // remove sandbox attribute
-  if_4.removeAttribute('sandbox');
-  if_4.src = 'file_iframe_sandbox_f_if1.html';
-}
-
-function if_4_load() {
-  if (if_4.src == "about:blank")
-    return;
-
-  SimpleTest.executeSoon(if_4_continue);
-}
-
-function if_4_continue() {
-  var p = document.getElementById('plugin1');
-  // there are 2 plugin instances in file_iframe_sandbox_if1.html loaded by
-  // if_1, they should successfully load.
-  is(p.getInstanceCount(), 2, "plugins should be loaded when a sandbox attribute is removed " +
-     "from an iframe and a document containing a plugin is then loaded into the iframe");
-
-  p.stopWatchingInstanceCount();
-  SimpleTest.executeSoon(finish_test);
-}
-
-function finish_test() {
-  SimpleTest.finish();
-}
-
-addLoadEvent(doTest);
-</script>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=341604">Mozilla Bug 341604</a> - Implement HTML5 sandbox attribute for IFRAMEs
-<p id="display"></p>
-<div id="content">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-<iframe id="if_1" sandbox='allow-same-origin' onLoad='if_1_load()' src="about:blank" height="400" width="400"></iframe>
-<iframe id="if_2" sandbox='allow-same-origin' src="about:blank" height="400" width="400"></iframe>
-<iframe id="if_3" src="about:blank" onload='if_3_load()' height="400" width="400"></iframe>
-<iframe id="if_4" sandbox='allow-same-origin' onload='if_4_load()' src="about:blank" height="400" width="400"></iframe>
-</div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/html/test/test_multipleFilePicker.html firefox-85.0+build1/dom/html/test/test_multipleFilePicker.html
--- firefox-84.0.2+build1/dom/html/test/test_multipleFilePicker.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_multipleFilePicker.html	2021-01-18 19:58:09.000000000 +0000
@@ -29,17 +29,22 @@
 
 let pickerCount = 0;
 
+SpecialPowers.pushPrefEnv({
+  set: [["dom.disable_open_during_load", true]],
+})
 // Let's do the first click.
-(new Promise(resolve => {
-  MockFilePicker.showCallback = function(filepicker) {
-    ++pickerCount;
-    resolve();
-  }
-  setTimeout(_ => {
-    is(pickerCount, 0, "No file picker initially");
-    sendMouseEvent({type:'click'}, 'foo');
-  }, 0);
-}))
+.then(() => {
+  return new Promise(resolve => {
+    MockFilePicker.showCallback = function(filepicker) {
+      ++pickerCount;
+      resolve();
+    }
+    setTimeout(_ => {
+      is(pickerCount, 0, "No file picker initially");
+      synthesizeMouseAtCenter(foo, {});
+    }, 0);
+  })
+})
 
 // Let's wait a bit more, then let's do a click.
 .then(() => {
diff -Nru firefox-84.0.2+build1/dom/html/test/test_object_nav.html firefox-85.0+build1/dom/html/test/test_object_nav.html
--- firefox-84.0.2+build1/dom/html/test/test_object_nav.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_object_nav.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=720130
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 720130</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"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720130">Mozilla Bug 720130</a>
+<p id="display"></p>
+<div id="content">
+  <input>
+  <object data="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAATklEQVRYhe3SIQ4AIBADwf7/04elBAtrVlSduGnSTDJ7cuT1PQJwwO+Hl7sAGAA07gjAAfgIBeAAoHFHAA7ARygABwCNOwJwAD5CATRgAYXh+kypw86nAAAAAElFTkSuQmCC"></object>
+  <button>foo</button>
+  <object type="application/x-shockwave-flash"></object>
+  <object tabindex='0' type="application/x-shockwave-flash"></object>
+  <object data="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAATklEQVRYhe3SIQ4AIBADwf7/04elBAtrVlSduGnSTDJ7cuT1PQJwwO+Hl7sAGAA07gjAAfgIBeAAoHFHAA7ARygABwCNOwJwAD5CATRgAYXh+kypw86nAAAAAElFTkSuQmCC"></object>
+  <object tabindex='0' data="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAATklEQVRYhe3SIQ4AIBADwf7/04elBAtrVlSduGnSTDJ7cuT1PQJwwO+Hl7sAGAA07gjAAfgIBeAAoHFHAA7ARygABwCNOwJwAD5CATRgAYXh+kypw86nAAAAAElFTkSuQmCC"></object>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 720130 **/
+
+var gFocusCount = 0;
+var gFocusNb    = 4;
+
+/**
+ * Check the focus navigation.
+ */
+function checkFocus() {
+  switch (gFocusCount) {
+    case 0:
+      is(document.activeElement, document.getElementsByTagName('a')[0],
+         "first focused element should be the link");
+      break;
+    case 1:
+      is(document.activeElement, document.getElementsByTagName('input')[0],
+         "second focused element should be the text field");
+      break;
+    case 2:
+      is(document.activeElement, document.getElementsByTagName('button')[0],
+         "third focused element should be the button");
+      break;
+    case 3:
+      ok(document.activeElement != document.getElementsByTagName('object')[1],
+         "fourth focused element should not be the plugin object");
+      ok(document.activeElement != document.getElementsByTagName('object')[2],
+         "fourth focused element should not be the plugin object with tabindex");
+      ok(document.activeElement != document.getElementsByTagName('object')[3],
+         "fourth focused element should not be the image object without tabindex");
+      is(document.activeElement, document.getElementsByTagName('object')[4],
+         "fourth focused element should be the image object with tabindex");
+      break;
+  }
+
+  gFocusCount++;
+}
+
+SimpleTest.waitForExplicitFinish();
+
+function doTest() {
+  is(document.activeElement, document.body);
+
+  // Preliminary check: tabindex should be 0 on the object.
+  is(document.getElementsByTagName('object')[0].tabIndex, 0,
+     "the element shouldn't get focus while navigating in the document");
+
+  document.addEventListener("focus", function() {
+    checkFocus();
+
+    if (gFocusCount != gFocusNb) {
+      synthesizeKey("KEY_Tab");
+      return;
+    }
+
+    document.removeEventListener("focus", arguments.callee, true);
+    SimpleTest.finish();
+  }, true);
+
+  synthesizeKey("KEY_Tab");
+}
+
+SimpleTest.waitForFocus(function () {
+  // Set the focus model so that links are focusable by the tab key even on Mac
+  SpecialPowers.pushPrefEnv({'set': [['accessibility.tabfocus', 7]]}, doTest);
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/html/test/test_object_plugin_nav.html firefox-85.0+build1/dom/html/test/test_object_plugin_nav.html
--- firefox-84.0.2+build1/dom/html/test/test_object_plugin_nav.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/test/test_object_plugin_nav.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=720130
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 720130</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720130">Mozilla Bug 720130</a>
-<p id="display"></p>
-<div id="content">
-  <input>
-  <object type="application/x-test"></object>
-  <button>foo</button>
-  <object tabindex='0' type="application/x-test"></object>
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 720130 **/
-
-var gFocusCount = 0;
-var gFocusNb    = 4;
-
-/**
- * Check the focus navigation.
- */
-function checkFocus() {
-  switch (gFocusCount) {
-    case 0:
-      is(document.activeElement, document.getElementsByTagName('a')[0],
-         "first focused element should be the link");
-      break;
-    case 1:
-      is(document.activeElement, document.getElementsByTagName('input')[0],
-         "second focused element should be the text field");
-      break;
-    case 2:
-      is(document.activeElement, document.getElementsByTagName('button')[0],
-         "third focused element should be the button");
-      break;
-    case 3:
-      is(document.activeElement, document.getElementsByTagName('object')[1],
-         "fourth focused element should be the object");
-      break;
-  }
-
-  gFocusCount++;
-}
-
-SimpleTest.waitForExplicitFinish();
-
-function doTest() {
-  is(document.activeElement, document.body);
-
-  // Preliminary check: tabindex should be 0 on the object.
-  is(document.getElementsByTagName('object')[0].tabIndex, 0,
-     "the plugin shouldn't get focus while navigating in the document");
-
-  document.addEventListener("focus", function() {
-    checkFocus();
-
-    if (gFocusCount != gFocusNb) {
-      synthesizeKey("KEY_Tab");
-      return;
-    }
-
-    document.removeEventListener("focus", arguments.callee, true);
-
-    // Just make sure that .focus() still works.
-    var o = document.getElementsByTagName('object')[0];
-    o.onfocus = function() {
-      SimpleTest.finish();
-      o.onfocus = null;
-    };
-    o.focus();
-  }, true);
-
-  synthesizeKey("KEY_Tab");
-}
-
-SimpleTest.waitForFocus(function () {
-  // Set the focus model so that links are focusable by the tab key even on Mac
-  SpecialPowers.pushPrefEnv({'set': [['accessibility.tabfocus', 7]]}, doTest);
-});
-
-</script>
-</pre>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/html/TextControlState.cpp firefox-85.0+build1/dom/html/TextControlState.cpp
--- firefox-84.0.2+build1/dom/html/TextControlState.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/TextControlState.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -54,6 +54,8 @@
 
 using namespace dom;
 using layers::ScrollInputMethod;
+using ValueSetterOption = TextControlState::ValueSetterOption;
+using ValueSetterOptions = TextControlState::ValueSetterOptions;
 
 /*****************************************************************************
  * TextControlElement
@@ -347,7 +349,6 @@
   NS_IMETHOD ScrollPage(bool aForward) override;
   NS_IMETHOD ScrollLine(bool aForward) override;
   NS_IMETHOD ScrollCharacter(bool aRight) override;
-  NS_IMETHOD SelectAll(void) override;
   NS_IMETHOD CheckVisibility(nsINode* node, int16_t startOffset,
                              int16_t EndOffset, bool* _retval) override;
   virtual nsresult CheckVisibilityContent(nsIContent* aNode,
@@ -752,15 +753,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-TextInputSelectionController::SelectAll() {
-  if (!mFrameSelection) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  RefPtr<nsFrameSelection> frameSelection = mFrameSelection;
-  return frameSelection->SelectAll();
-}
-
 void TextInputSelectionController::SelectionWillTakeFocus() {
   if (mFrameSelection) {
     if (PresShell* shell = mFrameSelection->GetPresShell()) {
@@ -1147,14 +1139,14 @@
   MOZ_CAN_RUN_SCRIPT AutoTextControlHandlingState(
       TextControlState& aTextControlState, TextControlAction aTextControlAction,
       const nsAString& aSettingValue, const nsAString* aOldValue,
-      uint32_t aFlags, ErrorResult& aRv)
+      const ValueSetterOptions& aOptions, ErrorResult& aRv)
       : mParent(aTextControlState.mHandlingState),
         mTextControlState(aTextControlState),
         mTextCtrlElement(aTextControlState.mTextCtrlElement),
         mTextInputListener(aTextControlState.mTextListener),
         mSettingValue(aSettingValue),
         mOldValue(aOldValue),
-        mSetValueFlags(aFlags),
+        mValueSetterOptions(aOptions),
         mTextControlAction(aTextControlAction) {
     MOZ_ASSERT(aTextControlAction == TextControlAction::SetValue,
                "Use generic constructor");
@@ -1221,15 +1213,15 @@
     // If we'reemulating user input, we don't need to manage mTextInputListener
     // by ourselves since everything should be handled by TextEditor as normal
     // user input.
-    if (mSetValueFlags & TextControlState::eSetValue_BySetUserInput) {
+    if (mValueSetterOptions.contains(ValueSetterOption::BySetUserInputAPI)) {
       return;
     }
     // Otherwise, if we're setting the value programatically, we need to manage
     // mTextInputListener by ourselves since TextEditor users special path
     // for the performance.
     mTextInputListener->SettingValue(true);
-    mTextInputListener->SetValueChanged(mSetValueFlags &
-                                        TextControlState::eSetValue_Notify);
+    mTextInputListener->SetValueChanged(mValueSetterOptions.contains(
+        ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame));
     mEditActionHandled = false;
     // Even if falling back to `TextControlState::SetValueWithoutTextEditor()`
     // due to editor destruction, it shouldn't dispatch "beforeinput" event
@@ -1256,11 +1248,13 @@
     if (!Is(TextControlAction::SetValue)) {
       return NS_OK;
     }
-    if (!(mSetValueFlags & TextControlState::eSetValue_BySetUserInput)) {
+    if (!mValueSetterOptions.contains(ValueSetterOption::BySetUserInputAPI)) {
       mTextInputListener->SetValueChanged(true);
       mTextInputListener->SettingValue(
           mParent && mParent->IsHandling(TextControlAction::SetValue));
-      if (!(mSetValueFlags & TextControlState::eSetValue_Notify)) {
+      if (!mValueSetterOptions.contains(
+              ValueSetterOption::
+                  UpdateOverlayTextVisibilityAndInvalidateFrame)) {
         // Listener doesn't update frame, but it is required for
         // placeholder
         mTextControlState.ValueWasChanged();
@@ -1293,13 +1287,17 @@
     if (mTextControlState.mBoundFrame) {
       return true;
     }
-    // XXX It's odd to drop flags except eSetValue_Notify.  Probably, this
-    //     intended to drop eSetValue_BySetUserInput and eSetValue_ByContent,
-    //     but other flags are added later.
+    // XXX It's odd to drop flags except
+    //     ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame.
+    //     Probably, this intended to drop ValueSetterOption::BySetUserInputAPI
+    //     and ValueSetterOption::ByContentAPI, but other flags are added later.
     ErrorResult error;
     AutoTextControlHandlingState handlingSetValueWithoutEditor(
         mTextControlState, TextControlAction::SetValue, mSettingValue,
-        mOldValue, mSetValueFlags & TextControlState::eSetValue_Notify, error);
+        mOldValue,
+        mValueSetterOptions &
+            ValueSetterOption::UpdateOverlayTextVisibilityAndInvalidateFrame,
+        error);
     if (error.Failed()) {
       MOZ_ASSERT(error.ErrorCodeIs(NS_ERROR_OUT_OF_MEMORY));
       error.SuppressException();
@@ -1331,9 +1329,9 @@
   }
   TextControlElement* GetTextControlElement() const { return mTextCtrlElement; }
   TextInputListener* GetTextInputListener() const { return mTextInputListener; }
-  uint32_t GetSetValueFlags() const {
+  const ValueSetterOptions& ValueSetterOptionsRef() const {
     MOZ_ASSERT(Is(TextControlAction::SetValue));
-    return mSetValueFlags;
+    return mValueSetterOptions;
   }
   const nsAString* GetOldValue() const {
     MOZ_ASSERT(Is(TextControlAction::SetValue));
@@ -1379,7 +1377,7 @@
   RefPtr<TextInputListener> const mTextInputListener;
   nsString mSettingValue;
   const nsAString* mOldValue = nullptr;
-  uint32_t mSetValueFlags = 0;
+  ValueSetterOptions mValueSetterOptions;
   TextControlAction const mTextControlAction;
   bool mTextControlStateDestroyed = false;
   bool mEditActionHandled = false;
@@ -1918,9 +1916,10 @@
     // the default value.  Make sure to turn off undo before setting the default
     // value, and turn it back on afterwards. This will make sure we can't undo
     // past the default value.
-    // So, we use eSetValue_Internal flag only that it will turn off undo.
+    // So, we use ValueSetterOption::ByInternalAPI only that it will turn off
+    // undo.
 
-    if (NS_WARN_IF(!SetValue(defaultValue, eSetValue_Internal))) {
+    if (NS_WARN_IF(!SetValue(defaultValue, ValueSetterOption::ByInternalAPI))) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
@@ -2065,7 +2064,8 @@
 
 void TextControlState::SetSelectionRange(
     uint32_t aStart, uint32_t aEnd,
-    nsITextControlFrame::SelectionDirection aDirection, ErrorResult& aRv) {
+    nsITextControlFrame::SelectionDirection aDirection, ErrorResult& aRv,
+    ScrollAfterSelection aScroll) {
   MOZ_ASSERT(IsSelectionCached() || mBoundFrame,
              "How can we have a non-cached selection but no frame?");
 
@@ -2079,23 +2079,10 @@
   bool changed = false;
   nsresult rv = NS_OK;  // For the ScrollSelectionIntoView() return value.
   if (IsSelectionCached()) {
-    nsAutoString value;
-    // XXXbz is "false" the right thing to pass here?  Hard to tell, given the
-    // various mismatches between our impl and the spec.
-    GetValue(value, false);
-    uint32_t length = value.Length();
-    if (aStart > length) {
-      aStart = length;
-    }
-    if (aEnd > length) {
-      aEnd = length;
-    }
     SelectionProperties& props = GetSelectionProperties();
-    changed = props.GetStart() != aStart || props.GetEnd() != aEnd ||
-              props.GetDirection() != aDirection;
-    props.SetStart(aStart);
-    props.SetEnd(aEnd);
-    props.SetDirection(aDirection);
+    changed |= props.SetStart(aStart);
+    changed |= props.SetEnd(aEnd);
+    changed |= props.SetDirection(aDirection);
   } else {
     MOZ_ASSERT(mBoundFrame, "Our frame should still be valid");
     aRv = mBoundFrame->SetSelectionRange(aStart, aEnd, aDirection);
@@ -2103,7 +2090,7 @@
         handlingSetSelectionRange.IsTextControlStateDestroyed()) {
       return;
     }
-    if (mBoundFrame) {
+    if (aScroll == ScrollAfterSelection::Yes) {
       mBoundFrame->ScrollSelectionIntoViewAsync();
     }
     // Press on to firing the event even if that failed, like our old code did.
@@ -2213,7 +2200,7 @@
     return nsITextControlFrame::eBackward;
   }
 
-  // We don't support directionless selections.
+  // We don't support directionless selections, see bug 1541454.
   return nsITextControlFrame::eForward;
 }
 
@@ -2222,11 +2209,6 @@
   nsITextControlFrame::SelectionDirection dir =
       DirectionStringToSelectionDirection(aDirection);
 
-  if (IsSelectionCached()) {
-    GetSelectionProperties().SetDirection(dir);
-    return;
-  }
-
   uint32_t start, end;
   GetSelectionRange(&start, &end, aRv);
   if (aRv.Failed()) {
@@ -2250,11 +2232,12 @@
 void TextControlState::SetSelectionRange(uint32_t aSelectionStart,
                                          uint32_t aSelectionEnd,
                                          const Optional<nsAString>& aDirection,
-                                         ErrorResult& aRv) {
+                                         ErrorResult& aRv,
+                                         ScrollAfterSelection aScroll) {
   nsITextControlFrame::SelectionDirection dir =
       DirectionStringToSelectionDirection(aDirection);
 
-  SetSelectionRange(aSelectionStart, aSelectionEnd, dir, aRv);
+  SetSelectionRange(aSelectionStart, aSelectionEnd, dir, aRv, aScroll);
   // The instance may have already been deleted here.
 }
 
@@ -2408,6 +2391,7 @@
         GetSelectionDirection(IgnoreErrors());
 
     SelectionProperties& props = GetSelectionProperties();
+    props.SetMaxLength(value.Length());
     props.SetStart(start);
     props.SetEnd(end);
     props.SetDirection(direction);
@@ -2482,7 +2466,7 @@
   // buffer. The only case where we don't do this is if a value transfer is in
   // progress.
   if (!mValueTransferInProgress) {
-    DebugOnly<bool> ok = SetValue(value, eSetValue_Internal);
+    DebugOnly<bool> ok = SetValue(value, ValueSetterOption::ByInternalAPI);
     // TODO Find something better to do if this fails...
     NS_WARNING_ASSERTION(ok, "SetValue() couldn't allocate memory");
   }
@@ -2576,18 +2560,18 @@
 }
 
 #ifdef DEBUG
-// @param aFlags TextControlState::SetValueFlags
-bool AreFlagsNotDemandingContradictingMovements(uint32_t aFlags) {
-  return !(
-      !!(aFlags &
-         TextControlState::
-             eSetValue_MoveCursorToBeginSetSelectionDirectionForward) &&
-      !!(aFlags & TextControlState::eSetValue_MoveCursorToEndIfValueChanged));
+// @param aOptions TextControlState::ValueSetterOptions
+bool AreFlagsNotDemandingContradictingMovements(
+    const ValueSetterOptions& aOptions) {
+  return !aOptions.contains(
+      {ValueSetterOption::MoveCursorToBeginSetSelectionDirectionForward,
+       ValueSetterOption::MoveCursorToEndIfValueChanged});
 }
 #endif  // DEBUG
 
 bool TextControlState::SetValue(const nsAString& aValue,
-                                const nsAString* aOldValue, uint32_t aFlags) {
+                                const nsAString* aOldValue,
+                                const ValueSetterOptions& aOptions) {
   if (mHandlingState &&
       mHandlingState->IsHandling(TextControlAction::CommitComposition)) {
     // GetValue doesn't return current text frame's content during committing.
@@ -2600,7 +2584,7 @@
 
   ErrorResult error;
   AutoTextControlHandlingState handlingSetValue(
-      *this, TextControlAction::SetValue, aValue, aOldValue, aFlags, error);
+      *this, TextControlAction::SetValue, aValue, aOldValue, aOptions, error);
   if (error.Failed()) {
     MOZ_ASSERT(error.ErrorCodeIs(NS_ERROR_OUT_OF_MEMORY));
     error.SuppressException();
@@ -2615,7 +2599,8 @@
   //       we shouldn't commit composition.  However, in Firefox, we never
   //       call this via `setUserInput` during composition.  Therefore, the
   //       bug must not be reproducible actually.
-  if (aFlags & (eSetValue_BySetUserInput | eSetValue_ByContent)) {
+  if (aOptions.contains(ValueSetterOption::BySetUserInputAPI) ||
+      aOptions.contains(ValueSetterOption::ByContentAPI)) {
     if (EditorHasComposition()) {
       // When this is called recursively, there shouldn't be composition.
       if (handlingSetValue.IsHandling(TextControlAction::CommitComposition)) {
@@ -2687,10 +2672,10 @@
   // just let the outer call do so.
   if (!wasHandlingSetValue) {
     // TODO(emilio): It seems wrong to pass ValueChangeKind::Script if
-    // BySetUserInput is in aFlags.
-    auto changeKind = (aFlags & eSetValue_Internal) ? ValueChangeKind::Internal
-                                                    : ValueChangeKind::Script;
-
+    // BySetUserInput is in aOptions.
+    auto changeKind = aOptions.contains(ValueSetterOption::ByInternalAPI)
+                          ? ValueChangeKind::Internal
+                          : ValueChangeKind::Script;
     handlingSetValue.GetTextControlElement()->OnValueChanged(changeKind);
   }
   return true;
@@ -2750,7 +2735,8 @@
 
   aHandlingSetValue.WillSetValueWithTextEditor();
 
-  if (aHandlingSetValue.GetSetValueFlags() & eSetValue_BySetUserInput) {
+  if (aHandlingSetValue.ValueSetterOptionsRef().contains(
+          ValueSetterOption::BySetUserInputAPI)) {
     // If the caller inserts text as part of user input, for example,
     // autocomplete, we need to replace the text as "insert string"
     // because undo should cancel only this operation (i.e., previous
@@ -2776,61 +2762,17 @@
   // by script.
   AutoInputEventSuppresser suppressInputEventDispatching(textEditor);
 
-  if (aHandlingSetValue.GetSetValueFlags() & eSetValue_ForXUL) {
-    // On XUL <textbox> element, we need to preserve existing undo
-    // transactions.
-    // XXX Do we really need to do such complicated optimization?
-    //     This was landed for web pages which set <textarea> value
-    //     per line (bug 518122).  For example:
-    //       for (;;) {
-    //         textarea.value += oneLineText + "\n";
-    //       }
-    //     However, this path won't be used in web content anymore.
-    nsCOMPtr<nsISelectionController> kungFuDeathGrip = mSelCon.get();
-    // Use nsString to avoid copying string buffer in most cases.
-    nsString currentValue;
-    if (aHandlingSetValue.GetOldValue()) {
-      currentValue.Assign(*aHandlingSetValue.GetOldValue());
-    } else {
-      mBoundFrame->GetText(currentValue);
-    }
-    uint32_t currentLength = currentValue.Length();
-    uint32_t newlength = aHandlingSetValue.GetSettingValue().Length();
-    if (!currentLength ||
-        !StringBeginsWith(aHandlingSetValue.GetSettingValue(), currentValue)) {
-      // Replace the whole text.
-      currentLength = 0;
-      kungFuDeathGrip->SelectAll();
-    } else {
-      // Collapse selection to the end so that we can append data.
-      mBoundFrame->SelectAllOrCollapseToEndOfText(false);
-    }
-    const nsAString& insertValue = StringTail(
-        aHandlingSetValue.GetSettingValue(), newlength - currentLength);
-
-    if (insertValue.IsEmpty()) {
-      // In this case, we makes the editor stop dispatching "input"
-      // event so that passing nullptr as nsIPrincipal is safe for
-      // now.
-      nsresult rv = textEditor->DeleteSelectionAsAction(
-          nsIEditor::eNone, nsIEditor::eNoStrip, nullptr);
-      NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
-                           "TextEditor::DeleteSelectionAsAction() failed");
-      return rv != NS_ERROR_OUT_OF_MEMORY;
-    }
-    // In this case, we makes the editor stop dispatching "input"
-    // event so that passing nullptr as nsIPrincipal is safe for
-    // now.
-    nsresult rv = textEditor->InsertTextAsAction(insertValue, nullptr);
-    NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
-                         "TextEditor::InsertTextAsAction() failed");
-    return rv != NS_ERROR_OUT_OF_MEMORY;
-  }
-
   // On <input> or <textarea>, we shouldn't preserve existing undo
   // transactions because other browsers do not preserve them too
   // and not preserving transactions makes setting value faster.
-  AutoDisableUndo disableUndo(textEditor);
+  //
+  // (Except if chrome opts into this behavior).
+  Maybe<AutoDisableUndo> disableUndo;
+  if (!aHandlingSetValue.ValueSetterOptionsRef().contains(
+          ValueSetterOption::PreserveUndoHistory)) {
+    disableUndo.emplace(textEditor);
+  }
+
   if (selection) {
     // Since we don't use undo transaction, we don't need to store
     // selection state.  SetText will set selection to tail.
@@ -2844,7 +2786,8 @@
   // event so that passing nullptr as nsIPrincipal is safe for now.
   nsresult rv = textEditor->SetTextAsAction(
       aHandlingSetValue.GetSettingValue(),
-      (aHandlingSetValue.GetSetValueFlags() & eSetValue_BySetUserInput) &&
+      aHandlingSetValue.ValueSetterOptionsRef().contains(
+          ValueSetterOption::BySetUserInputAPI) &&
               !StaticPrefs::dom_input_event_allow_to_cancel_set_user_input()
           ? TextEditor::AllowBeforeInputEventCancelable::No
           : TextEditor::AllowBeforeInputEventCancelable::Yes,
@@ -2891,7 +2834,8 @@
     // modified.  So, we need to store input event data value before
     // dispatching beforeinput event.
     nsString inputEventData(aHandlingSetValue.GetSettingValue());
-    if ((aHandlingSetValue.GetSetValueFlags() & eSetValue_BySetUserInput) &&
+    if (aHandlingSetValue.ValueSetterOptionsRef().contains(
+            ValueSetterOption::BySetUserInputAPI) &&
         StaticPrefs::dom_input_events_beforeinput_enabled() &&
         !aHandlingSetValue.HasBeforeInputEventDispatched()) {
       // This probably occurs when session restorer sets the old value with
@@ -2950,26 +2894,21 @@
       // Since we have no editor we presumably have cached selection state.
       if (IsSelectionCached()) {
         MOZ_ASSERT(AreFlagsNotDemandingContradictingMovements(
-            aHandlingSetValue.GetSetValueFlags()));
+            aHandlingSetValue.ValueSetterOptionsRef()));
 
         SelectionProperties& props = GetSelectionProperties();
-        if (aHandlingSetValue.GetSetValueFlags() &
-            eSetValue_MoveCursorToEndIfValueChanged) {
+        props.SetMaxLength(aHandlingSetValue.GetSettingValue().Length());
+        if (aHandlingSetValue.ValueSetterOptionsRef().contains(
+                ValueSetterOption::MoveCursorToEndIfValueChanged)) {
           props.SetStart(aHandlingSetValue.GetSettingValue().Length());
           props.SetEnd(aHandlingSetValue.GetSettingValue().Length());
           props.SetDirection(nsITextControlFrame::eForward);
-        } else if (aHandlingSetValue.GetSetValueFlags() &
-                   eSetValue_MoveCursorToBeginSetSelectionDirectionForward) {
+        } else if (aHandlingSetValue.ValueSetterOptionsRef().contains(
+                       ValueSetterOption::
+                           MoveCursorToBeginSetSelectionDirectionForward)) {
           props.SetStart(0);
           props.SetEnd(0);
           props.SetDirection(nsITextControlFrame::eForward);
-        } else {
-          // Make sure our cached selection position is not outside the new
-          // value.
-          props.SetStart(std::min(
-              props.GetStart(), aHandlingSetValue.GetSettingValue().Length()));
-          props.SetEnd(std::min(props.GetEnd(),
-                                aHandlingSetValue.GetSettingValue().Length()));
         }
       }
 
@@ -2986,7 +2925,8 @@
     // XXX Should we stop dispatching `input` event if the text control
     //     element has already removed from the DOM tree by a `beforeinput`
     //     event listener?
-    if (aHandlingSetValue.GetSetValueFlags() & eSetValue_BySetUserInput) {
+    if (aHandlingSetValue.ValueSetterOptionsRef().contains(
+            ValueSetterOption::BySetUserInputAPI)) {
       MOZ_ASSERT(aHandlingSetValue.GetTextControlElement());
 
       // Update validity state before dispatching "input" event for its
diff -Nru firefox-84.0.2+build1/dom/html/TextControlState.h firefox-85.0+build1/dom/html/TextControlState.h
--- firefox-84.0.2+build1/dom/html/TextControlState.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/TextControlState.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,11 +9,11 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/EnumSet.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TextControlElement.h"
 #include "mozilla/TextEditor.h"
 #include "mozilla/WeakPtr.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLInputElementBinding.h"
 #include "mozilla/dom/Nullable.h"
 #include "nsCycleCollectionParticipant.h"
@@ -32,6 +32,7 @@
 class TextInputSelectionController;
 
 namespace dom {
+class Element;
 class HTMLInputElement;
 }  // namespace dom
 
@@ -174,38 +175,39 @@
    */
   MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult OnEditActionHandled();
 
-  enum SetValueFlags {
-    // The call is for internal processing.
-    eSetValue_Internal = 1 << 0,
-    // The value is changed by a call of setUserInput() from chrome.
-    eSetValue_BySetUserInput = 1 << 1,
+  enum class ValueSetterOption {
+    // The call is for setting value to initial one, computed one, etc.
+    ByInternalAPI,
+    // The value is changed by a call of setUserInput() API from chrome.
+    BySetUserInputAPI,
     // The value is changed by changing value attribute of the element or
     // something like setRangeText().
-    eSetValue_ByContent = 1 << 2,
+    ByContentAPI,
     // Whether the value change should be notified to the frame/contet nor not.
-    eSetValue_Notify = 1 << 3,
+    UpdateOverlayTextVisibilityAndInvalidateFrame,
     // Whether to move the cursor to end of the value (in the case when we have
     // cached selection offsets), in the case when the value has changed.  If
-    // this is not set and
-    // eSetValue_MoveCursorToBeginSetSelectionDirectionForward
+    // this is not set and MoveCursorToBeginSetSelectionDirectionForward
     // is not set, the cached selection offsets will simply be clamped to
     // be within the length of the new value. In either case, if the value has
     // not changed the cursor won't move.
     // TODO(mbrodesser): update comment and enumerator identifier to reflect
     // that also the direction is set to forward.
-    eSetValue_MoveCursorToEndIfValueChanged = 1 << 4,
-    // The value is changed for a XUL text control as opposed to for an HTML
-    // text control.  Such value changes are different in that they preserve the
-    // undo history.
-    eSetValue_ForXUL = 1 << 5,
+    MoveCursorToEndIfValueChanged,
+
+    // The value change should preserve undo history.
+    PreserveUndoHistory,
+
     // Whether it should be tried to move the cursor to the beginning of the
     // text control and set the selection direction to "forward".
     // TODO(mbrodesser): As soon as "none" is supported
     // (https://bugzilla.mozilla.org/show_bug.cgi?id=1541454), it should be set
     // to "none" and only fall back to "forward" if the platform doesn't support
     // it.
-    eSetValue_MoveCursorToBeginSetSelectionDirectionForward = 1 << 6,
+    MoveCursorToBeginSetSelectionDirectionForward,
   };
+  using ValueSetterOptions = EnumSet<ValueSetterOption, uint32_t>;
+
   /**
    * SetValue() sets the value to aValue with replacing \r\n and \r with \n.
    *
@@ -213,15 +215,16 @@
    * @param aOldValue   Optional.  If you have already know current value,
    *                    set this to it.  However, this must not contain \r
    *                    for the performance.
-   * @param aFlags      See SetValueFlags.
+   * @param aOptions    See ValueSetterOption.
    */
-  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE bool SetValue(const nsAString& aValue,
-                                                const nsAString* aOldValue,
-                                                uint32_t aFlags);
-  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE bool SetValue(const nsAString& aValue,
-                                                uint32_t aFlags) {
-    return SetValue(aValue, nullptr, aFlags);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE bool SetValue(
+      const nsAString& aValue, const nsAString* aOldValue,
+      const ValueSetterOptions& aOptions);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE bool SetValue(
+      const nsAString& aValue, const ValueSetterOptions& aOptions) {
+    return SetValue(aValue, nullptr, aOptions);
   }
+
   /**
    * GetValue() returns current value either with or without TextEditor.
    * The result never includes \r.
@@ -275,38 +278,54 @@
 
   struct SelectionProperties {
    public:
-    SelectionProperties()
-        : mStart(0), mEnd(0), mDirection(nsITextControlFrame::eForward) {}
     bool IsDefault() const {
       return mStart == 0 && mEnd == 0 &&
              mDirection == nsITextControlFrame::eForward;
     }
     uint32_t GetStart() const { return mStart; }
-    void SetStart(uint32_t value) {
-      mIsDirty = true;
-      mStart = value;
+    bool SetStart(uint32_t value) {
+      uint32_t newValue = std::min(value, mMaxLength);
+      bool changed = mStart != newValue;
+      mStart = newValue;
+      mIsDirty |= changed;
+      return changed;
     }
     uint32_t GetEnd() const { return mEnd; }
-    void SetEnd(uint32_t value) {
-      mIsDirty = true;
-      mEnd = value;
+    bool SetEnd(uint32_t value) {
+      uint32_t newValue = std::min(value, mMaxLength);
+      bool changed = mEnd != newValue;
+      mEnd = newValue;
+      mIsDirty |= changed;
+      return changed;
     }
     nsITextControlFrame::SelectionDirection GetDirection() const {
       return mDirection;
     }
-    void SetDirection(nsITextControlFrame::SelectionDirection value) {
-      mIsDirty = true;
+    bool SetDirection(nsITextControlFrame::SelectionDirection value) {
+      bool changed = mDirection != value;
       mDirection = value;
+      mIsDirty |= changed;
+      return changed;
     }
+    void SetMaxLength(uint32_t aMax) {
+      mMaxLength = aMax;
+      // recompute against the new max length
+      SetStart(GetStart());
+      SetEnd(GetEnd());
+    }
+
     // return true only if mStart, mEnd, or mDirection have been modified,
     // or if SetIsDirty() was explicitly called.
     bool IsDirty() const { return mIsDirty; }
     void SetIsDirty() { mIsDirty = true; }
 
    private:
-    uint32_t mStart, mEnd;
+    uint32_t mStart = 0;
+    uint32_t mEnd = 0;
+    uint32_t mMaxLength = 0;
     bool mIsDirty = false;
-    nsITextControlFrame::SelectionDirection mDirection;
+    nsITextControlFrame::SelectionDirection mDirection =
+        nsITextControlFrame::eForward;
   };
 
   bool IsSelectionCached() const { return mSelectionCached; }
@@ -326,6 +345,8 @@
   nsITextControlFrame::SelectionDirection GetSelectionDirection(
       ErrorResult& aRv);
 
+  enum class ScrollAfterSelection { No, Yes };
+
   // Set the selection range (start, end, direction).  aEnd is allowed to be
   // smaller than aStart; in that case aStart will be reset to the same value as
   // aEnd.  This basically implements
@@ -335,19 +356,18 @@
   // SelectionDirection.
   //
   // If we have a frame, this method will scroll the selection into view.
-  //
-  // XXXbz This should really take uint32_t, but none of our guts (either the
-  // frame or our cached selection state) work with uint32_t at the moment...
   MOZ_CAN_RUN_SCRIPT void SetSelectionRange(
       uint32_t aStart, uint32_t aEnd,
-      nsITextControlFrame::SelectionDirection aDirection, ErrorResult& aRv);
+      nsITextControlFrame::SelectionDirection aDirection, ErrorResult& aRv,
+      ScrollAfterSelection aScroll = ScrollAfterSelection::Yes);
 
   // Set the selection range, but with an optional string for the direction.
   // This will convert aDirection to an nsITextControlFrame::SelectionDirection
   // and then call our other SetSelectionRange overload.
   MOZ_CAN_RUN_SCRIPT void SetSelectionRange(
       uint32_t aSelectionStart, uint32_t aSelectionEnd,
-      const dom::Optional<nsAString>& aDirection, ErrorResult& aRv);
+      const dom::Optional<nsAString>& aDirection, ErrorResult& aRv,
+      ScrollAfterSelection aScroll = ScrollAfterSelection::Yes);
 
   // Set the selection start.  This basically implements the
   // https://html.spec.whatwg.org/multipage/forms.html#dom-textarea/input-selectionstart
diff -Nru firefox-84.0.2+build1/dom/html/TextTrackManager.cpp firefox-85.0+build1/dom/html/TextTrackManager.cpp
--- firefox-84.0.2+build1/dom/html/TextTrackManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/TextTrackManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/dom/HTMLTrackElement.h"
diff -Nru firefox-84.0.2+build1/dom/html/TextTrackManager.h firefox-85.0+build1/dom/html/TextTrackManager.h
--- firefox-84.0.2+build1/dom/html/TextTrackManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/TextTrackManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/TextTrackCueList.h"
 #include "mozilla/StaticPtr.h"
 #include "nsContentUtils.h"
+#include "nsIDOMEventListener.h"
 #include "TimeUnits.h"
 
 class nsIWebVTTParserWrapper;
diff -Nru firefox-84.0.2+build1/dom/html/TimeRanges.h firefox-85.0+build1/dom/html/TimeRanges.h
--- firefox-84.0.2+build1/dom/html/TimeRanges.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/html/TimeRanges.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,10 +11,10 @@
 #include "nsISupports.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "TimeUnits.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class TimeRanges;
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ActorsChild.cpp firefox-85.0+build1/dom/indexedDB/ActorsChild.cpp
--- firefox-84.0.2+build1/dom/indexedDB/ActorsChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ActorsChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include <type_traits>
 
 #include "BackgroundChildImpl.h"
+#include "GeckoProfiler.h"
 #include "IDBDatabase.h"
 #include "IDBEvents.h"
 #include "IDBFactory.h"
@@ -29,6 +30,7 @@
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
@@ -572,8 +574,8 @@
     const NotNull<RefPtr<IDBRequest>>& aRequest,
     const SafeRefPtr<IDBTransaction>& aTransaction, T& aPtr,
     RefPtr<Event> aEvent) {
-  const auto autoTransaction = AutoSetCurrentTransaction{
-      aTransaction ? SomeRef(*aTransaction) : Nothing()};
+  const auto autoTransaction =
+      AutoSetCurrentTransaction{aTransaction.maybeDeref()};
 
   AUTO_PROFILER_LABEL("IndexedDB:SetResultAndDispatchSuccessEvent", DOM);
 
@@ -1062,9 +1064,9 @@
  * Actor class declarations
  ******************************************************************************/
 
-// CancelableRunnable is used to make workers happy.
+// DiscardableRunnable is used to make workers happy.
 class BackgroundRequestChild::PreprocessHelper final
-    : public CancelableRunnable,
+    : public DiscardableRunnable,
       public nsIInputStreamCallback,
       public nsIFileMetadataCallback {
   enum class State {
@@ -1095,7 +1097,7 @@
 
  public:
   PreprocessHelper(uint32_t aCloneDataIndex, BackgroundRequestChild* aActor)
-      : CancelableRunnable(
+      : DiscardableRunnable(
             "indexedDB::BackgroundRequestChild::PreprocessHelper"),
         mOwningEventTarget(aActor->GetActorEventTarget()),
         mActor(aActor),
@@ -2819,7 +2821,7 @@
 }
 
 NS_IMPL_ISUPPORTS_INHERITED(BackgroundRequestChild::PreprocessHelper,
-                            CancelableRunnable, nsIInputStreamCallback,
+                            DiscardableRunnable, nsIInputStreamCallback,
                             nsIFileMetadataCallback)
 
 NS_IMETHODIMP
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ActorsParentCommon.cpp firefox-85.0+build1/dom/indexedDB/ActorsParentCommon.cpp
--- firefox-84.0.2+build1/dom/indexedDB/ActorsParentCommon.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ActorsParentCommon.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -415,20 +415,20 @@
     const nsCOMPtr<nsIFile> nativeFile = file.FileInfo().GetFileForFileInfo();
     IDB_TRY(OkIf(nativeFile), Err(NS_ERROR_FAILURE));
 
-    // XXX NS_NewLocalFileInputStream does not follow the convention to place
-    // its output parameter last (it has optional parameters which makes that
-    // problematic), so we can't use ToResultInvoke, nor
-    // IDB_TRY_UNWRAP/IDB_TRY_INSPECT.
-    nsCOMPtr<nsIInputStream> fileInputStream;
-    IDB_TRY(NS_NewLocalFileInputStream(getter_AddRefs(fileInputStream),
-                                       nativeFile));
+    IDB_TRY_INSPECT(
+        const auto& fileInputStream,
+        NS_NewLocalFileInputStream(nativeFile)
+            .andThen([aMaybeKey](auto fileInputStream)
+                         -> Result<nsCOMPtr<nsIInputStream>, nsresult> {
+              if (aMaybeKey) {
+                return nsCOMPtr<nsIInputStream>{MakeRefPtr<
+                    quota::DecryptingInputStream<IndexedDBCipherStrategy>>(
+                    WrapNotNull(std::move(fileInputStream)),
+                    kEncryptedStreamBlockSize, *aMaybeKey)};
+              }
 
-    if (aMaybeKey) {
-      fileInputStream =
-          MakeRefPtr<quota::DecryptingInputStream<IndexedDBCipherStrategy>>(
-              WrapNotNull(std::move(fileInputStream)),
-              kEncryptedStreamBlockSize, *aMaybeKey);
-    }
+              return fileInputStream;
+            }));
 
     IDB_TRY(SnappyUncompressStructuredCloneData(*fileInputStream, data));
   }
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ActorsParent.cpp firefox-85.0+build1/dom/indexedDB/ActorsParent.cpp
--- firefox-84.0.2+build1/dom/indexedDB/ActorsParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ActorsParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -84,6 +84,7 @@
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/Scoped.h"
 #include "mozilla/SnappyCompressOutputStream.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TaskCategory.h"
 #include "mozilla/TimeStamp.h"
@@ -380,20 +381,6 @@
 
 const uint32_t kDeleteTimeoutMs = 1000;
 
-/**
- * Automatically crash the browser if IndexedDB shutdown takes this long.  We've
- * chosen a value that is longer than the value for QuotaManager shutdown timer
- * which is currently set to 30 seconds.  We've also chosen a value that is long
- * long enough that it is unlikely for the problem to be falsely triggered by
- * slow system I/O.  We've also chosen a value long enough so that automated
- * tests should time out and fail if IndexedDB shutdown hangs.  Also, this value
- * is long enough so that testers can notice the IndexedDB shutdown hang; we
- * want to know about the hangs, not hide them.  On the other hand this value is
- * less than 60 seconds which is used by nsTerminator to crash a hung main
- * process.
- */
-#define SHUTDOWN_TIMEOUT_MS 50000
-
 #ifdef DEBUG
 
 const int32_t kDEBUGThreadPriority = nsISupportsPriority::PRIORITY_NORMAL;
@@ -500,7 +487,7 @@
                 (aName && *aName == value->mCommonMetadata.name()));
       });
 
-  return it != aEnumerable.cend() ? SomeRef(*it->GetData()) : Nothing();
+  return ToMaybeRef(it != aEnumerable.cend() ? it->GetData().get() : nullptr);
 }
 
 /*******************************************************************************
@@ -698,20 +685,6 @@
   return NS_OK;
 }
 
-Result<nsCOMPtr<mozIStorageStatement>, nsresult>
-CreateAndExecuteSingleStepStatement(mozIStorageConnection& aConnection,
-                                    const nsACString& aStatementString) {
-  IDB_TRY_UNWRAP(auto stmt, MOZ_TO_RESULT_INVOKE_TYPED(
-                                nsCOMPtr<mozIStorageStatement>, aConnection,
-                                CreateStatement, aStatementString));
-
-  IDB_TRY_UNWRAP(const DebugOnly<bool> hasResult,
-                 MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep));
-  MOZ_ASSERT(hasResult);
-
-  return stmt;
-}
-
 template <typename StepFunc>
 Result<Ok, nsresult> CollectWhileHasResult(mozIStorageStatement& aStmt,
                                            StepFunc&& aStepFunc) {
@@ -734,7 +707,7 @@
 
   IDB_TRY_INSPECT(
       const auto& journalMode,
-      MOZ_TO_RESULT_INVOKE_TYPED(nsCString, stmt, GetUTF8String, 0));
+      MOZ_TO_RESULT_INVOKE_TYPED(nsCString, *stmt, GetUTF8String, 0));
 
   if (journalMode.Equals(journalModeWAL)) {
     // WAL mode successfully enabled. Maybe set limits on its size here.
@@ -1009,13 +982,13 @@
 #ifdef DEBUG
     if (!newDatabase) {
       // Re-enable foreign key support after doing a foreign key check.
-      nsCOMPtr<mozIStorageStatement> checkStmt;
-      MOZ_ALWAYS_SUCCEEDS(connection->CreateStatement(
-          "PRAGMA foreign_key_check;"_ns, getter_AddRefs(checkStmt)));
+      IDB_TRY_INSPECT(const bool& foreignKeyError,
+                      CreateAndExecuteSingleStepStatement<
+                          SingleStepResult::ReturnNullIfNoResult>(
+                          *connection, "PRAGMA foreign_key_check;"_ns),
+                      QM_ASSERT_UNREACHABLE);
 
-      bool hasResult;
-      MOZ_ALWAYS_SUCCEEDS(checkStmt->ExecuteStep(&hasResult));
-      MOZ_ASSERT(!hasResult, "Database has inconsisistent foreign keys!");
+      MOZ_ASSERT(!foreignKeyError, "Database has inconsisistent foreign keys!");
 
       MOZ_ALWAYS_SUCCEEDS(
           connection->ExecuteSimpleSQL("PRAGMA foreign_keys = OFF;"_ns));
@@ -1028,7 +1001,7 @@
                           *connection, "PRAGMA page_size;"_ns));
 
       IDB_TRY_INSPECT(const int32_t& pageSize,
-                      MOZ_TO_RESULT_INVOKE(stmt, GetInt32, 0));
+                      MOZ_TO_RESULT_INVOKE(*stmt, GetInt32, 0));
       MOZ_ASSERT(pageSize >= 512 && pageSize <= 65536);
 
       if (kSQLitePageSizeOverride != uint32_t(pageSize)) {
@@ -1042,7 +1015,7 @@
 
         IDB_TRY_INSPECT(
             const auto& journalMode,
-            MOZ_TO_RESULT_INVOKE_TYPED(nsCString, stmt, GetUTF8String, 0));
+            MOZ_TO_RESULT_INVOKE_TYPED(nsCString, *stmt, GetUTF8String, 0));
 
         if (journalMode.EqualsLiteral("delete")) {
           // Successfully set to rollback journal mode so changing the page size
@@ -1207,6 +1180,8 @@
 #endif
   };
 
+  class LazyStatement;
+
  private:
   InitializedOnce<const NotNull<nsCOMPtr<mozIStorageConnection>>>
       mStorageConnection;
@@ -1257,10 +1232,15 @@
 
   template <typename BindFunctor>
   nsresult ExecuteCachedStatement(const nsACString& aQuery,
-                                  const BindFunctor& aBindFunctor);
+                                  BindFunctor&& aBindFunctor);
 
   nsresult ExecuteCachedStatement(const nsACString& aQuery);
 
+  template <typename BindFunctor>
+  Result<Maybe<BorrowedStatement>, nsresult>
+  BorrowAndExecuteSingleStepStatement(const nsACString& aQuery,
+                                      BindFunctor&& aBindFunctor);
+
   nsresult BeginWriteTransaction();
 
   nsresult CommitWriteTransaction();
@@ -1395,6 +1375,44 @@
   CachedStatement& operator=(const CachedStatement&) = delete;
 };
 
+class DatabaseConnection::LazyStatement final {
+ public:
+  LazyStatement(DatabaseConnection& aConnection, const nsACString& aQueryString)
+      : mConnection{aConnection}, mQueryString{aQueryString} {}
+
+  Result<DatabaseConnection::BorrowedStatement, nsresult> Borrow() {
+    if (!mCachedStatement) {
+      IDB_TRY(Initialize());
+    }
+
+    return mCachedStatement.Borrow();
+  }
+
+  template <typename BindFunctor>
+  Result<Maybe<DatabaseConnection::BorrowedStatement>, nsresult>
+  BorrowAndExecuteSingleStep(BindFunctor&& aBindFunctor) {
+    IDB_TRY_UNWRAP(auto borrowedStatement, Borrow());
+
+    IDB_TRY(std::forward<BindFunctor>(aBindFunctor)(*borrowedStatement));
+
+    IDB_TRY_INSPECT(const bool& hasResult,
+                    MOZ_TO_RESULT_INVOKE(&*borrowedStatement, ExecuteStep));
+
+    return hasResult ? Some(std::move(borrowedStatement)) : Nothing{};
+  }
+
+ private:
+  Result<Ok, nsresult> Initialize() {
+    IDB_TRY_UNWRAP(mCachedStatement,
+                   mConnection.GetCachedStatement(mQueryString));
+    return Ok{};
+  }
+
+  DatabaseConnection& mConnection;
+  const nsCString mQueryString;
+  DatabaseConnection::CachedStatement mCachedStatement;
+};
+
 class DatabaseConnection::UpdateRefcountFunction final
     : public mozIStorageFunction {
   class FileInfoEntry;
@@ -2418,6 +2436,12 @@
 
   const nsCString& Id() const { return mId; }
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
+    AssertIsOnBackgroundThread();
+
+    return ToMaybeRef(mDirectoryLock.get());
+  }
+
   int64_t DirectoryLockId() const { return mDirectoryLockId; }
 
   uint32_t TelemetryId() const { return mTelemetryId; }
@@ -4538,9 +4562,9 @@
 
     const nsCString& GetContinueQuery(const bool hasContinueKey,
                                       const bool hasContinuePrimaryKey) const {
-      return hasContinuePrimaryKey
-                 ? mContinuePrimaryKeyQuery
-                 : hasContinueKey ? mContinueToQuery : mContinueQuery;
+      return hasContinuePrimaryKey ? mContinuePrimaryKeyQuery
+             : hasContinueKey      ? mContinueToQuery
+                                   : mContinueQuery;
     }
   };
 };
@@ -4968,14 +4992,12 @@
   friend class mozilla::DefaultDelete<DatabaseActorInfo>;
 
   SafeRefPtr<FullDatabaseMetadata> mMetadata;
-  nsTArray<CheckedUnsafePtr<Database>> mLiveDatabases;
+  nsTArray<NotNull<CheckedUnsafePtr<Database>>> mLiveDatabases;
   RefPtr<FactoryOp> mWaitingFactoryOp;
 
   DatabaseActorInfo(SafeRefPtr<FullDatabaseMetadata> aMetadata,
-                    Database* aDatabase)
+                    NotNull<Database*> aDatabase)
       : mMetadata(std::move(aMetadata)) {
-    MOZ_ASSERT(aDatabase);
-
     MOZ_COUNT_CTOR(DatabaseActorInfo);
 
     mLiveDatabases.AppendElement(aDatabase);
@@ -5101,6 +5123,10 @@
     MOZ_ASSERT(mCurrentMaintenance == aMaintenance);
 
     mCurrentMaintenance = nullptr;
+
+    QuotaClient::GetInstance()->MaybeRecordShutdownStep(
+        "Maintenance finished"_ns);
+
     ProcessMaintenanceQueue();
   }
 
@@ -5132,20 +5158,25 @@
 
   void ReleaseIOThreadObjects() override;
 
-  void AbortOperations(const nsACString& aOrigin) override;
+  void AbortOperationsForLocks(
+      const DirectoryLockIdTable& aDirectoryLockIds) override;
 
   void AbortOperationsForProcess(ContentParentId aContentParentId) override;
 
+  void AbortAllOperations() override;
+
   void StartIdleMaintenance() override;
 
   void StopIdleMaintenance() override;
 
-  void ShutdownWorkThreads() override;
-
  private:
   ~QuotaClient() override;
 
-  void ShutdownTimedOut();
+  void InitiateShutdown() override;
+  bool IsShutdownCompleted() const override;
+  nsCString GetShutdownStatus() const override;
+  void ForceKillActors() override;
+  void FinalizeShutdown() override;
 
   static void DeleteTimerCallback(nsITimer* aTimer, void* aClosure);
 
@@ -5194,9 +5225,6 @@
   // Runs on the PBackground thread. Checks to see if there's a queued
   // Maintenance to run.
   void ProcessMaintenanceQueue();
-
-  template <typename Condition>
-  static void InvalidateLiveDatabasesMatching(const Condition& aCondition);
 };
 
 class DeleteFilesRunnable final : public Runnable,
@@ -6256,6 +6284,36 @@
   }
 }
 
+template <typename Condition>
+void InvalidateLiveDatabasesMatching(const Condition& aCondition) {
+  AssertIsOnBackgroundThread();
+
+  if (!gLiveDatabaseHashtable) {
+    return;
+  }
+
+  // Invalidating a Database will cause it to be removed from the
+  // gLiveDatabaseHashtable entries' mLiveDatabases, and, if it was the last
+  // element in mLiveDatabases, to remove the whole hashtable entry. Therefore,
+  // we need to make a temporary list of the databases to invalidate to avoid
+  // iterator invalidation.
+
+  nsTArray<SafeRefPtr<Database>> databases;
+
+  for (const auto& liveDatabasesEntry : *gLiveDatabaseHashtable) {
+    for (const auto& database : liveDatabasesEntry.GetData()->mLiveDatabases) {
+      if (aCondition(*database)) {
+        databases.AppendElement(
+            SafeRefPtr{database.get(), AcquireStrongRefFromRawPtr{}});
+      }
+    }
+  }
+
+  for (const auto& database : databases) {
+    database->Invalidate();
+  }
+}
+
 uint32_t TelemetryIdForFile(nsIFile* aFile) {
   // May be called on any thread!
 
@@ -6837,6 +6895,10 @@
   return NS_FAILED(rv) ? Err(rv) : ResultType{std::move(updateInfoArray)};
 }
 
+bool IsSome(const Maybe<DatabaseConnection::BorrowedStatement>& aMaybeStmt) {
+  return aMaybeStmt.isSome();
+}
+
 }  // namespace
 
 /*******************************************************************************
@@ -7029,9 +7091,9 @@
 
 template <typename BindFunctor>
 nsresult DatabaseConnection::ExecuteCachedStatement(
-    const nsACString& aQuery, const BindFunctor& aBindFunctor) {
+    const nsACString& aQuery, BindFunctor&& aBindFunctor) {
   IDB_TRY_INSPECT(const auto& stmt, BorrowCachedStatement(aQuery));
-  IDB_TRY(aBindFunctor(*stmt));
+  IDB_TRY(std::forward<BindFunctor>(aBindFunctor)(*stmt));
   IDB_TRY(stmt->Execute());
 
   return NS_OK;
@@ -7041,6 +7103,14 @@
   return ExecuteCachedStatement(aQuery, [](auto&) { return NS_OK; });
 }
 
+template <typename BindFunctor>
+Result<Maybe<DatabaseConnection::BorrowedStatement>, nsresult>
+DatabaseConnection::BorrowAndExecuteSingleStepStatement(
+    const nsACString& aQuery, BindFunctor&& aBindFunctor) {
+  return LazyStatement{*this, aQuery}.BorrowAndExecuteSingleStep(
+      std::forward<BindFunctor>(aBindFunctor));
+}
+
 nsresult DatabaseConnection::BeginWriteTransaction() {
   AssertIsOnConnectionThread();
   MOZ_ASSERT(mStorageConnection);
@@ -7702,24 +7772,27 @@
   AUTO_PROFILER_LABEL("DatabaseConnection::UpdateRefcountFunction::WillCommit",
                       DOM);
 
+  // The parameter names are not used, parameters are bound by index
+  // only locally in the same function.
   auto update =
-      [updateStatement = CachedStatement{}, selectStatement = CachedStatement{},
-       insertStatement = CachedStatement{},
+      [updateStatement = LazyStatement{*mConnection,
+                                       "UPDATE file "
+                                       "SET refcount = refcount + :delta "
+                                       "WHERE id = :id"_ns},
+       selectStatement = LazyStatement{*mConnection,
+                                       "SELECT id "
+                                       "FROM file "
+                                       "WHERE id = :id"_ns},
+       insertStatement =
+           LazyStatement{
+               *mConnection,
+               "INSERT INTO file (id, refcount) VALUES(:id, :delta)"_ns},
        this](int64_t aId, int32_t aDelta) mutable -> Result<Ok, nsresult> {
     AUTO_PROFILER_LABEL(
         "DatabaseConnection::UpdateRefcountFunction::WillCommit::Update", DOM);
-
-    if (!updateStatement) {
-      // The parameter names are not used, parameters are bound by index
-      // only locally in the same function.
-      IDB_TRY_UNWRAP(updateStatement, mConnection->GetCachedStatement(
-                                          "UPDATE file "
-                                          "SET refcount = refcount + :delta "
-                                          "WHERE id = :id"_ns));
-    }
-
     {
-      const auto borrowedUpdateStatement = updateStatement.Borrow();
+      IDB_TRY_INSPECT(const auto& borrowedUpdateStatement,
+                      updateStatement.Borrow());
 
       IDB_TRY(borrowedUpdateStatement->BindInt32ByIndex(0, aDelta));
       IDB_TRY(borrowedUpdateStatement->BindInt64ByIndex(1, aId));
@@ -7732,22 +7805,14 @@
                              GetAffectedRows));
 
     if (rows > 0) {
-      if (!selectStatement) {
-        // The parameter names are not used, parameters are bound by index
-        // only locally in the same function.
-        IDB_TRY_UNWRAP(selectStatement,
-                       mConnection->GetCachedStatement("SELECT id "
-                                                       "FROM file "
-                                                       "WHERE id = :id"_ns));
-      }
-
-      const auto borrowedSelectStatement = selectStatement.Borrow();
-
-      IDB_TRY(borrowedSelectStatement->BindInt64ByIndex(0, aId));
-
-      IDB_TRY_INSPECT(
-          const bool& hasResult,
-          MOZ_TO_RESULT_INVOKE(&*borrowedSelectStatement, ExecuteStep));
+      IDB_TRY_INSPECT(const bool& hasResult,
+                      selectStatement
+                          .BorrowAndExecuteSingleStep(
+                              [aId](auto& stmt) -> Result<Ok, nsresult> {
+                                IDB_TRY(stmt.BindInt64ByIndex(0, aId));
+                                return Ok{};
+                              })
+                          .map(IsSome));
 
       if (!hasResult) {
         // Don't have to create the journal here, we can create all at once,
@@ -7758,16 +7823,8 @@
       return Ok{};
     }
 
-    if (!insertStatement) {
-      // The parameter names are not used, parameters are bound by index
-      // only locally in the same function.
-      IDB_TRY_UNWRAP(
-          insertStatement,
-          mConnection->GetCachedStatement(
-              "INSERT INTO file (id, refcount) VALUES(:id, :delta)"_ns));
-    }
-
-    const auto borrowedInsertStatement = insertStatement.Borrow();
+    IDB_TRY_INSPECT(const auto& borrowedInsertStatement,
+                    insertStatement.Borrow());
 
     IDB_TRY(borrowedInsertStatement->BindInt64ByIndex(0, aId));
     IDB_TRY(borrowedInsertStatement->BindInt32ByIndex(1, aDelta));
@@ -10063,10 +10120,16 @@
   MOZ_ALWAYS_TRUE(gLiveDatabaseHashtable->Get(Id(), &info));
   MOZ_ALWAYS_TRUE(info->mLiveDatabases.RemoveElement(this));
 
+  QuotaClient::GetInstance()->MaybeRecordShutdownStep(
+      "Live database entry removed"_ns);
+
   if (info->mLiveDatabases.IsEmpty()) {
     MOZ_ASSERT(!info->mWaitingFactoryOp ||
                !info->mWaitingFactoryOp->HasBlockedDatabases());
     gLiveDatabaseHashtable->Remove(Id());
+
+    QuotaClient::GetInstance()->MaybeRecordShutdownStep(
+        "gLiveDatabaseHashtable entry removed"_ns);
   }
 
   // Match the IncreaseBusyCount in OpenDatabaseOp::EnsureDatabaseActor().
@@ -12882,71 +12945,74 @@
                   GetDatabaseFilenames(*aDirectory,
                                        /* aCanceled */ AtomicBool{false}));
 
-  for (const nsString& subdirName : subdirsToProcess) {
-    // If the directory has the correct suffix then it should exist in
-    // databaseFilenames.
-    nsDependentSubstring subdirNameBase;
-    if (GetFilenameBase(subdirName, kFileManagerDirectoryNameSuffix,
-                        subdirNameBase)) {
-      Unused << NS_WARN_IF(!databaseFilenames.GetEntry(subdirNameBase));
-
-      continue;
-    }
-
-    // The directory didn't have the right suffix but we might need to rename
-    // it. Check to see if we have a database that references this directory.
-    nsString subdirNameWithSuffix;
-    if (databaseFilenames.GetEntry(subdirName)) {
-      subdirNameWithSuffix = subdirName + kFileManagerDirectoryNameSuffix;
-    } else {
-      // Windows doesn't allow a directory to end with a dot ('.'), so we have
-      // to check that possibility here too.
-      // We do this on all platforms, because the origin directory may have
-      // been created on Windows and now accessed on different OS.
-      nsString subdirNameWithDot = subdirName + u"."_ns;
-      if (NS_WARN_IF(!databaseFilenames.GetEntry(subdirNameWithDot))) {
-        continue;
-      }
-      subdirNameWithSuffix =
-          subdirNameWithDot + kFileManagerDirectoryNameSuffix;
-    }
-
-    // We do have a database that uses this subdir so we should rename it now.
-    IDB_TRY_INSPECT(const auto& subdir,
-                    CloneFileAndAppend(*aDirectory, subdirName));
-
-    DebugOnly<bool> isDirectory;
-    MOZ_ASSERT(NS_SUCCEEDED(subdir->IsDirectory(&isDirectory)));
-    MOZ_ASSERT(isDirectory);
+  IDB_TRY(CollectEachInRange(
+      subdirsToProcess,
+      [&databaseFilenames = databaseFilenames,
+       aDirectory](const nsString& subdirName) -> Result<Ok, nsresult> {
+        // If the directory has the correct suffix then it should exist in
+        // databaseFilenames.
+        nsDependentSubstring subdirNameBase;
+        if (GetFilenameBase(subdirName, kFileManagerDirectoryNameSuffix,
+                            subdirNameBase)) {
+          IDB_TRY(OkIf(databaseFilenames.GetEntry(subdirNameBase)), Ok{});
+          return Ok{};
+        }
 
-    // Check if the subdir with suffix already exists before renaming.
-    IDB_TRY_INSPECT(const auto& subdirWithSuffix,
-                    CloneFileAndAppend(*aDirectory, subdirNameWithSuffix));
+        // The directory didn't have the right suffix but we might need to
+        // rename it. Check to see if we have a database that references this
+        // directory.
+        IDB_TRY_INSPECT(
+            const auto& subdirNameWithSuffix,
+            ([&databaseFilenames,
+              &subdirName]() -> Result<nsAutoString, NotOk> {
+              if (databaseFilenames.GetEntry(subdirName)) {
+                return nsAutoString{subdirName +
+                                    kFileManagerDirectoryNameSuffix};
+              }
 
-    bool exists;
-    nsresult rv = subdirWithSuffix->Exists(&exists);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+              // Windows doesn't allow a directory to end with a dot ('.'), so
+              // we have to check that possibility here too. We do this on all
+              // platforms, because the origin directory may have been created
+              // on Windows and now accessed on different OS.
+              const nsAutoString subdirNameWithDot = subdirName + u"."_ns;
+              IDB_TRY(OkIf(databaseFilenames.GetEntry(subdirNameWithDot)),
+                      Err(NotOk{}));
+
+              return nsAutoString{subdirNameWithDot +
+                                  kFileManagerDirectoryNameSuffix};
+            }()),
+            Ok{});
+
+        // We do have a database that uses this subdir so we should rename it
+        // now.
+        IDB_TRY_INSPECT(const auto& subdir,
+                        CloneFileAndAppend(*aDirectory, subdirName));
+
+        DebugOnly<bool> isDirectory;
+        MOZ_ASSERT(NS_SUCCEEDED(subdir->IsDirectory(&isDirectory)));
+        MOZ_ASSERT(isDirectory);
+
+        // Check if the subdir with suffix already exists before renaming.
+        IDB_TRY_INSPECT(const auto& subdirWithSuffix,
+                        CloneFileAndAppend(*aDirectory, subdirNameWithSuffix));
+
+        IDB_TRY_INSPECT(const bool& exists,
+                        MOZ_TO_RESULT_INVOKE(subdirWithSuffix, Exists));
+
+        if (exists) {
+          IDB_WARNING("Deleting old %s files directory!",
+                      NS_ConvertUTF16toUTF8(subdirName).get());
 
-    if (exists) {
-      IDB_WARNING("Deleting old %s files directory!",
-                  NS_ConvertUTF16toUTF8(subdirName).get());
+          IDB_TRY(subdir->Remove(/* aRecursive */ true));
 
-      rv = subdir->Remove(/* aRecursive */ true);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+          return Ok{};
+        }
 
-      continue;
-    }
+        // Finally, rename the subdir.
+        IDB_TRY(subdir->RenameTo(nullptr, subdirNameWithSuffix));
 
-    // Finally, rename the subdir.
-    rv = subdir->RenameTo(nullptr, subdirNameWithSuffix);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
+        return Ok{};
+      }));
 
   return NS_OK;
 }
@@ -13180,50 +13246,29 @@
   }
 }
 
-template <typename Condition>
-void QuotaClient::InvalidateLiveDatabasesMatching(const Condition& aCondition) {
+void QuotaClient::AbortOperationsForLocks(
+    const DirectoryLockIdTable& aDirectoryLockIds) {
   AssertIsOnBackgroundThread();
 
-  if (!gLiveDatabaseHashtable) {
-    return;
-  }
-
-  // Invalidating a Database will cause it to be removed from the
-  // gLiveDatabaseHashtable entries' mLiveDatabases, and, if it was the last
-  // element in mLiveDatabases, to remove the whole hashtable entry. Therefore,
-  // we need to make a temporary list of the databases to invalidate to avoid
-  // iterator invalidation.
-
-  nsTArray<SafeRefPtr<Database>> databases;
-
-  for (const auto& liveDatabasesEntry : *gLiveDatabaseHashtable) {
-    for (Database* database : liveDatabasesEntry.GetData()->mLiveDatabases) {
-      if (aCondition(database)) {
-        databases.AppendElement(
-            SafeRefPtr{database, AcquireStrongRefFromRawPtr{}});
-      }
-    }
-  }
-
-  for (const auto& database : databases) {
-    database->Invalidate();
-  }
+  InvalidateLiveDatabasesMatching([&aDirectoryLockIds](const auto& database) {
+    // If the database is registered in gLiveDatabaseHashtable then it must have
+    // a directory lock.
+    return IsLockForObjectContainedInLockTable(database, aDirectoryLockIds);
+  });
 }
 
-void QuotaClient::AbortOperations(const nsACString& aOrigin) {
+void QuotaClient::AbortOperationsForProcess(ContentParentId aContentParentId) {
   AssertIsOnBackgroundThread();
 
-  InvalidateLiveDatabasesMatching([&aOrigin](const auto& database) {
-    return aOrigin.IsVoid() || database->GroupAndOrigin().mOrigin == aOrigin;
+  InvalidateLiveDatabasesMatching([&aContentParentId](const auto& database) {
+    return database.IsOwnedByProcess(aContentParentId);
   });
 }
 
-void QuotaClient::AbortOperationsForProcess(ContentParentId aContentParentId) {
+void QuotaClient::AbortAllOperations() {
   AssertIsOnBackgroundThread();
 
-  InvalidateLiveDatabasesMatching([aContentParentId](const auto& database) {
-    return database->IsOwnedByProcess(aContentParentId);
-  });
+  InvalidateLiveDatabasesMatching([](const auto&) { return true; });
 }
 
 void QuotaClient::StartIdleMaintenance() {
@@ -13249,66 +13294,26 @@
   }
 }
 
-void QuotaClient::ShutdownWorkThreads() {
+void QuotaClient::InitiateShutdown() {
   AssertIsOnBackgroundThread();
 
   mShutdownRequested.Flip();
 
-  AbortOperations(VoidCString());
-
-  nsCOMPtr<nsITimer> timer = NS_NewTimer();
-
-  MOZ_ALWAYS_SUCCEEDS(timer->InitWithNamedFuncCallback(
-      [](nsITimer* aTimer, void* aClosure) {
-        auto quotaClient = static_cast<QuotaClient*>(aClosure);
-
-        quotaClient->ShutdownTimedOut();
-      },
-      this, SHUTDOWN_TIMEOUT_MS, nsITimer::TYPE_ONE_SHOT,
-      "indexeddb::QuotaClient::ShutdownWorkThreads::SpinEventLoopTimer"));
-
-  // This should release any IDB related quota objects or directory locks.
-  MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() {
-    return (!gFactoryOps || gFactoryOps->IsEmpty()) &&
-           (!gLiveDatabaseHashtable || !gLiveDatabaseHashtable->Count()) &&
-           !mCurrentMaintenance;
-  }));
-
-  MOZ_ALWAYS_SUCCEEDS(timer->Cancel());
-
-  // And finally, shutdown all threads.
-  RefPtr<ConnectionPool> connectionPool = gConnectionPool.get();
-  if (connectionPool) {
-    connectionPool->Shutdown();
-
-    gConnectionPool = nullptr;
-  }
-
-  RefPtr<FileHandleThreadPool> fileHandleThreadPool =
-      gFileHandleThreadPool.get();
-  if (fileHandleThreadPool) {
-    fileHandleThreadPool->Shutdown();
-
-    gFileHandleThreadPool = nullptr;
-  }
+  AbortAllOperations();
+}
 
-  if (mMaintenanceThreadPool) {
-    mMaintenanceThreadPool->Shutdown();
-    mMaintenanceThreadPool = nullptr;
-  }
+bool QuotaClient::IsShutdownCompleted() const {
+  return (!gFactoryOps || gFactoryOps->IsEmpty()) &&
+         (!gLiveDatabaseHashtable || !gLiveDatabaseHashtable->Count()) &&
+         !mCurrentMaintenance;
+}
 
-  if (mDeleteTimer) {
-    MOZ_ALWAYS_SUCCEEDS(mDeleteTimer->Cancel());
-    mDeleteTimer = nullptr;
-  }
+void QuotaClient::ForceKillActors() {
+  // Currently we don't implement force killing actors.
 }
 
-void QuotaClient::ShutdownTimedOut() {
+nsCString QuotaClient::GetShutdownStatus() const {
   AssertIsOnBackgroundThread();
-  MOZ_DIAGNOSTIC_ASSERT(
-      (gFactoryOps && !gFactoryOps->IsEmpty()) ||
-      (gLiveDatabaseHashtable && gLiveDatabaseHashtable->Count()) ||
-      mCurrentMaintenance);
 
   nsCString data;
 
@@ -13346,8 +13351,6 @@
       MOZ_ASSERT(entry.GetData());
 
       for (const auto& database : entry.GetData()->mLiveDatabases) {
-        MOZ_ASSERT(database);
-
         nsCString id;
         database->Stringify(id);
 
@@ -13366,10 +13369,34 @@
     data.Append(")\n");
   }
 
-  CrashReporter::AnnotateCrashReport(
-      CrashReporter::Annotation::IndexedDBShutdownTimeout, data);
+  return data;
+}
+
+void QuotaClient::FinalizeShutdown() {
+  RefPtr<ConnectionPool> connectionPool = gConnectionPool.get();
+  if (connectionPool) {
+    connectionPool->Shutdown();
+
+    gConnectionPool = nullptr;
+  }
+
+  RefPtr<FileHandleThreadPool> fileHandleThreadPool =
+      gFileHandleThreadPool.get();
+  if (fileHandleThreadPool) {
+    fileHandleThreadPool->Shutdown();
+
+    gFileHandleThreadPool = nullptr;
+  }
+
+  if (mMaintenanceThreadPool) {
+    mMaintenanceThreadPool->Shutdown();
+    mMaintenanceThreadPool = nullptr;
+  }
 
-  MOZ_CRASH("IndexedDB shutdown timed out");
+  if (mDeleteTimer) {
+    MOZ_ALWAYS_SUCCEEDS(mDeleteTimer->Cancel());
+    mDeleteTimer = nullptr;
+  }
 }
 
 void QuotaClient::DeleteTimerCallback(nsITimer* aTimer, void* aClosure) {
@@ -13935,12 +13962,12 @@
             // (EnsureTemporaryStorageIsInitialized cleans up only
             // non-persistent origins).
 
-            nsCOMPtr<nsIFile> directory;
-            bool created;
-            IDB_TRY(quotaManager->EnsurePersistentOriginIsInitialized(
-                        quotaInfo, getter_AddRefs(directory), &created),
-                    // Not much we can do here...
-                    Ok{});
+            IDB_TRY_UNWRAP(
+                const DebugOnly<bool> created,
+                quotaManager->EnsurePersistentOriginIsInitialized(quotaInfo)
+                    .map([](const auto& res) { return res.second; }),
+                // Not much we can do here...
+                Ok{});
 
             // We found this origin directory by traversing the repository, so
             // EnsurePersistentOriginIsInitialized shouldn't report that a new
@@ -14152,54 +14179,54 @@
 Maintenance::Run() {
   MOZ_ASSERT(mState != State::Complete);
 
-  nsresult rv;
+  const auto handleError = [this](const nsresult rv) {
+    if (mState != State::Finishing) {
+      if (NS_SUCCEEDED(mResultCode)) {
+        mResultCode = rv;
+      }
+
+      // Must set mState before dispatching otherwise we will race with the
+      // owning thread.
+      mState = State::Finishing;
+
+      if (IsOnBackgroundThread()) {
+        Finish();
+      } else {
+        MOZ_ALWAYS_SUCCEEDS(mQuotaClient->BackgroundThread()->Dispatch(
+            this, NS_DISPATCH_NORMAL));
+      }
+    }
+  };
 
   switch (mState) {
     case State::Initial:
-      rv = Start();
+      IDB_TRY(Start(), NS_OK, handleError);
       break;
 
     case State::CreateIndexedDatabaseManager:
-      rv = CreateIndexedDatabaseManager();
+      IDB_TRY(CreateIndexedDatabaseManager(), NS_OK, handleError);
       break;
 
     case State::IndexedDatabaseManagerOpen:
-      rv = OpenDirectory();
+      IDB_TRY(OpenDirectory(), NS_OK, handleError);
       break;
 
     case State::DirectoryWorkOpen:
-      rv = DirectoryWork();
+      IDB_TRY(DirectoryWork(), NS_OK, handleError);
       break;
 
     case State::BeginDatabaseMaintenance:
-      rv = BeginDatabaseMaintenance();
+      IDB_TRY(BeginDatabaseMaintenance(), NS_OK, handleError);
       break;
 
     case State::Finishing:
       Finish();
-      return NS_OK;
+      break;
 
     default:
       MOZ_CRASH("Bad state!");
   }
 
-  if (NS_WARN_IF(NS_FAILED(rv)) && mState != State::Finishing) {
-    if (NS_SUCCEEDED(mResultCode)) {
-      mResultCode = rv;
-    }
-
-    // Must set mState before dispatching otherwise we will race with the owning
-    // thread.
-    mState = State::Finishing;
-
-    if (IsOnBackgroundThread()) {
-      Finish();
-    } else {
-      MOZ_ALWAYS_SUCCEEDS(
-          mQuotaClient->BackgroundThread()->Dispatch(this, NS_DISPATCH_NORMAL));
-    }
-  }
-
   return NS_OK;
 }
 
@@ -14349,7 +14376,7 @@
                         aConnection, "PRAGMA integrity_check(1);"_ns));
 
     IDB_TRY_INSPECT(const auto& result,
-                    MOZ_TO_RESULT_INVOKE_TYPED(nsString, stmt, GetString, 0));
+                    MOZ_TO_RESULT_INVOKE_TYPED(nsString, *stmt, GetString, 0));
 
     IDB_TRY(OkIf(result.EqualsLiteral("ok")), NS_OK,
             [&aOk](const auto) { *aOk = false; });
@@ -14364,7 +14391,7 @@
                           CreateAndExecuteSingleStepStatement(
                               aConnection, "PRAGMA foreign_keys;"_ns));
 
-                      IDB_TRY_RETURN(MOZ_TO_RESULT_INVOKE(stmt, GetInt32, 0));
+                      IDB_TRY_RETURN(MOZ_TO_RESULT_INVOKE(*stmt, GetInt32, 0));
                     }()));
 
     if (!foreignKeysWereEnabled) {
@@ -14372,15 +14399,9 @@
     }
 
     IDB_TRY_INSPECT(const bool& foreignKeyError,
-                    ([&aConnection]() -> Result<bool, nsresult> {
-                      IDB_TRY_INSPECT(
-                          const auto& stmt,
-                          MOZ_TO_RESULT_INVOKE_TYPED(
-                              nsCOMPtr<mozIStorageStatement>, aConnection,
-                              CreateStatement, "PRAGMA foreign_key_check;"_ns));
-
-                      IDB_TRY_RETURN(MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep));
-                    }()));
+                    CreateAndExecuteSingleStepStatement<
+                        SingleStepResult::ReturnNullIfNoResult>(
+                        aConnection, "PRAGMA foreign_key_check;"_ns));
 
     if (!foreignKeysWereEnabled) {
       IDB_TRY(aConnection.ExecuteSimpleSQL("PRAGMA foreign_keys = OFF;"_ns));
@@ -14433,10 +14454,10 @@
                       "FROM database;"_ns));
 
   IDB_TRY_INSPECT(const PRTime& lastVacuumTime,
-                  MOZ_TO_RESULT_INVOKE(stmt, GetInt64, 0));
+                  MOZ_TO_RESULT_INVOKE(*stmt, GetInt64, 0));
 
   IDB_TRY_INSPECT(const int64_t& lastVacuumSize,
-                  MOZ_TO_RESULT_INVOKE(stmt, GetInt64, 1));
+                  MOZ_TO_RESULT_INVOKE(*stmt, GetInt64, 1));
 
   NS_ASSERTION(lastVacuumSize > 0,
                "Thy last vacuum size shall be greater than zero, less than "
@@ -14477,7 +14498,7 @@
             "AND __ts1__.rowid = __ts2__.rowid + 1;"_ns));
 
     IDB_TRY_INSPECT(const int32_t& percentUnordered,
-                    MOZ_TO_RESULT_INVOKE(stmt, GetInt32, 0));
+                    MOZ_TO_RESULT_INVOKE(*stmt, GetInt32, 0));
 
     MOZ_ASSERT(percentUnordered >= 0);
     MOZ_ASSERT(percentUnordered <= 100);
@@ -14505,7 +14526,7 @@
                         aConnection, "PRAGMA freelist_count;"_ns));
 
     IDB_TRY_INSPECT(const int32_t& freelistCount,
-                    MOZ_TO_RESULT_INVOKE(stmt, GetInt32, 0));
+                    MOZ_TO_RESULT_INVOKE(*stmt, GetInt32, 0));
 
     MOZ_ASSERT(freelistCount >= 0);
 
@@ -14526,7 +14547,7 @@
             "SELECT SUM(unused) * 100.0 / SUM(pgsize) FROM __temp_stats__;"_ns));
 
     IDB_TRY_INSPECT(const int32_t& percentUnused,
-                    MOZ_TO_RESULT_INVOKE(stmt, GetInt32, 0));
+                    MOZ_TO_RESULT_INVOKE(*stmt, GetInt32, 0));
 
     MOZ_ASSERT(percentUnused >= 0);
     MOZ_ASSERT(percentUnused <= 100);
@@ -14895,39 +14916,31 @@
     return NS_OK;
   }
 
-  DatabaseConnection::CachedStatement insertUniqueStmt;
-  DatabaseConnection::CachedStatement insertStmt;
+  auto insertUniqueStmt = DatabaseConnection::LazyStatement{
+      *aConnection,
+      "INSERT INTO unique_index_data "
+      "(index_id, value, object_store_id, "
+      "object_data_key, value_locale) "
+      "VALUES (:"_ns +
+          kStmtParamNameIndexId + ", :"_ns + kStmtParamNameValue + ", :"_ns +
+          kStmtParamNameObjectStoreId + ", :"_ns + kStmtParamNameObjectDataKey +
+          ", :"_ns + kStmtParamNameValueLocale + ");"_ns};
+  auto insertStmt = DatabaseConnection::LazyStatement{
+      *aConnection,
+      "INSERT OR IGNORE INTO index_data "
+      "(index_id, value, object_data_key, "
+      "object_store_id, value_locale) "
+      "VALUES (:"_ns +
+          kStmtParamNameIndexId + ", :"_ns + kStmtParamNameValue + ", :"_ns +
+          kStmtParamNameObjectDataKey + ", :"_ns + kStmtParamNameObjectStoreId +
+          ", :"_ns + kStmtParamNameValueLocale + ");"_ns};
 
   for (uint32_t index = 0; index < count; index++) {
     const IndexDataValue& info = aIndexValues[index];
 
-    DatabaseConnection::CachedStatement& stmt =
-        info.mUnique ? insertUniqueStmt : insertStmt;
-
-    if (!stmt) {
-      IDB_TRY_UNWRAP(
-          stmt,
-          aConnection->GetCachedStatement(
-              info.mUnique
-                  ? "INSERT INTO unique_index_data "
-                    "(index_id, value, object_store_id, "
-                    "object_data_key, value_locale) "
-                    "VALUES (:"_ns +
-                        kStmtParamNameIndexId + ", :"_ns + kStmtParamNameValue +
-                        ", :"_ns + kStmtParamNameObjectStoreId + ", :"_ns +
-                        kStmtParamNameObjectDataKey + ", :"_ns +
-                        kStmtParamNameValueLocale + ");"_ns
-                  : "INSERT OR IGNORE INTO index_data "
-                    "(index_id, value, object_data_key, "
-                    "object_store_id, value_locale) "
-                    "VALUES (:"_ns +
-                        kStmtParamNameIndexId + ", :"_ns + kStmtParamNameValue +
-                        ", :"_ns + kStmtParamNameObjectDataKey + ", :"_ns +
-                        kStmtParamNameObjectStoreId + ", :"_ns +
-                        kStmtParamNameValueLocale + ");"_ns));
-    }
+    auto& stmt = info.mUnique ? insertUniqueStmt : insertStmt;
 
-    const auto borrowedStmt = stmt.Borrow();
+    IDB_TRY_INSPECT(const auto& borrowedStmt, stmt.Borrow());
 
     IDB_TRY(
         borrowedStmt->BindInt64ByName(kStmtParamNameIndexId, info.mIndexId));
@@ -14983,30 +14996,22 @@
     return NS_OK;
   }
 
-  DatabaseConnection::CachedStatement deleteUniqueStmt;
-  DatabaseConnection::CachedStatement deleteStmt;
+  auto deleteUniqueStmt = DatabaseConnection::LazyStatement{
+      *aConnection, "DELETE FROM unique_index_data WHERE index_id = :"_ns +
+                        kStmtParamNameIndexId + " AND value = :"_ns +
+                        kStmtParamNameValue + ";"_ns};
+  auto deleteStmt = DatabaseConnection::LazyStatement{
+      *aConnection, "DELETE FROM index_data WHERE index_id = :"_ns +
+                        kStmtParamNameIndexId + " AND value = :"_ns +
+                        kStmtParamNameValue + " AND object_data_key = :"_ns +
+                        kStmtParamNameObjectDataKey + ";"_ns};
 
   for (uint32_t index = 0; index < count; index++) {
     const IndexDataValue& indexValue = aIndexValues[index];
 
-    DatabaseConnection::CachedStatement& stmt =
-        indexValue.mUnique ? deleteUniqueStmt : deleteStmt;
-
-    if (!stmt) {
-      IDB_TRY_UNWRAP(
-          stmt,
-          aConnection->GetCachedStatement(
-              indexValue.mUnique
-                  ? "DELETE FROM unique_index_data WHERE index_id = :"_ns +
-                        kStmtParamNameIndexId + " AND value = :"_ns +
-                        kStmtParamNameValue + ";"_ns
-                  : "DELETE FROM index_data WHERE index_id = :"_ns +
-                        kStmtParamNameIndexId + " AND value = :"_ns +
-                        kStmtParamNameValue + " AND object_data_key = :"_ns +
-                        kStmtParamNameObjectDataKey + ";"_ns));
-    }
+    auto& stmt = indexValue.mUnique ? deleteUniqueStmt : deleteStmt;
 
-    const auto borrowedStmt = stmt.Borrow();
+    IDB_TRY_INSPECT(const auto& borrowedStmt, stmt.Borrow());
 
     IDB_TRY(borrowedStmt->BindInt64ByName(kStmtParamNameIndexId,
                                           indexValue.mIndexId));
@@ -15096,8 +15101,13 @@
       *selectStmt,
       [singleRowOnly, aObjectStoreId, &objectStoreKey, &aConnection,
        &resultCountDEBUG, indexValues = IndexDataValuesAutoArray{},
-       deleteStmt = DatabaseConnection::CachedStatement{}](
-          auto& selectStmt) mutable -> Result<Ok, nsresult> {
+       deleteStmt = DatabaseConnection::LazyStatement{
+           *aConnection,
+           "DELETE FROM object_data "
+           "WHERE object_store_id = :"_ns +
+               kStmtParamNameObjectStoreId + " AND key = :"_ns +
+               kStmtParamNameKey +
+               ";"_ns}](auto& selectStmt) mutable -> Result<Ok, nsresult> {
         if (!singleRowOnly) {
           IDB_TRY(objectStoreKey.SetFromStatement(&selectStmt, 1));
 
@@ -15108,16 +15118,7 @@
         IDB_TRY(
             DeleteIndexDataTableRows(aConnection, objectStoreKey, indexValues));
 
-        if (!deleteStmt) {
-          IDB_TRY_UNWRAP(deleteStmt,
-                         aConnection->GetCachedStatement(
-                             "DELETE FROM object_data "
-                             "WHERE object_store_id = :"_ns +
-                             kStmtParamNameObjectStoreId + " AND key = :"_ns +
-                             kStmtParamNameKey + ";"_ns));
-        }
-
-        const auto borrowedDeleteStmt = deleteStmt.Borrow();
+        IDB_TRY_INSPECT(const auto& borrowedDeleteStmt, deleteStmt.Borrow());
 
         IDB_TRY(borrowedDeleteStmt->BindInt64ByName(kStmtParamNameObjectStoreId,
                                                     aObjectStoreId));
@@ -15184,16 +15185,18 @@
   aConnection.AssertIsOnConnectionThread();
   MOZ_ASSERT(aObjectStoreId);
 
-  IDB_TRY_INSPECT(const auto& stmt,
-                  aConnection.BorrowCachedStatement(
-                      "SELECT id "
-                      "FROM object_store_index "
-                      "WHERE object_store_id = :"_ns +
-                      kStmtParamNameObjectStoreId + kOpenLimit + "1;"_ns));
-
-  IDB_TRY(stmt->BindInt64ByName(kStmtParamNameObjectStoreId, aObjectStoreId));
-
-  IDB_TRY_RETURN(MOZ_TO_RESULT_INVOKE(&*stmt, ExecuteStep));
+  IDB_TRY_RETURN(aConnection
+                     .BorrowAndExecuteSingleStepStatement(
+                         "SELECT id "
+                         "FROM object_store_index "
+                         "WHERE object_store_id = :"_ns +
+                             kStmtParamNameObjectStoreId + kOpenLimit + "1;"_ns,
+                         [aObjectStoreId](auto& stmt) -> Result<Ok, nsresult> {
+                           IDB_TRY(stmt.BindInt64ByName(
+                               kStmtParamNameObjectStoreId, aObjectStoreId));
+                           return Ok{};
+                         })
+                     .map(IsSome));
 }
 
 NS_IMPL_ISUPPORTS_INHERITED(DatabaseOperationBase, Runnable,
@@ -15812,6 +15815,13 @@
   MOZ_ASSERT(gFactoryOps);
   gFactoryOps->RemoveElement(this);
 
+  if (auto* const quotaClient = QuotaClient::GetInstance()) {
+    quotaClient->MaybeRecordShutdownStep(
+        "An element was removed from gFactoryOps"_ns);
+  } else {
+    NS_WARNING("Cannot record shutdown step because QuotaClient is nullptr");
+  }
+
   // Match the IncreaseBusyCount in AllocPBackgroundIDBFactoryRequestParent().
   DecreaseBusyCount();
 }
@@ -15971,8 +15981,7 @@
       if ((!aOpeningDatabase || database.get() != &aOpeningDatabase.ref()) &&
           !database->IsClosed() &&
           NS_WARN_IF(!maybeBlockedDatabases.AppendElement(
-              SafeRefPtr{static_cast<Database*>(database),
-                         AcquireStrongRefFromRawPtr{}},
+              SafeRefPtr{database.get(), AcquireStrongRefFromRawPtr{}},
               fallible))) {
         return NS_ERROR_OUT_OF_MEMORY;
       }
@@ -16103,68 +16112,68 @@
 // See bug 1356824 for more details.
 NS_IMETHODIMP
 FactoryOp::Run() {
-  nsresult rv;
+  const auto handleError = [this](const nsresult rv) {
+    if (mState != State::SendingResults) {
+      SetFailureCodeIfUnset(rv);
+
+      // Must set mState before dispatching otherwise we will race with the
+      // owning thread.
+      mState = State::SendingResults;
+
+      if (IsOnOwningThread()) {
+        SendResults();
+      } else {
+        MOZ_ALWAYS_SUCCEEDS(
+            mOwningEventTarget->Dispatch(this, NS_DISPATCH_NORMAL));
+      }
+    }
+  };
 
   switch (mState) {
     case State::Initial:
-      rv = Open();
+      IDB_TRY(Open(), NS_OK, handleError);
       break;
 
     case State::PermissionChallenge:
-      rv = ChallengePermission();
+      IDB_TRY(ChallengePermission(), NS_OK, handleError);
       break;
 
     case State::PermissionRetry:
-      rv = RetryCheckPermission();
+      IDB_TRY(RetryCheckPermission(), NS_OK, handleError);
       break;
 
     case State::FinishOpen:
-      rv = FinishOpen();
+      IDB_TRY(FinishOpen(), NS_OK, handleError);
       break;
 
     case State::QuotaManagerPending:
-      rv = QuotaManagerOpen();
+      IDB_TRY(QuotaManagerOpen(), NS_OK, handleError);
       break;
 
     case State::DatabaseOpenPending:
-      rv = DatabaseOpen();
+      IDB_TRY(DatabaseOpen(), NS_OK, handleError);
       break;
 
     case State::DatabaseWorkOpen:
-      rv = DoDatabaseWork();
+      IDB_TRY(DoDatabaseWork(), NS_OK, handleError);
       break;
 
     case State::BeginVersionChange:
-      rv = BeginVersionChange();
+      IDB_TRY(BeginVersionChange(), NS_OK, handleError);
       break;
 
     case State::WaitingForTransactionsToComplete:
-      rv = DispatchToWorkThread();
+      IDB_TRY(DispatchToWorkThread(), NS_OK, handleError);
       break;
 
     case State::SendingResults:
       SendResults();
-      return NS_OK;
+      break;
 
     default:
       MOZ_CRASH("Bad state!");
   }
 
-  if (NS_WARN_IF(NS_FAILED(rv)) && mState != State::SendingResults) {
-    SetFailureCodeIfUnset(rv);
-
-    // Must set mState before dispatching otherwise we will race with the owning
-    // thread.
-    mState = State::SendingResults;
-
-    if (IsOnOwningThread()) {
-      SendResults();
-    } else {
-      MOZ_ALWAYS_SUCCEEDS(
-          mOwningEventTarget->Dispatch(this, NS_DISPATCH_NORMAL));
-    }
-  }
-
   return NS_OK;
 }
 
@@ -16298,9 +16307,22 @@
   QuotaManager* const quotaManager = QuotaManager::Get();
   MOZ_ASSERT(quotaManager);
 
-  IDB_TRY_INSPECT(const auto& dbDirectory,
-                  quotaManager->EnsureStorageAndOriginIsInitialized(
-                      persistenceType, mQuotaInfo, Client::IDB));
+  IDB_TRY(quotaManager->EnsureStorageIsInitialized());
+
+  IDB_TRY_INSPECT(
+      const auto& dbDirectory,
+      ([persistenceType, &quotaManager, this]()
+           -> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
+        if (persistenceType == PERSISTENCE_TYPE_PERSISTENT) {
+          IDB_TRY_RETURN(
+              quotaManager->EnsurePersistentOriginIsInitialized(mQuotaInfo));
+        }
+
+        IDB_TRY(quotaManager->EnsureTemporaryStorageIsInitialized());
+        IDB_TRY_RETURN(quotaManager->EnsureTemporaryOriginIsInitialized(
+            persistenceType, mQuotaInfo));
+      }()
+                  .map([](const auto& res) { return res.first; })));
 
   IDB_TRY(
       dbDirectory->Append(NS_LITERAL_STRING_FROM_CSTRING(IDB_DIRECTORY_NAME)));
@@ -16450,14 +16472,11 @@
     // Load version information.
     IDB_TRY_INSPECT(
         const auto& stmt,
-        MOZ_TO_RESULT_INVOKE_TYPED(
-            nsCOMPtr<mozIStorageStatement>, aConnection, CreateStatement,
-            "SELECT name, origin, version FROM database"_ns));
+        CreateAndExecuteSingleStepStatement<
+            SingleStepResult::ReturnNullIfNoResult>(
+            aConnection, "SELECT name, origin, version FROM database"_ns));
 
-    IDB_TRY_INSPECT(const bool& hasResult,
-                    MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep));
-
-    IDB_TRY(OkIf(hasResult), NS_ERROR_FILE_CORRUPTED);
+    IDB_TRY(OkIf(stmt), NS_ERROR_FILE_CORRUPTED);
 
     IDB_TRY_INSPECT(const auto& databaseName,
                     MOZ_TO_RESULT_INVOKE_TYPED(nsString, stmt, GetString, 0));
@@ -17093,10 +17112,12 @@
       mInPrivateBrowsing, maybeKey);
 
   if (info) {
-    info->mLiveDatabases.AppendElement(mDatabase.unsafeGetRawPtr());
+    info->mLiveDatabases.AppendElement(
+        WrapNotNullUnchecked(mDatabase.unsafeGetRawPtr()));
   } else {
-    info = new DatabaseActorInfo(mMetadata.clonePtr(),
-                                 mDatabase.unsafeGetRawPtr());
+    info = new DatabaseActorInfo(
+        mMetadata.clonePtr(),
+        WrapNotNullUnchecked(mDatabase.unsafeGetRawPtr()));
     gLiveDatabaseHashtable->Put(mDatabaseId, info);
   }
 
@@ -17292,9 +17313,10 @@
   // locally in the same function.
   IDB_TRY(aConnection->ExecuteCachedStatement(
       "UPDATE database SET version = :version;"_ns,
-      ([this](
+      ([&self = *this](
            mozIStorageStatement& updateStmt) -> mozilla::Result<Ok, nsresult> {
-        IDB_TRY(updateStmt.BindInt64ByIndex(0, int64_t(mRequestedVersion)));
+        IDB_TRY(
+            updateStmt.BindInt64ByIndex(0, int64_t(self.mRequestedVersion)));
 
         return Ok{};
       })));
@@ -17391,18 +17413,13 @@
 
 #ifdef DEBUG
   {
-    nsCOMPtr<mozIStorageStatement> stmt;
-    rv = connection->CreateStatement("SELECT name FROM database"_ns,
-                                     getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return;
-    }
+    IDB_TRY_INSPECT(const auto& stmt,
+                    CreateAndExecuteSingleStepStatement<
+                        SingleStepResult::ReturnNullIfNoResult>(
+                        *connection, "SELECT name FROM database"_ns),
+                    QM_VOID);
 
-    IDB_TRY_INSPECT(const bool& hasResult,
-                    MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep), QM_VOID);
-    if (NS_WARN_IF(!hasResult)) {
-      return;
-    }
+    IDB_TRY(OkIf(stmt), QM_VOID);
 
     nsString databaseName;
     rv = stmt->GetString(0, databaseName);
@@ -17414,19 +17431,13 @@
   }
 #endif
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  rv = connection->CreateStatement("SELECT version FROM database"_ns,
-                                   getter_AddRefs(stmt));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return;
-  }
-
-  IDB_TRY_INSPECT(const bool& hasResult,
-                  MOZ_TO_RESULT_INVOKE(stmt, ExecuteStep), QM_VOID);
+  IDB_TRY_INSPECT(const auto& stmt,
+                  CreateAndExecuteSingleStepStatement<
+                      SingleStepResult::ReturnNullIfNoResult>(
+                      *connection, "SELECT version FROM database"_ns),
+                  QM_VOID);
 
-  if (NS_WARN_IF(!hasResult)) {
-    return;
-  }
+  IDB_TRY(OkIf(stmt), QM_VOID);
 
   int64_t version;
   rv = stmt->GetInt64(0, &version);
@@ -17696,7 +17707,7 @@
                        info->mLiveDatabases.cend(),
                        MakeBackInserter(liveDatabases),
                        [](const auto& aDatabase) -> SafeRefPtr<Database> {
-                         return {aDatabase, AcquireStrongRefFromRawPtr{}};
+                         return {aDatabase.get(), AcquireStrongRefFromRawPtr{}};
                        });
 
 #ifdef DEBUG
@@ -18057,24 +18068,20 @@
         mTransaction->GetDatabase().GetConnection();
     MOZ_ASSERT(connection);
 
-    DatabaseConnection::CachedStatement stmt;
+    // The parameter names are not used, parameters are bound by index only
+    // locally in the same function.
+    auto stmt = DatabaseConnection::LazyStatement(
+        *connection,
+        "UPDATE object_store "
+        "SET auto_increment = :auto_increment WHERE id "
+        "= :object_store_id;"_ns);
     nsresult rv;
 
     for (const auto& metadata : metadataArray) {
       MOZ_ASSERT(!metadata->mDeleted);
       MOZ_ASSERT(metadata->mNextAutoIncrementId > 1);
 
-      if (!stmt) {
-        // The parameter names are not used, parameters are bound by index only
-        // locally in the same function.
-        IDB_TRY_UNWRAP(stmt,
-                       connection->GetCachedStatement(
-                           "UPDATE object_store "
-                           "SET auto_increment = :auto_increment WHERE id "
-                           "= :object_store_id;"_ns));
-      }
-
-      const auto borrowedStmt = stmt.Borrow();
+      IDB_TRY_INSPECT(const auto& borrowedStmt, stmt.Borrow());
 
       rv = borrowedStmt->BindInt64ByIndex(1, metadata->mCommonMetadata.id());
       if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -18132,14 +18139,10 @@
   {
     IDB_TRY_INSPECT(
         const auto& pragmaStmt,
-        aConnection->BorrowCachedStatement("PRAGMA foreign_keys;"_ns),
+        CreateAndExecuteSingleStepStatement(
+            aConnection->MutableStorageConnection(), "PRAGMA foreign_keys;"_ns),
         QM_ASSERT_UNREACHABLE_VOID);
 
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(pragmaStmt->ExecuteStep(&hasResult));
-
-    MOZ_ASSERT(hasResult);
-
     int32_t foreignKeysEnabled;
     MOZ_ALWAYS_SUCCEEDS(pragmaStmt->GetInt32(0, &foreignKeysEnabled));
 
@@ -18148,15 +18151,14 @@
   }
 
   {
-    IDB_TRY_INSPECT(
-        const auto& checkStmt,
-        aConnection->BorrowCachedStatement("PRAGMA foreign_key_check;"_ns),
-        QM_ASSERT_UNREACHABLE_VOID);
-
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(checkStmt->ExecuteStep(&hasResult));
+    IDB_TRY_INSPECT(const bool& foreignKeyError,
+                    CreateAndExecuteSingleStepStatement<
+                        SingleStepResult::ReturnNullIfNoResult>(
+                        aConnection->MutableStorageConnection(),
+                        "PRAGMA foreign_key_check;"_ns),
+                    QM_ASSERT_UNREACHABLE_VOID);
 
-    MOZ_ASSERT(!hasResult, "Database has inconsisistent foreign keys!");
+    MOZ_ASSERT(!foreignKeyError, "Database has inconsisistent foreign keys!");
   }
 }
 
@@ -18318,35 +18320,36 @@
 
 NS_IMETHODIMP
 DatabaseOp::Run() {
-  nsresult rv;
+  const auto handleError = [this](const nsresult rv) {
+    if (mState != State::SendingResults) {
+      SetFailureCodeIfUnset(rv);
+
+      // Must set mState before dispatching otherwise we will race with the
+      // owning thread.
+      mState = State::SendingResults;
+
+      MOZ_ALWAYS_SUCCEEDS(
+          mOwningEventTarget->Dispatch(this, NS_DISPATCH_NORMAL));
+    }
+  };
 
   switch (mState) {
     case State::Initial:
-      rv = SendToIOThread();
+      IDB_TRY(SendToIOThread(), NS_OK, handleError);
       break;
 
     case State::DatabaseWork:
-      rv = DoDatabaseWork();
+      IDB_TRY(DoDatabaseWork(), NS_OK, handleError);
       break;
 
     case State::SendingResults:
       SendResults();
-      return NS_OK;
+      break;
 
     default:
       MOZ_CRASH("Bad state!");
   }
 
-  if (NS_WARN_IF(NS_FAILED(rv)) && mState != State::SendingResults) {
-    SetFailureCodeIfUnset(rv);
-
-    // Must set mState before dispatching otherwise we will race with the owning
-    // thread.
-    mState = State::SendingResults;
-
-    MOZ_ALWAYS_SUCCEEDS(mOwningEventTarget->Dispatch(this, NS_DISPATCH_NORMAL));
-  }
-
   return NS_OK;
 }
 
@@ -18534,16 +18537,19 @@
     // The parameter names are not used, parameters are bound by index only
     // locally in the same function.
     IDB_TRY_INSPECT(
-        const auto& stmt,
-        aConnection->BorrowCachedStatement("SELECT name "
-                                           "FROM object_store "
-                                           "WHERE name = :name;"_ns),
+        const bool& hasResult,
+        aConnection
+            ->BorrowAndExecuteSingleStepStatement(
+                "SELECT name "
+                "FROM object_store "
+                "WHERE name = :name;"_ns,
+                [&self = *this](auto& stmt) -> Result<Ok, nsresult> {
+                  IDB_TRY(stmt.BindStringByIndex(0, self.mMetadata.name()));
+                  return Ok{};
+                })
+            .map(IsSome),
         QM_ASSERT_UNREACHABLE);
 
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindStringByIndex(0, mMetadata.name()));
-
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(stmt->ExecuteStep(&hasResult));
     MOZ_ASSERT(!hasResult);
   }
 #endif
@@ -18561,16 +18567,17 @@
   IDB_TRY(aConnection->ExecuteCachedStatement(
       "INSERT INTO object_store (id, auto_increment, name, key_path) "
       "VALUES (:id, :auto_increment, :name, :key_path);"_ns,
-      [this](mozIStorageStatement& stmt) -> Result<Ok, nsresult> {
-        IDB_TRY(stmt.BindInt64ByIndex(0, mMetadata.id()));
+      [&metadata =
+           mMetadata](mozIStorageStatement& stmt) -> Result<Ok, nsresult> {
+        IDB_TRY(stmt.BindInt64ByIndex(0, metadata.id()));
 
-        IDB_TRY(stmt.BindInt32ByIndex(1, mMetadata.autoIncrement() ? 1 : 0));
+        IDB_TRY(stmt.BindInt32ByIndex(1, metadata.autoIncrement() ? 1 : 0));
 
-        IDB_TRY(stmt.BindStringByIndex(2, mMetadata.name()));
+        IDB_TRY(stmt.BindStringByIndex(2, metadata.name()));
 
-        if (mMetadata.keyPath().IsValid()) {
+        if (metadata.keyPath().IsValid()) {
           IDB_TRY(stmt.BindStringByIndex(
-              3, mMetadata.keyPath().SerializeToString()));
+              3, metadata.keyPath().SerializeToString()));
         } else {
           IDB_TRY(stmt.BindNullByIndex(3));
         }
@@ -18727,19 +18734,22 @@
     // have thrown an error long before now...
     // The parameter names are not used, parameters are bound by index only
     // locally in the same function.
-    IDB_TRY_INSPECT(const auto& stmt,
-                    aConnection->BorrowCachedStatement(
-                        "SELECT name "
-                        "FROM object_store "
-                        "WHERE name = :name AND id != :id;"_ns),
-                    QM_ASSERT_UNREACHABLE);
-
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindStringByIndex(0, mNewName));
+    IDB_TRY_INSPECT(
+        const bool& hasResult,
+        aConnection
+            ->BorrowAndExecuteSingleStepStatement(
+                "SELECT name "
+                "FROM object_store "
+                "WHERE name = :name AND id != :id;"_ns,
+                [&self = *this](auto& stmt) -> Result<Ok, nsresult> {
+                  IDB_TRY(stmt.BindStringByIndex(0, self.mNewName));
 
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindInt64ByIndex(1, mId));
+                  IDB_TRY(stmt.BindInt64ByIndex(1, self.mId));
+                  return Ok{};
+                })
+            .map(IsSome),
+        QM_ASSERT_UNREACHABLE);
 
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(stmt->ExecuteStep(&hasResult));
     MOZ_ASSERT(!hasResult);
   }
 #endif
@@ -18758,10 +18768,10 @@
       "UPDATE object_store "
       "SET name = :name "
       "WHERE id = :id;"_ns,
-      [this](mozIStorageStatement& stmt) -> nsresult {
-        IDB_TRY(stmt.BindStringByIndex(0, mNewName));
+      [&self = *this](mozIStorageStatement& stmt) -> nsresult {
+        IDB_TRY(stmt.BindStringByIndex(0, self.mNewName));
 
-        IDB_TRY(stmt.BindInt64ByIndex(1, mId));
+        IDB_TRY(stmt.BindInt64ByIndex(1, self.mId));
 
         return NS_OK;
       }));
@@ -18833,8 +18843,9 @@
       "SET index_data_values = update_index_data_values "
       "(key, index_data_values, file_ids, data) "
       "WHERE object_store_id = :object_store_id;"_ns,
-      [this](mozIStorageStatement& stmt) -> nsresult {
-        IDB_TRY(stmt.BindInt64ByIndex(0, mObjectStoreId));
+      [objectStoredId =
+           mObjectStoreId](mozIStorageStatement& stmt) -> nsresult {
+        IDB_TRY(stmt.BindInt64ByIndex(0, objectStoredId));
 
         return NS_OK;
       }));
@@ -18892,17 +18903,19 @@
     // The parameter names are not used, parameters are bound by index only
     // locally in the same function.
     IDB_TRY_INSPECT(
-        const auto& stmt,
-        aConnection->BorrowCachedStatement(
-            "SELECT name "
-            "FROM object_store_index "
-            "WHERE object_store_id = :object_store_id AND name = :name;"_ns),
+        const bool& hasResult,
+        aConnection
+            ->BorrowAndExecuteSingleStepStatement(
+                "SELECT name "
+                "FROM object_store_index "
+                "WHERE object_store_id = :object_store_id AND name = :name;"_ns,
+                [&self = *this](auto& stmt) -> Result<Ok, nsresult> {
+                  IDB_TRY(stmt.BindInt64ByIndex(0, self.mObjectStoreId));
+                  IDB_TRY(stmt.BindStringByIndex(1, self.mMetadata.name()));
+                  return Ok{};
+                })
+            .map(IsSome),
         QM_ASSERT_UNREACHABLE);
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindInt64ByIndex(0, mObjectStoreId));
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindStringByIndex(1, mMetadata.name()));
-
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(stmt->ExecuteStep(&hasResult));
 
     MOZ_ASSERT(!hasResult);
   }
@@ -18924,24 +18937,25 @@
       "is_auto_locale) "
       "VALUES (:id, :name, :key_path, :unique, :multientry, "
       ":object_store_id, :locale, :is_auto_locale)"_ns,
-      [this](mozIStorageStatement& stmt) -> nsresult {
-        IDB_TRY(stmt.BindInt64ByIndex(0, mMetadata.id()));
+      [&metadata = mMetadata,
+       objectStoreId = mObjectStoreId](mozIStorageStatement& stmt) -> nsresult {
+        IDB_TRY(stmt.BindInt64ByIndex(0, metadata.id()));
 
-        IDB_TRY(stmt.BindStringByIndex(1, mMetadata.name()));
+        IDB_TRY(stmt.BindStringByIndex(1, metadata.name()));
 
         IDB_TRY(
-            stmt.BindStringByIndex(2, mMetadata.keyPath().SerializeToString()));
+            stmt.BindStringByIndex(2, metadata.keyPath().SerializeToString()));
 
-        IDB_TRY(stmt.BindInt32ByIndex(3, mMetadata.unique() ? 1 : 0));
+        IDB_TRY(stmt.BindInt32ByIndex(3, metadata.unique() ? 1 : 0));
 
-        IDB_TRY(stmt.BindInt32ByIndex(4, mMetadata.multiEntry() ? 1 : 0));
-        IDB_TRY(stmt.BindInt64ByIndex(5, mObjectStoreId));
+        IDB_TRY(stmt.BindInt32ByIndex(4, metadata.multiEntry() ? 1 : 0));
+        IDB_TRY(stmt.BindInt64ByIndex(5, objectStoreId));
 
-        IDB_TRY(mMetadata.locale().IsEmpty()
+        IDB_TRY(metadata.locale().IsEmpty()
                     ? stmt.BindNullByIndex(6)
-                    : stmt.BindUTF8StringByIndex(6, mMetadata.locale()));
+                    : stmt.BindUTF8StringByIndex(6, metadata.locale()));
 
-        IDB_TRY(stmt.BindInt32ByIndex(7, mMetadata.autoLocale()));
+        IDB_TRY(stmt.BindInt32ByIndex(7, metadata.autoLocale()));
 
         return NS_OK;
       }));
@@ -19307,8 +19321,19 @@
   IDB_TRY(CollectWhileHasResult(
       *selectStmt,
       [this, &aConnection, &lastObjectStoreKey, &lastIndexValues,
-       deleteIndexRowStmt = DatabaseConnection::CachedStatement{},
-       nullIndexDataValuesStmt = DatabaseConnection::CachedStatement{}](
+       deleteIndexRowStmt =
+           DatabaseConnection::LazyStatement{
+               *aConnection,
+               mUnique
+                   ? "DELETE FROM unique_index_data "
+                     "WHERE index_id = :"_ns +
+                         kStmtParamNameIndexId + " AND value = :"_ns +
+                         kStmtParamNameValue + ";"_ns
+                   : "DELETE FROM index_data "
+                     "WHERE index_id = :"_ns +
+                         kStmtParamNameIndexId + " AND value = :"_ns +
+                         kStmtParamNameValue + " AND object_data_key = :"_ns +
+                         kStmtParamNameObjectDataKey + ";"_ns}](
           auto& selectStmt) mutable -> Result<Ok, nsresult> {
         // We always need the index key to delete the index row.
         Key indexKey;
@@ -19355,24 +19380,9 @@
         }
 
         // Now delete the index row.
-        if (!deleteIndexRowStmt) {
-          IDB_TRY_UNWRAP(
-              deleteIndexRowStmt,
-              aConnection->GetCachedStatement(
-                  mUnique ? "DELETE FROM unique_index_data "
-                            "WHERE index_id = :"_ns +
-                                kStmtParamNameIndexId + " AND value = :"_ns +
-                                kStmtParamNameValue + ";"_ns
-                          : "DELETE FROM index_data "
-                            "WHERE index_id = :"_ns +
-                                kStmtParamNameIndexId + " AND value = :"_ns +
-                                kStmtParamNameValue +
-                                " AND object_data_key = :"_ns +
-                                kStmtParamNameObjectDataKey + ";"_ns));
-        }
-
         {
-          const auto borrowedDeleteIndexRowStmt = deleteIndexRowStmt.Borrow();
+          IDB_TRY_INSPECT(const auto& borrowedDeleteIndexRowStmt,
+                          deleteIndexRowStmt.Borrow());
 
           IDB_TRY(borrowedDeleteIndexRowStmt->BindInt64ByName(
               kStmtParamNameIndexId, mIndexId));
@@ -19402,8 +19412,8 @@
   IDB_TRY(aConnection->ExecuteCachedStatement(
       "DELETE FROM object_store_index "
       "WHERE id = :index_id;"_ns,
-      [this](mozIStorageStatement& deleteStmt) -> nsresult {
-        IDB_TRY(deleteStmt.BindInt64ByIndex(0, mIndexId));
+      [indexId = mIndexId](mozIStorageStatement& deleteStmt) -> nsresult {
+        IDB_TRY(deleteStmt.BindInt64ByIndex(0, indexId));
 
         return NS_OK;
       }));
@@ -19435,23 +19445,25 @@
     // thrown an error long before now...
     // The parameter names are not used, parameters are bound by index only
     // locally in the same function.
-    IDB_TRY_INSPECT(const auto& stmt,
-                    aConnection->BorrowCachedStatement(
-                        "SELECT name "
-                        "FROM object_store_index "
-                        "WHERE object_store_id = :object_store_id "
-                        "AND name = :name "
-                        "AND id != :id;"_ns),
-                    QM_ASSERT_UNREACHABLE);
-
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindInt64ByIndex(0, mObjectStoreId));
-
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindStringByIndex(1, mNewName));
+    IDB_TRY_INSPECT(
+        const bool& hasResult,
+        aConnection
+            ->BorrowAndExecuteSingleStepStatement(
+                "SELECT name "
+                "FROM object_store_index "
+                "WHERE object_store_id = :object_store_id "
+                "AND name = :name "
+                "AND id != :id;"_ns,
+                [&self = *this](auto& stmt) -> Result<Ok, nsresult> {
+                  IDB_TRY(stmt.BindInt64ByIndex(0, self.mObjectStoreId));
+                  IDB_TRY(stmt.BindStringByIndex(1, self.mNewName));
+                  IDB_TRY(stmt.BindInt64ByIndex(2, self.mIndexId));
 
-    MOZ_ALWAYS_SUCCEEDS(stmt->BindInt64ByIndex(2, mIndexId));
+                  return Ok{};
+                })
+            .map(IsSome),
+        QM_ASSERT_UNREACHABLE);
 
-    bool hasResult;
-    MOZ_ALWAYS_SUCCEEDS(stmt->ExecuteStep(&hasResult));
     MOZ_ASSERT(!hasResult);
   }
 #else
@@ -19472,10 +19484,10 @@
       "UPDATE object_store_index "
       "SET name = :name "
       "WHERE id = :id;"_ns,
-      [this](mozIStorageStatement& stmt) -> nsresult {
-        IDB_TRY(stmt.BindStringByIndex(0, mNewName));
+      [&self = *this](mozIStorageStatement& stmt) -> nsresult {
+        IDB_TRY(stmt.BindStringByIndex(0, self.mNewName));
 
-        IDB_TRY(stmt.BindInt64ByIndex(1, mIndexId));
+        IDB_TRY(stmt.BindInt64ByIndex(1, self.mIndexId));
 
         return NS_OK;
       }));
@@ -19692,25 +19704,26 @@
   }
 #endif
 
-  IDB_TRY_INSPECT(const auto& indexValuesStmt,
-                  aConnection->BorrowCachedStatement(
-                      "SELECT index_data_values "
-                      "FROM object_data "
-                      "WHERE object_store_id = :"_ns +
-                      kStmtParamNameObjectStoreId + " AND key = :"_ns +
-                      kStmtParamNameKey + ";"_ns));
-
-  IDB_TRY(indexValuesStmt->BindInt64ByName(kStmtParamNameObjectStoreId,
-                                           mParams.objectStoreId()));
+  IDB_TRY_INSPECT(
+      const auto& indexValuesStmt,
+      aConnection->BorrowAndExecuteSingleStepStatement(
+          "SELECT index_data_values "
+          "FROM object_data "
+          "WHERE object_store_id = :"_ns +
+              kStmtParamNameObjectStoreId + " AND key = :"_ns +
+              kStmtParamNameKey + ";"_ns,
+          [&self = *this](auto& stmt) -> mozilla::Result<Ok, nsresult> {
+            IDB_TRY(stmt.BindInt64ByName(kStmtParamNameObjectStoreId,
+                                         self.mParams.objectStoreId()));
 
-  IDB_TRY(mResponse.BindToStatement(&*indexValuesStmt, kStmtParamNameKey));
+            IDB_TRY(self.mResponse.BindToStatement(&stmt, kStmtParamNameKey));
 
-  IDB_TRY_INSPECT(const bool& hasResult,
-                  MOZ_TO_RESULT_INVOKE(&*indexValuesStmt, ExecuteStep));
+            return Ok{};
+          }));
 
-  if (hasResult) {
+  if (indexValuesStmt) {
     IDB_TRY_INSPECT(const auto& existingIndexValues,
-                    ReadCompressedIndexDataValues(*indexValuesStmt, 0));
+                    ReadCompressedIndexDataValues(**indexValuesStmt, 0));
 
     IDB_TRY(
         DeleteIndexDataTableRows(aConnection, mResponse, existingIndexValues));
@@ -20453,11 +20466,11 @@
         "DELETE FROM object_data "
         "WHERE object_store_id = :"_ns +
             kStmtParamNameObjectStoreId + keyRangeClause + ";"_ns,
-        [this](mozIStorageStatement& stmt) -> nsresult {
+        [&params = mParams](mozIStorageStatement& stmt) -> nsresult {
           IDB_TRY(stmt.BindInt64ByName(kStmtParamNameObjectStoreId,
-                                       mParams.objectStoreId()));
+                                       params.objectStoreId()));
 
-          IDB_TRY(BindKeyRangeToStatement(mParams.keyRange(), &stmt));
+          IDB_TRY(BindKeyRangeToStatement(params.keyRange(), &stmt));
 
           return NS_OK;
         }));
@@ -20510,9 +20523,9 @@
               : aConnection->ExecuteCachedStatement(
                     "DELETE FROM object_data "
                     "WHERE object_store_id = :object_store_id;"_ns,
-                    [this](mozIStorageStatement& stmt) -> nsresult {
-                      IDB_TRY(
-                          stmt.BindInt64ByIndex(0, mParams.objectStoreId()));
+                    [objectStoreId = mParams.objectStoreId()](
+                        mozIStorageStatement& stmt) -> nsresult {
+                      IDB_TRY(stmt.BindInt64ByIndex(0, objectStoreId));
 
                       return NS_OK;
                     }));
@@ -20532,29 +20545,34 @@
   const auto keyRangeClause = MaybeGetBindingClauseForKeyRange(
       mParams.optionalKeyRange(), kColumnNameKey);
 
-  IDB_TRY_INSPECT(const auto& stmt,
-                  aConnection->BorrowCachedStatement(
-                      "SELECT count(*) "
-                      "FROM object_data "
-                      "WHERE object_store_id = :"_ns +
-                      kStmtParamNameObjectStoreId + keyRangeClause));
+  IDB_TRY_INSPECT(
+      const auto& maybeStmt,
+      aConnection->BorrowAndExecuteSingleStepStatement(
+          "SELECT count(*) "
+          "FROM object_data "
+          "WHERE object_store_id = :"_ns +
+              kStmtParamNameObjectStoreId + keyRangeClause,
+          [&params = mParams](auto& stmt) -> mozilla::Result<Ok, nsresult> {
+            IDB_TRY(stmt.BindInt64ByName(kStmtParamNameObjectStoreId,
+                                         params.objectStoreId()));
+
+            if (params.optionalKeyRange().isSome()) {
+              IDB_TRY(BindKeyRangeToStatement(params.optionalKeyRange().ref(),
+                                              &stmt));
+            }
 
-  IDB_TRY(stmt->BindInt64ByName(kStmtParamNameObjectStoreId,
-                                mParams.objectStoreId()));
+            return Ok{};
+          }));
 
-  if (mParams.optionalKeyRange().isSome()) {
-    IDB_TRY(BindKeyRangeToStatement(mParams.optionalKeyRange().ref(), &*stmt));
-  }
+  IDB_TRY(OkIf(maybeStmt.isSome()), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR,
+          [](const auto) {
+            // XXX Why do we have an assertion here, but not at most other
+            // places using IDB_REPORT_INTERNAL_ERR(_LAMBDA)?
+            MOZ_ASSERT(false, "This should never be possible!");
+            IDB_REPORT_INTERNAL_ERR();
+          });
 
-  IDB_TRY_INSPECT(const bool& hasResult,
-                  MOZ_TO_RESULT_INVOKE(&*stmt, ExecuteStep));
-
-  IDB_TRY(OkIf(hasResult), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR, [](const auto) {
-    // XXX Why do we have an assertion here, but not at most other places using
-    // IDB_REPORT_INTERNAL_ERR(_LAMBDA)?
-    MOZ_ASSERT(false, "This should never be possible!");
-    IDB_REPORT_INTERNAL_ERR();
-  });
+  const auto& stmt = *maybeStmt;
 
   const int64_t count = stmt->AsInt64(0);
   IDB_TRY(OkIf(count >= 0), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR, [](const auto) {
@@ -20853,8 +20871,6 @@
 
   AUTO_PROFILER_LABEL("IndexCountRequestOp::DoDatabaseWork", DOM);
 
-  const bool hasKeyRange = mParams.optionalKeyRange().isSome();
-
   const auto indexTable = mMetadata->mCommonMetadata.unique()
                               ? "unique_index_data "_ns
                               : "index_data "_ns;
@@ -20862,30 +20878,34 @@
   const auto keyRangeClause = MaybeGetBindingClauseForKeyRange(
       mParams.optionalKeyRange(), kColumnNameValue);
 
-  const nsCString query =
-      "SELECT count(*) "
-      "FROM "_ns +
-      indexTable + "WHERE index_id = :"_ns + kStmtParamNameIndexId +
-      keyRangeClause;
-
-  IDB_TRY_INSPECT(const auto& stmt, aConnection->BorrowCachedStatement(query));
-
-  IDB_TRY(stmt->BindInt64ByName(kStmtParamNameIndexId,
-                                mMetadata->mCommonMetadata.id()));
+  IDB_TRY_INSPECT(
+      const auto& maybeStmt,
+      aConnection->BorrowAndExecuteSingleStepStatement(
+          "SELECT count(*) "
+          "FROM "_ns +
+              indexTable + "WHERE index_id = :"_ns + kStmtParamNameIndexId +
+              keyRangeClause,
+          [&self = *this](auto& stmt) -> mozilla::Result<Ok, nsresult> {
+            IDB_TRY(stmt.BindInt64ByName(kStmtParamNameIndexId,
+                                         self.mMetadata->mCommonMetadata.id()));
+
+            if (self.mParams.optionalKeyRange().isSome()) {
+              IDB_TRY(BindKeyRangeToStatement(
+                  self.mParams.optionalKeyRange().ref(), &stmt));
+            }
 
-  if (hasKeyRange) {
-    IDB_TRY(BindKeyRangeToStatement(mParams.optionalKeyRange().ref(), &*stmt));
-  }
+            return Ok{};
+          }));
 
-  IDB_TRY_INSPECT(const bool& hasResult,
-                  MOZ_TO_RESULT_INVOKE(&*stmt, ExecuteStep));
+  IDB_TRY(OkIf(maybeStmt.isSome()), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR,
+          [](const auto) {
+            // XXX Why do we have an assertion here, but not at most other
+            // places using IDB_REPORT_INTERNAL_ERR(_LAMBDA)?
+            MOZ_ASSERT(false, "This should never be possible!");
+            IDB_REPORT_INTERNAL_ERR();
+          });
 
-  IDB_TRY(OkIf(hasResult), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR, [](const auto) {
-    // XXX Why do we have an assertion here, but not at most other places using
-    // IDB_REPORT_INTERNAL_ERR(_LAMBDA)?
-    MOZ_ASSERT(false, "This should never be possible!");
-    IDB_REPORT_INTERNAL_ERR();
-  });
+  const auto& stmt = *maybeStmt;
 
   const int64_t count = stmt->AsInt64(0);
   IDB_TRY(OkIf(count >= 0), NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR, [](const auto) {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/DBSchema.cpp firefox-85.0+build1/dom/indexedDB/DBSchema.cpp
--- firefox-84.0.2+build1/dom/indexedDB/DBSchema.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/DBSchema.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,10 @@
 
 #include "DBSchema.h"
 
+// local includes
+#include "ActorsParentCommon.h"
+#include "IndexedDBCommon.h"
+
 // global includes
 #include "ErrorList.h"
 #include "GeckoProfiler.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBCursor.cpp firefox-85.0+build1/dom/indexedDB/IDBCursor.cpp
--- firefox-84.0.2+build1/dom/indexedDB/IDBCursor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBCursor.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "IDBTransaction.h"
 #include "IndexedDatabaseInlines.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBSharedTypes.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBFactory.cpp firefox-85.0+build1/dom/indexedDB/IDBFactory.cpp
--- firefox-84.0.2+build1/dom/indexedDB/IDBFactory.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBFactory.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/IDBFactoryBinding.h"
 #include "mozilla/dom/quota/QuotaManager.h"
 #include "mozilla/dom/BrowserChild.h"
@@ -32,6 +33,7 @@
 #include "nsIURI.h"
 #include "nsIUUIDGenerator.h"
 #include "nsIWebNavigation.h"
+#include "nsNetUtil.h"
 #include "nsSandboxFlags.h"
 #include "nsServiceManagerUtils.h"
 #include "ProfilerHelpers.h"
@@ -407,7 +409,7 @@
     nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(mGlobal);
     if (window && window->GetExtantDoc()) {
       window->GetExtantDoc()->WarnOnceAbout(
-          Document::eIDBOpenDBOptions_StorageType);
+          DeprecatedOperations::eIDBOpenDBOptions_StorageType);
     } else if (!NS_IsMainThread()) {
       // The method below reports on the main thread too, so we need to make
       // sure we're on a worker. Workers don't have a WarnOnceAbout mechanism,
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBFileHandle.h firefox-85.0+build1/dom/indexedDB/IDBFileHandle.h
--- firefox-84.0.2+build1/dom/indexedDB/IDBFileHandle.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBFileHandle.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/FileModeBinding.h"
+#include "mozilla/dom/TypedArray.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIRunnable.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBFileRequest.h firefox-85.0+build1/dom/indexedDB/IDBFileRequest.h
--- firefox-84.0.2+build1/dom/indexedDB/IDBFileRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBFileRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "DOMRequest.h"
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsString.h"
 
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBKeyRange.cpp firefox-85.0+build1/dom/indexedDB/IDBKeyRange.cpp
--- firefox-84.0.2+build1/dom/indexedDB/IDBKeyRange.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBKeyRange.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "Key.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/IDBKeyRangeBinding.h"
 #include "mozilla/dom/indexedDB/PBackgroundIDBSharedTypes.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBRequest.h firefox-85.0+build1/dom/indexedDB/IDBRequest.h
--- firefox-84.0.2+build1/dom/indexedDB/IDBRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,7 +11,9 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/dom/IDBRequestBinding.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsCycleCollectionParticipant.h"
 #include "ReportInternalError.h"
 #include "SafeRefPtr.h"
@@ -186,7 +188,7 @@
   Maybe<IDBTransaction&> MaybeTransactionRef() const {
     AssertIsOnOwningThread();
 
-    return mTransaction ? SomeRef(*mTransaction) : Nothing();
+    return mTransaction.maybeDeref();
   }
 
   IDBTransaction& MutableTransactionRef() const {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IDBResult.h firefox-85.0+build1/dom/indexedDB/IDBResult.h
--- firefox-84.0.2+build1/dom/indexedDB/IDBResult.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IDBResult.h	2021-01-18 19:58:09.000000000 +0000
@@ -5,8 +5,9 @@
 #ifndef mozilla_dom_indexeddb_idbresult_h__
 #define mozilla_dom_indexeddb_idbresult_h__
 
-#include <mozilla/ErrorResult.h>
-#include <mozilla/Variant.h>
+#include "mozilla/ErrorResult.h"
+#include "mozilla/ResultVariant.h"
+#include "mozilla/Variant.h"
 
 #include <type_traits>
 #include <utility>
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IndexedDatabase.cpp firefox-85.0+build1/dom/indexedDB/IndexedDatabase.cpp
--- firefox-84.0.2+build1/dom/indexedDB/IndexedDatabase.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IndexedDatabase.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,7 +4,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 "IndexedDatabase.h"
+#include "mozilla/dom/IndexedDatabase.h"
 #include "IndexedDatabaseInlines.h"
 
 #include "IDBDatabase.h"
@@ -16,6 +16,7 @@
 #include "mozilla/dom/WorkerScope.h"
 #include "MainThreadUtils.h"
 #include "jsapi.h"
+#include "nsIFile.h"
 #include "nsIGlobalObject.h"
 #include "nsQueryObject.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IndexedDatabase.h firefox-85.0+build1/dom/indexedDB/IndexedDatabase.h
--- firefox-84.0.2+build1/dom/indexedDB/IndexedDatabase.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IndexedDatabase.h	2021-01-18 19:58:09.000000000 +0000
@@ -24,8 +24,6 @@
 
 namespace indexedDB {
 
-class SerializedStructuredCloneReadInfo;
-
 struct StructuredCloneFileBase {
   enum FileType {
     eBlob,
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IndexedDBCommon.cpp firefox-85.0+build1/dom/indexedDB/IndexedDBCommon.cpp
--- firefox-84.0.2+build1/dom/indexedDB/IndexedDBCommon.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IndexedDBCommon.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "IndexedDBCommon.h"
 
+#include "js/StructuredClone.h"
 #include "mozilla/SnappyUncompressInputStream.h"
 
 namespace mozilla::dom::indexedDB {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/IndexedDBCommon.h firefox-85.0+build1/dom/indexedDB/IndexedDBCommon.h
--- firefox-84.0.2+build1/dom/indexedDB/IndexedDBCommon.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/IndexedDBCommon.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,9 @@
 
 #include "mozilla/dom/quota/QuotaCommon.h"
 
+class JSStructuredCloneData;
+class nsIInputStream;
+
 // IndexedDB equivalents of QM_TRY.
 #define IDB_TRY_GLUE(...) \
   QM_TRY_META(mozilla::dom::indexedDB, MOZ_UNIQUE_VAR(tryResult), ##__VA_ARGS__)
diff -Nru firefox-84.0.2+build1/dom/indexedDB/Key.h firefox-85.0+build1/dom/indexedDB/Key.h
--- firefox-84.0.2+build1/dom/indexedDB/Key.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/Key.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,10 +9,8 @@
 
 #include "mozilla/dom/indexedDB/IDBResult.h"
 
-#include "js/Array.h"  // JS::GetArrayLength
 #include "js/RootingAPI.h"
-#include "jsapi.h"
-#include "mozilla/ErrorResult.h"
+#include "js/TypeDecls.h"
 #include "nsString.h"
 
 class mozIStorageStatement;
diff -Nru firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBCursor.ipdl firefox-85.0+build1/dom/indexedDB/PBackgroundIDBCursor.ipdl
--- firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBCursor.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/PBackgroundIDBCursor.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -14,8 +14,7 @@
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 using class mozilla::dom::indexedDB::Key
   from "mozilla/dom/indexedDB/Key.h";
diff -Nru firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBDatabase.ipdl firefox-85.0+build1/dom/indexedDB/PBackgroundIDBDatabase.ipdl
--- firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBDatabase.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/PBackgroundIDBDatabase.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -19,8 +19,7 @@
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using struct mozilla::null_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
 using mozilla::dom::IDBTransaction::Mode
   from "mozilla/dom/IDBTransaction.h";
diff -Nru firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBFactory.ipdl firefox-85.0+build1/dom/indexedDB/PBackgroundIDBFactory.ipdl
--- firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBFactory.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/PBackgroundIDBFactory.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -11,8 +11,7 @@
 
 include "mozilla/dom/quota/SerializationHelpers.h";
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBRequest.ipdl firefox-85.0+build1/dom/indexedDB/PBackgroundIDBRequest.ipdl
--- firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBRequest.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/PBackgroundIDBRequest.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -14,8 +14,7 @@
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 using class mozilla::dom::indexedDB::Key
   from "mozilla/dom/indexedDB/Key.h";
diff -Nru firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh firefox-85.0+build1/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh
--- firefox-84.0.2+build1/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -16,11 +16,9 @@
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
 include "mozilla/dom/quota/SerializationHelpers.h";
 
-using struct mozilla::null_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 using mozilla::dom::IDBCursor::Direction
   from "mozilla/dom/IDBCursor.h";
@@ -38,7 +36,7 @@
   from "mozilla/dom/quota/PersistenceType.h";
 
 using moveonly mozilla::SerializedStructuredCloneBuffer
-  from "ipc/IPCMessageUtils.h";
+  from "mozilla/ipc/SerializedStructuredCloneBuffer.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ProfilerHelpers.cpp firefox-85.0+build1/dom/indexedDB/ProfilerHelpers.cpp
--- firefox-84.0.2+build1/dom/indexedDB/ProfilerHelpers.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ProfilerHelpers.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,8 @@
 #include "Key.h"
 #include "ThreadLocal.h"
 
+#include "mozilla/dom/Event.h"
+
 namespace mozilla::dom::indexedDB {
 
 namespace {
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ReportInternalError.h firefox-85.0+build1/dom/indexedDB/ReportInternalError.h
--- firefox-84.0.2+build1/dom/indexedDB/ReportInternalError.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ReportInternalError.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_indexeddb_reportinternalerror_h__
 
 #include "nsDebug.h"
+#include "nsPrintfCString.h"
 
 #include "IndexedDatabase.h"
 
diff -Nru firefox-84.0.2+build1/dom/indexedDB/SafeRefPtr.h firefox-85.0+build1/dom/indexedDB/SafeRefPtr.h
--- firefox-84.0.2+build1/dom/indexedDB/SafeRefPtr.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/SafeRefPtr.h	2021-01-18 19:58:09.000000000 +0000
@@ -262,9 +262,7 @@
     return mRawPtr;
   }
 
-  Maybe<T&> maybeDeref() const {
-    return mRawPtr ? SomeRef(*mRawPtr) : Nothing();
-  }
+  Maybe<T&> maybeDeref() const { return ToMaybeRef(mRawPtr); }
 
   T* unsafeGetRawPtr() const { return mRawPtr; }
 
@@ -299,10 +297,17 @@
 };
 
 template <typename T>
-SafeRefPtr(RefPtr<T> &&) -> SafeRefPtr<T>;
+SafeRefPtr(RefPtr<T>&&) -> SafeRefPtr<T>;
+
+template <typename T>
+SafeRefPtr(already_AddRefed<T>&&) -> SafeRefPtr<T>;
+
+template <typename T>
+class CheckedUnsafePtr;
 
 template <typename T>
-SafeRefPtr(already_AddRefed<T> &&) -> SafeRefPtr<T>;
+SafeRefPtr(const CheckedUnsafePtr<T>&, const AcquireStrongRefFromRawPtr&)
+    -> SafeRefPtr<T>;
 
 template <typename T>
 SafeRefPtr<T>::SafeRefPtr(T* aRawPtr, detail::InitialConstructionTag)
diff -Nru firefox-84.0.2+build1/dom/indexedDB/SchemaUpgrades.cpp firefox-85.0+build1/dom/indexedDB/SchemaUpgrades.cpp
--- firefox-84.0.2+build1/dom/indexedDB/SchemaUpgrades.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/SchemaUpgrades.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -2127,12 +2127,10 @@
 #ifdef DEBUG
   {
     // Make sure there's only one entry in the |database| table.
-    nsCOMPtr<mozIStorageStatement> stmt;
-    MOZ_ASSERT(NS_SUCCEEDED(aConnection.CreateStatement(
-        "SELECT COUNT(*) FROM database;"_ns, getter_AddRefs(stmt))));
-
-    bool hasResult;
-    MOZ_ASSERT(NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)));
+    IDB_TRY_INSPECT(const auto& stmt,
+                    quota::CreateAndExecuteSingleStepStatement(
+                        aConnection, "SELECT COUNT(*) FROM database;"_ns),
+                    QM_ASSERT_UNREACHABLE);
 
     int64_t count;
     MOZ_ASSERT(NS_SUCCEEDED(stmt->GetInt64(0, &count)));
diff -Nru firefox-84.0.2+build1/dom/indexedDB/ScriptErrorHelper.cpp firefox-85.0+build1/dom/indexedDB/ScriptErrorHelper.cpp
--- firefox-84.0.2+build1/dom/indexedDB/ScriptErrorHelper.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/ScriptErrorHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,9 +8,11 @@
 
 #include "MainThreadUtils.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
+#include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/indexedDB/SerializationHelpers.h firefox-85.0+build1/dom/indexedDB/SerializationHelpers.h
--- firefox-84.0.2+build1/dom/indexedDB/SerializationHelpers.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/SerializationHelpers.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,8 @@
 #ifndef mozilla_dom_indexeddb_serializationhelpers_h__
 #define mozilla_dom_indexeddb_serializationhelpers_h__
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 
 #include "mozilla/dom/indexedDB/Key.h"
 #include "mozilla/dom/indexedDB/KeyPath.h"
diff -Nru firefox-84.0.2+build1/dom/indexedDB/test/mochitest.ini firefox-85.0+build1/dom/indexedDB/test/mochitest.ini
--- firefox-84.0.2+build1/dom/indexedDB/test/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -128,7 +128,6 @@
 [test_autoIncrement.html]
 [test_autoIncrement_indexes.html]
 [test_bfcache.html]
-skip-if = fission # bug 1665165
 [test_blob_file_backed.html]
 [test_blob_simple.html]
 [test_blob_worker_crash.html]
diff -Nru firefox-84.0.2+build1/dom/indexedDB/test/unit/test_marker_file.js firefox-85.0+build1/dom/indexedDB/test/unit/test_marker_file.js
--- firefox-84.0.2+build1/dom/indexedDB/test/unit/test_marker_file.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/test/unit/test_marker_file.js	2021-01-18 19:58:09.000000000 +0000
@@ -56,9 +56,12 @@
 
   info("Verifying initialization");
 
+  let request = initStorage();
+  await requestFinished(request);
+
   createTestingEnvironment();
 
-  let request = initStorageAndChromeOrigin("persistent");
+  request = initPersistentOrigin(getSystemPrincipal());
   await requestFinished(request);
 
   let testingFiles = getTestingFiles();
diff -Nru firefox-84.0.2+build1/dom/indexedDB/test/unit/xpcshell-head-parent-process.js firefox-85.0+build1/dom/indexedDB/test/unit/xpcshell-head-parent-process.js
--- firefox-84.0.2+build1/dom/indexedDB/test/unit/xpcshell-head-parent-process.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/indexedDB/test/unit/xpcshell-head-parent-process.js	2021-01-18 19:58:09.000000000 +0000
@@ -252,11 +252,12 @@
   return timer;
 }
 
-function initStorageAndChromeOrigin(persistence) {
-  let principal = Cc["@mozilla.org/systemprincipal;1"].createInstance(
-    Ci.nsIPrincipal
-  );
-  return Services.qms.initStorageAndOrigin(principal, persistence, "idb");
+function initStorage() {
+  return Services.qms.init();
+}
+
+function initPersistentOrigin(principal) {
+  return Services.qms.initializePersistentOrigin(principal);
 }
 
 function resetOrClearAllDatabases(callback, clear) {
@@ -537,6 +538,10 @@
   SpecialPowers.clearUserPref("dom.indexedDB.preprocessing");
 }
 
+function getSystemPrincipal() {
+  return Cc["@mozilla.org/systemprincipal;1"].createInstance(Ci.nsIPrincipal);
+}
+
 function getPrincipal(url) {
   let uri = Services.io.newURI(url);
   return Services.scriptSecurityManager.createContentPrincipal(uri, {});
diff -Nru firefox-84.0.2+build1/dom/interfaces/base/nsIDOMWindowUtils.idl firefox-85.0+build1/dom/interfaces/base/nsIDOMWindowUtils.idl
--- firefox-84.0.2+build1/dom/interfaces/base/nsIDOMWindowUtils.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/interfaces/base/nsIDOMWindowUtils.idl	2021-01-18 19:58:09.000000000 +0000
@@ -783,6 +783,11 @@
    * @param aFlushLayout flushes layout if true. Otherwise, no flush occurs.
    * @param aOnlyVisible Set to true if you only want nodes that pass a visibility
    *        hit test.
+   * @param aTransparencyThreshold Only has an effect if aOnlyVisible is true.
+   *        Returns what amount of transparency is considered "opaque enough"
+   *        to consider elements "not visible". The default is effectively "1"
+   *        (so, only opaque elements will stop an element from being
+   *        "visible").
    */
   NodeList nodesFromRect(in float aX,
                          in float aY,
@@ -792,7 +797,8 @@
                          in float aLeftSize,
                          in boolean aIgnoreRootScrollFrame,
                          in boolean aFlushLayout,
-                         in boolean aOnlyVisible);
+                         in boolean aOnlyVisible,
+                         [optional] in float aTransparencyThreshold);
 
 
   /**
diff -Nru firefox-84.0.2+build1/dom/interfaces/base/nsIFocusManager.idl firefox-85.0+build1/dom/interfaces/base/nsIFocusManager.idl
--- firefox-84.0.2+build1/dom/interfaces/base/nsIFocusManager.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/interfaces/base/nsIFocusManager.idl	2021-01-18 19:58:09.000000000 +0000
@@ -71,6 +71,13 @@
   attribute mozIDOMWindowProxy focusedWindow;
 
   /**
+   * Parent-process only: The content BrowsingContext that currently has focus,
+   * if any. Note this can be different from activeBrowsingContext in the case
+   * of subframes.
+   */
+  readonly attribute BrowsingContext focusedContentBrowsingContext;
+
+  /**
    * The element that is currently focused. This will always be an element
    * within the document loaded in focusedWindow or null if no element in that
    * document is focused.
@@ -92,6 +99,7 @@
    * descendant of it (e.g., for `<input type="number">` the focus is redirected
    * to its descendant `<input type="text">`).
    */
+  [can_run_script]
   void setFocus(in Element aElement, in unsigned long aFlags);
 
   /**
diff -Nru firefox-84.0.2+build1/dom/interfaces/base/nsIRemoteTab.idl firefox-85.0+build1/dom/interfaces/base/nsIRemoteTab.idl
--- firefox-84.0.2+build1/dom/interfaces/base/nsIRemoteTab.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/interfaces/base/nsIRemoteTab.idl	2021-01-18 19:58:09.000000000 +0000
@@ -13,14 +13,6 @@
 interface nsIRemoteTab : nsISupports
 {
   /**
-   * Manages the docshell active state of the remote browser. Setting the
-   * docShell to be active will also cause it to render layers and upload
-   * them to the compositor. Setting the docShell as not active will clear
-   * those layers.
-   */
-  attribute boolean docShellIsActive;
-
-  /**
    * When set to true, this tells the child to paint and upload layers to
    * the compositor. When set to false, previous layers are cleared from
    * the compositor, but only if preserveLayers is also set to false.
diff -Nru firefox-84.0.2+build1/dom/interfaces/security/nsIReferrerInfo.idl firefox-85.0+build1/dom/interfaces/security/nsIReferrerInfo.idl
--- firefox-84.0.2+build1/dom/interfaces/security/nsIReferrerInfo.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/interfaces/security/nsIReferrerInfo.idl	2021-01-18 19:58:09.000000000 +0000
@@ -6,7 +6,9 @@
 #include "nsISerializable.idl"
 
 %{C++
-#include "mozilla/dom/ReferrerPolicyBinding.h"
+namespace mozilla::dom {
+enum class ReferrerPolicy : uint8_t;
+}
 %}
 
 interface nsIURI;
diff -Nru firefox-84.0.2+build1/dom/interfaces/xul/nsIDOMXULCommandDispatcher.idl firefox-85.0+build1/dom/interfaces/xul/nsIDOMXULCommandDispatcher.idl
--- firefox-84.0.2+build1/dom/interfaces/xul/nsIDOMXULCommandDispatcher.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/interfaces/xul/nsIDOMXULCommandDispatcher.idl	2021-01-18 19:58:10.000000000 +0000
@@ -14,8 +14,10 @@
 [scriptable, uuid(a9fa9fd3-8d62-4f94-9ed8-3ea9c3cf0773)]
 interface nsIDOMXULCommandDispatcher : nsISupports
 {
-            attribute Element focusedElement;
-            attribute mozIDOMWindowProxy focusedWindow;
+  [setter_can_run_script]
+  attribute Element focusedElement;
+  [setter_can_run_script]
+  attribute mozIDOMWindowProxy focusedWindow;
 
   void                      addCommandUpdater(in Element updater,
                                               in AString events,
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserBridgeChild.cpp firefox-85.0+build1/dom/ipc/BrowserBridgeChild.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserBridgeChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserBridgeChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -17,9 +17,11 @@
 #include "mozilla/dom/BrowserBridgeHost.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/MozFrameLoaderOwnerBinding.h"
+#include "mozilla/PresShell.h"
 #include "nsFocusManager.h"
 #include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
+#include "nsObjectLoadingContent.h"
 #include "nsQueryObject.h"
 #include "nsSubDocumentFrame.h"
 #include "nsView.h"
@@ -74,10 +76,12 @@
   Unused << SendNavigateByKey(aForward, aForDocumentNavigation);
 }
 
-void BrowserBridgeChild::Activate() { Unused << SendActivate(); }
+void BrowserBridgeChild::Activate(uint64_t aActionId) {
+  Unused << SendActivate(aActionId);
+}
 
-void BrowserBridgeChild::Deactivate(bool aWindowLowering) {
-  Unused << SendDeactivate(aWindowLowering);
+void BrowserBridgeChild::Deactivate(bool aWindowLowering, uint64_t aActionId) {
+  Unused << SendDeactivate(aWindowLowering, aActionId);
 }
 
 void BrowserBridgeChild::SetIsUnderHiddenEmbedderElement(
@@ -245,11 +249,10 @@
     const Maybe<IntrinsicSize>& aIntrinsicSize,
     const Maybe<AspectRatio>& aIntrinsicRatio) {
   if (RefPtr<Element> owner = mFrameLoader->GetOwnerContent()) {
-    if (nsIFrame* f = owner->GetPrimaryFrame()) {
-      if (nsSubDocumentFrame* sdf = do_QueryFrame(f)) {
-        sdf->SubdocumentIntrinsicSizeOrRatioChanged(aIntrinsicSize,
-                                                    aIntrinsicRatio);
-      }
+    if (nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(owner)) {
+      static_cast<nsObjectLoadingContent*>(olc.get())
+          ->SubdocumentIntrinsicSizeOrRatioChanged(aIntrinsicSize,
+                                                   aIntrinsicRatio);
     }
   }
   return IPC_OK();
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserBridgeChild.h firefox-85.0+build1/dom/ipc/BrowserBridgeChild.h
--- firefox-84.0.2+build1/dom/ipc/BrowserBridgeChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserBridgeChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -49,9 +49,9 @@
 
   void NavigateByKey(bool aForward, bool aForDocumentNavigation);
 
-  void Activate();
+  void Activate(uint64_t aActionId);
 
-  void Deactivate(bool aWindowLowering);
+  void Deactivate(bool aWindowLowering, uint64_t aActionId);
 
   void SetIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement);
 
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserBridgeHost.cpp firefox-85.0+build1/dom/ipc/BrowserBridgeHost.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserBridgeHost.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserBridgeHost.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/BrowserBridgeHost.h"
 
 #include "mozilla/Unused.h"
+#include "mozilla/dom/Element.h"
 #include "nsFrameLoader.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserBridgeParent.cpp firefox-85.0+build1/dom/ipc/BrowserBridgeParent.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserBridgeParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserBridgeParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,8 @@
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/DocAccessibleParent.h"
 #endif
+
+#include "mozilla/MouseEvents.h"
 #include "mozilla/dom/BrowserBridgeParent.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/ContentParent.h"
@@ -14,6 +16,7 @@
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
 #include "mozilla/dom/WindowGlobalParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/InputAPZContext.h"
 
 using namespace mozilla::ipc;
@@ -201,13 +204,14 @@
   return IPC_OK();
 }
 
-IPCResult BrowserBridgeParent::RecvActivate() {
-  mBrowserParent->Activate();
+IPCResult BrowserBridgeParent::RecvActivate(uint64_t aActionId) {
+  mBrowserParent->Activate(aActionId);
   return IPC_OK();
 }
 
-IPCResult BrowserBridgeParent::RecvDeactivate(const bool& aWindowLowering) {
-  mBrowserParent->Deactivate(aWindowLowering);
+IPCResult BrowserBridgeParent::RecvDeactivate(const bool& aWindowLowering,
+                                              uint64_t aActionId) {
+  mBrowserParent->Deactivate(aWindowLowering, aActionId);
   return IPC_OK();
 }
 
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserBridgeParent.h firefox-85.0+build1/dom/ipc/BrowserBridgeParent.h
--- firefox-84.0.2+build1/dom/ipc/BrowserBridgeParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserBridgeParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -80,9 +80,10 @@
 
   mozilla::ipc::IPCResult RecvWillChangeProcess();
 
-  mozilla::ipc::IPCResult RecvActivate();
+  mozilla::ipc::IPCResult RecvActivate(uint64_t aActionId);
 
-  mozilla::ipc::IPCResult RecvDeactivate(const bool& aWindowLowering);
+  mozilla::ipc::IPCResult RecvDeactivate(const bool& aWindowLowering,
+                                         uint64_t aActionId);
 
   mozilla::ipc::IPCResult RecvSetIsUnderHiddenEmbedderElement(
       const bool& aIsUnderHiddenEmbedderElement);
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserChild.cpp firefox-85.0+build1/dom/ipc/BrowserChild.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -20,6 +20,7 @@
 #include "DocumentInlines.h"
 #include "EventStateManager.h"
 #include "FrameLayerBuilder.h"
+#include "GeckoProfiler.h"
 #include "Layers.h"
 #include "MMPrinter.h"
 #include "PermissionMessageUtils.h"
@@ -34,6 +35,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/EventListenerManager.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/IMEStateManager.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/MouseEvents.h"
@@ -65,6 +67,7 @@
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PBrowser.h"
 #include "mozilla/dom/PaymentRequestChild.h"
+#include "mozilla/dom/PointerEventHandler.h"
 #include "mozilla/dom/SessionStoreListener.h"
 #include "mozilla/dom/WindowGlobalChild.h"
 #include "mozilla/dom/WindowProxyHolder.h"
@@ -321,7 +324,6 @@
       mHasSiblings(false),
       mIsTransparent(false),
       mIPCOpen(false),
-      mParentIsActive(false),
       mDidSetRealShowInfo(false),
       mDidLoadURLInit(false),
       mSkipKeyPress(false),
@@ -1061,7 +1063,7 @@
 
 void BrowserChild::DoFakeShow(const ParentShowInfo& aParentShowInfo) {
   OwnerShowInfo ownerInfo{ScreenIntSize(), ScrollbarPreference::Auto,
-                          mParentIsActive, nsSizeMode_Normal};
+                          nsSizeMode_Normal};
   RecvShow(aParentShowInfo, ownerInfo);
   mDidFakeShow = true;
 }
@@ -1105,7 +1107,7 @@
   }
 
   ApplyParentShowInfo(aParentInfo);
-  RecvParentActivated(aOwnerInfo.parentWindowIsActive());
+
   if (!mIsTopLevel) {
     RecvScrollbarPreferenceChanged(aOwnerInfo.scrollbarPreference());
   }
@@ -1169,6 +1171,7 @@
   mUnscaledOuterRect = aDimensionInfo.rect();
   mClientOffset = aDimensionInfo.clientOffset();
   mChromeOffset = aDimensionInfo.chromeOffset();
+  MOZ_ASSERT_IF(!IsTopLevel(), mChromeOffset == LayoutDeviceIntPoint());
 
   mOrientation = aDimensionInfo.orientation();
   SetUnscaledInnerSize(aDimensionInfo.size());
@@ -1417,27 +1420,15 @@
   }
 }
 
-mozilla::ipc::IPCResult BrowserChild::RecvActivate() {
+mozilla::ipc::IPCResult BrowserChild::RecvActivate(uint64_t aActionId) {
   MOZ_ASSERT(mWebBrowser);
-  mWebBrowser->FocusActivate();
+  mWebBrowser->FocusActivate(aActionId);
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult BrowserChild::RecvDeactivate() {
+mozilla::ipc::IPCResult BrowserChild::RecvDeactivate(uint64_t aActionId) {
   MOZ_ASSERT(mWebBrowser);
-  mWebBrowser->FocusDeactivate();
-  return IPC_OK();
-}
-
-mozilla::ipc::IPCResult BrowserChild::RecvParentActivated(
-    const bool& aActivated) {
-  mParentIsActive = aActivated;
-
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
-  NS_ENSURE_TRUE(fm, IPC_OK());
-
-  nsCOMPtr<nsPIDOMWindowOuter> window = do_GetInterface(WebNavigation());
-  fm->ParentActivated(window, aActivated);
+  mWebBrowser->FocusDeactivate(aActionId);
   return IPC_OK();
 }
 
@@ -1572,12 +1563,25 @@
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult BrowserChild::RecvRealMouseMoveEventForTests(
+    const WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
+    const uint64_t& aInputBlockId) {
+  return RecvRealMouseMoveEvent(aEvent, aGuid, aInputBlockId);
+}
+
 mozilla::ipc::IPCResult BrowserChild::RecvNormalPriorityRealMouseMoveEvent(
     const WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
     const uint64_t& aInputBlockId) {
   return RecvRealMouseMoveEvent(aEvent, aGuid, aInputBlockId);
 }
 
+mozilla::ipc::IPCResult
+BrowserChild::RecvNormalPriorityRealMouseMoveEventForTests(
+    const WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
+    const uint64_t& aInputBlockId) {
+  return RecvRealMouseMoveEvent(aEvent, aGuid, aInputBlockId);
+}
+
 mozilla::ipc::IPCResult BrowserChild::RecvSynthMouseMoveEvent(
     const WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
     const uint64_t& aInputBlockId) {
@@ -2295,7 +2299,8 @@
   // went wrong.
   auto sendCallbackError = MakeScopeExit([&] {
     if (aCallback) {
-      aCallback(PrintPreviewResultInfo(0, 0, false));  // signal error
+      aCallback(
+          PrintPreviewResultInfo(0, 0, false, false, false));  // signal error
     }
   });
 
@@ -2449,41 +2454,6 @@
   return IPC_OK();
 }
 
-void BrowserChild::AddPendingDocShellBlocker() { mPendingDocShellBlockers++; }
-
-void BrowserChild::RemovePendingDocShellBlocker() {
-  mPendingDocShellBlockers--;
-  if (!mPendingDocShellBlockers && mPendingDocShellReceivedMessage) {
-    mPendingDocShellReceivedMessage = false;
-    InternalSetDocShellIsActive(mPendingDocShellIsActive);
-  }
-  if (!mPendingDocShellBlockers && mPendingRenderLayersReceivedMessage) {
-    mPendingRenderLayersReceivedMessage = false;
-    RecvRenderLayers(mPendingRenderLayers, mPendingLayersObserverEpoch);
-  }
-}
-
-void BrowserChild::InternalSetDocShellIsActive(bool aIsActive) {
-  if (nsCOMPtr<nsIDocShell> docShell = do_GetInterface(WebNavigation())) {
-    docShell->SetIsActive(aIsActive);
-  }
-}
-
-mozilla::ipc::IPCResult BrowserChild::RecvSetDocShellIsActive(
-    const bool& aIsActive) {
-  // If we're currently waiting for window opening to complete, we need to hold
-  // off on setting the docshell active. We queue up the values we're receiving
-  // in the mWindowOpenDocShellActiveStatus.
-  if (mPendingDocShellBlockers > 0) {
-    mPendingDocShellReceivedMessage = true;
-    mPendingDocShellIsActive = aIsActive;
-    return IPC_OK();
-  }
-
-  InternalSetDocShellIsActive(aIsActive);
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult BrowserChild::RecvRenderLayers(
     const bool& aEnabled, const layers::LayersObserverEpoch& aEpoch) {
   if (mPendingDocShellBlockers > 0) {
@@ -2862,26 +2832,18 @@
     return;
   }
 
-  // For top level stuff, the browser / tab-switcher is responsible of fixing
-  // the docshell state up explicitly via SetDocShellIsActive.
+  // The browser / tab-switcher is responsible of fixing the browsingContext
+  // state up explicitly via SetDocShellIsActive, which propagates to children
+  // automatically.
   //
   // We need it not to be observable, as this used via RecvRenderLayers and co.,
   // for stuff like async tab warming.
   //
   // We don't want to go through the docshell because we don't want to change
   // the visibility state of the document, which has side effects like firing
-  // events to content and unblocking media playback.
-  //
-  // FIXME(emilio): This feels a bit sketchy. Ideally we'd be able to just not
-  // update visibility of stuff in the tab warming case (we just want to paint
-  // once so that stuff is there already, really...), and use the docshell here
-  // all the time, but that makes some of the devtools tests fail (??).
-  if (mIsTopLevel) {
-    if (RefPtr<PresShell> presShell = docShell->GetPresShell()) {
-      presShell->SetIsActive(true);
-    }
-  } else {
-    docShell->SetIsActive(true);
+  // events to content, unblocking media playback, unthrottling timeouts...
+  if (RefPtr<PresShell> presShell = docShell->GetPresShell()) {
+    presShell->SetIsActive(true);
   }
 }
 
@@ -2913,8 +2875,8 @@
                                                       nullptr);
         rootPresContext->ApplyPluginGeometryUpdates();
       }
+      presShell->SetIsActive(false);
     }
-    docShell->SetIsActive(false);
   }
 
   if (mPuppetWidget) {
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserChild.h firefox-85.0+build1/dom/ipc/BrowserChild.h
--- firefox-84.0.2+build1/dom/ipc/BrowserChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -19,7 +19,6 @@
 #include "nsIWindowProvider.h"
 #include "nsIDocShell.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsFrameMessageManager.h"
 #include "nsWeakReference.h"
 #include "nsIBrowserChild.h"
 #include "nsITooltipListener.h"
@@ -29,6 +28,7 @@
 #include "mozilla/dom/TabContext.h"
 #include "mozilla/dom/CoalescedMouseData.h"
 #include "mozilla/dom/CoalescedWheelData.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventForwards.h"
@@ -41,6 +41,7 @@
 #include "AudioChannelService.h"
 #include "PuppetWidget.h"
 #include "nsDeque.h"
+#include "nsIRemoteTab.h"
 
 class nsBrowserStatusFilter;
 class nsIDOMWindow;
@@ -289,9 +290,9 @@
   mozilla::ipc::IPCResult RecvDynamicToolbarOffsetChanged(
       const mozilla::ScreenIntCoord& aOffset);
 
-  mozilla::ipc::IPCResult RecvActivate();
+  mozilla::ipc::IPCResult RecvActivate(uint64_t aActionId);
 
-  mozilla::ipc::IPCResult RecvDeactivate();
+  mozilla::ipc::IPCResult RecvDeactivate(uint64_t aActionId);
 
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   mozilla::ipc::IPCResult RecvMouseEvent(const nsString& aType, const float& aX,
@@ -303,10 +304,15 @@
   mozilla::ipc::IPCResult RecvRealMouseMoveEvent(
       const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
       const uint64_t& aInputBlockId);
-
   mozilla::ipc::IPCResult RecvNormalPriorityRealMouseMoveEvent(
       const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
       const uint64_t& aInputBlockId);
+  mozilla::ipc::IPCResult RecvRealMouseMoveEventForTests(
+      const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
+      const uint64_t& aInputBlockId);
+  mozilla::ipc::IPCResult RecvNormalPriorityRealMouseMoveEventForTests(
+      const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
+      const uint64_t& aInputBlockId);
 
   mozilla::ipc::IPCResult RecvSynthMouseMoveEvent(
       const mozilla::WidgetMouseEvent& aEvent, const ScrollableLayerGuid& aGuid,
@@ -565,8 +571,6 @@
 
   bool IPCOpen() const { return mIPCOpen; }
 
-  bool ParentIsActive() const { return mParentIsActive; }
-
   const mozilla::layers::CompositorOptions& GetCompositorOptions() const;
   bool AsyncPanZoomEnabled() const;
 
@@ -635,9 +639,6 @@
   }
 #endif
 
-  void AddPendingDocShellBlocker();
-  void RemovePendingDocShellBlocker();
-
   // The HANDLE object for the widget this BrowserChild in.
   WindowsHandle WidgetNativeData() { return mWidgetNativeData; }
 
@@ -701,8 +702,6 @@
 
   mozilla::ipc::IPCResult RecvDestroy();
 
-  mozilla::ipc::IPCResult RecvSetDocShellIsActive(const bool& aIsActive);
-
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   mozilla::ipc::IPCResult RecvRenderLayers(
       const bool& aEnabled, const layers::LayersObserverEpoch& aEpoch);
@@ -714,8 +713,6 @@
 
   mozilla::ipc::IPCResult RecvSuppressDisplayport(const bool& aEnabled);
 
-  mozilla::ipc::IPCResult RecvParentActivated(const bool& aActivated);
-
   mozilla::ipc::IPCResult RecvScrollbarPreferenceChanged(ScrollbarPreference);
 
   mozilla::ipc::IPCResult RecvSetKeyboardIndicators(
@@ -826,6 +823,7 @@
   // Position of client area relative to the outer window
   LayoutDeviceIntPoint mClientOffset;
   // Position of tab, relative to parent widget (typically the window)
+  // NOTE: This value is valuable only for the top level browser.
   LayoutDeviceIntPoint mChromeOffset;
   ScreenIntCoord mDynamicToolbarMaxHeight;
   TabId mUniqueId;
@@ -848,7 +846,6 @@
   bool mIsTransparent;
 
   bool mIPCOpen;
-  bool mParentIsActive;
   CSSSize mUnscaledInnerSize;
   bool mDidSetRealShowInfo;
   bool mDidLoadURLInit;
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserHost.cpp firefox-85.0+build1/dom/ipc/BrowserHost.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserHost.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserHost.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -100,28 +100,6 @@
   Unused << mRoot->SendUpdateEffects(mEffectsInfo);
 }
 
-/* attribute boolean docShellIsActive; */
-NS_IMETHODIMP
-BrowserHost::GetDocShellIsActive(bool* aDocShellIsActive) {
-  if (!mRoot) {
-    *aDocShellIsActive = false;
-    return NS_OK;
-  }
-  *aDocShellIsActive = mRoot->GetDocShellIsActive();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-BrowserHost::SetDocShellIsActive(bool aDocShellIsActive) {
-  if (!mRoot) {
-    return NS_OK;
-  }
-  VisitAll([&](BrowserParent* aBrowserParent) {
-    aBrowserParent->SetDocShellIsActive(aDocShellIsActive);
-  });
-  return NS_OK;
-}
-
 /* attribute boolean renderLayers; */
 NS_IMETHODIMP
 BrowserHost::GetRenderLayers(bool* aRenderLayers) {
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserParent.cpp firefox-85.0+build1/dom/ipc/BrowserParent.cpp
--- firefox-84.0.2+build1/dom/ipc/BrowserParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -40,11 +40,13 @@
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/Hal.h"
 #include "mozilla/IMEStateManager.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/AsyncDragMetrics.h"
 #include "mozilla/layers/InputAPZContext.h"
 #include "mozilla/layout/RemoteLayerTreeOwner.h"
 #include "mozilla/plugins/PPluginWidgetParent.h"
 #include "mozilla/LookAndFeel.h"
+#include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/net/CookieJarSettings.h"
@@ -122,6 +124,7 @@
 #include "IHistory.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "GeckoProfiler.h"
 #include "MMPrinter.h"
 #include "SessionStoreFunctions.h"
 #include "mozilla/dom/CrashReport.h"
@@ -222,7 +225,6 @@
       mCustomCursorHotspotX(0),
       mCustomCursorHotspotY(0),
       mVerifyDropLinks{},
-      mDocShellIsActive(false),
       mMarkedDestroying(false),
       mIsDestroyed(false),
       mRemoteTargetSetsCursor(false),
@@ -1076,7 +1078,9 @@
   hal::GetCurrentScreenConfiguration(&config);
   hal::ScreenOrientation orientation = config.orientation();
   LayoutDeviceIntPoint clientOffset = GetClientOffset();
-  LayoutDeviceIntPoint chromeOffset = -GetChildProcessOffset();
+  LayoutDeviceIntPoint chromeOffset = !GetBrowserBridgeParent()
+                                          ? -GetChildProcessOffset()
+                                          : LayoutDeviceIntPoint();
 
   if (!mUpdatedDimensions || mOrientation != orientation ||
       mDimensions != size || !mRect.IsEqualEdges(rect) ||
@@ -1141,21 +1145,21 @@
   }
 }
 
-void BrowserParent::Activate() {
+void BrowserParent::Activate(uint64_t aActionId) {
   LOGBROWSERFOCUS(("Activate %p", this));
   if (!mIsDestroyed) {
     SetTopLevelWebFocus(this);  // Intentionally inside "if"
-    Unused << SendActivate();
+    Unused << SendActivate(aActionId);
   }
 }
 
-void BrowserParent::Deactivate(bool aWindowLowering) {
+void BrowserParent::Deactivate(bool aWindowLowering, uint64_t aActionId) {
   LOGBROWSERFOCUS(("Deactivate %p", this));
   if (!aWindowLowering) {
     UnsetTopLevelWebFocus(this);  // Intentionally outside the next "if"
   }
   if (!mIsDestroyed) {
-    Unused << SendDeactivate();
+    Unused << SendDeactivate(aActionId);
   }
 }
 
@@ -1450,11 +1454,23 @@
       MOZ_ASSERT(!ret || aEvent.HasBeenPostedToRemoteProcess());
       return;
     }
+
+    if (!aEvent.mFlags.mIsSynthesizedForTests) {
+      DebugOnly<bool> ret =
+          isInputPriorityEventEnabled
+              ? SendRealMouseMoveEvent(aEvent, guid, blockId)
+              : SendNormalPriorityRealMouseMoveEvent(aEvent, guid, blockId);
+      NS_WARNING_ASSERTION(ret, "SendRealMouseMoveEvent() failed");
+      MOZ_ASSERT(!ret || aEvent.HasBeenPostedToRemoteProcess());
+      return;
+    }
+
     DebugOnly<bool> ret =
         isInputPriorityEventEnabled
-            ? SendRealMouseMoveEvent(aEvent, guid, blockId)
-            : SendNormalPriorityRealMouseMoveEvent(aEvent, guid, blockId);
-    NS_WARNING_ASSERTION(ret, "SendRealMouseMoveEvent() failed");
+            ? SendRealMouseMoveEventForTests(aEvent, guid, blockId)
+            : SendNormalPriorityRealMouseMoveEventForTests(aEvent, guid,
+                                                           blockId);
+    NS_WARNING_ASSERTION(ret, "SendRealMouseMoveEventForTests() failed");
     MOZ_ASSERT(!ret || aEvent.HasBeenPostedToRemoteProcess());
     return;
   }
@@ -1987,12 +2003,9 @@
     return false;
   }
   if ((aType == TapType::eSingleTap || aType == TapType::eSecondTap)) {
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
-      RefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
-      if (frameLoader) {
-        RefPtr<Element> element = frameLoader->GetOwnerContent();
-        if (element) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
+      if (RefPtr<nsFrameLoader> frameLoader = GetFrameLoader()) {
+        if (RefPtr<Element> element = frameLoader->GetOwnerContent()) {
           fm->SetFocus(element, nsIFocusManager::FLAG_BYMOUSE |
                                     nsIFocusManager::FLAG_BYTOUCH |
                                     nsIFocusManager::FLAG_NOSCROLL);
@@ -2567,21 +2580,6 @@
     const nsresult aStatus,
     const Maybe<WebProgressStateChangeData>& aStateChangeData) {
   if (mSuspendedProgressEvents) {
-    nsCOMPtr<nsIURI> uri = aRequestData.requestURI();
-    const uint32_t startDocumentFlags =
-        nsIWebProgressListener::STATE_START |
-        nsIWebProgressListener::STATE_IS_DOCUMENT |
-        nsIWebProgressListener::STATE_IS_REQUEST |
-        nsIWebProgressListener::STATE_IS_WINDOW |
-        nsIWebProgressListener::STATE_IS_NETWORK;
-    // Once we get a load start from something that isn't the initial
-    // about:blank, we should stop blocking future state changes.
-    if ((aStateFlags & startDocumentFlags) == startDocumentFlags &&
-        (aWebProgressData && aWebProgressData->isTopLevel()) &&
-        (!uri || !NS_IsAboutBlank(uri))) {
-      mSuspendedProgressEvents = false;
-    }
-
     return IPC_OK();
   }
 
@@ -2916,7 +2914,7 @@
   }
   if (NS_WARN_IF(!mContentCache.HandleQueryContentEvent(
           aEvent, textInputHandlingWidget)) ||
-      NS_WARN_IF(!aEvent.mSucceeded)) {
+      NS_WARN_IF(aEvent.Failed())) {
     return true;
   }
   switch (aEvent.mMessage) {
@@ -2925,10 +2923,10 @@
     case eQueryEditorRect: {
       nsCOMPtr<nsIWidget> browserWidget = GetWidget();
       if (browserWidget != textInputHandlingWidget) {
-        aEvent.mReply.mRect += nsLayoutUtils::WidgetToWidgetOffset(
+        aEvent.mReply->mRect += nsLayoutUtils::WidgetToWidgetOffset(
             browserWidget, textInputHandlingWidget);
       }
-      aEvent.mReply.mRect = TransformChildToParent(aEvent.mReply.mRect);
+      aEvent.mReply->mRect = TransformChildToParent(aEvent.mReply->mRect);
       break;
     }
     default:
@@ -3356,29 +3354,8 @@
   return IPC_OK();
 }
 
-bool BrowserParent::GetDocShellIsActive() { return mDocShellIsActive; }
-
-void BrowserParent::SetDocShellIsActive(bool isActive) {
-  mDocShellIsActive = isActive;
-  SetRenderLayers(isActive);
-  Unused << SendSetDocShellIsActive(isActive);
-
-  // update active accessible documents on windows
-#if defined(XP_WIN) && defined(ACCESSIBILITY)
-  if (a11y::Compatibility::IsDolphin()) {
-    if (a11y::DocAccessibleParent* tabDoc = GetTopLevelDocAccessible()) {
-      HWND window = tabDoc->GetEmulatedWindowHandle();
-      MOZ_ASSERT(window);
-      if (window) {
-        if (isActive) {
-          a11y::nsWinUtils::ShowNativeWindow(window);
-        } else {
-          a11y::nsWinUtils::HideNativeWindow(window);
-        }
-      }
-    }
-  }
-#endif
+bool BrowserParent::GetDocShellIsActive() {
+  return mBrowsingContext && mBrowsingContext->IsActive();
 }
 
 bool BrowserParent::GetHasPresented() { return mHasPresented; }
diff -Nru firefox-84.0.2+build1/dom/ipc/BrowserParent.h firefox-85.0+build1/dom/ipc/BrowserParent.h
--- firefox-84.0.2+build1/dom/ipc/BrowserParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/BrowserParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,32 +16,35 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BrowserBridgeParent.h"
-#include "mozilla/dom/File.h"
 #include "mozilla/dom/PBrowserParent.h"
-#include "mozilla/dom/PContent.h"
-#include "mozilla/dom/PFilePickerParent.h"
 #include "mozilla/dom/TabContext.h"
 #include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/gfx/CrossProcessPaint.h"
-#include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layout/RemoteLayerTreeOwner.h"
 #include "nsCOMPtr.h"
 #include "nsIAuthPromptProvider.h"
 #include "nsIBrowserDOMWindow.h"
 #include "nsIDOMEventListener.h"
 #include "nsIKeyEventInPluginCallback.h"
+#include "nsIRemoteTab.h"
 #include "nsIWidget.h"
-#include "nsIXULBrowserWindow.h"
 #include "nsWeakReference.h"
 
+class imgIContainer;
+class nsCycleCollectionTraversalCallback;
+class nsDocShellLoadState;
 class nsFrameLoader;
+class nsIBrowser;
 class nsIContent;
+class nsIContentSecurityPolicy;
+class nsIDocShell;
+class nsILoadContext;
 class nsIPrincipal;
+class nsIRequest;
 class nsIURI;
-class nsILoadContext;
-class nsIDocShell;
 class nsIWebBrowserPersistDocumentReceiver;
 class nsIWebProgress;
+class nsIXULBrowserWindow;
+class nsPIDOMWindowOuter;
 
 namespace mozilla {
 
@@ -49,17 +52,12 @@
 class DocAccessibleParent;
 }
 
-namespace layers {
-struct TextureFactoryIdentifier;
-}  // namespace layers
-
 namespace widget {
 struct IMENotification;
 }  // namespace widget
 
 namespace gfx {
 class SourceSurface;
-class DataSourceSurface;
 }  // namespace gfx
 
 namespace dom {
@@ -512,9 +510,9 @@
   void DynamicToolbarOffsetChanged(ScreenIntCoord aOffset);
 #endif
 
-  void Activate();
+  void Activate(uint64_t aActionId);
 
-  void Deactivate(bool aWindowLowering);
+  void Deactivate(bool aWindowLowering, uint64_t aActionId);
 
   void MouseEnterIntoWidget();
 
@@ -592,9 +590,9 @@
 
   bool SendSelectionEvent(mozilla::WidgetSelectionEvent& aEvent);
 
-  bool SendHandleTap(TapType aType, const LayoutDevicePoint& aPoint,
-                     Modifiers aModifiers, const ScrollableLayerGuid& aGuid,
-                     uint64_t aInputBlockId);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY bool SendHandleTap(
+      TapType aType, const LayoutDevicePoint& aPoint, Modifiers aModifiers,
+      const ScrollableLayerGuid& aGuid, uint64_t aInputBlockId);
 
   PFilePickerParent* AllocPFilePickerParent(const nsString& aTitle,
                                             const int16_t& aMode);
@@ -719,13 +717,9 @@
                           uint32_t aPresShellId);
   void StopApzAutoscroll(nsViewID aScrollId, uint32_t aPresShellId);
 
-  // Suspend nsIWebProgressListener events until after the next STATE_START
-  // onStateChange. This is used to block STATE_STOP events from the old process
-  // when process switching away, as well as the initial about:blank and
-  // STATE_START from the new process.
-  void SuspendProgressEventsUntilAfterNextLoadStarts() {
-    mSuspendedProgressEvents = true;
-  }
+  // Suspend nsIWebProgressListener events. This is used to block any further
+  // progress events from the old process when process switching away.
+  void SuspendProgressEvents() { mSuspendedProgressEvents = true; }
 
   bool CanCancelContentJS(nsIRemoteTab::NavigationType aNavigationType,
                           int32_t aNavigationIndex,
@@ -967,9 +961,6 @@
   int32_t mActiveSupressDisplayportCount = 0;
 #endif
 
-  // Cached value indicating the docshell active state of the remote browser.
-  bool mDocShellIsActive : 1;
-
   // When true, we've initiated normal shutdown and notified our managing
   // PContent.
   bool mMarkedDestroying : 1;
@@ -1009,9 +1000,8 @@
   bool mIsMouseEnterIntoWidgetEventSuppressed : 1;
 
   // Set to true if we're currently suspending nsIWebProgress events.
-  // We keep suspending until we get a STATE_START onStateChange event
-  // (for something that isn't the initial about:blank) and then start
-  // allowing future events.
+  // We do this when we are process switching and want to suspend events
+  // from the old BrowserParent after it sent STATE_START event.
   bool mSuspendedProgressEvents : 1;
 };
 
diff -Nru firefox-84.0.2+build1/dom/ipc/ClonedErrorHolder.h firefox-85.0+build1/dom/ipc/ClonedErrorHolder.h
--- firefox-84.0.2+build1/dom/ipc/ClonedErrorHolder.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ClonedErrorHolder.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,12 +13,13 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 
 class nsIGlobalObject;
 class nsQueryActorChild;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class ClonedErrorHolder final {
diff -Nru firefox-84.0.2+build1/dom/ipc/CoalescedMouseData.cpp firefox-85.0+build1/dom/ipc/CoalescedMouseData.cpp
--- firefox-84.0.2+build1/dom/ipc/CoalescedMouseData.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/CoalescedMouseData.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -60,7 +60,9 @@
                                      const uint64_t& aInputBlockId) {
   MOZ_ASSERT(aEvent.mMessage == eMouseMove);
   return !mCoalescedInputEvent ||
-         (mCoalescedInputEvent->mModifiers == aEvent.mModifiers &&
+         (!mCoalescedInputEvent->mFlags.mIsSynthesizedForTests &&
+          !aEvent.mFlags.mIsSynthesizedForTests &&
+          mCoalescedInputEvent->mModifiers == aEvent.mModifiers &&
           mCoalescedInputEvent->mInputSource == aEvent.mInputSource &&
           mCoalescedInputEvent->pointerId == aEvent.pointerId &&
           mCoalescedInputEvent->mButton == aEvent.mButton &&
diff -Nru firefox-84.0.2+build1/dom/ipc/ContentChild.cpp firefox-85.0+build1/dom/ipc/ContentChild.cpp
--- firefox-84.0.2+build1/dom/ipc/ContentChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ContentChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -38,7 +38,9 @@
 #include "mozilla/RemoteDecoderManagerChild.h"
 #include "mozilla/RemoteLazyInputStreamChild.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/SharedStyleSheetCache.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_fission.h"
 #include "mozilla/StaticPrefs_media.h"
@@ -47,6 +49,8 @@
 #include "mozilla/WebBrowserPersistDocumentChild.h"
 #include "mozilla/devtools/HeapSnapshotTempFileHelperChild.h"
 #include "mozilla/docshell/OfflineCacheUpdateChild.h"
+#include "mozilla/dom/AutoSuppressEventHandlingAndSuspend.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BrowserBridgeHost.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
@@ -86,6 +90,7 @@
 #include "mozilla/hal_sandbox/PHalChild.h"
 #include "mozilla/intl/LocaleService.h"
 #include "mozilla/ipc/BackgroundChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/FileDescriptorSetChild.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
@@ -1142,15 +1147,6 @@
   // we're going to need to return from this function, So we spin a nested event
   // loop until they get back to us.
 
-  // Prevent the docshell from becoming active while the nested event loop is
-  // spinning.
-  newChild->AddPendingDocShellBlocker();
-  auto removePendingDocShellBlocker = MakeScopeExit([&] {
-    if (newChild) {
-      newChild->RemovePendingDocShellBlocker();
-    }
-  });
-
   {
     // Suppress event handling for all contexts in our BrowsingContextGroup so
     // that event handlers cannot target our new window while it's still being
@@ -1643,7 +1639,7 @@
       CrashReporter::Annotation::ContentSandboxCapabilities,
       static_cast<int>(SandboxInfo::Get().AsInteger()));
 #  endif /* XP_LINUX && !OS_ANDROID */
-#endif   /* MOZ_SANDBOX */
+#endif /* MOZ_SANDBOX */
 
   return IPC_OK();
 }
@@ -1755,7 +1751,8 @@
   return IPC_OK();
 }
 
-void ContentChild::GetAvailableDictionaries(nsTArray<nsString>& aDictionaries) {
+void ContentChild::GetAvailableDictionaries(
+    nsTArray<nsCString>& aDictionaries) {
   aDictionaries = mAvailableDictionaries.Clone();
 }
 
@@ -2162,7 +2159,7 @@
   CrashReporterClient::DestroySingleton();
 
   XRE_ShutdownChildProcess();
-#endif    // NS_FREE_PERMANENT_DATA
+#endif  // NS_FREE_PERMANENT_DATA
 }
 
 void ContentChild::ProcessingError(Result aCode, const char* aReason) {
@@ -2392,7 +2389,7 @@
 }
 
 mozilla::ipc::IPCResult ContentChild::RecvUpdateDictionaryList(
-    nsTArray<nsString>&& aDictionaries) {
+    nsTArray<nsCString>&& aDictionaries) {
   mAvailableDictionaries = std::move(aDictionaries);
   mozInlineSpellChecker::UpdateCanEnableInlineSpellChecking();
   return IPC_OK();
@@ -3752,7 +3749,8 @@
 }
 
 mozilla::ipc::IPCResult ContentChild::RecvRaiseWindow(
-    const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType) {
+    const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType,
+    uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(BrowsingContext::GetLog(), LogLevel::Debug,
             ("ChildIPC: Trying to send a message to dead or detached context"));
@@ -3769,7 +3767,7 @@
 
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm) {
-    fm->RaiseWindow(window, aCallerType);
+    fm->RaiseWindow(window, aCallerType, aActionId);
   }
   return IPC_OK();
 }
@@ -3829,7 +3827,7 @@
 }
 
 mozilla::ipc::IPCResult ContentChild::RecvSetActiveBrowsingContext(
-    const MaybeDiscarded<BrowsingContext>& aContext) {
+    const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(BrowsingContext::GetLog(), LogLevel::Debug,
             ("ChildIPC: Trying to send a message to dead or detached context"));
@@ -3856,7 +3854,7 @@
 }
 
 mozilla::ipc::IPCResult ContentChild::RecvUnsetActiveBrowsingContext(
-    const MaybeDiscarded<BrowsingContext>& aContext) {
+    const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(BrowsingContext::GetLog(), LogLevel::Debug,
             ("ChildIPC: Trying to send a message to dead or detached context"));
@@ -3910,7 +3908,7 @@
     const MaybeDiscarded<BrowsingContext>& aFocusedBrowsingContext,
     const MaybeDiscarded<BrowsingContext>& aBrowsingContextToClear,
     const MaybeDiscarded<BrowsingContext>& aAncestorBrowsingContextToFocus,
-    bool aIsLeavingDocument, bool aAdjustWidget) {
+    bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId) {
   if (aFocusedBrowsingContext.IsNullOrDiscarded()) {
     MOZ_LOG(BrowsingContext::GetLog(), LogLevel::Debug,
             ("ChildIPC: Trying to send a message to dead or detached context"));
@@ -3927,7 +3925,7 @@
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm) {
     fm->BlurFromOtherProcess(aFocusedBrowsingContext.get(), toClear, toFocus,
-                             aIsLeavingDocument, aAdjustWidget);
+                             aIsLeavingDocument, aAdjustWidget, aActionId);
   }
   return IPC_OK();
 }
@@ -3948,6 +3946,16 @@
   }
   return IPC_OK();
 }
+
+mozilla::ipc::IPCResult ContentChild::RecvReviseActiveBrowsingContext(
+    const MaybeDiscarded<BrowsingContext>& aActiveBrowsingContext,
+    uint64_t aActionId) {
+  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm && !aActiveBrowsingContext.IsNullOrDiscarded()) {
+    fm->ReviseActiveBrowsingContext(aActiveBrowsingContext.get(), aActionId);
+  }
+  return IPC_OK();
+}
 
 mozilla::ipc::IPCResult ContentChild::RecvMaybeExitFullscreen(
     const MaybeDiscarded<BrowsingContext>& aContext) {
diff -Nru firefox-84.0.2+build1/dom/ipc/ContentChild.h firefox-85.0+build1/dom/ipc/ContentChild.h
--- firefox-84.0.2+build1/dom/ipc/ContentChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ContentChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,14 +8,13 @@
 #define mozilla_dom_ContentChild_h
 
 #include "mozilla/Atomics.h"
-#include "mozilla/dom/MediaControlKeySource.h"
+#include "mozilla/dom/BlobImpl.h"
+#include "mozilla/dom/GetFilesHelper.h"
 #include "mozilla/dom/PContentChild.h"
 #include "mozilla/dom/ProcessActor.h"
 #include "mozilla/dom/RemoteType.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/widget/ThemeChangeKind.h"
-#include "mozilla/LookAndFeel.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "nsClassHashtable.h"
@@ -46,10 +45,19 @@
 class ChildProfilerController;
 class BenchmarkStorageChild;
 
+namespace ipc {
+class PChildToParentStreamChild;
+class PFileDescriptorSetChild;
+}  // namespace ipc
+
 namespace loader {
 class PScriptCacheChild;
 }
 
+namespace widget {
+enum class ThemeChangeKind : uint8_t;
+}
+
 using mozilla::loader::PScriptCacheChild;
 
 #if !defined(XP_WIN)
@@ -71,8 +79,8 @@
 class ConsoleListener;
 class ClonedMessageData;
 class BrowserChild;
-class GetFilesHelperChild;
 class TabContext;
+enum class CallerType : uint32_t;
 
 class ContentChild final : public PContentChild,
                            public nsIDOMProcessChild,
@@ -353,7 +361,7 @@
   mozilla::ipc::IPCResult RecvGeolocationError(const uint16_t& errorCode);
 
   mozilla::ipc::IPCResult RecvUpdateDictionaryList(
-      nsTArray<nsString>&& aDictionaries);
+      nsTArray<nsCString>&& aDictionaries);
 
   mozilla::ipc::IPCResult RecvUpdateFontList(
       nsTArray<SystemFontListEntry>&& aFontList);
@@ -496,7 +504,7 @@
 
   FORWARD_SHMEM_ALLOCATOR_TO(PContentChild)
 
-  void GetAvailableDictionaries(nsTArray<nsString>& aDictionaries);
+  void GetAvailableDictionaries(nsTArray<nsCString>& aDictionaries);
 
   PWebrtcGlobalChild* AllocPWebrtcGlobalChild();
 
@@ -709,7 +717,8 @@
   mozilla::ipc::IPCResult RecvWindowBlur(
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvRaiseWindow(
-      const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType);
+      const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType,
+      uint64_t aActionId);
   mozilla::ipc::IPCResult RecvAdjustWindowFocus(
       const MaybeDiscarded<BrowsingContext>& aContext, bool aCheckPermission,
       bool aIsVisible);
@@ -718,11 +727,11 @@
   mozilla::ipc::IPCResult RecvSetFocusedBrowsingContext(
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvSetActiveBrowsingContext(
-      const MaybeDiscarded<BrowsingContext>& aContext);
+      const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvAbortOrientationPendingPromises(
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvUnsetActiveBrowsingContext(
-      const MaybeDiscarded<BrowsingContext>& aContext);
+      const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvSetFocusedElement(
       const MaybeDiscarded<BrowsingContext>& aContext, bool aNeedsFocus);
   mozilla::ipc::IPCResult RecvFinalizeFocusOuter(
@@ -732,10 +741,13 @@
       const MaybeDiscarded<BrowsingContext>& aFocusedBrowsingContext,
       const MaybeDiscarded<BrowsingContext>& aBrowsingContextToClear,
       const MaybeDiscarded<BrowsingContext>& aAncestorBrowsingContextToFocus,
-      bool aIsLeavingDocument, bool aAdjustWidget);
+      bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvSetupFocusedAndActive(
       const MaybeDiscarded<BrowsingContext>& aFocusedBrowsingContext,
       const MaybeDiscarded<BrowsingContext>& aActiveBrowsingContext);
+  mozilla::ipc::IPCResult RecvReviseActiveBrowsingContext(
+      const MaybeDiscarded<BrowsingContext>& aActiveBrowsingContext,
+      uint64_t aActionId);
   mozilla::ipc::IPCResult RecvMaybeExitFullscreen(
       const MaybeDiscarded<BrowsingContext>& aContext);
 
@@ -838,7 +850,7 @@
 
   nsTHashtable<nsPtrHashKey<nsIObserver>> mIdleObservers;
 
-  nsTArray<nsString> mAvailableDictionaries;
+  nsTArray<nsCString> mAvailableDictionaries;
 
   // Temporary storage for a list of available fonts, passed from the
   // parent process and used to initialize gfx in the child. Currently used
diff -Nru firefox-84.0.2+build1/dom/ipc/ContentParent.cpp firefox-85.0+build1/dom/ipc/ContentParent.cpp
--- firefox-84.0.2+build1/dom/ipc/ContentParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ContentParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,15 +15,14 @@
 
 #include "chrome/common/process_watcher.h"
 #include "mozilla/Result.h"
+#include "mozilla/XREAppData.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIBrowserDOMWindow.h"
 
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/PDocAccessible.h"
 #endif
 #include "GeckoProfiler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "GMPServiceParent.h"
 #include "HandlerServiceParent.h"
 #include "IHistory.h"
@@ -137,6 +136,7 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/CrashReporterHost.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/FileDescriptorUtils.h"
 #include "mozilla/ipc/IPCStreamAlloc.h"
@@ -344,6 +344,10 @@
 using mozilla::loader::PScriptCacheParent;
 using mozilla::Telemetry::ProcessID;
 
+extern mozilla::LazyLogModule gFocusLog;
+
+#define LOGFOCUS(args) MOZ_LOG(gFocusLog, mozilla::LogLevel::Debug, args)
+
 // XXX Workaround for bug 986973 to maintain the existing broken semantics
 template <>
 struct nsIConsoleService::COMTypeInfo<nsConsoleService, void> {
@@ -660,6 +664,10 @@
     return;
   }
 
+  // From this point on, NS_WARNING, NS_ASSERTION, etc. should print out the
+  // PID along with the warning.
+  nsDebugImpl::SetMultiprocessMode("Parent");
+
   // Note: This reporter measures all ContentParents.
   RegisterStrongMemoryReporter(new ContentParentsMemoryReporter());
 
@@ -734,10 +742,14 @@
                           WITH_COOP_COEP_REMOTE_TYPE_PREFIX);
 }
 
-bool IsPriviligedMozillaRemoteType(const nsACString& aContentProcessType) {
+bool IsPrivilegedMozillaRemoteType(const nsACString& aContentProcessType) {
   return aContentProcessType == PRIVILEGEDMOZILLA_REMOTE_TYPE;
 }
 
+bool IsExtensionRemoteType(const nsACString& aContentProcessType) {
+  return aContentProcessType == EXTENSION_REMOTE_TYPE;
+}
+
 /*static*/
 uint32_t ContentParent::GetMaxProcessCount(
     const nsACString& aContentProcessType) {
@@ -910,9 +922,7 @@
       if (profiler_thread_is_being_profiled()) {
         nsPrintfCString marker("Reused process %u",
                                (unsigned int)retval->ChildID());
-        TimeStamp now = TimeStamp::Now();
-        PROFILER_ADD_MARKER_WITH_PAYLOAD("Process", DOM, TextMarkerPayload,
-                                         (marker, now, now));
+        PROFILER_MARKER_TEXT("Process", DOM, {}, marker);
       }
 #endif
       MOZ_LOG(ContentParent::GetLog(), LogLevel::Debug,
@@ -951,9 +961,7 @@
     if (profiler_thread_is_being_profiled()) {
       nsPrintfCString marker("Recycled process %u (%p)",
                              (unsigned int)recycled->ChildID(), recycled.get());
-      TimeStamp now = TimeStamp::Now();
-      PROFILER_ADD_MARKER_WITH_PAYLOAD("Process", DOM, TextMarkerPayload,
-                                       (marker, now, now));
+      PROFILER_MARKER_TEXT("Process", DOM, {}, marker);
     }
 #endif
     MOZ_LOG(ContentParent::GetLog(), LogLevel::Debug,
@@ -976,9 +984,7 @@
     if (profiler_thread_is_being_profiled()) {
       nsPrintfCString marker("Assigned preallocated process %u",
                              (unsigned int)preallocated->ChildID());
-      TimeStamp now = TimeStamp::Now();
-      PROFILER_ADD_MARKER_WITH_PAYLOAD("Process", DOM, TextMarkerPayload,
-                                       (marker, now, now));
+      PROFILER_MARKER_TEXT("Process", DOM, {}, marker);
     }
 #endif
     MOZ_LOG(ContentParent::GetLog(), LogLevel::Debug,
@@ -2415,9 +2421,10 @@
     nsPrintfCString marker("Process start%s for %u",
                            mIsAPreallocBlocker ? " (immediate)" : "",
                            (unsigned int)ChildID());
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        mIsAPreallocBlocker ? "Process Immediate Launch" : "Process Launch",
-        DOM, TextMarkerPayload, (marker, mLaunchTS, launchResumeTS));
+    PROFILER_MARKER_TEXT(
+        mIsAPreallocBlocker ? ProfilerString8View("Process Immediate Launch")
+                            : ProfilerString8View("Process Launch"),
+        DOM, MarkerTiming::Interval(mLaunchTS, launchResumeTS), marker);
   }
 #endif
 
@@ -2573,10 +2580,6 @@
 
   mMessageManager = nsFrameMessageManager::NewProcessMessageManager(true);
 
-  // From this point on, NS_WARNING, NS_ASSERTION, etc. should print out the
-  // PID along with the warning.
-  nsDebugImpl::SetMultiprocessMode("Parent");
-
 #if defined(XP_WIN)
   if (XRE_IsParentProcess()) {
     audio::AudioNotificationSender::Init();
@@ -3664,6 +3667,19 @@
     return IPC_OK();
   }
 
+  if (NS_WARN_IF(cp->GetRemoteType() == GetRemoteType())) {
+    // Wanted to switch to a target browsing context that's already local again.
+    // See bug 1676996 for how this can happen.
+    //
+    // Dropping the switch on the floor seems fine for this case, though we
+    // could also try to clone the local document.
+    //
+    // If the remote type matches & it's in the same group (which was confirmed
+    // by CloneIsLegal), it must be the exact same process.
+    MOZ_DIAGNOSTIC_ASSERT(cp == this);
+    return IPC_OK();
+  }
+
   target
       ->ChangeRemoteness(cp->GetRemoteType(), /* aLoadID = */ 0,
                          /* aReplaceBC = */ false, /* aSpecificGroupId = */ 0)
@@ -4306,23 +4322,11 @@
   return IPC_OK();
 }
 
-bool ContentParent::HasNotificationPermission(
-    const IPC::Principal& aPrincipal) {
-  return true;
-}
-
 mozilla::ipc::IPCResult ContentParent::RecvShowAlert(
     nsIAlertNotification* aAlert) {
   if (!aAlert) {
     return IPC_FAIL_NO_REASON(this);
   }
-  nsCOMPtr<nsIPrincipal> principal;
-  nsresult rv = aAlert->GetPrincipal(getter_AddRefs(principal));
-  if (NS_WARN_IF(NS_FAILED(rv)) ||
-      !HasNotificationPermission(IPC::Principal(principal))) {
-    return IPC_OK();
-  }
-
   nsCOMPtr<nsIAlertsService> sysAlerts(components::Alerts::Service());
   if (sysAlerts) {
     sysAlerts->ShowAlert(aAlert, this);
@@ -4330,15 +4334,10 @@
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult ContentParent::RecvCloseAlert(
-    const nsString& aName, const IPC::Principal& aPrincipal) {
-  if (!HasNotificationPermission(aPrincipal)) {
-    return IPC_OK();
-  }
-
+mozilla::ipc::IPCResult ContentParent::RecvCloseAlert(const nsString& aName) {
   nsCOMPtr<nsIAlertsService> sysAlerts(components::Alerts::Service());
   if (sysAlerts) {
-    sysAlerts->CloseAlert(aName, aPrincipal);
+    sysAlerts->CloseAlert(aName);
   }
 
   return IPC_OK();
@@ -4346,17 +4345,13 @@
 
 mozilla::ipc::IPCResult ContentParent::RecvDisableNotifications(
     const IPC::Principal& aPrincipal) {
-  if (HasNotificationPermission(aPrincipal)) {
-    Unused << Notification::RemovePermission(aPrincipal);
-  }
+  Unused << Notification::RemovePermission(aPrincipal);
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvOpenNotificationSettings(
     const IPC::Principal& aPrincipal) {
-  if (HasNotificationPermission(aPrincipal)) {
-    Unused << Notification::OpenSettings(aPrincipal);
-  }
+  Unused << Notification::OpenSettings(aPrincipal);
   return IPC_OK();
 }
 
@@ -4436,7 +4431,7 @@
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvAddGeolocationListener(
-    const IPC::Principal& aPrincipal, const bool& aHighAccuracy) {
+    const bool& aHighAccuracy) {
   // To ensure no geolocation updates are skipped, we always force the
   // creation of a new listener.
   RecvRemoveGeolocationListener();
@@ -4643,8 +4638,7 @@
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvCopyFavicon(
-    nsIURI* aOldURI, nsIURI* aNewURI, const IPC::Principal& aLoadingPrincipal,
-    const bool& aInPrivateBrowsing) {
+    nsIURI* aOldURI, nsIURI* aNewURI, const bool& aInPrivateBrowsing) {
   if (!aOldURI) {
     return IPC_FAIL(this, "aOldURI should not be null");
   }
@@ -4652,8 +4646,7 @@
     return IPC_FAIL(this, "aNewURI should not be null");
   }
 
-  nsDocShell::CopyFavicon(aOldURI, aNewURI, aLoadingPrincipal,
-                          aInPrivateBrowsing);
+  nsDocShell::CopyFavicon(aOldURI, aNewURI, aInPrivateBrowsing);
   return IPC_OK();
 }
 
@@ -4832,7 +4825,7 @@
   RefPtr<mozSpellChecker> spellChecker(mozSpellChecker::Create());
   MOZ_ASSERT(spellChecker, "No spell checker?");
 
-  nsTArray<nsString> dictionaries;
+  nsTArray<nsCString> dictionaries;
   spellChecker->GetDictionaryList(&dictionaries);
 
   for (auto* cp : AllProcesses(eLive)) {
@@ -6592,19 +6585,21 @@
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvRaiseWindow(
-    const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType) {
+    const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType,
+    uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(
         BrowsingContext::GetLog(), LogLevel::Debug,
         ("ParentIPC: Trying to send a message to dead or detached context"));
     return IPC_OK();
   }
+
   CanonicalBrowsingContext* context = aContext.get_canonical();
 
   ContentProcessManager* cpm = ContentProcessManager::GetSingleton();
   ContentParent* cp =
       cpm->GetContentProcessById(ContentParentId(context->OwnerProcessId()));
-  Unused << cp->SendRaiseWindow(context, aCallerType);
+  Unused << cp->SendRaiseWindow(context, aCallerType, aActionId);
   return IPC_OK();
 }
 
@@ -6673,7 +6668,7 @@
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvSetActiveBrowsingContext(
-    const MaybeDiscarded<BrowsingContext>& aContext) {
+    const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(
         BrowsingContext::GetLog(), LogLevel::Debug,
@@ -6683,19 +6678,29 @@
   CanonicalBrowsingContext* context = aContext.get_canonical();
 
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
-  if (fm) {
-    fm->SetActiveBrowsingContextInChrome(context);
+  if (!fm) {
+    return IPC_OK();
+  }
+
+  if (!fm->SetActiveBrowsingContextInChrome(context, aActionId)) {
+    LOGFOCUS(
+        ("Ignoring out-of-sequence attempt [%p] to set active browsing context "
+         "in parent.",
+         context));
+    Unused << SendReviseActiveBrowsingContext(
+        fm->GetActiveBrowsingContextInChrome(), aActionId);
+    return IPC_OK();
   }
 
   context->Group()->EachOtherParent(this, [&](ContentParent* aParent) {
-    Unused << aParent->SendSetActiveBrowsingContext(context);
+    Unused << aParent->SendSetActiveBrowsingContext(context, aActionId);
   });
 
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult ContentParent::RecvUnsetActiveBrowsingContext(
-    const MaybeDiscarded<BrowsingContext>& aContext) {
+    const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId) {
   if (aContext.IsNullOrDiscarded()) {
     MOZ_LOG(
         BrowsingContext::GetLog(), LogLevel::Debug,
@@ -6705,14 +6710,22 @@
   CanonicalBrowsingContext* context = aContext.get_canonical();
 
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
-  if (fm) {
-    if (context == fm->GetActiveBrowsingContextInChrome()) {
-      fm->SetActiveBrowsingContextInChrome(nullptr);
-    }
+  if (!fm) {
+    return IPC_OK();
+  }
+
+  if (!fm->SetActiveBrowsingContextInChrome(nullptr, aActionId)) {
+    LOGFOCUS(
+        ("Ignoring out-of-sequence attempt to unset active browsing context in "
+         "parent [%p].",
+         context));
+    Unused << SendReviseActiveBrowsingContext(
+        fm->GetActiveBrowsingContextInChrome(), aActionId);
+    return IPC_OK();
   }
 
   context->Group()->EachOtherParent(this, [&](ContentParent* aParent) {
-    Unused << aParent->SendUnsetActiveBrowsingContext(context);
+    Unused << aParent->SendUnsetActiveBrowsingContext(context, aActionId);
   });
 
   return IPC_OK();
@@ -6757,13 +6770,22 @@
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult ContentParent::RecvInsertNewFocusActionId(
+    uint64_t aActionId) {
+  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  if (fm) {
+    fm->InsertNewFocusActionId(aActionId);
+  }
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult ContentParent::RecvBlurToParent(
     const MaybeDiscarded<BrowsingContext>& aFocusedBrowsingContext,
     const MaybeDiscarded<BrowsingContext>& aBrowsingContextToClear,
     const MaybeDiscarded<BrowsingContext>& aAncestorBrowsingContextToFocus,
     bool aIsLeavingDocument, bool aAdjustWidget,
     bool aBrowsingContextToClearHandled,
-    bool aAncestorBrowsingContextToFocusHandled) {
+    bool aAncestorBrowsingContextToFocusHandled, uint64_t aActionId) {
   if (aFocusedBrowsingContext.IsNullOrDiscarded()) {
     MOZ_LOG(
         BrowsingContext::GetLog(), LogLevel::Debug,
@@ -6804,9 +6826,10 @@
 
   ContentParent* cp = cpm->GetContentProcessById(
       ContentParentId(focusedBrowsingContext->OwnerProcessId()));
-  Unused << cp->SendBlurToChild(
-      aFocusedBrowsingContext, aBrowsingContextToClear,
-      aAncestorBrowsingContextToFocus, aIsLeavingDocument, aAdjustWidget);
+  Unused << cp->SendBlurToChild(aFocusedBrowsingContext,
+                                aBrowsingContextToClear,
+                                aAncestorBrowsingContextToFocus,
+                                aIsLeavingDocument, aAdjustWidget, aActionId);
   return IPC_OK();
 }
 
@@ -6988,10 +7011,12 @@
 
 mozilla::ipc::IPCResult ContentParent::RecvHistoryGo(
     const MaybeDiscarded<BrowsingContext>& aContext, int32_t aOffset,
-    uint64_t aHistoryEpoch, HistoryGoResolver&& aResolveRequestedIndex) {
+    uint64_t aHistoryEpoch, bool aRequireUserInteraction,
+    HistoryGoResolver&& aResolveRequestedIndex) {
   if (!aContext.IsDiscarded()) {
-    aContext.get_canonical()->HistoryGo(aOffset, aHistoryEpoch, Some(ChildID()),
-                                        std::move(aResolveRequestedIndex));
+    aContext.get_canonical()->HistoryGo(
+        aOffset, aHistoryEpoch, aRequireUserInteraction, Some(ChildID()),
+        std::move(aResolveRequestedIndex));
   }
   return IPC_OK();
 }
diff -Nru firefox-84.0.2+build1/dom/ipc/ContentParent.h firefox-85.0+build1/dom/ipc/ContentParent.h
--- firefox-84.0.2+build1/dom/ipc/ContentParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ContentParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/PContentParent.h"
 #include "mozilla/dom/ipc/IdType.h"
+#include "mozilla/dom/MessageManagerCallback.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/RemoteBrowser.h"
 #include "mozilla/dom/RemoteType.h"
@@ -29,12 +30,11 @@
 #include "mozilla/MemoryReportingProcess.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Variant.h"
 #include "mozilla/UniquePtr.h"
 
+#include "nsClassHashtable.h"
 #include "nsDataHashtable.h"
 #include "nsPluginTags.h"
-#include "nsFrameMessageManager.h"
 #include "nsHashKeys.h"
 #include "nsIAsyncShutdown.h"
 #include "nsIDOMProcessParent.h"
@@ -659,7 +659,8 @@
   mozilla::ipc::IPCResult RecvWindowBlur(
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvRaiseWindow(
-      const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType);
+      const MaybeDiscarded<BrowsingContext>& aContext, CallerType aCallerType,
+      uint64_t aActionId);
   mozilla::ipc::IPCResult RecvAdjustWindowFocus(
       const MaybeDiscarded<BrowsingContext>& aContext, bool aCheckPermission,
       bool aIsVisible);
@@ -668,21 +669,22 @@
   mozilla::ipc::IPCResult RecvSetFocusedBrowsingContext(
       const MaybeDiscarded<BrowsingContext>& aContext);
   mozilla::ipc::IPCResult RecvSetActiveBrowsingContext(
-      const MaybeDiscarded<BrowsingContext>& aContext);
+      const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvUnsetActiveBrowsingContext(
-      const MaybeDiscarded<BrowsingContext>& aContext);
+      const MaybeDiscarded<BrowsingContext>& aContext, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvSetFocusedElement(
       const MaybeDiscarded<BrowsingContext>& aContext, bool aNeedsFocus);
   mozilla::ipc::IPCResult RecvFinalizeFocusOuter(
       const MaybeDiscarded<BrowsingContext>& aContext, bool aCanFocus,
       CallerType aCallerType);
+  mozilla::ipc::IPCResult RecvInsertNewFocusActionId(uint64_t aActionId);
   mozilla::ipc::IPCResult RecvBlurToParent(
       const MaybeDiscarded<BrowsingContext>& aFocusedBrowsingContext,
       const MaybeDiscarded<BrowsingContext>& aBrowsingContextToClear,
       const MaybeDiscarded<BrowsingContext>& aAncestorBrowsingContextToFocus,
       bool aIsLeavingDocument, bool aAdjustWidget,
       bool aBrowsingContextToClearHandled,
-      bool aAncestorBrowsingContextToFocusHandled);
+      bool aAncestorBrowsingContextToFocusHandled, uint64_t aActionId);
   mozilla::ipc::IPCResult RecvMaybeExitFullscreen(
       const MaybeDiscarded<BrowsingContext>& aContext);
 
@@ -1047,12 +1049,9 @@
 
   mozilla::ipc::IPCResult RecvSetURITitle(nsIURI* uri, const nsString& title);
 
-  bool HasNotificationPermission(const IPC::Principal& aPrincipal);
-
   mozilla::ipc::IPCResult RecvShowAlert(nsIAlertNotification* aAlert);
 
-  mozilla::ipc::IPCResult RecvCloseAlert(const nsString& aName,
-                                         const IPC::Principal& aPrincipal);
+  mozilla::ipc::IPCResult RecvCloseAlert(const nsString& aName);
 
   mozilla::ipc::IPCResult RecvDisableNotifications(
       const IPC::Principal& aPrincipal);
@@ -1079,8 +1078,7 @@
   // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we don't have MOZ_CAN_RUN_SCRIPT bits
   // in IPC code yet.
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  mozilla::ipc::IPCResult RecvAddGeolocationListener(
-      const IPC::Principal& aPrincipal, const bool& aHighAccuracy);
+  mozilla::ipc::IPCResult RecvAddGeolocationListener(const bool& aHighAccuracy);
   mozilla::ipc::IPCResult RecvRemoveGeolocationListener();
 
   // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we don't have MOZ_CAN_RUN_SCRIPT bits
@@ -1135,9 +1133,8 @@
 
   mozilla::ipc::IPCResult RecvDeviceReset();
 
-  mozilla::ipc::IPCResult RecvCopyFavicon(
-      nsIURI* aOldURI, nsIURI* aNewURI, const IPC::Principal& aLoadingPrincipal,
-      const bool& aInPrivateBrowsing);
+  mozilla::ipc::IPCResult RecvCopyFavicon(nsIURI* aOldURI, nsIURI* aNewURI,
+                                          const bool& aInPrivateBrowsing);
 
   virtual void ProcessingError(Result aCode, const char* aMsgName) override;
 
@@ -1341,7 +1338,8 @@
 
   mozilla::ipc::IPCResult RecvHistoryGo(
       const MaybeDiscarded<BrowsingContext>& aContext, int32_t aOffset,
-      uint64_t aHistoryEpoch, HistoryGoResolver&& aResolveRequestedIndex);
+      uint64_t aHistoryEpoch, bool aRequireUserInteraction,
+      HistoryGoResolver&& aResolveRequestedIndex);
 
   mozilla::ipc::IPCResult RecvSessionHistoryUpdate(
       const MaybeDiscarded<BrowsingContext>& aContext, const int32_t& aIndex,
@@ -1610,7 +1608,9 @@
 
 bool IsWebCoopCoepRemoteType(const nsACString& aContentProcessType);
 
-bool IsPriviligedMozillaRemoteType(const nsACString& aContentProcessType);
+bool IsPrivilegedMozillaRemoteType(const nsACString& aContentProcessType);
+
+bool IsExtensionRemoteType(const nsACString& aContentProcessType);
 
 inline nsISupports* ToSupports(mozilla::dom::ContentParent* aContentParent) {
   return static_cast<nsIDOMProcessParent*>(aContentParent);
diff -Nru firefox-84.0.2+build1/dom/ipc/ContentProcessManager.cpp firefox-85.0+build1/dom/ipc/ContentProcessManager.cpp
--- firefox-84.0.2+build1/dom/ipc/ContentProcessManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ContentProcessManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "ContentParent.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
+#include "mozilla/dom/CanonicalBrowsingContext.h"
 
 #include "mozilla/StaticPtr.h"
 #include "mozilla/ClearOnShutdown.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/DocShellMessageUtils.cpp firefox-85.0+build1/dom/ipc/DocShellMessageUtils.cpp
--- firefox-84.0.2+build1/dom/ipc/DocShellMessageUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/DocShellMessageUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/DocShellMessageUtils.h"
 #include "mozilla/dom/DOMTypes.h"
+#include "mozilla/ipc/IPDLParamTraits.h"
 #include "nsSerializationHelper.h"
 
 namespace mozilla::ipc {
diff -Nru firefox-84.0.2+build1/dom/ipc/DocShellMessageUtils.h firefox-85.0+build1/dom/ipc/DocShellMessageUtils.h
--- firefox-84.0.2+build1/dom/ipc/DocShellMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/DocShellMessageUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_docshell_message_utils_h__
 #define mozilla_dom_docshell_message_utils_h__
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "nsCOMPtr.h"
 #include "nsDocShellLoadState.h"
 #include "nsIContentViewer.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/DOMTypes.ipdlh firefox-85.0+build1/dom/ipc/DOMTypes.ipdlh
--- firefox-84.0.2+build1/dom/ipc/DOMTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/DOMTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -5,8 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include "mozilla/GfxMessageUtils.h";
+include "mozilla/dom/CSPMessageUtils.h";
 include "mozilla/dom/DocShellMessageUtils.h";
+include "mozilla/dom/PermissionMessageUtils.h";
+include "mozilla/dom/PropertyBagUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
 include "mozilla/dom/TabMessageUtils.h";
+include "mozilla/ipc/URIUtils.h";
 include "mozilla/layers/LayersMessageUtils.h";
 
 include IPCBlob;
@@ -14,11 +19,10 @@
 include protocol PRemoteLazyInputStream;
 include ProtocolTypes;
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 using moveonly struct mozilla::SerializedStructuredCloneBuffer
-  from "ipc/IPCMessageUtils.h";
+  from "mozilla/ipc/SerializedStructuredCloneBuffer.h";
 
 using class mozilla::dom::LoadingSessionHistoryInfo
   from "mozilla/dom/SessionHistoryEntry.h";
@@ -35,13 +39,13 @@
 using ScrollbarPreference from "mozilla/ScrollbarPreferences.h";
 using hal::ScreenOrientation from "mozilla/HalScreenConfiguration.h";
 using mozilla::gfx::SurfaceFormat from "mozilla/gfx/Types.h";
-using refcounted class nsIPrincipal from "mozilla/dom/PermissionMessageUtils.h";
+using refcounted class nsIPrincipal from "nsIPrincipal.h";
 using mozilla::dom::MaybeDiscardedBrowsingContext from "mozilla/dom/BrowsingContext.h";
-using refcounted class nsIURI from "mozilla/ipc/URIUtils.h";
-using refcounted class nsIContentSecurityPolicy from "mozilla/dom/CSPMessageUtils.h";
+using refcounted class nsIURI from "nsIURI.h";
+using refcounted class nsIContentSecurityPolicy from "nsIContentSecurityPolicy.h";
 using refcounted class nsIInputStream from "mozilla/ipc/IPCStreamUtils.h";
-using refcounted class nsIReferrerInfo from "mozilla/dom/ReferrerInfoUtils.h";
-using refcounted class nsIVariant from "mozilla/dom/PropertyBagUtils.h";
+using refcounted class nsIReferrerInfo from "nsIReferrerInfo.h";
+using refcounted class nsIVariant from "nsIVariant.h";
 using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
 using refcounted class mozilla::dom::BrowsingContext from "mozilla/dom/BrowsingContext.h";
 
@@ -382,9 +386,8 @@
   // TODO(emilio): Margin preferences go here.
   ScrollbarPreference scrollbarPreference;
 
-  // TODO(emilio): I think we should really be able to figure out these from the
+  // TODO(emilio): I think we should really be able to figure this out from the
   // parent process too instead.
-  bool parentWindowIsActive;
   nsSizeMode sizeMode;
 };
 
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSActor.cpp firefox-85.0+build1/dom/ipc/jsactor/JSActor.cpp
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSActor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSActor.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/JSActor.h"
 #include "mozilla/dom/JSActorBinding.h"
 
+#include "chrome/common/ipc_channel.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/FunctionRef.h"
 #include "mozilla/dom/ClonedErrorHolder.h"
@@ -18,8 +19,10 @@
 #include "mozilla/dom/PWindowGlobal.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/RootedDictionary.h"
+#include "mozilla/dom/ipc/StructuredCloneData.h"
 #include "js/Promise.h"
 #include "xpcprivate.h"
+#include "nsFrameMessageManager.h"
 #include "nsICrashReporter.h"
 
 namespace mozilla::dom {
@@ -148,6 +151,18 @@
   mName = aName;
 }
 
+void JSActor::ThrowStateErrorForGetter(const char* aName,
+                                       ErrorResult& aRv) const {
+  if (mName.IsEmpty()) {
+    aRv.ThrowInvalidStateError(nsPrintfCString(
+        "Cannot access property '%s' before actor is initialized", aName));
+  } else {
+    aRv.ThrowInvalidStateError(nsPrintfCString(
+        "Cannot access property '%s' after actor '%s' has been destroyed",
+        aName, mName.get()));
+  }
+}
+
 static Maybe<ipc::StructuredCloneData> TryClone(JSContext* aCx,
                                                 JS::Handle<JS::Value> aValue) {
   Maybe<ipc::StructuredCloneData> data{std::in_place};
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSActor.h firefox-85.0+build1/dom/ipc/jsactor/JSActor.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSActor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSActor.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,9 +8,8 @@
 #define mozilla_dom_JSActor_h
 
 #include "js/TypeDecls.h"
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
@@ -20,8 +19,14 @@
 class nsQueryJSActor;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
+namespace ipc {
+class StructuredCloneData;
+}
+
 class JSActorManager;
 class JSActorMessageMeta;
 class QueryPromiseHandler;
@@ -82,6 +87,8 @@
 
   bool CanSend() const { return mCanSend; }
 
+  void ThrowStateErrorForGetter(const char* aName, ErrorResult& aRv) const;
+
   void StartDestroy();
   void AfterDestroy();
 
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSActorManager.cpp firefox-85.0+build1/dom/ipc/jsactor/JSActorManager.cpp
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSActorManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSActorManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/JSActorService.h"
 #include "mozilla/dom/PWindowGlobal.h"
 #include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ScopeExit.h"
 #include "mozJSComponentLoader.h"
 #include "jsapi.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSActorManager.h firefox-85.0+build1/dom/ipc/jsactor/JSActorManager.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSActorManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSActorManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,11 +9,12 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/dom/JSActor.h"
-#include "mozilla/ErrorResult.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace ipc {
 class IProtocol;
 }
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSActorService.h firefox-85.0+build1/dom/ipc/jsactor/JSActorService.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSActorService.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSActorService.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_JSActorService_h
 
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsRefPtrHashtable.h"
 #include "nsString.h"
@@ -17,9 +16,10 @@
 #include "nsIObserver.h"
 #include "nsIDOMEventListener.h"
 #include "mozilla/EventListenerManager.h"
-#include "mozilla/extensions/WebExtensionContentScript.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ProcessActorOptions;
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorParent.h firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorParent.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,16 +9,16 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/JSActor.h"
-#include "mozilla/extensions/WebExtensionContentScript.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIDOMProcessParent.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class JSProcessActorParent final : public JSActor {
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorProtocol.cpp firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorProtocol.cpp
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorProtocol.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorProtocol.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -147,13 +147,19 @@
   return false;
 }
 
-bool JSProcessActorProtocol::Matches(const nsACString& aRemoteType) {
+bool JSProcessActorProtocol::Matches(const nsACString& aRemoteType,
+                                     ErrorResult& aRv) {
   if (!mIncludeParent && aRemoteType.IsEmpty()) {
+    aRv.ThrowNotSupportedError(nsPrintfCString(
+        "Process protocol '%s' doesn't match the parent process", mName.get()));
     return false;
   }
 
   if (!mRemoteTypes.IsEmpty() &&
       !RemoteTypePrefixMatches(RemoteTypePrefix(aRemoteType))) {
+    aRv.ThrowNotSupportedError(nsPrintfCString(
+        "Process protocol '%s' doesn't support remote type '%s'", mName.get(),
+        PromiseFlatCString(aRemoteType).get()));
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorProtocol.h firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorProtocol.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSProcessActorProtocol.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSProcessActorProtocol.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,13 +9,14 @@
 
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsIObserver.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct ProcessActorOptions;
@@ -54,7 +55,7 @@
 
   void AddObservers();
   void RemoveObservers();
-  bool Matches(const nsACString& aRemoteType);
+  bool Matches(const nsACString& aRemoteType, ErrorResult& aRv);
 
  private:
   explicit JSProcessActorProtocol(const nsACString& aName) : mName(aName) {}
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorChild.cpp firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorChild.cpp
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -97,7 +97,7 @@
 
 Document* JSWindowActorChild::GetDocument(ErrorResult& aRv) {
   if (!mManager) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    ThrowStateErrorForGetter("document", aRv);
     return nullptr;
   }
 
@@ -107,7 +107,7 @@
 
 BrowsingContext* JSWindowActorChild::GetBrowsingContext(ErrorResult& aRv) {
   if (!mManager) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    ThrowStateErrorForGetter("browsingContext", aRv);
     return nullptr;
   }
 
@@ -115,17 +115,18 @@
 }
 
 nsIDocShell* JSWindowActorChild::GetDocShell(ErrorResult& aRv) {
-  if (BrowsingContext* bc = GetBrowsingContext(aRv)) {
-    return bc->GetDocShell();
+  if (!mManager) {
+    ThrowStateErrorForGetter("docShell", aRv);
+    return nullptr;
   }
 
-  return nullptr;
+  return mManager->BrowsingContext()->GetDocShell();
 }
 
 Nullable<WindowProxyHolder> JSWindowActorChild::GetContentWindow(
     ErrorResult& aRv) {
   if (!mManager) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    ThrowStateErrorForGetter("contentWindow", aRv);
     return nullptr;
   }
 
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorChild.h firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorChild.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorChild.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,24 +7,30 @@
 #ifndef mozilla_dom_JSWindowActorChild_h
 #define mozilla_dom_JSWindowActorChild_h
 
-#include "js/TypeDecls.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/JSActor.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
-#include "nsIDOMProcessChild.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+
+class nsIDocShell;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 template <typename>
 struct Nullable;
 
+class BrowsingContext;
 class Document;
-class WindowGlobalChild;
 class WindowProxyHolder;
 
 }  // namespace dom
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorParent.h firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorParent.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/JSActor.h"
@@ -17,6 +16,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class WindowGlobalParent;
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorProtocol.cpp firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorProtocol.cpp
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorProtocol.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorProtocol.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -339,31 +339,45 @@
 }
 
 bool JSWindowActorProtocol::Matches(BrowsingContext* aBrowsingContext,
-                                    nsIURI* aURI,
-                                    const nsACString& aRemoteType) {
+                                    nsIURI* aURI, const nsACString& aRemoteType,
+                                    ErrorResult& aRv) {
   MOZ_ASSERT(aBrowsingContext, "DocShell without a BrowsingContext!");
   MOZ_ASSERT(aURI, "Must have URI!");
 
   if (!mAllFrames && aBrowsingContext->GetParent()) {
+    aRv.ThrowNotSupportedError(nsPrintfCString(
+        "Window protocol '%s' doesn't match subframes", mName.get()));
     return false;
   }
 
   if (!mIncludeChrome && !aBrowsingContext->IsContent()) {
+    aRv.ThrowNotSupportedError(nsPrintfCString(
+        "Window protocol '%s' doesn't match chrome browsing contexts",
+        mName.get()));
     return false;
   }
 
   if (!mRemoteTypes.IsEmpty() &&
       !RemoteTypePrefixMatches(RemoteTypePrefix(aRemoteType))) {
+    aRv.ThrowNotSupportedError(
+        nsPrintfCString("Window protocol '%s' doesn't match remote type '%s'",
+                        mName.get(), PromiseFlatCString(aRemoteType).get()));
     return false;
   }
 
   if (!mMessageManagerGroups.IsEmpty() &&
       !MessageManagerGroupMatches(aBrowsingContext)) {
+    aRv.ThrowNotSupportedError(nsPrintfCString(
+        "Window protocol '%s' doesn't match message manager group",
+        mName.get()));
     return false;
   }
 
   if (extensions::MatchPatternSet* uriMatcher = GetURIMatcher()) {
     if (!uriMatcher->Matches(aURI)) {
+      aRv.ThrowNotSupportedError(nsPrintfCString(
+          "Window protocol '%s' doesn't match uri %s", mName.get(),
+          nsContentUtils::TruncatedURLForDisplay(aURI).get()));
       return false;
     }
   }
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorProtocol.h firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorProtocol.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/JSWindowActorProtocol.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/JSWindowActorProtocol.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,15 +9,16 @@
 
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/ErrorResult.h"
+#include "mozilla/extensions/MatchPattern.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsIObserver.h"
 #include "nsIDOMEventListener.h"
-#include "mozilla/extensions/WebExtensionContentScript.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct WindowActorOptions;
@@ -70,7 +71,7 @@
   void AddObservers();
   void RemoveObservers();
   bool Matches(BrowsingContext* aBrowsingContext, nsIURI* aURI,
-               const nsACString& aRemoteType);
+               const nsACString& aRemoteType, ErrorResult& aRv);
 
  private:
   explicit JSWindowActorProtocol(const nsACString& aName) : mName(aName) {}
diff -Nru firefox-84.0.2+build1/dom/ipc/jsactor/nsQueryActor.h firefox-85.0+build1/dom/ipc/jsactor/nsQueryActor.h
--- firefox-84.0.2+build1/dom/ipc/jsactor/nsQueryActor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/jsactor/nsQueryActor.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,9 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/WindowGlobalChild.h"
 
+class nsIDOMProcessChild;
+class nsIDOMProcessParent;
+
 // This type is used to get an XPCOM interface implemented by a JSActor from its
 // native manager.
 class MOZ_STACK_CLASS nsQueryJSActor final : public nsCOMPtr_helper {
diff -Nru firefox-84.0.2+build1/dom/ipc/MemoryReportTypes.ipdlh firefox-85.0+build1/dom/ipc/MemoryReportTypes.ipdlh
--- firefox-84.0.2+build1/dom/ipc/MemoryReportTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/MemoryReportTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -3,7 +3,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/. */
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/ipc/MMPrinter.cpp firefox-85.0+build1/dom/ipc/MMPrinter.cpp
--- firefox-84.0.2+build1/dom/ipc/MMPrinter.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/MMPrinter.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/ErrorResult.h"
 #include "nsFrameMessageManager.h"
+#include "prenv.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/ipc/PBrowserBridge.ipdl firefox-85.0+build1/dom/ipc/PBrowserBridge.ipdl
--- firefox-84.0.2+build1/dom/ipc/PBrowserBridge.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PBrowserBridge.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -12,10 +12,12 @@
 include DOMTypes;
 
 include "mozilla/LayoutMessageUtils.h";
+include "mozilla/dom/BindingIPCUtils.h";
+include "mozilla/dom/DocShellMessageUtils.h";
 include "mozilla/dom/TabMessageUtils.h";
 
 using mozilla::layers::LayersObserverEpoch from "mozilla/layers/LayersTypes.h";
-using mozilla::WidgetMouseEvent from "ipc/nsGUIEventIPC.h";
+using class mozilla::WidgetMouseEvent from "ipc/nsGUIEventIPC.h";
 using mozilla::a11y::IDispatchHolder from "mozilla/a11y/IPCTypes.h";
 using mozilla::dom::EffectsInfo from "mozilla/dom/EffectsInfo.h";
 using mozilla::ScrollAxis from "mozilla/PresShellForwards.h";
@@ -104,9 +106,9 @@
   /**
    * Sending an activate message moves focus to the iframe.
    */
-  async Activate();
+  async Activate(uint64_t aActionId);
 
-  async Deactivate(bool aWindowLowering);
+  async Deactivate(bool aWindowLowering, uint64_t aActionId);
 
   async SetIsUnderHiddenEmbedderElement(bool aIsUnderHiddenEmbedderElement);
 
diff -Nru firefox-84.0.2+build1/dom/ipc/PBrowser.ipdl firefox-85.0+build1/dom/ipc/PBrowser.ipdl
--- firefox-84.0.2+build1/dom/ipc/PBrowser.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PBrowser.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -32,11 +32,17 @@
 include PBackgroundSharedTypes;
 
 include "mozilla/AntiTrackingIPCUtils.h";
+include "mozilla/dom/BindingIPCUtils.h";
+include "mozilla/dom/CSPMessageUtils.h";
+include "mozilla/dom/DocShellMessageUtils.h";
+include "mozilla/dom/PermissionMessageUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
 include "mozilla/dom/TabMessageUtils.h";
 include "mozilla/GfxMessageUtils.h";
 include "mozilla/LayoutMessageUtils.h";
 include "mozilla/layers/LayersMessageUtils.h";
 include "mozilla/ipc/TransportSecurityInfoUtils.h";
+include "mozilla/ipc/URIUtils.h";
 
 using mozilla::gfx::Matrix4x4 from "mozilla/gfx/Matrix.h";
 using mozilla::gfx::MaybeMatrix4x4 from "mozilla/gfx/Matrix.h";
@@ -54,8 +60,8 @@
 using mozilla::layers::MaybeZoomConstraints from "mozilla/layers/ZoomConstraints.h";
 using mozilla::layers::GeckoContentController_TapType from "mozilla/layers/GeckoContentControllerTypes.h";
 using ScrollableLayerGuid::ViewID from "mozilla/layers/ScrollableLayerGuid.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
 using class mozilla::WidgetCompositionEvent from "ipc/nsGUIEventIPC.h";
 using struct mozilla::widget::IMENotification from "mozilla/widget/IMEData.h";
 using struct mozilla::widget::IMENotificationRequests from "mozilla/widget/IMEData.h";
@@ -86,9 +92,9 @@
 using mozilla::EventMessage from "mozilla/EventForwards.h";
 using nsEventStatus from "mozilla/EventForwards.h";
 using mozilla::Modifiers from "mozilla/EventForwards.h";
-using mozilla::widget::CandidateWindowPosition from "ipc/nsGUIEventIPC.h";
+using struct mozilla::widget::CandidateWindowPosition from "ipc/nsGUIEventIPC.h";
 using class mozilla::NativeEventData from "ipc/nsGUIEventIPC.h";
-using mozilla::FontRange from "ipc/nsGUIEventIPC.h";
+using struct mozilla::FontRange from "ipc/nsGUIEventIPC.h";
 using mozilla::a11y::IAccessibleHolder from "mozilla/a11y/IPCTypes.h";
 using mozilla::OriginAttributes from "mozilla/ipc/BackgroundUtils.h";
 using mozilla::dom::EffectsInfo from "mozilla/dom/EffectsInfo.h";
@@ -159,7 +165,11 @@
 {
   uint32_t sheetCount;
   uint32_t totalPageCount;
+  bool isEmpty;
+  // Whether there's a selection in the previewed page, including its subframes.
   bool hasSelection;
+  // Whether there's a selection in the previewed page, excluding its subframes.
+  bool hasSelfSelection;
 };
 
 /**
@@ -626,7 +636,7 @@
     /**
      * Parent informs the child to release all pointer capture.
      */
-    async ReleaseAllPointerCapture();
+    prio(input) async ReleaseAllPointerCapture();
 
 parent:
 
@@ -718,9 +728,9 @@
     /**
      * Sending an activate message moves focus to the child.
      */
-    async Activate();
+    async Activate(uint64_t aActionId);
 
-    async Deactivate();
+    async Deactivate(uint64_t aActionId);
 
     async ScrollbarPreferenceChanged(ScrollbarPreference pref);
 
@@ -748,8 +758,6 @@
 
     async DynamicToolbarOffsetChanged(ScreenIntCoord height);
 
-    async ParentActivated(bool aActivated);
-
     async SetKeyboardIndicators(UIStateChangeType showFocusRings);
 
     /**
@@ -775,12 +783,25 @@
     prio(input) async RealMouseMoveEvent(WidgetMouseEvent event,
                                          ScrollableLayerGuid aGuid,
                                          uint64_t aInputBlockId) compress;
-
     async NormalPriorityRealMouseMoveEvent(WidgetMouseEvent event,
                                            ScrollableLayerGuid aGuid,
                                            uint64_t aInputBlockId) compress;
 
     /**
+     * But don't compress mousemove events for tests since every event is
+     * important for the test since synthesizing various input events may
+     * be faster than what the user operates same things.  If you need to
+     * test the `compress`, send mouse move events with setting `isSyntehsized`
+     * of `aEvent` of `EventUtils#syntehsizeMouse*()`.
+     */
+    prio(input) async RealMouseMoveEventForTests(WidgetMouseEvent event,
+                                                 ScrollableLayerGuid aGuid,
+                                                 uint64_t aInputBlockId);
+    async NormalPriorityRealMouseMoveEventForTests(WidgetMouseEvent event,
+                                                   ScrollableLayerGuid aGuid,
+                                                   uint64_t aInputBlockId);
+
+    /**
      * Mouse move events with |reason == eSynthesized| are sent via a separate
      * message because they do not generate DOM 'mousemove' events, and the
      * 'compress' attribute on RealMouseMoveEvent() could result in a
@@ -885,16 +906,6 @@
     async Destroy();
 
     /**
-     * Update the child side docShell active (resource use) state.
-     *
-     * @param aIsActive
-     *        Whether to activate or deactivate the docshell.
-     * @param aPreserveLayers
-     *        Whether layer trees should be preserved for inactive docshells.
-     */
-    async SetDocShellIsActive(bool aIsActive);
-
-    /**
      * If aEnabled is true, tells the child to paint and upload layers to
      * the compositor. If aEnabled is false, the child stops painting and
      * clears the layers from the compositor.
diff -Nru firefox-84.0.2+build1/dom/ipc/PContent.ipdl firefox-85.0+build1/dom/ipc/PContent.ipdl
--- firefox-84.0.2+build1/dom/ipc/PContent.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PContent.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -69,6 +69,19 @@
 include protocol PSandboxTesting;
 #endif
 
+include "ipc/DataStorageIPCUtils.h";
+include "ipc/MediaControlIPC.h";
+include "mozilla/AntiTrackingIPCUtils.h";
+include "mozilla/GfxMessageUtils.h";
+include "mozilla/dom/BindingIPCUtils.h";
+include "mozilla/dom/CSPMessageUtils.h";
+include "mozilla/dom/DocShellMessageUtils.h";
+include "mozilla/dom/MediaSessionIPCUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
+include "mozilla/ipc/ByteBufUtils.h";
+include "mozilla/ipc/URIUtils.h";
+include "mozilla/PermissionDelegateIPCUtils.h";
+
 using refcounted class nsIDOMGeoPosition from "nsGeoPositionIPCSerialiser.h";
 using refcounted class nsIAlertNotification from "mozilla/AlertNotificationIPCSerializer.h";
 
@@ -106,20 +119,20 @@
 using mozilla::dom::MaybeDiscardedBrowsingContext from "mozilla/dom/BrowsingContext.h";
 using mozilla::dom::BrowsingContextTransaction from "mozilla/dom/BrowsingContext.h";
 using mozilla::dom::BrowsingContextInitializer from "mozilla/dom/BrowsingContext.h";
-using mozilla::dom::PermitUnloadResult from "mozilla/dom/DocShellMessageUtils.h";
+using mozilla::dom::PermitUnloadResult from "nsIContentViewer.h";
 using mozilla::dom::MaybeDiscardedWindowContext from "mozilla/dom/WindowContext.h";
 using mozilla::dom::WindowContextTransaction from "mozilla/dom/WindowContext.h";
 using base::SharedMemoryHandle from "base/shared_memory.h";
 using mozilla::fontlist::Pointer from "SharedFontList.h";
 using gfxSparseBitSet from "gfxFontUtils.h";
 using FontVisibility from "gfxFontEntry.h";
-using mozilla::dom::MediaControlAction from "ipc/MediaControlIPC.h";
-using mozilla::dom::MediaPlaybackState from "ipc/MediaControlIPC.h";
-using mozilla::dom::MediaAudibleState from "ipc/MediaControlIPC.h";
-using mozilla::dom::MaybeMediaMetadataBase from "mozilla/dom/MediaSessionIPCUtils.h";
-using mozilla::dom::MediaSessionAction from "mozilla/dom/MediaSessionIPCUtils.h";
-using mozilla::dom::MediaSessionPlaybackState from "mozilla/dom/MediaSessionIPCUtils.h";
-using mozilla::dom::PositionState from "mozilla/dom/MediaSessionIPCUtils.h";
+using mozilla::dom::MediaControlAction from "mozilla/dom/MediaControlKeySource.h";
+using mozilla::dom::MediaPlaybackState from "mozilla/dom/MediaPlaybackStatus.h";
+using mozilla::dom::MediaAudibleState from "mozilla/dom/MediaPlaybackStatus.h";
+using mozilla::dom::MediaMetadataBase from "mozilla/dom/MediaMetadata.h";
+using mozilla::dom::MediaSessionAction from "mozilla/dom/MediaSessionBinding.h";
+using mozilla::dom::MediaSessionPlaybackState from "mozilla/dom/MediaSessionBinding.h";
+using mozilla::dom::PositionState from "mozilla/dom/MediaSession.h";
 using refcounted class nsDocShellLoadState from "nsDocShellLoadState.h";
 using mozilla::dom::ServiceWorkerShutdownState::Progress from "mozilla/dom/ServiceWorkerShutdownState.h";
 using mozilla::ContentBlockingNotifier::StorageAccessPermissionGrantedReason from "mozilla/ContentBlockingNotifier.h";
@@ -127,10 +140,10 @@
 using mozilla::ContentBlocking::StorageAccessPromptChoices from "mozilla/ContentBlocking.h";
 using JSActorMessageKind from "mozilla/dom/JSActor.h";
 using JSActorMessageMeta from "mozilla/dom/PWindowGlobal.h";
-using mozilla::PermissionDelegateHandler::DelegatedPermissionList from "mozilla/PermissionDelegateIPCUtils.h";
+using mozilla::PermissionDelegateHandler::DelegatedPermissionList from "mozilla/PermissionDelegateHandler.h";
 using refcounted class nsILayoutHistoryState from "nsILayoutHistoryState.h";
 using class mozilla::dom::SessionHistoryInfo from "mozilla/dom/SessionHistoryEntry.h";
-using nsPoint from "mozilla/GfxMessageUtils.h";
+using struct nsPoint from "nsPoint.h";
 using struct mozilla::dom::LoadingSessionHistoryInfo from "mozilla/dom/SessionHistoryEntry.h";
 using mozilla::PDMFactory::MediaCodecsSupported from "PDMFactory.h";
 using mozilla::dom::PerformanceTimingData from "mozilla/dom/PerformanceTiming.h";
@@ -302,7 +315,7 @@
     int32_t captivePortalState;
     bool isLangRTL;
     bool haveBidiKeyboards;
-    nsString[] dictionaries;
+    nsCString[] dictionaries;
     ClipboardCapabilities clipboardCaps;
     DomainPolicyClone domainPolicy;
     nsIURI userContentSheetURL;
@@ -587,7 +600,7 @@
 
     async GeolocationError(uint16_t errorCode);
 
-    async UpdateDictionaryList(nsString[] dictionaries);
+    async UpdateDictionaryList(nsCString[] dictionaries);
 
     async UpdateFontList(SystemFontListEntry[] fontList);
 
@@ -1042,7 +1055,7 @@
 
     async ShowAlert(nsIAlertNotification alert);
 
-    async CloseAlert(nsString name, Principal principal);
+    async CloseAlert(nsString name);
 
     async DisableNotifications(Principal principal);
 
@@ -1099,7 +1112,7 @@
 
     async PHandlerService();
 
-    async AddGeolocationListener(Principal principal, bool highAccuracy);
+    async AddGeolocationListener(bool highAccuracy);
     async RemoveGeolocationListener();
     async SetGeolocationHigherAccuracy(bool enable);
 
@@ -1148,7 +1161,7 @@
 
     async DeviceReset();
 
-    async CopyFavicon(nsIURI oldURI, nsIURI newURI, Principal aLoadingPrincipal, bool isPrivate);
+    async CopyFavicon(nsIURI oldURI, nsIURI newURI, bool isPrivate);
 
     /**
      * Notifies the parent about a recording device is starting or shutdown.
@@ -1611,7 +1624,7 @@
      * metadata is being updated.
      */
     async NotifyUpdateMediaMetadata(MaybeDiscardedBrowsingContext aContext,
-                                    MaybeMediaMetadataBase aMetadata);
+                                    MediaMetadataBase? aMetadata);
 
     /**
      * This method is used to update media session's playback state whenever its
@@ -1681,7 +1694,7 @@
                         uint64_t aLoadID, nsID aChangeID, uint32_t aLoadType);
 
     async HistoryGo(MaybeDiscardedBrowsingContext aContext,
-                    int32_t aOffset, uint64_t aHistoryEpoch) returns(int32_t requestedIndex);
+                    int32_t aOffset, uint64_t aHistoryEpoch, bool aRequireUserInteraction) returns(int32_t requestedIndex);
 
     async BlobURLDataRequest(nsCString aBlobURL,
                              nsIPrincipal aTriggeringPrincipal,
@@ -1765,28 +1778,31 @@
     async WindowFocus(MaybeDiscardedBrowsingContext aContext,
                       CallerType aCallerType);
     async WindowBlur(MaybeDiscardedBrowsingContext aContext);
-    async RaiseWindow(MaybeDiscardedBrowsingContext aContext, CallerType aCallerType);
+    async RaiseWindow(MaybeDiscardedBrowsingContext aContext, CallerType aCallerType, uint64_t aActionId);
     async ClearFocus(MaybeDiscardedBrowsingContext aContext);
     async SetFocusedBrowsingContext(MaybeDiscardedBrowsingContext aContext);
-    async SetActiveBrowsingContext(MaybeDiscardedBrowsingContext aContext);
-    async UnsetActiveBrowsingContext(MaybeDiscardedBrowsingContext aContext);
+    async SetActiveBrowsingContext(MaybeDiscardedBrowsingContext aContext, uint64_t aActionId);
+    async UnsetActiveBrowsingContext(MaybeDiscardedBrowsingContext aContext, uint64_t aActionId);
     async SetFocusedElement(MaybeDiscardedBrowsingContext aContext, bool aNeedsFocus);
     async FinalizeFocusOuter(MaybeDiscardedBrowsingContext aContext, bool aCanFocus,
                              CallerType aCallerType);
 parent:
+    async InsertNewFocusActionId(uint64_t aActionId);
     async BlurToParent(MaybeDiscardedBrowsingContext aFocusedBrowsingContext,
                       MaybeDiscardedBrowsingContext aBrowsingContextToClear,
                       MaybeDiscardedBrowsingContext aAncestorBrowsingContextToFocus,
                       bool aIsLeavingDocument, bool aAdjustWidget,
                       bool aBrowsingContextToClearHandled,
-                      bool aAncestorBrowsingContextToFocusHandled);
+                      bool aAncestorBrowsingContextToFocusHandled, uint64_t aActionId);
 child:
     async BlurToChild(MaybeDiscardedBrowsingContext aFocusedBrowsingContext,
                       MaybeDiscardedBrowsingContext aBrowsingContextToClear,
                       MaybeDiscardedBrowsingContext aAncestorBrowsingContextToFocus,
-                      bool aIsLeavingDocument, bool aAdjustWidget);
+                      bool aIsLeavingDocument, bool aAdjustWidget, uint64_t aActionId);
     async SetupFocusedAndActive(MaybeDiscardedBrowsingContext aFocusedBrowsingContext,
                                 MaybeDiscardedBrowsingContext aActiveBrowsingContext);
+    async ReviseActiveBrowsingContext(MaybeDiscardedBrowsingContext aActiveBrowsingContext,
+                                      uint64_t aActionId);
 both:
     async MaybeExitFullscreen(MaybeDiscardedBrowsingContext aContext);
     async WindowPostMessage(MaybeDiscardedBrowsingContext aContext,
diff -Nru firefox-84.0.2+build1/dom/ipc/PFilePicker.ipdl firefox-85.0+build1/dom/ipc/PFilePicker.ipdl
--- firefox-84.0.2+build1/dom/ipc/PFilePicker.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PFilePicker.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,7 @@
 
 include IPCBlob;
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/ipc/PPluginWidget.ipdl firefox-85.0+build1/dom/ipc/PPluginWidget.ipdl
--- firefox-84.0.2+build1/dom/ipc/PPluginWidget.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PPluginWidget.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -4,6 +4,7 @@
 
 include protocol PBrowser;
 
+include "mozilla/dom/BindingIPCUtils.h";
 include "mozilla/GfxMessageUtils.h";
 
 using mozilla::dom::CallerType from "mozilla/dom/BindingDeclarations.h";
diff -Nru firefox-84.0.2+build1/dom/ipc/PreallocatedProcessManager.cpp firefox-85.0+build1/dom/ipc/PreallocatedProcessManager.cpp
--- firefox-84.0.2+build1/dom/ipc/PreallocatedProcessManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PreallocatedProcessManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,8 +5,10 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/PreallocatedProcessManager.h"
+
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ScriptSettings.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/PrefsTypes.ipdlh firefox-85.0+build1/dom/ipc/PrefsTypes.ipdlh
--- firefox-84.0.2+build1/dom/ipc/PrefsTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PrefsTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -3,7 +3,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/. */
 
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/ipc/ProcessActor.cpp firefox-85.0+build1/dom/ipc/ProcessActor.cpp
--- firefox-84.0.2+build1/dom/ipc/ProcessActor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ProcessActor.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -27,10 +27,11 @@
     return nullptr;
   }
 
-  if (!proto->Matches(GetRemoteType())) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
+  if (!proto->Matches(GetRemoteType(), aRv)) {
+    MOZ_ASSERT(aRv.Failed());
     return nullptr;
   }
+  MOZ_ASSERT(!aRv.Failed());
   return proto.forget();
 }
 
diff -Nru firefox-84.0.2+build1/dom/ipc/ProcessActor.h firefox-85.0+build1/dom/ipc/ProcessActor.h
--- firefox-84.0.2+build1/dom/ipc/ProcessActor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ProcessActor.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,19 +7,17 @@
 #ifndef mozilla_dom_ProcessActor_h
 #define mozilla_dom_ProcessActor_h
 
-#include "nsWrapperCache.h"
-#include "nsISupports.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
-#include "nsIURI.h"
-#include "nsRefPtrHashtable.h"
-#include "nsString.h"
-#include "mozilla/dom/JSActor.h"
 #include "mozilla/dom/JSActorManager.h"
+#include "nsStringFwd.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
+class JSActorProtocol;
+class JSActorService;
+
 // Common base class for Content{Parent, Child} and InProcess{Parent, Child}.
 class ProcessActor : public JSActorManager {
  protected:
diff -Nru firefox-84.0.2+build1/dom/ipc/ProcessHangMonitor.cpp firefox-85.0+build1/dom/ipc/ProcessHangMonitor.cpp
--- firefox-84.0.2+build1/dom/ipc/ProcessHangMonitor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ProcessHangMonitor.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,10 +15,12 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/CancelContentJSOptionsBinding.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowserParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/TaskFactory.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/plugins/PluginBridge.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/PURLClassifierLocal.ipdl firefox-85.0+build1/dom/ipc/PURLClassifierLocal.ipdl
--- firefox-84.0.2+build1/dom/ipc/PURLClassifierLocal.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PURLClassifierLocal.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,9 @@
 
 include PURLClassifierInfo;
 
-using refcounted class nsIURI from "mozilla/ipc/URIUtils.h";
+include "mozilla/ipc/URIUtils.h";
+
+using refcounted class nsIURI from "nsIURI.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/ipc/PWindowGlobal.ipdl firefox-85.0+build1/dom/ipc/PWindowGlobal.ipdl
--- firefox-84.0.2+build1/dom/ipc/PWindowGlobal.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/PWindowGlobal.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -5,7 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include "mozilla/dom/DocShellMessageUtils.h";
+include "mozilla/dom/PermissionMessageUtils.h";
 include "mozilla/ipc/TransportSecurityInfoUtils.h";
+include "mozilla/ipc/URIUtils.h";
 
 include protocol PBrowser;
 include protocol PInProcess;
@@ -15,12 +17,14 @@
 include ClientIPCTypes;
 include NeckoChannelParams;
 
+include "mozilla/layers/LayersMessageUtils.h";
+
 using JSActorMessageKind from "mozilla/dom/JSActor.h";
 using mozilla::gfx::IntRect from "mozilla/gfx/Rect.h";
 using moveonly mozilla::gfx::PaintFragment from "mozilla/gfx/CrossProcessPaint.h";
 using nscolor from "nsColor.h";
 using refcounted class nsDocShellLoadState from "nsDocShellLoadState.h";
-using mozilla::dom::XPCOMPermitUnloadAction from "mozilla/dom/DocShellMessageUtils.h";
+using mozilla::dom::XPCOMPermitUnloadAction from "nsIContentViewer.h";
 using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
 using mozilla::layers::LayersId from "mozilla/layers/LayersTypes.h";
 using refcounted class nsITransportSecurityInfo from "nsITransportSecurityInfo.h";
diff -Nru firefox-84.0.2+build1/dom/ipc/ReferrerInfoUtils.cpp firefox-85.0+build1/dom/ipc/ReferrerInfoUtils.cpp
--- firefox-84.0.2+build1/dom/ipc/ReferrerInfoUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/ReferrerInfoUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,7 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/ReferrerInfoUtils.h"
+
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "nsSerializationHelper.h"
+#include "nsString.h"
 
 namespace IPC {
 
diff -Nru firefox-84.0.2+build1/dom/ipc/RefMessageBodyService.cpp firefox-85.0+build1/dom/ipc/RefMessageBodyService.cpp
--- firefox-84.0.2+build1/dom/ipc/RefMessageBodyService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/RefMessageBodyService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -134,6 +134,8 @@
       mMaxCount(Nothing()),
       mCount(0) {}
 
+RefMessageBody::~RefMessageBody() = default;
+
 void RefMessageBody::Read(JSContext* aCx, JS::MutableHandle<JS::Value> aValue,
                           const JS::CloneDataPolicy& aCloneDataPolicy,
                           ErrorResult& aRv) {
diff -Nru firefox-84.0.2+build1/dom/ipc/RefMessageBodyService.h firefox-85.0+build1/dom/ipc/RefMessageBodyService.h
--- firefox-84.0.2+build1/dom/ipc/RefMessageBodyService.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/RefMessageBodyService.h	2021-01-18 19:58:09.000000000 +0000
@@ -68,7 +68,7 @@
       Sequence<OwningNonNull<mozilla::dom::MessagePort>>& aPorts);
 
  private:
-  ~RefMessageBody() = default;
+  ~RefMessageBody();
 
   const nsID mPortID;
 
diff -Nru firefox-84.0.2+build1/dom/ipc/RemoteBrowser.h firefox-85.0+build1/dom/ipc/RemoteBrowser.h
--- firefox-84.0.2+build1/dom/ipc/RemoteBrowser.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/RemoteBrowser.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,19 +7,16 @@
 #ifndef mozilla_dom_ipc_RemoteBrowser_h
 #define mozilla_dom_ipc_RemoteBrowser_h
 
-#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/dom/EffectsInfo.h"
 #include "mozilla/layers/LayersTypes.h"
-#include "nsILoadContext.h"
-#include "nsIPrincipal.h"
 #include "nsISupports.h"
-#include "nsISupportsImpl.h"
-#include "nsIURI.h"
 #include "nsRect.h"
 #include "Units.h"
 
+class nsDocShellLoadState;
 class nsFrameLoader;
+class nsILoadContext;
+class nsIContent;
 
 namespace mozilla {
 
@@ -27,6 +24,8 @@
 
 class BrowserHost;
 class BrowserBridgeHost;
+class BrowsingContext;
+class EffectsInfo;
 class OwnerShowInfo;
 
 /**
diff -Nru firefox-84.0.2+build1/dom/ipc/SharedMap.cpp firefox-85.0+build1/dom/ipc/SharedMap.cpp
--- firefox-84.0.2+build1/dom/ipc/SharedMap.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/SharedMap.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "MemMapSnapshot.h"
 #include "ScriptPreloader-inl.h"
 
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ContentProcessMessageManager.h"
 #include "mozilla/dom/IPCBlobUtils.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/SharedMessageBody.cpp firefox-85.0+build1/dom/ipc/SharedMessageBody.cpp
--- firefox-84.0.2+build1/dom/ipc/SharedMessageBody.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/SharedMessageBody.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/PMessagePort.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundParent.h"
+#include "xpcpublic.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/ipc/StructuredCloneData.cpp firefox-85.0+build1/dom/ipc/StructuredCloneData.cpp
--- firefox-84.0.2+build1/dom/ipc/StructuredCloneData.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/StructuredCloneData.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,14 +6,15 @@
 
 #include "StructuredCloneData.h"
 
-#include "ipc/IPCMessageUtils.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/DOMTypes.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
+#include "mozilla/ipc/SerializedStructuredCloneBuffer.h"
 #include "nsContentUtils.h"
 #include "nsJSEnvironment.h"
 #include "MainThreadUtils.h"
diff -Nru firefox-84.0.2+build1/dom/ipc/StructuredCloneData.h firefox-85.0+build1/dom/ipc/StructuredCloneData.h
--- firefox-84.0.2+build1/dom/ipc/StructuredCloneData.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/StructuredCloneData.h	2021-01-18 19:58:09.000000000 +0000
@@ -130,7 +130,7 @@
  *   returning a fatal false if unable to extract.  (And
  *   SerializedStructuredCloneBuffer wraps/defers to it.)  But if it's possible
  *   the ClonedMessageData came from a different source that might have borrowed
- *   the buffers itself, then things will crash.  That would be a pretty crazy
+ *   the buffers itself, then things will crash.  That would be a pretty strange
  *   implementation; if you see one, change it to use SharedJSAllocatedData.
  *
  * 1: Specifically, in the Write() case an owning SharedJSAllocatedData is
diff -Nru firefox-84.0.2+build1/dom/ipc/TabMessageUtils.h firefox-85.0+build1/dom/ipc/TabMessageUtils.h
--- firefox-84.0.2+build1/dom/ipc/TabMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/TabMessageUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef TABMESSAGE_UTILS_H
 #define TABMESSAGE_UTILS_H
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/Event.h"
 #include "nsIRemoteTab.h"
@@ -15,7 +15,6 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/EffectsInfo.h"
 #include "mozilla/layers/LayersMessageUtils.h"
-#include "ipc/IPCMessageUtils.h"
 #include "TabMessageTypes.h"
 #include "X11UndefineNone.h"
 
diff -Nru firefox-84.0.2+build1/dom/ipc/tests/JSProcessActor/browser_getActor_filter.js firefox-85.0+build1/dom/ipc/tests/JSProcessActor/browser_getActor_filter.js
--- firefox-84.0.2+build1/dom/ipc/tests/JSProcessActor/browser_getActor_filter.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/tests/JSProcessActor/browser_getActor_filter.js	2021-01-18 19:58:09.000000000 +0000
@@ -31,7 +31,7 @@
     let parent = browser.browsingContext.currentWindowGlobal.domProcess;
     Assert.throws(
       () => parent.getActor("TestProcessActor"),
-      /NS_ERROR_NOT_AVAILABLE/,
+      /NotSupportedError/,
       "Should throw if its remoteTypes don't match."
     );
 
@@ -40,7 +40,7 @@
       ok(child, "DOMProcessChild should have value.");
       Assert.throws(
         () => child.getActor("TestProcessActor"),
-        /NS_ERROR_NOT_AVAILABLE/,
+        /NotSupportedError/,
         "Should throw if its remoteTypes don't match."
       );
     });
diff -Nru firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js
--- firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js	2021-01-18 19:58:09.000000000 +0000
@@ -17,6 +17,27 @@
       let actorChild = child.getActor("TestWindow");
       ok(actorChild, "JSWindowActorChild should have value.");
 
+      {
+        let error = actorChild.uninitializedGetterError;
+        const prop = "contentWindow";
+        Assert.ok(
+          error,
+          `Should get error accessing '${prop}' before actor initialization`
+        );
+        if (error) {
+          Assert.equal(
+            error.name,
+            "InvalidStateError",
+            "Error should be an InvalidStateError"
+          );
+          Assert.equal(
+            error.message,
+            `JSWindowActorChild.${prop} getter: Cannot access property '${prop}' before actor is initialized`,
+            "Error should have informative message"
+          );
+        }
+      }
+
       let didDestroyPromise = new Promise(resolve => {
         const TOPIC = "test-js-window-actor-diddestroy";
         Services.obs.addObserver(function obs(subject, topic, data) {
@@ -24,7 +45,10 @@
           is(subject, actorChild, "Should have this value");
 
           Services.obs.removeObserver(obs, TOPIC);
-          resolve();
+          // Make a trip through the event loop to ensure that the
+          // actor's manager has been cleared before running remaining
+          // checks.
+          Services.tm.dispatchToMainThread(resolve);
         }, TOPIC);
       });
 
@@ -37,6 +61,36 @@
         /InvalidStateError/,
         "Should throw if frame destroy."
       );
+
+      for (let prop of [
+        "document",
+        "browsingContext",
+        "docShell",
+        "contentWindow",
+      ]) {
+        let error;
+        try {
+          void actorChild[prop];
+        } catch (e) {
+          error = e;
+        }
+        Assert.ok(
+          error,
+          `Should get error accessing '${prop}' after actor destruction`
+        );
+        if (error) {
+          Assert.equal(
+            error.name,
+            "InvalidStateError",
+            "Error should be an InvalidStateError"
+          );
+          Assert.equal(
+            error.message,
+            `JSWindowActorChild.${prop} getter: Cannot access property '${prop}' after actor 'TestWindow' has been destroyed`,
+            "Error should have informative message"
+          );
+        }
+      }
     });
   },
 });
diff -Nru firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js
--- firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,7 @@
     ok(parent, "WindowGlobalParent should have value.");
     Assert.throws(
       () => parent.getActor("TestWindow"),
-      /NS_ERROR_NOT_AVAILABLE/,
+      /NotSupportedError/,
       "Should throw if it doesn't match."
     );
 
@@ -22,7 +22,7 @@
 
       Assert.throws(
         () => child.getActor("TestWindow"),
-        /NS_ERROR_NOT_AVAILABLE/,
+        /NotSupportedError/,
         "Should throw if it doesn't match."
       );
     });
@@ -86,7 +86,7 @@
         let child = content.windowGlobalChild;
         Assert.throws(
           () => child.getActor("TestWindow"),
-          /NS_ERROR_NOT_AVAILABLE/,
+          /NotSupportedError/,
           "Should throw if it doesn't match."
         );
       });
@@ -145,7 +145,7 @@
     let parent = browser.browsingContext.currentWindowGlobal;
     Assert.throws(
       () => parent.getActor("TestWindow"),
-      /NS_ERROR_NOT_AVAILABLE/,
+      /NotSupportedError/,
       "Should throw if its remoteTypes don't match."
     );
 
@@ -154,7 +154,7 @@
       ok(child, "WindowGlobalChild should have value.");
       Assert.throws(
         () => child.getActor("TestWindow"),
-        /NS_ERROR_NOT_AVAILABLE/,
+        /NotSupportedError/,
         "Should throw if its remoteTypes don't match."
       );
     });
@@ -185,7 +185,7 @@
     let parent = browser.browsingContext.currentWindowGlobal;
     Assert.throws(
       () => parent.getActor("TestWindow"),
-      /NS_ERROR_NOT_AVAILABLE/,
+      /NotSupportedError/,
       "Should throw if its messageManagerGroups doesn't match."
     );
 
@@ -194,7 +194,7 @@
       ok(child, "WindowGlobalChild should have value.");
       Assert.throws(
         () => child.getActor("TestWindow"),
-        /NS_ERROR_NOT_AVAILABLE/,
+        /NotSupportedError/,
         "Should throw if its messageManagerGroups doesn't match."
       );
     });
@@ -213,7 +213,7 @@
       let child = frame.contentWindow.windowGlobalChild;
       Assert.throws(
         () => child.getActor("TestWindow"),
-        /NS_ERROR_NOT_AVAILABLE/,
+        /NotSupportedError/,
         "Should throw if allFrames is false."
       );
     });
diff -Nru firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_sendQuery.js firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_sendQuery.js
--- firefox-84.0.2+build1/dom/ipc/tests/JSWindowActor/browser_sendQuery.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/tests/JSWindowActor/browser_sendQuery.js	2021-01-18 19:58:10.000000000 +0000
@@ -2,6 +2,9 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
+const ERROR_LINE_NUMBER = 41;
+const EXCEPTION_LINE_NUMBER = ERROR_LINE_NUMBER + 3;
+
 function maybeAsyncStack(offset, column) {
   if (
     Services.prefs.getBoolPref(
@@ -35,7 +38,7 @@
     is(error.name, "SyntaxError", "Error should have the correct name");
     is(
       error.stack,
-      "receiveMessage@resource://testing-common/TestWindowChild.jsm:35:31\n" +
+      `receiveMessage@resource://testing-common/TestWindowChild.jsm:${ERROR_LINE_NUMBER}:31\n` +
         asyncStack,
       "Error should have the correct stack"
     );
@@ -63,7 +66,7 @@
     );
     is(
       error.stack,
-      "receiveMessage@resource://testing-common/TestWindowChild.jsm:38:22\n" +
+      `receiveMessage@resource://testing-common/TestWindowChild.jsm:${EXCEPTION_LINE_NUMBER}:22\n` +
         asyncStack,
       "Error should have the correct stack"
     );
diff -Nru firefox-84.0.2+build1/dom/ipc/UserActivationIPCUtils.h firefox-85.0+build1/dom/ipc/UserActivationIPCUtils.h
--- firefox-84.0.2+build1/dom/ipc/UserActivationIPCUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/UserActivationIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_useractivation_ipc_utils_h__
 #define mozilla_dom_useractivation_ipc_utils_h__
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 // Undo X11/X.h's definition of None
 #undef None
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalActor.cpp firefox-85.0+build1/dom/ipc/WindowGlobalActor.cpp
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalActor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalActor.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozJSComponentLoader.h"
 #include "mozilla/ContentBlockingAllowList.h"
 #include "mozilla/Logging.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/JSActorService.h"
 #include "mozilla/dom/JSWindowActorParent.h"
 #include "mozilla/dom/JSWindowActorChild.h"
@@ -21,6 +22,7 @@
 #include "mozilla/dom/WindowGlobalParent.h"
 
 #include "nsGlobalWindowInner.h"
+#include "nsNetUtil.h"
 
 namespace mozilla::dom {
 
@@ -157,10 +159,12 @@
     return nullptr;
   }
 
-  if (!proto->Matches(BrowsingContext(), GetDocumentURI(), GetRemoteType())) {
-    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
+  if (!proto->Matches(BrowsingContext(), GetDocumentURI(), GetRemoteType(),
+                      aRv)) {
+    MOZ_ASSERT(aRv.Failed());
     return nullptr;
   }
+  MOZ_ASSERT(!aRv.Failed());
   return proto.forget();
 }
 
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalActor.h firefox-85.0+build1/dom/ipc/WindowGlobalActor.h
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalActor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalActor.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsWrapperCache.h"
 #include "nsISupports.h"
 #include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/ErrorResult.h"
 #include "nsIURI.h"
 #include "nsString.h"
 #include "mozilla/dom/JSActor.h"
@@ -18,6 +17,8 @@
 #include "mozilla/dom/WindowGlobalTypes.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // Common base class for WindowGlobal{Parent, Child}.
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalChild.cpp firefox-85.0+build1/dom/ipc/WindowGlobalChild.cpp
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -22,12 +22,15 @@
 #include "mozilla/dom/WindowContext.h"
 #include "mozilla/dom/InProcessChild.h"
 #include "mozilla/dom/InProcessParent.h"
+#include "mozilla/ipc/Endpoint.h"
+#include "mozilla/PresShell.h"
 #include "nsContentUtils.h"
 #include "nsDocShell.h"
 #include "nsFocusManager.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsGlobalWindowInner.h"
 #include "nsFrameLoaderOwner.h"
+#include "nsNetUtil.h"
 #include "nsQueryObject.h"
 #include "nsSerializationHelper.h"
 #include "nsFrameLoader.h"
@@ -441,13 +444,8 @@
     const Maybe<IntRect>& aRect, const float& aScale,
     const nscolor& aBackgroundColor, const uint32_t& aFlags,
     DrawSnapshotResolver&& aResolve) {
-  nsCOMPtr<nsIDocShell> docShell = BrowsingContext()->GetDocShell();
-  if (!docShell) {
-    aResolve(gfx::PaintFragment{});
-    return IPC_OK();
-  }
-
-  aResolve(gfx::PaintFragment::Record(docShell, aRect, aScale, aBackgroundColor,
+  aResolve(gfx::PaintFragment::Record(BrowsingContext(), aRect, aScale,
+                                      aBackgroundColor,
                                       (gfx::CrossProcessPaintFlags)aFlags));
   return IPC_OK();
 }
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalParent.cpp firefox-85.0+build1/dom/ipc/WindowGlobalParent.cpp
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -26,6 +26,7 @@
 #include "mozilla/dom/ChromeUtils.h"
 #include "mozilla/dom/ipc/IdType.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ServoCSSParser.h"
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/StaticPrefs_network.h"
@@ -34,12 +35,14 @@
 #include "mozJSComponentLoader.h"
 #include "nsContentUtils.h"
 #include "nsDocShell.h"
+#include "nsDocShellLoadState.h"
 #include "nsError.h"
 #include "nsFrameLoader.h"
 #include "nsFrameLoaderOwner.h"
 #include "nsGlobalWindowInner.h"
 #include "nsQueryObject.h"
 #include "nsFrameLoaderOwner.h"
+#include "nsNetUtil.h"
 #include "nsSerializationHelper.h"
 #include "nsIBrowser.h"
 #include "nsIPromptCollection.h"
@@ -210,11 +213,11 @@
   return do_AddRef(static_cast<WindowGlobalChild*>(otherSide));
 }
 
-already_AddRefed<BrowserParent> WindowGlobalParent::GetBrowserParent() {
+BrowserParent* WindowGlobalParent::GetBrowserParent() {
   if (IsInProcess() || !CanSend()) {
     return nullptr;
   }
-  return do_AddRef(static_cast<BrowserParent*>(Manager()));
+  return static_cast<BrowserParent*>(Manager());
 }
 
 ContentParent* WindowGlobalParent::GetContentParent() {
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalParent.h firefox-85.0+build1/dom/ipc/WindowGlobalParent.h
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -94,7 +94,7 @@
 
   // Get this actor's manager if it is not an in-process actor. Returns
   // |nullptr| if the actor has been torn down, or is in-process.
-  already_AddRefed<BrowserParent> GetBrowserParent();
+  BrowserParent* GetBrowserParent();
 
   ContentParent* GetContentParent();
 
diff -Nru firefox-84.0.2+build1/dom/ipc/WindowGlobalTypes.ipdlh firefox-85.0+build1/dom/ipc/WindowGlobalTypes.ipdlh
--- firefox-84.0.2+build1/dom/ipc/WindowGlobalTypes.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/ipc/WindowGlobalTypes.ipdlh	2021-01-18 19:58:09.000000000 +0000
@@ -4,7 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+include "mozilla/dom/PermissionMessageUtils.h";
 include "mozilla/ipc/TransportSecurityInfoUtils.h";
+include "mozilla/ipc/URIUtils.h";
 
 include NeckoChannelParams;
 include DOMTypes;
diff -Nru firefox-84.0.2+build1/dom/jsurl/nsJSProtocolHandler.cpp firefox-85.0+build1/dom/jsurl/nsJSProtocolHandler.cpp
--- firefox-84.0.2+build1/dom/jsurl/nsJSProtocolHandler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/jsurl/nsJSProtocolHandler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -43,6 +43,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/dom/DOMSecurityMonitor.h"
+#include "mozilla/dom/JSExecutionContext.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/PopupBlocker.h"
 #include "nsContentSecurityManager.h"
@@ -54,6 +55,7 @@
 
 using mozilla::IsAscii;
 using mozilla::dom::AutoEntryScript;
+using mozilla::dom::JSExecutionContext;
 
 static NS_DEFINE_CID(kJSURICID, NS_JSURI_CID);
 
@@ -299,7 +301,7 @@
   options.setFileAndLine(mURL.get(), 1);
   options.setIntroductionType("javascriptURL");
   {
-    nsJSUtils::ExecutionContext exec(cx, globalJSObject);
+    JSExecutionContext exec(cx, globalJSObject);
     exec.SetCoerceToString(true);
     exec.Compile(options, NS_ConvertUTF8toUTF16(script));
     rv = exec.ExecScript(&v);
diff -Nru firefox-84.0.2+build1/dom/l10n/DocumentL10n.cpp firefox-85.0+build1/dom/l10n/DocumentL10n.cpp
--- firefox-84.0.2+build1/dom/l10n/DocumentL10n.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/l10n/DocumentL10n.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "DocumentL10n.h"
 #include "nsIContentSink.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentL10nBinding.h"
 
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/l10n/DocumentL10n.h firefox-85.0+build1/dom/l10n/DocumentL10n.h
--- firefox-84.0.2+build1/dom/l10n/DocumentL10n.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/l10n/DocumentL10n.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,12 +7,15 @@
 #ifndef mozilla_dom_l10n_DocumentL10n_h
 #define mozilla_dom_l10n_DocumentL10n_h
 
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DOMLocalization.h"
 
+class nsIContentSink;
+
 namespace mozilla {
 namespace dom {
 
+class Document;
+
 enum class DocumentL10nState {
   // State set when the DocumentL10n gets constructed.
   Constructed = 0,
diff -Nru firefox-84.0.2+build1/dom/l10n/DOMLocalization.cpp firefox-85.0+build1/dom/l10n/DOMLocalization.cpp
--- firefox-84.0.2+build1/dom/l10n/DOMLocalization.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/l10n/DOMLocalization.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,9 +6,11 @@
 
 #include "js/ForOfIterator.h"  // JS::ForOfIterator
 #include "js/JSON.h"           // JS_ParseJSON
+#include "nsContentUtils.h"
 #include "nsIScriptError.h"
 #include "DOMLocalization.h"
 #include "mozilla/intl/LocaleService.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/L10nOverlays.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/l10n/DOMLocalization.h firefox-85.0+build1/dom/l10n/DOMLocalization.h
--- firefox-84.0.2+build1/dom/l10n/DOMLocalization.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/l10n/DOMLocalization.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,14 +10,17 @@
 #include "nsXULPrototypeDocument.h"
 #include "mozilla/intl/Localization.h"
 #include "mozilla/dom/DOMLocalizationBinding.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/L10nMutations.h"
 #include "mozilla/dom/L10nOverlaysBinding.h"
 #include "mozilla/dom/LocalizationBinding.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsINode.h"
+
 namespace mozilla {
 namespace dom {
 
+class Element;
 class L10nMutations;
 
 class DOMLocalization : public intl::Localization {
diff -Nru firefox-84.0.2+build1/dom/l10n/L10nOverlays.h firefox-85.0+build1/dom/l10n/L10nOverlays.h
--- firefox-84.0.2+build1/dom/l10n/L10nOverlays.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/l10n/L10nOverlays.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,13 +7,17 @@
 #ifndef mozilla_dom_l10n_L10nOverlays_h
 #define mozilla_dom_l10n_L10nOverlays_h
 
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/L10nOverlaysBinding.h"
 #include "mozilla/dom/LocalizationBinding.h"
 
+class nsINode;
+
 namespace mozilla {
 namespace dom {
 
+class DocumentFragment;
+class Element;
+
 class L10nOverlays {
  public:
   /**
diff -Nru firefox-84.0.2+build1/dom/locales/en-US/chrome/dom/dom.properties firefox-85.0+build1/dom/locales/en-US/chrome/dom/dom.properties
--- firefox-84.0.2+build1/dom/locales/en-US/chrome/dom/dom.properties	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/locales/en-US/chrome/dom/dom.properties	2021-01-18 19:58:09.000000000 +0000
@@ -401,3 +401,10 @@
 RequestStorageAccessUserGesture=document.requestStorageAccess() may only be requested from inside a short running user-generated event handler.
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented=Too many calls to Location or History APIs within a short timeframe.
+FolderUploadPrompt.title = Confirm Upload
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = Are you sure you want to upload all files from “%S�? Only do this if you trust the site.
+FolderUploadPrompt.acceptButtonLabel = Upload
+InputPickerBlockedNoUserActivation=<input> picker was blocked due to lack of user activation.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe with external protocol was blocked due to lack of user activation, or because not enough time has passed since the last such iframe was loaded.
+MultiplePopupsBlockedNoUserActivation=Opening multiple popups was blocked due to lack of user activation.
diff -Nru firefox-84.0.2+build1/dom/localstorage/ActorsParent.cpp firefox-85.0+build1/dom/localstorage/ActorsParent.cpp
--- firefox-84.0.2+build1/dom/localstorage/ActorsParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/ActorsParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -46,6 +46,7 @@
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/StoragePrincipalHelper.h"
@@ -337,25 +338,6 @@
 
 const uint32_t kShadowJournalSizeLimit = kShadowMaxWALSize * 3;
 
-/**
- * Automatically kill database actors if LocalStorage shutdown takes this long.
- */
-#define SHUTDOWN_FORCE_KILL_TIMEOUT_MS 5000
-
-/**
- * Automatically crash the browser if LocalStorage shutdown takes this long.
- * We've chosen a value that is longer than the value for QuotaManager shutdown
- * timer which is currently set to 30 seconds.  We've also chosen a value that
- * is long enough that it is unlikely for the problem to be falsely triggered by
- * slow system I/O.  We've also chosen a value long enough so that automated
- * tests should time out and fail if LocalStorage shutdown hangs.  Also, this
- * value is long enough so that testers can notice the LocalStorage shutdown
- * hang; we want to know about the hangs, not hide them.  On the other hand this
- * value is less than 60 seconds which is used by nsTerminator to crash a hung
- * main process.
- */
-#define SHUTDOWN_FORCE_CRASH_TIMEOUT_MS 45000
-
 bool IsOnConnectionThread();
 
 void AssertIsOnConnectionThread();
@@ -497,68 +479,60 @@
   return NS_OK;
 }
 
-nsresult CreateStorageConnection(nsIFile* aDBFile, nsIFile* aUsageFile,
-                                 const nsACString& aOrigin,
-                                 mozIStorageConnection** aConnection,
-                                 bool* aRemovedUsageFile) {
+// In case of success, returns a pair of the connection and a boolean that
+// indicates whether a usage file existed and has been removed.
+Result<std::pair<nsCOMPtr<mozIStorageConnection>, bool>, nsresult>
+CreateStorageConnection(nsIFile& aDBFile, nsIFile& aUsageFile,
+                        const nsACString& aOrigin) {
   MOZ_ASSERT(IsOnIOThread() || IsOnConnectionThread());
-  MOZ_ASSERT(aDBFile);
-  MOZ_ASSERT(aUsageFile);
-  MOZ_ASSERT(aConnection);
-  MOZ_ASSERT(aRemovedUsageFile);
-
-  // aRemovedUsageFile has to be initialized even when this method fails.
-  *aRemovedUsageFile = false;
-
-  nsresult rv;
-
-  nsCOMPtr<mozIStorageService> ss =
-      do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsCOMPtr<mozIStorageConnection> connection;
-  rv = ss->OpenDatabase(aDBFile, getter_AddRefs(connection));
-  if (rv == NS_ERROR_FILE_CORRUPTED) {
-    // Remove the usage file first.
-    rv = aUsageFile->Remove(false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
 
-    // Let the caller know that the usage file has been removed.
-    *aRemovedUsageFile = true;
+  // XXX Common logic should be refactored out of this method and
+  // cache::DBAction::OpenDBConnection, and maybe other similar functions.
 
-    // Nuke the database file.
-    rv = aDBFile->Remove(false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    rv = ss->OpenDatabase(aDBFile, getter_AddRefs(connection));
-  }
-
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(
+      const auto& storageService,
+      ToResultGet<nsCOMPtr<mozIStorageService>>(
+          MOZ_SELECT_OVERLOAD(do_GetService), MOZ_STORAGE_SERVICE_CONTRACTID));
+
+  // XXX removedUsageFile could be const
+  LS_TRY_UNWRAP(
+      (auto [connection, removedUsageFile]),
+      MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<mozIStorageConnection>,
+                                 storageService, OpenDatabase, &aDBFile)
+          .map([](auto connection) { return std::pair(connection, false); })
+          .orElse(
+              [&aUsageFile, &aDBFile, &storageService](const nsresult rv)
+                  -> Result<std::pair<nsCOMPtr<mozIStorageConnection>, bool>,
+                            nsresult> {
+                if (rv == NS_ERROR_FILE_CORRUPTED) {
+                  // Remove the usage file first.
+                  LS_TRY(aUsageFile.Remove(false));
+
+                  // Nuke the database file.
+                  LS_TRY(aDBFile.Remove(false));
+
+                  LS_TRY_RETURN(MOZ_TO_RESULT_INVOKE_TYPED(
+                                    nsCOMPtr<mozIStorageConnection>,
+                                    storageService, OpenDatabase, &aDBFile)
+                                    .map([](auto connection) {
+                                      return std::pair(
+                                          connection,
+                                          // Let the caller know that the usage
+                                          // file has been removed.
+                                          true);
+                                    }));
+                }
+                return Err(rv);
+              }));
 
-  rv = SetDefaultPragmas(connection);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY(SetDefaultPragmas(connection));
 
   // Check to make sure that the database schema is correct.
-  int32_t schemaVersion;
-  rv = connection->GetSchemaVersion(&schemaVersion);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  // XXX Try to make schemaVersion const.
+  LS_TRY_UNWRAP(int32_t schemaVersion,
+                MOZ_TO_RESULT_INVOKE(connection, GetSchemaVersion));
 
-  if (schemaVersion > kSQLiteSchemaVersion) {
-    LS_WARNING("Unable to open LocalStorage database, schema is too high!");
-    return NS_ERROR_FAILURE;
-  }
+  LS_TRY(OkIf(schemaVersion <= kSQLiteSchemaVersion), Err(NS_ERROR_FAILURE));
 
   if (schemaVersion != kSQLiteSchemaVersion) {
     const bool newDatabase = !schemaVersion;
@@ -566,15 +540,12 @@
     if (newDatabase) {
       // Set the page size first.
       if (kSQLitePageSizeOverride) {
-        rv = connection->ExecuteSimpleSQL(nsPrintfCString(
-            "PRAGMA page_size = %" PRIu32 ";", kSQLitePageSizeOverride));
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
+        LS_TRY(connection->ExecuteSimpleSQL(nsPrintfCString(
+            "PRAGMA page_size = %" PRIu32 ";", kSQLitePageSizeOverride)));
       }
 
       // We have to set the auto_vacuum mode before opening a transaction.
-      rv = connection->ExecuteSimpleSQL(
+      LS_TRY(connection->ExecuteSimpleSQL(
 #ifdef LS_MOBILE
           // Turn on full auto_vacuum mode to reclaim disk space on mobile
           // devices (at the cost of some COMMIT speed).
@@ -583,20 +554,14 @@
           // Turn on incremental auto_vacuum mode on desktop builds.
           "PRAGMA auto_vacuum = INCREMENTAL;"_ns
 #endif
-      );
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+          ));
     }
 
     mozStorageTransaction transaction(
         connection, false, mozIStorageConnection::TRANSACTION_IMMEDIATE);
 
     if (newDatabase) {
-      rv = CreateTables(connection);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(CreateTables(connection));
 
 #ifdef DEBUG
       {
@@ -608,24 +573,15 @@
       }
 #endif
 
-      nsCOMPtr<mozIStorageStatement> stmt;
-      nsresult rv = connection->CreateStatement(
-          nsLiteralCString("INSERT INTO database (origin) "
-                           "VALUES (:origin)"),
-          getter_AddRefs(stmt));
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY_INSPECT(
+          const auto& stmt,
+          MOZ_TO_RESULT_INVOKE_TYPED(
+              nsCOMPtr<mozIStorageStatement>, connection, CreateStatement,
+              "INSERT INTO database (origin) VALUES (:origin)"_ns));
 
-      rv = stmt->BindUTF8StringByName("origin"_ns, aOrigin);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(stmt->BindUTF8StringByName("origin"_ns, aOrigin));
 
-      rv = stmt->Execute();
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(stmt->Execute());
     } else {
       // This logic needs to change next time we change the schema!
       static_assert(kSQLiteSchemaVersion == int32_t((4 << 4) + 0),
@@ -633,84 +589,57 @@
 
       while (schemaVersion != kSQLiteSchemaVersion) {
         if (schemaVersion == MakeSchemaVersion(1, 0)) {
-          rv = UpgradeSchemaFrom1_0To2_0(connection);
+          LS_TRY(UpgradeSchemaFrom1_0To2_0(connection));
         } else if (schemaVersion == MakeSchemaVersion(2, 0)) {
-          rv = UpgradeSchemaFrom2_0To3_0(connection);
+          LS_TRY(UpgradeSchemaFrom2_0To3_0(connection));
         } else if (schemaVersion == MakeSchemaVersion(3, 0)) {
-          rv = UpgradeSchemaFrom3_0To4_0(connection);
+          LS_TRY(UpgradeSchemaFrom3_0To4_0(connection));
         } else {
           LS_WARNING(
               "Unable to open LocalStorage database, no upgrade path is "
               "available!");
-          return NS_ERROR_FAILURE;
+          return Err(NS_ERROR_FAILURE);
         }
 
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
-
-        rv = connection->GetSchemaVersion(&schemaVersion);
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
+        LS_TRY_UNWRAP(schemaVersion,
+                      MOZ_TO_RESULT_INVOKE(connection, GetSchemaVersion));
       }
 
       MOZ_ASSERT(schemaVersion == kSQLiteSchemaVersion);
     }
 
-    rv = transaction.Commit();
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    LS_TRY(transaction.Commit());
 
     if (newDatabase) {
       // Windows caches the file size, let's force it to stat the file again.
-      bool dummy;
-      rv = aDBFile->Exists(&dummy);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY_INSPECT(const bool& exists, MOZ_TO_RESULT_INVOKE(aDBFile, Exists));
+      Unused << exists;
 
-      int64_t fileSize;
-      rv = aDBFile->GetFileSize(&fileSize);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY_INSPECT(const int64_t& fileSize,
+                     MOZ_TO_RESULT_INVOKE(aDBFile, GetFileSize));
 
       MOZ_ASSERT(fileSize > 0);
 
-      PRTime vacuumTime = PR_Now();
+      const PRTime vacuumTime = PR_Now();
       MOZ_ASSERT(vacuumTime);
 
-      nsCOMPtr<mozIStorageStatement> vacuumTimeStmt;
-      rv = connection->CreateStatement(
-          nsLiteralCString("UPDATE database "
-                           "SET last_vacuum_time = :time"
-                           ", last_vacuum_size = :size;"),
-          getter_AddRefs(vacuumTimeStmt));
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY_INSPECT(
+          const auto& vacuumTimeStmt,
+          MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<mozIStorageStatement>, connection,
+                                     CreateStatement,
+                                     "UPDATE database "
+                                     "SET last_vacuum_time = :time"
+                                     ", last_vacuum_size = :size;"_ns));
 
-      rv = vacuumTimeStmt->BindInt64ByName("time"_ns, vacuumTime);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(vacuumTimeStmt->BindInt64ByName("time"_ns, vacuumTime));
 
-      rv = vacuumTimeStmt->BindInt64ByName("size"_ns, fileSize);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(vacuumTimeStmt->BindInt64ByName("size"_ns, fileSize));
 
-      rv = vacuumTimeStmt->Execute();
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
+      LS_TRY(vacuumTimeStmt->Execute());
     }
   }
 
-  connection.forget(aConnection);
-  return NS_OK;
+  return std::pair{std::move(connection), removedUsageFile};
 }
 
 nsresult GetStorageConnection(const nsAString& aDatabaseFilePath,
@@ -927,23 +856,12 @@
   constexpr auto journalModeQueryStart = "PRAGMA journal_mode = "_ns;
   constexpr auto journalModeWAL = "wal"_ns;
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = aConnection->CreateStatement(
-      journalModeQueryStart + journalModeWAL, getter_AddRefs(stmt));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  MOZ_ASSERT(hasResult);
+  LS_TRY_INSPECT(const auto& stmt,
+                 CreateAndExecuteSingleStepStatement(
+                     *aConnection, journalModeQueryStart + journalModeWAL));
 
   nsCString journalMode;
-  rv = stmt->GetUTF8String(0, journalMode);
+  nsresult rv = stmt->GetUTF8String(0, journalMode);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -953,19 +871,8 @@
 
     // Set the threshold for auto-checkpointing the WAL. We don't want giant
     // logs slowing down us.
-    rv = aConnection->CreateStatement("PRAGMA page_size;"_ns,
-                                      getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    bool hasResult;
-    rv = stmt->ExecuteStep(&hasResult);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    MOZ_ASSERT(hasResult);
+    LS_TRY_INSPECT(const auto& stmt, CreateAndExecuteSingleStepStatement(
+                                         *aConnection, "PRAGMA page_size;"_ns));
 
     int32_t pageSize;
     rv = stmt->GetInt32(0, &pageSize);
@@ -1170,47 +1077,57 @@
   return NS_OK;
 }
 
-nsresult GetUsageFile(const nsAString& aDirectoryPath, nsIFile** aUsageFile) {
+Result<nsCOMPtr<nsIFile>, nsresult> GetUsageFile(
+    const nsAString& aDirectoryPath) {
   MOZ_ASSERT(IsOnIOThread() || IsOnConnectionThread());
   MOZ_ASSERT(!aDirectoryPath.IsEmpty());
-  MOZ_ASSERT(aUsageFile);
-
-  auto usageFileOrErr = QM_NewLocalFile(aDirectoryPath);
-  if (NS_WARN_IF(usageFileOrErr.isErr())) {
-    return usageFileOrErr.unwrapErr();
-  }
 
-  nsCOMPtr<nsIFile> usageFile = usageFileOrErr.unwrap();
+  LS_TRY_UNWRAP(auto usageFile, QM_NewLocalFile(aDirectoryPath));
 
-  nsresult rv = usageFile->Append(kUsageFileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY(usageFile->Append(kUsageFileName));
 
-  usageFile.forget(aUsageFile);
-  return NS_OK;
+  return usageFile;
 }
 
-nsresult GetUsageJournalFile(const nsAString& aDirectoryPath,
-                             nsIFile** aUsageJournalFile) {
+Result<nsCOMPtr<nsIFile>, nsresult> GetUsageJournalFile(
+    const nsAString& aDirectoryPath) {
   MOZ_ASSERT(IsOnIOThread() || IsOnConnectionThread());
   MOZ_ASSERT(!aDirectoryPath.IsEmpty());
-  MOZ_ASSERT(aUsageJournalFile);
 
-  auto usageJournalFileOrErr = QM_NewLocalFile(aDirectoryPath);
-  if (NS_WARN_IF(usageJournalFileOrErr.isErr())) {
-    return usageJournalFileOrErr.unwrapErr();
-  }
+  LS_TRY_UNWRAP(auto usageJournalFile, QM_NewLocalFile(aDirectoryPath));
 
-  nsCOMPtr<nsIFile> usageJournalFile = usageJournalFileOrErr.unwrap();
+  LS_TRY(usageJournalFile->Append(kUsageJournalFileName));
 
-  nsresult rv = usageJournalFile->Append(kUsageJournalFileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  return usageJournalFile;
+}
 
-  usageJournalFile.forget(aUsageJournalFile);
-  return NS_OK;
+// Checks if aFile exists and is a file. Returns true if it exists and is a
+// file, false if it doesn't exist, and an error if it exists but isn't a file.
+Result<bool, nsresult> ExistsAsFile(nsIFile& aFile) {
+  enum class ExistsAsFileResult { DoesNotExist, IsDirectory, IsFile };
+
+  // This is an optimization to check both properties in one OS case, rather
+  // than calling Exists first, and then IsDirectory. IsDirectory also checks if
+  // the path exists.
+  QM_TRY_INSPECT(
+      const auto& res,
+      MOZ_TO_RESULT_INVOKE(aFile, IsDirectory)
+          .map([](const bool isDirectory) {
+            return isDirectory ? ExistsAsFileResult::IsDirectory
+                               : ExistsAsFileResult::IsFile;
+          })
+          .orElse(
+              [](const nsresult rv) -> Result<ExistsAsFileResult, nsresult> {
+                if (rv != NS_ERROR_FILE_NOT_FOUND &&
+                    rv != NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
+                  return Err(rv);
+                }
+                return ExistsAsFileResult::DoesNotExist;
+              }));
+
+  QM_TRY(OkIf(res != ExistsAsFileResult::IsDirectory), Err(NS_ERROR_FAILURE));
+
+  return res == ExistsAsFileResult::IsFile;
 }
 
 nsresult UpdateUsageFile(nsIFile* aUsageFile, nsIFile* aUsageJournalFile,
@@ -1220,100 +1137,51 @@
   MOZ_ASSERT(aUsageJournalFile);
   MOZ_ASSERT(aUsage >= 0);
 
-  bool isDirectory;
-  nsresult rv = aUsageJournalFile->IsDirectory(&isDirectory);
-  if (rv != NS_ERROR_FILE_NOT_FOUND &&
-      rv != NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    if (NS_WARN_IF(isDirectory)) {
-      return NS_ERROR_FAILURE;
-    }
-  } else {
-    rv = aUsageJournalFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+  LS_TRY_INSPECT(const bool& usageJournalFileExists,
+                 ExistsAsFile(*aUsageJournalFile));
+  if (!usageJournalFileExists) {
+    LS_TRY(aUsageJournalFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644));
   }
 
-  nsCOMPtr<nsIOutputStream> stream;
-  rv = NS_NewLocalFileOutputStream(getter_AddRefs(stream), aUsageFile);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& stream, NS_NewLocalFileOutputStream(aUsageFile));
 
   nsCOMPtr<nsIBinaryOutputStream> binaryStream =
       NS_NewObjectOutputStream(stream);
 
-  rv = binaryStream->Write32(kUsageFileCookie);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY(binaryStream->Write32(kUsageFileCookie));
 
-  rv = binaryStream->Write64(aUsage);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY(binaryStream->Write64(aUsage));
 
-  rv = stream->Close();
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY(stream->Close());
 
   return NS_OK;
 }
 
-nsresult LoadUsageFile(nsIFile* aUsageFile, int64_t* aUsage) {
+Result<UsageInfo, nsresult> LoadUsageFile(nsIFile& aUsageFile) {
   AssertIsOnIOThread();
-  MOZ_ASSERT(aUsageFile);
-  MOZ_ASSERT(aUsage);
 
-  int64_t fileSize;
-  nsresult rv = aUsageFile->GetFileSize(&fileSize);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const int64_t& fileSize,
+                 MOZ_TO_RESULT_INVOKE(aUsageFile, GetFileSize));
 
-  if (NS_WARN_IF(fileSize != kUsageFileSize)) {
-    return NS_ERROR_FILE_CORRUPTED;
-  }
+  LS_TRY(OkIf(fileSize == kUsageFileSize), Err(NS_ERROR_FILE_CORRUPTED));
 
-  nsCOMPtr<nsIInputStream> stream;
-  rv = NS_NewLocalFileInputStream(getter_AddRefs(stream), aUsageFile);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_UNWRAP(auto stream, NS_NewLocalFileInputStream(&aUsageFile));
 
-  nsCOMPtr<nsIInputStream> bufferedStream;
-  rv = NS_NewBufferedInputStream(getter_AddRefs(bufferedStream),
-                                 stream.forget(), 16);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& bufferedStream,
+                 NS_NewBufferedInputStream(stream.forget(), 16));
 
-  nsCOMPtr<nsIBinaryInputStream> binaryStream =
+  const nsCOMPtr<nsIBinaryInputStream> binaryStream =
       NS_NewObjectInputStream(bufferedStream);
 
-  uint32_t cookie;
-  rv = binaryStream->Read32(&cookie);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const uint32_t& cookie,
+                 MOZ_TO_RESULT_INVOKE(binaryStream, Read32));
 
-  if (NS_WARN_IF(cookie != kUsageFileCookie)) {
-    return NS_ERROR_FILE_CORRUPTED;
-  }
+  LS_TRY(OkIf(cookie == kUsageFileCookie), Err(NS_ERROR_FILE_CORRUPTED));
 
-  uint64_t usage;
-  rv = binaryStream->Read64(&usage);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const uint64_t& usage,
+                 MOZ_TO_RESULT_INVOKE(binaryStream, Read64));
 
-  *aUsage = usage;
-  return NS_OK;
+  return UsageInfo{DatabaseUsageType(Some(usage))};
 }
 
 /*******************************************************************************
@@ -1479,7 +1347,7 @@
   class CachedStatement;
 
  private:
-  class InitStorageAndOriginHelper;
+  class InitTemporaryOriginHelper;
 
   class FlushOp;
   class CloseOp;
@@ -1622,7 +1490,7 @@
 };
 
 /**
- * Helper to invoke EnsureStorageAndOriginIsInitialized on the QuotaManager IO
+ * Helper to invoke EnsureTemporaryOriginIsInitialized on the QuotaManager IO
  * thread from the LocalStorage connection thread when creating a database
  * connection on demand. This is necessary because we attempt to defer the
  * creation of the origin directory and the database until absolutely needed,
@@ -1631,7 +1499,7 @@
  * could be logic on the IO thread that also wants to deal with the same
  * origin, so we need to queue a runnable and wait our turn.)
  */
-class Connection::InitStorageAndOriginHelper final : public Runnable {
+class Connection::InitTemporaryOriginHelper final : public Runnable {
   mozilla::Monitor mMonitor;
   const QuotaInfo mQuotaInfo;
   nsString mOriginDirectoryPath;
@@ -1639,9 +1507,9 @@
   bool mWaiting;
 
  public:
-  explicit InitStorageAndOriginHelper(const QuotaInfo& aQuotaInfo)
-      : Runnable("dom::localstorage::Connection::InitStorageAndOriginHelper"),
-        mMonitor("InitStorageAndOriginHelper::mMonitor"),
+  explicit InitTemporaryOriginHelper(const QuotaInfo& aQuotaInfo)
+      : Runnable("dom::localstorage::Connection::InitTemporaryOriginHelper"),
+        mMonitor("InitTemporaryOriginHelper::mMonitor"),
         mQuotaInfo(aQuotaInfo),
         mIOThreadResultCode(NS_OK),
         mWaiting(true) {
@@ -1651,7 +1519,7 @@
   nsresult BlockAndReturnOriginDirectoryPath(nsAString& aOriginDirectoryPath);
 
  private:
-  ~InitStorageAndOriginHelper() = default;
+  ~InitTemporaryOriginHelper() = default;
 
   nsresult RunOnIOThread();
 
@@ -1787,6 +1655,12 @@
             nsDataHashtable<nsStringHashKey, LSValue>& aValues,
             nsTArray<LSItemInfo>&& aOrderedItems);
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
+    AssertIsOnBackgroundThread();
+
+    return ToMaybeRef(mDirectoryLock.get());
+  }
+
   const nsCString& Origin() const { return mGroupAndOrigin.mOrigin; }
 
   uint32_t PrivateBrowsingId() const { return mPrivateBrowsingId; }
@@ -1908,6 +1782,12 @@
   }
 
   ~PrivateDatastore() { mDatastore->NoteFinishedPrivateDatastore(); }
+
+  const Datastore& DatastoreRef() const {
+    AssertIsOnBackgroundThread();
+
+    return *mDatastore;
+  }
 };
 
 class PreparedDatastore {
@@ -1953,11 +1833,18 @@
     mDatastore->NoteFinishedPreparedDatastore(this);
   }
 
-  Datastore* GetDatastore() const {
+  const Datastore& DatastoreRef() const {
     AssertIsOnBackgroundThread();
     MOZ_ASSERT(mDatastore);
 
-    return mDatastore;
+    return *mDatastore;
+  }
+
+  Datastore& MutableDatastoreRef() const {
+    AssertIsOnBackgroundThread();
+    MOZ_ASSERT(mDatastore);
+
+    return *mDatastore;
   }
 
   const Maybe<ContentParentId>& GetContentParentId() const {
@@ -2025,6 +1912,12 @@
     return mDatastore;
   }
 
+  Maybe<Datastore&> MaybeDatastoreRef() const {
+    AssertIsOnBackgroundThread();
+
+    return ToMaybeRef(mDatastore.get());
+  }
+
   const PrincipalInfo& GetPrincipalInfo() const { return mPrincipalInfo; }
 
   bool IsOwnedByProcess(ContentParentId aContentParentId) const {
@@ -2478,7 +2371,6 @@
   NestedState mNestedState;
   const bool mForPreload;
   bool mDatabaseNotAvailable;
-  bool mRequestedDirectoryLock;
   // Set when the Datastore has been registered with gPrivateDatastores so that
   // it can be unregistered if an error is encountered in PrepareDatastoreOp.
   FlippedOnce<false> mPrivateDatastoreRegistered;
@@ -2497,6 +2389,12 @@
                      const LSRequestParams& aParams,
                      const Maybe<ContentParentId>& aContentParentId);
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
+    AssertIsOnBackgroundThread();
+
+    return ToMaybeRef(mDirectoryLock.get());
+  }
+
   bool OriginIsKnown() const {
     MOZ_ASSERT(IsOnOwningThread() || IsOnIOThread());
 
@@ -2510,12 +2408,6 @@
     return mQuotaInfo.mOrigin;
   }
 
-  bool RequestedDirectoryLock() const {
-    AssertIsOnOwningThread();
-
-    return mRequestedDirectoryLock;
-  }
-
   void Invalidate() {
     AssertIsOnOwningThread();
 
@@ -2896,20 +2788,25 @@
 
   void ReleaseIOThreadObjects() override;
 
-  void AbortOperations(const nsACString& aOrigin) override;
+  void AbortOperationsForLocks(
+      const DirectoryLockIdTable& aDirectoryLockIds) override;
 
   void AbortOperationsForProcess(ContentParentId aContentParentId) override;
 
+  void AbortAllOperations() override;
+
   void StartIdleMaintenance() override;
 
   void StopIdleMaintenance() override;
 
-  void ShutdownWorkThreads() override;
-
  private:
   ~QuotaClient() override;
 
-  void ShutdownTimedOut();
+  void InitiateShutdown() override;
+  bool IsShutdownCompleted() const override;
+  nsCString GetShutdownStatus() const override;
+  void ForceKillActors() override;
+  void FinalizeShutdown() override;
 
   nsresult CreateArchivedOriginScope(
       const OriginScope& aOriginScope,
@@ -2983,7 +2880,8 @@
 bool gLocalStorageInitialized = false;
 #endif
 
-typedef nsTArray<CheckedUnsafePtr<PrepareDatastoreOp>> PrepareDatastoreOpArray;
+using PrepareDatastoreOpArray =
+    nsTArray<NotNull<CheckedUnsafePtr<PrepareDatastoreOp>>>;
 
 StaticAutoPtr<PrepareDatastoreOpArray> gPrepareDatastoreOps;
 
@@ -3036,7 +2934,7 @@
 // window actually goes away.
 UniquePtr<PrivateDatastoreHashtable> gPrivateDatastores;
 
-typedef nsTArray<CheckedUnsafePtr<Database>> LiveDatabaseArray;
+using LiveDatabaseArray = nsTArray<NotNull<CheckedUnsafePtr<Database>>>;
 
 StaticAutoPtr<LiveDatabaseArray> gLiveDatabases;
 
@@ -3160,55 +3058,37 @@
   return NS_OK;
 }
 
-nsresult GetUsage(mozIStorageConnection* aConnection,
-                  ArchivedOriginScope* aArchivedOriginScope, int64_t* aUsage) {
+Result<int64_t, nsresult> GetUsage(mozIStorageConnection& aConnection,
+                                   ArchivedOriginScope* aArchivedOriginScope) {
   AssertIsOnIOThread();
-  MOZ_ASSERT(aConnection);
-  MOZ_ASSERT(aUsage);
-
-  nsresult rv;
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  if (aArchivedOriginScope) {
-    rv = aConnection->CreateStatement(
-        nsLiteralCString("SELECT "
-                         "total(utf16Length(key) + utf16Length(value)) "
-                         "FROM webappsstore2 "
-                         "WHERE originKey = :originKey "
-                         "AND originAttributes = :originAttributes;"),
-        getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
 
-    rv = aArchivedOriginScope->BindToStatement(stmt);
-  } else {
-    rv = aConnection->CreateStatement(nsLiteralCString("SELECT usage "
-                                                       "FROM database"),
-                                      getter_AddRefs(stmt));
-  }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(
+      const auto& stmt,
+      ([aArchivedOriginScope,
+        &aConnection]() -> Result<nsCOMPtr<mozIStorageStatement>, nsresult> {
+        if (aArchivedOriginScope) {
+          LS_TRY_RETURN(CreateAndExecuteSingleStepStatement<
+                        SingleStepResult::ReturnNullIfNoResult>(
+              aConnection,
+              "SELECT "
+              "total(utf16Length(key) + utf16Length(value)) "
+              "FROM webappsstore2 "
+              "WHERE originKey = :originKey "
+              "AND originAttributes = :originAttributes;"_ns,
+              [aArchivedOriginScope](auto& stmt) -> Result<Ok, nsresult> {
+                LS_TRY(aArchivedOriginScope->BindToStatement(&stmt));
+                return Ok{};
+              }));
+        }
 
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+        LS_TRY_RETURN(CreateAndExecuteSingleStepStatement<
+                      SingleStepResult::ReturnNullIfNoResult>(
+            aConnection, "SELECT usage FROM database"_ns));
+      }()));
 
-  if (NS_WARN_IF(!hasResult)) {
-    return NS_ERROR_FAILURE;
-  }
+  LS_TRY(OkIf(stmt), Err(NS_ERROR_FAILURE));
 
-  int64_t usage;
-  rv = stmt->GetInt64(0, &usage);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  *aUsage = usage;
-  return NS_OK;
+  LS_TRY_RETURN(MOZ_TO_RESULT_INVOKE(stmt, GetInt64, 0));
 }
 
 void ShadowWritesPrefChangedCallback(const char* aPrefName, void* aClosure) {
@@ -3261,52 +3141,78 @@
   gClientValidation = Preferences::GetBool(aPrefName, kDefaultClientValidation);
 }
 
-template <typename P>
-void CollectDatabases(P aPredicate, nsTArray<RefPtr<Database>>& aDatabases) {
-  AssertIsOnBackgroundThread();
+template <typename Condition>
+void InvalidatePrepareDatastoreOpsMatching(const Condition& aCondition) {
+  if (!gPrepareDatastoreOps) {
+    return;
+  }
 
-  if (!gLiveDatabases) {
+  for (const auto& prepareDatastoreOp : *gPrepareDatastoreOps) {
+    if (aCondition(*prepareDatastoreOp)) {
+      prepareDatastoreOp->Invalidate();
+    }
+  }
+}
+
+template <typename Condition>
+void InvalidatePreparedDatastoresMatching(const Condition& aCondition) {
+  if (!gPreparedDatastores) {
     return;
   }
 
-  for (const auto& database : *gLiveDatabases) {
-    if (aPredicate(database)) {
-      aDatabases.AppendElement(database);
+  for (const auto& preparedDatastoreEntry : *gPreparedDatastores) {
+    const auto& preparedDatastore = preparedDatastoreEntry.GetData();
+    MOZ_ASSERT(preparedDatastore);
+
+    if (aCondition(*preparedDatastore)) {
+      preparedDatastore->Invalidate();
     }
   }
 }
 
-template <typename P>
-void RequestAllowToCloseIf(P aPredicate) {
+template <typename Condition>
+nsTArray<RefPtr<Database>> CollectDatabasesMatching(Condition aCondition) {
   AssertIsOnBackgroundThread();
 
+  if (!gLiveDatabases) {
+    return nsTArray<RefPtr<Database>>{};
+  }
+
   nsTArray<RefPtr<Database>> databases;
 
-  CollectDatabases(aPredicate, databases);
+  for (const auto& database : *gLiveDatabases) {
+    if (aCondition(*database)) {
+      databases.AppendElement(database.get());
+    }
+  }
+
+  return databases;
+}
+
+template <typename Condition>
+void RequestAllowToCloseDatabasesMatching(Condition aCondition) {
+  AssertIsOnBackgroundThread();
+
+  nsTArray<RefPtr<Database>> databases = CollectDatabasesMatching(aCondition);
 
   for (const auto& database : databases) {
     MOZ_ASSERT(database);
 
     database->RequestAllowToClose();
   }
-
-  databases.Clear();
 }
 
-void ForceKillDatabases() {
+void ForceKillAllDatabases() {
   AssertIsOnBackgroundThread();
 
-  nsTArray<RefPtr<Database>> databases;
-
-  CollectDatabases([](const Database* const) { return true; }, databases);
+  nsTArray<RefPtr<Database>> databases =
+      CollectDatabasesMatching([](const auto&) { return true; });
 
   for (const auto& database : databases) {
     MOZ_ASSERT(database);
 
     database->ForceKill();
   }
-
-  databases.Clear();
 }
 
 bool VerifyPrincipalInfo(const PrincipalInfo& aPrincipalInfo,
@@ -3460,11 +3366,11 @@
 
   auto* database = static_cast<Database*>(aActor);
 
-  database->SetActorAlive(preparedDatastore->GetDatastore());
+  database->SetActorAlive(&preparedDatastore->MutableDatastoreRef());
 
-  // It's possible that AbortOperations was called before the database actor
-  // was created and became live. Let the child know that the database in no
-  // longer valid.
+  // It's possible that AbortOperationsForLocks was called before the database
+  // actor was created and became live. Let the child know that the database is
+  // no longer valid.
   if (preparedDatastore->IsInvalidated()) {
     database->RequestAllowToClose();
   }
@@ -3584,7 +3490,8 @@
       if (!gPrepareDatastoreOps) {
         gPrepareDatastoreOps = new PrepareDatastoreOpArray();
       }
-      gPrepareDatastoreOps->AppendElement(prepareDatastoreOp);
+      gPrepareDatastoreOps->AppendElement(
+          WrapNotNullUnchecked(prepareDatastoreOp.get()));
 
       actor = std::move(prepareDatastoreOp);
 
@@ -3881,30 +3788,24 @@
     return rv;
   }
 
-  rv = aConnection->GetCachedStatement(nsLiteralCString("SELECT usage "
-                                                        "FROM database"),
-                                       &stmt);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  {
+    LS_TRY_INSPECT(const auto& stmt,
+                   CreateAndExecuteSingleStepStatement<
+                       SingleStepResult::ReturnNullIfNoResult>(
+                       *aConnection->StorageConnection(),
+                       "SELECT usage FROM database"_ns));
 
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+    LS_TRY(OkIf(stmt), NS_ERROR_FAILURE);
 
-  if (NS_WARN_IF(!hasResult)) {
-    return NS_ERROR_FAILURE;
-  }
+    int64_t usage;
+    rv = stmt->GetInt64(0, &usage);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
 
-  int64_t usage;
-  rv = stmt->GetInt64(0, &usage);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    aOutUsage = usage;
   }
 
-  aOutUsage = usage;
   return NS_OK;
 }
 
@@ -4360,8 +4261,8 @@
     return NS_OK;
   }
 
-  RefPtr<InitStorageAndOriginHelper> helper =
-      new InitStorageAndOriginHelper(mQuotaInfo);
+  RefPtr<InitTemporaryOriginHelper> helper =
+      new InitTemporaryOriginHelper(mQuotaInfo);
 
   nsString originDirectoryPath;
   rv = helper->BlockAndReturnOriginDirectoryPath(originDirectoryPath);
@@ -4413,16 +4314,11 @@
   MOZ_ASSERT(!exists);
 #endif
 
-  nsCOMPtr<nsIFile> usageFile;
-  rv = GetUsageFile(mDirectoryPath, getter_AddRefs(usageFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& usageFile, GetUsageFile(mDirectoryPath));
 
   nsCOMPtr<mozIStorageConnection> storageConnection;
-  bool removedUsageFile;
 
-  auto autoRemove = MakeScopeExit([&] {
+  auto autoRemove = MakeScopeExit([&storageConnection, &directoryEntry] {
     if (storageConnection) {
       MOZ_ALWAYS_SUCCEEDS(storageConnection->Close());
     }
@@ -4434,15 +4330,12 @@
     }
   });
 
-  rv = CreateStorageConnection(directoryEntry, usageFile, Origin(),
-                               getter_AddRefs(storageConnection),
-                               &removedUsageFile);
+  bool removedUsageFile;
 
-  MOZ_ASSERT(!removedUsageFile);
+  LS_TRY_UNWRAP(std::tie(storageConnection, removedUsageFile),
+                CreateStorageConnection(*directoryEntry, *usageFile, Origin()));
 
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  MOZ_ASSERT(!removedUsageFile);
 
   MOZ_ASSERT(mQuotaClient);
 
@@ -4647,7 +4540,7 @@
 }
 
 nsresult
-Connection::InitStorageAndOriginHelper::BlockAndReturnOriginDirectoryPath(
+Connection::InitTemporaryOriginHelper::BlockAndReturnOriginDirectoryPath(
     nsAString& aOriginDirectoryPath) {
   AssertIsOnConnectionThread();
 
@@ -4670,16 +4563,17 @@
   return NS_OK;
 }
 
-nsresult Connection::InitStorageAndOriginHelper::RunOnIOThread() {
+nsresult Connection::InitTemporaryOriginHelper::RunOnIOThread() {
   AssertIsOnIOThread();
 
   QuotaManager* quotaManager = QuotaManager::Get();
   MOZ_ASSERT(quotaManager);
 
   LS_TRY_INSPECT(const auto& directoryEntry,
-                 quotaManager->EnsureStorageAndOriginIsInitialized(
-                     PERSISTENCE_TYPE_DEFAULT, mQuotaInfo,
-                     mozilla::dom::quota::Client::LS));
+                 quotaManager
+                     ->EnsureTemporaryOriginIsInitialized(
+                         PERSISTENCE_TYPE_DEFAULT, mQuotaInfo)
+                     .map([](const auto& res) { return res.first; }));
 
   nsresult rv = directoryEntry->GetPath(mOriginDirectoryPath);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -4690,7 +4584,7 @@
 }
 
 NS_IMETHODIMP
-Connection::InitStorageAndOriginHelper::Run() {
+Connection::InitTemporaryOriginHelper::Run() {
   AssertIsOnIOThread();
 
   nsresult rv = RunOnIOThread();
@@ -4730,18 +4624,11 @@
     return rv;
   }
 
-  nsCOMPtr<nsIFile> usageFile;
-  rv = GetUsageFile(mConnection->DirectoryPath(), getter_AddRefs(usageFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& usageFile,
+                 GetUsageFile(mConnection->DirectoryPath()));
 
-  nsCOMPtr<nsIFile> usageJournalFile;
-  rv = GetUsageJournalFile(mConnection->DirectoryPath(),
-                           getter_AddRefs(usageJournalFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& usageJournalFile,
+                 GetUsageJournalFile(mConnection->DirectoryPath()));
 
   rv = UpdateUsageFile(usageFile, usageJournalFile, usage);
   if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -4949,6 +4836,16 @@
 
   mPrepareDatastoreOps.RemoveEntry(aPrepareDatastoreOp);
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "PrepareDatastoreOp finished"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   MaybeClose();
 }
 
@@ -4969,6 +4866,16 @@
 
   mHasLivePrivateDatastore = false;
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "PrivateDatastore finished"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   MaybeClose();
 }
 
@@ -4993,6 +4900,16 @@
 
   mPreparedDatastores.RemoveEntry(aPreparedDatastore);
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "PreparedDatastore finished"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   MaybeClose();
 }
 
@@ -5016,6 +4933,16 @@
 
   mDatabases.RemoveEntry(aDatabase);
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "Database finished"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   MaybeClose();
 }
 
@@ -5675,6 +5602,16 @@
   MOZ_ASSERT(gDatastores->Get(mGroupAndOrigin.mOrigin));
   gDatastores->Remove(mGroupAndOrigin.mOrigin);
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "Datastore removed"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   if (!gDatastores->Count()) {
     gDatastores = nullptr;
   }
@@ -5766,7 +5703,7 @@
     gLiveDatabases = new LiveDatabaseArray();
   }
 
-  gLiveDatabases->AppendElement(this);
+  gLiveDatabases->AppendElement(WrapNotNullUnchecked(this));
 }
 
 void Database::RegisterSnapshot(Snapshot* aSnapshot) {
@@ -5872,6 +5809,9 @@
   MOZ_ASSERT(gLiveDatabases);
   gLiveDatabases->RemoveElement(this);
 
+  // XXX Record removal from gLiveDatabase here as well, once we have an easy
+  // way to record a shutdown step here.
+
   if (gLiveDatabases->IsEmpty()) {
     gLiveDatabases = nullptr;
   }
@@ -6932,7 +6872,6 @@
       mForPreload(aParams.type() ==
                   LSRequestParams::TLSRequestPreloadDatastoreParams),
       mDatabaseNotAvailable(false),
-      mRequestedDirectoryLock(false),
       mInvalidated(false)
 #ifdef DEBUG
       ,
@@ -7032,10 +6971,11 @@
     case NestedState::CheckClosingDatastore: {
       for (uint32_t index = gPrepareDatastoreOps->Length(); index > 0;
            index--) {
-        PrepareDatastoreOp* existingOp = (*gPrepareDatastoreOps)[index - 1];
+        const auto& existingOp = (*gPrepareDatastoreOps)[index - 1];
 
         if (existingOp->mDelayedOp == this) {
-          LS_LOG(("  mDelayedBy: [%p]", existingOp));
+          LS_LOG(("  mDelayedBy: [%p]",
+                  static_cast<PrepareDatastoreOp*>(existingOp.get())));
 
           existingOp->Log();
 
@@ -7154,7 +7094,7 @@
   // See if this PrepareDatastoreOp needs to wait.
   bool foundThis = false;
   for (uint32_t index = gPrepareDatastoreOps->Length(); index > 0; index--) {
-    PrepareDatastoreOp* existingOp = (*gPrepareDatastoreOps)[index - 1];
+    const auto& existingOp = (*gPrepareDatastoreOps)[index - 1];
 
     if (existingOp == this) {
       foundThis = true;
@@ -7308,8 +7248,6 @@
       PERSISTENCE_TYPE_DEFAULT, mQuotaInfo, mozilla::dom::quota::Client::LS,
       /* aExclusive */ false, this);
 
-  mRequestedDirectoryLock = true;
-
   return NS_OK;
 }
 
@@ -7324,11 +7262,11 @@
   // are preparing a datastore for private browsing.
   // Note that we do use a directory lock for private browsing even though we
   // don't do any stuff on disk. The thing is that without a directory lock,
-  // quota manager wouldn't call AbortOperations for our private browsing
-  // origin when a clear origin operation is requested. AbortOperations
-  // requests all databases to close and the datastore is destroyed in the end.
-  // Any following LocalStorage API call will trigger preparation of a new
-  // (empty) datastore.
+  // quota manager wouldn't call AbortOperationsForLocks for our private
+  // browsing origin when a clear origin operation is requested.
+  // AbortOperationsForLocks requests all databases to close and the datastore
+  // is destroyed in the end. Any following LocalStorage API call will trigger
+  // preparation of a new (empty) datastore.
   if (mPrivateBrowsingId) {
     FinishNesting();
 
@@ -7373,10 +7311,11 @@
     return rv;
   }
 
-  uint64_t usage;
-  bool hasUsage =
-      quotaManager->GetUsageForClient(PERSISTENCE_TYPE_DEFAULT, mQuotaInfo,
-                                      mozilla::dom::quota::Client::LS, usage);
+  const UsageInfo usageInfo = quotaManager->GetUsageForClient(
+      PERSISTENCE_TYPE_DEFAULT, mQuotaInfo, mozilla::dom::quota::Client::LS);
+
+  const bool hasUsage = usageInfo.DatabaseUsage().isSome();
+  MOZ_ASSERT(usageInfo.FileUsage().isNothing());
 
   if (!gArchivedOrigins) {
     rv = LoadArchivedOrigins();
@@ -7406,19 +7345,20 @@
       ([hasDataForMigration, &quotaManager,
         this]() -> mozilla::Result<nsCOMPtr<nsIFile>, nsresult> {
         if (hasDataForMigration) {
-          LS_TRY_RETURN(quotaManager->EnsureStorageAndOriginIsInitialized(
-              PERSISTENCE_TYPE_DEFAULT, mQuotaInfo,
-              mozilla::dom::quota::Client::LS));
-        } else {
-          LS_TRY_UNWRAP(auto directoryEntry,
-                        quotaManager->GetDirectoryForOrigin(
-                            PERSISTENCE_TYPE_DEFAULT, Origin()));
+          LS_TRY_RETURN(quotaManager
+                            ->EnsureTemporaryOriginIsInitialized(
+                                PERSISTENCE_TYPE_DEFAULT, mQuotaInfo)
+                            .map([](const auto& res) { return res.first; }));
+        }
 
-          quotaManager->EnsureQuotaForOrigin(PERSISTENCE_TYPE_DEFAULT,
-                                             mQuotaInfo);
+        LS_TRY_UNWRAP(auto directoryEntry,
+                      quotaManager->GetDirectoryForOrigin(
+                          PERSISTENCE_TYPE_DEFAULT, Origin()));
 
-          return directoryEntry;
-        }
+        quotaManager->EnsureQuotaForOrigin(PERSISTENCE_TYPE_DEFAULT,
+                                           mQuotaInfo);
+
+        return directoryEntry;
       }()));
 
   rv =
@@ -7467,7 +7407,9 @@
   if (alreadyExisted) {
     // The database does exist.
     MOZ_ASSERT(hasUsage);
-    mUsage = usage;
+
+    // XXX Change type of mUsage to UsageInfo or DatabaseUsageType.
+    mUsage = usageInfo.DatabaseUsage().valueOr(0);
   } else {
     // The database doesn't exist.
     MOZ_ASSERT(!hasUsage);
@@ -7485,23 +7427,14 @@
   // from now on.
   RefPtr<QuotaObject> quotaObject;
 
-  nsCOMPtr<nsIFile> usageFile;
-  rv = GetUsageFile(directoryPath, getter_AddRefs(usageFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  nsCOMPtr<nsIFile> usageJournalFile;
-  rv = GetUsageJournalFile(directoryPath, getter_AddRefs(usageJournalFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& usageFile, GetUsageFile(directoryPath));
 
-  nsCOMPtr<mozIStorageConnection> connection;
-  bool removedUsageFile;
+  LS_TRY_INSPECT(const auto& usageJournalFile,
+                 GetUsageJournalFile(directoryPath));
 
-  rv = CreateStorageConnection(directoryEntry, usageFile, Origin(),
-                               getter_AddRefs(connection), &removedUsageFile);
+  LS_TRY_INSPECT(
+      (const auto& [connection, removedUsageFile]),
+      CreateStorageConnection(*directoryEntry, *usageFile, Origin()));
 
   // removedUsageFile must be checked before rv since we may need to reset usage
   // even when CreateStorageConnection failed.
@@ -7535,11 +7468,8 @@
       return rv;
     }
 
-    int64_t newUsage;
-    rv = GetUsage(connection, mArchivedOriginScope.get(), &newUsage);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    LS_TRY_INSPECT(const int64_t& newUsage,
+                   GetUsage(*connection, mArchivedOriginScope.get()));
 
     if (!quotaObject) {
       quotaObject = GetQuotaObject();
@@ -7766,26 +7696,15 @@
   AssertIsOnIOThread();
   MOZ_ASSERT(aConnection);
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = aConnection->CreateStatement(nsLiteralCString("SELECT origin "
-                                                              "FROM database"),
-                                             getter_AddRefs(stmt));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  LS_TRY_INSPECT(const auto& stmt,
+                 CreateAndExecuteSingleStepStatement<
+                     SingleStepResult::ReturnNullIfNoResult>(
+                     *aConnection, "SELECT origin FROM database"_ns));
 
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  if (NS_WARN_IF(!hasResult)) {
-    return NS_ERROR_FILE_CORRUPTED;
-  }
+  LS_TRY(OkIf(stmt), NS_ERROR_FILE_CORRUPTED);
 
   nsCString origin;
-  rv = stmt->GetUTF8String(0, origin);
+  nsresult rv = stmt->GetUTF8String(0, origin);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -8125,6 +8044,16 @@
   MOZ_ASSERT(gPrepareDatastoreOps);
   gPrepareDatastoreOps->RemoveElement(this);
 
+  // XXX Can we store a strong reference to the quota client ourselves to avoid
+  // going through mConnection?
+  if (mConnection) {
+    mConnection->GetQuotaClient()->MaybeRecordShutdownStep(
+        "PrepareDatastoreOp completed"_ns);
+  } else {
+    // XXX Bug 1681670 will change reporting to go to the quota manager instead,
+    // which resolves this case.
+  }
+
   if (gPrepareDatastoreOps->IsEmpty()) {
     gPrepareDatastoreOps = nullptr;
   }
@@ -8863,219 +8792,130 @@
   QuotaManager* quotaManager = QuotaManager::Get();
   MOZ_ASSERT(quotaManager);
 
-  LS_TRY_UNWRAP(auto directory, quotaManager->GetDirectoryForOrigin(
-                                    aPersistenceType, aGroupAndOrigin.mOrigin));
+  LS_TRY_INSPECT(const auto& directory,
+                 quotaManager->GetDirectoryForOrigin(aPersistenceType,
+                                                     aGroupAndOrigin.mOrigin));
 
   MOZ_ASSERT(directory);
 
-  nsresult rv =
-      directory->Append(NS_LITERAL_STRING_FROM_CSTRING(LS_DIRECTORY_NAME));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Append);
-    return Err(rv);
-  }
+  LS_TRY(directory->Append(NS_LITERAL_STRING_FROM_CSTRING(LS_DIRECTORY_NAME)));
 
 #ifdef DEBUG
-  bool exists;
-  rv = directory->Exists(&exists);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Exists);
-    return Err(rv);
+  {
+    LS_TRY_INSPECT(const bool& exists, MOZ_TO_RESULT_INVOKE(directory, Exists));
+    MOZ_ASSERT(exists);
   }
-
-  MOZ_ASSERT(exists);
 #endif
 
-  nsString directoryPath;
-  rv = directory->GetPath(directoryPath);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetPath);
-    return Err(rv);
-  }
+  LS_TRY_INSPECT(const auto& directoryPath,
+                 MOZ_TO_RESULT_INVOKE_TYPED(nsString, directory, GetPath));
 
-  nsCOMPtr<nsIFile> usageFile;
-  rv = GetUsageFile(directoryPath, getter_AddRefs(usageFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetUsageFile);
-    return Err(rv);
-  }
+  LS_TRY_INSPECT(const auto& usageFile, GetUsageFile(directoryPath));
 
-  bool usageFileExists;
+  // XXX Try to make usageFileExists const
+  LS_TRY_UNWRAP(bool usageFileExists, ExistsAsFile(*usageFile));
 
-  bool isDirectory;
-  rv = usageFile->IsDirectory(&isDirectory);
-  if (rv != NS_ERROR_FILE_NOT_FOUND &&
-      rv != NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_IsDirectory);
-      return Err(rv);
-    }
+  LS_TRY_INSPECT(const auto& usageJournalFile,
+                 GetUsageJournalFile(directoryPath));
 
-    if (NS_WARN_IF(isDirectory)) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaInternalError, LS_UnexpectedDir);
-      return Err(NS_ERROR_FAILURE);
-    }
-
-    usageFileExists = true;
-  } else {
-    usageFileExists = false;
-  }
-
-  UsageInfo res;
-
-  nsCOMPtr<nsIFile> usageJournalFile;
-  rv = GetUsageJournalFile(directoryPath, getter_AddRefs(usageJournalFile));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetUsageForJFile);
-    return Err(rv);
-  }
-
-  rv = usageJournalFile->IsDirectory(&isDirectory);
-  if (rv != NS_ERROR_FILE_NOT_FOUND &&
-      rv != NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_IsDirectory2);
-      return Err(rv);
-    }
-
-    if (NS_WARN_IF(isDirectory)) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaInternalError, LS_UnexpectedDir2);
-      return Err(NS_ERROR_FAILURE);
-    }
+  LS_TRY_INSPECT(const bool& usageJournalFileExists,
+                 ExistsAsFile(*usageJournalFile));
 
+  if (usageJournalFileExists) {
     if (usageFileExists) {
-      rv = usageFile->Remove(false);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Remove);
-        return Err(rv);
-      }
+      LS_TRY(usageFile->Remove(false));
 
       usageFileExists = false;
     }
 
-    rv = usageJournalFile->Remove(false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Remove2);
-      return Err(rv);
-    }
-  }
-
-  nsCOMPtr<nsIFile> file;
-  rv = directory->Clone(getter_AddRefs(file));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Clone);
-    return Err(rv);
+    LS_TRY(usageJournalFile->Remove(false));
   }
 
-  rv = file->Append(kDataFileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Append2);
-    return Err(rv);
-  }
+  LS_TRY_INSPECT(const auto& file,
+                 CloneFileAndAppend(*directory, kDataFileName));
 
-  rv = file->IsDirectory(&isDirectory);
-  if (rv != NS_ERROR_FILE_NOT_FOUND &&
-      rv != NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) {
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_IsDirectory3);
-      return Err(rv);
-    }
+  LS_TRY_INSPECT(const bool& fileExists, ExistsAsFile(*file));
 
-    if (NS_WARN_IF(isDirectory)) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaInternalError, LS_UnexpectedDir3);
-      return Err(NS_ERROR_FAILURE);
-    }
-
-    int64_t usage;
-    rv = LoadUsageFile(usageFile, &usage);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      nsCOMPtr<mozIStorageConnection> connection;
-      bool dummy;
-      rv = CreateStorageConnection(file, usageFile, aGroupAndOrigin.mOrigin,
-                                   getter_AddRefs(connection), &dummy);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_CreateConnection);
-        return Err(rv);
-      }
-
-      rv = GetUsage(connection, /* aArchivedOriginScope */ nullptr, &usage);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetUsage);
-        return Err(rv);
-      }
-
-      rv = UpdateUsageFile(usageFile, usageJournalFile, usage);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_UpdateUsageFile);
-        return Err(rv);
-      }
-
-      rv = usageJournalFile->Remove(false);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Remove3);
-        return Err(rv);
-      }
-    }
+  LS_TRY_INSPECT(
+      const UsageInfo& res,
+      ([fileExists, usageFileExists, &file, &usageFile, &usageJournalFile,
+        &aGroupAndOrigin]() -> Result<UsageInfo, nsresult> {
+        if (fileExists) {
+          LS_TRY_RETURN(
+              LoadUsageFile(*usageFile)
+                  .orElse([&file, &usageFile, &usageJournalFile,
+                           &aGroupAndOrigin](
+                              const nsresult) -> Result<UsageInfo, nsresult> {
+                    LS_TRY_INSPECT(
+                        (const auto& [connection, usageFileRemoved]),
+                        CreateStorageConnection(*file, *usageFile,
+                                                aGroupAndOrigin.mOrigin));
+
+                    Unused << usageFileRemoved;
+
+                    LS_TRY_INSPECT(
+                        const int64_t& usage,
+                        GetUsage(*connection,
+                                 /* aArchivedOriginScope */ nullptr));
+
+                    LS_TRY(UpdateUsageFile(usageFile, usageJournalFile, usage));
+
+                    LS_TRY(usageJournalFile->Remove(false));
+
+                    MOZ_ASSERT(usage >= 0);
+                    return UsageInfo{DatabaseUsageType(Some(uint64_t(usage)))};
+                  }));
+        }
 
-    MOZ_ASSERT(usage >= 0);
+        if (usageFileExists) {
+          LS_TRY(usageFile->Remove(false));
+        }
 
-    res += DatabaseUsageType(Some(uint64_t(usage)));
-  } else if (usageFileExists) {
-    rv = usageFile->Remove(false);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_Remove4);
-      return Err(rv);
-    }
-  }
+        return UsageInfo{};
+      }()));
 
   // Report unknown files in debug builds, but don't fail, just warn.
 
 #ifdef DEBUG
-  nsCOMPtr<nsIDirectoryEnumerator> directoryEntries;
-  rv = directory->GetDirectoryEntries(getter_AddRefs(directoryEntries));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetDirEntries);
-    return Err(rv);
-  }
-
-  while (!aCanceled) {
-    nsCOMPtr<nsIFile> file;
-    rv = directoryEntries->GetNextFile(getter_AddRefs(file));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetNextFile);
-      return Err(rv);
-    }
-
-    if (!file) {
-      break;
-    }
-
-    bool isDirectory;
-    rv = file->IsDirectory(&isDirectory);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_IsDirectory4);
-      return Err(rv);
-    }
+  {
+    LS_TRY_INSPECT(const auto& directoryEntries,
+                   MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<nsIDirectoryEnumerator>,
+                                              directory, GetDirectoryEntries));
+
+    LS_TRY(CollectEach(
+        [&directoryEntries,
+         &aCanceled]() -> Result<nsCOMPtr<nsIFile>, nsresult> {
+          if (aCanceled) {
+            return nsCOMPtr<nsIFile>{};
+          }
 
-    if (isDirectory) {
-      Unused << WARN_IF_FILE_IS_UNKNOWN(*file);
-      continue;
-    }
+          LS_TRY_RETURN(MOZ_TO_RESULT_INVOKE_TYPED(
+              nsCOMPtr<nsIFile>, directoryEntries, GetNextFile));
+        },
+        [](const nsCOMPtr<nsIFile>& file) -> Result<Ok, nsresult> {
+          LS_TRY_INSPECT(const bool& isDirectory,
+                         MOZ_TO_RESULT_INVOKE(file, IsDirectory));
+
+          if (isDirectory) {
+            Unused << WARN_IF_FILE_IS_UNKNOWN(*file);
+            return Ok{};
+          }
 
-    nsString leafName;
-    rv = file->GetLeafName(leafName);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, LS_GetLeafName);
-      return Err(rv);
-    }
+          LS_TRY_INSPECT(
+              const auto& leafName,
+              MOZ_TO_RESULT_INVOKE_TYPED(nsString, file, GetLeafName));
+
+          if (leafName.Equals(kDataFileName) ||
+              leafName.Equals(kJournalFileName) ||
+              leafName.Equals(kUsageFileName) ||
+              leafName.Equals(kUsageJournalFileName)) {
+            return Ok{};
+          }
 
-    if (leafName.Equals(kDataFileName) || leafName.Equals(kJournalFileName) ||
-        leafName.Equals(kUsageFileName) ||
-        leafName.Equals(kUsageJournalFileName)) {
-      continue;
-    }
+          Unused << WARN_IF_FILE_IS_UNKNOWN(*file);
 
-    Unused << WARN_IF_FILE_IS_UNKNOWN(*file);
+          return Ok{};
+        }));
   }
 #endif
 
@@ -9107,14 +8947,8 @@
   QuotaManager* quotaManager = QuotaManager::Get();
   MOZ_ASSERT(quotaManager);
 
-  UsageInfo res;
-  uint64_t usage;
-  if (quotaManager->GetUsageForClient(PERSISTENCE_TYPE_DEFAULT, aGroupAndOrigin,
-                                      Client::LS, usage)) {
-    res += DatabaseUsageType(Some(usage));
-  }
-
-  return res;
+  return quotaManager->GetUsageForClient(PERSISTENCE_TYPE_DEFAULT,
+                                         aGroupAndOrigin, Client::LS);
 }
 
 nsresult QuotaClient::AboutToClearOrigins(
@@ -9293,7 +9127,8 @@
   gArchivedOrigins = nullptr;
 }
 
-void QuotaClient::AbortOperations(const nsACString& aOrigin) {
+void QuotaClient::AbortOperationsForLocks(
+    const DirectoryLockIdTable& aDirectoryLockIds) {
   AssertIsOnBackgroundThread();
 
   // A PrepareDatastoreOp object could already acquire a directory lock for
@@ -9309,72 +9144,94 @@
   // will close the Datastore on the parent side (the closing releases the
   // directory lock).
 
-  if (gPrepareDatastoreOps) {
-    for (PrepareDatastoreOp* prepareDatastoreOp : *gPrepareDatastoreOps) {
-      MOZ_ASSERT(prepareDatastoreOp);
+  InvalidatePrepareDatastoreOpsMatching(
+      [&aDirectoryLockIds](const auto& prepareDatastoreOp) {
+        // Check if the PrepareDatastoreOp holds an acquired DirectoryLock.
+        // Origin clearing can't be blocked by this PrepareDatastoreOp if there
+        // is no acquired DirectoryLock. If there is an acquired DirectoryLock,
+        // check if the table contains the lock for the PrepareDatastoreOp.
+        return IsLockForObjectAcquiredAndContainedInLockTable(
+            prepareDatastoreOp, aDirectoryLockIds);
+      });
 
-      // Explicitely check if a directory lock has been requested.
-      // Origin clearing can't be blocked by this PrepareDatastoreOp if it
-      // hasn't requested a directory lock yet, so we can just ignore it.
-      // This will also guarantee that PrepareDatastoreOp has a known origin.
-      // And it also ensures that the ordering is right. Without the check we
-      // could invalidate ops whose directory locks were requested after we
-      // requested a directory lock for origin clearing.
-      if (!prepareDatastoreOp->RequestedDirectoryLock()) {
-        continue;
-      }
+  if (gPrivateDatastores) {
+    gPrivateDatastores->RemoveIf([&aDirectoryLockIds](const auto& iter) {
+      const auto& privateDatastore = iter.Data();
 
-      MOZ_ASSERT(prepareDatastoreOp->OriginIsKnown());
+      // The PrivateDatastore::mDatastore member is not cleared until the
+      // PrivateDatastore is destroyed.
+      const auto& datastore = privateDatastore->DatastoreRef();
+
+      // If the PrivateDatastore exists then it must be registered in
+      // Datastore::mHasLivePrivateDatastore as well. The Datastore must have
+      // a DirectoryLock if there is a registered PrivateDatastore.
+      return IsLockForObjectContainedInLockTable(datastore, aDirectoryLockIds);
+    });
 
-      if (aOrigin.IsVoid() || prepareDatastoreOp->Origin() == aOrigin) {
-        prepareDatastoreOp->Invalidate();
-      }
+    if (!gPrivateDatastores->Count()) {
+      gPrivateDatastores = nullptr;
     }
   }
 
-  if (gPrivateDatastores &&
-      (aOrigin.IsVoid() ||
-       (gPrivateDatastores->Remove(aOrigin) && !gPrivateDatastores->Count()))) {
-    gPrivateDatastores = nullptr;
-  }
-
-  if (gPreparedDatastores) {
-    for (auto iter = gPreparedDatastores->ConstIter(); !iter.Done();
-         iter.Next()) {
-      const auto& preparedDatastore = iter.Data();
-      MOZ_ASSERT(preparedDatastore);
+  InvalidatePreparedDatastoresMatching([&aDirectoryLockIds](
+                                           const auto& preparedDatastore) {
+    // The PreparedDatastore::mDatastore member is not cleared until the
+    // PreparedDatastore is destroyed.
+    const auto& datastore = preparedDatastore.DatastoreRef();
 
-      if (aOrigin.IsVoid() || preparedDatastore->Origin() == aOrigin) {
-        preparedDatastore->Invalidate();
-      }
-    }
-  }
+    // If the PreparedDatastore exists then it must be registered in
+    // Datastore::mPreparedDatastores as well. The Datastore must have a
+    // DirectoryLock if there are registered PreparedDatastore objects.
+    return IsLockForObjectContainedInLockTable(datastore, aDirectoryLockIds);
+  });
 
-  if (aOrigin.IsVoid()) {
-    RequestAllowToCloseIf([](const Database* const) { return true; });
-  } else {
-    RequestAllowToCloseIf([&aOrigin](const Database* const aDatabase) {
-      return aDatabase->Origin() == aOrigin;
-    });
-  }
+  RequestAllowToCloseDatabasesMatching(
+      [&aDirectoryLockIds](const auto& database) {
+        const auto& maybeDatastore = database.MaybeDatastoreRef();
+
+        // If the Database is registered in gLiveDatabases then it must have a
+        // Datastore.
+        MOZ_ASSERT(maybeDatastore.isSome());
+
+        // If the Database is registered in gLiveDatabases then it must be
+        // registered in Datastore::mDatabases as well. The Datastore must have
+        // a DirectoryLock if there are registered Database objects.
+        return IsLockForObjectContainedInLockTable(*maybeDatastore,
+                                                   aDirectoryLockIds);
+      });
 }
 
 void QuotaClient::AbortOperationsForProcess(ContentParentId aContentParentId) {
   AssertIsOnBackgroundThread();
 
-  RequestAllowToCloseIf([aContentParentId](const Database* const aDatabase) {
-    return aDatabase->IsOwnedByProcess(aContentParentId);
+  RequestAllowToCloseDatabasesMatching(
+      [&aContentParentId](const auto& database) {
+        return database.IsOwnedByProcess(aContentParentId);
+      });
+}
+
+void QuotaClient::AbortAllOperations() {
+  AssertIsOnBackgroundThread();
+
+  InvalidatePrepareDatastoreOpsMatching([](const auto& prepareDatastoreOp) {
+    return prepareDatastoreOp.MaybeDirectoryLockRef();
   });
+
+  if (gPrivateDatastores) {
+    gPrivateDatastores = nullptr;
+  }
+
+  InvalidatePreparedDatastoresMatching([](const auto&) { return true; });
+
+  RequestAllowToCloseDatabasesMatching([](const auto&) { return true; });
 }
 
 void QuotaClient::StartIdleMaintenance() { AssertIsOnBackgroundThread(); }
 
 void QuotaClient::StopIdleMaintenance() { AssertIsOnBackgroundThread(); }
 
-void QuotaClient::ShutdownWorkThreads() {
-  AssertIsOnBackgroundThread();
+void QuotaClient::InitiateShutdown() {
   MOZ_ASSERT(!mShutdownRequested);
-
   mShutdownRequested = true;
 
   // gPrepareDatastoreOps are short lived objects running a state machine.
@@ -9395,52 +9252,24 @@
     gPreparedDatastores = nullptr;
   }
 
-  RequestAllowToCloseIf([](const Database* const) { return true; });
+  RequestAllowToCloseDatabasesMatching([](const auto&) { return true; });
 
   if (gPreparedObsevers) {
     gPreparedObsevers->Clear();
     gPreparedObsevers = nullptr;
   }
+}
 
-  nsCOMPtr<nsITimer> timer = NS_NewTimer();
-
-  MOZ_ALWAYS_SUCCEEDS(timer->InitWithNamedFuncCallback(
-      [](nsITimer* aTimer, void* aClosure) {
-        ForceKillDatabases();
-
-        MOZ_ALWAYS_SUCCEEDS(aTimer->InitWithNamedFuncCallback(
-            [](nsITimer* aTimer, void* aClosure) {
-              auto quotaClient = static_cast<QuotaClient*>(aClosure);
-
-              quotaClient->ShutdownTimedOut();
-            },
-            aClosure, SHUTDOWN_FORCE_CRASH_TIMEOUT_MS, nsITimer::TYPE_ONE_SHOT,
-            "localstorage::QuotaClient::ShutdownWorkThreads::ForceCrashTimer"));
-      },
-      this, SHUTDOWN_FORCE_KILL_TIMEOUT_MS, nsITimer::TYPE_ONE_SHOT,
-      "localstorage::QuotaClient::ShutdownWorkThreads::ForceKillTimer"));
-
-  // This should release any local storage related quota objects or directory
-  // locks.
-  MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() {
-    // Don't have to check gPrivateDatastores and gPreparedDatastores since we
-    // nulled it out above.
-    return !gPrepareDatastoreOps && !gDatastores && !gLiveDatabases;
-  }));
-
-  MOZ_ALWAYS_SUCCEEDS(timer->Cancel());
-
-  // And finally, shutdown the connection thread.
-  if (gConnectionThread) {
-    gConnectionThread->Shutdown();
-
-    gConnectionThread = nullptr;
-  }
+bool QuotaClient::IsShutdownCompleted() const {
+  // Don't have to check gPrivateDatastores and gPreparedDatastores since we
+  // nulled it out in InitiateShutdown.
+  return !gPrepareDatastoreOps && !gDatastores && !gLiveDatabases;
 }
 
-void QuotaClient::ShutdownTimedOut() {
+void QuotaClient::ForceKillActors() { ForceKillAllDatabases(); }
+
+nsCString QuotaClient::GetShutdownStatus() const {
   AssertIsOnBackgroundThread();
-  MOZ_DIAGNOSTIC_ASSERT(gPrepareDatastoreOps || gDatastores || gLiveDatabases);
 
   nsCString data;
 
@@ -9452,8 +9281,6 @@
     nsTHashtable<nsCStringHashKey> ids;
 
     for (const auto& prepareDatastoreOp : *gPrepareDatastoreOps) {
-      MOZ_ASSERT(prepareDatastoreOp);
-
       nsCString id;
       prepareDatastoreOp->Stringify(id);
 
@@ -9494,8 +9321,6 @@
     nsTHashtable<nsCStringHashKey> ids;
 
     for (const auto& database : *gLiveDatabases) {
-      MOZ_ASSERT(database);
-
       nsCString id;
       database->Stringify(id);
 
@@ -9507,10 +9332,16 @@
     data.Append(")\n");
   }
 
-  CrashReporter::AnnotateCrashReport(
-      CrashReporter::Annotation::LocalStorageShutdownTimeout, data);
+  return data;
+}
 
-  MOZ_CRASH("LocalStorage shutdown timed out");
+void QuotaClient::FinalizeShutdown() {
+  // And finally, shutdown the connection thread.
+  if (gConnectionThread) {
+    gConnectionThread->Shutdown();
+
+    gConnectionThread = nullptr;
+  }
 }
 
 nsresult QuotaClient::CreateArchivedOriginScope(
diff -Nru firefox-84.0.2+build1/dom/localstorage/LSObject.cpp firefox-85.0+build1/dom/localstorage/LSObject.cpp
--- firefox-84.0.2+build1/dom/localstorage/LSObject.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/LSObject.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/RemoteLazyInputStreamThread.h"
 #include "mozilla/ScopeExit.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StorageAccess.h"
diff -Nru firefox-84.0.2+build1/dom/localstorage/PBackgroundLSRequest.ipdl firefox-85.0+build1/dom/localstorage/PBackgroundLSRequest.ipdl
--- firefox-84.0.2+build1/dom/localstorage/PBackgroundLSRequest.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/PBackgroundLSRequest.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -4,8 +4,7 @@
 
 include protocol PBackground;
 
-using struct mozilla::null_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/localstorage/SerializationHelpers.h firefox-85.0+build1/dom/localstorage/SerializationHelpers.h
--- firefox-84.0.2+build1/dom/localstorage/SerializationHelpers.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/SerializationHelpers.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include <string>
 #include "chrome/common/ipc_message_utils.h"
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/dom/LSSnapshot.h"
 #include "mozilla/dom/LSValue.h"
 
diff -Nru firefox-84.0.2+build1/dom/localstorage/test/unit/head.js firefox-85.0+build1/dom/localstorage/test/unit/head.js
--- firefox-84.0.2+build1/dom/localstorage/test/unit/head.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/test/unit/head.js	2021-01-18 19:58:09.000000000 +0000
@@ -107,16 +107,16 @@
   return timer;
 }
 
-function init() {
-  let request = Services.qms.init();
-
-  return request;
+function initStorage() {
+  return Services.qms.init();
 }
 
-function initStorageAndOrigin(principal, persistence) {
-  let request = Services.qms.initStorageAndOrigin(principal, persistence, "ls");
+function initTemporaryStorage() {
+  return Services.qms.initTemporaryStorage();
+}
 
-  return request;
+function initTemporaryOrigin(persistence, principal) {
+  return Services.qms.initializeTemporaryOrigin(persistence, principal);
 }
 
 function getOriginUsage(principal, fromMemory = false) {
diff -Nru firefox-84.0.2+build1/dom/localstorage/test/unit/test_groupLimit.js firefox-85.0+build1/dom/localstorage/test/unit/test_groupLimit.js
--- firefox-84.0.2+build1/dom/localstorage/test/unit/test_groupLimit.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/test/unit/test_groupLimit.js	2021-01-18 19:58:10.000000000 +0000
@@ -25,6 +25,7 @@
 
   info("Setting pref");
 
+  Services.prefs.setBoolPref("dom.storage.next_gen", true);
   Services.prefs.setBoolPref("dom.storage.snapshot_reusing", false);
 
   info("Setting limits");
diff -Nru firefox-84.0.2+build1/dom/localstorage/test/unit/test_originInit.js firefox-85.0+build1/dom/localstorage/test/unit/test_originInit.js
--- firefox-84.0.2+build1/dom/localstorage/test/unit/test_originInit.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/test/unit/test_originInit.js	2021-01-18 19:58:09.000000000 +0000
@@ -57,7 +57,13 @@
   }
 
   async function initTestOrigin() {
-    let request = initStorageAndOrigin(principal, "default");
+    let request = initStorage();
+    await requestFinished(request);
+
+    request = initTemporaryStorage();
+    await requestFinished(request);
+
+    request = initTemporaryOrigin("default", principal);
     await requestFinished(request);
   }
 
diff -Nru firefox-84.0.2+build1/dom/localstorage/test/unit/test_usageAfterMigration.js firefox-85.0+build1/dom/localstorage/test/unit/test_usageAfterMigration.js
--- firefox-84.0.2+build1/dom/localstorage/test/unit/test_usageAfterMigration.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/localstorage/test/unit/test_usageAfterMigration.js	2021-01-18 19:58:10.000000000 +0000
@@ -38,10 +38,21 @@
     installPackage("usageAfterMigration_profile");
 
     if (createUsageDir) {
+      // Origin must be initialized before the usage dir is created.
+
+      info("Initializing storage");
+
+      request = initStorage();
+      await requestFinished(request);
+
+      info("Initializing temporary storage");
+
+      request = initTemporaryStorage();
+      await requestFinished(request);
+
       info("Initializing origin");
 
-      // Origin must be initialized before the usage dir is created.
-      request = initStorageAndOrigin(principal, "default");
+      request = initTemporaryOrigin("default", principal);
       await requestFinished(request);
 
       info("Creating usage as a directory");
diff -Nru firefox-84.0.2+build1/dom/manifest/ImageObjectProcessor.jsm firefox-85.0+build1/dom/manifest/ImageObjectProcessor.jsm
--- firefox-84.0.2+build1/dom/manifest/ImageObjectProcessor.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/ImageObjectProcessor.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -17,7 +17,6 @@
  *   .process(aManifest, aBaseURL, aMemberName);
  *
  */
-/* exported EXPORTED_SYMBOLS*/
 
 "use strict";
 
@@ -258,4 +257,4 @@
     }
   }
 };
-var EXPORTED_SYMBOLS = ["ImageObjectProcessor"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ImageObjectProcessor"];
diff -Nru firefox-84.0.2+build1/dom/manifest/ManifestFinder.jsm firefox-85.0+build1/dom/manifest/ManifestFinder.jsm
--- firefox-84.0.2+build1/dom/manifest/ManifestFinder.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/ManifestFinder.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -4,7 +4,6 @@
 "use strict";
 
 var ManifestFinder = {
-  // jshint ignore:line
   /**
    * Check from content process if DOM Window has a conforming
    * manifest link relationship.
@@ -59,7 +58,4 @@
   return true;
 }
 
-var EXPORTED_SYMBOLS = [
-  // jshint ignore:line
-  "ManifestFinder",
-];
+var EXPORTED_SYMBOLS = ["ManifestFinder"];
diff -Nru firefox-84.0.2+build1/dom/manifest/ManifestIcons.jsm firefox-85.0+build1/dom/manifest/ManifestIcons.jsm
--- firefox-84.0.2+build1/dom/manifest/ManifestIcons.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/ManifestIcons.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -84,4 +84,4 @@
   });
 }
 
-var EXPORTED_SYMBOLS = ["ManifestIcons"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ManifestIcons"];
diff -Nru firefox-84.0.2+build1/dom/manifest/Manifest.jsm firefox-85.0+build1/dom/manifest/Manifest.jsm
--- firefox-84.0.2+build1/dom/manifest/Manifest.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/Manifest.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -250,4 +250,4 @@
   },
 };
 
-var EXPORTED_SYMBOLS = ["Manifests"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["Manifests"];
diff -Nru firefox-84.0.2+build1/dom/manifest/ManifestObtainer.jsm firefox-85.0+build1/dom/manifest/ManifestObtainer.jsm
--- firefox-84.0.2+build1/dom/manifest/ManifestObtainer.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/ManifestObtainer.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -20,8 +20,6 @@
  *   dom/ipc/manifestMessages.js
  *
  * Which is injected into every browser instance via browser.js.
- *
- * exported ManifestObtainer
  */
 "use strict";
 
@@ -32,7 +30,6 @@
 );
 
 var ManifestObtainer = {
-  // jshint ignore:line
   /**
    * Public interface for obtaining a web manifest from a XUL browser, to use
    * on the parent process.
@@ -170,4 +167,4 @@
   return aWindow.fetch(request);
 }
 
-var EXPORTED_SYMBOLS = ["ManifestObtainer"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ManifestObtainer"];
diff -Nru firefox-84.0.2+build1/dom/manifest/ManifestProcessor.jsm firefox-85.0+build1/dom/manifest/ManifestProcessor.jsm
--- firefox-84.0.2+build1/dom/manifest/ManifestProcessor.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/ManifestProcessor.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -58,7 +58,6 @@
 );
 
 var ManifestProcessor = {
-  // jshint ignore:line
   get defaultDisplayMode() {
     return "browser";
   },
@@ -311,4 +310,4 @@
     }
   },
 };
-var EXPORTED_SYMBOLS = ["ManifestProcessor"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ManifestProcessor"];
diff -Nru firefox-84.0.2+build1/dom/manifest/test/browser_ManifestFinder_browserHasManifestLink.js firefox-85.0+build1/dom/manifest/test/browser_ManifestFinder_browserHasManifestLink.js
--- firefox-84.0.2+build1/dom/manifest/test/browser_ManifestFinder_browserHasManifestLink.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/test/browser_ManifestFinder_browserHasManifestLink.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,3 @@
-// Used by JSHint:
-/* global Cu, BrowserTestUtils, ok, add_task, gBrowser */
 "use strict";
 const { ManifestFinder } = ChromeUtils.import(
   "resource://gre/modules/ManifestFinder.jsm"
diff -Nru firefox-84.0.2+build1/dom/manifest/test/browser_ManifestIcons_browserFetchIcon.js firefox-85.0+build1/dom/manifest/test/browser_ManifestIcons_browserFetchIcon.js
--- firefox-84.0.2+build1/dom/manifest/test/browser_ManifestIcons_browserFetchIcon.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/test/browser_ManifestIcons_browserFetchIcon.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,3 @@
-// Used by JSHint:
-/* global Cu, BrowserTestUtils, ok, add_task, gBrowser */
 "use strict";
 
 Services.prefs.setBoolPref("dom.manifest.enabled", true);
diff -Nru firefox-84.0.2+build1/dom/manifest/test/browser_Manifest_install.js firefox-85.0+build1/dom/manifest/test/browser_Manifest_install.js
--- firefox-84.0.2+build1/dom/manifest/test/browser_Manifest_install.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/test/browser_Manifest_install.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,3 @@
-// Used by JSHint:
-/* global Cu, BrowserTestUtils, ok, add_task, gBrowser */
 "use strict";
 
 const { Manifests } = ChromeUtils.import("resource://gre/modules/Manifest.jsm");
diff -Nru firefox-84.0.2+build1/dom/manifest/test/browser_ManifestObtainer_credentials.js firefox-85.0+build1/dom/manifest/test/browser_ManifestObtainer_credentials.js
--- firefox-84.0.2+build1/dom/manifest/test/browser_ManifestObtainer_credentials.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/test/browser_ManifestObtainer_credentials.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,3 @@
-// Used by JSHint:
-/* global ok, is, Cu, BrowserTestUtils, add_task, gBrowser, makeTestURL, requestLongerTimeout*/
 "use strict";
 
 Services.prefs.setBoolPref("dom.manifest.enabled", true);
diff -Nru firefox-84.0.2+build1/dom/manifest/test/browser_ManifestObtainer_obtain.js firefox-85.0+build1/dom/manifest/test/browser_ManifestObtainer_obtain.js
--- firefox-84.0.2+build1/dom/manifest/test/browser_ManifestObtainer_obtain.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/manifest/test/browser_ManifestObtainer_obtain.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,5 +1,3 @@
-// Used by JSHint:
-/* global ok, is, Cu, BrowserTestUtils, add_task, gBrowser, requestLongerTimeout*/
 "use strict";
 
 Services.prefs.setBoolPref("dom.manifest.enabled", true);
diff -Nru firefox-84.0.2+build1/dom/mathml/MathMLElement.cpp firefox-85.0+build1/dom/mathml/MathMLElement.cpp
--- firefox-84.0.2+build1/dom/mathml/MathMLElement.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/mathml/MathMLElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "mozilla/dom/BindContext.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/EventListenerManager.h"
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/StaticPrefs_mathml.h"
 #include "mozilla/TextUtils.h"
@@ -207,7 +208,8 @@
     }
   }
   if (0 != i) {
-    aDocument.WarnOnceAbout(dom::Document::eMathML_DeprecatedMathSpaceValue);
+    aDocument.WarnOnceAbout(
+        dom::DeprecatedOperations::eMathML_DeprecatedMathSpaceValue);
     aCSSValue.SetFloatValue(float(i) / float(18), eCSSUnit_EM);
     return true;
   }
@@ -383,7 +385,8 @@
   if (value && value->Type() == nsAttrValue::eString &&
       !aDecls.PropertyIsSet(eCSSProperty__moz_script_size_multiplier)) {
     aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedScriptsizemultiplierAttribute);
+        dom::DeprecatedOperations::
+            eMathML_DeprecatedScriptsizemultiplierAttribute);
     auto str = value->GetStringValue();
     str.CompressWhitespace();
     // MathML numbers can't have leading '+'
@@ -416,7 +419,7 @@
   if (value && value->Type() == nsAttrValue::eString &&
       !aDecls.PropertyIsSet(eCSSProperty__moz_script_min_size)) {
     aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedScriptminsizeAttribute);
+        dom::DeprecatedOperations::eMathML_DeprecatedScriptminsizeAttribute);
     nsCSSValue scriptMinSize;
     ParseNumericValue(value->GetStringValue(), scriptMinSize,
                       PARSE_ALLOW_UNITLESS | CONVERT_UNITLESS_TO_PERCENT,
@@ -488,7 +491,7 @@
     value = aAttributes->GetAttr(nsGkAtoms::fontsize_);
     if (value) {
       aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
     }
   }
   if (value && value->Type() == nsAttrValue::eString &&
@@ -510,7 +513,7 @@
       for (uint32_t i = 0; i < ArrayLength(sizes); ++i) {
         if (str.EqualsASCII(sizes[i])) {
           aDecls.Document()->WarnOnceAbout(
-              dom::Document::eMathML_DeprecatedMathSizeValue);
+              dom::DeprecatedOperations::eMathML_DeprecatedMathSizeValue);
           aDecls.SetKeywordValue(eCSSProperty_font_size, values[i]);
           break;
         }
@@ -534,7 +537,7 @@
   value = aAttributes->GetAttr(nsGkAtoms::fontfamily_);
   if (value) {
     aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
+        dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
   }
   if (value && value->Type() == nsAttrValue::eString &&
       !aDecls.PropertyIsSet(eCSSProperty_font_family)) {
@@ -554,7 +557,7 @@
   value = aAttributes->GetAttr(nsGkAtoms::fontstyle_);
   if (value) {
     aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
+        dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
     if (value->Type() == nsAttrValue::eString &&
         !aDecls.PropertyIsSet(eCSSProperty_font_style)) {
       auto str = value->GetStringValue();
@@ -582,7 +585,7 @@
   value = aAttributes->GetAttr(nsGkAtoms::fontweight_);
   if (value) {
     aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
+        dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
     if (value->Type() == nsAttrValue::eString &&
         !aDecls.PropertyIsSet(eCSSProperty_font_weight)) {
       auto str = value->GetStringValue();
@@ -681,7 +684,7 @@
     value = aAttributes->GetAttr(nsGkAtoms::background);
     if (value) {
       aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
     }
   }
   if (value) {
@@ -713,7 +716,7 @@
     value = aAttributes->GetAttr(nsGkAtoms::color);
     if (value) {
       aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedStyleAttribute);
     }
   }
   nscolor color;
@@ -915,7 +918,7 @@
         FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::actuate, sActuateVals,
                         eCaseMatters) != Element::ATTR_VALUE_NO_MATCH) {
       OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedXLinkAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedXLinkAttribute);
       hasHref = true;
     }
   }
@@ -943,7 +946,8 @@
   const nsAttrValue* target =
       mAttrs.GetAttr(nsGkAtoms::target, kNameSpaceID_XLink);
   if (target) {
-    OwnerDoc()->WarnOnceAbout(dom::Document::eMathML_DeprecatedXLinkAttribute);
+    OwnerDoc()->WarnOnceAbout(
+        dom::DeprecatedOperations::eMathML_DeprecatedXLinkAttribute);
     target->ToString(aTarget);
   }
 
@@ -965,7 +969,7 @@
     }
     if (hasDeprecatedShowAttribute) {
       OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedXLinkAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedXLinkAttribute);
     }
     OwnerDoc()->GetBaseTarget(aTarget);
   }
@@ -1032,7 +1036,7 @@
                                     aNameSpaceID == kNameSpaceID_XLink))) {
     if (aValue && aNameSpaceID == kNameSpaceID_XLink) {
       OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedXLinkAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedXLinkAttribute);
     }
     // Note: When unsetting href, there may still be another href since there
     // are 2 possible namespaces.
diff -Nru firefox-84.0.2+build1/dom/media/AsyncLogger.h firefox-85.0+build1/dom/media/AsyncLogger.h
--- firefox-84.0.2+build1/dom/media/AsyncLogger.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AsyncLogger.h	2021-01-18 19:58:10.000000000 +0000
@@ -16,9 +16,6 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/Sprintf.h"
 #include "GeckoProfiler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "MPSCQueue.h"
 
 #if defined(_WIN32)
@@ -199,24 +196,41 @@
         }
 #ifdef MOZ_GECKO_PROFILER
         {
+          struct BudgetMarker {
+            static constexpr Span<const char> MarkerTypeName() {
+              return MakeStringSpan("Budget");
+            }
+            static void StreamJSONMarkerData(
+                baseprofiler::SpliceableJSONWriter& aWriter) {}
+            static MarkerSchema MarkerTypeDisplay() {
+              using MS = MarkerSchema;
+              MS schema{MS::Location::markerChart, MS::Location::markerTable};
+              // Nothing outside the defaults.
+              return schema;
+            }
+          };
+
           TracePayload message;
           while (mMessageQueueProfiler.Pop(&message) && mRunning) {
             if (message.mPhase != TracingPhase::COMPLETE) {
-              TracingKind kind = message.mPhase == TracingPhase::BEGIN
-                                     ? TracingKind::TRACING_INTERVAL_START
-                                     : TracingKind::TRACING_INTERVAL_END;
-              TracingMarkerPayload payload("media", kind, message.mTimestamp);
-              profiler_add_marker_for_thread(
-                  message.mTID, JS::ProfilingCategoryPair::MEDIA_RT,
-                  message.mName, payload);
+              profiler_add_marker(
+                  ProfilerString8View::WrapNullTerminatedString(message.mName),
+                  geckoprofiler::category::MEDIA_RT,
+                  {MarkerThreadId(message.mTID),
+                   (message.mPhase == TracingPhase::BEGIN)
+                       ? MarkerTiming::IntervalStart(message.mTimestamp)
+                       : MarkerTiming::IntervalEnd(message.mTimestamp)},
+                  BudgetMarker{});
             } else {
-              mozilla::TimeStamp end =
-                  message.mTimestamp +
-                  TimeDuration::FromMicroseconds(message.mDurationUs);
-              BudgetMarkerPayload payload(message.mTimestamp, end);
-              profiler_add_marker_for_thread(
-                  message.mTID, JS::ProfilingCategoryPair::MEDIA_RT,
-                  message.mName, payload);
+              profiler_add_marker(
+                  ProfilerString8View::WrapNullTerminatedString(message.mName),
+                  geckoprofiler::category::MEDIA_RT,
+                  {MarkerThreadId(message.mTID),
+                   MarkerTiming::Interval(
+                       message.mTimestamp,
+                       message.mTimestamp + TimeDuration::FromMicroseconds(
+                                                message.mDurationUs))},
+                  BudgetMarker{});
             }
           }
         }
diff -Nru firefox-84.0.2+build1/dom/media/AudioBufferUtils.h firefox-85.0+build1/dom/media/AudioBufferUtils.h
--- firefox-84.0.2+build1/dom/media/AudioBufferUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AudioBufferUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -103,22 +103,7 @@
    * instance can be reused.
    */
   void BufferFilled() {
-    // It's okay to have exactly zero samples here, it can happen we have an
-    // audio callback driver because of a hint on MTG creation, but the
-    // AudioOutputStream has not been created yet, or if all the tracks have
-    // finished but we're still running. Note: it's also ok if we had data in
-    // the scratch buffer - and we usually do - and all the tracks were ended
-    // (no mixer callback occured).
-    // XXX Remove this warning, or find a way to avoid it if the mixer callback
-    // isn't called.
-    NS_WARNING_ASSERTION(
-        Available() == 0 || mSampleWriteOffset == 0,
-        "Audio Buffer is not full by the end of the callback.");
-    // Make sure the data returned is always set and not random!
-    if (Available()) {
-      PodZero(mBuffer + mSampleWriteOffset,
-              FramesToSamples(mChannels, Available()));
-    }
+    MOZ_ASSERT(Available() == 0, "Frames should have been written");
     MOZ_ASSERT(mSamples, "Buffer not set.");
     mSamples = 0;
     mSampleWriteOffset = 0;
diff -Nru firefox-84.0.2+build1/dom/media/AudioChannelFormat.h firefox-85.0+build1/dom/media/AudioChannelFormat.h
--- firefox-84.0.2+build1/dom/media/AudioChannelFormat.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AudioChannelFormat.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <stdint.h>
 
+#include "mozilla/PodOperations.h"
 #include "nsTArrayForwardDeclare.h"
 #include "AudioSampleFormat.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/dom/media/AudioDriftCorrection.h firefox-85.0+build1/dom/media/AudioDriftCorrection.h
--- firefox-84.0.2+build1/dom/media/AudioDriftCorrection.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AudioDriftCorrection.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #define MOZILLA_AUDIO_DRIFT_CORRECTION_H_
 
 #include "DynamicResampler.h"
+#include "mozilla/Preferences.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/AudioStream.cpp firefox-85.0+build1/dom/media/AudioStream.cpp
--- firefox-84.0.2+build1/dom/media/AudioStream.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AudioStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -379,9 +379,9 @@
     mState = ERRORED;
   }
 
-  LOG("started, state %s", mState == STARTED
-                               ? "STARTED"
-                               : mState == DRAINED ? "DRAINED" : "ERRORED");
+  LOG("started, state %s", mState == STARTED   ? "STARTED"
+                           : mState == DRAINED ? "DRAINED"
+                                               : "ERRORED");
   if (mState == STARTED || mState == DRAINED) {
     return promise.forget();
   }
diff -Nru firefox-84.0.2+build1/dom/media/AudioStreamTrack.h firefox-85.0+build1/dom/media/AudioStreamTrack.h
--- firefox-84.0.2+build1/dom/media/AudioStreamTrack.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/AudioStreamTrack.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "MediaStreamTrack.h"
 #include "DOMMediaStream.h"
 #include "CrossGraphPort.h"
+#include "nsClassHashtable.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/media/autoplay/GVAutoplayPermissionRequest.h firefox-85.0+build1/dom/media/autoplay/GVAutoplayPermissionRequest.h
--- firefox-84.0.2+build1/dom/media/autoplay/GVAutoplayPermissionRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/autoplay/GVAutoplayPermissionRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,8 @@
 #include "GVAutoplayRequestUtils.h"
 #include "nsContentPermissionHelper.h"
 
+class nsGlobalWindowInner;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/media/autoplay/GVAutoplayRequestStatusIPC.h firefox-85.0+build1/dom/media/autoplay/GVAutoplayRequestStatusIPC.h
--- firefox-84.0.2+build1/dom/media/autoplay/GVAutoplayRequestStatusIPC.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/autoplay/GVAutoplayRequestStatusIPC.h	2021-01-18 19:58:09.000000000 +0000
@@ -5,7 +5,7 @@
 #ifndef DOM_MEDIA_GVAUTOPLAYREQUESTSTATUSIPC_H_
 #define DOM_MEDIA_GVAUTOPLAYREQUESTSTATUSIPC_H_
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "GVAutoplayRequestUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/ChannelMediaDecoder.cpp firefox-85.0+build1/dom/media/ChannelMediaDecoder.cpp
--- firefox-84.0.2+build1/dom/media/ChannelMediaDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ChannelMediaDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "MediaFormatReader.h"
 #include "BaseMediaResource.h"
 #include "MediaShutdownManager.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "VideoUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/ChannelMediaResource.cpp firefox-85.0+build1/dom/media/ChannelMediaResource.cpp
--- firefox-84.0.2+build1/dom/media/ChannelMediaResource.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ChannelMediaResource.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,10 +5,12 @@
 
 #include "ChannelMediaResource.h"
 
+#include "mozilla/Preferences.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsICachingChannel.h"
 #include "nsIClassOfService.h"
+#include "nsIHttpChannel.h"
 #include "nsIInputStream.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsITimedChannel.h"
diff -Nru firefox-84.0.2+build1/dom/media/ChannelMediaResource.h firefox-85.0+build1/dom/media/ChannelMediaResource.h
--- firefox-84.0.2+build1/dom/media/ChannelMediaResource.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ChannelMediaResource.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,10 +10,11 @@
 #include "MediaCache.h"
 #include "mozilla/Mutex.h"
 #include "nsIChannelEventSink.h"
-#include "nsIHttpChannel.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIThreadRetargetableStreamListener.h"
 
+class nsIHttpChannel;
+
 namespace mozilla {
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/CloneableWithRangeMediaResource.cpp firefox-85.0+build1/dom/media/CloneableWithRangeMediaResource.cpp
--- firefox-84.0.2+build1/dom/media/CloneableWithRangeMediaResource.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/CloneableWithRangeMediaResource.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsIAsyncInputStream.h"
 #include "nsITimedChannel.h"
 #include "nsNetCID.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/CrossGraphPort.cpp firefox-85.0+build1/dom/media/CrossGraphPort.cpp
--- firefox-84.0.2+build1/dom/media/CrossGraphPort.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/CrossGraphPort.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -18,9 +18,9 @@
 #  undef LOG_TEST
 #endif
 
-extern LazyLogModule gForwardedInputTrackLog;
-#define LOG(type, msg) MOZ_LOG(gForwardedInputTrackLog, type, msg)
-#define LOG_TEST(type) MOZ_LOG_TEST(gForwardedInputTrackLog, type)
+extern LazyLogModule gMediaTrackGraphLog;
+#define LOG(type, msg) MOZ_LOG(gMediaTrackGraphLog, type, msg)
+#define LOG_TEST(type) MOZ_LOG_TEST(gMediaTrackGraphLog, type)
 
 UniquePtr<CrossGraphPort> CrossGraphPort::Connect(
     const RefPtr<dom::AudioStreamTrack>& aStreamTrack, AudioDeviceInfo* aSink,
@@ -106,9 +106,8 @@
 
   MediaTrack* input = mInputs[0]->GetSource();
 
-  if (mInputs[0]->GetSource()->Ended() &&
-      (mInputs[0]->GetSource()->GetEnd() <=
-       mInputs[0]->GetSource()->GraphTimeToTrackTimeWithBlocking(aFrom))) {
+  if (input->Ended() &&
+      (input->GetEnd() <= input->GraphTimeToTrackTimeWithBlocking(aFrom))) {
     mEnded = true;
     return;
   }
diff -Nru firefox-84.0.2+build1/dom/media/doctor/DDMediaLogs.cpp firefox-85.0+build1/dom/media/doctor/DDMediaLogs.cpp
--- firefox-84.0.2+build1/dom/media/doctor/DDMediaLogs.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/doctor/DDMediaLogs.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "DDMediaLogs.h"
 
 #include "DDLogUtils.h"
+#include "nsIThread.h"
 #include "nsIThreadManager.h"
 #include "mozilla/JSONWriter.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/doctor/gtest/TestMultiWriterQueue.cpp firefox-85.0+build1/dom/media/doctor/gtest/TestMultiWriterQueue.cpp
--- firefox-84.0.2+build1/dom/media/doctor/gtest/TestMultiWriterQueue.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/doctor/gtest/TestMultiWriterQueue.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "DDTimeStamp.h"
 #include "mozilla/Assertions.h"
 #include "nsDeque.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 #include <gtest/gtest.h>
diff -Nru firefox-84.0.2+build1/dom/media/DOMMediaStream.cpp firefox-85.0+build1/dom/media/DOMMediaStream.cpp
--- firefox-84.0.2+build1/dom/media/DOMMediaStream.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/DOMMediaStream.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -338,7 +338,10 @@
   }
 
   mTracks.AppendElement(&aTrack);
-  NotifyTrackAdded(&aTrack);
+
+  if (!aTrack.Ended()) {
+    NotifyTrackAdded(&aTrack);
+  }
 }
 
 void DOMMediaStream::RemoveTrack(MediaStreamTrack& aTrack) {
diff -Nru firefox-84.0.2+build1/dom/media/DOMMediaStream.h firefox-85.0+build1/dom/media/DOMMediaStream.h
--- firefox-84.0.2+build1/dom/media/DOMMediaStream.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/DOMMediaStream.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "MediaTrackConstraints.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/RelativeTimeline.h"
+#include "mozilla/WeakPtr.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/DynamicResampler.cpp firefox-85.0+build1/dom/media/DynamicResampler.cpp
--- firefox-84.0.2+build1/dom/media/DynamicResampler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/DynamicResampler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -396,8 +396,6 @@
 }
 
 AudioSegment AudioResampler::Resample(uint32_t aOutFrames) {
-  MOZ_ASSERT(aOutFrames);
-
   AudioSegment segment;
 
   // We don't know what to do yet and we only have received silence if any just
diff -Nru firefox-84.0.2+build1/dom/media/eme/CDMProxy.h firefox-85.0+build1/dom/media/eme/CDMProxy.h
--- firefox-84.0.2+build1/dom/media/eme/CDMProxy.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/CDMProxy.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/CDMCaps.h"
 #include "mozilla/DataMutex.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/MozPromise.h"
 
 #include "mozilla/dom/MediaKeyMessageEvent.h"
@@ -18,6 +17,7 @@
 #include "nsIThread.h"
 
 namespace mozilla {
+class ErrorResult;
 class MediaRawData;
 class ChromiumCDMProxy;
 
diff -Nru firefox-84.0.2+build1/dom/media/eme/DecryptorProxyCallback.h firefox-85.0+build1/dom/media/eme/DecryptorProxyCallback.h
--- firefox-84.0.2+build1/dom/media/eme/DecryptorProxyCallback.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/DecryptorProxyCallback.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,10 @@
 #include "mozilla/dom/MediaKeyStatusMapBinding.h"     // For MediaKeyStatus
 #include "mozilla/dom/MediaKeyMessageEventBinding.h"  // For MediaKeyMessageType
 #include "mozilla/CDMProxy.h"
-#include "mozilla/ErrorResult.h"
+
+namespace mozilla {
+class ErrorResult;
+}
 
 class DecryptorProxyCallback {
  public:
diff -Nru firefox-84.0.2+build1/dom/media/eme/mediadrm/MediaDrmCDMCallbackProxy.h firefox-85.0+build1/dom/media/eme/mediadrm/MediaDrmCDMCallbackProxy.h
--- firefox-84.0.2+build1/dom/media/eme/mediadrm/MediaDrmCDMCallbackProxy.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/mediadrm/MediaDrmCDMCallbackProxy.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,11 +8,12 @@
 #define MediaDrmCDMCallbackProxy_h_
 
 #include "mozilla/CDMProxy.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/DecryptorProxyCallback.h"
 
 namespace mozilla {
 class CDMProxy;
+class ErrorResult;
+
 // Proxies call backs from the MediaDrmProxy -> MediaDrmProxySupport back to the
 // MediaKeys object on the main thread. We used annotation calledFrom = "gecko"
 // to ensure running on main thread.
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaEncryptedEvent.cpp firefox-85.0+build1/dom/media/eme/MediaEncryptedEvent.cpp
--- firefox-84.0.2+build1/dom/media/eme/MediaEncryptedEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaEncryptedEvent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,7 @@
 #include "jsfriendapi.h"
 #include "nsINode.h"
 #include "mozilla/dom/MediaKeys.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeyError.h firefox-85.0+build1/dom/media/eme/MediaKeyError.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeyError.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeyError.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_MediaKeyError_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/Event.h"
 #include "js/TypeDecls.h"
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeyMessageEvent.h firefox-85.0+build1/dom/media/eme/MediaKeyMessageEvent.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeyMessageEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeyMessageEvent.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_MediaKeyMessageEvent_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsCOMPtr.h"
@@ -18,6 +17,8 @@
 #include "mozilla/dom/MediaKeyMessageEventBinding.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct MediaKeyMessageEventInit;
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeys.cpp firefox-85.0+build1/dom/media/eme/MediaKeys.cpp
--- firefox-84.0.2+build1/dom/media/eme/MediaKeys.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeys.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,38 +5,42 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MediaKeys.h"
+
+#include "ChromiumCDMProxy.h"
 #include "GMPCrashHelper.h"
+#include "mozilla/EMEUtils.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/dom/DOMException.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "mozilla/dom/MediaKeysBinding.h"
-#include "mozilla/dom/MediaKeyMessageEvent.h"
 #include "mozilla/dom/MediaKeyError.h"
+#include "mozilla/dom/MediaKeyMessageEvent.h"
 #include "mozilla/dom/MediaKeySession.h"
 #include "mozilla/dom/MediaKeyStatusMap.h"
-#include "mozilla/dom/DOMException.h"
+#include "mozilla/dom/MediaKeySystemAccess.h"
+#include "mozilla/dom/MediaKeysBinding.h"
 #include "mozilla/dom/UnionTypes.h"
-#include "mozilla/Telemetry.h"
+#include "mozilla/dom/WindowContext.h"
+#include "mozilla/dom/WindowGlobalChild.h"
+#include "nsContentCID.h"
+#include "nsContentTypeParser.h"
+#include "nsContentUtils.h"
+#include "nsIScriptObjectPrincipal.h"
+#include "nsPrintfCString.h"
+#include "nsServiceManagerUtils.h"
+
 #ifdef MOZ_WIDGET_ANDROID
 #  include "mozilla/MediaDrmCDMProxy.h"
 #endif
-#include "mozilla/EMEUtils.h"
-#include "nsContentUtils.h"
-#include "nsIScriptObjectPrincipal.h"
-#include "nsContentTypeParser.h"
 #ifdef XP_WIN
 #  include "mozilla/WindowsVersion.h"
 #endif
-#include "nsContentCID.h"
-#include "nsServiceManagerUtils.h"
-#include "mozilla/dom/MediaKeySystemAccess.h"
-#include "nsPrintfCString.h"
-#include "ChromiumCDMProxy.h"
 
 namespace mozilla::dom {
 
 // We don't use NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE because we need to
-// unregister our MediaKeys from mDocument's activity listeners. If we don't do
-// this then cycle collection can null mDocument before our dtor runs and the
-// observer ptr held by mDocument will dangle.
+// disconnect our MediaKeys instances from the inner window (mparent) before
+// we unlink it.
 NS_IMPL_CYCLE_COLLECTION_CLASS(MediaKeys)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MediaKeys)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElement)
@@ -44,18 +48,16 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mKeySessions)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPromises)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPendingSessions)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(MediaKeys)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MediaKeys)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mElement)
+  tmp->DisconnectInnerWindow();
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mKeySessions)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mPromises)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mPendingSessions)
-  tmp->UnregisterActivityObserver();
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
   NS_IMPL_CYCLE_COLLECTION_UNLINK_WEAK_PTR
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -65,7 +67,6 @@
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeys)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_INTERFACE_MAP_ENTRY(nsIDocumentActivity)
 NS_INTERFACE_MAP_END
 
 MediaKeys::MediaKeys(nsPIDOMWindowInner* aParent, const nsAString& aKeySystem,
@@ -79,36 +80,48 @@
 }
 
 MediaKeys::~MediaKeys() {
-  UnregisterActivityObserver();
-  mDocument = nullptr;
+  MOZ_ASSERT(NS_IsMainThread());
+
+  DisconnectInnerWindow();
   Shutdown();
   EME_LOG("MediaKeys[%p] destroyed", this);
 }
 
-void MediaKeys::RegisterActivityObserver() {
-  MOZ_ASSERT(mDocument);
-  if (mDocument) {
-    mDocument->RegisterActivityObserver(this);
-  }
+void MediaKeys::ConnectInnerWindow() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsCOMPtr<nsPIDOMWindowInner> innerWindowParent = GetParentObject();
+  MOZ_ASSERT(innerWindowParent,
+             "We should only be connecting when we have an inner window!");
+  innerWindowParent->AddMediaKeysInstance(this);
 }
 
-void MediaKeys::UnregisterActivityObserver() {
-  if (mDocument) {
-    mDocument->UnregisterActivityObserver(this);
+void MediaKeys::DisconnectInnerWindow() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!GetParentObject()) {
+    // We don't have a parent. We've been cycle collected, or the window
+    // already notified us of its destruction and we cleared the ref.
+    return;
   }
+
+  GetParentObject()->RemoveMediaKeysInstance(this);
 }
 
-// NS_DECL_NSIDOCUMENTACTIVITY
-void MediaKeys::NotifyOwnerDocumentActivityChanged() {
-  EME_LOG("MediaKeys[%p] NotifyOwnerDocumentActivityChanged()", this);
-  // If our owning document is no longer active we should shutdown.
-  if (!mDocument->IsCurrentActiveDocument()) {
-    EME_LOG(
-        "MediaKeys[%p] NotifyOwnerDocumentActivityChanged() owning document is "
-        "not active, shutting down!",
-        this);
-    Shutdown();
-  }
+void MediaKeys::OnInnerWindowDestroy() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  EME_LOG("MediaKeys[%p] OnInnerWindowDestroy()", this);
+
+  // The InnerWindow should clear its reference to this object after this call,
+  // so we don't need to explicitly call DisconnectInnerWindow before nulling.
+  mParent = nullptr;
+
+  // Don't call shutdown directly because (at time of writing) mProxy can
+  // spin the event loop when it's shutdown. This can change the world state
+  // in the middle of window destruction, which we do not want.
+  GetMainThreadEventTarget()->Dispatch(
+      NewRunnableMethod("MediaKeys::Shutdown", this, &MediaKeys::Shutdown));
 }
 
 void MediaKeys::Terminated() {
@@ -143,7 +156,10 @@
     mProxy = nullptr;
   }
 
-  RefPtr<MediaKeys> kungFuDeathGrip = this;
+  // Hold a self reference to keep us alive after we clear the self reference
+  // for each promise. This ensures we stay alive until we're done shutting
+  // down.
+  RefPtr<MediaKeys> selfReference = this;
 
   for (auto iter = mPromises.Iter(); !iter.Done(); iter.Next()) {
     RefPtr<dom::DetailedPromise>& promise = iter.Data();
@@ -403,31 +419,83 @@
   }
   mPrincipal = sop->GetPrincipal();
 
+  // Begin figuring out the top level principal.
   nsCOMPtr<nsPIDOMWindowInner> window = GetParentObject();
-  mDocument = window->GetExtantDoc();
-  if (!mDocument) {
+
+  // If we're in a top level document, getting the top level principal is easy.
+  // However, we're not in a top level doc this becomes more complicated. If
+  // we're not top level we need to get the top level principal, this can be
+  // done by reading the principal of the load info, which we can get of a
+  // document's channel.
+  //
+  // There is an edge case we need to watch out for here where this code can be
+  // run in an about:blank document before it has done its async load. In this
+  // case the document will not yet have a load info. We address this below by
+  // walking up a level in the window context chain. See
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1675360
+  // for more info.
+  Document* document = window->GetExtantDoc();
+  if (!document) {
     NS_WARNING("Failed to get document when creating MediaKeys");
     promise->MaybeRejectWithInvalidStateError(
         "Couldn't get document in MediaKeys::Init");
     return promise.forget();
   }
 
-  // Get the top-level principal so we can partition the GMP based on
-  // the current + top level principal.
-  nsIChannel* channel = mDocument->GetChannel();
-  if (!channel) {
-    NS_WARNING("Failed to get channel when creating MediaKeys");
+  WindowGlobalChild* windowGlobalChild = window->GetWindowGlobalChild();
+  if (!windowGlobalChild) {
+    NS_WARNING("Failed to get window global child when creating MediaKeys");
     promise->MaybeRejectWithInvalidStateError(
-        "Couldn't get channel in MediaKeys::Init");
+        "Couldn't get window global child in MediaKeys::Init");
     return promise.forget();
   }
-  nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
-  MOZ_RELEASE_ASSERT(loadInfo, "Channels should always have LoadInfo");
 
-  if (loadInfo->GetIsTopLevelLoad()) {
-    // We're in a top level context so our principal is already top level.
+  if (windowGlobalChild->SameOriginWithTop()) {
+    // We're in the same origin as the top window context, so our principal
+    // is also the top principal.
     mTopLevelPrincipal = mPrincipal;
   } else {
+    // We have a different origin than the top doc, try and find the top level
+    // principal by looking it up via load info, which we read off a channel.
+    nsIChannel* channel = document->GetChannel();
+
+    WindowContext* windowContext = document->GetWindowContext();
+    if (!windowContext) {
+      NS_WARNING("Failed to get window context when creating MediaKeys");
+      promise->MaybeRejectWithInvalidStateError(
+          "Couldn't get window context in MediaKeys::Init");
+      return promise.forget();
+    }
+    while (!channel) {
+      // We don't have a channel, this can happen if we're in an about:blank
+      // page that hasn't yet had its async load performed. Try and get
+      // the channel from our parent doc. We should be able to do this because
+      // an about:blank is considered the same origin as its parent. We do this
+      // recursively to cover pages do silly things like nesting blank iframes
+      // and not waiting for loads.
+
+      // Move our window context up a level.
+      windowContext = windowContext->GetParentWindowContext();
+      if (!windowContext || !windowContext->GetExtantDoc()) {
+        NS_WARNING(
+            "Failed to get parent window context's document when creating "
+            "MediaKeys");
+        promise->MaybeRejectWithInvalidStateError(
+            "Couldn't get parent window context's document in "
+            "MediaKeys::Init (likely due to an nested about about:blank frame "
+            "that hasn't loaded yet)");
+        return promise.forget();
+      }
+
+      Document* parentDoc = windowContext->GetExtantDoc();
+      channel = parentDoc->GetChannel();
+    }
+
+    MOZ_RELEASE_ASSERT(
+        channel, "Should either have a channel or should have returned by now");
+
+    nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
+    MOZ_RELEASE_ASSERT(loadInfo, "Channels should always have LoadInfo");
     mTopLevelPrincipal = loadInfo->GetTopLevelPrincipal();
     if (!mTopLevelPrincipal) {
       NS_WARNING("Failed to get top level principal when creating MediaKeys");
@@ -437,6 +505,7 @@
     }
   }
 
+  // We should have figured out our top level principal.
   if (!mPrincipal || !mTopLevelPrincipal) {
     NS_WARNING("Failed to get principals when creating MediaKeys");
     promise->MaybeRejectWithInvalidStateError(
@@ -480,7 +549,7 @@
                NS_ConvertUTF8toUTF16(topLevelOrigin),
                KeySystemToGMPName(mKeySystem));
 
-  RegisterActivityObserver();
+  ConnectInnerWindow();
 
   return promise.forget();
 }
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeySession.h firefox-85.0+build1/dom/media/eme/MediaKeySession.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeySession.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeySession.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "DecoderDoctorLogger.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "nsCOMPtr.h"
@@ -24,6 +23,7 @@
 struct JSContext;
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class MediaKeySession;
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeys.h firefox-85.0+build1/dom/media/eme/MediaKeys.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeys.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeys.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,20 +8,18 @@
 #define mozilla_dom_mediakeys_h__
 
 #include "DecoderDoctorLogger.h"
-#include "nsWrapperCache.h"
-#include "nsISupports.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/DetailedPromise.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/WeakPtr.h"
+#include "mozilla/dom/MediaKeyStatusMapBinding.h"  // For MediaKeyStatus
+#include "mozilla/dom/MediaKeySystemAccessBinding.h"
+#include "mozilla/dom/MediaKeysBinding.h"
+#include "mozilla/dom/Promise.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIDocumentActivity.h"
 #include "nsRefPtrHashtable.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/MediaKeysBinding.h"
-#include "mozilla/dom/MediaKeyStatusMapBinding.h"  // For MediaKeyStatus
-#include "mozilla/dom/MediaKeySystemAccessBinding.h"
-#include "mozilla/DetailedPromise.h"
-#include "mozilla/WeakPtr.h"
+#include "nsWrapperCache.h"
 
 namespace mozilla {
 
@@ -48,7 +46,7 @@
 
 // This class is used on the main thread only.
 // Note: its addref/release is not (and can't be) thread safe!
-class MediaKeys final : public nsIDocumentActivity,
+class MediaKeys final : public nsISupports,
                         public nsWrapperCache,
                         public SupportsWeakPtr,
                         public DecoderDoctorLifeLogger<MediaKeys> {
@@ -57,9 +55,6 @@
  public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaKeys)
-  // We want to listen to the owning document so we can shutdown if it goes
-  // inactive.
-  NS_DECL_NSIDOCUMENTACTIVITY
 
   MediaKeys(nsPIDOMWindowInner* aParentWindow, const nsAString& aKeySystem,
             const MediaKeySystemConfiguration& aConfig);
@@ -137,6 +132,10 @@
   // Returns true if this MediaKeys has been bound to a media element.
   bool IsBoundToMediaElement() const;
 
+  // Indicates to a MediaKeys instance that the inner window parent of that
+  // instance is being destroyed, this should prompt the keys to shutdown.
+  void OnInnerWindowDestroy();
+
   void GetSessionsInfo(nsString& sessionsInfo);
 
   // JavaScript: MediaKeys.GetStatusForPolicy()
@@ -164,16 +163,28 @@
   // Removes promise from mPromises, and returns it.
   already_AddRefed<DetailedPromise> RetrievePromise(PromiseId aId);
 
-  void RegisterActivityObserver();
-  void UnregisterActivityObserver();
+  // Helpers to connect and disconnect to the parent inner window. An inner
+  // window should track (via weak ptr) MediaKeys created within it so we can
+  // ensure MediaKeys are shutdown if that window is destroyed.
+  void ConnectInnerWindow();
+  void DisconnectInnerWindow();
 
   // Owning ref to proxy. The proxy has a weak reference back to the MediaKeys,
   // and the MediaKeys destructor clears the proxy's reference to the MediaKeys.
   RefPtr<CDMProxy> mProxy;
 
+  // The HTMLMediaElement the MediaKeys are associated with. Note that a
+  // MediaKeys instance may not be associated with any HTMLMediaElement so
+  // this can be null (we also cannot rely on a media element to drive shutdown
+  // for this reason).
   RefPtr<HTMLMediaElement> mElement;
-  RefPtr<Document> mDocument;
 
+  // The  inner window associated with an instance of MediaKeys. We will
+  // shutdown the media keys when this Window is destroyed. We do this from the
+  // window rather than a document to address the case where media keys can be
+  // created in an about:blank document that then performs an async load -- this
+  // recreates the document, but the inner window is preserved in such a case.
+  // See https://bugzilla.mozilla.org/show_bug.cgi?id=1675360 for more info.
   nsCOMPtr<nsPIDOMWindowInner> mParent;
   const nsString mKeySystem;
   KeySessionHashMap mKeySessions;
@@ -181,7 +192,10 @@
   PendingKeySessionsHashMap mPendingSessions;
   PromiseId mCreatePromiseId;
 
+  // The principal of the relevant settings object.
   RefPtr<nsIPrincipal> mPrincipal;
+  // The principal of the top level page. This can differ from mPrincipal if
+  // we're in an iframe.
   RefPtr<nsIPrincipal> mTopLevelPrincipal;
 
   const MediaKeySystemConfiguration mConfig;
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeyStatusMap.h firefox-85.0+build1/dom/media/eme/MediaKeyStatusMap.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeyStatusMap.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeyStatusMap.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_MediaKeyStatuses_h
 #define mozilla_dom_MediaKeyStatuses_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
@@ -19,6 +18,8 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class ArrayBufferViewOrArrayBuffer;
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccess.h firefox-85.0+build1/dom/media/eme/MediaKeySystemAccess.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccess.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeySystemAccess.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_MediaKeySystemAccess_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
@@ -21,6 +20,7 @@
 namespace mozilla {
 
 class DecoderDoctorDiagnostics;
+class ErrorResult;
 
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccessManager.cpp firefox-85.0+build1/dom/media/eme/MediaKeySystemAccessManager.cpp
--- firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccessManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeySystemAccessManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,8 +7,10 @@
 #include "DecoderDoctorDiagnostics.h"
 #include "MediaKeySystemAccessPermissionRequest.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/DetailedPromise.h"
 #include "mozilla/EMEUtils.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccessPermissionRequest.h firefox-85.0+build1/dom/media/eme/MediaKeySystemAccessPermissionRequest.h
--- firefox-84.0.2+build1/dom/media/eme/MediaKeySystemAccessPermissionRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/eme/MediaKeySystemAccessPermissionRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/MozPromise.h"
 #include "nsContentPermissionHelper.h"
 
+class nsGlobalWindowInner;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/media/FileBlockCache.cpp firefox-85.0+build1/dom/media/FileBlockCache.cpp
--- firefox-84.0.2+build1/dom/media/FileBlockCache.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/FileBlockCache.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsAnonymousTemporaryFile.h"
 #include "nsIThreadManager.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/ScopeExit.h"
 #include "nsXULAppAPI.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/media/FileMediaResource.cpp firefox-85.0+build1/dom/media/FileMediaResource.cpp
--- firefox-84.0.2+build1/dom/media/FileMediaResource.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/FileMediaResource.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "nsContentUtils.h"
+#include "nsIFile.h"
 #include "nsIFileChannel.h"
 #include "nsIFileStreams.h"
 #include "nsITimedChannel.h"
diff -Nru firefox-84.0.2+build1/dom/media/fuzz/FuzzMedia.cpp firefox-85.0+build1/dom/media/fuzz/FuzzMedia.cpp
--- firefox-84.0.2+build1/dom/media/fuzz/FuzzMedia.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/fuzz/FuzzMedia.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "FlacDemuxer.h"
 #include "FuzzingInterface.h"
 #include "mozilla/AbstractThread.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "MP3Demuxer.h"
 #include "MP4Demuxer.h"
 #include "OggDemuxer.h"
diff -Nru firefox-84.0.2+build1/dom/media/GetUserMediaRequest.h firefox-85.0+build1/dom/media/GetUserMediaRequest.h
--- firefox-84.0.2+build1/dom/media/GetUserMediaRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/GetUserMediaRequest.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,7 +6,7 @@
 #define GetUserMediaRequest_h__
 
 #include <cstdint>
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/UniquePtr.h"
 #include "nsCycleCollectionParticipant.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMAdapter.cpp firefox-85.0+build1/dom/media/gmp/ChromiumCDMAdapter.cpp
--- firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMAdapter.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/ChromiumCDMAdapter.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "content_decryption_module_ext.h"
 #include "gmp-api/gmp-entrypoints.h"
 #include "gmp-api/gmp-video-codec.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/HelperMacros.h"
 
 #ifdef XP_WIN
diff -Nru firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMCallback.h firefox-85.0+build1/dom/media/gmp/ChromiumCDMCallback.h
--- firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMCallback.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/ChromiumCDMCallback.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,11 +7,14 @@
 #define ChromiumCDMCallback_h_
 
 #include "mozilla/CDMProxy.h"
-#include "mozilla/ErrorResult.h"                      // For ErrorResult
 #include "mozilla/dom/MediaKeyStatusMapBinding.h"     // For MediaKeyStatus
 #include "mozilla/dom/MediaKeyMessageEventBinding.h"  // For MediaKeyMessageType
 #include "mozilla/gmp/GMPTypes.h"                     // For CDMKeyInformation
 
+namespace mozilla {
+class ErrorResult;
+}
+
 class ChromiumCDMCallback {
  public:
   virtual ~ChromiumCDMCallback() = default;
diff -Nru firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMParent.cpp firefox-85.0+build1/dom/media/gmp/ChromiumCDMParent.cpp
--- firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/ChromiumCDMParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "GMPUtils.h"
 #include "mozilla/dom/MediaKeyMessageEventBinding.h"
 #include "mozilla/gmp/GMPTypes.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/Unused.h"
 #include "AnnexB.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMParent.h firefox-85.0+build1/dom/media/gmp/ChromiumCDMParent.h
--- firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMParent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/ChromiumCDMParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -15,7 +15,6 @@
 #include "nsDataHashtable.h"
 #include "PlatformDecoderModule.h"
 #include "ImageContainer.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Span.h"
 #include "ReorderQueue.h"
 
@@ -23,6 +22,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class MediaRawData;
 class ChromiumCDMProxy;
 
diff -Nru firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMProxy.h firefox-85.0+build1/dom/media/gmp/ChromiumCDMProxy.h
--- firefox-84.0.2+build1/dom/media/gmp/ChromiumCDMProxy.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/ChromiumCDMProxy.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,12 +8,12 @@
 #define ChromiumCDMProxy_h_
 
 #include "mozilla/AbstractThread.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/CDMProxy.h"
 #include "ChromiumCDMParent.h"
 
 namespace mozilla {
 
+class ErrorResult;
 class MediaRawData;
 class DecryptJob;
 class ChromiumCDMCallbackProxy;
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPChild.cpp firefox-85.0+build1/dom/media/gmp/GMPChild.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -25,6 +25,7 @@
 #include "GMPVideoHost.h"
 #include "mozilla/Algorithm.h"
 #include "mozilla/ipc/CrashReporterClient.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProcessChild.h"
 #include "mozilla/TextUtils.h"
 #include "nsDebugImpl.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPCrashHelper.h firefox-85.0+build1/dom/media/gmp/GMPCrashHelper.h
--- firefox-84.0.2+build1/dom/media/gmp/GMPCrashHelper.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPCrashHelper.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,8 @@
 
 #  include "MainThreadUtils.h"
 #  include "nsISupportsImpl.h"
-#  include "nsPIDOMWindow.h"
+
+class nsPIDOMWindowInner;
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPMessageUtils.h firefox-85.0+build1/dom/media/gmp/GMPMessageUtils.h
--- firefox-84.0.2+build1/dom/media/gmp/GMPMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPMessageUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,8 @@
 #include "gmp-sanitized-cdm-exports.h"
 #include "gmp-video-codec.h"
 #include "gmp-video-frame-encoded.h"
-#include "IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 
 namespace IPC {
 
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPParent.cpp firefox-85.0+build1/dom/media/gmp/GMPParent.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,13 +10,16 @@
 #include "GMPContentParent.h"
 #include "GMPLog.h"
 #include "GMPTimerParent.h"
+#include "MediaResult.h"
 #include "mozIGeckoMediaPluginService.h"
 #include "mozilla/dom/WidevineCDMManifestBinding.h"
 #include "mozilla/ipc/CrashReporterHost.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxInfo.h"
 #endif
+#include "mozilla/Services.h"
 #include "mozilla/SSE.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPProcessParent.cpp firefox-85.0+build1/dom/media/gmp/GMPProcessParent.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPProcessParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPProcessParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -20,6 +20,7 @@
 
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
 #  include "mozilla/dom/ContentChild.h"
+#  include "mozilla/Preferences.h"
 #  include "mozilla/Sandbox.h"
 #  include "mozilla/SandboxSettings.h"
 #  include "nsMacUtilsImpl.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPServiceChild.cpp firefox-85.0+build1/dom/media/gmp/GMPServiceChild.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPServiceChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPServiceChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIObserverService.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPService.cpp firefox-85.0+build1/dom/media/gmp/GMPService.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "GMPService.h"
 
+#include "ChromiumCDMParent.h"
 #include "GMPLog.h"
 #include "GMPParent.h"
 #include "GMPProcessParent.h"
@@ -14,6 +15,7 @@
 #include "GeckoChildProcessHost.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventDispatcher.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/PluginCrashedEvent.h"
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxInfo.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPService.h firefox-85.0+build1/dom/media/gmp/GMPService.h
--- firefox-84.0.2+build1/dom/media/gmp/GMPService.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPService.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,24 +6,21 @@
 #ifndef GMPService_h_
 #define GMPService_h_
 
-#include "ChromiumCDMParent.h"
 #include "GMPContentParent.h"
 #include "GMPCrashHelper.h"
-#include "MediaResult.h"
 #include "mozIGeckoMediaPluginService.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/Monitor.h"
 #include "mozilla/MozPromise.h"
-#include "mozilla/dom/Document.h"
 #include "nsCOMPtr.h"
 #include "nsClassHashtable.h"
-#include "nsIAsyncShutdown.h"
-#include "nsISupportsImpl.h"
-#include "nsIThread.h"
+#include "nsIObserver.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsThreadUtils.h"
+
+class nsIAsyncShutdownClient;
+class nsIRunnable;
+class nsISerialEventTarget;
+class nsIThread;
 
 template <class>
 struct already_AddRefed;
@@ -31,6 +28,7 @@
 namespace mozilla {
 
 class GMPCrashHelper;
+class MediaResult;
 
 extern LogModule* GetGMPLog();
 
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPServiceParent.cpp firefox-85.0+build1/dom/media/gmp/GMPServiceParent.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPServiceParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPServiceParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -18,11 +18,13 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxInfo.h"
 #endif
 #include "VideoUtils.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPServiceParent.h firefox-85.0+build1/dom/media/gmp/GMPServiceParent.h
--- firefox-84.0.2+build1/dom/media/gmp/GMPServiceParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPServiceParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsDataHashtable.h"
 #include "mozilla/Atomics.h"
 #include "nsIAsyncShutdown.h"
+#include "nsRefPtrHashtable.h"
 #include "nsThreadUtils.h"
 #include "mozilla/MozPromise.h"
 #include "GMPStorage.h"
@@ -21,6 +22,8 @@
 struct already_AddRefed;
 
 namespace mozilla {
+class OriginAttributesPattern;
+
 namespace gmp {
 
 class GMPParent;
diff -Nru firefox-84.0.2+build1/dom/media/gmp/GMPUtils.cpp firefox-85.0+build1/dom/media/gmp/GMPUtils.cpp
--- firefox-84.0.2+build1/dom/media/gmp/GMPUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/gmp/GMPUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #include "GMPUtils.h"
 
 #include "GMPService.h"
+#include "VideoLimits.h"
 #include "mozIGeckoMediaPluginService.h"
 #include "mozilla/Base64.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/dom/media/GraphDriver.cpp firefox-85.0+build1/dom/media/GraphDriver.cpp
--- firefox-84.0.2+build1/dom/media/GraphDriver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/GraphDriver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -52,7 +52,7 @@
 }
 
 #ifdef DEBUG
-bool GraphDriver::InIteration() {
+bool GraphDriver::InIteration() const {
   return OnThread() || Graph()->InDriverIteration(this);
 }
 #endif
@@ -399,7 +399,7 @@
     MOZ_CRASH("Unexpected DeviceChanged from fallback SystemClockDriver");
   }
 #ifdef DEBUG
-  bool InDriverIteration(GraphDriver* aDriver) override {
+  bool InDriverIteration(const GraphDriver* aDriver) const override {
     return !mOwner->ThreadRunning() && mOwner->InIteration();
   }
 #endif
@@ -867,10 +867,21 @@
   if (!mSandboxed && CheckThreadIdChanged()) {
     CubebUtils::GetAudioThreadRegistry()->Register(mAudioThreadId);
   }
+
+  if (mAudioStreamState.compareExchange(AudioStreamState::Pending,
+                                        AudioStreamState::Running)) {
+    LOG(LogLevel::Verbose, ("%p: AudioCallbackDriver %p First audio callback "
+                            "close the Fallback driver",
+                            Graph(), this));
+  }
+
   FallbackDriverState fallbackState = mFallbackDriverState;
   if (MOZ_UNLIKELY(fallbackState == FallbackDriverState::Running)) {
     // Wait for the fallback driver to stop. Wake it up so it can stop if it's
     // sleeping.
+    LOG(LogLevel::Verbose,
+        ("%p: AudioCallbackDriver %p Waiting for the Fallback driver to stop",
+         Graph(), this));
     EnsureNextIteration();
     PodZero(aOutputBuffer, aFrames * mOutputChannelCount);
     return aFrames;
@@ -966,6 +977,9 @@
     result = IterationResult::CreateStillProcessing();
   }
 
+  MOZ_ASSERT(mBuffer.Available() == 0,
+             "The graph should have filled the buffer");
+
   mBuffer.BufferFilled();
 
 #ifdef MOZ_SAMPLE_TYPE_FLOAT32
@@ -1059,11 +1073,11 @@
   LOG(LogLevel::Debug,
       ("AudioCallbackDriver(%p) State: %s", this, StateToString(aState)));
 
-  // Clear the flag for the not running
-  // states: stopped, drained, error.
-  AudioStreamState streamState = mAudioStreamState.exchange(
-      aState == CUBEB_STATE_STARTED ? AudioStreamState::Running
-                                    : AudioStreamState::None);
+  AudioStreamState streamState = mAudioStreamState;
+  if (aState != CUBEB_STATE_STARTED) {
+    // Clear the flag for the not running states: stopped, drained, error.
+    streamState = mAudioStreamState.exchange(AudioStreamState::None);
+  }
 
   if (aState == CUBEB_STATE_ERROR) {
     // About to hand over control of the graph.  Do not start a new driver if
@@ -1217,6 +1231,11 @@
                                    mSampleRate);
 }
 
+bool AudioCallbackDriver::OnFallback() const {
+  MOZ_ASSERT(InIteration());
+  return mFallbackDriverState == FallbackDriverState::Running;
+}
+
 void AudioCallbackDriver::FallbackToSystemClockDriver() {
   MOZ_ASSERT(!ThreadRunning());
   MOZ_ASSERT(mAudioStreamState == AudioStreamState::None ||
diff -Nru firefox-84.0.2+build1/dom/media/GraphDriver.h firefox-85.0+build1/dom/media/GraphDriver.h
--- firefox-84.0.2+build1/dom/media/GraphDriver.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/GraphDriver.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 #define GRAPHDRIVER_H_
 
 #include "nsAutoRef.h"
+#include "nsIThread.h"
 #include "AudioBufferUtils.h"
 #include "AudioMixer.h"
 #include "AudioSegment.h"
@@ -199,7 +200,7 @@
 #ifdef DEBUG
   /* True if we're on aDriver's thread, or if we're on mGraphRunner's thread
    * and mGraphRunner is currently run by aDriver. */
-  virtual bool InDriverIteration(GraphDriver* aDriver) = 0;
+  virtual bool InDriverIteration(const GraphDriver* aDriver) const = 0;
 #endif
 };
 
@@ -298,10 +299,19 @@
   void SetPreviousDriver(GraphDriver* aPreviousDriver);
 
   virtual AudioCallbackDriver* AsAudioCallbackDriver() { return nullptr; }
+  virtual const AudioCallbackDriver* AsAudioCallbackDriver() const {
+    return nullptr;
+  }
 
   virtual OfflineClockDriver* AsOfflineClockDriver() { return nullptr; }
+  virtual const OfflineClockDriver* AsOfflineClockDriver() const {
+    return nullptr;
+  }
 
   virtual SystemClockDriver* AsSystemClockDriver() { return nullptr; }
+  virtual const SystemClockDriver* AsSystemClockDriver() const {
+    return nullptr;
+  }
 
   /**
    * Set the state of the driver so it can start at the right point in time,
@@ -314,12 +324,12 @@
 
 #ifdef DEBUG
   // True if the current thread is currently iterating the MTG.
-  bool InIteration();
+  bool InIteration() const;
 #endif
   // True if the current thread is the GraphDriver's thread.
-  virtual bool OnThread() = 0;
+  virtual bool OnThread() const = 0;
   // GraphDriver's thread has started and the thread is running.
-  virtual bool ThreadRunning() = 0;
+  virtual bool ThreadRunning() const = 0;
 
   double MediaTimeToSeconds(GraphTime aTime) const {
     NS_ASSERTION(aTime > -TRACK_TIME_MAX && aTime <= TRACK_TIME_MAX,
@@ -431,13 +441,13 @@
   friend class MediaTrackGraphInitThreadRunnable;
   uint32_t IterationDuration() override { return MEDIA_GRAPH_TARGET_PERIOD_MS; }
 
-  nsIThread* Thread() { return mThread; }
+  nsIThread* Thread() const { return mThread; }
 
-  bool OnThread() override {
+  bool OnThread() const override {
     return !mThread || mThread->EventTarget()->IsOnCurrentThread();
   }
 
-  bool ThreadRunning() override { return mThreadRunning; }
+  bool ThreadRunning() const override { return mThreadRunning; }
 
  protected:
   /* Waits until it's time to process more data. */
@@ -474,6 +484,7 @@
                     GraphDriver* aPreviousDriver, uint32_t aSampleRate);
   virtual ~SystemClockDriver();
   SystemClockDriver* AsSystemClockDriver() override { return this; }
+  const SystemClockDriver* AsSystemClockDriver() const override { return this; }
 
  protected:
   /* Return the TimeDuration to wait before the next rendering iteration. */
@@ -498,6 +509,9 @@
                      GraphTime aSlice);
   virtual ~OfflineClockDriver();
   OfflineClockDriver* AsOfflineClockDriver() override { return this; }
+  const OfflineClockDriver* AsOfflineClockDriver() const override {
+    return this;
+  }
 
   void RunThread() override;
 
@@ -607,6 +621,9 @@
                      uint32_t aSampleRate) override;
 
   AudioCallbackDriver* AsAudioCallbackDriver() override { return this; }
+  const AudioCallbackDriver* AsAudioCallbackDriver() const override {
+    return this;
+  }
 
   uint32_t OutputChannelCount() { return mOutputChannelCount; }
 
@@ -619,7 +636,7 @@
     return AudioInputType::Unknown;
   }
 
-  std::thread::id ThreadId() { return mAudioThreadIdInCb.load(); }
+  std::thread::id ThreadId() const { return mAudioThreadIdInCb.load(); }
 
   /* Called when the thread servicing the callback has changed. This can be
    * fairly expensive */
@@ -628,13 +645,13 @@
    * changed. */
   bool CheckThreadIdChanged();
 
-  bool OnThread() override {
+  bool OnThread() const override {
     return mAudioThreadIdInCb.load() == std::this_thread::get_id();
   }
 
   /* Returns true if this audio callback driver has successfully started and not
    * yet stopped. If the fallback driver is active, this returns false. */
-  bool ThreadRunning() override {
+  bool ThreadRunning() const override {
     return mAudioStreamState == AudioStreamState::Running;
   }
 
@@ -645,6 +662,9 @@
   // Returns the output latency for the current audio output stream.
   TimeDuration AudioOutputLatency();
 
+  /* Returns true if this driver is currently driven by the fallback driver. */
+  bool OnFallback() const;
+
  private:
   /**
    * On certain MacBookPro, the microphone is located near the left speaker.
diff -Nru firefox-84.0.2+build1/dom/media/GraphRunner.cpp firefox-85.0+build1/dom/media/GraphRunner.cpp
--- firefox-84.0.2+build1/dom/media/GraphRunner.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/GraphRunner.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -56,13 +56,13 @@
   mThread->Shutdown();
 }
 
-auto GraphRunner::OneIteration(GraphTime aStateEnd, GraphTime aIterationEnd,
+auto GraphRunner::OneIteration(GraphTime aStateTime, GraphTime aIterationEnd,
                                AudioMixer* aMixer) -> IterationResult {
   TRACE();
 
   MonitorAutoLock lock(mMonitor);
   MOZ_ASSERT(mThreadState == ThreadState::Wait);
-  mIterationState = Some(IterationState(aStateEnd, aIterationEnd, aMixer));
+  mIterationState = Some(IterationState(aStateTime, aIterationEnd, aMixer));
 
 #ifdef DEBUG
   if (auto audioDriver = mGraph->CurrentDriver()->AsAudioCallbackDriver()) {
@@ -113,7 +113,7 @@
     }
     MOZ_DIAGNOSTIC_ASSERT(mIterationState.isSome());
     TRACE();
-    mIterationResult = mGraph->OneIterationImpl(mIterationState->StateEnd(),
+    mIterationResult = mGraph->OneIterationImpl(mIterationState->StateTime(),
                                                 mIterationState->IterationEnd(),
                                                 mIterationState->Mixer());
     // Signal that mIterationResult was updated
@@ -130,12 +130,12 @@
   return NS_OK;
 }
 
-bool GraphRunner::OnThread() {
+bool GraphRunner::OnThread() const {
   return mThread->EventTarget()->IsOnCurrentThread();
 }
 
 #ifdef DEBUG
-bool GraphRunner::InDriverIteration(GraphDriver* aDriver) {
+bool GraphRunner::InDriverIteration(const GraphDriver* aDriver) const {
   if (!OnThread()) {
     return false;
   }
diff -Nru firefox-84.0.2+build1/dom/media/GraphRunner.h firefox-85.0+build1/dom/media/GraphRunner.h
--- firefox-84.0.2+build1/dom/media/GraphRunner.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/GraphRunner.h	2021-01-18 19:58:09.000000000 +0000
@@ -35,7 +35,7 @@
    * Signals one iteration of mGraph. Hands state over to mThread and runs
    * the iteration there.
    */
-  IterationResult OneIteration(GraphTime aStateEnd, GraphTime aIterationEnd,
+  IterationResult OneIteration(GraphTime aStateTime, GraphTime aIterationEnd,
                                AudioMixer* aMixer);
 
   /**
@@ -46,14 +46,14 @@
   /**
    * Returns true if called on mThread.
    */
-  bool OnThread();
+  bool OnThread() const;
 
 #ifdef DEBUG
   /**
    * Returns true if called on mThread, and aDriver was the driver that called
    * OneIteration() last.
    */
-  bool InDriverIteration(GraphDriver* aDriver);
+  bool InDriverIteration(const GraphDriver* aDriver) const;
 #endif
 
  private:
@@ -62,16 +62,18 @@
   ~GraphRunner();
 
   class IterationState {
-    GraphTime mStateEnd;
+    GraphTime mStateTime;
     GraphTime mIterationEnd;
     AudioMixer* MOZ_NON_OWNING_REF mMixer;
 
    public:
-    IterationState(GraphTime aStateEnd, GraphTime aIterationEnd,
+    IterationState(GraphTime aStateTime, GraphTime aIterationEnd,
                    AudioMixer* aMixer)
-        : mStateEnd(aStateEnd), mIterationEnd(aIterationEnd), mMixer(aMixer) {}
+        : mStateTime(aStateTime),
+          mIterationEnd(aIterationEnd),
+          mMixer(aMixer) {}
     IterationState& operator=(const IterationState& aOther) = default;
-    GraphTime StateEnd() const { return mStateEnd; }
+    GraphTime StateTime() const { return mStateTime; }
     GraphTime IterationEnd() const { return mIterationEnd; }
     AudioMixer* Mixer() const { return mMixer; }
   };
@@ -90,8 +92,8 @@
 
   enum class ThreadState {
     Wait,      // Waiting for a message.  This is the initial state.
-               // A transition from Run back to Wait occurs on the runner
-               // thread after it processes as far as mIterationState->mStateEnd
+               // A transition from Run back to Wait occurs on the runner thread
+               // after it processes as far as mIterationState->mStateTime
                // and sets mIterationResult.
     Run,       // Set on driver thread after each mIterationState update.
     Shutdown,  // Set when Shutdown() is called on main thread.
diff -Nru firefox-84.0.2+build1/dom/media/gtest/GMPTestMonitor.h firefox-85.0+build1/dom/media/gtest/GMPTestMonitor.h
--- firefox-84.0.2+build1/dom/media/gtest/GMPTestMonitor.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/GMPTestMonitor.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsThreadUtils.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 class GMPTestMonitor {
  public:
diff -Nru firefox-84.0.2+build1/dom/media/gtest/MockCubeb.cpp firefox-85.0+build1/dom/media/gtest/MockCubeb.cpp
--- firefox-84.0.2+build1/dom/media/gtest/MockCubeb.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/MockCubeb.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,10 +15,14 @@
                                  cubeb_stream_params* aOutputStreamParams,
                                  cubeb_data_callback aDataCallback,
                                  cubeb_state_callback aStateCallback,
-                                 void* aUserPtr)
+                                 void* aUserPtr, SmartMockCubebStream* aSelf,
+                                 bool aFrozenStart)
     : context(aContext),
       mHasInput(aInputStreamParams),
       mHasOutput(aOutputStreamParams),
+      mSelf(aSelf),
+      mFrozenStartMonitor("MockCubebStream::mFrozenStartMonitor"),
+      mFrozenStart(aFrozenStart),
       mDataCallback(aDataCallback),
       mStateCallback(aStateCallback),
       mUserPtr(aUserPtr),
@@ -42,26 +46,47 @@
 MockCubebStream::~MockCubebStream() = default;
 
 int MockCubebStream::Start() {
+  mStateCallback(AsCubebStream(), mUserPtr, CUBEB_STATE_STARTED);
   mStreamStop = false;
-  reinterpret_cast<MockCubeb*>(context)->StartStream(this);
-  cubeb_stream* stream = reinterpret_cast<cubeb_stream*>(this);
-  mStateCallback(stream, mUserPtr, CUBEB_STATE_STARTED);
+  MonitorAutoLock lock(mFrozenStartMonitor);
+  if (mFrozenStart) {
+    NS_DispatchBackgroundTask(NS_NewRunnableFunction(
+        "MockCubebStream::WaitForThawBeforeStart",
+        [this, self = RefPtr<SmartMockCubebStream>(mSelf)] {
+          MonitorAutoLock lock(mFrozenStartMonitor);
+          while (mFrozenStart) {
+            mFrozenStartMonitor.Wait();
+          }
+          if (!mStreamStop) {
+            MockCubeb::AsMock(context)->StartStream(mSelf);
+          }
+        }));
+    return CUBEB_OK;
+  }
+  MockCubeb::AsMock(context)->StartStream(this);
   return CUBEB_OK;
 }
 
 int MockCubebStream::Stop() {
-  mStreamStop = true;
   mOutputVerificationEvent.Notify(MakeTuple(
       mAudioVerifier.PreSilenceSamples(), mAudioVerifier.EstimatedFreq(),
       mAudioVerifier.CountDiscontinuities()));
-  int rv = reinterpret_cast<MockCubeb*>(context)->StopStream(this);
+  int rv = MockCubeb::AsMock(context)->StopStream(this);
+  mStreamStop = true;
   if (rv == CUBEB_OK) {
-    cubeb_stream* stream = reinterpret_cast<cubeb_stream*>(this);
-    mStateCallback(stream, mUserPtr, CUBEB_STATE_STOPPED);
+    mStateCallback(AsCubebStream(), mUserPtr, CUBEB_STATE_STOPPED);
   }
   return rv;
 }
 
+cubeb_stream* MockCubebStream::AsCubebStream() {
+  return reinterpret_cast<cubeb_stream*>(this);
+}
+
+MockCubebStream* MockCubebStream::AsMock(cubeb_stream* aStream) {
+  return reinterpret_cast<MockCubebStream*>(aStream);
+}
+
 cubeb_devid MockCubebStream::GetInputDeviceID() const { return mInputDeviceID; }
 
 cubeb_devid MockCubebStream::GetOutputDeviceID() const {
@@ -86,6 +111,12 @@
 
 void MockCubebStream::ForceError() { mForceErrorState = true; }
 
+void MockCubebStream::Thaw() {
+  MonitorAutoLock l(mFrozenStartMonitor);
+  mFrozenStart = false;
+  mFrozenStartMonitor.Notify();
+}
+
 MediaEventSource<uint32_t>& MockCubebStream::FramesProcessedEvent() {
   return mFramesProcessedEvent;
 }
@@ -115,7 +146,7 @@
   if (mInputParams.rate) {
     mAudioGenerator.GenerateInterleaved(mInputBuffer, nrFrames);
   }
-  cubeb_stream* stream = reinterpret_cast<cubeb_stream*>(this);
+  cubeb_stream* stream = AsCubebStream();
   const long outframes =
       mDataCallback(stream, mUserPtr, mHasInput ? mInputBuffer : nullptr,
                     mHasOutput ? mOutputBuffer : nullptr, nrFrames);
@@ -137,10 +168,9 @@
     mForceErrorState = false;
     // Let the audio thread (this thread!) run to completion before
     // being released, by joining and releasing on main.
-    NS_DispatchBackgroundTask(NS_NewRunnableFunction(
-        __func__, [cubeb = reinterpret_cast<MockCubeb*>(context), this] {
-          cubeb->StopStream(this);
-        }));
+    NS_DispatchBackgroundTask(
+        NS_NewRunnableFunction(__func__, [cubeb = MockCubeb::AsMock(context),
+                                          this] { cubeb->StopStream(this); }));
     mStateCallback(stream, mUserPtr, CUBEB_STATE_ERROR);
     mErrorForcedEvent.Notify();
     mStreamStop = true;
@@ -154,6 +184,10 @@
 
 cubeb* MockCubeb::AsCubebContext() { return reinterpret_cast<cubeb*>(this); }
 
+MockCubeb* MockCubeb::AsMock(cubeb* aContext) {
+  return reinterpret_cast<MockCubeb*>(aContext);
+}
+
 int MockCubeb::EnumerateDevices(cubeb_device_type aType,
                                 cubeb_device_collection* collection) {
 #ifdef ANDROID
@@ -287,6 +321,23 @@
   mSupportsDeviceCollectionChangedCallback = aSupports;
 }
 
+void MockCubeb::SetStreamStartFreezeEnabled(bool aEnabled) {
+  mStreamStartFreezeEnabled = aEnabled;
+}
+
+auto MockCubeb::ForceAudioThread() -> RefPtr<ForcedAudioThreadPromise> {
+  RefPtr<ForcedAudioThreadPromise> p =
+      mForcedAudioThreadPromise.Ensure(__func__);
+  mForcedAudioThread = true;
+  StartStream(nullptr);
+  return p;
+}
+
+void MockCubeb::UnforceAudioThread() {
+  mForcedAudioThread = false;
+  StopStream(nullptr);
+}
+
 int MockCubeb::StreamInit(cubeb* aContext, cubeb_stream** aStream,
                           cubeb_devid aInputDevice,
                           cubeb_stream_params* aInputStreamParams,
@@ -294,25 +345,28 @@
                           cubeb_stream_params* aOutputStreamParams,
                           cubeb_data_callback aDataCallback,
                           cubeb_state_callback aStateCallback, void* aUserPtr) {
-  MockCubebStream* mockStream = new MockCubebStream(
+  auto mockStream = MakeRefPtr<SmartMockCubebStream>(
       aContext, aInputDevice, aInputStreamParams, aOutputDevice,
-      aOutputStreamParams, aDataCallback, aStateCallback, aUserPtr);
-  *aStream = reinterpret_cast<cubeb_stream*>(mockStream);
+      aOutputStreamParams, aDataCallback, aStateCallback, aUserPtr,
+      mStreamStartFreezeEnabled);
+  *aStream = mockStream->AsCubebStream();
   mStreamInitEvent.Notify(mockStream);
+  // AddRef the stream to keep it alive. StreamDestroy releases it.
+  Unused << mockStream.forget().take();
   return CUBEB_OK;
 }
 
 void MockCubeb::StreamDestroy(cubeb_stream* aStream) {
   mStreamDestroyEvent.Notify();
-  MockCubebStream* mockStream = reinterpret_cast<MockCubebStream*>(aStream);
-  delete mockStream;
+  RefPtr<SmartMockCubebStream> mockStream =
+      dont_AddRef(MockCubebStream::AsMock(aStream)->mSelf);
 }
 
 void MockCubeb::GoFaster() { mFastMode = true; }
 
 void MockCubeb::DontGoFaster() { mFastMode = false; }
 
-MediaEventSource<MockCubebStream*>& MockCubeb::StreamInitEvent() {
+MediaEventSource<RefPtr<SmartMockCubebStream>>& MockCubeb::StreamInitEvent() {
   return mStreamInitEvent;
 }
 
@@ -322,8 +376,13 @@
 
 void MockCubeb::StartStream(MockCubebStream* aStream) {
   auto streams = mLiveStreams.Lock();
-  MOZ_ASSERT(!streams->Contains(aStream));
-  streams->AppendElement(aStream);
+  MOZ_ASSERT_IF(!aStream, mForcedAudioThread);
+  // Forcing an audio thread must happen before starting streams
+  MOZ_ASSERT_IF(!aStream, streams->IsEmpty());
+  if (aStream) {
+    MOZ_ASSERT(!streams->Contains(aStream->mSelf));
+    streams->AppendElement(aStream->mSelf);
+  }
   if (!mFakeAudioThread) {
     mFakeAudioThread = WrapUnique(new std::thread(ThreadFunction_s, this));
   }
@@ -333,13 +392,14 @@
   UniquePtr<std::thread> audioThread;
   {
     auto streams = mLiveStreams.Lock();
-    if (!streams->Contains(aStream)) {
-      return CUBEB_ERROR;
+    if (aStream) {
+      if (!streams->Contains(aStream->mSelf)) {
+        return CUBEB_ERROR;
+      }
+      streams->RemoveElement(aStream->mSelf);
     }
-    MOZ_ASSERT(streams->Contains(aStream));
-    streams->RemoveElement(aStream);
     MOZ_ASSERT(mFakeAudioThread);
-    if (streams->IsEmpty()) {
+    if (streams->IsEmpty() && !mForcedAudioThread) {
       audioThread = std::move(mFakeAudioThread);
     }
   }
@@ -350,13 +410,17 @@
 }
 
 void MockCubeb::ThreadFunction() {
+  if (mForcedAudioThread) {
+    mForcedAudioThreadPromise.Resolve(MakeRefPtr<AudioThreadAutoUnforcer>(this),
+                                      __func__);
+  }
   while (true) {
     {
       auto streams = mLiveStreams.Lock();
       for (auto& stream : *streams) {
         stream->Process10Ms();
       }
-      if (streams->IsEmpty()) {
+      if (streams->IsEmpty() && !mForcedAudioThread) {
         break;
       }
     }
diff -Nru firefox-84.0.2+build1/dom/media/gtest/MockCubeb.h firefox-85.0+build1/dom/media/gtest/MockCubeb.h
--- firefox-84.0.2+build1/dom/media/gtest/MockCubeb.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/MockCubeb.h	2021-01-18 19:58:09.000000000 +0000
@@ -10,10 +10,9 @@
 #include "AudioVerifier.h"
 #include "MediaEventSource.h"
 #include "mozilla/DataMutex.h"
+#include "mozilla/ThreadSafeWeakPtr.h"
 #include "nsTArray.h"
 
-#include "mozilla/DataMutex.h"
-
 #include <thread>
 #include <atomic>
 #include <chrono>
@@ -124,6 +123,8 @@
 
     cubeb_mock_register_device_collection_changed};
 
+class SmartMockCubebStream;
+
 // Represents the fake cubeb_stream. The context instance is needed to
 // provide access on cubeb_ops struct.
 class MockCubebStream {
@@ -133,13 +134,17 @@
                   cubeb_devid aOutputDevice,
                   cubeb_stream_params* aOutputStreamParams,
                   cubeb_data_callback aDataCallback,
-                  cubeb_state_callback aStateCallback, void* aUserPtr);
+                  cubeb_state_callback aStateCallback, void* aUserPtr,
+                  SmartMockCubebStream* aSelf, bool aFrozenStart);
 
   ~MockCubebStream();
 
   int Start();
   int Stop();
 
+  cubeb_stream* AsCubebStream();
+  static MockCubebStream* AsMock(cubeb_stream* aStream);
+
   cubeb_devid GetInputDeviceID() const;
   cubeb_devid GetOutputDeviceID() const;
 
@@ -149,6 +154,7 @@
 
   void SetDriftFactor(float aDriftFactor);
   void ForceError();
+  void Thaw();
 
   MediaEventSource<uint32_t>& FramesProcessedEvent();
   MediaEventSource<uint32_t>& FramesVerifiedEvent();
@@ -162,8 +168,14 @@
 
   const bool mHasInput;
   const bool mHasOutput;
+  SmartMockCubebStream* const mSelf;
 
  private:
+  // Monitor used to block start until mFrozenStart is false.
+  Monitor mFrozenStartMonitor;
+  // Whether this stream should wait for an explicit start request before
+  // starting. Protected by FrozenStartMonitor.
+  bool mFrozenStart;
   // Signal to the audio thread that stream is stopped.
   std::atomic_bool mStreamStop{true};
   // The audio buffer used on data callback.
@@ -194,6 +206,24 @@
   MediaEventProducer<void> mErrorForcedEvent;
 };
 
+class SmartMockCubebStream
+    : public MockCubebStream,
+      public SupportsThreadSafeWeakPtr<SmartMockCubebStream> {
+ public:
+  MOZ_DECLARE_THREADSAFEWEAKREFERENCE_TYPENAME(SmartMockCubebStream)
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(SmartMockCubebStream)
+  SmartMockCubebStream(cubeb* aContext, cubeb_devid aInputDevice,
+                       cubeb_stream_params* aInputStreamParams,
+                       cubeb_devid aOutputDevice,
+                       cubeb_stream_params* aOutputStreamParams,
+                       cubeb_data_callback aDataCallback,
+                       cubeb_state_callback aStateCallback, void* aUserPtr,
+                       bool aFrozenStart)
+      : MockCubebStream(aContext, aInputDevice, aInputStreamParams,
+                        aOutputDevice, aOutputStreamParams, aDataCallback,
+                        aStateCallback, aUserPtr, this, aFrozenStart) {}
+};
+
 // This class has two facets: it is both a fake cubeb backend that is intended
 // to be used for testing, and passed to Gecko code that expects a normal
 // backend, but is also controllable by the test code to decide what the backend
@@ -205,6 +235,7 @@
   // Cubeb backend implementation
   // This allows passing this class as a cubeb* instance.
   cubeb* AsCubebContext();
+  static MockCubeb* AsMock(cubeb* aContext);
   // Fill in the collection parameter with all devices of aType.
   int EnumerateDevices(cubeb_device_type aType,
                        cubeb_device_collection* collection);
@@ -233,6 +264,36 @@
   // collection invalidation callback, to be able to test the fallback path.
   void SetSupportDeviceChangeCallback(bool aSupports);
 
+  // Makes MockCubebStreams starting after this point wait for AllowStart().
+  // Callers must ensure they get a hold of the stream through StreamInitEvent
+  // to be able to start them.
+  void SetStreamStartFreezeEnabled(bool aEnabled);
+
+  // Helper class that automatically unforces a forced audio thread on release.
+  class AudioThreadAutoUnforcer {
+    NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AudioThreadAutoUnforcer)
+
+   public:
+    explicit AudioThreadAutoUnforcer(MockCubeb* aContext)
+        : mContext(aContext) {}
+
+   protected:
+    virtual ~AudioThreadAutoUnforcer() { mContext->UnforceAudioThread(); }
+    MockCubeb* mContext;
+  };
+
+  // Creates the audio thread if one is not available. The audio thread remains
+  // forced until UnforceAudioThread is called. The returned promise is resolved
+  // when the audio thread is running. With this, a test can ensure starting
+  // audio streams is deterministically fast across platforms for more accurate
+  // results.
+  using ForcedAudioThreadPromise =
+      MozPromise<RefPtr<AudioThreadAutoUnforcer>, nsresult, false>;
+  RefPtr<ForcedAudioThreadPromise> ForceAudioThread();
+
+  // Allows a forced audio thread to stop.
+  void UnforceAudioThread();
+
   int StreamInit(cubeb* aContext, cubeb_stream** aStream,
                  cubeb_devid aInputDevice,
                  cubeb_stream_params* aInputStreamParams,
@@ -246,7 +307,7 @@
   void GoFaster();
   void DontGoFaster();
 
-  MediaEventSource<MockCubebStream*>& StreamInitEvent();
+  MediaEventSource<RefPtr<SmartMockCubebStream>>& StreamInitEvent();
   MediaEventSource<void>& StreamDestroyEvent();
 
   // MockCubeb specific API
@@ -280,12 +341,19 @@
   // notification via a system callback. If not, Gecko is expected to re-query
   // the list every time.
   bool mSupportsDeviceCollectionChangedCallback = true;
+  // Whether new MockCubebStreams should be frozen on start.
+  Atomic<bool> mStreamStartFreezeEnabled{false};
+  // Whether the audio thread is forced, i.e., whether it remains active even
+  // with no live streams.
+  Atomic<bool> mForcedAudioThread{false};
+  MozPromiseHolder<ForcedAudioThreadPromise> mForcedAudioThreadPromise;
   // Our input and output devices.
   nsTArray<cubeb_device_info> mInputDevices;
   nsTArray<cubeb_device_info> mOutputDevices;
 
   // The streams that are currently running.
-  DataMutex<nsTArray<MockCubebStream*>> mLiveStreams{"MockCubeb::mLiveStreams"};
+  DataMutex<nsTArray<RefPtr<SmartMockCubebStream>>> mLiveStreams{
+      "MockCubeb::mLiveStreams"};
   // Thread that simulates the audio thread, shared across MockCubebStreams to
   // avoid unintended drift. This is set together with mLiveStreams, under the
   // mLiveStreams DataMutex.
@@ -295,18 +363,15 @@
   // true we sleep(0) between iterations instead of 10ms.
   std::atomic<bool> mFastMode{false};
 
-  MediaEventProducer<MockCubebStream*> mStreamInitEvent;
+  MediaEventProducer<RefPtr<SmartMockCubebStream>> mStreamInitEvent;
   MediaEventProducer<void> mStreamDestroyEvent;
 };
 
-void cubeb_mock_destroy(cubeb* context) {
-  delete reinterpret_cast<MockCubeb*>(context);
-}
+void cubeb_mock_destroy(cubeb* context) { delete MockCubeb::AsMock(context); }
 
 int cubeb_mock_enumerate_devices(cubeb* context, cubeb_device_type type,
                                  cubeb_device_collection* out) {
-  MockCubeb* mock = reinterpret_cast<MockCubeb*>(context);
-  return mock->EnumerateDevices(type, out);
+  return MockCubeb::AsMock(context)->EnumerateDevices(type, out);
 }
 
 int cubeb_mock_device_collection_destroy(cubeb* context,
@@ -318,9 +383,8 @@
 int cubeb_mock_register_device_collection_changed(
     cubeb* context, cubeb_device_type devtype,
     cubeb_device_collection_changed_callback callback, void* user_ptr) {
-  MockCubeb* mock = reinterpret_cast<MockCubeb*>(context);
-  return mock->RegisterDeviceCollectionChangeCallback(devtype, callback,
-                                                      user_ptr);
+  return MockCubeb::AsMock(context)->RegisterDeviceCollectionChangeCallback(
+      devtype, callback, user_ptr);
 }
 
 int cubeb_mock_stream_init(
@@ -329,25 +393,22 @@
     cubeb_devid output_device, cubeb_stream_params* output_stream_params,
     unsigned int latency, cubeb_data_callback data_callback,
     cubeb_state_callback state_callback, void* user_ptr) {
-  MockCubeb* mock = reinterpret_cast<MockCubeb*>(context);
-  return mock->StreamInit(context, stream, input_device, input_stream_params,
-                          output_device, output_stream_params, data_callback,
-                          state_callback, user_ptr);
+  return MockCubeb::AsMock(context)->StreamInit(
+      context, stream, input_device, input_stream_params, output_device,
+      output_stream_params, data_callback, state_callback, user_ptr);
 }
 
 int cubeb_mock_stream_start(cubeb_stream* stream) {
-  MockCubebStream* mockStream = reinterpret_cast<MockCubebStream*>(stream);
-  return mockStream->Start();
+  return MockCubebStream::AsMock(stream)->Start();
 }
 
 int cubeb_mock_stream_stop(cubeb_stream* stream) {
-  MockCubebStream* mockStream = reinterpret_cast<MockCubebStream*>(stream);
-  return mockStream->Stop();
+  return MockCubebStream::AsMock(stream)->Stop();
 }
 
 void cubeb_mock_stream_destroy(cubeb_stream* stream) {
-  MockCubebStream* mockStream = reinterpret_cast<MockCubebStream*>(stream);
-  MockCubeb* mock = reinterpret_cast<MockCubeb*>(mockStream->context);
+  MockCubebStream* mockStream = MockCubebStream::AsMock(stream);
+  MockCubeb* mock = MockCubeb::AsMock(mockStream->context);
   return mock->StreamDestroy(stream);
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/gtest/mp4_demuxer/TestParser.cpp firefox-85.0+build1/dom/media/gtest/mp4_demuxer/TestParser.cpp
--- firefox-84.0.2+build1/dom/media/gtest/mp4_demuxer/TestParser.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/mp4_demuxer/TestParser.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
+#include "js/Conversions.h"
 #include "MediaData.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Preferences.h"
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestAudioCallbackDriver.cpp firefox-85.0+build1/dom/media/gtest/TestAudioCallbackDriver.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestAudioCallbackDriver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestAudioCallbackDriver.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,19 +10,22 @@
 #include "gtest/gtest-printers.h"
 #include "gtest/gtest.h"
 
+#include "MediaTrackGraphImpl.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
 
 #include "MockCubeb.h"
+#include "WaitFor.h"
 
 using namespace mozilla;
 using IterationResult = GraphInterface::IterationResult;
 using ::testing::NiceMock;
-using ::testing::Return;
 
 class MockGraphInterface : public GraphInterface {
   NS_DECL_THREADSAFE_ISUPPORTS
+  explicit MockGraphInterface(TrackRate aSampleRate)
+      : mSampleRate(aSampleRate) {}
   MOCK_METHOD4(NotifyOutputData,
                void(AudioDataValue*, size_t, TrackRate, uint32_t));
   MOCK_METHOD0(NotifyInputStopped, void());
@@ -31,7 +34,21 @@
   MOCK_METHOD0(DeviceChanged, void());
   /* OneIteration cannot be mocked because IterationResult is non-memmovable and
    * cannot be passed as a parameter, which GMock does internally. */
-  IterationResult OneIteration(GraphTime, GraphTime, AudioMixer*) {
+  IterationResult OneIteration(GraphTime aStateComputedTime, GraphTime,
+                               AudioMixer* aMixer) {
+    GraphDriver* driver = mCurrentDriver;
+    if (aMixer) {
+      aMixer->StartMixing();
+      aMixer->Mix(nullptr,
+                  driver->AsAudioCallbackDriver()->OutputChannelCount(),
+                  aStateComputedTime - mStateComputedTime, mSampleRate);
+      aMixer->FinishMixing();
+    }
+    if (aStateComputedTime != mStateComputedTime) {
+      mFramesIteratedEvent.Notify(aStateComputedTime - mStateComputedTime);
+      ++mIterationCount;
+    }
+    mStateComputedTime = aStateComputedTime;
     if (!mKeepProcessing) {
       return IterationResult::CreateStop(
           NS_NewRunnableFunction(__func__, [] {}));
@@ -41,21 +58,41 @@
       return IterationResult::CreateSwitchDriver(
           next, NS_NewRunnableFunction(__func__, [] {}));
     }
+    if (mEnsureNextIteration) {
+      driver->EnsureNextIteration();
+    }
     return IterationResult::CreateStillProcessing();
   }
+  void SetEnsureNextIteration(bool aEnsure) { mEnsureNextIteration = aEnsure; }
+
 #ifdef DEBUG
-  bool InDriverIteration(GraphDriver* aDriver) override {
+  bool InDriverIteration(const GraphDriver* aDriver) const override {
     return aDriver->OnThread();
   }
 #endif
 
+  size_t IterationCount() const { return mIterationCount; }
+
+  GraphTime StateComputedTime() const { return mStateComputedTime; }
+  void SetCurrentDriver(GraphDriver* aDriver) { mCurrentDriver = aDriver; }
+
   void StopIterating() { mKeepProcessing = false; }
 
   void SwitchTo(GraphDriver* aDriver) { mNextDriver = aDriver; }
+  const TrackRate mSampleRate;
+
+  MediaEventSource<uint32_t>& FramesIteratedEvent() {
+    return mFramesIteratedEvent;
+  }
 
  protected:
+  Atomic<size_t> mIterationCount{0};
+  Atomic<GraphTime> mStateComputedTime{0};
+  Atomic<GraphDriver*> mCurrentDriver{nullptr};
+  Atomic<bool> mEnsureNextIteration{false};
   Atomic<bool> mKeepProcessing{true};
   Atomic<GraphDriver*> mNextDriver{nullptr};
+  MediaEventProducer<uint32_t> mFramesIteratedEvent;
   virtual ~MockGraphInterface() = default;
 };
 
@@ -63,20 +100,22 @@
 
 TEST(TestAudioCallbackDriver, StartStop)
 MOZ_CAN_RUN_SCRIPT_FOR_DEFINITION {
+  const TrackRate rate = 44100;
   MockCubeb* cubeb = new MockCubeb();
   CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
 
   RefPtr<AudioCallbackDriver> driver;
-  auto graph = MakeRefPtr<NiceMock<MockGraphInterface>>();
+  auto graph = MakeRefPtr<NiceMock<MockGraphInterface>>(rate);
   EXPECT_CALL(*graph, NotifyInputStopped).Times(0);
   ON_CALL(*graph, NotifyOutputData)
       .WillByDefault([&](AudioDataValue*, size_t, TrackRate, uint32_t) {});
 
-  driver = MakeRefPtr<AudioCallbackDriver>(graph, nullptr, 44100, 2, 0, nullptr,
+  driver = MakeRefPtr<AudioCallbackDriver>(graph, nullptr, rate, 2, 0, nullptr,
                                            nullptr, AudioInputType::Unknown);
   EXPECT_FALSE(driver->ThreadRunning()) << "Verify thread is not running";
   EXPECT_FALSE(driver->IsStarted()) << "Verify thread is not started";
 
+  graph->SetCurrentDriver(driver);
   driver->Start();
   // Allow some time to "play" audio.
   std::this_thread::sleep_for(std::chrono::milliseconds(200));
@@ -84,8 +123,102 @@
   EXPECT_TRUE(driver->IsStarted()) << "Verify thread is started";
 
   // This will block untill all events have been executed.
-  graph->StopIterating();
   MOZ_KnownLive(driver)->Shutdown();
   EXPECT_FALSE(driver->ThreadRunning()) << "Verify thread is not running";
   EXPECT_FALSE(driver->IsStarted()) << "Verify thread is not started";
 }
+
+void TestSlowStart(const TrackRate aRate) MOZ_CAN_RUN_SCRIPT_FOR_DEFINITION {
+  std::cerr << "TestSlowStart with rate " << aRate << std::endl;
+
+  MockCubeb* cubeb = new MockCubeb();
+  cubeb->SetStreamStartFreezeEnabled(true);
+  auto unforcer = WaitFor(cubeb->ForceAudioThread()).unwrap();
+  Unused << unforcer;
+  CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
+
+  RefPtr<AudioCallbackDriver> driver;
+  auto graph = MakeRefPtr<NiceMock<MockGraphInterface>>(aRate);
+  EXPECT_CALL(*graph, NotifyInputStopped).Times(0);
+
+  Maybe<int64_t> audioStart;
+  Maybe<uint32_t> alreadyBuffered;
+  int64_t inputFrameCount = 0;
+  int64_t outputFrameCount = 0;
+  int64_t processedFrameCount = 0;
+  ON_CALL(*graph, NotifyInputData)
+      .WillByDefault([&](const AudioDataValue*, size_t aFrames, TrackRate,
+                         uint32_t, uint32_t aAlreadyBuffered) {
+        if (!audioStart) {
+          audioStart = Some(graph->StateComputedTime());
+          alreadyBuffered = Some(aAlreadyBuffered);
+        }
+        EXPECT_NEAR(inputFrameCount,
+                    static_cast<int64_t>(graph->StateComputedTime() -
+                                         *audioStart + *alreadyBuffered),
+                    WEBAUDIO_BLOCK_SIZE)
+            << "Input should be behind state time, due to the delayed start. "
+               "stateComputedTime="
+            << graph->StateComputedTime() << ", audioStartTime=" << *audioStart
+            << ", alreadyBuffered=" << *alreadyBuffered;
+        inputFrameCount += aFrames;
+      });
+  ON_CALL(*graph, NotifyOutputData)
+      .WillByDefault([&](AudioDataValue*, size_t aFrames, TrackRate aRate,
+                         uint32_t) { outputFrameCount += aFrames; });
+
+  driver = MakeRefPtr<AudioCallbackDriver>(graph, nullptr, aRate, 2, 2, nullptr,
+                                           (void*)1, AudioInputType::Voice);
+  EXPECT_FALSE(driver->ThreadRunning()) << "Verify thread is not running";
+  EXPECT_FALSE(driver->IsStarted()) << "Verify thread is not started";
+
+  graph->SetCurrentDriver(driver);
+  graph->SetEnsureNextIteration(true);
+
+  driver->Start();
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
+  cubeb->SetStreamStartFreezeEnabled(false);
+
+  const int fallbackIterations = 3;
+  WaitUntil(graph->FramesIteratedEvent(), [&](uint32_t aFrames) {
+    const GraphTime tenMillis = aRate / 100;
+    // An iteration is always rounded upwards to the next full block.
+    const GraphTime tenMillisIteration =
+        MediaTrackGraphImpl::RoundUpToEndOfAudioBlock(tenMillis);
+    // The iteration may be smaller because up to an extra block may have been
+    // processed and buffered.
+    const GraphTime tenMillisMinIteration =
+        tenMillisIteration - WEBAUDIO_BLOCK_SIZE;
+    // An iteration must be at least one audio block.
+    const GraphTime minIteration =
+        std::max<GraphTime>(WEBAUDIO_BLOCK_SIZE, tenMillisMinIteration);
+    EXPECT_GE(aFrames, minIteration)
+        << "Fallback driver iteration >= 10ms, modulo an audio block";
+    EXPECT_LT(aFrames, static_cast<size_t>(aRate))
+        << "Fallback driver iteration <1s (sanity)";
+    return graph->IterationCount() >= fallbackIterations;
+  });
+  stream->Thaw();
+
+  // Wait for at least 100ms of audio data.
+  WaitUntil(stream->FramesProcessedEvent(), [&](uint32_t aFrames) {
+    processedFrameCount += aFrames;
+    return processedFrameCount >= aRate / 10;
+  });
+
+  // This will block untill all events have been executed.
+  MOZ_KnownLive(driver)->Shutdown();
+
+  EXPECT_EQ(inputFrameCount, outputFrameCount);
+  EXPECT_NEAR(graph->StateComputedTime() - *audioStart,
+              inputFrameCount + *alreadyBuffered, WEBAUDIO_BLOCK_SIZE)
+      << "Graph progresses while audio driver runs. stateComputedTime="
+      << graph->StateComputedTime() << ", inputFrameCount=" << inputFrameCount;
+}
+
+TEST(TestAudioCallbackDriver, SlowStart)
+MOZ_CAN_RUN_SCRIPT_FOR_DEFINITION {
+  TestSlowStart(1000);   // 10ms = 10 <<< 128 samples
+  TestSlowStart(8000);   // 10ms = 80  <  128 samples
+  TestSlowStart(44100);  // 10ms = 441 >  128 samples
+}
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestAudioTrackGraph.cpp firefox-85.0+build1/dom/media/gtest/TestAudioTrackGraph.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestAudioTrackGraph.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestAudioTrackGraph.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,80 +15,14 @@
 #endif  // MOZ_WEBRTC
 #include "MockCubeb.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/SpinEventLoopUntil.h"
+#include "WaitFor.h"
 
 #define DRIFT_BUFFERING_PREF "media.clockdrift.buffering"
 
 using namespace mozilla;
 
 namespace {
-/**
- * Waits for an occurrence of aEvent on the current thread (by blocking it,
- * except tasks added to the event loop may run) and returns the event's
- * templated value, if it's non-void.
- *
- * The caller must be wary of eventloop issues, in
- * particular cases where we rely on a stable state runnable, but there is never
- * a task to trigger stable state. In such cases it is the responsibility of the
- * caller to create the needed tasks, as JS would. A noteworthy API that relies
- * on stable state is MediaTrackGraph::GetInstance.
- */
-template <typename T>
-T WaitFor(MediaEventSource<T>& aEvent) {
-  Maybe<T> value;
-  MediaEventListener listener = aEvent.Connect(
-      AbstractThread::GetCurrent(), [&](T aValue) { value = Some(aValue); });
-  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
-      [&] { return value.isSome(); });
-  listener.Disconnect();
-  return value.value();
-}
-
-/**
- * Specialization of WaitFor<T> for void.
- */
-void WaitFor(MediaEventSource<void>& aEvent) {
-  bool done = false;
-  MediaEventListener listener =
-      aEvent.Connect(AbstractThread::GetCurrent(), [&] { done = true; });
-  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
-      [&] { return done; });
-  listener.Disconnect();
-}
-
-/**
- * Variant of WaitFor that blocks the caller until a MozPromise has either been
- * resolved or rejected.
- */
-template <typename R, typename E, bool Exc>
-Result<R, E> WaitFor(const RefPtr<MozPromise<R, E, Exc>>& aPromise) {
-  Maybe<Result<R, E>> result;
-  aPromise->Then(
-      GetCurrentSerialEventTarget(), __func__,
-      [&](R aResult) { result = Some(Result<R, E>(aResult)); },
-      [&](E aError) { result = Some(Result<R, E>(aError)); });
-  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
-      [&] { return result.isSome(); });
-  return result.extract();
-}
-
-/**
- * A variation of WaitFor that takes a callback to be called each time aEvent is
- * raised. Blocks the caller until the callback function returns true.
- */
-template <typename T, typename CallbackFunction>
-void WaitUntil(MediaEventSource<T>& aEvent, const CallbackFunction& aF) {
-  bool done = false;
-  MediaEventListener listener =
-      aEvent.Connect(AbstractThread::GetCurrent(), [&](T aValue) {
-        if (!done) {
-          done = aF(aValue);
-        }
-      });
-  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
-      [&] { return done; });
-  listener.Disconnect();
-}
-
 // Short-hand for InvokeAsync on the current thread.
 #define Invoke(f) InvokeAsync(GetCurrentSerialEventTarget(), __func__, f)
 
@@ -233,7 +167,7 @@
   DispatchFunction(
       [&] { dummySource = graph->CreateSourceTrack(MediaSegment::AUDIO); });
 
-  MockCubebStream* stream = WaitFor(cubeb->StreamInitEvent());
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
 
   EXPECT_EQ(stream->GetOutputDeviceID(), reinterpret_cast<cubeb_devid>(2))
       << "After init confirm the expected output device id";
@@ -280,14 +214,18 @@
   CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
 
   MediaTrackGraph* graph = MediaTrackGraph::GetInstance(
-      MediaTrackGraph::AUDIO_THREAD_DRIVER, /*window*/ nullptr,
+      MediaTrackGraph::SYSTEM_THREAD_DRIVER, /*window*/ nullptr,
       MediaTrackGraph::REQUEST_DEFAULT_SAMPLE_RATE, nullptr);
 
   // Dummy track to make graph rolling. Add it and remove it to remove the
   // graph from the global hash table and let it shutdown.
+  //
+  // We open an input through this track so that there's something triggering
+  // EnsureNextIteration on the fallback driver after the callback driver has
+  // gotten the error.
   RefPtr<AudioInputTrack> inputTrack;
   RefPtr<AudioInputProcessing> listener;
-  Unused << WaitFor(Invoke([&] {
+  auto started = Invoke([&] {
     inputTrack = AudioInputTrack::Create(graph);
     listener = new AudioInputProcessing(2, PRINCIPAL_HANDLE_NONE);
     inputTrack->GraphImpl()->AppendMessage(
@@ -295,18 +233,11 @@
     inputTrack->SetInputProcessing(listener);
     inputTrack->GraphImpl()->AppendMessage(
         MakeUnique<StartInputProcessing>(inputTrack, listener));
-    return graph->NotifyWhenDeviceStarted(inputTrack);
-  }));
-
-  // We open an input through this track so that there's something triggering
-  // EnsureNextIteration on the fallback driver after the callback driver has
-  // gotten the error.
-  auto started = Invoke([&] {
     inputTrack->OpenAudioInput((void*)1, listener);
     return graph->NotifyWhenDeviceStarted(inputTrack);
   });
 
-  MockCubebStream* stream = WaitFor(cubeb->StreamInitEvent());
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
   Result<bool, nsresult> rv = WaitFor(started);
   EXPECT_TRUE(rv.unwrapOr(false));
 
@@ -340,16 +271,21 @@
 {
   MockCubeb* cubeb = new MockCubeb();
   CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
+  auto unforcer = WaitFor(cubeb->ForceAudioThread()).unwrap();
+  Unused << unforcer;
 
+  // Start on a system clock driver, then switch to full-duplex in one go. If we
+  // did output-then-full-duplex we'd risk a second NotifyWhenDeviceStarted
+  // resolving early after checking the first audio driver only.
   MediaTrackGraph* graph = MediaTrackGraph::GetInstance(
-      MediaTrackGraph::AUDIO_THREAD_DRIVER, /*window*/ nullptr,
+      MediaTrackGraph::SYSTEM_THREAD_DRIVER, /*window*/ nullptr,
       MediaTrackGraph::REQUEST_DEFAULT_SAMPLE_RATE, nullptr);
 
   RefPtr<AudioInputTrack> inputTrack;
   RefPtr<ProcessedMediaTrack> outputTrack;
   RefPtr<MediaInputPort> port;
   RefPtr<AudioInputProcessing> listener;
-  Unused << WaitFor(Invoke([&] {
+  auto p = Invoke([&] {
     inputTrack = AudioInputTrack::Create(graph);
     outputTrack = graph->CreateForwardedInputTrack(MediaSegment::AUDIO);
     outputTrack->QueueSetAutoend(false);
@@ -362,16 +298,12 @@
     inputTrack->SetInputProcessing(listener);
     inputTrack->GraphImpl()->AppendMessage(
         MakeUnique<StartInputProcessing>(inputTrack, listener));
-    return graph->NotifyWhenDeviceStarted(inputTrack);
-  }));
-
-  DispatchFunction([&] {
     // Device id does not matter. Ignore.
     inputTrack->OpenAudioInput((void*)1, listener);
+    return graph->NotifyWhenDeviceStarted(inputTrack);
   });
 
-  auto p = Invoke([&] { return graph->NotifyWhenDeviceStarted(inputTrack); });
-  MockCubebStream* stream = WaitFor(cubeb->StreamInitEvent());
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
   EXPECT_TRUE(stream->mHasInput);
   Unused << WaitFor(p);
 
@@ -420,10 +352,9 @@
   // driver has started to complete the switch, *usually* resulting two
   // 10ms-iterations of silence; sometimes only one.
   EXPECT_LE(preSilenceSamples, 128U + 2 * inputRate / 100 /* 2*10ms */);
-  // Waveform may start after the beginning. In this case, there is a gap
-  // at the beginning and the end which is counted as discontinuity.
-  EXPECT_GE(nrDiscontinuities, 0U);
-  EXPECT_LE(nrDiscontinuities, 2U);
+  // The waveform from AudioGenerator starts at 0, but we don't control its
+  // ending, so we expect a discontinuity there.
+  EXPECT_LE(nrDiscontinuities, 1U);
 }
 
 TEST(TestAudioTrackGraph, ReOpenAudioInput)
@@ -457,7 +388,7 @@
     return graph->NotifyWhenDeviceStarted(inputTrack);
   });
 
-  MockCubebStream* stream = WaitFor(cubeb->StreamInitEvent());
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
   EXPECT_TRUE(stream->mHasInput);
   Unused << WaitFor(p);
 
@@ -569,6 +500,103 @@
   EXPECT_LE(nrDiscontinuities, 1U);
 }
 
+TEST(TestAudioTrackGraph, AudioInputTrackDisabling)
+{
+  MockCubeb* cubeb = new MockCubeb();
+  CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
+
+  MediaTrackGraph* graph = MediaTrackGraph::GetInstance(
+      MediaTrackGraph::SYSTEM_THREAD_DRIVER, /*window*/ nullptr,
+      MediaTrackGraph::REQUEST_DEFAULT_SAMPLE_RATE, nullptr);
+
+  RefPtr<AudioInputTrack> inputTrack;
+  RefPtr<ProcessedMediaTrack> outputTrack;
+  RefPtr<MediaInputPort> port;
+  RefPtr<AudioInputProcessing> listener;
+  auto p = Invoke([&] {
+    inputTrack = AudioInputTrack::Create(graph);
+    outputTrack = graph->CreateForwardedInputTrack(MediaSegment::AUDIO);
+    outputTrack->QueueSetAutoend(false);
+    outputTrack->AddAudioOutput(reinterpret_cast<void*>(1));
+    port = outputTrack->AllocateInputPort(inputTrack);
+    /* Primary graph: Open Audio Input through SourceMediaTrack */
+    listener = new AudioInputProcessing(2, PRINCIPAL_HANDLE_NONE);
+    inputTrack->GraphImpl()->AppendMessage(
+        MakeUnique<SetPassThrough>(inputTrack, listener, true));
+    inputTrack->SetInputProcessing(listener);
+    inputTrack->OpenAudioInput((void*)1, listener);
+    inputTrack->GraphImpl()->AppendMessage(
+        MakeUnique<StartInputProcessing>(inputTrack, listener));
+    return graph->NotifyWhenDeviceStarted(inputTrack);
+  });
+
+  RefPtr<SmartMockCubebStream> stream = WaitFor(cubeb->StreamInitEvent());
+  EXPECT_TRUE(stream->mHasInput);
+  Unused << WaitFor(p);
+
+  // Wait for a second worth of audio data. GoFaster is dispatched through a
+  // ControlMessage so that it is called in the first audio driver iteration.
+  // Otherwise the audio driver might be going very fast while the fallback
+  // system clock driver is still in an iteration.
+  DispatchFunction([&] {
+    inputTrack->GraphImpl()->AppendMessage(MakeUnique<GoFaster>(cubeb));
+  });
+  uint32_t totalFrames = 0;
+  WaitUntil(stream->FramesProcessedEvent(), [&](uint32_t aFrames) {
+    totalFrames += aFrames;
+    return totalFrames > static_cast<uint32_t>(graph->GraphRate());
+  });
+  cubeb->DontGoFaster();
+
+  const uint32_t ITERATION_COUNT = 5;
+  uint32_t iterations = ITERATION_COUNT;
+  DisabledTrackMode currentMode = DisabledTrackMode::SILENCE_BLACK;
+  while (iterations--) {
+    // toggle the track enabled mode, wait a second, do this ITERATION_COUNT
+    // times
+    DispatchFunction([&] {
+      inputTrack->SetDisabledTrackMode(currentMode);
+      if (currentMode == DisabledTrackMode::SILENCE_BLACK) {
+        currentMode = DisabledTrackMode::ENABLED;
+      } else {
+        currentMode = DisabledTrackMode::SILENCE_BLACK;
+      }
+      inputTrack->GraphImpl()->AppendMessage(MakeUnique<GoFaster>(cubeb));
+    });
+
+    totalFrames = 0;
+    WaitUntil(stream->FramesProcessedEvent(), [&](uint32_t aFrames) {
+      totalFrames += aFrames;
+      return totalFrames > static_cast<uint32_t>(graph->GraphRate());
+    });
+    cubeb->DontGoFaster();
+  }
+
+  // Clean up.
+  DispatchFunction([&] {
+    outputTrack->RemoveAudioOutput((void*)1);
+    outputTrack->Destroy();
+    port->Destroy();
+    inputTrack->GraphImpl()->AppendMessage(
+        MakeUnique<StopInputProcessing>(listener));
+    Maybe<CubebUtils::AudioDeviceID> id =
+        Some(reinterpret_cast<CubebUtils::AudioDeviceID>(1));
+    inputTrack->CloseAudioInput(id);
+    inputTrack->Destroy();
+  });
+
+  uint64_t preSilenceSamples;
+  uint32_t estimatedFreq;
+  uint32_t nrDiscontinuities;
+  Tie(preSilenceSamples, estimatedFreq, nrDiscontinuities) =
+      WaitFor(stream->OutputVerificationEvent());
+
+  // We're enabling/disabling the track ITERATION_COUNT times, so we expect the
+  // same number of discontinuities.
+  std::cerr << "nrDiscontinuities" << nrDiscontinuities << std::endl;
+  EXPECT_EQ(nrDiscontinuities, ITERATION_COUNT);
+}
+
 void TestCrossGraphPort(uint32_t aInputRate, uint32_t aOutputRate,
                         float aDriftFactor, uint32_t aBufferMs = 50) {
   std::cerr << "TestCrossGraphPort input: " << aInputRate
@@ -577,15 +605,25 @@
 
   MockCubeb* cubeb = new MockCubeb();
   CubebUtils::ForceSetCubebContext(cubeb->AsCubebContext());
+  auto unforcer = WaitFor(cubeb->ForceAudioThread()).unwrap();
+  Unused << unforcer;
+
+  cubeb->SetStreamStartFreezeEnabled(true);
 
-  /* Primary graph: Create the graph and a SourceMediaTrack. */
+  /* Primary graph: Create the graph. */
   MediaTrackGraph* primary =
-      MediaTrackGraph::GetInstance(MediaTrackGraph::AUDIO_THREAD_DRIVER,
+      MediaTrackGraph::GetInstance(MediaTrackGraph::SYSTEM_THREAD_DRIVER,
                                    /*window*/ nullptr, aInputRate, nullptr);
 
+  /* Partner graph: Create the graph. */
+  MediaTrackGraph* partner = MediaTrackGraph::GetInstance(
+      MediaTrackGraph::SYSTEM_THREAD_DRIVER, /*window*/ nullptr, aOutputRate,
+      /*OutputDeviceID*/ reinterpret_cast<cubeb_devid>(1));
+
   RefPtr<AudioInputTrack> inputTrack;
   RefPtr<AudioInputProcessing> listener;
-  DispatchFunction([&] {
+  auto primaryStarted = Invoke([&] {
+    /* Primary graph: Create input track and open it */
     inputTrack = AudioInputTrack::Create(primary);
     listener = new AudioInputProcessing(2, PRINCIPAL_HANDLE_NONE);
     inputTrack->GraphImpl()->AppendMessage(
@@ -593,18 +631,17 @@
     inputTrack->SetInputProcessing(listener);
     inputTrack->GraphImpl()->AppendMessage(
         MakeUnique<StartInputProcessing>(inputTrack, listener));
+    inputTrack->OpenAudioInput((void*)1, listener);
+    return primary->NotifyWhenDeviceStarted(inputTrack);
   });
-  WaitFor(cubeb->StreamInitEvent());
 
-  /* Partner graph: Create graph and the CrossGraphReceiver. */
-  MediaTrackGraph* partner = MediaTrackGraph::GetInstance(
-      MediaTrackGraph::AUDIO_THREAD_DRIVER, /*window*/ nullptr, aOutputRate,
-      /*OutputDeviceID*/ reinterpret_cast<cubeb_devid>(1));
+  RefPtr<SmartMockCubebStream> inputStream = WaitFor(cubeb->StreamInitEvent());
 
-  RefPtr<CrossGraphReceiver> receiver;
   RefPtr<CrossGraphTransmitter> transmitter;
   RefPtr<MediaInputPort> port;
-  DispatchFunction([&] {
+  RefPtr<CrossGraphReceiver> receiver;
+  auto partnerStarted = Invoke([&] {
+    /* Partner graph: Create CrossGraphReceiver */
     receiver = partner->CreateCrossGraphReceiver(primary->GraphRate());
 
     /* Primary graph: Create CrossGraphTransmitter */
@@ -614,30 +651,34 @@
      * Check in MediaManager how it is connected to AudioStreamTrack. */
     port = transmitter->AllocateInputPort(inputTrack);
     receiver->AddAudioOutput((void*)1);
-
-    /* Primary graph: Open Audio Input through SourceMediaTrack */
-    // Device id does not matter. Ignore.
-    inputTrack->OpenAudioInput((void*)1, listener);
-  });
-
-  MockCubebStream* inputStream = nullptr;
-  MockCubebStream* partnerStream = nullptr;
-  // Wait for the streams to be created.
-  WaitUntil(cubeb->StreamInitEvent(), [&](MockCubebStream* aStream) {
-    if (aStream->mHasInput) {
-      inputStream = aStream;
-    } else {
-      partnerStream = aStream;
-    }
-    return inputStream && partnerStream;
+    return partner->NotifyWhenDeviceStarted(receiver);
   });
 
+  RefPtr<SmartMockCubebStream> partnerStream =
+      WaitFor(cubeb->StreamInitEvent());
   partnerStream->SetDriftFactor(aDriftFactor);
 
-  // Wait for a second worth of audio data. GoFaster is dispatched through a
-  // ControlMessage so that it is called in the first audio driver iteration.
-  // Otherwise the audio driver might be going very fast while the fallback
-  // system clock driver is still in an iteration.
+  cubeb->SetStreamStartFreezeEnabled(false);
+
+  // One source of non-determinism in this type of test is that inputStream
+  // and partnerStream are started in sequence by the CubebOperation thread pool
+  // (of size 1). To minimize the chance that the stream that starts first sees
+  // an iteration before the other has started - this is a source of pre-silence
+  // - we freeze both on start and thaw them together here.
+  // Note that another source of non-determinism is the fallback driver. Handing
+  // over from the fallback to the audio driver requires first an audio callback
+  // (deterministic with the fake audio thread), then a fallback driver
+  // iteration (non-deterministic, since each graph has its own fallback driver,
+  // each with its own dedicated thread, which we have no control over). This
+  // non-determinism is worrisome, but both fallback drivers are likely to
+  // exhibit similar characteristics, hopefully keeping the level of
+  // non-determinism down sufficiently for this test to pass.
+  inputStream->Thaw();
+  partnerStream->Thaw();
+
+  Unused << WaitFor(primaryStarted);
+  Unused << WaitFor(partnerStarted);
+
   // Wait for 3s worth of audio data on the receiver stream.
   DispatchFunction([&] {
     inputTrack->GraphImpl()->AppendMessage(MakeUnique<GoFaster>(cubeb));
@@ -677,7 +718,9 @@
       static_cast<uint32_t>(partnerRate * aDriftFactor / 1000 * aBufferMs);
   uint32_t margin = partnerRate / 20 /* +/- 50ms */;
   EXPECT_NEAR(preSilenceSamples, expectedPreSilence, margin);
-  EXPECT_LE(nrDiscontinuities, 2U);
+  // The waveform from AudioGenerator starts at 0, but we don't control its
+  // ending, so we expect a discontinuity there.
+  EXPECT_LE(nrDiscontinuities, 1U);
 }
 
 TEST(TestAudioTrackGraph, CrossGraphPort)
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestCDMStorage.cpp firefox-85.0+build1/dom/media/gtest/TestCDMStorage.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestCDMStorage.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestCDMStorage.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -5,12 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ChromiumCDMCallback.h"
+#include "ChromiumCDMParent.h"
 #include "GMPServiceParent.h"
 #include "GMPTestMonitor.h"
 #include "MediaResult.h"
 #include "gtest/gtest.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsIFile.h"
 #include "nsNSSComponent.h"  //For EnsureNSSInitializedChromeOrContent
 #include "nsThreadUtils.h"
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestDataMutex.cpp firefox-85.0+build1/dom/media/gtest/TestDataMutex.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestDataMutex.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestDataMutex.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -18,9 +18,14 @@
 {
   {
     DataMutex<uint32_t> i(1, "1");
-    auto x = i.Lock();
-    *x = 4;
-    ASSERT_EQ(*x, 4u);
+    i.Mutex().AssertNotCurrentThreadOwns();
+    {
+      auto x = i.Lock();
+      i.Mutex().AssertCurrentThreadOwns();
+      *x = 4;
+      ASSERT_EQ(*x, 4u);
+    }
+    i.Mutex().AssertNotCurrentThreadOwns();
   }
   {
     DataMutex<A> a({4}, "StructA");
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestDriftCompensation.cpp firefox-85.0+build1/dom/media/gtest/TestDriftCompensation.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestDriftCompensation.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestDriftCompensation.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "gtest/gtest.h"
 #include "DriftCompensation.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 using namespace mozilla;
 
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestGMPUtils.cpp firefox-85.0+build1/dom/media/gtest/TestGMPUtils.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestGMPUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestGMPUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "gtest/gtest.h"
 #include "GMPUtils.h"
+#include "mozilla/ArrayUtils.h"
 #include "nsString.h"
 
 #include <string>
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestIntervalSet.cpp firefox-85.0+build1/dom/media/gtest/TestIntervalSet.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestIntervalSet.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestIntervalSet.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/TimeRanges.h"
 #include "TimeUnits.h"
 #include "Intervals.h"
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestMediaDataDecoder.cpp firefox-85.0+build1/dom/media/gtest/TestMediaDataDecoder.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestMediaDataDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestMediaDataDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "WebMDecoder.h"
 #include "WebMDemuxer.h"
 #include "mozilla/AbstractThread.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsMimeTypes.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/media/gtest/TestMediaDataEncoder.cpp firefox-85.0+build1/dom/media/gtest/TestMediaDataEncoder.cpp
--- firefox-84.0.2+build1/dom/media/gtest/TestMediaDataEncoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/TestMediaDataEncoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,6 +8,7 @@
 #include "AnnexB.h"
 #include "ImageContainer.h"
 #include "mozilla/AbstractThread.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/media/MediaUtils.h"  // For media::Await
 #include "nsMimeTypes.h"
 #include "PEMFactory.h"
diff -Nru firefox-84.0.2+build1/dom/media/gtest/WaitFor.h firefox-85.0+build1/dom/media/gtest/WaitFor.h
--- firefox-84.0.2+build1/dom/media/gtest/WaitFor.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/gtest/WaitFor.h	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef WAITFOR_H_
+#define WAITFOR_H_
+
+#include "MediaEventSource.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Result.h"
+#include "mozilla/SpinEventLoopUntil.h"
+
+namespace mozilla {
+
+/**
+ * Waits for an occurrence of aEvent on the current thread (by blocking it,
+ * except tasks added to the event loop may run) and returns the event's
+ * templated value, if it's non-void.
+ *
+ * The caller must be wary of eventloop issues, in
+ * particular cases where we rely on a stable state runnable, but there is never
+ * a task to trigger stable state. In such cases it is the responsibility of the
+ * caller to create the needed tasks, as JS would. A noteworthy API that relies
+ * on stable state is MediaTrackGraph::GetInstance.
+ */
+template <typename T>
+T WaitFor(MediaEventSource<T>& aEvent) {
+  Maybe<T> value;
+  MediaEventListener listener = aEvent.Connect(
+      AbstractThread::GetCurrent(), [&](T aValue) { value = Some(aValue); });
+  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
+      [&] { return value.isSome(); });
+  listener.Disconnect();
+  return value.value();
+}
+
+/**
+ * Specialization of WaitFor<T> for void.
+ */
+void WaitFor(MediaEventSource<void>& aEvent) {
+  bool done = false;
+  MediaEventListener listener =
+      aEvent.Connect(AbstractThread::GetCurrent(), [&] { done = true; });
+  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
+      [&] { return done; });
+  listener.Disconnect();
+}
+
+/**
+ * Variant of WaitFor that blocks the caller until a MozPromise has either been
+ * resolved or rejected.
+ */
+template <typename R, typename E, bool Exc>
+Result<R, E> WaitFor(const RefPtr<MozPromise<R, E, Exc>>& aPromise) {
+  Maybe<R> success;
+  Maybe<E> error;
+  aPromise->Then(
+      GetCurrentSerialEventTarget(), __func__,
+      [&](R aResult) { success = Some(aResult); },
+      [&](E aError) { error = Some(aError); });
+  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
+      [&] { return success.isSome() || error.isSome(); });
+  if (success.isSome()) {
+    return success.extract();
+  }
+  return Err(error.extract());
+}
+
+/**
+ * A variation of WaitFor that takes a callback to be called each time aEvent is
+ * raised. Blocks the caller until the callback function returns true.
+ */
+template <typename T, typename CallbackFunction>
+void WaitUntil(MediaEventSource<T>& aEvent, const CallbackFunction& aF) {
+  bool done = false;
+  MediaEventListener listener =
+      aEvent.Connect(AbstractThread::GetCurrent(), [&](T aValue) {
+        if (!done) {
+          done = aF(aValue);
+        }
+      });
+  SpinEventLoopUntil<ProcessFailureBehavior::IgnoreAndContinue>(
+      [&] { return done; });
+  listener.Disconnect();
+}
+
+}  // namespace mozilla
+
+#endif  // WAITFOR_H_
diff -Nru firefox-84.0.2+build1/dom/media/hls/HLSDecoder.cpp firefox-85.0+build1/dom/media/hls/HLSDecoder.cpp
--- firefox-84.0.2+build1/dom/media/hls/HLSDecoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/hls/HLSDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,6 +16,7 @@
 #include "MediaShutdownManager.h"
 #include "mozilla/java/GeckoHLSResourceWrapperNatives.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
 #include "mozilla/dom/HTMLMediaElement.h"
diff -Nru firefox-84.0.2+build1/dom/media/imagecapture/CaptureTask.cpp firefox-85.0+build1/dom/media/imagecapture/CaptureTask.cpp
--- firefox-84.0.2+build1/dom/media/imagecapture/CaptureTask.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/imagecapture/CaptureTask.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "CaptureTask.h"
 #include "gfxUtils.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/ImageCapture.h"
 #include "mozilla/dom/ImageCaptureError.h"
 #include "mozilla/dom/ImageEncoder.h"
diff -Nru firefox-84.0.2+build1/dom/media/ipc/MediaIPCUtils.h firefox-85.0+build1/dom/media/ipc/MediaIPCUtils.h
--- firefox-84.0.2+build1/dom/media/ipc/MediaIPCUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/MediaIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "DecoderDoctorDiagnostics.h"
 #include "PlatformDecoderModule.h"
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/EnumSet.h"
 #include "mozilla/GfxMessageUtils.h"
 #include "mozilla/gfx/Rect.h"
@@ -175,18 +175,14 @@
   static void Write(Message* aMsg, const paramType& aParam) {
     WriteParam(aMsg, aParam.Code());
     WriteParam(aMsg, aParam.Message());
-    WriteParam(aMsg, aParam.GPUCrashTimeStamp());
   }
 
   static bool Read(const Message* aMsg, PickleIterator* aIter,
                    paramType* aResult) {
     nsresult result;
     nsCString message;
-    mozilla::TimeStamp timeStamp;
-    if (ReadParam(aMsg, aIter, &result) && ReadParam(aMsg, aIter, &message) &&
-        ReadParam(aMsg, aIter, &timeStamp)) {
+    if (ReadParam(aMsg, aIter, &result) && ReadParam(aMsg, aIter, &message)) {
       *aResult = paramType(result, std::move(message));
-      aResult->SetGPUCrashTimeStamp(timeStamp);
       return true;
     }
     return false;
diff -Nru firefox-84.0.2+build1/dom/media/ipc/PRDD.ipdl firefox-85.0+build1/dom/media/ipc/PRDD.ipdl
--- firefox-84.0.2+build1/dom/media/ipc/PRDD.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/PRDD.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -45,6 +45,7 @@
   async UpdateVar(GfxVarUpdate var);
 
   async InitVideoBridge(Endpoint<PVideoBridgeChild> endpoint,
+                        bool createHardwareDevice,
                         ContentDeviceData contentDeviceData);
 
   async GetUntrustedModulesData() returns (UntrustedModulesData? data);
diff -Nru firefox-84.0.2+build1/dom/media/ipc/PRemoteDecoderManager.ipdl firefox-85.0+build1/dom/media/ipc/PRemoteDecoderManager.ipdl
--- firefox-84.0.2+build1/dom/media/ipc/PRemoteDecoderManager.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/PRemoteDecoderManager.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,7 @@
 include protocol PRemoteDecoder;
 include LayersSurfaces;
 include "mozilla/dom/MediaIPCUtils.h";
+include "mozilla/layers/LayersMessageUtils.h";
 
 using VideoInfo from "MediaInfo.h";
 using AudioInfo from "MediaInfo.h";
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDChild.cpp firefox-85.0+build1/dom/media/ipc/RDDChild.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RDDChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/RDDProcessManager.h"
 #include "mozilla/dom/MemoryReportRequest.h"
 #include "mozilla/ipc/CrashReporterHost.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDParent.cpp firefox-85.0+build1/dom/media/ipc/RDDParent.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RDDParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,8 +15,10 @@
 #  include <unistd.h>
 #endif
 
+#include "chrome/common/ipc_channel.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/HangDetails.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/RemoteDecoderManagerChild.h"
 #include "mozilla/RemoteDecoderManagerParent.h"
 #include "mozilla/TimeStamp.h"
@@ -165,7 +167,7 @@
 }
 
 mozilla::ipc::IPCResult RDDParent::RecvInitVideoBridge(
-    Endpoint<PVideoBridgeChild>&& aEndpoint,
+    Endpoint<PVideoBridgeChild>&& aEndpoint, const bool& aCreateHardwareDevice,
     const ContentDeviceData& aContentDeviceData) {
   if (!RemoteDecoderManagerParent::CreateVideoBridgeToOtherProcess(
           std::move(aEndpoint))) {
@@ -187,7 +189,9 @@
     auto* devmgr = DeviceManagerDx::Get();
     if (devmgr) {
       devmgr->ImportDeviceInfo(aContentDeviceData.d3d11());
-      devmgr->CreateContentDevices();
+      if (aCreateHardwareDevice) {
+        devmgr->CreateContentDevices();
+      }
     }
   }
 #endif
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDParent.h firefox-85.0+build1/dom/media/ipc/RDDParent.h
--- firefox-84.0.2+build1/dom/media/ipc/RDDParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDParent.h	2021-01-18 19:58:09.000000000 +0000
@@ -37,6 +37,7 @@
       Endpoint<PRemoteDecoderManagerParent>&& aEndpoint);
   mozilla::ipc::IPCResult RecvInitVideoBridge(
       Endpoint<PVideoBridgeChild>&& aEndpoint,
+      const bool& aCreateHardwareDevice,
       const ContentDeviceData& aContentDeviceData);
   mozilla::ipc::IPCResult RecvRequestMemoryReport(
       const uint32_t& generation, const bool& anonymize,
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDProcessHost.cpp firefox-85.0+build1/dom/media/ipc/RDDProcessHost.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RDDProcessHost.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDProcessHost.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,13 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "RDDProcessHost.h"
 
+#include "ProcessUtils.h"
+#include "RDDChild.h"
 #include "chrome/common/process_watcher.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_media.h"
 
-#include "ProcessUtils.h"
-#include "RDDChild.h"
-
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
 #  include "mozilla/Sandbox.h"
 #endif
@@ -27,11 +26,7 @@
 RDDProcessHost::RDDProcessHost(Listener* aListener)
     : GeckoChildProcessHost(GeckoProcessType_RDD),
       mListener(aListener),
-      mTaskFactory(this),
-      mLaunchPhase(LaunchPhase::Unlaunched),
-      mProcessToken(0),
-      mShutdownRequested(false),
-      mChannelClosed(false) {
+      mLiveToken(new media::Refcountable<bool>(true)) {
   MOZ_COUNT_CTOR(RDDProcessHost);
 
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
@@ -45,6 +40,8 @@
 RDDProcessHost::~RDDProcessHost() { MOZ_COUNT_DTOR(RDDProcessHost); }
 
 bool RDDProcessHost::Launch(StringVector aExtraOpts) {
+  MOZ_ASSERT(NS_IsMainThread());
+
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mRDDChild);
 
@@ -61,19 +58,6 @@
   mLaunchPhase = LaunchPhase::Waiting;
   mLaunchTime = TimeStamp::Now();
 
-  if (!GeckoChildProcessHost::AsyncLaunch(aExtraOpts)) {
-    mLaunchPhase = LaunchPhase::Complete;
-    mPrefSerializer = nullptr;
-    return false;
-  }
-  return true;
-}
-
-bool RDDProcessHost::WaitForLaunch() {
-  if (mLaunchPhase == LaunchPhase::Complete) {
-    return !!mRDDChild;
-  }
-
   int32_t timeoutMs = StaticPrefs::media_rdd_process_startup_timeout_ms();
 
   // If one of the following environment variables are set we can
@@ -83,13 +67,62 @@
       PR_GetEnv("MOZ_DEBUG_CHILD_PAUSE")) {
     timeoutMs = 0;
   }
+  if (timeoutMs) {
+    // We queue a delayed task. If that task runs before the
+    // WhenProcessHandleReady promise gets resolved, we will abort the launch.
+    GetMainThreadSerialEventTarget()->DelayedDispatch(
+        NS_NewRunnableFunction(
+            "RDDProcessHost::Launchtimeout",
+            [this, liveToken = mLiveToken]() {
+              if (!*liveToken || mTimerChecked) {
+                // We have been deleted or the runnable has already started, we
+                // can abort.
+                return;
+              }
+              InitAfterConnect(false);
+              MOZ_ASSERT(mTimerChecked,
+                         "InitAfterConnect must have acted on the promise");
+            }),
+        timeoutMs);
+  }
+
+  if (!GeckoChildProcessHost::AsyncLaunch(aExtraOpts)) {
+    mLaunchPhase = LaunchPhase::Complete;
+    mPrefSerializer = nullptr;
+    return false;
+  }
+  return true;
+}
+
+RefPtr<GenericNonExclusivePromise> RDDProcessHost::LaunchPromise() {
+  MOZ_ASSERT(NS_IsMainThread());
 
-  // Our caller expects the connection to be finished after we return, so we
-  // immediately set up the IPDL actor and fire callbacks. The IO thread will
-  // still dispatch a notification to the main thread - we'll just ignore it.
-  bool result = GeckoChildProcessHost::WaitUntilConnected(timeoutMs);
-  InitAfterConnect(result);
-  return result;
+  if (mLaunchPromise) {
+    return mLaunchPromise;
+  }
+  mLaunchPromise = MakeRefPtr<GenericNonExclusivePromise::Private>(__func__);
+  WhenProcessHandleReady()->Then(
+      GetCurrentSerialEventTarget(), __func__,
+      [this, liveToken = mLiveToken](
+          const ipc::ProcessHandlePromise::ResolveOrRejectValue& aResult) {
+        if (!*liveToken) {
+          // The RDDProcessHost got deleted. Abort. The promise would have
+          // already been rejected.
+          return;
+        }
+        if (mTimerChecked) {
+          // We hit the timeout earlier, abort.
+          return;
+        }
+        mTimerChecked = true;
+        if (aResult.IsReject()) {
+          RejectPromise();
+        }
+        // If aResult.IsResolve() then we have succeeded in launching the
+        // RDD process. The promise will be resolved once the channel has
+        // connected (or failed to) later.
+      });
+  return mLaunchPromise;
 }
 
 void RDDProcessHost::OnChannelConnected(int32_t peer_pid) {
@@ -97,15 +130,12 @@
 
   GeckoChildProcessHost::OnChannelConnected(peer_pid);
 
-  // Post a task to the main thread. Take the lock because mTaskFactory is not
-  // thread-safe.
-  RefPtr<Runnable> runnable;
-  {
-    MonitorAutoLock lock(mMonitor);
-    runnable =
-        mTaskFactory.NewRunnableMethod(&RDDProcessHost::OnChannelConnectedTask);
-  }
-  NS_DispatchToMainThread(runnable);
+  NS_DispatchToMainThread(NS_NewRunnableFunction(
+      "RDDProcessHost::OnChannelConnected", [this, liveToken = mLiveToken]() {
+        if (*liveToken && mLaunchPhase == LaunchPhase::Waiting) {
+          InitAfterConnect(true);
+        }
+      }));
 }
 
 void RDDProcessHost::OnChannelError() {
@@ -113,71 +143,59 @@
 
   GeckoChildProcessHost::OnChannelError();
 
-  // Post a task to the main thread. Take the lock because mTaskFactory is not
-  // thread-safe.
-  RefPtr<Runnable> runnable;
-  {
-    MonitorAutoLock lock(mMonitor);
-    runnable =
-        mTaskFactory.NewRunnableMethod(&RDDProcessHost::OnChannelErrorTask);
-  }
-  NS_DispatchToMainThread(runnable);
-}
-
-void RDDProcessHost::OnChannelConnectedTask() {
-  if (mLaunchPhase == LaunchPhase::Waiting) {
-    InitAfterConnect(true);
-  }
-}
-
-void RDDProcessHost::OnChannelErrorTask() {
-  if (mLaunchPhase == LaunchPhase::Waiting) {
-    InitAfterConnect(false);
-  }
+  NS_DispatchToMainThread(NS_NewRunnableFunction(
+      "RDDProcessHost::OnChannelError", [this, liveToken = mLiveToken]() {
+        if (*liveToken && mLaunchPhase == LaunchPhase::Waiting) {
+          InitAfterConnect(false);
+        }
+      }));
 }
 
 static uint64_t sRDDProcessTokenCounter = 0;
 
 void RDDProcessHost::InitAfterConnect(bool aSucceeded) {
+  MOZ_ASSERT(NS_IsMainThread());
+
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Waiting);
   MOZ_ASSERT(!mRDDChild);
 
   mLaunchPhase = LaunchPhase::Complete;
 
-  if (aSucceeded) {
-    mProcessToken = ++sRDDProcessTokenCounter;
-    mRDDChild = MakeUnique<RDDChild>(this);
-    DebugOnly<bool> rv = mRDDChild->Open(
-        TakeChannel(), base::GetProcId(GetChildProcessHandle()));
-    MOZ_ASSERT(rv);
-
-    // Only clear mPrefSerializer in the success case to avoid a
-    // possible race in the case case of a timeout on Windows launch.
-    // See Bug 1555076 comment 7:
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=1555076#c7
-    mPrefSerializer = nullptr;
-
-    if (!mRDDChild->Init()) {
-      // Can't just kill here because it will create a timing race that
-      // will crash the tab. We don't really want to crash the tab just
-      // because RDD linux sandbox failed to initialize.  In this case,
-      // we'll close the child channel which will cause the RDD process
-      // to shutdown nicely avoiding the tab crash (which manifests as
-      // Bug 1535335).
-      mRDDChild->Close();
-      return;
-    }
+  if (!aSucceeded) {
+    RejectPromise();
+    return;
   }
-
-  if (mListener) {
-    mListener->OnProcessLaunchComplete(this);
+  mProcessToken = ++sRDDProcessTokenCounter;
+  mRDDChild = MakeUnique<RDDChild>(this);
+  DebugOnly<bool> rv =
+      mRDDChild->Open(TakeChannel(), base::GetProcId(GetChildProcessHandle()));
+  MOZ_ASSERT(rv);
+
+  // Only clear mPrefSerializer in the success case to avoid a
+  // possible race in the case case of a timeout on Windows launch.
+  // See Bug 1555076 comment 7:
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1555076#c7
+  mPrefSerializer = nullptr;
+
+  if (!mRDDChild->Init()) {
+    // Can't just kill here because it will create a timing race that
+    // will crash the tab. We don't really want to crash the tab just
+    // because RDD linux sandbox failed to initialize.  In this case,
+    // we'll close the child channel which will cause the RDD process
+    // to shutdown nicely avoiding the tab crash (which manifests as
+    // Bug 1535335).
+    mRDDChild->Close();
+    RejectPromise();
+  } else {
+    ResolvePromise();
   }
 }
 
 void RDDProcessHost::Shutdown() {
+  MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(!mShutdownRequested);
 
-  mListener = nullptr;
+  RejectPromise();
 
   if (mRDDChild) {
     // OnChannelClosed uses this to check if the shutdown was expected or
@@ -208,7 +226,10 @@
 }
 
 void RDDProcessHost::OnChannelClosed() {
+  MOZ_ASSERT(NS_IsMainThread());
+
   mChannelClosed = true;
+  RejectPromise();
 
   if (!mShutdownRequested && mListener) {
     // This is an unclean shutdown. Notify our listener that we're going away.
@@ -219,10 +240,11 @@
 
   // Release the actor.
   RDDChild::Destroy(std::move(mRDDChild));
-  MOZ_ASSERT(!mRDDChild);
 }
 
 void RDDProcessHost::KillHard(const char* aReason) {
+  MOZ_ASSERT(NS_IsMainThread());
+
   ProcessHandle handle = GetChildProcessHandle();
   if (!base::KillProcess(handle, base::PROCESS_END_KILLED_BY_USER, false)) {
     NS_WARNING("failed to kill subprocess!");
@@ -231,22 +253,46 @@
   SetAlreadyDead();
 }
 
-uint64_t RDDProcessHost::GetProcessToken() const { return mProcessToken; }
-
-void RDDProcessHost::KillProcess() { KillHard("DiagnosticKill"); }
+uint64_t RDDProcessHost::GetProcessToken() const {
+  MOZ_ASSERT(NS_IsMainThread());
+  return mProcessToken;
+}
 
 void RDDProcessHost::DestroyProcess() {
-  // Cancel all tasks. We don't want anything triggering after our caller
-  // expects this to go away.
-  {
-    MonitorAutoLock lock(mMonitor);
-    mTaskFactory.RevokeAll();
-  }
+  MOZ_ASSERT(NS_IsMainThread());
+  RejectPromise();
+
+  // Any pending tasks will be cancelled from now on.
+  *mLiveToken = false;
 
-  GetCurrentSerialEventTarget()->Dispatch(
+  NS_DispatchToMainThread(
       NS_NewRunnableFunction("DestroyProcessRunnable", [this] { Destroy(); }));
 }
 
+void RDDProcessHost::ResolvePromise() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!mLaunchPromiseSettled) {
+    mLaunchPromise->Resolve(true, __func__);
+    mLaunchPromiseSettled = true;
+  }
+  // We have already acted on the promise; the timeout runnable no longer needs
+  // to interrupt anything.
+  mTimerChecked = true;
+}
+
+void RDDProcessHost::RejectPromise() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!mLaunchPromiseSettled) {
+    mLaunchPromise->Reject(NS_ERROR_FAILURE, __func__);
+    mLaunchPromiseSettled = true;
+  }
+  // We have already acted on the promise; the timeout runnable no longer needs
+  // to interrupt anything.
+  mTimerChecked = true;
+}
+
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
 bool RDDProcessHost::FillMacSandboxInfo(MacSandboxInfo& aInfo) {
   GeckoChildProcessHost::FillMacSandboxInfo(aInfo);
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDProcessHost.h firefox-85.0+build1/dom/media/ipc/RDDProcessHost.h
--- firefox-84.0.2+build1/dom/media/ipc/RDDProcessHost.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDProcessHost.h	2021-01-18 19:58:09.000000000 +0000
@@ -6,12 +6,10 @@
 
 #ifndef _include_dom_media_ipc_RDDProcessHost_h_
 #define _include_dom_media_ipc_RDDProcessHost_h_
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-
-#include "mozilla/Maybe.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/ipc/TaskFactory.h"
+#include "mozilla/media/MediaUtils.h"
 
 namespace mozilla {
 namespace ipc {
@@ -37,8 +35,6 @@
  public:
   class Listener {
    public:
-    virtual void OnProcessLaunchComplete(RDDProcessHost* aHost) {}
-
     // The RDDProcessHost has unexpectedly shutdown or had its connection
     // severed. This is not called if an error occurs after calling
     // Shutdown().
@@ -48,19 +44,18 @@
   explicit RDDProcessHost(Listener* listener);
 
   // Launch the subprocess asynchronously. On failure, false is returned.
-  // Otherwise, true is returned, and the OnProcessLaunchComplete listener
-  // callback will be invoked either when a connection has been established, or
-  // if a connection could not be established due to an asynchronous error.
+  // Otherwise, true is returned. If succeeded, a follow-up call should be made
+  // to LaunchPromise() which will return a promise that will be resolved once
+  // the RDD process has launched and a channel has been established.
   //
   // @param aExtraOpts (StringVector)
   //        Extra options to pass to the subprocess.
   bool Launch(StringVector aExtraOpts);
 
-  // If the process is being launched, block until it has launched and
-  // connected. If a launch task is pending, it will fire immediately.
-  //
-  // Returns true if the process is successfully connected; false otherwise.
-  bool WaitForLaunch();
+  // Return a promise that will be resolved once the process has completed its
+  // launch. The promise will be immediately resolved if the launch has already
+  // succeeded.
+  RefPtr<GenericNonExclusivePromise> LaunchPromise();
 
   // Inform the process that it should clean up its resources and shut
   // down. This initiates an asynchronous shutdown sequence. After this
@@ -72,13 +67,19 @@
 
   // Return the actor for the top-level actor of the process. If the process
   // has not connected yet, this returns null.
-  RDDChild* GetActor() const { return mRDDChild.get(); }
+  RDDChild* GetActor() const {
+    MOZ_ASSERT(NS_IsMainThread());
+    return mRDDChild.get();
+  }
 
   // Return a unique id for this process, guaranteed not to be shared with any
   // past or future instance of RDDProcessHost.
   uint64_t GetProcessToken() const;
 
-  bool IsConnected() const { return !!mRDDChild; }
+  bool IsConnected() const {
+    MOZ_ASSERT(NS_IsMainThread());
+    return !!mRDDChild;
+  }
 
   // Return the time stamp for when we tried to launch the RDD process.
   // This is currently used for Telemetry so that we can determine how
@@ -92,9 +93,6 @@
 
   void SetListener(Listener* aListener);
 
-  // Used for tests and diagnostics
-  void KillProcess();
-
 #if defined(XP_MACOSX) && defined(MOZ_SANDBOX)
   // Return the sandbox type to be used with this process type.
   static MacSandboxType GetMacSandboxType();
@@ -103,11 +101,8 @@
  private:
   ~RDDProcessHost();
 
-  // Called on the main thread.
-  void OnChannelConnectedTask();
-  void OnChannelErrorTask();
-
-  // Called on the main thread after a connection has been established.
+  // Called on the main thread with true after a connection has been established
+  // or false if it failed (including if it failed before the timeout kicked in)
   void InitAfterConnect(bool aSucceeded);
 
   // Called on the main thread when the mRDDChild actor is shutting down.
@@ -130,21 +125,37 @@
 
   DISALLOW_COPY_AND_ASSIGN(RDDProcessHost);
 
-  Listener* mListener;
-  mozilla::ipc::TaskFactory<RDDProcessHost> mTaskFactory;
+  Listener* const mListener;
 
+  // All members below are only ever accessed on the main thread.
   enum class LaunchPhase { Unlaunched, Waiting, Complete };
-  LaunchPhase mLaunchPhase;
+  LaunchPhase mLaunchPhase = LaunchPhase::Unlaunched;
 
   UniquePtr<RDDChild> mRDDChild;
-  uint64_t mProcessToken;
+  uint64_t mProcessToken = 0;
 
   UniquePtr<ipc::SharedPreferenceSerializer> mPrefSerializer;
 
-  bool mShutdownRequested;
-  bool mChannelClosed;
+  bool mShutdownRequested = false;
+  bool mChannelClosed = false;
 
   TimeStamp mLaunchTime;
+  void RejectPromise();
+  void ResolvePromise();
+
+  // Set to true on construction and to false just prior deletion.
+  // The RDDProcessHost isn't refcounted; so we can capture this by value in
+  // lambdas along with a strong reference to mLiveToken and check if that value
+  // is true before accessing "this".
+  // While a reference to mLiveToken can be taken on any thread; its value can
+  // only be read on the main thread.
+  const RefPtr<media::Refcountable<bool>> mLiveToken;
+  RefPtr<GenericNonExclusivePromise::Private> mLaunchPromise;
+  bool mLaunchPromiseSettled = false;
+  // Will be set to true if we've exceeded the allowed startup time or if the
+  // RDD process as successfully started. This is used to determine if the
+  // timeout runnable needs to execute code or not.
+  bool mTimerChecked = false;
 };
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDProcessManager.cpp firefox-85.0+build1/dom/media/ipc/RDDProcessManager.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RDDProcessManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDProcessManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/SyncRunnable.h"  // for LaunchRDDProcess
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/gfx/GPUProcessManager.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/VideoBridgeParent.h"
 #include "nsAppRunner.h"
@@ -101,47 +102,86 @@
 
 auto RDDProcessManager::EnsureRDDProcessAndCreateBridge(
     base::ProcessId aOtherProcess) -> RefPtr<EnsureRDDPromise> {
-  return InvokeAsync(GetMainThreadSerialEventTarget(), __func__,
-                     [aOtherProcess, this]() -> RefPtr<EnsureRDDPromise> {
-                       if (!Get()) {
-                         // Shutdown?
-                         return EnsureRDDPromise::CreateAndReject(
-                             NS_ERROR_NOT_AVAILABLE, __func__);
-                       }
-                       if (mProcess) {
-                         ipc::Endpoint<PRemoteDecoderManagerChild> endpoint;
-                         if (!CreateContentBridge(aOtherProcess, &endpoint)) {
-                           return EnsureRDDPromise::CreateAndReject(
-                               NS_ERROR_NOT_AVAILABLE, __func__);
-                         }
-                         return EnsureRDDPromise::CreateAndResolve(
-                             std::move(endpoint), __func__);
-                       }
-
-                       mNumProcessAttempts++;
-
-                       std::vector<std::string> extraArgs;
-                       nsCString parentBuildID(mozilla::PlatformBuildID());
-                       extraArgs.push_back("-parentBuildID");
-                       extraArgs.push_back(parentBuildID.get());
-
-                       // The subprocess is launched asynchronously, so we wait
-                       // for a callback to acquire the IPDL actor.
-                       mProcess = new RDDProcessHost(this);
-                       if (!mProcess->Launch(extraArgs)) {
-                         DestroyProcess();
-                         return EnsureRDDPromise::CreateAndReject(
-                             NS_ERROR_NOT_AVAILABLE, __func__);
-                       }
-                       ipc::Endpoint<PRemoteDecoderManagerChild> endpoint;
-                       if (!EnsureRDDReady() || !CreateVideoBridge() ||
-                           !CreateContentBridge(aOtherProcess, &endpoint)) {
-                         return EnsureRDDPromise::CreateAndReject(
-                             NS_ERROR_NOT_AVAILABLE, __func__);
-                       }
-                       return EnsureRDDPromise::CreateAndResolve(
-                           std::move(endpoint), __func__);
-                     });
+  return InvokeAsync(
+      GetMainThreadSerialEventTarget(), __func__,
+      [aOtherProcess, this]() -> RefPtr<EnsureRDDPromise> {
+        if (!Get()) {
+          // Shutdown?
+          return EnsureRDDPromise::CreateAndReject(NS_ERROR_NOT_AVAILABLE,
+                                                   __func__);
+        }
+        if (mProcess) {
+          return mProcess->LaunchPromise()->Then(
+              GetMainThreadSerialEventTarget(), __func__,
+              [aOtherProcess, this](bool) {
+                ipc::Endpoint<PRemoteDecoderManagerChild> endpoint;
+                if (!CreateContentBridge(aOtherProcess, &endpoint)) {
+                  return EnsureRDDPromise::CreateAndReject(
+                      NS_ERROR_NOT_AVAILABLE, __func__);
+                }
+                return EnsureRDDPromise::CreateAndResolve(std::move(endpoint),
+                                                          __func__);
+              },
+              [](nsresult aError) {
+                return EnsureRDDPromise::CreateAndReject(aError, __func__);
+              });
+        }
+
+        if (mNumProcessAttempts &&
+            !StaticPrefs::media_rdd_retryonfailure_enabled()) {
+          // We failed to start the RDD process earlier, abort now.
+          return EnsureRDDPromise::CreateAndReject(NS_ERROR_NOT_AVAILABLE,
+                                                   __func__);
+        }
+        // Launch the RDD process.
+        std::vector<std::string> extraArgs;
+        nsCString parentBuildID(mozilla::PlatformBuildID());
+        extraArgs.push_back("-parentBuildID");
+        extraArgs.push_back(parentBuildID.get());
+
+        // The subprocess is launched asynchronously, so we
+        // wait for the promise to be resolved to acquire the IPDL actor.
+        mProcess = new RDDProcessHost(this);
+        if (!mProcess->Launch(extraArgs)) {
+          DestroyProcess();
+          return EnsureRDDPromise::CreateAndReject(NS_ERROR_NOT_AVAILABLE,
+                                                   __func__);
+        }
+        return mProcess->LaunchPromise()->Then(
+            GetMainThreadSerialEventTarget(), __func__,
+            [aOtherProcess, this](bool) {
+              mRDDChild = mProcess->GetActor();
+              mProcessToken = mProcess->GetProcessToken();
+
+              // Flush any pref updates that happened during
+              // launch and weren't included in the blobs set
+              // up in LaunchRDDProcess.
+              for (const mozilla::dom::Pref& pref : mQueuedPrefs) {
+                Unused << NS_WARN_IF(!mRDDChild->SendPreferenceUpdate(pref));
+              }
+              mQueuedPrefs.Clear();
+
+              CrashReporter::AnnotateCrashReport(
+                  CrashReporter::Annotation::RDDProcessStatus, "Running"_ns);
+
+              ipc::Endpoint<PRemoteDecoderManagerChild> endpoint;
+
+              if (!CreateVideoBridge() ||
+                  !CreateContentBridge(aOtherProcess, &endpoint)) {
+                mNumProcessAttempts++;
+                return EnsureRDDPromise::CreateAndReject(NS_ERROR_NOT_AVAILABLE,
+                                                         __func__);
+              }
+              mNumProcessAttempts = 0;
+              return EnsureRDDPromise::CreateAndResolve(std::move(endpoint),
+                                                        __func__);
+            },
+            [this](nsresult aError) {
+              mNumProcessAttempts++;
+              DestroyProcess();
+              return EnsureRDDPromise::CreateAndReject(aError, __func__);
+            });
+      });
 }
 
 bool RDDProcessManager::IsRDDProcessLaunching() {
@@ -149,45 +189,12 @@
   return !!mProcess && !mRDDChild;
 }
 
-bool RDDProcessManager::EnsureRDDReady() {
-  MOZ_ASSERT(NS_IsMainThread());
-  if (mProcess && !mProcess->IsConnected() && !mProcess->WaitForLaunch()) {
-    // If this fails, we should have fired OnProcessLaunchComplete and
-    // removed the process.
-    MOZ_ASSERT(!mProcess && !mRDDChild);
-    return false;
-  }
-
-  return true;
-}
-
-void RDDProcessManager::OnProcessLaunchComplete(RDDProcessHost* aHost) {
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mProcess && mProcess == aHost);
-
-  if (!mProcess->IsConnected()) {
-    DestroyProcess();
-    return;
-  }
-
-  mRDDChild = mProcess->GetActor();
-  mProcessToken = mProcess->GetProcessToken();
-
-  // Flush any pref updates that happened during launch and weren't
-  // included in the blobs set up in LaunchRDDProcess.
-  for (const mozilla::dom::Pref& pref : mQueuedPrefs) {
-    Unused << NS_WARN_IF(!mRDDChild->SendPreferenceUpdate(pref));
-  }
-  mQueuedPrefs.Clear();
-
-  CrashReporter::AnnotateCrashReport(
-      CrashReporter::Annotation::RDDProcessStatus, "Running"_ns);
-}
-
 void RDDProcessManager::OnProcessUnexpectedShutdown(RDDProcessHost* aHost) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(mProcess && mProcess == aHost);
 
+  mNumUnexpectedCrashes++;
+
   DestroyProcess();
 }
 
@@ -214,15 +221,6 @@
 
 void RDDProcessManager::CleanShutdown() { DestroyProcess(); }
 
-void RDDProcessManager::KillProcess() {
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!mProcess) {
-    return;
-  }
-
-  mProcess->KillProcess();
-}
-
 void RDDProcessManager::DestroyProcess() {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mProcess) {
@@ -287,7 +285,8 @@
   ContentDeviceData contentDeviceData;
   gfxPlatform::GetPlatform()->BuildContentDeviceData(&contentDeviceData);
 
-  mRDDChild->SendInitVideoBridge(std::move(childPipe), contentDeviceData);
+  mRDDChild->SendInitVideoBridge(std::move(childPipe),
+                                 mNumUnexpectedCrashes == 0, contentDeviceData);
   if (gpuProcessPid != -1) {
     gpuManager->InitVideoBridge(std::move(parentPipe));
   } else {
@@ -345,7 +344,7 @@
 };
 
 RefPtr<MemoryReportingProcess> RDDProcessManager::GetProcessMemoryReporter() {
-  if (!EnsureRDDReady()) {
+  if (!mProcess || !mProcess->IsConnected()) {
     return nullptr;
   }
   return new RDDMemoryReporter();
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RDDProcessManager.h firefox-85.0+build1/dom/media/ipc/RDDProcessManager.h
--- firefox-84.0.2+build1/dom/media/ipc/RDDProcessManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RDDProcessManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/PRemoteDecoderManagerChild.h"
 #include "mozilla/RDDProcessHost.h"
 #include "mozilla/ipc/TaskFactory.h"
+#include "nsIObserver.h"
 
 namespace mozilla {
 
@@ -35,16 +36,12 @@
   RefPtr<EnsureRDDPromise> EnsureRDDProcessAndCreateBridge(
       base::ProcessId aOtherProcess);
 
-  void OnProcessLaunchComplete(RDDProcessHost* aHost) override;
   void OnProcessUnexpectedShutdown(RDDProcessHost* aHost) override;
 
   // Notify the RDDProcessManager that a top-level PRDD protocol has been
   // terminated. This may be called from any thread.
   void NotifyRemoteActorDestroyed(const uint64_t& aProcessToken);
 
-  // Used for tests and diagnostics
-  void KillProcess();
-
   // Returns -1 if there is no RDD process, or the platform pid for it.
   base::ProcessId RDDProcessPid();
 
@@ -63,10 +60,6 @@
 
  private:
   bool IsRDDProcessLaunching();
-  // Ensure that RDD-bound methods can be used. If no RDD process is being
-  // used, or one is launched and ready, this function returns immediately.
-  // Otherwise it blocks until the RDD process has finished launching.
-  bool EnsureRDDReady();
   bool CreateVideoBridge();
 
   // Called from our xpcom-shutdown observer.
@@ -101,6 +94,7 @@
   const RefPtr<Observer> mObserver;
   ipc::TaskFactory<RDDProcessManager> mTaskFactory;
   uint32_t mNumProcessAttempts = 0;
+  uint32_t mNumUnexpectedCrashes = 0;
 
   // Fields that are associated with the current RDD process.
   RDDProcessHost* mProcess = nullptr;
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteAudioDecoder.cpp firefox-85.0+build1/dom/media/ipc/RemoteAudioDecoder.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteAudioDecoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteAudioDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,8 @@
 
 namespace mozilla {
 
-RemoteAudioDecoderChild::RemoteAudioDecoderChild() : RemoteDecoderChild() {}
+RemoteAudioDecoderChild::RemoteAudioDecoderChild()
+    : RemoteDecoderChild(RemoteDecodeIn::RddProcess) {}
 
 MediaResult RemoteAudioDecoderChild::ProcessOutput(
     DecodedOutputIPDL&& aDecodedData) {
@@ -38,7 +39,7 @@
     const AudioInfo& aAudioInfo,
     const CreateDecoderParams::OptionSet& aOptions) {
   RefPtr<RemoteDecoderManagerChild> manager =
-      RemoteDecoderManagerChild::GetSingleton(RemoteDecodeIn::RddProcess);
+      RemoteDecoderManagerChild::GetSingleton(mLocation);
 
   // The manager isn't available because RemoteDecoderManagerChild has been
   // initialized with null end points and we don't want to decode video on RDD
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderChild.cpp firefox-85.0+build1/dom/media/ipc/RemoteDecoderChild.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteDecoderChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,10 +9,10 @@
 
 namespace mozilla {
 
-RemoteDecoderChild::RemoteDecoderChild(bool aRecreatedOnCrash)
+RemoteDecoderChild::RemoteDecoderChild(RemoteDecodeIn aLocation)
     : ShmemRecycleAllocator(this),
-      mThread(GetCurrentSerialEventTarget()),
-      mRecreatedOnCrash(aRecreatedOnCrash) {
+      mLocation(aLocation),
+      mThread(GetCurrentSerialEventTarget()) {
   MOZ_DIAGNOSTIC_ASSERT(
       RemoteDecoderManagerChild::GetManagerThread() &&
           RemoteDecoderManagerChild::GetManagerThread()->IsOnCurrentThread(),
@@ -29,23 +29,26 @@
   // thing and we can consider that the parent has crashed. The child can no
   // longer be used.
 
-  // The GPU/RDD process crashed, record the time and send back to MFR for
-  // telemetry.
-  mRemoteProcessCrashTime = TimeStamp::Now();
-  if (mRecreatedOnCrash) {
-    // Defer reporting an error until we've recreated the manager so that
-    // it'll be safe for MediaFormatReader to recreate decoders
+  // The GPU/RDD process crashed.
+  if (mLocation == RemoteDecodeIn::GpuProcess) {
+    // The GPU process will get automatically restarted by the parent process.
+    // Once it has been restarted the ContentChild will receive the message and
+    // will call GetManager()->InitForGPUProcess.
+    // We defer reporting an error until we've recreated the RemoteDecoder
+    // manager so that it'll be safe for MediaFormatReader to recreate decoders
     RefPtr<RemoteDecoderChild> self = this;
     GetManager()->RunWhenGPUProcessRecreated(NS_NewRunnableFunction(
         "RemoteDecoderChild::HandleRejectionError",
         [self, callback = std::move(aCallback)]() {
           MediaResult error(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER, __func__);
-          error.SetGPUCrashTimeStamp(self->mRemoteProcessCrashTime);
           callback(error);
         }));
     return;
   }
-  aCallback(MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__));
+  // The RDD process is restarted on demand and asynchronously, we can
+  // immediately inform the caller that a new decoder is needed. The RDD will
+  // then be restarted during the new decoder creation.
+  aCallback(MediaResult(NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER, __func__));
 }
 
 // ActorDestroy is called if the channel goes down while waiting for a response.
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderChild.h firefox-85.0+build1/dom/media/ipc/RemoteDecoderChild.h
--- firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderChild.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteDecoderChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -24,7 +24,7 @@
  public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(RemoteDecoderChild);
 
-  explicit RemoteDecoderChild(bool aRecreatedOnCrash = false);
+  explicit RemoteDecoderChild(RemoteDecodeIn aLocation);
 
   void ActorDestroy(ActorDestroyReason aWhy) override;
 
@@ -56,6 +56,7 @@
 
   RefPtr<RemoteDecoderChild> mIPDLSelfRef;
   MediaDataDecoder::DecodedData mDecodedData;
+  const RemoteDecodeIn mLocation;
 
  private:
   const nsCOMPtr<nsISerialEventTarget> mThread;
@@ -70,12 +71,10 @@
   void HandleRejectionError(
       const ipc::ResponseRejectReason& aReason,
       std::function<void(const MediaResult&)>&& aCallback);
-  TimeStamp mRemoteProcessCrashTime;
 
   nsCString mHardwareAcceleratedReason;
   nsCString mDescription;
   bool mIsHardwareAccelerated = false;
-  const bool mRecreatedOnCrash;
   MediaDataDecoder::ConversionRequired mConversion =
       MediaDataDecoder::ConversionRequired::kNeedNone;
 };
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderManagerChild.cpp firefox-85.0+build1/dom/media/ipc/RemoteDecoderManagerChild.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderManagerChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteDecoderManagerChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -16,8 +16,9 @@
 #include "mozilla/gfx/DataSurfaceHelpers.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
-#include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
+#include "nsContentUtils.h"
 #include "nsIObserver.h"
 
 namespace mozilla {
@@ -143,7 +144,12 @@
 
 void RemoteDecoderManagerChild::RunWhenGPUProcessRecreated(
     already_AddRefed<Runnable> aTask) {
-  MOZ_ASSERT(GetManagerThread() && GetManagerThread()->IsOnCurrentThread());
+  nsCOMPtr<nsISerialEventTarget> managerThread = GetManagerThread();
+  if (!managerThread) {
+    // We've been shutdown, bail.
+    return;
+  }
+  MOZ_ASSERT(managerThread->IsOnCurrentThread());
 
   // If we've already been recreated, then run the task immediately.
   auto* manager = GetSingleton(RemoteDecodeIn::GpuProcess);
@@ -158,7 +164,12 @@
 /* static */
 RemoteDecoderManagerChild* RemoteDecoderManagerChild::GetSingleton(
     RemoteDecodeIn aLocation) {
-  MOZ_ASSERT(GetManagerThread() && GetManagerThread()->IsOnCurrentThread());
+  nsCOMPtr<nsISerialEventTarget> managerThread = GetManagerThread();
+  if (!managerThread) {
+    // We've been shutdown, bail.
+    return nullptr;
+  }
+  MOZ_ASSERT(managerThread->IsOnCurrentThread());
   switch (aLocation) {
     case RemoteDecodeIn::GpuProcess:
       return sRemoteDecoderManagerChildForGPUProcess;
@@ -404,7 +415,13 @@
 
 void RemoteDecoderManagerChild::OpenForRDDProcess(
     Endpoint<PRemoteDecoderManagerChild>&& aEndpoint) {
-  MOZ_ASSERT(GetManagerThread() && GetManagerThread()->IsOnCurrentThread());
+  nsCOMPtr<nsISerialEventTarget> managerThread = GetManagerThread();
+  if (!managerThread) {
+    // We've been shutdown, bail.
+    return;
+  }
+  MOZ_ASSERT(managerThread->IsOnCurrentThread());
+
   // Only create RemoteDecoderManagerChild, bind new endpoint and init
   // ipdl if:
   // 1) haven't init'd sRemoteDecoderManagerChild
@@ -428,7 +445,12 @@
 
 void RemoteDecoderManagerChild::OpenForGPUProcess(
     Endpoint<PRemoteDecoderManagerChild>&& aEndpoint) {
-  MOZ_ASSERT(GetManagerThread() && GetManagerThread()->IsOnCurrentThread());
+  nsCOMPtr<nsISerialEventTarget> managerThread = GetManagerThread();
+  if (!managerThread) {
+    // We've been shutdown, bail.
+    return;
+  }
+  MOZ_ASSERT(managerThread->IsOnCurrentThread());
   // Make sure we always dispatch everything in sRecreateTasks, even if we
   // fail since this is as close to being recreated as we will ever be.
   sRemoteDecoderManagerChildForGPUProcess = nullptr;
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderManagerParent.cpp firefox-85.0+build1/dom/media/ipc/RemoteDecoderManagerParent.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteDecoderManagerParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteDecoderManagerParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/RDDParent.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/gfx/GPUParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "mozilla/layers/VideoBridgeChild.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteImageHolder.cpp firefox-85.0+build1/dom/media/ipc/RemoteImageHolder.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteImageHolder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteImageHolder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/PRemoteDecoderChild.h"
 #include "mozilla/RemoteDecoderManagerChild.h"
 #include "mozilla/layers/ImageDataSerializer.h"
+#include "mozilla/layers/VideoBridgeUtils.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteVideoDecoder.cpp firefox-85.0+build1/dom/media/ipc/RemoteVideoDecoder.cpp
--- firefox-84.0.2+build1/dom/media/ipc/RemoteVideoDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteVideoDecoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -55,9 +55,7 @@
 }
 
 RemoteVideoDecoderChild::RemoteVideoDecoderChild(RemoteDecodeIn aLocation)
-    : RemoteDecoderChild(aLocation == RemoteDecodeIn::GpuProcess),
-      mBufferRecycleBin(new BufferRecycleBin),
-      mLocation(aLocation) {}
+    : RemoteDecoderChild(aLocation), mBufferRecycleBin(new BufferRecycleBin) {}
 
 MediaResult RemoteVideoDecoderChild::ProcessOutput(
     DecodedOutputIPDL&& aDecodedData) {
diff -Nru firefox-84.0.2+build1/dom/media/ipc/RemoteVideoDecoder.h firefox-85.0+build1/dom/media/ipc/RemoteVideoDecoder.h
--- firefox-84.0.2+build1/dom/media/ipc/RemoteVideoDecoder.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ipc/RemoteVideoDecoder.h	2021-01-18 19:58:09.000000000 +0000
@@ -47,9 +47,6 @@
 
  private:
   RefPtr<mozilla::layers::BufferRecycleBin> mBufferRecycleBin;
-
-  // The location of the RemoteVideoDecoderParent - Gpu or Rdd process.
-  const RemoteDecodeIn mLocation;
 };
 
 class RemoteVideoDecoderParent final : public RemoteDecoderParent {
diff -Nru firefox-84.0.2+build1/dom/media/MediaCache.cpp firefox-85.0+build1/dom/media/MediaCache.cpp
--- firefox-84.0.2+build1/dom/media/MediaCache.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaCache.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1513,12 +1513,10 @@
     }
     LOG("Stream %p, mCacheSuspended=%d, enableReading=%d, action=%s", stream,
         stream->mCacheSuspended, enableReading,
-        actions[i].mTag == StreamAction::SEEK
-            ? "SEEK"
-            : actions[i].mTag == StreamAction::RESUME
-                  ? "RESUME"
-                  : actions[i].mTag == StreamAction::SUSPEND ? "SUSPEND"
-                                                             : "NONE");
+        actions[i].mTag == StreamAction::SEEK      ? "SEEK"
+        : actions[i].mTag == StreamAction::RESUME  ? "RESUME"
+        : actions[i].mTag == StreamAction::SUSPEND ? "SUSPEND"
+                                                   : "NONE");
   }
 #ifdef DEBUG
   mInUpdate = false;
diff -Nru firefox-84.0.2+build1/dom/media/mediacapabilities/MediaCapabilities.cpp firefox-85.0+build1/dom/media/mediacapabilities/MediaCapabilities.cpp
--- firefox-84.0.2+build1/dom/media/mediacapabilities/MediaCapabilities.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacapabilities/MediaCapabilities.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -23,6 +23,7 @@
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TaskQueue.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DOMMozPromiseRequestHolder.h"
 #include "mozilla/dom/MediaCapabilitiesBinding.h"
 #include "mozilla/dom/MediaSource.h"
diff -Nru firefox-84.0.2+build1/dom/media/mediacapabilities/MediaCapabilities.h firefox-85.0+build1/dom/media/mediacapabilities/MediaCapabilities.h
--- firefox-84.0.2+build1/dom/media/mediacapabilities/MediaCapabilities.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacapabilities/MediaCapabilities.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,7 @@
 #define mozilla_dom_MediaCapabilities_h_
 
 #include "DDLoggedTypeTraits.h"
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Maybe.h"
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/FetchImageHelper.cpp firefox-85.0+build1/dom/media/mediacontrol/FetchImageHelper.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/FetchImageHelper.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/FetchImageHelper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,8 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/Logging.h"
 #include "mozilla/NullPrincipal.h"
+#include "nsIChannel.h"
+#include "nsNetUtil.h"
 
 mozilla::LazyLogModule gFetchImageLog("FetchImageHelper");
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlIPC.h firefox-85.0+build1/dom/media/mediacontrol/MediaControlIPC.h
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlIPC.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaControlIPC.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef ipc_MediaControlIPC_h
 #define ipc_MediaControlIPC_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "mozilla/dom/MediaControllerBinding.h"
 #include "mozilla/dom/MediaControlKeySource.h"
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlKeyManager.cpp firefox-85.0+build1/dom/media/mediacontrol/MediaControlKeyManager.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlKeyManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaControlKeyManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -10,9 +10,11 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/widget/MediaKeysEventSourceFactory.h"
 #include "nsContentUtils.h"
+#include "nsIObserverService.h"
 
 #undef LOG
 #define LOG(msg, ...)                        \
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaController.cpp firefox-85.0+build1/dom/media/mediacontrol/MediaController.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaController.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaController.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -93,6 +93,9 @@
   mSupportedActionsChangedListener = SupportedActionsChangedEvent().Connect(
       AbstractThread::MainThread(), this,
       &MediaController::HandleSupportedMediaSessionActionsChanged);
+  mPlaybackChangedListener = PlaybackChangedEvent().Connect(
+      AbstractThread::MainThread(), this,
+      &MediaController::HandleActualPlaybackStateChanged);
   mPositionStateChangedListener = PositionChangedEvent().Connect(
       AbstractThread::MainThread(), this,
       &MediaController::HandlePositionStateChanged);
@@ -231,6 +234,7 @@
   Deactivate();
   mShutdown = true;
   mSupportedActionsChangedListener.DisconnectIfExists();
+  mPlaybackChangedListener.DisconnectIfExists();
   mPositionStateChangedListener.DisconnectIfExists();
   mMetadataChangedListener.DisconnectIfExists();
 }
@@ -335,22 +339,13 @@
   // sound, then it would be able to be controlled once the controll gets
   // activated.
   //
-  // Activating a controller means that we would start to interfere the media
+  // Activating a controller means that we would start to intercept the media
   // keys on the platform and show the virtual control interface (if needed).
-  // The controller would be activated when (1) the controller becomes audible
-  // or (2) enters fullscreen or PIP mode.
-  //
-  // The reason of activating controller after it beomes audible is, if there is
-  // another application playing audio at the same time, it doesn't make sense
-  // to interfere it if we're playing an inaudible media. In addtion, it can
-  // preven showing control interface for those inaudible media which are used
-  // for GIF-like image or background image.
-  //
-  // When a media enters fullscreen or Picture-in-Picture mode, we can regard it
-  // as a sign of that a user is going to start that media soon. Therefore, it
-  // makes sense to activate the controller in order to start controlling media.
+  // The controller would be activated when (1) controllable media starts in the
+  // browsing context that controller belongs to (2) controllable media enters
+  // fullscreen or PIP mode.
   return IsAnyMediaBeingControlled() &&
-         (IsAudible() || IsBeingUsedInPIPModeOrFullscreen()) && !mIsActive;
+         (IsPlaying() || IsBeingUsedInPIPModeOrFullscreen()) && !mIsActive;
 }
 
 bool MediaController::ShouldDeactivateController() const {
@@ -517,16 +512,22 @@
 }
 
 void MediaController::DispatchAsyncEvent(const nsAString& aName) {
-  LOG("Dispatch event %s", NS_ConvertUTF16toUTF8(aName).get());
-  RefPtr<AsyncEventDispatcher> asyncDispatcher =
-      new AsyncEventDispatcher(this, aName, CanBubble::eYes);
-  asyncDispatcher->PostDOMEvent();
+  RefPtr<Event> event = NS_NewDOMEvent(this, nullptr, nullptr);
+  event->InitEvent(aName, false, false);
+  event->SetTrusted(true);
+  DispatchAsyncEvent(event);
 }
 
 void MediaController::DispatchAsyncEvent(Event* aEvent) {
   MOZ_ASSERT(aEvent);
   nsAutoString eventType;
   aEvent->GetType(eventType);
+  if (!mIsActive && !eventType.EqualsLiteral("deactivated")) {
+    LOG("Only 'deactivated' can be dispatched on a deactivated controller, not "
+        "'%s'",
+        NS_ConvertUTF16toUTF8(eventType).get());
+    return;
+  }
   LOG("Dispatch event %s", NS_ConvertUTF16toUTF8(eventType).get());
   RefPtr<AsyncEventDispatcher> asyncDispatcher =
       new AsyncEventDispatcher(this, aEvent);
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaController.h firefox-85.0+build1/dom/media/mediacontrol/MediaController.h
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaController.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaController.h	2021-01-18 19:58:09.000000000 +0000
@@ -152,7 +152,7 @@
 
  private:
   ~MediaController();
-  void HandleActualPlaybackStateChanged() override;
+  void HandleActualPlaybackStateChanged();
   void UpdateMediaControlActionToContentMediaIfNeeded(
       const MediaControlAction& aAction);
   void HandleSupportedMediaSessionActionsChanged(
@@ -194,6 +194,7 @@
   MediaEventListener mSupportedActionsChangedListener;
   MediaEventProducer<nsTArray<MediaControlKey>> mSupportedKeysChangedEvent;
 
+  MediaEventListener mPlaybackChangedListener;
   MediaEventListener mPositionStateChangedListener;
   MediaEventListener mMetadataChangedListener;
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlService.cpp firefox-85.0+build1/dom/media/mediacontrol/MediaControlService.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaControlService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -135,45 +135,55 @@
 MediaControlService::~MediaControlService() {
   LOG("destroy media control service");
   Shutdown();
-  UpdateTelemetryUsageProbe();
 }
 
-void MediaControlService::UpdateTelemetryUsageProbe() {
-  if (!mHasEverEnabledMediaControl) {
+void MediaControlService::NotifyMediaControlHasEverBeenUsed() {
+  // We've already updated the telemetry for using meida control.
+  if (mHasEverUsedMediaControl) {
     return;
   }
+  mHasEverUsedMediaControl = true;
+  const uint32_t usedOnMediaControl = 1;
 #ifdef XP_WIN
-  if (mHasEverUsedMediaControl) {
-    AccumulateCategorical(
-        mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::UsedOnWin);
-  }
-  AccumulateCategorical(
-      mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::EnabledOnWin);
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Windows"_ns, usedOnMediaControl);
 #endif
 #ifdef XP_MACOSX
-  if (mHasEverUsedMediaControl) {
-    AccumulateCategorical(
-        mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::UsedOnMac);
-  }
-  AccumulateCategorical(
-      mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::EnabledOnMac);
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"MacOS"_ns, usedOnMediaControl);
 #endif
 #ifdef MOZ_WIDGET_GTK
-  if (mHasEverUsedMediaControl) {
-    AccumulateCategorical(
-        mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::UsedOnLinux);
-  }
-  AccumulateCategorical(
-      mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::EnabledOnLinux);
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Linux"_ns, usedOnMediaControl);
 #endif
 #ifdef MOZ_WIDGET_ANDROID
-  if (mHasEverUsedMediaControl) {
-    AccumulateCategorical(
-        mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::UsedOnAndroid);
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Android"_ns, usedOnMediaControl);
+#endif
+}
+
+void MediaControlService::NotifyMediaControlHasEverBeenEnabled() {
+  // We've already enabled the service and update the telemetry.
+  if (mHasEverEnabledMediaControl) {
+    return;
   }
-  AccumulateCategorical(
-      mozilla::Telemetry::LABELS_MEDIA_CONTROL_PLATFORM_USAGE::
-          EnabledOnAndroid);
+  mHasEverEnabledMediaControl = true;
+  const uint32_t enableOnMediaControl = 0;
+#ifdef XP_WIN
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Windows"_ns, enableOnMediaControl);
+#endif
+#ifdef XP_MACOSX
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"MacOS"_ns, enableOnMediaControl);
+#endif
+#ifdef MOZ_WIDGET_GTK
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Linux"_ns, enableOnMediaControl);
+#endif
+#ifdef MOZ_WIDGET_ANDROID
+  Telemetry::ScalarSet(Telemetry::ScalarID::MEDIA_CONTROL_PLATFORM_USAGE,
+                       u"Android"_ns, enableOnMediaControl);
 #endif
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlService.h firefox-85.0+build1/dom/media/mediacontrol/MediaControlService.h
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlService.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaControlService.h	2021-01-18 19:58:09.000000000 +0000
@@ -83,10 +83,8 @@
 
   // These functions are used to update the variable which would be used for
   // telemetry probe.
-  void NotifyMediaControlHasEverBeenUsed() { mHasEverUsedMediaControl = true; }
-  void NotifyMediaControlHasEverBeenEnabled() {
-    mHasEverEnabledMediaControl = true;
-  }
+  void NotifyMediaControlHasEverBeenUsed();
+  void NotifyMediaControlHasEverBeenEnabled();
 
  private:
   MediaControlService();
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlUtils.h firefox-85.0+build1/dom/media/mediacontrol/MediaControlUtils.h
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaControlUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaControlUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/MediaControllerBinding.h"
 #include "mozilla/Logging.h"
 #include "nsReadableUtils.h"
+#include "nsServiceManagerUtils.h"
 
 extern mozilla::LazyLogModule gMediaControlLog;
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaStatusManager.cpp firefox-85.0+build1/dom/media/mediacontrol/MediaStatusManager.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaStatusManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaStatusManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIChromeRegistry.h"
 #include "nsIObserverService.h"
 #include "nsIXULAppInfo.h"
+#include "nsNetUtil.h"
 
 #ifdef MOZ_PLACES
 #  include "nsIFaviconService.h"
@@ -103,8 +104,10 @@
   }
   // Only notify the event if the changed metadata belongs to the active media
   // session.
-  if (!mActiveMediaSessionContextId ||
+  if (mActiveMediaSessionContextId &&
       *mActiveMediaSessionContextId == aBrowsingContextId) {
+    LOG("Notify metadata change for active session %" PRIu64,
+        aBrowsingContextId);
     mMetadataChangedEvent.Notify(GetCurrentMediaMetadata());
   }
   if (StaticPrefs::media_mediacontrol_testingevents_enabled()) {
@@ -318,7 +321,6 @@
   mActualPlaybackState = newState;
   LOG("UpdateActualPlaybackState : '%s'",
       ToMediaSessionPlaybackStateStr(mActualPlaybackState));
-  HandleActualPlaybackStateChanged();
   mPlaybackStateChangedEvent.Notify(mActualPlaybackState);
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/MediaStatusManager.h firefox-85.0+build1/dom/media/mediacontrol/MediaStatusManager.h
--- firefox-84.0.2+build1/dom/media/mediacontrol/MediaStatusManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/MediaStatusManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -198,7 +198,6 @@
 
  protected:
   ~MediaStatusManager() = default;
-  virtual void HandleActualPlaybackStateChanged() = 0;
 
   // This event would be notified when the active media session changes its
   // supported actions.
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_audio_focus_management.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_audio_focus_management.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_audio_focus_management.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_audio_focus_management.js	2021-01-18 19:58:09.000000000 +0000
@@ -18,11 +18,11 @@
   await switchAudioFocusManagerment(false);
 
   info(`open audible autoplay media in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab1 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab1, testVideoId);
 
   info(`open same page on another tab, which shouldn't cause audio competing`);
-  const tab2 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab2 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab2, testVideoId);
 
   info(`media in tab1 should be playing still`);
@@ -36,11 +36,11 @@
   await switchAudioFocusManagerment(true);
 
   info(`open audible autoplay media in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab1 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab1, testVideoId);
 
   info(`open same page on another tab, which should cause audio competing`);
-  const tab2 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab2 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab2, testVideoId);
 
   info(`media in tab1 should be stopped`);
@@ -54,11 +54,11 @@
   await switchAudioFocusManagerment(true);
 
   info(`open audible autoplay media in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab1 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab1, testVideoId);
 
   info(`open same page on another tab, which should cause audio competing`);
-  const tab2 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab2 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab2, testVideoId);
 
   info(`media in tab1 should be stopped`);
@@ -84,13 +84,15 @@
   await switchAudioFocusManagerment(true);
 
   info(`open audible autoplay media in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab1 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab1, testVideoId);
 
   info(
     `open inaudible media page on another tab, which shouldn't cause audio competing`
   );
-  const tab2 = await createTabAndLoad(PAGE_INAUDIBLE);
+  const tab2 = await createLoadedTabWrapper(PAGE_INAUDIBLE, {
+    needCheck: false,
+  });
   await checkOrWaitUntilMediaStartedPlaying(tab2, testVideoId);
 
   info(`media in tab1 should be playing still`);
@@ -99,7 +101,7 @@
   info(
     `open audible media page on the third tab, which should cause audio competing`
   );
-  const tab3 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab3 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab3, testVideoId);
 
   info(`media in tab1 should be stopped`);
@@ -116,17 +118,17 @@
   await switchAudioFocusManagerment(false);
 
   info(`open audible autoplay media in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab1 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab1, testVideoId);
 
   info(`open same page on another tab, which shouldn't cause audio competing`);
-  const tab2 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab2 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab2, testVideoId);
 
   await switchAudioFocusManagerment(true);
 
   info(`open same page on the third tab, which should cause audio competing`);
-  const tab3 = await createTabAndLoad(PAGE_AUDIBLE);
+  const tab3 = await createLoadedTabWrapper(PAGE_AUDIBLE, { needCheck: false });
   await checkOrWaitUntilMediaStartedPlaying(tab3, testVideoId);
 
   info(`media in tab1 and tab2 should be stopped`);
@@ -171,7 +173,7 @@
 async function clearTabsAndResetPref(tabs) {
   info(`clear tabs and reset pref`);
   for (let tab of tabs) {
-    BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
   await switchAudioFocusManagerment(false);
 }
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_control_page_with_audible_and_inaudible_media.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_control_page_with_audible_and_inaudible_media.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_control_page_with_audible_and_inaudible_media.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_control_page_with_audible_and_inaudible_media.js	2021-01-18 19:58:09.000000000 +0000
@@ -14,7 +14,7 @@
  */
 add_task(async function testSetPositionState() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
 
   info(`play video1 (audible) and video2 (inaudible)`);
   await playBothAudibleAndInaudibleMedia(tab);
@@ -37,7 +37,7 @@
   });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_default_action_handler.js	2021-01-18 19:58:10.000000000 +0000
@@ -30,53 +30,53 @@
   // Default handler should be triggered no matter if media session exists or not.
   const kCreateMediaSession = [true, false];
   for (const shouldCreateSession of kCreateMediaSession) {
-    const kActions = ["play", "pause", "stop"];
-    for (const action of kActions) {
-      info(`test for '${action}', shouldCreateSession=${shouldCreateSession}`);
-      info(`open page and start media`);
-      const tab = await createTabAndLoad(PAGE_URL);
-      await playMedia(tab, videoId);
-
-      if (shouldCreateSession) {
-        info(
-          `media has started, so created session should become active session`
-        );
-        await Promise.all([
-          waitUntilActiveMediaSessionChanged(),
-          createMediaSession(tab),
-        ]);
-      }
+    info(`open page and start media`);
+    const tab = await createLoadedTabWrapper(PAGE_URL);
+    await playMedia(tab, videoId);
 
-      if (action == "play") {
-        info(`pause media first in order to test 'play'`);
-        await pauseMedia(tab, videoId);
+    if (shouldCreateSession) {
+      info(
+        `media has started, so created session should become active session`
+      );
+      await Promise.all([
+        waitUntilActiveMediaSessionChanged(),
+        createMediaSession(tab),
+      ]);
+    }
 
-        info(`press '${action}' should trigger default action handler`);
-        await simulateMediaAction(tab, action);
+    info(`test 'pause' action`);
+    await simulateMediaAction(tab, "pause");
 
-        info(`default action handler should resume media`);
-        await checkOrWaitUntilMediaPlays(tab, { videoId });
-      } else {
-        info(`press '${action}' should trigger default action handler`);
-        await simulateMediaAction(tab, action);
+    info(`default action handler should pause media`);
+    await checkOrWaitUntilMediaPauses(tab, { videoId });
 
-        info(`default action handler should pause media`);
-        await checkOrWaitUntilMediaPauses(tab, { videoId });
-      }
+    info(`test 'play' action`);
+    await simulateMediaAction(tab, "play");
 
-      info(`remove tab`);
-      await BrowserTestUtils.removeTab(tab);
-    }
+    info(`default action handler should resume media`);
+    await checkOrWaitUntilMediaPlays(tab, { videoId });
+
+    info(`test 'stop' action`);
+    await simulateMediaAction(tab, "stop");
+
+    info(`default action handler should pause media`);
+    await checkOrWaitUntilMediaPauses(tab, { videoId });
+
+    info(`remove tab`);
+    await tab.close();
   }
 });
 
 add_task(async function triggerNonDefaultHandlerWhenSetCustomizedHandler() {
+  info(`open page and start media`);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
+  await Promise.all([
+    new Promise(r => (tab.controller.onactivated = r)),
+    startMedia(tab, { videoId }),
+  ]);
+
   const kActions = ["play", "pause", "stop"];
   for (const action of kActions) {
-    info(`open page and start media`);
-    const tab = await createTabAndLoad(PAGE_URL);
-    await startMedia(tab, { videoId });
-
     info(`set action handler for '${action}'`);
     await setActionHandler(tab, action);
 
@@ -86,10 +86,10 @@
 
     info(`action handler doesn't pause media, media should keep playing`);
     await checkOrWaitUntilMediaPlays(tab, { videoId });
-
-    info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
   }
+
+  info(`remove tab`);
+  await tab.close();
 });
 
 add_task(
@@ -99,12 +99,15 @@
       const kActions = ["play", "pause", "stop"];
       for (const action of kActions) {
         info(`open page and load iframe`);
-        const tab = await createTabAndLoad(PAGE_URL);
+        const tab = await createLoadedTabWrapper(PAGE_URL);
         const frameId = "iframe";
         await loadIframe(tab, frameId, url);
 
         info(`start media from iframe would make it become active session`);
-        await startMedia(tab, { frameId });
+        await Promise.all([
+          new Promise(r => (tab.controller.onactivated = r)),
+          startMedia(tab, { frameId }),
+        ]);
 
         info(`press '${action}' should trigger iframe's action handler`);
         await setActionHandler(tab, action, frameId);
@@ -145,7 +148,7 @@
         }
 
         info(`remove tab`);
-        await BrowserTestUtils.removeTab(tab);
+        await tab.close();
       }
     }
   }
@@ -153,7 +156,7 @@
 
 add_task(async function onlyResumeActiveMediaSession() {
   info(`open page and load iframes`);
-  const tab = await createTabAndLoad(PAGE2_URL);
+  const tab = await createLoadedTabWrapper(PAGE2_URL);
   const frame1Id = "frame1";
   const frame2Id = "frame2";
   await loadIframe(tab, frame1Id, CORS_IFRAME_URL);
@@ -186,7 +189,7 @@
   await checkOrWaitUntilMediaPlays(tab, { frameId: frame2Id });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser.ini firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser.ini
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser.ini	2021-01-18 19:58:09.000000000 +0000
@@ -31,12 +31,14 @@
 [browser_media_control_keys_event.js]
 [browser_media_control_main_controller.js]
 [browser_media_control_non_eligible_media.js]
+skip-if = verify && (os == 'mac') # bug 1673509
 [browser_media_control_playback_state.js]
 [browser_media_control_position_state.js]
 [browser_media_control_seekto.js]
 [browser_media_control_supported_keys.js]
 [browser_media_control_stop_timer.js]
 [browser_nosrc_and_error_media.js]
+skip-if = verify && (os == 'mac') # bug 1673509
 [browser_seek_captured_audio.js]
 [browser_stop_control_after_media_reaches_to_end.js]
 [browser_suspend_inactive_tab.js]
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_audio_focus_within_a_page.js	2021-01-18 19:58:10.000000000 +0000
@@ -30,7 +30,7 @@
    * frame doesn't use media session, the current metadata would be the default
    * metadata.
    */
-  const tab = await createTabAndLoad(mainPageURL);
+  const tab = await createLoadedTabWrapper(mainPageURL);
   await playAndWaitUntilMetadataChanged(tab);
   await isGivenTabUsingDefaultMetadata(tab);
 
@@ -55,7 +55,7 @@
   /**
    * Remove tab and end test.
    */
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testAudioFocusChangesAfterPausingAudioFocusOwner() {
@@ -65,7 +65,7 @@
    * frame doesn't use media session, the current metadata would be the default
    * metadata.
    */
-  const tab = await createTabAndLoad(mainPageURL);
+  const tab = await createLoadedTabWrapper(mainPageURL);
   await playAndWaitUntilMetadataChanged(tab);
   await isGivenTabUsingDefaultMetadata(tab);
 
@@ -88,7 +88,7 @@
   /**
    * Remove tab and end test.
    */
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testAudioFocusUnchangesAfterPausingAudioFocusOwner() {
@@ -98,7 +98,7 @@
    * frame doesn't use media session, the current metadata would be the default
    * metadata.
    */
-  const tab = await createTabAndLoad(mainPageURL);
+  const tab = await createLoadedTabWrapper(mainPageURL);
   await playAndWaitUntilMetadataChanged(tab);
   await isGivenTabUsingDefaultMetadata(tab);
 
@@ -122,7 +122,7 @@
   /**
    * Remove tab and end test.
    */
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(
@@ -133,7 +133,7 @@
      * main frame doesn't use media session, the current metadata would be the
      * default metadata.
      */
-    const tab = await createTabAndLoad(mainPageURL);
+    const tab = await createLoadedTabWrapper(mainPageURL);
     await playAndWaitUntilMetadataChanged(tab);
     await isGivenTabUsingDefaultMetadata(tab);
 
@@ -159,7 +159,7 @@
     /**
      * Remove tab and end test.
      */
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 );
 
@@ -169,7 +169,7 @@
      * Play media for frame1, so frame1 owns the audio focus and frame1's metadata
      * should be displayed.
      */
-    const tab = await createTabAndLoad(mainPageURL);
+    const tab = await createLoadedTabWrapper(mainPageURL);
     await loadPageForFrame(tab, frame1, frameURL);
     let metadataFrame1 = await setMetadataAndGetReturnResult(tab, frame1);
     await playAndWaitUntilMetadataChanged(tab, frame1);
@@ -197,7 +197,7 @@
     /**
      * Remove tab and end test.
      */
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 );
 
@@ -208,7 +208,7 @@
    * frame doesn't use media session, the current metadata would be the default
    * metadata.
    */
-  const tab = await createTabAndLoad(mainPageURL);
+  const tab = await createLoadedTabWrapper(mainPageURL);
   await playAndWaitUntilMetadataChanged(tab);
   await isGivenTabUsingDefaultMetadata(tab);
 
@@ -236,7 +236,7 @@
   /**
    * Remove tab and end test.
    */
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
@@ -288,7 +288,9 @@
 }
 
 function playAndWaitUntilMetadataChanged(tab, frameId = undefined) {
-  const metadataChanged = waitUntilDisplayedMetadataChanged();
+  const metadataChanged = frameId
+    ? new Promise(r => (tab.controller.onmetadatachange = r))
+    : waitUntilDisplayedMetadataChanged();
   return Promise.all([metadataChanged, playMediaFrom(tab, frameId)]);
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js	2021-01-18 19:58:09.000000000 +0000
@@ -27,7 +27,7 @@
  */
 add_task(async function testMediaEntersPIPMode() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`trigger PIP mode`);
   const winPIP = await triggerPictureInPicture(tab.linkedBrowser, testVideoId);
@@ -38,12 +38,12 @@
 
   info(`remove tab`);
   await BrowserTestUtils.closeWindow(winPIP);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMutedMediaEntersPIPMode() {
   info(`open media page and mute video`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
   await muteMedia(tab, testVideoId);
 
   info(`trigger PIP mode`);
@@ -55,12 +55,12 @@
 
   info(`remove tab`);
   await BrowserTestUtils.closeWindow(winPIP);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMediaEntersFullScreen() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`make video fullscreen`);
   await enableFullScreen(tab, testVideoId);
@@ -70,12 +70,12 @@
   await checkOrWaitUntilMediaStartedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMutedMediaEntersFullScreen() {
   info(`open media page and mute video`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
   await muteMedia(tab, testVideoId);
 
   info(`make video fullscreen`);
@@ -86,12 +86,16 @@
   await checkOrWaitUntilMediaStartedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testNonMediaEntersFullScreen() {
-  info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  info(`open media page which won't have an activated controller`);
+  // As we won't activate controller in this test case, not need to
+  // check controller's status.
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY, {
+    needCheck: false,
+  });
 
   info(`make non-media element fullscreen`);
   const nonMediaElementId = "image";
@@ -104,12 +108,12 @@
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMediaInIframeEntersFullScreen() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`make video in iframe fullscreen`);
   await enableMediaFullScreenInIframe(tab, testVideoId);
@@ -127,7 +131,7 @@
   await removeIframeFromDocument(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_captured_audio.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_captured_audio.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_captured_audio.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_captured_audio.js	2021-01-18 19:58:09.000000000 +0000
@@ -15,7 +15,7 @@
  */
 add_task(async function testAudibleCapturedMedia() {
   info(`open new non autoplay media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY_MEDIA);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY_MEDIA);
 
   info(`capture audio and start playing`);
   await captureAudio(tab, testVideoId);
@@ -26,7 +26,7 @@
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_keys_event.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_keys_event.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_keys_event.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_keys_event.js	2021-01-18 19:58:10.000000000 +0000
@@ -15,52 +15,48 @@
 
 add_task(async function testPlayPauseAndStop() {
   info(`open page and start media`);
-  const tab = await createTabAndLoad(PAGE);
+  const tab = await createLoadedTabWrapper(PAGE);
   await playMedia(tab, testVideoId);
 
   info(`pressing 'pause' key`);
-  await generateMediaControlKey("pause");
+  MediaControlService.generateMediaControlKey("pause");
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
   info(`pressing 'play' key`);
-  await generateMediaControlKey("play");
+  MediaControlService.generateMediaControlKey("play");
   await checkOrWaitUntilMediaStartedPlaying(tab, testVideoId);
 
   info(`pressing 'stop' key`);
-  await generateMediaControlKey("stop");
+  MediaControlService.generateMediaControlKey("stop");
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
-  info(`we have stop controlling media, pressing 'play' won't resume media`);
-  // Not expect playback state change, so using ChromeUtils's method directly.
+  info(`Has stopped controlling media, pressing 'play' won't resume it`);
   MediaControlService.generateMediaControlKey("play");
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testPlayPause() {
   info(`open page and start media`);
-  const tab = await createTabAndLoad(PAGE);
+  const tab = await createLoadedTabWrapper(PAGE);
   await playMedia(tab, testVideoId);
 
   info(`pressing 'playPause' key, media should stop`);
-  await generateMediaControlKey("playpause");
-  await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
+  MediaControlService.generateMediaControlKey("playpause");
+  await Promise.all([
+    new Promise(r => (tab.controller.onplaybackstatechange = r)),
+    checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId),
+  ]);
 
   info(`pressing 'playPause' key, media should start`);
-  await generateMediaControlKey("playpause");
-  await checkOrWaitUntilMediaStartedPlaying(tab, testVideoId);
+  MediaControlService.generateMediaControlKey("playpause");
+  await Promise.all([
+    new Promise(r => (tab.controller.onplaybackstatechange = r)),
+    checkOrWaitUntilMediaStartedPlaying(tab, testVideoId),
+  ]);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
-
-/**
- * The following are helper functions.
- */
-function generateMediaControlKey(event) {
-  const playbackStateChanged = waitUntilDisplayedPlaybackChanged();
-  MediaControlService.generateMediaControlKey(event);
-  return playbackStateChanged;
-}
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_main_controller.js	2021-01-18 19:58:09.000000000 +0000
@@ -39,9 +39,9 @@
  */
 add_task(async function testDeterminingMainController() {
   info(`open three different tabs`);
-  const tab0 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-  const tab1 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-  const tab2 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab0 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+  const tab1 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+  const tab2 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   /**
    * part1 : [] -> [tab0] -> [tab0, tab1] -> [tab0, tab1, tab2]
@@ -51,19 +51,19 @@
   await setMediaMetadataForTabs([tab0, tab1, tab2]);
 
   info(`start media for tab0, main controller should become tab0`);
-  await makeTabBecomeMainController(tab0);
+  await makeTabBecomeMainControllerAndWaitForMetadataChange(tab0);
 
   info(`currrent metadata should be equal to tab0's metadata`);
   await isCurrentMetadataEqualTo(tab0.metadata);
 
   info(`start media for tab1, main controller should become tab1`);
-  await makeTabBecomeMainController(tab1);
+  await makeTabBecomeMainControllerAndWaitForMetadataChange(tab1);
 
   info(`currrent metadata should be equal to tab1's metadata`);
   await isCurrentMetadataEqualTo(tab1.metadata);
 
   info(`start media for tab2, main controller should become tab2`);
-  await makeTabBecomeMainController(tab2);
+  await makeTabBecomeMainControllerAndWaitForMetadataChange(tab2);
 
   info(`currrent metadata should be equal to tab2's metadata`);
   await isCurrentMetadataEqualTo(tab2.metadata);
@@ -89,41 +89,32 @@
    */
   info(`# [tab2, tab1, tab0] -> [tab2, tab1] -> [tab2] -> [] #`);
   info(`remove tab0 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab0),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab0.close()]);
 
   info(`currrent metadata should be equal to tab1's metadata`);
   await isCurrentMetadataEqualTo(tab1.metadata);
 
   info(`remove tab1 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab1),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab1.close()]);
 
   info(`currrent metadata should be equal to tab2's metadata`);
   await isCurrentMetadataEqualTo(tab2.metadata);
 
   info(`remove tab2 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab2),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab2.close()]);
   isCurrentMetadataEmpty();
 });
 
 add_task(async function testPIPControllerWontBeReplacedByNormalController() {
   info(`open two different tabs`);
-  const tab0 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-  const tab1 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab0 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+  const tab1 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`set different metadata for each tab`);
   await setMediaMetadataForTabs([tab0, tab1]);
 
   info(`start media for tab0, main controller should become tab0`);
-  await makeTabBecomeMainController(tab0);
+  await makeTabBecomeMainControllerAndWaitForMetadataChange(tab0);
 
   info(`currrent metadata should be equal to tab0's metadata`);
   await isCurrentMetadataEqualTo(tab0.metadata);
@@ -139,35 +130,29 @@
 
   info(`remove tab0 and wait until main controller changes`);
   await BrowserTestUtils.closeWindow(winPIP);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab0),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab0.close()]);
 
   info(`currrent metadata should be equal to tab1's metadata`);
   await isCurrentMetadataEqualTo(tab1.metadata);
 
   info(`remove tab1 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab1),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab1.close()]);
   isCurrentMetadataEmpty();
 });
 
 add_task(
   async function testFullscreenControllerWontBeReplacedByNormalController() {
     info(`open two different tabs`);
-    const tab0 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-    const tab1 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+    const tab0 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+    const tab1 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
     info(`set different metadata for each tab`);
     await setMediaMetadataForTabs([tab0, tab1]);
 
     info(`start media for tab0, main controller should become tab0`);
-    await makeTabBecomeMainController(tab0);
+    await makeTabBecomeMainControllerAndWaitForMetadataChange(tab0);
 
-    info(`currrent metadata should be equal to tab0's metadata`);
+    info(`current metadata should be equal to tab0's metadata`);
     await isCurrentMetadataEqualTo(tab0.metadata);
 
     info(`video in tab0 enters fullscreen`);
@@ -183,16 +168,15 @@
     await isCurrentMetadataEqualTo(tab0.metadata);
 
     info(`remove tabs`);
-    await BrowserTestUtils.removeTab(tab0);
-    await BrowserTestUtils.removeTab(tab1);
+    await Promise.all([tab0.close(), tab1.close()]);
   }
 );
 
 add_task(async function testFullscreenAndPIPControllers() {
   info(`open three different tabs`);
-  const tab0 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-  const tab1 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
-  const tab2 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab0 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+  const tab1 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+  const tab2 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`set different metadata for each tab`);
   await setMediaMetadataForTabs([tab0, tab1, tab2]);
@@ -201,7 +185,7 @@
    * Current controller list : [tab0 (fullscreen)]
    */
   info(`start media for tab0, main controller should become tab0`);
-  await makeTabBecomeMainController(tab0);
+  await makeTabBecomeMainControllerAndWaitForMetadataChange(tab0);
 
   info(`currrent metadata should be equal to tab0's metadata`);
   await isCurrentMetadataEqualTo(tab0.metadata);
@@ -240,10 +224,7 @@
    */
   info(`remove tab1 and wait until main controller changes`);
   await BrowserTestUtils.closeWindow(winPIP);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab1),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab1.close()]);
 
   info(`currrent metadata should be equal to tab0's metadata`);
   await isCurrentMetadataEqualTo(tab0.metadata);
@@ -252,10 +233,7 @@
    * Current controller list : [tab2]
    */
   info(`remove tab0 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab0),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab0.close()]);
 
   info(`currrent metadata should be equal to tab0's metadata`);
   await isCurrentMetadataEqualTo(tab2.metadata);
@@ -264,10 +242,7 @@
    * Current controller list : []
    */
   info(`remove tab2 and wait until main controller changes`);
-  await Promise.all([
-    waitUntilMainMediaControllerChanged(),
-    BrowserTestUtils.removeTab(tab2),
-  ]);
+  await Promise.all([waitUntilMainMediaControllerChanged(), tab2.close()]);
   isCurrentMetadataEmpty();
 });
 
@@ -324,6 +299,13 @@
   return Promise.all([playPromise, waitUntilMainMediaControllerChanged()]);
 }
 
+function makeTabBecomeMainControllerAndWaitForMetadataChange(tab) {
+  return Promise.all([
+    new Promise(r => (tab.controller.onmetadatachange = r)),
+    makeTabBecomeMainController(tab),
+  ]);
+}
+
 function playMediaAndWaitUntilRegisteringController(tab, elementId) {
   const playPromise = SpecialPowers.spawn(
     tab.linkedBrowser,
@@ -341,7 +323,7 @@
 
 async function switchTabToForegroundAndEnableFullScreen(tab, elementId) {
   // Fullscreen can only be allowed to enter from a focus tab.
-  await BrowserTestUtils.switchTab(gBrowser, tab);
+  await BrowserTestUtils.switchTab(gBrowser, tab.tabElement);
   await SpecialPowers.spawn(tab.linkedBrowser, [elementId], elementId => {
     return new Promise(r => {
       const element = content.document.getElementById(elementId);
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_metadata.js	2021-01-18 19:58:09.000000000 +0000
@@ -40,7 +40,7 @@
  */
 add_task(async function testDefaultMetadataForPageWithoutMediaSession() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -49,13 +49,13 @@
   await isGivenTabUsingDefaultMetadata(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(
   async function testDefaultMetadataForEmptyTitlePageWithoutMediaSession() {
     info(`open media page`);
-    const tab = await createTabAndLoad(PAGE_EMPTY_TITLE_URL);
+    const tab = await createLoadedTabWrapper(PAGE_EMPTY_TITLE_URL);
 
     info(`start media`);
     await playMedia(tab, testVideoId);
@@ -64,13 +64,13 @@
     await isGivenTabUsingDefaultMetadata(tab);
 
     info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 );
 
 add_task(async function testDefaultMetadataForPageUsingEmptyMetadata() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -87,12 +87,12 @@
   await isGivenTabUsingDefaultMetadata(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testDefaultMetadataForPageUsingNullMetadata() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -104,12 +104,12 @@
   await isGivenTabUsingDefaultMetadata(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMetadataWithEmptyTitleAndArtwork() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -126,12 +126,12 @@
   await isGivenTabUsingDefaultMetadata(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMetadataWithoutTitleAndArtwork() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -146,17 +146,17 @@
   await isGivenTabUsingDefaultMetadata(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testMetadataInPrivateBrowsing() {
   info(`create a private window`);
-  const privateWindow = await BrowserTestUtils.openNewBrowserWindow({
+  const inputWindow = await BrowserTestUtils.openNewBrowserWindow({
     private: true,
   });
 
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY, privateWindow);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY, { inputWindow });
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -174,15 +174,15 @@
   await isGivenTabUsingDefaultMetadata(tab, { isPrivateBrowsing: true });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 
   info(`close private window`);
-  await BrowserTestUtils.closeWindow(privateWindow);
+  await BrowserTestUtils.closeWindow(inputWindow);
 });
 
 add_task(async function testSetMetadataFromMediaSessionAPI() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -212,12 +212,14 @@
   await isCurrentMetadataEqualTo(metadata);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSetMetadataBeforeMediaStarts() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY, {
+    needCheck: false,
+  });
 
   info(`set metadata`);
   let metadata = {
@@ -226,18 +228,18 @@
     album: "foo",
     artwork: [{ src: "bar.jpg", sizes: "128x128", type: "image/jpeg" }],
   };
-  await setMediaMetadata(tab, metadata);
+  await setMediaMetadata(tab, metadata, { notExpectChange: true });
 
   info(`current media metadata should be empty before media starts`);
   isCurrentMetadataEmpty();
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSetMetadataAfterMediaPaused() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media in order to let this tab be controlled`);
   await playMedia(tab, testVideoId);
@@ -258,12 +260,12 @@
   await isCurrentMetadataEqualTo(metadata);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSetMetadataAmongMultipleTabs() {
   info(`open media page in tab1`);
-  const tab1 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab1 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media in tab1`);
   await playMedia(tab1, testVideoId);
@@ -281,7 +283,10 @@
   await isCurrentMetadataEqualTo(metadata);
 
   info(`open another page in tab2`);
-  const tab2 = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab2 = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
+
+  info(`start media in tab2`);
+  await playMedia(tab2, testVideoId);
 
   info(`set metadata for tab2`);
   metadata = {
@@ -292,9 +297,6 @@
   };
   await setMediaMetadata(tab2, metadata);
 
-  info(`start media in tab2`);
-  await playMedia(tab2, testVideoId);
-
   info(`current active metadata should become metadata from tab2`);
   await isCurrentMetadataEqualTo(metadata);
 
@@ -313,13 +315,12 @@
   await isCurrentMetadataEqualTo(metadata);
 
   info(`remove tabs`);
-  await BrowserTestUtils.removeTab(tab1);
-  await BrowserTestUtils.removeTab(tab2);
+  await Promise.all([tab1.close(), tab2.close()]);
 });
 
 add_task(async function testMetadataAfterTabNavigation() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -338,20 +339,21 @@
 
   info(`navigate tab to blank page`);
   await Promise.all([
+    new Promise(r => (tab.controller.ondeactivated = r)),
     BrowserTestUtils.loadURI(tab.linkedBrowser, "about:blank"),
-    waitUntilMainMediaControllerChanged(),
+    waitUntilDisplayedMetadataChanged(),
   ]);
 
   info(`current media metadata should be reset`);
   isCurrentMetadataEmpty();
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testUpdateDefaultMetadataWhenPageTitleChanges() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -375,20 +377,22 @@
   await isCurrentMetadataEqualTo(metadata);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
  * The following are helper functions.
  */
-function setMediaMetadata(tab, metadata) {
+function setMediaMetadata(tab, metadata, { notExpectChange } = {}) {
   const controller = tab.linkedBrowser.browsingContext.mediaController;
-  const promise = SpecialPowers.spawn(tab.linkedBrowser, [metadata], data => {
-    content.navigator.mediaSession.metadata = new content.MediaMetadata(data);
-  });
+  const metadatachangePromise = notExpectChange
+    ? Promise.resolve()
+    : new Promise(r => (controller.onmetadatachange = r));
   return Promise.all([
-    promise,
-    new Promise(r => (controller.onmetadatachange = r)),
+    metadatachangePromise,
+    SpecialPowers.spawn(tab.linkedBrowser, [metadata], data => {
+      content.navigator.mediaSession.metadata = new content.MediaMetadata(data);
+    }),
   ]);
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_non_eligible_media.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_non_eligible_media.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_non_eligible_media.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_non_eligible_media.js	2021-01-18 19:58:09.000000000 +0000
@@ -8,8 +8,8 @@
   this
 );
 
-// Bug 1620686 - This test requests a lot of fullscreen and picture-in-picture
-// for media elements which needs longer time to run.
+// Bug 1673509 - This test requests a lot of fullscreen for media elements,
+// which sometime Gecko would take longer time to fulfill.
 requestLongerTimeout(2);
 
 // This array contains the elements' id in `file_non_eligible_media.html`.
@@ -27,7 +27,7 @@
  * eligible for being controlled by media control keys.
  * (1) If media is inaudible all the time, then we would not control it.
  * (2) If media starts inaudibly, we would not try to control it. But once it
- * becomes audible later, we would keep controlling it until it's detroyed.
+ * becomes audible later, we would keep controlling it until it's destroyed.
  * (3) If media's duration is too short (<3s), then we would not control it.
  */
 add_task(async function setupTestingPref() {
@@ -36,63 +36,63 @@
   });
 });
 
-add_task(async function testPlayPauseAndStop() {
-  for (const elementId of gNonEligibleElementIds) {
-    info(`- open new tab and start non eligible media ${elementId} -`);
-    const tab = await createTabAndLoad(PAGE_NON_ELIGIBLE_MEDIA);
-    await startNonEligibleMedia(tab, elementId);
-
-    // Generate media control event should be postponed for a while to ensure
-    // that we didn't create any controller.
-    info(`- let media play for a while -`);
-    await checkIfMediaIsStillPlaying(tab, elementId);
-
-    info(`- simulate pressing 'pause' media control key -`);
-    MediaControlService.generateMediaControlKey("pause");
+add_task(
+  async function testNonAudibleMediaCantActivateControllerButAudibleMediaCan() {
+    for (const elementId of gNonEligibleElementIds) {
+      info(`open new tab with non eligible media elements`);
+      const tab = await createLoadedTabWrapper(PAGE_NON_ELIGIBLE_MEDIA, {
+        needCheck: couldElementBecomeEligible(elementId),
+      });
+
+      info(`although media is playing but it won't activate controller`);
+      await Promise.all([
+        startNonEligibleMedia(tab, elementId),
+        checkIfMediaIsStillPlaying(tab, elementId),
+      ]);
+      ok(!tab.controller.isActive, "controller is still inactive");
+
+      if (couldElementBecomeEligible(elementId)) {
+        info(`make element ${elementId} audible would activate controller`);
+        await Promise.all([
+          makeElementEligible(tab, elementId),
+          checkOrWaitUntilControllerBecomeActive(tab),
+        ]);
+      }
 
-    info(`- non eligible media won't be controlled by media control -`);
-    await checkIfMediaIsStillPlaying(tab, elementId);
-
-    if (couldElementBecomeEligible(elementId)) {
-      info(`- make element ${elementId} audible -`);
-      await makeElementEligible(tab, elementId);
-
-      info(`- simulate pressing 'pause' media control key -`);
-      MediaControlService.generateMediaControlKey("pause");
-
-      info(`- audible media should be controlled by media control -`);
-      await waitUntilMediaPaused(tab, elementId);
+      info(`remove tab`);
+      await tab.close();
     }
-
-    info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
   }
-});
+);
 
 /**
  * Normally those media are not able to being controlled, however, once they
  * enter fullsceen or Picture-in-Picture mode, then they can be controlled.
  */
 add_task(async function testNonEligibleMediaEnterFullscreen() {
+  info(`open new tab with non eligible media elements`);
+  const tab = await createLoadedTabWrapper(PAGE_NON_ELIGIBLE_MEDIA);
+
   for (const elementId of gNonEligibleElementIds) {
-    info(`- open new tab and start non eligible media ${elementId} -`);
-    const tab = await createTabAndLoad(PAGE_NON_ELIGIBLE_MEDIA);
     await startNonEligibleMedia(tab, elementId);
 
     info(`entering fullscreen should activate the media controller`);
-    await enableFullScreen(tab, elementId);
+    await enterFullScreen(tab, elementId);
     await checkOrWaitUntilControllerBecomeActive(tab);
     ok(true, `fullscreen ${elementId} media is able to being controlled`);
 
-    info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
+    info(`leave fullscreen`);
+    await leaveFullScreen(tab);
   }
+  info(`remove tab`);
+  await tab.close();
 });
 
 add_task(async function testNonEligibleMediaEnterPIPMode() {
+  info(`open new tab with non eligible media elements`);
+  const tab = await createLoadedTabWrapper(PAGE_NON_ELIGIBLE_MEDIA);
+
   for (const elementId of gNonEligibleElementIds) {
-    info(`- open new tab and start non eligible media ${elementId} -`);
-    const tab = await createTabAndLoad(PAGE_NON_ELIGIBLE_MEDIA);
     await startNonEligibleMedia(tab, elementId);
 
     info(`media entering PIP mode should activate the media controller`);
@@ -100,10 +100,11 @@
     await checkOrWaitUntilControllerBecomeActive(tab);
     ok(true, `PIP ${elementId} media is able to being controlled`);
 
-    info(`remove tab`);
+    info(`stop PIP mode`);
     await BrowserTestUtils.closeWindow(winPIP);
-    await BrowserTestUtils.removeTab(tab);
   }
+  info(`remove tab`);
+  await tab.close();
 });
 
 /**
@@ -122,6 +123,7 @@
       const context = new content.AudioContext();
       context.createMediaElementSource(video);
     }
+    info(`start non eligible media ${Id}`);
     return video.play();
   });
 }
@@ -178,10 +180,10 @@
   });
 }
 
-function enableFullScreen(tab, elementId) {
-  return SpecialPowers.spawn(tab.linkedBrowser, [elementId], elementId => {
+function enterFullScreen(tab, elementId) {
+  return SpecialPowers.spawn(tab.linkedBrowser, [elementId], Id => {
     return new Promise(r => {
-      const element = content.document.getElementById(elementId);
+      const element = content.document.getElementById(Id);
       element.requestFullscreen();
       element.onfullscreenchange = () => {
         element.onfullscreenchange = null;
@@ -195,3 +197,9 @@
     });
   });
 }
+
+function leaveFullScreen(tab) {
+  return SpecialPowers.spawn(tab.linkedBrowser, [], _ => {
+    return content.document.exitFullscreen();
+  });
+}
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_playback_state.js	2021-01-18 19:58:09.000000000 +0000
@@ -23,18 +23,20 @@
  */
 add_task(async function testDefaultPlaybackStateBeforeAnyMediaStart() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY, {
+    needCheck: false,
+  });
 
   info(`before media starts, playback state should be 'none'`);
   await isActualPlaybackStateEqualTo(tab, "none");
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testGuessedPlaybackState() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(
     `Now declared='none', guessed='playing', so actual playback state should be 'playing'`
@@ -49,12 +51,12 @@
   await isActualPlaybackStateEqualTo(tab, "paused");
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testBothGuessedAndDeclaredPlaybackState() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(
     `Now declared='paused', guessed='playing', so actual playback state should be 'playing'`
@@ -76,7 +78,7 @@
   await isActualPlaybackStateEqualTo(tab, "playing");
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_position_state.js	2021-01-18 19:58:09.000000000 +0000
@@ -20,7 +20,7 @@
  */
 add_task(async function testSetPositionState() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -44,12 +44,12 @@
   });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSetPositionStateFromInactiveMediaSession() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -81,7 +81,7 @@
   );
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_seekto.js	2021-01-18 19:58:09.000000000 +0000
@@ -20,7 +20,7 @@
  */
 add_task(async function testSetPositionState() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -44,7 +44,7 @@
   });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_stop_timer.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_stop_timer.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_stop_timer.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_stop_timer.js	2021-01-18 19:58:09.000000000 +0000
@@ -31,7 +31,7 @@
  */
 add_task(async function testStopMediaControlAfterPausingMedia() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -40,12 +40,12 @@
   await pauseMediaAndMediaControlShouldBeStopped(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testNotToStopMediaControlForPIPVideo() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -62,15 +62,19 @@
 
   info(`remove tab`);
   await BrowserTestUtils.closeWindow(winPIP);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
  * The following is helper function.
  */
-function pauseMediaAndMediaControlShouldBeStopped(tab, testVideoId) {
+function pauseMediaAndMediaControlShouldBeStopped(tab, elementId) {
   // After pausing media, the stop timer would be triggered and stop the media
-  // control, which would reset the current main media controller.
-  const controllerChangedPromise = waitUntilMainMediaControllerChanged();
-  return Promise.all([pauseMedia(tab, testVideoId), controllerChangedPromise]);
+  // control.
+  return Promise.all([
+    new Promise(r => (tab.controller.ondeactivated = r)),
+    SpecialPowers.spawn(tab.linkedBrowser, [elementId], Id => {
+      content.document.getElementById(Id).pause();
+    }),
+  ]);
 }
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_media_control_supported_keys.js	2021-01-18 19:58:10.000000000 +0000
@@ -23,7 +23,7 @@
  */
 add_task(async function testDefaultSupportedKeys() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -32,12 +32,12 @@
   await supportedKeysShouldEqualTo(tab, sDefaultSupportedKeys);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testNoActionHandlerBeingSet() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -52,12 +52,12 @@
   await supportedKeysShouldEqualTo(tab, sDefaultSupportedKeys);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSettingActionsWhichAreAlreadyDefaultKeys() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -72,12 +72,12 @@
   await supportedKeysShouldEqualTo(tab, sDefaultSupportedKeys);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testSettingActionsWhichAreNotDefaultKeys() {
   info(`open media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY);
 
   info(`start media`);
   await playMedia(tab, testVideoId);
@@ -98,7 +98,7 @@
   await supportedKeysShouldEqualTo(tab, expectedKeys);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_nosrc_and_error_media.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_nosrc_and_error_media.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_nosrc_and_error_media.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_nosrc_and_error_media.js	2021-01-18 19:58:10.000000000 +0000
@@ -25,7 +25,7 @@
 add_task(async function testNoSrcOrErrorMediaEntersPIPMode() {
   for (let page of PAGES) {
     info(`open media page ${page}`);
-    const tab = await createTabAndLoad(page);
+    const tab = await createLoadedTabWrapper(page, { needCheck: false });
 
     info(`controller should always inactive`);
     const controller = tab.linkedBrowser.browsingContext.mediaController;
@@ -33,32 +33,29 @@
       ok(false, "should not get activated!");
     };
 
-    info(`enter PIP mode several times and controller should keep inactive`);
-    for (let idx = 0; idx < 3; idx++) {
-      const winPIP = await triggerPictureInPicture(
-        tab.linkedBrowser,
-        testVideoId
-      );
-
-      await ensureMessageAndClosePiP(
-        tab.linkedBrowser,
-        testVideoId,
-        winPIP,
-        false
-      );
-    }
+    info(`enter PIP mode which would not affect controller`);
+    const winPIP = await triggerPictureInPicture(
+      tab.linkedBrowser,
+      testVideoId
+    );
+    info(`leave PIP mode`);
+    await ensureMessageAndClosePiP(
+      tab.linkedBrowser,
+      testVideoId,
+      winPIP,
+      false
+    );
     ok(!controller.isActive, "controller is still inactive");
 
     info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
-    await SimpleTest.promiseFocus(window);
+    await tab.close();
   }
 });
 
 add_task(async function testNoSrcOrErrorMediaEntersFullscreen() {
   for (let page of PAGES) {
     info(`open media page ${page}`);
-    const tab = await createTabAndLoad(page);
+    const tab = await createLoadedTabWrapper(page, { needCheck: false });
 
     info(`controller should always inactive`);
     const controller = tab.linkedBrowser.browsingContext.mediaController;
@@ -66,41 +63,23 @@
       ok(false, "should not get activated!");
     };
 
-    info(`enter fullscreen several times and controller should keep inactive`);
-    await ensureTabIsAlreadyFocused(tab);
-    for (let idx = 0; idx < 3; idx++) {
-      await enterAndLeaveFullScreen(tab, testVideoId);
-    }
+    info(`enter and leave fullscreen which would not affect controller`);
+    await enterAndLeaveFullScreen(tab, testVideoId);
     ok(!controller.isActive, "controller is still inactive");
 
     info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 });
 
 /**
  * The following is helper function.
  */
-function ensureTabIsAlreadyFocused(tab) {
-  return SpecialPowers.spawn(tab.linkedBrowser, [], () => {
-    // fullscreen can only be request from a visible tab, sometime we excecute
-    // this method too early where the tab hasn't become a focus tab.
-    if (content.document.visibilityState != "visible") {
-      info(`wait until tab becomes a focus tab`);
-      return new Promise(r => {
-        content.document.onvisibilitychange = () => {
-          if (content.document.visibilityState == "visible") {
-            r();
-          }
-        };
-      });
-    }
-    return Promise.resolve();
-  });
-}
-
-function enterAndLeaveFullScreen(tab, elementId) {
-  return SpecialPowers.spawn(tab.linkedBrowser, [elementId], elementId => {
+async function enterAndLeaveFullScreen(tab, elementId) {
+  await new Promise(resolve =>
+    SimpleTest.waitForFocus(resolve, tab.linkedBrowser.ownerGlobal)
+  );
+  await SpecialPowers.spawn(tab.linkedBrowser, [elementId], elementId => {
     return new Promise(r => {
       const element = content.document.getElementById(elementId);
       ok(!content.document.fullscreenElement, "no fullscreen element");
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_remove_controllable_media_for_active_controller.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_remove_controllable_media_for_active_controller.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_remove_controllable_media_for_active_controller.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_remove_controllable_media_for_active_controller.js	2021-01-18 19:58:09.000000000 +0000
@@ -20,7 +20,7 @@
 add_task(
   async function testControllerWithActiveMediaSessionShouldStillBeActiveWhenNoControllableMediaPresents() {
     info(`open media page`);
-    const tab = await createTabAndLoad(PAGE_URL);
+    const tab = await createLoadedTabWrapper(PAGE_URL);
 
     info(`play media would activate controller and media session`);
     await setupMediaSession(tab);
@@ -28,7 +28,10 @@
     await checkOrWaitControllerBecomesActive(tab);
 
     info(`remove playing media so we don't have any controllable media now`);
-    await removePlayingMedia(tab);
+    await Promise.all([
+      new Promise(r => (tab.controller.onplaybackstatechange = r)),
+      removePlayingMedia(tab),
+    ]);
 
     info(`despite that, controller should still be active`);
     await checkOrWaitControllerBecomesActive(tab);
@@ -37,27 +40,29 @@
     await ensureActiveMediaSessionReceivedMediaKey(tab);
 
     info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 );
 
 add_task(
   async function testControllerWithoutActiveMediaSessionShouldBecomeInactiveWhenNoControllableMediaPresents() {
     info(`open media page`);
-    const tab = await createTabAndLoad(PAGE_URL);
+    const tab = await createLoadedTabWrapper(PAGE_URL);
 
     info(`play media would activate controller`);
     await playMedia(tab, testVideoId);
     await checkOrWaitControllerBecomesActive(tab);
 
-    info(`remove playing media so we don't have any controllable media now`);
-    await removePlayingMedia(tab);
-
-    info(`without having media session, controller should be deactivated`);
-    await checkOrWaitControllerBecomesInactive(tab);
+    info(
+      `remove playing media so we don't have any controllable media, which would deactivate controller`
+    );
+    await Promise.all([
+      new Promise(r => (tab.controller.ondeactivated = r)),
+      removePlayingMedia(tab),
+    ]);
 
     info(`remove tab`);
-    await BrowserTestUtils.removeTab(tab);
+    await tab.close();
   }
 );
 
@@ -88,13 +93,9 @@
 }
 
 function removePlayingMedia(tab) {
-  const controller = tab.linkedBrowser.browsingContext.mediaController;
-  return Promise.all([
-    new Promise(r => (controller.onplaybackstatechange = r)),
-    SpecialPowers.spawn(tab.linkedBrowser, [testVideoId], Id => {
-      content.document.getElementById(Id).remove();
-    }),
-  ]);
+  return SpecialPowers.spawn(tab.linkedBrowser, [testVideoId], Id => {
+    content.document.getElementById(Id).remove();
+  });
 }
 
 async function checkOrWaitControllerBecomesActive(tab) {
@@ -104,11 +105,3 @@
   }
   ok(controller.isActive, `controller is active`);
 }
-
-async function checkOrWaitControllerBecomesInactive(tab) {
-  const controller = tab.linkedBrowser.browsingContext.mediaController;
-  if (controller.isActive) {
-    await new Promise(r => (controller.ondeactivated = r));
-  }
-  ok(!controller.isActive, `controller is inacitve`);
-}
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_resume_latest_paused_media.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_resume_latest_paused_media.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_resume_latest_paused_media.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_resume_latest_paused_media.js	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,7 @@
  */
 add_task(async function testResumingLatestPausedMedias() {
   info(`open media page and play all media`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
   await playAllMedia(tab);
 
   /**
@@ -118,7 +118,7 @@
   });
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_seek_captured_audio.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_seek_captured_audio.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_seek_captured_audio.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_seek_captured_audio.js	2021-01-18 19:58:10.000000000 +0000
@@ -15,7 +15,7 @@
  */
 add_task(async function testSeekAudibleCapturedMedia() {
   info(`open new non autoplay media page`);
-  const tab = await createTabAndLoad(PAGE_NON_AUTOPLAY_MEDIA);
+  const tab = await createLoadedTabWrapper(PAGE_NON_AUTOPLAY_MEDIA);
 
   info(`perform seek on the captured media before it starts`);
   await captureAudio(tab, testVideoId);
@@ -29,7 +29,7 @@
   await checkOrWaitUntilMediaStoppedPlaying(tab, testVideoId);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_stop_control_after_media_reaches_to_end.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_stop_control_after_media_reaches_to_end.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_stop_control_after_media_reaches_to_end.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_stop_control_after_media_reaches_to_end.js	2021-01-18 19:58:09.000000000 +0000
@@ -15,19 +15,19 @@
  */
 add_task(async function testControllerShouldStopAfterMediaReachesToTheEnd() {
   info(`open media page and play media until the end`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
   await Promise.all([
     checkIfMediaControllerBecomeInactiveAfterMediaEnds(tab),
     playMediaUntilItReachesToTheEnd(tab),
   ]);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testControllerWontStopAfterMediaReachesToTheEnd() {
   info(`open media page and create media session`);
-  const tab = await createTabAndLoad(PAGE_URL);
+  const tab = await createLoadedTabWrapper(PAGE_URL);
   await createMediaSession(tab);
 
   info(`play media until the end`);
@@ -37,7 +37,7 @@
   await checkControllerIsActive(tab);
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_suspend_inactive_tab.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_suspend_inactive_tab.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/browser_suspend_inactive_tab.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/browser_suspend_inactive_tab.js	2021-01-18 19:58:09.000000000 +0000
@@ -35,12 +35,12 @@
   await shouldTabStateEqualTo(tab, "suspended");
 
   info(`remove tab`);
-  await BrowserTestUtils.removeTab(tab);
+  await tab.close();
 });
 
 add_task(async function testInactiveTabEverStartPlayingWontBeSuspended() {
   info(`open tab1 and play media`);
-  const tab1 = await createTab(PAGE_NON_AUTOPLAY);
+  const tab1 = await createTab(PAGE_NON_AUTOPLAY, { needCheck: true });
   await shouldTabStateEqualTo(tab1, "running");
   await playMedia(tab1, VIDEO_ID);
 
@@ -55,7 +55,7 @@
   await shouldTabStateEqualTo(tab1, "running");
 
   info(`open tab2 and play media`);
-  const tab2 = await createTab(PAGE_NON_AUTOPLAY);
+  const tab2 = await createTab(PAGE_NON_AUTOPLAY, { needCheck: true });
   await shouldTabStateEqualTo(tab2, "running");
   await playMedia(tab2, VIDEO_ID);
 
@@ -65,15 +65,14 @@
   await shouldTabStateEqualTo(tab1, "suspended");
 
   info(`remove tabs`);
-  await BrowserTestUtils.removeTab(tab1);
-  await BrowserTestUtils.removeTab(tab2);
+  await Promise.all([tab1.close(), tab2.close()]);
 });
 
 /**
  * The following are helper functions.
  */
-async function createTab(url) {
-  const tab = await createTabAndLoad(url);
+async function createTab(url, needCheck = false) {
+  const tab = await createLoadedTabWrapper(url, { needCheck });
   await createStateObserver(tab);
   return tab;
 }
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/head.js firefox-85.0+build1/dom/media/mediacontrol/tests/browser/head.js
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/browser/head.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/browser/head.js	2021-01-18 19:58:09.000000000 +0000
@@ -1,19 +1,90 @@
 /**
- * Create a new tab and load the content from a given window (optional), if
- * caller doesn't provide any window, then we would create tab in the current
- * window.
- *
- * @param {string} url
- *        The URL that tab is going to load
- * @param {window} inputWindow [optional]
- *        The window that uses to create a tab
- * @return {tab}
- *         Return a loaded tab created from the given window
+ * This function would create a new foreround tab and load the url for it. In
+ * addition, instead of returning a tab element, we return a tab wrapper that
+ * helps us to automatically detect if the media controller of that tab
+ * dispatches the first (activated) and the last event (deactivated) correctly.
+ * @ param url
+ *         the page url which tab would load
+ * @ param input window (optional)
+ *         if it exists, the tab would be created from the input window. If not,
+ *         then the tab would be created in current window.
+ * @ param needCheck (optional)
+ *         it decides if we would perform the check for the first and last event
+ *         on the media controller. It's default true.
  */
-async function createTabAndLoad(url, inputWindow = null) {
+async function createLoadedTabWrapper(
+  url,
+  { inputWindow = window, needCheck = true } = {}
+) {
+  class tabWrapper {
+    constructor(tab, needCheck) {
+      this._tab = tab;
+      this._controller = tab.linkedBrowser.browsingContext.mediaController;
+      this._firstEvent = "";
+      this._lastEvent = "";
+      this._events = [
+        "activated",
+        "deactivated",
+        "metadatachange",
+        "playbackstatechange",
+        "positionstatechange",
+        "supportedkeyschange",
+      ];
+      this._needCheck = needCheck;
+      if (this._needCheck) {
+        this._registerAllEvents();
+      }
+    }
+    _registerAllEvents() {
+      for (let event of this._events) {
+        this._controller.addEventListener(event, this._handleEvent.bind(this));
+      }
+    }
+    _unregisterAllEvents() {
+      for (let event of this._events) {
+        this._controller.removeEventListener(
+          event,
+          this._handleEvent.bind(this)
+        );
+      }
+    }
+    _handleEvent(event) {
+      info(`handle event=${event.type}`);
+      if (this._firstEvent === "") {
+        this._firstEvent = event.type;
+      }
+      this._lastEvent = event.type;
+    }
+    get linkedBrowser() {
+      return this._tab.linkedBrowser;
+    }
+    get controller() {
+      return this._controller;
+    }
+    get tabElement() {
+      return this._tab;
+    }
+    async close() {
+      info(`wait until finishing close tab wrapper`);
+      const deactivationPromise = this._controller.isActive
+        ? new Promise(r => (this._controller.ondeactivated = r))
+        : Promise.resolve();
+      BrowserTestUtils.removeTab(this._tab);
+      await deactivationPromise;
+      if (this._needCheck) {
+        is(this._firstEvent, "activated", "First event should be 'activated'");
+        is(
+          this._lastEvent,
+          "deactivated",
+          "Last event should be 'deactivated'"
+        );
+        this._unregisterAllEvents();
+      }
+    }
+  }
   const browser = inputWindow ? inputWindow.gBrowser : window.gBrowser;
   let tab = await BrowserTestUtils.openNewForegroundTab(browser, url);
-  return tab;
+  return new tabWrapper(tab, needCheck);
 }
 
 /**
diff -Nru firefox-84.0.2+build1/dom/media/mediacontrol/tests/gtest/TestMediaController.cpp firefox-85.0+build1/dom/media/mediacontrol/tests/gtest/TestMediaController.cpp
--- firefox-84.0.2+build1/dom/media/mediacontrol/tests/gtest/TestMediaController.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediacontrol/tests/gtest/TestMediaController.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -96,7 +96,7 @@
   {
     FakeControlledMedia fakeMedia(controller);
     fakeMedia.SetPlaying(MediaPlaybackState::ePlayed);
-    ASSERT_TRUE(service->GetActiveControllersNum() == 0);
+    ASSERT_TRUE(service->GetActiveControllersNum() == 1);
 
     fakeMedia.SetAudible(MediaAudibleState::eAudible);
     ASSERT_TRUE(service->GetActiveControllersNum() == 1);
diff -Nru firefox-84.0.2+build1/dom/media/MediaDecoder.cpp firefox-85.0+build1/dom/media/MediaDecoder.cpp
--- firefox-84.0.2+build1/dom/media/MediaDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaDecoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -33,6 +33,7 @@
 #include "nsError.h"
 #include "nsIMemoryReporter.h"
 #include "nsPrintfCString.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
 #include <algorithm>
 #include <limits>
diff -Nru firefox-84.0.2+build1/dom/media/MediaDecoderStateMachine.cpp firefox-85.0+build1/dom/media/MediaDecoderStateMachine.cpp
--- firefox-84.0.2+build1/dom/media/MediaDecoderStateMachine.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaDecoderStateMachine.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -27,6 +27,7 @@
 #include "AudioSegment.h"
 #include "DOMMediaStream.h"
 #include "ImageContainer.h"
+#include "GeckoProfiler.h"
 #include "MediaDecoder.h"
 #include "MediaDecoderStateMachine.h"
 #include "MediaShutdownManager.h"
@@ -38,17 +39,8 @@
 #include "VideoUtils.h"
 
 #ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define MDSM_ERROR_MARKER(tag, error, markerTime)                          \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(tag, MEDIA_PLAYBACK, TextMarkerPayload, \
-                                     (error, markerTime))
-#  define MDSM_SAMPLE_MARKER(tag, startTime, endTime) \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(                 \
-        tag, MEDIA_PLAYBACK, MediaSampleMarkerPayload, (startTime, endTime))
-#else
-#  define MDSM_ERROR_MARKER(tag, error, markerTime)
-#  define MDSM_SAMPLE_MARKER(tag, startTime, endTime)
-#endif
+#  include "mozilla/ProfilerMarkerTypes.h"
+#endif  // MOZ_GECKO_PROFILER
 
 namespace mozilla {
 
@@ -2859,8 +2851,9 @@
   MOZ_ASSERT(OnTaskQueue());
   MOZ_ASSERT(aSample);
   AudioQueue().Push(aSample);
-  MDSM_SAMPLE_MARKER("MDSM::PushAudio", aSample->mTime.ToMicroseconds(),
-                     aSample->GetEndTime().ToMicroseconds());
+  PROFILER_MARKER("MDSM::PushAudio", MEDIA_PLAYBACK, {}, MediaSampleMarker,
+                  aSample->mTime.ToMicroseconds(),
+                  aSample->GetEndTime().ToMicroseconds());
 }
 
 void MediaDecoderStateMachine::PushVideo(VideoData* aSample) {
@@ -2868,8 +2861,9 @@
   MOZ_ASSERT(aSample);
   aSample->mFrameID = ++mCurrentFrameID;
   VideoQueue().Push(aSample);
-  MDSM_SAMPLE_MARKER("MDSM::PushVideo", aSample->mTime.ToMicroseconds(),
-                     aSample->GetEndTime().ToMicroseconds());
+  PROFILER_MARKER("MDSM::PushVideo", MEDIA_PLAYBACK, {}, MediaSampleMarker,
+                  aSample->mTime.ToMicroseconds(),
+                  aSample->GetEndTime().ToMicroseconds());
 }
 
 void MediaDecoderStateMachine::OnAudioPopped(const RefPtr<AudioData>& aSample) {
@@ -3469,8 +3463,8 @@
 void MediaDecoderStateMachine::DecodeError(const MediaResult& aError) {
   MOZ_ASSERT(OnTaskQueue());
   LOGE("Decode error: %s", aError.Description().get());
-  MDSM_ERROR_MARKER("MDSM::DecodeError", aError.Description(),
-                    TimeStamp::NowUnfuzzed());
+  PROFILER_MARKER_TEXT("MDSM::DecodeError", MEDIA_PLAYBACK, {},
+                       aError.Description());
   // Notify the decode error and MediaDecoder will shut down MDSM.
   mOnPlaybackErrorEvent.Notify(aError);
 }
diff -Nru firefox-84.0.2+build1/dom/media/MediaDevices.cpp firefox-85.0+build1/dom/media/MediaDevices.cpp
--- firefox-84.0.2+build1/dom/media/MediaDevices.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaDevices.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -3,6 +3,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MediaDevices.h"
+
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/MediaDeviceInfo.h"
 #include "mozilla/dom/MediaDevicesBinding.h"
@@ -31,25 +33,46 @@
 already_AddRefed<Promise> MediaDevices::GetUserMedia(
     const MediaStreamConstraints& aConstraints, CallerType aCallerType,
     ErrorResult& aRv) {
-  if (RefPtr<nsPIDOMWindowInner> owner = GetOwner()) {
-    if (Document* doc = owner->GetExtantDoc()) {
-      if (!owner->IsSecureContext()) {
-        doc->SetUseCounter(eUseCounter_custom_GetUserMediaInsec);
-      }
-      Document* topDoc = doc->GetTopLevelContentDocument();
-      IgnoredErrorResult ignored;
-      if (topDoc && !topDoc->HasFocus(ignored)) {
-        doc->SetUseCounter(eUseCounter_custom_GetUserMediaUnfocused);
-      }
+  MOZ_ASSERT(NS_IsMainThread());
+  // Get the relevant global for the promise from the wrapper cache because
+  // DOMEventTargetHelper::GetOwner() returns null if the document is unloaded.
+  // We know the wrapper exists because it is being used for |this| from JS.
+  // See https://github.com/heycam/webidl/issues/932 for why the relevant
+  // global is used instead of the current global.
+  nsCOMPtr<nsIGlobalObject> global = xpc::NativeGlobal(GetWrapper());
+  // global is a window because MediaDevices is exposed only to Window.
+  nsCOMPtr<nsPIDOMWindowInner> owner = do_QueryInterface(global);
+  if (Document* doc = owner->GetExtantDoc()) {
+    if (!owner->IsSecureContext()) {
+      doc->SetUseCounter(eUseCounter_custom_GetUserMediaInsec);
+    }
+    Document* topDoc = doc->GetTopLevelContentDocument();
+    IgnoredErrorResult ignored;
+    if (topDoc && !topDoc->HasFocus(ignored)) {
+      doc->SetUseCounter(eUseCounter_custom_GetUserMediaUnfocused);
     }
   }
-  RefPtr<Promise> p = Promise::Create(GetParentObject(), aRv);
+  RefPtr<Promise> p = Promise::Create(global, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
+  /* If requestedMediaTypes is the empty set, return a promise rejected with a
+   * TypeError. */
+  if (!MediaManager::IsOn(aConstraints.mVideo) &&
+      !MediaManager::IsOn(aConstraints.mAudio)) {
+    p->MaybeRejectWithTypeError("audio and/or video is required");
+    return p.forget();
+  }
+  /* If the relevant settings object's responsible document is NOT fully
+   * active, return a promise rejected with a DOMException object whose name
+   * attribute has the value "InvalidStateError". */
+  if (!owner->IsFullyActive()) {
+    p->MaybeRejectWithInvalidStateError("The document is not fully active.");
+    return p.forget();
+  }
   RefPtr<MediaDevices> self(this);
   MediaManager::Get()
-      ->GetUserMedia(GetOwner(), aConstraints, aCallerType)
+      ->GetUserMedia(owner, aConstraints, aCallerType)
       ->Then(
           GetCurrentSerialEventTarget(), __func__,
           [this, self, p](RefPtr<DOMMediaStream>&& aStream) {
@@ -63,7 +86,7 @@
             if (!window) {
               return;  // Leave Promise pending after navigation by design.
             }
-            p->MaybeReject(MakeRefPtr<MediaStreamError>(window, *error));
+            error->Reject(p);
           });
   return p.forget();
 }
@@ -71,26 +94,25 @@
 already_AddRefed<Promise> MediaDevices::EnumerateDevices(CallerType aCallerType,
                                                          ErrorResult& aRv) {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (RefPtr<nsPIDOMWindowInner> owner = GetOwner()) {
-    if (Document* doc = owner->GetExtantDoc()) {
-      if (!owner->IsSecureContext()) {
-        doc->SetUseCounter(eUseCounter_custom_EnumerateDevicesInsec);
-      }
-      Document* topDoc = doc->GetTopLevelContentDocument();
-      IgnoredErrorResult ignored;
-      if (topDoc && !topDoc->HasFocus(ignored)) {
-        doc->SetUseCounter(eUseCounter_custom_EnumerateDevicesUnfocused);
-      }
+  nsCOMPtr<nsIGlobalObject> global = xpc::NativeGlobal(GetWrapper());
+  nsCOMPtr<nsPIDOMWindowInner> owner = do_QueryInterface(global);
+  if (Document* doc = owner->GetExtantDoc()) {
+    if (!owner->IsSecureContext()) {
+      doc->SetUseCounter(eUseCounter_custom_EnumerateDevicesInsec);
+    }
+    Document* topDoc = doc->GetTopLevelContentDocument();
+    IgnoredErrorResult ignored;
+    if (topDoc && !topDoc->HasFocus(ignored)) {
+      doc->SetUseCounter(eUseCounter_custom_EnumerateDevicesUnfocused);
     }
   }
-  RefPtr<Promise> p = Promise::Create(GetParentObject(), aRv);
+  RefPtr<Promise> p = Promise::Create(global, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
   RefPtr<MediaDevices> self(this);
   MediaManager::Get()
-      ->EnumerateDevices(GetOwner(), aCallerType)
+      ->EnumerateDevices(owner, aCallerType)
       ->Then(
           GetCurrentSerialEventTarget(), __func__,
           [this, self,
@@ -127,7 +149,7 @@
             if (!window) {
               return;  // Leave Promise pending after navigation by design.
             }
-            p->MaybeReject(MakeRefPtr<MediaStreamError>(window, *error));
+            error->Reject(p);
           });
   return p.forget();
 }
@@ -135,13 +157,118 @@
 already_AddRefed<Promise> MediaDevices::GetDisplayMedia(
     const DisplayMediaStreamConstraints& aConstraints, CallerType aCallerType,
     ErrorResult& aRv) {
-  RefPtr<Promise> p = Promise::Create(GetParentObject(), aRv);
+  nsCOMPtr<nsIGlobalObject> global = xpc::NativeGlobal(GetWrapper());
+  RefPtr<Promise> p = Promise::Create(global, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
+  nsCOMPtr<nsPIDOMWindowInner> owner = do_QueryInterface(global);
+  /* If the relevant global object of this does not have transient activation,
+   * return a promise rejected with a DOMException object whose name attribute
+   * has the value InvalidStateError. */
+  Document* doc = owner->GetExtantDoc();
+  if (NS_WARN_IF(!doc)) {
+    p->MaybeRejectWithSecurityError("No document.");
+    return p.forget();
+  }
+  if (!doc->HasBeenUserGestureActivated()) {
+    p->MaybeRejectWithInvalidStateError(
+        "getDisplayMedia must be called from a user gesture handler.");
+    return p.forget();
+  }
+  /* If constraints.video is false, return a promise rejected with a newly
+   * created TypeError. */
+  if (!MediaManager::IsOn(aConstraints.mVideo)) {
+    p->MaybeRejectWithTypeError("video is required");
+    return p.forget();
+  }
+  MediaStreamConstraints c;
+  auto& vc = c.mVideo.SetAsMediaTrackConstraints();
+
+  if (aConstraints.mVideo.IsMediaTrackConstraints()) {
+    vc = aConstraints.mVideo.GetAsMediaTrackConstraints();
+    /* If CS contains a member named advanced, return a promise rejected with
+     * a newly created TypeError. */
+    if (vc.mAdvanced.WasPassed()) {
+      p->MaybeRejectWithTypeError("advanced not allowed");
+      return p.forget();
+    }
+    auto getCLR = [](const auto& aCon) -> const ConstrainLongRange& {
+      static ConstrainLongRange empty;
+      return (aCon.WasPassed() && !aCon.Value().IsLong())
+                 ? aCon.Value().GetAsConstrainLongRange()
+                 : empty;
+    };
+    auto getCDR = [](auto&& aCon) -> const ConstrainDoubleRange& {
+      static ConstrainDoubleRange empty;
+      return (aCon.WasPassed() && !aCon.Value().IsDouble())
+                 ? aCon.Value().GetAsConstrainDoubleRange()
+                 : empty;
+    };
+    const auto& w = getCLR(vc.mWidth);
+    const auto& h = getCLR(vc.mHeight);
+    const auto& f = getCDR(vc.mFrameRate);
+    /* If CS contains a member whose name specifies a constrainable property
+     * applicable to display surfaces, and whose value in turn is a dictionary
+     * containing a member named either min or exact, return a promise
+     * rejected with a newly created TypeError. */
+    if (w.mMin.WasPassed() || h.mMin.WasPassed() || f.mMin.WasPassed()) {
+      p->MaybeRejectWithTypeError("min not allowed");
+      return p.forget();
+    }
+    if (w.mExact.WasPassed() || h.mExact.WasPassed() || f.mExact.WasPassed()) {
+      p->MaybeRejectWithTypeError("exact not allowed");
+      return p.forget();
+    }
+    /* If CS contains a member whose name, failedConstraint specifies a
+     * constrainable property, constraint, applicable to display surfaces, and
+     * whose value in turn is a dictionary containing a member named max, and
+     * that member's value in turn is less than the constrainable property's
+     * floor value, then let failedConstraint be the name of the constraint,
+     * let message be either undefined or an informative human-readable
+     * message, and return a promise rejected with a new OverconstrainedError
+     * created by calling OverconstrainedError(failedConstraint, message). */
+    // We fail early without incurring a prompt, on known-to-fail constraint
+    // values that don't reveal anything about the user's system.
+    const char* badConstraint = nullptr;
+    if (w.mMax.WasPassed() && w.mMax.Value() < 1) {
+      badConstraint = "width";
+    }
+    if (h.mMax.WasPassed() && h.mMax.Value() < 1) {
+      badConstraint = "height";
+    }
+    if (f.mMax.WasPassed() && f.mMax.Value() < 1) {
+      badConstraint = "frameRate";
+    }
+    if (badConstraint) {
+      p->MaybeReject(MakeRefPtr<dom::MediaStreamError>(
+          owner, *MakeRefPtr<MediaMgrError>(
+                     MediaMgrError::Name::OverconstrainedError, "",
+                     NS_ConvertASCIItoUTF16(badConstraint))));
+      return p.forget();
+    }
+  }
+  /* If the relevant settings object's responsible document is NOT fully
+   * active, return a promise rejected with a DOMException object whose name
+   * attribute has the value "InvalidStateError". */
+  if (!owner->IsFullyActive()) {
+    p->MaybeRejectWithInvalidStateError("The document is not fully active.");
+    return p.forget();
+  }
+  // We ask for "screen" sharing.
+  //
+  // If this is a privileged call or permission is disabled, this gives us full
+  // screen sharing by default, which is useful for internal testing.
+  //
+  // If this is a non-priviliged call, GetUserMedia() will change it to "window"
+  // for us.
+  vc.mMediaSource.Reset();
+  vc.mMediaSource.Construct().AssignASCII(
+      dom::MediaSourceEnumValues::GetString(MediaSourceEnum::Screen));
+
   RefPtr<MediaDevices> self(this);
   MediaManager::Get()
-      ->GetDisplayMedia(GetOwner(), aConstraints, aCallerType)
+      ->GetUserMedia(owner, c, aCallerType)
       ->Then(
           GetCurrentSerialEventTarget(), __func__,
           [this, self, p](RefPtr<DOMMediaStream>&& aStream) {
@@ -155,7 +282,7 @@
             if (!window) {
               return;  // leave promise pending after navigation.
             }
-            p->MaybeReject(MakeRefPtr<MediaStreamError>(window, *error));
+            error->Reject(p);
           });
   return p.forget();
 }
diff -Nru firefox-84.0.2+build1/dom/media/MediaFormatReader.cpp firefox-85.0+build1/dom/media/MediaFormatReader.cpp
--- firefox-84.0.2+build1/dom/media/MediaFormatReader.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaFormatReader.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -42,15 +42,6 @@
   DDMOZ_LOG(sFormatDecoderLog, mozilla::LogLevel::Verbose, "::%s: " arg, \
             __func__, ##__VA_ARGS__)
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define MEDIA_FORMAT_READER_STATUS_MARKER(tag, text, markerTime)           \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(tag, MEDIA_PLAYBACK, TextMarkerPayload, \
-                                     (text, markerTime))
-#else
-#  define MEDIA_FORMAT_READER_STATUS_MARKER(tag, text, markerTime)
-#endif
-
 #define NS_DispatchToMainThread(...) CompileError_UseAbstractMainThreadInstead
 
 namespace mozilla {
@@ -1627,10 +1618,9 @@
             break;
           case MediaData::Type::RAW_DATA:
             DDLOGPR(DDLogCategory::Log,
-                    aTrack == TrackInfo::kAudioTrack
-                        ? "decoded_audio"
-                        : aTrack == TrackInfo::kVideoTrack ? "decoded_video"
-                                                           : "decoded_?",
+                    aTrack == TrackInfo::kAudioTrack   ? "decoded_audio"
+                    : aTrack == TrackInfo::kVideoTrack ? "decoded_video"
+                                                       : "decoded_?",
                     "{\"type\":\"RawData\", \"offset\":%" PRIi64
                     " \"time_us\":%" PRIi64 ", \"timecode_us\":%" PRIi64
                     ", \"duration_us\":%" PRIi64 ", \"kf\":%s}",
@@ -1641,10 +1631,9 @@
             break;
           case MediaData::Type::NULL_DATA:
             DDLOGPR(DDLogCategory::Log,
-                    aTrack == TrackInfo::kAudioTrack
-                        ? "decoded_audio"
-                        : aTrack == TrackInfo::kVideoTrack ? "decoded_video"
-                                                           : "decoded_?",
+                    aTrack == TrackInfo::kAudioTrack   ? "decoded_audio"
+                    : aTrack == TrackInfo::kVideoTrack ? "decoded_video"
+                                                       : "decoded_?",
                     "{\"type\":\"NullData\", \"offset\":%" PRIi64
                     " \"time_us\":%" PRIi64 ", \"timecode_us\":%" PRIi64
                     ", \"duration_us\":%" PRIi64 ", \"kf\":%s}",
@@ -1854,9 +1843,9 @@
   RefPtr<MediaFormatReader> self = this;
   decoder.mFlushed = false;
   DDLOGPR(DDLogCategory::Log,
-          aTrack == TrackInfo::kAudioTrack
-              ? "decode_audio"
-              : aTrack == TrackInfo::kVideoTrack ? "decode_video" : "decode_?",
+          aTrack == TrackInfo::kAudioTrack   ? "decode_audio"
+          : aTrack == TrackInfo::kVideoTrack ? "decode_video"
+                                             : "decode_?",
           "{\"type\":\"MediaRawData\", \"offset\":%" PRIi64
           ", \"bytes\":%zu, \"time_us\":%" PRIi64 ", \"timecode_us\":%" PRIi64
           ", \"duration_us\":%" PRIi64 ",%s%s}",
@@ -1933,8 +1922,7 @@
     nsPrintfCString markerString(
         "%s stream id changed from:%" PRIu32 " to:%" PRIu32,
         TrackTypeToStr(aTrack), decoder.mLastStreamSourceID, info->GetID());
-    MEDIA_FORMAT_READER_STATUS_MARKER("StreamID Change", markerString,
-                                      TimeStamp::NowUnfuzzed());
+    PROFILER_MARKER_TEXT("StreamID Change", MEDIA_PLAYBACK, {}, markerString);
     LOG("%s", markerString.get());
 
     if (aTrack == TrackInfo::kVideoTrack) {
@@ -3152,6 +3140,5 @@
 }  // namespace mozilla
 
 #undef NS_DispatchToMainThread
-#undef MEDIA_FORMAT_READER_STATUS_MARKER
 #undef LOGV
 #undef LOG
diff -Nru firefox-84.0.2+build1/dom/media/MediaFormatReader.h firefox-85.0+build1/dom/media/MediaFormatReader.h
--- firefox-84.0.2+build1/dom/media/MediaFormatReader.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaFormatReader.h	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #  include "MediaMetadataManager.h"
 #  include "MediaPromiseDefs.h"
 #  include "PDMFactory.h"
+#  include "PlatformDecoderModule.h"
 #  include "SeekTarget.h"
 #  include "mozilla/Atomics.h"
 #  include "mozilla/Maybe.h"
diff -Nru firefox-84.0.2+build1/dom/media/MediaManager.cpp firefox-85.0+build1/dom/media/MediaManager.cpp
--- firefox-84.0.2+build1/dom/media/MediaManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1184,10 +1184,6 @@
   return mSource->GetMediaSource();
 }
 
-static bool IsOn(const OwningBooleanOrMediaTrackConstraints& aUnion) {
-  return !aUnion.IsBoolean() || aUnion.GetAsBoolean();
-}
-
 static const MediaTrackConstraints& GetInvariant(
     const OwningBooleanOrMediaTrackConstraints& aUnion) {
   static const MediaTrackConstraints empty;
@@ -1302,7 +1298,7 @@
         audioTrackSource = new LocalTrackSource(
             principal, audioDeviceName, mSourceListener,
             mAudioDevice->GetMediaSource(), track, mPeerIdentity);
-        MOZ_ASSERT(IsOn(mConstraints.mAudio));
+        MOZ_ASSERT(MediaManager::IsOn(mConstraints.mAudio));
         RefPtr<MediaStreamTrack> domTrack = new dom::AudioStreamTrack(
             window, track, audioTrackSource, dom::MediaStreamTrackState::Live,
             false, GetInvariant(mConstraints.mAudio));
@@ -1316,7 +1312,7 @@
       videoTrackSource = new LocalTrackSource(
           principal, videoDeviceName, mSourceListener,
           mVideoDevice->GetMediaSource(), track, mPeerIdentity);
-      MOZ_ASSERT(IsOn(mConstraints.mVideo));
+      MOZ_ASSERT(MediaManager::IsOn(mConstraints.mVideo));
       RefPtr<MediaStreamTrack> domTrack = new dom::VideoStreamTrack(
           window, track, videoTrackSource, dom::MediaStreamTrackState::Live,
           false, GetInvariant(mConstraints.mVideo));
@@ -1340,7 +1336,7 @@
 
       mHolder.Reject(MakeRefPtr<MediaMgrError>(
                          MediaMgrError::Name::AbortError,
-                         sHasShutdown ? u"In shutdown"_ns : u"No stream."_ns),
+                         sHasShutdown ? "In shutdown"_ns : "No stream."_ns),
                      __func__);
       return NS_OK;
     }
@@ -1379,7 +1375,7 @@
                         return SourceListener::SourceListenerPromise::
                             CreateAndReject(MakeRefPtr<MediaMgrError>(
                                                 MediaMgrError::Name::AbortError,
-                                                u"In shutdown"_ns),
+                                                "In shutdown"),
                                             __func__);
                       });
               return resolvePromise;
@@ -1568,7 +1564,7 @@
     }
   }
 
-  void Fail(MediaMgrError::Name aName, const nsString& aMessage = u""_ns,
+  void Fail(MediaMgrError::Name aName, const nsCString& aMessage = ""_ns,
             const nsString& aConstraint = u""_ns) {
     NS_DispatchToMainThread(NS_NewRunnableFunction(
         "GetUserMediaTask::Fail",
@@ -1639,11 +1635,10 @@
     if (errorMsg) {
       LOG("%s %" PRIu32, errorMsg, static_cast<uint32_t>(rv));
       if (badConstraint) {
-        Fail(MediaMgrError::Name::OverconstrainedError, u""_ns,
+        Fail(MediaMgrError::Name::OverconstrainedError, ""_ns,
              NS_ConvertUTF8toUTF16(badConstraint));
       } else {
-        Fail(MediaMgrError::Name::NotReadableError,
-             NS_ConvertUTF8toUTF16(errorMsg));
+        Fail(MediaMgrError::Name::NotReadableError, nsCString(errorMsg));
       }
       NS_DispatchToMainThread(
           NS_NewRunnableFunction("MediaManager::SendPendingGUMRequest", []() {
@@ -1668,7 +1663,7 @@
   }
 
   nsresult Denied(MediaMgrError::Name aName,
-                  const nsString& aMessage = u""_ns) {
+                  const nsCString& aMessage = ""_ns) {
     // We add a disabled listener to the StreamListeners array until accepted
     // If this was the only active MediaStream, remove the window from the list.
     if (NS_IsMainThread()) {
@@ -1951,10 +1946,9 @@
     // Need to ask permission to retrieve list of all devices;
     // notify frontend observer and wait for callback notification to post task.
     const char16_t* const type =
-        (aVideoInputType != MediaSourceEnum::Camera)
-            ? u"audio"
-            : (aAudioInputType != MediaSourceEnum::Microphone) ? u"video"
-                                                               : u"all";
+        (aVideoInputType != MediaSourceEnum::Camera)       ? u"audio"
+        : (aAudioInputType != MediaSourceEnum::Microphone) ? u"video"
+                                                           : u"all";
     nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
     obs->NotifyObservers(static_cast<nsIRunnable*>(task),
                          "getUserMedia:ask-device-permission", type);
@@ -2248,7 +2242,7 @@
             if (!MediaManager::GetIfExists()) {
               return MgrPromise::CreateAndReject(
                   MakeRefPtr<MediaMgrError>(MediaMgrError::Name::AbortError,
-                                            u"In shutdown"_ns),
+                                            "In shutdown"),
                   __func__);
             }
             return EnumerateRawDevices(
@@ -2337,7 +2331,7 @@
 static void ReduceConstraint(
     OwningBooleanOrMediaTrackConstraints& aConstraint) {
   // Not requesting stream.
-  if (!IsOn(aConstraint)) {
+  if (!MediaManager::IsOn(aConstraint)) {
     return;
   }
 
@@ -2376,26 +2370,10 @@
 
   MediaStreamConstraints c(aConstraintsPassedIn);  // use a modifiable copy
 
-  // Do all the validation we can while we're sync (to return an
-  // already-rejected promise on failure).
-
-  if (!IsOn(c.mVideo) && !IsOn(c.mAudio)) {
-    return StreamPromise::CreateAndReject(
-        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
-                                  u"audio and/or video is required"_ns),
-        __func__);
-  }
-
-  if (!aWindow->IsFullyActive()) {
-    return StreamPromise::CreateAndReject(
-        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::InvalidStateError),
-        __func__);
-  }
-
   if (sHasShutdown) {
     return StreamPromise::CreateAndReject(
         MakeRefPtr<MediaMgrError>(MediaMgrError::Name::AbortError,
-                                  u"In shutdown"_ns),
+                                  "In shutdown"),
         __func__);
   }
 
@@ -2506,7 +2484,7 @@
       default: {
         return StreamPromise::CreateAndReject(
             MakeRefPtr<MediaMgrError>(MediaMgrError::Name::OverconstrainedError,
-                                      u""_ns, u"mediaSource"_ns),
+                                      "", u"mediaSource"_ns),
             __func__);
       }
     }
@@ -2584,7 +2562,7 @@
       default: {
         return StreamPromise::CreateAndReject(
             MakeRefPtr<MediaMgrError>(MediaMgrError::Name::OverconstrainedError,
-                                      u""_ns, u"mediaSource"_ns),
+                                      "", u"mediaSource"_ns),
             __func__);
       }
     }
@@ -2775,7 +2753,7 @@
               windowListener->Remove(sourceListener);
               return StreamPromise::CreateAndReject(
                   MakeRefPtr<MediaMgrError>(
-                      MediaMgrError::Name::OverconstrainedError, u""_ns,
+                      MediaMgrError::Name::OverconstrainedError, "",
                       constraint),
                   __func__);
             }
@@ -2866,107 +2844,6 @@
           });
 };
 
-RefPtr<MediaManager::StreamPromise> MediaManager::GetDisplayMedia(
-    nsPIDOMWindowInner* aWindow,
-    const DisplayMediaStreamConstraints& aConstraintsPassedIn,
-    CallerType aCallerType) {
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aWindow);
-  Document* doc = aWindow->GetExtantDoc();
-  if (NS_WARN_IF(!doc)) {
-    return StreamPromise::CreateAndReject(
-        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::SecurityError),
-        __func__);
-  }
-
-  if (!doc->HasBeenUserGestureActivated()) {
-    return StreamPromise::CreateAndReject(
-        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::InvalidStateError,
-                                  u"getDisplayMedia must be called from a user "
-                                  u"gesture handler."_ns),
-        __func__);
-  }
-
-  if (!IsOn(aConstraintsPassedIn.mVideo)) {
-    return StreamPromise::CreateAndReject(
-        MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
-                                  u"video is required"_ns),
-        __func__);
-  }
-
-  MediaStreamConstraints c;
-  auto& vc = c.mVideo.SetAsMediaTrackConstraints();
-
-  if (aConstraintsPassedIn.mVideo.IsMediaTrackConstraints()) {
-    vc = aConstraintsPassedIn.mVideo.GetAsMediaTrackConstraints();
-    if (vc.mAdvanced.WasPassed()) {
-      return StreamPromise::CreateAndReject(
-          MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
-                                    u"advanced not allowed"_ns),
-          __func__);
-    }
-    auto getCLR = [](const auto& aCon) -> const ConstrainLongRange& {
-      static ConstrainLongRange empty;
-      return (aCon.WasPassed() && !aCon.Value().IsLong())
-                 ? aCon.Value().GetAsConstrainLongRange()
-                 : empty;
-    };
-    auto getCDR = [](auto&& aCon) -> const ConstrainDoubleRange& {
-      static ConstrainDoubleRange empty;
-      return (aCon.WasPassed() && !aCon.Value().IsDouble())
-                 ? aCon.Value().GetAsConstrainDoubleRange()
-                 : empty;
-    };
-    const auto& w = getCLR(vc.mWidth);
-    const auto& h = getCLR(vc.mHeight);
-    const auto& f = getCDR(vc.mFrameRate);
-    if (w.mMin.WasPassed() || h.mMin.WasPassed() || f.mMin.WasPassed()) {
-      return StreamPromise::CreateAndReject(
-          MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
-                                    u"min not allowed"_ns),
-          __func__);
-    }
-    if (w.mExact.WasPassed() || h.mExact.WasPassed() || f.mExact.WasPassed()) {
-      return StreamPromise::CreateAndReject(
-          MakeRefPtr<MediaMgrError>(MediaMgrError::Name::TypeError,
-                                    u"exact not allowed"_ns),
-          __func__);
-    }
-    // As a UA optimization, we fail early without incurring a prompt, on
-    // known-to-fail constraint values that don't reveal anything about the
-    // user's system.
-    const char* badConstraint = nullptr;
-    if (w.mMax.WasPassed() && w.mMax.Value() < 1) {
-      badConstraint = "width";
-    }
-    if (h.mMax.WasPassed() && h.mMax.Value() < 1) {
-      badConstraint = "height";
-    }
-    if (f.mMax.WasPassed() && f.mMax.Value() < 1) {
-      badConstraint = "frameRate";
-    }
-    if (badConstraint) {
-      return StreamPromise::CreateAndReject(
-          MakeRefPtr<MediaMgrError>(MediaMgrError::Name::OverconstrainedError,
-                                    u""_ns,
-                                    NS_ConvertASCIItoUTF16(badConstraint)),
-          __func__);
-    }
-  }
-  // We ask for "screen" sharing.
-  //
-  // If this is a privileged call or permission is disabled, this gives us full
-  // screen sharing by default, which is useful for internal testing.
-  //
-  // If this is a non-priviliged call, GetUserMedia() will change it to "window"
-  // for us.
-  vc.mMediaSource.Reset();
-  vc.mMediaSource.Construct().AssignASCII(
-      dom::MediaSourceEnumValues::GetString(MediaSourceEnum::Screen));
-
-  return MediaManager::GetUserMedia(aWindow, c, aCallerType);
-}
-
 /* static */
 void MediaManager::AnonymizeDevices(MediaDeviceSet& aDevices,
                                     const nsACString& aOriginKey,
@@ -3184,7 +3061,7 @@
   if (sHasShutdown) {
     return DevicesPromise::CreateAndReject(
         MakeRefPtr<MediaMgrError>(MediaMgrError::Name::AbortError,
-                                  u"In shutdown"_ns),
+                                  "In shutdown"),
         __func__);
   }
   uint64_t windowId = aWindow->WindowID();
@@ -3888,7 +3765,7 @@
     }
 
     if (sHasShutdown) {
-      return task->Denied(MediaMgrError::Name::AbortError, u"In shutdown"_ns);
+      return task->Denied(MediaMgrError::Name::AbortError, "In shutdown"_ns);
     }
     // Reuse the same thread to save memory.
     MediaManager::Dispatch(task.forget());
@@ -4205,7 +4082,7 @@
                    rv = audioDevice->Start();
                  }
                  if (NS_FAILED(rv)) {
-                   nsString log;
+                   nsCString log;
                    if (rv == NS_ERROR_NOT_AVAILABLE) {
                      log.AssignLiteral("Concurrent mic process limit.");
                      aHolder.Reject(
@@ -4230,10 +4107,9 @@
                        MOZ_ASSERT_UNREACHABLE("Stopping audio failed");
                      }
                    }
-                   nsString log;
-                   log.AssignLiteral("Starting video failed");
                    aHolder.Reject(MakeRefPtr<MediaMgrError>(
-                                      MediaMgrError::Name::AbortError, log),
+                                      MediaMgrError::Name::AbortError,
+                                      "Starting video failed"),
                                   __func__);
                    return;
                  }
@@ -4372,42 +4248,18 @@
   }
 }
 
-static bool SameGroupAsCurrentAudioOutput(const nsString& aGroupId) {
-  CubebDeviceEnumerator* enumerator = CubebDeviceEnumerator::GetInstance();
-  // Get the current graph's device info. This is always the
-  // default audio output device for now.
-  RefPtr<AudioDeviceInfo> outputDevice =
-      enumerator->DefaultDevice(CubebDeviceEnumerator::Side::OUTPUT);
-  return outputDevice && outputDevice->GroupID().Equals(aGroupId);
-}
-
 auto SourceListener::UpdateDevice(MediaTrack* aTrack, bool aOn)
     -> RefPtr<DeviceOperationPromise> {
   MOZ_ASSERT(NS_IsMainThread());
   RefPtr<SourceListener> self = this;
   DeviceState& state = GetDeviceStateFor(aTrack);
-  nsString groupId;
-  state.mDevice->GetRawGroupId(groupId);
 
   return MediaManager::Dispatch<DeviceOperationPromise>(
              __func__,
-             [self, device = state.mDevice, aOn,
-              groupId](MozPromiseHolder<DeviceOperationPromise>& h) {
-               if (device->mKind == dom::MediaDeviceKind::Audioinput && !aOn &&
-                   SameGroupAsCurrentAudioOutput(groupId)) {
-                 // Don't turn off the microphone of a device that is on the
-                 // same physical device as the output.
-                 //
-                 // Also don't take this branch when turning on, in case the
-                 // default audio output device has changed. The AudioInput
-                 // source start/stop are idempotent, so this works.
-                 LOG("Not turning device off, as it matches audio output (%s)",
-                     NS_ConvertUTF16toUTF8(groupId).get());
-                 h.Resolve(NS_OK, __func__);
-                 return;
-               }
+             [self, device = state.mDevice,
+              aOn](MozPromiseHolder<DeviceOperationPromise>& h) {
                LOG("Turning %s device (%s)", aOn ? "on" : "off",
-                   NS_ConvertUTF16toUTF8(groupId).get());
+                   NS_ConvertUTF16toUTF8(device->mName).get());
                h.Resolve(aOn ? device->Start() : device->Stop(), __func__);
              })
       ->Then(
@@ -4612,9 +4464,9 @@
   } else {
     aTrackSource->Unmute();
   }
-  if (state.mOffWhileDisabled && !state.mDeviceEnabled &&
-      state.mDevice->mKind == dom::MediaDeviceKind::Videoinput) {
-    // Camera is already off. TODO: Revisit once we support UA-muting mics.
+  if (!state.mOffWhileDisabled || !state.mDeviceEnabled) {
+    // If the pref to turn the underlying device is itself off, or the device is
+    // already off, it's unecessary to do anything else.
     return;
   }
   UpdateDevice(track, !aMute);
@@ -4774,7 +4626,7 @@
           }
 
           aHolder.Reject(MakeRefPtr<MediaMgrError>(
-                             MediaMgrError::Name::OverconstrainedError, u""_ns,
+                             MediaMgrError::Name::OverconstrainedError, "",
                              NS_ConvertASCIItoUTF16(badConstraint)),
                          __func__);
           return;
diff -Nru firefox-84.0.2+build1/dom/media/MediaManager.h firefox-85.0+build1/dom/media/MediaManager.h
--- firefox-84.0.2+build1/dom/media/MediaManager.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaManager.h	2021-01-18 19:58:09.000000000 +0000
@@ -192,6 +192,9 @@
   bool IsWindowListenerStillActive(
       const RefPtr<GetUserMediaWindowListener>& aListener);
 
+  static bool IsOn(const dom::OwningBooleanOrMediaTrackConstraints& aUnion) {
+    return !aUnion.IsBoolean() || aUnion.GetAsBoolean();
+  }
   typedef dom::NavigatorUserMediaSuccessCallback GetUserMediaSuccessCallback;
   typedef dom::NavigatorUserMediaErrorCallback GetUserMediaErrorCallback;
 
@@ -230,11 +233,6 @@
   nsresult EnumerateDevices(nsPIDOMWindowInner* aWindow,
                             dom::Promise& aPromise);
 
-  RefPtr<StreamPromise> GetDisplayMedia(
-      nsPIDOMWindowInner* aWindow,
-      const dom::DisplayMediaStreamConstraints& aConstraintsPassedIn,
-      dom::CallerType aCallerType);
-
   // Get the sink that corresponds to the given device id.
   // It is resposible to check if an application is
   // authorized to play audio through the requested device.
diff -Nru firefox-84.0.2+build1/dom/media/MediaPlaybackDelayPolicy.cpp firefox-85.0+build1/dom/media/MediaPlaybackDelayPolicy.cpp
--- firefox-84.0.2+build1/dom/media/MediaPlaybackDelayPolicy.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaPlaybackDelayPolicy.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 #include "MediaPlaybackDelayPolicy.h"
 
 #include "nsPIDOMWindow.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/StaticPrefs_media.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/MediaRecorder.cpp firefox-85.0+build1/dom/media/MediaRecorder.cpp
--- firefox-84.0.2+build1/dom/media/MediaRecorder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaRecorder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -37,6 +37,7 @@
 #include "nsIScriptError.h"
 #include "nsMimeTypes.h"
 #include "nsProxyRelease.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
 
 mozilla::LazyLogModule gMediaRecorderLog("MediaRecorder");
diff -Nru firefox-84.0.2+build1/dom/media/MediaResult.h firefox-85.0+build1/dom/media/MediaResult.h
--- firefox-84.0.2+build1/dom/media/MediaResult.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaResult.h	2021-01-18 19:58:09.000000000 +0000
@@ -55,16 +55,9 @@
                            mMessage.IsEmpty() ? "" : " - ", mMessage.get());
   }
 
-  void SetGPUCrashTimeStamp(const TimeStamp& aTime) {
-    mGPUCrashTimeStamp = aTime;
-  }
-  const TimeStamp& GPUCrashTimeStamp() const { return mGPUCrashTimeStamp; }
-
  private:
   nsresult mCode;
   nsCString mMessage;
-  TimeStamp
-      mGPUCrashTimeStamp;  // Used in bug 1393399 for temporary telemetry usage.
 };
 
 #ifdef _MSC_VER
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/MediaMetadata.cpp firefox-85.0+build1/dom/media/mediasession/MediaMetadata.cpp
--- firefox-84.0.2+build1/dom/media/mediasession/MediaMetadata.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/MediaMetadata.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MediaMetadata.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/ToJSValue.h"
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/MediaMetadata.h firefox-85.0+build1/dom/media/mediasession/MediaMetadata.h
--- firefox-84.0.2+build1/dom/media/mediasession/MediaMetadata.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/MediaMetadata.h	2021-01-18 19:58:09.000000000 +0000
@@ -11,13 +11,14 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/MediaSessionBinding.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MediaMetadataBase {
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/MediaSession.cpp firefox-85.0+build1/dom/media/mediasession/MediaSession.cpp
--- firefox-84.0.2+build1/dom/media/mediasession/MediaSession.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/MediaSession.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/ContentMediaController.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MediaSession.h"
 #include "mozilla/dom/MediaControlUtils.h"
 #include "mozilla/dom/WindowContext.h"
@@ -92,25 +93,17 @@
 MediaMetadata* MediaSession::GetMetadata() const { return mMediaMetadata; }
 
 void MediaSession::SetMetadata(MediaMetadata* aMetadata) {
-  MOZ_ASSERT(mSessionDocState == SessionDocStatus::eActive);
   mMediaMetadata = aMetadata;
   NotifyMetadataUpdated();
 }
 
 void MediaSession::SetPlaybackState(
     const MediaSessionPlaybackState& aPlaybackState) {
-  MOZ_ASSERT(mSessionDocState == SessionDocStatus::eActive);
   if (mDeclaredPlaybackState == aPlaybackState) {
     return;
   }
   mDeclaredPlaybackState = aPlaybackState;
-
-  RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
-  MOZ_ASSERT(currentBC,
-             "Update session playback state after context destroyed!");
-  if (RefPtr<IMediaInfoUpdater> updater = ContentMediaAgent::Get(currentBC)) {
-    updater->SetDeclaredPlaybackState(currentBC->Id(), mDeclaredPlaybackState);
-  }
+  NotifyPlaybackStateUpdated();
 }
 
 MediaSessionPlaybackState MediaSession::PlaybackState() const {
@@ -119,7 +112,6 @@
 
 void MediaSession::SetActionHandler(MediaSessionAction aAction,
                                     MediaSessionActionHandler* aHandler) {
-  MOZ_ASSERT(mSessionDocState == SessionDocStatus::eActive);
   MOZ_ASSERT(size_t(aAction) < ArrayLength(mActionHandlers));
   // If the media session changes its supported action, then we would propagate
   // this information to the chrome process in order to run the media session
@@ -142,7 +134,6 @@
 
 void MediaSession::SetPositionState(const MediaPositionState& aState,
                                     ErrorResult& aRv) {
-  MOZ_ASSERT(mSessionDocState == SessionDocStatus::eActive);
   // https://w3c.github.io/mediasession/#dom-mediasession-setpositionstate
   // If the state is an empty dictionary then clear the position state.
   if (!aState.IsAnyMemberPresent()) {
@@ -251,12 +242,51 @@
   }
   if (aState == SessionDocStatus::eActive) {
     updater->NotifySessionCreated(currentBC->Id());
+    // If media session set its attributes before its document becomes active,
+    // then we would notify those attributes which hasn't been notified as well
+    // because attributes update would only happen if its document is already
+    // active.
+    NotifyMediaSessionAttributes();
   } else {
     updater->NotifySessionDestroyed(currentBC->Id());
   }
 }
 
+void MediaSession::NotifyMediaSessionAttributes() {
+  MOZ_ASSERT(mSessionDocState == SessionDocStatus::eActive);
+  if (mDeclaredPlaybackState != MediaSessionPlaybackState::None) {
+    NotifyPlaybackStateUpdated();
+  }
+  if (mMediaMetadata) {
+    NotifyMetadataUpdated();
+  }
+  for (size_t idx = 0; idx < ArrayLength(mActionHandlers); idx++) {
+    MediaSessionAction action = static_cast<MediaSessionAction>(idx);
+    if (mActionHandlers[action]) {
+      NotifyEnableSupportedAction(action);
+    }
+  }
+  if (mPositionState) {
+    NotifyPositionStateChanged();
+  }
+}
+
+void MediaSession::NotifyPlaybackStateUpdated() {
+  if (mSessionDocState != SessionDocStatus::eActive) {
+    return;
+  }
+  RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
+  MOZ_ASSERT(currentBC,
+             "Update session playback state after context destroyed!");
+  if (RefPtr<IMediaInfoUpdater> updater = ContentMediaAgent::Get(currentBC)) {
+    updater->SetDeclaredPlaybackState(currentBC->Id(), mDeclaredPlaybackState);
+  }
+}
+
 void MediaSession::NotifyMetadataUpdated() {
+  if (mSessionDocState != SessionDocStatus::eActive) {
+    return;
+  }
   RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
   MOZ_ASSERT(currentBC, "Update session metadata after context destroyed!");
 
@@ -270,6 +300,9 @@
 }
 
 void MediaSession::NotifyEnableSupportedAction(MediaSessionAction aAction) {
+  if (mSessionDocState != SessionDocStatus::eActive) {
+    return;
+  }
   RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
   MOZ_ASSERT(currentBC, "Update action after context destroyed!");
   if (RefPtr<IMediaInfoUpdater> updater = ContentMediaAgent::Get(currentBC)) {
@@ -278,6 +311,9 @@
 }
 
 void MediaSession::NotifyDisableSupportedAction(MediaSessionAction aAction) {
+  if (mSessionDocState != SessionDocStatus::eActive) {
+    return;
+  }
   RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
   MOZ_ASSERT(currentBC, "Update action after context destroyed!");
   if (RefPtr<IMediaInfoUpdater> updater = ContentMediaAgent::Get(currentBC)) {
@@ -286,6 +322,9 @@
 }
 
 void MediaSession::NotifyPositionStateChanged() {
+  if (mSessionDocState != SessionDocStatus::eActive) {
+    return;
+  }
   RefPtr<BrowsingContext> currentBC = GetParentObject()->GetBrowsingContext();
   MOZ_ASSERT(currentBC, "Update action after context destroyed!");
   if (RefPtr<IMediaInfoUpdater> updater = ContentMediaAgent::Get(currentBC)) {
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/MediaSession.h firefox-85.0+build1/dom/media/mediasession/MediaSession.h
--- firefox-84.0.2+build1/dom/media/mediasession/MediaSession.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/MediaSession.h	2021-01-18 19:58:09.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/MediaMetadata.h"
 #include "mozilla/dom/MediaSessionBinding.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/EnumeratedArray.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIDocumentActivity.h"
@@ -21,6 +20,8 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 // https://w3c.github.io/mediasession/#position-state
@@ -92,6 +93,8 @@
   // These methods are used to propagate media session's status to the chrome
   // process.
   void NotifyMediaSessionDocStatus(SessionDocStatus aState);
+  void NotifyMediaSessionAttributes();
+  void NotifyPlaybackStateUpdated();
   void NotifyMetadataUpdated();
   void NotifyEnableSupportedAction(MediaSessionAction aAction);
   void NotifyDisableSupportedAction(MediaSessionAction aAction);
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/MediaSessionIPCUtils.h firefox-85.0+build1/dom/media/mediasession/MediaSessionIPCUtils.h
--- firefox-84.0.2+build1/dom/media/mediasession/MediaSessionIPCUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/MediaSessionIPCUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -5,7 +5,7 @@
 #ifndef DOM_MEDIA_MEDIASESSION_MEDIASESSIONIPCUTILS_H_
 #define DOM_MEDIA_MEDIASESSION_MEDIASESSIONIPCUTILS_H_
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "MediaMetadata.h"
 #include "mozilla/dom/MediaSession.h"
 #include "mozilla/dom/MediaSessionBinding.h"
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/moz.build firefox-85.0+build1/dom/media/mediasession/moz.build
--- firefox-84.0.2+build1/dom/media/mediasession/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/moz.build	2021-01-18 19:58:09.000000000 +0000
@@ -17,6 +17,8 @@
     "MediaSession.cpp",
 ]
 
+CRASHTEST_MANIFESTS += ["test/crashtests/crashtests.list"]
+
 include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js firefox-85.0+build1/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js
--- firefox-84.0.2+build1/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/test/browser_active_mediasession_among_tabs.js	2021-01-18 19:58:10.000000000 +0000
@@ -23,8 +23,8 @@
  */
 add_task(async function testActiveSessionWhenClosingTab() {
   info(`open tab1 and load media session test page`);
-  const tab1 = await createTabAndLoad(PAGE);
-  await startMediaPlayback(tab1);
+  const tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+  await startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab1);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -33,8 +33,8 @@
   await checkIfActionReceived(tab1, ACTION);
 
   info(`open tab2 and load media session test page`);
-  const tab2 = await createTabAndLoad(PAGE);
-  await startMediaPlayback(tab2);
+  const tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+  await startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab2);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -65,8 +65,8 @@
  */
 add_task(async function testActiveSessionWhenNavigatingTab() {
   info(`open tab1 and load media session test page`);
-  const tab1 = await createTabAndLoad(PAGE);
-  await startMediaPlayback(tab1);
+  const tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+  await startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab1);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -75,8 +75,8 @@
   await checkIfActionReceived(tab1, ACTION);
 
   info(`open tab2 and load media session test page`);
-  const tab2 = await createTabAndLoad(PAGE);
-  await startMediaPlayback(tab2);
+  const tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+  await startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab2);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -108,8 +108,8 @@
  */
 add_task(async function testCreatingSessionWithoutPlayingMedia() {
   info(`open tab1 and load media session test page`);
-  const tab1 = await createTabAndLoad(PAGE);
-  await startMediaPlayback(tab1);
+  const tab1 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
+  await startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab1);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -118,7 +118,7 @@
   await checkIfActionReceived(tab1, ACTION);
 
   info(`open tab2 and load media session test page`);
-  const tab2 = await createTabAndLoad(PAGE);
+  const tab2 = await BrowserTestUtils.openNewForegroundTab(gBrowser, PAGE);
 
   info(`pressing '${ACTION}' key`);
   MediaControlService.generateMediaControlKey(ACTION);
@@ -137,16 +137,17 @@
 /**
  * The following are helper functions
  */
-async function startMediaPlayback(tab) {
-  const controllerChanged = waitUntilMainMediaControllerChanged();
-  await SpecialPowers.spawn(tab.linkedBrowser, [], () => {
-    const video = content.document.getElementById("testVideo");
-    if (!video) {
-      ok(false, `can't get the media element!`);
-    }
-    video.play();
-  });
-  await controllerChanged;
+async function startMediaPlaybackAndWaitMedisSessionBecomeActiveSession(tab) {
+  await Promise.all([
+    BrowserUtils.promiseObserved("active-media-session-changed"),
+    SpecialPowers.spawn(tab.linkedBrowser, [], () => {
+      const video = content.document.getElementById("testVideo");
+      if (!video) {
+        ok(false, `can't get the media element!`);
+      }
+      video.play();
+    }),
+  ]);
 }
 
 async function checkIfActionReceived(tab, action) {
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/test/browser.ini firefox-85.0+build1/dom/media/mediasession/test/browser.ini
--- firefox-84.0.2+build1/dom/media/mediasession/test/browser.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/test/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -2,7 +2,6 @@
 tags = mediacontrol
 support-files =
   file_media_session.html
-  ../../mediacontrol/tests/browser/head.js
   ../../test/gizmo.mp4
 
 [browser_active_mediasession_among_tabs.js]
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/test/crashtests/crashtests.list firefox-85.0+build1/dom/media/mediasession/test/crashtests/crashtests.list
--- firefox-84.0.2+build1/dom/media/mediasession/test/crashtests/crashtests.list	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/test/crashtests/crashtests.list	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+load inactive-mediasession.html
diff -Nru firefox-84.0.2+build1/dom/media/mediasession/test/crashtests/inactive-mediasession.html firefox-85.0+build1/dom/media/mediasession/test/crashtests/inactive-mediasession.html
--- firefox-84.0.2+build1/dom/media/mediasession/test/crashtests/inactive-mediasession.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasession/test/crashtests/inactive-mediasession.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,16 @@
+<html>
+<head></head>
+<script>
+const frame = document.createElementNS('http://www.w3.org/1999/xhtml', 'frame');
+document.documentElement.appendChild(frame);
+
+const windowPointer = frame.contentWindow;
+document.documentElement.replaceWith();
+
+// Setting attributes on inactive media session should not cause crash.
+windowPointer.navigator.mediaSession.setActionHandler('nexttrack', null);
+windowPointer.navigator.mediaSession.playbackState = "playing";
+windowPointer.navigator.mediaSession.setPositionState();
+windowPointer.navigator.mediaSession.metadata = null;
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/mediasink/AudioSink.cpp firefox-85.0+build1/dom/media/mediasink/AudioSink.cpp
--- firefox-84.0.2+build1/dom/media/mediasink/AudioSink.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasink/AudioSink.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,28 +12,11 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/ProfilerMarkerTypes.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "nsPrintfCString.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define PROFILER_AUDIO_MARKER(tag, sample)                              \
-    do {                                                                  \
-      uint64_t startTime = (sample)->mTime.ToMicroseconds();              \
-      uint64_t endTime = (sample)->GetEndTime().ToMicroseconds();         \
-      auto profilerTag = (tag);                                           \
-      mOwnerThread->Dispatch(NS_NewRunnableFunction(                      \
-          "AudioSink:AddMarker", [profilerTag, startTime, endTime] {      \
-            PROFILER_ADD_MARKER_WITH_PAYLOAD(profilerTag, MEDIA_PLAYBACK, \
-                                             MediaSampleMarkerPayload,    \
-                                             (startTime, endTime));       \
-          }));                                                            \
-    } while (0)
-#else
-#  define PROFILER_AUDIO_MARKER(tag, sample)
-#endif
-
 namespace mozilla {
 
 extern LazyLogModule gMediaDecoderLog;
@@ -271,7 +254,16 @@
   SINK_LOG_V("playing audio at time=%" PRId64 " offset=%u length=%u",
              mCurrentData->mTime.ToMicroseconds(),
              mCurrentData->Frames() - mCursor->Available(), framesToPop);
-  PROFILER_AUDIO_MARKER("PlayAudio", mCurrentData);
+
+#ifdef MOZ_GECKO_PROFILER
+  mOwnerThread->Dispatch(NS_NewRunnableFunction(
+      "AudioSink:AddMarker",
+      [startTime = mCurrentData->mTime.ToMicroseconds(),
+       endTime = mCurrentData->GetEndTime().ToMicroseconds()] {
+        PROFILER_MARKER("PlayAudio", MEDIA_PLAYBACK, {}, MediaSampleMarker,
+                        startTime, endTime);
+      }));
+#endif  // MOZ_GECKO_PROFILER
 
   UniquePtr<AudioStream::Chunk> chunk =
       MakeUnique<Chunk>(mCurrentData, framesToPop, mCursor->Ptr());
diff -Nru firefox-84.0.2+build1/dom/media/mediasink/VideoSink.cpp firefox-85.0+build1/dom/media/mediasink/VideoSink.cpp
--- firefox-84.0.2+build1/dom/media/mediasink/VideoSink.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasink/VideoSink.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,10 +12,12 @@
 
 #include "VideoSink.h"
 
+#include "GeckoProfiler.h"
 #include "MediaQueue.h"
 #include "VideoUtils.h"
 
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/ProfilerMarkerTypes.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_media.h"
 
@@ -29,15 +31,6 @@
 #define VSINK_LOG_V(x, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Verbose, (FMT(x, ##__VA_ARGS__)))
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define VSINK_ADD_PROFILER_MARKER(tag, startTime, endTime) \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(                        \
-        tag, MEDIA_PLAYBACK, MediaSampleMarkerPayload, (startTime, endTime))
-#else
-#  define VSINK_ADD_PROFILER_MARKER(tag, startTime, endTime)
-#endif
-
 namespace mozilla {
 
 using namespace mozilla::layers;
@@ -463,8 +456,9 @@
                 frame->mTime.ToMicroseconds(), frame->mFrameID,
                 VideoQueue().GetSize());
     if (!wasSent) {
-      VSINK_ADD_PROFILER_MARKER("PlayVideo", frame->mTime.ToMicroseconds(),
-                                frame->GetEndTime().ToMicroseconds());
+      PROFILER_MARKER("PlayVideo", MEDIA_PLAYBACK, {}, MediaSampleMarker,
+                      frame->mTime.ToMicroseconds(),
+                      frame->GetEndTime().ToMicroseconds());
     }
   }
 
@@ -503,8 +497,9 @@
       VSINK_LOG_V("discarding video frame mTime=%" PRId64
                   " clock_time=%" PRId64,
                   frame->mTime.ToMicroseconds(), clockTime.ToMicroseconds());
-      VSINK_ADD_PROFILER_MARKER("DiscardVideo", frame->mTime.ToMicroseconds(),
-                                frame->GetEndTime().ToMicroseconds());
+      PROFILER_MARKER("DiscardVideo", MEDIA_PLAYBACK, {}, MediaSampleMarker,
+                      frame->mTime.ToMicroseconds(),
+                      frame->GetEndTime().ToMicroseconds());
     }
   }
 
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/MediaSourceDemuxer.cpp firefox-85.0+build1/dom/media/mediasource/MediaSourceDemuxer.cpp
--- firefox-84.0.2+build1/dom/media/mediasource/MediaSourceDemuxer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/MediaSourceDemuxer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -253,15 +253,15 @@
                   VorbisDataDecoder::IsVorbis(
                       mParent->GetTrackInfo(mType)->mMimeType)
               ? 80000
-              : mParent->GetTrackInfo(mType)->mMimeType.EqualsLiteral(
-                    "audio/mp4a-latm")
-                    // AAC encoder delay is by default 2112 audio frames.
-                    // See
-                    // https://developer.apple.com/library/content/documentation/QuickTime/QTFF/QTFFAppenG/QTFFAppenG.html
-                    // So we always seek 2112 frames
-                    ? (2112 * 1000000ULL /
-                       mParent->GetTrackInfo(mType)->GetAsAudioInfo()->mRate)
-                    : 0)) {}
+          : mParent->GetTrackInfo(mType)->mMimeType.EqualsLiteral(
+                "audio/mp4a-latm")
+              // AAC encoder delay is by default 2112 audio frames.
+              // See
+              // https://developer.apple.com/library/content/documentation/QuickTime/QTFF/QTFFAppenG/QTFFAppenG.html
+              // So we always seek 2112 frames
+              ? (2112 * 1000000ULL /
+                 mParent->GetTrackInfo(mType)->GetAsAudioInfo()->mRate)
+              : 0)) {}
 
 UniquePtr<TrackInfo> MediaSourceTrackDemuxer::GetInfo() const {
   return mParent->GetTrackInfo(mType)->Clone();
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid2.mp4 and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/init-trackid2.mp4 differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid2.mp4^headers^ firefox-85.0+build1/dom/media/mediasource/test/init-trackid2.mp4^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid2.mp4^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/init-trackid2.mp4^headers^	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid3.mp4 and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/init-trackid3.mp4 differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid3.mp4^headers^ firefox-85.0+build1/dom/media/mediasource/test/init-trackid3.mp4^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/init-trackid3.mp4^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/init-trackid3.mp4^headers^	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/mochitest.ini firefox-85.0+build1/dom/media/mediasource/test/mochitest.ini
--- firefox-84.0.2+build1/dom/media/mediasource/test/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -49,6 +49,9 @@
   tags_before_cluster.webm
   tags_before_cluster.webm^header^
   1516754.webm 1516754.webm^headers^
+  init-trackid2.mp4 init-trackid3.mp4 segment-2.0001.m4s segment-2.0002.m4s segment-3.0001.m4s segment-3.0002.m4s
+  init-trackid2.mp4^headers^ init-trackid3.mp4^headers^ segment-2.0001.m4s^headers^ segment-2.0002.m4s^headers^
+  segment-3.0001.m4s^headers^ segment-3.0002.m4s^headers^
 
 [test_AbortAfterPartialMediaSegment.html]
 [test_AppendPartialInitSegment.html]
@@ -143,6 +146,7 @@
 skip-if = toolkit == 'android' # Not supported on android
 [test_TimestampOffset_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
+[test_trackidchange_mp4.html]
 [test_TruncatedDuration.html]
 [test_TruncatedDuration_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0001.m4s and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/segment-2.0001.m4s differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0001.m4s^headers^ firefox-85.0+build1/dom/media/mediasource/test/segment-2.0001.m4s^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0001.m4s^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/segment-2.0001.m4s^headers^	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0002.m4s and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/segment-2.0002.m4s differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0002.m4s^headers^ firefox-85.0+build1/dom/media/mediasource/test/segment-2.0002.m4s^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/segment-2.0002.m4s^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/segment-2.0002.m4s^headers^	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0001.m4s and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/segment-3.0001.m4s differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0001.m4s^headers^ firefox-85.0+build1/dom/media/mediasource/test/segment-3.0001.m4s^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0001.m4s^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/segment-3.0001.m4s^headers^	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0002.m4s and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/mediasource/test/segment-3.0002.m4s differ
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0002.m4s^headers^ firefox-85.0+build1/dom/media/mediasource/test/segment-3.0002.m4s^headers^
--- firefox-84.0.2+build1/dom/media/mediasource/test/segment-3.0002.m4s^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/segment-3.0002.m4s^headers^	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1 @@
+Cache-Control: no-store
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/test/test_trackidchange_mp4.html firefox-85.0+build1/dom/media/mediasource/test/test_trackidchange_mp4.html
--- firefox-84.0.2+build1/dom/media/mediasource/test/test_trackidchange_mp4.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/test/test_trackidchange_mp4.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>MSE: test append of audio with similar init segments that have different track ids</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="mediasource.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+runWithMSE(async (ms, el) => {
+  el.controls = true;
+  await once(ms, "sourceopen");
+  ok(true, "Receive a sourceopen event");
+  const audiosb = ms.addSourceBuffer("audio/mp4");
+  await fetchAndLoad(audiosb, "init-trackid2", [''], ".mp4");
+  await fetchAndLoad(audiosb, "segment-2.0001", [''], ".m4s");
+  await fetchAndLoad(audiosb, "init-trackid3", [''], ".mp4");
+  await fetchAndLoad(audiosb, "segment-3.0002", [''], ".m4s");
+  is(el.buffered.length, 1, "data is buffered");
+  is(el.buffered.end(0), 8, "all data got appended");
+  SimpleTest.finish();
+});
+
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/mediasource/TrackBuffersManager.cpp firefox-85.0+build1/dom/media/mediasource/TrackBuffersManager.cpp
--- firefox-84.0.2+build1/dom/media/mediasource/TrackBuffersManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mediasource/TrackBuffersManager.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1392,10 +1392,9 @@
       MutexAutoLock mut(mMutex);
       mInfo = info;
     }
-
-    // We now have a valid init data ; we can store it for later use.
-    mInitData = mParser->InitData();
   }
+  // We now have a valid init data ; we can store it for later use.
+  mInitData = mParser->InitData();
 
   // We have now completed the changeType operation.
   mChangeTypeReceived = false;
diff -Nru firefox-84.0.2+build1/dom/media/MediaStreamError.cpp firefox-85.0+build1/dom/media/MediaStreamError.cpp
--- firefox-84.0.2+build1/dom/media/MediaStreamError.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaStreamError.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,11 +6,12 @@
 
 #include "MediaStreamError.h"
 #include "mozilla/dom/MediaStreamErrorBinding.h"
+#include "mozilla/dom/Promise.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
 
-BaseMediaMgrError::BaseMediaMgrError(Name aName, const nsAString& aMessage,
+BaseMediaMgrError::BaseMediaMgrError(Name aName, const nsACString& aMessage,
                                      const nsAString& aConstraint)
     : mMessage(aMessage), mConstraint(aConstraint), mName(aName) {
 #define MAP_MEDIAERR(name, msg) \
@@ -28,7 +29,6 @@
                    "or the platform in the current context."),
       MAP_MEDIAERR(NotFoundError, "The object can not be found here."),
       MAP_MEDIAERR(NotReadableError, "The I/O read operation failed."),
-      MAP_MEDIAERR(NotSupportedError, "The operation is not supported."),
       MAP_MEDIAERR(OverconstrainedError, "Constraints could be not satisfied."),
       MAP_MEDIAERR(SecurityError, "The operation is insecure."),
       MAP_MEDIAERR(TypeError, ""),
@@ -47,12 +47,42 @@
 
 NS_IMPL_ISUPPORTS0(MediaMgrError)
 
-namespace dom {
+void MediaMgrError::Reject(dom::Promise* aPromise) {
+  switch (mName) {
+    case Name::AbortError:
+      aPromise->MaybeRejectWithAbortError(mMessage);
+      return;
+    case Name::InvalidStateError:
+      aPromise->MaybeRejectWithInvalidStateError(mMessage);
+      return;
+    case Name::NotAllowedError:
+      aPromise->MaybeRejectWithNotAllowedError(mMessage);
+      return;
+    case Name::NotFoundError:
+      aPromise->MaybeRejectWithNotFoundError(mMessage);
+      return;
+    case Name::NotReadableError:
+      aPromise->MaybeRejectWithNotReadableError(mMessage);
+      return;
+    case Name::OverconstrainedError: {
+      // TODO: Add OverconstrainedError type.
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1453013
+      nsCOMPtr<nsPIDOMWindowInner> window =
+          do_QueryInterface(aPromise->GetGlobalObject());
+      aPromise->MaybeReject(MakeRefPtr<dom::MediaStreamError>(window, *this));
+      return;
+    }
+    case Name::SecurityError:
+      aPromise->MaybeRejectWithSecurityError(mMessage);
+      return;
+    case Name::TypeError:
+      aPromise->MaybeRejectWithTypeError(mMessage);
+      return;
+      // -Wswitch ensures all cases are covered so don't add default:.
+  }
+}
 
-MediaStreamError::MediaStreamError(nsPIDOMWindowInner* aParent, Name aName,
-                                   const nsAString& aMessage,
-                                   const nsAString& aConstraint)
-    : BaseMediaMgrError(aName, aMessage, aConstraint), mParent(aParent) {}
+namespace dom {
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MediaStreamError, mParent)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(MediaStreamError)
@@ -71,7 +101,7 @@
 void MediaStreamError::GetName(nsAString& aName) const { aName = mNameString; }
 
 void MediaStreamError::GetMessage(nsAString& aMessage) const {
-  aMessage = mMessage;
+  CopyUTF8toUTF16(mMessage, aMessage);
 }
 
 void MediaStreamError::GetConstraint(nsAString& aConstraint) const {
diff -Nru firefox-84.0.2+build1/dom/media/MediaStreamError.h firefox-85.0+build1/dom/media/MediaStreamError.h
--- firefox-84.0.2+build1/dom/media/MediaStreamError.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaStreamError.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_MediaStreamError_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
 #include "nsPIDOMWindow.h"
@@ -42,31 +41,38 @@
     NotAllowedError,
     NotFoundError,
     NotReadableError,
-    NotSupportedError,
     OverconstrainedError,
     SecurityError,
     TypeError,
   };
 
  protected:
-  BaseMediaMgrError(Name aName, const nsAString& aMessage,
+  BaseMediaMgrError(Name aName, const nsACString& aMessage,
                     const nsAString& aConstraint);
 
  public:
   nsString mNameString;
-  nsString mMessage;
+  nsCString mMessage;
   const nsString mConstraint;
   const Name mName;
 };
 
 class MediaMgrError final : public nsISupports, public BaseMediaMgrError {
  public:
-  explicit MediaMgrError(Name aName, const nsAString& aMessage = u""_ns,
+  // aMessage should be valid UTF-8, but invalid UTF-8 byte sequences are
+  // replaced with the REPLACEMENT CHARACTER on conversion to UTF-16.
+  explicit MediaMgrError(Name aName, const nsACString& aMessage = ""_ns,
                          const nsAString& aConstraint = u""_ns)
       : BaseMediaMgrError(aName, aMessage, aConstraint) {}
+  template <int N>
+  explicit MediaMgrError(Name aName, const char (&aMessage)[N],
+                         const nsAString& aConstraint = u""_ns)
+      : BaseMediaMgrError(aName, nsLiteralCString(aMessage), aConstraint) {}
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
+  void Reject(dom::Promise* aPromise);
+
  private:
   ~MediaMgrError() = default;
 };
@@ -76,10 +82,6 @@
                                public BaseMediaMgrError,
                                public nsWrapperCache {
  public:
-  MediaStreamError(nsPIDOMWindowInner* aParent, Name aName,
-                   const nsAString& aMessage = u""_ns,
-                   const nsAString& aConstraint = u""_ns);
-
   MediaStreamError(nsPIDOMWindowInner* aParent, const BaseMediaMgrError& aOther)
       : BaseMediaMgrError(aOther.mName, aOther.mMessage, aOther.mConstraint),
         mParent(aParent) {}
diff -Nru firefox-84.0.2+build1/dom/media/MediaStreamTrack.cpp firefox-85.0+build1/dom/media/MediaStreamTrack.cpp
--- firefox-84.0.2+build1/dom/media/MediaStreamTrack.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaStreamTrack.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -50,8 +50,7 @@
     const dom::MediaTrackConstraints& aConstraints, CallerType aCallerType)
     -> RefPtr<ApplyConstraintsPromise> {
   return ApplyConstraintsPromise::CreateAndReject(
-      MakeRefPtr<MediaMgrError>(MediaMgrError::Name::OverconstrainedError,
-                                u""_ns),
+      MakeRefPtr<MediaMgrError>(MediaMgrError::Name::OverconstrainedError, ""),
       __func__);
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/MediaTrackGraph.cpp firefox-85.0+build1/dom/media/MediaTrackGraph.cpp
--- firefox-84.0.2+build1/dom/media/MediaTrackGraph.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaTrackGraph.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -1342,7 +1342,7 @@
   MOZ_ASSERT(OnGraphThread());
   if (mForceShutDownReceived) {
     for (MediaTrack* track : AllTracks()) {
-      track->NotifyForcedShutdown();
+      track->OnGraphThreadDone();
     }
   }
   {
@@ -1365,17 +1365,17 @@
   return false;
 }
 
-auto MediaTrackGraphImpl::OneIteration(GraphTime aStateEnd,
+auto MediaTrackGraphImpl::OneIteration(GraphTime aStateTime,
                                        GraphTime aIterationEnd,
                                        AudioMixer* aMixer) -> IterationResult {
   if (mGraphRunner) {
-    return mGraphRunner->OneIteration(aStateEnd, aIterationEnd, aMixer);
+    return mGraphRunner->OneIteration(aStateTime, aIterationEnd, aMixer);
   }
 
-  return OneIterationImpl(aStateEnd, aIterationEnd, aMixer);
+  return OneIterationImpl(aStateTime, aIterationEnd, aMixer);
 }
 
-auto MediaTrackGraphImpl::OneIterationImpl(GraphTime aStateEnd,
+auto MediaTrackGraphImpl::OneIterationImpl(GraphTime aStateTime,
                                            GraphTime aIterationEnd,
                                            AudioMixer* aMixer)
     -> IterationResult {
@@ -1406,14 +1406,14 @@
     NS_ProcessPendingEvents(nullptr);
   }
 
-  GraphTime stateEnd = std::min(aStateEnd, GraphTime(mEndTime));
-  UpdateGraph(stateEnd);
+  GraphTime stateTime = std::min(aStateTime, GraphTime(mEndTime));
+  UpdateGraph(stateTime);
 
-  mStateComputedTime = stateEnd;
+  mStateComputedTime = stateTime;
 
   GraphTime oldProcessedTime = mProcessedTime;
   Process(aMixer);
-  MOZ_ASSERT(mProcessedTime == stateEnd);
+  MOZ_ASSERT(mProcessedTime == stateTime);
 
   UpdateCurrentTimeForTracks(oldProcessedTime);
 
@@ -2037,13 +2037,16 @@
   class Message : public ControlMessage {
    public:
     explicit Message(MediaTrack* aTrack) : ControlMessage(aTrack) {}
-    void Run() override {
+    void RunDuringShutdown() override {
       mTrack->RemoveAllResourcesAndListenersImpl();
       auto graph = mTrack->GraphImpl();
       mTrack->DestroyImpl();
       graph->RemoveTrackGraphThread(mTrack);
     }
-    void RunDuringShutdown() override { Run(); }
+    void Run() override {
+      mTrack->OnGraphThreadDone();
+      RunDuringShutdown();
+    }
   };
   // Keep a reference to the graph, since Message might RunDuringShutdown()
   // synchronously and make GraphImpl() invalid.
@@ -2435,7 +2438,7 @@
   mUpdateTrack->mData = UniquePtr<MediaSegment>(mSegment->CreateEmptyClone());
   mUpdateTrack->mEnded = false;
   mUpdateTrack->mPullingEnabled = false;
-  mUpdateTrack->mInForcedShutdown = false;
+  mUpdateTrack->mGraphThreadDone = false;
 }
 
 void SourceMediaTrack::DestroyImpl() {
@@ -2649,9 +2652,7 @@
   MutexAutoLock lock(mMutex);
   MOZ_DIAGNOSTIC_ASSERT(aSegment->GetType() == mType);
   TrackTime appended = 0;
-  auto graph = GraphImpl();
-  if (!mUpdateTrack || mUpdateTrack->mEnded ||
-      mUpdateTrack->mInForcedShutdown || !graph) {
+  if (!mUpdateTrack || mUpdateTrack->mEnded || mUpdateTrack->mGraphThreadDone) {
     aSegment->Clear();
     return appended;
   }
@@ -2673,6 +2674,7 @@
   appended = aSegment->GetDuration();
   mUpdateTrack->mData->AppendFrom(aSegment);  // note: aSegment is now dead
   {
+    auto graph = GraphImpl();
     MonitorAutoLock lock(graph->GetMonitor());
     if (graph->CurrentDriver()) {  // graph has not completed forced shutdown
       graph->EnsureNextIteration();
@@ -3095,7 +3097,7 @@
 }
 
 #ifdef DEBUG
-bool MediaTrackGraphImpl::InDriverIteration(GraphDriver* aDriver) {
+bool MediaTrackGraphImpl::InDriverIteration(const GraphDriver* aDriver) const {
   return aDriver->OnThread() ||
          (mGraphRunner && mGraphRunner->InDriverIteration(aDriver));
 }
@@ -3447,7 +3449,8 @@
       // ControlMessage.
       MediaTrackGraphImpl* graphImpl = mMediaTrack->GraphImpl();
       if (graphImpl->CurrentDriver()->AsAudioCallbackDriver() &&
-          graphImpl->CurrentDriver()->ThreadRunning()) {
+          graphImpl->CurrentDriver()->ThreadRunning() &&
+          !graphImpl->CurrentDriver()->AsAudioCallbackDriver()->OnFallback()) {
         // Avoid Resolve's locking on the graph thread by doing it on main.
         graphImpl->Dispatch(NS_NewRunnableFunction(
             "MediaTrackGraphImpl::NotifyWhenGraphStarted::Resolver",
diff -Nru firefox-84.0.2+build1/dom/media/MediaTrackGraph.h firefox-85.0+build1/dom/media/MediaTrackGraph.h
--- firefox-84.0.2+build1/dom/media/MediaTrackGraph.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaTrackGraph.h	2021-01-18 19:58:09.000000000 +0000
@@ -505,9 +505,9 @@
   virtual void DecrementSuspendCount();
 
  protected:
-  // Called on graph thread before handing control to the main thread to
-  // release tracks.
-  virtual void NotifyForcedShutdown() {}
+  // Called on graph thread either during destroy handling or before handing
+  // graph control to the main thread to release tracks.
+  virtual void OnGraphThreadDone() {}
 
   // |AdvanceTimeVaryingValuesToCurrentTime| will be override in
   // SourceMediaTrack.
@@ -715,8 +715,9 @@
     bool mEnded;
     // True if the producer of this track is having data pulled by the graph.
     bool mPullingEnabled;
-    // True if the graph has notified this track of forced shutdown.
-    bool mInForcedShutdown;
+    // True if the graph has notified this track that it will not be used
+    // again on the graph thread.
+    bool mGraphThreadDone;
   };
 
   bool NeedsMixing();
@@ -735,12 +736,12 @@
    */
   void NotifyDirectConsumers(MediaSegment* aSegment);
 
-  void NotifyForcedShutdown() override {
+  void OnGraphThreadDone() override {
     MutexAutoLock lock(mMutex);
     if (!mUpdateTrack) {
       return;
     }
-    mUpdateTrack->mInForcedShutdown = true;
+    mUpdateTrack->mGraphThreadDone = true;
     if (!mUpdateTrack->mData) {
       return;
     }
diff -Nru firefox-84.0.2+build1/dom/media/MediaTrackGraphImpl.h firefox-85.0+build1/dom/media/MediaTrackGraphImpl.h
--- firefox-84.0.2+build1/dom/media/MediaTrackGraphImpl.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/MediaTrackGraphImpl.h	2021-01-18 19:58:09.000000000 +0000
@@ -131,7 +131,7 @@
    * True if we're on aDriver's thread, or if we're on mGraphRunner's thread
    * and mGraphRunner is currently run by aDriver.
    */
-  bool InDriverIteration(GraphDriver* aDriver) override;
+  bool InDriverIteration(const GraphDriver* aDriver) const override;
 #endif
 
   /**
@@ -222,14 +222,14 @@
    * OneIterationImpl is called directly. Output from the graph gets mixed into
    * aMixer, if it is non-null.
    */
-  IterationResult OneIteration(GraphTime aStateEnd, GraphTime aIterationEnd,
+  IterationResult OneIteration(GraphTime aStateTime, GraphTime aIterationEnd,
                                AudioMixer* aMixer) override;
 
   /**
    * Returns true if this MediaTrackGraph should keep running
    */
-  IterationResult OneIterationImpl(GraphTime aStateEnd, GraphTime aIterationEnd,
-                                   AudioMixer* aMixer);
+  IterationResult OneIterationImpl(GraphTime aStateTime,
+                                   GraphTime aIterationEnd, AudioMixer* aMixer);
 
   /**
    * Called from the driver, when the graph thread is about to stop, to tell
diff -Nru firefox-84.0.2+build1/dom/media/mp3/MP3Demuxer.cpp firefox-85.0+build1/dom/media/mp3/MP3Demuxer.cpp
--- firefox-84.0.2+build1/dom/media/mp3/MP3Demuxer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp3/MP3Demuxer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -450,7 +450,7 @@
           numSuccFrames);
       mFrameLock = true;
       return candidateFrame;
-    } else if (prevFrame.mStart == mParser.ID3Header().TotalTagSize() &&
+    } else if (prevFrame.mStart == mParser.TotalID3HeaderSize() &&
                currentFrame.mEnd == StreamLength()) {
       // We accept streams with only two frames if both frames are valid. This
       // is to handle very short files and provide parity with Chrome. See
@@ -521,7 +521,7 @@
       // this parsing session with, we need to discount the ID3 tag size only
       // if we were looking for one during the current frame parsing session.
       if (searchingForID3) {
-        maxSkippableBytes += mParser.ID3Header().TotalTagSize();
+        maxSkippableBytes += mParser.TotalID3HeaderSize();
       }
     } else if (mFrameLock) {
       // We've found a valid MPEG stream, so don't impose any limits
diff -Nru firefox-84.0.2+build1/dom/media/mp3/MP3FrameParser.cpp firefox-85.0+build1/dom/media/mp3/MP3FrameParser.cpp
--- firefox-84.0.2+build1/dom/media/mp3/MP3FrameParser.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp3/MP3FrameParser.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -68,6 +68,10 @@
   return mID3Parser.Header();
 }
 
+uint32_t FrameParser::TotalID3HeaderSize() const {
+  return mID3Parser.TotalHeadersSize();
+}
+
 const FrameParser::VBRHeader& FrameParser::VBRInfo() const {
   return mVBRHeader;
 }
@@ -77,12 +81,12 @@
   MOZ_ASSERT(aReader && aBytesToSkip);
   *aBytesToSkip = 0;
 
-  if (!mID3Parser.Header().HasSizeBeenSet() && !mFirstFrame.Length()) {
+  if (ID3Parser::IsBufferStartingWithID3Tag(aReader) && !mFirstFrame.Length()) {
     // No MP3 frames have been parsed yet, look for ID3v2 headers at file begin.
     // ID3v1 tags may only be at file end.
     // TODO: should we try to read ID3 tags at end of file/mid-stream, too?
     const size_t prevReaderOffset = aReader->Offset();
-    const uint32_t tagSize = mID3Parser.Parse(aReader).unwrapOr(0);
+    const uint32_t tagSize = mID3Parser.Parse(aReader);
     if (!!tagSize) {
       // ID3 tag found, skip past it.
       const uint32_t skipSize = tagSize - ID3Parser::ID3Header::SIZE;
@@ -540,18 +544,64 @@
 static const uint8_t MAX_MAJOR_VER = 4;
 }  // namespace id3_header
 
-Result<uint32_t, nsresult> ID3Parser::Parse(BufferReader* aReader) {
+/* static */
+bool ID3Parser::IsBufferStartingWithID3Tag(BufferReader* aReader) {
+  mozilla::Result<uint32_t, nsresult> res = aReader->PeekU24();
+  if (res.isErr()) {
+    return false;
+  }
+  // If buffer starts with ID3v2 tag, `rv` would be reverse and its content
+  // should be '3' 'D' 'I' from the lowest bit.
+  uint32_t rv = res.unwrap();
+  for (int idx = id3_header::ID_LEN - 1; idx >= 0; idx--) {
+    if ((rv & 0xff) != id3_header::ID[idx]) {
+      return false;
+    }
+    rv = rv >> 8;
+  }
+  return true;
+}
+
+uint32_t ID3Parser::Parse(BufferReader* aReader) {
   MOZ_ASSERT(aReader);
+  MOZ_ASSERT(ID3Parser::IsBufferStartingWithID3Tag(aReader));
+
+  if (!mHeader.HasSizeBeenSet()) {
+    return ParseInternal(aReader);
+  }
 
+  // Encounter another possible ID3 header, if that is valid then we would use
+  // it and save the size of previous one in order to report the size of all ID3
+  // headers together in `TotalHeadersSize()`.
+  ID3Header prevHeader = mHeader;
+  mHeader.Reset();
+  uint32_t size = ParseInternal(aReader);
+  if (!size) {
+    // next ID3 is invalid, so revert the header.
+    mHeader = prevHeader;
+    return size;
+  }
+
+  mFormerID3Size += prevHeader.TotalTagSize();
+  return size;
+}
+
+uint32_t ID3Parser::ParseInternal(BufferReader* aReader) {
   for (auto res = aReader->ReadU8();
        res.isOk() && !mHeader.ParseNext(res.unwrap());
        res = aReader->ReadU8()) {
   }
-
   return mHeader.TotalTagSize();
 }
 
-void ID3Parser::Reset() { mHeader.Reset(); }
+void ID3Parser::Reset() {
+  mHeader.Reset();
+  mFormerID3Size = 0;
+}
+
+uint32_t ID3Parser::TotalHeadersSize() const {
+  return mHeader.TotalTagSize() + mFormerID3Size;
+}
 
 const ID3Parser::ID3Header& ID3Parser::Header() const { return mHeader; }
 
diff -Nru firefox-84.0.2+build1/dom/media/mp3/MP3FrameParser.h firefox-85.0+build1/dom/media/mp3/MP3FrameParser.h
--- firefox-84.0.2+build1/dom/media/mp3/MP3FrameParser.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp3/MP3FrameParser.h	2021-01-18 19:58:09.000000000 +0000
@@ -16,7 +16,7 @@
 // ID3 header parser state machine used by FrameParser.
 // The header contains the following format (one byte per term):
 // 'I' 'D' '3' MajorVersion MinorVersion Flags Size1 Size2 Size3 Size4
-// For more details see http://id3.org/id3v2.3.0.
+// For more details see https://id3.org/id3v2.4.0-structure
 class ID3Parser {
  public:
   // Holds the ID3 header and its parsing state.
@@ -80,19 +80,31 @@
     int mPos;
   };
 
+  // Check if the buffer is starting with ID3v2 tag.
+  static bool IsBufferStartingWithID3Tag(BufferReader* aReader);
+
   // Returns the parsed ID3 header. Note: check for validity.
   const ID3Header& Header() const;
 
+  // Returns the size of all parsed ID3 headers.
+  uint32_t TotalHeadersSize() const;
+
   // Parses contents of given BufferReader for a valid ID3v2 header.
-  // Returns the total ID3v2 tag size if successful and zero otherwise.
-  Result<uint32_t, nsresult> Parse(BufferReader* aReader);
+  // Returns the parsed ID3v2 tag size if successful and zero otherwise.
+  uint32_t Parse(BufferReader* aReader);
 
   // Resets the state to allow for a new parsing session.
   void Reset();
 
  private:
+  uint32_t ParseInternal(BufferReader* aReader);
+
   // The currently parsed ID3 header. Reset via Reset, updated via Parse.
   ID3Header mHeader;
+  // If a file contains multiple ID3 headers, then we would only select the
+  // latest one, but keep the size of former abandoned in order to return the
+  // correct size offset.
+  uint32_t mFormerID3Size = 0;
 };
 
 // MPEG audio frame parser.
@@ -298,6 +310,9 @@
   // Returns the parsed ID3 header. Note: check for validity.
   const ID3Parser::ID3Header& ID3Header() const;
 
+  // Returns the size of all parsed ID3 headers.
+  uint32_t TotalID3HeaderSize() const;
+
   // Returns the parsed VBR header info. Note: check for validity by type.
   const VBRHeader& VBRInfo() const;
 
diff -Nru firefox-84.0.2+build1/dom/media/mp4/Index.h firefox-85.0+build1/dom/media/mp4/Index.h
--- firefox-84.0.2+build1/dom/media/mp4/Index.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp4/Index.h	2021-01-18 19:58:09.000000000 +0000
@@ -9,7 +9,7 @@
 #include "MediaData.h"
 #include "MediaResource.h"
 #include "MoofParser.h"
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 #include "MP4Interval.h"
 #include "nsISupportsImpl.h"
 #include "TimeUnits.h"
diff -Nru firefox-84.0.2+build1/dom/media/mp4/MP4Decoder.cpp firefox-85.0+build1/dom/media/mp4/MP4Decoder.cpp
--- firefox-84.0.2+build1/dom/media/mp4/MP4Decoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp4/MP4Decoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "MP4Demuxer.h"
 #include "MediaContainerType.h"
 #include "PDMFactory.h"
+#include "PlatformDecoderModule.h"
 #include "VideoUtils.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/gfx/Tools.h"
diff -Nru firefox-84.0.2+build1/dom/media/mp4/MP4Metadata.cpp firefox-85.0+build1/dom/media/mp4/MP4Metadata.cpp
--- firefox-84.0.2+build1/dom/media/mp4/MP4Metadata.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/mp4/MP4Metadata.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -336,7 +336,7 @@
           ("track codec %s (%u)\n", codecString, codecType));
 #endif
 
-  // This specialization interface is crazy.
+  // This specialization interface is wild.
   UniquePtr<mozilla::TrackInfo> e;
   switch (aType) {
     case TrackInfo::TrackType::kAudioTrack: {
diff -Nru firefox-84.0.2+build1/dom/media/PeerConnectionIdp.jsm firefox-85.0+build1/dom/media/PeerConnectionIdp.jsm
--- firefox-84.0.2+build1/dom/media/PeerConnectionIdp.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/PeerConnectionIdp.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -1,4 +1,3 @@
-/* jshint moz:true, browser:true */
 /* 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/. */
diff -Nru firefox-84.0.2+build1/dom/media/PeerConnection.jsm firefox-85.0+build1/dom/media/PeerConnection.jsm
--- firefox-84.0.2+build1/dom/media/PeerConnection.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/PeerConnection.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -1,4 +1,3 @@
-/* jshint moz:true, browser:true */
 /* 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/. */
diff -Nru firefox-84.0.2+build1/dom/media/platforms/agnostic/DAV1DDecoder.h firefox-85.0+build1/dom/media/platforms/agnostic/DAV1DDecoder.h
--- firefox-84.0.2+build1/dom/media/platforms/agnostic/DAV1DDecoder.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/agnostic/DAV1DDecoder.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #  include "PlatformDecoderModule.h"
 #  include "dav1d/dav1d.h"
+#  include "nsRefPtrHashtable.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp firefox-85.0+build1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
--- firefox-84.0.2+build1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "GMPVideoHost.h"
 #include "MediaData.h"
 #include "mozilla/EndianUtils.h"
+#include "nsServiceManagerUtils.h"
 #include "AnnexB.h"
 #include "MP4Decoder.h"
 #include "prsystem.h"
diff -Nru firefox-84.0.2+build1/dom/media/platforms/android/AndroidDataEncoder.cpp firefox-85.0+build1/dom/media/platforms/android/AndroidDataEncoder.cpp
--- firefox-84.0.2+build1/dom/media/platforms/android/AndroidDataEncoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/android/AndroidDataEncoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "ImageContainer.h"
 #include "mozilla/Logging.h"
+#include "mozilla/ResultVariant.h"
 
 #include "nsMimeTypes.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/platforms/apple/AppleDecoderModule.cpp firefox-85.0+build1/dom/media/platforms/apple/AppleDecoderModule.cpp
--- firefox-84.0.2+build1/dom/media/platforms/apple/AppleDecoderModule.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/apple/AppleDecoderModule.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -139,18 +139,17 @@
       return false;
     }
 
+    // Check that we can instantiate a VP9 decoder.
     VideoInfo info(1920, 1080);
     info.mMimeType = "video/vp9";
     VPXDecoder::GetVPCCBox(info.mExtraData, VPXDecoder::VPXStreamInfo());
 
     RefPtr<AppleVTDecoder> decoder =
         new AppleVTDecoder(info, nullptr, {}, nullptr);
-    nsAutoCString reason;
     MediaResult rv = decoder->InitializeSession();
-    bool isHardwareAccelerated = decoder->IsHardwareAccelerated(reason);
     decoder->Shutdown();
 
-    return NS_SUCCEEDED(rv) && isHardwareAccelerated;
+    return NS_SUCCEEDED(rv);
   }
 
   return false;
diff -Nru firefox-84.0.2+build1/dom/media/platforms/apple/AppleVTDecoder.cpp firefox-85.0+build1/dom/media/platforms/apple/AppleVTDecoder.cpp
--- firefox-84.0.2+build1/dom/media/platforms/apple/AppleVTDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/apple/AppleVTDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -44,11 +44,9 @@
                       ? DefaultColorSpace({mPictureWidth, mPictureHeight})
                       : aConfig.mColorSpace),
       mColorRange(aConfig.mColorRange),
-      mStreamType(MP4Decoder::IsH264(aConfig.mMimeType)
-                      ? StreamType::H264
-                      : VPXDecoder::IsVP9(aConfig.mMimeType)
-                            ? StreamType::VP9
-                            : StreamType::Unknown),
+      mStreamType(MP4Decoder::IsH264(aConfig.mMimeType)  ? StreamType::H264
+                  : VPXDecoder::IsVP9(aConfig.mMimeType) ? StreamType::VP9
+                                                         : StreamType::Unknown),
       mTaskQueue(
           new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
                         "AppleVTDecoder")),
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffmpeg58/moz.build firefox-85.0+build1/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffmpeg58/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/ffmpeg58/moz.build	2021-01-18 19:58:09.000000000 +0000
@@ -27,8 +27,6 @@
   ]
 if CONFIG['MOZ_WAYLAND']:
   CXXFLAGS += CONFIG['TK_CFLAGS']
-  CXXFLAGS += CONFIG['MOZ_WAYLAND_CFLAGS']
   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-  include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -11,6 +11,10 @@
 #include "mozilla/Types.h"
 #include "PlatformDecoderModule.h"
 #include "prlink.h"
+#ifdef MOZ_WAYLAND
+#  include "mozilla/widget/DMABufLibWrapper.h"
+#  include "mozilla/StaticPrefs_media.h"
+#endif
 
 #define AV_LOG_DEBUG 48
 #define AV_LOG_INFO 32
@@ -254,6 +258,46 @@
 }
 
 #ifdef MOZ_WAYLAND
+void FFmpegLibWrapper::LinkVAAPILibs() {
+  if (widget::GetDMABufDevice()->IsDMABufVAAPIEnabled()) {
+    PRLibSpec lspec;
+    lspec.type = PR_LibSpec_Pathname;
+    const char* libDrm = "libva-drm.so.2";
+    lspec.value.pathname = libDrm;
+    mVALibDrm = PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
+    if (!mVALibDrm) {
+      FFMPEG_LOG("VA-API support: Missing or old %s library.\n", libDrm);
+    }
+
+    if (!StaticPrefs::media_ffmpeg_vaapi_drm_display_enabled()) {
+      const char* libWayland = "libva-wayland.so.2";
+      lspec.value.pathname = libWayland;
+      mVALibWayland = PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
+      if (!mVALibWayland) {
+        FFMPEG_LOG("VA-API support: Missing or old %s library.\n", libWayland);
+      }
+    }
+
+    if (mVALibWayland || mVALibDrm) {
+      const char* lib = "libva.so.2";
+      lspec.value.pathname = lib;
+      mVALib = PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
+      // Don't use libva when it's missing vaExportSurfaceHandle.
+      if (mVALib && !PR_FindSymbol(mVALib, "vaExportSurfaceHandle")) {
+        PR_UnloadLibrary(mVALib);
+        mVALib = nullptr;
+      }
+      if (!mVALib) {
+        FFMPEG_LOG("VA-API support: Missing or old %s library.\n", lib);
+      }
+    }
+  } else {
+    FFMPEG_LOG("VA-API FFmpeg is disabled by platform");
+  }
+}
+#endif
+
+#ifdef MOZ_WAYLAND
 bool FFmpegLibWrapper::IsVAAPIAvailable() {
 #  define VA_FUNC_LOADED(func) (func != nullptr)
   return VA_FUNC_LOADED(avcodec_get_hw_config) &&
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegLibWrapper.h	2021-01-18 19:58:09.000000000 +0000
@@ -56,6 +56,7 @@
 #ifdef MOZ_WAYLAND
   // Check if mVALib are available and we can use HW decode.
   bool IsVAAPIAvailable();
+  void LinkVAAPILibs();
 #endif
 
   // indicate the version of libavcodec linked to.
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,10 +9,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "FFmpegLog.h"
 #include "prlink.h"
-#ifdef MOZ_WAYLAND
-#  include "mozilla/widget/DMABufLibWrapper.h"
-#  include "mozilla/StaticPrefs_media.h"
-#endif
 
 namespace mozilla {
 
@@ -58,43 +54,7 @@
   }
 
 #ifdef MOZ_WAYLAND
-  if (widget::GetDMABufDevice()->IsDMABufVAAPIEnabled()) {
-    PRLibSpec lspec;
-    lspec.type = PR_LibSpec_Pathname;
-    const char* libDrm = "libva-drm.so.2";
-    lspec.value.pathname = libDrm;
-    sLibAV.mVALibDrm = PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
-    if (!sLibAV.mVALibDrm) {
-      FFMPEG_LOG("VA-API support: Missing or old %s library.\n", libDrm);
-    }
-
-    if (!StaticPrefs::media_ffmpeg_vaapi_drm_display_enabled()) {
-      const char* libWayland = "libva-wayland.so.2";
-      lspec.value.pathname = libWayland;
-      sLibAV.mVALibWayland =
-          PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
-      if (!sLibAV.mVALibWayland) {
-        FFMPEG_LOG("VA-API support: Missing or old %s library.\n", libWayland);
-      }
-    }
-
-    if (sLibAV.mVALibWayland || sLibAV.mVALibDrm) {
-      const char* lib = "libva.so.2";
-      lspec.value.pathname = lib;
-      sLibAV.mVALib = PR_LoadLibraryWithFlags(lspec, PR_LD_NOW | PR_LD_LOCAL);
-      // Don't use libva when it's missing vaExportSurfaceHandle.
-      if (sLibAV.mVALib &&
-          !PR_FindSymbol(sLibAV.mVALib, "vaExportSurfaceHandle")) {
-        PR_UnloadLibrary(sLibAV.mVALib);
-        sLibAV.mVALib = nullptr;
-      }
-      if (!sLibAV.mVALib) {
-        FFMPEG_LOG("VA-API support: Missing or old %s library.\n", lib);
-      }
-    }
-  } else {
-    FFMPEG_LOG("VA-API FFmpeg is disabled by platform");
-  }
+  sLibAV.LinkVAAPILibs();
 #endif
 
   // While going through all possible libs, this status will be updated with a
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -32,6 +32,8 @@
 #  define AV_PIX_FMT_NONE PIX_FMT_NONE
 #endif
 #include "mozilla/PodOperations.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TaskQueue.h"
 #include "nsThreadUtils.h"
 #include "prsystem.h"
@@ -124,8 +126,8 @@
   return AV_PIX_FMT_NONE;
 }
 
-DMABufSurfaceWrapper::DMABufSurfaceWrapper(DMABufSurface* aSurface,
-                                           FFmpegLibWrapper* aLib)
+DMABufSurfaceWrapper<LIBAV_VER>::DMABufSurfaceWrapper(DMABufSurface* aSurface,
+                                                      FFmpegLibWrapper* aLib)
     : mSurface(aSurface),
       mLib(aLib),
       mAVHWFramesContext(nullptr),
@@ -138,8 +140,8 @@
              mSurface->GetUID());
 }
 
-void DMABufSurfaceWrapper::LockVAAPIData(AVCodecContext* aAVCodecContext,
-                                         AVFrame* aAVFrame) {
+void DMABufSurfaceWrapper<LIBAV_VER>::LockVAAPIData(
+    AVCodecContext* aAVCodecContext, AVFrame* aAVFrame) {
   FFMPEG_LOG("DMABufSurfaceWrapper: VAAPI locking dmabuf surface UID = %d",
              mSurface->GetUID());
   if (aAVCodecContext && aAVFrame) {
@@ -148,7 +150,7 @@
   }
 }
 
-void DMABufSurfaceWrapper::ReleaseVAAPIData() {
+void DMABufSurfaceWrapper<LIBAV_VER>::ReleaseVAAPIData() {
   FFMPEG_LOG("DMABufSurfaceWrapper: VAAPI releasing dmabuf surface UID = %d",
              mSurface->GetUID());
   if (mHWAVBuffer && mAVHWFramesContext) {
@@ -158,7 +160,7 @@
   mSurface->ReleaseSurface();
 }
 
-DMABufSurfaceWrapper::~DMABufSurfaceWrapper() {
+DMABufSurfaceWrapper<LIBAV_VER>::~DMABufSurfaceWrapper() {
   FFMPEG_LOG("DMABufSurfaceWrapper: deleting dmabuf surface UID = %d",
              mSurface->GetUID());
   ReleaseVAAPIData();
@@ -181,7 +183,14 @@
   return nullptr;
 }
 
-class VAAPIDisplayHolder {
+template <int V>
+class VAAPIDisplayHolder {};
+
+template <>
+class VAAPIDisplayHolder<LIBAV_VER>;
+
+template <>
+class VAAPIDisplayHolder<LIBAV_VER> {
  public:
   VAAPIDisplayHolder(FFmpegLibWrapper* aLib, VADisplay aDisplay)
       : mLib(aLib), mDisplay(aDisplay){};
@@ -193,7 +202,8 @@
 };
 
 static void VAAPIDisplayReleaseCallback(struct AVHWDeviceContext* hwctx) {
-  auto displayHolder = static_cast<VAAPIDisplayHolder*>(hwctx->user_opaque);
+  auto displayHolder =
+      static_cast<VAAPIDisplayHolder<LIBAV_VER>*>(hwctx->user_opaque);
   delete displayHolder;
 }
 
@@ -229,7 +239,7 @@
     }
   }
 
-  hwctx->user_opaque = new VAAPIDisplayHolder(mLib, mDisplay);
+  hwctx->user_opaque = new VAAPIDisplayHolder<LIBAV_VER>(mLib, mDisplay);
   hwctx->free = VAAPIDisplayReleaseCallback;
 
   int major, minor;
@@ -703,7 +713,7 @@
   }
 }
 
-DMABufSurfaceWrapper*
+DMABufSurfaceWrapper<LIBAV_VER>*
 FFmpegVideoDecoder<LIBAV_VER>::GetUnusedDMABufSurfaceWrapper() {
   int len = mDMABufSurfaces.Length();
   for (int i = 0; i < len; i++) {
@@ -769,7 +779,8 @@
 
   RefPtr<DMABufSurfaceYUV> surface;
 
-  DMABufSurfaceWrapper* surfaceWrapper = GetUnusedDMABufSurfaceWrapper();
+  DMABufSurfaceWrapper<LIBAV_VER>* surfaceWrapper =
+      GetUnusedDMABufSurfaceWrapper();
   if (!surfaceWrapper) {
     if (mVAAPIDeviceContext) {
       surface = DMABufSurfaceYUV::CreateYUVSurface(vaDesc);
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h	2021-01-18 19:58:09.000000000 +0000
@@ -55,7 +55,14 @@
 // We own the DMABufSurface underlying GPU data and we use it for
 // repeated rendering of video frames.
 //
-class DMABufSurfaceWrapper final {
+template <int V>
+class DMABufSurfaceWrapper {};
+
+template <>
+class DMABufSurfaceWrapper<LIBAV_VER>;
+
+template <>
+class DMABufSurfaceWrapper<LIBAV_VER> final {
  public:
   DMABufSurfaceWrapper(DMABufSurface* aSurface, FFmpegLibWrapper* aLib);
   ~DMABufSurfaceWrapper();
@@ -162,7 +169,7 @@
                                 MediaDataDecoder::DecodedData& aResults);
 
   void ReleaseUnusedVAAPIFrames();
-  DMABufSurfaceWrapper* GetUnusedDMABufSurfaceWrapper();
+  DMABufSurfaceWrapper<LIBAV_VER>* GetUnusedDMABufSurfaceWrapper();
   void ReleaseDMABufSurfaces();
 #endif
 
@@ -180,7 +187,7 @@
   const bool mDisableHardwareDecoding;
   VADisplay mDisplay;
   bool mUseDMABufSurfaces;
-  nsTArray<DMABufSurfaceWrapper> mDMABufSurfaces;
+  nsTArray<DMABufSurfaceWrapper<LIBAV_VER>> mDMABufSurfaces;
 #endif
   RefPtr<KnowsCompositor> mImageAllocator;
   RefPtr<ImageContainer> mImageContainer;
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp firefox-85.0+build1/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -64,6 +64,10 @@
   MOZ_ASSERT(NS_IsMainThread());
   sLinkStatus = LinkStatus_FAILED;
 
+#ifdef MOZ_WAYLAND
+  sFFVPXLib.LinkVAAPILibs();
+#endif
+
   // We retrieve the path of the lgpllibs library as this is where mozavcodec
   // and mozavutil libs are located.
   PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs");
diff -Nru firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffvpx/moz.build firefox-85.0+build1/dom/media/platforms/ffmpeg/ffvpx/moz.build
--- firefox-84.0.2+build1/dom/media/platforms/ffmpeg/ffvpx/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/ffmpeg/ffvpx/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -36,4 +36,8 @@
 DEFINES["FFVPX_VERSION"] = 46465650
 DEFINES["USING_MOZFFVPX"] = True
 
+if CONFIG["MOZ_WAYLAND"]:
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
+    DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
+
 FINAL_LIBRARY = "xul"
diff -Nru firefox-84.0.2+build1/dom/media/platforms/PDMFactory.cpp firefox-85.0+build1/dom/media/platforms/PDMFactory.cpp
--- firefox-84.0.2+build1/dom/media/platforms/PDMFactory.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/PDMFactory.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -16,8 +16,8 @@
 #include "MP4Decoder.h"
 #include "MediaChangeMonitor.h"
 #include "MediaInfo.h"
+#include "VideoUtils.h"
 #include "VPXDecoder.h"
-#include "mozilla/CDMProxy.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/RemoteDecoderManagerChild.h"
 #include "mozilla/RemoteDecoderModule.h"
@@ -229,6 +229,8 @@
   CreateNullPDM();
 }
 
+PDMFactory::~PDMFactory() = default;
+
 PDMFactory::PDMFactory(const RemoteDecodeIn& aProcess) {
   switch (aProcess) {
     case RemoteDecodeIn::RddProcess:
diff -Nru firefox-84.0.2+build1/dom/media/platforms/PDMFactory.h firefox-85.0+build1/dom/media/platforms/PDMFactory.h
--- firefox-84.0.2+build1/dom/media/platforms/PDMFactory.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/PDMFactory.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,19 +7,37 @@
 #if !defined(PDMFactory_h_)
 #  define PDMFactory_h_
 
+#  include <utility>
 #  include "DecoderDoctorDiagnostics.h"
-#  include "PlatformDecoderModule.h"
-#  include "mozilla/StaticMutex.h"
-
-class CDMProxy;
+#  include "mozilla/AlreadyAddRefed.h"
+#  include "mozilla/EnumSet.h"
+#  include "mozilla/MozPromise.h"
+#  include "mozilla/RefPtr.h"
+#  include "nsISupports.h"
+#  include "nsStringFwd.h"
+#  include "nsTArray.h"
 
 namespace mozilla {
 
+class CDMProxy;
+class MediaDataDecoder;
+class MediaResult;
 class PDMFactoryImpl;
+class PlatformDecoderModule;
+class StaticMutex;
+template <typename T>
+struct MaxEnumValue;
 template <class T>
 class StaticAutoPtr;
+struct CreateDecoderParams;
+struct CreateDecoderParamsForAsync;
+struct SupportDecoderParams;
 enum class RemoteDecodeIn;
 
+using PDMCreateDecoderPromise =
+    MozPromise<RefPtr<MediaDataDecoder>, MediaResult,
+               /* IsExclusive = */ true>;
+
 class PDMFactory final {
  public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(PDMFactory)
@@ -33,7 +51,7 @@
 
   // Factory method that creates the appropriate PlatformDecoderModule for
   // the platform we're running on.
-  RefPtr<PlatformDecoderModule::CreateDecoderPromise> CreateDecoder(
+  RefPtr<PDMCreateDecoderPromise> CreateDecoder(
       const CreateDecoderParams& aParams);
 
   bool SupportsMimeType(const nsACString& aMimeType,
@@ -78,7 +96,7 @@
   static void SetSupported(const MediaCodecsSupported& aSupported);
 
  private:
-  virtual ~PDMFactory() = default;
+  virtual ~PDMFactory();
   // Will set PDM list for the required process.
   // This is used to determine which PDMs are available on the given process
   // from the content process.
@@ -104,11 +122,10 @@
       const SupportDecoderParams& aParams,
       DecoderDoctorDiagnostics* aDiagnostics) const;
 
-  RefPtr<PlatformDecoderModule::CreateDecoderPromise> CreateDecoderWithPDM(
+  RefPtr<PDMCreateDecoderPromise> CreateDecoderWithPDM(
       PlatformDecoderModule* aPDM, const CreateDecoderParams& aParams);
-  RefPtr<PlatformDecoderModule::CreateDecoderPromise>
-  CheckAndMaybeCreateDecoder(CreateDecoderParamsForAsync&& aParams,
-                             uint32_t aIndex);
+  RefPtr<PDMCreateDecoderPromise> CheckAndMaybeCreateDecoder(
+      CreateDecoderParamsForAsync&& aParams, uint32_t aIndex);
 
   nsTArray<RefPtr<PlatformDecoderModule>> mCurrentPDMs;
   RefPtr<PlatformDecoderModule> mEMEPDM;
diff -Nru firefox-84.0.2+build1/dom/media/platforms/PlatformDecoderModule.h firefox-85.0+build1/dom/media/platforms/PlatformDecoderModule.h
--- firefox-84.0.2+build1/dom/media/platforms/PlatformDecoderModule.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/PlatformDecoderModule.h	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,7 @@
 #  include "MediaEventSource.h"
 #  include "MediaInfo.h"
 #  include "MediaResult.h"
+#  include "PDMFactory.h"
 #  include "mozilla/EnumSet.h"
 #  include "mozilla/EnumTypeTraits.h"
 #  include "mozilla/MozPromise.h"
@@ -329,9 +330,7 @@
            SupportsColorDepth(videoInfo->mColorDepth, aDiagnostics);
   }
 
-  typedef MozPromise<RefPtr<MediaDataDecoder>, MediaResult,
-                     /* IsExclusive = */ true>
-      CreateDecoderPromise;
+  using CreateDecoderPromise = PDMCreateDecoderPromise;
 
  protected:
   PlatformDecoderModule() = default;
diff -Nru firefox-84.0.2+build1/dom/media/platforms/wmf/WMFDecoderModule.cpp firefox-85.0+build1/dom/media/platforms/wmf/WMFDecoderModule.cpp
--- firefox-84.0.2+build1/dom/media/platforms/wmf/WMFDecoderModule.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/wmf/WMFDecoderModule.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -27,6 +27,7 @@
 #include "mozilla/WindowsVersion.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/mscom/EnsureMTA.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIXULRuntime.h"
 #include "nsIXULRuntime.h"  // for BrowserTabsRemoteAutostart
@@ -36,28 +37,19 @@
 
 #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define WFM_DECODER_MODULE_STATUS_MARKER(tag, text, markerTime)            \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(tag, MEDIA_PLAYBACK, TextMarkerPayload, \
-                                     (text, markerTime))
-#else
-#  define WFM_DECODER_MODULE_STATUS_MARKER(tag, text, markerTime)
-#endif
-
 extern const GUID CLSID_WebmMfVpxDec;
 
 namespace mozilla {
 
 // Helper function to add a profile marker and log at the same time.
 static void MOZ_FORMAT_PRINTF(2, 3)
-    WmfDeocderModuleMarkerAndLog(const char* aTag, const char* aFormat, ...) {
+    WmfDeocderModuleMarkerAndLog(const ProfilerString8View& aMarkerTag,
+                                 const char* aFormat, ...) {
   va_list ap;
   va_start(ap, aFormat);
   const nsVprintfCString markerString(aFormat, ap);
   va_end(ap);
-  WFM_DECODER_MODULE_STATUS_MARKER(aTag, markerString,
-                                   TimeStamp::NowUnfuzzed());
+  PROFILER_MARKER_TEXT(aMarkerTag, MEDIA_PLAYBACK, {}, markerString);
   LOG("%s", markerString.get());
 }
 
@@ -115,9 +107,13 @@
     // means that we've given up on the GPU process (it's been crashing) so we
     // should disable DXVA
     sDXVAEnabled = !StaticPrefs::media_gpu_process_decoder();
-  } else if (XRE_IsGPUProcess() || XRE_IsRDDProcess()) {
-    // Always allow DXVA in the GPU or RDD process.
+  } else if (XRE_IsGPUProcess()) {
+    // Always allow DXVA in the GPU process.
     sDXVAEnabled = true;
+  } else if (XRE_IsRDDProcess()) {
+    // Only allows DXVA if we have an image device. We may have explicitly
+    // disabled its creation following an earlier RDD process crash.
+    sDXVAEnabled = !!DeviceManagerDx::Get()->GetImageDevice();
   } else {
     // Only allow DXVA in the UI process if we aren't in e10s Firefox
     sDXVAEnabled = !mozilla::BrowserTabsRemoteAutostart();
diff -Nru firefox-84.0.2+build1/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp firefox-85.0+build1/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
--- firefox-84.0.2+build1/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -9,6 +9,7 @@
 #include "VideoUtils.h"
 #include "WMFUtils.h"
 #include "mozilla/Logging.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/Telemetry.h"
@@ -16,15 +17,6 @@
 
 #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define WFM_MEDIA_DATA_DECODER_STATUS_MARKER(tag, text, markerTime)        \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(tag, MEDIA_PLAYBACK, TextMarkerPayload, \
-                                     (text, markerTime))
-#else
-#  define WFM_MEDIA_DATA_DECODER_STATUS_MARKER(tag, text, markerTime)
-#endif
-
 namespace mozilla {
 
 WMFMediaDataDecoder::WMFMediaDataDecoder(MFTManager* aMFTManager)
@@ -102,8 +94,7 @@
       "reason: %s",
       GetDescriptionName().get(), aReason);
   LOG(markerString.get());
-  WFM_MEDIA_DATA_DECODER_STATUS_MARKER("WMFDecoder Error", markerString,
-                                       TimeStamp::NowUnfuzzed());
+  PROFILER_MARKER_TEXT("WMFDecoder Error", MEDIA_PLAYBACK, {}, markerString);
 
   // TODO: For the error DXGI_ERROR_DEVICE_RESET, we could return
   // NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER to get the latest device. Maybe retry
diff -Nru firefox-84.0.2+build1/dom/media/platforms/wrappers/MediaChangeMonitor.cpp firefox-85.0+build1/dom/media/platforms/wrappers/MediaChangeMonitor.cpp
--- firefox-84.0.2+build1/dom/media/platforms/wrappers/MediaChangeMonitor.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/platforms/wrappers/MediaChangeMonitor.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,23 +8,16 @@
 
 #include "AnnexB.h"
 #include "H264.h"
+#include "GeckoProfiler.h"
 #include "ImageContainer.h"
 #include "MP4Decoder.h"
 #include "MediaInfo.h"
 #include "PDMFactory.h"
 #include "VPXDecoder.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/TaskQueue.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#  define MEDIA_CHANGE_MONITOR_STATUS_MARKER(tag, text, markerTime)          \
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(tag, MEDIA_PLAYBACK, TextMarkerPayload, \
-                                     (text, markerTime))
-#else
-#  define MEDIA_CHANGE_MONITOR_STATUS_MARKER(tag, text, markerTime)
-#endif
-
 namespace mozilla {
 
 // H264ChangeMonitor is used to ensure that only AVCC or AnnexB is fed to the
@@ -98,11 +91,9 @@
     mPreviousExtraData = aSample->mExtraData;
     UpdateConfigFromExtraData(extra_data);
 
-    MEDIA_CHANGE_MONITOR_STATUS_MARKER(
-        "H264 Stream Change",
-        "H264ChangeMonitor::CheckForChange has detected a change in the "
-        "stream and will request a new decoder"_ns,
-        TimeStamp::NowUnfuzzed());
+    PROFILER_MARKER_TEXT("H264 Stream Change", MEDIA_PLAYBACK, {},
+                         "H264ChangeMonitor::CheckForChange has detected a "
+                         "change in the stream and will request a new decoder");
     return NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER;
   }
 
@@ -204,11 +195,10 @@
       mCurrentConfig.SetImageRect(
           gfx::IntRect(0, 0, info.mImage.width, info.mImage.height));
 
-      MEDIA_CHANGE_MONITOR_STATUS_MARKER(
-          "VPX Stream Change",
+      PROFILER_MARKER_TEXT(
+          "VPX Stream Change", MEDIA_PLAYBACK, {},
           "VPXChangeMonitor::CheckForChange has detected a change in the "
-          "stream and will request a new decoder"_ns,
-          TimeStamp::NowUnfuzzed());
+          "stream and will request a new decoder");
       rv = NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER;
     }
     mInfo = Some(info);
@@ -755,5 +745,3 @@
 }
 
 }  // namespace mozilla
-
-#undef MEDIA_CHANGE_MONITOR_STATUS_MARKER
diff -Nru firefox-84.0.2+build1/dom/media/ReaderProxy.h firefox-85.0+build1/dom/media/ReaderProxy.h
--- firefox-84.0.2+build1/dom/media/ReaderProxy.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/ReaderProxy.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/AbstractThread.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/Variant.h"
 #include "nsISupportsImpl.h"
 
 #include "MediaEventSource.h"
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/android_video_capture/video_capture_android.cc firefox-85.0+build1/dom/media/systemservices/android_video_capture/video_capture_android.cc
--- firefox-84.0.2+build1/dom/media/systemservices/android_video_capture/video_capture_android.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/android_video_capture/video_capture_android.cc	2021-01-18 19:58:09.000000000 +0000
@@ -146,15 +146,11 @@
   rtc::CritScope cs(&_apiCs);
 
   VideoRotation rotation =
-      (degrees <= 45 || degrees > 315)
-          ? kVideoRotation_0
-          : (degrees > 45 && degrees <= 135)
-                ? kVideoRotation_90
-                : (degrees > 135 && degrees <= 225)
-                      ? kVideoRotation_180
-                      : (degrees > 225 && degrees <= 315)
-                            ? kVideoRotation_270
-                            : kVideoRotation_0;  // Impossible.
+      (degrees <= 45 || degrees > 315)    ? kVideoRotation_0
+      : (degrees > 45 && degrees <= 135)  ? kVideoRotation_90
+      : (degrees > 135 && degrees <= 225) ? kVideoRotation_180
+      : (degrees > 225 && degrees <= 315) ? kVideoRotation_270
+                                          : kVideoRotation_0;  // Impossible.
 
   // Historically, we have ignored captureTime. Why?
   VideoFrame captureFrame(I420Buffer::Rotate(*buffer, rotation), 0,
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/CamerasTypes.h firefox-85.0+build1/dom/media/systemservices/CamerasTypes.h
--- firefox-84.0.2+build1/dom/media/systemservices/CamerasTypes.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/CamerasTypes.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_CamerasTypes_h
 #define mozilla_CamerasTypes_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/MediaParent.cpp firefox-85.0+build1/dom/media/systemservices/MediaParent.cpp
--- firefox-84.0.2+build1/dom/media/systemservices/MediaParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/MediaParent.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -12,6 +12,7 @@
 #include "MediaUtils.h"
 #include "MediaEngine.h"
 #include "VideoUtils.h"
+#include "nsClassHashtable.h"
 #include "nsThreadUtils.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
@@ -20,6 +21,7 @@
 #include "nsIOutputStream.h"
 #include "nsISafeOutputStream.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "nsIFile.h"
 #include "nsISupportsImpl.h"
 #include "mozilla/Logging.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/MediaSystemResourceMessageUtils.h firefox-85.0+build1/dom/media/systemservices/MediaSystemResourceMessageUtils.h
--- firefox-84.0.2+build1/dom/media/systemservices/MediaSystemResourceMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/MediaSystemResourceMessageUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -7,7 +7,7 @@
 #if !defined(MediaSystemResourceMessageUtils_h_)
 #  define MediaSystemResourceMessageUtils_h_
 
-#  include "ipc/IPCMessageUtils.h"
+#  include "ipc/EnumSerializer.h"
 #  include "MediaSystemResourceTypes.h"
 
 namespace IPC {
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/MediaUtils.h firefox-85.0+build1/dom/media/systemservices/MediaUtils.h
--- firefox-84.0.2+build1/dom/media/systemservices/MediaUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/MediaUtils.h	2021-01-18 19:58:09.000000000 +0000
@@ -111,35 +111,43 @@
 template <typename T>
 class Refcountable : public T, public RefcountableBase {
  public:
-  NS_METHOD_(MozExternalRefCountType) AddRef() {
-    return RefcountableBase::AddRef();
-  }
-
-  NS_METHOD_(MozExternalRefCountType) Release() {
-    return RefcountableBase::Release();
-  }
-
-  Refcountable<T>& operator=(T&& aOther) {
+  Refcountable& operator=(T&& aOther) {
     T::operator=(std::move(aOther));
     return *this;
   }
 
-  Refcountable<T>& operator=(T& aOther) {
+  Refcountable& operator=(T& aOther) {
     T::operator=(aOther);
     return *this;
   }
-
- private:
-  ~Refcountable<T>() = default;
 };
 
 template <typename T>
-class Refcountable<UniquePtr<T>> : public UniquePtr<T> {
+class Refcountable<UniquePtr<T>> : public UniquePtr<T>,
+                                   public RefcountableBase {
+ public:
+  explicit Refcountable(T* aPtr) : UniquePtr<T>(aPtr) {}
+};
+
+template <>
+class Refcountable<bool> : public RefcountableBase {
  public:
-  explicit Refcountable<UniquePtr<T>>(T* aPtr) : UniquePtr<T>(aPtr) {}
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Refcountable<T>)
+  explicit Refcountable(bool aValue) : mValue(aValue) {}
+
+  Refcountable& operator=(bool aOther) {
+    mValue = aOther;
+    return *this;
+  }
+
+  Refcountable& operator=(const Refcountable& aOther) {
+    mValue = aOther.mValue;
+    return *this;
+  }
+
+  explicit operator bool() const { return mValue; }
+
  private:
-  ~Refcountable<UniquePtr<T>>() = default;
+  bool mValue;
 };
 
 /* Async shutdown helpers
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/ShmemPool.h firefox-85.0+build1/dom/media/systemservices/ShmemPool.h
--- firefox-84.0.2+build1/dom/media/systemservices/ShmemPool.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/ShmemPool.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Mutex.h"
 #include "mozilla/ipc/Shmem.h"
+#include "nsTArray.h"
 
 extern mozilla::LazyLogModule sShmemPoolLog;
 #define SHMEMPOOL_LOG(args) \
diff -Nru firefox-84.0.2+build1/dom/media/systemservices/video_engine/tab_capturer.cc firefox-85.0+build1/dom/media/systemservices/video_engine/tab_capturer.cc
--- firefox-84.0.2+build1/dom/media/systemservices/video_engine/tab_capturer.cc	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/systemservices/video_engine/tab_capturer.cc	2021-01-18 19:58:09.000000000 +0000
@@ -30,9 +30,11 @@
 #include "mozilla/dom/BrowserHost.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/ImageBitmapBinding.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_media.h"
 
 #include "MediaUtils.h"
diff -Nru firefox-84.0.2+build1/dom/media/test/crashtests/1489160.html firefox-85.0+build1/dom/media/test/crashtests/1489160.html
--- firefox-84.0.2+build1/dom/media/test/crashtests/1489160.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/crashtests/1489160.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,10 @@
+<html>
+<head>
+<script>
+audio = new AudioContext()
+audio.close()
+audio.close()
+</script>
+</head>
+</html>
+
diff -Nru firefox-84.0.2+build1/dom/media/test/crashtests/crashtests.list firefox-85.0+build1/dom/media/test/crashtests/crashtests.list
--- firefox-84.0.2+build1/dom/media/test/crashtests/crashtests.list	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/crashtests/crashtests.list	2021-01-18 19:58:10.000000000 +0000
@@ -94,6 +94,7 @@
 load 1393272.webm
 load 1411322.html
 load 1450845.html
+load 1489160.html
 load disconnect-wrong-destination.html
 load analyser-channels-1.html
 load audiocontext-after-unload-1.html
@@ -105,6 +106,7 @@
 load buffer-source-slow-resampling-1.html
 load convolver-memory-report-1.html
 load copyFromChannel-2.html
+load empty-buffer-source.html
 skip-if(verify&&isDebugBuild&&gtkWidget) HTTP load media-element-source-seek-1.html
 skip-if(verify&&isDebugBuild&&gtkWidget) load offline-buffer-source-ended-1.html
 load oscillator-ended-1.html
diff -Nru firefox-84.0.2+build1/dom/media/test/crashtests/empty-buffer-source.html firefox-85.0+build1/dom/media/test/crashtests/empty-buffer-source.html
--- firefox-84.0.2+build1/dom/media/test/crashtests/empty-buffer-source.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/crashtests/empty-buffer-source.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+  <title>Bug 1636540: AudioBufferSourceNode with empty buffer</title>
+  <script>
+const offline = new OfflineAudioContext({length: 128, sampleRate: 16384});
+const buffer = new AudioBuffer({length: 1, sampleRate: 21725});
+const node = new AudioBufferSourceNode(offline, {buffer: buffer});
+node.start(5/offline.sampleRate);
+offline.startRendering().then(
+  () => document.documentElement.removeAttribute("class"));
+  </script>
+</head>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/test/file_eme_createMediaKeys.html firefox-85.0+build1/dom/media/test/file_eme_createMediaKeys.html
--- firefox-84.0.2+build1/dom/media/test/file_eme_createMediaKeys.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/file_eme_createMediaKeys.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Eme createMediaKeys helper page</title>
+<script>
+// This script waits for a message then attempts to requestMediaKeySystemAccess
+// then createMediaKeys. On success posts 'successCreatingMediaKeys' to the
+// source of the message, on failure posts 'failureCreatingMediaKeys' and a
+// description of the failure to the source of the message.
+
+async function createMediaKeys() {
+  const clearKeyOptions = [
+    {
+      initDataTypes: ["webm"],
+      videoCapabilities: [{ contentType: 'video/webm; codecs="vp9"' }],
+    },
+  ];
+
+  let access = await navigator.requestMediaKeySystemAccess(
+    "org.w3.clearkey",
+    clearKeyOptions
+  );
+
+  return access.createMediaKeys();
+}
+function setupMessageListener() {
+  window.onmessage = async event => {
+    // We don't bother checking the message data since it should always be
+    // telling us to create media keys.
+    try {
+      let keys = await createMediaKeys();
+      if (!keys) {
+        event.source.postMessage("failureCreatingMediaKeys no keys", "*");
+        return;
+      }
+      event.source.postMessage("successCreatingMediaKeys", "*");
+    } catch (e) {
+      event.source.postMessage(`failureCreatingMediaKeys ${e}`, "*");
+    }
+  };
+}
+window.onload = setupMessageListener;
+</script>
+</head>
+<body>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/test/mochitest.ini firefox-85.0+build1/dom/media/test/mochitest.ini
--- firefox-84.0.2+build1/dom/media/test/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/mochitest.ini	2021-01-18 19:58:09.000000000 +0000
@@ -446,6 +446,7 @@
   eme.js
   empty_size.mp3
   file_access_controls.html
+  file_eme_createMediaKeys.html
   flac-s24.flac
   flac-s24.flac^headers^
   flac-noheader-s16.flac
@@ -508,6 +509,7 @@
   multiple-bos.ogg^headers^
   multiple-bos-more-header-fileds.ogg
   multiple-bos-more-header-fileds.ogg^headers^
+  multi_id3v2.mp3
   no-cues.webm
   no-cues.webm^headers^
   notags.mp3
@@ -764,6 +766,9 @@
 [test_eme_canvas_blocked.html]
 skip-if = toolkit == 'android' # bug 1149374
 scheme=https
+[test_eme_createMediaKeys_iframes.html]
+skip-if = toolkit == 'android' # bug 1149374
+scheme=https
 [test_eme_detach_media_keys.html]
 skip-if = toolkit == 'android' || (verify && debug && (os == 'linux' || os == 'win')) # bug 1149374
 scheme=https
@@ -925,6 +930,7 @@
 [test_mixed_principals.html]
 skip-if = toolkit == 'android' # bug 1309814, android(bug 1232305)
 [test_mozHasAudio.html]
+[test_mp3_with_multiple_ID3v2.html]
 [test_multiple_mediastreamtracks.html]
 scheme=https
 [test_networkState.html]
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/dom/media/test/multi_id3v2.mp3 and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/dom/media/test/multi_id3v2.mp3 differ
diff -Nru firefox-84.0.2+build1/dom/media/test/test_background_video_resume_looping_video_without_audio.html firefox-85.0+build1/dom/media/test/test_background_video_resume_looping_video_without_audio.html
--- firefox-84.0.2+build1/dom/media/test/test_background_video_resume_looping_video_without_audio.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/test_background_video_resume_looping_video_without_audio.html	2021-01-18 19:58:09.000000000 +0000
@@ -19,7 +19,7 @@
   await startVideo(video);
   await suspendVideoDecoding(video);
   await resumeVideoDecoding(video);
-  await waitUntilVideoLoopAgain(video);
+  await checkIfVideoIsStillPlaying(video);
   endTestAndClearVideo(video);
 }
 
@@ -40,9 +40,6 @@
   video.src = "gizmo-noaudio.webm";
   video.controls = true;
   video.loop = true;
-  // In order to reduce the test running time, because we don't need to acutally
-  // go through the whole video.
-  video.currentTime = 3;
   document.body.appendChild(video);
   info(`ensure video becomes visible`);
   await waitUntilVisible(video);
@@ -59,20 +56,19 @@
   info(`suspend video decoding`);
   video.setVisible(false);
   await nextVideoSuspends(video);
+  info(`suspended video decoding`);
 }
 
 async function resumeVideoDecoding(video) {
   info(`resume video decoding.`);
   video.setVisible(true);
   await nextVideoResumes(video);
+  info(`resumed video decoding`);
 }
 
-async function waitUntilVideoLoopAgain(video) {
-  info(`ensure video is still playing after resuming video decoding.`);
-  await once(video, "seeking");
-  info(`got 'seeking' event.`);
-  await once(video, "seeked");
-  ok(!video.paused, "video is still playing and looping again.")
+async function checkIfVideoIsStillPlaying(video) {
+  await once(video, "timeupdate");
+  ok(!video.paused, "video is still playing after resuming video decoding.")
 }
 
 function endTestAndClearVideo(video) {
diff -Nru firefox-84.0.2+build1/dom/media/test/test_eme_createMediaKeys_iframes.html firefox-85.0+build1/dom/media/test/test_eme_createMediaKeys_iframes.html
--- firefox-84.0.2+build1/dom/media/test/test_eme_createMediaKeys_iframes.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/test_eme_createMediaKeys_iframes.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,201 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test creation of MediaKeys in iframes</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+  <script type="text/javascript" src="eme.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody">
+// Helper functions.
+
+// We take navigator explicitly as an argument to avoid ambiguity in fetching
+// it. This is to avoid issues with the following
+// ```
+// iframe.contentWindow.createMediaKeys = createMediaKeys;
+// await iframe.contentWindow.createMediaKeys();
+// ```
+// If we don't pass a navigator, and just use `navigator` in the function, this
+// ends up being equivalent to
+// ```
+// iframe.contentWindow.createMediaKeys = createMediaKeys;
+// await iframe.contentWindow.createMediaKeys(window.navigator);
+// ```
+// i.e. the function will use the navigator from the global window for the top
+// browsing context, not the iframe's. This would result in the tests not
+// correctly testing within the iframe.
+async function createMediaKeys(aNavigator) {
+  const clearKeyOptions = [
+    {
+      initDataTypes: ["webm"],
+      videoCapabilities: [{ contentType: 'video/webm; codecs="vp9"' }],
+    },
+  ];
+
+  let access = await aNavigator.requestMediaKeySystemAccess(
+    "org.w3.clearkey",
+    clearKeyOptions
+  );
+
+  return access.createMediaKeys();
+}
+// End helper functions.
+
+// Setup for the tests.
+add_task(async () => {
+  info("Setting up EME prefs");
+  // Wrap EME pref setup in a promise so it plays nice with add_task.
+  return new Promise(r => {
+    SetupEMEPref(r);
+  });
+});
+
+// These tests check that the following work using different iframe combinations
+// - navigator.requestMediaKeySystem(...) successfully grants access.
+// - the resulting MediaKeySystemAccess object's createMediaKeys() creates
+//   MediaKeys as expected.
+
+// Same origin iframe, using src attribute, wait for onload.
+add_task(async () => {
+  info(
+    "Starting same origin iframe, using src attribute, wait for onload test"
+  );
+  let iframe = document.createElement("iframe");
+  let iframeLoadPromise = new Promise(r => {
+    iframe.onload = r;
+  });
+  iframe.src = "file_eme_createMediaKeys.html";
+  document.body.appendChild(iframe);
+  await iframeLoadPromise;
+  info("iframe loaded");
+
+  // Setup our handler for when the iframe messages to tell us if it
+  // created MediaKeys or not.
+  let iframeMessagePromise = new Promise(r => {
+    window.onmessage = message => {
+      is(
+        message.data,
+        "successCreatingMediaKeys",
+        "iframe should have posted us a message saying keys were successfully created"
+      );
+      r();
+    };
+  });
+  // Post a message to the iframe to ask it to try and create media keys.
+  iframe.contentWindow.postMessage("", "*");
+  // Wait until we've got a message back from our iframe.
+  await iframeMessagePromise;
+});
+
+// Same origin iframe, call via JS, wait for onload.
+add_task(async () => {
+  info("Starting same origin iframe, call via JS, wait for onload test");
+  let iframe = document.createElement("iframe");
+  let iframeLoadPromise = new Promise(r => {
+    iframe.onload = r;
+  });
+  iframe.src = ""; // No src iframes are same origin.
+  document.body.appendChild(iframe);
+  await iframeLoadPromise;
+  info("iframe loaded");
+
+  try {
+    iframe.contentWindow.createMediaKeys = createMediaKeys;
+    let mediaKeys = await iframe.contentWindow.createMediaKeys(
+      iframe.contentWindow.navigator
+    );
+    ok(mediaKeys, "Should get media keys");
+  } catch (e) {
+    ok(
+      false,
+      `Should not get any errors while trying to get media keys, got ${e}`
+    );
+  }
+});
+
+// Same origin iframe, call via JS, *do not* wait for onload.
+//
+// Note, sites shouldn't do this, because
+// https://bugzilla.mozilla.org/show_bug.cgi?id=543435
+// means not waiting for onload results in weird behavior, however
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1675360
+// shows sites doing this in the wild because historically this worked in
+// Firefox.
+//
+// Breaking this test case isn't necessarily against any specifications
+// I'm (bryce) aware of, but it will probably break site compat, so be really
+// sure you want to before doing so.
+add_task(async () => {
+  info(
+    "Starting same origin iframe, call via JS, *do not* wait for onload test"
+  );
+  let iframe = document.createElement("iframe");
+  let iframeLoadPromise = new Promise(r => {
+    iframe.onload = r;
+  });
+  iframe.src = ""; // No src iframes are same origin.
+  document.body.appendChild(iframe);
+  info("iframe appended (we're not waiting for load)");
+
+  try {
+    iframe.contentWindow.createMediaKeys = createMediaKeys;
+    let mediaKeys = await iframe.contentWindow.createMediaKeys(
+      iframe.contentWindow.navigator
+    );
+    ok(mediaKeys, "Should get media keys");
+
+    // We await the load to see if they keys persist through the load.
+    // This could fail if gecko internally associates the keys with the
+    // about:blank page that is replaced by the load.
+    await iframeLoadPromise;
+    ok(mediaKeys, "Media keys should still exist after the load");
+  } catch (e) {
+    ok(
+      false,
+      `Should not get any errors while trying to get media keys, got ${e}`
+    );
+  }
+});
+
+// Different origin iframe, using src attribute, wait for onload
+add_task(async () => {
+  info(
+    "Starting different origin iframe, using src attribute, wait for onload test"
+  );
+  let iframe = document.createElement("iframe");
+  let iframeLoadPromise = new Promise(r => {
+    iframe.onload = r;
+  });
+  // Make our iframe cross origin (see build/pgo/server-locations.txt for more
+  // info the url used).
+  iframe.src =
+    "https://w3c-test.org:443/tests/dom/media/test/file_eme_createMediaKeys.html";
+  iframe.allow = "encrypted-media";
+  document.body.appendChild(iframe);
+  await iframeLoadPromise;
+  info("iframe loaded");
+
+  // Setup our handler for when the iframe messages to tell us if it
+  // created MediaKeys or not.
+  let iframeMessagePromise = new Promise(r => {
+    window.onmessage = message => {
+      is(
+        message.data,
+        "successCreatingMediaKeys",
+        "iframe should have posted us a message saying keys were successfully created"
+      );
+      r();
+    };
+  });
+  // Post a message to the iframe to ask it to try and create media keys.
+  iframe.contentWindow.postMessage("", "*");
+  // Wait until we've got a message back from our iframe.
+  await iframeMessagePromise;
+});
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/test/test_mp3_with_multiple_ID3v2.html firefox-85.0+build1/dom/media/test/test_mp3_with_multiple_ID3v2.html
--- firefox-84.0.2+build1/dom/media/test/test_mp3_with_multiple_ID3v2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/test_mp3_with_multiple_ID3v2.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Play mp3 file with multiple ID3v2 tags</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<script type="application/javascript">
+
+add_task(async function testPlayMP3WithMultipleID3Tags() {
+  info(`adjust cache size`);
+  await SpecialPowers.pushPrefEnv(
+    // The second ID3v2 header is huge (4622361 bytes) so the first audio samle
+    // in this file is in the position 4945370, so we have to extend the size of
+    // the cache.
+    {"set": [["media.cache_size", 5000000]]}
+  );
+
+  info(`create audio and wait its loading`);
+  let audio = document.createElement('audio');
+  audio.src = "multi_id3v2.mp3";
+  document.body.appendChild(audio);
+  await new Promise(r => audio.onloadeddata = r);
+  ok(true, `finishing loading data.`)
+});
+
+</script>
+</head>
+<body>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/test/test_suspend_media_by_inactive_docshell.html firefox-85.0+build1/dom/media/test/test_suspend_media_by_inactive_docshell.html
--- firefox-84.0.2+build1/dom/media/test/test_suspend_media_by_inactive_docshell.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/test/test_suspend_media_by_inactive_docshell.html	2021-01-18 19:58:10.000000000 +0000
@@ -44,10 +44,12 @@
 }
 
 function setDocShellActive(isActive) {
-  const docShell = SpecialPowers.wrap(window).docShell;
+  const win = SpecialPowers.wrap(window);
+  const docShell = win.docShell;
+  const browsingContext = win.browsingContext;
   // This flag is used to prevent media from playing when docShell is inactive.
-  docShell.browsingContext.top.suspendMediaWhenInactive = true;
-  docShell.isActive = isActive;
+  browsingContext.top.suspendMediaWhenInactive = true;
+  browsingContext.isActive = isActive;
   // After updating `docshell.isActive`, it would suspend/resume media and we
   // wait suspending/resuming finishing by listening to `MozMediaSuspendChanged`
   return new Promise(r => {
diff -Nru firefox-84.0.2+build1/dom/media/tests/crashtests/1443212.html firefox-85.0+build1/dom/media/tests/crashtests/1443212.html
--- firefox-84.0.2+build1/dom/media/tests/crashtests/1443212.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/tests/crashtests/1443212.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,13 @@
+<script>
+window.addEventListener("load", () => {
+  const c = document.createElement("canvas");
+  c.getContext("2d");
+  const stream = c.captureStream();
+  const [track] = stream.getTracks();
+  stream.removeTrack(track);
+  track.stop();
+  stream.addTrack(track);
+  stream.removeTrack(track);
+  stream.addTrack(track);
+});
+</script>
diff -Nru firefox-84.0.2+build1/dom/media/tests/crashtests/802982.html firefox-85.0+build1/dom/media/tests/crashtests/802982.html
--- firefox-84.0.2+build1/dom/media/tests/crashtests/802982.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/tests/crashtests/802982.html	2021-01-18 19:58:10.000000000 +0000
@@ -15,7 +15,7 @@
   function boom()
   {
     for (var j = 0; j < 100; ++j) {
-      navigator.mozGetUserMedia({}, function(){}, function(){});
+      navigator.mozGetUserMedia({video:true}, function(){}, function(){});
     }
     finish(); // we're not waiting for success/error callbacks here
   }
diff -Nru firefox-84.0.2+build1/dom/media/tests/crashtests/crashtests.list firefox-85.0+build1/dom/media/tests/crashtests/crashtests.list
--- firefox-84.0.2+build1/dom/media/tests/crashtests/crashtests.list	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/tests/crashtests/crashtests.list	2021-01-18 19:58:09.000000000 +0000
@@ -22,6 +22,7 @@
 load 1367930_2.html
 asserts-if(Android,0-1) pref(browser.link.open_newwindow,2) load 1429507_1.html # window.open() in tab doesn't work for crashtest in e10s, this opens a new window instead
 asserts-if(Android,0-1) pref(browser.link.open_newwindow,2) load 1429507_2.html # window.open() in tab doesn't work for crashtest in e10s, this opens a new window instead
+load 1443212.html
 asserts-if(Android,0-2) load 1453030.html
 load 1468451.html
 skip-if(Android) load 1490700.html # No screenshare on Android
diff -Nru firefox-84.0.2+build1/dom/media/VideoUtils.cpp firefox-85.0+build1/dom/media/VideoUtils.cpp
--- firefox-84.0.2+build1/dom/media/VideoUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/VideoUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -188,11 +188,9 @@
 
   if (resampling) {
     rate = 48000;
-  } else if (aInfo.mRate == 44100 || aInfo.mRate == 48000) {
+  } else if (aInfo.mRate >= 44100) {
     // The original rate is of good quality and we want to minimize unecessary
-    // resampling. The common scenario being that the sampling rate is one or
-    // the other. This minimizes audio quality regressions but depends on
-    // content providers not changing rates mid-stream.
+    // resampling, so we let cubeb decide how to resample (if needed).
     rate = aInfo.mRate;
   } else {
     // We will resample all data to match cubeb's preferred sampling rate.
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AnalyserNode.cpp firefox-85.0+build1/dom/media/webaudio/AnalyserNode.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AnalyserNode.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AnalyserNode.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "AudioNodeTrack.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/PodOperations.h"
+#include "nsMathUtils.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioBuffer.cpp firefox-85.0+build1/dom/media/webaudio/AudioBuffer.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AudioBuffer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioBuffer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "AudioChannelFormat.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/MemoryReporting.h"
 #include "AudioNodeEngine.h"
 #include "nsPrintfCString.h"
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioBufferSourceNode.cpp firefox-85.0+build1/dom/media/webaudio/AudioBufferSourceNode.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AudioBufferSourceNode.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioBufferSourceNode.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -349,7 +349,7 @@
     uint32_t numFrames = std::min<TrackTime>(
         WEBAUDIO_BLOCK_SIZE - *aOffsetWithinBlock, aMaxPos - *aCurrentPosition);
     if (numFrames == WEBAUDIO_BLOCK_SIZE || !aChannels) {
-      aOutput->SetNull(numFrames);
+      aOutput->SetNull(WEBAUDIO_BLOCK_SIZE);
     } else {
       if (*aOffsetWithinBlock == 0) {
         aOutput->AllocateChannels(aChannels);
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioContext.cpp firefox-85.0+build1/dom/media/webaudio/AudioContext.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AudioContext.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioContext.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -931,7 +931,7 @@
     return promise.forget();
   }
 
-  if (mAudioContextState == AudioContextState::Closed || mCloseCalled) {
+  if (mCloseCalled) {
     promise->MaybeRejectWithInvalidStateError(
         "Can't suspend if the control thread state is \"closed\"");
     return promise.forget();
@@ -1002,7 +1002,7 @@
     return promise.forget();
   }
 
-  if (mAudioContextState == AudioContextState::Closed || mCloseCalled) {
+  if (mCloseCalled) {
     promise->MaybeRejectWithInvalidStateError(
         "Can't resume if the control thread state is \"closed\"");
     return promise.forget();
@@ -1139,7 +1139,7 @@
     return promise.forget();
   }
 
-  if (mAudioContextState == AudioContextState::Closed) {
+  if (mCloseCalled) {
     promise->MaybeRejectWithInvalidStateError(
         "Can't close an AudioContext twice");
     return promise.forget();
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioContext.h firefox-85.0+build1/dom/media/webaudio/AudioContext.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioContext.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioContext.h	2021-01-18 19:58:10.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/UniquePtr.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsTHashtable.h"
 #include "js/TypeDecls.h"
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioEventTimeline.h firefox-85.0+build1/dom/media/webaudio/AudioEventTimeline.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioEventTimeline.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioEventTimeline.h	2021-01-18 19:58:09.000000000 +0000
@@ -18,6 +18,9 @@
 #include "math.h"
 #include "WebAudioUtils.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "js/GCAPI.h"
+
 namespace mozilla {
 
 class AudioNodeTrack;
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioNodeEngine.h firefox-85.0+build1/dom/media/webaudio/AudioNodeEngine.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioNodeEngine.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioNodeEngine.h	2021-01-18 19:58:10.000000000 +0000
@@ -339,9 +339,8 @@
   // returning false, then the track can be suspended.
   virtual bool IsActive() const { return false; }
 
-  // Called on forced shutdown of the MediaTrackGraph before handing ownership
-  // from graph thread to main thread.
-  virtual void NotifyForcedShutdown() {}
+  // Called on graph thread when the engine will not be used again.
+  virtual void OnGraphThreadDone() {}
 
   bool HasNode() const {
     MOZ_ASSERT(NS_IsMainThread());
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioNode.h firefox-85.0+build1/dom/media/webaudio/AudioNode.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioNode.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioNode.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "AudioContext.h"
 #include "MediaTrackGraph.h"
 #include "WebAudioUtils.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/MemoryReporting.h"
 #include "nsPrintfCString.h"
 #include "nsWeakReference.h"
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioNodeTrack.cpp firefox-85.0+build1/dom/media/webaudio/AudioNodeTrack.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AudioNodeTrack.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioNodeTrack.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -54,7 +54,7 @@
   MOZ_COUNT_DTOR(AudioNodeTrack);
 }
 
-void AudioNodeTrack::NotifyForcedShutdown() { mEngine->NotifyForcedShutdown(); }
+void AudioNodeTrack::OnGraphThreadDone() { mEngine->OnGraphThreadDone(); }
 
 void AudioNodeTrack::DestroyImpl() {
   // These are graph thread objects, so clean up on graph thread.
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioNodeTrack.h firefox-85.0+build1/dom/media/webaudio/AudioNodeTrack.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioNodeTrack.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioNodeTrack.h	2021-01-18 19:58:09.000000000 +0000
@@ -178,7 +178,7 @@
   class AdvanceAndResumeMessage;
   class CheckForInactiveMessage;
 
-  void NotifyForcedShutdown() override;
+  void OnGraphThreadDone() override;
   void DestroyImpl() override;
 
   /*
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioParamTimeline.h firefox-85.0+build1/dom/media/webaudio/AudioParamTimeline.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioParamTimeline.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioParamTimeline.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "AudioEventTimeline.h"
 #include "AudioNodeTrack.h"
-#include "mozilla/ErrorResult.h"
 #include "AudioSegment.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioWorkletNode.cpp firefox-85.0+build1/dom/media/webaudio/AudioWorkletNode.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/AudioWorkletNode.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioWorkletNode.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -22,6 +22,7 @@
 #include "AudioDestinationNode.h"
 #include "mozilla/dom/MessageChannel.h"
 #include "mozilla/dom/MessagePort.h"
+#include "mozilla/ScopeExit.h"
 #include "nsReadableUtils.h"
 #include "mozilla/Span.h"
 #include "PlayingRefChangeHandler.h"
@@ -95,7 +96,7 @@
                             Span<const AudioBlock> aInput,
                             Span<AudioBlock> aOutput, bool* aFinished) override;
 
-  void NotifyForcedShutdown() override { ReleaseJSResources(); }
+  void OnGraphThreadDone() override { ReleaseJSResources(); }
 
   bool IsActive() const override { return mKeepEngineActive; }
 
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/AudioWorkletNode.h firefox-85.0+build1/dom/media/webaudio/AudioWorkletNode.h
--- firefox-84.0.2+build1/dom/media/webaudio/AudioWorkletNode.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/AudioWorkletNode.h	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,8 @@
 class MessagePort;
 struct NamedAudioParamTimeline;
 struct ProcessorErrorDetails;
+template <typename KeyType, typename ValueType>
+class Record;
 
 class AudioWorkletNode : public AudioNode {
  public:
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/blink/DenormalDisabler.h firefox-85.0+build1/dom/media/webaudio/blink/DenormalDisabler.h
--- firefox-84.0.2+build1/dom/media/webaudio/blink/DenormalDisabler.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/blink/DenormalDisabler.h	2021-01-18 19:58:09.000000000 +0000
@@ -107,18 +107,18 @@
   inline int getStatusWord() {
     int result;
 #    if defined(__aarch64__)
-    asm volatile("mrs %x[result], FPCR" : [ result ] "=r"(result));
+    asm volatile("mrs %x[result], FPCR" : [result] "=r"(result));
 #    else
-    asm volatile("vmrs %[result], FPSCR" : [ result ] "=r"(result));
+    asm volatile("vmrs %[result], FPSCR" : [result] "=r"(result));
 #    endif
     return result;
   }
 
   inline void setStatusWord(int a) {
 #    if defined(__aarch64__)
-    asm volatile("msr FPCR, %x[src]" : : [ src ] "r"(a));
+    asm volatile("msr FPCR, %x[src]" : : [src] "r"(a));
 #    else
-    asm volatile("vmsr FPSCR, %[src]" : : [ src ] "r"(a));
+    asm volatile("vmsr FPSCR, %[src]" : : [src] "r"(a));
 #    endif
   }
 
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/blink/ReverbInputBuffer.cpp firefox-85.0+build1/dom/media/webaudio/blink/ReverbInputBuffer.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/blink/ReverbInputBuffer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/blink/ReverbInputBuffer.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -39,18 +39,19 @@
 }
 
 void ReverbInputBuffer::write(const float* sourceP, size_t numberOfFrames) {
+  // m_writeIndex is atomic and checked by other threads, so only touch
+  // it at the start and end.
   size_t bufferLength = m_buffer.Length();
-  bool isCopySafe = m_writeIndex + numberOfFrames <= bufferLength;
-  MOZ_ASSERT(isCopySafe);
-  if (!isCopySafe) return;
+  size_t index = m_writeIndex;
+  size_t newIndex = index + numberOfFrames;
 
-  memcpy(m_buffer.Elements() + m_writeIndex, sourceP,
-         sizeof(float) * numberOfFrames);
+  MOZ_RELEASE_ASSERT(newIndex <= bufferLength);
 
-  m_writeIndex += numberOfFrames;
-  MOZ_ASSERT(m_writeIndex <= bufferLength);
+  memcpy(m_buffer.Elements() + index, sourceP, sizeof(float) * numberOfFrames);
 
-  if (m_writeIndex >= bufferLength) m_writeIndex = 0;
+  if (newIndex >= bufferLength) {
+    m_writeIndex = 0;
+  }
 }
 
 float* ReverbInputBuffer::directReadFrom(int* readIndex,
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/blink/ReverbInputBuffer.h firefox-85.0+build1/dom/media/webaudio/blink/ReverbInputBuffer.h
--- firefox-84.0.2+build1/dom/media/webaudio/blink/ReverbInputBuffer.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/blink/ReverbInputBuffer.h	2021-01-18 19:58:09.000000000 +0000
@@ -30,6 +30,7 @@
 #define ReverbInputBuffer_h
 
 #include "nsTArray.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/MemoryReporting.h"
 
 namespace WebCore {
@@ -64,7 +65,7 @@
 
  private:
   nsTArray<float> m_buffer;
-  size_t m_writeIndex;
+  mozilla::Atomic<size_t, mozilla::ReleaseAcquire> m_writeIndex;
 };
 
 }  // namespace WebCore
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/ScriptProcessorNode.h firefox-85.0+build1/dom/media/webaudio/ScriptProcessorNode.h
--- firefox-84.0.2+build1/dom/media/webaudio/ScriptProcessorNode.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/ScriptProcessorNode.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define ScriptProcessorNode_h_
 
 #include "AudioNode.h"
+#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/StereoPannerNode.h firefox-85.0+build1/dom/media/webaudio/StereoPannerNode.h
--- firefox-84.0.2+build1/dom/media/webaudio/StereoPannerNode.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/StereoPannerNode.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "AudioNode.h"
 #include "nsPrintfCString.h"
+#include "mozilla/RefCounted.h"
 #include "mozilla/dom/StereoPannerNodeBinding.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/WebAudioUtils.cpp firefox-85.0+build1/dom/media/webaudio/WebAudioUtils.cpp
--- firefox-84.0.2+build1/dom/media/webaudio/WebAudioUtils.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/WebAudioUtils.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -8,9 +8,12 @@
 #include "AudioNodeTrack.h"
 #include "blink/HRTFDatabaseLoader.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
+#include "nsJSUtils.h"
+#include "nsServiceManagerUtils.h"
 #include "AudioEventTimeline.h"
 
 #include "mozilla/SchedulerGroup.h"
diff -Nru firefox-84.0.2+build1/dom/media/webaudio/WebAudioUtils.h firefox-85.0+build1/dom/media/webaudio/WebAudioUtils.h
--- firefox-84.0.2+build1/dom/media/webaudio/WebAudioUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webaudio/WebAudioUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include <limits>
 #include <type_traits>
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/Logging.h"
 #include "MediaSegment.h"
 
 // Forward declaration
diff -Nru firefox-84.0.2+build1/dom/media/webm/WebMDecoder.cpp firefox-85.0+build1/dom/media/webm/WebMDecoder.cpp
--- firefox-84.0.2+build1/dom/media/webm/WebMDecoder.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webm/WebMDecoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #endif
 #include "MediaContainerType.h"
 #include "PDMFactory.h"
+#include "PlatformDecoderModule.h"
 #include "VideoUtils.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandler.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandler.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandler.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandler.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 
 // Config stuff
 #include "mozilla/dom/RTCConfigurationBinding.h"
+#include "mozilla/Preferences.h"
 
 // Parsing STUN/TURN URIs
 #include "nsIURI.h"
@@ -39,6 +40,8 @@
 #include "nss.h"                // For NSS_NoDB_Init
 #include "mozilla/PublicSSL.h"  // For psm::InitializeCipherSuite
 
+#include "nsISocketTransportService.h"
+
 #include <string>
 #include <vector>
 #include <map>
@@ -64,7 +67,6 @@
   nsresult CreateIceCtx(const std::string& aName,
                         const nsTArray<dom::RTCIceServer>& aIceServers,
                         dom::RTCIceTransportPolicy aIcePolicy) override;
-  void Destroy() override;
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
@@ -114,7 +116,13 @@
   RefPtr<dom::RTCStatsPromise> GetIceStats(const std::string& aTransportId,
                                            DOMHighResTimeStamp aNow) override;
 
+  void Shutdown();
+
  private:
+  void Destroy() override;
+  void Destroy_s();
+  void DestroyFinal();
+  void Shutdown_s();
   RefPtr<TransportFlow> CreateTransportFlow(const std::string& aTransportId,
                                             bool aIsRtcp,
                                             RefPtr<DtlsIdentity> aDtlsIdentity,
@@ -183,6 +191,67 @@
   return result.forget();
 }
 
+class STSShutdownHandler : public nsISTSShutdownObserver {
+ public:
+  NS_DECL_ISUPPORTS
+
+  // Lazy singleton
+  static RefPtr<STSShutdownHandler>& Instance() {
+    MOZ_ASSERT(NS_IsMainThread());
+    static RefPtr<STSShutdownHandler> sHandler(new STSShutdownHandler);
+    return sHandler;
+  }
+
+  void Shutdown() {
+    MOZ_ASSERT(NS_IsMainThread());
+    for (const auto& handler : mHandlers) {
+      handler->Shutdown();
+    }
+    mHandlers.clear();
+  }
+
+  STSShutdownHandler() {
+    CSFLogDebug(LOGTAG, "%s", __func__);
+    nsresult res;
+    nsCOMPtr<nsISocketTransportService> sts =
+        do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &res);
+    MOZ_RELEASE_ASSERT(NS_SUCCEEDED(res));
+    MOZ_RELEASE_ASSERT(sts);
+    sts->AddShutdownObserver(this);
+  }
+
+  NS_IMETHOD Observe() override {
+    CSFLogDebug(LOGTAG, "%s", __func__);
+    Shutdown();
+    nsresult res;
+    nsCOMPtr<nsISocketTransportService> sts =
+        do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &res);
+    MOZ_RELEASE_ASSERT(NS_SUCCEEDED(res));
+    MOZ_RELEASE_ASSERT(sts);
+    sts->RemoveShutdownObserver(this);
+    Instance() = nullptr;
+    return NS_OK;
+  }
+
+  void Register(MediaTransportHandlerSTS* aHandler) {
+    MOZ_ASSERT(NS_IsMainThread());
+    mHandlers.insert(aHandler);
+  }
+
+  void Deregister(MediaTransportHandlerSTS* aHandler) {
+    MOZ_ASSERT(NS_IsMainThread());
+    mHandlers.erase(aHandler);
+  }
+
+ private:
+  virtual ~STSShutdownHandler() {}
+
+  // Raw ptrs, registered on init, deregistered on destruction, all on main
+  std::set<MediaTransportHandlerSTS*> mHandlers;
+};
+
+NS_IMPL_ISUPPORTS(STSShutdownHandler, nsISTSShutdownObserver);
+
 MediaTransportHandlerSTS::MediaTransportHandlerSTS(
     nsISerialEventTarget* aCallbackThread)
     : MediaTransportHandler(aCallbackThread) {
@@ -194,7 +263,7 @@
 
   RLogConnector::CreateInstance();
 
-  CSFLogDebug(LOGTAG, "%s done", __func__);
+  CSFLogDebug(LOGTAG, "%s done %p", __func__, this);
 
   // We do not set up mDNSService here, because we are not running on main (we
   // use PBackground), and the DNS service asserts.
@@ -369,6 +438,8 @@
       "media.peerconnection.nat_simulator.block_tcp", false);
   bool block_udp = Preferences::GetBool(
       "media.peerconnection.nat_simulator.block_udp", false);
+  int error_code_for_drop = Preferences::GetInt(
+      "media.peerconnection.nat_simulator.error_code_for_drop", 0);
   nsAutoCString mapping_type;
   (void)Preferences::GetCString(
       "media.peerconnection.nat_simulator.mapping_type", mapping_type);
@@ -383,6 +454,7 @@
     NrIceCtx::NatSimulatorConfig natConfig;
     natConfig.mBlockUdp = block_udp;
     natConfig.mBlockTcp = block_tcp;
+    natConfig.mErrorCodeForDrop = error_code_for_drop;
     natConfig.mFilteringType = filtering_type;
     natConfig.mMappingType = mapping_type;
     return Some(natConfig);
@@ -443,6 +515,9 @@
         config.mPolicy = toNrIcePolicy(aIcePolicy);
         config.mNatSimulatorConfig = GetNatConfig();
 
+        MOZ_RELEASE_ASSERT(STSShutdownHandler::Instance());
+        STSShutdownHandler::Instance()->Register(this);
+
         return InvokeAsync(
             mStsThread, __func__,
             [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
@@ -499,49 +574,89 @@
   return NS_OK;
 }
 
+void MediaTransportHandlerSTS::Shutdown() {
+  CSFLogDebug(LOGTAG, "%s", __func__);
+  MOZ_ASSERT(NS_IsMainThread());
+  mStsThread->Dispatch(NewNonOwningRunnableMethod(
+      __func__, this, &MediaTransportHandlerSTS::Shutdown_s));
+}
+
+void MediaTransportHandlerSTS::Shutdown_s() {
+  CSFLogDebug(LOGTAG, "%s", __func__);
+  disconnect_all();
+  // Clear the transports before destroying the ice ctx so that
+  // the close_notify alerts have a chance to be sent as the
+  // TransportFlow destructors execute.
+  mTransports.clear();
+  if (mIceCtx) {
+    NrIceStats stats = mIceCtx->Destroy();
+    CSFLogDebug(LOGTAG,
+                "Ice Telemetry: stun (retransmits: %d)"
+                "   turn (401s: %d   403s: %d   438s: %d)",
+                stats.stun_retransmits, stats.turn_401s, stats.turn_403s,
+                stats.turn_438s);
+  }
+  mIceCtx = nullptr;
+  mDNSResolver = nullptr;
+}
+
 void MediaTransportHandlerSTS::Destroy() {
-  if (!mInitPromise) {
+  CSFLogDebug(LOGTAG, "%s %p", __func__, this);
+  // Our "destruction tour" starts on main, because we need to deregister.
+  if (!NS_IsMainThread()) {
+    GetMainThreadEventTarget()->Dispatch(NewNonOwningRunnableMethod(
+        __func__, this, &MediaTransportHandlerSTS::Destroy));
     return;
   }
 
-  mInitPromise->Then(
-      mStsThread, __func__,
-      [this, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
-        disconnect_all();
-        // Clear the transports before destroying the ice ctx so that
-        // the close_notify alerts have a chance to be sent as the
-        // TransportFlow destructors execute.
-        mTransports.clear();
-        if (mIceCtx) {
-          // We're already on the STS thread, but the TransportFlow
-          // destructors executed when mTransports.clear() is called
-          // above dispatch calls to DestroyFinal to the STS thread. If
-          // we don't also dispatch the call to destory the NrIceCtx to
-          // the STS thread, it will tear down the NrIceMediaStreams
-          // before the TransportFlows are destroyed.  Without a valid
-          // NrIceMediaStreams the close_notify alert cannot be sent.
-          mStsThread->Dispatch(NS_NewRunnableFunction(
-              __func__, [iceCtx = RefPtr<NrIceCtx>(mIceCtx)] {
-                NrIceStats stats = iceCtx->Destroy();
-                CSFLogDebug(LOGTAG,
-                            "Ice Telemetry: stun (retransmits: %d)"
-                            "   turn (401s: %d   403s: %d   438s: %d)",
-                            stats.stun_retransmits, stats.turn_401s,
-                            stats.turn_403s, stats.turn_438s);
-              }));
+  MOZ_ASSERT(NS_IsMainThread());
+  if (!STSShutdownHandler::Instance()) {
+    CSFLogDebug(LOGTAG, "%s Already shut down. Nothing else to do.", __func__);
+    delete this;
+    return;
+  }
 
-          mIceCtx = nullptr;
-        }
-      },
-      [](const std::string& aError) {});
+  STSShutdownHandler::Instance()->Deregister(this);
+  Shutdown();
+
+  // mIceCtx still has a reference to us via sigslot! We must dispach to STS,
+  // and clean up there. However, by the time _that_ happens, we may have
+  // dispatched a signal callback to mCallbackThread, so we have to dispatch
+  // the final destruction to mCallbackThread.
+  nsresult rv = mStsThread->Dispatch(NewNonOwningRunnableMethod(
+      __func__, this, &MediaTransportHandlerSTS::Destroy_s));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    CSFLogError(LOGTAG,
+                "Unable to dispatch to STS: why has the XPCOM shutdown handler "
+                "not been invoked?");
+    delete this;
+  }
 }
 
+void MediaTransportHandlerSTS::Destroy_s() {
+  if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
+    nsresult rv = mCallbackThread->Dispatch(NewNonOwningRunnableMethod(
+        __func__, this, &MediaTransportHandlerSTS::DestroyFinal));
+    if (NS_SUCCEEDED(rv)) {
+      return;
+    }
+  }
+
+  DestroyFinal();
+}
+
+void MediaTransportHandlerSTS::DestroyFinal() { delete this; }
+
 void MediaTransportHandlerSTS::SetProxyConfig(
     NrSocketProxyConfig&& aProxyConfig) {
   mInitPromise->Then(
       mStsThread, __func__,
       [this, self = RefPtr<MediaTransportHandlerSTS>(this),
        aProxyConfig = std::move(aProxyConfig)]() mutable {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         mIceCtx->SetProxyConfig(std::move(aProxyConfig));
       },
       [](const std::string& aError) {});
@@ -553,6 +668,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         RefPtr<NrIceMediaStream> stream(mIceCtx->GetStream(aTransportId));
         if (!stream) {
           CSFLogDebug(LOGTAG, "%s: Creating ICE media stream=%s components=%u",
@@ -593,6 +712,10 @@
       mStsThread, __func__,
       [=, keyDer = aKeyDer.Clone(), certDer = aCertDer.Clone(),
        self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         MOZ_ASSERT(aComponentCount);
         RefPtr<DtlsIdentity> dtlsIdentity(
             DtlsIdentity::Deserialize(keyDer, certDer, aAuthType));
@@ -673,6 +796,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         mIceCtx->SetTargetForDefaultLocalAddressLookup(aTargetIp, aTargetPort);
       },
       [](const std::string& aError) {});
@@ -685,6 +812,10 @@
       mStsThread, __func__,
       [=, stunAddrs = aStunAddrs.Clone(),
        self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         mObfuscateHostAddresses = aObfuscateHostAddresses;
 
         // Belt and suspenders - in e10s mode, the call below to SetStunAddrs
@@ -710,6 +841,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         nsresult rv = mIceCtx->ParseGlobalAttributes(aIceOptions);
         if (NS_FAILED(rv)) {
           CSFLogError(LOGTAG, "%s: couldn't parse global parameters",
@@ -751,6 +886,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         std::vector<std::string> tokens;
         TokenizeCandidate(aCandidate, tokens);
 
@@ -786,6 +925,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         mIceCtx->UpdateNetworkState(aOnline);
       },
       [](const std::string& aError) {});
@@ -796,6 +939,10 @@
   mInitPromise->Then(
       mStsThread, __func__,
       [=, self = RefPtr<MediaTransportHandlerSTS>(this)]() {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         for (auto it = mTransports.begin(); it != mTransports.end();) {
           const std::string transportId(it->first);
           if (!aTransportIds.count(transportId)) {
@@ -833,6 +980,10 @@
       mStsThread, __func__,
       [this, self = RefPtr<MediaTransportHandlerSTS>(this), aTransportId,
        aPacket = std::move(aPacket)]() mutable {
+        if (!mIceCtx) {
+          return;  // Probably due to XPCOM shutdown
+        }
+
         MOZ_ASSERT(aPacket.type() != MediaPacket::UNCLASSIFIED);
         RefPtr<TransportFlow> flow =
             GetTransportFlow(aTransportId, aPacket.type() == MediaPacket::RTCP);
@@ -895,10 +1046,11 @@
 void MediaTransportHandler::OnCandidate(const std::string& aTransportId,
                                         const CandidateInfo& aCandidateInfo) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
-    mCallbackThread->Dispatch(WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                                           &MediaTransportHandler::OnCandidate,
-                                           aTransportId, aCandidateInfo),
-                              NS_DISPATCH_NORMAL);
+    mCallbackThread->Dispatch(
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnCandidate, aTransportId,
+                     aCandidateInfo),
+        NS_DISPATCH_NORMAL);
     return;
   }
 
@@ -908,8 +1060,8 @@
 void MediaTransportHandler::OnAlpnNegotiated(const std::string& aAlpn) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnAlpnNegotiated, aAlpn),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnAlpnNegotiated, aAlpn),
         NS_DISPATCH_NORMAL);
     return;
   }
@@ -922,8 +1074,9 @@
     dom::RTCIceGatheringState aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnGatheringStateChange, aState),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnGatheringStateChange,
+                     aState),
         NS_DISPATCH_NORMAL);
     return;
   }
@@ -935,8 +1088,9 @@
     dom::RTCIceConnectionState aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnConnectionStateChange, aState),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnConnectionStateChange,
+                     aState),
         NS_DISPATCH_NORMAL);
     return;
   }
@@ -948,9 +1102,9 @@
                                              const MediaPacket& aPacket) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnPacketReceived, aTransportId,
-                     const_cast<MediaPacket&>(aPacket)),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnPacketReceived,
+                     aTransportId, const_cast<MediaPacket&>(aPacket)),
         NS_DISPATCH_NORMAL);
     return;
   }
@@ -962,9 +1116,9 @@
                                                const MediaPacket& aPacket) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnEncryptedSending, aTransportId,
-                     const_cast<MediaPacket&>(aPacket)),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnEncryptedSending,
+                     aTransportId, const_cast<MediaPacket&>(aPacket)),
         NS_DISPATCH_NORMAL);
     return;
   }
@@ -976,8 +1130,8 @@
                                           TransportLayer::State aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnStateChange, aTransportId,
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnStateChange, aTransportId,
                      aState),
         NS_DISPATCH_NORMAL);
     return;
@@ -995,9 +1149,9 @@
                                               TransportLayer::State aState) {
   if (mCallbackThread && !mCallbackThread->IsOnCurrentThread()) {
     mCallbackThread->Dispatch(
-        WrapRunnable(RefPtr<MediaTransportHandler>(this),
-                     &MediaTransportHandler::OnRtcpStateChange, aTransportId,
-                     aState),
+        // This is being called from sigslot, which does not hold a strong ref.
+        WrapRunnable(this, &MediaTransportHandler::OnRtcpStateChange,
+                     aTransportId, aState),
         NS_DISPATCH_NORMAL);
     return;
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandler.h firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandler.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandler.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandler.h	2021-01-18 19:58:10.000000000 +0000
@@ -63,8 +63,6 @@
   virtual void EnterPrivateMode() = 0;
   virtual void ExitPrivateMode() = 0;
 
-  virtual void Destroy() = 0;
-
   virtual nsresult CreateIceCtx(const std::string& aName,
                                 const nsTArray<dom::RTCIceServer>& aIceServers,
                                 dom::RTCIceTransportPolicy aIcePolicy) = 0;
@@ -129,7 +127,9 @@
   sigslot::signal2<const std::string&, TransportLayer::State> SignalStateChange;
   sigslot::signal2<const std::string&, TransportLayer::State>
       SignalRtcpStateChange;
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaTransportHandler)
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING_WITH_DESTROY(MediaTransportHandler,
+                                                     Destroy())
 
   TransportLayer::State GetState(const std::string& aTransportId,
                                  bool aRtcp) const;
@@ -148,6 +148,7 @@
                      TransportLayer::State aState);
   void OnRtcpStateChange(const std::string& aTransportId,
                          TransportLayer::State aState);
+  virtual void Destroy() = 0;
   virtual ~MediaTransportHandler() = default;
   std::map<std::string, TransportLayer::State> mStateCache;
   std::map<std::string, TransportLayer::State> mRtcpStateCache;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -152,15 +152,11 @@
 }
 
 void MediaTransportHandlerIPC::Destroy() {
-  mInitPromise->Then(
-      mCallbackThread, __func__,
-      [=, self = RefPtr<MediaTransportHandlerIPC>(this)](bool /*dummy*/) {
-        if (mChild) {
-          MediaTransportChild::Send__delete__(mChild);
-          mChild = nullptr;
-        }
-      },
-      [](const nsCString& aError) {});
+  if (mChild) {
+    MediaTransportChild::Send__delete__(mChild);
+    mChild = nullptr;
+  }
+  delete this;
 }
 
 // We will probably be able to move the proxy lookup stuff into
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportHandlerIPC.h	2021-01-18 19:58:10.000000000 +0000
@@ -25,7 +25,6 @@
   nsresult CreateIceCtx(const std::string& aName,
                         const nsTArray<dom::RTCIceServer>& aIceServers,
                         dom::RTCIceTransportPolicy aIcePolicy) override;
-  void Destroy() override;
 
   // We will probably be able to move the proxy lookup stuff into
   // this class once we move mtransport to its own process.
@@ -76,6 +75,7 @@
 
  private:
   friend class MediaTransportChild;
+  void Destroy() override;
 
   // We do not own this; it will tell us when it is going away.
   dom::PMediaTransportChild* mChild = nullptr;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportParent.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportParent.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/MediaTransportParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/MediaTransportParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -37,7 +37,6 @@
 
   virtual ~Impl() {
     disconnect_all();
-    mHandler->Destroy();
     mHandler = nullptr;
   }
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -24,6 +24,7 @@
 #include "mozilla/StaticPtr.h"
 
 #include "nsCRTGlue.h"
+#include "nsIIOService.h"
 
 #include "gmp-video-decode.h"  // GMP_API_VIDEO_DECODER
 #include "gmp-video-encode.h"  // GMP_API_VIDEO_ENCODER
@@ -117,7 +118,7 @@
     PeerConnectionCtx::gPeerConnectionCtxObserver;
 
 const std::map<const std::string, PeerConnectionImpl*>&
-PeerConnectionCtx::mGetPeerConnections() {
+PeerConnectionCtx::GetPeerConnections() {
   return mPeerConnections;
 }
 
@@ -354,7 +355,7 @@
 
   mQueuedJSEPOperations.Clear();
   mGMPService = nullptr;
-  mTransportHandler->Destroy();
+  mTransportHandler = nullptr;
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.h firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionCtx.h	2021-01-18 19:58:09.000000000 +0000
@@ -65,7 +65,7 @@
   mozilla::dom::Sequence<mozilla::dom::RTCStatsReportInternal>
       mStatsForClosedPeerConnections;
 
-  const std::map<const std::string, PeerConnectionImpl*>& mGetPeerConnections();
+  const std::map<const std::string, PeerConnectionImpl*>& GetPeerConnections();
 
  private:
   // We could make these available only via accessors but it's too much trouble.
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -429,28 +429,17 @@
 
   CopyUTF16toUTF8(locationAStr, locationCStr);
 
-  SprintfLiteral(temp, "%" PRIu64 " (id=%" PRIu64 " url=%s)",
-                 static_cast<uint64_t>(timestamp),
-                 static_cast<uint64_t>(mWindow ? mWindow->WindowID() : 0),
-                 locationCStr.get() ? locationCStr.get() : "NULL");
-
-  mName = temp;
-
-  // Generate a random handle
-  unsigned char handle_bin[8];
-  SECStatus rv;
-  rv = PK11_GenerateRandom(handle_bin, sizeof(handle_bin));
-  if (rv != SECSuccess) {
+  if (!mUuidGen->Generate(&mHandle)) {
     MOZ_CRASH();
     return NS_ERROR_UNEXPECTED;
   }
 
-  char hex[17];
-  SprintfLiteral(hex, "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", handle_bin[0],
-                 handle_bin[1], handle_bin[2], handle_bin[3], handle_bin[4],
-                 handle_bin[5], handle_bin[6], handle_bin[7]);
+  SprintfLiteral(temp, "%s %" PRIu64 " (id=%" PRIu64 " url=%s)",
+                 mHandle.c_str(), static_cast<uint64_t>(timestamp),
+                 static_cast<uint64_t>(mWindow ? mWindow->WindowID() : 0),
+                 locationCStr.get() ? locationCStr.get() : "NULL");
 
-  mHandle = hex;
+  mName = temp;
 
   STAMP_TIMECARD(mTimeCard, "Initializing PC Ctx");
   res = PeerConnectionCtx::InitializeGlobal(mThread, mSTSThread);
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionMedia.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionMedia.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/PeerConnectionMedia.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/PeerConnectionMedia.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -25,6 +25,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/net/WebrtcProxyConfig.h"
 #include "MediaManager.h"
@@ -628,6 +629,9 @@
 
   ASSERT_ON_THREAD(mMainThread);
 
+  mTransportHandler->RemoveTransportsExcept(std::set<std::string>());
+  mTransportHandler = nullptr;
+
   mMainThread = nullptr;
 
   // Final self-destruct.
@@ -641,9 +645,6 @@
 
   disconnect_all();
 
-  mTransportHandler->Destroy();
-  mTransportHandler = nullptr;
-
   // we're holding a ref to 'this' that's released by SelfDestruct_m
   mMainThread->Dispatch(
       WrapRunnable(this, &PeerConnectionMedia::SelfDestruct_m),
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/RemoteTrackSource.h firefox-85.0+build1/dom/media/webrtc/jsapi/RemoteTrackSource.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/RemoteTrackSource.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/RemoteTrackSource.h	2021-01-18 19:58:09.000000000 +0000
@@ -25,7 +25,7 @@
       dom::CallerType aCallerType) override {
     return ApplyConstraintsPromise::CreateAndReject(
         MakeRefPtr<MediaMgrError>(
-            dom::MediaStreamError::Name::OverconstrainedError, u""_ns),
+            dom::MediaStreamError::Name::OverconstrainedError, ""),
         __func__);
   }
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCDTMFSender.h firefox-85.0+build1/dom/media/webrtc/jsapi/RTCDTMFSender.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCDTMFSender.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/RTCDTMFSender.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/RefPtr.h"
 #include "js/RootingAPI.h"
+#include "nsITimer.h"
 
 class nsPIDOMWindowInner;
 class nsITimer;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCRtpReceiver.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/RTCRtpReceiver.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCRtpReceiver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/RTCRtpReceiver.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -126,6 +126,9 @@
 }
 
 RTCDtlsTransport* RTCRtpReceiver::GetTransport() const {
+  if (!mTransceiverImpl) {
+    return nullptr;
+  }
   return mTransceiverImpl->GetDtlsTransport();
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCStatsReport.h firefox-85.0+build1/dom/media/webrtc/jsapi/RTCStatsReport.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/RTCStatsReport.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/RTCStatsReport.h	2021-01-18 19:58:10.000000000 +0000
@@ -38,6 +38,9 @@
   bool mCrossOriginIsolated = false;
 };
 
+// TODO(bug 1588303): If we ever get move semantics for webidl dictionaries, we
+// can stop wrapping these in UniquePtr, which will allow us to simplify code
+// in several places.
 typedef MozPromise<UniquePtr<RTCStatsCollection>, nsresult, true>
     RTCStatsPromise;
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/TransceiverImpl.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/TransceiverImpl.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/TransceiverImpl.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/TransceiverImpl.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -90,10 +90,16 @@
 
   mTransmitPipeline->SetTrack(mSendTrack);
 
-  mTransportHandler->SignalStateChange.connect(
-      this, &TransceiverImpl::UpdateDtlsTransportState);
-  mTransportHandler->SignalRtcpStateChange.connect(
-      this, &TransceiverImpl::UpdateDtlsTransportState);
+  auto self = nsMainThreadPtrHandle<TransceiverImpl>(
+      new nsMainThreadPtrHolder<TransceiverImpl>(
+          "TransceiverImpl::TransceiverImpl::self", this, false));
+  mStsThread->Dispatch(
+      NS_NewRunnableFunction("TransceiverImpl::TransceiverImpl", [self] {
+        self->mTransportHandler->SignalStateChange.connect(
+            self.get(), &TransceiverImpl::UpdateDtlsTransportState);
+        self->mTransportHandler->SignalRtcpStateChange.connect(
+            self.get(), &TransceiverImpl::UpdateDtlsTransportState);
+      }));
 }
 
 TransceiverImpl::~TransceiverImpl() = default;
@@ -169,7 +175,13 @@
   }
   Stop();
   mTransmitPipeline = nullptr;
-  mTransportHandler = nullptr;
+  auto self = nsMainThreadPtrHandle<TransceiverImpl>(
+      new nsMainThreadPtrHolder<TransceiverImpl>(
+          "TransceiverImpl::Shutdown_m::self", this, false));
+  mStsThread->Dispatch(NS_NewRunnableFunction(__func__, [self] {
+    self->disconnect_all();
+    self->mTransportHandler = nullptr;
+  }));
 }
 
 nsresult TransceiverImpl::UpdateSendTrack(dom::MediaStreamTrack* aSendTrack) {
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalChild.h firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalChild.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -18,15 +18,15 @@
   MOZ_IMPLICIT WebrtcGlobalChild();
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
-  virtual mozilla::ipc::IPCResult RecvGetStatsRequest(
-      const int& aRequestId, const nsString& aPcIdFilter) override;
-  virtual mozilla::ipc::IPCResult RecvClearStatsRequest() override;
+  virtual mozilla::ipc::IPCResult RecvGetStats(
+      const nsString& aPcIdFilter, GetStatsResolver&& aResolve) override;
+  virtual mozilla::ipc::IPCResult RecvClearStats() override;
   // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we can't do MOZ_CAN_RUN_SCRIPT in
   // ipdl-generated things yet.
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  virtual mozilla::ipc::IPCResult RecvGetLogRequest(
-      const int& aReqestId, const nsCString& aPattern) override;
-  virtual mozilla::ipc::IPCResult RecvClearLogRequest() override;
+  virtual mozilla::ipc::IPCResult RecvGetLog(
+      GetLogResolver&& aResolve) override;
+  virtual mozilla::ipc::IPCResult RecvClearLog() override;
   virtual mozilla::ipc::IPCResult RecvSetAecLogging(
       const bool& aEnable) override;
   virtual mozilla::ipc::IPCResult RecvSetDebugMode(const int& aLevel) override;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalInformation.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,169 +7,36 @@
 #include "WebrtcGlobalChild.h"
 #include "WebrtcGlobalParent.h"
 
-#include <deque>
-#include <string>
 #include <algorithm>
 #include <vector>
-#include <map>
-#include <queue>
 #include <type_traits>
 
-#include "common/browser_logging/CSFLog.h"
-#include "common/browser_logging/WebRtcLog.h"
 #include "mozilla/dom/WebrtcGlobalInformationBinding.h"
+#include "mozilla/dom/RTCStatsReportBinding.h"  // for RTCStatsReportInternal
 #include "mozilla/dom/ContentChild.h"
 
 #include "nsNetCID.h"               // NS_SOCKETTRANSPORTSERVICE_CONTRACTID
 #include "nsServiceManagerUtils.h"  // do_GetService
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Vector.h"
-#include "nsProxyRelease.h"
+#include "nsProxyRelease.h"  // nsMainThreadPtrHolder
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
-#include "mozilla/StaticMutex.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/ClearOnShutdown.h"
 
+#include "common/browser_logging/WebRtcLog.h"
 #include "transport/runnable_utils.h"
 #include "MediaTransportHandler.h"
 #include "PeerConnectionCtx.h"
 #include "PeerConnectionImpl.h"
 
-static const char* wgiLogTag = "WebrtcGlobalInformation";
-#ifdef LOGTAG
-#  undef LOGTAG
-#endif
-#define LOGTAG wgiLogTag
-
 namespace mozilla::dom {
 
-typedef nsTArray<RTCStatsReportInternal> Stats;
-
-template <class Request, typename Callback, typename Result,
-          typename QueryParam>
-class RequestManager {
- public:
-  static Request* Create(Callback& aCallback, QueryParam& aParam) {
-    mozilla::StaticMutexAutoLock lock(sMutex);
-
-    int id = ++sLastRequestId;
-    auto result = sRequests.try_emplace(id, id, aCallback, aParam);
-
-    if (!result.second) {
-      return nullptr;
-    }
-
-    return &result.first->second;
-  }
-
-  static void Delete(int aId) {
-    mozilla::StaticMutexAutoLock lock(sMutex);
-    sRequests.erase(aId);
-  }
-
-  static Request* Get(int aId) {
-    mozilla::StaticMutexAutoLock lock(sMutex);
-    auto r = sRequests.find(aId);
-
-    if (r == sRequests.end()) {
-      return nullptr;
-    }
-
-    return &r->second;
-  }
-
-  Result mResult;
-  std::queue<RefPtr<WebrtcGlobalParent>> mContactList;
-  const int mRequestId;
-
-  RefPtr<WebrtcGlobalParent> GetNextParent() {
-    while (!mContactList.empty()) {
-      RefPtr<WebrtcGlobalParent> next = mContactList.front();
-      mContactList.pop();
-      if (next->IsActive()) {
-        return next;
-      }
-    }
-
-    return nullptr;
-  }
-
-  MOZ_CAN_RUN_SCRIPT
-  void Complete() {
-    IgnoredErrorResult rv;
-    using RealCallbackType = std::remove_pointer_t<decltype(mCallback.get())>;
-    RefPtr<RealCallbackType> callback(mCallback.get());
-    callback->Call(mResult, rv);
-
-    if (rv.Failed()) {
-      CSFLogError(LOGTAG, "Error firing stats observer callback");
-    }
-  }
-
- protected:
-  // The mutex is used to protect two related operations involving the sRequest
-  // map and the sLastRequestId. For the map, it prevents more than one thread
-  // from adding or deleting map entries at the same time. For id generation, it
-  // creates an atomic allocation and increment.
-  static mozilla::StaticMutex sMutex;
-  static std::map<int, Request> sRequests;
-  static int sLastRequestId;
-
-  Callback mCallback;
-
-  explicit RequestManager(int aId, Callback& aCallback)
-      : mRequestId(aId), mCallback(aCallback) {}
-  ~RequestManager() {}
-
- private:
-  RequestManager() = delete;
-  RequestManager& operator=(const RequestManager&) = delete;
-};
-
-template <class Request, typename Callback, typename Result,
-          typename QueryParam>
-mozilla::StaticMutex
-    RequestManager<Request, Callback, Result, QueryParam>::sMutex;
-template <class Request, typename Callback, typename Result,
-          typename QueryParam>
-std::map<int, Request>
-    RequestManager<Request, Callback, Result, QueryParam>::sRequests;
-template <class Request, typename Callback, typename Result,
-          typename QueryParam>
-int RequestManager<Request, Callback, Result, QueryParam>::sLastRequestId;
-
 typedef nsMainThreadPtrHandle<WebrtcGlobalStatisticsCallback>
     StatsRequestCallback;
 
-class StatsRequest
-    : public RequestManager<StatsRequest, StatsRequestCallback,
-                            WebrtcGlobalStatisticsReport, nsAString> {
- public:
-  const nsString mPcIdFilter;
-  explicit StatsRequest(int aId, StatsRequestCallback& aCallback,
-                        nsAString& aFilter)
-      : RequestManager(aId, aCallback), mPcIdFilter(aFilter) {}
-
- private:
-  StatsRequest() = delete;
-  StatsRequest& operator=(const StatsRequest&) = delete;
-};
-
 typedef nsMainThreadPtrHandle<WebrtcGlobalLoggingCallback> LogRequestCallback;
 
-class LogRequest : public RequestManager<LogRequest, LogRequestCallback,
-                                         Sequence<nsString>, const nsACString> {
- public:
-  const nsCString mPattern;
-  explicit LogRequest(int aId, LogRequestCallback& aCallback,
-                      const nsACString& aPattern)
-      : RequestManager(aId, aCallback), mPattern(aPattern) {}
-
- private:
-  LogRequest() = delete;
-  LogRequest& operator=(const LogRequest&) = delete;
-};
-
 class WebrtcContentParents {
  public:
   static WebrtcGlobalParent* Alloc();
@@ -213,146 +80,69 @@
   return nullptr;
 }
 
-MOZ_CAN_RUN_SCRIPT
-static void OnStatsReport_m(
-    WebrtcGlobalChild* aThisChild, const int aRequestId,
-    nsTArray<UniquePtr<dom::RTCStatsReportInternal>>&& aReports) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (aThisChild) {
-    Stats stats;
-
-    // Copy stats generated for the currently active PeerConnections
-    for (auto& report : aReports) {
-      if (report) {
-        stats.AppendElement(*report);
-      }
-    }
-    // Reports saved for closed/destroyed PeerConnections
-    auto ctx = PeerConnectionCtx::GetInstance();
-    if (ctx) {
-      for (auto& pc : ctx->mStatsForClosedPeerConnections) {
-        stats.AppendElement(pc);
+static RefPtr<PWebrtcGlobalParent::GetStatsPromise>
+GetStatsPromiseForThisProcess(const nsAString& aPcIdFilter) {
+  nsTArray<RefPtr<dom::RTCStatsReportPromise>> promises;
+
+  PeerConnectionCtx* ctx = GetPeerConnectionCtx();
+  if (ctx) {
+    // Grab stats for non-closed PCs
+    for (const auto& [id, pc] : ctx->GetPeerConnections()) {
+      if (aPcIdFilter.IsEmpty() || aPcIdFilter.EqualsASCII(id.c_str())) {
+        if (pc->HasMedia()) {
+          promises.AppendElement(pc->GetStats(nullptr, true));
+        }
       }
     }
 
-    Unused << aThisChild->SendGetStatsResult(aRequestId, stats);
-    return;
-  }
-
-  // This is the last stats report to be collected. (Must be the gecko process).
-  MOZ_ASSERT(XRE_IsParentProcess());
-
-  StatsRequest* request = StatsRequest::Get(aRequestId);
-
-  if (!request) {
-    CSFLogError(LOGTAG, "Bad RequestId");
-    return;
-  }
-
-  for (auto& report : aReports) {
-    if (report) {
-      if (!request->mResult.mReports.AppendElement(*report, fallible)) {
-        mozalloc_handle_oom(0);
+    // Grab stats for closed PCs
+    for (const auto& report : ctx->mStatsForClosedPeerConnections) {
+      if (aPcIdFilter.IsEmpty() || aPcIdFilter == report.mPcid) {
+        promises.AppendElement(dom::RTCStatsReportPromise::CreateAndResolve(
+            MakeUnique<dom::RTCStatsReportInternal>(report), __func__));
       }
     }
   }
 
-  // Reports saved for closed/destroyed PeerConnections
-  auto ctx = PeerConnectionCtx::GetInstance();
-  if (ctx) {
-    for (auto&& pc : ctx->mStatsForClosedPeerConnections) {
-      if (!request->mResult.mReports.AppendElement(pc, fallible)) {
-        // XXX(Bug 1632090) Instead of extending the array 1-by-1 (which might
-        // involve multiple reallocations) and potentially crashing here,
-        // SetCapacity could be called outside the loop once.
-        mozalloc_handle_oom(0);
+  auto UnwrapUniquePtrs = [](dom::RTCStatsReportPromise::AllSettledPromiseType::
+                                 ResolveOrRejectValue&& aResult) {
+    nsTArray<dom::RTCStatsReportInternal> reports;
+    MOZ_RELEASE_ASSERT(aResult.IsResolve(), "AllSettled should never reject!");
+    for (auto& reportResult : aResult.ResolveValue()) {
+      if (reportResult.IsResolve()) {
+        reports.AppendElement(*reportResult.ResolveValue());
       }
     }
-  }
+    return PWebrtcGlobalParent::GetStatsPromise::CreateAndResolve(
+        std::move(reports), __func__);
+  };
 
-  request->Complete();
-  StatsRequest::Delete(aRequestId);
+  return dom::RTCStatsReportPromise::AllSettled(
+             GetMainThreadSerialEventTarget(), promises)
+      ->Then(GetMainThreadSerialEventTarget(), __func__,
+             std::move(UnwrapUniquePtrs));
 }
 
-MOZ_CAN_RUN_SCRIPT
-static void OnGetLogging_m(WebrtcGlobalChild* aThisChild, const int aRequestId,
-                           Sequence<nsString>&& aLogList) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (!aLogList.IsEmpty()) {
-    if (!aLogList.AppendElement(u"+++++++ END ++++++++"_ns, fallible)) {
-      mozalloc_handle_oom(0);
-    }
-  }
-
-  if (aThisChild) {
-    // Add this log to the collection of logs and call into
-    // the next content process.
-    Unused << aThisChild->SendGetLogResult(aRequestId, aLogList);
-    return;
+static nsTArray<dom::RTCStatsReportInternal>& GetWebrtcGlobalStatsStash() {
+  static StaticAutoPtr<nsTArray<dom::RTCStatsReportInternal>> sStash;
+  if (!sStash) {
+    sStash = new nsTArray<dom::RTCStatsReportInternal>();
+    ClearOnShutdown(&sStash);
   }
-
-  // This is the last log to be collected. (Must be the gecko process).
-  MOZ_ASSERT(XRE_IsParentProcess());
-
-  LogRequest* request = LogRequest::Get(aRequestId);
-
-  if (!request) {
-    CSFLogError(LOGTAG, "Bad RequestId");
-    return;
-  }
-
-  if (!request->mResult.AppendElements(std::move(aLogList), fallible)) {
-    mozalloc_handle_oom(0);
-  }
-  request->Complete();
-  LogRequest::Delete(aRequestId);
+  return *sStash;
 }
 
-static void RunStatsQuery(
-    const std::map<const std::string, PeerConnectionImpl*>& aPeerConnections,
-    const nsAString& aPcIdFilter, WebrtcGlobalChild* aThisChild,
-    const int aRequestId) {
-  nsTArray<RefPtr<RTCStatsReportPromise>> promises;
-
-  for (auto& idAndPc : aPeerConnections) {
-    MOZ_ASSERT(idAndPc.second);
-    PeerConnectionImpl& pc = *idAndPc.second;
-    if (aPcIdFilter.IsEmpty() ||
-        aPcIdFilter.EqualsASCII(pc.GetIdAsAscii().c_str())) {
-      if (pc.HasMedia()) {
-        promises.AppendElement(
-            pc.GetStats(nullptr, true)
-                ->Then(
-                    GetMainThreadSerialEventTarget(), __func__,
-                    [=](UniquePtr<dom::RTCStatsReportInternal>&& aReport) {
-                      return RTCStatsReportPromise::CreateAndResolve(
-                          std::move(aReport), __func__);
-                    },
-                    [=](nsresult aError) {
-                      // Ignore errors! Just resolve with a nullptr.
-                      return RTCStatsReportPromise::CreateAndResolve(
-                          UniquePtr<dom::RTCStatsReportInternal>(), __func__);
-                    }));
-      }
-    }
+static std::map<int32_t, dom::Sequence<nsString>>& GetWebrtcGlobalLogStash() {
+  static StaticAutoPtr<std::map<int32_t, dom::Sequence<nsString>>> sStash;
+  if (!sStash) {
+    sStash = new std::map<int32_t, dom::Sequence<nsString>>();
+    ClearOnShutdown(&sStash);
   }
-
-  RTCStatsReportPromise::All(GetMainThreadSerialEventTarget(), promises)
-      ->Then(
-          GetMainThreadSerialEventTarget(), __func__,
-          // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we're going to run that
-          // function async anyway.
-          [aThisChild, aRequestId](
-              nsTArray<UniquePtr<dom::RTCStatsReportInternal>>&& aReports)
-              MOZ_CAN_RUN_SCRIPT_BOUNDARY {
-                OnStatsReport_m(aThisChild, aRequestId, std::move(aReports));
-              },
-          [=](nsresult) { MOZ_CRASH(); });
+  return *sStash;
 }
 
-void ClearClosedStats() {
+static void ClearClosedStats() {
+  GetWebrtcGlobalStatsStash().Clear();
   PeerConnectionCtx* ctx = GetPeerConnectionCtx();
 
   if (ctx) {
@@ -370,8 +160,8 @@
 
   if (!WebrtcContentParents::Empty()) {
     // Pass on the request to any content process based PeerConnections.
-    for (auto& cp : WebrtcContentParents::GetAll()) {
-      Unused << cp->SendClearStatsRequest();
+    for (const auto& cp : WebrtcContentParents::GetAll()) {
+      Unused << cp->SendClearStats();
     }
   }
 
@@ -389,98 +179,145 @@
 
   MOZ_ASSERT(XRE_IsParentProcess());
 
-  // CallbackObject does not support threadsafe refcounting, and must be
-  // used and destroyed on main.
-  StatsRequestCallback callbackHandle(
-      new nsMainThreadPtrHolder<WebrtcGlobalStatisticsCallback>(
-          "WebrtcGlobalStatisticsCallback", &aStatsCallback));
+  nsTArray<RefPtr<PWebrtcGlobalParent::GetStatsPromise>> statsPromises;
 
   nsString filter;
   if (pcIdFilter.WasPassed()) {
     filter = pcIdFilter.Value();
   }
 
-  auto* request = StatsRequest::Create(callbackHandle, filter);
-
-  if (!request) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
+  for (const auto& cp : WebrtcContentParents::GetAll()) {
+    statsPromises.AppendElement(cp->SendGetStats(filter));
   }
 
-  if (!WebrtcContentParents::Empty()) {
-    // Pass on the request to any content based PeerConnections.
-    for (auto& cp : WebrtcContentParents::GetAll()) {
-      request->mContactList.push(cp);
-    }
+  // Stats from this (the parent) process. How long do we keep supporting this?
+  statsPromises.AppendElement(GetStatsPromiseForThisProcess(filter));
 
-    auto next = request->GetNextParent();
-    if (next) {
-      aRv = next->SendGetStatsRequest(request->mRequestId, request->mPcIdFilter)
-                ? NS_OK
-                : NS_ERROR_FAILURE;
-      return;
-    }
-  }
-  // No content resident PeerConnectionCtx instances.
-  // Check this process.
-  PeerConnectionCtx* ctx = GetPeerConnectionCtx();
+  // CallbackObject does not support threadsafe refcounting, and must be
+  // used and destroyed on main.
+  StatsRequestCallback callbackHandle(
+      new nsMainThreadPtrHolder<WebrtcGlobalStatisticsCallback>(
+          "WebrtcGlobalStatisticsCallback", &aStatsCallback));
 
-  if (ctx) {
-    RunStatsQuery(ctx->mGetPeerConnections(), filter, nullptr,
-                  request->mRequestId);
-  } else {
-    // Just send back an empty report.
-    request->Complete();
-    StatsRequest::Delete(request->mRequestId);
-  }
+  auto FlattenThenStashThenCallback =
+      [callbackHandle,
+       filter](PWebrtcGlobalParent::GetStatsPromise::AllSettledPromiseType::
+                   ResolveOrRejectValue&& aResult) MOZ_CAN_RUN_SCRIPT_BOUNDARY {
+        std::set<nsString> pcids;
+        WebrtcGlobalStatisticsReport flattened;
+        MOZ_RELEASE_ASSERT(aResult.IsResolve(),
+                           "AllSettled should never reject!");
+        for (auto& contentProcessResult : aResult.ResolveValue()) {
+          // TODO: Report rejection on individual content processes someday?
+          if (contentProcessResult.IsResolve()) {
+            for (auto& pcStats : contentProcessResult.ResolveValue()) {
+              pcids.insert(pcStats.mPcid);
+              if (!flattened.mReports.AppendElement(std::move(pcStats),
+                                                    fallible)) {
+                mozalloc_handle_oom(0);
+              }
+            }
+          }
+        }
+
+        if (filter.IsEmpty()) {
+          // Unfiltered is pretty simple; add stuff from stash that is
+          // missing, then stomp the stash with the new reports.
+          for (auto& pcStats : GetWebrtcGlobalStatsStash()) {
+            if (!pcids.count(pcStats.mPcid)) {
+              // Stats from a closed PC or stopped content process.
+              // Content process may have gone away before we got to update
+              // this.
+              pcStats.mClosed = true;
+              if (!flattened.mReports.AppendElement(std::move(pcStats),
+                                                    fallible)) {
+                mozalloc_handle_oom(0);
+              }
+            }
+          }
+          GetWebrtcGlobalStatsStash() = flattened.mReports;
+        } else {
+          // Filtered is slightly more complex
+          if (flattened.mReports.IsEmpty()) {
+            // Find entry from stash and add it to report
+            for (auto& pcStats : GetWebrtcGlobalStatsStash()) {
+              if (pcStats.mPcid == filter) {
+                pcStats.mClosed = true;
+                if (!flattened.mReports.AppendElement(std::move(pcStats),
+                                                      fallible)) {
+                  mozalloc_handle_oom(0);
+                }
+              }
+            }
+          } else {
+            // Find entries in stash, remove them, and then add new entries
+            for (size_t i = 0; i < GetWebrtcGlobalStatsStash().Length();) {
+              auto& pcStats = GetWebrtcGlobalStatsStash()[i];
+              if (pcStats.mPcid == filter) {
+                GetWebrtcGlobalStatsStash().RemoveElementAt(i);
+              } else {
+                ++i;
+              }
+            }
+            GetWebrtcGlobalStatsStash().AppendElements(flattened.mReports);
+          }
+        }
+
+        IgnoredErrorResult rv;
+        callbackHandle->Call(flattened, rv);
+      };
+
+  PWebrtcGlobalParent::GetStatsPromise::AllSettled(
+      GetMainThreadSerialEventTarget(), statsPromises)
+      ->Then(GetMainThreadSerialEventTarget(), __func__,
+             std::move(FlattenThenStashThenCallback));
 
   aRv = NS_OK;
 }
 
-MOZ_CAN_RUN_SCRIPT
-static nsresult RunLogQuery(const nsCString& aPattern,
-                            WebrtcGlobalChild* aThisChild,
-                            const int aRequestId) {
+static RefPtr<PWebrtcGlobalParent::GetLogPromise> GetLogPromise() {
   PeerConnectionCtx* ctx = GetPeerConnectionCtx();
   if (!ctx) {
     // This process has never created a PeerConnection, so no ICE logging.
-    OnGetLogging_m(aThisChild, aRequestId, Sequence<nsString>());
-    return NS_OK;
+    return PWebrtcGlobalParent::GetLogPromise::CreateAndResolve(
+        Sequence<nsString>(), __func__);
   }
 
   nsresult rv;
   nsCOMPtr<nsISerialEventTarget> stsThread =
       do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
 
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  if (!stsThread) {
-    return NS_ERROR_FAILURE;
+  if (NS_WARN_IF(NS_FAILED(rv) || !stsThread)) {
+    return PWebrtcGlobalParent::GetLogPromise::CreateAndResolve(
+        Sequence<nsString>(), __func__);
   }
 
   RefPtr<MediaTransportHandler> transportHandler = ctx->GetTransportHandler();
 
-  InvokeAsync(stsThread, __func__,
-              [transportHandler, aPattern]() {
-                return transportHandler->GetIceLog(aPattern);
-              })
-      ->Then(
-          GetMainThreadSerialEventTarget(), __func__,
-          // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we're going to run that
-          // function async anyway.
-          [aRequestId, aThisChild](Sequence<nsString>&& aLogLines)
-              MOZ_CAN_RUN_SCRIPT_BOUNDARY {
-                OnGetLogging_m(aThisChild, aRequestId, std::move(aLogLines));
-              },
-          // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we're going to run that
-          // function async anyway.
-          [aRequestId, aThisChild](nsresult aError)
-              MOZ_CAN_RUN_SCRIPT_BOUNDARY {
-                OnGetLogging_m(aThisChild, aRequestId, Sequence<nsString>());
-              });
+  auto AddMarkers =
+      [](MediaTransportHandler::IceLogPromise::ResolveOrRejectValue&& aValue) {
+        nsString pid;
+        pid.AppendInt(getpid());
+        Sequence<nsString> logs;
+        if (aValue.IsResolve() && !aValue.ResolveValue().IsEmpty()) {
+          bool ok = logs.AppendElement(
+              u"+++++++ BEGIN (process id "_ns + pid + u") ++++++++"_ns,
+              fallible);
+          ok &=
+              !!logs.AppendElements(std::move(aValue.ResolveValue()), fallible);
+          ok &= !!logs.AppendElement(
+              u"+++++++ END (process id "_ns + pid + u") ++++++++"_ns,
+              fallible);
+          if (!ok) {
+            mozalloc_handle_oom(0);
+          }
+        }
+        return PWebrtcGlobalParent::GetLogPromise::CreateAndResolve(
+            std::move(logs), __func__);
+      };
 
-  return NS_OK;
+  return transportHandler->GetIceLog(nsCString())
+      ->Then(GetMainThreadSerialEventTarget(), __func__, std::move(AddMarkers));
 }
 
 static nsresult RunLogClear() {
@@ -516,11 +353,12 @@
 
   // Chrome-only API
   MOZ_ASSERT(XRE_IsParentProcess());
+  GetWebrtcGlobalLogStash().clear();
 
   if (!WebrtcContentParents::Empty()) {
     // Clear content process signaling logs
-    for (auto& cp : WebrtcContentParents::GetAll()) {
-      Unused << cp->SendClearLogRequest();
+    for (const auto& cp : WebrtcContentParents::GetAll()) {
+      Unused << cp->SendClearLog();
     }
   }
 
@@ -528,6 +366,44 @@
   Unused << RunLogClear();
 }
 
+static RefPtr<GenericPromise> UpdateLogStash() {
+  nsTArray<RefPtr<GenericPromise>> logPromises;
+  MOZ_ASSERT(XRE_IsParentProcess());
+  for (const auto& cp : WebrtcContentParents::GetAll()) {
+    auto StashLog =
+        [id = cp->Id() * 2 /* Make sure 1 isn't used */](
+            PWebrtcGlobalParent::GetLogPromise::ResolveOrRejectValue&& aValue) {
+          if (aValue.IsResolve() && !aValue.ResolveValue().IsEmpty()) {
+            GetWebrtcGlobalLogStash()[id] = aValue.ResolveValue();
+          }
+          return GenericPromise::CreateAndResolve(true, __func__);
+        };
+    logPromises.AppendElement(cp->SendGetLog()->Then(
+        GetMainThreadSerialEventTarget(), __func__, std::move(StashLog)));
+  }
+
+  // Get ICE logging for this (the parent) process. How long do we support this?
+  logPromises.AppendElement(GetLogPromise()->Then(
+      GetMainThreadSerialEventTarget(), __func__,
+      [](PWebrtcGlobalParent::GetLogPromise::ResolveOrRejectValue&& aValue) {
+        if (aValue.IsResolve()) {
+          GetWebrtcGlobalLogStash()[1] = aValue.ResolveValue();
+        }
+        return GenericPromise::CreateAndResolve(true, __func__);
+      }));
+
+  return GenericPromise::AllSettled(GetMainThreadSerialEventTarget(),
+                                    logPromises)
+      ->Then(GetMainThreadSerialEventTarget(), __func__,
+             [](GenericPromise::AllSettledPromiseType::ResolveOrRejectValue&&
+                    aValue) {
+               // We don't care about the value, since we're just going to copy
+               // what is in the stash. This ignores failures too, which is what
+               // we want.
+               return GenericPromise::CreateAndResolve(true, __func__);
+             });
+}
+
 void WebrtcGlobalInformation::GetLogging(
     const GlobalObject& aGlobal, const nsAString& aPattern,
     WebrtcGlobalLoggingCallback& aLoggingCallback, ErrorResult& aRv) {
@@ -538,44 +414,36 @@
 
   MOZ_ASSERT(XRE_IsParentProcess());
 
+  nsAutoCString pattern;
+  CopyUTF16toUTF8(aPattern, pattern);
+
   // CallbackObject does not support threadsafe refcounting, and must be
   // destroyed on main.
   LogRequestCallback callbackHandle(
       new nsMainThreadPtrHolder<WebrtcGlobalLoggingCallback>(
           "WebrtcGlobalLoggingCallback", &aLoggingCallback));
 
-  nsAutoCString pattern;
-  CopyUTF16toUTF8(aPattern, pattern);
-
-  LogRequest* request = LogRequest::Create(callbackHandle, pattern);
-
-  if (!request) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  if (!WebrtcContentParents::Empty()) {
-    // Pass on the request to any content based PeerConnections.
-    for (auto& cp : WebrtcContentParents::GetAll()) {
-      request->mContactList.push(cp);
-    }
-
-    auto next = request->GetNextParent();
-    if (next) {
-      aRv = next->SendGetLogRequest(request->mRequestId, request->mPattern)
-                ? NS_OK
-                : NS_ERROR_FAILURE;
-      return;
-    }
-  }
-
-  nsresult rv = RunLogQuery(request->mPattern, nullptr, request->mRequestId);
+  auto FilterThenCallback =
+      [pattern, callbackHandle](GenericPromise::ResolveOrRejectValue&& aValue)
+          MOZ_CAN_RUN_SCRIPT_BOUNDARY {
+            dom::Sequence<nsString> flattened;
+            for (const auto& [id, log] : GetWebrtcGlobalLogStash()) {
+              (void)id;
+              for (const auto& line : log) {
+                if (pattern.IsEmpty() || (line.Find(pattern) != kNotFound)) {
+                  if (!flattened.AppendElement(line, fallible)) {
+                    mozalloc_handle_oom(0);
+                  }
+                }
+              }
+            }
+            IgnoredErrorResult rv;
+            callbackHandle->Call(flattened, rv);
+          };
 
-  if (NS_FAILED(rv)) {
-    LogRequest::Delete(request->mRequestId);
-  }
-
-  aRv = rv;
+  UpdateLogStash()->Then(GetMainThreadSerialEventTarget(), __func__,
+                         std::move(FilterThenCallback));
+  aRv = NS_OK;
 }
 
 static int32_t sLastSetLevel = 0;
@@ -591,7 +459,7 @@
   }
   sLastSetLevel = aLevel;
 
-  for (auto& cp : WebrtcContentParents::GetAll()) {
+  for (const auto& cp : WebrtcContentParents::GetAll()) {
     Unused << cp->SendSetDebugMode(aLevel);
   }
 }
@@ -610,7 +478,7 @@
 
   sLastAECDebug = aEnable;
 
-  for (auto& cp : WebrtcContentParents::GetAll()) {
+  for (const auto& cp : WebrtcContentParents::GetAll()) {
     Unused << cp->SendSetAecLogging(aEnable);
   }
 }
@@ -624,85 +492,6 @@
   aDir = NS_ConvertASCIItoUTF16(sAecDebugLogDir.valueOr(""_ns));
 }
 
-mozilla::ipc::IPCResult WebrtcGlobalParent::RecvGetStatsResult(
-    const int& aRequestId, nsTArray<RTCStatsReportInternal>&& Stats) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  StatsRequest* request = StatsRequest::Get(aRequestId);
-
-  if (!request) {
-    CSFLogError(LOGTAG, "Bad RequestId");
-    return IPC_FAIL_NO_REASON(this);
-  }
-
-  for (auto& s : Stats) {
-    if (!request->mResult.mReports.AppendElement(s, fallible)) {
-      CSFLogError(LOGTAG, "Out of memory");
-      return IPC_FAIL_NO_REASON(this);
-    }
-  }
-
-  auto next = request->GetNextParent();
-  if (next) {
-    // There are more content instances to query.
-    if (!next->SendGetStatsRequest(request->mRequestId, request->mPcIdFilter)) {
-      return IPC_FAIL_NO_REASON(this);
-    }
-    return IPC_OK();
-  }
-
-  // Content queries complete, run chrome instance query if applicable
-  PeerConnectionCtx* ctx = GetPeerConnectionCtx();
-
-  if (ctx) {
-    RunStatsQuery(ctx->mGetPeerConnections(), request->mPcIdFilter, nullptr,
-                  aRequestId);
-  } else {
-    // No instance in the process, return the collections as is
-    request->Complete();
-    StatsRequest::Delete(aRequestId);
-  }
-
-  return IPC_OK();
-}
-
-mozilla::ipc::IPCResult WebrtcGlobalParent::RecvGetLogResult(
-    const int& aRequestId, const WebrtcGlobalLog& aLog) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  LogRequest* request = LogRequest::Get(aRequestId);
-
-  if (!request) {
-    CSFLogError(LOGTAG, "Bad RequestId");
-    return IPC_FAIL_NO_REASON(this);
-  }
-  if (!request->mResult.AppendElements(aLog, fallible)) {
-    CSFLogError(LOGTAG, "Out of memory");
-    return IPC_FAIL_NO_REASON(this);
-  }
-
-  auto next = request->GetNextParent();
-  if (next) {
-    // There are more content instances to query.
-    if (!next->SendGetLogRequest(request->mRequestId, request->mPattern)) {
-      return IPC_FAIL_NO_REASON(this);
-    }
-    return IPC_OK();
-  }
-
-  // Content queries complete, run chrome instance query if applicable
-  nsresult rv = RunLogQuery(request->mPattern, nullptr, aRequestId);
-
-  if (NS_FAILED(rv)) {
-    // Unable to get gecko process log. Return what has been collected.
-    CSFLogError(LOGTAG, "Unable to extract chrome process log");
-    request->Complete();
-    LogRequest::Delete(aRequestId);
-  }
-
-  return IPC_OK();
-}
-
 WebrtcGlobalParent* WebrtcGlobalParent::Alloc() {
   return WebrtcContentParents::Alloc();
 }
@@ -728,26 +517,25 @@
   MOZ_COUNT_DTOR(WebrtcGlobalParent);
 }
 
-mozilla::ipc::IPCResult WebrtcGlobalChild::RecvGetStatsRequest(
-    const int& aRequestId, const nsString& aPcIdFilter) {
-  if (mShutdown) {
-    return IPC_OK();
-  }
-
-  PeerConnectionCtx* ctx = GetPeerConnectionCtx();
-
-  if (ctx) {
-    RunStatsQuery(ctx->mGetPeerConnections(), aPcIdFilter, this, aRequestId);
+mozilla::ipc::IPCResult WebrtcGlobalChild::RecvGetStats(
+    const nsString& aPcIdFilter, GetStatsResolver&& aResolve) {
+  if (!mShutdown) {
+    GetStatsPromiseForThisProcess(aPcIdFilter)
+        ->Then(
+            GetMainThreadSerialEventTarget(), __func__,
+            [resolve = std::move(aResolve)](
+                nsTArray<dom::RTCStatsReportInternal>&& aReports) {
+              resolve(std::move(aReports));
+            },
+            []() { MOZ_CRASH(); });
     return IPC_OK();
   }
 
-  nsTArray<RTCStatsReportInternal> empty_stats;
-  SendGetStatsResult(aRequestId, empty_stats);
-
+  aResolve(nsTArray<RTCStatsReportInternal>());
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult WebrtcGlobalChild::RecvClearStatsRequest() {
+mozilla::ipc::IPCResult WebrtcGlobalChild::RecvClearStats() {
   if (mShutdown) {
     return IPC_OK();
   }
@@ -756,23 +544,28 @@
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult WebrtcGlobalChild::RecvGetLogRequest(
-    const int& aRequestId, const nsCString& aPattern) {
+mozilla::ipc::IPCResult WebrtcGlobalChild::RecvGetLog(
+    GetLogResolver&& aResolve) {
   if (mShutdown) {
+    aResolve(Sequence<nsString>());
     return IPC_OK();
   }
 
-  nsresult rv = RunLogQuery(aPattern, this, aRequestId);
-
-  if (NS_FAILED(rv)) {
-    Sequence<nsString> empty_log;
-    SendGetLogResult(aRequestId, empty_log);
-  }
+  GetLogPromise()->Then(
+      GetMainThreadSerialEventTarget(), __func__,
+      [aResolve = std::move(aResolve)](
+          PWebrtcGlobalParent::GetLogPromise::ResolveOrRejectValue&& aValue) {
+        if (aValue.IsResolve()) {
+          aResolve(aValue.ResolveValue());
+        } else {
+          aResolve(Sequence<nsString>());
+        }
+      });
 
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult WebrtcGlobalChild::RecvClearLogRequest() {
+mozilla::ipc::IPCResult WebrtcGlobalChild::RecvClearLog() {
   if (mShutdown) {
     return IPC_OK();
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalParent.h firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalParent.h
--- firefox-84.0.2+build1/dom/media/webrtc/jsapi/WebrtcGlobalParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/jsapi/WebrtcGlobalParent.h	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,6 @@
 #define _WEBRTC_GLOBAL_PARENT_H_
 
 #include "mozilla/dom/PWebrtcGlobalParent.h"
-#include "mozilla/dom/RTCStatsReportBinding.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsISupportsImpl.h"
 
@@ -27,18 +26,6 @@
   static WebrtcGlobalParent* Alloc();
   static bool Dealloc(WebrtcGlobalParent* aActor);
 
-  // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we can't do MOZ_CAN_RUN_SCRIPT in
-  // ipdl-generated things yet.
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  virtual mozilla::ipc::IPCResult RecvGetStatsResult(
-      const int& aRequestId,
-      nsTArray<RTCStatsReportInternal>&& aStats) override;
-  // MOZ_CAN_RUN_SCRIPT_BOUNDARY because we can't do MOZ_CAN_RUN_SCRIPT in
-  // ipdl-generated things yet.
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  virtual mozilla::ipc::IPCResult RecvGetLogResult(
-      const int& aRequestId, const WebrtcGlobalLog& aLog) override;
-
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
   virtual mozilla::ipc::IPCResult Recv__delete__() override;
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp firefox-85.0+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 #include "MediaData.h"
 #include "PEMFactory.h"
 #include "VideoUtils.h"
-#include "mozilla/Result.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Span.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/media/MediaUtils.h"
@@ -32,7 +32,7 @@
 
 using namespace media;
 using namespace layers;
-using MimeTypeResult = Result<nsCString, bool>;
+using MimeTypeResult = Maybe<nsLiteralCString>;
 
 static const char* GetModeName(webrtc::H264PacketizationMode aMode) {
   if (aMode == webrtc::H264PacketizationMode::SingleNalUnit) {
@@ -48,15 +48,15 @@
     const webrtc::VideoCodecType& aType) {
   switch (aType) {
     case webrtc::VideoCodecType::kVideoCodecVP8:
-      return nsCString("video/vp8");
+      return Some("video/vp8"_ns);
     case webrtc::VideoCodecType::kVideoCodecVP9:
-      return nsCString("video/vp9");
+      return Some("video/vp9"_ns);
     case webrtc::VideoCodecType::kVideoCodecH264:
-      return nsCString("video/avc");
+      return Some("video/avc"_ns);
     default:
       break;
   }
-  return MimeTypeResult(false);
+  return Nothing();
 }
 
 static MediaDataEncoder::H264Specific::ProfileLevel ConvertProfileLevel(
@@ -76,11 +76,10 @@
 }
 
 WebrtcMediaDataEncoder::WebrtcMediaDataEncoder()
-    : mCallbackMutex("WebrtcMediaDataEncoderCodec encoded callback mutex"),
-      mThreadPool(GetMediaThreadPool(MediaThreadType::SUPERVISOR)),
-      mTaskQueue(new TaskQueue(do_AddRef(mThreadPool),
+    : mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
                                "WebrtcMediaDataEncoder::mTaskQueue")),
       mFactory(new PEMFactory()),
+      mCallbackMutex("WebrtcMediaDataEncoderCodec encoded callback mutex"),
       // Use the same lower and upper bound as h264_video_toolbox_encoder which
       // is an encoder from webrtc's upstream codebase.
       // 0.5 is set as a mininum to prevent overcompensating for large temporary
@@ -98,24 +97,36 @@
   MOZ_ASSERT(
       aCodecSettings->codecType == webrtc::VideoCodecType::kVideoCodecH264,
       "Only support h264 for now.");
-  if (!CreateEncoder(aCodecSettings)) {
+
+  if (mEncoder) {
+    // Clean existing encoder.
+    Shutdown();
+  }
+
+  RefPtr<MediaDataEncoder> encoder = CreateEncoder(aCodecSettings);
+  if (!encoder) {
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
+
   LOG("Init encode, mimeType %s, mode %s", mInfo.mMimeType.get(),
       GetModeName(mMode));
-  return InitEncoder() ? WEBRTC_VIDEO_CODEC_OK : WEBRTC_VIDEO_CODEC_ERROR;
+  if (!media::Await(do_AddRef(mTaskQueue), encoder->Init()).IsResolve()) {
+    return WEBRTC_VIDEO_CODEC_ERROR;
+  }
+  mEncoder = std::move(encoder);
+  return WEBRTC_VIDEO_CODEC_OK;
 }
 
 bool WebrtcMediaDataEncoder::SetupConfig(
     const webrtc::VideoCodec* aCodecSettings) {
   MimeTypeResult mimeType =
       ConvertWebrtcCodecTypeToMimeType(aCodecSettings->codecType);
-  if (mimeType.isErr()) {
+  if (!mimeType) {
     LOG("Get incorrect mime type");
     return false;
   }
   mInfo = VideoInfo(aCodecSettings->width, aCodecSettings->height);
-  mInfo.mMimeType = mimeType.unwrap();
+  mInfo.mMimeType = mimeType.extract();
   mMode = aCodecSettings->H264().packetizationMode == 1
               ? webrtc::H264PacketizationMode::NonInterleaved
               : webrtc::H264PacketizationMode::SingleNalUnit;
@@ -128,18 +139,15 @@
   return true;
 }
 
-bool WebrtcMediaDataEncoder::CreateEncoder(
+already_AddRefed<MediaDataEncoder> WebrtcMediaDataEncoder::CreateEncoder(
     const webrtc::VideoCodec* aCodecSettings) {
   if (!SetupConfig(aCodecSettings)) {
-    return false;
-  }
-  if (mEncoder) {
-    Release();
+    return nullptr;
   }
   LOG("Request platform encoder for %s, bitRate=%u bps, frameRate=%u",
       mInfo.mMimeType.get(), mBitrateAdjuster.GetTargetBitrateBps(),
       aCodecSettings->maxFramerate);
-  mEncoder = mFactory->CreateEncoder(CreateEncoderParams(
+  return mFactory->CreateEncoder(CreateEncoderParams(
       mInfo, MediaDataEncoder::Usage::Realtime,
       MakeRefPtr<TaskQueue>(
           GetMediaThreadPool(MediaThreadType::PLATFORM_ENCODER),
@@ -147,17 +155,6 @@
       MediaDataEncoder::PixelFormat::YUV420P, aCodecSettings->maxFramerate,
       mBitrateAdjuster.GetTargetBitrateBps(),
       GetCodecSpecific(aCodecSettings)));
-  return !!mEncoder;
-}
-
-bool WebrtcMediaDataEncoder::InitEncoder() {
-  LOG("Wait until encoder successfully initialize");
-  MutexAutoLock lock(mCallbackMutex);
-  media::Await(
-      do_AddRef(mThreadPool), mEncoder->Init(),
-      [&](TrackInfo::TrackType) { mError = NS_OK; },
-      [&](const MediaResult& aError) { mError = aError; });
-  return NS_SUCCEEDED(mError);
 }
 
 int32_t WebrtcMediaDataEncoder::RegisterEncodeCompleteCallback(
@@ -174,17 +171,16 @@
     mCallback = nullptr;
     mError = NS_OK;
   }
-  mThreadPool->Dispatch(NS_NewRunnableFunction(
-      "WebrtcMediaDataEncoder::Shutdown",
-      [self = RefPtr<WebrtcMediaDataEncoder>(this),
-       encoder = RefPtr<MediaDataEncoder>(std::move(mEncoder))]() {
-        encoder->Shutdown();
-      }));
+  if (mEncoder) {
+    media::Await(do_AddRef(mTaskQueue), mEncoder->Shutdown());
+    mEncoder = nullptr;
+  }
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-RefPtr<MediaData> WebrtcMediaDataEncoder::CreateVideoDataFromWebrtcVideoFrame(
-    const webrtc::VideoFrame& aFrame, bool aIsKeyFrame) {
+static already_AddRefed<VideoData> CreateVideoDataFromWebrtcVideoFrame(
+    const webrtc::VideoFrame& aFrame, const bool aIsKeyFrame,
+    const TimeUnit aDuration) {
   MOZ_ASSERT(aFrame.video_frame_buffer()->type() ==
                  webrtc::VideoFrameBuffer::Type::kI420,
              "Only support YUV420!");
@@ -206,28 +202,29 @@
       new RecyclingPlanarYCbCrImage(new BufferRecycleBin());
   image->CopyData(yCbCrData);
 
-  RefPtr<MediaData> data = VideoData::CreateFromImage(
+  return VideoData::CreateFromImage(
       image->GetSize(), 0, TimeUnit::FromMicroseconds(aFrame.timestamp_us()),
-      TimeUnit::FromSeconds(1.0 / mMaxFrameRate), image, aIsKeyFrame,
+      aDuration, image, aIsKeyFrame,
       TimeUnit::FromMicroseconds(aFrame.timestamp()));
-  return data;
 }
 
 int32_t WebrtcMediaDataEncoder::Encode(
     const webrtc::VideoFrame& aInputFrame,
     const webrtc::CodecSpecificInfo* aCodecSpecificInfo,
     const std::vector<webrtc::FrameType>* aFrameTypes) {
-  if (!mCallback || !mEncoder) {
-    return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
-  }
-
   if (!aInputFrame.size() || !aInputFrame.video_frame_buffer() ||
       aFrameTypes->empty()) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
 
+  if (!mEncoder) {
+    return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
+  }
   {
     MutexAutoLock lock(mCallbackMutex);
+    if (!mCallback) {
+      return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
+    }
     if (NS_FAILED(mError)) {
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
@@ -236,91 +233,70 @@
   LOG_V("Encode frame, type %d size %u", (*aFrameTypes)[0], aInputFrame.size());
   MOZ_ASSERT(aInputFrame.video_frame_buffer()->type() ==
              webrtc::VideoFrameBuffer::Type::kI420);
-  RefPtr<MediaData> data = CreateVideoDataFromWebrtcVideoFrame(
-      aInputFrame, (*aFrameTypes)[0] == webrtc::FrameType::kVideoFrameKey);
-  OwnerThread()->Dispatch(NS_NewRunnableFunction(
-      "WebrtcMediaDataEncoder::Encode",
-      [self = RefPtr<WebrtcMediaDataEncoder>(this), data]() {
-        if (!self->mEncoder) {
-          return;
+  RefPtr<VideoData> data = CreateVideoDataFromWebrtcVideoFrame(
+      aInputFrame, (*aFrameTypes)[0] == webrtc::FrameType::kVideoFrameKey,
+      TimeUnit::FromSeconds(1.0 / mMaxFrameRate));
+  const gfx::IntSize displaySize = data->mDisplay;
+
+  mEncoder->Encode(data)->Then(
+      mTaskQueue, __func__,
+      [self = RefPtr<WebrtcMediaDataEncoder>(this), this,
+       displaySize](MediaDataEncoder::EncodedData aFrames) {
+        LOG_V("Received encoded frame, nums %zu width %d height %d",
+              aFrames.Length(), displaySize.width, displaySize.height);
+        for (auto& frame : aFrames) {
+          MutexAutoLock lock(mCallbackMutex);
+          if (!mCallback) {
+            break;
+          }
+          webrtc::EncodedImage image(const_cast<uint8_t*>(frame->Data()),
+                                     frame->Size(), frame->Size());
+          image._encodedWidth = displaySize.width;
+          image._encodedHeight = displaySize.height;
+          CheckedInt64 time =
+              TimeUnitToFrames(frame->mTime, cricket::kVideoCodecClockrate);
+          if (!time.isValid()) {
+            self->mError = MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
+                                       "invalid timestamp from encoder");
+            break;
+          }
+          image._timeStamp = time.value();
+          image._frameType = frame->mKeyframe
+                                 ? webrtc::FrameType::kVideoFrameKey
+                                 : webrtc::FrameType::kVideoFrameDelta;
+          image._completeFrame = true;
+
+          nsTArray<AnnexB::NALEntry> entries;
+          AnnexB::ParseNALEntries(
+              Span<const uint8_t>(frame->Data(), frame->Size()), entries);
+          const size_t nalNums = entries.Length();
+          LOG_V("NAL nums %zu", nalNums);
+          MOZ_ASSERT(nalNums, "Should have at least 1 NALU in encoded frame!");
+
+          webrtc::RTPFragmentationHeader header;
+          header.VerifyAndAllocateFragmentationHeader(nalNums);
+          for (size_t idx = 0; idx < nalNums; idx++) {
+            header.fragmentationOffset[idx] = entries[idx].mOffset;
+            header.fragmentationLength[idx] = entries[idx].mSize;
+            LOG_V("NAL offset %" PRId64 " size %" PRId64, entries[idx].mOffset,
+                  entries[idx].mSize);
+          }
+
+          webrtc::CodecSpecificInfo codecSpecific;
+          codecSpecific.codecType = webrtc::kVideoCodecH264;
+          codecSpecific.codecSpecific.H264.packetization_mode = mMode;
+
+          LOG_V("Send encoded image");
+          self->mCallback->OnEncodedImage(image, &codecSpecific, &header);
+          self->mBitrateAdjuster.Update(image._size);
         }
-        self->ProcessEncode(data);
-      }));
+      },
+      [self = RefPtr<WebrtcMediaDataEncoder>(this)](const MediaResult aError) {
+        self->mError = aError;
+      });
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-void WebrtcMediaDataEncoder::ProcessEncode(
-    const RefPtr<MediaData>& aInputData) {
-  const gfx::IntSize display = aInputData->As<VideoData>()->mDisplay;
-  mEncoder->Encode(aInputData)
-      ->Then(
-          OwnerThread(), __func__,
-          [display, self = RefPtr<WebrtcMediaDataEncoder>(this),
-           // capture this for printing address in LOG.
-           this](const MediaDataEncoder::EncodedData& aData) {
-            MutexAutoLock lock(mCallbackMutex);
-            // Callback has been unregistered.
-            if (!mCallback) {
-              return;
-            }
-            // The encoder haven't finished encoding yet.
-            if (aData.IsEmpty()) {
-              return;
-            }
-
-            LOG_V("Received encoded frame, nums %zu width %d height %d",
-                  aData.Length(), display.width, display.height);
-            for (auto& frame : aData) {
-              webrtc::EncodedImage image(const_cast<uint8_t*>(frame->Data()),
-                                         frame->Size(), frame->Size());
-              image._encodedWidth = display.width;
-              image._encodedHeight = display.height;
-              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;
-              image._completeFrame = true;
-
-              nsTArray<AnnexB::NALEntry> entries;
-              AnnexB::ParseNALEntries(
-                  Span<const uint8_t>(frame->Data(), frame->Size()), entries);
-              const size_t nalNums = entries.Length();
-              LOG_V("NAL nums %zu", nalNums);
-              MOZ_ASSERT(nalNums,
-                         "Should have at least 1 NALU in encoded frame!");
-
-              webrtc::RTPFragmentationHeader header;
-              header.VerifyAndAllocateFragmentationHeader(nalNums);
-              for (size_t idx = 0; idx < nalNums; idx++) {
-                header.fragmentationOffset[idx] = entries[idx].mOffset;
-                header.fragmentationLength[idx] = entries[idx].mSize;
-                LOG_V("NAL offset %" PRId64 " size %" PRId64,
-                      entries[idx].mOffset, entries[idx].mSize);
-              }
-
-              webrtc::CodecSpecificInfo codecSpecific;
-              codecSpecific.codecType = webrtc::kVideoCodecH264;
-              codecSpecific.codecSpecific.H264.packetization_mode = mMode;
-
-              LOG_V("Send encoded image");
-              mCallback->OnEncodedImage(image, &codecSpecific, &header);
-              mBitrateAdjuster.Update(image._size);
-            }
-          },
-          [self = RefPtr<WebrtcMediaDataEncoder>(this)](
-              const MediaResult& aError) {
-            MutexAutoLock lock(self->mCallbackMutex);
-            self->mError = aError;
-          });
-}
-
 int32_t WebrtcMediaDataEncoder::SetChannelParameters(uint32_t aPacketLoss,
                                                      int64_t aRtt) {
   return WEBRTC_VIDEO_CODEC_OK;
@@ -328,21 +304,10 @@
 
 int32_t WebrtcMediaDataEncoder::SetRates(uint32_t aNewBitrateKbps,
                                          uint32_t aFrameRate) {
-  if (!mEncoder) {
-    return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
-  }
-
   if (!aFrameRate) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
 
-  {
-    MutexAutoLock lock(mCallbackMutex);
-    if (NS_FAILED(mError)) {
-      return WEBRTC_VIDEO_CODEC_ERROR;
-    }
-  }
-
   const uint32_t newBitrateBps = aNewBitrateKbps * 1000;
   if (newBitrateBps < mMinBitrateBps || newBitrateBps > mMaxBitrateBps) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
@@ -352,11 +317,21 @@
   if (mBitrateAdjuster.GetAdjustedBitrateBps() == newBitrateBps) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
+
+  if (!mEncoder) {
+    return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
+  }
+  {
+    MutexAutoLock lock(mCallbackMutex);
+    if (NS_FAILED(mError)) {
+      return WEBRTC_VIDEO_CODEC_ERROR;
+    }
+  }
   mBitrateAdjuster.SetTargetBitrateBps(newBitrateBps);
   LOG("Set bitrate %u bps, minBitrate %u bps, maxBitrate %u bps", newBitrateBps,
       mMinBitrateBps, mMaxBitrateBps);
   auto rv =
-      media::Await(do_AddRef(mThreadPool), mEncoder->SetBitrate(newBitrateBps));
+      media::Await(do_AddRef(mTaskQueue), mEncoder->SetBitrate(newBitrateBps));
   return rv.IsResolve() ? WEBRTC_VIDEO_CODEC_OK : WEBRTC_VIDEO_CODEC_ERROR;
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.h firefox-85.0+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.h
--- firefox-84.0.2+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.h	2021-01-18 19:58:10.000000000 +0000
@@ -46,25 +46,19 @@
   virtual ~WebrtcMediaDataEncoder() = default;
 
   bool SetupConfig(const webrtc::VideoCodec* aCodecSettings);
-  bool CreateEncoder(const webrtc::VideoCodec* aCodecSettings);
+  already_AddRefed<MediaDataEncoder> CreateEncoder(
+      const webrtc::VideoCodec* aCodecSettings);
   bool InitEncoder();
-  RefPtr<MediaData> CreateVideoDataFromWebrtcVideoFrame(
-      const webrtc::VideoFrame& aFrame, bool aIsKeyFrame);
 
-  void ProcessEncode(const RefPtr<MediaData>& aInputData);
-
-  AbstractThread* OwnerThread() const { return mTaskQueue; }
-  bool OnTaskQueue() const { return OwnerThread()->IsCurrentThreadIn(); };
-
-  Mutex mCallbackMutex;
-  const RefPtr<SharedThreadPool> mThreadPool;
   const RefPtr<TaskQueue> mTaskQueue;
   const RefPtr<PEMFactory> mFactory;
   RefPtr<MediaDataEncoder> mEncoder;
+
+  Mutex mCallbackMutex;  // Protects mCallback and mError.
   webrtc::EncodedImageCallback* mCallback = nullptr;
+  MediaResult mError = NS_OK;
 
   VideoInfo mInfo;
-  MediaResult mError = NS_OK;
   webrtc::H264PacketizationMode mMode;
   webrtc::BitrateAdjuster mBitrateAdjuster;
   uint32_t mMaxFrameRate;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/MediaEngineWebRTCAudio.cpp firefox-85.0+build1/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/MediaEngineWebRTCAudio.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1272,6 +1272,7 @@
   mInputProcessing->Pull(
       GraphImpl(), aFrom, aTo, TrackTimeToGraphTime(GetEnd()),
       GetData<AudioSegment>(), aTo == GraphImpl()->mStateComputedTime, &ended);
+  ApplyTrackDisabling(mSegment.get());
   if (ended && (aFlags & ALLOW_END)) {
     mEnded = true;
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/PMediaTransport.ipdl firefox-85.0+build1/dom/media/webrtc/PMediaTransport.ipdl
--- firefox-84.0.2+build1/dom/media/webrtc/PMediaTransport.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/PMediaTransport.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -13,7 +13,7 @@
 using StringVector from "mozilla/media/webrtc/WebrtcIPCTraits.h";
 using CandidateInfo from "mozilla/media/webrtc/WebrtcIPCTraits.h";
 using DtlsDigestList from "mozilla/media/webrtc/WebrtcIPCTraits.h";
-using std::string from "ipc/IPCMessageUtils.h";
+using std::string from "string";
 using struct mozilla::dom::NotReallyMovableButLetsPretendItIsRTCStatsCollection from "mozilla/dom/RTCStatsReportBinding.h";
 using WebrtcGlobalLog from "mozilla/media/webrtc/WebrtcGlobal.h";
 using mozilla::dom::RTCIceServer from "mozilla/dom/RTCConfigurationBinding.h";
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/PWebrtcGlobal.ipdl firefox-85.0+build1/dom/media/webrtc/PWebrtcGlobal.ipdl
--- firefox-84.0.2+build1/dom/media/webrtc/PWebrtcGlobal.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/PWebrtcGlobal.ipdl	2021-01-18 19:58:09.000000000 +0000
@@ -20,14 +20,12 @@
 parent: // child -> parent messages
   async __delete__();
 #ifdef MOZ_WEBRTC
-  async GetStatsResult(int aRequestId, RTCStatsReportInternal[] aStats);
-  async GetLogResult(int aRequestId, WebrtcGlobalLog aLog);
 
 child: // parent -> child messages
-  async GetStatsRequest(int aRequestId, nsString aPcIdFilter);
-  async ClearStatsRequest();
-  async GetLogRequest(int aRequestId, nsCString aPattern);
-  async ClearLogRequest();
+  async GetStats(nsString aPcIdFilter) returns (RTCStatsReportInternal[] stats);
+  async ClearStats();
+  async GetLog() returns (WebrtcGlobalLog logs);
+  async ClearLog();
   async SetAecLogging(bool aEnable);
   async SetDebugMode(int aLevel);
 #endif
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/RTCCertificate.cpp firefox-85.0+build1/dom/media/webrtc/RTCCertificate.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/RTCCertificate.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/RTCCertificate.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -6,19 +6,52 @@
 
 #include "mozilla/dom/RTCCertificate.h"
 
-#include <cmath>
 #include <cstdio>
+#include <cstring>
+#include <memory>
+#include <new>
 #include <utility>
-
+#include "ErrorList.h"
+#include "MainThreadUtils.h"
 #include "cert.h"
-#include "jsapi.h"
-#include "mozilla/Sprintf.h"
+#include "cryptohi.h"
+#include "js/StructuredClone.h"
+#include "js/TypeDecls.h"
+#include "js/Value.h"
+#include "keyhi.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/OwningNonNull.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/CryptoBuffer.h"
 #include "mozilla/dom/CryptoKey.h"
+#include "mozilla/dom/KeyAlgorithmBinding.h"
+#include "mozilla/dom/KeyAlgorithmProxy.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/RTCCertificateBinding.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
+#include "mozilla/dom/SubtleCryptoBinding.h"
+#include "mozilla/dom/UnionTypes.h"
 #include "mozilla/dom/WebCryptoCommon.h"
 #include "mozilla/dom/WebCryptoTask.h"
+#include "mozilla/fallible.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsLiteralString.h"
+#include "nsStringFlags.h"
+#include "nsStringFwd.h"
+#include "nsTLiteralString.h"
+#include "pk11pub.h"
+#include "plarena.h"
+#include "secasn1.h"
+#include "secasn1t.h"
+#include "seccomon.h"
+#include "secmodt.h"
+#include "secoid.h"
+#include "secoidt.h"
 #include "transport/dtlsidentity.h"
+#include "xpcpublic.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/RTCCertificate.h firefox-85.0+build1/dom/media/webrtc/RTCCertificate.h
--- firefox-84.0.2+build1/dom/media/webrtc/RTCCertificate.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/RTCCertificate.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,26 +7,39 @@
 #ifndef mozilla_dom_RTCCertificate_h
 #define mozilla_dom_RTCCertificate_h
 
+#include <cstdint>
+#include "ScopedNSSTypes.h"
+#include "certt.h"
+#include "js/RootingAPI.h"
+#include "keythi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
 #include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsWrapperCache.h"
 #include "prtime.h"
 #include "sslt.h"
-#include "ScopedNSSTypes.h"
 
-#include "mozilla/ErrorResult.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/dom/CryptoKey.h"
-#include "mozilla/dom/RTCCertificateBinding.h"
-#include "js/StructuredClone.h"
-#include "js/TypeDecls.h"
+class JSObject;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
+
+namespace JS {
+class Compartment;
+}
 
 namespace mozilla {
 class DtlsIdentity;
+class ErrorResult;
+
 namespace dom {
 
+class GlobalObject;
 class ObjectOrString;
+class Promise;
 
 class RTCCertificate final : public nsISupports, public nsWrapperCache {
  public:
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/sdp/SdpAttribute.h firefox-85.0+build1/dom/media/webrtc/sdp/SdpAttribute.h
--- firefox-84.0.2+build1/dom/media/webrtc/sdp/SdpAttribute.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/sdp/SdpAttribute.h	2021-01-18 19:58:09.000000000 +0000
@@ -377,7 +377,7 @@
   };
 
   // For use by application programmers. Enforces that it's a known and
-  // non-crazy algorithm.
+  // reasonable algorithm.
   void PushEntry(std::string algorithm_str,
                  const std::vector<uint8_t>& fingerprint,
                  bool enforcePlausible = true) {
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/mochitest.ini firefox-85.0+build1/dom/media/webrtc/tests/mochitests/mochitest.ini
--- firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/tests/mochitests/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -83,7 +83,9 @@
 [test_getUserMedia_basicScreenshare.html]
 skip-if = toolkit == 'android' || (os == 'win' && webrender) # no screenshare on android, see bug 1504162 for webrender on windows
 [test_getUserMedia_basicTabshare.html]
-skip-if = toolkit == 'android' # no windowshare on android
+skip-if = 
+  toolkit == 'android' # no windowshare on android
+  os == 'win' && os_version == '10.0' && bits == 64 # Bug 1678060
 [test_getUserMedia_basicWindowshare.html]
 skip-if = toolkit == 'android' # no windowshare on android
 [test_getUserMedia_basicVideoAudio.html]
@@ -123,16 +125,19 @@
 [test_peerConnection_audioContributingSources.html]
 [test_peerConnection_checkPacketDumpHook.html]
 [test_peerConnection_basicAudioNATSrflx.html]
-skip-if = toolkit == 'android' || (verify && (os == 'linux')) || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 scheme=http
 [test_peerConnection_basicAudioNATRelay.html]
-skip-if = toolkit == 'android' || (verify && debug && (os == 'linux')) || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 scheme=http
 [test_peerConnection_basicAudioNATRelayTCP.html]
-skip-if = toolkit == 'android' || socketprocess_e10s # websockets don't work on android (bug 1266217, IPV6 is busted in try which causes timeouts in socket process case (bug 1521117))
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
+scheme=http
+[test_peerConnection_basicAudioNoisyUDPBlock.html]
+skip-if = toolkit == 'android' # websockets don't work on android (bug 1266217)
 scheme=http
 [test_peerConnection_basicAudioNATRelayTLS.html]
-skip-if = true # need pyopenssl on builders, see bug 1323439 # toolkit == 'android' || socketprocess_e10s # websockets don't work on android (bug 1266217), IPV6 is busted in try which causes timeouts in socket process case (bug 1521117)
+skip-if = true # need pyopenssl on builders, see bug 1323439 # toolkit == 'android' # websockets don't work on android (bug 1266217)
 scheme=http
 [test_peerConnection_basicAudioRequireEOC.html]
 [test_peerConnection_basicAudioPcmaPcmuOnly.html]
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html
--- firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATRelay.html	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 <script type="application/javascript">
 createHTML({
   bug: "1231975",
-  title: "Basic audio-only peer connection with port dependent NAT"
+  title: "Basic audio-only peer connection with port dependent NAT, for verifying UDP relay"
 });
 
 // This test uses the NAT simulator, which doesn't work in https, so we turn
@@ -23,6 +23,7 @@
         ['media.peerconnection.ice.obfuscate_host_addresses', false],
         ['media.peerconnection.nat_simulator.filtering_type', 'PORT_DEPENDENT'],
         ['media.peerconnection.nat_simulator.mapping_type', 'PORT_DEPENDENT'],
+        ['media.peerconnection.nat_simulator.block_tcp', true],
         ['media.getusermedia.insecure.enabled', true]);
     options.expectedLocalCandidateType = "srflx";
     options.expectedRemoteCandidateType = "relay";
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html
--- firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNATSrflx.html	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 <script type="application/javascript">
 createHTML({
   bug: "1231975",
-  title: "Basic audio-only peer connection with endpoint independent NAT"
+  title: "Basic audio-only peer connection with endpoint independent NAT, for verifying UDP srflx"
 });
 
 // This test uses the NAT simulator, which doesn't work in https, so we turn
@@ -23,6 +23,7 @@
         ['media.peerconnection.ice.obfuscate_host_addresses', false],
         ['media.peerconnection.nat_simulator.filtering_type', 'ENDPOINT_INDEPENDENT'],
         ['media.peerconnection.nat_simulator.mapping_type', 'ENDPOINT_INDEPENDENT'],
+        ['media.peerconnection.nat_simulator.block_tcp', true],
         ['media.getusermedia.insecure.enabled', true]);
     options.expectedLocalCandidateType = "srflx";
     options.expectedRemoteCandidateType = "srflx";
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNoisyUDPBlock.html firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNoisyUDPBlock.html
--- firefox-84.0.2+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNoisyUDPBlock.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/tests/mochitests/test_peerConnection_basicAudioNoisyUDPBlock.html	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script type="application/javascript" src="pc.js"></script>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+createHTML({
+  bug: "1231975",
+  title: "Basic audio-only peer connection where UDP sockets return errors on send"
+});
+
+// This test uses the NAT simulator, which doesn't work in https, so we turn
+// on getUserMedia in http, which requires a reload.
+if (!("mediaDevices" in navigator)) {
+  SpecialPowers.pushPrefEnv({set: [['media.devices.insecure.enabled', true]]},
+                            () => location.reload());
+} else {
+  runNetworkTest(async (options = {}) => {
+    await pushPrefs(
+        ['media.peerconnection.ice.obfuscate_host_addresses', false],
+        ['media.peerconnection.nat_simulator.filtering_type', 'PORT_DEPENDENT'],
+        ['media.peerconnection.nat_simulator.mapping_type', 'PORT_DEPENDENT'],
+        ['media.peerconnection.nat_simulator.block_udp', true],
+        ['media.peerconnection.nat_simulator.error_code_for_drop', 3 /*R_INTERNAL*/],
+        ['media.getusermedia.insecure.enabled', true]);
+    options.expectedLocalCandidateType = "relay-tcp";
+    options.expectedRemoteCandidateType = "relay-tcp";
+    // No reason to wait for gathering to complete like the other NAT tests,
+    // since relayed-tcp is the only thing that can work.
+    const test = new PeerConnectionTest(options);
+    test.setMediaConstraints([{audio: true}], [{audio: true}]);
+    test.run();
+  }, { useIceServer: true });
+}
+</script>
+</pre>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_linux.json	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_False_arm64_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -11230,6 +11230,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -11259,6 +11260,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -11340,7 +11342,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_linux.json	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/arm64_True_arm64_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -10835,6 +10835,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -10863,6 +10864,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/jenkins/workspace/Firefox-default/label/aarch64/firefox/obj-aarch64-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -10944,7 +10946,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_linux.json	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x64_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -10828,6 +10828,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -10854,6 +10855,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -10935,7 +10937,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_linux.json	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_False_x86_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -11407,6 +11407,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -11433,6 +11434,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -11514,7 +11516,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_linux.json	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x64_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -10538,6 +10538,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -10563,6 +10564,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -10644,7 +10646,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_linux.json firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_linux.json
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_linux.json	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/gn-configs/x64_True_x86_linux.json	2021-01-18 19:58:10.000000000 +0000
@@ -11117,6 +11117,7 @@
             ],
             "defines": [
                 "MULTI_MONITOR_SCREENSHARE",
+                "WEBRTC_USE_PIPEWIRE",
                 "V8_DEPRECATION_WARNINGS",
                 "USE_NSS_CERTS=1",
                 "USE_X11=1",
@@ -11142,6 +11143,7 @@
             ],
             "include_dirs": [
                 "/media/libyuv/libyuv/include/",
+                "/third_party/pipewire/",
                 "//",
                 "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/"
             ],
@@ -11223,7 +11225,13 @@
                 "//modules/desktop_capture/linux/desktop_device_info_x11.cc",
                 "//modules/desktop_capture/linux/desktop_device_info_x11.h",
                 "//modules/desktop_capture/linux/shared_x_util.cc",
-                "//modules/desktop_capture/linux/shared_x_util.h"
+                "//modules/desktop_capture/linux/shared_x_util.h",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/base_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/screen_capturer_pipewire.h",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.cc",
+                "//modules/desktop_capture/linux/window_capturer_pipewire.h"
             ],
             "type": "static_library"
         },
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/third_party_build/moz.build firefox-85.0+build1/dom/media/webrtc/third_party_build/moz.build
--- firefox-84.0.2+build1/dom/media/webrtc/third_party_build/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/third_party_build/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -56,6 +56,9 @@
     "../../../../third_party/libwebrtc/webrtc/video/overuse_frame_detector.cc",  # Because of name clash with call_stats.cc on kWeightFactor
 ]
 
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+    DIRS += ["../../../../third_party/pipewire/libpipewire"]
+
 GN_DIRS += ["../../../../third_party/libwebrtc/webrtc"]
 
 gn_vars_copy = gn_vars.copy()
@@ -77,3 +80,6 @@
 GN_DIRS[
     "../../../../third_party/libwebrtc/webrtc"
 ].non_unified_sources += webrtc_non_unified_sources
+GN_DIRS["../../../../third_party/libwebrtc/webrtc"].write_mozbuild_vars[
+    "INCLUDE_TK_CFLAGS_DIRS"
+] = ["third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn"]
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp firefox-85.0+build1/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/ipc/StunAddrsRequestParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
 #include "StunAddrsRequestParent.h"
 
 #include "../runnable_utils.h"
+#include "mozilla/StaticPtr.h"
+#include "nsIThread.h"
 #include "nsNetUtil.h"
 
 #include "transport/nricectx.h"
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/nricectx.cpp firefox-85.0+build1/dom/media/webrtc/transport/nricectx.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/nricectx.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/nricectx.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -420,7 +420,10 @@
 void NrIceCtx::trickle_cb(void* arg, nr_ice_ctx* ice_ctx,
                           nr_ice_media_stream* stream, int component_id,
                           nr_ice_candidate* candidate) {
-  MOZ_ASSERT(!stream->obsolete);
+  if (stream->obsolete) {
+    // Stream was probably just marked obsolete, resulting in this callback
+    return;
+  }
   // Get the ICE ctx
   NrIceCtx* ctx = static_cast<NrIceCtx*>(arg);
   RefPtr<NrIceMediaStream> s = ctx->FindStream(stream);
@@ -605,6 +608,8 @@
         TestNat::ToNatBehavior(config_.mNatSimulatorConfig->mMappingType.get());
     test_nat->block_udp_ = config_.mNatSimulatorConfig->mBlockUdp;
     test_nat->block_tcp_ = config_.mNatSimulatorConfig->mBlockTcp;
+    test_nat->error_code_for_drop_ =
+        config_.mNatSimulatorConfig->mErrorCodeForDrop;
     test_nat->enabled_ = true;
     SetNat(test_nat);
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/nricectx.h firefox-85.0+build1/dom/media/webrtc/transport/nricectx.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/nricectx.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/nricectx.h	2021-01-18 19:58:10.000000000 +0000
@@ -205,6 +205,7 @@
   struct NatSimulatorConfig {
     bool mBlockTcp = false;
     bool mBlockUdp = false;
+    int mErrorCodeForDrop = 0;
     nsCString mMappingType = "ENDPOINT_INDEPENDENT"_ns;
     nsCString mFilteringType = "ENDPOINT_INDEPENDENT"_ns;
   };
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/nricemediastream.cpp firefox-85.0+build1/dom/media/webrtc/transport/nricemediastream.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/nricemediastream.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/nricemediastream.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -193,8 +193,7 @@
 NrIceMediaStream::NrIceMediaStream(NrIceCtx* ctx, const std::string& id,
                                    const std::string& name, size_t components)
     : state_(ICE_CONNECTING),
-      ctx_(ctx->ctx()),
-      ctx_peer_(ctx->peer()),
+      ctx_(ctx),
       name_(name),
       components_(components),
       stream_(nullptr),
@@ -229,7 +228,7 @@
   }
 
   nr_ice_media_stream* peer_stream;
-  if (nr_ice_peer_ctx_find_pstream(ctx_peer_, stream_, &peer_stream)) {
+  if (nr_ice_peer_ctx_find_pstream(ctx_->peer(), stream_, &peer_stream)) {
     // No peer yet
     std::vector<char*> attributes_in;
     attributes_in.reserve(attributes.size());
@@ -240,7 +239,8 @@
 
     // Still need to call nr_ice_ctx_parse_stream_attributes.
     int r = nr_ice_peer_ctx_parse_stream_attributes(
-        ctx_peer_, stream_, attributes_in.empty() ? nullptr : &attributes_in[0],
+        ctx_->peer(), stream_,
+        attributes_in.empty() ? nullptr : &attributes_in[0],
         attributes_in.size());
     if (r) {
       MOZ_MTLOG(ML_ERROR,
@@ -269,7 +269,7 @@
 
   std::string name(name_ + " - " + ufrag + ":" + pwd);
 
-  int r = nr_ice_add_media_stream(ctx_, name.c_str(), ufrag.c_str(),
+  int r = nr_ice_add_media_stream(ctx_->ctx(), name.c_str(), ufrag.c_str(),
                                   pwd.c_str(), components_, &stream_);
   if (r) {
     MOZ_MTLOG(ML_ERROR, "Couldn't create ICE media stream for '"
@@ -292,12 +292,12 @@
     return NS_ERROR_FAILURE;
   }
 
-  MOZ_MTLOG(ML_INFO, "NrIceCtx(" << ctx_->label << ")/STREAM(" << name()
+  MOZ_MTLOG(ML_INFO, "NrIceCtx(" << ctx_->ctx()->label << ")/STREAM(" << name()
                                  << ") : parsing trickle candidate "
                                  << candidate);
 
   int r = nr_ice_peer_ctx_parse_trickle_candidate(
-      ctx_peer_, stream, const_cast<char*>(candidate.c_str()),
+      ctx_->peer(), stream, const_cast<char*>(candidate.c_str()),
       mdns_addr.c_str());
 
   if (r) {
@@ -333,8 +333,8 @@
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  r = nr_ice_media_stream_get_active(ctx_peer_, stream_, component, &local_int,
-                                     &remote_int);
+  r = nr_ice_media_stream_get_active(ctx_->peer(), stream_, component,
+                                     &local_int, &remote_int);
   // If result is R_REJECTED then component is unpaired or disabled.
   if (r == R_REJECTED) return NS_ERROR_NOT_AVAILABLE;
 
@@ -360,14 +360,14 @@
   }
 
   // If we haven't at least started checking then there is nothing to report
-  if (ctx_peer_->state != NR_ICE_PEER_STATE_PAIRED) {
+  if (ctx_->peer()->state != NR_ICE_PEER_STATE_PAIRED) {
     return NS_OK;
   }
 
   // Get the check_list on the peer stream (this is where the check_list
   // actually lives, not in stream_)
   nr_ice_media_stream* peer_stream;
-  int r = nr_ice_peer_ctx_find_pstream(ctx_peer_, stream_, &peer_stream);
+  int r = nr_ice_peer_ctx_find_pstream(ctx_->peer(), stream_, &peer_stream);
   if (r != 0) {
     return NS_ERROR_FAILURE;
   }
@@ -562,12 +562,12 @@
   }
 
   // If we haven't at least started checking then there is nothing to report
-  if (ctx_peer_->state != NR_ICE_PEER_STATE_PAIRED) {
+  if (ctx_->peer()->state != NR_ICE_PEER_STATE_PAIRED) {
     return NS_OK;
   }
 
   nr_ice_media_stream* peer_stream;
-  int r = nr_ice_peer_ctx_find_pstream(ctx_peer_, stream_, &peer_stream);
+  int r = nr_ice_peer_ctx_find_pstream(ctx_->peer(), stream_, &peer_stream);
   if (r != 0) {
     return NS_ERROR_FAILURE;
   }
@@ -592,7 +592,7 @@
   if (!stream_) return NS_ERROR_FAILURE;
 
   nr_ice_media_stream* peer_stream;
-  int r = nr_ice_peer_ctx_find_pstream(ctx_peer_, stream_, &peer_stream);
+  int r = nr_ice_peer_ctx_find_pstream(ctx_->peer(), stream_, &peer_stream);
   if (r) {
     MOZ_MTLOG(ML_ERROR, "Failed to find peer stream for '"
                             << name_ << "':" << component_id);
@@ -623,7 +623,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  int r = nr_ice_media_stream_send(ctx_peer_, stream, component_id,
+  int r = nr_ice_media_stream_send(ctx_->peer(), stream, component_id,
                                    const_cast<unsigned char*>(data), len);
   if (r) {
     MOZ_MTLOG(ML_ERROR, "Couldn't send media on '" << name_ << "'");
@@ -671,11 +671,12 @@
 
   CloseStream(&old_stream_);
   CloseStream(&stream_);
+  ctx_ = nullptr;
 }
 
 void NrIceMediaStream::CloseStream(nr_ice_media_stream** stream) {
   if (*stream) {
-    int r = nr_ice_remove_media_stream(ctx_, stream);
+    int r = nr_ice_remove_media_stream(ctx_->ctx(), stream);
     if (r) {
       MOZ_ASSERT(false, "Failed to remove stream");
       MOZ_MTLOG(ML_ERROR, "Failed to remove stream, error=" << r);
@@ -698,13 +699,13 @@
 
   nr_ice_media_stream* peer_stream = nullptr;
 
-  if (!nr_ice_peer_ctx_find_pstream(ctx_peer_, stream_, &peer_stream) &&
+  if (!nr_ice_peer_ctx_find_pstream(ctx_->peer(), stream_, &peer_stream) &&
       aUfrag == peer_stream->ufrag) {
     return stream_;
   }
 
   if (old_stream_ &&
-      !nr_ice_peer_ctx_find_pstream(ctx_peer_, old_stream_, &peer_stream) &&
+      !nr_ice_peer_ctx_find_pstream(ctx_->peer(), old_stream_, &peer_stream) &&
       aUfrag == peer_stream->ufrag) {
     return old_stream_;
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/nricemediastream.h firefox-85.0+build1/dom/media/webrtc/transport/nricemediastream.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/nricemediastream.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/nricemediastream.h	2021-01-18 19:58:10.000000000 +0000
@@ -213,8 +213,7 @@
   nr_ice_media_stream* GetStreamForRemoteUfrag(const std::string& ufrag);
 
   State state_;
-  nr_ice_ctx* ctx_;
-  nr_ice_peer_ctx* ctx_peer_;
+  RefPtr<NrIceCtx> ctx_;
   const std::string name_;
   const size_t components_;
   nr_ice_media_stream* stream_;
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/test/TestSyncRunnable.cpp firefox-85.0+build1/dom/media/webrtc/transport/test/TestSyncRunnable.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/test/TestSyncRunnable.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/test/TestSyncRunnable.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -3,6 +3,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 "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "mozilla/SyncRunnable.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/test/transport_unittests.cpp firefox-85.0+build1/dom/media/webrtc/transport/test/transport_unittests.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/test/transport_unittests.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/test/transport_unittests.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; 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,
@@ -484,9 +484,15 @@
   }
 
   void DisconnectDestroyFlow() {
-    loopback_->Disconnect();
-    disconnect_all();  // Disconnect from the signals;
-    flow_ = nullptr;
+    test_utils_->sts_target()->Dispatch(
+        NS_NewRunnableFunction(
+            __func__,
+            [this] {
+              loopback_->Disconnect();
+              disconnect_all();  // Disconnect from the signals;
+              flow_ = nullptr;
+            }),
+        NS_DISPATCH_SYNC);
   }
 
   void SetDtlsAllowAll() {
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp firefox-85.0+build1/dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/test/webrtcproxychannel_unittest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -127,6 +127,10 @@
     MOZ_ASSERT(false);
     return NS_OK;
   }
+  NS_IMETHOD SetIsPrivate(bool) override {
+    MOZ_ASSERT(false);
+    return NS_OK;
+  }
   NS_IMETHOD GetTlsFlags(uint32_t* aTlsFlags) override {
     MOZ_ASSERT(false);
     return NS_OK;
@@ -178,7 +182,7 @@
     MOZ_ASSERT(false);
     return NS_OK;
   }
-  NS_IMETHOD GetEsniUsed(bool* aEsniUsed) override {
+  NS_IMETHOD GetEchConfigUsed(bool* aEchConfigUsed) override {
     MOZ_ASSERT(false);
     return NS_OK;
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/test_nr_socket.cpp firefox-85.0+build1/dom/media/webrtc/transport/test_nr_socket.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/test_nr_socket.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/test_nr_socket.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -299,12 +299,12 @@
 
   if (nat_->nat_delegate_ &&
       nat_->nat_delegate_->on_sendto(nat_, msg, len, flags, to)) {
-    return 0;
+    return nat_->error_code_for_drop_;
   }
 
   UCHAR* buf = static_cast<UCHAR*>(const_cast<void*>(msg));
   if (nat_->block_stun_ && nr_is_stun_message(buf, len)) {
-    return 0;
+    return nat_->error_code_for_drop_;
   }
 
   /* TODO: improve the functionality of this in bug 1253657 */
@@ -322,8 +322,7 @@
   destroy_stale_port_mappings();
 
   if (to->protocol == IPPROTO_UDP && nat_->block_udp_) {
-    // Silently eat the packet
-    return 0;
+    return nat_->error_code_for_drop_;
   }
 
   // Choose our port mapping based on our most selective criteria
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/test_nr_socket.h firefox-85.0+build1/dom/media/webrtc/transport/test_nr_socket.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/test_nr_socket.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/test_nr_socket.h	2021-01-18 19:58:10.000000000 +0000
@@ -156,6 +156,7 @@
         block_udp_(false),
         block_stun_(false),
         block_tcp_(false),
+        error_code_for_drop_(0),
         delay_stun_resp_ms_(0),
         nat_delegate_(nullptr),
         sockets_() {}
@@ -185,6 +186,7 @@
   bool block_udp_;
   bool block_stun_;
   bool block_tcp_;
+  bool error_code_for_drop_;
   /* Note: this can only delay a single response so far (bug 1253657) */
   uint32_t delay_stun_resp_ms_;
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp	2021-01-18 19:58:10.000000000 +0000
@@ -258,12 +258,14 @@
                   "DONT_HAVE_ETHTOOL_SPEED_HI",
                ]
              }],
-        ['(libfuzzer == 1) and (libfuzzer_fuzzer_no_link_flag == 1)', {
+        # libFuzzer instrumentation is not compatible with TSan.
+        # See also the comment in build/moz.configure/toolchain.configure.
+        ['(libfuzzer == 1) and (tsan == 0) and (libfuzzer_fuzzer_no_link_flag == 1)', {
           'cflags_mozilla': [
             '-fsanitize=fuzzer-no-link'
          ],
         }],
-        ['(libfuzzer == 1) and (libfuzzer_fuzzer_no_link_flag == 0)', {
+        ['(libfuzzer == 1) and (tsan == 0) and (libfuzzer_fuzzer_no_link_flag == 0)', {
           'cflags_mozilla': [
             '-fsanitize-coverage=trace-pc-guard,trace-cmp'
          ],
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.c	2021-01-18 19:58:10.000000000 +0000
@@ -62,7 +62,6 @@
 #ifdef USE_TURN
 static int nr_ice_fetch_turn_servers(int ct, nr_ice_turn_server **out);
 #endif /* USE_TURN */
-static void nr_ice_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg);
 static int nr_ice_ctx_pair_new_trickle_candidates(nr_ice_ctx *ctx, nr_ice_candidate *cand);
 static int no_op(void **obj) {
   return 0;
@@ -416,20 +415,31 @@
 
     _status=0;
   abort:
-    if(_status && ctx)
-      nr_ice_ctx_destroy_cb(0,0,ctx);
+    if (_status && ctx) nr_ice_ctx_destroy(&ctx);
 
     return(_status);
   }
 
-static void nr_ice_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg)
-  {
-    nr_ice_ctx *ctx=cb_arg;
+  void nr_ice_ctx_add_flags(nr_ice_ctx* ctx, UINT4 flags) {
+    ctx->flags |= flags;
+  }
+
+  void nr_ice_ctx_remove_flags(nr_ice_ctx* ctx, UINT4 flags) {
+    ctx->flags &= ~flags;
+  }
+
+  void nr_ice_ctx_destroy(nr_ice_ctx** ctxp) {
+    if (!ctxp || !*ctxp) return;
+
+    nr_ice_ctx* ctx = *ctxp;
     nr_ice_foundation *f1,*f2;
     nr_ice_media_stream *s1,*s2;
     int i;
     nr_ice_stun_id *id1,*id2;
 
+    ctx->done_cb = 0;
+    ctx->trickle_cb = 0;
+
     STAILQ_FOREACH_SAFE(s1, &ctx->streams, entry, s2){
       STAILQ_REMOVE(&ctx->streams,s1,nr_ice_media_stream_,entry);
       nr_ice_media_stream_destroy(&s1);
@@ -466,31 +476,8 @@
     nr_socket_factory_destroy(&ctx->socket_factory);
 
     RFREE(ctx);
-  }
-
-void nr_ice_ctx_add_flags(nr_ice_ctx *ctx, UINT4 flags)
-  {
-    ctx->flags |= flags;
-  }
-
-void nr_ice_ctx_remove_flags(nr_ice_ctx *ctx, UINT4 flags)
-  {
-    ctx->flags &= ~flags;
-  }
-
-int nr_ice_ctx_destroy(nr_ice_ctx **ctxp)
-  {
-    if(!ctxp || !*ctxp)
-      return(0);
-
-    (*ctxp)->done_cb=0;
-    (*ctxp)->trickle_cb=0;
-
-    NR_ASYNC_SCHEDULE(nr_ice_ctx_destroy_cb,*ctxp);
 
     *ctxp=0;
-
-    return(0);
   }
 
 void nr_ice_gather_finished_cb(NR_SOCKET s, int h, void *cb_arg)
@@ -545,11 +532,11 @@
           /* But continue */
         }
       }
+    }
 
-      if (nr_ice_media_stream_is_done_gathering(stream) &&
-          ctx->trickle_cb) {
-        ctx->trickle_cb(ctx->trickle_cb_arg, ctx, stream, component_id, NULL);
-      }
+    if (nr_ice_media_stream_is_done_gathering(stream) &&
+        ctx->trickle_cb) {
+      ctx->trickle_cb(ctx->trickle_cb_arg, ctx, stream, component_id, NULL);
     }
 
     if(ctx->uninitialized_candidates==0){
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h	2021-01-18 19:58:10.000000000 +0000
@@ -174,7 +174,7 @@
 
 void nr_ice_ctx_add_flags(nr_ice_ctx *ctx, UINT4 flags);
 void nr_ice_ctx_remove_flags(nr_ice_ctx *ctx, UINT4 flags);
-int nr_ice_ctx_destroy(nr_ice_ctx **ctxp);
+void nr_ice_ctx_destroy(nr_ice_ctx** ctxp);
 int nr_ice_set_local_addresses(nr_ice_ctx *ctx, nr_local_addr* stun_addrs, int stun_addr_ct);
 int nr_ice_set_target_for_default_local_address_lookup(nr_ice_ctx *ctx, const char *target_ip, UINT2 target_port);
 int nr_ice_gather(nr_ice_ctx *ctx, NR_async_cb done_cb, void *cb_arg);
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.c	2021-01-18 19:58:10.000000000 +0000
@@ -42,7 +42,6 @@
 #include "async_timer.h"
 #include "ice_reg.h"
 
-static void nr_ice_peer_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg);
 static void nr_ice_peer_ctx_parse_stream_attributes_int(nr_ice_peer_ctx *pctx, nr_ice_media_stream *stream, nr_ice_media_stream *pstream, char **attrs, int attr_ct);
 static int nr_ice_ctx_parse_candidate(nr_ice_peer_ctx *pctx, nr_ice_media_stream *pstream, char *candidate, int trickled, const char *mdns_addr);
 static void nr_ice_peer_ctx_start_trickle_timer(nr_ice_peer_ctx *pctx);
@@ -81,7 +80,7 @@
     _status = 0;
   abort:
     if(_status){
-      nr_ice_peer_ctx_destroy_cb(0,0,pctx);
+      nr_ice_peer_ctx_destroy(&pctx);
     }
     return(_status);
   }
@@ -311,17 +310,17 @@
        just re-pair the stream which is inefficient but still
        fine because we suppress duplicate pairing */
     if (needs_pairing) {
-      if(r=nr_ice_media_stream_pair_candidates(pctx, stream, pstream)) {
-        r_log(LOG_ICE,LOG_ERR,"ICE(%s): peer (%s), stream(%s) failed to pair trickle ICE candidates",pctx->ctx->label,pctx->label,stream->label);
-        ABORT(r);
-      }
-
       /* Start the remote trickle grace timeout if it hasn't been started by
          another trickled candidate or from the SDP. */
       if (!pctx->trickle_grace_period_timer) {
         nr_ice_peer_ctx_start_trickle_timer(pctx);
       }
 
+      if(r=nr_ice_media_stream_pair_candidates(pctx, stream, pstream)) {
+        r_log(LOG_ICE,LOG_ERR,"ICE(%s): peer (%s), stream(%s) failed to pair trickle ICE candidates",pctx->ctx->label,pctx->label,stream->label);
+        ABORT(r);
+      }
+
       /* Start checks if this stream is not checking yet or if it has checked
          all the available candidates but not had a completed check for all
          components.
@@ -438,15 +437,15 @@
     if ((r = nr_ice_peer_ctx_find_pstream(pctx, cand->stream, &pstream)))
       ABORT(r);
 
-    if ((r = nr_ice_media_stream_pair_new_trickle_candidate(pctx, pstream, cand)))
-      ABORT(r);
-
     /* Start the remote trickle grace timeout if it hasn't been started
        already. */
     if (!pctx->trickle_grace_period_timer) {
       nr_ice_peer_ctx_start_trickle_timer(pctx);
     }
 
+    if ((r = nr_ice_media_stream_pair_new_trickle_candidate(pctx, pstream, cand)))
+      ABORT(r);
+
     _status=0;
  abort:
     return _status;
@@ -476,11 +475,15 @@
     return(_status);
   }
 
-static void nr_ice_peer_ctx_destroy_cb(NR_SOCKET s, int how, void *cb_arg)
-  {
-    nr_ice_peer_ctx *pctx=cb_arg;
+  void nr_ice_peer_ctx_destroy(nr_ice_peer_ctx** pctxp) {
+    if (!pctxp || !*pctxp) return;
+
+    nr_ice_peer_ctx* pctx = *pctxp;
     nr_ice_media_stream *str1,*str2;
 
+    /* Stop calling the handler */
+    pctx->handler = 0;
+
     NR_async_timer_cancel(pctx->connected_cb_timer);
     RFREE(pctx->label);
 
@@ -498,25 +501,10 @@
     }
 
     RFREE(pctx);
-  }
-
-int nr_ice_peer_ctx_destroy(nr_ice_peer_ctx **pctxp)
-  {
-
-    if(!pctxp || !*pctxp)
-      return(0);
-
-    /* Stop calling the handler */
-    (*pctxp)->handler = 0;
-
-    NR_ASYNC_SCHEDULE(nr_ice_peer_ctx_destroy_cb,*pctxp);
 
     *pctxp=0;
-
-    return(0);
   }
 
-
 /* Start the checks for the first media stream (S 5.7)
    The rest remain FROZEN */
 int nr_ice_peer_ctx_start_checks(nr_ice_peer_ctx *pctx)
@@ -539,11 +527,9 @@
     nr_ice_media_stream *stream;
     int started = 0;
 
-    /* Ensure that any existing grace period timers are cancelled */
-    if(pctx->trickle_grace_period_timer) {
-      NR_async_timer_cancel(pctx->trickle_grace_period_timer);
-      pctx->trickle_grace_period_timer=0;
-    }
+    /* Ensure that grace period timer is running. We might cancel this if we
+     * didn't actually start any pairs. */
+    nr_ice_peer_ctx_start_trickle_timer(pctx);
 
     /* Might have added some streams */
     pctx->reported_connected = 0;
@@ -622,12 +608,11 @@
 
     if (!started) {
       r_log(LOG_ICE,LOG_NOTICE,"ICE(%s): peer (%s) no checks to start",pctx->ctx->label,pctx->label);
+      /* Never mind on the grace period timer */
+      NR_async_timer_cancel(pctx->trickle_grace_period_timer);
+      pctx->trickle_grace_period_timer=0;
       ABORT(R_NOT_FOUND);
     }
-    else {
-      /* Start grace period timer for more remote trickle candidates. */
-      nr_ice_peer_ctx_start_trickle_timer(pctx);
-    }
 
     _status=0;
   abort:
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_peer_ctx.h	2021-01-18 19:58:10.000000000 +0000
@@ -70,7 +70,7 @@
 typedef STAILQ_HEAD(nr_ice_peer_ctx_head_, nr_ice_peer_ctx_) nr_ice_peer_ctx_head;
 
 int nr_ice_peer_ctx_create(nr_ice_ctx *ctx, nr_ice_handler *handler,char *label, nr_ice_peer_ctx **pctxp);
-int nr_ice_peer_ctx_destroy(nr_ice_peer_ctx **pctxp);
+void nr_ice_peer_ctx_destroy(nr_ice_peer_ctx** pctxp);
 int nr_ice_peer_ctx_parse_stream_attributes(nr_ice_peer_ctx *pctx, nr_ice_media_stream *stream, char **attrs, int attr_ct);
 int nr_ice_peer_ctx_find_pstream(nr_ice_peer_ctx *pctx, nr_ice_media_stream *stream, nr_ice_media_stream **pstreamp);
 int nr_ice_peer_ctx_remove_pstream(nr_ice_peer_ctx *pctx, nr_ice_media_stream **pstreamp);
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.c	2021-01-18 19:58:10.000000000 +0000
@@ -57,17 +57,21 @@
 
     r_log(LOG_ICE,LOG_DEBUG,"ICE(%s): Socket ready to read",sock->ctx->label);
 
-    /* Re-arm first! */
-    if (sock->type != NR_ICE_SOCKET_TYPE_STREAM_TCP) {
-      r_log(LOG_ICE,LOG_DEBUG,"ICE(%s): rearming",sock->ctx->label);
-      NR_ASYNC_WAIT(s,how,nr_ice_socket_readable_cb,cb_arg);
-    }
-
     if(r=nr_socket_recvfrom(sock->sock,buf,sizeof(buf),&len_s,0,&addr)){
       if (r != R_WOULDBLOCK && (sock->type != NR_ICE_SOCKET_TYPE_DGRAM)) {
         /* Report this error upward. Bug 946423 */
         r_log(LOG_ICE,LOG_ERR,"ICE(%s): Error %d on reliable socket(%p). Abandoning.",sock->ctx->label, r, s);
+        nr_ice_socket_failed(sock);
+        return;
       }
+    }
+
+    if (sock->type != NR_ICE_SOCKET_TYPE_STREAM_TCP) {
+      r_log(LOG_ICE,LOG_DEBUG,"ICE(%s): rearming",sock->ctx->label);
+      NR_ASYNC_WAIT(s,how,nr_ice_socket_readable_cb,cb_arg);
+    }
+
+    if (r) {
       return;
     }
 
@@ -374,3 +378,27 @@
     return(0);
   }
 
+void nr_ice_socket_failed(nr_ice_socket *sock)
+  {
+    nr_ice_stun_ctx *s1,*s2;
+    TAILQ_FOREACH_SAFE(s1, &sock->stun_ctxs, entry, s2){
+      switch (s1->type) {
+        case NR_ICE_STUN_NONE:
+          break;
+        case NR_ICE_STUN_CLIENT:
+          nr_stun_client_failed(s1->u.client);
+          break;
+        case NR_ICE_STUN_SERVER:
+          /* Nothing to do here? */
+          break;
+#ifdef USE_TURN
+        case NR_ICE_TURN_CLIENT:
+          nr_turn_client_failed(s1->u.turn_client.turn_client);
+          break;
+#endif
+        default:
+          assert(0);
+      }
+    }
+  }
+
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_socket.h	2021-01-18 19:58:10.000000000 +0000
@@ -89,6 +89,7 @@
 int nr_ice_socket_register_stun_server(nr_ice_socket *sock, nr_stun_server_ctx *srv,void **handle);
 int nr_ice_socket_register_turn_client(nr_ice_socket *sock, nr_turn_client_ctx *srv,nr_socket *turn_socket, void **handle);
 int nr_ice_socket_deregister(nr_ice_socket *sock, void *handle);
+void nr_ice_socket_failed(nr_ice_socket *sock);
 
 #ifdef __cplusplus
 }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2021-01-18 19:58:10.000000000 +0000
@@ -94,7 +94,7 @@
 }
 
 static int set_sockaddr(nr_local_addr *addr, struct ifaddrmsg* msg, struct rtattr* rta) {
-  assert(rta->rta_type == IFA_ADDRESS);
+  assert(rta->rta_type == IFA_ADDRESS || rta->rta_type == IFA_LOCAL);
   void *data = RTA_DATA(rta);
   size_t len = RTA_PAYLOAD(rta);
   if (msg->ifa_family == AF_INET) {
@@ -235,15 +235,27 @@
                 (struct ifaddrmsg*)NLMSG_DATA(header);
             struct rtattr* rta = IFA_RTA(address_msg);
             ssize_t payload_len = IFA_PAYLOAD(header);
+            bool found = false;
             while (RTA_OK(rta, payload_len)) {
-              if (rta->rta_type == IFA_ADDRESS) {
+              // This is a bit convoluted. IFA_ADDRESS and IFA_LOCAL are the
+              // same thing except when using a POINTTOPOINT interface, in
+              // which case IFA_LOCAL is the local address, and IFA_ADDRESS is
+              // the remote address. In a reasonable world, that would mean we
+              // could just use IFA_LOCAL all the time. Sadly, IFA_LOCAL is not
+              // always set (IPv6 in particular). So, we have to be on the
+              // lookout for both, and prefer IFA_LOCAL when present.
+              if (rta->rta_type == IFA_ADDRESS || rta->rta_type == IFA_LOCAL) {
                 int family = address_msg->ifa_family;
                 if ((family == AF_INET || family == AF_INET6) &&
-                    !stun_ifaddr_is_disallowed_v6(address_msg->ifa_flags)) {
-                  if (stun_convert_netlink(&addrs[*count], address_msg, rta)) {
-                    assert(0);
-                  } else {
-                    ++(*count);
+                    !stun_ifaddr_is_disallowed_v6(address_msg->ifa_flags) &&
+                    !stun_convert_netlink(&addrs[*count], address_msg, rta)) {
+                  found = true;
+                  if (rta->rta_type == IFA_LOCAL) {
+                    // IFA_LOCAL is what we really want; if we find it we're
+                    // done. If this is IFA_ADDRESS instead, we do not proceed
+                    // yet, and allow a subsequent IFA_LOCAL to overwrite what
+                    // we just put in |addrs|.
+                    break;
                   }
                 }
               }
@@ -252,6 +264,10 @@
                * ifaddrmsg, and set the label on all of them. */
               rta = RTA_NEXT(rta, payload_len);
             }
+
+            if (found) {
+              ++(*count);
+            }
             break;
           }
         }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c
--- firefox-84.0.2+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c	2021-01-18 19:58:10.000000000 +0000
@@ -604,6 +604,12 @@
   if (_status && _status != R_WOULDBLOCK) {
     r_log(LOG_GENERIC, LOG_ERR, "Failure in writable_cb: %d", _status);
     nr_socket_buffered_stun_failed(sock);
+    /* Report this failure up; the only way to do this is a readable callback.
+     * Once the user tries to read (using nr_socket_buffered_stun_recvfrom), it
+     * will notice that there has been a failure. */
+    if (sock->readable_cb) {
+      sock->readable_cb(s, NR_ASYNC_WAIT_READ, sock->readable_cb_arg);
+    }
   } else if (sock->pending) {
     nr_socket_buffered_stun_arm_writable_cb(sock);
   }
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/transportflow.cpp firefox-85.0+build1/dom/media/webrtc/transport/transportflow.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/transportflow.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/transportflow.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -28,11 +28,8 @@
   // destroy it simultaneously. The conversion to a UniquePtr
   // ensures automatic destruction of the queue at exit of
   // DestroyFinal.
-  MOZ_RELEASE_ASSERT(target_);
-  DebugOnly<nsresult> rv = target_->Dispatch(
-      WrapRunnableNM(&TransportFlow::DestroyFinal, std::move(layers_)),
-      NS_DISPATCH_NORMAL);
-  MOZ_ASSERT(NS_SUCCEEDED(rv));
+  CheckThread();
+  ClearLayers(layers_.get());
 }
 
 void TransportFlow::DestroyFinal(
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp firefox-85.0+build1/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "nsNetCID.h"
 #include "nsProxyRelease.h"
+#include "nsServiceManagerUtils.h"
 
 #include "nr_socket_proxy_config.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/transportbridge/MediaPipeline.cpp firefox-85.0+build1/dom/media/webrtc/transportbridge/MediaPipeline.cpp
--- firefox-84.0.2+build1/dom/media/webrtc/transportbridge/MediaPipeline.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/transportbridge/MediaPipeline.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1010,9 +1010,9 @@
     mSendPort = nullptr;
   }
 
-  if (aDomTrack && mDomTrack && !aDomTrack->Ended() && !mDomTrack->Ended() &&
-      aDomTrack->Graph() != mDomTrack->Graph() && mSendTrack) {
-    // Recreate the send track if the new stream resides in different MTG.
+  if (aDomTrack && !aDomTrack->Ended() && mSendTrack &&
+      aDomTrack->Graph() != mSendTrack->Graph()) {
+    // Recreate the send track if the new stream resides in a different MTG.
     // Stopping and re-starting will result in removing and re-adding the
     // listener BUT in different threads, since tracks belong to different MTGs.
     // This can create thread races so we wait here for the stop to happen
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/WebrtcGlobal.h firefox-85.0+build1/dom/media/webrtc/WebrtcGlobal.h
--- firefox-84.0.2+build1/dom/media/webrtc/WebrtcGlobal.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/WebrtcGlobal.h	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,8 @@
 #define _WEBRTC_GLOBAL_H_
 
 #include "WebrtcIPCTraits.h"
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/RTCDataChannelBinding.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"
diff -Nru firefox-84.0.2+build1/dom/media/webrtc/WebrtcIPCTraits.h firefox-85.0+build1/dom/media/webrtc/WebrtcIPCTraits.h
--- firefox-84.0.2+build1/dom/media/webrtc/WebrtcIPCTraits.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webrtc/WebrtcIPCTraits.h	2021-01-18 19:58:10.000000000 +0000
@@ -5,7 +5,9 @@
 #ifndef _WEBRTC_IPC_TRAITS_H_
 #define _WEBRTC_IPC_TRAITS_H_
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/RTCConfigurationBinding.h"
 #include "mozilla/media/webrtc/WebrtcGlobal.h"
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp firefox-85.0+build1/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/OnlineSpeechRecognitionService.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -14,6 +14,9 @@
 #include "SpeechRecognitionResult.h"
 #include "SpeechRecognitionResultList.h"
 #include "nsIObserverService.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/Services.h"
 #include "nsDirectoryServiceDefs.h"
@@ -21,6 +24,8 @@
 #include "nsMemory.h"
 #include "nsNetUtil.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIPrincipal.h"
 #include "nsIStreamListener.h"
 #include "nsIUploadChannel2.h"
@@ -96,14 +101,14 @@
   bool parsingSuccessful;
   nsAutoCString result;
   nsAutoCString hypoValue;
-  nsAutoString errorMsg;
+  nsAutoCString errorMsg;
   SpeechRecognitionErrorCode errorCode;
 
   SR_LOG("STT Result: %s", mBuf.get());
 
   if (NS_FAILED(aStatusCode)) {
     success = false;
-    errorMsg.Assign(u"Error connecting to the service."_ns);
+    errorMsg.AssignLiteral("Error connecting to the service.");
     errorCode = SpeechRecognitionErrorCode::Network;
   } else {
     success = true;
@@ -113,7 +118,7 @@
     if (!parsingSuccessful) {
       // there's an internal server error
       success = false;
-      errorMsg.Assign(u"Internal server error"_ns);
+      errorMsg.AssignLiteral("Internal server error");
       errorCode = SpeechRecognitionErrorCode::Network;
     } else {
       result.Assign(root.get("status", "error").asString().c_str());
@@ -124,13 +129,12 @@
           confidence = root["data"][0].get("confidence", "0").asFloat();
         } else {
           success = false;
-          errorMsg.Assign(u"Error reading result data."_ns);
+          errorMsg.AssignLiteral("Error reading result data.");
           errorCode = SpeechRecognitionErrorCode::Network;
         }
       } else {
         success = false;
-        NS_ConvertUTF8toUTF16 error(root.get("message", "").asString().c_str());
-        errorMsg.Assign(error);
+        errorMsg.Assign(root.get("message", "").asString().c_str());
         errorCode = SpeechRecognitionErrorCode::No_speech;
       }
     }
@@ -237,7 +241,7 @@
         }
         mRecognition->DispatchError(
             SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-            SpeechRecognitionErrorCode::Audio_capture, u"Encoder error"_ns);
+            SpeechRecognitionErrorCode::Audio_capture, "Encoder error");
       }));
 }
 
@@ -309,7 +313,7 @@
   if (NS_WARN_IF(NS_FAILED(rv))) {
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-        SpeechRecognitionErrorCode::Network, u"Unknown URI"_ns);
+        SpeechRecognitionErrorCode::Network, "Unknown URI");
     return;
   }
 
@@ -324,7 +328,7 @@
   if (NS_WARN_IF(!window)) {
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-        SpeechRecognitionErrorCode::Aborted, u"No window"_ns);
+        SpeechRecognitionErrorCode::Aborted, "No window");
     return;
   }
 
@@ -332,7 +336,7 @@
   if (NS_WARN_IF(!doc)) {
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-        SpeechRecognitionErrorCode::Aborted, u"No document"_ns);
+        SpeechRecognitionErrorCode::Aborted, "No document");
   }
   rv = NS_NewChannel(getter_AddRefs(chan), uri, doc->NodePrincipal(), secFlags,
                      contentPolicy, nullptr, nullptr, nullptr, nullptr,
@@ -340,7 +344,7 @@
   if (NS_WARN_IF(NS_FAILED(rv))) {
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-        SpeechRecognitionErrorCode::Network, u"Failed to open channel"_ns);
+        SpeechRecognitionErrorCode::Network, "Failed to open channel");
     return;
   }
 
@@ -385,7 +389,7 @@
     if (!audio.SetCapacity(length, fallible)) {
       mRecognition->DispatchError(
           SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-          SpeechRecognitionErrorCode::Audio_capture, u"Allocation error"_ns);
+          SpeechRecognitionErrorCode::Audio_capture, "Allocation error");
       return;
     }
 
@@ -399,7 +403,7 @@
     if (NS_WARN_IF(NS_FAILED(rv))) {
       mRecognition->DispatchError(
           SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-          SpeechRecognitionErrorCode::Network, u"Failed to open stream"_ns);
+          SpeechRecognitionErrorCode::Network, "Failed to open stream");
       return;
     }
     if (bodyStream) {
@@ -413,7 +417,7 @@
   if (NS_WARN_IF(NS_FAILED(rv))) {
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
-        SpeechRecognitionErrorCode::Network, u"Internal server error"_ns);
+        SpeechRecognitionErrorCode::Network, "Internal server error");
   }
 }
 
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechGrammar.cpp firefox-85.0+build1/dom/media/webspeech/recognition/SpeechGrammar.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechGrammar.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/SpeechGrammar.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "SpeechGrammar.h"
 
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/SpeechGrammarBinding.h"
 
 namespace mozilla::dom {
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechGrammar.h firefox-85.0+build1/dom/media/webspeech/recognition/SpeechGrammar.h
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechGrammar.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/SpeechGrammar.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,9 +14,10 @@
 #include "js/TypeDecls.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class GlobalObject;
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechRecognition.cpp firefox-85.0+build1/dom/media/webspeech/recognition/SpeechRecognition.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechRecognition.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/SpeechRecognition.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/dom/SpeechGrammar.h"
 #include "mozilla/MediaManager.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/AbstractThread.h"
@@ -28,6 +29,7 @@
 #include "endpointer.h"
 
 #include "mozilla/dom/SpeechRecognitionEvent.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/Document.h"
 #include "nsIObserverService.h"
@@ -698,7 +700,7 @@
       StateBetween(STATE_IDLE, STATE_WAITING_FOR_SPEECH)) {
     DispatchError(SpeechRecognition::EVENT_AUDIO_ERROR,
                   SpeechRecognitionErrorCode::No_speech,
-                  u"No speech detected (timeout)"_ns);
+                  "No speech detected (timeout)");
   } else if (!strcmp(aTopic, SPEECH_RECOGNITION_TEST_END_TOPIC)) {
     nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
     obs->RemoveObserver(this, SPEECH_RECOGNITION_TEST_EVENT_REQUEST_TOPIC);
@@ -719,7 +721,7 @@
     DispatchError(
         SpeechRecognition::EVENT_AUDIO_ERROR,
         SpeechRecognitionErrorCode::Audio_capture,  // TODO different codes?
-        u"AUDIO_ERROR test event"_ns);
+        "AUDIO_ERROR test event");
   } else {
     NS_ASSERTION(StaticPrefs::media_webspeech_test_fake_recognition_service(),
                  "Got request for fake recognition service event, but "
@@ -811,10 +813,15 @@
     }
   } else {
     mTrackIsOwned = true;
+    nsPIDOMWindowInner* win = GetOwner();
+    if (!win || !win->IsFullyActive()) {
+      aRv.ThrowInvalidStateError("The document is not fully active.");
+      return;
+    }
     AutoNoJSAPI nojsapi;
     RefPtr<SpeechRecognition> self(this);
     MediaManager::Get()
-        ->GetUserMedia(GetOwner(), constraints, aCallerType)
+        ->GetUserMedia(win, constraints, aCallerType)
         ->Then(
             GetCurrentSerialEventTarget(), __func__,
             [this, self,
@@ -963,7 +970,7 @@
 
 void SpeechRecognition::DispatchError(EventType aErrorType,
                                       SpeechRecognitionErrorCode aErrorCode,
-                                      const nsAString& aMessage) {
+                                      const nsACString& aMessage) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aErrorType == EVENT_RECOGNITIONSERVICE_ERROR ||
                  aErrorType == EVENT_AUDIO_ERROR,
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechRecognition.h firefox-85.0+build1/dom/media/webspeech/recognition/SpeechRecognition.h
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/SpeechRecognition.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/SpeechRecognition.h	2021-01-18 19:58:10.000000000 +0000
@@ -134,10 +134,17 @@
   };
 
   void NotifyTrackAdded(const RefPtr<MediaStreamTrack>& aTrack) override;
-
+  // aMessage should be valid UTF-8, but invalid UTF-8 byte sequences are
+  // replaced with the REPLACEMENT CHARACTER on conversion to UTF-16.
+  void DispatchError(EventType aErrorType,
+                     SpeechRecognitionErrorCode aErrorCode,
+                     const nsACString& aMessage);
+  template <int N>
   void DispatchError(EventType aErrorType,
                      SpeechRecognitionErrorCode aErrorCode,
-                     const nsAString& aMessage);
+                     const char (&aMessage)[N]) {
+    DispatchError(aErrorType, aErrorCode, nsLiteralCString(aMessage));
+  }
   uint32_t FillSamplesBuffer(const int16_t* aSamples, uint32_t aSampleCount);
   uint32_t SplitSamplesBuffer(const int16_t* aSamplesBuffer,
                               uint32_t aSampleCount,
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp firefox-85.0+build1/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -84,7 +84,7 @@
     mRecognition->DispatchError(
         SpeechRecognition::EVENT_RECOGNITIONSERVICE_ERROR,
         SpeechRecognitionErrorCode::Network,  // TODO different codes?
-        u"RECOGNITIONSERVICE_ERROR test event"_ns);
+        "RECOGNITIONSERVICE_ERROR test event");
 
   } else if (eventName.EqualsLiteral("EVENT_RECOGNITIONSERVICE_FINAL_RESULT")) {
     RefPtr<SpeechEvent> event = new SpeechEvent(
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm firefox-85.0+build1/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm
--- firefox-84.0.2+build1/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/cocoa/OSXSpeechSynthesizerService.mm	2021-01-18 19:58:10.000000000 +0000
@@ -8,7 +8,9 @@
 #include "nsServiceManagerUtils.h"
 #include "nsObjCExceptions.h"
 #include "nsCocoaUtils.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/nsSynthVoiceRegistry.h"
 #include "mozilla/dom/nsSpeechTask.h"
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/nsSpeechTask.cpp firefox-85.0+build1/dom/media/webspeech/synth/nsSpeechTask.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/synth/nsSpeechTask.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/nsSpeechTask.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "AudioSegment.h"
 #include "nsSpeechTask.h"
 #include "nsSynthVoiceRegistry.h"
+#include "nsXULAppAPI.h"
 #include "SharedBuffer.h"
 #include "SpeechSynthesis.h"
 
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/nsSpeechTask.h firefox-85.0+build1/dom/media/webspeech/synth/nsSpeechTask.h
--- firefox-84.0.2+build1/dom/media/webspeech/synth/nsSpeechTask.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/nsSpeechTask.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "SpeechSynthesisUtterance.h"
 #include "AudioChannelAgent.h"
 #include "nsISpeechService.h"
+#include "nsWeakReference.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp firefox-85.0+build1/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/intl/LocaleService.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/StaticPtr.h"
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp firefox-85.0+build1/dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/speechd/SpeechDispatcherService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsReadableUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
 #include "prlink.h"
 
 #include <math.h>
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp firefox-85.0+build1/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/test/nsFakeSynthServices.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/nsSpeechTask.h"
 
 #include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
 #include "prenv.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/DebugOnly.h"
diff -Nru firefox-84.0.2+build1/dom/media/webspeech/synth/windows/SapiService.cpp firefox-85.0+build1/dom/media/webspeech/synth/windows/SapiService.cpp
--- firefox-84.0.2+build1/dom/media/webspeech/synth/windows/SapiService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webspeech/synth/windows/SapiService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsServiceManagerUtils.h"
 #include "GeckoProfiler.h"
 #include "nsEscape.h"
+#include "nsXULAppAPI.h"
 
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/nsSynthVoiceRegistry.h"
diff -Nru firefox-84.0.2+build1/dom/media/webvtt/TextTrackCue.cpp firefox-85.0+build1/dom/media/webvtt/TextTrackCue.cpp
--- firefox-84.0.2+build1/dom/media/webvtt/TextTrackCue.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webvtt/TextTrackCue.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -3,8 +3,10 @@
  * 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/HTMLTrackElement.h"
 #include "mozilla/dom/TextTrackCue.h"
+
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/HTMLTrackElement.h"
 #include "mozilla/dom/TextTrackList.h"
 #include "mozilla/dom/TextTrackRegion.h"
 #include "nsComponentManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/media/webvtt/TextTrackCue.h firefox-85.0+build1/dom/media/webvtt/TextTrackCue.h
--- firefox-84.0.2+build1/dom/media/webvtt/TextTrackCue.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/media/webvtt/TextTrackCue.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsIWebVTTParserWrapper.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLDivElement.h"
 #include "mozilla/dom/TextTrack.h"
 #include "mozilla/StateWatching.h"
@@ -21,6 +20,7 @@
 namespace mozilla {
 namespace dom {
 
+class Document;
 class HTMLTrackElement;
 class TextTrackRegion;
 
diff -Nru firefox-84.0.2+build1/dom/media/webvtt/TextTrackCueList.h firefox-85.0+build1/dom/media/webvtt/TextTrackCueList.h
--- firefox-84.0.2+build1/dom/media/webvtt/TextTrackCueList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webvtt/TextTrackCueList.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,9 +11,10 @@
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class TextTrackCue;
diff -Nru firefox-84.0.2+build1/dom/media/webvtt/WebVTTListener.cpp firefox-85.0+build1/dom/media/webvtt/WebVTTListener.cpp
--- firefox-84.0.2+build1/dom/media/webvtt/WebVTTListener.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/media/webvtt/WebVTTListener.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "WebVTTListener.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLTrackElement.h"
 #include "mozilla/dom/TextTrackCue.h"
 #include "mozilla/dom/TextTrackRegion.h"
diff -Nru firefox-84.0.2+build1/dom/messagechannel/MessageChannel.h firefox-85.0+build1/dom/messagechannel/MessageChannel.h
--- firefox-84.0.2+build1/dom/messagechannel/MessageChannel.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/messagechannel/MessageChannel.h	2021-01-18 19:58:09.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_MessageChannel_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
@@ -17,6 +16,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MessagePort;
diff -Nru firefox-84.0.2+build1/dom/messagechannel/MessagePort.cpp firefox-85.0+build1/dom/messagechannel/MessagePort.cpp
--- firefox-84.0.2+build1/dom/messagechannel/MessagePort.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/messagechannel/MessagePort.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/dom/PMessagePort.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/StructuredCloneTags.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 #include "mozilla/dom/WorkerScope.h"
 #include "mozilla/ipc/BackgroundChild.h"
diff -Nru firefox-84.0.2+build1/dom/messagechannel/MessagePortParent.h firefox-85.0+build1/dom/messagechannel/MessagePortParent.h
--- firefox-84.0.2+build1/dom/messagechannel/MessagePortParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/messagechannel/MessagePortParent.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_MessagePortParent_h
 #define mozilla_dom_MessagePortParent_h
 
+#include "mozilla/WeakPtr.h"
 #include "mozilla/dom/PMessagePortParent.h"
 #include "mozilla/dom/quota/CheckedUnsafePtr.h"
 
@@ -17,6 +18,7 @@
 
 class MessagePortParent final
     : public PMessagePortParent,
+      public SupportsWeakPtr,
       public SupportsCheckedUnsafePtr<CheckIf<DiagnosticAssertEnabled>> {
   friend class PMessagePortParent;
 
diff -Nru firefox-84.0.2+build1/dom/messagechannel/MessagePortService.cpp firefox-85.0+build1/dom/messagechannel/MessagePortService.cpp
--- firefox-84.0.2+build1/dom/messagechannel/MessagePortService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/messagechannel/MessagePortService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
+#include "mozilla/WeakPtr.h"
 #include "nsTArray.h"
 
 using mozilla::ipc::AssertIsOnBackgroundThread;
@@ -31,17 +32,11 @@
 struct MessagePortService::NextParent {
   uint32_t mSequenceID;
   // MessagePortParent keeps the service alive, and we don't want a cycle.
-  CheckedUnsafePtr<MessagePortParent> mParent;
+  WeakPtr<MessagePortParent> mParent;
 };
 
 }  // namespace mozilla::dom
 
-// Need to call CheckedUnsafePtr's copy constructor and destructor when
-// resizing dynamic arrays containing NextParent (by calling NextParent's
-// implicit copy constructor/destructor rather than memmove-ing NextParents).
-MOZ_DECLARE_RELOCATE_USING_MOVE_CONSTRUCTOR(
-    mozilla::dom::MessagePortService::NextParent);
-
 namespace mozilla::dom {
 
 class MessagePortService::MessagePortServiceData final {
@@ -278,14 +273,13 @@
     data->mParent = nullptr;
   }
 
-  for (auto& nextParent : data->mNextParents) {
-    // CloseAndDelete may delete the pointee, so ensure no CheckedUnsafePtrs
-    // exist when that happens.
-    MessagePortParent* parent = nextParent.mParent;
-    nextParent.mParent = nullptr;
-
-    parent->CloseAndDelete();
+  for (const auto& nextParent : data->mNextParents) {
+    MessagePortParent* const parent = nextParent.mParent;
+    if (parent) {
+      parent->CloseAndDelete();
+    }
   }
+  data->mNextParents.Clear();
 
   nsID destinationUUID = data->mDestinationUUID;
 
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIAccess.h firefox-85.0+build1/dom/midi/MIDIAccess.h
--- firefox-84.0.2+build1/dom/midi/MIDIAccess.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIAccess.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Observer.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
@@ -17,6 +16,8 @@
 struct JSContext;
 
 namespace mozilla {
+class ErrorResult;
+
 // Predeclare void_t here, as including IPCMessageUtils brings in windows.h and
 // causes binding compilation problems.
 struct void_t;
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIAccessManager.cpp firefox-85.0+build1/dom/midi/MIDIAccessManager.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIAccessManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIAccessManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MIDIAccessManager.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MIDIAccess.h"
 #include "mozilla/dom/MIDIManagerChild.h"
 #include "mozilla/dom/MIDIPermissionRequest.h"
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIInput.cpp firefox-85.0+build1/dom/midi/MIDIInput.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIInput.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIInput.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MIDIInput.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MIDIPortChild.h"
 #include "mozilla/dom/MIDIInputBinding.h"
 #include "mozilla/dom/MIDIMessageEvent.h"
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIMessageEvent.cpp firefox-85.0+build1/dom/midi/MIDIMessageEvent.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIMessageEvent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIMessageEvent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "js/GCAPI.h"
 #include "jsfriendapi.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/PrimitiveConversions.h"
 #include "mozilla/dom/TypedArray.h"
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIMessageQueue.h firefox-85.0+build1/dom/midi/MIDIMessageQueue.h
--- firefox-84.0.2+build1/dom/midi/MIDIMessageQueue.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIMessageQueue.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,10 @@
 #include "mozilla/Mutex.h"
 #include "nsTArray.h"
 
+// XXX Avoid including this here by moving function implementations to the cpp
+// file.
+#include "mozilla/dom/MIDITypes.h"
+
 namespace mozilla {
 
 class TimeStamp;
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIOutput.cpp firefox-85.0+build1/dom/midi/MIDIOutput.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIOutput.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIOutput.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,7 +10,9 @@
 #include "mozilla/dom/MIDIOutputBinding.h"
 #include "mozilla/dom/MIDIUtils.h"
 #include "nsDOMNavigationTiming.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Performance.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIOutput.h firefox-85.0+build1/dom/midi/MIDIOutput.h
--- firefox-84.0.2+build1/dom/midi/MIDIOutput.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIOutput.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,12 +9,13 @@
 
 #include "mozilla/dom/MIDIPort.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 struct JSContext;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MIDIPortInfo;
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIPermissionRequest.cpp firefox-85.0+build1/dom/midi/MIDIPermissionRequest.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIPermissionRequest.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIPermissionRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/MIDIPermissionRequest.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MIDIAccessManager.h"
 #include "mozilla/dom/MIDIOptionsBinding.h"
 #include "nsIGlobalObject.h"
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIPlatformService.cpp firefox-85.0+build1/dom/midi/MIDIPlatformService.cpp
--- firefox-84.0.2+build1/dom/midi/MIDIPlatformService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIPlatformService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,8 @@
 #include "MIDIPlatformService.h"
 #include "MIDIMessageQueue.h"
 #include "TestMIDIPlatformService.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/MIDIManagerParent.h"
 #include "mozilla/dom/MIDIPlatformRunnables.h"
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIPlatformService.h firefox-85.0+build1/dom/midi/MIDIPlatformService.h
--- firefox-84.0.2+build1/dom/midi/MIDIPlatformService.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIPlatformService.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,17 +8,22 @@
 #define mozilla_dom_MIDIPlatformService_h
 
 #include "nsClassHashtable.h"
+#include "mozilla/Mutex.h"
 #include "mozilla/dom/MIDIPortBinding.h"
-#include "mozilla/dom/MIDITypes.h"
-#include "mozilla/dom/MIDIPortInterface.h"
 #include "nsHashKeys.h"
 
+// XXX Avoid including this here by moving function implementations to the cpp
+// file.
+#include "mozilla/dom/MIDIMessageQueue.h"
+
 namespace mozilla {
 namespace dom {
 
 class MIDIManagerParent;
 class MIDIPortParent;
+class MIDIMessage;
 class MIDIMessageQueue;
+class MIDIPortInfo;
 
 /**
  * Base class for platform specific MIDI implementations. Handles aggregation of
diff -Nru firefox-84.0.2+build1/dom/midi/MIDIPort.h firefox-85.0+build1/dom/midi/MIDIPort.h
--- firefox-84.0.2+build1/dom/midi/MIDIPort.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/MIDIPort.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,7 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Observer.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/MIDIAccess.h"
 #include "mozilla/dom/MIDIPortInterface.h"
 
diff -Nru firefox-84.0.2+build1/dom/midi/TestMIDIPlatformService.cpp firefox-85.0+build1/dom/midi/TestMIDIPlatformService.cpp
--- firefox-84.0.2+build1/dom/midi/TestMIDIPlatformService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/TestMIDIPlatformService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/dom/MIDIUtils.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/Unused.h"
+#include "nsIThread.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/midi/TestMIDIPlatformService.h firefox-85.0+build1/dom/midi/TestMIDIPlatformService.h
--- firefox-84.0.2+build1/dom/midi/TestMIDIPlatformService.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/midi/TestMIDIPlatformService.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/dom/MIDIPlatformService.h"
 #include "mozilla/dom/MIDITypes.h"
 
+class nsIThread;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/moz.build firefox-85.0+build1/dom/moz.build
--- firefox-84.0.2+build1/dom/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -101,6 +101,7 @@
     "script",
     "payments",
     "websocket",
+    "serializers",
     "serviceworkers",
     "simpledb",
     "reporting",
diff -Nru firefox-84.0.2+build1/dom/network/PTCPSocket.ipdl firefox-85.0+build1/dom/network/PTCPSocket.ipdl
--- firefox-84.0.2+build1/dom/network/PTCPSocket.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/network/PTCPSocket.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 
 include "mozilla/net/NeckoMessageUtils.h";
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 struct TCPError {
   nsString name;
diff -Nru firefox-84.0.2+build1/dom/network/PUDPSocket.ipdl firefox-85.0+build1/dom/network/PUDPSocket.ipdl
--- firefox-84.0.2+build1/dom/network/PUDPSocket.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/network/PUDPSocket.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -18,7 +18,7 @@
 include "prio.h";
 
 using mozilla::net::NetAddr from "mozilla/net/DNS.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 struct UDPAddressInfo {
   nsCString addr;
diff -Nru firefox-84.0.2+build1/dom/network/TCPServerSocket.cpp firefox-85.0+build1/dom/network/TCPServerSocket.cpp
--- firefox-84.0.2+build1/dom/network/TCPServerSocket.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/network/TCPServerSocket.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/ErrorResult.h"
 #include "TCPServerSocket.h"
 #include "TCPSocket.h"
+#include "nsComponentManagerUtils.h"
 
 using namespace mozilla::dom;
 
diff -Nru firefox-84.0.2+build1/dom/network/TCPSocketChild.cpp firefox-85.0+build1/dom/network/TCPSocketChild.cpp
--- firefox-84.0.2+build1/dom/network/TCPSocketChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/network/TCPSocketChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include "TCPSocketChild.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Unused.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/net/NeckoChild.h"
diff -Nru firefox-84.0.2+build1/dom/network/TCPSocket.cpp firefox-85.0+build1/dom/network/TCPSocket.cpp
--- firefox-84.0.2+build1/dom/network/TCPSocket.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/network/TCPSocket.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "TCPServerSocket.h"
 #include "TCPSocketChild.h"
 #include "TCPSocketParent.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/TCPSocketBinding.h"
 #include "mozilla/dom/TCPSocketErrorEvent.h"
@@ -17,6 +18,7 @@
 #include "mozilla/dom/TCPSocketEvent.h"
 #include "mozilla/dom/TCPSocketEventBinding.h"
 #include "mozilla/dom/ToJSValue.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIArrayBufferInputStream.h"
 #include "nsISocketTransportService.h"
@@ -24,14 +26,17 @@
 #include "nsIMultiplexInputStream.h"
 #include "nsIAsyncStreamCopier.h"
 #include "nsIInputStream.h"
+#include "nsIInputStreamPump.h"
 #include "nsIBinaryInputStream.h"
 #include "nsIScriptableInputStream.h"
 #include "nsIAsyncInputStream.h"
 #include "nsISupportsPrimitives.h"
 #include "nsITransport.h"
+#include "nsIObserverService.h"
 #include "nsIOutputStream.h"
 #include "nsINSSErrorsService.h"
 #include "nsISSLSocketControl.h"
+#include "nsServiceManagerUtils.h"
 #include "nsStringStream.h"
 #include "secerr.h"
 #include "sslerr.h"
diff -Nru firefox-84.0.2+build1/dom/network/TCPSocket.h firefox-85.0+build1/dom/network/TCPSocket.h
--- firefox-84.0.2+build1/dom/network/TCPSocket.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/network/TCPSocket.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_TCPSocket_h
 
 #include "mozilla/dom/TCPSocketBinding.h"
+#include "mozilla/dom/TypedArray.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "nsITransport.h"
 #include "nsIStreamListener.h"
diff -Nru firefox-84.0.2+build1/dom/network/UDPSocketChild.h firefox-85.0+build1/dom/network/UDPSocketChild.h
--- firefox-84.0.2+build1/dom/network/UDPSocketChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/network/UDPSocketChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -18,6 +18,8 @@
     }                                                \
   }
 
+class nsIInputStream;
+class nsIPrincipal;
 class nsIUDPSocketInternal;
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/network/UDPSocket.h firefox-85.0+build1/dom/network/UDPSocket.h
--- firefox-84.0.2+build1/dom/network/UDPSocket.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/network/UDPSocket.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/SocketCommonBinding.h"
 #include "nsIUDPSocket.h"
@@ -23,6 +22,9 @@
 //
 
 namespace mozilla {
+class ErrorResult;
+class LazyLogModule;
+
 namespace net {
 extern LazyLogModule gUDPSocketLog;
 #define UDPSOCKET_LOG(args) \
diff -Nru firefox-84.0.2+build1/dom/network/UDPSocketParent.cpp firefox-85.0+build1/dom/network/UDPSocketParent.cpp
--- firefox-84.0.2+build1/dom/network/UDPSocketParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/network/UDPSocketParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIUDPSocket.h"
 #include "nsINetAddr.h"
+#include "nsNetCID.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/ipc/InputStreamUtils.h"
diff -Nru firefox-84.0.2+build1/dom/notification/Notification.cpp firefox-85.0+build1/dom/notification/Notification.cpp
--- firefox-84.0.2+build1/dom/notification/Notification.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/notification/Notification.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Components.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/EventStateManager.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/JSONWriter.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/Preferences.h"
@@ -1851,7 +1852,7 @@
     if (alertService) {
       nsAutoString alertName;
       GetAlertName(alertName);
-      alertService->CloseAlert(alertName, GetPrincipal());
+      alertService->CloseAlert(alertName);
     }
   }
 }
diff -Nru firefox-84.0.2+build1/dom/offline/nsDOMOfflineResourceList.cpp firefox-85.0+build1/dom/offline/nsDOMOfflineResourceList.cpp
--- firefox-84.0.2+build1/dom/offline/nsDOMOfflineResourceList.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/offline/nsDOMOfflineResourceList.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -21,9 +21,11 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
 #include "nsOfflineCacheUpdate.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/OfflineResourceListBinding.h"
 #include "mozilla/EventDispatcher.h"
+#include "mozilla/EventListenerManager.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/StaticPrefs_browser.h"
diff -Nru firefox-84.0.2+build1/dom/payments/BasicCardPayment.cpp firefox-85.0+build1/dom/payments/BasicCardPayment.cpp
--- firefox-84.0.2+build1/dom/payments/BasicCardPayment.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/payments/BasicCardPayment.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "BasicCardPayment.h"
 #include "PaymentAddress.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/ErrorResult.h"
 #include "nsArrayUtils.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsDataHashtable.h"
diff -Nru firefox-84.0.2+build1/dom/payments/ipc/PPaymentRequest.ipdl firefox-85.0+build1/dom/payments/ipc/PPaymentRequest.ipdl
--- firefox-84.0.2+build1/dom/payments/ipc/PPaymentRequest.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/ipc/PPaymentRequest.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -5,7 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PBrowser;
-using refcounted class nsIPrincipal from "mozilla/dom/PermissionMessageUtils.h";
+
+include "mozilla/dom/PermissionMessageUtils.h";
+
+using refcounted class nsIPrincipal from "nsIPrincipal.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/payments/MerchantValidationEvent.cpp firefox-85.0+build1/dom/payments/MerchantValidationEvent.cpp
--- firefox-84.0.2+build1/dom/payments/MerchantValidationEvent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/MerchantValidationEvent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/MerchantValidationEvent.h"
 #include "nsNetCID.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/PaymentRequest.h"
 #include "mozilla/dom/Location.h"
 #include "mozilla/dom/URL.h"
diff -Nru firefox-84.0.2+build1/dom/payments/MerchantValidationEvent.h firefox-85.0+build1/dom/payments/MerchantValidationEvent.h
--- firefox-84.0.2+build1/dom/payments/MerchantValidationEvent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/MerchantValidationEvent.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,13 +8,16 @@
 #define mozilla_dom_MerchantValidationEvent_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Result.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/MerchantValidationEventBinding.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 
+class nsIURI;
+
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Promise;
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentActionResponse.h firefox-85.0+build1/dom/payments/PaymentActionResponse.h
--- firefox-84.0.2+build1/dom/payments/PaymentActionResponse.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentActionResponse.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIPaymentActionResponse.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentMethodChangeEvent.cpp firefox-85.0+build1/dom/payments/PaymentMethodChangeEvent.cpp
--- firefox-84.0.2+build1/dom/payments/PaymentMethodChangeEvent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentMethodChangeEvent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "BasicCardPayment.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/PaymentMethodChangeEvent.h"
 #include "mozilla/dom/PaymentRequestUpdateEvent.h"
 #include "PaymentRequestUtils.h"
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentMethodChangeEvent.h firefox-85.0+build1/dom/payments/PaymentMethodChangeEvent.h
--- firefox-84.0.2+build1/dom/payments/PaymentMethodChangeEvent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentMethodChangeEvent.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_PaymentMethodChangeEvent_h
 #define mozilla_dom_PaymentMethodChangeEvent_h
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/PaymentMethodChangeEventBinding.h"
 #include "mozilla/dom/PaymentRequestUpdateEvent.h"
 #include "mozilla/dom/PaymentRequest.h"
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentRequest.cpp firefox-85.0+build1/dom/payments/PaymentRequest.cpp
--- firefox-84.0.2+build1/dom/payments/PaymentRequest.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "BasicCardPayment.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/PaymentMethodChangeEvent.h"
@@ -22,6 +23,7 @@
 #include "nsIScriptError.h"
 #include "nsIURLParser.h"
 #include "nsNetCID.h"
+#include "nsServiceManagerUtils.h"
 #include "mozilla/dom/MerchantValidationEvent.h"
 #include "PaymentResponse.h"
 
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentRequestManager.cpp firefox-85.0+build1/dom/payments/PaymentRequestManager.cpp
--- firefox-84.0.2+build1/dom/payments/PaymentRequestManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentRequestManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/PaymentRequestChild.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/Preferences.h"
 #include "nsContentUtils.h"
 #include "nsString.h"
 #include "nsIPrincipal.h"
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentRequestService.cpp firefox-85.0+build1/dom/payments/PaymentRequestService.cpp
--- firefox-84.0.2+build1/dom/payments/PaymentRequestService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentRequestService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsIMutableArray.h"
+#include "nsServiceManagerUtils.h"
 #include "nsSimpleEnumerator.h"
 #include "PaymentRequestService.h"
 
diff -Nru firefox-84.0.2+build1/dom/payments/PaymentRequestUpdateEvent.h firefox-85.0+build1/dom/payments/PaymentRequestUpdateEvent.h
--- firefox-84.0.2+build1/dom/payments/PaymentRequestUpdateEvent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/payments/PaymentRequestUpdateEvent.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,12 +8,13 @@
 #define mozilla_dom_PaymentRequestUpdateEvent_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/PaymentRequestUpdateEventBinding.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Promise;
diff -Nru firefox-84.0.2+build1/dom/performance/Performance.cpp firefox-85.0+build1/dom/performance/Performance.cpp
--- firefox-84.0.2+build1/dom/performance/Performance.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/performance/Performance.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -28,10 +28,6 @@
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 #define PERFLOG(msg, ...) printf_stderr(msg, ##__VA_ARGS__)
 
 namespace mozilla::dom {
@@ -41,7 +37,7 @@
 
 NS_IMPL_CYCLE_COLLECTION_INHERITED(Performance, DOMEventTargetHelper,
                                    mUserEntries, mResourceEntries,
-                                   mSecondaryResourceEntries);
+                                   mSecondaryResourceEntries, mObservers);
 
 NS_IMPL_ADDREF_INHERITED(Performance, DOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(Performance, DOMEventTargetHelper)
@@ -68,8 +64,9 @@
   return performance.forget();
 }
 
-Performance::Performance(bool aSystemPrincipal)
-    : mResourceTimingBufferSize(kDefaultResourceTimingBufferSize),
+Performance::Performance(nsIGlobalObject* aGlobal, bool aSystemPrincipal)
+    : DOMEventTargetHelper(aGlobal),
+      mResourceTimingBufferSize(kDefaultResourceTimingBufferSize),
       mPendingNotificationObserversTask(false),
       mPendingResourceTimingBufferFullEvent(false),
       mSystemPrincipal(aSystemPrincipal) {
@@ -216,6 +213,53 @@
 
 void Performance::ClearResourceTimings() { mResourceEntries.Clear(); }
 
+#ifdef MOZ_GECKO_PROFILER
+struct UserTimingMarker {
+  static constexpr Span<const char> MarkerTypeName() {
+    return MakeStringSpan("UserTiming");
+  }
+  static void StreamJSONMarkerData(
+      baseprofiler::SpliceableJSONWriter& aWriter,
+      const ProfilerString16View& aName, bool aIsMeasure,
+      const Maybe<ProfilerString16View>& aStartMark,
+      const Maybe<ProfilerString16View>& aEndMark) {
+    aWriter.StringProperty("name", NS_ConvertUTF16toUTF8(aName.Data()));
+    if (aIsMeasure) {
+      aWriter.StringProperty("entryType", "measure");
+    } else {
+      aWriter.StringProperty("entryType", "mark");
+    }
+
+    if (aStartMark.isSome()) {
+      aWriter.StringProperty("startMark",
+                             NS_ConvertUTF16toUTF8(aStartMark->Data()));
+    } else {
+      aWriter.NullProperty("startMark");
+    }
+    if (aEndMark.isSome()) {
+      aWriter.StringProperty("endMark",
+                             NS_ConvertUTF16toUTF8(aEndMark->Data()));
+    } else {
+      aWriter.NullProperty("endMark");
+    }
+  }
+  static MarkerSchema MarkerTypeDisplay() {
+    using MS = MarkerSchema;
+    MS schema{MS::Location::markerChart, MS::Location::markerTable};
+    schema.SetAllLabels("{marker.data.name}");
+    schema.AddStaticLabelValue("Marker", "UserTiming");
+    schema.AddKeyLabelFormat("entryType", "Entry Type", MS::Format::string);
+    schema.AddKeyLabelFormat("name", "Name", MS::Format::string);
+    schema.AddKeyLabelFormat("startMark", "Start Mark", MS::Format::string);
+    schema.AddKeyLabelFormat("endMark", "End Mark", MS::Format::string);
+    schema.AddStaticLabelValue("Description",
+                               "UserTimingMeasure is created using the DOM API "
+                               "performance.measure().");
+    return schema;
+  }
+};
+#endif
+
 void Performance::Mark(const nsAString& aName, ErrorResult& aRv) {
   // We add nothing when 'privacy.resistFingerprinting' is on.
   if (nsContentUtils::ShouldResistFingerprinting()) {
@@ -237,8 +281,9 @@
     if (GetOwner()) {
       innerWindowId = Some(GetOwner()->WindowID());
     }
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("UserTiming", DOM, UserTimingMarkerPayload,
-                                     (aName, TimeStamp::Now(), innerWindowId));
+    profiler_add_marker("UserTiming", geckoprofiler::category::DOM,
+                        MarkerInnerWindowId(innerWindowId), UserTimingMarker{},
+                        aName, /* aIsMeasure */ false, Nothing{}, Nothing{});
   }
 #endif
 }
@@ -332,9 +377,11 @@
     if (GetOwner()) {
       innerWindowId = Some(GetOwner()->WindowID());
     }
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("UserTiming", DOM, UserTimingMarkerPayload,
-                                     (aName, startMark, endMark, startTimeStamp,
-                                      endTimeStamp, innerWindowId));
+    profiler_add_marker("UserTiming", geckoprofiler::category::DOM,
+                        {MarkerTiming::Interval(startTimeStamp, endTimeStamp),
+                         MarkerInnerWindowId(innerWindowId)},
+                        UserTimingMarker{}, aName, /* aIsMeasure */ true,
+                        startMark, endMark);
   }
 #endif
 }
diff -Nru firefox-84.0.2+build1/dom/performance/Performance.h firefox-85.0+build1/dom/performance/Performance.h
--- firefox-84.0.2+build1/dom/performance/Performance.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/performance/Performance.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/DOMEventTargetHelper.h"
 #include "nsCOMPtr.h"
 #include "nsDOMNavigationTiming.h"
+#include "nsTObserverArray.h"
 
 class nsITimedChannel;
 
@@ -121,7 +122,7 @@
   void QueueNotificationObserversTask();
 
  protected:
-  explicit Performance(bool aSystemPrincipal);
+  Performance(nsIGlobalObject* aGlobal, bool aSystemPrincipal);
   Performance(nsPIDOMWindowInner* aWindow, bool aSystemPrincipal);
 
   virtual ~Performance();
@@ -154,7 +155,7 @@
   void RunNotificationObserversTask();
   void QueueEntry(PerformanceEntry* aEntry);
 
-  nsTObserverArray<PerformanceObserver*> mObservers;
+  nsTObserverArray<RefPtr<PerformanceObserver>> mObservers;
 
  protected:
   static const uint64_t kDefaultResourceTimingBufferSize = 250;
diff -Nru firefox-84.0.2+build1/dom/performance/PerformanceMainThread.cpp firefox-85.0+build1/dom/performance/PerformanceMainThread.cpp
--- firefox-84.0.2+build1/dom/performance/PerformanceMainThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/performance/PerformanceMainThread.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,12 +7,17 @@
 #include "PerformanceMainThread.h"
 #include "PerformanceNavigation.h"
 #include "PerformancePaintTiming.h"
+#include "js/GCAPI.h"
+#include "jsapi.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/PerformanceNavigationTiming.h"
 #include "mozilla/dom/PerformanceResourceTiming.h"
 #include "mozilla/dom/PerformanceTiming.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 
 namespace mozilla::dom {
 
diff -Nru firefox-84.0.2+build1/dom/performance/PerformanceNavigationTiming.h firefox-85.0+build1/dom/performance/PerformanceNavigationTiming.h
--- firefox-84.0.2+build1/dom/performance/PerformanceNavigationTiming.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/performance/PerformanceNavigationTiming.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,16 +7,29 @@
 #ifndef mozilla_dom_PerformanceNavigationTiming_h___
 #define mozilla_dom_PerformanceNavigationTiming_h___
 
-#include "nsCOMPtr.h"
-#include "nsITimedChannel.h"
-#include "nsRFPService.h"
-#include "mozilla/dom/PerformanceResourceTiming.h"
+#include <stdint.h>
+#include <utility>
+#include "js/RootingAPI.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/dom/PerformanceNavigationTimingBinding.h"
-#include "nsIHttpChannel.h"
+#include "mozilla/dom/PerformanceResourceTiming.h"
+#include "nsDOMNavigationTiming.h"
+#include "nsISupports.h"
+#include "nsLiteralString.h"
+#include "nsString.h"
+#include "nsTLiteralString.h"
+
+class JSObject;
+class nsIHttpChannel;
+class nsITimedChannel;
+struct JSContext;
 
 namespace mozilla {
 namespace dom {
 
+class Performance;
+class PerformanceTimingData;
+
 // https://www.w3.org/TR/navigation-timing-2/#sec-PerformanceNavigationTiming
 class PerformanceNavigationTiming final : public PerformanceResourceTiming {
  public:
diff -Nru firefox-84.0.2+build1/dom/performance/PerformanceTiming.cpp firefox-85.0+build1/dom/performance/PerformanceTiming.cpp
--- firefox-84.0.2+build1/dom/performance/PerformanceTiming.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/performance/PerformanceTiming.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/Telemetry.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
+#include "nsIHttpChannel.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/Document.h"
 #include "nsITimedChannel.h"
diff -Nru firefox-84.0.2+build1/dom/performance/PerformanceTiming.h firefox-85.0+build1/dom/performance/PerformanceTiming.h
--- firefox-84.0.2+build1/dom/performance/PerformanceTiming.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/performance/PerformanceTiming.h	2021-01-18 19:58:10.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsITimedChannel.h"
 #include "mozilla/ipc/IPDLParamTraits.h"
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/net/nsServerTiming.h"
 
 class nsIHttpChannel;
diff -Nru firefox-84.0.2+build1/dom/performance/PerformanceWorker.cpp firefox-85.0+build1/dom/performance/PerformanceWorker.cpp
--- firefox-84.0.2+build1/dom/performance/PerformanceWorker.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/performance/PerformanceWorker.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,7 +11,8 @@
 namespace mozilla::dom {
 
 PerformanceWorker::PerformanceWorker(WorkerPrivate* aWorkerPrivate)
-    : Performance(aWorkerPrivate->UsesSystemPrincipal()),
+    : Performance(aWorkerPrivate->GlobalScope(),
+                  aWorkerPrivate->UsesSystemPrincipal()),
       mWorkerPrivate(aWorkerPrivate) {
   mWorkerPrivate->AssertIsOnWorkerThread();
 }
diff -Nru firefox-84.0.2+build1/dom/permission/Permissions.cpp firefox-85.0+build1/dom/permission/Permissions.cpp
--- firefox-84.0.2+build1/dom/permission/Permissions.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/permission/Permissions.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,8 @@
 #include "mozilla/dom/Permissions.h"
 
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/PermissionsBinding.h"
 #include "mozilla/dom/PermissionStatus.h"
 #include "mozilla/dom/Promise.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/base/moz.build firefox-85.0+build1/dom/plugins/base/moz.build
--- firefox-84.0.2+build1/dom/plugins/base/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -23,7 +23,6 @@
     "nptypes.h",
     "nsJSNPRuntime.h",
     "nsNPAPIPluginInstance.h",
-    "nsPluginDirServiceProvider.h",
     "nsPluginHost.h",
     "nsPluginInstanceOwner.h",
     "nsPluginLogging.h",
@@ -40,7 +39,6 @@
     "nsPluginInstanceOwner.cpp",
     "nsPluginStreamListenerPeer.cpp",
     "nsPluginTags.cpp",
-    "PluginFinder.cpp",
 ]
 
 SOURCES += [
@@ -50,7 +48,6 @@
 
 if CONFIG["OS_ARCH"] == "WINNT":
     UNIFIED_SOURCES += [
-        "nsPluginDirServiceProvider.cpp",
         "nsPluginNativeWindowWin.cpp",
         "nsPluginsDirWin.cpp",
     ]
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsJSNPRuntime.cpp firefox-85.0+build1/dom/plugins/base/nsJSNPRuntime.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsJSNPRuntime.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsJSNPRuntime.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "jsfriendapi.h"
 
+#include "GeckoProfiler.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsJSNPRuntime.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPlugin.cpp firefox-85.0+build1/dom/plugins/base/nsNPAPIPlugin.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPlugin.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsNPAPIPlugin.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -41,9 +41,11 @@
 #include "nsWildCard.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/JSExecutionContext.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "nsIXPConnect.h"
+#include "nsMemory.h"
 
 #include <prinrval.h>
 
@@ -92,6 +94,7 @@
 using namespace mozilla;
 using namespace mozilla::plugins::parent;
 using mozilla::dom::Document;
+using mozilla::dom::JSExecutionContext;
 
 // We should make this const...
 static NPNetscapeFuncs sBrowserFuncs = {
@@ -980,7 +983,7 @@
   MOZ_ASSERT(obj);
   nsresult rv = NS_OK;
   {
-    nsJSUtils::ExecutionContext exec(cx, obj);
+    JSExecutionContext exec(cx, obj);
     exec.SetScopeChain(scopeChain);
     exec.Compile(options, utf16script);
     rv = exec.ExecScript(&rval);
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPluginInstance.cpp firefox-85.0+build1/dom/plugins/base/nsNPAPIPluginInstance.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPluginInstance.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsNPAPIPluginInstance.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -35,6 +35,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLObjectElementBinding.h"
 #include "AudioChannelService.h"
+#include "GeckoProfiler.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPluginStreamListener.cpp firefox-85.0+build1/dom/plugins/base/nsNPAPIPluginStreamListener.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsNPAPIPluginStreamListener.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsNPAPIPluginStreamListener.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "plstr.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
+#include "nsIHttpChannel.h"
 #include "nsNetUtil.h"
 #include "nsPluginHost.h"
 #include "nsNPAPIPlugin.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginDirServiceProvider.cpp firefox-85.0+build1/dom/plugins/base/nsPluginDirServiceProvider.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginDirServiceProvider.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginDirServiceProvider.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsPluginDirServiceProvider.h"
-
-#include "nsCRT.h"
-#include "nsIFile.h"
-
-#include <windows.h>
-#include "nsIWindowsRegKey.h"
-
-using namespace mozilla;
-
-/* static */ nsresult GetPLIDDirectories(nsTArray<nsCOMPtr<nsIFile>>& aDirs) {
-  GetPLIDDirectoriesWithRootKey(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER, aDirs);
-  GetPLIDDirectoriesWithRootKey(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE,
-                                aDirs);
-  return NS_OK;
-}
-
-/* static */ nsresult GetPLIDDirectoriesWithRootKey(
-    uint32_t aKey, nsTArray<nsCOMPtr<nsIFile>>& aDirs) {
-  nsCOMPtr<nsIWindowsRegKey> regKey =
-      do_CreateInstance("@mozilla.org/windows-registry-key;1");
-  NS_ENSURE_TRUE(regKey, NS_ERROR_FAILURE);
-
-  nsresult rv = regKey->Open(aKey, u"Software\\MozillaPlugins"_ns,
-                             nsIWindowsRegKey::ACCESS_READ);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  uint32_t childCount = 0;
-  regKey->GetChildCount(&childCount);
-
-  for (uint32_t index = 0; index < childCount; ++index) {
-    nsAutoString childName;
-    rv = regKey->GetChildName(index, childName);
-    if (NS_SUCCEEDED(rv)) {
-      nsCOMPtr<nsIWindowsRegKey> childKey;
-      rv = regKey->OpenChild(childName, nsIWindowsRegKey::ACCESS_QUERY_VALUE,
-                             getter_AddRefs(childKey));
-      if (NS_SUCCEEDED(rv) && childKey) {
-        nsAutoString path;
-        rv = childKey->ReadStringValue(u"Path"_ns, path);
-        if (NS_SUCCEEDED(rv)) {
-          // We deliberately do not do any further checks here on whether
-          // these are actually directories, whether they even exist, or
-          // whether they are duplicates. The pluginhost code will do them.
-          // This allows the whole process to avoid mainthread IO.
-          nsCOMPtr<nsIFile> localFile;
-          rv = NS_NewLocalFile(path, true, getter_AddRefs(localFile));
-          if (NS_SUCCEEDED(rv) && localFile) {
-            aDirs.AppendElement(localFile);
-          }
-        }
-      }
-    }
-  }
-  return NS_OK;
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginDirServiceProvider.h firefox-85.0+build1/dom/plugins/base/nsPluginDirServiceProvider.h
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginDirServiceProvider.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginDirServiceProvider.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsPluginDirServiceProvider_h_
-#define nsPluginDirServiceProvider_h_
-
-#ifdef XP_WIN
-#  include "nsCOMPtr.h"
-#  include "nsTArray.h"
-
-static nsresult GetPLIDDirectories(nsTArray<nsCOMPtr<nsIFile>>& aDirs);
-
-static nsresult GetPLIDDirectoriesWithRootKey(
-    uint32_t aKey, nsTArray<nsCOMPtr<nsIFile>>& aDirs);
-
-#endif  // XP_WIN
-#endif  // nsPluginDirServiceProvider_h_
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginHost.cpp firefox-85.0+build1/dom/plugins/base/nsPluginHost.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginHost.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginHost.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,79 +5,106 @@
 
 /* nsPluginHost.cpp - top-level plugin management code */
 
-#include "nscore.h"
 #include "nsPluginHost.h"
 
-#include <cstdlib>
+#include <inttypes.h>
 #include <stdio.h>
-#include "nsNPAPIPlugin.h"
-#include "nsNPAPIPluginStreamListener.h"
-#include "nsNPAPIPluginInstance.h"
-#include "nsPluginInstanceOwner.h"
-#include "nsObjectLoadingContent.h"
-#include "nsIEventTarget.h"
-#include "nsIObserverService.h"
-#include "nsIHttpProtocolHandler.h"
+#include <string.h>
+#include <cstdlib>
+#include <new>
+#include <utility>
+#include "GeckoProfiler.h"
+#include "ReferrerInfo.h"
+#include "js/RootingAPI.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/PluginLibrary.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TextUtils.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/FakePluginTagInitBinding.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/PromiseNativeHandler.h"
+#include "mozilla/dom/ReferrerPolicyBinding.h"
+#include "mozilla/fallible.h"
+#include "mozilla/ipc/URIParams.h"
+#include "mozilla/ipc/URIUtils.h"
+#include "mozilla/mozalloc.h"
+#include "mozilla/plugins/PluginTypes.h"
+#include "npapi.h"
+#include "npfunctions.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIAsyncShutdown.h"
+#include "nsIBlocklistService.h"
+#include "nsICategoryManager.h"
+#include "nsIChannel.h"
+#include "nsIContent.h"
+#include "nsIContentPolicy.h"
+#include "nsID.h"
+#include "nsIEffectiveTLDService.h"
+#include "nsIFile.h"
 #include "nsIHttpChannel.h"
-#include "nsIUploadChannel.h"
-#include "nsIStreamListener.h"
+#include "nsIHttpProtocolHandler.h"
+#include "nsIIDNService.h"
 #include "nsIInputStream.h"
-#include "nsTArray.h"
-#include "nsReadableUtils.h"
-#include "nsIFile.h"
+#include "nsILoadInfo.h"
+#include "nsIObjectLoadingContent.h"
+#include "nsIObserverService.h"
+#include "nsIPluginInstanceOwner.h"
+#include "nsIPluginTag.h"
+#include "nsIPrefBranch.h"
+#include "nsIProtocolHandler.h"
+#include "nsIReferrerInfo.h"
+#include "nsIRequest.h"
+#include "nsIScriptChannel.h"
 #include "nsISeekableStream.h"
-#include "nsNetUtil.h"
-#include "nsISimpleEnumerator.h"
 #include "nsIStringStream.h"
-#include "mozilla/dom/Document.h"
-#include "nsPluginLogging.h"
-#include "nsIScriptChannel.h"
-#include "nsIBlocklistService.h"
-#include "nsVersionComparator.h"
-#include "nsIObjectLoadingContent.h"
+#include "nsISupportsUtils.h"
+#include "nsIURI.h"
+#include "nsIUploadChannel.h"
+#include "nsIWeakReference.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsIWritablePropertyBag2.h"
-#include "nsICategoryManager.h"
+#include "nsLiteralString.h"
+#include "nsNPAPIPlugin.h"
+#include "nsNPAPIPluginInstance.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+#include "nsObjectLoadingContent.h"
+#include "nsPluginInstanceOwner.h"
+#include "nsPluginLogging.h"
+#include "nsPluginNativeWindow.h"
 #include "nsPluginStreamListenerPeer.h"
-#include "mozilla/NullPrincipal.h"
-#include "mozilla/dom/ContentChild.h"
-#include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/FakePluginTagInitBinding.h"
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/LoadInfo.h"
-#include "mozilla/plugins/PluginBridge.h"
-#include "mozilla/plugins/PluginTypes.h"
-#include "mozilla/TextUtils.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/ipc/URIUtils.h"
-
-#include "nsEnumeratorUtils.h"
+#include "nsPluginTags.h"
+#include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTPromiseFlatString.h"
+#include "nsTStringRepr.h"
+#include "nsThreadUtils.h"
+#include "nsVersionComparator.h"
 #include "nsXPCOM.h"
 #include "nsXPCOMCID.h"
-
 #include "nsXULAppAPI.h"
-
-// for the dialog
-
-#include "nsNetCID.h"
-#include "mozilla/Sprintf.h"
-#include "nsThreadUtils.h"
-#include "nsQueryObject.h"
-
-#include "nsIWeakReferenceUtils.h"
-#include "nsPluginNativeWindow.h"
-#include "nsIContentPolicy.h"
-#include "nsContentPolicyUtils.h"
-#include "mozilla/ResultExtensions.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/Telemetry.h"
-#include "nsIImageLoadingContent.h"
-#include "nsVersionComparator.h"
-#include "ReferrerInfo.h"
-
-#include "mozilla/dom/Promise.h"
-
-#include "PluginFinder.h"
+#include "nscore.h"
+#include "plstr.h"
 
 #if defined(XP_WIN)
 #  include "nsIWindowMediator.h"
@@ -90,8 +117,6 @@
 #  include <gdk/gdkx.h>
 #endif
 
-#include "npapi.h"
-
 using namespace mozilla;
 using mozilla::TimeStamp;
 using mozilla::dom::Document;
@@ -182,14 +207,6 @@
         sPluginBlocklistStatesChangedSinceLastWrite = false;
 
         RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
-        // XXXgijs This will wipe invalid plugin info. That's unfortunate, but
-        // there's no easy way around this - re-running FindPlugins will only
-        // keep invalid plugin info around long enough to use it if we force
-        // it to re-create plugin tags, and in any case can cause re-entrancy
-        // because it would do more async blocklist lookups. Just make sure
-        // we write the blocklist info.
-        PluginFinder::WritePluginInfo(host->mFlashOnly, host->mPlugins);
-
         // We update blocklist info in content processes asynchronously
         // by just sending a new plugin list to content.
         host->IncrementChromeEpoch();
@@ -265,17 +282,11 @@
     : mPluginsLoaded(false),
       mOverrideInternalTypes(false),
       mPluginsDisabled(false),
-      mFlashOnly(true),
-      mDoReloadOnceFindingFinished(false),
-      mAddedFinderShutdownBlocker(false),
       mPluginEpoch(0) {
   // check to see if pref is set at startup to let plugins take over in
   // full page mode for certain image mime types that we handle internally
   mOverrideInternalTypes =
       Preferences::GetBool("plugin.override_internal_types", false);
-  if (xpc::IsInAutomation()) {
-    mFlashOnly = Preferences::GetBool("plugin.load_flash_only", true);
-  }
 
   bool waylandBackend = false;
 #if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11)
@@ -366,56 +377,8 @@
 }
 
 nsresult nsPluginHost::ReloadPlugins() {
-  PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsPluginHost::ReloadPlugins Begin\n"));
-
-  // If we're calling this from a content process, forward the reload request to
-  // the parent process. If plugins actually changed, it will notify us
-  // asynchronously later.
-  if (XRE_IsContentProcess()) {
-    Unused
-        << mozilla::dom::ContentChild::GetSingleton()->SendMaybeReloadPlugins();
-    // In content processes, always signal that plugins have not changed. We
-    // will never know if they changed here unless we make slow synchronous
-    // calls. This information will hopefully only be wrong once, as if there
-    // has been a plugin update, we expect to have gotten notification from the
-    // parent process and everything should be updated by the next time this is
-    // called. See Bug 1337058 for more info.
-    return NS_ERROR_PLUGINS_PLUGINSNOTCHANGED;
-  }
-  // this will create the initial plugin list out of cache
-  // if it was not created yet
-  if (!mPluginsLoaded) return LoadPlugins();
-
-  // We're already in the process of finding more plugins. Do it again once
-  // done (because maybe things have changed since we started looking).
-  if (mPendingFinder) {
-    mDoReloadOnceFindingFinished = true;
-    return NS_ERROR_PLUGINS_PLUGINSNOTCHANGED;
-  }
-
-  // we are re-scanning plugins. New plugins may have been added, also some
-  // plugins may have been removed, so we should probably shut everything down
-  // but don't touch running (active and not stopped) plugins
-
-  // check if plugins changed, no need to do anything else
-  // if no changes to plugins have been made
-  // We're doing this on the main thread, and we checked mPendingFinder
-  // above, so we don't need to do anything else to ensure we don't re-enter.
-  // Future work may make this asynchronous and do the finding away from
-  // the mainthread for the reload case, too, (in which case we should use
-  // mPendingFinder instead of a local copy, and update PluginFinder) but at
-  // the moment this is less important than the initial finding on startup.
-  RefPtr<PluginFinder> pf = new PluginFinder(mFlashOnly);
-  bool pluginschanged;
-  MOZ_TRY(pf->HavePluginsChanged([&pluginschanged](bool aPluginsChanged) {
-    pluginschanged = aPluginsChanged;
-  }));
-  pf->Run();
-
-  // if no changed detected, return an appropriate error code
-  if (!pluginschanged) return NS_ERROR_PLUGINS_PLUGINSNOTCHANGED;
-
-  return ActuallyReloadPlugins();
+  PLUGIN_LOG(PLUGIN_LOG_NORMAL, ("nsPluginHost::ReloadPlugins\n"));
+  return NS_ERROR_PLUGINS_PLUGINSNOTCHANGED;
 }
 
 void nsPluginHost::ClearNonRunningPlugins() {
@@ -637,35 +600,8 @@
     }
   }
 
-  // We have some options for unloading plugins if they have no instances.
-  //
-  // Unloading plugins immediately can be bad - some plugins retain state
-  // between instances even when there are none. This is largely limited to
-  // going from one page to another, so state is retained without an instance
-  // for only a very short period of time. In order to allow this to work
-  // we don't unload plugins immediately by default. This is supported
-  // via a hidden user pref though.
-  //
-  // Another reason not to unload immediately is that loading is expensive,
-  // and it is better to leave popular plugins loaded.
-  //
-  // Our default behavior is to try to unload a plugin after a pref-controlled
-  // delay once its last instance is destroyed. This seems like a reasonable
-  // compromise that allows us to reclaim memory while allowing short state
-  // retention and avoid perf hits for loading popular plugins.
   if (!hasInstance) {
-    if (UnloadPluginsASAP()) {
-      aPluginTag->TryUnloadPlugin(false);
-    } else {
-      if (aPluginTag->mUnloadTimer) {
-        aPluginTag->mUnloadTimer->Cancel();
-      } else {
-        aPluginTag->mUnloadTimer = NS_NewTimer();
-      }
-      uint32_t unloadTimeout = StaticPrefs::dom_ipc_plugins_unloadTimeoutSecs();
-      aPluginTag->mUnloadTimer->InitWithCallback(this, 1000 * unloadTimeout,
-                                                 nsITimer::TYPE_ONE_SHOT);
-    }
+    aPluginTag->TryUnloadPlugin(false);
   }
 }
 
@@ -1828,27 +1764,6 @@
   mPluginEpoch = aEpoch;
 }
 
-#ifdef XP_WIN
-static void WatchRegKey(uint32_t aRoot, nsCOMPtr<nsIWindowsRegKey>& aKey) {
-  if (aKey) {
-    return;
-  }
-
-  aKey = do_CreateInstance("@mozilla.org/windows-registry-key;1");
-  if (!aKey) {
-    return;
-  }
-  nsresult rv = aKey->Open(
-      aRoot, u"Software\\MozillaPlugins"_ns,
-      nsIWindowsRegKey::ACCESS_READ | nsIWindowsRegKey::ACCESS_NOTIFY);
-  if (NS_FAILED(rv)) {
-    aKey = nullptr;
-    return;
-  }
-  aKey->StartWatching(true);
-}
-#endif
-
 already_AddRefed<nsIAsyncShutdownClient> GetProfileChangeTeardownPhase() {
   nsCOMPtr<nsIAsyncShutdownService> asyncShutdownSvc =
       services::GetAsyncShutdownService();
@@ -1864,133 +1779,9 @@
   return shutdownPhase.forget();
 }
 
-nsresult nsPluginHost::LoadPlugins() {
-  // This should only be run in the parent process. On plugin list change, we'll
-  // update observers in the content process as part of SetPluginsInContent
-  if (XRE_IsContentProcess()) {
-    return NS_OK;
-  }
-  // do not do anything if it is already done
-  // use ReloadPlugins() to enforce loading
-  if (mPluginsLoaded) return NS_OK;
-
-  // Uh oh, someone's forcing us to load plugins, but we're already in the
-  // process of doing so. Schedule a reload for when we're done:
-  if (mPendingFinder) {
-    mDoReloadOnceFindingFinished = true;
-    return NS_OK;
-  }
+nsresult nsPluginHost::LoadPlugins() { return NS_OK; }
 
-  if (mPluginsDisabled) return NS_OK;
-
-#ifdef XP_WIN
-  WatchRegKey(nsIWindowsRegKey::ROOT_KEY_LOCAL_MACHINE, mRegKeyHKLM);
-  WatchRegKey(nsIWindowsRegKey::ROOT_KEY_CURRENT_USER, mRegKeyHKCU);
-#endif
-
-  // This is a runnable. The main part of its work will be done away from the
-  // main thread.
-  mPendingFinder = new PluginFinder(mFlashOnly);
-  mDoReloadOnceFindingFinished = false;
-  mAddedFinderShutdownBlocker = false;
-  RefPtr<nsPluginHost> self = this;
-  // Note that if we're in flash only mode, which is the default, then the
-  // callback will be called twice. Once for flash (or nothing, if we're not
-  // (yet) aware of flash being present), and then again after we've actually
-  // looked for it on disk.
-  nsresult rv = mPendingFinder->DoFullSearch(
-      [self](bool aPluginsChanged, RefPtr<nsPluginTag> aPlugins,
-             const nsTArray<std::pair<bool, RefPtr<nsPluginTag>>>&
-                 aBlocklistRequests) {
-        MOZ_ASSERT(NS_IsMainThread(),
-                   "Callback should only be called on the main thread.");
-        self->mPluginsLoaded = true;
-        if (aPluginsChanged) {
-          self->ClearNonRunningPlugins();
-          while (aPlugins) {
-            RefPtr<nsPluginTag> pluginTag = aPlugins;
-            aPlugins = aPlugins->mNext;
-            self->AddPluginTag(pluginTag);
-          }
-          self->IncrementChromeEpoch();
-          self->BroadcastPluginsToContent();
-        }
-
-        // Do blocklist queries immediately after.
-        for (auto pair : aBlocklistRequests) {
-          RefPtr<nsPluginTag> pluginTag = pair.second;
-          bool shouldSoftblock = pair.first;
-          self->UpdatePluginBlocklistState(pluginTag, shouldSoftblock);
-        }
-
-        if (aPluginsChanged) {
-          nsCOMPtr<nsIObserverService> obsService =
-              mozilla::services::GetObserverService();
-          if (obsService) {
-            obsService->NotifyObservers(nullptr, "plugins-list-updated",
-                                        nullptr);
-          }
-        }
-      });
-  // Deal with the profile not being ready yet by returning NS_OK - we'll get
-  // the data later.
-  if (NS_FAILED(rv)) {
-    mPendingFinder = nullptr;
-    if (rv == NS_ERROR_NOT_AVAILABLE) {
-      return NS_OK;
-    }
-    return rv;
-  }
-  bool dispatched = false;
-
-  // If we're only looking for flash (the default), try to do so away from
-  // the main thread. Note that in this case, the callback may have been called
-  // already, from the cached plugin info.
-  if (mFlashOnly) {
-    // First add the shutdown blocker, to avoid the potential for race
-    // conditions.
-    nsCOMPtr<nsIAsyncShutdownClient> shutdownPhase =
-        GetProfileChangeTeardownPhase();
-    if (shutdownPhase) {
-      rv = shutdownPhase->AddBlocker(mPendingFinder,
-                                     NS_LITERAL_STRING_FROM_CSTRING(__FILE__),
-                                     __LINE__, u""_ns);
-      mAddedFinderShutdownBlocker = NS_SUCCEEDED(rv);
-    }
-
-    nsCOMPtr<nsIEventTarget> target =
-        do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv)) {
-      rv = target->Dispatch(mPendingFinder, nsIEventTarget::DISPATCH_NORMAL);
-      dispatched = NS_SUCCEEDED(rv);
-    }
-    // If we somehow failed to dispatch, remove the shutdown blocker.
-    if (mAddedFinderShutdownBlocker && !dispatched) {
-      shutdownPhase->RemoveBlocker(mPendingFinder);
-      mAddedFinderShutdownBlocker = false;
-    }
-  }
-  if (!dispatched) {
-    mPendingFinder->Run();
-    // We're running synchronously, so just remove the pending finder now.
-    mPendingFinder = nullptr;
-  }
-
-  return NS_OK;
-}
-
-void nsPluginHost::FindingFinished() {
-  if (mAddedFinderShutdownBlocker) {
-    nsCOMPtr<nsIAsyncShutdownClient> shutdownPhase =
-        GetProfileChangeTeardownPhase();
-    shutdownPhase->RemoveBlocker(mPendingFinder);
-    mAddedFinderShutdownBlocker = false;
-  }
-  mPendingFinder = nullptr;
-  if (mDoReloadOnceFindingFinished) {
-    Unused << ReloadPlugins();
-  }
-}
+void nsPluginHost::FindingFinished() {}
 
 nsresult nsPluginHost::SetPluginsInContent(
     uint32_t aPluginEpoch, nsTArray<mozilla::plugins::PluginTag>& aPlugins,
@@ -2889,9 +2680,7 @@
   if (nsPluginHost::GetSpecialType(aMIMEType) ==
           nsPluginHost::eSpecialType_Flash ||
       MimeTypeIsAllowedForFakePlugin(NS_ConvertUTF8toUTF16(aMIMEType)) ||
-      aMIMEType.LowerCaseEqualsLiteral("application/x-test") ||
-      aMIMEType.LowerCaseEqualsLiteral("application/x-second-test") ||
-      aMIMEType.LowerCaseEqualsLiteral("application/x-third-test")) {
+      aMIMEType.LowerCaseEqualsLiteral("application/x-test")) {
     return true;
   }
 
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginHost.h firefox-85.0+build1/dom/plugins/base/nsPluginHost.h
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginHost.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginHost.h	2021-01-18 19:58:10.000000000 +0000
@@ -59,8 +59,6 @@
 typedef _NPP* NPP;
 #endif
 
-class PluginFinder;
-
 class nsPluginHost final : public nsIPluginHost,
                            public nsIObserver,
                            public nsITimerCallback,
@@ -68,7 +66,6 @@
                            public nsINamed {
   friend class nsPluginTag;
   friend class nsFakePluginTag;
-  friend class PluginFinder;
   virtual ~nsPluginHost();
 
  public:
@@ -315,7 +312,6 @@
   void ClearNonRunningPlugins();
   nsresult ActuallyReloadPlugins();
 
-  // Callback into the host from PluginFinder once it's done.
   void FindingFinished();
 
   RefPtr<nsPluginTag> mPlugins;
@@ -333,14 +329,6 @@
   // set by pref plugin.disable
   bool mPluginsDisabled;
 
-  // set by pref plugin.load_flash_only
-  bool mFlashOnly;
-
-  // Only one plugin finding operation should be run at a time.
-  RefPtr<PluginFinder> mPendingFinder;
-  bool mDoReloadOnceFindingFinished;
-  bool mAddedFinderShutdownBlocker;
-
   // Any instances in this array will have valid plugin objects via GetPlugin().
   // When removing an instance it might not die - be sure to null out it's
   // plugin.
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginInstanceOwner.cpp firefox-85.0+build1/dom/plugins/base/nsPluginInstanceOwner.cpp
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginInstanceOwner.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginInstanceOwner.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1474,8 +1474,7 @@
   // otherwise, we might not get key events
   if (mPluginFrame && mPluginWindow &&
       mPluginWindow->type == NPWindowTypeDrawable) {
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
       nsCOMPtr<Element> elem = do_QueryReferent(mContent);
       fm->SetFocus(elem, 0);
     }
diff -Nru firefox-84.0.2+build1/dom/plugins/base/nsPluginInstanceOwner.h firefox-85.0+build1/dom/plugins/base/nsPluginInstanceOwner.h
--- firefox-84.0.2+build1/dom/plugins/base/nsPluginInstanceOwner.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/nsPluginInstanceOwner.h	2021-01-18 19:58:10.000000000 +0000
@@ -102,7 +102,8 @@
   // nsIDOMEventListener interfaces
   NS_DECL_NSIDOMEVENTLISTENER
 
-  nsresult ProcessMouseDown(mozilla::dom::Event* aMouseEvent);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult
+  ProcessMouseDown(mozilla::dom::Event* aMouseEvent);
   nsresult ProcessKeyPress(mozilla::dom::Event* aKeyEvent);
   nsresult Destroy();
 
diff -Nru firefox-84.0.2+build1/dom/plugins/base/PluginFinder.cpp firefox-85.0+build1/dom/plugins/base/PluginFinder.cpp
--- firefox-84.0.2+build1/dom/plugins/base/PluginFinder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/PluginFinder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1237 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* PluginFinder.cpp - manages finding plugins on disk, and keeping plugin
- * lists in the host updated. */
-
-#include "PluginFinder.h"
-
-#include "nsIBlocklistService.h"
-#include "nsIFile.h"
-#include "nsIXULRuntime.h"
-#if defined(XP_MACOSX)
-#  include "nsILocalFileMac.h"
-#endif
-#include "nsIWritablePropertyBag2.h"
-
-#include "mozilla/ClearOnShutdown.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Result.h"
-#include "mozilla/ResultExtensions.h"
-#include "mozilla/Telemetry.h"
-
-#include "nscore.h"
-#include "prio.h"
-
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsCharSeparatedTokenizer.h"
-#include "nsComponentManagerUtils.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsPluginDirServiceProvider.h"
-#include "nsPluginHost.h"
-#include "nsPluginLogging.h"
-#include "nsPluginManifestLineReader.h"
-#include "nsPrintfCString.h"
-#include "nsUnicharUtils.h"
-#include "nsThreadUtils.h"
-#include "xpcpublic.h"
-
-using namespace mozilla;
-
-static const char* kPluginRegistryVersion = "0.19";
-
-StaticRefPtr<nsIFile> sPluginRegFile;
-
-#define kPluginRegistryFilename "pluginreg.dat"_ns
-
-#define NS_ITERATIVE_UNREF_LIST(type_, list_, mNext_) \
-  {                                                   \
-    while (list_) {                                   \
-      type_ temp = list_->mNext_;                     \
-      list_->mNext_ = nullptr;                        \
-      list_ = temp;                                   \
-    }                                                 \
-  }
-
-/* to cope with short read */
-/* we should probably put this into a global library now that this is the second
-   time we need this. */
-static int32_t busy_beaver_PR_Read(PRFileDesc* fd, void* start, int32_t len) {
-  int n;
-  int32_t remaining = len;
-
-  while (remaining > 0) {
-    n = PR_Read(fd, start, remaining);
-    if (n < 0) {
-      /* may want to repeat if errno == EINTR */
-      if ((len - remaining) == 0)  // no octet is ever read
-        return -1;
-      break;
-    }
-    remaining -= n;
-    char* cp = (char*)start;
-    cp += n;
-    start = cp;
-  }
-  return len - remaining;
-}
-
-NS_IMPL_ISUPPORTS0(nsInvalidPluginTag)
-
-nsInvalidPluginTag::nsInvalidPluginTag(const char* aFullPath,
-                                       int64_t aLastModifiedTime)
-    : mFullPath(aFullPath),
-      mLastModifiedTime(aLastModifiedTime),
-      mSeen(false) {}
-
-nsInvalidPluginTag::~nsInvalidPluginTag() = default;
-
-// flat file reg funcs
-static bool ReadSectionHeader(nsPluginManifestLineReader& reader,
-                              const char* token) {
-  do {
-    if (*reader.LinePtr() == '[') {
-      char* p = reader.LinePtr() + (reader.LineLength() - 1);
-      if (*p != ']') break;
-      *p = 0;
-
-      char* values[1];
-      if (1 != reader.ParseLine(values, 1)) break;
-      // ignore the leading '['
-      if (PL_strcmp(values[0] + 1, token)) {
-        break;  // it's wrong token
-      }
-      return true;
-    }
-  } while (reader.NextLine());
-  return false;
-}
-
-nsPluginTag* PluginFinder::FirstPluginWithPath(const nsCString& path) {
-  for (nsPluginTag* tag = mPlugins; tag; tag = tag->mNext) {
-    if (tag->mFullPath.Equals(path)) {
-      return tag;
-    }
-  }
-  return nullptr;
-}
-
-NS_IMPL_ISUPPORTS(PluginFinder, nsIRunnable, nsIAsyncShutdownBlocker)
-
-// nsIAsyncShutdownBlocker
-nsresult PluginFinder::GetName(nsAString& aName) {
-  aName.AssignLiteral("PluginFinder: finding plugins to load");
-  return NS_OK;
-}
-
-NS_IMETHODIMP PluginFinder::BlockShutdown(
-    nsIAsyncShutdownClient* aBarrierClient) {
-  // Finding plugins isn't interruptable, but we can attempt to prevent loading
-  // the plugins in nsPluginHost.
-  mShutdown = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP PluginFinder::GetState(nsIPropertyBag** aBagOut) {
-  MOZ_ASSERT(aBagOut);
-  nsCOMPtr<nsIWritablePropertyBag2> propertyBag =
-      do_CreateInstance("@mozilla.org/hash-property-bag;1");
-
-  if (NS_WARN_IF(!propertyBag)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  propertyBag->SetPropertyAsBool(u"Finding"_ns, !mFinishedFinding);
-  propertyBag->SetPropertyAsBool(u"CreatingList"_ns, mCreateList);
-  propertyBag->SetPropertyAsBool(u"FlashOnly"_ns, mFlashOnly);
-  propertyBag->SetPropertyAsBool(u"HavePlugins"_ns, !!mPlugins);
-  propertyBag.forget(aBagOut);
-  return NS_OK;
-}
-
-PluginFinder::PluginFinder(bool aFlashOnly)
-    : mFlashOnly(aFlashOnly),
-      mCreateList(false),
-      mPluginsChanged(false),
-      mFinishedFinding(false),
-      mCalledOnMainthread(false),  // overwritten from Run()
-      mShutdown(false) {}
-
-nsresult PluginFinder::DoFullSearch(const FoundPluginCallback& aCallback) {
-  MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
-  mCreateList = true;
-  mFoundPluginCallback = std::move(aCallback);
-
-  nsresult rv = EnsurePluginReg();
-  // We pass this back to the caller, and ignore all other errors.
-  if (rv == NS_ERROR_NOT_AVAILABLE) {
-    return rv;
-  }
-
-  // Figure out plugin directories:
-  MOZ_TRY(DeterminePluginDirs());
-  // If we're only interested in flash, provide an initial update from
-  // cache. We'll do a scan async, away from the main thread, and if
-  // there are updates then we'll pass them in.
-  if (mFlashOnly) {
-    ReadFlashInfo();
-    // Don't do a blocklist check until we're done scanning,
-    // as the version might change anyway.
-    nsTArray<std::pair<bool, RefPtr<nsPluginTag>>> arr;
-    mFoundPluginCallback(!!mPlugins, mPlugins, arr);
-    // We've passed ownership of the flash plugin to the host, so make sure
-    // we don't accidentally try to use it when we leave the mainthread.
-    mPlugins = nullptr;
-  }
-  return NS_OK;
-}
-
-nsresult PluginFinder::HavePluginsChanged(
-    const PluginChangeCallback& aCallback) {
-  MOZ_ASSERT(XRE_IsParentProcess() && NS_IsMainThread());
-  mChangeCallback = std::move(aCallback);
-
-  nsresult rv = EnsurePluginReg();
-  // We pass this back to the caller, and ignore all other errors.
-  if (rv == NS_ERROR_NOT_AVAILABLE) {
-    return rv;
-  }
-
-  // Read cached flash info if in flash-only mode.
-  if (mFlashOnly) {
-    ReadFlashInfo();
-  }
-
-  // Figure out plugin directories:
-  MOZ_TRY(DeterminePluginDirs());
-  return NS_OK;
-}
-
-nsresult PluginFinder::Run() {
-  if (!mFinishedFinding) {
-    mCalledOnMainthread = NS_IsMainThread();
-    mFinishedFinding = true;
-    FindPlugins();  // Will call WritePluginInfo()
-    if (!mCalledOnMainthread) {
-      return NS_DispatchToMainThread(this);
-    }
-  }
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!mShutdown) {
-    // Write flash info here because we can only do so when on the main thread.
-    // pluginreg.dat got written in FindPlugins if mPluginsChanged is true.
-    if (mFlashOnly && mPluginsChanged) {
-      WriteFlashInfo(mPlugins);
-    }
-    if (mCreateList) {
-      mFoundPluginCallback(mPluginsChanged, mPlugins, mPluginBlocklistRequests);
-    } else {
-      mChangeCallback(mPluginsChanged);
-    }
-  }
-
-  // The host will adopt these plugin tag instances when given them,
-  // so we should delete our references.
-  mPlugins = nullptr;  // Don't iterate over these as the host needs them.
-  NS_ITERATIVE_UNREF_LIST(RefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
-  NS_ITERATIVE_UNREF_LIST(RefPtr<nsPluginTag>, mCachedPlugins, mNext);
-
-  // We need to tell the host we're done. We're on the main thread,
-  // but we could still be in the process of creating the pluginhost,
-  // if we were called synchronously. In that case, the host is
-  // responsible for cleaning us up, as we can't tell it to do so.
-  // So if we were called *async*, tell the host we're done:
-  if (mCreateList && !mCalledOnMainthread) {
-    RefPtr<nsPluginHost> host = nsPluginHost::GetInst();
-    host->FindingFinished();
-  }
-  return NS_OK;
-}
-
-nsresult PluginFinder::ReadFlashInfo() {
-  nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/runtime;1");
-  if (!runtime) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIPrefBranch> prefs = Preferences::GetRootBranch();
-  nsAutoCString arch;
-  nsresult rv = prefs->GetCharPref("plugin.flash.arch", arch);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  nsAutoCString ourArch;
-  rv = runtime->GetXPCOMABI(ourArch);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  // Bail if we've changed architectures.
-  if (!ourArch.Equals(arch)) {
-    return NS_OK;
-  }
-
-  nsAutoCString version;
-  rv = prefs->GetCharPref("plugin.flash.version", version);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  nsAutoCString path;
-  rv = prefs->GetCharPref("plugin.flash.path", path);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  nsCOMPtr<nsIFile> pluginFile;
-#ifdef XP_WIN
-  // "native" files don't use utf-8 paths, convert:
-  rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(path), false,
-                       getter_AddRefs(pluginFile));
-#else
-  rv = NS_NewNativeLocalFile(path, false, getter_AddRefs(pluginFile));
-#endif
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  nsAutoString filename;
-  rv = pluginFile->GetLeafName(filename);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  int32_t blocklistState;
-  rv = Preferences::GetInt("plugin.flash.blockliststate", &blocklistState);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  int32_t lastModLo;
-  int32_t lastModHi;
-  rv = Preferences::GetInt("plugin.flash.lastmod_lo", &lastModLo);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  rv = Preferences::GetInt("plugin.flash.lastmod_hi", &lastModHi);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-  int64_t lastMod =
-      (int64_t)(((uint64_t)lastModHi) << 32 | (uint32_t)lastModLo);
-
-  nsAutoCString desc;
-  rv = prefs->GetCharPref("plugin.flash.desc", desc);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  const char* const mimetypes[3] = {"application/x-shockwave-flash",
-                                    "application/x-futuresplash", nullptr};
-  const char* const extensions[3] = {"swf", "spl", nullptr};
-  const int32_t mimetypecount = 2;
-  // For some reason, the descriptions are different between Windows and
-  // Linux/Mac:
-#ifdef XP_WIN
-  const char* const mimedescriptions[3] = {"Adobe Flash movie",
-                                           "FutureSplash movie", nullptr};
-#else
-  const char* const mimedescriptions[3] = {"Shockwave Flash",
-                                           "FutureSplash Player", nullptr};
-#endif
-
-  MOZ_ASSERT((!mPlugins) && (!mCachedPlugins));
-  // We will pass this to the host:
-  RefPtr<nsPluginTag> tag = new nsPluginTag(
-      "Shockwave Flash", desc.get(), NS_ConvertUTF16toUTF8(filename).get(),
-      path.get(), version.get(), mimetypes, mimedescriptions, extensions,
-      mimetypecount, lastMod, blocklistState, true);
-  mPlugins = tag;
-  // And keep this in cache:
-  RefPtr<nsPluginTag> cachedTag = new nsPluginTag(
-      "Shockwave Flash", desc.get(), NS_ConvertUTF16toUTF8(filename).get(),
-      path.get(), version.get(), mimetypes, mimedescriptions, extensions,
-      mimetypecount, lastMod, blocklistState, true);
-  mCachedPlugins = cachedTag;
-  return NS_OK;
-}
-
-/* static */ nsresult PluginFinder::WriteFlashInfo(nsPluginTag* aPlugins) {
-  nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/runtime;1");
-  if (!runtime) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!aPlugins) {
-    Preferences::ClearUser("plugin.flash.arch");
-    Preferences::ClearUser("plugin.flash.blockliststate");
-    Preferences::ClearUser("plugin.flash.desc");
-    Preferences::ClearUser("plugin.flash.lastmod");
-    Preferences::ClearUser("plugin.flash.path");
-    Preferences::ClearUser("plugin.flash.version");
-    return NS_OK;
-  }
-  nsPluginTag* tag = aPlugins;
-
-  nsAutoCString arch;
-  nsresult rv = runtime->GetXPCOMABI(arch);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  nsCOMPtr<nsIPrefBranch> prefs = Preferences::GetRootBranch();
-  prefs->SetCharPref("plugin.flash.arch", arch);
-
-  nsAutoCString path;
-  tag->GetFullpath(path);
-  prefs->SetCharPref("plugin.flash.path", path);
-
-  int64_t lastModifiedTime;
-  tag->GetLastModifiedTime(&lastModifiedTime);
-  uint32_t lastModHi = ((uint64_t)lastModifiedTime) >> 32;
-  Preferences::SetInt("plugin.flash.lastmod_hi", (int32_t)lastModHi);
-  uint32_t lastModLo = ((uint64_t)lastModifiedTime) & 0xffffffff;
-  Preferences::SetInt("plugin.flash.lastmod_lo", (int32_t)lastModLo);
-
-  nsAutoCString version;
-  tag->GetVersion(version);
-  prefs->SetCharPref("plugin.flash.version", version);
-
-  nsAutoCString desc;
-  tag->GetDescription(desc);
-  prefs->SetCharPref("plugin.flash.desc", desc);
-
-  uint32_t blocklistState;
-  tag->GetBlocklistState(&blocklistState);
-  Preferences::SetInt("plugin.flash.blockliststate", blocklistState);
-  return NS_OK;
-}
-
-namespace {
-
-int64_t GetPluginLastModifiedTime(const nsCOMPtr<nsIFile>& localfile) {
-  PRTime fileModTime = 0;
-
-#if defined(XP_MACOSX)
-  // On OS X the date of a bundle's "contents" (i.e. of its Info.plist file)
-  // is a much better guide to when it was last modified than the date of
-  // its package directory.  See bug 313700.
-  nsCOMPtr<nsILocalFileMac> localFileMac = do_QueryInterface(localfile);
-  if (localFileMac) {
-    localFileMac->GetBundleContentsLastModifiedTime(&fileModTime);
-  } else {
-    localfile->GetLastModifiedTime(&fileModTime);
-  }
-#else
-  localfile->GetLastModifiedTime(&fileModTime);
-#endif
-
-  return fileModTime;
-}
-
-struct CompareFilesByTime {
-  bool LessThan(const nsCOMPtr<nsIFile>& a, const nsCOMPtr<nsIFile>& b) const {
-    return GetPluginLastModifiedTime(a) < GetPluginLastModifiedTime(b);
-  }
-
-  bool Equals(const nsCOMPtr<nsIFile>& a, const nsCOMPtr<nsIFile>& b) const {
-    return GetPluginLastModifiedTime(a) == GetPluginLastModifiedTime(b);
-  }
-};
-
-}  // namespace
-
-bool PluginFinder::ShouldAddPlugin(const nsPluginInfo& info) {
-  if (!info.fName ||
-      (strcmp(info.fName, "Shockwave Flash") != 0 && mFlashOnly)) {
-    return false;
-  }
-  for (uint32_t i = 0; i < info.fVariantCount; ++i) {
-    if (info.fMimeTypeArray[i] &&
-        (!strcmp(info.fMimeTypeArray[i], "application/x-shockwave-flash") ||
-         !strcmp(info.fMimeTypeArray[i],
-                 "application/x-shockwave-flash-test"))) {
-      return true;
-    }
-    if (mFlashOnly) {
-      continue;
-    }
-    if (info.fMimeTypeArray[i] &&
-        (!strcmp(info.fMimeTypeArray[i], "application/x-test") ||
-         !strcmp(info.fMimeTypeArray[i], "application/x-Second-Test"))) {
-      return true;
-    }
-  }
-#ifdef PLUGIN_LOGGING
-  PLUGIN_LOG(PLUGIN_LOG_NORMAL,
-             ("ShouldAddPlugin : Ignoring non-flash plugin library %s\n",
-              aPluginTag->FileName().get()));
-#endif  // PLUGIN_LOGGING
-  return false;
-}
-
-nsresult PluginFinder::ScanPluginsDirectory(nsIFile* pluginsDir,
-                                            bool* aPluginsChanged) {
-  MOZ_ASSERT(XRE_IsParentProcess());
-
-  NS_ENSURE_ARG_POINTER(aPluginsChanged);
-  nsresult rv;
-
-  *aPluginsChanged = false;
-
-#ifdef PLUGIN_LOGGING
-  nsAutoCString dirPath;
-  pluginsDir->GetNativePath(dirPath);
-  PLUGIN_LOG(PLUGIN_LOG_BASIC,
-             ("PluginFinder::ScanPluginsDirectory dir=%s\n", dirPath.get()));
-#endif
-
-  nsCOMPtr<nsIDirectoryEnumerator> iter;
-  rv = pluginsDir->GetDirectoryEntries(getter_AddRefs(iter));
-  if (NS_FAILED(rv)) return rv;
-
-  AutoTArray<nsCOMPtr<nsIFile>, 6> pluginFiles;
-
-  nsCOMPtr<nsIFile> dirEntry;
-  while (NS_SUCCEEDED(iter->GetNextFile(getter_AddRefs(dirEntry))) &&
-         dirEntry) {
-    // Sun's JRE 1.3.1 plugin must have symbolic links resolved or else it'll
-    // crash. See bug 197855.
-    dirEntry->Normalize();
-
-    if (nsPluginsDir::IsPluginFile(dirEntry)) {
-      pluginFiles.AppendElement(dirEntry);
-    }
-  }
-
-  pluginFiles.Sort(CompareFilesByTime());
-
-  for (int32_t i = (pluginFiles.Length() - 1); i >= 0; i--) {
-    nsCOMPtr<nsIFile>& localfile = pluginFiles[i];
-
-    nsString utf16FilePath;
-    rv = localfile->GetPath(utf16FilePath);
-    if (NS_FAILED(rv)) continue;
-
-    const int64_t fileModTime = GetPluginLastModifiedTime(localfile);
-
-    // Look for it in our cache
-    NS_ConvertUTF16toUTF8 filePath(utf16FilePath);
-    RefPtr<nsPluginTag> pluginTag;
-    RemoveCachedPluginsInfo(filePath.get(), getter_AddRefs(pluginTag));
-
-    bool seenBefore = false;
-    uint32_t blocklistState = nsIBlocklistService::STATE_NOT_BLOCKED;
-
-    if (pluginTag) {
-      seenBefore = true;
-      blocklistState = pluginTag->GetBlocklistState();
-      // If plugin changed, delete cachedPluginTag and don't use cache
-      if (fileModTime != pluginTag->mLastModifiedTime) {
-        // Plugins has changed. Don't use cached plugin info.
-        pluginTag = nullptr;
-
-        // plugin file changed, flag this fact
-        *aPluginsChanged = true;
-      }
-
-      // If we're not creating a list and we already know something changed then
-      // we're done.
-      if (!mCreateList) {
-        if (*aPluginsChanged) {
-          return NS_OK;
-        }
-        continue;
-      }
-    }
-
-    bool isKnownInvalidPlugin = false;
-    for (RefPtr<nsInvalidPluginTag> invalidPlugins = mInvalidPlugins;
-         invalidPlugins; invalidPlugins = invalidPlugins->mNext) {
-      // If already marked as invalid, ignore it
-      if (invalidPlugins->mFullPath.Equals(filePath.get()) &&
-          invalidPlugins->mLastModifiedTime == fileModTime) {
-        if (mCreateList) {
-          invalidPlugins->mSeen = true;
-        }
-        isKnownInvalidPlugin = true;
-        break;
-      }
-    }
-    if (isKnownInvalidPlugin) {
-      continue;
-    }
-
-    // if it is not found in cache info list or has been changed, create a new
-    // one
-    if (!pluginTag) {
-      nsPluginFile pluginFile(localfile);
-
-      // create a tag describing this plugin.
-      PRLibrary* library = nullptr;
-      nsPluginInfo info;
-      memset(&info, 0, sizeof(info));
-      nsresult res;
-      // Opening a block for the telemetry AutoTimer
-      {
-        Telemetry::AutoTimer<Telemetry::PLUGIN_LOAD_METADATA> telemetry;
-        res = pluginFile.GetPluginInfo(info, &library);
-      }
-      // if we don't have mime type don't proceed, this is not a plugin
-      if (NS_FAILED(res) || !info.fMimeTypeArray || !ShouldAddPlugin(info)) {
-        RefPtr<nsInvalidPluginTag> invalidTag =
-            new nsInvalidPluginTag(filePath.get(), fileModTime);
-        pluginFile.FreePluginInfo(info);
-
-        if (mCreateList) {
-          invalidTag->mSeen = true;
-        }
-        invalidTag->mNext = mInvalidPlugins;
-        if (mInvalidPlugins) {
-          mInvalidPlugins->mPrev = invalidTag;
-        }
-        mInvalidPlugins = invalidTag;
-
-        // Mark aPluginsChanged so pluginreg is rewritten
-        *aPluginsChanged = true;
-        continue;
-      }
-
-      pluginTag = new nsPluginTag(&info, fileModTime, blocklistState);
-      pluginTag->mLibrary = library;
-      pluginFile.FreePluginInfo(info);
-
-      // We'll need to do a blocklist request later.
-      mPluginBlocklistRequests.AppendElement(
-          std::make_pair(!seenBefore, pluginTag));
-
-      // Plugin unloading is tag-based. If we created a new tag and loaded
-      // the library in the process then we want to attempt to unload it here.
-      // Only do this if the pref is set for aggressive unloading.
-      if (UnloadPluginsASAP()) {
-        if (NS_IsMainThread()) {
-          pluginTag->TryUnloadPlugin(false);
-        } else {
-          nsCOMPtr<nsIRunnable> unloadRunnable =
-              mozilla::NewRunnableMethod<bool>(
-                  "nsPluginTag::TryUnloadPlugin", pluginTag,
-                  &nsPluginTag::TryUnloadPlugin, false);
-          NS_DispatchToMainThread(unloadRunnable);
-        }
-      }
-    }
-
-    // do it if we still want it
-    if (!seenBefore) {
-      // We have a valid new plugin so report that plugins have changed.
-      *aPluginsChanged = true;
-    }
-
-    // Don't add the same plugin again if it hasn't changed
-    if (nsPluginTag* duplicate = FirstPluginWithPath(pluginTag->mFullPath)) {
-      if (pluginTag->mLastModifiedTime == duplicate->mLastModifiedTime) {
-        continue;
-      }
-    }
-
-    // If we're not creating a plugin list, simply looking for changes,
-    // then we're done.
-    if (!mCreateList) {
-      return NS_OK;
-    }
-
-    pluginTag->mNext = mPlugins;
-    mPlugins = pluginTag;
-  }
-
-  return NS_OK;
-}
-
-// if mCreateList is false we will just scan for plugins
-// and see if any changes have been made to the plugins.
-// This is needed in ReloadPlugins to prevent possible recursive reloads
-nsresult PluginFinder::FindPlugins() {
-  Telemetry::AutoTimer<Telemetry::FIND_PLUGINS> telemetry;
-
-  // Read cached plugins info. We ignore failures, as we can proceed
-  // without a pluginreg file.
-  ReadPluginInfo();
-
-  for (nsIFile* pluginDir : mPluginDirs) {
-    if (!pluginDir) {
-      continue;
-    }
-    // Ensure we have a directory; if this isn't a directory, try the parent.
-    // We do this because in some cases items in this list of supposed plugin
-    // directories can be individual plugin files instead of directories.
-    bool isDir = false;
-    nsCOMPtr<nsIFile> parent;
-    if (NS_FAILED(pluginDir->IsDirectory(&isDir)) || !isDir) {
-      pluginDir->GetParent(getter_AddRefs(parent));
-      pluginDir = parent;
-      if (!pluginDir) {
-        continue;
-      }
-    }
-    // pluginDir not existing will be handled transparently in
-    // ScanPluginsDirectory
-
-    // don't pass mPluginsChanged directly, to prevent its
-    // possible reset in subsequent ScanPluginsDirectory calls
-    bool pluginschanged = false;
-    ScanPluginsDirectory(pluginDir, &pluginschanged);
-
-    if (pluginschanged) {
-      mPluginsChanged = true;
-      if (!mCreateList) {
-        // We're just looking for changes, so we can stop looking.
-        break;
-      }
-    }
-  }
-
-  // if we are just looking for possible changes,
-  // no need to proceed if changes are detected
-  if (!mCreateList && mPluginsChanged) {
-    NS_ITERATIVE_UNREF_LIST(RefPtr<nsPluginTag>, mCachedPlugins, mNext);
-    NS_ITERATIVE_UNREF_LIST(RefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
-    return NS_OK;
-  }
-
-  // We should also consider plugins to have changed if any plugins have been
-  // removed. We'll know if any were removed if they weren't taken out of the
-  // cached plugins list during our scan, thus we can assume something was
-  // removed if the cached plugins list contains anything.
-  if (!mPluginsChanged && mCachedPlugins) {
-    mPluginsChanged = true;
-  }
-
-  // Remove unseen invalid plugins
-  RefPtr<nsInvalidPluginTag> invalidPlugins = mInvalidPlugins;
-  while (invalidPlugins) {
-    if (!invalidPlugins->mSeen) {
-      RefPtr<nsInvalidPluginTag> invalidPlugin = invalidPlugins;
-
-      if (invalidPlugin->mPrev) {
-        invalidPlugin->mPrev->mNext = invalidPlugin->mNext;
-      } else {
-        mInvalidPlugins = invalidPlugin->mNext;
-      }
-      if (invalidPlugin->mNext) {
-        invalidPlugin->mNext->mPrev = invalidPlugin->mPrev;
-      }
-
-      invalidPlugins = invalidPlugin->mNext;
-
-      invalidPlugin->mPrev = nullptr;
-      invalidPlugin->mNext = nullptr;
-    } else {
-      invalidPlugins->mSeen = false;
-      invalidPlugins = invalidPlugins->mNext;
-    }
-  }
-
-  // if we are not creating the list, there is no need to proceed
-  if (!mCreateList) {
-    NS_ITERATIVE_UNREF_LIST(RefPtr<nsPluginTag>, mCachedPlugins, mNext);
-    NS_ITERATIVE_UNREF_LIST(RefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
-    return NS_OK;
-  }
-
-  // if we are creating the list, it is already done;
-  // update the plugins info cache if changes are detected
-  if (mPluginsChanged) {
-    WritePluginInfo(mFlashOnly, mPlugins, mInvalidPlugins);
-  }
-
-  return NS_OK;
-}
-
-/* static */ nsresult PluginFinder::WritePluginInfo(
-    bool aFlashOnly, nsPluginTag* aPlugins,
-    nsInvalidPluginTag* aInvalidPlugins) {
-  MOZ_ASSERT(XRE_IsParentProcess());
-  // We can't write to prefs from non-main threads. Run() will update prefs
-  // from the main thread if we're flash only.
-  // We can't separate this out completely because the blocklist updates
-  // from nsPluginHost expect to be able to write here.
-  if (NS_IsMainThread() && aFlashOnly) {
-    WriteFlashInfo(aPlugins);
-  }
-
-  if (!sPluginRegFile) return NS_ERROR_FAILURE;
-
-  // Get the tmp file by getting the parent and then re-appending
-  // kPluginRegistryFilename followed by `.tmp`.
-  nsCOMPtr<nsIFile> pluginReg;
-  nsresult rv = sPluginRegFile->GetParent(getter_AddRefs(pluginReg));
-  if (NS_FAILED(rv)) return rv;
-
-  nsAutoCString filename(kPluginRegistryFilename);
-  filename.AppendLiteral(".tmp");
-  rv = pluginReg->AppendNative(filename);
-  if (NS_FAILED(rv)) return rv;
-
-  PRFileDesc* fd = nullptr;
-  rv = pluginReg->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
-                                   0600, &fd);
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/runtime;1");
-  if (!runtime) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsAutoCString arch;
-  rv = runtime->GetXPCOMABI(arch);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  PR_fprintf(fd, "Generated File. Do not edit.\n");
-
-  PR_fprintf(fd, "\n[HEADER]\nVersion%c%s%c%c%c\nArch%c%s%c%c\n",
-             PLUGIN_REGISTRY_FIELD_DELIMITER, kPluginRegistryVersion,
-             aFlashOnly ? 't' : 'f', PLUGIN_REGISTRY_FIELD_DELIMITER,
-             PLUGIN_REGISTRY_END_OF_LINE_MARKER,
-             PLUGIN_REGISTRY_FIELD_DELIMITER, arch.get(),
-             PLUGIN_REGISTRY_FIELD_DELIMITER,
-             PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-
-  // Store all plugins in the mPlugins list - all plugins currently in use.
-  PR_fprintf(fd, "\n[PLUGINS]\n");
-
-  // Do not write plugin info if we're in flash-only mode.
-  for (nsPluginTag* tag = aPlugins; !aFlashOnly && tag; tag = tag->mNext) {
-    // store each plugin info into the registry
-    // filename & fullpath are on separate line
-    // because they can contain field delimiter char
-    PR_fprintf(
-        fd, "%s%c%c\n%s%c%c\n%s%c%c\n", (tag->FileName().get()),
-        PLUGIN_REGISTRY_FIELD_DELIMITER, PLUGIN_REGISTRY_END_OF_LINE_MARKER,
-        (tag->mFullPath.get()), PLUGIN_REGISTRY_FIELD_DELIMITER,
-        PLUGIN_REGISTRY_END_OF_LINE_MARKER, (tag->Version().get()),
-        PLUGIN_REGISTRY_FIELD_DELIMITER, PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-
-    // lastModifiedTimeStamp|canUnload|tag->mFlags|fromExtension|blocklistState
-    PR_fprintf(fd, "%lld%c%d%c%lu%c%d%c%d%c%c\n", tag->mLastModifiedTime,
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               false,  // did store whether or not to unload in-process plugins
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               0,  // legacy field for flags
-               PLUGIN_REGISTRY_FIELD_DELIMITER, false,
-               PLUGIN_REGISTRY_FIELD_DELIMITER, tag->BlocklistState(),
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-
-    // description, name & mtypecount are on separate line
-    PR_fprintf(fd, "%s%c%c\n%s%c%c\n%d\n", (tag->Description().get()),
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               PLUGIN_REGISTRY_END_OF_LINE_MARKER, (tag->Name().get()),
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               PLUGIN_REGISTRY_END_OF_LINE_MARKER, tag->MimeTypes().Length());
-
-    // Add in each mimetype this plugin supports
-    for (uint32_t i = 0; i < tag->MimeTypes().Length(); i++) {
-      PR_fprintf(fd, "%d%c%s%c%s%c%s%c%c\n", i, PLUGIN_REGISTRY_FIELD_DELIMITER,
-                 (tag->MimeTypes()[i].get()), PLUGIN_REGISTRY_FIELD_DELIMITER,
-                 (tag->MimeDescriptions()[i].get()),
-                 PLUGIN_REGISTRY_FIELD_DELIMITER, (tag->Extensions()[i].get()),
-                 PLUGIN_REGISTRY_FIELD_DELIMITER,
-                 PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-    }
-  }
-
-  PR_fprintf(fd, "\n[INVALID]\n");
-
-  RefPtr<nsInvalidPluginTag> invalidPlugins = aInvalidPlugins;
-  while (invalidPlugins) {
-    // fullPath
-    PR_fprintf(
-        fd, "%s%c%c\n",
-        (!invalidPlugins->mFullPath.IsEmpty() ? invalidPlugins->mFullPath.get()
-                                              : ""),
-        PLUGIN_REGISTRY_FIELD_DELIMITER, PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-
-    // lastModifiedTimeStamp
-    PR_fprintf(fd, "%lld%c%c\n", invalidPlugins->mLastModifiedTime,
-               PLUGIN_REGISTRY_FIELD_DELIMITER,
-               PLUGIN_REGISTRY_END_OF_LINE_MARKER);
-
-    invalidPlugins = invalidPlugins->mNext;
-  }
-
-  PRStatus prrc;
-  prrc = PR_Close(fd);
-  if (prrc != PR_SUCCESS) {
-    // we should obtain a refined value based on prrc;
-    rv = NS_ERROR_FAILURE;
-    MOZ_ASSERT(false, "PR_Close() failed.");
-    return rv;
-  }
-  rv = pluginReg->MoveToNative(nullptr, kPluginRegistryFilename);
-  return rv;
-}
-
-/* static */ nsresult PluginFinder::EnsurePluginReg() {
-  if (sPluginRegFile) {
-    return NS_OK;
-  }
-
-  if (!NS_IsMainThread()) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsresult rv;
-  nsCOMPtr<nsIProperties> directoryService(
-      do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) return rv;
-
-  nsCOMPtr<nsIFile> pluginRegFile;
-  directoryService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile),
-                        getter_AddRefs(pluginRegFile));
-
-  if (!pluginRegFile) {
-    // There is no profile yet, this will tell us if there is going to be one
-    // in the future.
-    directoryService->Get(NS_APP_PROFILE_DIR_STARTUP, NS_GET_IID(nsIFile),
-                          getter_AddRefs(pluginRegFile));
-    if (!pluginRegFile) {
-      return NS_ERROR_FAILURE;
-    }
-
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-  pluginRegFile->AppendNative(kPluginRegistryFilename);
-  sPluginRegFile = pluginRegFile;
-  ClearOnShutdown(&sPluginRegFile);
-  return NS_OK;
-}
-
-nsresult PluginFinder::DeterminePluginDirs() {
-  nsresult rv;
-  nsCOMPtr<nsIProperties> dirService(
-      do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // Get the app-defined list of plugin dirs.
-  nsCOMPtr<nsISimpleEnumerator> dirEnum;
-  MOZ_TRY(dirService->Get(NS_APP_PLUGINS_DIR_LIST,
-                          NS_GET_IID(nsISimpleEnumerator),
-                          getter_AddRefs(dirEnum)));
-
-  // Add any paths from MOZ_PLUGIN_PATH first.
-#if defined(XP_WIN) || defined(XP_LINUX)
-#  ifdef XP_WIN
-#    define PATH_SEPARATOR ';'
-#  else
-#    define PATH_SEPARATOR ':'
-#  endif
-  const char* pathsenv = PR_GetEnv("MOZ_PLUGIN_PATH");
-  if (pathsenv) {
-    const nsDependentCString pathsStr(pathsenv);
-    nsCCharSeparatedTokenizer paths(pathsStr, PATH_SEPARATOR);
-    while (paths.hasMoreTokens()) {
-      auto pathStr = paths.nextToken();
-      nsCOMPtr<nsIFile> pathFile;
-      rv = NS_NewNativeLocalFile(pathStr, true, getter_AddRefs(pathFile));
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        continue;
-      }
-
-      bool exists;
-      if (pathFile && NS_SUCCEEDED(pathFile->Exists(&exists)) && exists) {
-        mPluginDirs.AppendElement(pathFile);
-      }
-    }
-  }
-#endif  // defined(XP_WIN) || defined(XP_LINUX)
-
-  bool hasMore = false;
-  while (NS_SUCCEEDED(dirEnum->HasMoreElements(&hasMore)) && hasMore) {
-    nsCOMPtr<nsISupports> supports;
-    nsresult rv = dirEnum->GetNext(getter_AddRefs(supports));
-    if (NS_SUCCEEDED(rv)) {
-      nsCOMPtr<nsIFile> nextDir(do_QueryInterface(supports, &rv));
-      if (NS_SUCCEEDED(rv)) {
-        mPluginDirs.AppendElement(nextDir);
-      }
-    }
-  }
-
-  // In tests, load plugins from the profile.
-  if (xpc::IsInAutomation()) {
-    nsCOMPtr<nsIFile> profDir;
-    rv = dirService->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile),
-                         getter_AddRefs(profDir));
-    if (NS_SUCCEEDED(rv)) {
-      profDir->Append(u"plugins"_ns);
-      mPluginDirs.AppendElement(profDir);
-    }
-  }
-
-  // Get the directories from the windows registry. Note: these can
-  // be files instead of directories. We'll have to filter them later.
-#ifdef XP_WIN
-  bool bScanPLIDs = Preferences::GetBool("plugin.scan.plid.all", false);
-  if (bScanPLIDs) {
-    GetPLIDDirectories(mPluginDirs);
-  }
-#endif /* XP_WIN */
-  return NS_OK;
-}
-
-nsresult PluginFinder::ReadPluginInfo() {
-  MOZ_ASSERT(XRE_IsParentProcess());
-  // Non-flash-only (for tests that use other plugins) and updates to the list
-  // sadly still use the main thread - but assert about the flash startup case:
-  if (mFlashOnly && mCreateList) {
-    MOZ_ASSERT(!NS_IsMainThread());
-  } else {
-    MOZ_ASSERT(NS_IsMainThread());
-  }
-
-  nsresult rv = EnsurePluginReg();
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // Cloning ensures we don't have a stat cache and get an
-  // accurate filesize.
-  nsCOMPtr<nsIFile> pluginReg;
-  rv = sPluginRegFile->Clone(getter_AddRefs(pluginReg));
-  if (NS_FAILED(rv)) return rv;
-
-  int64_t fileSize;
-  rv = pluginReg->GetFileSize(&fileSize);
-  if (NS_FAILED(rv)) return rv;
-
-  if (fileSize > INT32_MAX) {
-    return NS_ERROR_FAILURE;
-  }
-  int32_t flen = int32_t(fileSize);
-  if (flen == 0) {
-    NS_WARNING("Plugins Registry Empty!");
-    return NS_OK;  // ERROR CONDITION
-  }
-
-  nsPluginManifestLineReader reader;
-  char* registry = reader.Init(flen);
-  if (!registry) return NS_ERROR_OUT_OF_MEMORY;
-
-  PRFileDesc* fd = nullptr;
-  rv = pluginReg->OpenNSPRFileDesc(PR_RDONLY, 0444, &fd);
-  if (NS_FAILED(rv)) return rv;
-
-  // set rv to return an error on goto out
-  rv = NS_ERROR_FAILURE;
-
-  // We know how many octes we are supposed to read.
-  // So let use the busy_beaver_PR_Read version.
-  int32_t bread = busy_beaver_PR_Read(fd, registry, flen);
-
-  PRStatus prrc;
-  prrc = PR_Close(fd);
-  if (prrc != PR_SUCCESS) {
-    // Strange error: this is one of those "Should not happen" error.
-    // we may want to report something more refined than  NS_ERROR_FAILURE.
-    MOZ_ASSERT(false, "PR_Close() failed.");
-    return rv;
-  }
-
-  // short read error, so to speak.
-  if (flen > bread) return rv;
-
-  if (!ReadSectionHeader(reader, "HEADER")) return rv;
-
-  if (!reader.NextLine()) return rv;
-
-  char* values[6];
-
-  // VersionLiteral, kPluginRegistryVersion
-  if (2 != reader.ParseLine(values, 2)) return rv;
-
-  // VersionLiteral
-  if (PL_strcmp(values[0], "Version")) return rv;
-
-  // If we're reading an old registry, ignore it
-  // If we flipped the flash-only pref, ignore it
-  nsAutoCString expectedVersion(kPluginRegistryVersion);
-  expectedVersion.Append(mFlashOnly ? 't' : 'f');
-
-  if (!expectedVersion.Equals(values[1])) {
-    return rv;
-  }
-
-  char* archValues[6];
-  if (!reader.NextLine()) {
-    return rv;
-  }
-
-  // ArchLiteral, Architecture
-  if (2 != reader.ParseLine(archValues, 2)) {
-    return rv;
-  }
-
-  // ArchLiteral
-  if (PL_strcmp(archValues[0], "Arch")) {
-    return rv;
-  }
-
-  nsCOMPtr<nsIXULRuntime> runtime = do_GetService("@mozilla.org/xre/runtime;1");
-  if (!runtime) {
-    return rv;
-  }
-
-  nsAutoCString arch;
-  if (NS_FAILED(runtime->GetXPCOMABI(arch))) {
-    return rv;
-  }
-
-  // If this is a registry from a different architecture then don't attempt to
-  // read it
-  if (PL_strcmp(archValues[1], arch.get())) {
-    return rv;
-  }
-
-  if (!ReadSectionHeader(reader, "PLUGINS")) return rv;
-
-  while (reader.NextLine()) {
-    if (*reader.LinePtr() == '[') {
-      break;
-    }
-    // Ignore all listed plugins if we're in flash-only mode.
-    // In that case, we're only reading this file to find invalid plugin info
-    // so we can avoid reading/loading those.
-    if (mFlashOnly) {
-      continue;
-    }
-
-    const char* filename = reader.LinePtr();
-    if (!reader.NextLine()) return rv;
-
-    const char* fullpath = reader.LinePtr();
-    if (!reader.NextLine()) return rv;
-
-    const char* version;
-    version = reader.LinePtr();
-    if (!reader.NextLine()) return rv;
-
-    // lastModifiedTimeStamp|canUnload|tag.mFlag|fromExtension|blocklistState
-    if (5 != reader.ParseLine(values, 5)) return rv;
-
-    int64_t lastmod = nsCRT::atoll(values[0]);
-    uint16_t blocklistState = atoi(values[4]);
-    if (!reader.NextLine()) return rv;
-
-    char* description = reader.LinePtr();
-    if (!reader.NextLine()) return rv;
-
-    const char* name = reader.LinePtr();
-    if (!reader.NextLine()) return rv;
-
-    const long PLUGIN_REG_MIMETYPES_ARRAY_SIZE = 12;
-    const long PLUGIN_REG_MAX_MIMETYPES = 1000;
-
-    long mimetypecount = std::strtol(reader.LinePtr(), nullptr, 10);
-    if (mimetypecount == LONG_MAX || mimetypecount == LONG_MIN ||
-        mimetypecount >= PLUGIN_REG_MAX_MIMETYPES || mimetypecount < 0) {
-      return NS_ERROR_FAILURE;
-    }
-
-    char* stackalloced[PLUGIN_REG_MIMETYPES_ARRAY_SIZE * 3];
-    char** mimetypes;
-    char** mimedescriptions;
-    char** extensions;
-    char** heapalloced = 0;
-    if (mimetypecount > PLUGIN_REG_MIMETYPES_ARRAY_SIZE - 1) {
-      heapalloced = new char*[mimetypecount * 3];
-      mimetypes = heapalloced;
-    } else {
-      mimetypes = stackalloced;
-    }
-    mimedescriptions = mimetypes + mimetypecount;
-    extensions = mimedescriptions + mimetypecount;
-
-    int mtr = 0;  // mimetype read
-    for (; mtr < mimetypecount; mtr++) {
-      if (!reader.NextLine()) break;
-
-      // line number|mimetype|description|extension
-      if (4 != reader.ParseLine(values, 4)) break;
-      int line = atoi(values[0]);
-      if (line != mtr) break;
-      mimetypes[mtr] = values[1];
-      mimedescriptions[mtr] = values[2];
-      extensions[mtr] = values[3];
-    }
-
-    if (mtr != mimetypecount) {
-      delete[] heapalloced;
-      return rv;
-    }
-
-    RefPtr<nsPluginTag> tag = new nsPluginTag(
-        name, description, filename, fullpath, version,
-        (const char* const*)mimetypes, (const char* const*)mimedescriptions,
-        (const char* const*)extensions, mimetypecount, lastmod, blocklistState,
-        true);
-
-    delete[] heapalloced;
-
-    // Import flags from registry into prefs for old registry versions
-    MOZ_LOG(nsPluginLogging::gPluginLog, PLUGIN_LOG_BASIC,
-            ("LoadCachedPluginsInfo : Loading Cached plugininfo for %s\n",
-             tag->FileName().get()));
-
-    tag->mNext = mCachedPlugins;
-    mCachedPlugins = tag;
-  }
-
-  if (!ReadSectionHeader(reader, "INVALID")) {
-    return rv;
-  }
-
-  while (reader.NextLine()) {
-    const char* fullpath = reader.LinePtr();
-    if (!reader.NextLine()) {
-      return rv;
-    }
-
-    const char* lastModifiedTimeStamp = reader.LinePtr();
-    int64_t lastmod = nsCRT::atoll(lastModifiedTimeStamp);
-
-    RefPtr<nsInvalidPluginTag> invalidTag =
-        new nsInvalidPluginTag(fullpath, lastmod);
-
-    invalidTag->mNext = mInvalidPlugins;
-    if (mInvalidPlugins) {
-      mInvalidPlugins->mPrev = invalidTag;
-    }
-    mInvalidPlugins = invalidTag;
-  }
-
-  return NS_OK;
-}
-
-void PluginFinder::RemoveCachedPluginsInfo(const char* filePath,
-                                           nsPluginTag** result) {
-  RefPtr<nsPluginTag> prev;
-  RefPtr<nsPluginTag> tag = mCachedPlugins;
-  while (tag) {
-    if (tag->mFullPath.Equals(filePath)) {
-      // Found it. Remove it from our list
-      if (prev)
-        prev->mNext = tag->mNext;
-      else
-        mCachedPlugins = tag->mNext;
-      tag->mNext = nullptr;
-      *result = tag;
-      NS_ADDREF(*result);
-      break;
-    }
-    prev = tag;
-    tag = tag->mNext;
-  }
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/base/PluginFinder.h firefox-85.0+build1/dom/plugins/base/PluginFinder.h
--- firefox-84.0.2+build1/dom/plugins/base/PluginFinder.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/base/PluginFinder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef PluginFinder_h_
-#define PluginFinder_h_
-
-#include "nsIRunnable.h"
-#include "mozilla/RefPtr.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "nsPluginTags.h"
-#include "mozilla/StaticPrefs_dom.h"
-#include "nsIAsyncShutdown.h"
-
-class nsIFile;
-class nsPluginHost;
-
-class nsInvalidPluginTag : public nsISupports {
-  virtual ~nsInvalidPluginTag();
-
- public:
-  explicit nsInvalidPluginTag(const char* aFullPath,
-                              int64_t aLastModifiedTime = 0);
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-
-  nsCString mFullPath;
-  int64_t mLastModifiedTime;
-  bool mSeen;
-
-  RefPtr<nsInvalidPluginTag> mPrev;
-  RefPtr<nsInvalidPluginTag> mNext;
-};
-
-static inline bool UnloadPluginsASAP() {
-  return mozilla::StaticPrefs::dom_ipc_plugins_unloadTimeoutSecs() == 0;
-}
-
-/**
- * Class responsible for discovering plugins on disk, in part based
- * on cached information stored in pluginreg.dat and in the prefs.
- *
- * This runnable is designed to be used as a one-shot. It's created
- * when the pluginhost wants to find plugins, and the next time it
- * wants to do so, it should create a new one.
- */
-class PluginFinder final : public nsIRunnable, public nsIAsyncShutdownBlocker {
-  ~PluginFinder() = default;
-
- public:
-  explicit PluginFinder(bool aFlashOnly);
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIRUNNABLE
-  NS_DECL_NSIASYNCSHUTDOWNBLOCKER
-
-  typedef std::function<void(
-      bool /* aPluginsChanged */, RefPtr<nsPluginTag> /* aNewPlugins */,
-      nsTArray<
-          std::pair<bool, RefPtr<nsPluginTag>>>&) /* aBlocklistRequestPairs */>
-      FoundPluginCallback;
-  typedef std::function<void(bool /* aPluginsChanged */)> PluginChangeCallback;
-
-  // The expectation is that one (and only one) of these gets called
-  // by the plugin host. We can't easily do the work in the constructor
-  // because in some cases we'll fail early (e.g. if we're called before
-  // the profile is ready) and want to signal that to the consumer via
-  // the nsresult return value, which we can't do in a constructor.
-  nsresult DoFullSearch(const FoundPluginCallback& aCallback);
-  nsresult HavePluginsChanged(const PluginChangeCallback& aCallback);
-
-  static nsresult WritePluginInfo(
-      bool aFlashOnly, nsPluginTag* aPlugins,
-      nsInvalidPluginTag* aInvalidPlugins = nullptr);
-
- private:
-  nsPluginTag* FirstPluginWithPath(const nsCString& path);
-  bool ShouldAddPlugin(const nsPluginInfo& aInfo);
-
-  nsresult ReadFlashInfo();
-  static nsresult WriteFlashInfo(nsPluginTag* aPlugins);
-  static nsresult EnsurePluginReg();
-
-  nsresult ReadPluginInfo();
-  nsresult ReadPluginInfoFromDisk();
-
-  nsresult DeterminePluginDirs();
-
-  nsresult ScanPluginsDirectory(nsIFile* aPluginsDir, bool* aPluginsChanged);
-  nsresult FindPlugins();
-
-  void RemoveCachedPluginsInfo(const char* filePath, nsPluginTag** result);
-
-  nsTArray<nsCOMPtr<nsIFile>> mPluginDirs;
-
-  // The plugins we've found on disk (to be passed to the host)
-  RefPtr<nsPluginTag> mPlugins;
-  // The plugin whose metadata we found in cache
-  RefPtr<nsPluginTag> mCachedPlugins;
-  // Any invalid plugins our cache info made us aware of prior to actually
-  // examining the disk; this is a performance optimization to avoid trying
-  // to load files that aren't plugins on every browser startup.
-  RefPtr<nsInvalidPluginTag> mInvalidPlugins;
-
-  // The bool (shouldSoftBlock) indicates whether we should disable the plugin
-  // if it's soft-blocked in the blocklist
-  // The plugintag is a reference to the actual plugin whose blocklist state
-  // needs checking.
-  nsTArray<std::pair<bool, RefPtr<nsPluginTag>>> mPluginBlocklistRequests;
-
-  FoundPluginCallback mFoundPluginCallback;
-  PluginChangeCallback mChangeCallback;
-  RefPtr<nsPluginHost> mHost;
-
-  bool mFlashOnly;
-  bool mCreateList;
-  bool mPluginsChanged;
-  bool mFinishedFinding;
-  bool mCalledOnMainthread;
-  bool mShutdown;
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerChild.cpp firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerChild.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerChild.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -7,6 +7,8 @@
 #include "FunctionBrokerChild.h"
 #include "FunctionBrokerThread.h"
 
+#include "mozilla/ipc/Endpoint.h"
+
 namespace mozilla::plugins {
 
 FunctionBrokerChild* FunctionBrokerChild::sInstance = nullptr;
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerIPCUtils.h firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerIPCUtils.h
--- firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerIPCUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerIPCUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef dom_plugins_ipc_functionbrokeripcutils_h
 #define dom_plugins_ipc_functionbrokeripcutils_h 1
 
+#include "ipc/EnumSerializer.h"
 #include "PluginMessageUtils.h"
 
 #if defined(XP_WIN)
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerParent.cpp firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerParent.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/FunctionBrokerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/FunctionBrokerParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,8 @@
 #include "FunctionBroker.h"
 #include "FunctionBrokerThread.h"
 
+#include "mozilla/ipc/Endpoint.h"
+
 namespace mozilla::plugins {
 
 #if defined(XP_WIN)
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/FunctionHook.h firefox-85.0+build1/dom/plugins/ipc/FunctionHook.h
--- firefox-84.0.2+build1/dom/plugins/ipc/FunctionHook.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/FunctionHook.h	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,10 @@
 #endif
 
 namespace mozilla {
+
+template <class T>
+class StaticAutoPtr;
+
 namespace plugins {
 
 // "PluginHooks" logging helpers
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/IpdlTuple.h firefox-85.0+build1/dom/plugins/ipc/IpdlTuple.h
--- firefox-84.0.2+build1/dom/plugins/ipc/IpdlTuple.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/IpdlTuple.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef dom_plugins_ipc_ipdltuple_h
 #define dom_plugins_ipc_ipdltuple_h
 
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/plugins/FunctionBrokerIPCUtils.h"
 #include "mozilla/Variant.h"
 
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginHangUIParent.cpp firefox-85.0+build1/dom/plugins/ipc/PluginHangUIParent.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginHangUIParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginHangUIParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "PluginHangUIParent.h"
 
+#include "base/command_line.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/plugins/PluginModuleParent.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceChild.cpp firefox-85.0+build1/dom/plugins/ipc/PluginInstanceChild.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginInstanceChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #include "gfx2DGlue.h"
 #include "nsNPAPIPluginInstance.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Logging.h"
 #ifdef MOZ_X11
 #  include "gfxXlibSurface.h"
 #endif
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceParent.cpp firefox-85.0+build1/dom/plugins/ipc/PluginInstanceParent.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginInstanceParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/BasicEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/ToString.h"
 #include "mozilla/dom/Element.h"
@@ -2220,7 +2221,7 @@
   if (gotFocus) {
     nsPluginInstanceOwner* owner = GetOwner();
     if (owner) {
-      nsFocusManager* fm = nsFocusManager::GetFocusManager();
+      RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
       RefPtr<dom::Element> element;
       owner->GetDOMElement(getter_AddRefs(element));
       if (fm && element) {
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceParent.h firefox-85.0+build1/dom/plugins/ipc/PluginInstanceParent.h
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginInstanceParent.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginInstanceParent.h	2021-01-18 19:58:10.000000000 +0000
@@ -250,7 +250,8 @@
 
   void GetSrcAttribute(nsACString& aOutput) const { aOutput = mSrcAttribute; }
 
-  mozilla::ipc::IPCResult AnswerPluginFocusChange(const bool& gotFocus);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY mozilla::ipc::IPCResult AnswerPluginFocusChange(
+      const bool& gotFocus);
 
   nsresult AsyncSetWindow(NPWindow* window);
   nsresult GetImageContainer(mozilla::layers::ImageContainer** aContainer);
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginMessageUtils.h firefox-85.0+build1/dom/plugins/ipc/PluginMessageUtils.h
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginMessageUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginMessageUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef DOM_PLUGINS_PLUGINMESSAGEUTILS_H
 #define DOM_PLUGINS_PLUGINMESSAGEUTILS_H
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 
@@ -15,7 +15,7 @@
 #include "mozilla/ipc/MessageChannel.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/UniquePtr.h"
-#include "gfxipc/ShadowLayerUtils.h"
+#include "gfxipc/SurfaceDescriptor.h"
 
 #include "npapi.h"
 #include "npruntime.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginModuleChild.cpp firefox-85.0+build1/dom/plugins/ipc/PluginModuleChild.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginModuleChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginModuleChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -31,6 +31,7 @@
 #endif
 
 #include "mozilla/ipc/CrashReporterClient.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProcessChild.h"
 #include "mozilla/plugins/PluginInstanceChild.h"
 #include "mozilla/plugins/StreamNotifyChild.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginModuleParent.cpp firefox-85.0+build1/dom/plugins/ipc/PluginModuleParent.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginModuleParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginModuleParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,12 +12,13 @@
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/ipc/CrashReporterClient.h"
 #include "mozilla/ipc/CrashReporterHost.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ipc/MessageChannel.h"
-#include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/layers/ImageBridgeChild.h"
 #include "mozilla/plugins/BrowserStreamParent.h"
 #include "mozilla/plugins/PluginBridge.h"
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginProcessChild.cpp firefox-85.0+build1/dom/plugins/ipc/PluginProcessChild.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginProcessChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginProcessChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -21,13 +21,6 @@
 #  include "mozilla/SandboxSettings.h"
 #endif
 
-#if defined(XP_MACOSX)
-#  include "nsCocoaFeatures.h"
-// An undocumented CoreGraphics framework method, present in the same form
-// since at least OS X 10.5.
-extern "C" CGError CGSSetDebugOptions(int options);
-#endif
-
 #ifdef XP_WIN
 #  if defined(MOZ_SANDBOX)
 #    include "mozilla/sandboxTarget.h"
@@ -166,19 +159,9 @@
 #  error Sorry
 #endif
 
-  bool retval = mPlugin.InitForChrome(pluginFilename, ParentPid(),
-                                      IOThreadChild::message_loop(),
-                                      IOThreadChild::TakeChannel());
-#if defined(XP_MACOSX)
-  // Explicitly turn off CGEvent logging.  This works around bug 1092855.
-  // If there are already CGEvents in the log, turning off logging also
-  // causes those events to be written to disk.  But at this point no
-  // CGEvents have yet been processed.  CGEvents are events (usually
-  // input events) pulled from the WindowServer.  An option of 0x80000008
-  // turns on CGEvent logging.
-  CGSSetDebugOptions(0x80000007);
-#endif
-  return retval;
+  return mPlugin.InitForChrome(pluginFilename, ParentPid(),
+                               IOThreadChild::message_loop(),
+                               IOThreadChild::TakeChannel());
 }
 
 void PluginProcessChild::CleanUp() {
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PluginProcessParent.cpp firefox-85.0+build1/dom/plugins/ipc/PluginProcessParent.cpp
--- firefox-84.0.2+build1/dom/plugins/ipc/PluginProcessParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PluginProcessParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
+#include "nsIFile.h"
 #include "nsIProperties.h"
 #include "nsServiceManagerUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PPluginInstance.ipdl firefox-85.0+build1/dom/plugins/ipc/PPluginInstance.ipdl
--- firefox-84.0.2+build1/dom/plugins/ipc/PPluginInstance.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PPluginInstance.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 include protocol PStreamNotify;
 include protocol PPluginSurface;
 
+include "gfxipc/ShadowLayerUtils.h";
 include "mozilla/GfxMessageUtils.h";
 include "mozilla/layers/LayersMessageUtils.h";
 
@@ -24,10 +25,10 @@
 using gfxSurfaceType from "gfxTypes.h";
 using mozilla::gfx::IntSize from "mozilla/gfx/2D.h";
 using mozilla::gfx::IntRect from "mozilla/gfx/2D.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
 using mozilla::plugins::WindowsSharedMemoryHandle from "mozilla/plugins/PluginMessageUtils.h";
-using mozilla::layers::SurfaceDescriptorX11 from "gfxipc/ShadowLayerUtils.h";
+using mozilla::layers::SurfaceDescriptorX11 from "gfxipc/SurfaceDescriptor.h";
 using nsIntRect from "nsRect.h";
 using mozilla::gfx::SurfaceFormat from "mozilla/gfx/Types.h";
 using struct DxgiAdapterDesc from "mozilla/D3DMessageUtils.h";
diff -Nru firefox-84.0.2+build1/dom/plugins/ipc/PPluginScriptableObject.ipdl firefox-85.0+build1/dom/plugins/ipc/PPluginScriptableObject.ipdl
--- firefox-84.0.2+build1/dom/plugins/ipc/PPluginScriptableObject.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/ipc/PPluginScriptableObject.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -6,8 +6,8 @@
 include protocol PPluginInstance;
 include PluginTypes;
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace plugins {
diff -Nru firefox-84.0.2+build1/dom/plugins/test/crashtests/crashtests.list firefox-85.0+build1/dom/plugins/test/crashtests/crashtests.list
--- firefox-84.0.2+build1/dom/plugins/test/crashtests/crashtests.list	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/crashtests/crashtests.list	2021-01-18 19:58:10.000000000 +0000
@@ -3,12 +3,12 @@
 HTTP load 110650-1.html
 skip-if(!haveTestPlugin) HTTP script 539897-1.html
 asserts-if(winWidget&&browserIsRemote,0-1) skip-if(!haveTestPlugin) HTTP script 540114-1.html
-HTTP load 570884.html
+skip-if(!haveTestPlugin) HTTP load 570884.html
 # This test relies on the reading of screenX/Y forcing a round trip to
 # the X server, which is a bad assumption for <browser remote>.
 # Plugin arch is going to change anyway with OOP content so skipping
 # this test for now is OK.
 skip-if(!haveTestPlugin||http.platform!="X11") HTTP load 598862.html
-HTTP load 626602-1.html
+skip-if(!haveTestPlugin) HTTP load 626602-1.html
 HTTP load 752340.html
 HTTP load 843086.xhtml
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageA1.html firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageA1.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageA1.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageA1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>1028200 subpageA1</h1>
-    <embed id="plugin1" type="application/x-test" />
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageA.html firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageA.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageA.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageA.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>1028200 subpageA</h1>
-    <iframe id="iframe2" src="1028200-subpageA1.html" width="400" height="400"></iframe>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageB1.html firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageB1.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageB1.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageB1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>1028200 subpageB1</h1>
-    <div id="div1">
-      <embed id="plugin1" type="application/x-test" />
-    </div>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageB.html firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageB.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageB.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageB.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>1028200 subpageB</h1>
-    <iframe id="iframe2" src="1028200-subpageB1.html" width="400" height="400"></iframe>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageC.html firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageC.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/1028200-subpageC.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/1028200-subpageC.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>1028200 subpageC</h1>
-    <div id="div1"> </div>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/block_all_plugins.html firefox-85.0+build1/dom/plugins/test/mochitest/block_all_plugins.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/block_all_plugins.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/block_all_plugins.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+  <object id="object" type="application/x-shockwave-flash"></object>
+  <embed id="embed" type="application/x-shockwave-flash"></embed>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_blockallplugins.js firefox-85.0+build1/dom/plugins/test/mochitest/browser_blockallplugins.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_blockallplugins.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser_blockallplugins.js	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,66 @@
+var gTestRoot = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content/",
+  "http://127.0.0.1:8888/"
+);
+
+add_task(async function() {
+  registerCleanupFunction(function() {
+    gBrowser.removeCurrentTab();
+    window.focus();
+  });
+});
+
+// simple tab load helper, pilfered from browser plugin tests
+function promiseTabLoadEvent(tab, url) {
+  info("Wait tab event: load");
+
+  function handle(loadedUrl) {
+    if (loadedUrl === "about:blank" || (url && loadedUrl !== url)) {
+      info(`Skipping spurious load event for ${loadedUrl}`);
+      return false;
+    }
+
+    info("Tab event received: load");
+    return true;
+  }
+
+  let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);
+
+  if (url) {
+    BrowserTestUtils.loadURI(tab.linkedBrowser, url);
+  }
+
+  return loaded;
+}
+
+add_task(async function() {
+  let pluginTab = (gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser));
+  await promiseTabLoadEvent(pluginTab, gTestRoot + "block_all_plugins.html");
+  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+    let doc = content.document;
+
+    let objectElt = doc.getElementById("object");
+    Assert.ok(!!objectElt, "object should exist");
+    Assert.ok(
+      objectElt instanceof Ci.nsIObjectLoadingContent,
+      "object should be an nsIObjectLoadingContent"
+    );
+    Assert.ok(
+      objectElt.pluginFallbackType ==
+        Ci.nsIObjectLoadingContent.PLUGIN_BLOCK_ALL,
+      "object should be blocked"
+    );
+
+    let embedElt = doc.getElementById("embed");
+    Assert.ok(!!embedElt, "embed should exist");
+    Assert.ok(
+      embedElt instanceof Ci.nsIObjectLoadingContent,
+      "embed should be an nsIObjectLoadingContent"
+    );
+    Assert.ok(
+      embedElt.pluginFallbackType ==
+        Ci.nsIObjectLoadingContent.PLUGIN_BLOCK_ALL,
+      "embed should be blocked"
+    );
+  });
+});
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_bug1196539.js firefox-85.0+build1/dom/plugins/test/mochitest/browser_bug1196539.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_bug1196539.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser_bug1196539.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-var gTestRoot = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-function checkPaintCount(aCount) {
-  ok(
-    aCount != 0,
-    "paint count can't be greater than zero, count was " + aCount
-  );
-  ok(
-    aCount < kMaxPaints,
-    "paint count should be within limits, count was " + aCount
-  );
-}
-
-// maximum number of paints we allow before failing. The test plugin doesn't
-// animate so this should really be just 1, but operating systems can
-// occasionally fire a few of these so we give these tests a fudge factor.
-// A bad regression would either be 0, or 100+.
-const kMaxPaints = 10;
-
-add_task(async function() {
-  let result, tabSwitchedPromise;
-
-  // We want to make sure that we will paint in cases where we need to. The
-  // tab layer cache just gets in the way of measuring that.
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.tabs.remote.tabCacheSize", 0]],
-  });
-
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-
-  let pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gTestRoot + "plugin_test.html"
-  );
-  let homeTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "about:home"
-  );
-
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return !!plugin;
-    }
-  );
-  is(result, true, "plugin is loaded");
-
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return !XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible();
-    }
-  );
-  is(result, true, "plugin is hidden");
-
-  // reset plugin paint count
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("testplugin");
-    XPCNativeWrapper.unwrap(plugin).resetPaintCount();
-  });
-
-  // select plugin tab
-  tabSwitchedPromise = waitTabSwitched();
-  gBrowser.selectedTab = pluginTab;
-  await tabSwitchedPromise;
-
-  // wait a bit for spurious paints
-  await waitForMs(100);
-
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible();
-    }
-  );
-  is(result, true, "plugin is visible");
-
-  // check for good paint count
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return XPCNativeWrapper.unwrap(plugin).getPaintCount();
-    }
-  );
-  checkPaintCount(result);
-
-  // select home tab
-  tabSwitchedPromise = waitTabSwitched();
-  gBrowser.selectedTab = homeTab;
-  await tabSwitchedPromise;
-
-  // reset paint count
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("testplugin");
-    XPCNativeWrapper.unwrap(plugin).resetPaintCount();
-  });
-
-  // wait a bit for spurious paints
-  await waitForMs(100);
-
-  // check for no paint count
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return XPCNativeWrapper.unwrap(plugin).getPaintCount();
-    }
-  );
-  is(result, 0, "no paints, this is correct.");
-
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return !XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible();
-    }
-  );
-  is(result, true, "plugin is hidden");
-
-  // reset paint count
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let doc = content.document;
-    let plugin = doc.getElementById("testplugin");
-    XPCNativeWrapper.unwrap(plugin).resetPaintCount();
-  });
-
-  // select plugin tab
-  tabSwitchedPromise = waitTabSwitched();
-  gBrowser.selectedTab = pluginTab;
-  await tabSwitchedPromise;
-
-  // check paint count
-  result = await SpecialPowers.spawn(
-    pluginTab.linkedBrowser,
-    [],
-    async function() {
-      let doc = content.document;
-      let plugin = doc.getElementById("testplugin");
-      return XPCNativeWrapper.unwrap(plugin).getPaintCount();
-    }
-  );
-  checkPaintCount(result);
-
-  gBrowser.removeTab(homeTab);
-  gBrowser.removeTab(pluginTab);
-});
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_bug1335475.js firefox-85.0+build1/dom/plugins/test/mochitest/browser_bug1335475.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_bug1335475.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser_bug1335475.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-add_task(async function() {
-  is(
-    navigator.plugins.length,
-    0,
-    "plugins should not be available to chrome-privilege pages"
-  );
-  ok(
-    !("application/x-test" in navigator.mimeTypes),
-    "plugins should not be available to chrome-privilege pages"
-  );
-
-  await BrowserTestUtils.withNewTab(
-    { gBrowser, url: "about:blank" },
-    async function(browser) {
-      // about:blank triggered from a toplevel load should not inherit permissions
-      await SpecialPowers.spawn(browser, [], async function() {
-        is(
-          content.window.navigator.plugins.length,
-          0,
-          "plugins should not be available to null-principal about:blank"
-        );
-        ok(
-          !("application/x-test" in content.window.navigator.mimeTypes),
-          "plugins should not be available to null-principal about:blank"
-        );
-      });
-
-      let promise = BrowserTestUtils.browserLoaded(browser);
-      BrowserTestUtils.loadURI(browser, gTestRoot + "plugin_test.html");
-      await promise;
-
-      await SpecialPowers.spawn(browser, [], async function() {
-        ok(
-          content.window.navigator.plugins.length > 0,
-          "plugins should be available to HTTP-loaded pages"
-        );
-        ok(
-          "application/x-test" in content.window.navigator.mimeTypes,
-          "plugins should be available to HTTP-loaded pages"
-        );
-
-        let subwindow = content.document.getElementById("subf").contentWindow;
-
-        ok(
-          "application/x-test" in subwindow.navigator.mimeTypes,
-          "plugins should be available to an about:blank subframe loaded from a site"
-        );
-      });
-
-      // navigate from the HTTP page to an about:blank page which ought to
-      // inherit permissions
-      promise = BrowserTestUtils.browserLoaded(browser);
-      await SpecialPowers.spawn(browser, [], async function() {
-        content.document.getElementById("aboutlink").click();
-      });
-      await promise;
-
-      await SpecialPowers.spawn(browser, [], async function() {
-        is(
-          content.window.location.href,
-          "about:blank",
-          "sanity-check about:blank load"
-        );
-        ok(
-          "application/x-test" in content.window.navigator.mimeTypes,
-          "plugins should be available when a site triggers an about:blank load"
-        );
-      });
-
-      // navigate to the file: URI, which shouldn't allow plugins. This might
-      // be wrapped in jar:, but that shouldn't matter for this test
-      promise = BrowserTestUtils.browserLoaded(browser);
-      let converteduri = Cc["@mozilla.org/chrome/chrome-registry;1"]
-        .getService(Ci.nsIChromeRegistry)
-        .convertChromeURL(Services.io.newURI(rootDir + "plugin_test.html"));
-      BrowserTestUtils.loadURI(browser, converteduri.spec);
-      await promise;
-
-      await SpecialPowers.spawn(browser, [], async function() {
-        ok(
-          !("application/x-test" in content.window.navigator.mimeTypes),
-          "plugins should not be available to file: URI content"
-        );
-      });
-    }
-  );
-
-  // As much as it would be nice, this doesn't actually check ftp:// because
-  // we don't have a synthetic server.
-});
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_data_url_plugin.js firefox-85.0+build1/dom/plugins/test/mochitest/browser_data_url_plugin.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_data_url_plugin.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser_data_url_plugin.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir.replace(
-  "chrome://mochitests/content/",
-  "http://127.0.0.1:8888/"
-);
-
-add_task(async function() {
-  is(
-    navigator.plugins.length,
-    0,
-    "plugins should not be available to chrome-privilege pages"
-  );
-
-  await BrowserTestUtils.withNewTab(
-    { gBrowser, url: gTestRoot + "plugin_data_url_test.html" },
-    async function(browser) {
-      await SpecialPowers.spawn(browser, [], async function() {
-        ok(
-          content.window.navigator.plugins.length > 0,
-          "plugins should be available to HTTP-loaded pages"
-        );
-        let dataFrameWin = content.document.getElementById("dataFrame")
-          .contentWindow;
-        is(
-          dataFrameWin.navigator.plugins.length,
-          0,
-          "plugins should not be available to data: URI in iframe on a site"
-        );
-      });
-    }
-  );
-});
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser.ini firefox-85.0+build1/dom/plugins/test/mochitest/browser.ini
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -2,19 +2,16 @@
 prefs =
   plugin.load_flash_only=false
 support-files =
+  block_all_plugins.html
   head.js
-  plugin_data_url_test.html
   plugin_test.html
   plugin_subframe_test.html
   plugin_no_scroll_div.html
 
+[browser_blockallplugins.js]
 [browser_bug1163570.js]
 skip-if = true # Bug 1249878
-[browser_bug1196539.js]
-skip-if = (!e10s || os != "win" || webrender)  # plugin painting test doesn't work with WR
 [browser_tabswitchbetweenplugins.js]
 skip-if = true #Bug 1538425
 [browser_pluginscroll.js]
 skip-if = (true || !e10s || os != "win") # Bug 1213631
-[browser_bug1335475.js]
-[browser_data_url_plugin.js]
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_pluginscroll.js firefox-85.0+build1/dom/plugins/test/mochitest/browser_pluginscroll.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/browser_pluginscroll.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/browser_pluginscroll.js	2021-01-18 19:58:10.000000000 +0000
@@ -21,7 +21,9 @@
   };
 }
 
-var apzEnabled = Preferences.get("layers.async-pan-zoom.enabled", false);
+var apzEnabled =
+  Services.appinfo.fissionAutostart ||
+  Preferences.get("layers.async-pan-zoom.enabled", false);
 var pluginHideEnabled = Preferences.get(
   "gfx.e10s.hide-plugins-for-scroll",
   true
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/chrome.ini firefox-85.0+build1/dom/plugins/test/mochitest/chrome.ini
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/chrome.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/chrome.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-[DEFAULT]
-prefs =
-  plugin.load_flash_only=false
-support-files =
-  hang_test.js
-  privatemode_perwindowpb.xhtml
-  plugin-utils.js
-
-[test_bug479979.xhtml]
-[test_bug751809.html]
-[test_busy_hang.xhtml]
-skip-if = (!crashreporter) || (os != "win")
-[test_clear_site_data.html]
-[test_convertpoint.xhtml]
-skip-if = toolkit != "cocoa"
-[test_crash_notify.xhtml]
-skip-if = !crashreporter
-[test_crash_notify_no_report.xhtml]
-skip-if = !crashreporter
-[test_crash_submit.xhtml]
-skip-if = !crashreporter
-[test_hang_submit.xhtml]
-skip-if = !crashreporter
-[test_hangui.xhtml]
-skip-if = (!crashreporter) || (os != "win") || verify
-support-files = hangui_subpage.html hangui_common.js hangui_iface.js dialog_watcher.js
-[test_idle_hang.xhtml]
-skip-if = (!crashreporter) || (os != "win")
-[test_npruntime.xhtml]
-[test_plugin_tag_clicktoplay.html]
-[test_privatemode_perwindowpb.xhtml]
-[test_xulbrowser_plugin_visibility.xhtml]
-skip-if = (toolkit == "cocoa") || (os == "win")
-support-files = xulbrowser_plugin_visibility.xhtml plugin_visibility_loader.html
-[test_wmode.xhtml]
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/cocoa_focus.html firefox-85.0+build1/dom/plugins/test/mochitest/cocoa_focus.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/cocoa_focus.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/cocoa_focus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-<html>
-<head>
-  <title>NPCocoaEventFocusChanged Tests</title>
-</head>
-<body>
-  <embed id="plugin1" type="application/x-test" width="100" height="100"></embed>
-  <embed id="plugin2" type="application/x-test" width="100" height="100"></embed>
-  <script type="application/javascript">
-    function is(aLeft, aRight, aMessage) {
-      window.opener.SimpleTest.is(aLeft, aRight, aMessage);
-    }
-
-    function ok(aValue, aMessage) {
-      window.opener.SimpleTest.ok(aValue, aMessage);
-    }
-
-    function synthesizeNativeMouseEvent(aX, aY, aNativeMsg, aModifiers, aElement, aCallback) {
-      var observer = {
-        observe(aSubject, aTopic, aData) {
-      if (aCallback && aTopic == "mouseevent") {
-        aCallback(aData);
-      }
-    },
-      };
-      SpecialPowers.DOMWindowUtils.sendNativeMouseEvent(aX, aY, aNativeMsg, aModifiers, aElement, observer);
-      return true;
-    }
-
-    function* runTests() {
-      var utils = SpecialPowers.DOMWindowUtils;
-      var scale = utils.screenPixelsPerCSSPixel;
-
-      var plugin1 = document.getElementById("plugin1"); // What we're testing.
-      var plugin2 = document.getElementById("plugin2"); // Dummy.
-
-      var plugin1Bounds = plugin1.getBoundingClientRect();
-      var plugin2Bounds = plugin2.getBoundingClientRect();
-
-      var plugin1X = (window.mozInnerScreenX + plugin1Bounds.left + 10);
-      var plugin1Y = (window.mozInnerScreenY + plugin1Bounds.top + 10);
-      var plugin2X = (window.mozInnerScreenX + plugin2Bounds.left + 10);
-      var plugin2Y = (window.mozInnerScreenY + plugin2Bounds.top + 10);
-
-      const NSLeftMouseDown          = 1,
-            NSLeftMouseUp            = 2;
-
-      if (plugin1.getEventModel() != 1) {
-        window.opener.todo(false, "Skipping this test when not testing the Cocoa event model");
-        return;
-      }
-
-      // Initialize to 0 since there is no initial state event,
-      // plugins should assume they do not initially have focus.
-      var expectedEventCount = 0;
-
-      // Make sure initial event count is correct.
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Make sure initial focus state is unknown (assumed false).
-      var initialStateUnknown = false;
-      try {
-        plugin1.getFocusState();
-      } catch (e) {
-        initialStateUnknown = true;
-      }
-      is(initialStateUnknown, true, "Initial state should be unknown, assumed false.");
-
-      // Give the plugin focus (the window is already focused).
-      yield synthesizeNativeMouseEvent(plugin1X * scale, plugin1Y * scale, NSLeftMouseDown, 0, plugin1, continueTest);
-      yield synthesizeNativeMouseEvent(plugin1X * scale, plugin1Y * scale, NSLeftMouseUp, 0, plugin1, continueTest);
-      expectedEventCount++;
-
-      is(plugin1.getFocusState(), true, "(1) Plugin should have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Make sure window activation state changes don't spontaneously
-      // change plugin focus.
-
-      // Blur the window.
-      SpecialPowers.focus(opener);
-
-      is(plugin1.getFocusState(), true, "(2) Plugin should still have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Focus the window.
-      SpecialPowers.focus(window);
-
-      is(plugin1.getFocusState(), true, "(3) Plugin should still have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Take focus from the plugin.
-      yield synthesizeNativeMouseEvent(plugin2X * scale, plugin2Y * scale, NSLeftMouseDown, 0, plugin2, continueTest);
-      yield synthesizeNativeMouseEvent(plugin2X * scale, plugin2Y * scale, NSLeftMouseUp, 0, plugin2, continueTest);
-      expectedEventCount++;
-
-      is(plugin1.getFocusState(), false, "(4) Plugin should not have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Make sure window activation causes the plugin to be informed of focus
-      // changes that took place while the window was inactive.
-
-      // Give the plugin focus (the window is already focused).
-      yield synthesizeNativeMouseEvent(plugin1X * scale, plugin1Y * scale, NSLeftMouseDown, 0, plugin1, continueTest);
-      yield synthesizeNativeMouseEvent(plugin1X * scale, plugin1Y * scale, NSLeftMouseUp, 0, plugin1, continueTest);
-      expectedEventCount++;
-
-      // Blur the window.
-      SpecialPowers.focus(opener);
-
-      // Take focus from the plugin while the window is blurred.
-      plugin2.focus();
-
-      is(plugin1.getFocusState(), true, "(5) Plugin should still have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-
-      // Focus the window.
-      SpecialPowers.focus(window);
-      expectedEventCount++;
-
-      is(plugin1.getFocusState(), false, "(6) Plugin should not have focus.");
-      is(plugin1.getFocusEventCount(), expectedEventCount, "Focus event count should be " + expectedEventCount);
-    }
-
-    var gTestContinuation = null;
-    function continueTest() {
-      if (!gTestContinuation) {
-        gTestContinuation = runTests();
-      }
-      var ret = gTestContinuation.next();
-      if (ret.done) {
-        window.opener.testsFinished();
-      } else {
-        is(ret.value, true, "Mouse event successfully synthesized");
-      }
-    }
-
-    // Onload hander doesn't work for these tests -- no events arrive at the plugin.
-    window.opener.SimpleTest.waitForFocus(continueTest, window);
-
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/cocoa_window_focus.html firefox-85.0+build1/dom/plugins/test/mochitest/cocoa_window_focus.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/cocoa_window_focus.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/cocoa_window_focus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-<html>
-<head>
-  <title>NPCocoaEventWindowFocusChanged Tests</title>
-</head>
-<body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-  <embed id="plugin2" type="application/x-test" width="400" height="400"></embed>
-  <script type="application/javascript">
-    function is(aLeft, aRight, aMessage) {
-      window.opener.SimpleTest.is(aLeft, aRight, aMessage);
-    }
-
-    function ok(aValue, aMessage) {
-      window.opener.SimpleTest.ok(aValue, aMessage);
-    }
-
-    function executeSoon(func) {
-      window.opener.SimpleTest.executeSoon(func);
-    }
-
-    function waitForFocus(aCb, aTarget, aBlank) {
-      window.opener.SimpleTest.waitForFocus(aCb, aTarget, aBlank);
-    }
-
-    function runTests() {
-      var plugin1 = document.getElementById("plugin1");
-      var plugin2 = document.getElementById("plugin2");
-
-      if (plugin1.getEventModel() != 1) {
-        window.opener.todo(false, "Skipping this test when not testing the Cocoa event model");
-        window.opener.testsFinished();
-        return;
-      }
-
-      // The first plugin will have in-page focus for these tests.
-      plugin1.focus();
-
-      // The expected event count which applies to all instances.
-      // Initialize to 1 to account for the initial state event.
-      var expectedEventCount = 1;
-
-      // First make sure the plugins got an initial window focus event.
-      // Since this window was just opened it should be in the front. If
-      // the plugin has not been sent an initial window state then it will
-      // be in an unknown state and it will throw an exception.
-      try {
-        is(plugin1.getTopLevelWindowActivationState(), true, "Activation state should be: activated");
-        is(plugin1.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-
-        is(plugin2.getTopLevelWindowActivationState(), true, "Activation state should be: activated");
-        is(plugin2.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-      } catch (e) {
-        ok(false, "Plugin does not know its initial top-level window activation state!");
-      }
-
-      var fm = SpecialPowers.Services.focus;
-
-      waitForFocus(function() {
-        // Make sure the plugin handled the focus event before checking.
-        executeSoon(function() {
-          expectedEventCount++;
-
-          is(plugin1.getTopLevelWindowActivationState(), false, "Activation state should be: deactivated");
-          is(plugin1.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-
-          is(plugin2.getTopLevelWindowActivationState(), false, "Activation state should be: deactivated");
-          is(plugin2.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-
-          // Bring our window back to the front and make sure plugins were properly notified.
-          fm.focusedWindow = window;
-
-          waitForFocus(function() {
-            // Make sure the plugin handled the focus event before checking.
-            executeSoon(function() {
-              expectedEventCount++;
-
-              is(plugin1.getTopLevelWindowActivationState(), true, "Activation state should be: activated");
-              is(plugin1.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-
-              is(plugin2.getTopLevelWindowActivationState(), true, "Activation state should be: activated");
-              is(plugin2.getTopLevelWindowActivationEventCount(), expectedEventCount, "Window focus event count should be " + expectedEventCount);
-
-              window.opener.testsFinished();
-            });
-          }, window);
-        });
-      }, window.opener);
-
-      // Send our window to the back and make sure plugins were properly notified.
-      // Calling window.blur() is not allowed.
-      fm.focusedWindow = window.opener;
-    }
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/crashing_subpage.html firefox-85.0+build1/dom/plugins/test/mochitest/crashing_subpage.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/crashing_subpage.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/crashing_subpage.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<html>
-<body onload="window.parent.frameLoaded()">
-  <h1>Crashing subpage</h1>
-  <embed id="plugin1" type="application/x-test" width="400" height="400" drawmode="solid" color="FF00FFFF"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/dialog_watcher.js firefox-85.0+build1/dom/plugins/test/mochitest/dialog_watcher.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/dialog_watcher.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/dialog_watcher.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,245 +0,0 @@
-/* eslint-env mozilla/chrome-worker */
-
-const EVENT_OBJECT_SHOW = 0x8002;
-const EVENT_OBJECT_HIDE = 0x8003;
-const WINEVENT_OUTOFCONTEXT = 0;
-const WINEVENT_SKIPOWNPROCESS = 2;
-const QS_ALLINPUT = 0x04ff;
-const INFINITE = 0xffffffff;
-const WAIT_OBJECT_0 = 0;
-const WAIT_TIMEOUT = 258;
-const PM_NOREMOVE = 0;
-var user32;
-
-function DialogWatcher(titleText, onDialogStart, onDialogEnd) {
-  this.titleText = titleText;
-  this.onDialogStart = onDialogStart;
-  this.onDialogEnd = onDialogEnd;
-}
-
-DialogWatcher.prototype.init = function() {
-  this.hwnd = undefined;
-  if (!this.user32) {
-    this.user32 = ctypes.open("user32.dll");
-  }
-  if (!this.findWindow) {
-    this.findWindow = user32.declare(
-      "FindWindowW",
-      ctypes.winapi_abi,
-      ctypes.uintptr_t,
-      ctypes.char16_t.ptr,
-      ctypes.char16_t.ptr
-    );
-  }
-  if (!this.winEventProcType) {
-    this.winEventProcType = ctypes.FunctionType(
-      ctypes.stdcall_abi,
-      ctypes.void_t,
-      [
-        ctypes.uintptr_t,
-        ctypes.uint32_t,
-        ctypes.uintptr_t,
-        ctypes.long,
-        ctypes.long,
-        ctypes.uint32_t,
-        ctypes.uint32_t,
-      ]
-    ).ptr;
-  }
-  if (!this.setWinEventHook) {
-    this.setWinEventHook = user32.declare(
-      "SetWinEventHook",
-      ctypes.winapi_abi,
-      ctypes.uintptr_t,
-      ctypes.uint32_t,
-      ctypes.uint32_t,
-      ctypes.uintptr_t,
-      this.winEventProcType,
-      ctypes.uint32_t,
-      ctypes.uint32_t,
-      ctypes.uint32_t
-    );
-  }
-  if (!this.unhookWinEvent) {
-    this.unhookWinEvent = user32.declare(
-      "UnhookWinEvent",
-      ctypes.winapi_abi,
-      ctypes.int,
-      ctypes.uintptr_t
-    );
-  }
-  if (!this.pointType) {
-    this.pointType = ctypes.StructType("tagPOINT", [
-      { x: ctypes.long },
-      { y: ctypes.long },
-    ]);
-  }
-  if (!this.msgType) {
-    this.msgType = ctypes.StructType("tagMSG", [
-      { hwnd: ctypes.uintptr_t },
-      { message: ctypes.uint32_t },
-      { wParam: ctypes.uintptr_t },
-      { lParam: ctypes.intptr_t },
-      { time: ctypes.uint32_t },
-      { pt: this.pointType },
-    ]);
-  }
-  if (!this.peekMessage) {
-    this.peekMessage = user32.declare(
-      "PeekMessageW",
-      ctypes.winapi_abi,
-      ctypes.int,
-      this.msgType.ptr,
-      ctypes.uintptr_t,
-      ctypes.uint32_t,
-      ctypes.uint32_t,
-      ctypes.uint32_t
-    );
-  }
-  if (!this.msgWaitForMultipleObjects) {
-    this.msgWaitForMultipleObjects = user32.declare(
-      "MsgWaitForMultipleObjects",
-      ctypes.winapi_abi,
-      ctypes.uint32_t,
-      ctypes.uint32_t,
-      ctypes.uintptr_t.ptr,
-      ctypes.int,
-      ctypes.uint32_t,
-      ctypes.uint32_t
-    );
-  }
-  if (!this.getWindowTextW) {
-    this.getWindowTextW = user32.declare(
-      "GetWindowTextW",
-      ctypes.winapi_abi,
-      ctypes.int,
-      ctypes.uintptr_t,
-      ctypes.char16_t.ptr,
-      ctypes.int
-    );
-  }
-  if (!this.messageBox) {
-    // Handy for debugging this code
-    this.messageBox = user32.declare(
-      "MessageBoxW",
-      ctypes.winapi_abi,
-      ctypes.int,
-      ctypes.uintptr_t,
-      ctypes.char16_t.ptr,
-      ctypes.char16_t.ptr,
-      ctypes.uint32_t
-    );
-  }
-};
-
-DialogWatcher.prototype.getWindowText = function(hwnd) {
-  var bufType = ctypes.ArrayType(ctypes.char16_t);
-  var buffer = new bufType(256);
-
-  if (this.getWindowTextW(hwnd, buffer, buffer.length)) {
-    return buffer.readString();
-  }
-  return undefined;
-};
-
-DialogWatcher.prototype.processWindowEvents = function(timeout) {
-  var onWinEvent = function(
-    self,
-    hook,
-    event,
-    hwnd,
-    idObject,
-    idChild,
-    dwEventThread,
-    dwmsEventTime
-  ) {
-    var nhwnd = Number(hwnd);
-    if (event == EVENT_OBJECT_SHOW) {
-      if (nhwnd == self.hwnd) {
-        // We've already picked up this event via FindWindow
-        return;
-      }
-      var windowText = self.getWindowText(hwnd);
-      if (windowText == self.titleText && self.onDialogStart) {
-        self.hwnd = nhwnd;
-        self.onDialogStart(nhwnd);
-      }
-    } else if (
-      event == EVENT_OBJECT_HIDE &&
-      nhwnd == self.hwnd &&
-      self.onDialogEnd
-    ) {
-      self.onDialogEnd();
-      self.hwnd = null;
-    }
-  };
-  var self = this;
-  var callback = this.winEventProcType(function(
-    hook,
-    event,
-    hwnd,
-    idObject,
-    idChild,
-    dwEventThread,
-    dwmsEventTime
-  ) {
-    onWinEvent(
-      self,
-      hook,
-      event,
-      hwnd,
-      idObject,
-      idChild,
-      dwEventThread,
-      dwmsEventTime
-    );
-  });
-  var hook = this.setWinEventHook(
-    EVENT_OBJECT_SHOW,
-    EVENT_OBJECT_HIDE,
-    0,
-    callback,
-    0,
-    0,
-    WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS
-  );
-  if (!hook) {
-    return null;
-  }
-  // Check if the window is already showing
-  var hwnd = this.findWindow(null, this.titleText);
-  if (hwnd && hwnd > 0) {
-    this.hwnd = Number(hwnd);
-    if (this.onDialogStart) {
-      this.onDialogStart(this.hwnd);
-    }
-  }
-
-  if (!timeout) {
-    timeout = INFINITE;
-  }
-
-  var waitStatus = WAIT_OBJECT_0;
-  var expectingStart = this.onDialogStart && this.hwnd === undefined;
-  var startWaitTime = Date.now();
-  while (this.hwnd === undefined || (this.onDialogEnd && this.hwnd)) {
-    waitStatus = this.msgWaitForMultipleObjects(
-      0,
-      null,
-      0,
-      expectingStart ? INFINITE : timeout,
-      0
-    );
-    if (waitStatus == WAIT_OBJECT_0) {
-      var msg = new this.msgType();
-      this.peekMessage(msg.address(), 0, 0, 0, PM_NOREMOVE);
-    }
-    if (waitStatus == WAIT_TIMEOUT || Date.now() - startWaitTime >= timeout) {
-      break;
-    }
-  }
-
-  this.unhookWinEvent(hook);
-  // Returns true if the hook was successful, something was found, and we never timed out
-  return this.hwnd !== undefined && waitStatus == WAIT_OBJECT_0;
-};
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/file_bug1245545.js firefox-85.0+build1/dom/plugins/test/mochitest/file_bug1245545.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/file_bug1245545.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/file_bug1245545.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* eslint-env mozilla/frame-script */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-function getTestPlugin(pluginName) {
-  var ph = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-  var tags = ph.getPluginTags();
-  var name = pluginName || "Test Plug-in";
-  for (var tag of tags) {
-    if (tag.name == name) {
-      return tag;
-    }
-  }
-  return null;
-}
-
-addMessageListener("check-plugin-unload", function(message) {
-  var tag = getTestPlugin();
-  sendAsyncMessage("check-plugin-unload", tag.loaded);
-});
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/hang_test.js firefox-85.0+build1/dom/plugins/test/mochitest/hang_test.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/hang_test.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/hang_test.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-
-var success = false;
-var observerFired = false;
-var observerPromise = null;
-
-var testObserver = {
-  idleHang: true,
-
-  observe(subject, topic, data) {
-    observerFired = true;
-    ok(true, "Observer fired");
-    is(topic, "plugin-crashed", "Checking correct topic");
-    is(data, null, "Checking null data");
-    ok(subject instanceof Ci.nsIPropertyBag2, "got Propbag");
-    ok(subject instanceof Ci.nsIWritablePropertyBag2, "got writable Propbag");
-
-    var pluginId = subject.getPropertyAsAString("pluginDumpID");
-    isnot(pluginId, "", "got a non-empty plugin crash id");
-
-    var additionalDumps = subject.getPropertyAsACString("additionalMinidumps");
-    isnot(additionalDumps, "", "got a non-empty additionalDumps field");
-
-    // check plugin dump and extra files
-    let profD = Services.dirsvc.get("ProfD", Ci.nsIFile);
-    profD.append("minidumps");
-    let pluginDumpFile = profD.clone();
-    pluginDumpFile.append(pluginId + ".dmp");
-    ok(pluginDumpFile.exists(), "plugin minidump exists");
-
-    let pluginExtraFile = profD.clone();
-    pluginExtraFile.append(pluginId + ".extra");
-    ok(pluginExtraFile.exists(), "plugin extra file exists");
-
-    observerPromise = OS.File.read(pluginExtraFile.path, {
-      encoding: "utf-8",
-    }).then(json => {
-      let extraData = JSON.parse(json);
-
-      // check additional dumps
-      ok(
-        "additional_minidumps" in extraData,
-        "got field for additional minidumps"
-      );
-      is(
-        additionalDumps,
-        extraData.additional_minidumps,
-        "the annotation matches the propbag entry"
-      );
-      let dumpNames = extraData.additional_minidumps.split(",");
-      ok(dumpNames.includes("browser"), "browser in additional_minidumps");
-
-      for (let name of dumpNames) {
-        let file = profD.clone();
-        file.append(pluginId + "-" + name + ".dmp");
-        ok(file.exists(), "additional dump '" + name + "' exists");
-      }
-
-      // check cpu usage field
-      ok("PluginCpuUsage" in extraData, "got extra field for plugin cpu usage");
-      let cpuUsage = parseFloat(extraData.PluginCpuUsage);
-      if (this.idleHang) {
-        ok(cpuUsage == 0, "plugin cpu usage is 0%");
-      } else {
-        ok(cpuUsage > 0, "plugin cpu usage is >0%");
-      }
-    });
-  },
-
-  QueryInterface: ChromeUtils.generateQI([
-    "nsIObserver",
-    "nsISupportsWeakReference",
-  ]),
-};
-
-function onPluginCrashed(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  ok(observerFired, "Observer should have fired first");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  var pluginElement = document.getElementById("plugin1");
-  is(
-    pluginElement,
-    aEvent.target,
-    "Plugin crashed event target is plugin element"
-  );
-
-  ok(
-    aEvent instanceof PluginCrashedEvent,
-    "plugin crashed event has the right interface"
-  );
-
-  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
-  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
-  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
-  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
-  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
-  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
-  // The app itself may or may not have decided to submit the report, so
-  // allow either true or false here.
-  ok(
-    "submittedCrashReport" in aEvent,
-    "submittedCrashReport is a property of event"
-  );
-  is(
-    typeof aEvent.submittedCrashReport,
-    "boolean",
-    "submittedCrashReport is correct type"
-  );
-
-  Services.obs.removeObserver(testObserver, "plugin-crashed");
-
-  observerPromise.then(() => {
-    SimpleTest.finish();
-  });
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_common.js firefox-85.0+build1/dom/plugins/test/mochitest/hangui_common.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_common.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/hangui_common.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Plugin Hang UI constants
-const HANGUIOP_NOTHING = 0;
-const HANGUIOP_CANCEL = 1;
-const HANGUIOP_COMMAND = 2;
-const IDC_CONTINUE = 1001;
-const IDC_STOP = 1002;
-const IDC_NOFUTURE = 1003;
-
-// Windows constants
-const WM_CLOSE = 0x0010;
-const WM_COMMAND = 0x0111;
-const BM_GETCHECK = 0x00f0;
-const BM_SETCHECK = 0x00f1;
-const BN_CLICKED = 0;
-const BST_CHECKED = 1;
-
-// Test-specific constants
-const EPSILON_MS = 1000;
-const STALL_DURATION = 2;
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_iface.js firefox-85.0+build1/dom/plugins/test/mochitest/hangui_iface.js
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_iface.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/hangui_iface.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/* eslint-env mozilla/chrome-worker */
-
-var user32;
-var sendMessage;
-var getDlgItem;
-var messageBox;
-var watcher;
-
-/* import-globals-from hangui_common.js */
-importScripts("hangui_common.js");
-/* import-globals-from dialog_watcher.js */
-importScripts("dialog_watcher.js");
-
-function initCTypes() {
-  if (!user32) {
-    user32 = ctypes.open("user32.dll");
-  }
-  if (!getDlgItem) {
-    getDlgItem = user32.declare(
-      "GetDlgItem",
-      ctypes.winapi_abi,
-      ctypes.uintptr_t,
-      ctypes.uintptr_t,
-      ctypes.int
-    );
-  }
-  if (!sendMessage) {
-    sendMessage = user32.declare(
-      "SendMessageW",
-      ctypes.winapi_abi,
-      ctypes.intptr_t,
-      ctypes.uintptr_t,
-      ctypes.uint32_t,
-      ctypes.uintptr_t,
-      ctypes.intptr_t
-    );
-  }
-  if (!messageBox) {
-    // Handy for debugging the test itself
-    messageBox = user32.declare(
-      "MessageBoxW",
-      ctypes.winapi_abi,
-      ctypes.int,
-      ctypes.uintptr_t,
-      ctypes.char16_t.ptr,
-      ctypes.char16_t.ptr,
-      ctypes.uint32_t
-    );
-  }
-  if (!watcher) {
-    watcher = new DialogWatcher("Warning: Unresponsive plugin");
-  }
-}
-
-function postSuccess(params) {
-  self.postMessage({ status: true, params });
-}
-
-function postFail(params, msg) {
-  self.postMessage({ status: false, params, msg });
-}
-
-function onDialogStart(inparams, hwnd) {
-  var params = Object.create(inparams);
-  params.testName += " (Start)";
-  params.callback = null;
-  if (!params.expectToFind) {
-    postFail(params, "Dialog showed when we weren't expecting it to!");
-    return;
-  }
-  if (params.opCode == HANGUIOP_CANCEL) {
-    sendMessage(hwnd, WM_CLOSE, 0, 0);
-  } else if (params.opCode == HANGUIOP_COMMAND) {
-    if (params.check) {
-      var checkbox = getDlgItem(hwnd, IDC_NOFUTURE);
-      if (!checkbox) {
-        postFail(params, "Couldn't find checkbox");
-        return;
-      }
-      sendMessage(checkbox, BM_SETCHECK, BST_CHECKED, 0);
-      sendMessage(
-        hwnd,
-        WM_COMMAND,
-        (BN_CLICKED << 16) | IDC_NOFUTURE,
-        checkbox
-      );
-    }
-    var button = getDlgItem(hwnd, params.commandId);
-    if (!button) {
-      postFail(
-        params,
-        "GetDlgItem failed to find button with ID " + params.commandId
-      );
-      return;
-    }
-    sendMessage(
-      hwnd,
-      WM_COMMAND,
-      (BN_CLICKED << 16) | params.commandId,
-      button
-    );
-  }
-  postSuccess(params);
-}
-
-function onDialogEnd(inparams) {
-  var params = Object.create(inparams);
-  params.testName += " (End)";
-  params.callback = inparams.callback;
-  postSuccess(params);
-}
-
-self.onmessage = function(event) {
-  initCTypes();
-  watcher.init();
-  var params = event.data;
-  var timeout = params.timeoutMs;
-  if (params.expectToFind) {
-    watcher.onDialogStart = function(hwnd) {
-      onDialogStart(params, hwnd);
-    };
-    if (params.expectToClose) {
-      watcher.onDialogEnd = function() {
-        onDialogEnd(params);
-      };
-    }
-  } else {
-    watcher.onDialogStart = null;
-    watcher.onDialogEnd = null;
-  }
-  var result = watcher.processWindowEvents(timeout);
-  if (result === null) {
-    postFail(params, "Hook failed");
-  } else if (!result) {
-    if (params.expectToFind) {
-      postFail(params, "The dialog didn't show but we were expecting it to");
-    } else {
-      postSuccess(params);
-    }
-  }
-};
-
-self.onerror = function(event) {
-  var msg =
-    "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
-  postFail(null, msg);
-};
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_subpage.html firefox-85.0+build1/dom/plugins/test/mochitest/hangui_subpage.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/hangui_subpage.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/hangui_subpage.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<html>
-<body onload="window.parent.frameLoaded()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/mixed_case_mime.sjs firefox-85.0+build1/dom/plugins/test/mochitest/mixed_case_mime.sjs
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/mixed_case_mime.sjs	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/mixed_case_mime.sjs	2021-01-18 19:58:10.000000000 +0000
@@ -1,7 +1,7 @@
 function handleRequest(request, response)
 {
   response.processAsync();
-  response.setHeader("Content-Type", "application/x-Second-Test", false);
+  response.setHeader("Content-Type", "image/pNG", false);
 
   response.write("Hello world.\n");
   response.finish();
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/mochitest.ini firefox-85.0+build1/dom/plugins/test/mochitest/mochitest.ini
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/mochitest.ini	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -4,16 +4,9 @@
 skip-if = headless # crash on shutdown, no other failures
 support-files =
   307-xo-redirect.sjs
-  crashing_subpage.html
-  1028200-subpageA.html
-  1028200-subpageA1.html
-  1028200-subpageB.html
-  1028200-subpageB1.html
-  1028200-subpageC.html
   file_authident.js
   file_bug771202.html
   file_bug863792.html
-  file_bug1245545.js
   large-pic.jpg
   loremipsum.txt
   loremipsum.xtest
@@ -30,134 +23,23 @@
   post.sjs
   plugin-utils.js
 
-[test_bug1028200-1.html]
-skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
-[test_bug1028200-2.html]
-skip-if = !crashreporter
-[test_bug1028200-3.html]
-skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
-[test_bug1028200-4.html]
-skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
-[test_bug1028200-5.html]
-skip-if = !crashreporter
-fail-if = (xorigin && fission) # Element is no longer fullscreen
-[test_bug1028200-6.html]
-skip-if = !crashreporter
-[test_bug1028200-7.html]
-skip-if = !crashreporter
-[test_bug532208.html]
-[test_bug539565-1.html]
-[test_bug539565-2.html]
-[test_bug771202.html]
-[test_bug777098.html]
-[test_bug784131.html]
-[test_bug813906.html]
-[test_bug852315.html]
-[test_bug854082.html]
-[test_bug863792.html]
-[test_bug967694.html]
-[test_bug985859.html]
-[test_bug986930.html]
-[test_bug1092842.html]
-skip-if = (verify && (os == 'win')) || (os == "win" && webrender) # win/webrender bug 1296400
-[test_bug1165981.html]
-skip-if =
-    processor == 'aarch64' && os == 'win'
-    xorigin && !fission  # JavaScript error: test_bug1165981.html:line 51: TypeError: pluginElement.identifierToStringTest is not a function; this test incorrectly passes when fission is enabled because the permission is being checked for the frame site rather than the top-level site.
-reason = Plugins are not supported on Windows/AArch64
-[test_bug1245545.html]
-[test_bug1307694.html]
-skip-if = verify || (processor == 'aarch64' && os == 'win') # aarch64 due to 1541241
-fail-if = (xorigin && !fission)
-[test_cocoa_focus.html]
-skip-if = toolkit != "cocoa" || e10s # Bug 1194534
-support-files = cocoa_focus.html
-[test_cocoa_window_focus.html]
-skip-if = toolkit != "cocoa" # Bug 1194534
-support-files = cocoa_window_focus.html
-[test_copyText.html]
-skip-if = toolkit != "gtk"
-[test_crash_nested_loop.html]
-skip-if = toolkit != "gtk"
-[test_crashing.html]
-skip-if = !crashreporter
-[test_crashing2.html]
-skip-if = (!crashreporter) || true # Bug 566049
-[test_CrashService_crash.html]
-skip-if = !crashreporter || e10s
-[test_CrashService_hang.html]
-skip-if = !crashreporter || e10s
-[test_defaultValue.html]
-skip-if = (verify && !debug && (os == 'linux'))
-[test_enumerate.html]
 [test_hanging.html]
 skip-if = !crashreporter || e10s
-[test_hidden_plugin.html]
-[test_instance_re-parent.html]
-[test_instance_unparent1.html]
-[test_instance_unparent2.html]
-[test_instance_unparent3.html]
-[test_instantiation.html]
 [test_mixed_case_mime.html]
 skip-if = (processor == 'aarch64' && os == 'win')
 reason = Plugins are not supported on Windows/AArch64
-[test_multipleinstanceobjects.html]
-[test_newstreamondestroy.html]
-[test_npn_timers.html]
-[test_npobject_getters.html]
-[test_NPNVdocumentOrigin.html]
-[test_NPPVpluginWantsAllNetworkStreams.html]
-[test_npruntime_construct.html]
-[test_npruntime_identifiers.html]
-[test_npruntime_npnevaluate.html]
-[test_npruntime_npninvoke.html]
-[test_npruntime_npninvokedefault.html]
-[test_object.html]
-[test_painting.html]
-skip-if = (toolkit == "cocoa" && e10s) # bug 1252230
+[test_plugin_fallback_focus.html]
 [test_plugin_scroll_painting.html]
 skip-if = true # Bug 596491
-[test_pluginstream_err.html]
 [test_pluginstream_geturl.html]
 skip-if = true # Bug 1267432
 [test_pluginstream_geturlnotify.html]
 skip-if = true # Bug 1267432
-[test_pluginstream_post.html]
-[test_pluginstream_poststream.html]
-[test_pluginstream_referer.html]
-fail-if = xorigin
-[test_pluginstream_src.html]
-[test_pluginstream_src_dynamic.html]
-[test_pluginstream_src_referer.html]
-fail-if = xorigin
 [test_positioning.html]
 skip-if = true # disabled due to oddness, perhaps scrolling of the mochitest window?
-[test_propertyAndMethod.html]
-[test_queryCSSZoomFactor.html]
 [test_queryContentsScaleFactor.html]
 skip-if = (toolkit != "cocoa") || (os != "win")
 [test_queryContentsScaleFactorWindowed.html]
 skip-if = (toolkit != "cocoa") || (os != "win")
-[test_redirect_handling.html]
 [test_refresh_navigator_plugins.html]
 skip-if = e10s # Bug 1090576
-[test_secondPlugin.html]
-[test_src_url_change.html]
-[test_streamatclose.html]
-[test_streamNotify.html]
-[test_stringHandling.html]
-[test_visibility.html]
-skip-if = toolkit == "cocoa"
-[test_windowed_invalidate.html]
-skip-if = os != "win" || webrender # win/webrender bug 1296400
-[test_windowless_flash.html]
-skip-if = !(os == "win" && processor == "x86_64") || verify
-[test_windowless_ime.html]
-skip-if = os != "win" || (os == "win" && processor == "aarch64") # aarch64 due to 1536350
-[test_x11_error_crash.html]
-skip-if = !crashreporter || e10s || toolkit != "gtk"
-[test_zero_opacity.html]
-skip-if = os == "win" && webrender # win/webrender bug 1296400
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/plugin_data_url_test.html firefox-85.0+build1/dom/plugins/test/mochitest/plugin_data_url_test.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/plugin_data_url_test.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/plugin_data_url_test.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-  <embed id="testplugin" type="application/x-test" drawmode="solid" color="ff00ff00" wmode="window"
-         style="position:absolute; top:50px; left:50px; width:500px; height:250px">
-<div style="display:block; height:3000px;"></div>
-
-<iframe id="dataFrame" src="data:text/html,foo" width="300" height="300"></iframe>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/plugin_visibility_loader.html firefox-85.0+build1/dom/plugins/test/mochitest/plugin_visibility_loader.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/plugin_visibility_loader.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/plugin_visibility_loader.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body style="background-color: #88AAFF;">
-  <h1>This Page Has a Solid Plugin</h1>
-
-  <p><embed id="p" type="application/x-test" drawmode="solid" color="FFFF0000" width="200" height="200"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/privatemode_perwindowpb.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/privatemode_perwindowpb.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/privatemode_perwindowpb.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/privatemode_perwindowpb.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="NPAPI Private Mode Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<body xmlns="http://www.w3.org/1999/xhtml">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-<embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
-</body>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-1.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-1.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-1.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Cancelled, div[F] -> iframe -> iframe -> plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to be a child of the full
-     * screen element - and therefore exit out of the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToBeCancelled() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("div1");
-        let plugin = document.getElementById("iframe1")
-          .contentDocument.getElementById("iframe2")
-          .contentDocument.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * doesn't.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            resolve();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            reject();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is no longer fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is no longer fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <div id="div1">
-    <iframe id="iframe1" src="1028200-subpageA.html" height="600" width="600"></iframe>
-  </div>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-2.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-2.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-2.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Remains, div[F];plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to not be a child of the full
-     * screen element - and therefore remain in the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToRemain() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("div1");
-        let plugin = document.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to _not_ change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * does. Otherwise, we'll assume fullscreen didn't change and finish the
-         * test.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            reject();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            resolve();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is still fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is still fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <div id="div1"></div>
-  <embed id="plugin1" type="application/x-test" />
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-3.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-3.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-3.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Cancelled, iframe[F] -> iframe -> div -> plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to be a child of the full
-     * screen element - and therefore exit out of the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToBeCancelled() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("iframe1");
-        let plugin = document.getElementById("iframe1")
-             .contentDocument.getElementById("iframe2")
-             .contentDocument.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * doesn't.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            resolve();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            reject();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is no longer fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is no longer fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <iframe id="iframe1" src="1028200-subpageB.html" height="600" width="600"></iframe>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-4.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-4.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-4.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-4.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Cancelled, iframe[F]  -> iframe -> div -> plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to be a child of the full
-     * screen element - and therefore exit out of the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToBeCancelled() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("iframe1");
-        let plugin = document.getElementById("iframe1")
-             .contentDocument.getElementById("iframe2")
-             .contentDocument.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * doesn't.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            resolve();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            reject();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is no longer fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is no longer fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <iframe id="iframe1" src="1028200-subpageB.html" height="600" width="600"></iframe>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-5.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-5.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-5.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-5.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Cancelled, div[F] -> plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to be a child of the full
-     * screen element - and therefore exit out of the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToBeCancelled() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("div1");
-        let plugin = document.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * doesn't.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            resolve();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            reject();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is no longer fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is no longer fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-test" />
-  </div>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-6.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-6.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-6.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-6.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Remains, iframe[F];plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to not be a child of the full
-     * screen element - and therefore remain in the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToRemain() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("iframe1");
-        let plugin = document.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to _not_ change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * does. Otherwise, we'll assume fullscreen didn't change and finish the
-         * test.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            reject();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            resolve();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is still fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is still fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <iframe id="iframe1"></iframe>
-  <embed id="plugin1" type="application/x-test" />
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-7.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-7.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1028200-7.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1028200-7.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <title>Plugin Crash, FullScreenElement Remains, iframe -> div[F]; iframe -> iframe -> plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-
-<body onLoad="load()">
-  <script class="testbody" type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.expectChildProcessCrash();
-    SimpleTest.requestFlakyTimeout("This is needed in the event the " +
-        "fullscreen element fails to cancel fullscreen.  The fullscreen " +
-        "element is expected to exit fullscreen but takes some time to " +
-        "register as having exited when using `mozCancelFullScreen`.  So we " +
-        "can't just check that `mozFullScreenElement` is true or false after " +
-        "having called `mozCancelFullScreen` without the timeout because it " +
-        "will return the value prior to actually cancelling. A timeout is " +
-        "preferred here as opposed to polling methods similar to " +
-        "`SimpleTest.waitForCondition` in `SimpleTest.js` for reasons of" +
-        "idiomaticity."
-        );
-
-    /**
-     * FullScreen element is expected to remain alive after the test ends; this
-     * stops it.
-     */
-    SimpleTest.registerCleanupFunction(() => {
-      if (this.document.mozFullScreenElement) {
-        let fullScreenChange = promiseFullScreenChange();
-        this.document.mozCancelFullScreen();
-        return fullScreenChange;
-      }
-      return Promise.resolve();
-    });
-
-    /**
-     * Start with a fullscreen element.
-     * Then crash the plugin - which is expected to not be a child of the full
-     * screen element - and therefore remain in the fullscreen element.
-     */
-    let load = function testCrashChildPlugin_expectFullScreenElementToRemain() {
-      add_task(async function() {
-        /* Needed to be able to programatically (without user interaction) enter
-         * fullscreen  (has been deemed a security issue otherwise and therefore
-         * disabled by default)
-         */
-        await SpecialPowers.pushPrefEnv({
-          "set": [
-            ["full-screen-api.allow-trusted-requests-only", false],
-          ],
-        });
-      });
-
-      add_task(async function() {
-        let fullScreenElement = document.getElementById("iframeA");
-        let plugin = document.getElementById("iframe1")
-          .contentDocument.getElementById("iframe2")
-          .contentDocument.getElementById("plugin1");
-
-        let fullScreenChange = promiseFullScreenChange();
-        fullScreenElement.mozRequestFullScreen();
-        await fullScreenChange;
-        ok(true, "Element is fullscreen");
-
-        await crashPlugin(plugin)
-          .then(() => {
-            ok(true, "Plugin was crashed");
-          })
-          .catch(() => {
-            ok(false, "Plugin was crashed");
-          });
-      });
-
-      add_task(async function() {
-        /**
-         * We expect the fullscreen mode to _not_ change in this test. We'll wait
-         * 5 seconds for any kind of fullscreen change to occur, and fail if it
-         * does. Otherwise, we'll assume fullscreen didn't change and finish the
-         * test.
-         */
-        await new Promise((resolve, reject) => {
-          let timeoutId;
-          let onFullScreenChange = () => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            clearTimeout(timeoutId);
-            reject();
-          };
-          document.addEventListener("fullscreenchange", onFullScreenChange);
-          timeoutId = setTimeout(() => {
-            document.removeEventListener("fullscreenchange", onFullScreenChange);
-            resolve();
-          }, 5000);
-        })
-        .then(() => {
-          ok(true, "Element is still fullscreen");
-        })
-        .catch(() => {
-          ok(false, "Element is still fullscreen");
-        });
-      });
-    };
-  </script>
-
-  <iframe id="iframeA" src="1028200-subpageC.html" allowfullscreen="true"></iframe>
-  <iframe id="iframe1" src="1028200-subpageA.html" height="600" width="600"></iframe>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1092842.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1092842.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1092842.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1092842.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Bug 1092842</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<body onload="startTest()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var p = null;
-
-  function startTest() {
-    p = document.getElementById("theplugin");
-    if (!p.hasWidget()) {
-      todo(false, "This test is only relevant for windowed plugins");
-      SimpleTest.finish();
-      return;
-    }
-
-    // Wait for the plugin to have painted once.
-    var interval = setInterval(function() {
-      if (!p.getPaintCount())
-        return;
-
-      clearInterval(interval);
-      doTest();
-      SimpleTest.finish();
-    }, 100);
-  }
-
-  function doTest() {
-    is(p.getClipRegionRectCount(), 1, "getClipRegionRectCount should be a single rect");
-    var dpr = window.devicePixelRatio;
-    is(p.getClipRegionRectEdge(0, 2) - p.getClipRegionRectEdge(0, 0), 100 * dpr, "width of clip region rect");
-    is(p.getClipRegionRectEdge(0, 3) - p.getClipRegionRectEdge(0, 1), 26 * dpr, "height of clip region rect");
-  }
-  </script>
-
-  <div style="position:fixed; z-index:1; left:0; right:0; top:0; height:100px; border-bottom:24px solid blue; background:pink; transform:translateZ(0)"></div>
-  <object id="theplugin" type="application/x-test" drawmode="solid" color="ff00ff00" wmode="window"
-          style="position:absolute; top:50px; left:0; width:100px; height:100px"></object>
-
-  <p id="display"></p>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1165981.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1165981.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1165981.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1165981.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-<html>
-  <head>
-     <title>Bug 1165981 Test</title>
-
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="plugin-utils.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  </head>
-    <script class="testbody" type="application/javascript">
-      "use strict";
-
-      SimpleTest.waitForExplicitFinish();
-
-      function findPlugin(pluginName) {
-          for (var i = 0; i < navigator.plugins.length; i++) {
-            var plugin = navigator.plugins[i];
-            if (plugin.name === pluginName) {
-              return plugin;
-            }
-          }
-          return null;
-      }
-
-      function findMimeType(mimeTypeType) {
-          for (var i = 0; i < navigator.mimeTypes.length; i++) {
-            var mimeType = navigator.mimeTypes[i];
-            if (mimeType.type === mimeTypeType) {
-              return mimeType;
-            }
-          }
-          return null;
-      }
-
-      function createNode(id, type) {
-          let obj = document.createElement("object");
-          obj.type = type;
-          obj.id = id;
-          obj.width = 200;
-          obj.height = 200;
-          document.body.appendChild(obj);
-      }
-
-      async function run() {
-        ok(await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Shockwave Flash"), "Should find allowed test flash plugin");
-        ok(!await SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Third Test Plug-in"), "Should not find disallowed plugin");
-        await SpecialPowers.pushPermissions([{type: "plugin:flash", allow: true, context: document}]);
-
-        createNode("plugin-flash", "application/x-shockwave-flash-test");
-        createNode("disallowedPlugin", "application/x-third-test");
-        var pluginElement = document.getElementById("plugin-flash");
-        is(pluginElement.identifierToStringTest("foo"), "foo", "Should be able to call a function provided by the plugin");
-
-        pluginElement = document.getElementById("disallowedPlugin");
-        is(typeof pluginElement.identifierToStringTest, "undefined", "Should NOT be able to call a function on a disallowed plugin");
-
-        ok(navigator.plugins["Shockwave Flash"], "Should have queried a plugin named 'Shockwave Flash'");
-        ok(!navigator.plugins["Third Test Plug-in"], "Should NOT have queried a disallowed plugin named 'Third Test Plug-in'");
-
-        ok(findPlugin("Shockwave Flash"), "Should have found a plugin named 'Shockwave Flash'");
-        ok(!findPlugin("Third Test Plug-in"), "Should NOT found a disallowed plugin named 'Third Test Plug-in'");
-
-        ok(navigator.mimeTypes["application/x-shockwave-flash-test"], "Should have queried a MIME type named 'application/x-shockwave-flash-test'");
-        ok(!navigator.mimeTypes["application/x-third-test"], "Should NOT have queried a disallowed type named 'application/x-third-test'");
-
-        ok(findMimeType("application/x-shockwave-flash-test"), "Should have found a MIME type named 'application/x-shockwave-flash-test'");
-        ok(!findMimeType("application/x-third-test"), "Should NOT have found a disallowed MIME type named 'application/x-third-test'");
-
-        SimpleTest.finish();
-      }
-    </script>
-
-  <body onload="run()">
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1245545.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1245545.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1245545.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1245545.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta><charset="utf-8"/>
-    <title>Test Modifying Plugin click-to-play Flag</title>
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="application/javascript" src="plugin-utils.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  </head>
-  <body onload="startTest()">
-    <script class="testbody" type="application/javascript">
-     SimpleTest.waitForExplicitFinish();
-     setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-     SpecialPowers.pushPrefEnv({ "set": [
-       ["dom.ipc.plugins.unloadTimeoutSecs", 0],
-     ] });
-
-     function startTest() {
-       let url = SimpleTest.getTestFileURL("file_bug1245545.js");
-       let script = SpecialPowers.loadChromeScript(url);
-       script.addMessageListener("check-plugin-unload", testChromeUnload);
-       var testPlugin = getTestPlugin();
-       ok(testPlugin, "Should have Test Plug-in");
-       is(testPlugin.loaded, true, "Test plugin should be loaded");
-       var pluginNode = document.getElementById("theplugin");
-       pluginNode.remove();
-       // Poll for plugin to unload.
-       function testContentUnload() {
-         if (!testPlugin.loaded) {
-           ok(true, "Test plugin unloaded in client process");
-           // Start the chrome unload test
-           testChromeUnload(true);
-         } else {
-           setTimeout(testContentUnload, 0);
-         }
-       }
-
-       function testChromeUnload(isLoaded) {
-         if (!isLoaded) {
-           ok(true, "Test plugin unloaded in chrome process");
-           SimpleTest.finish();
-         } else {
-           script.sendAsyncMessage("check-plugin-unload");
-         }
-       }
-       testContentUnload();
-     }
-    </script>
-    <object id="theplugin" type="application/x-test"></object>
-
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1307694.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1307694.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug1307694.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug1307694.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onLoad="addPerms()">
-
-  <script type="text/javascript">
-   SimpleTest.waitForExplicitFinish();
-   function addPerms() {
-     SpecialPowers.pushPermissions([{type: "plugin:flash", allow: true, context: document}], addPluginElement);
-   }
-
-   function addPluginElement() {
-     SpecialPowers.DOMWindowUtils.plugins[0].playPlugin();
-     var p = document.createElement("embed");
-     p.setAttribute("id", "plugin2");
-     p.setAttribute("type", "application/x-shockwave-flash-test");
-     p.setAttribute("scale", "noscale");
-     p.setAttribute("salign", "lt");
-     document.body.appendChild(p);
-     SimpleTest.executeSoon(function() {
-      runTests();
-     });
-   }
-
-   function runTests() {
-     var p = document.getElementById("plugin1");
-     ok(p.setColor != undefined, "Static plugin parameter (salign/scale) ordering were correct");
-     var p2 = document.getElementById("plugin2");
-     ok(p2.setColor != undefined, "Dynamic plugin parameter (salign/scale) ordering were correct");
-     SimpleTest.finish();
-   }
-
-  </script>
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-shockwave-flash-test" width="200" height="200" scale="noscale" salign="lt"></embed>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug479979.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_bug479979.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug479979.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug479979.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="NPAPI Set Undefined Value Test"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-async function runTests() {
-  var pluginElement1 = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement1.setUndefinedValueTest !== undefined,
-                                           "Waited too long for plugin to activate");
-
-  var rv = true; // we want !true from the test plugin
-  var exceptionThrown = false;
-  try {
-    rv = pluginElement1.setUndefinedValueTest();
-  } catch (e) {
-    exceptionThrown = true;
-  }
-  is(exceptionThrown, false, "Exception thrown setting undefined variable.");
-  is(rv, false, "Setting undefined variable succeeded.");
-
-  // give the UI a chance to settle with the current enabled plugin state
-  // before we finish the test and reset the state to disabled. Otherwise
-  // the UI shows the plugin infobar!
-  SimpleTest.executeSoon(SimpleTest.finish);
-}
-]]>
-</script>
-<embed id="plugin1" type="application/x-test" width="300" height="300"></embed>
-</body>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug532208.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug532208.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug532208.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug532208.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<head>
-<title>Test for correct async delivery of large streams, bug
-532208</title>
-
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="setTimeout(runTests, 2000)">
-
-<script class="testbody" type="application/javascript">
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-function runTests() {
-  try {
-    document.getElementById("plugin1").getPaintCount();
-    ok(true, "Data delivery didn't crash");
-  } catch (e) {
-    ok(false, "Data delivery crashed");
-  }
-  SimpleTest.finish();
-}
-</script>
-
-<embed id="plugin1" type="application/x-test" width="400"
-  height="400" src="large-pic.jpg" functiontofail="npp_write_rpc" streammode="normal"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug539565-1.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug539565-1.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug539565-1.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug539565-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=539565
--->
-<head>
-  <title>Test #1 for Bug 539565</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script class="testbody" type="text/javascript">
-function runTests() {
-  var moveBy = 17;
-  var waitedForPaint = 0;
-  function waitForPaint(func) {
-    waitedForPaint = 0;
-    var testplugin = $("plugin1");
-    testplugin.last_paint_count = testplugin.getPaintCount ? testplugin.getPaintCount() : -2;
-    function waitForPaintCountIncrement() {
-      waitedForPaint++;
-      moveBy = -moveBy;
-      $("abs").style.left = ($("abs").offsetLeft + moveBy) + "px";
-      document.documentElement.offsetHeight;
-      var pc = testplugin.getPaintCount ? testplugin.getPaintCount() : -2;
-      if (waitedForPaint == 20 || (pc != testplugin.last_paint_count && pc >= 0)) {
-        setTimeout(func, 0);
-      } else {
-        setTimeout(waitForPaintCountIncrement, 50);
-      }
-    }
-    waitForPaintCountIncrement();
-  }
-
-  function doClick(x, y, func) {
-    synthesizeMouse($("plugin1"), x, y, {}, window);
-    setTimeout(func, 0);
-  }
-
-  function verify(test, x, y, next) {
-    var p = $("plugin1").getLastMouseX();
-    const delta = 2;
-    var dpr = window.devicePixelRatio / SpecialPowers.getFullZoom(window);
-    ok(p - delta <= x * dpr && x * dpr <= p + delta, "test" + test + " LastMouseX got " + p + " expected " + x +
-                                     " with fullZoom=" + SpecialPowers.getFullZoom(window) + " MozTransform='" + $("container").style.MozTransform + "'");
-    p = $("plugin1").getLastMouseY();
-    ok(p - delta <= y * dpr && y * dpr <= p + delta, "test" + test + " LastMouseY got " + p + " expected " + y +
-                                     " with fullZoom=" + SpecialPowers.getFullZoom(window) + " MozTransform='" + $("container").style.MozTransform + "'");
-    if (next) next();
-  }
-
-  function click(x, y, next) {
-    waitForPaint(function() { doClick(x, y, next); });
-  }
-  function zoom(factor) {
-    SpecialPowers.setFullZoom(window, factor);
-  }
-
-  function test1() { // fullZoom=1 (sanity check)
-    zoom(1);
-    click(55, 136, function() { verify("1", 55, 136, test2); });
-  }
-  function test2() { // fullZoom=2
-    zoom(2);
-    click(40, 108, function() { verify("2", 80, 216, test2b); });
-  }
-  function test2b() {
-    click(108, 112, function() { verify("2c", 216, 224, endTest); });
-  }
-
-  function endTest() {
-    zoom(1);
-    SimpleTest.finish();
-  }
-
-  setTimeout(function() { waitForPaint(test1); }, 1000);
-}
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  </script>
-</head>
-
-<body onload="runTests()">
- <div id="container" style="position:relative;top: 0px; left: 0px; width: 640px; height: 480px;"> 
-  <div id="abs" style="position:absolute; left:90px; top:90px; width:20px; height:20px; background:blue; pointer-events:none;"></div>
-  <embed id="plugin1" type="application/x-test" wmode="transparent" width="200" height="200"></embed>
- </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug539565-2.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug539565-2.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug539565-2.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug539565-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=539565
--->
-<head>
-  <title>Test #2 for Bug 539565</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script class="testbody" type="text/javascript">
-function runTests() {
-  var moveBy = 17;
-  var waitedForPaint = 0;
-  function waitForPaint(func) {
-    waitedForPaint = 0;
-    var testplugin = $("plugin1");
-    testplugin.last_paint_count = testplugin.getPaintCount ? testplugin.getPaintCount() : -2;
-    function waitForPaintCountIncrement() {
-      waitedForPaint++;
-      moveBy = -moveBy;
-      $("abs").style.left = ($("abs").offsetLeft + moveBy) + "px";
-      document.documentElement.offsetHeight;
-      var pc = testplugin.getPaintCount ? testplugin.getPaintCount() : -2;
-      if (waitedForPaint == 20 || (pc != testplugin.last_paint_count && pc >= 0)) {
-        setTimeout(func, 0);
-      } else {
-        setTimeout(waitForPaintCountIncrement, 50);
-      }
-    }
-    waitForPaintCountIncrement();
-  }
-
-  function doClick(x, y, func) {
-    synthesizeMouse($("plugin1"), x, y, {}, window);
-    setTimeout(func, 0);
-  }
-
-  function verify(test, x, y, next) {
-    var p = $("plugin1").getLastMouseX();
-    const delta = 2;
-    var dpr = window.devicePixelRatio / SpecialPowers.getFullZoom(window);
-    ok(p - delta <= x * dpr && x * dpr <= p + delta, "test" + test + " LastMouseX got " + p + " expected " + x +
-                                     " with fullZoom=" + SpecialPowers.getFullZoom(window) + " MozTransform='" + $("container").style.MozTransform + "'");
-    p = $("plugin1").getLastMouseY();
-    ok(p - delta <= y * dpr && y * dpr <= p + delta, "test" + test + " LastMouseY got " + p + " expected " + y +
-                                     " with fullZoom=" + SpecialPowers.getFullZoom(window) + " MozTransform='" + $("container").style.MozTransform + "'");
-    if (next) next();
-  }
-
-  function click(x, y, next) {
-    waitForPaint(function() { doClick(x, y, next); });
-  }
-  function zoom(factor) {
-    SpecialPowers.setFullZoom(window, factor);
-  }
-
-  function test3() { // fullZoom=1 + scale(2)
-    zoom(1);
-    //
-    // ======================== BUG WARNING =========================================
-    // 'container' already has -moz-transform:scale(2) in its style attribute.
-    // Removing that and setting MozTransform dynamically here (as in test4)
-    // makes the test fail ("getLastMouseX is not a function" in verify() above)
-    // Looks like the plugin instance got destroyed and we never recover from that...
-    // ==============================================================================
-    //
-    click(50, 136, function() { verify("3", 25, 68, test3b); });
-  }
-  function test3b() {
-    click(208, 212, function() { verify("3b", 104, 106, test4); });
-  }
-  function test4() { // fullZoom=2 + scale(0.5)
-    zoom(2);
-    var container = $("container");
-    container.style.MozTransformOrigin = "0px 0px";
-    container.style.MozTransform = "scale(0.5)";
-    document.documentElement.offsetHeight;
-    click(60, 52, function() { verify("4", 240, 208, test5); });
-  }
-  function test5() { // fullZoom=2 + scale(2)
-    zoom(2);
-    var container = $("container");
-    container.style.MozTransformOrigin = "0px 0px";
-    container.style.MozTransform = "scale(2)";
-    document.documentElement.offsetHeight;
-    click(108, 112, function() { verify("5", 108, 112, endTest); });
-  }
-
-  function endTest() {
-    zoom(1);
-    SimpleTest.finish();
-  }
-
-  setTimeout(function() { waitForPaint(test3); }, 1000);
-}
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  </script>
-</head>
-
-<body onload="runTests()">
- <div id="container" style="position:relative;top: 0px; left: 0px; width: 640px; height: 480px; -moz-transform:scale(2); -moz-transform-origin:0px 0px;"> 
-  <div id="abs" style="position:absolute; left:90px; top:90px; width:20px; height:20px; background:blue; pointer-events:none;"></div>
-  <embed id="plugin1" type="application/x-test" wmode="transparent" width="200" height="200"></embed>
- </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug751809.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug751809.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug751809.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug751809.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-<html>
-<head>
-  <title>Bug 751809</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/paint_listener.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-  const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-  </script>
-</head>
-
-<body onload="go();">
-  <embed id="plugin" type="application/x-test" width="400" height="400" drawmode="solid" color="FF00FFFF"></embed>
-
-  <script type="application/javascript">
-
-  SimpleTest.waitForExplicitFinish();
-
-  const utils = window.windowUtils;
-
-  function go() {
-    var plugin = document.getElementById("plugin");
-    var objLoadingContent = SpecialPowers.wrap(plugin);
-    ok(!objLoadingContent.activated, "plugin should not be activated");
-  
-    SimpleTest.waitForFocus(afterWindowFocus);
-  }
-
-  function afterWindowFocus() {
-    var plugin = document.getElementById("plugin");
-    var objLoadingContent = SpecialPowers.wrap(plugin);
-
-    objLoadingContent.playPlugin();
-    var condition = () => plugin.setColor !== undefined;
-    SimpleTest.waitForCondition(condition, afterPluginActivation,
-                                "Waited too long for plugin to activate");
-  }
-  
-  function afterPluginActivation() {
-    var plugin = document.getElementById("plugin");
-    var objLoadingContent = SpecialPowers.wrap(plugin);
-    ok(objLoadingContent.activated, "plugin should be activated now");
-
-    // Triggering a paint and waiting for it to be flushed makes sure
-    // that both plugin and platform see the plugin element as visible.
-    // See bug 805330 for details.
-    /* global waitForAllPaintsFlushed */
-    plugin.setColor("FF000088");
-    waitForAllPaintsFlushed(afterPaintsFlushed);
-  }
-
-  function afterPaintsFlushed() {
-    var plugin = document.getElementById("plugin");
-    try {
-      is(plugin.getMouseUpEventCount(), 0, "Plugin should not have received mouse events yet.");
-    } catch (e) {
-      ok(false, "plugin.getMouseUpEventCount() shouldn't throw");
-    }
-
-    synthesizeMouseAtCenter(plugin, {});
-    var condition = () => plugin.getMouseUpEventCount() > 0;
-    SimpleTest.waitForCondition(condition, afterFirstClick,
-                                "Waited too long for plugin to receive the mouse click");
-  }
-
-  function afterFirstClick() {
-    var plugin = document.getElementById("plugin");
-    try {
-      is(plugin.getMouseUpEventCount(), 1, "Plugin should have received 1 mouse up event.");
-    } catch (e) {
-      ok(false, "plugin.getMouseUpEventCount() shouldn't throw");
-    }
-
-    SimpleTest.finish();
-  }
-
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug771202.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug771202.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug771202.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug771202.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=771202
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 771202</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=771202">Mozilla Bug 771202</a>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for recreating spliced plugin prototype chains after tranplant. **/
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-function go() {
-  // Set things up.
-  var win = document.getElementById("ifr").contentWindow;
-  var plugin = win.document.getElementById("pluginElement");
-  var testValue = plugin.getObjectValue();
-
-  function checkPlugin() {
-      dump("About to call checkObjectValue\n");
-      ok(plugin.checkObjectValue(testValue), "Plugin proto should work correctly");
-  }
-  // First, check things before transplanting.
-  checkPlugin();
-
-  // Adopt the plugin and retest.
-  document.body.appendChild(plugin);
-  checkPlugin();
-
-  // All done.
-  SimpleTest.finish();
-}
-
-</script>
-</pre>
-
-<iframe id="ifr" onload="go();" src="file_bug771202.html">
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug777098.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug777098.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug777098.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug777098.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=777098
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 777098</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body onload="go();">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=777098">Mozilla Bug 777098</a>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for passing dead NPObjects back into plugins. **/
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-function go() {
-  var plugin = document.getElementById("plugin");
-
-  // Get wrapped npobject from plugin (plugin.__proto__)
-  var val = plugin.getObjectValue();
-
-  // Force a re-instantiate by re-setting dummy uri,
-  // making val a wrapper for a dead plugin
-  // eslint-disable-next-line no-self-assign
-  plugin.data = plugin.data;
-
-  // The correct behavior is an exception, if plugin.checkObjectValue succeeds
-  // the plugin wasn't torn down for some reason, and if we crash... that's bad
-  function pluginCheck() {
-    try {
-      plugin.checkObjectValue(val);
-    } catch (e) {
-      return true;
-    }
-    return false;
-  }
-
-  // Spin the event loop so the instantiation can complete
-  window.setTimeout(function() {
-    ok(pluginCheck(), "Shouldn't explode");
-
-    // All done.
-    SimpleTest.finish();
-  }, 0);
-}
-
-</script>
-</pre>
-
-<object data="data:text/plain,a" width=200 height=200 type="application/x-test" id="plugin"></object>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug784131.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug784131.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug784131.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug784131.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 784131</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <base href="chrome://browser/content/">
-</head>
-<body>
-
-<script type="text/javascript">
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-</script>
-
-<embed id="body" type="application/x-test">
-<div>
-  <embed id="nested" type="application/x-test">
-</div>
-
-<script type="application/javascript">
-  function getObjectValue(obj) {
-    try {
-      return obj.getObjectValue();
-    } catch (e) {
-      return null;
-    }
-  }
-  SimpleTest.waitForExplicitFinish();
-
-  var body_embed = document.querySelector("embed#body");
-  var nested_embed = document.querySelector("embed#nested");
-  var nested_parent = nested_embed.parentNode;
-  // Ensure plugins are spawned
-  var body_obj = getObjectValue(body_embed);
-  var nested_obj = getObjectValue(nested_embed);
-  isnot(body_obj, null, "body plugin spawned");
-  isnot(nested_obj, null, "nested plugin spawned");
-  // Display:none the plugin and the nested plugin's parent
-  body_embed.style.display = "none";
-  nested_parent.style.display = "none";
-  body_embed.clientTop;
-  nested_embed.clientTop;
-
-  // Plugins should still be running the same instance
-  ok(body_embed.checkObjectValue(body_obj), "body plugin still running");
-  ok(nested_embed.checkObjectValue(nested_obj), "nested plugin still running");
-  // Spin event loop
-  SimpleTest.executeSoon(function() {
-    // Plugins should be stopped
-    is(getObjectValue(body_embed), null, "body plugin gone");
-    is(getObjectValue(nested_embed), null, "nested plugin gone");
-
-    // Restart plugins...
-    body_embed.style.display = "inherit";
-    nested_parent.style.display = "inherit";
-
-    // Ensure plugins are spawned
-    var body_objs = getObjectValue(body_embed);
-    var nested_objs = getObjectValue(nested_embed);
-    isnot(body_objs, null, "body plugin spawned");
-    isnot(nested_objs, null, "nested plugin spawned");
-
-    // Take away frames again, flush layout, restore frames
-    body_embed.style.display = "none";
-    nested_parent.style.display = "none";
-    body_embed.clientTop;
-    nested_embed.clientTop;
-    body_embed.style.display = "inherit";
-    nested_parent.style.display = "inherit";
-    body_embed.clientTop;
-    nested_embed.clientTop;
-
-    // Spin event loop, ensure plugin remains running
-    SimpleTest.executeSoon(function() {
-      ok(body_embed.checkObjectValue(body_objs), "body plugin still running");
-      ok(nested_embed.checkObjectValue(nested_objs), "nested plugin still running");
-      SimpleTest.finish();
-    });
-  });
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug813906.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug813906.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug813906.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug813906.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 813906</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <base href="chrome://browser/content/">
-</head>
-<body>
-
-<script type="application/javascript">
-function f() {
-  document.getElementsByTagName("base")[0].href = "http://www.safe.com/";
-}
-</script>
-
-<script type="application/javascript">
-SimpleTest.requestFlakyTimeout(
-  "Blocking an iframe does not cause the onerror event to be fired");
-
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-var frameLoadCount = 0;
-
-function frameNavBlocked() {
-  isnot(SpecialPowers.wrap(window.frame1).location.href.indexOf("chrome://"),
-        0, "plugin shouldnt be able to cause navigation to chrome URLs");
-  SimpleTest.finish();
-}
-
-function frameLoaded() {
-  frameLoadCount++;
-  if (frameLoadCount == 1) {
-    document.getElementsByTagName("object")[0].type = "application/x-test";
-    document.getElementsByTagName("use")[0].setAttributeNS("http://www.w3.org/1999/xlink", "href", location.href + "#a");
-
-    // wait two seconds and verify that frame navigation did not succeed
-    setTimeout(frameNavBlocked, 2000);
-    return;
-  }
-  // we should never get here, but just in case, make sure the test fails in that case.
-  ok(false, "onload() event should not fire for blocked navigation");
-  SimpleTest.finish();
-}
-
-</script>
-
-<!-- Note that <svg:use> ends up creating an anonymous subtree, which means that the plugin
-     reflector gets hoisted into the XBL scope, and isn't accessible to content. We pass
-     the 'donttouchelement' parameter to the plugin to prevent it from trying to define the
-     'pluginFoundElement' property on the plugin reflector, since doing so would throw a
-     security exception. -->
-<svg>
-  <symbol id="a">
-    <foreignObject>
-      <object bugmode="813906" frame="frame1"><param name="donttouchelement"></param></object>
-    </foreignObject>
-  </symbol>
-  <use />
-</svg>
-
-<iframe name="frame1" onload="frameLoaded()"></iframe>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug852315.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug852315.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug852315.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug852315.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 852315</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <base href="chrome://browser/content/">
-</head>
-<body>
-<script type="application/javascript">
-
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-// Tests that the document-inactive notification stopping plugins does not
-// fatally re-enter when adding other plugins to the document.
-
-var i = document.createElement("iframe");
-var ob = document.body;
-i.addEventListener("load", function loadfunc() {
-  var d = i.contentWindow.document;
-  var e = i.contentDocument.createElement("embed");
-  var destroyran = false;
-  e.type = "application/x-test";
-  i.contentDocument.body.appendChild(e);
-
-  // On despawn, append an embed tag to document.
-  e.callOnDestroy(function() {
-    var e2 = d.createElement("embed");
-    d.body.appendChild(e2);
-    destroyran = true;
-  });
-
-  // Navigate the frame to cause the document with the plugin to go inactive
-  i.removeEventListener("load", loadfunc);
-  i.src = "about:blank";
-
-  const MAX_ATTEMPTS = 50;
-  var attempts = 0;
-  function checkPluginDestroyRan() {
-    // We may need to retry a few times until the plugin stop event makes
-    // its way through the event queue.
-    if (attempts < MAX_ATTEMPTS && !destroyran) {
-      ++attempts;
-      SimpleTest.executeSoon(checkPluginDestroyRan);
-    } else {
-      info("Number of retry attempts: " + attempts);
-      ok(destroyran, "OnDestroy callback ran and did not crash");
-      SimpleTest.finish();
-    }
-  }
-
-  SimpleTest.executeSoon(checkPluginDestroyRan);
-});
-document.body.appendChild(i);
-
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug854082.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug854082.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug854082.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug854082.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 854082</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <base href="chrome://browser/content/">
-</head>
-<body>
-<script type="application/javascript">
-  // Tests that destroying the plugin's frame inside NPP_New does not cause a
-  // crash
-
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  // Create an object that will spawn asynchronously
-  var o = document.createElement("object");
-  o.type = "application/x-test";
-
-  // The test plugin sets pluginFoundElement on its element inside NPP_New,
-  // abuse this to run arbitrary script.
-  var setterCalled;
-  o.__defineSetter__("pluginFoundElement", function() {
-    o.style.display = "none";
-    // Access clientTop to force layout flush
-    o.clientTop;
-    ok(true, "Setter called and did not crash");
-    SimpleTest.finish();
-    setterCalled = true;
-  });
-  document.body.appendChild(o);
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug863792.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug863792.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug863792.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug863792.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 863792</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-</head>
-<body>
-<script type="application/javascript">
-
-// A plugin that removes itself from the document and inactivates said document
-// inside NPP_New. We should not leak the instance. See also test_bug854082
-
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-var i = document.createElement("iframe");
-i.src = "file_bug863792.html";
-i.width = 500;
-i.height = 500;
-document.body.appendChild(i);
-
-i.addEventListener("load", function() {
-  SpecialPowers.forceGC();
-  SpecialPowers.forceCC();
-  SimpleTest.executeSoon(function() {
-    SpecialPowers.forceGC();
-    SpecialPowers.forceCC();
-    SimpleTest.executeSoon(function() {
-      ok(true, "Didn't crash");
-      SimpleTest.finish();
-    });
-  });
-});
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug967694.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug967694.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug967694.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug967694.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 967694</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-</head>
-<body>
-<script type="application/javascript">
-
-// Touching a plugin from chrome scope should not spawn it, bug should
-// synchronously spawn it from content scope
-
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-var plugin;
-var spPlugin;
-
-function recreatePlugin() {
-  if (plugin) {
-    document.body.removeChild(plugin);
-  }
-  plugin = document.createElement("embed");
-  plugin.type = "application/x-test";
-
-  document.body.appendChild(plugin);
-  // Plugin should now be queued for async spawning.
-  spPlugin = SpecialPowers.wrap(plugin);
-
-  is(spPlugin.displayedType, spPlugin.TYPE_PLUGIN, "Should be configured as plugin");
-  ok(!spPlugin.hasRunningPlugin, "Should not be spawned yet");
-}
-
-recreatePlugin();
-
-// Try various JS operations with chrome context
-var thrown = false;
-// Get and set non-existent Property
-var hi = spPlugin._testShouldntExist;
-spPlugin._testShouldntExist = 5;
-// Call some test-plugin function
-try {
-  var val = spPlugin.getObjectValue();
-} catch (e) {
-  thrown = true;
-}
-
-ok(thrown, "Function call should have thrown");
-ok(!spPlugin.hasRunningPlugin, "Plugin should not have spawned");
-
-// Try property access from content
-hi = plugin._testShouldntExistContent;
-ok(spPlugin.hasRunningPlugin, "Should've caused plugin to spawn");
-
-// Property set
-recreatePlugin();
-plugin._testShouldntExistContent = 5;
-ok(spPlugin.hasRunningPlugin, "Should've caused plugin to spawn");
-
-// Call test plugin function. Should succeed.
-recreatePlugin();
-thrown = false;
-try {
-  var value = plugin.getObjectValue();
-} catch (e) {
-  thrown = true;
-}
-
-ok(!thrown, "Call should have succeeded");
-ok(spPlugin.hasRunningPlugin, "Call should have synchronously spawned plugin");
-ok(plugin.checkObjectValue(value), "Plugin should recognize self");
-
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug985859.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug985859.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug985859.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug985859.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Test for Bug 985859</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <base href="chrome://browser/content/">
-</head>
-<body>
-<script type="application/javascript">
-
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-var testType     = navigator.mimeTypes["application/x-test"];
-var testTypeCap  = navigator.mimeTypes["Application/x-Test"];
-var testTypeCap2 = navigator.mimeTypes["APPLICATION/X-TEST"];
-
-ok(testType, "Test plugin should be found");
-is(testType, testTypeCap, "navigator.mimeTypes should be case insensitive");
-is(testType, testTypeCap2, "navigator.mimeTypes should be case insensitive");
-
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug986930.html firefox-85.0+build1/dom/plugins/test/mochitest/test_bug986930.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_bug986930.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_bug986930.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8"/>
-  <title>Test for Bug 986930</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-<body>
-  <script class="testbody" type="application/javascript">
-    var testPlugin = getTestPlugin("Test Plug-in");
-
-    var mimeDescriptions = testPlugin.getMimeDescriptions();
-
-    is(mimeDescriptions[0], "Test \u2122 mimetype",
-       "Plugin should handle non-ascii mime description");
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_busy_hang.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_busy_hang.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_busy_hang.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_busy_hang.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <title>Plugin Busy Hang Test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="hang_test.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  </body>
-  <script class="testbody" type="application/javascript">
-    <![CDATA[
-SimpleTest.waitForExplicitFinish();
-SimpleTest.expectChildProcessCrash();
-
-async function runTests() {
-  // Default plugin hang timeout is too high for mochitests
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefBranch);
-  var timeoutPref = "dom.ipc.plugins.timeoutSecs";
-  prefs.setIntPref(timeoutPref, 5);
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.addObserver(testObserver, "plugin-crashed", true);
-
-  testObserver.idleHang = false;
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.hang !== undefined,
-                                           "Waited too long for plugin to activate");
-
-  try {
-    pluginElement.hang(true);
-  } catch (e) {
-  }
-}
-]]>
-  </script>
-</window>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_clear_site_data.html firefox-85.0+build1/dom/plugins/test/mochitest/test_clear_site_data.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_clear_site_data.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_clear_site_data.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,242 +0,0 @@
-<html>
-<head>
-  <title>NPAPI ClearSiteData/GetSitesWithData Functionality</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-<body>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-
-    const pluginHostIface = Ci.nsIPluginHost;
-    var pluginHost = Cc["@mozilla.org/plugin/host;1"].
-                     getService(pluginHostIface);
-    const FLAG_CLEAR_ALL = pluginHostIface.FLAG_CLEAR_ALL;
-    const FLAG_CLEAR_CACHE = pluginHostIface.FLAG_CLEAR_CACHE;
-
-    var p = document.getElementById("plugin1");
-
-    // Since we're running with chrome permissions, accessing the plugin wont
-    // synchronously spawn it -- wait for the async spawning to finish.
-    SimpleTest.executeSoon(function() {
-      // Make sure clearing by timerange is supported.
-      p.setSitesWithDataCapabilities(true);
-      ok(PluginUtils.withTestPlugin(runTest), "Test plugin found");
-    });
-
-    function stored(needles) {
-      var something = pluginHost.siteHasData(this.pluginTag, null);
-      if (!needles)
-        return something;
-
-      if (!something)
-        return false;
-
-      for (var i = 0; i < needles.length; ++i) {
-        if (!pluginHost.siteHasData(this.pluginTag, needles[i]))
-          return false;
-      }
-      return true;
-    }
-
-    function checkThrows(fn, result) {
-      try {
-        fn();
-        throw new Error("bad exception");
-      } catch (e) {
-        is(e.result, result, "Correct exception thrown");
-      }
-    }
-
-    function runTest(pluginTag) {
-      this.pluginTag = pluginTag;
-      p.setSitesWithData(
-        "foo.com:0:5," +
-        "foo.com:0:7," +
-        "bar.com:0:10," +
-        "baz.com:0:10," +
-        "foo.com:1:7," +
-        "qux.com:1:5," +
-        "quz.com:1:8"
-      );
-      ok(stored(["foo.com", "bar.com", "baz.com", "qux.com", "quz.com"]),
-         "Data stored for sites");
-
-      // Clear nothing.
-      pluginHost.clearSiteData(pluginTag, null, FLAG_CLEAR_ALL, 4, {callback() { test1(); }});
-    }
-    function test1() {
-      ok(stored(["foo.com", "bar.com", "baz.com", "qux.com", "quz.com"]),
-         "Data stored for sites");
-
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_CACHE, 4, {callback() { test2(); }});
-    }
-    function test2() {
-      ok(stored(["foo.com", "bar.com", "baz.com", "qux.com", "quz.com"]),
-         "Data stored for sites");
-
-      // Clear cache data 5 seconds or older.
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_CACHE, 5, {callback() { test3(); }});
-    }
-    function test3() {
-      ok(stored(["foo.com", "bar.com", "baz.com", "quz.com"]),
-         "Data stored for sites");
-      ok(!stored(["qux.com"]), "Data cleared for qux.com");
-      // Clear cache data for foo.com, but leave non-cache data.
-      pluginHost.clearSiteData(this.pluginTag, "foo.com", FLAG_CLEAR_CACHE, 20, {callback() { test4(); }});
-    }
-    function test4() {
-      ok(stored(["foo.com", "bar.com", "baz.com", "quz.com"]),
-         "Data stored for sites");
-
-      // Clear all data 7 seconds or older.
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_ALL, 7, {callback() { test5(); }});
-    }
-    function test5() {
-      ok(stored(["bar.com", "baz.com", "quz.com"]), "Data stored for sites");
-      ok(!stored(["foo.com"]), "Data cleared for foo.com");
-      ok(!stored(["qux.com"]), "Data cleared for qux.com");
-
-      // Clear all cache data.
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_CACHE, 20, {callback() { test6(); }});
-    }
-    function test6() {
-      ok(stored(["bar.com", "baz.com"]), "Data stored for sites");
-      ok(!stored(["quz.com"]), "Data cleared for quz.com");
-
-      // Clear all data for bar.com.
-      pluginHost.clearSiteData(this.pluginTag, "bar.com", FLAG_CLEAR_ALL, 20, {callback(rv) { test7(rv); }});
-    }
-    function test7() {
-      ok(stored(["baz.com"]), "Data stored for baz.com");
-      ok(!stored(["bar.com"]), "Data cleared for bar.com");
-
-      // Disable clearing by age.
-      p.setSitesWithDataCapabilities(false);
-
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_ALL, 20, {callback(rv) {
-    is(rv, Cr.NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED);
-    test8(rv);
-  }});
-    }
-    function test8() {
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_CACHE, 20, {callback(rv) {
-    is(rv, Cr.NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED);
-    test9(rv);
-  }});
-    }
-    function test9() {
-      pluginHost.clearSiteData(this.pluginTag, "baz.com", FLAG_CLEAR_ALL, 20, {callback(rv) {
-    is(rv, Cr.NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED);
-    test10(rv);
-  }});
-    }
-    function test10() {
-      pluginHost.clearSiteData(this.pluginTag, "baz.com", FLAG_CLEAR_CACHE, 20, {callback(rv) {
-    is(rv, Cr.NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED);
-      test11();
-      }});
-    }
-    function test11() {
-      // Clear cache for baz.com and globally for all ages.
-      pluginHost.clearSiteData(this.pluginTag, "baz.com", FLAG_CLEAR_CACHE, -1, {callback(rv) { test12(); }});
-    }
-    function test12() {
-      pluginHost.clearSiteData(this.pluginTag, null, FLAG_CLEAR_CACHE, -1, {callback(rv) { test13(); }});
-    }
-    function test13() {
-      // Check that all of the above were no-ops.
-      ok(stored(["baz.com"]), "Data stored for baz.com");
-
-      // Clear everything for baz.com.
-      pluginHost.clearSiteData(this.pluginTag, "baz.com", FLAG_CLEAR_ALL, -1, {callback(rv) { test14(); }});
-    }
-    function test14() {
-      ok(!stored(["baz.com"]), "Data cleared for baz.com");
-      ok(!stored(null), "All data cleared");
-
-      // Set data to test subdomains, IP literals, and 'localhost'-like hosts.
-      p.setSitesWithData(
-        "foo.com:0:0," +
-        "bar.foo.com:0:0," +
-        "baz.foo.com:0:0," +
-        "bar.com:0:0," +
-        "[192.168.1.1]:0:0," +
-        "localhost:0:0"
-      );
-      ok(stored(["foo.com", "nonexistent.foo.com", "bar.com", "192.168.1.1", "localhost"]),
-         "Data stored for sites");
-
-      // Clear data for "foo.com" and its subdomains.
-      pluginHost.clearSiteData(this.pluginTag, "foo.com", FLAG_CLEAR_ALL, -1, {callback(rv) { test15(); }});
-    }
-    function test15() {
-      ok(stored(["bar.com", "192.168.1.1", "localhost"]), "Data stored for sites");
-      ok(!stored(["foo.com"]), "Data cleared for foo.com");
-      ok(!stored(["bar.foo.com"]), "Data cleared for subdomains of foo.com");
-
-      // Clear data for "bar.com" using a subdomain.
-      pluginHost.clearSiteData(this.pluginTag, "foo.bar.com", FLAG_CLEAR_ALL, -1, {callback(rv) { test16(); }});
-    }
-    function test16() {
-      ok(!stored(["bar.com"]), "Data cleared for bar.com");
-
-      // Clear data for "192.168.1.1".
-      pluginHost.clearSiteData(this.pluginTag, "192.168.1.1", FLAG_CLEAR_ALL, -1, {callback(rv) { test17(); }});
-    }
-    function test17() {
-      ok(!stored(["192.168.1.1"]), "Data cleared for 192.168.1.1");
-
-      // Clear data for "localhost".
-      pluginHost.clearSiteData(this.pluginTag, "localhost", FLAG_CLEAR_ALL, -1, {callback(rv) { test18(); }});
-    }
-    function test18() {
-      ok(!stored(null), "All data cleared");
-
-      // Set data to test international domains.
-      p.setSitesWithData(
-        "b\u00FCcher.es:0:0," +
-        "b\u00FCcher.uk:0:0," +
-        "xn--bcher-kva.NZ:0:0"
-      );
-        // Check that both the ACE and UTF-8 representations register.
-      ok(stored(["b\u00FCcher.es", "xn--bcher-kva.es", "b\u00FCcher.uk", "xn--bcher-kva.uk"]),
-         "Data stored for sites");
-
-      // Clear data for the UTF-8 version.
-      pluginHost.clearSiteData(this.pluginTag, "b\u00FCcher.es", FLAG_CLEAR_ALL, -1, {callback(rv) { test19(); }});
-    }
-    function test19() {
-      ok(!stored(["b\u00FCcher.es"]), "Data cleared for UTF-8 representation");
-      ok(!stored(["xn--bcher-kva.es"]), "Data cleared for ACE representation");
-
-      // Clear data for the ACE version.
-      pluginHost.clearSiteData(this.pluginTag, "xn--bcher-kva.uk", FLAG_CLEAR_ALL, -1, {callback(rv) { test20(); }});
-    }
-    function test20() {
-      ok(!stored(["b\u00FCcher.uk"]), "Data cleared for UTF-8 representation");
-      ok(!stored(["xn--bcher-kva.uk"]), "Data cleared for ACE representation");
-
-      // The NPAPI spec requires that the plugin report sites in normalized
-      // UTF-8. We do happen to normalize the result anyway, so while that's not
-      // strictly required, we test it here.
-      ok(stored(["b\u00FCcher.nz", "xn--bcher-kva.nz"]),
-         "Data stored for sites");
-      pluginHost.clearSiteData(this.pluginTag, "b\u00FCcher.nz", FLAG_CLEAR_ALL, -1, {callback(rv) { test21(); }});
-    }
-    function test21() {
-      ok(!stored(["b\u00FCcher.nz"]), "Data cleared for UTF-8 representation");
-      ok(!stored(["xn--bcher-kva.nz"]), "Data cleared for ACE representation");
-      ok(!stored(null), "All data cleared");
-      SimpleTest.finish();
-    }
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_cocoa_focus.html firefox-85.0+build1/dom/plugins/test/mochitest/test_cocoa_focus.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_cocoa_focus.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_cocoa_focus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<html>
-<head>
-  <title>NPCocoaEventFocusChanged Tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    var gOtherWindow;
-
-    function runTests() {
-      // We have to have two top-level windows in play in order to run these tests.
-      gOtherWindow = window.open("cocoa_focus.html", "", "width=250,height=250");
-    }
-
-    function testsFinished() {
-      // Tests have finished running, close the new window and end tests.
-      gOtherWindow.close();
-      SimpleTest.finish();
-    }
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_cocoa_window_focus.html firefox-85.0+build1/dom/plugins/test/mochitest/test_cocoa_window_focus.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_cocoa_window_focus.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_cocoa_window_focus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<html>
-<head>
-  <title>NPCocoaEventWindowFocusChanged Tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    var gOtherWindow;
-
-    function runTests() {
-      // We have to have two top-level windows in play in order to run these tests.
-      gOtherWindow = window.open("cocoa_window_focus.html", "", "width=200,height=200");
-    }
-
-    function testsFinished() {
-      // Tests have finished running, close the new window and end tests.
-      gOtherWindow.close();
-      SimpleTest.finish();
-    }
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_convertpoint.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_convertpoint.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_convertpoint.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_convertpoint.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-async function runTests() {
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.convertPointX !== undefined,
-                                           "Waited too long for plugin to activate");
-  // Poll to see if the plugin is in the right place yet.
-  // Check if x-coordinate 0 in plugin space is 0 in window space. If it is,
-  // the plugin hasn't been placed yet.
-  if (pluginElement.convertPointX(1, 0, 0, 2) == 0) {
-    setTimeout(runTests, 0);
-    return;
-  }
-
-  var domWindowUtils = window.windowUtils;
-
-  var pluginRect = pluginElement.getBoundingClientRect();
-  var pluginX = pluginRect.left + (window.mozInnerScreenX - window.screenX);
-  var pluginY = pluginRect.top + (window.mozInnerScreenY - window.screenY);
-
-  var windowX = window.screenX;
-  var windowY = window.screenY;
-  var windowHeight = window.outerHeight;
-
-  var screenHeight = window.screen.height;
-
-  // arbitrary coordinates of test point in plugin top-left origin terms
-  var xOffset = 5;
-  var yOffset = 5;
-
-  var NPCoordinateSpacePluginX = 0 + xOffset;
-  var NPCoordinateSpacePluginY = 0 + yOffset;
-
-  var NPCoordinateSpaceWindowX = pluginX + xOffset;
-  var NPCoordinateSpaceWindowY = (windowHeight - pluginY) - yOffset;
-
-  var NPCoordinateSpaceFlippedWindowX = pluginX + xOffset;
-  var NPCoordinateSpaceFlippedWindowY = pluginY + yOffset;
-
-  var NPCoordinateSpaceScreenX = windowX + pluginX + xOffset;
-  var NPCoordinateSpaceScreenY = ((screenHeight - windowY) - pluginY) - yOffset;
-
-  var NPCoordinateSpaceFlippedScreenX = windowX + pluginX + xOffset;
-  var NPCoordinateSpaceFlippedScreenY = windowY + pluginY + yOffset;
-
-  // these are in coordinate space enumeration order
-  var xValues = new Array(NPCoordinateSpacePluginX, NPCoordinateSpaceWindowX, NPCoordinateSpaceFlippedWindowX, NPCoordinateSpaceScreenX, NPCoordinateSpaceFlippedScreenX);
-  var yValues = new Array(NPCoordinateSpacePluginY, NPCoordinateSpaceWindowY, NPCoordinateSpaceFlippedWindowY, NPCoordinateSpaceScreenY, NPCoordinateSpaceFlippedScreenY);
-
-  var i;
-  for (i = 0; i < 5; i = i + 1) {
-    var sourceCoordSpaceValue = i + 1;
-    var j;
-    for (j = 0; j < 5; j = j + 1) {
-      var destCoordSpaceValue = j + 1;
-      xResult = pluginElement.convertPointX(sourceCoordSpaceValue, xValues[i], yValues[i], destCoordSpaceValue);
-      yResult = pluginElement.convertPointY(sourceCoordSpaceValue, xValues[i], yValues[i], destCoordSpaceValue);
-      is(xResult, xValues[j], "convertPointX: space " + sourceCoordSpaceValue + " to space " + destCoordSpaceValue + " mismatch");
-      is(yResult, yValues[j], "convertPointY: space " + sourceCoordSpaceValue + " to space " + destCoordSpaceValue + " mismatch");
-    }
-  }
-
-  SimpleTest.finish();
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_copyText.html firefox-85.0+build1/dom/plugins/test/mochitest/test_copyText.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_copyText.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_copyText.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test copying text from browser to plugin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-
-  <script class="testbody" type="text/javascript">
-function runTests() {
-  var text = " some text \n to copy 'n paste ";
-  var textElt = document.getElementById("input");
-  var plugin = document.getElementById("plugin1");
-
-  // Make sure we wait for the clipboard
-  SimpleTest.waitForClipboard(text, () => {
-    textElt.focus();
-    textElt.value = text;
-    textElt.select();
-    SpecialPowers.wrap(textElt).editor.copy();
-  }, () => {
-    is(plugin.getClipboardText(), text);
-    SimpleTest.finish();
-  }, () => {
-    ok(false, "Failed to set the clipboard text!");
-    SimpleTest.finish();
-  });
-}
-
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  </script>
-</head>
-
-<body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-  <textarea id="input"></textarea>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crashing2.html firefox-85.0+build1/dom/plugins/test/mochitest/test_crashing2.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crashing2.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crashing2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-<head>
-  <title>Plugin crashing</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="mainLoaded()">
-  <iframe id="iframe1" src="about:blank" width="600" height="600"></iframe>
-
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var iframe = document.getElementById("iframe1");
-
-  function mainLoaded() {
-    SimpleTest.expectChildProcessCrash();
-
-    var p = iframe.contentDocument.createElement("embed");
-    p.setAttribute("id", "plugin1");
-    p.setAttribute("type", "application/x-test");
-    p.setAttribute("width", "400");
-    p.setAttribute("height", "400");
-    p.setAttribute("drawmode", "solid");
-    p.setAttribute("color", "FF00FFFF");
-    p.setAttribute("newCrash", "true");
-    iframe.contentDocument.body.appendChild(p);
-
-    // The plugin will now crash when it is instantiated, but
-    // that happens asynchronously. HACK: this should use an
-    // event instead of nested pending runnables, but I don't
-    // know of any DOM event that's fired when a plugin is
-    // instantiated.
-    SimpleTest.executeSoon(function() {
-      SimpleTest.executeSoon(function() {
-        ok(p.setColor === undefined,
-           "Plugin should have crashed on creation");
-
-        window.frameLoaded = reloaded1;
-        iframe.contentWindow.location.replace("crashing_subpage.html");
-      });
-    });
-  }
-
-  function reloaded1() {
-    var p = iframe.contentDocument.getElementById("plugin1");
-    try {
-      p.setColor("FF00FF00");
-      ok(true, "Reloading after crash-on-new worked");
-    } catch (e) {
-      ok(false, "Reloading after crash-on-new didn't give us a usable plugin");
-    }
-    p.crashOnDestroy();
-    // the child crash should happen here
-    p.remove();
-
-    window.frameLoaded = reloaded2;
-    SimpleTest.executeSoon(function() {
-      iframe.contentWindow.location.reload();
-    });
-  }
-
-  function reloaded2() {
-    var p = iframe.contentDocument.getElementById("plugin1");
-    try {
-      p.setColor("FF00FF00");
-      ok(true, "Reloading after crash-on-destroy worked");
-    } catch (e) {
-      ok(false, "Reloading after crash-on-destroy didn't give us a usable plugin");
-    }
-    SimpleTest.finish();
-  }
-  </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crashing.html firefox-85.0+build1/dom/plugins/test/mochitest/test_crashing.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crashing.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crashing.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<head>
-  <title>Plugin crashing</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body>
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  window.frameLoaded = function frameLoaded_toCrash() {
-    SimpleTest.expectChildProcessCrash();
-
-    var iframe = document.getElementById("iframe1");
-    var p = iframe.contentDocument.getElementById("plugin1");
-
-    p.setColor("FFFF00FF");
-
-    try {
-      p.crash();
-      ok(false, "p.crash() should throw an exception");
-    } catch (e) {
-      ok(true, "p.crash() should throw an exception");
-    }
-
-    // Create random identifiers to test bug 560213
-    for (var i = 0; i < 5; ++i) {
-      var r = "rid_" + Math.floor(Math.random() * 10000 + 1);
-      try {
-        ok(!(r in p), "unknown identifier in crashed plugin should fail silently");
-      } catch (e) {
-        ok(false, "unknown identifier check threw");
-      }
-    }
-
-    try {
-      p.setColor("FFFF0000");
-      ok(false, "p.setColor should throw after the plugin crashes");
-    } catch (e) {
-      ok(true, "p.setColor should throw after the plugin crashes");
-    }
-
-    window.frameLoaded = function reloaded() {
-      var p1 = iframe.contentDocument.getElementById("plugin1");
-      try {
-        p1.setColor("FF00FF00");
-        ok(true, "Reloading worked");
-      } catch (e) {
-        ok(false, "Reloading didn't give us a usable plugin");
-      }
-      SimpleTest.finish();
-    };
-
-    iframe.contentWindow.location.reload();
-  };
-
-  </script>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_nested_loop.html firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_nested_loop.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_nested_loop.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_nested_loop.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<head>
-  <title>Plugin crashing in nested loop</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body>
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  window.frameLoaded = function frameLoaded_toCrash() {
-    var iframe = document.getElementById("iframe1");
-    var p = iframe.contentDocument.getElementById("plugin1");
-
-    // This test is for bug 550026, which is inherently nondeterministic.
-    // If we hit that bug, the browser process would crash when the plugin
-    // crashes in crashInNestedLoop.  If not, we'll pass "spuriously".
-    try {
-      p.crashInNestedLoop();
-      // The plugin didn't crash when expected.  This happens sometimes.  Give
-      // it longer to crash.  If it crashes (but not at the apropriate time),
-      // soft fail with a todo; if it doesn't crash then something went wrong,
-      // so fail.
-      SimpleTest.requestFlakyTimeout("sometimes the plugin takes a little longer to crash");
-      setTimeout(
-        function() {
-          try {
-            p.getPaintCount();
-            ok(false, "plugin should crash");
-          } catch (e) {
-            todo(false, "p.crashInNestedLoop() should throw an exception");
-          }
-
-          SimpleTest.finish();
-        },
-        1000);
-    } catch (e) {
-      ok(true, "p.crashInNestedLoop() should throw an exception");
-      SimpleTest.finish();
-    }
-  };
-
-  </script>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_notify_no_report.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_notify_no_report.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_notify_no_report.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_notify_no_report.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-SimpleTest.waitForExplicitFinish();
-
-var success = false;
-
-var observerFired = false;
-
-var testObserver = {
-  observe: function(subject, topic, data) {
-    observerFired = true;
-    ok(true, "Observer fired");
-    is(topic, "plugin-crashed", "Checking correct topic");
-    is(data,  null, "Checking null data");
-    ok((subject instanceof Ci.nsIPropertyBag2), "got Propbag");
-    ok((subject instanceof Ci.nsIWritablePropertyBag2),
-"got writable Propbag");
-
-    var id = subject.getPropertyAsAString("pluginDumpID");
-    isnot(id, "", "got a non-empty crash id");
-    ok(subject.hasKey("additionalMinidumps"), "the additionalMinidumps key is present");
-    let directoryService =
-      Cc["@mozilla.org/file/directory_service;1"].
-      getService(Ci.nsIProperties);
-    let pendingD = directoryService.get("UAppData",
-                                        Ci.nsIFile);
-    pendingD.append("Crash Reports");
-    pendingD.append("pending");
-    let dumpFile = pendingD.clone();
-    dumpFile.append(id + ".dmp");
-    ok(dumpFile.exists(), "minidump exists");
-    let extraFile = pendingD.clone();
-    extraFile.append(id + ".extra");
-    ok(extraFile.exists(), "extra file exists");
-    Services.crashmanager.ensureCrashIsPresent(id).then(() => {
-      // cleanup, to be nice, this will execute before SimpleTest.finish()
-      dumpFile.remove(false);
-      extraFile.remove(false);
-    });
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsIObserver) ||
-        iid.equals(Ci.nsISupportsWeakReference) ||
-        iid.equals(Ci.nsISupports))
-      return this;
-    throw Components.Exception("", Cr.NS_NOINTERFACE);
-  }
-};
-
-
-function onPluginCrashed(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  ok(observerFired, "Observer should have fired first");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  var pluginElement = document.getElementById("plugin1");
-  is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
-
-  ok(aEvent instanceof PluginCrashedEvent,
-     "plugin crashed event has the right interface");
-
-  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
-  is(aEvent.pluginName, "Test Plug-in");
-  // The app itself may or may not have decided to submit the report, so
-  // allow either true or false here.
-  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
-  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.removeObserver(testObserver, "plugin-crashed");
-
-  // re-set MOZ_CRASHREPORTER_NO_REPORT
-  let env = Cc["@mozilla.org/process/environment;1"]
-              .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-  Services.crashmanager.ensureCrashIsPresent(aEvent.pluginDumpID).then(() => {
-    SimpleTest.finish();
-  });
-}
-
-async function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Cc["@mozilla.org/process/environment;1"]
-              .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.addObserver(testObserver, "plugin-crashed", true);
-
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.crash !== undefined,
-                                           "Waited too long for plugin to activate");
-
-  try {
-    pluginElement.crash();
-  } catch (e) {
-  }
-}
-]]>
-</script>
-</window>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_notify.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_notify.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_notify.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_notify.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.expectChildProcessCrash();
-
-var success = false;
-
-var observerFired = false;
-var observerDeferred = PromiseUtils.defer();
-var eventListenerDeferred = PromiseUtils.defer();
-
-var testObserver = {
-  observe: function(subject, topic, data) {
-    observerFired = true;
-    ok(true, "Observer fired");
-    is(topic, "plugin-crashed", "Checking correct topic");
-    is(data,  null, "Checking null data");
-    ok((subject instanceof Ci.nsIPropertyBag2), "got Propbag");
-    ok((subject instanceof Ci.nsIWritablePropertyBag2), "got writable Propbag");
-
-    var id = subject.getPropertyAsAString("pluginDumpID");
-    isnot(id, "", "got a non-empty crash id");
-    ok(subject.hasKey("additionalMinidumps"), "the additionalMinidumps key is present");
-    let directoryService =
-      Cc["@mozilla.org/file/directory_service;1"].
-      getService(Ci.nsIProperties);
-    let profD = directoryService.get("ProfD", Ci.nsIFile);
-    profD.append("minidumps");
-    let dumpFile = profD.clone();
-    dumpFile.append(id + ".dmp");
-    ok(dumpFile.exists(), "minidump exists");
-    let extraFile = profD.clone();
-    extraFile.append(id + ".extra");
-    ok(extraFile.exists(), "extra file exists");
-
-    observerDeferred.resolve();
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsIObserver) ||
-        iid.equals(Ci.nsISupportsWeakReference) ||
-        iid.equals(Ci.nsISupports))
-      return this;
-    throw Components.Exception("", Cr.NS_NOINTERFACE);
-  }
-};
-
-
-function onPluginCrashed(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  ok(observerFired, "Observer should have fired first");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  var pluginElement = document.getElementById("plugin1");
-  is (pluginElement, aEvent.target, "Plugin crashed event target is plugin element");
-
-  ok(aEvent instanceof PluginCrashedEvent,
-     "plugin crashed event has the right interface");
-
-  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
-  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
-  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
-  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
-  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
-  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
-  // The app itself may or may not have decided to submit the report, so
-  // allow either true or false here.
-  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
-  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.removeObserver(testObserver, "plugin-crashed");
-
-  eventListenerDeferred.resolve();
-}
-
-async function runTests() {
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.addObserver(testObserver, "plugin-crashed", true);
-
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.crash !== undefined,
-                                           "Waited too long for plugin to activate");
-  try {
-    pluginElement.crash();
-  } catch (e) {
-  }
-
-  Promise.all([
-    observerDeferred.promise,
-    eventListenerDeferred.promise
-  ]).then(() => {
-    SimpleTest.finish();
-  });
-}
-]]>
-</script>
-</window>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_CrashService_crash.html firefox-85.0+build1/dom/plugins/test/mochitest/test_CrashService_crash.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_CrashService_crash.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_CrashService_crash.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<head>
-  <title>nsICrashService plugin crash</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body>
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout(
-    "crashAndGetCrashServiceRecord() polls for async crash recording");
-  SimpleTest.requestCompleteLog();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  window.frameLoaded = function frameLoaded_toCrash() {
-    SimpleTest.expectChildProcessCrash();
-
-    crashAndGetCrashServiceRecord("crash", function(cm, crash) {
-      var isPluginCrash = crash.isOfType(cm.PROCESS_TYPE_PLUGIN, cm.CRASH_TYPE_CRASH);
-      ok(isPluginCrash, "Record should be a plugin crash");
-      if (!isPluginCrash) {
-        dump("Crash type: " + crash.type + "\n");
-      }
-      SimpleTest.finish();
-    });
-  };
-  </script>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_CrashService_hang.html firefox-85.0+build1/dom/plugins/test/mochitest/test_CrashService_hang.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_CrashService_hang.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_CrashService_hang.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<head>
-  <title>nsICrashService plugin hang</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body>
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout(
-    "crashAndGetCrashServiceRecord() polls for async crash recording");
-  SimpleTest.requestCompleteLog();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  window.frameLoaded = function frameLoaded_toCrash() {
-    SimpleTest.expectChildProcessCrash();
-
-    // the default timeout is annoying high for mochitest runs
-    var timeoutPref = "dom.ipc.plugins.timeoutSecs";
-    SpecialPowers.setIntPref(timeoutPref, 5);
-
-    crashAndGetCrashServiceRecord("hang", function(cm, crash) {
-      ok(crash.isOfType(cm.PROCESS_TYPE_PLUGIN, cm.CRASH_TYPE_HANG),
-         "Record should be a plugin hang");
-      SimpleTest.finish();
-    });
-  };
-  </script>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_submit.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_submit.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_crash_submit.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_crash_submit.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-SimpleTest.ignoreAllUncaughtExceptions();
-
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var crashReporter =
-  Cc["@mozilla.org/toolkit/crash-reporter;1"]
-    .getService(Ci.nsICrashReporter);
-var oldServerURL = crashReporter.serverURL;
-
-const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
-
-var testObserver = {
-  observe: function(subject, topic, data) {
-    if (data == "submitting") // not done yet
-      return;
-    is(data, "success", "report should have been submitted successfully");
-    is(topic, "crash-report-status", "Checking correct topic");
-    ok(subject instanceof Ci.nsIPropertyBag2,
-       "Subject should be a property bag");
-
-    ok(subject.hasKey("minidumpID"), "Should have a local crash ID");
-    let crashID = subject.getPropertyAsAString("minidumpID");
-    isnot(crashID, "", "Local crash ID should not be an empty string");
-
-    ok(subject.hasKey("serverCrashID"), "Should have a server crash ID");
-    let remoteID = subject.getPropertyAsAString("serverCrashID");
-    isnot(remoteID, "", "Server crash ID should not be an empty string");
-
-    // Verify the data. The SJS script will return the data that was POSTed
-    let req = new XMLHttpRequest();
-    req.open("GET", SERVER_URL + "?id=" + remoteID, false);
-    req.send(null);
-    is(req.status, 200, "Server response should be 200 OK");
-    let submitted = JSON.parse(req.responseText);
-    ok(!("Throttleable" in submitted), "Submit request should not be Throttleable");
-    is(submitted.ProcessType, "plugin", "Should specify ProcessType=plugin");
-
-    // Cleanup
-    // First remove our fake submitted report
-    let file = Services.dirsvc.get("UAppData", Ci.nsIFile);
-    file.append("Crash Reports");
-    file.append("submitted");
-    file.append(remoteID + ".txt");
-    file.remove(false);
-
-    // Next unregister our observer
-    var os = Cc["@mozilla.org/observer-service;1"].
-             getService(Ci.nsIObserverService);
-    os.removeObserver(testObserver, "crash-report-status");
-
-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Cc["@mozilla.org/process/environment;1"]
-                .getService(Ci.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
-    // Finally re-set crashreporter URL
-    crashReporter.serverURL = oldServerURL;
-
-    // Check and cleanup CrashManager.
-    (async function() {
-      let cm = Services.crashmanager;
-      await cm.ensureCrashIsPresent(crashID);
-      let store = await cm._getStore();
-      is(store.crashesCount, 1, "Store should have only 1 item");
-
-      let crash = store.getCrash(crashID);
-      ok(!!crash, "Store should have the crash record");
-      ok(crash.isOfType(cm.PROCESS_TYPE_PLUGIN, cm.CRASH_TYPE_CRASH),
-         "Crash type should be plugin-crash");
-      is(crash.remoteID, remoteID, "Crash remoteID should match");
-
-      is(crash.submissions.size, 1, "Crash should have a submission");
-      let submission = crash.submissions.values().next().value;
-      is(submission.result, cm.SUBMISSION_RESULT_OK,
-         "Submission should be successful");
-
-      store.reset();
-
-      SimpleTest.finish();
-    })();
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsIObserver) ||
-        iid.equals(Ci.nsISupportsWeakReference) ||
-        iid.equals(Ci.nsISupports))
-      return this;
-    throw Components.Exception("", Cr.NS_NOINTERFACE);
-  }
-};
-
-
-async function onPluginCrashed(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  await SimpleTest.promiseWaitForCondition(
-    () => aEvent.target.openOrClosedShadowRoot.getElementById("submitButton"),
-    "Waiting for submit button to exist."
-  );
-  let submitButton = aEvent.target.openOrClosedShadowRoot.getElementById("submitButton");
-
-  // try to submit this report
-  sendMouseEvent({type:'click'}, submitButton, window);
-}
-
-function runTests() {
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Cc["@mozilla.org/process/environment;1"]
-              .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
-  // Override the crash reporter URL to send to our fake server
-  crashReporter.serverURL = NetUtil.newURI(SERVER_URL);
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.addObserver(testObserver, "crash-report-status", true);
-
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  try {
-    (async function() {
-      // Clear data in CrashManager in case previous tests caused something
-      // to be added.
-      let store = await Services.crashmanager._getStore();
-      store.reset();
-
-      await SimpleTest.promiseWaitForCondition(() => pluginElement.crash !== undefined,
-                                               "Waited too long for plugin to activate");
-      pluginElement.crash();
-    })();
-  } catch (e) {
-  }
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_defaultValue.html firefox-85.0+build1/dom/plugins/test/mochitest/test_defaultValue.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_defaultValue.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_defaultValue.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<html>
-  <head>
-    <title>NPObject [[DefaultValue]] implementation</title>
-
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="plugin-utils.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  </head>
-
-  <body onload="run()">
-
-    <script class="testbody" type="application/javascript">
-      SimpleTest.waitForExplicitFinish();
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-      function run() {
-        var plugin = document.getElementById("plugin");
-        var pluginProto = Object.getPrototypeOf(plugin);
-
-        plugin.propertyAndMethod = {};
-        plugin.propertyAndMethod + "baz";
-        ok(true, "|plugin.propertyAndMethod + \"baz\"| shouldn't assert");
-        pluginProto.propertyAndMethod = {};
-        pluginProto.propertyAndMethod + "quux";
-        ok(true, "|pluginProto.propertyAndMethod + \"quux\"| shouldn't assert");
-
-        plugin + "foo";
-        ok(true, "|plugin + \"foo\"| shouldn't assert");
-        pluginProto + "bar";
-        ok(true, "|pluginProto + \"bar\"| shouldn't assert");
-
-        SimpleTest.finish();
-      }
-    </script>
-
-    <embed id="plugin" type="application/x-test" wmode="window"></embed>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_enumerate.html firefox-85.0+build1/dom/plugins/test/mochitest/test_enumerate.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_enumerate.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_enumerate.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<html>
-<head>
-  <title>NPAPI Cookie Tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    function runTests() {
-      var pluginElement = document.getElementById("plugin1");
-      var c = 0;
-      var foundSetColor = false;
-      for (var n in pluginElement) {
-        ++c;
-        ok(n in pluginElement, "Enumerated property which doesn't exist?");
-        if (n == "setColor")
-          foundSetColor = true;
-      }
-      ok(c > 0, "Should have enumerated some properties");
-      ok(foundSetColor, "Should have enumerated .setColor");
-      SimpleTest.finish();
-    }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hang_submit.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_hang_submit.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hang_submit.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_hang_submit.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-SimpleTest.ignoreAllUncaughtExceptions();
-
-const {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const crashReporter = Cc["@mozilla.org/toolkit/crash-reporter;1"].getService(Ci.nsICrashReporter);
-const SERVER_URL = "http://example.com/browser/toolkit/crashreporter/test/browser/crashreport.sjs";
-
-var oldServerURL = crashReporter.serverURL;
-
-const oldTimeoutPref = Services.prefs.getIntPref("dom.ipc.plugins.timeoutSecs");
-
-var testObserver = {
-  observe: function(subject, topic, data) {
-    if (data == "submitting") // not done yet
-      return;
-    is(data, "success", "report should have been submitted successfully");
-    is(topic, "crash-report-status", "Checking correct topic");
-    ok(subject instanceof Ci.nsIPropertyBag2, "Subject should be a property bag");
-
-    ok(subject.hasKey("minidumpID"), "Should have a local crash ID");
-    let crashID = subject.getPropertyAsAString("minidumpID");
-    isnot(crashID, "", "Local crash ID should not be an empty string");
-
-    ok(subject.hasKey("serverCrashID"), "Should have a server crash ID");
-    let remoteID = subject.getPropertyAsAString("serverCrashID");
-    isnot(remoteID, "", "Server crash ID should not be an empty string");
-
-    // Verify the data. The SJS script will return the data that was POSTed
-    let req = new XMLHttpRequest();
-    req.open("GET", SERVER_URL + "?id=" + remoteID, false);
-    req.send(null);
-    is(req.status, 200, "Server response should be 200 OK");
-    let submitted = JSON.parse(req.responseText);
-
-    ok(!("Throttleable" in submitted), "Submit request should not be Throttleable");
-    is(submitted.ProcessType, "plugin", "Should specify ProcessType=plugin");
-    ok("PluginHang" in submitted, "Request should contain PluginHang field");
-    ok("additional_minidumps" in submitted, "Request should contain additional_minidumps field");
-    let dumpNames = submitted.additional_minidumps.split(',');
-    ok(dumpNames.includes("browser"), "additional_minidumps should contain browser");
-    info("additional_minidumps="+submitted.additional_minidumps);
-    ok("upload_file_minidump" in submitted, "Request should contain upload_file_minidump field");
-    ok("upload_file_minidump_browser" in submitted, "Request should contain upload_file_minidump_browser field");
-
-    // Cleanup
-    // First remove our fake submitted report
-    let file = Services.dirsvc.get("UAppData", Ci.nsIFile);
-    file.append("Crash Reports");
-    file.append("submitted");
-    file.append(remoteID + ".txt");
-    file.remove(false);
-
-    // Next unregister our observer
-    Services.obs.removeObserver(testObserver, "crash-report-status");
-
-    // Then re-set MOZ_CRASHREPORTER_NO_REPORT
-    let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-    env.set("MOZ_CRASHREPORTER_NO_REPORT", "1");
-
-    // Finally re-set prefs
-    crashReporter.serverURL = oldServerURL;
-    Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", oldTimeoutPref);
-
-    // Check and cleanup CrashManager.
-    (async function() {
-      let cm = Services.crashmanager;
-      await cm.ensureCrashIsPresent(crashID);
-      let store = await cm._getStore();
-      is(store.crashesCount, 1, "Store should have only 1 item");
-
-      let crash = store.getCrash(crashID);
-      ok(!!crash, "Store should have the crash record");
-      ok(crash.isOfType(cm.PROCESS_TYPE_PLUGIN, cm.CRASH_TYPE_HANG),
-         "Crash type should be plugin-hang");
-      is(crash.remoteID, remoteID, "Crash remoteID should match");
-
-      is(crash.submissions.size, 1, "Crash should have a submission");
-      let submission = crash.submissions.values().next().value;
-      is(submission.result, cm.SUBMISSION_RESULT_OK,
-         "Submission should be successful");
-
-      store.reset();
-
-      SimpleTest.finish();
-    })();
-  },
-
-  QueryInterface: function(iid) {
-    if (iid.equals(Ci.nsIObserver) ||
-        iid.equals(Ci.nsISupportsWeakReference) ||
-        iid.equals(Ci.nsISupports))
-      return this;
-    throw Components.Exception("", Cr.NS_NOINTERFACE);
-  }
-};
-
-async function onPluginCrashed(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  await SimpleTest.promiseWaitForCondition(
-    () => aEvent.target.openOrClosedShadowRoot.getElementById("submitButton"),
-    "Waiting for submit button to exist."
-  );
-  let submitButton = aEvent.target.openOrClosedShadowRoot.getElementById("submitButton");
-  // try to submit this report
-  sendMouseEvent({type:'click'}, submitButton, window);
-}
-
-async function runTests() {
-  // Default plugin hang timeout is too high for mochitests
-  Services.prefs.setIntPref("dom.ipc.plugins.timeoutSecs", 1);
-
-  // the test harness will have set MOZ_CRASHREPORTER_NO_REPORT,
-  // ensure that we can change the setting and have our minidumps
-  // wind up in Crash Reports/pending
-  let env = Cc["@mozilla.org/process/environment;1"]
-                      .getService(Ci.nsIEnvironment);
-  env.set("MOZ_CRASHREPORTER_NO_REPORT", "");
-
-  // Override the crash reporter URL to send to our fake server
-  crashReporter.serverURL = NetUtil.newURI(SERVER_URL);
-
-  // Hook into plugin crash events
-  Services.obs.addObserver(testObserver, "crash-report-status", true);
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.hang !== undefined,
-                                           "Waited too long for plugin to activate");
-  try {
-    (async function() {
-      // Clear data in CrashManager in case previous tests caused something
-      // to be added.
-      let store = await Services.crashmanager._getStore();
-      store.reset();
-
-      pluginElement.hang();
-    })();
-  } catch (e) {
-  }
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hangui.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_hangui.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hangui.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_hangui.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <title>Plugin Hang UI Test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript"
-          src="plugin-utils.js" />
-  <script type="application/javascript" src="hang_test.js" />
-  <script type="application/javascript" src="hangui_common.js" />
-
-<body xmlns="http://www.w3.org/1999/xhtml">
-  <iframe id="iframe1" src="hangui_subpage.html" width="400" height="400"></iframe>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-SimpleTest.expectChildProcessCrash();
-SpecialPowers.pushPrefEnv({"set": [["security.allow_eval_with_system_principal",
-                                    true]]});
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-const hangUITimeoutPref = "dom.ipc.plugins.hangUITimeoutSecs";
-const hangUIMinDisplayPref = "dom.ipc.plugins.hangUIMinDisplaySecs";
-const timeoutPref = "dom.ipc.plugins.timeoutSecs";
-
-var worker = new ChromeWorker("hangui_iface.js");
-worker.onmessage = function(event) {
-  var result = event.data;
-  var params = result.params;
-  var output = params.testName;
-  if (result.msg) {
-    output += ": " + result.msg;
-  }
-  ok(result.status, output);
-  if (params.callback) {
-    var cb = eval(params.callback);
-    var timeout = setTimeout(function() { clearTimeout(timeout); cb(); }, 100);
-  }
-};
-worker.onerror = function(event) {
-  var output = "Error: " + event.message + " at " + event.filename + ":" + event.lineno;
-  ok(false, output);
-};
-
-var iframe;
-var p;
-var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-
-function hanguiOperation(testName, timeoutSec, expectFind, expectClose, opCode,
-                         commandId, check, cb) {
-  var timeoutMs = timeoutSec * 1000 + EPSILON_MS;
-  worker.postMessage({ "timeoutMs": timeoutMs, "expectToFind": expectFind,
-                       "expectToClose": expectClose, "opCode": opCode,
-                       "commandId": commandId, "check": check,
-                       "testName": testName, "callback": cb });
-}
-
-function hanguiExpect(testName, shouldBeShowing, shouldClose, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  if (!shouldBeShowing && !timeoutSec) {
-    timeoutSec = Services.prefs.getIntPref(timeoutPref);
-  }
-  hanguiOperation(testName, timeoutSec, shouldBeShowing, shouldClose, HANGUIOP_NOTHING, 0, false, cb);
-}
-
-function hanguiContinue(testName, check, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_CONTINUE, check, cb);
-}
-
-function hanguiStop(testName, check, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_COMMAND, IDC_STOP, check, cb);
-}
-
-function hanguiCancel(testName, cb) {
-  var timeoutSec = Services.prefs.getIntPref(hangUITimeoutPref);
-  hanguiOperation(testName, timeoutSec, true, true, HANGUIOP_CANCEL, 0, false, cb);
-}
-
-function finishTest() {
-  if (obsCount > 0) {
-    os.removeObserver(testObserver, "plugin-crashed");
-    --obsCount;
-  }
-  Services.prefs.clearUserPref(hangUITimeoutPref);
-  Services.prefs.clearUserPref(hangUIMinDisplayPref);
-  Services.prefs.clearUserPref(timeoutPref);
-  SimpleTest.finish();
-}
-
-function runTests() {
-  resetVars();
-
-  hanguiOperation("Prime ChromeWorker", 0, false, false, HANGUIOP_NOTHING, 0,
-                  false, "test1");
-}
-
-window.frameLoaded = runTests;
-
-var obsCount = 0;
-
-function onPluginCrashedHangUI(aEvent) {
-  ok(true, "Plugin crashed notification received");
-  is(aEvent.type, "PluginCrashed", "event is correct type");
-
-  is(p, aEvent.target, "Plugin crashed event target is plugin element");
-
-  ok(aEvent instanceof PluginCrashedEvent,
-     "plugin crashed event has the right interface");
-
-  is(typeof aEvent.pluginDumpID, "string", "pluginDumpID is correct type");
-  isnot(aEvent.pluginDumpID, "", "got a non-empty dump ID");
-  is(typeof aEvent.pluginName, "string", "pluginName is correct type");
-  is(aEvent.pluginName, "Test Plug-in", "got correct plugin name");
-  is(typeof aEvent.pluginFilename, "string", "pluginFilename is correct type");
-  isnot(aEvent.pluginFilename, "", "got a non-empty filename");
-  // The app itself may or may not have decided to submit the report, so
-  // allow either true or false here.
-  ok("submittedCrashReport" in aEvent, "submittedCrashReport is a property of event");
-  is(typeof aEvent.submittedCrashReport, "boolean", "submittedCrashReport is correct type");
-
-  os.removeObserver(testObserver, "plugin-crashed");
-  --obsCount;
-}
-
-function resetVars() {
-  iframe = document.getElementById('iframe1');
-  p = iframe.contentDocument.getElementById("plugin1");
-  if (obsCount == 0) {
-    os.addObserver(testObserver, "plugin-crashed", true);
-    ++obsCount;
-  }
-  iframe.contentDocument.addEventListener("PluginCrashed",
-                                          onPluginCrashedHangUI,
-                                          false);
-}
-
-function test9b() {
-  hanguiExpect("test9b: Plugin Hang UI is not showing (checkbox)", false);
-  p.stall(STALL_DURATION);
-  hanguiExpect("test9b: Plugin Hang UI is still not showing (checkbox)", false, false, "finishTest");
-  p.stall(STALL_DURATION);
-}
-
-function test9a() {
-  resetVars();
-  Services.prefs.setIntPref(hangUITimeoutPref, 1);
-  Services.prefs.setIntPref(hangUIMinDisplayPref, 1);
-  Services.prefs.setIntPref(timeoutPref, 45);
-  hanguiContinue("test9a: Continue button works with checkbox", true, "test9b");
-  p.stall(STALL_DURATION);
-}
-
-function test9() {
-  window.frameLoaded = test9a;
-  iframe.contentWindow.location.reload();
-}
-
-function test8a() {
-  resetVars();
-  Services.prefs.setIntPref(hangUITimeoutPref, 1);
-  Services.prefs.setIntPref(hangUIMinDisplayPref, 4);
-  hanguiExpect("test8a: Plugin Hang UI is not showing (disabled due to hangUIMinDisplaySecs)", false, false, "test9");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test8a: Exception thrown from hang() when plugin was terminated");
-}
-
-function test8() {
-  window.frameLoaded = test8a;
-  iframe.contentWindow.location.reload();
-}
-
-function test7a() {
-  resetVars();
-  Services.prefs.setIntPref(hangUITimeoutPref, 0);
-  hanguiExpect("test7a: Plugin Hang UI is not showing (disabled)", false, false, "test8");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test7a: Exception thrown from hang() when plugin was terminated");
-}
-
-function test7() {
-  window.frameLoaded = test7a;
-  iframe.contentWindow.location.reload();
-}
-
-function test6() {
-  Services.prefs.setIntPref(hangUITimeoutPref, 1);
-  Services.prefs.setIntPref(hangUIMinDisplayPref, 1);
-  Services.prefs.setIntPref(timeoutPref, 3);
-  hanguiExpect("test6: Plugin Hang UI is showing", true, true, "test7");
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test6: Exception thrown from hang() when plugin was terminated (child timeout)");
-}
-
-function test5a() {
-  resetVars();
-  hanguiCancel("test5a: Close button works", "test6");
-  p.stall(STALL_DURATION);
-}
-
-function test5() {
-  window.frameLoaded = test5a;
-  iframe.contentWindow.location.reload();
-}
-
-function test4() {
-  hanguiStop("test4: Stop button works", false, "test5");
-  // We'll get an exception here because the plugin was terminated
-  var exceptionThrown = false;
-  try {
-    p.hang();
-  } catch(e) {
-    exceptionThrown = true;
-  }
-  ok(exceptionThrown, "test4: Exception thrown from hang() when plugin was terminated");
-}
-
-function test3() {
-  hanguiContinue("test3: Continue button works", false, "test4");
-  p.stall(STALL_DURATION);
-}
-
-function test2() {
-  // This test is identical to test1 because there were some bugs where the
-  // Hang UI would show on the first hang but not on subsequent hangs
-  hanguiExpect("test2: Plugin Hang UI is showing", true, true, "test3");
-  p.stall(STALL_DURATION);
-}
-
-function test1() {
-  Services.prefs.setIntPref(hangUITimeoutPref, 1);
-  Services.prefs.setIntPref(hangUIMinDisplayPref, 1);
-  Services.prefs.setIntPref(timeoutPref, 45);
-  hanguiExpect("test1: Plugin Hang UI is showing", true, true, "test2");
-  p.stall(STALL_DURATION);
-}
-
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hidden_plugin.html firefox-85.0+build1/dom/plugins/test/mochitest/test_hidden_plugin.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_hidden_plugin.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_hidden_plugin.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test whether we are adding the dummy plugin correctly when there is only 1 plugin and its hidden</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<body>
-  <script type="application/javascript">
-  "use strict";
-  {
-    SimpleTest.waitForExplicitFinish();
-    let ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"].getService(SpecialPowers.Ci.nsIPluginHost);
-    let plugins = ph.getPluginTags();
-    let testPluginName = plugins[0].name;
-    let prefName = "plugins.navigator.hidden_ctp_plugin";
-    try {
-      SpecialPowers.getCharPref(prefName);
-    } catch (ex) {}
-    let promise = SpecialPowers.pushPrefEnv({ set: [[prefName, testPluginName]]});
-    promise.then(function() {
-      for (let i = 0; i < plugins.length; i++) {
-        let plugin = plugins[i];
-        let newState = (plugin.name == testPluginName ? SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY :
-                        SpecialPowers.Ci.nsIPluginTag.STATE_DISABLED);
-        if (plugin.enabledState != newState) {
-          let oldState = plugin.enabledState;
-          setTestPluginEnabledState(newState, plugin.name);
-          SimpleTest.registerCleanupFunction(function() {
-            if (plugin.enabledState != oldState)
-              setTestPluginEnabledState(oldState, plugin.name);
-          });
-        }
-      }
-      // we have disabled all the plugins except for 1 which is click to play and hidden. The
-      // navigator.plugins list should have only one entry and it should be the dummy plugin.
-      isnot(navigator.plugins.length, 0, "navigator.plugins should not be empty");
-      SimpleTest.finish();
-    });
-  }
-</script>
-</body>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_idle_hang.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_idle_hang.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_idle_hang.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_idle_hang.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <title>Plugin Idle Hang Test</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="hang_test.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-SimpleTest.expectChildProcessCrash();
-
-async function runTests() {
-  // Default plugin hang timeout is too high for mochitests
-  var prefs = Cc["@mozilla.org/preferences-service;1"]
-                    .getService(Ci.nsIPrefBranch);
-  var timeoutPref = "dom.ipc.plugins.timeoutSecs";
-  prefs.setIntPref(timeoutPref, 5);
-
-  var os = Cc["@mozilla.org/observer-service;1"].
-           getService(Ci.nsIObserverService);
-  os.addObserver(testObserver, "plugin-crashed", true);
-
-  testObserver.idleHang = true;
-  document.addEventListener("PluginCrashed", onPluginCrashed, false);
-
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.hang !== undefined,
-                                           "Waited too long for plugin to activate");
-
-  try {
-    pluginElement.hang(false);
-  } catch (e) {
-  }
-}
-]]>
-</script>
-</window>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_re-parent.html firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_re-parent.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_re-parent.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_re-parent.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test re-parentinging an instance's DOM node</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <script type="text/javascript" src="plugin-utils.js"></script>
-</head>
-<body onload="begin()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  const MAX_CHECK_PLUGIN_STOPPED_ATTEMPTS = 50;
-  var numCheckPluginStoppedAttempts = 0;
-  var exceptionThrown = false;
-  var p = null;
-  var d1 = null;
-  var d2 = null;
-
-  var destroyed = false;
-
-  function begin() {
-    runTests(function() {
-      // Callback when finished - set plugin to windowed and repeat the tests
-
-      info("Repeating tests with wmode=window");
-      p.setAttribute("wmode", "window");
-      d1.appendChild(p);
-
-      // Forces the plugin to be respawned
-      // eslint-disable-next-line no-self-assign
-      p.src = p.src;
-
-      destroyed = false;
-      exceptionThrown = false;
-      runTests(function() {
-        SimpleTest.finish();
-      });
-    });
-  }
-
-  function checkPluginStopped(callback, param) {
-    if (numCheckPluginStoppedAttempts < MAX_CHECK_PLUGIN_STOPPED_ATTEMPTS &&
-        !destroyed) {
-      ++numCheckPluginStoppedAttempts;
-      SimpleTest.executeSoon(function() {
-          checkPluginStopped(callback, param);
-      });
-    } else {
-      info("Number of check plugin stopped attempts: " +
-           numCheckPluginStoppedAttempts);
-      callback(param);
-    }
-  }
-
-  function runTests(callback) {
-    p = document.getElementById("plugin1");
-    d1 = document.getElementById("div1");
-    d2 = document.getElementById("div2");
-
-    // First tests involve moving the instance from one div to another.
-    p.startWatchingInstanceCount();
-    p.callOnDestroy(function() {
-      destroyed = true;
-    });
-
-    try {
-      d1.removeChild(p);
-    } catch (e) {
-      exceptionThrown = true;
-    }
-    is(exceptionThrown, false, "Testing for exception after removeChild.");
-
-    try {
-      d2.appendChild(p);
-    } catch (e) {
-      exceptionThrown = true;
-    }
-    is(exceptionThrown, false, "Testing for exception after appendChild.");
-
-    is(destroyed, false, "No instances should have been destroyed at this point.");
-    is(p.getInstanceCount(), 0, "No new instances should have been created at this point.");
-
-    // Wait for the event loop to spin and ensure the plugin still wasn't touched
-    SimpleTest.executeSoon(function() {
-      is(destroyed, false, "No instances should have been destroyed at this point.");
-      is(p.getInstanceCount(), 0, "No new instances should have been created at this point.");
-
-      d2.removeChild(p);
-      checkPluginStopped(continueTestsAfterPluginDestruction, callback);
-    });
-  }
-
-  function continueTestsAfterPluginDestruction(callback) {
-    d2.appendChild(p);
-    SimpleTest.executeSoon(function() {
-      try {
-        is(p.getInstanceCount(), 1, "One new instance should have been created at this point.");
-      } catch (e) {
-        exceptionThrown = true;
-      }
-      is(exceptionThrown, false, "Testing for exception getting instance count from plugin.");
-
-      p.stopWatchingInstanceCount();
-      callback.apply(null);
-    });
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <div id="div1">
-    <!-- This embed has to have a "src" attribute. Part of this test involves seeing if we
-         properly restart plugins that have been added back to a document without a change
-         in URL. Not re-loading an object when the URL hasn't changed is a shortcut used for
-         some object types. Without a URL, this won't be tested. -->
-    <embed id="plugin1" src="loremipsum.txt" type="application/x-test" width="200" height="200"></embed>
-  </div>
-  <div id="div2">
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent1.html firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent1.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent1.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test removing an instance's DOM node</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="startTest()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  const MAX_ATTEMPTS = 50;
-  var attempts = 0;
-  var destroyed = false;
-  function onDestroy() {
-    destroyed = true;
-  }
-
-  function checkPluginAlreadyDestroyed() {
-    // We may need to retry a few times until the plugin stop event makes
-    // its way through the event queue.
-    if (attempts < MAX_ATTEMPTS && !destroyed) {
-      ++attempts;
-      SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-    } else {
-      info("Number of retry attempts: " + attempts);
-      is(destroyed, true, "Plugin instance should have been destroyed.");
-      SimpleTest.finish();
-    }
-  }
-
-  function startTest() {
-    var p1 = document.getElementById("plugin1");
-    var d1 = document.getElementById("div1");
-
-    p1.callOnDestroy(onDestroy);
-    d1.removeChild(p1);
-    SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent2.html firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent2.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent2.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test removing an instance's DOM node</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="startTest()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  const MAX_ATTEMPTS = 50;
-  var attempts = 0;
-  var destroyed = false;
-  function onDestroy() {
-    destroyed = true;
-  }
-
-  function checkPluginAlreadyDestroyed() {
-    // We may need to retry a few times until the plugin stop event makes
-    // its way through the event queue.
-    if (attempts < MAX_ATTEMPTS && !destroyed) {
-      ++attempts;
-      SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-    } else {
-      info("Number of retry attempts: " + attempts);
-      is(destroyed, true, "Plugin instance should have been destroyed.");
-      SimpleTest.finish();
-    }
-  }
-
-  function startTest() {
-    var p1 = document.getElementById("plugin1");
-    var d1 = document.getElementById("div1");
-
-    p1.callOnDestroy(onDestroy);
-
-    // Get two parent check events to run.
-    d1.removeChild(p1);
-    d1.appendChild(p1);
-    d1.removeChild(p1);
-
-    SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  </div>
-
-  <div id="div2">
-    <div id="div3">
-        <embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
-    </div>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent3.html firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent3.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instance_unparent3.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_instance_unparent3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test removing an instance's DOM node</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="startTest()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  const MAX_ATTEMPTS = 50;
-  var attempts = 0;
-  var destroyed = false;
-  function onDestroy() {
-    destroyed = true;
-  }
-
-  function checkPluginAlreadyDestroyed() {
-    // We may need to retry a few times until the plugin stop event makes
-    // its way through the event queue.
-    if (attempts < MAX_ATTEMPTS && !destroyed) {
-      ++attempts;
-      SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-    } else {
-      info("Number of retry attempts: " + attempts);
-      is(destroyed, true, "Plugin instance should have been destroyed.");
-      SimpleTest.finish();
-    }
-  }
-
-  function startTest() {
-    var p1 = document.getElementById("plugin1");
-    var d1 = document.getElementById("div1");
-    var d2 = document.getElementById("div2");
-
-    p1.callOnDestroy(onDestroy);
-    d1.removeChild(d2);
-    SimpleTest.executeSoon(checkPluginAlreadyDestroyed);
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <div id="div1">
-    <div id="div2">
-      <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-    </div<
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instantiation.html firefox-85.0+build1/dom/plugins/test/mochitest/test_instantiation.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_instantiation.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_instantiation.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<head>
-  <title>Plugin instantiation</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="mainLoaded()">
-  <iframe id="iframe1" src="about:blank" width="600" height="600"></iframe>
-
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var iframe = document.getElementById("iframe1");
-
-  function mainLoaded() {
-    var p = iframe.contentDocument.createElement("embed");
-    p.setAttribute("id", "plugin1");
-    p.setAttribute("type", "application/x-test");
-    p.setAttribute("width", "400");
-    p.setAttribute("height", "400");
-    p.setAttribute("drawmode", "solid");
-    p.setAttribute("color", "FF00FFFF");
-    iframe.contentDocument.body.appendChild(p);
-
-    // Plugin instantiation happens asynchronously
-    SimpleTest.executeSoon(function() {
-      SimpleTest.executeSoon(function() {
-        ok(p.setColor !== undefined, "Dynamic plugin instantiation.");
-        SimpleTest.finish();
-      });
-    });
-  }
-  </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_mixed_case_mime.html firefox-85.0+build1/dom/plugins/test/mochitest/test_mixed_case_mime.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_mixed_case_mime.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_mixed_case_mime.html	2021-01-18 19:58:10.000000000 +0000
@@ -2,20 +2,16 @@
 <head>
   <title>Test mixed case mimetype for plugins</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 <script>
   SimpleTest.expectAssertions(0, 1);
 
   SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Second Test Plug-in");
 
   function frameLoaded() {
     var contentDocument = document.getElementById("testframe").contentDocument;
     ok(contentDocument.body.innerHTML.length > 0, "Frame content shouldn't be empty.");
-    ok(contentDocument.plugins.length > 0, "Frame content should have a plugin.");
-    var plugin = contentDocument.plugins[0];
-    is(plugin.type.toLowerCase(), "application/x-second-test", "Should have loaded the second test plugin.");
+    ok(contentDocument.images.length > 0, "Frame content should have an image.");
     SimpleTest.finish();
   }
 </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_multipleinstanceobjects.html firefox-85.0+build1/dom/plugins/test/mochitest/test_multipleinstanceobjects.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_multipleinstanceobjects.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_multipleinstanceobjects.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<head>
-  <title>NPNV*NPObject accessibility tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  function runTests() {
-    var p1 = document.getElementById("plugin1");
-    var p2 = document.getElementById("plugin2");
-
-    var o = p1.getObjectValue();
-    ok(p1.checkObjectValue(o), "Plugin objects passed to the same instance are identical.");
-    ok(!p2.checkObjectValue(o), "Plugin objects passed to another instance are double-wrapped.");
-
-    SimpleTest.finish();
-  }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-  <embed id="plugin2" type="application/x-test" width="400" height="400"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_newstreamondestroy.html firefox-85.0+build1/dom/plugins/test/mochitest/test_newstreamondestroy.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_newstreamondestroy.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_newstreamondestroy.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<head>
-  <title>NPN_GetURL called from NPP_Destroy</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-  <link rel="stylesheet" type="text/css"
-	href="/tests/SimpleTest/test.css">
-
-<body onload="runTest()">
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout("untriaged");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  function runTest() {
-    var p = document.getElementById("plugin1");
-    var destroyed = false;
-    p.callOnDestroy(function() {
-      destroyed = true;
-      ok(!p.streamTest("loremipsum.txt", false, null, null,
-                       function(r, t) {
-                         ok(false, "get-during-destroy should have failed");
-                       }, null, true), "NPN_GetURLNotify should fail during NPP_Destroy");
-    });
-    document.body.removeChild(p);
-
-    setTimeout(function() {
-      ok(destroyed, "callback was fired as expected");
-      SimpleTest.finish();
-    }, 1000);
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npn_timers.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npn_timers.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npn_timers.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npn_timers.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<html>
-<head>
-  <title>NPN_Timer Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  function pluginTimerTestFinish(result) {
-    ok(result, "timer tests completed");
-    SimpleTest.finish();
-  }
-  
-  function runTests() {
-    var plugin = document.getElementById("plugin1");
-    plugin.timerTest("pluginTimerTestFinish");
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
- </body>
- </html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html firefox-85.0+build1/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_NPNVdocumentOrigin.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<html>
-<head>
-  <title>Test NPNVdocumentOrigin</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-<body onload="runTest()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    function runTest() {
-      "use strict";
-      var p1 = document.getElementById("plugin1");
-      var realOrigin = "http://mochi.test:8888";
-
-      // Test with no modifications
-      is(p1.getNPNVdocumentOrigin(), realOrigin, "Checking for expected origin.");
-
-      // This used to test that shadowing window.location.toString didn't confuse
-      // getNPNVdocumentOrigin. But now we explicitly throw when that happens. So
-      // just verify that we throw. There's no reason why getNPNVdocumentOrigin _would_
-      // be confused in this case anyway.
-      try {
-        window.location.toString = function() { return "http://victim.rckc.at/"; };
-        ok(false, "Should throw when shadowing window.location.toString");
-      } catch (e) {
-        ok(true, "Should throw when shadowing window.location.toString");
-      }
-
-      // Create a plugin in a new window with about:blank
-      var newWindow = window.open("about:blank");
-      newWindow.onload = function() {
-        newWindow.document.writeln('<embed id="plugin2" type="application/x-test" width="200" height="200"></embed>');
-        var p2 = newWindow.document.getElementById("plugin2");
-        is(p2.getNPNVdocumentOrigin(), realOrigin, "Checking for expected origin of plugin in new about:blank window.");
-        newWindow.close();
-
-        SimpleTest.finish();
-      };
-    }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npobject_getters.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npobject_getters.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npobject_getters.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npobject_getters.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<head>
-  <title>NPNV*NPObject accessibility tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  dump("lastScript\n");
-
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  function runTests() {
-    ok(
-      document.getElementById("plugin1").pluginFoundElement,
-      "plugin1.pluginFoundElement (NPNVPluginElementNPObject) - " +
-      document.getElementById("plugin1").pluginFoundElement
-    );
-    ok(
-      window.pluginFoundWindow,
-      "window.pluginFoundWindow (NPNVWindowNPObject) - " +
-      window.pluginFoundWindow
-    );
-
-    SimpleTest.finish();
-  }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html firefox-85.0+build1/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_NPPVpluginWantsAllNetworkStreams.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<html>
-<head>
-  <title>Test NPPVpluginWantsAllNetworkStreams</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    var p = null;
-
-    var missingDoc = "not-found.html";
-
-    var expectedWriteURL = "";
-    var expectedNotifyStatus = -1;
-
-    var writeHappened = false;
-    var expectedWrite = false;
-
-    function writeCallback(url) {
-      writeHappened = true;
-    }
-
-    function notifyCallback(status, data) {
-      is(writeHappened, expectedWrite, "Test for expected write.");
-      is(status, expectedNotifyStatus, "Test for expected stream notification status.");
-      runNextTest();
-    }
-
-    function test1() {
-      // In this test we do not expect a stream for the missing document.
-      p.setPluginWantsAllStreams(false);
-
-      expectedWriteURL = missingDoc;
-      expectedNotifyStatus = 1;
-
-      writeHappened = false;
-      expectedWrite = false;
-
-      p.streamTest(missingDoc, false, null, writeCallback, notifyCallback, null, false);
-    }
-
-    function test2() {
-      // In this test we expect a stream for the missing document.
-      p.setPluginWantsAllStreams(true);
-
-      expectedWriteURL = missingDoc;
-      expectedNotifyStatus = 0;
-
-      writeHappened = false;
-      expectedWrite = true;
-
-      p.streamTest(missingDoc, false, null, writeCallback, notifyCallback, null, false);
-    }
-
-    var tests = [test1, test2];
-    var currentTest = -1;
-    function runNextTest() {
-      currentTest++;
-      if (currentTest < tests.length) {
-        tests[currentTest]();
-      } else {
-        SimpleTest.finish();
-      }
-    }
-
-    function runTests() {
-      p = document.getElementById("plugin1");
-      runNextTest();
-    }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_construct.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_construct.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_construct.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_construct.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test whether windowless plugins receive correct visible/invisible notifications.</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<body>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="theplugin" type="application/x-test"></embed>
-
-  <script type="application/javascript">
-    function MyFunc(arg) {
-      is(arg, "hi", "Argument passed to constructor function");
-      this.localProp = "local";
-    }
-    MyFunc.prototype.protoProp = "t";
-
-    var theplugin = document.getElementById("theplugin");
-
-    ok(theplugin.constructObject(Array) instanceof Array, "Constructed Array");
-    var o = theplugin.constructObject(MyFunc, "hi");
-    ok(o instanceof MyFunc, "Constructed MyFunc");
-    is(o.localProp, "local", "this property correct");
-    is(o.protoProp, "t", "prototype property correct");
-  </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_identifiers.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_identifiers.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_identifiers.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_identifiers.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-<html>
-<head>
-  <title>NPN_Invoke Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-
-  <script class="testbody" type="application/javascript">
-  // //
-  // This test exercises NP identifiers by querying the reflector to make sure
-  // that identifiers are translated to values correctly.
-  
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var testsRun = 0;
-
-  function doTest() {
-    SpecialPowers.gc();
-
-    var reflector = document.getElementById("subframe").contentDocument.getElementById("plugin1").getReflector();
-
-    var i, prop, randomnumber;
-
-    for (i = 0; i < 20; ++i) {
-      randomnumber = Math.floor(Math.random() * 1001);
-      prop = "prop" + randomnumber;
-      is(reflector[prop], prop, "Property " + prop);
-    }
-
-    for (i = -10; i < 0; ++i) {
-      is(reflector[i], String(i), "Property " + i);
-      prop = "prop" + i;
-      is(reflector[prop], prop, "Property " + prop);
-    }
-
-    for (i = 0; i < 10; ++i) {
-      is(reflector[i], i, "Property " + i);
-      prop = "prop" + i;
-      is(reflector[prop], prop, "Property " + prop);
-    }
-
-    is(reflector.a, "a", "Property .a");
-    is(reflector.a, "a", "Property ['a']");
-    reflector = null;
-
-    SpecialPowers.gc();
-
-    ++testsRun;
-    if (testsRun == 3) {
-      SimpleTest.finish();
-    } else {
-      document.getElementById("subframe").contentWindow.location.reload(true);
-    }
-  }
-  </script>
-
-  <iframe id="subframe" src="npruntime_identifiers_subpage.html" onload="doTest()"></iframe>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npnevaluate.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-<html>
-<head>
-  <title>NPN_Evaluate Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  
-  // global test function
-  function testMe(arg) {
-    var result = arg + arg;
-    for (var i = 1; i < arguments.length; i++) {
-      result += arguments[i] + arguments[i];
-    }
-    return result;
-  }
-
-  // //
-  // This test exercises NPN_Evaluate using the test plugin's
-  // npnEvaluateTest method.  This method calls NPN_Evaluate on
-  // a string argument passed to it, and returns the eval result.
-  // The array below drives the tests; each array member has two
-  // members:  the first is a string to eval, and the second is
-  // the expected result of the eval.
-  //
-
-  function runTests() {
-    var tests = [
-      ["3", 3],
-      ["3 + 3", 6],
-      ["'3'", "3"],
-      ["function test() { return 3; } test();", 3],
-      ["testMe(3)", 6],
-      ["testMe(new Object(3))", 6],
-      // eslint-disable-next-line no-new-object
-      ["new Object(3)", new Object(3)],
-      ["new Array(1, 2, 3, 4)", [1, 2, 3, 4]],
-      ["document.getElementById('display')",
-          document.getElementById("display")],
-      ["encodeURI('a = b')", "a%20=%20b"],
-      ["document.getElementById('testdiv').innerHTML = 'Hello world!'",
-          "Hello world!"],
-      ["function test2() { var x = {a: '1', b: '2'}; return x; } test2();",
-          {a: "1", b: "2"}],
-      ["(function() { var ret; try { win = window.open(); win.document.writeln('wibble'); ret = 'no error' } catch(e) { ret = e.name; } win.close(); return ret; })()", "no error"],
-    ];
-
-    var plugin = document.getElementById("plugin1");
-
-    // Test calling NPN_Evaluate from within plugin code.
-    for (var test of tests) {
-      var expected = test[1];
-      var result = plugin.npnEvaluateTest(test[0]);
-      // serialize the two values for easy comparison
-      var json_expected = JSON.stringify(expected);
-      var json_result = JSON.stringify(result);
-      if (typeof(result) == "function")
-          json_result = result.toString();
-      if (typeof(expected) == "function")
-          json_expected = expected.toString();
-      is(json_result, json_expected,
-          "npnEvaluateTest returned an unexpected value");
-      is(typeof(result), typeof(expected),
-          "npnEvaluateTest return value was of unexpected type");
-      var success = (json_result == json_expected &&
-          typeof(result) == typeof(expected));
-      $("verbose").appendChild(
-          createEl("span", null, (success ? "pass" : "fail") + ": eval(" + test[0] + ")"));
-      $("verbose").appendChild(
-          createEl("span", null, " == " + json_result + "(" +
-          typeof(result) + "), expected " + json_expected + "(" +
-          typeof(expected) + ")"));
-      $("verbose").appendChild(
-          createEl("br")
-          );
-    }
-  
-    is(document.getElementById("testdiv").innerHTML, "Hello world!",
-      "innerHTML not set correctly via NPN_Evaluate");
-  
-    SimpleTest.finish();
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
-  <div id="verbose">
-  </div>
-  <div id="testdiv">
-  </div>
- </body>
- </html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-<html>
-<head>
-  <title>NPN_Invoke_Default Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  // global test function
-  function testMe(arg) {
-    var result = arg + arg;
-    for (var i = 1; i < arguments.length; i++) {
-      result += arguments[i] + arguments[i];
-    }
-    return result;
-  }
-
-  // //
-  // This test exercises NPN_InvokeDefault using the test plugin's
-  // npnInvokeDefaultTest method.  This method invokes an object
-  // with a single parameter, and returns the result of the invocation.
-  // The test list below is used to drive the tests.  Each member of the
-  // array contains three members: the object to invoke, an argument to
-  // invoke it with, and the expected result of the invocation.
-  //
-  var tests = [
-    // Number object
-    ["Number", 3, 3],
-    ["Number", "3", 3],
-    ["Number", "0x20", 32],
-    ["Number", "three", Number.NaN],
-    ["Number", "1e+3", 1000],
-    ["Number", 5.6612, 5.6612],
-    // Array object
-    ["Array", 3, Array(3)],
-    // Boolean object
-    ["Boolean", 0, false],
-    ["Boolean", null, false],
-    ["Boolean", "", false],
-    ["Boolean", false, false],
-    ["Boolean", true, true],
-    ["Boolean", "true", true],
-    ["Boolean", "false", true],
-    /* eslint-disable no-new-wrappers */
-    ["Boolean", new Boolean(false), true],
-    ["Boolean", { "value": false }, true],
-    // Function object
-    ["Function", "return 3", Function("return 3")],
-    ["Function", "window.alert('test')", Function("window.alert('test')")],
-    // Object object
-    ["Object", undefined, Object()],
-    ["Object", null, Object()],
-    ["Object", true, new Boolean(true)],
-    ["Object", Boolean(), new Boolean(false)],
-    ["Object", "a string", new String("a string")],
-    ["Object", 3.14, new Number(3.14)],
-    /* eslint-enable no-new-wrappers */
-    ["Object", { "key1": "test", "key2": 15 }, { "key1": "test", "key2": 15 }],
-    ["Object", [1, 3, 5, 7, 9, 11, 13, 17], [1, 3, 5, 7, 9, 11, 13, 17]],
-    // RegExp object
-    ["RegExp", "...", RegExp("...")],
-    // String object
-    ["String", "testing", "testing"],
-    ["String", "test\u0020me", "test me"],
-    ["String", "314", "314"],
-    ["String", "true", "true"],
-    ["String", "null", "null"],
-    ["String", "2 + 2", String("2 + 2")],
-    ["String", ""],
-    // global functions
-    ["testMe", 3, 6],
-    ["testMe", "string", [1, 2], "stringstring1,21,2"],
-    ["testMe", "me", "meme"],
-    ["testMe", undefined, Number.NaN],
-    ["testMe", [1, 2], "1,21,2"],
-    ["testMe", 3, 4, 14],
-    ["isNaN", "junk", true],
-    ["parseInt", "156", 156],
-    ["encodeURI", "a = b", "a%20=%20b"],
-  ];
-
-  function runTests() {
-    var plugin = document.getElementById("plugin1");
-
-    // Test calling NPN_InvokeDefault from within plugin code.
-    for (var test of tests) {
-      var result;
-      var expected = test[test.length - 1];
-      switch (test.length) {
-        case 2:
-          result = plugin.npnInvokeDefaultTest(test[0]);
-          break;
-        case 3:
-          result = plugin.npnInvokeDefaultTest(test[0], test[1]);
-          break;
-        case 4:
-          result = plugin.npnInvokeDefaultTest(test[0], test[1], test[2]);
-          break;
-      }
-      // serialize the two values for easy
-      var json_expected = JSON.stringify(expected);
-      var json_result = JSON.stringify(result);
-      if (typeof(result) == "function")
-          json_result = result.toString();
-      if (typeof(test[2]) == "function")
-          json_expected = expected.toString();
-      is(json_result, json_expected,
-          "npnInvokeDefault returned an unexpected value");
-      is(typeof(result), typeof(expected),
-          "npnInvokeDefaultTest return value was of unexpected type");
-      var success = (json_result == json_expected &&
-          typeof(result) == typeof(expected));
-      $("verbose").appendChild(
-          createEl("span", null, ((success ? "pass" : "fail") + ": " + test[0] + "(")));
-      for (var i = 1; i < test.length - 1; i++) {
-        $("verbose").appendChild(
-            createEl("span", null, (JSON.stringify(test[i]) + (i < test.length - 2 ? "," : ""))));
-      }
-      $("verbose").appendChild(
-          createEl("span", null, (") == " + json_result + "(" +
-          typeof(result) + "), expected " + json_expected + "(" +
-          typeof(expected) + ")")));
-      $("verbose").appendChild(createEl("br"));
-    }
-
-    let testObject = plugin.getInvokeDefaultObject();
-
-    // Test calling the invokedefault method of plugin-defined object
-    is(testObject(), "Test Plug-in",
-        "calling NPN_InvokeDefault on plugin-defined Object doesn't work");
-    is(testObject(1), "Test Plug-in;1",
-        "calling NPN_InvokeDefault on plugin-defined Object doesn't work");
-    is(testObject("test"), "Test Plug-in;test",
-        "calling NPN_InvokeDefault on plugin-defined Object doesn't work");
-    is(testObject(undefined, -1, null), "Test Plug-in;undefined;-1;null",
-        "calling NPN_InvokeDefault on plugin-defined Object doesn't work");
-  
-    SimpleTest.finish();
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
-  <div id="verbose">
-  </div>
- </body>
- </html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npninvoke.html firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npninvoke.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime_npninvoke.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime_npninvoke.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,163 +0,0 @@
-<html>
-<head>
-  <title>NPN_Invoke Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-
-  <script class="testbody" type="application/javascript">
-  // //
-  // This test exercises NPN_Invoke by calling the plugin's npnInvokeTest
-  // method, which in turn invokes a script method with 1 or more parameters,
-  // and then compares the return vale with an expected value.  This is good
-  // for verifying various NPVariant values and types moving between
-  // the browser and the plugin.
-  //
-  
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  // This function returns all the arguments passed to it, either as a
-  // single variable (in the caes of 1 argument), or as an array.
-  function returnArgs() {
-    if (arguments.length == 1)
-      return arguments[0];
-    var arr = [];
-    for (var i = 0; i < arguments.length; i++) {
-      arr.push(arguments[i]);
-    }
-    return arr;
-  }
-  
-  // Same as above but explicitly expects two arguments.
-  function returnTwoArgs(arg1, arg2) {
-    return [arg1, arg2];
-  }
-
-  // some objects and arrays used in the tests...
-  var obj = {"key1": "string", "key2": 0, "key3": true, "key4": undefined,
-        "key5": null, "key6": -551235.12552, "key7": false};
-  var arr = ["string", 0, true, false, undefined, null, -1, 55512.1252];
-  var obj2 = {"key1": "string", "key2": 0, "key3": true, "key4": undefined,
-        "key5": null, "key6": -551235.12552, "key7": false, "array": arr};
-  var arr2 = ["string", false, undefined, null, -1, 55512.1252,
-        {"a": "apple", "b": true, "c": undefined}];
-  
-  // //
-  // A list of tests to run.  Each member of the main array contains
-  // two members:  the first contains the arguments passed to npnInvokeTest,
-  // and the second is the expected result.
-  //
-  var tests = [
-    // numeric values
-    [["returnArgs", 0, 0], true],
-    [["returnArgs", 1, 1], true],
-    [["returnArgs", 32768, 32768], true],
-    [["returnArgs", -32768, -32768], true],
-    [["returnArgs", 2147483648, 2147483648], true],
-    [["returnArgs", -2147483648, -2147483648], true],
-    [["returnArgs", 1.0, 1.0], true],
-    [["returnArgs", 1.592786, 1.592786], true],
-    [["returnArgs", 1.592786837, 1.592786837], true],
-    [["returnArgs", -1.592786, -1.592786], true],
-    [["returnArgs", -1.592786837, -1.592786837], true],
-    [["returnArgs", 15235.592786, 15235.592786], true],
-    // null, void, bool
-    [["returnArgs", null, null], true],
-    [["returnArgs", undefined, undefined], true],
-    [["returnArgs", undefined, null], false],
-    [["returnArgs", null, undefined], false],
-    [["returnArgs", 0, undefined], false],
-    [["returnArgs", 0, null], false],
-    [["returnArgs", 0, false], false],
-    [["returnArgs", 1, true], false],
-    [["returnArgs", true, true], true],
-    [["returnArgs", false, false], true],
-    // strings
-    [["returnArgs", "", ""], true],
-    [["returnArgs", "test", "test"], true],
-    [["returnArgs", "test", "testing"], false],
-    [["returnArgs", "test\n", "test\n"], true],
-    [["returnArgs", "test\nline2", "test\nline2"], true],
-    [["returnArgs", "test\nline2", "testline2"], false],
-    [["returnArgs", "test\u000aline2", "test\u000aline2"], true],
-    [["returnArgs", "test\u0020line2", "test line2"], true],
-    [["returnArgs", "test line2", "test\u0020line2"], true],
-    // objects and arrays
-    [["returnArgs", obj, obj], true],
-    [["returnArgs", arr, arr], true],
-    [["returnArgs", obj2, obj2], true],
-    [["returnArgs", arr2, arr2], true],
-    // multiple arguments
-    [["returnArgs", [0, 1, 2], 0, 1, 2], true],
-    [["returnArgs", [5, "a", true, false, null],
-        5, "a", true, false, null], true],
-    [["returnArgs", [-1500.583, "test string\n",
-                     [5, 10, 15, 20], {"a": 1, "b": 2}],
-        -1500.583, "test string\n", [5, 10, 15, 20], {"a": 1, "b": 2}], true],
-    [["returnArgs", [undefined, 0, null, "yes"],
-        undefined, 0, null, "yes"], true],
-    [["returnArgs", [0, undefined, null, "yes"],
-        0, undefined, null, "yes"], true],
-    // too many/too few args
-    [["returnTwoArgs", ["a", "b"], "a", "b", "c"], true],
-    [["returnTwoArgs", ["a", undefined], "a"], true],
-    [["returnTwoArgs", [undefined, undefined]], true],
-  ];
-
-  function runTests() {
-    var plugin = document.getElementById("plugin1");
-  
-    var result;
-    for (var test of tests) {
-      switch (test[0].length) {
-        case 2:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1]);
-          break;
-        case 3:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1], test[0][2]);
-          break;
-        case 4:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1], test[0][2],
-              test[0][3]);
-          break;
-        case 5:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1], test[0][2],
-              test[0][3], test[0][4]);
-          break;
-        case 6:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1], test[0][2],
-              test[0][3], test[0][4], test[0][5]);
-          break;
-        case 7:
-          result = plugin.npnInvokeTest(test[0][0], test[0][1], test[0][2],
-              test[0][3], test[0][4], test[0][5], test[0][6]);
-          break;
-        default:
-          is(false, "bad number of test arguments");
-      }
-      is(result, test[1], "npnInvokeTestFailed: " + plugin.getError());
-      $("verbose").appendChild(
-          createEl("span", null, ((result == test[1] ? "pass" : "fail") + ": " + test[0])));
-      if (result != test[1])
-        $("verbose").appendChild(createEl("span", null, (" " + plugin.getError())));
-      $("verbose").appendChild(createEl("br"));
-    }
-  
-    SimpleTest.finish();
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="100">
-  </embed>
-
-  <div id="verbose">
-  </div>
- </body>
- </html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_npruntime.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_npruntime.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="Basic Plugin Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-async function runTests() {
-  var pluginElement = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement.identifierToStringTest !== undefined,
-                                           "Waited too long for plugin to activate");
-
-  ok(pluginElement.identifierToStringTest('foo') == "foo", "identifierToStringTest failed");
-
-  SimpleTest.finish();
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_object.html firefox-85.0+build1/dom/plugins/test/mochitest/test_object.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_object.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_object.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,513 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Plugin instantiation</title>
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script src="/tests/SimpleTest/SpecialPowers.js"></script>
-    <script type="application/javascript" src="plugin-utils.js"></script>
-    <meta charset="utf-8">
-  <body onload="onLoad()">
-    <script class="testbody" type="text/javascript">
-
-      "use strict";
-      SimpleTest.waitForExplicitFinish();
-
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-
-      // This can go away once embed also is on WebIDL
-      let OBJLC = SpecialPowers.Ci.nsIObjectLoadingContent;
-
-      // Use string modes in this test to make the test easier to read/debug.
-      // nsIObjectLoadingContent refers to this as "type", but I am using "mode"
-      // in the test to avoid confusing with content-type.
-      let prettyModes = {};
-      prettyModes[OBJLC.TYPE_LOADING] = "loading";
-      prettyModes[OBJLC.TYPE_IMAGE] = "image";
-      prettyModes[OBJLC.TYPE_PLUGIN] = "plugin";
-      prettyModes[OBJLC.TYPE_DOCUMENT] = "document";
-      prettyModes[OBJLC.TYPE_NULL] = "none";
-
-      let body = document.body;
-      // A single-pixel white png
-      let testPNG = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3AoIFiETNqbNRQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAACklEQVQIHWP4DwABAQEANl9ngAAAAABJRU5ErkJggg==";
-      // An empty, but valid, SVG
-      let testSVG = 'data:image/svg+xml,<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"></svg>';
-      // executeSoon wrapper to count pending callbacks
-      let pendingCalls = 0;
-      let afterPendingCalls = false;
-
-      function runWhenDone(func) {
-        if (!pendingCalls)
-          func();
-        else
-          afterPendingCalls = func;
-      }
-      function runSoon(func) {
-        pendingCalls++;
-        SimpleTest.executeSoon(function() {
-          func();
-          if (--pendingCalls < 1 && afterPendingCalls)
-            afterPendingCalls();
-        });
-      }
-      function src(obj, state, uri) {
-        // If we have a running plugin, src changing should always throw it out,
-        // even if it causes us to load the same plugin again.
-        if (uri && runningPlugin(obj, state)) {
-          if (!state.oldPlugins)
-            state.oldPlugins = [];
-          try {
-            state.oldPlugins.push(obj.getObjectValue());
-          } catch (e) {
-            ok(false, "Running plugin but cannot call getObjectValue?");
-          }
-        }
-
-        var srcattr;
-        if (state.tagName == "object")
-          srcattr = "data";
-        else if (state.tagName == "embed")
-          srcattr = "src";
-        else
-          ok(false, "Internal test fail: Why are we setting the src of an applet");
-
-        // Plugins should always go away immediately on src/data change
-        state.initialPlugin = false;
-        if (uri === null) {
-          removeAttr(obj, srcattr);
-          // TODO Bug 767631 - we don't trigger loadObject on UnsetAttr :(
-          forceReload(obj, state);
-        } else {
-          setAttr(obj, srcattr, uri);
-        }
-      }
-      // We have to be careful not to reach past the nsObjectLoadingContent
-      // prototype to touch generic element attributes, as this will try to
-      // spawn the plugin, breaking our ability to test for that.
-      function getAttr(obj, attr) {
-        return document.body.constructor.prototype.getAttribute.call(obj, attr);
-      }
-      function setAttr(obj, attr, val) {
-        return document.body.constructor.prototype.setAttribute.call(obj, attr, val);
-      }
-      function hasAttr(obj, attr) {
-        return document.body.constructor.prototype.hasAttribute.call(obj, attr);
-      }
-      function removeAttr(obj, attr) {
-        return document.body.constructor.prototype.removeAttribute.call(obj, attr);
-      }
-      function setDisplayed(obj, display) {
-        if (display)
-          removeAttr(obj, "style");
-        else
-          setAttr(obj, "style", "display: none;");
-      }
-      function displayed(obj) {
-        // Hacky, but that's all we use style for.
-        return !hasAttr(obj, "style");
-      }
-      function actualType(obj, state) {
-        return state.getActualType.call(obj);
-      }
-      function getMode(obj, state) {
-        return prettyModes[state.getDisplayedType.call(obj)];
-      }
-      function runningPlugin(obj, state) {
-        return state.getHasRunningPlugin.call(obj);
-      }
-
-      // TODO this is hacky and might hide some failures, but is needed until
-      // Bug 767635 lands -- which itself will probably mean tweaking this test.
-      function forceReload(obj, state) {
-        let attr;
-        if (state.tagName == "object")
-          attr = "data";
-        else if (state.tagName == "embed")
-          attr = "src";
-
-        if (attr && hasAttr(obj, attr)) {
-          src(obj, state, getAttr(obj, attr));
-        } else if (body.contains(obj)) {
-          body.appendChild(obj);
-        } else {
-          // Out of document nodes without data attributes simply can't be
-          // reloaded currently. Bug 767635
-        }
-      }
-
-// Make a list of combinations of sub-lists, e.g.:
-// [ [a, b], [c, d] ]
-// ->
-// [ [a, c], [a, d], [b, c], [b, d] ]
-function eachList() {
-        let all = [];
-        if (!arguments.length)
-          return all;
-        let list = Array.prototype.slice.call(arguments, 0);
-        for (let c of list[0]) {
-          if (list.length > 1) {
-            for (let x of eachList.apply(this, list.slice(1))) {
-              all.push((c.length ? [c] : []).concat(x));
-            }
-          } else if (c.length) {
-            all.push([c]);
-          }
-        }
-        return all;
-      }
-
-      let states = {
-        svg(obj, state) {
-    removeAttr(obj, "type");
-    src(obj, state, testSVG);
-    state.noChannel = false;
-    state.expectedType = "image/svg";
-    // SVGs are actually image-like subdocuments
-    state.expectedMode = "document";
-  },
-        image(obj, state) {
-    removeAttr(obj, "type");
-    src(obj, state, testPNG);
-    state.noChannel = false;
-    state.expectedMode = "image";
-    state.expectedType = "image/png";
-  },
-        plugin(obj, state) {
-    removeAttr(obj, "type");
-    src(obj, state, "data:application/x-test,foo");
-    state.noChannel = false;
-    state.expectedType = "application/x-test";
-    state.expectedMode = "plugin";
-  },
-        pluginExtension(obj, state) {
-    src(obj, state, "./fake_plugin.tst");
-    state.expectedMode = "plugin";
-    state.pluginExtension = true;
-    state.noChannel = false;
-  },
-        document(obj, state) {
-    removeAttr(obj, "type");
-    src(obj, state, "data:text/plain,I am a document");
-    state.noChannel = false;
-    state.expectedType = "text/plain";
-    state.expectedMode = "document";
-  },
-        fallback(obj, state) {
-    removeAttr(obj, "type");
-    state.expectedType = "application/x-unknown";
-    state.expectedMode = "none";
-    state.noChannel = true;
-    src(obj, state, null);
-  },
-        addToDoc(obj, state) {
-    body.appendChild(obj);
-  },
-        removeFromDoc(obj, state) {
-    if (body.contains(obj))
-      body.removeChild(obj);
-  },
-        // Set the proper type
-        setType(obj, state) {
-    if (state.expectedType) {
-      state.badType = false;
-      setAttr(obj, "type", state.expectedType);
-      forceReload(obj, state);
-    }
-  },
-        // Set an improper type
-        setWrongType(obj, state) {
-    // This should break no-channel-plugins but nothing else
-    state.badType = true;
-    setAttr(obj, "type", "application/x-unknown");
-    forceReload(obj, state);
-  },
-        // Set a plugin type
-        setPluginType(obj, state) {
-    // If an object/embed has a type set to a plugin type, it should not
-    // use the channel type.
-    state.badType = false;
-    setAttr(obj, "type", "application/x-test");
-    state.expectedType = "application/x-test";
-    state.expectedMode = "plugin";
-    forceReload(obj, state);
-  },
-        noChannel(obj, state) {
-    src(obj, state, null);
-    state.noChannel = true;
-    state.pluginExtension = false;
-  },
-        displayNone(obj, state) {
-    setDisplayed(obj, false);
-  },
-        displayInherit(obj, state) {
-    setDisplayed(obj, true);
-  },
-      };
-
-      // eslint-disable-next-line complexity
-      function testObject(obj, state) {
-        // If our test combination both sets noChannel but no explicit type
-        // it shouldn't load ever.
-        let expectedMode = state.expectedMode;
-        let actualMode = getMode(obj, state);
-
-        if (state.noChannel && !getAttr(obj, "type")) {
-          // Some combinations of test both set no type and no channel. This is
-          // worth testing with the various combinations, but shouldn't load.
-          expectedMode = "none";
-        }
-
-        // Embed tags should always try to load a plugin by type or extension
-        // before falling back to opening a channel. See bug 803159
-        if (state.tagName == "embed" &&
-            (getAttr(obj, "type") == "application/x-test" || state.pluginExtension)) {
-          state.noChannel = true;
-        }
-
-        // with state.loading, unless we're loading with no channel, these types
-        // should still be in loading state pending a channel.
-        if (state.loading && (expectedMode == "image" || expectedMode == "document" ||
-                             (expectedMode == "plugin" && !state.initialPlugin && !state.noChannel))) {
-          expectedMode = "loading";
-        }
-
-        // With the exception of plugins with a proper type, nothing should
-        // load without a channel
-        if (state.noChannel && (expectedMode != "plugin" || state.badType) &&
-            body.contains(obj)) {
-          expectedMode = "none";
-        }
-
-        // embed tags should reject documents, except for SVG images which
-        // render as such
-        if (state.tagName == "embed" && expectedMode == "document" &&
-            actualType(obj, state) != "image/svg+xml") {
-          expectedMode = "none";
-        }
-
-        // Embeds with a plugin type should skip opening a channel prior to
-        // loading, taking only type into account.
-        if (state.tagName == "embed" && getAttr(obj, "type") == "application/x-test" &&
-            body.contains(obj)) {
-          expectedMode = "plugin";
-        }
-
-        if (!body.contains(obj)
-            && (!state.loading || expectedMode != "image")
-            && (!state.initialPlugin || expectedMode != "plugin")) {
-          // Images are handled by nsIImageLoadingContent so we dont track
-          // their state change as they're detached and reattached. All other
-          // types switch to state "loading", and are completely unloaded
-          expectedMode = "loading";
-        }
-
-        is(actualMode, expectedMode, "check loaded mode");
-
-        // If we're a plugin, check that we spawned successfully. state.loading
-        // is set if we haven't had an event loop since applying state, in which
-        // case the plugin would not have stopped yet if it was initially a
-        // plugin.
-        let shouldBeSpawnable = expectedMode == "plugin" && displayed(obj);
-        let shouldSpawn = shouldBeSpawnable && (!state.loading || state.initialPlugin);
-        let didSpawn = runningPlugin(obj, state);
-        is(didSpawn, !!shouldSpawn, "check plugin spawned is " + !!shouldSpawn);
-
-        // If we are a plugin, scripting should work. If we're not spawned we
-        // should spawn synchronously.
-        let scripted = false;
-        try {
-          obj.getObjectValue();
-          scripted = true;
-        } catch (e) {}
-        is(scripted, shouldBeSpawnable, "check plugin scriptability");
-
-        // If this tag previously had other spawned plugins, make sure it
-        // respawned between then and now
-        if (state.oldPlugins && didSpawn) {
-          let didRespawn = false;
-          for (let oldp of state.oldPlugins) {
-            // If this returns false or throws, it's not the same plugin
-            try {
-              didRespawn = !obj.checkObjectValue(oldp);
-            } catch (e) {
-              didRespawn = true;
-            }
-          }
-          is(didRespawn, true, "Plugin should have re-spawned since old state (" + state.oldPlugins.length + ")");
-        }
-      }
-
-      let total = 0;
-      let test_modes = {
-        // Just apply from_state then to_state
-        "immediate": function(obj, from_state, to_state, state) {
-          for (let from of from_state)
-            states[from](obj, state);
-          for (let to of to_state)
-            states[to](obj, state);
-
-          // We don't spin the event loop between applying to_state and
-          // running tests, so some types are still loading
-          state.loading = true;
-          info("[" + (++total) + "] Testing [ " + from_state + " ] -> [ " + to_state + " ] / " + state.tagName + " / immediate");
-          testObject(obj, state);
-
-          if (body.contains(obj))
-            body.removeChild(obj);
-        },
-        // Apply states, spin event loop, run tests.
-        "cycle": function(obj, from_state, to_state, state) {
-          for (let from of from_state)
-            states[from](obj, state);
-          for (let to of to_state)
-            states[to](obj, state);
-          // Because re-appending to the document creates a script blocker, but
-          // plugins spawn asynchronously, we need to return to the event loop
-          // twice to ensure the plugin has been given a chance to lazily spawn.
-          runSoon(function() {
- runSoon(function() {
-            info("[" + (++total) + "] Testing [ " + from_state + " ] -> [ " + to_state + " ] / " + state.tagName + " / cycle");
-            testObject(obj, state);
-
-            if (body.contains(obj))
-              body.removeChild(obj);
-          });
-});
-        },
-        // Apply initial state, spin event loop, apply final state, spin event
-        // loop again.
-        "cycleboth": function(obj, from_state, to_state, state) {
-          for (let from of from_state) {
-            states[from](obj, state);
-          }
-          runSoon(function() {
-            for (let to of to_state) {
-              states[to](obj, state);
-            }
-            // Because re-appending to the document creates a script blocker,
-            // but plugins spawn asynchronously, we need to return to the event
-            // loop twice to ensure the plugin has been given a chance to lazily
-            // spawn.
-            runSoon(function() {
- runSoon(function() {
-              info("[" + (++total) + "] Testing [ " + from_state + " ] -> [ " + to_state + " ] / " + state.tagName + " / cycleboth");
-              testObject(obj, state);
-
-              if (body.contains(obj))
-                body.removeChild(obj);
-            });
-});
-          });
-        },
-        // Apply initial state, spin event loop, apply later state, test
-        // immediately
-        "cyclefirst": function(obj, from_state, to_state, state) {
-          for (let from of from_state) {
-            states[from](obj, state);
-          }
-          runSoon(function() {
-            state.initialPlugin = runningPlugin(obj, state);
-            for (let to of to_state) {
-              states[to](obj, state);
-            }
-            info("[" + (++total) + "] Testing [ " + from_state + " ] -> [ " + to_state + " ] / " + state.tagName + " / cyclefirst");
-            // We don't spin the event loop between applying to_state and
-            // running tests, so some types are still loading
-            state.loading = true;
-            testObject(obj, state);
-
-            if (body.contains(obj))
-              body.removeChild(obj);
-          });
-        },
-      };
-
-      function test(testdat) {
-        // FIXME bug 1291854: Change back to lets when the test is fixed.
-        for (var from_state of testdat.from_states) {
-          for (var to_state of testdat.to_states) {
-            for (var mode of testdat.test_modes) {
-              for (var type of testdat.tag_types) {
-                runSoon(function() {
-                  let obj = document.createElement(type);
-                  obj.width = 1; obj.height = 1;
-                  let state = {};
-                  state.noChannel = true;
-                  state.tagName = type;
-                  // Part of the test checks whether a plugin spawned or not,
-                  // but touching the object prototype will attempt to
-                  // synchronously spawn a plugin!  We use this terrible hack to
-                  // get a privileged getter for the attributes we want to touch
-                  // prior to applying any attributes.
-                  // TODO when embed goes away we wont need to check for
-                  //      QueryInterface any longer.
-                  var lookup_on = obj.QueryInterface ? obj.QueryInterface(OBJLC) : obj;
-                  state.getDisplayedType = SpecialPowers.do_lookupGetter(lookup_on, "displayedType");
-                  state.getHasRunningPlugin = SpecialPowers.do_lookupGetter(lookup_on, "hasRunningPlugin");
-                  state.getActualType = SpecialPowers.do_lookupGetter(lookup_on, "actualType");
-                  test_modes[mode](obj, from_state, to_state, state);
-                });
-              }
-            }
-          }
-        }
-      }
-
-      function onLoad() {
-        // Generic tests
-        test({
-          "tag_types": [ "embed", "object" ],
-          // In all three modes
-          "test_modes": [ "immediate", "cycle", "cyclefirst", "cycleboth" ],
-          // Starting from a blank tag in and out of the document, a loading
-          // plugin, and no-channel plugin (initial types only really have
-          // odd cases with plugins)
-          "from_states": [
-            [ "addToDoc" ],
-            [ "plugin" ],
-            [ "plugin", "addToDoc" ],
-            [ "plugin", "noChannel", "setType", "addToDoc" ],
-            [],
-          ],
-          // To various combinations of loaded objects
-          "to_states": eachList(
-            [ "svg", "image", "plugin", "document", "" ],
-            [ "setType", "setWrongType", "setPluginType", "" ],
-            [ "noChannel", "" ],
-            [ "displayNone", "displayInherit", "" ]
-          )});
-        // Special case test for embed tags with plugin-by-extension
-        // TODO object tags should be tested here too -- they have slightly
-        //      different behavior, but waiting on a file load requires a loaded
-        //      event handler and wont work with just our event loop spinning.
-        test({
-          "tag_types": [ "embed" ],
-          "test_modes": [ "immediate", "cyclefirst", "cycle", "cycleboth" ],
-          "from_states": eachList(
-            [ "svg", "plugin", "image", "document" ],
-            [ "addToDoc" ]
-          ),
-          // Set extension along with valid ty
-          "to_states": [
-            [ "pluginExtension" ],
-          ]});
-        // Test plugin add/remove from document with adding/removing frame, with
-        // and without a channel.
-        test({
-          "tag_types": [ "embed", "object" ], // Ideally we'd test object too, but this gets exponentially long.
-          "test_modes": [ "immediate", "cyclefirst", "cycle" ],
-          "from_states": [ [ "displayNone", "plugin", "addToDoc" ],
-                           [ "displayNone", "plugin", "noChannel", "addToDoc" ],
-                           [ "plugin", "noChannel", "addToDoc" ],
-                           [ "plugin", "noChannel" ] ],
-          "to_states": eachList(
-            [ "displayNone", "" ],
-            [ "removeFromDoc" ],
-            [ "image", "displayNone", "" ],
-            [ "image", "displayNone", "" ],
-            [ "addToDoc" ],
-            [ "displayInherit" ]
-          )});
-        runWhenDone(() => SimpleTest.finish());
-      }
-    </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_painting.html firefox-85.0+build1/dom/plugins/test/mochitest/test_painting.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_painting.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_painting.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for windowless plugin invalidation and expose events in clips</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <style>
-    div#container {
-      position: relative;
-      height: 30px;
-      background: blue;
-    }
-    div#clip {
-      overflow:hidden;
-      position:absolute;
-      left: 10.3px;
-      top: 9.7px;
-      width: 10px;
-      height: 0px;
-      background: red;
-    }
-    embed {
-      position:absolute;
-    }
-    embed#paint-waiter {
-      top: 0px;
-      left: 0px;
-      width: 1px;
-      height: 0px;
-    }
-    embed#clipped {
-      left: -5.3px;
-      top: -4.7px;
-      width: 20px;
-      height: 20px;
-    }
-  </style>
-</head>
-<body onload="initialize()">
-
-<script type="application/javascript" src="plugin-utils.js"></script>
-<script type="application/javascript">
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-var paint_waiter;
-var clip;
-var clipped;
-
-function initialize() {
-  paint_waiter = document.getElementById("paint-waiter");
-  clip = document.getElementById("clip");
-  clipped = document.getElementById("clipped");
-
-  waitForPaint(show);
-}
-
-function show() {
-  paintCountIs(clipped, 0, "fully clipped plugin not painted");
-
-  clip.style.height = "10px";
-
-  // Capturing an image (as in a reftest) would force a repaint and use
-  // different paths for the image surface, so instead check the plugin's
-  // paint count.
-  waitForPaint(invalidate);
-}
-
-function invalidate() {
-  paintCountIs(clipped, 1, "partially clipped plugin painted once");
-
-  clipped.setColor("FF00FF00"); // plugin invalidates
-
-  waitForPaint(done);
-}
-
-function done() {
-  paintCountIs(clipped, 2, "painted after invalidate");
-
-  SimpleTest.finish();
-}
-
-function waitForPaint(func) {
-  paint_waiter.last_paint_count = paint_waiter.getPaintCount();
-  // Ensure the waiter has had a style change, so that this will
-  // change its size and cause a paint.
-  paint_waiter.style.backgroundColor = paint_waiter.style.backgroundColor == "blue" ? "yellow" : "blue";
-  // eslint-disable-next-line no-unused-vars
-  var flush = paint_waiter.offsetHeight;
-  paint_waiter.style.height = "1px";
-  waitForPaintHelper(func);
-}
-
-function waitForPaintHelper(func) {
-  if (paint_waiter.getPaintCount() != paint_waiter.last_paint_count) {
-    // hide the paint waiter
-    paint_waiter.style.height = "0px";
-    setTimeout(func, 0);
-    return;
-  }
-  setTimeout(function() { waitForPaintHelper(func); }, 1000);
-}
-
-</script>
-
-<p id="display"></p>
-<div id="container">
-  <embed id="paint-waiter" type="application/x-test"/>
-  <div id="clip">
-    <embed id="clipped" type="application/x-test"
-           drawmode="solid" color="FF808080"/>
-  </div>
-</div>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_plugin_fallback_focus.html firefox-85.0+build1/dom/plugins/test/mochitest/test_plugin_fallback_focus.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_plugin_fallback_focus.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_plugin_fallback_focus.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Test that plugins reject focus</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"/>
+</head>
+<body>
+<div id="content">
+	<object id="obj_elt" type="application/x-shockwave-flash"></object>
+	<object tabindex='0' id="obj_elt_with_idx" type="application/x-shockwave-flash"></object>
+	<embed id="embed_elt" type="application/x-shockwave-flash"></embed>
+</div>
+<script type="application/javascript">
+var objElt = document.getElementById('obj_elt');
+var objEltWithIdx = document.getElementById('obj_elt_with_idx');
+var embedElt = document.getElementById('embed_elt');
+
+function checkHasFocus(expected, typeOfElts, elt) {
+	ok((document.activeElement == elt) == expected,
+		typeOfElts + " element should " + (expected ? "" : "not ") + "accept focus");
+}
+
+function checkNoneHasFocus(typeOfElts) {
+	checkHasFocus(false, typeOfElts + " <object>", objElt);
+	checkHasFocus(false, typeOfElts + " <object> with tabindex", objEltWithIdx);
+	checkHasFocus(false, typeOfElts + " <embed>", embedElt);
+}
+
+function checkFocusable(expected, typeOfElts, elt) {
+	elt.focus();
+	checkHasFocus(expected, typeOfElts, elt);
+}
+
+// As plugins, object and embed elements are not given focus
+ok(objElt != null, "object element should exist");
+ok(objEltWithIdx != null, "object element with tabindex should exist");
+ok(embedElt != null, "embed element should exist");
+
+// As plugins, obj/embed_elt can not take focus
+checkNoneHasFocus("plugin");
+
+// Switch obj/embed_elt attributes from plugin to image
+objElt.data = "large-pic.jpg";
+objElt.width = 100;
+objElt.height = 100;
+objElt.type = "image/jpg";
+objEltWithIdx.data = "large-pic.jpg";
+objEltWithIdx.width = 100;
+objEltWithIdx.height = 100;
+objEltWithIdx.type = "image/jpg";
+embedElt.src = "large-pic.jpg";
+embedElt.width = 100;
+embedElt.height = 100;
+embedElt.type = "image/jpg";
+
+// As images, obj/embed_elt can take focus as image
+// object image elements require a tabindex to accept focus. 
+// embed elements must be reparented before new type is recognized.
+checkFocusable(false, "<object> image", objElt);
+checkFocusable(true, "<object> image with tabindex", objEltWithIdx);
+checkFocusable(false, "<embed> plugin with image attribs before reparenting", embedElt);
+embedElt.parentNode.appendChild(embedElt);
+checkFocusable(true, "<embed> image", embedElt);
+
+// Switch obj/embed_elt attributes from image to plugin
+objElt.type = "application/x-shockwave-flash";
+embedElt.type = "application/x-shockwave-flash";
+
+// embed elements must be reparented before new type is recognized.
+checkFocusable(true, "<embed> image with plugin attribs", embedElt);
+embedElt.parentNode.appendChild(embedElt);
+checkNoneHasFocus("plugin");
+</script>
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_err.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_err.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_err.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_err.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=517078
-
-Tests for plugin stream error conditions.
--->
-<head>
-  <title>NPAPI Stream Error Tests</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="startTests()">
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=517078">
-  Mozilla Bug 517078</a> - Plugin Stream Error Tests
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<div id="test">
-<script class="testbody" type="text/javascript">
-// //
-// These tests verify that nothing "bad" happens when a plugin returns an
-// error from one of the NPP_ stream functions.  "Bad" is defined here
-// as the plugin being terminated, or NPP_ stream functions being
-// called inappropriately by the browser after the plugin has returned
-// a stream error.
-//
-
-function $(id) { return document.getElementById(id); }
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-
-var tests = [
-  {
-    "src": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_newstream",
-    "failurecode": "1",
-    "frame": "testframe",
-  },
-  {
-    "src": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_newstream",
-    "failurecode": "3",
-    "frame": "testframe",
-  },
-  {
-    "src": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_newstream",
-    "failurecode": "5",
-    "frame": "testframe",
-  },
-  {
-    "geturl": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_newstream",
-    "failurecode": "1",
-    "frame": "testframe",
-  },
-  {
-    "src": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_write",
-    "frame": "testframe",
-  },
-  {
-    "src": "loremipsum.txt",
-    "streammode": "asfile",
-    "functiontofail": "npp_write",
-    "frame": "testframe",
-  },
-  {
-    "src": "loremipsum.txt",
-    "streammode": "normal",
-    "functiontofail": "npp_destroystream",
-    "failurecode": "1",
-    "frame": "testframe",
-  },
-];
-
-function iframeonload(evt) {
-  // We have to use SpecialPowers because nptest.cpp prepends
-  // data: whichs makes the frame cross origin with the including page.
-  var wrappedDoc = SpecialPowers.wrap(evt.target).contentDocument;
-  var contentLength = wrappedDoc.body.innerHTML.length;
-  var plugin = gTestWindow.document.getElementById("embedtest");
-  var functionToFail = plugin.getAttribute("functiontofail");
-  if (contentLength > 0) {
-    is(wrappedDoc.body.innerHTML, "pass",
-      "test frame has unexpected content");
-    setTimeout(function() {
-      // This verifies that the plugin hasn't been unloaded, and that
-      // no calls to NPP_ functions have been made unexpectedly.
-      is(plugin.getError(), "pass", "plugin reported an error");
-      gTestWindow.close();
-      setTimeout(runNextTest, 10);
-    }, functionToFail == "npp_newstream" ? 500 : 10);
-  }
-}
-
-var index = 0;
-var gTestWindow;
-function runNextTest() {
-  if (index == tests.length * 2) {
-    SimpleTest.finish();
-    return;
-  }
-
-  gTestWindow = window.open("plugin_window.html",
-                            "",
-                            "width=620,height=320");
-}
-
-function continueTest() {
-  // We run each test as an embed and an object, as their initial stream
-  // handling differs.
-  var tag = index % 2 ? "embed" : "object";
-  var test = tests[Math.floor(index / 2)];
-
-  var p = gTestWindow.document.createElement("p");
-  p.textContent = "Plugin Stream Test " + Number(index);
-  gTestWindow.document.getElementById("test").appendChild(p);
-
-  if (test.frame) {
-    var iframe = gTestWindow.document.createElement("iframe");
-    iframe.name = test.frame;
-    iframe.onload = iframeonload;
-    gTestWindow.document.getElementById("test").appendChild(iframe);
-  }
-
-  var plugin = gTestWindow.document.createElement(tag);
-  plugin.setAttribute("id", "embedtest");
-  plugin.setAttribute("style", "width: 400px; height: 100px;");
-  plugin.setAttribute("type", "application/x-test");
-  for (var name in test) {
-    if (tag == "embed") {
-      plugin.setAttribute(name, test[name]);
-    } else if (name == "src") {
-      plugin.setAttribute("data", test[name]);
-    } else {
-      var param = document.createElement("param");
-      param.name = name;
-      param.value = test[name];
-      plugin.appendChild(param);
-    }
-  }
-  gTestWindow.document.getElementById("test").appendChild(plugin);
-
-  gTestWindow.document.getElementById("test")
-                      .appendChild(document.createElement("br"));
-
-  index++;
-}
-
-function startTests() {
-  SpecialPowers.pushPrefEnv({"set": [
-    ["security.data_uri.block_toplevel_data_uri_navigations", false],
-  ]}, runNextTest);
-}
-
-</script>
-</div>
-</body>
-</html>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_post.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_post.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_post.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_post.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<html>
-<head>
-  <title>NPAPI NPN_PostURL NPStream Test</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" 
-          src="pluginstream.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-
-  <iframe id="testframe" name="testframe" onload="frameLoaded()"></iframe>
-
-  <!--
-   - In this test, a stream is sent to the plugin via NPP_NewStream, 
-   - NP_NORMAL.  When the stream is destroyed, the plugin posts the
-   - stream content to post.sjs via NPN_PostURL, with a frame specified
-   - to display the post's response.  Post.sjs just reflects
-   - the body of the post back in the HTTP response, so the original
-   - stream content should end up being displayed in the frame.   
-   -->
-  <embed src="loremipsum.txt" streammode="normal"
-         frame="testframe" posturl="post.sjs" postmode="frame"
-         id="embedtest" style="width: 400px; height: 100px;"
-         type="application/x-test"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_poststream.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_poststream.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_poststream.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_poststream.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<html>
-<head>
-  <title>NPAPI NPN_PostURL NPStream Test</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" 
-          src="pluginstream.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-
-  <iframe id="testframe" name="testframe" onload="frameLoaded()"></iframe>
-
-  <!--
-   - Same as test_pluginstream_post.html, except NULL is passed to NPN_PostURL
-   - as the frame parameter, so the HTTP response to the post is passed to the
-   - plugin via NPP_NewStream. Once this stream is received, it's displayed
-   - in a frame in the browser via a call to NPN_GetURL.
-   -->
-  <embed src="loremipsum.txt" streammode="normal"
-         frame="testframe" posturl="post.sjs" postmode="stream"
-         id="embedtest" style="width: 400px; height: 100px;"
-         type="application/x-test"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_referer.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_referer.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_referer.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_referer.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-<head>
-  <title>Do plugin stream requests send the Referer header correctly?</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var pending = 3;
-  function testDone() {
-    --pending;
-    if (0 == pending)
-      SimpleTest.finish();
-  }
-
-  function runTests() {
-    var p = document.getElementById("plugin1");
-    var p2 = document.getElementById("plugin2");
-
-    ok(p.streamTest("plugin-stream-referer.sjs", false, null, null,
-                    function(r, t) {
-                      is(r, 0, "GET plugin-stream-referer.sjs");
-                      is(t, "Referer found: " + window.location,
-                         "GET Referer correct");
-                      testDone();
-                    }, null, true), "referer GET");
-
-    ok(p.streamTest("plugin-stream-referer.sjs", true, "Dummy Data", null,
-                    function(r, t) {
-                      is(r, 0, "POST plugin-stream-referer.sjs");
-                      is(t, "No Referer found", "POST Referer absent");
-                      testDone();
-                    }, null, true), "referer POST");
-
-    ok(p2.streamTest("plugin-stream-referer.sjs", false, null, null,
-                     function(r, t) {
-                       is(r, 0, "GET plugin-stream-referer.sjs (2)");
-                       var expectedreferer = String(window.location).replace("test_pluginstream_referer.html", "loremipsum.xtest");
-                       is(t, "Referer found: " + expectedreferer,
-                          "GET Referer correct with plugin src");
-                       testDone();
-                     }, null, true), "referer GET (2)");
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-  <embed id="plugin2" type="application/x-test" src="loremipsum.xtest" width="200" height="200"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src_dynamic.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<html>
-<head>
-  <title>NPAPI src="" NPStream Test</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" 
-          src="pluginstream.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-
-  <iframe id="testframe" name="testframe" onload="frameLoaded()"></iframe>
-
-  <!--
-   - A stream is sent to the browser via NPP_NewStream, NP_NORMAL.
-   - The plugin reports that data can only be sent to it in 100-byte
-   - chunks.  When NPP_DestroyStream is called, the plugin sends the stream
-   - content back to the browser by passing it as a data: url to
-   - NPN_GetURL, using a frame, so that the stream content should 
-   - be displayed in the frame in the browser.
-   -
-   - We create the object element dynamically, which in some cases has caused us to deliver the data=""
-   - stream twice. This verifies that we only deliver the data="" stream once.
-   -->
-
-  <script type="text/javascript">
-    var e = document.createElement("object");
-    e.setAttribute("data", "loremipsum.xtest");
-    e.setAttribute("type", "application/x-test");
-    e.setAttribute("streammode", "normal");
-    e.setAttribute("streamchunksize", "100");
-    e.setAttribute("frame", "testframe");
-    e.setAttribute("style", "width: 400px; height: 100px;");
-    document.body.appendChild(e);
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<html>
-<head>
-  <title>NPAPI src="" NPStream Test</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" 
-          src="pluginstream.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  <p id="display"></p>
-
-  <iframe id="testframe" name="testframe" onload="frameLoaded()"></iframe>
-
-  <!--
-   - A stream is sent to the browser via NPP_NewStream, NP_NORMAL.
-   - The plugin reports that data can only be sent to it in 100-byte
-   - chunks.  When NPP_DestroyStream is called, the plugin sends the stream
-   - content back to the browser by passing it as a data: url to
-   - NPN_GetURL, using a frame, so that the stream content should 
-   - be displayed in the frame in the browser.
-   -->
-  <embed src="loremipsum.txt" streammode="normal"
-         streamchunksize="100" frame="testframe"
-         id="embedtest" style="width: 400px; height: 100px;"
-         type="application/x-test"></embed>
-</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src_referer.html firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src_referer.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_pluginstream_src_referer.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_pluginstream_src_referer.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<head>
-  <title>Do plugin stream src requests send the Referer header correctly?</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-
-<body>
-  <p id="display"></p>
-
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  function frameLoaded() {
-    var testframe = document.getElementById("pluginframe");
-    // We have to use SpecialPowers because nptest.cpp prepends
-    // data: whichs makes the frame cross origin with the including page.
-    var wrappedDoc = SpecialPowers.wrap(testframe).contentDocument;
-    var content = wrappedDoc.body.innerHTML;
-    if (!content.length)
-      return;
-
-    is(content, "Referer found: " + window.location);
-    SimpleTest.finish();
-  }
-  </script>
-
-  <iframe name="pluginframe" id="pluginframe" onload="frameLoaded()"></iframe>
-
-  <embed id="plugin" type="application/x-test" src="plugin-stream-referer.sjs" width="200" height="200" frame="pluginframe"></embed>
-
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html firefox-85.0+build1/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_plugin_tag_clicktoplay.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta><charset="utf-8"/>
-    <title>Test Modifying Plugin click-to-play Flag</title>
-    <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="application/javascript" src="plugin-utils.js"></script>
-  </head>
-  <body>
-    <script class="testbody" type="application/javascript">
-      const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-      var pluginHost = Cc["@mozilla.org/plugin/host;1"]
-                       .getService(Ci.nsIPluginHost);
-
-      var testPlugin = getTestPlugin();
-      var secondTestPlugin = getTestPlugin("Second Test Plug-in");
-      ok(testPlugin, "Should have Test Plug-in");
-      ok(secondTestPlugin, "Should have Second Test Plug-in");
-
-      // make sure both start off as click-to-play
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Second Test Plug-in");
-
-      testPlugin.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-      is(pluginHost.getStateForType("application/x-test"), Ci.nsIPluginTag.STATE_ENABLED, "click-to-play should be off for Test Plug-in now");
-      is(pluginHost.getStateForType("application/x-second-test"), Ci.nsIPluginTag.STATE_CLICKTOPLAY, "click-to-play should still be on for the Second Test Plug-in");
-
-      testPlugin.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-      is(pluginHost.getStateForType("application/x-test"), Ci.nsIPluginTag.STATE_CLICKTOPLAY, "click-to-play should be on for Test Plug-in now");
-    </script>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xhtml	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_privatemode_perwindowpb.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="NPAPI Private Mode Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script src="chrome://mochikit/content/chrome-harness.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTestsCallback()">
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-<embed id="plugin2" type="application/x-test" width="200" height="200"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-
-function whenDelayedStartupFinished(aWindow, aCallback) {
-  Services.obs.addObserver(function observer(aSubject, aTopic) {
-    if (aWindow == aSubject) {
-      Services.obs.removeObserver(observer, aTopic);
-      SimpleTest.executeSoon(aCallback);
-    }
-  }, "browser-delayed-startup-finished");
-}
-
-async function runTestsCallback() {
-  var pluginElement1 = document.getElementById("plugin1");
-  var pluginElement2 = document.getElementById("plugin2");
-
-  await SimpleTest.promiseWaitForCondition(() => pluginElement1.queryPrivateModeState !== undefined,
-                                           "Waited too long for plugin to activate");
-  await SimpleTest.promiseWaitForCondition(() => pluginElement2.queryPrivateModeState !== undefined,
-                                           "Waited too long for plugin to activate");
-
-
-  var state1 = false;
-  var state2 = false;
-  var exceptionThrown = false;
-
-  try {
-    state1 = pluginElement1.queryPrivateModeState();
-    state2 = pluginElement2.queryPrivateModeState();
-  } catch (e) {
-    exceptionThrown = true;
-  }
-  is(exceptionThrown, false, "Exception thrown getting private mode state.");
-  is(state1, false, "Browser returned incorrect private mode state.");
-  is(state2, false, "Browser returned incorrect private mode state.");
-
-  // open a window with private mode and get the references of the elements.
-  var mainWindow = window.browsingContext.topChromeWindow;
-  var contentPage = getRootDirectory(window.location.href) + "privatemode_perwindowpb.xhtml";
-
-  function testOnWindow(aIsPrivate, aCallback) {
-    var win = mainWindow.OpenBrowserWindow({private: aIsPrivate});
-    whenDelayedStartupFinished(win, function () {
-      win.addEventListener("DOMContentLoaded", function onInnerLoad() {
-        if (win.content.location.href == "about:privatebrowsing") {
-          BrowserTestUtils.loadURI(win.gBrowser, contentPage)
-          return;
-        }
-        win.removeEventListener("DOMContentLoaded", onInnerLoad, true);
-        win.gBrowser.selectedBrowser.focus();
-        SimpleTest.executeSoon(function() { aCallback(win); });
-      }, true);
-      SimpleTest.executeSoon(function() { BrowserTestUtils.loadURI(win.gBrowser, contentPage); });
-    });
-  }
-
-  testOnWindow(true, function(aWin) {
-    pluginElement1 = aWin.gBrowser.contentDocument.getElementById("plugin1");
-    pluginElement2 = aWin.gBrowser.contentDocument.getElementById("plugin2");
-
-    var officialState1, officialState2;
-    try {
-      officialState1 = pluginElement1.queryPrivateModeState();
-      officialState2 = pluginElement2.queryPrivateModeState();
-    } catch (e) {
-      exceptionThrown = true;
-    }
-    is(exceptionThrown, false, "Exception thrown getting private mode state.");
-    is(officialState1, true, "Querying private mode reported incorrectly");
-    is(officialState2, true, "Querying private mode reported incorrectly");
-
-    aWin.close();
-
-    pluginElement1 = document.getElementById("plugin1");
-
-    SimpleTest.finish();
-  });
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_propertyAndMethod.html firefox-85.0+build1/dom/plugins/test/mochitest/test_propertyAndMethod.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_propertyAndMethod.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_propertyAndMethod.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-<html>
-  <head>
-    <title>NPObject with property and method with the same name</title>
-
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="plugin-utils.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  </head>
-
-  <body onload="run()">
-
-    <script class="testbody" type="application/javascript">
-      if (typeof Object.getPrototypeOf !== "function") {
-        if (typeof"test".__proto__ === "object") {
-          Object.getPrototypeOf = function(object) {
-            return object.__proto__;
-          };
-        } else {
-          Object.getPrototypeOf = function(object) {
-            // May break if the constructor has been tampered with
-            return object.constructor.prototype;
-          };
-        }
-      }
-
-      SimpleTest.waitForExplicitFinish();
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-      function run() {
-        var plugin = document.getElementById("plugin");
-        var pluginProto = Object.getPrototypeOf(plugin);
-
-        delete pluginProto.propertyAndMethod;
-        ok(isNaN(plugin.propertyAndMethod + 0), "Shouldn't be set yet!");
-
-        plugin.propertyAndMethod = 5;
-        is(+plugin.propertyAndMethod, 5, "Should be set to 5!");
-
-        delete pluginProto.propertyAndMethod;
-        ok(isNaN(plugin.propertyAndMethod + 0), "Shouldn't be set any more!");
-
-        var res = plugin.propertyAndMethod();
-        is(res, 5, "Method invocation should return 5!");
-
-        SimpleTest.finish();
-      }
-    </script>
-
-    <embed id="plugin" type="application/x-test" wmode="window"></embed>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_queryCSSZoomFactor.html firefox-85.0+build1/dom/plugins/test/mochitest/test_queryCSSZoomFactor.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_queryCSSZoomFactor.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_queryCSSZoomFactor.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-<html>
-  <head>
-    <title>NPAPI NPNVcontentsScaleFactor Test</title>
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="application/javascript" src="plugin-utils.js"></script>
-  </head>
-
-  <body onload="runTests()">
-    <script class="testbody" type="application/javascript">
-     SimpleTest.waitForExplicitFinish();
-     setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-     function checkZoomFactor(zoomFactor, expectedValue) {
-       // Done as if/ok instead of is() so we don't spam test results
-       if (isNaN(zoomFactor)) {
-         ok(false, "Return should be valid when getting CSS zoom factor");
-       }
-       return (expectedValue - zoomFactor) < 0.00001;
-     }
-
-     function testZoom() {
-       var pluginElement = document.getElementById("plugin");
-       // setTimeout loop on value checks, as zoom value updates can take some
-       // time and we don't have a good event to listen for.
-       if (!checkZoomFactor(pluginElement.queryCSSZoomFactorGetValue(), 2.0) ||
-           !checkZoomFactor(pluginElement.queryCSSZoomFactorSetValue(), 2.0)) {
-         setTimeout(testZoom, 0);
-         return;
-       }
-       ok(true, "Zoom values set to 2.0 as expected");
-       // set back to 1 when we're done otherwise later tests can fail
-       SpecialPowers.setFullZoom(window, 1.0);
-       SimpleTest.finish();
-     }
-
-     function runTests() {
-       var pluginElement = document.getElementById("plugin");
-       // Don't check SetValue yet, needs to happen after zoom has been explicitly set.
-       ok(checkZoomFactor(pluginElement.queryCSSZoomFactorGetValue(), 1.0), "Zoom values set to 1.0 as expected");
-       SpecialPowers.setFullZoom(window, 2.0);
-       // Check for new zoom value sometime after we've spun event loop to repaint.
-       setTimeout(testZoom, 0);
-     }
-    </script>
-
-    <embed id="plugin" type="application/x-test" width="400" height="400"></embed>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_redirect_handling.html firefox-85.0+build1/dom/plugins/test/mochitest/test_redirect_handling.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_redirect_handling.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_redirect_handling.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<html>
-<head>
-  <title>Basic NPAPI Redirect Handling</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    var p = null;
-
-    var redirectingURL = "307-xo-redirect.sjs";
-    var redirectTargetURL = "http://example.org/tests/dom/plugins/test/mochitest/loremipsum.txt";
-
-    var expectedWriteURL = "";
-    var expectedNotifyStatus = -1;
-
-    function redirectCallback(url, httpStatus) {
-      is(url, redirectTargetURL, "Test for expected redirect notify URL.");
-      is(httpStatus, 307, "Test for expected http redirect status.");
-    }
-
-    function writeCallback(url) {
-      is(url, expectedWriteURL, "Test for expected stream write URL.");
-    }
-
-    function notifyCallback(status, data) {
-      is(status, expectedNotifyStatus, "Test for expected stream notification status.");
-      runNextTest();
-    }
-
-    function test1() {
-      expectedWriteURL = "";
-      expectedNotifyStatus = 2;
-
-      p.streamTest(redirectingURL, false, null, writeCallback, notifyCallback, redirectCallback, false);
-    }
-
-    function test2() {
-      expectedWriteURL = redirectTargetURL;
-      expectedNotifyStatus = 0;
-
-      p.streamTest(redirectingURL, false, null, writeCallback, notifyCallback, redirectCallback, true);
-    }
-
-    var tests = [test1, test2];
-    var currentTest = -1;
-    function runNextTest() {
-      currentTest++;
-      if (currentTest < tests.length) {
-        tests[currentTest]();
-      } else {
-        SimpleTest.finish();
-      }
-    }
-
-    function runTests() {
-      p = document.getElementById("plugin1");
-      runNextTest();
-    }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_secondPlugin.html firefox-85.0+build1/dom/plugins/test/mochitest/test_secondPlugin.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_secondPlugin.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_secondPlugin.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-<html>
-  <head>
-     <title>Second Test Plug-in Test</title>
-
-    <script src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="plugin-utils.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  </head>
-
-  <body onload="run()">
-    <script class="testbody" type="application/javascript">
-      "use strict";
-
-      SimpleTest.waitForExplicitFinish();
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_DISABLED, "Second Test Plug-in");
-      setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Shockwave Flash");
-
-      function findPlugin(pluginName) {
-          for (var i = 0; i < navigator.plugins.length; i++) {
-            var plugin = navigator.plugins[i];
-            if (plugin.name === pluginName) {
-              return plugin;
-            }
-          }
-          return null;
-      }
-
-      function findMimeType(mimeTypeType) {
-          for (var i = 0; i < navigator.mimeTypes.length; i++) {
-            var mimeType = navigator.mimeTypes[i];
-            if (mimeType.type === mimeTypeType) {
-              return mimeType;
-            }
-          }
-          return null;
-      }
-
-      function run() {
-        var pluginElement = document.getElementById("plugin");
-        is(pluginElement.identifierToStringTest("foo"), "foo", "Should be able to call a function provided by the plugin");
-
-        pluginElement = document.getElementById("disabledPlugin");
-        is(typeof pluginElement.identifierToStringTest, "undefined", "Should NOT be able to call a function on a disabled plugin");
-
-        pluginElement = document.getElementById("clickToPlayPlugin");
-        is(typeof pluginElement.identifierToStringTest, "undefined", "Should NOT be able to call a function on a click-to-play plugin");
-
-        ok(navigator.plugins["Test Plug-in"], "Should have queried a plugin named 'Test Plug-in'");
-        ok(!navigator.plugins["Second Test Plug-in"], "Should NOT have queried a disabled plugin named 'Second Test Plug-in'");
-        ok(navigator.plugins["Shockwave Flash"], "Should have queried a click-to-play plugin named 'Shockwave Flash'");
-
-        ok(findPlugin("Test Plug-in"), "Should have found a plugin named 'Test Plug-in'");
-        ok(!findPlugin("Second Test Plug-in"), "Should NOT found a disabled plugin named 'Second Test Plug-in'");
-        ok(findPlugin("Shockwave Flash"), "Should have found a click-to-play plugin named 'Shockwave Flash'");
-
-        ok(navigator.mimeTypes["application/x-test"], "Should have queried a MIME type named 'application/x-test'");
-        ok(!navigator.mimeTypes["application/x-second-test"], "Should NOT have queried a disabled type named 'application/x-second-test'");
-        ok(navigator.mimeTypes["application/x-shockwave-flash-test"], "Should have queried a click-to-play MIME type named 'application/x-shockwave-flash-test'");
-
-        ok(findMimeType("application/x-test"), "Should have found a MIME type named 'application/x-test'");
-        ok(!findMimeType("application/x-second-test"), "Should NOT have found a disabled MIME type named 'application/x-second-test'");
-        ok(findMimeType("application/x-shockwave-flash-test"), "Should have found a click-to-play MIME type named 'application/x-shockwave-flash-test'");
-
-        SimpleTest.finish();
-      }
-    </script>
-
-    <object id="plugin" type="application/x-test" width=200 height=200></object>
-    <object id="disabledPlugin" type="application/x-second-test" width=200 height=200></object>
-    <object id="clickToPlayPlugin" type="application/x-shockwave-flash-test" width=200 height=200></object>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_src_url_change.html firefox-85.0+build1/dom/plugins/test/mochitest/test_src_url_change.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_src_url_change.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_src_url_change.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test changing src attribute</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var destroyed = false;
-  function onDestroy() {
-    destroyed = true;
-  }
-
-  function runTests() {
-    var p = document.getElementById("plugin1");
-
-    p.startWatchingInstanceCount();
-    p.callOnDestroy(onDestroy);
-
-    p.setAttribute("src", "loremipsum.txt");
-
-    is(destroyed, true, "Instance should have been destroyed.");
-    is(p.getInstanceCount(), 1, "One new instance should have been created.");
-
-    p.stopWatchingInstanceCount();
-
-    SimpleTest.finish();
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" src="about:blank" type="application/x-test" width="200" height="200"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_streamatclose.html firefox-85.0+build1/dom/plugins/test/mochitest/test_streamatclose.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_streamatclose.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_streamatclose.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<html>
-<head>
-  <title>Stream open at NPP_Destroy</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css"
-	href="/tests/SimpleTest/test.css">
-
-<body onload="startTest()">
-  <script type="text/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout("untriaged");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var urlnotified = false;
-
-  var p = null;
-
-  function startTest() {
-    p = document.getElementById("embedtest");
-    ok(p.streamTest("neverending.sjs", false, null, null,
-                    function(r, t) {
-                      is(r, 2, "Stream should have failed");
-                      urlnotified = true;
-                    }, null, true), "neverending.sjs started successfully");
-
-    setTimeout(removePlugin, 500);
-  }
-
-  function removePlugin() {
-    document.body.removeChild(p); // Fires NPP_Destroy immediately
-    SimpleTest.executeSoon(done);
-  }
-
-  function done() {
-    ok(urlnotified, "NPP_URLNotify should be called if streams are active at NPP_Destroy");
-    SimpleTest.finish();
-  }
-
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="embedtest"
-   style="width: 400px; height: 100px;" type="application/x-test"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_streamNotify.html firefox-85.0+build1/dom/plugins/test/mochitest/test_streamNotify.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_streamNotify.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_streamNotify.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-<head>
-  <title>NPN_Get/PostURLNotify tests</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout("untriaged");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var pending = 5;
-  function testDone() {
-    dump("testDone: " + pending + "\n");
-    --pending;
-
-    // Wait for a bit so that any unexpected notifications from the
-    // malformed data or null-post tests are received.
-    if (0 == pending)
-      window.setTimeout(SimpleTest.finish, 2000);
-  }
-
-  function runTests() {
-    var p = document.getElementById("plugin1");
-
-    ok(p.streamTest("loremipsum.txt", false, null, null,
-                    function(r, t) {
-                      is(r, 0, "GET loremipsum.txt");
-                      is(t.substr(0, 11), "Lorem ipsum",
-                         "GET loremipsum.txt correct");
-                      testDone();
-                    }, null, true), "streamTest GET");
-
-    ok(!p.streamTest("post.sjs", true, null, null,
-                     function(r, t) {
-                       ok(false, "Shouldn't get callback from null post");
-                     }, null, true), "streamTest POST null postdata");
-
-    ok(p.streamTest("post.sjs", true, "Something good", null,
-                    function(r, t) {
-                      is(r, 0, "POST something good");
-                      is(t, "Something good", "POST non-null correct");
-                      testDone();
-                    }, null, true), "streamTest POST valid postdata");
-
-    ok(p.streamTest("http://example.invalid/", false, null, null,
-                    function(r, t) {
-                      is(r, 1, "Shouldn't load example.invalid DNS name");
-                      testDone();
-                    }, null, true), "streamTest GET bad DNS");
-
-    ok(!p.streamTest("http://localhost:-8/", false, null, null,
-                    function(r, t) {
-                      ok(false, "Shouldn't get callback from malformed URI");
-                    }, null, true), "streamTest GET invalid URL");
-
-    ok(p.streamTest("javascript:'Hello';", false, null, null,
-                    function(r, t) {
-                      is(r, 0, "GET javascript: URI");
-                      is(t, "Hello", "GET javascript: URI correct");
-                      testDone();
-                    }, null, true), "streamTest GET javascript: URI");
-
-/*
- * XXX/cjones: disabled for now because it appears to be hard to make
- * mochitest ignore the malformed javascript
-
-    ok(!p.streamTest("javascript:syntax##$&*@error-*", false, null,
-                     function(r, t) {
-                       is(r, 1, "Shouldn't load invalid javascript: URI");
-                       testDone();
-                     }), "streamTest GET bad javascript: URI");
-*/
-
-    ok(p.streamTest("data:text/plain,World", false, null, null,
-                    function(r, t) {
-                      is(r, 0, "GET data: URI");
-                      is(t, "World", "GET data: URI correct");
-                      testDone();
-                    }, null, true), "streamTest GET data: URI");
-
-    ok(!p.streamTest("data:malformed?", false, null, null,
-                     function(r, t) {
-                       todo(false, "Shouldn't get callback for invalid data: URI");
-                     }, null, true), "streamTest GET bad data: URI");
-
-    ok(!p.postFileToURLTest("post.sjs"), "postFileToURLTest POST a file");
-
-    ok(!p.streamTest("post.sjs", true, "non-existent-file",
-                     function(r, t) {
-                       ok(false, "Shouldn't get write callback from file post");
-                     }, function(r, t) {
-                       ok(false, "Shouldn't get notify callback from file post");
-                     }, function(r, t) {
-                       ok(false, "Shouldn't get redirect callback from file post");
-                     }, true, true), "streamTest POST a file");
-  }
-  </script>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_stringHandling.html firefox-85.0+build1/dom/plugins/test/mochitest/test_stringHandling.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_stringHandling.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_stringHandling.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-<html>
-<head>
-  <title>NPAPI string test</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-  <link rel="stylesheet" type="text/css"
-        href="/tests/SimpleTest/test.css" />
-</head>
-
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-    SimpleTest.waitForExplicitFinish();
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-    function runTests() {
-      try {
-        var plugin = document.getElementById("plugin1");
-        var badData = "foo " + "\x00".repeat(260000);
-        var ret = plugin.echoString(badData);
-        ok(true, "Did not crash.");
-        is(ret, badData, "Returned string should equal what we passed in.");
-      } catch (e) {
-        ok(false, "Failed to call plugin.echoString() properly.");
-      } finally {
-        SimpleTest.finish();
-      }
-    }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_visibility.html firefox-85.0+build1/dom/plugins/test/mochitest/test_visibility.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_visibility.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_visibility.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test whether windowless plugins receive correct visible/invisible notifications.</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-  <style>
-    .hidden { visibility: hidden; }
-  </style>
-
-<body onload="startTest()">
-  <p id="display"></p>
-
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout("untriaged");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var didPaint = function() {};
-
-  var p = null;
-
-  function startTest() {
-    if (p.getPaintCount() < 1) {
-      setTimeout(startTest, 0);
-      return;
-    }
-
-    didPaint = function() {
-      ok(false, "Plugin should not paint until it is visible!");
-    };
-
-    ok(!p.isVisible(), "Plugin should not be visible.");
-    paintCountIs(p, 0, "Plugin should not have painted.");
-
-    didPaint = part2;
-
-    p.style.visibility = "visible";
-  }
-
-  function part2() {
-    ok(p.isVisible(), "Plugin should now be visible.");
-    paintCountIs(p, 1, "Plugin should have painted once.");
-
-    didPaint = part3;
-
-    p.setColor("FF0000FF"); // this causes an invalidate/repaint
-  }
-
-  const kTimeout = 5000; // 5 seconds
-  var part4GiveUp;
-  var part4Interval;
-
-  function part3() {
-    ok(p.isVisible(), "Plugin should still be visible.");
-    paintCountIs(p, 2, "Plugin should have painted twice.");
-
-    didPaint = function() {
-      ok(false, "Plugin should not paint when it is invisible.");
-    };
-
-    p.style.visibility = "hidden";
-
-    part4GiveUp = Date.now() + kTimeout;
-    part4Interval = setInterval(part4, 100);
-  }
-
-  function part4() {
-    if (p.isVisible()) {
-      if (Date.now() < part4GiveUp)
-        return;
-
-      ok(false, "Plugin never became invisible in part4.");
-      SimpleTest.finish();
-      return;
-    }
-
-    clearInterval(part4Interval);
-
-    ok(true, "Plugin became invisible again.");
-    p.setColor("FF00FF00");
-    setTimeout(SimpleTest.finish, 500);
-    // wait to make sure we don't actually paint
-  }
-
-  function inPaint() {
-    // We're actually in the middle of painting the plugin so don't do anything
-    // complex here, for the sake of cases where async plugin painting isn't
-    // enabled yet
-    setTimeout(didPaint, 0);
-    // Don't run that didPaint callback again
-    didPaint = function() {};
-  }
-  </script>
-
-  <embed id="theplugin" class="hidden" type="application/x-test" drawmode="solid" color="FFFF0000" paintscript="inPaint()"></embed>
-  
-  <script type="application/javascript">
-  var p = document.getElementById("theplugin");
-  </script>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowed_invalidate.html firefox-85.0+build1/dom/plugins/test/mochitest/test_windowed_invalidate.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowed_invalidate.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_windowed_invalidate.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-<html>
-<head>
-  <title>Test NPN_Invalidate working for a windowed plugin</title>
-  <script type="text/javascript" 
-          src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" 
-        href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="runTests()">
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout("untriaged");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var lastPaintCount;
-  var p = null;
-
-  function checkPainted() {
-    if (p.getPaintCount() > lastPaintCount) {
-      ok(true, "Plugin did repaint");
-      SimpleTest.finish();
-    } else {
-      setTimeout(checkPainted, 100);
-    }
-  }
-
-  function doTest() {
-    // Cause the plugin to invalidate itself using NPN_Invalidate,
-    // and then wait for the plugin's paintCount to increase. This is the
-    // simplest way to check that a windowed plugin has repainted.
-    p.setColor("FF00FF00");
-    checkPainted();
-  }
-
-  function checkPaintCountStabilized() {
-    // Wait for the paint count to stabilize (i.e. doesn't change for a full
-    // second), so that all buffered-up painting is hopefully finished,
-    // before running the test
-    lastPaintCount = p.getPaintCount();
-    setTimeout(function() {
-      var newCount = p.getPaintCount();
-      if (newCount == lastPaintCount) {
-        doTest();
-      } else {
-        checkPaintCountStabilized();
-      }
-    }, 1000);
-  }
-
-  function runTests() {
-    p = document.getElementById("p");
-    checkPaintCountStabilized();
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="p" type="application/x-test" wmode="window" drawmode="solid"
-         color="FFFF0000">
-  </embed>
-
-  <div id="verbose">
-  </div>
- </body>
- </html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowless_flash.html firefox-85.0+build1/dom/plugins/test/mochitest/test_windowless_flash.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowless_flash.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_windowless_flash.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body onload="addPerms()">
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  function addPerms() {
-    SpecialPowers.pushPermissions([{type: "plugin:flash", allow: true, context: document}], function() {
-      for (let p of SpecialPowers.DOMWindowUtils.plugins) {
-        p.playPlugin();
-      }
-      runTests();
-    });
-  }
-
-
-  function runTests() {
-    var p1 = document.getElementById("plugin1");
-    var p2 = document.getElementById("plugin2");
-    var p3 = document.getElementById("plugin3");
-    is(p1.hasWidget(), false, "Flash is always windowless mode even if wmode=window");
-    is(p2.hasWidget(), false, "Flash is always windowless mode even if wmode=anything");
-    is(p3.hasWidget(), false, "Flash is always windowless mode even if no wmode");
-    SimpleTest.finish();
-  }
-
-  </script>
-  <p id="display"></p>
-
-  <div id="div1">
-    <embed id="plugin1" type="application/x-shockwave-flash-test" width="200" height="200" wmode="window"></embed>
-    <embed id="plugin2" type="application/x-shockwave-flash-test" width="200" height="200" wmode="test"></embed>
-    <embed id="plugin3" type="application/x-shockwave-flash-test" width="200" height="200"></embed>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowless_ime.html firefox-85.0+build1/dom/plugins/test/mochitest/test_windowless_ime.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_windowless_ime.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_windowless_ime.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=539565
--->
-<head>
-  <title>Test #1 for Bug 539565</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script class="testbody" type="text/javascript">
-function runTests() {
-  var plugin = document.getElementById("plugin1");
-
-  plugin.focus();
-  // FYI: "compositionstart" will be dispatched automatically.
-  let data = "composition";
-  synthesizeCompositionChange({
-    composition: {
-      string: data,
-      clauses: [
-        { length: data.length, attr: COMPOSITION_ATTR_RAW_CLAUSE },
-      ],
-    },
-    caret: {start: data.length, length: 0},
-  });
-  is(plugin.getLastCompositionText(), data, "can get composition string");
-  synthesizeComposition({ type: "compositioncommit", data: "" });
-
-  synthesizeComposition({ type: "compositionstart", data: "" });
-  is(plugin.getLastCompositionText(), "", "can get empty composition string");
-  synthesizeComposition({ type: "compositioncommit", data: "" });
-  SimpleTest.finish();
-}
-
-SimpleTest.waitForExplicitFinish();
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-</head>
-
-<body onload="runTests()">
-  <embed id="plugin1" type="application/x-test" wmode="transparent" width="200" height="200"></embed>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_wmode.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_wmode.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_wmode.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_wmode.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window title="WMode Tests"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-<body xmlns="http://www.w3.org/1999/xhtml" onload="runTests()">
-<embed id="plugin2" type="application/x-test" width="400" height="400" wmode="window"></embed>
-<embed id="plugin1" type="application/x-test" width="400" height="400"></embed>
-</body>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-SimpleTest.waitForExplicitFinish();
-
-async function runTests() {
-  var p1 = document.getElementById("plugin1");
-  await SimpleTest.promiseWaitForCondition(() => p1.hasWidget !== undefined,
-                                           "Waited too long for plugin to activate");
-  is(p1.hasWidget(), false, "Plugin should be windowless by default");
-
-  var p2 = document.getElementById("plugin2");
-  await SimpleTest.promiseWaitForCondition(() => p2.hasWidget !== undefined,
-                                           "Waited too long for plugin to activate");
-  if (navigator.platform.includes("Mac")) {
-    is(p2.hasWidget(), false, "Mac does not support windowed plugins");
-  } else if (navigator.platform.includes("Win")) {
-    is(p2.hasWidget(), true, "Windows supports windowed plugins");
-  } else if (navigator.platform.includes("Linux")) {
-    is(p2.hasWidget(), false, "Linux does not support windowed plugins");
-  }
-
-  SimpleTest.finish();
-}
-]]>
-</script>
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_x11_error_crash.html firefox-85.0+build1/dom/plugins/test/mochitest/test_x11_error_crash.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_x11_error_crash.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_x11_error_crash.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<head>
-  <title>Plugin terminating on X11 error</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-<body>
-  <script class="testbody" type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  SimpleTest.requestFlakyTimeout(
-    "crashAndGetCrashServiceRecord() polls for async crash recording");
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  window.frameLoaded = function frameLoaded_toCrash() {
-    SimpleTest.expectChildProcessCrash();
-
-    crashAndGetCrashServiceRecord("triggerXError", function(cm, crash) {
-      var isPluginCrash = crash.isOfType(cm.PROCESS_TYPE_PLUGIN, cm.CRASH_TYPE_CRASH);
-      ok(isPluginCrash, "Record should be a plugin crash");
-      if (!isPluginCrash) {
-        dump("Crash type: " + crash.type + "\n");
-      }
-      SimpleTest.finish();
-    });
-  };
-  </script>
-  <iframe id="iframe1" src="crashing_subpage.html" width="600" height="600"></iframe>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-  <script type="application/javascript" src="plugin-utils.js"></script>
-
-  <script>
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var w = window.browsingContext.topChromeWindow.openDialog('xulbrowser_plugin_visibility.xhtml', '_blank', 'chrome,resizable=yes,width=400,height=600', window);
-
-  function done()
-  {
-    w.close();
-    SimpleTest.finish();
-  }
-  </script>
-
-  <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;" />
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/test_zero_opacity.html firefox-85.0+build1/dom/plugins/test/mochitest/test_zero_opacity.html
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/test_zero_opacity.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/test_zero_opacity.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Test whether windowed plugins with opacity:0 get their window set correctly</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-
-<body onload="startTest()">
-  <script type="application/javascript">
-  SimpleTest.waitForExplicitFinish();
-  setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-
-  var p = null;
-
-  function startTest() {
-    p = document.getElementById("theplugin");
-    if (!p.hasWidget()) {
-      todo(false, "This test is only relevant for windowed plugins");
-      SimpleTest.finish();
-      return;
-    }
-
-    // Wait for the plugin to have painted once.
-    var interval = setInterval(function() {
-      if (!p.getPaintCount())
-        return;
-
-      clearInterval(interval);
-      doTest();
-      SimpleTest.finish();
-    }, 100);
-  }
-
-  function doTest() {
-    is(p.getClipRegionRectCount(), 1, "getClipRegionRectCount should be a single rect");
-    var dpr = window.devicePixelRatio;
-    is(p.getClipRegionRectEdge(0, 2) - p.getClipRegionRectEdge(0, 0), 100 * dpr, "width of clip region rect");
-    is(p.getClipRegionRectEdge(0, 3) - p.getClipRegionRectEdge(0, 1), 50 * dpr, "height of clip region rect");
-  }
-  </script>
-
-  <p id="display"></p>
-
-  <embed id="theplugin" type="application/x-test" width="100" height="50" style="opacity:0" wmode="window"></embed>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xhtml firefox-85.0+build1/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xhtml
--- firefox-84.0.2+build1/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	orient="vertical">
-
-  <tabbox id="tabbox" flex="1">
-    <tabs>
-      <tab id="tab1" label="Tab 1" />
-      <tab id="tab2" label="Tab 2" />
-    </tabs>
-    <tabpanels flex="1">
-      <browser id="browser1" type="content" primary="true" flex="1" src="about:blank"/>
-      <browser id="browser2" type="content" primary="true" flex="1" src="about:blank"/>
-    </tabpanels>
-  </tabbox>
-  <script type="application/javascript" src="plugin-utils.js"/>
-  <script type="application/javascript"><![CDATA[
-    const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    const ok = window.arguments[0].ok;
-    const is = window.arguments[0].is;
-    const done = window.arguments[0].done;
-    const SimpleTest = window.arguments[0].SimpleTest;
-
-    const nsIWebProgress = Ci.nsIWebProgress;
-    const nsIWebProgressListener = Ci.nsIWebProgressListener;
-
-    const kURI = 'http://mochi.test:8888/chrome/dom/plugins/test/mochitest/plugin_visibility_loader.html';
-
-    function ProgressListener() {
-    }
-    ProgressListener.prototype.onStateChange =
-      function(progress, req, flags, status) {
-        if ((flags & nsIWebProgressListener.STATE_IS_WINDOW) &&
-            (flags & nsIWebProgressListener.STATE_STOP))
-          browserLoaded();
-      };
-    ProgressListener.prototype.QueryInterface = function(iid) {
-      if (iid.equals(nsIWebProgressListener) ||
-          iid.equals(Ci.nsISupportsWeakReference))
-        return this;
-      throw Components.Exception("", Cr.NS_ERROR_NO_INTERFACE);
-    };
-
-    var loadCount = 0;
-    function browserLoaded() {
-      ++loadCount;
-      if (2 == loadCount)
-        startTest();
-    }
-
-    var tabbox = document.getElementById('tabbox');
-    var browser1 = document.getElementById('browser1');
-    var browser2 = document.getElementById('browser2');
-
-    var progressListener1, progressListener2;
-
-    function setup() {
-      progressListener1 = new ProgressListener();
-      browser1.addProgressListener(progressListener1, nsIWebProgress.NOTIFY_STATE_WINDOW);
-      BrowserTestUtils.loadURI(browser1, kURI);
-      progressListener2 = new ProgressListener();
-      browser2.addProgressListener(progressListener2, nsIWebProgress.NOTIFY_STATE_WINDOW);
-      BrowserTestUtils.loadURI(browser2, kURI);
-    }
-
-    window.addEventListener("load", setup, false);
-
-    var plugin1, plugin2;
-
-    const kTimeout = 5000; // 5 seconds
-    var paintGiveUp;
-    var paintInterval;
-
-    function startTest() {
-      plugin1 = browser1.contentDocument.getElementById('p').wrappedJSObject;
-      plugin2 = browser2.contentDocument.getElementById('p').wrappedJSObject;
-
-      paintGiveUp = Date.now() + kTimeout;
-      paintInterval = setInterval(waitForPaint, 100);
-    }
-
-    function waitForPaint() {
-      if (!plugin1.isVisible()) {
-        if (Date.now() < paintGiveUp)
-          return;
-
-        ok(false, "Plugin in tab 1 never became visible.");
-        done();
-        return;
-      }
-
-      clearInterval(paintInterval);
-
-      ok(true, "Plugin in tab 1 should be visible.");
-      paintCountIs(plugin1, 1, "Plugin in tab 1 should have painted once.");
-
-      ok(!plugin2.isVisible(), "Plugin in tab 2 should not be visible.");
-      paintCountIs(plugin2, 0, "Plugin in tab 2 should not have painted.");
-
-      tabbox.selectedIndex = 1;
-      paintGiveUp = Date.now() + kTimeout;
-      paintInterval = setInterval(part2, 100);
-    }
-
-    function part2() {
-      if (!plugin2.isVisible()) {
-        if (Date.now() < paintGiveUp)
-          return;
-
-        ok(false, "Plugin in tab 2 never became visible.");
-        done();
-        return;
-      }
-
-      clearInterval(paintInterval);
-
-      ok(true, "Plugin in tab 2 became visible.");
-      paintCountIs(plugin2, 1, "Plugin in tab 2 should have painted once.");
-
-      ok(!plugin1.isVisible(), "Plugin in tab 1 should have become invisible.");
-      paintCountIs(plugin1, 1, "Plugin in tab 1 should have painted once.");
-
-      // Setcolor invalidates
-      plugin1.setColor('FF00FF00');
-      plugin2.setColor('FF00FF00');
-
-      setTimeout(part3, 500);
-    }
-
-    function part3() {
-      paintCountIs(plugin1, 1,
-                   "Plugin in tab 1 should not have repainted after invalidate.");
-      paintCountIs(plugin2, 2,
-                   "Plugin in tab 2 should have repainted after invalidate.");
-      done();
-    }
-  ]]></script>
-
-</window>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/moz.build firefox-85.0+build1/dom/plugins/test/moz.build
--- firefox-84.0.2+build1/dom/plugins/test/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -6,9 +6,6 @@
 
 DIRS += ["testplugin"]
 
-XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"]
-
 if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("gtk", "cocoa", "windows"):
     MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"]
-    MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.ini"]
     BROWSER_CHROME_MANIFESTS += ["mochitest/browser.ini"]
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/moz.build firefox-85.0+build1/dom/plugins/test/testplugin/moz.build
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -4,7 +4,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/.
 
-DIRS += ["secondplugin", "thirdplugin", "flashplugin"]
+DIRS += ["secondplugin", "flashplugin"]
 
 SharedLibrary("nptest")
 
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/Info.plist firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/Info.plist
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/Info.plist	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/Info.plist	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>libnpthirdtest.dylib</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.mozilla.ThirdTestPlugin</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BRPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>THIRDTEST</string>
-	<key>CFBundleVersion</key>
-	<string>1.0.0.0</string>
-	<key>WebPluginName</key>
-	<string>Third Test Plug-in</string>
-	<key>WebPluginDescription</key>
-	<string>Third plug-in for testing purposes.</string>
-	<key>WebPluginMIMETypes</key>
-	<dict>
-		<key>application/x-Third-Test</key>
-		<dict>
-			<key>WebPluginExtensions</key>
-			<array>
-				<string>ts2</string>
-			</array>
-			<key>WebPluginTypeDescription</key>
-			<string>Third test type</string>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/moz.build firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/moz.build
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# -*- 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/.
-
-SharedLibrary("npthirdtest")
-
-relative_path = "thirdplugin"
-cocoa_name = "ThirdTest"
-include("../testplugin.mozbuild")
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest.def firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest.def
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest.def	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest.def	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-LIBRARY   NPTHIRDTEST
-
-EXPORTS
-  NP_GetEntryPoints     @1
-  NP_Initialize         @2
-  NP_Shutdown           @3
-  NP_GetMIMEDescription @4
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest_name.cpp firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest_name.cpp
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest_name.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest_name.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +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/. */
-
-const char* sPluginName = "Third Test Plug-in";
-const char* sPluginDescription = "Third plug-in for testing purposes.";
-const char* sMimeDescription = "application/x-Third-Test:ts3:Third test type";
diff -Nru firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest.rc firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest.rc
--- firefox-84.0.2+build1/dom/plugins/test/testplugin/thirdplugin/nptest.rc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/testplugin/thirdplugin/nptest.rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#include<winver.h>
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    1,0,0,0
- PRODUCTVERSION 1,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "CompanyName", "mozilla.org"
-            VALUE "FileDescription", L"Third plug-in for testing purposes."
-            VALUE "FileExtents", "ts2"
-            VALUE "FileOpenName", "Third test type"
-            VALUE "FileVersion", "1.0"
-            VALUE "InternalName", "npthirdtest"
-            VALUE "MIMEType", "application/x-Third-Test"
-            VALUE "OriginalFilename", "npthirdtest.dll"
-            VALUE "ProductName", "Third Test Plug-in"
-            VALUE "ProductVersion", "1.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/head_plugins.js firefox-85.0+build1/dom/plugins/test/unit/head_plugins.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/head_plugins.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/head_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +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/.
- */
-
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const gIsWindows = mozinfo.os == "win";
-const gIsOSX = mozinfo.os == "mac";
-const gIsLinux = mozinfo.os == "linux";
-const gDirSvc = Services.dirsvc;
-
-function allow_all_plugins() {
-  Services.prefs.setBoolPref("plugin.load_flash_only", false);
-  // plugin.load_flash_only is only respected if xpc::IsInAutomation is true.
-  // This is not the case by default in xpcshell tests, unless the following
-  // pref is also set. Fixing this generically is bug 1598804
-  Services.prefs.setBoolPref(
-    "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer",
-    true
-  );
-}
-
-// Finds the test plugin library
-function get_test_plugin(secondplugin = false) {
-  for (let dir of gDirSvc.get("APluginsDL", Ci.nsISimpleEnumerator)) {
-    let name = get_platform_specific_plugin_name(secondplugin);
-    let plugin = dir.clone();
-    plugin.append(name);
-    if (plugin.exists()) {
-      plugin.normalize();
-      return plugin;
-    }
-  }
-  return null;
-}
-
-// Finds the test nsIPluginTag
-function get_test_plugintag(aName = "Test Plug-in") {
-  var name = aName || "Test Plug-in";
-  var host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-  var tags = host.getPluginTags();
-
-  for (var i = 0; i < tags.length; i++) {
-    if (tags[i].name == name) {
-      return tags[i];
-    }
-  }
-  return null;
-}
-
-// Creates a fake ProfDS directory key, copied from do_get_profile
-function do_get_profile_startup() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  // the python harness sets this in the environment for us
-  let profd = env.get("XPCSHELL_TEST_PROFILE_DIR");
-  let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-  file.initWithPath(profd);
-
-  let dirSvc = Services.dirsvc;
-  let provider = {
-    getFile(prop, persistent) {
-      persistent.value = true;
-      if (prop == "ProfDS") {
-        return file.clone();
-      }
-      throw Components.Exception("", Cr.NS_ERROR_FAILURE);
-    },
-    QueryInterface: ChromeUtils.generateQI(["nsIDirectoryServiceProvider"]),
-  };
-  dirSvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(provider);
-  return file.clone();
-}
-
-function get_platform_specific_plugin_name(secondplugin = false) {
-  if (secondplugin) {
-    if (gIsWindows) {
-      return "npsecondtest.dll";
-    }
-    if (gIsOSX) {
-      return "SecondTest.plugin";
-    }
-    if (gIsLinux) {
-      return "libnpsecondtest.so";
-    }
-  } else {
-    if (gIsWindows) {
-      return "nptest.dll";
-    }
-    if (gIsOSX) {
-      return "Test.plugin";
-    }
-    if (gIsLinux) {
-      return "libnptest.so";
-    }
-  }
-  return null;
-}
-
-function get_platform_specific_plugin_suffix() {
-  if (gIsWindows) {
-    return ".dll";
-  } else if (gIsOSX) {
-    return ".plugin";
-  } else if (gIsLinux) {
-    return ".so";
-  }
-  return null;
-}
-
-function get_test_plugin_no_symlink() {
-  let dirSvc = Services.dirsvc;
-  for (let dir of dirSvc.get("APluginsDL", Ci.nsISimpleEnumerator)) {
-    let plugin = dir.clone();
-    plugin.append(get_platform_specific_plugin_name());
-    if (plugin.exists()) {
-      return plugin;
-    }
-  }
-  return null;
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_bug471245.js firefox-85.0+build1/dom/plugins/test/unit/test_bug471245.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_bug471245.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_bug471245.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +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/.
- */
-
-function run_test() {
-  allow_all_plugins();
-  do_get_profile_startup();
-
-  var plugin = get_test_plugintag();
-  Assert.ok(plugin == null);
-
-  // Initialises a profile folder
-  do_get_profile();
-
-  plugin = get_test_plugintag();
-  Assert.equal(false, plugin == null);
-
-  // Clean up
-  Services.prefs.clearUserPref("plugin.importedState");
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_bug813245.js firefox-85.0+build1/dom/plugins/test/unit/test_bug813245.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_bug813245.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_bug813245.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +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/.
- */
-
-// Plugin registry uses different field delimeters on different platforms
-var DELIM = mozinfo.os == "win" ? "|" : ":";
-
-var gProfD = do_get_profile_startup();
-
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-// Writes out some plugin registry to the profile
-function write_registry(version, info) {
-  let runtime = Services.appinfo;
-
-  var header = "Generated File. Do not edit.\n\n";
-  header += "[HEADER]\n";
-  header += "Version" + DELIM + version + DELIM + "$\n";
-  header += "Arch" + DELIM + runtime.XPCOMABI + DELIM + "$\n";
-  header += "\n";
-  header += "[PLUGINS]\n";
-
-  var registry = gProfD.clone();
-  registry.append("pluginreg.dat");
-  var foStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(
-    Ci.nsIFileOutputStream
-  );
-  // write, create, truncate
-  foStream.init(registry, 0x02 | 0x08 | 0x20, 0o666, 0);
-
-  var charset = "UTF-8"; // Can be any character encoding name that Mozilla supports
-  var os = Cc["@mozilla.org/intl/converter-output-stream;1"].createInstance(
-    Ci.nsIConverterOutputStream
-  );
-  os.init(foStream, charset);
-
-  os.writeString(header);
-  os.writeString(info);
-  os.close();
-}
-
-function run_test() {
-  allow_all_plugins();
-  var plugin = get_test_plugintag();
-  Assert.ok(plugin == null);
-
-  var file = get_test_plugin();
-  if (!file) {
-    do_throw("Plugin library not found");
-  }
-
-  // write plugin registry data
-  let registry = "";
-
-  if (gIsOSX) {
-    registry += file.leafName + DELIM + "$\n";
-    registry += file.path + DELIM + "$\n";
-  } else {
-    registry += file.path + DELIM + "$\n";
-    registry += DELIM + "$\n";
-  }
-  registry += "0.0.0.0" + DELIM + "$\n";
-  registry += "16725225600" + DELIM + "0" + DELIM + "5" + DELIM + "$\n";
-  registry += "Plug-in for testing purposes." + DELIM + "$\n";
-  registry += "Test Plug-in" + DELIM + "$\n";
-  registry += "999999999999999999999999999999999999999999999999|0|5|$\n";
-  registry +=
-    "0" +
-    DELIM +
-    "application/x-test" +
-    DELIM +
-    "Test mimetype" +
-    DELIM +
-    "tst" +
-    DELIM +
-    "$\n";
-
-  registry += "\n";
-  registry += "[INVALID]\n";
-  registry += "\n";
-  write_registry("0.15", registry);
-
-  // Initialise profile folder
-  do_get_profile();
-
-  plugin = get_test_plugintag();
-  if (!plugin) {
-    do_throw("Plugin tag not found");
-  }
-
-  // The plugin registry should have been rejected.
-  // If not, the test plugin version would be 0.0.0.0
-  Assert.equal(plugin.version, "1.0.0.0");
-
-  // Clean up
-  Services.prefs.clearUserPref("plugin.importedState");
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_bug854467.js firefox-85.0+build1/dom/plugins/test/unit/test_bug854467.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_bug854467.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_bug854467.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +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/.
- */
-
-function check_state(aTag, aExpectedClicktoplay, aExpectedDisabled) {
-  Assert.equal(aTag.clicktoplay, aExpectedClicktoplay);
-  Assert.equal(aTag.disabled, aExpectedDisabled);
-}
-
-function run_test() {
-  allow_all_plugins();
-  let tag = get_test_plugintag();
-  tag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  check_state(tag, false, false);
-
-  /* test going to click-to-play from always enabled and back */
-  tag.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  check_state(tag, true, false);
-  tag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  check_state(tag, false, false);
-
-  /* test going to disabled from always enabled and back */
-  tag.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-  check_state(tag, false, true);
-  tag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  check_state(tag, false, false);
-
-  /* test going to click-to-play from disabled and back */
-  tag.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-  check_state(tag, false, true);
-  tag.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  check_state(tag, true, false);
-  tag.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-  check_state(tag, false, true);
-
-  /* put everything back to normal and check that that succeeded */
-  tag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  check_state(tag, false, false);
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_nice_plugin_name.js firefox-85.0+build1/dom/plugins/test/unit/test_nice_plugin_name.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_nice_plugin_name.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_nice_plugin_name.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +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/.
- */
-
-const XULAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
-const XULAPPINFO_CID = Components.ID("{c763b610-9d49-455a-bbd2-ede71682a1ac}");
-
-var gAppInfo = null;
-
-function createAppInfo(ID, name, version, platformVersion = "1.0") {
-  let tmp = {};
-  ChromeUtils.import("resource://testing-common/AppInfo.jsm", tmp);
-  tmp.updateAppInfo({
-    ID,
-    name,
-    version,
-    platformVersion,
-    crashReporter: true,
-  });
-  gAppInfo = tmp.getAppInfo();
-}
-
-var gPluginHost = null;
-
-function test_expected_permission_string(aPermString) {
-  gPluginHost.reloadPlugins(false);
-  let plugin = get_test_plugintag();
-  Assert.equal(false, plugin == null);
-  Assert.equal(
-    gPluginHost.getPermissionStringForType("application/x-test"),
-    aPermString
-  );
-}
-
-function run_test() {
-  allow_all_plugins();
-  Assert.ok(gIsWindows || gIsOSX || gIsLinux);
-  Assert.ok(
-    !(gIsWindows && gIsOSX) &&
-      !(gIsWindows && gIsLinux) &&
-      !(gIsOSX && gIsLinux)
-  );
-
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-  gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-
-  let expectedDefaultPermissionString = null;
-  if (gIsWindows) {
-    expectedDefaultPermissionString = "plugin:nptest";
-  }
-  if (gIsOSX) {
-    expectedDefaultPermissionString = "plugin:test";
-  }
-  if (gIsLinux) {
-    expectedDefaultPermissionString = "plugin:libnptest";
-  }
-  test_expected_permission_string(expectedDefaultPermissionString);
-
-  let suffix = get_platform_specific_plugin_suffix();
-  let pluginFile = get_test_plugin_no_symlink();
-  let pluginDir = pluginFile.parent;
-  pluginFile.copyTo(null, "npblah235" + suffix);
-  let pluginCopy = pluginDir.clone();
-  pluginCopy.append("npblah235" + suffix);
-  let tempDir = do_get_tempdir();
-  pluginFile.moveTo(tempDir, null);
-  test_expected_permission_string("plugin:npblah");
-
-  pluginCopy.moveTo(null, "npasdf-3.2.2" + suffix);
-  test_expected_permission_string("plugin:npasdf");
-
-  pluginCopy.moveTo(null, "npasdf_##29387!{}{[][" + suffix);
-  test_expected_permission_string("plugin:npasdf");
-
-  pluginCopy.moveTo(null, "npqtplugin7" + suffix);
-  test_expected_permission_string("plugin:npqtplugin");
-
-  pluginCopy.moveTo(null, "npFoo3d" + suffix);
-  test_expected_permission_string("plugin:npfoo3d");
-
-  pluginCopy.moveTo(null, "NPSWF32_11_5_502_146" + suffix);
-  test_expected_permission_string("plugin:npswf");
-
-  pluginCopy.remove(true);
-  pluginFile.moveTo(pluginDir, null);
-  test_expected_permission_string(expectedDefaultPermissionString);
-
-  // Clean up
-  Services.prefs.clearUserPref("plugin.importedState");
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_persist_in_prefs.js firefox-85.0+build1/dom/plugins/test/unit/test_persist_in_prefs.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_persist_in_prefs.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_persist_in_prefs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +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/.
- */
-
-// Plugin registry uses different field delimeters on different platforms
-var DELIM = mozinfo.os == "win" ? "|" : ":";
-
-var gProfD = do_get_profile_startup();
-
-function run_test() {
-  allow_all_plugins();
-
-  Assert.ok(gIsWindows || gIsOSX || gIsLinux);
-
-  let file = get_test_plugin_no_symlink();
-  if (!file) {
-    do_throw("Plugin library not found");
-  }
-
-  const pluginDir = file.parent;
-  const tempDir = do_get_tempdir();
-  const suffix = get_platform_specific_plugin_suffix();
-  const pluginName = file.leafName
-    .substring(0, file.leafName.length - suffix.length)
-    .toLowerCase();
-  const pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(
-    Ci.nsIPluginHost
-  );
-  const statePref = "plugin.state." + pluginName;
-
-  // Initialise profile folder
-  do_get_profile();
-
-  let plugin = get_test_plugintag();
-  if (!plugin) {
-    do_throw("Plugin tag not found");
-  }
-
-  plugin.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-
-  // prepare a copy of the plugin and backup the original
-  file.copyTo(null, "nptestcopy" + suffix);
-  let copy = pluginDir.clone();
-  copy.append("nptestcopy" + suffix);
-  file.moveTo(tempDir, null);
-
-  // test that the settings persist through a few variations of test-plugin names
-  let testNames = [
-    pluginName + "2",
-    pluginName.toUpperCase() + "_11_5_42_2323",
-    pluginName + "-5.2.7",
-  ];
-  testNames.forEach(function(leafName) {
-    dump("Checking " + leafName + ".\n");
-    copy.moveTo(null, leafName + suffix);
-    pluginHost.reloadPlugins(false);
-    plugin = get_test_plugintag();
-    Assert.equal(false, plugin == null);
-    Assert.ok(plugin.disabled);
-    Assert.ok(!plugin.clicktoplay);
-  });
-
-  // check that the state persists even if the plugin is not always present
-  copy.moveTo(tempDir, null);
-  pluginHost.reloadPlugins(false);
-  copy.moveTo(pluginDir, null);
-  pluginHost.reloadPlugins(false);
-
-  plugin = get_test_plugintag();
-  Assert.equal(false, plugin == null);
-  Assert.ok(plugin.disabled);
-  Assert.ok(!plugin.clicktoplay);
-
-  // clean up
-  Services.prefs.clearUserPref(statePref);
-  Services.prefs.clearUserPref("plugin.importedState");
-  copy.remove(true);
-  file.moveTo(pluginDir, null);
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/test_plugin_default_state.js firefox-85.0+build1/dom/plugins/test/unit/test_plugin_default_state.js
--- firefox-84.0.2+build1/dom/plugins/test/unit/test_plugin_default_state.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/test_plugin_default_state.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-function run_test() {
-  allow_all_plugins();
-  let pluginDefaultState = Services.prefs.getIntPref("plugin.default.state");
-  // if this fails, we just have to switch around the values we're testing
-  Assert.notEqual(pluginDefaultState, Ci.nsIPluginTag.STATE_DISABLED);
-  let nonDefaultState =
-    pluginDefaultState != Ci.nsIPluginTag.STATE_ENABLED
-      ? Ci.nsIPluginTag.STATE_ENABLED
-      : Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  let testPlugin = get_test_plugintag();
-  // the test plugin should have the default enabledState
-  Assert.equal(testPlugin.enabledState, pluginDefaultState);
-
-  let secondTestPlugin = get_test_plugintag("Second Test Plug-in");
-  // set an enabledState for the second test plugin
-  secondTestPlugin.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
-  // change what the default enabledState is
-  Services.prefs.setIntPref("plugin.default.state", nonDefaultState);
-  // the test plugin should follow the default (it has no individual pref yet)
-  Assert.equal(testPlugin.enabledState, nonDefaultState);
-  // the second test plugin should retain its preferred state
-  Assert.equal(secondTestPlugin.enabledState, Ci.nsIPluginTag.STATE_DISABLED);
-
-  // clean up
-  testPlugin.enabledState = pluginDefaultState;
-  secondTestPlugin.enabledState = pluginDefaultState;
-  Services.prefs.clearUserPref("plugin.default.state");
-  Services.prefs.clearUserPref("plugin.importedState");
-}
diff -Nru firefox-84.0.2+build1/dom/plugins/test/unit/xpcshell.ini firefox-85.0+build1/dom/plugins/test/unit/xpcshell.ini
--- firefox-84.0.2+build1/dom/plugins/test/unit/xpcshell.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/plugins/test/unit/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-[DEFAULT]
-skip-if = toolkit == 'android'
-head = head_plugins.js
-tags = addons
-firefox-appdir = browser
-
-[test_bug471245.js]
-# Bug 676953: test fails consistently on Android
-fail-if = os == "android"
-[test_bug813245.js]
-# Bug 676953: test fails consistently on Android
-fail-if = os == "android"
-[test_nice_plugin_name.js]
-# Bug 676953: test fails consistently on Android
-fail-if = os == "android"
-[test_persist_in_prefs.js]
-skip-if = appname == "thunderbird"
-reason = plugins are disabled by default in Thunderbird
-[test_bug854467.js]
-[test_plugin_default_state.js]
-skip-if = appname == "thunderbird" || (processor == 'aarch64' && os == 'win')
-reason = plugins are disabled by default in Thunderbird and Windows10-aarch64
diff -Nru firefox-84.0.2+build1/dom/power/PowerManagerService.cpp firefox-85.0+build1/dom/power/PowerManagerService.cpp
--- firefox-84.0.2+build1/dom/power/PowerManagerService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/power/PowerManagerService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -135,14 +135,6 @@
   return NS_OK;
 }
 
-already_AddRefed<WakeLock> PowerManagerService::NewWakeLockOnBehalfOfProcess(
-    const nsAString& aTopic, ContentParent* aContentParent) {
-  RefPtr<WakeLock> wakelock = new WakeLock();
-  nsresult rv = wakelock->Init(aTopic, aContentParent);
-  NS_ENSURE_SUCCESS(rv, nullptr);
-  return wakelock.forget();
-}
-
 }  // namespace mozilla::dom::power
 
 NS_DEFINE_NAMED_CID(NS_POWERMANAGERSERVICE_CID);
diff -Nru firefox-84.0.2+build1/dom/power/PowerManagerService.h firefox-85.0+build1/dom/power/PowerManagerService.h
--- firefox-84.0.2+build1/dom/power/PowerManagerService.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/power/PowerManagerService.h	2021-01-18 19:58:10.000000000 +0000
@@ -38,21 +38,6 @@
   // Implement WakeLockObserver
   void Notify(const hal::WakeLockInformation& aWakeLockInfo) override;
 
-  /**
-   * Acquire a wake lock on behalf of a given process (aContentParent).
-   *
-   * This method stands in contrast to nsIPowerManagerService::NewWakeLock,
-   * which acquires a wake lock on behalf of the /current/ process.
-   *
-   * NewWakeLockOnBehalfOfProcess is different from NewWakeLock in that
-   *
-   *  - The wake lock unlocks itself if the /given/ process dies, and
-   *  - The /given/ process shows up in WakeLockInfo::lockingProcesses.
-   *
-   */
-  already_AddRefed<WakeLock> NewWakeLockOnBehalfOfProcess(
-      const nsAString& aTopic, ContentParent* aContentParent);
-
   already_AddRefed<WakeLock> NewWakeLock(const nsAString& aTopic,
                                          nsPIDOMWindowInner* aWindow,
                                          mozilla::ErrorResult& aRv);
diff -Nru firefox-84.0.2+build1/dom/power/WakeLock.cpp firefox-85.0+build1/dom/power/WakeLock.cpp
--- firefox-84.0.2+build1/dom/power/WakeLock.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/power/WakeLock.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -58,7 +58,7 @@
   if (aWindow) {
     nsCOMPtr<Document> doc = aWindow->GetExtantDoc();
     NS_ENSURE_STATE(doc);
-    mHidden = doc->Hidden();
+    mHidden = IsDocumentInvisible(*doc);
   }
 
   AttachEventListener();
@@ -67,29 +67,6 @@
   return NS_OK;
 }
 
-nsresult WakeLock::Init(const nsAString& aTopic,
-                        ContentParent* aContentParent) {
-  // Don't Init() a WakeLock twice.
-  MOZ_ASSERT(mTopic.IsEmpty());
-  MOZ_ASSERT(aContentParent);
-
-  if (aTopic.IsEmpty()) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  mTopic.Assign(aTopic);
-  mContentParentID = aContentParent->ChildID();
-  mHidden = false;
-
-  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
-  if (obs) {
-    obs->AddObserver(this, "ipc:content-shutdown", /* ownsWeak */ true);
-  }
-
-  DoLock();
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 WakeLock::Observe(nsISupports* aSubject, const char* aTopic,
                   const char16_t* data) {
@@ -194,6 +171,13 @@
 
 void WakeLock::GetTopic(nsAString& aTopic) { aTopic.Assign(mTopic); }
 
+bool WakeLock::IsDocumentInvisible(const Document& aDocument) const {
+  // If document has a child element being used in the picture in picture
+  // mode, which is always visible to users, then we would consider the
+  // document as visible as well.
+  return aDocument.Hidden() && !aDocument.HasPictureInPictureChildElement();
+}
+
 NS_IMETHODIMP
 WakeLock::HandleEvent(Event* aEvent) {
   nsAutoString type;
@@ -204,10 +188,7 @@
     NS_ENSURE_STATE(doc);
 
     bool oldHidden = mHidden;
-    // If document has a child element being used in the picture in picture
-    // mode, which is always visible to users, then we would consider the
-    // document as visible as well.
-    mHidden = doc->Hidden() && !doc->HasPictureInPictureChildElement();
+    mHidden = IsDocumentInvisible(*doc);
 
     if (mLocked && oldHidden != mHidden) {
       hal::ModifyWakeLock(
diff -Nru firefox-84.0.2+build1/dom/power/WakeLock.h firefox-85.0+build1/dom/power/WakeLock.h
--- firefox-84.0.2+build1/dom/power/WakeLock.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/power/WakeLock.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,14 +14,14 @@
 #include "nsString.h"
 #include "nsWeakReference.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 
 class nsPIDOMWindowInner;
 
 namespace mozilla {
-namespace dom {
+class ErrorResult;
 
-class ContentParent;
+namespace dom {
+class Document;
 
 class WakeLock final : public nsIDOMEventListener,
                        public nsIObserver,
@@ -46,11 +46,6 @@
   // invisible.
   nsresult Init(const nsAString& aTopic, nsPIDOMWindowInner* aWindow);
 
-  // Initialize this wake lock on behalf of the given process.  If the process
-  // dies, the lock is released.  A wake lock initialized via this method is
-  // always considered visible.
-  nsresult Init(const nsAString& aTopic, ContentParent* aContentParent);
-
   // WebIDL methods
 
   nsPIDOMWindowInner* GetParentObject() const;
@@ -67,6 +62,9 @@
   void AttachEventListener();
   void DetachEventListener();
 
+  // Return true if all parts of the given document are regarded as invisible.
+  bool IsDocumentInvisible(const Document& aDocument) const;
+
   bool mLocked;
   bool mHidden;
 
diff -Nru firefox-84.0.2+build1/dom/presentation/components.conf firefox-85.0+build1/dom/presentation/components.conf
--- firefox-84.0.2+build1/dom/presentation/components.conf	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/components.conf	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,12 @@
 
 Classes = [
     {
+        'cid': '{a2b5ef38-a650-4bee-b488-3739f1f3afe7}',
+        'contract_ids': ['@mozilla.org/presentation/mockedsockettransport;1'],
+        'headers': ['/dom/presentation/MockedSocketTransport.h'],
+        'type': 'mozilla::dom::MockedSocketTransport',
+    },
+    {
         'cid': '{dd2bbf2f-3399-4389-8f5f-d382afb8b2d6}',
         'contract_ids': ['@mozilla.org/presentation/datachanneltransport;1'],
         'jsm': 'resource://gre/modules/PresentationDataChannelSessionTransport.jsm',
diff -Nru firefox-84.0.2+build1/dom/presentation/interfaces/nsIPresentationListener.idl firefox-85.0+build1/dom/presentation/interfaces/nsIPresentationListener.idl
--- firefox-84.0.2+build1/dom/presentation/interfaces/nsIPresentationListener.idl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/interfaces/nsIPresentationListener.idl	2021-01-18 19:58:10.000000000 +0000
@@ -4,6 +4,10 @@
 
 #include "nsISupports.idl"
 
+%{C++
+#include "nsTArray.h"
+%}
+
 [ref] native URLArrayRef(const nsTArray<nsString>);
 
 [uuid(0105f837-4279-4715-9d5b-2dc3f8b65353)]
diff -Nru firefox-84.0.2+build1/dom/presentation/ipc/PPresentation.ipdl firefox-85.0+build1/dom/presentation/ipc/PPresentation.ipdl
--- firefox-84.0.2+build1/dom/presentation/ipc/PPresentation.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/ipc/PPresentation.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -10,7 +10,9 @@
 
 include InputStreamParams;
 
-using refcounted class nsIPrincipal from "mozilla/dom/PermissionMessageUtils.h";
+include "mozilla/dom/PermissionMessageUtils.h";
+
+using refcounted class nsIPrincipal from "nsIPrincipal.h";
 using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/presentation/ipc/PresentationContentSessionInfo.h firefox-85.0+build1/dom/presentation/ipc/PresentationContentSessionInfo.h
--- firefox-84.0.2+build1/dom/presentation/ipc/PresentationContentSessionInfo.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/ipc/PresentationContentSessionInfo.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,10 @@
 #include "nsCOMPtr.h"
 #include "nsIPresentationSessionTransport.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsIPresentationService.h"
+#include "nsXULAppAPI.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/presentation/ipc/PresentationParent.cpp firefox-85.0+build1/dom/presentation/ipc/PresentationParent.cpp
--- firefox-84.0.2+build1/dom/presentation/ipc/PresentationParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/ipc/PresentationParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,10 +5,12 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DCPresentationChannelDescription.h"
+#include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/ContentProcessManager.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/Unused.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIPresentationSessionTransport.h"
 #include "nsIPresentationSessionTransportBuilder.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/MockedSocketTransport.cpp firefox-85.0+build1/dom/presentation/MockedSocketTransport.cpp
--- firefox-84.0.2+build1/dom/presentation/MockedSocketTransport.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/MockedSocketTransport.cpp	2021-01-18 19:58:09.000000000 +0000
@@ -0,0 +1,224 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#include "MockedSocketTransport.h"
+
+using namespace mozilla::net;
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_ISUPPORTS(MockedSocketTransport, nsISocketTransport, nsITransport)
+
+// static
+already_AddRefed<MockedSocketTransport> MockedSocketTransport::Create() {
+  RefPtr<MockedSocketTransport> transport = new MockedSocketTransport();
+  return transport.forget();
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetKeepaliveEnabled(bool) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetKeepaliveVals(int32_t, int32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetSecurityCallbacks(nsIInterfaceRequestor**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetSecurityCallbacks(nsIInterfaceRequestor*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::OpenInputStream(uint32_t, uint32_t, uint32_t,
+                                       nsIInputStream**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::OpenOutputStream(uint32_t, uint32_t, uint32_t,
+                                        nsIOutputStream**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::Close(nsresult) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::SetEventSink(nsITransportEventSink*, nsIEventTarget*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::Bind(NetAddr*) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::GetFirstRetryError(nsresult*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetEchConfigUsed(bool*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetEchConfig(const nsACString&) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::ResolvedByTRR(bool*) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+nsresult MockedSocketTransport::GetOriginAttributes(
+    mozilla::OriginAttributes*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetKeepaliveEnabled(bool*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetSendBufferSize(uint32_t*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetSendBufferSize(uint32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetPort(int32_t*) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::GetPeerAddr(mozilla::net::NetAddr*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetSelfAddr(mozilla::net::NetAddr*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetScriptablePeerAddr(nsINetAddr**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetScriptableSelfAddr(nsINetAddr**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetSecurityInfo(nsISupports**) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::IsAlive(bool*) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::GetConnectionFlags(uint32_t*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetConnectionFlags(uint32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetIsPrivate(bool) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::GetTlsFlags(uint32_t*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetTlsFlags(uint32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetRecvBufferSize(uint32_t*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetRecvBufferSize(uint32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetResetIPFamilyPreference(bool*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+nsresult MockedSocketTransport::SetOriginAttributes(
+    const mozilla::OriginAttributes&) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetScriptableOriginAttributes(
+    JSContext* aCx, JS::MutableHandle<JS::Value>) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetScriptableOriginAttributes(JSContext* aCx,
+                                                     JS::Handle<JS::Value>) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetHost(nsACString&) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::GetTimeout(uint32_t, uint32_t*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetTimeout(uint32_t, uint32_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetReuseAddrPort(bool) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::SetLinger(bool, int16_t) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+MockedSocketTransport::GetQoSBits(uint8_t*) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::SetQoSBits(uint8_t) { return NS_ERROR_NOT_IMPLEMENTED; }
+
+NS_IMETHODIMP
+MockedSocketTransport::SetFastOpenCallback(TCPFastOpen*) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+}  // namespace dom
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/presentation/MockedSocketTransport.h firefox-85.0+build1/dom/presentation/MockedSocketTransport.h
--- firefox-84.0.2+build1/dom/presentation/MockedSocketTransport.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/MockedSocketTransport.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,36 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef DOM_PRESENTATION_MOCKEDSOCKETTRANSPORT_H_
+#define DOM_PRESENTATION_MOCKEDSOCKETTRANSPORT_H_
+
+#include "nsISocketTransport.h"
+
+namespace mozilla {
+namespace dom {
+
+// For testing purposes, we need a mocked socket transport that doesn't do
+// anything. It has to be implemented in C++ because nsISocketTransport is
+// builtinclass because it contains nostdcall methods.
+
+class MockedSocketTransport final : public nsISocketTransport {
+ public:
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSITRANSPORT
+  NS_DECL_NSISOCKETTRANSPORT
+
+  MockedSocketTransport() = default;
+
+  static already_AddRefed<MockedSocketTransport> Create();
+
+ protected:
+  virtual ~MockedSocketTransport() = default;
+};
+
+}  // namespace dom
+}  // namespace mozilla
+
+#endif  // DOM_PRESENTATION_MOCKEDSOCKETTRANSPORT_H_
diff -Nru firefox-84.0.2+build1/dom/presentation/moz.build firefox-85.0+build1/dom/presentation/moz.build
--- firefox-84.0.2+build1/dom/presentation/moz.build	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -20,6 +20,7 @@
     "ipc/PresentationChild.h",
     "ipc/PresentationIPCService.h",
     "ipc/PresentationParent.h",
+    "MockedSocketTransport.h",
     "Presentation.h",
     "PresentationAvailability.h",
     "PresentationCallbacks.h",
@@ -44,6 +45,7 @@
     "ipc/PresentationContentSessionInfo.cpp",
     "ipc/PresentationIPCService.cpp",
     "ipc/PresentationParent.cpp",
+    "MockedSocketTransport.cpp",
     "Presentation.cpp",
     "PresentationAvailability.cpp",
     "PresentationCallbacks.cpp",
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationAvailability.cpp firefox-85.0+build1/dom/presentation/PresentationAvailability.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationAvailability.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationAvailability.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,11 +8,13 @@
 
 #include "mozilla/dom/PresentationAvailabilityBinding.h"
 #include "mozilla/dom/Promise.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIPresentationService.h"
 #include "nsServiceManagerUtils.h"
+#include "AvailabilityCollection.h"
 #include "PresentationLog.h"
 
 namespace mozilla {
@@ -198,4 +200,4 @@
 }
 
 }  // namespace dom
-}  // namespace mozilla
\ No newline at end of file
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationAvailability.h firefox-85.0+build1/dom/presentation/PresentationAvailability.h
--- firefox-84.0.2+build1/dom/presentation/PresentationAvailability.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationAvailability.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_PresentationAvailability_h
 
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/WeakPtr.h"
 #include "nsIPresentationListener.h"
 #include "nsTArray.h"
 
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationConnection.cpp firefox-85.0+build1/dom/presentation/PresentationConnection.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationConnection.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationConnection.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,8 @@
 #include "mozilla/dom/MessageEvent.h"
 #include "mozilla/dom/MessageEventBinding.h"
 #include "mozilla/dom/PresentationConnectionCloseEvent.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/ToJSValue.h"
 #include "mozilla/ErrorNames.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/Presentation.cpp firefox-85.0+build1/dom/presentation/Presentation.cpp
--- firefox-84.0.2+build1/dom/presentation/Presentation.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/Presentation.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,7 +8,10 @@
 
 #include <ctype.h>
 
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/PresentationBinding.h"
+#include "mozilla/dom/PresentationRequest.h"
 #include "mozilla/dom/Promise.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationDeviceManager.cpp firefox-85.0+build1/dom/presentation/PresentationDeviceManager.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationDeviceManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationDeviceManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,9 +11,11 @@
 #include "nsArrayUtils.h"
 #include "nsCategoryCache.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 #include "nsIObserverService.h"
 #include "nsISupportsPrimitives.h"
+#include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
 #include "PresentationSessionRequest.h"
 #include "PresentationTerminateRequest.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationLog.h firefox-85.0+build1/dom/presentation/PresentationLog.h
--- firefox-84.0.2+build1/dom/presentation/PresentationLog.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationLog.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,9 @@
  * For detail, see PresentationService.cpp
  */
 namespace mozilla {
+
+class LazyLogModule;
+
 namespace dom {
 extern mozilla::LazyLogModule gPresentationLog;
 }
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationReceiver.cpp firefox-85.0+build1/dom/presentation/PresentationReceiver.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationReceiver.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationReceiver.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,9 +6,11 @@
 
 #include "PresentationReceiver.h"
 
+#include "mozilla/Logging.h"
 #include "mozilla/dom/PresentationReceiverBinding.h"
 #include "mozilla/dom/Promise.h"
 #include "nsContentUtils.h"
+#include "nsIDocShell.h"
 #include "nsIPresentationService.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationReceiver.h firefox-85.0+build1/dom/presentation/PresentationReceiver.h
--- firefox-84.0.2+build1/dom/presentation/PresentationReceiver.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationReceiver.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_dom_PresentationReceiver_h
 #define mozilla_dom_PresentationReceiver_h
 
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIPresentationListener.h"
@@ -17,6 +16,8 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class PresentationConnection;
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationRequest.cpp firefox-85.0+build1/dom/presentation/PresentationRequest.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationRequest.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #include "PresentationCallbacks.h"
 #include "PresentationLog.h"
 #include "PresentationTransportBuilderConstructor.h"
+#include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Navigator.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationService.cpp firefox-85.0+build1/dom/presentation/PresentationService.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationService.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "ipc/PresentationIPCService.h"
 #include "mozilla/Services.h"
+#include "nsArrayUtils.h"
 #include "nsGlobalWindow.h"
 #include "nsIMutableArray.h"
 #include "nsIObserverService.h"
@@ -15,6 +16,8 @@
 #include "nsIPresentationDevicePrompt.h"
 #include "nsIPresentationListener.h"
 #include "nsIPresentationRequestUIGlue.h"
+#include "nsIPresentationSessionRequest.h"
+#include "nsIPresentationTerminateRequest.h"
 #include "nsISupportsPrimitives.h"
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationSessionRequest.cpp firefox-85.0+build1/dom/presentation/PresentationSessionRequest.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationSessionRequest.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationSessionRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PresentationSessionRequest.h"
+
+#include "nsIPresentationControlChannel.h"
 #include "nsIPresentationDevice.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationTCPSessionTransport.cpp firefox-85.0+build1/dom/presentation/PresentationTCPSessionTransport.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationTCPSessionTransport.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationTCPSessionTransport.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,17 +4,25 @@
  * 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/Logging.h"
 #include "nsArrayUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIAsyncStreamCopier.h"
+#include "nsIInputStreamPump.h"
 #include "nsIMultiplexInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIPresentationControlChannel.h"
+#include "nsIPresentationService.h"
 #include "nsIScriptableInputStream.h"
 #include "nsISocketTransport.h"
 #include "nsISocketTransportService.h"
+#include "nsIStringStream.h"
 #include "nsISupportsPrimitives.h"
 #include "nsNetUtil.h"
 #include "nsQueryObject.h"
 #include "nsServiceManagerUtils.h"
 #include "nsStreamUtils.h"
+#include "nsStringStream.h"
 #include "nsThreadUtils.h"
 #include "PresentationLog.h"
 #include "PresentationTCPSessionTransport.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationTCPSessionTransport.h firefox-85.0+build1/dom/presentation/PresentationTCPSessionTransport.h
--- firefox-84.0.2+build1/dom/presentation/PresentationTCPSessionTransport.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationTCPSessionTransport.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsIAsyncInputStream.h"
 #include "nsIPresentationSessionTransport.h"
 #include "nsIPresentationSessionTransportBuilder.h"
diff -Nru firefox-84.0.2+build1/dom/presentation/PresentationTerminateRequest.cpp firefox-85.0+build1/dom/presentation/PresentationTerminateRequest.cpp
--- firefox-84.0.2+build1/dom/presentation/PresentationTerminateRequest.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/PresentationTerminateRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PresentationTerminateRequest.h"
+#include "nsIPresentationControlChannel.h"
 #include "nsIPresentationDevice.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/presentation/provider/ControllerStateMachine.jsm firefox-85.0+build1/dom/presentation/provider/ControllerStateMachine.jsm
--- firefox-84.0.2+build1/dom/presentation/provider/ControllerStateMachine.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/provider/ControllerStateMachine.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,7 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["ControllerStateMachine"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ControllerStateMachine"];
 
 const { CommandType, State } = ChromeUtils.import(
   "resource://gre/modules/presentation/StateMachineHelper.jsm"
@@ -20,7 +20,7 @@
 var handlers = [
   function _initHandler(stateMachine, command) {
     // shouldn't receive any command at init state.
-    DEBUG && debug("unexpected command: " + JSON.stringify(command)); // jshint ignore:line
+    DEBUG && debug("unexpected command: " + JSON.stringify(command));
   },
   function _connectingHandler(stateMachine, command) {
     switch (command.type) {
@@ -80,7 +80,7 @@
   },
   function _closedHandler(stateMachine, command) {
     // ignore every command in closed state.
-    DEBUG && debug("unexpected command: " + JSON.stringify(command)); // jshint ignore:line
+    DEBUG && debug("unexpected command: " + JSON.stringify(command));
   },
 ];
 
@@ -193,7 +193,7 @@
         break;
       default:
         DEBUG &&
-          debug("unexpected channel close: " + reason + ", " + isByRemote); // jshint ignore:line
+          debug("unexpected channel close: " + reason + ", " + isByRemote);
         break;
     }
   },
diff -Nru firefox-84.0.2+build1/dom/presentation/provider/PresentationControlService.jsm firefox-85.0+build1/dom/presentation/provider/PresentationControlService.jsm
--- firefox-84.0.2+build1/dom/presentation/provider/PresentationControlService.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/provider/PresentationControlService.jsm	2021-01-18 19:58:09.000000000 +0000
@@ -52,7 +52,7 @@
   startServer(aEncrypted, aPort) {
     if (this._isServiceInit()) {
       DEBUG &&
-        log("PresentationControlService - server socket has been initialized"); // jshint ignore:line
+        log("PresentationControlService - server socket has been initialized");
       throw Components.Exception("", Cr.NS_ERROR_FAILURE);
     }
 
@@ -70,7 +70,7 @@
       ].getService(Ci.nsILocalCertService);
       localCertService.getOrCreateCert(kLocalCertName, {
         handleCert(aCert, aRv) {
-          DEBUG && log("PresentationControlService - handleCert"); // jshint ignore:line
+          DEBUG && log("PresentationControlService - handleCert");
           if (aRv) {
             self._notifyServerStopped(aRv);
           } else {
@@ -93,7 +93,7 @@
 
   _serverSocketInit(aPort, aCert) {
     if (!this._serverSocket) {
-      DEBUG && log("PresentationControlService - create server socket fail."); // jshint ignore:line
+      DEBUG && log("PresentationControlService - create server socket fail.");
       throw Components.Exception("", Cr.NS_ERROR_FAILURE);
     }
 
@@ -111,14 +111,14 @@
     } catch (e) {
       // NS_ERROR_SOCKET_ADDRESS_IN_USE
       DEBUG &&
-        log("PresentationControlService - init server socket fail: " + e); // jshint ignore:line
+        log("PresentationControlService - init server socket fail: " + e);
       throw Components.Exception("", Cr.NS_ERROR_FAILURE);
     }
 
     this._port = this._serverSocket.port;
 
     DEBUG &&
-      log("PresentationControlService - service start on port: " + this._port); // jshint ignore:line
+      log("PresentationControlService - service start on port: " + this._port);
 
     // Monitor network interface change to restart server socket.
     Services.obs.addObserver(this, "network:offline-status-changed");
@@ -188,10 +188,10 @@
       DEBUG &&
         log(
           "PresentationControlService - Id has not initialized; connect fails"
-        ); // jshint ignore:line
+        );
       return null;
     }
-    DEBUG && log("PresentationControlService - connect to " + aDeviceInfo.id); // jshint ignore:line
+    DEBUG && log("PresentationControlService - connect to " + aDeviceInfo.id);
 
     let socketTransport = this._attemptConnect(aDeviceInfo);
     return new TCPControlChannel(this, socketTransport, aDeviceInfo, "sender");
@@ -233,7 +233,7 @@
       // Shorten the connection failure procedure.
       socketTransport.setTimeout(Ci.nsISocketTransport.TIMEOUT_CONNECT, 2);
     } catch (e) {
-      DEBUG && log("PresentationControlService - createTransport throws: " + e); // jshint ignore:line
+      DEBUG && log("PresentationControlService - createTransport throws: " + e);
       // Pop the exception to |TCPDevice.establishControlChannel|
       throw Components.Exception("", Cr.NS_ERROR_FAILURE);
     }
@@ -246,14 +246,14 @@
         log(
           "PresentationControlService - should never receive remote " +
             "session request before server socket initialization"
-        ); // jshint ignore:line
+        );
       return null;
     }
     DEBUG &&
       log(
         "PresentationControlService - responseSession to " +
           JSON.stringify(aDeviceInfo)
-      ); // jshint ignore:line
+      );
     return new TCPControlChannel(
       this,
       aSocketTransport,
@@ -270,7 +270,7 @@
           aDeviceInfo.address +
           ":" +
           aDeviceInfo.port
-      ); // jshint ignore:line
+      );
     if (!this.listener) {
       this.releaseControlChannel(aControlChannel);
       return;
@@ -297,7 +297,7 @@
           aDeviceInfo.address +
           ":" +
           aDeviceInfo.port
-      ); // jshint ignore:line
+      );
     if (!this.listener) {
       this.releaseControlChannel(aControlChannel);
       return;
@@ -319,7 +319,7 @@
           aDeviceInfo.address +
           ":" +
           aDeviceInfo.port
-      ); // jshint ignore:line
+      );
     if (!this.listener) {
       this.releaseControlChannel(aControlChannel);
       return;
@@ -342,7 +342,7 @@
           aClientSocket.host +
           ":" +
           aClientSocket.port
-      ); // jshint ignore:line
+      );
     let deviceInfo = new TCPDeviceInfo(aClientSocket.host, aClientSocket.port);
     this.holdControlChannel(this.responseSession(deviceInfo, aClientSocket));
   },
@@ -360,13 +360,13 @@
 
   // nsIServerSocketListener (Triggered by nsIServerSocket.init)
   onStopListening(aServerSocket, aStatus) {
-    DEBUG && log("PresentationControlService - onStopListening: " + aStatus); // jshint ignore:line
+    DEBUG && log("PresentationControlService - onStopListening: " + aStatus);
   },
 
   close() {
-    DEBUG && log("PresentationControlService - close"); // jshint ignore:line
+    DEBUG && log("PresentationControlService - close");
     if (this._isServiceInit()) {
-      DEBUG && log("PresentationControlService - close server socket"); // jshint ignore:line
+      DEBUG && log("PresentationControlService - close server socket");
       this._serverSocket.close();
       this._serverSocket = null;
 
@@ -379,11 +379,11 @@
 
   // nsIObserver
   observe(aSubject, aTopic, aData) {
-    DEBUG && log("PresentationControlService - observe: " + aTopic); // jshint ignore:line
+    DEBUG && log("PresentationControlService - observe: " + aTopic);
     switch (aTopic) {
       case "network:offline-status-changed": {
         if (aData == "offline") {
-          DEBUG && log("network offline"); // jshint ignore:line
+          DEBUG && log("network offline");
           return;
         }
         this._restartServer();
@@ -393,7 +393,7 @@
   },
 
   _restartServer() {
-    DEBUG && log("PresentationControlService - restart service"); // jshint ignore:line
+    DEBUG && log("PresentationControlService - restart service");
 
     // restart server socket
     if (this._isServiceInit()) {
@@ -402,7 +402,7 @@
       try {
         this.startServer();
       } catch (e) {
-        DEBUG && log("PresentationControlService - restart service fail: " + e); // jshint ignore:line
+        DEBUG && log("PresentationControlService - restart service fail: " + e);
       }
     }
   },
@@ -494,7 +494,7 @@
   deviceInfo,
   direction
 ) {
-  DEBUG && log("create TCPControlChannel for : " + direction); // jshint ignore:line
+  DEBUG && log("create TCPControlChannel for : " + direction);
   this._deviceInfo = deviceInfo;
   this._direction = direction;
   this._transport = transport;
@@ -571,7 +571,7 @@
       // Start a guard timer to ensure terminateAck is processed.
       this._terminateTimer = setTimeout(() => {
         DEBUG &&
-          log("TCPControlChannel - terminate timeout: " + aPresentationId); // jshint ignore:line
+          log("TCPControlChannel - terminate timeout: " + aPresentationId);
         delete this._terminateTimer;
         if (this._pendingDisconnect) {
           this._pendingDisconnect();
@@ -595,7 +595,7 @@
 
   // may throw an exception
   _send(aMsg) {
-    DEBUG && log("TCPControlChannel - Send: " + JSON.stringify(aMsg, null, 2)); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - Send: " + JSON.stringify(aMsg, null, 2));
 
     /**
      * XXX In TCP streaming, it is possible that more than one message in one
@@ -608,14 +608,14 @@
     try {
       this._output.write(message, message.length);
     } catch (e) {
-      DEBUG && log("TCPControlChannel - Failed to send message: " + e.name); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - Failed to send message: " + e.name);
       throw e;
     }
   },
 
   _setSecurityObserver(observer) {
     if (this._transport && this._transport.securityInfo) {
-      DEBUG && log("TCPControlChannel - setSecurityObserver: " + observer); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - setSecurityObserver: " + observer);
       let connectionInfo = this._transport.securityInfo.QueryInterface(
         Ci.nsITLSServerConnectionInfo
       );
@@ -638,7 +638,7 @@
 
   // nsIAsyncOutputStream
   onOutputStreamReady() {
-    DEBUG && log("TCPControlChannel - onOutputStreamReady"); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - onOutputStreamReady");
     if (this._outgoingMsgs.length === 0) {
       return;
     }
@@ -661,11 +661,11 @@
   // nsIAsyncInputStream (Triggered by nsIInputStream.asyncWait)
   // Only used for detecting connection refused
   onInputStreamReady(aStream) {
-    DEBUG && log("TCPControlChannel - onInputStreamReady"); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - onInputStreamReady");
     try {
       aStream.available();
     } catch (e) {
-      DEBUG && log("TCPControlChannel - onInputStreamReady error: " + e.name); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - onInputStreamReady error: " + e.name);
       // NS_ERROR_CONNECTION_REFUSED
       this._notifyDisconnected(e.result);
     }
@@ -679,7 +679,7 @@
           aStatus.toString(16) +
           " with role: " +
           this._direction
-      ); // jshint ignore:line
+      );
     if (aStatus === Ci.nsISocketTransport.STATUS_CONNECTED_TO) {
       this._outgoingEnabled = true;
       this._createInputStreamPump();
@@ -689,7 +689,7 @@
   // nsIRequestObserver (Triggered by nsIInputStreamPump.asyncRead)
   onStartRequest() {
     DEBUG &&
-      log("TCPControlChannel - onStartRequest with role: " + this._direction); // jshint ignore:line
+      log("TCPControlChannel - onStartRequest with role: " + this._direction);
     this._incomingEnabled = true;
   },
 
@@ -701,7 +701,7 @@
           aStatus +
           " with role: " +
           this._direction
-      ); // jshint ignore:line
+      );
     this._stateMachine.onChannelClosed(aStatus, true);
   },
 
@@ -711,7 +711,7 @@
       aInputStream,
       aInputStream.available()
     );
-    DEBUG && log("TCPControlChannel - onDataAvailable: " + data); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - onDataAvailable: " + data);
 
     // Parser of line delimited JSON. Please see |_send| for more informaiton.
     let jsonArray = data.split("\n");
@@ -721,7 +721,7 @@
       try {
         msg = JSON.parse(json);
       } catch (e) {
-        DEBUG && log("TCPSignalingChannel - error in parsing json: " + e); // jshint ignore:line
+        DEBUG && log("TCPSignalingChannel - error in parsing json: " + e);
       }
 
       this._handleMessage(msg);
@@ -734,7 +734,7 @@
     }
 
     DEBUG &&
-      log("TCPControlChannel - create pump with role: " + this._direction); // jshint ignore:line
+      log("TCPControlChannel - create pump with role: " + this._direction);
     this._pump = Cc["@mozilla.org/network/input-stream-pump;1"].createInstance(
       Ci.nsIInputStreamPump
     );
@@ -751,7 +751,7 @@
           JSON.stringify(this._deviceInfo) +
           ": " +
           JSON.stringify(aMsg)
-      ); // jshint ignore:line
+      );
     this._stateMachine.onCommand(aMsg);
   },
 
@@ -760,7 +760,7 @@
   },
 
   set listener(aListener) {
-    DEBUG && log("TCPControlChannel - set listener: " + aListener); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - set listener: " + aListener);
     if (!aListener) {
       this._listener = null;
       return;
@@ -769,7 +769,7 @@
     this._listener = aListener;
     if (this._pendingOpen) {
       this._pendingOpen = false;
-      DEBUG && log("TCPControlChannel - notify pending opened"); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - notify pending opened");
       this._listener.notifyConnected();
     }
 
@@ -778,7 +778,7 @@
       DEBUG &&
         log(
           "TCPControlChannel - notify pending offer: " + JSON.stringify(offer)
-        ); // jshint ignore:line
+        );
       this._listener.onOffer(new ChannelDescription(offer));
       this._pendingOffer = null;
     }
@@ -788,19 +788,19 @@
       DEBUG &&
         log(
           "TCPControlChannel - notify pending answer: " + JSON.stringify(answer)
-        ); // jshint ignore:line
+        );
       this._listener.onAnswer(new ChannelDescription(answer));
       this._pendingAnswer = null;
     }
 
     if (this._pendingClose) {
-      DEBUG && log("TCPControlChannel - notify pending closed"); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - notify pending closed");
       this._notifyDisconnected(this._pendingCloseReason);
       this._pendingClose = null;
     }
 
     if (this._pendingReconnect) {
-      DEBUG && log("TCPControlChannel - notify pending reconnected"); // jshint ignore:line
+      DEBUG && log("TCPControlChannel - notify pending reconnected");
       this._notifyReconnected();
       this._pendingReconnect = false;
     }
@@ -818,7 +818,7 @@
       this._pendingOffer = aOffer;
       return;
     }
-    DEBUG && log("TCPControlChannel - notify offer: " + JSON.stringify(aOffer)); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - notify offer: " + JSON.stringify(aOffer));
     this._listener.onOffer(new ChannelDescription(aOffer));
   },
 
@@ -831,7 +831,7 @@
       return;
     }
     DEBUG &&
-      log("TCPControlChannel - notify answer: " + JSON.stringify(aAnswer)); // jshint ignore:line
+      log("TCPControlChannel - notify answer: " + JSON.stringify(aAnswer));
     this._listener.onAnswer(new ChannelDescription(aAnswer));
   },
 
@@ -845,7 +845,7 @@
     }
 
     DEBUG &&
-      log("TCPControlChannel - notify opened with role: " + this._direction); // jshint ignore:line
+      log("TCPControlChannel - notify opened with role: " + this._direction);
     this._listener.notifyConnected();
   },
 
@@ -866,7 +866,7 @@
     }
 
     DEBUG &&
-      log("TCPControlChannel - notify closed with role: " + this._direction); // jshint ignore:line
+      log("TCPControlChannel - notify closed with role: " + this._direction);
     this._listener.notifyDisconnected(aReason);
   },
 
@@ -879,7 +879,7 @@
     DEBUG &&
       log(
         "TCPControlChannel - notify reconnected with role: " + this._direction
-      ); // jshint ignore:line
+      );
     this._listener.notifyReconnected();
   },
 
@@ -917,7 +917,7 @@
   },
 
   disconnect(aReason) {
-    DEBUG && log("TCPControlChannel - disconnect with reason: " + aReason); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - disconnect with reason: " + aReason);
 
     // Pending disconnect during termination procedure.
     if (this._terminateTimer) {
@@ -936,14 +936,14 @@
 
       // Start a guard timer to ensure the transport will be closed.
       this._disconnectTimer = setTimeout(() => {
-        DEBUG && log("TCPControlChannel - disconnect timeout"); // jshint ignore:line
+        DEBUG && log("TCPControlChannel - disconnect timeout");
         this._closeTransport();
       }, kDisconnectTimeout);
     }
   },
 
   reconnect(aPresentationId, aUrl) {
-    DEBUG && log("TCPControlChannel - reconnect with role: " + this._direction); // jshint ignore:line
+    DEBUG && log("TCPControlChannel - reconnect with role: " + this._direction);
     if (this._direction != "sender") {
       throw Components.Exception("", Cr.NS_ERROR_FAILURE);
     }
@@ -1006,7 +1006,7 @@
       // Requested presentation Id doesn't matched with the one in ACK.
       // Disconnect the control channel with error.
       DEBUG &&
-        log("TCPControlChannel - unmatched terminatingId: " + presentationId); // jshint ignore:line
+        log("TCPControlChannel - unmatched terminatingId: " + presentationId);
       this.disconnect(Cr.NS_ERROR_FAILURE);
     }
 
diff -Nru firefox-84.0.2+build1/dom/presentation/provider/ReceiverStateMachine.jsm firefox-85.0+build1/dom/presentation/provider/ReceiverStateMachine.jsm
--- firefox-84.0.2+build1/dom/presentation/provider/ReceiverStateMachine.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/provider/ReceiverStateMachine.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,7 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["ReceiverStateMachine"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["ReceiverStateMachine"];
 
 const { CommandType, State } = ChromeUtils.import(
   "resource://gre/modules/presentation/StateMachineHelper.jsm"
@@ -20,7 +20,7 @@
 var handlers = [
   function _initHandler(stateMachine, command) {
     // shouldn't receive any command at init state
-    DEBUG && debug("unexpected command: " + JSON.stringify(command)); // jshint ignore:line
+    DEBUG && debug("unexpected command: " + JSON.stringify(command));
   },
   function _connectingHandler(stateMachine, command) {
     switch (command.type) {
@@ -91,7 +91,7 @@
   },
   function _closedHandler(stateMachine, command) {
     // ignore every command in closed state.
-    DEBUG && debug("unexpected command: " + JSON.stringify(command)); // jshint ignore:line
+    DEBUG && debug("unexpected command: " + JSON.stringify(command));
   },
 ];
 
@@ -190,7 +190,7 @@
         break;
       default:
         DEBUG &&
-          debug("unexpected channel close: " + reason + ", " + isByRemote); // jshint ignore:line
+          debug("unexpected channel close: " + reason + ", " + isByRemote);
         break;
     }
   },
diff -Nru firefox-84.0.2+build1/dom/presentation/provider/StateMachineHelper.jsm firefox-85.0+build1/dom/presentation/provider/StateMachineHelper.jsm
--- firefox-84.0.2+build1/dom/presentation/provider/StateMachineHelper.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/provider/StateMachineHelper.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -3,11 +3,10 @@
 /* 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/. */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["State", "CommandType"]; // jshint ignore:line
+var EXPORTED_SYMBOLS = ["State", "CommandType"];
 
 const State = Object.freeze({
   INIT: 0,
@@ -35,5 +34,5 @@
   ICE_CANDIDATE: "ice-candidate", // { candidate: <string> }
 });
 
-this.State = State; // jshint ignore:line
-this.CommandType = CommandType; // jshint ignore:line
+this.State = State;
+this.CommandType = CommandType;
diff -Nru firefox-84.0.2+build1/dom/presentation/tests/mochitest/mochitest.ini firefox-85.0+build1/dom/presentation/tests/mochitest/mochitest.ini
--- firefox-84.0.2+build1/dom/presentation/tests/mochitest/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/tests/mochitest/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -41,7 +41,9 @@
 [test_presentation_1ua_connection_wentaway_oop.html]
 skip-if = e10s # Bug 1129785
 [test_presentation_tcp_sender_disconnect.html]
+skip-if = os == 'android'
 [test_presentation_tcp_sender_establish_connection_error.html]
+skip-if = os == 'android'
 [test_presentation_tcp_receiver_establish_connection_error.html]
 skip-if = (e10s || os == 'mac' || os == 'win') # Bug 1129785, Bug 1204709
 [test_presentation_tcp_receiver_establish_connection_timeout.html]
@@ -67,6 +69,7 @@
 [test_presentation_terminate_establish_connection_error_oop.html]
 skip-if = e10s
 [test_presentation_sender_on_terminate_request.html]
+skip-if = os == 'android'
 [test_presentation_sandboxed_presentation.html]
 skip-if = true # bug 1315867
 [test_presentation_reconnect.html]
diff -Nru firefox-84.0.2+build1/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js firefox-85.0+build1/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js
--- firefox-84.0.2+build1/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js	2021-01-18 19:58:10.000000000 +0000
@@ -111,9 +111,9 @@
   },
 };
 
-const mockedSocketTransport = {
-  QueryInterface: ChromeUtils.generateQI(["nsISocketTransport"]),
-};
+const mockedSocketTransport = Cc[
+  "@mozilla.org/presentation/mockedsockettransport;1"
+].createInstance(Ci.nsISocketTransport);
 
 const mockedControlChannel = {
   QueryInterface: ChromeUtils.generateQI(["nsIPresentationControlChannel"]),
diff -Nru firefox-84.0.2+build1/dom/prio/test/gtest/TestPrioEncoder.cpp firefox-85.0+build1/dom/prio/test/gtest/TestPrioEncoder.cpp
--- firefox-84.0.2+build1/dom/prio/test/gtest/TestPrioEncoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/prio/test/gtest/TestPrioEncoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "PrioEncoder.h"
 
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/ErrorResult.h"
 
 #include "mprio.h"
 
diff -Nru firefox-84.0.2+build1/dom/promise/Promise.cpp firefox-85.0+build1/dom/promise/Promise.cpp
--- firefox-84.0.2+build1/dom/promise/Promise.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/promise/Promise.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ResultExtensions.h"
@@ -850,5 +851,52 @@
   return PromiseState::Pending;
 }
 
+void Promise::SetSettledPromiseIsHandled() {
+  AutoAllowLegacyScriptExecution exemption;
+  AutoEntryScript aes(mGlobal, "Set settled promise handled");
+  JSContext* cx = aes.cx();
+  JS::RootedObject promiseObj(cx, mPromiseObj);
+  JS::SetSettledPromiseIsHandled(cx, promiseObj);
+}
+
 }  // namespace dom
 }  // namespace mozilla
+
+extern "C" {
+
+// These functions are used in the implementation of ffi bindings for
+// dom::Promise from Rust.
+
+void DomPromise_AddRef(mozilla::dom::Promise* aPromise) {
+  MOZ_ASSERT(aPromise);
+  aPromise->AddRef();
+}
+
+void DomPromise_Release(mozilla::dom::Promise* aPromise) {
+  MOZ_ASSERT(aPromise);
+  aPromise->Release();
+}
+
+#define DOM_PROMISE_FUNC_WITH_VARIANT(name, func)                         \
+  void name(mozilla::dom::Promise* aPromise, nsIVariant* aVariant) {      \
+    MOZ_ASSERT(aPromise);                                                 \
+    MOZ_ASSERT(aVariant);                                                 \
+    mozilla::dom::AutoEntryScript aes(aPromise->GetGlobalObject(),        \
+                                      "Promise resolution or rejection"); \
+    JSContext* cx = aes.cx();                                             \
+                                                                          \
+    JS::Rooted<JS::Value> val(cx);                                        \
+    nsresult rv = NS_OK;                                                  \
+    if (!XPCVariant::VariantDataToJS(cx, aVariant, &rv, &val)) {          \
+      aPromise->MaybeRejectWithTypeError(                                 \
+          "Failed to convert nsIVariant to JS");                          \
+      return;                                                             \
+    }                                                                     \
+    aPromise->func(val);                                                  \
+  }
+
+DOM_PROMISE_FUNC_WITH_VARIANT(DomPromise_RejectWithVariant, MaybeReject)
+DOM_PROMISE_FUNC_WITH_VARIANT(DomPromise_ResolveWithVariant, MaybeResolve)
+
+#undef DOM_PROMISE_FUNC_WITH_VARIANT
+}
diff -Nru firefox-84.0.2+build1/dom/promise/PromiseDebugging.cpp firefox-85.0+build1/dom/promise/PromiseDebugging.cpp
--- firefox-84.0.2+build1/dom/promise/PromiseDebugging.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/promise/PromiseDebugging.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -23,9 +23,9 @@
 namespace mozilla {
 namespace dom {
 
-class FlushRejections : public CancelableRunnable {
+class FlushRejections : public DiscardableRunnable {
  public:
-  FlushRejections() : CancelableRunnable("dom::FlushRejections") {}
+  FlushRejections() : DiscardableRunnable("dom::FlushRejections") {}
 
   static void Init() {
     if (!sDispatched.init()) {
diff -Nru firefox-84.0.2+build1/dom/promise/Promise.h firefox-85.0+build1/dom/promise/Promise.h
--- firefox-84.0.2+build1/dom/promise/Promise.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/promise/Promise.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,24 +7,32 @@
 #ifndef mozilla_dom_Promise_h
 #define mozilla_dom_Promise_h
 
+#include <functional>
 #include <type_traits>
 #include <utility>
-
-#include "js/Promise.h"
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
 #include "js/TypeDecls.h"
-#include "jspubtd.h"
-#include "mozilla/Attributes.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/TimeStamp.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
 #include "mozilla/WeakPtr.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/PromiseBinding.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
+#include "nsError.h"
+#include "nsISupports.h"
+#include "nsString.h"
 
+class nsCycleCollectionTraversalCallback;
 class nsIGlobalObject;
 
+namespace JS {
+class Value;
+}
+
 namespace mozilla {
 
 namespace dom {
@@ -173,13 +181,7 @@
 
   // Mark a settled promise as already handled so that rejections will not
   // be reported as unhandled.
-  void SetSettledPromiseIsHandled() {
-    AutoAllowLegacyScriptExecution exemption;
-    AutoEntryScript aes(mGlobal, "Set settled promise handled");
-    JSContext* cx = aes.cx();
-    JS::RootedObject promiseObj(cx, mPromiseObj);
-    JS::SetSettledPromiseIsHandled(cx, promiseObj);
-  }
+  void SetSettledPromiseIsHandled();
 
   // WebIDL
 
@@ -341,4 +343,15 @@
 }  // namespace dom
 }  // namespace mozilla
 
+extern "C" {
+// These functions are used in the implementation of ffi bindings for
+// dom::Promise from Rust in xpcom crate.
+void DomPromise_AddRef(mozilla::dom::Promise* aPromise);
+void DomPromise_Release(mozilla::dom::Promise* aPromise);
+void DomPromise_RejectWithVariant(mozilla::dom::Promise* aPromise,
+                                  nsIVariant* aVariant);
+void DomPromise_ResolveWithVariant(mozilla::dom::Promise* aPromise,
+                                   nsIVariant* aVariant);
+}
+
 #endif  // mozilla_dom_Promise_h
diff -Nru firefox-84.0.2+build1/dom/promise/PromiseNativeHandler.h firefox-85.0+build1/dom/promise/PromiseNativeHandler.h
--- firefox-84.0.2+build1/dom/promise/PromiseNativeHandler.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/promise/PromiseNativeHandler.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include <functional>
 #include "js/TypeDecls.h"
+#include "mozilla/Maybe.h"
 #include "nsISupports.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/prototype/PrototypeDocumentContentSink.cpp firefox-85.0+build1/dom/prototype/PrototypeDocumentContentSink.cpp
--- firefox-84.0.2+build1/dom/prototype/PrototypeDocumentContentSink.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/prototype/PrototypeDocumentContentSink.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -49,6 +49,7 @@
 #include "mozilla/LoadInfo.h"
 #include "mozilla/PresShell.h"
 
+#include "GeckoProfiler.h"
 #include "nsXULPrototypeCache.h"
 #include "nsXULElement.h"
 #include "mozilla/CycleCollectedJSContext.h"
diff -Nru firefox-84.0.2+build1/dom/push/PushBroadcastService.jsm firefox-85.0+build1/dom/push/PushBroadcastService.jsm
--- firefox-84.0.2+build1/dom/push/PushBroadcastService.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushBroadcastService.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -1,4 +1,3 @@
-/* jshint moz: true, esnext: true */
 /* 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/. */
diff -Nru firefox-84.0.2+build1/dom/push/PushManager.cpp firefox-85.0+build1/dom/push/PushManager.cpp
--- firefox-84.0.2+build1/dom/push/PushManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -28,6 +28,7 @@
 
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/push/PushManager.h firefox-85.0+build1/dom/push/PushManager.h
--- firefox-84.0.2+build1/dom/push/PushManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushManager.h	2021-01-18 19:58:10.000000000 +0000
@@ -29,7 +29,6 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/TypedArray.h"
 
@@ -40,6 +39,8 @@
 class nsIPrincipal;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class OwningArrayBufferViewOrArrayBufferOrString;
diff -Nru firefox-84.0.2+build1/dom/push/PushNotifier.cpp firefox-85.0+build1/dom/push/PushNotifier.cpp
--- firefox-84.0.2+build1/dom/push/PushNotifier.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushNotifier.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsXPCOM.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/Unused.h"
 
diff -Nru firefox-84.0.2+build1/dom/push/PushServiceHttp2.jsm firefox-85.0+build1/dom/push/PushServiceHttp2.jsm
--- firefox-84.0.2+build1/dom/push/PushServiceHttp2.jsm	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushServiceHttp2.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -1,4 +1,3 @@
-/* jshint moz: true, esnext: true */
 /* 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/. */
diff -Nru firefox-84.0.2+build1/dom/push/PushServiceWebSocket.jsm firefox-85.0+build1/dom/push/PushServiceWebSocket.jsm
--- firefox-84.0.2+build1/dom/push/PushServiceWebSocket.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushServiceWebSocket.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -1,4 +1,3 @@
-/* jshint moz: true, esnext: true */
 /* 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/. */
diff -Nru firefox-84.0.2+build1/dom/push/PushSubscription.cpp firefox-85.0+build1/dom/push/PushSubscription.cpp
--- firefox-84.0.2+build1/dom/push/PushSubscription.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushSubscription.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsIPushService.h"
 #include "nsIScriptObjectPrincipal.h"
+#include "nsServiceManagerUtils.h"
 
 #include "mozilla/Base64.h"
 #include "mozilla/Unused.h"
@@ -18,6 +19,7 @@
 #include "mozilla/dom/PushUtil.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/WorkerScope.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/push/PushSubscription.h firefox-85.0+build1/dom/push/PushSubscription.h
--- firefox-84.0.2+build1/dom/push/PushSubscription.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushSubscription.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,12 +7,11 @@
 #ifndef mozilla_dom_PushSubscription_h
 #define mozilla_dom_PushSubscription_h
 
-#include "jsapi.h"
+#include "js/RootingAPI.h"
 #include "nsCOMPtr.h"
 #include "nsWrapperCache.h"
 
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 
 #include "mozilla/dom/BindingDeclarations.h"
@@ -23,6 +22,8 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Promise;
diff -Nru firefox-84.0.2+build1/dom/push/PushSubscriptionOptions.cpp firefox-85.0+build1/dom/push/PushSubscriptionOptions.cpp
--- firefox-84.0.2+build1/dom/push/PushSubscriptionOptions.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushSubscriptionOptions.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,8 +6,12 @@
 
 #include "mozilla/dom/PushSubscriptionOptions.h"
 
+#include "MainThreadUtils.h"
 #include "mozilla/dom/PushSubscriptionOptionsBinding.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/dom/PushUtil.h"
+#include "nsIGlobalObject.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/push/PushSubscriptionOptions.h firefox-85.0+build1/dom/push/PushSubscriptionOptions.h
--- firefox-84.0.2+build1/dom/push/PushSubscriptionOptions.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushSubscriptionOptions.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,9 @@
 #ifndef mozilla_dom_PushSubscriptionOptions_h
 #define mozilla_dom_PushSubscriptionOptions_h
 
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
diff -Nru firefox-84.0.2+build1/dom/push/PushUtil.cpp firefox-85.0+build1/dom/push/PushUtil.cpp
--- firefox-84.0.2+build1/dom/push/PushUtil.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushUtil.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/PushUtil.h"
+#include "mozilla/dom/UnionTypes.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/push/PushUtil.h firefox-85.0+build1/dom/push/PushUtil.h
--- firefox-84.0.2+build1/dom/push/PushUtil.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/push/PushUtil.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,8 @@
 #include "mozilla/dom/TypedArray.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class OwningArrayBufferViewOrArrayBuffer;
diff -Nru firefox-84.0.2+build1/dom/quota/ActorsChild.cpp firefox-85.0+build1/dom/quota/ActorsChild.cpp
--- firefox-84.0.2+build1/dom/quota/ActorsChild.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/ActorsChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -352,8 +352,14 @@
       HandleResponse();
       break;
 
-    case RequestResponse::TInitStorageAndOriginResponse:
-      HandleResponse(aResponse.get_InitStorageAndOriginResponse().created());
+    case RequestResponse::TInitializePersistentOriginResponse:
+      HandleResponse(
+          aResponse.get_InitializePersistentOriginResponse().created());
+      break;
+
+    case RequestResponse::TInitializeTemporaryOriginResponse:
+      HandleResponse(
+          aResponse.get_InitializeTemporaryOriginResponse().created());
       break;
 
     case RequestResponse::TPersistedResponse:
diff -Nru firefox-84.0.2+build1/dom/quota/ActorsParent.cpp firefox-85.0+build1/dom/quota/ActorsParent.cpp
--- firefox-84.0.2+build1/dom/quota/ActorsParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/ActorsParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -55,6 +55,7 @@
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
@@ -294,8 +295,6 @@
 
 const int32_t kCacheVersion = 1;
 
-const int64_t kBypassDirectoryLockIdTableId = -1;
-
 /******************************************************************************
  * SQLite functions
  ******************************************************************************/
@@ -345,25 +344,15 @@
 Result<int32_t, nsresult> LoadCacheVersion(mozIStorageConnection& aConnection) {
   AssertIsOnIOThread();
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = aConnection.CreateStatement(
-      "SELECT cache_version FROM database"_ns, getter_AddRefs(stmt));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  QM_TRY_INSPECT(const auto& stmt,
+                 CreateAndExecuteSingleStepStatement<
+                     SingleStepResult::ReturnNullIfNoResult>(
+                     aConnection, "SELECT cache_version FROM database"_ns));
 
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  if (NS_WARN_IF(!hasResult)) {
-    return Err(NS_ERROR_FILE_CORRUPTED);
-  }
+  QM_TRY(OkIf(stmt), Err(NS_ERROR_FILE_CORRUPTED));
 
   int32_t version;
-  rv = stmt->GetInt32(0, &version);
+  nsresult rv = stmt->GetInt32(0, &version);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return Err(rv);
   }
@@ -658,25 +647,15 @@
     mozIStorageConnection& aConnection) {
   AssertIsOnIOThread();
 
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = aConnection.CreateStatement("SELECT version FROM database"_ns,
-                                            getter_AddRefs(stmt));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
+  QM_TRY_INSPECT(const auto& stmt,
+                 CreateAndExecuteSingleStepStatement<
+                     SingleStepResult::ReturnNullIfNoResult>(
+                     aConnection, "SELECT version FROM database"_ns));
 
-  bool hasResult;
-  rv = stmt->ExecuteStep(&hasResult);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return Err(rv);
-  }
-
-  if (NS_WARN_IF(!hasResult)) {
-    return Err(NS_ERROR_FILE_CORRUPTED);
-  }
+  QM_TRY(OkIf(stmt), Err(NS_ERROR_FILE_CORRUPTED));
 
   int32_t version;
-  rv = stmt->GetInt32(0, &version);
+  nsresult rv = stmt->GetInt32(0, &version);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return Err(rv);
   }
@@ -742,6 +721,8 @@
 
 }  // namespace
 
+enum class ShouldUpdateLockIdTableFlag { No, Yes };
+
 class DirectoryLockImpl final : public DirectoryLock {
   const NotNull<RefPtr<QuotaManager>> mQuotaManager;
 
@@ -764,7 +745,10 @@
   // registraction/unregistration from updating origin access time, etc.
   const bool mInternal;
 
+  const bool mShouldUpdateLockIdTable;
+
   bool mRegistered;
+  FlippedOnce<true> mPending;
   FlippedOnce<false> mInvalidated;
 
  public:
@@ -774,6 +758,7 @@
                     const nsACString& aGroup, const OriginScope& aOriginScope,
                     const Nullable<Client::Type>& aClientType, bool aExclusive,
                     bool aInternal,
+                    ShouldUpdateLockIdTableFlag aShouldUpdateLockIdTableFlag,
                     RefPtr<OpenDirectoryListener> aOpenListener);
 
   void AssertIsOnOwningThread() const
@@ -798,6 +783,8 @@
 
   void SetRegistered(bool aRegistered) { mRegistered = aRegistered; }
 
+  bool IsPending() const { return mPending; }
+
   // Ideally, we would have just one table (instead of these two:
   // QuotaManager::mDirectoryLocks and QuotaManager::mDirectoryLockIdTable) for
   // all registered locks. However, some directory locks need to be accessed off
@@ -807,9 +794,7 @@
   // for now and to not register directory locks for eviction in
   // QuotaMnaager::mDirectoryLockIdTable. This can be improved in future after
   // some refactoring of the mutex locking.
-  bool ShouldUpdateLockIdTable() const {
-    return mId != kBypassDirectoryLockIdTableId;
-  }
+  bool ShouldUpdateLockIdTable() const { return mShouldUpdateLockIdTable; }
 
   bool ShouldUpdateLockTable() {
     return !mInternal &&
@@ -1013,7 +998,7 @@
 
   void LockedResetUsageForClient(Client::Type aClientType);
 
-  bool LockedGetUsageForClient(Client::Type aClientType, uint64_t& aUsage);
+  UsageInfo LockedGetUsageForClient(Client::Type aClientType);
 
   void LockedUpdateAccessTime(int64_t aAccessTime) {
     AssertCurrentThreadOwnsQuotaMutex();
@@ -1052,13 +1037,15 @@
 class OriginInfoLRUComparator {
  public:
   bool Equals(const OriginInfo* a, const OriginInfo* b) const {
-    return a && b ? a->LockedAccessTime() == b->LockedAccessTime()
-                  : !a && !b ? true : false;
+    return a && b     ? a->LockedAccessTime() == b->LockedAccessTime()
+           : !a && !b ? true
+                      : false;
   }
 
   bool LessThan(const OriginInfo* a, const OriginInfo* b) const {
     return a && b ? a->LockedAccessTime() < b->LockedAccessTime()
-                  : b ? true : false;
+           : b    ? true
+                  : false;
   }
 };
 
@@ -1655,18 +1642,38 @@
   void GetResponse(RequestResponse& aResponse) override;
 };
 
-class InitStorageAndOriginOp final : public QuotaRequestBase {
+class InitializeOriginRequestBase : public QuotaRequestBase {
+ protected:
   nsCString mSuffix;
   nsCString mGroup;
   bool mCreated;
 
  public:
-  explicit InitStorageAndOriginOp(const RequestParams& aParams);
-
   void Init(Quota& aQuota) override;
 
+ protected:
+  InitializeOriginRequestBase(PersistenceType aPersistenceType,
+                              const PrincipalInfo& aPrincipalInfo);
+};
+
+class InitializePersistentOriginOp final : public InitializeOriginRequestBase {
+ public:
+  explicit InitializePersistentOriginOp(const RequestParams& aParams);
+
  private:
-  ~InitStorageAndOriginOp() = default;
+  ~InitializePersistentOriginOp() = default;
+
+  nsresult DoDirectoryWork(QuotaManager& aQuotaManager) override;
+
+  void GetResponse(RequestResponse& aResponse) override;
+};
+
+class InitializeTemporaryOriginOp final : public InitializeOriginRequestBase {
+ public:
+  explicit InitializeTemporaryOriginOp(const RequestParams& aParams);
+
+ private:
+  ~InitializeTemporaryOriginOp() = default;
 
   nsresult DoDirectoryWork(QuotaManager& aQuotaManager) override;
 
@@ -2514,23 +2521,24 @@
   return timestamp;
 }
 
-nsresult EnsureDirectory(nsIFile* aDirectory, bool* aCreated) {
+// Returns a bool indicating whether the directory was newly created.
+Result<bool, nsresult> EnsureDirectory(nsIFile& aDirectory) {
   AssertIsOnIOThread();
 
   // TODO: Convert to mapOrElse once mozilla::Result supports it.
-  QM_TRY_INSPECT(const auto& exists,
-                 ToResult(aDirectory->Create(nsIFile::DIRECTORY_TYPE, 0755))
-                     .andThen(OkToOk<false>)
-                     .orElse(ErrToOkOrErr<NS_ERROR_FILE_ALREADY_EXISTS, true>));
+  QM_TRY_INSPECT(
+      const auto& exists,
+      MOZ_TO_RESULT_INVOKE(aDirectory, Create, nsIFile::DIRECTORY_TYPE, 0755)
+          .andThen(OkToOk<false>)
+          .orElse(ErrToOkOrErr<NS_ERROR_FILE_ALREADY_EXISTS, true>));
 
   if (exists) {
-    bool isDirectory;
-    QM_TRY(aDirectory->IsDirectory(&isDirectory));
-    QM_TRY(OkIf(isDirectory), NS_ERROR_UNEXPECTED);
+    QM_TRY_INSPECT(const bool& isDirectory,
+                   MOZ_TO_RESULT_INVOKE(aDirectory, IsDirectory));
+    QM_TRY(OkIf(isDirectory), Err(NS_ERROR_UNEXPECTED));
   }
 
-  *aCreated = !exists;
-  return NS_OK;
+  return !exists;
 }
 
 enum FileFlag { kTruncateFileFlag, kUpdateFileFlag, kAppendFileFlag };
@@ -2539,13 +2547,9 @@
     nsIFile& aFile, FileFlag aFileFlag) {
   AssertIsOnIOThread();
 
-  nsCOMPtr<nsIOutputStream> outputStream;
   switch (aFileFlag) {
-    case kTruncateFileFlag: {
-      QM_TRY(NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), &aFile));
-
-      break;
-    }
+    case kTruncateFileFlag:
+      QM_TRY_RETURN(NS_NewLocalFileOutputStream(&aFile));
 
     case kUpdateFileFlag: {
       QM_TRY_INSPECT(const bool& exists, MOZ_TO_RESULT_INVOKE(&aFile, Exists));
@@ -2554,28 +2558,21 @@
         return nsCOMPtr<nsIOutputStream>();
       }
 
-      nsCOMPtr<nsIFileStream> stream;
-      QM_TRY(NS_NewLocalFileStream(getter_AddRefs(stream), &aFile));
+      QM_TRY_INSPECT(const auto& stream, NS_NewLocalFileStream(&aFile));
 
-      outputStream = do_QueryInterface(stream);
+      nsCOMPtr<nsIOutputStream> outputStream = do_QueryInterface(stream);
       QM_TRY(OkIf(outputStream), Err(NS_ERROR_FAILURE));
 
-      break;
+      return outputStream;
     }
 
-    case kAppendFileFlag: {
-      QM_TRY(
-          NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), &aFile,
-                                      PR_WRONLY | PR_CREATE_FILE | PR_APPEND));
-
-      break;
-    }
+    case kAppendFileFlag:
+      QM_TRY_RETURN(NS_NewLocalFileOutputStream(
+          &aFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND));
 
     default:
       MOZ_CRASH("Should never get here!");
   }
-
-  return outputStream;
 }
 
 Result<nsCOMPtr<nsIBinaryOutputStream>, nsresult> GetBinaryOutputStream(
@@ -2716,12 +2713,10 @@
 
   QM_TRY(file->Append(aFilename));
 
-  nsCOMPtr<nsIInputStream> stream;
-  QM_TRY(NS_NewLocalFileInputStream(getter_AddRefs(stream), file));
+  QM_TRY_UNWRAP(auto stream, NS_NewLocalFileInputStream(file));
 
-  nsCOMPtr<nsIInputStream> bufferedStream;
-  QM_TRY(NS_NewBufferedInputStream(getter_AddRefs(bufferedStream),
-                                   stream.forget(), 512));
+  QM_TRY_INSPECT(const auto& bufferedStream,
+                 NS_NewBufferedInputStream(stream.forget(), 512));
 
   QM_TRY(OkIf(bufferedStream), Err(NS_ERROR_FAILURE));
 
@@ -2851,7 +2846,8 @@
     MovingNotNull<RefPtr<QuotaManager>> aQuotaManager, const int64_t aId,
     const Nullable<PersistenceType>& aPersistenceType, const nsACString& aGroup,
     const OriginScope& aOriginScope, const Nullable<Client::Type>& aClientType,
-    bool aExclusive, bool aInternal,
+    const bool aExclusive, const bool aInternal,
+    const ShouldUpdateLockIdTableFlag aShouldUpdateLockIdTableFlag,
     RefPtr<OpenDirectoryListener> aOpenListener)
     : mQuotaManager(std::move(aQuotaManager)),
       mPersistenceType(aPersistenceType),
@@ -2861,6 +2857,8 @@
       mId(aId),
       mExclusive(aExclusive),
       mInternal(aInternal),
+      mShouldUpdateLockIdTable(aShouldUpdateLockIdTableFlag ==
+                               ShouldUpdateLockIdTableFlag::Yes),
       mRegistered(false) {
   AssertIsOnOwningThread();
   MOZ_ASSERT_IF(aOriginScope.IsOrigin(), !aOriginScope.GetOrigin().IsEmpty());
@@ -2881,7 +2879,7 @@
 DirectoryLockImpl::~DirectoryLockImpl() {
   AssertIsOnOwningThread();
 
-  for (DirectoryLockImpl* blockingLock : mBlocking) {
+  for (NotNull<RefPtr<DirectoryLockImpl>> blockingLock : mBlocking) {
     blockingLock->MaybeUnblock(*this);
   }
 
@@ -2952,6 +2950,8 @@
   mOpenListener.destroy();
 
   mQuotaManager->RemovePendingDirectoryLock(*this);
+
+  mPending.Flip();
 }
 
 already_AddRefed<DirectoryLock> DirectoryLockImpl::Specialize(
@@ -2975,8 +2975,8 @@
       Nullable<PersistenceType>(aPersistenceType), aGroupAndOrigin.mGroup,
       OriginScope::FromOrigin(aGroupAndOrigin.mOrigin),
       Nullable<Client::Type>(aClientType),
-      /* aExclusive */ false, mInternal, /* aOpenListener */ nullptr);
-
+      /* aExclusive */ false, mInternal, ShouldUpdateLockIdTableFlag::Yes,
+      /* aOpenListener */ nullptr);
   if (NS_WARN_IF(!Overlaps(*lock))) {
     return nullptr;
   }
@@ -3042,13 +3042,10 @@
   }
   QM_LOG(("  mOriginScope: %s", originScope.get()));
 
-  nsString clientType;
-  if (mClientType.IsNull()) {
-    clientType.AssignLiteral("null");
-  } else {
-    Client::TypeToText(mClientType.Value(), clientType);
-  }
-  QM_LOG(("  mClientType: %s", NS_ConvertUTF16toUTF8(clientType).get()));
+  const auto clientType = mClientType.IsNull()
+                              ? nsAutoCString{"null"_ns}
+                              : Client::TypeToText(mClientType.Value());
+  QM_LOG(("  mClientType: %s", clientType.get()));
 
   nsCString blockedOnString;
   for (auto blockedOn : mBlockedOn) {
@@ -3174,6 +3171,8 @@
       return NS_OK;
     }
 
+    Telemetry::SetEventRecordingEnabled("dom.quota.try"_ns, true);
+
     gBasePath = new nsString();
 
     nsCOMPtr<nsIFile> baseDir;
@@ -3250,6 +3249,8 @@
 
     gBuildId = nullptr;
 
+    Telemetry::SetEventRecordingEnabled("dom.quota.try"_ns, false);
+
     return NS_OK;
   }
 
@@ -3714,7 +3715,7 @@
   RefPtr<DirectoryLockImpl> lock = new DirectoryLockImpl(
       WrapNotNullUnchecked(this), GenerateDirectoryLockId(), aPersistenceType,
       aGroup, aOriginScope, aClientType, aExclusive, aInternal,
-      std::move(aOpenListener));
+      ShouldUpdateLockIdTableFlag::Yes, std::move(aOpenListener));
 
   mPendingDirectoryLocks.AppendElement(lock);
 
@@ -3748,12 +3749,12 @@
   MOZ_ASSERT(!aGroupAndOrigin.mOrigin.IsEmpty());
 
   RefPtr<DirectoryLockImpl> lock = new DirectoryLockImpl(
-      WrapNotNullUnchecked(this),
-      /* aDirectoryLockId */ kBypassDirectoryLockIdTableId,
+      WrapNotNullUnchecked(this), GenerateDirectoryLockId(),
       Nullable<PersistenceType>(aPersistenceType), aGroupAndOrigin.mGroup,
       OriginScope::FromOrigin(aGroupAndOrigin.mOrigin),
       Nullable<Client::Type>(),
-      /* aExclusive */ true, /* aInternal */ true, nullptr);
+      /* aExclusive */ true, /* aInternal */ true,
+      ShouldUpdateLockIdTableFlag::No, nullptr);
 
 #ifdef DEBUG
   for (uint32_t index = mDirectoryLocks.Length(); index > 0; index--) {
@@ -4086,10 +4087,28 @@
       &ShutdownTimerCallback, this, DEFAULT_SHUTDOWN_TIMER_MS,
       nsITimer::TYPE_ONE_SHOT, "QuotaManager::ShutdownTimerCallback"));
 
-  // Each client will spin the event loop while we wait on all the threads
-  // to close. Our timer may fire during that loop.
-  for (Client::Type type : AllClientTypes()) {
-    mClients[type]->ShutdownWorkThreads();
+  const auto& allClientTypes = AllClientTypes();
+
+  bool needsToWait = false;
+  for (Client::Type type : allClientTypes) {
+    needsToWait |= mClients[type]->InitiateShutdownWorkThreads();
+  }
+  needsToWait |= static_cast<bool>(gNormalOriginOps);
+
+  // If any client cannot shutdown immediately, spin the event loop while we
+  // wait on all the threads to close. Our timer may fire during that loop.
+  if (needsToWait) {
+    MOZ_ALWAYS_TRUE(SpinEventLoopUntil([this, &allClientTypes] {
+      return !gNormalOriginOps &&
+             std::all_of(allClientTypes.cbegin(), allClientTypes.cend(),
+                         [&self = *this](const auto type) {
+                           return self.mClients[type]->IsShutdownCompleted();
+                         });
+    }));
+  }
+
+  for (Client::Type type : allClientTypes) {
+    mClients[type]->FinalizeShutdownWorkThreads();
   }
 
   // Cancel the timer regardless of whether it actually fired.
@@ -4097,8 +4116,6 @@
     NS_WARNING("Failed to cancel shutdown timer!");
   }
 
-  MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { return !gNormalOriginOps; }));
-
   // NB: It's very important that runnable is destroyed on this thread
   // (i.e. after we join the IO thread) because we can't release the
   // QuotaManager on the IO thread. This should probably use
@@ -4247,10 +4264,9 @@
   }
 }
 
-bool QuotaManager::GetUsageForClient(PersistenceType aPersistenceType,
-                                     const GroupAndOrigin& aGroupAndOrigin,
-                                     Client::Type aClientType,
-                                     uint64_t& aUsage) {
+UsageInfo QuotaManager::GetUsageForClient(PersistenceType aPersistenceType,
+                                          const GroupAndOrigin& aGroupAndOrigin,
+                                          Client::Type aClientType) {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(aPersistenceType != PERSISTENCE_TYPE_PERSISTENT);
 
@@ -4258,21 +4274,21 @@
 
   GroupInfoPair* pair;
   if (!mGroupInfoPairs.Get(aGroupAndOrigin.mGroup, &pair)) {
-    return false;
+    return UsageInfo{};
   }
 
   RefPtr<GroupInfo> groupInfo = pair->LockedGetGroupInfo(aPersistenceType);
   if (!groupInfo) {
-    return false;
+    return UsageInfo{};
   }
 
   RefPtr<OriginInfo> originInfo =
       groupInfo->LockedGetOriginInfo(aGroupAndOrigin.mOrigin);
   if (!originInfo) {
-    return false;
+    return UsageInfo{};
   }
 
-  return originInfo->LockedGetUsageForClient(aClientType, aUsage);
+  return originInfo->LockedGetUsageForClient(aClientType);
 }
 
 void QuotaManager::UpdateOriginAccessTime(
@@ -4396,12 +4412,12 @@
       }
 
       // We don't need to update the .metadata-v2 file on disk here,
-      // EnsureStorageAndOriginIsInitialized is responsible for doing that. We
+      // EnsureTemporaryOriginIsInitialized is responsible for doing that. We
       // just need to use correct group before initializing quota for the given
       // origin. (Note that calling GetDirectoryMetadata2WithRestore below
       // might update the group in the metadata file, but only as a side-effect.
       // The actual place we ensure consistency is in
-      // EnsureStorageAndOriginIsInitialized.)
+      // EnsureTemporaryOriginIsInitialized.)
 
       nsCString clientUsagesText;
       rv = stmt->GetUTF8String(3, clientUsagesText);
@@ -4466,7 +4482,7 @@
 
         // Calling GetDirectoryMetadata2WithRestore might update the group in
         // the metadata file, but only as a side-effect. The actual place we
-        // ensure consistency is in EnsureStorageAndOriginIsInitialized.
+        // ensure consistency is in EnsureTemporaryOriginIsInitialized.
 
         int64_t metadataLastAccessTime;
         bool metadataPersisted;
@@ -4511,24 +4527,13 @@
   bool loadQuotaFromCache = false;
 
   if (mCacheUsable) {
-    nsCOMPtr<mozIStorageStatement> stmt;
-    rv = mStorageConnection->CreateStatement(
-        nsLiteralCString("SELECT valid, build_id "
-                         "FROM cache"),
-        getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    bool hasResult;
-    rv = stmt->ExecuteStep(&hasResult);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    QM_TRY_INSPECT(
+        const auto& stmt,
+        CreateAndExecuteSingleStepStatement<
+            SingleStepResult::ReturnNullIfNoResult>(
+            *mStorageConnection, "SELECT valid, build_id FROM cache"_ns));
 
-    if (NS_WARN_IF(!hasResult)) {
-      return NS_ERROR_FILE_CORRUPTED;
-    }
+    QM_TRY(OkIf(stmt), Err(NS_ERROR_FILE_CORRUPTED));
 
     int32_t valid;
     rv = stmt->GetInt32(0, &valid);
@@ -4835,7 +4840,6 @@
 already_AddRefed<QuotaObject> QuotaManager::GetQuotaObject(
     const int64_t aDirectoryLockId, const nsAString& aPath) {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
-  MOZ_DIAGNOSTIC_ASSERT(aDirectoryLockId != kBypassDirectoryLockIdTableId);
 
   Maybe<MutexAutoLock> lock;
 
@@ -4849,6 +4853,7 @@
     MOZ_CRASH("Getting quota object for an unregistered directory lock?");
   }
   MOZ_DIAGNOSTIC_ASSERT(directoryLock);
+  MOZ_DIAGNOSTIC_ASSERT(directoryLock->ShouldUpdateLockIdTable());
 
   const PersistenceType persistenceType = directoryLock->GetPersistenceType();
   const GroupAndOrigin& groupAndOrigin = directoryLock->GroupAndOrigin();
@@ -5080,15 +5085,12 @@
 
   nsCOMPtr<nsIFile> directory = directoryOrErr.unwrap();
 
-  bool created;
-  nsresult rv = EnsureDirectory(directory, &created);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, Rep_EnsureDirectory);
-    return rv;
-  }
+  QM_TRY_INSPECT(const bool& created, EnsureDirectory(*directory));
+
+  Unused << created;
 
   nsCOMPtr<nsIDirectoryEnumerator> entries;
-  rv = directory->GetDirectoryEntries(getter_AddRefs(entries));
+  nsresult rv = directory->GetDirectoryEntries(getter_AddRefs(entries));
   if (NS_WARN_IF(NS_FAILED(rv))) {
     REPORT_TELEMETRY_INIT_ERR(kQuotaExternalError, Rep_GetDirEntries);
     return rv;
@@ -6021,20 +6023,9 @@
 
   if (connection) {
     // Find out the journal mode.
-    nsCOMPtr<mozIStorageStatement> stmt;
-    rv = connection->CreateStatement("PRAGMA journal_mode;"_ns,
-                                     getter_AddRefs(stmt));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    bool hasResult;
-    rv = stmt->ExecuteStep(&hasResult);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    MOZ_ASSERT(hasResult);
+    QM_TRY_INSPECT(const auto& stmt,
+                   CreateAndExecuteSingleStepStatement(
+                       *connection, "PRAGMA journal_mode;"_ns));
 
     nsCString journalMode;
     rv = stmt->GetUTF8String(0, journalMode);
@@ -6135,11 +6126,9 @@
 
     nsCOMPtr<nsIFile> storageDirectory = storageDirectoryOrErr.unwrap();
 
-    bool dummy;
-    rv = EnsureDirectory(storageDirectory, &dummy);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    QM_TRY_INSPECT(const bool& created, EnsureDirectory(*storageDirectory));
+
+    Unused << created;
 
     nsCOMPtr<mozIStorageConnection> lsArchiveConnection;
     rv = ss->OpenUnsharedDatabase(lsArchiveFile,
@@ -6392,6 +6381,9 @@
       Initialization::Storage,
       [&self = *this] { return static_cast<bool>(self.mStorageConnection); });
 
+  const auto contextLogExtraInfo = ScopedLogExtraInfo{
+      ScopedLogExtraInfo::kTagContext, "Initialization::Storage"_ns};
+
   QM_TRY_UNWRAP(auto storageFile, QM_NewLocalFile(mBasePath));
 
   QM_TRY(storageFile->Append(mStorageName + kSQLiteSuffix));
@@ -6713,9 +6705,8 @@
 
   // All the locks that block this new exclusive lock need to be invalidated.
   // We also need to notify clients to abort operations for them.
-  AutoTArray<UniquePtr<nsTHashtable<nsCStringHashKey>>, Client::TYPE_MAX>
-      origins;
-  origins.SetLength(Client::TypeMax());
+  AutoTArray<Client::DirectoryLockIdTable, Client::TYPE_MAX> lockIds;
+  lockIds.SetLength(Client::TypeMax());
 
   const auto& blockedOnLocks = lock->GetBlockedOnLocks();
 
@@ -6723,193 +6714,132 @@
     if (!blockedOnLock->IsInternal()) {
       blockedOnLock->Invalidate();
 
-      auto& clientOrigins = origins[blockedOnLock->ClientType()];
-      if (!clientOrigins) {
-        clientOrigins = MakeUnique<nsTHashtable<nsCStringHashKey>>();
+      // Clients don't have to handle pending locks. Invalidation is sufficient
+      // in that case (once a lock is ready and the listener needs to be
+      // notified, we will call DirectoryLockFailed instead of
+      // DirectoryLockAcquired which should release any remaining references to
+      // the lock).
+      if (!blockedOnLock->IsPending()) {
+        lockIds[blockedOnLock->ClientType()].Put(blockedOnLock->Id());
       }
-      clientOrigins->PutEntry(blockedOnLock->Origin());
     }
   }
 
   for (Client::Type type : AllClientTypes()) {
-    if (origins[type]) {
-      for (auto iter = origins[type]->Iter(); !iter.Done(); iter.Next()) {
-        MOZ_ASSERT(mClients[type]);
-
-        mClients[type]->AbortOperations(iter.Get()->GetKey());
-      }
+    if (lockIds[type].Filled()) {
+      mClients[type]->AbortOperationsForLocks(lockIds[type]);
     }
   }
 
   return blocked ? lock.forget() : nullptr;
 }
 
-Result<nsCOMPtr<nsIFile>, nsresult>
-QuotaManager::EnsureStorageAndOriginIsInitialized(
-    PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo,
-    Client::Type aClientType) {
+Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult>
+QuotaManager::EnsurePersistentOriginIsInitialized(const QuotaInfo& aQuotaInfo) {
   AssertIsOnIOThread();
+  MOZ_DIAGNOSTIC_ASSERT(mStorageConnection);
 
-  QM_TRY_RETURN(
-      EnsureStorageAndOriginIsInitializedInternal(
-          aPersistenceType, aQuotaInfo, Nullable<Client::Type>(aClientType))
-          .map([](const auto& res) { return res.first; }));
-}
+  auto res = [&aQuotaInfo, this]()
+      -> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
+    QM_TRY_UNWRAP(
+        auto directory,
+        GetDirectoryForOrigin(PERSISTENCE_TYPE_PERSISTENT, aQuotaInfo.mOrigin));
 
-Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult>
-QuotaManager::EnsureStorageAndOriginIsInitializedInternal(
-    PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo,
-    const Nullable<Client::Type>& aClientType) {
-  AssertIsOnIOThread();
+    if (mInitializedOrigins.Contains(aQuotaInfo.mOrigin)) {
+      return std::pair(std::move(directory), false);
+    }
 
-  // XXX Can't we just remove the argument if we don't need it?
-  Unused << aClientType;
+    QM_TRY_INSPECT(const bool& created, EnsureOriginDirectory(*directory));
 
-  QM_TRY(EnsureStorageIsInitialized());
+    int64_t timestamp;
+    if (created) {
+      timestamp = PR_Now();
 
-  nsCOMPtr<nsIFile> directory;
-  bool created;
-  if (aPersistenceType == PERSISTENCE_TYPE_PERSISTENT) {
-    QM_TRY(EnsurePersistentOriginIsInitialized(
-        aQuotaInfo, getter_AddRefs(directory), &created));
-  } else {
-    QM_TRY(EnsureTemporaryStorageIsInitialized());
+      // Only creating .metadata-v2 to reduce IO.
+      QM_TRY(CreateDirectoryMetadata2(*directory, timestamp,
+                                      /* aPersisted */ true, aQuotaInfo));
+    } else {
+      QM_TRY(GetDirectoryMetadata2WithRestore(directory,
+                                              /* aPersistent */ true,
+                                              &timestamp,
+                                              /* aPersisted */ nullptr));
 
-    QM_TRY(EnsureTemporaryOriginIsInitialized(
-        aPersistenceType, aQuotaInfo, getter_AddRefs(directory), &created));
-  }
+      MOZ_ASSERT(timestamp <= PR_Now());
+    }
 
-  return std::pair(std::move(directory), created);
-}
+    QM_TRY(InitializeOrigin(PERSISTENCE_TYPE_PERSISTENT, aQuotaInfo, timestamp,
+                            /* aPersisted */ true, directory));
 
-nsresult QuotaManager::EnsurePersistentOriginIsInitialized(
-    const QuotaInfo& aQuotaInfo, nsIFile** aDirectory, bool* aCreated) {
-  AssertIsOnIOThread();
-  MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aCreated);
-  MOZ_ASSERT(mStorageConnection);
+    mInitializedOrigins.AppendElement(aQuotaInfo.mOrigin);
 
-  nsresult rv = NS_OK;
+    return std::pair(std::move(directory), created);
+  }();
 
-  auto autoReportTelemetry = MakeScopeExit([&]() {
+  auto& info = mOriginInitializationInfos.GetOrInsert(aQuotaInfo.mOrigin);
+  if (!info.mPersistentOriginAttempted) {
     Telemetry::Accumulate(Telemetry::QM_FIRST_INITIALIZATION_ATTEMPT,
                           kPersistentOriginTelemetryKey,
-                          static_cast<uint32_t>(NS_SUCCEEDED(rv)));
-  });
+                          static_cast<uint32_t>(res.isOk()));
 
-  auto& info = mOriginInitializationInfos.GetOrInsert(aQuotaInfo.mOrigin);
-  if (info.mPersistentOriginAttempted) {
-    autoReportTelemetry.release();
-  } else {
     info.mPersistentOriginAttempted = true;
   }
 
-  QM_TRY_UNWRAP(
-      auto directory,
-      GetDirectoryForOrigin(PERSISTENCE_TYPE_PERSISTENT, aQuotaInfo.mOrigin));
-
-  if (mInitializedOrigins.Contains(aQuotaInfo.mOrigin)) {
-    directory.forget(aDirectory);
-    *aCreated = false;
-    return rv;
-  }
-
-  bool created;
-  rv = EnsureOriginDirectory(directory, &created);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  int64_t timestamp;
-  if (created) {
-    timestamp = PR_Now();
-
-    // Only creating .metadata-v2 to reduce IO.
-    rv = CreateDirectoryMetadata2(*directory, timestamp,
-                                  /* aPersisted */ true, aQuotaInfo);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  } else {
-    rv = GetDirectoryMetadata2WithRestore(directory,
-                                          /* aPersistent */ true, &timestamp,
-                                          /* aPersisted */ nullptr);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    MOZ_ASSERT(timestamp <= PR_Now());
-  }
-
-  rv = InitializeOrigin(PERSISTENCE_TYPE_PERSISTENT, aQuotaInfo, timestamp,
-                        /* aPersisted */ true, directory);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  mInitializedOrigins.AppendElement(aQuotaInfo.mOrigin);
-
-  directory.forget(aDirectory);
-  *aCreated = created;
-  return rv;
+  return res;
 }
 
-nsresult QuotaManager::EnsureTemporaryOriginIsInitialized(
-    PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo,
-    nsIFile** aDirectory, bool* aCreated) {
+Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult>
+QuotaManager::EnsureTemporaryOriginIsInitialized(
+    PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo) {
   AssertIsOnIOThread();
   MOZ_ASSERT(aPersistenceType != PERSISTENCE_TYPE_PERSISTENT);
-  MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aCreated);
-  MOZ_ASSERT(mStorageConnection);
-  MOZ_ASSERT(mTemporaryStorageInitialized);
+  MOZ_DIAGNOSTIC_ASSERT(mStorageConnection);
+  MOZ_DIAGNOSTIC_ASSERT(mTemporaryStorageInitialized);
 
-  nsresult rv = NS_OK;
+  auto res = [&aPersistenceType, &aQuotaInfo, this]()
+      -> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
+    // Get directory for this origin and persistence type.
+    QM_TRY_UNWRAP(auto directory,
+                  GetDirectoryForOrigin(aPersistenceType, aQuotaInfo.mOrigin));
 
-  auto autoReportTelemetry = MakeScopeExit([&]() {
-    Telemetry::Accumulate(Telemetry::QM_FIRST_INITIALIZATION_ATTEMPT,
-                          kTemporaryOriginTelemetryKey,
-                          static_cast<uint32_t>(NS_SUCCEEDED(rv)));
-  });
+    QM_TRY_INSPECT(const bool& created, EnsureOriginDirectory(*directory));
 
-  auto& info = mOriginInitializationInfos.GetOrInsert(aQuotaInfo.mOrigin);
-  if (info.mTemporaryOriginAttempted) {
-    autoReportTelemetry.release();
-  } else {
-    info.mTemporaryOriginAttempted = true;
-  }
+    if (created) {
+      int64_t timestamp;
+      NoteOriginDirectoryCreated(aPersistenceType, aQuotaInfo,
+                                 /* aPersisted */ false, timestamp);
+
+      // Only creating .metadata-v2 to reduce IO.
+      QM_TRY(CreateDirectoryMetadata2(*directory, timestamp,
+                                      /* aPersisted */ false, aQuotaInfo));
+    }
+
+    // TODO: If the metadata file exists and we didn't call
+    //       GetDirectoryMetadata2WithRestore for it (because the quota info
+    //       was loaded from the cache), then the group in the metadata file
+    //       may be wrong, so it should be checked and eventually updated.
+    //       It's not a big deal that we are not doing it here, because the
+    //       origin will be marked as "accessed", so
+    //       GetDirectoryMetadata2WithRestore will be called for the metadata
+    //       file in next session in LoadQuotaFromCache.
 
-  // Get directory for this origin and persistence type.
-  QM_TRY_UNWRAP(auto directory,
-                GetDirectoryForOrigin(aPersistenceType, aQuotaInfo.mOrigin));
-
-  bool created;
-  rv = EnsureOriginDirectory(directory, &created);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+    return std::pair(std::move(directory), created);
+  }();
 
-  if (created) {
-    int64_t timestamp;
-    NoteOriginDirectoryCreated(aPersistenceType, aQuotaInfo,
-                               /* aPersisted */ false, timestamp);
+  auto& info = mOriginInitializationInfos.GetOrInsert(aQuotaInfo.mOrigin);
+  if (!info.mTemporaryOriginAttempted) {
+    Telemetry::Accumulate(Telemetry::QM_FIRST_INITIALIZATION_ATTEMPT,
+                          kTemporaryOriginTelemetryKey,
+                          static_cast<uint32_t>(res.isOk()));
 
-    // Only creating .metadata-v2 to reduce IO.
-    rv = CreateDirectoryMetadata2(*directory, timestamp,
-                                  /* aPersisted */ false, aQuotaInfo);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+    info.mTemporaryOriginAttempted = true;
   }
 
-  directory.forget(aDirectory);
-  *aCreated = created;
-  return rv;
+  return res;
 }
 
 nsresult QuotaManager::EnsureTemporaryStorageIsInitialized() {
   AssertIsOnIOThread();
-  MOZ_ASSERT(mStorageConnection);
+  MOZ_DIAGNOSTIC_ASSERT(mStorageConnection);
 
   if (mTemporaryStorageInitialized) {
     mInitializationInfo.AssertInitializationAttempted(
@@ -6921,6 +6851,9 @@
       Initialization::TemporaryStorage,
       [&self = *this] { return self.mTemporaryStorageInitialized; });
 
+  const auto contextLogExtraInfo = ScopedLogExtraInfo{
+      ScopedLogExtraInfo::kTagContext, "Initialization::TemporaryStorage"_ns};
+
   nsresult rv;
 
   nsCOMPtr<nsIFile> storageDir =
@@ -6935,11 +6868,9 @@
   }
 
   // The storage directory must exist before calling GetDiskSpaceAvailable.
-  bool dummy;
-  rv = EnsureDirectory(storageDir, &dummy);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  QM_TRY_INSPECT(const bool& created, EnsureDirectory(*storageDir));
+
+  Unused << created;
 
   // Check for available disk space users have on their device where storage
   // directory lives.
@@ -6996,39 +6927,28 @@
   mInitializationInfo.ResetInitializationAttempts();
 }
 
-nsresult QuotaManager::EnsureOriginDirectory(nsIFile* aDirectory,
-                                             bool* aCreated) {
+Result<bool, nsresult> QuotaManager::EnsureOriginDirectory(
+    nsIFile& aDirectory) {
   AssertIsOnIOThread();
-  MOZ_ASSERT(aDirectory);
-  MOZ_ASSERT(aCreated);
 
-  bool exists;
-  nsresult rv = aDirectory->Exists(&exists);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  QM_TRY_INSPECT(const bool& exists, MOZ_TO_RESULT_INVOKE(aDirectory, Exists));
 
   if (!exists) {
-    nsString leafName;
-    rv = aDirectory->GetLeafName(leafName);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    if (!IsSanitizedOriginValid(NS_ConvertUTF16toUTF8(leafName))) {
-      QM_WARNING(
-          "Preventing creation of a new origin directory which is not "
-          "supported by our origin parser or is obsolete!");
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  rv = EnsureDirectory(aDirectory, aCreated);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    QM_TRY_INSPECT(const auto& leafName,
+                   MOZ_TO_RESULT_INVOKE_TYPED(nsString, aDirectory, GetLeafName)
+                       .map([](const auto& leafName) {
+                         return NS_ConvertUTF16toUTF8(leafName);
+                       }));
+
+    QM_TRY(OkIf(IsSanitizedOriginValid(leafName)), Err(NS_ERROR_FAILURE),
+           [](const auto&) {
+             QM_WARNING(
+                 "Preventing creation of a new origin directory which is not "
+                 "supported by our origin parser or is obsolete!");
+           });
   }
 
-  return NS_OK;
+  QM_TRY_RETURN(EnsureDirectory(aDirectory));
 }
 
 nsresult QuotaManager::AboutToClearOrigins(
@@ -7724,7 +7644,7 @@
 
   // Abort all operations.
   for (RefPtr<Client>& client : quotaManager->mClients) {
-    client->AbortOperations(VoidCString());
+    client->AbortAllOperations();
   }
 }
 
@@ -7970,18 +7890,16 @@
   quotaManager->mTemporaryStorageUsage -= size;
 }
 
-bool OriginInfo::LockedGetUsageForClient(Client::Type aClientType,
-                                         uint64_t& aUsage) {
+UsageInfo OriginInfo::LockedGetUsageForClient(Client::Type aClientType) {
   AssertCurrentThreadOwnsQuotaMutex();
 
-  Maybe<uint64_t>& clientUsage = mClientUsages[aClientType];
-
-  if (clientUsage.isNothing()) {
-    return false;
-  }
+  // The current implementation of this method only supports DOMCACHE and LS,
+  // which only use DatabaseUsage. If this assertion is lifted, the logic below
+  // must be adapted.
+  MOZ_ASSERT(aClientType == Client::Type::DOMCACHE ||
+             aClientType == Client::Type::LS);
 
-  aUsage = clientUsage.value();
-  return true;
+  return UsageInfo{DatabaseUsageType{mClientUsages[aClientType]}};
 }
 
 void OriginInfo::LockedPersist() {
@@ -8568,9 +8486,9 @@
     case RequestParams::TInitTemporaryStorageParams:
       break;
 
-    case RequestParams::TInitStorageAndOriginParams: {
-      const InitStorageAndOriginParams& params =
-          aParams.get_InitStorageAndOriginParams();
+    case RequestParams::TInitializePersistentOriginParams: {
+      const InitializePersistentOriginParams& params =
+          aParams.get_InitializePersistentOriginParams();
 
       if (NS_WARN_IF(
               !QuotaManager::IsPrincipalInfoValid(params.principalInfo()))) {
@@ -8578,16 +8496,22 @@
         return false;
       }
 
-      if (NS_WARN_IF(!IsValidPersistenceType(params.persistenceType()))) {
+      break;
+    }
+
+    case RequestParams::TInitializeTemporaryOriginParams: {
+      const InitializeTemporaryOriginParams& params =
+          aParams.get_InitializeTemporaryOriginParams();
+
+      if (NS_WARN_IF(!IsBestEffortPersistenceType(params.persistenceType()))) {
         ASSERT_UNLESS_FUZZING();
         return false;
       }
 
-      if (params.clientTypeIsExplicit()) {
-        if (NS_WARN_IF(!Client::IsValidType(params.clientType()))) {
-          ASSERT_UNLESS_FUZZING();
-          return false;
-        }
+      if (NS_WARN_IF(
+              !QuotaManager::IsPrincipalInfoValid(params.principalInfo()))) {
+        ASSERT_UNLESS_FUZZING();
+        return false;
       }
 
       break;
@@ -8817,8 +8741,11 @@
       case RequestParams::TInitTemporaryStorageParams:
         return MakeRefPtr<InitTemporaryStorageOp>();
 
-      case RequestParams::TInitStorageAndOriginParams:
-        return MakeRefPtr<InitStorageAndOriginOp>(aParams);
+      case RequestParams::TInitializePersistentOriginParams:
+        return MakeRefPtr<InitializePersistentOriginOp>(aParams);
+
+      case RequestParams::TInitializeTemporaryOriginParams:
+        return MakeRefPtr<InitializeTemporaryOriginOp>(aParams);
 
       case RequestParams::TClearOriginParams:
         return MakeRefPtr<ClearOriginOp>(aParams);
@@ -9583,63 +9510,100 @@
   aResponse = InitTemporaryStorageResponse();
 }
 
-InitStorageAndOriginOp::InitStorageAndOriginOp(const RequestParams& aParams)
+InitializeOriginRequestBase::InitializeOriginRequestBase(
+    const PersistenceType aPersistenceType, const PrincipalInfo& aPrincipalInfo)
     : QuotaRequestBase(/* aExclusive */ false), mCreated(false) {
   AssertIsOnOwningThread();
-  MOZ_ASSERT(aParams.type() == RequestParams::TInitStorageAndOriginParams);
-
-  const InitStorageAndOriginParams& params =
-      aParams.get_InitStorageAndOriginParams();
 
   auto quotaInfo =
-      QuotaManager::GetInfoFromValidatedPrincipalInfo(params.principalInfo());
+      QuotaManager::GetInfoFromValidatedPrincipalInfo(aPrincipalInfo);
 
   // Overwrite OriginOperationBase default values.
   mNeedsQuotaManagerInit = true;
   mNeedsStorageInit = false;
 
   // Overwrite NormalOriginOperationBase default values.
-  mPersistenceType.SetValue(params.persistenceType());
-
+  mPersistenceType.SetValue(aPersistenceType);
   mOriginScope.SetFromOrigin(quotaInfo.mOrigin);
 
-  if (params.clientTypeIsExplicit()) {
-    mClientType.SetValue(params.clientType());
-  }
-
-  // Overwrite InitStorageAndOriginOp default values.
+  // Overwrite InitializeOriginRequestBase default values.
   mSuffix = std::move(quotaInfo.mSuffix);
   mGroup = std::move(quotaInfo.mGroup);
 }
 
-void InitStorageAndOriginOp::Init(Quota& aQuota) { AssertIsOnOwningThread(); }
+void InitializeOriginRequestBase::Init(Quota& aQuota) {
+  AssertIsOnOwningThread();
+}
+
+InitializePersistentOriginOp::InitializePersistentOriginOp(
+    const RequestParams& aParams)
+    : InitializeOriginRequestBase(
+          PERSISTENCE_TYPE_PERSISTENT,
+          aParams.get_InitializePersistentOriginParams().principalInfo()) {
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(aParams.type() ==
+             RequestParams::TInitializePersistentOriginParams);
+}
+
+nsresult InitializePersistentOriginOp::DoDirectoryWork(
+    QuotaManager& aQuotaManager) {
+  AssertIsOnIOThread();
+  MOZ_ASSERT(!mPersistenceType.IsNull());
+
+  AUTO_PROFILER_LABEL("InitializePersistentOriginOp::DoDirectoryWork", OTHER);
+
+  QM_TRY(OkIf(aQuotaManager.IsStorageInitialized()), NS_ERROR_FAILURE);
+
+  QM_TRY_UNWRAP(mCreated,
+                (aQuotaManager
+                     .EnsurePersistentOriginIsInitialized(QuotaInfo{
+                         mSuffix, mGroup, nsCString{mOriginScope.GetOrigin()}})
+                     .map([](const auto& res) { return res.second; })));
+
+  return NS_OK;
+}
+
+void InitializePersistentOriginOp::GetResponse(RequestResponse& aResponse) {
+  AssertIsOnOwningThread();
+
+  aResponse = InitializePersistentOriginResponse(mCreated);
+}
+
+InitializeTemporaryOriginOp::InitializeTemporaryOriginOp(
+    const RequestParams& aParams)
+    : InitializeOriginRequestBase(
+          aParams.get_InitializeTemporaryOriginParams().persistenceType(),
+          aParams.get_InitializeTemporaryOriginParams().principalInfo()) {
+  AssertIsOnOwningThread();
+  MOZ_ASSERT(aParams.type() == RequestParams::TInitializeTemporaryOriginParams);
+}
 
-nsresult InitStorageAndOriginOp::DoDirectoryWork(QuotaManager& aQuotaManager) {
+nsresult InitializeTemporaryOriginOp::DoDirectoryWork(
+    QuotaManager& aQuotaManager) {
   AssertIsOnIOThread();
   MOZ_ASSERT(!mPersistenceType.IsNull());
 
-  AUTO_PROFILER_LABEL("InitStorageAndOriginOp::DoDirectoryWork", OTHER);
+  AUTO_PROFILER_LABEL("InitializeTemporaryOriginOp::DoDirectoryWork", OTHER);
+
+  QM_TRY(OkIf(aQuotaManager.IsStorageInitialized()), NS_ERROR_FAILURE);
+
+  QM_TRY(OkIf(aQuotaManager.IsTemporaryStorageInitialized()), NS_ERROR_FAILURE);
 
   QM_TRY_UNWRAP(
       mCreated,
       (aQuotaManager
-           .EnsureStorageAndOriginIsInitializedInternal(
+           .EnsureTemporaryOriginIsInitialized(
                mPersistenceType.Value(),
-               QuotaInfo{mSuffix, mGroup, nsCString{mOriginScope.GetOrigin()}},
-               mClientType)
+               QuotaInfo{mSuffix, mGroup, nsCString{mOriginScope.GetOrigin()}})
            .map([](const auto& res) { return res.second; })));
 
   return NS_OK;
 }
 
-void InitStorageAndOriginOp::GetResponse(RequestResponse& aResponse) {
+void InitializeTemporaryOriginOp::GetResponse(RequestResponse& aResponse) {
   AssertIsOnOwningThread();
 
-  InitStorageAndOriginResponse response;
-
-  response.created() = mCreated;
-
-  aResponse = response;
+  aResponse = InitializeTemporaryOriginResponse(mCreated);
 }
 
 ResetOrClearOp::ResetOrClearOp(bool aClear)
@@ -10104,11 +10068,10 @@
                 aQuotaManager.GetDirectoryForOrigin(mPersistenceType.Value(),
                                                     quotaInfo.mOrigin));
 
-  bool created;
-  nsresult rv = aQuotaManager.EnsureOriginDirectory(directory, &created);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
+  QM_TRY_INSPECT(const bool& created,
+                 aQuotaManager.EnsureOriginDirectory(*directory));
+
+  nsresult rv;
 
   if (created) {
     int64_t timestamp;
diff -Nru firefox-84.0.2+build1/dom/quota/CheckedUnsafePtr.h firefox-85.0+build1/dom/quota/CheckedUnsafePtr.h
--- firefox-84.0.2+build1/dom/quota/CheckedUnsafePtr.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/CheckedUnsafePtr.h	2021-01-18 19:58:10.000000000 +0000
@@ -391,4 +391,15 @@
       nsTArray_RelocateUsingMemutils>;
 };
 
+template <typename T>
+struct nsTArray_RelocationStrategy<
+    mozilla::NotNull<mozilla::CheckedUnsafePtr<T>>> {
+  using Type =
+      std::conditional_t<T::SupportsChecking::value ==
+                             mozilla::CheckingSupport::Enabled,
+                         nsTArray_RelocateUsingMoveConstructor<
+                             mozilla::NotNull<mozilla::CheckedUnsafePtr<T>>>,
+                         nsTArray_RelocateUsingMemutils>;
+};
+
 #endif  // mozilla_CheckedUnsafePtr_h
diff -Nru firefox-84.0.2+build1/dom/quota/Client.cpp firefox-85.0+build1/dom/quota/Client.cpp
--- firefox-84.0.2+build1/dom/quota/Client.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/Client.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,10 +7,14 @@
 #include "Client.h"
 
 // Global includes
+#include "BackgroundParent.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 namespace mozilla::dom::quota {
 
+using mozilla::ipc::AssertIsOnBackgroundThread;
+
 namespace {
 
 const char kIDBPrefix = 'I';
@@ -18,6 +22,27 @@
 const char kSDBPrefix = 'S';
 const char kLSPrefix = 'L';
 
+/**
+ * If shutdown takes this long, kill actors of a quota client, to avoid reaching
+ * the crash timeout.
+ */
+#define SHUTDOWN_FORCE_KILL_TIMEOUT_MS 5000
+
+/**
+ * Automatically crash the browser if shutdown of a quota client takes this
+ * long. We've chosen a value that is longer than the value for QuotaManager
+ * shutdown timer which is currently set to 30 seconds, so that the QuotaManager
+ * abort may still make the quota client's shutdown complete in time.  We've
+ * also chosen a value that is long enough that it is unlikely for the problem
+ * to be falsely triggered by slow system I/O.  We've also chosen a value long
+ * enough so that automated tests should time out and fail if shutdown of a
+ * quota client takes too long.  Also, this value is long enough so that testers
+ * can notice the timeout; we want to know about the timeouts, not hide them. On
+ * the other hand this value is less than 60 seconds which is used by
+ * nsTerminator to crash a hung main process.
+ */
+#define SHUTDOWN_FORCE_CRASH_TIMEOUT_MS 45000
+
 template <Client::Type type>
 struct ClientTypeTraits;
 
@@ -179,17 +204,12 @@
 }
 
 // static
-void Client::TypeToText(Type aType, nsAString& aText) {
-  if (!TypeTo_impl(aType, aText)) {
-    BadType();
-  }
-}
-
-// static
-void Client::TypeToText(Type aType, nsACString& aText) {
-  if (!TypeTo_impl(aType, aText)) {
+nsAutoCString Client::TypeToText(Type aType) {
+  nsAutoCString res;
+  if (!TypeTo_impl(aType, res)) {
     BadType();
   }
+  return res;
 }
 
 // static
@@ -231,4 +251,101 @@
   return true;
 }
 
+void Client::MaybeRecordShutdownStep(const nsACString& aStepDescription) {
+  AssertIsOnBackgroundThread();
+
+  if (!mShutdownStartedAt) {
+    // We are not shutting down yet, we intentionally ignore this here to avoid
+    // that every caller has to make a distinction for shutdown vs. non-shutdown
+    // situations.
+    return;
+  }
+
+  const TimeDuration elapsedSinceShutdownStart =
+      TimeStamp::NowLoRes() - *mShutdownStartedAt;
+
+  const auto stepString =
+      nsPrintfCString("%fs: %s", elapsedSinceShutdownStart.ToSeconds(),
+                      nsPromiseFlatCString(aStepDescription).get());
+
+  mShutdownSteps.Append(stepString + "\n"_ns);
+
+#ifdef DEBUG
+  // XXX Probably this isn't the mechanism that should be used here.
+
+  NS_DebugBreak(
+      NS_DEBUG_WARNING,
+      nsAutoCString(TypeToText(GetType()) + " shutdown step"_ns).get(),
+      stepString.get(), __FILE__, __LINE__);
+#endif
+}
+
+bool Client::InitiateShutdownWorkThreads() {
+  AssertIsOnBackgroundThread();
+  MOZ_ASSERT(!mShutdownTimer);
+  MOZ_ASSERT(mShutdownSteps.IsEmpty());
+
+  mShutdownStartedAt.init(TimeStamp::NowLoRes());
+
+  MaybeRecordShutdownStep("starting"_ns);
+
+  InitiateShutdown();
+
+  if (!IsShutdownCompleted()) {
+    mShutdownTimer = NS_NewTimer();
+
+    MOZ_ALWAYS_SUCCEEDS(mShutdownTimer->InitWithNamedFuncCallback(
+        [](nsITimer* aTimer, void* aClosure) {
+          auto* const quotaClient = static_cast<Client*>(aClosure);
+
+          quotaClient->ForceKillActors();
+
+          MOZ_ALWAYS_SUCCEEDS(aTimer->InitWithNamedFuncCallback(
+              [](nsITimer* aTimer, void* aClosure) {
+                auto* const quotaClient = static_cast<Client*>(aClosure);
+
+                if (quotaClient->IsShutdownCompleted()) {
+                  // Apparently, the shutdown did complete between the timer
+                  // fired and we processed the event. So there's no reason to
+                  // crash, just do nothing.
+
+                  return;
+                }
+
+                const auto type = TypeToText(quotaClient->GetType());
+
+                CrashReporter::AnnotateCrashReport(
+                    CrashReporter::Annotation::QuotaManagerShutdownTimeout,
+                    nsPrintfCString("%s: %s\nIntermediate steps:\n%s",
+                                    type.get(),
+                                    quotaClient->GetShutdownStatus().get(),
+                                    quotaClient->mShutdownSteps.get()));
+
+                MOZ_CRASH_UNSAFE_PRINTF("%s shutdown timed out", type.get());
+              },
+              aClosure, SHUTDOWN_FORCE_CRASH_TIMEOUT_MS,
+              nsITimer::TYPE_ONE_SHOT,
+              "quota::Client::ShutdownWorkThreads::ForceCrashTimer"));
+        },
+        this, SHUTDOWN_FORCE_KILL_TIMEOUT_MS, nsITimer::TYPE_ONE_SHOT,
+        "quota::Client::ShutdownWorkThreads::ForceKillTimer"));
+
+    return true;
+  }
+
+  return false;
+}
+
+void Client::FinalizeShutdownWorkThreads() {
+  MOZ_ASSERT(mShutdownStartedAt);
+
+  if (mShutdownTimer) {
+    MOZ_ALWAYS_SUCCEEDS(mShutdownTimer->Cancel());
+  }
+
+  MaybeRecordShutdownStep("completed"_ns);
+
+  FinalizeShutdown();
+}
+
 }  // namespace mozilla::dom::quota
diff -Nru firefox-84.0.2+build1/dom/quota/Client.h firefox-85.0+build1/dom/quota/Client.h
--- firefox-84.0.2+build1/dom/quota/Client.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/Client.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include <cstdint>
 #include "ErrorList.h"
 #include "mozilla/Atomics.h"
+#include "mozilla/InitializedOnce.h"
 #include "mozilla/Result.h"
 #include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/dom/ipc/IdType.h"
@@ -17,6 +18,7 @@
 #include "mozilla/dom/quota/QuotaCommon.h"
 #include "mozilla/dom/quota/QuotaInfo.h"
 #include "mozilla/fallible.h"
+#include "nsHashKeys.h"
 #include "nsISupports.h"
 #include "nsStringFwd.h"
 
@@ -57,6 +59,17 @@
     TYPE_MAX
   };
 
+  class DirectoryLockIdTable final {
+    nsTHashtable<nsUint64HashKey> mIds;
+
+   public:
+    void Put(const int64_t aId) { mIds.PutEntry(aId); }
+
+    bool Has(const int64_t aId) const { return mIds.Contains(aId); }
+
+    bool Filled() const { return mIds.Count(); }
+  };
+
   static Type TypeMax() {
     if (CachedNextGenLocalStorageEnabled()) {
       return TYPE_MAX;
@@ -68,9 +81,7 @@
 
   static bool TypeToText(Type aType, nsAString& aText, const fallible_t&);
 
-  static void TypeToText(Type aType, nsAString& aText);
-
-  static void TypeToText(Type aType, nsACString& aText);
+  static nsAutoCString TypeToText(Type aType);
 
   static bool TypeFromText(const nsAString& aText, Type& aType,
                            const fallible_t&);
@@ -85,6 +96,24 @@
     return aText.EqualsLiteral(ASMJSCACHE_DIRECTORY_NAME);
   }
 
+  template <typename T>
+  static bool IsLockForObjectContainedInLockTable(
+      const T& aObject, const DirectoryLockIdTable& aIds) {
+    const auto& maybeDirectoryLock = aObject.MaybeDirectoryLockRef();
+
+    MOZ_ASSERT(maybeDirectoryLock.isSome());
+
+    return aIds.Has(maybeDirectoryLock->Id());
+  }
+
+  template <typename T>
+  static bool IsLockForObjectAcquiredAndContainedInLockTable(
+      const T& aObject, const DirectoryLockIdTable& aIds) {
+    const auto& maybeDirectoryLock = aObject.MaybeDirectoryLockRef();
+
+    return maybeDirectoryLock && aIds.Has(maybeDirectoryLock->Id());
+  }
+
   NS_INLINE_DECL_PURE_VIRTUAL_REFCOUNTING
 
   virtual Type GetType() = 0;
@@ -128,15 +157,36 @@
   virtual void ReleaseIOThreadObjects() = 0;
 
   // Methods which are called on the background thread.
-  virtual void AbortOperations(const nsACString& aOrigin) = 0;
+  virtual void AbortOperationsForLocks(
+      const DirectoryLockIdTable& aDirectoryLockIds) = 0;
 
   virtual void AbortOperationsForProcess(ContentParentId aContentParentId) = 0;
 
+  virtual void AbortAllOperations() = 0;
+
   virtual void StartIdleMaintenance() = 0;
 
   virtual void StopIdleMaintenance() = 0;
 
-  virtual void ShutdownWorkThreads() = 0;
+  // Returns true if there is work that needs to be waited for.
+  bool InitiateShutdownWorkThreads();
+  void FinalizeShutdownWorkThreads();
+
+  virtual bool IsShutdownCompleted() const = 0;
+
+  void MaybeRecordShutdownStep(const nsACString& aStepDescription);
+
+ private:
+  virtual void InitiateShutdown() = 0;
+  virtual nsCString GetShutdownStatus() const = 0;
+  virtual void ForceKillActors() = 0;
+  virtual void FinalizeShutdown() = 0;
+
+  // A timer that gets activated at shutdown to ensure we close all storages.
+  nsCOMPtr<nsITimer> mShutdownTimer;
+
+  nsCString mShutdownSteps;
+  LazyInitializedOnce<const TimeStamp> mShutdownStartedAt;
 
  protected:
   virtual ~Client() = default;
diff -Nru firefox-84.0.2+build1/dom/quota/InitializationTypes.h firefox-85.0+build1/dom/quota/InitializationTypes.h
--- firefox-84.0.2+build1/dom/quota/InitializationTypes.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/InitializationTypes.h	2021-01-18 19:58:10.000000000 +0000
@@ -20,6 +20,9 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/TelemetryHistogramEnums.h"
 
+// Undo X11/X.h's definition of None
+#undef None
+
 namespace mozilla {
 namespace dom {
 namespace quota {
diff -Nru firefox-84.0.2+build1/dom/quota/nsIQuotaManagerService.idl firefox-85.0+build1/dom/quota/nsIQuotaManagerService.idl
--- firefox-84.0.2+build1/dom/quota/nsIQuotaManagerService.idl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/nsIQuotaManagerService.idl	2021-01-18 19:58:10.000000000 +0000
@@ -63,26 +63,35 @@
   initTemporaryStorage();
 
   /**
-   * Initializes storage directory, temporary storage (if persistence type is
-   * default or temporary) and directory for the given origin. This can be used
-   * in tests to verify origin initialization.
+   * Initializes persistent origin directory for the given origin. This can be
+   * used in tests to verify origin initialization.
    *
    * If the dom.quotaManager.testing preference is not true the call will be
    * a no-op.
    *
    * @param aPrincipal
    *        A principal for the origin whose directory is to be initialized.
+   */
+  [must_use] nsIQuotaRequest
+  initializePersistentOrigin(in nsIPrincipal aPrincipal);
+
+  /**
+   * Initializes temporary origin directory for the given origin. This can be
+   * used in tests to verify origin initialization.
+   *
+   * If the dom.quotaManager.testing preference is not true the call will be
+   * a no-op.
+   *
    * @param aPersistenceType
    *        A string that tells what persistence type of origin will be
-   *        initialized.
-   * @param aClientType
-   *        An optional string that tells what client type of origin will be
-   *        initialized.
+   *        initialized (temporary or default).
+   *
+   * @param aPrincipal
+   *        A principal for the origin whose directory is to be initialized.
    */
   [must_use] nsIQuotaRequest
-  initStorageAndOrigin(in nsIPrincipal aPrincipal,
-                       in ACString aPersistenceType,
-                       [optional] in AString aClientType);
+  initializeTemporaryOrigin(in ACString aPersistenceType,
+                            in nsIPrincipal aPrincipal);
 
   /**
    * Schedules an asynchronous callback that will inspect all origins and
diff -Nru firefox-84.0.2+build1/dom/quota/PersistenceType.cpp firefox-85.0+build1/dom/quota/PersistenceType.cpp
--- firefox-84.0.2+build1/dom/quota/PersistenceType.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/PersistenceType.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -160,6 +160,19 @@
   }
 }
 
+bool IsBestEffortPersistenceType(const PersistenceType aPersistenceType) {
+  switch (aPersistenceType) {
+    case PERSISTENCE_TYPE_TEMPORARY:
+    case PERSISTENCE_TYPE_DEFAULT:
+      return true;
+
+    case PERSISTENCE_TYPE_PERSISTENT:
+    case PERSISTENCE_TYPE_INVALID:
+    default:
+      return false;
+  }
+}
+
 nsLiteralCString PersistenceTypeToString(
     const PersistenceType aPersistenceType) {
   const auto maybeString = TypeTo_impl<nsLiteralCString>(aPersistenceType);
diff -Nru firefox-84.0.2+build1/dom/quota/PersistenceType.h firefox-85.0+build1/dom/quota/PersistenceType.h
--- firefox-84.0.2+build1/dom/quota/PersistenceType.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/PersistenceType.h	2021-01-18 19:58:10.000000000 +0000
@@ -26,15 +26,17 @@
   PERSISTENCE_TYPE_INVALID
 };
 
-static const PersistenceType kBestEffortPersistenceTypes[] = {
-    PERSISTENCE_TYPE_TEMPORARY, PERSISTENCE_TYPE_DEFAULT};
-
 static const PersistenceType kAllPersistenceTypes[] = {
     PERSISTENCE_TYPE_PERSISTENT, PERSISTENCE_TYPE_TEMPORARY,
     PERSISTENCE_TYPE_DEFAULT};
 
+static const PersistenceType kBestEffortPersistenceTypes[] = {
+    PERSISTENCE_TYPE_TEMPORARY, PERSISTENCE_TYPE_DEFAULT};
+
 bool IsValidPersistenceType(PersistenceType aPersistenceType);
 
+bool IsBestEffortPersistenceType(const PersistenceType aPersistenceType);
+
 nsLiteralCString PersistenceTypeToString(PersistenceType aPersistenceType);
 
 Maybe<PersistenceType> PersistenceTypeFromString(const nsACString& aString,
diff -Nru firefox-84.0.2+build1/dom/quota/PQuota.ipdl firefox-85.0+build1/dom/quota/PQuota.ipdl
--- firefox-84.0.2+build1/dom/quota/PQuota.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/PQuota.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -46,12 +46,15 @@
 {
 };
 
-struct InitStorageAndOriginParams
+struct InitializePersistentOriginParams
 {
   PrincipalInfo principalInfo;
+};
+
+struct InitializeTemporaryOriginParams
+{
   PersistenceType persistenceType;
-  Type clientType;
-  bool clientTypeIsExplicit;
+  PrincipalInfo principalInfo;
 };
 
 struct AllUsageParams
@@ -130,7 +133,8 @@
   TemporaryStorageInitializedParams;
   InitParams;
   InitTemporaryStorageParams;
-  InitStorageAndOriginParams;
+  InitializePersistentOriginParams;
+  InitializeTemporaryOriginParams;
   ClearOriginParams;
   ResetOriginParams;
   ClearDataParams;
diff -Nru firefox-84.0.2+build1/dom/quota/PQuotaRequest.ipdl firefox-85.0+build1/dom/quota/PQuotaRequest.ipdl
--- firefox-84.0.2+build1/dom/quota/PQuotaRequest.ipdl	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/PQuotaRequest.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -31,7 +31,12 @@
 {
 };
 
-struct InitStorageAndOriginResponse
+struct InitializePersistentOriginResponse
+{
+  bool created;
+};
+
+struct InitializeTemporaryOriginResponse
 {
   bool created;
 };
@@ -84,7 +89,8 @@
   TemporaryStorageInitializedResponse;
   InitResponse;
   InitTemporaryStorageResponse;
-  InitStorageAndOriginResponse;
+  InitializePersistentOriginResponse;
+  InitializeTemporaryOriginResponse;
   ClearOriginResponse;
   ResetOriginResponse;
   ClearDataResponse;
diff -Nru firefox-84.0.2+build1/dom/quota/QuotaCommon.cpp firefox-85.0+build1/dom/quota/QuotaCommon.cpp
--- firefox-84.0.2+build1/dom/quota/QuotaCommon.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/QuotaCommon.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,12 @@
 
 #include "QuotaCommon.h"
 
+#include "mozIStorageConnection.h"
+#include "mozIStorageStatement.h"
 #include "mozilla/Logging.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryComms.h"
+#include "mozilla/TelemetryEventEnums.h"
 #include "mozilla/TextUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIFile.h"
@@ -26,6 +31,8 @@
 
 namespace mozilla::dom::quota {
 
+using namespace mozilla::Telemetry;
+
 namespace {
 
 #ifdef DEBUG
@@ -106,23 +113,21 @@
 #endif
 
 Result<nsCOMPtr<nsIFile>, nsresult> QM_NewLocalFile(const nsAString& aPath) {
-  nsCOMPtr<nsIFile> file;
-  nsresult rv =
-      NS_NewLocalFile(aPath, /* aFollowLinks */ false, getter_AddRefs(file));
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    QM_WARNING("Failed to construct a file for path (%s)",
-               NS_ConvertUTF16toUTF8(aPath).get());
-    return Err(rv);
-  }
+  QM_TRY_UNWRAP(auto file,
+                ToResultInvoke<nsCOMPtr<nsIFile>>(NS_NewLocalFile, aPath,
+                                                  /* aFollowLinks */ false),
+                QM_PROPAGATE, [&aPath](const nsresult rv) {
+                  QM_WARNING("Failed to construct a file for path (%s)",
+                             NS_ConvertUTF16toUTF8(aPath).get());
+                });
 
 #ifdef XP_WIN
   MOZ_ASSERT(gUseDOSDevicePathSyntax != -1);
 
   if (gUseDOSDevicePathSyntax) {
-    nsCOMPtr<nsILocalFileWin> winFile = do_QueryInterface(file, &rv);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return Err(rv);
-    }
+    QM_TRY_INSPECT(const auto& winFile,
+                   ToResultGet<nsCOMPtr<nsILocalFileWin>>(
+                       MOZ_SELECT_OVERLOAD(do_QueryInterface), file));
 
     MOZ_ASSERT(winFile);
     winFile->SetUseDOSDevicePathSyntax(true);
@@ -157,8 +162,63 @@
   return resultFile;
 }
 
+Result<nsCOMPtr<mozIStorageStatement>, nsresult> CreateStatement(
+    mozIStorageConnection& aConnection, const nsACString& aStatementString) {
+  QM_TRY_RETURN(MOZ_TO_RESULT_INVOKE_TYPED(nsCOMPtr<mozIStorageStatement>,
+                                           aConnection, CreateStatement,
+                                           aStatementString));
+}
+
+template <SingleStepResult ResultHandling>
+Result<SingleStepSuccessType<ResultHandling>, nsresult> ExecuteSingleStep(
+    nsCOMPtr<mozIStorageStatement>&& aStatement) {
+  QM_TRY_INSPECT(const bool& hasResult,
+                 MOZ_TO_RESULT_INVOKE(aStatement, ExecuteStep));
+
+  if constexpr (ResultHandling == SingleStepResult::AssertHasResult) {
+    MOZ_ASSERT(hasResult);
+    (void)hasResult;
+
+    return WrapNotNullUnchecked(std::move(aStatement));
+  } else {
+    return hasResult ? std::move(aStatement) : nullptr;
+  }
+}
+
+template Result<SingleStepSuccessType<SingleStepResult::AssertHasResult>,
+                nsresult>
+ExecuteSingleStep<SingleStepResult::AssertHasResult>(
+    nsCOMPtr<mozIStorageStatement>&&);
+
+template Result<SingleStepSuccessType<SingleStepResult::ReturnNullIfNoResult>,
+                nsresult>
+ExecuteSingleStep<SingleStepResult::ReturnNullIfNoResult>(
+    nsCOMPtr<mozIStorageStatement>&&);
+
+template <SingleStepResult ResultHandling>
+Result<SingleStepSuccessType<ResultHandling>, nsresult>
+CreateAndExecuteSingleStepStatement(mozIStorageConnection& aConnection,
+                                    const nsACString& aStatementString) {
+  QM_TRY_UNWRAP(auto stmt, MOZ_TO_RESULT_INVOKE_TYPED(
+                               nsCOMPtr<mozIStorageStatement>, aConnection,
+                               CreateStatement, aStatementString));
+
+  return ExecuteSingleStep<ResultHandling>(std::move(stmt));
+}
+
+template Result<SingleStepSuccessType<SingleStepResult::AssertHasResult>,
+                nsresult>
+CreateAndExecuteSingleStepStatement<SingleStepResult::AssertHasResult>(
+    mozIStorageConnection& aConnection, const nsACString& aStatementString);
+
+template Result<SingleStepSuccessType<SingleStepResult::ReturnNullIfNoResult>,
+                nsresult>
+CreateAndExecuteSingleStepStatement<SingleStepResult::ReturnNullIfNoResult>(
+    mozIStorageConnection& aConnection, const nsACString& aStatementString);
+
 #ifdef QM_ENABLE_SCOPED_LOG_EXTRA_INFO
 MOZ_THREAD_LOCAL(const nsACString*) ScopedLogExtraInfo::sQueryValue;
+MOZ_THREAD_LOCAL(const nsACString*) ScopedLogExtraInfo::sContextValue;
 
 /* static */
 auto ScopedLogExtraInfo::FindSlot(const char* aTag) {
@@ -168,6 +228,10 @@
     return &sQueryValue;
   }
 
+  if (aTag == kTagContext) {
+    return &sContextValue;
+  }
+
   MOZ_CRASH("Unknown tag!");
 }
 
@@ -199,12 +263,17 @@
     if (sQueryValue.get()) {
       map.emplace(kTagQuery, sQueryValue.get());
     }
+
+    if (sContextValue.get()) {
+      map.emplace(kTagContext, sContextValue.get());
+    }
   }
   return map;
 }
 
 /* static */ void ScopedLogExtraInfo::Initialize() {
   MOZ_ALWAYS_TRUE(sQueryValue.init());
+  MOZ_ALWAYS_TRUE(sContextValue.init());
 }
 
 void ScopedLogExtraInfo::AddInfo() {
@@ -252,6 +321,30 @@
 
     console->LogStringMessage(message.get());
   }
+
+#  ifdef QM_ENABLE_SCOPED_LOG_EXTRA_INFO
+  if (const auto contextIt = extraInfos.find(ScopedLogExtraInfo::kTagContext);
+      contextIt != extraInfos.cend()) {
+    // For now, we don't include aExpr in the telemetry event. It might help to
+    // match locations across versions, but they might be large.
+    auto extra = Some([&] {
+      auto res = CopyableTArray<EventExtraEntry>{};
+      res.SetCapacity(5);
+      res.AppendElement(EventExtraEntry{"module"_ns, aModule});
+      res.AppendElement(EventExtraEntry{"source_file"_ns,
+                                        nsCString(GetLeafName(aSourceFile))});
+      res.AppendElement(
+          EventExtraEntry{"source_line"_ns, IntToCString(aSourceLine)});
+      res.AppendElement(EventExtraEntry{
+          "context"_ns, nsPromiseFlatCString{*contextIt->second}});
+
+      return res;
+    }());
+
+    Telemetry::RecordEvent(Telemetry::EventID::DomQuotaTry_Error_Step,
+                           Nothing(), extra);
+  }
+#  endif
 #endif
 }
 
diff -Nru firefox-84.0.2+build1/dom/quota/QuotaCommon.h firefox-85.0+build1/dom/quota/QuotaCommon.h
--- firefox-84.0.2+build1/dom/quota/QuotaCommon.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/QuotaCommon.h	2021-01-18 19:58:10.000000000 +0000
@@ -738,6 +738,8 @@
 #  define RETURN_STATUS_OR_RESULT(_status, _rv) return _rv
 #endif
 
+class mozIStorageConnection;
+class mozIStorageStatement;
 class nsIFile;
 
 namespace mozilla {
@@ -800,7 +802,7 @@
 // Body must a function type accepting a V xvalue with a return type convertible
 // to Result<empty, E>.
 template <typename Step, typename Body>
-auto CollectEach(const Step& aStep, const Body& aBody)
+auto CollectEach(Step aStep, const Body& aBody)
     -> Result<mozilla::Ok, typename std::result_of_t<Step()>::err_type> {
   using StepResultType = typename std::result_of_t<Step()>::ok_type;
 
@@ -821,6 +823,30 @@
   return mozilla::Ok{};
 }
 
+// This is like std::reduce with a to-be-defined execution policy (we don't want
+// to std::terminate on an error, but probably it's fine to just propagate any
+// error that occurred), operating not on a pair of iterators but rather a
+// generator function.
+template <typename InputGenerator, typename T, typename BinaryOp>
+auto ReduceEach(InputGenerator aInputGenerator, T aInit,
+                const BinaryOp& aBinaryOp)
+    -> Result<T, typename std::invoke_result_t<InputGenerator>::err_type> {
+  T res = std::move(aInit);
+
+  // XXX This can be done in parallel!
+  MOZ_TRY(CollectEach(
+      std::move(aInputGenerator),
+      [&res, &aBinaryOp](const auto& element)
+          -> Result<Ok,
+                    typename std::invoke_result_t<InputGenerator>::err_type> {
+        MOZ_TRY_VAR(res, aBinaryOp(std::move(res), element));
+
+        return Ok{};
+      }));
+
+  return std::move(res);
+}
+
 template <typename Range, typename Body>
 auto CollectEachInRange(const Range& aRange, const Body& aBody)
     -> Result<mozilla::Ok, nsresult> {
@@ -953,6 +979,36 @@
 Result<nsCOMPtr<nsIFile>, nsresult> CloneFileAndAppend(
     nsIFile& aDirectory, const nsAString& aPathElement);
 
+Result<nsCOMPtr<mozIStorageStatement>, nsresult> CreateStatement(
+    mozIStorageConnection& aConnection, const nsACString& aStatementString);
+
+enum class SingleStepResult { AssertHasResult, ReturnNullIfNoResult };
+
+template <SingleStepResult ResultHandling>
+using SingleStepSuccessType =
+    std::conditional_t<ResultHandling == SingleStepResult::AssertHasResult,
+                       NotNull<nsCOMPtr<mozIStorageStatement>>,
+                       nsCOMPtr<mozIStorageStatement>>;
+
+template <SingleStepResult ResultHandling>
+Result<SingleStepSuccessType<ResultHandling>, nsresult> ExecuteSingleStep(
+    nsCOMPtr<mozIStorageStatement>&& aStatement);
+
+// Creates a statement with the specified aStatementString, executes a single
+// step, and returns the statement.
+// Depending on the value ResultHandling,
+// - it is asserted that there is a result (default resp.
+//   SingleStepResult::AssertHasResult), and the success type is
+//   MovingNotNull<nsCOMPtr<mozIStorageStatement>>
+// - it is asserted that there is no result, and the success type is Ok
+// - in case there is no result, nullptr is returned, and the success type is
+//   nsCOMPtr<mozIStorageStatement>
+// Any other errors are always propagated.
+template <SingleStepResult ResultHandling = SingleStepResult::AssertHasResult>
+Result<SingleStepSuccessType<ResultHandling>, nsresult>
+CreateAndExecuteSingleStepStatement(mozIStorageConnection& aConnection,
+                                    const nsACString& aStatementString);
+
 void LogError(const nsLiteralCString& aModule, const nsACString& aExpr,
               const nsACString& aSourceFile, int32_t aSourceLine);
 
@@ -968,6 +1024,7 @@
 
 struct MOZ_STACK_CLASS ScopedLogExtraInfo {
   static constexpr const char kTagQuery[] = "query";
+  static constexpr const char kTagContext[] = "context";
 
 #ifdef QM_ENABLE_SCOPED_LOG_EXTRA_INFO
  private:
@@ -1005,6 +1062,7 @@
   nsCString mCurrentValue;
 
   static MOZ_THREAD_LOCAL(const nsACString*) sQueryValue;
+  static MOZ_THREAD_LOCAL(const nsACString*) sContextValue;
 
   void AddInfo();
 #else
@@ -1046,6 +1104,19 @@
 
 QM_META_HANDLE_ERROR("QuotaManager"_ns)
 
+template <SingleStepResult ResultHandling = SingleStepResult::AssertHasResult,
+          typename BindFunctor>
+Result<SingleStepSuccessType<ResultHandling>, nsresult>
+CreateAndExecuteSingleStepStatement(mozIStorageConnection& aConnection,
+                                    const nsACString& aStatementString,
+                                    BindFunctor aBindFunctor) {
+  QM_TRY_UNWRAP(auto stmt, CreateStatement(aConnection, aStatementString));
+
+  QM_TRY(aBindFunctor(*stmt));
+
+  return ExecuteSingleStep<ResultHandling>(std::move(stmt));
+}
+
 }  // namespace quota
 }  // namespace dom
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/dom/quota/QuotaManager.h firefox-85.0+build1/dom/quota/QuotaManager.h
--- firefox-84.0.2+build1/dom/quota/QuotaManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/QuotaManager.h	2021-01-18 19:58:10.000000000 +0000
@@ -219,9 +219,9 @@
                            const GroupAndOrigin& aGroupAndOrigin,
                            Client::Type aClientType);
 
-  bool GetUsageForClient(PersistenceType aPersistenceType,
-                         const GroupAndOrigin& aGroupAndOrigin,
-                         Client::Type aClientType, uint64_t& aUsage);
+  UsageInfo GetUsageForClient(PersistenceType aPersistenceType,
+                              const GroupAndOrigin& aGroupAndOrigin,
+                              Client::Type aClientType);
 
   void UpdateOriginAccessTime(PersistenceType aPersistenceType,
                               const GroupAndOrigin& aGroupAndOrigin);
@@ -338,35 +338,23 @@
 
   nsresult EnsureStorageIsInitialized();
 
-  /**
-   * @returns a Result with the success value pointing to the storage directory
-   * for the origin.
-   */
-  Result<nsCOMPtr<nsIFile>, nsresult> EnsureStorageAndOriginIsInitialized(
-      PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo,
-      Client::Type aClientType);
+  // Returns a pair of an nsIFile object referring to the directory, and a bool
+  // indicating whether the directory was newly created.
+  Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult>
+  EnsurePersistentOriginIsInitialized(const QuotaInfo& aQuotaInfo);
 
   // Returns a pair of an nsIFile object referring to the directory, and a bool
   // indicating whether the directory was newly created.
   Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult>
-  EnsureStorageAndOriginIsInitializedInternal(
-      PersistenceType aPersistenceType, const QuotaInfo& aQuotaInfo,
-      const Nullable<Client::Type>& aClientType);
-
-  nsresult EnsurePersistentOriginIsInitialized(const QuotaInfo& aQuotaInfo,
-                                               nsIFile** aDirectory,
-                                               bool* aCreated);
-
-  nsresult EnsureTemporaryOriginIsInitialized(PersistenceType aPersistenceType,
-                                              const QuotaInfo& aQuotaInfo,
-                                              nsIFile** aDirectory,
-                                              bool* aCreated);
+  EnsureTemporaryOriginIsInitialized(PersistenceType aPersistenceType,
+                                     const QuotaInfo& aQuotaInfo);
 
   nsresult EnsureTemporaryStorageIsInitialized();
 
   void ShutdownStorage();
 
-  nsresult EnsureOriginDirectory(nsIFile* aDirectory, bool* aCreated);
+  // Returns a bool indicating whether the directory was newly created.
+  Result<bool, nsresult> EnsureOriginDirectory(nsIFile& aDirectory);
 
   nsresult AboutToClearOrigins(
       const Nullable<PersistenceType>& aPersistenceType,
diff -Nru firefox-84.0.2+build1/dom/quota/QuotaManagerService.cpp firefox-85.0+build1/dom/quota/QuotaManagerService.cpp
--- firefox-84.0.2+build1/dom/quota/QuotaManagerService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/QuotaManagerService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -528,10 +528,8 @@
 }
 
 NS_IMETHODIMP
-QuotaManagerService::InitStorageAndOrigin(nsIPrincipal* aPrincipal,
-                                          const nsACString& aPersistenceType,
-                                          const nsAString& aClientType,
-                                          nsIQuotaRequest** _retval) {
+QuotaManagerService::InitializePersistentOrigin(nsIPrincipal* aPrincipal,
+                                                nsIQuotaRequest** _retval) {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(nsContentUtils::IsCallerChrome());
 
@@ -541,7 +539,7 @@
 
   RefPtr<Request> request = new Request();
 
-  InitStorageAndOriginParams params;
+  InitializePersistentOriginParams params;
 
   nsresult rv =
       CheckedPrincipalToPrincipalInfo(aPrincipal, params.principalInfo());
@@ -549,25 +547,48 @@
     return rv;
   }
 
+  RequestInfo info(request, params);
+
+  rv = InitiateRequest(info);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  request.forget(_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+QuotaManagerService::InitializeTemporaryOrigin(
+    const nsACString& aPersistenceType, nsIPrincipal* aPrincipal,
+    nsIQuotaRequest** _retval) {
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(nsContentUtils::IsCallerChrome());
+
+  if (NS_WARN_IF(!StaticPrefs::dom_quotaManager_testing())) {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  RefPtr<Request> request = new Request();
+
+  InitializeTemporaryOriginParams params;
+
   const auto maybePersistenceType =
       PersistenceTypeFromString(aPersistenceType, fallible);
   if (NS_WARN_IF(maybePersistenceType.isNothing())) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  params.persistenceType() = maybePersistenceType.value();
+  if (NS_WARN_IF(!IsBestEffortPersistenceType(maybePersistenceType.value()))) {
+    return NS_ERROR_FAILURE;
+  }
 
-  if (aClientType.IsVoid()) {
-    params.clientTypeIsExplicit() = false;
-  } else {
-    Client::Type clientType;
-    bool ok = Client::TypeFromText(aClientType, clientType, fallible);
-    if (NS_WARN_IF(!ok)) {
-      return NS_ERROR_INVALID_ARG;
-    }
+  params.persistenceType() = maybePersistenceType.value();
 
-    params.clientType() = clientType;
-    params.clientTypeIsExplicit() = true;
+  nsresult rv =
+      CheckedPrincipalToPrincipalInfo(aPrincipal, params.principalInfo());
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
   }
 
   RequestInfo info(request, params);
diff -Nru firefox-84.0.2+build1/dom/quota/SerializationHelpers.h firefox-85.0+build1/dom/quota/SerializationHelpers.h
--- firefox-84.0.2+build1/dom/quota/SerializationHelpers.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/SerializationHelpers.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_quota_SerializationHelpers_h
 #define mozilla_dom_quota_SerializationHelpers_h
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 
 #include "mozilla/dom/quota/Client.h"
diff -Nru firefox-84.0.2+build1/dom/quota/StorageManager.h firefox-85.0+build1/dom/quota/StorageManager.h
--- firefox-84.0.2+build1/dom/quota/StorageManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/StorageManager.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_StorageManager_h
 #define mozilla_dom_StorageManager_h
 
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/dom/quota/test/gtest/TestQuotaCommon.cpp firefox-85.0+build1/dom/quota/test/gtest/TestQuotaCommon.cpp
--- firefox-84.0.2+build1/dom/quota/test/gtest/TestQuotaCommon.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/gtest/TestQuotaCommon.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Result.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Unused.h"
 #include "mozilla/fallible.h"
 #include "nsCOMPtr.h"
@@ -1331,6 +1332,67 @@
   MOZ_RELEASE_ASSERT(3 == bodyExecutions);
 }
 
+TEST(QuotaCommon_ReduceEach, Success)
+{
+  const auto result = ReduceEach(
+      [i = int{0}]() mutable -> Result<int, Failed> {
+        if (i < 5) {
+          return ++i;
+        }
+        return 0;
+      },
+      0, [](int val, int add) -> Result<int, Failed> { return val + add; });
+  static_assert(std::is_same_v<decltype(result), const Result<int, Failed>>);
+
+  MOZ_RELEASE_ASSERT(result.isOk());
+  MOZ_RELEASE_ASSERT(15 == result.inspect());
+}
+
+TEST(QuotaCommon_ReduceEach, StepError)
+{
+  const auto result = ReduceEach(
+      [i = int{0}]() mutable -> Result<int, Failed> {
+        if (i < 5) {
+          return ++i;
+        }
+        return 0;
+      },
+      0,
+      [](int val, int add) -> Result<int, Failed> {
+        if (val > 2) {
+          return Err(Failed{});
+        }
+        return val + add;
+      });
+  static_assert(std::is_same_v<decltype(result), const Result<int, Failed>>);
+
+  MOZ_RELEASE_ASSERT(result.isErr());
+}
+
+TEST(QuotaCommon_ReduceEach, GeneratorError)
+{
+  size_t generatorExecutions = 0;
+  const auto result = ReduceEach(
+      [i = int{0}, &generatorExecutions]() mutable -> Result<int, Failed> {
+        ++generatorExecutions;
+        if (i < 1) {
+          return ++i;
+        }
+        return Err(Failed{});
+      },
+      0,
+      [](int val, int add) -> Result<int, Failed> {
+        if (val > 2) {
+          return Err(Failed{});
+        }
+        return val + add;
+      });
+  static_assert(std::is_same_v<decltype(result), const Result<int, Failed>>);
+
+  MOZ_RELEASE_ASSERT(result.isErr());
+  MOZ_RELEASE_ASSERT(2 == generatorExecutions);
+}
+
 TEST(QuotaCommon_ScopedLogExtraInfo, AddAndRemove)
 {
   static constexpr auto text = "foo"_ns;
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/common/head.js firefox-85.0+build1/dom/quota/test/xpcshell/common/head.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/common/head.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/common/head.js	2021-01-18 19:58:10.000000000 +0000
@@ -149,23 +149,19 @@
   return request;
 }
 
-function initStorageAndOrigin(principal, persistence, callback) {
-  let request = SpecialPowers._getQuotaManager().initStorageAndOrigin(
-    principal,
-    persistence
+function initPersistentOrigin(principal, callback) {
+  let request = SpecialPowers._getQuotaManager().initializePersistentOrigin(
+    principal
   );
   request.callback = callback;
 
   return request;
 }
 
-function initStorageAndChromeOrigin(persistence, callback) {
-  let principal = Cc["@mozilla.org/systemprincipal;1"].createInstance(
-    Ci.nsIPrincipal
-  );
-  let request = SpecialPowers._getQuotaManager().initStorageAndOrigin(
-    principal,
-    persistence
+function initTemporaryOrigin(persistence, principal, callback) {
+  let request = SpecialPowers._getQuotaManager().initializeTemporaryOrigin(
+    persistence,
+    principal
   );
   request.callback = callback;
 
@@ -190,19 +186,6 @@
   );
   request.callback = callback;
 
-  return request;
-}
-
-function clearChromeOrigin(callback) {
-  let principal = Cc["@mozilla.org/systemprincipal;1"].createInstance(
-    Ci.nsIPrincipal
-  );
-  let request = SpecialPowers._getQuotaManager().clearStoragesForPrincipal(
-    principal,
-    "persistent"
-  );
-  request.callback = callback;
-
   return request;
 }
 
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/make_unknownFiles.js firefox-85.0+build1/dom/quota/test/xpcshell/make_unknownFiles.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/make_unknownFiles.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/make_unknownFiles.js	2021-01-18 19:58:10.000000000 +0000
@@ -59,7 +59,13 @@
 
   // Unknown file and unknown directory in the origin directory
   {
-    const request = initStorageAndOrigin(principal, "default");
+    let request = init();
+    await requestFinished(request);
+
+    request = initTemporaryStorage();
+    await requestFinished(request);
+
+    request = initTemporaryOrigin("default", principal);
     await requestFinished(request);
 
     ok(request.result === true, "The origin directory was created");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/telemetry/test_qm_first_initialization_attempt.js firefox-85.0+build1/dom/quota/test/xpcshell/telemetry/test_qm_first_initialization_attempt.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/telemetry/test_qm_first_initialization_attempt.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/telemetry/test_qm_first_initialization_attempt.js	2021-01-18 19:58:10.000000000 +0000
@@ -560,6 +560,12 @@
   {
     mainKey: "PersistentOrigin",
     async setup(expectedInitResult) {
+      // We need to initialize storage before creating the origin files. If we
+      // don't do that, the storage directory created for the origin files
+      // would trigger storage upgrades (from version 0 to current version).
+      let request = init();
+      await requestFinished(request);
+
       if (!expectedInitResult) {
         const originFiles = [
           getRelativeFile("storage/permanent/https+++example.com"),
@@ -567,22 +573,27 @@
           getRelativeFile("storage/default/https+++example2.com"),
         ];
 
-        // We need to initialize storage before creating the origin files. If
-        // we don't do that, the storage directory created for the origin files
-        // would trigger storage upgrades (from version 0 to current version).
-        let request = init();
-        await requestFinished(request);
-
         for (const originFile of originFiles) {
           originFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o666);
         }
       }
+
+      request = initTemporaryStorage();
+      await requestFinished(request);
     },
-    initFunction: initStorageAndOrigin,
-    initArgs: [
-      [getPrincipal("https://example.com"), "persistent"],
-      [getPrincipal("https://example1.com"), "persistent"],
-      [getPrincipal("https://example2.com"), "default"],
+    initFunctions: [
+      {
+        name: initPersistentOrigin,
+        args: [getPrincipal("https://example.com")],
+      },
+      {
+        name: initPersistentOrigin,
+        args: [getPrincipal("https://example1.com")],
+      },
+      {
+        name: initTemporaryOrigin,
+        args: ["default", getPrincipal("https://example2.com")],
+      },
     ],
     expectedSnapshots: {
       initFailure: {
@@ -632,6 +643,10 @@
   {
     mainKey: "TemporaryOrigin",
     async setup(expectedInitResult) {
+      // See the comment for "PersistentOrigin".
+      let request = init();
+      await requestFinished(request);
+
       if (!expectedInitResult) {
         const originFiles = [
           getRelativeFile("storage/temporary/https+++example.com"),
@@ -640,21 +655,31 @@
           getRelativeFile("storage/permanent/https+++example2.com"),
         ];
 
-        // See the comment for "PersistentOrigin".
-        let request = init();
-        await requestFinished(request);
-
         for (const originFile of originFiles) {
           originFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o666);
         }
       }
+
+      request = initTemporaryStorage();
+      await requestFinished(request);
     },
-    initFunction: initStorageAndOrigin,
-    initArgs: [
-      [getPrincipal("https://example.com"), "temporary"],
-      [getPrincipal("https://example.com"), "default"],
-      [getPrincipal("https://example1.com"), "default"],
-      [getPrincipal("https://example2.com"), "persistent"],
+    initFunctions: [
+      {
+        name: initTemporaryOrigin,
+        args: ["temporary", getPrincipal("https://example.com")],
+      },
+      {
+        name: initTemporaryOrigin,
+        args: ["default", getPrincipal("https://example.com")],
+      },
+      {
+        name: initTemporaryOrigin,
+        args: ["default", getPrincipal("https://example1.com")],
+      },
+      {
+        name: initPersistentOrigin,
+        args: [getPrincipal("https://example2.com")],
+      },
     ],
     // Only the first result of EnsureTemporaryOriginIsInitialized per origin
     // should be reported. Thus, only the results for (temporary, example.com),
@@ -775,9 +800,21 @@
       // Call the initialization function twice, so we can verify below that
       // only the first initialization attempt has been reported.
       for (let i = 0; i < 2; ++i) {
-        const initArgs = testcase.initArgs ? testcase.initArgs : [[]];
-        for (const initArg of initArgs) {
-          request = testcase.initFunction(...initArg);
+        let initFunctions;
+
+        if (testcase.initFunctions) {
+          initFunctions = testcase.initFunctions;
+        } else {
+          initFunctions = [
+            {
+              name: testcase.initFunction,
+              args: [],
+            },
+          ];
+        }
+
+        for (const initFunction of initFunctions) {
+          request = initFunction.name(...initFunction.args);
           try {
             await requestFinished(request);
             ok(expectedInitResult, msg);
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_allowListFiles.js firefox-85.0+build1/dom/quota/test/xpcshell/test_allowListFiles.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_allowListFiles.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_allowListFiles.js	2021-01-18 19:58:10.000000000 +0000
@@ -22,7 +22,12 @@
   for (let allowListFile of allowListFiles) {
     info("Testing " + allowListFile + " in the repository");
 
-    info("Creating unknown file");
+    info("Initializing");
+
+    let request = init();
+    await requestFinished(request);
+
+    info("Creating unknown files");
 
     for (let dir of ["persistenceType dir", "origin dir"]) {
       let dirPath =
@@ -33,12 +38,9 @@
       file.create(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("0644", 8));
     }
 
-    info("Initializing an origin");
+    info("Initializing temporary storage");
 
-    let request = initStorageAndOrigin(
-      getPrincipal("http://example.com"),
-      "default"
-    );
+    request = initTemporaryStorage();
     await requestFinished(request);
 
     info("Resetting");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_basics.js firefox-85.0+build1/dom/quota/test/xpcshell/test_basics.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_basics.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_basics.js	2021-01-18 19:58:10.000000000 +0000
@@ -114,7 +114,7 @@
 
   info("Initializing origin");
 
-  request = initStorageAndChromeOrigin("persistent", continueToNextStepSync);
+  request = initPersistentOrigin(getCurrentPrincipal(), continueToNextStepSync);
   yield undefined;
 
   ok(request.resultCode == NS_OK, "Initialization succeeded");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_groupMismatch.js firefox-85.0+build1/dom/quota/test/xpcshell/test_groupMismatch.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_groupMismatch.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_groupMismatch.js	2021-01-18 19:58:10.000000000 +0000
@@ -11,7 +11,6 @@
 loadScript("dom/quota/test/common/file.js");
 
 async function testSteps() {
-  const principal = getPrincipal("https://foo.bar.mozilla-iot.org");
   const metadataFile = getRelativeFile(
     "storage/default/https+++foo.bar.mozilla-iot.org/.metadata-v2"
   );
@@ -55,9 +54,14 @@
 
   let metadataBuffer = await readMetadataFile();
 
-  info("Initializing origin");
+  info("Initializing");
 
-  request = initStorageAndOrigin(principal, "default");
+  request = init();
+  await requestFinished(request);
+
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
   await requestFinished(request);
 
   info("Reading out contents of metadata file");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_listOrigins.js firefox-85.0+build1/dom/quota/test/xpcshell/test_listOrigins.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_listOrigins.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_listOrigins.js	2021-01-18 19:58:10.000000000 +0000
@@ -52,10 +52,20 @@
   request = clear();
   await requestFinished(request);
 
+  info("Initializing");
+
+  request = init();
+  await requestFinished(request);
+
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
+  await requestFinished(request);
+
   info("Initializing origins");
 
   for (const origin of origins) {
-    request = initStorageAndOrigin(getPrincipal(origin), "default");
+    request = initTemporaryOrigin("default", getPrincipal(origin));
     await requestFinished(request);
   }
 
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_persist.js firefox-85.0+build1/dom/quota/test/xpcshell/test_persist.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_persist.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_persist.js	2021-01-18 19:58:10.000000000 +0000
@@ -68,7 +68,10 @@
 
   info("Persisting an already initialized origin");
 
-  initStorageAndOrigin(principal, origin.persistence, continueToNextStepSync);
+  initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
+
+  initTemporaryOrigin(origin.persistence, principal, continueToNextStepSync);
   yield undefined;
 
   info("Reading out contents of metadata file");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_specialOrigins.js firefox-85.0+build1/dom/quota/test/xpcshell/test_specialOrigins.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_specialOrigins.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_specialOrigins.js	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,11 @@
 
   SpecialPowers.setBoolPref("security.fileuri.strict_origin_policy", false);
 
+  info("Initializing");
+
+  let request = init();
+  await requestFinished(request);
+
   info("Creating origin directories");
 
   for (let origin of origins) {
@@ -23,15 +28,20 @@
     originDir.create(Ci.nsIFile.DIRECTORY_TYPE, parseInt("0755", 8));
   }
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
+  await requestFinished(request);
+
   info("Initializing origin directories");
 
   for (let origin of origins) {
     let result;
 
     try {
-      let request = initStorageAndOrigin(
-        getPrincipal(origin.url),
-        origin.persistence
+      request = initTemporaryOrigin(
+        origin.persistence,
+        getPrincipal(origin.url)
       );
       result = await requestFinished(request);
 
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_tempMetadataCleanup.js firefox-85.0+build1/dom/quota/test/xpcshell/test_tempMetadataCleanup.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_tempMetadataCleanup.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_tempMetadataCleanup.js	2021-01-18 19:58:10.000000000 +0000
@@ -18,12 +18,14 @@
 
   installPackage("tempMetadataCleanup_profile");
 
+  info("Initializing");
+
+  let request = init(continueToNextStepSync);
+  yield undefined;
+
   info("Initializing origin");
 
-  let request = initStorageAndChromeOrigin(
-    "persistent",
-    continueToNextStepSync
-  );
+  request = initPersistentOrigin(getCurrentPrincipal(), continueToNextStepSync);
   yield undefined;
 
   ok(request.resultCode == NS_OK, "Initialization succeeded");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_unknownFiles.js firefox-85.0+build1/dom/quota/test/xpcshell/test_unknownFiles.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_unknownFiles.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_unknownFiles.js	2021-01-18 19:58:10.000000000 +0000
@@ -5,9 +5,9 @@
 
 /**
  * This test is mainly to verify that init, initTemporaryStorage,
- * initStorageAndOrigin, getUsageForPrincipal and clearStoragesForPrincipal are
- * able to ignore unknown files and directories in the storage/default
- * directory and its subdirectories.
+ * getUsageForPrincipal and clearStoragesForPrincipal are able to ignore
+ * unknown files and directories in the storage/default directory and its
+ * subdirectories.
  */
 async function testSteps() {
   const principal = getPrincipal("http://example.com");
@@ -79,17 +79,6 @@
   // init and initTemporaryStorage functionality is tested in the
   // testFunctionality function as part of the multi mode testing
 
-  info("Testing initStorageAndOrigin functionality");
-
-  await testFunctionality(async function() {
-    info("Initializing origin");
-
-    request = initStorageAndOrigin(principal, "default");
-    await requestFinished(request);
-
-    ok(request.result === false, "The origin directory was not created");
-  });
-
   info("Testing getUsageForPrincipal functionality");
 
   await testFunctionality(async function() {
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/test_validOrigins.js firefox-85.0+build1/dom/quota/test/xpcshell/test_validOrigins.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/test_validOrigins.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/test_validOrigins.js	2021-01-18 19:58:10.000000000 +0000
@@ -64,11 +64,21 @@
     },
   ];
 
+  info("Initializing");
+
+  let request = init();
+  await requestFinished(request);
+
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
+  await requestFinished(request);
+
   for (let origin of origins) {
     info(`Testing ${origin.url}`);
 
     try {
-      let request = initStorageAndOrigin(getPrincipal(origin.url), "default");
+      request = initTemporaryOrigin("default", getPrincipal(origin.url));
       await requestFinished(request);
 
       ok(true, "Should not have thrown");
@@ -84,6 +94,6 @@
     );
   }
 
-  let request = clear();
+  request = clear();
   await requestFinished(request);
 }
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromFlatOriginDirectories.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromFlatOriginDirectories.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromFlatOriginDirectories.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromFlatOriginDirectories.js	2021-01-18 19:58:10.000000000 +0000
@@ -152,13 +152,26 @@
 
         exists = metadataFile.exists();
         ok(exists, "Metadata file does exist");
+      }
+    }
 
+    info("Initializing temporary storage");
+
+    request = initTemporaryStorage(continueToNextStepSync);
+    yield undefined;
+
+    ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+    info("Initializing origins");
+
+    for (const origin of setup.origins) {
+      if (origin.newPath) {
         info("Initializing origin");
 
         let principal = getPrincipal(origin.url);
-        request = initStorageAndOrigin(
-          principal,
+        request = initTemporaryOrigin(
           origin.persistence,
+          principal,
           continueToNextStepSync
         );
         yield undefined;
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory.js	2021-01-18 19:58:10.000000000 +0000
@@ -87,13 +87,26 @@
       originDir = getRelativeFile(origin.newPath);
       exists = originDir.exists();
       ok(exists, "Origin directory does exist");
+    }
+  }
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
+
+  ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+  info("Initializing origins");
+
+  for (const origin of origins) {
+    if (origin.newPath) {
       info("Initializing origin");
 
       let principal = getPrincipal(origin.url);
-      request = initStorageAndOrigin(
-        principal,
+      request = initTemporaryOrigin(
         origin.persistence,
+        principal,
         continueToNextStepSync
       );
       yield undefined;
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory_removeOldDirectory.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory_removeOldDirectory.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory_removeOldDirectory.js	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromIndexedDBDirectory_removeOldDirectory.js	2021-01-18 19:58:10.000000000 +0000
@@ -72,9 +72,14 @@
   exists = persistentStorageDir.exists();
   ok(!exists, "Persistent storage directory doesn't exist");
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
+  await requestFinished(request);
+
   info("Initializing origin");
 
-  request = initStorageAndOrigin(getPrincipal(url), persistence);
+  request = initTemporaryOrigin(persistence, getPrincipal(url));
   await requestFinished(request);
 
   ok(!request.result, "Origin directory wasn't created");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory.js	2021-01-18 19:58:10.000000000 +0000
@@ -291,6 +291,8 @@
   getRelativeFile("storage/default/invalid+++example.com").remove(false);
   getRelativeFile("storage/temporary/invalid+++example.com").remove(false);
 
+  info("Checking origin directories");
+
   for (let origin of origins) {
     if (!origin.newPath || origin.newPath != origin.oldPath) {
       let originDir = getRelativeFile(origin.oldPath);
@@ -332,24 +334,39 @@
           "Metadata differ"
         );
       }
+    }
+  }
+
+  info("Initializing");
+
+  request = initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
 
+  ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+  info("Initializing origins");
+
+  for (const origin of origins) {
+    if (origin.newPath) {
       info("Initializing origin");
 
+      let principal;
       if (origin.chrome) {
-        request = initStorageAndChromeOrigin(
-          origin.persistence,
-          continueToNextStepSync
-        );
-        yield undefined;
+        principal = getCurrentPrincipal();
       } else {
-        let principal = getPrincipal(origin.url);
-        request = initStorageAndOrigin(
-          principal,
+        principal = getPrincipal(origin.url);
+      }
+
+      if (origin.persistence == "persistent") {
+        request = initPersistentOrigin(principal, continueToNextStepSync);
+      } else {
+        request = initTemporaryOrigin(
           origin.persistence,
+          principal,
           continueToNextStepSync
         );
-        yield undefined;
       }
+      yield undefined;
 
       ok(request.resultCode == NS_OK, "Initialization succeeded");
 
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_removeOldDirectory.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_removeOldDirectory.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_removeOldDirectory.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_removeOldDirectory.js	2021-01-18 19:58:10.000000000 +0000
@@ -72,9 +72,14 @@
   exists = defaultStorageDir.exists();
   ok(exists, "Default storage directory does exist");
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage();
+  await requestFinished(request);
+
   info("Initializing origin");
 
-  request = initStorageAndOrigin(getPrincipal(url), persistence);
+  request = initTemporaryOrigin(persistence, getPrincipal(url));
   await requestFinished(request);
 
   ok(!request.result, "Origin directory wasn't created");
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_upgradeOriginDirectories.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_upgradeOriginDirectories.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_upgradeOriginDirectories.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeFromPersistentStorageDirectory_upgradeOriginDirectories.js	2021-01-18 19:58:10.000000000 +0000
@@ -128,13 +128,26 @@
 
       exists = metadataFile.exists();
       ok(exists, "Metadata file does exist");
+    }
+  }
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
+
+  ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+  info("Initializing origins");
+
+  for (const origin of origins) {
+    if (origin.newPath) {
       info("Initializing origin");
 
       let principal = getPrincipal(origin.url);
-      request = initStorageAndOrigin(
-        principal,
+      request = initTemporaryOrigin(
         origin.persistence,
+        principal,
         continueToNextStepSync
       );
       yield undefined;
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom0_0.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom0_0.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom0_0.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom0_0.js	2021-01-18 19:58:10.000000000 +0000
@@ -124,13 +124,26 @@
 
       exists = metadata2File.exists();
       ok(exists, "Metadata file does exist");
+    }
+  }
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
+
+  ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+  info("Initializing origins");
+
+  for (const origin of origins) {
+    if (!origin.obsolete) {
       info("Initializing origin");
 
       let principal = getPrincipal(origin.url);
-      request = initStorageAndOrigin(
-        principal,
+      request = initTemporaryOrigin(
         origin.persistence,
+        principal,
         continueToNextStepSync
       );
       yield undefined;
diff -Nru firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom1_0_stripObsoleteOriginAttributes.js firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom1_0_stripObsoleteOriginAttributes.js
--- firefox-84.0.2+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom1_0_stripObsoleteOriginAttributes.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/test/xpcshell/upgrades/test_upgradeStorageFrom1_0_stripObsoleteOriginAttributes.js	2021-01-18 19:58:10.000000000 +0000
@@ -144,15 +144,30 @@
       !compareBuffers(metadataBuffer, metadataBuffers.shift()),
       "Metadata differ"
     );
+  }
 
+  info("Initializing temporary storage");
+
+  request = initTemporaryStorage(continueToNextStepSync);
+  yield undefined;
+
+  ok(request.resultCode == NS_OK, "Initialization succeeded");
+
+  info("Initializing origins");
+
+  for (const origin of origins) {
     info("Initializing origin");
 
     let principal = getPrincipal(origin.url);
-    request = initStorageAndOrigin(
-      principal,
-      origin.persistence,
-      continueToNextStepSync
-    );
+    if (origin.persistence == "persistent") {
+      request = initPersistentOrigin(principal, continueToNextStepSync);
+    } else {
+      request = initTemporaryOrigin(
+        origin.persistence,
+        principal,
+        continueToNextStepSync
+      );
+    }
     yield undefined;
 
     ok(request.resultCode == NS_OK, "Initialization succeeded");
diff -Nru firefox-84.0.2+build1/dom/quota/UsageInfo.h firefox-85.0+build1/dom/quota/UsageInfo.h
--- firefox-84.0.2+build1/dom/quota/UsageInfo.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/quota/UsageInfo.h	2021-01-18 19:58:10.000000000 +0000
@@ -56,6 +56,18 @@
 
 class UsageInfo final {
  public:
+  UsageInfo() = default;
+
+  explicit UsageInfo(const DatabaseUsageType aUsage) : mDatabaseUsage(aUsage) {}
+
+  explicit UsageInfo(const FileUsageType aUsage) : mFileUsage(aUsage) {}
+
+  UsageInfo operator+(const UsageInfo& aUsageInfo) {
+    UsageInfo res = *this;
+    res += aUsageInfo;
+    return res;
+  }
+
   UsageInfo& operator+=(const UsageInfo& aUsageInfo) {
     mDatabaseUsage += aUsageInfo.mDatabaseUsage;
     mFileUsage += aUsageInfo.mFileUsage;
@@ -72,6 +84,8 @@
     return *this;
   }
 
+  Maybe<uint64_t> DatabaseUsage() const { return mDatabaseUsage.GetValue(); }
+
   Maybe<uint64_t> FileUsage() const { return mFileUsage.GetValue(); }
 
   Maybe<uint64_t> TotalUsage() const {
diff -Nru firefox-84.0.2+build1/dom/reporting/EndpointForReportParent.cpp firefox-85.0+build1/dom/reporting/EndpointForReportParent.cpp
--- firefox-84.0.2+build1/dom/reporting/EndpointForReportParent.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/EndpointForReportParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/ReportingHeader.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "mozilla/Unused.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/reporting/EndpointForReportParent.h firefox-85.0+build1/dom/reporting/EndpointForReportParent.h
--- firefox-84.0.2+build1/dom/reporting/EndpointForReportParent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/EndpointForReportParent.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,10 @@
 #include "mozilla/dom/PEndpointForReportParent.h"
 
 namespace mozilla {
+namespace ipc {
+class PrincipalInfo;
+}
+
 namespace dom {
 
 class EndpointForReport;
diff -Nru firefox-84.0.2+build1/dom/reporting/FeaturePolicyViolationReportBody.cpp firefox-85.0+build1/dom/reporting/FeaturePolicyViolationReportBody.cpp
--- firefox-84.0.2+build1/dom/reporting/FeaturePolicyViolationReportBody.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/FeaturePolicyViolationReportBody.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/FeaturePolicyViolationReportBody.h"
+
+#include "mozilla/JSONWriter.h"
 #include "mozilla/dom/FeaturePolicyBinding.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/reporting/ReportDeliver.cpp firefox-85.0+build1/dom/reporting/ReportDeliver.cpp
--- firefox-84.0.2+build1/dom/reporting/ReportDeliver.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/ReportDeliver.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,6 +4,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 "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/EndpointForReportChild.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/Navigator.h"
diff -Nru firefox-84.0.2+build1/dom/reporting/ReportDeliver.h firefox-85.0+build1/dom/reporting/ReportDeliver.h
--- firefox-84.0.2+build1/dom/reporting/ReportDeliver.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/ReportDeliver.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,9 @@
 #include "nsString.h"
 #include "nsTArray.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsIPrincipal.h"
+
 class nsIPrincipal;
 class nsPIDOMWindowInner;
 
diff -Nru firefox-84.0.2+build1/dom/reporting/Report.h firefox-85.0+build1/dom/reporting/Report.h
--- firefox-84.0.2+build1/dom/reporting/Report.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/Report.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_Report_h
 #define mozilla_dom_Report_h
 
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/RefPtr.h"
diff -Nru firefox-84.0.2+build1/dom/reporting/ReportingObserver.cpp firefox-85.0+build1/dom/reporting/ReportingObserver.cpp
--- firefox-84.0.2+build1/dom/reporting/ReportingObserver.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/ReportingObserver.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/ReportingBinding.h"
 #include "nsContentUtils.h"
 #include "nsIGlobalObject.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -84,10 +85,10 @@
 
 namespace {
 
-class ReportRunnable final : public CancelableRunnable {
+class ReportRunnable final : public DiscardableRunnable {
  public:
   explicit ReportRunnable(nsIGlobalObject* aGlobal)
-      : CancelableRunnable("ReportRunnable"), mGlobal(aGlobal) {}
+      : DiscardableRunnable("ReportRunnable"), mGlobal(aGlobal) {}
 
   // MOZ_CAN_RUN_SCRIPT_BOUNDARY until Runnable::Run is MOZ_CAN_RUN_SCRIPT.  See
   // bug 1535398.
diff -Nru firefox-84.0.2+build1/dom/reporting/ReportingObserver.h firefox-85.0+build1/dom/reporting/ReportingObserver.h
--- firefox-84.0.2+build1/dom/reporting/ReportingObserver.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/ReportingObserver.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_ReportingObserver_h
 #define mozilla_dom_ReportingObserver_h
 
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
diff -Nru firefox-84.0.2+build1/dom/reporting/TestingDeprecatedInterface.h firefox-85.0+build1/dom/reporting/TestingDeprecatedInterface.h
--- firefox-84.0.2+build1/dom/reporting/TestingDeprecatedInterface.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/reporting/TestingDeprecatedInterface.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_TestingDeprecatedInterface_h
 #define mozilla_dom_TestingDeprecatedInterface_h
 
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/dom/script/ModuleLoadRequest.h firefox-85.0+build1/dom/script/ModuleLoadRequest.h
--- firefox-84.0.2+build1/dom/script/ModuleLoadRequest.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ModuleLoadRequest.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,8 +8,11 @@
 #define mozilla_dom_ModuleLoadRequest_h
 
 #include "ScriptLoadRequest.h"
+#include "js/RootingAPI.h"
+#include "js/Value.h"
 #include "nsURIHashKey.h"
 #include "mozilla/MozPromise.h"
+#include "nsTHashtable.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/script/moz.build firefox-85.0+build1/dom/script/moz.build
--- firefox-84.0.2+build1/dom/script/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -30,6 +30,7 @@
 UNIFIED_SOURCES += [
     "LoadedScript.cpp",
     "ModuleLoadRequest.cpp",
+    "nsIScriptElement.cpp",
     "ScriptElement.cpp",
     "ScriptLoader.cpp",
     "ScriptLoadHandler.cpp",
diff -Nru firefox-84.0.2+build1/dom/script/nsIScriptElement.cpp firefox-85.0+build1/dom/script/nsIScriptElement.cpp
--- firefox-84.0.2+build1/dom/script/nsIScriptElement.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/script/nsIScriptElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,53 @@
+
+/* -*- 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 "nsIScriptElement.h"
+
+#include "mozilla/dom/ReferrerPolicyBinding.h"
+#include "nsIParser.h"
+#include "nsIWeakReference.h"
+
+void nsIScriptElement::SetCreatorParser(nsIParser* aParser) {
+  mCreatorParser = do_GetWeakReference(aParser);
+}
+
+void nsIScriptElement::UnblockParser() {
+  nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
+  if (parser) {
+    parser->UnblockParser();
+  }
+}
+
+void nsIScriptElement::ContinueParserAsync() {
+  nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
+  if (parser) {
+    parser->ContinueInterruptedParsingAsync();
+  }
+}
+
+void nsIScriptElement::BeginEvaluating() {
+  nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
+  if (parser) {
+    parser->IncrementScriptNestingLevel();
+  }
+}
+
+void nsIScriptElement::EndEvaluating() {
+  nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
+  if (parser) {
+    parser->DecrementScriptNestingLevel();
+  }
+}
+
+already_AddRefed<nsIParser> nsIScriptElement::GetCreatorParser() {
+  nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
+  return parser.forget();
+}
+
+mozilla::dom::ReferrerPolicy nsIScriptElement::GetReferrerPolicy() {
+  return mozilla::dom::ReferrerPolicy::_empty;
+}
diff -Nru firefox-84.0.2+build1/dom/script/nsIScriptElement.h firefox-85.0+build1/dom/script/nsIScriptElement.h
--- firefox-84.0.2+build1/dom/script/nsIScriptElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/nsIScriptElement.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,16 +7,28 @@
 #ifndef nsIScriptElement_h___
 #define nsIScriptElement_h___
 
-#include "nsISupports.h"
-#include "nsIURI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/CORSMode.h"
+#include "mozilla/dom/FromParser.h"
 #include "nsCOMPtr.h"
+#include "nsID.h"
 #include "nsIScriptLoaderObserver.h"
 #include "nsIWeakReferenceUtils.h"
-#include "nsIParser.h"
-#include "nsIContent.h"
-#include "nsContentCreatorFunctions.h"
-#include "mozilla/CORSMode.h"
-#include "ReferrerInfo.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
+
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsIPrincipal.h"
+
+class nsIParser;
+class nsIPrincipal;
+class nsIURI;
+
+namespace mozilla::dom {
+class Document;
+enum class ReferrerPolicy : uint8_t;
+}  // namespace mozilla::dom
 
 // Must be kept in sync with xpcom/rust/xpcom/src/interfaces/nonidl.rs
 #define NS_ISCRIPTELEMENT_IID                        \
@@ -160,57 +172,32 @@
     mDefer = false;
   }
 
-  void SetCreatorParser(nsIParser* aParser) {
-    mCreatorParser = do_GetWeakReference(aParser);
-  }
+  void SetCreatorParser(nsIParser* aParser);
 
   /**
    * Unblocks the creator parser
    */
-  void UnblockParser() {
-    nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
-    if (parser) {
-      parser->UnblockParser();
-    }
-  }
+  void UnblockParser();
 
   /**
    * Attempts to resume parsing asynchronously
    */
-  void ContinueParserAsync() {
-    nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
-    if (parser) {
-      parser->ContinueInterruptedParsingAsync();
-    }
-  }
+  void ContinueParserAsync();
 
   /**
    * Informs the creator parser that the evaluation of this script is starting
    */
-  void BeginEvaluating() {
-    nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
-    if (parser) {
-      parser->IncrementScriptNestingLevel();
-    }
-  }
+  void BeginEvaluating();
 
   /**
    * Informs the creator parser that the evaluation of this script is ending
    */
-  void EndEvaluating() {
-    nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
-    if (parser) {
-      parser->DecrementScriptNestingLevel();
-    }
-  }
+  void EndEvaluating();
 
   /**
    * Retrieves a pointer to the creator parser if this has one or null if not
    */
-  already_AddRefed<nsIParser> GetCreatorParser() {
-    nsCOMPtr<nsIParser> parser = do_QueryReferent(mCreatorParser);
-    return parser.forget();
-  }
+  already_AddRefed<nsIParser> GetCreatorParser();
 
   /**
    * This method is called when the parser finishes creating the script
@@ -241,9 +228,7 @@
   /**
    * Get referrer policy of the script element
    */
-  virtual mozilla::dom::ReferrerPolicy GetReferrerPolicy() {
-    return mozilla::dom::ReferrerPolicy::_empty;
-  }
+  virtual mozilla::dom::ReferrerPolicy GetReferrerPolicy();
 
   /**
    * Fire an error event
diff -Nru firefox-84.0.2+build1/dom/script/ScriptElement.cpp firefox-85.0+build1/dom/script/ScriptElement.cpp
--- firefox-84.0.2+build1/dom/script/ScriptElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "ScriptLoader.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventDispatcher.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
 #include "nsPresContext.h"
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoader.cpp firefox-85.0+build1/dom/script/ScriptLoader.cpp
--- firefox-84.0.2+build1/dom/script/ScriptLoader.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoader.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,7 @@
 #include "jsfriendapi.h"
 #include "js/Array.h"  // JS::GetArrayLength
 #include "js/CompilationAndEvaluation.h"
+#include "js/ContextOptions.h"        // JS::ContextOptionsRef
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/MemoryFunctions.h"
 #include "js/Modules.h"  // JS::FinishDynamicModuleImport, JS::{G,S}etModuleResolveHook, JS::Get{ModulePrivate,ModuleScript,RequestedModule{s,Specifier,SourcePos}}, JS::SetModule{DynamicImport,Metadata}Hook
@@ -24,16 +25,19 @@
 #include "js/SourceText.h"
 #include "js/Utility.h"
 #include "xpcpublic.h"
+#include "GeckoProfiler.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIContent.h"
 #include "nsJSUtils.h"
 #include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/JSExecutionContext.h"
 #include "mozilla/dom/ScriptDecoding.h"  // mozilla::dom::ScriptDecoding
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/SRILogHelper.h"
 #include "mozilla/dom/WindowContext.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "nsAboutProtocolUtils.h"
@@ -69,6 +73,7 @@
 #include "nsINetworkPredictor.h"
 #include "nsMimeTypes.h"
 #include "mozilla/ConsoleReportCollector.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/LoadInfo.h"
 #include "ReferrerInfo.h"
 
@@ -83,10 +88,6 @@
 #include "nsIScriptError.h"
 #include "nsIAsyncOutputStream.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 using JS::SourceText;
 
 using mozilla::Telemetry::LABELS_DOM_SCRIPT_PRELOAD_RESULT;
@@ -108,6 +109,33 @@
 // store bytecode without reading it.
 static constexpr auto kNullMimeType = "javascript/null"_ns;
 
+/////////////////////////////////////////////////////////////
+// AsyncCompileShutdownObserver
+/////////////////////////////////////////////////////////////
+
+NS_IMPL_ISUPPORTS(AsyncCompileShutdownObserver, nsIObserver)
+
+void AsyncCompileShutdownObserver::OnShutdown() {
+  if (mScriptLoader) {
+    mScriptLoader->Shutdown();
+    Unregister();
+  }
+}
+
+void AsyncCompileShutdownObserver::Unregister() {
+  if (mScriptLoader) {
+    mScriptLoader = nullptr;
+    nsContentUtils::UnregisterShutdownObserver(this);
+  }
+}
+
+NS_IMETHODIMP
+AsyncCompileShutdownObserver::Observe(nsISupports* aSubject, const char* aTopic,
+                                      const char16_t* aData) {
+  OnShutdown();
+  return NS_OK;
+}
+
 //////////////////////////////////////////////////////////////
 // ScriptLoader::PreloadInfo
 //////////////////////////////////////////////////////////////
@@ -156,6 +184,9 @@
 
   mSpeculativeOMTParsingEnabled = StaticPrefs::
       dom_script_loader_external_scripts_speculative_omt_parse_enabled();
+
+  mShutdownObserver = new AsyncCompileShutdownObserver(this);
+  nsContentUtils::RegisterShutdownObserver(mShutdownObserver);
 }
 
 ScriptLoader::~ScriptLoader() {
@@ -189,7 +220,7 @@
 
   for (ScriptLoadRequest* req = mDynamicImportRequests.getFirst(); req;
        req = req->getNext()) {
-    FinishDynamicImport(req->AsModuleRequest(), NS_ERROR_ABORT);
+    FinishDynamicImportAndReject(req->AsModuleRequest(), NS_ERROR_ABORT);
   }
 
   for (ScriptLoadRequest* req =
@@ -207,6 +238,11 @@
   for (size_t i = 0; i < mPreloads.Length(); i++) {
     AccumulateCategorical(LABELS_DOM_SCRIPT_PRELOAD_RESULT::NotUsed);
   }
+
+  if (mShutdownObserver) {
+    mShutdownObserver->Unregister();
+    mShutdownObserver = nullptr;
+  }
 }
 
 // Collect telemtry data about the cache information, and the kind of source
@@ -1017,20 +1053,30 @@
 
   nsresult rv = StartLoad(aRequest);
   if (NS_FAILED(rv)) {
-    FinishDynamicImport(aRequest, rv);
+    FinishDynamicImportAndReject(aRequest, rv);
   }
 }
 
-void ScriptLoader::FinishDynamicImport(ModuleLoadRequest* aRequest,
-                                       nsresult aResult) {
+void ScriptLoader::FinishDynamicImportAndReject(ModuleLoadRequest* aRequest,
+                                                nsresult aResult) {
   AutoJSAPI jsapi;
+  MOZ_ASSERT(NS_FAILED(aResult));
   MOZ_ALWAYS_TRUE(jsapi.Init(aRequest->mDynamicPromise));
-  FinishDynamicImport(jsapi.cx(), aRequest, aResult);
+  if (!JS::ContextOptionsRef(jsapi.cx()).topLevelAwait()) {
+    // This is used so that Top Level Await functionality can be turned off
+    // entirely. It will be removed in bug#1676612.
+    FinishDynamicImport_NoTLA(jsapi.cx(), aRequest, aResult);
+  } else {
+    // Path for when Top Level Await is enabled.
+    FinishDynamicImport(jsapi.cx(), aRequest, aResult, nullptr);
+  }
 }
 
-void ScriptLoader::FinishDynamicImport(JSContext* aCx,
-                                       ModuleLoadRequest* aRequest,
-                                       nsresult aResult) {
+// This is used so that Top Level Await functionality can be turned off
+// entirely. It will be removed in bug#1676612.
+void ScriptLoader::FinishDynamicImport_NoTLA(JSContext* aCx,
+                                             ModuleLoadRequest* aRequest,
+                                             nsresult aResult) {
   LOG(("ScriptLoadRequest (%p): Finish dynamic import %x %d", aRequest,
        unsigned(aResult), JS_IsExceptionPending(aCx)));
 
@@ -1054,8 +1100,42 @@
   JS::Rooted<JSString*> specifier(aCx, aRequest->mDynamicSpecifier);
   JS::Rooted<JSObject*> promise(aCx, aRequest->mDynamicPromise);
 
-  JS::FinishDynamicModuleImport(aCx, status, referencingScript, specifier,
-                                promise);
+  JS::FinishDynamicModuleImport_NoTLA(aCx, status, referencingScript, specifier,
+                                      promise);
+
+  // FinishDynamicModuleImport clears any pending exception.
+  MOZ_ASSERT(!JS_IsExceptionPending(aCx));
+
+  aRequest->ClearDynamicImport();
+}
+
+void ScriptLoader::FinishDynamicImport(
+    JSContext* aCx, ModuleLoadRequest* aRequest, nsresult aResult,
+    JS::Handle<JSObject*> aEvaluationPromise) {
+  // If aResult is a failed result, we don't have an EvaluationPromise. If it
+  // succeeded, evaluationPromise may still be null, but in this case it will
+  // be handled by rejecting the dynamic module import promise in the JSAPI.
+  MOZ_ASSERT_IF(NS_FAILED(aResult), !aEvaluationPromise);
+  LOG(("ScriptLoadRequest (%p): Finish dynamic import %x %d", aRequest,
+       unsigned(aResult), JS_IsExceptionPending(aCx)));
+
+  // Complete the dynamic import, report failures indicated by aResult or as a
+  // pending exception on the context.
+
+  if (NS_FAILED(aResult) &&
+      aResult != NS_SUCCESS_DOM_SCRIPT_EVALUATION_THREW_UNCATCHABLE) {
+    MOZ_ASSERT(!JS_IsExceptionPending(aCx));
+    JS_ReportErrorNumberUC(aCx, js::GetErrorMessage, nullptr,
+                           JSMSG_DYNAMIC_IMPORT_FAILED);
+  }
+
+  JS::Rooted<JS::Value> referencingScript(aCx,
+                                          aRequest->mDynamicReferencingPrivate);
+  JS::Rooted<JSString*> specifier(aCx, aRequest->mDynamicSpecifier);
+  JS::Rooted<JSObject*> promise(aCx, aRequest->mDynamicPromise);
+
+  JS::FinishDynamicModuleImport(aCx, aEvaluationPromise, referencingScript,
+                                specifier, promise);
 
   // FinishDynamicModuleImport clears any pending exception.
   MOZ_ASSERT(!JS_IsExceptionPending(aCx));
@@ -2062,6 +2142,53 @@
 
 } /* anonymous namespace */
 
+void ScriptLoader::Shutdown() {
+  CancelScriptLoadRequests();
+  GiveUpBytecodeEncoding();
+}
+
+void ScriptLoader::CancelScriptLoadRequests() {
+  // Cancel all requests that have not been executed.
+  if (mParserBlockingRequest) {
+    mParserBlockingRequest->Cancel();
+  }
+
+  for (ScriptLoadRequest* req = mXSLTRequests.getFirst(); req;
+       req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (ScriptLoadRequest* req = mDeferRequests.getFirst(); req;
+       req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (ScriptLoadRequest* req = mLoadingAsyncRequests.getFirst(); req;
+       req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (ScriptLoadRequest* req = mLoadedAsyncRequests.getFirst(); req;
+       req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (ScriptLoadRequest* req = mDynamicImportRequests.getFirst(); req;
+       req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (ScriptLoadRequest* req =
+           mNonAsyncExternalScriptInsertedRequests.getFirst();
+       req; req = req->getNext()) {
+    req->Cancel();
+  }
+
+  for (size_t i = 0; i < mPreloads.Length(); i++) {
+    mPreloads[i].mRequest->Cancel();
+  }
+}
+
 nsresult ScriptLoader::ProcessOffThreadRequest(ScriptLoadRequest* aRequest) {
   MOZ_ASSERT(aRequest->mProgress == ScriptLoadRequest::Progress::eCompiling);
   MOZ_ASSERT(!aRequest->mWasCompiledOMT);
@@ -2180,7 +2307,7 @@
 
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_is_active()) {
-    const char* scriptSourceString;
+    ProfilerString8View scriptSourceString;
     if (request->IsTextSource()) {
       scriptSourceString = "ScriptCompileOffThread";
     } else if (request->IsBinASTSource()) {
@@ -2192,10 +2319,11 @@
 
     nsAutoCString profilerLabelString;
     GetProfilerLabelForRequest(request, profilerLabelString);
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        scriptSourceString, JS, TextMarkerPayload,
-        (profilerLabelString, request->mOffThreadParseStartTime,
-         request->mOffThreadParseStopTime));
+    PROFILER_MARKER_TEXT(
+        scriptSourceString, JS,
+        MarkerTiming::Interval(request->mOffThreadParseStartTime,
+                               request->mOffThreadParseStopTime),
+        profilerLabelString);
   }
 #endif
 
@@ -2559,7 +2687,7 @@
   }
 
   if (NS_FAILED(rv)) {
-    FinishDynamicImport(aRequest, rv);
+    FinishDynamicImportAndReject(aRequest, rv);
   }
 }
 
@@ -2763,7 +2891,7 @@
 
 static nsresult ExecuteCompiledScript(JSContext* aCx,
                                       ScriptLoadRequest* aRequest,
-                                      nsJSUtils::ExecutionContext& aExec,
+                                      JSExecutionContext& aExec,
                                       ClassicScript* aLoaderScript) {
   JS::Rooted<JSScript*> script(aCx, aExec.GetScript());
   if (!script) {
@@ -2853,12 +2981,30 @@
         LOG(("ScriptLoadRequest (%p):   module has error to rethrow",
              aRequest));
         JS::Rooted<JS::Value> error(cx, moduleScript->ErrorToRethrow());
-        JS_SetPendingException(cx, error);
-
-        // For a dynamic import, the promise is rejected.  Otherwise an error is
-        // either reported by AutoEntryScript.
-        if (request->IsDynamicImport()) {
-          FinishDynamicImport(cx, request, NS_OK);
+        if (!JS::ContextOptionsRef(cx).topLevelAwait()) {
+          JS_SetPendingException(cx, error);
+          // For a dynamic import, the promise is rejected.  Otherwise an error
+          // is either reported by AutoEntryScript.
+          if (request->IsDynamicImport()) {
+            FinishDynamicImport_NoTLA(cx, request, NS_OK);
+          }
+        } else {
+          ErrorResult err;
+          RefPtr<Promise> aPromise = Promise::Create(globalObject, err);
+          if (NS_WARN_IF(err.Failed())) {
+            return err.StealNSResult();
+          }
+          aPromise->MaybeReject(error);
+          JS::Rooted<JSObject*> aEvaluationPromise(cx, aPromise->PromiseObj());
+          if (request->IsDynamicImport()) {
+            FinishDynamicImport(cx, request, NS_OK, aEvaluationPromise);
+          } else {
+            if (!JS::ThrowOnModuleEvaluationFailure(cx, aEvaluationPromise)) {
+              LOG(("ScriptLoadRequest (%p):   evaluation failed", aRequest));
+              // For a dynamic import, the promise is rejected.  Otherwise an
+              // error is either reported by AutoEntryScript.
+            }
+          }
         }
         return NS_OK;
       }
@@ -2871,7 +3017,10 @@
 
       TRACE_FOR_TEST(aRequest->GetScriptElement(),
                      "scriptloader_evaluate_module");
-      rv = nsJSUtils::ModuleEvaluate(cx, module);
+
+      JS::Rooted<JS::Value> rval(cx);
+
+      rv = nsJSUtils::ModuleEvaluate(cx, module, &rval);
       MOZ_ASSERT(NS_FAILED(rv) == aes.HasException());
 
       if (NS_FAILED(rv)) {
@@ -2881,8 +3030,25 @@
         rv = NS_OK;
       }
 
-      if (request->IsDynamicImport()) {
-        FinishDynamicImport(cx, request, rv);
+      if (!JS::ContextOptionsRef(cx).topLevelAwait()) {
+        if (request->IsDynamicImport()) {
+          FinishDynamicImport_NoTLA(cx, request, rv);
+        }
+      } else {
+        // Path for when Top Level Await is enabled
+        JS::Rooted<JSObject*> aEvaluationPromise(cx, &rval.toObject());
+        if (request->IsDynamicImport()) {
+          FinishDynamicImport(cx, request, rv, aEvaluationPromise);
+        } else {
+          // If this is not a dynamic import, and if the promise is rejected,
+          // the value is unwrapped from the promise value.
+          if (!JS::ThrowOnModuleEvaluationFailure(cx, aEvaluationPromise)) {
+            LOG(("ScriptLoadRequest (%p):   evaluation failed", aRequest));
+            // For a dynamic import, the promise is rejected.  Otherwise an
+            // error is either reported by AutoEntryScript.
+            rv = NS_OK;
+          }
+        }
       }
 
       TRACE_FOR_TEST_NONE(aRequest->GetScriptElement(),
@@ -2904,7 +3070,7 @@
       if (NS_SUCCEEDED(rv)) {
         if (aRequest->IsBytecode()) {
           TRACE_FOR_TEST(aRequest->GetScriptElement(), "scriptloader_execute");
-          nsJSUtils::ExecutionContext exec(cx, global);
+          JSExecutionContext exec(cx, global);
           if (aRequest->mOffThreadToken) {
             LOG(("ScriptLoadRequest (%p): Decode Bytecode & Join and Execute",
                  aRequest));
@@ -2936,7 +3102,7 @@
           bool encodeBytecode = ShouldCacheBytecode(aRequest);
 
           {
-            nsJSUtils::ExecutionContext exec(cx, global);
+            JSExecutionContext exec(cx, global);
             exec.SetEncodeBytecode(encodeBytecode);
             TRACE_FOR_TEST(aRequest->GetScriptElement(),
                            "scriptloader_execute");
@@ -3047,6 +3213,16 @@
   MaybeTriggerBytecodeEncoding();
 }
 
+void ScriptLoader::Destroy() {
+  // Off thread compilations will be canceled in ProcessRequest after the inner
+  // window is removed in Document::Destroy()
+  if (mShutdownObserver) {
+    mShutdownObserver->Unregister();
+    mShutdownObserver = nullptr;
+  }
+  GiveUpBytecodeEncoding();
+}
+
 void ScriptLoader::MaybeTriggerBytecodeEncoding() {
   // If we already gave up, ensure that we are not going to enqueue any script,
   // and that we finalize them properly.
@@ -3687,7 +3863,7 @@
         // FinishDynamicImport must happen exactly once for each dynamic import
         // request. If the load is aborted we do it when we remove the request
         // from mDynamicImportRequests.
-        FinishDynamicImport(modReq, aResult);
+        FinishDynamicImportAndReject(modReq, aResult);
       }
     } else {
       MOZ_ASSERT(!modReq->IsTopLevel());
@@ -3935,7 +4111,7 @@
     // FinishDynamicImport must happen exactly once for each dynamic import
     // request. If the load is aborted we do it when we remove the request
     // from mDynamicImportRequests.
-    FinishDynamicImport(req->AsModuleRequest(), NS_ERROR_ABORT);
+    FinishDynamicImportAndReject(req->AsModuleRequest(), NS_ERROR_ABORT);
   }
   mDynamicImportRequests.Clear();
 
@@ -4068,6 +4244,41 @@
   return false;
 }
 
+DocGroup* ScriptLoader::GetDocGroup() const { return mDocument->GetDocGroup(); }
+
+void ScriptLoader::BeginDeferringScripts() {
+  mDeferEnabled = true;
+  if (mDeferCheckpointReached) {
+    // We already completed a parse and were just waiting for some async
+    // scripts to load (and were already blocking the load event waiting for
+    // that to happen), when document.open() happened and now we're doing a
+    // new parse.  We shouldn't block the load event again, but _should_ reset
+    // mDeferCheckpointReached to false.  It'll get set to true again when the
+    // DeferCheckpointReached call that corresponds to this
+    // BeginDeferringScripts call happens (on document.close()), since we just
+    // set mDeferEnabled to true.
+    mDeferCheckpointReached = false;
+  } else {
+    if (mDocument) {
+      mDocument->BlockOnload();
+    }
+  }
+}
+
+nsAutoScriptLoaderDisabler::nsAutoScriptLoaderDisabler(Document* aDoc) {
+  mLoader = aDoc->ScriptLoader();
+  mWasEnabled = mLoader->GetEnabled();
+  if (mWasEnabled) {
+    mLoader->SetEnabled(false);
+  }
+}
+
+nsAutoScriptLoaderDisabler::~nsAutoScriptLoaderDisabler() {
+  if (mWasEnabled) {
+    mLoader->SetEnabled(true);
+  }
+}
+
 #undef TRACE_FOR_TEST
 #undef TRACE_FOR_TEST_BOOL
 #undef TRACE_FOR_TEST_NONE
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoader.h firefox-85.0+build1/dom/script/ScriptLoader.h
--- firefox-84.0.2+build1/dom/script/ScriptLoader.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoader.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,45 +7,82 @@
 #ifndef mozilla_dom_ScriptLoader_h
 #define mozilla_dom_ScriptLoader_h
 
+#include "js/TypeDecls.h"
 #include "nsCOMPtr.h"
 #include "nsRefPtrHashtable.h"
-#include "mozilla/Encoding.h"
 #include "nsIScriptElement.h"
 #include "nsCOMArray.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
-#include "mozilla/dom/Document.h"
-#include "nsIIncrementalStreamLoader.h"
+#include "nsINode.h"
+#include "nsIObserver.h"
+#include "nsIScriptLoaderObserver.h"
 #include "nsURIHashKey.h"
 #include "mozilla/CORSMode.h"
+#include "mozilla/dom/LoadedScript.h"
 #include "mozilla/dom/ScriptLoadRequest.h"
-#include "mozilla/dom/SRIMetadata.h"
-#include "mozilla/dom/SRICheck.h"
 #include "mozilla/MaybeOneOf.h"
 #include "mozilla/MozPromise.h"
-#include "mozilla/Utf8.h"  // mozilla::Utf8Unit
-#include "mozilla/Vector.h"
 #include "ScriptKind.h"
 
+class nsCycleCollectionTraversalCallback;
+class nsIChannel;
+class nsIConsoleReportCollector;
+class nsIContent;
+class nsIIncrementalStreamLoader;
+class nsIPrincipal;
+class nsIScriptGlobalObject;
 class nsIURI;
 
 namespace JS {
 
+class CompileOptions;
+
 template <typename UnitT>
 class SourceText;
 
 }  // namespace JS
 
 namespace mozilla {
+
+class LazyLogModule;
+union Utf8Unit;
+
 namespace dom {
 
 class AutoJSAPI;
+class DocGroup;
+class Document;
 class LoadedScript;
 class ModuleLoadRequest;
 class ModuleScript;
+class SRICheckDataVerifier;
+class SRIMetadata;
 class ScriptLoadHandler;
+class ScriptLoader;
 class ScriptRequestProcessor;
 
+enum class ReferrerPolicy : uint8_t;
+
+class AsyncCompileShutdownObserver final : public nsIObserver {
+  ~AsyncCompileShutdownObserver() { Unregister(); }
+
+ public:
+  explicit AsyncCompileShutdownObserver(ScriptLoader* aLoader)
+      : mScriptLoader(aLoader) {}
+
+  void OnShutdown();
+  void Unregister();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+ private:
+  // Defined during registration in ScriptLoader constructor, and
+  // cleared during destructor, ScriptLoader::Destroy() or Shutdown.
+  ScriptLoader* mScriptLoader;
+};
+
 //////////////////////////////////////////////////////////////
 // Script loader implementation
 //////////////////////////////////////////////////////////////
@@ -279,24 +316,7 @@
    * Starts deferring deferred scripts and puts them in the mDeferredRequests
    * queue instead.
    */
-  void BeginDeferringScripts() {
-    mDeferEnabled = true;
-    if (mDeferCheckpointReached) {
-      // We already completed a parse and were just waiting for some async
-      // scripts to load (and were already blocking the load event waiting for
-      // that to happen), when document.open() happened and now we're doing a
-      // new parse.  We shouldn't block the load event again, but _should_ reset
-      // mDeferCheckpointReached to false.  It'll get set to true again when the
-      // DeferCheckpointReached call that corresponds to this
-      // BeginDeferringScripts call happens (on document.close()), since we just
-      // set mDeferEnabled to true.
-      mDeferCheckpointReached = false;
-    } else {
-      if (mDocument) {
-        mDocument->BlockOnload();
-      }
-    }
-  }
+  void BeginDeferringScripts();
 
   /**
    * Notifies the script loader that parsing is done.  If aTerminated is true,
@@ -357,9 +377,7 @@
     return true;
   }
 
-  mozilla::dom::DocGroup* GetDocGroup() const {
-    return mDocument->GetDocGroup();
-  }
+  mozilla::dom::DocGroup* GetDocGroup() const;
 
   /**
    * Register the fact that we saw the load event, and that we need to save the
@@ -373,7 +391,7 @@
    * any references to the JSScript or to the Request which might be used for
    * caching the encoded bytecode.
    */
-  void Destroy() { GiveUpBytecodeEncoding(); }
+  void Destroy();
 
   /**
    * Implement the HostResolveImportedModule abstract operation.
@@ -393,9 +411,60 @@
                                     JS::MutableHandle<JSObject*> aModuleOut);
 
   void StartDynamicImport(ModuleLoadRequest* aRequest);
-  void FinishDynamicImport(ModuleLoadRequest* aRequest, nsresult aResult);
+
+  /**
+   * Shorthand Wrapper for JSAPI FinishDynamicImport function for the reject
+   * case where we do not have `aEvaluationPromise`. As there is no evaluation
+   * Promise, JS::FinishDynamicImport will always reject.
+   *
+   * @param aRequest
+   *        The module load request for the dynamic module.
+   * @param aResult
+   *        The result of running ModuleEvaluate -- If this is successful, then
+   *        we can await the associated EvaluationPromise.
+   */
+  void FinishDynamicImportAndReject(ModuleLoadRequest* aRequest,
+                                    nsresult aResult);
+
+  /**
+   * Wrapper for JSAPI FinishDynamicImport function. Takes an optional argument
+   * `aEvaluationPromise` which, if null, exits early.
+   *
+   * This is the non-tla version, which works with modules which return
+   * completion records.
+   *
+   * @param aCX
+   *        The JSContext for the module.
+   * @param aRequest
+   *        The module load request for the dynamic module.
+   * @param aResult
+   *        The result of running ModuleEvaluate
+   */
+  void FinishDynamicImport_NoTLA(JSContext* aCx, ModuleLoadRequest* aRequest,
+                                 nsresult aResult);
+
+  /**
+   * Wrapper for JSAPI FinishDynamicImport function. Takes an optional argument
+   * `aEvaluationPromise` which, if null, exits early.
+   *
+   * This is the Top Level Await version, which works with modules which return
+   * promises.
+   *
+   * @param aCX
+   *        The JSContext for the module.
+   * @param aRequest
+   *        The module load request for the dynamic module.
+   * @param aResult
+   *        The result of running ModuleEvaluate -- If this is successful, then
+   *        we can await the associated EvaluationPromise.
+   * @param aEvaluationPromise
+   *        The evaluation promise returned from evaluating the module. If this
+   *        is null, JS::FinishDynamicImport will reject the dynamic import
+   *        module promise.
+   */
   void FinishDynamicImport(JSContext* aCx, ModuleLoadRequest* aRequest,
-                           nsresult aResult);
+                           nsresult aResult,
+                           JS::Handle<JSObject*> aEvaluationPromise);
 
   /*
    * Get the currently active script. This is used as the initiating script when
@@ -405,6 +474,11 @@
 
   Document* GetDocument() const { return mDocument; }
 
+  /**
+   *   Called by shutdown observer.
+   */
+  void Shutdown();
+
  private:
   virtual ~ScriptLoader();
 
@@ -612,6 +686,12 @@
 
   void RunScriptWhenSafe(ScriptLoadRequest* aRequest);
 
+  /**
+   *  Wait for any unused off thread compilations to finish and then
+   *  cancel them.
+   */
+  void CancelScriptLoadRequests();
+
   Document* mDocument;  // [WEAK]
   nsCOMArray<nsIScriptLoaderObserver> mObservers;
   ScriptLoadRequestList mNonAsyncExternalScriptInsertedRequests;
@@ -673,6 +753,9 @@
 
   nsCOMPtr<nsIConsoleReportCollector> mReporter;
 
+  // ShutdownObserver for off thread compilations
+  RefPtr<AsyncCompileShutdownObserver> mShutdownObserver;
+
   // Logging
  public:
   static LazyLogModule gCspPRLog;
@@ -681,19 +764,9 @@
 
 class nsAutoScriptLoaderDisabler {
  public:
-  explicit nsAutoScriptLoaderDisabler(Document* aDoc) {
-    mLoader = aDoc->ScriptLoader();
-    mWasEnabled = mLoader->GetEnabled();
-    if (mWasEnabled) {
-      mLoader->SetEnabled(false);
-    }
-  }
+  explicit nsAutoScriptLoaderDisabler(Document* aDoc);
 
-  ~nsAutoScriptLoaderDisabler() {
-    if (mWasEnabled) {
-      mLoader->SetEnabled(true);
-    }
-  }
+  ~nsAutoScriptLoaderDisabler();
 
   bool mWasEnabled;
   RefPtr<ScriptLoader> mLoader;
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoadHandler.cpp firefox-85.0+build1/dom/script/ScriptLoadHandler.cpp
--- firefox-84.0.2+build1/dom/script/ScriptLoadHandler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoadHandler.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,16 +5,39 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ScriptLoadHandler.h"
+
+#include <stdlib.h>
+#include <utility>
 #include "ScriptLoader.h"
 #include "ScriptTrace.h"
-
+#include "mozilla/Assertions.h"
+#include "mozilla/CheckedInt.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/Encoding.h"
+#include "mozilla/Logging.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/Tuple.h"
+#include "mozilla/Utf8.h"
+#include "mozilla/Vector.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/SRICheck.h"
+#include "mozilla/dom/ScriptDecoding.h"
+#include "mozilla/dom/ScriptLoadRequest.h"
+#include "nsCOMPtr.h"
 #include "nsContentUtils.h"
+#include "nsDebug.h"
 #include "nsICacheInfoChannel.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
+#include "nsIRequest.h"
+#include "nsIScriptElement.h"
+#include "nsIURI.h"
+#include "nsJSUtils.h"
 #include "nsMimeTypes.h"
-
-#include "mozilla/dom/ScriptDecoding.h"  // mozilla::dom::ScriptDecoding
-#include "mozilla/Telemetry.h"
-#include "mozilla/StaticPrefs_dom.h"
+#include "nsString.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoadHandler.h firefox-85.0+build1/dom/script/ScriptLoadHandler.h
--- firefox-84.0.2+build1/dom/script/ScriptLoadHandler.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoadHandler.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,8 @@
 #define mozilla_dom_ScriptLoadHandler_h
 
 #include "nsIIncrementalStreamLoader.h"
+#include "nsISupports.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoadRequest.cpp firefox-85.0+build1/dom/script/ScriptLoadRequest.cpp
--- firefox-84.0.2+build1/dom/script/ScriptLoadRequest.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoadRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ScriptLoadRequest.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Unused.h"
@@ -126,6 +127,19 @@
   DropJSObjects(this);
 }
 
+void ScriptLoadRequest::BlockOnload(Document* aDocument) {
+  MOZ_ASSERT(!mLoadBlockedDocument);
+  aDocument->BlockOnload();
+  mLoadBlockedDocument = aDocument;
+}
+
+void ScriptLoadRequest::MaybeUnblockOnload() {
+  if (mLoadBlockedDocument) {
+    mLoadBlockedDocument->UnblockOnload(false);
+    mLoadBlockedDocument = nullptr;
+  }
+}
+
 void ScriptLoadRequest::SetReady() {
   MOZ_ASSERT(mProgress != Progress::eReady);
   mProgress = Progress::eReady;
@@ -246,6 +260,20 @@
   }
 }
 
+nsIScriptElement* ScriptLoadRequest::GetScriptElement() const {
+  nsCOMPtr<nsIScriptElement> scriptElement =
+      do_QueryInterface(mFetchOptions->mElement);
+  return scriptElement;
+}
+
+void ScriptLoadRequest::SetIsLoadRequest(nsIScriptElement* aElement) {
+  MOZ_ASSERT(aElement);
+  MOZ_ASSERT(!GetScriptElement());
+  MOZ_ASSERT(IsPreload());
+  mFetchOptions->mElement = do_QueryInterface(aElement);
+  mFetchOptions->mIsPreload = false;
+}
+
 //////////////////////////////////////////////////////////////
 // ScriptLoadRequestList
 //////////////////////////////////////////////////////////////
diff -Nru firefox-84.0.2+build1/dom/script/ScriptLoadRequest.h firefox-85.0+build1/dom/script/ScriptLoadRequest.h
--- firefox-84.0.2+build1/dom/script/ScriptLoadRequest.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptLoadRequest.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,10 +7,12 @@
 #ifndef mozilla_dom_ScriptLoadRequest_h
 #define mozilla_dom_ScriptLoadRequest_h
 
+#include "js/AllocPolicy.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CORSMode.h"
-#include "mozilla/dom/Element.h"
 #include "mozilla/dom/SRIMetadata.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
@@ -25,9 +27,14 @@
 
 class nsICacheInfoChannel;
 
+namespace JS {
+class OffThreadToken;
+}
+
 namespace mozilla {
 namespace dom {
 
+class Element;
 class ModuleLoadRequest;
 class ScriptLoadRequestList;
 
@@ -124,18 +131,9 @@
     mIsTracking = true;
   }
 
-  void BlockOnload(Document* aDocument) {
-    MOZ_ASSERT(!mLoadBlockedDocument);
-    aDocument->BlockOnload();
-    mLoadBlockedDocument = aDocument;
-  }
+  void BlockOnload(Document* aDocument);
 
-  void MaybeUnblockOnload() {
-    if (mLoadBlockedDocument) {
-      mLoadBlockedDocument->UnblockOnload(false);
-      mLoadBlockedDocument = nullptr;
-    }
-  }
+  void MaybeUnblockOnload();
 
   enum class Progress : uint8_t {
     eLoading,         // Request either source or bytecode
@@ -181,7 +179,7 @@
   // can be transferred in constant time to the JS engine, not copied in linear
   // time.
   template <typename Unit>
-  using ScriptTextBuffer = Vector<Unit, 0, JSMallocAllocPolicy>;
+  using ScriptTextBuffer = Vector<Unit, 0, js::MallocAllocPolicy>;
 
   // BinAST data isn't transferred to the JS engine, so it doesn't need to use
   // the JS allocator.
@@ -255,11 +253,7 @@
   enum ReferrerPolicy ReferrerPolicy() const {
     return mFetchOptions->mReferrerPolicy;
   }
-  nsIScriptElement* GetScriptElement() const {
-    nsCOMPtr<nsIScriptElement> scriptElement =
-        do_QueryInterface(mFetchOptions->mElement);
-    return scriptElement;
-  }
+  nsIScriptElement* GetScriptElement() const;
   nsIPrincipal* TriggeringPrincipal() const {
     return mFetchOptions->mTriggeringPrincipal;
   }
@@ -272,13 +266,7 @@
   }
 
   // Make a preload request into an actual load request for the given element.
-  void SetIsLoadRequest(nsIScriptElement* aElement) {
-    MOZ_ASSERT(aElement);
-    MOZ_ASSERT(!GetScriptElement());
-    MOZ_ASSERT(IsPreload());
-    mFetchOptions->mElement = do_QueryInterface(aElement);
-    mFetchOptions->mIsPreload = false;
-  }
+  void SetIsLoadRequest(nsIScriptElement* aElement);
 
   FromParser GetParserCreated() const {
     nsIScriptElement* element = GetScriptElement();
diff -Nru firefox-84.0.2+build1/dom/script/ScriptSettings.cpp firefox-85.0+build1/dom/script/ScriptSettings.cpp
--- firefox-84.0.2+build1/dom/script/ScriptSettings.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptSettings.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,8 @@
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/ThreadLocal.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/JSExecutionManager.h"
 #include "mozilla/dom/WorkerPrivate.h"
 
@@ -42,20 +44,22 @@
     return nullptr;
   }
 
-  nsCOMPtr<Element> domElement = script->GetFetchOptions()->mElement;
-  if (!domElement) {
-    return nullptr;
-  }
-
-  JSObject* globalObject =
-      domElement->OwnerDoc()->GetScopeObject()->GetGlobalJSObject();
-  JSAutoRealm ar(aCx, globalObject);
-
   JS::Rooted<JS::Value> elementValue(aCx);
-  nsresult rv = nsContentUtils::WrapNative(aCx, domElement, &elementValue,
-                                           /* aAllowWrapping = */ true);
-  if (NS_FAILED(rv)) {
-    return nullptr;
+  {
+    nsCOMPtr<Element> domElement = script->GetFetchOptions()->mElement;
+    if (!domElement) {
+      return nullptr;
+    }
+
+    JSObject* globalObject =
+        domElement->OwnerDoc()->GetScopeObject()->GetGlobalJSObject();
+    JSAutoRealm ar(aCx, globalObject);
+
+    nsresult rv = nsContentUtils::WrapNative(aCx, domElement, &elementValue,
+                                             /* aAllowWrapping = */ true);
+    if (NS_FAILED(rv)) {
+      return nullptr;
+    }
   }
   return elementValue.toObjectOrNull();
 }
diff -Nru firefox-84.0.2+build1/dom/script/ScriptSettings.h firefox-85.0+build1/dom/script/ScriptSettings.h
--- firefox-84.0.2+build1/dom/script/ScriptSettings.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/script/ScriptSettings.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,21 +10,33 @@
 #define mozilla_dom_ScriptSettings_h
 
 #include "MainThreadUtils.h"
-#include "nsIGlobalObject.h"
-#include "nsIPrincipal.h"
 #include "xpcpublic.h"
 
 #include "mozilla/dom/JSExecutionManager.h"
 #include "mozilla/Maybe.h"
 
 #include "jsapi.h"
-#include "js/Exception.h"
 #include "js/Debug.h"
 #include "js/Warnings.h"  // JS::WarningReporter
 
+#ifdef MOZ_GECKO_PROFILER
+#  include "GeckoProfiler.h"
+#endif
+
+class JSFunction;
+class JSObject;
+class JSScript;
+class nsIGlobalObject;
+class nsIPrincipal;
 class nsPIDOMWindowInner;
 class nsGlobalWindowInner;
 class nsIScriptContext;
+struct JSContext;
+
+namespace JS {
+class ExceptionStack;
+class Value;
+}  // namespace JS
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicy.cpp firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicy.cpp
--- firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicy.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicy.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "FeaturePolicy.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Feature.h"
 #include "mozilla/dom/FeaturePolicyBinding.h"
 #include "mozilla/dom/FeaturePolicyParser.h"
diff -Nru firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicy.h firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicy.h
--- firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicy.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicy.h	2021-01-18 19:58:10.000000000 +0000
@@ -58,6 +58,8 @@
 namespace dom {
 class Document;
 class Feature;
+template <typename T>
+class Optional;
 
 class FeaturePolicyUtils;
 
diff -Nru firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicyParser.cpp firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicyParser.cpp
--- firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicyParser.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicyParser.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "FeaturePolicyParser.h"
 
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Feature.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/PolicyTokenizer.h"
diff -Nru firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicyUtils.h firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicyUtils.h
--- firefox-84.0.2+build1/dom/security/featurepolicy/FeaturePolicyUtils.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/featurepolicy/FeaturePolicyUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,12 @@
 
 #include "mozilla/dom/FeaturePolicy.h"
 
+class PickleIterator;
+
+namespace IPC {
+class Message;
+}
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/security/featurepolicy/fuzztest/fp_fuzzer.cpp firefox-85.0+build1/dom/security/featurepolicy/fuzztest/fp_fuzzer.cpp
--- firefox-84.0.2+build1/dom/security/featurepolicy/fuzztest/fp_fuzzer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/featurepolicy/fuzztest/fp_fuzzer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "FuzzingInterface.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Feature.h"
 #include "mozilla/dom/FeaturePolicyParser.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/dom/security/fuzztest/csp_fuzzer.cpp firefox-85.0+build1/dom/security/fuzztest/csp_fuzzer.cpp
--- firefox-84.0.2+build1/dom/security/fuzztest/csp_fuzzer.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/fuzztest/csp_fuzzer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "FuzzingInterface.h"
+#include "mozilla/BasePrincipal.h"
+#include "nsComponentManagerUtils.h"
 #include "nsCSPContext.h"
 #include "nsNetUtil.h"
 #include "nsStringFwd.h"
diff -Nru firefox-84.0.2+build1/dom/security/nsContentSecurityManager.cpp firefox-85.0+build1/dom/security/nsContentSecurityManager.cpp
--- firefox-84.0.2+build1/dom/security/nsContentSecurityManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/nsContentSecurityManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -21,6 +21,7 @@
 #include "nsIParentChannel.h"
 #include "nsIStreamListener.h"
 #include "nsIRedirectHistoryEntry.h"
+#include "nsNetUtil.h"
 #include "nsReadableUtils.h"
 #include "nsIXPConnect.h"
 
@@ -35,6 +36,7 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/Components.h"
 #include "mozilla/Logging.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_security.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/dom/security/nsContentSecurityUtils.cpp firefox-85.0+build1/dom/security/nsContentSecurityUtils.cpp
--- firefox-84.0.2+build1/dom/security/nsContentSecurityUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/nsContentSecurityUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,12 +10,14 @@
 
 #include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIChannel.h"
 #include "nsIHttpChannel.h"
 #include "nsIMultiPartChannel.h"
 #include "nsIURI.h"
 #include "nsITransfer.h"
+#include "nsNetUtil.h"
 #include "nsSandboxFlags.h"
 #if defined(XP_WIN)
 #  include "WinUtils.h"
@@ -24,10 +26,12 @@
 
 #include "FramingChecker.h"
 #include "js/Array.h"  // JS::GetArrayLength
+#include "js/ContextOptions.h"
 #include "js/RegExp.h"
 #include "js/RegExpFlags.h"  // JS::RegExpFlags
 #include "mozilla/ExtensionPolicyService.h"
 #include "mozilla/Logging.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/nsCSPContext.h"
 #include "mozilla/StaticPrefs_security.h"
@@ -1170,4 +1174,4 @@
   }
 
   return nsITransfer::DOWNLOAD_ACCEPTABLE;
-}
\ No newline at end of file
+}
diff -Nru firefox-84.0.2+build1/dom/security/nsCSPUtils.cpp firefox-85.0+build1/dom/security/nsCSPUtils.cpp
--- firefox-84.0.2+build1/dom/security/nsCSPUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/nsCSPUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,14 +10,17 @@
 #include "nsCSPUtils.h"
 #include "nsDebug.h"
 #include "nsCSPParser.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIChannel.h"
 #include "nsICryptoHash.h"
 #include "nsIScriptError.h"
 #include "nsIStringBundle.h"
 #include "nsIURL.h"
+#include "nsNetUtil.h"
 #include "nsReadableUtils.h"
 #include "nsSandboxFlags.h"
+#include "nsServiceManagerUtils.h"
 
 #include "mozilla/dom/CSPDictionariesBinding.h"
 #include "mozilla/dom/Document.h"
diff -Nru firefox-84.0.2+build1/dom/security/nsHTTPSOnlyUtils.cpp firefox-85.0+build1/dom/security/nsHTTPSOnlyUtils.cpp
--- firefox-84.0.2+build1/dom/security/nsHTTPSOnlyUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/nsHTTPSOnlyUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -92,7 +92,12 @@
   // if it's already an https channel, then there is nothing to do here.
   nsCOMPtr<nsIURI> channelURI;
   channel->GetURI(getter_AddRefs(channelURI));
-  if (channelURI->SchemeIs("https")) {
+  if (!channelURI->SchemeIs("http")) {
+    return;
+  }
+
+  // Check for general exceptions
+  if (OnionException(channelURI) || LoopbackOrLocalException(channelURI)) {
     return;
   }
 
diff -Nru firefox-84.0.2+build1/dom/security/PolicyTokenizer.cpp firefox-85.0+build1/dom/security/PolicyTokenizer.cpp
--- firefox-84.0.2+build1/dom/security/PolicyTokenizer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/PolicyTokenizer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "PolicyTokenizer.h"
 
+#include "mozilla/Logging.h"
+
 static mozilla::LogModule* GetPolicyTokenizerLog() {
   static mozilla::LazyLogModule gPolicyTokenizerPRLog("PolicyTokenizer");
   return gPolicyTokenizerPRLog;
diff -Nru firefox-84.0.2+build1/dom/security/ReferrerInfo.cpp firefox-85.0+build1/dom/security/ReferrerInfo.cpp
--- firefox-84.0.2+build1/dom/security/ReferrerInfo.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/ReferrerInfo.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -23,6 +23,7 @@
 #include "mozilla/ContentBlocking.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/net/HttpBaseChannel.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StyleSheet.h"
@@ -51,6 +52,42 @@
 #define MIN_CROSS_ORIGIN_SENDING_POLICY 0
 #define MIN_TRIMMING_POLICY 0
 
+/*
+ * Default referrer policy to use
+ */
+enum DefaultReferrerPolicy : uint32_t {
+  eDefaultPolicyNoReferrer = 0,
+  eDefaultPolicySameOrgin = 1,
+  eDefaultPolicyStrictWhenXorigin = 2,
+  eDefaultPolicyNoReferrerWhenDownGrade = 3,
+};
+
+static uint32_t GetDefaultFirstPartyReferrerPolicyPref(bool privateBrowsing) {
+  return privateBrowsing
+             ? StaticPrefs::network_http_referer_defaultPolicy_pbmode()
+             : StaticPrefs::network_http_referer_defaultPolicy();
+}
+
+static uint32_t GetDefaultThirdPartyReferrerPolicyPref(bool privateBrowsing) {
+  return privateBrowsing
+             ? StaticPrefs::network_http_referer_defaultPolicy_trackers_pbmode()
+             : StaticPrefs::network_http_referer_defaultPolicy_trackers();
+}
+
+static ReferrerPolicy DefaultReferrerPolicyToReferrerPolicy(
+    uint32_t defaultToUse) {
+  switch (defaultToUse) {
+    case DefaultReferrerPolicy::eDefaultPolicyNoReferrer:
+      return ReferrerPolicy::No_referrer;
+    case DefaultReferrerPolicy::eDefaultPolicySameOrgin:
+      return ReferrerPolicy::Same_origin;
+    case DefaultReferrerPolicy::eDefaultPolicyStrictWhenXorigin:
+      return ReferrerPolicy::Strict_origin_when_cross_origin;
+  }
+
+  return ReferrerPolicy::No_referrer_when_downgrade;
+}
+
 struct LegacyReferrerPolicyTokenMap {
   const char* mToken;
   ReferrerPolicy mPolicy;
@@ -219,32 +256,10 @@
     }
   }
 
-  uint32_t defaultToUse;
-  if (thirdPartyTrackerIsolated) {
-    if (privateBrowsing) {
-      defaultToUse =
-          StaticPrefs::network_http_referer_defaultPolicy_trackers_pbmode();
-    } else {
-      defaultToUse = StaticPrefs::network_http_referer_defaultPolicy_trackers();
-    }
-  } else {
-    if (privateBrowsing) {
-      defaultToUse = StaticPrefs::network_http_referer_defaultPolicy_pbmode();
-    } else {
-      defaultToUse = StaticPrefs::network_http_referer_defaultPolicy();
-    }
-  }
-
-  switch (defaultToUse) {
-    case DefaultReferrerPolicy::eDefaultPolicyNoReferrer:
-      return ReferrerPolicy::No_referrer;
-    case DefaultReferrerPolicy::eDefaultPolicySameOrgin:
-      return ReferrerPolicy::Same_origin;
-    case DefaultReferrerPolicy::eDefaultPolicyStrictWhenXorigin:
-      return ReferrerPolicy::Strict_origin_when_cross_origin;
-  }
-
-  return ReferrerPolicy::No_referrer_when_downgrade;
+  return DefaultReferrerPolicyToReferrerPolicy(
+      thirdPartyTrackerIsolated
+          ? GetDefaultThirdPartyReferrerPolicyPref(privateBrowsing)
+          : GetDefaultFirstPartyReferrerPolicyPref(privateBrowsing));
 }
 
 /* static */
diff -Nru firefox-84.0.2+build1/dom/security/ReferrerInfo.h firefox-85.0+build1/dom/security/ReferrerInfo.h
--- firefox-84.0.2+build1/dom/security/ReferrerInfo.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/ReferrerInfo.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsIReferrerInfo.h"
-#include "nsIHttpChannel.h"
 #include "nsReadableUtils.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/HashFunctions.h"
@@ -24,6 +23,7 @@
     }                                                \
   }
 
+class nsIHttpChannel;
 class nsIURI;
 class nsIChannel;
 class nsILoadInfo;
@@ -219,7 +219,16 @@
    */
   static ReferrerPolicyEnum GetDefaultReferrerPolicy(
       nsIHttpChannel* aChannel = nullptr, nsIURI* aURI = nullptr,
-      bool privateBrowsing = false);
+      bool aPrivateBrowsing = false);
+
+  /**
+   * Return default referrer policy for third party which is controlled by user
+   * prefs:
+   * network.http.referer.defaultPolicy.trackers for regular mode
+   * network.http.referer.defaultPolicy.trackers.pbmode for private mode
+   */
+  static ReferrerPolicyEnum GetDefaultThirdPartyReferrerPolicy(
+      bool aPrivateBrowsing = false);
 
   /*
    * Helper function to parse ReferrerPolicy from meta tag referrer content.
@@ -276,16 +285,6 @@
   ReferrerInfo(const ReferrerInfo& rhs);
 
   /*
-   * Default referrer policy to use
-   */
-  enum DefaultReferrerPolicy : uint32_t {
-    eDefaultPolicyNoReferrer = 0,
-    eDefaultPolicySameOrgin = 1,
-    eDefaultPolicyStrictWhenXorigin = 2,
-    eDefaultPolicyNoReferrerWhenDownGrade = 3,
-  };
-
-  /*
    * Trimming policy when compute referrer, indicate how much information in the
    * referrer will be sent. Order matters here.
    */
diff -Nru firefox-84.0.2+build1/dom/security/sanitizer/Sanitizer.h firefox-85.0+build1/dom/security/sanitizer/Sanitizer.h
--- firefox-84.0.2+build1/dom/security/sanitizer/Sanitizer.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/sanitizer/Sanitizer.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,10 @@
 #include "nsIParserUtils.h"
 #include "nsTreeSanitizer.h"
 
+// XXX(Bug 1673929) This is not really needed here, but the generated
+// SanitizerBinding.cpp needs it and does not include it.
+#include "mozilla/dom/Document.h"
+
 class nsISupports;
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/security/sanitizer/tests/mochitest/test_sanitizer_api.html firefox-85.0+build1/dom/security/sanitizer/tests/mochitest/test_sanitizer_api.html
--- firefox-84.0.2+build1/dom/security/sanitizer/tests/mochitest/test_sanitizer_api.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/sanitizer/tests/mochitest/test_sanitizer_api.html	2021-01-18 19:58:10.000000000 +0000
@@ -1,87 +1,82 @@
 <!DOCTYPE HTML>
-<html>
-
-<head>
-    <title>Test sanitizer api</title>
-    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-
-<body>
-    <div id="div"></div>
-    <script type="text/javascript">
-            "use strict";
-            /* global Sanitizer */
-            // we're not done after "onload"
-            SimpleTest.waitForExplicitFinish();
-            var oldVal = SpecialPowers.getBoolPref("dom.security.sanitizer.enabled");
-
-            (async function() {
-                // Ensure Sanitizer is not exposed when the pref is false
-                await SpecialPowers.pushPrefEnv({
-                    set: [["dom.security.sanitizer.enabled", false]],
-                });
-                ok(typeof Sanitizer === "undefined", "Sanitizer undefined when preffed off");
-
-                // The rest of this test assumes the sanitizer is enabled
-                await SpecialPowers.pushPrefEnv({
-                    set: [["dom.security.sanitizer.enabled", true]],
-                });
-
-
-                function* possibleInputTypes(inputStr) {
-                    /* This generator function, given a string, yields all possible input objects
-                    for our sanitizer API (string, docfragment, document).
-                    */
-
-                    // 1) as string
-                    yield ({testInput: inputStr, testType: "String" });
-                    // 2) as DocumentFragment
-                    let temp = document.createElement('template');
-                    // asking eslint to skip this: innerHTML is safe for template elements.
-                    // eslint-disable-next-line no-unsanitized/property
-                    temp.innerHTML = inputStr;
-                    yield ({testInput: temp.content, testType: "DocumentFragment" });
-                    // 3) as HTMLDocument
-                    const parser = new DOMParser;
-                    yield ({testInput: parser.parseFromString(inputStr, "text/html"), testType: "Document" });
-                }
-                // basic interface smoke test
-                ok(typeof Sanitizer === "function", "Sanitizer constructor exposed when preffed on");
-                const mySanitizer = new Sanitizer();
-                ok(mySanitizer, "Sanitizer constructor works");
-                ok(mySanitizer.sanitize, "sanitize function exists");
-
-                // testing sanitizer results
-                const testCases = [
-                    {testString: "<p>hello</p>", testExpected: "<p>hello</p>" },
-                    // script element encoded to not confuse the HTML parser and end execution here
-                    { testString: "<p>second test</p><script>alert(1)\x3C/script>", testExpected: "<p>second test</p>"},
-                ];
-
-
-                const div = document.getElementById("div");
-                for (let test of testCases) {
-                    const {testString, testExpected} = test;
-
-                    for (let testInputAndType of possibleInputTypes(testString)) {
-                        const {testInput, testType} = testInputAndType;
-
-                        // test documentfragment API
-                        div.innerHTML = "";
-                        const docFragment = mySanitizer.sanitize(testInput);
-                        div.append(docFragment);
-                        is(div.innerHTML, testExpected, `Sanitizer.sanitize() should turn (${testType}) '${testInput}' into '${testExpected}'`);
-
-                        // test string api, doesnt work yet
-                        /*is(mySanitizer.sanitizeToString(testInput), testExpected,
-                        `Sanitizer.sanitizeToString() should turn (${testType}) '${testInput}' into '${testExpected}'`);*/
-                    }
-                }
-
-                SpecialPowers.setBoolPref("dom.security.sanitizer.enabled", oldVal);
-                SimpleTest.finish();
-            })();
-    </script>
-</body>
-</html>
+<title>Test sanitizer api</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css" />
+<div id="div"></div>
+<script type="text/javascript">
+"use strict";
+/* global Sanitizer */
+// we're not done after "onload"
+SimpleTest.waitForExplicitFinish();
+(async function() {
+  // Ensure Sanitizer is not exposed when the pref is false
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.security.sanitizer.enabled", false]],
+  });
+  ok(typeof Sanitizer === "undefined", "Sanitizer undefined when preffed off");
+
+  // The rest of this test assumes the sanitizer is enabled
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.security.sanitizer.enabled", true]],
+  });
+
+
+  function* possibleInputTypes(inputStr) {
+    /* This generator function, given a string, yields all possible input objects
+    for our sanitizer API (string, docfragment, document).
+    */
+
+    // 1) as string
+    yield ({testInput: inputStr, testType: "String" });
+    // 2) as DocumentFragment
+    let temp = document.createElement('template');
+    // asking eslint to skip this: innerHTML is safe for template elements.
+    // eslint-disable-next-line no-unsanitized/property
+    temp.innerHTML = inputStr;
+    yield ({testInput: temp.content, testType: "DocumentFragment" });
+    // 3) as HTMLDocument
+    const parser = new DOMParser;
+    yield ({testInput: parser.parseFromString(inputStr, "text/html"), testType: "Document" });
+  }
+  // basic interface smoke test
+  ok(typeof Sanitizer === "function", "Sanitizer constructor exposed when preffed on");
+  const mySanitizer = new Sanitizer();
+  ok(mySanitizer, "Sanitizer constructor works");
+  ok(mySanitizer.sanitize, "sanitize function exists");
+
+  // testing sanitizer results
+  const testCases = [
+    {
+      testString: "<p>hello</p>",
+      testExpected: "<p>hello</p>"
+    },
+    {
+      // script element encoded to not confuse the HTML parser and end execution here
+      testString: "<p>second test</p><script>alert(1)\x3C/script>",
+      testExpected: "<p>second test</p>"
+    },
+  ];
+
+
+  const div = document.getElementById("div");
+  for (let test of testCases) {
+    const {testString, testExpected} = test;
+
+    for (let testInputAndType of possibleInputTypes(testString)) {
+      const {testInput, testType} = testInputAndType;
+
+      // test documentfragment API
+      div.innerHTML = "";
+      const docFragment = mySanitizer.sanitize(testInput);
+      div.append(docFragment);
+      is(div.innerHTML, testExpected, `Sanitizer.sanitize() should turn (${testType}) '${testInput}' into '${testExpected}'`);
+
+      // test string api, doesnt work yet
+      /*is(mySanitizer.sanitizeToString(testInput), testExpected,
+      `Sanitizer.sanitizeToString() should turn (${testType}) '${testInput}' into '${testExpected}'`);*/
+    }
+  }
+
+  SimpleTest.finish();
+})();
+</script>
diff -Nru firefox-84.0.2+build1/dom/security/SRICheck.cpp firefox-85.0+build1/dom/security/SRICheck.cpp
--- firefox-84.0.2+build1/dom/security/SRICheck.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/SRICheck.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/SRILogHelper.h"
 #include "mozilla/dom/SRIMetadata.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
 #include "nsIConsoleReportCollector.h"
diff -Nru firefox-84.0.2+build1/dom/security/test/csp/mochitest.ini firefox-85.0+build1/dom/security/test/csp/mochitest.ini
--- firefox-84.0.2+build1/dom/security/test/csp/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/csp/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -395,7 +395,6 @@
 # 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.
 support-files =
   file_reloadInFreshProcess.sjs
 [test_parent_location_js.html]
diff -Nru firefox-84.0.2+build1/dom/security/test/general/browser.ini firefox-85.0+build1/dom/security/test/general/browser.ini
--- firefox-84.0.2+build1/dom/security/test/general/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/general/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -23,7 +23,6 @@
   file_assert_systemprincipal_documents.html
   file_assert_systemprincipal_documents_iframe.html
 [browser_test_referrer_loadInOtherProcess.js]
-skip-if = fission
 [browser_test_framing_error_pages.js]
 support-files =
   file_framing_error_pages_csp.html
diff -Nru firefox-84.0.2+build1/dom/security/test/general/browser_test_FTP_console_warning.js firefox-85.0+build1/dom/security/test/general/browser_test_FTP_console_warning.js
--- firefox-84.0.2+build1/dom/security/test/general/browser_test_FTP_console_warning.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/general/browser_test_FTP_console_warning.js	2021-01-18 19:58:10.000000000 +0000
@@ -37,7 +37,7 @@
 
   Services.console.registerListener(on_new_message);
 
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURI);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURI);
   await BrowserTestUtils.waitForCondition(() => seen_files.length === 0);
   is(seen_files.length, 0, "All FTP subresources should be blocked");
 
diff -Nru firefox-84.0.2+build1/dom/security/test/general/browser_test_referrer_loadInOtherProcess.js firefox-85.0+build1/dom/security/test/general/browser_test_referrer_loadInOtherProcess.js
--- firefox-84.0.2+build1/dom/security/test/general/browser_test_referrer_loadInOtherProcess.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/general/browser_test_referrer_loadInOtherProcess.js	2021-01-18 19:58:10.000000000 +0000
@@ -131,11 +131,6 @@
 
 // Tests referrerInfo when navigating from a page in the remote process to main
 // process and vice versa.
-// The changing process code flow is (cpp) docshell.shouldLoadURI
-// -> (JS) browser.shouldLoadURI -> E10sUtils.redirectLoad
-// -> ContentRestore.restoreTabContent.
-// Finally, docshell will do the load in correct process with the input
-// referrerInfo and store an entry to SessionHistory
 add_task(async function test_navigation() {
   // Navigate from non remote to remote
   gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser, "about:blank");
diff -Nru firefox-84.0.2+build1/dom/security/test/gtest/TestCSPParser.cpp firefox-85.0+build1/dom/security/test/gtest/TestCSPParser.cpp
--- firefox-84.0.2+build1/dom/security/test/gtest/TestCSPParser.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/gtest/TestCSPParser.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,8 +11,11 @@
 
 #include "nsIContentSecurityPolicy.h"
 #include "nsNetUtil.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/nsCSPContext.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsStringFwd.h"
 
 /*
diff -Nru firefox-84.0.2+build1/dom/security/test/gtest/TestSecureContext.cpp firefox-85.0+build1/dom/security/test/gtest/TestSecureContext.cpp
--- firefox-84.0.2+build1/dom/security/test/gtest/TestSecureContext.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/gtest/TestSecureContext.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIPrincipal.h"
 #include "nsScriptSecurityManager.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
diff -Nru firefox-84.0.2+build1/dom/security/test/gtest/TestUnexpectedPrivilegedLoads.cpp firefox-85.0+build1/dom/security/test/gtest/TestUnexpectedPrivilegedLoads.cpp
--- firefox-84.0.2+build1/dom/security/test/gtest/TestUnexpectedPrivilegedLoads.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/gtest/TestUnexpectedPrivilegedLoads.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include "nsContentSecurityManager.h"
 #include "nsContentSecurityUtils.h"
+#include "nsNetUtil.h"
 #include "nsStringFwd.h"
 
 using namespace mozilla;
@@ -193,4 +194,4 @@
                  currentTest.expected.extraValueFiledetails.get())
         << "Reported value for extra filedetails should equals supplied value";
   }
-}
\ No newline at end of file
+}
diff -Nru firefox-84.0.2+build1/dom/security/test/https-only/browser_console_logging.js firefox-85.0+build1/dom/security/test/https-only/browser_console_logging.js
--- firefox-84.0.2+build1/dom/security/test/https-only/browser_console_logging.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/https-only/browser_console_logging.js	2021-01-18 19:58:10.000000000 +0000
@@ -87,7 +87,7 @@
   });
   Services.console.registerListener(on_new_message);
   // 1. Upgrade page to https://
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURISuccess);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURISuccess);
   // 2. Make an exempt http:// request
   let xhr = new XMLHttpRequest();
   xhr.open("GET", kTestURIExempt, true);
diff -Nru firefox-84.0.2+build1/dom/security/test/https-only/test_http_background_request.html firefox-85.0+build1/dom/security/test/https-only/test_http_background_request.html
--- firefox-84.0.2+build1/dom/security/test/https-only/test_http_background_request.html	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/https-only/test_http_background_request.html	2021-01-18 19:58:10.000000000 +0000
@@ -20,7 +20,10 @@
 SimpleTest.requestFlakyTimeout("have to test that https-only mode background request does not happen");
 SimpleTest.requestLongerTimeout(8);
 
-const EXPECTED_KICK_OFF_REQUEST = "http://example.com/tests/dom/security/test/https-only/file_http_background_request.sjs?sensitive";
+const SJS_PATH = "tests/dom/security/test/https-only/file_http_background_request.sjs?sensitive";
+
+const EXPECTED_KICK_OFF_REQUEST = "http://example.com/" + SJS_PATH;
+const EXPECTED_KICK_OFF_REQUEST_LOCAL = "http://localhost:8/" + SJS_PATH;
 const EXPECTED_UPGRADE_REQUEST = EXPECTED_KICK_OFF_REQUEST.replace("http://", "https://");
 let expectedBackgroundRequest = "";
 let requestCounter = 0;
@@ -36,12 +39,17 @@
     // On Android we have other requests appear here as well. Let's make
     // sure we only evaluate requests triggered by the test.
     if (!data.startsWith("http://example.com") &&
-        !data.startsWith("https://example.com")) {
+        !data.startsWith("https://example.com") &&
+        !data.startsWith("http://localhost:8") &&
+        !data.startsWith("https://localhost:8")) {
       return;
     }
     ++requestCounter;
     if (requestCounter == 1) {
-      is(data, EXPECTED_KICK_OFF_REQUEST, "kick off request needs to be http");
+      ok(
+        data === EXPECTED_KICK_OFF_REQUEST || data === EXPECTED_KICK_OFF_REQUEST_LOCAL,
+        "kick off request needs to be http"
+      );
       return;
     }
     if (requestCounter == 2) {
@@ -83,6 +91,14 @@
   is(requestCounter, 3, "three requests total (kickoff, upgraded, background)");
   testWin.close();
 
+  // (x) Test no http background request happens when localhost
+  expectedBackgroundRequest = "";
+  requestCounter = 0;
+  testWin = window.open(EXPECTED_KICK_OFF_REQUEST_LOCAL, "_blank");
+  await resolveAfter4Seconds();
+  is(requestCounter, 1, "one requests total (kickoff, no upgraded, no background)");
+  testWin.close();
+
   // (b) Test no http background request happens if pref is set to false
   expectedBackgroundRequest = "";
   requestCounter = 0;
diff -Nru firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/browser_mixed_content_auto_upgrade_display_console.js firefox-85.0+build1/dom/security/test/mixedcontentblocker/browser_mixed_content_auto_upgrade_display_console.js
--- firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/browser_mixed_content_auto_upgrade_display_console.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/mixedcontentblocker/browser_mixed_content_auto_upgrade_display_console.js	2021-01-18 19:58:10.000000000 +0000
@@ -22,7 +22,7 @@
   });
   Services.console.registerListener(on_auto_upgrade_message);
 
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURI);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, kTestURI);
 
   await BrowserTestUtils.waitForCondition(() => seenAutoUpgradeMessage);
 
diff -Nru firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/file_main.html firefox-85.0+build1/dom/security/test/mixedcontentblocker/file_main.html
--- firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/file_main.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/mixedcontentblocker/file_main.html	2021-01-18 19:58:10.000000000 +0000
@@ -78,7 +78,7 @@
     var object = document.createElement("object");
     var objectId = uniqueID();
     object.data = baseUrl + "?type=object" + uniqueIDParam(objectId);
-    object.type = "application/x-test";
+    object.type = "image/png";
     object.width = "200";
     object.height = "200";
 
@@ -87,15 +87,17 @@
     var objectCount = 0;
 
     function objectStatus(object) {
-      // Expose our privileged bits on the object
+      // Expose our privileged bits on the object.  We will match the MIME type to the one
+      // provided by file_server.sjs
       object = SpecialPowers.wrap(object);
-
-      if (object.displayedType != SpecialPowers.Ci.nsIObjectLoadingContent.TYPE_NULL) {
+      var typeIsSet = object.actualType && (object.actualType !== '');
+      var isLoaded = typeIsSet && object.actualType === 'application/x-test-match';
+      if (isLoaded) {
         //object loaded
         report("object", "insecure object loaded");
       }
       else {
-        if(objectCount < MAX_COUNT) {
+        if(!typeIsSet && objectCount < MAX_COUNT) {
           objectCount++;
           setTimeout(objectStatus, TIMEOUT_INTERVAL, object);
         }
diff -Nru firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/file_server.sjs firefox-85.0+build1/dom/security/test/mixedcontentblocker/file_server.sjs
--- firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/file_server.sjs	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/mixedcontentblocker/file_server.sjs	2021-01-18 19:58:10.000000000 +0000
@@ -106,7 +106,7 @@
       break;
 
     case "object":
-      response.setHeader("Content-Type", "application/x-test", false);
+      response.setHeader("Content-Type", "application/x-test-match", false);
       break;
 
    case "xhr":
diff -Nru firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/test_main.html firefox-85.0+build1/dom/security/test/mixedcontentblocker/test_main.html
--- firefox-84.0.2+build1/dom/security/test/mixedcontentblocker/test_main.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/security/test/mixedcontentblocker/test_main.html	2021-01-18 19:58:10.000000000 +0000
@@ -11,8 +11,6 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script>
-  SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-
   let counter = 0;
   // blockDisplay blockActive upgradeDisplay
   const settings = [
diff -Nru firefox-84.0.2+build1/dom/serializers/moz.build firefox-85.0+build1/dom/serializers/moz.build
--- firefox-84.0.2+build1/dom/serializers/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,34 @@
+# -*- 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 Files("*"):
+    BUG_COMPONENT = ("Core", "DOM: Serializers")
+
+XPIDL_SOURCES += [
+    "nsIDocumentEncoder.idl",
+]
+
+XPIDL_MODULE = "dom_serializers"
+
+EXPORTS += [
+    "nsDOMSerializer.h",
+    "nsHTMLContentSerializer.h",
+    "nsIContentSerializer.h",
+    "nsPlainTextSerializer.h",
+    "nsXHTMLContentSerializer.h",
+    "nsXMLContentSerializer.h",
+]
+
+UNIFIED_SOURCES += [
+    "nsDocumentEncoder.cpp",
+    "nsDOMSerializer.cpp",
+    "nsHTMLContentSerializer.cpp",
+    "nsPlainTextSerializer.cpp",
+    "nsXHTMLContentSerializer.cpp",
+    "nsXMLContentSerializer.cpp",
+]
+
+FINAL_LIBRARY = "xul"
diff -Nru firefox-84.0.2+build1/dom/serializers/nsDocumentEncoder.cpp firefox-85.0+build1/dom/serializers/nsDocumentEncoder.cpp
--- firefox-84.0.2+build1/dom/serializers/nsDocumentEncoder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsDocumentEncoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,2106 @@
+/* -*- 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/. */
+
+/*
+ * Object that can be used to serialize selections, ranges, or nodes
+ * to strings in a gazillion different ways.
+ */
+
+#include "nsIDocumentEncoder.h"
+
+#include <utility>
+
+#include "nscore.h"
+#include "nsISupports.h"
+#include "mozilla/dom/Document.h"
+#include "nsCOMPtr.h"
+#include "nsCRT.h"
+#include "nsIContentSerializer.h"
+#include "mozilla/Encoding.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIOutputStream.h"
+#include "nsRange.h"
+#include "nsGkAtoms.h"
+#include "nsHTMLDocument.h"
+#include "nsIContent.h"
+#include "nsIScriptContext.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsITransferable.h"
+#include "mozilla/dom/Selection.h"
+#include "nsContentUtils.h"
+#include "nsElementTable.h"
+#include "nsUnicharUtils.h"
+#include "nsReadableUtils.h"
+#include "nsTArray.h"
+#include "nsIFrame.h"
+#include "nsStringBuffer.h"
+#include "mozilla/dom/Comment.h"
+#include "mozilla/dom/DocumentType.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLBRElement.h"
+#include "mozilla/dom/ProcessingInstruction.h"
+#include "mozilla/dom/ShadowRoot.h"
+#include "mozilla/dom/Text.h"
+#include "nsLayoutUtils.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/UniquePtr.h"
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+enum nsRangeIterationDirection { kDirectionOut = -1, kDirectionIn = 1 };
+
+class TextStreamer {
+ public:
+  /**
+   * @param aStream Will be kept alive by the TextStreamer.
+   * @param aUnicodeEncoder Needs to be non-nullptr.
+   */
+  TextStreamer(nsIOutputStream& aStream, UniquePtr<Encoder> aUnicodeEncoder,
+               bool aIsPlainText, nsAString& aOutputBuffer);
+
+  /**
+   * String will be truncated if it is written to stream.
+   */
+  nsresult FlushIfStringLongEnough();
+
+  /**
+   * String will be truncated.
+   */
+  nsresult ForceFlush();
+
+ private:
+  const static uint32_t kMaxLengthBeforeFlush = 1024;
+
+  const static uint32_t kEncoderBufferSizeInBytes = 4096;
+
+  nsresult EncodeAndWrite();
+
+  nsresult EncodeAndWriteAndTruncate();
+
+  const nsCOMPtr<nsIOutputStream> mStream;
+  const UniquePtr<Encoder> mUnicodeEncoder;
+  const bool mIsPlainText;
+  nsAString& mOutputBuffer;
+};
+
+TextStreamer::TextStreamer(nsIOutputStream& aStream,
+                           UniquePtr<Encoder> aUnicodeEncoder,
+                           bool aIsPlainText, nsAString& aOutputBuffer)
+    : mStream{&aStream},
+      mUnicodeEncoder(std::move(aUnicodeEncoder)),
+      mIsPlainText(aIsPlainText),
+      mOutputBuffer(aOutputBuffer) {
+  MOZ_ASSERT(mUnicodeEncoder);
+}
+
+nsresult TextStreamer::FlushIfStringLongEnough() {
+  nsresult rv = NS_OK;
+
+  if (mOutputBuffer.Length() > kMaxLengthBeforeFlush) {
+    rv = EncodeAndWriteAndTruncate();
+  }
+
+  return rv;
+}
+
+nsresult TextStreamer::ForceFlush() { return EncodeAndWriteAndTruncate(); }
+
+nsresult TextStreamer::EncodeAndWrite() {
+  if (mOutputBuffer.IsEmpty()) {
+    return NS_OK;
+  }
+
+  uint8_t buffer[kEncoderBufferSizeInBytes];
+  auto src = Span(mOutputBuffer);
+  auto bufferSpan = Span(buffer);
+  // Reserve space for terminator
+  auto dst = bufferSpan.To(bufferSpan.Length() - 1);
+  for (;;) {
+    uint32_t result;
+    size_t read;
+    size_t written;
+    bool hadErrors;
+    if (mIsPlainText) {
+      Tie(result, read, written) =
+          mUnicodeEncoder->EncodeFromUTF16WithoutReplacement(src, dst, false);
+      if (result != kInputEmpty && result != kOutputFull) {
+        // There's always room for one byte in the case of
+        // an unmappable character, because otherwise
+        // we'd have gotten `kOutputFull`.
+        dst[written++] = '?';
+      }
+    } else {
+      Tie(result, read, written, hadErrors) =
+          mUnicodeEncoder->EncodeFromUTF16(src, dst, false);
+    }
+    Unused << hadErrors;
+    src = src.From(read);
+    // Sadly, we still have test cases that implement nsIOutputStream in JS, so
+    // the buffer needs to be zero-terminated for XPConnect to do its thing.
+    // See bug 170416.
+    bufferSpan[written] = 0;
+    uint32_t streamWritten;
+    nsresult rv = mStream->Write(reinterpret_cast<char*>(dst.Elements()),
+                                 written, &streamWritten);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    if (result == kInputEmpty) {
+      return NS_OK;
+    }
+  }
+}
+
+nsresult TextStreamer::EncodeAndWriteAndTruncate() {
+  const nsresult rv = EncodeAndWrite();
+  mOutputBuffer.Truncate();
+  return rv;
+}
+
+/**
+ * The scope may be limited to either a selection, range, or node.
+ */
+class EncodingScope {
+ public:
+  /**
+   * @return true, iff the scope is limited to a selection, range or node.
+   */
+  bool IsLimited() const;
+
+  RefPtr<Selection> mSelection;
+  RefPtr<nsRange> mRange;
+  nsCOMPtr<nsINode> mNode;
+  bool mNodeIsContainer = false;
+};
+
+bool EncodingScope::IsLimited() const { return mSelection || mRange || mNode; }
+
+struct RangeBoundariesInclusiveAncestorsAndOffsets {
+  /**
+   * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
+   */
+  using InclusiveAncestors = AutoTArray<nsIContent*, 8>;
+
+  /**
+   * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
+   */
+  using InclusiveAncestorsOffsets = AutoTArray<int32_t, 8>;
+
+  // The first node is the range's boundary node, the following ones the
+  // ancestors.
+  InclusiveAncestors mInclusiveAncestorsOfStart;
+  // The first offset represents where at the boundary node the range starts.
+  // Each other offset is the index of the child relative to its parent.
+  InclusiveAncestorsOffsets mInclusiveAncestorsOffsetsOfStart;
+
+  // The first node is the range's boundary node, the following one the
+  // ancestors.
+  InclusiveAncestors mInclusiveAncestorsOfEnd;
+  // The first offset represents where at the boundary node the range ends.
+  // Each other offset is the index of the child relative to its parent.
+  InclusiveAncestorsOffsets mInclusiveAncestorsOffsetsOfEnd;
+};
+
+struct ContextInfoDepth {
+  uint32_t mStart = 0;
+  uint32_t mEnd = 0;
+};
+
+class nsDocumentEncoder : public nsIDocumentEncoder {
+ protected:
+  class RangeNodeContext {
+   public:
+    virtual ~RangeNodeContext() = default;
+
+    virtual bool IncludeInContext(nsINode& aNode) const { return false; }
+
+    virtual int32_t GetImmediateContextCount(
+        const nsTArray<nsINode*>& aAncestorArray) const {
+      return -1;
+    }
+  };
+
+ public:
+  nsDocumentEncoder();
+
+ protected:
+  /**
+   * @param aRangeNodeContext has to be non-null.
+   */
+  explicit nsDocumentEncoder(UniquePtr<RangeNodeContext> aRangeNodeContext);
+
+ public:
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDocumentEncoder)
+  NS_DECL_NSIDOCUMENTENCODER
+
+ protected:
+  virtual ~nsDocumentEncoder();
+
+  void Initialize(bool aClearCachedSerializer = true);
+
+  /**
+   * @param aMaxLength As described at
+   * `nsIDocumentEncodder.encodeToStringWithMaxLength`.
+   */
+  nsresult SerializeDependingOnScope(uint32_t aMaxLength);
+
+  nsresult SerializeSelection();
+
+  nsresult SerializeNode();
+
+  /**
+   * @param aMaxLength As described at
+   * `nsIDocumentEncodder.encodeToStringWithMaxLength`.
+   */
+  nsresult SerializeWholeDocument(uint32_t aMaxLength);
+
+  /**
+   * @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.o
+   */
+  static bool IsInvisibleNodeAndShouldBeSkipped(const nsINode& aNode,
+                                                const uint32_t aFlags) {
+    if (aFlags & SkipInvisibleContent) {
+      // Treat the visibility of the ShadowRoot as if it were
+      // the host content.
+      //
+      // FIXME(emilio): I suspect instead of this a bunch of the GetParent()
+      // calls here should be doing GetFlattenedTreeParent, then this condition
+      // should be unreachable...
+      const nsINode* node{&aNode};
+      if (const ShadowRoot* shadowRoot = ShadowRoot::FromNode(node)) {
+        node = shadowRoot->GetHost();
+      }
+
+      if (node->IsContent()) {
+        nsIFrame* frame = node->AsContent()->GetPrimaryFrame();
+        if (!frame) {
+          if (node->IsElement() && node->AsElement()->IsDisplayContents()) {
+            return false;
+          }
+          if (node->IsText()) {
+            // We have already checked that our parent is visible.
+            //
+            // FIXME(emilio): Text not assigned to a <slot> in Shadow DOM should
+            // probably return false...
+            return false;
+          }
+          if (node->IsHTMLElement(nsGkAtoms::rp)) {
+            // Ruby parentheses are part of ruby structure, hence
+            // shouldn't be stripped out even if it is not displayed.
+            return false;
+          }
+          return true;
+        }
+        bool isVisible = frame->StyleVisibility()->IsVisible();
+        if (!isVisible && node->IsText()) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  void ReleaseDocumentReferenceAndInitialize(bool aClearCachedSerializer);
+
+  class MOZ_STACK_CLASS AutoReleaseDocumentIfNeeded final {
+   public:
+    explicit AutoReleaseDocumentIfNeeded(nsDocumentEncoder* aEncoder)
+        : mEncoder(aEncoder) {}
+
+    ~AutoReleaseDocumentIfNeeded() {
+      if (mEncoder->mFlags & RequiresReinitAfterOutput) {
+        const bool clearCachedSerializer = false;
+        mEncoder->ReleaseDocumentReferenceAndInitialize(clearCachedSerializer);
+      }
+    }
+
+   private:
+    nsDocumentEncoder* mEncoder;
+  };
+
+  nsCOMPtr<Document> mDocument;
+  EncodingScope mEncodingScope;
+  nsCOMPtr<nsIContentSerializer> mSerializer;
+
+  Maybe<TextStreamer> mTextStreamer;
+  nsCOMPtr<nsIDocumentEncoderNodeFixup> mNodeFixup;
+
+  nsString mMimeType;
+  const Encoding* mEncoding;
+  // Multiple of the flags defined in nsIDocumentEncoder.idl.
+  uint32_t mFlags;
+  uint32_t mWrapColumn;
+  // Whether the serializer cares about being notified to scan elements to
+  // keep track of whether they are preformatted.  This stores the out
+  // argument of nsIContentSerializer::Init().
+  bool mNeedsPreformatScanning;
+  bool mIsCopying;  // Set to true only while copying
+  nsStringBuffer* mCachedBuffer;
+
+  class NodeSerializer {
+   public:
+    /**
+     * @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.
+     */
+    NodeSerializer(const bool& aNeedsPreformatScanning,
+                   const nsCOMPtr<nsIContentSerializer>& aSerializer,
+                   const uint32_t& aFlags,
+                   const nsCOMPtr<nsIDocumentEncoderNodeFixup>& aNodeFixup,
+                   Maybe<TextStreamer>& aTextStreamer)
+        : mNeedsPreformatScanning{aNeedsPreformatScanning},
+          mSerializer{aSerializer},
+          mFlags{aFlags},
+          mNodeFixup{aNodeFixup},
+          mTextStreamer{aTextStreamer} {}
+
+    nsresult SerializeNodeStart(nsINode& aOriginalNode, int32_t aStartOffset,
+                                int32_t aEndOffset,
+                                nsINode* aFixupNode = nullptr) const;
+
+    enum class SerializeRoot { eYes, eNo };
+
+    nsresult SerializeToStringRecursive(nsINode* aNode,
+                                        SerializeRoot aSerializeRoot,
+                                        uint32_t aMaxLength = 0) const;
+
+    nsresult SerializeNodeEnd(nsINode& aOriginalNode,
+                              nsINode* aFixupNode = nullptr) const;
+
+    [[nodiscard]] nsresult SerializeTextNode(nsINode& aNode,
+                                             int32_t aStartOffset,
+                                             int32_t aEndOffset) const;
+
+    nsresult SerializeToStringIterative(nsINode* aNode) const;
+
+   private:
+    const bool& mNeedsPreformatScanning;
+    const nsCOMPtr<nsIContentSerializer>& mSerializer;
+    // Multiple of the flags defined in nsIDocumentEncoder.idl.
+    const uint32_t& mFlags;
+    const nsCOMPtr<nsIDocumentEncoderNodeFixup>& mNodeFixup;
+    Maybe<TextStreamer>& mTextStreamer;
+  };
+
+  NodeSerializer mNodeSerializer;
+
+  const UniquePtr<RangeNodeContext> mRangeNodeContext;
+
+  struct RangeContextSerializer final {
+    RangeContextSerializer(const RangeNodeContext& aRangeNodeContext,
+                           const NodeSerializer& aNodeSerializer)
+        : mDisableContextSerialize{false},
+          mRangeNodeContext{aRangeNodeContext},
+          mNodeSerializer{aNodeSerializer} {}
+
+    nsresult SerializeRangeContextStart(
+        const nsTArray<nsINode*>& aAncestorArray);
+    nsresult SerializeRangeContextEnd();
+
+    // Used when context has already been serialized for
+    // table cell selections (where parent is <tr>)
+    bool mDisableContextSerialize;
+    AutoTArray<AutoTArray<nsINode*, 8>, 8> mRangeContexts;
+
+    const RangeNodeContext& mRangeNodeContext;
+
+   private:
+    const NodeSerializer& mNodeSerializer;
+  };
+
+  RangeContextSerializer mRangeContextSerializer;
+
+  struct RangeSerializer {
+    // @param aFlags multiple of the flags defined in nsIDocumentEncoder.idl.
+    RangeSerializer(const uint32_t& aFlags,
+                    const NodeSerializer& aNodeSerializer,
+                    RangeContextSerializer& aRangeContextSerializer)
+        : mStartRootIndex{0},
+          mEndRootIndex{0},
+          mHaltRangeHint{false},
+          mFlags{aFlags},
+          mNodeSerializer{aNodeSerializer},
+          mRangeContextSerializer{aRangeContextSerializer} {}
+
+    void Initialize();
+
+    /**
+     * @param aDepth the distance (number of `GetParent` calls) from aNode to
+     *               aRange's closest common inclusive ancestor.
+     */
+    nsresult SerializeRangeNodes(const nsRange* aRange, nsINode* aNode,
+                                 int32_t aDepth);
+
+    /**
+     * Serialize aContent's children from aStartOffset to aEndOffset.
+     *
+     * @param aDepth the distance (number of `GetParent` calls) from aContent to
+     *               aRange's closest common inclusive ancestor.
+     */
+    [[nodiscard]] nsresult SerializeChildrenOfContent(nsIContent& aContent,
+                                                      int32_t aStartOffset,
+                                                      int32_t aEndOffset,
+                                                      const nsRange* aRange,
+                                                      int32_t aDepth);
+
+    nsresult SerializeRangeToString(const nsRange* aRange);
+
+    /**
+     * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
+     */
+    nsCOMPtr<nsINode> mClosestCommonInclusiveAncestorOfRange;
+
+    /**
+     * https://dom.spec.whatwg.org/#concept-tree-inclusive-ancestor.
+     */
+    AutoTArray<nsINode*, 8> mCommonInclusiveAncestors;
+
+    ContextInfoDepth mContextInfoDepth;
+
+   private:
+    struct StartAndEndContent {
+      nsCOMPtr<nsIContent> mStart;
+      nsCOMPtr<nsIContent> mEnd;
+    };
+
+    StartAndEndContent GetStartAndEndContentForRecursionLevel(
+        int32_t aDepth) const;
+
+    bool HasInvisibleParentAndShouldBeSkipped(nsINode& aNode) const;
+
+    nsresult SerializeNodePartiallyContainedInRange(
+        nsINode& aNode, nsIContent& aContent,
+        const StartAndEndContent& aStartAndEndContent, const nsRange& aRange,
+        int32_t aDepth);
+
+    nsresult SerializeTextNode(nsINode& aNode, const nsIContent& aContent,
+                               const StartAndEndContent& aStartAndEndContent,
+                               const nsRange& aRange) const;
+
+    RangeBoundariesInclusiveAncestorsAndOffsets
+        mRangeBoundariesInclusiveAncestorsAndOffsets;
+    int32_t mStartRootIndex;
+    int32_t mEndRootIndex;
+    bool mHaltRangeHint;
+
+    // Multiple of the flags defined in nsIDocumentEncoder.idl.
+    const uint32_t& mFlags;
+
+    const NodeSerializer& mNodeSerializer;
+    RangeContextSerializer& mRangeContextSerializer;
+  };
+
+  RangeSerializer mRangeSerializer;
+};
+
+void nsDocumentEncoder::RangeSerializer::Initialize() {
+  mContextInfoDepth = {};
+  mStartRootIndex = 0;
+  mEndRootIndex = 0;
+  mHaltRangeHint = false;
+  mClosestCommonInclusiveAncestorOfRange = nullptr;
+  mRangeBoundariesInclusiveAncestorsAndOffsets = {};
+}
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDocumentEncoder)
+NS_IMPL_CYCLE_COLLECTING_RELEASE_WITH_LAST_RELEASE(
+    nsDocumentEncoder, ReleaseDocumentReferenceAndInitialize(true))
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocumentEncoder)
+  NS_INTERFACE_MAP_ENTRY(nsIDocumentEncoder)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION(
+    nsDocumentEncoder, mDocument, mEncodingScope.mSelection,
+    mEncodingScope.mRange, mEncodingScope.mNode, mSerializer,
+    mRangeSerializer.mClosestCommonInclusiveAncestorOfRange)
+
+nsDocumentEncoder::nsDocumentEncoder(
+    UniquePtr<RangeNodeContext> aRangeNodeContext)
+    : mEncoding(nullptr),
+      mIsCopying(false),
+      mCachedBuffer(nullptr),
+      mNodeSerializer(mNeedsPreformatScanning, mSerializer, mFlags, mNodeFixup,
+                      mTextStreamer),
+      mRangeNodeContext(std::move(aRangeNodeContext)),
+      mRangeContextSerializer(*mRangeNodeContext, mNodeSerializer),
+      mRangeSerializer(mFlags, mNodeSerializer, mRangeContextSerializer) {
+  MOZ_ASSERT(mRangeNodeContext);
+
+  Initialize();
+  mMimeType.AssignLiteral("text/plain");
+}
+
+nsDocumentEncoder::nsDocumentEncoder()
+    : nsDocumentEncoder(MakeUnique<RangeNodeContext>()) {}
+
+void nsDocumentEncoder::Initialize(bool aClearCachedSerializer) {
+  mFlags = 0;
+  mWrapColumn = 72;
+  mRangeSerializer.Initialize();
+  mNeedsPreformatScanning = false;
+  mRangeContextSerializer.mDisableContextSerialize = false;
+  mEncodingScope = {};
+  mNodeFixup = nullptr;
+  if (aClearCachedSerializer) {
+    mSerializer = nullptr;
+  }
+}
+
+static bool ParentIsTR(nsIContent* aContent) {
+  mozilla::dom::Element* parent = aContent->GetParentElement();
+  if (!parent) {
+    return false;
+  }
+  return parent->IsHTMLElement(nsGkAtoms::tr);
+}
+
+nsresult nsDocumentEncoder::SerializeDependingOnScope(uint32_t aMaxLength) {
+  nsresult rv = NS_OK;
+  if (mEncodingScope.mSelection) {
+    rv = SerializeSelection();
+  } else if (nsRange* range = mEncodingScope.mRange) {
+    rv = mRangeSerializer.SerializeRangeToString(range);
+  } else if (mEncodingScope.mNode) {
+    rv = SerializeNode();
+  } else {
+    rv = SerializeWholeDocument(aMaxLength);
+  }
+
+  mEncodingScope = {};
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::SerializeSelection() {
+  NS_ENSURE_TRUE(mEncodingScope.mSelection, NS_ERROR_FAILURE);
+
+  nsresult rv = NS_OK;
+  const Selection* selection = mEncodingScope.mSelection;
+  uint32_t count = selection->RangeCount();
+
+  nsCOMPtr<nsINode> node;
+  nsCOMPtr<nsINode> prevNode;
+  uint32_t firstRangeStartDepth = 0;
+  for (uint32_t i = 0; i < count; ++i) {
+    RefPtr<const nsRange> range = selection->GetRangeAt(i);
+
+    // Bug 236546: newlines not added when copying table cells into clipboard
+    // Each selected cell shows up as a range containing a row with a single
+    // cell get the row, compare it to previous row and emit </tr><tr> as
+    // needed Bug 137450: Problem copying/pasting a table from a web page to
+    // Excel. Each separate block of <tr></tr> produced above will be wrapped
+    // by the immediate context. This assumes that you can't select cells that
+    // are multiple selections from two tables simultaneously.
+    node = range->GetStartContainer();
+    NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
+    if (node != prevNode) {
+      if (prevNode) {
+        rv = mNodeSerializer.SerializeNodeEnd(*prevNode);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+      nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(node);
+      if (content && content->IsHTMLElement(nsGkAtoms::tr) &&
+          !ParentIsTR(content)) {
+        if (!prevNode) {
+          // Went from a non-<tr> to a <tr>
+          mRangeSerializer.mCommonInclusiveAncestors.Clear();
+          nsContentUtils::GetInclusiveAncestors(
+              node->GetParentNode(),
+              mRangeSerializer.mCommonInclusiveAncestors);
+          rv = mRangeContextSerializer.SerializeRangeContextStart(
+              mRangeSerializer.mCommonInclusiveAncestors);
+          NS_ENSURE_SUCCESS(rv, rv);
+          // Don't let SerializeRangeToString serialize the context again
+          mRangeContextSerializer.mDisableContextSerialize = true;
+        }
+
+        rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
+        NS_ENSURE_SUCCESS(rv, rv);
+        prevNode = node;
+      } else if (prevNode) {
+        // Went from a <tr> to a non-<tr>
+        mRangeContextSerializer.mDisableContextSerialize = false;
+
+        // `mCommonInclusiveAncestors` is used in `EncodeToStringWithContext`
+        // too. Update it here to mimic the old behavior.
+        mRangeSerializer.mCommonInclusiveAncestors.Clear();
+        nsContentUtils::GetInclusiveAncestors(
+            prevNode->GetParentNode(),
+            mRangeSerializer.mCommonInclusiveAncestors);
+
+        rv = mRangeContextSerializer.SerializeRangeContextEnd();
+        NS_ENSURE_SUCCESS(rv, rv);
+        prevNode = nullptr;
+      }
+    }
+
+    rv = mRangeSerializer.SerializeRangeToString(range);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (i == 0) {
+      firstRangeStartDepth = mRangeSerializer.mContextInfoDepth.mStart;
+    }
+  }
+  mRangeSerializer.mContextInfoDepth.mStart = firstRangeStartDepth;
+
+  if (prevNode) {
+    rv = mNodeSerializer.SerializeNodeEnd(*prevNode);
+    NS_ENSURE_SUCCESS(rv, rv);
+    mRangeContextSerializer.mDisableContextSerialize = false;
+
+    // `mCommonInclusiveAncestors` is used in `EncodeToStringWithContext`
+    // too. Update it here to mimic the old behavior.
+    mRangeSerializer.mCommonInclusiveAncestors.Clear();
+    nsContentUtils::GetInclusiveAncestors(
+        prevNode->GetParentNode(), mRangeSerializer.mCommonInclusiveAncestors);
+
+    rv = mRangeContextSerializer.SerializeRangeContextEnd();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // Just to be safe
+  mRangeContextSerializer.mDisableContextSerialize = false;
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::SerializeNode() {
+  NS_ENSURE_TRUE(mEncodingScope.mNode, NS_ERROR_FAILURE);
+
+  nsresult rv = NS_OK;
+  nsINode* node = mEncodingScope.mNode;
+  const bool nodeIsContainer = mEncodingScope.mNodeIsContainer;
+  if (!mNodeFixup && !(mFlags & SkipInvisibleContent) && !mTextStreamer &&
+      nodeIsContainer) {
+    rv = mNodeSerializer.SerializeToStringIterative(node);
+  } else {
+    rv = mNodeSerializer.SerializeToStringRecursive(
+        node, nodeIsContainer ? NodeSerializer::SerializeRoot::eNo
+                              : NodeSerializer::SerializeRoot::eYes);
+  }
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::SerializeWholeDocument(uint32_t aMaxLength) {
+  NS_ENSURE_FALSE(mEncodingScope.mSelection, NS_ERROR_FAILURE);
+  NS_ENSURE_FALSE(mEncodingScope.mRange, NS_ERROR_FAILURE);
+  NS_ENSURE_FALSE(mEncodingScope.mNode, NS_ERROR_FAILURE);
+
+  nsresult rv = mSerializer->AppendDocumentStart(mDocument);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mNodeSerializer.SerializeToStringRecursive(
+      mDocument, NodeSerializer::SerializeRoot::eYes, aMaxLength);
+  return rv;
+}
+
+nsDocumentEncoder::~nsDocumentEncoder() {
+  if (mCachedBuffer) {
+    mCachedBuffer->Release();
+  }
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::Init(Document* aDocument, const nsAString& aMimeType,
+                        uint32_t aFlags) {
+  return NativeInit(aDocument, aMimeType, aFlags);
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::NativeInit(Document* aDocument, const nsAString& aMimeType,
+                              uint32_t aFlags) {
+  if (!aDocument) return NS_ERROR_INVALID_ARG;
+
+  Initialize(!mMimeType.Equals(aMimeType));
+
+  mDocument = aDocument;
+
+  mMimeType = aMimeType;
+
+  mFlags = aFlags;
+  mIsCopying = false;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetWrapColumn(uint32_t aWC) {
+  mWrapColumn = aWC;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetSelection(Selection* aSelection) {
+  mEncodingScope.mSelection = aSelection;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetRange(nsRange* aRange) {
+  mEncodingScope.mRange = aRange;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetNode(nsINode* aNode) {
+  mEncodingScope.mNodeIsContainer = false;
+  mEncodingScope.mNode = aNode;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetContainerNode(nsINode* aContainer) {
+  mEncodingScope.mNodeIsContainer = true;
+  mEncodingScope.mNode = aContainer;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetCharset(const nsACString& aCharset) {
+  const Encoding* encoding = Encoding::ForLabel(aCharset);
+  if (!encoding) {
+    return NS_ERROR_UCONV_NOCONV;
+  }
+  mEncoding = encoding->OutputEncoding();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::GetMimeType(nsAString& aMimeType) {
+  aMimeType = mMimeType;
+  return NS_OK;
+}
+
+class FixupNodeDeterminer {
+ public:
+  FixupNodeDeterminer(nsIDocumentEncoderNodeFixup* aNodeFixup,
+                      nsINode* aFixupNode, nsINode& aOriginalNode)
+      : mIsSerializationOfFixupChildrenNeeded{false},
+        mNodeFixup(aNodeFixup),
+        mOriginalNode(aOriginalNode) {
+    if (mNodeFixup) {
+      if (aFixupNode) {
+        mFixupNode = aFixupNode;
+      } else {
+        mNodeFixup->FixupNode(&mOriginalNode,
+                              &mIsSerializationOfFixupChildrenNeeded,
+                              getter_AddRefs(mFixupNode));
+      }
+    }
+  }
+
+  bool IsSerializationOfFixupChildrenNeeded() const {
+    return mIsSerializationOfFixupChildrenNeeded;
+  }
+
+  /**
+   * @return The fixup node, if available, otherwise the original node. The
+   * former is kept alive by this object.
+   */
+  nsINode& GetFixupNodeFallBackToOriginalNode() const {
+    return mFixupNode ? *mFixupNode : mOriginalNode;
+  }
+
+ private:
+  bool mIsSerializationOfFixupChildrenNeeded;
+  nsIDocumentEncoderNodeFixup* mNodeFixup;
+  nsCOMPtr<nsINode> mFixupNode;
+  nsINode& mOriginalNode;
+};
+
+nsresult nsDocumentEncoder::NodeSerializer::SerializeNodeStart(
+    nsINode& aOriginalNode, int32_t aStartOffset, int32_t aEndOffset,
+    nsINode* aFixupNode) const {
+  if (mNeedsPreformatScanning) {
+    if (aOriginalNode.IsElement()) {
+      mSerializer->ScanElementForPreformat(aOriginalNode.AsElement());
+    } else if (aOriginalNode.IsText()) {
+      const nsCOMPtr<nsINode> parent = aOriginalNode.GetParent();
+      if (parent && parent->IsElement()) {
+        mSerializer->ScanElementForPreformat(parent->AsElement());
+      }
+    }
+  }
+
+  if (IsInvisibleNodeAndShouldBeSkipped(aOriginalNode, mFlags)) {
+    return NS_OK;
+  }
+
+  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, aFixupNode,
+                                          aOriginalNode};
+  nsINode* node = &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
+
+  nsresult rv = NS_OK;
+
+  if (node->IsElement()) {
+    if ((mFlags & (nsIDocumentEncoder::OutputPreformatted |
+                   nsIDocumentEncoder::OutputDropInvisibleBreak)) &&
+        nsLayoutUtils::IsInvisibleBreak(node)) {
+      return rv;
+    }
+    rv = mSerializer->AppendElementStart(node->AsElement(),
+                                         aOriginalNode.AsElement());
+    return rv;
+  }
+
+  switch (node->NodeType()) {
+    case nsINode::TEXT_NODE: {
+      rv = mSerializer->AppendText(static_cast<nsIContent*>(node), aStartOffset,
+                                   aEndOffset);
+      break;
+    }
+    case nsINode::CDATA_SECTION_NODE: {
+      rv = mSerializer->AppendCDATASection(static_cast<nsIContent*>(node),
+                                           aStartOffset, aEndOffset);
+      break;
+    }
+    case nsINode::PROCESSING_INSTRUCTION_NODE: {
+      rv = mSerializer->AppendProcessingInstruction(
+          static_cast<ProcessingInstruction*>(node), aStartOffset, aEndOffset);
+      break;
+    }
+    case nsINode::COMMENT_NODE: {
+      rv = mSerializer->AppendComment(static_cast<Comment*>(node), aStartOffset,
+                                      aEndOffset);
+      break;
+    }
+    case nsINode::DOCUMENT_TYPE_NODE: {
+      rv = mSerializer->AppendDoctype(static_cast<DocumentType*>(node));
+      break;
+    }
+  }
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::NodeSerializer::SerializeNodeEnd(
+    nsINode& aOriginalNode, nsINode* aFixupNode) const {
+  if (mNeedsPreformatScanning) {
+    if (aOriginalNode.IsElement()) {
+      mSerializer->ForgetElementForPreformat(aOriginalNode.AsElement());
+    } else if (aOriginalNode.IsText()) {
+      const nsCOMPtr<nsINode> parent = aOriginalNode.GetParent();
+      if (parent && parent->IsElement()) {
+        mSerializer->ForgetElementForPreformat(parent->AsElement());
+      }
+    }
+  }
+
+  if (IsInvisibleNodeAndShouldBeSkipped(aOriginalNode, mFlags)) {
+    return NS_OK;
+  }
+
+  nsresult rv = NS_OK;
+
+  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, aFixupNode,
+                                          aOriginalNode};
+  nsINode* node = &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
+
+  if (node->IsElement()) {
+    rv = mSerializer->AppendElementEnd(node->AsElement(),
+                                       aOriginalNode.AsElement());
+  }
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::NodeSerializer::SerializeToStringRecursive(
+    nsINode* aNode, SerializeRoot aSerializeRoot, uint32_t aMaxLength) const {
+  uint32_t outputLength{0};
+  nsresult rv = mSerializer->GetOutputLength(outputLength);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (aMaxLength > 0 && outputLength >= aMaxLength) {
+    return NS_OK;
+  }
+
+  NS_ENSURE_TRUE(aNode, NS_ERROR_NULL_POINTER);
+
+  if (IsInvisibleNodeAndShouldBeSkipped(*aNode, mFlags)) {
+    return NS_OK;
+  }
+
+  FixupNodeDeterminer fixupNodeDeterminer{mNodeFixup, nullptr, *aNode};
+  nsINode* maybeFixedNode =
+      &fixupNodeDeterminer.GetFixupNodeFallBackToOriginalNode();
+
+  if (mFlags & SkipInvisibleContent) {
+    if (aNode->IsContent()) {
+      if (nsIFrame* frame = aNode->AsContent()->GetPrimaryFrame()) {
+        if (!frame->IsSelectable(nullptr)) {
+          aSerializeRoot = SerializeRoot::eNo;
+        }
+      }
+    }
+  }
+
+  if (aSerializeRoot == SerializeRoot::eYes) {
+    int32_t endOffset = -1;
+    if (aMaxLength > 0) {
+      MOZ_ASSERT(aMaxLength >= outputLength);
+      endOffset = aMaxLength - outputLength;
+    }
+    rv = SerializeNodeStart(*aNode, 0, endOffset, maybeFixedNode);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  nsINode* node = fixupNodeDeterminer.IsSerializationOfFixupChildrenNeeded()
+                      ? maybeFixedNode
+                      : aNode;
+
+  for (nsINode* child = node->GetFirstChildOfTemplateOrNode(); child;
+       child = child->GetNextSibling()) {
+    rv = SerializeToStringRecursive(child, SerializeRoot::eYes, aMaxLength);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  if (aSerializeRoot == SerializeRoot::eYes) {
+    rv = SerializeNodeEnd(*aNode, maybeFixedNode);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  if (mTextStreamer) {
+    rv = mTextStreamer->FlushIfStringLongEnough();
+  }
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::NodeSerializer::SerializeToStringIterative(
+    nsINode* aNode) const {
+  nsresult rv;
+
+  nsINode* node = aNode->GetFirstChildOfTemplateOrNode();
+  while (node) {
+    nsINode* current = node;
+    rv = SerializeNodeStart(*current, 0, -1, current);
+    NS_ENSURE_SUCCESS(rv, rv);
+    node = current->GetFirstChildOfTemplateOrNode();
+    while (!node && current && current != aNode) {
+      rv = SerializeNodeEnd(*current);
+      NS_ENSURE_SUCCESS(rv, rv);
+      // Check if we have siblings.
+      node = current->GetNextSibling();
+      if (!node) {
+        // Perhaps parent node has siblings.
+        current = current->GetParentNode();
+
+        // Handle template element. If the parent is a template's content,
+        // then adjust the parent to be the template element.
+        if (current && current != aNode && current->IsDocumentFragment()) {
+          nsIContent* host = current->AsDocumentFragment()->GetHost();
+          if (host && host->IsHTMLElement(nsGkAtoms::_template)) {
+            current = host;
+          }
+        }
+      }
+    }
+  }
+
+  return NS_OK;
+}
+
+static bool IsTextNode(nsINode* aNode) { return aNode && aNode->IsText(); }
+
+nsresult nsDocumentEncoder::NodeSerializer::SerializeTextNode(
+    nsINode& aNode, int32_t aStartOffset, int32_t aEndOffset) const {
+  MOZ_ASSERT(IsTextNode(&aNode));
+
+  nsresult rv = SerializeNodeStart(aNode, aStartOffset, aEndOffset);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = SerializeNodeEnd(aNode);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return rv;
+}
+
+nsDocumentEncoder::RangeSerializer::StartAndEndContent
+nsDocumentEncoder::RangeSerializer::GetStartAndEndContentForRecursionLevel(
+    const int32_t aDepth) const {
+  StartAndEndContent result;
+
+  const auto& inclusiveAncestorsOfStart =
+      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfStart;
+  const auto& inclusiveAncestorsOfEnd =
+      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfEnd;
+  int32_t start = mStartRootIndex - aDepth;
+  if (start >= 0 && (uint32_t)start <= inclusiveAncestorsOfStart.Length()) {
+    result.mStart = inclusiveAncestorsOfStart[start];
+  }
+
+  int32_t end = mEndRootIndex - aDepth;
+  if (end >= 0 && (uint32_t)end <= inclusiveAncestorsOfEnd.Length()) {
+    result.mEnd = inclusiveAncestorsOfEnd[end];
+  }
+
+  return result;
+}
+
+nsresult nsDocumentEncoder::RangeSerializer::SerializeTextNode(
+    nsINode& aNode, const nsIContent& aContent,
+    const StartAndEndContent& aStartAndEndContent,
+    const nsRange& aRange) const {
+  const int32_t startOffset =
+      (aStartAndEndContent.mStart == &aContent) ? aRange.StartOffset() : 0;
+  const int32_t endOffset =
+      (aStartAndEndContent.mEnd == &aContent) ? aRange.EndOffset() : -1;
+  return mNodeSerializer.SerializeTextNode(aNode, startOffset, endOffset);
+}
+
+nsresult nsDocumentEncoder::RangeSerializer::SerializeRangeNodes(
+    const nsRange* const aRange, nsINode* const aNode, const int32_t aDepth) {
+  MOZ_ASSERT(aDepth >= 0);
+  MOZ_ASSERT(aRange);
+
+  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aNode);
+  NS_ENSURE_TRUE(content, NS_ERROR_FAILURE);
+
+  if (nsDocumentEncoder::IsInvisibleNodeAndShouldBeSkipped(*aNode, mFlags)) {
+    return NS_OK;
+  }
+
+  nsresult rv = NS_OK;
+
+  StartAndEndContent startAndEndContent =
+      GetStartAndEndContentForRecursionLevel(aDepth);
+
+  if (startAndEndContent.mStart != content &&
+      startAndEndContent.mEnd != content) {
+    // node is completely contained in range.  Serialize the whole subtree
+    // rooted by this node.
+    rv = mNodeSerializer.SerializeToStringRecursive(
+        aNode, NodeSerializer::SerializeRoot::eYes);
+    NS_ENSURE_SUCCESS(rv, rv);
+  } else {
+    rv = SerializeNodePartiallyContainedInRange(
+        *aNode, *content, startAndEndContent, *aRange, aDepth);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+  }
+  return NS_OK;
+}
+
+nsresult
+nsDocumentEncoder::RangeSerializer::SerializeNodePartiallyContainedInRange(
+    nsINode& aNode, nsIContent& aContent,
+    const StartAndEndContent& aStartAndEndContent, const nsRange& aRange,
+    const int32_t aDepth) {
+  // due to implementation it is impossible for text node to be both start and
+  // end of range.  We would have handled that case without getting here.
+  // XXXsmaug What does this all mean?
+  if (IsTextNode(&aNode)) {
+    nsresult rv =
+        SerializeTextNode(aNode, aContent, aStartAndEndContent, aRange);
+    NS_ENSURE_SUCCESS(rv, rv);
+  } else {
+    if (&aNode != mClosestCommonInclusiveAncestorOfRange) {
+      if (mRangeContextSerializer.mRangeNodeContext.IncludeInContext(aNode)) {
+        // halt the incrementing of mContextInfoDepth.  This
+        // is so paste client will include this node in paste.
+        mHaltRangeHint = true;
+      }
+      if ((aStartAndEndContent.mStart == &aContent) && !mHaltRangeHint) {
+        ++mContextInfoDepth.mStart;
+      }
+      if ((aStartAndEndContent.mEnd == &aContent) && !mHaltRangeHint) {
+        ++mContextInfoDepth.mEnd;
+      }
+
+      // serialize the start of this node
+      nsresult rv = mNodeSerializer.SerializeNodeStart(aNode, 0, -1);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    const auto& inclusiveAncestorsOffsetsOfStart =
+        mRangeBoundariesInclusiveAncestorsAndOffsets
+            .mInclusiveAncestorsOffsetsOfStart;
+    const auto& inclusiveAncestorsOffsetsOfEnd =
+        mRangeBoundariesInclusiveAncestorsAndOffsets
+            .mInclusiveAncestorsOffsetsOfEnd;
+    // do some calculations that will tell us which children of this
+    // node are in the range.
+    int32_t startOffset = 0, endOffset = -1;
+    if (aStartAndEndContent.mStart == &aContent && mStartRootIndex >= aDepth) {
+      startOffset = inclusiveAncestorsOffsetsOfStart[mStartRootIndex - aDepth];
+    }
+    if (aStartAndEndContent.mEnd == &aContent && mEndRootIndex >= aDepth) {
+      endOffset = inclusiveAncestorsOffsetsOfEnd[mEndRootIndex - aDepth];
+    }
+    // generated aContent will cause offset values of -1 to be returned.
+    uint32_t childCount = aContent.GetChildCount();
+
+    if (startOffset == -1) startOffset = 0;
+    if (endOffset == -1)
+      endOffset = childCount;
+    else {
+      // if we are at the "tip" of the selection, endOffset is fine.
+      // otherwise, we need to add one.  This is because of the semantics
+      // of the offset list created by GetInclusiveAncestorsAndOffsets().  The
+      // intermediate points on the list use the endOffset of the
+      // location of the ancestor, rather than just past it.  So we need
+      // to add one here in order to include it in the children we serialize.
+      if (&aNode != aRange.GetEndContainer()) {
+        endOffset++;
+      }
+    }
+
+    if (endOffset) {
+      nsresult rv = SerializeChildrenOfContent(aContent, startOffset, endOffset,
+                                               &aRange, aDepth);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+    // serialize the end of this node
+    if (&aNode != mClosestCommonInclusiveAncestorOfRange) {
+      nsresult rv = mNodeSerializer.SerializeNodeEnd(aNode);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
+    nsIContent& aContent, int32_t aStartOffset, int32_t aEndOffset,
+    const nsRange* aRange, int32_t aDepth) {
+  // serialize the children of this node that are in the range
+  nsIContent* childAsNode = aContent.GetFirstChild();
+  int32_t j = 0;
+
+  for (; j < aStartOffset && childAsNode; ++j) {
+    childAsNode = childAsNode->GetNextSibling();
+  }
+
+  MOZ_ASSERT(j == aStartOffset);
+
+  for (; childAsNode && j < aEndOffset; ++j) {
+    nsresult rv{NS_OK};
+    if ((j == aStartOffset) || (j == aEndOffset - 1)) {
+      rv = SerializeRangeNodes(aRange, childAsNode, aDepth + 1);
+    } else {
+      rv = mNodeSerializer.SerializeToStringRecursive(
+          childAsNode, NodeSerializer::SerializeRoot::eYes);
+    }
+
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    childAsNode = childAsNode->GetNextSibling();
+  }
+
+  return NS_OK;
+}
+
+nsresult nsDocumentEncoder::RangeContextSerializer::SerializeRangeContextStart(
+    const nsTArray<nsINode*>& aAncestorArray) {
+  if (mDisableContextSerialize) {
+    return NS_OK;
+  }
+
+  AutoTArray<nsINode*, 8>* serializedContext = mRangeContexts.AppendElement();
+
+  int32_t i = aAncestorArray.Length(), j;
+  nsresult rv = NS_OK;
+
+  // currently only for table-related elements; see Bug 137450
+  j = mRangeNodeContext.GetImmediateContextCount(aAncestorArray);
+
+  while (i > 0) {
+    nsINode* node = aAncestorArray.ElementAt(--i);
+    if (!node) break;
+
+    // Either a general inclusion or as immediate context
+    if (mRangeNodeContext.IncludeInContext(*node) || i < j) {
+      rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
+      serializedContext->AppendElement(node);
+      if (NS_FAILED(rv)) break;
+    }
+  }
+
+  return rv;
+}
+
+nsresult nsDocumentEncoder::RangeContextSerializer::SerializeRangeContextEnd() {
+  if (mDisableContextSerialize) {
+    return NS_OK;
+  }
+
+  MOZ_RELEASE_ASSERT(!mRangeContexts.IsEmpty(),
+                     "Tried to end context without starting one.");
+  AutoTArray<nsINode*, 8>& serializedContext = mRangeContexts.LastElement();
+
+  nsresult rv = NS_OK;
+  for (nsINode* node : Reversed(serializedContext)) {
+    rv = mNodeSerializer.SerializeNodeEnd(*node);
+
+    if (NS_FAILED(rv)) break;
+  }
+
+  mRangeContexts.RemoveLastElement();
+  return rv;
+}
+
+bool nsDocumentEncoder::RangeSerializer::HasInvisibleParentAndShouldBeSkipped(
+    nsINode& aNode) const {
+  if (!(mFlags & SkipInvisibleContent)) {
+    return false;
+  }
+
+  // Check that the parent is visible if we don't a frame.
+  // IsInvisibleNodeAndShouldBeSkipped() will do it when there's a frame.
+  nsCOMPtr<nsIContent> content = nsIContent::FromNode(aNode);
+  if (content && !content->GetPrimaryFrame()) {
+    nsIContent* parent = content->GetParent();
+    return !parent || IsInvisibleNodeAndShouldBeSkipped(*parent, mFlags);
+  }
+
+  return false;
+}
+
+nsresult nsDocumentEncoder::RangeSerializer::SerializeRangeToString(
+    const nsRange* aRange) {
+  if (!aRange || aRange->Collapsed()) return NS_OK;
+
+  mClosestCommonInclusiveAncestorOfRange =
+      aRange->GetClosestCommonInclusiveAncestor();
+
+  if (!mClosestCommonInclusiveAncestorOfRange) {
+    return NS_OK;
+  }
+
+  nsINode* startContainer = aRange->GetStartContainer();
+  NS_ENSURE_TRUE(startContainer, NS_ERROR_FAILURE);
+  int32_t startOffset = aRange->StartOffset();
+
+  nsINode* endContainer = aRange->GetEndContainer();
+  NS_ENSURE_TRUE(endContainer, NS_ERROR_FAILURE);
+  int32_t endOffset = aRange->EndOffset();
+
+  mContextInfoDepth = {};
+  mCommonInclusiveAncestors.Clear();
+
+  mRangeBoundariesInclusiveAncestorsAndOffsets = {};
+  auto& inclusiveAncestorsOfStart =
+      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfStart;
+  auto& inclusiveAncestorsOffsetsOfStart =
+      mRangeBoundariesInclusiveAncestorsAndOffsets
+          .mInclusiveAncestorsOffsetsOfStart;
+  auto& inclusiveAncestorsOfEnd =
+      mRangeBoundariesInclusiveAncestorsAndOffsets.mInclusiveAncestorsOfEnd;
+  auto& inclusiveAncestorsOffsetsOfEnd =
+      mRangeBoundariesInclusiveAncestorsAndOffsets
+          .mInclusiveAncestorsOffsetsOfEnd;
+
+  nsContentUtils::GetInclusiveAncestors(mClosestCommonInclusiveAncestorOfRange,
+                                        mCommonInclusiveAncestors);
+  nsContentUtils::GetInclusiveAncestorsAndOffsets(
+      startContainer, startOffset, &inclusiveAncestorsOfStart,
+      &inclusiveAncestorsOffsetsOfStart);
+  nsContentUtils::GetInclusiveAncestorsAndOffsets(
+      endContainer, endOffset, &inclusiveAncestorsOfEnd,
+      &inclusiveAncestorsOffsetsOfEnd);
+
+  nsCOMPtr<nsIContent> commonContent =
+      nsIContent::FromNodeOrNull(mClosestCommonInclusiveAncestorOfRange);
+  mStartRootIndex = inclusiveAncestorsOfStart.IndexOf(commonContent);
+  mEndRootIndex = inclusiveAncestorsOfEnd.IndexOf(commonContent);
+
+  nsresult rv = NS_OK;
+
+  rv = mRangeContextSerializer.SerializeRangeContextStart(
+      mCommonInclusiveAncestors);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (startContainer == endContainer && IsTextNode(startContainer)) {
+    if (HasInvisibleParentAndShouldBeSkipped(*startContainer)) {
+      return NS_OK;
+    }
+    rv = mNodeSerializer.SerializeTextNode(*startContainer, startOffset,
+                                           endOffset);
+    NS_ENSURE_SUCCESS(rv, rv);
+  } else {
+    rv = SerializeRangeNodes(aRange, mClosestCommonInclusiveAncestorOfRange, 0);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  rv = mRangeContextSerializer.SerializeRangeContextEnd();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return rv;
+}
+
+void nsDocumentEncoder::ReleaseDocumentReferenceAndInitialize(
+    bool aClearCachedSerializer) {
+  mDocument = nullptr;
+
+  Initialize(aClearCachedSerializer);
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::EncodeToString(nsAString& aOutputString) {
+  return EncodeToStringWithMaxLength(0, aOutputString);
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
+                                               nsAString& aOutputString) {
+  MOZ_ASSERT(mRangeContextSerializer.mRangeContexts.IsEmpty(),
+             "Re-entrant call to nsDocumentEncoder.");
+  auto rangeContextGuard =
+      MakeScopeExit([&] { mRangeContextSerializer.mRangeContexts.Clear(); });
+
+  if (!mDocument) return NS_ERROR_NOT_INITIALIZED;
+
+  AutoReleaseDocumentIfNeeded autoReleaseDocument(this);
+
+  aOutputString.Truncate();
+
+  nsString output;
+  static const size_t kStringBufferSizeInBytes = 2048;
+  if (!mCachedBuffer) {
+    mCachedBuffer = nsStringBuffer::Alloc(kStringBufferSizeInBytes).take();
+    if (NS_WARN_IF(!mCachedBuffer)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+  NS_ASSERTION(
+      !mCachedBuffer->IsReadonly(),
+      "nsIDocumentEncoder shouldn't keep reference to non-readonly buffer!");
+  static_cast<char16_t*>(mCachedBuffer->Data())[0] = char16_t(0);
+  mCachedBuffer->ToString(0, output, true);
+  // output owns the buffer now!
+  mCachedBuffer = nullptr;
+
+  if (!mSerializer) {
+    nsAutoCString progId(NS_CONTENTSERIALIZER_CONTRACTID_PREFIX);
+    AppendUTF16toUTF8(mMimeType, progId);
+
+    mSerializer = do_CreateInstance(progId.get());
+    NS_ENSURE_TRUE(mSerializer, NS_ERROR_NOT_IMPLEMENTED);
+  }
+
+  nsresult rv = NS_OK;
+
+  bool rewriteEncodingDeclaration =
+      !mEncodingScope.IsLimited() &&
+      !(mFlags & OutputDontRewriteEncodingDeclaration);
+  mSerializer->Init(mFlags, mWrapColumn, mEncoding, mIsCopying,
+                    rewriteEncodingDeclaration, &mNeedsPreformatScanning,
+                    output);
+
+  rv = SerializeDependingOnScope(aMaxLength);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mSerializer->FlushAndFinish();
+
+  mCachedBuffer = nsStringBuffer::FromString(output);
+  // We have to be careful how we set aOutputString, because we don't
+  // want it to end up sharing mCachedBuffer if we plan to reuse it.
+  bool setOutput = false;
+  // Try to cache the buffer.
+  if (mCachedBuffer) {
+    if ((mCachedBuffer->StorageSize() == kStringBufferSizeInBytes) &&
+        !mCachedBuffer->IsReadonly()) {
+      mCachedBuffer->AddRef();
+    } else {
+      if (NS_SUCCEEDED(rv)) {
+        mCachedBuffer->ToString(output.Length(), aOutputString);
+        setOutput = true;
+      }
+      mCachedBuffer = nullptr;
+    }
+  }
+
+  if (!setOutput && NS_SUCCEEDED(rv)) {
+    aOutputString.Append(output.get(), output.Length());
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::EncodeToStream(nsIOutputStream* aStream) {
+  MOZ_ASSERT(mRangeContextSerializer.mRangeContexts.IsEmpty(),
+             "Re-entrant call to nsDocumentEncoder.");
+  auto rangeContextGuard =
+      MakeScopeExit([&] { mRangeContextSerializer.mRangeContexts.Clear(); });
+  NS_ENSURE_ARG_POINTER(aStream);
+
+  nsresult rv = NS_OK;
+
+  if (!mDocument) return NS_ERROR_NOT_INITIALIZED;
+
+  if (!mEncoding) {
+    return NS_ERROR_UCONV_NOCONV;
+  }
+
+  nsAutoString buf;
+  const bool isPlainText = mMimeType.LowerCaseEqualsLiteral(kTextMime);
+  mTextStreamer.emplace(*aStream, mEncoding->NewEncoder(), isPlainText, buf);
+
+  rv = EncodeToString(buf);
+
+  // Force a flush of the last chunk of data.
+  rv = mTextStreamer->ForceFlush();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mTextStreamer.reset();
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::EncodeToStringWithContext(nsAString& aContextString,
+                                             nsAString& aInfoString,
+                                             nsAString& aEncodedString) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::SetNodeFixup(nsIDocumentEncoderNodeFixup* aFixup) {
+  mNodeFixup = aFixup;
+  return NS_OK;
+}
+
+bool do_getDocumentTypeSupportedForEncoding(const char* aContentType) {
+  if (!nsCRT::strcmp(aContentType, "text/xml") ||
+      !nsCRT::strcmp(aContentType, "application/xml") ||
+      !nsCRT::strcmp(aContentType, "application/xhtml+xml") ||
+      !nsCRT::strcmp(aContentType, "image/svg+xml") ||
+      !nsCRT::strcmp(aContentType, "text/html") ||
+      !nsCRT::strcmp(aContentType, "text/plain")) {
+    return true;
+  }
+  return false;
+}
+
+already_AddRefed<nsIDocumentEncoder> do_createDocumentEncoder(
+    const char* aContentType) {
+  if (do_getDocumentTypeSupportedForEncoding(aContentType)) {
+    return do_AddRef(new nsDocumentEncoder);
+  }
+  return nullptr;
+}
+
+class nsHTMLCopyEncoder : public nsDocumentEncoder {
+ private:
+  class RangeNodeContext final : public nsDocumentEncoder::RangeNodeContext {
+    bool IncludeInContext(nsINode& aNode) const final;
+
+    int32_t GetImmediateContextCount(
+        const nsTArray<nsINode*>& aAncestorArray) const final;
+  };
+
+ public:
+  nsHTMLCopyEncoder();
+  ~nsHTMLCopyEncoder();
+
+  NS_IMETHOD Init(Document* aDocument, const nsAString& aMimeType,
+                  uint32_t aFlags) override;
+
+  // overridden methods from nsDocumentEncoder
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY
+  NS_IMETHOD SetSelection(Selection* aSelection) override;
+  NS_IMETHOD EncodeToStringWithContext(nsAString& aContextString,
+                                       nsAString& aInfoString,
+                                       nsAString& aEncodedString) override;
+  NS_IMETHOD EncodeToString(nsAString& aOutputString) override;
+
+ protected:
+  enum Endpoint { kStart, kEnd };
+
+  nsresult PromoteRange(nsRange* inRange);
+  nsresult PromoteAncestorChain(nsCOMPtr<nsINode>* ioNode,
+                                int32_t* ioStartOffset, int32_t* ioEndOffset);
+  nsresult GetPromotedPoint(Endpoint aWhere, nsINode* aNode, int32_t aOffset,
+                            nsCOMPtr<nsINode>* outNode, int32_t* outOffset,
+                            nsINode* aCommon);
+  static nsCOMPtr<nsINode> GetChildAt(nsINode* aParent, int32_t aOffset);
+  static bool IsMozBR(Element* aNode);
+  static nsresult GetNodeLocation(nsINode* inChild,
+                                  nsCOMPtr<nsINode>* outParent,
+                                  int32_t* outOffset);
+  bool IsRoot(nsINode* aNode);
+  static bool IsFirstNode(nsINode* aNode);
+  static bool IsLastNode(nsINode* aNode);
+
+  bool mIsTextWidget;
+};
+
+nsHTMLCopyEncoder::nsHTMLCopyEncoder()
+    : nsDocumentEncoder{MakeUnique<nsHTMLCopyEncoder::RangeNodeContext>()} {
+  mIsTextWidget = false;
+}
+
+nsHTMLCopyEncoder::~nsHTMLCopyEncoder() = default;
+
+NS_IMETHODIMP
+nsHTMLCopyEncoder::Init(Document* aDocument, const nsAString& aMimeType,
+                        uint32_t aFlags) {
+  if (!aDocument) return NS_ERROR_INVALID_ARG;
+
+  mIsTextWidget = false;
+  Initialize();
+
+  mIsCopying = true;
+  mDocument = aDocument;
+
+  // Hack, hack! Traditionally, the caller passes text/unicode, which is
+  // treated as "guess text/html or text/plain" in this context. (It has a
+  // different meaning in other contexts. Sigh.) From now on, "text/plain"
+  // means forcing text/plain instead of guessing.
+  if (aMimeType.EqualsLiteral("text/plain")) {
+    mMimeType.AssignLiteral("text/plain");
+  } else {
+    mMimeType.AssignLiteral("text/html");
+  }
+
+  // Make all links absolute when copying
+  // (see related bugs #57296, #41924, #58646, #32768)
+  mFlags = aFlags | OutputAbsoluteLinks;
+
+  if (!mDocument->IsScriptEnabled()) mFlags |= OutputNoScriptContent;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLCopyEncoder::SetSelection(Selection* aSelection) {
+  // check for text widgets: we need to recognize these so that
+  // we don't tweak the selection to be outside of the magic
+  // div that ender-lite text widgets are embedded in.
+
+  if (!aSelection) return NS_ERROR_NULL_POINTER;
+
+  uint32_t rangeCount = aSelection->RangeCount();
+
+  // if selection is uninitialized return
+  if (!rangeCount) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // we'll just use the common parent of the first range.  Implicit assumption
+  // here that multi-range selections are table cell selections, in which case
+  // the common parent is somewhere in the table and we don't really care where.
+  //
+  // FIXME(emilio, bug 1455894): This assumption is already wrong, and will
+  // probably be more wrong in a Shadow DOM world...
+  //
+  // We should be able to write this as "Find the common ancestor of the
+  // selection, then go through the flattened tree and serialize the selected
+  // nodes", effectively serializing the composed tree.
+  RefPtr<nsRange> range = aSelection->GetRangeAt(0);
+  nsINode* commonParent = range->GetClosestCommonInclusiveAncestor();
+
+  for (nsCOMPtr<nsIContent> selContent(
+           nsIContent::FromNodeOrNull(commonParent));
+       selContent; selContent = selContent->GetParent()) {
+    // checking for selection inside a plaintext form widget
+    if (selContent->IsAnyOfHTMLElements(nsGkAtoms::input,
+                                        nsGkAtoms::textarea)) {
+      mIsTextWidget = true;
+      break;
+    }
+  }
+
+  // normalize selection if we are not in a widget
+  if (mIsTextWidget) {
+    mEncodingScope.mSelection = aSelection;
+    mMimeType.AssignLiteral("text/plain");
+    return NS_OK;
+  }
+
+  // XXX We should try to get rid of the Selection object here.
+  // XXX bug 1245883
+
+  // also consider ourselves in a text widget if we can't find an html document
+  if (!(mDocument && mDocument->IsHTMLDocument())) {
+    mIsTextWidget = true;
+    mEncodingScope.mSelection = aSelection;
+    // mMimeType is set to text/plain when encoding starts.
+    return NS_OK;
+  }
+
+  // there's no Clone() for selection! fix...
+  // nsresult rv = aSelection->Clone(getter_AddRefs(mSelection);
+  // NS_ENSURE_SUCCESS(rv, rv);
+  mEncodingScope.mSelection = new Selection(SelectionType::eNormal, nullptr);
+
+  // loop thru the ranges in the selection
+  for (uint32_t rangeIdx = 0; rangeIdx < rangeCount; ++rangeIdx) {
+    range = aSelection->GetRangeAt(rangeIdx);
+    NS_ENSURE_TRUE(range, NS_ERROR_FAILURE);
+    RefPtr<nsRange> myRange = range->CloneRange();
+    MOZ_ASSERT(myRange);
+
+    // adjust range to include any ancestors who's children are entirely
+    // selected
+    nsresult rv = PromoteRange(myRange);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    ErrorResult result;
+    RefPtr<Selection> selection(mEncodingScope.mSelection);
+    RefPtr<Document> document(mDocument);
+    selection->AddRangeAndSelectFramesAndNotifyListeners(*myRange, document,
+                                                         result);
+    rv = result.StealNSResult();
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLCopyEncoder::EncodeToString(nsAString& aOutputString) {
+  if (mIsTextWidget) {
+    mMimeType.AssignLiteral("text/plain");
+  }
+  return nsDocumentEncoder::EncodeToString(aOutputString);
+}
+
+NS_IMETHODIMP
+nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString,
+                                             nsAString& aInfoString,
+                                             nsAString& aEncodedString) {
+  nsresult rv = EncodeToString(aEncodedString);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // do not encode any context info or range hints if we are in a text widget.
+  if (mIsTextWidget) return NS_OK;
+
+  // now encode common ancestors into aContextString.  Note that the common
+  // ancestors will be for the last range in the selection in the case of
+  // multirange selections. encoding ancestors every range in a multirange
+  // selection in a way that could be understood by the paste code would be a
+  // lot more work to do.  As a practical matter, selections are single range,
+  // and the ones that aren't are table cell selections where all the cells are
+  // in the same table.
+
+  mSerializer->Init(mFlags, mWrapColumn, mEncoding, mIsCopying, false,
+                    &mNeedsPreformatScanning, aContextString);
+
+  // leaf of ancestors might be text node.  If so discard it.
+  int32_t count = mRangeSerializer.mCommonInclusiveAncestors.Length();
+  int32_t i;
+  nsCOMPtr<nsINode> node;
+  if (count > 0) {
+    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(0);
+  }
+
+  if (node && IsTextNode(node)) {
+    mRangeSerializer.mCommonInclusiveAncestors.RemoveElementAt(0);
+    if (mRangeSerializer.mContextInfoDepth.mStart) {
+      --mRangeSerializer.mContextInfoDepth.mStart;
+    }
+    if (mRangeSerializer.mContextInfoDepth.mEnd) {
+      --mRangeSerializer.mContextInfoDepth.mEnd;
+    }
+    count--;
+  }
+
+  i = count;
+  while (i > 0) {
+    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(--i);
+    rv = mNodeSerializer.SerializeNodeStart(*node, 0, -1);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  // i = 0; guaranteed by above
+  while (i < count) {
+    node = mRangeSerializer.mCommonInclusiveAncestors.ElementAt(i++);
+    rv = mNodeSerializer.SerializeNodeEnd(*node);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  mSerializer->Finish();
+
+  // encode range info : the start and end depth of the selection, where the
+  // depth is distance down in the parent hierarchy.  Later we will need to add
+  // leading/trailing whitespace info to this.
+  nsAutoString infoString;
+  infoString.AppendInt(mRangeSerializer.mContextInfoDepth.mStart);
+  infoString.Append(char16_t(','));
+  infoString.AppendInt(mRangeSerializer.mContextInfoDepth.mEnd);
+  aInfoString = infoString;
+
+  return rv;
+}
+
+bool nsHTMLCopyEncoder::RangeNodeContext::IncludeInContext(
+    nsINode& aNode) const {
+  nsCOMPtr<nsIContent> content(nsIContent::FromNodeOrNull(&aNode));
+
+  if (!content) return false;
+
+  return content->IsAnyOfHTMLElements(
+      nsGkAtoms::b, nsGkAtoms::i, nsGkAtoms::u, nsGkAtoms::a, nsGkAtoms::tt,
+      nsGkAtoms::s, nsGkAtoms::big, nsGkAtoms::small, nsGkAtoms::strike,
+      nsGkAtoms::em, nsGkAtoms::strong, nsGkAtoms::dfn, nsGkAtoms::code,
+      nsGkAtoms::cite, nsGkAtoms::var, nsGkAtoms::abbr, nsGkAtoms::font,
+      nsGkAtoms::script, nsGkAtoms::span, nsGkAtoms::pre, nsGkAtoms::h1,
+      nsGkAtoms::h2, nsGkAtoms::h3, nsGkAtoms::h4, nsGkAtoms::h5,
+      nsGkAtoms::h6);
+}
+
+nsresult nsHTMLCopyEncoder::PromoteRange(nsRange* inRange) {
+  if (!inRange->IsPositioned()) {
+    return NS_ERROR_UNEXPECTED;
+  }
+  nsCOMPtr<nsINode> startNode = inRange->GetStartContainer();
+  uint32_t startOffset = inRange->StartOffset();
+  nsCOMPtr<nsINode> endNode = inRange->GetEndContainer();
+  uint32_t endOffset = inRange->EndOffset();
+  nsCOMPtr<nsINode> common = inRange->GetClosestCommonInclusiveAncestor();
+
+  nsCOMPtr<nsINode> opStartNode;
+  nsCOMPtr<nsINode> opEndNode;
+  int32_t opStartOffset, opEndOffset;
+
+  // examine range endpoints.
+  nsresult rv =
+      GetPromotedPoint(kStart, startNode, static_cast<int32_t>(startOffset),
+                       address_of(opStartNode), &opStartOffset, common);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = GetPromotedPoint(kEnd, endNode, static_cast<int32_t>(endOffset),
+                        address_of(opEndNode), &opEndOffset, common);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // if both range endpoints are at the common ancestor, check for possible
+  // inclusion of ancestors
+  if (opStartNode == common && opEndNode == common) {
+    rv = PromoteAncestorChain(address_of(opStartNode), &opStartOffset,
+                              &opEndOffset);
+    NS_ENSURE_SUCCESS(rv, rv);
+    opEndNode = opStartNode;
+  }
+
+  // set the range to the new values
+  ErrorResult err;
+  inRange->SetStart(*opStartNode, static_cast<uint32_t>(opStartOffset), err);
+  if (NS_WARN_IF(err.Failed())) {
+    return err.StealNSResult();
+  }
+  inRange->SetEnd(*opEndNode, static_cast<uint32_t>(opEndOffset), err);
+  if (NS_WARN_IF(err.Failed())) {
+    return err.StealNSResult();
+  }
+  return NS_OK;
+}
+
+// PromoteAncestorChain will promote a range represented by
+// [{*ioNode,*ioStartOffset} , {*ioNode,*ioEndOffset}] The promotion is
+// different from that found in getPromotedPoint: it will only promote one
+// endpoint if it can promote the other.  Thus, instead of having a
+// startnode/endNode, there is just the one ioNode.
+nsresult nsHTMLCopyEncoder::PromoteAncestorChain(nsCOMPtr<nsINode>* ioNode,
+                                                 int32_t* ioStartOffset,
+                                                 int32_t* ioEndOffset) {
+  if (!ioNode || !ioStartOffset || !ioEndOffset) return NS_ERROR_NULL_POINTER;
+
+  nsresult rv = NS_OK;
+  bool done = false;
+
+  nsCOMPtr<nsINode> frontNode, endNode, parent;
+  int32_t frontOffset, endOffset;
+
+  // save the editable state of the ioNode, so we don't promote an ancestor if
+  // it has different editable state
+  nsCOMPtr<nsINode> node = *ioNode;
+  bool isEditable = node->IsEditable();
+
+  // loop for as long as we can promote both endpoints
+  while (!done) {
+    node = *ioNode;
+    parent = node->GetParentNode();
+    if (!parent) {
+      done = true;
+    } else {
+      // passing parent as last param to GetPromotedPoint() allows it to promote
+      // only one level up the hierarchy.
+      rv = GetPromotedPoint(kStart, *ioNode, *ioStartOffset,
+                            address_of(frontNode), &frontOffset, parent);
+      NS_ENSURE_SUCCESS(rv, rv);
+      // then we make the same attempt with the endpoint
+      rv = GetPromotedPoint(kEnd, *ioNode, *ioEndOffset, address_of(endNode),
+                            &endOffset, parent);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      // if both endpoints were promoted one level and isEditable is the same as
+      // the original node, keep looping - otherwise we are done.
+      if ((frontNode != parent) || (endNode != parent) ||
+          (frontNode->IsEditable() != isEditable))
+        done = true;
+      else {
+        *ioNode = frontNode;
+        *ioStartOffset = frontOffset;
+        *ioEndOffset = endOffset;
+      }
+    }
+  }
+  return rv;
+}
+
+nsresult nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsINode* aNode,
+                                             int32_t aOffset,
+                                             nsCOMPtr<nsINode>* outNode,
+                                             int32_t* outOffset,
+                                             nsINode* common) {
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsINode> node = aNode;
+  nsCOMPtr<nsINode> parent = aNode;
+  int32_t offset = aOffset;
+  bool bResetPromotion = false;
+
+  // default values
+  *outNode = node;
+  *outOffset = offset;
+
+  if (common == node) return NS_OK;
+
+  if (aWhere == kStart) {
+    // some special casing for text nodes
+    if (auto nodeAsText = aNode->GetAsText()) {
+      // if not at beginning of text node, we are done
+      if (offset > 0) {
+        // unless everything before us in just whitespace.  NOTE: we need a more
+        // general solution that truly detects all cases of non-significant
+        // whitesace with no false alarms.
+        nsAutoString text;
+        nodeAsText->SubstringData(0, offset, text, IgnoreErrors());
+        text.CompressWhitespace();
+        if (!text.IsEmpty()) return NS_OK;
+        bResetPromotion = true;
+      }
+      // else
+      rv = GetNodeLocation(aNode, address_of(parent), &offset);
+      NS_ENSURE_SUCCESS(rv, rv);
+    } else {
+      node = GetChildAt(parent, offset);
+    }
+    if (!node) node = parent;
+
+    // finding the real start for this point.  look up the tree for as long as
+    // we are the first node in the container, and as long as we haven't hit the
+    // body node.
+    if (!IsRoot(node) && (parent != common)) {
+      rv = GetNodeLocation(node, address_of(parent), &offset);
+      NS_ENSURE_SUCCESS(rv, rv);
+      if (offset == -1) return NS_OK;  // we hit generated content; STOP
+      while ((IsFirstNode(node)) && (!IsRoot(parent)) && (parent != common)) {
+        if (bResetPromotion) {
+          nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(parent);
+          if (content && content->IsHTMLElement()) {
+            if (nsHTMLElement::IsBlock(
+                    nsHTMLTags::AtomTagToId(content->NodeInfo()->NameAtom()))) {
+              bResetPromotion = false;
+            }
+          }
+        }
+
+        node = parent;
+        rv = GetNodeLocation(node, address_of(parent), &offset);
+        NS_ENSURE_SUCCESS(rv, rv);
+        if (offset == -1)  // we hit generated content; STOP
+        {
+          // back up a bit
+          parent = node;
+          offset = 0;
+          break;
+        }
+      }
+      if (bResetPromotion) {
+        *outNode = aNode;
+        *outOffset = aOffset;
+      } else {
+        *outNode = parent;
+        *outOffset = offset;
+      }
+      return rv;
+    }
+  }
+
+  if (aWhere == kEnd) {
+    // some special casing for text nodes
+    if (auto nodeAsText = aNode->GetAsText()) {
+      // if not at end of text node, we are done
+      uint32_t len = aNode->Length();
+      if (offset < (int32_t)len) {
+        // unless everything after us in just whitespace.  NOTE: we need a more
+        // general solution that truly detects all cases of non-significant
+        // whitespace with no false alarms.
+        nsAutoString text;
+        nodeAsText->SubstringData(offset, len - offset, text, IgnoreErrors());
+        text.CompressWhitespace();
+        if (!text.IsEmpty()) return NS_OK;
+        bResetPromotion = true;
+      }
+      rv = GetNodeLocation(aNode, address_of(parent), &offset);
+      NS_ENSURE_SUCCESS(rv, rv);
+    } else {
+      if (offset) offset--;  // we want node _before_ offset
+      node = GetChildAt(parent, offset);
+    }
+    if (!node) node = parent;
+
+    // finding the real end for this point.  look up the tree for as long as we
+    // are the last node in the container, and as long as we haven't hit the
+    // body node.
+    if (!IsRoot(node) && (parent != common)) {
+      rv = GetNodeLocation(node, address_of(parent), &offset);
+      NS_ENSURE_SUCCESS(rv, rv);
+      if (offset == -1) return NS_OK;  // we hit generated content; STOP
+      while ((IsLastNode(node)) && (!IsRoot(parent)) && (parent != common)) {
+        if (bResetPromotion) {
+          nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(parent);
+          if (content && content->IsHTMLElement()) {
+            if (nsHTMLElement::IsBlock(
+                    nsHTMLTags::AtomTagToId(content->NodeInfo()->NameAtom()))) {
+              bResetPromotion = false;
+            }
+          }
+        }
+
+        node = parent;
+        rv = GetNodeLocation(node, address_of(parent), &offset);
+        NS_ENSURE_SUCCESS(rv, rv);
+        if (offset == -1)  // we hit generated content; STOP
+        {
+          // back up a bit
+          parent = node;
+          offset = 0;
+          break;
+        }
+      }
+      if (bResetPromotion) {
+        *outNode = aNode;
+        *outOffset = aOffset;
+      } else {
+        *outNode = parent;
+        offset++;  // add one since this in an endpoint - want to be AFTER node.
+        *outOffset = offset;
+      }
+      return rv;
+    }
+  }
+
+  return rv;
+}
+
+nsCOMPtr<nsINode> nsHTMLCopyEncoder::GetChildAt(nsINode* aParent,
+                                                int32_t aOffset) {
+  nsCOMPtr<nsINode> resultNode;
+
+  if (!aParent) return resultNode;
+
+  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aParent);
+  MOZ_ASSERT(content, "null content in nsHTMLCopyEncoder::GetChildAt");
+
+  resultNode = content->GetChildAt_Deprecated(aOffset);
+
+  return resultNode;
+}
+
+bool nsHTMLCopyEncoder::IsMozBR(Element* aElement) {
+  HTMLBRElement* brElement = HTMLBRElement::FromNodeOrNull(aElement);
+  return brElement && brElement->IsPaddingForEmptyLastLine();
+}
+
+nsresult nsHTMLCopyEncoder::GetNodeLocation(nsINode* inChild,
+                                            nsCOMPtr<nsINode>* outParent,
+                                            int32_t* outOffset) {
+  NS_ASSERTION((inChild && outParent && outOffset), "bad args");
+  if (inChild && outParent && outOffset) {
+    nsCOMPtr<nsIContent> child = nsIContent::FromNodeOrNull(inChild);
+    if (!child) {
+      return NS_ERROR_NULL_POINTER;
+    }
+
+    nsIContent* parent = child->GetParent();
+    if (!parent) {
+      return NS_ERROR_NULL_POINTER;
+    }
+
+    *outParent = parent;
+    *outOffset = parent->ComputeIndexOf(child);
+    return NS_OK;
+  }
+  return NS_ERROR_NULL_POINTER;
+}
+
+bool nsHTMLCopyEncoder::IsRoot(nsINode* aNode) {
+  nsCOMPtr<nsIContent> content = nsIContent::FromNodeOrNull(aNode);
+  if (!content) {
+    return false;
+  }
+
+  if (mIsTextWidget) {
+    return content->IsHTMLElement(nsGkAtoms::div);
+  }
+
+  return content->IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::td,
+                                      nsGkAtoms::th);
+}
+
+bool nsHTMLCopyEncoder::IsFirstNode(nsINode* aNode) {
+  // need to check if any nodes before us are really visible.
+  // Mike wrote something for me along these lines in nsSelectionController,
+  // but I don't think it's ready for use yet - revisit.
+  // HACK: for now, simply consider all whitespace text nodes to be
+  // invisible formatting nodes.
+  for (nsIContent* sibling = aNode->GetPreviousSibling(); sibling;
+       sibling = sibling->GetPreviousSibling()) {
+    if (!sibling->TextIsOnlyWhitespace()) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool nsHTMLCopyEncoder::IsLastNode(nsINode* aNode) {
+  // need to check if any nodes after us are really visible.
+  // Mike wrote something for me along these lines in nsSelectionController,
+  // but I don't think it's ready for use yet - revisit.
+  // HACK: for now, simply consider all whitespace text nodes to be
+  // invisible formatting nodes.
+  for (nsIContent* sibling = aNode->GetNextSibling(); sibling;
+       sibling = sibling->GetNextSibling()) {
+    if (sibling->IsElement() && IsMozBR(sibling->AsElement())) {
+      // we ignore trailing moz BRs.
+      continue;
+    }
+    if (!sibling->TextIsOnlyWhitespace()) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+already_AddRefed<nsIDocumentEncoder> do_createHTMLCopyEncoder() {
+  return do_AddRef(new nsHTMLCopyEncoder);
+}
+
+int32_t nsHTMLCopyEncoder::RangeNodeContext::GetImmediateContextCount(
+    const nsTArray<nsINode*>& aAncestorArray) const {
+  int32_t i = aAncestorArray.Length(), j = 0;
+  while (j < i) {
+    nsINode* node = aAncestorArray.ElementAt(j);
+    if (!node) {
+      break;
+    }
+    nsCOMPtr<nsIContent> content(nsIContent::FromNodeOrNull(node));
+    if (!content || !content->IsAnyOfHTMLElements(
+                        nsGkAtoms::tr, nsGkAtoms::thead, nsGkAtoms::tbody,
+                        nsGkAtoms::tfoot, nsGkAtoms::table)) {
+      break;
+    }
+    ++j;
+  }
+  return j;
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsDOMSerializer.cpp firefox-85.0+build1/dom/serializers/nsDOMSerializer.cpp
--- firefox-84.0.2+build1/dom/serializers/nsDOMSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsDOMSerializer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,112 @@
+/* -*- 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 "nsDOMSerializer.h"
+
+#include "mozilla/Encoding.h"
+#include "mozilla/dom/Document.h"
+#include "nsIDocumentEncoder.h"
+#include "nsComponentManagerUtils.h"
+#include "nsContentCID.h"
+#include "nsContentUtils.h"
+#include "nsError.h"
+#include "nsINode.h"
+
+using namespace mozilla;
+
+nsDOMSerializer::nsDOMSerializer() = default;
+
+static already_AddRefed<nsIDocumentEncoder> SetUpEncoder(
+    nsINode& aRoot, const nsAString& aCharset, ErrorResult& aRv) {
+  nsCOMPtr<nsIDocumentEncoder> encoder =
+      do_createDocumentEncoder("application/xhtml+xml");
+  if (!encoder) {
+    aRv.Throw(NS_ERROR_FAILURE);
+    return nullptr;
+  }
+
+  dom::Document* doc = aRoot.OwnerDoc();
+  bool entireDocument = (doc == &aRoot);
+
+  // This method will fail if no document
+  nsresult rv = encoder->NativeInit(
+      doc, u"application/xhtml+xml"_ns,
+      nsIDocumentEncoder::OutputRaw |
+          nsIDocumentEncoder::OutputDontRewriteEncodingDeclaration);
+
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+
+  NS_ConvertUTF16toUTF8 charset(aCharset);
+  if (charset.IsEmpty()) {
+    doc->GetDocumentCharacterSet()->Name(charset);
+  }
+  rv = encoder->SetCharset(charset);
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+
+  // If we are working on the entire document we do not need to
+  // specify which part to serialize
+  if (!entireDocument) {
+    rv = encoder->SetNode(&aRoot);
+  }
+
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+    return nullptr;
+  }
+
+  return encoder.forget();
+}
+
+void nsDOMSerializer::SerializeToString(nsINode& aRoot, nsAString& aStr,
+                                        ErrorResult& aRv) {
+  aStr.Truncate();
+
+  if (!nsContentUtils::CanCallerAccess(&aRoot)) {
+    aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
+    return;
+  }
+
+  nsCOMPtr<nsIDocumentEncoder> encoder = SetUpEncoder(aRoot, u""_ns, aRv);
+  if (aRv.Failed()) {
+    return;
+  }
+
+  nsresult rv = encoder->EncodeToString(aStr);
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+  }
+}
+
+void nsDOMSerializer::SerializeToStream(nsINode& aRoot,
+                                        nsIOutputStream* aStream,
+                                        const nsAString& aCharset,
+                                        ErrorResult& aRv) {
+  if (NS_WARN_IF(!aStream)) {
+    aRv.Throw(NS_ERROR_INVALID_ARG);
+    return;
+  }
+
+  // The charset arg can be empty, in which case we get the document's
+  // charset and use that when serializing.
+
+  // No point doing a CanCallerAccess check, because we can only be
+  // called by system JS or C++.
+  nsCOMPtr<nsIDocumentEncoder> encoder = SetUpEncoder(aRoot, aCharset, aRv);
+  if (aRv.Failed()) {
+    return;
+  }
+
+  nsresult rv = encoder->EncodeToStream(aStream);
+  if (NS_FAILED(rv)) {
+    aRv.Throw(rv);
+  }
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsDOMSerializer.h firefox-85.0+build1/dom/serializers/nsDOMSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsDOMSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsDOMSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,43 @@
+/* -*- 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 nsDOMSerializer_h_
+#define nsDOMSerializer_h_
+
+#include "mozilla/dom/NonRefcountedDOMObject.h"
+#include "mozilla/dom/XMLSerializerBinding.h"
+
+class nsINode;
+class nsIOutputStream;
+
+namespace mozilla {
+class ErrorResult;
+}
+
+class nsDOMSerializer final : public mozilla::dom::NonRefcountedDOMObject {
+ public:
+  nsDOMSerializer();
+
+  // WebIDL API
+  static nsDOMSerializer* Constructor(
+      const mozilla::dom::GlobalObject& aOwner) {
+    return new nsDOMSerializer();
+  }
+
+  void SerializeToString(nsINode& aRoot, nsAString& aStr,
+                         mozilla::ErrorResult& rv);
+
+  void SerializeToStream(nsINode& aRoot, nsIOutputStream* aStream,
+                         const nsAString& aCharset, mozilla::ErrorResult& aRv);
+
+  bool WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto,
+                  JS::MutableHandle<JSObject*> aReflector) {
+    return mozilla::dom::XMLSerializer_Binding::Wrap(aCx, this, aGivenProto,
+                                                     aReflector);
+  }
+};
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/serializers/nsHTMLContentSerializer.cpp firefox-85.0+build1/dom/serializers/nsHTMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/serializers/nsHTMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsHTMLContentSerializer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,441 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an HTML (not XHTML!) DOM to an HTML
+ * string that could be parsed into more or less the original DOM.
+ */
+
+#include "nsHTMLContentSerializer.h"
+
+#include "nsIContent.h"
+#include "mozilla/dom/Document.h"
+#include "nsElementTable.h"
+#include "nsNameSpaceManager.h"
+#include "nsString.h"
+#include "nsUnicharUtils.h"
+#include "nsIDocumentEncoder.h"
+#include "nsGkAtoms.h"
+#include "nsIURI.h"
+#include "nsNetUtil.h"
+#include "nsEscape.h"
+#include "nsCRT.h"
+#include "nsContentUtils.h"
+#include "nsIScriptElement.h"
+#include "nsAttrName.h"
+#include "mozilla/dom/Element.h"
+#include "nsParserConstants.h"
+
+using namespace mozilla::dom;
+
+nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer) {
+  RefPtr<nsHTMLContentSerializer> it = new nsHTMLContentSerializer();
+  it.forget(aSerializer);
+  return NS_OK;
+}
+
+nsHTMLContentSerializer::nsHTMLContentSerializer() { mIsHTMLSerializer = true; }
+
+nsHTMLContentSerializer::~nsHTMLContentSerializer() = default;
+
+NS_IMETHODIMP
+nsHTMLContentSerializer::AppendDocumentStart(Document* aDocument) {
+  return NS_OK;
+}
+
+bool nsHTMLContentSerializer::SerializeHTMLAttributes(
+    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
+    const nsAString& aTagNamespaceURI, nsAtom* aTagName, int32_t aNamespace,
+    nsAString& aStr) {
+  MaybeSerializeIsValue(aElement, aStr);
+
+  int32_t count = aElement->GetAttrCount();
+  if (!count) return true;
+
+  nsresult rv;
+  nsAutoString valueStr;
+
+  for (int32_t index = 0; index < count; index++) {
+    const nsAttrName* name = aElement->GetAttrNameAt(index);
+    int32_t namespaceID = name->NamespaceID();
+    nsAtom* attrName = name->LocalName();
+
+    // Filter out any attribute starting with [-|_]moz
+    nsDependentAtomString attrNameStr(attrName);
+    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
+        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
+      continue;
+    }
+    aElement->GetAttr(namespaceID, attrName, valueStr);
+
+    if (mIsCopying && mIsFirstChildOfOL && aTagName == nsGkAtoms::li &&
+        aNamespace == kNameSpaceID_XHTML && attrName == nsGkAtoms::value &&
+        namespaceID == kNameSpaceID_None) {
+      // This is handled separately in SerializeLIValueAttribute()
+      continue;
+    }
+    bool isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
+
+    if (((attrName == nsGkAtoms::href && (namespaceID == kNameSpaceID_None ||
+                                          namespaceID == kNameSpaceID_XLink)) ||
+         (attrName == nsGkAtoms::src && namespaceID == kNameSpaceID_None))) {
+      // Make all links absolute when converting only the selection:
+      if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
+        // Would be nice to handle OBJECT tags, but that gets more complicated
+        // since we have to search the tag list for CODEBASE as well. For now,
+        // just leave them relative.
+        nsIURI* uri = aElement->GetBaseURI();
+        if (uri) {
+          nsAutoString absURI;
+          rv = NS_MakeAbsoluteURI(absURI, valueStr, uri);
+          if (NS_SUCCEEDED(rv)) {
+            valueStr = absURI;
+          }
+        }
+      }
+    }
+
+    if (mRewriteEncodingDeclaration && aTagName == nsGkAtoms::meta &&
+        aNamespace == kNameSpaceID_XHTML && attrName == nsGkAtoms::content &&
+        namespaceID == kNameSpaceID_None) {
+      // If we're serializing a <meta http-equiv="content-type">,
+      // use the proper value, rather than what's in the document.
+      nsAutoString header;
+      aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv, header);
+      if (header.LowerCaseEqualsLiteral("content-type")) {
+        valueStr = u"text/html; charset="_ns + NS_ConvertASCIItoUTF16(mCharset);
+      }
+    }
+
+    nsDependentAtomString nameStr(attrName);
+    nsAutoString prefix;
+    if (namespaceID == kNameSpaceID_XML) {
+      prefix.AssignLiteral(u"xml");
+    } else if (namespaceID == kNameSpaceID_XLink) {
+      prefix.AssignLiteral(u"xlink");
+    }
+
+    // Expand shorthand attribute.
+    if (aNamespace == kNameSpaceID_XHTML && namespaceID == kNameSpaceID_None &&
+        IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) {
+      valueStr = nameStr;
+    }
+    NS_ENSURE_TRUE(SerializeAttr(prefix, nameStr, valueStr, aStr, !isJS),
+                   false);
+  }
+
+  return true;
+}
+
+NS_IMETHODIMP
+nsHTMLContentSerializer::AppendElementStart(Element* aElement,
+                                            Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+  NS_ENSURE_STATE(mOutput);
+
+  bool forceFormat = false;
+  nsresult rv = NS_OK;
+  if (!CheckElementStart(aElement, forceFormat, *mOutput, rv)) {
+    // When we go to AppendElementEnd for this element, we're going to
+    // MaybeLeaveFromPreContent().  So make sure to MaybeEnterInPreContent()
+    // now, so our PreLevel() doesn't get confused.
+    MaybeEnterInPreContent(aElement);
+    return rv;
+  }
+
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAtom* name = aElement->NodeInfo()->NameAtom();
+  int32_t ns = aElement->GetNameSpaceID();
+
+  bool lineBreakBeforeOpen = LineBreakBeforeOpen(ns, name);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    if (mColPos && lineBreakBeforeOpen) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else {
+      NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+    if (!mColPos) {
+      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else if (mAddSpace) {
+      bool result = AppendToString(char16_t(' '), *mOutput);
+      mAddSpace = false;
+      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+    }
+  } else if (mAddSpace) {
+    bool result = AppendToString(char16_t(' '), *mOutput);
+    mAddSpace = false;
+    NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+  // Always reset to avoid false newlines in case MaybeAddNewlineForRootNode
+  // wasn't called
+  mAddNewlineForRootNode = false;
+
+  NS_ENSURE_TRUE(AppendToString(kLessThan, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  NS_ENSURE_TRUE(AppendToString(nsDependentAtomString(name), *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  MaybeEnterInPreContent(aElement);
+
+  // for block elements, we increase the indentation
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel())
+    NS_ENSURE_TRUE(IncrIndentation(name), NS_ERROR_OUT_OF_MEMORY);
+
+  // Need to keep track of OL and LI elements in order to get ordinal number
+  // for the LI.
+  if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML) {
+    // We are copying and current node is an OL;
+    // Store its start attribute value in olState->startVal.
+    nsAutoString start;
+    int32_t startAttrVal = 0;
+
+    aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::start, start);
+    if (!start.IsEmpty()) {
+      nsresult rv = NS_OK;
+      startAttrVal = start.ToInteger(&rv);
+      // If OL has "start" attribute, first LI element has to start with that
+      // value Therefore subtracting 1 as all the LI elements are incrementing
+      // it before using it; In failure of ToInteger(), default StartAttrValue
+      // to 0.
+      if (NS_SUCCEEDED(rv))
+        startAttrVal--;
+      else
+        startAttrVal = 0;
+    }
+    mOLStateStack.AppendElement(olState(startAttrVal, true));
+  }
+
+  if (mIsCopying && name == nsGkAtoms::li && ns == kNameSpaceID_XHTML) {
+    mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement);
+    if (mIsFirstChildOfOL) {
+      // If OL is parent of this LI, serialize attributes in different manner.
+      NS_ENSURE_TRUE(SerializeLIValueAttribute(aElement, *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+  }
+
+  // Even LI passed above have to go through this
+  // for serializing attributes other than "value".
+  nsAutoString dummyPrefix;
+  NS_ENSURE_TRUE(
+      SerializeHTMLAttributes(aElement, aOriginalElement, dummyPrefix, u""_ns,
+                              name, ns, *mOutput),
+      NS_ERROR_OUT_OF_MEMORY);
+
+  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  if (ns == kNameSpaceID_XHTML &&
+      (name == nsGkAtoms::script || name == nsGkAtoms::style ||
+       name == nsGkAtoms::noscript || name == nsGkAtoms::noframes)) {
+    ++mDisableEntityEncoding;
+  }
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
+      LineBreakAfterOpen(ns, name)) {
+    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  NS_ENSURE_TRUE(AfterElementStart(aElement, aOriginalElement, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
+                                          Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+  NS_ENSURE_STATE(mOutput);
+
+  nsAtom* name = aElement->NodeInfo()->NameAtom();
+  int32_t ns = aElement->GetNameSpaceID();
+
+  if (ns == kNameSpaceID_XHTML &&
+      (name == nsGkAtoms::script || name == nsGkAtoms::style ||
+       name == nsGkAtoms::noscript || name == nsGkAtoms::noframes)) {
+    --mDisableEntityEncoding;
+  }
+
+  bool forceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
+                     aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    DecrIndentation(name);
+  }
+
+  if (name == nsGkAtoms::script) {
+    nsCOMPtr<nsIScriptElement> script = do_QueryInterface(aElement);
+
+    if (ShouldMaintainPreLevel() && script && script->IsMalformed()) {
+      // We're looking at a malformed script tag. This means that the end tag
+      // was missing in the source. Imitate that here by not serializing the end
+      // tag.
+      --PreLevel();
+      return NS_OK;
+    }
+  } else if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML) {
+    NS_ASSERTION((!mOLStateStack.IsEmpty()), "Cannot have an empty OL Stack");
+    /* Though at this point we must always have an state to be deleted as all
+    the OL opening tags are supposed to push an olState object to the stack*/
+    if (!mOLStateStack.IsEmpty()) {
+      mOLStateStack.RemoveLastElement();
+    }
+  }
+
+  if (ns == kNameSpaceID_XHTML) {
+    bool isContainer =
+        nsHTMLElement::IsContainer(nsHTMLTags::CaseSensitiveAtomTagToId(name));
+    if (!isContainer) {
+      // Keep this in sync with the cleanup at the end of this method.
+      MOZ_ASSERT(name != nsGkAtoms::body);
+      MaybeLeaveFromPreContent(aElement);
+      return NS_OK;
+    }
+  }
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    bool lineBreakBeforeClose = LineBreakBeforeClose(ns, name);
+
+    if (mColPos && lineBreakBeforeClose) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    }
+    if (!mColPos) {
+      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else if (mAddSpace) {
+      bool result = AppendToString(char16_t(' '), *mOutput);
+      mAddSpace = false;
+      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+    }
+  } else if (mAddSpace) {
+    bool result = AppendToString(char16_t(' '), *mOutput);
+    mAddSpace = false;
+    NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  NS_ENSURE_TRUE(AppendToString(kEndTag, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(AppendToString(nsDependentAtomString(name), *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  // Keep this cleanup in sync with the IsContainer() early return above.
+  MaybeLeaveFromPreContent(aElement);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
+      LineBreakAfterClose(ns, name)) {
+    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    MaybeFlagNewlineForRootNode(aElement);
+  }
+
+  if (name == nsGkAtoms::body && ns == kNameSpaceID_XHTML) {
+    --mInBody;
+  }
+
+  return NS_OK;
+}
+
+static const uint16_t kValNBSP = 160;
+
+#define _ 0
+
+// This table indexes into kEntityStrings[].
+const uint8_t nsHTMLContentSerializer::kEntities[] = {
+    // clang-format off
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, 2, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  3, _, 4, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  5
+    // clang-format on
+};
+
+// This table indexes into kEntityStrings[].
+const uint8_t nsHTMLContentSerializer::kAttrEntities[] = {
+    // clang-format off
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, 1, _, _, _, 2, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  3, _, 4, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  5
+    // clang-format on
+};
+
+#undef _
+
+const char* const nsHTMLContentSerializer::kEntityStrings[] = {
+    /* 0 */ nullptr,
+    /* 1 */ "&quot;",
+    /* 2 */ "&amp;",
+    /* 3 */ "&lt;",
+    /* 4 */ "&gt;",
+    /* 5 */ "&nbsp;"};
+
+bool nsHTMLContentSerializer::AppendAndTranslateEntities(
+    const nsAString& aStr, nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+
+  if (mDisableEntityEncoding) {
+    return aOutputStr.Append(aStr, mozilla::fallible);
+  }
+
+  if (mFlags & (nsIDocumentEncoder::OutputEncodeBasicEntities)) {
+    // Per the API documentation, encode &nbsp;, &amp;, &lt;, &gt;, and &quot;
+    if (mInAttribute) {
+      return nsXMLContentSerializer::AppendAndTranslateEntities<kValNBSP>(
+          aStr, aOutputStr, kAttrEntities, kEntityStrings);
+    }
+
+    return nsXMLContentSerializer::AppendAndTranslateEntities<kValNBSP>(
+        aStr, aOutputStr, kEntities, kEntityStrings);
+  }
+
+  // We don't want to call into our superclass 2-arg version of
+  // AppendAndTranslateEntities, because it wants to encode more characters
+  // than we do.  Use our tables, but avoid encoding &nbsp; by passing in a
+  // smaller max index.  This will only encode &amp;, &lt;, &gt;, and &quot;.
+  if (mInAttribute) {
+    return nsXMLContentSerializer::AppendAndTranslateEntities<kGTVal>(
+        aStr, aOutputStr, kAttrEntities, kEntityStrings);
+  }
+
+  return nsXMLContentSerializer::AppendAndTranslateEntities<kGTVal>(
+      aStr, aOutputStr, kEntities, kEntityStrings);
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsHTMLContentSerializer.h firefox-85.0+build1/dom/serializers/nsHTMLContentSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsHTMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsHTMLContentSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,57 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an HTML (not XHTML!) DOM to an HTML
+ * string that could be parsed into more or less the original DOM.
+ */
+
+#ifndef nsHTMLContentSerializer_h__
+#define nsHTMLContentSerializer_h__
+
+#include "mozilla/Attributes.h"
+#include "nsXHTMLContentSerializer.h"
+#include "nsString.h"
+
+class nsAtom;
+
+class nsHTMLContentSerializer final : public nsXHTMLContentSerializer {
+ public:
+  nsHTMLContentSerializer();
+  virtual ~nsHTMLContentSerializer();
+
+  NS_IMETHOD AppendElementStart(
+      mozilla::dom::Element* aElement,
+      mozilla::dom::Element* aOriginalElement) override;
+
+  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
+                              mozilla::dom::Element* aOriginalElement) override;
+
+  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
+
+ protected:
+  MOZ_MUST_USE
+  virtual bool SerializeHTMLAttributes(mozilla::dom::Element* aContent,
+                                       mozilla::dom::Element* aOriginalElement,
+                                       nsAString& aTagPrefix,
+                                       const nsAString& aTagNamespaceURI,
+                                       nsAtom* aTagName, int32_t aNamespace,
+                                       nsAString& aStr);
+
+  MOZ_MUST_USE
+  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
+                                          nsAString& aOutputStr) override;
+
+ private:
+  static const uint8_t kEntities[];
+  static const uint8_t kAttrEntities[];
+  static const char* const kEntityStrings[];
+};
+
+nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer);
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/serializers/nsIContentSerializer.h firefox-85.0+build1/dom/serializers/nsIContentSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsIContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsIContentSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,97 @@
+/* -*- 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 nsIContentSerializer_h
+#define nsIContentSerializer_h
+
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+
+class nsIContent;
+
+namespace mozilla {
+class Encoding;
+namespace dom {
+class Comment;
+class Document;
+class DocumentType;
+class Element;
+class ProcessingInstruction;
+}  // namespace dom
+}  // namespace mozilla
+
+#define NS_ICONTENTSERIALIZER_IID                    \
+  {                                                  \
+    0xb1ee32f2, 0xb8c4, 0x49b9, {                    \
+      0x93, 0xdf, 0xb6, 0xfa, 0xb5, 0xd5, 0x46, 0x88 \
+    }                                                \
+  }
+
+class nsIContentSerializer : public nsISupports {
+ public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTSERIALIZER_IID)
+
+  /**
+   * @param aOutput The `Append*` methods will append to this string. The
+   *        reference to it will be dropped with `Finish`.
+   */
+  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
+                  const mozilla::Encoding* aEncoding, bool aIsCopying,
+                  bool aIsWholeDocument, bool* aNeedsPerformatScanning,
+                  nsAString& aOutput) = 0;
+
+  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
+                        int32_t aEndOffset) = 0;
+
+  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
+                                int32_t aEndOffset) = 0;
+
+  NS_IMETHOD AppendProcessingInstruction(
+      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
+      int32_t aEndOffset) = 0;
+
+  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
+                           int32_t aStartOffset, int32_t aEndOffset) = 0;
+
+  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) = 0;
+
+  NS_IMETHOD AppendElementStart(mozilla::dom::Element* aElement,
+                                mozilla::dom::Element* aOriginalElement) = 0;
+
+  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
+                              mozilla::dom::Element* aOriginalElement) = 0;
+
+  NS_IMETHOD FlushAndFinish() = 0;
+
+  /**
+   * Drops the reference to the output buffer.
+   */
+  NS_IMETHOD Finish() = 0;
+
+  NS_IMETHOD GetOutputLength(uint32_t& aLength) const = 0;
+
+  /**
+   * Append any items in the beginning of the document that won't be
+   * serialized by other methods. XML declaration is the most likely
+   * thing this method can produce.
+   */
+  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) = 0;
+
+  // If Init() sets *aNeedsPerformatScanning to true, then these methods are
+  // called when elements are started and ended, before AppendElementStart
+  // and AppendElementEnd, respectively.  They are supposed to be used to
+  // allow the implementer to keep track of whether the element is
+  // preformatted.
+  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) = 0;
+  NS_IMETHOD ForgetElementForPreformat(mozilla::dom::Element* aElement) = 0;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentSerializer, NS_ICONTENTSERIALIZER_IID)
+
+#define NS_CONTENTSERIALIZER_CONTRACTID_PREFIX \
+  "@mozilla.org/layout/contentserializer;1?mimetype="
+
+#endif /* nsIContentSerializer_h */
diff -Nru firefox-84.0.2+build1/dom/serializers/nsIDocumentEncoder.idl firefox-85.0+build1/dom/serializers/nsIDocumentEncoder.idl
--- firefox-84.0.2+build1/dom/serializers/nsIDocumentEncoder.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsIDocumentEncoder.idl	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,354 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+interface nsIOutputStream;
+
+webidl Document;
+webidl Node;
+webidl Range;
+webidl Selection;
+
+%{ C++
+class nsINode;
+
+%}
+[ptr] native nsINodePtr(nsINode);
+
+[scriptable, uuid(3d9371d8-a2ad-403e-8b0e-8885ad3562e3)]
+interface nsIDocumentEncoderNodeFixup : nsISupports
+{
+  /**
+   * Create a fixed up version of a node. This method is called before
+   * each node in a document is about to be persisted. The implementor
+   * may return a new node with fixed up attributes or null. If null is
+   * returned the node should be used as-is.
+   * @param aNode Node to fixup.
+   * @param [OUT] aSerializeCloneKids True if the document encoder should
+   * apply recursive serialization to the children of the fixed up node
+   * instead of the children of the original node.
+   * @return The resulting fixed up node.
+   */
+  Node fixupNode(in Node aNode, out boolean aSerializeCloneKids);
+};
+
+[scriptable, uuid(21f112df-d96f-47da-bfcb-5331273003d1)]
+interface nsIDocumentEncoder : nsISupports
+{
+  // Output methods flag bits. There are a frightening number of these,
+  // because everyone wants something a little bit different
+
+
+  /**
+   * Output only the selection (as opposed to the whole document).
+   */
+  const unsigned long OutputSelectionOnly = (1 << 0);
+
+  /** Plaintext output: Convert html to plaintext that looks like the html.
+    * Can't be used in conjunction with `OutputPreformatted`.
+    * Implies wrap (except inside <pre>), since html wraps.
+    * HTML, XHTML and XML output: do prettyprinting, ignoring existing formatting.
+    * XML output : it doesn't implicitly wrap
+    */
+  const unsigned long OutputFormatted     = (1 << 1);
+
+  /** Don't do prettyprinting. Don't do any wrapping that's not in the existing
+   * HTML/XML source. This option overrides OutputFormatted if both are set.
+   * HTML/XHTML output: If neither are set, there won't be prettyprinting too, but
+   * long lines will be wrapped.
+   * Supported also in XML and Plaintext output.
+   * @note This option does not affect entity conversion.
+   */
+  const unsigned long OutputRaw           = (1 << 2);
+
+  /**
+   * Do not print html head tags.
+   * XHTML/HTML output only.
+   */
+  const unsigned long OutputBodyOnly      = (1 << 3);
+
+  /**
+   * Output as though the content is preformatted
+   * (e.g. maybe it's wrapped in a PRE or PRE_WRAP style tag)
+   * Plaintext output only.
+   * Can't be used together with `OutputFormatted`/`OutputFormatFlowed`.
+   * XXXbz How does this interact with OutputRaw?
+   */
+  const unsigned long OutputPreformatted  = (1 << 4);
+
+  /**
+   * Wrap even if we're not doing formatted output (e.g. for text fields).
+   * Supported in XML, XHTML, HTML and Plaintext output.
+   * Set implicitly in HTML/XHTML output when no OutputRaw.
+   * Ignored when OutputRaw.
+   * XXXLJ: set implicitly in HTML/XHTML output, to keep compatible behaviors
+   *        for old callers of this interface
+   * XXXbz How does this interact with OutputFormatFlowed?
+   */
+  const unsigned long OutputWrap          = (1 << 5);
+
+  /**
+   * Output for format flowed (RFC 2646). This is used when converting
+   * to text for mail sending. This differs just slightly
+   * but in an important way from normal formatted, and that is that
+   * lines are space stuffed. This can't (correctly) be done later.
+   * PlainText output only.
+   * If this flag is set, `OutputFormat` has to be set too.
+   * XXXbz How does this interact with OutputRaw/OutputWrap?
+   */
+  const unsigned long OutputFormatFlowed  = (1 << 6);
+
+  /**
+   * Convert links, image src, and script src to absolute URLs when possible.
+   * XHTML/HTML output only.
+   */
+  const unsigned long OutputAbsoluteLinks = (1 << 7);
+
+  /**
+   * LineBreak processing: if this flag is set than CR line breaks will
+   * be written. If neither this nor OutputLFLineBreak is set, then we
+   * will use platform line breaks. The combination of the two flags will
+   * cause CRLF line breaks to be written.
+   */
+  const unsigned long OutputCRLineBreak = (1 << 9);
+
+  /**
+   * LineBreak processing: if this flag is set than LF line breaks will
+   * be written. If neither this nor OutputCRLineBreak is set, then we
+   * will use platform line breaks. The combination of the two flags will
+   * cause CRLF line breaks to be written.
+   */
+  const unsigned long OutputLFLineBreak = (1 << 10);
+
+  /**
+   * Output the content of noscript elements (only for serializing
+   * to plaintext).
+   */
+  const unsigned long OutputNoScriptContent = (1 << 11);
+
+  /**
+   * Output the content of noframes elements (only for serializing
+   * to plaintext). (Used only internally in the plain text serializer;
+   * ignored if passed by the caller.)
+   */
+  const unsigned long OutputNoFramesContent = (1 << 12);
+
+  /**
+   * Don't allow any formatting nodes (e.g. <br>, <b>) inside a <pre>.
+   * This is used primarily by mail. XHTML/HTML output only.
+   */
+  const unsigned long OutputNoFormattingInPre = (1 << 13);
+
+  /**
+   * Encode entities when outputting to a string.
+   * E.g. If set, we'll output &nbsp; if clear, we'll output 0xa0.
+   * The basic set is just &nbsp; &amp; &lt; &gt; &quot; for interoperability
+   * with older products that don't support &alpha; and friends.
+   * HTML output only.
+   */
+  const unsigned long OutputEncodeBasicEntities = (1 << 14);
+
+  /**
+   * Normally &nbsp; is replaced with a space character when
+   * encoding data as plain text, set this flag if that's
+   * not desired.
+   * Plaintext output only.
+   */
+  const unsigned long OutputPersistNBSP = (1 << 17);
+
+  /**
+   * Normally when serializing the whole document using the HTML or
+   * XHTML serializer, the encoding declaration is rewritten to match.
+   * This flag suppresses that behavior.
+   */
+  const unsigned long OutputDontRewriteEncodingDeclaration = (1 << 18);
+
+  /**
+   * When using the HTML or XHTML serializer, skip elements that are not
+   * visible when this flag is set.  Elements are not visible when they
+   * have CSS style display:none or visibility:collapse, for example.
+   */
+  const unsigned long SkipInvisibleContent = (1 << 19);
+
+  /**
+   * Output for delsp=yes (RFC 3676). This is used with OutputFormatFlowed
+   * when converting to text for mail sending.
+   * PlainText output only.
+   */
+  const unsigned long OutputFormatDelSp  = (1 << 20);
+
+  /**
+   * Drop <br> elements considered "invisible" by the editor. OutputPreformatted
+   * implies this flag.
+   */
+  const unsigned long OutputDropInvisibleBreak = (1 << 21);
+
+  /**
+   * Don't check for _moz_dirty attributes when deciding whether to
+   * pretty-print if this flag is set (bug 599983).
+   */
+  const unsigned long OutputIgnoreMozDirty = (1 << 22);
+
+  /**
+   * Serialize in a way that is suitable for copying a plaintext version of the
+   * document to the clipboard.  This can for example cause line endings to be
+   * injected at preformatted block element boundaries.
+   */
+  const unsigned long OutputForPlainTextClipboardCopy = (1 << 25);
+
+  /**
+   * Include ruby annotations and ruby parentheses in the output.
+   * PlainText output only.
+   */
+  const unsigned long OutputRubyAnnotation = (1 << 26);
+
+  /**
+   * Disallow breaking of long character strings. This is important
+   * for serializing e-mail which contains CJK strings. These must
+   * not be broken just as "normal" longs strings aren't broken.
+   */
+  const unsigned long OutputDisallowLineBreaking = (1 << 27);
+
+  /**
+   * Release reference of Document after using encodeTo* method to recycle
+   * this encoder without holding Document. To use this encoder again,
+   * we have to call init again.
+   */
+  const unsigned long RequiresReinitAfterOutput = (1 << 28);
+
+  /**
+   * Initialize with a pointer to the document and the mime type.
+   * Resets wrap column to 72 and resets node fixup.
+   * @param aDocument Document to encode.
+   * @param aMimeType MimeType to use. May also be set by SetMimeType.
+   * @param aFlags Flags to use while encoding. May also be set by SetFlags.
+   */
+  void init(in Document aDocument,
+            in AString aMimeType,
+            in unsigned long aFlags);
+  [noscript] void nativeInit(in Document aDocument,
+                             in AString aMimeType,
+                             in unsigned long aFlags);
+
+  /**
+   *  If the selection is set to a non-null value, then the
+   *  selection is used for encoding, otherwise the entire
+   *  document is encoded.
+   * @param aSelection The selection to encode.
+   */
+  void setSelection(in Selection aSelection);
+
+  /**
+   *  If the range is set to a non-null value, then the
+   *  range is used for encoding, otherwise the entire
+   *  document or selection is encoded.
+   * @param aRange The range to encode.
+   */
+  void setRange(in Range aRange);
+
+  /**
+   *  If the node is set to a non-null value, then the
+   *  node is used for encoding, otherwise the entire
+   *  document or range or selection is encoded.
+   * @param aNode The node to encode.
+   */
+  void setNode(in Node aNode);
+
+  /**
+   *  If the container is set to a non-null value, then its
+   *  child nodes are used for encoding, otherwise the entire
+   *  document or range or selection or node is encoded.
+   *  @param aContainer The node which child nodes will be encoded.
+   */
+  void setContainerNode(in Node aContainer);
+
+  /**
+   *  Documents typically have an intrinsic character set,
+   *  but if no intrinsic value is found, the platform character set
+   *  is used. This function overrides both the intrinisc and platform
+   *  charset.
+   *  @param aCharset Overrides the both the intrinsic or platform
+   *  character set when encoding the document.
+   *
+   *  Possible result codes: NS_ERROR_NO_CHARSET_CONVERTER
+   */
+  void setCharset(in ACString aCharset);
+
+  /**
+   *  Set a wrap column.  This may have no effect in some types of encoders.
+   * @param aWrapColumn Column to which to wrap. If 0, wrapping is disabled.
+   */
+  void setWrapColumn(in unsigned long aWrapColumn);
+
+  /**
+   *  The mime type preferred by the encoder.  This piece of api was
+   *  added because the copy encoder may need to switch mime types on you
+   *  if you ask it to copy html that really represents plaintext content.
+   *  Call this AFTER Init() and SetSelection() have both been called.
+   */
+  readonly attribute AString mimeType;
+
+  /**
+   *  Encode the document and send the result to the nsIOutputStream.
+   *
+   *  Possible result codes are the stream errors which might have
+   *  been encountered.
+   * @param aStream Stream into which to encode.
+   */
+  void encodeToStream(in nsIOutputStream aStream);
+
+  /**
+   * Encode the document into a string.
+   *
+   * @return The document encoded into a string.
+   */
+  AString encodeToString();
+
+  /**
+   * Encode the document into a string. Stores the extra context information
+   * into the two arguments.
+   * @param [OUT] aContextString The string where the parent hierarchy
+   *              information will be stored.
+   * @param [OUT] aInfoString The string where extra context info will
+   *              be stored.
+   * @return The document encoded as a string.
+   *
+   */
+  AString encodeToStringWithContext( out AString aContextString,
+                                     out AString aInfoString);
+
+  /**
+   * Encode the document into a string of limited size.
+   * @param aMaxLength After aMaxLength characters, the encoder will stop
+   *                   encoding new data.
+   *                   Only values > 0 will be considered.
+   *                   The returned string may be slightly larger than
+   *                   aMaxLength because some serializers (eg. HTML)
+   *                   may need to close some tags after they stop
+   *                   encoding new data, or finish a line (72 columns
+   *                   by default for the plain text serializer).
+   *
+   * @return The document encoded into a string.
+   */
+  AString encodeToStringWithMaxLength(in unsigned long aMaxLength);
+
+  /**
+   * Set the fixup object associated with node persistence.
+   * @param aFixup The fixup object.
+   */
+  void setNodeFixup(in nsIDocumentEncoderNodeFixup aFixup);
+};
+
+%{ C++
+template<class T> struct already_AddRefed;
+
+bool
+do_getDocumentTypeSupportedForEncoding(const char* aContentType);
+already_AddRefed<nsIDocumentEncoder>
+do_createDocumentEncoder(const char* aContentType);
+already_AddRefed<nsIDocumentEncoder>
+do_createHTMLCopyEncoder();
+%}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsPlainTextSerializer.cpp firefox-85.0+build1/dom/serializers/nsPlainTextSerializer.cpp
--- firefox-84.0.2+build1/dom/serializers/nsPlainTextSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsPlainTextSerializer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,1906 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert a DOM into plaintext in a nice way
+ * (eg for copy/paste as plaintext).
+ */
+
+#include "nsPlainTextSerializer.h"
+
+#include <limits>
+
+#include "nsPrintfCString.h"
+#include "nsDebug.h"
+#include "nsGkAtoms.h"
+#include "nsNameSpaceManager.h"
+#include "nsTextFragment.h"
+#include "nsContentUtils.h"
+#include "nsReadableUtils.h"
+#include "nsUnicharUtils.h"
+#include "nsCRT.h"
+#include "mozilla/EditorUtils.h"
+#include "mozilla/dom/CharacterData.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/HTMLBRElement.h"
+#include "mozilla/dom/Text.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/StaticPrefs_converter.h"
+#include "mozilla/BinarySearch.h"
+#include "nsComputedDOMStyle.h"
+
+namespace mozilla {
+class Encoding;
+}
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+#define PREF_STRUCTS "converter.html2txt.structs"
+#define PREF_HEADER_STRATEGY "converter.html2txt.header_strategy"
+
+static const int32_t kTabSize = 4;
+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>
+static const char16_t kNBSP = 160;
+static const char16_t kSPACE = ' ';
+
+constexpr int32_t kNoFlags = 0;
+
+static int32_t HeaderLevel(const nsAtom* aTag);
+static int32_t GetUnicharWidth(char16_t ucs);
+static int32_t GetUnicharStringWidth(const nsString& aString);
+
+// Someday may want to make this non-const:
+static const uint32_t TagStackSize = 500;
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPlainTextSerializer)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPlainTextSerializer)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsPlainTextSerializer)
+  NS_INTERFACE_MAP_ENTRY(nsIContentSerializer)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTION(nsPlainTextSerializer, mElement)
+
+nsresult NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer) {
+  RefPtr<nsPlainTextSerializer> it = new nsPlainTextSerializer();
+  it.forget(aSerializer);
+  return NS_OK;
+}
+
+// @param aFlags As defined in nsIDocumentEncoder.idl.
+static void DetermineLineBreak(const int32_t aFlags, nsAString& aLineBreak) {
+  // Set the line break character:
+  if ((aFlags & nsIDocumentEncoder::OutputCRLineBreak) &&
+      (aFlags & nsIDocumentEncoder::OutputLFLineBreak)) {
+    // Windows
+    aLineBreak.AssignLiteral(u"\r\n");
+  } else if (aFlags & nsIDocumentEncoder::OutputCRLineBreak) {
+    // Mac
+    aLineBreak.AssignLiteral(u"\r");
+  } else if (aFlags & nsIDocumentEncoder::OutputLFLineBreak) {
+    // Unix/DOM
+    aLineBreak.AssignLiteral(u"\n");
+  } else {
+    // Platform/default
+    aLineBreak.AssignLiteral(NS_ULINEBREAK);
+  }
+}
+
+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.
+    mContent.ReplaceChar(kNBSP, kSPACE);
+  }
+}
+
+void nsPlainTextSerializer::CurrentLine::ResetContentAndIndentationHeader() {
+  mContent.Truncate();
+  mIndentation.mHeader.Truncate();
+}
+
+int32_t nsPlainTextSerializer::CurrentLine::FindWrapIndexForContent(
+    const uint32_t aWrapColumn, const uint32_t aContentWidth,
+    mozilla::intl::LineBreaker* aLineBreaker) const {
+  MOZ_ASSERT(aContentWidth < std::numeric_limits<int32_t>::max());
+  MOZ_ASSERT(static_cast<int32_t>(aContentWidth) ==
+             GetUnicharStringWidth(mContent));
+
+  const uint32_t prefixwidth = DeterminePrefixWidth();
+  int32_t goodSpace = mContent.Length();
+
+  if (aLineBreaker) {
+    // We go from the end removing one letter at a time until
+    // we have a reasonable width
+    uint32_t width = aContentWidth;
+    while (goodSpace > 0 && (width + prefixwidth > aWrapColumn)) {
+      goodSpace--;
+      width -= GetUnicharWidth(mContent[goodSpace]);
+    }
+
+    goodSpace++;
+
+    goodSpace =
+        aLineBreaker->Prev(mContent.get(), mContent.Length(), goodSpace);
+    if (goodSpace != NS_LINEBREAKER_NEED_MORE_TEXT &&
+        nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace - 1))) {
+      --goodSpace;  // adjust the position since line breaker returns a
+                    // position next to space
+    }
+  } else {
+    // In this case we don't want strings, especially CJK-ones, to be split.
+    // See
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=333064 for more
+    // information.
+
+    if (mContent.IsEmpty() || aWrapColumn < prefixwidth) {
+      goodSpace = NS_LINEBREAKER_NEED_MORE_TEXT;
+    } else {
+      goodSpace = std::min(aWrapColumn - prefixwidth, mContent.Length() - 1);
+      while (goodSpace >= 0 &&
+             !nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace))) {
+        goodSpace--;
+      }
+    }
+  }
+
+  if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT) {
+    // If we didn't find a good place to break, accept long line and
+    // try to find another place to break
+    goodSpace =
+        (prefixwidth > aWrapColumn + 1) ? 1 : aWrapColumn - prefixwidth + 1;
+    if (aLineBreaker) {
+      if ((uint32_t)goodSpace < mContent.Length())
+        goodSpace =
+            aLineBreaker->Next(mContent.get(), mContent.Length(), goodSpace);
+      if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT)
+        goodSpace = mContent.Length();
+    } else {
+      // In this case we don't want strings, especially CJK-ones, to be
+      // split. See
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=333064 for more
+      // information.
+      goodSpace = (prefixwidth > aWrapColumn) ? 1 : aWrapColumn - prefixwidth;
+      const int32_t contentLength = mContent.Length();
+      while (goodSpace < contentLength &&
+             !nsCRT::IsAsciiSpace(mContent.CharAt(goodSpace))) {
+        goodSpace++;
+      }
+    }
+  }
+  return goodSpace;
+}
+
+nsPlainTextSerializer::OutputManager::OutputManager(const int32_t aFlags,
+                                                    nsAString& aOutput)
+    : mFlags{aFlags}, mOutput{aOutput}, mAtFirstColumn{true} {
+  MOZ_ASSERT(aOutput.IsEmpty());
+
+  DetermineLineBreak(mFlags, mLineBreak);
+}
+
+void nsPlainTextSerializer::OutputManager::Append(
+    const CurrentLine& aCurrentLine,
+    const StripTrailingWhitespaces aStripTrailingWhitespaces) {
+  if (IsAtFirstColumn()) {
+    nsAutoString quotesAndIndent;
+    aCurrentLine.CreateQuotesAndIndent(quotesAndIndent);
+
+    if ((aStripTrailingWhitespaces == StripTrailingWhitespaces::kMaybe)) {
+      const bool stripTrailingSpaces = aCurrentLine.mContent.IsEmpty();
+      if (stripTrailingSpaces) {
+        quotesAndIndent.Trim(" ", false, true, false);
+      }
+    }
+
+    Append(quotesAndIndent);
+  }
+
+  Append(aCurrentLine.mContent);
+}
+
+void nsPlainTextSerializer::OutputManager::Append(const nsAString& aString) {
+  if (!aString.IsEmpty()) {
+    mOutput.Append(aString);
+    mAtFirstColumn = false;
+  }
+}
+
+void nsPlainTextSerializer::OutputManager::AppendLineBreak() {
+  mOutput.Append(mLineBreak);
+  mAtFirstColumn = true;
+}
+
+uint32_t nsPlainTextSerializer::OutputManager::GetOutputLength() const {
+  return mOutput.Length();
+}
+
+nsPlainTextSerializer::nsPlainTextSerializer()
+    : mFloatingLines(-1),
+      mLineBreakDue(false),
+      kSpace(u" "_ns)  // Init of "constant"
+{
+  mHeadLevel = 0;
+  mHasWrittenCiteBlockquote = false;
+  mSpanLevel = 0;
+  for (int32_t i = 0; i <= 6; i++) {
+    mHeaderCounter[i] = 0;
+  }
+
+  // Flow
+  mEmptyLines = 1;  // The start of the document is an "empty line" in itself,
+  mInWhitespace = false;
+  mPreFormattedMail = false;
+
+  mPreformattedBlockBoundary = false;
+
+  // initialize the tag stack to zero:
+  // The stack only ever contains pointers to static atoms, so they don't
+  // need refcounting.
+  mTagStack = new const nsAtom*[TagStackSize];
+  mTagStackIndex = 0;
+  mIgnoreAboveIndex = (uint32_t)kNotFound;
+
+  mULCount = 0;
+
+  mIgnoredChildNodeLevel = 0;
+}
+
+nsPlainTextSerializer::~nsPlainTextSerializer() {
+  delete[] mTagStack;
+  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,
+                                           const uint32_t aWrapColumn) {
+  mFlags = aFlags;
+
+  if (mFlags & nsIDocumentEncoder::OutputFormatted) {
+    // Get some prefs that controls how we do formatted output
+    mStructs = Preferences::GetBool(PREF_STRUCTS, mStructs);
+
+    int32_t headerStrategy =
+        Preferences::GetInt(PREF_HEADER_STRATEGY, kDefaultHeaderStrategy);
+    mHeaderStrategy = Convert(headerStrategy);
+  }
+
+  mWithRubyAnnotation = StaticPrefs::converter_html2txt_always_include_ruby() ||
+                        (mFlags & nsIDocumentEncoder::OutputRubyAnnotation);
+
+  // XXX We should let the caller decide whether to do this or not
+  mFlags &= ~nsIDocumentEncoder::OutputNoFramesContent;
+
+  mWrapColumn = aWrapColumn;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::Init(const uint32_t aFlags, uint32_t aWrapColumn,
+                            const Encoding* aEncoding, bool aIsCopying,
+                            bool aIsWholeDocument,
+                            bool* aNeedsPreformatScanning, nsAString& aOutput) {
+#ifdef DEBUG
+  // Check if the major control flags are set correctly.
+  if (aFlags & nsIDocumentEncoder::OutputFormatFlowed) {
+    NS_ASSERTION(aFlags & nsIDocumentEncoder::OutputFormatted,
+                 "If you want format=flowed, you must combine it with "
+                 "nsIDocumentEncoder::OutputFormatted");
+  }
+
+  if (aFlags & nsIDocumentEncoder::OutputFormatted) {
+    NS_ASSERTION(
+        !(aFlags & nsIDocumentEncoder::OutputPreformatted),
+        "Can't do formatted and preformatted output at the same time!");
+  }
+#endif
+  MOZ_ASSERT(!(aFlags & nsIDocumentEncoder::OutputFormatDelSp) ||
+             (aFlags & nsIDocumentEncoder::OutputFormatFlowed));
+
+  *aNeedsPreformatScanning = true;
+  mSettings.Init(aFlags, aWrapColumn);
+  mOutputManager.emplace(mSettings.GetFlags(), aOutput);
+
+  if (mSettings.MayWrap() && mSettings.MayBreakLines()) {
+    mLineBreaker = nsContentUtils::LineBreaker();
+  }
+
+  mLineBreakDue = false;
+  mFloatingLines = -1;
+
+  mPreformattedBlockBoundary = false;
+
+  MOZ_ASSERT(mOLStack.IsEmpty());
+
+  return NS_OK;
+}
+
+bool nsPlainTextSerializer::GetLastBool(const nsTArray<bool>& aStack) {
+  uint32_t size = aStack.Length();
+  if (size == 0) {
+    return false;
+  }
+  return aStack.ElementAt(size - 1);
+}
+
+void nsPlainTextSerializer::SetLastBool(nsTArray<bool>& aStack, bool aValue) {
+  uint32_t size = aStack.Length();
+  if (size > 0) {
+    aStack.ElementAt(size - 1) = aValue;
+  } else {
+    NS_ERROR("There is no \"Last\" value");
+  }
+}
+
+void nsPlainTextSerializer::PushBool(nsTArray<bool>& aStack, bool aValue) {
+  aStack.AppendElement(bool(aValue));
+}
+
+bool nsPlainTextSerializer::PopBool(nsTArray<bool>& aStack) {
+  return aStack.Length() ? aStack.PopLastElement() : false;
+}
+
+bool nsPlainTextSerializer::IsIgnorableRubyAnnotation(
+    const nsAtom* aTag) const {
+  if (mSettings.GetWithRubyAnnotation()) {
+    return false;
+  }
+
+  return aTag == nsGkAtoms::rp || aTag == nsGkAtoms::rt ||
+         aTag == nsGkAtoms::rtc;
+}
+
+// Return true if aElement has 'display:none' or if we just don't know.
+static bool IsDisplayNone(Element* aElement) {
+  RefPtr<ComputedStyle> computedStyle =
+      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
+  return !computedStyle ||
+         computedStyle->StyleDisplay()->mDisplay == StyleDisplay::None;
+}
+
+static bool IsIgnorableScriptOrStyle(Element* aElement) {
+  return aElement->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style) &&
+         IsDisplayNone(aElement);
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
+                                  int32_t aEndOffset) {
+  if (mIgnoreAboveIndex != (uint32_t)kNotFound) {
+    return NS_OK;
+  }
+
+  NS_ASSERTION(aStartOffset >= 0, "Negative start offset for text fragment!");
+  if (aStartOffset < 0) return NS_ERROR_INVALID_ARG;
+
+  NS_ENSURE_ARG(aText);
+
+  nsresult rv = NS_OK;
+
+  nsIContent* content = aText;
+  const nsTextFragment* frag;
+  if (!content || !(frag = content->GetText())) {
+    return NS_ERROR_FAILURE;
+  }
+
+  int32_t fragLength = frag->GetLength();
+  int32_t endoffset =
+      (aEndOffset == -1) ? fragLength : std::min(aEndOffset, fragLength);
+  NS_ASSERTION(aStartOffset <= endoffset,
+               "A start offset is beyond the end of the text fragment!");
+
+  int32_t length = endoffset - aStartOffset;
+  if (length <= 0) {
+    return NS_OK;
+  }
+
+  nsAutoString textstr;
+  if (frag->Is2b()) {
+    textstr.Assign(frag->Get2b() + aStartOffset, length);
+  } else {
+    // AssignASCII is for 7-bit character only, so don't use it
+    const char* data = frag->Get1b();
+    CopyASCIItoUTF16(Substring(data + aStartOffset, data + endoffset), textstr);
+  }
+
+  // Mask the text if the text node is in a password field.
+  if (content->HasFlag(NS_MAYBE_MASKED)) {
+    EditorUtils::MaskString(textstr, content->AsText(), 0, aStartOffset);
+  }
+
+  // We have to split the string across newlines
+  // to match parser behavior
+  int32_t start = 0;
+  int32_t offset = textstr.FindCharInSet("\n\r");
+  while (offset != kNotFound) {
+    if (offset > start) {
+      // Pass in the line
+      DoAddText(false, Substring(textstr, start, offset - start));
+    }
+
+    // Pass in a newline
+    DoAddText();
+
+    start = offset + 1;
+    offset = textstr.FindCharInSet("\n\r", start);
+  }
+
+  // Consume the last bit of the string if there's any left
+  if (start < length) {
+    if (start) {
+      DoAddText(false, Substring(textstr, start, length - start));
+    } else {
+      DoAddText(false, textstr);
+    }
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::AppendCDATASection(nsIContent* aCDATASection,
+                                          int32_t aStartOffset,
+                                          int32_t aEndOffset) {
+  return AppendText(aCDATASection, aStartOffset, aEndOffset);
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::ScanElementForPreformat(Element* aElement) {
+  mPreformatStack.push(IsElementPreformatted(aElement));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::ForgetElementForPreformat(Element* aElement) {
+  MOZ_RELEASE_ASSERT(!mPreformatStack.empty(),
+                     "Tried to pop without previous push.");
+  mPreformatStack.pop();
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::AppendElementStart(Element* aElement,
+                                          Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+
+  mElement = aElement;
+
+  nsresult rv;
+  nsAtom* id = GetIdForContent(mElement);
+
+  bool isContainer = !FragmentOrElement::IsHTMLVoid(id);
+
+  if (isContainer) {
+    rv = DoOpenContainer(id);
+  } else {
+    rv = DoAddLeaf(id);
+  }
+
+  mElement = nullptr;
+
+  if (id == nsGkAtoms::head) {
+    ++mHeadLevel;
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::AppendElementEnd(Element* aElement,
+                                        Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+
+  mElement = aElement;
+
+  nsresult rv;
+  nsAtom* id = GetIdForContent(mElement);
+
+  bool isContainer = !FragmentOrElement::IsHTMLVoid(id);
+
+  rv = NS_OK;
+  if (isContainer) {
+    rv = DoCloseContainer(id);
+  }
+
+  mElement = nullptr;
+
+  if (id == nsGkAtoms::head) {
+    NS_ASSERTION(mHeadLevel != 0, "mHeadLevel being decremented below 0");
+    --mHeadLevel;
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::FlushAndFinish() {
+  MOZ_ASSERT(mOutputManager);
+
+  mOutputManager->Flush(mCurrentLine);
+  return Finish();
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::Finish() {
+  mOutputManager.reset();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::GetOutputLength(uint32_t& aLength) const {
+  MOZ_ASSERT(mOutputManager);
+
+  aLength = mOutputManager->GetOutputLength();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPlainTextSerializer::AppendDocumentStart(Document* aDocument) {
+  return NS_OK;
+}
+
+constexpr int32_t kOlStackDummyValue = 0;
+
+nsresult nsPlainTextSerializer::DoOpenContainer(const nsAtom* aTag) {
+  if (IsIgnorableRubyAnnotation(aTag)) {
+    // Ignorable ruby annotation shouldn't be replaced by a placeholder
+    // character, neither any of its descendants.
+    mIgnoredChildNodeLevel++;
+    return NS_OK;
+  }
+  if (IsIgnorableScriptOrStyle(mElement)) {
+    mIgnoredChildNodeLevel++;
+    return NS_OK;
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputForPlainTextClipboardCopy)) {
+    if (mPreformattedBlockBoundary && DoOutput()) {
+      // Should always end a line, but get no more whitespace
+      if (mFloatingLines < 0) mFloatingLines = 0;
+      mLineBreakDue = true;
+    }
+    mPreformattedBlockBoundary = false;
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputRaw)) {
+    // Raw means raw.  Don't even think about doing anything fancy
+    // here like indenting, adding line breaks or any other
+    // characters such as list item bullets, quote characters
+    // around <q>, etc.
+
+    return NS_OK;
+  }
+
+  if (mTagStackIndex < TagStackSize) {
+    mTagStack[mTagStackIndex++] = aTag;
+  }
+
+  if (mIgnoreAboveIndex != (uint32_t)kNotFound) {
+    return NS_OK;
+  }
+
+  // Reset this so that <blockquote type=cite> doesn't affect the whitespace
+  // above random <pre>s below it.
+  mHasWrittenCiteBlockquote =
+      mHasWrittenCiteBlockquote && aTag == nsGkAtoms::pre;
+
+  bool isInCiteBlockquote = false;
+
+  // XXX special-case <blockquote type=cite> so that we don't add additional
+  // newlines before the text.
+  if (aTag == nsGkAtoms::blockquote) {
+    nsAutoString value;
+    nsresult rv = GetAttributeValue(nsGkAtoms::type, value);
+    isInCiteBlockquote = NS_SUCCEEDED(rv) && value.EqualsIgnoreCase("cite");
+  }
+
+  if (mLineBreakDue && !isInCiteBlockquote) EnsureVerticalSpace(mFloatingLines);
+
+  // Check if this tag's content that should not be output
+  if ((aTag == nsGkAtoms::noscript &&
+       !mSettings.HasFlag(nsIDocumentEncoder::OutputNoScriptContent)) ||
+      ((aTag == nsGkAtoms::iframe || aTag == nsGkAtoms::noframes) &&
+       !mSettings.HasFlag(nsIDocumentEncoder::OutputNoFramesContent))) {
+    // Ignore everything that follows the current tag in
+    // question until a matching end tag is encountered.
+    mIgnoreAboveIndex = mTagStackIndex - 1;
+    return NS_OK;
+  }
+
+  if (aTag == nsGkAtoms::body) {
+    // Try to figure out here whether we have a
+    // preformatted style attribute set by Thunderbird.
+    //
+    // Trigger on the presence of a "pre-wrap" in the
+    // style attribute. That's a very simplistic way to do
+    // it, but better than nothing.
+    nsAutoString style;
+    int32_t whitespace;
+    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::style, style)) &&
+        (kNotFound != (whitespace = style.Find("white-space:")))) {
+      if (kNotFound != style.Find("pre-wrap", true, whitespace)) {
+#ifdef DEBUG_preformatted
+        printf("Set mPreFormattedMail based on style pre-wrap\n");
+#endif
+        mPreFormattedMail = true;
+      } else if (kNotFound != style.Find("pre", true, whitespace)) {
+#ifdef DEBUG_preformatted
+        printf("Set mPreFormattedMail based on style pre\n");
+#endif
+        mPreFormattedMail = true;
+      }
+    } else {
+      /* See comment at end of function. */
+      mInWhitespace = true;
+      mPreFormattedMail = false;
+    }
+
+    return NS_OK;
+  }
+
+  // Keep this in sync with DoCloseContainer!
+  if (!DoOutput()) {
+    return NS_OK;
+  }
+
+  if (aTag == nsGkAtoms::p)
+    EnsureVerticalSpace(1);
+  else if (aTag == nsGkAtoms::pre) {
+    if (GetLastBool(mIsInCiteBlockquote))
+      EnsureVerticalSpace(0);
+    else if (mHasWrittenCiteBlockquote) {
+      EnsureVerticalSpace(0);
+      mHasWrittenCiteBlockquote = false;
+    } else
+      EnsureVerticalSpace(1);
+  } else if (aTag == nsGkAtoms::tr) {
+    PushBool(mHasWrittenCellsForRow, false);
+  } else if (aTag == nsGkAtoms::td || aTag == nsGkAtoms::th) {
+    // We must make sure that the content of two table cells get a
+    // space between them.
+
+    // To make the separation between cells most obvious and
+    // importable, we use a TAB.
+    if (mHasWrittenCellsForRow.IsEmpty()) {
+      // We don't always see a <tr> (nor a <table>) before the <td> if we're
+      // copying part of a table
+      PushBool(mHasWrittenCellsForRow, true);  // will never be popped
+    } else if (GetLastBool(mHasWrittenCellsForRow)) {
+      // Bypass |Write| so that the TAB isn't compressed away.
+      AddToLine(u"\t", 1);
+      mInWhitespace = true;
+    } else {
+      SetLastBool(mHasWrittenCellsForRow, true);
+    }
+  } else if (aTag == nsGkAtoms::ul) {
+    // Indent here to support nested lists, which aren't included in li :-(
+    EnsureVerticalSpace(IsInOlOrUl() ? 0 : 1);
+    // Must end the current line before we change indention
+    mCurrentLine.mIndentation.mLength += kIndentSizeList;
+    mULCount++;
+  } else if (aTag == nsGkAtoms::ol) {
+    EnsureVerticalSpace(IsInOlOrUl() ? 0 : 1);
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+      // Must end the current line before we change indention
+      nsAutoString startAttr;
+      int32_t startVal = 1;
+      if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::start, startAttr))) {
+        nsresult rv = NS_OK;
+        startVal = startAttr.ToInteger(&rv);
+        if (NS_FAILED(rv)) {
+          startVal = 1;
+        }
+      }
+      mOLStack.AppendElement(startVal);
+    } else {
+      mOLStack.AppendElement(kOlStackDummyValue);
+    }
+    mCurrentLine.mIndentation.mLength += kIndentSizeList;  // see ul
+  } else if (aTag == nsGkAtoms::li &&
+             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+    if (mTagStackIndex > 1 && IsInOL()) {
+      if (!mOLStack.IsEmpty()) {
+        nsAutoString valueAttr;
+        if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::value, valueAttr))) {
+          nsresult rv = NS_OK;
+          int32_t valueAttrVal = valueAttr.ToInteger(&rv);
+          if (NS_SUCCEEDED(rv)) {
+            mOLStack.LastElement() = valueAttrVal;
+          }
+        }
+        // This is what nsBulletFrame does for OLs:
+        mCurrentLine.mIndentation.mHeader.AppendInt(mOLStack.LastElement(), 10);
+        mOLStack.LastElement()++;
+      } else {
+        mCurrentLine.mIndentation.mHeader.Append(char16_t('#'));
+      }
+
+      mCurrentLine.mIndentation.mHeader.Append(char16_t('.'));
+
+    } else {
+      static const char bulletCharArray[] = "*o+#";
+      uint32_t index = mULCount > 0 ? (mULCount - 1) : 3;
+      char bulletChar = bulletCharArray[index % 4];
+      mCurrentLine.mIndentation.mHeader.Append(char16_t(bulletChar));
+    }
+
+    mCurrentLine.mIndentation.mHeader.Append(char16_t(' '));
+  } else if (aTag == nsGkAtoms::dl) {
+    EnsureVerticalSpace(1);
+  } else if (aTag == nsGkAtoms::dt) {
+    EnsureVerticalSpace(0);
+  } else if (aTag == nsGkAtoms::dd) {
+    EnsureVerticalSpace(0);
+    mCurrentLine.mIndentation.mLength += kIndentSizeDD;
+  } else if (aTag == nsGkAtoms::span) {
+    ++mSpanLevel;
+  } else if (aTag == nsGkAtoms::blockquote) {
+    // Push
+    PushBool(mIsInCiteBlockquote, isInCiteBlockquote);
+    if (isInCiteBlockquote) {
+      EnsureVerticalSpace(0);
+      mCurrentLine.mCiteQuoteLevel++;
+    } else {
+      EnsureVerticalSpace(1);
+      mCurrentLine.mIndentation.mLength +=
+          kTabSize;  // Check for some maximum value?
+    }
+  } else if (aTag == nsGkAtoms::q) {
+    Write(u"\""_ns);
+  }
+
+  // Else make sure we'll separate block level tags,
+  // even if we're about to leave, before doing any other formatting.
+  else if (IsCssBlockLevelElement(mElement)) {
+    EnsureVerticalSpace(0);
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+    OpenContainerForOutputFormatted(aTag);
+  }
+  return NS_OK;
+}
+
+void nsPlainTextSerializer::OpenContainerForOutputFormatted(
+    const nsAtom* aTag) {
+  const bool currentNodeIsConverted = IsCurrentNodeConverted();
+
+  if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
+      aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
+    EnsureVerticalSpace(2);
+    if (mSettings.GetHeaderStrategy() ==
+        Settings::HeaderStrategy::kNumberHeadingsAndIndentSlightly) {
+      mCurrentLine.mIndentation.mLength += kIndentSizeHeaders;
+      // Caching
+      int32_t level = HeaderLevel(aTag);
+      // Increase counter for current level
+      mHeaderCounter[level]++;
+      // Reset all lower levels
+      int32_t i;
+
+      for (i = level + 1; i <= 6; i++) {
+        mHeaderCounter[i] = 0;
+      }
+
+      // Construct numbers
+      nsAutoString leadup;
+      for (i = 1; i <= level; i++) {
+        leadup.AppendInt(mHeaderCounter[i]);
+        leadup.Append(char16_t('.'));
+      }
+      leadup.Append(char16_t(' '));
+      Write(leadup);
+    } 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.mLength += kIndentIncrementHeaders;
+      }
+    }
+  } else if (aTag == nsGkAtoms::sup && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"^"_ns);
+  } else if (aTag == nsGkAtoms::sub && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"_"_ns);
+  } else if (aTag == nsGkAtoms::code && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"|"_ns);
+  } else if ((aTag == nsGkAtoms::strong || aTag == nsGkAtoms::b) &&
+             mSettings.GetStructs() && !currentNodeIsConverted) {
+    Write(u"*"_ns);
+  } else if ((aTag == nsGkAtoms::em || aTag == nsGkAtoms::i) &&
+             mSettings.GetStructs() && !currentNodeIsConverted) {
+    Write(u"/"_ns);
+  } else if (aTag == nsGkAtoms::u && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"_"_ns);
+  }
+
+  /* Container elements are always block elements, so we shouldn't
+     output any whitespace immediately after the container tag even if
+     there's extra whitespace there because the HTML is pretty-printed
+     or something. To ensure that happens, tell the serializer we're
+     already in whitespace so it won't output more. */
+  mInWhitespace = true;
+}
+
+nsresult nsPlainTextSerializer::DoCloseContainer(const nsAtom* aTag) {
+  if (IsIgnorableRubyAnnotation(aTag)) {
+    mIgnoredChildNodeLevel--;
+    return NS_OK;
+  }
+  if (IsIgnorableScriptOrStyle(mElement)) {
+    mIgnoredChildNodeLevel--;
+    return NS_OK;
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputForPlainTextClipboardCopy)) {
+    if (DoOutput() && IsElementPreformatted() &&
+        IsCssBlockLevelElement(mElement)) {
+      // If we're closing a preformatted block element, output a line break
+      // when we find a new container.
+      mPreformattedBlockBoundary = true;
+    }
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputRaw)) {
+    // Raw means raw.  Don't even think about doing anything fancy
+    // here like indenting, adding line breaks or any other
+    // characters such as list item bullets, quote characters
+    // around <q>, etc.
+
+    return NS_OK;
+  }
+
+  if (mTagStackIndex > 0) {
+    --mTagStackIndex;
+  }
+
+  if (mTagStackIndex >= mIgnoreAboveIndex) {
+    if (mTagStackIndex == mIgnoreAboveIndex) {
+      // We're dealing with the close tag whose matching
+      // open tag had set the mIgnoreAboveIndex value.
+      // Reset mIgnoreAboveIndex before discarding this tag.
+      mIgnoreAboveIndex = (uint32_t)kNotFound;
+    }
+    return NS_OK;
+  }
+
+  MOZ_ASSERT(mOutputManager);
+
+  // End current line if we're ending a block level tag
+  if ((aTag == nsGkAtoms::body) || (aTag == nsGkAtoms::html)) {
+    // We want the output to end with a new line,
+    // but in preformatted areas like text fields,
+    // we can't emit newlines that weren't there.
+    // So add the newline only in the case of formatted output.
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+      EnsureVerticalSpace(0);
+    } else {
+      mOutputManager->Flush(mCurrentLine);
+    }
+    // We won't want to do anything with these in formatted mode either,
+    // so just return now:
+    return NS_OK;
+  }
+
+  // Keep this in sync with DoOpenContainer!
+  if (!DoOutput()) {
+    return NS_OK;
+  }
+
+  if (aTag == nsGkAtoms::tr) {
+    PopBool(mHasWrittenCellsForRow);
+    // Should always end a line, but get no more whitespace
+    if (mFloatingLines < 0) mFloatingLines = 0;
+    mLineBreakDue = true;
+  } else if (((aTag == nsGkAtoms::li) || (aTag == nsGkAtoms::dt)) &&
+             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+    // Items that should always end a line, but get no more whitespace
+    if (mFloatingLines < 0) mFloatingLines = 0;
+    mLineBreakDue = true;
+  } else if (aTag == nsGkAtoms::pre) {
+    mFloatingLines = GetLastBool(mIsInCiteBlockquote) ? 0 : 1;
+    mLineBreakDue = true;
+  } else if (aTag == nsGkAtoms::ul) {
+    mOutputManager->Flush(mCurrentLine);
+    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
+    --mULCount;
+    if (!IsInOlOrUl()) {
+      mFloatingLines = 1;
+      mLineBreakDue = true;
+    }
+  } else if (aTag == nsGkAtoms::ol) {
+    mOutputManager->Flush(mCurrentLine);  // Doing this after decreasing
+                                          // OLStackIndex would be wrong.
+    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
+    MOZ_ASSERT(!mOLStack.IsEmpty(), "Wrong OLStack level!");
+    mOLStack.RemoveLastElement();
+    if (!IsInOlOrUl()) {
+      mFloatingLines = 1;
+      mLineBreakDue = true;
+    }
+  } else if (aTag == nsGkAtoms::dl) {
+    mFloatingLines = 1;
+    mLineBreakDue = true;
+  } else if (aTag == nsGkAtoms::dd) {
+    mOutputManager->Flush(mCurrentLine);
+    mCurrentLine.mIndentation.mLength -= kIndentSizeDD;
+  } else if (aTag == nsGkAtoms::span) {
+    NS_ASSERTION(mSpanLevel, "Span level will be negative!");
+    --mSpanLevel;
+  } else if (aTag == nsGkAtoms::div) {
+    if (mFloatingLines < 0) mFloatingLines = 0;
+    mLineBreakDue = true;
+  } else if (aTag == nsGkAtoms::blockquote) {
+    mOutputManager->Flush(mCurrentLine);  // Is this needed?
+
+    // Pop
+    bool isInCiteBlockquote = PopBool(mIsInCiteBlockquote);
+
+    if (isInCiteBlockquote) {
+      NS_ASSERTION(mCurrentLine.mCiteQuoteLevel,
+                   "CiteQuote level will be negative!");
+      mCurrentLine.mCiteQuoteLevel--;
+      mFloatingLines = 0;
+      mHasWrittenCiteBlockquote = true;
+    } else {
+      mCurrentLine.mIndentation.mLength -= kTabSize;
+      mFloatingLines = 1;
+    }
+    mLineBreakDue = true;
+  } else if (aTag == nsGkAtoms::q) {
+    Write(u"\""_ns);
+  } else if (IsCssBlockLevelElement(mElement)) {
+    // All other blocks get 1 vertical space after them
+    // in formatted mode, otherwise 0.
+    // This is hard. Sometimes 0 is a better number, but
+    // how to know?
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+      EnsureVerticalSpace(1);
+    } else {
+      if (mFloatingLines < 0) mFloatingLines = 0;
+      mLineBreakDue = true;
+    }
+  }
+
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+    CloseContainerForOutputFormatted(aTag);
+  }
+
+  return NS_OK;
+}
+
+void nsPlainTextSerializer::CloseContainerForOutputFormatted(
+    const nsAtom* aTag) {
+  const bool currentNodeIsConverted = IsCurrentNodeConverted();
+
+  if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
+      aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
+    using HeaderStrategy = Settings::HeaderStrategy;
+    if ((mSettings.GetHeaderStrategy() ==
+         HeaderStrategy::kIndentIncreasedWithHeaderLevel) ||
+        (mSettings.GetHeaderStrategy() ==
+         HeaderStrategy::kNumberHeadingsAndIndentSlightly)) {
+      mCurrentLine.mIndentation.mLength -= kIndentSizeHeaders;
+    }
+    if (mSettings.GetHeaderStrategy() ==
+        HeaderStrategy::kIndentIncreasedWithHeaderLevel) {
+      for (int32_t i = HeaderLevel(aTag); i > 1; i--) {
+        // for h(x), run x-1 times
+        mCurrentLine.mIndentation.mLength -= kIndentIncrementHeaders;
+      }
+    }
+    EnsureVerticalSpace(1);
+  } else if (aTag == nsGkAtoms::a && !currentNodeIsConverted) {
+    nsAutoString url;
+    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::href, url)) &&
+        !url.IsEmpty()) {
+      nsAutoString temp;
+      temp.AssignLiteral(" <");
+      temp += url;
+      temp.Append(char16_t('>'));
+      Write(temp);
+    }
+  } else if ((aTag == nsGkAtoms::sup || aTag == nsGkAtoms::sub) &&
+             mSettings.GetStructs() && !currentNodeIsConverted) {
+    Write(kSpace);
+  } else if (aTag == nsGkAtoms::code && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"|"_ns);
+  } else if ((aTag == nsGkAtoms::strong || aTag == nsGkAtoms::b) &&
+             mSettings.GetStructs() && !currentNodeIsConverted) {
+    Write(u"*"_ns);
+  } else if ((aTag == nsGkAtoms::em || aTag == nsGkAtoms::i) &&
+             mSettings.GetStructs() && !currentNodeIsConverted) {
+    Write(u"/"_ns);
+  } else if (aTag == nsGkAtoms::u && mSettings.GetStructs() &&
+             !currentNodeIsConverted) {
+    Write(u"_"_ns);
+  }
+}
+
+bool nsPlainTextSerializer::MustSuppressLeaf() const {
+  if (mIgnoredChildNodeLevel > 0) {
+    return true;
+  }
+
+  if ((mTagStackIndex > 1 &&
+       mTagStack[mTagStackIndex - 2] == nsGkAtoms::select) ||
+      (mTagStackIndex > 0 &&
+       mTagStack[mTagStackIndex - 1] == nsGkAtoms::select)) {
+    // Don't output the contents of SELECT elements;
+    // Might be nice, eventually, to output just the selected element.
+    // Read more in bug 31994.
+    return true;
+  }
+
+  return false;
+}
+
+void nsPlainTextSerializer::DoAddText() { DoAddText(true, u""_ns); }
+
+void nsPlainTextSerializer::DoAddText(bool aIsLineBreak,
+                                      const nsAString& aText) {
+  // If we don't want any output, just return
+  if (!DoOutput()) {
+    return;
+  }
+
+  if (!aIsLineBreak) {
+    // Make sure to reset this, since it's no longer true.
+    mHasWrittenCiteBlockquote = false;
+  }
+
+  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
+
+  if (MustSuppressLeaf()) {
+    return;
+  }
+
+  if (aIsLineBreak) {
+    // The only times we want to pass along whitespace from the original
+    // html source are if we're forced into preformatted mode via flags,
+    // or if we're prettyprinting and we're inside a <pre>.
+    // Otherwise, either we're collapsing to minimal text, or we're
+    // prettyprinting to mimic the html format, and in neither case
+    // does the formatting of the html source help us.
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted) ||
+        (mPreFormattedMail && !mSettings.GetWrapColumn()) ||
+        IsElementPreformatted()) {
+      EnsureVerticalSpace(mEmptyLines + 1);
+    } else if (!mInWhitespace) {
+      Write(kSpace);
+      mInWhitespace = true;
+    }
+    return;
+  }
+
+  Write(aText);
+}
+
+void CreateLineOfDashes(nsAString& aResult, const uint32_t aWrapColumn) {
+  MOZ_ASSERT(aResult.IsEmpty());
+
+  const uint32_t width = (aWrapColumn > 0 ? aWrapColumn : 25);
+  while (aResult.Length() < width) {
+    aResult.Append(char16_t('-'));
+  }
+}
+
+nsresult nsPlainTextSerializer::DoAddLeaf(const nsAtom* aTag) {
+  mPreformattedBlockBoundary = false;
+
+  if (!DoOutput()) {
+    return NS_OK;
+  }
+
+  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
+
+  if (MustSuppressLeaf()) {
+    return NS_OK;
+  }
+
+  if (aTag == nsGkAtoms::br) {
+    // Another egregious editor workaround, see bug 38194:
+    // ignore the bogus br tags that the editor sticks here and there.
+    // FYI: `brElement` may be `nullptr` if the element is <br> element
+    //      of non-HTML element.
+    // XXX Do we need to call `EnsureVerticalSpace()` when the <br> element
+    //     is not an HTML element?
+    HTMLBRElement* brElement = HTMLBRElement::FromNodeOrNull(mElement);
+    if (!brElement || !brElement->IsPaddingForEmptyLastLine()) {
+      EnsureVerticalSpace(mEmptyLines + 1);
+    }
+  } else if (aTag == nsGkAtoms::hr &&
+             mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
+    EnsureVerticalSpace(0);
+
+    // Make a line of dashes as wide as the wrap width
+    // XXX honoring percentage would be nice
+    nsAutoString line;
+    CreateLineOfDashes(line, mSettings.GetWrapColumn());
+    Write(line);
+
+    EnsureVerticalSpace(0);
+  } else if (aTag == nsGkAtoms::img) {
+    /* Output (in decreasing order of preference)
+       alt, title or nothing */
+    // See <http://www.w3.org/TR/REC-html40/struct/objects.html#edef-IMG>
+    nsAutoString imageDescription;
+    if (NS_SUCCEEDED(GetAttributeValue(nsGkAtoms::alt, imageDescription))) {
+      // If the alt attribute has an empty value (|alt=""|), output nothing
+    } else if (NS_SUCCEEDED(
+                   GetAttributeValue(nsGkAtoms::title, imageDescription)) &&
+               !imageDescription.IsEmpty()) {
+      imageDescription = u" ["_ns + imageDescription + u"] "_ns;
+    }
+
+    Write(imageDescription);
+  }
+
+  return NS_OK;
+}
+
+/**
+ * Adds as many newline as necessary to get |aNumberOfRows| empty lines
+ *
+ * aNumberOfRows = -1    :   Being in the middle of some line of text
+ * aNumberOfRows =  0    :   Being at the start of a line
+ * aNumberOfRows =  n>0  :   Having n empty lines before the current line.
+ */
+void nsPlainTextSerializer::EnsureVerticalSpace(const int32_t aNumberOfRows) {
+  // If we have something in the indent we probably want to output
+  // it and it's not included in the count for empty lines so we don't
+  // realize that we should start a new line.
+  if (aNumberOfRows >= 0 && !mCurrentLine.mIndentation.mHeader.IsEmpty()) {
+    EndLine(false);
+    mInWhitespace = true;
+  }
+
+  while (mEmptyLines < aNumberOfRows) {
+    EndLine(false);
+    mInWhitespace = true;
+  }
+  mLineBreakDue = false;
+  mFloatingLines = -1;
+}
+
+void nsPlainTextSerializer::OutputManager::Flush(CurrentLine& aCurrentLine) {
+  if (!aCurrentLine.mContent.IsEmpty()) {
+    aCurrentLine.MaybeReplaceNbspsInContent(mFlags);
+
+    Append(aCurrentLine, StripTrailingWhitespaces::kNo);
+
+    aCurrentLine.ResetContentAndIndentationHeader();
+  }
+}
+
+static bool IsSpaceStuffable(const char16_t* s) {
+  return (s[0] == '>' || s[0] == ' ' || s[0] == kNBSP ||
+          NS_strncmp(s, u"From ", 5) == 0);
+}
+
+void nsPlainTextSerializer::MaybeWrapAndOutputCompleteLines() {
+  if (!mSettings.MayWrap()) {
+    return;
+  }
+
+  const uint32_t prefixwidth = mCurrentLine.DeterminePrefixWidth();
+
+  // The width of the line as it will appear on the screen (approx.).
+  uint32_t currentLineContentWidth =
+      GetUnicharStringWidth(mCurrentLine.mContent);
+
+  // Yes, wrap!
+  // The "+4" is to avoid wrap lines that only would be a couple
+  // of letters too long. We give this bonus only if the
+  // wrapcolumn is more than 20.
+  const uint32_t wrapColumn = mSettings.GetWrapColumn();
+  uint32_t bonuswidth = (wrapColumn > 20) ? 4 : 0;
+
+  while (currentLineContentWidth + prefixwidth > wrapColumn + bonuswidth) {
+    const int32_t goodSpace = mCurrentLine.FindWrapIndexForContent(
+        wrapColumn, currentLineContentWidth, mLineBreaker);
+
+    const int32_t contentLength = mCurrentLine.mContent.Length();
+    if ((goodSpace < contentLength) && (goodSpace > 0)) {
+      // Found a place to break
+
+      // -1 (trim a char at the break position)
+      // only if the line break was a space.
+      nsAutoString restOfContent;
+      if (nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace))) {
+        mCurrentLine.mContent.Right(restOfContent,
+                                    contentLength - goodSpace - 1);
+      } else {
+        mCurrentLine.mContent.Right(restOfContent, contentLength - goodSpace);
+      }
+      // if breaker was U+0020, it has to consider for delsp=yes support
+      const bool breakBySpace = mCurrentLine.mContent.CharAt(goodSpace) == ' ';
+      mCurrentLine.mContent.Truncate(goodSpace);
+      EndLine(true, breakBySpace);
+      mCurrentLine.mContent.Truncate();
+      // Space stuff new line?
+      if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
+        if (!restOfContent.IsEmpty() && IsSpaceStuffable(restOfContent.get()) &&
+            mCurrentLine.mCiteQuoteLevel ==
+                0  // We space-stuff quoted lines anyway
+        ) {
+          // Space stuffing a la RFC 2646 (format=flowed).
+          mCurrentLine.mContent.Append(char16_t(' '));
+          // XXX doesn't seem to work correctly for ' '
+        }
+      }
+      mCurrentLine.mContent.Append(restOfContent);
+      currentLineContentWidth = GetUnicharStringWidth(mCurrentLine.mContent);
+      mEmptyLines = -1;
+    } else {
+      // Nothing to do. Hopefully we get more data later
+      // to use for a place to break line
+      break;
+    }
+  }
+}
+
+/**
+ * This function adds a piece of text to the current stored line. If we are
+ * wrapping text and the stored line will become too long, a suitable
+ * location to wrap will be found and the line that's complete will be
+ * output.
+ */
+void nsPlainTextSerializer::AddToLine(const char16_t* aLineFragment,
+                                      int32_t aLineFragmentLength) {
+  if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
+
+  if (mCurrentLine.mContent.IsEmpty()) {
+    if (0 == aLineFragmentLength) {
+      return;
+    }
+
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
+      if (IsSpaceStuffable(aLineFragment) &&
+          mCurrentLine.mCiteQuoteLevel ==
+              0  // We space-stuff quoted lines anyway
+      ) {
+        // Space stuffing a la RFC 2646 (format=flowed).
+        mCurrentLine.mContent.Append(char16_t(' '));
+      }
+    }
+    mEmptyLines = -1;
+  }
+
+  mCurrentLine.mContent.Append(aLineFragment, aLineFragmentLength);
+
+  MaybeWrapAndOutputCompleteLines();
+}
+
+// The signature separator (RFC 2646).
+const char kSignatureSeparator[] = "-- ";
+
+// The OpenPGP dash-escaped signature separator in inline
+// signed messages according to the OpenPGP standard (RFC 2440).
+const char kDashEscapedSignatureSeparator[] = "- -- ";
+
+static bool IsSignatureSeparator(const nsAString& aString) {
+  return aString.EqualsLiteral(kSignatureSeparator) ||
+         aString.EqualsLiteral(kDashEscapedSignatureSeparator);
+}
+
+/**
+ * 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.IsEmpty()) {
+    // No meaning
+    return;
+  }
+
+  /* In non-preformatted mode, remove spaces from the end of the line for
+   * format=flowed compatibility. Don't do this for these special cases:
+   * "-- ", the signature separator (RFC 2646) shouldn't be touched and
+   * "- -- ", the OpenPGP dash-escaped signature separator in inline
+   * signed messages according to the OpenPGP standard (RFC 2440).
+   */
+  if (!mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted) &&
+      (aSoftLineBreak || !IsSignatureSeparator(mCurrentLine.mContent))) {
+    mCurrentLine.mContent.Trim(" ", false, true, false);
+  }
+
+  if (aSoftLineBreak &&
+      mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed) &&
+      (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.
+
+    // If breaker character is ASCII space with RFC 3676 support (delsp=yes),
+    // add twice space.
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatDelSp) &&
+        aBreakBySpace) {
+      mCurrentLine.mContent.AppendLiteral("  ");
+    } else {
+      mCurrentLine.mContent.Append(char16_t(' '));
+    }
+  }
+
+  if (aSoftLineBreak) {
+    mEmptyLines = 0;
+  } else {
+    // Hard break
+    if (mCurrentLine.HasContentOrIndentationHeader()) {
+      mEmptyLines = 0;
+    } else {
+      mEmptyLines++;
+    }
+  }
+
+  MOZ_ASSERT(mOutputManager);
+
+  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
+  // would trick a format=flowed-aware receiver.
+  mOutputManager->Append(mCurrentLine,
+                         OutputManager::StripTrailingWhitespaces::kMaybe);
+  mOutputManager->AppendLineBreak();
+  mCurrentLine.ResetContentAndIndentationHeader();
+  mInWhitespace = true;
+  mLineBreakDue = false;
+  mFloatingLines = -1;
+}
+
+/**
+ * Creates the calculated and stored indent and text in the indentation. That is
+ * quote chars and numbers for numbered lists and such.
+ */
+void nsPlainTextSerializer::CurrentLine::CreateQuotesAndIndent(
+    nsAString& aResult) const {
+  // Put the mail quote "> " chars in, if appropriate:
+  if (mCiteQuoteLevel > 0) {
+    nsAutoString quotes;
+    for (int i = 0; i < mCiteQuoteLevel; i++) {
+      quotes.Append(char16_t('>'));
+    }
+    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
+         with the following one, so the empty line may be lost completely.) */
+      quotes.Append(char16_t(' '));
+    }
+    aResult = quotes;
+  }
+
+  // Indent if necessary
+  int32_t indentwidth = mIndentation.mLength - mIndentation.mHeader.Length();
+  if (indentwidth > 0 && HasContentOrIndentationHeader()
+      // Don't make empty lines look flowed
+  ) {
+    nsAutoString spaces;
+    for (int i = 0; i < indentwidth; ++i) spaces.Append(char16_t(' '));
+    aResult += spaces;
+  }
+
+  if (!mIndentation.mHeader.IsEmpty()) {
+    aResult += mIndentation.mHeader;
+  }
+}
+
+static bool IsLineFeedCarriageReturnBlankOrTab(char16_t c) {
+  return ('\n' == c || '\r' == c || ' ' == c || '\t' == c);
+}
+
+static void ReplaceVisiblyTrailingNbsps(nsAString& aString) {
+  const int32_t totLen = aString.Length();
+  for (int32_t i = totLen - 1; i >= 0; i--) {
+    char16_t c = aString[i];
+    if (IsLineFeedCarriageReturnBlankOrTab(c)) {
+      continue;
+    }
+    if (kNBSP == c) {
+      aString.Replace(i, 1, ' ');
+    } else {
+      break;
+    }
+  }
+}
+
+void nsPlainTextSerializer::ConvertToLinesAndOutput(const nsAString& aString) {
+  const int32_t totLen = aString.Length();
+  int32_t newline{0};
+
+  // Put the mail quote "> " chars in, if appropriate.
+  // Have to put it in before every line.
+  int32_t bol = 0;
+  while (bol < totLen) {
+    bool outputLineBreak = false;
+    bool spacesOnly = true;
+
+    // Find one of '\n' or '\r' using iterators since nsAString
+    // doesn't have the old FindCharInSet function.
+    nsAString::const_iterator iter;
+    aString.BeginReading(iter);
+    nsAString::const_iterator done_searching;
+    aString.EndReading(done_searching);
+    iter.advance(bol);
+    int32_t new_newline = bol;
+    newline = kNotFound;
+    while (iter != done_searching) {
+      if ('\n' == *iter || '\r' == *iter) {
+        newline = new_newline;
+        break;
+      }
+      if (' ' != *iter) {
+        spacesOnly = false;
+      }
+      ++new_newline;
+      ++iter;
+    }
+
+    // Done searching
+    nsAutoString stringpart;
+    if (newline == kNotFound) {
+      // No new lines.
+      stringpart.Assign(Substring(aString, bol, totLen - bol));
+      if (!stringpart.IsEmpty()) {
+        char16_t lastchar = stringpart.Last();
+        mInWhitespace = IsLineFeedCarriageReturnBlankOrTab(lastchar);
+      }
+      mEmptyLines = -1;
+      bol = totLen;
+    } else {
+      // There is a newline
+      stringpart.Assign(Substring(aString, bol, newline - bol));
+      mInWhitespace = true;
+      outputLineBreak = true;
+      mEmptyLines = 0;
+      bol = newline + 1;
+      if ('\r' == *iter && bol < totLen && '\n' == *++iter) {
+        // There was a CRLF in the input. This used to be illegal and
+        // stripped by the parser. Apparently not anymore. Let's skip
+        // over the LF.
+        bol++;
+      }
+    }
+
+    if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
+      if ((outputLineBreak || !spacesOnly) &&  // bugs 261467,125928
+          !IsQuotedLine(stringpart) && !IsSignatureSeparator(stringpart)) {
+        stringpart.Trim(" ", false, true, true);
+      }
+      if (IsSpaceStuffable(stringpart.get()) && !IsQuotedLine(stringpart)) {
+        mCurrentLine.mContent.Append(char16_t(' '));
+      }
+    }
+    mCurrentLine.mContent.Append(stringpart);
+
+    mCurrentLine.MaybeReplaceNbspsInContent(mSettings.GetFlags());
+
+    mOutputManager->Append(mCurrentLine,
+                           OutputManager::StripTrailingWhitespaces::kNo);
+    if (outputLineBreak) {
+      mOutputManager->AppendLineBreak();
+    }
+
+    mCurrentLine.ResetContentAndIndentationHeader();
+  }
+
+#ifdef DEBUG_wrapping
+  printf("No wrapping: newline is %d, totLen is %d\n", newline, totLen);
+#endif
+}
+
+/**
+ * Write a string. This is the highlevel function to use to get text output.
+ * By using AddToLine, Output, EndLine and other functions it handles quotation,
+ * line wrapping, indentation, whitespace compression and other things.
+ */
+void nsPlainTextSerializer::Write(const nsAString& aStr) {
+  // XXX Copy necessary to use nsString methods and gain
+  // access to underlying buffer
+  nsAutoString str(aStr);
+
+#ifdef DEBUG_wrapping
+  printf("Write(%s): wrap col = %d\n", NS_ConvertUTF16toUTF8(str).get(),
+         mSettings.GetWrapColumn());
+#endif
+
+  const int32_t totLen = str.Length();
+
+  // If the string is empty, do nothing:
+  if (totLen <= 0) return;
+
+  // For Flowed text change nbsp-ses to spaces at end of lines to allow them
+  // to be cut off along with usual spaces if required. (bug #125928)
+  if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
+    ReplaceVisiblyTrailingNbsps(str);
+  }
+
+  // We have two major codepaths here. One that does preformatted text and one
+  // that does normal formatted text. The one for preformatted text calls
+  // Output directly while the other code path goes through AddToLine.
+  if ((mPreFormattedMail && !mSettings.GetWrapColumn()) ||
+      (IsElementPreformatted() && !mPreFormattedMail) ||
+      (mSpanLevel > 0 && mEmptyLines >= 0 && IsQuotedLine(str))) {
+    // No intelligent wrapping.
+
+    // 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.IsEmpty()) {
+      mOutputManager->Flush(mCurrentLine);
+    }
+
+    ConvertToLinesAndOutput(str);
+    return;
+  }
+
+  // Intelligent handling of text
+  // If needed, strip out all "end of lines"
+  // and multiple whitespace between words
+  int32_t nextpos;
+  const char16_t* offsetIntoBuffer = nullptr;
+
+  int32_t bol = 0;
+  while (bol < totLen) {  // Loop over lines
+    // Find a place where we may have to do whitespace compression
+    nextpos = str.FindCharInSet(" \t\n\r", bol);
+#ifdef DEBUG_wrapping
+    nsAutoString remaining;
+    str.Right(remaining, totLen - bol);
+    foo = ToNewCString(remaining);
+    // printf("Next line: bol = %d, newlinepos = %d, totLen = %d, "
+    //        "string = '%s'\n", bol, nextpos, totLen, foo);
+    free(foo);
+#endif
+
+    if (nextpos == kNotFound) {
+      // The rest of the string
+      offsetIntoBuffer = str.get() + bol;
+      AddToLine(offsetIntoBuffer, totLen - bol);
+      bol = totLen;
+      mInWhitespace = false;
+    } else {
+      // There's still whitespace left in the string
+      if (nextpos != 0 && (nextpos + 1) < totLen) {
+        offsetIntoBuffer = str.get() + nextpos;
+        // skip '\n' if it is between CJ chars
+        if (offsetIntoBuffer[0] == '\n' && IS_CJ_CHAR(offsetIntoBuffer[-1]) &&
+            IS_CJ_CHAR(offsetIntoBuffer[1])) {
+          offsetIntoBuffer = str.get() + bol;
+          AddToLine(offsetIntoBuffer, nextpos - bol);
+          bol = nextpos + 1;
+          continue;
+        }
+      }
+      // If we're already in whitespace and not preformatted, just skip it:
+      if (mInWhitespace && (nextpos == bol) && !mPreFormattedMail &&
+          !mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted)) {
+        // Skip whitespace
+        bol++;
+        continue;
+      }
+
+      if (nextpos == bol) {
+        // Note that we are in whitespace.
+        mInWhitespace = true;
+        offsetIntoBuffer = str.get() + nextpos;
+        AddToLine(offsetIntoBuffer, 1);
+        bol++;
+        continue;
+      }
+
+      mInWhitespace = true;
+
+      offsetIntoBuffer = str.get() + bol;
+      if (mPreFormattedMail ||
+          mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted)) {
+        // Preserve the real whitespace character
+        nextpos++;
+        AddToLine(offsetIntoBuffer, nextpos - bol);
+        bol = nextpos;
+      } else {
+        // Replace the whitespace with a space
+        AddToLine(offsetIntoBuffer, nextpos - bol);
+        AddToLine(kSpace.get(), 1);
+        bol = nextpos + 1;  // Let's eat the whitespace
+      }
+    }
+  }  // Continue looping over the string
+}
+
+/**
+ * Gets the value of an attribute in a string. If the function returns
+ * NS_ERROR_NOT_AVAILABLE, there was none such attribute specified.
+ */
+nsresult nsPlainTextSerializer::GetAttributeValue(const nsAtom* aName,
+                                                  nsString& aValueRet) const {
+  if (mElement) {
+    if (mElement->GetAttr(kNameSpaceID_None, aName, aValueRet)) {
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_NOT_AVAILABLE;
+}
+
+/**
+ * Returns true, if the element was inserted by Moz' TXT->HTML converter.
+ * In this case, we should ignore it.
+ */
+bool nsPlainTextSerializer::IsCurrentNodeConverted() const {
+  nsAutoString value;
+  nsresult rv = GetAttributeValue(nsGkAtoms::_class, value);
+  return (NS_SUCCEEDED(rv) && (value.EqualsIgnoreCase("moz-txt", 7) ||
+                               value.EqualsIgnoreCase("\"moz-txt", 8)));
+}
+
+// static
+nsAtom* nsPlainTextSerializer::GetIdForContent(nsIContent* aContent) {
+  if (!aContent->IsHTMLElement()) {
+    return nullptr;
+  }
+
+  nsAtom* localName = aContent->NodeInfo()->NameAtom();
+  return localName->IsStatic() ? localName : nullptr;
+}
+
+bool nsPlainTextSerializer::IsElementPreformatted() const {
+  return !mPreformatStack.empty() && mPreformatStack.top();
+}
+
+bool nsPlainTextSerializer::IsElementPreformatted(Element* aElement) {
+  RefPtr<ComputedStyle> computedStyle =
+      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
+  if (computedStyle) {
+    const nsStyleText* textStyle = computedStyle->StyleText();
+    return textStyle->WhiteSpaceOrNewlineIsSignificant();
+  }
+  // Fall back to looking at the tag, in case there is no style information.
+  return GetIdForContent(aElement) == nsGkAtoms::pre;
+}
+
+bool nsPlainTextSerializer::IsCssBlockLevelElement(Element* aElement) {
+  RefPtr<ComputedStyle> computedStyle =
+      nsComputedDOMStyle::GetComputedStyleNoFlush(aElement, nullptr);
+  if (computedStyle) {
+    const nsStyleDisplay* displayStyle = computedStyle->StyleDisplay();
+    return displayStyle->IsBlockOutsideStyle();
+  }
+  // Fall back to looking at the tag, in case there is no style information.
+  return nsContentUtils::IsHTMLBlockLevelElement(aElement);
+}
+
+/**
+ * This method is required only to identify LI's inside OL.
+ * Returns TRUE if we are inside an OL tag and FALSE otherwise.
+ */
+bool nsPlainTextSerializer::IsInOL() const {
+  int32_t i = mTagStackIndex;
+  while (--i >= 0) {
+    if (mTagStack[i] == nsGkAtoms::ol) return true;
+    if (mTagStack[i] == nsGkAtoms::ul) {
+      // If a UL is reached first, LI belongs the UL nested in OL.
+      return false;
+    }
+  }
+  // We may reach here for orphan LI's.
+  return false;
+}
+
+bool nsPlainTextSerializer::IsInOlOrUl() const {
+  return (mULCount > 0) || !mOLStack.IsEmpty();
+}
+
+/*
+  @return 0 = no header, 1 = h1, ..., 6 = h6
+*/
+int32_t HeaderLevel(const nsAtom* aTag) {
+  if (aTag == nsGkAtoms::h1) {
+    return 1;
+  }
+  if (aTag == nsGkAtoms::h2) {
+    return 2;
+  }
+  if (aTag == nsGkAtoms::h3) {
+    return 3;
+  }
+  if (aTag == nsGkAtoms::h4) {
+    return 4;
+  }
+  if (aTag == nsGkAtoms::h5) {
+    return 5;
+  }
+  if (aTag == nsGkAtoms::h6) {
+    return 6;
+  }
+  return 0;
+}
+
+/*
+ * This is an implementation of GetUnicharWidth() and
+ * GetUnicharStringWidth() as defined in
+ * "The Single UNIX Specification, Version 2, The Open Group, 1997"
+ * <http://www.UNIX-systems.org/online.html>
+ *
+ * Markus Kuhn -- 2000-02-08 -- public domain
+ *
+ * Minor alterations to fit Mozilla's data types by Daniel Bratell
+ */
+
+/* These functions define the column width of an ISO 10646 character
+ * as follows:
+ *
+ *    - The null character (U+0000) has a column width of 0.
+ *
+ *    - Other C0/C1 control characters and DEL will lead to a return
+ *      value of -1.
+ *
+ *    - Non-spacing and enclosing combining characters (general
+ *      category code Mn or Me in the Unicode database) have a
+ *      column width of 0.
+ *
+ *    - Spacing characters in the East Asian Wide (W) or East Asian
+ *      FullWidth (F) category as defined in Unicode Technical
+ *      Report #11 have a column width of 2.
+ *
+ *    - All remaining characters (including all printable
+ *      ISO 8859-1 and WGL4 characters, Unicode control characters,
+ *      etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+namespace {
+
+struct interval {
+  uint16_t first;
+  uint16_t last;
+};
+
+struct CombiningComparator {
+  const char16_t mUcs;
+  explicit CombiningComparator(char16_t aUcs) : mUcs(aUcs) {}
+  int operator()(const interval& combining) const {
+    if (mUcs > combining.last) return 1;
+    if (mUcs < combining.first) return -1;
+
+    MOZ_ASSERT(combining.first <= mUcs);
+    MOZ_ASSERT(mUcs <= combining.last);
+    return 0;
+  }
+};
+
+}  // namespace
+
+int32_t GetUnicharWidth(char16_t ucs) {
+  /* sorted list of non-overlapping intervals of non-spacing characters */
+  static const interval combining[] = {
+      {0x0300, 0x034E}, {0x0360, 0x0362}, {0x0483, 0x0486}, {0x0488, 0x0489},
+      {0x0591, 0x05A1}, {0x05A3, 0x05B9}, {0x05BB, 0x05BD}, {0x05BF, 0x05BF},
+      {0x05C1, 0x05C2}, {0x05C4, 0x05C4}, {0x064B, 0x0655}, {0x0670, 0x0670},
+      {0x06D6, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED}, {0x0711, 0x0711},
+      {0x0730, 0x074A}, {0x07A6, 0x07B0}, {0x0901, 0x0902}, {0x093C, 0x093C},
+      {0x0941, 0x0948}, {0x094D, 0x094D}, {0x0951, 0x0954}, {0x0962, 0x0963},
+      {0x0981, 0x0981}, {0x09BC, 0x09BC}, {0x09C1, 0x09C4}, {0x09CD, 0x09CD},
+      {0x09E2, 0x09E3}, {0x0A02, 0x0A02}, {0x0A3C, 0x0A3C}, {0x0A41, 0x0A42},
+      {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D}, {0x0A70, 0x0A71}, {0x0A81, 0x0A82},
+      {0x0ABC, 0x0ABC}, {0x0AC1, 0x0AC5}, {0x0AC7, 0x0AC8}, {0x0ACD, 0x0ACD},
+      {0x0B01, 0x0B01}, {0x0B3C, 0x0B3C}, {0x0B3F, 0x0B3F}, {0x0B41, 0x0B43},
+      {0x0B4D, 0x0B4D}, {0x0B56, 0x0B56}, {0x0B82, 0x0B82}, {0x0BC0, 0x0BC0},
+      {0x0BCD, 0x0BCD}, {0x0C3E, 0x0C40}, {0x0C46, 0x0C48}, {0x0C4A, 0x0C4D},
+      {0x0C55, 0x0C56}, {0x0CBF, 0x0CBF}, {0x0CC6, 0x0CC6}, {0x0CCC, 0x0CCD},
+      {0x0D41, 0x0D43}, {0x0D4D, 0x0D4D}, {0x0DCA, 0x0DCA}, {0x0DD2, 0x0DD4},
+      {0x0DD6, 0x0DD6}, {0x0E31, 0x0E31}, {0x0E34, 0x0E3A}, {0x0E47, 0x0E4E},
+      {0x0EB1, 0x0EB1}, {0x0EB4, 0x0EB9}, {0x0EBB, 0x0EBC}, {0x0EC8, 0x0ECD},
+      {0x0F18, 0x0F19}, {0x0F35, 0x0F35}, {0x0F37, 0x0F37}, {0x0F39, 0x0F39},
+      {0x0F71, 0x0F7E}, {0x0F80, 0x0F84}, {0x0F86, 0x0F87}, {0x0F90, 0x0F97},
+      {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102D, 0x1030}, {0x1032, 0x1032},
+      {0x1036, 0x1037}, {0x1039, 0x1039}, {0x1058, 0x1059}, {0x17B7, 0x17BD},
+      {0x17C6, 0x17C6}, {0x17C9, 0x17D3}, {0x18A9, 0x18A9}, {0x20D0, 0x20E3},
+      {0x302A, 0x302F}, {0x3099, 0x309A}, {0xFB1E, 0xFB1E}, {0xFE20, 0xFE23}};
+
+  /* test for 8-bit control characters */
+  if (ucs == 0) return 0;
+  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return -1;
+
+  /* first quick check for Latin-1 etc. characters */
+  if (ucs < combining[0].first) return 1;
+
+  /* binary search in table of non-spacing characters */
+  size_t idx;
+  if (BinarySearchIf(combining, 0, ArrayLength(combining),
+                     CombiningComparator(ucs), &idx)) {
+    return 0;
+  }
+
+  /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+  /* fast test for majority of non-wide scripts */
+  if (ucs < 0x1100) return 1;
+
+  return 1 +
+         ((ucs >= 0x1100 && ucs <= 0x115f) || /* Hangul Jamo */
+          (ucs >= 0x2e80 && ucs <= 0xa4cf && (ucs & ~0x0011) != 0x300a &&
+           ucs != 0x303f) ||                  /* CJK ... Yi */
+          (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+          (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+          (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+          (ucs >= 0xff00 && ucs <= 0xff5f) || /* Fullwidth Forms */
+          (ucs >= 0xffe0 && ucs <= 0xffe6));
+}
+
+int32_t GetUnicharStringWidth(const nsString& aString) {
+  const char16_t* pwcs = aString.get();
+  int32_t n = aString.Length();
+
+  int32_t w, width = 0;
+
+  for (; *pwcs && n-- > 0; pwcs++)
+    if ((w = GetUnicharWidth(*pwcs)) < 0)
+      ++width;  // Taking 1 as the width of non-printable character, for bug#
+                // 94475.
+    else
+      width += w;
+
+  return width;
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsPlainTextSerializer.h firefox-85.0+build1/dom/serializers/nsPlainTextSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsPlainTextSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsPlainTextSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,389 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert a DOM into plaintext in a nice way
+ * (eg for copy/paste as plaintext).
+ */
+
+#ifndef nsPlainTextSerializer_h__
+#define nsPlainTextSerializer_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/intl/LineBreaker.h"
+#include "nsCOMPtr.h"
+#include "nsAtom.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIContentSerializer.h"
+#include "nsIDocumentEncoder.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+#include <stack>
+
+class nsIContent;
+
+namespace mozilla {
+namespace dom {
+class DocumentType;
+class Element;
+}  // namespace dom
+}  // namespace mozilla
+
+class nsPlainTextSerializer final : public nsIContentSerializer {
+ public:
+  nsPlainTextSerializer();
+
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsPlainTextSerializer)
+
+  // nsIContentSerializer
+  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
+                  const mozilla::Encoding* aEncoding, bool aIsCopying,
+                  bool aIsWholeDocument, bool* aNeedsPreformatScanning,
+                  nsAString& aOutput) override;
+
+  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
+                        int32_t aEndOffset) override;
+  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
+                                int32_t aEndOffset) override;
+  NS_IMETHOD AppendProcessingInstruction(
+      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
+      int32_t aEndOffset) override {
+    return NS_OK;
+  }
+  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
+                           int32_t aStartOffset, int32_t aEndOffset) override {
+    return NS_OK;
+  }
+  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) override {
+    return NS_OK;
+  }
+  NS_IMETHOD AppendElementStart(
+      mozilla::dom::Element* aElement,
+      mozilla::dom::Element* aOriginalElement) override;
+  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
+                              mozilla::dom::Element* aOriginalElement) override;
+
+  NS_IMETHOD FlushAndFinish() override;
+
+  NS_IMETHOD Finish() override;
+
+  NS_IMETHOD GetOutputLength(uint32_t& aLength) const override;
+
+  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
+
+  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) override;
+  NS_IMETHOD ForgetElementForPreformat(
+      mozilla::dom::Element* aElement) override;
+
+ private:
+  ~nsPlainTextSerializer();
+
+  nsresult GetAttributeValue(const nsAtom* aName, nsString& aValueRet) const;
+  void AddToLine(const char16_t* aStringToAdd, int32_t aLength);
+
+  void MaybeWrapAndOutputCompleteLines();
+
+  // @param aSoftLineBreak A soft line break is a space followed by a linebreak
+  // (cf. https://www.ietf.org/rfc/rfc3676.txt, section 4.2).
+  void EndLine(bool aSoftLineBreak, bool aBreakBySpace = false);
+
+  void EnsureVerticalSpace(int32_t noOfRows);
+
+  void ConvertToLinesAndOutput(const nsAString& aString);
+
+  void Write(const nsAString& aString);
+
+  // @return true, iff the elements' whitespace and newline characters have to
+  //         be preserved according to its style or because it's a `<pre>`
+  //         element.
+  bool IsElementPreformatted() const;
+  bool IsInOL() const;
+  bool IsInOlOrUl() const;
+  bool IsCurrentNodeConverted() const;
+  bool MustSuppressLeaf() const;
+
+  /**
+   * Returns the local name of the element as an atom if the element is an
+   * HTML element and the atom is a static atom. Otherwise, nullptr is returned.
+   */
+  static nsAtom* GetIdForContent(nsIContent* aContent);
+  nsresult DoOpenContainer(const nsAtom* aTag);
+  void OpenContainerForOutputFormatted(const nsAtom* aTag);
+  nsresult DoCloseContainer(const nsAtom* aTag);
+  void CloseContainerForOutputFormatted(const nsAtom* aTag);
+  nsresult DoAddLeaf(const nsAtom* aTag);
+
+  void DoAddText();
+  // @param aText Ignored if aIsLineBreak is true.
+  void DoAddText(bool aIsLineBreak, const nsAString& aText);
+
+  inline bool DoOutput() const { return mHeadLevel == 0; }
+
+  static inline bool IsQuotedLine(const nsAString& aLine) {
+    return !aLine.IsEmpty() && aLine.First() == char16_t('>');
+  }
+
+  // Stack handling functions
+  bool GetLastBool(const nsTArray<bool>& aStack);
+  void SetLastBool(nsTArray<bool>& aStack, bool aValue);
+  void PushBool(nsTArray<bool>& aStack, bool aValue);
+  bool PopBool(nsTArray<bool>& aStack);
+
+  bool IsIgnorableRubyAnnotation(const nsAtom* aTag) const;
+
+  // @return true, iff the elements' whitespace and newline characters have to
+  //         be preserved according to its style or because it's a `<pre>`
+  //         element.
+  static bool IsElementPreformatted(mozilla::dom::Element* aElement);
+
+  // https://drafts.csswg.org/css-display/#block-level
+  static bool IsCssBlockLevelElement(mozilla::dom::Element* aElement);
+
+ private:
+  uint32_t mHeadLevel;
+
+  class Settings {
+   public:
+    enum class HeaderStrategy {
+      kNoIndentation,
+      kIndentIncreasedWithHeaderLevel,
+      kNumberHeadingsAndIndentSlightly
+    };
+
+    // May adapt the flags.
+    //
+    // @param aFlags As defined in nsIDocumentEncoder.idl.
+    void Init(int32_t aFlags, uint32_t aWrapColumn);
+
+    // Pref: converter.html2txt.structs.
+    bool GetStructs() const { return mStructs; }
+
+    // Pref: converter.html2txt.header_strategy.
+    HeaderStrategy GetHeaderStrategy() const { return mHeaderStrategy; }
+
+    // @return As defined in nsIDocumentEncoder.idl.
+    int32_t GetFlags() const { return mFlags; }
+
+    // @param aFlag As defined in nsIDocumentEncoder.idl. May consist of
+    // multiple bitwise or'd flags.
+    bool HasFlag(int32_t aFlag) const { return mFlags & aFlag; }
+
+    // Whether the output should include ruby annotations.
+    bool GetWithRubyAnnotation() const { return mWithRubyAnnotation; }
+
+    uint32_t GetWrapColumn() const { return mWrapColumn; }
+
+    bool MayWrap() const {
+      return GetWrapColumn() && HasFlag(nsIDocumentEncoder::OutputFormatted |
+                                        nsIDocumentEncoder::OutputWrap);
+    }
+
+    bool MayBreakLines() const {
+      return !HasFlag(nsIDocumentEncoder::OutputDisallowLineBreaking);
+    }
+
+   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.
+    HeaderStrategy mHeaderStrategy =
+        HeaderStrategy::kIndentIncreasedWithHeaderLevel;
+
+    // Flags defined in nsIDocumentEncoder.idl.
+    int32_t mFlags = 0;
+
+    // Whether the output should include ruby annotations.
+    bool mWithRubyAnnotation = false;
+
+    // The wrap column is how many fixed-pitch narrow
+    // (https://unicode.org/reports/tr11/) (e.g. Latin) characters
+    // should be allowed on a line. There could be less chars if the chars
+    // are wider than latin chars of more if the chars are more narrow.
+    uint32_t mWrapColumn = 0;
+  };
+
+  Settings mSettings;
+
+  struct Indentation {
+    // 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;
+  };
+
+  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.IsEmpty() || !mIndentation.mHeader.IsEmpty();
+    }
+
+    // @param aContentWidth Has to be the unichar string width of mContent.
+    // @param aLineBreaker May be nullptr.
+    int32_t FindWrapIndexForContent(
+        uint32_t aWrapColumn, uint32_t aContentWidth,
+        mozilla::intl::LineBreaker* aLineBreaker) const;
+
+    // @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.mLength;
+    }
+
+    Indentation mIndentation;
+
+    // The number of '>' characters.
+    int32_t mCiteQuoteLevel = 0;
+
+    // Excludes indentation and quotes.
+    nsString mContent;
+  };
+
+  CurrentLine mCurrentLine;
+
+  class OutputManager {
+   public:
+    /**
+     *  @param aFlags As defined in nsIDocumentEncoder.idl.
+     *  @param aOutput An empty string.
+     */
+    OutputManager(int32_t aFlags, nsAString& aOutput);
+
+    enum class StripTrailingWhitespaces { kMaybe, kNo };
+
+    void Append(const CurrentLine& aCurrentLine,
+                StripTrailingWhitespaces aStripTrailingWhitespaces);
+
+    void AppendLineBreak();
+
+    /**
+     * This empties the current line cache without adding a NEWLINE.
+     * Should not be used if line wrapping is of importance since
+     * this function destroys the cache information.
+     *
+     * It will also write indentation and quotes if we believe us to be
+     * at the start of the line.
+     */
+    void Flush(CurrentLine& aCurrentLine);
+
+    bool IsAtFirstColumn() const { return mAtFirstColumn; }
+
+    uint32_t GetOutputLength() const;
+
+   private:
+    /**
+     * @param aString Last character is expected to not be a line break.
+     */
+    void Append(const nsAString& aString);
+
+    // As defined in nsIDocumentEncoder.idl.
+    const int32_t mFlags;
+
+    nsAString& mOutput;
+
+    bool mAtFirstColumn;
+
+    nsString mLineBreak;
+  };
+
+  mozilla::Maybe<OutputManager> mOutputManager;
+
+  // If we've just written out a cite blockquote, we need to remember it
+  // so we don't duplicate spaces before a <pre wrap> (which mail uses to quote
+  // old messages).
+  bool mHasWrittenCiteBlockquote;
+
+  int32_t mFloatingLines;  // To store the number of lazy line breaks
+
+  // Treat quoted text as though it's preformatted -- don't wrap it.
+  // Having it on a pref is a temporary measure, See bug 69638.
+  int32_t mSpanLevel;
+
+  int32_t mEmptyLines;  // Will be the number of empty lines before
+                        // the current. 0 if we are starting a new
+                        // line and -1 if we are in a line.
+
+  bool mInWhitespace;
+  bool mPreFormattedMail;  // we're dealing with special DOM
+                           // used by Thunderbird code.
+
+  // While handling a new tag, this variable should remind if any line break
+  // is due because of a closing tag. Setting it to "TRUE" while closing the
+  // tags. Hence opening tags are guaranteed to start with appropriate line
+  // breaks.
+  bool mLineBreakDue;
+
+  bool mPreformattedBlockBoundary;
+
+  int32_t mHeaderCounter[7]; /* For header-numbering:
+                                Number of previous headers of
+                                the same depth and in the same
+                                section.
+                                mHeaderCounter[1] for <h1> etc. */
+
+  RefPtr<mozilla::dom::Element> mElement;
+
+  // For handling table rows
+  AutoTArray<bool, 8> mHasWrittenCellsForRow;
+
+  // Values gotten in OpenContainer that is (also) needed in CloseContainer
+  AutoTArray<bool, 8> mIsInCiteBlockquote;
+
+  // The tag stack: the stack of tags we're operating on, so we can nest.
+  // The stack only ever points to static atoms, so they don't need to be
+  // refcounted.
+  const nsAtom** mTagStack;
+  uint32_t mTagStackIndex;
+
+  // The stack indicating whether the elements we've been operating on are
+  // CSS preformatted elements, so that we can tell if the text inside them
+  // should be formatted.
+  std::stack<bool> mPreformatStack;
+
+  // Content in the stack above this index should be ignored:
+  uint32_t mIgnoreAboveIndex;
+
+  // The stack for ordered lists
+  AutoTArray<int32_t, 100> mOLStack;
+
+  uint32_t mULCount;
+
+  RefPtr<mozilla::intl::LineBreaker> mLineBreaker;
+
+  // Conveniance constant. It would be nice to have it as a const static
+  // variable, but that causes issues with OpenBSD and module unloading.
+  const nsString kSpace;
+
+  // mIgnoredChildNodeLevel is used to tell if current node is an ignorable
+  // child node. The initial value of mIgnoredChildNodeLevel is 0. When
+  // serializer enters those specific nodes, mIgnoredChildNodeLevel increases
+  // and is greater than 0. Otherwise when serializer leaves those nodes,
+  // mIgnoredChildNodeLevel decreases.
+  uint32_t mIgnoredChildNodeLevel;
+};
+
+nsresult NS_NewPlainTextSerializer(nsIContentSerializer** aSerializer);
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/serializers/nsXHTMLContentSerializer.cpp firefox-85.0+build1/dom/serializers/nsXHTMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/serializers/nsXHTMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsXHTMLContentSerializer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,731 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an XHTML (not HTML!) DOM to an XHTML
+ * string that could be parsed into more or less the original DOM.
+ */
+
+#include "nsXHTMLContentSerializer.h"
+
+#include "mozilla/dom/Element.h"
+#include "nsIContent.h"
+#include "mozilla/dom/Document.h"
+#include "nsElementTable.h"
+#include "nsNameSpaceManager.h"
+#include "nsString.h"
+#include "nsUnicharUtils.h"
+#include "nsIDocumentEncoder.h"
+#include "nsGkAtoms.h"
+#include "nsIURI.h"
+#include "nsNetUtil.h"
+#include "nsEscape.h"
+#include "nsCRT.h"
+#include "nsContentUtils.h"
+#include "nsIScriptElement.h"
+#include "nsStubMutationObserver.h"
+#include "nsAttrName.h"
+#include "nsComputedDOMStyle.h"
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+static const int32_t kLongLineLen = 128;
+
+#define kXMLNS "xmlns"
+
+nsresult NS_NewXHTMLContentSerializer(nsIContentSerializer** aSerializer) {
+  RefPtr<nsXHTMLContentSerializer> it = new nsXHTMLContentSerializer();
+  it.forget(aSerializer);
+  return NS_OK;
+}
+
+nsXHTMLContentSerializer::nsXHTMLContentSerializer()
+    : mIsHTMLSerializer(false),
+      mIsCopying(false),
+      mDisableEntityEncoding(0),
+      mRewriteEncodingDeclaration(false),
+      mIsFirstChildOfOL(false) {}
+
+nsXHTMLContentSerializer::~nsXHTMLContentSerializer() {
+  NS_ASSERTION(mOLStateStack.IsEmpty(), "Expected OL State stack to be empty");
+}
+
+NS_IMETHODIMP
+nsXHTMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,
+                               const Encoding* aEncoding, bool aIsCopying,
+                               bool aRewriteEncodingDeclaration,
+                               bool* aNeedsPreformatScanning,
+                               nsAString& aOutput) {
+  // The previous version of the HTML serializer did implicit wrapping
+  // when there is no flags, so we keep wrapping in order to keep
+  // compatibility with the existing calling code
+  // XXXLJ perhaps should we remove this default settings later ?
+  if (aFlags & nsIDocumentEncoder::OutputFormatted) {
+    aFlags = aFlags | nsIDocumentEncoder::OutputWrap;
+  }
+
+  nsresult rv;
+  rv = nsXMLContentSerializer::Init(aFlags, aWrapColumn, aEncoding, aIsCopying,
+                                    aRewriteEncodingDeclaration,
+                                    aNeedsPreformatScanning, aOutput);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  mRewriteEncodingDeclaration = aRewriteEncodingDeclaration;
+  mIsCopying = aIsCopying;
+  mIsFirstChildOfOL = false;
+  mInBody = 0;
+  mDisableEntityEncoding = 0;
+  mBodyOnly = (mFlags & nsIDocumentEncoder::OutputBodyOnly);
+
+  return NS_OK;
+}
+
+// See if the string has any lines longer than longLineLen:
+// if so, we presume formatting is wonky (e.g. the node has been edited)
+// and we'd better rewrap the whole text node.
+bool nsXHTMLContentSerializer::HasLongLines(const nsString& text,
+                                            int32_t& aLastNewlineOffset) {
+  uint32_t start = 0;
+  uint32_t theLen = text.Length();
+  bool rv = false;
+  aLastNewlineOffset = kNotFound;
+  for (start = 0; start < theLen;) {
+    int32_t eol = text.FindChar('\n', start);
+    if (eol < 0) {
+      eol = text.Length();
+    } else {
+      aLastNewlineOffset = eol;
+    }
+    if (int32_t(eol - start) > kLongLineLen) rv = true;
+    start = eol + 1;
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsXHTMLContentSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
+                                     int32_t aEndOffset) {
+  NS_ENSURE_ARG(aText);
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString data;
+  nsresult rv;
+
+  rv = AppendTextData(aText, aStartOffset, aEndOffset, data, true);
+  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoFormat) {
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    int32_t lastNewlineOffset = kNotFound;
+    if (HasLongLines(data, lastNewlineOffset)) {
+      // We have long lines, rewrap
+      mDoWrap = true;
+      bool result = AppendToStringWrapped(data, *mOutput);
+      mDoWrap = false;
+      NS_ENSURE_TRUE(result, NS_ERROR_OUT_OF_MEMORY);
+    } else {
+      NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+  }
+
+  return NS_OK;
+}
+
+bool nsXHTMLContentSerializer::SerializeAttributes(
+    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
+    const nsAString& aTagNamespaceURI, nsAtom* aTagName, nsAString& aStr,
+    uint32_t aSkipAttr, bool aAddNSAttr) {
+  nsresult rv;
+  uint32_t index, count;
+  nsAutoString prefixStr, uriStr, valueStr;
+  nsAutoString xmlnsStr;
+  xmlnsStr.AssignLiteral(kXMLNS);
+
+  int32_t contentNamespaceID = aElement->GetNameSpaceID();
+
+  MaybeSerializeIsValue(aElement, aStr);
+
+  // this method is not called by nsHTMLContentSerializer
+  // so we don't have to check HTML element, just XHTML
+
+  if (mIsCopying && kNameSpaceID_XHTML == contentNamespaceID) {
+    // Need to keep track of OL and LI elements in order to get ordinal number
+    // for the LI.
+    if (aTagName == nsGkAtoms::ol) {
+      // We are copying and current node is an OL;
+      // Store its start attribute value in olState->startVal.
+      nsAutoString start;
+      int32_t startAttrVal = 0;
+      aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::start, start);
+      if (!start.IsEmpty()) {
+        nsresult rv = NS_OK;
+        startAttrVal = start.ToInteger(&rv);
+        // If OL has "start" attribute, first LI element has to start with that
+        // value Therefore subtracting 1 as all the LI elements are incrementing
+        // it before using it; In failure of ToInteger(), default StartAttrValue
+        // to 0.
+        if (NS_SUCCEEDED(rv))
+          --startAttrVal;
+        else
+          startAttrVal = 0;
+      }
+      olState state(startAttrVal, true);
+      mOLStateStack.AppendElement(state);
+    } else if (aTagName == nsGkAtoms::li) {
+      mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement);
+      if (mIsFirstChildOfOL) {
+        // If OL is parent of this LI, serialize attributes in different manner.
+        NS_ENSURE_TRUE(SerializeLIValueAttribute(aElement, aStr), false);
+      }
+    }
+  }
+
+  // If we had to add a new namespace declaration, serialize
+  // and push it on the namespace stack
+  if (aAddNSAttr) {
+    if (aTagPrefix.IsEmpty()) {
+      // Serialize default namespace decl
+      NS_ENSURE_TRUE(
+          SerializeAttr(u""_ns, xmlnsStr, aTagNamespaceURI, aStr, true), false);
+    } else {
+      // Serialize namespace decl
+      NS_ENSURE_TRUE(
+          SerializeAttr(xmlnsStr, aTagPrefix, aTagNamespaceURI, aStr, true),
+          false);
+    }
+    PushNameSpaceDecl(aTagPrefix, aTagNamespaceURI, aOriginalElement);
+  }
+
+  count = aElement->GetAttrCount();
+
+  // Now serialize each of the attributes
+  // XXX Unfortunately we need a namespace manager to get
+  // attribute URIs.
+  for (index = 0; index < count; index++) {
+    if (aSkipAttr == index) {
+      continue;
+    }
+
+    dom::BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
+    const nsAttrName* name = info.mName;
+
+    int32_t namespaceID = name->NamespaceID();
+    nsAtom* attrName = name->LocalName();
+    nsAtom* attrPrefix = name->GetPrefix();
+
+    // Filter out any attribute starting with [-|_]moz
+    nsDependentAtomString attrNameStr(attrName);
+    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
+        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
+      continue;
+    }
+
+    if (attrPrefix) {
+      attrPrefix->ToString(prefixStr);
+    } else {
+      prefixStr.Truncate();
+    }
+
+    bool addNSAttr = false;
+    if (kNameSpaceID_XMLNS != namespaceID) {
+      nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, uriStr);
+      addNSAttr = ConfirmPrefix(prefixStr, uriStr, aOriginalElement, true);
+    }
+
+    info.mValue->ToString(valueStr);
+
+    nsDependentAtomString nameStr(attrName);
+    bool isJS = false;
+
+    if (kNameSpaceID_XHTML == contentNamespaceID) {
+      if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsGkAtoms::li) &&
+          (attrName == nsGkAtoms::value)) {
+        // This is handled separately in SerializeLIValueAttribute()
+        continue;
+      }
+
+      isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
+
+      if (namespaceID == kNameSpaceID_None &&
+          ((attrName == nsGkAtoms::href) || (attrName == nsGkAtoms::src))) {
+        // Make all links absolute when converting only the selection:
+        if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
+          // Would be nice to handle OBJECT tags,
+          // but that gets more complicated since we have to
+          // search the tag list for CODEBASE as well.
+          // For now, just leave them relative.
+          nsIURI* uri = aElement->GetBaseURI();
+          if (uri) {
+            nsAutoString absURI;
+            rv = NS_MakeAbsoluteURI(absURI, valueStr, uri);
+            if (NS_SUCCEEDED(rv)) {
+              valueStr = absURI;
+            }
+          }
+        }
+      }
+
+      if (mRewriteEncodingDeclaration && aTagName == nsGkAtoms::meta &&
+          attrName == nsGkAtoms::content) {
+        // If we're serializing a <meta http-equiv="content-type">,
+        // use the proper value, rather than what's in the document.
+        nsAutoString header;
+        aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv, header);
+        if (header.LowerCaseEqualsLiteral("content-type")) {
+          valueStr =
+              u"text/html; charset="_ns + NS_ConvertASCIItoUTF16(mCharset);
+        }
+      }
+
+      // Expand shorthand attribute.
+      if (namespaceID == kNameSpaceID_None &&
+          IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) {
+        valueStr = nameStr;
+      }
+    } else {
+      isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
+    }
+
+    NS_ENSURE_TRUE(SerializeAttr(prefixStr, nameStr, valueStr, aStr, !isJS),
+                   false);
+
+    if (addNSAttr) {
+      NS_ASSERTION(!prefixStr.IsEmpty(),
+                   "Namespaced attributes must have a prefix");
+      NS_ENSURE_TRUE(SerializeAttr(xmlnsStr, prefixStr, uriStr, aStr, true),
+                     false);
+      PushNameSpaceDecl(prefixStr, uriStr, aOriginalElement);
+    }
+  }
+
+  return true;
+}
+
+bool nsXHTMLContentSerializer::AfterElementStart(nsIContent* aContent,
+                                                 nsIContent* aOriginalElement,
+                                                 nsAString& aStr) {
+  if (mRewriteEncodingDeclaration && aContent->IsHTMLElement(nsGkAtoms::head)) {
+    // Check if there already are any content-type meta children.
+    // If there are, they will be modified to use the correct charset.
+    // If there aren't, we'll insert one here.
+    bool hasMeta = false;
+    for (nsIContent* child = aContent->GetFirstChild(); child;
+         child = child->GetNextSibling()) {
+      if (child->IsHTMLElement(nsGkAtoms::meta) &&
+          child->AsElement()->HasAttr(kNameSpaceID_None, nsGkAtoms::content)) {
+        nsAutoString header;
+        child->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::httpEquiv,
+                                    header);
+
+        if (header.LowerCaseEqualsLiteral("content-type")) {
+          hasMeta = true;
+          break;
+        }
+      }
+    }
+
+    if (!hasMeta) {
+      NS_ENSURE_TRUE(AppendNewLineToString(aStr), false);
+      if (mDoFormat) {
+        NS_ENSURE_TRUE(AppendIndentation(aStr), false);
+      }
+      NS_ENSURE_TRUE(
+          AppendToString(u"<meta http-equiv=\"content-type\""_ns, aStr), false);
+      NS_ENSURE_TRUE(AppendToString(u" content=\"text/html; charset="_ns, aStr),
+                     false);
+      NS_ENSURE_TRUE(AppendToString(NS_ConvertASCIItoUTF16(mCharset), aStr),
+                     false);
+      if (mIsHTMLSerializer) {
+        NS_ENSURE_TRUE(AppendToString(u"\">"_ns, aStr), false);
+      } else {
+        NS_ENSURE_TRUE(AppendToString(u"\" />"_ns, aStr), false);
+      }
+    }
+  }
+
+  return true;
+}
+
+void nsXHTMLContentSerializer::AfterElementEnd(nsIContent* aContent,
+                                               nsAString& aStr) {
+  NS_ASSERTION(!mIsHTMLSerializer,
+               "nsHTMLContentSerializer shouldn't call this method !");
+
+  // this method is not called by nsHTMLContentSerializer
+  // so we don't have to check HTML element, just XHTML
+  if (aContent->IsHTMLElement(nsGkAtoms::body)) {
+    --mInBody;
+  }
+}
+
+NS_IMETHODIMP
+nsXHTMLContentSerializer::AppendDocumentStart(Document* aDocument) {
+  if (!mBodyOnly) {
+    return nsXMLContentSerializer::AppendDocumentStart(aDocument);
+  }
+
+  return NS_OK;
+}
+
+bool nsXHTMLContentSerializer::CheckElementStart(Element* aElement,
+                                                 bool& aForceFormat,
+                                                 nsAString& aStr,
+                                                 nsresult& aResult) {
+  aResult = NS_OK;
+
+  // The _moz_dirty attribute is emitted by the editor to
+  // indicate that this element should be pretty printed
+  // even if we're not in pretty printing mode
+  aForceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
+                 aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
+
+  if (aElement->IsHTMLElement(nsGkAtoms::br) &&
+      (mFlags & nsIDocumentEncoder::OutputNoFormattingInPre) &&
+      PreLevel() > 0) {
+    aResult = AppendNewLineToString(aStr) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+    return false;
+  }
+
+  if (aElement->IsHTMLElement(nsGkAtoms::body)) {
+    ++mInBody;
+  }
+
+  return true;
+}
+
+bool nsXHTMLContentSerializer::CheckElementEnd(Element* aElement,
+                                               Element* aOriginalElement,
+                                               bool& aForceFormat,
+                                               nsAString& aStr) {
+  NS_ASSERTION(!mIsHTMLSerializer,
+               "nsHTMLContentSerializer shouldn't call this method !");
+
+  aForceFormat = !(mFlags & nsIDocumentEncoder::OutputIgnoreMozDirty) &&
+                 aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::mozdirty);
+
+  if (mIsCopying && aElement->IsHTMLElement(nsGkAtoms::ol)) {
+    NS_ASSERTION((!mOLStateStack.IsEmpty()), "Cannot have an empty OL Stack");
+    /* Though at this point we must always have an state to be deleted as all
+       the OL opening tags are supposed to push an olState object to the stack*/
+    if (!mOLStateStack.IsEmpty()) {
+      mOLStateStack.RemoveLastElement();
+    }
+  }
+
+  bool dummyFormat;
+  return nsXMLContentSerializer::CheckElementEnd(aElement, aOriginalElement,
+                                                 dummyFormat, aStr);
+}
+
+bool nsXHTMLContentSerializer::AppendAndTranslateEntities(
+    const nsAString& aStr, nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+
+  if (mDisableEntityEncoding) {
+    return aOutputStr.Append(aStr, fallible);
+  }
+
+  return nsXMLContentSerializer::AppendAndTranslateEntities(aStr, aOutputStr);
+}
+
+bool nsXHTMLContentSerializer::IsShorthandAttr(const nsAtom* aAttrName,
+                                               const nsAtom* aElementName) {
+  // checked
+  if ((aAttrName == nsGkAtoms::checked) && (aElementName == nsGkAtoms::input)) {
+    return true;
+  }
+
+  // compact
+  if ((aAttrName == nsGkAtoms::compact) &&
+      (aElementName == nsGkAtoms::dir || aElementName == nsGkAtoms::dl ||
+       aElementName == nsGkAtoms::menu || aElementName == nsGkAtoms::ol ||
+       aElementName == nsGkAtoms::ul)) {
+    return true;
+  }
+
+  // declare
+  if ((aAttrName == nsGkAtoms::declare) &&
+      (aElementName == nsGkAtoms::object)) {
+    return true;
+  }
+
+  // defer
+  if ((aAttrName == nsGkAtoms::defer) && (aElementName == nsGkAtoms::script)) {
+    return true;
+  }
+
+  // disabled
+  if ((aAttrName == nsGkAtoms::disabled) &&
+      (aElementName == nsGkAtoms::button || aElementName == nsGkAtoms::input ||
+       aElementName == nsGkAtoms::optgroup ||
+       aElementName == nsGkAtoms::option || aElementName == nsGkAtoms::select ||
+       aElementName == nsGkAtoms::textarea)) {
+    return true;
+  }
+
+  // ismap
+  if ((aAttrName == nsGkAtoms::ismap) &&
+      (aElementName == nsGkAtoms::img || aElementName == nsGkAtoms::input)) {
+    return true;
+  }
+
+  // multiple
+  if ((aAttrName == nsGkAtoms::multiple) &&
+      (aElementName == nsGkAtoms::select)) {
+    return true;
+  }
+
+  // noresize
+  if ((aAttrName == nsGkAtoms::noresize) &&
+      (aElementName == nsGkAtoms::frame)) {
+    return true;
+  }
+
+  // noshade
+  if ((aAttrName == nsGkAtoms::noshade) && (aElementName == nsGkAtoms::hr)) {
+    return true;
+  }
+
+  // nowrap
+  if ((aAttrName == nsGkAtoms::nowrap) &&
+      (aElementName == nsGkAtoms::td || aElementName == nsGkAtoms::th)) {
+    return true;
+  }
+
+  // readonly
+  if ((aAttrName == nsGkAtoms::readonly) &&
+      (aElementName == nsGkAtoms::input ||
+       aElementName == nsGkAtoms::textarea)) {
+    return true;
+  }
+
+  // selected
+  if ((aAttrName == nsGkAtoms::selected) &&
+      (aElementName == nsGkAtoms::option)) {
+    return true;
+  }
+
+  // autoplay and controls
+  if ((aElementName == nsGkAtoms::video || aElementName == nsGkAtoms::audio) &&
+      (aAttrName == nsGkAtoms::autoplay || aAttrName == nsGkAtoms::muted ||
+       aAttrName == nsGkAtoms::controls)) {
+    return true;
+  }
+
+  return false;
+}
+
+bool nsXHTMLContentSerializer::LineBreakBeforeOpen(int32_t aNamespaceID,
+                                                   nsAtom* aName) {
+  if (aNamespaceID != kNameSpaceID_XHTML) {
+    return mAddSpace;
+  }
+
+  if (aName == nsGkAtoms::title || aName == nsGkAtoms::meta ||
+      aName == nsGkAtoms::link || aName == nsGkAtoms::style ||
+      aName == nsGkAtoms::select || aName == nsGkAtoms::option ||
+      aName == nsGkAtoms::script || aName == nsGkAtoms::html) {
+    return true;
+  }
+
+  return nsHTMLElement::IsBlock(nsHTMLTags::CaseSensitiveAtomTagToId(aName));
+}
+
+bool nsXHTMLContentSerializer::LineBreakAfterOpen(int32_t aNamespaceID,
+                                                  nsAtom* aName) {
+  if (aNamespaceID != kNameSpaceID_XHTML) {
+    return false;
+  }
+
+  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
+      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::ul) ||
+      (aName == nsGkAtoms::ol) || (aName == nsGkAtoms::dl) ||
+      (aName == nsGkAtoms::table) || (aName == nsGkAtoms::tbody) ||
+      (aName == nsGkAtoms::tr) || (aName == nsGkAtoms::br) ||
+      (aName == nsGkAtoms::meta) || (aName == nsGkAtoms::link) ||
+      (aName == nsGkAtoms::script) || (aName == nsGkAtoms::select) ||
+      (aName == nsGkAtoms::map) || (aName == nsGkAtoms::area) ||
+      (aName == nsGkAtoms::style)) {
+    return true;
+  }
+
+  return false;
+}
+
+bool nsXHTMLContentSerializer::LineBreakBeforeClose(int32_t aNamespaceID,
+                                                    nsAtom* aName) {
+  if (aNamespaceID != kNameSpaceID_XHTML) {
+    return false;
+  }
+
+  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
+      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::ul) ||
+      (aName == nsGkAtoms::ol) || (aName == nsGkAtoms::dl) ||
+      (aName == nsGkAtoms::select) || (aName == nsGkAtoms::table) ||
+      (aName == nsGkAtoms::tbody)) {
+    return true;
+  }
+  return false;
+}
+
+bool nsXHTMLContentSerializer::LineBreakAfterClose(int32_t aNamespaceID,
+                                                   nsAtom* aName) {
+  if (aNamespaceID != kNameSpaceID_XHTML) {
+    return false;
+  }
+
+  if ((aName == nsGkAtoms::html) || (aName == nsGkAtoms::head) ||
+      (aName == nsGkAtoms::body) || (aName == nsGkAtoms::tr) ||
+      (aName == nsGkAtoms::th) || (aName == nsGkAtoms::td) ||
+      (aName == nsGkAtoms::title) || (aName == nsGkAtoms::dt) ||
+      (aName == nsGkAtoms::dd) || (aName == nsGkAtoms::select) ||
+      (aName == nsGkAtoms::option) || (aName == nsGkAtoms::map)) {
+    return true;
+  }
+
+  return nsHTMLElement::IsBlock(nsHTMLTags::CaseSensitiveAtomTagToId(aName));
+}
+
+void nsXHTMLContentSerializer::MaybeEnterInPreContent(nsIContent* aNode) {
+  if (!ShouldMaintainPreLevel() || !aNode->IsHTMLElement()) {
+    return;
+  }
+
+  if (IsElementPreformatted(aNode) ||
+      aNode->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style,
+                                 nsGkAtoms::noscript, nsGkAtoms::noframes)) {
+    PreLevel()++;
+  }
+}
+
+void nsXHTMLContentSerializer::MaybeLeaveFromPreContent(nsIContent* aNode) {
+  if (!ShouldMaintainPreLevel() || !aNode->IsHTMLElement()) {
+    return;
+  }
+
+  if (IsElementPreformatted(aNode) ||
+      aNode->IsAnyOfHTMLElements(nsGkAtoms::script, nsGkAtoms::style,
+                                 nsGkAtoms::noscript, nsGkAtoms::noframes)) {
+    --PreLevel();
+  }
+}
+
+bool nsXHTMLContentSerializer::IsElementPreformatted(nsIContent* aNode) {
+  MOZ_ASSERT(ShouldMaintainPreLevel(),
+             "We should not be calling this needlessly");
+
+  if (!aNode->IsElement()) {
+    return false;
+  }
+  RefPtr<ComputedStyle> computedStyle =
+      nsComputedDOMStyle::GetComputedStyleNoFlush(aNode->AsElement(), nullptr);
+  if (computedStyle) {
+    const nsStyleText* textStyle = computedStyle->StyleText();
+    return textStyle->WhiteSpaceOrNewlineIsSignificant();
+  }
+  return false;
+}
+
+bool nsXHTMLContentSerializer::SerializeLIValueAttribute(nsIContent* aElement,
+                                                         nsAString& aStr) {
+  // We are copying and we are at the "first" LI node of OL in selected range.
+  // It may not be the first LI child of OL but it's first in the selected
+  // range. Note that we get into this condition only once per a OL.
+  bool found = false;
+  nsAutoString valueStr;
+
+  olState state(0, false);
+
+  if (!mOLStateStack.IsEmpty()) {
+    state = mOLStateStack[mOLStateStack.Length() - 1];
+    // isFirstListItem should be true only before the serialization of the
+    // first item in the list.
+    state.isFirstListItem = false;
+    mOLStateStack[mOLStateStack.Length() - 1] = state;
+  }
+
+  int32_t startVal = state.startVal;
+  int32_t offset = 0;
+
+  // Traverse previous siblings until we find one with "value" attribute.
+  // offset keeps track of how many previous siblings we had to traverse.
+  nsIContent* currNode = aElement;
+  while (currNode && !found) {
+    if (currNode->IsHTMLElement(nsGkAtoms::li)) {
+      currNode->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::value,
+                                     valueStr);
+      if (valueStr.IsEmpty()) {
+        offset++;
+      } else {
+        found = true;
+        nsresult rv = NS_OK;
+        startVal = valueStr.ToInteger(&rv);
+      }
+    }
+    currNode = currNode->GetPreviousSibling();
+  }
+  // If LI was not having "value", Set the "value" attribute for it.
+  // Note that We are at the first LI in the selected range of OL.
+  if (offset == 0 && found) {
+    // offset = 0 => LI itself has the value attribute and we did not need to
+    // traverse back. Just serialize value attribute like other tags.
+    NS_ENSURE_TRUE(SerializeAttr(u""_ns, u"value"_ns, valueStr, aStr, false),
+                   false);
+  } else if (offset == 1 && !found) {
+    /*(offset = 1 && !found) means either LI is the first child node of OL
+    and LI is not having "value" attribute.
+    In that case we would not like to set "value" attribute to reduce the
+    changes.
+    */
+    // do nothing...
+  } else if (offset > 0) {
+    // Set value attribute.
+    nsAutoString valueStr;
+
+    // As serializer needs to use this valueAttr we are creating here,
+    valueStr.AppendInt(startVal + offset);
+    NS_ENSURE_TRUE(SerializeAttr(u""_ns, u"value"_ns, valueStr, aStr, false),
+                   false);
+  }
+
+  return true;
+}
+
+bool nsXHTMLContentSerializer::IsFirstChildOfOL(nsIContent* aElement) {
+  nsIContent* parent = aElement->GetParent();
+  if (parent && parent->NodeName().LowerCaseEqualsLiteral("ol")) {
+    if (!mOLStateStack.IsEmpty()) {
+      olState state = mOLStateStack[mOLStateStack.Length() - 1];
+      if (state.isFirstListItem) return true;
+    }
+  }
+
+  return false;
+}
+
+bool nsXHTMLContentSerializer::HasNoChildren(nsIContent* aContent) {
+  for (nsIContent* child = aContent->GetFirstChild(); child;
+       child = child->GetNextSibling()) {
+    if (!child->IsText()) return false;
+
+    if (child->TextLength()) return false;
+  }
+
+  return true;
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsXHTMLContentSerializer.h firefox-85.0+build1/dom/serializers/nsXHTMLContentSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsXHTMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsXHTMLContentSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,148 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an XHTML (not HTML!) DOM to an XHTML
+ * string that could be parsed into more or less the original DOM.
+ */
+
+#ifndef nsXHTMLContentSerializer_h__
+#define nsXHTMLContentSerializer_h__
+
+#include "mozilla/Attributes.h"
+#include "nsXMLContentSerializer.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+class nsIContent;
+class nsAtom;
+
+namespace mozilla {
+class Encoding;
+}
+
+class nsXHTMLContentSerializer : public nsXMLContentSerializer {
+ public:
+  nsXHTMLContentSerializer();
+  virtual ~nsXHTMLContentSerializer();
+
+  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
+                  const mozilla::Encoding* aEncoding, bool aIsCopying,
+                  bool aRewriteEncodingDeclaration,
+                  bool* aNeedsPreformatScanning, nsAString& aOutput) override;
+
+  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
+                        int32_t aEndOffset) override;
+
+  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
+
+ protected:
+  virtual bool CheckElementStart(mozilla::dom::Element* aElement,
+                                 bool& aForceFormat, nsAString& aStr,
+                                 nsresult& aResult) override;
+
+  MOZ_MUST_USE
+  virtual bool AfterElementStart(nsIContent* aContent,
+                                 nsIContent* aOriginalElement,
+                                 nsAString& aStr) override;
+
+  virtual bool CheckElementEnd(mozilla::dom::Element* aContent,
+                               mozilla::dom::Element* aOriginalElement,
+                               bool& aForceFormat, nsAString& aStr) override;
+
+  virtual void AfterElementEnd(nsIContent* aContent, nsAString& aStr) override;
+
+  virtual bool LineBreakBeforeOpen(int32_t aNamespaceID,
+                                   nsAtom* aName) override;
+  virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsAtom* aName) override;
+  virtual bool LineBreakBeforeClose(int32_t aNamespaceID,
+                                    nsAtom* aName) override;
+  virtual bool LineBreakAfterClose(int32_t aNamespaceID,
+                                   nsAtom* aName) override;
+
+  bool HasLongLines(const nsString& text, int32_t& aLastNewlineOffset);
+
+  // functions to check if we enter in or leave from a preformated content
+  virtual void MaybeEnterInPreContent(nsIContent* aNode) override;
+  virtual void MaybeLeaveFromPreContent(nsIContent* aNode) override;
+
+  MOZ_MUST_USE
+  virtual bool SerializeAttributes(mozilla::dom::Element* aContent,
+                                   mozilla::dom::Element* aOriginalElement,
+                                   nsAString& aTagPrefix,
+                                   const nsAString& aTagNamespaceURI,
+                                   nsAtom* aTagName, nsAString& aStr,
+                                   uint32_t aSkipAttr,
+                                   bool aAddNSAttr) override;
+
+  bool IsFirstChildOfOL(nsIContent* aElement);
+
+  MOZ_MUST_USE
+  bool SerializeLIValueAttribute(nsIContent* aElement, nsAString& aStr);
+  bool IsShorthandAttr(const nsAtom* aAttrName, const nsAtom* aElementName);
+
+  MOZ_MUST_USE
+  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
+                                          nsAString& aOutputStr) override;
+
+ private:
+  bool IsElementPreformatted(nsIContent* aNode);
+
+ protected:
+  /*
+   * isHTMLParser should be set to true by the HTML parser which inherits from
+   * this class. It avoids to redefine methods just for few changes.
+   */
+  bool mIsHTMLSerializer;
+
+  bool mIsCopying;  // Set to true only while copying
+
+  /*
+   * mDisableEntityEncoding is higher than 0 while the serializer is serializing
+   * the content of a element whose content is considerd CDATA by the
+   * serializer (such elements are 'script', 'style', 'noscript' and
+   * possibly others in XHTML) This doesn't have anything to do with if the
+   * element is defined as CDATA in the DTD, it simply means we'll
+   * output the content of the element without doing any entity encoding
+   * what so ever.
+   */
+  int32_t mDisableEntityEncoding;
+
+  // This is to ensure that we only do meta tag fixups when dealing with
+  // whole documents.
+  bool mRewriteEncodingDeclaration;
+
+  // To keep track of First LI child of OL in selected range
+  bool mIsFirstChildOfOL;
+
+  // To keep track of startvalue of OL and first list item for nested lists
+  struct olState {
+    olState(int32_t aStart, bool aIsFirst)
+        : startVal(aStart), isFirstListItem(aIsFirst) {}
+
+    olState(const olState& aOlState) {
+      startVal = aOlState.startVal;
+      isFirstListItem = aOlState.isFirstListItem;
+    }
+
+    // the value of the start attribute in the OL
+    int32_t startVal;
+
+    // is true only before the serialization of the first li of an ol
+    // should be false for other li in the list
+    bool isFirstListItem;
+  };
+
+  // Stack to store one olState struct per <OL>.
+  AutoTArray<olState, 8> mOLStateStack;
+
+  bool HasNoChildren(nsIContent* aContent);
+};
+
+nsresult NS_NewXHTMLContentSerializer(nsIContentSerializer** aSerializer);
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/serializers/nsXMLContentSerializer.cpp firefox-85.0+build1/dom/serializers/nsXMLContentSerializer.cpp
--- firefox-84.0.2+build1/dom/serializers/nsXMLContentSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsXMLContentSerializer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,1781 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an XML DOM to an XML string that
+ * could be parsed into more or less the original DOM.
+ */
+
+#include "nsXMLContentSerializer.h"
+
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+#include "nsIContentInlines.h"
+#include "mozilla/dom/Document.h"
+#include "nsIDocumentEncoder.h"
+#include "nsElementTable.h"
+#include "nsNameSpaceManager.h"
+#include "nsTextFragment.h"
+#include "nsString.h"
+#include "mozilla/Sprintf.h"
+#include "nsUnicharUtils.h"
+#include "nsCRT.h"
+#include "nsContentUtils.h"
+#include "nsAttrName.h"
+#include "mozilla/dom/Comment.h"
+#include "mozilla/dom/CustomElementRegistry.h"
+#include "mozilla/dom/DocumentType.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/ProcessingInstruction.h"
+#include "mozilla/intl/LineBreaker.h"
+#include "nsParserConstants.h"
+#include "mozilla/Encoding.h"
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+#define kXMLNS "xmlns"
+
+// to be readable, we assume that an indented line contains
+// at least this number of characters (arbitrary value here).
+// This is a limit for the indentation.
+#define MIN_INDENTED_LINE_LENGTH 15
+
+// the string used to indent.
+#define INDENT_STRING "  "
+#define INDENT_STRING_LENGTH 2
+
+nsresult NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer) {
+  RefPtr<nsXMLContentSerializer> it = new nsXMLContentSerializer();
+  it.forget(aSerializer);
+  return NS_OK;
+}
+
+nsXMLContentSerializer::nsXMLContentSerializer()
+    : mPrefixIndex(0),
+      mColPos(0),
+      mIndentOverflow(0),
+      mIsIndentationAddedOnCurrentLine(false),
+      mInAttribute(false),
+      mAddNewlineForRootNode(false),
+      mAddSpace(false),
+      mMayIgnoreLineBreakSequence(false),
+      mBodyOnly(false),
+      mInBody(0) {}
+
+nsXMLContentSerializer::~nsXMLContentSerializer() = default;
+
+NS_IMPL_ISUPPORTS(nsXMLContentSerializer, nsIContentSerializer)
+
+NS_IMETHODIMP
+nsXMLContentSerializer::Init(uint32_t aFlags, uint32_t aWrapColumn,
+                             const Encoding* aEncoding, bool aIsCopying,
+                             bool aRewriteEncodingDeclaration,
+                             bool* aNeedsPreformatScanning,
+                             nsAString& aOutput) {
+  *aNeedsPreformatScanning = false;
+  mPrefixIndex = 0;
+  mColPos = 0;
+  mIndentOverflow = 0;
+  mIsIndentationAddedOnCurrentLine = false;
+  mInAttribute = false;
+  mAddNewlineForRootNode = false;
+  mAddSpace = false;
+  mMayIgnoreLineBreakSequence = false;
+  mBodyOnly = false;
+  mInBody = 0;
+
+  if (aEncoding) {
+    aEncoding->Name(mCharset);
+  }
+  mFlags = aFlags;
+
+  // Set the line break character:
+  if ((mFlags & nsIDocumentEncoder::OutputCRLineBreak) &&
+      (mFlags & nsIDocumentEncoder::OutputLFLineBreak)) {  // Windows
+    mLineBreak.AssignLiteral("\r\n");
+  } else if (mFlags & nsIDocumentEncoder::OutputCRLineBreak) {  // Mac
+    mLineBreak.Assign('\r');
+  } else if (mFlags & nsIDocumentEncoder::OutputLFLineBreak) {  // Unix/DOM
+    mLineBreak.Assign('\n');
+  } else {
+    mLineBreak.AssignLiteral(NS_LINEBREAK);  // Platform/default
+  }
+
+  mDoRaw = !!(mFlags & nsIDocumentEncoder::OutputRaw);
+
+  mDoFormat = (mFlags & nsIDocumentEncoder::OutputFormatted && !mDoRaw);
+
+  mDoWrap = (mFlags & nsIDocumentEncoder::OutputWrap && !mDoRaw);
+
+  mAllowLineBreaking =
+      !(mFlags & nsIDocumentEncoder::OutputDisallowLineBreaking);
+
+  if (!aWrapColumn) {
+    mMaxColumn = 72;
+  } else {
+    mMaxColumn = aWrapColumn;
+  }
+
+  mOutput = &aOutput;
+  mPreLevel = 0;
+  mIsIndentationAddedOnCurrentLine = false;
+  return NS_OK;
+}
+
+nsresult nsXMLContentSerializer::AppendTextData(nsIContent* aNode,
+                                                int32_t aStartOffset,
+                                                int32_t aEndOffset,
+                                                nsAString& aStr,
+                                                bool aTranslateEntities) {
+  nsIContent* content = aNode;
+  const nsTextFragment* frag;
+  if (!content || !(frag = content->GetText())) {
+    return NS_ERROR_FAILURE;
+  }
+
+  int32_t fragLength = frag->GetLength();
+  int32_t endoffset =
+      (aEndOffset == -1) ? fragLength : std::min(aEndOffset, fragLength);
+  int32_t length = endoffset - aStartOffset;
+
+  NS_ASSERTION(aStartOffset >= 0, "Negative start offset for text fragment!");
+  NS_ASSERTION(aStartOffset <= endoffset,
+               "A start offset is beyond the end of the text fragment!");
+
+  if (length <= 0) {
+    // XXX Zero is a legal value, maybe non-zero values should be an
+    // error.
+    return NS_OK;
+  }
+
+  if (frag->Is2b()) {
+    const char16_t* strStart = frag->Get2b() + aStartOffset;
+    if (aTranslateEntities) {
+      NS_ENSURE_TRUE(AppendAndTranslateEntities(
+                         Substring(strStart, strStart + length), aStr),
+                     NS_ERROR_OUT_OF_MEMORY);
+    } else {
+      NS_ENSURE_TRUE(aStr.Append(Substring(strStart, strStart + length),
+                                 mozilla::fallible),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+  } else {
+    nsAutoString utf16;
+    if (!CopyASCIItoUTF16(Span(frag->Get1b() + aStartOffset, length), utf16,
+                          mozilla::fallible_t())) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    if (aTranslateEntities) {
+      NS_ENSURE_TRUE(AppendAndTranslateEntities(utf16, aStr),
+                     NS_ERROR_OUT_OF_MEMORY);
+    } else {
+      NS_ENSURE_TRUE(aStr.Append(utf16, mozilla::fallible),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendText(nsIContent* aText, int32_t aStartOffset,
+                                   int32_t aEndOffset) {
+  NS_ENSURE_ARG(aText);
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString data;
+  nsresult rv;
+
+  rv = AppendTextData(aText, aStartOffset, aEndOffset, data, true);
+  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoFormat) {
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendCDATASection(nsIContent* aCDATASection,
+                                           int32_t aStartOffset,
+                                           int32_t aEndOffset) {
+  NS_ENSURE_ARG(aCDATASection);
+  NS_ENSURE_STATE(mOutput);
+
+  nsresult rv;
+
+  constexpr auto cdata = u"<![CDATA["_ns;
+
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToString(cdata, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoFormat) {
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(cdata, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(cdata, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    NS_ENSURE_TRUE(AppendToString(cdata, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  nsAutoString data;
+  rv = AppendTextData(aCDATASection, aStartOffset, aEndOffset, data, false);
+  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+  NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  NS_ENSURE_TRUE(AppendToString(u"]]>"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendProcessingInstruction(ProcessingInstruction* aPI,
+                                                    int32_t aStartOffset,
+                                                    int32_t aEndOffset) {
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString target, data, start;
+
+  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  aPI->GetTarget(target);
+
+  aPI->GetData(data);
+
+  NS_ENSURE_TRUE(start.AppendLiteral("<?", mozilla::fallible),
+                 NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(start.Append(target, mozilla::fallible),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToString(start, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoFormat) {
+    if (mAddSpace) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    }
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(start, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(start, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    NS_ENSURE_TRUE(AppendToString(start, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  if (!data.IsEmpty()) {
+    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+  NS_ENSURE_TRUE(AppendToString(u"?>"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  MaybeFlagNewlineForRootNode(aPI);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendComment(Comment* aComment, int32_t aStartOffset,
+                                      int32_t aEndOffset) {
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString data;
+  aComment->GetData(data);
+
+  int32_t dataLength = data.Length();
+  if (aStartOffset || (aEndOffset != -1 && aEndOffset < dataLength)) {
+    int32_t length =
+        (aEndOffset == -1) ? dataLength : std::min(aEndOffset, dataLength);
+    length -= aStartOffset;
+
+    nsAutoString frag;
+    if (length > 0) {
+      data.Mid(frag, aStartOffset, length);
+    }
+    data.Assign(frag);
+  }
+
+  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  constexpr auto startComment = u"<!--"_ns;
+
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToString(startComment, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoFormat) {
+    if (mAddSpace) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    }
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(startComment, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(startComment, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    NS_ENSURE_TRUE(AppendToString(startComment, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  // Even if mDoformat, we don't format the content because it
+  // could have been preformated by the author
+  NS_ENSURE_TRUE(AppendToStringConvertLF(data, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(AppendToString(u"-->"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  MaybeFlagNewlineForRootNode(aComment);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendDoctype(DocumentType* aDocType) {
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString name, publicId, systemId;
+  aDocType->GetName(name);
+  aDocType->GetPublicId(publicId);
+  aDocType->GetSystemId(systemId);
+
+  NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  NS_ENSURE_TRUE(AppendToString(u"<!DOCTYPE "_ns, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(AppendToString(name, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+  char16_t quote;
+  if (!publicId.IsEmpty()) {
+    NS_ENSURE_TRUE(AppendToString(u" PUBLIC "_ns, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+    if (publicId.FindChar(char16_t('"')) == -1) {
+      quote = char16_t('"');
+    } else {
+      quote = char16_t('\'');
+    }
+    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(publicId, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+
+    if (!systemId.IsEmpty()) {
+      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+      if (systemId.FindChar(char16_t('"')) == -1) {
+        quote = char16_t('"');
+      } else {
+        quote = char16_t('\'');
+      }
+      NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+      NS_ENSURE_TRUE(AppendToString(systemId, *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+      NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    }
+  } else if (!systemId.IsEmpty()) {
+    if (systemId.FindChar(char16_t('"')) == -1) {
+      quote = char16_t('"');
+    } else {
+      quote = char16_t('\'');
+    }
+    NS_ENSURE_TRUE(AppendToString(u" SYSTEM "_ns, *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(systemId, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(quote, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+  MaybeFlagNewlineForRootNode(aDocType);
+
+  return NS_OK;
+}
+
+nsresult nsXMLContentSerializer::PushNameSpaceDecl(const nsAString& aPrefix,
+                                                   const nsAString& aURI,
+                                                   nsIContent* aOwner) {
+  NameSpaceDecl* decl = mNameSpaceStack.AppendElement();
+  if (!decl) return NS_ERROR_OUT_OF_MEMORY;
+
+  decl->mPrefix.Assign(aPrefix);
+  decl->mURI.Assign(aURI);
+  // Don't addref - this weak reference will be removed when
+  // we pop the stack
+  decl->mOwner = aOwner;
+  return NS_OK;
+}
+
+void nsXMLContentSerializer::PopNameSpaceDeclsFor(nsIContent* aOwner) {
+  int32_t index, count;
+
+  count = mNameSpaceStack.Length();
+  for (index = count - 1; index >= 0; index--) {
+    if (mNameSpaceStack[index].mOwner != aOwner) {
+      break;
+    }
+    mNameSpaceStack.RemoveLastElement();
+  }
+}
+
+bool nsXMLContentSerializer::ConfirmPrefix(nsAString& aPrefix,
+                                           const nsAString& aURI,
+                                           nsIContent* aElement,
+                                           bool aIsAttribute) {
+  if (aPrefix.EqualsLiteral(kXMLNS)) {
+    return false;
+  }
+
+  if (aURI.EqualsLiteral("http://www.w3.org/XML/1998/namespace")) {
+    // The prefix must be xml for this namespace. We don't need to declare it,
+    // so always just set the prefix to xml.
+    aPrefix.AssignLiteral("xml");
+
+    return false;
+  }
+
+  bool mustHavePrefix;
+  if (aIsAttribute) {
+    if (aURI.IsEmpty()) {
+      // Attribute in the null namespace.  This just shouldn't have a prefix.
+      // And there's no need to push any namespace decls
+      aPrefix.Truncate();
+      return false;
+    }
+
+    // Attribute not in the null namespace -- must have a prefix
+    mustHavePrefix = true;
+  } else {
+    // Not an attribute, so doesn't _have_ to have a prefix
+    mustHavePrefix = false;
+  }
+
+  // Keep track of the closest prefix that's bound to aURI and whether we've
+  // found such a thing.  closestURIMatch holds the prefix, and uriMatch
+  // indicates whether we actually have one.
+  nsAutoString closestURIMatch;
+  bool uriMatch = false;
+
+  // Also keep track of whether we've seen aPrefix already.  If we have, that
+  // means that it's already bound to a URI different from aURI, so even if we
+  // later (so in a more outer scope) see it bound to aURI we can't reuse it.
+  bool haveSeenOurPrefix = false;
+
+  int32_t count = mNameSpaceStack.Length();
+  int32_t index = count - 1;
+  while (index >= 0) {
+    NameSpaceDecl& decl = mNameSpaceStack.ElementAt(index);
+    // Check if we've found a prefix match
+    if (aPrefix.Equals(decl.mPrefix)) {
+      // If the URIs match and aPrefix is not bound to any other URI, we can
+      // use aPrefix
+      if (!haveSeenOurPrefix && aURI.Equals(decl.mURI)) {
+        // Just use our uriMatch stuff.  That will deal with an empty aPrefix
+        // the right way.  We can break out of the loop now, though.
+        uriMatch = true;
+        closestURIMatch = aPrefix;
+        break;
+      }
+
+      haveSeenOurPrefix = true;
+
+      // If they don't, and either:
+      // 1) We have a prefix (so we'd be redeclaring this prefix to point to a
+      //    different namespace) or
+      // 2) We're looking at an existing default namespace decl on aElement (so
+      //    we can't create a new default namespace decl for this URI)
+      // then generate a new prefix.  Note that we do NOT generate new prefixes
+      // if we happen to have aPrefix == decl->mPrefix == "" and mismatching
+      // URIs when |decl| doesn't have aElement as its owner.  In that case we
+      // can simply push the new namespace URI as the default namespace for
+      // aElement.
+      if (!aPrefix.IsEmpty() || decl.mOwner == aElement) {
+        NS_ASSERTION(!aURI.IsEmpty(),
+                     "Not allowed to add a xmlns attribute with an empty "
+                     "namespace name unless it declares the default "
+                     "namespace.");
+
+        GenerateNewPrefix(aPrefix);
+        // Now we need to validate our new prefix/uri combination; check it
+        // against the full namespace stack again.  Note that just restarting
+        // the while loop is ok, since we haven't changed aURI, so the
+        // closestURIMatch and uriMatch state is not affected.
+        index = count - 1;
+        haveSeenOurPrefix = false;
+        continue;
+      }
+    }
+
+    // If we've found a URI match, then record the first one
+    if (!uriMatch && aURI.Equals(decl.mURI)) {
+      // Need to check that decl->mPrefix is not declared anywhere closer to
+      // us.  If it is, we can't use it.
+      bool prefixOK = true;
+      int32_t index2;
+      for (index2 = count - 1; index2 > index && prefixOK; --index2) {
+        prefixOK = (mNameSpaceStack[index2].mPrefix != decl.mPrefix);
+      }
+
+      if (prefixOK) {
+        uriMatch = true;
+        closestURIMatch.Assign(decl.mPrefix);
+      }
+    }
+
+    --index;
+  }
+
+  // At this point the following invariants hold:
+  // 1) The prefix in closestURIMatch is mapped to aURI in our scope if
+  //    uriMatch is set.
+  // 2) There is nothing on the namespace stack that has aPrefix as the prefix
+  //    and a _different_ URI, except for the case aPrefix.IsEmpty (and
+  //    possible default namespaces on ancestors)
+
+  // So if uriMatch is set it's OK to use the closestURIMatch prefix.  The one
+  // exception is when closestURIMatch is actually empty (default namespace
+  // decl) and we must have a prefix.
+  if (uriMatch && (!mustHavePrefix || !closestURIMatch.IsEmpty())) {
+    aPrefix.Assign(closestURIMatch);
+    return false;
+  }
+
+  if (aPrefix.IsEmpty()) {
+    // At this point, aPrefix is empty (which means we never had a prefix to
+    // start with).  If we must have a prefix, just generate a new prefix and
+    // then send it back through the namespace stack checks to make sure it's
+    // OK.
+    if (mustHavePrefix) {
+      GenerateNewPrefix(aPrefix);
+      return ConfirmPrefix(aPrefix, aURI, aElement, aIsAttribute);
+    }
+
+    // One final special case.  If aPrefix is empty and we never saw an empty
+    // prefix (default namespace decl) on the namespace stack and we're in the
+    // null namespace there is no reason to output an |xmlns=""| here.  It just
+    // makes the output less readable.
+    if (!haveSeenOurPrefix && aURI.IsEmpty()) {
+      return false;
+    }
+  }
+
+  // Now just set aURI as the new default namespace URI.  Indicate that we need
+  // to create a namespace decl for the final prefix
+  return true;
+}
+
+void nsXMLContentSerializer::GenerateNewPrefix(nsAString& aPrefix) {
+  aPrefix.Assign('a');
+  aPrefix.AppendInt(mPrefixIndex++);
+}
+
+bool nsXMLContentSerializer::SerializeAttr(const nsAString& aPrefix,
+                                           const nsAString& aName,
+                                           const nsAString& aValue,
+                                           nsAString& aStr,
+                                           bool aDoEscapeEntities) {
+  nsAutoString attrString_;
+  // For innerHTML we can do faster appending without
+  // temporary strings.
+  bool rawAppend = mDoRaw && aDoEscapeEntities;
+  nsAString& attrString = (rawAppend) ? aStr : attrString_;
+
+  NS_ENSURE_TRUE(attrString.Append(char16_t(' '), mozilla::fallible), false);
+  if (!aPrefix.IsEmpty()) {
+    NS_ENSURE_TRUE(attrString.Append(aPrefix, mozilla::fallible), false);
+    NS_ENSURE_TRUE(attrString.Append(char16_t(':'), mozilla::fallible), false);
+  }
+  NS_ENSURE_TRUE(attrString.Append(aName, mozilla::fallible), false);
+
+  if (aDoEscapeEntities) {
+    // if problem characters are turned into character entity references
+    // then there will be no problem with the value delimiter characters
+    NS_ENSURE_TRUE(attrString.AppendLiteral("=\"", mozilla::fallible), false);
+
+    mInAttribute = true;
+    bool result = AppendAndTranslateEntities(aValue, attrString);
+    mInAttribute = false;
+    NS_ENSURE_TRUE(result, false);
+
+    NS_ENSURE_TRUE(attrString.Append(char16_t('"'), mozilla::fallible), false);
+    if (rawAppend) {
+      return true;
+    }
+  } else {
+    // Depending on whether the attribute value contains quotes or apostrophes
+    // we need to select the delimiter character and escape characters using
+    // character entity references, ignoring the value of aDoEscapeEntities.
+    // See http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.3.2.2 for
+    // the standard on character entity references in values.  We also have to
+    // make sure to escape any '&' characters.
+
+    bool bIncludesSingle = false;
+    bool bIncludesDouble = false;
+    nsAString::const_iterator iCurr, iEnd;
+    aValue.BeginReading(iCurr);
+    aValue.EndReading(iEnd);
+    for (; iCurr != iEnd; ++iCurr) {
+      if (*iCurr == char16_t('\'')) {
+        bIncludesSingle = true;
+        if (bIncludesDouble) {
+          break;
+        }
+      } else if (*iCurr == char16_t('"')) {
+        bIncludesDouble = true;
+        if (bIncludesSingle) {
+          break;
+        }
+      }
+    }
+
+    // Delimiter and escaping is according to the following table
+    //    bIncludesDouble   bIncludesSingle   Delimiter    Escape Double Quote
+    //    FALSE             FALSE             "            FALSE
+    //    FALSE             TRUE              "            FALSE
+    //    TRUE              FALSE             '            FALSE
+    //    TRUE              TRUE              "            TRUE
+    char16_t cDelimiter =
+        (bIncludesDouble && !bIncludesSingle) ? char16_t('\'') : char16_t('"');
+    NS_ENSURE_TRUE(attrString.Append(char16_t('='), mozilla::fallible), false);
+    NS_ENSURE_TRUE(attrString.Append(cDelimiter, mozilla::fallible), false);
+    nsAutoString sValue(aValue);
+    NS_ENSURE_TRUE(
+        sValue.ReplaceSubstring(u"&"_ns, u"&amp;"_ns, mozilla::fallible),
+        false);
+    if (bIncludesDouble && bIncludesSingle) {
+      NS_ENSURE_TRUE(
+          sValue.ReplaceSubstring(u"\""_ns, u"&quot;"_ns, mozilla::fallible),
+          false);
+    }
+    NS_ENSURE_TRUE(attrString.Append(sValue, mozilla::fallible), false);
+    NS_ENSURE_TRUE(attrString.Append(cDelimiter, mozilla::fallible), false);
+  }
+  if (mDoRaw || PreLevel() > 0) {
+    NS_ENSURE_TRUE(AppendToStringConvertLF(attrString, aStr), false);
+  } else if (mDoFormat) {
+    NS_ENSURE_TRUE(AppendToStringFormatedWrapped(attrString, aStr), false);
+  } else if (mDoWrap) {
+    NS_ENSURE_TRUE(AppendToStringWrapped(attrString, aStr), false);
+  } else {
+    NS_ENSURE_TRUE(AppendToStringConvertLF(attrString, aStr), false);
+  }
+
+  return true;
+}
+
+uint32_t nsXMLContentSerializer::ScanNamespaceDeclarations(
+    Element* aElement, Element* aOriginalElement,
+    const nsAString& aTagNamespaceURI) {
+  uint32_t index, count;
+  nsAutoString uriStr, valueStr;
+
+  count = aElement->GetAttrCount();
+
+  // First scan for namespace declarations, pushing each on the stack
+  uint32_t skipAttr = count;
+  for (index = 0; index < count; index++) {
+    const BorrowedAttrInfo info = aElement->GetAttrInfoAt(index);
+    const nsAttrName* name = info.mName;
+
+    int32_t namespaceID = name->NamespaceID();
+    nsAtom* attrName = name->LocalName();
+
+    if (namespaceID == kNameSpaceID_XMLNS ||
+        // Also push on the stack attrs named "xmlns" in the null
+        // namespace... because once we serialize those out they'll look like
+        // namespace decls.  :(
+        // XXXbz what if we have both "xmlns" in the null namespace and "xmlns"
+        // in the xmlns namespace?
+        (namespaceID == kNameSpaceID_None && attrName == nsGkAtoms::xmlns)) {
+      info.mValue->ToString(uriStr);
+
+      if (!name->GetPrefix()) {
+        if (aTagNamespaceURI.IsEmpty() && !uriStr.IsEmpty()) {
+          // If the element is in no namespace we need to add a xmlns
+          // attribute to declare that. That xmlns attribute must not have a
+          // prefix (see http://www.w3.org/TR/REC-xml-names/#dt-prefix), ie it
+          // must declare the default namespace. We just found an xmlns
+          // attribute that declares the default namespace to something
+          // non-empty. We're going to ignore this attribute, for children we
+          // will detect that we need to add it again and attributes aren't
+          // affected by the default namespace.
+          skipAttr = index;
+        } else {
+          // Default NS attribute does not have prefix (and the name is "xmlns")
+          PushNameSpaceDecl(u""_ns, uriStr, aOriginalElement);
+        }
+      } else {
+        PushNameSpaceDecl(nsDependentAtomString(attrName), uriStr,
+                          aOriginalElement);
+      }
+    }
+  }
+  return skipAttr;
+}
+
+bool nsXMLContentSerializer::IsJavaScript(nsIContent* aContent,
+                                          nsAtom* aAttrNameAtom,
+                                          int32_t aAttrNamespaceID,
+                                          const nsAString& aValueString) {
+  bool isHtml = aContent->IsHTMLElement();
+  bool isXul = aContent->IsXULElement();
+  bool isSvg = aContent->IsSVGElement();
+
+  if (aAttrNamespaceID == kNameSpaceID_None && (isHtml || isXul || isSvg) &&
+      (aAttrNameAtom == nsGkAtoms::href || aAttrNameAtom == nsGkAtoms::src)) {
+    static const char kJavaScript[] = "javascript";
+    int32_t pos = aValueString.FindChar(':');
+    if (pos < (int32_t)(sizeof kJavaScript - 1)) return false;
+    nsAutoString scheme(Substring(aValueString, 0, pos));
+    scheme.StripWhitespace();
+    if ((scheme.Length() == (sizeof kJavaScript - 1)) &&
+        scheme.EqualsIgnoreCase(kJavaScript))
+      return true;
+    else
+      return false;
+  }
+
+  return aContent->IsEventAttributeName(aAttrNameAtom);
+}
+
+bool nsXMLContentSerializer::SerializeAttributes(
+    Element* aElement, Element* aOriginalElement, nsAString& aTagPrefix,
+    const nsAString& aTagNamespaceURI, nsAtom* aTagName, nsAString& aStr,
+    uint32_t aSkipAttr, bool aAddNSAttr) {
+  nsAutoString prefixStr, uriStr, valueStr;
+  nsAutoString xmlnsStr;
+  xmlnsStr.AssignLiteral(kXMLNS);
+  uint32_t index, count;
+
+  MaybeSerializeIsValue(aElement, aStr);
+
+  // If we had to add a new namespace declaration, serialize
+  // and push it on the namespace stack
+  if (aAddNSAttr) {
+    if (aTagPrefix.IsEmpty()) {
+      // Serialize default namespace decl
+      NS_ENSURE_TRUE(
+          SerializeAttr(u""_ns, xmlnsStr, aTagNamespaceURI, aStr, true), false);
+    } else {
+      // Serialize namespace decl
+      NS_ENSURE_TRUE(
+          SerializeAttr(xmlnsStr, aTagPrefix, aTagNamespaceURI, aStr, true),
+          false);
+    }
+    PushNameSpaceDecl(aTagPrefix, aTagNamespaceURI, aOriginalElement);
+  }
+
+  count = aElement->GetAttrCount();
+
+  // Now serialize each of the attributes
+  // XXX Unfortunately we need a namespace manager to get
+  // attribute URIs.
+  for (index = 0; index < count; index++) {
+    if (aSkipAttr == index) {
+      continue;
+    }
+
+    const nsAttrName* name = aElement->GetAttrNameAt(index);
+    int32_t namespaceID = name->NamespaceID();
+    nsAtom* attrName = name->LocalName();
+    nsAtom* attrPrefix = name->GetPrefix();
+
+    // Filter out any attribute starting with [-|_]moz
+    nsDependentAtomString attrNameStr(attrName);
+    if (StringBeginsWith(attrNameStr, u"_moz"_ns) ||
+        StringBeginsWith(attrNameStr, u"-moz"_ns)) {
+      continue;
+    }
+
+    if (attrPrefix) {
+      attrPrefix->ToString(prefixStr);
+    } else {
+      prefixStr.Truncate();
+    }
+
+    bool addNSAttr = false;
+    if (kNameSpaceID_XMLNS != namespaceID) {
+      nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, uriStr);
+      addNSAttr = ConfirmPrefix(prefixStr, uriStr, aOriginalElement, true);
+    }
+
+    aElement->GetAttr(namespaceID, attrName, valueStr);
+
+    nsDependentAtomString nameStr(attrName);
+    bool isJS = IsJavaScript(aElement, attrName, namespaceID, valueStr);
+
+    NS_ENSURE_TRUE(SerializeAttr(prefixStr, nameStr, valueStr, aStr, !isJS),
+                   false);
+
+    if (addNSAttr) {
+      NS_ASSERTION(!prefixStr.IsEmpty(),
+                   "Namespaced attributes must have a prefix");
+      NS_ENSURE_TRUE(SerializeAttr(xmlnsStr, prefixStr, uriStr, aStr, true),
+                     false);
+      PushNameSpaceDecl(prefixStr, uriStr, aOriginalElement);
+    }
+  }
+
+  return true;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendElementStart(Element* aElement,
+                                           Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+  NS_ENSURE_STATE(mOutput);
+
+  bool forceFormat = false;
+  nsresult rv = NS_OK;
+  if (!CheckElementStart(aElement, forceFormat, *mOutput, rv)) {
+    // When we go to AppendElementEnd for this element, we're going to
+    // MaybeLeaveFromPreContent().  So make sure to MaybeEnterInPreContent()
+    // now, so our PreLevel() doesn't get confused.
+    MaybeEnterInPreContent(aElement);
+    return rv;
+  }
+
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
+  aElement->NodeInfo()->GetPrefix(tagPrefix);
+  aElement->NodeInfo()->GetName(tagLocalName);
+  aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
+
+  uint32_t skipAttr =
+      ScanNamespaceDeclarations(aElement, aOriginalElement, tagNamespaceURI);
+
+  nsAtom* name = aElement->NodeInfo()->NameAtom();
+  bool lineBreakBeforeOpen =
+      LineBreakBeforeOpen(aElement->GetNameSpaceID(), name);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    if (mColPos && lineBreakBeforeOpen) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else {
+      NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+    }
+    if (!mColPos) {
+      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else if (mAddSpace) {
+      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+      mAddSpace = false;
+    }
+  } else if (mAddSpace) {
+    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+    mAddSpace = false;
+  } else {
+    NS_ENSURE_TRUE(MaybeAddNewlineForRootNode(*mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  // Always reset to avoid false newlines in case MaybeAddNewlineForRootNode
+  // wasn't called
+  mAddNewlineForRootNode = false;
+
+  bool addNSAttr;
+  addNSAttr =
+      ConfirmPrefix(tagPrefix, tagNamespaceURI, aOriginalElement, false);
+
+  // Serialize the qualified name of the element
+  NS_ENSURE_TRUE(AppendToString(kLessThan, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  if (!tagPrefix.IsEmpty()) {
+    NS_ENSURE_TRUE(AppendToString(tagPrefix, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(u":"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+  NS_ENSURE_TRUE(AppendToString(tagLocalName, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  MaybeEnterInPreContent(aElement);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    NS_ENSURE_TRUE(IncrIndentation(name), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  NS_ENSURE_TRUE(
+      SerializeAttributes(aElement, aOriginalElement, tagPrefix,
+                          tagNamespaceURI, name, *mOutput, skipAttr, addNSAttr),
+      NS_ERROR_OUT_OF_MEMORY);
+
+  NS_ENSURE_TRUE(AppendEndOfElementStart(aElement, aOriginalElement, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
+      LineBreakAfterOpen(aElement->GetNameSpaceID(), name)) {
+    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+
+  NS_ENSURE_TRUE(AfterElementStart(aElement, aOriginalElement, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  return NS_OK;
+}
+
+// aElement is the actual element we're outputting.  aOriginalElement is the one
+// in the original DOM, which is the one we have to test for kids.
+static bool ElementNeedsSeparateEndTag(Element* aElement,
+                                       Element* aOriginalElement) {
+  if (aOriginalElement->GetChildCount()) {
+    // We have kids, so we need a separate end tag.  This needs to be checked on
+    // aOriginalElement because that's the one that's actually in the DOM and
+    // might have kids.
+    return true;
+  }
+
+  if (!aElement->IsHTMLElement()) {
+    // Empty non-HTML elements can just skip a separate end tag.
+    return false;
+  }
+
+  // HTML container tags should have a separate end tag even if empty, per spec.
+  // See
+  // https://w3c.github.io/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
+  nsAtom* localName = aElement->NodeInfo()->NameAtom();
+  bool isHTMLContainer = nsHTMLElement::IsContainer(
+      nsHTMLTags::CaseSensitiveAtomTagToId(localName));
+  return isHTMLContainer;
+}
+
+bool nsXMLContentSerializer::AppendEndOfElementStart(Element* aElement,
+                                                     Element* aOriginalElement,
+                                                     nsAString& aStr) {
+  if (ElementNeedsSeparateEndTag(aElement, aOriginalElement)) {
+    return AppendToString(kGreaterThan, aStr);
+  }
+
+  // We don't need a separate end tag.  For HTML elements (which at this point
+  // must be non-containers), append a space before the '/', per spec.  See
+  // https://w3c.github.io/DOM-Parsing/#dfn-concept-xml-serialization-algorithm
+  if (aOriginalElement->IsHTMLElement()) {
+    if (!AppendToString(kSpace, aStr)) {
+      return false;
+    }
+  }
+
+  return AppendToString(u"/>"_ns, aStr);
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendElementEnd(Element* aElement,
+                                         Element* aOriginalElement) {
+  NS_ENSURE_ARG(aElement);
+  NS_ENSURE_STATE(mOutput);
+
+  nsIContent* content = aElement;
+
+  bool forceFormat = false, outputElementEnd;
+  outputElementEnd =
+      CheckElementEnd(aElement, aOriginalElement, forceFormat, *mOutput);
+
+  nsAtom* name = content->NodeInfo()->NameAtom();
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    DecrIndentation(name);
+  }
+
+  if (!outputElementEnd) {
+    // Keep this in sync with the cleanup at the end of this method.
+    PopNameSpaceDeclsFor(aElement);
+    MaybeLeaveFromPreContent(content);
+    MaybeFlagNewlineForRootNode(aElement);
+    AfterElementEnd(content, *mOutput);
+    return NS_OK;
+  }
+
+  nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
+
+  aElement->NodeInfo()->GetPrefix(tagPrefix);
+  aElement->NodeInfo()->GetName(tagLocalName);
+  aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
+
+#ifdef DEBUG
+  bool debugNeedToPushNamespace =
+#endif
+      ConfirmPrefix(tagPrefix, tagNamespaceURI, aElement, false);
+  NS_ASSERTION(!debugNeedToPushNamespace,
+               "Can't push namespaces in closing tag!");
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel()) {
+    bool lineBreakBeforeClose =
+        LineBreakBeforeClose(content->GetNameSpaceID(), name);
+
+    if (mColPos && lineBreakBeforeClose) {
+      NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    }
+    if (!mColPos) {
+      NS_ENSURE_TRUE(AppendIndentation(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+    } else if (mAddSpace) {
+      NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                     NS_ERROR_OUT_OF_MEMORY);
+      mAddSpace = false;
+    }
+  } else if (mAddSpace) {
+    NS_ENSURE_TRUE(AppendToString(char16_t(' '), *mOutput),
+                   NS_ERROR_OUT_OF_MEMORY);
+    mAddSpace = false;
+  }
+
+  NS_ENSURE_TRUE(AppendToString(kEndTag, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  if (!tagPrefix.IsEmpty()) {
+    NS_ENSURE_TRUE(AppendToString(tagPrefix, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+    NS_ENSURE_TRUE(AppendToString(u":"_ns, *mOutput), NS_ERROR_OUT_OF_MEMORY);
+  }
+  NS_ENSURE_TRUE(AppendToString(tagLocalName, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+  NS_ENSURE_TRUE(AppendToString(kGreaterThan, *mOutput),
+                 NS_ERROR_OUT_OF_MEMORY);
+
+  // Keep what follows in sync with the cleanup in the !outputElementEnd case.
+  PopNameSpaceDeclsFor(aElement);
+
+  MaybeLeaveFromPreContent(content);
+
+  if ((mDoFormat || forceFormat) && !mDoRaw && !PreLevel() &&
+      LineBreakAfterClose(content->GetNameSpaceID(), name)) {
+    NS_ENSURE_TRUE(AppendNewLineToString(*mOutput), NS_ERROR_OUT_OF_MEMORY);
+  } else {
+    MaybeFlagNewlineForRootNode(aElement);
+  }
+
+  AfterElementEnd(content, *mOutput);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::Finish() {
+  NS_ENSURE_STATE(mOutput);
+
+  mOutput = nullptr;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::GetOutputLength(uint32_t& aLength) const {
+  NS_ENSURE_STATE(mOutput);
+
+  aLength = mOutput->Length();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXMLContentSerializer::AppendDocumentStart(Document* aDocument) {
+  NS_ENSURE_ARG_POINTER(aDocument);
+  NS_ENSURE_STATE(mOutput);
+
+  nsAutoString version, encoding, standalone;
+  aDocument->GetXMLDeclaration(version, encoding, standalone);
+
+  if (version.IsEmpty())
+    return NS_OK;  // A declaration must have version, or there is no decl
+
+  constexpr auto endQuote = u"\""_ns;
+
+  *mOutput += u"<?xml version=\""_ns + version + endQuote;
+
+  if (!mCharset.IsEmpty()) {
+    *mOutput +=
+        u" encoding=\""_ns + NS_ConvertASCIItoUTF16(mCharset) + endQuote;
+  }
+  // Otherwise just don't output an encoding attr.  Not that we expect
+  // mCharset to ever be empty.
+#ifdef DEBUG
+  else {
+    NS_WARNING("Empty mCharset?  How come?");
+  }
+#endif
+
+  if (!standalone.IsEmpty()) {
+    *mOutput += u" standalone=\""_ns + standalone + endQuote;
+  }
+
+  NS_ENSURE_TRUE(mOutput->AppendLiteral("?>", mozilla::fallible),
+                 NS_ERROR_OUT_OF_MEMORY);
+  mAddNewlineForRootNode = true;
+
+  return NS_OK;
+}
+
+bool nsXMLContentSerializer::CheckElementStart(Element*, bool& aForceFormat,
+                                               nsAString& aStr,
+                                               nsresult& aResult) {
+  aResult = NS_OK;
+  aForceFormat = false;
+  return true;
+}
+
+bool nsXMLContentSerializer::CheckElementEnd(Element* aElement,
+                                             Element* aOriginalElement,
+                                             bool& aForceFormat,
+                                             nsAString& aStr) {
+  // We don't output a separate end tag for empty element
+  aForceFormat = false;
+  return ElementNeedsSeparateEndTag(aElement, aOriginalElement);
+}
+
+bool nsXMLContentSerializer::AppendToString(const char16_t aChar,
+                                            nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+  mColPos += 1;
+  return aOutputStr.Append(aChar, mozilla::fallible);
+}
+
+bool nsXMLContentSerializer::AppendToString(const nsAString& aStr,
+                                            nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+  mColPos += aStr.Length();
+  return aOutputStr.Append(aStr, mozilla::fallible);
+}
+
+#define _ 0
+
+// This table indexes into kEntityStrings[].
+const uint8_t nsXMLContentSerializer::kEntities[] = {
+    // clang-format off
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, 2, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  3, _, 4
+    // clang-format on
+};
+
+// This table indexes into kEntityStrings[].
+const uint8_t nsXMLContentSerializer::kAttrEntities[] = {
+    // clang-format off
+  _, _, _, _, _, _, _, _, _, 5,
+  6, _, _, 7, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, 1, _, _, _, 2, _,
+  _, _, _, _, _, _, _, _, _, _,
+  _, _, _, _, _, _, _, _, _, _,
+  3, _, 4
+    // clang-format on
+};
+
+#undef _
+
+const char* const nsXMLContentSerializer::kEntityStrings[] = {
+    /* 0 */ nullptr,
+    /* 1 */ "&quot;",
+    /* 2 */ "&amp;",
+    /* 3 */ "&lt;",
+    /* 4 */ "&gt;",
+    /* 5 */ "&#9;",
+    /* 6 */ "&#xA;",
+    /* 7 */ "&#xD;",
+};
+
+bool nsXMLContentSerializer::AppendAndTranslateEntities(const nsAString& aStr,
+                                                        nsAString& aOutputStr) {
+  if (mInAttribute) {
+    return AppendAndTranslateEntities<kGTVal>(aStr, aOutputStr, kAttrEntities,
+                                              kEntityStrings);
+  }
+
+  return AppendAndTranslateEntities<kGTVal>(aStr, aOutputStr, kEntities,
+                                            kEntityStrings);
+}
+
+/* static */
+bool nsXMLContentSerializer::AppendAndTranslateEntities(
+    const nsAString& aStr, nsAString& aOutputStr, const uint8_t aEntityTable[],
+    uint16_t aMaxTableIndex, const char* const aStringTable[]) {
+  nsReadingIterator<char16_t> done_reading;
+  aStr.EndReading(done_reading);
+
+  // for each chunk of |aString|...
+  uint32_t advanceLength = 0;
+  nsReadingIterator<char16_t> iter;
+
+  for (aStr.BeginReading(iter); iter != done_reading;
+       iter.advance(int32_t(advanceLength))) {
+    uint32_t fragmentLength = done_reading - iter;
+    const char16_t* c = iter.get();
+    const char16_t* fragmentStart = c;
+    const char16_t* fragmentEnd = c + fragmentLength;
+    const char* entityText = nullptr;
+
+    advanceLength = 0;
+    // for each character in this chunk, check if it
+    // needs to be replaced
+    for (; c < fragmentEnd; c++, advanceLength++) {
+      char16_t val = *c;
+      if ((val <= aMaxTableIndex) && aEntityTable[val]) {
+        entityText = aStringTable[aEntityTable[val]];
+        break;
+      }
+    }
+
+    NS_ENSURE_TRUE(
+        aOutputStr.Append(fragmentStart, advanceLength, mozilla::fallible),
+        false);
+    if (entityText) {
+      NS_ENSURE_TRUE(AppendASCIItoUTF16(mozilla::MakeStringSpan(entityText),
+                                        aOutputStr, mozilla::fallible),
+                     false);
+      advanceLength++;
+    }
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::MaybeAddNewlineForRootNode(nsAString& aStr) {
+  if (mAddNewlineForRootNode) {
+    return AppendNewLineToString(aStr);
+  }
+
+  return true;
+}
+
+void nsXMLContentSerializer::MaybeFlagNewlineForRootNode(nsINode* aNode) {
+  nsINode* parent = aNode->GetParentNode();
+  if (parent) {
+    mAddNewlineForRootNode = parent->IsDocument();
+  }
+}
+
+void nsXMLContentSerializer::MaybeEnterInPreContent(nsIContent* aNode) {
+  // support of the xml:space attribute
+  nsAutoString space;
+  if (ShouldMaintainPreLevel() && aNode->IsElement() &&
+      aNode->AsElement()->GetAttr(kNameSpaceID_XML, nsGkAtoms::space, space) &&
+      space.EqualsLiteral("preserve")) {
+    ++PreLevel();
+  }
+}
+
+void nsXMLContentSerializer::MaybeLeaveFromPreContent(nsIContent* aNode) {
+  // support of the xml:space attribute
+  nsAutoString space;
+  if (ShouldMaintainPreLevel() && aNode->IsElement() &&
+      aNode->AsElement()->GetAttr(kNameSpaceID_XML, nsGkAtoms::space, space) &&
+      space.EqualsLiteral("preserve")) {
+    --PreLevel();
+  }
+}
+
+bool nsXMLContentSerializer::AppendNewLineToString(nsAString& aStr) {
+  bool result = AppendToString(mLineBreak, aStr);
+  mMayIgnoreLineBreakSequence = true;
+  mColPos = 0;
+  mAddSpace = false;
+  mIsIndentationAddedOnCurrentLine = false;
+  return result;
+}
+
+bool nsXMLContentSerializer::AppendIndentation(nsAString& aStr) {
+  mIsIndentationAddedOnCurrentLine = true;
+  bool result = AppendToString(mIndent, aStr);
+  mAddSpace = false;
+  mMayIgnoreLineBreakSequence = false;
+  return result;
+}
+
+bool nsXMLContentSerializer::IncrIndentation(nsAtom* aName) {
+  // we want to keep the source readable
+  if (mDoWrap &&
+      mIndent.Length() >= uint32_t(mMaxColumn) - MIN_INDENTED_LINE_LENGTH) {
+    ++mIndentOverflow;
+  } else {
+    return mIndent.AppendLiteral(INDENT_STRING, mozilla::fallible);
+  }
+
+  return true;
+}
+
+void nsXMLContentSerializer::DecrIndentation(nsAtom* aName) {
+  if (mIndentOverflow)
+    --mIndentOverflow;
+  else
+    mIndent.Cut(0, INDENT_STRING_LENGTH);
+}
+
+bool nsXMLContentSerializer::LineBreakBeforeOpen(int32_t aNamespaceID,
+                                                 nsAtom* aName) {
+  return mAddSpace;
+}
+
+bool nsXMLContentSerializer::LineBreakAfterOpen(int32_t aNamespaceID,
+                                                nsAtom* aName) {
+  return false;
+}
+
+bool nsXMLContentSerializer::LineBreakBeforeClose(int32_t aNamespaceID,
+                                                  nsAtom* aName) {
+  return mAddSpace;
+}
+
+bool nsXMLContentSerializer::LineBreakAfterClose(int32_t aNamespaceID,
+                                                 nsAtom* aName) {
+  return false;
+}
+
+bool nsXMLContentSerializer::AppendToStringConvertLF(const nsAString& aStr,
+                                                     nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+
+  if (mDoRaw) {
+    NS_ENSURE_TRUE(AppendToString(aStr, aOutputStr), false);
+  } else {
+    // Convert line-endings to mLineBreak
+    uint32_t start = 0;
+    uint32_t theLen = aStr.Length();
+    while (start < theLen) {
+      int32_t eol = aStr.FindChar('\n', start);
+      if (eol == kNotFound) {
+        nsDependentSubstring dataSubstring(aStr, start, theLen - start);
+        NS_ENSURE_TRUE(AppendToString(dataSubstring, aOutputStr), false);
+        start = theLen;
+        // if there was a line break before this substring
+        // AppendNewLineToString was called, so we should reverse
+        // this flag
+        mMayIgnoreLineBreakSequence = false;
+      } else {
+        nsDependentSubstring dataSubstring(aStr, start, eol - start);
+        NS_ENSURE_TRUE(AppendToString(dataSubstring, aOutputStr), false);
+        NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
+        start = eol + 1;
+      }
+    }
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::AppendFormatedWrapped_WhitespaceSequence(
+    nsAString::const_char_iterator& aPos,
+    const nsAString::const_char_iterator aEnd,
+    const nsAString::const_char_iterator aSequenceStart,
+    bool& aMayIgnoreStartOfLineWhitespaceSequence, nsAString& aOutputStr) {
+  // Handle the complete sequence of whitespace.
+  // Continue to iterate until we find the first non-whitespace char.
+  // Updates "aPos" to point to the first unhandled char.
+  // Also updates the aMayIgnoreStartOfLineWhitespaceSequence flag,
+  // as well as the other "global" state flags.
+
+  bool sawBlankOrTab = false;
+  bool leaveLoop = false;
+
+  do {
+    switch (*aPos) {
+      case ' ':
+      case '\t':
+        sawBlankOrTab = true;
+        [[fallthrough]];
+      case '\n':
+        ++aPos;
+        // do not increase mColPos,
+        // because we will reduce the whitespace to a single char
+        break;
+      default:
+        leaveLoop = true;
+        break;
+    }
+  } while (!leaveLoop && aPos < aEnd);
+
+  if (mAddSpace) {
+    // if we had previously been asked to add space,
+    // our situation has not changed
+  } else if (!sawBlankOrTab && mMayIgnoreLineBreakSequence) {
+    // nothing to do in the case where line breaks have already been added
+    // before the call of AppendToStringWrapped
+    // and only if we found line break in the sequence
+    mMayIgnoreLineBreakSequence = false;
+  } else if (aMayIgnoreStartOfLineWhitespaceSequence) {
+    // nothing to do
+    aMayIgnoreStartOfLineWhitespaceSequence = false;
+  } else {
+    if (sawBlankOrTab) {
+      if (mDoWrap && mColPos + 1 >= mMaxColumn) {
+        // no much sense in delaying, we only have one slot left,
+        // let's write a break now
+        bool result = aOutputStr.Append(mLineBreak, mozilla::fallible);
+        mColPos = 0;
+        mIsIndentationAddedOnCurrentLine = false;
+        mMayIgnoreLineBreakSequence = true;
+        NS_ENSURE_TRUE(result, false);
+      } else {
+        // do not write out yet, we may write out either a space or a linebreak
+        // let's delay writing it out until we know more
+        mAddSpace = true;
+        ++mColPos;  // eat a slot of available space
+      }
+    } else {
+      // Asian text usually does not contain spaces, therefore we should not
+      // transform a linebreak into a space.
+      // Since we only saw linebreaks, but no spaces or tabs,
+      // let's write a linebreak now.
+      NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
+    }
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::AppendWrapped_NonWhitespaceSequence(
+    nsAString::const_char_iterator& aPos,
+    const nsAString::const_char_iterator aEnd,
+    const nsAString::const_char_iterator aSequenceStart,
+    bool& aMayIgnoreStartOfLineWhitespaceSequence,
+    bool& aSequenceStartAfterAWhiteSpace, nsAString& aOutputStr) {
+  mMayIgnoreLineBreakSequence = false;
+  aMayIgnoreStartOfLineWhitespaceSequence = false;
+
+  // Handle the complete sequence of non-whitespace in this block
+  // Iterate until we find the first whitespace char or an aEnd condition
+  // Updates "aPos" to point to the first unhandled char.
+  // Also updates the aMayIgnoreStartOfLineWhitespaceSequence flag,
+  // as well as the other "global" state flags.
+
+  bool thisSequenceStartsAtBeginningOfLine = !mColPos;
+  bool onceAgainBecauseWeAddedBreakInFront = false;
+  bool foundWhitespaceInLoop;
+  uint32_t length, colPos;
+
+  do {
+    if (mColPos) {
+      colPos = mColPos;
+    } else {
+      if (mDoFormat && !mDoRaw && !PreLevel() &&
+          !onceAgainBecauseWeAddedBreakInFront) {
+        colPos = mIndent.Length();
+      } else
+        colPos = 0;
+    }
+    foundWhitespaceInLoop = false;
+    length = 0;
+    // we iterate until the next whitespace character
+    // or until we reach the maximum of character per line
+    // or until the end of the string to add.
+    do {
+      if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
+        foundWhitespaceInLoop = true;
+        break;
+      }
+
+      ++aPos;
+      ++length;
+    } while ((!mDoWrap || colPos + length < mMaxColumn) && aPos < aEnd);
+
+    // in the case we don't reached the end of the string, but we reached the
+    // maxcolumn, we see if there is a whitespace after the maxcolumn if yes,
+    // then we can append directly the string instead of appending a new line
+    // etc.
+    if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
+      foundWhitespaceInLoop = true;
+    }
+
+    if (aPos == aEnd || foundWhitespaceInLoop) {
+      // there is enough room for the complete block we found
+      if (mDoFormat && !mColPos) {
+        NS_ENSURE_TRUE(AppendIndentation(aOutputStr), false);
+      } else if (mAddSpace) {
+        bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
+        mAddSpace = false;
+        NS_ENSURE_TRUE(result, false);
+      }
+
+      mColPos += length;
+      NS_ENSURE_TRUE(aOutputStr.Append(aSequenceStart, aPos - aSequenceStart,
+                                       mozilla::fallible),
+                     false);
+
+      // We have not yet reached the max column, we will continue to
+      // fill the current line in the next outer loop iteration
+      // (this one in AppendToStringWrapped)
+      // make sure we return in this outer loop
+      onceAgainBecauseWeAddedBreakInFront = false;
+    } else {  // we reach the max column
+      if (!thisSequenceStartsAtBeginningOfLine &&
+          (mAddSpace || (!mDoFormat && aSequenceStartAfterAWhiteSpace))) {
+        // when !mDoFormat, mAddSpace is not used, mAddSpace is always false
+        // so, in the case where mDoWrap && !mDoFormat, if we want to enter in
+        // this condition...
+
+        // We can avoid to wrap. We try to add the whole block
+        // in an empty new line
+
+        NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
+        aPos = aSequenceStart;
+        thisSequenceStartsAtBeginningOfLine = true;
+        onceAgainBecauseWeAddedBreakInFront = true;
+      } else {
+        // we must wrap
+        onceAgainBecauseWeAddedBreakInFront = false;
+        bool foundWrapPosition = false;
+        int32_t wrapPosition = 0;
+
+        if (mAllowLineBreaking) {
+          mozilla::intl::LineBreaker* lineBreaker =
+              nsContentUtils::LineBreaker();
+
+          wrapPosition =
+              lineBreaker->Prev(aSequenceStart, (aEnd - aSequenceStart),
+                                (aPos - aSequenceStart) + 1);
+          if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
+            foundWrapPosition = true;
+          } else {
+            wrapPosition =
+                lineBreaker->Next(aSequenceStart, (aEnd - aSequenceStart),
+                                  (aPos - aSequenceStart));
+            if (wrapPosition != NS_LINEBREAKER_NEED_MORE_TEXT) {
+              foundWrapPosition = true;
+            }
+          }
+        }
+
+        if (foundWrapPosition) {
+          if (!mColPos && mDoFormat) {
+            NS_ENSURE_TRUE(AppendIndentation(aOutputStr), false);
+          } else if (mAddSpace) {
+            bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
+            mAddSpace = false;
+            NS_ENSURE_TRUE(result, false);
+          }
+          NS_ENSURE_TRUE(aOutputStr.Append(aSequenceStart, wrapPosition,
+                                           mozilla::fallible),
+                         false);
+
+          NS_ENSURE_TRUE(AppendNewLineToString(aOutputStr), false);
+          aPos = aSequenceStart + wrapPosition;
+          aMayIgnoreStartOfLineWhitespaceSequence = true;
+        } else {
+          // try some simple fallback logic
+          // go forward up to the next whitespace position,
+          // in the worst case this will be all the rest of the data
+
+          // we update the mColPos variable with the length of
+          // the part already parsed.
+          mColPos += length;
+
+          // now try to find the next whitespace
+          do {
+            if (*aPos == ' ' || *aPos == '\t' || *aPos == '\n') {
+              break;
+            }
+
+            ++aPos;
+            ++mColPos;
+          } while (aPos < aEnd);
+
+          if (mAddSpace) {
+            bool result = aOutputStr.Append(char16_t(' '), mozilla::fallible);
+            mAddSpace = false;
+            NS_ENSURE_TRUE(result, false);
+          }
+          NS_ENSURE_TRUE(
+              aOutputStr.Append(aSequenceStart, aPos - aSequenceStart,
+                                mozilla::fallible),
+              false);
+        }
+      }
+      aSequenceStartAfterAWhiteSpace = false;
+    }
+  } while (onceAgainBecauseWeAddedBreakInFront);
+
+  return true;
+}
+
+bool nsXMLContentSerializer::AppendToStringFormatedWrapped(
+    const nsAString& aStr, nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+
+  nsAString::const_char_iterator pos, end, sequenceStart;
+
+  aStr.BeginReading(pos);
+  aStr.EndReading(end);
+
+  bool sequenceStartAfterAWhitespace = false;
+  if (pos < end) {
+    nsAString::const_char_iterator end2;
+    aOutputStr.EndReading(end2);
+    --end2;
+    if (*end2 == ' ' || *end2 == '\n' || *end2 == '\t') {
+      sequenceStartAfterAWhitespace = true;
+    }
+  }
+
+  // if the current line already has text on it, such as a tag,
+  // leading whitespace is significant
+  bool mayIgnoreStartOfLineWhitespaceSequence =
+      (!mColPos ||
+       (mIsIndentationAddedOnCurrentLine && sequenceStartAfterAWhitespace &&
+        uint32_t(mColPos) == mIndent.Length()));
+
+  while (pos < end) {
+    sequenceStart = pos;
+
+    // if beginning of a whitespace sequence
+    if (*pos == ' ' || *pos == '\n' || *pos == '\t') {
+      NS_ENSURE_TRUE(AppendFormatedWrapped_WhitespaceSequence(
+                         pos, end, sequenceStart,
+                         mayIgnoreStartOfLineWhitespaceSequence, aOutputStr),
+                     false);
+    } else {  // any other non-whitespace char
+      NS_ENSURE_TRUE(
+          AppendWrapped_NonWhitespaceSequence(
+              pos, end, sequenceStart, mayIgnoreStartOfLineWhitespaceSequence,
+              sequenceStartAfterAWhitespace, aOutputStr),
+          false);
+    }
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::AppendWrapped_WhitespaceSequence(
+    nsAString::const_char_iterator& aPos,
+    const nsAString::const_char_iterator aEnd,
+    const nsAString::const_char_iterator aSequenceStart,
+    nsAString& aOutputStr) {
+  // Handle the complete sequence of whitespace.
+  // Continue to iterate until we find the first non-whitespace char.
+  // Updates "aPos" to point to the first unhandled char.
+  mAddSpace = false;
+  mIsIndentationAddedOnCurrentLine = false;
+
+  bool leaveLoop = false;
+  nsAString::const_char_iterator lastPos = aPos;
+
+  do {
+    switch (*aPos) {
+      case ' ':
+      case '\t':
+        // if there are too many spaces on a line, we wrap
+        if (mColPos >= mMaxColumn) {
+          if (lastPos != aPos) {
+            NS_ENSURE_TRUE(
+                aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible),
+                false);
+          }
+          NS_ENSURE_TRUE(AppendToString(mLineBreak, aOutputStr), false);
+          mColPos = 0;
+          lastPos = aPos;
+        }
+
+        ++mColPos;
+        ++aPos;
+        break;
+      case '\n':
+        if (lastPos != aPos) {
+          NS_ENSURE_TRUE(
+              aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible),
+              false);
+        }
+        NS_ENSURE_TRUE(AppendToString(mLineBreak, aOutputStr), false);
+        mColPos = 0;
+        ++aPos;
+        lastPos = aPos;
+        break;
+      default:
+        leaveLoop = true;
+        break;
+    }
+  } while (!leaveLoop && aPos < aEnd);
+
+  if (lastPos != aPos) {
+    NS_ENSURE_TRUE(
+        aOutputStr.Append(lastPos, aPos - lastPos, mozilla::fallible), false);
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::AppendToStringWrapped(const nsAString& aStr,
+                                                   nsAString& aOutputStr) {
+  if (mBodyOnly && !mInBody) {
+    return true;
+  }
+
+  nsAString::const_char_iterator pos, end, sequenceStart;
+
+  aStr.BeginReading(pos);
+  aStr.EndReading(end);
+
+  // not used in this case, but needed by AppendWrapped_NonWhitespaceSequence
+  bool mayIgnoreStartOfLineWhitespaceSequence = false;
+  mMayIgnoreLineBreakSequence = false;
+
+  bool sequenceStartAfterAWhitespace = false;
+  if (pos < end && !aOutputStr.IsEmpty()) {
+    nsAString::const_char_iterator end2;
+    aOutputStr.EndReading(end2);
+    --end2;
+    if (*end2 == ' ' || *end2 == '\n' || *end2 == '\t') {
+      sequenceStartAfterAWhitespace = true;
+    }
+  }
+
+  while (pos < end) {
+    sequenceStart = pos;
+
+    // if beginning of a whitespace sequence
+    if (*pos == ' ' || *pos == '\n' || *pos == '\t') {
+      sequenceStartAfterAWhitespace = true;
+      NS_ENSURE_TRUE(
+          AppendWrapped_WhitespaceSequence(pos, end, sequenceStart, aOutputStr),
+          false);
+    } else {  // any other non-whitespace char
+      NS_ENSURE_TRUE(
+          AppendWrapped_NonWhitespaceSequence(
+              pos, end, sequenceStart, mayIgnoreStartOfLineWhitespaceSequence,
+              sequenceStartAfterAWhitespace, aOutputStr),
+          false);
+    }
+  }
+
+  return true;
+}
+
+bool nsXMLContentSerializer::ShouldMaintainPreLevel() const {
+  // Only attempt to maintain the pre level for consumers who care about it.
+  return !mDoRaw || (mFlags & nsIDocumentEncoder::OutputNoFormattingInPre);
+}
+
+bool nsXMLContentSerializer::MaybeSerializeIsValue(Element* aElement,
+                                                   nsAString& aStr) {
+  CustomElementData* ceData = aElement->GetCustomElementData();
+  if (ceData) {
+    nsAtom* isAttr = ceData->GetIs(aElement);
+    if (isAttr && !aElement->HasAttr(kNameSpaceID_None, nsGkAtoms::is)) {
+      NS_ENSURE_TRUE(aStr.AppendLiteral(" is=\"", mozilla::fallible), false);
+      NS_ENSURE_TRUE(
+          aStr.Append(nsDependentAtomString(isAttr), mozilla::fallible), false);
+      NS_ENSURE_TRUE(aStr.AppendLiteral("\"", mozilla::fallible), false);
+    }
+  }
+
+  return true;
+}
diff -Nru firefox-84.0.2+build1/dom/serializers/nsXMLContentSerializer.h firefox-85.0+build1/dom/serializers/nsXMLContentSerializer.h
--- firefox-84.0.2+build1/dom/serializers/nsXMLContentSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/serializers/nsXMLContentSerializer.h	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,456 @@
+/* -*- 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/. */
+
+/*
+ * nsIContentSerializer implementation that can be used with an
+ * nsIDocumentEncoder to convert an XML DOM to an XML string that
+ * could be parsed into more or less the original DOM.
+ */
+
+#ifndef nsXMLContentSerializer_h__
+#define nsXMLContentSerializer_h__
+
+#include "mozilla/Attributes.h"
+#include "nsIContentSerializer.h"
+#include "nsISupportsUtils.h"
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
+#include "nsString.h"
+
+#define kIndentStr u"  "_ns
+#define kEndTag u"</"_ns
+
+class nsAtom;
+class nsINode;
+
+namespace mozilla {
+class Encoding;
+}
+
+class nsXMLContentSerializer : public nsIContentSerializer {
+ public:
+  nsXMLContentSerializer();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(uint32_t flags, uint32_t aWrapColumn,
+                  const mozilla::Encoding* aEncoding, bool aIsCopying,
+                  bool aRewriteEncodingDeclaration,
+                  bool* aNeedsPreformatScanning, nsAString& aOutput) override;
+
+  NS_IMETHOD AppendText(nsIContent* aText, int32_t aStartOffset,
+                        int32_t aEndOffset) override;
+
+  NS_IMETHOD AppendCDATASection(nsIContent* aCDATASection, int32_t aStartOffset,
+                                int32_t aEndOffset) override;
+
+  NS_IMETHOD AppendProcessingInstruction(
+      mozilla::dom::ProcessingInstruction* aPI, int32_t aStartOffset,
+      int32_t aEndOffset) override;
+
+  NS_IMETHOD AppendComment(mozilla::dom::Comment* aComment,
+                           int32_t aStartOffset, int32_t aEndOffset) override;
+
+  NS_IMETHOD AppendDoctype(mozilla::dom::DocumentType* aDoctype) override;
+
+  NS_IMETHOD AppendElementStart(
+      mozilla::dom::Element* aElement,
+      mozilla::dom::Element* aOriginalElement) override;
+
+  NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement,
+                              mozilla::dom::Element* aOriginalElement) override;
+
+  NS_IMETHOD FlushAndFinish() override { return NS_OK; }
+
+  NS_IMETHOD Finish() override;
+
+  NS_IMETHOD GetOutputLength(uint32_t& aLength) const override;
+
+  NS_IMETHOD AppendDocumentStart(mozilla::dom::Document* aDocument) override;
+
+  NS_IMETHOD ScanElementForPreformat(mozilla::dom::Element* aElement) override {
+    return NS_OK;
+  }
+  NS_IMETHOD ForgetElementForPreformat(
+      mozilla::dom::Element* aElement) override {
+    return NS_OK;
+  }
+
+ protected:
+  virtual ~nsXMLContentSerializer();
+
+  /**
+   * Appends a char16_t character and increments the column position
+   */
+  MOZ_MUST_USE
+  bool AppendToString(const char16_t aChar, nsAString& aOutputStr);
+
+  /**
+   * Appends a nsAString string and increments the column position
+   */
+  MOZ_MUST_USE
+  bool AppendToString(const nsAString& aStr, nsAString& aOutputStr);
+
+  /**
+   * Appends a string by replacing all line-endings
+   * by mLineBreak, except in the case of raw output.
+   * It increments the column position.
+   */
+  MOZ_MUST_USE
+  bool AppendToStringConvertLF(const nsAString& aStr, nsAString& aOutputStr);
+
+  /**
+   * Appends a string by wrapping it when necessary.
+   * It updates the column position.
+   */
+  MOZ_MUST_USE
+  bool AppendToStringWrapped(const nsAString& aStr, nsAString& aOutputStr);
+
+  /**
+   * Appends a string by formating and wrapping it when necessary
+   * It updates the column position.
+   */
+  MOZ_MUST_USE
+  bool AppendToStringFormatedWrapped(const nsAString& aStr,
+                                     nsAString& aOutputStr);
+
+  // used by AppendToStringWrapped
+  MOZ_MUST_USE
+  bool AppendWrapped_WhitespaceSequence(
+      nsAString::const_char_iterator& aPos,
+      const nsAString::const_char_iterator aEnd,
+      const nsAString::const_char_iterator aSequenceStart,
+      nsAString& aOutputStr);
+
+  // used by AppendToStringFormatedWrapped
+  MOZ_MUST_USE
+  bool AppendFormatedWrapped_WhitespaceSequence(
+      nsAString::const_char_iterator& aPos,
+      const nsAString::const_char_iterator aEnd,
+      const nsAString::const_char_iterator aSequenceStart,
+      bool& aMayIgnoreStartOfLineWhitespaceSequence, nsAString& aOutputStr);
+
+  // used by AppendToStringWrapped and AppendToStringFormatedWrapped
+  MOZ_MUST_USE
+  bool AppendWrapped_NonWhitespaceSequence(
+      nsAString::const_char_iterator& aPos,
+      const nsAString::const_char_iterator aEnd,
+      const nsAString::const_char_iterator aSequenceStart,
+      bool& aMayIgnoreStartOfLineWhitespaceSequence,
+      bool& aSequenceStartAfterAWhiteSpace, nsAString& aOutputStr);
+
+  /**
+   * add mLineBreak to the string
+   * It updates the column position and other flags.
+   */
+  MOZ_MUST_USE
+  bool AppendNewLineToString(nsAString& aOutputStr);
+
+  /**
+   * Appends a string by translating entities
+   * It doesn't increment the column position
+   */
+  MOZ_MUST_USE
+  virtual bool AppendAndTranslateEntities(const nsAString& aStr,
+                                          nsAString& aOutputStr);
+
+  /**
+   * Helper for virtual AppendAndTranslateEntities that does the actualy work.
+   *
+   * Do not call this directly.  Call it via the template helper below.
+   */
+ private:
+  MOZ_MUST_USE
+  static bool AppendAndTranslateEntities(const nsAString& aStr,
+                                         nsAString& aOutputStr,
+                                         const uint8_t aEntityTable[],
+                                         uint16_t aMaxTableIndex,
+                                         const char* const aStringTable[]);
+
+ protected:
+  /**
+   * Helper for calling AppendAndTranslateEntities in a way that guarantees we
+   * don't mess up our aEntityTable sizing.  This is a bit more complicated than
+   * it could be, becaue sometimes we don't want to use all of aEntityTable, so
+   * we have to allow passing the amount to use independently.  But we can
+   * statically ensure it's not too big.
+   *
+   * The first integer template argument, which callers need to specify
+   * explicitly, is the index of the last entry in aEntityTable that should be
+   * considered for encoding as an entity reference.  The second integer
+   * argument will be deduced from the actual table passed in.
+   *
+   * aEntityTable contains as values indices into aStringTable.  Those represent
+   * the strings that should be used to replace the characters that are used to
+   * index into aEntityTable.  aStringTable[0] should be nullptr, and characters
+   * that do not need replacement should map to 0 in aEntityTable.
+   */
+  template <uint16_t LargestIndex, uint16_t TableLength>
+  MOZ_MUST_USE bool AppendAndTranslateEntities(
+      const nsAString& aStr, nsAString& aOutputStr,
+      const uint8_t (&aEntityTable)[TableLength],
+      const char* const aStringTable[]) {
+    static_assert(LargestIndex < TableLength,
+                  "Largest allowed index must be smaller than table length");
+    return AppendAndTranslateEntities(aStr, aOutputStr, aEntityTable,
+                                      LargestIndex, aStringTable);
+  }
+
+  /**
+   * Max index that can be used with some of our entity tables.
+   */
+  static const uint16_t kGTVal = 62;
+
+  /**
+   * retrieve the text content of the node and append it to the given string
+   * It doesn't increment the column position
+   */
+  nsresult AppendTextData(nsIContent* aNode, int32_t aStartOffset,
+                          int32_t aEndOffset, nsAString& aStr,
+                          bool aTranslateEntities);
+
+  virtual nsresult PushNameSpaceDecl(const nsAString& aPrefix,
+                                     const nsAString& aURI, nsIContent* aOwner);
+  void PopNameSpaceDeclsFor(nsIContent* aOwner);
+
+  /**
+   * The problem that ConfirmPrefix fixes is that anyone can insert nodes
+   * through the DOM that have a namespace URI and a random or empty or
+   * previously existing prefix that's totally unrelated to the prefixes
+   * declared at that point through xmlns attributes.  So what ConfirmPrefix
+   * does is ensure that we can map aPrefix to the namespace URI aURI (for
+   * example, that the prefix is not already mapped to some other namespace).
+   * aPrefix will be adjusted, if necessary, so the value of the prefix
+   * _after_ this call is what should be serialized.
+   * @param aPrefix the prefix that may need adjusting
+   * @param aURI the namespace URI we want aPrefix to point to
+   * @param aElement the element we're working with (needed for proper default
+   *                 namespace handling)
+   * @param aIsAttribute true if we're confirming a prefix for an attribute.
+   * @return true if we need to push the (prefix, uri) pair on the namespace
+   *                 stack (note that this can happen even if the prefix is
+   *                 empty).
+   */
+  bool ConfirmPrefix(nsAString& aPrefix, const nsAString& aURI,
+                     nsIContent* aElement, bool aIsAttribute);
+  /**
+   * GenerateNewPrefix generates a new prefix and writes it to aPrefix
+   */
+  void GenerateNewPrefix(nsAString& aPrefix);
+
+  uint32_t ScanNamespaceDeclarations(mozilla::dom::Element* aContent,
+                                     mozilla::dom::Element* aOriginalElement,
+                                     const nsAString& aTagNamespaceURI);
+
+  MOZ_MUST_USE
+  virtual bool SerializeAttributes(mozilla::dom::Element* aContent,
+                                   mozilla::dom::Element* aOriginalElement,
+                                   nsAString& aTagPrefix,
+                                   const nsAString& aTagNamespaceURI,
+                                   nsAtom* aTagName, nsAString& aStr,
+                                   uint32_t aSkipAttr, bool aAddNSAttr);
+
+  MOZ_MUST_USE
+  bool SerializeAttr(const nsAString& aPrefix, const nsAString& aName,
+                     const nsAString& aValue, nsAString& aStr,
+                     bool aDoEscapeEntities);
+
+  bool IsJavaScript(nsIContent* aContent, nsAtom* aAttrNameAtom,
+                    int32_t aAttrNamespaceID, const nsAString& aValueString);
+
+  /**
+   * This method can be redefined to check if the element can be serialized.
+   * It is called when the serialization of the start tag is asked
+   * (AppendElementStart)
+   * In this method you can also force the formating
+   * by setting aForceFormat to true.
+   * @return boolean  true if the element can be output
+   */
+  virtual bool CheckElementStart(mozilla::dom::Element* aElement,
+                                 bool& aForceFormat, nsAString& aStr,
+                                 nsresult& aResult);
+
+  /**
+   * This method is responsible for appending the '>' at the end of the start
+   * tag, possibly preceded by '/' and maybe a ' ' before that too.
+   *
+   * aElement and aOriginalElement are the same as the corresponding arguments
+   * to AppendElementStart.
+   */
+  MOZ_MUST_USE
+  bool AppendEndOfElementStart(mozilla::dom::Element* aEleemnt,
+                               mozilla::dom::Element* aOriginalElement,
+                               nsAString& aStr);
+
+  /**
+   * This method can be redefine to serialize additional things just after
+   * after the serialization ot the start tag.
+   * (called at the end of AppendElementStart)
+   */
+  MOZ_MUST_USE
+  virtual bool AfterElementStart(nsIContent* aContent,
+                                 nsIContent* aOriginalElement,
+                                 nsAString& aStr) {
+    return true;
+  };
+
+  /**
+   * This method can be redefined to check if the element can be serialized.
+   * It is called when the serialization of the end tag is asked
+   * (AppendElementEnd)
+   * In this method you can also force the formating
+   * by setting aForceFormat to true.
+   * @return boolean  true if the element can be output
+   */
+  virtual bool CheckElementEnd(mozilla::dom::Element* aElement,
+                               mozilla::dom::Element* aOriginalElement,
+                               bool& aForceFormat, nsAString& aStr);
+
+  /**
+   * This method can be redefine to serialize additional things just after
+   * after the serialization ot the end tag.
+   * (called at the end of AppendElementStart)
+   */
+  virtual void AfterElementEnd(nsIContent* aContent, nsAString& aStr){};
+
+  /**
+   * Returns true if a line break should be inserted before an element open tag
+   */
+  virtual bool LineBreakBeforeOpen(int32_t aNamespaceID, nsAtom* aName);
+
+  /**
+   * Returns true if a line break should be inserted after an element open tag
+   */
+  virtual bool LineBreakAfterOpen(int32_t aNamespaceID, nsAtom* aName);
+
+  /**
+   * Returns true if a line break should be inserted after an element close tag
+   */
+  virtual bool LineBreakBeforeClose(int32_t aNamespaceID, nsAtom* aName);
+
+  /**
+   * Returns true if a line break should be inserted after an element close tag
+   */
+  virtual bool LineBreakAfterClose(int32_t aNamespaceID, nsAtom* aName);
+
+  /**
+   * add intendation. Call only in the case of formating and if the current
+   * position is at 0. It updates the column position.
+   */
+  MOZ_MUST_USE
+  bool AppendIndentation(nsAString& aStr);
+
+  MOZ_MUST_USE
+  bool IncrIndentation(nsAtom* aName);
+  void DecrIndentation(nsAtom* aName);
+
+  // Functions to check for newlines that needs to be added between nodes in
+  // the root of a document. See mAddNewlineForRootNode
+  MOZ_MUST_USE
+  bool MaybeAddNewlineForRootNode(nsAString& aStr);
+  void MaybeFlagNewlineForRootNode(nsINode* aNode);
+
+  // Functions to check if we enter in or leave from a preformated content
+  virtual void MaybeEnterInPreContent(nsIContent* aNode);
+  virtual void MaybeLeaveFromPreContent(nsIContent* aNode);
+
+  bool ShouldMaintainPreLevel() const;
+  int32_t PreLevel() const {
+    MOZ_ASSERT(ShouldMaintainPreLevel());
+    return mPreLevel;
+  }
+  int32_t& PreLevel() {
+    MOZ_ASSERT(ShouldMaintainPreLevel());
+    return mPreLevel;
+  }
+
+  bool MaybeSerializeIsValue(mozilla::dom::Element* aElement, nsAString& aStr);
+
+  int32_t mPrefixIndex;
+
+  struct NameSpaceDecl {
+    nsString mPrefix;
+    nsString mURI;
+    nsIContent* mOwner;
+  };
+
+  nsTArray<NameSpaceDecl> mNameSpaceStack;
+
+  // nsIDocumentEncoder flags
+  MOZ_INIT_OUTSIDE_CTOR uint32_t mFlags;
+
+  // characters to use for line break
+  nsString mLineBreak;
+
+  // The charset that was passed to Init()
+  nsCString mCharset;
+
+  // current column position on the current line
+  uint32_t mColPos;
+
+  // true = pretty formating should be done (OutputFormated flag)
+  MOZ_INIT_OUTSIDE_CTOR bool mDoFormat;
+
+  // true = no formatting,(OutputRaw flag)
+  // no newline convertion and no rewrap long lines even if OutputWrap is set.
+  MOZ_INIT_OUTSIDE_CTOR bool mDoRaw;
+
+  // true = wrapping should be done (OutputWrap flag)
+  MOZ_INIT_OUTSIDE_CTOR bool mDoWrap;
+
+  // true = we can break lines (OutputDisallowLineBreaking flag)
+  MOZ_INIT_OUTSIDE_CTOR bool mAllowLineBreaking;
+
+  // number of maximum column in a line, in the wrap mode
+  MOZ_INIT_OUTSIDE_CTOR uint32_t mMaxColumn;
+
+  // current indent value
+  nsString mIndent;
+
+  // this is the indentation level after the indentation reached
+  // the maximum length of indentation
+  int32_t mIndentOverflow;
+
+  // says if the indentation has been already added on the current line
+  bool mIsIndentationAddedOnCurrentLine;
+
+  // the string which is currently added is in an attribute
+  bool mInAttribute;
+
+  // true = a newline character should be added. It's only
+  // useful when serializing root nodes. see MaybeAddNewlineForRootNode and
+  // MaybeFlagNewlineForRootNode
+  bool mAddNewlineForRootNode;
+
+  // Indicates that a space will be added if and only if content is
+  // continued on the same line while serializing source.  Otherwise,
+  // the newline character acts as the whitespace and no space is needed.
+  // used when mDoFormat = true
+  bool mAddSpace;
+
+  // says that if the next string to add contains a newline character at the
+  // begining, then this newline character should be ignored, because a
+  // such character has already been added into the output string
+  bool mMayIgnoreLineBreakSequence;
+
+  bool mBodyOnly;
+  int32_t mInBody;
+
+  // Non-owning.
+  nsAString* mOutput;
+
+ private:
+  // number of nested elements which have preformated content
+  MOZ_INIT_OUTSIDE_CTOR int32_t mPreLevel;
+
+  static const uint8_t kEntities[];
+  static const uint8_t kAttrEntities[];
+  static const char* const kEntityStrings[];
+};
+
+nsresult NS_NewXMLContentSerializer(nsIContentSerializer** aSerializer);
+
+#endif
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/IPCServiceWorkerDescriptor.ipdlh firefox-85.0+build1/dom/serviceworkers/IPCServiceWorkerDescriptor.ipdlh
--- firefox-84.0.2+build1/dom/serviceworkers/IPCServiceWorkerDescriptor.ipdlh	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/IPCServiceWorkerDescriptor.ipdlh	2021-01-18 19:58:10.000000000 +0000
@@ -4,7 +4,9 @@
 
 include PBackgroundSharedTypes;
 
-using ServiceWorkerState from "mozilla/dom/ServiceWorkerIPCUtils.h";
+include "mozilla/dom/ServiceWorkerIPCUtils.h";
+
+using ServiceWorkerState from "mozilla/dom/ServiceWorkerBinding.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/IPCServiceWorkerRegistrationDescriptor.ipdlh firefox-85.0+build1/dom/serviceworkers/IPCServiceWorkerRegistrationDescriptor.ipdlh
--- firefox-84.0.2+build1/dom/serviceworkers/IPCServiceWorkerRegistrationDescriptor.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/IPCServiceWorkerRegistrationDescriptor.ipdlh	2021-01-18 19:58:10.000000000 +0000
@@ -5,8 +5,11 @@
 include PBackgroundSharedTypes;
 include IPCServiceWorkerDescriptor;
 
-using ServiceWorkerUpdateViaCache from "mozilla/dom/ServiceWorkerIPCUtils.h";
-using mozilla::CopyableErrorResult from "ipc/ErrorIPCUtils.h";
+include "ipc/ErrorIPCUtils.h";
+include "mozilla/dom/ServiceWorkerIPCUtils.h";
+
+using ServiceWorkerUpdateViaCache from "mozilla/dom/ServiceWorkerRegistrationBinding.h";
+using mozilla::CopyableErrorResult from "mozilla/ErrorResult.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/PServiceWorkerContainer.ipdl firefox-85.0+build1/dom/serviceworkers/PServiceWorkerContainer.ipdl
--- firefox-84.0.2+build1/dom/serviceworkers/PServiceWorkerContainer.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/PServiceWorkerContainer.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,8 @@
 include ClientIPCTypes;
 include IPCServiceWorkerRegistrationDescriptor;
 
+include "mozilla/dom/ServiceWorkerIPCUtils.h";
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/PServiceWorkerRegistration.ipdl firefox-85.0+build1/dom/serviceworkers/PServiceWorkerRegistration.ipdl
--- firefox-84.0.2+build1/dom/serviceworkers/PServiceWorkerRegistration.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/PServiceWorkerRegistration.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 
 include IPCServiceWorkerRegistrationDescriptor;
 
+include "ipc/ErrorIPCUtils.h";
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerChild.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerChild.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ServiceWorkerChild.h"
 #include "RemoteServiceWorkerImpl.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerChild.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerChild.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_serviceworkerchild_h__
 
 #include "mozilla/dom/PServiceWorkerChild.h"
+#include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerCloneData.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerCloneData.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerCloneData.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerCloneData.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,8 +6,13 @@
 
 #include "ServiceWorkerCloneData.h"
 
+#include <utility>
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/DOMTypes.h"
+#include "mozilla/dom/StructuredCloneHolder.h"
+#include "nsISerialEventTarget.h"
 #include "nsProxyRelease.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerCloneData.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerCloneData.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerCloneData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerCloneData.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,11 @@
 #ifndef mozilla_dom_ServiceWorkerCloneData_h__
 #define mozilla_dom_ServiceWorkerCloneData_h__
 
+#include "mozilla/Assertions.h"
+#include "mozilla/dom/DOMTypes.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 
 class nsISerialEventTarget;
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerChild.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerChild.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/PServiceWorkerContainerChild.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 
 #include "RemoteServiceWorkerContainerImpl.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerChild.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerChild.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,9 @@
 
 #include "mozilla/dom/PServiceWorkerContainerChild.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/WorkerRef.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainer.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainer.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainer.h	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainer.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_serviceworkercontainer_h__
 
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 
 class nsIGlobalWindow;
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerParent.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerParent.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorkerContainerParent.h"
 
 #include "ServiceWorkerContainerProxy.h"
+#include "mozilla/dom/ClientInfo.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerProxy.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerProxy.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerContainerProxy.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerContainerProxy.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorker.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorker.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorker.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorker.h"
 
 #include "mozilla/dom/Document.h"
+#include "nsGlobalWindowInner.h"
 #include "nsPIDOMWindow.h"
 #include "RemoteServiceWorkerImpl.h"
 #include "ServiceWorkerCloneData.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerEvents.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerEvents.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerEvents.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerEvents.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #include "js/TypeDecls.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BodyUtil.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerInfo.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerInfo.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerInfo.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerInfo.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,8 +9,10 @@
 
 #include "MainThreadUtils.h"
 #include "mozilla/dom/ServiceWorkerBinding.h"  // For ServiceWorkerState
+#include "mozilla/dom/ServiceWorkerDescriptor.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/OriginAttributes.h"
+#include "mozilla/TimeStamp.h"
 #include "nsIServiceWorkerManager.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerInterceptController.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerInterceptController.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerInterceptController.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerInterceptController.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorkerInterceptController.h"
 
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StorageAccess.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerIPCUtils.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerIPCUtils.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerIPCUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerIPCUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef _mozilla_dom_ServiceWorkerIPCUtils_h
 #define _mozilla_dom_ServiceWorkerIPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 // Undo X11/X.h's definition of None
 #undef None
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerManager.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerManager.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerManager.cpp	2021-01-06 11:23:07.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -58,10 +58,12 @@
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/PermissionManager.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_extensions.h"
 #include "mozilla/Unused.h"
 #include "mozilla/EnumSet.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 #include "nsProxyRelease.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerOpArgs.ipdlh firefox-85.0+build1/dom/serviceworkers/ServiceWorkerOpArgs.ipdlh
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerOpArgs.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerOpArgs.ipdlh	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,9 @@
 include DOMTypes;
 include FetchTypes;
 
-using ServiceWorkerState from "mozilla/dom/ServiceWorkerIPCUtils.h";
+include "mozilla/dom/ServiceWorkerIPCUtils.h";
+
+using ServiceWorkerState from "mozilla/dom/ServiceWorkerBinding.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerPrivate.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "ServiceWorkerUtils.h"
 #include "nsContentUtils.h"
 #include "nsICacheInfoChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsINamed.h"
@@ -29,6 +30,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/CycleCollectedJSContext.h"  // for MicroTaskRunnable
 #include "mozilla/JSObjectHolder.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/dom/Client.h"
 #include "mozilla/dom/ClientIPCTypes.h"
 #include "mozilla/dom/FetchUtil.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerPrivateImpl.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsDebug.h"
 #include "nsError.h"
 #include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsINetworkInterceptController.h"
@@ -23,6 +24,7 @@
 #include "nsIUploadChannel2.h"
 #include "nsThreadUtils.h"
 #include "nsICacheInfoChannel.h"
+#include "nsNetUtil.h"
 
 #include "ServiceWorkerCloneData.h"
 #include "ServiceWorkerManager.h"
@@ -49,6 +51,7 @@
 #include "mozilla/dom/ServiceWorkerBinding.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
+#include "mozilla/ipc/URIUtils.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/RemoteLazyInputStreamStorage.h"
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerProxy.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerProxy.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerProxy.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerProxy.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "ServiceWorkerParent.h"
 
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ClientState.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "ServiceWorkerInfo.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerProxy.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerProxy.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerProxy.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerProxy.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,7 @@
 namespace mozilla {
 namespace dom {
 
+class ClientInfo;
 class ClientState;
 class ServiceWorkerCloneData;
 class ServiceWorkerInfo;
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrar.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrar.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrar.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrar.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -33,6 +33,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozJSComponentLoader.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsNetCID.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorkerRegistrationChild.h"
 
 #include "RemoteServiceWorkerRegistrationImpl.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationChild.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,9 @@
 
 #include "mozilla/dom/PServiceWorkerRegistrationChild.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/WorkerRef.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistration.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistration.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistration.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistration.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/dom/ServiceWorkerRegistrationBinding.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/ScopeExit.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsPIDOMWindow.h"
 #include "RemoteServiceWorkerRegistrationImpl.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationImpl.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationImpl.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationImpl.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationImpl.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,22 +7,22 @@
 #ifndef mozilla_dom_serviceworkerregistrationimpl_h
 #define mozilla_dom_serviceworkerregistrationimpl_h
 
-#include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/Unused.h"
-#include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/Document.h"
-#include "nsPIDOMWindow.h"
-#include "ServiceWorkerManager.h"
 #include "ServiceWorkerRegistration.h"
 #include "ServiceWorkerRegistrationListener.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
+#include "mozilla/dom/ServiceWorkerUtils.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace dom {
 
-class Promise;
-class PushManager;
-class ServiceWorker;
+class ServiceWorkerRegistrationInfo;
 class WeakWorkerRef;
+class WorkerPrivate;
 
 ////////////////////////////////////////////////////
 // Main Thread implementation
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationInfo.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationInfo.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationInfo.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationInfo.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "ServiceWorkerPrivate.h"
 #include "ServiceWorkerRegistrationListener.h"
 
+#include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerRegistrationProxy.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ServiceWorkerRegistrationProxy.h"
 
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "ServiceWorkerManager.h"
 #include "ServiceWorkerRegistrationParent.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerScriptCache.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerScriptCache.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerScriptCache.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerScriptCache.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -18,8 +18,10 @@
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "mozilla/net/CookieJarSettings.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_extensions.h"
 #include "nsICacheInfoChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIStreamLoader.h"
 #include "nsIThreadRetargetableRequest.h"
 #include "nsIUUIDGenerator.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerShutdownBlocker.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerShutdownBlocker.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerShutdownBlocker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerShutdownBlocker.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include <utility>
 
 #include "MainThreadUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsDebug.h"
 #include "nsError.h"
 #include "nsIWritablePropertyBag2.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerShutdownState.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerShutdownState.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerShutdownState.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerShutdownState.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include <cstdint>
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/dom/ServiceWorkerOpArgs.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUnregisterJob.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Unused.h"
 #include "nsIPushService.h"
+#include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "ServiceWorkerManager.h"
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUpdateJob.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUpdateJob.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUpdateJob.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUpdateJob.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,8 @@
 #include "ServiceWorkerJob.h"
 #include "ServiceWorkerRegistration.h"
 
+#include "nsIRequest.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUtils.cpp firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUtils.cpp
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "ServiceWorkerUtils.h"
 
+#include "mozilla/BasePrincipal.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/ClientInfo.h"
 #include "mozilla/dom/ServiceWorkerRegistrarTypes.h"
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUtils.h firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUtils.h
--- firefox-84.0.2+build1/dom/serviceworkers/ServiceWorkerUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/ServiceWorkerUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 namespace mozilla {
 
 class CopyableErrorResult;
+class ErrorResult;
 
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/test/browser_antitracking.js firefox-85.0+build1/dom/serviceworkers/test/browser_antitracking.js
--- firefox-84.0.2+build1/dom/serviceworkers/test/browser_antitracking.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/test/browser_antitracking.js	2021-01-18 19:58:10.000000000 +0000
@@ -72,7 +72,7 @@
   let browserLoadedPromise = BrowserTestUtils.browserLoaded(
     topTab.linkedBrowser
   );
-  await BrowserTestUtils.loadURI(topTab.linkedBrowser, TOP_EMPTY_PAGE);
+  BrowserTestUtils.loadURI(topTab.linkedBrowser, TOP_EMPTY_PAGE);
   await browserLoadedPromise;
 
   // Create Iframe in the top-level page and verify its state.
@@ -92,7 +92,7 @@
   // ## Cleanup
   info("Loading the SW unregister page: " + SW_REGISTER_PAGE);
   browserLoadedPromise = BrowserTestUtils.browserLoaded(topTab.linkedBrowser);
-  await BrowserTestUtils.loadURI(topTab.linkedBrowser, SW_REGISTER_PAGE);
+  BrowserTestUtils.loadURI(topTab.linkedBrowser, SW_REGISTER_PAGE);
   await browserLoadedPromise;
 
   await SpecialPowers.spawn(topTab.linkedBrowser, [], async function() {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/test/browser_antitracking_subiframes.js firefox-85.0+build1/dom/serviceworkers/test/browser_antitracking_subiframes.js
--- firefox-84.0.2+build1/dom/serviceworkers/test/browser_antitracking_subiframes.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/test/browser_antitracking_subiframes.js	2021-01-18 19:58:10.000000000 +0000
@@ -57,7 +57,7 @@
   let browserLoadedPromise = BrowserTestUtils.browserLoaded(
     topTab.linkedBrowser
   );
-  await BrowserTestUtils.loadURI(topTab.linkedBrowser, TOP_EMPTY_PAGE);
+  BrowserTestUtils.loadURI(topTab.linkedBrowser, TOP_EMPTY_PAGE);
   await browserLoadedPromise;
 
   // Create Iframe in the top-level page and verify its state.
@@ -93,7 +93,7 @@
 
   info("Loading the SW unregister page: " + SW_REGISTER_PAGE);
   browserLoadedPromise = BrowserTestUtils.browserLoaded(topTab.linkedBrowser);
-  await BrowserTestUtils.loadURI(topTab.linkedBrowser, SW_REGISTER_PAGE);
+  BrowserTestUtils.loadURI(topTab.linkedBrowser, SW_REGISTER_PAGE);
   await browserLoadedPromise;
 
   await SpecialPowers.spawn(topTab.linkedBrowser, [], async function() {
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/test/browser_force_refresh.js firefox-85.0+build1/dom/serviceworkers/test/browser_force_refresh.js
--- firefox-84.0.2+build1/dom/serviceworkers/test/browser_force_refresh.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/test/browser_force_refresh.js	2021-01-18 19:58:10.000000000 +0000
@@ -79,7 +79,7 @@
       var tab = BrowserTestUtils.addTab(gBrowser);
       var tabBrowser = gBrowser.getBrowserForTab(tab);
       gBrowser.selectedTab = tab;
-      await BrowserTestUtils.loadURI(gBrowser, url);
+      BrowserTestUtils.loadURI(gBrowser, url);
     }
   );
 }
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/test/browser.ini firefox-85.0+build1/dom/serviceworkers/test/browser.ini
--- firefox-84.0.2+build1/dom/serviceworkers/test/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/test/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -26,6 +26,7 @@
 [browser_devtools_serviceworker_interception.js]
 skip-if = serviceworker_e10s
 [browser_force_refresh.js]
+skip-if = verify # Bug 1603340
 [browser_download.js]
 [browser_download_canceled.js]
 skip-if = verify
diff -Nru firefox-84.0.2+build1/dom/serviceworkers/test/browser_remote_type_process_swap.js firefox-85.0+build1/dom/serviceworkers/test/browser_remote_type_process_swap.js
--- firefox-84.0.2+build1/dom/serviceworkers/test/browser_remote_type_process_swap.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/serviceworkers/test/browser_remote_type_process_swap.js	2021-01-18 19:58:10.000000000 +0000
@@ -36,7 +36,7 @@
 
 async function loadURI(aXULBrowser, aURI) {
   const browserLoadedPromise = BrowserTestUtils.browserLoaded(aXULBrowser);
-  await BrowserTestUtils.loadURI(aXULBrowser, aURI);
+  BrowserTestUtils.loadURI(aXULBrowser, aURI);
 
   return browserLoadedPromise;
 }
diff -Nru firefox-84.0.2+build1/dom/simpledb/ActorsParent.cpp firefox-85.0+build1/dom/simpledb/ActorsParent.cpp
--- firefox-84.0.2+build1/dom/simpledb/ActorsParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/simpledb/ActorsParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -25,6 +25,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/Result.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Variant.h"
@@ -135,6 +136,12 @@
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(mozilla::dom::Connection)
 
+  Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
+    AssertIsOnBackgroundThread();
+
+    return ToMaybeRef(mDirectoryLock.get());
+  }
+
   nsIFileStream* GetFileStream() const {
     AssertIsOnIOThread();
 
@@ -504,28 +511,48 @@
 
   void ReleaseIOThreadObjects() override;
 
-  void AbortOperations(const nsACString& aOrigin) override;
+  void AbortOperationsForLocks(
+      const DirectoryLockIdTable& aDirectoryLockIds) override;
 
   void AbortOperationsForProcess(ContentParentId aContentParentId) override;
 
+  void AbortAllOperations() override;
+
   void StartIdleMaintenance() override;
 
   void StopIdleMaintenance() override;
 
-  void ShutdownWorkThreads() override;
-
  private:
   ~QuotaClient() override;
+
+  void InitiateShutdown() override;
+  bool IsShutdownCompleted() const override;
+  nsCString GetShutdownStatus() const override;
+  void ForceKillActors() override;
+  void FinalizeShutdown() override;
 };
 
 /*******************************************************************************
  * Globals
  ******************************************************************************/
 
-typedef nsTArray<RefPtr<Connection>> ConnectionArray;
+using ConnectionArray = nsTArray<NotNull<RefPtr<Connection>>>;
 
 StaticAutoPtr<ConnectionArray> gOpenConnections;
 
+template <typename Condition>
+void AllowToCloseConnectionsMatching(const Condition& aCondition) {
+  AssertIsOnBackgroundThread();
+
+  if (gOpenConnections) {
+    for (const auto& connection : *gOpenConnections) {
+      if (aCondition(*connection)) {
+        connection->AllowToClose();
+      }
+    }
+  }
+}
+
 }  // namespace
 
 /*******************************************************************************
@@ -719,7 +746,7 @@
     gOpenConnections = new ConnectionArray();
   }
 
-  gOpenConnections->AppendElement(this);
+  gOpenConnections->AppendElement(WrapNotNullUnchecked(this));
 }
 
 void Connection::OnClose() {
@@ -1103,7 +1130,7 @@
   MOZ_ASSERT(mState == State::FinishOpen);
 
   if (gOpenConnections) {
-    for (Connection* connection : *gOpenConnections) {
+    for (const auto& connection : *gOpenConnections) {
       if (connection->Origin() == mQuotaInfo.mOrigin &&
           connection->Name() == mParams.name()) {
         return NS_ERROR_STORAGE_BUSY;
@@ -1201,10 +1228,23 @@
   QuotaManager* quotaManager = QuotaManager::Get();
   MOZ_ASSERT(quotaManager);
 
-  SDB_TRY_INSPECT(const auto& dbDirectory,
-                  quotaManager->EnsureStorageAndOriginIsInitialized(
-                      GetConnection()->GetPersistenceType(), mQuotaInfo,
-                      mozilla::dom::quota::Client::SDB));
+  SDB_TRY(quotaManager->EnsureStorageIsInitialized());
+
+  SDB_TRY_INSPECT(
+      const auto& dbDirectory,
+      ([persistenceType = GetConnection()->GetPersistenceType(), &quotaManager,
+        this]()
+           -> mozilla::Result<std::pair<nsCOMPtr<nsIFile>, bool>, nsresult> {
+        if (persistenceType == PERSISTENCE_TYPE_PERSISTENT) {
+          SDB_TRY_RETURN(
+              quotaManager->EnsurePersistentOriginIsInitialized(mQuotaInfo));
+        }
+
+        SDB_TRY(quotaManager->EnsureTemporaryStorageIsInitialized());
+        SDB_TRY_RETURN(quotaManager->EnsureTemporaryOriginIsInitialized(
+            persistenceType, mQuotaInfo));
+      }()
+                  .map([](const auto& res) { return res.first; })));
 
   nsresult rv =
       dbDirectory->Append(NS_LITERAL_STRING_FROM_CSTRING(SDB_DIRECTORY_NAME));
@@ -1758,39 +1798,57 @@
 
 void QuotaClient::ReleaseIOThreadObjects() { AssertIsOnIOThread(); }
 
-void QuotaClient::AbortOperations(const nsACString& aOrigin) {
+void QuotaClient::AbortOperationsForLocks(
+    const DirectoryLockIdTable& aDirectoryLockIds) {
   AssertIsOnBackgroundThread();
 
-  if (gOpenConnections) {
-    for (Connection* connection : *gOpenConnections) {
-      if (aOrigin.IsVoid() || connection->Origin() == aOrigin) {
-        connection->AllowToClose();
-      }
-    }
-  }
+  AllowToCloseConnectionsMatching([&aDirectoryLockIds](const auto& connection) {
+    // If the connections is registered in gOpenConnections then it must have
+    // a directory lock.
+    return IsLockForObjectContainedInLockTable(connection, aDirectoryLockIds);
+  });
 }
 
 void QuotaClient::AbortOperationsForProcess(ContentParentId aContentParentId) {
   AssertIsOnBackgroundThread();
 }
 
+void QuotaClient::AbortAllOperations() {
+  AssertIsOnBackgroundThread();
+
+  AllowToCloseConnectionsMatching([](const auto&) { return true; });
+}
+
 void QuotaClient::StartIdleMaintenance() { AssertIsOnBackgroundThread(); }
 
 void QuotaClient::StopIdleMaintenance() { AssertIsOnBackgroundThread(); }
 
-void QuotaClient::ShutdownWorkThreads() {
+void QuotaClient::InitiateShutdown() {
   AssertIsOnBackgroundThread();
   MOZ_ASSERT(!mShutdownRequested);
 
   mShutdownRequested = true;
 
   if (gOpenConnections) {
-    for (Connection* connection : *gOpenConnections) {
+    for (const auto& connection : *gOpenConnections) {
       connection->AllowToClose();
     }
-
-    MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { return !gOpenConnections; }));
   }
 }
 
+bool QuotaClient::IsShutdownCompleted() const { return !gOpenConnections; }
+
+void QuotaClient::ForceKillActors() {
+  // Currently we don't implement killing actors (are there any to kill here?).
+}
+
+nsCString QuotaClient::GetShutdownStatus() const {
+  // XXX Gather information here.
+  return "To be implemented"_ns;
+}
+
+void QuotaClient::FinalizeShutdown() {
+  // Nothing to do here.
+}
+
 }  // namespace mozilla::dom
diff -Nru firefox-84.0.2+build1/dom/smil/SMILCompositor.h firefox-85.0+build1/dom/smil/SMILCompositor.h
--- firefox-84.0.2+build1/dom/smil/SMILCompositor.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/smil/SMILCompositor.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,11 +14,14 @@
 #include "mozilla/SMILAnimationFunction.h"
 #include "mozilla/SMILCompositorTable.h"
 #include "mozilla/UniquePtr.h"
+#include "nsCSSPropertyID.h"
 #include "nsString.h"
 #include "nsTHashtable.h"
 
 namespace mozilla {
 
+class ComputedStyle;
+
 //----------------------------------------------------------------------
 // SMILCompositor
 //
diff -Nru firefox-84.0.2+build1/dom/smil/SMILTargetIdentifier.h firefox-85.0+build1/dom/smil/SMILTargetIdentifier.h
--- firefox-84.0.2+build1/dom/smil/SMILTargetIdentifier.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/smil/SMILTargetIdentifier.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,9 +7,17 @@
 #ifndef DOM_SMIL_SMILTARGETIDENTIFIER_H_
 #define DOM_SMIL_SMILTARGETIDENTIFIER_H_
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "nsAtom.h"
+#include "nsIContent.h"
 #include "mozilla/dom/Element.h"
 
+class nsIContent;
+
 namespace mozilla {
+namespace dom {
+class Element;
+}
 
 /**
  * Struct: SMILTargetIdentifier
diff -Nru firefox-84.0.2+build1/dom/smil/SMILTimedElement.cpp firefox-85.0+build1/dom/smil/SMILTimedElement.cpp
--- firefox-84.0.2+build1/dom/smil/SMILTimedElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/smil/SMILTimedElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1354,9 +1354,9 @@
 
 void SMILTimedElement::UnpreserveInstanceTimes(InstanceTimeList& aList) {
   const SMILInterval* prevInterval = GetPreviousInterval();
-  const SMILInstanceTime* cutoff =
-      mCurrentInterval ? mCurrentInterval->Begin()
-                       : prevInterval ? prevInterval->Begin() : nullptr;
+  const SMILInstanceTime* cutoff = mCurrentInterval ? mCurrentInterval->Begin()
+                                   : prevInterval   ? prevInterval->Begin()
+                                                    : nullptr;
   uint32_t count = aList.Length();
   for (uint32_t i = 0; i < count; ++i) {
     SMILInstanceTime* instance = aList[i].get();
diff -Nru firefox-84.0.2+build1/dom/smil/SMILTimeValueSpec.cpp firefox-85.0+build1/dom/smil/SMILTimeValueSpec.cpp
--- firefox-84.0.2+build1/dom/smil/SMILTimeValueSpec.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/smil/SMILTimeValueSpec.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/SMILTimedElement.h"
 #include "mozilla/SMILTimeValueSpec.h"
 #include "mozilla/SMILTimeValue.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/SVGAnimationElement.h"
 #include "mozilla/dom/TimeEvent.h"
diff -Nru firefox-84.0.2+build1/dom/smil/SMILTimeValueSpec.h firefox-85.0+build1/dom/smil/SMILTimeValueSpec.h
--- firefox-84.0.2+build1/dom/smil/SMILTimeValueSpec.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/smil/SMILTimeValueSpec.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,9 @@
 #include "nsStringFwd.h"
 #include "nsIDOMEventListener.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/Element.h"
+
 namespace mozilla {
 
 class EventListenerManager;
diff -Nru firefox-84.0.2+build1/dom/storage/LocalStorageCache.cpp firefox-85.0+build1/dom/storage/LocalStorageCache.cpp
--- firefox-84.0.2+build1/dom/storage/LocalStorageCache.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/LocalStorageCache.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -194,7 +194,7 @@
   Data& data = mData[aGetDataSetIndex];
   uint64_t newOriginUsage = data.mOriginQuotaUsage + aDelta;
   if (aSource == ContentMutation && aDelta > 0 &&
-      newOriginUsage > LocalStorageManager::GetQuota()) {
+      newOriginUsage > LocalStorageManager::GetOriginQuota()) {
     return false;
   }
 
@@ -609,7 +609,7 @@
 
   int64_t newUsage = mUsage[aDataSetIndex] + aDelta;
   if (aSource == LocalStorageCache::ContentMutation && aDelta > 0 &&
-      newUsage > LocalStorageManager::GetQuota()) {
+      newUsage > LocalStorageManager::GetSiteQuota()) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/dom/storage/LocalStorageManager.cpp firefox-85.0+build1/dom/storage/LocalStorageManager.cpp
--- firefox-84.0.2+build1/dom/storage/LocalStorageManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/LocalStorageManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -33,10 +33,17 @@
 LocalStorageManager* LocalStorageManager::sSelf = nullptr;
 
 // static
-uint32_t LocalStorageManager::GetQuota() {
+uint32_t LocalStorageManager::GetOriginQuota() {
   return StaticPrefs::dom_storage_default_quota() * 1024;  // pref is in kBs
 }
 
+// static
+uint32_t LocalStorageManager::GetSiteQuota() {
+  return std::max(StaticPrefs::dom_storage_default_quota(),
+                  StaticPrefs::dom_storage_default_site_quota()) *
+         1024;  // pref is in kBs
+}
+
 NS_IMPL_ISUPPORTS(LocalStorageManager, nsIDOMStorageManager,
                   nsILocalStorageManager)
 
diff -Nru firefox-84.0.2+build1/dom/storage/LocalStorageManager.h firefox-85.0+build1/dom/storage/LocalStorageManager.h
--- firefox-84.0.2+build1/dom/storage/LocalStorageManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/LocalStorageManager.h	2021-01-18 19:58:10.000000000 +0000
@@ -37,7 +37,10 @@
   LocalStorageManager();
 
   // Reads the preference for DOM storage quota
-  static uint32_t GetQuota();
+  static uint32_t GetOriginQuota();
+
+  // Reads the preference for DOM storage site quota
+  static uint32_t GetSiteQuota();
 
   // Gets (but not ensures) cache for the given scope
   LocalStorageCache* GetCache(const nsACString& aOriginSuffix,
diff -Nru firefox-84.0.2+build1/dom/storage/SessionStorageCache.cpp firefox-85.0+build1/dom/storage/SessionStorageCache.cpp
--- firefox-84.0.2+build1/dom/storage/SessionStorageCache.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/SessionStorageCache.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "StorageIPC.h"
 #include "mozilla/dom/LSWriteOptimizer.h"
 #include "mozilla/dom/PBackgroundSessionStorageCache.h"
+#include "nsDOMString.h"
 
 namespace mozilla {
 namespace dom {
@@ -326,7 +327,7 @@
 bool SessionStorageCache::DataSet::ProcessUsageDelta(int64_t aDelta) {
   // Check limit per this origin
   uint64_t newOriginUsage = mOriginQuotaUsage + aDelta;
-  if (aDelta > 0 && newOriginUsage > LocalStorageManager::GetQuota()) {
+  if (aDelta > 0 && newOriginUsage > LocalStorageManager::GetOriginQuota()) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/dom/storage/SessionStorage.cpp firefox-85.0+build1/dom/storage/SessionStorage.cpp
--- firefox-84.0.2+build1/dom/storage/SessionStorage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/SessionStorage.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsContentUtils.h"
 #include "nsIPrincipal.h"
 #include "nsPIDOMWindow.h"
+#include "nsThreadUtils.h"
 
 #define DATASET                                    \
   (!IsPrivateBrowsing() && IsSessionScopedOrLess() \
diff -Nru firefox-84.0.2+build1/dom/storage/SessionStorageManager.cpp firefox-85.0+build1/dom/storage/SessionStorageManager.cpp
--- firefox-84.0.2+build1/dom/storage/SessionStorageManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/SessionStorageManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/OriginAttributes.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/dom/PBackgroundSessionStorageCache.h"
 #include "mozilla/dom/PBackgroundSessionStorageManager.h"
 #include "mozilla/ipc/BackgroundChild.h"
@@ -40,6 +41,21 @@
   return true;
 }
 
+void RecvPropagateBackgroundSessionStorageManager(
+    uint64_t aCurrentTopContextId, uint64_t aTargetTopContextId) {
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
+
+  if (sManagers) {
+    if (RefPtr<BackgroundSessionStorageManager> mgr =
+            sManagers->Get(aCurrentTopContextId)) {
+      // Assuming the target top browsing context should haven't been
+      // registered yet.
+      MOZ_DIAGNOSTIC_ASSERT(!sManagers->GetWeak(aTargetTopContextId));
+      sManagers->Put(aTargetTopContextId, std::move(mgr));
+    }
+  }
+}
+
 bool RecvRemoveBackgroundSessionStorageManager(uint64_t aTopContextId) {
   ::mozilla::ipc::AssertIsOnBackgroundThread();
 
@@ -567,6 +583,25 @@
     return;
   }
 }
+
+// static
+void BackgroundSessionStorageManager::PropagateManager(
+    uint64_t aCurrentTopContextId, uint64_t aTargetTopContextId) {
+  MOZ_ASSERT(XRE_IsParentProcess());
+  AssertIsOnMainThread();
+  MOZ_ASSERT(aCurrentTopContextId != aTargetTopContextId);
+
+  ::mozilla::ipc::PBackgroundChild* backgroundActor =
+      ::mozilla::ipc::BackgroundChild::GetOrCreateForCurrentThread();
+  if (NS_WARN_IF(!backgroundActor)) {
+    return;
+  }
+
+  if (NS_WARN_IF(!backgroundActor->SendPropagateBackgroundSessionStorageManager(
+          aCurrentTopContextId, aTargetTopContextId))) {
+    return;
+  }
+}
 
 // static
 BackgroundSessionStorageManager* BackgroundSessionStorageManager::GetOrCreate(
diff -Nru firefox-84.0.2+build1/dom/storage/SessionStorageManager.h firefox-85.0+build1/dom/storage/SessionStorageManager.h
--- firefox-84.0.2+build1/dom/storage/SessionStorageManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/SessionStorageManager.h	2021-01-18 19:58:10.000000000 +0000
@@ -21,6 +21,8 @@
 namespace dom {
 
 bool RecvShutdownBackgroundSessionStorageManagers();
+void RecvPropagateBackgroundSessionStorageManager(uint64_t aCurrentTopContextId,
+                                                  uint64_t aTargetTopContextId);
 bool RecvRemoveBackgroundSessionStorageManager(uint64_t aTopContextId);
 
 class BrowsingContext;
@@ -159,7 +161,12 @@
 
   NS_INLINE_DECL_REFCOUNTING(BackgroundSessionStorageManager);
 
-  // Only called by ~BrowsingContext on parent process.
+  // Only called by CanonicalBrowsingContext::ReplaceBy on the parent process.
+  static void PropagateManager(uint64_t aCurrentTopContextId,
+                               uint64_t aTargetTopContextId);
+
+  // Only called by CanonicalBrowsingContext::CanonicalDiscard on parent
+  // process.
   static void RemoveManager(uint64_t aTopContextId);
 
   void CopyDataToContentProcess(const nsACString& aOriginAttrs,
diff -Nru firefox-84.0.2+build1/dom/storage/StorageActivityService.cpp firefox-85.0+build1/dom/storage/StorageActivityService.cpp
--- firefox-84.0.2+build1/dom/storage/StorageActivityService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageActivityService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,10 +10,12 @@
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 #include "nsIObserverService.h"
 #include "nsIPrincipal.h"
diff -Nru firefox-84.0.2+build1/dom/storage/Storage.cpp firefox-85.0+build1/dom/storage/Storage.cpp
--- firefox-84.0.2+build1/dom/storage/Storage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/Storage.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,8 +11,11 @@
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/StorageEventBinding.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/Services.h"
 #include "mozilla/StorageAccess.h"
+#include "nsIObserverService.h"
 #include "nsPIDOMWindow.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/storage/StorageDBThread.cpp firefox-85.0+build1/dom/storage/StorageDBThread.cpp
--- firefox-84.0.2+build1/dom/storage/StorageDBThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageDBThread.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "LocalStorageCache.h"
 #include "LocalStorageManager.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsThreadUtils.h"
@@ -992,6 +993,14 @@
     }
 
     case opGetUsage: {
+      // Bug 1676410 fixed a regression caused by bug 1165214. However, it
+      // turns out that 100% correct checking of the eTLD+1 usage is not
+      // possible to recover easily, see bug 1683299.
+#if 0
+      // This is how it should be done, but due to other problems like lack
+      // of usage synchronization between content processes, we temporarily
+      // disabled the matching using "%".
+
       nsCOMPtr<mozIStorageStatement> stmt =
           aThread->mWorkerStatements.GetCachedStatement(
               "SELECT SUM(LENGTH(key) + LENGTH(value)) FROM webappsstore2 "
@@ -1023,6 +1032,24 @@
       rv = stmt->BindUTF8StringByName("usageOrigin"_ns,
                                       originScopeEscaped + "%"_ns);
       NS_ENSURE_SUCCESS(rv, rv);
+#else
+      // This is the code before bug 1676410 and bug 1676973. The returned
+      // usage will be zero in most of the cases, but due to lack of usage
+      // synchronization between content processes we have to live with this
+      // semi-broken behaviour because it causes less harm than the matching
+      // using "%".
+
+      nsCOMPtr<mozIStorageStatement> stmt =
+          aThread->mWorkerStatements.GetCachedStatement(
+              "SELECT SUM(LENGTH(key) + LENGTH(value)) FROM webappsstore2 "
+              "WHERE (originAttributes || ':' || originKey) LIKE :usageOrigin");
+      NS_ENSURE_STATE(stmt);
+
+      mozStorageStatementScoper scope(stmt);
+
+      rv = stmt->BindUTF8StringByName("usageOrigin"_ns, mUsage->OriginScope());
+      NS_ENSURE_SUCCESS(rv, rv);
+#endif
 
       bool exists;
       rv = stmt->ExecuteStep(&exists);
diff -Nru firefox-84.0.2+build1/dom/storage/StorageDBThread.h firefox-85.0+build1/dom/storage/StorageDBThread.h
--- firefox-84.0.2+build1/dom/storage/StorageDBThread.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageDBThread.h	2021-01-18 19:58:10.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsClassHashtable.h"
 #include "nsIFile.h"
 #include "nsIThreadInternal.h"
+#include "nsThreadUtils.h"
 
 class mozIStorageConnection;
 
diff -Nru firefox-84.0.2+build1/dom/storage/Storage.h firefox-85.0+build1/dom/storage/Storage.h
--- firefox-84.0.2+build1/dom/storage/Storage.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/Storage.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,6 +14,8 @@
 #include "nsCOMPtr.h"
 #include "nsWrapperCache.h"
 #include "nsISupports.h"
+#include "nsTArrayForwardDeclare.h"
+#include "nsString.h"
 
 class nsIPrincipal;
 class nsPIDOMWindowInner;
diff -Nru firefox-84.0.2+build1/dom/storage/StorageIPC.cpp firefox-85.0+build1/dom/storage/StorageIPC.cpp
--- firefox-84.0.2+build1/dom/storage/StorageIPC.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageIPC.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "SessionStorageManager.h"
 #include "SessionStorageCache.h"
 
+#include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/PBackgroundChild.h"
diff -Nru firefox-84.0.2+build1/dom/storage/StorageNotifierService.cpp firefox-85.0+build1/dom/storage/StorageNotifierService.cpp
--- firefox-84.0.2+build1/dom/storage/StorageNotifierService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageNotifierService.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/storage/StorageObserver.cpp firefox-85.0+build1/dom/storage/StorageObserver.cpp
--- firefox-84.0.2+build1/dom/storage/StorageObserver.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/storage/StorageObserver.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -25,6 +25,7 @@
 #include "mozilla/dom/LocalStorageCommon.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsServiceManagerUtils.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGLengthList.h firefox-85.0+build1/dom/svg/DOMSVGLengthList.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGLengthList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGLengthList.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsTArray.h"
 #include "SVGLengthList.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Unused.h"
 
 // {cbecb7a4-d6f3-47b5-b5a3-3e5bdbf5b2f9}
@@ -26,6 +25,7 @@
   }
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class DOMSVGLength;
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGNumber.h firefox-85.0+build1/dom/svg/DOMSVGNumber.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGNumber.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGNumber.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,13 +12,13 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "nsWrapperCache.h"
 
 #define MOZ_SVG_LIST_INDEX_BIT_COUNT 27  // supports > 134 million list items
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class SVGElement;
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGNumberList.h firefox-85.0+build1/dom/svg/DOMSVGNumberList.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGNumberList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGNumberList.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,10 +14,10 @@
 #include "nsTArray.h"
 #include "SVGNumberList.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 class DOMSVGNumber;
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGPathSegList.h firefox-85.0+build1/dom/svg/DOMSVGPathSegList.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGPathSegList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGPathSegList.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,12 +13,12 @@
 #include "nsTArray.h"
 #include "SVGPathData.h"  // IWYU pragma: keep
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/SVGElement.h"
 
 namespace mozilla {
 
+class ErrorResult;
 class SVGAnimatedPathSegList;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGPointList.h firefox-85.0+build1/dom/svg/DOMSVGPointList.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGPointList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGPointList.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,7 +13,6 @@
 #include "nsTArray.h"
 #include "SVGPointList.h"  // IWYU pragma: keep
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 
 // {61812ad1-c078-4cd1-87e6-bc1c1b8d7284}
@@ -26,6 +25,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class SVGAnimatedPointList;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/svg/DOMSVGTransformList.h firefox-85.0+build1/dom/svg/DOMSVGTransformList.h
--- firefox-84.0.2+build1/dom/svg/DOMSVGTransformList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/DOMSVGTransformList.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,9 +14,9 @@
 #include "SVGTransformList.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 struct DOMMatrix2DInit;
diff -Nru firefox-84.0.2+build1/dom/svg/SVGAnimatedNumberPair.cpp firefox-85.0+build1/dom/svg/SVGAnimatedNumberPair.cpp
--- firefox-84.0.2+build1/dom/svg/SVGAnimatedNumberPair.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGAnimatedNumberPair.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include "SVGNumberPairSMILType.h"
 #include "mozilla/SMILValue.h"
 #include "mozilla/SVGContentUtils.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla::dom;
 
diff -Nru firefox-84.0.2+build1/dom/svg/SVGAnimatedRect.h firefox-85.0+build1/dom/svg/SVGAnimatedRect.h
--- firefox-84.0.2+build1/dom/svg/SVGAnimatedRect.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGAnimatedRect.h	2021-01-18 19:58:10.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/dom/SVGElement.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/svg/SVGAnimatedTransformList.cpp firefox-85.0+build1/dom/svg/SVGAnimatedTransformList.cpp
--- firefox-84.0.2+build1/dom/svg/SVGAnimatedTransformList.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGAnimatedTransformList.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/SVGAnimationElement.h"
 #include "nsCharSeparatedTokenizer.h"
+#include "nsContentUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::dom::SVGTransform_Binding;
diff -Nru firefox-84.0.2+build1/dom/svg/SVGContentUtils.h firefox-85.0+build1/dom/svg/SVGContentUtils.h
--- firefox-84.0.2+build1/dom/svg/SVGContentUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGContentUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,9 +13,9 @@
 #include "mozilla/gfx/2D.h"  // for StrokeOptions
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/RangedPtr.h"
-#include "mozilla/ServoStyleConsts.h"
 #include "nsError.h"
 #include "nsStringFwd.h"
+#include "nsTArray.h"
 #include "gfx2DGlue.h"
 #include "nsDependentSubstring.h"
 
@@ -30,6 +30,7 @@
 class SVGAnimatedPreserveAspectRatio;
 class SVGContextPaint;
 class SVGPreserveAspectRatio;
+union StyleLengthPercentageUnion;
 namespace dom {
 class Document;
 class Element;
@@ -306,11 +307,18 @@
    */
   static bool ParseInteger(const nsAString& aString, int32_t& aValue);
 
+  // XXX This should rather use LengthPercentage instead of
+  // StyleLengthPercentageUnion, but that's a type alias defined in
+  // ServoStyleConsts.h, and we don't want to avoid including that large header
+  // with all its dependencies. If a forwarding header were generated by
+  // cbindgen, we could include that.
+  // https://github.com/eqrion/cbindgen/issues/617 addresses this.
   /**
    * Converts a LengthPercentage into a userspace value, resolving percentage
    * values relative to aContent's SVG viewport.
    */
-  static float CoordToFloat(dom::SVGElement* aContent, const LengthPercentage&,
+  static float CoordToFloat(dom::SVGElement* aContent,
+                            const StyleLengthPercentageUnion&,
                             uint8_t aCtxType = SVGContentUtils::XY);
   /**
    * Parse the SVG path string
diff -Nru firefox-84.0.2+build1/dom/svg/SVGElement.cpp firefox-85.0+build1/dom/svg/SVGElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -33,6 +33,7 @@
 #include "mozAutoDocUpdate.h"
 #include "nsAttrValueOrString.h"
 #include "nsCSSProps.h"
+#include "nsCSSValue.h"
 #include "nsContentUtils.h"
 #include "nsDOMCSSAttrDeclaration.h"
 #include "nsICSSDeclaration.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGElement.h firefox-85.0+build1/dom/svg/SVGElement.h
--- firefox-84.0.2+build1/dom/svg/SVGElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGElement.h	2021-01-18 19:58:10.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/gfx/MatrixFwd.h"
 #include "mozilla/UniquePtr.h"
+#include "nsCSSPropertyID.h"
 #include "nsChangeHint.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsError.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGFEImageElement.cpp firefox-85.0+build1/dom/svg/SVGFEImageElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGFEImageElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGFEImageElement.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/EventStates.h"
 #include "mozilla/SVGObserverUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/SVGFEImageElementBinding.h"
 #include "mozilla/dom/SVGFilterElement.h"
 #include "mozilla/dom/UserActivation.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGGeometryProperty.cpp firefox-85.0+build1/dom/svg/SVGGeometryProperty.cpp
--- firefox-84.0.2+build1/dom/svg/SVGGeometryProperty.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGGeometryProperty.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
 #include "SVGImageElement.h"
 #include "SVGRectElement.h"
 #include "SVGUseElement.h"
+#include "nsCSSValue.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/svg/SVGGraphicsElement.cpp firefox-85.0+build1/dom/svg/SVGGraphicsElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGGraphicsElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGGraphicsElement.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/dom/SVGGraphicsElement.h"
 
 #include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/Document.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/svg/SVGImageElement.cpp firefox-85.0+build1/dom/svg/SVGImageElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGImageElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGImageElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsIURI.h"
 #include "nsNetUtil.h"
 #include "imgINotificationObserver.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/SVGImageElementBinding.h"
 #include "mozilla/dom/SVGLengthBinding.h"
 #include "mozilla/dom/UserActivation.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGLengthList.cpp firefox-85.0+build1/dom/svg/SVGLengthList.cpp
--- firefox-84.0.2+build1/dom/svg/SVGLengthList.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGLengthList.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "SVGLengthList.h"
 #include "nsCharSeparatedTokenizer.h"
+#include "nsContentUtils.h"
 #include "nsError.h"
 #include "nsString.h"
 #include "SVGElement.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGMPathElement.cpp firefox-85.0+build1/dom/svg/SVGMPathElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGMPathElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGMPathElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsDebug.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "mozilla/dom/SVGAnimateMotionElement.h"
 #include "mozilla/dom/SVGGeometryElement.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGNumberList.cpp firefox-85.0+build1/dom/svg/SVGNumberList.cpp
--- firefox-84.0.2+build1/dom/svg/SVGNumberList.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGNumberList.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "nsCharSeparatedTokenizer.h"
+#include "nsContentUtils.h"
 #include "nsString.h"
 #include "nsTextFormatter.h"
 #include "SVGContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGPathData.h firefox-85.0+build1/dom/svg/SVGPathData.h
--- firefox-84.0.2+build1/dom/svg/SVGPathData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGPathData.h	2021-01-18 19:58:10.000000000 +0000
@@ -23,6 +23,7 @@
 
 namespace mozilla {
 
+struct StylePathCommand;
 struct SVGMark;
 enum class StyleStrokeLinecap : uint8_t;
 
diff -Nru firefox-84.0.2+build1/dom/svg/SVGPointList.cpp firefox-85.0+build1/dom/svg/SVGPointList.cpp
--- firefox-84.0.2+build1/dom/svg/SVGPointList.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGPointList.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "SVGPointList.h"
 #include "nsCharSeparatedTokenizer.h"
+#include "nsContentUtils.h"
 #include "nsTextFormatter.h"
 #include "SVGContentUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/svg/SVGPreserveAspectRatio.h firefox-85.0+build1/dom/svg/SVGPreserveAspectRatio.h
--- firefox-84.0.2+build1/dom/svg/SVGPreserveAspectRatio.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGPreserveAspectRatio.h	2021-01-18 19:58:10.000000000 +0000
@@ -12,10 +12,10 @@
 
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/SVGElement.h"
 
 namespace mozilla {
+class ErrorResult;
 
 // These constants represent the range of valid enum values for the <align>
 // parameter. They exclude the sentinel _UNKNOWN value.
diff -Nru firefox-84.0.2+build1/dom/svg/SVGStyleElement.cpp firefox-85.0+build1/dom/svg/SVGStyleElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGStyleElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGStyleElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,7 +7,9 @@
 #include "mozilla/dom/SVGStyleElement.h"
 
 #include "mozilla/RefPtr.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "mozilla/dom/SVGStyleElementBinding.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGTitleElement.cpp firefox-85.0+build1/dom/svg/SVGTitleElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGTitleElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGTitleElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,8 @@
 #include "mozilla/dom/SVGTitleElement.h"
 #include "mozilla/dom/SVGTitleElementBinding.h"
 
+#include "mozilla/dom/Document.h"
+
 NS_IMPL_NS_NEW_SVG_ELEMENT(Title)
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/svg/SVGUseElement.cpp firefox-85.0+build1/dom/svg/SVGUseElement.cpp
--- firefox-84.0.2+build1/dom/svg/SVGUseElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGUseElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/SVGObserverUtils.h"
 #include "mozilla/SVGUseFrame.h"
 #include "mozilla/URLExtraData.h"
diff -Nru firefox-84.0.2+build1/dom/svg/SVGUseElement.h firefox-85.0+build1/dom/svg/SVGUseElement.h
--- firefox-84.0.2+build1/dom/svg/SVGUseElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/SVGUseElement.h	2021-01-18 19:58:10.000000000 +0000
@@ -26,6 +26,7 @@
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 namespace mozilla {
+class Encoding;
 class SVGUseFrame;
 struct URLExtraData;
 
diff -Nru firefox-84.0.2+build1/dom/svg/test/mochitest.ini firefox-85.0+build1/dom/svg/test/mochitest.ini
--- firefox-84.0.2+build1/dom/svg/test/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/svg/test/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -107,5 +107,4 @@
 [test_valueLeaks.xhtml]
 [test_viewBox.html]
 [test_viewport.html]
-skip-if = (xorigin && fission) # Intermittent crash in treeherder, JavaScript error: resource://gre/modules/AsyncShutdown.jsm, line 554: NotFoundError: No such JSWindowActor 'SpecialPowers'
 
diff -Nru firefox-84.0.2+build1/dom/system/IOUtils.cpp firefox-85.0+build1/dom/system/IOUtils.cpp
--- firefox-84.0.2+build1/dom/system/IOUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/IOUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -13,7 +13,9 @@
 #include "mozilla/EndianUtils.h"
 #include "mozilla/ErrorNames.h"
 #include "mozilla/ResultExtensions.h"
+#include "mozilla/Services.h"
 #include "mozilla/Span.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/dom/IOUtilsBinding.h"
 #include "mozilla/dom/Promise.h"
@@ -31,21 +33,12 @@
 #include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsThreadManager.h"
+#include "nsXULAppAPI.h"
 #include "prerror.h"
 #include "prio.h"
 #include "prtime.h"
 #include "prtypes.h"
 
-#define REJECT_IF_NULL_EVENT_TARGET(aEventTarget, aJSPromise)  \
-  do {                                                         \
-    if (!(aEventTarget)) {                                     \
-      (aJSPromise)                                             \
-          ->MaybeRejectWithAbortError(                         \
-              "Could not dispatch task to background thread"); \
-      return (aJSPromise).forget();                            \
-    }                                                          \
-  } while (false)
-
 #define REJECT_IF_SHUTTING_DOWN(aJSPromise)                       \
   do {                                                            \
     if (sShutdownStarted) {                                       \
@@ -66,8 +59,7 @@
     }                                                                    \
   } while (0)
 
-namespace mozilla {
-namespace dom {
+namespace mozilla::dom {
 
 // static helper functions
 
@@ -134,15 +126,16 @@
   info.mType.Construct(aInternalFileInfo.mType);
   info.mSize.Construct(aInternalFileInfo.mSize);
   info.mLastModified.Construct(aInternalFileInfo.mLastModified);
+
+  if (aInternalFileInfo.mCreationTime.isSome()) {
+    info.mCreationTime.Construct(aInternalFileInfo.mCreationTime.ref());
+  }
+
+  info.mPermissions.Construct(aInternalFileInfo.mPermissions);
+
   return ToJSValue(aCx, info, aValue);
 }
 
-#ifdef XP_WIN
-constexpr char PathSeparator = u'\\';
-#else
-constexpr char PathSeparator = u'/';
-#endif
-
 // IOUtils implementation
 
 /* static */
@@ -153,50 +146,33 @@
 /* static */
 Atomic<bool> IOUtils::sShutdownStarted = Atomic<bool>(false);
 
-template <typename MozPromiseT, typename Fn, typename... Args>
-static RefPtr<MozPromiseT> InvokeToMozPromise(Fn aFunc, Args... aArgs) {
-  MOZ_ASSERT(!NS_IsMainThread());
-  auto rv = aFunc(std::forward<Args>(aArgs)...);
-  if (rv.isErr()) {
-    return MozPromiseT::CreateAndReject(rv.unwrapErr(), __func__);
-  }
-  return MozPromiseT::CreateAndResolve(rv.unwrap(), __func__);
-}
-
 /* static */
-template <typename OkT, typename Fn, typename... Args>
-already_AddRefed<Promise> IOUtils::RunOnBackgroundThread(
-    RefPtr<Promise>& aPromise, Fn aFunc, Args... aArgs) {
+template <typename OkT, typename Fn>
+void IOUtils::RunOnBackgroundThread(Promise* aPromise, Fn aFunc) {
   nsCOMPtr<nsISerialEventTarget> bg = GetBackgroundEventTarget();
-  REJECT_IF_NULL_EVENT_TARGET(bg, aPromise);
+  if (!bg) {
+    aPromise->MaybeRejectWithAbortError(
+        "Could not dispatch task to background thread");
+    return;
+  }
 
   InvokeAsync(
       bg, __func__,
-      [fn = aFunc, argsTuple = std::make_tuple(std::move(aArgs)...)]() mutable {
-        return std::apply(
-            [fn](Args... args) mutable {
-              using MozPromiseT = MozPromise<OkT, IOError, true>;
-              return InvokeToMozPromise<MozPromiseT>(
-                  fn, std::forward<Args>(args)...);
-            },
-            std::move(argsTuple));
+      [func = std::move(aFunc)]() {
+        Result<OkT, IOError> result = func();
+        if (result.isErr()) {
+          return IOPromise<OkT>::CreateAndReject(result.unwrapErr(), __func__);
+        }
+        return IOPromise<OkT>::CreateAndResolve(result.unwrap(), __func__);
       })
       ->Then(
           GetCurrentSerialEventTarget(), __func__,
           [promise = RefPtr(aPromise)](const OkT& ok) {
-            if constexpr (std::is_same_v<OkT, nsTArray<uint8_t>>) {
-              TypedArrayCreator<Uint8Array> arr(ok);
-              promise->MaybeResolve(arr);
-            } else if constexpr (std::is_same_v<OkT, Ok>) {
-              promise->MaybeResolveWithUndefined();
-            } else {
-              promise->MaybeResolve(ok);
-            }
+            ResolveJSPromise(promise, ok);
           },
           [promise = RefPtr(aPromise)](const IOError& err) {
             RejectJSPromise(promise, err);
           });
-  return aPromise.forget();
 }
 
 /* static */
@@ -222,8 +198,12 @@
     toRead.emplace(aOptions.mMaxBytes.Value());
   }
 
-  return RunOnBackgroundThread<nsTArray<uint8_t>>(
-      promise, &ReadSync, file.forget(), toRead, aOptions.mDecompress);
+  RunOnBackgroundThread<nsTArray<uint8_t>>(
+      promise,
+      [file = std::move(file), toRead, decompress = aOptions.mDecompress]() {
+        return ReadSync(file, toRead, decompress);
+      });
+  return promise.forget();
 }
 
 /* static */
@@ -236,15 +216,19 @@
 
   nsCOMPtr<nsIFile> file = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
+  RunOnBackgroundThread<nsString>(
+      promise, [file = std::move(file), decompress = aOptions.mDecompress]() {
+        return ReadUTF8Sync(file, decompress);
+      });
 
-  return RunOnBackgroundThread<nsString>(promise, &ReadUTF8Sync, file.forget(),
-                                         aOptions.mDecompress);
+  return promise.forget();
 }
 
 /* static */
-already_AddRefed<Promise> IOUtils::WriteAtomic(
-    GlobalObject& aGlobal, const nsAString& aPath, const Uint8Array& aData,
-    const WriteAtomicOptions& aOptions) {
+already_AddRefed<Promise> IOUtils::Write(GlobalObject& aGlobal,
+                                         const nsAString& aPath,
+                                         const Uint8Array& aData,
+                                         const WriteOptions& aOptions) {
   MOZ_DIAGNOSTIC_ASSERT(XRE_IsParentProcess());
   RefPtr<Promise> promise = CreateJSPromise(aGlobal);
   NS_ENSURE_TRUE(!!promise, nullptr);
@@ -261,20 +245,24 @@
     return promise.forget();
   }
 
-  auto opts = InternalWriteAtomicOpts::FromBinding(aOptions);
+  auto opts = InternalWriteOpts::FromBinding(aOptions);
   if (opts.isErr()) {
     RejectJSPromise(promise, opts.unwrapErr());
     return promise.forget();
   }
 
-  return RunOnBackgroundThread<uint32_t>(
-      promise, &WriteAtomicSync, file.forget(), std::move(*buf), opts.unwrap());
+  RunOnBackgroundThread<uint32_t>(
+      promise, [file = std::move(file), buf = std::move(*buf),
+                opts = opts.unwrap()]() { return WriteSync(file, buf, opts); });
+
+  return promise.forget();
 }
 
 /* static */
-already_AddRefed<Promise> IOUtils::WriteAtomicUTF8(
-    GlobalObject& aGlobal, const nsAString& aPath, const nsAString& aString,
-    const WriteAtomicOptions& aOptions) {
+already_AddRefed<Promise> IOUtils::WriteUTF8(GlobalObject& aGlobal,
+                                             const nsAString& aPath,
+                                             const nsAString& aString,
+                                             const WriteOptions& aOptions) {
   MOZ_DIAGNOSTIC_ASSERT(XRE_IsParentProcess());
   RefPtr<Promise> promise = CreateJSPromise(aGlobal);
   NS_ENSURE_TRUE(!!promise, nullptr);
@@ -290,15 +278,18 @@
     return promise.forget();
   }
 
-  auto opts = InternalWriteAtomicOpts::FromBinding(aOptions);
+  auto opts = InternalWriteOpts::FromBinding(aOptions);
   if (opts.isErr()) {
     RejectJSPromise(promise, opts.unwrapErr());
     return promise.forget();
   }
 
-  return RunOnBackgroundThread<uint32_t>(promise, &WriteAtomicUTF8Sync,
-                                         file.forget(), std::move(utf8Str),
-                                         opts.unwrap());
+  RunOnBackgroundThread<uint32_t>(
+      promise,
+      [file = std::move(file), utf8Str = std::move(utf8Str),
+       opts = opts.unwrap()]() { return WriteUTF8Sync(file, utf8Str, opts); });
+
+  return promise.forget();
 }
 
 /* static */
@@ -317,8 +308,13 @@
   nsCOMPtr<nsIFile> destFile = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(destFile, aDestPath, promise);
 
-  return RunOnBackgroundThread<Ok>(promise, &MoveSync, sourceFile.forget(),
-                                   destFile.forget(), aOptions.mNoOverwrite);
+  RunOnBackgroundThread<Ok>(promise, [sourceFile = std::move(sourceFile),
+                                      destFile = std::move(destFile),
+                                      noOverwrite = aOptions.mNoOverwrite]() {
+    return MoveSync(sourceFile, destFile, noOverwrite);
+  });
+
+  return promise.forget();
 }
 
 /* static */
@@ -333,8 +329,13 @@
   nsCOMPtr<nsIFile> file = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
 
-  return RunOnBackgroundThread<Ok>(promise, &RemoveSync, file.forget(),
-                                   aOptions.mIgnoreAbsent, aOptions.mRecursive);
+  RunOnBackgroundThread<Ok>(
+      promise, [file = std::move(file), ignoreAbsent = aOptions.mIgnoreAbsent,
+                recursive = aOptions.mRecursive]() {
+        return RemoveSync(file, ignoreAbsent, recursive);
+      });
+
+  return promise.forget();
 }
 
 /* static */
@@ -349,9 +350,16 @@
   nsCOMPtr<nsIFile> file = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
 
-  return RunOnBackgroundThread<Ok>(promise, &MakeDirectorySync, file.forget(),
-                                   aOptions.mCreateAncestors,
-                                   aOptions.mIgnoreExisting, 0777);
+  RunOnBackgroundThread<Ok>(
+      promise,
+      [file = std::move(file), createAncestors = aOptions.mCreateAncestors,
+       ignoreExisting = aOptions.mIgnoreExisting,
+       permissions = aOptions.mPermissions]() {
+        return MakeDirectorySync(file, createAncestors, ignoreExisting,
+                                 permissions);
+      });
+
+  return promise.forget();
 }
 
 already_AddRefed<Promise> IOUtils::Stat(GlobalObject& aGlobal,
@@ -364,8 +372,10 @@
   nsCOMPtr<nsIFile> file = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
 
-  return RunOnBackgroundThread<InternalFileInfo>(promise, &StatSync,
-                                                 file.forget());
+  RunOnBackgroundThread<InternalFileInfo>(
+      promise, [file = std::move(file)]() { return StatSync(file); });
+
+  return promise.forget();
 }
 
 /* static */
@@ -384,9 +394,14 @@
   nsCOMPtr<nsIFile> destFile = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(destFile, aDestPath, promise);
 
-  return RunOnBackgroundThread<Ok>(promise, &CopySync, sourceFile.forget(),
-                                   destFile.forget(), aOptions.mNoOverwrite,
-                                   aOptions.mRecursive);
+  RunOnBackgroundThread<Ok>(
+      promise,
+      [sourceFile = std::move(sourceFile), destFile = std::move(destFile),
+       noOverwrite = aOptions.mNoOverwrite, recursive = aOptions.mRecursive]() {
+        return CopySync(sourceFile, destFile, noOverwrite, recursive);
+      });
+
+  return promise.forget();
 }
 
 /* static */
@@ -405,8 +420,11 @@
     newTime = Some(aModification.Value());
   }
 
-  return RunOnBackgroundThread<int64_t>(promise, &TouchSync, file.forget(),
-                                        newTime);
+  RunOnBackgroundThread<int64_t>(promise, [file = std::move(file), newTime]() {
+    return TouchSync(file, newTime);
+  });
+
+  return promise.forget();
 }
 
 /* static */
@@ -419,8 +437,45 @@
   nsCOMPtr<nsIFile> file = new nsLocalFile();
   REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
 
-  return RunOnBackgroundThread<nsTArray<nsString>>(promise, &GetChildrenSync,
-                                                   file.forget());
+  RunOnBackgroundThread<nsTArray<nsString>>(
+      promise, [file = std::move(file)]() { return GetChildrenSync(file); });
+
+  return promise.forget();
+}
+
+/* static */
+already_AddRefed<Promise> IOUtils::SetPermissions(GlobalObject& aGlobal,
+                                                  const nsAString& aPath,
+                                                  const uint32_t aPermissions) {
+  MOZ_ASSERT(XRE_IsParentProcess());
+  RefPtr<Promise> promise = CreateJSPromise(aGlobal);
+  NS_ENSURE_TRUE(!!promise, nullptr);
+
+  nsCOMPtr<nsIFile> file = new nsLocalFile();
+  REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
+
+  RunOnBackgroundThread<Ok>(
+      promise, [file = std::move(file), permissions = aPermissions]() {
+        return SetPermissionsSync(file, permissions);
+      });
+
+  return promise.forget();
+}
+
+/* static */
+already_AddRefed<Promise> IOUtils::Exists(GlobalObject& aGlobal,
+                                          const nsAString& aPath) {
+  MOZ_ASSERT(XRE_IsParentProcess());
+  RefPtr<Promise> promise = CreateJSPromise(aGlobal);
+  NS_ENSURE_TRUE(!!promise, nullptr);
+
+  nsCOMPtr<nsIFile> file = new nsLocalFile();
+  REJECT_IF_INIT_PATH_FAILED(file, aPath, promise);
+
+  RunOnBackgroundThread<bool>(
+      promise, [file = std::move(file)]() { return ExistsSync(file); });
+
+  return promise.forget();
 }
 
 /* static */
@@ -496,8 +551,20 @@
 }
 
 /* static */
-void IOUtils::RejectJSPromise(const RefPtr<Promise>& aPromise,
-                              const IOError& aError) {
+template <typename T>
+void IOUtils::ResolveJSPromise(Promise* aPromise, const T& aValue) {
+  if constexpr (std::is_same_v<T, nsTArray<uint8_t>>) {
+    TypedArrayCreator<Uint8Array> arr(aValue);
+    aPromise->MaybeResolve(arr);
+  } else if constexpr (std::is_same_v<T, Ok>) {
+    aPromise->MaybeResolveWithUndefined();
+  } else {
+    aPromise->MaybeResolve(aValue);
+  }
+}
+
+/* static */
+void IOUtils::RejectJSPromise(Promise* aPromise, const IOError& aError) {
   const auto& errMsg = aError.Message();
 
   switch (aError.Code()) {
@@ -555,12 +622,9 @@
 
 /* static */
 Result<nsTArray<uint8_t>, IOUtils::IOError> IOUtils::ReadSync(
-    already_AddRefed<nsIFile> aFile, const Maybe<uint32_t>& aMaxBytes,
-    const bool aDecompress) {
+    nsIFile* aFile, const Maybe<uint32_t>& aMaxBytes, const bool aDecompress) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
   if (aMaxBytes.isSome() && aDecompress) {
     return Err(
         IOError(NS_ERROR_ILLEGAL_INPUT)
@@ -570,10 +634,10 @@
 
   RefPtr<nsFileStream> stream = new nsFileStream();
   if (nsresult rv =
-          stream->Init(file, PR_RDONLY | nsIFile::OS_READAHEAD, 0666, 0);
+          stream->Init(aFile, PR_RDONLY | nsIFile::OS_READAHEAD, 0666, 0);
       NS_FAILED(rv)) {
     return Err(IOError(rv).WithMessage("Could not open the file at %s",
-                                       file->HumanReadablePath().get()));
+                                       aFile->HumanReadablePath().get()));
   }
   int64_t bufSize = 0;
 
@@ -586,7 +650,7 @@
     if (nsresult rv = stream->GetSize(&streamSize); NS_FAILED(rv)) {
       return Err(IOError(NS_ERROR_FILE_ACCESS_DENIED)
                      .WithMessage("Could not get info for the file at %s",
-                                  file->HumanReadablePath().get()));
+                                  aFile->HumanReadablePath().get()));
     }
     MOZ_RELEASE_ASSERT(streamSize >= 0);
 
@@ -595,7 +659,7 @@
           IOError(NS_ERROR_FILE_TOO_BIG)
               .WithMessage("Could not read the file at %s because it is too "
                            "large(size=%" PRId64 " bytes)",
-                           file->HumanReadablePath().get(), streamSize));
+                           aFile->HumanReadablePath().get(), streamSize));
     }
     bufSize = static_cast<uint32_t>(streamSize);
   } else {
@@ -606,7 +670,7 @@
   if (!buffer.SetCapacity(bufSize, fallible)) {
     return Err(IOError(NS_ERROR_OUT_OF_MEMORY)
                    .WithMessage("Could not allocate buffer to read file(%s)",
-                                file->HumanReadablePath().get()));
+                                aFile->HumanReadablePath().get()));
   }
 
   Span<char> toRead(reinterpret_cast<char*>(buffer.Elements()), bufSize);
@@ -620,7 +684,7 @@
         NS_FAILED(rv)) {
       return Err(IOError(rv).WithMessage(
           "Encountered an unexpected error while reading file(%s)",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     if (bytesRead == 0) {
       break;
@@ -640,56 +704,55 @@
 
 /* static */
 Result<nsString, IOUtils::IOError> IOUtils::ReadUTF8Sync(
-    already_AddRefed<nsIFile> aFile, const bool aDecompress) {
+    nsIFile* aFile, const bool aDecompress) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-  return ReadSync(do_AddRef(file), Nothing(), aDecompress)
-      .andThen([file](const nsTArray<uint8_t>& bytes)
-                   -> Result<nsString, IOError> {
-        auto utf8Span = Span(reinterpret_cast<const char*>(bytes.Elements()),
-                             bytes.Length());
-        if (!IsUtf8(utf8Span)) {
-          return Err(
-              IOError(NS_ERROR_FILE_CORRUPTED)
-                  .WithMessage(
-                      "Could not read file(%s) because it is not UTF-8 encoded",
-                      file->HumanReadablePath().get()));
-        }
+  auto rv = ReadSync(aFile, Nothing(), aDecompress);
+  if (rv.isErr()) {
+    return Err(rv.unwrapErr());
+  }
 
-        nsDependentCSubstring utf8Str(utf8Span.Elements(), utf8Span.Length());
-        nsString utf16Str;
-        if (!CopyUTF8toUTF16(utf8Str, utf16Str, fallible)) {
-          return Err(
-              IOError(NS_ERROR_OUT_OF_MEMORY)
-                  .WithMessage("Could not allocate buffer to convert UTF-8 "
-                               "contents of file at (%s) to UTF-16",
-                               file->HumanReadablePath().get()));
-        }
+  const nsTArray<uint8_t> bytes = rv.unwrap();
+  auto utf8Span =
+      Span(reinterpret_cast<const char*>(bytes.Elements()), bytes.Length());
+  if (!IsUtf8(utf8Span)) {
+    return Err(
+        IOError(NS_ERROR_FILE_CORRUPTED)
+            .WithMessage(
+                "Could not read file(%s) because it is not UTF-8 encoded",
+                aFile->HumanReadablePath().get()));
+  }
 
-        return utf16Str;
-      });
+  nsDependentCSubstring utf8Str(utf8Span.Elements(), utf8Span.Length());
+  nsString utf16Str;
+  if (!CopyUTF8toUTF16(utf8Str, utf16Str, fallible)) {
+    return Err(IOError(NS_ERROR_OUT_OF_MEMORY)
+                   .WithMessage("Could not allocate buffer to convert UTF-8 "
+                                "contents of file at (%s) to UTF-16",
+                                aFile->HumanReadablePath().get()));
+  }
+
+  return utf16Str;
 }
 
 /* static */
-Result<uint32_t, IOUtils::IOError> IOUtils::WriteAtomicSync(
-    already_AddRefed<nsIFile> aFile, const Span<const uint8_t>& aByteArray,
-    IOUtils::InternalWriteAtomicOpts aOptions) {
+Result<uint32_t, IOUtils::IOError> IOUtils::WriteSync(
+    nsIFile* aFile, const Span<const uint8_t>& aByteArray,
+    const IOUtils::InternalWriteOpts& aOptions) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> destFile = aFile;
-  nsCOMPtr<nsIFile> backupFile = std::move(aOptions.mBackupFile);
-  nsCOMPtr<nsIFile> tempFile = std::move(aOptions.mTmpFile);
+  nsIFile* backupFile = aOptions.mBackupFile;
+  nsIFile* tempFile = aOptions.mTmpFile;
 
   bool exists = false;
-  MOZ_TRY(destFile->Exists(&exists));
+  MOZ_TRY(aFile->Exists(&exists));
 
   if (aOptions.mNoOverwrite && exists) {
     return Err(IOError(NS_ERROR_FILE_ALREADY_EXISTS)
                    .WithMessage("Refusing to overwrite the file at %s\n"
                                 "Specify `noOverwrite: false` to allow "
                                 "overwriting the destination",
-                                destFile->HumanReadablePath().get()));
+                                aFile->HumanReadablePath().get()));
   }
 
   // If backupFile was specified, perform the backup as a move.
@@ -701,25 +764,24 @@
     // would end up overwriting `backupFile` and never actually write to the
     // file we were supposed to.
     nsCOMPtr<nsIFile> toMove;
-    MOZ_ALWAYS_SUCCEEDS(destFile->Clone(getter_AddRefs(toMove)));
+    MOZ_ALWAYS_SUCCEEDS(aFile->Clone(getter_AddRefs(toMove)));
 
-    if (MoveSync(toMove.forget(), do_AddRef(backupFile), aOptions.mNoOverwrite)
-            .isErr()) {
+    if (MoveSync(toMove, backupFile, aOptions.mNoOverwrite).isErr()) {
       return Err(IOError(NS_ERROR_FILE_COPY_OR_MOVE_FAILED)
                      .WithMessage("Failed to backup the source file(%s) to %s",
-                                  destFile->HumanReadablePath().get(),
+                                  aFile->HumanReadablePath().get(),
                                   backupFile->HumanReadablePath().get()));
     }
   }
 
   // If tempFile was specified, we will write to there first, then perform a
   // move to ensure the file ends up at the final requested destination.
-  nsCOMPtr<nsIFile> writeFile;
+  nsIFile* writeFile;
 
   if (tempFile) {
-    writeFile = tempFile.forget();
+    writeFile = tempFile;
   } else {
-    writeFile = destFile.forget();
+    writeFile = aFile;
   }
 
   int32_t flags = PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE;
@@ -778,93 +840,85 @@
     }
   }
 
-  // If tmpFile was passed, destFile will be non-null. Check destFile against
-  // writeFile and if they differ, the operation is finished by performing a
-  // move.
-
-  if (destFile) {
+  // If tempFile was passed, check destFile against writeFile and, if they
+  // differ, the operation is finished by performing a move.
+  if (tempFile) {
     nsAutoStringN<256> destPath;
     nsAutoStringN<256> writePath;
 
-    MOZ_ALWAYS_SUCCEEDS(destFile->GetPath(destPath));
+    MOZ_ALWAYS_SUCCEEDS(aFile->GetPath(destPath));
     MOZ_ALWAYS_SUCCEEDS(writeFile->GetPath(writePath));
 
     // nsIFile::MoveToFollowingLinks will only update the path of the file if
     // the move succeeds.
-    if (destPath != writePath &&
-        MoveSync(do_AddRef(writeFile), do_AddRef(destFile), false).isErr()) {
+    if (destPath != writePath && MoveSync(writeFile, aFile, false).isErr()) {
       return Err(IOError(NS_ERROR_FILE_COPY_OR_MOVE_FAILED)
                      .WithMessage(
                          "Could not move temporary file(%s) to destination(%s)",
                          writeFile->HumanReadablePath().get(),
-                         destFile->HumanReadablePath().get()));
+                         aFile->HumanReadablePath().get()));
     }
   }
   return totalWritten;
 }
 
 /* static */
-Result<uint32_t, IOUtils::IOError> IOUtils::WriteAtomicUTF8Sync(
-    already_AddRefed<nsIFile> aFile, const nsCString& aUTF8String,
-    InternalWriteAtomicOpts aOptions) {
+Result<uint32_t, IOUtils::IOError> IOUtils::WriteUTF8Sync(
+    nsIFile* aFile, const nsCString& aUTF8String,
+    const InternalWriteOpts& aOptions) {
   MOZ_ASSERT(!NS_IsMainThread());
 
   Span utf8Bytes(reinterpret_cast<const uint8_t*>(aUTF8String.get()),
                  aUTF8String.Length());
 
-  return WriteAtomicSync(std::move(aFile), utf8Bytes, std::move(aOptions));
+  return WriteSync(aFile, utf8Bytes, aOptions);
 }
 
 /* static */
-Result<Ok, IOUtils::IOError> IOUtils::MoveSync(
-    already_AddRefed<nsIFile> aSourceFile, already_AddRefed<nsIFile> aDestFile,
-    bool aNoOverwrite) {
+Result<Ok, IOUtils::IOError> IOUtils::MoveSync(nsIFile* aSourceFile,
+                                               nsIFile* aDestFile,
+                                               bool aNoOverwrite) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> sourceFile = aSourceFile;
-  nsCOMPtr<nsIFile> destFile = aDestFile;
-
   // Ensure the source file exists before continuing. If it doesn't exist,
   // subsequent operations can fail in different ways on different platforms.
   bool srcExists = false;
-  MOZ_TRY(sourceFile->Exists(&srcExists));
+  MOZ_TRY(aSourceFile->Exists(&srcExists));
   if (!srcExists) {
     return Err(
         IOError(NS_ERROR_FILE_NOT_FOUND)
             .WithMessage(
                 "Could not move source file(%s) because it does not exist",
-                sourceFile->HumanReadablePath().get()));
+                aSourceFile->HumanReadablePath().get()));
   }
 
-  return CopyOrMoveSync(&nsIFile::MoveToFollowingLinks, "move", sourceFile,
-                        destFile, aNoOverwrite);
+  return CopyOrMoveSync(&nsIFile::MoveToFollowingLinks, "move", aSourceFile,
+                        aDestFile, aNoOverwrite);
 }
 
 /* static */
-Result<Ok, IOUtils::IOError> IOUtils::CopySync(
-    already_AddRefed<nsIFile> aSourceFile, already_AddRefed<nsIFile> aDestFile,
-    bool aNoOverwrite, bool aRecursive) {
+Result<Ok, IOUtils::IOError> IOUtils::CopySync(nsIFile* aSourceFile,
+                                               nsIFile* aDestFile,
+                                               bool aNoOverwrite,
+                                               bool aRecursive) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> sourceFile = aSourceFile;
-  nsCOMPtr<nsIFile> destFile = aDestFile;
-
   // Ensure the source file exists before continuing. If it doesn't exist,
   // subsequent operations can fail in different ways on different platforms.
   bool srcExists;
-  MOZ_TRY(sourceFile->Exists(&srcExists));
+  MOZ_TRY(aSourceFile->Exists(&srcExists));
   if (!srcExists) {
     return Err(
         IOError(NS_ERROR_FILE_NOT_FOUND)
             .WithMessage(
                 "Could not copy source file(%s) because it does not exist",
-                sourceFile->HumanReadablePath().get()));
+                aSourceFile->HumanReadablePath().get()));
   }
 
   // If source is a directory, fail immediately unless the recursive option is
   // true.
   bool srcIsDir = false;
-  MOZ_TRY(sourceFile->IsDirectory(&srcIsDir));
+  MOZ_TRY(aSourceFile->IsDirectory(&srcIsDir));
   if (srcIsDir && !aRecursive) {
     return Err(
         IOError(NS_ERROR_FILE_COPY_OR_MOVE_FAILED)
@@ -872,12 +926,12 @@
                 "Refused to copy source directory(%s) to the destination(%s)\n"
                 "Specify the `recursive: true` option to allow copying "
                 "directories",
-                sourceFile->HumanReadablePath().get(),
-                destFile->HumanReadablePath().get()));
+                aSourceFile->HumanReadablePath().get(),
+                aDestFile->HumanReadablePath().get()));
   }
 
-  return CopyOrMoveSync(&nsIFile::CopyToFollowingLinks, "copy", sourceFile,
-                        destFile, aNoOverwrite);
+  return CopyOrMoveSync(&nsIFile::CopyToFollowingLinks, "copy", aSourceFile,
+                        aDestFile, aNoOverwrite);
 }
 
 /* static */
@@ -963,13 +1017,12 @@
 }
 
 /* static */
-Result<Ok, IOUtils::IOError> IOUtils::RemoveSync(
-    already_AddRefed<nsIFile> aFile, bool aIgnoreAbsent, bool aRecursive) {
+Result<Ok, IOUtils::IOError> IOUtils::RemoveSync(nsIFile* aFile,
+                                                 bool aIgnoreAbsent,
+                                                 bool aRecursive) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
-  nsresult rv = file->Remove(aRecursive);
+  nsresult rv = aFile->Remove(aRecursive);
   if (aIgnoreAbsent && IsFileNotFound(rv)) {
     return Ok();
   }
@@ -979,34 +1032,33 @@
       return Err(err.WithMessage(
           "Could not remove the file at %s because it does not exist.\n"
           "Specify the `ignoreAbsent: true` option to mitigate this error",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     if (rv == NS_ERROR_FILE_DIR_NOT_EMPTY) {
       return Err(err.WithMessage(
           "Could not remove the non-empty directory at %s.\n"
           "Specify the `recursive: true` option to mitigate this error",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     return Err(err.WithMessage("Could not remove the file at %s",
-                               file->HumanReadablePath().get()));
+                               aFile->HumanReadablePath().get()));
   }
   return Ok();
 }
 
 /* static */
-Result<Ok, IOUtils::IOError> IOUtils::MakeDirectorySync(
-    already_AddRefed<nsIFile> aFile, bool aCreateAncestors,
-    bool aIgnoreExisting, int32_t aMode) {
+Result<Ok, IOUtils::IOError> IOUtils::MakeDirectorySync(nsIFile* aFile,
+                                                        bool aCreateAncestors,
+                                                        bool aIgnoreExisting,
+                                                        int32_t aMode) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
   // nsIFile::Create will create ancestor directories by default.
   // If the caller does not want this behaviour, then check and possibly
   // return an error.
   if (!aCreateAncestors) {
     nsCOMPtr<nsIFile> parent;
-    MOZ_TRY(file->GetParent(getter_AddRefs(parent)));
+    MOZ_TRY(aFile->GetParent(getter_AddRefs(parent)));
     bool parentExists = false;
     MOZ_TRY(parent->Exists(&parentExists));
     if (!parentExists) {
@@ -1014,11 +1066,11 @@
                      .WithMessage("Could not create directory at %s because "
                                   "the path has missing "
                                   "ancestor components",
-                                  file->HumanReadablePath().get()));
+                                  aFile->HumanReadablePath().get()));
     }
   }
 
-  nsresult rv = file->Create(nsIFile::DIRECTORY_TYPE, aMode);
+  nsresult rv = aFile->Create(nsIFile::DIRECTORY_TYPE, aMode);
   if (NS_FAILED(rv)) {
     if (rv == NS_ERROR_FILE_ALREADY_EXISTS) {
       // NB: We may report a success only if the target is an existing
@@ -1026,13 +1078,13 @@
       // an existing file, since trying to create a directory where a regular
       // file exists may be indicative of a logic error.
       bool isDirectory;
-      MOZ_TRY(file->IsDirectory(&isDirectory));
+      MOZ_TRY(aFile->IsDirectory(&isDirectory));
       if (!isDirectory) {
         return Err(IOError(NS_ERROR_FILE_NOT_DIRECTORY)
                        .WithMessage("Could not create directory because the "
                                     "target file(%s) exists "
                                     "and is not a directory",
-                                    file->HumanReadablePath().get()));
+                                    aFile->HumanReadablePath().get()));
       }
       // The directory exists.
       // The caller may suppress this error.
@@ -1044,34 +1096,32 @@
           "Could not create directory because it already exists at %s\n"
           "Specify the `ignoreExisting: true` option to mitigate this "
           "error",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     return Err(IOError(rv).WithMessage("Could not create directory at %s",
-                                       file->HumanReadablePath().get()));
+                                       aFile->HumanReadablePath().get()));
   }
   return Ok();
 }
 
 Result<IOUtils::InternalFileInfo, IOUtils::IOError> IOUtils::StatSync(
-    already_AddRefed<nsIFile> aFile) {
+    nsIFile* aFile) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
   InternalFileInfo info;
-  MOZ_ALWAYS_SUCCEEDS(file->GetPath(info.mPath));
+  MOZ_ALWAYS_SUCCEEDS(aFile->GetPath(info.mPath));
 
   bool isRegular = false;
   // IsFile will stat and cache info in the file object. If the file doesn't
   // exist, or there is an access error, we'll discover it here.
   // Any subsequent errors are unexpected and will just be forwarded.
-  nsresult rv = file->IsFile(&isRegular);
+  nsresult rv = aFile->IsFile(&isRegular);
   if (NS_FAILED(rv)) {
     IOError err(rv);
     if (IsFileNotFound(rv)) {
       return Err(
           err.WithMessage("Could not stat file(%s) because it does not exist",
-                          file->HumanReadablePath().get()));
+                          aFile->HumanReadablePath().get()));
     }
     return Err(err);
   }
@@ -1080,29 +1130,37 @@
   info.mType = FileType::Regular;
   if (!isRegular) {
     bool isDir = false;
-    MOZ_TRY(file->IsDirectory(&isDir));
+    MOZ_TRY(aFile->IsDirectory(&isDir));
     info.mType = isDir ? FileType::Directory : FileType::Other;
   }
 
   int64_t size = -1;
   if (info.mType == FileType::Regular) {
-    MOZ_TRY(file->GetFileSize(&size));
+    MOZ_TRY(aFile->GetFileSize(&size));
   }
   info.mSize = size;
   PRTime lastModified = 0;
-  MOZ_TRY(file->GetLastModifiedTime(&lastModified));
+  MOZ_TRY(aFile->GetLastModifiedTime(&lastModified));
   info.mLastModified = static_cast<int64_t>(lastModified);
 
+  PRTime creationTime = 0;
+  if (nsresult rv = aFile->GetCreationTime(&creationTime); NS_SUCCEEDED(rv)) {
+    info.mCreationTime.emplace(static_cast<int64_t>(creationTime));
+  } else if (NS_FAILED(rv) && rv != NS_ERROR_NOT_IMPLEMENTED) {
+    // This field is only supported on some platforms.
+    return Err(IOError(rv));
+  }
+
+  MOZ_TRY(aFile->GetPermissions(&info.mPermissions));
+
   return info;
 }
 
 /* static */
 Result<int64_t, IOUtils::IOError> IOUtils::TouchSync(
-    already_AddRefed<nsIFile> aFile, const Maybe<int64_t>& aNewModTime) {
+    nsIFile* aFile, const Maybe<int64_t>& aNewModTime) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
   int64_t now = aNewModTime.valueOrFrom([]() {
     // NB: PR_Now reports time in microseconds since the Unix epoch
     //     (1970-01-01T00:00:00Z). Both nsLocalFile's lastModifiedTime and
@@ -1127,17 +1185,17 @@
                 "Refusing to set the modification time of file(%s) to 0.\n"
                 "To use the current system time, call `touch` with no "
                 "arguments",
-                file->HumanReadablePath().get()));
+                aFile->HumanReadablePath().get()));
   }
 
-  nsresult rv = file->SetLastModifiedTime(now);
+  nsresult rv = aFile->SetLastModifiedTime(now);
 
   if (NS_FAILED(rv)) {
     IOError err(rv);
     if (IsFileNotFound(rv)) {
       return Err(
           err.WithMessage("Could not touch file(%s) because it does not exist",
-                          file->HumanReadablePath().get()));
+                          aFile->HumanReadablePath().get()));
     }
     return Err(err);
   }
@@ -1146,24 +1204,22 @@
 
 /* static */
 Result<nsTArray<nsString>, IOUtils::IOError> IOUtils::GetChildrenSync(
-    already_AddRefed<nsIFile> aFile) {
+    nsIFile* aFile) {
   MOZ_ASSERT(!NS_IsMainThread());
 
-  nsCOMPtr<nsIFile> file = aFile;
-
   nsCOMPtr<nsIDirectoryEnumerator> iter;
-  nsresult rv = file->GetDirectoryEntries(getter_AddRefs(iter));
+  nsresult rv = aFile->GetDirectoryEntries(getter_AddRefs(iter));
   if (NS_FAILED(rv)) {
     IOError err(rv);
     if (IsFileNotFound(rv)) {
       return Err(err.WithMessage(
           "Could not get children of file(%s) because it does not exist",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     if (IsNotDirectory(rv)) {
       return Err(err.WithMessage(
           "Could not get children of file(%s) because it is not a directory",
-          file->HumanReadablePath().get()));
+          aFile->HumanReadablePath().get()));
     }
     return Err(err);
   }
@@ -1186,6 +1242,25 @@
 }
 
 /* static */
+Result<Ok, IOUtils::IOError> IOUtils::SetPermissionsSync(
+    nsIFile* aFile, const uint32_t aPermissions) {
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  MOZ_TRY(aFile->SetPermissions(aPermissions));
+  return Ok{};
+}
+
+/* static */
+Result<bool, IOUtils::IOError> IOUtils::ExistsSync(nsIFile* aFile) {
+  MOZ_ASSERT(!NS_IsMainThread());
+
+  bool exists = false;
+  MOZ_TRY(aFile->Exists(&exists));
+
+  return exists;
+}
+
+/* static */
 Result<nsTArray<uint8_t>, IOUtils::IOError> IOUtils::MozLZ4::Compress(
     Span<const uint8_t> aUncompressed) {
   nsTArray<uint8_t> result;
@@ -1310,10 +1385,9 @@
   return NS_OK;
 }
 
-Result<IOUtils::InternalWriteAtomicOpts, IOUtils::IOError>
-IOUtils::InternalWriteAtomicOpts::FromBinding(
-    const WriteAtomicOptions& aOptions) {
-  InternalWriteAtomicOpts opts;
+Result<IOUtils::InternalWriteOpts, IOUtils::IOError>
+IOUtils::InternalWriteOpts::FromBinding(const WriteOptions& aOptions) {
+  InternalWriteOpts opts;
   opts.mFlush = aOptions.mFlush;
   opts.mNoOverwrite = aOptions.mNoOverwrite;
 
@@ -1342,9 +1416,7 @@
   return opts;
 }
 
-}  // namespace dom
-}  // namespace mozilla
+}  // namespace mozilla::dom
 
-#undef REJECT_IF_NULL_EVENT_TARGET
 #undef REJECT_IF_SHUTTING_DOWN
 #undef REJECT_IF_INIT_PATH_FAILED
diff -Nru firefox-84.0.2+build1/dom/system/IOUtils.h firefox-85.0+build1/dom/system/IOUtils.h
--- firefox-84.0.2+build1/dom/system/IOUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/IOUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -63,13 +63,15 @@
                                             const nsAString& aPath,
                                             const ReadUTF8Options& aOptions);
 
-  static already_AddRefed<Promise> WriteAtomic(
-      GlobalObject& aGlobal, const nsAString& aPath, const Uint8Array& aData,
-      const WriteAtomicOptions& aOptions);
-
-  static already_AddRefed<Promise> WriteAtomicUTF8(
-      GlobalObject& aGlobal, const nsAString& aPath, const nsAString& aString,
-      const WriteAtomicOptions& aOptions);
+  static already_AddRefed<Promise> Write(GlobalObject& aGlobal,
+                                         const nsAString& aPath,
+                                         const Uint8Array& aData,
+                                         const WriteOptions& aOptions);
+
+  static already_AddRefed<Promise> WriteUTF8(GlobalObject& aGlobal,
+                                             const nsAString& aPath,
+                                             const nsAString& aString,
+                                             const WriteOptions& aOptions);
 
   static already_AddRefed<Promise> Move(GlobalObject& aGlobal,
                                         const nsAString& aSourcePath,
@@ -99,14 +101,22 @@
   static already_AddRefed<Promise> GetChildren(GlobalObject& aGlobal,
                                                const nsAString& aPath);
 
-  static bool IsAbsolutePath(const nsAString& aPath);
+  static already_AddRefed<Promise> SetPermissions(GlobalObject& aGlobal,
+                                                  const nsAString& aPath,
+                                                  const uint32_t aPermissions);
+
+  static already_AddRefed<Promise> Exists(GlobalObject& aGlobal,
+                                          const nsAString& aPath);
 
  private:
   ~IOUtils() = default;
 
+  template <typename T>
+  using IOPromise = MozPromise<T, IOError, true>;
+
   friend class IOUtilsShutdownBlocker;
   struct InternalFileInfo;
-  struct InternalWriteAtomicOpts;
+  struct InternalWriteOpts;
   class MozLZ4;
 
   static StaticDataMutex<StaticRefPtr<nsISerialEventTarget>>
@@ -114,15 +124,18 @@
   static StaticRefPtr<nsIAsyncShutdownClient> sBarrier;
   static Atomic<bool> sShutdownStarted;
 
+  template <typename OkT, typename Fn, typename... Args>
+  static RefPtr<IOUtils::IOPromise<OkT>> InvokeToIOPromise(Fn aFunc,
+                                                           Args... aArgs);
+
   static already_AddRefed<nsIAsyncShutdownClient> GetShutdownBarrier();
 
   static already_AddRefed<nsISerialEventTarget> GetBackgroundEventTarget();
 
   static void SetShutdownHooks();
 
-  template <typename OkT, typename Fn, typename... Args>
-  static already_AddRefed<Promise> RunOnBackgroundThread(
-      RefPtr<Promise>& aPromise, Fn aFunc, Args... aArgs);
+  template <typename OkT, typename Fn>
+  static void RunOnBackgroundThread(Promise* aPromise, Fn aFunc);
 
   /**
    * Creates a new JS Promise.
@@ -137,10 +150,14 @@
                                      JS::MutableHandle<JS::Value> aValue);
 
   /**
+   * Resolves |aPromise| with an appropriate JS value for |aValue|.
+   */
+  template <typename T>
+  static void ResolveJSPromise(Promise* aPromise, const T& aValue);
+  /**
    * Rejects |aPromise| with an appropriate |DOMException| describing |aError|.
    */
-  static void RejectJSPromise(const RefPtr<Promise>& aPromise,
-                              const IOError& aError);
+  static void RejectJSPromise(Promise* aPromise, const IOError& aError);
 
   /**
    * Attempts to read the entire file at |aPath| into a buffer.
@@ -155,8 +172,7 @@
    *         error.
    */
   static Result<nsTArray<uint8_t>, IOError> ReadSync(
-      already_AddRefed<nsIFile> aFile, const Maybe<uint32_t>& aMaxBytes,
-      const bool aDecompress);
+      nsIFile* aFile, const Maybe<uint32_t>& aMaxBytes, const bool aDecompress);
 
   /**
    * Attempts to read the entire file at |aPath| as a UTF-8 string.
@@ -168,7 +184,7 @@
    * @return The (decompressed) contents of the file re-encoded as a UTF-16
    *         string.
    */
-  static Result<nsString, IOError> ReadUTF8Sync(already_AddRefed<nsIFile> aFile,
+  static Result<nsString, IOError> ReadUTF8Sync(nsIFile* aFile,
                                                 const bool aDecompress);
 
   /**
@@ -183,9 +199,9 @@
    * @return The number of bytes written to the file, or an error if the write
    *         failed or was incomplete.
    */
-  static Result<uint32_t, IOError> WriteAtomicSync(
-      already_AddRefed<nsIFile> aFile, const Span<const uint8_t>& aByteArray,
-      InternalWriteAtomicOpts aOptions);
+  static Result<uint32_t, IOError> WriteSync(
+      nsIFile* aFile, const Span<const uint8_t>& aByteArray,
+      const InternalWriteOpts& aOptions);
 
   /**
    * Attempt to write the entirety of |aUTF8String| to the file at |aFile|.
@@ -199,23 +215,9 @@
    * @return The number of bytes written to the file, or an error if the write
    *         failed or was incomplete.
    */
-  static Result<uint32_t, IOError> WriteAtomicUTF8Sync(
-      already_AddRefed<nsIFile> aFile, const nsCString& aUTF8String,
-      InternalWriteAtomicOpts aOptions);
-
-  /**
-   * Attempts to write |aBytes| to the file pointed by |aFd|.
-   *
-   * @param aFd    An open PRFileDesc for the destination file to be
-   *               overwritten.
-   * @param aFile  The location of the file.
-   * @param aBytes The data to write to the file.
-   *
-   * @return The number of bytes written to the file, or an error if the write
-   *         failed or was incomplete.
-   */
-  static Result<uint32_t, IOError> WriteSync(PRFileDesc* aFd, nsIFile* aFile,
-                                             const Span<const uint8_t>& aBytes);
+  static Result<uint32_t, IOError> WriteUTF8Sync(
+      nsIFile* aFile, const nsCString& aUTF8String,
+      const InternalWriteOpts& aOptions);
 
   /**
    * Attempts to move the file located at |aSourceFile| to |aDestFile|.
@@ -228,8 +230,7 @@
    *
    * @return Ok if the file was moved successfully, or an error.
    */
-  static Result<Ok, IOError> MoveSync(already_AddRefed<nsIFile> aSourceFile,
-                                      already_AddRefed<nsIFile> aDestFile,
+  static Result<Ok, IOError> MoveSync(nsIFile* aSourceFile, nsIFile* aDestFile,
                                       bool aNoOverwrite);
 
   /**
@@ -240,8 +241,7 @@
    *
    * @return Ok if the operation was successful, or an error.
    */
-  static Result<Ok, IOError> CopySync(already_AddRefed<nsIFile> aSourceFile,
-                                      already_AddRefed<nsIFile> aDestFile,
+  static Result<Ok, IOError> CopySync(nsIFile* aSourceFile, nsIFile* aDestFile,
                                       bool aNoOverWrite, bool aRecursive);
 
   /**
@@ -276,8 +276,8 @@
    *
    * @return Ok if the file was removed successfully, or an error.
    */
-  static Result<Ok, IOError> RemoveSync(already_AddRefed<nsIFile> aFile,
-                                        bool aIgnoreAbsent, bool aRecursive);
+  static Result<Ok, IOError> RemoveSync(nsIFile* aFile, bool aIgnoreAbsent,
+                                        bool aRecursive);
 
   /**
    * Attempts to create a new directory at |aFile|.
@@ -295,7 +295,7 @@
    *
    * @return Ok if the directory was created successfully, or an error.
    */
-  static Result<Ok, IOError> MakeDirectorySync(already_AddRefed<nsIFile> aFile,
+  static Result<Ok, IOError> MakeDirectorySync(nsIFile* aFile,
                                                bool aCreateAncestors,
                                                bool aIgnoreExisting,
                                                int32_t aMode = 0777);
@@ -307,8 +307,7 @@
    *
    * @return An |InternalFileInfo| struct if successful, or an error.
    */
-  static Result<IOUtils::InternalFileInfo, IOError> StatSync(
-      already_AddRefed<nsIFile> aFile);
+  static Result<IOUtils::InternalFileInfo, IOError> StatSync(nsIFile* aFile);
 
   /**
    * Attempts to update the last modification time of the file at |aFile|.
@@ -319,7 +318,7 @@
    *
    * @return Timestamp of the file if the operation was successful, or an error.
    */
-  static Result<int64_t, IOError> TouchSync(already_AddRefed<nsIFile> aFile,
+  static Result<int64_t, IOError> TouchSync(nsIFile* aFile,
                                             const Maybe<int64_t>& aNewModTime);
 
   /**
@@ -330,8 +329,32 @@
    * @return An array of absolute paths identifying the children of |aFile|.
    *         If there are no children, an empty array. Otherwise, an error.
    */
-  static Result<nsTArray<nsString>, IOError> GetChildrenSync(
-      already_AddRefed<nsIFile> aFile);
+  static Result<nsTArray<nsString>, IOError> GetChildrenSync(nsIFile* aFile);
+
+  /**
+   * Set the permissions of the given file.
+   *
+   * Windows does not make a distinction between user, group, and other
+   * permissions like UNICES do. If a permission flag is set for any of user,
+   * group, or other has a permission, then all users will have that
+   * permission.
+   *
+   * @param aFile        The location of the file.
+   * @param aPermissions The permissions to set, as a UNIX file mode.
+   *
+   * @return |Ok| if the permissions were successfully set, or an error.
+   */
+  static Result<Ok, IOError> SetPermissionsSync(nsIFile* aFile,
+                                                const uint32_t aPermissions);
+
+  /**
+   * Return whether or not the file exists.
+   *
+   * @param aFile The location of the file.
+   *
+   * @return Whether or not the file exists.
+   */
+  static Result<bool, IOError> ExistsSync(nsIFile* aFile);
 };
 
 /**
@@ -384,28 +407,30 @@
  */
 struct IOUtils::InternalFileInfo {
   nsString mPath;
-  FileType mType;
-  uint64_t mSize;
-  uint64_t mLastModified;
+  FileType mType = FileType::Other;
+  uint64_t mSize = 0;
+  uint64_t mLastModified = 0;
+  Maybe<uint64_t> mCreationTime;
+  uint32_t mPermissions = 0;
 };
 
 /**
  * This is an easier to work with representation of a
- * |mozilla::dom::WriteAtomicOptions| for private use in the |IOUtils|
+ * |mozilla::dom::WriteOptions| for private use in the |IOUtils|
  * implementation.
  *
  * Because web IDL dictionaries are not easily copy/moveable, this class is
  * used instead.
  */
-struct IOUtils::InternalWriteAtomicOpts {
+struct IOUtils::InternalWriteOpts {
   RefPtr<nsIFile> mBackupFile;
-  bool mFlush;
-  bool mNoOverwrite;
   RefPtr<nsIFile> mTmpFile;
-  bool mCompress;
+  bool mFlush = false;
+  bool mNoOverwrite = false;
+  bool mCompress = false;
 
-  static Result<InternalWriteAtomicOpts, IOUtils::IOError> FromBinding(
-      const WriteAtomicOptions& aOptions);
+  static Result<InternalWriteOpts, IOUtils::IOError> FromBinding(
+      const WriteOptions& aOptions);
 };
 
 /**
diff -Nru firefox-84.0.2+build1/dom/system/NetworkGeolocationProvider.jsm firefox-85.0+build1/dom/system/NetworkGeolocationProvider.jsm
--- firefox-84.0.2+build1/dom/system/NetworkGeolocationProvider.jsm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/NetworkGeolocationProvider.jsm	2021-01-18 19:58:10.000000000 +0000
@@ -483,6 +483,10 @@
 
     let compareUrl = Services.urlFormatter.formatURL(this._wifiCompareURL);
     let compare = await this.makeRequest(compareUrl, wifiData);
+    if (!compare.location) {
+      LOG("Backup location service didnt report location");
+      return;
+    }
     let distance = LocationHelper.distance(result.location, compare.location);
     LOG(
       `compare reported reported: ${compare.location.lng}:${compare.location.lat}`
diff -Nru firefox-84.0.2+build1/dom/system/nsDeviceSensors.cpp firefox-85.0+build1/dom/system/nsDeviceSensors.cpp
--- firefox-84.0.2+build1/dom/system/nsDeviceSensors.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/nsDeviceSensors.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/dom/DeviceLightEvent.h"
 #include "mozilla/dom/DeviceOrientationEvent.h"
 #include "mozilla/dom/DeviceProximityEvent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/UserProximityEvent.h"
 #include "mozilla/ErrorResult.h"
@@ -195,15 +196,12 @@
   }
 
   nsPIDOMWindowOuter* windowOuter = aWindow->GetOuterWindow();
-  bool disabled =
-      windowOuter->IsBackground() || !windowOuter->IsTopLevelWindowActive();
-  if (disabled) {
+  BrowsingContext* topBC = aWindow->GetBrowsingContext()->Top();
+  if (windowOuter->IsBackground() || !topBC->GetIsActiveBrowserWindow()) {
     return true;
   }
 
   // Check to see if this window is a cross-origin iframe:
-
-  auto topBC = aWindow->GetBrowsingContext()->Top();
   if (!topBC->IsInProcess()) {
     return true;
   }
@@ -531,7 +529,7 @@
       if (!StaticPrefs::device_sensors_motion_enabled()) {
         return false;
       } else if (doc) {
-        doc->WarnOnceAbout(Document::eMotionEvent);
+        doc->WarnOnceAbout(DeprecatedOperations::eMotionEvent);
       }
       break;
     case nsIDeviceSensorData::TYPE_GAME_ROTATION_VECTOR:
@@ -541,7 +539,7 @@
       if (!StaticPrefs::device_sensors_orientation_enabled()) {
         return false;
       } else if (doc) {
-        doc->WarnOnceAbout(Document::eOrientationEvent);
+        doc->WarnOnceAbout(DeprecatedOperations::eOrientationEvent);
       }
       break;
     case nsIDeviceSensorData::TYPE_PROXIMITY:
@@ -549,7 +547,7 @@
       if (!StaticPrefs::device_sensors_proximity_enabled()) {
         return false;
       } else if (doc) {
-        doc->WarnOnceAbout(Document::eProximityEvent, true);
+        doc->WarnOnceAbout(DeprecatedOperations::eProximityEvent, true);
       }
       break;
     case nsIDeviceSensorData::TYPE_LIGHT:
@@ -557,7 +555,7 @@
       if (!StaticPrefs::device_sensors_ambientLight_enabled()) {
         return false;
       } else if (doc) {
-        doc->WarnOnceAbout(Document::eAmbientLightEvent, true);
+        doc->WarnOnceAbout(DeprecatedOperations::eAmbientLightEvent, true);
       }
       break;
     default:
diff -Nru firefox-84.0.2+build1/dom/system/PathUtils.h firefox-85.0+build1/dom/system/PathUtils.h
--- firefox-84.0.2+build1/dom/system/PathUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/PathUtils.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,16 +8,17 @@
 #define mozilla_dom_PathUtils__
 
 #include "mozilla/DataMutex.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/dom/DOMParser.h"
+#include "mozilla/Result.h"
 #include "mozilla/dom/Promise.h"
 #include "nsString.h"
 #include "nsTArray.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class PathUtils final {
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/chrome.ini firefox-85.0+build1/dom/system/tests/ioutils/chrome.ini
--- firefox-84.0.2+build1/dom/system/tests/ioutils/chrome.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/chrome.ini	2021-01-18 19:58:10.000000000 +0000
@@ -12,3 +12,4 @@
 [test_ioutils_remove.html]
 [test_ioutils_stat_touch.html]
 [test_ioutils_worker.xhtml]
+[test_ioutils_set_permissions.html]
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/file_ioutils_test_fixtures.js firefox-85.0+build1/dom/system/tests/ioutils/file_ioutils_test_fixtures.js
--- firefox-84.0.2+build1/dom/system/tests/ioutils/file_ioutils_test_fixtures.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/file_ioutils_test_fixtures.js	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,7 @@
   if (typeof contents === "string") {
     contents = new TextEncoder().encode(contents);
   }
-  await IOUtils.writeAtomic(location, contents);
+  await IOUtils.write(location, contents);
   const exists = await fileExists(location);
   ok(exists, `Created temporary file at: ${location}`);
 }
@@ -21,7 +21,7 @@
     ignoreExisting: true,
     createAncestors: true,
   });
-  const exists = await OS.File.exists(location);
+  const exists = await dirExists(location);
   ok(exists, `Created temporary directory at: ${location}`);
 }
 
@@ -62,22 +62,13 @@
   }
 }
 
-async function fileOrDirExists(location) {
-  try {
-    await IOUtils.stat(location);
-    return true;
-  } catch (ex) {
-    return false;
-  }
-}
-
 async function cleanup(...files) {
   for (const file of files) {
     await IOUtils.remove(file, {
       ignoreAbsent: true,
       recursive: true,
     });
-    const exists = await fileOrDirExists(file);
+    const exists = await IOUtils.exists(file);
     ok(!exists, `Removed temporary file: ${file}`);
   }
 }
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/file_ioutils_worker.js firefox-85.0+build1/dom/system/tests/ioutils/file_ioutils_worker.js
--- firefox-84.0.2+build1/dom/system/tests/ioutils/file_ioutils_worker.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/file_ioutils_worker.js	2021-01-18 19:58:11.000000000 +0000
@@ -37,12 +37,8 @@
     // Write a file.
     const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_numbers.tmp");
     const bytes = Uint8Array.of(...new Array(50).keys());
-    const bytesWritten = await IOUtils.writeAtomic(tmpFileName, bytes);
-    is(
-      bytesWritten,
-      50,
-      "IOUtils::writeAtomic can write entire byte array to file"
-    );
+    const bytesWritten = await IOUtils.write(tmpFileName, bytes);
+    is(bytesWritten, 50, "IOUtils::write can write entire byte array to file");
 
     // Read it back.
     let fileContents = await IOUtils.read(tmpFileName);
@@ -67,7 +63,7 @@
     const src = OS.Path.join(tmpDir, "test_move_file_src.tmp");
     const dest = OS.Path.join(tmpDir, "test_move_file_dest.tmp");
     const bytes = Uint8Array.of(...new Array(50).keys());
-    await IOUtils.writeAtomic(src, bytes);
+    await IOUtils.write(src, bytes);
 
     await IOUtils.move(src, dest);
     ok(
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_copy_move.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_copy_move.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_copy_move.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_copy_move.html	2021-01-18 19:58:10.000000000 +0000
@@ -92,7 +92,7 @@
       const dest = OS.Path.join(destDir, "dest.tmp");
       await createFile(tmpFileName);
       // Test.
-      ok(!await fileOrDirExists(destDir), "Expected path not to exist");
+      ok(!await IOUtils.exists(destDir), "Expected path not to exist");
       await IOUtils.move(tmpFileName, dest);
       ok(
         !await fileExists(tmpFileName) && await fileExists(dest),
@@ -136,7 +136,7 @@
       // Test.
       await IOUtils.move(srcDir, destDir);
       ok(
-        !await fileOrDirExists(srcDir) && await dirExists(destDir),
+        !await IOUtils.exists(srcDir) && await dirExists(destDir),
         "IOUtils::move can rename directories"
       );
 
@@ -148,7 +148,7 @@
       await IOUtils.move(srcDir, destDir);
       const destFile = OS.Path.join(destDir, OS.Path.basename(srcDir), "file.tmp");
       ok(
-        !await fileOrDirExists(srcDir)
+        !await IOUtils.exists(srcDir)
         && await dirExists(destDir)
         && await dirExists(OS.Path.join(destDir, OS.Path.basename(srcDir)))
         && await fileHasTextContents(destFile, "foo"),
@@ -242,7 +242,7 @@
       const dest = OS.Path.join(destDir, "dest.tmp");
       await createFile(tmpFileName);
       // Test.
-      ok(!await fileOrDirExists(destDir), "Expected path not to exist");
+      ok(!await IOUtils.exists(destDir), "Expected path not to exist");
       await IOUtils.copy(tmpFileName, dest);
       ok(
         await fileExists(tmpFileName) && await fileExists(dest),
@@ -348,8 +348,8 @@
         /Refused to copy source directory\(.*\) to the destination\(.*\)/,
         "IOUtils::copy throws if try to copy a directory with { recursive: false }"
       );
-      console.log(`${notExistsDest} exists?`, await fileOrDirExists(notExistsDest))
-      ok(!await fileOrDirExists(notExistsDest), "IOUtils::copy failure does not affect destination");
+      console.log(`${notExistsDest} exists?`, await IOUtils.exists(notExistsDest))
+      ok(!await IOUtils.exists(notExistsDest), "IOUtils::copy failure does not affect destination");
 
       // Clean up.
       await cleanup(destFile, srcDir);
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_mkdir.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_mkdir.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_mkdir.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_mkdir.html	2021-01-18 19:58:10.000000000 +0000
@@ -13,28 +13,23 @@
     "use strict";
 
     const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
-    const { ObjectUtils } = ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
+    const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-    // TODO: Remove this import for OS.File. It is currently being used as a
-    //       stop gap for missing IOUtils functionality.
-    const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-
-
-    const tmpDir = OS.Constants.Path.tmpDir;
 
     add_task(async function test_make_directory() {
       info("Test creating a new directory");
-      const newDirectoryName = OS.Path.join(tmpDir, "test_ioutils_new_dir.tmp.d");
+      const tmpDir = await PathUtils.getTempDir();
+      const newDirectoryName = PathUtils.join(tmpDir, "test_ioutils_new_dir.tmp.d");
       await IOUtils.makeDirectory(newDirectoryName);
       ok(
-        await OS.File.exists(newDirectoryName),
+        await IOUtils.exists(newDirectoryName),
         "IOUtils::makeDirectory can create a new directory"
       );
 
       info("Test creating an existing directory");
       await IOUtils.makeDirectory(newDirectoryName, { ignoreExisting: true });
       ok(
-        await OS.File.exists(newDirectoryName),
+        await IOUtils.exists(newDirectoryName),
         "IOUtils::makeDirectory can ignore existing directories"
       );
       await Assert.rejects(
@@ -44,8 +39,8 @@
       )
 
       info("Test creating a nested directory");
-      const parentDirName = OS.Path.join(tmpDir, "test_ioutils_mkdir_parent.tmp.d");
-      const nestedDirName = OS.Path.join(
+      const parentDirName = PathUtils.join(tmpDir, "test_ioutils_mkdir_parent.tmp.d");
+      const nestedDirName = PathUtils.join(
         parentDirName,
         "test_ioutils_mkdir_child.tmp.d"
       );
@@ -54,10 +49,10 @@
         /Could not create directory at .* because the path has missing ancestor components/,
         "IOUtils::makeDirectory can fail if the target is missing parents"
       );
-      ok(!await OS.File.exists(nestedDirName), `Expected ${nestedDirName} not to exist`);
+      ok(!await IOUtils.exists(nestedDirName), `Expected ${nestedDirName} not to exist`);
       await IOUtils.makeDirectory(nestedDirName, { createAncestors: true });
       ok(
-        await OS.File.exists(nestedDirName),
+        await IOUtils.exists(nestedDirName),
         "IOUtils::makeDirectory can create ancestors of the target directory"
       );
 
@@ -66,7 +61,8 @@
 
     add_task(async function test_make_directory_failure() {
       info("Try to create a directory where a file already exists");
-      const notADirFileName = OS.Path.join(tmpDir, "test_ioutils_not_a_dir.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const notADirFileName = PathUtils.join(tmpDir, "test_ioutils_not_a_dir.tmp");
       await createFile(notADirFileName);
 
       await Assert.rejects(
@@ -85,6 +81,26 @@
 
       await cleanup(notADirFileName);
     });
+
+    add_task(async function test_make_directory_permissions() {
+      if (Services.appinfo.OS === "WINNT") {
+        ok(true, "Skipping test on unsupported platform (Windows)");
+        return;
+      }
+
+      const tmpDir = await PathUtils.getTempDir();
+      const newDir = PathUtils.join(tmpDir, "test_ioutils_mkdir_perms.tmp.d");
+
+      ok(!await IOUtils.exists(newDir), "Directory does not exist before creation");
+      await IOUtils.makeDirectory(newDir, { permissions: 0o751 });
+      ok(await IOUtils.exists(newDir), "Directory created");
+
+      const stat = await IOUtils.stat(newDir);
+      is(stat.type, "directory", "Directory stat() as directory");
+      is(stat.permissions, 0o751, "Directory created with expected permissions");
+
+      await cleanup(newDir);
+    });
   </script>
 </head>
 
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_read_write.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_read_write.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_read_write.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_read_write.html	2021-01-18 19:58:10.000000000 +0000
@@ -15,15 +15,14 @@
     const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
     const { ObjectUtils } = ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
 
-    // TODO: Remove this import for OS.File. It is currently being used as a
-    //       stop gap for missing IOUtils functionality.
+    // This is presently only used to test compatability between OS.File and
+    // IOUtils when it comes to writing compressed files. The import and the
+    // test `test_lz4_osfile_compat` can be removed with OS.File is removed.
     const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
-
-    const tmpDir = OS.Constants.Path.tmpDir;
-
     add_task(async function test_read_failure() {
-      const doesNotExist = OS.Path.join(tmpDir, "does_not_exist.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const doesNotExist = PathUtils.join(tmpDir, "does_not_exist.tmp");
       await Assert.rejects(
         IOUtils.read(doesNotExist),
         /Could not open the file at .*/,
@@ -32,25 +31,34 @@
     });
 
     add_task(async function test_write_no_overwrite() {
+      const tmpDir = await PathUtils.getTempDir();
+
       // Make a new file, and try to write to it with overwrites disabled.
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_overwrite.tmp");
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_overwrite.tmp");
       const untouchableContents = new TextEncoder().encode("Can't touch this!\n");
-      await IOUtils.writeAtomic(tmpFileName, untouchableContents);
+
+      let exists = await IOUtils.exists(tmpFileName);
+      ok(!exists, `File ${tmpFileName} should not exist before writing`);
+
+      await IOUtils.write(tmpFileName, untouchableContents);
+
+      exists = await IOUtils.exists(tmpFileName);
+      ok(exists, `File ${tmpFileName} should exist after writing`);
 
       const newContents = new TextEncoder().encode("Nah nah nah!\n");
       await Assert.rejects(
-        IOUtils.writeAtomic(tmpFileName, newContents, {
+        IOUtils.write(tmpFileName, newContents, {
           noOverwrite: true,
         }),
         /Refusing to overwrite the file at */,
-        "IOUtils::writeAtomic rejects writing to existing file if overwrites are disabled"
+        "IOUtils::write rejects writing to existing file if overwrites are disabled"
       );
       ok(
         await fileHasBinaryContents(tmpFileName, untouchableContents),
-        "IOUtils::writeAtomic doesn't change target file when overwrite is refused"
+        "IOUtils::write doesn't change target file when overwrite is refused"
       );
 
-      const bytesWritten = await IOUtils.writeAtomic(
+      const bytesWritten = await IOUtils.write(
         tmpFileName,
         newContents,
         { noOverwrite: false /* Default. */ }
@@ -58,7 +66,7 @@
       is(
         bytesWritten,
         newContents.length,
-        "IOUtils::writeAtomic can overwrite files if specified"
+        "IOUtils::write can overwrite files if specified"
       );
 
       await cleanup(tmpFileName);
@@ -66,46 +74,49 @@
 
     add_task(async function test_write_with_backup() {
       info("Test backup file option with non-existing file");
+
+      const tmpDir = await PathUtils.getTempDir();
+
       let fileContents = new TextEncoder().encode("Original file contents");
-      let destFileName = OS.Path.join(tmpDir, "test_write_with_backup_option.tmp");
+      let destFileName = PathUtils.join(tmpDir, "test_write_with_backup_option.tmp");
       let backupFileName = destFileName + ".backup";
       let bytesWritten =
-        await IOUtils.writeAtomic(destFileName, fileContents, {
+        await IOUtils.write(destFileName, fileContents, {
           backupFile: backupFileName,
         });
       ok(
         await fileHasTextContents(destFileName, "Original file contents"),
-        "IOUtils::writeAtomic creates a new file with the correct contents"
+        "IOUtils::write creates a new file with the correct contents"
       );
       ok(
         !await fileExists(backupFileName),
-        "IOUtils::writeAtomic does not create a backup if the target file does not exist"
+        "IOUtils::write does not create a backup if the target file does not exist"
       );
       is(
         bytesWritten,
         fileContents.length,
-        "IOUtils::writeAtomic correctly writes to a new file without performing a backup"
+        "IOUtils::write correctly writes to a new file without performing a backup"
       );
 
       info("Test backup file option with existing destination");
       let newFileContents = new TextEncoder().encode("New file contents");
       ok(await fileExists(destFileName), `Expected ${destFileName} to exist`);
       bytesWritten =
-        await IOUtils.writeAtomic(destFileName, newFileContents, {
+        await IOUtils.write(destFileName, newFileContents, {
           backupFile: backupFileName,
         });
       ok(
         await fileHasTextContents(backupFileName, "Original file contents"),
-        "IOUtils::writeAtomic can backup an existing file before writing"
+        "IOUtils::write can backup an existing file before writing"
       );
       ok(
         await fileHasTextContents(destFileName, "New file contents"),
-        "IOUtils::writeAtomic can create the target with the correct contents"
+        "IOUtils::write can create the target with the correct contents"
       );
       is(
         bytesWritten,
         newFileContents.length,
-        "IOUtils::writeAtomic correctly writes to the target after taking a backup"
+        "IOUtils::write correctly writes to the target after taking a backup"
       );
 
       await cleanup(destFileName, backupFileName);
@@ -113,64 +124,69 @@
 
     add_task(async function test_write_with_backup_and_tmp() {
       info("Test backup with tmp and backup file options, non-existing destination");
+
+      const tmpDir = await PathUtils.getTempDir();
+
       let fileContents = new TextEncoder().encode("Original file contents");
-      let destFileName = OS.Path.join(tmpDir, "test_write_with_backup_and_tmp_options.tmp");
+      let destFileName = PathUtils.join(tmpDir, "test_write_with_backup_and_tmp_options.tmp");
       let backupFileName = destFileName + ".backup";
-      let tmpFileName = OS.Path.join(tmpDir, "temp_file.tmp");
+      let tmpFileName = PathUtils.join(tmpDir, "temp_file.tmp");
       let bytesWritten =
-        await IOUtils.writeAtomic(destFileName, fileContents, {
+        await IOUtils.write(destFileName, fileContents, {
           backupFile: backupFileName,
           tmpPath: tmpFileName,
         });
-      ok(!await fileExists(tmpFileName), "IOUtils::writeAtomic cleans up the tmpFile");
+      ok(!await fileExists(tmpFileName), "IOUtils::write cleans up the tmpFile");
       ok(
         !await fileExists(backupFileName),
-        "IOUtils::writeAtomic does not create a backup if the target file does not exist"
+        "IOUtils::write does not create a backup if the target file does not exist"
       );
       ok(
         await fileHasTextContents(destFileName, "Original file contents"),
-        "IOUtils::writeAtomic can write to the destination when a temporary file is used"
+        "IOUtils::write can write to the destination when a temporary file is used"
       );
       is(
         bytesWritten,
         fileContents.length,
-        "IOUtils::writeAtomic can copy tmp file to destination without performing a backup"
+        "IOUtils::write can copy tmp file to destination without performing a backup"
       );
 
       info("Test backup with tmp and backup file options, existing destination");
       let newFileContents = new TextEncoder().encode("New file contents");
       bytesWritten =
-        await IOUtils.writeAtomic(destFileName, newFileContents, {
+        await IOUtils.write(destFileName, newFileContents, {
           backupFile: backupFileName,
           tmpPath: tmpFileName,
         });
 
-      ok(!await fileExists(tmpFileName), "IOUtils::writeAtomic cleans up the tmpFile");
+      ok(!await fileExists(tmpFileName), "IOUtils::write cleans up the tmpFile");
       ok(
         await fileHasTextContents(backupFileName, "Original file contents"),
-        "IOUtils::writeAtomic can create a backup if the target file exists"
+        "IOUtils::write can create a backup if the target file exists"
       );
       ok(
         await fileHasTextContents(destFileName, "New file contents"),
-        "IOUtils::writeAtomic can write to the destination when a temporary file is used"
+        "IOUtils::write can write to the destination when a temporary file is used"
       );
       is(
         bytesWritten,
         newFileContents.length,
-        "IOUtils::writeAtomic IOUtils::writeAtomic can move tmp file to destination after performing a backup"
+        "IOUtils::write IOUtils::write can move tmp file to destination after performing a backup"
       );
 
       await cleanup(destFileName, backupFileName);
     });
 
     add_task(async function test_partial_read() {
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_partial_read.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_partial_read.tmp");
       const bytes = Uint8Array.of(...new Array(50).keys());
-      const bytesWritten = await IOUtils.writeAtomic(tmpFileName, bytes);
+      const bytesWritten = await IOUtils.write(tmpFileName, bytes);
       is(
         bytesWritten,
         50,
-        "IOUtils::writeAtomic can write entire byte array to file"
+        "IOUtils::write can write entire byte array to file"
       );
 
       // Read just the first 10 bytes.
@@ -192,13 +208,16 @@
     add_task(async function test_empty_read_and_write() {
       // Trying to write an empty file isn't very useful, but it should still
       // succeed.
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_empty.tmp");
+
+      const tmpDir = await PathUtils.getTempDir();
+
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_empty.tmp");
       const emptyByteArray = new Uint8Array(0);
-      const bytesWritten = await IOUtils.writeAtomic(
+      const bytesWritten = await IOUtils.write(
         tmpFileName,
         emptyByteArray
       );
-      is(bytesWritten, 0, "IOUtils::writeAtomic can create an empty file");
+      is(bytesWritten, 0, "IOUtils::write can create an empty file");
 
       // Trying to explicitly read nothing isn't useful, but it should still
       // succeed.
@@ -214,14 +233,17 @@
 
     add_task(async function test_full_read_and_write() {
       // Write a file.
+
+      const tmpDir = await PathUtils.getTempDir();
+
       info("Test writing to a new binary file");
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_numbers.tmp");
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_numbers.tmp");
       const bytes = Uint8Array.of(...new Array(50).keys());
-      const bytesWritten = await IOUtils.writeAtomic(tmpFileName, bytes);
+      const bytesWritten = await IOUtils.write(tmpFileName, bytes);
       is(
         bytesWritten,
         50,
-        "IOUtils::writeAtomic can write entire byte array to file"
+        "IOUtils::write can write entire byte array to file"
       );
 
       // Read it back.
@@ -251,9 +273,9 @@
 
       info("Test writing a file at a relative destination");
       await Assert.rejects(
-        IOUtils.writeAtomic(tmpFileName, bytes),
+        IOUtils.write(tmpFileName, bytes),
         /Could not parse path/,
-        "IOUtils::writeAtomic only works with absolute paths"
+        "IOUtils::write only works with absolute paths"
       );
     });
 
@@ -264,16 +286,17 @@
       await Assert.rejects(
         IOUtils.read(tmpFileName),
         /Could not parse path/,
-        "IOUtils::writeAtomic only works with absolute paths"
+        "IOUtils::write only works with absolute paths"
       );
     });
 
     add_task(async function test_lz4() {
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_lz4.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_lz4.tmp");
 
       info("Test writing lz4 encoded data");
       const varyingBytes = Uint8Array.of(...new Array(50).keys());
-      let bytesWritten = await IOUtils.writeAtomic(tmpFileName, varyingBytes, { compress: true });
+      let bytesWritten = await IOUtils.write(tmpFileName, varyingBytes, { compress: true });
       is(bytesWritten, 64, "Expected to write 64 bytes");
 
       info("Test reading lz4 encoded data");
@@ -282,7 +305,7 @@
 
       info("Test writing lz4 compressed data");
       const repeatedBytes = Uint8Array.of(...new Array(50).fill(1));
-      bytesWritten = await IOUtils.writeAtomic(tmpFileName, repeatedBytes, { compress: true });
+      bytesWritten = await IOUtils.write(tmpFileName, repeatedBytes, { compress: true });
       is(bytesWritten, 23, "Expected 50 bytes to compress to 23 bytes");
 
       info("Test reading lz4 encoded data");
@@ -291,7 +314,7 @@
 
       info("Test writing empty lz4 compressed data")
       const empty = new Uint8Array();
-      bytesWritten = await IOUtils.writeAtomic(tmpFileName, empty, { compress: true });
+      bytesWritten = await IOUtils.write(tmpFileName, empty, { compress: true });
       is(bytesWritten, 12, "Expected to write just the LZ4 header, with a content length of 0");
 
 
@@ -307,13 +330,14 @@
     });
 
     add_task(async function test_lz4_osfile_compat() {
-      const osfileTmpFile = OS.Path.join(tmpDir, "test_ioutils_lz4_compat_osfile.tmp");
-      const ioutilsTmpFile = OS.Path.join(tmpDir, "test_ioutils_lz4_compat_ioutils.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const osfileTmpFile = PathUtils.join(tmpDir, "test_ioutils_lz4_compat_osfile.tmp");
+      const ioutilsTmpFile = PathUtils.join(tmpDir, "test_ioutils_lz4_compat_ioutils.tmp");
 
       info("Test OS.File and IOUtils write the same file with LZ4 compression enabled")
       const repeatedBytes = Uint8Array.of(...new Array(50).fill(1));
       let expectedBytes = 23;
-      let ioutilsBytes = await IOUtils.writeAtomic(ioutilsTmpFile, repeatedBytes, { compress: true });
+      let ioutilsBytes = await IOUtils.write(ioutilsTmpFile, repeatedBytes, { compress: true });
       let osfileBytes = await OS.File.writeAtomic(osfileTmpFile, repeatedBytes, { compression: "lz4" });
       is(ioutilsBytes, expectedBytes, "IOUtils writes the expected number of bytes for compression");
       is(osfileBytes, ioutilsBytes, "OS.File and IOUtils write the same number of bytes for LZ4 compression");
@@ -332,11 +356,12 @@
     });
 
     add_task(async function test_lz4_bad_call() {
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_lz4_bad_call.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_lz4_bad_call.tmp");
 
       info("Test decompression with invalid options");
       const varyingBytes = Uint8Array.of(...new Array(50).keys());
-      let bytesWritten = await IOUtils.writeAtomic(tmpFileName, varyingBytes, { compress: true });
+      let bytesWritten = await IOUtils.write(tmpFileName, varyingBytes, { compress: true });
       is(bytesWritten, 64, "Expected to write 64 bytes");
       await Assert.rejects(
         IOUtils.read(tmpFileName, { maxBytes: 4, decompress: true }),
@@ -348,21 +373,32 @@
     });
 
     add_task(async function test_lz4_failure() {
-      const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_lz4_fail.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const tmpFileName = PathUtils.join(tmpDir, "test_ioutils_lz4_fail.tmp");
 
       info("Test decompression of non-lz4 data");
       const repeatedBytes = Uint8Array.of(...new Array(50).fill(1));
-      await IOUtils.writeAtomic(tmpFileName, repeatedBytes, { compress: false });
+      await IOUtils.write(tmpFileName, repeatedBytes, { compress: false });
 
       await Assert.rejects(
         IOUtils.read(tmpFileName, { decompress: true }),
-        /Could not decompress file because it has an invalid LZ4 header \(wrong magic number: .*\)/,
+        (actual) => {
+          is(actual.constructor, DOMException,
+             "rejection reason constructor for decompress with bad header");
+          is(actual.name, "NotReadableError",
+             "rejection error name for decompress with bad header");
+          ok(/Could not decompress file because it has an invalid LZ4 header \(wrong magic number: .*\)/
+             .test(actual.message),
+             "rejection error message for decompress with bad header. Got "
+             + actual.message);
+          return true;
+        },
         "IOUtils::read fails to decompress LZ4 data with a bad header"
       );
 
       info("Test decompression of short byte buffer");
       const elevenBytes = Uint8Array.of(...new Array(11).fill(1));
-      await IOUtils.writeAtomic(tmpFileName, elevenBytes, { compress: false });
+      await IOUtils.write(tmpFileName, elevenBytes, { compress: false });
 
       await Assert.rejects(
         IOUtils.read(tmpFileName, { decompress: true }),
@@ -374,7 +410,7 @@
       const headerFor10bytes = [109, 111, 122, 76, 122, 52, 48, 0, 10, 0, 0, 0] // "mozlz40\0" + 4 byte length
       const badContents = new Array(11).fill(255); // Bad leading byte, followed by uncompressed stream.
       const goodHeaderBadContents = Uint8Array.of(...headerFor10bytes, ...badContents);
-      await IOUtils.writeAtomic(tmpFileName, goodHeaderBadContents, { compress: false });
+      await IOUtils.write(tmpFileName, goodHeaderBadContents, { compress: false });
 
       await Assert.rejects(
         IOUtils.read(tmpFileName, { decompress: true }),
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_read_write_utf8.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_read_write_utf8.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_read_write_utf8.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_read_write_utf8.html	2021-01-18 19:58:10.000000000 +0000
@@ -40,7 +40,7 @@
       const invalidUTF8File = OS.Path.join(tmpDir, "invalid_utf8.tmp");
 
       // Deliberately write the invalid byte sequence to file.
-      await IOUtils.writeAtomic(invalidUTF8File, invalidUTF8);
+      await IOUtils.write(invalidUTF8File, invalidUTF8);
 
       await Assert.rejects(
         IOUtils.readUTF8(invalidUTF8File),
@@ -55,22 +55,22 @@
       // Make a new file, and try to write to it with overwrites disabled.
       const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_write_utf8_overwrite.tmp");
       const untouchableContents = "Can't touch this!\n";
-      await IOUtils.writeAtomicUTF8(tmpFileName, untouchableContents);
+      await IOUtils.writeUTF8(tmpFileName, untouchableContents);
 
       const newContents = "Nah nah nah!\n";
       await Assert.rejects(
-        IOUtils.writeAtomicUTF8(tmpFileName, newContents, {
+        IOUtils.writeUTF8(tmpFileName, newContents, {
           noOverwrite: true,
         }),
         /Refusing to overwrite the file at */,
-        "IOUtils::writeAtomicUTF8 rejects writing to existing file if overwrites are disabled"
+        "IOUtils::writeUTF8 rejects writing to existing file if overwrites are disabled"
       );
       ok(
         await fileHasTextContents(tmpFileName, untouchableContents),
-        "IOUtils::writeAtomicUTF8 doesn't change target file when overwrite is refused"
+        "IOUtils::writeUTF8 doesn't change target file when overwrite is refused"
       );
 
-      const bytesWritten = await IOUtils.writeAtomicUTF8(
+      const bytesWritten = await IOUtils.writeUTF8(
         tmpFileName,
         newContents,
         { noOverwrite: false /* Default. */ }
@@ -78,11 +78,11 @@
       is(
         bytesWritten,
         newContents.length,
-        "IOUtils::writeAtomicUTF8 can overwrite files if specified"
+        "IOUtils::writeUTF8 can overwrite files if specified"
       );
       ok(
         await fileHasTextContents(tmpFileName, newContents),
-        "IOUtils::writeAtomicUTF8 overwrites with the expected contents"
+        "IOUtils::writeUTF8 overwrites with the expected contents"
       );
 
       await cleanup(tmpFileName);
@@ -94,42 +94,42 @@
       let destFileName = OS.Path.join(tmpDir, "test_write_utf8_with_backup_option.tmp");
       let backupFileName = destFileName + ".backup";
       let bytesWritten =
-        await IOUtils.writeAtomicUTF8(destFileName, fileContents, {
+        await IOUtils.writeUTF8(destFileName, fileContents, {
           backupFile: backupFileName,
         });
       ok(
         await fileHasTextContents(destFileName, "Original file contents"),
-        "IOUtils::writeAtomicUTF8 creates a new file with the correct contents"
+        "IOUtils::writeUTF8 creates a new file with the correct contents"
       );
       ok(
         !await fileExists(backupFileName),
-        "IOUtils::writeAtomicUTF8 does not create a backup if the target file does not exist"
+        "IOUtils::writeUTF8 does not create a backup if the target file does not exist"
       );
       is(
         bytesWritten,
         fileContents.length,
-        "IOUtils::writeAtomic correctly writes to a new file without performing a backup"
+        "IOUtils::write correctly writes to a new file without performing a backup"
       );
 
       info("Test backup file option with existing destination");
       let newFileContents = "New file contents";
       ok(await fileExists(destFileName), `Expected ${destFileName} to exist`);
       bytesWritten =
-        await IOUtils.writeAtomicUTF8(destFileName, newFileContents, {
+        await IOUtils.writeUTF8(destFileName, newFileContents, {
           backupFile: backupFileName,
         });
       ok(
         await fileHasTextContents(backupFileName, "Original file contents"),
-        "IOUtils::writeAtomicUTF8 can backup an existing file before writing"
+        "IOUtils::writeUTF8 can backup an existing file before writing"
       );
       ok(
         await fileHasTextContents(destFileName, "New file contents"),
-        "IOUtils::writeAtomicUTF8 can create the target with the correct contents"
+        "IOUtils::writeUTF8 can create the target with the correct contents"
       );
       is(
         bytesWritten,
         newFileContents.length,
-        "IOUtils::writeAtomicUTF8 correctly writes to the target after taking a backup"
+        "IOUtils::writeUTF8 correctly writes to the target after taking a backup"
       );
 
       await cleanup(destFileName, backupFileName);
@@ -142,46 +142,46 @@
       let backupFileName = destFileName + ".backup";
       let tmpFileName = OS.Path.join(tmpDir, "temp_file.tmp");
       let bytesWritten =
-        await IOUtils.writeAtomicUTF8(destFileName, fileContents, {
+        await IOUtils.writeUTF8(destFileName, fileContents, {
           backupFile: backupFileName,
           tmpPath: tmpFileName,
         });
-      ok(!await fileExists(tmpFileName), "IOUtils::writeAtomicUTF8 cleans up the tmpFile");
+      ok(!await fileExists(tmpFileName), "IOUtils::writeUTF8 cleans up the tmpFile");
       ok(
         !await fileExists(backupFileName),
-        "IOUtils::writeAtomicUTF8 does not create a backup if the target file does not exist"
+        "IOUtils::writeUTF8 does not create a backup if the target file does not exist"
       );
       ok(
         await fileHasTextContents(destFileName, "Original file contents"),
-        "IOUtils::writeAtomicUTF8 can write to the destination when a temporary file is used"
+        "IOUtils::writeUTF8 can write to the destination when a temporary file is used"
       );
       is(
         bytesWritten,
         fileContents.length,
-        "IOUtils::writeAtomicUTF8 can copy tmp file to destination without performing a backup"
+        "IOUtils::writeUTF8 can copy tmp file to destination without performing a backup"
       );
 
       info("Test backup with tmp and backup file options, existing destination");
       let newFileContents = "New file contents";
       bytesWritten =
-        await IOUtils.writeAtomicUTF8(destFileName, newFileContents, {
+        await IOUtils.writeUTF8(destFileName, newFileContents, {
           backupFile: backupFileName,
           tmpPath: tmpFileName,
         });
 
-      ok(!await fileExists(tmpFileName), "IOUtils::writeAtomicUTF8 cleans up the tmpFile");
+      ok(!await fileExists(tmpFileName), "IOUtils::writeUTF8 cleans up the tmpFile");
       ok(
         await fileHasTextContents(backupFileName, "Original file contents"),
-        "IOUtils::writeAtomicUTF8 can create a backup if the target file exists"
+        "IOUtils::writeUTF8 can create a backup if the target file exists"
       );
       ok(
         await fileHasTextContents(destFileName, "New file contents"),
-        "IOUtils::writeAtomicUTF8 can write to the destination when a temporary file is used"
+        "IOUtils::writeUTF8 can write to the destination when a temporary file is used"
       );
       is(
         bytesWritten,
         newFileContents.length,
-        "IOUtils::writeAtomicUTF8 can move tmp file to destination after performing a backup"
+        "IOUtils::writeUTF8 can move tmp file to destination after performing a backup"
       );
 
       await cleanup(destFileName, backupFileName);
@@ -190,11 +190,11 @@
     add_task(async function test_empty_read_and_write_utf8() {
       const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_empty_utf8.tmp");
       const emptyString = ""
-      const bytesWritten = await IOUtils.writeAtomicUTF8(
+      const bytesWritten = await IOUtils.writeUTF8(
         tmpFileName,
         emptyString
       );
-      is(bytesWritten, 0, "IOUtils::writeAtomicUTF8 can create an empty file");
+      is(bytesWritten, 0, "IOUtils::writeUTF8 can create an empty file");
 
       const nothing = await IOUtils.readUTF8(tmpFileName);
       is(nothing.length, 0, "IOUtils::readUTF8 can read empty files");
@@ -213,11 +213,11 @@
       // ZWJ sequences.
       const emoji = "☕� ⚧� 😀 🖖� 🤠 ���🌈 🥠 ��☠� �";
       const expectedBytes = 71;
-      const bytesWritten = await IOUtils.writeAtomicUTF8(tmpFileName, emoji);
+      const bytesWritten = await IOUtils.writeUTF8(tmpFileName, emoji);
       is(
         bytesWritten,
         expectedBytes,
-        "IOUtils::writeAtomicUTF8 can write emoji to file"
+        "IOUtils::writeUTF8 can write emoji to file"
       );
 
       // Read it back.
@@ -238,9 +238,9 @@
 
       info("Test writing a file at a relative destination");
       await Assert.rejects(
-        IOUtils.writeAtomicUTF8(tmpFileName, "foo"),
+        IOUtils.writeUTF8(tmpFileName, "foo"),
         /Could not parse path/,
-        "IOUtils::writeAtomicUTF8 only works with absolute paths"
+        "IOUtils::writeUTF8 only works with absolute paths"
       );
     });
 
@@ -261,7 +261,7 @@
 
       info("Test writing lz4 encoded UTF-8 string");
       const emoji = "☕� ⚧� 😀 🖖� 🤠 ���🌈 🥠 ��☠� �";
-      let bytesWritten = await IOUtils.writeAtomicUTF8(tmpFileName, emoji, { compress: true });
+      let bytesWritten = await IOUtils.writeUTF8(tmpFileName, emoji, { compress: true });
       is(bytesWritten, 83, "Expected to write 64 bytes");
 
       info("Test reading lz4 encoded UTF-8 string");
@@ -270,7 +270,7 @@
 
       info("Test writing lz4 compressed UTF-8 string");
       const lotsOfCoffee = new Array(24).fill("☕�").join(""); // ☕� is 3 bytes in UTF-8: \0xe2 \0x98 \0x95
-      bytesWritten = await IOUtils.writeAtomicUTF8(tmpFileName, lotsOfCoffee, { compress: true });
+      bytesWritten = await IOUtils.writeUTF8(tmpFileName, lotsOfCoffee, { compress: true });
       console.log(bytesWritten);
       is(bytesWritten, 28, "Expected 72 bytes to compress to 28 bytes");
 
@@ -280,7 +280,7 @@
 
       info("Test writing empty lz4 compressed UTF-8 string")
       const empty = "";
-      bytesWritten = await IOUtils.writeAtomicUTF8(tmpFileName, empty, { compress: true });
+      bytesWritten = await IOUtils.writeUTF8(tmpFileName, empty, { compress: true });
       is(bytesWritten, 12, "Expected to write just the LZ4 header");
 
       info("Test reading empty lz4 compressed UTF-8 string")
@@ -299,7 +299,7 @@
       info("Test OS.File and IOUtils write the same UTF-8 file with LZ4 compression enabled")
       const emoji = "☕� ⚧� 😀 🖖� 🤠 ���🌈 🥠 ��☠� �";
       let expectedBytes = 83;
-      let ioutilsBytes = await IOUtils.writeAtomicUTF8(ioutilsTmpFile, emoji, { compress: true });
+      let ioutilsBytes = await IOUtils.writeUTF8(ioutilsTmpFile, emoji, { compress: true });
       let osfileBytes = await OS.File.writeAtomic(osfileTmpFile, emoji, { compression: "lz4" });
       is(ioutilsBytes, expectedBytes, "IOUtils writes the expected number of bytes for compression");
       is(osfileBytes, ioutilsBytes, "OS.File and IOUtils write the same number of bytes for LZ4 compression");
@@ -320,7 +320,7 @@
 
       info("readUTF8 ignores the maxBytes option if provided");
       const emoji = "☕� ⚧� 😀 🖖� 🤠 ���🌈 🥠 ��☠� �";
-      let bytesWritten = await IOUtils.writeAtomicUTF8(tmpFileName, emoji, { compress: true });
+      let bytesWritten = await IOUtils.writeUTF8(tmpFileName, emoji, { compress: true });
       is(bytesWritten, 83, "Expected to write 83 bytes");
 
       let readData = await IOUtils.readUTF8(tmpFileName, { maxBytes: 4, decompress: true });
@@ -334,7 +334,7 @@
 
       info("Test decompression of non-lz4 UTF-8 string");
       const repeatedBytes = Uint8Array.of(...new Array(50).fill(1));
-      await IOUtils.writeAtomic(tmpFileName, repeatedBytes, { compress: false });
+      await IOUtils.write(tmpFileName, repeatedBytes, { compress: false });
 
       await Assert.rejects(
         IOUtils.readUTF8(tmpFileName, { decompress: true }),
@@ -344,7 +344,7 @@
 
       info("Test UTF-8 decompression of short byte buffer");
       const elevenBytes = Uint8Array.of(...new Array(11).fill(1));
-      await IOUtils.writeAtomic(tmpFileName, elevenBytes, { compress: false });
+      await IOUtils.write(tmpFileName, elevenBytes, { compress: false });
 
       await Assert.rejects(
         IOUtils.readUTF8(tmpFileName, { decompress: true }),
@@ -356,7 +356,7 @@
       const headerFor10bytes = [109, 111, 122, 76, 122, 52, 48, 0, 10, 0, 0, 0] // "mozlz40\0" + 4 byte length
       const badContents = new Array(11).fill(255); // Bad leading byte, followed by uncompressed stream.
       const goodHeaderBadContents = Uint8Array.of(...headerFor10bytes, ...badContents);
-      await IOUtils.writeAtomic(tmpFileName, goodHeaderBadContents, { compress: false });
+      await IOUtils.write(tmpFileName, goodHeaderBadContents, { compress: false });
 
       await Assert.rejects(
         IOUtils.readUTF8(tmpFileName, { decompress: true }),
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_remove.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_remove.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_remove.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_remove.html	2021-01-18 19:58:10.000000000 +0000
@@ -25,7 +25,7 @@
     add_task(async function test_create_and_remove_file() {
       info("Test creating and removing a single file");
       const tmpFileName = OS.Path.join(tmpDir, "test_ioutils_create_and_remove.tmp");
-      await IOUtils.writeAtomic(tmpFileName, new Uint8Array(0));
+      await IOUtils.write(tmpFileName, new Uint8Array(0));
       ok(await fileExists(tmpFileName), `Expected file ${tmpFileName} to exist`);
 
       await IOUtils.remove(tmpFileName);
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_set_permissions.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_set_permissions.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_set_permissions.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_set_permissions.html	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,56 @@
+<!-- Any copyright is dedicated to the Public Domain.
+- http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <title>Test the IOUtils file I/O API</title>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+  <script src="file_ioutils_test_fixtures.js"></script>
+  <script>
+    "use strict";
+
+    const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+    add_task(async function test_setPermissions() {
+      const tempDir = await PathUtils.getTempDir();
+      const tempFile = PathUtils.join(tempDir, "setPermissions.tmp");
+
+      await IOUtils.writeUTF8(tempFile, "");
+      await IOUtils.setPermissions(tempFile, 0o421);
+
+      let stat = await IOUtils.stat(tempFile);
+
+      if (Services.appinfo.OS === "WINNT") {
+        // setPermissions ignores the x bit on Windows.
+        is(stat.permissions, 0o666, "Permissions munged on Windows");
+      } else {
+        is(stat.permissions, 0o421, "Permissions match");
+      }
+
+      await IOUtils.setPermissions(tempFile, 0o400);
+      stat = await IOUtils.stat(tempFile);
+
+      if (Services.appinfo.OS === "WINNT") {
+        is(stat.permissions, 0o444, "Permissions munged on Windows");
+
+        // We need to make the file writable to delete it on Windows.
+        await IOUtils.setPermissions(tempFile, 0o600);
+      } else {
+        is(stat.permissions, 0o400, "Permissions match");
+      }
+
+      await cleanup(tempFile);
+    });
+  </script>
+</head>
+
+<body>
+  <p id="display"></p>
+  <div id="content" style="display: none"></div>
+  <pre id="test"></pre>
+</body>
+
+</html>
diff -Nru firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_stat_touch.html firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_stat_touch.html
--- firefox-84.0.2+build1/dom/system/tests/ioutils/test_ioutils_stat_touch.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/system/tests/ioutils/test_ioutils_stat_touch.html	2021-01-18 19:58:10.000000000 +0000
@@ -14,17 +14,14 @@
 
     const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
     const { ObjectUtils } = ChromeUtils.import("resource://gre/modules/ObjectUtils.jsm");
-
-    // TODO: Remove this import for OS.File. It is currently being used as a
-    //       stop gap for missing IOUtils functionality.
-    const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-
-
-    const tmpDir = OS.Constants.Path.tmpDir;
+    const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
     add_task(async function test_stat() {
       info("Test attempt to stat a regular empty file");
-      const emptyFileName = OS.Path.join(tmpDir, "test_stat_empty.tmp");
+
+      const tmpDir = await PathUtils.getTempDir();
+
+      const emptyFileName = PathUtils.join(tmpDir, "test_stat_empty.tmp");
       await createFile(emptyFileName);
 
       const emptyFileInfo = await IOUtils.stat(emptyFileName);
@@ -38,7 +35,7 @@
       );
 
       info("Test attempt to stat a regular binary file");
-      const tempFileName = OS.Path.join(tmpDir, "test_stat_binary.tmp");
+      const tempFileName = PathUtils.join(tmpDir, "test_stat_binary.tmp");
       const bytes = Uint8Array.of(...new Array(50).keys());
       await createFile(tempFileName, bytes);
 
@@ -53,8 +50,8 @@
       );
 
       info("Test attempt to stat a directory");
-      const tempDirName = OS.Path.join(tmpDir, "test_stat_dir.tmp.d");
-      await OS.File.makeDir(tempDirName);
+      const tempDirName = PathUtils.join(tmpDir, "test_stat_dir.tmp.d");
+      await IOUtils.makeDirectory(tempDirName);
 
       const dirInfo = await IOUtils.stat(tempDirName);
       is(dirInfo.size, -1, "IOUtils::stat reports -1 size for directories")
@@ -71,7 +68,10 @@
 
     add_task(async function test_stat_failures() {
       info("Test attempt to stat a non-existing file");
-      const notExistsFile = OS.Path.join(tmpDir, "test_stat_not_exists.tmp");
+
+      const tmpDir = await PathUtils.getTempDir();
+
+      const notExistsFile = PathUtils.join(tmpDir, "test_stat_not_exists.tmp");
 
       await Assert.rejects(
         IOUtils.stat(notExistsFile),
@@ -82,7 +82,10 @@
 
     add_task(async function test_touch_and_stat() {
       info("Test attempt to touch a file");
-      const tmpFileName = OS.Path.join(tmpDir, "test_touch_and_stat.tmp");
+
+      const tmpDir = await PathUtils.getTempDir();
+
+      const tmpFileName = PathUtils.join(tmpDir, "test_touch_and_stat.tmp");
       await createFile(tmpFileName);
 
       const oldFileInfo = await IOUtils.stat(tmpFileName);
@@ -103,14 +106,16 @@
       );
 
       info("Test attempt to touch a directory");
-      const tmpDirName = OS.Path.join(tmpDir, "test_touch_and_stat.tmp.d");
+      const tmpDirName = PathUtils.join(tmpDir, "test_touch_and_stat.tmp.d");
       await createDir(tmpDirName);
 
       await cleanup(tmpFileName, tmpDirName);
     });
 
     add_task(async function test_touch_custom_mod_time() {
-      const tempFileName = OS.Path.join(tmpDir, "test_touch_custom_mod_time.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+
+      const tempFileName = PathUtils.join(tmpDir, "test_touch_custom_mod_time.tmp");
       await createFile(tempFileName);
       const originalInfo = await IOUtils.stat(tempFileName);
       const now = originalInfo.lastModified;
@@ -138,9 +143,36 @@
       await cleanup(tempFileName);
     });
 
+    add_task(async function test_stat_btime() {
+      if (["Darwin", "WINNT"].includes(Services.appinfo.OS)) {
+        const tmpDir = await PathUtils.getTempDir();
+
+        const tempFileName = PathUtils.join(tmpDir, "test_stat_btime.tmp");
+        await createFile(tempFileName);
+        const originalInfo = await IOUtils.stat(tempFileName);
+
+        const future = originalInfo.lastModified + 6000;
+        await IOUtils.touch(tempFileName, future);
+        const futureInfo = await IOUtils.stat(tempFileName);
+
+        ok(originalInfo.hasOwnProperty("creationTime"), "originalInfo has creationTime field");
+        ok(originalInfo.creationTime !== undefined && originalInfo.creationTime !== null, "originalInfo has non-null creationTime");
+
+        ok(futureInfo.hasOwnProperty("creationTime"), "futureInfo has creationTime field");
+        ok(futureInfo.creationTime !== undefined && futureInfo.creationTime !== null, "futureInfo has non-null creationTime");
+
+        is(originalInfo.creationTime, futureInfo.creationTime, "creationTime matches");
+
+        await cleanup(tempFileName);
+      } else {
+        ok(true, `skipping test_stat_btime() on unsupported platform ${Services.appinfo.OS}`);
+      }
+    });
+
     add_task(async function test_touch_failures() {
       info("Test attempt to touch a non-existing file");
-      const notExistsFile = OS.Path.join(tmpDir, "test_touch_not_exists.tmp");
+      const tmpDir = await PathUtils.getTempDir();
+      const notExistsFile = PathUtils.join(tmpDir, "test_touch_not_exists.tmp");
 
       await Assert.rejects(
         IOUtils.touch(notExistsFile),
@@ -149,7 +181,7 @@
       );
 
       info("Test attempt to set modification time to Epoch");
-      const tempFileName = OS.Path.join(tmpDir, "test_touch_epoch.tmp");
+      const tempFileName = PathUtils.join(tmpDir, "test_touch_epoch.tmp");
       await createFile(tempFileName);
 
       await Assert.rejects(
diff -Nru firefox-84.0.2+build1/dom/tests/browser/browser_beforeunload_between_chrome_content.js firefox-85.0+build1/dom/tests/browser/browser_beforeunload_between_chrome_content.js
--- firefox-84.0.2+build1/dom/tests/browser/browser_beforeunload_between_chrome_content.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/browser_beforeunload_between_chrome_content.js	2021-01-18 19:58:10.000000000 +0000
@@ -67,7 +67,7 @@
   await injectBeforeUnload(browser);
   // Navigate to a chrome page.
   let dialogShown1 = awaitAndCloseBeforeUnloadDialog(false);
-  await BrowserTestUtils.loadURI(browser, "about:support");
+  BrowserTestUtils.loadURI(browser, "about:support");
   await Promise.all([dialogShown1, BrowserTestUtils.browserLoaded(browser)]);
 
   is(beforeUnloadCount, 1, "Should have received one beforeunload event.");
@@ -122,7 +122,7 @@
 
   // Navigate to a content page.
   let dialogShown1 = awaitAndCloseBeforeUnloadDialog(false);
-  await BrowserTestUtils.loadURI(browser, TEST_URL);
+  BrowserTestUtils.loadURI(browser, TEST_URL);
   await Promise.all([dialogShown1, BrowserTestUtils.browserLoaded(browser)]);
   is(beforeUnloadCount, 1, "Should have received one beforeunload event.");
   ok(browser.isRemoteBrowser, "Browser should be remote.");
diff -Nru firefox-84.0.2+build1/dom/tests/browser/browser_focus_steal_from_chrome.js firefox-85.0+build1/dom/tests/browser/browser_focus_steal_from_chrome.js
--- firefox-84.0.2+build1/dom/tests/browser/browser_focus_steal_from_chrome.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/browser_focus_steal_from_chrome.js	2021-01-18 19:58:10.000000000 +0000
@@ -77,9 +77,9 @@
         fg.focus();
 
         // Load the URIs.
-        await BrowserTestUtils.loadURI(bg, test.uri);
+        BrowserTestUtils.loadURI(bg, test.uri);
         await BrowserTestUtils.browserLoaded(bg);
-        await BrowserTestUtils.loadURI(fg, test.uri);
+        BrowserTestUtils.loadURI(fg, test.uri);
         await BrowserTestUtils.browserLoaded(fg);
 
         ok(true, "Test1: Both of the tabs are loaded");
@@ -146,15 +146,15 @@
         let originalFocus = Services.focus.focusedElement;
 
         // Load about:blank just to make sure that everything works nicely
-        await BrowserTestUtils.loadURI(bg, "about:blank");
+        BrowserTestUtils.loadURI(bg, "about:blank");
         await BrowserTestUtils.browserLoaded(bg);
-        await BrowserTestUtils.loadURI(fg, "about:blank");
+        BrowserTestUtils.loadURI(fg, "about:blank");
         await BrowserTestUtils.browserLoaded(fg);
 
         // Load the URIs.
-        await BrowserTestUtils.loadURI(bg, test.uri);
+        BrowserTestUtils.loadURI(bg, test.uri);
         await BrowserTestUtils.browserLoaded(bg);
-        await BrowserTestUtils.loadURI(fg, test.uri);
+        BrowserTestUtils.loadURI(fg, test.uri);
         await BrowserTestUtils.browserLoaded(fg);
 
         ok(true, "Test2: Both of the tabs are loaded");
diff -Nru firefox-84.0.2+build1/dom/tests/browser/browser.ini firefox-85.0+build1/dom/tests/browser/browser.ini
--- firefox-84.0.2+build1/dom/tests/browser/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -61,7 +61,7 @@
 skip-if = fission || !e10s || (os == "win" && processor == "x86") # Large-Allocation requires non-fission e10s
 [browser_localStorage_e10s.js]
 fail-if = fission
-skip-if = !e10s || verify # This is a test of e10s functionality.
+skip-if = !e10s || verify || tsan # This is a test of e10s functionality. Times out on TSan intermittently.
 [browser_localStorage_privatestorageevent.js]
 [browser_localStorage_snapshotting_e10s.js]
 fail-if = fission
@@ -80,6 +80,8 @@
 [browser_sessionStorage_navigation.js]
 support-files =
   file_empty.html
+  file_coop_coep.html
+  file_coop_coep.html^headers^
 [browser_test_focus_after_modal_state.js]
 skip-if = verify
 support-files =
diff -Nru firefox-84.0.2+build1/dom/tests/browser/browser_sessionStorage_navigation.js firefox-85.0+build1/dom/tests/browser/browser_sessionStorage_navigation.js
--- firefox-84.0.2+build1/dom/tests/browser/browser_sessionStorage_navigation.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/browser_sessionStorage_navigation.js	2021-01-18 19:58:10.000000000 +0000
@@ -6,10 +6,11 @@
 );
 const PATH = DIRPATH + "file_empty.html";
 
-const ORIGIN1 = "http://example.com";
-const ORIGIN2 = "http://example.org";
+const ORIGIN1 = "https://example.com";
+const ORIGIN2 = "https://example.org";
 const URL1 = `${ORIGIN1}/${PATH}`;
 const URL2 = `${ORIGIN2}/${PATH}`;
+const URL1_WITH_COOP_COEP = `${ORIGIN1}/${DIRPATH}file_coop_coep.html`;
 
 add_task(async function() {
   await BrowserTestUtils.withNewTab(URL1, async function(browser) {
@@ -34,8 +35,8 @@
         is(
           value1,
           null,
-          `SessionStroage for ${key} in  ${content.window.origin} is null since` +
-            ` it's the first visit`
+          `SessionStorage for ${key} in ${content.window.origin} is null ` +
+            `since it's the first visit`
         );
 
         content.window.sessionStorage.setItem(key, value);
@@ -44,7 +45,8 @@
         is(
           value2,
           value,
-          `SessionStorage for ${key} in ${content.window.origin} is set correctly`
+          `SessionStorage for ${key} in ${content.window.origin} is set ` +
+            `correctly`
         );
       }
     );
@@ -62,7 +64,7 @@
         is(
           value1,
           null,
-          `SessionStroage for ${key} in ${content.window.origin} is null ` +
+          `SessionStorage for ${key} in ${content.window.origin} is null ` +
             `since it's the first visit`
         );
       }
@@ -116,7 +118,8 @@
             is(
               value1,
               value,
-              `SessionStorage for ${key} in ${content.window.origin} is preserved`
+              `SessionStorage for ${key} in ${content.window.origin} is ` +
+                `preserved`
             );
           }
         );
@@ -164,5 +167,84 @@
         );
       }
     );
+
+    info(
+      `Verifying the sessionStorage for a tab shares between ` +
+        `cross-origin-isolated and non cross-origin-isolated environments`
+    );
+    const anotherKey = `anotherKey`;
+    const anotherValue = `anotherValue;`;
+
+    BrowserTestUtils.loadURI(browser, URL1_WITH_COOP_COEP);
+    await BrowserTestUtils.browserLoaded(browser);
+
+    await SpecialPowers.spawn(
+      browser,
+      [ORIGIN1, key, value, anotherKey, anotherValue],
+      async (ORIGIN, key, value, anotherKey, anotherValue) => {
+        is(content.window.origin, ORIGIN, `Navigate to ${ORIGIN} as expected`);
+        ok(
+          content.window.crossOriginIsolated,
+          `The window is cross-origin-isolated.`
+        );
+
+        let value1 = content.window.sessionStorage.getItem(key);
+        is(
+          value1,
+          value,
+          `SessionStorage for ${key} in ${content.window.origin} was ` +
+            `propagated to COOP+COEP process correctly.`
+        );
+
+        let value2 = content.window.sessionStorage.getItem(anotherKey);
+        is(
+          value2,
+          null,
+          `SessionStorage for ${anotherKey} in ${content.window.origin} ` +
+            `hasn't been set yet.`
+        );
+
+        content.window.sessionStorage.setItem(anotherKey, anotherValue);
+
+        let value3 = content.window.sessionStorage.getItem(anotherKey);
+        is(
+          value3,
+          anotherValue,
+          `SessionStorage for ${anotherKey} in ${content.window.origin} ` +
+            `was set as expected.`
+        );
+      }
+    );
+
+    BrowserTestUtils.loadURI(browser, URL1);
+    await BrowserTestUtils.browserLoaded(browser);
+
+    await SpecialPowers.spawn(
+      browser,
+      [ORIGIN1, key, value, anotherKey, anotherValue],
+      async (ORIGIN, key, value, anotherKey, anotherValue) => {
+        is(content.window.origin, ORIGIN, `Navigate to ${ORIGIN} as expected`);
+        ok(
+          !content.window.crossOriginIsolated,
+          `The window is not cross-origin-isolated.`
+        );
+
+        let value1 = content.window.sessionStorage.getItem(key);
+        is(
+          value1,
+          value,
+          `SessionStorage for ${key} in ${content.window.origin} is ` +
+            `preserved.`
+        );
+
+        let value2 = content.window.sessionStorage.getItem(anotherKey);
+        is(
+          value2,
+          anotherValue,
+          `SessionStorage for ${anotherKey} in ${content.window.origin} was ` +
+            `propagated to non-COOP+COEP process correctly.`
+        );
+      }
+    );
   });
 });
diff -Nru firefox-84.0.2+build1/dom/tests/browser/browser_test_new_window_from_content.js firefox-85.0+build1/dom/tests/browser/browser_test_new_window_from_content.js
--- firefox-84.0.2+build1/dom/tests/browser/browser_test_new_window_from_content.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/browser_test_new_window_from_content.js	2021-01-18 19:58:10.000000000 +0000
@@ -116,7 +116,7 @@
         await BrowserTestUtils.browserLoaded(aBrowser);
         is(aBrowser.currentURI.spec, expectedSpec, "Should be at dummy.html");
         // Now put the browser back where it came from
-        await BrowserTestUtils.loadURI(aBrowser, kContentDoc);
+        BrowserTestUtils.loadURI(aBrowser, kContentDoc);
         await BrowserTestUtils.browserLoaded(aBrowser);
       })();
     case kNewWin:
diff -Nru firefox-84.0.2+build1/dom/tests/browser/file_coop_coep.html^headers^ firefox-85.0+build1/dom/tests/browser/file_coop_coep.html^headers^
--- firefox-84.0.2+build1/dom/tests/browser/file_coop_coep.html^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/dom/tests/browser/file_coop_coep.html^headers^	2021-01-18 19:58:10.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/ajax/mochikit/MochiKit/Signal.js firefox-85.0+build1/dom/tests/mochitest/ajax/mochikit/MochiKit/Signal.js
--- firefox-84.0.2+build1/dom/tests/mochitest/ajax/mochikit/MochiKit/Signal.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/ajax/mochikit/MochiKit/Signal.js	2021-01-18 19:58:10.000000000 +0000
@@ -222,7 +222,7 @@
                 shift+1 kp      33
 
                 Safari key event behavior:
-                (Safari sets charCode and keyCode to something crazy for
+                (Safari sets charCode and keyCode to something weird for
                 special keys.)
                 key     event   charCode    keyCode
                 DOWN    ku,kd   63233       40
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/beacon/test_beaconWithSafelistedContentType.html firefox-85.0+build1/dom/tests/mochitest/beacon/test_beaconWithSafelistedContentType.html
--- firefox-84.0.2+build1/dom/tests/mochitest/beacon/test_beaconWithSafelistedContentType.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/beacon/test_beaconWithSafelistedContentType.html	2021-01-18 19:58:10.000000000 +0000
@@ -60,7 +60,7 @@
       testOnPrivateWindow();
     }, "cookie-changed");
     let testURL = baseURL + "file_beaconSafelist.html";
-    await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, testURL);
+    BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, testURL);
     await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser, false, testURL);
     await SpecialPowers.spawn(win.gBrowser.selectedBrowser, [], async () => {
       await new Promise((resolve, reject) => {
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/bugs/mochitest.ini firefox-85.0+build1/dom/tests/mochitest/bugs/mochitest.ini
--- firefox-84.0.2+build1/dom/tests/mochitest/bugs/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/bugs/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -73,9 +73,6 @@
 [test_bug404748.html]
 [test_bug414291.html]
 tags = openwindow
-[test_bug427744.html]
-skip-if = toolkit == 'android' || (processor == 'aarch64' && os == 'win')
-reason = Plugins are not supported on Android and Windows/AArch64
 [test_bug42976.html]
 [test_bug430276.html]
 [test_bug440572.html]
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/bugs/test_bug427744.html firefox-85.0+build1/dom/tests/mochitest/bugs/test_bug427744.html
--- firefox-84.0.2+build1/dom/tests/mochitest/bugs/test_bug427744.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/bugs/test_bug427744.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=427744
--->
-<head>
-  <title>Test for Bug 427744</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=427744">Mozilla Bug 427744</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 427744 **/
-
-var firstPlugin = navigator.plugins["Test Plug-in"];
-ok(firstPlugin, "Should have seen the test plugin");
-is(firstPlugin.version, "1.0.0.0", "Should have seen the right test plugin version");
-
-var secondPlugin = navigator.plugins["Second Test Plug-in"];
-ok(secondPlugin, "Should have seen the second test plugin");
-is(secondPlugin.version, "1.0.0.0", "Should have seen the right second test plugin version");
-
-</script>
-</pre>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/chrome/489127.html firefox-85.0+build1/dom/tests/mochitest/chrome/489127.html
--- firefox-84.0.2+build1/dom/tests/mochitest/chrome/489127.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/chrome/489127.html	2021-01-18 19:58:10.000000000 +0000
@@ -13,8 +13,8 @@
 
   let dwu = window.windowUtils;
 
-  function check(x, y, top, right, bottom, left, onlyVisible, list, aListIsComplete) {
-    let nodes = dwu.nodesFromRect(x, y, top, right, bottom, left, true, false, onlyVisible);
+  function check(x, y, top, right, bottom, left, onlyVisible, list, aListIsComplete = false, aOpacityThreshold = 1.0) {
+    let nodes = dwu.nodesFromRect(x, y, top, right, bottom, left, /* aIgnoreRootScrollFrame = */ true, /* aFlushLayout = */ true, onlyVisible, aOpacityThreshold);
 
     if (!aListIsComplete) {
       list.push(e.body);
@@ -118,7 +118,23 @@
 
       let [x, y] = getCenterFor(container);
       check(x, y, 1, 1, 1, 1, false, [fg, bg, container]);
-      check(x, y, 1, 1, 1, 1, true, [fg], true);
+
+      const kListIsComplete = true;
+
+      check(x, y, 1, 1, 1, 1, true, [fg], kListIsComplete);
+      check(x, y, 1, 1, 1, 1, true, [fg], kListIsComplete, 0.5);
+
+      // Occluded with different opacity thresholds, with background colors and
+      // opacity.
+      fg.style.backgroundColor = "rgba(0, 255, 0, 0.5)";
+      check(x, y, 1, 1, 1, 1, true, [fg], kListIsComplete, 0.4);
+      check(x, y, 1, 1, 1, 1, true, [fg, bg], kListIsComplete, 0.6);
+
+      fg.style.backgroundColor = "";
+      fg.style.opacity = "0.5";
+
+      check(x, y, 1, 1, 1, 1, true, [fg], kListIsComplete, 0.4);
+      check(x, y, 1, 1, 1, 1, true, [fg, bg], kListIsComplete, 0.6);
     }
 
     done();
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/chrome/test_intlUtils_getLocaleInfo.html firefox-85.0+build1/dom/tests/mochitest/chrome/test_intlUtils_getLocaleInfo.html
--- firefox-84.0.2+build1/dom/tests/mochitest/chrome/test_intlUtils_getLocaleInfo.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/chrome/test_intlUtils_getLocaleInfo.html	2021-01-18 19:58:11.000000000 +0000
@@ -18,8 +18,7 @@
   Cc["@mozilla.org/intl/localeservice;1"].getService(Ci.mozILocaleService);
 const mozIntl = Cc["@mozilla.org/mozintl;1"].getService(Ci.mozIMozIntl);
 
-let rpLocale = localeService.negotiateLanguages(localeService.regionalPrefsLocales,
-                                                localeService.availableLocales)[0];
+let rpLocale = localeService.regionalPrefsLocales[0];
 
 let testData = [
   {
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/chrome/window_focus.xhtml firefox-85.0+build1/dom/tests/mochitest/chrome/window_focus.xhtml
--- firefox-84.0.2+build1/dom/tests/mochitest/chrome/window_focus.xhtml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/chrome/window_focus.xhtml	2021-01-18 19:58:10.000000000 +0000
@@ -433,7 +433,7 @@
   expectFocusShift(() => t19.select(),
                    null, getById("t" + 19), true, "input.select()");
   t19.removeEventListener("select", selectListener, false);
-  ok(selectFired, "select event fires for input");
+  ok(!selectFired, "select event does not fire asynchronously for input");
 
   // mouse clicking
   gLastFocusMethod = fm.FLAG_BYMOUSE;
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html
--- firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_extensions_iframe.html	2021-01-18 19:58:11.000000000 +0000
@@ -121,9 +121,7 @@
 }
 
 function setFrameVisible(f, visible) {
-  var Ci = SpecialPowers.Ci;
-  var docshell = SpecialPowers.wrap(f.contentWindow).docShell;
-  docshell.isActive = visible;
+  SpecialPowers.wrap(f.contentWindow).browsingContext.isActive = visible;
 }
 
 function haptictest() {
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html
--- firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_frame_state_sync_iframe.html	2021-01-18 19:58:11.000000000 +0000
@@ -18,9 +18,7 @@
 var index;
 
 function setFrameVisible(f, visible) {
-  var Ci = SpecialPowers.Ci;
-  var docshell = SpecialPowers.wrap(f.contentWindow).docShell;
-  docshell.isActive = visible;
+  SpecialPowers.wrap(f.contentWindow).browsingContext.isActive = visible;
 }
 
 var frames_loaded = 0;
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html
--- firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_hidden_frame_iframe.html	2021-01-18 19:58:10.000000000 +0000
@@ -25,9 +25,7 @@
 }
 
 function setFrameVisible(f, visible) {
-  var Ci = SpecialPowers.Ci;
-  var docshell = SpecialPowers.wrap(f.contentWindow).docShell;
-  docshell.isActive = visible;
+  SpecialPowers.wrap(f.contentWindow).browsingContext.isActive = visible;
 }
 
 var frames_loaded = 0;
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html
--- firefox-84.0.2+build1/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/gamepad/test_gamepad_multitouch_crossorigin_iframe.html	2021-01-18 19:58:10.000000000 +0000
@@ -111,9 +111,7 @@
 }
 
 function setFrameVisible(f, visible) {
-  let Ci = SpecialPowers.Ci;
-  let docshell = SpecialPowers.wrap(f.contentWindow).docShell;
-  docshell.isActive = visible;
+  SpecialPowers.wrap(f.contentWindow).browsingContext.isActive = visible;
 }
 
 function touchAdd() {
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/general/test_interfaces.js firefox-85.0+build1/dom/tests/mochitest/general/test_interfaces.js
--- firefox-84.0.2+build1/dom/tests/mochitest/general/test_interfaces.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/general/test_interfaces.js	2021-01-18 19:58:11.000000000 +0000
@@ -517,8 +517,6 @@
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "HTMLMenuElement", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
-  { name: "HTMLMenuItemElement", insecureContext: true },
-  // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "HTMLMetaElement", insecureContext: true },
   // IMPORTANT: Do not change this list without review from a DOM peer!
   { name: "HTMLMeterElement", insecureContext: true },
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuota.html firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuota.html
--- firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuota.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuota.html	2021-01-18 19:58:11.000000000 +0000
@@ -117,7 +117,7 @@
 function startTest() {
   // Initialy setup the quota to testing value of 1024B and
   // set a 500 bytes key with name length 1 (allocate 501 bytes)
-  SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, doNextTest);
+  SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["dom.storage.default_site_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, doNextTest);
 }
 </script>
 
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html
--- firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaPrivateBrowsing_perwindowpb.html	2021-01-18 19:58:11.000000000 +0000
@@ -14,8 +14,10 @@
 const slavePath = "/chrome/dom/tests/mochitest/localstorage/";
 var currentTest = 1;
 var quota = Services.prefs.getIntPref("dom.storage.default_quota", 5 * 1024);
+var siteQuota = Services.prefs.getIntPref("dom.storage.default_site_quota", 25 * 1024);
 Services.prefs.setIntPref("browser.startup.page", 0);
 Services.prefs.setIntPref("dom.storage.default_quota", 1);
+Services.prefs.setIntPref("dom.storage.default_site_quota", 1);
 
 var slaveLoadsPending = 1;
 var slaveOrigin = "";
@@ -128,6 +130,7 @@
     default:
       Services.prefs.clearUserPref("browser.startup.page")
       Services.prefs.setIntPref("dom.storage.default_quota", quota);
+      Services.prefs.setIntPref("dom.storage.default_site_quota", siteQuota);
       aWindow.close();
       SimpleTest.finish();
   }
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html
--- firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html	2021-01-18 19:58:10.000000000 +0000
@@ -84,7 +84,7 @@
 function startTest() {
   // Initialy setup the quota to testing value of 1024B and
   // set a 500 bytes key with name length 1 (allocate 501 bytes)
-  SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, function() {
+  SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["dom.storage.default_site_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, function() {
       SpecialPowers.pushPermissions([{'type': 'cookie', 'allow': SpecialPowers.Ci.nsICookiePermission.ACCESS_SESSION, 'context': document}], doNextTest);
   });
 }
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html
--- firefox-84.0.2+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly.html	2021-01-18 19:58:10.000000000 +0000
@@ -121,7 +121,7 @@
   ], function() {
     // Initialy setup the quota to testing value of 1024B and
     // set a 500 bytes key with name length 1 (allocate 501 bytes)
-    SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, doNextTest);
+    SpecialPowers.pushPrefEnv({"set": [["dom.storage.default_quota", 1], ["dom.storage.default_site_quota", 1], ["security.mixed_content.block_display_content", false], ["security.mixed_content.block_active_content", false]]}, doNextTest);
   });
 }
 </script>
diff -Nru firefox-84.0.2+build1/dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js firefox-85.0+build1/dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js
--- firefox-84.0.2+build1/dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js	2021-01-18 19:58:11.000000000 +0000
@@ -72,7 +72,6 @@
   ["mark", ""],
   ["marquee", "Marquee"],
   ["menu", "Menu"],
-  ["menuitem", "MenuItem"],
   ["meta", "Meta"],
   ["meter", "Meter"],
   ["nav", ""],
diff -Nru firefox-84.0.2+build1/dom/u2f/tests/browser/browser.ini firefox-85.0+build1/dom/u2f/tests/browser/browser.ini
--- firefox-84.0.2+build1/dom/u2f/tests/browser/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/u2f/tests/browser/browser.ini	2021-01-18 19:58:11.000000000 +0000
@@ -2,7 +2,9 @@
 support-files =
   head.js
   tab_u2f_result.html
-skip-if = !e10s
+skip-if =
+  !e10s
+  os == 'win' && version == '18362'  # win10-1903+ - test not relevant on 1903
 
 [browser_abort_visibility.js]
 [browser_appid_localhost.js]
diff -Nru firefox-84.0.2+build1/dom/u2f/tests/frame_appid_facet.html firefox-85.0+build1/dom/u2f/tests/frame_appid_facet.html
--- firefox-84.0.2+build1/dom/u2f/tests/frame_appid_facet.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/u2f/tests/frame_appid_facet.html	2021-01-18 19:58:10.000000000 +0000
@@ -66,7 +66,7 @@
   });
 
   // Test: TLD
-  await promiseU2FRegister("https://com/crazyAppID", [{
+  await promiseU2FRegister("https://com/weirdAppID", [{
       version,
       challenge: bytesToBase64UrlSafe(challenge),
     }], [], function(res){
diff -Nru firefox-84.0.2+build1/dom/u2f/U2F.cpp firefox-85.0+build1/dom/u2f/U2F.cpp
--- firefox-84.0.2+build1/dom/u2f/U2F.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/u2f/U2F.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/WebCryptoCommon.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/BackgroundChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/WebAuthnTransactionChild.h"
 #include "mozilla/dom/WebAuthnUtil.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/dom/u2f/U2F.h firefox-85.0+build1/dom/u2f/U2F.h
--- firefox-84.0.2+build1/dom/u2f/U2F.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/u2f/U2F.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,14 +13,19 @@
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/U2FBinding.h"
 #include "mozilla/dom/WebAuthnManagerBase.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
 #include "nsProxyRelease.h"
 #include "nsWrapperCache.h"
 #include "U2FAuthenticator.h"
 
+// XXX(Bug 1674080) Remove this and let Codegen.py generate it in U2FBinding.cpp
+// instead.
+#include "mozilla/dom/Document.h"
+
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class WebAuthnMakeCredentialResult;
diff -Nru firefox-84.0.2+build1/dom/url/tests/test_url.html firefox-85.0+build1/dom/url/tests/test_url.html
--- firefox-84.0.2+build1/dom/url/tests/test_url.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/url/tests/test_url.html	2021-01-18 19:58:11.000000000 +0000
@@ -487,5 +487,15 @@
     is(u.toJSON(), "http://www.example.org/", "URL.toJSON()");
     is(JSON.stringify(u), "\"http://www.example.org/\"", "JSON.stringify(u) works");
   </script>
+
+  <script>
+    // bug 1648493
+    var url = new URL("http://example.com/");
+    url.protocol = 'file'
+    url.protocol = 'resource'
+    url.password = 'ê'
+    url.username = 'ç'
+    url.protocol = 't'
+  </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/dom/url/URLMainThread.cpp firefox-85.0+build1/dom/url/URLMainThread.cpp
--- firefox-84.0.2+build1/dom/url/URLMainThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/url/URLMainThread.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/url/URLSearchParams.cpp firefox-85.0+build1/dom/url/URLSearchParams.cpp
--- firefox-84.0.2+build1/dom/url/URLSearchParams.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/url/URLSearchParams.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,12 +4,34 @@
  * 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 "URLSearchParams.h"
+#include "mozilla/dom/URLSearchParams.h"
+
+// XXX encoding_rs.h is not self-contained, this order is required
+#include "mozilla/Encoding.h"
+#include "encoding_rs.h"
+
+#include <new>
+#include <type_traits>
+#include <utility>
+#include "js/StructuredClone.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/Record.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/dom/URLSearchParamsBinding.h"
-#include "mozilla/Encoding.h"
+#include "mozilla/fallible.h"
 #include "nsDOMString.h"
-#include "nsIInputStream.h"
+#include "nsError.h"
+#include "nsIGlobalObject.h"
+#include "nsLiteralString.h"
+#include "nsPrintfCString.h"
+#include "nsString.h"
+#include "nsStringFlags.h"
+#include "nsStringIterator.h"
 #include "nsStringStream.h"
 #include "nsURLHelper.h"
 
diff -Nru firefox-84.0.2+build1/dom/url/URLSearchParams.h firefox-85.0+build1/dom/url/URLSearchParams.h
--- firefox-84.0.2+build1/dom/url/URLSearchParams.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/url/URLSearchParams.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,21 +7,35 @@
 #ifndef mozilla_dom_URLSearchParams_h
 #define mozilla_dom_URLSearchParams_h
 
-#include "js/StructuredClone.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
+#include <cstdint>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsWrapperCache.h"
 #include "nsISupports.h"
-#include "nsIInputStream.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
 
+class JSObject;
 class nsIGlobalObject;
+class nsIInputStream;
+struct JSContext;
+struct JSStructuredCloneReader;
+struct JSStructuredCloneWriter;
 
 namespace mozilla {
+
+class ErrorResult;
 class URLParams;
 
 namespace dom {
 
+class GlobalObject;
 class URLSearchParams;
 class USVStringSequenceSequenceOrUSVStringUSVStringRecordOrUSVString;
 
diff -Nru firefox-84.0.2+build1/dom/url/URLWorker.cpp firefox-85.0+build1/dom/url/URLWorker.cpp
--- firefox-84.0.2+build1/dom/url/URLWorker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/url/URLWorker.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "URLWorker.h"
 
 #include "mozilla/dom/Blob.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
diff -Nru firefox-84.0.2+build1/dom/vr/VRDisplay.cpp firefox-85.0+build1/dom/vr/VRDisplay.cpp
--- firefox-84.0.2+build1/dom/vr/VRDisplay.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/VRDisplay.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,8 @@
 #include "mozilla/dom/VRDisplayBinding.h"
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Base64.h"
+#include "mozilla/ProfilerMarkers.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/gfx/DataSurfaceHelpers.h"
 #include "Navigator.h"
diff -Nru firefox-84.0.2+build1/dom/vr/VRDisplay.h firefox-85.0+build1/dom/vr/VRDisplay.h
--- firefox-84.0.2+build1/dom/vr/VRDisplay.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/VRDisplay.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include <stdint.h>
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/dom/VRDisplayBinding.h"
 #include "mozilla/DOMEventTargetHelper.h"
@@ -25,6 +24,8 @@
 #include "gfxVR.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace gfx {
 class VRDisplayClient;
 class VRDisplayPresentation;
diff -Nru firefox-84.0.2+build1/dom/vr/VRServiceTest.h firefox-85.0+build1/dom/vr/VRServiceTest.h
--- firefox-84.0.2+build1/dom/vr/VRServiceTest.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/VRServiceTest.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_VRServiceTest_h_
 
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/dom/TypedArray.h"
 #include "mozilla/dom/VRServiceTestBinding.h"
 
 #include "gfxVR.h"
diff -Nru firefox-84.0.2+build1/dom/vr/XRInputSource.cpp firefox-85.0+build1/dom/vr/XRInputSource.cpp
--- firefox-84.0.2+build1/dom/vr/XRInputSource.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRInputSource.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "XRInputSpace.h"
 #include "VRDisplayClient.h"
 
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/Gamepad.h"
 #include "mozilla/dom/GamepadManager.h"
 
diff -Nru firefox-84.0.2+build1/dom/vr/XRPermissionRequest.cpp firefox-85.0+build1/dom/vr/XRPermissionRequest.cpp
--- firefox-84.0.2+build1/dom/vr/XRPermissionRequest.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRPermissionRequest.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "XRPermissionRequest.h"
 #include "nsGlobalWindowInner.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/Preferences.h"
 #include "nsContentUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/vr/XRRigidTransform.cpp firefox-85.0+build1/dom/vr/XRRigidTransform.cpp
--- firefox-84.0.2+build1/dom/vr/XRRigidTransform.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRRigidTransform.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/DOMPoint.h"
 #include "mozilla/dom/Pose.h"
 #include "mozilla/dom/DOMPointBinding.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/vr/XRSession.cpp firefox-85.0+build1/dom/vr/XRSession.cpp
--- firefox-84.0.2+build1/dom/vr/XRSession.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRSession.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/XRInputSourceEvent.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/Promise.h"
 #include "XRSystem.h"
 #include "XRRenderState.h"
 #include "XRBoundedReferenceSpace.h"
diff -Nru firefox-84.0.2+build1/dom/vr/XRSystem.cpp firefox-85.0+build1/dom/vr/XRSystem.cpp
--- firefox-84.0.2+build1/dom/vr/XRSystem.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRSystem.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,9 +5,12 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/XRSystem.h"
+
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/XRPermissionRequest.h"
 #include "mozilla/dom/XRSession.h"
 #include "mozilla/dom/BindingCallContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/PermissionMessageUtils.h"
diff -Nru firefox-84.0.2+build1/dom/vr/XRView.cpp firefox-85.0+build1/dom/vr/XRView.cpp
--- firefox-84.0.2+build1/dom/vr/XRView.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/vr/XRView.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/XRView.h"
+
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/XRRigidTransform.h"
 #include "mozilla/dom/Pose.h"
 
diff -Nru firefox-84.0.2+build1/dom/webauthn/AuthenticatorAssertionResponse.h firefox-85.0+build1/dom/webauthn/AuthenticatorAssertionResponse.h
--- firefox-84.0.2+build1/dom/webauthn/AuthenticatorAssertionResponse.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/AuthenticatorAssertionResponse.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AuthenticatorResponse.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CryptoBuffer.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/AuthenticatorAttestationResponse.cpp firefox-85.0+build1/dom/webauthn/AuthenticatorAttestationResponse.cpp
--- firefox-84.0.2+build1/dom/webauthn/AuthenticatorAttestationResponse.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/AuthenticatorAttestationResponse.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,8 @@
 #include "mozilla/dom/WebAuthenticationBinding.h"
 #include "mozilla/dom/AuthenticatorAttestationResponse.h"
 
+#include "mozilla/HoldDropJSObjects.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/webauthn/AuthenticatorAttestationResponse.h firefox-85.0+build1/dom/webauthn/AuthenticatorAttestationResponse.h
--- firefox-84.0.2+build1/dom/webauthn/AuthenticatorAttestationResponse.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/AuthenticatorAttestationResponse.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/AuthenticatorResponse.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CryptoBuffer.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/AuthenticatorResponse.cpp firefox-85.0+build1/dom/webauthn/AuthenticatorResponse.cpp
--- firefox-84.0.2+build1/dom/webauthn/AuthenticatorResponse.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/AuthenticatorResponse.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "mozilla/dom/AuthenticatorResponse.h"
 
+#include "nsPIDOMWindow.h"
+
 namespace mozilla {
 namespace dom {
 
@@ -42,6 +44,8 @@
   // Call DropJSObjects() in subclasses.
 }
 
+nsISupports* AuthenticatorResponse::GetParentObject() const { return mParent; }
+
 void AuthenticatorResponse::GetClientDataJSON(
     JSContext* aCx, JS::MutableHandle<JSObject*> aRetVal) {
   if (!mClientDataJSONCachedObj) {
diff -Nru firefox-84.0.2+build1/dom/webauthn/AuthenticatorResponse.h firefox-85.0+build1/dom/webauthn/AuthenticatorResponse.h
--- firefox-84.0.2+build1/dom/webauthn/AuthenticatorResponse.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/AuthenticatorResponse.h	2021-01-18 19:58:10.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CryptoBuffer.h"
 #include "nsCycleCollectionParticipant.h"
@@ -31,7 +30,7 @@
   virtual ~AuthenticatorResponse();
 
  public:
-  nsISupports* GetParentObject() const { return mParent; }
+  nsISupports* GetParentObject() const;
 
   void GetFormat(nsString& aRetVal) const;
 
diff -Nru firefox-84.0.2+build1/dom/webauthn/libudev-sys/Cargo.toml firefox-85.0+build1/dom/webauthn/libudev-sys/Cargo.toml
--- firefox-84.0.2+build1/dom/webauthn/libudev-sys/Cargo.toml	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/libudev-sys/Cargo.toml	2021-01-18 19:58:10.000000000 +0000
@@ -1,3 +1,31 @@
+# This is a fork of libudev-sys that dynamically loads its symbols with
+# dlopen when they are first used. This continues a precedent established
+# by Firefox's gamepad APIs to minimize the footprint of features when they
+# aren't being used. Specifically, this avoids the cost of dynamically linking
+# in libudev at process startup.
+#
+# "-sys" crates are a convention in the rust ecosystem for "a simple header
+# for a C library that Rust code can use to build a richer and safer API on
+# top of". In this case, libudev-sys is used by the [libudev crate].
+#
+# As of this writing, this hack is being used by the [authenticator-rs] crate,
+# which uses the libudev crate.
+#
+# The libudev crate assumes libudev is being dynamically linked in, and
+# checks if its symbols are null before intializing anything else, so that
+# you can use it to detect if libudev is installed and gracefully
+# disable gamepads or whatever else if it's not.
+#
+# If we're missing any symbols the libudev crate needs, then rust will give
+# us a compilation error. It's not a problem if we export additional symbols.
+#
+# So while this is a bit of a weird hack, it works pretty robustly, and this
+# crate is basically just a header for libudev so it's not a particularly
+# significant maintenance burden.
+#
+# authenticator-rs: https://github.com/mozilla/authenticator-rs
+# libudev crate: https://crates.io/crates/libudev
+
 [package]
 name = "libudev-sys"
 version = "0.1.3"
diff -Nru firefox-84.0.2+build1/dom/webauthn/PublicKeyCredential.cpp firefox-85.0+build1/dom/webauthn/PublicKeyCredential.cpp
--- firefox-84.0.2+build1/dom/webauthn/PublicKeyCredential.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/PublicKeyCredential.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/WebAuthenticationBinding.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/dom/AuthenticatorResponse.h"
+#include "mozilla/HoldDropJSObjects.h"
 
 #ifdef OS_WIN
 #  include "WinWebAuthnManager.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/PublicKeyCredential.h firefox-85.0+build1/dom/webauthn/PublicKeyCredential.h
--- firefox-84.0.2+build1/dom/webauthn/PublicKeyCredential.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/PublicKeyCredential.h	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Credential.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/CryptoBuffer.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/tests/browser/browser_abort_visibility.js firefox-85.0+build1/dom/webauthn/tests/browser/browser_abort_visibility.js
--- firefox-84.0.2+build1/dom/webauthn/tests/browser/browser_abort_visibility.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/tests/browser/browser_abort_visibility.js	2021-01-18 19:58:11.000000000 +0000
@@ -13,7 +13,7 @@
     [],
     async function() {
       info("visbility state: " + content.document.visibilityState);
-      info("docshell active: " + docShell.isActive);
+      info("active: " + content.browsingContext.isActive);
       return content.document.getElementById("status").value;
     }
   );
@@ -32,7 +32,12 @@
           ", visbility state: " +
           content.document.visibilityState
       );
-      info("expecting " + expected + ", docshell active: " + docShell.isActive);
+      info(
+        "expecting " +
+          expected +
+          ", active: " +
+          content.browsingContext.isActive
+      );
       return content.document.getElementById("status").value == expected;
     });
   });
diff -Nru firefox-84.0.2+build1/dom/webauthn/tests/browser/browser.ini firefox-85.0+build1/dom/webauthn/tests/browser/browser.ini
--- firefox-84.0.2+build1/dom/webauthn/tests/browser/browser.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/tests/browser/browser.ini	2021-01-18 19:58:10.000000000 +0000
@@ -8,7 +8,15 @@
 skip-if = !e10s
 
 [browser_abort_visibility.js]
+skip-if =
+  os == 'win' && version == '18362'  # win10-1903+ - test not relevant on 1903
 [browser_fido_appid_extension.js]
+skip-if =
+  os == 'win' && version == '18362'  # win10-1903+ - test not relevant on 1903
 [browser_webauthn_prompts.js]
+skip-if =
+  os == 'win' && version == '18362'  # win10-1903+ - test not relevant on 1903
 [browser_webauthn_telemetry.js]
+skip-if =
+  os == 'win' && version == '18362'  # win10-1903+ - test not relevant on 1903
 [browser_webauthn_ipaddress.js]
diff -Nru firefox-84.0.2+build1/dom/webauthn/U2FSoftTokenManager.cpp firefox-85.0+build1/dom/webauthn/U2FSoftTokenManager.cpp
--- firefox-84.0.2+build1/dom/webauthn/U2FSoftTokenManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/U2FSoftTokenManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "CryptoBuffer.h"
 #include "mozilla/Base64.h"
 #include "mozilla/Casting.h"
+#include "mozilla/Preferences.h"
 #include "nsNSSComponent.h"
 #include "nsThreadUtils.h"
 #include "pk11pub.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/U2FTokenManager.cpp firefox-85.0+build1/dom/webauthn/U2FTokenManager.cpp
--- firefox-84.0.2+build1/dom/webauthn/U2FTokenManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/U2FTokenManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -13,7 +13,12 @@
 #include "mozilla/dom/WebAuthnUtil.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/Unused.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsIThread.h"
 #include "nsTextFormatter.h"
 #include "mozilla/Telemetry.h"
 
diff -Nru firefox-84.0.2+build1/dom/webauthn/U2FTokenTransport.h firefox-85.0+build1/dom/webauthn/U2FTokenTransport.h
--- firefox-84.0.2+build1/dom/webauthn/U2FTokenTransport.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/U2FTokenTransport.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_dom_U2FTokenTransport_h
 
 #include "mozilla/dom/PWebAuthnTransaction.h"
+#include "mozilla/MozPromise.h"
 
 /*
  * Abstract class representing a transport manager for U2F Keys (software,
diff -Nru firefox-84.0.2+build1/dom/webauthn/WebAuthnManagerBase.cpp firefox-85.0+build1/dom/webauthn/WebAuthnManagerBase.cpp
--- firefox-84.0.2+build1/dom/webauthn/WebAuthnManagerBase.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/WebAuthnManagerBase.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/WebAuthnManagerBase.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/WebAuthnTransactionChild.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/WebAuthnManager.cpp firefox-85.0+build1/dom/webauthn/WebAuthnManager.cpp
--- firefox-84.0.2+build1/dom/webauthn/WebAuthnManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/WebAuthnManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsIURIMutator.h"
 #include "nsThreadUtils.h"
 #include "WebAuthnCoseIdentifiers.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/AuthenticatorAssertionResponse.h"
 #include "mozilla/dom/AuthenticatorAttestationResponse.h"
 #include "mozilla/dom/PublicKeyCredential.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/WebAuthnUtil.cpp firefox-85.0+build1/dom/webauthn/WebAuthnUtil.cpp
--- firefox-84.0.2+build1/dom/webauthn/WebAuthnUtil.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/WebAuthnUtil.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "mozilla/dom/WebAuthnUtil.h"
 #include "mozilla/dom/WebAuthnCBORUtil.h"
+#include "nsComponentManagerUtils.h"
+#include "nsICryptoHash.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsNetUtil.h"
 #include "mozpkix/pkixutil.h"
diff -Nru firefox-84.0.2+build1/dom/webauthn/WebAuthnUtil.h firefox-85.0+build1/dom/webauthn/WebAuthnUtil.h
--- firefox-84.0.2+build1/dom/webauthn/WebAuthnUtil.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webauthn/WebAuthnUtil.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,7 @@
  * Utility functions used by both WebAuthnManager and U2FTokenManager.
  */
 
+#include "ipc/EnumSerializer.h"
 #include "mozilla/dom/CryptoBuffer.h"
 #include "mozilla/dom/WebAuthenticationBinding.h"
 #include "ipc/IPCMessageUtils.h"
diff -Nru firefox-84.0.2+build1/dom/webbrowserpersist/nsWebBrowserPersist.cpp firefox-85.0+build1/dom/webbrowserpersist/nsWebBrowserPersist.cpp
--- firefox-84.0.2+build1/dom/webbrowserpersist/nsWebBrowserPersist.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webbrowserpersist/nsWebBrowserPersist.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -1713,6 +1713,11 @@
     nsIWebBrowserPersistDocument* aDoc, BrowsingContext* aContext) {
   RefPtr<dom::CanonicalBrowsingContext> context = aContext->Canonical();
 
+  if (NS_WARN_IF(!context->GetCurrentWindowGlobal())) {
+    EndVisit(nullptr, NS_ERROR_FAILURE);
+    return NS_ERROR_FAILURE;
+  }
+
   UniquePtr<WebBrowserPersistDocumentParent> actor(
       new WebBrowserPersistDocumentParent());
 
diff -Nru firefox-84.0.2+build1/dom/webbrowserpersist/nsWebBrowserPersist.h firefox-85.0+build1/dom/webbrowserpersist/nsWebBrowserPersist.h
--- firefox-84.0.2+build1/dom/webbrowserpersist/nsWebBrowserPersist.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webbrowserpersist/nsWebBrowserPersist.h	2021-01-18 19:58:11.000000000 +0000
@@ -23,6 +23,8 @@
 #include "nsIWebBrowserPersist.h"
 #include "nsIWebBrowserPersistDocument.h"
 
+#include "mozilla/MozPromise.h"
+#include "mozilla/Mutex.h"
 #include "mozilla/UniquePtr.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
diff -Nru firefox-84.0.2+build1/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl firefox-85.0+build1/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
--- firefox-84.0.2+build1/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -14,7 +14,9 @@
 include IPCStream;
 include NeckoChannelParams;
 
-using refcounted class nsIReferrerInfo from "mozilla/dom/ReferrerInfoUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
+
+using refcounted class nsIReferrerInfo from "nsIReferrerInfo.h";
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp firefox-85.0+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
--- firefox-84.0.2+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -34,6 +34,7 @@
 #include "nsFrameLoader.h"
 #include "nsGlobalWindowOuter.h"
 #include "nsIContent.h"
+#include "nsICookieJarSettings.h"
 #include "nsIDOMWindowUtils.h"
 #include "mozilla/dom/Document.h"
 #include "nsIDocumentEncoder.h"
diff -Nru firefox-84.0.2+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.h firefox-85.0+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.h
--- firefox-84.0.2+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webbrowserpersist/WebBrowserPersistLocalDocument.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,9 +7,9 @@
 #ifndef WebBrowserPersistLocalDocument_h__
 #define WebBrowserPersistLocalDocument_h__
 
+#include "mozilla/NotNull.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
-#include "mozilla/dom/Document.h"
 #include "nsIURI.h"
 #include "nsIWebBrowserPersistDocument.h"
 
@@ -18,6 +18,10 @@
 
 namespace mozilla {
 
+namespace dom {
+class Document;
+}
+
 class WebBrowserPersistLocalDocument final
     : public nsIWebBrowserPersistDocument {
  public:
diff -Nru firefox-84.0.2+build1/dom/webgpu/Adapter.h firefox-85.0+build1/dom/webgpu/Adapter.h
--- firefox-84.0.2+build1/dom/webgpu/Adapter.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Adapter.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "ObjectModel.h"
 
 namespace mozilla {
+class ErrorResult;
 namespace dom {
 class Promise;
 struct GPUDeviceDescriptor;
diff -Nru firefox-84.0.2+build1/dom/webgpu/BindGroup.cpp firefox-85.0+build1/dom/webgpu/BindGroup.cpp
--- firefox-84.0.2+build1/dom/webgpu/BindGroup.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/BindGroup.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "BindGroup.h"
+#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/BindGroupLayout.cpp firefox-85.0+build1/dom/webgpu/BindGroupLayout.cpp
--- firefox-84.0.2+build1/dom/webgpu/BindGroupLayout.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/BindGroupLayout.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "BindGroupLayout.h"
+#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/Buffer.cpp firefox-85.0+build1/dom/webgpu/Buffer.cpp
--- firefox-84.0.2+build1/dom/webgpu/Buffer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Buffer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,8 +6,11 @@
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Buffer.h"
 
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/ipc/Shmem.h"
+#include "ipc/WebGPUChild.h"
 #include "js/RootingAPI.h"
 #include "nsContentUtils.h"
 #include "nsWrapperCache.h"
diff -Nru firefox-84.0.2+build1/dom/webgpu/CanvasContext.cpp firefox-85.0+build1/dom/webgpu/CanvasContext.cpp
--- firefox-84.0.2+build1/dom/webgpu/CanvasContext.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/CanvasContext.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/layers/CompositorManagerChild.h"
 #include "mozilla/layers/RenderRootStateManager.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
+#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/CommandBuffer.cpp firefox-85.0+build1/dom/webgpu/CommandBuffer.cpp
--- firefox-84.0.2+build1/dom/webgpu/CommandBuffer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/CommandBuffer.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "CommandBuffer.h"
+#include "ipc/WebGPUChild.h"
 
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "Device.h"
diff -Nru firefox-84.0.2+build1/dom/webgpu/CommandBuffer.h firefox-85.0+build1/dom/webgpu/CommandBuffer.h
--- firefox-84.0.2+build1/dom/webgpu/CommandBuffer.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/CommandBuffer.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef GPU_CommandBuffer_H_
 #define GPU_CommandBuffer_H_
 
+#include "mozilla/WeakPtr.h"
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/CommandEncoder.cpp firefox-85.0+build1/dom/webgpu/CommandEncoder.cpp
--- firefox-84.0.2+build1/dom/webgpu/CommandEncoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/CommandEncoder.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,9 @@
 #include "ComputePassEncoder.h"
 #include "Device.h"
 #include "RenderPassEncoder.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/webgpu/ffi/wgpu.h"
+#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/CommandEncoder.h firefox-85.0+build1/dom/webgpu/CommandEncoder.h
--- firefox-84.0.2+build1/dom/webgpu/CommandEncoder.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/CommandEncoder.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,12 +7,16 @@
 #define GPU_CommandEncoder_H_
 
 #include "mozilla/dom/TypedArray.h"
+#include "mozilla/WeakPtr.h"
 #include "mozilla/webgpu/WebGPUTypes.h"
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
 
 namespace mozilla {
 namespace dom {
+struct GPUComputePassDescriptor;
+struct GPUTextureDataLayout;
+class HTMLCanvasElement;
 template <typename T>
 class Sequence;
 class GPUComputePipelineOrGPURenderPipeline;
diff -Nru firefox-84.0.2+build1/dom/webgpu/ComputePassEncoder.cpp firefox-85.0+build1/dom/webgpu/ComputePassEncoder.cpp
--- firefox-84.0.2+build1/dom/webgpu/ComputePassEncoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ComputePassEncoder.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "ComputePassEncoder.h"
 #include "BindGroup.h"
 #include "ComputePipeline.h"
+#include "CommandEncoder.h"
 
 #include "mozilla/webgpu/ffi/wgpu.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/ComputePipeline.cpp firefox-85.0+build1/dom/webgpu/ComputePipeline.cpp
--- firefox-84.0.2+build1/dom/webgpu/ComputePipeline.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ComputePipeline.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 #include "ComputePipeline.h"
 
 #include "Device.h"
+#include "ipc/WebGPUChild.h"
+#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/ComputePipeline.h firefox-85.0+build1/dom/webgpu/ComputePipeline.h
--- firefox-84.0.2+build1/dom/webgpu/ComputePipeline.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ComputePipeline.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,8 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
+#include "mozilla/webgpu/WebGPUTypes.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Device.cpp firefox-85.0+build1/dom/webgpu/Device.cpp
--- firefox-84.0.2+build1/dom/webgpu/Device.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Device.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,10 +5,13 @@
 
 #include "js/ArrayBuffer.h"
 #include "js/Value.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/Logging.h"
 #include "mozilla/ipc/Shmem.h"
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Device.h"
+#include "CommandEncoder.h"
+#include "BindGroup.h"
 
 #include "Adapter.h"
 #include "Buffer.h"
diff -Nru firefox-84.0.2+build1/dom/webgpu/Device.h firefox-85.0+build1/dom/webgpu/Device.h
--- firefox-84.0.2+build1/dom/webgpu/Device.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Device.h	2021-01-18 19:58:10.000000000 +0000
@@ -131,7 +131,7 @@
   already_AddRefed<RenderPipeline> CreateRenderPipeline(
       const dom::GPURenderPipelineDescriptor& aDesc);
 
-  // IMPL_EVENT_HANDLER(uncapturederror)
+  IMPL_EVENT_HANDLER(uncapturederror)
 };
 
 }  // namespace webgpu
diff -Nru firefox-84.0.2+build1/dom/webgpu/DeviceLostInfo.cpp firefox-85.0+build1/dom/webgpu/DeviceLostInfo.cpp
--- firefox-84.0.2+build1/dom/webgpu/DeviceLostInfo.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/DeviceLostInfo.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DeviceLostInfo.h"
+#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Instance.cpp firefox-85.0+build1/dom/webgpu/Instance.cpp
--- firefox-84.0.2+build1/dom/webgpu/Instance.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Instance.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsIGlobalObject.h"
 #include "ipc/WebGPUChild.h"
 #include "ipc/WebGPUTypes.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Instance.h firefox-85.0+build1/dom/webgpu/Instance.h
--- firefox-84.0.2+build1/dom/webgpu/Instance.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Instance.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "ObjectModel.h"
 
 namespace mozilla {
+class ErrorResult;
 namespace dom {
 class Promise;
 struct GPURequestAdapterOptions;
diff -Nru firefox-84.0.2+build1/dom/webgpu/ipc/PWebGPU.ipdl firefox-85.0+build1/dom/webgpu/ipc/PWebGPU.ipdl
--- firefox-84.0.2+build1/dom/webgpu/ipc/PWebGPU.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ipc/PWebGPU.ipdl	2021-01-18 19:58:10.000000000 +0000
@@ -17,7 +17,9 @@
 using webgpu::ffi::WGPUExtent3d from "mozilla/webgpu/ffi/wgpu.h";
 using webgpu::ffi::WGPUHostMap from "mozilla/webgpu/ffi/wgpu.h";
 
+include "mozilla/ipc/ByteBufUtils.h";
 include "mozilla/webgpu/WebGPUSerialize.h";
+include "mozilla/layers/WebRenderMessageUtils.h";
 include protocol PCompositorBridge;
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUChild.cpp firefox-85.0+build1/dom/webgpu/ipc/WebGPUChild.cpp
--- firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ipc/WebGPUChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,7 @@
 #include "WebGPUChild.h"
 #include "mozilla/dom/WebGPUBinding.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
+#include "Sampler.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUParent.cpp firefox-85.0+build1/dom/webgpu/ipc/WebGPUParent.cpp
--- firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ipc/WebGPUParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -413,6 +413,7 @@
   }
   RefPtr<layers::MemoryTextureHost> textureHost = new layers::MemoryTextureHost(
       textureHostData, aDesc, layers::TextureFlags::NO_FLAGS);
+  textureHost->DisableExternalTextures();
   textureHost->CreateRenderTexture(aExternalId);
   nsTArray<RawId> bufferIds(aBufferIds.Clone());
   RefPtr<PresentationData> data = new PresentationData();
diff -Nru firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUSerialize.h firefox-85.0+build1/dom/webgpu/ipc/WebGPUSerialize.h
--- firefox-84.0.2+build1/dom/webgpu/ipc/WebGPUSerialize.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ipc/WebGPUSerialize.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #define WEBGPU_SERIALIZE_H_
 
 #include "WebGPUTypes.h"
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/dom/WebGPUBinding.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
diff -Nru firefox-84.0.2+build1/dom/webgpu/mochitest/mochitest.ini firefox-85.0+build1/dom/webgpu/mochitest/mochitest.ini
--- firefox-84.0.2+build1/dom/webgpu/mochitest/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/mochitest/mochitest.ini	2021-01-18 19:58:10.000000000 +0000
@@ -1,7 +1,8 @@
 [DEFAULT]
 subsuite = webgpu
-prefs = dom.webgpu.enabled=true
-run_if = nightly_build
+run-if = nightly_build && webrender
+prefs =
+  dom.webgpu.enabled=true
 
 [test_enabled.html]
 [test_device_creation.html]
diff -Nru firefox-84.0.2+build1/dom/webgpu/ObjectModel.cpp firefox-85.0+build1/dom/webgpu/ObjectModel.cpp
--- firefox-84.0.2+build1/dom/webgpu/ObjectModel.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ObjectModel.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "Device.h"
 #include "CommandEncoder.h"
 #include "Instance.h"
+#include "Texture.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/OutOfMemoryError.cpp firefox-85.0+build1/dom/webgpu/OutOfMemoryError.cpp
--- firefox-84.0.2+build1/dom/webgpu/OutOfMemoryError.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/OutOfMemoryError.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "OutOfMemoryError.h"
 #include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/PipelineLayout.cpp firefox-85.0+build1/dom/webgpu/PipelineLayout.cpp
--- firefox-84.0.2+build1/dom/webgpu/PipelineLayout.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/PipelineLayout.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "PipelineLayout.h"
+#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/RenderPassEncoder.cpp firefox-85.0+build1/dom/webgpu/RenderPassEncoder.cpp
--- firefox-84.0.2+build1/dom/webgpu/RenderPassEncoder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/RenderPassEncoder.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include "BindGroup.h"
 #include "CommandEncoder.h"
 #include "RenderPipeline.h"
+#include "mozilla/webgpu/ffi/wgpu.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/RenderPipeline.cpp firefox-85.0+build1/dom/webgpu/RenderPipeline.cpp
--- firefox-84.0.2+build1/dom/webgpu/RenderPipeline.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/RenderPipeline.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,6 +6,8 @@
 #include "RenderPipeline.h"
 
 #include "Device.h"
+#include "ipc/WebGPUChild.h"
+#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/RenderPipeline.h firefox-85.0+build1/dom/webgpu/RenderPipeline.h
--- firefox-84.0.2+build1/dom/webgpu/RenderPipeline.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/RenderPipeline.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,10 +8,13 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
+#include "mozilla/webgpu/WebGPUTypes.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace webgpu {
 
+class BindGroupLayout;
 class Device;
 
 class RenderPipeline final : public ObjectBase, public ChildOf<Device> {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Sampler.cpp firefox-85.0+build1/dom/webgpu/Sampler.cpp
--- firefox-84.0.2+build1/dom/webgpu/Sampler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Sampler.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "Sampler.h"
+#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/ShaderModule.cpp firefox-85.0+build1/dom/webgpu/ShaderModule.cpp
--- firefox-84.0.2+build1/dom/webgpu/ShaderModule.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ShaderModule.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/dom/WebGPUBinding.h"
 #include "ShaderModule.h"
+#include "ipc/WebGPUChild.h"
 
 #include "Device.h"
 
diff -Nru firefox-84.0.2+build1/dom/webgpu/SwapChain.cpp firefox-85.0+build1/dom/webgpu/SwapChain.cpp
--- firefox-84.0.2+build1/dom/webgpu/SwapChain.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/SwapChain.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,8 @@
 
 #include "SwapChain.h"
 #include "Texture.h"
+#include "mozilla/dom/WebGPUBinding.h"
+#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Texture.cpp firefox-85.0+build1/dom/webgpu/Texture.cpp
--- firefox-84.0.2+build1/dom/webgpu/Texture.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Texture.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,8 +5,10 @@
 
 #include "Texture.h"
 
+#include "ipc/WebGPUChild.h"
 #include "mozilla/webgpu/ffi/wgpu.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/dom/WebGPUBinding.h"
 #include "TextureView.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/webgpu/Texture.h firefox-85.0+build1/dom/webgpu/Texture.h
--- firefox-84.0.2+build1/dom/webgpu/Texture.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/Texture.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,8 +6,11 @@
 #ifndef GPU_Texture_H_
 #define GPU_Texture_H_
 
+#include "mozilla/WeakPtr.h"
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
+#include "mozilla/webgpu/WebGPUTypes.h"
+#include "mozilla/WeakPtr.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/webgpu/TextureView.cpp firefox-85.0+build1/dom/webgpu/TextureView.cpp
--- firefox-84.0.2+build1/dom/webgpu/TextureView.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/TextureView.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,9 @@
 #include "TextureView.h"
 
 #include "Device.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/dom/WebGPUBinding.h"
+#include "ipc/WebGPUChild.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webgpu/TextureView.h firefox-85.0+build1/dom/webgpu/TextureView.h
--- firefox-84.0.2+build1/dom/webgpu/TextureView.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/TextureView.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsWrapperCache.h"
 #include "ObjectModel.h"
+#include "mozilla/webgpu/WebGPUTypes.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/webgpu/ValidationError.cpp firefox-85.0+build1/dom/webgpu/ValidationError.cpp
--- firefox-84.0.2+build1/dom/webgpu/ValidationError.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webgpu/ValidationError.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "ValidationError.h"
 #include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
 
 namespace mozilla {
 namespace webgpu {
diff -Nru firefox-84.0.2+build1/dom/webidl/EventHandler.webidl firefox-85.0+build1/dom/webidl/EventHandler.webidl
--- firefox-84.0.2+build1/dom/webidl/EventHandler.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/EventHandler.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -83,6 +83,7 @@
            attribute EventHandler onseeked;
            attribute EventHandler onseeking;
            attribute EventHandler onselect;
+           [Pref="dom.menuitem.enabled"]
            attribute EventHandler onshow;
            //(Not implemented)attribute EventHandler onsort;
            attribute EventHandler onstalled;
diff -Nru firefox-84.0.2+build1/dom/webidl/FuzzingFunctions.webidl firefox-85.0+build1/dom/webidl/FuzzingFunctions.webidl
--- firefox-84.0.2+build1/dom/webidl/FuzzingFunctions.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/FuzzingFunctions.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,11 @@
    * Synchronously perform a garbage collection.
    */
   static void garbageCollect();
+ 
+  /**
+   * Synchronously perform a compacting garbage collection.
+   */
+  static void garbageCollectCompacting();
 
   /**
    * Synchronously perform a cycle collection.
@@ -24,6 +29,12 @@
   static void cycleCollect();
 
   /**
+   * Send a memory pressure event, causes shrinking GC, cycle collection and
+   * other actions.
+   */
+  static void memoryPressure();
+
+  /**
    * Enable accessibility.
    */
   [Throws]
diff -Nru firefox-84.0.2+build1/dom/webidl/GPUUncapturedErrorEvent.webidl firefox-85.0+build1/dom/webidl/GPUUncapturedErrorEvent.webidl
--- firefox-84.0.2+build1/dom/webidl/GPUUncapturedErrorEvent.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/GPUUncapturedErrorEvent.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -7,15 +7,13 @@
  * https://gpuweb.github.io/gpuweb/
  */
 
-[
-    Pref="dom.webgpu.enabled",
-    Exposed=Window,
-]
-interface GPUUncapturedErrorEvent : Event {
-    constructor(DOMString type, GPUUncapturedErrorEventInit gpuUncapturedErrorEventInitDict);
-    readonly attribute GPUError error;
-};
-
 dictionary GPUUncapturedErrorEventInit : EventInit {
     required GPUError error;
 };
+
+[Pref="dom.webgpu.enabled",
+ Exposed=Window]
+interface GPUUncapturedErrorEvent: Event {
+    constructor(DOMString type, GPUUncapturedErrorEventInit gpuUncapturedErrorEventInitDict);
+    readonly attribute GPUError error;
+};
diff -Nru firefox-84.0.2+build1/dom/webidl/HTMLElement.webidl firefox-85.0+build1/dom/webidl/HTMLElement.webidl
--- firefox-84.0.2+build1/dom/webidl/HTMLElement.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/HTMLElement.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -46,10 +46,8 @@
            attribute DOMString contentEditable;
   [Pure]
   readonly attribute boolean isContentEditable;
-  [Pure]
+  [Pure, Pref="dom.menuitem.enabled"]
   readonly attribute HTMLMenuElement? contextMenu;
-  //[SetterThrows]
-  //         attribute HTMLMenuElement? contextMenu;
   [CEReactions, SetterThrows, Pure]
            attribute boolean spellcheck;
   [CEReactions, Pure, SetterThrows, Pref="dom.forms.inputmode"]
diff -Nru firefox-84.0.2+build1/dom/webidl/HTMLMenuElement.webidl firefox-85.0+build1/dom/webidl/HTMLMenuElement.webidl
--- firefox-84.0.2+build1/dom/webidl/HTMLMenuElement.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/HTMLMenuElement.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -4,8 +4,8 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is
- * http://www.whatwg.org/specs/web-apps/current-work/#the-menu-element
- * http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+ * https://html.spec.whatwg.org/multipage/grouping-content.html#the-menu-element
+ * https://html.spec.whatwg.org/multipage/obsolete.html#HTMLMenuElement-partial
  *
  * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
  * Opera Software ASA. You are granted a license to use, reproduce
@@ -14,18 +14,18 @@
 
 interface MenuBuilder;
 
-// http://www.whatwg.org/specs/web-apps/current-work/#the-menu-element
+// https://html.spec.whatwg.org/multipage/grouping-content.html#the-menu-element
 [Exposed=Window]
 interface HTMLMenuElement : HTMLElement {
   [HTMLConstructor] constructor();
 
-           [CEReactions, SetterThrows]
+           [CEReactions, SetterThrows, Pref="dom.menuitem.enabled"]
            attribute DOMString type;
-           [CEReactions, SetterThrows]
+           [CEReactions, SetterThrows, Pref="dom.menuitem.enabled"]
            attribute DOMString label;
 };
 
-// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
+// https://html.spec.whatwg.org/multipage/obsolete.html#HTMLMenuElement-partial
 partial interface HTMLMenuElement {
            [CEReactions, SetterThrows]
            attribute boolean compact;
diff -Nru firefox-84.0.2+build1/dom/webidl/HTMLMenuItemElement.webidl firefox-85.0+build1/dom/webidl/HTMLMenuItemElement.webidl
--- firefox-84.0.2+build1/dom/webidl/HTMLMenuItemElement.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/HTMLMenuItemElement.webidl	2021-01-18 19:58:10.000000000 +0000
@@ -12,7 +12,7 @@
  */
 
 // http://www.whatwg.org/specs/web-apps/current-work/#the-menuitem-element
-[Exposed=Window]
+[Exposed=Window, Pref="dom.menuitem.enabled"]
 interface HTMLMenuItemElement : HTMLElement {
   [HTMLConstructor] constructor();
 
diff -Nru firefox-84.0.2+build1/dom/webidl/moz.build firefox-85.0+build1/dom/webidl/moz.build
--- firefox-84.0.2+build1/dom/webidl/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/moz.build	2021-01-18 19:58:10.000000000 +0000
@@ -721,7 +721,6 @@
     "NamedNodeMap.webidl",
     "NativeOSFileInternals.webidl",
     "Navigator.webidl",
-    "NetDashboard.webidl",
     "NetErrorInfo.webidl",
     "NetworkInformation.webidl",
     "NetworkOptions.webidl",
diff -Nru firefox-84.0.2+build1/dom/webidl/NetDashboard.webidl firefox-85.0+build1/dom/webidl/NetDashboard.webidl
--- firefox-84.0.2+build1/dom/webidl/NetDashboard.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/NetDashboard.webidl	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// This file defines dictionaries used by about:networking page.
-
-dictionary SocketElement {
-  DOMString host = "";
-  unsigned long port = 0;
-  boolean active = false;
-  boolean tcp = false;
-  double sent = 0;
-  double received = 0;
-};
-
-[GenerateConversionToJS]
-dictionary SocketsDict {
-  sequence<SocketElement> sockets;
-  double sent = 0;
-  double received = 0;
-};
-
-dictionary HttpConnInfo {
-  unsigned long rtt = 0;
-  unsigned long ttl = 0;
-  DOMString protocolVersion = "";
-};
-
-dictionary HalfOpenInfoDict {
-  boolean speculative = false;
-};
-
-dictionary HttpConnectionElement {
-  DOMString host = "";
-  unsigned long port = 0;
-  DOMString httpVersion = "";
-  boolean ssl = false;
-  sequence<HttpConnInfo> active;
-  sequence<HttpConnInfo> idle;
-  sequence<HalfOpenInfoDict> halfOpens;
-};
-
-[GenerateConversionToJS]
-dictionary HttpConnDict {
-  sequence<HttpConnectionElement> connections;
-};
-
-dictionary WebSocketElement {
-  DOMString hostport = "";
-  unsigned long msgsent = 0;
-  unsigned long msgreceived = 0;
-  double sentsize = 0;
-  double receivedsize = 0;
-  boolean encrypted = false;
-};
-
-[GenerateConversionToJS]
-dictionary WebSocketDict {
-  sequence<WebSocketElement> websockets;
-};
-
-dictionary DnsCacheEntry {
-  DOMString hostname = "";
-  sequence<DOMString> hostaddr;
-  DOMString family = "";
-  double expiration = 0;
-  boolean trr = false;
-  DOMString originAttributesSuffix = "";
-};
-
-[GenerateConversionToJS]
-dictionary DNSCacheDict {
-  sequence<DnsCacheEntry> entries;
-};
-
-[GenerateConversionToJS]
-dictionary DNSLookupDict {
-  sequence<DOMString> address;
-  DOMString error = "";
-  boolean answer = false;
-};
-
-dictionary SVCParam {
-  unsigned short type = 0;
-};
-
-dictionary SVCParamAlpn : SVCParam {
-  DOMString alpn = "";
-};
-
-dictionary SVCParamNoDefaultAlpn : SVCParam {
-};
-
-dictionary SVCParamPort : SVCParam {
-  unsigned short port = 0;
-};
-
-dictionary SVCParamIPv4Hint : SVCParam {
-  sequence<DOMString> address;
-};
-
-dictionary SVCParamIPv6Hint : SVCParam {
-  sequence<DOMString> address;
-};
-
-dictionary SVCParamEchConfig : SVCParam {
-  DOMString echConfig = "";
-};
-
-dictionary HTTPSRecord {
-  unsigned short priority = 0;
-  DOMString targetName = "";
-  SVCParamAlpn alpn;
-  SVCParamNoDefaultAlpn noDefaultAlpn;
-  SVCParamPort port;
-  SVCParamIPv4Hint ipv4Hint;
-  SVCParamIPv6Hint ipv6Hint;
-  SVCParamEchConfig echConfig;
-};
-
-[GenerateConversionToJS]
-dictionary HTTPSRRLookupDict {
-  DOMString error = "";
-  boolean answer = false;
-  sequence<HTTPSRecord> records;
-};
-
-[GenerateConversionToJS]
-dictionary ConnStatusDict {
-  DOMString status = "";
-};
-
-dictionary RcwnPerfStats {
-  unsigned long avgShort = 0;
-  unsigned long avgLong = 0;
-  unsigned long stddevLong = 0;
-};
-
-[GenerateConversionToJS]
-dictionary RcwnStatus {
-  unsigned long totalNetworkRequests = 0;
-  unsigned long rcwnCacheWonCount = 0;
-  unsigned long rcwnNetWonCount = 0;
-  unsigned long cacheSlowCount = 0;
-  unsigned long cacheNotSlowCount = 0;
-  // Sequence is indexed by CachePerfStats::EDataType
-  sequence<RcwnPerfStats> perfStats;
-};
diff -Nru firefox-84.0.2+build1/dom/webidl/SourceBuffer.webidl firefox-85.0+build1/dom/webidl/SourceBuffer.webidl
--- firefox-84.0.2+build1/dom/webidl/SourceBuffer.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/SourceBuffer.webidl	2021-01-18 19:58:11.000000000 +0000
@@ -41,22 +41,25 @@
   void appendBuffer(ArrayBuffer data);
   [Throws]
   void appendBuffer(ArrayBufferView data);
-  // Experimental function as proposed in:
-  // https://github.com/w3c/media-source/issues/100 for promise proposal.
-  [Throws, Pref="media.mediasource.experimental.enabled"]
-  Promise<void> appendBufferAsync(ArrayBuffer data);
-  [Throws, Pref="media.mediasource.experimental.enabled"]
-  Promise<void> appendBufferAsync(ArrayBufferView data);
   //[Throws]
   //void appendStream(Stream stream, [EnforceRange] optional unsigned long long maxSize);
   [Throws]
   void abort();
   [Throws]
   void remove(double start, unrestricted double end);
+};
+
+// Mozilla extensions for experimental features
+partial interface SourceBuffer {
   // Experimental function as proposed in:
   // https://github.com/w3c/media-source/issues/100 for promise proposal.
   [Throws, Pref="media.mediasource.experimental.enabled"]
+  Promise<void> appendBufferAsync(ArrayBuffer data);
+  [Throws, Pref="media.mediasource.experimental.enabled"]
+  Promise<void> appendBufferAsync(ArrayBufferView data);
+  [Throws, Pref="media.mediasource.experimental.enabled"]
   Promise<void> removeAsync(double start, unrestricted double end);
+
   // Experimental function as proposed in:
   // https://github.com/w3c/media-source/issues/155
   [Throws]
diff -Nru firefox-84.0.2+build1/dom/webidl/WebGPU.webidl firefox-85.0+build1/dom/webidl/WebGPU.webidl
--- firefox-84.0.2+build1/dom/webidl/WebGPU.webidl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/webidl/WebGPU.webidl	2021-01-18 19:58:11.000000000 +0000
@@ -188,8 +188,8 @@
     //readonly attribute Promise<GPUDeviceLostInfo> lost;
     //void pushErrorScope(GPUErrorFilter filter);
     //Promise<GPUError?> popErrorScope();
-    //[Exposed=Window]
-    //attribute EventHandler onuncapturederror;
+    [Exposed=Window]
+    attribute EventHandler onuncapturederror;
 };
 
 // ****************************************************************************
diff -Nru firefox-84.0.2+build1/dom/websocket/WebSocket.cpp firefox-85.0+build1/dom/websocket/WebSocket.cpp
--- firefox-84.0.2+build1/dom/websocket/WebSocket.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/websocket/WebSocket.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -245,10 +245,10 @@
                   nsIObserver, nsISupportsWeakReference, nsIRequest,
                   nsIEventTarget, nsIWebSocketImpl)
 
-class CallDispatchConnectionCloseEvents final : public CancelableRunnable {
+class CallDispatchConnectionCloseEvents final : public DiscardableRunnable {
  public:
   explicit CallDispatchConnectionCloseEvents(WebSocketImpl* aWebSocketImpl)
-      : CancelableRunnable("dom::CallDispatchConnectionCloseEvents"),
+      : DiscardableRunnable("dom::CallDispatchConnectionCloseEvents"),
         mWebSocketImpl(aWebSocketImpl) {
     aWebSocketImpl->AssertIsOnTargetThread();
   }
@@ -912,6 +912,11 @@
 
 WebSocket::~WebSocket() = default;
 
+mozilla::Maybe<EventCallbackDebuggerNotificationType>
+WebSocket::GetDebuggerNotificationType() const {
+  return mozilla::Some(EventCallbackDebuggerNotificationType::Websocket);
+}
+
 JSObject* WebSocket::WrapObject(JSContext* cx,
                                 JS::Handle<JSObject*> aGivenProto) {
   return WebSocket_Binding::Wrap(cx, this, aGivenProto);
diff -Nru firefox-84.0.2+build1/dom/websocket/WebSocket.h firefox-85.0+build1/dom/websocket/WebSocket.h
--- firefox-84.0.2+build1/dom/websocket/WebSocket.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/websocket/WebSocket.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/dom/WebSocketBinding.h"  // for BinaryType
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Mutex.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
@@ -28,6 +27,8 @@
 class nsITransportProvider;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class Blob;
@@ -55,9 +56,7 @@
   virtual void DisconnectFromOwner() override;
 
   mozilla::Maybe<EventCallbackDebuggerNotificationType>
-  GetDebuggerNotificationType() const override {
-    return mozilla::Some(EventCallbackDebuggerNotificationType::Websocket);
-  }
+  GetDebuggerNotificationType() const override;
 
   // nsWrapperCache
   virtual JSObject* WrapObject(JSContext* cx,
diff -Nru firefox-84.0.2+build1/dom/workers/ChromeWorkerScope.cpp firefox-85.0+build1/dom/workers/ChromeWorkerScope.cpp
--- firefox-84.0.2+build1/dom/workers/ChromeWorkerScope.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/ChromeWorkerScope.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,12 +10,9 @@
 #include "js/experimental/CTypes.h"  // JS::InitCTypesClass, JS::CTypesCallbacks, JS::SetCTypesCallbacks
 #include "js/MemoryFunctions.h"
 
-#include "nsXPCOM.h"
 #include "nsNativeCharsetUtils.h"
 #include "nsString.h"
 
-#include "WorkerPrivate.h"
-
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/workers/ChromeWorkerScope.h firefox-85.0+build1/dom/workers/ChromeWorkerScope.h
--- firefox-84.0.2+build1/dom/workers/ChromeWorkerScope.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/ChromeWorkerScope.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_workers_chromeworkerscope_h__
 #define mozilla_dom_workers_chromeworkerscope_h__
 
-#include "WorkerCommon.h"
+#include "js/TypeDecls.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/JSExecutionManager.cpp firefox-85.0+build1/dom/workers/JSExecutionManager.cpp
--- firefox-84.0.2+build1/dom/workers/JSExecutionManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/JSExecutionManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,12 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "JSExecutionManager.h"
+#include "mozilla/dom/JSExecutionManager.h"
+
+#include "WorkerCommon.h"
 #include "WorkerPrivate.h"
 
 #include "mozilla/dom/DocGroup.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPtr.h"
 
diff -Nru firefox-84.0.2+build1/dom/workers/JSExecutionManager.h firefox-85.0+build1/dom/workers/JSExecutionManager.h
--- firefox-84.0.2+build1/dom/workers/JSExecutionManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/JSExecutionManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,24 +7,23 @@
 #ifndef mozilla_dom_workers_jsexecutionmanager_h__
 #define mozilla_dom_workers_jsexecutionmanager_h__
 
-#include "mozilla/dom/WorkerCommon.h"
-#include "mozilla/dom/WorkerRef.h"
-#include "mozilla/dom/WorkerStatus.h"
-#include "mozilla/StaticPtr.h"
-
-#include "nsICancelableRunnable.h"
-
-#include "mozilla/Atomics.h"
+#include <stdint.h>
+#include <deque>
+#include "MainThreadUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/CondVar.h"
 #include "mozilla/Mutex.h"
-#include "nsISupportsImpl.h"
-#include "nsThreadUtils.h" /* nsRunnable */
-
-#include <deque>
+#include "mozilla/RefPtr.h"
+#include "nsISupports.h"
 
-struct JSContext;
-class nsIEventTarget;
 class nsIGlobalObject;
+namespace mozilla {
+
+class ErrorResult;
+
+namespace dom {
+class WorkerPrivate;
 
 // The code in this file is responsible for throttling JS execution. It does
 // this by introducing a JSExecutionManager class. An execution manager may be
@@ -56,12 +55,6 @@
 // 1 execution manager per DocGroup, as this is the granularity at which
 // SharedArrayBuffers may be present.
 
-namespace mozilla {
-
-class ErrorResult;
-
-namespace dom {
-
 class AutoRequestJSThreadExecution;
 class AutoYieldJSThreadExecution;
 
diff -Nru firefox-84.0.2+build1/dom/workers/JSSettings.h firefox-85.0+build1/dom/workers/JSSettings.h
--- firefox-84.0.2+build1/dom/workers/JSSettings.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/JSSettings.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,9 +9,9 @@
 
 #include <stdint.h>
 
-#include "jsapi.h"
 #include "js/ContextOptions.h"
 #include "js/GCAPI.h"
+#include "js/RealmOptions.h"
 #include "mozilla/Maybe.h"
 #include "nsString.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/dom/workers/Principal.cpp firefox-85.0+build1/dom/workers/Principal.cpp
--- firefox-84.0.2+build1/dom/workers/Principal.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/Principal.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,9 +6,11 @@
 
 #include "Principal.h"
 
+#include "JSSettings.h"
 #include "jsapi.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/StructuredCloneTags.h"
+#include "mozilla/dom/workerinternals/JSSettings.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/Principal.h firefox-85.0+build1/dom/workers/Principal.h
--- firefox-84.0.2+build1/dom/workers/Principal.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/Principal.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_workers_principal_h__
 #define mozilla_dom_workers_principal_h__
 
-#include "WorkerCommon.h"
+#include "js/Principals.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/Queue.h firefox-85.0+build1/dom/workers/Queue.h
--- firefox-84.0.2+build1/dom/workers/Queue.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/Queue.h	2021-01-18 19:58:10.000000000 +0000
@@ -7,8 +7,6 @@
 #ifndef mozilla_dom_workerinternal_Queue_h
 #define mozilla_dom_workerinternal_Queue_h
 
-#include "mozilla/dom/WorkerCommon.h"
-
 #include "mozilla/Mutex.h"
 #include "nsTArray.h"
 
diff -Nru firefox-84.0.2+build1/dom/workers/RegisterBindings.cpp firefox-85.0+build1/dom/workers/RegisterBindings.cpp
--- firefox-84.0.2+build1/dom/workers/RegisterBindings.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/RegisterBindings.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "WorkerPrivate.h"
 #include "ChromeWorkerScope.h"
-#include "RuntimeService.h"
 
 #include "jsapi.h"
 #include "mozilla/dom/DebuggerNotificationObserverBinding.h"
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerController.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerController.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerController.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerController.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -15,7 +15,7 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/RemoteLazyInputStreamUtils.h"
 #include "mozilla/RemoteLazyInputStreamStorage.h"
-#include "mozilla/ScopeExit.h"
+#include "mozilla/dom/FetchEventOpParent.h"
 #include "mozilla/dom/FetchEventOpProxyParent.h"
 #include "mozilla/dom/MessagePortParent.h"
 #include "mozilla/dom/RemoteWorkerTypes.h"
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerControllerParent.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerControllerParent.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerControllerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerControllerParent.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/FetchEventOpParent.h"
+#include "mozilla/dom/RemoteWorkerParent.h"
 #include "mozilla/dom/ServiceWorkerOpPromise.h"
 #include "mozilla/ipc/BackgroundParent.h"
 
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerManager.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerManager.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ContentChild.h"  // ContentChild::GetSingleton
+#include "mozilla/dom/RemoteWorkerController.h"
 #include "mozilla/dom/RemoteWorkerParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/BackgroundUtils.h"
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerParent.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerParent.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/PFetchEventOpProxyParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/SchedulerGroup.h"
 #include "mozilla/Unused.h"
 #include "nsProxyRelease.h"
 
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerService.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerService.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerService.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/PBackgroundParent.h"
+#include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerServiceParent.cpp firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerServiceParent.cpp
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerServiceParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerServiceParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "RemoteWorkerServiceParent.h"
 #include "RemoteWorkerManager.h"
+#include "mozilla/ipc/BackgroundParent.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh
--- firefox-84.0.2+build1/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/remoteworkers/RemoteWorkerTypes.ipdlh	2021-01-18 19:58:10.000000000 +0000
@@ -11,8 +11,11 @@
 include NeckoChannelParams;
 include ProtocolTypes;
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using mozilla::StorageAccess from "mozilla/dom/ClientIPCUtils.h";
+include "mozilla/dom/ClientIPCUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
+
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using mozilla::StorageAccess from "mozilla/StorageAccess.h";
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/RuntimeService.cpp firefox-85.0+build1/dom/workers/RuntimeService.cpp
--- firefox-84.0.2+build1/dom/workers/RuntimeService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/RuntimeService.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -48,6 +48,7 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/Navigator.h"
 #include "mozilla/Monitor.h"
 #include "nsContentUtils.h"
@@ -297,7 +298,8 @@
       .setPrivateClassFields(
           GetWorkerPref<bool>("experimental.private_fields"_ns))
       .setPrivateClassMethods(
-          GetWorkerPref<bool>("experimental.private_methods"_ns));
+          GetWorkerPref<bool>("experimental.private_methods"_ns))
+      .setTopLevelAwait(GetWorkerPref<bool>("experimental.top_level_await"_ns));
 
   nsCOMPtr<nsIXULRuntime> xr = do_GetService("@mozilla.org/xre/runtime;1");
   if (xr) {
diff -Nru firefox-84.0.2+build1/dom/workers/ScriptLoader.cpp firefox-85.0+build1/dom/workers/ScriptLoader.cpp
--- firefox-84.0.2+build1/dom/workers/ScriptLoader.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/ScriptLoader.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -35,9 +35,11 @@
 #include "js/Exception.h"
 #include "js/SourceText.h"
 #include "nsError.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
 #include "nsDocShellCID.h"
+#include "nsJSEnvironment.h"
 #include "nsNetUtil.h"
 #include "nsIPipe.h"
 #include "nsIOutputStream.h"
@@ -72,7 +74,9 @@
 #include "mozilla/dom/Response.h"
 #include "mozilla/dom/ScriptLoader.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/SerializedStackHolder.h"
 #include "mozilla/dom/SRILogHelper.h"
+#include "mozilla/dom/SerializedStackHolder.h"
 #include "mozilla/dom/ServiceWorkerBinding.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/Result.h"
diff -Nru firefox-84.0.2+build1/dom/workers/ScriptLoader.h firefox-85.0+build1/dom/workers/ScriptLoader.h
--- firefox-84.0.2+build1/dom/workers/ScriptLoader.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/ScriptLoader.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,8 +8,10 @@
 #define mozilla_dom_workers_scriptloader_h__
 
 #include "mozilla/dom/WorkerCommon.h"
+#include "mozilla/Maybe.h"
 #include "nsIContentPolicy.h"
 #include "nsStringFwd.h"
+#include "nsTArrayForwardDeclare.h"
 
 class nsIChannel;
 class nsICookieJarSettings;
diff -Nru firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerChild.cpp firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerChild.cpp
--- firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerChild.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,6 +8,9 @@
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/ErrorEventBinding.h"
 #include "mozilla/dom/Exceptions.h"
+#include "mozilla/dom/RootedDictionary.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/SharedWorker.h"
 #include "mozilla/dom/WorkerError.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorker.cpp firefox-85.0+build1/dom/workers/sharedworkers/SharedWorker.cpp
--- firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/sharedworkers/SharedWorker.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -7,6 +7,7 @@
 #include "SharedWorker.h"
 
 #include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/ClientInfo.h"
 #include "mozilla/dom/Event.h"
@@ -228,6 +229,10 @@
   nsGlobalWindowInner::Cast(window)->StoreSharedWorker(sharedWorker);
   actor->SetParent(sharedWorker);
 
+  if (nsGlobalWindowInner::Cast(window)->IsSuspended()) {
+    sharedWorker->Suspend();
+  }
+
   return sharedWorker.forget();
 }
 
diff -Nru firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerManager.cpp firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerManager.cpp
--- firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "SharedWorkerManager.h"
 #include "SharedWorkerParent.h"
 #include "SharedWorkerService.h"
+#include "mozilla/dom/MessagePort.h"
 #include "mozilla/dom/PSharedWorker.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/URIUtils.h"
@@ -61,7 +62,7 @@
 bool SharedWorkerManager::MaybeCreateRemoteWorker(
     const RemoteWorkerData& aData, uint64_t aWindowID,
     UniqueMessagePortId& aPortIdentifier, base::ProcessId aProcessId) {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   if (!mRemoteWorkerController) {
     mRemoteWorkerController =
@@ -108,7 +109,7 @@
 }
 
 void SharedWorkerManager::AddActor(SharedWorkerParent* aParent) {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   MOZ_ASSERT(aParent);
   MOZ_ASSERT(!mActors.Contains(aParent));
 
@@ -121,7 +122,7 @@
 }
 
 void SharedWorkerManager::RemoveActor(SharedWorkerParent* aParent) {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   MOZ_ASSERT(aParent);
   MOZ_ASSERT(mActors.Contains(aParent));
 
@@ -141,7 +142,7 @@
 }
 
 void SharedWorkerManager::Terminate() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   MOZ_ASSERT(mActors.IsEmpty());
   MOZ_ASSERT(mHolders.IsEmpty());
 
@@ -150,7 +151,7 @@
 }
 
 void SharedWorkerManager::UpdateSuspend() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   MOZ_ASSERT(mRemoteWorkerController);
 
   uint32_t suspended = 0;
@@ -178,7 +179,7 @@
 }
 
 void SharedWorkerManager::UpdateFrozen() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   MOZ_ASSERT(mRemoteWorkerController);
 
   uint32_t frozen = 0;
@@ -208,7 +209,7 @@
 bool SharedWorkerManager::IsSecureContext() const { return mIsSecureContext; }
 
 void SharedWorkerManager::CreationFailed() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendError(NS_ERROR_FAILURE);
@@ -216,12 +217,12 @@
 }
 
 void SharedWorkerManager::CreationSucceeded() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
   // Nothing to do here.
 }
 
 void SharedWorkerManager::ErrorReceived(const ErrorValue& aValue) {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendError(aValue);
@@ -229,7 +230,7 @@
 }
 
 void SharedWorkerManager::Terminated() {
-  AssertIsOnBackgroundThread();
+  ::mozilla::ipc::AssertIsOnBackgroundThread();
 
   for (SharedWorkerParent* actor : mActors) {
     Unused << actor->SendTerminate();
diff -Nru firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerService.cpp firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerService.cpp
--- firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerService.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,8 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "SharedWorkerService.h"
+#include "mozilla/dom/MessagePort.h"
 #include "mozilla/dom/RemoteWorkerTypes.h"
+#include "mozilla/dom/SharedWorkerManager.h"
 #include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/ipc/URIUtils.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/StaticMutex.h"
diff -Nru firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerService.h firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerService.h
--- firefox-84.0.2+build1/dom/workers/sharedworkers/SharedWorkerService.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/sharedworkers/SharedWorkerService.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,6 +11,8 @@
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
 
+class nsIEventTarget;
+
 namespace mozilla {
 
 namespace ipc {
diff -Nru firefox-84.0.2+build1/dom/workers/test/json_worker.js firefox-85.0+build1/dom/workers/test/json_worker.js
--- firefox-84.0.2+build1/dom/workers/test/json_worker.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/test/json_worker.js	2021-01-18 19:58:10.000000000 +0000
@@ -8,7 +8,7 @@
 var cyclicalArray = [];
 cyclicalArray.push(cyclicalArray);
 
-function makeCrazyNested(obj, count) {
+function makeNested(obj, count) {
   var innermostobj;
   for (var i = 0; i < count; i++) {
     obj.foo = { bar: 5 };
@@ -18,12 +18,12 @@
   return innermostobj;
 }
 
-var crazyNestedObject = {};
-makeCrazyNested(crazyNestedObject, 100);
+var nestedObject = {};
+makeNested(nestedObject, 100);
 
-var crazyCyclicalObject = {};
-var innermost = makeCrazyNested(crazyCyclicalObject, 1000);
-innermost.baz = crazyCyclicalObject;
+var cyclicalObject = {};
+var innermost = makeNested(cyclicalObject, 1000);
+innermost.baz = cyclicalObject;
 
 var objectWithSaneGetter = {};
 objectWithSaneGetter.__defineGetter__("foo", function() {
@@ -103,12 +103,12 @@
   },
   {
     type: "object",
-    value: crazyNestedObject,
-    jsonValue: JSON.stringify(crazyNestedObject),
+    value: nestedObject,
+    jsonValue: JSON.stringify(nestedObject),
   },
   {
     type: "object",
-    value: crazyCyclicalObject,
+    value: cyclicalObject,
   },
   {
     type: "object",
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerCommon.h firefox-85.0+build1/dom/workers/WorkerCommon.h
--- firefox-84.0.2+build1/dom/workers/WorkerCommon.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerCommon.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,9 +7,7 @@
 #ifndef mozilla_dom_workers_WorkerCommon_h
 #define mozilla_dom_workers_WorkerCommon_h
 
-#include "jsapi.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/dom/ServiceWorkerDescriptor.h"
+#include "js/TypeDecls.h"
 
 class nsPIDOMWindowInner;
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerCSPEventListener.cpp firefox-85.0+build1/dom/workers/WorkerCSPEventListener.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerCSPEventListener.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerCSPEventListener.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,8 +7,10 @@
 #include "WorkerCSPEventListener.h"
 #include "WorkerPrivate.h"
 #include "WorkerRef.h"
+#include "WorkerRunnable.h"
 #include "mozilla/dom/SecurityPolicyViolationEvent.h"
 #include "mozilla/dom/SecurityPolicyViolationEventBinding.h"
+#include "mozilla/dom/WorkerRunnable.h"
 
 using namespace mozilla::dom;
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerCSPEventListener.h firefox-85.0+build1/dom/workers/WorkerCSPEventListener.h
--- firefox-84.0.2+build1/dom/workers/WorkerCSPEventListener.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerCSPEventListener.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,12 +7,14 @@
 #ifndef mozilla_dom_WorkerCSPEventListener_h
 #define mozilla_dom_WorkerCSPEventListener_h
 
+#include "mozilla/dom/WorkerRef.h"
 #include "mozilla/Mutex.h"
 #include "nsIContentSecurityPolicy.h"
 
 namespace mozilla {
 namespace dom {
 
+class WeakWorkerRef;
 class WorkerRef;
 class WorkerPrivate;
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerDebugger.cpp firefox-85.0+build1/dom/workers/WorkerDebugger.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerDebugger.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerDebugger.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,8 +6,10 @@
 
 #include "WorkerDebugger.h"
 
+#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/MessageEvent.h"
 #include "mozilla/dom/MessageEventBinding.h"
+#include "mozilla/dom/WindowContext.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/PerformanceUtils.h"
 #include "nsProxyRelease.h"
@@ -457,7 +459,7 @@
 
 RefPtr<PerformanceInfoPromise> WorkerDebugger::ReportPerformanceInfo() {
   AssertIsOnMainThread();
-  nsCOMPtr<nsPIDOMWindowOuter> top;
+  RefPtr<BrowsingContext> top;
   RefPtr<WorkerDebugger> self = this;
 
 #if defined(XP_WIN)
@@ -476,12 +478,12 @@
   }
   nsPIDOMWindowInner* win = wp->GetWindow();
   if (win) {
-    nsPIDOMWindowOuter* outer = win->GetOuterWindow();
-    if (outer) {
-      top = outer->GetInProcessTop();
+    BrowsingContext* context = win->GetBrowsingContext();
+    if (context) {
+      top = context->Top();
       if (top) {
-        windowID = top->WindowID();
-        isTopLevel = outer->GetBrowsingContext()->IsTop();
+        windowID = top->GetCurrentWindowContext()->OuterWindowId();
+        isTopLevel = context->IsTop();
       }
     }
   }
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerDebugger.h firefox-85.0+build1/dom/workers/WorkerDebugger.h
--- firefox-84.0.2+build1/dom/workers/WorkerDebugger.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerDebugger.h	2021-01-18 19:58:10.000000000 +0000
@@ -8,10 +8,12 @@
 #define mozilla_dom_workers_WorkerDebugger_h
 
 #include "mozilla/PerformanceTypes.h"
-#include "mozilla/dom/DOMTypes.h"
-#include "mozilla/dom/WorkerCommon.h"
+#include "nsCOMPtr.h"
 #include "nsIWorkerDebugger.h"
 
+class mozIDOMWindow;
+class nsIPrincipal;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerDebuggerManager.h firefox-85.0+build1/dom/workers/WorkerDebuggerManager.h
--- firefox-84.0.2+build1/dom/workers/WorkerDebuggerManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerDebuggerManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,14 +7,15 @@
 #ifndef mozilla_dom_workers_workerdebuggermanager_h
 #define mozilla_dom_workers_workerdebuggermanager_h
 
-#include "mozilla/dom/WorkerCommon.h"
-
+#include "MainThreadUtils.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Mutex.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
 #include "nsIObserver.h"
+#include "nsISupports.h"
 #include "nsIWorkerDebuggerManager.h"
-
-#include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
-#include "nsThreadUtils.h"
 
 #define WORKERDEBUGGERMANAGER_CID                    \
   {                                                  \
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerError.cpp firefox-85.0+build1/dom/workers/WorkerError.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerError.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerError.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,24 +6,57 @@
 
 #include "WorkerError.h"
 
-#include "js/friend/ErrorMessages.h"  // JSMSG_OVER_RECURSED
+#include <stdio.h>
+#include <algorithm>
+#include <utility>
+#include "MainThreadUtils.h"
+#include "WorkerPrivate.h"
+#include "WorkerRunnable.h"
+#include "WorkerScope.h"
+#include "js/ComparisonOperators.h"
+#include "js/UniquePtr.h"
+#include "js/friend/ErrorMessages.h"
+#include "jsapi.h"
 #include "mozilla/ArrayAlgorithm.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Span.h"
+#include "mozilla/ThreadSafeWeakPtr.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ErrorEvent.h"
 #include "mozilla/dom/ErrorEventBinding.h"
+#include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventBinding.h"
+#include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/RemoteWorkerChild.h"
+#include "mozilla/dom/RemoteWorkerTypes.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/SimpleGlobalObject.h"
+#include "mozilla/dom/Worker.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerDebuggerGlobalScopeBinding.h"
 #include "mozilla/dom/WorkerGlobalScopeBinding.h"
-#include "mozilla/EventDispatcher.h"
-#include "nsGlobalWindowInner.h"
+#include "mozilla/fallible.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsGlobalWindowOuter.h"
 #include "nsIConsoleService.h"
+#include "nsIScriptError.h"
 #include "nsScriptError.h"
-#include "WorkerRunnable.h"
-#include "WorkerPrivate.h"
-#include "WorkerScope.h"
+#include "nsServiceManagerUtils.h"
+#include "nsString.h"
+#include "nsWrapperCacheInlines.h"
+#include "nscore.h"
+#include "xpcpublic.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerEventTarget.cpp firefox-85.0+build1/dom/workers/WorkerEventTarget.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerEventTarget.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerEventTarget.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WorkerEventTarget.h"
+#include "WorkerPrivate.h"
+#include "WorkerRunnable.h"
+
+#include "WorkerPrivate.h"
+#include "WorkerRunnable.h"
+#include "mozilla/dom/ReferrerInfo.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerLoadInfo.cpp firefox-85.0+build1/dom/workers/WorkerLoadInfo.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerLoadInfo.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerLoadInfo.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/nsCSPUtils.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "mozilla/LoadContext.h"
@@ -20,6 +21,7 @@
 #include "nsICookieJarSettings.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIProtocolHandler.h"
+#include "nsIReferrerInfo.h"
 #include "nsIBrowserChild.h"
 #include "nsScriptSecurityManager.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerLoadInfo.h firefox-85.0+build1/dom/workers/WorkerLoadInfo.h
--- firefox-84.0.2+build1/dom/workers/WorkerLoadInfo.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerLoadInfo.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_workers_WorkerLoadInfo_h
 #define mozilla_dom_workers_WorkerLoadInfo_h
 
+#include "mozilla/OriginAttributes.h"
 #include "mozilla/StorageAccess.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/ChannelInfo.h"
@@ -15,14 +16,17 @@
 
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
+#include "nsIRequest.h"
 #include "nsISupportsImpl.h"
 #include "nsIWeakReferenceUtils.h"
+#include "nsTArray.h"
 
 class nsIChannel;
 class nsIContentSecurityPolicy;
 class nsICookieJarSettings;
 class nsILoadGroup;
 class nsIPrincipal;
+class nsIReferrerInfo;
 class nsIRunnable;
 class nsIScriptContext;
 class nsIBrowserChild;
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerNavigator.h firefox-85.0+build1/dom/workers/WorkerNavigator.h
--- firefox-84.0.2+build1/dom/workers/WorkerNavigator.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerNavigator.h	2021-01-18 19:58:10.000000000 +0000
@@ -11,7 +11,6 @@
 #include "js/RootingAPI.h"
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/workerinternals/RuntimeService.h"
@@ -22,6 +21,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace webgpu {
 class Instance;
 }  // namespace webgpu
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerPrivate.cpp firefox-85.0+build1/dom/workers/WorkerPrivate.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerPrivate.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerPrivate.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,15 +15,22 @@
 #include "js/LocaleSensitive.h"
 #include "js/MemoryMetrics.h"
 #include "js/SourceText.h"
+#include "GeckoProfiler.h"
 #include "MessageEventRunnable.h"
+#include "mozilla/BasePrincipal.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Result.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_dom.h"
+#include "mozilla/dom/BrowsingContextGroup.h"
 #include "mozilla/dom/CallbackDebuggerNotification.h"
 #include "mozilla/dom/ClientManager.h"
 #include "mozilla/dom/ClientState.h"
 #include "mozilla/dom/Console.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DOMTypes.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/Exceptions.h"
@@ -54,6 +61,7 @@
 #include "nsCycleCollector.h"
 #include "nsGlobalWindowInner.h"
 #include "nsNetUtil.h"
+#include "nsIFile.h"
 #include "nsIMemoryReporter.h"
 #include "nsIPermissionManager.h"
 #include "nsIProtocolHandler.h"
@@ -192,13 +200,11 @@
   }
 
   nsresult Cancel() override {
-    nsresult rv;
-    nsCOMPtr<nsICancelableRunnable> cancelable =
+    nsCOMPtr<nsIDiscardableRunnable> doomed =
         do_QueryInterface(mWrappedRunnable);
-    MOZ_ASSERT(cancelable);  // We checked this earlier!
-    rv = cancelable->Cancel();
-    nsresult rv2 = WorkerRunnable::Cancel();
-    return NS_FAILED(rv) ? rv : rv2;
+    MOZ_ASSERT(doomed);  // We checked this earlier!
+    doomed->OnDiscard();
+    return WorkerRunnable::Cancel();
   }
 };
 
@@ -1564,9 +1570,11 @@
     return workerRunnable.forget();
   }
 
-  nsCOMPtr<nsICancelableRunnable> cancelable = do_QueryInterface(runnable);
-  if (!cancelable) {
-    MOZ_CRASH("All runnables destined for a worker thread must be cancelable!");
+  nsCOMPtr<nsIDiscardableRunnable> maybe = do_QueryInterface(runnable);
+  if (!maybe) {
+    MOZ_CRASH(
+        "All runnables destined for a worker thread must be "
+        "nsIDiscardableRunnable!");
   }
 
   workerRunnable = new ExternalRunnableWrapper(this, runnable);
@@ -3264,10 +3272,10 @@
 
   data->mPeriodicGCTimerRunning = false;
   data->mIdleGCTimerRunning = false;
-  LOG(WorkerLog(),
-      ("Worker %p canceled GC timer because %s\n", this,
-       aMode == PeriodicTimer ? "periodic"
-                              : aMode == IdleTimer ? "idle" : "none"));
+  LOG(WorkerLog(), ("Worker %p canceled GC timer because %s\n", this,
+                    aMode == PeriodicTimer ? "periodic"
+                    : aMode == IdleTimer   ? "idle"
+                                           : "none"));
 
   if (aMode == NoTimer) {
     return;
@@ -4877,7 +4885,7 @@
   if (aShrinking || aCollectChildren) {
     JS::PrepareForFullGC(aCx);
 
-    if (aShrinking) {
+    if (aShrinking && mSyncLoopStack.IsEmpty()) {
       JS::NonIncrementalGC(aCx, GC_SHRINK, JS::GCReason::DOM_WORKER);
 
       // Check whether the CC collected anything and if so GC again. This is
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerPrivate.h firefox-85.0+build1/dom/workers/WorkerPrivate.h
--- firefox-84.0.2+build1/dom/workers/WorkerPrivate.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerPrivate.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_workers_workerprivate_h__
 #define mozilla_dom_workers_workerprivate_h__
 
+#include <bitset>
 #include "MainThreadUtils.h"
 #include "ScriptLoader.h"
 #include "js/ContextOptions.h"
@@ -34,6 +35,7 @@
 #include "mozilla/dom/workerinternals/JSSettings.h"
 #include "mozilla/dom/workerinternals/Queue.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIEventTarget.h"
 #include "nsILoadInfo.h"
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerRef.cpp firefox-85.0+build1/dom/workers/WorkerRef.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerRef.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerRef.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -4,9 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "WorkerRef.h"
+#include "mozilla/dom/WorkerRef.h"
 
-#include "mozilla/Unused.h"
+#include "nsDebug.h"
 #include "WorkerRunnable.h"
 #include "WorkerPrivate.h"
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerRef.h firefox-85.0+build1/dom/workers/WorkerRef.h
--- firefox-84.0.2+build1/dom/workers/WorkerRef.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerRef.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,10 +7,10 @@
 #ifndef mozilla_dom_workers_WorkerRef_h
 #define mozilla_dom_workers_WorkerRef_h
 
-#include "mozilla/dom/WorkerCommon.h"
-#include "mozilla/dom/WorkerStatus.h"
-#include "mozilla/UniquePtr.h"
 #include <functional>
+#include "mozilla/dom/WorkerStatus.h"
+#include "mozilla/RefPtr.h"
+#include "nsISupports.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerRunnable.cpp firefox-85.0+build1/dom/workers/WorkerRunnable.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerRunnable.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerRunnable.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -6,23 +6,31 @@
 
 #include "WorkerRunnable.h"
 
-#include "nsGlobalWindow.h"
+#include "WorkerPrivate.h"
+#include "WorkerScope.h"
+#include "js/RootingAPI.h"
+#include "jsapi.h"
+#include "jsfriendapi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/DebugOnly.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Telemetry.h"
+#include "mozilla/TelemetryHistogramEnums.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/Worker.h"
+#include "mozilla/dom/WorkerCommon.h"
+#include "nsDebug.h"
+#include "nsGlobalWindowInner.h"
+#include "nsID.h"
 #include "nsIEventTarget.h"
 #include "nsIGlobalObject.h"
 #include "nsIRunnable.h"
 #include "nsThreadUtils.h"
-
-#include "mozilla/DebugOnly.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/JSExecutionManager.h"
-#include "mozilla/dom/ScriptSettings.h"
-#include "mozilla/Telemetry.h"
-
-#include "js/RootingAPI.h"
-#include "js/Value.h"
-
-#include "WorkerPrivate.h"
-#include "WorkerScope.h"
+#include "nsWrapperCacheInlines.h"
 
 namespace mozilla {
 namespace dom {
@@ -533,6 +541,8 @@
   mWorkerPrivate->AssertIsOnWorkerThread();
 }
 
+WorkerMainThreadRunnable::~WorkerMainThreadRunnable() = default;
+
 void WorkerMainThreadRunnable::Dispatch(WorkerStatus aFailStatus,
                                         mozilla::ErrorResult& aRv) {
   mWorkerPrivate->AssertIsOnWorkerThread();
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerRunnable.h firefox-85.0+build1/dom/workers/WorkerRunnable.h
--- firefox-84.0.2+build1/dom/workers/WorkerRunnable.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerRunnable.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,18 +7,24 @@
 #ifndef mozilla_dom_workers_workerrunnable_h__
 #define mozilla_dom_workers_workerrunnable_h__
 
-#include "mozilla/dom/WorkerCommon.h"
+#include <cstdint>
+#include <utility>
+#include "MainThreadUtils.h"
+#include "mozilla/Atomics.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/dom/WorkerRef.h"
 #include "mozilla/dom/WorkerStatus.h"
-
+#include "nsCOMPtr.h"
 #include "nsICancelableRunnable.h"
-
-#include "mozilla/Atomics.h"
-#include "nsISupportsImpl.h"
-#include "nsThreadUtils.h" /* nsRunnable */
+#include "nsIRunnable.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsThreadUtils.h"
+#include "nscore.h"
 
 struct JSContext;
 class nsIEventTarget;
+class nsIGlobalObject;
 
 namespace mozilla {
 
@@ -355,7 +361,7 @@
 
   explicit WorkerMainThreadRunnable(WorkerPrivate* aWorkerPrivate,
                                     const nsACString& aTelemetryKey);
-  ~WorkerMainThreadRunnable() = default;
+  ~WorkerMainThreadRunnable();
 
   virtual bool MainThreadRun() = 0;
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerScope.cpp firefox-85.0+build1/dom/workers/WorkerScope.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerScope.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerScope.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -4,48 +4,104 @@
  * 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 "WorkerScope.h"
+#include "mozilla/dom/WorkerScope.h"
 
+#include <stdio.h>
+#include <new>
 #include <utility>
-
 #include "Crypto.h"
+#include "GeckoProfiler.h"
+#include "MainThreadUtils.h"
 #include "Principal.h"
+#include "ScriptLoader.h"
+#include "js/CompilationAndEvaluation.h"
+#include "js/CompileOptions.h"
+#include "js/RealmOptions.h"
+#include "js/RootingAPI.h"
+#include "js/SourceText.h"
+#include "js/Value.h"
+#include "js/Wrapper.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/BaseProfilerMarkersPrerequisites.h"
 #include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/ErrorResult.h"
+#include "mozilla/EventListenerManager.h"
+#include "mozilla/Logging.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Result.h"
+#include "mozilla/StaticAnalysisFunctions.h"
 #include "mozilla/StorageAccess.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BlobURLProtocolHandler.h"
 #include "mozilla/dom/CSPEvalChecker.h"
+#include "mozilla/dom/ClientSource.h"
 #include "mozilla/dom/Clients.h"
+#include "mozilla/dom/Console.h"
 #include "mozilla/dom/DOMMozPromiseRequestHolder.h"
 #include "mozilla/dom/DebuggerNotification.h"
+#include "mozilla/dom/DebuggerNotificationBinding.h"
+#include "mozilla/dom/DebuggerNotificationManager.h"
 #include "mozilla/dom/DedicatedWorkerGlobalScopeBinding.h"
+#include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/IDBFactory.h"
 #include "mozilla/dom/ImageBitmap.h"
+#include "mozilla/dom/ImageBitmapSource.h"
+#include "mozilla/dom/MessagePortBinding.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/SerializedStackHolder.h"
+#include "mozilla/dom/ServiceWorkerDescriptor.h"
 #include "mozilla/dom/ServiceWorkerGlobalScopeBinding.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
 #include "mozilla/dom/ServiceWorkerRegistration.h"
+#include "mozilla/dom/ServiceWorkerRegistrationDescriptor.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/dom/SharedWorkerGlobalScopeBinding.h"
 #include "mozilla/dom/SimpleGlobalObject.h"
+#include "mozilla/dom/TimeoutHandler.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerDebuggerGlobalScopeBinding.h"
 #include "mozilla/dom/WorkerGlobalScopeBinding.h"
 #include "mozilla/dom/WorkerLocation.h"
 #include "mozilla/dom/WorkerNavigator.h"
+#include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
 #include "mozilla/dom/cache/CacheStorage.h"
+#include "mozilla/dom/cache/Types.h"
+#include "mozilla/fallible.h"
+#include "mozilla/gfx/Rect.h"
 #include "nsAtom.h"
+#include "nsCOMPtr.h"
+#include "nsContentUtils.h"
 #include "nsDebug.h"
+#include "nsGkAtoms.h"
+#include "nsIEventTarget.h"
+#include "nsIGlobalObject.h"
+#include "nsIScriptError.h"
 #include "nsISerialEventTarget.h"
+#include "nsIWeakReference.h"
 #include "nsJSUtils.h"
+#include "nsLiteralString.h"
+#include "nsQueryObject.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsThreadUtils.h"
+#include "nsWeakReference.h"
+#include "nsWrapperCacheInlines.h"
+#include "nscore.h"
 #include "xpcpublic.h"
 
 #ifdef ANDROID
@@ -110,6 +166,12 @@
   return true;
 };
 
+namespace workerinternals {
+void NamedWorkerGlobalScopeMixin::GetName(DOMString& aName) const {
+  aName.AsAString() = mName;
+}
+}  // namespace workerinternals
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(WorkerGlobalScopeBase)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WorkerGlobalScopeBase,
@@ -160,6 +222,8 @@
   BindToOwner(static_cast<nsIGlobalObject*>(this));
 }
 
+WorkerGlobalScopeBase::~WorkerGlobalScopeBase() = default;
+
 JSObject* WorkerGlobalScopeBase::GetGlobalJSObject() {
   mWorkerPrivate->AssertIsOnWorkerThread();
   return GetWrapper();
@@ -175,6 +239,14 @@
   return mWorkerPrivate->IsSharedMemoryAllowed();
 }
 
+Maybe<ClientInfo> WorkerGlobalScopeBase::GetClientInfo() const {
+  return Some(mClientSource->Info());
+}
+
+Maybe<ServiceWorkerDescriptor> WorkerGlobalScopeBase::GetController() const {
+  return mClientSource->GetController();
+}
+
 void WorkerGlobalScopeBase::Control(
     const ServiceWorkerDescriptor& aServiceWorker) {
   mWorkerPrivate->AssertIsOnWorkerThread();
@@ -263,6 +335,8 @@
                                              WorkerGlobalScopeBase,
                                              nsISupportsWeakReference)
 
+WorkerGlobalScope::~WorkerGlobalScope() = default;
+
 Crypto* WorkerGlobalScope::GetCrypto(ErrorResult& aError) {
   mWorkerPrivate->AssertIsOnWorkerThread();
 
@@ -587,6 +661,11 @@
   return mDebuggerNotificationManager;
 }
 
+Maybe<EventCallbackDebuggerNotificationType>
+WorkerGlobalScope::GetDebuggerNotificationType() const {
+  return Some(EventCallbackDebuggerNotificationType::Global);
+}
+
 RefPtr<ServiceWorkerRegistration>
 WorkerGlobalScope::GetServiceWorkerRegistration(
     const ServiceWorkerRegistrationDescriptor& aDescriptor) const {
@@ -742,6 +821,8 @@
       mRegistration(
           GetOrCreateServiceWorkerRegistration(aRegistrationDescriptor)) {}
 
+ServiceWorkerGlobalScope::~ServiceWorkerGlobalScope() = default;
+
 bool ServiceWorkerGlobalScope::WrapGlobalObject(
     JSContext* aCx, JS::MutableHandle<JSObject*> aReflector) {
   mWorkerPrivate->AssertIsOnWorkerThread();
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerScope.h firefox-85.0+build1/dom/workers/WorkerScope.h
--- firefox-84.0.2+build1/dom/workers/WorkerScope.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerScope.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,26 +7,19 @@
 #ifndef mozilla_dom_workerscope_h__
 #define mozilla_dom_workerscope_h__
 
+#include "js/TypeDecls.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/dom/ClientSource.h"
-#include "mozilla/dom/Console.h"
-#include "mozilla/dom/DOMString.h"
-#include "mozilla/dom/EventCallbackDebuggerNotification.h"
 #include "mozilla/dom/ImageBitmapSource.h"
-#include "mozilla/dom/RequestBinding.h"
-#include "mozilla/dom/RequestBinding.h"
 #include "nsCOMPtr.h"
-#include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIGlobalObject.h"
-#include "nsISupportsImpl.h"
+#include "nsISupports.h"
 #include "nsWeakReference.h"
 
 #ifdef XP_WIN
@@ -37,30 +30,39 @@
 class nsISerialEventTarget;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class AnyCallback;
 enum class CallerType : uint32_t;
 class ClientInfo;
+class ClientSource;
 class Clients;
 class Console;
 class Crypto;
 class DOMString;
 class DebuggerNotificationManager;
+enum class EventCallbackDebuggerNotificationType : uint8_t;
+class EventHandlerNonNull;
 class Function;
 class IDBFactory;
 class OnErrorEventHandlerNonNull;
 template <typename T>
 class Optional;
+class Performance;
 struct PostMessageOptions;
 class Promise;
+class RequestOrUSVString;
 template <typename T>
 class Sequence;
 class ServiceWorkerDescriptor;
+class ServiceWorkerRegistration;
 class ServiceWorkerRegistrationDescriptor;
 class WorkerLocation;
 class WorkerNavigator;
 class WorkerPrivate;
+struct RequestInit;
 
 namespace cache {
 
@@ -96,13 +98,9 @@
 
   bool IsSharedMemoryAllowed() const final;
 
-  Maybe<ClientInfo> GetClientInfo() const final {
-    return Some(mClientSource->Info());
-  }
+  Maybe<ClientInfo> GetClientInfo() const final;
 
-  Maybe<ServiceWorkerDescriptor> GetController() const final {
-    return mClientSource->GetController();
-  }
+  Maybe<ServiceWorkerDescriptor> GetController() const final;
 
   virtual void Control(const ServiceWorkerDescriptor& aServiceWorker);
 
@@ -138,7 +136,7 @@
   void WorkerPrivateSaysAllowScript() { StopForbiddingScript(); }
 
  protected:
-  ~WorkerGlobalScopeBase() = default;
+  ~WorkerGlobalScopeBase();
 
   const NotNull<WorkerPrivate*> mWorkerPrivate;
 
@@ -154,7 +152,7 @@
  public:
   explicit NamedWorkerGlobalScopeMixin(const nsAString& aName) : mName(aName) {}
 
-  void GetName(DOMString& aName) const { aName.AsAString() = mName; }
+  void GetName(DOMString& aName) const;
 
  protected:
   ~NamedWorkerGlobalScopeMixin() = default;
@@ -186,9 +184,7 @@
   DebuggerNotificationManager* GetExistingDebuggerNotificationManager() final;
 
   Maybe<EventCallbackDebuggerNotificationType> GetDebuggerNotificationType()
-      const final {
-    return Some(EventCallbackDebuggerNotificationType::Global);
-  }
+      const final;
 
   // WorkerGlobalScope WebIDL implementation
   WorkerGlobalScope* Self() { return this; }
@@ -282,7 +278,7 @@
   void StorageAccessPermissionGranted();
 
  protected:
-  ~WorkerGlobalScope() = default;
+  ~WorkerGlobalScope();
 
  private:
   MOZ_CAN_RUN_SCRIPT
@@ -390,7 +386,7 @@
   IMPL_EVENT_HANDLER(pushsubscriptionchange)
 
  private:
-  ~ServiceWorkerGlobalScope() = default;
+  ~ServiceWorkerGlobalScope();
 
   void NoteFetchHandlerWasAdded() const;
 
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerThread.cpp firefox-85.0+build1/dom/workers/WorkerThread.cpp
--- firefox-84.0.2+build1/dom/workers/WorkerThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerThread.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,19 +6,27 @@
 
 #include "WorkerThread.h"
 
-#include "EventQueue.h"
+#include <utility>
 #include "WorkerPrivate.h"
 #include "WorkerRunnable.h"
-#include "mozilla/AbstractThread.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Atomics.h"
+#include "mozilla/CycleCollectedJSContext.h"
+#include "mozilla/EventQueue.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/NotNull.h"
 #include "mozilla/PerformanceCounter.h"
 #include "mozilla/ThreadEventQueue.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/ipc/BackgroundChild.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
+#include "nsICancelableRunnable.h"
+#include "nsIEventTarget.h"
+#include "nsIRunnable.h"
 #include "nsIThreadInternal.h"
-
-#ifdef DEBUG
-#  include "nsThreadManager.h"
-#endif
+#include "nsString.h"
+#include "prthread.h"
 
 namespace mozilla {
 
@@ -236,15 +244,16 @@
 
 #ifdef DEBUG
   if (runnable && !onWorkerThread) {
-    nsCOMPtr<nsICancelableRunnable> cancelable = do_QueryInterface(runnable);
+    nsCOMPtr<nsIDiscardableRunnable> discardable = do_QueryInterface(runnable);
 
     {
       MutexAutoLock lock(mLock);
 
-      // Only enforce cancelable runnables after we've started the worker loop.
+      // Only enforce discardable runnables after we've started the worker loop.
       if (!mAcceptingNonWorkerRunnables) {
-        MOZ_ASSERT(cancelable,
-                   "Only nsICancelableRunnable may be dispatched to a worker!");
+        MOZ_ASSERT(
+            discardable,
+            "Only nsIDiscardableRunnable may be dispatched to a worker!");
       }
     }
   }
diff -Nru firefox-84.0.2+build1/dom/workers/WorkerThread.h firefox-85.0+build1/dom/workers/WorkerThread.h
--- firefox-84.0.2+build1/dom/workers/WorkerThread.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/workers/WorkerThread.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,17 +7,21 @@
 #ifndef mozilla_dom_workers_WorkerThread_h__
 #define mozilla_dom_workers_WorkerThread_h__
 
-#include "mozilla/Attributes.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/CondVar.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/dom/SafeRefPtr.h"
-#include "nsISupportsImpl.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/PerformanceCounter.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/dom/SafeRefPtr.h"
+#include "nsISupports.h"
 #include "nsThread.h"
+#include "nscore.h"
 
 class nsIRunnable;
 
 namespace mozilla {
+class Runnable;
+
 namespace dom {
 
 class WorkerRunnable;
diff -Nru firefox-84.0.2+build1/dom/worklet/Worklet.cpp firefox-85.0+build1/dom/worklet/Worklet.cpp
--- firefox-84.0.2+build1/dom/worklet/Worklet.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/Worklet.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/WorkletBinding.h"
 #include "mozilla/dom/WorkletGlobalScope.h"
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Fetch.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "mozilla/dom/Request.h"
@@ -404,7 +405,8 @@
   // https://html.spec.whatwg.org/multipage/webappapis.html#run-a-module-script
   // without /rethrow errors/ and so unhandled exceptions do not cause the
   // promise to be rejected.
-  JS::ModuleEvaluate(cx, module);
+  JS::Rooted<JS::Value> ignored(cx);
+  JS::ModuleEvaluate(cx, module, &ignored);
 
   // All done.
   mResult = NS_OK;
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletGlobalScope.cpp firefox-85.0+build1/dom/worklet/WorkletGlobalScope.cpp
--- firefox-84.0.2+build1/dom/worklet/WorkletGlobalScope.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletGlobalScope.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "WorkletGlobalScope.h"
 #include "mozilla/dom/WorkletGlobalScopeBinding.h"
 #include "mozilla/dom/WorkletImpl.h"
+#include "mozilla/dom/WorkletThread.h"
 #include "mozilla/dom/Console.h"
 #include "nsJSUtils.h"
 
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletGlobalScope.h firefox-85.0+build1/dom/worklet/WorkletGlobalScope.h
--- firefox-84.0.2+build1/dom/worklet/WorkletGlobalScope.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletGlobalScope.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_WorkletGlobalScope_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -25,6 +24,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class WorkletImpl;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/worklet/Worklet.h firefox-85.0+build1/dom/worklet/Worklet.h
--- firefox-84.0.2+build1/dom/worklet/Worklet.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/Worklet.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_Worklet_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
 #include "nsCOMPtr.h"
@@ -17,6 +16,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class WorkletImpl;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletImpl.cpp firefox-85.0+build1/dom/worklet/WorkletImpl.cpp
--- firefox-84.0.2+build1/dom/worklet/WorkletImpl.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletImpl.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,9 +11,11 @@
 
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/RegisterWorkletBindings.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/WorkletBinding.h"
+#include "mozilla/dom/WorkletGlobalScope.h"
 #include "nsGlobalWindowInner.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletPrincipals.cpp firefox-85.0+build1/dom/worklet/WorkletPrincipals.cpp
--- firefox-84.0.2+build1/dom/worklet/WorkletPrincipals.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletPrincipals.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "WorkletPrincipals.h"
 
+#include "mozilla/dom/WorkletImpl.h"
 #include "nsJSPrincipals.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletThread.cpp firefox-85.0+build1/dom/worklet/WorkletThread.cpp
--- firefox-84.0.2+build1/dom/worklet/WorkletThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletThread.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,9 +8,13 @@
 #include "prthread.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollector.h"
+#include "nsJSEnvironment.h"
 #include "mozilla/dom/AtomList.h"
+#include "mozilla/dom/WorkletGlobalScope.h"
+#include "mozilla/dom/WorkletPrincipals.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/EventQueue.h"
 #include "mozilla/ThreadEventQueue.h"
 #include "js/Exception.h"
diff -Nru firefox-84.0.2+build1/dom/worklet/WorkletThread.h firefox-85.0+build1/dom/worklet/WorkletThread.h
--- firefox-84.0.2+build1/dom/worklet/WorkletThread.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/worklet/WorkletThread.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/WorkletImpl.h"
+#include "nsIObserver.h"
 #include "nsThread.h"
 
 class nsIRunnable;
diff -Nru firefox-84.0.2+build1/dom/xhr/tests/mochitest.ini firefox-85.0+build1/dom/xhr/tests/mochitest.ini
--- firefox-84.0.2+build1/dom/xhr/tests/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/tests/mochitest.ini	2021-01-18 19:58:11.000000000 +0000
@@ -104,7 +104,6 @@
 support-files = test_XHR_timeout.js
 [test_xhr_withCredentials.html]
 [test_XHRDocURI.html]
-skip-if = fission
 [test_XHRResponseURL.html]
 [test_XHRSendData.html]
 [test_sync_xhr_document_write_with_iframe.html]
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestEventTarget.cpp firefox-85.0+build1/dom/xhr/XMLHttpRequestEventTarget.cpp
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestEventTarget.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestEventTarget.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "XMLHttpRequestEventTarget.h"
 
+#include "mozilla/dom/DebuggerNotificationBinding.h"
+
 namespace mozilla {
 namespace dom {
 
@@ -25,6 +27,11 @@
 NS_IMPL_ADDREF_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(XMLHttpRequestEventTarget, DOMEventTargetHelper)
 
+mozilla::Maybe<EventCallbackDebuggerNotificationType>
+XMLHttpRequestEventTarget::GetDebuggerNotificationType() const {
+  return mozilla::Some(EventCallbackDebuggerNotificationType::Xhr);
+}
+
 void XMLHttpRequestEventTarget::DisconnectFromOwner() {
   DOMEventTargetHelper::DisconnectFromOwner();
 }
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestEventTarget.h firefox-85.0+build1/dom/xhr/XMLHttpRequestEventTarget.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestEventTarget.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestEventTarget.h	2021-01-18 19:58:11.000000000 +0000
@@ -28,9 +28,7 @@
                                            DOMEventTargetHelper)
 
   mozilla::Maybe<EventCallbackDebuggerNotificationType>
-  GetDebuggerNotificationType() const override {
-    return mozilla::Some(EventCallbackDebuggerNotificationType::Xhr);
-  }
+  GetDebuggerNotificationType() const override;
 
   IMPL_EVENT_HANDLER(loadstart)
   IMPL_EVENT_HANDLER(progress)
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequest.h firefox-85.0+build1/dom/xhr/XMLHttpRequest.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequest.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequest.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,9 +8,12 @@
 #define mozilla_dom_XMLHttpRequest_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/XMLHttpRequestEventTarget.h"
 #include "mozilla/dom/XMLHttpRequestBinding.h"
 
+class nsIInputStream;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestMainThread.cpp firefox-85.0+build1/dom/xhr/XMLHttpRequestMainThread.cpp
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestMainThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestMainThread.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -32,9 +32,11 @@
 #include "mozilla/Encoding.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/LoadContext.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
@@ -53,6 +55,7 @@
 #include "nsIAuthPrompt.h"
 #include "nsIAuthPrompt2.h"
 #include "nsIClassOfService.h"
+#include "nsIHttpChannel.h"
 #include "nsISupportsPriority.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsStreamUtils.h"
@@ -64,6 +67,7 @@
 #include "nsVariant.h"
 #include "nsIScriptError.h"
 #include "nsICachingChannel.h"
+#include "nsICookieJarSettings.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsError.h"
@@ -1396,7 +1400,8 @@
   // Gecko-specific
   if (!aAsync && !DontWarnAboutSyncXHR() && GetOwner() &&
       GetOwner()->GetExtantDoc()) {
-    GetOwner()->GetExtantDoc()->WarnOnceAbout(Document::eSyncXMLHttpRequest);
+    GetOwner()->GetExtantDoc()->WarnOnceAbout(
+        DeprecatedOperations::eSyncXMLHttpRequest);
   }
 
   Telemetry::Accumulate(Telemetry::XMLHTTPREQUEST_ASYNC_OR_SYNC,
@@ -2457,7 +2462,7 @@
     rv = httpChannel->SetRequestMethod(mRequestMethod);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    httpChannel->SetSource(profiler_get_backtrace());
+    httpChannel->SetSource(profiler_capture_backtrace());
 
     // Set the initiator type
     nsCOMPtr<nsITimedChannel> timedChannel(do_QueryInterface(httpChannel));
@@ -3239,7 +3244,8 @@
   mOriginStack = std::move(aOriginStack);
 }
 
-void XMLHttpRequestMainThread::SetSource(UniqueProfilerBacktrace aSource) {
+void XMLHttpRequestMainThread::SetSource(
+    UniquePtr<ProfileChunkedBuffer> aSource) {
   if (!mChannel) {
     return;
   }
@@ -3674,6 +3680,13 @@
   return NS_OK;
 }
 
+XMLHttpRequestMainThread::nsHeaderVisitor::nsHeaderVisitor(
+    const XMLHttpRequestMainThread& aXMLHttpRequest,
+    NotNull<nsIHttpChannel*> aHttpChannel)
+    : mXHR(aXMLHttpRequest), mHttpChannel(aHttpChannel) {}
+
+XMLHttpRequestMainThread::nsHeaderVisitor::~nsHeaderVisitor() = default;
+
 void XMLHttpRequestMainThread::MaybeCreateBlobStorage() {
   MOZ_ASSERT(mResponseType == XMLHttpRequestResponseType::Blob);
 
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestMainThread.h firefox-85.0+build1/dom/xhr/XMLHttpRequestMainThread.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestMainThread.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestMainThread.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,11 +10,11 @@
 #include <bitset>
 #include "nsISupportsUtils.h"
 #include "nsIURI.h"
-#include "nsIHttpChannel.h"
 #include "mozilla/dom/Document.h"
 #include "nsIStreamListener.h"
 #include "nsIChannelEventSink.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIDOMEventListener.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsIProgressEventSink.h"
@@ -56,10 +56,13 @@
 typedef __StatusTmp Status;
 #endif
 
+class nsIHttpChannel;
 class nsIJARChannel;
 class nsILoadGroup;
 
 namespace mozilla {
+class ProfileChunkedBuffer;
+
 namespace dom {
 
 class DOMString;
@@ -396,7 +399,7 @@
 
   void SetOriginStack(UniquePtr<SerializedStackHolder> aOriginStack);
 
-  void SetSource(UniqueProfilerBacktrace aSource);
+  void SetSource(UniquePtr<ProfileChunkedBuffer> aSource);
 
   virtual uint16_t ErrorCode() const override {
     return static_cast<uint16_t>(mErrorLoad);
@@ -559,8 +562,7 @@
     NS_DECL_ISUPPORTS
     NS_DECL_NSIHTTPHEADERVISITOR
     nsHeaderVisitor(const XMLHttpRequestMainThread& aXMLHttpRequest,
-                    NotNull<nsIHttpChannel*> aHttpChannel)
-        : mXHR(aXMLHttpRequest), mHttpChannel(aHttpChannel) {}
+                    NotNull<nsIHttpChannel*> aHttpChannel);
     const nsACString& Headers() {
       for (uint32_t i = 0; i < mHeaderList.Length(); i++) {
         HeaderEntry& header = mHeaderList.ElementAt(i);
@@ -574,7 +576,7 @@
     }
 
    private:
-    virtual ~nsHeaderVisitor() = default;
+    virtual ~nsHeaderVisitor();
 
     nsTArray<HeaderEntry> mHeaderList;
     nsCString mHeaders;
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestString.cpp firefox-85.0+build1/dom/xhr/XMLHttpRequestString.cpp
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestString.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestString.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -164,6 +164,8 @@
     XMLHttpRequestString& aString)
     : mBuffer(aString.mBuffer), mLock(aString.mBuffer->mMutex) {}
 
+XMLHttpRequestStringWriterHelper::~XMLHttpRequestStringWriterHelper() = default;
+
 uint32_t XMLHttpRequestStringWriterHelper::Length() const {
   return mBuffer->UnsafeLength();
 }
@@ -181,6 +183,9 @@
         XMLHttpRequestStringSnapshot& aSnapshot)
     : mBuffer(aSnapshot.mBuffer), mLock(aSnapshot.mBuffer->mMutex) {}
 
+XMLHttpRequestStringSnapshotReaderHelper::
+    ~XMLHttpRequestStringSnapshotReaderHelper() = default;
+
 const char16_t* XMLHttpRequestStringSnapshotReaderHelper::Buffer() const {
   return mBuffer->UnsafeData().BeginReading();
 }
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestString.h firefox-85.0+build1/dom/xhr/XMLHttpRequestString.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestString.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestString.h	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,8 @@
 namespace mozilla {
 namespace dom {
 
+class ArrayBufferBuilder;
+class BlobImpl;
 class DOMString;
 class XMLHttpRequestStringBuffer;
 class XMLHttpRequestStringSnapshot;
@@ -61,6 +63,7 @@
 class MOZ_STACK_CLASS XMLHttpRequestStringWriterHelper final {
  public:
   explicit XMLHttpRequestStringWriterHelper(XMLHttpRequestString& aString);
+  ~XMLHttpRequestStringWriterHelper();
 
   /**
    * The existing length of the string. Do not call during BulkWrite().
@@ -126,6 +129,7 @@
  public:
   explicit XMLHttpRequestStringSnapshotReaderHelper(
       XMLHttpRequestStringSnapshot& aSnapshot);
+  ~XMLHttpRequestStringSnapshotReaderHelper();
 
   const char16_t* Buffer() const;
 
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestUpload.h firefox-85.0+build1/dom/xhr/XMLHttpRequestUpload.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestUpload.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestUpload.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,9 @@
 
 #include "mozilla/dom/XMLHttpRequestEventTarget.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/EventListenerManager.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestWorker.cpp firefox-85.0+build1/dom/xhr/XMLHttpRequestWorker.cpp
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestWorker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestWorker.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -12,15 +12,18 @@
 #include "jsfriendapi.h"
 #include "js/ArrayBuffer.h"  // JS::Is{,Detached}ArrayBufferObject
 #include "js/GCPolicyAPI.h"
+#include "js/JSON.h"
 #include "js/RootingAPI.h"  // JS::{Handle,Heap},PersistentRooted
 #include "js/TracingAPI.h"
 #include "js/Value.h"  // JS::{Undefined,}Value
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/Exceptions.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 #include "mozilla/dom/ProgressEvent.h"
+#include "mozilla/dom/SerializedStackHolder.h"
 #include "mozilla/dom/StreamBlobImpl.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "mozilla/dom/UnionConversions.h"
@@ -36,6 +39,7 @@
 #include "nsJSUtils.h"
 #include "nsThreadUtils.h"
 
+#include "XMLHttpRequestMainThread.h"
 #include "XMLHttpRequestUpload.h"
 
 #include "mozilla/UniquePtr.h"
@@ -650,7 +654,7 @@
 
   // Remember the worker thread's stack when the XHR was opened for profiling
   // purposes.
-  UniqueProfilerBacktrace mSource;
+  UniquePtr<ProfileChunkedBuffer> mSource;
 
  public:
   OpenRunnable(WorkerPrivate* aWorkerPrivate, Proxy* aProxy,
@@ -661,7 +665,7 @@
                XMLHttpRequestResponseType aResponseType,
                const nsString& aMimeTypeOverride,
                UniquePtr<SerializedStackHolder> aOriginStack,
-               UniqueProfilerBacktrace aSource = nullptr)
+               UniquePtr<ProfileChunkedBuffer> aSource = nullptr)
       : WorkerThreadProxySyncRunnable(aWorkerPrivate, aProxy),
         mMethod(aMethod),
         mURL(aURL),
@@ -1738,7 +1742,7 @@
       mWorkerPrivate, mProxy, aMethod, aUrl, aUser, aPassword,
       mBackgroundRequest, mWithCredentials, mTimeout, mResponseType,
       alsoOverrideMimeType ? mMimeTypeOverride : VoidString(), std::move(stack),
-      profiler_get_backtrace());
+      profiler_capture_backtrace());
 
   ++mProxy->mOpenCount;
   runnable->Dispatch(Canceling, aRv);
diff -Nru firefox-84.0.2+build1/dom/xhr/XMLHttpRequestWorker.h firefox-85.0+build1/dom/xhr/XMLHttpRequestWorker.h
--- firefox-84.0.2+build1/dom/xhr/XMLHttpRequestWorker.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xhr/XMLHttpRequestWorker.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,9 @@
 #include "mozilla/dom/BodyExtractor.h"
 #include "mozilla/dom/TypedArray.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/BlobImpl.h"
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/xml/nsXMLContentSink.cpp firefox-85.0+build1/dom/xml/nsXMLContentSink.cpp
--- firefox-84.0.2+build1/dom/xml/nsXMLContentSink.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xml/nsXMLContentSink.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsGkAtoms.h"
 #include "nsContentUtils.h"
 #include "nsDocElementCreatedNotificationRunner.h"
+#include "nsIDocShell.h"
 #include "nsIScriptContext.h"
 #include "nsNameSpaceManager.h"
 #include "nsIScriptSecurityManager.h"
diff -Nru firefox-84.0.2+build1/dom/xml/nsXMLContentSink.h firefox-85.0+build1/dom/xml/nsXMLContentSink.h
--- firefox-84.0.2+build1/dom/xml/nsXMLContentSink.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xml/nsXMLContentSink.h	2021-01-18 19:58:10.000000000 +0000
@@ -103,7 +103,8 @@
   // stylesheets are all done loading.
   virtual void MaybeStartLayout(bool aIgnorePendingSheets);
 
-  virtual nsresult AddAttributes(const char16_t** aNode, Element* aElement);
+  virtual nsresult AddAttributes(const char16_t** aNode,
+                                 mozilla::dom::Element* aElement);
   nsresult AddText(const char16_t* aString, int32_t aLength);
 
   virtual bool OnOpenContainer(const char16_t** aAtts, uint32_t aAttsCount,
diff -Nru firefox-84.0.2+build1/dom/xml/nsXMLFragmentContentSink.cpp firefox-85.0+build1/dom/xml/nsXMLFragmentContentSink.cpp
--- firefox-84.0.2+build1/dom/xml/nsXMLFragmentContentSink.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xml/nsXMLFragmentContentSink.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/dom/NodeInfo.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsError.h"
+#include "nsIDocShell.h"
 #include "nsIScriptError.h"
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
diff -Nru firefox-84.0.2+build1/dom/xml/XMLDocument.cpp firefox-85.0+build1/dom/xml/XMLDocument.cpp
--- firefox-84.0.2+build1/dom/xml/XMLDocument.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xml/XMLDocument.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -26,6 +26,7 @@
 #include "nsThreadUtils.h"
 #include "nsJSUtils.h"
 #include "nsCRT.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentPolicyUtils.h"
 #include "nsIConsoleService.h"
diff -Nru firefox-84.0.2+build1/dom/xml/XMLStylesheetProcessingInstruction.cpp firefox-85.0+build1/dom/xml/XMLStylesheetProcessingInstruction.cpp
--- firefox-84.0.2+build1/dom/xml/XMLStylesheetProcessingInstruction.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xml/XMLStylesheetProcessingInstruction.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -5,6 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "XMLStylesheetProcessingInstruction.h"
+
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/ReferrerInfo.h"
 #include "nsContentUtils.h"
 #include "nsNetUtil.h"
 
diff -Nru firefox-84.0.2+build1/dom/xslt/base/txExpandedNameMap.h firefox-85.0+build1/dom/xslt/base/txExpandedNameMap.h
--- firefox-84.0.2+build1/dom/xslt/base/txExpandedNameMap.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/base/txExpandedNameMap.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #define TRANSFRMX_EXPANDEDNAMEMAP_H
 
 #include "mozilla/UniquePtr.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsError.h"
 #include "txExpandedName.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xpath/txExprParser.cpp firefox-85.0+build1/dom/xslt/xpath/txExprParser.cpp
--- firefox-84.0.2+build1/dom/xslt/xpath/txExprParser.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xpath/txExprParser.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -13,6 +13,7 @@
 
 #include <utility>
 
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsError.h"
 #include "nsGkAtoms.h"
 #include "txExpr.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xpath/XPathEvaluator.cpp firefox-85.0+build1/dom/xslt/xpath/XPathEvaluator.cpp
--- firefox-84.0.2+build1/dom/xslt/xpath/XPathEvaluator.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xpath/XPathEvaluator.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "XPathResult.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/XPathEvaluatorBinding.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xpath/XPathEvaluator.h firefox-85.0+build1/dom/xslt/xpath/XPathEvaluator.h
--- firefox-84.0.2+build1/dom/xslt/xpath/XPathEvaluator.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xpath/XPathEvaluator.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,6 @@
 #include "mozilla/dom/NonRefcountedDOMObject.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Document.h"
 
 class nsINode;
@@ -17,6 +16,8 @@
 class txResultRecycler;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class GlobalObject;
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp firefox-85.0+build1/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #include "nsContentPolicyUtils.h"
 #include "nsIStreamConverterService.h"
 #include "nsSyncLoadService.h"
+#include "nsIHttpChannel.h"
 #include "nsIURI.h"
 #include "nsIPrincipal.h"
 #include "nsIWindowWatcher.h"
@@ -28,6 +29,7 @@
 #include "txStylesheetCompiler.h"
 #include "txXMLUtils.h"
 #include "nsAttrName.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIScriptError.h"
 #include "nsError.h"
 #include "mozilla/Attributes.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txMozillaXMLOutput.h firefox-85.0+build1/dom/xslt/xslt/txMozillaXMLOutput.h
--- firefox-84.0.2+build1/dom/xslt/xslt/txMozillaXMLOutput.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txMozillaXMLOutput.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,10 +10,10 @@
 #include "nsIScriptLoaderObserver.h"
 #include "txOutputFormat.h"
 #include "nsCOMArray.h"
+#include "nsCOMPtr.h"
 #include "nsICSSLoaderObserver.h"
 #include "txStack.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/Element.h"
 
 class nsIContent;
 class nsAtom;
@@ -25,6 +25,7 @@
 namespace dom {
 class Document;
 class DocumentFragment;
+class Element;
 }  // namespace dom
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txMozillaXSLTProcessor.h firefox-85.0+build1/dom/xslt/xslt/txMozillaXSLTProcessor.h
--- firefox-84.0.2+build1/dom/xslt/xslt/txMozillaXSLTProcessor.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txMozillaXSLTProcessor.h	2021-01-18 19:58:11.000000000 +0000
@@ -13,9 +13,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/dom/ReferrerPolicyBinding.h"
 #include "mozilla/dom/XSLTProcessorBinding.h"
 
 class nsINode;
@@ -26,13 +24,15 @@
 class txIGlobalParameter;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DocGroup;
 class Document;
 class DocumentFragment;
 class GlobalObject;
-
+enum class ReferrerPolicy : uint8_t;
 }  // namespace dom
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txPatternParser.cpp firefox-85.0+build1/dom/xslt/xslt/txPatternParser.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txPatternParser.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txPatternParser.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,8 @@
 #include "txStylesheetCompiler.h"
 #include "txPatternOptimizer.h"
 
+#include "mozilla/UniquePtrExtensions.h"
+
 using mozilla::UniquePtr;
 
 nsresult txPatternParser::createPattern(const nsString& aPattern,
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txStylesheetCompileHandlers.cpp firefox-85.0+build1/dom/xslt/xslt/txStylesheetCompileHandlers.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txStylesheetCompileHandlers.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txStylesheetCompileHandlers.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsGkAtoms.h"
 #include "nsWhitespaceTokenizer.h"
 #include "txCore.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txStylesheetCompiler.cpp firefox-85.0+build1/dom/xslt/xslt/txStylesheetCompiler.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txStylesheetCompiler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txStylesheetCompiler.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsGkAtoms.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txUnknownHandler.cpp firefox-85.0+build1/dom/xslt/xslt/txUnknownHandler.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txUnknownHandler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txUnknownHandler.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include <utility>
 
+#include "mozilla/UniquePtrExtensions.h"
 #include "nsGkAtoms.h"
 #include "txExecutionState.h"
 #include "txStringUtils.h"
diff -Nru firefox-84.0.2+build1/dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp firefox-85.0+build1/dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp
--- firefox-84.0.2+build1/dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -115,11 +115,10 @@
 
 #ifdef TX_TO_STRING
 void txXSLTEnvironmentFunctionCall::appendName(nsAString& aDest) {
-  nsStaticAtom* atom = mType == SYSTEM_PROPERTY
-                           ? nsGkAtoms::systemProperty
-                           : mType == ELEMENT_AVAILABLE
-                                 ? nsGkAtoms::elementAvailable
-                                 : nsGkAtoms::functionAvailable;
+  nsStaticAtom* atom = mType == SYSTEM_PROPERTY ? nsGkAtoms::systemProperty
+                       : mType == ELEMENT_AVAILABLE
+                           ? nsGkAtoms::elementAvailable
+                           : nsGkAtoms::functionAvailable;
   aDest.Append(atom->GetUTF16String());
 }
 #endif
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULCommandDispatcher.cpp firefox-85.0+build1/dom/xul/nsXULCommandDispatcher.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULCommandDispatcher.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULCommandDispatcher.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -150,7 +150,7 @@
 
 NS_IMETHODIMP
 nsXULCommandDispatcher::SetFocusedElement(Element* aElement) {
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
   NS_ENSURE_TRUE(fm, NS_ERROR_FAILURE);
 
   if (aElement) {
@@ -170,7 +170,7 @@
   nsCOMPtr<nsPIDOMWindowOuter> window = nsPIDOMWindowOuter::From(aWindow);
   NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
 
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
   NS_ENSURE_TRUE(fm, NS_ERROR_FAILURE);
 
   // get the containing frame for the window, and set it as focused. This will
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULContentSink.cpp firefox-85.0+build1/dom/xul/nsXULContentSink.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULContentSink.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULContentSink.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -49,6 +49,8 @@
 
 static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");
 
+using namespace mozilla;
+using namespace mozilla::dom;
 //----------------------------------------------------------------------
 
 XULContentSinkImpl::ContextStack::ContextStack() : mTop(nullptr), mDepth(0) {}
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULContentUtils.cpp firefox-85.0+build1/dom/xul/nsXULContentUtils.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULContentUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULContentUtils.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -14,9 +14,11 @@
 
 #include "nsCollationCID.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIContent.h"
 #include "nsICollation.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "nsXULContentUtils.h"
 #include "nsLayoutCID.h"
 #include "nsString.h"
@@ -57,7 +59,7 @@
 
 nsresult nsXULContentUtils::FindChildByTag(nsIContent* aElement,
                                            int32_t aNameSpaceID, nsAtom* aTag,
-                                           Element** aResult) {
+                                           mozilla::dom::Element** aResult) {
   for (nsIContent* child = aElement->GetFirstChild(); child;
        child = child->GetNextSibling()) {
     if (child->IsElement() && child->NodeInfo()->Equals(aTag, aNameSpaceID)) {
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULControllers.cpp firefox-85.0+build1/dom/xul/nsXULControllers.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULControllers.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULControllers.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -19,6 +19,15 @@
 
 //----------------------------------------------------------------------
 
+nsXULControllerData::nsXULControllerData(uint32_t inControllerID,
+                                         nsIController* inController)
+    : mControllerID(inControllerID), mController(inController) {}
+
+nsresult nsXULControllerData::GetController(nsIController** outController) {
+  NS_IF_ADDREF(*outController = mController);
+  return NS_OK;
+}
+
 nsXULControllers::nsXULControllers() : mCurControllerID(0) {}
 
 nsXULControllers::~nsXULControllers(void) { DeleteControllers(); }
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULControllers.h firefox-85.0+build1/dom/xul/nsXULControllers.h
--- firefox-84.0.2+build1/dom/xul/nsXULControllers.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULControllers.h	2021-01-18 19:58:11.000000000 +0000
@@ -20,17 +20,12 @@
 /* non-XPCOM class for holding controllers and their IDs */
 class nsXULControllerData final {
  public:
-  nsXULControllerData(uint32_t inControllerID, nsIController* inController)
-      : mControllerID(inControllerID), mController(inController) {}
-
+  nsXULControllerData(uint32_t inControllerID, nsIController* inController);
   ~nsXULControllerData() = default;
 
   uint32_t GetControllerID() { return mControllerID; }
 
-  nsresult GetController(nsIController** outController) {
-    NS_IF_ADDREF(*outController = mController);
-    return NS_OK;
-  }
+  nsresult GetController(nsIController** outController);
 
   uint32_t mControllerID;
   nsCOMPtr<nsIController> mController;
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULElement.cpp firefox-85.0+build1/dom/xul/nsXULElement.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULElement.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -3,83 +3,111 @@
  * 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 "nsCOMPtr.h"
-#include "nsDOMCID.h"
-#include "nsError.h"
-#include "nsDOMString.h"
-#include "nsAtom.h"
-#include "nsIBaseWindow.h"
-#include "nsIDOMEventListener.h"
-#include "nsIDOMXULControlElement.h"
-#include "nsIDOMXULSelectCntrlItemEl.h"
-#include "mozilla/dom/BindContext.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/CSSRuleBinding.h"
+#include "nsXULElement.h"
+
+#include <new>
+#include <utility>
+#include "AttrArray.h"
+#include "MainThreadUtils.h"
+#include "ReferrerInfo.h"
+#include "Units.h"
+#include "XULFrameElement.h"
+#include "XULMenuElement.h"
+#include "XULPopupElement.h"
+#include "XULTextElement.h"
+#include "XULTooltipElement.h"
+#include "XULTreeElement.h"
+#include "js/CompilationAndEvaluation.h"
+#include "js/CompileOptions.h"
+#include "js/OffThreadScriptCompilation.h"
+#include "js/SourceText.h"
+#include "js/Utility.h"
+#include "jsapi.h"
+#include "mozilla/ArrayIterator.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/DeclarationBlock.h"
+#include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/DeclarationBlock.h"
+#include "mozilla/FlushType.h"
+#include "mozilla/GlobalKeyListener.h"
+#include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/OwningNonNull.h"
 #include "mozilla/PresShell.h"
-#include "js/CompilationAndEvaluation.h"
-#include "js/SourceText.h"
+#include "mozilla/StaticAnalysisFunctions.h"
+#include "mozilla/StaticPtr.h"
+#include "mozilla/URLExtraData.h"
+#include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/BorrowedAttrInfo.h"
+#include "mozilla/dom/CSSRuleBinding.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/DocumentInlines.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/FragmentOrElement.h"
+#include "mozilla/dom/FromParser.h"
+#include "mozilla/dom/MouseEventBinding.h"
+#include "mozilla/dom/MutationEventBinding.h"
+#include "mozilla/dom/NodeInfo.h"
+#include "mozilla/dom/ReferrerPolicyBinding.h"
+#include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/XULBroadcastManager.h"
+#include "mozilla/dom/XULCommandEvent.h"
+#include "mozilla/dom/XULElementBinding.h"
+#include "mozilla/dom/nsCSPUtils.h"
+#include "mozilla/fallible.h"
+#include "nsAtom.h"
+#include "nsAttrValueInlines.h"
+#include "nsAttrValueOrString.h"
+#include "nsCaseTreatment.h"
+#include "nsChangeHint.h"
+#include "nsCOMPtr.h"
+#include "nsCompatibility.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsContentUtils.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionTraversalCallback.h"
+#include "nsDebug.h"
+#include "nsError.h"
 #include "nsFocusManager.h"
-#include "nsHTMLStyleSheet.h"
-#include "nsNameSpaceManager.h"
+#include "nsGkAtoms.h"
+#include "nsIContent.h"
+#include "nsIContentSecurityPolicy.h"
+#include "nsIControllers.h"
+#include "nsID.h"
+#include "nsIDOMEventListener.h"
+#include "nsIDOMXULControlElement.h"
+#include "nsIDOMXULSelectCntrlItemEl.h"
+#include "nsIDocShell.h"
+#include "nsIFocusManager.h"
+#include "nsIFrame.h"
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
-#include "nsIPrincipal.h"
+#include "nsIRunnable.h"
 #include "nsIScriptContext.h"
+#include "nsISupportsUtils.h"
+#include "nsIURI.h"
 #include "nsIXPConnect.h"
-#include "nsViewManager.h"
-#include "nsIWidget.h"
-#include "nsLayoutCID.h"
-#include "nsContentCID.h"
-#include "mozilla/dom/Event.h"
-#include "nsStyleConsts.h"
+#include "nsMenuFrame.h"
+#include "nsMenuPopupFrame.h"
+#include "nsNodeInfoManager.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
+#include "nsPresContext.h"
+#include "nsQueryFrame.h"
 #include "nsString.h"
+#include "nsStyledElement.h"
+#include "nsThreadUtils.h"
 #include "nsXULControllers.h"
 #include "nsXULPopupListener.h"
-#include "nsContentUtils.h"
-#include "nsContentList.h"
-#include "mozilla/InternalMutationEvent.h"
-#include "mozilla/MouseEvents.h"
-#include "nsPIDOMWindow.h"
-#include "nsJSPrincipals.h"
-#include "nsDOMAttributeMap.h"
-#include "nsGkAtoms.h"
-#include "nsFrameLoader.h"
-#include "mozilla/Logging.h"
-#include "nsIControllers.h"
-#include "nsAttrValueOrString.h"
-#include "nsAttrValueInlines.h"
-#include "mozilla/Attributes.h"
-#include "nsIController.h"
-#include "nsQueryObject.h"
-#include <algorithm>
-
-#include "nsReadableUtils.h"
-#include "nsIFrame.h"
-#include "nsNodeInfoManager.h"
-#include "nsXULTooltipListener.h"
-#include "mozilla/EventDispatcher.h"
-#include "mozAutoDocUpdate.h"
-#include "nsCCUncollectableMarker.h"
-#include "nsICSSDeclaration.h"
-#include "nsLayoutUtils.h"
-#include "XULFrameElement.h"
-#include "XULMenuElement.h"
-#include "XULPopupElement.h"
-#include "XULTreeElement.h"
+#include "nsXULPopupManager.h"
 #include "nsXULPrototypeCache.h"
-
-#include "mozilla/dom/nsCSPUtils.h"
-#include "mozilla/dom/XULElementBinding.h"
-#include "mozilla/dom/XULBroadcastManager.h"
-#include "mozilla/dom/MouseEventBinding.h"
-#include "mozilla/dom/MutationEventBinding.h"
-#include "mozilla/dom/XULCommandEvent.h"
-#include "mozilla/GlobalKeyListener.h"
+#include "nsXULTooltipListener.h"
+#include "xpcpublic.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -485,8 +513,7 @@
   if (elm) {
     // Define behavior for each type of XUL element.
     if (!content->IsXULElement(nsGkAtoms::toolbarbutton)) {
-      nsFocusManager* fm = nsFocusManager::GetFocusManager();
-      if (fm) {
+      if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
         nsCOMPtr<Element> elementToFocus;
         // for radio buttons, focus the radiogroup instead
         if (content->IsXULElement(nsGkAtoms::radio)) {
@@ -566,7 +593,8 @@
       : mozilla::Runnable("XULInContentErrorReporter"), mDocument(aDocument) {}
 
   NS_IMETHOD Run() override {
-    mDocument->WarnOnceAbout(Document::eImportXULIntoContent, false);
+    mDocument->WarnOnceAbout(DeprecatedOperations::eImportXULIntoContent,
+                             false);
     return NS_OK;
   }
 
@@ -595,7 +623,7 @@
 
   Document& doc = aContext.OwnerDoc();
   if (!IsInNativeAnonymousSubtree() && !doc.AllowXULXBL() &&
-      !doc.HasWarnedAbout(Document::eImportXULIntoContent)) {
+      !doc.HasWarnedAbout(DeprecatedOperations::eImportXULIntoContent)) {
     nsContentUtils::AddScriptRunner(new XULInContentErrorReporter(doc));
   }
 
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULElement.h firefox-85.0+build1/dom/xul/nsXULElement.h
--- firefox-84.0.2+build1/dom/xul/nsXULElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULElement.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,39 +12,69 @@
 #ifndef nsXULElement_h__
 #define nsXULElement_h__
 
-#include "js/CompileOptions.h"  // JS::CompileOptions
+#include <stdint.h>
+#include <stdio.h>
+#include "ErrorList.h"
+#include "js/RootingAPI.h"
 #include "js/SourceText.h"
 #include "js/TracingAPI.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "nsAtom.h"
+#include "mozilla/BasicEvents.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/dom/DOMString.h"
+#include "mozilla/dom/Element.h"
+#include "mozilla/dom/FragmentOrElement.h"
+#include "mozilla/dom/FromParser.h"
+#include "mozilla/dom/NameSpaceConstants.h"
 #include "mozilla/dom/NodeInfo.h"
-#include "nsIControllers.h"
-#include "nsIURI.h"
-#include "nsLayoutCID.h"
-#include "AttrArray.h"
+#include "nsAtom.h"
+#include "nsAttrName.h"
+#include "nsAttrValue.h"
+#include "nsCOMPtr.h"
+#include "nsCaseTreatment.h"
+#include "nsChangeHint.h"
+#include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
-#include "nsStringFwd.h"
+#include "nsIContent.h"
+#include "nsINode.h"
+#include "nsISupports.h"
+#include "nsLiteralString.h"
+#include "nsString.h"
 #include "nsStyledElement.h"
-#include "mozilla/dom/DOMRect.h"
-#include "mozilla/dom/Element.h"
-#include "mozilla/dom/DOMString.h"
-#include "mozilla/dom/FromParser.h"
-
-class nsXULPrototypeDocument;
-
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nscore.h"
+
+class JSObject;
+class JSScript;
+class nsAttrValueOrString;
+class nsIControllers;
 class nsIObjectInputStream;
 class nsIObjectOutputStream;
 class nsIOffThreadScriptReceiver;
+class nsIPrincipal;
+class nsIURI;
+class nsXULPrototypeDocument;
 class nsXULPrototypeNode;
+struct JSContext;
+
 typedef nsTArray<RefPtr<nsXULPrototypeNode>> nsPrototypeArray;
 
+namespace JS {
+class CompileOptions;
+}
+
 namespace mozilla {
+class ErrorResult;
 class EventChainPreVisitor;
 class EventListenerManager;
 namespace css {
 class StyleRule;
 }  // namespace css
 namespace dom {
+class Document;
 class HTMLIFrameElement;
 class PrototypeDocumentContentSink;
 enum class CallerType : uint32_t;
@@ -346,8 +376,8 @@
   MOZ_CAN_RUN_SCRIPT bool HasMenu();
   MOZ_CAN_RUN_SCRIPT void OpenMenu(bool aOpenFlag);
 
-  virtual bool PerformAccesskey(bool aKeyCausesActivation,
-                                bool aIsTrustedEvent) override;
+  MOZ_CAN_RUN_SCRIPT virtual bool PerformAccesskey(
+      bool aKeyCausesActivation, bool aIsTrustedEvent) override;
   void ClickWithInputSource(uint16_t aInputSource, bool aIsTrustedEvent);
 
   virtual bool IsNodeOfType(uint32_t aFlags) const override;
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULPopupListener.cpp firefox-85.0+build1/dom/xul/nsXULPopupListener.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULPopupListener.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULPopupListener.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -210,8 +210,7 @@
     currFrame = currFrame->GetParent();
   }
 
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
-  if (fm) {
+  if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
     if (newFocusElement) {
       uint32_t focusFlags =
           nsIFocusManager::FLAG_BYMOUSE | nsIFocusManager::FLAG_NOSCROLL;
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULPopupListener.h firefox-85.0+build1/dom/xul/nsXULPopupListener.h
--- firefox-84.0.2+build1/dom/xul/nsXULPopupListener.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULPopupListener.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,12 +12,14 @@
 
 #include "nsCOMPtr.h"
 
-#include "mozilla/dom/Element.h"
 #include "nsIDOMEventListener.h"
 #include "nsCycleCollectionParticipant.h"
 
+class nsIContent;
+
 namespace mozilla {
 namespace dom {
+class Element;
 class MouseEvent;
 }  // namespace dom
 }  // namespace mozilla
@@ -48,7 +50,8 @@
  private:
 #ifndef NS_CONTEXT_MENU_IS_MOUSEUP
   // When a context menu is opened, focus the target of the contextmenu event.
-  nsresult FireFocusOnTargetContent(nsIContent* aTargetContent, bool aIsTouch);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult
+  FireFocusOnTargetContent(nsIContent* aTargetContent, bool aIsTouch);
 #endif
 
   // |mElement| is the node to which this listener is attached.
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULPrototypeDocument.cpp firefox-85.0+build1/dom/xul/nsXULPrototypeDocument.cpp
--- firefox-84.0.2+build1/dom/xul/nsXULPrototypeDocument.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULPrototypeDocument.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -25,6 +25,8 @@
 #include "mozilla/dom/BindingUtils.h"
 #include "nsXULPrototypeCache.h"
 #include "mozilla/DeclarationBlock.h"
+#include "mozilla/dom/CustomElementRegistry.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Text.h"
 
@@ -478,6 +480,12 @@
     protoAttr++;
   }
 
+  // Make sure the mIsAtom is correct in case this prototype element has been
+  // completely rebuilt.
+  CustomElementData* ceData = aElement->GetCustomElementData();
+  nsAtom* isAtom = ceData ? ceData->GetIs(aElement) : nullptr;
+  aPrototype->mIsAtom = isAtom;
+
   if (aDeep) {
     // We have to rebuild the prototype children from this element.
     // First release the tree under this element.
diff -Nru firefox-84.0.2+build1/dom/xul/nsXULPrototypeDocument.h firefox-85.0+build1/dom/xul/nsXULPrototypeDocument.h
--- firefox-84.0.2+build1/dom/xul/nsXULPrototypeDocument.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/nsXULPrototypeDocument.h	2021-01-18 19:58:10.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsISerializable.h"
 #include "nsCycleCollectionParticipant.h"
 #include <functional>
-#include "mozilla/dom/Element.h"
 
 class nsAtom;
 class nsIPrincipal;
@@ -23,6 +22,10 @@
 class nsXULPrototypeElement;
 class nsXULPrototypePI;
 
+namespace mozilla::dom {
+class Element;
+}
+
 /**
  * A "prototype" document that stores shared document information
  * for the XUL cache.
diff -Nru firefox-84.0.2+build1/dom/xul/XULBroadcastManager.cpp firefox-85.0+build1/dom/xul/XULBroadcastManager.cpp
--- firefox-84.0.2+build1/dom/xul/XULBroadcastManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULBroadcastManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -64,6 +64,48 @@
 namespace dom {
 static LazyLogModule sXULBroadCastManager("XULBroadcastManager");
 
+class XULBroadcastManager::nsDelayedBroadcastUpdate {
+ public:
+  nsDelayedBroadcastUpdate(Element* aBroadcaster, Element* aListener,
+                           const nsAString& aAttr)
+      : mBroadcaster(aBroadcaster),
+        mListener(aListener),
+        mAttr(aAttr),
+        mSetAttr(false),
+        mNeedsAttrChange(false) {}
+
+  nsDelayedBroadcastUpdate(Element* aBroadcaster, Element* aListener,
+                           nsAtom* aAttrName, const nsAString& aAttr,
+                           bool aSetAttr, bool aNeedsAttrChange)
+      : mBroadcaster(aBroadcaster),
+        mListener(aListener),
+        mAttr(aAttr),
+        mAttrName(aAttrName),
+        mSetAttr(aSetAttr),
+        mNeedsAttrChange(aNeedsAttrChange) {}
+
+  nsDelayedBroadcastUpdate(const nsDelayedBroadcastUpdate& aOther) = delete;
+  nsDelayedBroadcastUpdate(nsDelayedBroadcastUpdate&& aOther) = default;
+
+  nsCOMPtr<Element> mBroadcaster;
+  nsCOMPtr<Element> mListener;
+  // Note if mAttrName isn't used, this is the name of the attr, otherwise
+  // this is the value of the attribute.
+  nsString mAttr;
+  RefPtr<nsAtom> mAttrName;
+  bool mSetAttr;
+  bool mNeedsAttrChange;
+
+  class Comparator {
+   public:
+    static bool Equals(const nsDelayedBroadcastUpdate& a,
+                       const nsDelayedBroadcastUpdate& b) {
+      return a.mBroadcaster == b.mBroadcaster && a.mListener == b.mListener &&
+             a.mAttrName == b.mAttrName;
+    }
+  };
+};
+
 /* static */
 bool XULBroadcastManager::MayNeedListener(const Element& aElement) {
   if (aElement.NodeInfo()->Equals(nsGkAtoms::observes, kNameSpaceID_XUL)) {
diff -Nru firefox-84.0.2+build1/dom/xul/XULBroadcastManager.h firefox-85.0+build1/dom/xul/XULBroadcastManager.h
--- firefox-84.0.2+build1/dom/xul/XULBroadcastManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULBroadcastManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,14 +7,21 @@
 #ifndef mozilla_dom_XULBroadcastManager_h
 #define mozilla_dom_XULBroadcastManager_h
 
-#include "mozilla/dom/Element.h"
 #include "nsAtom.h"
+#include "nsTArray.h"
 
+class PLDHashTable;
 class nsXULElement;
 
 namespace mozilla {
+
+class ErrorResult;
+
 namespace dom {
 
+class Document;
+class Element;
+
 class XULBroadcastManager final {
  public:
   explicit XULBroadcastManager(Document* aDocument);
@@ -67,47 +74,7 @@
    */
   PLDHashTable* mBroadcasterMap;
 
-  class nsDelayedBroadcastUpdate {
-   public:
-    nsDelayedBroadcastUpdate(Element* aBroadcaster, Element* aListener,
-                             const nsAString& aAttr)
-        : mBroadcaster(aBroadcaster),
-          mListener(aListener),
-          mAttr(aAttr),
-          mSetAttr(false),
-          mNeedsAttrChange(false) {}
-
-    nsDelayedBroadcastUpdate(Element* aBroadcaster, Element* aListener,
-                             nsAtom* aAttrName, const nsAString& aAttr,
-                             bool aSetAttr, bool aNeedsAttrChange)
-        : mBroadcaster(aBroadcaster),
-          mListener(aListener),
-          mAttr(aAttr),
-          mAttrName(aAttrName),
-          mSetAttr(aSetAttr),
-          mNeedsAttrChange(aNeedsAttrChange) {}
-
-    nsDelayedBroadcastUpdate(const nsDelayedBroadcastUpdate& aOther) = delete;
-    nsDelayedBroadcastUpdate(nsDelayedBroadcastUpdate&& aOther) = default;
-
-    nsCOMPtr<Element> mBroadcaster;
-    nsCOMPtr<Element> mListener;
-    // Note if mAttrName isn't used, this is the name of the attr, otherwise
-    // this is the value of the attribute.
-    nsString mAttr;
-    RefPtr<nsAtom> mAttrName;
-    bool mSetAttr;
-    bool mNeedsAttrChange;
-
-    class Comparator {
-     public:
-      static bool Equals(const nsDelayedBroadcastUpdate& a,
-                         const nsDelayedBroadcastUpdate& b) {
-        return a.mBroadcaster == b.mBroadcaster && a.mListener == b.mListener &&
-               a.mAttrName == b.mAttrName;
-      }
-    };
-  };
+  class nsDelayedBroadcastUpdate;
   nsTArray<nsDelayedBroadcastUpdate> mDelayedBroadcasters;
   nsTArray<nsDelayedBroadcastUpdate> mDelayedAttrChangeBroadcasts;
   bool mHandlingDelayedAttrChange;
diff -Nru firefox-84.0.2+build1/dom/xul/XULFrameElement.h firefox-85.0+build1/dom/xul/XULFrameElement.h
--- firefox-84.0.2+build1/dom/xul/XULFrameElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULFrameElement.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define XULFrameElement_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/WindowProxyHolder.h"
 #include "js/TypeDecls.h"
@@ -23,6 +22,8 @@
 class nsFrameLoader;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BrowsingContext;
diff -Nru firefox-84.0.2+build1/dom/xul/XULPersist.cpp firefox-85.0+build1/dom/xul/XULPersist.cpp
--- firefox-84.0.2+build1/dom/xul/XULPersist.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULPersist.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,6 +13,9 @@
 #  include "nsIStringEnumerator.h"
 #endif
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
+#include "nsContentUtils.h"
 #include "nsIAppWindow.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/dom/xul/XULPersist.h firefox-85.0+build1/dom/xul/XULPersist.h
--- firefox-84.0.2+build1/dom/xul/XULPersist.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULPersist.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,10 +7,15 @@
 #ifndef mozilla_dom_XULPersist_h
 #define mozilla_dom_XULPersist_h
 
+#include "nsStubDocumentObserver.h"
+
 #ifndef MOZ_NEW_XULSTORE
 class nsIXULStore;
 #endif
 
+template <typename T>
+class nsCOMArray;
+
 namespace mozilla {
 namespace dom {
 
diff -Nru firefox-84.0.2+build1/dom/xul/XULPopupElement.h firefox-85.0+build1/dom/xul/XULPopupElement.h
--- firefox-84.0.2+build1/dom/xul/XULPopupElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULPopupElement.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define XULPopupElement_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsString.h"
@@ -17,6 +16,8 @@
 struct JSContext;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DOMRect;
diff -Nru firefox-84.0.2+build1/dom/xul/XULTooltipElement.cpp firefox-85.0+build1/dom/xul/XULTooltipElement.cpp
--- firefox-84.0.2+build1/dom/xul/XULTooltipElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULTooltipElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -8,8 +8,13 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/XULTooltipElement.h"
 #include "mozilla/dom/NodeInfo.h"
+#include "mozilla/EventDispatcher.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsContentUtils.h"
 #include "nsCTooltipTextProvider.h"
 #include "nsITooltipTextProvider.h"
+#include "nsServiceManagerUtils.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {
diff -Nru firefox-84.0.2+build1/dom/xul/XULTooltipElement.h firefox-85.0+build1/dom/xul/XULTooltipElement.h
--- firefox-84.0.2+build1/dom/xul/XULTooltipElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULTooltipElement.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,7 +12,7 @@
 namespace mozilla {
 namespace dom {
 
-nsXULElement* NS_NewXULPopupElement(
+nsXULElement* NS_NewXULTooltipElement(
     already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 class XULTooltipElement final : public XULPopupElement {
diff -Nru firefox-84.0.2+build1/dom/xul/XULTreeElement.cpp firefox-85.0+build1/dom/xul/XULTreeElement.cpp
--- firefox-84.0.2+build1/dom/xul/XULTreeElement.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULTreeElement.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -106,9 +106,9 @@
   return mTreeBody;
 }
 
-already_AddRefed<nsITreeView> XULTreeElement::GetView() {
+already_AddRefed<nsITreeView> XULTreeElement::GetView(FlushType aFlushType) {
   if (!mTreeBody) {
-    if (!GetTreeBodyFrame()) {
+    if (!GetTreeBodyFrame(aFlushType)) {
       return nullptr;
     }
 
diff -Nru firefox-84.0.2+build1/dom/xul/XULTreeElement.h firefox-85.0+build1/dom/xul/XULTreeElement.h
--- firefox-84.0.2+build1/dom/xul/XULTreeElement.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/dom/xul/XULTreeElement.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define XULTreeElement_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsString.h"
@@ -20,6 +19,8 @@
 class nsTreeColumns;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct TreeCellInfo;
@@ -46,7 +47,7 @@
   already_AddRefed<nsITreeView> GetView(CallerType /* unused */) {
     return GetView();
   }
-  already_AddRefed<nsITreeView> GetView();
+  already_AddRefed<nsITreeView> GetView(FlushType = FlushType::Frames);
 
   void SetView(nsITreeView* arg, CallerType aCallerType, ErrorResult& aRv);
 
diff -Nru firefox-84.0.2+build1/editor/libeditor/CreateElementTransaction.h firefox-85.0+build1/editor/libeditor/CreateElementTransaction.h
--- firefox-84.0.2+build1/editor/libeditor/CreateElementTransaction.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/CreateElementTransaction.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,6 @@
 #include "mozilla/EditorDOMPoint.h"
 #include "mozilla/EditTransactionBase.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/dom/Element.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"
 
@@ -19,6 +18,9 @@
  * A transaction that creates a new node in the content tree.
  */
 namespace mozilla {
+namespace dom {
+class Element;
+}
 
 class EditorBase;
 
diff -Nru firefox-84.0.2+build1/editor/libeditor/CSSEditUtils.cpp firefox-85.0+build1/editor/libeditor/CSSEditUtils.cpp
--- firefox-84.0.2+build1/editor/libeditor/CSSEditUtils.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/CSSEditUtils.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1248,9 +1248,9 @@
     return true;
   }
 
-  nsAutoCString propertyNameString;
-  nsAutoString firstValue, otherValue;
   for (uint32_t i = 0; i < firstLength; i++) {
+    nsAutoString firstValue, otherValue;
+    nsAutoCString propertyNameString;
     firstCSSDecl->Item(i, propertyNameString);
     DebugOnly<nsresult> rvIgnored =
         firstCSSDecl->GetPropertyValue(propertyNameString, firstValue);
@@ -1266,6 +1266,8 @@
     }
   }
   for (uint32_t i = 0; i < otherLength; i++) {
+    nsAutoString firstValue, otherValue;
+    nsAutoCString propertyNameString;
     otherCSSDecl->Item(i, propertyNameString);
     DebugOnly<nsresult> rvIgnored =
         otherCSSDecl->GetPropertyValue(propertyNameString, otherValue);
diff -Nru firefox-84.0.2+build1/editor/libeditor/EditorBase.cpp firefox-85.0+build1/editor/libeditor/EditorBase.cpp
--- firefox-84.0.2+build1/editor/libeditor/EditorBase.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/EditorBase.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5719,4 +5719,39 @@
                        "failed, but ignored");
 }
 
+nsPIDOMWindowOuter* EditorBase::GetWindow() const {
+  return mDocument ? mDocument->GetWindow() : nullptr;
+}
+
+nsPIDOMWindowInner* EditorBase::GetInnerWindow() const {
+  return mDocument ? mDocument->GetInnerWindow() : nullptr;
+}
+
+PresShell* EditorBase::GetPresShell() const {
+  return mDocument ? mDocument->GetPresShell() : nullptr;
+}
+
+nsPresContext* EditorBase::GetPresContext() const {
+  PresShell* presShell = GetPresShell();
+  return presShell ? presShell->GetPresContext() : nullptr;
+}
+
+already_AddRefed<nsCaret> EditorBase::GetCaret() const {
+  PresShell* presShell = GetPresShell();
+  if (NS_WARN_IF(!presShell)) {
+    return nullptr;
+  }
+  return presShell->GetCaret();
+}
+
+nsISelectionController* EditorBase::GetSelectionController() const {
+  if (mSelectionController) {
+    return mSelectionController;
+  }
+  if (!mDocument) {
+    return nullptr;
+  }
+  return mDocument->GetPresShell();
+}
+
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/editor/libeditor/EditorBase.h firefox-85.0+build1/editor/libeditor/EditorBase.h
--- firefox-84.0.2+build1/editor/libeditor/EditorBase.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/EditorBase.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/EventForwards.h"       // for InputEventTargetRanges
 #include "mozilla/Maybe.h"               // for Maybe
 #include "mozilla/OwningNonNull.h"       // for OwningNonNull
-#include "mozilla/PresShell.h"           // for PresShell
 #include "mozilla/TypeInState.h"         // for PropItem, StyleCache
 #include "mozilla/RangeBoundary.h"       // for RawRangeBoundary, RangeBoundary
 #include "mozilla/SelectionState.h"      // for RangeUpdater, etc.
@@ -27,7 +26,6 @@
 #include "nsCOMPtr.h"  // for already_AddRefed, nsCOMPtr
 #include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
-#include "mozilla/dom/Document.h"
 #include "nsIContentInlines.h"       // for nsINode::IsEditable()
 #include "nsIEditor.h"               // for nsIEditor, etc.
 #include "nsIFrame.h"                // for nsBidiLevel
@@ -106,6 +104,7 @@
 namespace dom {
 class AbstractRange;
 class DataTransfer;
+class Document;
 class DragEvent;
 class Element;
 class EventTarget;
@@ -197,12 +196,8 @@
   bool Destroyed() const { return mDidPreDestroy; }
 
   Document* GetDocument() const { return mDocument; }
-  nsPIDOMWindowOuter* GetWindow() const {
-    return mDocument ? mDocument->GetWindow() : nullptr;
-  }
-  nsPIDOMWindowInner* GetInnerWindow() const {
-    return mDocument ? mDocument->GetInnerWindow() : nullptr;
-  }
+  nsPIDOMWindowOuter* GetWindow() const;
+  nsPIDOMWindowInner* GetInnerWindow() const;
 
   /**
    * MayHaveMutationEventListeners() returns true when the window may have
@@ -263,32 +258,13 @@
     return false;
   }
 
-  PresShell* GetPresShell() const {
-    return mDocument ? mDocument->GetPresShell() : nullptr;
-  }
-  nsPresContext* GetPresContext() const {
-    PresShell* presShell = GetPresShell();
-    return presShell ? presShell->GetPresContext() : nullptr;
-  }
-  already_AddRefed<nsCaret> GetCaret() const {
-    PresShell* presShell = GetPresShell();
-    if (NS_WARN_IF(!presShell)) {
-      return nullptr;
-    }
-    return presShell->GetCaret();
-  }
+  PresShell* GetPresShell() const;
+  nsPresContext* GetPresContext() const;
+  already_AddRefed<nsCaret> GetCaret() const;
 
   already_AddRefed<nsIWidget> GetWidget();
 
-  nsISelectionController* GetSelectionController() const {
-    if (mSelectionController) {
-      return mSelectionController;
-    }
-    if (!mDocument) {
-      return nullptr;
-    }
-    return mDocument->GetPresShell();
-  }
+  nsISelectionController* GetSelectionController() const;
 
   nsresult GetSelection(SelectionType aSelectionType,
                         Selection** aSelection) const;
diff -Nru firefox-84.0.2+build1/editor/libeditor/EditorEventListener.cpp firefox-85.0+build1/editor/libeditor/EditorEventListener.cpp
--- firefox-84.0.2+build1/editor/libeditor/EditorEventListener.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/EditorEventListener.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -804,9 +804,10 @@
 
   aDragEvent->PreventDefault();
   aDragEvent->StopImmediatePropagation();
-  MOZ_ASSERT(aDragEvent->GetDataTransfer());
-  aDragEvent->GetDataTransfer()->SetDropEffectInt(
-      nsIDragService::DRAGDROP_ACTION_NONE);
+  DataTransfer* dataTransfer = aDragEvent->GetDataTransfer();
+  if (dataTransfer) {
+    dataTransfer->SetDropEffectInt(nsIDragService::DRAGDROP_ACTION_NONE);
+  }
   if (mCaret) {
     mCaret->SetVisible(false);
   }
@@ -902,9 +903,9 @@
   // because once DataTransfer is retrieved, DragEvent has initialized it
   // with nsContentUtils::SetDataTransferInEvent() but it does not check
   // whether the content is movable or not.
-  MOZ_ASSERT(aDragEvent->GetDataTransfer());
   DataTransfer* dataTransfer = aDragEvent->GetDataTransfer();
-  if (dataTransfer->DropEffectInt() == nsIDragService::DRAGDROP_ACTION_MOVE) {
+  if (dataTransfer &&
+      dataTransfer->DropEffectInt() == nsIDragService::DRAGDROP_ACTION_MOVE) {
     nsCOMPtr<nsINode> dragSource = dataTransfer->GetMozSourceNode();
     if (dragSource && !dragSource->IsEditable()) {
       // In this case, we shouldn't allow "move" because the drag source
@@ -983,11 +984,15 @@
   MOZ_ASSERT(!mEditorBase->IsReadonly());
   MOZ_ASSERT(DragEventHasSupportingData(aDragEvent));
 
+  DataTransfer* dataTransfer = aDragEvent->GetDataTransfer();
+  if (NS_WARN_IF(!dataTransfer)) {
+    return false;
+  }
+
   // If there is no source node, this is probably an external drag and the
   // drop is allowed. The later checks rely on checking if the drag target
   // is the same as the drag source.
-  nsCOMPtr<nsINode> sourceNode =
-      aDragEvent->GetDataTransfer()->GetMozSourceNode();
+  nsCOMPtr<nsINode> sourceNode = dataTransfer->GetMozSourceNode();
   if (!sourceNode) {
     return true;
   }
diff -Nru firefox-84.0.2+build1/editor/libeditor/HTMLEditor.h firefox-85.0+build1/editor/libeditor/HTMLEditor.h
--- firefox-84.0.2+build1/editor/libeditor/HTMLEditor.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/HTMLEditor.h	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/Result.h"
 #include "mozilla/TextEditor.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/File.h"
 
diff -Nru firefox-84.0.2+build1/editor/libeditor/ReplaceTextTransaction.h firefox-85.0+build1/editor/libeditor/ReplaceTextTransaction.h
--- firefox-84.0.2+build1/editor/libeditor/ReplaceTextTransaction.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/ReplaceTextTransaction.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/EditorBase.h"
 #include "mozilla/EditorDOMPoint.h"
 #include "mozilla/EditTransactionBase.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/dom/Text.h"
diff -Nru firefox-84.0.2+build1/editor/libeditor/tests/test_middle_click_paste.html firefox-85.0+build1/editor/libeditor/tests/test_middle_click_paste.html
--- firefox-84.0.2+build1/editor/libeditor/tests/test_middle_click_paste.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/tests/test_middle_click_paste.html	2021-01-18 19:58:11.000000000 +0000
@@ -549,8 +549,8 @@
   }
   // On windows, HTML clipboard includes extra data.
   // The values are from widget/windows/nsDataObj.cpp.
-  const kHTMLPrefix = (navigator.platform.includes("Win")) ? "<html><body>\n<!--StartFragment-->" : "";
-  const kHTMLPostfix = (navigator.platform.includes("Win")) ? "<!--EndFragment-->\n</body>\n</html>" : "";
+  const kHTMLPrefix = (navigator.platform.includes("Win")) ? kTextHtmlPrefixClipboardDataWindows : "";
+  const kHTMLPostfix = (navigator.platform.includes("Win")) ? kTextHtmlSuffixClipboardDataWindows : "";
   is(beforeInputEvents.length, 1,
      'One "beforeinput" event should be fired when pasting HTML');
   checkInputEvent(beforeInputEvents[0], "insertFromPasteAsQuotation", null,
diff -Nru firefox-84.0.2+build1/editor/libeditor/tests/test_pasting_table_rows.html firefox-85.0+build1/editor/libeditor/tests/test_pasting_table_rows.html
--- firefox-84.0.2+build1/editor/libeditor/tests/test_pasting_table_rows.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/tests/test_pasting_table_rows.html	2021-01-18 19:58:11.000000000 +0000
@@ -40,10 +40,6 @@
     const kInputEventType = "input";
     const kInputEventInputTypeInsertFromPaste = "insertFromPaste";
 
-    const kPlatformWindows = "Win";
-    const kClipboardDataPrefixOnWindows = "<html><body>\n<!--StartFragment-->";
-    const kClipboardDataSuffixOnWindows = "<!--EndFragment-->\n</body>\n</html>";
-
     // Where a table is pasted to in the test.
     const kTargetElementId = "targetElement";
 
@@ -57,10 +53,6 @@
         rowName).parentElement.tagName == aTagName);
     }
 
-    function stripLinebreaksAndWhitespaceAfterTags(aString) {
-      return aString.replace(/(>\s*(\r\n|\n|\r)*\s*)/gm,">");
-    }
-
     /**
      * Tables used with this class are required to:
      * - have ids of the following form for each table cell:
@@ -128,7 +120,7 @@
 
         // Linebreaks and whitespace after tags are irrelevant, hence stripping
         // them.
-        is(stripLinebreaksAndWhitespaceAfterTags(
+        is(SimpleTest.stripLinebreaksAndWhitespaceAfterTags(
           targetElement.children[0].outerHTML), expectedPastedHTML,
           "Pasted table (" + this._toString() + ") has expected outerHTML.");
       }
@@ -166,7 +158,7 @@
 
       _getOuterHTMLAndStripLinebreaksAndWhitespaceAfterTags(aElementId) {
         const outerHTML = document.getElementById(aElementId).outerHTML;
-        return stripLinebreaksAndWhitespaceAfterTags(outerHTML);
+        return SimpleTest.stripLinebreaksAndWhitespaceAfterTags(outerHTML);
       }
 
       _createExpectedOuterHTMLOfTable() {
@@ -266,14 +258,14 @@
 
             // Windows wraps the pasted HTML, see
             // https://searchfox.org/mozilla-central/rev/8f7b017a31326515cb467e69eef1f6c965b4f00e/widget/windows/nsDataObj.cpp#1798-1805,1839-1840,1842.
-            aExpectedPastedHTML = kClipboardDataPrefixOnWindows +
-              aExpectedPastedHTML + kClipboardDataSuffixOnWindows;
+            aExpectedPastedHTML = kTextHtmlPrefixClipboardDataWindows +
+              aExpectedPastedHTML + kTextHtmlSuffixClipboardDataWindows;
           }
 
           // The data's format doesn't specify whether there should be line
           // breaks or whitspace between tags. Hence, remove them.
-          return stripLinebreaksAndWhitespaceAfterTags(aData) ==
-            stripLinebreaksAndWhitespaceAfterTags(aExpectedPastedHTML);
+          return SimpleTest.stripLinebreaksAndWhitespaceAfterTags(aData) ==
+            SimpleTest.stripLinebreaksAndWhitespaceAfterTags(aExpectedPastedHTML);
         }
 
         return SimpleTest.promiseClipboardChange(validatorFn,
diff -Nru firefox-84.0.2+build1/editor/libeditor/TextEditorDataTransfer.cpp firefox-85.0+build1/editor/libeditor/TextEditorDataTransfer.cpp
--- firefox-84.0.2+build1/editor/libeditor/TextEditorDataTransfer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/libeditor/TextEditorDataTransfer.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -411,8 +411,8 @@
   // Then, move focus if necessary.  This must cause dispatching "blur" event
   // and "focus" event.
   if (newFocusedElement && focusedElement != newFocusedElement) {
-    DebugOnly<nsresult> rvIgnored =
-        nsFocusManager::GetFocusManager()->SetFocus(newFocusedElement, 0);
+    RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
+    DebugOnly<nsresult> rvIgnored = fm->SetFocus(newFocusedElement, 0);
     NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
                          "nsFocusManager::SetFocus() failed to set focus "
                          "to the element, but ignored");
diff -Nru firefox-84.0.2+build1/editor/nsIEditorSpellCheck.idl firefox-85.0+build1/editor/nsIEditorSpellCheck.idl
--- firefox-84.0.2+build1/editor/nsIEditorSpellCheck.idl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/nsIEditorSpellCheck.idl	2021-01-18 19:58:11.000000000 +0000
@@ -109,17 +109,17 @@
    *
    * @see mozISpellCheckingEngine::GetDictionaryList
    */
-  Array<AString> GetDictionaryList();
+  Array<ACString> GetDictionaryList();
 
   /**
    * @see mozSpellChecker::GetCurrentDictionary
    */
-  AString       GetCurrentDictionary();
+  ACString      GetCurrentDictionary();
 
   /**
    * @see mozSpellChecker::SetCurrentDictionary
    */
-  void          SetCurrentDictionary(in AString dictionary);
+  void          SetCurrentDictionary(in ACString dictionary);
 
   /**
    * Call this to free up the spell checking object. It will also save the
diff -Nru firefox-84.0.2+build1/editor/spellchecker/EditorSpellCheck.cpp firefox-85.0+build1/editor/spellchecker/EditorSpellCheck.cpp
--- firefox-84.0.2+build1/editor/spellchecker/EditorSpellCheck.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/spellchecker/EditorSpellCheck.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,6 +13,8 @@
 #include "mozilla/dom/Selection.h"
 #include "mozilla/dom/StaticRange.h"
 #include "mozilla/intl/LocaleService.h"    // for retrieving app locale
+#include "mozilla/intl/MozLocale.h"        // for mozilla::intl::Locale
+#include "mozilla/intl/OSPreferences.h"    // for mozilla::intl::OSPreferences
 #include "mozilla/mozalloc.h"              // for operator delete, etc
 #include "mozilla/mozSpellChecker.h"       // for mozSpellChecker
 #include "mozilla/Preferences.h"           // for Preferences
@@ -46,6 +48,7 @@
 
 using namespace dom;
 using intl::LocaleService;
+using intl::OSPreferences;
 
 class UpdateDictionaryHolder {
  private:
@@ -198,7 +201,7 @@
  * Stores the current dictionary for aEditor's document URL.
  */
 static nsresult StoreCurrentDictionary(EditorBase* aEditorBase,
-                                       const nsAString& aDictionary) {
+                                       const nsACString& aDictionary) {
   NS_ENSURE_ARG_POINTER(aEditorBase);
 
   nsresult rv;
@@ -213,7 +216,7 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   RefPtr<nsVariant> prefValue = new nsVariant();
-  prefValue->SetAsAString(aDictionary);
+  prefValue->SetAsAString(NS_ConvertUTF8toUTF16(aDictionary));
 
   nsCOMPtr<nsIContentPrefService2> contentPrefService =
       do_GetService(NS_CONTENT_PREF_SERVICE_CONTRACTID);
@@ -288,7 +291,7 @@
     spellChecker = mozSpellChecker::Create();
     MOZ_ASSERT(spellChecker);
   }
-  nsTArray<nsString> dictList;
+  nsTArray<nsCString> dictList;
   nsresult rv = spellChecker->GetDictionaryList(&dictList);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -506,21 +509,21 @@
 }
 
 NS_IMETHODIMP
-EditorSpellCheck::GetDictionaryList(nsTArray<nsString>& aList) {
+EditorSpellCheck::GetDictionaryList(nsTArray<nsCString>& aList) {
   NS_ENSURE_TRUE(mSpellChecker, NS_ERROR_NOT_INITIALIZED);
 
   return mSpellChecker->GetDictionaryList(&aList);
 }
 
 NS_IMETHODIMP
-EditorSpellCheck::GetCurrentDictionary(nsAString& aDictionary) {
+EditorSpellCheck::GetCurrentDictionary(nsACString& aDictionary) {
   NS_ENSURE_TRUE(mSpellChecker, NS_ERROR_NOT_INITIALIZED);
 
   return mSpellChecker->GetCurrentDictionary(aDictionary);
 }
 
 NS_IMETHODIMP
-EditorSpellCheck::SetCurrentDictionary(const nsAString& aDictionary) {
+EditorSpellCheck::SetCurrentDictionary(const nsACString& aDictionary) {
   NS_ENSURE_TRUE(mSpellChecker, NS_ERROR_NOT_INITIALIZED);
 
   RefPtr<EditorSpellCheck> kungFuDeathGrip = this;
@@ -539,7 +542,7 @@
       if (!aDictionary.IsEmpty() &&
           (mPreferredLang.IsEmpty() ||
            !mPreferredLang.Equals(aDictionary,
-                                  nsCaseInsensitiveStringComparator))) {
+                                  nsCaseInsensitiveCStringComparator))) {
         // When user sets dictionary manually, we store this value associated
         // with editor url, if it doesn't match the document language exactly.
         // For example on "en" sites, we need to store "en-GB", otherwise
@@ -548,7 +551,7 @@
         StoreCurrentDictionary(mEditor, aDictionary);
 #ifdef DEBUG_DICT
         printf("***** Writing content preferences for |%s|\n",
-               NS_ConvertUTF16toUTF8(aDictionary).get());
+               aDictionary.get());
 #endif
       } else {
         // If user sets a dictionary matching the language defined by
@@ -557,7 +560,7 @@
         ClearCurrentDictionary(mEditor);
 #ifdef DEBUG_DICT
         printf("***** Clearing content preferences for |%s|\n",
-               NS_ConvertUTF16toUTF8(aDictionary).get());
+               aDictionary.get());
 #endif
       }
 
@@ -569,10 +572,10 @@
       // necessary to stop libpref from throwing errors. But this should
       // probably be handled in a better way.
       if (XRE_IsParentProcess()) {
-        Preferences::SetString("spellchecker.dictionary", aDictionary);
+        Preferences::SetCString("spellchecker.dictionary", aDictionary);
 #ifdef DEBUG_DICT
         printf("***** Possibly storing spellchecker.dictionary |%s|\n",
-               NS_ConvertUTF16toUTF8(aDictionary).get());
+               aDictionary.get());
 #endif
       }
     }
@@ -664,30 +667,30 @@
 
 // Helper function that iterates over the list of dictionaries and sets the one
 // that matches based on a given comparison type.
-void EditorSpellCheck::BuildDictionaryList(const nsAString& aDictName,
-                                           const nsTArray<nsString>& aDictList,
+void EditorSpellCheck::BuildDictionaryList(const nsACString& aDictName,
+                                           const nsTArray<nsCString>& aDictList,
                                            enum dictCompare aCompareType,
-                                           nsTArray<nsString>& aOutList) {
-  for (uint32_t i = 0; i < aDictList.Length(); i++) {
-    nsAutoString dictStr(aDictList.ElementAt(i));
+                                           nsTArray<nsCString>& aOutList) {
+  for (const auto& dictStr : aDictList) {
     bool equals = false;
     switch (aCompareType) {
       case DICT_NORMAL_COMPARE:
         equals = aDictName.Equals(dictStr);
         break;
       case DICT_COMPARE_CASE_INSENSITIVE:
-        equals = aDictName.Equals(dictStr, nsCaseInsensitiveStringComparator);
+        equals = aDictName.Equals(dictStr, nsCaseInsensitiveCStringComparator);
         break;
       case DICT_COMPARE_DASHMATCH:
         equals = nsStyleUtil::DashMatchCompare(
-            dictStr, aDictName, nsCaseInsensitiveStringComparator);
+            NS_ConvertUTF8toUTF16(dictStr), NS_ConvertUTF8toUTF16(aDictName),
+            nsCaseInsensitiveStringComparator);
         break;
     }
     if (equals) {
       aOutList.AppendElement(dictStr);
 #ifdef DEBUG_DICT
       if (NS_SUCCEEDED(rv)) {
-        printf("***** Trying |%s|.\n", NS_ConvertUTF16toUTF8(dictStr).get());
+        printf("***** Trying |%s|.\n", dictStr.get());
       }
 #endif
       // We always break here. We tried to set the dictionary to an existing
@@ -722,7 +725,8 @@
    *    matches that. (Introduced in bug 338427.)
    *    Eg. if the website is "en-GB", a user who only has "en-US" will get
    *    that. If the website is generic "en", the user will get one of the
-   *    "en-*" installed, (almost) at random.
+   *    "en-*" installed. If application locale or system locale is "en-*",
+   *    we get it. If others, it is (almost) random.
    *    However, we prefer what is stored in "spellchecker.dictionary",
    *    so if the user chose "en-AU" before, they will get "en-AU" on a plain
    *    "en" site. (Introduced in bug 682564.)
@@ -739,23 +743,22 @@
   // Get the language from the element or its closest parent according to:
   // https://html.spec.whatwg.org/#attr-lang
   // This is used in SetCurrentDictionary.
-  mPreferredLang.Assign(aFetcher->mRootContentLang);
+  CopyUTF16toUTF8(aFetcher->mRootContentLang, mPreferredLang);
 #ifdef DEBUG_DICT
-  printf("***** mPreferredLang (element) |%s|\n",
-         NS_ConvertUTF16toUTF8(mPreferredLang).get());
+  printf("***** mPreferredLang (element) |%s|\n", mPreferredLang.get());
 #endif
 
   // If no luck, try the "Content-Language" header.
   if (mPreferredLang.IsEmpty()) {
-    mPreferredLang.Assign(aFetcher->mRootDocContentLang);
+    CopyUTF16toUTF8(aFetcher->mRootDocContentLang, mPreferredLang);
 #ifdef DEBUG_DICT
     printf("***** mPreferredLang (content-language) |%s|\n",
-           NS_ConvertUTF16toUTF8(mPreferredLang).get());
+           mPreferredLang.get());
 #endif
   }
 
   // We obtain a list of available dictionaries.
-  AutoTArray<nsString, 8> dictList;
+  AutoTArray<nsCString, 8> dictList;
   nsresult rv = mSpellChecker->GetDictionaryList(&dictList);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     EndUpdateDictionary();
@@ -769,13 +772,13 @@
   // If we successfully fetched a dictionary from content prefs, do not go
   // further. Use this exact dictionary.
   // Don't use content preferences for editor with eEditorMailMask flag.
-  nsAutoString dictName;
+  nsAutoCString dictName;
   uint32_t flags;
   mEditor->GetFlags(&flags);
   if (!(flags & nsIEditor::eEditorMailMask)) {
-    dictName.Assign(aFetcher->mDictionary);
+    CopyUTF16toUTF8(aFetcher->mDictionary, dictName);
     if (!dictName.IsEmpty()) {
-      AutoTArray<nsString, 1> tryDictList;
+      AutoTArray<nsCString, 1> tryDictList;
       BuildDictionaryList(dictName, dictList, DICT_NORMAL_COMPARE, tryDictList);
 
       RefPtr<EditorSpellCheck> self = this;
@@ -786,7 +789,7 @@
               [self, fetcher]() {
 #ifdef DEBUG_DICT
                 printf("***** Assigned from content preferences |%s|\n",
-                       NS_ConvertUTF16toUTF8(dictName).get());
+                       dictName.get());
 #endif
                 // We take an early exit here, so let's not forget to clear
                 // the word list.
@@ -818,10 +821,10 @@
 void EditorSpellCheck::SetFallbackDictionary(DictionaryFetcher* aFetcher) {
   MOZ_ASSERT(mUpdateDictionaryRunning);
 
-  AutoTArray<nsString, 6> tryDictList;
+  AutoTArray<nsCString, 6> tryDictList;
 
   // We obtain a list of available dictionaries.
-  AutoTArray<nsString, 8> dictList;
+  AutoTArray<nsCString, 8> dictList;
   nsresult rv = mSpellChecker->GetDictionaryList(&dictList);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     EndUpdateDictionary();
@@ -834,54 +837,74 @@
   // Priority 2:
   // After checking the content preferences, we use the language of the element
   // or document.
-  nsAutoString dictName(mPreferredLang);
+  nsAutoCString dictName(mPreferredLang);
 #ifdef DEBUG_DICT
-  printf("***** Assigned from element/doc |%s|\n",
-         NS_ConvertUTF16toUTF8(dictName).get());
+  printf("***** Assigned from element/doc |%s|\n", dictName.get());
 #endif
 
   // Get the preference value.
-  nsAutoString preferredDict;
-  Preferences::GetLocalizedString("spellchecker.dictionary", preferredDict);
+  nsAutoCString preferredDict;
+  Preferences::GetLocalizedCString("spellchecker.dictionary", preferredDict);
 
+  nsAutoCString appLocaleStr;
   if (!dictName.IsEmpty()) {
     // RFC 5646 explicitly states that matches should be case-insensitive.
     BuildDictionaryList(dictName, dictList, DICT_COMPARE_CASE_INSENSITIVE,
                         tryDictList);
 
 #ifdef DEBUG_DICT
-    printf("***** Trying from element/doc |%s| \n",
-           NS_ConvertUTF16toUTF8(dictName).get());
+    printf("***** Trying from element/doc |%s| \n", dictName.get());
 #endif
 
     // Required dictionary was not available. Try to get a dictionary
     // matching at least language part of dictName.
-    nsAutoString langCode;
-    int32_t dashIdx = dictName.FindChar('-');
-    if (dashIdx != -1) {
-      langCode.Assign(Substring(dictName, 0, dashIdx));
-    } else {
-      langCode.Assign(dictName);
-    }
+    mozilla::intl::Locale loc = mozilla::intl::Locale(dictName);
+    nsAutoCString langCode(loc.GetLanguage());
 
     // Try dictionary.spellchecker preference, if it starts with langCode,
     // so we don't just get any random dictionary matching the language.
     if (!preferredDict.IsEmpty() &&
-        nsStyleUtil::DashMatchCompare(preferredDict, langCode,
+        nsStyleUtil::DashMatchCompare(NS_ConvertUTF8toUTF16(preferredDict),
+                                      NS_ConvertUTF8toUTF16(langCode),
                                       nsTDefaultStringComparator)) {
 #ifdef DEBUG_DICT
       printf(
           "***** Trying preference value |%s| since it matches language code\n",
-          NS_ConvertUTF16toUTF8(preferredDict).get());
+          preferredDict.get());
 #endif
       BuildDictionaryList(preferredDict, dictList,
                           DICT_COMPARE_CASE_INSENSITIVE, tryDictList);
     }
 
+    if (tryDictList.IsEmpty()) {
+      // Use the application locale dictionary when the required language
+      // equlas applocation locale language.
+      LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocaleStr);
+      if (!appLocaleStr.IsEmpty()) {
+        mozilla::intl::Locale appLoc = mozilla::intl::Locale(appLocaleStr);
+        if (langCode.Equals(appLoc.GetLanguage())) {
+          BuildDictionaryList(appLocaleStr, dictList,
+                              DICT_COMPARE_CASE_INSENSITIVE, tryDictList);
+        }
+      }
+
+      // Use the system locale dictionary when the required language equlas
+      // system locale language.
+      nsAutoCString sysLocaleStr;
+      OSPreferences::GetInstance()->GetSystemLocale(sysLocaleStr);
+      if (!sysLocaleStr.IsEmpty()) {
+        mozilla::intl::Locale sysLoc = mozilla::intl::Locale(sysLocaleStr);
+        if (langCode.Equals(sysLoc.GetLanguage())) {
+          BuildDictionaryList(sysLocaleStr, dictList,
+                              DICT_COMPARE_CASE_INSENSITIVE, tryDictList);
+        }
+      }
+    }
+
     // Use any dictionary with the required language.
 #ifdef DEBUG_DICT
     printf("***** Trying to find match for language code |%s|\n",
-           NS_ConvertUTF16toUTF8(langCode).get());
+           langCode.get());
 #endif
     BuildDictionaryList(langCode, dictList, DICT_COMPARE_DASHMATCH,
                         tryDictList);
@@ -892,8 +915,7 @@
   // try the user preference next.
   if (!preferredDict.IsEmpty()) {
 #ifdef DEBUG_DICT
-    printf("***** Trying preference value |%s|\n",
-           NS_ConvertUTF16toUTF8(preferredDict).get());
+    printf("***** Trying preference value |%s|\n", preferredDict.get());
 #endif
     BuildDictionaryList(preferredDict, dictList, DICT_NORMAL_COMPARE,
                         tryDictList);
@@ -901,25 +923,23 @@
 
   // Priority 4:
   // As next fallback, try the current locale.
-  nsAutoCString utf8DictName;
-  LocaleService::GetInstance()->GetAppLocaleAsBCP47(utf8DictName);
-
-  CopyUTF8toUTF16(utf8DictName, dictName);
+  if (appLocaleStr.IsEmpty()) {
+    LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocaleStr);
+  }
 #ifdef DEBUG_DICT
-  printf("***** Trying locale |%s|\n", NS_ConvertUTF16toUTF8(dictName).get());
+  printf("***** Trying locale |%s|\n", appLocaleStr.get());
 #endif
-  BuildDictionaryList(dictName, dictList, DICT_COMPARE_CASE_INSENSITIVE,
+  BuildDictionaryList(appLocaleStr, dictList, DICT_COMPARE_CASE_INSENSITIVE,
                       tryDictList);
 
   // Priority 5:
   // If we have a current dictionary and we don't have no item in try list,
   // don't try anything else.
-  nsAutoString currentDictionary;
+  nsAutoCString currentDictionary;
   GetCurrentDictionary(currentDictionary);
   if (!currentDictionary.IsEmpty() && tryDictList.IsEmpty()) {
 #ifdef DEBUG_DICT
-    printf("***** Retrieved current dict |%s|\n",
-           NS_ConvertUTF16toUTF8(currentDictionary).get());
+    printf("***** Retrieved current dict |%s|\n", currentDictionary.get());
 #endif
     EndUpdateDictionary();
     if (aFetcher->mCallback) {
@@ -933,7 +953,7 @@
   // LANG = language[_territory][.charset]
   char* env_lang = getenv("LANG");
   if (env_lang) {
-    nsString lang = NS_ConvertUTF8toUTF16(env_lang);
+    nsAutoCString lang(env_lang);
     // Strip trailing charset, if there is any.
     int32_t dot_pos = lang.FindChar('.');
     if (dot_pos != -1) {
@@ -944,8 +964,7 @@
     if (underScore != -1) {
       lang.Replace(underScore, 1, '-');
 #ifdef DEBUG_DICT
-      printf("***** Trying LANG from environment |%s|\n",
-             NS_ConvertUTF16toUTF8(lang).get());
+      printf("***** Trying LANG from environment |%s|\n", lang.get());
 #endif
       BuildDictionaryList(lang, dictList, DICT_COMPARE_CASE_INSENSITIVE,
                           tryDictList);
@@ -958,8 +977,7 @@
     BuildDictionaryList(dictList[0], dictList, DICT_NORMAL_COMPARE,
                         tryDictList);
 #ifdef DEBUG_DICT
-    printf("***** Trying first of list |%s|\n",
-           NS_ConvertUTF16toUTF8(dictList[0]).get());
+    printf("***** Trying first of list |%s|\n", dictList[0].get());
 #endif
   }
 
diff -Nru firefox-84.0.2+build1/editor/spellchecker/EditorSpellCheck.h firefox-85.0+build1/editor/spellchecker/EditorSpellCheck.h
--- firefox-84.0.2+build1/editor/spellchecker/EditorSpellCheck.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/spellchecker/EditorSpellCheck.h	2021-01-18 19:58:11.000000000 +0000
@@ -68,7 +68,7 @@
   // GetPersonalDictionary must be called to load them.
   nsTArray<nsString> mDictionaryList;
 
-  nsString mPreferredLang;
+  nsCString mPreferredLang;
 
   uint32_t mTxtSrvFilterType;
   int32_t mSuggestedWordIndex;
@@ -79,10 +79,10 @@
 
   nsresult DeleteSuggestedWordList();
 
-  void BuildDictionaryList(const nsAString& aDictName,
-                           const nsTArray<nsString>& aDictList,
+  void BuildDictionaryList(const nsACString& aDictName,
+                           const nsTArray<nsCString>& aDictList,
                            enum dictCompare aCompareType,
-                           nsTArray<nsString>& aTryList);
+                           nsTArray<nsCString>& aOutList);
 
   nsresult DictionaryFetched(DictionaryFetcher* aFetchState);
 
diff -Nru firefox-84.0.2+build1/editor/spellchecker/tests/bug1200533_subframe.html firefox-85.0+build1/editor/spellchecker/tests/bug1200533_subframe.html
--- firefox-84.0.2+build1/editor/spellchecker/tests/bug1200533_subframe.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/spellchecker/tests/bug1200533_subframe.html	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 <textarea id="en-gb" lang="en-gb">root en-US, but element en-gb (lower case)</textarea>
 <textarea id="en-ZA-not-avail" lang="en-ZA">root en-US, but element en-ZA (which is not installed)</textarea>
 <textarea id="en-generic" lang="en">root en-US, but element en</textarea>
+<textarea id="en" lang="en">root en-US, but element en</textarea>
 <textarea id="ko-not-avail" lang="ko">root en-US, but element ko (which is not installed)</textarea>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/editor/spellchecker/tests/test_bug1200533.html firefox-85.0+build1/editor/spellchecker/tests/test_bug1200533.html
--- firefox-84.0.2+build1/editor/spellchecker/tests/test_bug1200533.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/spellchecker/tests/test_bug1200533.html	2021-01-18 19:58:11.000000000 +0000
@@ -29,9 +29,10 @@
     // Result: Element language.
     [ "en-GB", "", "en-GB" ],
     [ "en-gb", "", "en-GB" ],
-    // Result: Random en-*.
+    // Result: Random en-* or en-US (if application locale is en-US).
     [ "en-ZA-not-avail", "", "*" ],
     [ "en-generic",      "", "*" ],
+    [ "en",              "", "*" ],
     // Result: Locale.
     [ "ko-not-avail",    "", "en-US" ],
 
@@ -103,6 +104,7 @@
   var editor = SpecialPowers.wrap(elem).editor;
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
+  const is_en_US = SpecialPowers.Services.locale.appLocaleAsBCP47 == "en-US";
 
   SpecialPowers.Cu.import(
     "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
@@ -122,6 +124,10 @@
     } else {
       if (tests[loadCount][2] != "*") {
         is(dict, tests[loadCount][2], "expected " + tests[loadCount][2]);
+      } else if (is_en_US && tests[loadCount][0].startsWith("en")) {
+        // Current application locale is en-US and content lang is en or
+        // en-unknown, so we should use en-US dictionary as default.
+        is(dict, "en-US", "expected en-US that is application locale");
       } else {
         var gotEn = (dict == "en-GB" || dict == "en-AU" || dict == "en-US");
         is(gotEn, true, "expected en-AU or en-GB or en-US");
diff -Nru firefox-84.0.2+build1/editor/txmgr/TransactionItem.cpp firefox-85.0+build1/editor/txmgr/TransactionItem.cpp
--- firefox-84.0.2+build1/editor/txmgr/TransactionItem.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/txmgr/TransactionItem.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 #include "TransactionItem.h"
 
 #include "mozilla/mozalloc.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/TransactionManager.h"
 #include "mozilla/TransactionStack.h"
diff -Nru firefox-84.0.2+build1/editor/txmgr/TransactionManager.cpp firefox-85.0+build1/editor/txmgr/TransactionManager.cpp
--- firefox-84.0.2+build1/editor/txmgr/TransactionManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/editor/txmgr/TransactionManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 #include "mozilla/TransactionManager.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/DebugOnly.h"
 #include "mozilla/mozalloc.h"
 #include "mozilla/TransactionStack.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/.eslintrc.js firefox-85.0+build1/.eslintrc.js
--- firefox-84.0.2+build1/.eslintrc.js	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/.eslintrc.js	2021-01-18 19:58:08.000000000 +0000
@@ -455,16 +455,6 @@
         "dom/ipc/test.xhtml",
         "dom/ipc/tests/test_process_error.xhtml",
         "dom/notification/test/chrome/test_notification_system_principal.xhtml",
-        "dom/plugins/test/mochitest/test_busy_hang.xhtml",
-        "dom/plugins/test/mochitest/test_convertpoint.xhtml",
-        "dom/plugins/test/mochitest/test_crash_notify.xhtml",
-        "dom/plugins/test/mochitest/test_crash_notify_no_report.xhtml",
-        "dom/plugins/test/mochitest/test_crash_submit.xhtml",
-        "dom/plugins/test/mochitest/test_hang_submit.xhtml",
-        "dom/plugins/test/mochitest/test_hangui.xhtml",
-        "dom/plugins/test/mochitest/test_idle_hang.xhtml",
-        "dom/plugins/test/mochitest/test_xulbrowser_plugin_visibility.xhtml",
-        "dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xhtml",
         "dom/security/test/general/test_bug1277803.xhtml",
         "dom/serviceworkers/test/test_serviceworkerinfo.xhtml",
         "dom/serviceworkers/test/test_serviceworkermanager.xhtml",
diff -Nru firefox-84.0.2+build1/extensions/auth/nsAuthSSPI.cpp firefox-85.0+build1/extensions/auth/nsAuthSSPI.cpp
--- firefox-84.0.2+build1/extensions/auth/nsAuthSSPI.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/auth/nsAuthSSPI.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsIDNSRecord.h"
 #include "nsMemory.h"
 #include "nsNetCID.h"
+#include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsICryptoHash.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/extensions/auth/nsHttpNegotiateAuth.cpp firefox-85.0+build1/extensions/auth/nsHttpNegotiateAuth.cpp
--- firefox-84.0.2+build1/extensions/auth/nsHttpNegotiateAuth.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/auth/nsHttpNegotiateAuth.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -22,6 +22,7 @@
 #include "nsIHttpAuthenticableChannel.h"
 #include "nsIAuthModule.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsIProxyInfo.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
diff -Nru firefox-84.0.2+build1/extensions/permissions/PermissionManager.cpp firefox-85.0+build1/extensions/permissions/PermissionManager.cpp
--- firefox-84.0.2+build1/extensions/permissions/PermissionManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/permissions/PermissionManager.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/Permission.h"
 #include "mozilla/PermissionManager.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_permissions.h"
 #include "mozilla/Telemetry.h"
 
@@ -2243,17 +2244,14 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP PermissionManager::GetAll(
-    nsTArray<RefPtr<nsIPermission>>& aResult) {
-  return GetAllWithTypePrefix(""_ns, aResult);
-}
-
-NS_IMETHODIMP PermissionManager::GetAllWithTypePrefix(
-    const nsACString& aPrefix, nsTArray<RefPtr<nsIPermission>>& aResult) {
+// Helper function to filter permissions using a condition function.
+template <class T>
+nsresult PermissionManager::GetPermissionEntries(
+    T aCondition, nsTArray<RefPtr<nsIPermission>>& aResult) {
   aResult.Clear();
   if (XRE_IsContentProcess()) {
     NS_WARNING(
-        "PermissionManager's getAllWithTypePrefix is not available in the "
+        "Iterating over all permissions is not available in the "
         "content process, as not all permissions may be available.");
     return NS_ERROR_NOT_AVAILABLE;
   }
@@ -2277,8 +2275,7 @@
         continue;
       }
 
-      if (!aPrefix.IsEmpty() &&
-          !StringBeginsWith(mTypeArray[permEntry.mType], aPrefix)) {
+      if (!aCondition(permEntry)) {
         continue;
       }
 
@@ -2305,6 +2302,32 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP PermissionManager::GetAll(
+    nsTArray<RefPtr<nsIPermission>>& aResult) {
+  return GetPermissionEntries(
+      [](const PermissionEntry& aPermEntry) { return true; }, aResult);
+}
+
+NS_IMETHODIMP PermissionManager::GetAllByTypeSince(
+    const nsACString& aPrefix, int64_t aSince,
+    nsTArray<RefPtr<nsIPermission>>& aResult) {
+  return GetPermissionEntries(
+      [&](const PermissionEntry& aPermEntry) {
+        return mTypeArray[aPermEntry.mType].Equals(aPrefix) &&
+               aSince <= aPermEntry.mModificationTime;
+      },
+      aResult);
+}
+
+NS_IMETHODIMP PermissionManager::GetAllWithTypePrefix(
+    const nsACString& aPrefix, nsTArray<RefPtr<nsIPermission>>& aResult) {
+  return GetPermissionEntries(
+      [&](const PermissionEntry& aPermEntry) {
+        return StringBeginsWith(mTypeArray[aPermEntry.mType], aPrefix);
+      },
+      aResult);
+}
+
 NS_IMETHODIMP
 PermissionManager::GetAllForPrincipal(
     nsIPrincipal* aPrincipal, nsTArray<RefPtr<nsIPermission>>& aResult) {
diff -Nru firefox-84.0.2+build1/extensions/permissions/PermissionManager.h firefox-85.0+build1/extensions/permissions/PermissionManager.h
--- firefox-84.0.2+build1/extensions/permissions/PermissionManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/permissions/PermissionManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -471,6 +471,10 @@
   template <class T>
   nsresult RemovePermissionEntries(T aCondition);
 
+  template <class T>
+  nsresult GetPermissionEntries(T aCondition,
+                                nsTArray<RefPtr<nsIPermission>>& aResult);
+
   // This method must be called before doing any operation to be sure that the
   // DB reading has been completed. This method is also in charge to complete
   // the migrations if needed.
diff -Nru firefox-84.0.2+build1/extensions/permissions/test/gtest/PermissionManagerTest.cpp firefox-85.0+build1/extensions/permissions/test/gtest/PermissionManagerTest.cpp
--- firefox-84.0.2+build1/extensions/permissions/test/gtest/PermissionManagerTest.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/permissions/test/gtest/PermissionManagerTest.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsNetUtil.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/OriginAttributes.h"
 #include "mozilla/PermissionManager.h"
 #include "mozilla/RefPtr.h"
diff -Nru firefox-84.0.2+build1/extensions/permissions/test/unit/test_permmanager_getAllByTypeSince.js firefox-85.0+build1/extensions/permissions/test/unit/test_permmanager_getAllByTypeSince.js
--- firefox-84.0.2+build1/extensions/permissions/test/unit/test_permmanager_getAllByTypeSince.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/extensions/permissions/test/unit/test_permmanager_getAllByTypeSince.js	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,77 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function check_enumerator(prefix, from, permissions) {
+  let pm = Services.perms;
+
+  let array = pm.getAllByTypeSince(prefix, from);
+  Assert.equal(array.length, permissions.length);
+  for (let [principal, type, capability] of permissions) {
+    let perm = array.find(p => p.principal.equals(principal));
+    Assert.ok(perm != null);
+    Assert.equal(perm.type, type);
+    Assert.equal(perm.capability, capability);
+    Assert.equal(perm.expireType, pm.EXPIRE_NEVER);
+  }
+}
+
+add_task(async function test() {
+  let pm = Services.perms;
+
+  let principal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+    "http://example.com"
+  );
+  let subPrincipal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+    "http://sub.example.com"
+  );
+
+  check_enumerator("test/", 0, []);
+
+  pm.addFromPrincipal(principal, "test/getAllByTypeSince", pm.ALLOW_ACTION);
+
+  // These shouldn't show up anywhere, the name doesn't match.
+  pm.addFromPrincipal(
+    subPrincipal,
+    "other-test/getAllByTypeSince",
+    pm.PROMPT_ACTION
+  );
+  pm.addFromPrincipal(principal, "test/getAllByTypeSince1", pm.PROMPT_ACTION);
+
+  check_enumerator("test/getAllByTypeSince", 0, [
+    [principal, "test/getAllByTypeSince", pm.ALLOW_ACTION],
+  ]);
+
+  // Add some time in between taking the snapshot of the timestamp
+  // to avoid flakyness.
+  await new Promise(c => do_timeout(100, c));
+  let timestamp = Date.now();
+  await new Promise(c => do_timeout(100, c));
+
+  pm.addFromPrincipal(subPrincipal, "test/getAllByTypeSince", pm.DENY_ACTION);
+
+  check_enumerator("test/getAllByTypeSince", 0, [
+    [subPrincipal, "test/getAllByTypeSince", pm.DENY_ACTION],
+    [principal, "test/getAllByTypeSince", pm.ALLOW_ACTION],
+  ]);
+
+  check_enumerator("test/getAllByTypeSince", timestamp, [
+    [subPrincipal, "test/getAllByTypeSince", pm.DENY_ACTION],
+  ]);
+
+  // check that UNKNOWN_ACTION permissions are ignored
+  pm.addFromPrincipal(
+    subPrincipal,
+    "test/getAllByTypeSince",
+    pm.UNKNOWN_ACTION
+  );
+
+  check_enumerator("test/getAllByTypeSince", 0, [
+    [principal, "test/getAllByTypeSince", pm.ALLOW_ACTION],
+  ]);
+
+  // check that permission removals are reflected
+  pm.removeFromPrincipal(principal, "test/getAllByTypeSince");
+  check_enumerator("test/", 0, []);
+
+  pm.removeAll();
+});
diff -Nru firefox-84.0.2+build1/extensions/permissions/test/unit/xpcshell.ini firefox-85.0+build1/extensions/permissions/test/unit/xpcshell.ini
--- firefox-84.0.2+build1/extensions/permissions/test/unit/xpcshell.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/permissions/test/unit/xpcshell.ini	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
 [test_permmanager_default_pref.js]
 [test_permmanager_defaults.js]
 [test_permmanager_expiration.js]
+[test_permmanager_getAllByTypeSince.js]
 [test_permmanager_getAllForPrincipal.js]
 [test_permmanager_getAllWithTypePrefix.js]
 [test_permmanager_getPermissionObject.js]
diff -Nru firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsAutoConfig.cpp firefox-85.0+build1/extensions/pref/autoconfig/src/nsAutoConfig.cpp
--- firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsAutoConfig.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/pref/autoconfig/src/nsAutoConfig.cpp	2021-01-18 19:58:10.000000000 +0000
@@ -16,6 +16,8 @@
 #include "nsIPromptService.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
+#include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsIStringBundle.h"
 #include "nsContentUtils.h"
 #include "nsCRT.h"
@@ -26,6 +28,7 @@
 
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Logging.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 using mozilla::LogLevel;
 
diff -Nru firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp firefox-85.0+build1/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
--- firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/NullPrincipal.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "nsContentUtils.h"
 #include "nsJSPrincipals.h"
 #include "nsIScriptError.h"
diff -Nru firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsReadConfig.cpp firefox-85.0+build1/extensions/pref/autoconfig/src/nsReadConfig.cpp
--- firefox-84.0.2+build1/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/pref/autoconfig/src/nsReadConfig.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -103,7 +103,7 @@
               components::AppStartup::Service();
           if (appStartup) {
             bool userAllowedQuit = true;
-            appStartup->Quit(nsIAppStartup::eAttemptQuit, &userAllowedQuit);
+            appStartup->Quit(nsIAppStartup::eAttemptQuit, 0, &userAllowedQuit);
           }
         }
       }
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h firefox-85.0+build1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/hunspell_alloc_hooks.h	2021-01-18 19:58:11.000000000 +0000
@@ -44,9 +44,13 @@
  * allocated using C memory allocation functions.
  */
 
-#include "mozilla/mozalloc.h"
 #include "mozHunspellAllocator.h"
 
+// Ensure that malloc is imported before we set our malloc-counting hooks below.
+// Otherwise, if malloc is imported afterwards, its source will be trampled
+// over by the "#define"s.
+#include "mozmemory.h"
+
 #define malloc(size) HunspellAllocator::CountingMalloc(size)
 #define calloc(count, size) HunspellAllocator::CountingCalloc(count, size)
 #define free(ptr) HunspellAllocator::CountingFree(ptr)
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/mozHunspell.cpp firefox-85.0+build1/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/mozHunspell.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/mozHunspell.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -70,9 +70,11 @@
 #include "mozInlineSpellChecker.h"
 #include <stdlib.h>
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsNetUtil.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/Components.h"
+#include "mozilla/Services.h"
 
 using mozilla::dom::ContentParent;
 using namespace mozilla;
@@ -135,8 +137,8 @@
 }
 
 NS_IMETHODIMP
-mozHunspell::GetDictionary(nsAString& aDictionary) {
-  aDictionary = mDictionary;
+mozHunspell::GetDictionary(nsACString& aDictionary) {
+  CopyUTF16toUTF8(mDictionary, aDictionary);
   return NS_OK;
 }
 
@@ -145,7 +147,7 @@
  * dictionaries converter
  */
 NS_IMETHODIMP
-mozHunspell::SetDictionary(const nsAString& aDictionary) {
+mozHunspell::SetDictionary(const nsACString& aDictionary) {
   if (aDictionary.IsEmpty()) {
     delete mHunspell;
     mHunspell = nullptr;
@@ -157,7 +159,8 @@
     return NS_OK;
   }
 
-  nsIURI* affFile = mDictionaries.GetWeak(aDictionary);
+  NS_ConvertUTF8toUTF16 dict(aDictionary);
+  nsIURI* affFile = mDictionaries.GetWeak(dict);
   if (!affFile) {
     return NS_ERROR_FILE_NOT_FOUND;
   }
@@ -182,7 +185,7 @@
   // valid mHunspell instance which needs cleaned up.
   delete mHunspell;
 
-  mDictionary = aDictionary;
+  mDictionary = dict;
   mAffixFileName = affFileName;
 
   RegisterHunspellCallbacks(
@@ -216,10 +219,10 @@
 }
 
 NS_IMETHODIMP mozHunspell::GetDictionaryList(
-    nsTArray<nsString>& aDictionaries) {
+    nsTArray<nsCString>& aDictionaries) {
   MOZ_ASSERT(aDictionaries.IsEmpty());
   for (auto iter = mDictionaries.Iter(); !iter.Done(); iter.Next()) {
-    aDictionaries.AppendElement(iter.Key());
+    aDictionaries.AppendElement(NS_ConvertUTF16toUTF8(iter.Key()));
   }
 
   return NS_OK;
@@ -297,14 +300,14 @@
   // Check if the current dictionary is still available.
   // If not, try to replace it with another dictionary of the same language.
   if (!mDictionary.IsEmpty()) {
-    nsresult rv = SetDictionary(mDictionary);
+    nsresult rv = SetDictionary(NS_ConvertUTF16toUTF8(mDictionary));
     if (NS_SUCCEEDED(rv)) return;
   }
 
   // If the current dictionary has gone, and we don't have a good replacement,
   // set no current dictionary.
   if (!mDictionary.IsEmpty()) {
-    SetDictionary(u""_ns);
+    SetDictionary(EmptyCString());
   }
 }
 
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/mozHunspellFileMgrHost.cpp firefox-85.0+build1/extensions/spellcheck/hunspell/glue/mozHunspellFileMgrHost.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/mozHunspellFileMgrHost.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/mozHunspellFileMgrHost.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozHunspellFileMgrHost.h"
 #include "mozilla/DebugOnly.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
 #include "nsILoadInfo.h"
 #include "nsNetUtil.h"
 
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/PRemoteSpellcheckEngine.ipdl firefox-85.0+build1/extensions/spellcheck/hunspell/glue/PRemoteSpellcheckEngine.ipdl
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/PRemoteSpellcheckEngine.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/PRemoteSpellcheckEngine.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,7 @@
 
   sync CheckAndSuggest(nsString aWord) returns (bool aIsMisspelled, nsString[] aSuggestions);
 
-  sync SetDictionary(nsString aDictionary) returns (bool success);
+  sync SetDictionary(nsCString aDictionary) returns (bool success);
 
   /*
    * Set current dictionary from list of dictionary name.
@@ -26,8 +26,8 @@
    * @aSuccess      true if setting dictionary is successful
    * @aDictionary   Return current dictionary name that set by this method.
    */
-  async SetDictionaryFromList(nsString[] aList)
-           returns (bool aSuccess, nsString aDictionary);
+  async SetDictionaryFromList(nsCString[] aList)
+           returns (bool aSuccess, nsCString aDictionary);
 };
 
 } // namespace mozilla
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.cpp firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -19,12 +19,12 @@
 
 RefPtr<GenericPromise>
 RemoteSpellcheckEngineChild::SetCurrentDictionaryFromList(
-    const nsTArray<nsString>& aList) {
+    const nsTArray<nsCString>& aList) {
   RefPtr<mozSpellChecker> spellChecker = mOwner;
 
   return SendSetDictionaryFromList(aList)->Then(
       GetMainThreadSerialEventTarget(), __func__,
-      [spellChecker](Tuple<bool, nsString>&& aParam) {
+      [spellChecker](Tuple<bool, nsCString>&& aParam) {
         if (!Get<0>(aParam)) {
           spellChecker->mCurrentDictionary.Truncate();
           return GenericPromise::CreateAndReject(NS_ERROR_NOT_AVAILABLE,
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.h firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.h
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineChild.h	2021-01-18 19:58:11.000000000 +0000
@@ -20,7 +20,7 @@
   virtual ~RemoteSpellcheckEngineChild();
 
   RefPtr<GenericPromise> SetCurrentDictionaryFromList(
-      const nsTArray<nsString>& aList);
+      const nsTArray<nsCString>& aList);
 
   RefPtr<CheckWordPromise> CheckWords(const nsTArray<nsString>& aWords);
 
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.cpp firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -17,22 +17,22 @@
 RemoteSpellcheckEngineParent::~RemoteSpellcheckEngineParent() {}
 
 mozilla::ipc::IPCResult RemoteSpellcheckEngineParent::RecvSetDictionary(
-    const nsString& aDictionary, bool* success) {
+    const nsCString& aDictionary, bool* success) {
   nsresult rv = mSpellChecker->SetCurrentDictionary(aDictionary);
   *success = NS_SUCCEEDED(rv);
   return IPC_OK();
 }
 
 mozilla::ipc::IPCResult RemoteSpellcheckEngineParent::RecvSetDictionaryFromList(
-    nsTArray<nsString>&& aList, SetDictionaryFromListResolver&& aResolve) {
+    nsTArray<nsCString>&& aList, SetDictionaryFromListResolver&& aResolve) {
   for (auto& dictionary : aList) {
     nsresult rv = mSpellChecker->SetCurrentDictionary(dictionary);
     if (NS_SUCCEEDED(rv)) {
-      aResolve(Tuple<const bool&, const nsString&>(true, dictionary));
+      aResolve(Tuple<const bool&, const nsCString&>(true, dictionary));
       return IPC_OK();
     }
   }
-  aResolve(Tuple<const bool&, const nsString&>(false, u""_ns));
+  aResolve(Tuple<const bool&, const nsCString&>(false, ""_ns));
   return IPC_OK();
 }
 
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h
--- firefox-84.0.2+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/hunspell/glue/RemoteSpellCheckEngineParent.h	2021-01-18 19:58:10.000000000 +0000
@@ -20,11 +20,11 @@
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
-  virtual mozilla::ipc::IPCResult RecvSetDictionary(const nsString& aDictionary,
-                                                    bool* success);
+  virtual mozilla::ipc::IPCResult RecvSetDictionary(
+      const nsCString& aDictionary, bool* success);
 
   virtual mozilla::ipc::IPCResult RecvSetDictionaryFromList(
-      nsTArray<nsString>&& aList, SetDictionaryFromListResolver&& aResolve);
+      nsTArray<nsCString>&& aList, SetDictionaryFromListResolver&& aResolve);
 
   virtual mozilla::ipc::IPCResult RecvCheckAsync(nsTArray<nsString>&& aWord,
                                                  CheckAsyncResolver&& aResolve);
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/idl/mozISpellCheckingEngine.idl firefox-85.0+build1/extensions/spellcheck/idl/mozISpellCheckingEngine.idl
--- firefox-84.0.2+build1/extensions/spellcheck/idl/mozISpellCheckingEngine.idl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/idl/mozISpellCheckingEngine.idl	2021-01-18 19:58:11.000000000 +0000
@@ -23,7 +23,7 @@
    * If the dictionary is changed to no dictionary (the empty string), an
    * observer is allowed to set another dictionary before it returns.
    */
-  attribute AString dictionary;
+  attribute ACString dictionary;
 
   /**
    * the personal dictionary
@@ -33,7 +33,7 @@
   /**
    * Get the list of dictionaries
    */
-  Array<AString> getDictionaryList();
+  Array<ACString> getDictionaryList();
 
   /**
    * check a word
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/src/mozInlineSpellChecker.cpp firefox-85.0+build1/extensions/spellcheck/src/mozInlineSpellChecker.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/src/mozInlineSpellChecker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/src/mozInlineSpellChecker.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -51,7 +51,9 @@
 #include "nsGenericHTMLElement.h"
 #include "nsRange.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsIRunnable.h"
+#include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 #include "nsUnicharUtils.h"
@@ -1516,7 +1518,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  nsAutoString currentDictionary;
+  nsAutoCString currentDictionary;
   rv = mSpellCheck->GetCurrentDictionary(currentDictionary);
   if (NS_FAILED(rv)) {
     // no active dictionary
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/src/mozInlineSpellWordUtil.h firefox-85.0+build1/extensions/spellcheck/src/mozInlineSpellWordUtil.h
--- firefox-84.0.2+build1/extensions/spellcheck/src/mozInlineSpellWordUtil.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/src/mozInlineSpellWordUtil.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,8 +7,8 @@
 #define mozInlineSpellWordUtil_h
 
 #include "mozilla/Attributes.h"
-#include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
+#include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
 
@@ -19,6 +19,10 @@
 
 namespace mozilla {
 class TextEditor;
+
+namespace dom {
+class Document;
+}
 }  // namespace mozilla
 
 struct NodeOffset {
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/src/mozSpellChecker.cpp firefox-85.0+build1/extensions/spellcheck/src/mozSpellChecker.cpp
--- firefox-84.0.2+build1/extensions/spellcheck/src/mozSpellChecker.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/src/mozSpellChecker.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -302,7 +302,7 @@
 }
 
 nsresult mozSpellChecker::GetDictionaryList(
-    nsTArray<nsString>* aDictionaryList) {
+    nsTArray<nsCString>* aDictionaryList) {
   MOZ_ASSERT(aDictionaryList->IsEmpty());
   if (XRE_IsContentProcess()) {
     ContentChild* child = ContentChild::GetSingleton();
@@ -313,7 +313,7 @@
   nsresult rv;
 
   // For catching duplicates
-  nsTHashtable<nsStringHashKey> dictionaries;
+  nsTHashtable<nsCStringHashKey> dictionaries;
 
   nsCOMArray<mozISpellCheckingEngine> spellCheckingEngines;
   rv = GetEngineList(&spellCheckingEngines);
@@ -322,7 +322,7 @@
   for (int32_t i = 0; i < spellCheckingEngines.Count(); i++) {
     nsCOMPtr<mozISpellCheckingEngine> engine = spellCheckingEngines[i];
 
-    nsTArray<nsString> dictNames;
+    nsTArray<nsCString> dictNames;
     engine->GetDictionaryList(dictNames);
     for (auto& dictName : dictNames) {
       // Skip duplicate dictionaries. Only take the first one
@@ -337,7 +337,7 @@
   return NS_OK;
 }
 
-nsresult mozSpellChecker::GetCurrentDictionary(nsAString& aDictionary) {
+nsresult mozSpellChecker::GetCurrentDictionary(nsACString& aDictionary) {
   if (XRE_IsContentProcess()) {
     aDictionary = mCurrentDictionary;
     return NS_OK;
@@ -351,9 +351,9 @@
   return mSpellCheckingEngine->GetDictionary(aDictionary);
 }
 
-nsresult mozSpellChecker::SetCurrentDictionary(const nsAString& aDictionary) {
+nsresult mozSpellChecker::SetCurrentDictionary(const nsACString& aDictionary) {
   if (XRE_IsContentProcess()) {
-    nsString wrappedDict = nsString(aDictionary);
+    nsCString wrappedDict = nsCString(aDictionary);
     bool isSuccess;
     mEngine->SendSetDictionary(wrappedDict, &isSuccess);
     if (!isSuccess) {
@@ -404,7 +404,7 @@
 }
 
 RefPtr<GenericPromise> mozSpellChecker::SetCurrentDictionaryFromList(
-    const nsTArray<nsString>& aList) {
+    const nsTArray<nsCString>& aList) {
   if (aList.IsEmpty()) {
     return GenericPromise::CreateAndReject(NS_ERROR_INVALID_ARG, __func__);
   }
diff -Nru firefox-84.0.2+build1/extensions/spellcheck/src/mozSpellChecker.h firefox-85.0+build1/extensions/spellcheck/src/mozSpellChecker.h
--- firefox-84.0.2+build1/extensions/spellcheck/src/mozSpellChecker.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/extensions/spellcheck/src/mozSpellChecker.h	2021-01-18 19:58:11.000000000 +0000
@@ -120,7 +120,7 @@
    * @param aDictionaryList is an array of nsStrings that represent the
    * dictionaries supported by the spellchecker.
    */
-  nsresult GetDictionaryList(nsTArray<nsString>* aDictionaryList);
+  nsresult GetDictionaryList(nsTArray<nsCString>* aDictionaryList);
 
   /**
    * Returns a string representing the current dictionary.
@@ -128,7 +128,7 @@
    * This name is the same string that is in the list returned
    * by GetDictionaryList().
    */
-  nsresult GetCurrentDictionary(nsAString& aDictionary);
+  nsresult GetCurrentDictionary(nsACString& aDictionary);
 
   /**
    * Tells the spellchecker to use a specific dictionary.
@@ -136,14 +136,14 @@
    * by GetDictionaryList() or an empty string. If aDictionary is
    * empty string, spellchecker will be disabled.
    */
-  nsresult SetCurrentDictionary(const nsAString& aDictionary);
+  nsresult SetCurrentDictionary(const nsACString& aDictionary);
 
   /**
    * Tells the spellchecker to use a specific dictionary from list.
    * @param aList  a preferred dictionary list
    */
   RefPtr<mozilla::GenericPromise> SetCurrentDictionaryFromList(
-      const nsTArray<nsString>& aList);
+      const nsTArray<nsCString>& aList);
 
   void DeleteRemoteEngine() { mEngine = nullptr; }
 
@@ -162,7 +162,7 @@
   nsCOMPtr<mozISpellCheckingEngine> mSpellCheckingEngine;
   bool mFromStart;
 
-  nsString mCurrentDictionary;
+  nsCString mCurrentDictionary;
 
   MOZ_CAN_RUN_SCRIPT
   nsresult SetupDoc(int32_t* outBlockOffset);
diff -Nru firefox-84.0.2+build1/gfx/2d/BezierUtils.h firefox-85.0+build1/gfx/2d/BezierUtils.h
--- firefox-84.0.2+build1/gfx/2d/BezierUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/BezierUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,8 +7,8 @@
 #ifndef mozilla_BezierUtils_h_
 #define mozilla_BezierUtils_h_
 
-#include "mozilla/gfx/2D.h"
-#include "gfxRect.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Types.h"
 
 namespace mozilla {
 namespace gfx {
diff -Nru firefox-84.0.2+build1/gfx/2d/BlurLS3.cpp firefox-85.0+build1/gfx/2d/BlurLS3.cpp
--- firefox-84.0.2+build1/gfx/2d/BlurLS3.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/BlurLS3.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -32,8 +32,8 @@
       "gsldlc1 %[vl], 0x7(%[p]) \n\t"
       "gsldrc1 %[vl], 0x0(%[p]) \n\t"
       ".set pop \n\t"
-      : [ vh ] "=f"(v.h), [ vl ] "=f"(v.l)
-      : [ p ] "r"(p)
+      : [vh] "=f"(v.h), [vl] "=f"(v.l)
+      : [p] "r"(p)
       : "memory");
 
   return v;
@@ -56,8 +56,8 @@
       "mthc1 %[tmp], %[maskl] \n\t"
       "mov.d %[maskh], %[maskl] \n\t"
       ".set pop \n\t"
-      : [ rah ] "=f"(ra.h), [ ral ] "=f"(ra.l), [ maskh ] "=f"(mask.h),
-        [ maskl ] "=f"(mask.l), [ tmp ] "=&r"(tmp));
+      : [rah] "=f"(ra.h), [ral] "=f"(ra.l), [maskh] "=f"(mask.h),
+        [maskl] "=f"(mask.l), [tmp] "=&r"(tmp));
 
   asm volatile(
       ".set push \n\t"
@@ -69,12 +69,12 @@
       // the result is rounded.
       _mm_paddd(t1, t1, ra) _mm_psrld(t1, t1, srl32) _mm_paddd(t2, t2, ra)
           _mm_and(t2, t2, mask) _mm_or(p4321, t1, t2) ".set pop \n\t"
-      : [ p4321h ] "=&f"(p4321.h), [ p4321l ] "=&f"(p4321.l),
-        [ t1h ] "=&f"(t1.h), [ t1l ] "=&f"(t1.l), [ t2h ] "=&f"(t2.h),
-        [ t2l ] "=&f"(t2.l), [ srl32 ] "=&f"(srl32), [ tmp ] "=&r"(tmp)
-      : [ rah ] "f"(ra.h), [ ral ] "f"(ra.l), [ maskh ] "f"(mask.h),
-        [ maskl ] "f"(mask.l), [ avh ] "f"(aValues.h), [ avl ] "f"(aValues.l),
-        [ adh ] "f"(aDivisor.h), [ adl ] "f"(aDivisor.l));
+      : [p4321h] "=&f"(p4321.h), [p4321l] "=&f"(p4321.l), [t1h] "=&f"(t1.h),
+        [t1l] "=&f"(t1.l), [t2h] "=&f"(t2.h), [t2l] "=&f"(t2.l),
+        [srl32] "=&f"(srl32), [tmp] "=&r"(tmp)
+      : [rah] "f"(ra.h), [ral] "f"(ra.l), [maskh] "f"(mask.h),
+        [maskl] "f"(mask.l), [avh] "f"(aValues.h), [avl] "f"(aValues.l),
+        [adh] "f"(aDivisor.h), [adl] "f"(aDivisor.l));
 
   return p4321;
 }
@@ -89,11 +89,11 @@
       ".set push \n\t"
       ".set arch=loongson3a \n\t" _mm_psubw(val, abr, atr)
           _mm_psubw(val, val, abl) _mm_paddw(val, val, atl) ".set pop \n\t"
-      : [ valh ] "=&f"(values.h), [ vall ] "=&f"(values.l)
-      : [ abrh ] "f"(aBottomRight.h), [ abrl ] "f"(aBottomRight.l),
-        [ atrh ] "f"(aTopRight.h), [ atrl ] "f"(aTopRight.l),
-        [ ablh ] "f"(aBottomLeft.h), [ abll ] "f"(aBottomLeft.l),
-        [ atlh ] "f"(aTopLeft.h), [ atll ] "f"(aTopLeft.l));
+      : [valh] "=&f"(values.h), [vall] "=&f"(values.l)
+      : [abrh] "f"(aBottomRight.h), [abrl] "f"(aBottomRight.l),
+        [atrh] "f"(aTopRight.h), [atrl] "f"(aTopRight.l),
+        [ablh] "f"(aBottomLeft.h), [abll] "f"(aBottomLeft.l),
+        [atlh] "f"(aTopLeft.h), [atll] "f"(aTopLeft.l));
 
   return Divide(values, aDivisor);
 }
@@ -203,8 +203,8 @@
       "mtc1 %[tmp], %[see] \n\t"
       "li %[tmp], 0x44 \n\t"
       "mtc1 %[tmp], %[s44] \n\t" _mm_xor(zero, zero, zero) ".set pop \n\t"
-      : [ tmp ] "=&r"(tmp), [ s44 ] "=f"(s44), [ see ] "=f"(see),
-        [ zeroh ] "=f"(zero.h), [ zerol ] "=f"(zero.l));
+      : [tmp] "=&r"(tmp), [s44] "=f"(s44), [see] "=f"(see),
+        [zeroh] "=f"(zero.h), [zerol] "=f"(zero.l));
   for (int y = aTopInflation + 1; y < (aSize.height + aTopInflation); y++) {
     __m128i currentRowSum;
     uint32_t* intRow = aIntegralImage + (y * stride32bit);
@@ -215,7 +215,7 @@
     asm volatile(
         ".set push \n\t"
         ".set arch=loongson3a \n\t" _mm_xor(cr, cr, cr) ".set pop \n\t"
-        : [ crh ] "=f"(currentRowSum.h), [ crl ] "=f"(currentRowSum.l));
+        : [crh] "=f"(currentRowSum.h), [crl] "=f"(currentRowSum.l));
     for (int x = 0; x < aLeftInflation; x += 4) {
       __m128i sumPixels, t;
       asm volatile(
@@ -227,8 +227,8 @@
           "pshufh %[sph], %[spl], %[s44] \n\t"
           "pshufh %[spl], %[spl], %[s44] \n\t"
           ".set pop \n\t"
-          : [ sph ] "=&f"(sumPixels.h), [ spl ] "=&f"(sumPixels.l)
-          : [ pix ] "r"(pixel), [ s44 ] "f"(s44));
+          : [sph] "=&f"(sumPixels.h), [spl] "=&f"(sumPixels.l)
+          : [pix] "r"(pixel), [s44] "f"(s44));
       sumPixels = AccumulatePixelSums(sumPixels);
       asm volatile (
         ".set push \n\t"
@@ -264,10 +264,10 @@
           "punpcklwd %[spl], %[spl], %[spl] \n\t"
           "mov.d %[sph], %[spl] \n\t" _mm_punpcklbh(sp, sp, zero)
               _mm_punpcklhw(sp, sp, zero) ".set pop \n\t"
-          : [ sph ] "=&f"(sumPixels.h), [ spl ] "=&f"(sumPixels.l),
-            [ crh ] "+f"(currentRowSum.h), [ crl ] "+f"(currentRowSum.l)
-          : [ pix ] "r"(pixels), [ see ] "f"(see), [ zeroh ] "f"(zero.h),
-            [ zerol ] "f"(zero.l));
+          : [sph] "=&f"(sumPixels.h), [spl] "=&f"(sumPixels.l),
+            [crh] "+f"(currentRowSum.h), [crl] "+f"(currentRowSum.l)
+          : [pix] "r"(pixels), [see] "f"(see), [zeroh] "f"(zero.h),
+            [zerol] "f"(zero.l));
       sumPixels = AccumulatePixelSums(sumPixels);
       asm volatile (
         ".set push \n\t"
@@ -305,8 +305,8 @@
               "punpcklwd %[crl], %[crl], %[crl] \n\t"
               "mov.d %[crh], %[crl] \n\t"
               ".set pop \n\t"
-              : [ crh ] "=f"(currentRowSum.h), [ crl ] "=f"(currentRowSum.l)
-              : [ cr ] "r"(intCurrentRowSum));
+              : [crh] "=f"(currentRowSum.h), [crl] "=f"(currentRowSum.l)
+              : [cr] "r"(intCurrentRowSum));
           break;
         }
         intCurrentRowSum += pixel;
@@ -319,8 +319,8 @@
           "pshufh %[crl], %[crh], %[see] \n\t"
           "pshufh %[crh], %[crh], %[see] \n\t"
           ".set pop \n\t"
-          : [ crh ] "+f"(currentRowSum.h), [ crl ] "+f"(currentRowSum.l)
-          : [ see ] "f"(see));
+          : [crh] "+f"(currentRowSum.h), [crl] "+f"(currentRowSum.l)
+          : [see] "f"(see));
     }
     for (; x < integralImageSize.width; x += 4) {
       __m128i sumPixels, t;
@@ -331,8 +331,8 @@
           "punpcklwd %[spl], %[spl], %[spl] \n\t"
           "mov.d %[sph], %[spl] \n\t"
           ".set pop \n\t"
-          : [ sph ] "=f"(sumPixels.h), [ spl ] "=f"(sumPixels.l)
-          : [ pix ] "r"(pixel));
+          : [sph] "=f"(sumPixels.h), [spl] "=f"(sumPixels.l)
+          : [pix] "r"(pixel));
       sumPixels = AccumulatePixelSums(sumPixels);
       asm volatile (
         ".set push \n\t"
@@ -432,9 +432,9 @@
       "mtc1 %[rec], %[divl] \n\t"
       "punpcklwd %[divl], %[divl], %[divl] \n\t"
       "mov.d %[divh], %[divl] \n\t" _mm_xor(zero, zero, zero) ".set pop \n\t"
-      : [ divh ] "=f"(divisor.h), [ divl ] "=f"(divisor.l),
-        [ zeroh ] "=f"(zero.h), [ zerol ] "=f"(zero.l)
-      : [ rec ] "r"(reciprocal));
+      : [divh] "=f"(divisor.h), [divl] "=f"(divisor.l), [zeroh] "=f"(zero.h),
+        [zerol] "=f"(zero.l)
+      : [rec] "r"(reciprocal));
 
   // This points to the start of the rectangle within the IntegralImage that
   // overlaps the surface being blurred.
diff -Nru firefox-84.0.2+build1/gfx/2d/CGTextDrawing.h firefox-85.0+build1/gfx/2d/CGTextDrawing.h
--- firefox-84.0.2+build1/gfx/2d/CGTextDrawing.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/CGTextDrawing.h	2021-01-18 19:58:11.000000000 +0000
@@ -81,6 +81,10 @@
   int stride = CGBitmapContextGetBytesPerRow(aContext);
 
   CGRect bounds = CGRectIntersection(bitmapBounds, aTextBounds);
+  if (CGRectIsEmpty(bounds)) {
+    return;
+  }
+
   int startX = bounds.origin.x;
   int endX = startX + bounds.size.width;
   MOZ_ASSERT(endX <= bitmapBounds.size.width);
diff -Nru firefox-84.0.2+build1/gfx/2d/DrawTargetRecording.cpp firefox-85.0+build1/gfx/2d/DrawTargetRecording.cpp
--- firefox-84.0.2+build1/gfx/2d/DrawTargetRecording.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/DrawTargetRecording.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -261,23 +261,25 @@
   } else if (!aFont->GetUserData(userDataKey)) {
     UnscaledFont* unscaledFont = aFont->GetUnscaledFont();
     if (mRecorder->IncrementUnscaledFontRefCount(unscaledFont) == 0) {
-      RecordedFontData fontData(unscaledFont);
-      RecordedFontDetails fontDetails;
-      if (fontData.GetFontDetails(fontDetails)) {
-        // Try to serialise the whole font, just in case this is a web font that
-        // is not present on the system.
-        if (!mRecorder->HasStoredFontData(fontDetails.fontDataKey)) {
-          mRecorder->RecordEvent(fontData);
-          mRecorder->AddStoredFontData(fontDetails.fontDataKey);
-        }
-        mRecorder->RecordEvent(
-            RecordedUnscaledFontCreation(unscaledFont, fontDetails));
+      // Prefer sending the description, if we can create one. This ensures
+      // we don't record the data of system fonts which saves time and can
+      // prevent duplicate copies from accumulating in the OS cache during
+      // playback.
+      RecordedFontDescriptor fontDesc(unscaledFont);
+      if (fontDesc.IsValid()) {
+        mRecorder->RecordEvent(fontDesc);
       } else {
-        // If that fails, record just the font description and try to load it
-        // from the system on the other side.
-        RecordedFontDescriptor fontDesc(unscaledFont);
-        if (fontDesc.IsValid()) {
-          mRecorder->RecordEvent(fontDesc);
+        RecordedFontData fontData(unscaledFont);
+        RecordedFontDetails fontDetails;
+        if (fontData.GetFontDetails(fontDetails)) {
+          // Try to serialise the whole font, just in case this is a web font
+          // that is not present on the system.
+          if (!mRecorder->HasStoredFontData(fontDetails.fontDataKey)) {
+            mRecorder->RecordEvent(fontData);
+            mRecorder->AddStoredFontData(fontDetails.fontDataKey);
+          }
+          mRecorder->RecordEvent(
+              RecordedUnscaledFontCreation(unscaledFont, fontDetails));
         } else {
           gfxWarning() << "DrawTargetRecording::FillGlyphs failed to serialise "
                           "UnscaledFont";
diff -Nru firefox-84.0.2+build1/gfx/2d/Matrix.h firefox-85.0+build1/gfx/2d/Matrix.h
--- firefox-84.0.2+build1/gfx/2d/Matrix.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/Matrix.h	2021-01-18 19:58:11.000000000 +0000
@@ -444,14 +444,14 @@
    * The xMajor parameter indicates if the larger scale is
    * to be assumed to be in the X direction or not.
    */
-  MatrixSize ScaleFactors(bool xMajor) const {
+  MatrixSize ScaleFactors() const {
     T det = Determinant();
 
     if (det == 0.0) {
       return MatrixSize(0.0, 0.0);
     }
 
-    MatrixSize sz = xMajor ? MatrixSize(1.0, 0.0) : MatrixSize(0.0, 1.0);
+    MatrixSize sz = MatrixSize(1.0, 0.0);
     sz = TransformSize(sz);
 
     T major = sqrt(sz.width * sz.width + sz.height * sz.height);
@@ -466,11 +466,7 @@
       minor = det / major;
     }
 
-    if (xMajor) {
-      return MatrixSize(major, minor);
-    }
-
-    return MatrixSize(minor, major);
+    return MatrixSize(major, minor);
   }
 };
 
diff -Nru firefox-84.0.2+build1/gfx/2d/NativeFontResourceMac.cpp firefox-85.0+build1/gfx/2d/NativeFontResourceMac.cpp
--- firefox-84.0.2+build1/gfx/2d/NativeFontResourceMac.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/NativeFontResourceMac.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -53,7 +53,7 @@
         subPath.AppendPrintf("<anonymized-%p>", this);
       } else {
         if (i.second.Length()) {
-          subPath.AppendLiteral("family=");
+          subPath.AppendLiteral("psname=");
           subPath.Append(i.second);
         } else {
           subPath.AppendPrintf("Unknown(%d)", unknownFontIndex);
@@ -83,6 +83,9 @@
 already_AddRefed<NativeFontResourceMac> NativeFontResourceMac::Create(
     uint8_t* aFontData, uint32_t aDataLength) {
   uint8_t* fontData = (uint8_t*)malloc(aDataLength);
+  if (!fontData) {
+    return nullptr;
+  }
   memcpy(fontData, aFontData, aDataLength);
   CFAllocatorContext context = {0,       fontData, nullptr, nullptr,
                                 nullptr, nullptr,  nullptr, FontDataDeallocate,
@@ -95,9 +98,17 @@
   // we'll later release this CFDataRef.
   CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, fontData,
                                                aDataLength, allocator);
+  if (!data) {
+    free(fontData);
+    return nullptr;
+  }
 
   CTFontDescriptorRef ctFontDesc =
       CTFontManagerCreateFontDescriptorFromData(data);
+  if (!ctFontDesc) {
+    CFRelease(data);
+    return nullptr;
+  }
 
   // creating the CGFontRef via the CTFont avoids the data being held alive
   // in a cache.
diff -Nru firefox-84.0.2+build1/gfx/2d/PathD2D.cpp firefox-85.0+build1/gfx/2d/PathD2D.cpp
--- firefox-84.0.2+build1/gfx/2d/PathD2D.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/PathD2D.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -316,6 +316,11 @@
 
 bool PathD2D::ContainsPoint(const Point& aPoint,
                             const Matrix& aTransform) const {
+  if (!aTransform.Determinant()) {
+    // If the transform is not invertible, then don't consider point inside.
+    return false;
+  }
+
   BOOL result;
 
   HRESULT hr = mGeometry->FillContainsPoint(
@@ -332,6 +337,11 @@
 bool PathD2D::StrokeContainsPoint(const StrokeOptions& aStrokeOptions,
                                   const Point& aPoint,
                                   const Matrix& aTransform) const {
+  if (!aTransform.Determinant()) {
+    // If the transform is not invertible, then don't consider point inside.
+    return false;
+  }
+
   BOOL result;
 
   RefPtr<ID2D1StrokeStyle> strokeStyle =
diff -Nru firefox-84.0.2+build1/gfx/2d/RecordedEvent.h firefox-85.0+build1/gfx/2d/RecordedEvent.h
--- firefox-84.0.2+build1/gfx/2d/RecordedEvent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/RecordedEvent.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef MOZILLA_GFX_RECORDEDEVENT_H_
 #define MOZILLA_GFX_RECORDEDEVENT_H_
 
-#include "2D.h"
 #include <ostream>
 #include <sstream>
 #include <cstring>
@@ -15,6 +14,8 @@
 #include <vector>
 
 #include "RecordingTypes.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/ipc/ByteBuf.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/2d/Rect.h firefox-85.0+build1/gfx/2d/Rect.h
--- firefox-84.0.2+build1/gfx/2d/Rect.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/Rect.h	2021-01-18 19:58:11.000000000 +0000
@@ -75,16 +75,20 @@
            fabs(this->right - aOther.right) < aEpsilon &&
            fabs(this->bottom - aOther.bottom) < aEpsilon;
   }
+
+  IntMarginTyped<units> Rounded() const {
+    return IntMarginTyped<units>(int32_t(std::floor(this->top + 0.5f)),
+                                 int32_t(std::floor(this->right + 0.5f)),
+                                 int32_t(std::floor(this->bottom + 0.5f)),
+                                 int32_t(std::floor(this->left + 0.5f)));
+  }
 };
 typedef MarginTyped<UnknownUnits> Margin;
 typedef MarginTyped<UnknownUnits, double> MarginDouble;
 
 template <class units>
 IntMarginTyped<units> RoundedToInt(const MarginTyped<units>& aMargin) {
-  return IntMarginTyped<units>(int32_t(floorf(aMargin.top + 0.5f)),
-                               int32_t(floorf(aMargin.right + 0.5f)),
-                               int32_t(floorf(aMargin.bottom + 0.5f)),
-                               int32_t(floorf(aMargin.left + 0.5f)));
+  return aMargin.Rounded();
 }
 
 template <class units>
diff -Nru firefox-84.0.2+build1/gfx/2d/ScaledFontDWrite.cpp firefox-85.0+build1/gfx/2d/ScaledFontDWrite.cpp
--- firefox-84.0.2+build1/gfx/2d/ScaledFontDWrite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/ScaledFontDWrite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -304,19 +304,26 @@
     return false;
   }
 
-  uint32_t fileSize = static_cast<uint32_t>(fileSize64);
-  const void* fragmentStart;
-  void* context;
-  hr = stream->ReadFileFragment(&fragmentStart, 0, fileSize, &context);
+  // Try to catch any device memory exceptions that may occur while attempting
+  // to read the file fragment.
+  void* context = nullptr;
+  hr = E_FAIL;
+  MOZ_SEH_TRY {
+    uint32_t fileSize = static_cast<uint32_t>(fileSize64);
+    const void* fragmentStart = nullptr;
+    hr = stream->ReadFileFragment(&fragmentStart, 0, fileSize, &context);
+    if (SUCCEEDED(hr)) {
+      aDataCallback((uint8_t*)fragmentStart, fileSize, mFontFace->GetIndex(),
+                    aBaton);
+    }
+  }
+  MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
+    gfxCriticalNote << "Exception occurred reading DWrite font file data";
+  }
   if (FAILED(hr)) {
     return false;
   }
-
-  aDataCallback((uint8_t*)fragmentStart, fileSize, mFontFace->GetIndex(),
-                aBaton);
-
   stream->ReleaseFileFragment(context);
-
   return true;
 }
 
@@ -377,7 +384,7 @@
     gfxDebug() << "Invalid file \"" << aFileName.data() << "\" for WR font";
     return false;
   }
-  aFileName.pop_back();
+  // We leave the null terminator at the end of the returned file name.
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/gfx/2d/ScaledFontWin.cpp firefox-85.0+build1/gfx/2d/ScaledFontWin.cpp
--- firefox-84.0.2+build1/gfx/2d/ScaledFontWin.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/ScaledFontWin.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -73,8 +73,12 @@
 
 bool UnscaledFontGDI::GetFontDescriptor(FontDescriptorOutput aCb,
                                         void* aBaton) {
-  aCb(reinterpret_cast<uint8_t*>(&mLogFont), sizeof(mLogFont), 0, aBaton);
-  return true;
+  // Because all the callers of this function are preparing a recorded
+  // event to be played back in another process, it's not helpful to ever
+  // return a font descriptor, since it isn't meaningful in another
+  // process. Those callers will always need to send full font data, and
+  // returning false here will ensure that that happens.
+  return false;
 }
 
 already_AddRefed<UnscaledFont> UnscaledFontGDI::CreateFromFontDescriptor(
diff -Nru firefox-84.0.2+build1/gfx/2d/Types.h firefox-85.0+build1/gfx/2d/Types.h
--- firefox-84.0.2+build1/gfx/2d/Types.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/2d/Types.h	2021-01-18 19:58:11.000000000 +0000
@@ -684,13 +684,13 @@
   return HalfCorner(aCorner * 2 + aIsVertical);
 }
 
-constexpr bool SideIsVertical(Side aSide) { return aSide % 2; }
+constexpr bool SideIsVertical(mozilla::Side aSide) { return aSide % 2; }
 
 // @param aIsSecond when true, return the clockwise second of the two
 // corners associated with aSide. For example, with aSide = eSideBottom the
 // result is eCornerBottomRight when aIsSecond is false, and
 // eCornerBottomLeft when aIsSecond is true.
-constexpr Corner SideToFullCorner(Side aSide, bool aIsSecond) {
+constexpr Corner SideToFullCorner(mozilla::Side aSide, bool aIsSecond) {
   return Corner((aSide + aIsSecond) % 4);
 }
 
@@ -701,7 +701,7 @@
 // eCornerTopRightY when aIsParallel is false (because "X" is parallel with
 // eSideTop/eSideBottom, similarly "Y" is parallel with
 // eSideLeft/eSideRight)
-constexpr HalfCorner SideToHalfCorner(Side aSide, bool aIsSecond,
+constexpr HalfCorner SideToHalfCorner(mozilla::Side aSide, bool aIsSecond,
                                       bool aIsParallel) {
   return HalfCorner(((aSide + aIsSecond) * 2 + (aSide + !aIsParallel) % 2) % 8);
 }
diff -Nru firefox-84.0.2+build1/gfx/config/gfxConfigManager.cpp firefox-85.0+build1/gfx/config/gfxConfigManager.cpp
--- firefox-84.0.2+build1/gfx/config/gfxConfigManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/config/gfxConfigManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,6 +13,7 @@
 #include "gfxConfig.h"
 #include "gfxPlatform.h"
 #include "nsIGfxInfo.h"
+#include "nsPrintfCString.h"
 #include "nsXULAppAPI.h"
 
 #ifdef XP_WIN
@@ -30,6 +31,7 @@
   EmplaceUserPref("gfx.webrender.compositor", mWrCompositorEnabled);
   mWrForceEnabled = gfxPlatform::WebRenderPrefEnabled();
   mWrForceDisabled = StaticPrefs::gfx_webrender_force_disabled_AtStartup();
+  mWrSoftwareForceEnabled = StaticPrefs::gfx_webrender_software_AtStartup();
   mWrCompositorForceEnabled =
       StaticPrefs::gfx_webrender_compositor_force_enabled_AtStartup();
   mGPUProcessAllowSoftware =
@@ -113,8 +115,21 @@
 
   mFeatureWrSoftware->EnableByDefault();
 
-  if (StaticPrefs::gfx_webrender_software_AtStartup()) {
+  // Note that for testing in CI, software WebRender uses gfx.webrender.software
+  // to force enable WebRender Software. As a result, we need to prefer that
+  // over the MOZ_WEBRENDER envvar which is used to otherwise force on WebRender
+  // (hardware). See bug 1656811.
+  if (mWrSoftwareForceEnabled) {
     mFeatureWrSoftware->UserForceEnable("Force enabled by pref");
+  } else if (mWrForceEnabled || mWrEnvForceEnabled) {
+    mFeatureWrSoftware->UserDisable(
+        "User force-enabled full WR",
+        "FEATURE_FAILURE_USER_FORCE_ENABLED_FULL_WR"_ns);
+  } else if (mWrForceDisabled || mWrEnvForceDisabled) {
+    // If the user set the pref to force-disable, let's do that. This
+    // will override all the other enabling prefs
+    mFeatureWrSoftware->UserDisable("User force-disabled WR",
+                                    "FEATURE_FAILURE_USER_FORCE_DISABLED"_ns);
   }
 
   nsCString failureId;
@@ -189,7 +204,7 @@
     if (adapterVendorID == u"0x8086") {
       bool mixed;
       int32_t maxRefreshRate = mGfxInfo->GetMaxRefreshRate(&mixed);
-      if (maxRefreshRate > 60) {
+      if (maxRefreshRate > 75) {
         mFeatureWrQualified->Disable(FeatureStatus::Blocked,
                                      "Monitor refresh rate too high",
                                      "REFRESH_RATE_TOO_HIGH"_ns);
@@ -308,7 +323,7 @@
                                       "ANGLE is disabled",
                                       mFeatureD3D11HwAngle->GetFailureId());
       } else if (!mFeatureGPUProcess->IsEnabled() &&
-                 (!mIsNightly || !mWrForceAngleNoGPUProcess)) {
+                 !mWrForceAngleNoGPUProcess) {
         // WebRender with ANGLE relies on the GPU process when on Windows
         mFeatureWrAngle->ForceDisable(
             FeatureStatus::UnavailableNoGpuProcess, "GPU Process is disabled",
diff -Nru firefox-84.0.2+build1/gfx/config/gfxConfigManager.h firefox-85.0+build1/gfx/config/gfxConfigManager.h
--- firefox-84.0.2+build1/gfx/config/gfxConfigManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/config/gfxConfigManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -29,6 +29,7 @@
         mFeatureGPUProcess(nullptr),
         mWrForceEnabled(false),
         mWrForceDisabled(false),
+        mWrSoftwareForceEnabled(false),
         mWrCompositorForceEnabled(false),
         mWrForceAngle(false),
         mWrForceAngleNoGPUProcess(false),
@@ -75,6 +76,7 @@
   Maybe<bool> mWrCompositorEnabled;
   bool mWrForceEnabled;
   bool mWrForceDisabled;
+  bool mWrSoftwareForceEnabled;
   bool mWrCompositorForceEnabled;
   bool mWrForceAngle;
   bool mWrForceAngleNoGPUProcess;
diff -Nru firefox-84.0.2+build1/gfx/gl/GLBlitHelper.h firefox-85.0+build1/gfx/gl/GLBlitHelper.h
--- firefox-84.0.2+build1/gfx/gl/GLBlitHelper.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLBlitHelper.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,13 +10,16 @@
 #include "GLContextTypes.h"
 #include "GLConsts.h"
 #include "nsSize.h"
-#include "ipc/IPCMessageUtils.h"
+#include "mozilla/ipc/IPCTypes.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/gfx/Point.h"
 #include "../layers/ImageTypes.h"
 
+#include <map>
+
 #ifdef XP_WIN
 #  include <windows.h>
+struct ID3D11Texture2D;
 #endif
 
 #ifdef XP_MACOSX
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContext.cpp firefox-85.0+build1/gfx/gl/GLContext.cpp
--- firefox-84.0.2+build1/gfx/gl/GLContext.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContext.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -25,6 +25,7 @@
 #include "gfxEnv.h"
 #include "gfxUtils.h"
 #include "GLContextProvider.h"
+#include "GLLibraryLoader.h"
 #include "GLTextureImage.h"
 #include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextEGL.h firefox-85.0+build1/gfx/gl/GLContextEGL.h
--- firefox-84.0.2+build1/gfx/gl/GLContextEGL.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextEGL.h	2021-01-18 19:58:11.000000000 +0000
@@ -90,6 +90,8 @@
 
   virtual void SetDamage(const nsIntRegion& aDamageRegion) override;
 
+  GLint GetBufferAge() const override;
+
   virtual void GetWSIInfo(nsCString* const out) const override;
 
   // hold a reference to the given surface
@@ -100,7 +102,6 @@
 
   bool HasExtBufferAge() const;
   bool HasKhrPartialUpdate() const;
-  EGLint GetBufferAge() const;
 
   bool BindTex2DOffscreen(GLContext* aOffscreen);
   void UnbindTex2DOffscreen(GLContext* aOffscreen);
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextGLX.h firefox-85.0+build1/gfx/gl/GLContextGLX.h
--- firefox-84.0.2+build1/gfx/gl/GLContextGLX.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextGLX.h	2021-01-18 19:58:11.000000000 +0000
@@ -53,6 +53,8 @@
 
   bool SwapBuffers() override;
 
+  GLint GetBufferAge() const override;
+
   void GetWSIInfo(nsCString* const out) const override;
 
   // Overrides the current GLXDrawable backing the context and makes the
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContext.h firefox-85.0+build1/gfx/gl/GLContext.h
--- firefox-84.0.2+build1/gfx/gl/GLContext.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContext.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,12 +8,10 @@
 #define GLCONTEXT_H_
 
 #include <bitset>
-#include <ctype.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <map>
-#include <queue>
 #include <stack>
+#include <vector>
 
 #ifdef DEBUG
 #  include <string.h>
@@ -35,34 +33,31 @@
 
 #include "MozFramebuffer.h"
 #include "nsTArray.h"
+#include "GLConsts.h"
 #include "GLDefs.h"
-#include "GLLibraryLoader.h"
-#include "nsISupportsImpl.h"
+#include "GLTypes.h"
 #include "nsRegionFwd.h"
 #include "nsString.h"
-#include "plstr.h"
 #include "GLContextTypes.h"
-#include "SurfaceTypes.h"
 #include "GLContextSymbols.h"
 #include "base/platform_thread.h"  // for PlatformThreadId
 #include "mozilla/GenericRefCounted.h"
 #include "mozilla/WeakPtr.h"
-#include "gfx2DGlue.h"
-#include "GeckoProfiler.h"
+
+#ifdef MOZ_WIDGET_ANDROID
+#  include "GeckoProfiler.h"
+#endif
 
 namespace mozilla {
-namespace gfx {
-class DataSourceSurface;
-class SourceSurface;
-}  // namespace gfx
 
 namespace gl {
 class GLBlitHelper;
 class GLBlitTextureImageHelper;
-class GLContext;
 class GLLibraryEGL;
 class GLReadTexImageHelper;
 class SharedSurface;
+class SymbolLoader;
+struct SymLoadStruct;
 }  // namespace gl
 
 namespace layers {
@@ -3382,6 +3377,12 @@
   virtual void SetDamage(const nsIntRegion& aDamageRegion) {}
 
   /**
+   * Get the buffer age. If it returns 0, that indicates the buffer state is
+   * unknown and the entire frame should be redrawn.
+   */
+  virtual GLint GetBufferAge() const { return 0; }
+
+  /**
    * Defines a two-dimensional texture image for context target surface
    */
   virtual bool BindTexImage() { return false; }
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextProviderCGL.mm firefox-85.0+build1/gfx/gl/GLContextProviderCGL.mm
--- firefox-84.0.2+build1/gfx/gl/GLContextProviderCGL.mm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextProviderCGL.mm	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "GLContextProvider.h"
 #include "GLContextCGL.h"
+#include "GLLibraryLoader.h"
 #include "nsDebug.h"
 #include "nsIWidget.h"
 #include <OpenGL/gl.h>
@@ -14,6 +15,7 @@
 #include "mozilla/StaticPrefs_gl.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "prenv.h"
+#include "prlink.h"
 #include "GeckoProfiler.h"
 #include "MozFramebuffer.h"
 #include "mozilla/layers/CompositorOptions.h"
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextProviderEGL.cpp firefox-85.0+build1/gfx/gl/GLContextProviderEGL.cpp
--- firefox-84.0.2+build1/gfx/gl/GLContextProviderEGL.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextProviderEGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -606,7 +606,7 @@
   return mEgl->IsExtensionSupported(EGLExtension::KHR_partial_update);
 }
 
-EGLint GLContextEGL::GetBufferAge() const {
+GLint GLContextEGL::GetBufferAge() const {
   EGLSurface surface =
       mSurfaceOverride != EGL_NO_SURFACE ? mSurfaceOverride : mSurface;
 
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextProviderGLX.cpp firefox-85.0+build1/gfx/gl/GLContextProviderGLX.cpp
--- firefox-84.0.2+build1/gfx/gl/GLContextProviderGLX.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextProviderGLX.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -171,6 +171,9 @@
   const SymLoadStruct symbols_swapcontrol[] = {SYMBOL(SwapIntervalEXT),
                                                END_OF_SYMBOLS};
 
+  const SymLoadStruct symbols_querydrawable[] = {SYMBOL(QueryDrawable),
+                                                 END_OF_SYMBOLS};
+
   const auto fnLoadSymbols = [&](const SymLoadStruct* symbols) {
     if (pfnLoader.LoadSymbols(symbols)) return true;
 
@@ -217,6 +220,11 @@
         "swaps.");
   }
 
+  if (HasExtension(extensionsStr, "GLX_EXT_buffer_age") &&
+      fnLoadSymbols(symbols_querydrawable)) {
+    mHasBufferAge = true;
+  }
+
   mIsATI = serverVendor && DoesStringMatch(serverVendor, "ATI");
   mIsNVIDIA =
       serverVendor && DoesStringMatch(serverVendor, "NVIDIA Corporation");
@@ -619,6 +627,21 @@
   return true;
 }
 
+GLint GLContextGLX::GetBufferAge() const {
+  if (!sGLXLibrary.SupportsBufferAge()) {
+    return 0;
+  }
+
+  GLuint result = 0;
+  mGLX->fQueryDrawable(mDisplay, mDrawable, LOCAL_GLX_BACK_BUFFER_AGE_EXT,
+                       &result);
+  if (result > INT32_MAX) {
+    // If the result can't fit, just assume the buffer cannot be reused.
+    return 0;
+  }
+  return result;
+}
+
 void GLContextGLX::GetWSIInfo(nsCString* const out) const {
   Display* display = DefaultXDisplay();
   int screen = DefaultScreen(display);
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextProvider.h firefox-85.0+build1/gfx/gl/GLContextProvider.h
--- firefox-84.0.2+build1/gfx/gl/GLContextProvider.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextProvider.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "SurfaceTypes.h"
 
 #include "nsSize.h"  // for gfx::IntSize (needed by GLContextProviderImpl.h below)
+#include "nsStringFwd.h"  // needed by GLContextProviderImpl.h below
 
 class nsIWidget;
 
diff -Nru firefox-84.0.2+build1/gfx/gl/GLContextProviderWGL.cpp firefox-85.0+build1/gfx/gl/GLContextProviderWGL.cpp
--- firefox-84.0.2+build1/gfx/gl/GLContextProviderWGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLContextProviderWGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/webrender/RenderThread.h"
diff -Nru firefox-84.0.2+build1/gfx/gl/GLLibraryEGL.cpp firefox-85.0+build1/gfx/gl/GLLibraryEGL.cpp
--- firefox-84.0.2+build1/gfx/gl/GLLibraryEGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLLibraryEGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -146,12 +146,12 @@
 
 static std::shared_ptr<EglDisplay> GetAndInitWARPDisplay(GLLibraryEGL& egl,
                                                          void* displayType) {
-  const EGLAttrib attrib_list[] = {LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
-                                   LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
-                                   // Requires:
-                                   LOCAL_EGL_PLATFORM_ANGLE_TYPE_ANGLE,
-                                   LOCAL_EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-                                   LOCAL_EGL_NONE};
+  const EGLAttrib attrib_list[] = {
+      LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+      LOCAL_EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE,
+      // Requires:
+      LOCAL_EGL_PLATFORM_ANGLE_TYPE_ANGLE,
+      LOCAL_EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, LOCAL_EGL_NONE};
   const EGLDisplay display = egl.fGetPlatformDisplay(
       LOCAL_EGL_PLATFORM_ANGLE_ANGLE, displayType, attrib_list);
 
@@ -483,7 +483,8 @@
   const SymbolLoader pfnLoader(mSymbols.fGetProcAddress);
 
   const auto fnLoadSymbols = [&](const SymLoadStruct* symbols) {
-    if (pfnLoader.LoadSymbols(symbols)) return true;
+    const bool shouldWarn = gfxEnv::GlSpew();
+    if (pfnLoader.LoadSymbols(symbols, shouldWarn)) return true;
 
     ClearSymbols(symbols);
     return false;
diff -Nru firefox-84.0.2+build1/gfx/gl/GLLibraryEGL.h firefox-85.0+build1/gfx/gl/GLLibraryEGL.h
--- firefox-84.0.2+build1/gfx/gl/GLLibraryEGL.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLLibraryEGL.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,17 +9,16 @@
 #  include "mozilla/X11Util.h"
 #endif
 
-#include "GLLibraryLoader.h"
+#include "GLTypes.h"
 #include "mozilla/EnumTypeTraits.h"
-#include "mozilla/StaticMutex.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/ThreadLocal.h"
-#include "GeckoProfiler.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
+#include "nsISupports.h"
+#include "prlink.h"
 
 #include <bitset>
 #include <memory>
 #include <unordered_map>
-#include <vector>
 
 #if defined(MOZ_X11)
 #  define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay())
@@ -45,7 +44,8 @@
 
 namespace gl {
 
-class GLContext;
+class SymbolLoader;
+
 PRLibrary* LoadApitraceLibrary();
 
 void BeforeEGLCall(const char* funcName);
diff -Nru firefox-84.0.2+build1/gfx/gl/GLScreenBuffer.h firefox-85.0+build1/gfx/gl/GLScreenBuffer.h
--- firefox-84.0.2+build1/gfx/gl/GLScreenBuffer.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLScreenBuffer.h	2021-01-18 19:58:11.000000000 +0000
@@ -15,12 +15,9 @@
 #ifndef SCREEN_BUFFER_H_
 #define SCREEN_BUFFER_H_
 
-#include "GLContextTypes.h"
-#include "GLDefs.h"
-#include "mozilla/gfx/2D.h"
+#include "GLTypes.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/UniquePtr.h"
-#include "SurfaceTypes.h"
 
 #include <queue>
 #include <memory>
diff -Nru firefox-84.0.2+build1/gfx/gl/GLXLibrary.h firefox-85.0+build1/gfx/gl/GLXLibrary.h
--- firefox-84.0.2+build1/gfx/gl/GLXLibrary.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/GLXLibrary.h	2021-01-18 19:58:11.000000000 +0000
@@ -154,6 +154,10 @@
                              int interval) const
       VOID_WRAP(fSwapIntervalEXT(dpy, drawable, interval))
 
+          int fQueryDrawable(Display* dpy, GLXDrawable drawable, int attribute,
+                             unsigned int* value) const
+      WRAP(fQueryDrawable(dpy, drawable, attribute, value))
+
 #undef WRAP
 #undef VOID_WRAP
 #undef BEFORE_CALL
@@ -176,6 +180,10 @@
   bool SupportsTextureFromPixmap(gfxASurface* aSurface);
   bool SupportsVideoSync();
   bool SupportsSwapControl() const { return bool(mSymbols.fSwapIntervalEXT); }
+  bool SupportsBufferAge() const {
+    MOZ_ASSERT(mInitialized);
+    return mHasBufferAge;
+  }
   bool IsATI() { return mIsATI; }
   bool IsMesa() { return mClientIsMesa; }
 
@@ -214,6 +222,7 @@
     int(GLAPIENTRY* fGetVideoSyncSGI)(unsigned int*);
     int(GLAPIENTRY* fWaitVideoSyncSGI)(int, int, unsigned int*);
     void(GLAPIENTRY* fSwapIntervalEXT)(Display*, GLXDrawable, int);
+    int(GLAPIENTRY* fQueryDrawable)(Display*, GLXDrawable, int, unsigned int*);
   } mSymbols = {};
 
 #ifdef DEBUG
@@ -229,6 +238,7 @@
   bool mHasVideoMemoryPurge = false;
   bool mHasCreateContextAttribs = false;
   bool mHasVideoSync = false;
+  bool mHasBufferAge = false;
   bool mIsATI = false;
   bool mIsNVIDIA = false;
   bool mClientIsMesa = false;
diff -Nru firefox-84.0.2+build1/gfx/gl/SharedSurfaceIO.cpp firefox-85.0+build1/gfx/gl/SharedSurfaceIO.cpp
--- firefox-84.0.2+build1/gfx/gl/SharedSurfaceIO.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/gl/SharedSurfaceIO.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/gfx/MacIOSurface.h"
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor, etc
+#include "mozilla/layers/LayersTypes.h"
 #include "ScopedGLHelpers.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/ipc/CrossProcessPaint.cpp firefox-85.0+build1/gfx/ipc/CrossProcessPaint.cpp
--- firefox-84.0.2+build1/gfx/ipc/CrossProcessPaint.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/CrossProcessPaint.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/ImageBitmap.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/PWindowGlobalParent.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/WindowGlobalChild.h"
 #include "mozilla/dom/WindowGlobalActorsBinding.h"
@@ -42,16 +43,17 @@
 static const float kMinPaintScale = 0.05f;
 
 /* static */
-PaintFragment PaintFragment::Record(nsIDocShell* aDocShell,
+PaintFragment PaintFragment::Record(dom::BrowsingContext* aBc,
                                     const Maybe<IntRect>& aRect, float aScale,
                                     nscolor aBackgroundColor,
                                     CrossProcessPaintFlags aFlags) {
-  if (!aDocShell) {
-    PF_LOG("Couldn't find DocShell.\n");
+  nsIDocShell* ds = aBc->GetDocShell();
+  if (!ds) {
+    PF_LOG("Couldn't find docshell.\n");
     return PaintFragment{};
   }
 
-  RefPtr<nsPresContext> presContext = aDocShell->GetPresContext();
+  RefPtr<nsPresContext> presContext = ds->GetPresContext();
   if (!presContext) {
     PF_LOG("Couldn't find PresContext.\n");
     return PaintFragment{};
@@ -60,7 +62,7 @@
   IntRect rect;
   if (!aRect) {
     nsCOMPtr<nsIWidget> widget =
-        nsContentUtils::WidgetForDocument(aDocShell->GetDocument());
+        nsContentUtils::WidgetForDocument(presContext->Document());
 
     // TODO: Apply some sort of clipping to visible bounds here (Bug 1562720)
     LayoutDeviceIntRect boundsDevice = widget->GetBounds();
@@ -84,11 +86,11 @@
 
   CPP_LOG(
       "Recording "
-      "[docshell=%p, "
+      "[browsingContext=%p, "
       "rect=(%d, %d) x (%d, %d), "
       "scale=%f, "
       "color=(%u, %u, %u, %u)]\n",
-      aDocShell, rect.x, rect.y, rect.width, rect.height, aScale,
+      aBc, rect.x, rect.y, rect.width, rect.height, aScale,
       NS_GET_R(aBackgroundColor), NS_GET_G(aBackgroundColor),
       NS_GET_B(aBackgroundColor), NS_GET_A(aBackgroundColor));
 
@@ -100,13 +102,8 @@
     return PaintFragment{};
   }
 
-  bool oldActiveState = aDocShell->GetIsActive();
-  if (!oldActiveState) {
-    aDocShell->SetIsActive(true);
-  }
-
   // Flush any pending notifications
-  nsContentUtils::FlushLayoutForTree(aDocShell->GetWindow());
+  nsContentUtils::FlushLayoutForTree(ds->GetWindow());
 
   // Initialize the recorder
   SurfaceFormat format = SurfaceFormat::B8G8R8A8;
@@ -139,10 +136,6 @@
                                         thebes);
   }
 
-  if (!oldActiveState) {
-    aDocShell->SetIsActive(false);
-  }
-
   if (!recorder->mOutputStream.mValid) {
     return PaintFragment{};
   }
@@ -221,17 +214,13 @@
     }
 
     // `BrowsingContext()` cannot be nullptr.
-    nsCOMPtr<nsIDocShell> docShell =
-        childActor->BrowsingContext()->GetDocShell();
-    if (!docShell) {
-      return false;
-    }
+    RefPtr<dom::BrowsingContext> bc = childActor->BrowsingContext();
 
     promise = resolver->Init();
     resolver->mPendingFragments += 1;
     resolver->ReceiveFragment(
-        aRoot, PaintFragment::Record(docShell, rect, aScale, aBackgroundColor,
-                                     aFlags));
+        aRoot,
+        PaintFragment::Record(bc, rect, aScale, aBackgroundColor, aFlags));
   } else {
     promise = resolver->Init();
     resolver->QueuePaint(aRoot, rect, aBackgroundColor, aFlags);
diff -Nru firefox-84.0.2+build1/gfx/ipc/CrossProcessPaint.h firefox-85.0+build1/gfx/ipc/CrossProcessPaint.h
--- firefox-84.0.2+build1/gfx/ipc/CrossProcessPaint.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/CrossProcessPaint.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,16 +9,18 @@
 #include "nsISupportsImpl.h"
 
 #include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/dom/DOMRect.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/Maybe.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/RecordedEvent.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/MozPromise.h"
 #include "mozilla/ipc/ByteBuf.h"
+#include "nsColor.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsRefPtrHashtable.h"
 #include "nsTHashtable.h"
-#include "mozilla/gfx/RecordedEvent.h"
+
+class nsIDocShell;
 
 namespace IPC {
 template <typename T>
@@ -28,6 +30,8 @@
 namespace mozilla {
 
 namespace dom {
+class DOMRect;
+class Promise;
 class WindowGlobalParent;
 }  // namespace dom
 
@@ -52,9 +56,9 @@
 
   /**
    * Creates a paint fragment by recording the draw commands and dependent tabs
-   * for an nsIDocShell.
+   * for a BrowsingContext.
    *
-   * @param aDocShell The document shell to record.
+   * @param aBrowsingContext The frame to record.
    * @param aRect The rectangle relative to the viewport to use. If no
    *   rectangle is specified, then the whole viewport will be used.
    * @param aScale The coordinate scale to use. The size of the resolved
@@ -65,7 +69,7 @@
    * @return A paint fragment. The paint fragment may be `empty` if rendering
    *         was unable to be accomplished for some reason.
    */
-  static PaintFragment Record(nsIDocShell* aDocShell,
+  static PaintFragment Record(dom::BrowsingContext* aBc,
                               const Maybe<IntRect>& aRect, float aScale,
                               nscolor aBackgroundColor,
                               CrossProcessPaintFlags aFlags);
diff -Nru firefox-84.0.2+build1/gfx/ipc/GfxMessageUtils.h firefox-85.0+build1/gfx/ipc/GfxMessageUtils.h
--- firefox-84.0.2+build1/gfx/ipc/GfxMessageUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GfxMessageUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -17,13 +17,18 @@
 #include "gfxRect.h"
 #include "gfxTelemetry.h"
 #include "gfxTypes.h"
+#include "ipc/EnumSerializer.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/gfx/CrossProcessPaint.h"
 #include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/ScaleFactor.h"
+#include "mozilla/gfx/ScaleFactors2D.h"
 #include "nsRect.h"
 #include "nsRegion.h"
 #include "mozilla/Array.h"
+#include "mozilla/ipc/IPDLParamTraits.h"
 #include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/ipc/Shmem.h"
+#include "mozilla/ipc/ShmemMessageUtils.h"
 
 #include <stdint.h>
 
diff -Nru firefox-84.0.2+build1/gfx/ipc/GPUChild.cpp firefox-85.0+build1/gfx/ipc/GPUChild.cpp
--- firefox-84.0.2+build1/gfx/ipc/GPUChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GPUChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -19,6 +19,7 @@
 #if defined(XP_WIN)
 #  include "mozilla/gfx/DeviceManagerDx.h"
 #endif
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/APZInputBridgeChild.h"
 #include "mozilla/layers/LayerTreeOwnerTracker.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/gfx/ipc/GPUParent.cpp firefox-85.0+build1/gfx/ipc/GPUParent.cpp
--- firefox-84.0.2+build1/gfx/ipc/GPUParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GPUParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -42,6 +42,7 @@
 #include "mozilla/webrender/RenderThread.h"
 #include "mozilla/webrender/WebRenderAPI.h"
 #include "mozilla/HangDetails.h"
+#include "mozilla/Preferences.h"
 #include "nscore.h"
 #include "nsDebugImpl.h"
 #include "nsIGfxInfo.h"
diff -Nru firefox-84.0.2+build1/gfx/ipc/GPUProcessManager.cpp firefox-85.0+build1/gfx/ipc/GPUProcessManager.cpp
--- firefox-84.0.2+build1/gfx/ipc/GPUProcessManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GPUProcessManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "GPUProcessManager.h"
 
 #include "gfxConfig.h"
+#include "gfxPlatform.h"
 #include "GPUProcessHost.h"
 #include "GPUProcessListener.h"
 #include "mozilla/MemoryReportingProcess.h"
@@ -22,6 +23,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/APZCTreeManagerChild.h"
 #include "mozilla/layers/APZInputBridgeChild.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
@@ -442,14 +444,14 @@
     }
     OnRemoteProcessDeviceReset(mProcess);
   } else {
-    OnInProcessDeviceReset();
+    OnInProcessDeviceReset(/* aTrackThreshold */ false);
   }
 }
 
-void GPUProcessManager::DisableWebRender(wr::WebRenderError aError,
-                                         const nsCString& aMsg) {
+bool GPUProcessManager::DisableWebRenderConfig(wr::WebRenderError aError,
+                                               const nsCString& aMsg) {
   if (!gfx::gfxVars::UseWebRender()) {
-    return;
+    return false;
   }
   // Disable WebRender
   if (aError == wr::WebRenderError::INITIALIZE) {
@@ -471,6 +473,11 @@
         .ForceDisable(gfx::FeatureStatus::Unavailable,
                       "Failed to create new surface",
                       "FEATURE_FAILURE_WEBRENDER_NEW_SURFACE"_ns);
+  } else if (aError == wr::WebRenderError::EXCESSIVE_RESETS) {
+    gfx::gfxConfig::GetFeature(gfx::Feature::WEBRENDER)
+        .ForceDisable(gfx::FeatureStatus::Unavailable,
+                      "Device resets exceeded threshold",
+                      "FEATURE_FAILURE_WEBRENDER_EXCESSIVE_RESETS"_ns);
   } else {
     MOZ_ASSERT_UNREACHABLE("Invalid value");
   }
@@ -494,10 +501,17 @@
                        "FEATURE_FAILURE_LOST_WEBRENDER"_ns);
 #endif
 
-  if (mProcess) {
-    OnRemoteProcessDeviceReset(mProcess);
-  } else {
-    OnInProcessDeviceReset();
+  return true;
+}
+
+void GPUProcessManager::DisableWebRender(wr::WebRenderError aError,
+                                         const nsCString& aMsg) {
+  if (DisableWebRenderConfig(aError, aMsg)) {
+    if (mProcess) {
+      OnRemoteProcessDeviceReset(mProcess);
+    } else {
+      OnInProcessDeviceReset(/* aTrackThreshold */ false);
+    }
   }
 }
 
@@ -513,26 +527,56 @@
   DisableWebRender(aError, nsCString());
 }
 
-void GPUProcessManager::OnInProcessDeviceReset() {
-  RebuildInProcessSessions();
-  NotifyListenersOnCompositeDeviceReset();
-}
+/* static */ void GPUProcessManager::RecordDeviceReset(
+    DeviceResetReason aReason) {
+  if (aReason != DeviceResetReason::FORCED_RESET) {
+    Telemetry::Accumulate(Telemetry::DEVICE_RESET_REASON, uint32_t(aReason));
+  }
 
-void GPUProcessManager::OnRemoteProcessDeviceReset(GPUProcessHost* aHost) {
-  // Detect whether the device is resetting too quickly or too much
-  // indicating that we should give up and use software
-  mDeviceResetCount++;
+  CrashReporter::AnnotateCrashReport(
+      CrashReporter::Annotation::DeviceResetReason, int(aReason));
+}
 
+bool GPUProcessManager::OnDeviceReset(bool aTrackThreshold) {
+#ifdef XP_WIN
   // Disable double buffering when device reset happens.
   if (!gfxVars::UseWebRender() && gfxVars::UseDoubleBufferingWithCompositor()) {
     gfxVars::SetUseDoubleBufferingWithCompositor(false);
   }
+#endif
+
+  // Ignore resets for thresholding if requested.
+  if (!aTrackThreshold) {
+    return false;
+  }
+
+  // Detect whether the device is resetting too quickly or too much
+  // indicating that we should give up and use software
+  mDeviceResetCount++;
 
   auto newTime = TimeStamp::Now();
   auto delta = (int32_t)(newTime - mDeviceResetLastTime).ToMilliseconds();
   mDeviceResetLastTime = newTime;
 
-  if (ShouldLimitDeviceResets(mDeviceResetCount, delta)) {
+  // Returns true if we should disable acceleration due to the reset.
+  return ShouldLimitDeviceResets(mDeviceResetCount, delta);
+}
+
+void GPUProcessManager::OnInProcessDeviceReset(bool aTrackThreshold) {
+  if (OnDeviceReset(aTrackThreshold)) {
+    gfxCriticalNoteOnce << "In-process device reset threshold exceeded";
+#ifdef MOZ_WIDGET_GTK
+    // FIXME(aosmond): Should we disable WebRender on other platforms?
+    DisableWebRenderConfig(wr::WebRenderError::EXCESSIVE_RESETS, nsCString());
+#endif
+  }
+
+  RebuildInProcessSessions();
+  NotifyListenersOnCompositeDeviceReset();
+}
+
+void GPUProcessManager::OnRemoteProcessDeviceReset(GPUProcessHost* aHost) {
+  if (OnDeviceReset(/* aTrackThreshold */ true)) {
     DestroyProcess();
     DisableGPUProcess("GPU processed experienced too many device resets");
     HandleProcessLost();
diff -Nru firefox-84.0.2+build1/gfx/ipc/GPUProcessManager.h firefox-85.0+build1/gfx/ipc/GPUProcessManager.h
--- firefox-84.0.2+build1/gfx/ipc/GPUProcessManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GPUProcessManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -18,8 +18,10 @@
 #include "mozilla/ipc/Transport.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/webrender/WebRenderTypes.h"
+#include "nsIObserver.h"
 #include "nsThreadUtils.h"
 class nsBaseWidget;
+enum class DeviceResetReason;
 
 namespace mozilla {
 class MemoryReportingProcess;
@@ -36,6 +38,7 @@
 class RemoteCompositorSession;
 class InProcessCompositorSession;
 class UiCompositorControllerChild;
+class LayerManager;
 }  // namespace layers
 namespace widget {
 class CompositorWidget;
@@ -146,12 +149,15 @@
   // Destroy and recreate all of the compositors
   void ResetCompositors();
 
+  // Record the device reset in telemetry / annotate the crash report.
+  static void RecordDeviceReset(DeviceResetReason aReason);
+
   void OnProcessLaunchComplete(GPUProcessHost* aHost) override;
   void OnProcessUnexpectedShutdown(GPUProcessHost* aHost) override;
   void SimulateDeviceReset();
   void DisableWebRender(wr::WebRenderError aError, const nsCString& aMsg);
   void NotifyWebRenderError(wr::WebRenderError aError);
-  void OnInProcessDeviceReset();
+  void OnInProcessDeviceReset(bool aTrackThreshold);
   void OnRemoteProcessDeviceReset(GPUProcessHost* aHost) override;
   void NotifyListenersOnCompositeDeviceReset();
 
@@ -216,6 +222,13 @@
   void RebuildRemoteSessions();
   void RebuildInProcessSessions();
 
+  // Returns true if we crossed the threshold such that we should disable
+  // acceleration.
+  bool OnDeviceReset(bool aTrackThreshold);
+
+  // Returns true if WebRender was enabled and is now disabled.
+  bool DisableWebRenderConfig(wr::WebRenderError aError, const nsCString& aMsg);
+
   void NotifyDisablingWebRender();
 
   void FallbackToSoftware(const char* aMessage);
diff -Nru firefox-84.0.2+build1/gfx/ipc/GraphicsMessages.ipdlh firefox-85.0+build1/gfx/ipc/GraphicsMessages.ipdlh
--- firefox-84.0.2+build1/gfx/ipc/GraphicsMessages.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/GraphicsMessages.ipdlh	2021-01-18 19:58:11.000000000 +0000
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 using struct DxgiAdapterDesc from "mozilla/D3DMessageUtils.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 using mozilla::gfx::FeatureStatus from "gfxTelemetry.h";
 using mozilla::gfx::BackendType from "mozilla/gfx/Types.h";
 using mozilla::gfx::IntSize from "mozilla/gfx/Point.h";
diff -Nru firefox-84.0.2+build1/gfx/ipc/PGPU.ipdl firefox-85.0+build1/gfx/ipc/PGPU.ipdl
--- firefox-84.0.2+build1/gfx/ipc/PGPU.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/PGPU.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -22,6 +22,8 @@
 include protocol PSandboxTesting;
 #endif
 
+include "mozilla/layers/LayersMessageUtils.h";
+
 using base::ProcessId from "base/process.h";
 using mozilla::dom::NativeThreadId from "mozilla/dom/NativeThreadId.h";
 using mozilla::Telemetry::HistogramAccumulation from "mozilla/TelemetryComms.h";
diff -Nru firefox-84.0.2+build1/gfx/ipc/VsyncBridgeChild.cpp firefox-85.0+build1/gfx/ipc/VsyncBridgeChild.cpp
--- firefox-84.0.2+build1/gfx/ipc/VsyncBridgeChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/VsyncBridgeChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "VsyncIOThreadHolder.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/gfx/GPUProcessManager.h"
+#include "mozilla/ipc/Endpoint.h"
 
 namespace mozilla {
 namespace gfx {
diff -Nru firefox-84.0.2+build1/gfx/ipc/VsyncBridgeParent.cpp firefox-85.0+build1/gfx/ipc/VsyncBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/ipc/VsyncBridgeParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ipc/VsyncBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -4,6 +4,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 "VsyncBridgeParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
 
diff -Nru firefox-84.0.2+build1/gfx/layers/AnimationHelper.cpp firefox-85.0+build1/gfx/layers/AnimationHelper.cpp
--- firefox-84.0.2+build1/gfx/layers/AnimationHelper.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/AnimationHelper.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AnimationHelper.h"
+#include "base/process_util.h"
 #include "gfx2DGlue.h"                       // for ThebesRect
 #include "gfxLineSegment.h"                  // for gfxLineSegment
 #include "gfxPoint.h"                        // for gfxPoint
diff -Nru firefox-84.0.2+build1/gfx/layers/AnimationHelper.h firefox-85.0+build1/gfx/layers/AnimationHelper.h
--- firefox-84.0.2+build1/gfx/layers/AnimationHelper.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/AnimationHelper.h	2021-01-18 19:58:11.000000000 +0000
@@ -15,7 +15,6 @@
 #include "mozilla/TimeStamp.h"                 // for TimeStamp
 #include "mozilla/TimingParams.h"
 #include "mozilla/Types.h"  // for SideBits
-#include "mozilla/Variant.h"
 #include "X11UndefineNone.h"
 #include <unordered_map>
 
diff -Nru firefox-84.0.2+build1/gfx/layers/AnimationInfo.cpp firefox-85.0+build1/gfx/layers/AnimationInfo.cpp
--- firefox-84.0.2+build1/gfx/layers/AnimationInfo.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/AnimationInfo.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AnimationInfo.h"
+#include "Layers.h"
 #include "mozilla/LayerAnimationInfo.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/layers/AnimationHelper.h"
@@ -13,6 +14,7 @@
 #include "mozilla/dom/CSSTransition.h"
 #include "mozilla/dom/KeyframeEffect.h"
 #include "mozilla/EffectSet.h"
+#include "mozilla/PresShell.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "nsIContent.h"
 #include "nsLayoutUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/public/APZInputBridge.h firefox-85.0+build1/gfx/layers/apz/public/APZInputBridge.h
--- firefox-84.0.2+build1/gfx/layers/apz/public/APZInputBridge.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/public/APZInputBridge.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,8 +8,9 @@
 #define mozilla_layers_APZInputBridge_h
 
 #include "mozilla/EventForwards.h"  // for WidgetInputEvent, nsEventStatus
-#include "mozilla/layers/APZPublicUtils.h"  // for APZWheelAction
-#include "Units.h"                          // for LayoutDeviceIntPoint
+#include "mozilla/layers/APZPublicUtils.h"       // for APZWheelAction
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid
+#include "Units.h"                               // for LayoutDeviceIntPoint
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/public/APZPublicUtils.h firefox-85.0+build1/gfx/layers/apz/public/APZPublicUtils.h
--- firefox-84.0.2+build1/gfx/layers/apz/public/APZPublicUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/public/APZPublicUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,25 +10,20 @@
 // This file is for APZ-related utilities that need to be consumed from outside
 // of gfx/layers. For internal utilities, prefer APZUtils.h.
 
-#include <stdint.h>  // for uint32_t
-#include <type_traits>
+#include <stdint.h>
 #include <utility>
-#include "gfxTypes.h"
-#include "FrameMetrics.h"
-#include "LayersTypes.h"
-#include "UnitTransforms.h"
-#include "mozilla/gfx/CompositorHitTestInfo.h"
-#include "mozilla/gfx/Point.h"
+#include "ScrollAnimationBezierPhysics.h"
+#include "Units.h"
 #include "mozilla/DefineEnum.h"
-#include "mozilla/EnumSet.h"
-#include "mozilla/FloatingPoint.h"
 #include "mozilla/ScrollOrigin.h"
-#include "ScrollAnimationBezierPhysics.h"
+#include "mozilla/gfx/Point.h"
 
 namespace mozilla {
 
 namespace layers {
 
+struct FrameMetrics;
+
 // clang-format off
 MOZ_DEFINE_ENUM_CLASS_WITH_BASE(APZWheelAction, uint8_t, (
     Scroll,
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/public/APZSampler.h firefox-85.0+build1/gfx/layers/apz/public/APZSampler.h
--- firefox-84.0.2+build1/gfx/layers/apz/public/APZSampler.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/public/APZSampler.h	2021-01-18 19:58:11.000000000 +0000
@@ -56,13 +56,13 @@
    * which thread it is.
    */
   static void SetSamplerThread(const wr::WrWindowId& aWindowId);
-  static void SampleForWebRender(
-      const wr::WrWindowId& aWindowId, wr::Transaction* aTxn,
-      const wr::WrPipelineIdEpochs* aEpochsBeingRendered);
+  static void SampleForWebRender(const wr::WrWindowId& aWindowId,
+                                 const uint64_t* aGeneratedFrameId,
+                                 wr::Transaction* aTransaction);
 
   void SetSampleTime(const SampleTime& aSampleTime);
-  void SampleForWebRender(wr::TransactionWrapper& aTxn,
-                          const wr::WrPipelineIdEpochs* aEpochsBeingRendered);
+  void SampleForWebRender(const Maybe<VsyncId>& aGeneratedFrameId,
+                          wr::TransactionWrapper& aTxn);
 
   bool AdvanceAnimations(const SampleTime& aSampleTime);
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/public/MatrixMessage.h firefox-85.0+build1/gfx/layers/apz/public/MatrixMessage.h
--- firefox-84.0.2+build1/gfx/layers/apz/public/MatrixMessage.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/public/MatrixMessage.h	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "Units.h"  // for ScreenRect
+#include "UnitTransforms.h"
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/APZCTreeManager.cpp firefox-85.0+build1/gfx/layers/apz/src/APZCTreeManager.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/APZCTreeManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/APZCTreeManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -33,6 +33,7 @@
 #include "mozilla/layers/CompositorBridgeParent.h"  // for CompositorBridgeParent, etc
 #include "mozilla/layers/LayerMetricsWrapper.h"
 #include "mozilla/layers/MatrixMessage.h"
+#include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/layers/WebRenderScrollDataWrapper.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/mozalloc.h"     // for operator new
@@ -571,12 +572,8 @@
                 *mAsyncZoomContainerSubtree),
         "If there is an async zoom container, all scroll nodes with root "
         "content scroll metadata should be inside it");
-    // TODO(bug 1534459): Avoid nested async zoom containers. They
-    // can't currently occur in production code, but that will become
-    // possible with either OOP iframes or desktop zooming (due to
-    // RDM), and will need to be guarded against.
-    // MOZ_ASSERT(!haveNestedAsyncZoomContainers,
-    //           "Should not have nested async zoom container");
+    MOZ_ASSERT(!haveNestedAsyncZoomContainers,
+               "Should not have nested async zoom container");
 
     // If we have perspective transforms deferred to children, do another
     // walk of the tree and actually apply them to the children.
@@ -708,22 +705,23 @@
                            aPaintSequenceNumber);
 }
 
-void APZCTreeManager::SampleForWebRender(
-    wr::TransactionWrapper& aTxn, const SampleTime& aSampleTime,
-    const wr::WrPipelineIdEpochs* aEpochsBeingRendered) {
+void APZCTreeManager::SampleForWebRender(const Maybe<VsyncId>& aVsyncId,
+                                         wr::TransactionWrapper& aTxn,
+                                         const SampleTime& aSampleTime) {
   AssertOnSamplerThread();
   MutexAutoLock lock(mMapLock);
 
+  RefPtr<WebRenderBridgeParent> wrBridgeParent;
+  RefPtr<CompositorController> controller;
+  CompositorBridgeParent::CallWithIndirectShadowTree(
+      mRootLayersId, [&](LayerTreeState& aState) -> void {
+        controller = aState.GetCompositorController();
+        wrBridgeParent = aState.mWrBridge;
+      });
+
   bool activeAnimations = AdvanceAnimationsInternal(lock, aSampleTime);
-  if (activeAnimations) {
-    RefPtr<CompositorController> controller;
-    CompositorBridgeParent::CallWithIndirectShadowTree(
-        mRootLayersId, [&](LayerTreeState& aState) -> void {
-          controller = aState.GetCompositorController();
-        });
-    if (controller) {
-      controller->ScheduleRenderOnCompositorThread();
-    }
+  if (activeAnimations && controller) {
+    controller->ScheduleRenderOnCompositorThread();
   }
 
   nsTArray<wr::WrTransformProperty> transforms;
@@ -742,23 +740,8 @@
             .mTranslation;
 
     if (Maybe<CompositionPayload> payload = apzc->NotifyScrollSampling()) {
-      RefPtr<WebRenderBridgeParent> wrBridgeParent;
-      LayersId layersId = apzc->GetGuid().mLayersId;
-      CompositorBridgeParent::CallWithIndirectShadowTree(
-          layersId, [&](LayerTreeState& aState) -> void {
-            wrBridgeParent = aState.mWrBridge;
-          });
-
-      if (wrBridgeParent) {
-        wr::PipelineId pipelineId = wr::AsPipelineId(layersId);
-        for (size_t i = 0; i < aEpochsBeingRendered->Length(); i++) {
-          if ((*aEpochsBeingRendered)[i].pipeline_id == pipelineId) {
-            auto& epoch = (*aEpochsBeingRendered)[i].epoch;
-            wrBridgeParent->AddPendingScrollPayload(
-                *payload, std::make_pair(pipelineId, epoch));
-            break;
-          }
-        }
+      if (wrBridgeParent && aVsyncId) {
+        wrBridgeParent->AddPendingScrollPayload(*payload, *aVsyncId);
       }
     }
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/APZCTreeManager.h firefox-85.0+build1/gfx/layers/apz/src/APZCTreeManager.h
--- firefox-84.0.2+build1/gfx/layers/apz/src/APZCTreeManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/APZCTreeManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -26,11 +26,12 @@
 #include "mozilla/layers/KeyboardMap.h"      // for KeyboardMap
 #include "mozilla/layers/TouchCounter.h"     // for TouchCounter
 #include "mozilla/layers/ZoomConstraints.h"  // for ZoomConstraints
-#include "mozilla/RecursiveMutex.h"          // for RecursiveMutex
-#include "mozilla/RefPtr.h"                  // for RefPtr
-#include "mozilla/TimeStamp.h"               // for mozilla::TimeStamp
-#include "mozilla/UniquePtr.h"               // for UniquePtr
-#include "nsCOMPtr.h"                        // for already_AddRefed
+#include "mozilla/webrender/webrender_ffi.h"
+#include "mozilla/RecursiveMutex.h"  // for RecursiveMutex
+#include "mozilla/RefPtr.h"          // for RefPtr
+#include "mozilla/TimeStamp.h"       // for mozilla::TimeStamp
+#include "mozilla/UniquePtr.h"       // for UniquePtr
+#include "nsCOMPtr.h"                // for already_AddRefed
 #include "OvershootDetector.h"
 
 namespace mozilla {
@@ -195,9 +196,9 @@
    * In effect it is the webrender equivalent of (part of) the code in
    * AsyncCompositionManager.
    */
-  void SampleForWebRender(wr::TransactionWrapper& aTxn,
-                          const SampleTime& aSampleTime,
-                          const wr::WrPipelineIdEpochs* aEpochsBeingRendered);
+  void SampleForWebRender(const Maybe<VsyncId>& aVsyncId,
+                          wr::TransactionWrapper& aTxn,
+                          const SampleTime& aSampleTime);
 
   /**
    * Walk through all the APZCs and do the sampling steps needed when
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/APZSampler.cpp firefox-85.0+build1/gfx/layers/apz/src/APZSampler.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/APZSampler.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/APZSampler.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -65,12 +65,14 @@
 }
 
 /*static*/
-void APZSampler::SampleForWebRender(
-    const wr::WrWindowId& aWindowId, wr::Transaction* aTransaction,
-    const wr::WrPipelineIdEpochs* aEpochsBeingRendered) {
+void APZSampler::SampleForWebRender(const wr::WrWindowId& aWindowId,
+                                    const uint64_t* aGeneratedFrameId,
+                                    wr::Transaction* aTransaction) {
   if (RefPtr<APZSampler> sampler = GetSampler(aWindowId)) {
     wr::TransactionWrapper txn(aTransaction);
-    sampler->SampleForWebRender(txn, aEpochsBeingRendered);
+    Maybe<VsyncId> vsyncId =
+        aGeneratedFrameId ? Some(VsyncId{*aGeneratedFrameId}) : Nothing();
+    sampler->SampleForWebRender(vsyncId, txn);
   }
 }
 
@@ -83,9 +85,8 @@
   mSampleTime = aSampleTime;
 }
 
-void APZSampler::SampleForWebRender(
-    wr::TransactionWrapper& aTxn,
-    const wr::WrPipelineIdEpochs* aEpochsBeingRendered) {
+void APZSampler::SampleForWebRender(const Maybe<VsyncId>& aVsyncId,
+                                    wr::TransactionWrapper& aTxn) {
   AssertOnSamplerThread();
   SampleTime sampleTime;
   {  // scope lock
@@ -121,7 +122,7 @@
             ? now
             : mSampleTime;
   }
-  mApz->SampleForWebRender(aTxn, sampleTime, aEpochsBeingRendered);
+  mApz->SampleForWebRender(aVsyncId, aTxn, sampleTime);
 }
 
 bool APZSampler::AdvanceAnimations(const SampleTime& aSampleTime) {
@@ -330,11 +331,11 @@
   mozilla::layers::APZSampler::SetSamplerThread(aWindowId);
 }
 
-void apz_sample_transforms(
-    mozilla::wr::WrWindowId aWindowId, mozilla::wr::Transaction* aTransaction,
-    const mozilla::wr::WrPipelineIdEpochs* aEpochsBeingRendered) {
-  mozilla::layers::APZSampler::SampleForWebRender(aWindowId, aTransaction,
-                                                  aEpochsBeingRendered);
+void apz_sample_transforms(mozilla::wr::WrWindowId aWindowId,
+                           const uint64_t* aGeneratedFrameId,
+                           mozilla::wr::Transaction* aTransaction) {
+  mozilla::layers::APZSampler::SampleForWebRender(aWindowId, aGeneratedFrameId,
+                                                  aTransaction);
 }
 
 void apz_deregister_sampler(mozilla::wr::WrWindowId aWindowId) {}
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/AsyncPanZoomController.cpp firefox-85.0+build1/gfx/layers/apz/src/AsyncPanZoomController.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/AsyncPanZoomController.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/AsyncPanZoomController.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -486,12 +486,6 @@
  * How long to delay between repaint requests during a scale.
  * A negative number prevents repaint requests during a scale.\n
  * Units: ms
- *
- * \li\b apz.relative-update.enabled
- * Whether to enable relative scroll offset updates or not. Relative scroll
- * offset updates allow APZ and the main thread to concurrently update
- * the scroll offset and merge the result.
- *
  */
 
 /**
@@ -633,6 +627,11 @@
 
     // We scale the scrollOffset linearly with sampledPosition, so the zoom
     // needs to scale inversely to match.
+    if (mStartZoom == CSSToParentLayerScale2D(0, 0) ||
+        mEndZoom == CSSToParentLayerScale2D(0, 0)) {
+      return false;
+    }
+
     aFrameMetrics.SetZoom(CSSToParentLayerScale2D(
         1 / (sampledPosition / mEndZoom.xScale +
              (1 - sampledPosition) / mStartZoom.xScale),
@@ -643,7 +642,6 @@
         mEndOffset.x * sampledPosition + mStartOffset.x * (1 - sampledPosition),
         mEndOffset.y * sampledPosition +
             mStartOffset.y * (1 - sampledPosition))));
-
     return true;
   }
 
@@ -1548,7 +1546,10 @@
     CSSToParentLayerScale userZoom = Metrics().GetZoom().ToScaleFactor();
     ParentLayerPoint focusPoint =
         aEvent.mLocalFocusPoint - Metrics().GetCompositionBounds().TopLeft();
-    CSSPoint cssFocusPoint = focusPoint / Metrics().GetZoom();
+    CSSPoint cssFocusPoint;
+    if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+      cssFocusPoint = focusPoint / Metrics().GetZoom();
+    }
 
     ParentLayerPoint focusChange = mLastZoomFocus - focusPoint;
     mLastZoomFocus = focusPoint;
@@ -1556,7 +1557,9 @@
     // then reduce the displacement such that it doesn't.
     focusChange.x -= mX.DisplacementWillOverscrollAmount(focusChange.x);
     focusChange.y -= mY.DisplacementWillOverscrollAmount(focusChange.y);
-    ScrollBy(focusChange / userZoom);
+    if (userZoom != CSSToParentLayerScale(0)) {
+      ScrollBy(focusChange / userZoom);
+    }
 
     // If the span is zero or close to it, we don't want to process this zoom
     // change because we're going to get wonky numbers for the spanRatio. So
@@ -1827,8 +1830,12 @@
     const ScrollbarData& aThumbData) const {
   RecursiveMutexAutoLock lock(mRecursiveMutex);
 
-  // First, get it into the right coordinate space.
-  CSSPoint scrollbarPoint = aScrollbarPoint / Metrics().GetZoom();
+  CSSPoint scrollbarPoint;
+  if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+    // First, get it into the right coordinate space.
+    scrollbarPoint = aScrollbarPoint / Metrics().GetZoom();
+  }
+
   // The scrollbar can be transformed with the frame but the pres shell
   // resolution is only applied to the scroll frame.
   scrollbarPoint = scrollbarPoint * Metrics().GetPresShellResolution();
@@ -2038,9 +2045,13 @@
 
   // Convert velocity from ParentLayerPoints/ms to ParentLayerPoints/s and then
   // to appunits/second.
-  nsPoint velocity = CSSPoint::ToAppUnits(
-      ParentLayerPoint(mX.GetVelocity() * 1000.0f, mY.GetVelocity() * 1000.0f) /
-      Metrics().GetZoom());
+  nsPoint velocity;
+  if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+    velocity =
+        CSSPoint::ToAppUnits(ParentLayerPoint(mX.GetVelocity() * 1000.0f,
+                                              mY.GetVelocity() * 1000.0f) /
+                             Metrics().GetZoom());
+  }
 
   SmoothScrollAnimation* animation = mAnimation->AsSmoothScrollAnimation();
   MOZ_ASSERT(animation);
@@ -2434,16 +2445,18 @@
         StartAnimation(new WheelScrollAnimation(*this, initialPosition,
                                                 aEvent.mDeltaType));
       }
-
-      nsPoint deltaInAppUnits =
-          CSSPoint::ToAppUnits(delta / Metrics().GetZoom());
-
       // Convert velocity from ParentLayerPoints/ms to ParentLayerPoints/s and
       // then to appunits/second.
-      nsPoint velocity =
-          CSSPoint::ToAppUnits(ParentLayerPoint(mX.GetVelocity() * 1000.0f,
-                                                mY.GetVelocity() * 1000.0f) /
-                               Metrics().GetZoom());
+
+      nsPoint deltaInAppUnits;
+      nsPoint velocity;
+      if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+        deltaInAppUnits = CSSPoint::ToAppUnits(delta / Metrics().GetZoom());
+        velocity =
+            CSSPoint::ToAppUnits(ParentLayerPoint(mX.GetVelocity() * 1000.0f,
+                                                  mY.GetVelocity() * 1000.0f) /
+                                 Metrics().GetZoom());
+      }
 
       WheelScrollAnimation* animation = mAnimation->AsWheelScrollAnimation();
       animation->UpdateDelta(aEvent.mTimeStamp, deltaInAppUnits,
@@ -3245,7 +3258,8 @@
       ScheduleComposite();
     }
 
-    if (!IsZero(adjustedDisplacement)) {
+    if (!IsZero(adjustedDisplacement) &&
+        Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
       ScrollBy(adjustedDisplacement / Metrics().GetZoom());
       if (InputBlockState* block = GetCurrentInputBlock()) {
         bool displacementIsUserVisible = true;
@@ -3524,9 +3538,12 @@
   // Convert velocity from ParentLayerPoints/ms to ParentLayerPoints/s and then
   // to appunits/second.
   nsPoint destination = CSSPoint::ToAppUnits(aDestination);
-  nsSize velocity = CSSSize::ToAppUnits(
-      ParentLayerSize(mX.GetVelocity() * 1000.0f, mY.GetVelocity() * 1000.0f) /
-      Metrics().GetZoom());
+  nsSize velocity;
+  if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+    velocity = CSSSize::ToAppUnits(ParentLayerSize(mX.GetVelocity() * 1000.0f,
+                                                   mY.GetVelocity() * 1000.0f) /
+                                   Metrics().GetZoom());
+  }
 
   if (mState == SMOOTH_SCROLL && mAnimation) {
     RefPtr<SmoothScrollAnimation> animation(
@@ -3559,9 +3576,12 @@
     CancelAnimation();
     SetState(SMOOTHMSD_SCROLL);
     // Convert velocity from ParentLayerPoints/ms to ParentLayerPoints/s.
-    CSSPoint initialVelocity = ParentLayerPoint(mX.GetVelocity() * 1000.0f,
-                                                mY.GetVelocity() * 1000.0f) /
-                               Metrics().GetZoom();
+    CSSPoint initialVelocity;
+    if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+      initialVelocity = ParentLayerPoint(mX.GetVelocity() * 1000.0f,
+                                         mY.GetVelocity() * 1000.0f) /
+                        Metrics().GetZoom();
+    }
 
     StartAnimation(new SmoothMsdScrollAnimation(
         *this, Metrics().GetVisualScrollOffset(), initialVelocity, aDestination,
@@ -4470,8 +4490,10 @@
   LayoutDeviceToParentLayerScale2D lastDispatchedZoom =
       mExpectedGeckoMetrics.GetZoom() /
       mExpectedGeckoMetrics.GetDevPixelsPerCSSPixel();
-  gfxSize zoomChange = lastContentZoom / lastDispatchedZoom;
-
+  gfxSize zoomChange(1.0, 1.0);
+  if (lastDispatchedZoom != LayoutDeviceToParentLayerScale2D(0, 0)) {
+    zoomChange = lastContentZoom / lastDispatchedZoom;
+  }
   return Matrix4x4::Translation(scrollChange.x, scrollChange.y, 0)
       .PostScale(zoomChange.width, zoomChange.height, 1);
 }
@@ -4506,9 +4528,11 @@
   // The "*RelativeToItself*" variables are relative to the comp bounds origin
   ParentLayerRect visiblePartOfCompBoundsRelativeToItself =
       aClippedCompositionBounds - Metrics().GetCompositionBounds().TopLeft();
-
-  CSSRect visiblePartOfCompBoundsRelativeToItselfInCssSpace =
-      (visiblePartOfCompBoundsRelativeToItself / Metrics().GetZoom());
+  CSSRect visiblePartOfCompBoundsRelativeToItselfInCssSpace;
+  if (Metrics().GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+    visiblePartOfCompBoundsRelativeToItselfInCssSpace =
+        (visiblePartOfCompBoundsRelativeToItself / Metrics().GetZoom());
+  }
 
   // This one is relative to the scrolled frame origin, same as `visible`
   CSSRect visiblePartOfCompBoundsInCssSpace =
@@ -4746,8 +4770,14 @@
       // our zoom to reflect that. Note that we can't just take
       // aLayerMetrics.mZoom because the APZ may have additional async zoom
       // since the repaint request.
-      gfxSize totalResolutionChange = aLayerMetrics.GetCumulativeResolution() /
-                                      Metrics().GetCumulativeResolution();
+      gfxSize totalResolutionChange(1.0, 1.0);
+
+      if (Metrics().GetCumulativeResolution() !=
+          LayoutDeviceToLayerScale2D(0, 0)) {
+        totalResolutionChange = aLayerMetrics.GetCumulativeResolution() /
+                                Metrics().GetCumulativeResolution();
+      }
+
       float presShellResolutionChange = aLayerMetrics.GetPresShellResolution() /
                                         Metrics().GetPresShellResolution();
       if (presShellResolutionChange != 1.0f) {
@@ -4851,8 +4881,7 @@
           Metrics().GetVisualScrollOffset());
 
       CSSPoint destination;
-      if (StaticPrefs::apz_relative_update_enabled() &&
-          scrollUpdate.GetType() == ScrollUpdateType::Relative) {
+      if (scrollUpdate.GetType() == ScrollUpdateType::Relative) {
         CSSPoint delta =
             scrollUpdate.GetDestination() - scrollUpdate.GetSource();
         APZC_LOG("%p relative smooth scrolling from %s by %s\n", this,
@@ -4897,8 +4926,7 @@
 
     Maybe<CSSPoint> relativeDelta;
 
-    if (StaticPrefs::apz_relative_update_enabled() &&
-        scrollUpdate.GetType() == ScrollUpdateType::Relative) {
+    if (scrollUpdate.GetType() == ScrollUpdateType::Relative) {
       APZC_LOG(
           "%p relative updating scroll offset from %s by %s\n", this,
           ToString(Metrics().GetVisualScrollOffset()).c_str(),
@@ -5632,6 +5660,9 @@
     ScrollUnit aUnit, ParentLayerPoint& aDelta, CSSPoint& aStartPosition) {
   RecursiveMutexAutoLock lock(mRecursiveMutex);
   CSSToParentLayerScale2D zoom = Metrics().GetZoom();
+  if (zoom == CSSToParentLayerScale2D(0, 0)) {
+    return false;
+  }
   CSSPoint destination = Metrics().CalculateScrollRange().ClampPoint(
       aStartPosition + (aDelta / zoom));
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/Axis.cpp firefox-85.0+build1/gfx/layers/apz/src/Axis.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/Axis.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/Axis.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -275,7 +275,6 @@
 CSSCoord Axis::ClampOriginToScrollableRect(CSSCoord aOrigin) const {
   CSSToParentLayerScale zoom = GetScaleForAxis(GetFrameMetrics().GetZoom());
   ParentLayerCoord origin = aOrigin * zoom;
-
   ParentLayerCoord result;
   if (origin < GetPageStart()) {
     result = GetPageStart();
@@ -284,7 +283,9 @@
   } else {
     return aOrigin;
   }
-
+  if (zoom == CSSToParentLayerScale(0)) {
+    return aOrigin;
+  }
   return result / zoom;
 }
 
@@ -333,10 +334,10 @@
                "In an OVERSCROLL_BOTH condition in ScaleWillOverscrollAmount");
     return 0;
   }
-  if (minus) {
+  if (minus && zoom != CSSToParentLayerScale(0)) {
     return (originAfterScale - GetPageStart()) / zoom;
   }
-  if (plus) {
+  if (plus && zoom != CSSToParentLayerScale(0)) {
     return (originAfterScale + (GetCompositionLength() / aScale) -
             GetPageEnd()) /
            zoom;
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/GenericFlingAnimation.h firefox-85.0+build1/gfx/layers/apz/src/GenericFlingAnimation.h
--- firefox-84.0.2+build1/gfx/layers/apz/src/GenericFlingAnimation.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/GenericFlingAnimation.h	2021-01-18 19:58:11.000000000 +0000
@@ -132,8 +132,9 @@
     ParentLayerPoint adjustedOffset;
     mApzc.mX.AdjustDisplacement(offset.x, adjustedOffset.x, overscroll.x);
     mApzc.mY.AdjustDisplacement(offset.y, adjustedOffset.y, overscroll.y);
-
-    mApzc.ScrollBy(adjustedOffset / aFrameMetrics.GetZoom());
+    if (aFrameMetrics.GetZoom() != CSSToParentLayerScale2D(0, 0)) {
+      mApzc.ScrollBy(adjustedOffset / aFrameMetrics.GetZoom());
+    }
 
     // The fling may have caused us to reach the end of our scroll range.
     if (!IsZero(overscroll)) {
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/GenericScrollAnimation.cpp firefox-85.0+build1/gfx/layers/apz/src/GenericScrollAnimation.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/GenericScrollAnimation.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/GenericScrollAnimation.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -59,6 +59,9 @@
                                       const TimeDuration& aDelta) {
   TimeStamp now = mApzc.GetFrameTime().Time();
   CSSToParentLayerScale2D zoom = aFrameMetrics.GetZoom();
+  if (zoom == CSSToParentLayerScale2D(0, 0)) {
+    return false;
+  }
 
   // If the animation is finished, make sure the final position is correct by
   // using one last displacement. Otherwise, compute the delta via the timing
@@ -80,7 +83,6 @@
     mApzc.mX.SetVelocity(velocityPL.x / 1000.0);
     mApzc.mY.SetVelocity(velocityPL.y / 1000.0);
   }
-
   // Note: we ignore overscroll for generic animations.
   ParentLayerPoint adjustedOffset, overscroll;
   mApzc.mX.AdjustDisplacement(
@@ -89,7 +91,6 @@
   mApzc.mY.AdjustDisplacement(
       displacement.y, adjustedOffset.y, overscroll.y,
       mDirectionForcedToOverscroll == Some(ScrollDirection::eVertical));
-
   // If we expected to scroll, but there's no more scroll range on either axis,
   // then end the animation early. Note that the initial displacement could be 0
   // if the compositor ran very quickly (<1ms) after the animation was created.
@@ -98,7 +99,6 @@
     // Nothing more to do - end the animation.
     return false;
   }
-
   mApzc.ScrollBy(adjustedOffset / zoom);
   return !finished;
 }
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/src/SmoothMsdScrollAnimation.cpp firefox-85.0+build1/gfx/layers/apz/src/SmoothMsdScrollAnimation.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/src/SmoothMsdScrollAnimation.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/src/SmoothMsdScrollAnimation.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -3,7 +3,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/. */
-
 #include "SmoothMsdScrollAnimation.h"
 #include "AsyncPanZoomController.h"
 
@@ -22,6 +21,10 @@
 
 bool SmoothMsdScrollAnimation::DoSample(FrameMetrics& aFrameMetrics,
                                         const TimeDuration& aDelta) {
+  CSSToParentLayerScale2D zoom = aFrameMetrics.GetZoom();
+  if (zoom == CSSToParentLayerScale2D(0, 0)) {
+    return false;
+  }
   CSSPoint oneParentLayerPixel =
       ParentLayerPoint(1, 1) / aFrameMetrics.GetZoom();
   if (mXAxisModel.IsFinished(oneParentLayerPixel.x) &&
@@ -61,7 +64,6 @@
   }
   // If we overscroll, hand off to a fling animation that will complete the
   // spring back.
-  CSSToParentLayerScale2D zoom = aFrameMetrics.GetZoom();
   ParentLayerPoint displacement =
       (position - aFrameMetrics.GetVisualScrollOffset()) * zoom;
 
@@ -69,9 +71,7 @@
   ParentLayerPoint adjustedOffset;
   mApzc.mX.AdjustDisplacement(displacement.x, adjustedOffset.x, overscroll.x);
   mApzc.mY.AdjustDisplacement(displacement.y, adjustedOffset.y, overscroll.y);
-
   mApzc.ScrollBy(adjustedOffset / zoom);
-
   // The smooth scroll may have caused us to reach the end of our scroll
   // range. This can happen if either the
   // layout.css.scroll-behavior.damping-ratio preference is set to less than 1
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js firefox-85.0+build1/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js	2021-01-18 19:58:11.000000000 +0000
@@ -705,6 +705,13 @@
   return synthesizeNativeClick(aElement, aX, aY);
 }
 
+// Promise-returning variant of synthesizeNativeClickAndWaitForClickEvent
+function promiseNativeClickAndClickEvent(aElement, aX, aY) {
+  return new Promise(resolve => {
+    synthesizeNativeClickAndWaitForClickEvent(aElement, aX, aY, resolve);
+  });
+}
+
 // Move the mouse to (dx, dy) relative to |target|, and scroll the wheel
 // at that location.
 // Moving the mouse is necessary to avoid wheel events from two consecutive
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/apz_test_utils.js firefox-85.0+build1/gfx/layers/apz/test/mochitest/apz_test_utils.js
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/apz_test_utils.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/apz_test_utils.js	2021-01-18 19:58:11.000000000 +0000
@@ -235,6 +235,13 @@
   });
 }
 
+// Return a promise that is resolved on the next MozAfterPaint event
+function promiseAfterPaint() {
+  return new Promise(resolve => {
+    window.addEventListener("MozAfterPaint", resolve, { once: true });
+  });
+}
+
 function promiseApzRepaintsFlushed(aWindow = window) {
   return new Promise(function(resolve, reject) {
     var repaintDone = function() {
@@ -672,26 +679,6 @@
   };
 }
 
-// Same as runContinuation, except it takes an async generator, and doesn't
-// invoke it with any callback, since the generator doesn't need one.
-function runAsyncContinuation(testFunction) {
-  return async function() {
-    var asyncContinuation = testFunction();
-    try {
-      var ret = await asyncContinuation.next();
-      while (!ret.done) {
-        ret = await asyncContinuation.next();
-      }
-    } catch (ex) {
-      SimpleTest.ok(
-        false,
-        "APZ async test continuation failed with exception: " + ex
-      );
-      throw ex;
-    }
-  };
-}
-
 // Take a snapshot of the given rect, *including compositor transforms* (i.e.
 // includes async scroll transforms applied by APZ). If you don't need the
 // compositor transforms, you can probably get away with using
@@ -1055,6 +1042,10 @@
         // position is synced back to the main thread. So we disable displayport
         // expiry for these tests.
         ["apz.displayport_expiry_ms", 0],
+        // We need to disable touch resampling during these tests because we
+        // rely on touch move events being processed without delay. Touch
+        // resampling only processes them once vsync fires.
+        ["android.touch_resampling.enabled", false],
       ];
     case "TOUCH_ACTION":
       return [
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/browser_test_group_fission.js firefox-85.0+build1/gfx/layers/apz/test/mochitest/browser_test_group_fission.js
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/browser_test_group_fission.js	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/browser_test_group_fission.js	2021-01-18 19:58:11.000000000 +0000
@@ -50,11 +50,12 @@
       file: "helper_fission_tap.html",
       prefs: [["apz.max_tap_time", 10000]],
     },
+    { file: "helper_fission_inactivescroller_under_oopif.html" },
     // add additional tests here
   ];
   if (isWebRender) {
     subtests = subtests.concat([
-      // add additional WebRender-specific tests here
+      // add WebRender-specific tests here
     ]);
   } else {
     subtests = subtests.concat([
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1280013.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1280013.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1280013.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1280013.html	2021-01-18 19:58:11.000000000 +0000
@@ -8,22 +8,19 @@
   <script type="application/javascript" src="apz_test_utils.js"></script>
   <script src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
-function* test(testDriver) {
+async function test() {
   ok(screen.height > 500, "Screen height must be at least 500 pixels for this test to work");
 
-  // This listener will trigger the test to continue once APZ is done with
-  // processing the scroll.
-  SpecialPowers.Services.obs.addObserver(testDriver, "APZ:TransformEnd");
-
-  // Note on the synthesizeNativeTouchDrag() calls in this file: by using
-  // yield and *not* passing |testDriver| as the |aObserver| argument, these
-  // calls block until something else (in this case, the APZ:TransformEnd
-  // notification) resumes the test.
-
   // Scroll down to the iframe. Do it in two drags instead of one in case the
   // device screen is short.
-  yield synthesizeNativeTouchDrag(window, 10, 200, 0, -175);
-  yield synthesizeNativeTouchDrag(window, 10, 200, 0, -175);
+  let transformEnd = promiseTransformEnd();
+  synthesizeNativeTouchDrag(window, 10, 200, 0, -175);
+  await transformEnd;
+
+  transformEnd = promiseTransformEnd();
+  synthesizeNativeTouchDrag(window, 10, 200, 0, -175);
+  await transformEnd;
+
   // Now the top of the visible area should be at y=350 of the top-level page,
   // so if the screen is >= 500px tall, the entire iframe should be visible, at
   // least vertically.
@@ -32,19 +29,18 @@
   // scrolling is happening in APZ and is not reflected in the main-thread
   // scroll position (it is stored in the callback transform instead). We check
   // this by checking the scroll offset.
-  yield flushApzRepaints(testDriver);
+  await promiseApzRepaintsFlushed();
   is(window.scrollY, 0, "Main-thread scroll position is still at 0");
 
   // Scroll the iframe by 150px.
   var subframe = document.getElementById("subframe");
-  yield synthesizeNativeTouchDrag(subframe, 10, 100, 0, -150);
-
-  // Remove the observer, we don't need it any more.
-  SpecialPowers.Services.obs.removeObserver(testDriver, "APZ:TransformEnd");
+  transformEnd = promiseTransformEnd();
+  synthesizeNativeTouchDrag(subframe, 10, 100, 0, -150);
+  await transformEnd;
 
   // Flush any pending paints on the APZ side, and wait for the main thread
   // to process them all so that we get the correct test data
-  yield waitForApzFlushedRepaints(testDriver);
+  await promiseApzFlushedRepaints();
 
   // get the displayport for the subframe
   var utils = SpecialPowers.getDOMWindowUtils(window);
@@ -65,7 +61,7 @@
 
 SpecialPowers.getDOMWindowUtils(window).setResolutionAndScaleTo(2.0);
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1346632.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1346632.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1346632.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1346632.html	2021-01-18 19:58:11.000000000 +0000
@@ -25,13 +25,15 @@
     }
   </style>
   <script type="text/javascript">
-function* test(testDriver) {
+async function test() {
   var root = document.scrollingElement;
   var scrollPos = root.scrollTop;
-  document.addEventListener("scroll", () => {
-    ok(root.scrollTop > scrollPos, "document scrolled after dragging scrollbar");
-    setTimeout(testDriver, 0);
-  }, {once: true});
+  var scrollPromise = new Promise((resolve, reject) => {
+    document.addEventListener("scroll", () => {
+      ok(root.scrollTop > scrollPos, "document scrolled after dragging scrollbar");
+      resolve();
+    }, {once: true});
+  });
 
   if (window.innerWidth == root.clientWidth) {
     // No scrollbar, abort the test. This can happen e.g. on local macOS runs
@@ -42,19 +44,19 @@
 
   var scrollbarX = (window.innerWidth + root.clientWidth) / 2;
   // Move the mouse to the scrollbar
-  yield synthesizeNativeMouseEvent(root, scrollbarX, 100, nativeMouseMoveEventMsg(), testDriver);
+  await promiseNativeMouseEvent(root, scrollbarX, 100, nativeMouseMoveEventMsg());
   // mouse down
-  yield synthesizeNativeMouseEvent(root, scrollbarX, 100, nativeMouseDownEventMsg(), testDriver);
+  await promiseNativeMouseEvent(root, scrollbarX, 100, nativeMouseDownEventMsg());
   // drag vertically
-  yield synthesizeNativeMouseEvent(root, scrollbarX, 150, nativeMouseMoveEventMsg(), testDriver);
-  // wait for the scroll listener to fire, which will resume this function
-  yield;
+  await promiseNativeMouseEvent(root, scrollbarX, 150, nativeMouseMoveEventMsg());
+  // wait for the scroll listener to fire
+  await scrollPromise;
   // and release
-  yield synthesizeNativeMouseEvent(root, scrollbarX, 150, nativeMouseUpEventMsg(), testDriver);
+  await promiseNativeMouseEvent(root, scrollbarX, 150, nativeMouseUpEventMsg());
 }
 
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1502010_unconsumed_pan.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1502010_unconsumed_pan.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1502010_unconsumed_pan.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1502010_unconsumed_pan.html	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,10 @@
     var lastPointerCoord = -1;
     var apzFlushed = false;
     var endEventReceived = false;
+    var testEndResolveFunc = null;
+    var testEndPromise = new Promise(resolve => {
+      testEndResolveFunc = resolve;
+    });
 
     function checkForTestEnd() {
         if (apzFlushed && endEventReceived) {
@@ -22,7 +26,7 @@
             is(document.scrollingElement.scrollTop, 0, "Document didn't y-scroll");
             is(document.scrollingElement.scrollLeft, 0, "Document didn't x-scroll");
 
-            subtestDone();
+            testEndResolveFunc();
         }
     }
 
@@ -32,7 +36,7 @@
         pointerMoveCount++;
     }
 
-    function* test(testDriver) {
+    async function test() {
         var target = document.getElementById("carousel");
         target.addEventListener("pointercancel", (event) => {
             ok(false, "Received pointercancel, uh-oh!");
@@ -50,14 +54,18 @@
         // Drag mostly horizontally but also slightly vertically. If the
         // touch-action were not respected due to a bug this might result
         // in vertical scrolling instead of pointermove events.
-        yield synthesizeNativeTouchDrag(target, 10, 10, 200, -10, testDriver);
-        yield flushApzRepaints(testDriver);
+        await new Promise(resolve => {
+            synthesizeNativeTouchDrag(target, 10, 10, 200, -10, resolve);
+        });
+        await promiseApzRepaintsFlushed();
         apzFlushed = true;
 
         setTimeout(checkForTestEnd, 0);
+
+        await testEndPromise;
     }
 
-    waitUntilApzStable().then(runContinuation(test));
+    waitUntilApzStable().then(test).then(subtestDone, subtestFailed);
 
   </script>
 </head>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1506497_touch_action_fixed_on_fixed.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1506497_touch_action_fixed_on_fixed.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1506497_touch_action_fixed_on_fixed.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1506497_touch_action_fixed_on_fixed.html	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,7 @@
   <script src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript">
 
-function* test(testDriver) {
+async function test() {
   document.getElementById("overlay").addEventListener("touchstart", function(e) {
     // no need to do anything here. Just having a non-passive touchstart
     // listener will force APZ to wait for the main thread to handle the
@@ -19,7 +19,7 @@
   }, {passive: false});
 
   // Ensure that APZ gets updated hit-test info
-  yield waitForAllPaints(testDriver);
+  await promiseAllPaintsDone();
 
   // Register a listener that fails the test if the APZ:TransformEnd event fires,
   // because this test shouldn't actually be triggering any transforms
@@ -31,20 +31,26 @@
   let visScrEvtInternal = new EventCounter(window, "mozvisualscroll",
                                            { mozSystemGroup: true });
 
-  // This listener will continue the test after the main thread has processed
+  // This promise will resolve after the main thread has processed
   // all the synthesized touch events.
-  var waitForTouchEnd = function(e) {
-    dump("touchend listener hit\n");
-    setTimeout(testDriver, 0);
-  };
-  document.documentElement.addEventListener("touchend", waitForTouchEnd, {passive: true, once: true});
+  let promiseTouchEnd = new Promise(resolve => {
+    var waitForTouchEnd = function(e) {
+      dump("touchend listener hit\n");
+      resolve();
+    };
+    document.documentElement.addEventListener(
+      "touchend",
+      waitForTouchEnd,
+      {passive: true, once: true}
+    );
+  });
 
   synthesizeNativeTouchDrag(document.getElementById("boxOnTop"), 5, 5, 0, -50);
   dump("finished drag, waiting for touchend listener...");
-  yield;
+  await promiseTouchEnd;
 
   // Flush state.
-  yield waitForApzFlushedRepaints(testDriver);
+  await promiseApzFlushedRepaints();
 
   // Check that the touch was prevented, per the touch-action
   is(window.scrollY, 0, "window didn't scroll");
@@ -54,7 +60,7 @@
 }
 
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1509575.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1509575.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1509575.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1509575.html	2021-01-18 19:58:11.000000000 +0000
@@ -18,23 +18,16 @@
   </div>
   <script type="application/javascript">
 
-function* test(testDriver) {
-  // This listener will trigger the test to continue once APZ is done with
-  // processing the scroll.
-  SpecialPowers.Services.obs.addObserver(testDriver, "APZ:TransformEnd");
-
+async function test() {
+  let transformEndPromise = promiseTransformEnd();
   synthesizeNativeTouchDrag(document.body, 10, 100, -100, 0);
   dump("Finished native drag, waiting for transform-end observer...\n");
 
   // Wait for the APZ:TransformEnd to be fired after touch events are processed.
-  yield true;
-
-  // We get here once the APZ:TransformEnd has fired, so we don't need that
-  // observer any more.
-  SpecialPowers.Services.obs.removeObserver(testDriver, "APZ:TransformEnd");
+  await transformEndPromise;
 
   // Flush state.
-  yield waitForApzFlushedRepaints(testDriver);
+  await promiseApzFlushedRepaints();
 
   is(window.scrollX, 0, "layout viewport didn't scroll");
   let visualX = window.visualViewport.pageLeft;
@@ -52,26 +45,25 @@
   } else {
     topWinUtils = SpecialPowers.getDOMWindowUtils(window);
   }
-  window.addEventListener("MozAfterPaint",
-                          () => setTimeout(testDriver, 0), {once: true});
+  let afterPaintPromise = promiseAfterPaint();
   ok(topWinUtils.isFirstPaint === false, "first paint not set");
   topWinUtils.isFirstPaint = true;
   // do something that forces a paint *and* an APZ update.
   document.getElementById("expand").style.width = "6000px";
 
   // Wait for the event listener to fire.
-  yield true;
+  await afterPaintPromise;
   ok(true, "MozAfterPaint fired");
 
   // Flush state just to be sure.
-  yield waitForApzFlushedRepaints(testDriver);
+  await promiseApzFlushedRepaints();
 
   is(window.visualViewport.pageLeft, visualX, "visual viewport remains unchanged");
 }
 
 SpecialPowers.getDOMWindowUtils(window).setResolutionAndScaleTo(2.0);
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1544966_zoom_on_touch_action_none.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1544966_zoom_on_touch_action_none.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1544966_zoom_on_touch_action_none.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1544966_zoom_on_touch_action_none.html	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,7 @@
   <script src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript">
 
-function* test(testDriver) {
+async function test() {
   var target = document.getElementById("target");
 
   var pointersDown = 0;
@@ -25,22 +25,24 @@
     dump(`Got pointermove, pointer id ${e.pointerId}, at ${e.clientX}, ${e.clientY}\n`);
     pointerMoveCount++;
   });
-  target.addEventListener("pointercancel", function(e) {
-    dump(`Got pointercancel, pointer id ${e.pointerId}\n`);
-    ok(false, "Should not have gotten pointercancel");
-    pointersUp++;
-    if (pointersDown == pointersUp) {
-      // All pointers lifted, let's continue the test
-      setTimeout(testDriver, 0);
-    }
-  });
-  target.addEventListener("pointerup", function(e) {
-    dump(`Got pointerup, pointer id ${e.pointerId}\n`);
-    pointersUp++;
-    if (pointersDown == pointersUp) {
-      // All pointers lifted, let's continue the test
-      setTimeout(testDriver, 0);
-    }
+  let pointersUpPromise = new Promise(resolve => {
+    target.addEventListener("pointercancel", function(e) {
+      dump(`Got pointercancel, pointer id ${e.pointerId}\n`);
+      ok(false, "Should not have gotten pointercancel");
+      pointersUp++;
+      if (pointersDown == pointersUp) {
+        // All pointers lifted, let's continue the test
+        resolve();
+      }
+    });
+    target.addEventListener("pointerup", function(e) {
+      dump(`Got pointerup, pointer id ${e.pointerId}\n`);
+      pointersUp++;
+      if (pointersDown == pointersUp) {
+        // All pointers lifted, let's continue the test
+        resolve();
+      }
+    });
   });
 
   var zoom_in = [
@@ -56,7 +58,7 @@
   synthesizeNativeTouchSequences(document.getElementById("target"), zoom_in, null, touchIds);
 
   dump("All touch events synthesized, waiting for final pointerup...\n");
-  yield true;
+  await pointersUpPromise;
 
   // Should get at least one pointermove per pointer, even if the events
   // get coalesced somewhere.
@@ -65,7 +67,7 @@
 }
 
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1648491_no_pointercancel_with_dtc.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1648491_no_pointercancel_with_dtc.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1648491_no_pointercancel_with_dtc.html	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1648491_no_pointercancel_with_dtc.html	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,7 @@
   <script src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript">
 
-function* test(testDriver) {
+async function test() {
   var body = document.body;
 
   var pointersDown = 0;
@@ -25,22 +25,24 @@
     dump(`Got pointermove, pointer id ${e.pointerId}, at ${e.clientX}, ${e.clientY}\n`);
     pointerMoveCount++;
   });
-  body.addEventListener("pointercancel", function(e) {
-    dump(`Got pointercancel, pointer id ${e.pointerId}\n`);
-    ok(false, "Should not have gotten pointercancel");
-    pointersUp++;
-    if (pointersDown == pointersUp) {
-      // All pointers lifted, let's continue the test
-      setTimeout(testDriver, 0);
-    }
-  });
-  body.addEventListener("pointerup", function(e) {
-    dump(`Got pointerup, pointer id ${e.pointerId}\n`);
-    pointersUp++;
-    if (pointersDown == pointersUp) {
-      // All pointers lifted, let's continue the test
-      setTimeout(testDriver, 0);
-    }
+  let pointersUpPromise = new Promise(resolve => {
+    body.addEventListener("pointercancel", function(e) {
+      dump(`Got pointercancel, pointer id ${e.pointerId}\n`);
+      ok(false, "Should not have gotten pointercancel");
+      pointersUp++;
+      if (pointersDown == pointersUp) {
+        // All pointers lifted, let's continue the test
+        resolve();
+      }
+    });
+    body.addEventListener("pointerup", function(e) {
+      dump(`Got pointerup, pointer id ${e.pointerId}\n`);
+      pointersUp++;
+      if (pointersDown == pointersUp) {
+        // All pointers lifted, let's continue the test
+        resolve();
+      }
+    });
   });
 
   var zoom_in = [
@@ -56,7 +58,7 @@
   synthesizeNativeTouchSequences(document.getElementById("target"), zoom_in, null, touchIds);
 
   dump("All touch events synthesized, waiting for final pointerup...\n");
-  yield true;
+  await pointersUpPromise;
 
   // Should get at least one pointermove per pointer, even if the events
   // get coalesced somewhere.
@@ -65,7 +67,7 @@
 }
 
 waitUntilApzStable()
-.then(runContinuation(test))
+.then(test)
 .then(subtestDone, subtestFailed);
 
   </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1674935.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1674935.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1674935.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1674935.html	2021-01-18 19:58:11.000000000 +0000
@@ -56,13 +56,15 @@
       });
     }
 
-    async function test(testDriver) {
+    async function test() {
       is(window.scrollX, 0, "shouldn't have scrolled (1)");
       is(window.scrollY, 0, "shouldn't have scrolled (2)");
 
+      let waitForScroll = waitForScrollEvent(window);
+
       window.synthesizeKey("KEY_ArrowDown");
 
-      await waitForScrollEvent(window);
+      await waitForScroll;
 
       is(window.scrollX, 0, "shouldn't have scrolled (3)");
       isnot(window.scrollY, 0, "should have scrolled (4)");
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width; initial-scale=1.0">
+  <script type="application/javascript" src="apz_test_native_event_utils.js"></script>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
+  <script src="/tests/SimpleTest/paint_listener.js"></script>
+  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript">
+
+async function test() {
+  var body = document.body;
+
+  // Event listeners just for logging/debugging purposes
+  body.addEventListener("pointerdown", function(e) {
+    dump(`Got pointerdown, pointer id ${e.pointerId}\n`);
+  });
+  body.addEventListener("touchstart", function(e) {
+    dump(`Got touchstart with ${e.touches.length} touches\n`);
+  }, {passive: true});
+
+
+  // Event listeners relevant to the test. We want to make sure that a
+  // pointercancel event is dispatched to web content, so we listen for that.
+  // Also we want to ensure the main thread TouchActionHelper code is run and
+  // used, so we add a non-passive touchmove listener that ensures the body has
+  // a d-t-c region.
+  var gotPointerCancel = false;
+  body.addEventListener("pointercancel", function(e) {
+    dump(`Got pointercancel, pointer id ${e.pointerId}\n`);
+    gotPointerCancel = true;
+  });
+  body.addEventListener("touchmove", function(e) {
+    dump(`Got touchmove with ${e.touches.length} touches\n`);
+  }, {passive: false});
+
+  let touchEndPromise = new Promise(resolve => {
+    // This listener is just to catch the end of the touch sequence so we can
+    // end the test at the right time.
+    body.addEventListener("touchend", function(e) {
+      dump(`Got touchend with ${e.touches.length} touches\n`);
+      if (e.touches.length == 0) {
+        resolve();
+      }
+    });
+  });
+
+  // We can't await this call, because this pinch action doesn't generate a
+  // APZ:TransformEnd. Instead we await the touchend.
+  pinchZoomOutWithTouchAtCenter();
+  await touchEndPromise;
+
+  ok(gotPointerCancel, "Checking that we definitely cancelled the pointerevents");
+}
+
+waitUntilApzStable()
+.then(test)
+.then(subtestDone, subtestFailed);
+
+  </script>
+  <style>
+    body {
+        height: 5000px;
+        touch-action: pinch-zoom;
+    }
+  </style>
+</head>
+<body>
+  A two-finger pinch action here should trigger browser zoom and trigger a pointercancel to content.
+  Note that the code does a zoom-out and the page is already at min zoom, so
+  the zoom doesn't produce any visual effect. But the DOM events should be the
+  same either way.
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_apzforcedisabled.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_apzforcedisabled.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_apzforcedisabled.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_apzforcedisabled.html	2021-01-18 19:58:11.000000000 +0000
@@ -10,15 +10,15 @@
   <script src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
 
-function* test(testDriver) {
+async function test() {
   var utils = SpecialPowers.getDOMWindowUtils(window);
   var subframe = document.getElementById('subframe');
 
   // layerize subframe
-  yield synthesizeNativeClickAndWaitForClickEvent(subframe, 10, 10, testDriver);
+  await promiseNativeClickAndClickEvent(subframe, 10, 10);
 
   // verify layerization
-  yield waitForAllPaints(() => setTimeout(testDriver, 0));
+  await promiseAllPaintsDone();
   ok(isLayerized("subframe"), "subframe should be layerized at this point");
   var subframeScrollId = utils.getViewId(subframe);
   ok(subframeScrollId > 0, "subframe should have a scroll id");
@@ -27,7 +27,7 @@
   utils.disableApzForElement(subframe);
 
   // wait for the dust to settle
-  yield waitForAllPaints(() => setTimeout(testDriver, 0));
+  await promiseAllPaintsDone();
 
   // Check that the root element's displayport has at least 500px of vertical
   // displayport margin on either side. This will ensure that we can scroll
@@ -63,13 +63,13 @@
   // advanceTimeAndRefresh has the additional advantage of freezing the refresh
   // driver which avoids any additional externally-triggered repaints from
   // erasing the symptoms of the bug.
-  yield waitForAllPaints(() => setTimeout(testDriver, 0));
+  await promiseAllPaintsDone();
   assertNotCheckerboarded(utils, subframeScrollId, "subframe");
-
-  subtestDone();
 }
 
-waitUntilApzStable().then(runContinuation(test));
+waitUntilApzStable()
+.then(test)
+.then(subtestDone, subtestFailed);
 
   </script>
   <style>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_no_multiplier.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_no_multiplier.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_no_multiplier.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_no_multiplier.html	2021-01-18 19:58:11.000000000 +0000
@@ -14,7 +14,7 @@
  <div style="height: 5000px; background-color: green"></div>
 </body>
 <script type="application/javascript">
-function* test(testDriver) {
+async function test() {
   var utils = SpecialPowers.getDOMWindowUtils(window);
   var scrollerId = utils.getViewId(document.scrollingElement);
 
@@ -32,25 +32,26 @@
   // increment too small increases runtime and too large might miss some
   // alignment values so this seems like a good number.
 
-  function* scrollAndCheck(x, y) {
+  async function scrollAndCheck(x, y) {
     dump(`Scrolling visual viewport to ${x}, ${y}\n`);
     utils.scrollToVisual(x, y, utils.UPDATE_TYPE_MAIN_THREAD, utils.SCROLL_MODE_INSTANT);
-    yield waitForApzFlushedRepaints(testDriver);
+    await promiseApzFlushedRepaints();
     assertNotCheckerboarded(utils, scrollerId, `At ${x}, ${y}`);
   }
 
   let vv_scrollable_x = window.innerWidth - (window.innerWidth / scale);
   for (var x = 0; x < vv_scrollable_x + 100; x += 43) {
-    yield* scrollAndCheck(x, 0);
+    await scrollAndCheck(x, 0);
   }
   ok(window.scrollX == 0, "Layout viewport couldn't move on the x-axis, page not scrollable that way");
   let vv_scrollable_y = window.innerHeight - (window.innerHeight / scale);
   for (var y = 0; y < vv_scrollable_y + 100; y += 43) {
-    yield* scrollAndCheck(0, y);
+    await scrollAndCheck(0, y);
   }
   ok(window.scrollY > 0, `Layout viewport moved down to ${window.scrollY} on the y-axis`);
-
-  subtestDone();
 }
-waitUntilApzStable().then(runContinuation(test));
+
+waitUntilApzStable()
+.then(test)
+.then(subtestDone, subtestFailed)
 </script>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_scrollinfo.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_scrollinfo.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_scrollinfo.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_checkerboard_scrollinfo.html	2021-01-18 19:58:11.000000000 +0000
@@ -53,7 +53,7 @@
  </svg>
 </body>
 <script type="application/javascript">
-function* test(testDriver) {
+async function test() {
   var scroller = document.querySelector("#scroller");
   var utils = SpecialPowers.getDOMWindowUtils(window);
   var scrollerId = utils.getViewId(scroller);
@@ -78,14 +78,14 @@
   for (var y = 3; y <= scroller.scrollTopMax; y += 17) {
     dump(`Scrolling scroller to ${y}\n`);
     scroller.scrollTo(0, y);
-    yield waitForApzFlushedRepaints(testDriver);
+    await promiseApzFlushedRepaints();
     assertNotCheckerboarded(utils, scrollerId, `At y=${y}`);
   }
-
-  subtestDone();
 }
 
-waitUntilApzStable().then(runContinuation(test));
+waitUntilApzStable()
+.then(test)
+.then(subtestDone, subtestFailed);
 
 </script>
 </html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_click.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_click.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_click.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_click.html	2021-01-18 19:58:11.000000000 +0000
@@ -9,29 +9,29 @@
   <script src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
 
-function* clickButton(testDriver) {
-  document.addEventListener("click", clicked);
+async function clickButton() {
+  let clickPromise = new Promise(resolve => {
+    document.addEventListener("click", resolve);
+  });
 
   if (getQueryArgs().dtc) {
     // force a dispatch-to-content region on the document
     document.addEventListener("wheel", function() { /* no-op */ }, { passive: false });
-    yield waitForAllPaints(function() {
-      flushApzRepaints(testDriver);
-    });
+    await promiseAllPaintsDone();
+    await promiseApzRepaintsFlushed();
   }
 
   synthesizeNativeClick(document.getElementById("b"), 5, 5, function() {
     dump("Finished synthesizing click, waiting for button to be clicked...\n");
   });
-}
 
-function clicked(e) {
+  let e = await clickPromise;
   is(e.target, document.getElementById("b"), "Clicked on button, yay! (at " + e.clientX + "," + e.clientY + ")");
-  subtestDone();
 }
 
 waitUntilApzStable()
-.then(runContinuation(clickButton));
+.then(clickButton)
+.then(subtestDone, subtestFailed);
 
   </script>
 </head>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_drag_click.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_drag_click.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_drag_click.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_drag_click.html	2021-01-18 19:58:11.000000000 +0000
@@ -9,31 +9,32 @@
   <script src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
 
-function* test(testDriver) {
-  document.addEventListener("click", clicked);
+async function test() {
+  let clickPromise = new Promise(resolve => {
+    document.addEventListener("click", resolve);
+  });
 
   // Ensure the pointer is inside the window
-  yield synthesizeNativeMouseEvent(document.getElementById("b"), 5, 5, nativeMouseMoveEventMsg(), testDriver);
+  await promiseNativeMouseEvent(document.getElementById("b"), 5, 5, nativeMouseMoveEventMsg());
   // mouse down, move it around, and release it near where it went down. this
   // should generate a click at the release point
-  yield synthesizeNativeMouseEvent(document.getElementById("b"), 5, 5, nativeMouseDownEventMsg(), testDriver);
-  yield synthesizeNativeMouseEvent(document.getElementById("b"), 100, 100, nativeMouseMoveEventMsg(), testDriver);
-  yield synthesizeNativeMouseEvent(document.getElementById("b"), 10, 10, nativeMouseMoveEventMsg(), testDriver);
-  yield synthesizeNativeMouseEvent(document.getElementById("b"), 8, 8, nativeMouseUpEventMsg(), testDriver);
+  await promiseNativeMouseEvent(document.getElementById("b"), 5, 5, nativeMouseDownEventMsg());
+  await promiseNativeMouseEvent(document.getElementById("b"), 100, 100, nativeMouseMoveEventMsg());
+  await promiseNativeMouseEvent(document.getElementById("b"), 10, 10, nativeMouseMoveEventMsg());
+  await promiseNativeMouseEvent(document.getElementById("b"), 8, 8, nativeMouseUpEventMsg());
   dump("Finished synthesizing click with a drag in the middle\n");
-}
 
-function clicked(e) {
+  let e = await clickPromise;
   // The mouse down at (5, 5) should not have generated a click, but the up
   // at (8, 8) should have.
   is(e.target, document.getElementById("b"), "Clicked on button, yay! (at " + e.clientX + "," + e.clientY + ")");
   is(e.clientX, 8 + Math.floor(document.getElementById("b").getBoundingClientRect().left), "x-coord of click event looks sane");
   is(e.clientY, 8 + Math.floor(document.getElementById("b").getBoundingClientRect().top), "y-coord of click event looks sane");
-  subtestDone();
 }
 
 waitUntilApzStable()
-.then(runContinuation(test));
+.then(test)
+.then(subtestDone, subtestFailed);
 
   </script>
 </head>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_oopif.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_oopif.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_oopif.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_oopif.html	2021-01-18 19:58:11.000000000 +0000
@@ -15,7 +15,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 async function setup_in_oopif() {
@@ -75,7 +75,7 @@
 
 // The actual test
 
-async function* test() {
+async function test() {
   // Generate an infinite animation which is initially clipped out by
   // overflow: hidden style in the out-of-process iframe.
   await setup_in_oopif();
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_transformed_oopif.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_transformed_oopif.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_transformed_oopif.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_animation_styling_in_transformed_oopif.html	2021-01-18 19:58:11.000000000 +0000
@@ -15,7 +15,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 async function setup_in_oopif() {
@@ -72,7 +72,7 @@
 
 // The actual test
 
-async function* test() {
+async function test() {
   // Generate an infinite animation which is initially scrolled out of view.
   // setup_in_oopif() returns the right bottom position of the animating element
   // on the iframe coodinate system.
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_basic.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_basic.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_basic.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_basic.html	2021-01-18 19:58:11.000000000 +0000
@@ -15,13 +15,13 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 
 // The actual test
 
-async function* test() {
+async function test() {
   let iframeElement = document.getElementById("testframe");
   ok(SpecialPowers.wrap(window)
        .docShell
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_event_region_override.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_event_region_override.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_event_region_override.html	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_event_region_override.html	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 
@@ -38,7 +38,7 @@
   return true;
 };
 
-async function* test() {
+async function test() {
   let iframeElement = document.getElementById("testframe");
 
   let iframeResponse = await FissionTestHelper.sendToOopif(iframeElement, `(${code_for_oopif_to_run})()`);
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_inactivescroller_under_oopif.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_inactivescroller_under_oopif.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_inactivescroller_under_oopif.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_inactivescroller_under_oopif.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,88 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Ensure inactive scollframes under OOPIFs hit-test properly</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/paint_listener.js"></script>
+  <script src="helper_fission_utils.js"></script>
+  <script src="apz_test_utils.js"></script>
+  <script src="apz_test_native_event_utils.js"></script>
+  <script>
+
+fission_subtest_init();
+
+FissionTestHelper.startTestPromise
+  .then(waitUntilApzStable)
+  .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
+  .then(waitUntilApzStable)
+  .then(test)
+  .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
+
+let make_oopif_scrollable = function() {
+  // ensure the oopif is scrollable, and wait for the paint so that the
+  // compositor also knows it's scrollable.
+  document.body.style.height = "200vh";
+  promiseApzFlushedRepaints().then(() => {
+    let utils = SpecialPowers.getDOMWindowUtils(window);
+    let result = {
+      layersId: utils.getLayersId(),
+      viewId: utils.getViewId(document.scrollingElement)
+    };
+    dump(`OOPIF computed IDs ${JSON.stringify(result)}\n`);
+    FissionTestHelper.fireEventInEmbedder("OOPIF:Scrollable", result);
+  });
+  return true;
+};
+
+async function test() {
+  let iframe = document.getElementById("testframe");
+
+  let letScrollerIdPromise = promiseOneEvent(window, "OOPIF:Scrollable", null);
+  ok(await FissionTestHelper.sendToOopif(iframe, `(${make_oopif_scrollable})()`),
+     "Ran code to make OOPIF scrollable");
+  let oopifScrollerIds = (await letScrollerIdPromise).data;
+
+  // The #scroller div is (a) inactive, and (b) under the OOPIF. Hit-testing
+  // against it should hit the OOPIF.
+
+  checkHitResult(await fissionHitTest(centerOf("scroller"), iframe),
+                 APZHitResultFlags.VISIBLE,
+                 oopifScrollerIds.viewId,
+                 oopifScrollerIds.layersId,
+                 "Part of OOPIF sitting on top of the inactive scrollframe should hit OOPIF");
+}
+
+  </script>
+</head>
+<body>
+<style>
+html, body {
+    margin: 0;
+}
+body {
+    /* Ensure root document is scrollable so that #scroller is inactive by
+      default */
+    height: 200vh;
+}
+iframe {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 300px;
+    height: 200px;
+}
+
+#scroller {
+    width: 200px;
+    height: 200px;
+    background-color: transparent;
+    overflow-y: scroll;
+}
+</style>
+<div id="scroller">
+  <div style="height:500px">inside scroller</div>
+</div>
+<iframe id="testframe"></iframe>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_scroll_oopif.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_scroll_oopif.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_scroll_oopif.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_scroll_oopif.html	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 
@@ -86,7 +86,7 @@
 
 // The actual test
 
-async function* test() {
+async function test() {
   ok(SpecialPowers.getBoolPref("apz.paint_skipping.enabled"),
      "paint-skipping is expected to be enabled for this test to be meaningful");
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_tap.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_tap.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_tap.html	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_tap.html	2021-01-18 19:58:11.000000000 +0000
@@ -19,7 +19,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 let code_for_oopif_to_run = function() {
@@ -43,7 +43,7 @@
   }, {once: true});
 }
 
-async function* test() {
+async function test() {
   let iframeElement = document.getElementById("testframe");
 
   let iframeResponse = await FissionTestHelper.sendToOopif(iframeElement, `(${code_for_oopif_to_run})()`)
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_transforms.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_transforms.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fission_transforms.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fission_transforms.html	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,7 @@
   .then(waitUntilApzStable)
   .then(loadOOPIFrame("testframe", "helper_fission_empty.html"))
   .then(waitUntilApzStable)
-  .then(runAsyncContinuation(test))
+  .then(test)
   .then(FissionTestHelper.subtestDone, FissionTestHelper.subtestFailed);
 
 
@@ -41,7 +41,7 @@
   }, {once: true});
 }
 
-async function* test() {
+async function test() {
   let iframeElement = document.getElementById("testframe");
 
   let iframeResponse = await FissionTestHelper.sendToOopif(iframeElement, `(${code_for_oopif_to_run})()`);
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fixed_pos_displayport.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fixed_pos_displayport.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fixed_pos_displayport.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fixed_pos_displayport.html	2021-01-18 19:58:11.000000000 +0000
@@ -42,12 +42,14 @@
       return parseRect(data[key]);
     }
 
-    function* scrollToVisual(targetX, targetY, testDriver) {
-      vv.addEventListener("scroll", testDriver, { once: true });
+    async function scrollToVisual(targetX, targetY) {
+      let scrollPromise = new Promise(resolve => {
+        vv.addEventListener("scroll", resolve, { once: true });
+      });
       utils.scrollToVisual(targetX, targetY, utils.UPDATE_TYPE_MAIN_THREAD,
                            utils.SCROLL_MODE_INSTANT);
-      yield; // wait for visual viewport "scroll" event
-      yield waitForApzFlushedRepaints(testDriver);
+      await scrollPromise;
+      await promiseApzFlushedRepaints();
       // Allow up to 1 pixel discrepancy due to floating-point error.
       isfuzzy(vv.pageLeft, targetX, 1, "visual-scrolled horizontally as expected");
       isfuzzy(vv.pageTop, targetY, 1, "visual-scrolled vertically as expected");
@@ -76,24 +78,24 @@
                             vvRect, "visual viewport");
     }
 
-    function* test(testDriver) {
+    async function test() {
       // First, check size and position on page load.
       checkFixedPosDisplayport();
 
       // Scroll the visual viewport within the layout viewport, without
       // scrolling the layout viewport itself, and check the size and
       // position again.
-      yield* scrollToVisual(vv.width * 3, vv.height * 3, testDriver);
+      await scrollToVisual(vv.width * 3, vv.height * 3);
       checkFixedPosDisplayport();
 
       // Finally, scroll the visual viewport farther so as to cause the
       // layout viewport to scroll as well, and check the size and position
       // once more.
-      yield* scrollToVisual(vv.width * 3, vv.height * 30, testDriver);
+      await scrollToVisual(vv.width * 3, vv.height * 30);
       checkFixedPosDisplayport();
     }
     SpecialPowers.getDOMWindowUtils(window).setResolutionAndScaleTo(8.0);
-    waitUntilApzStable().then(runContinuation(test)).then(subtestDone, subtestFailed);
+    waitUntilApzStable().then(test).then(subtestDone, subtestFailed);
   </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html	2021-01-18 19:58:11.000000000 +0000
@@ -28,27 +28,24 @@
 <body>
   <div id="fixed"><input type="button" value="Button" /></div>
   <script>
-    const input = document.querySelector("input");
-    function* test(testDriver) {
-      SpecialPowers.Services.obs.addObserver(testDriver, "APZ:TransformEnd");
-      yield synthesizeNativeTouchDrag(document.body, 10, 10, -2000, 0);
-      SpecialPowers.Services.obs.removeObserver(testDriver, "APZ:TransformEnd");
+    async function test() {
+      let transformEndPromise = promiseTransformEnd();
+      synthesizeNativeTouchDrag(document.body, 10, 10, -2000, 0);
+      await transformEndPromise;
 
-      yield waitForApzFlushedRepaints(testDriver);
+      await promiseApzFlushedRepaints();
 
-      // TODO: We're unsure why, but adding this observer substantially
-      // decreases the rate of intermittents that we see. We should figure out
-      // why and/or rewrite this test entirely.
-      SpecialPowers.Services.obs.addObserver(testDriver, "mouseevent");
-      yield synthesizeNativeClick(input, 10, 10, testDriver);
-      SpecialPowers.Services.obs.removeObserver(testDriver, "mouseevent");
-    }
-    window.addEventListener("click", (e) => {
+      let clickPromise = new Promise(resolve => {
+        window.addEventListener("click", resolve);
+      });
+      let input = document.querySelector("input");
+      synthesizeNativeClick(input, 10, 10);
+      let e = await clickPromise;
       is(e.target, input, "got click");
-      subtestDone();
-    });
+    }
+
     SpecialPowers.getDOMWindowUtils(window).setResolutionAndScaleTo(2.0);
-    waitUntilApzStable().then(runContinuation(test));
+    waitUntilApzStable().then(test).then(subtestDone, subtestFailed);
   </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_hittest_touchaction.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_hittest_touchaction.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_hittest_touchaction.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_hittest_touchaction.html	2021-01-18 19:58:11.000000000 +0000
@@ -65,6 +65,8 @@
  <div id="taListener" class="taBox" ontouchstart="return false;">
   <div id="taInnerListenerPanX" style="touch-action: pan-x"></div>
  </div>
+ <div id="taPinchZoom" class="taBox" style="touch-action: pinch-zoom">
+ </div>
 
  <br/>
 
@@ -286,6 +288,16 @@
       "touch-action: pan-x inside div with touch listener");
 
   checkHitResult(
+      hitTest(centerOf("taPinchZoom")),
+      APZHitResultFlags.VISIBLE |
+      APZHitResultFlags.PAN_Y_DISABLED |
+      APZHitResultFlags.PAN_X_DISABLED |
+      APZHitResultFlags.DOUBLE_TAP_ZOOM_DISABLED,
+      scrollId,
+      layersId,
+      "touch-action: pinch-zoom inside div with touch listener");
+
+  checkHitResult(
       hitTest(centerOf("taScrollerPanY")),
       APZHitResultFlags.VISIBLE |
       APZHitResultFlags.PAN_X_DISABLED |
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_iframe_textarea.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_iframe_textarea.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_iframe_textarea.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_iframe_textarea.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="helper_subframe_style.css"/>
+  </head>
+  <body>
+    <div style="height: 8000px;">ABC</div>
+    <textarea rows="20"></textarea>
+    <!-- Leave additional room below the element so it can be scrolled to the center -->
+    <div style="height: 1000px;">ABC</div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_iframe.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_iframe.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_iframe.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,54 @@
+<!DOCTYPE>
+<html>
+  <head>
+  <title>Checking zoomToFocusedInput scrolls that focused element is into iframe</title>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
+  <script src="/tests/SimpleTest/paint_listener.js"></script>
+  </head>
+<body>
+<div style="height: 8000px;">ABC</div>
+<iframe style="height: 30em;" src="helper_iframe_textarea.html"></iframe>
+</div>
+<!-- Leave additional room below the element so it can be scrolled to the center -->
+<div style="height: 1000px;">ABC</div>
+<script type="application/javascript">
+async function test() {
+  let utils = SpecialPowers.getDOMWindowUtils(window);
+
+  let iframe = document.querySelector("iframe");
+  let textarea = iframe.contentDocument.querySelector("textarea");
+  for (let i = 0; i < 20; i++) {
+    textarea.value += "foo\n";
+  }
+
+  iframe.focus();
+  textarea.focus();
+
+  textarea.setSelectionRange(0, 0);
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+
+  ok(window.scrollY > 0, "scroll position isn't top");
+  ok(iframe.contentWindow.scrollY > 0, "scroll position into iframe isn't top");
+  let prevPosY = window.scrollY;
+
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+
+  textarea.setSelectionRange(textarea.value.length, textarea.value.length);
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+
+  ok(window.scrollY > 0, "scroll position isn't top");
+  ok(iframe.contentWindow.scrollY > 0, "scroll position into iframe isn't top");
+  ok(prevPosY < window.scrollY,
+     "scroll position is different from first line of textarea");
+}
+
+waitUntilApzStable().then(test).then(subtestDone, subtestFailed);
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_multiline.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_multiline.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_multiline.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/helper_zoomToFocusedInput_multiline.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,75 @@
+<!DOCTYPE>
+<html>
+  <head>
+  <title>Checking zoomToFocusedInput scrolls that focused non-input element is visible position</title>
+  <script type="application/javascript" src="apz_test_utils.js"></script>
+  <script src="/tests/SimpleTest/paint_listener.js"></script>
+  </head>
+<body>
+<div style="height: 8000px;">ABC</div>
+<div id="content">
+</div>
+<!-- Leave additional room below the element so it can be scrolled to the center -->
+<div style="height: 1000px;">ABC</div>
+<script type="application/javascript">
+async function test() {
+  let utils = SpecialPowers.getDOMWindowUtils(window);
+
+  // contenteditable
+  let div = document.createElement("div");
+  div.setAttribute("contenteditable", "true");
+  for (let i = 0; i < 200; i++) {
+    div.innerHTML += "foo<br>";
+  }
+  div.innerHTML += "<span id=last>bar</span>";
+  document.getElementById("content").appendChild(div);
+
+  let selection = window.getSelection();
+  selection.collapse(div.firstChild, 0);
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+  ok(window.scrollY > 0, "scroll position isn't top");
+  let prevY = window.scrollY;
+
+  selection.collapse(document.getElementById("last").firstChild, 0);
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+  ok(prevY < window.scrollY, "scroll position is visibile position of caret");
+
+  document.getElementById("content").removeChild(div);
+
+  // <textarea> element
+  let textarea = document.createElement("textarea");
+  textarea.rows = 200;
+  for (let i = 0; i < 200; i++) {
+    textarea.value += "foo\n";
+  }
+  document.getElementById("content").appendChild(textarea);
+  textarea.focus();
+
+  textarea.setSelectionRange(0, 0);
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+  ok(window.scrollY > 0, "scroll position isn't top");
+  prevY = window.scrollY;
+
+  textarea.setSelectionRange(textarea.value.length, textarea.value.length);
+  window.scrollTo(0, 0);
+  is(0, window.scrollY, "scroll position is reset");
+  utils.zoomToFocusedInput();
+  await promiseApzFlushedRepaints();
+  ok(prevY < window.scrollY, "scroll position is visibile position of caret");
+
+  document.getElementById("content").removeChild(textarea);
+}
+
+waitUntilApzStable().then(test).then(subtestDone, subtestFailed);
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/mochitest.ini firefox-85.0+build1/gfx/layers/apz/test/mochitest/mochitest.ini
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/mochitest.ini	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/mochitest.ini	2021-01-18 19:58:11.000000000 +0000
@@ -99,6 +99,8 @@
     toolkit == 'android'  # mouse events not supported on mobile
     xorigin  # Hangs
 [test_group_zoomToFocusedInput.html]
+  skip-if =
+    xorigin  # Bug 1681211
 [test_group_scroll_snap.html]
   skip-if = (os == 'android') # wheel events not supported on mobile
 [test_group_checkerboarding.html]
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_pointerevents.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_pointerevents.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_pointerevents.html	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_pointerevents.html	2021-01-18 19:58:11.000000000 +0000
@@ -25,6 +25,7 @@
     {"file": "helper_bug1544966_zoom_on_touch_action_none.html", "prefs": [enablePE, ...touch_action_prefs]},
     {"file": "helper_bug1648491_no_pointercancel_with_dtc.html", "prefs": [enablePE, ...touch_action_prefs]},
     {"file": "helper_bug1663731_no_pointercancel_on_second_touchstart.html", "prefs": [enablePE, ...touch_action_prefs]},
+    {"file": "helper_bug1682170_pointercancel_on_touchaction_pinchzoom.html", "prefs": [enablePE, ...touch_action_prefs]},
   ];
 
   if (isApzEnabled()) {
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoom-2.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoom-2.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoom-2.html	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoom-2.html	2021-01-18 19:58:11.000000000 +0000
@@ -36,6 +36,9 @@
   ["apz.force_disable_desktop_zooming_scrollbars", false],
   // Force consistent scroll-to-click behaviour across all platforms.
   ["ui.scrollToClick", 0],
+  // Disable touch resampling so that touch events are processed without delay
+  // and we don't zoom more than expected due to overprediction.
+  ["android.touch_resampling.enabled", false],
 ];
 
 var instant_repaint_prefs = [
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoom.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoom.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoom.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoom.html	2021-01-18 19:58:11.000000000 +0000
@@ -32,6 +32,9 @@
   // Increase the content response timeout because some tests do preventDefault
   // and we want to make sure APZ actually waits for them.
   ["apz.content_response_timeout", 60000],
+  // Disable touch resampling so that touch events are processed without delay
+  // and we don't zoom more than expected due to overprediction.
+  ["android.touch_resampling.enabled", false],
 ];
 
 // Increase the tap timeouts so the one-touch-pinch gesture is still detected
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoomToFocusedInput.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoomToFocusedInput.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_group_zoomToFocusedInput.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_group_zoomToFocusedInput.html	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,8 @@
 
 var subtests = [
   {"file": "helper_zoomToFocusedInput_scroll.html"},
+  {"file": "helper_zoomToFocusedInput_multiline.html"},
+  {"file": "helper_zoomToFocusedInput_iframe.html"},
 ];
 
 if (isApzEnabled()) {
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_relative_update.html firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_relative_update.html
--- firefox-84.0.2+build1/gfx/layers/apz/test/mochitest/test_relative_update.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/test/mochitest/test_relative_update.html	2021-01-18 19:58:11.000000000 +0000
@@ -81,7 +81,7 @@
   // Receiving a relative scroll offset update can cause scroll animations to
   // be cancelled. This should be fixed, but for now we can still test this
   // by disabling smooth scrolling.
-  pushPrefs([["apz.relative-update.enabled", true], ["general.smoothScroll", false]])
+  pushPrefs([["general.smoothScroll", false]])
   .then(waitUntilApzStable)
   .then(runContinuation(test))
   .then(SimpleTest.finish, SimpleTest.finishWithFailure);
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/APZEventState.cpp firefox-85.0+build1/gfx/layers/apz/util/APZEventState.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/util/APZEventState.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/APZEventState.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -391,6 +391,10 @@
     mFirstTouchCancelled = false;
   }
 
+  APZES_LOG("Pointercancel if %d %d %d %d %d\n", sentContentResponse,
+            !isTouchPrevented, aApzResponse == nsEventStatus_eConsumeDoDefault,
+            StaticPrefs::dom_w3c_pointer_events_enabled(),
+            MainThreadAgreesEventsAreConsumableByAPZ());
   if (sentContentResponse && !isTouchPrevented &&
       aApzResponse == nsEventStatus_eConsumeDoDefault &&
       StaticPrefs::dom_w3c_pointer_events_enabled() &&
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/CheckerboardReportService.cpp firefox-85.0+build1/gfx/layers/apz/util/CheckerboardReportService.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/util/CheckerboardReportService.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/CheckerboardReportService.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,12 +10,15 @@
 #include "MainThreadUtils.h"          // for NS_IsMainThread
 #include "mozilla/Assertions.h"       // for MOZ_ASSERT
 #include "mozilla/ClearOnShutdown.h"  // for ClearOnShutdown
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/CheckerboardReportServiceBinding.h"  // for dom::CheckerboardReports
 #include "mozilla/gfx/GPUParent.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "nsContentUtils.h"  // for nsContentUtils
+#include "nsIObserverService.h"
 #include "nsXULAppAPI.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/CheckerboardReportService.h firefox-85.0+build1/gfx/layers/apz/util/CheckerboardReportService.h
--- firefox-84.0.2+build1/gfx/layers/apz/util/CheckerboardReportService.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/CheckerboardReportService.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,12 +9,12 @@
 
 #include <string>
 
-#include "js/TypeDecls.h"         // for JSContext, JSObject
-#include "mozilla/ErrorResult.h"  // for ErrorResult
-#include "mozilla/StaticPtr.h"    // for StaticRefPtr
-#include "nsCOMPtr.h"             // for nsCOMPtr
-#include "nsISupports.h"          // for NS_INLINE_DECL_REFCOUNTING
-#include "nsWrapperCache.h"       // for nsWrapperCache
+#include "js/TypeDecls.h"            // for JSContext, JSObject
+#include "mozilla/StaticPtr.h"       // for StaticRefPtr
+#include "nsCOMPtr.h"                // for nsCOMPtr
+#include "nsISupports.h"             // for NS_INLINE_DECL_REFCOUNTING
+#include "nsTArrayForwardDeclare.h"  // for nsTArray
+#include "nsWrapperCache.h"          // for nsWrapperCache
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/ChromeProcessController.cpp firefox-85.0+build1/gfx/layers/apz/util/ChromeProcessController.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/util/ChromeProcessController.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/ChromeProcessController.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/layers/IAPZCTreeManager.h"
 #include "mozilla/layers/InputAPZContext.h"
 #include "mozilla/layers/DoubleTapToZoom.h"
+#include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/dom/Document.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsLayoutUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/DoubleTapToZoom.cpp firefox-85.0+build1/gfx/layers/apz/util/DoubleTapToZoom.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/util/DoubleTapToZoom.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/DoubleTapToZoom.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -42,7 +42,7 @@
   }
   nsIFrame* frame = nsLayoutUtils::GetFrameForPoint(
       RelativeTo{rootFrame, ViewportType::Visual}, CSSPoint::ToAppUnits(aPoint),
-      {FrameForPointOption::IgnorePaintSuppression});
+      {{FrameForPointOption::IgnorePaintSuppression}});
   while (frame && (!frame->GetContent() ||
                    frame->GetContent()->IsInNativeAnonymousSubtree())) {
     frame = nsLayoutUtils::GetParentOrPlaceholderFor(frame);
diff -Nru firefox-84.0.2+build1/gfx/layers/apz/util/TouchActionHelper.cpp firefox-85.0+build1/gfx/layers/apz/util/TouchActionHelper.cpp
--- firefox-84.0.2+build1/gfx/layers/apz/util/TouchActionHelper.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/apz/util/TouchActionHelper.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -21,8 +21,10 @@
   if (aTouchActionValue != StyleTouchAction::AUTO) {
     // Double-tap-zooming need property value AUTO
     aOutBehavior &= ~AllowedTouchBehavior::DOUBLE_TAP_ZOOM;
-    if (aTouchActionValue != StyleTouchAction::MANIPULATION) {
-      // Pinch-zooming need value AUTO or MANIPULATION
+    if (aTouchActionValue != StyleTouchAction::MANIPULATION &&
+        !(aTouchActionValue & StyleTouchAction::PINCH_ZOOM)) {
+      // Pinch-zooming needs value AUTO or MANIPULATION, or the PINCH_ZOOM bit
+      // set
       aOutBehavior &= ~AllowedTouchBehavior::PINCH_ZOOM;
     }
   }
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/BasicCompositor.cpp firefox-85.0+build1/gfx/layers/basic/BasicCompositor.cpp
--- firefox-84.0.2+build1/gfx/layers/basic/BasicCompositor.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/BasicCompositor.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/gfx/Tools.h"
 #include "mozilla/gfx/ssse3-scaler.h"
 #include "mozilla/layers/ImageDataSerializer.h"
+#include "mozilla/layers/NativeLayer.h"
 #include "mozilla/SSE.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/StaticPrefs_nglayout.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/BasicImplData.h firefox-85.0+build1/gfx/layers/basic/BasicImplData.h
--- firefox-84.0.2+build1/gfx/layers/basic/BasicImplData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/BasicImplData.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,15 +7,24 @@
 #ifndef GFX_BASICIMPLDATA_H
 #define GFX_BASICIMPLDATA_H
 
-#include "Layers.h"           // for Layer (ptr only), etc
-#include "gfxContext.h"       // for gfxContext, etc
-#include "nsDebug.h"          // for NS_ASSERTION
-#include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
-#include "mozilla/gfx/Types.h"
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/gfx/Point.h"        // for Point
+#include "mozilla/gfx/Types.h"  // for CompositionOp, CompositionOp::OP_OVER, CompositionOp::OP_SOURCE
+#include "mozilla/layers/LayerManager.h"  // for LayerManager, LayerManager::DrawPaintedLayerCallback
+#include "nsDebug.h"      // for NS_ASSERTION
+#include "nsISupports.h"  // for MOZ_COUNTED_DTOR_VIRTUAL, MOZ_COUNT_CTOR
+
+class gfxContext;
 
 namespace mozilla {
+namespace gfx {
+class DrawTarget;
+class SourceSurface;
+}  // namespace gfx
+
 namespace layers {
 
+class Layer;
 class ReadbackProcessor;
 
 /**
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/BasicLayerManager.cpp firefox-85.0+build1/gfx/layers/basic/BasicLayerManager.cpp
--- firefox-84.0.2+build1/gfx/layers/basic/BasicLayerManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/BasicLayerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -36,7 +36,8 @@
 #include "mozilla/gfx/BaseRect.h"   // for BaseRect
 #include "mozilla/gfx/Matrix.h"     // for Matrix
 #include "mozilla/gfx/PathHelpers.h"
-#include "mozilla/gfx/Rect.h"            // for IntRect, Rect
+#include "mozilla/gfx/Rect.h"  // for IntRect, Rect
+#include "mozilla/layers/BSPTree.h"
 #include "mozilla/layers/LayersTypes.h"  // for BufferMode::BUFFER_NONE, etc
 #include "mozilla/mozalloc.h"            // for operator new
 #include "nsCOMPtr.h"                    // for already_AddRefed
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/BasicLayers.h firefox-85.0+build1/gfx/layers/basic/BasicLayers.h
--- firefox-84.0.2+build1/gfx/layers/basic/BasicLayers.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/BasicLayers.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,12 +8,12 @@
 #define GFX_BASICLAYERS_H
 
 #include <stdint.h>  // for INT32_MAX, int32_t
-#include "Layers.h"  // for Layer (ptr only), etc
 #include "gfxTypes.h"
-#include "gfxContext.h"                  // for gfxContext
-#include "mozilla/Attributes.h"          // for override
-#include "mozilla/WidgetUtils.h"         // for ScreenRotation
-#include "mozilla/layers/LayersTypes.h"  // for BufferMode, LayersBackend, etc
+#include "gfxContext.h"                   // for gfxContext
+#include "mozilla/Attributes.h"           // for override
+#include "mozilla/WidgetUtils.h"          // for ScreenRotation
+#include "mozilla/layers/LayerManager.h"  // for LayerManager::DrawPaintedLayerCallback, LayerManager::END_DEFAULT, LayerManager::EndTra...
+#include "mozilla/layers/LayersTypes.h"   // for BufferMode, LayersBackend, etc
 #include "mozilla/TimeStamp.h"
 #include "nsAString.h"
 #include "nsCOMPtr.h"         // for already_AddRefed
@@ -26,9 +26,14 @@
 namespace mozilla {
 namespace layers {
 
+class CanvasLayer;
+class ColorLayer;
+class ContainerLayer;
 class ImageFactory;
 class ImageLayer;
+class Layer;
 class PaintLayerContext;
+class PaintedLayer;
 class ReadbackLayer;
 
 /**
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/TextureClientX11.cpp firefox-85.0+build1/gfx/layers/basic/TextureClientX11.cpp
--- firefox-84.0.2+build1/gfx/layers/basic/TextureClientX11.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/TextureClientX11.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
 #include "mozilla/layers/ShadowLayerUtilsX11.h"
+#include "mozilla/layers/TextureForwarder.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Logging.h"
 #include "gfx2DGlue.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/basic/TextureClientX11.h firefox-85.0+build1/gfx/layers/basic/TextureClientX11.h
--- firefox-84.0.2+build1/gfx/layers/basic/TextureClientX11.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/basic/TextureClientX11.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/layers/TextureClient.h"
 #include "ISurfaceAllocator.h"  // For IsSurfaceDescriptorValid
-#include "mozilla/layers/ShadowLayerUtilsX11.h"
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/BufferTexture.cpp firefox-85.0+build1/gfx/layers/BufferTexture.cpp
--- firefox-84.0.2+build1/gfx/layers/BufferTexture.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/BufferTexture.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
 #include "mozilla/layers/ImageDataSerializer.h"
+#include "mozilla/layers/TextureForwarder.h"
 
 #ifdef MOZ_WIDGET_GTK
 #  include "gfxPlatformGtk.h"
@@ -191,9 +192,6 @@
                       yOffset, cbOffset, crOffset, aStereoMode, aColorDepth,
                       aYUVColorSpace, aColorRange, hasIntermediateBuffer);
 
-  // extra SIMD padding needed for SWGL
-  bufSize += 16;
-
   return CreateInternal(
       aAllocator ? aAllocator->GetTextureForwarder() : nullptr, descriptor,
       gfx::BackendType::NONE, bufSize, aTextureFlags);
diff -Nru firefox-84.0.2+build1/gfx/layers/client/ClientLayerManager.cpp firefox-85.0+build1/gfx/layers/client/ClientLayerManager.cpp
--- firefox-84.0.2+build1/gfx/layers/client/ClientLayerManager.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/ClientLayerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -23,6 +23,7 @@
 #include "mozilla/layers/LayerTransactionChild.h"
 #include "mozilla/layers/PersistentBufferProvider.h"
 #include "mozilla/layers/SyncObject.h"
+#include "mozilla/layers/TransactionIdAllocator.h"
 #include "mozilla/PerfStats.h"
 #include "ClientReadbackLayer.h"  // for ClientReadbackLayer
 #include "nsAString.h"
@@ -894,5 +895,9 @@
 
 ClientLayer::~ClientLayer() { MOZ_COUNT_DTOR(ClientLayer); }
 
+ClientLayer* ClientLayer::ToClientLayer(Layer* aLayer) {
+  return static_cast<ClientLayer*>(aLayer->ImplData());
+}
+
 }  // namespace layers
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/gfx/layers/client/ClientLayerManager.h firefox-85.0+build1/gfx/layers/client/ClientLayerManager.h
--- firefox-84.0.2+build1/gfx/layers/client/ClientLayerManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/ClientLayerManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,38 +7,57 @@
 #ifndef GFX_CLIENTLAYERMANAGER_H
 #define GFX_CLIENTLAYERMANAGER_H
 
-#include <stdint.h>  // for int32_t
-#include "Layers.h"
-#include "gfxContext.h"          // for gfxContext
-#include "mozilla/Attributes.h"  // for override
-#include "mozilla/LinkedList.h"  // for LinkedList
-#include "mozilla/StaticPrefs_apz.h"
-#include "mozilla/WidgetUtils.h"  // for ScreenRotation
-#include "mozilla/gfx/Rect.h"     // for Rect
-#include "mozilla/layers/CompositorTypes.h"
-#include "mozilla/layers/FocusTarget.h"   // for FocusTarget
-#include "mozilla/layers/LayersTypes.h"   // for BufferMode, LayersBackend, etc
-#include "mozilla/layers/PaintThread.h"   // For PaintThread
-#include "mozilla/layers/ShadowLayers.h"  // for ShadowLayerForwarder, etc
-#include "mozilla/layers/APZTestData.h"   // for APZTestData
-#include "mozilla/layers/MemoryPressureObserver.h"
-#include "nsCOMPtr.h"         // for already_AddRefed
-#include "nsISupportsImpl.h"  // for Layer::Release, etc
-#include "nsRect.h"           // for mozilla::gfx::IntRect
-#include "nsTArray.h"         // for nsTArray
-#include "nscore.h"           // for nsAString
-#include "mozilla/layers/TransactionIdAllocator.h"
-#include "nsIWidget.h"  // For plugin window configuration information structs
-
-class nsDisplayListBuilder;
+#include <cstddef>                    // for size_t
+#include <cstdint>                    // for uint32_t, int32_t
+#include <new>                        // for operator new
+#include <string>                     // for string
+#include <utility>                    // for forward
+#include "gfxContext.h"               // for gfxContext
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER2
+#include "mozilla/RefPtr.h"                  // for RefPtr
+#include "mozilla/TimeStamp.h"               // for TimeStamp, BaseTimeDuration
+#include "mozilla/WidgetUtils.h"             // for ScreenRotation
+#include "mozilla/gfx/Point.h"               // for IntSize
+#include "mozilla/gfx/Types.h"               // for SurfaceFormat
+#include "mozilla/layers/APZTestData.h"      // for APZTestData, SequenceNumber
+#include "mozilla/layers/CompositorTypes.h"  // for TextureFactoryIdentifier
+#include "mozilla/layers/LayerManager.h"  // for LayerManager::DrawPaintedLayerCallback, DidCompositeObserver (ptr only), Laye...
+#include "mozilla/layers/LayersTypes.h"  // for LayerHandle, LayersBackend, TransactionId, BufferMode, LayersBackend::LAYERS_...
+#include "mozilla/layers/MemoryPressureObserver.h"  // for MemoryPressureListener, MemoryPressureObserver (ptr only), MemoryPressureReason
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::ViewID
+#include "mozilla/layers/ShadowLayers.h"  // for ShadowLayerForwarder, ShadowableLayer
+#include "nsISupports.h"                  // for MOZ_COUNTED_DEFAULT_CTOR
+#include "nsIThread.h"                    // for TimeDuration
+#include "nsIWidget.h"                    // for nsIWidget
+#include "nsRegion.h"                     // for nsIntRegion
+#include "nsStringFwd.h"                  // for nsCString, nsAString
+#include "nsTArray.h"                     // for nsTArray
+
+// XXX Includes that could be avoided by moving function implementation to the
+// cpp file.
+#include "mozilla/StaticPrefs_apz.h"  // for apz_test_logging_enabled
 
 namespace mozilla {
 namespace layers {
 
+class CanvasLayer;
+class ColorLayer;
+class ContainerLayer;
 class ClientPaintedLayer;
 class CompositorBridgeChild;
-class ImageLayer;
+class FocusTarget;
 class FrameUniformityData;
+class ImageLayer;
+class Layer;
+class PCompositorBridgeChild;
+class PaintTiming;
+class PaintedLayer;
+class PersistentBufferProvider;
+class ReadbackLayer;
+class ReadbackProcessor;
+class RefLayer;
+class TransactionIdAllocator;
 
 class ClientLayerManager final : public LayerManager,
                                  public MemoryPressureListener {
@@ -356,9 +375,7 @@
 
   virtual ClientPaintedLayer* AsThebes() { return nullptr; }
 
-  static inline ClientLayer* ToClientLayer(Layer* aLayer) {
-    return static_cast<ClientLayer*>(aLayer->ImplData());
-  }
+  static ClientLayer* ToClientLayer(Layer* aLayer);
 
   template <typename LayerType>
   static inline void RenderMaskLayers(LayerType* aLayer) {
diff -Nru firefox-84.0.2+build1/gfx/layers/client/MultiTiledContentClient.cpp firefox-85.0+build1/gfx/layers/client/MultiTiledContentClient.cpp
--- firefox-84.0.2+build1/gfx/layers/client/MultiTiledContentClient.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/MultiTiledContentClient.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "ClientTiledPaintedLayer.h"
 #include "mozilla/StaticPrefs_layers.h"
+#include "mozilla/layers/APZUtils.h"
 #include "mozilla/layers/LayerMetricsWrapper.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/client/TextureClient.cpp firefox-85.0+build1/gfx/layers/client/TextureClient.cpp
--- firefox-84.0.2+build1/gfx/layers/client/TextureClient.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/TextureClient.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include <stdint.h>  // for uint8_t, uint32_t, etc
 
 #include "BufferTexture.h"
+#include "GeckoProfiler.h"
 #include "IPDLActor.h"
 #include "ImageContainer.h"  // for PlanarYCbCrData, etc
 #include "Layers.h"          // for Layer, etc
diff -Nru firefox-84.0.2+build1/gfx/layers/client/TextureRecorded.cpp firefox-85.0+build1/gfx/layers/client/TextureRecorded.cpp
--- firefox-84.0.2+build1/gfx/layers/client/TextureRecorded.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/TextureRecorded.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -45,6 +45,9 @@
     mTextureId = sNextRecordedTextureId++;
     mCanvasChild->RecordEvent(RecordedNextTextureId(mTextureId));
     mDT = mCanvasChild->CreateDrawTarget(mSize, mFormat);
+    if (!mDT) {
+      return false;
+    }
 
     // We lock the TextureData when we create it to get the remote DrawTarget.
     mCanvasChild->OnTextureWriteLock();
diff -Nru firefox-84.0.2+build1/gfx/layers/client/TiledContentClient.cpp firefox-85.0+build1/gfx/layers/client/TiledContentClient.cpp
--- firefox-84.0.2+build1/gfx/layers/client/TiledContentClient.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/TiledContentClient.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -27,7 +27,8 @@
 #include "nsISupportsImpl.h"      // for gfxContext::AddRef, etc
 #include "nsExpirationTracker.h"  // for nsExpirationTracker
 #include "nsMathUtils.h"          // for NS_lroundf
-#include "UnitTransforms.h"       // for TransformTo
+#include "TiledLayerBuffer.h"
+#include "UnitTransforms.h"  // for TransformTo
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/UniquePtr.h"
 
diff -Nru firefox-84.0.2+build1/gfx/layers/client/TiledContentClient.h firefox-85.0+build1/gfx/layers/client/TiledContentClient.h
--- firefox-84.0.2+build1/gfx/layers/client/TiledContentClient.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/client/TiledContentClient.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,42 +7,36 @@
 #ifndef MOZILLA_GFX_TILEDCONTENTCLIENT_H
 #define MOZILLA_GFX_TILEDCONTENTCLIENT_H
 
-#include <stddef.h>   // for size_t
-#include <stdint.h>   // for uint16_t
-#include <algorithm>  // for swap
-#include <limits>
-#include "Layers.h"            // for LayerManager, etc
-#include "TiledLayerBuffer.h"  // for TiledLayerBuffer
-#include "Units.h"             // for CSSPoint
-#include "gfxTypes.h"
-#include "mozilla/Attributes.h"                 // for override
-#include "mozilla/gfx/2D.h"                     // for gfx::Tile
-#include "mozilla/RefPtr.h"                     // for RefPtr
-#include "mozilla/ipc/Shmem.h"                  // for Shmem
-#include "mozilla/ipc/SharedMemory.h"           // for SharedMemory
-#include "mozilla/layers/APZUtils.h"            // for AsyncTransform
+#include <cstdint>               // for uint64_t, uint16_t, uint8_t
+#include <iosfwd>                // for stringstream
+#include <utility>               // for move
+#include "ClientLayerManager.h"  // for ClientLayerManager
+#include "Units.h"  // for CSSToParentLayerScale2D, ParentLayerPoint, LayerIntRect, LayerRect, LayerToParent...
+#include "gfxTypes.h"               // for gfxContentType, gfxContentType::COLOR
+#include "mozilla/Maybe.h"          // for Maybe
+#include "mozilla/RefPtr.h"         // for RefPtr, operator==, operator!=
+#include "mozilla/TypedEnumBits.h"  // for CastableTypedEnumResult, UnsignedIntegerTypeForEnum, MOZ_MAKE_ENUM_CLASS_BITWISE_...
+#include "mozilla/gfx/2D.h"         // for DrawTarget, DrawTargetCapture
+#include "mozilla/gfx/Rect.h"       // for IntRect
 #include "mozilla/layers/CompositableClient.h"  // for CompositableClient
-#include "mozilla/layers/CompositorTypes.h"     // for TextureInfo, etc
-#include "mozilla/layers/LayersMessages.h"      // for TileDescriptor
-#include "mozilla/layers/LayersTypes.h"         // for TextureDumpMode
-#include "mozilla/layers/PaintThread.h"         // for CapturedTiledPaintState
-#include "mozilla/layers/TextureClient.h"
-#include "mozilla/layers/TextureClientPool.h"
-#include "ClientLayerManager.h"
-#include "mozilla/mozalloc.h"  // for operator delete
-#include "nsISupportsImpl.h"   // for MOZ_COUNT_DTOR
-#include "nsPoint.h"           // for nsIntPoint
-#include "nsRect.h"            // for mozilla::gfx::IntRect
-#include "nsRegion.h"          // for nsIntRegion
-#include "nsTArray.h"          // for nsTArray, nsTArray_Impl, etc
-#include "nsExpirationTracker.h"
-#include "mozilla/layers/ISurfaceAllocator.h"
+#include "mozilla/layers/CompositorTypes.h"  // for TextureInfo, CompositableType, CompositableType::CONTENT_TILED
+#include "mozilla/layers/LayerManager.h"  // for LayerManager, LayerManager::DrawPaintedLayerCallback
+#include "mozilla/layers/LayersMessages.h"  // for TileDescriptor
+#include "mozilla/layers/LayersTypes.h"  // for SurfaceMode, TextureDumpMode, Compress, SurfaceMode::SURFACE_OPAQUE
+#include "mozilla/layers/ShadowLayers.h"       // for ShadowLayerForwarder
+#include "mozilla/layers/TextureClient.h"      // for TextureClient
+#include "mozilla/layers/TextureClientPool.h"  // for TextureClientAllocator
+#include "nsExpirationTracker.h"               // for nsExpirationState
+#include "nsRegion.h"                          // for nsIntRegion
+#include "nsTArray.h"  // for AutoTArray, nsTArray (ptr only)
 
 namespace mozilla {
 namespace layers {
 
 class ClientTiledPaintedLayer;
-class ClientLayerManager;
+class LayerMetricsWrapper;
+struct AsyncTransform;
+struct FrameMetrics;
 
 enum class TilePaintFlags : uint8_t {
   None = 0x0,
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/CanvasLayerComposite.cpp firefox-85.0+build1/gfx/layers/composite/CanvasLayerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/CanvasLayerComposite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/CanvasLayerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,7 +13,8 @@
 #include "mozilla/gfx/Rect.h"            // for Rect
 #include "mozilla/layers/Compositor.h"   // for Compositor
 #include "mozilla/layers/Effects.h"      // for EffectChain
-#include "mozilla/mozalloc.h"            // for operator delete
+#include "mozilla/layers/LayerManagerCompositeUtils.h"
+#include "mozilla/mozalloc.h"  // for operator delete
 #include "nsAString.h"
 #include "mozilla/RefPtr.h"   // for nsRefPtr
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/ColorLayerComposite.cpp firefox-85.0+build1/gfx/layers/composite/ColorLayerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/ColorLayerComposite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/ColorLayerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -13,8 +13,9 @@
 #include "mozilla/layers/Compositor.h"       // for Compositor
 #include "mozilla/layers/CompositorTypes.h"  // for DiagnosticFlags::COLOR
 #include "mozilla/layers/Effects.h"          // for Effect, EffectChain, etc
-#include "mozilla/mozalloc.h"                // for operator delete, etc
-#include "UnitTransforms.h"                  // for ViewAs
+#include "mozilla/layers/LayerManagerCompositeUtils.h"
+#include "mozilla/mozalloc.h"  // for operator delete, etc
+#include "UnitTransforms.h"    // for ViewAs
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/ContainerLayerComposite.cpp firefox-85.0+build1/gfx/layers/composite/ContainerLayerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/ContainerLayerComposite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/ContainerLayerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -14,18 +14,20 @@
 #include "mozilla/RefPtr.h"      // for RefPtr
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_layers.h"
-#include "mozilla/UniquePtr.h"                      // for UniquePtr
-#include "mozilla/gfx/BaseRect.h"                   // for BaseRect
-#include "mozilla/gfx/Matrix.h"                     // for Matrix4x4
-#include "mozilla/gfx/Point.h"                      // for Point, IntPoint
-#include "mozilla/gfx/Rect.h"                       // for IntRect, Rect
-#include "mozilla/layers/APZSampler.h"              // for APZSampler
+#include "mozilla/UniquePtr.h"          // for UniquePtr
+#include "mozilla/gfx/BaseRect.h"       // for BaseRect
+#include "mozilla/gfx/Matrix.h"         // for Matrix4x4
+#include "mozilla/gfx/Point.h"          // for Point, IntPoint
+#include "mozilla/gfx/Rect.h"           // for IntRect, Rect
+#include "mozilla/layers/APZSampler.h"  // for APZSampler
+#include "mozilla/layers/BSPTree.h"
 #include "mozilla/layers/Compositor.h"              // for Compositor, etc
 #include "mozilla/layers/CompositorBridgeParent.h"  // for CompositorBridgeParent
 #include "mozilla/layers/CompositorTypes.h"  // for DiagnosticFlags::CONTAINER
 #include "mozilla/layers/Effects.h"          // for Effect, EffectChain, etc
 #include "mozilla/layers/TextureHost.h"      // for CompositingRenderTarget
 #include "mozilla/layers/APZUtils.h"         // for AsyncTransform
+#include "mozilla/layers/LayerManagerCompositeUtils.h"
 #include "mozilla/layers/LayerMetricsWrapper.h"  // for LayerMetricsWrapper
 #include "mozilla/layers/LayersHelpers.h"
 #include "mozilla/mozalloc.h"  // for operator delete, etc
@@ -40,10 +42,6 @@
 #include <vector>
 #include "GeckoProfiler.h"  // for GeckoProfiler
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"  // for LayerTranslationMarkerPayload
-#endif
-
 static mozilla::LazyLogModule sGfxCullLog("gfx.culling");
 #define CULLING_LOG(...) MOZ_LOG(sGfxCullLog, LogLevel::Debug, (__VA_ARGS__))
 
@@ -103,9 +101,37 @@
   }
 
   Point translation = transform.As2D().GetTranslation();
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("LayerTranslation", GRAPHICS,
-                                   LayerTranslationMarkerPayload,
-                                   (aLayer, translation, TimeStamp::Now()));
+
+  // Contains the translation applied to a 2d layer so we can track the layer
+  // position at each frame.
+  struct LayerTranslationMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("LayerTranslation");
+    }
+    static void StreamJSONMarkerData(
+        baseprofiler::SpliceableJSONWriter& aWriter,
+        ProfileBufferRawPointer<layers::Layer> aLayer, gfx::Point aPoint) {
+      const size_t bufferSize = 32;
+      char buffer[bufferSize];
+      SprintfLiteral(buffer, "%p", aLayer.mRawPointer);
+
+      aWriter.StringProperty("layer", buffer);
+      aWriter.IntProperty("x", aPoint.x);
+      aWriter.IntProperty("y", aPoint.y);
+    }
+    static MarkerSchema MarkerTypeDisplay() {
+      using MS = MarkerSchema;
+      MS schema{MS::Location::markerChart, MS::Location::markerTable};
+      schema.AddKeyLabelFormat("layer", "Layer", MS::Format::string);
+      schema.AddKeyLabelFormat("x", "X", MS::Format::integer);
+      schema.AddKeyLabelFormat("y", "Y", MS::Format::integer);
+      return schema;
+    }
+  };
+
+  profiler_add_marker("LayerTranslation", geckoprofiler::category::GRAPHICS, {},
+                      LayerTranslationMarker{},
+                      WrapProfileBufferRawPointer(aLayer), translation);
 #endif
 }
 
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/ImageLayerComposite.cpp firefox-85.0+build1/gfx/layers/composite/ImageLayerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/ImageLayerComposite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/ImageLayerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,18 +5,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ImageLayerComposite.h"
-#include "CompositableHost.h"            // for CompositableHost
-#include "Layers.h"                      // for WriteSnapshotToDumpFile, etc
-#include "gfx2DGlue.h"                   // for ToFilter
-#include "gfxEnv.h"                      // for gfxEnv
-#include "gfxRect.h"                     // for gfxRect
-#include "mozilla/Assertions.h"          // for MOZ_ASSERT, etc
-#include "mozilla/gfx/Matrix.h"          // for Matrix4x4
-#include "mozilla/gfx/Point.h"           // for IntSize, Point
-#include "mozilla/gfx/Rect.h"            // for Rect
-#include "mozilla/layers/Compositor.h"   // for Compositor
-#include "mozilla/layers/Effects.h"      // for EffectChain
-#include "mozilla/layers/ImageHost.h"    // for ImageHost
+#include "CompositableHost.h"           // for CompositableHost
+#include "Layers.h"                     // for WriteSnapshotToDumpFile, etc
+#include "gfx2DGlue.h"                  // for ToFilter
+#include "gfxEnv.h"                     // for gfxEnv
+#include "gfxRect.h"                    // for gfxRect
+#include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc
+#include "mozilla/gfx/Matrix.h"         // for Matrix4x4
+#include "mozilla/gfx/Point.h"          // for IntSize, Point
+#include "mozilla/gfx/Rect.h"           // for Rect
+#include "mozilla/layers/Compositor.h"  // for Compositor
+#include "mozilla/layers/Effects.h"     // for EffectChain
+#include "mozilla/layers/ImageHost.h"   // for ImageHost
+#include "mozilla/layers/LayerManagerCompositeUtils.h"
 #include "mozilla/layers/TextureHost.h"  // for TextureHost, etc
 #include "mozilla/mozalloc.h"            // for operator delete
 #include "nsAString.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/LayerManagerComposite.cpp firefox-85.0+build1/gfx/layers/composite/LayerManagerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/LayerManagerComposite.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/LayerManagerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,12 +12,13 @@
 #include "CompositableHost.h"         // for CompositableHost
 #include "ContainerLayerComposite.h"  // for ContainerLayerComposite, etc
 #include "Diagnostics.h"
-#include "FPSCounter.h"                    // for FPSState, FPSCounter
-#include "FrameMetrics.h"                  // for FrameMetrics
-#include "GeckoProfiler.h"                 // for profiler_*
-#include "ImageLayerComposite.h"           // for ImageLayerComposite
-#include "Layers.h"                        // for Layer, ContainerLayer, etc
-#include "LayerScope.h"                    // for LayerScope Tool
+#include "FPSCounter.h"           // for FPSState, FPSCounter
+#include "FrameMetrics.h"         // for FrameMetrics
+#include "GeckoProfiler.h"        // for profiler_*
+#include "ImageLayerComposite.h"  // for ImageLayerComposite
+#include "Layers.h"               // for Layer, ContainerLayer, etc
+#include "LayerScope.h"           // for LayerScope Tool
+#include "LayerTreeInvalidation.h"
 #include "protobuf/LayerScopePacket.pb.h"  // for protobuf (LayerScope)
 #include "PaintedLayerComposite.h"         // for PaintedLayerComposite
 #include "TiledContentHost.h"
@@ -46,9 +47,11 @@
 #include "mozilla/layers/Effects.h"              // for Effect, EffectChain, etc
 #include "mozilla/layers/LayerMetricsWrapper.h"  // for LayerMetricsWrapper
 #include "mozilla/layers/LayersTypes.h"          // for etc
-#include "mozilla/widget/CompositorWidget.h"     // for WidgetRenderingContext
-#include "ipc/CompositorBench.h"                 // for CompositorBench
-#include "ipc/ShadowLayerUtils.h"
+#include "mozilla/layers/NativeLayer.h"
+#include "mozilla/layers/UiCompositorControllerParent.h"
+#include "mozilla/widget/CompositorWidget.h"  // for WidgetRenderingContext
+#include "ipc/CompositorBench.h"              // for CompositorBench
+#include "ipc/SurfaceDescriptor.h"
 #include "mozilla/mozalloc.h"  // for operator new, etc
 #include "nsAppRunner.h"
 #include "mozilla/RefPtr.h"   // for nsRefPtr
@@ -588,6 +591,8 @@
 #endif
 }
 
+void LayerManagerComposite::SetRoot(Layer* aLayer) { mRoot = aLayer; }
+
 void LayerManagerComposite::UpdateAndRender() {
   mCompositionOpportunityId = mCompositionOpportunityId.Next();
 
@@ -1293,7 +1298,7 @@
 
   RecordFrame();
 
-  PayloadPresented();
+  PayloadPresented(TimeStamp::Now());
 
   // Our payload has now been presented.
   mPayload.Clear();
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/LayerManagerComposite.h firefox-85.0+build1/gfx/layers/composite/LayerManagerComposite.h
--- firefox-84.0.2+build1/gfx/layers/composite/LayerManagerComposite.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/LayerManagerComposite.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,36 +7,37 @@
 #ifndef GFX_LayerManagerComposite_H
 #define GFX_LayerManagerComposite_H
 
-#include <stdint.h>            // for int32_t, uint32_t
-#include "CompositableHost.h"  // for CompositableHost, ImageCompositeNotificationInfo
-#include "GLDefs.h"            // for GLenum
-#include "Layers.h"
-#include "Units.h"               // for ParentLayerIntRect
-#include "mozilla/Assertions.h"  // for MOZ_ASSERT, etc
-#include "mozilla/Attributes.h"  // for override
-#include "mozilla/RefPtr.h"      // for RefPtr, already_AddRefed
-#include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/Point.h"  // for IntSize
-#include "mozilla/gfx/Rect.h"   // for Rect
-#include "mozilla/gfx/Types.h"  // for SurfaceFormat
-#include "mozilla/layers/CompositionRecorder.h"
-#include "mozilla/layers/CompositorTypes.h"
-#include "mozilla/layers/Effects.h"  // for EffectChain
-#include "mozilla/layers/LayersMessages.h"
-#include "mozilla/layers/LayersTypes.h"  // for LayersBackend, etc
-#include "mozilla/Maybe.h"               // for Maybe
-#include "mozilla/RefPtr.h"
-#include "mozilla/UniquePtr.h"
-#include "nsAString.h"
-#include "mozilla/RefPtr.h"   // for nsRefPtr
-#include "nsCOMPtr.h"         // for already_AddRefed
-#include "nsDebug.h"          // for NS_ASSERTION
-#include "nsISupportsImpl.h"  // for Layer::AddRef, etc
-#include "nsRect.h"           // for mozilla::gfx::IntRect
-#include "nsRegion.h"         // for nsIntRegion
-#include "nscore.h"           // for nsAString, etc
-#include "LayerTreeInvalidation.h"
-#include "mozilla/layers/ScreenshotGrabber.h"
+#include <cstdint>             // for uint64_t, int32_t
+#include <deque>               // for deque
+#include <new>                 // for operator new
+#include <type_traits>         // for remove_reference<>::type
+#include <utility>             // for move, forward
+#include "CompositableHost.h"  // for ImageCompositeNotificationInfo
+#include "Units.h"  // for LayerIntRegion, ParentLayerIntRect, RenderTargetIntRect
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Assertions.h"  // for MOZ_CRASH, AssertionConditionType, MOZ_ASSERT, MOZ_AS...
+#include "mozilla/Maybe.h"        // for Maybe
+#include "mozilla/RefPtr.h"       // for RefPtr
+#include "mozilla/TimeStamp.h"    // for TimeStamp, BaseTimeDuration
+#include "mozilla/UniquePtr.h"    // for UniquePtr
+#include "mozilla/gfx/2D.h"       // for DrawTarget
+#include "mozilla/gfx/Matrix.h"   // for Matrix4x4
+#include "mozilla/gfx/Point.h"    // for IntSize
+#include "mozilla/gfx/Polygon.h"  // for Polygon
+#include "mozilla/gfx/Rect.h"     // for IntRect
+#include "mozilla/gfx/Types.h"    // for DeviceColor (ptr only), SurfaceFormat
+#include "mozilla/layers/CompositionRecorder.h"  // for CompositionRecorder, CollectedFrames (ptr only)
+#include "mozilla/layers/Compositor.h"  // for Compositor
+#include "mozilla/layers/CompositorTypes.h"  // for DiagnosticTypes, TextureFactoryIdentifier
+#include "mozilla/layers/LayerManager.h"  // for LayerManager::END_DEFAULT, LayerManager::EndTransacti...
+#include "mozilla/layers/LayersTypes.h"  // for CompositionOpportunityId, LayersBackend, LayersBacken...
+#include "mozilla/layers/ScreenshotGrabber.h"  // for ScreenshotGrabber
+#include "nsDebug.h"                           // for NS_WARNING
+#include "nsIThread.h"                         // for TimeDuration
+#include "nsRegion.h"                          // for nsIntRegion
+#include "nsRegionFwd.h"                       // for IntRegion
+#include "nsStringFwd.h"                       // for nsCString, nsAString
+#include "nsTArray.h"                          // for nsTArray
 
 class gfxContext;
 
@@ -45,30 +46,37 @@
 #endif
 
 namespace mozilla {
-namespace gfx {
-class DrawTarget;
-}  // namespace gfx
-
 namespace layers {
 
+class CanvasLayer;
 class CanvasLayerComposite;
+class ColorLayer;
 class ColorLayerComposite;
-class Compositor;
+class ContainerLayer;
 class ContainerLayerComposite;
 class Diagnostics;
 struct EffectChain;
 class ImageLayer;
 class ImageLayerComposite;
 class LayerComposite;
+class NativeLayer;
+class NativeLayerRoot;
 class RefLayerComposite;
+class PaintTiming;
+class PaintedLayer;
 class PaintedLayerComposite;
+class RefLayer;
+class SurfacePoolHandle;
 class TextRenderer;
+class TextureSourceProvider;
 class CompositingRenderTarget;
 struct FPSState;
 class PaintCounter;
 class LayerMLGPU;
 class LayerManagerMLGPU;
 class UiCompositorControllerParent;
+class Layer;
+struct LayerProperties;
 
 static const int kVisualWarningDuration = 150;  // ms
 
@@ -289,7 +297,7 @@
     MOZ_CRASH("GFX: Use EndTransaction(aTimeStamp)");
   }
 
-  void SetRoot(Layer* aLayer) override { mRoot = aLayer; }
+  void SetRoot(Layer* aLayer) override;
 
   // XXX[nrc]: never called, we should move this logic to ClientLayerManager
   // (bug 946926).
@@ -700,138 +708,6 @@
   gfx::IntRect mClearRect;
 };
 
-// Render aLayer using aCompositor and apply all mask layers of aLayer: The
-// layer's own mask layer (aLayer->GetMaskLayer()), and any ancestor mask
-// layers.
-// If more than one mask layer needs to be applied, we use intermediate surfaces
-// (CompositingRenderTargets) for rendering, applying one mask layer at a time.
-// Callers need to provide a callback function aRenderCallback that does the
-// actual rendering of the source. It needs to have the following form:
-// void (EffectChain& effectChain, const Rect& clipRect)
-// aRenderCallback is called exactly once, inside this function, unless aLayer's
-// visible region is completely clipped out (in that case, aRenderCallback won't
-// be called at all).
-// This function calls aLayer->AsHostLayer()->AddBlendModeEffect for the
-// final rendering pass.
-//
-// (This function should really live in LayerManagerComposite.cpp, but we
-// need to use templates for passing lambdas until bug 1164522 is resolved.)
-template <typename RenderCallbackType>
-void RenderWithAllMasks(Layer* aLayer, Compositor* aCompositor,
-                        const gfx::IntRect& aClipRect,
-                        RenderCallbackType aRenderCallback) {
-  Layer* firstMask = nullptr;
-  size_t maskLayerCount = 0;
-  size_t nextAncestorMaskLayer = 0;
-
-  size_t ancestorMaskLayerCount = aLayer->GetAncestorMaskLayerCount();
-  if (Layer* ownMask = aLayer->GetMaskLayer()) {
-    firstMask = ownMask;
-    maskLayerCount = ancestorMaskLayerCount + 1;
-    nextAncestorMaskLayer = 0;
-  } else if (ancestorMaskLayerCount > 0) {
-    firstMask = aLayer->GetAncestorMaskLayerAt(0);
-    maskLayerCount = ancestorMaskLayerCount;
-    nextAncestorMaskLayer = 1;
-  } else {
-    // no mask layers at all
-  }
-
-  if (maskLayerCount <= 1) {
-    // This is the common case. Render in one pass and return.
-    EffectChain effectChain(aLayer);
-    LayerManagerComposite::AutoAddMaskEffect autoMaskEffect(firstMask,
-                                                            effectChain);
-    static_cast<LayerComposite*>(aLayer->AsHostLayer())
-        ->AddBlendModeEffect(effectChain);
-    aRenderCallback(effectChain, aClipRect);
-    return;
-  }
-
-  // We have multiple mask layers.
-  // We split our list of mask layers into three parts:
-  //  (1) The first mask
-  //  (2) The list of intermediate masks (every mask except first and last)
-  //  (3) The final mask.
-  // Part (2) can be empty.
-  // For parts (1) and (2) we need to allocate intermediate surfaces to render
-  // into. The final mask gets rendered into the original render target.
-
-  // Calculate the size of the intermediate surfaces.
-  gfx::Rect visibleRect(
-      aLayer->GetLocalVisibleRegion().GetBounds().ToUnknownRect());
-  gfx::Matrix4x4 transform = aLayer->GetEffectiveTransform();
-  // TODO: Use RenderTargetIntRect and TransformBy here
-  gfx::IntRect surfaceRect = RoundedOut(
-      transform.TransformAndClipBounds(visibleRect, gfx::Rect(aClipRect)));
-  if (surfaceRect.IsEmpty()) {
-    return;
-  }
-
-  RefPtr<CompositingRenderTarget> originalTarget =
-      aCompositor->GetCurrentRenderTarget();
-
-  RefPtr<CompositingRenderTarget> firstTarget =
-      aCompositor->CreateRenderTarget(surfaceRect, INIT_MODE_CLEAR);
-  if (!firstTarget) {
-    return;
-  }
-
-  // Render the source while applying the first mask.
-  aCompositor->SetRenderTarget(firstTarget);
-  {
-    EffectChain firstEffectChain(aLayer);
-    LayerManagerComposite::AutoAddMaskEffect firstMaskEffect(firstMask,
-                                                             firstEffectChain);
-    aRenderCallback(firstEffectChain, aClipRect - surfaceRect.TopLeft());
-    // firstTarget now contains the transformed source with the first mask and
-    // opacity already applied.
-  }
-
-  // Apply the intermediate masks.
-  gfx::IntRect intermediateClip(surfaceRect - surfaceRect.TopLeft());
-  RefPtr<CompositingRenderTarget> previousTarget = firstTarget;
-  for (size_t i = nextAncestorMaskLayer; i < ancestorMaskLayerCount - 1; i++) {
-    Layer* intermediateMask = aLayer->GetAncestorMaskLayerAt(i);
-    RefPtr<CompositingRenderTarget> intermediateTarget =
-        aCompositor->CreateRenderTarget(surfaceRect, INIT_MODE_CLEAR);
-    if (!intermediateTarget) {
-      break;
-    }
-    aCompositor->SetRenderTarget(intermediateTarget);
-    EffectChain intermediateEffectChain(aLayer);
-    LayerManagerComposite::AutoAddMaskEffect intermediateMaskEffect(
-        intermediateMask, intermediateEffectChain);
-    if (intermediateMaskEffect.Failed()) {
-      continue;
-    }
-    intermediateEffectChain.mPrimaryEffect =
-        new EffectRenderTarget(previousTarget);
-    aCompositor->DrawQuad(gfx::Rect(surfaceRect), intermediateClip,
-                          intermediateEffectChain, 1.0, gfx::Matrix4x4());
-    previousTarget = intermediateTarget;
-  }
-
-  aCompositor->SetRenderTarget(originalTarget);
-
-  // Apply the final mask, rendering into originalTarget.
-  EffectChain finalEffectChain(aLayer);
-  finalEffectChain.mPrimaryEffect = new EffectRenderTarget(previousTarget);
-  Layer* finalMask = aLayer->GetAncestorMaskLayerAt(ancestorMaskLayerCount - 1);
-
-  // The blend mode needs to be applied in this final step, because this is
-  // where we're blending with the actual background (which is in
-  // originalTarget).
-  static_cast<LayerComposite*>(aLayer->AsHostLayer())
-      ->AddBlendModeEffect(finalEffectChain);
-  LayerManagerComposite::AutoAddMaskEffect autoMaskEffect(finalMask,
-                                                          finalEffectChain);
-  if (!autoMaskEffect.Failed()) {
-    aCompositor->DrawQuad(gfx::Rect(surfaceRect), aClipRect, finalEffectChain,
-                          1.0, gfx::Matrix4x4());
-  }
-}
-
 }  // namespace layers
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/LayerManagerCompositeUtils.h firefox-85.0+build1/gfx/layers/composite/LayerManagerCompositeUtils.h
--- firefox-84.0.2+build1/gfx/layers/composite/LayerManagerCompositeUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/LayerManagerCompositeUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,160 @@
+/* -*- 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 GFX_LayerManagerCompositeUtils_H
+#define GFX_LayerManagerCompositeUtils_H
+
+#include <cstddef>                 // for size_t
+#include "Layers.h"                // for Layer
+#include "Units.h"                 // for LayerIntRegion
+#include "mozilla/RefPtr.h"        // for RefPtr
+#include "mozilla/gfx/BaseRect.h"  // for operator-
+#include "mozilla/gfx/Matrix.h"    // for Matrix4x4
+#include "mozilla/gfx/Rect.h"  // for IntRect, Rect, RoundedOut, IntRectTyped
+#include "mozilla/layers/Compositor.h"  // for Compositor, INIT_MODE_CLEAR
+#include "mozilla/layers/Effects.h"     // for EffectChain, EffectRenderTarget
+#include "mozilla/layers/LayerManagerComposite.h"  // for LayerManagerComposite::AutoAddMaskEffect, LayerComposite, LayerManagerComposite
+#include "mozilla/layers/TextureHost.h"  // for CompositingRenderTarget
+
+namespace mozilla {
+namespace layers {
+
+// Render aLayer using aCompositor and apply all mask layers of aLayer: The
+// layer's own mask layer (aLayer->GetMaskLayer()), and any ancestor mask
+// layers.
+// If more than one mask layer needs to be applied, we use intermediate surfaces
+// (CompositingRenderTargets) for rendering, applying one mask layer at a time.
+// Callers need to provide a callback function aRenderCallback that does the
+// actual rendering of the source. It needs to have the following form:
+// void (EffectChain& effectChain, const Rect& clipRect)
+// aRenderCallback is called exactly once, inside this function, unless aLayer's
+// visible region is completely clipped out (in that case, aRenderCallback won't
+// be called at all).
+// This function calls aLayer->AsHostLayer()->AddBlendModeEffect for the
+// final rendering pass.
+//
+// (This function should really live in LayerManagerComposite.cpp, but we
+// need to use templates for passing lambdas until bug 1164522 is resolved.)
+template <typename RenderCallbackType>
+void RenderWithAllMasks(Layer* aLayer, Compositor* aCompositor,
+                        const gfx::IntRect& aClipRect,
+                        RenderCallbackType aRenderCallback) {
+  Layer* firstMask = nullptr;
+  size_t maskLayerCount = 0;
+  size_t nextAncestorMaskLayer = 0;
+
+  size_t ancestorMaskLayerCount = aLayer->GetAncestorMaskLayerCount();
+  if (Layer* ownMask = aLayer->GetMaskLayer()) {
+    firstMask = ownMask;
+    maskLayerCount = ancestorMaskLayerCount + 1;
+    nextAncestorMaskLayer = 0;
+  } else if (ancestorMaskLayerCount > 0) {
+    firstMask = aLayer->GetAncestorMaskLayerAt(0);
+    maskLayerCount = ancestorMaskLayerCount;
+    nextAncestorMaskLayer = 1;
+  } else {
+    // no mask layers at all
+  }
+
+  if (maskLayerCount <= 1) {
+    // This is the common case. Render in one pass and return.
+    EffectChain effectChain(aLayer);
+    LayerManagerComposite::AutoAddMaskEffect autoMaskEffect(firstMask,
+                                                            effectChain);
+    static_cast<LayerComposite*>(aLayer->AsHostLayer())
+        ->AddBlendModeEffect(effectChain);
+    aRenderCallback(effectChain, aClipRect);
+    return;
+  }
+
+  // We have multiple mask layers.
+  // We split our list of mask layers into three parts:
+  //  (1) The first mask
+  //  (2) The list of intermediate masks (every mask except first and last)
+  //  (3) The final mask.
+  // Part (2) can be empty.
+  // For parts (1) and (2) we need to allocate intermediate surfaces to render
+  // into. The final mask gets rendered into the original render target.
+
+  // Calculate the size of the intermediate surfaces.
+  gfx::Rect visibleRect(
+      aLayer->GetLocalVisibleRegion().GetBounds().ToUnknownRect());
+  gfx::Matrix4x4 transform = aLayer->GetEffectiveTransform();
+  // TODO: Use RenderTargetIntRect and TransformBy here
+  gfx::IntRect surfaceRect = RoundedOut(
+      transform.TransformAndClipBounds(visibleRect, gfx::Rect(aClipRect)));
+  if (surfaceRect.IsEmpty()) {
+    return;
+  }
+
+  RefPtr<CompositingRenderTarget> originalTarget =
+      aCompositor->GetCurrentRenderTarget();
+
+  RefPtr<CompositingRenderTarget> firstTarget =
+      aCompositor->CreateRenderTarget(surfaceRect, INIT_MODE_CLEAR);
+  if (!firstTarget) {
+    return;
+  }
+
+  // Render the source while applying the first mask.
+  aCompositor->SetRenderTarget(firstTarget);
+  {
+    EffectChain firstEffectChain(aLayer);
+    LayerManagerComposite::AutoAddMaskEffect firstMaskEffect(firstMask,
+                                                             firstEffectChain);
+    aRenderCallback(firstEffectChain, aClipRect - surfaceRect.TopLeft());
+    // firstTarget now contains the transformed source with the first mask and
+    // opacity already applied.
+  }
+
+  // Apply the intermediate masks.
+  gfx::IntRect intermediateClip(surfaceRect - surfaceRect.TopLeft());
+  RefPtr<CompositingRenderTarget> previousTarget = firstTarget;
+  for (size_t i = nextAncestorMaskLayer; i < ancestorMaskLayerCount - 1; i++) {
+    Layer* intermediateMask = aLayer->GetAncestorMaskLayerAt(i);
+    RefPtr<CompositingRenderTarget> intermediateTarget =
+        aCompositor->CreateRenderTarget(surfaceRect, INIT_MODE_CLEAR);
+    if (!intermediateTarget) {
+      break;
+    }
+    aCompositor->SetRenderTarget(intermediateTarget);
+    EffectChain intermediateEffectChain(aLayer);
+    LayerManagerComposite::AutoAddMaskEffect intermediateMaskEffect(
+        intermediateMask, intermediateEffectChain);
+    if (intermediateMaskEffect.Failed()) {
+      continue;
+    }
+    intermediateEffectChain.mPrimaryEffect =
+        new EffectRenderTarget(previousTarget);
+    aCompositor->DrawQuad(gfx::Rect(surfaceRect), intermediateClip,
+                          intermediateEffectChain, 1.0, gfx::Matrix4x4());
+    previousTarget = intermediateTarget;
+  }
+
+  aCompositor->SetRenderTarget(originalTarget);
+
+  // Apply the final mask, rendering into originalTarget.
+  EffectChain finalEffectChain(aLayer);
+  finalEffectChain.mPrimaryEffect = new EffectRenderTarget(previousTarget);
+  Layer* finalMask = aLayer->GetAncestorMaskLayerAt(ancestorMaskLayerCount - 1);
+
+  // The blend mode needs to be applied in this final step, because this is
+  // where we're blending with the actual background (which is in
+  // originalTarget).
+  static_cast<LayerComposite*>(aLayer->AsHostLayer())
+      ->AddBlendModeEffect(finalEffectChain);
+  LayerManagerComposite::AutoAddMaskEffect autoMaskEffect(finalMask,
+                                                          finalEffectChain);
+  if (!autoMaskEffect.Failed()) {
+    aCompositor->DrawQuad(gfx::Rect(surfaceRect), aClipRect, finalEffectChain,
+                          1.0, gfx::Matrix4x4());
+  }
+}
+
+}  // namespace layers
+}  // namespace mozilla
+
+#endif /* GFX_LayerManagerCompositeUtils_H */
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/PaintedLayerComposite.cpp firefox-85.0+build1/gfx/layers/composite/PaintedLayerComposite.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/PaintedLayerComposite.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/PaintedLayerComposite.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -18,7 +18,8 @@
 #include "mozilla/layers/Compositor.h"   // for Compositor
 #include "mozilla/layers/ContentHost.h"  // for ContentHost
 #include "mozilla/layers/Effects.h"      // for EffectChain
-#include "mozilla/mozalloc.h"            // for operator delete
+#include "mozilla/layers/LayerManagerCompositeUtils.h"
+#include "mozilla/mozalloc.h"  // for operator delete
 #include "nsAString.h"
 #include "mozilla/RefPtr.h"   // for nsRefPtr
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/TextureHost.cpp firefox-85.0+build1/gfx/layers/composite/TextureHost.cpp
--- firefox-84.0.2+build1/gfx/layers/composite/TextureHost.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/TextureHost.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -707,10 +707,10 @@
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
 
-  auto imageType =
-      UseExternalTextures() || gfx::gfxVars::UseSoftwareWebRender()
-          ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Rect)
-          : wr::ExternalImageType::Buffer();
+  auto imageType = UseExternalTextures() || gfx::gfxVars::UseSoftwareWebRender()
+                       ? wr::ExternalImageType::TextureHandle(
+                             wr::ImageBufferKind::TextureRect)
+                       : wr::ExternalImageType::Buffer();
 
   if (GetFormat() != gfx::SurfaceFormat::YUV) {
     MOZ_ASSERT(aImageKeys.length() == 1);
diff -Nru firefox-84.0.2+build1/gfx/layers/composite/TextureHost.h firefox-85.0+build1/gfx/layers/composite/TextureHost.h
--- firefox-84.0.2+build1/gfx/layers/composite/TextureHost.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/composite/TextureHost.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,18 +7,17 @@
 #ifndef MOZILLA_GFX_TEXTUREHOST_H
 #define MOZILLA_GFX_TEXTUREHOST_H
 
-#include <functional>
-#include <stddef.h>  // for size_t
-#include <stdint.h>  // for uint64_t, uint32_t, uint8_t
-#include "gfxTypes.h"
+#include <stddef.h>              // for size_t
+#include <stdint.h>              // for uint64_t, uint32_t, uint8_t
 #include "mozilla/Assertions.h"  // for MOZ_ASSERT, etc
 #include "mozilla/Attributes.h"  // for override
 #include "mozilla/RefPtr.h"      // for RefPtr, already_AddRefed, etc
-#include "mozilla/gfx/2D.h"      // for DataSourceSurface
-#include "mozilla/gfx/Point.h"   // for IntSize, IntPoint
-#include "mozilla/gfx/Types.h"   // for SurfaceFormat, etc
+#include "mozilla/gfx/Logging.h"
+#include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/Point.h"  // for IntSize, IntPoint
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/Types.h"  // for SurfaceFormat, etc
 #include "mozilla/ipc/FileDescriptor.h"
-#include "mozilla/layers/Compositor.h"       // for Compositor
 #include "mozilla/layers/CompositorTypes.h"  // for TextureFlags, etc
 #include "mozilla/layers/LayersTypes.h"      // for LayerRenderState, etc
 #include "mozilla/layers/LayersSurfaces.h"
@@ -29,14 +28,18 @@
 #include "nsCOMPtr.h"         // for already_AddRefed
 #include "nsDebug.h"          // for NS_WARNING
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
-#include "nsRegion.h"         // for nsIntRegion
-#include "nsTraceRefcnt.h"    // for MOZ_COUNT_CTOR, etc
-#include "nscore.h"           // for nsACString
+#include "nsRect.h"
+#include "nsRegion.h"       // for nsIntRegion
+#include "nsTraceRefcnt.h"  // for MOZ_COUNT_CTOR, etc
+#include "nscore.h"         // for nsACString
 #include "mozilla/layers/AtomicRefCountedWithFinalize.h"
-#include "mozilla/gfx/Rect.h"
 
 class MacIOSurface;
 namespace mozilla {
+namespace gfx {
+class DataSourceSurface;
+}
+
 namespace ipc {
 class Shmem;
 }  // namespace ipc
@@ -66,6 +69,7 @@
 class TextureSourceOGL;
 class TextureSourceD3D11;
 class TextureSourceBasic;
+class TextureSourceProvider;
 class DataTextureSource;
 class PTextureParent;
 class TextureParent;
diff -Nru firefox-84.0.2+build1/gfx/layers/CompositorAnimationStorage.cpp firefox-85.0+build1/gfx/layers/CompositorAnimationStorage.cpp
--- firefox-84.0.2+build1/gfx/layers/CompositorAnimationStorage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/CompositorAnimationStorage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/layers/LayerManagerComposite.h"  // for LayerComposite, etc
 #include "mozilla/layers/LayerMetricsWrapper.h"    // for LayerMetricsWrapper
 #include "mozilla/layers/OMTAController.h"         // for OMTAController
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ServoStyleConsts.h"
 #include "mozilla/webrender/WebRenderTypes.h"  // for ToWrTransformProperty, etc
 #include "nsDeviceContext.h"                   // for AppUnitsPerCSSPixel
diff -Nru firefox-84.0.2+build1/gfx/layers/CompositorAnimationStorage.h firefox-85.0+build1/gfx/layers/CompositorAnimationStorage.h
--- firefox-84.0.2+build1/gfx/layers/CompositorAnimationStorage.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/CompositorAnimationStorage.h	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,9 @@
 #include "mozilla/layers/LayersMessages.h"  // for TransformData, etc
 #include "mozilla/webrender/webrender_ffi.h"
 #include "mozilla/Variant.h"
+#include "nsClassHashtable.h"
 #include "X11UndefineNone.h"
+#include <memory>
 #include <unordered_map>
 #include <unordered_set>
 
diff -Nru firefox-84.0.2+build1/gfx/layers/d3d11/CompositorD3D11.cpp firefox-85.0+build1/gfx/layers/d3d11/CompositorD3D11.cpp
--- firefox-84.0.2+build1/gfx/layers/d3d11/CompositorD3D11.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/d3d11/CompositorD3D11.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -251,6 +251,12 @@
     if (!mSwapChain)
 #endif
     {
+      if (mWidget->AsWindows()->GetCompositorHwnd()) {
+        // Destroy compositor window.
+        mWidget->AsWindows()->DestroyCompositorWindow();
+        mHwnd = mWidget->AsWindows()->GetHwnd();
+      }
+
       DXGI_SWAP_CHAIN_DESC swapDesc;
       ::ZeroMemory(&swapDesc, sizeof(swapDesc));
       swapDesc.BufferDesc.Width = 0;
@@ -1425,7 +1431,7 @@
   mSwapChain->GetDesc(&desc);
 
   if (desc.BufferDesc.Width == size.width &&
-      desc.BufferDesc.Height == size.height) {
+      desc.BufferDesc.Height == size.height && size == mBufferSize) {
     mSwapChain->Present(0, 0);
     if (mIsDoubleBuffered) {
       // Make sure we present what was the front buffer before that we know is
@@ -1528,6 +1534,9 @@
     gfxCriticalNote << "D3D11 swap resize buffers failed " << hexa(hr) << " on "
                     << mSize;
     HandleError(hr);
+    mBufferSize = LayoutDeviceIntSize();
+  } else {
+    mBufferSize = mSize;
   }
 
   mBackBufferInvalid = mFrontBufferInvalid =
diff -Nru firefox-84.0.2+build1/gfx/layers/d3d11/CompositorD3D11.h firefox-85.0+build1/gfx/layers/d3d11/CompositorD3D11.h
--- firefox-84.0.2+build1/gfx/layers/d3d11/CompositorD3D11.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/d3d11/CompositorD3D11.h	2021-01-18 19:58:11.000000000 +0000
@@ -258,6 +258,10 @@
 
   LayoutDeviceIntSize mSize;
 
+  // The size that we passed to ResizeBuffers to set
+  // the swapchain buffer size.
+  LayoutDeviceIntSize mBufferSize;
+
   HWND mHwnd;
 
   D3D_FEATURE_LEVEL mFeatureLevel;
diff -Nru firefox-84.0.2+build1/gfx/layers/d3d11/TextureD3D11.cpp firefox-85.0+build1/gfx/layers/d3d11/TextureD3D11.cpp
--- firefox-84.0.2+build1/gfx/layers/d3d11/TextureD3D11.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/d3d11/TextureD3D11.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1012,11 +1012,11 @@
       MOZ_ASSERT(aImageKeys.length() == 1);
 
       wr::ImageDescriptor descriptor(mSize, GetFormat());
-      auto imageType =
-          gfx::gfxVars::UseSoftwareWebRender()
-              ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Rect)
-              : wr::ExternalImageType::TextureHandle(
-                    wr::TextureTarget::External);
+      auto imageType = gfx::gfxVars::UseSoftwareWebRender()
+                           ? wr::ExternalImageType::TextureHandle(
+                                 wr::ImageBufferKind::TextureRect)
+                           : wr::ExternalImageType::TextureHandle(
+                                 wr::ImageBufferKind::TextureExternal);
       (aResources.*method)(aImageKeys[0], descriptor, aExtID, imageType, 0);
       break;
     }
@@ -1034,11 +1034,11 @@
                                       mFormat == gfx::SurfaceFormat::NV12
                                           ? gfx::SurfaceFormat::R8G8
                                           : gfx::SurfaceFormat::R16G16);
-      auto imageType =
-          gfx::gfxVars::UseSoftwareWebRender()
-              ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Rect)
-              : wr::ExternalImageType::TextureHandle(
-                    wr::TextureTarget::External);
+      auto imageType = gfx::gfxVars::UseSoftwareWebRender()
+                           ? wr::ExternalImageType::TextureHandle(
+                                 wr::ImageBufferKind::TextureRect)
+                           : wr::ExternalImageType::TextureHandle(
+                                 wr::ImageBufferKind::TextureExternal);
       (aResources.*method)(aImageKeys[0], descriptor0, aExtID, imageType, 0);
       (aResources.*method)(aImageKeys[1], descriptor1, aExtID, imageType, 1);
       break;
@@ -1081,7 +1081,6 @@
     case gfx::SurfaceFormat::P016:
     case gfx::SurfaceFormat::NV12: {
       MOZ_ASSERT(aImageKeys.length() == 2);
-      bool supportsExternalCompositing = false;
       // XXX Add P010 and P016 support.
       if (GetFormat() == gfx::SurfaceFormat::NV12 &&
           gfx::gfxVars::UseWebRenderDCompVideoOverlayWin()) {
@@ -1286,10 +1285,11 @@
   auto method = aOp == TextureHost::ADD_IMAGE
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
-  auto imageType =
-      gfx::gfxVars::UseSoftwareWebRender()
-          ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Rect)
-          : wr::ExternalImageType::TextureHandle(wr::TextureTarget::External);
+  auto imageType = gfx::gfxVars::UseSoftwareWebRender()
+                       ? wr::ExternalImageType::TextureHandle(
+                             wr::ImageBufferKind::TextureRect)
+                       : wr::ExternalImageType::TextureHandle(
+                             wr::ImageBufferKind::TextureExternal);
 
   // y
   wr::ImageDescriptor descriptor0(mSizeY, gfx::SurfaceFormat::A8);
diff -Nru firefox-84.0.2+build1/gfx/layers/DMABUFSurfaceImage.cpp firefox-85.0+build1/gfx/layers/DMABUFSurfaceImage.cpp
--- firefox-84.0.2+build1/gfx/layers/DMABUFSurfaceImage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/DMABUFSurfaceImage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,16 +5,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DMABUFSurfaceImage.h"
-#include "gfxPlatform.h"
+#include "mozilla/widget/DMABufSurface.h"
 #include "mozilla/layers/CompositableClient.h"
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/DMABUFTextureClientOGL.h"
-#include "mozilla/UniquePtr.h"
+#include "mozilla/layers/TextureForwarder.h"
 
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::gfx;
 
+DMABUFSurfaceImage::DMABUFSurfaceImage(DMABufSurface* aSurface)
+    : Image(nullptr, ImageFormat::DMABUF), mSurface(aSurface) {
+  mSurface->GlobalRefAdd();
+}
+
+DMABUFSurfaceImage::~DMABUFSurfaceImage() { mSurface->GlobalRefRelease(); }
+
 TextureClient* DMABUFSurfaceImage::GetTextureClient(
     KnowsCompositor* aKnowsCompositor) {
   if (!mTextureClient) {
@@ -25,3 +32,7 @@
   }
   return mTextureClient;
 }
+
+gfx::IntSize DMABUFSurfaceImage::GetSize() const {
+  return gfx::IntSize::Truncate(mSurface->GetWidth(), mSurface->GetHeight());
+}
diff -Nru firefox-84.0.2+build1/gfx/layers/DMABUFSurfaceImage.h firefox-85.0+build1/gfx/layers/DMABUFSurfaceImage.h
--- firefox-84.0.2+build1/gfx/layers/DMABUFSurfaceImage.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/DMABUFSurfaceImage.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,32 +8,24 @@
 #define SURFACE_DMABUF_H
 
 #include "ImageContainer.h"
-#include "mozilla/widget/DMABufSurface.h"
-#include "mozilla/gfx/Point.h"
-#include "mozilla/layers/TextureClient.h"
+
+class DMABufSurface;
 
 namespace mozilla {
 namespace layers {
 
+class TextureClient;
+
 class DMABUFSurfaceImage : public Image {
  public:
-  explicit DMABUFSurfaceImage(DMABufSurface* aSurface)
-      : Image(nullptr, ImageFormat::DMABUF), mSurface(aSurface) {
-    mSurface->GlobalRefAdd();
-  }
-
-  ~DMABUFSurfaceImage() { mSurface->GlobalRefRelease(); }
+  explicit DMABUFSurfaceImage(DMABufSurface* aSurface);
+  ~DMABUFSurfaceImage();
 
   DMABufSurface* GetSurface() { return mSurface; }
-
-  gfx::IntSize GetSize() const override {
-    return gfx::IntSize::Truncate(mSurface->GetWidth(), mSurface->GetHeight());
-  }
-
+  gfx::IntSize GetSize() const override;
   already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override {
     return nullptr;
   }
-
   TextureClient* GetTextureClient(KnowsCompositor* aKnowsCompositor) override;
 
  private:
diff -Nru firefox-84.0.2+build1/gfx/layers/Effects.h firefox-85.0+build1/gfx/layers/Effects.h
--- firefox-84.0.2+build1/gfx/layers/Effects.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/Effects.h	2021-01-18 19:58:11.000000000 +0000
@@ -14,10 +14,9 @@
 #include "mozilla/gfx/Rect.h"    // for Rect
 #include "mozilla/gfx/Types.h"   // for SamplingFilter, etc
 #include "mozilla/layers/CompositorTypes.h"  // for EffectTypes, etc
-#include "mozilla/layers/LayersTypes.h"
-#include "mozilla/layers/TextureHost.h"  // for CompositingRenderTarget, etc
-#include "mozilla/mozalloc.h"            // for operator delete, etc
-#include "nscore.h"                      // for nsACString
+#include "mozilla/layers/TextureHost.h"      // for CompositingRenderTarget, etc
+#include "mozilla/mozalloc.h"                // for operator delete, etc
+#include "nscore.h"                          // for nsACString
 #include "mozilla/EnumeratedArray.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/ImageContainer.cpp firefox-85.0+build1/gfx/layers/ImageContainer.cpp
--- firefox-84.0.2+build1/gfx/layers/ImageContainer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ImageContainer.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <string.h>  // for memcpy, memset
 
+#include "GeckoProfiler.h"
 #include "GLImages.h"    // for SurfaceTextureImage
 #include "YCbCrUtils.h"  // for YCbCr conversions
 #include "gfx2DGlue.h"
@@ -29,6 +30,7 @@
 #include "mozilla/layers/SharedRGBImage.h"
 #include "mozilla/layers/SharedSurfacesChild.h"  // for SharedSurfacesAnimation
 #include "mozilla/layers/TextureClientRecycleAllocator.h"
+#include "nsProxyRelease.h"
 #include "nsISupportsUtils.h"  // for NS_IF_ADDREF
 
 #ifdef XP_MACOSX
diff -Nru firefox-84.0.2+build1/gfx/layers/ImageContainer.h firefox-85.0+build1/gfx/layers/ImageContainer.h
--- firefox-84.0.2+build1/gfx/layers/ImageContainer.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ImageContainer.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,28 +7,24 @@
 #ifndef GFX_IMAGECONTAINER_H
 #define GFX_IMAGECONTAINER_H
 
-#include <stdint.h>     // for uint32_t, uint8_t, uint64_t
-#include <sys/types.h>  // for int32_t
-#include "gfxTypes.h"
-#include "ImageTypes.h"              // for ImageFormat, etc
+#include <stdint.h>      // for int32_t, uint32_t, uint8_t, uint64_t
+#include "ImageTypes.h"  // for ImageFormat, etc
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"      // for MOZ_ASSERT_HELPER2
 #include "mozilla/Mutex.h"           // for Mutex
 #include "mozilla/RecursiveMutex.h"  // for RecursiveMutex, etc
 #include "mozilla/ThreadSafeWeakPtr.h"
-#include "mozilla/TimeStamp.h"           // for TimeStamp
-#include "mozilla/gfx/Point.h"           // For IntSize
+#include "mozilla/TimeStamp.h"  // for TimeStamp
+#include "mozilla/gfx/Point.h"  // For IntSize
+#include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/Types.h"           // For ColorDepth
 #include "mozilla/layers/LayersTypes.h"  // for LayersBackend, etc
 #include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/mozalloc.h"  // for operator delete, etc
-#include "nsCOMPtr.h"          // for already_AddRefed
 #include "nsDebug.h"           // for NS_ASSERTION
 #include "nsISupportsImpl.h"   // for Image::Release, etc
-#include "nsRect.h"            // for mozilla::gfx::IntRect
 #include "nsTArray.h"          // for nsTArray
 #include "mozilla/Atomics.h"
-#include "mozilla/WeakPtr.h"
-#include "nsThreadUtils.h"
 #include "mozilla/gfx/2D.h"
 #include "nsDataHashtable.h"
 #include "mozilla/EnumeratedArray.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CanvasChild.cpp firefox-85.0+build1/gfx/layers/ipc/CanvasChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CanvasChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CanvasChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/gfx/Tools.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/Point.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProcessChild.h"
 #include "mozilla/layers/CanvasDrawEventRecorder.h"
 #include "nsIObserverService.h"
@@ -178,6 +179,7 @@
 }
 
 void CanvasChild::OnTextureWriteLock() {
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return;
   }
@@ -187,6 +189,7 @@
 }
 
 void CanvasChild::OnTextureForwarded() {
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return;
   }
@@ -202,6 +205,7 @@
 }
 
 void CanvasChild::EnsureBeginTransaction() {
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return;
   }
@@ -213,6 +217,7 @@
 }
 
 void CanvasChild::EndTransaction() {
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return;
   }
@@ -245,7 +250,10 @@
 
 already_AddRefed<gfx::DrawTarget> CanvasChild::CreateDrawTarget(
     gfx::IntSize aSize, gfx::SurfaceFormat aFormat) {
-  MOZ_ASSERT(mRecorder);
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
+  if (!mRecorder) {
+    return nullptr;
+  }
 
   RefPtr<gfx::DrawTarget> dummyDt = gfx::Factory::CreateDrawTarget(
       gfx::BackendType::SKIA, gfx::IntSize(1, 1), aFormat);
@@ -255,6 +263,7 @@
 }
 
 void CanvasChild::RecordEvent(const gfx::RecordedEvent& aEvent) {
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return;
   }
@@ -267,6 +276,7 @@
   MOZ_DIAGNOSTIC_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aSurface);
 
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return nullptr;
   }
@@ -303,6 +313,7 @@
 already_AddRefed<gfx::SourceSurface> CanvasChild::WrapSurface(
     const RefPtr<gfx::SourceSurface>& aSurface) {
   MOZ_ASSERT(aSurface);
+  // We drop mRecorder in ActorDestroy to break the reference cycle.
   if (!mRecorder) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CanvasTranslator.cpp firefox-85.0+build1/gfx/layers/ipc/CanvasTranslator.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CanvasTranslator.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CanvasTranslator.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/GPUParent.h"
 #include "mozilla/gfx/Logging.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/TextureClient.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositableForwarder.cpp firefox-85.0+build1/gfx/layers/ipc/CompositableForwarder.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositableForwarder.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositableForwarder.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,15 @@
+/* -*- 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 "CompositableForwarder.h"
+
+#include "mozilla/layers/CompositableClient.h"
+#include "mozilla/layers/TextureClient.h"
+
+namespace mozilla::layers {
+CompositableForwarder::CompositableForwarder() = default;
+CompositableForwarder::~CompositableForwarder() = default;
+}  // namespace mozilla::layers
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositableForwarder.h firefox-85.0+build1/gfx/layers/ipc/CompositableForwarder.h
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositableForwarder.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositableForwarder.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,30 +7,25 @@
 #ifndef MOZILLA_LAYERS_COMPOSITABLEFORWARDER
 #define MOZILLA_LAYERS_COMPOSITABLEFORWARDER
 
-#include <stdint.h>  // for int32_t, uint64_t
-#include "gfxTypes.h"
-#include "mozilla/Attributes.h"  // for override
-#include "mozilla/UniquePtr.h"
-#include "mozilla/layers/CompositableClient.h"  // for CompositableClient
-#include "mozilla/layers/CompositorTypes.h"
-#include "mozilla/layers/ISurfaceAllocator.h"  // for ISurfaceAllocator
-#include "mozilla/layers/LayersTypes.h"        // for LayersBackend
-#include "mozilla/layers/TextureClient.h"      // for TextureClient
-#include "mozilla/layers/TextureForwarder.h"   // for TextureForwarder
-#include "nsRegion.h"                          // for nsIntRegion
-#include "mozilla/gfx/Rect.h"
-#include "nsHashKeys.h"
-#include "nsTHashtable.h"
+#include <stdint.h>  // for int32_t, uint32_t, uint64_t
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER1
+#include "mozilla/RefPtr.h"                  // for RefPtr
+#include "mozilla/TimeStamp.h"               // for TimeStamp
+#include "mozilla/layers/KnowsCompositor.h"  // for KnowsCompositor
+#include "nsRect.h"                          // for nsIntRect
+#include "nsRegion.h"                        // for nsIntRegion
+#include "nsTArray.h"                        // for nsTArray
 
 namespace mozilla {
 namespace layers {
-
 class CompositableClient;
+class CompositableHandle;
 class ImageContainer;
-class SurfaceDescriptor;
+class PTextureChild;
+class ShadowLayerForwarder;
 class SurfaceDescriptorTiles;
+class TextureClient;
 class ThebesBufferData;
-class PTextureChild;
 
 /**
  * A transaction is a set of changes that happenned on the content side, that
@@ -48,6 +43,9 @@
  */
 class CompositableForwarder : public KnowsCompositor {
  public:
+  CompositableForwarder();
+  ~CompositableForwarder();
+
   /**
    * Setup the IPDL actor for aCompositable to be part of layers
    * transactions.
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeChild.cpp firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -28,6 +28,7 @@
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/Logging.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/webgpu/WebGPUChild.h"
 #include "mozilla/mozalloc.h"  // for operator new, etc
 #include "mozilla/Telemetry.h"
@@ -41,6 +42,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Unused.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsThreadUtils.h"
 #if defined(XP_WIN)
 #  include "WinUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeChild.h firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeChild.h
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeChild.h	2021-01-18 19:58:11.000000000 +0000
@@ -51,6 +51,7 @@
 class CompositorBridgeParent;
 class CompositorManagerChild;
 class CompositorOptions;
+class LayerManager;
 class TextureClient;
 class TextureClientPool;
 struct FrameMetrics;
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeParent.cpp firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -60,6 +60,7 @@
 #include "mozilla/layers/OMTASampler.h"
 #include "mozilla/layers/PLayerTransactionParent.h"
 #include "mozilla/layers/RemoteContentController.h"
+#include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/layers/WebRenderBridgeParent.h"
 #include "mozilla/layers/AsyncImagePipelineManager.h"
 #include "mozilla/webrender/WebRenderAPI.h"
@@ -90,9 +91,6 @@
 #include "mozilla/HalTypes.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "mozilla/VsyncDispatcher.h"
 #if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
 #  include "VsyncSource.h"
@@ -115,7 +113,6 @@
 using namespace mozilla::gfx;
 
 using base::ProcessId;
-using base::Thread;
 
 using mozilla::Telemetry::LABELS_CONTENT_FRAME_TIME_REASON;
 
@@ -704,13 +701,6 @@
                         this, &CompositorBridgeParent::ScheduleComposition));
 }
 
-void CompositorBridgeParent::InvalidateOnCompositorThread() {
-  MOZ_ASSERT(CompositorThread());
-  CompositorThread()->Dispatch(
-      NewRunnableMethod("layers::CompositorBridgeParent::Invalidate", this,
-                        &CompositorBridgeParent::Invalidate));
-}
-
 void CompositorBridgeParent::PauseComposition() {
   MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread(),
              "PauseComposition() can only be called on the compositor thread");
@@ -797,53 +787,6 @@
   ResumeComposition();
 }
 
-/*
- * This will execute a pause synchronously, waiting to make sure that the
- * compositor really is paused.
- */
-void CompositorBridgeParent::SchedulePauseOnCompositorThread() {
-  MonitorAutoLock lock(mPauseCompositionMonitor);
-
-  MOZ_ASSERT(CompositorThread());
-  CompositorThread()->Dispatch(
-      NewRunnableMethod("layers::CompositorBridgeParent::PauseComposition",
-                        this, &CompositorBridgeParent::PauseComposition));
-
-  // Wait until the pause has actually been processed by the compositor thread
-  lock.Wait();
-}
-
-bool CompositorBridgeParent::ScheduleResumeOnCompositorThread() {
-  MonitorAutoLock lock(mResumeCompositionMonitor);
-
-  MOZ_ASSERT(CompositorThread());
-  CompositorThread()->Dispatch(
-      NewRunnableMethod("layers::CompositorBridgeParent::ResumeComposition",
-                        this, &CompositorBridgeParent::ResumeComposition));
-
-  // Wait until the resume has actually been processed by the compositor thread
-  lock.Wait();
-
-  return !mPaused;
-}
-
-bool CompositorBridgeParent::ScheduleResumeOnCompositorThread(int x, int y,
-                                                              int width,
-                                                              int height) {
-  MonitorAutoLock lock(mResumeCompositionMonitor);
-
-  MOZ_ASSERT(CompositorThread());
-  CompositorThread()->Dispatch(NewRunnableMethod<int, int, int, int>(
-      "layers::CompositorBridgeParent::ResumeCompositionAndResize", this,
-      &CompositorBridgeParent::ResumeCompositionAndResize, x, y, width,
-      height));
-
-  // Wait until the resume has actually been processed by the compositor thread
-  lock.Wait();
-
-  return !mPaused;
-}
-
 void CompositorBridgeParent::UpdatePaintTime(LayerTransactionParent* aLayerTree,
                                              const TimeDuration& aPaintTime) {
   // We get a lot of paint timings for things with empty transactions.
@@ -2230,8 +2173,23 @@
 static void InsertVsyncProfilerMarker(TimeStamp aVsyncTimestamp) {
   MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
   if (profiler_thread_is_being_profiled()) {
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("VsyncTimestamp", GRAPHICS,
-                                     VsyncMarkerPayload, (aVsyncTimestamp));
+    // Tracks when a vsync occurs according to the HardwareComposer.
+    struct VsyncMarker {
+      static constexpr mozilla::Span<const char> MarkerTypeName() {
+        return mozilla::MakeStringSpan("VsyncTimestamp");
+      }
+      static void StreamJSONMarkerData(
+          baseprofiler::SpliceableJSONWriter& aWriter) {}
+      static MarkerSchema MarkerTypeDisplay() {
+        using MS = MarkerSchema;
+        MS schema{MS::Location::markerChart, MS::Location::markerTable};
+        // Nothing outside the defaults.
+        return schema;
+      }
+    };
+    profiler_add_marker("VsyncTimestamp", geckoprofiler::category::GRAPHICS,
+                        MarkerTiming::InstantAt(aVsyncTimestamp),
+                        VsyncMarker{});
   }
 }
 #endif
@@ -2359,6 +2317,38 @@
   }
 }
 
+void CompositorBridgeParent::NotifyDidRender(const VsyncId& aCompositeStartId,
+                                             TimeStamp& aCompositeStart,
+                                             TimeStamp& aRenderStart,
+                                             TimeStamp& aCompositeEnd,
+                                             wr::RendererStats* aStats) {
+  if (!mWrBridge) {
+    return;
+  }
+
+  MOZ_RELEASE_ASSERT(mWrBridge->IsRootWebRenderBridgeParent());
+
+  RefPtr<UiCompositorControllerParent> uiController =
+      UiCompositorControllerParent::GetFromRootLayerTreeId(mRootLayerTreeID);
+
+  if (mIsForcedFirstPaint) {
+    uiController->NotifyFirstPaint();
+    mIsForcedFirstPaint = false;
+  }
+
+  nsTArray<CompositionPayload> payload =
+      mWrBridge->TakePendingScrollPayload(aCompositeStartId);
+  if (!payload.IsEmpty()) {
+    RecordCompositionPayloadsPresented(aCompositeEnd, payload);
+  }
+
+  nsTArray<ImageCompositeNotificationInfo> notifications;
+  mWrBridge->ExtractImageCompositeNotifications(&notifications);
+  if (!notifications.IsEmpty()) {
+    Unused << ImageBridgeParent::NotifyImageComposites(notifications);
+  }
+}
+
 void CompositorBridgeParent::NotifyPipelineRendered(
     const wr::PipelineId& aPipelineId, const wr::Epoch& aEpoch,
     const VsyncId& aCompositeStartId, TimeStamp& aCompositeStart,
@@ -2368,58 +2358,37 @@
     return;
   }
 
-  nsTArray<FrameStats> stats;
+  bool isRoot = mWrBridge->PipelineId() == aPipelineId;
+  RefPtr<WebRenderBridgeParent> wrBridge =
+      isRoot ? mWrBridge
+             : RefPtr<WebRenderBridgeParent>(
+                   mAsyncImageManager->GetWrBridge(aPipelineId));
+  if (!wrBridge) {
+    return;
+  }
 
-  RefPtr<UiCompositorControllerParent> uiController =
-      UiCompositorControllerParent::GetFromRootLayerTreeId(mRootLayerTreeID);
+  CompositorBridgeParentBase* compBridge =
+      isRoot ? this : wrBridge->GetCompositorBridge();
+  if (!compBridge) {
+    return;
+  }
 
-  if (mWrBridge->PipelineId() == aPipelineId) {
-    mWrBridge->RemoveEpochDataPriorTo(aEpoch);
+  MOZ_RELEASE_ASSERT(isRoot == wrBridge->IsRootWebRenderBridgeParent());
 
-    if (mIsForcedFirstPaint) {
-      uiController->NotifyFirstPaint();
-      mIsForcedFirstPaint = false;
-    }
-
-    std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
-    nsTArray<CompositionPayload> payload =
-        mWrBridge->TakePendingScrollPayload(key);
-    if (!payload.IsEmpty()) {
-      RecordCompositionPayloadsPresented(payload);
-    }
-
-    TransactionId transactionId = mWrBridge->FlushTransactionIdsForEpoch(
-        aEpoch, aCompositeStartId, aCompositeStart, aRenderStart, aCompositeEnd,
-        uiController);
-    Unused << SendDidComposite(LayersId{0}, transactionId, aCompositeStart,
-                               aCompositeEnd);
+  wrBridge->RemoveEpochDataPriorTo(aEpoch);
 
-    nsTArray<ImageCompositeNotificationInfo> notifications;
-    mWrBridge->ExtractImageCompositeNotifications(&notifications);
-    if (!notifications.IsEmpty()) {
-      Unused << ImageBridgeParent::NotifyImageComposites(notifications);
-    }
-    return;
-  }
+  nsTArray<FrameStats> stats;
 
-  auto wrBridge = mAsyncImageManager->GetWrBridge(aPipelineId);
-  if (wrBridge && wrBridge->GetCompositorBridge()) {
-    MOZ_ASSERT(!wrBridge->IsRootWebRenderBridgeParent());
-    wrBridge->RemoveEpochDataPriorTo(aEpoch);
-
-    std::pair<wr::PipelineId, wr::Epoch> key(aPipelineId, aEpoch);
-    nsTArray<CompositionPayload> payload =
-        wrBridge->TakePendingScrollPayload(key);
-    if (!payload.IsEmpty()) {
-      RecordCompositionPayloadsPresented(payload);
-    }
-
-    TransactionId transactionId = wrBridge->FlushTransactionIdsForEpoch(
-        aEpoch, aCompositeStartId, aCompositeStart, aRenderStart, aCompositeEnd,
-        uiController, aStats, &stats);
-    Unused << wrBridge->GetCompositorBridge()->SendDidComposite(
-        wrBridge->GetLayersId(), transactionId, aCompositeStart, aCompositeEnd);
-  }
+  RefPtr<UiCompositorControllerParent> uiController =
+      UiCompositorControllerParent::GetFromRootLayerTreeId(mRootLayerTreeID);
+
+  TransactionId transactionId = wrBridge->FlushTransactionIdsForEpoch(
+      aEpoch, aCompositeStartId, aCompositeStart, aRenderStart, aCompositeEnd,
+      uiController, aStats, &stats);
+
+  LayersId layersId = isRoot ? LayersId{0} : wrBridge->GetLayersId();
+  Unused << compBridge->SendDidComposite(layersId, transactionId,
+                                         aCompositeStart, aCompositeEnd);
 
   if (!stats.IsEmpty()) {
     Unused << SendNotifyFrameStats(stats);
@@ -2435,8 +2404,9 @@
                                                 VsyncId aId,
                                                 TimeStamp& aCompositeStart,
                                                 TimeStamp& aCompositeEnd) {
-  MOZ_ASSERT(
-      !mWrBridge);  // We should be going through NotifyPipelineRendered instead
+  MOZ_ASSERT(!mWrBridge,
+             "We should be going through NotifyDidRender and "
+             "NotifyPipelineRendered instead");
 
   Unused << SendDidComposite(LayersId{0}, aTransactionId, aCompositeStart,
                              aCompositeEnd);
@@ -2796,42 +2766,23 @@
 
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_can_accept_markers()) {
-    class ContentFramePayload : public ProfilerMarkerPayload {
-     public:
-      ContentFramePayload(const mozilla::TimeStamp& aStartTime,
-                          const mozilla::TimeStamp& aEndTime)
-          : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-      mozilla::ProfileBufferEntryWriter::Length TagAndSerializationBytes()
-          const override {
-        return CommonPropsTagAndSerializationBytes();
+    struct ContentFrameMarker {
+      static constexpr Span<const char> MarkerTypeName() {
+        return MakeStringSpan("CONTENT_FRAME_TIME");
       }
-      void SerializeTagAndPayload(
-          mozilla::ProfileBufferEntryWriter& aEntryWriter) const override {
-        static const DeserializerTag tag = TagForDeserializer(Deserialize);
-        SerializeTagAndCommonProps(tag, aEntryWriter);
-      }
-      void StreamPayload(mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-                         const TimeStamp& aProcessStartTime,
-                         UniqueStacks& aUniqueStacks) const override {
-        StreamCommonProps("CONTENT_FRAME_TIME", aWriter, aProcessStartTime,
-                          aUniqueStacks);
-      }
-
-     private:
-      explicit ContentFramePayload(CommonProps&& aCommonProps)
-          : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-      static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
-          mozilla::ProfileBufferEntryReader& aEntryReader) {
-        ProfilerMarkerPayload::CommonProps props =
-            DeserializeCommonProps(aEntryReader);
-        return UniquePtr<ProfilerMarkerPayload>(
-            new ContentFramePayload(std::move(props)));
+      static void StreamJSONMarkerData(
+          baseprofiler::SpliceableJSONWriter& aWriter) {}
+      static MarkerSchema MarkerTypeDisplay() {
+        using MS = MarkerSchema;
+        MS schema{MS::Location::markerChart, MS::Location::markerTable};
+        // Nothing outside the defaults.
+        return schema;
       }
     };
-    AUTO_PROFILER_STATS(add_marker_with_ContentFramePayload);
-    profiler_add_marker_for_thread(
-        profiler_current_thread_id(), JS::ProfilingCategoryPair::GRAPHICS,
-        "CONTENT_FRAME_TIME", ContentFramePayload(aTxnStart, aCompositeEnd));
+
+    profiler_add_marker("CONTENT_FRAME_TIME", geckoprofiler::category::GRAPHICS,
+                        MarkerTiming::Interval(aTxnStart, aCompositeEnd),
+                        ContentFrameMarker{});
   }
 #endif
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeParent.h firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeParent.h
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorBridgeParent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorBridgeParent.h	2021-01-18 19:58:11.000000000 +0000
@@ -15,38 +15,25 @@
 //       which the deadline will be 15ms + throttle threshold
 //#define COMPOSITOR_PERFORMANCE_WARNING
 
-#include <stdint.h>                   // for uint64_t
-#include "Layers.h"                   // for Layer
-#include "mozilla/Assertions.h"       // for MOZ_ASSERT_HELPER2
-#include "mozilla/Attributes.h"       // for override
-#include "mozilla/GfxMessageUtils.h"  // for WebGLVersion
+#include <stdint.h>  // for uint64_t
+#include <unordered_map>
+#include "mozilla/Assertions.h"  // for MOZ_ASSERT_HELPER2
 #include "mozilla/Maybe.h"
 #include "mozilla/Monitor.h"    // for Monitor
 #include "mozilla/RefPtr.h"     // for RefPtr
 #include "mozilla/TimeStamp.h"  // for TimeStamp
-#include "mozilla/dom/ipc/IdType.h"
 #include "mozilla/gfx/Point.h"  // for IntSize
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/ipc/SharedMemory.h"
-#include "mozilla/layers/CompositionRecorder.h"
 #include "mozilla/layers/CompositorController.h"
-#include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
 #include "mozilla/layers/ISurfaceAllocator.h"  // for IShmemAllocator
-#include "mozilla/layers/LayersMessages.h"     // for TargetConfig
+#include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/MetricsSharingController.h"
-#include "mozilla/layers/PCompositorBridgeTypes.h"
 #include "mozilla/layers/PCompositorBridgeParent.h"
-#include "mozilla/layers/APZTestData.h"
 #include "mozilla/webrender/WebRenderTypes.h"
-#include "mozilla/webrender/RenderThread.h"
-#include "mozilla/widget/CompositorWidget.h"
-#include "nsISupportsImpl.h"
-#include "ThreadSafeRefcountingWithMainThreadDestruction.h"
-#include "mozilla/layers/UiCompositorControllerParent.h"
-#include "mozilla/VsyncDispatcher.h"
 
-class nsIWidget;
+struct DxgiAdapterDesc;
 
 namespace mozilla {
 
@@ -74,11 +61,24 @@
 class WebGPUParent;
 }  // namespace webgpu
 
+namespace widget {
+class CompositorWidget;
+}
+
+namespace wr {
+class WebRenderPipelineInfo;
+struct Epoch;
+struct MemoryReport;
+struct PipelineId;
+struct RendererStats;
+}  // namespace wr
+
 namespace layers {
 
 class APZCTreeManager;
 class APZCTreeManagerParent;
 class APZSampler;
+class APZTestData;
 class APZUpdater;
 class AsyncCompositionManager;
 class AsyncImagePipelineManager;
@@ -87,17 +87,19 @@
 class CompositorBridgeParent;
 class CompositorManagerParent;
 class CompositorVsyncScheduler;
+class FrameUniformityData;
 class GeckoContentController;
 class HostLayerManager;
 class IAPZCTreeManager;
+class Layer;
 class LayerTransactionParent;
 class OMTASampler;
-class PAPZParent;
 class ContentCompositorBridgeParent;
 class CompositorThreadHolder;
 class InProcessCompositorSession;
-class TextureData;
+class UiCompositorControllerParent;
 class WebRenderBridgeParent;
+struct CollectedFrames;
 
 struct ScopedLayerTreeRegistration {
   ScopedLayerTreeRegistration(APZCTreeManager* aApzctm, LayersId aLayersId,
@@ -446,6 +448,10 @@
   void NotifyWebRenderContextPurge();
   void NotifyWebRenderDisableNativeCompositor();
 
+  void NotifyDidRender(const VsyncId& aCompositeStartId,
+                       TimeStamp& aCompositeStart, TimeStamp& aRenderStart,
+                       TimeStamp& aCompositeEnd,
+                       wr::RendererStats* aStats = nullptr);
   void NotifyPipelineRendered(const wr::PipelineId& aPipelineId,
                               const wr::Epoch& aEpoch,
                               const VsyncId& aCompositeStartId,
@@ -479,14 +485,6 @@
 
   // Can be called from any thread
   void ScheduleRenderOnCompositorThread() override;
-  void SchedulePauseOnCompositorThread();
-  void InvalidateOnCompositorThread();
-  /**
-   * Returns true if a surface was obtained and the resume succeeded; false
-   * otherwise.
-   */
-  bool ScheduleResumeOnCompositorThread();
-  bool ScheduleResumeOnCompositorThread(int x, int y, int width, int height);
 
   void ScheduleComposition();
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerChild.cpp firefox-85.0+build1/gfx/layers/ipc/CompositorManagerChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerChild.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorManagerChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/dom/ContentChild.h"  // for ContentChild
 #include "mozilla/dom/BrowserChild.h"  // for BrowserChild
+#include "mozilla/ipc/Endpoint.h"
 #include "VsyncSource.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerChild.h firefox-85.0+build1/gfx/layers/ipc/CompositorManagerChild.h
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorManagerChild.h	2021-01-18 19:58:11.000000000 +0000
@@ -17,6 +17,7 @@
 namespace mozilla {
 namespace layers {
 
+class CompositorBridgeChild;
 class CompositorManagerParent;
 class LayerManager;
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerParent.cpp firefox-85.0+build1/gfx/layers/ipc/CompositorManagerParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorManagerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorManagerParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/layers/CompositorManagerParent.h"
 #include "mozilla/gfx/GPUParent.h"
 #include "mozilla/webrender/RenderThread.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/ContentCompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorThread.cpp firefox-85.0+build1/gfx/layers/ipc/CompositorThread.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorThread.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorThread.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "MainThreadUtils.h"
 #include "VRManagerParent.h"
 #include "mozilla/BackgroundHangMonitor.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/layers/CanvasTranslator.h"
 #include "mozilla/layers/CompositorManagerParent.h"
 #include "mozilla/layers/ImageBridgeParent.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/CompositorThread.h firefox-85.0+build1/gfx/layers/ipc/CompositorThread.h
--- firefox-84.0.2+build1/gfx/layers/ipc/CompositorThread.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/CompositorThread.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #define mozilla_layers_CompositorThread_h
 
 #include "nsISupportsImpl.h"
+#include "nsIThread.h"
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 
 class nsISerialEventTarget;
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ContentCompositorBridgeParent.cpp firefox-85.0+build1/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/ContentCompositorBridgeParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ContentCompositorBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -39,7 +39,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
 #ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
+#  include "mozilla/BaseProfilerMarkerTypes.h"
 #endif
 
 namespace mozilla {
@@ -372,43 +372,10 @@
   auto endTime = TimeStamp::Now();
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_can_accept_markers()) {
-    class ContentBuildPayload : public ProfilerMarkerPayload {
-     public:
-      ContentBuildPayload(const mozilla::TimeStamp& aStartTime,
-                          const mozilla::TimeStamp& aEndTime)
-          : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-      mozilla::ProfileBufferEntryWriter::Length TagAndSerializationBytes()
-          const override {
-        return CommonPropsTagAndSerializationBytes();
-      }
-      void SerializeTagAndPayload(
-          mozilla::ProfileBufferEntryWriter& aEntryWriter) const override {
-        static const DeserializerTag tag = TagForDeserializer(Deserialize);
-        SerializeTagAndCommonProps(tag, aEntryWriter);
-      }
-      void StreamPayload(mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-                         const TimeStamp& aProcessStartTime,
-                         UniqueStacks& aUniqueStacks) const override {
-        StreamCommonProps("CONTENT_FULL_PAINT_TIME", aWriter, aProcessStartTime,
-                          aUniqueStacks);
-      }
-
-     private:
-      explicit ContentBuildPayload(CommonProps&& aCommonProps)
-          : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-      static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
-          mozilla::ProfileBufferEntryReader& aEntryReader) {
-        ProfilerMarkerPayload::CommonProps props =
-            DeserializeCommonProps(aEntryReader);
-        return UniquePtr<ProfilerMarkerPayload>(
-            new ContentBuildPayload(std::move(props)));
-      }
-    };
-    AUTO_PROFILER_STATS(add_marker_with_ContentBuildPayload);
-    profiler_add_marker_for_thread(
-        profiler_current_thread_id(), JS::ProfilingCategoryPair::GRAPHICS,
-        "CONTENT_FULL_PAINT_TIME",
-        ContentBuildPayload(aInfo.transactionStart(), endTime));
+    profiler_add_marker(
+        "CONTENT_FULL_PAINT_TIME", geckoprofiler::category::GRAPHICS,
+        MarkerTiming::Interval(aInfo.transactionStart(), endTime),
+        baseprofiler::markers::ContentBuildMarker{});
   }
 #endif
   Telemetry::Accumulate(
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeChild.cpp firefox-85.0+build1/gfx/layers/ipc/ImageBridgeChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ImageBridgeChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/gfx/Point.h"  // for IntSize
 #include "mozilla/gfx/gfxVars.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/MessageChannel.h"         // for MessageChannel, etc
 #include "mozilla/ipc/Transport.h"              // for Transport
 #include "mozilla/layers/CompositableClient.h"  // for CompositableChild, etc
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeChild.h firefox-85.0+build1/gfx/layers/ipc/ImageBridgeChild.h
--- firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeChild.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ImageBridgeChild.h	2021-01-18 19:58:11.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/PImageBridgeChild.h"
+#include "mozilla/layers/TextureForwarder.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "nsRegion.h"  // for nsIntRegion
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeParent.cpp firefox-85.0+build1/gfx/layers/ipc/ImageBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/ImageBridgeParent.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ImageBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,12 +10,12 @@
 #include "base/process.h"      // for ProcessId
 #include "base/task.h"         // for CancelableTask, DeleteTask, etc
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/gfx/Point.h"           // for IntSize
-#include "mozilla/Hal.h"                 // for hal::SetCurrentThreadPriority()
-#include "mozilla/HalTypes.h"            // for hal::THREAD_PRIORITY_COMPOSITOR
+#include "mozilla/gfx/Point.h"  // for IntSize
+#include "mozilla/Hal.h"        // for hal::SetCurrentThreadPriority()
+#include "mozilla/HalTypes.h"   // for hal::THREAD_PRIORITY_COMPOSITOR
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/MessageChannel.h"  // for MessageChannel, etc
-#include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/ipc/Transport.h"                           // for Transport
+#include "mozilla/ipc/Transport.h"       // for Transport
 #include "mozilla/media/MediaSystemResourceManagerParent.h"  // for MediaSystemResourceManagerParent
 #include "mozilla/layers/BufferTexture.h"
 #include "mozilla/layers/CompositableTransactionParent.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ISurfaceAllocator.h firefox-85.0+build1/gfx/layers/ipc/ISurfaceAllocator.h
--- firefox-84.0.2+build1/gfx/layers/ipc/ISurfaceAllocator.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ISurfaceAllocator.h	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsIMemoryReporter.h"              // for nsIMemoryReporter
 #include "mozilla/Atomics.h"                // for Atomic
 #include "mozilla/layers/LayersMessages.h"  // for ShmemSection
-#include "LayersTypes.h"
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/LayersMessages.ipdlh firefox-85.0+build1/gfx/layers/ipc/LayersMessages.ipdlh
--- firefox-84.0.2+build1/gfx/layers/ipc/LayersMessages.ipdlh	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/LayersMessages.ipdlh	2021-01-18 19:58:11.000000000 +0000
@@ -59,7 +59,7 @@
 using mozilla::layers::CompositionPayload from "mozilla/layers/LayersTypes.h";
 using mozilla::layers::SimpleLayerAttributes from "mozilla/layers/LayerAttributes.h";
 using mozilla::CrossProcessSemaphoreHandle from "mozilla/ipc/CrossProcessSemaphore.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 using mozilla::layers::LayersId from "mozilla/layers/LayersTypes.h";
 using mozilla::layers::TransactionId from "mozilla/layers/LayersTypes.h";
 using mozilla::VsyncId from "mozilla/VsyncDispatcher.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/LayersMessageUtils.h firefox-85.0+build1/gfx/layers/ipc/LayersMessageUtils.h
--- firefox-84.0.2+build1/gfx/layers/ipc/LayersMessageUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/LayersMessageUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "FrameMetrics.h"
 #include "VsyncSource.h"
 #include "chrome/common/ipc_message_utils.h"
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/MotionPathUtils.h"
 #include "mozilla/ServoBindings.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/LayersSurfaces.ipdlh firefox-85.0+build1/gfx/layers/ipc/LayersSurfaces.ipdlh
--- firefox-84.0.2+build1/gfx/layers/ipc/LayersSurfaces.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/LayersSurfaces.ipdlh	2021-01-18 19:58:11.000000000 +0000
@@ -2,12 +2,14 @@
  * 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 "gfxipc/ShadowLayerUtils.h";
+
 using struct gfxPoint from "gfxPoint.h";
 using nsIntRegion from "nsRegion.h";
-using struct mozilla::layers::SurfaceDescriptorX11 from "gfxipc/ShadowLayerUtils.h";
+using struct mozilla::layers::SurfaceDescriptorX11 from "gfxipc/SurfaceDescriptor.h";
 using mozilla::StereoMode from "ImageTypes.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
 using mozilla::gfx::YUVColorSpace from "mozilla/gfx/Types.h";
 using mozilla::gfx::ColorDepth from "mozilla/gfx/Types.h";
 using mozilla::gfx::ColorRange from "mozilla/gfx/Types.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/PCanvas.ipdl firefox-85.0+build1/gfx/layers/ipc/PCanvas.ipdl
--- firefox-84.0.2+build1/gfx/layers/ipc/PCanvas.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/PCanvas.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -4,6 +4,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/. */
 
+include "mozilla/layers/LayersMessageUtils.h";
+
 using mozilla::CrossProcessSemaphoreHandle from "mozilla/ipc/CrossProcessSemaphore.h";
 using mozilla::layers::TextureType from "mozilla/layers/LayersTypes.h";
 using mozilla::ipc::SharedMemoryBasic::Handle from "mozilla/ipc/SharedMemoryBasic.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/PCompositorBridge.ipdl firefox-85.0+build1/gfx/layers/ipc/PCompositorBridge.ipdl
--- firefox-84.0.2+build1/gfx/layers/ipc/PCompositorBridge.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/PCompositorBridge.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -24,7 +24,7 @@
 include "mozilla/layers/LayersMessageUtils.h";
 include "mozilla/layers/WebRenderMessageUtils.h";
 
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 using struct mozilla::layers::LayersId from "mozilla/layers/LayersTypes.h";
 using struct mozilla::layers::TextureFactoryIdentifier from "mozilla/layers/CompositorTypes.h";
 using struct mozilla::layers::ScrollableLayerGuid from "mozilla/layers/ScrollableLayerGuid.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/PCompositorManager.ipdl firefox-85.0+build1/gfx/layers/ipc/PCompositorManager.ipdl
--- firefox-84.0.2+build1/gfx/layers/ipc/PCompositorManager.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/PCompositorManager.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,7 @@
 include "mozilla/GfxMessageUtils.h";
 include "mozilla/layers/WebRenderMessageUtils.h";
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 using mozilla::TimeDuration from "mozilla/TimeStamp.h";
 using mozilla::CSSToLayoutDeviceScale from "Units.h";
 using mozilla::gfx::IntSize from "mozilla/gfx/2D.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/PLayerTransaction.ipdl firefox-85.0+build1/gfx/layers/ipc/PLayerTransaction.ipdl
--- firefox-84.0.2+build1/gfx/layers/ipc/PLayerTransaction.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/PLayerTransaction.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -14,8 +14,8 @@
 include "mozilla/layers/LayersMessageUtils.h";
 
 using struct mozilla::layers::TextureInfo from "mozilla/layers/CompositorTypes.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 using class mozilla::layers::APZTestData from "mozilla/layers/APZTestData.h";
 using mozilla::layers::FrameUniformityData from "mozilla/layers/FrameUniformityData.h";
 using mozilla::layers::ScrollableLayerGuid from "mozilla/layers/ScrollableLayerGuid.h";
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/RemoteContentController.cpp firefox-85.0+build1/gfx/layers/ipc/RemoteContentController.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/RemoteContentController.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/RemoteContentController.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/layers/APZCCallbackHelper.h"
 #include "mozilla/layers/APZCTreeManagerParent.h"  // for APZCTreeManagerParent
 #include "mozilla/layers/APZThreadUtils.h"
+#include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/MatrixMessage.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ShadowLayerUtils.h firefox-85.0+build1/gfx/layers/ipc/ShadowLayerUtils.h
--- firefox-84.0.2+build1/gfx/layers/ipc/ShadowLayerUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ShadowLayerUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,25 +7,15 @@
 #ifndef IPC_ShadowLayerUtils_h
 #define IPC_ShadowLayerUtils_h
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "GLContextTypes.h"
+#include "SurfaceDescriptor.h"
 #include "SurfaceTypes.h"
 #include "mozilla/WidgetUtils.h"
 
-#if defined(XP_MACOSX)
-#  define MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
-#endif
-
 #if defined(MOZ_X11)
 #  include "mozilla/layers/ShadowLayerUtilsX11.h"
-#else
-namespace mozilla {
-namespace layers {
-struct SurfaceDescriptorX11 {
-  bool operator==(const SurfaceDescriptorX11&) const { return false; }
-};
-}  // namespace layers
-}  // namespace mozilla
 #endif
 
 namespace IPC {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/ShadowLayerUtilsX11.h firefox-85.0+build1/gfx/layers/ipc/ShadowLayerUtilsX11.h
--- firefox-84.0.2+build1/gfx/layers/ipc/ShadowLayerUtilsX11.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/ShadowLayerUtilsX11.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,58 +7,11 @@
 #ifndef mozilla_layers_ShadowLayerUtilsX11_h
 #define mozilla_layers_ShadowLayerUtilsX11_h
 
+#include "gfxipc/SurfaceDescriptor.h"
 #include "ipc/IPCMessageUtils.h"
-#include "mozilla/AlreadyAddRefed.h"
-
-#define MOZ_HAVE_SURFACEDESCRIPTORX11
-#define MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
-
-typedef unsigned long XID;
-typedef XID Drawable;
-
-class gfxXlibSurface;
 
 namespace IPC {
 class Message;
-}
-
-namespace mozilla {
-namespace layers {
-
-struct SurfaceDescriptorX11 {
-  SurfaceDescriptorX11() = default;
-
-  explicit SurfaceDescriptorX11(gfxXlibSurface* aSurf,
-                                bool aForwardGLX = false);
-
-  SurfaceDescriptorX11(Drawable aDrawable, XID aFormatID,
-                       const gfx::IntSize& aSize);
-
-  // Default copy ctor and operator= are OK
-
-  bool operator==(const SurfaceDescriptorX11& aOther) const {
-    // Define == as two descriptors having the same XID for now,
-    // ignoring size and render format.  If the two indeed refer to
-    // the same valid XID, then size/format are "actually" the same
-    // anyway, regardless of the values of the fields in
-    // SurfaceDescriptorX11.
-    return mId == aOther.mId;
-  }
-
-  already_AddRefed<gfxXlibSurface> OpenForeign() const;
-
-  MOZ_INIT_OUTSIDE_CTOR Drawable mId;
-  MOZ_INIT_OUTSIDE_CTOR XID mFormat;  // either a PictFormat or VisualID
-  MOZ_INIT_OUTSIDE_CTOR gfx::IntSize mSize;
-  MOZ_INIT_OUTSIDE_CTOR Drawable
-      mGLXPixmap;  // used to prevent multiple bindings to the same GLXPixmap
-                   // in-process
-};
-
-}  // namespace layers
-}  // namespace mozilla
-
-namespace IPC {
 
 template <>
 struct ParamTraits<mozilla::layers::SurfaceDescriptorX11> {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/SharedRGBImage.cpp firefox-85.0+build1/gfx/layers/ipc/SharedRGBImage.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/SharedRGBImage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/SharedRGBImage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -20,7 +20,8 @@
 #include "mozilla/mozalloc.h"                 // for operator delete, etc
 #include "nsDebug.h"                          // for NS_WARNING, NS_ASSERTION
 #include "nsISupportsImpl.h"                  // for Image::AddRef, etc
-#include "nsRect.h"                           // for mozilla::gfx::IntRect
+#include "nsProxyRelease.h"
+#include "nsRect.h"  // for mozilla::gfx::IntRect
 
 // Just big enough for a 1080p RGBA32 frame
 #define MAX_FRAME_SIZE (16 * 1024 * 1024)
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/SharedSurfacesMemoryReport.h firefox-85.0+build1/gfx/layers/ipc/SharedSurfacesMemoryReport.h
--- firefox-84.0.2+build1/gfx/layers/ipc/SharedSurfacesMemoryReport.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/SharedSurfacesMemoryReport.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,9 @@
 
 #include <cstdint>  // for uint32_t
 #include <unordered_map>
+#include "base/process.h"
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/gfx/Point.h"  // for IntSize
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/SurfaceDescriptor.h firefox-85.0+build1/gfx/layers/ipc/SurfaceDescriptor.h
--- firefox-84.0.2+build1/gfx/layers/ipc/SurfaceDescriptor.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/SurfaceDescriptor.h	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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 IPC_SurfaceDescriptor_h
+#define IPC_SurfaceDescriptor_h
+
+#if defined(XP_MACOSX)
+#  define MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
+#endif
+
+#if defined(MOZ_X11)
+#  include "mozilla/AlreadyAddRefed.h"
+#  include "mozilla/gfx/Point.h"
+
+#  define MOZ_HAVE_SURFACEDESCRIPTORX11
+#  define MOZ_HAVE_PLATFORM_SPECIFIC_LAYER_BUFFERS
+
+typedef unsigned long XID;
+typedef XID Drawable;
+
+class gfxXlibSurface;
+
+namespace mozilla {
+namespace layers {
+
+struct SurfaceDescriptorX11 {
+  SurfaceDescriptorX11() = default;
+
+  explicit SurfaceDescriptorX11(gfxXlibSurface* aSurf,
+                                bool aForwardGLX = false);
+
+  SurfaceDescriptorX11(Drawable aDrawable, XID aFormatID,
+                       const gfx::IntSize& aSize);
+
+  // Default copy ctor and operator= are OK
+
+  bool operator==(const SurfaceDescriptorX11& aOther) const {
+    // Define == as two descriptors having the same XID for now,
+    // ignoring size and render format.  If the two indeed refer to
+    // the same valid XID, then size/format are "actually" the same
+    // anyway, regardless of the values of the fields in
+    // SurfaceDescriptorX11.
+    return mId == aOther.mId;
+  }
+
+  already_AddRefed<gfxXlibSurface> OpenForeign() const;
+
+  MOZ_INIT_OUTSIDE_CTOR Drawable mId;
+  MOZ_INIT_OUTSIDE_CTOR XID mFormat;  // either a PictFormat or VisualID
+  MOZ_INIT_OUTSIDE_CTOR gfx::IntSize mSize;
+  MOZ_INIT_OUTSIDE_CTOR Drawable
+      mGLXPixmap;  // used to prevent multiple bindings to the same GLXPixmap
+                   // in-process
+};
+
+}  // namespace layers
+}  // namespace mozilla
+#else
+namespace mozilla {
+namespace layers {
+struct SurfaceDescriptorX11 {
+  bool operator==(const SurfaceDescriptorX11&) const { return false; }
+};
+}  // namespace layers
+}  // namespace mozilla
+#endif
+
+#endif  // IPC_SurfaceDescriptor_h
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/TextureForwarder.h firefox-85.0+build1/gfx/layers/ipc/TextureForwarder.h
--- firefox-84.0.2+build1/gfx/layers/ipc/TextureForwarder.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/TextureForwarder.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include <stdint.h>  // for int32_t, uint64_t
 #include "gfxTypes.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/layers/LayersMessages.h"  // for Edit, etc
 #include "mozilla/layers/LayersTypes.h"     // for LayersBackend
 #include "mozilla/layers/TextureClient.h"   // for TextureClient
@@ -16,9 +17,6 @@
 #include "nsISerialEventTarget.h"
 
 namespace mozilla {
-namespace ipc {
-class IShmemAllocator;
-}
 namespace layers {
 class CanvasChild;
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/UiCompositorControllerChild.cpp firefox-85.0+build1/gfx/layers/ipc/UiCompositorControllerChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/UiCompositorControllerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/UiCompositorControllerChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/layers/UiCompositorControllerMessageTypes.h"
 #include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/gfx/GPUProcessManager.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/StaticPtr.h"
 #include "nsBaseWidget.h"
 #include "nsProxyRelease.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/UiCompositorControllerParent.cpp firefox-85.0+build1/gfx/layers/ipc/UiCompositorControllerParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/UiCompositorControllerParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/UiCompositorControllerParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -15,6 +15,7 @@
 #include "SynchronousTask.h"
 #include "mozilla/Unused.h"
 #include "mozilla/gfx/Types.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeChild.cpp firefox-85.0+build1/gfx/layers/ipc/VideoBridgeChild.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/VideoBridgeChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include "VideoBridgeParent.h"
 #include "CompositorThread.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "transport/runnable_utils.h"
 #include "SynchronousTask.h"
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeParent.cpp firefox-85.0+build1/gfx/layers/ipc/VideoBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/VideoBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "VideoBridgeParent.h"
 #include "CompositorThread.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/VideoBridgeUtils.h"
 
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeUtils.h firefox-85.0+build1/gfx/layers/ipc/VideoBridgeUtils.h
--- firefox-84.0.2+build1/gfx/layers/ipc/VideoBridgeUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/VideoBridgeUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef IPC_VideoBridgeUtils_h
 #define IPC_VideoBridgeUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/ipc/WebRenderMessages.ipdlh firefox-85.0+build1/gfx/layers/ipc/WebRenderMessages.ipdlh
--- firefox-84.0.2+build1/gfx/layers/ipc/WebRenderMessages.ipdlh	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ipc/WebRenderMessages.ipdlh	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,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 "mozilla/layers/LayersMessageUtils.h";
 include "mozilla/layers/WebRenderMessageUtils.h";
 
 include LayersSurfaces;
@@ -31,7 +32,7 @@
 using mozilla::gfx::Rect from "mozilla/gfx/Rect.h";
 using mozilla::VideoInfo::Rotation from "MediaInfo.h";
 using class mozilla::gfx::Matrix4x4 from "mozilla/gfx/Matrix.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/LayerManager.cpp firefox-85.0+build1/gfx/layers/LayerManager.cpp
--- firefox-84.0.2+build1/gfx/layers/LayerManager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/LayerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,216 @@
+/* -*- 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/layers/LayerManager.h"
+
+#include <stdint.h>          // for uint64_t, uint8_t
+#include <stdlib.h>          // for abort
+#include <algorithm>         // for copy, copy_backward
+#include <utility>           // for move, forward
+#include "FrameMetrics.h"    // for FrameMetrics
+#include "ImageContainer.h"  // for ImageContainer, ImageContainer::Mode
+#include "LayerUserData.h"   // for LayerUserData
+#include "Layers.h"          // for RecordCompositionPayloadsPresented, Layer
+#include "TreeTraversal.h"   // for ForwardIterator, BreadthFirstSearch
+#include "gfxPlatform.h"     // for gfxPlatform
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/ArrayIterator.h"    // for ArrayIterator
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER1
+#include "mozilla/EffectSet.h"  // for EffectSet
+#include "mozilla/Logging.h"    // for LazyLogModule, LogModule (ptr only)
+#include "mozilla/RefPtr.h"  // for RefPtr, getter_AddRefs, RefPtrGetterAddRefs
+#include "mozilla/StaticPrefs_layers.h"  // for layers_componentalpha_enabled_AtStartup_DoNotUseDirectly
+#include "mozilla/UniquePtr.h"            // for UniquePtr
+#include "mozilla/dom/Animation.h"        // for Animation
+#include "mozilla/dom/AnimationEffect.h"  // for AnimationEffect
+#include "mozilla/gfx/Point.h"            // for IntSize
+#include "mozilla/gfx/Types.h"            // for SurfaceFormat, gfx
+#include "mozilla/gfx/UserData.h"  // for UserData, UserDataKey (ptr only)
+#include "mozilla/layers/LayerMetricsWrapper.h"  // for LayerMetricsWrapper
+#include "mozilla/layers/LayersTypes.h"          // for CompositionPayload
+#include "mozilla/layers/PersistentBufferProvider.h"  // for PersistentBufferProviderBasic, PersistentBufferProvider (ptr only)
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::NULL_SCROLL_ID, ScrollableLayerGu...
+#include "nsHashKeys.h"                          // for nsUint64HashKey
+#include "nsRefPtrHashtable.h"                   // for nsRefPtrHashtable
+#include "nsTArray.h"                            // for nsTArray
+
+uint8_t gLayerManagerLayerBuilder;
+
+// Undo the damage done by mozzconf.h
+#undef compress
+#include "mozilla/Compression.h"
+
+namespace mozilla {
+namespace layers {
+
+using namespace mozilla::gfx;
+using namespace mozilla::Compression;
+
+//--------------------------------------------------
+// LayerManager
+
+LayerManager::LayerManager()
+    : mDestroyed(false),
+      mSnapEffectiveTransforms(true),
+      mId(0),
+      mInTransaction(false),
+      mContainsSVG(false),
+      mPaintedPixelCount(0) {}
+
+LayerManager::~LayerManager() = default;
+
+void LayerManager::Destroy() {
+  mDestroyed = true;
+  mUserData.Destroy();
+  mRoot = nullptr;
+  mPartialPrerenderedAnimations.Clear();
+}
+
+/* static */ mozilla::LogModule* LayerManager::GetLog() {
+  static LazyLogModule sLog("Layers");
+  return sLog;
+}
+
+ScrollableLayerGuid::ViewID LayerManager::GetRootScrollableLayerId() {
+  if (!mRoot) {
+    return ScrollableLayerGuid::NULL_SCROLL_ID;
+  }
+
+  LayerMetricsWrapper layerMetricsRoot = LayerMetricsWrapper(mRoot);
+
+  LayerMetricsWrapper rootScrollableLayerMetrics =
+      BreadthFirstSearch<ForwardIterator>(
+          layerMetricsRoot, [](LayerMetricsWrapper aLayerMetrics) {
+            return aLayerMetrics.Metrics().IsScrollable();
+          });
+
+  return rootScrollableLayerMetrics.IsValid()
+             ? rootScrollableLayerMetrics.Metrics().GetScrollId()
+             : ScrollableLayerGuid::NULL_SCROLL_ID;
+}
+
+LayerMetricsWrapper LayerManager::GetRootContentLayer() {
+  if (!mRoot) {
+    return LayerMetricsWrapper();
+  }
+
+  LayerMetricsWrapper root(mRoot);
+
+  return BreadthFirstSearch<ForwardIterator>(
+      root, [](LayerMetricsWrapper aLayerMetrics) {
+        return aLayerMetrics.Metrics().IsRootContent();
+      });
+}
+
+already_AddRefed<DrawTarget> LayerManager::CreateOptimalDrawTarget(
+    const gfx::IntSize& aSize, SurfaceFormat aFormat) {
+  return gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(aSize,
+                                                                      aFormat);
+}
+
+already_AddRefed<DrawTarget> LayerManager::CreateOptimalMaskDrawTarget(
+    const gfx::IntSize& aSize) {
+  return CreateOptimalDrawTarget(aSize, SurfaceFormat::A8);
+}
+
+already_AddRefed<DrawTarget> LayerManager::CreateDrawTarget(
+    const IntSize& aSize, SurfaceFormat aFormat) {
+  return gfxPlatform::GetPlatform()->CreateOffscreenCanvasDrawTarget(aSize,
+                                                                     aFormat);
+}
+
+already_AddRefed<PersistentBufferProvider>
+LayerManager::CreatePersistentBufferProvider(
+    const mozilla::gfx::IntSize& aSize, mozilla::gfx::SurfaceFormat aFormat) {
+  RefPtr<PersistentBufferProviderBasic> bufferProvider =
+      PersistentBufferProviderBasic::Create(
+          aSize, aFormat,
+          gfxPlatform::GetPlatform()->GetPreferredCanvasBackend());
+
+  if (!bufferProvider) {
+    bufferProvider = PersistentBufferProviderBasic::Create(
+        aSize, aFormat, gfxPlatform::GetPlatform()->GetFallbackCanvasBackend());
+  }
+
+  return bufferProvider.forget();
+}
+
+already_AddRefed<ImageContainer> LayerManager::CreateImageContainer(
+    ImageContainer::Mode flag) {
+  RefPtr<ImageContainer> container = new ImageContainer(flag);
+  return container.forget();
+}
+
+bool LayerManager::LayersComponentAlphaEnabled() {
+  // If MOZ_GFX_OPTIMIZE_MOBILE is defined, we force component alpha off
+  // and ignore the preference.
+#ifdef MOZ_GFX_OPTIMIZE_MOBILE
+  return false;
+#else
+  return StaticPrefs::
+      layers_componentalpha_enabled_AtStartup_DoNotUseDirectly();
+#endif
+}
+
+bool LayerManager::AreComponentAlphaLayersEnabled() {
+  return LayerManager::LayersComponentAlphaEnabled();
+}
+
+/*static*/
+void LayerManager::LayerUserDataDestroy(void* data) {
+  delete static_cast<LayerUserData*>(data);
+}
+
+UniquePtr<LayerUserData> LayerManager::RemoveUserData(void* aKey) {
+  UniquePtr<LayerUserData> d(static_cast<LayerUserData*>(
+      mUserData.Remove(static_cast<gfx::UserDataKey*>(aKey))));
+  return d;
+}
+
+void LayerManager::PayloadPresented(const TimeStamp& aTimeStamp) {
+  RecordCompositionPayloadsPresented(aTimeStamp, mPayload);
+}
+
+void LayerManager::AddPartialPrerenderedAnimation(
+    uint64_t aCompositorAnimationId, dom::Animation* aAnimation) {
+  mPartialPrerenderedAnimations.Put(aCompositorAnimationId, RefPtr{aAnimation});
+  aAnimation->SetPartialPrerendered(aCompositorAnimationId);
+}
+
+void LayerManager::RemovePartialPrerenderedAnimation(
+    uint64_t aCompositorAnimationId, dom::Animation* aAnimation) {
+  MOZ_ASSERT(aAnimation);
+#ifdef DEBUG
+  RefPtr<dom::Animation> animation;
+  if (mPartialPrerenderedAnimations.Remove(aCompositorAnimationId,
+                                           getter_AddRefs(animation)) &&
+      // It may be possible that either animation's effect has already been
+      // nulled out via Animation::SetEffect() so ignore such cases.
+      aAnimation->GetEffect() && aAnimation->GetEffect()->AsKeyframeEffect() &&
+      animation->GetEffect() && animation->GetEffect()->AsKeyframeEffect()) {
+    MOZ_ASSERT(EffectSet::GetEffectSetForEffect(
+                   aAnimation->GetEffect()->AsKeyframeEffect()) ==
+               EffectSet::GetEffectSetForEffect(
+                   animation->GetEffect()->AsKeyframeEffect()));
+  }
+#else
+  mPartialPrerenderedAnimations.Remove(aCompositorAnimationId);
+#endif
+  aAnimation->ResetPartialPrerendered();
+}
+
+void LayerManager::UpdatePartialPrerenderedAnimations(
+    const nsTArray<uint64_t>& aJankedAnimations) {
+  for (uint64_t id : aJankedAnimations) {
+    RefPtr<dom::Animation> animation;
+    if (mPartialPrerenderedAnimations.Remove(id, getter_AddRefs(animation))) {
+      animation->UpdatePartialPrerendered();
+    }
+  }
+}
+
+}  // namespace layers
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/gfx/layers/LayerManager.h firefox-85.0+build1/gfx/layers/LayerManager.h
--- firefox-84.0.2+build1/gfx/layers/LayerManager.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/LayerManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,788 @@
+/* -*- 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 GFX_LAYERMANAGER_H
+#define GFX_LAYERMANAGER_H
+
+#include <cstdint>         // for uint32_t, uint64_t, int32_t, uint8_t
+#include <iosfwd>          // for stringstream
+#include <new>             // for operator new
+#include <unordered_set>   // for unordered_set
+#include <utility>         // for forward
+#include "FrameMetrics.h"  // for ScrollUpdatesMap
+#include "ImageContainer.h"  // for ImageContainer, ImageContainer::Mode, ImageContainer::SYNCHRONOUS
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Maybe.h"            // for Maybe
+#include "mozilla/RefPtr.h"           // for RefPtr
+#include "mozilla/TimeStamp.h"        // for TimeStamp
+#include "mozilla/UniquePtr.h"        // for UniquePtr
+#include "mozilla/dom/Animation.h"    // for Animation
+#include "mozilla/gfx/Point.h"        // for IntSize
+#include "mozilla/gfx/Types.h"        // for SurfaceFormat
+#include "mozilla/gfx/UserData.h"     // for UserData, UserDataKey (ptr only)
+#include "mozilla/layers/CompositorTypes.h"  // for TextureFactoryIdentifier
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::ViewID
+#include "nsHashKeys.h"                          // for nsUint64HashKey
+#include "nsISupports.h"        // for NS_INLINE_DECL_REFCOUNTING
+#include "nsIWidget.h"          // for nsIWidget
+#include "nsRefPtrHashtable.h"  // for nsRefPtrHashtable
+#include "nsRegion.h"           // for nsIntRegion
+#include "nsStringFwd.h"        // for nsCString, nsAString
+#include "nsTArray.h"           // for nsTArray
+
+// XXX These includes could be avoided by moving function implementations to the
+// cpp file
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_A...
+#include "mozilla/layers/LayersTypes.h"  // for CompositionPayload, LayersBackend, TransactionId, DrawRegionClip, LayersBackend:...
+
+class gfxContext;
+
+extern uint8_t gLayerManagerLayerBuilder;
+
+namespace mozilla {
+
+class FrameLayerBuilder;
+class LogModule;
+class ScrollPositionUpdate;
+
+namespace gfx {
+class DrawTarget;
+}  // namespace gfx
+
+namespace layers {
+
+class AsyncPanZoomController;
+class BasicLayerManager;
+class ClientLayerManager;
+class HostLayerManager;
+class Layer;
+class LayerMetricsWrapper;
+class PaintedLayer;
+class ContainerLayer;
+class ImageLayer;
+class ColorLayer;
+class CompositorBridgeChild;
+class CanvasLayer;
+class ReadbackLayer;
+class ReadbackProcessor;
+class RefLayer;
+class HostLayer;
+class FocusTarget;
+class KnowsCompositor;
+class ShadowableLayer;
+class ShadowLayerForwarder;
+class LayerManagerComposite;
+class TransactionIdAllocator;
+class FrameUniformityData;
+class PersistentBufferProvider;
+class GlyphArray;
+class WebRenderLayerManager;
+struct LayerPolygon;
+struct AnimData;
+
+namespace layerscope {
+class LayersPacket;
+}  // namespace layerscope
+
+// Defined in LayerUserData.h; please include that file instead.
+class LayerUserData;
+
+class DidCompositeObserver {
+ public:
+  virtual void DidComposite() = 0;
+};
+
+class FrameRecorder {
+ public:
+  /**
+   * Record (and return) frame-intervals and paint-times for frames which were
+   * presented between calling StartFrameTimeRecording and
+   * StopFrameTimeRecording.
+   *
+   * - Uses a cyclic buffer and serves concurrent consumers, so if Stop is
+   *   called too late
+   *     (elements were overwritten since Start), result is considered invalid
+   *      and hence empty.)
+   * - Buffer is capable of holding 10 seconds @ 60fps (or more if frames were
+   *   less frequent).
+   *     Can be changed (up to 1 hour) via pref:
+   *     toolkit.framesRecording.bufferSize.
+   * - Note: the first frame-interval may be longer than expected because last
+   *   frame
+   *     might have been presented some time before calling
+   *     StartFrameTimeRecording.
+   */
+
+  /**
+   * Returns a handle which represents current recording start position.
+   */
+  virtual uint32_t StartFrameTimeRecording(int32_t aBufferSize);
+
+  /**
+   *  Clears, then populates aFrameIntervals with the recorded frame timing
+   *  data. The array will be empty if data was overwritten since
+   *  aStartIndex was obtained.
+   */
+  virtual void StopFrameTimeRecording(uint32_t aStartIndex,
+                                      nsTArray<float>& aFrameIntervals);
+
+  void RecordFrame();
+
+ private:
+  struct FramesTimingRecording {
+    // Stores state and data for frame intervals and paint times recording.
+    // see LayerManager::StartFrameTimeRecording() at Layers.cpp for more
+    // details.
+    FramesTimingRecording()
+        : mNextIndex(0),
+          mLatestStartIndex(0),
+          mCurrentRunStartIndex(0),
+          mIsPaused(true) {}
+    nsTArray<float> mIntervals;
+    TimeStamp mLastFrameTime;
+    uint32_t mNextIndex;
+    uint32_t mLatestStartIndex;
+    uint32_t mCurrentRunStartIndex;
+    bool mIsPaused;
+  };
+  FramesTimingRecording mRecording;
+};
+
+/*
+ * Motivation: For truly smooth animation and video playback, we need to
+ * be able to compose frames and render them on a dedicated thread (i.e.
+ * off the main thread where DOM manipulation, script execution and layout
+ * induce difficult-to-bound latency). This requires Gecko to construct
+ * some kind of persistent scene structure (graph or tree) that can be
+ * safely transmitted across threads. We have other scenarios (e.g. mobile
+ * browsing) where retaining some rendered data between paints is desired
+ * for performance, so again we need a retained scene structure.
+ *
+ * Our retained scene structure is a layer tree. Each layer represents
+ * content which can be composited onto a destination surface; the root
+ * layer is usually composited into a window, and non-root layers are
+ * composited into their parent layers. Layers have attributes (e.g.
+ * opacity and clipping) that influence their compositing.
+ *
+ * We want to support a variety of layer implementations, including
+ * a simple "immediate mode" implementation that doesn't retain any
+ * rendered data between paints (i.e. uses cairo in just the way that
+ * Gecko used it before layers were introduced). But we also don't want
+ * to have bifurcated "layers"/"non-layers" rendering paths in Gecko.
+ * Therefore the layers API is carefully designed to permit maximally
+ * efficient implementation in an "immediate mode" style. See the
+ * BasicLayerManager for such an implementation.
+ */
+
+/**
+ * A LayerManager controls a tree of layers. All layers in the tree
+ * must use the same LayerManager.
+ *
+ * All modifications to a layer tree must happen inside a transaction.
+ * Only the state of the layer tree at the end of a transaction is
+ * rendered. Transactions cannot be nested
+ *
+ * Each transaction has two phases:
+ * 1) Construction: layers are created, inserted, removed and have
+ * properties set on them in this phase.
+ * BeginTransaction and BeginTransactionWithTarget start a transaction in
+ * the Construction phase.
+ * 2) Drawing: PaintedLayers are rendered into in this phase, in tree
+ * order. When the client has finished drawing into the PaintedLayers, it should
+ * call EndTransaction to complete the transaction.
+ *
+ * All layer API calls happen on the main thread.
+ *
+ * Layers are refcounted. The layer manager holds a reference to the
+ * root layer, and each container layer holds a reference to its children.
+ */
+class LayerManager : public FrameRecorder {
+  NS_INLINE_DECL_REFCOUNTING(LayerManager)
+
+ protected:
+  typedef mozilla::gfx::DrawTarget DrawTarget;
+  typedef mozilla::gfx::IntSize IntSize;
+  typedef mozilla::gfx::SurfaceFormat SurfaceFormat;
+
+ public:
+  LayerManager();
+
+  /**
+   * Release layers and resources held by this layer manager, and mark
+   * it as destroyed.  Should do any cleanup necessary in preparation
+   * for its widget going away.  After this call, only user data calls
+   * are valid on the layer manager.
+   */
+  virtual void Destroy();
+  bool IsDestroyed() { return mDestroyed; }
+
+  virtual ShadowLayerForwarder* AsShadowForwarder() { return nullptr; }
+
+  virtual KnowsCompositor* AsKnowsCompositor() { return nullptr; }
+
+  virtual LayerManagerComposite* AsLayerManagerComposite() { return nullptr; }
+
+  virtual ClientLayerManager* AsClientLayerManager() { return nullptr; }
+
+  virtual BasicLayerManager* AsBasicLayerManager() { return nullptr; }
+  virtual HostLayerManager* AsHostLayerManager() { return nullptr; }
+
+  virtual WebRenderLayerManager* AsWebRenderLayerManager() { return nullptr; }
+
+  /**
+   * Returns true if this LayerManager is owned by an nsIWidget,
+   * and is used for drawing into the widget.
+   */
+  virtual bool IsWidgetLayerManager() { return true; }
+  virtual bool IsInactiveLayerManager() { return false; }
+
+  /**
+   * Start a new transaction. Nested transactions are not allowed so
+   * there must be no transaction currently in progress.
+   * This transaction will update the state of the window from which
+   * this LayerManager was obtained.
+   */
+  virtual bool BeginTransaction(const nsCString& aURL = nsCString()) = 0;
+  /**
+   * Start a new transaction. Nested transactions are not allowed so
+   * there must be no transaction currently in progress.
+   * This transaction will render the contents of the layer tree to
+   * the given target context. The rendering will be complete when
+   * EndTransaction returns.
+   */
+  virtual bool BeginTransactionWithTarget(
+      gfxContext* aTarget, const nsCString& aURL = nsCString()) = 0;
+
+  enum EndTransactionFlags {
+    END_DEFAULT = 0,
+    END_NO_IMMEDIATE_REDRAW = 1 << 0,  // Do not perform the drawing phase
+    END_NO_COMPOSITE =
+        1 << 1,  // Do not composite after drawing painted layer contents.
+    END_NO_REMOTE_COMPOSITE = 1 << 2  // Do not schedule a composition with a
+                                      // remote Compositor, if one exists.
+  };
+
+  FrameLayerBuilder* GetLayerBuilder() {
+    return reinterpret_cast<FrameLayerBuilder*>(
+        GetUserData(&gLayerManagerLayerBuilder));
+  }
+
+  /**
+   * Attempts to end an "empty transaction". There must have been no
+   * changes to the layer tree since the BeginTransaction().
+   * It's possible for this to fail; PaintedLayers may need to be updated
+   * due to VRAM data being lost, for example. In such cases this method
+   * returns false, and the caller must proceed with a normal layer tree
+   * update and EndTransaction.
+   */
+  virtual bool EndEmptyTransaction(
+      EndTransactionFlags aFlags = END_DEFAULT) = 0;
+
+  /**
+   * Function called to draw the contents of each PaintedLayer.
+   * aRegionToDraw contains the region that needs to be drawn.
+   * This would normally be a subregion of the visible region.
+   * The callee must draw all of aRegionToDraw. Drawing outside
+   * aRegionToDraw will be clipped out or ignored.
+   * The callee must draw all of aRegionToDraw.
+   * This region is relative to 0,0 in the PaintedLayer.
+   *
+   * aDirtyRegion should contain the total region that is be due to be painted
+   * during the transaction, even though only aRegionToDraw should be drawn
+   * during this call. aRegionToDraw must be entirely contained within
+   * aDirtyRegion. If the total dirty region is unknown it is okay to pass a
+   * subregion of the total dirty region, e.g. just aRegionToDraw, though it
+   * may not be as efficient.
+   *
+   * aRegionToInvalidate contains a region whose contents have been
+   * changed by the layer manager and which must therefore be invalidated.
+   * For example, this could be non-empty if a retained layer internally
+   * switches from RGBA to RGB or back ... we might want to repaint it to
+   * consistently use subpixel-AA or not.
+   * This region is relative to 0,0 in the PaintedLayer.
+   * aRegionToInvalidate may contain areas that are outside
+   * aRegionToDraw; the callee must ensure that these areas are repainted
+   * in the current layer manager transaction or in a later layer
+   * manager transaction.
+   *
+   * aContext must not be used after the call has returned.
+   * We guarantee that buffered contents in the visible
+   * region are valid once drawing is complete.
+   *
+   * The origin of aContext is 0,0 in the PaintedLayer.
+   */
+  typedef void (*DrawPaintedLayerCallback)(
+      PaintedLayer* aLayer, gfxContext* aContext,
+      const nsIntRegion& aRegionToDraw, const nsIntRegion& aDirtyRegion,
+      DrawRegionClip aClip, const nsIntRegion& aRegionToInvalidate,
+      void* aCallbackData);
+
+  /**
+   * Finish the construction phase of the transaction, perform the
+   * drawing phase, and end the transaction.
+   * During the drawing phase, all PaintedLayers in the tree are
+   * drawn in tree order, exactly once each, except for those layers
+   * where it is known that the visible region is empty.
+   */
+  virtual void EndTransaction(DrawPaintedLayerCallback aCallback,
+                              void* aCallbackData,
+                              EndTransactionFlags aFlags = END_DEFAULT) = 0;
+
+  /**
+   * Schedule a composition with the remote Compositor, if one exists
+   * for this LayerManager. Useful in conjunction with the
+   * END_NO_REMOTE_COMPOSITE flag to EndTransaction.
+   */
+  virtual void ScheduleComposite() {}
+
+  virtual void SetNeedsComposite(bool aNeedsComposite) {}
+  virtual bool NeedsComposite() const { return false; }
+
+  virtual bool HasShadowManagerInternal() const { return false; }
+  bool HasShadowManager() const { return HasShadowManagerInternal(); }
+  virtual void StorePluginWidgetConfigurations(
+      const nsTArray<nsIWidget::Configuration>& aConfigurations) {}
+  bool IsSnappingEffectiveTransforms() { return mSnapEffectiveTransforms; }
+
+  /**
+   * Returns true if the underlying platform can properly support layers with
+   * SurfaceMode::SURFACE_COMPONENT_ALPHA.
+   */
+  static bool LayersComponentAlphaEnabled();
+
+  /**
+   * Returns true if this LayerManager can properly support layers with
+   * SurfaceMode::SURFACE_COMPONENT_ALPHA. LayerManagers that can't will use
+   * transparent surfaces (and lose subpixel-AA for text).
+   */
+  virtual bool AreComponentAlphaLayersEnabled();
+
+  /**
+   * Returns true if this LayerManager always requires an intermediate surface
+   * to render blend operations.
+   */
+  virtual bool BlendingRequiresIntermediateSurface() { return false; }
+
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Set the root layer. The root layer is initially null. If there is
+   * no root layer, EndTransaction won't draw anything.
+   */
+  virtual void SetRoot(Layer* aLayer) = 0;
+  /**
+   * Can be called anytime
+   */
+  Layer* GetRoot() { return mRoot; }
+
+  /**
+   * Does a breadth-first search from the root layer to find the first
+   * scrollable layer, and returns its ViewID. Note that there may be
+   * other layers in the tree which share the same ViewID.
+   * Can be called any time.
+   */
+  ScrollableLayerGuid::ViewID GetRootScrollableLayerId();
+
+  /**
+   * Returns a LayerMetricsWrapper containing the Root
+   * Content Documents layer.
+   */
+  LayerMetricsWrapper GetRootContentLayer();
+
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Called when a managee has mutated.
+   * Subclasses overriding this method must first call their
+   * superclass's impl
+   */
+  virtual void Mutated(Layer* aLayer) {}
+  virtual void MutatedSimple(Layer* aLayer) {}
+
+  /**
+   * Hints that can be used during PaintedLayer creation to influence the type
+   * or properties of the layer created.
+   *
+   * NONE: No hint.
+   * SCROLLABLE: This layer may represent scrollable content.
+   */
+  enum PaintedLayerCreationHint { NONE, SCROLLABLE };
+
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a PaintedLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<PaintedLayer> CreatePaintedLayer() = 0;
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a PaintedLayer for this manager's layer tree, with a creation hint
+   * parameter to help optimise the type of layer created.
+   */
+  virtual already_AddRefed<PaintedLayer> CreatePaintedLayerWithHint(
+      PaintedLayerCreationHint) {
+    return CreatePaintedLayer();
+  }
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a ContainerLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<ContainerLayer> CreateContainerLayer() = 0;
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create an ImageLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<ImageLayer> CreateImageLayer() = 0;
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a ColorLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<ColorLayer> CreateColorLayer() = 0;
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a CanvasLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<CanvasLayer> CreateCanvasLayer() = 0;
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a ReadbackLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<ReadbackLayer> CreateReadbackLayer() {
+    return nullptr;
+  }
+  /**
+   * CONSTRUCTION PHASE ONLY
+   * Create a RefLayer for this manager's layer tree.
+   */
+  virtual already_AddRefed<RefLayer> CreateRefLayer() { return nullptr; }
+  /**
+   * Can be called anytime, from any thread.
+   *
+   * Creates an Image container which forwards its images to the compositor
+   * within layer transactions on the main thread or asynchronously using the
+   * ImageBridge IPDL protocol. In the case of asynchronous, If the protocol is
+   * not available, the returned ImageContainer will forward images within layer
+   * transactions.
+   */
+  static already_AddRefed<ImageContainer> CreateImageContainer(
+      ImageContainer::Mode flag = ImageContainer::SYNCHRONOUS);
+
+  /**
+   * Type of layer manager his is. This is to be used sparsely in order to
+   * avoid a lot of Layers backend specific code. It should be used only when
+   * Layers backend specific functionality is necessary.
+   */
+  virtual LayersBackend GetBackendType() = 0;
+
+  /**
+   * Type of layers backend that will be used to composite this layer tree.
+   * When compositing is done remotely, then this returns the layers type
+   * of the compositor.
+   */
+  virtual LayersBackend GetCompositorBackendType() { return GetBackendType(); }
+
+  /**
+   * Creates a DrawTarget which is optimized for inter-operating with this
+   * layer manager.
+   */
+  virtual already_AddRefed<DrawTarget> CreateOptimalDrawTarget(
+      const IntSize& aSize, SurfaceFormat imageFormat);
+
+  /**
+   * Creates a DrawTarget for alpha masks which is optimized for inter-
+   * operating with this layer manager. In contrast to CreateOptimalDrawTarget,
+   * this surface is optimised for drawing alpha only and we assume that
+   * drawing the mask is fairly simple.
+   */
+  virtual already_AddRefed<DrawTarget> CreateOptimalMaskDrawTarget(
+      const IntSize& aSize);
+
+  /**
+   * Creates a DrawTarget for use with canvas which is optimized for
+   * inter-operating with this layermanager.
+   */
+  virtual already_AddRefed<mozilla::gfx::DrawTarget> CreateDrawTarget(
+      const mozilla::gfx::IntSize& aSize, mozilla::gfx::SurfaceFormat aFormat);
+
+  /**
+   * Creates a PersistentBufferProvider for use with canvas which is optimized
+   * for inter-operating with this layermanager.
+   */
+  virtual already_AddRefed<PersistentBufferProvider>
+  CreatePersistentBufferProvider(const mozilla::gfx::IntSize& aSize,
+                                 mozilla::gfx::SurfaceFormat aFormat);
+
+  virtual bool CanUseCanvasLayerForSize(const gfx::IntSize& aSize) {
+    return true;
+  }
+
+  /**
+   * returns the maximum texture size on this layer backend, or INT32_MAX
+   * if there is no maximum
+   */
+  virtual int32_t GetMaxTextureSize() const = 0;
+
+  /**
+   * Return the name of the layer manager's backend.
+   */
+  virtual void GetBackendName(nsAString& aName) = 0;
+
+  /**
+   * This setter can be used anytime. The user data for all keys is
+   * initially null. Ownership pases to the layer manager.
+   */
+  void SetUserData(void* aKey, LayerUserData* aData) {
+    mUserData.Add(static_cast<gfx::UserDataKey*>(aKey), aData,
+                  LayerUserDataDestroy);
+  }
+  /**
+   * This can be used anytime. Ownership passes to the caller!
+   */
+  UniquePtr<LayerUserData> RemoveUserData(void* aKey);
+
+  /**
+   * This getter can be used anytime.
+   */
+  bool HasUserData(void* aKey) {
+    return mUserData.Has(static_cast<gfx::UserDataKey*>(aKey));
+  }
+  /**
+   * This getter can be used anytime. Ownership is retained by the layer
+   * manager.
+   */
+  LayerUserData* GetUserData(void* aKey) const {
+    return static_cast<LayerUserData*>(
+        mUserData.Get(static_cast<gfx::UserDataKey*>(aKey)));
+  }
+
+  /**
+   * Must be called outside of a layers transaction.
+   *
+   * For the subtree rooted at |aSubtree|, this attempts to free up
+   * any free-able resources like retained buffers, but may do nothing
+   * at all.  After this call, the layer tree is left in an undefined
+   * state; the layers in |aSubtree|'s subtree may no longer have
+   * buffers with valid content and may no longer be able to draw
+   * their visible and valid regions.
+   *
+   * In general, a painting or forwarding transaction on |this| must
+   * complete on the tree before it returns to a valid state.
+   *
+   * Resource freeing begins from |aSubtree| or |mRoot| if |aSubtree|
+   * is null.  |aSubtree|'s manager must be this.
+   */
+  virtual void ClearCachedResources(Layer* aSubtree = nullptr) {}
+
+  /**
+   * Flag the next paint as the first for a document.
+   */
+  virtual void SetIsFirstPaint() {}
+  virtual bool GetIsFirstPaint() const { return false; }
+
+  /**
+   * Set the current focus target to be sent with the next paint.
+   */
+  virtual void SetFocusTarget(const FocusTarget& aFocusTarget) {}
+
+  /**
+   * Make sure that the previous transaction has been entirely
+   * completed.
+   *
+   * Note: This may sychronously wait on a remote compositor
+   * to complete rendering.
+   */
+  virtual void FlushRendering() {}
+
+  /**
+   * Make sure that the previous transaction has been
+   * received. This will synchronsly wait on a remote compositor. */
+  virtual void WaitOnTransactionProcessed() {}
+
+  virtual void SendInvalidRegion(const nsIntRegion& aRegion) {}
+
+  /**
+   * Checks if we need to invalidate the OS widget to trigger
+   * painting when updating this layer manager.
+   */
+  virtual bool NeedsWidgetInvalidation() { return true; }
+
+  virtual const char* Name() const { return "???"; }
+
+  /**
+   * Dump information about this layer manager and its managed tree to
+   * aStream.
+   */
+  void Dump(std::stringstream& aStream, const char* aPrefix = "",
+            bool aDumpHtml = false, bool aSorted = false);
+  /**
+   * Dump information about just this layer manager itself to aStream
+   */
+  void DumpSelf(std::stringstream& aStream, const char* aPrefix = "",
+                bool aSorted = false);
+  void Dump(bool aSorted = false);
+
+  /**
+   * Dump information about this layer manager and its managed tree to
+   * layerscope packet.
+   */
+  void Dump(layerscope::LayersPacket* aPacket);
+
+  /**
+   * Log information about this layer manager and its managed tree to
+   * the NSPR log (if enabled for "Layers").
+   */
+  void Log(const char* aPrefix = "");
+  /**
+   * Log information about just this layer manager itself to the NSPR
+   * log (if enabled for "Layers").
+   */
+  void LogSelf(const char* aPrefix = "");
+
+  static bool IsLogEnabled();
+  static mozilla::LogModule* GetLog();
+
+  bool IsCompositingCheap(LayersBackend aBackend) {
+    // LayersBackend::LAYERS_NONE is an error state, but in that case we should
+    // try to avoid loading the compositor!
+    return LayersBackend::LAYERS_BASIC != aBackend &&
+           LayersBackend::LAYERS_NONE != aBackend;
+  }
+
+  virtual bool IsCompositingCheap() { return true; }
+
+  bool IsInTransaction() const { return mInTransaction; }
+  virtual void GetFrameUniformity(FrameUniformityData* aOutData) {}
+
+  virtual void SetRegionToClear(const nsIntRegion& aRegion) {
+    mRegionToClear = aRegion;
+  }
+
+  virtual float RequestProperty(const nsAString& property) { return -1; }
+
+  const TimeStamp& GetAnimationReadyTime() const { return mAnimationReadyTime; }
+
+  virtual bool AsyncPanZoomEnabled() const { return false; }
+
+  static void LayerUserDataDestroy(void* data);
+
+  void AddPaintedPixelCount(int32_t aCount) { mPaintedPixelCount += aCount; }
+
+  uint32_t GetAndClearPaintedPixelCount() {
+    uint32_t count = mPaintedPixelCount;
+    mPaintedPixelCount = 0;
+    return count;
+  }
+
+  virtual void SetLayersObserverEpoch(LayersObserverEpoch aEpoch) {}
+
+  virtual void DidComposite(TransactionId aTransactionId,
+                            const mozilla::TimeStamp& aCompositeStart,
+                            const mozilla::TimeStamp& aCompositeEnd) {}
+
+  virtual void AddDidCompositeObserver(DidCompositeObserver* aObserver) {
+    MOZ_CRASH("GFX: LayerManager");
+  }
+  virtual void RemoveDidCompositeObserver(DidCompositeObserver* aObserver) {
+    MOZ_CRASH("GFX: LayerManager");
+  }
+
+  virtual void UpdateTextureFactoryIdentifier(
+      const TextureFactoryIdentifier& aNewIdentifier) {}
+
+  virtual TextureFactoryIdentifier GetTextureFactoryIdentifier() {
+    return TextureFactoryIdentifier();
+  }
+
+  virtual void SetTransactionIdAllocator(TransactionIdAllocator* aAllocator) {}
+
+  virtual TransactionId GetLastTransactionId() { return TransactionId{0}; }
+
+  virtual CompositorBridgeChild* GetCompositorBridgeChild() { return nullptr; }
+
+  void RegisterPayload(const CompositionPayload& aPayload) {
+    mPayload.AppendElement(aPayload);
+    MOZ_ASSERT(mPayload.Length() < 10000);
+  }
+
+  void RegisterPayloads(const nsTArray<CompositionPayload>& aPayload) {
+    mPayload.AppendElements(aPayload);
+    MOZ_ASSERT(mPayload.Length() < 10000);
+  }
+
+  virtual void PayloadPresented(const TimeStamp& aTimeStamp);
+
+  void SetContainsSVG(bool aContainsSVG) { mContainsSVG = aContainsSVG; }
+
+  void AddPartialPrerenderedAnimation(uint64_t aCompositorAnimationId,
+                                      dom::Animation* aAnimation);
+  void RemovePartialPrerenderedAnimation(uint64_t aCompositorAnimationId,
+                                         dom::Animation* aAnimation);
+  void UpdatePartialPrerenderedAnimations(
+      const nsTArray<uint64_t>& aJankedAnimations);
+
+ protected:
+  RefPtr<Layer> mRoot;
+  gfx::UserData mUserData;
+  bool mDestroyed;
+  bool mSnapEffectiveTransforms;
+
+  nsIntRegion mRegionToClear;
+
+  // Protected destructor, to discourage deletion outside of Release():
+  virtual ~LayerManager();
+
+  // Print interesting information about this into aStreamo.  Internally
+  // used to implement Dump*() and Log*().
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
+
+  // Print interesting information about this into layerscope packet.
+  // Internally used to implement Dump().
+  virtual void DumpPacket(layerscope::LayersPacket* aPacket);
+
+  uint64_t mId;
+  bool mInTransaction;
+
+  // Used for tracking CONTENT_FRAME_TIME_WITH_SVG
+  bool mContainsSVG;
+  // The time when painting most recently finished. This is recorded so that
+  // we can time any play-pending animations from this point.
+  TimeStamp mAnimationReadyTime;
+  // The count of pixels that were painted in the current transaction.
+  uint32_t mPaintedPixelCount;
+  // The payload associated with currently pending painting work, for
+  // client layer managers that typically means payload that is part of the
+  // 'upcoming transaction', for HostLayerManagers this typically means
+  // what has been included in received transactions to be presented on the
+  // next composite.
+  // IMPORTANT: Clients should take care to clear this or risk it slowly
+  // growing out of control.
+  nsTArray<CompositionPayload> mPayload;
+  // Transform animations which are not fully pre-rendered because it's on a
+  // large frame.  We need to update the pre-rendered area once after we tried
+  // to composite area which is outside of the pre-rendered area on the
+  // compositor.
+  nsRefPtrHashtable<nsUint64HashKey, dom::Animation>
+      mPartialPrerenderedAnimations;
+
+ public:
+  /*
+   * Methods to store/get/clear a "pending scroll info update" object on a
+   * per-scrollid basis. This is used for empty transactions that push over
+   * scroll position updates to the APZ code.
+   */
+  virtual bool AddPendingScrollUpdateForNextTransaction(
+      ScrollableLayerGuid::ViewID aScrollId,
+      const ScrollPositionUpdate& aUpdateInfo);
+  Maybe<nsTArray<ScrollPositionUpdate>> GetPendingScrollInfoUpdate(
+      ScrollableLayerGuid::ViewID aScrollId);
+  std::unordered_set<ScrollableLayerGuid::ViewID>
+  ClearPendingScrollInfoUpdate();
+
+ protected:
+  ScrollUpdatesMap mPendingScrollUpdates;
+};
+
+}  // namespace layers
+}  // namespace mozilla
+
+#endif /* GFX_LAYERS_H */
diff -Nru firefox-84.0.2+build1/gfx/layers/LayerScope.cpp firefox-85.0+build1/gfx/layers/LayerScope.cpp
--- firefox-84.0.2+build1/gfx/layers/LayerScope.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/LayerScope.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/Base64.h"
 #include "mozilla/SHA1.h"
 #include "mozilla/StaticPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsISocketTransport.h"
 #include "nsIServerSocket.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/Layers.cpp firefox-85.0+build1/gfx/layers/Layers.cpp
--- firefox-84.0.2+build1/gfx/layers/Layers.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/Layers.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,53 +5,58 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Layers.h"
-#include <algorithm>  // for max, min
-#include "apz/src/AsyncPanZoomController.h"
+
+#include <inttypes.h>          // for PRIu64
+#include <stdio.h>             // for stderr
+#include <algorithm>           // for max, min
+#include <list>                // for list
+#include <set>                 // for set
+#include <string>              // for char_traits, string, basic_string
+#include <type_traits>         // for remove_reference<>::type
 #include "CompositableHost.h"  // for CompositableHost
-#include "ImageContainer.h"    // for ImageContainer, etc
-#include "ImageLayers.h"       // for ImageLayer
-#include "LayerSorter.h"       // for SortLayersBy3DZOrder
-#include "LayerUserData.h"
-#include "ReadbackLayer.h"   // for ReadbackLayer
-#include "UnitTransforms.h"  // for ViewAs
-#include "gfxEnv.h"
-#include "gfxPlatform.h"  // for gfxPlatform
-#include "gfxUtils.h"     // for gfxUtils, etc
-#include "gfx2DGlue.h"
-#include "mozilla/DebugOnly.h"  // for DebugOnly
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/StaticPrefs_layers.h"
-#include "mozilla/Telemetry.h"  // for Accumulate
-#include "mozilla/ToString.h"
-#include "mozilla/dom/Animation.h"              // for dom::Animation
-#include "mozilla/dom/KeyframeEffect.h"         // for dom::Animation
-#include "mozilla/EffectSet.h"                  // for dom::Animation
-#include "mozilla/gfx/2D.h"                     // for DrawTarget
-#include "mozilla/gfx/BaseSize.h"               // for BaseSize
-#include "mozilla/gfx/Matrix.h"                 // for Matrix4x4
-#include "mozilla/gfx/Polygon.h"                // for Polygon
-#include "mozilla/layers/BSPTree.h"             // for BSPTree
-#include "mozilla/layers/CompositableClient.h"  // for CompositableClient
-#include "mozilla/layers/Compositor.h"          // for Compositor
-#include "mozilla/layers/CompositorTypes.h"
-#include "mozilla/layers/LayerManagerComposite.h"  // for LayerComposite
-#include "mozilla/layers/LayerMetricsWrapper.h"    // for LayerMetricsWrapper
-#include "mozilla/layers/LayersMessages.h"         // for TransformFunction, etc
-#include "mozilla/layers/LayersTypes.h"            // for TextureDumpMode
-#include "mozilla/layers/PersistentBufferProvider.h"
+#include "GeckoProfiler.h"  // for profiler_can_accept_markers, PROFILER_MARKER_TEXT
+#include "ImageLayers.h"    // for ImageLayer
+#include "LayerUserData.h"  // for LayerUserData
+#include "ReadbackLayer.h"  // for ReadbackLayer
+#include "TreeTraversal.h"  // for ForwardIterator, ForEachNode, DepthFirstSearch, TraversalFlag, TraversalFl...
+#include "UnitTransforms.h"  // for ViewAs, PixelCastJustification, PixelCastJustification::RenderTargetIsPare...
+#include "apz/src/AsyncPanZoomController.h"  // for AsyncPanZoomController
+#include "gfx2DGlue.h"              // for ThebesMatrix, ToPoint, ThebesRect
+#include "gfxEnv.h"                 // for gfxEnv
+#include "gfxMatrix.h"              // for gfxMatrix
+#include "gfxUtils.h"               // for gfxUtils, gfxUtils::sDumpPaintFile
+#include "mozilla/ArrayIterator.h"  // for ArrayIterator
+#include "mozilla/BaseProfilerMarkersPrerequisites.h"  // for MarkerTiming
+#include "mozilla/DebugOnly.h"                         // for DebugOnly
+#include "mozilla/Logging.h"  // for LogLevel, LogLevel::Debug, MOZ_LOG_TEST
+#include "mozilla/ScrollPositionUpdate.h"  // for ScrollPositionUpdate
+#include "mozilla/Telemetry.h"             // for AccumulateTimeDelta
+#include "mozilla/TelemetryHistogramEnums.h"  // for KEYPRESS_PRESENT_LATENCY, SCROLL_PRESENT_LATENCY
+#include "mozilla/ToString.h"  // for ToString
+#include "mozilla/gfx/2D.h"  // for SourceSurface, DrawTarget, DataSourceSurface
+#include "mozilla/gfx/BasePoint3D.h"  // for BasePoint3D<>::(anonymous union)::(anonymous), BasePoint3D<>::(anonymous)
+#include "mozilla/gfx/BaseRect.h"  // for operator<<, BaseRect (ptr only)
+#include "mozilla/gfx/BaseSize.h"  // for operator<<, BaseSize<>::(anonymous union)::(anonymous), BaseSize<>::(anony...
+#include "mozilla/gfx/Matrix.h"  // for Matrix4x4, Matrix, Matrix4x4Typed<>::(anonymous union)::(anonymous), Matri...
+#include "mozilla/gfx/MatrixFwd.h"                 // for Float
+#include "mozilla/gfx/Polygon.h"                   // for Polygon, PolygonTyped
+#include "mozilla/layers/BSPTree.h"                // for LayerPolygon, BSPTree
+#include "mozilla/layers/CompositableClient.h"     // for CompositableClient
+#include "mozilla/layers/Compositor.h"             // for Compositor
+#include "mozilla/layers/LayerManagerComposite.h"  // for HostLayer
+#include "mozilla/layers/LayersMessages.h"  // for SpecificLayerAttributes, CompositorAnimations (ptr only), ContainerLayerAt...
+#include "mozilla/layers/LayersTypes.h"  // for EventRegions, operator<<, CompositionPayload, CSSTransformMatrix, MOZ_LAYE...
 #include "mozilla/layers/ShadowLayers.h"  // for ShadowableLayer
-#include "nsAString.h"
-#include "nsCSSValue.h"       // for nsCSSValue::Array, etc
-#include "nsDisplayList.h"    // for nsDisplayItem
-#include "nsPrintfCString.h"  // for nsPrintfCString
-#include "protobuf/LayerScopePacket.pb.h"
-#include "mozilla/Compression.h"
-#include "TreeTraversal.h"  // for ForEachNode
+#include "nsBaseHashtable.h"  // for nsBaseHashtable<>::Iterator, nsBaseHashtable<>::LookupResult
+#include "nsISupportsUtils.h"              // for NS_ADDREF, NS_RELEASE
+#include "nsPrintfCString.h"               // for nsPrintfCString
+#include "nsRegionFwd.h"                   // for IntRegion
+#include "nsString.h"                      // for nsTSubstring
+#include "protobuf/LayerScopePacket.pb.h"  // for LayersPacket::Layer, LayersPacket, LayersPacket_Layer::Matrix, LayersPacke...
 
-#include <list>
-#include <set>
-
-uint8_t gLayerManagerLayerBuilder;
+// Undo the damage done by mozzconf.h
+#undef compress
+#include "mozilla/Compression.h"
 
 namespace mozilla {
 namespace layers {
@@ -62,152 +67,6 @@
 using namespace mozilla::Compression;
 
 //--------------------------------------------------
-// LayerManager
-
-/* static */ mozilla::LogModule* LayerManager::GetLog() {
-  static LazyLogModule sLog("Layers");
-  return sLog;
-}
-
-ScrollableLayerGuid::ViewID LayerManager::GetRootScrollableLayerId() {
-  if (!mRoot) {
-    return ScrollableLayerGuid::NULL_SCROLL_ID;
-  }
-
-  LayerMetricsWrapper layerMetricsRoot = LayerMetricsWrapper(mRoot);
-
-  LayerMetricsWrapper rootScrollableLayerMetrics =
-      BreadthFirstSearch<ForwardIterator>(
-          layerMetricsRoot, [](LayerMetricsWrapper aLayerMetrics) {
-            return aLayerMetrics.Metrics().IsScrollable();
-          });
-
-  return rootScrollableLayerMetrics.IsValid()
-             ? rootScrollableLayerMetrics.Metrics().GetScrollId()
-             : ScrollableLayerGuid::NULL_SCROLL_ID;
-}
-
-LayerMetricsWrapper LayerManager::GetRootContentLayer() {
-  if (!mRoot) {
-    return LayerMetricsWrapper();
-  }
-
-  LayerMetricsWrapper root(mRoot);
-
-  return BreadthFirstSearch<ForwardIterator>(
-      root, [](LayerMetricsWrapper aLayerMetrics) {
-        return aLayerMetrics.Metrics().IsRootContent();
-      });
-}
-
-already_AddRefed<DrawTarget> LayerManager::CreateOptimalDrawTarget(
-    const gfx::IntSize& aSize, SurfaceFormat aFormat) {
-  return gfxPlatform::GetPlatform()->CreateOffscreenContentDrawTarget(aSize,
-                                                                      aFormat);
-}
-
-already_AddRefed<DrawTarget> LayerManager::CreateOptimalMaskDrawTarget(
-    const gfx::IntSize& aSize) {
-  return CreateOptimalDrawTarget(aSize, SurfaceFormat::A8);
-}
-
-already_AddRefed<DrawTarget> LayerManager::CreateDrawTarget(
-    const IntSize& aSize, SurfaceFormat aFormat) {
-  return gfxPlatform::GetPlatform()->CreateOffscreenCanvasDrawTarget(aSize,
-                                                                     aFormat);
-}
-
-already_AddRefed<PersistentBufferProvider>
-LayerManager::CreatePersistentBufferProvider(
-    const mozilla::gfx::IntSize& aSize, mozilla::gfx::SurfaceFormat aFormat) {
-  RefPtr<PersistentBufferProviderBasic> bufferProvider =
-      PersistentBufferProviderBasic::Create(
-          aSize, aFormat,
-          gfxPlatform::GetPlatform()->GetPreferredCanvasBackend());
-
-  if (!bufferProvider) {
-    bufferProvider = PersistentBufferProviderBasic::Create(
-        aSize, aFormat, gfxPlatform::GetPlatform()->GetFallbackCanvasBackend());
-  }
-
-  return bufferProvider.forget();
-}
-
-already_AddRefed<ImageContainer> LayerManager::CreateImageContainer(
-    ImageContainer::Mode flag) {
-  RefPtr<ImageContainer> container = new ImageContainer(flag);
-  return container.forget();
-}
-
-bool LayerManager::LayersComponentAlphaEnabled() {
-  // If MOZ_GFX_OPTIMIZE_MOBILE is defined, we force component alpha off
-  // and ignore the preference.
-#ifdef MOZ_GFX_OPTIMIZE_MOBILE
-  return false;
-#else
-  return StaticPrefs::
-      layers_componentalpha_enabled_AtStartup_DoNotUseDirectly();
-#endif
-}
-
-bool LayerManager::AreComponentAlphaLayersEnabled() {
-  return LayerManager::LayersComponentAlphaEnabled();
-}
-
-/*static*/
-void LayerManager::LayerUserDataDestroy(void* data) {
-  delete static_cast<LayerUserData*>(data);
-}
-
-UniquePtr<LayerUserData> LayerManager::RemoveUserData(void* aKey) {
-  UniquePtr<LayerUserData> d(static_cast<LayerUserData*>(
-      mUserData.Remove(static_cast<gfx::UserDataKey*>(aKey))));
-  return d;
-}
-
-void LayerManager::PayloadPresented() {
-  RecordCompositionPayloadsPresented(mPayload);
-}
-
-void LayerManager::AddPartialPrerenderedAnimation(
-    uint64_t aCompositorAnimationId, dom::Animation* aAnimation) {
-  mPartialPrerenderedAnimations.Put(aCompositorAnimationId, RefPtr{aAnimation});
-  aAnimation->SetPartialPrerendered(aCompositorAnimationId);
-}
-
-void LayerManager::RemovePartialPrerenderedAnimation(
-    uint64_t aCompositorAnimationId, dom::Animation* aAnimation) {
-  MOZ_ASSERT(aAnimation);
-#ifdef DEBUG
-  RefPtr<dom::Animation> animation;
-  if (mPartialPrerenderedAnimations.Remove(aCompositorAnimationId,
-                                           getter_AddRefs(animation)) &&
-      // It may be possible that either animation's effect has already been
-      // nulled out via Animation::SetEffect() so ignore such cases.
-      aAnimation->GetEffect() && aAnimation->GetEffect()->AsKeyframeEffect() &&
-      animation->GetEffect() && animation->GetEffect()->AsKeyframeEffect()) {
-    MOZ_ASSERT(EffectSet::GetEffectSetForEffect(
-                   aAnimation->GetEffect()->AsKeyframeEffect()) ==
-               EffectSet::GetEffectSetForEffect(
-                   animation->GetEffect()->AsKeyframeEffect()));
-  }
-#else
-  mPartialPrerenderedAnimations.Remove(aCompositorAnimationId);
-#endif
-  aAnimation->ResetPartialPrerendered();
-}
-
-void LayerManager::UpdatePartialPrerenderedAnimations(
-    const nsTArray<uint64_t>& aJankedAnimations) {
-  for (uint64_t id : aJankedAnimations) {
-    RefPtr<dom::Animation> animation;
-    if (mPartialPrerenderedAnimations.Remove(id, getter_AddRefs(animation))) {
-      animation->UpdatePartialPrerendered();
-    }
-  }
-}
-
-//--------------------------------------------------
 // Layer
 
 Layer::Layer(LayerManager* aManager, void* aImplData)
@@ -2351,9 +2210,10 @@
 }
 
 void RecordCompositionPayloadsPresented(
+    const TimeStamp& aCompositionEndTime,
     const nsTArray<CompositionPayload>& aPayloads) {
   if (aPayloads.Length()) {
-    TimeStamp presented = TimeStamp::Now();
+    TimeStamp presented = aCompositionEndTime;
     for (const CompositionPayload& payload : aPayloads) {
 #if MOZ_GECKO_PROFILER
       if (profiler_can_accept_markers()) {
diff -Nru firefox-84.0.2+build1/gfx/layers/Layers.h firefox-85.0+build1/gfx/layers/Layers.h
--- firefox-84.0.2+build1/gfx/layers/Layers.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/Layers.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,108 +7,78 @@
 #ifndef GFX_LAYERS_H
 #define GFX_LAYERS_H
 
-#include <map>
-#include <unordered_set>
-#include <stdint.h>        // for uint32_t, uint64_t, uint8_t
-#include <stdio.h>         // for FILE
-#include <sys/types.h>     // for int32_t
-#include "FrameMetrics.h"  // for FrameMetrics
-#include "Units.h"         // for LayerMargin, LayerPoint, ParentLayerIntRect
-#include "gfxContext.h"
-#include "gfxTypes.h"
-#include "gfxPoint.h"  // for gfxPoint
-#include "gfxRect.h"   // for gfxRect
-#include "gfx2DGlue.h"
-#include "mozilla/Assertions.h"  // for MOZ_ASSERT_HELPER2, etc
-#include "mozilla/Array.h"
-#include "mozilla/DebugOnly.h"      // for DebugOnly
-#include "mozilla/EventForwards.h"  // for nsPaintEvent
-#include "mozilla/Maybe.h"          // for Maybe
-#include "mozilla/Poison.h"
-#include "mozilla/RefPtr.h"                // for already_AddRefed
-#include "mozilla/TimeStamp.h"             // for TimeStamp, TimeDuration
-#include "mozilla/UniquePtr.h"             // for UniquePtr
-#include "mozilla/dom/Animation.h"         // for dom::Animation
-#include "mozilla/gfx/BaseMargin.h"        // for BaseMargin
-#include "mozilla/gfx/BasePoint.h"         // for BasePoint
-#include "mozilla/gfx/Point.h"             // for IntSize
-#include "mozilla/gfx/TiledRegion.h"       // for TiledIntRegion
-#include "mozilla/gfx/Types.h"             // for SurfaceFormat
-#include "mozilla/gfx/UserData.h"          // for UserData, etc
+#include <cstdint>        // for uint32_t, uint64_t, int32_t, uint8_t
+#include <cstring>        // for memcpy, size_t
+#include <iosfwd>         // for stringstream
+#include <new>            // for operator new
+#include <unordered_set>  // for unordered_set
+#include <utility>        // for forward, move
+#include "FrameMetrics.h"  // for ScrollMetadata, FrameMetrics::ViewID, FrameMetrics
+#include "Units.h"  // for LayerIntRegion, ParentLayerIntRect, LayerIntSize, Lay...
+#include "gfxPoint.h"           // for gfxPoint
+#include "gfxRect.h"            // for gfxRect
+#include "mozilla/Maybe.h"      // for Maybe, Nothing (ptr only)
+#include "mozilla/Poison.h"     // for CorruptionCanary
+#include "mozilla/RefPtr.h"     // for RefPtr, operator!=
+#include "mozilla/TimeStamp.h"  // for TimeStamp
+#include "mozilla/UniquePtr.h"  // for UniquePtr, MakeUnique
+#include "mozilla/gfx/BasePoint.h"  // for BasePoint<>::(anonymous union)::(anonymous), BasePoin...
+#include "mozilla/gfx/BaseSize.h"     // for BaseSize
+#include "mozilla/gfx/Matrix.h"       // for Matrix4x4, Matrix, Matrix4x4Typed
+#include "mozilla/gfx/Point.h"        // for Point, PointTyped
+#include "mozilla/gfx/Polygon.h"      // for Polygon
+#include "mozilla/gfx/Rect.h"         // for IntRectTyped, IntRect
+#include "mozilla/gfx/TiledRegion.h"  // for TiledIntRegion
+#include "mozilla/gfx/Types.h"  // for CompositionOp, DeviceColor, SamplingFilter, SideBits
+#include "mozilla/gfx/UserData.h"  // for UserData, UserDataKey (ptr only)
 #include "mozilla/layers/AnimationInfo.h"  // for AnimationInfo
-#include "mozilla/layers/BSPTree.h"        // for LayerPolygon
-#include "mozilla/layers/CanvasRenderer.h"
-#include "mozilla/layers/LayerAttributes.h"
-#include "mozilla/layers/LayersTypes.h"
-#include "mozilla/webrender/WebRenderTypes.h"
-#include "mozilla/mozalloc.h"        // for operator delete, etc
-#include "nsCOMPtr.h"                // for already_AddRefed
-#include "nsCSSPropertyID.h"         // for nsCSSPropertyID
-#include "nsDebug.h"                 // for NS_ASSERTION
-#include "nsISupportsImpl.h"         // for Layer::Release, etc
-#include "nsRect.h"                  // for mozilla::gfx::IntRect
-#include "nsRefPtrHashtable.h"       // for nsRefPtrHashtable
-#include "nsRegion.h"                // for nsIntRegion
-#include "nsString.h"                // for nsCString
-#include "nsTArray.h"                // for nsTArray
-#include "nsTArrayForwardDeclare.h"  // for nsTArray
-#include "nscore.h"                  // for nsACString, nsAString
-#include "mozilla/Logging.h"         // for PRLogModuleInfo
-#include "nsIWidget.h"  // For plugin window configuration information structs
-#include "ImageContainer.h"
-
-class gfxContext;
-class nsDisplayListBuilder;
-class nsDisplayItem;
-
-extern uint8_t gLayerManagerLayerBuilder;
+#include "mozilla/layers/LayerAttributes.h"  // for SimpleLayerAttributes, ScrollbarData (ptr only)
+#include "mozilla/layers/LayerManager.h"  // for LayerManager, LayerManager::PaintedLayerCreationHint
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::ViewID
+#include "nsISupports.h"    // for NS_INLINE_DECL_REFCOUNTING
+#include "nsPoint.h"        // for nsIntPoint
+#include "nsRect.h"         // for nsIntRect
+#include "nsRegion.h"       // for nsIntRegion
+#include "nsStringFlags.h"  // for operator&
+#include "nsStringFwd.h"    // for nsCString, nsACString
+#include "nsTArray.h"  // for nsTArray, nsTArray_Impl, nsTArray_Impl<>::elem_type
+
+// XXX These includes could be avoided by moving function implementations to the
+// cpp file
+#include "gfx2DGlue.h"           // for ThebesPoint
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_A...
+#include "mozilla/DebugOnly.h"              // for DebugOnly
+#include "mozilla/layers/CanvasRenderer.h"  // for CanvasRenderer
+#include "mozilla/layers/LayersTypes.h"  // for MOZ_LAYERS_LOG_IF_SHADOWABLE, LayersId, EventRegionsO...
+#include "nsDebug.h"  // for NS_ASSERTION, NS_WARNING
 
 namespace mozilla {
 
-class ComputedTimingFunction;
-class FrameLayerBuilder;
-
-namespace gl {
-class GLContext;
-}  // namespace gl
-
 namespace gfx {
+class DataSourceSurface;
 class DrawTarget;
+class Path;
 }  // namespace gfx
 
 namespace layers {
 
 class Animation;
 class AsyncPanZoomController;
-class BasicLayerManager;
-class ClientLayerManager;
 class HostLayerManager;
-class Layer;
-class LayerMetricsWrapper;
 class PaintedLayer;
 class ContainerLayer;
 class ImageLayer;
 class ColorLayer;
 class CompositorAnimations;
-class CompositorBridgeChild;
 class CanvasLayer;
-class ReadbackLayer;
-class ReadbackProcessor;
 class RefLayer;
 class HostLayer;
-class FocusTarget;
-class KnowsCompositor;
 class ShadowableLayer;
-class ShadowLayerForwarder;
-class LayerManagerComposite;
 class SpecificLayerAttributes;
-class TransactionIdAllocator;
 class Compositor;
-class FrameUniformityData;
-class PersistentBufferProvider;
-class GlyphArray;
-class WebRenderLayerManager;
-struct AnimData;
+class TransformData;
+struct LayerPolygon;
+struct PropertyAnimationGroup;
 
 namespace layerscope {
 class LayersPacket;
@@ -119,70 +89,6 @@
   LayerType GetType() const override { return e; } \
   static LayerType Type() { return e; }
 
-// Defined in LayerUserData.h; please include that file instead.
-class LayerUserData;
-
-class DidCompositeObserver {
- public:
-  virtual void DidComposite() = 0;
-};
-
-class FrameRecorder {
- public:
-  /**
-   * Record (and return) frame-intervals and paint-times for frames which were
-   * presented between calling StartFrameTimeRecording and
-   * StopFrameTimeRecording.
-   *
-   * - Uses a cyclic buffer and serves concurrent consumers, so if Stop is
-   *   called too late
-   *     (elements were overwritten since Start), result is considered invalid
-   *      and hence empty.)
-   * - Buffer is capable of holding 10 seconds @ 60fps (or more if frames were
-   *   less frequent).
-   *     Can be changed (up to 1 hour) via pref:
-   *     toolkit.framesRecording.bufferSize.
-   * - Note: the first frame-interval may be longer than expected because last
-   *   frame
-   *     might have been presented some time before calling
-   *     StartFrameTimeRecording.
-   */
-
-  /**
-   * Returns a handle which represents current recording start position.
-   */
-  virtual uint32_t StartFrameTimeRecording(int32_t aBufferSize);
-
-  /**
-   *  Clears, then populates aFrameIntervals with the recorded frame timing
-   *  data. The array will be empty if data was overwritten since
-   *  aStartIndex was obtained.
-   */
-  virtual void StopFrameTimeRecording(uint32_t aStartIndex,
-                                      nsTArray<float>& aFrameIntervals);
-
-  void RecordFrame();
-
- private:
-  struct FramesTimingRecording {
-    // Stores state and data for frame intervals and paint times recording.
-    // see LayerManager::StartFrameTimeRecording() at Layers.cpp for more
-    // details.
-    FramesTimingRecording()
-        : mNextIndex(0),
-          mLatestStartIndex(0),
-          mCurrentRunStartIndex(0),
-          mIsPaused(true) {}
-    nsTArray<float> mIntervals;
-    TimeStamp mLastFrameTime;
-    uint32_t mNextIndex;
-    uint32_t mLatestStartIndex;
-    uint32_t mCurrentRunStartIndex;
-    bool mIsPaused;
-  };
-  FramesTimingRecording mRecording;
-};
-
 /*
  * Motivation: For truly smooth animation and video playback, we need to
  * be able to compose frames and render them on a dedicated thread (i.e.
@@ -210,622 +116,6 @@
  */
 
 /**
- * A LayerManager controls a tree of layers. All layers in the tree
- * must use the same LayerManager.
- *
- * All modifications to a layer tree must happen inside a transaction.
- * Only the state of the layer tree at the end of a transaction is
- * rendered. Transactions cannot be nested
- *
- * Each transaction has two phases:
- * 1) Construction: layers are created, inserted, removed and have
- * properties set on them in this phase.
- * BeginTransaction and BeginTransactionWithTarget start a transaction in
- * the Construction phase.
- * 2) Drawing: PaintedLayers are rendered into in this phase, in tree
- * order. When the client has finished drawing into the PaintedLayers, it should
- * call EndTransaction to complete the transaction.
- *
- * All layer API calls happen on the main thread.
- *
- * Layers are refcounted. The layer manager holds a reference to the
- * root layer, and each container layer holds a reference to its children.
- */
-class LayerManager : public FrameRecorder {
-  NS_INLINE_DECL_REFCOUNTING(LayerManager)
-
- protected:
-  typedef mozilla::gfx::DrawTarget DrawTarget;
-  typedef mozilla::gfx::IntSize IntSize;
-  typedef mozilla::gfx::SurfaceFormat SurfaceFormat;
-
- public:
-  LayerManager()
-      : mDestroyed(false),
-        mSnapEffectiveTransforms(true),
-        mId(0),
-        mInTransaction(false),
-        mContainsSVG(false),
-        mPaintedPixelCount(0) {}
-
-  /**
-   * Release layers and resources held by this layer manager, and mark
-   * it as destroyed.  Should do any cleanup necessary in preparation
-   * for its widget going away.  After this call, only user data calls
-   * are valid on the layer manager.
-   */
-  virtual void Destroy() {
-    mDestroyed = true;
-    mUserData.Destroy();
-    mRoot = nullptr;
-    mPartialPrerenderedAnimations.Clear();
-  }
-  bool IsDestroyed() { return mDestroyed; }
-
-  virtual ShadowLayerForwarder* AsShadowForwarder() { return nullptr; }
-
-  virtual KnowsCompositor* AsKnowsCompositor() { return nullptr; }
-
-  virtual LayerManagerComposite* AsLayerManagerComposite() { return nullptr; }
-
-  virtual ClientLayerManager* AsClientLayerManager() { return nullptr; }
-
-  virtual BasicLayerManager* AsBasicLayerManager() { return nullptr; }
-  virtual HostLayerManager* AsHostLayerManager() { return nullptr; }
-
-  virtual WebRenderLayerManager* AsWebRenderLayerManager() { return nullptr; }
-
-  /**
-   * Returns true if this LayerManager is owned by an nsIWidget,
-   * and is used for drawing into the widget.
-   */
-  virtual bool IsWidgetLayerManager() { return true; }
-  virtual bool IsInactiveLayerManager() { return false; }
-
-  /**
-   * Start a new transaction. Nested transactions are not allowed so
-   * there must be no transaction currently in progress.
-   * This transaction will update the state of the window from which
-   * this LayerManager was obtained.
-   */
-  virtual bool BeginTransaction(const nsCString& aURL = nsCString()) = 0;
-  /**
-   * Start a new transaction. Nested transactions are not allowed so
-   * there must be no transaction currently in progress.
-   * This transaction will render the contents of the layer tree to
-   * the given target context. The rendering will be complete when
-   * EndTransaction returns.
-   */
-  virtual bool BeginTransactionWithTarget(
-      gfxContext* aTarget, const nsCString& aURL = nsCString()) = 0;
-
-  enum EndTransactionFlags {
-    END_DEFAULT = 0,
-    END_NO_IMMEDIATE_REDRAW = 1 << 0,  // Do not perform the drawing phase
-    END_NO_COMPOSITE =
-        1 << 1,  // Do not composite after drawing painted layer contents.
-    END_NO_REMOTE_COMPOSITE = 1 << 2  // Do not schedule a composition with a
-                                      // remote Compositor, if one exists.
-  };
-
-  FrameLayerBuilder* GetLayerBuilder() {
-    return reinterpret_cast<FrameLayerBuilder*>(
-        GetUserData(&gLayerManagerLayerBuilder));
-  }
-
-  /**
-   * Attempts to end an "empty transaction". There must have been no
-   * changes to the layer tree since the BeginTransaction().
-   * It's possible for this to fail; PaintedLayers may need to be updated
-   * due to VRAM data being lost, for example. In such cases this method
-   * returns false, and the caller must proceed with a normal layer tree
-   * update and EndTransaction.
-   */
-  virtual bool EndEmptyTransaction(
-      EndTransactionFlags aFlags = END_DEFAULT) = 0;
-
-  /**
-   * Function called to draw the contents of each PaintedLayer.
-   * aRegionToDraw contains the region that needs to be drawn.
-   * This would normally be a subregion of the visible region.
-   * The callee must draw all of aRegionToDraw. Drawing outside
-   * aRegionToDraw will be clipped out or ignored.
-   * The callee must draw all of aRegionToDraw.
-   * This region is relative to 0,0 in the PaintedLayer.
-   *
-   * aDirtyRegion should contain the total region that is be due to be painted
-   * during the transaction, even though only aRegionToDraw should be drawn
-   * during this call. aRegionToDraw must be entirely contained within
-   * aDirtyRegion. If the total dirty region is unknown it is okay to pass a
-   * subregion of the total dirty region, e.g. just aRegionToDraw, though it
-   * may not be as efficient.
-   *
-   * aRegionToInvalidate contains a region whose contents have been
-   * changed by the layer manager and which must therefore be invalidated.
-   * For example, this could be non-empty if a retained layer internally
-   * switches from RGBA to RGB or back ... we might want to repaint it to
-   * consistently use subpixel-AA or not.
-   * This region is relative to 0,0 in the PaintedLayer.
-   * aRegionToInvalidate may contain areas that are outside
-   * aRegionToDraw; the callee must ensure that these areas are repainted
-   * in the current layer manager transaction or in a later layer
-   * manager transaction.
-   *
-   * aContext must not be used after the call has returned.
-   * We guarantee that buffered contents in the visible
-   * region are valid once drawing is complete.
-   *
-   * The origin of aContext is 0,0 in the PaintedLayer.
-   */
-  typedef void (*DrawPaintedLayerCallback)(
-      PaintedLayer* aLayer, gfxContext* aContext,
-      const nsIntRegion& aRegionToDraw, const nsIntRegion& aDirtyRegion,
-      DrawRegionClip aClip, const nsIntRegion& aRegionToInvalidate,
-      void* aCallbackData);
-
-  /**
-   * Finish the construction phase of the transaction, perform the
-   * drawing phase, and end the transaction.
-   * During the drawing phase, all PaintedLayers in the tree are
-   * drawn in tree order, exactly once each, except for those layers
-   * where it is known that the visible region is empty.
-   */
-  virtual void EndTransaction(DrawPaintedLayerCallback aCallback,
-                              void* aCallbackData,
-                              EndTransactionFlags aFlags = END_DEFAULT) = 0;
-
-  /**
-   * Schedule a composition with the remote Compositor, if one exists
-   * for this LayerManager. Useful in conjunction with the
-   * END_NO_REMOTE_COMPOSITE flag to EndTransaction.
-   */
-  virtual void ScheduleComposite() {}
-
-  virtual void SetNeedsComposite(bool aNeedsComposite) {}
-  virtual bool NeedsComposite() const { return false; }
-
-  virtual bool HasShadowManagerInternal() const { return false; }
-  bool HasShadowManager() const { return HasShadowManagerInternal(); }
-  virtual void StorePluginWidgetConfigurations(
-      const nsTArray<nsIWidget::Configuration>& aConfigurations) {}
-  bool IsSnappingEffectiveTransforms() { return mSnapEffectiveTransforms; }
-
-  /**
-   * Returns true if the underlying platform can properly support layers with
-   * SurfaceMode::SURFACE_COMPONENT_ALPHA.
-   */
-  static bool LayersComponentAlphaEnabled();
-
-  /**
-   * Returns true if this LayerManager can properly support layers with
-   * SurfaceMode::SURFACE_COMPONENT_ALPHA. LayerManagers that can't will use
-   * transparent surfaces (and lose subpixel-AA for text).
-   */
-  virtual bool AreComponentAlphaLayersEnabled();
-
-  /**
-   * Returns true if this LayerManager always requires an intermediate surface
-   * to render blend operations.
-   */
-  virtual bool BlendingRequiresIntermediateSurface() { return false; }
-
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Set the root layer. The root layer is initially null. If there is
-   * no root layer, EndTransaction won't draw anything.
-   */
-  virtual void SetRoot(Layer* aLayer) = 0;
-  /**
-   * Can be called anytime
-   */
-  Layer* GetRoot() { return mRoot; }
-
-  /**
-   * Does a breadth-first search from the root layer to find the first
-   * scrollable layer, and returns its ViewID. Note that there may be
-   * other layers in the tree which share the same ViewID.
-   * Can be called any time.
-   */
-  ScrollableLayerGuid::ViewID GetRootScrollableLayerId();
-
-  /**
-   * Returns a LayerMetricsWrapper containing the Root
-   * Content Documents layer.
-   */
-  LayerMetricsWrapper GetRootContentLayer();
-
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Called when a managee has mutated.
-   * Subclasses overriding this method must first call their
-   * superclass's impl
-   */
-  virtual void Mutated(Layer* aLayer) {}
-  virtual void MutatedSimple(Layer* aLayer) {}
-
-  /**
-   * Hints that can be used during PaintedLayer creation to influence the type
-   * or properties of the layer created.
-   *
-   * NONE: No hint.
-   * SCROLLABLE: This layer may represent scrollable content.
-   */
-  enum PaintedLayerCreationHint { NONE, SCROLLABLE };
-
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a PaintedLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<PaintedLayer> CreatePaintedLayer() = 0;
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a PaintedLayer for this manager's layer tree, with a creation hint
-   * parameter to help optimise the type of layer created.
-   */
-  virtual already_AddRefed<PaintedLayer> CreatePaintedLayerWithHint(
-      PaintedLayerCreationHint) {
-    return CreatePaintedLayer();
-  }
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a ContainerLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<ContainerLayer> CreateContainerLayer() = 0;
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create an ImageLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<ImageLayer> CreateImageLayer() = 0;
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a ColorLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<ColorLayer> CreateColorLayer() = 0;
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a CanvasLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<CanvasLayer> CreateCanvasLayer() = 0;
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a ReadbackLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<ReadbackLayer> CreateReadbackLayer() {
-    return nullptr;
-  }
-  /**
-   * CONSTRUCTION PHASE ONLY
-   * Create a RefLayer for this manager's layer tree.
-   */
-  virtual already_AddRefed<RefLayer> CreateRefLayer() { return nullptr; }
-  /**
-   * Can be called anytime, from any thread.
-   *
-   * Creates an Image container which forwards its images to the compositor
-   * within layer transactions on the main thread or asynchronously using the
-   * ImageBridge IPDL protocol. In the case of asynchronous, If the protocol is
-   * not available, the returned ImageContainer will forward images within layer
-   * transactions.
-   */
-  static already_AddRefed<ImageContainer> CreateImageContainer(
-      ImageContainer::Mode flag = ImageContainer::SYNCHRONOUS);
-
-  /**
-   * Type of layer manager his is. This is to be used sparsely in order to
-   * avoid a lot of Layers backend specific code. It should be used only when
-   * Layers backend specific functionality is necessary.
-   */
-  virtual LayersBackend GetBackendType() = 0;
-
-  /**
-   * Type of layers backend that will be used to composite this layer tree.
-   * When compositing is done remotely, then this returns the layers type
-   * of the compositor.
-   */
-  virtual LayersBackend GetCompositorBackendType() { return GetBackendType(); }
-
-  /**
-   * Creates a DrawTarget which is optimized for inter-operating with this
-   * layer manager.
-   */
-  virtual already_AddRefed<DrawTarget> CreateOptimalDrawTarget(
-      const IntSize& aSize, SurfaceFormat imageFormat);
-
-  /**
-   * Creates a DrawTarget for alpha masks which is optimized for inter-
-   * operating with this layer manager. In contrast to CreateOptimalDrawTarget,
-   * this surface is optimised for drawing alpha only and we assume that
-   * drawing the mask is fairly simple.
-   */
-  virtual already_AddRefed<DrawTarget> CreateOptimalMaskDrawTarget(
-      const IntSize& aSize);
-
-  /**
-   * Creates a DrawTarget for use with canvas which is optimized for
-   * inter-operating with this layermanager.
-   */
-  virtual already_AddRefed<mozilla::gfx::DrawTarget> CreateDrawTarget(
-      const mozilla::gfx::IntSize& aSize, mozilla::gfx::SurfaceFormat aFormat);
-
-  /**
-   * Creates a PersistentBufferProvider for use with canvas which is optimized
-   * for inter-operating with this layermanager.
-   */
-  virtual already_AddRefed<PersistentBufferProvider>
-  CreatePersistentBufferProvider(const mozilla::gfx::IntSize& aSize,
-                                 mozilla::gfx::SurfaceFormat aFormat);
-
-  virtual bool CanUseCanvasLayerForSize(const gfx::IntSize& aSize) {
-    return true;
-  }
-
-  /**
-   * returns the maximum texture size on this layer backend, or INT32_MAX
-   * if there is no maximum
-   */
-  virtual int32_t GetMaxTextureSize() const = 0;
-
-  /**
-   * Return the name of the layer manager's backend.
-   */
-  virtual void GetBackendName(nsAString& aName) = 0;
-
-  /**
-   * This setter can be used anytime. The user data for all keys is
-   * initially null. Ownership pases to the layer manager.
-   */
-  void SetUserData(void* aKey, LayerUserData* aData) {
-    mUserData.Add(static_cast<gfx::UserDataKey*>(aKey), aData,
-                  LayerUserDataDestroy);
-  }
-  /**
-   * This can be used anytime. Ownership passes to the caller!
-   */
-  UniquePtr<LayerUserData> RemoveUserData(void* aKey);
-
-  /**
-   * This getter can be used anytime.
-   */
-  bool HasUserData(void* aKey) {
-    return mUserData.Has(static_cast<gfx::UserDataKey*>(aKey));
-  }
-  /**
-   * This getter can be used anytime. Ownership is retained by the layer
-   * manager.
-   */
-  LayerUserData* GetUserData(void* aKey) const {
-    return static_cast<LayerUserData*>(
-        mUserData.Get(static_cast<gfx::UserDataKey*>(aKey)));
-  }
-
-  /**
-   * Must be called outside of a layers transaction.
-   *
-   * For the subtree rooted at |aSubtree|, this attempts to free up
-   * any free-able resources like retained buffers, but may do nothing
-   * at all.  After this call, the layer tree is left in an undefined
-   * state; the layers in |aSubtree|'s subtree may no longer have
-   * buffers with valid content and may no longer be able to draw
-   * their visible and valid regions.
-   *
-   * In general, a painting or forwarding transaction on |this| must
-   * complete on the tree before it returns to a valid state.
-   *
-   * Resource freeing begins from |aSubtree| or |mRoot| if |aSubtree|
-   * is null.  |aSubtree|'s manager must be this.
-   */
-  virtual void ClearCachedResources(Layer* aSubtree = nullptr) {}
-
-  /**
-   * Flag the next paint as the first for a document.
-   */
-  virtual void SetIsFirstPaint() {}
-  virtual bool GetIsFirstPaint() const { return false; }
-
-  /**
-   * Set the current focus target to be sent with the next paint.
-   */
-  virtual void SetFocusTarget(const FocusTarget& aFocusTarget) {}
-
-  /**
-   * Make sure that the previous transaction has been entirely
-   * completed.
-   *
-   * Note: This may sychronously wait on a remote compositor
-   * to complete rendering.
-   */
-  virtual void FlushRendering() {}
-
-  /**
-   * Make sure that the previous transaction has been
-   * received. This will synchronsly wait on a remote compositor. */
-  virtual void WaitOnTransactionProcessed() {}
-
-  virtual void SendInvalidRegion(const nsIntRegion& aRegion) {}
-
-  /**
-   * Checks if we need to invalidate the OS widget to trigger
-   * painting when updating this layer manager.
-   */
-  virtual bool NeedsWidgetInvalidation() { return true; }
-
-  virtual const char* Name() const { return "???"; }
-
-  /**
-   * Dump information about this layer manager and its managed tree to
-   * aStream.
-   */
-  void Dump(std::stringstream& aStream, const char* aPrefix = "",
-            bool aDumpHtml = false, bool aSorted = false);
-  /**
-   * Dump information about just this layer manager itself to aStream
-   */
-  void DumpSelf(std::stringstream& aStream, const char* aPrefix = "",
-                bool aSorted = false);
-  void Dump(bool aSorted = false);
-
-  /**
-   * Dump information about this layer manager and its managed tree to
-   * layerscope packet.
-   */
-  void Dump(layerscope::LayersPacket* aPacket);
-
-  /**
-   * Log information about this layer manager and its managed tree to
-   * the NSPR log (if enabled for "Layers").
-   */
-  void Log(const char* aPrefix = "");
-  /**
-   * Log information about just this layer manager itself to the NSPR
-   * log (if enabled for "Layers").
-   */
-  void LogSelf(const char* aPrefix = "");
-
-  static bool IsLogEnabled();
-  static mozilla::LogModule* GetLog();
-
-  bool IsCompositingCheap(LayersBackend aBackend) {
-    // LayersBackend::LAYERS_NONE is an error state, but in that case we should
-    // try to avoid loading the compositor!
-    return LayersBackend::LAYERS_BASIC != aBackend &&
-           LayersBackend::LAYERS_NONE != aBackend;
-  }
-
-  virtual bool IsCompositingCheap() { return true; }
-
-  bool IsInTransaction() const { return mInTransaction; }
-  virtual void GetFrameUniformity(FrameUniformityData* aOutData) {}
-
-  virtual void SetRegionToClear(const nsIntRegion& aRegion) {
-    mRegionToClear = aRegion;
-  }
-
-  virtual float RequestProperty(const nsAString& property) { return -1; }
-
-  const TimeStamp& GetAnimationReadyTime() const { return mAnimationReadyTime; }
-
-  virtual bool AsyncPanZoomEnabled() const { return false; }
-
-  static void LayerUserDataDestroy(void* data);
-
-  void AddPaintedPixelCount(int32_t aCount) { mPaintedPixelCount += aCount; }
-
-  uint32_t GetAndClearPaintedPixelCount() {
-    uint32_t count = mPaintedPixelCount;
-    mPaintedPixelCount = 0;
-    return count;
-  }
-
-  virtual void SetLayersObserverEpoch(LayersObserverEpoch aEpoch) {}
-
-  virtual void DidComposite(TransactionId aTransactionId,
-                            const mozilla::TimeStamp& aCompositeStart,
-                            const mozilla::TimeStamp& aCompositeEnd) {}
-
-  virtual void AddDidCompositeObserver(DidCompositeObserver* aObserver) {
-    MOZ_CRASH("GFX: LayerManager");
-  }
-  virtual void RemoveDidCompositeObserver(DidCompositeObserver* aObserver) {
-    MOZ_CRASH("GFX: LayerManager");
-  }
-
-  virtual void UpdateTextureFactoryIdentifier(
-      const TextureFactoryIdentifier& aNewIdentifier) {}
-
-  virtual TextureFactoryIdentifier GetTextureFactoryIdentifier() {
-    return TextureFactoryIdentifier();
-  }
-
-  virtual void SetTransactionIdAllocator(TransactionIdAllocator* aAllocator) {}
-
-  virtual TransactionId GetLastTransactionId() { return TransactionId{0}; }
-
-  virtual CompositorBridgeChild* GetCompositorBridgeChild() { return nullptr; }
-
-  void RegisterPayload(const CompositionPayload& aPayload) {
-    mPayload.AppendElement(aPayload);
-    MOZ_ASSERT(mPayload.Length() < 10000);
-  }
-
-  void RegisterPayloads(const nsTArray<CompositionPayload>& aPayload) {
-    mPayload.AppendElements(aPayload);
-    MOZ_ASSERT(mPayload.Length() < 10000);
-  }
-
-  virtual void PayloadPresented();
-
-  void SetContainsSVG(bool aContainsSVG) { mContainsSVG = aContainsSVG; }
-
-  void AddPartialPrerenderedAnimation(uint64_t aCompositorAnimationId,
-                                      dom::Animation* aAnimation);
-  void RemovePartialPrerenderedAnimation(uint64_t aCompositorAnimationId,
-                                         dom::Animation* aAnimation);
-  void UpdatePartialPrerenderedAnimations(
-      const nsTArray<uint64_t>& aJankedAnimations);
-
- protected:
-  RefPtr<Layer> mRoot;
-  gfx::UserData mUserData;
-  bool mDestroyed;
-  bool mSnapEffectiveTransforms;
-
-  nsIntRegion mRegionToClear;
-
-  // Protected destructor, to discourage deletion outside of Release():
-  virtual ~LayerManager() = default;
-
-  // Print interesting information about this into aStreamo.  Internally
-  // used to implement Dump*() and Log*().
-  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
-
-  // Print interesting information about this into layerscope packet.
-  // Internally used to implement Dump().
-  virtual void DumpPacket(layerscope::LayersPacket* aPacket);
-
-  uint64_t mId;
-  bool mInTransaction;
-
-  // Used for tracking CONTENT_FRAME_TIME_WITH_SVG
-  bool mContainsSVG;
-  // The time when painting most recently finished. This is recorded so that
-  // we can time any play-pending animations from this point.
-  TimeStamp mAnimationReadyTime;
-  // The count of pixels that were painted in the current transaction.
-  uint32_t mPaintedPixelCount;
-  // The payload associated with currently pending painting work, for
-  // client layer managers that typically means payload that is part of the
-  // 'upcoming transaction', for HostLayerManagers this typically means
-  // what has been included in received transactions to be presented on the
-  // next composite.
-  // IMPORTANT: Clients should take care to clear this or risk it slowly
-  // growing out of control.
-  nsTArray<CompositionPayload> mPayload;
-  // Transform animations which are not fully pre-rendered because it's on a
-  // large frame.  We need to update the pre-rendered area once after we tried
-  // to composite area which is outside of the pre-rendered area on the
-  // compositor.
-  nsRefPtrHashtable<nsUint64HashKey, dom::Animation>
-      mPartialPrerenderedAnimations;
-
- public:
-  /*
-   * Methods to store/get/clear a "pending scroll info update" object on a
-   * per-scrollid basis. This is used for empty transactions that push over
-   * scroll position updates to the APZ code.
-   */
-  virtual bool AddPendingScrollUpdateForNextTransaction(
-      ScrollableLayerGuid::ViewID aScrollId,
-      const ScrollPositionUpdate& aUpdateInfo);
-  Maybe<nsTArray<ScrollPositionUpdate>> GetPendingScrollInfoUpdate(
-      ScrollableLayerGuid::ViewID aScrollId);
-  std::unordered_set<ScrollableLayerGuid::ViewID>
-  ClearPendingScrollInfoUpdate();
-
- protected:
-  ScrollUpdatesMap mPendingScrollUpdates;
-};
-
-/**
  * A Layer represents anything that can be rendered onto a destination
  * surface.
  */
@@ -2764,6 +2054,7 @@
 gfx::IntRect ToOutsideIntRect(const gfxRect& aRect);
 
 void RecordCompositionPayloadsPresented(
+    const TimeStamp& aCompositionEndTime,
     const nsTArray<CompositionPayload>& aPayloads);
 
 }  // namespace layers
diff -Nru firefox-84.0.2+build1/gfx/layers/LayersTypes.cpp firefox-85.0+build1/gfx/layers/LayersTypes.cpp
--- firefox-84.0.2+build1/gfx/layers/LayersTypes.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/LayersTypes.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include <cinttypes>
 #include "nsPrintfCString.h"
+#include "mozilla/gfx/gfxVars.h"
 
 namespace mozilla {
 namespace layers {
@@ -30,6 +31,10 @@
     case LayersBackend::LAYERS_CLIENT:
       return "client";
     case LayersBackend::LAYERS_WR:
+      MOZ_ASSERT(gfxVars::UseWebRender());
+      if (gfxVars::UseSoftwareWebRender()) {
+        return "webrender_software";
+      }
       return "webrender";
     case LayersBackend::LAYERS_BASIC:
       return "basic";
diff -Nru firefox-84.0.2+build1/gfx/layers/MacIOSurfaceImage.cpp firefox-85.0+build1/gfx/layers/MacIOSurfaceImage.cpp
--- firefox-84.0.2+build1/gfx/layers/MacIOSurfaceImage.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/MacIOSurfaceImage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/layers/CompositableClient.h"
 #include "mozilla/layers/CompositableForwarder.h"
 #include "mozilla/layers/MacIOSurfaceTextureClientOGL.h"
+#include "mozilla/layers/TextureForwarder.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "mozilla/UniquePtr.h"
 #include "YCbCrUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/mlgpu/LayerManagerMLGPU.cpp firefox-85.0+build1/gfx/layers/mlgpu/LayerManagerMLGPU.cpp
--- firefox-84.0.2+build1/gfx/layers/mlgpu/LayerManagerMLGPU.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/mlgpu/LayerManagerMLGPU.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -362,7 +362,7 @@
   mClonedLayerTreeProperties = nullptr;
   mClonedLayerTreeProperties = LayerProperties::CloneFrom(mRoot);
 
-  PayloadPresented();
+  PayloadPresented(TimeStamp::Now());
 
   mPayload.Clear();
 }
diff -Nru firefox-84.0.2+build1/gfx/layers/mlgpu/LayerManagerMLGPU.h firefox-85.0+build1/gfx/layers/mlgpu/LayerManagerMLGPU.h
--- firefox-84.0.2+build1/gfx/layers/mlgpu/LayerManagerMLGPU.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/mlgpu/LayerManagerMLGPU.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,19 +7,28 @@
 #ifndef MOZILLA_GFX_LAYERMANAGERMLGPU_H
 #define MOZILLA_GFX_LAYERMANAGERMLGPU_H
 
-#include "Layers.h"
-#include "mozilla/layers/LayerManagerComposite.h"
-#include "LayerMLGPU.h"
-#include "mozilla/layers/MLGPUScreenshotGrabber.h"
+#include <cstdint>                    // for uint32_t
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER1
+#include "mozilla/Maybe.h"                   // for Maybe
+#include "mozilla/RefPtr.h"                  // for RefPtr
+#include "mozilla/TimeStamp.h"               // for TimeStamp
+#include "mozilla/UniquePtr.h"               // for UniquePtr
+#include "mozilla/gfx/Rect.h"                // for IntRect
+#include "mozilla/layers/CompositorTypes.h"  // for TextureFactoryIdentifier
+#include "mozilla/layers/LayerManager.h"  // for LayerManager::EndTransactionFlags, LayerManager::DrawPaintedLayerCallback
+#include "mozilla/layers/LayerManagerComposite.h"   // for HostLayerManager
+#include "mozilla/layers/LayersTypes.h"             // for LayersBackend
+#include "mozilla/layers/MLGPUScreenshotGrabber.h"  // for MLGPUScreenshotGrabber
+#include "nsRegion.h"                               // for nsIntRegion
+#include "nsStringFwd.h"                            // for nsCString
 
 namespace mozilla {
 namespace layers {
 
 class FrameBuilder;
-class LayerManagerMLGPU;
 class RenderPassMLGPU;
 class SharedBufferMLGPU;
-class RenderViewMLGPU;
 class TextRenderer;
 class TextureSourceProviderMLGPU;
 class MLGBuffer;
diff -Nru firefox-84.0.2+build1/gfx/layers/mlgpu/RenderPassMLGPU.h firefox-85.0+build1/gfx/layers/mlgpu/RenderPassMLGPU.h
--- firefox-84.0.2+build1/gfx/layers/mlgpu/RenderPassMLGPU.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/mlgpu/RenderPassMLGPU.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef MOZILLA_GFX_RENDERPASSMLGPU_H
 #define MOZILLA_GFX_RENDERPASSMLGPU_H
 
+#include "LayerMLGPU.h"
 #include "LayerManagerMLGPU.h"
 #include "ShaderDefinitionsMLGPU.h"
 #include "SharedBufferMLGPU.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/moz.build firefox-85.0+build1/gfx/layers/moz.build
--- firefox-84.0.2+build1/gfx/layers/moz.build	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/moz.build	2021-01-18 19:58:11.000000000 +0000
@@ -83,6 +83,7 @@
 
 EXPORTS.gfxipc += [
     "ipc/ShadowLayerUtils.h",
+    "ipc/SurfaceDescriptor.h",
 ]
 
 EXPORTS.mozilla.dom += [
@@ -164,6 +165,7 @@
     "composite/ImageHost.h",
     "composite/ImageLayerComposite.h",
     "composite/LayerManagerComposite.h",
+    "composite/LayerManagerCompositeUtils.h",
     "composite/PaintedLayerComposite.h",
     "composite/TextRenderer.h",
     "composite/TextureHost.h",
@@ -222,6 +224,7 @@
     "ipc/VideoBridgeParent.h",
     "ipc/VideoBridgeUtils.h",
     "LayerAttributes.h",
+    "LayerManager.h",
     "LayerMetricsWrapper.h",
     "LayersHelpers.h",
     "LayersTypes.h",
@@ -465,6 +468,7 @@
     "ipc/CanvasChild.cpp",
     "ipc/CanvasThread.cpp",
     "ipc/CanvasTranslator.cpp",
+    "ipc/CompositableForwarder.cpp",
     "ipc/CompositableTransactionParent.cpp",
     "ipc/CompositorBench.cpp",
     "ipc/CompositorBridgeChild.cpp",
@@ -492,6 +496,7 @@
     "ipc/UiCompositorControllerParent.cpp",
     "ipc/VideoBridgeChild.cpp",
     "ipc/VideoBridgeParent.cpp",
+    "LayerManager.cpp",
     "Layers.cpp",
     "LayerScope.cpp",
     "LayersHelpers.cpp",
diff -Nru firefox-84.0.2+build1/gfx/layers/opengl/CompositorOGL.cpp firefox-85.0+build1/gfx/layers/opengl/CompositorOGL.cpp
--- firefox-84.0.2+build1/gfx/layers/opengl/CompositorOGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/opengl/CompositorOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -29,6 +29,7 @@
 #include "mozilla/gfx/gfxVars.h"    // for gfxVars
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "mozilla/layers/LayerManagerComposite.h"  // for LayerComposite, etc
+#include "mozilla/layers/NativeLayer.h"
 #include "mozilla/layers/CompositingRenderTargetOGL.h"
 #include "mozilla/layers/Effects.h"      // for EffectChain, TexturedEffect, etc
 #include "mozilla/layers/TextureHost.h"  // for TextureSource, etc
@@ -40,6 +41,7 @@
 #include "mozilla/mozalloc.h"  // for operator delete, etc
 #include "nsAppRunner.h"
 #include "nsAString.h"
+#include "nsClassHashtable.h"
 #include "nsIConsoleService.h"      // for nsIConsoleService, etc
 #include "nsIWidget.h"              // for nsIWidget
 #include "nsLiteralString.h"        // for NS_LITERAL_STRING
diff -Nru firefox-84.0.2+build1/gfx/layers/opengl/DMABUFTextureHostOGL.cpp firefox-85.0+build1/gfx/layers/opengl/DMABUFTextureHostOGL.cpp
--- firefox-84.0.2+build1/gfx/layers/opengl/DMABUFTextureHostOGL.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/opengl/DMABUFTextureHostOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -135,7 +135,7 @@
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
   auto imageType =
-      wr::ExternalImageType::TextureHandle(wr::TextureTarget::Default);
+      wr::ExternalImageType::TextureHandle(wr::ImageBufferKind::Texture2D);
 
   switch (mSurface->GetFormat()) {
     case gfx::SurfaceFormat::R8G8B8X8:
diff -Nru firefox-84.0.2+build1/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp firefox-85.0+build1/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp
--- firefox-84.0.2+build1/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -166,7 +166,7 @@
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
   auto imageType =
-      wr::ExternalImageType::TextureHandle(wr::TextureTarget::Rect);
+      wr::ExternalImageType::TextureHandle(wr::ImageBufferKind::TextureRect);
 
   switch (GetFormat()) {
     case gfx::SurfaceFormat::B8G8R8A8:
diff -Nru firefox-84.0.2+build1/gfx/layers/opengl/TextureClientOGL.cpp firefox-85.0+build1/gfx/layers/opengl/TextureClientOGL.cpp
--- firefox-84.0.2+build1/gfx/layers/opengl/TextureClientOGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/opengl/TextureClientOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -16,6 +16,7 @@
 #  include <jni.h>
 #  include <android/native_window.h>
 #  include <android/native_window_jni.h>
+#  include <sys/socket.h>
 #  include "mozilla/ipc/FileDescriptor.h"
 #  include "mozilla/java/GeckoSurfaceWrappers.h"
 #  include "mozilla/java/SurfaceAllocatorWrappers.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/opengl/TextureHostOGL.cpp firefox-85.0+build1/gfx/layers/opengl/TextureHostOGL.cpp
--- firefox-84.0.2+build1/gfx/layers/opengl/TextureHostOGL.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/opengl/TextureHostOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -671,8 +671,8 @@
   auto method = aOp == TextureHost::ADD_IMAGE
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
-  auto imageType =
-      wr::ExternalImageType::TextureHandle(wr::TextureTarget::External);
+  auto imageType = wr::ExternalImageType::TextureHandle(
+      wr::ImageBufferKind::TextureExternal);
 
   switch (GetFormat()) {
     case gfx::SurfaceFormat::R8G8B8X8:
@@ -969,8 +969,8 @@
   auto method = aOp == TextureHost::ADD_IMAGE
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
-  auto imageType =
-      wr::ExternalImageType::TextureHandle(wr::TextureTarget::External);
+  auto imageType = wr::ExternalImageType::TextureHandle(
+      wr::ImageBufferKind::TextureExternal);
 
   switch (GetFormat()) {
     case gfx::SurfaceFormat::R8G8B8X8:
@@ -1181,8 +1181,8 @@
   auto method = aOp == TextureHost::ADD_IMAGE
                     ? &wr::TransactionBuilder::AddExternalImage
                     : &wr::TransactionBuilder::UpdateExternalImage;
-  auto imageType =
-      wr::ExternalImageType::TextureHandle(wr::TextureTarget::External);
+  auto imageType = wr::ExternalImageType::TextureHandle(
+      wr::ImageBufferKind::TextureExternal);
 
   gfx::SurfaceFormat format =
       mHasAlpha ? gfx::SurfaceFormat::R8G8B8A8 : gfx::SurfaceFormat::R8G8B8X8;
diff -Nru firefox-84.0.2+build1/gfx/layers/ProfilerScreenshots.cpp firefox-85.0+build1/gfx/layers/ProfilerScreenshots.cpp
--- firefox-84.0.2+build1/gfx/layers/ProfilerScreenshots.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ProfilerScreenshots.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -11,9 +11,6 @@
 #include "GeckoProfiler.h"
 #include "gfxUtils.h"
 #include "nsThreadUtils.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 
 using namespace mozilla;
 using namespace mozilla::gfx;
@@ -84,12 +81,32 @@
               nullptr, &dataURL);
           if (NS_SUCCEEDED(rv)) {
             // Add a marker with the data URL.
-            AUTO_PROFILER_STATS(add_marker_with_ScreenshotPayload);
-            profiler_add_marker_for_thread(
-                sourceThread, JS::ProfilingCategoryPair::GRAPHICS,
-                "CompositorScreenshot",
-                ScreenshotPayload(timeStamp, std::move(dataURL), originalSize,
-                                  windowIdentifier));
+            struct ScreenshotMarker {
+              static constexpr mozilla::Span<const char> MarkerTypeName() {
+                return mozilla::MakeStringSpan("CompositorScreenshot");
+              }
+              static void StreamJSONMarkerData(
+                  mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+                  const mozilla::ProfilerString8View& aScreenshotDataURL,
+                  const mozilla::gfx::IntSize& aWindowSize,
+                  uintptr_t aWindowIdentifier) {
+                aWriter.UniqueStringProperty("url", aScreenshotDataURL);
+
+                char hexWindowID[32];
+                SprintfLiteral(hexWindowID, "0x%" PRIXPTR, aWindowIdentifier);
+                aWriter.StringProperty("windowID", hexWindowID);
+                aWriter.DoubleProperty("windowWidth", aWindowSize.width);
+                aWriter.DoubleProperty("windowHeight", aWindowSize.height);
+              }
+              static mozilla::MarkerSchema MarkerTypeDisplay() {
+                return mozilla::MarkerSchema::SpecialFrontendLocation{};
+              }
+            };
+            profiler_add_marker(
+                "CompositorScreenshot", geckoprofiler::category::GRAPHICS,
+                {MarkerThreadId(sourceThread),
+                 MarkerTiming::InstantAt(timeStamp)},
+                ScreenshotMarker{}, dataURL, originalSize, windowIdentifier);
           }
         }
 
diff -Nru firefox-84.0.2+build1/gfx/layers/RotatedBuffer.h firefox-85.0+build1/gfx/layers/RotatedBuffer.h
--- firefox-84.0.2+build1/gfx/layers/RotatedBuffer.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/RotatedBuffer.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,16 +9,15 @@
 
 #include "gfxTypes.h"
 #include <stdint.h>                        // for uint32_t
+#include "mozilla/AlreadyAddRefed.h"       // for already_AddRefed
 #include "mozilla/Assertions.h"            // for MOZ_ASSERT, etc
 #include "mozilla/RefPtr.h"                // for RefPtr, already_AddRefed
 #include "mozilla/gfx/2D.h"                // for DrawTarget, etc
 #include "mozilla/gfx/MatrixFwd.h"         // for Matrix
 #include "mozilla/layers/TextureClient.h"  // for TextureClient
 #include "mozilla/mozalloc.h"              // for operator delete
-#include "nsCOMPtr.h"                      // for already_AddRefed
 #include "nsISupportsImpl.h"               // for MOZ_COUNT_CTOR, etc
 #include "nsRegion.h"                      // for nsIntRegion
-#include "LayersTypes.h"
 
 namespace mozilla {
 namespace layers {
diff -Nru firefox-84.0.2+build1/gfx/layers/ScreenshotGrabber.cpp firefox-85.0+build1/gfx/layers/ScreenshotGrabber.cpp
--- firefox-84.0.2+build1/gfx/layers/ScreenshotGrabber.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ScreenshotGrabber.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ScreenshotGrabber.h"
 
+#include "GeckoProfiler.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/ShareableCanvasRenderer.cpp firefox-85.0+build1/gfx/layers/ShareableCanvasRenderer.cpp
--- firefox-84.0.2+build1/gfx/layers/ShareableCanvasRenderer.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/ShareableCanvasRenderer.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/gfx/2D.h"
 #include "mozilla/layers/TextureClientSharedSurface.h"
 #include "mozilla/layers/CompositableForwarder.h"
+#include "mozilla/layers/TextureForwarder.h"
 
 #include "ClientWebGLContext.h"
 #include "gfxUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/SourceSurfaceSharedData.h firefox-85.0+build1/gfx/layers/SourceSurfaceSharedData.h
--- firefox-84.0.2+build1/gfx/layers/SourceSurfaceSharedData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/SourceSurfaceSharedData.h	2021-01-18 19:58:11.000000000 +0000
@@ -86,8 +86,7 @@
 
  private:
   size_t GetDataLength() const {
-    // extra SIMD padding needed for SWGL
-    return static_cast<size_t>(mStride) * mSize.height + 16;
+    return static_cast<size_t>(mStride) * mSize.height;
   }
 
   size_t GetAlignedDataLength() const {
@@ -298,8 +297,7 @@
   uint8_t* GetDataInternal() const;
 
   size_t GetDataLength() const {
-    // extra SIMD padding needed for SWGL
-    return static_cast<size_t>(mStride) * mSize.height + 16;
+    return static_cast<size_t>(mStride) * mSize.height;
   }
 
   size_t GetAlignedDataLength() const {
diff -Nru firefox-84.0.2+build1/gfx/layers/SurfacePoolCA.mm firefox-85.0+build1/gfx/layers/SurfacePoolCA.mm
--- firefox-84.0.2+build1/gfx/layers/SurfacePoolCA.mm	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/SurfacePoolCA.mm	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_gfx.h"
 
+#include "GeckoProfiler.h"
 #include "GLContextCGL.h"
 #include "MozFramebuffer.h"
 
@@ -156,14 +157,6 @@
     return surface;
   }
 
-  // Add enough padding so that SWGL can safely read up to one SIMD vector worth
-  // of bytes at the last pixel, which it does for performance reasons.
-  //
-  // This in turn also requires specifying a properly aligned bytes per row
-  // value so odd-sized surfaces like a tooltip still work.
-  size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, aSize.width * 4);
-  size_t allocSize = IOSurfaceAlignProperty(kIOSurfaceAllocSize, bytesPerRow * aSize.height + 16);
-
   AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("IOSurface creation", GRAPHICS_TileAllocation,
                                         nsPrintfCString("%dx%d", aSize.width, aSize.height));
   CFTypeRefPtr<IOSurfaceRef> surface =
@@ -172,8 +165,6 @@
         (__bridge NSString*)kIOSurfaceHeight : @(aSize.height),
         (__bridge NSString*)kIOSurfacePixelFormat : @(kCVPixelFormatType_32BGRA),
         (__bridge NSString*)kIOSurfaceBytesPerElement : @(4),
-        (__bridge NSString*)kIOSurfaceBytesPerRow : @(bytesPerRow),
-        (__bridge NSString*)kIOSurfaceAllocSize : @(allocSize),
       }));
   if (surface) {
     // Create a new entry in mInUseEntries.
diff -Nru firefox-84.0.2+build1/gfx/layers/TextureSourceProvider.cpp firefox-85.0+build1/gfx/layers/TextureSourceProvider.cpp
--- firefox-84.0.2+build1/gfx/layers/TextureSourceProvider.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/TextureSourceProvider.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/layers/PTextureParent.h"
 #ifdef XP_DARWIN
 #  include "mozilla/layers/TextureSync.h"
+#  include "nsClassHashtable.h"
 #endif
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/layers/UpdateImageHelper.h firefox-85.0+build1/gfx/layers/UpdateImageHelper.h
--- firefox-84.0.2+build1/gfx/layers/UpdateImageHelper.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/UpdateImageHelper.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef GFX_UPDATEIMAGEHELPER_H
 #define GFX_UPDATEIMAGEHELPER_H
 
-#include "Layers.h"
+#include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/ImageClient.h"
 #include "mozilla/layers/TextureClient.h"
 #include "mozilla/layers/TextureClientRecycleAllocator.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/AsyncImagePipelineManager.cpp firefox-85.0+build1/gfx/layers/wr/AsyncImagePipelineManager.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/AsyncImagePipelineManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/AsyncImagePipelineManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -731,5 +731,13 @@
   return mAsyncImageEpoch;
 }
 
+AsyncImagePipelineManager::WebRenderPipelineInfoHolder::
+    WebRenderPipelineInfoHolder(RefPtr<const wr::WebRenderPipelineInfo>&& aInfo,
+                                ipc::FileDescriptor&& aFenceFd)
+    : mInfo(aInfo), mFenceFd(aFenceFd) {}
+
+AsyncImagePipelineManager::WebRenderPipelineInfoHolder::
+    ~WebRenderPipelineInfoHolder() = default;
+
 }  // namespace layers
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/AsyncImagePipelineManager.h firefox-85.0+build1/gfx/layers/wr/AsyncImagePipelineManager.h
--- firefox-84.0.2+build1/gfx/layers/wr/AsyncImagePipelineManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/AsyncImagePipelineManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -253,9 +253,8 @@
 
   struct WebRenderPipelineInfoHolder {
     WebRenderPipelineInfoHolder(RefPtr<const wr::WebRenderPipelineInfo>&& aInfo,
-                                ipc::FileDescriptor&& aFenceFd)
-        : mInfo(aInfo), mFenceFd(aFenceFd) {}
-    ~WebRenderPipelineInfoHolder() {}
+                                ipc::FileDescriptor&& aFenceFd);
+    ~WebRenderPipelineInfoHolder();
     RefPtr<const wr::WebRenderPipelineInfo> mInfo;
     ipc::FileDescriptor mFenceFd;
   };
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/IpcResourceUpdateQueue.h firefox-85.0+build1/gfx/layers/wr/IpcResourceUpdateQueue.h
--- firefox-84.0.2+build1/gfx/layers/wr/IpcResourceUpdateQueue.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/IpcResourceUpdateQueue.h	2021-01-18 19:58:11.000000000 +0000
@@ -18,7 +18,8 @@
 }
 namespace layers {
 class TextureClient;
-}
+class WebRenderBridgeChild;
+}  // namespace layers
 
 namespace wr {
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/RenderRootTypes.h firefox-85.0+build1/gfx/layers/wr/RenderRootTypes.h
--- firefox-84.0.2+build1/gfx/layers/wr/RenderRootTypes.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/RenderRootTypes.h	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,6 @@
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/layers/WebRenderMessages.h"
 #include "mozilla/layers/WebRenderScrollData.h"
-#include "mozilla/Variant.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/StackingContextHelper.cpp firefox-85.0+build1/gfx/layers/wr/StackingContextHelper.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/StackingContextHelper.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/StackingContextHelper.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/layers/StackingContextHelper.h"
 
+#include "mozilla/PresShell.h"
 #include "UnitTransforms.h"
 #include "nsDisplayList.h"
 
@@ -61,6 +62,19 @@
           transform2d * aParentSC.mSnappingSurfaceTransform;
     }
 
+  } else if (aParams.reference_frame_kind == wr::WrReferenceFrameKind::Zoom &&
+             aContainerItem &&
+             aContainerItem->GetType() == DisplayItemType::TYPE_ASYNC_ZOOM &&
+             aContainerItem->Frame()) {
+    double resolution = aContainerItem->Frame()->PresShell()->GetResolution();
+    gfx::Matrix transform = gfx::Matrix::Scaling(resolution, resolution);
+
+    mInheritedTransform = transform * aParentSC.mInheritedTransform;
+    mScale = resolution * aParentSC.mScale;
+
+    MOZ_ASSERT(!aParams.mAnimated);
+    mSnappingSurfaceTransform = transform * aParentSC.mSnappingSurfaceTransform;
+
   } else {
     mInheritedTransform = aParentSC.mInheritedTransform;
     mScale = aParentSC.mScale;
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderBridgeParent.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderBridgeParent.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderBridgeParent.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderBridgeParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,8 @@
 #include "GeckoProfiler.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
+#include "GLLibraryLoader.h"
+#include "Layers.h"
 #include "nsExceptionHandler.h"
 #include "mozilla/Range.h"
 #include "mozilla/StaticPrefs_gfx.h"
@@ -32,6 +34,7 @@
 #include "mozilla/layers/SharedSurfacesParent.h"
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/AsyncImagePipelineManager.h"
+#include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/layers/WebRenderImageHost.h"
 #include "mozilla/layers/WebRenderTextureHost.h"
 #include "mozilla/Telemetry.h"
@@ -45,7 +48,7 @@
 #endif
 
 #ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
+#  include "mozilla/ProfilerMarkerTypes.h"
 #endif
 
 bool is_in_main_thread() { return NS_IsMainThread(); }
@@ -59,26 +62,20 @@
 }
 
 void gecko_profiler_start_marker(const char* name) {
-#ifdef MOZ_GECKO_PROFILER
-  profiler_tracing_marker("WebRender", name,
-                          JS::ProfilingCategoryPair::GRAPHICS,
-                          TRACING_INTERVAL_START);
-#endif
+  PROFILER_MARKER(mozilla::ProfilerString8View::WrapNullTerminatedString(name),
+                  GRAPHICS, mozilla::MarkerTiming::IntervalStart(), Tracing,
+                  "WebRender");
 }
 
 void gecko_profiler_end_marker(const char* name) {
-#ifdef MOZ_GECKO_PROFILER
-  profiler_tracing_marker("WebRender", name,
-                          JS::ProfilingCategoryPair::GRAPHICS,
-                          TRACING_INTERVAL_END);
-#endif
+  PROFILER_MARKER(mozilla::ProfilerString8View::WrapNullTerminatedString(name),
+                  GRAPHICS, mozilla::MarkerTiming::IntervalEnd(), Tracing,
+                  "WebRender");
 }
 
 void gecko_profiler_event_marker(const char* name) {
-#ifdef MOZ_GECKO_PROFILER
-  profiler_tracing_marker("WebRender", name,
-                          JS::ProfilingCategoryPair::GRAPHICS, TRACING_EVENT);
-#endif
+  PROFILER_MARKER(mozilla::ProfilerString8View::WrapNullTerminatedString(name),
+                  GRAPHICS, {}, Tracing, "WebRender");
 }
 
 void gecko_profiler_add_text_marker(const char* name, const char* text_bytes,
@@ -226,46 +223,10 @@
           auto endTime = TimeStamp::Now();
 #ifdef MOZ_GECKO_PROFILER
           if (profiler_can_accept_markers()) {
-            class ContentFullPaintPayload : public ProfilerMarkerPayload {
-             public:
-              ContentFullPaintPayload(const mozilla::TimeStamp& aStartTime,
-                                      const mozilla::TimeStamp& aEndTime)
-                  : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-              mozilla::ProfileBufferEntryWriter::Length
-              TagAndSerializationBytes() const override {
-                return CommonPropsTagAndSerializationBytes();
-              }
-              void SerializeTagAndPayload(mozilla::ProfileBufferEntryWriter&
-                                              aEntryWriter) const override {
-                static const DeserializerTag tag =
-                    TagForDeserializer(Deserialize);
-                SerializeTagAndCommonProps(tag, aEntryWriter);
-              }
-              void StreamPayload(
-                  mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-                  const TimeStamp& aProcessStartTime,
-                  UniqueStacks& aUniqueStacks) const override {
-                StreamCommonProps("CONTENT_FULL_PAINT_TIME", aWriter,
-                                  aProcessStartTime, aUniqueStacks);
-              }
-
-             private:
-              explicit ContentFullPaintPayload(CommonProps&& aCommonProps)
-                  : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-              static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
-                  mozilla::ProfileBufferEntryReader& aEntryReader) {
-                ProfilerMarkerPayload::CommonProps props =
-                    DeserializeCommonProps(aEntryReader);
-                return UniquePtr<ProfilerMarkerPayload>(
-                    new ContentFullPaintPayload(std::move(props)));
-              }
-            };
-
-            AUTO_PROFILER_STATS(add_marker_with_ContentFullPaintPayload);
-            profiler_add_marker_for_thread(
-                profiler_current_thread_id(),
-                JS::ProfilingCategoryPair::GRAPHICS, "CONTENT_FULL_PAINT_TIME",
-                ContentFullPaintPayload(startTime, endTime));
+            profiler_add_marker("CONTENT_FULL_PAINT_TIME",
+                                geckoprofiler::category::GRAPHICS,
+                                MarkerTiming::Interval(startTime, endTime),
+                                baseprofiler::markers::ContentBuildMarker{});
           }
 #endif
           Telemetry::Accumulate(
@@ -437,6 +398,11 @@
     return;
   }
   mDestroyed = true;
+  if (mWebRenderBridgeRef) {
+    // Break mutual reference
+    mWebRenderBridgeRef->Clear();
+    mWebRenderBridgeRef = nullptr;
+  }
   ClearResources();
 }
 
@@ -709,7 +675,7 @@
 
   auto imageType =
       mApi->GetBackendType() == WebRenderBackend::SOFTWARE
-          ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Default)
+          ? wr::ExternalImageType::TextureHandle(wr::ImageBufferKind::Texture2D)
           : wr::ExternalImageType::Buffer();
   wr::ImageDescriptor descriptor(dSurf->GetSize(), dSurf->Stride(),
                                  dSurf->GetFormat());
@@ -823,7 +789,7 @@
 
   auto imageType =
       mApi->GetBackendType() == WebRenderBackend::SOFTWARE
-          ? wr::ExternalImageType::TextureHandle(wr::TextureTarget::Default)
+          ? wr::ExternalImageType::TextureHandle(wr::ImageBufferKind::Texture2D)
           : wr::ExternalImageType::Buffer();
   wr::ImageDescriptor descriptor(dSurf->GetSize(), dSurf->Stride(),
                                  dSurf->GetFormat());
@@ -927,23 +893,22 @@
 }
 
 void WebRenderBridgeParent::AddPendingScrollPayload(
-    CompositionPayload& aPayload,
-    const std::pair<wr::PipelineId, wr::Epoch>& aKey) {
+    CompositionPayload& aPayload, const VsyncId& aCompositeStartId) {
   auto pendingScrollPayloads = mPendingScrollPayloads.Lock();
   nsTArray<CompositionPayload>* payloads =
-      pendingScrollPayloads->LookupOrAdd(aKey);
+      pendingScrollPayloads->LookupOrAdd(aCompositeStartId.mId);
 
   payloads->AppendElement(aPayload);
 }
 
 nsTArray<CompositionPayload> WebRenderBridgeParent::TakePendingScrollPayload(
-    const std::pair<wr::PipelineId, wr::Epoch>& aKey) {
+    const VsyncId& aCompositeStartId) {
   auto pendingScrollPayloads = mPendingScrollPayloads.Lock();
   nsTArray<CompositionPayload> payload;
   if (nsTArray<CompositionPayload>* storedPayload =
-          pendingScrollPayloads->Get(aKey)) {
+          pendingScrollPayloads->Get(aCompositeStartId.mId)) {
     payload.AppendElements(std::move(*storedPayload));
-    pendingScrollPayloads->Remove(aKey);
+    pendingScrollPayloads->Remove(aCompositeStartId.mId);
   }
   return payload;
 }
@@ -2125,7 +2090,7 @@
 #endif
 
   MOZ_ASSERT(generateFrame);
-  fastTxn.GenerateFrame();
+  fastTxn.GenerateFrame(aId);
   mApi->SendTransaction(fastTxn);
 
 #if defined(MOZ_WIDGET_ANDROID)
@@ -2283,7 +2248,7 @@
       aUiController->NotifyFirstPaint();
     }
 
-    RecordCompositionPayloadsPresented(transactionId.mPayloads);
+    RecordCompositionPayloadsPresented(aEndTime, transactionId.mPayloads);
 
     id = transactionId.mId;
     mPendingTransactionIds.pop_front();
@@ -2506,5 +2471,38 @@
   mAsyncImageManager->FlushImageNotifications(aNotifications);
 }
 
+RefPtr<WebRenderBridgeParentRef>
+WebRenderBridgeParent::GetWebRenderBridgeParentRef() {
+  if (mDestroyed) {
+    return nullptr;
+  }
+
+  if (!mWebRenderBridgeRef) {
+    mWebRenderBridgeRef = new WebRenderBridgeParentRef(this);
+  }
+  return mWebRenderBridgeRef;
+}
+
+WebRenderBridgeParentRef::WebRenderBridgeParentRef(
+    WebRenderBridgeParent* aWebRenderBridge)
+    : mWebRenderBridge(aWebRenderBridge) {
+  MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
+  MOZ_ASSERT(mWebRenderBridge);
+}
+
+RefPtr<WebRenderBridgeParent> WebRenderBridgeParentRef::WrBridge() {
+  return mWebRenderBridge;
+}
+
+void WebRenderBridgeParentRef::Clear() {
+  MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
+  mWebRenderBridge = nullptr;
+}
+
+WebRenderBridgeParentRef::~WebRenderBridgeParentRef() {
+  MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());
+  MOZ_ASSERT(!mWebRenderBridge);
+}
+
 }  // namespace layers
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderBridgeParent.h firefox-85.0+build1/gfx/layers/wr/WebRenderBridgeParent.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderBridgeParent.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderBridgeParent.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,20 +12,17 @@
 
 #include "CompositableHost.h"  // for CompositableHost, ImageCompositeNotificationInfo
 #include "GLContextProvider.h"
-#include "Layers.h"
+#include "mozilla/DataMutex.h"
 #include "mozilla/layers/CompositableTransactionParent.h"
-#include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/layers/CompositorVsyncSchedulerOwner.h"
+#include "mozilla/layers/LayerManager.h"
 #include "mozilla/layers/PWebRenderBridgeParent.h"
-#include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/HashTable.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Result.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/WeakPtr.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/webrender/WebRenderAPI.h"
-#include "mozilla/webrender/RenderThread.h"
 #include "nsTArrayForwardDeclare.h"
 
 namespace mozilla {
@@ -40,7 +37,8 @@
 
 namespace wr {
 class WebRenderAPI;
-}
+class WebRenderPipelineInfo;
+}  // namespace wr
 
 namespace layers {
 
@@ -49,45 +47,11 @@
 class CompositorBridgeParentBase;
 class CompositorVsyncScheduler;
 class OMTASampler;
+class UiCompositorControllerParent;
+class WebRenderBridgeParentRef;
 class WebRenderImageHost;
 struct WrAnimations;
 
-class PipelineIdAndEpochHashEntry : public PLDHashEntryHdr {
- public:
-  typedef const std::pair<wr::PipelineId, wr::Epoch>& KeyType;
-  typedef const std::pair<wr::PipelineId, wr::Epoch>* KeyTypePointer;
-  enum { ALLOW_MEMMOVE = true };
-
-  explicit PipelineIdAndEpochHashEntry(wr::PipelineId aPipelineId,
-                                       wr::Epoch aEpoch)
-      : mValue(aPipelineId, aEpoch) {}
-
-  PipelineIdAndEpochHashEntry(PipelineIdAndEpochHashEntry&& aOther) = default;
-
-  explicit PipelineIdAndEpochHashEntry(KeyTypePointer aKey)
-      : mValue(aKey->first, aKey->second) {}
-
-  ~PipelineIdAndEpochHashEntry() {}
-
-  KeyType GetKey() const { return mValue; }
-
-  bool KeyEquals(KeyTypePointer aKey) const {
-    return mValue.first.mHandle == aKey->first.mHandle &&
-           mValue.first.mNamespace == aKey->first.mNamespace &&
-           mValue.second.mHandle == aKey->second.mHandle;
-  };
-
-  static KeyTypePointer KeyToPointer(KeyType aKey) { return &aKey; }
-
-  static PLDHashNumber HashKey(KeyTypePointer aKey) {
-    return mozilla::HashGeneric(aKey->first.mHandle, aKey->first.mNamespace,
-                                aKey->second.mHandle);
-  }
-
- private:
-  std::pair<wr::PipelineId, wr::Epoch> mValue;
-};
-
 struct CompositorAnimationIdsForEpoch {
   CompositorAnimationIdsForEpoch(const wr::Epoch& aEpoch,
                                  nsTArray<uint64_t>&& aIds)
@@ -100,8 +64,7 @@
 class WebRenderBridgeParent final : public PWebRenderBridgeParent,
                                     public CompositorVsyncSchedulerOwner,
                                     public CompositableParentManager,
-                                    public layers::FrameRecorder,
-                                    public SupportsWeakPtr {
+                                    public layers::FrameRecorder {
  public:
   WebRenderBridgeParent(CompositorBridgeParentBase* aCompositorBridge,
                         const wr::PipelineId& aPipelineId,
@@ -326,12 +289,13 @@
   RefPtr<wr::WebRenderAPI::GetCollectedFramesPromise> GetCollectedFrames();
 
   void DisableNativeCompositor();
-  void AddPendingScrollPayload(
-      CompositionPayload& aPayload,
-      const std::pair<wr::PipelineId, wr::Epoch>& aKey);
+  void AddPendingScrollPayload(CompositionPayload& aPayload,
+                               const VsyncId& aCompositeStartId);
 
   nsTArray<CompositionPayload> TakePendingScrollPayload(
-      const std::pair<wr::PipelineId, wr::Epoch>& aKey);
+      const VsyncId& aCompositeStartId);
+
+  RefPtr<WebRenderBridgeParentRef> GetWebRenderBridgeParentRef();
 
  private:
   class ScheduleSharedSurfaceRelease;
@@ -512,6 +476,8 @@
 
   TimeStamp mMostRecentComposite;
 
+  RefPtr<WebRenderBridgeParentRef> mWebRenderBridgeRef;
+
 #if defined(MOZ_WIDGET_ANDROID)
   UiCompositorControllerParent* mScreenPixelsTarget;
 #endif
@@ -522,11 +488,30 @@
   bool mSkippedComposite;
   bool mDisablingNativeCompositor;
   // These payloads are being used for SCROLL_PRESENT_LATENCY telemetry
-  DataMutex<nsClassHashtable<PipelineIdAndEpochHashEntry,
-                             nsTArray<CompositionPayload>>>
+  DataMutex<nsClassHashtable<nsUint64HashKey, nsTArray<CompositionPayload>>>
       mPendingScrollPayloads;
 };
 
+// Use this class, since WebRenderBridgeParent could not supports
+// ThreadSafeWeakPtr.
+// This class provides a ref of WebRenderBridgeParent when
+// the WebRenderBridgeParent is not destroyed. Then it works similar to
+// weak pointer.
+class WebRenderBridgeParentRef final {
+ public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(WebRenderBridgeParentRef)
+
+  explicit WebRenderBridgeParentRef(WebRenderBridgeParent* aWebRenderBridge);
+
+  RefPtr<WebRenderBridgeParent> WrBridge();
+  void Clear();
+
+ protected:
+  ~WebRenderBridgeParentRef();
+
+  RefPtr<WebRenderBridgeParent> mWebRenderBridge;
+};
+
 }  // namespace layers
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderCommandBuilder.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderCommandBuilder.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderCommandBuilder.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderCommandBuilder.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1339,10 +1339,10 @@
 
 /* This is just a copy of nsRect::ScaleToOutsidePixels with an offset added in.
  * The offset is applied just before the rounding. It's in the scaled space. */
-static mozilla::gfx::IntRect ScaleToOutsidePixelsOffset(
+static mozilla::LayerIntRect ScaleToOutsidePixelsOffset(
     nsRect aRect, float aXScale, float aYScale, nscoord aAppUnitsPerPixel,
     LayerPoint aOffset) {
-  mozilla::gfx::IntRect rect;
+  mozilla::LayerIntRect rect;
   rect.SetNonEmptyBox(
       NSToIntFloor(NSAppUnitsToFloatPixels(aRect.x, float(aAppUnitsPerPixel)) *
                        aXScale +
@@ -1431,17 +1431,16 @@
   // allocating much larger textures than necessary in webrender.
   //
   // Don't bother fixing this unless we run into this in the real world, though.
-  auto layerBounds = LayerIntRect::FromUnknownRect(
+  auto layerBounds =
       ScaleToOutsidePixelsOffset(groupBounds, scale.width, scale.height,
-                                 appUnitsPerDevPixel, residualOffset));
+                                 appUnitsPerDevPixel, residualOffset);
 
   const nsRect& untransformedPaintRect =
       aWrappingItem->GetUntransformedPaintRect();
 
-  auto visibleRect = LayerIntRect::FromUnknownRect(
-                         ScaleToOutsidePixelsOffset(
-                             untransformedPaintRect, scale.width, scale.height,
-                             appUnitsPerDevPixel, residualOffset))
+  auto visibleRect = ScaleToOutsidePixelsOffset(
+                         untransformedPaintRect, scale.width, scale.height,
+                         appUnitsPerDevPixel, residualOffset)
                          .Intersect(layerBounds);
 
   GP("LayerBounds: %d %d %d %d\n", layerBounds.x, layerBounds.y,
@@ -1553,7 +1552,7 @@
   AUTO_PROFILER_LABEL_CATEGORY_PAIR(GRAPHICS_WRDisplayList);
 
   StackingContextHelper sc;
-  aScrollData = WebRenderScrollData(mManager);
+  aScrollData = WebRenderScrollData(mManager, aDisplayListBuilder);
   MOZ_ASSERT(mLayerScrollData.empty());
   mClipManager.BeginBuild(mManager, aBuilder);
   mBuilderDumpIndex = 0;
@@ -1625,7 +1624,7 @@
 
 bool WebRenderCommandBuilder::ShouldDumpDisplayList(
     nsDisplayListBuilder* aBuilder) {
-  return aBuilder != nullptr && aBuilder->IsInActiveDocShell() &&
+  return aBuilder && aBuilder->IsInActiveDocShell() &&
          ((XRE_IsParentProcess() &&
            StaticPrefs::gfx_webrender_dl_dump_parent()) ||
           (XRE_IsContentProcess() &&
@@ -1945,8 +1944,6 @@
   RefPtr<Layer> root = aItem->AsPaintedDisplayItem()->BuildLayer(
       aDisplayListBuilder, blm, param);
 
-  aDisplayListBuilder->NotifyAndClearScrollFrames();
-
   if (root) {
     blm->SetRoot(root);
     layerBuilder->WillEndTransaction();
@@ -1989,8 +1986,6 @@
   RefPtr<Layer> root = aItem->AsPaintedDisplayItem()->BuildLayer(
       aDisplayListBuilder, aManager, param);
 
-  aDisplayListBuilder->NotifyAndClearScrollFrames();
-
   if (root) {
     aManager->SetRoot(root);
     layerBuilder->WillEndTransaction();
@@ -2195,14 +2190,12 @@
                           appUnitsPerDevPixel, residualOffset))
                       .Intersect(dtRect);
   } else {
-    dtRect = LayerIntRect::FromUnknownRect(
-        ScaleToOutsidePixelsOffset(paintBounds, scale.width, scale.height,
-                                   appUnitsPerDevPixel, residualOffset));
+    dtRect = ScaleToOutsidePixelsOffset(paintBounds, scale.width, scale.height,
+                                        appUnitsPerDevPixel, residualOffset);
 
-    visibleRect = LayerIntRect::FromUnknownRect(
-                      ScaleToOutsidePixelsOffset(
-                          aItem->GetBuildingRect(), scale.width, scale.height,
-                          appUnitsPerDevPixel, residualOffset))
+    visibleRect = ScaleToOutsidePixelsOffset(
+                      aItem->GetBuildingRect(), scale.width, scale.height,
+                      appUnitsPerDevPixel, residualOffset)
                       .Intersect(dtRect);
   }
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderImageHost.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderImageHost.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderImageHost.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderImageHost.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -68,7 +68,7 @@
 
   if (GetAsyncRef()) {
     for (const auto& it : mWrBridges) {
-      WebRenderBridgeParent* wrBridge = it.second;
+      RefPtr<WebRenderBridgeParent> wrBridge = it.second->WrBridge();
       if (wrBridge && wrBridge->CompositorScheduler()) {
         wrBridge->CompositorScheduler()->ScheduleComposition();
       }
@@ -86,7 +86,7 @@
           img.mFrameID > mLastFrameID || img.mProducerID != mLastProducerID;
       if (frameComesAfter && !img.mTimeStamp.IsNull()) {
         for (const auto& it : mWrBridges) {
-          WebRenderBridgeParent* wrBridge = it.second;
+          RefPtr<WebRenderBridgeParent> wrBridge = it.second->WrBridge();
           if (wrBridge) {
             wrBridge->AsyncImageManager()->CompositeUntil(
                 img.mTimeStamp + TimeDuration::FromMilliseconds(BIAS_TIME_MS));
@@ -257,7 +257,9 @@
   const auto it = mWrBridges.find(wr::AsUint64(aPipelineId));
   MOZ_ASSERT(it == mWrBridges.end());
 #endif
-  mWrBridges.emplace(wr::AsUint64(aPipelineId), aWrBridge);
+  RefPtr<WebRenderBridgeParentRef> ref =
+      aWrBridge->GetWebRenderBridgeParentRef();
+  mWrBridges.emplace(wr::AsUint64(aPipelineId), ref);
 }
 
 void WebRenderImageHost::ClearWrBridge(const wr::PipelineId& aPipelineId,
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderImageHost.h firefox-85.0+build1/gfx/layers/wr/WebRenderImageHost.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderImageHost.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderImageHost.h	2021-01-18 19:58:11.000000000 +0000
@@ -18,6 +18,7 @@
 
 class AsyncImagePipelineManager;
 class WebRenderBridgeParent;
+class WebRenderBridgeParentRef;
 
 /**
  * ImageHost. Works with ImageClientSingle and ImageClientBuffered
@@ -88,7 +89,7 @@
 
   void SetCurrentTextureHost(TextureHost* aTexture);
 
-  std::unordered_map<uint64_t, WeakPtr<WebRenderBridgeParent>> mWrBridges;
+  std::unordered_map<uint64_t, RefPtr<WebRenderBridgeParentRef>> mWrBridges;
 
   AsyncImagePipelineManager* mCurrentAsyncImageManager;
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderLayerManager.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderLayerManager.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderLayerManager.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderLayerManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include "WebRenderLayerManager.h"
 
 #include "BasicLayers.h"
+#include "Layers.h"
 
 #include "GeckoProfiler.h"
 #include "mozilla/StaticPrefs_apz.h"
@@ -17,6 +18,7 @@
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/StackingContextHelper.h"
 #include "mozilla/layers/TextureClient.h"
+#include "mozilla/layers/TransactionIdAllocator.h"
 #include "mozilla/layers/WebRenderBridgeChild.h"
 #include "mozilla/layers/UpdateImageHelper.h"
 #include "nsDisplayList.h"
@@ -182,7 +184,7 @@
   }
 }
 
-void WebRenderLayerManager::PayloadPresented() {
+void WebRenderLayerManager::PayloadPresented(const TimeStamp& aTimeStamp) {
   MOZ_CRASH("WebRenderLayerManager::PayloadPresented should not be called");
 }
 
@@ -319,8 +321,16 @@
 
   LayoutDeviceIntSize size = mWidget->GetClientSize();
 
-  wr::DisplayListBuilder builder(WrBridge()->GetPipeline(),
-                                 mLastDisplayListSize, &mDisplayItemCache);
+  // While the first display list after tab-switch can be large, the
+  // following ones are always smaller thanks to interning (rarely above 0.3MB).
+  // So don't let the spike of the first allocation make us allocate a large
+  // contiguous buffer (with some likelihood of OOM, see bug 1531819).
+  static const size_t kMaxPrealloc = 300000;
+  size_t preallocate =
+      mLastDisplayListSize < kMaxPrealloc ? mLastDisplayListSize : kMaxPrealloc;
+
+  wr::DisplayListBuilder builder(WrBridge()->GetPipeline(), preallocate,
+                                 &mDisplayItemCache);
 
   wr::IpcResourceUpdateQueue resourceUpdates(WrBridge());
   wr::usize builderDumpIndex = 0;
@@ -350,6 +360,8 @@
         builder, resourceUpdates, aDisplayList, aDisplayListBuilder,
         mScrollData, std::move(aFilters));
 
+    aDisplayListBuilder->NotifyAndClearScrollFrames();
+
     builderDumpIndex = mWebRenderCommandBuilder.GetBuilderDumpIndex();
     containsSVGGroup = mWebRenderCommandBuilder.GetContainsSVGGroup();
   } else {
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderLayerManager.h firefox-85.0+build1/gfx/layers/wr/WebRenderLayerManager.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderLayerManager.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderLayerManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,29 +7,37 @@
 #ifndef GFX_WEBRENDERLAYERMANAGER_H
 #define GFX_WEBRENDERLAYERMANAGER_H
 
-#include <unordered_set>
-#include <unordered_map>
-#include <vector>
-
-#include "Layers.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/MozPromise.h"
-#include "mozilla/StaticPrefs_apz.h"
-#include "mozilla/SVGIntegrationUtils.h"  // for WrFiltersHolder
-#include "mozilla/layers/APZTestData.h"
-#include "mozilla/layers/FocusTarget.h"
-#include "mozilla/layers/IpcResourceUpdateQueue.h"
-#include "mozilla/layers/RenderRootStateManager.h"
-#include "mozilla/layers/SharedSurfacesChild.h"
-#include "mozilla/layers/StackingContextHelper.h"
-#include "mozilla/layers/TransactionIdAllocator.h"
-#include "mozilla/layers/WebRenderCommandBuilder.h"
-#include "mozilla/layers/WebRenderScrollData.h"
-#include "mozilla/layers/WebRenderUserData.h"
-#include "mozilla/webrender/WebRenderAPI.h"
-#include "mozilla/webrender/WebRenderTypes.h"
-#include "nsDisplayList.h"
-
+#include <cstddef>                    // for size_t
+#include <cstdint>                    // for uint32_t, int32_t, INT32_MAX
+#include <string>                     // for string
+#include "Units.h"                    // for LayoutDeviceIntSize
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_ASSERT_HELPER2
+#include "mozilla/Attributes.h"               // for MOZ_NON_OWNING_REF
+#include "mozilla/RefPtr.h"                   // for RefPtr
+#include "mozilla/StaticPrefs_apz.h"          // for apz_test_logging_enabled
+#include "mozilla/TimeStamp.h"                // for TimeStamp
+#include "mozilla/gfx/Point.h"                // for IntSize
+#include "mozilla/gfx/Types.h"                // for SurfaceFormat
+#include "mozilla/layers/APZTestData.h"       // for APZTestData
+#include "mozilla/layers/CompositorTypes.h"   // for TextureFactoryIdentifier
+#include "mozilla/layers/DisplayItemCache.h"  // for DisplayItemCache
+#include "mozilla/layers/FocusTarget.h"       // for FocusTarget
+#include "mozilla/layers/LayerManager.h"  // for DidCompositeObserver (ptr only), LayerManager::END_DEFAULT, LayerManager::En...
+#include "mozilla/layers/LayersTypes.h"  // for TransactionId, LayersBackend, CompositionPayload (ptr only), LayersBackend::...
+#include "mozilla/layers/RenderRootStateManager.h"  // for RenderRootStateManager
+#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::ViewID
+#include "mozilla/layers/WebRenderCommandBuilder.h"  // for WebRenderCommandBuilder
+#include "mozilla/layers/WebRenderScrollData.h"      // for WebRenderScrollData
+#include "nsHashKeys.h"                              // for nsRefPtrHashKey
+#include "nsRegion.h"                                // for nsIntRegion
+#include "nsStringFwd.h"                             // for nsCString, nsAString
+#include "nsTArray.h"                                // for nsTArray
+#include "nsTHashtable.h"  // for nsTHashtable<>::Iterator, nsTHashtable
+
+class gfxContext;
+class nsDisplayList;
+class nsDisplayListBuilder;
 class nsIWidget;
 
 namespace mozilla {
@@ -40,6 +48,7 @@
 
 class CompositorBridgeChild;
 class KnowsCompositor;
+class Layer;
 class PCompositorBridgeChild;
 class WebRenderBridgeChild;
 class WebRenderParentCommand;
@@ -178,7 +187,7 @@
 
   RenderRootStateManager* GetRenderRootStateManager() { return &mStateManager; }
 
-  virtual void PayloadPresented() override;
+  virtual void PayloadPresented(const TimeStamp& aTimeStamp) override;
 
   void TakeCompositionPayloads(nsTArray<CompositionPayload>& aPayloads);
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderMessageUtils.h firefox-85.0+build1/gfx/layers/wr/WebRenderMessageUtils.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderMessageUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderMessageUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "chrome/common/ipc_message_utils.h"
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/webrender/webrender_ffi.h"
 #include "mozilla/webrender/WebRenderTypes.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderScrollData.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderScrollData.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderScrollData.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderScrollData.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -63,7 +63,7 @@
       Maybe<ScrollMetadata> metadata =
           asr->mScrollableFrame->ComputeScrollMetadata(
               aOwner.GetManager(), aItem->ReferenceFrame(), Nothing(), nullptr);
-      asr->mScrollableFrame->NotifyApzTransaction();
+      aOwner.GetBuilder()->AddScrollFrameToNotify(asr->mScrollableFrame);
       if (metadata) {
         MOZ_ASSERT(metadata->GetMetrics().GetScrollId() == scrollId);
         mScrollIds.AppendElement(aOwner.AddMetadata(metadata.ref()));
@@ -163,13 +163,21 @@
 WebRenderScrollData::WebRenderScrollData()
     : mManager(nullptr), mIsFirstPaint(false), mPaintSequenceNumber(0) {}
 
-WebRenderScrollData::WebRenderScrollData(WebRenderLayerManager* aManager)
-    : mManager(aManager), mIsFirstPaint(false), mPaintSequenceNumber(0) {}
+WebRenderScrollData::WebRenderScrollData(WebRenderLayerManager* aManager,
+                                         nsDisplayListBuilder* aBuilder)
+    : mManager(aManager),
+      mBuilder(aBuilder),
+      mIsFirstPaint(false),
+      mPaintSequenceNumber(0) {}
 
 WebRenderLayerManager* WebRenderScrollData::GetManager() const {
   return mManager;
 }
 
+nsDisplayListBuilder* WebRenderScrollData::GetBuilder() const {
+  return mBuilder;
+}
+
 size_t WebRenderScrollData::AddMetadata(const ScrollMetadata& aMetadata) {
   ScrollableLayerGuid::ViewID scrollId = aMetadata.GetMetrics().GetScrollId();
   auto p = mScrollIdMap.lookupForAdd(scrollId);
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderScrollData.h firefox-85.0+build1/gfx/layers/wr/WebRenderScrollData.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderScrollData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderScrollData.h	2021-01-18 19:58:11.000000000 +0000
@@ -24,6 +24,7 @@
 #include "mozilla/Maybe.h"
 #include "nsTArrayForwardDeclare.h"
 
+class nsDisplayListBuilder;
 class nsDisplayItem;
 
 namespace mozilla {
@@ -211,10 +212,13 @@
 class WebRenderScrollData final {
  public:
   WebRenderScrollData();
-  explicit WebRenderScrollData(WebRenderLayerManager* aManager);
+  explicit WebRenderScrollData(WebRenderLayerManager* aManager,
+                               nsDisplayListBuilder* aBuilder);
 
   WebRenderLayerManager* GetManager() const;
 
+  nsDisplayListBuilder* GetBuilder() const;
+
   // Add the given ScrollMetadata if it doesn't already exist. Return an index
   // that can be used to look up the metadata later.
   size_t AddMetadata(const ScrollMetadata& aMetadata);
@@ -259,6 +263,11 @@
   // outlive |this|.
   WebRenderLayerManager* MOZ_NON_OWNING_REF mManager;
 
+  // Pointer to the display list builder; if this is non-null, it will always be
+  // valid, because the nsDisplayListBuilder that created the layer manager will
+  // outlive |this|.
+  nsDisplayListBuilder* MOZ_NON_OWNING_REF mBuilder;
+
   // Internal data structure used to maintain uniqueness of mScrollMetadatas.
   // This is not serialized/deserialized over IPC, but it is rebuilt on the
   // parent side when mScrollMetadatas is deserialized. So it should always be
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderTextureHost.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderTextureHost.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderTextureHost.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderTextureHost.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/layers/ImageDataSerializer.h"
 #include "mozilla/layers/LayersSurfaces.h"
+#include "mozilla/layers/TextureSourceProvider.h"
 #include "mozilla/webrender/RenderThread.h"
 #include "mozilla/webrender/WebRenderAPI.h"
 
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderUserData.cpp firefox-85.0+build1/gfx/layers/wr/WebRenderUserData.cpp
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderUserData.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderUserData.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "WebRenderUserData.h"
 
+#include "BasicLayers.h"
 #include "mozilla/layers/AnimationHelper.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/ImageClient.h"
diff -Nru firefox-84.0.2+build1/gfx/layers/wr/WebRenderUserData.h firefox-85.0+build1/gfx/layers/wr/WebRenderUserData.h
--- firefox-84.0.2+build1/gfx/layers/wr/WebRenderUserData.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/layers/wr/WebRenderUserData.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,13 +8,12 @@
 #define GFX_WEBRENDERUSERDATA_H
 
 #include <vector>
-#include "BasicLayers.h"  // for BasicLayerManager
-#include "mozilla/layers/StackingContextHelper.h"
 #include "mozilla/webrender/WebRenderAPI.h"
 #include "mozilla/layers/AnimationInfo.h"
 #include "mozilla/dom/RemoteBrowser.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIFrame.h"
+#include "nsRefPtrHashtable.h"
 #include "ImageTypes.h"
 
 class nsDisplayItemGeometry;
@@ -33,12 +32,14 @@
 }
 
 namespace layers {
+class BasicLayerManager;
 class CanvasLayer;
 class ImageClient;
 class ImageContainer;
 class WebRenderBridgeChild;
 class WebRenderCanvasData;
 class WebRenderCanvasRenderer;
+class WebRenderCanvasRendererAsync;
 class WebRenderImageData;
 class WebRenderFallbackData;
 class WebRenderLocalCanvasData;
diff -Nru firefox-84.0.2+build1/gfx/ots/README.mozilla firefox-85.0+build1/gfx/ots/README.mozilla
--- firefox-84.0.2+build1/gfx/ots/README.mozilla	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/README.mozilla	2021-01-18 19:58:11.000000000 +0000
@@ -2,7 +2,7 @@
 
 Our reference repository is https://github.com/khaledhosny/ots/.
 
-Current revision: e6ac199dda34e069f8e67f40f85364063675293c (8.1.0)
+Current revision: d6d783c67b4aa604edd12dce0decc18a5c79906b (8.1.1)
 
 Upstream files included: LICENSE, src/, include/, tests/*.cc
 
diff -Nru firefox-84.0.2+build1/gfx/ots/src/gdef.cc firefox-85.0+build1/gfx/ots/src/gdef.cc
--- firefox-84.0.2+build1/gfx/ots/src/gdef.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/gdef.cc	2021-01-18 19:58:11.000000000 +0000
@@ -83,9 +83,9 @@
       if (!subtable.ReadU16(&point_index)) {
         return Error("Can't read point index %d in point %d", j, i);
       }
-      // Contour point indeces are in increasing numerical order
+      // Contour point indices are in increasing numerical order
       if (last_point_index != 0 && last_point_index >= point_index) {
-        return Error("bad contour indeces: %u >= %u",
+        return Error("bad contour indices: %u >= %u",
                     last_point_index, point_index);
       }
       last_point_index = point_index;
diff -Nru firefox-84.0.2+build1/gfx/ots/src/gloc.cc firefox-85.0+build1/gfx/ots/src/gloc.cc
--- firefox-84.0.2+build1/gfx/ots/src/gloc.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/gloc.cc	2021-01-18 19:58:11.000000000 +0000
@@ -31,7 +31,7 @@
 
   if (this->flags & ATTRIB_IDS && this->numAttribs * sizeof(uint16_t) >
                                   table.remaining()) {
-    return DropGraphite("Failed to calulate length of locations");
+    return DropGraphite("Failed to calculate length of locations");
   }
   size_t locations_len = (table.remaining() -
     (this->flags & ATTRIB_IDS ? this->numAttribs * sizeof(uint16_t) : 0)) /
diff -Nru firefox-84.0.2+build1/gfx/ots/src/glyf.cc firefox-85.0+build1/gfx/ots/src/glyf.cc
--- firefox-84.0.2+build1/gfx/ots/src/glyf.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/glyf.cc	2021-01-18 19:58:11.000000000 +0000
@@ -236,7 +236,7 @@
   std::vector<uint32_t> &offsets = loca->offsets;
 
   if (offsets.size() != num_glyphs + 1) {
-    return Error("Invalide glyph offsets size %ld != %d", offsets.size(), num_glyphs + 1);
+    return Error("Invalid glyph offsets size %ld != %d", offsets.size(), num_glyphs + 1);
   }
 
   std::vector<uint32_t> resulting_offsets(num_glyphs + 1);
diff -Nru firefox-84.0.2+build1/gfx/ots/src/gsub.cc firefox-85.0+build1/gfx/ots/src/gsub.cc
--- firefox-84.0.2+build1/gfx/ots/src/gsub.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/gsub.cc	2021-01-18 19:58:11.000000000 +0000
@@ -150,7 +150,7 @@
       return OTS_FAILURE_MSG("Failed to read substitution %d in sequence table", i);
     }
     if (substitute >= num_glyphs) {
-      return OTS_FAILURE_MSG("Bad subsitution (%d) %d > %d", i, substitute, num_glyphs);
+      return OTS_FAILURE_MSG("Bad substitution (%d) %d > %d", i, substitute, num_glyphs);
     }
   }
 
diff -Nru firefox-84.0.2+build1/gfx/ots/src/metrics.cc firefox-85.0+build1/gfx/ots/src/metrics.cc
--- firefox-84.0.2+build1/gfx/ots/src/metrics.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/metrics.cc	2021-01-18 19:58:11.000000000 +0000
@@ -58,7 +58,7 @@
 
   // skip the reserved bytes
   if (!table.Skip(8)) {
-    return Error("Failed to read reserverd bytes");
+    return Error("Failed to read reserved bytes");
   }
 
   int16_t data_format;
diff -Nru firefox-84.0.2+build1/gfx/ots/src/stat.cc firefox-85.0+build1/gfx/ots/src/stat.cc
--- firefox-84.0.2+build1/gfx/ots/src/stat.cc	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/ots/src/stat.cc	2021-01-18 19:58:11.000000000 +0000
@@ -186,8 +186,7 @@
       break;
     case 4:
       if (this->minorVersion < 2) {
-        Warning("Invalid table version for format 4 axis values - updating");
-        this->minorVersion = 2;
+        return Drop("Invalid table minorVersion for format 4 axis values: %d", this->minorVersion);
       }
       if (!table.ReadU16(&axisValue.format4.axisCount) ||
           !table.ReadU16(&axisValue.format4.flags) ||
diff -Nru firefox-84.0.2+build1/gfx/qcms/fuzz/fuzz_targets/fuzz_target_qcms.rs firefox-85.0+build1/gfx/qcms/fuzz/fuzz_targets/fuzz_target_qcms.rs
--- firefox-84.0.2+build1/gfx/qcms/fuzz/fuzz_targets/fuzz_target_qcms.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/fuzz/fuzz_targets/fuzz_target_qcms.rs	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
- use qcms::{iccread::{qcms_profile, qcms_profile_get_color_space}, transform::QCMS_DATA_RGBA_8, transform::QCMS_DATA_RGB_8, transform::QCMS_DATA_GRAYA_8, transform::QCMS_DATA_GRAY_8, iccread::icSigRgbData, iccread::qcms_profile_get_rendering_intent, transform::qcms_profile_precache_output_transform, transform::qcms_transform_create, transform::qcms_transform_data, transform::qcms_transform_release, transform::qcms_enable_iccv4, iccread::qcms_profile_from_memory, iccread::qcms_profile_release, iccread::qcms_profile_sRGB, iccread::qcms_profile_is_bogus, iccread::icSigGrayData};
+ use qcms::iccread::{qcms_profile, icSigRgbData, qcms_profile_is_bogus, icSigGrayData};
+ use qcms::c_bindings::{qcms_profile_get_color_space, qcms_profile_get_rendering_intent, qcms_profile_from_memory, qcms_profile_release, qcms_profile_sRGB};
+ use qcms::transform::{QCMS_DATA_RGBA_8, QCMS_DATA_RGB_8, QCMS_DATA_GRAYA_8, QCMS_DATA_GRAY_8, qcms_profile_precache_output_transform, qcms_transform_create, qcms_transform_data, qcms_transform_release, qcms_enable_iccv4};
 
  unsafe fn transform(src_profile: *mut qcms_profile, dst_profile: *mut qcms_profile, size: usize)
  {
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/qcms/profiles/B2A0-ident.icc and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/qcms/profiles/B2A0-ident.icc differ
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/c_bindings.rs firefox-85.0+build1/gfx/qcms/src/c_bindings.rs
--- firefox-84.0.2+build1/gfx/qcms/src/c_bindings.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/c_bindings.rs	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,222 @@
+use std::{ptr::null_mut, slice};
+
+use libc::{fclose, fopen, fread, free, malloc, FILE};
+
+use crate::{iccread::*, qcms_intent};
+
+#[no_mangle]
+pub extern "C" fn qcms_profile_sRGB() -> *mut qcms_profile {
+    let profile = profile_sRGB();
+    match profile {
+        Some(profile) => Box::into_raw(profile),
+        None => null_mut(),
+    }
+}
+
+//XXX: it would be nice if we had a way of ensuring
+// everything in a profile was initialized regardless of how it was created
+//XXX: should this also be taking a black_point?
+/* similar to CGColorSpaceCreateCalibratedRGB */
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma_set(
+    mut white_point: qcms_CIE_xyY,
+    mut primaries: qcms_CIE_xyYTRIPLE,
+    mut redGamma: f32,
+    mut greenGamma: f32,
+    mut blueGamma: f32,
+) -> *mut qcms_profile {
+    let profile =
+        profile_create_rgb_with_gamma_set(white_point, primaries, redGamma, greenGamma, blueGamma);
+    match profile {
+        Some(profile) => Box::into_raw(profile),
+        None => null_mut(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_create_gray_with_gamma(mut gamma: f32) -> *mut qcms_profile {
+    let profile = profile_create_gray_with_gamma(gamma);
+    match profile {
+        Some(profile) => Box::into_raw(profile),
+        None => null_mut(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma(
+    mut white_point: qcms_CIE_xyY,
+    mut primaries: qcms_CIE_xyYTRIPLE,
+    mut gamma: f32,
+) -> *mut qcms_profile {
+    return qcms_profile_create_rgb_with_gamma_set(white_point, primaries, gamma, gamma, gamma);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_create_rgb_with_table(
+    mut white_point: qcms_CIE_xyY,
+    mut primaries: qcms_CIE_xyYTRIPLE,
+    mut table: *const u16,
+    mut num_entries: i32,
+) -> *mut qcms_profile {
+    let table = slice::from_raw_parts(table, num_entries as usize);
+    let profile = profile_create_rgb_with_table(white_point, primaries, table);
+    match profile {
+        Some(profile) => Box::into_raw(profile),
+        None => null_mut(),
+    }
+}
+
+/* qcms_profile_from_memory does not hold a reference to the memory passed in */
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_from_memory(
+    mut mem: *const libc::c_void,
+    mut size: usize,
+) -> *mut qcms_profile {
+    let mem = slice::from_raw_parts(mem as *const libc::c_uchar, size);
+    let profile = profile_from_slice(mem);
+    match profile {
+        Some(profile) => Box::into_raw(profile),
+        None => null_mut(),
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_get_rendering_intent(
+    mut profile: *mut qcms_profile,
+) -> qcms_intent {
+    return (*profile).rendering_intent;
+}
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_get_color_space(
+    mut profile: *mut qcms_profile,
+) -> icColorSpaceSignature {
+    return (*profile).color_space;
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_release(mut profile: *mut qcms_profile) {
+    drop(Box::from_raw(profile));
+}
+unsafe extern "C" fn qcms_data_from_file(
+    mut file: *mut FILE,
+    mut mem: *mut *mut libc::c_void,
+    mut size: *mut usize,
+) {
+    let mut length: u32;
+    let mut remaining_length: u32;
+    let mut read_length: usize;
+    let mut length_be: be32 = 0;
+    let mut data: *mut libc::c_void;
+    *mem = 0 as *mut libc::c_void;
+    *size = 0;
+    if fread(
+        &mut length_be as *mut be32 as *mut libc::c_void,
+        1,
+        ::std::mem::size_of::<be32>(),
+        file,
+    ) != ::std::mem::size_of::<be32>()
+    {
+        return;
+    }
+    length = u32::from_be(length_be);
+    if length > MAX_PROFILE_SIZE as libc::c_uint
+        || (length as libc::c_ulong) < ::std::mem::size_of::<be32>() as libc::c_ulong
+    {
+        return;
+    }
+    /* allocate room for the entire profile */
+    data = malloc(length as usize);
+    if data.is_null() {
+        return;
+    }
+    /* copy in length to the front so that the buffer will contain the entire profile */
+    *(data as *mut be32) = length_be;
+    remaining_length =
+        (length as libc::c_ulong - ::std::mem::size_of::<be32>() as libc::c_ulong) as u32;
+    /* read the rest profile */
+    read_length = fread(
+        (data as *mut libc::c_uchar).offset(::std::mem::size_of::<be32>() as isize)
+            as *mut libc::c_void,
+        1,
+        remaining_length as usize,
+        file,
+    ) as usize;
+    if read_length != remaining_length as usize {
+        free(data);
+        return;
+    }
+    /* successfully get the profile.*/
+    *mem = data;
+    *size = length as usize;
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_from_file(mut file: *mut FILE) -> *mut qcms_profile {
+    let mut length: usize = 0;
+    let mut profile: *mut qcms_profile;
+    let mut data: *mut libc::c_void = 0 as *mut libc::c_void;
+    qcms_data_from_file(file, &mut data, &mut length);
+    if data.is_null() || length == 0 {
+        return 0 as *mut qcms_profile;
+    }
+    profile = qcms_profile_from_memory(data, length);
+    free(data);
+    return profile;
+}
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_from_path(
+    mut path: *const libc::c_char,
+) -> *mut qcms_profile {
+    let mut profile: *mut qcms_profile = 0 as *mut qcms_profile;
+    let mut file = fopen(path, b"rb\x00" as *const u8 as *const libc::c_char);
+    if !file.is_null() {
+        profile = qcms_profile_from_file(file);
+        fclose(file);
+    }
+    return profile;
+}
+#[no_mangle]
+pub unsafe extern "C" fn qcms_data_from_path(
+    mut path: *const libc::c_char,
+    mut mem: *mut *mut libc::c_void,
+    mut size: *mut usize,
+) {
+    *mem = 0 as *mut libc::c_void;
+    *size = 0;
+    let file = fopen(path, b"rb\x00" as *const u8 as *const libc::c_char);
+    if !file.is_null() {
+        qcms_data_from_file(file, mem, size);
+        fclose(file);
+    };
+}
+
+#[cfg(windows)]
+extern "C" {
+    pub fn _wfopen(filename: *const libc::wchar_t, mode: *const libc::wchar_t) -> *mut FILE;
+}
+
+#[cfg(windows)]
+#[no_mangle]
+pub unsafe extern "C" fn qcms_profile_from_unicode_path(mut path: *const libc::wchar_t) {
+    let mut file = _wfopen(path, ['r' as u16, 'b' as u16, '\0' as u16].as_ptr());
+    if !file.is_null() {
+        qcms_profile_from_file(file);
+        fclose(file);
+    };
+}
+
+#[cfg(windows)]
+#[no_mangle]
+pub unsafe extern "C" fn qcms_data_from_unicode_path(
+    mut path: *const libc::wchar_t,
+    mut mem: *mut *mut libc::c_void,
+    mut size: *mut usize,
+) {
+    *mem = 0 as *mut libc::c_void;
+    *size = 0;
+    let mut file = _wfopen(path, ['r' as u16, 'b' as u16, '\0' as u16].as_ptr());
+    if !file.is_null() {
+        qcms_data_from_file(file, mem, size);
+        fclose(file);
+    };
+}
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/chain.rs firefox-85.0+build1/gfx/qcms/src/chain.rs
--- firefox-84.0.2+build1/gfx/qcms/src/chain.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/chain.rs	2021-01-18 19:58:11.000000000 +0000
@@ -33,10 +33,8 @@
         lut_interp_linear_float,
     },
 };
-use ::libc::{self, calloc, free, malloc, memcpy};
 
-#[repr(C)]
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct qcms_modular_transform {
     pub matrix: matrix,
     pub tx: f32,
@@ -46,13 +44,11 @@
     pub input_clut_table_g: Option<Vec<f32>>,
     pub input_clut_table_b: Option<Vec<f32>>,
     pub input_clut_table_length: u16,
-    pub r_clut: *mut f32,
-    pub g_clut: *mut f32,
-    pub b_clut: *mut f32,
+    pub clut: Option<Vec<f32>>,
     pub grid_size: u16,
-    pub output_clut_table_r: *mut f32,
-    pub output_clut_table_g: *mut f32,
-    pub output_clut_table_b: *mut f32,
+    pub output_clut_table_r: Option<Vec<f32>>,
+    pub output_clut_table_g: Option<Vec<f32>>,
+    pub output_clut_table_b: Option<Vec<f32>>,
     pub output_clut_table_length: u16,
     pub output_gamma_lut_r: Option<Vec<u16>>,
     pub output_gamma_lut_g: Option<Vec<u16>>,
@@ -61,18 +57,17 @@
     pub output_gamma_lut_g_length: usize,
     pub output_gamma_lut_b_length: usize,
     pub transform_module_fn: transform_module_fn_t,
-    pub next_transform: *mut qcms_modular_transform,
+    pub next_transform: Option<Box<qcms_modular_transform>>,
 }
-pub type transform_module_fn_t = Option<
-    unsafe extern "C" fn(_: *mut qcms_modular_transform, _: *mut f32, _: *mut f32, _: usize) -> (),
->;
+pub type transform_module_fn_t =
+    Option<unsafe fn(_: *const qcms_modular_transform, _: *mut f32, _: *mut f32, _: usize) -> ()>;
 
 #[inline]
 fn lerp(mut a: f32, mut b: f32, mut t: f32) -> f32 {
     return a * (1.0 - t) + b * t;
 }
 
-unsafe extern "C" fn build_lut_matrix(mut lut: Option<&lutType>) -> matrix {
+fn build_lut_matrix(mut lut: Option<&lutType>) -> matrix {
     let mut result: matrix = matrix {
         m: [[0.; 3]; 3],
         invalid: false,
@@ -89,12 +84,12 @@
         result.m[2][2] = s15Fixed16Number_to_float((*lut).e22);
         result.invalid = false
     } else {
-        result = std::mem::zeroed();
+        result.m = Default::default();
         result.invalid = true
     }
     return result;
 }
-unsafe extern "C" fn build_mAB_matrix(lut: &lutmABType) -> matrix {
+fn build_mAB_matrix(lut: &lutmABType) -> matrix {
     let mut result: matrix = matrix {
         m: [[0.; 3]; 3],
         invalid: false,
@@ -114,8 +109,8 @@
     return result;
 }
 //Based on lcms cmsLab2XYZ
-unsafe extern "C" fn qcms_transform_module_LAB_to_XYZ(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_LAB_to_XYZ(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -166,8 +161,8 @@
     }
 }
 //Based on lcms cmsXYZ2Lab
-unsafe extern "C" fn qcms_transform_module_XYZ_to_LAB(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_XYZ_to_LAB(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -220,8 +215,8 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_transform_module_clut_only(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_clut_only(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -229,12 +224,14 @@
     let mut xy_len: i32 = 1;
     let mut x_len: i32 = (*transform).grid_size as i32;
     let mut len: i32 = x_len * x_len;
-    let mut r_table: *mut f32 = (*transform).r_clut;
-    let mut g_table: *mut f32 = (*transform).g_clut;
-    let mut b_table: *mut f32 = (*transform).b_clut;
+    let mut r_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(0isize);
+    let mut g_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(1isize);
+    let mut b_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(2isize);
+
     let mut i: usize = 0;
-    let CLU =
-        |table: *mut f32, x, y, z| *table.offset(((x * len + y * x_len + z * xy_len) * 3) as isize);
+    let CLU = |table: *const f32, x, y, z| {
+        *table.offset(((x * len + y * x_len + z * xy_len) * 3) as isize)
+    };
 
     while i < length {
         debug_assert!((*transform).grid_size as i32 >= 1);
@@ -293,8 +290,8 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_transform_module_clut(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_clut(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -302,11 +299,12 @@
     let mut xy_len: i32 = 1;
     let mut x_len: i32 = (*transform).grid_size as i32;
     let mut len: i32 = x_len * x_len;
-    let mut r_table: *mut f32 = (*transform).r_clut;
-    let mut g_table: *mut f32 = (*transform).g_clut;
-    let mut b_table: *mut f32 = (*transform).b_clut;
-    let CLU =
-        |table: *mut f32, x, y, z| *table.offset(((x * len + y * x_len + z * xy_len) * 3) as isize);
+    let mut r_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(0isize);
+    let mut g_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(1isize);
+    let mut b_table: *const f32 = (*transform).clut.as_ref().unwrap().as_ptr().offset(2isize);
+    let CLU = |table: *const f32, x, y, z| {
+        *table.offset(((x * len + y * x_len + z * xy_len) * 3) as isize)
+    };
 
     let mut i: usize = 0;
     let input_clut_table_r = (*transform).input_clut_table_r.as_ref().unwrap();
@@ -359,27 +357,12 @@
         let mut b_x4: f32 = lerp(CLU(b_table, x, y_n, z_n), CLU(b_table, x_n, y_n, z_n), x_d);
         let mut b_y2: f32 = lerp(b_x3, b_x4, y_d);
         let mut clut_b: f32 = lerp(b_y1, b_y2, z_d);
-        let mut pcs_r: f32 = lut_interp_linear_float(
-            clut_r,
-            std::slice::from_raw_parts(
-                (*transform).output_clut_table_r,
-                (*transform).output_clut_table_length as usize,
-            ),
-        );
-        let mut pcs_g: f32 = lut_interp_linear_float(
-            clut_g,
-            std::slice::from_raw_parts(
-                (*transform).output_clut_table_g,
-                (*transform).output_clut_table_length as usize,
-            ),
-        );
-        let mut pcs_b: f32 = lut_interp_linear_float(
-            clut_b,
-            std::slice::from_raw_parts(
-                (*transform).output_clut_table_b,
-                (*transform).output_clut_table_length as usize,
-            ),
-        );
+        let mut pcs_r: f32 =
+            lut_interp_linear_float(clut_r, &(*transform).output_clut_table_r.as_ref().unwrap());
+        let mut pcs_g: f32 =
+            lut_interp_linear_float(clut_g, &(*transform).output_clut_table_g.as_ref().unwrap());
+        let mut pcs_b: f32 =
+            lut_interp_linear_float(clut_b, &(*transform).output_clut_table_b.as_ref().unwrap());
         let fresh21 = dest;
         dest = dest.offset(1);
         *fresh21 = clamp_float(pcs_r);
@@ -517,8 +500,8 @@
     }
 }
 */
-unsafe extern "C" fn qcms_transform_module_gamma_table(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_gamma_table(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -556,8 +539,8 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_transform_module_gamma_lut(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_gamma_lut(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -600,8 +583,8 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_transform_module_matrix_translate(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_matrix_translate(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -650,8 +633,8 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_transform_module_matrix(
-    mut transform: *mut qcms_modular_transform,
+unsafe fn transform_module_matrix(
+    mut transform: *const qcms_modular_transform,
     mut src: *mut f32,
     mut dest: *mut f32,
     mut length: usize,
@@ -697,373 +680,212 @@
         i = i + 1
     }
 }
-unsafe extern "C" fn qcms_modular_transform_alloc() -> *mut qcms_modular_transform {
-    return calloc(1, ::std::mem::size_of::<qcms_modular_transform>())
-        as *mut qcms_modular_transform;
-}
-unsafe extern "C" fn qcms_modular_transform_release(mut transform: *mut qcms_modular_transform) {
-    let mut next_transform: *mut qcms_modular_transform;
-    while !transform.is_null() {
-        next_transform = (*transform).next_transform;
-
-        (*transform).input_clut_table_r = None;
-        (*transform).input_clut_table_g = None;
-        (*transform).input_clut_table_b = None;
-
-        if (*transform).r_clut.offset(1isize) == (*transform).g_clut
-            && (*transform).g_clut.offset(1isize) == (*transform).b_clut
-        {
-            if !(*transform).r_clut.is_null() {
-                free((*transform).r_clut as *mut libc::c_void);
-            }
-        } else {
-            if !(*transform).r_clut.is_null() {
-                free((*transform).r_clut as *mut libc::c_void);
-            }
-            if !(*transform).g_clut.is_null() {
-                free((*transform).g_clut as *mut libc::c_void);
-            }
-            if !(*transform).b_clut.is_null() {
-                free((*transform).b_clut as *mut libc::c_void);
-            }
-        }
-        if (*transform)
-            .output_clut_table_r
-            .offset((*transform).output_clut_table_length as i32 as isize)
-            == (*transform).output_clut_table_g
-            && (*transform)
-                .output_clut_table_g
-                .offset((*transform).output_clut_table_length as i32 as isize)
-                == (*transform).output_clut_table_b
-        {
-            if !(*transform).output_clut_table_r.is_null() {
-                free((*transform).output_clut_table_r as *mut libc::c_void);
-            }
-        } else {
-            if !(*transform).output_clut_table_r.is_null() {
-                free((*transform).output_clut_table_r as *mut libc::c_void);
-            }
-            if !(*transform).output_clut_table_g.is_null() {
-                free((*transform).output_clut_table_g as *mut libc::c_void);
-            }
-            if !(*transform).output_clut_table_b.is_null() {
-                free((*transform).output_clut_table_b as *mut libc::c_void);
-            }
-        }
-        if !(*transform).output_gamma_lut_r.is_none() {
-            (*transform).output_gamma_lut_r = None;
-        }
-        if !(*transform).output_gamma_lut_g.is_none() {
-            (*transform).output_gamma_lut_g = None;
-        }
-        if !(*transform).output_gamma_lut_b.is_none() {
-            (*transform).output_gamma_lut_b = None;
-        }
-        free(transform as *mut libc::c_void);
-        transform = next_transform
+fn modular_transform_alloc() -> Option<Box<qcms_modular_transform>> {
+    return Some(Box::new(Default::default()));
+}
+fn modular_transform_release(mut t: Option<Box<qcms_modular_transform>>) {
+    // destroy a list of transforms non-recursively
+    let mut next_transform;
+    while let Some(mut transform) = t {
+        next_transform = std::mem::replace(&mut (*transform).next_transform, None);
+        t = next_transform
     }
 }
 /* Set transform to be the next element in the linked list. */
-unsafe extern "C" fn append_transform(
-    mut transform: *mut qcms_modular_transform,
-    mut next_transform: *mut *mut *mut qcms_modular_transform,
-) {
-    **next_transform = transform;
-    while !transform.is_null() {
-        *next_transform = &mut (*transform).next_transform;
-        transform = (*transform).next_transform
+fn append_transform(
+    mut transform: Option<Box<qcms_modular_transform>>,
+    mut next_transform: &mut Option<Box<qcms_modular_transform>>,
+) -> &mut Option<Box<qcms_modular_transform>> {
+    *next_transform = transform;
+    while next_transform.is_some() {
+        next_transform = &mut next_transform.as_mut().unwrap().next_transform;
     }
+    next_transform
 }
 /* reverse the transformation list (used by mBA) */
-unsafe extern "C" fn reverse_transform(
-    mut transform: *mut qcms_modular_transform,
-) -> *mut qcms_modular_transform {
-    let mut prev_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    while !transform.is_null() {
-        let mut next_transform: *mut qcms_modular_transform = (*transform).next_transform;
-        (*transform).next_transform = prev_transform;
+fn reverse_transform(
+    mut transform: Option<Box<qcms_modular_transform>>,
+) -> Option<Box<qcms_modular_transform>> {
+    let mut prev_transform = None;
+    while !transform.is_none() {
+        let mut next_transform = std::mem::replace(
+            &mut transform.as_mut().unwrap().next_transform,
+            prev_transform,
+        );
         prev_transform = transform;
         transform = next_transform
     }
     return prev_transform;
 }
-unsafe extern "C" fn qcms_modular_transform_create_mAB(
-    mut lut: &lutmABType,
-) -> *mut qcms_modular_transform {
-    let mut current_block: u64;
-    let mut first_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    let mut next_transform: *mut *mut qcms_modular_transform = &mut first_transform;
-    let mut transform: *mut qcms_modular_transform;
+fn modular_transform_create_mAB(mut lut: &lutmABType) -> Option<Box<qcms_modular_transform>> {
+    let mut first_transform = None;
+    let mut next_transform = &mut first_transform;
+    let mut transform;
     if !(*lut).a_curves[0].is_none() {
         let mut clut_length: usize;
-        let mut clut: *mut f32;
         // If the A curve is present this also implies the
         // presence of a CLUT.
         if (*lut).clut_table.is_none() {
-            current_block = 7590209878260659629;
-        } else {
-            // Prepare A curve.
-            transform = qcms_modular_transform_alloc();
-            if transform.is_null() {
-                current_block = 7590209878260659629;
-            } else {
-                append_transform(transform, &mut next_transform);
-                (*transform).input_clut_table_r =
-                    build_input_gamma_table((*lut).a_curves[0].as_deref());
-                (*transform).input_clut_table_g =
-                    build_input_gamma_table((*lut).a_curves[1].as_deref());
-                (*transform).input_clut_table_b =
-                    build_input_gamma_table((*lut).a_curves[2].as_deref());
-                (*transform).transform_module_fn = Some(
-                    qcms_transform_module_gamma_table
-                        as unsafe extern "C" fn(
-                            _: *mut qcms_modular_transform,
-                            _: *mut f32,
-                            _: *mut f32,
-                            _: usize,
-                        ) -> (),
-                );
-                if (*lut).num_grid_points[0] as i32 != (*lut).num_grid_points[1] as i32
-                    || (*lut).num_grid_points[1] as i32 != (*lut).num_grid_points[2] as i32
-                {
-                    //XXX: We don't currently support clut that are not squared!
-                    current_block = 7590209878260659629;
-                } else {
-                    // Prepare CLUT
-                    transform = qcms_modular_transform_alloc();
-                    if transform.is_null() {
-                        current_block = 7590209878260659629;
-                    } else {
-                        append_transform(transform, &mut next_transform);
-                        clut_length = (::std::mem::size_of::<f32>() as f64
-                            * ((*lut).num_grid_points[0] as f64).powf(3f64)
-                            * 3f64) as usize;
-                        clut = malloc(clut_length) as *mut f32;
-                        if clut.is_null() {
-                            current_block = 7590209878260659629;
-                        } else {
-                            memcpy(
-                                clut as *mut libc::c_void,
-                                (*lut).clut_table.as_ref().unwrap().as_ptr() as *const libc::c_void,
-                                clut_length,
-                            );
-                            (*transform).r_clut = clut.offset(0isize);
-                            (*transform).g_clut = clut.offset(1isize);
-                            (*transform).b_clut = clut.offset(2isize);
-                            (*transform).grid_size = (*lut).num_grid_points[0] as u16;
-                            (*transform).transform_module_fn = Some(
-                                qcms_transform_module_clut_only
-                                    as unsafe extern "C" fn(
-                                        _: *mut qcms_modular_transform,
-                                        _: *mut f32,
-                                        _: *mut f32,
-                                        _: usize,
-                                    )
-                                        -> (),
-                            );
-                            current_block = 10652014663920648156;
-                        }
-                    }
-                }
-            }
+            return None;
+        }
+
+        // Prepare A curve.
+        transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
+        }
+        transform.as_mut().unwrap().input_clut_table_r =
+            build_input_gamma_table((*lut).a_curves[0].as_deref());
+        transform.as_mut().unwrap().input_clut_table_g =
+            build_input_gamma_table((*lut).a_curves[1].as_deref());
+        transform.as_mut().unwrap().input_clut_table_b =
+            build_input_gamma_table((*lut).a_curves[2].as_deref());
+        transform.as_mut().unwrap().transform_module_fn = Some(transform_module_gamma_table);
+        next_transform = append_transform(transform, next_transform);
+
+        if (*lut).num_grid_points[0] as i32 != (*lut).num_grid_points[1] as i32
+            || (*lut).num_grid_points[1] as i32 != (*lut).num_grid_points[2] as i32
+        {
+            //XXX: We don't currently support clut that are not squared!
+            return None;
         }
+
+        // Prepare CLUT
+        transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
+        }
+
+        clut_length = ((*lut).num_grid_points[0] as usize).pow(3) * 3;
+        assert_eq!(clut_length, lut.clut_table.as_ref().unwrap().len());
+        transform.as_mut().unwrap().clut = lut.clut_table.clone();
+        transform.as_mut().unwrap().grid_size = (*lut).num_grid_points[0] as u16;
+        transform.as_mut().unwrap().transform_module_fn = Some(transform_module_clut_only);
+        next_transform = append_transform(transform, next_transform);
+    }
+
+    if !(*lut).m_curves[0].is_none() {
+        // M curve imples the presence of a Matrix
+
+        // Prepare M curve
+        transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
+        }
+        transform.as_mut().unwrap().input_clut_table_r =
+            build_input_gamma_table((*lut).m_curves[0].as_deref());
+        transform.as_mut().unwrap().input_clut_table_g =
+            build_input_gamma_table((*lut).m_curves[1].as_deref());
+        transform.as_mut().unwrap().input_clut_table_b =
+            build_input_gamma_table((*lut).m_curves[2].as_deref());
+        transform.as_mut().unwrap().transform_module_fn = Some(transform_module_gamma_table);
+        next_transform = append_transform(transform, next_transform);
+
+        // Prepare Matrix
+        transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
+        }
+        transform.as_mut().unwrap().matrix = build_mAB_matrix(lut);
+        if transform.as_mut().unwrap().matrix.invalid {
+            return None;
+        }
+        transform.as_mut().unwrap().tx = s15Fixed16Number_to_float((*lut).e03);
+        transform.as_mut().unwrap().ty = s15Fixed16Number_to_float((*lut).e13);
+        transform.as_mut().unwrap().tz = s15Fixed16Number_to_float((*lut).e23);
+        transform.as_mut().unwrap().transform_module_fn = Some(transform_module_matrix_translate);
+        next_transform = append_transform(transform, next_transform);
+    }
+
+    if !(*lut).b_curves[0].is_none() {
+        // Prepare B curve
+        transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
+        }
+        transform.as_mut().unwrap().input_clut_table_r =
+            build_input_gamma_table((*lut).b_curves[0].as_deref());
+        transform.as_mut().unwrap().input_clut_table_g =
+            build_input_gamma_table((*lut).b_curves[1].as_deref());
+        transform.as_mut().unwrap().input_clut_table_b =
+            build_input_gamma_table((*lut).b_curves[2].as_deref());
+        transform.as_mut().unwrap().transform_module_fn = Some(transform_module_gamma_table);
+        append_transform(transform, next_transform);
     } else {
-        current_block = 10652014663920648156;
+        // B curve is mandatory
+        return None;
     }
-    match current_block {
-        10652014663920648156 => {
-            if !(*lut).m_curves[0].is_none() {
-                // M curve imples the presence of a Matrix
-                // Prepare M curve
-                transform = qcms_modular_transform_alloc();
-                if transform.is_null() {
-                    current_block = 7590209878260659629;
-                } else {
-                    append_transform(transform, &mut next_transform);
-                    (*transform).input_clut_table_r =
-                        build_input_gamma_table((*lut).m_curves[0].as_deref());
-                    (*transform).input_clut_table_g =
-                        build_input_gamma_table((*lut).m_curves[1].as_deref());
-                    (*transform).input_clut_table_b =
-                        build_input_gamma_table((*lut).m_curves[2].as_deref());
-                    (*transform).transform_module_fn = Some(
-                        qcms_transform_module_gamma_table
-                            as unsafe extern "C" fn(
-                                _: *mut qcms_modular_transform,
-                                _: *mut f32,
-                                _: *mut f32,
-                                _: usize,
-                            ) -> (),
-                    );
-                    // Prepare Matrix
-                    transform = qcms_modular_transform_alloc();
-                    if transform.is_null() {
-                        current_block = 7590209878260659629;
-                    } else {
-                        append_transform(transform, &mut next_transform);
-                        (*transform).matrix = build_mAB_matrix(lut);
-                        if (*transform).matrix.invalid {
-                            current_block = 7590209878260659629;
-                        } else {
-                            (*transform).tx = s15Fixed16Number_to_float((*lut).e03);
-                            (*transform).ty = s15Fixed16Number_to_float((*lut).e13);
-                            (*transform).tz = s15Fixed16Number_to_float((*lut).e23);
-                            (*transform).transform_module_fn = Some(
-                                qcms_transform_module_matrix_translate
-                                    as unsafe extern "C" fn(
-                                        _: *mut qcms_modular_transform,
-                                        _: *mut f32,
-                                        _: *mut f32,
-                                        _: usize,
-                                    )
-                                        -> (),
-                            );
-                            current_block = 980989089337379490;
-                        }
-                    }
-                }
-            } else {
-                current_block = 980989089337379490;
-            }
-            match current_block {
-                7590209878260659629 => {}
-                _ => {
-                    if !(*lut).b_curves[0].is_none() {
-                        // Prepare B curve
-                        transform = qcms_modular_transform_alloc();
-                        if !transform.is_null() {
-                            append_transform(transform, &mut next_transform);
-                            (*transform).input_clut_table_r =
-                                build_input_gamma_table((*lut).b_curves[0].as_deref());
-                            (*transform).input_clut_table_g =
-                                build_input_gamma_table((*lut).b_curves[1].as_deref());
-                            (*transform).input_clut_table_b =
-                                build_input_gamma_table((*lut).b_curves[2].as_deref());
-                            (*transform).transform_module_fn = Some(
-                                qcms_transform_module_gamma_table
-                                    as unsafe extern "C" fn(
-                                        _: *mut qcms_modular_transform,
-                                        _: *mut f32,
-                                        _: *mut f32,
-                                        _: usize,
-                                    )
-                                        -> (),
-                            );
-                            if (*lut).reversed {
-                                // mBA are identical to mAB except that the transformation order
-                                // is reversed
-                                first_transform = reverse_transform(first_transform)
-                            }
-                            return first_transform;
-                        }
-                    }
-                }
-            }
-        }
-        _ => {}
+
+    if (*lut).reversed {
+        // mBA are identical to mAB except that the transformation order
+        // is reversed
+        first_transform = reverse_transform(first_transform)
     }
-    // B curve is mandatory
-    qcms_modular_transform_release(first_transform);
-    return 0 as *mut qcms_modular_transform;
-}
-unsafe extern "C" fn qcms_modular_transform_create_lut(
-    mut lut: &lutType,
-) -> *mut qcms_modular_transform {
-    let mut first_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    let mut next_transform: *mut *mut qcms_modular_transform = &mut first_transform;
+    return first_transform;
+}
+
+fn modular_transform_create_lut(mut lut: &lutType) -> Option<Box<qcms_modular_transform>> {
+    let mut first_transform = None;
+    let mut next_transform = &mut first_transform;
 
     let mut in_curve_len: usize;
     let mut clut_length: usize;
     let mut out_curve_len: usize;
     let mut in_curves: *mut f32;
-    let mut clut: *mut f32;
     let mut out_curves: *mut f32;
-    let mut transform: *mut qcms_modular_transform = qcms_modular_transform_alloc();
-    if !transform.is_null() {
-        append_transform(transform, &mut next_transform);
-        (*transform).matrix = build_lut_matrix(Some(lut));
-        if !(*transform).matrix.invalid {
-            (*transform).transform_module_fn = Some(
-                qcms_transform_module_matrix
-                    as unsafe extern "C" fn(
-                        _: *mut qcms_modular_transform,
-                        _: *mut f32,
-                        _: *mut f32,
-                        _: usize,
-                    ) -> (),
-            );
+    let mut transform = modular_transform_alloc();
+    if !transform.is_none() {
+        transform.as_mut().unwrap().matrix = build_lut_matrix(Some(lut));
+        if !transform.as_mut().unwrap().matrix.invalid {
+            transform.as_mut().unwrap().transform_module_fn = Some(transform_module_matrix);
+            next_transform = append_transform(transform, next_transform);
             // Prepare input curves
-            transform = qcms_modular_transform_alloc();
-            if !transform.is_null() {
-                append_transform(transform, &mut next_transform);
-                in_curve_len =
-                    ::std::mem::size_of::<f32>() * (*lut).num_input_table_entries as usize * 3;
-                in_curves = malloc(in_curve_len) as *mut f32;
-                if !in_curves.is_null() {
-                    memcpy(
-                        in_curves as *mut libc::c_void,
-                        (*lut).input_table.as_ptr() as *mut libc::c_void,
-                        in_curve_len,
-                    );
-                    // XXX: in_curves is unused
-                    free(in_curves as *mut libc::c_void);
-                    (*transform).input_clut_table_r = Some(
+            transform = modular_transform_alloc();
+            if !transform.is_none() {
+                if true {
+                    transform.as_mut().unwrap().input_clut_table_r = Some(
                         (*lut).input_table[0..(*lut).num_input_table_entries as usize].to_vec(),
                     );
-                    (*transform).input_clut_table_g = Some(
+                    transform.as_mut().unwrap().input_clut_table_g = Some(
                         (*lut).input_table[(*lut).num_input_table_entries as usize
                             ..(*lut).num_input_table_entries as usize * 2]
                             .to_vec(),
                     );
-                    (*transform).input_clut_table_b = Some(
+                    transform.as_mut().unwrap().input_clut_table_b = Some(
                         (*lut).input_table[(*lut).num_input_table_entries as usize * 2
                             ..(*lut).num_input_table_entries as usize * 3]
                             .to_vec(),
                     );
-                    (*transform).input_clut_table_length = (*lut).num_input_table_entries;
+                    transform.as_mut().unwrap().input_clut_table_length =
+                        (*lut).num_input_table_entries;
                     // Prepare table
-                    clut_length = (::std::mem::size_of::<f32>() as f64
-                        * ((*lut).num_clut_grid_points as f64).powf(3f64)
-                        * 3f64) as usize;
-                    clut = malloc(clut_length) as *mut f32;
-                    if !clut.is_null() {
-                        memcpy(
-                            clut as *mut libc::c_void,
-                            (*lut).clut_table.as_ptr() as *const libc::c_void,
-                            clut_length,
-                        );
-                        (*transform).r_clut = clut.offset(0isize);
-                        (*transform).g_clut = clut.offset(1isize);
-                        (*transform).b_clut = clut.offset(2isize);
-                        (*transform).grid_size = (*lut).num_clut_grid_points as u16;
+                    clut_length = ((*lut).num_clut_grid_points as usize).pow(3) * 3;
+                    if true {
+                        assert_eq!(clut_length, lut.clut_table.len());
+                        transform.as_mut().unwrap().clut = Some((*lut).clut_table.clone());
+
+                        transform.as_mut().unwrap().grid_size = (*lut).num_clut_grid_points as u16;
                         // Prepare output curves
-                        out_curve_len = ::std::mem::size_of::<f32>()
-                            * (*lut).num_output_table_entries as usize
-                            * 3;
-                        out_curves = malloc(out_curve_len) as *mut f32;
-                        if !out_curves.is_null() {
-                            memcpy(
-                                out_curves as *mut libc::c_void,
-                                (*lut).output_table.as_ptr() as *const libc::c_void,
-                                out_curve_len,
+                        if true {
+                            transform.as_mut().unwrap().output_clut_table_r = Some(
+                                (*lut).output_table[0..(*lut).num_output_table_entries as usize]
+                                    .to_vec(),
+                            );
+                            transform.as_mut().unwrap().output_clut_table_g = Some(
+                                (*lut).output_table[(*lut).num_output_table_entries as usize
+                                    ..(*lut).num_output_table_entries as usize * 2]
+                                    .to_vec(),
                             );
-                            (*transform).output_clut_table_r = out_curves
-                                .offset(((*lut).num_output_table_entries as i32 * 0) as isize);
-                            (*transform).output_clut_table_g = out_curves
-                                .offset(((*lut).num_output_table_entries as i32 * 1) as isize);
-                            (*transform).output_clut_table_b = out_curves
-                                .offset(((*lut).num_output_table_entries as i32 * 2) as isize);
-                            (*transform).output_clut_table_length = (*lut).num_output_table_entries;
-                            (*transform).transform_module_fn = Some(
-                                qcms_transform_module_clut
-                                    as unsafe extern "C" fn(
-                                        _: *mut qcms_modular_transform,
-                                        _: *mut f32,
-                                        _: *mut f32,
-                                        _: usize,
-                                    )
-                                        -> (),
+                            transform.as_mut().unwrap().output_clut_table_b = Some(
+                                (*lut).output_table[(*lut).num_output_table_entries as usize * 2
+                                    ..(*lut).num_output_table_entries as usize * 3]
+                                    .to_vec(),
                             );
+                            transform.as_mut().unwrap().output_clut_table_length =
+                                (*lut).num_output_table_entries;
+                            transform.as_mut().unwrap().transform_module_fn =
+                                Some(transform_module_clut);
+                            append_transform(transform, next_transform);
                             return first_transform;
                         }
                     }
@@ -1071,223 +893,153 @@
             }
         }
     }
-    qcms_modular_transform_release(first_transform);
-    return 0 as *mut qcms_modular_transform;
+    modular_transform_release(first_transform);
+    return None;
 }
-#[no_mangle]
-pub unsafe extern "C" fn qcms_modular_transform_create_input(
-    mut in_0: &qcms_profile,
-) -> *mut qcms_modular_transform {
-    let mut current_block: u64;
-    let mut first_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    let mut next_transform: *mut *mut qcms_modular_transform = &mut first_transform;
+
+fn modular_transform_create_input(mut in_0: &qcms_profile) -> Option<Box<qcms_modular_transform>> {
+    let mut first_transform = None;
+    let mut next_transform = &mut first_transform;
     if !(*in_0).A2B0.is_none() {
-        let mut lut_transform: *mut qcms_modular_transform =
-            qcms_modular_transform_create_lut((*in_0).A2B0.as_deref().unwrap());
-        if lut_transform.is_null() {
-            current_block = 8903102000210989603;
+        let mut lut_transform = modular_transform_create_lut((*in_0).A2B0.as_deref().unwrap());
+        if lut_transform.is_none() {
+            return None;
         } else {
-            append_transform(lut_transform, &mut next_transform);
-            current_block = 10692455896603418738;
+            append_transform(lut_transform, next_transform);
         }
     } else if !(*in_0).mAB.is_none()
         && (*(*in_0).mAB.as_deref().unwrap()).num_in_channels as i32 == 3
         && (*(*in_0).mAB.as_deref().unwrap()).num_out_channels as i32 == 3
     {
-        let mut mAB_transform: *mut qcms_modular_transform =
-            qcms_modular_transform_create_mAB((*in_0).mAB.as_deref().unwrap());
-        if mAB_transform.is_null() {
-            current_block = 8903102000210989603;
+        let mut mAB_transform = modular_transform_create_mAB((*in_0).mAB.as_deref().unwrap());
+        if mAB_transform.is_none() {
+            return None;
         } else {
-            append_transform(mAB_transform, &mut next_transform);
-            current_block = 10692455896603418738;
+            append_transform(mAB_transform, next_transform);
         }
     } else {
-        let mut transform: *mut qcms_modular_transform = qcms_modular_transform_alloc();
-        if transform.is_null() {
-            current_block = 8903102000210989603;
+        let mut transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
         } else {
-            append_transform(transform, &mut next_transform);
-            (*transform).input_clut_table_r = build_input_gamma_table((*in_0).redTRC.as_deref());
-            (*transform).input_clut_table_g = build_input_gamma_table((*in_0).greenTRC.as_deref());
-            (*transform).input_clut_table_b = build_input_gamma_table((*in_0).blueTRC.as_deref());
-            (*transform).transform_module_fn = Some(
-                qcms_transform_module_gamma_table
-                    as unsafe extern "C" fn(
-                        _: *mut qcms_modular_transform,
-                        _: *mut f32,
-                        _: *mut f32,
-                        _: usize,
-                    ) -> (),
-            );
-            if (*transform).input_clut_table_r.is_none()
-                || (*transform).input_clut_table_g.is_none()
-                || (*transform).input_clut_table_b.is_none()
+            transform.as_mut().unwrap().input_clut_table_r =
+                build_input_gamma_table((*in_0).redTRC.as_deref());
+            transform.as_mut().unwrap().input_clut_table_g =
+                build_input_gamma_table((*in_0).greenTRC.as_deref());
+            transform.as_mut().unwrap().input_clut_table_b =
+                build_input_gamma_table((*in_0).blueTRC.as_deref());
+            transform.as_mut().unwrap().transform_module_fn = Some(transform_module_gamma_table);
+            if transform.as_mut().unwrap().input_clut_table_r.is_none()
+                || transform.as_mut().unwrap().input_clut_table_g.is_none()
+                || transform.as_mut().unwrap().input_clut_table_b.is_none()
             {
-                current_block = 8903102000210989603;
+                append_transform(transform, next_transform);
+                return None;
             } else {
-                transform = qcms_modular_transform_alloc();
-                if transform.is_null() {
-                    current_block = 8903102000210989603;
+                next_transform = append_transform(transform, next_transform);
+                transform = modular_transform_alloc();
+                if transform.is_none() {
+                    return None;
                 } else {
-                    append_transform(transform, &mut next_transform);
-                    (*transform).matrix.m[0][0] = 1. / 1.999969482421875;
-                    (*transform).matrix.m[0][1] = 0.0;
-                    (*transform).matrix.m[0][2] = 0.0;
-                    (*transform).matrix.m[1][0] = 0.0;
-                    (*transform).matrix.m[1][1] = 1. / 1.999969482421875;
-                    (*transform).matrix.m[1][2] = 0.0;
-                    (*transform).matrix.m[2][0] = 0.0;
-                    (*transform).matrix.m[2][1] = 0.0;
-                    (*transform).matrix.m[2][2] = 1. / 1.999969482421875;
-                    (*transform).matrix.invalid = false;
-                    (*transform).transform_module_fn = Some(
-                        qcms_transform_module_matrix
-                            as unsafe extern "C" fn(
-                                _: *mut qcms_modular_transform,
-                                _: *mut f32,
-                                _: *mut f32,
-                                _: usize,
-                            ) -> (),
-                    );
-                    transform = qcms_modular_transform_alloc();
-                    if transform.is_null() {
-                        current_block = 8903102000210989603;
+                    transform.as_mut().unwrap().matrix.m[0][0] = 1. / 1.999969482421875;
+                    transform.as_mut().unwrap().matrix.m[0][1] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[0][2] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[1][0] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[1][1] = 1. / 1.999969482421875;
+                    transform.as_mut().unwrap().matrix.m[1][2] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[2][0] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[2][1] = 0.0;
+                    transform.as_mut().unwrap().matrix.m[2][2] = 1. / 1.999969482421875;
+                    transform.as_mut().unwrap().matrix.invalid = false;
+                    transform.as_mut().unwrap().transform_module_fn = Some(transform_module_matrix);
+                    next_transform = append_transform(transform, next_transform);
+                    transform = modular_transform_alloc();
+                    if transform.is_none() {
+                        return None;
                     } else {
-                        append_transform(transform, &mut next_transform);
-                        (*transform).matrix = build_colorant_matrix(in_0);
-                        (*transform).transform_module_fn = Some(
-                            qcms_transform_module_matrix
-                                as unsafe extern "C" fn(
-                                    _: *mut qcms_modular_transform,
-                                    _: *mut f32,
-                                    _: *mut f32,
-                                    _: usize,
-                                ) -> (),
-                        );
-                        current_block = 10692455896603418738;
+                        transform.as_mut().unwrap().matrix = build_colorant_matrix(in_0);
+                        transform.as_mut().unwrap().transform_module_fn =
+                            Some(transform_module_matrix);
+                        append_transform(transform, next_transform);
                     }
                 }
             }
         }
     }
-    match current_block {
-        10692455896603418738 => return first_transform,
-        _ => {
-            qcms_modular_transform_release(first_transform);
-            return 0 as *mut qcms_modular_transform;
-        }
-    };
+    first_transform
 }
-unsafe extern "C" fn qcms_modular_transform_create_output(
-    mut out: &qcms_profile,
-) -> *mut qcms_modular_transform {
-    let mut current_block: u64;
-    let mut first_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    let mut next_transform: *mut *mut qcms_modular_transform = &mut first_transform;
+fn modular_transform_create_output(mut out: &qcms_profile) -> Option<Box<qcms_modular_transform>> {
+    let mut first_transform = None;
+    let mut next_transform = &mut first_transform;
     if !(*out).B2A0.is_none() {
-        let mut lut_transform: *mut qcms_modular_transform =
-            qcms_modular_transform_create_lut((*out).B2A0.as_deref().unwrap());
-        if lut_transform.is_null() {
-            current_block = 15713701561912628542;
+        let mut lut_transform = modular_transform_create_lut((*out).B2A0.as_deref().unwrap());
+        if lut_transform.is_none() {
+            return None;
         } else {
-            append_transform(lut_transform, &mut next_transform);
-            current_block = 13131896068329595644;
+            append_transform(lut_transform, next_transform);
         }
     } else if !(*out).mBA.is_none()
         && (*(*out).mBA.as_deref().unwrap()).num_in_channels as i32 == 3
         && (*(*out).mBA.as_deref().unwrap()).num_out_channels as i32 == 3
     {
-        let mut lut_transform_0: *mut qcms_modular_transform =
-            qcms_modular_transform_create_mAB((*out).mBA.as_deref().unwrap());
-        if lut_transform_0.is_null() {
-            current_block = 15713701561912628542;
+        let mut lut_transform_0 = modular_transform_create_mAB((*out).mBA.as_deref().unwrap());
+        if lut_transform_0.is_none() {
+            return None;
         } else {
-            append_transform(lut_transform_0, &mut next_transform);
-            current_block = 13131896068329595644;
+            append_transform(lut_transform_0, next_transform);
         }
     } else if !(*out).redTRC.is_none() && !(*out).greenTRC.is_none() && !(*out).blueTRC.is_none() {
-        let mut transform: *mut qcms_modular_transform = qcms_modular_transform_alloc();
-        if transform.is_null() {
-            current_block = 15713701561912628542;
+        let mut transform = modular_transform_alloc();
+        if transform.is_none() {
+            return None;
         } else {
-            append_transform(transform, &mut next_transform);
-            (*transform).matrix = matrix_invert(build_colorant_matrix(out));
-            (*transform).transform_module_fn = Some(
-                qcms_transform_module_matrix
-                    as unsafe extern "C" fn(
-                        _: *mut qcms_modular_transform,
-                        _: *mut f32,
-                        _: *mut f32,
-                        _: usize,
-                    ) -> (),
-            );
-            transform = qcms_modular_transform_alloc();
-            if transform.is_null() {
-                current_block = 15713701561912628542;
+            transform.as_mut().unwrap().matrix = matrix_invert(build_colorant_matrix(out));
+            transform.as_mut().unwrap().transform_module_fn = Some(transform_module_matrix);
+            next_transform = append_transform(transform, next_transform);
+            transform = modular_transform_alloc();
+            if transform.is_none() {
+                return None;
             } else {
-                append_transform(transform, &mut next_transform);
-                (*transform).matrix.m[0][0] = 1.999969482421875;
-                (*transform).matrix.m[0][1] = 0.0;
-                (*transform).matrix.m[0][2] = 0.0;
-                (*transform).matrix.m[1][0] = 0.0;
-                (*transform).matrix.m[1][1] = 1.999969482421875;
-                (*transform).matrix.m[1][2] = 0.0;
-                (*transform).matrix.m[2][0] = 0.0;
-                (*transform).matrix.m[2][1] = 0.0;
-                (*transform).matrix.m[2][2] = 1.999969482421875;
-                (*transform).matrix.invalid = false;
-                (*transform).transform_module_fn = Some(
-                    qcms_transform_module_matrix
-                        as unsafe extern "C" fn(
-                            _: *mut qcms_modular_transform,
-                            _: *mut f32,
-                            _: *mut f32,
-                            _: usize,
-                        ) -> (),
-                );
-                transform = qcms_modular_transform_alloc();
-                if transform.is_null() {
-                    current_block = 15713701561912628542;
+                transform.as_mut().unwrap().matrix.m[0][0] = 1.999969482421875;
+                transform.as_mut().unwrap().matrix.m[0][1] = 0.0;
+                transform.as_mut().unwrap().matrix.m[0][2] = 0.0;
+                transform.as_mut().unwrap().matrix.m[1][0] = 0.0;
+                transform.as_mut().unwrap().matrix.m[1][1] = 1.999969482421875;
+                transform.as_mut().unwrap().matrix.m[1][2] = 0.0;
+                transform.as_mut().unwrap().matrix.m[2][0] = 0.0;
+                transform.as_mut().unwrap().matrix.m[2][1] = 0.0;
+                transform.as_mut().unwrap().matrix.m[2][2] = 1.999969482421875;
+                transform.as_mut().unwrap().matrix.invalid = false;
+                transform.as_mut().unwrap().transform_module_fn = Some(transform_module_matrix);
+                next_transform = append_transform(transform, next_transform);
+                transform = modular_transform_alloc();
+                if transform.is_none() {
+                    return None;
                 } else {
-                    append_transform(transform, &mut next_transform);
-                    (*transform).output_gamma_lut_r =
+                    transform.as_mut().unwrap().output_gamma_lut_r =
                         Some(build_output_lut((*out).redTRC.as_deref().unwrap()));
-                    (*transform).output_gamma_lut_g =
+                    transform.as_mut().unwrap().output_gamma_lut_g =
                         Some(build_output_lut((*out).greenTRC.as_deref().unwrap()));
-                    (*transform).output_gamma_lut_b =
+                    transform.as_mut().unwrap().output_gamma_lut_b =
                         Some(build_output_lut((*out).blueTRC.as_deref().unwrap()));
-                    (*transform).transform_module_fn = Some(
-                        qcms_transform_module_gamma_lut
-                            as unsafe extern "C" fn(
-                                _: *mut qcms_modular_transform,
-                                _: *mut f32,
-                                _: *mut f32,
-                                _: usize,
-                            ) -> (),
-                    );
-                    if (*transform).output_gamma_lut_r.is_none()
-                        || (*transform).output_gamma_lut_g.is_none()
-                        || (*transform).output_gamma_lut_b.is_none()
+                    transform.as_mut().unwrap().transform_module_fn =
+                        Some(transform_module_gamma_lut);
+                    if transform.as_mut().unwrap().output_gamma_lut_r.is_none()
+                        || transform.as_mut().unwrap().output_gamma_lut_g.is_none()
+                        || transform.as_mut().unwrap().output_gamma_lut_b.is_none()
                     {
-                        current_block = 15713701561912628542;
+                        return None;
                     } else {
-                        current_block = 13131896068329595644;
+                        append_transform(transform, next_transform);
                     }
                 }
             }
         }
     } else {
         debug_assert!(false, "Unsupported output profile workflow.");
-        return 0 as *mut qcms_modular_transform;
+        return None;
     }
-    match current_block {
-        13131896068329595644 => return first_transform,
-        _ => {
-            qcms_modular_transform_release(first_transform);
-            return 0 as *mut qcms_modular_transform;
-        }
-    };
+    first_transform
 }
 /* Not Completed
 // Simplify the transformation chain to an equivalent transformation chain
@@ -1340,135 +1092,122 @@
     return transform;
 }
 */
-unsafe extern "C" fn qcms_modular_transform_create(
+fn modular_transform_create(
     mut in_0: &qcms_profile,
     mut out: &qcms_profile,
-) -> *mut qcms_modular_transform {
-    let mut current_block: u64;
-    let mut first_transform: *mut qcms_modular_transform = 0 as *mut qcms_modular_transform;
-    let mut next_transform: *mut *mut qcms_modular_transform = &mut first_transform;
+) -> Option<Box<qcms_modular_transform>> {
+    let mut first_transform = None;
+    let mut next_transform = &mut first_transform;
     if (*in_0).color_space == RGB_SIGNATURE {
-        let mut rgb_to_pcs: *mut qcms_modular_transform = qcms_modular_transform_create_input(in_0);
-        if !rgb_to_pcs.is_null() {
-            append_transform(rgb_to_pcs, &mut next_transform);
-            if (*in_0).pcs == LAB_SIGNATURE && (*out).pcs == XYZ_SIGNATURE {
-                let mut lab_to_pcs: *mut qcms_modular_transform = qcms_modular_transform_alloc();
-                if lab_to_pcs.is_null() {
-                    current_block = 8418824557173580938;
-                } else {
-                    append_transform(lab_to_pcs, &mut next_transform);
-                    (*lab_to_pcs).transform_module_fn = Some(qcms_transform_module_LAB_to_XYZ);
-                    current_block = 10599921512955367680;
-                }
-            } else {
-                current_block = 10599921512955367680;
-            }
-            match current_block {
-                8418824557173580938 => {}
-                _ =>
-                // This does not improve accuracy in practice, something is wrong here.
-                //if (in->chromaticAdaption.invalid == false) {
-                //	struct qcms_modular_transform* chromaticAdaption;
-                //	chromaticAdaption = qcms_modular_transform_alloc();
-                //	if (!chromaticAdaption)
-                //		goto fail;
-                //	append_transform(chromaticAdaption, &next_transform);
-                //	chromaticAdaption->matrix = matrix_invert(in->chromaticAdaption);
-                //	chromaticAdaption->transform_module_fn = qcms_transform_module_matrix;
-                //}
-                {
-                    if (*in_0).pcs == XYZ_SIGNATURE && (*out).pcs == LAB_SIGNATURE {
-                        let mut pcs_to_lab: *mut qcms_modular_transform =
-                            qcms_modular_transform_alloc();
-                        if pcs_to_lab.is_null() {
-                            current_block = 8418824557173580938;
-                        } else {
-                            append_transform(pcs_to_lab, &mut next_transform);
-                            (*pcs_to_lab).transform_module_fn =
-                                Some(qcms_transform_module_XYZ_to_LAB);
-                            current_block = 7175849428784450219;
-                        }
-                    } else {
-                        current_block = 7175849428784450219;
-                    }
-                    match current_block {
-                        8418824557173580938 => {}
-                        _ => {
-                            if (*out).color_space == RGB_SIGNATURE {
-                                let mut pcs_to_rgb: *mut qcms_modular_transform =
-                                    qcms_modular_transform_create_output(out);
-                                if !pcs_to_rgb.is_null() {
-                                    append_transform(pcs_to_rgb, &mut next_transform);
-                                    // Not Completed
-                                    //return qcms_modular_transform_reduce(first_transform);
-                                    return first_transform;
-                                }
-                            } else {
-                                debug_assert!(false, "output color space not supported");
-                            }
-                        }
-                    }
-                }
-            }
+        let mut rgb_to_pcs = modular_transform_create_input(in_0);
+        if rgb_to_pcs.is_none() {
+            return None;
         }
+        next_transform = append_transform(rgb_to_pcs, next_transform);
     } else {
         debug_assert!(false, "input color space not supported");
+        return None;
     }
-    qcms_modular_transform_release(first_transform);
-    return 0 as *mut qcms_modular_transform;
+
+    if (*in_0).pcs == LAB_SIGNATURE && (*out).pcs == XYZ_SIGNATURE {
+        let mut lab_to_pcs = modular_transform_alloc();
+        if lab_to_pcs.is_none() {
+            return None;
+        }
+        lab_to_pcs.as_mut().unwrap().transform_module_fn = Some(transform_module_LAB_to_XYZ);
+        next_transform = append_transform(lab_to_pcs, next_transform);
+    }
+
+    // This does not improve accuracy in practice, something is wrong here.
+    //if (in->chromaticAdaption.invalid == false) {
+    //	struct qcms_modular_transform* chromaticAdaption;
+    //	chromaticAdaption = qcms_modular_transform_alloc();
+    //	if (!chromaticAdaption)
+    //		goto fail;
+    //	append_transform(chromaticAdaption, &next_transform);
+    //	chromaticAdaption->matrix = matrix_invert(in->chromaticAdaption);
+    //	chromaticAdaption->transform_module_fn = qcms_transform_module_matrix;
+    //}
+
+    if (*in_0).pcs == XYZ_SIGNATURE && (*out).pcs == LAB_SIGNATURE {
+        let mut pcs_to_lab = modular_transform_alloc();
+        if pcs_to_lab.is_none() {
+            return None;
+        }
+        pcs_to_lab.as_mut().unwrap().transform_module_fn = Some(transform_module_XYZ_to_LAB);
+        next_transform = append_transform(pcs_to_lab, next_transform);
+    }
+
+    if (*out).color_space == RGB_SIGNATURE {
+        let mut pcs_to_rgb = modular_transform_create_output(out);
+        if pcs_to_rgb.is_none() {
+            return None;
+        }
+        append_transform(pcs_to_rgb, next_transform);
+    } else {
+        debug_assert!(false, "output color space not supported");
+    }
+
+    // Not Completed
+    //return qcms_modular_transform_reduce(first_transform);
+    return first_transform;
 }
-unsafe extern "C" fn qcms_modular_transform_data(
-    mut transform: *mut qcms_modular_transform,
-    mut src: *mut f32,
-    mut dest: *mut f32,
+unsafe fn modular_transform_data(
+    mut transform: Option<&qcms_modular_transform>,
+    mut src: Vec<f32>,
+    mut dest: Vec<f32>,
     mut len: usize,
-) -> *mut f32 {
-    while !transform.is_null() {
+) -> Option<Vec<f32>> {
+    while !transform.is_none() {
         // Keep swaping src/dest when performing a transform to use less memory.
-        let mut new_src: *mut f32 = dest;
-        let transform_fn: transform_module_fn_t = (*transform).transform_module_fn;
-        if transform_fn != Some(qcms_transform_module_gamma_table)
-            && transform_fn != Some(qcms_transform_module_gamma_lut)
-            && transform_fn != Some(qcms_transform_module_clut)
-            && transform_fn != Some(qcms_transform_module_clut_only)
-            && transform_fn != Some(qcms_transform_module_matrix)
-            && transform_fn != Some(qcms_transform_module_matrix_translate)
-            && transform_fn != Some(qcms_transform_module_LAB_to_XYZ)
-            && transform_fn != Some(qcms_transform_module_XYZ_to_LAB)
+        let transform_fn: transform_module_fn_t = transform.unwrap().transform_module_fn;
+        if transform_fn != Some(transform_module_gamma_table)
+            && transform_fn != Some(transform_module_gamma_lut)
+            && transform_fn != Some(transform_module_clut)
+            && transform_fn != Some(transform_module_clut_only)
+            && transform_fn != Some(transform_module_matrix)
+            && transform_fn != Some(transform_module_matrix_translate)
+            && transform_fn != Some(transform_module_LAB_to_XYZ)
+            && transform_fn != Some(transform_module_XYZ_to_LAB)
         {
             debug_assert!(false, "Unsupported transform module");
-            return 0 as *mut f32;
+            return None;
         }
-        if (*transform).grid_size as i32 <= 0
-            && (transform_fn == Some(qcms_transform_module_clut)
-                || transform_fn == Some(qcms_transform_module_clut_only))
+        if transform.unwrap().grid_size as i32 <= 0
+            && (transform_fn == Some(transform_module_clut)
+                || transform_fn == Some(transform_module_clut_only))
         {
             debug_assert!(false, "Invalid transform");
-            return 0 as *mut f32;
+            return None;
         }
-        (*transform)
+        transform
+            .unwrap()
             .transform_module_fn
-            .expect("non-null function pointer")(transform, src, dest, len);
-        dest = src;
-        src = new_src;
-        transform = (*transform).next_transform
+            .expect("non-null function pointer")(
+            transform.unwrap() as *const _ as *mut _,
+            src.as_mut_ptr(),
+            dest.as_mut_ptr(),
+            len,
+        );
+        std::mem::swap(&mut src, &mut dest);
+        transform = transform.unwrap().next_transform.as_deref();
     }
     // The results end up in the src buffer because of the switching
-    return src;
+    return Some(src);
 }
-#[no_mangle]
-pub unsafe extern "C" fn qcms_chain_transform(
+
+pub unsafe fn chain_transform(
     mut in_0: &qcms_profile,
     mut out: &qcms_profile,
-    mut src: *mut f32,
-    mut dest: *mut f32,
+    mut src: Vec<f32>,
+    mut dest: Vec<f32>,
     mut lutSize: usize,
-) -> *mut f32 {
-    let mut transform_list: *mut qcms_modular_transform = qcms_modular_transform_create(in_0, out);
-    if !transform_list.is_null() {
-        let mut lut: *mut f32 = qcms_modular_transform_data(transform_list, src, dest, lutSize / 3);
-        qcms_modular_transform_release(transform_list);
+) -> Option<Vec<f32>> {
+    let mut transform_list = modular_transform_create(in_0, out);
+    if !transform_list.is_none() {
+        let mut lut = modular_transform_data(transform_list.as_deref(), src, dest, lutSize / 3);
+        modular_transform_release(transform_list);
         return lut;
     }
-    return 0 as *mut f32;
+    return None;
 }
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/gtest.rs firefox-85.0+build1/gfx/qcms/src/gtest.rs
--- firefox-84.0.2+build1/gfx/qcms/src/gtest.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/gtest.rs	2021-01-18 19:58:11.000000000 +0000
@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod test {
     use crate::{
-        iccread::*, transform::*, transform_util::lut_inverse_interp16, QCMS_INTENT_DEFAULT,
-        QCMS_INTENT_PERCEPTUAL,
+        c_bindings::*, iccread::*, transform::*, transform_util::lut_inverse_interp16,
+        QCMS_INTENT_DEFAULT, QCMS_INTENT_PERCEPTUAL,
     };
     use libc::c_void;
     use std::ptr::null_mut;
@@ -160,7 +160,7 @@
                 qcms_enable_avx()
             }
         };
-        let sRGB_profile = unsafe { crate::iccread::qcms_profile_sRGB() };
+        let sRGB_profile = crate::c_bindings::qcms_profile_sRGB();
 
         let mut Rec709Primaries = qcms_CIE_xyYTRIPLE {
             red: qcms_CIE_xyY {
@@ -179,7 +179,7 @@
                 Y: 1.0f64,
             },
         };
-        let D65 = unsafe { qcms_white_point_sRGB() };
+        let D65 = qcms_white_point_sRGB();
         let other = unsafe { qcms_profile_create_rgb_with_gamma(D65, Rec709Primaries, 2.2) };
         unsafe { qcms_profile_precache_output_transform(&mut *other) };
 
@@ -212,7 +212,7 @@
 
     #[test]
     fn gray_alpha() {
-        let sRGB_profile = unsafe { crate::iccread::qcms_profile_sRGB() };
+        let sRGB_profile = qcms_profile_sRGB();
         let other = unsafe { qcms_profile_create_gray_with_gamma(2.2) };
         unsafe { qcms_profile_precache_output_transform(&mut *other) };
 
@@ -299,7 +299,7 @@
             unsafe { qcms_profile_from_memory(data.as_ptr() as *const c_void, data.len()) };
         assert_ne!(profile, std::ptr::null_mut());
 
-        let srgb_profile = unsafe { qcms_profile_sRGB() };
+        let srgb_profile = qcms_profile_sRGB();
         assert_ne!(srgb_profile, std::ptr::null_mut());
 
         unsafe { qcms_profile_precache_output_transform(&mut *srgb_profile) };
@@ -857,4 +857,41 @@
             pt.TearDown();
         }
     }
+
+    #[test]
+    fn v4_output() {
+        unsafe {
+            qcms_enable_iccv4();
+        }
+        let input = qcms_profile_sRGB();
+        // B2A0-ident.icc was created from the profile in bug 1679621
+        // manually edited using iccToXML/iccFromXML
+        let output = profile_from_path("B2A0-ident.icc");
+
+        let transform = unsafe {
+            qcms_transform_create(
+                &*input,
+                QCMS_DATA_RGB_8,
+                &*output,
+                QCMS_DATA_RGB_8,
+                QCMS_INTENT_PERCEPTUAL,
+            )
+        };
+        let src = [0u8, 60, 195];
+        let mut dst = [0u8, 0, 0];
+        unsafe {
+            qcms_transform_data(
+                transform,
+                src.as_ptr() as *const libc::c_void,
+                dst.as_mut_ptr() as *mut libc::c_void,
+                1,
+            );
+        }
+        assert_eq!(dst, [15, 16, 122]);
+        unsafe {
+            qcms_transform_release(transform);
+            qcms_profile_release(input);
+            qcms_profile_release(output);
+        }
+    }
 }
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/iccread.rs firefox-85.0+build1/gfx/qcms/src/iccread.rs
--- firefox-84.0.2+build1/gfx/qcms/src/iccread.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/iccread.rs	2021-01-18 19:58:11.000000000 +0000
@@ -22,14 +22,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 use std::{
-    ptr::null_mut,
-    slice,
     sync::atomic::{AtomicBool, Ordering},
     sync::Arc,
 };
 
 use ::libc;
-use libc::{fclose, fopen, fread, free, malloc, memset, FILE};
+use libc::{free, malloc, memset};
 
 use crate::{
     double_to_s15Fixed16Number,
@@ -76,34 +74,34 @@
 pub const LAB_SIGNATURE: u32 = 0x4C616220;
 
 #[repr(C)]
-#[derive(Clone, Default)]
+#[derive(Default)]
 pub struct qcms_profile {
-    pub class_type: u32,
-    pub color_space: u32,
-    pub pcs: u32,
-    pub rendering_intent: qcms_intent,
-    pub redColorant: XYZNumber,
-    pub blueColorant: XYZNumber,
-    pub greenColorant: XYZNumber,
-    pub redTRC: Option<Box<curveType>>,
-    pub blueTRC: Option<Box<curveType>>,
-    pub greenTRC: Option<Box<curveType>>,
-    pub grayTRC: Option<Box<curveType>>,
-    pub A2B0: Option<Box<lutType>>,
-    pub B2A0: Option<Box<lutType>>,
-    pub mAB: Option<Box<lutmABType>>,
-    pub mBA: Option<Box<lutmABType>>,
-    pub chromaticAdaption: matrix,
-    pub output_table_r: Option<Arc<precache_output>>,
-    pub output_table_g: Option<Arc<precache_output>>,
-    pub output_table_b: Option<Arc<precache_output>>,
+    pub(crate) class_type: u32,
+    pub(crate) color_space: u32,
+    pub(crate) pcs: u32,
+    pub(crate) rendering_intent: qcms_intent,
+    pub(crate) redColorant: XYZNumber,
+    pub(crate) blueColorant: XYZNumber,
+    pub(crate) greenColorant: XYZNumber,
+    pub(crate) redTRC: Option<Box<curveType>>,
+    pub(crate) blueTRC: Option<Box<curveType>>,
+    pub(crate) greenTRC: Option<Box<curveType>>,
+    pub(crate) grayTRC: Option<Box<curveType>>,
+    pub(crate) A2B0: Option<Box<lutType>>,
+    pub(crate) B2A0: Option<Box<lutType>>,
+    pub(crate) mAB: Option<Box<lutmABType>>,
+    pub(crate) mBA: Option<Box<lutmABType>>,
+    pub(crate) chromaticAdaption: matrix,
+    pub(crate) output_table_r: Option<Arc<precache_output>>,
+    pub(crate) output_table_g: Option<Arc<precache_output>>,
+    pub(crate) output_table_b: Option<Arc<precache_output>>,
 }
 
-#[repr(C)]
-#[derive(Clone, Default)]
-pub struct lutmABType {
+#[derive(Default)]
+pub(crate) struct lutmABType {
     pub num_in_channels: u8,
     pub num_out_channels: u8,
+    // 16 is the upperbound, actual is 0..num_in_channels.
     pub num_grid_points: [u8; 16],
     pub e00: s15Fixed16Number,
     pub e01: s15Fixed16Number,
@@ -117,6 +115,7 @@
     pub e21: s15Fixed16Number,
     pub e22: s15Fixed16Number,
     pub e23: s15Fixed16Number,
+    // reversed elements (for mBA)
     pub reversed: bool,
     pub clut_table: Option<Vec<f32>>,
     pub a_curves: [Option<Box<curveType>>; 10],
@@ -124,17 +123,15 @@
     pub m_curves: [Option<Box<curveType>>; 10],
 }
 
-#[repr(C)]
-#[derive(Clone)]
-pub enum curveType {
+pub(crate) enum curveType {
     Curve(Vec<uInt16Number>),
     Parametric(Vec<f32>),
 }
-pub type uInt16Number = u16;
+type uInt16Number = u16;
 
-#[repr(C)]
-#[derive(Clone)]
-pub struct lutType {
+/* should lut8Type and lut16Type be different types? */
+pub(crate) struct lutType {
+    // used by lut8Type/lut16Type (mft2) only
     pub num_input_channels: u8,
     pub num_output_channels: u8,
     pub num_clut_grid_points: u8,
@@ -179,9 +176,7 @@
     pub blue: qcms_CIE_xyY,
 }
 
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct tag {
+struct tag {
     pub signature: u32,
     pub offset: u32,
     pub size: u32,
@@ -197,10 +192,7 @@
 
 /* a wrapper around the memory that we are going to parse
  * into a qcms_profile */
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct mem_source<'a> {
+struct mem_source<'a> {
     pub buf: &'a [u8],
     pub valid: bool,
     pub invalid_reason: Option<&'static str>,
@@ -282,7 +274,7 @@
 }
 
 /* An arbitrary 4MB limit on profile size */
-const MAX_PROFILE_SIZE: usize = 1024 * 1024 * 4;
+pub(crate) const MAX_PROFILE_SIZE: usize = 1024 * 1024 * 4;
 const MAX_TAG_COUNT: u32 = 1024;
 
 fn check_CMM_type_signature(mut src: &mut mem_source) {
@@ -872,7 +864,13 @@
     } else if type_0 == LUT16_TYPE {
         num_input_table_entries = read_u16(src, (offset + 48) as usize);
         num_output_table_entries = read_u16(src, (offset + 50) as usize);
-        if num_input_table_entries as i32 == 0 || num_output_table_entries as i32 == 0 {
+
+        // these limits come from the spec
+        if num_input_table_entries < 2
+            || num_input_table_entries > 4096
+            || num_output_table_entries < 2
+            || num_output_table_entries > 4096
+        {
             invalid_source(src, "Bad channel count");
             return None;
         }
@@ -1070,73 +1068,7 @@
 // everything in a profile was initialized regardless of how it was created
 //XXX: should this also be taking a black_point?
 /* similar to CGColorSpaceCreateCalibratedRGB */
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma_set(
-    mut white_point: qcms_CIE_xyY,
-    mut primaries: qcms_CIE_xyYTRIPLE,
-    mut redGamma: f32,
-    mut greenGamma: f32,
-    mut blueGamma: f32,
-) -> *mut qcms_profile {
-    let mut profile = qcms_profile_create();
-
-    //XXX: should store the whitepoint
-    if !set_rgb_colorants(&mut profile, white_point, primaries) {
-        return 0 as *mut qcms_profile;
-    }
-    (*profile).redTRC = Some(curve_from_gamma(redGamma));
-    (*profile).blueTRC = Some(curve_from_gamma(blueGamma));
-    (*profile).greenTRC = Some(curve_from_gamma(greenGamma));
-    if (*profile).redTRC.is_none() || (*profile).blueTRC.is_none() || (*profile).greenTRC.is_none()
-    {
-        return 0 as *mut qcms_profile;
-    }
-    (*profile).class_type = DISPLAY_DEVICE_PROFILE;
-    (*profile).rendering_intent = QCMS_INTENT_PERCEPTUAL;
-    (*profile).color_space = RGB_SIGNATURE;
-    (*profile).pcs = XYZ_TYPE;
-    return Box::into_raw(profile);
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_create_gray_with_gamma(mut gamma: f32) -> *mut qcms_profile {
-    let mut profile = qcms_profile_create();
-
-    (*profile).grayTRC = Some(curve_from_gamma(gamma));
-    if (*profile).grayTRC.is_none() {
-        return 0 as *mut qcms_profile;
-    }
-    (*profile).class_type = DISPLAY_DEVICE_PROFILE;
-    (*profile).rendering_intent = QCMS_INTENT_PERCEPTUAL;
-    (*profile).color_space = GRAY_SIGNATURE;
-    (*profile).pcs = XYZ_TYPE;
-    return Box::into_raw(profile);
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_create_rgb_with_gamma(
-    mut white_point: qcms_CIE_xyY,
-    mut primaries: qcms_CIE_xyYTRIPLE,
-    mut gamma: f32,
-) -> *mut qcms_profile {
-    return qcms_profile_create_rgb_with_gamma_set(white_point, primaries, gamma, gamma, gamma);
-}
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_create_rgb_with_table(
-    mut white_point: qcms_CIE_xyY,
-    mut primaries: qcms_CIE_xyYTRIPLE,
-    mut table: *const u16,
-    mut num_entries: i32,
-) -> *mut qcms_profile {
-    let table = slice::from_raw_parts(table, num_entries as usize);
-    let profile = profile_create_rgb_with_table(white_point, primaries, table);
-    match profile {
-        Some(profile) => Box::into_raw(profile),
-        None => null_mut(),
-    }
-}
-
-fn profile_create_rgb_with_table(
+pub fn profile_create_rgb_with_table(
     mut white_point: qcms_CIE_xyY,
     mut primaries: qcms_CIE_xyYTRIPLE,
     table: &[u16],
@@ -1208,60 +1140,72 @@
     return white_point;
 }
 #[no_mangle]
-pub unsafe extern "C" fn qcms_white_point_sRGB() -> qcms_CIE_xyY {
+pub extern "C" fn qcms_white_point_sRGB() -> qcms_CIE_xyY {
     return white_point_from_temp(6504);
 }
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_sRGB() -> *mut qcms_profile {
-    let mut profile: *mut qcms_profile;
-    let mut table: Vec<u16>;
-    let mut Rec709Primaries: qcms_CIE_xyYTRIPLE = {
-        let mut init = qcms_CIE_xyYTRIPLE {
-            red: {
-                let mut init = qcms_CIE_xyY {
-                    x: 0.6400f64,
-                    y: 0.3300f64,
-                    Y: 1.0f64,
-                };
-                init
-            },
-            green: {
-                let mut init = qcms_CIE_xyY {
-                    x: 0.3000f64,
-                    y: 0.6000f64,
-                    Y: 1.0f64,
-                };
-                init
-            },
-            blue: {
-                let mut init = qcms_CIE_xyY {
-                    x: 0.1500f64,
-                    y: 0.0600f64,
-                    Y: 1.0f64,
-                };
-                init
-            },
-        };
-        init
+
+pub fn profile_sRGB() -> Option<Box<qcms_profile>> {
+    let Rec709Primaries = qcms_CIE_xyYTRIPLE {
+        red: {
+            qcms_CIE_xyY {
+                x: 0.6400f64,
+                y: 0.3300f64,
+                Y: 1.0f64,
+            }
+        },
+        green: {
+            qcms_CIE_xyY {
+                x: 0.3000f64,
+                y: 0.6000f64,
+                Y: 1.0f64,
+            }
+        },
+        blue: {
+            qcms_CIE_xyY {
+                x: 0.1500f64,
+                y: 0.0600f64,
+                Y: 1.0f64,
+            }
+        },
     };
     let D65 = qcms_white_point_sRGB();
-    table = build_sRGB_gamma_table(1024);
+    let table = build_sRGB_gamma_table(1024);
 
-    profile = qcms_profile_create_rgb_with_table(D65, Rec709Primaries, table.as_ptr(), 1024);
-    return profile;
+    profile_create_rgb_with_table(D65, Rec709Primaries, &table)
 }
-/* qcms_profile_from_memory does not hold a reference to the memory passed in */
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_from_memory(
-    mut mem: *const libc::c_void,
-    mut size: usize,
-) -> *mut qcms_profile {
-    let mem = slice::from_raw_parts(mem as *const libc::c_uchar, size);
-    let profile = profile_from_slice(mem);
-    match profile {
-        Some(profile) => Box::into_raw(profile),
-        None => null_mut(),
+
+pub fn profile_create_gray_with_gamma(gamma: f32) -> Option<Box<qcms_profile>> {
+    let mut profile = qcms_profile_create();
+
+    profile.grayTRC = Some(curve_from_gamma(gamma));
+    profile.class_type = DISPLAY_DEVICE_PROFILE;
+    profile.rendering_intent = QCMS_INTENT_PERCEPTUAL;
+    profile.color_space = GRAY_SIGNATURE;
+    profile.pcs = XYZ_TYPE;
+    Some(profile)
+}
+
+pub fn profile_create_rgb_with_gamma_set(
+    mut white_point: qcms_CIE_xyY,
+    mut primaries: qcms_CIE_xyYTRIPLE,
+    mut redGamma: f32,
+    mut greenGamma: f32,
+    mut blueGamma: f32,
+) -> Option<Box<qcms_profile>> {
+    let mut profile = qcms_profile_create();
+
+    //XXX: should store the whitepoint
+    if !set_rgb_colorants(&mut profile, white_point, primaries) {
+        return None;
     }
+    profile.redTRC = Some(curve_from_gamma(redGamma));
+    profile.blueTRC = Some(curve_from_gamma(blueGamma));
+    profile.greenTRC = Some(curve_from_gamma(greenGamma));
+    profile.class_type = DISPLAY_DEVICE_PROFILE;
+    profile.rendering_intent = QCMS_INTENT_PERCEPTUAL;
+    profile.color_space = RGB_SIGNATURE;
+    profile.pcs = XYZ_TYPE;
+    Some(profile)
 }
 
 pub fn profile_from_slice(mem: &[u8]) -> Option<Box<qcms_profile>> {
@@ -1374,145 +1318,6 @@
     }
     Some(profile)
 }
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_get_rendering_intent(
-    mut profile: *mut qcms_profile,
-) -> qcms_intent {
-    return (*profile).rendering_intent;
-}
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_get_color_space(
-    mut profile: *mut qcms_profile,
-) -> icColorSpaceSignature {
-    return (*profile).color_space;
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_release(mut profile: *mut qcms_profile) {
-    drop(Box::from_raw(profile));
-}
-unsafe extern "C" fn qcms_data_from_file(
-    mut file: *mut FILE,
-    mut mem: *mut *mut libc::c_void,
-    mut size: *mut usize,
-) {
-    let mut length: u32;
-    let mut remaining_length: u32;
-    let mut read_length: usize;
-    let mut length_be: be32 = 0;
-    let mut data: *mut libc::c_void;
-    *mem = 0 as *mut libc::c_void;
-    *size = 0;
-    if fread(
-        &mut length_be as *mut be32 as *mut libc::c_void,
-        1,
-        ::std::mem::size_of::<be32>(),
-        file,
-    ) != ::std::mem::size_of::<be32>()
-    {
-        return;
-    }
-    length = be32_to_cpu(length_be);
-    if length > MAX_PROFILE_SIZE as libc::c_uint
-        || (length as libc::c_ulong) < ::std::mem::size_of::<be32>() as libc::c_ulong
-    {
-        return;
-    }
-    /* allocate room for the entire profile */
-    data = malloc(length as usize);
-    if data.is_null() {
-        return;
-    }
-    /* copy in length to the front so that the buffer will contain the entire profile */
-    *(data as *mut be32) = length_be;
-    remaining_length =
-        (length as libc::c_ulong - ::std::mem::size_of::<be32>() as libc::c_ulong) as u32;
-    /* read the rest profile */
-    read_length = fread(
-        (data as *mut libc::c_uchar).offset(::std::mem::size_of::<be32>() as isize)
-            as *mut libc::c_void,
-        1,
-        remaining_length as usize,
-        file,
-    ) as usize;
-    if read_length != remaining_length as usize {
-        free(data);
-        return;
-    }
-    /* successfully get the profile.*/
-    *mem = data;
-    *size = length as usize;
-}
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_from_file(mut file: *mut FILE) -> *mut qcms_profile {
-    let mut length: usize = 0;
-    let mut profile: *mut qcms_profile;
-    let mut data: *mut libc::c_void = 0 as *mut libc::c_void;
-    qcms_data_from_file(file, &mut data, &mut length);
-    if data.is_null() || length == 0 {
-        return 0 as *mut qcms_profile;
-    }
-    profile = qcms_profile_from_memory(data, length);
-    free(data);
-    return profile;
-}
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_from_path(
-    mut path: *const libc::c_char,
-) -> *mut qcms_profile {
-    let mut profile: *mut qcms_profile = 0 as *mut qcms_profile;
-    let mut file = fopen(path, b"rb\x00" as *const u8 as *const libc::c_char);
-    if !file.is_null() {
-        profile = qcms_profile_from_file(file);
-        fclose(file);
-    }
-    return profile;
-}
-#[no_mangle]
-pub unsafe extern "C" fn qcms_data_from_path(
-    mut path: *const libc::c_char,
-    mut mem: *mut *mut libc::c_void,
-    mut size: *mut usize,
-) {
-    *mem = 0 as *mut libc::c_void;
-    *size = 0;
-    let file = fopen(path, b"rb\x00" as *const u8 as *const libc::c_char);
-    if !file.is_null() {
-        qcms_data_from_file(file, mem, size);
-        fclose(file);
-    };
-}
-
-#[cfg(windows)]
-extern "C" {
-    pub fn _wfopen(filename: *const libc::wchar_t, mode: *const libc::wchar_t) -> *mut FILE;
-}
-
-#[cfg(windows)]
-#[no_mangle]
-pub unsafe extern "C" fn qcms_profile_from_unicode_path(mut path: *const libc::wchar_t) {
-    let mut file = _wfopen(path, ['r' as u16, 'b' as u16, '\0' as u16].as_ptr());
-    if !file.is_null() {
-        qcms_profile_from_file(file);
-        fclose(file);
-    };
-}
-
-#[cfg(windows)]
-#[no_mangle]
-pub unsafe extern "C" fn qcms_data_from_unicode_path(
-    mut path: *const libc::wchar_t,
-    mut mem: *mut *mut libc::c_void,
-    mut size: *mut usize,
-) {
-    *mem = 0 as *mut libc::c_void;
-    *size = 0;
-    let mut file = _wfopen(path, ['r' as u16, 'b' as u16, '\0' as u16].as_ptr());
-    if !file.is_null() {
-        qcms_data_from_file(file, mem, size);
-        fclose(file);
-    };
-}
 
 #[no_mangle]
 pub unsafe extern "C" fn qcms_data_create_rgb_with_gamma(
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/lib.rs firefox-85.0+build1/gfx/qcms/src/lib.rs
--- firefox-84.0.2+build1/gfx/qcms/src/lib.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/lib.rs	2021-01-18 19:58:11.000000000 +0000
@@ -40,8 +40,9 @@
     return (v * 65536f64) as i32;
 }
 
-pub mod chain;
-pub mod gtest;
+pub mod c_bindings;
+mod chain;
+mod gtest;
 pub mod iccread;
 pub mod matrix;
 pub mod transform;
@@ -51,4 +52,4 @@
 pub mod transform_neon;
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub mod transform_sse2;
-pub mod transform_util;
+mod transform_util;
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/transform.rs firefox-85.0+build1/gfx/qcms/src/transform.rs
--- firefox-84.0.2+build1/gfx/qcms/src/transform.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/transform.rs	2021-01-18 19:58:11.000000000 +0000
@@ -27,7 +27,7 @@
     qcms_transform_data_rgba_out_lut_neon,
 };
 use crate::{
-    chain::qcms_chain_transform,
+    chain::chain_transform,
     double_to_s15Fixed16Number,
     iccread::qcms_supports_iccv4,
     matrix::*,
@@ -37,8 +37,8 @@
     },
 };
 use crate::{
-    iccread::{curveType, qcms_CIE_xyY, qcms_CIE_xyYTRIPLE, qcms_profile, RGB_SIGNATURE},
-    qcms_intent, s15Fixed16Number,
+    iccread::{qcms_CIE_xyY, qcms_CIE_xyYTRIPLE, qcms_profile, RGB_SIGNATURE},
+    qcms_intent,
     transform_util::clamp_float,
 };
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
@@ -53,9 +53,9 @@
     },
 };
 
-use ::libc::{self, free, malloc};
+use ::libc::{self};
+use std::sync::atomic::Ordering;
 use std::sync::{atomic::AtomicBool, Arc};
-use std::{ptr::null_mut, sync::atomic::Ordering};
 
 pub const PRECACHE_OUTPUT_SIZE: usize = 8192;
 pub const PRECACHE_OUTPUT_MAX: usize = PRECACHE_OUTPUT_SIZE - 1;
@@ -86,23 +86,15 @@
 
 #[repr(C)]
 #[repr(align(16))]
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct qcms_transform {
     pub matrix: [[f32; 4]; 3],
     pub input_gamma_table_r: Option<Vec<f32>>,
     pub input_gamma_table_g: Option<Vec<f32>>,
     pub input_gamma_table_b: Option<Vec<f32>>,
-    pub input_clut_table_r: *mut f32,
-    pub input_clut_table_g: *mut f32,
-    pub input_clut_table_b: *mut f32,
     pub input_clut_table_length: u16,
-    pub r_clut: *mut f32,
-    pub g_clut: *mut f32,
-    pub b_clut: *mut f32,
+    pub clut: Option<Vec<f32>>,
     pub grid_size: u16,
-    pub output_clut_table_r: *mut f32,
-    pub output_clut_table_g: *mut f32,
-    pub output_clut_table_b: *mut f32,
     pub output_clut_table_length: u16,
     pub input_gamma_table_gray: Option<Vec<f32>>,
     pub out_gamma_r: f32,
@@ -123,46 +115,6 @@
     pub transform_fn: transform_fn_t,
 }
 
-impl Default for qcms_transform {
-    fn default() -> qcms_transform {
-        qcms_transform {
-            matrix: Default::default(),
-            input_gamma_table_r: Default::default(),
-            input_gamma_table_b: Default::default(),
-            input_gamma_table_g: Default::default(),
-            input_clut_table_r: null_mut(),
-            input_clut_table_g: null_mut(),
-            input_clut_table_b: null_mut(),
-            input_clut_table_length: Default::default(),
-            r_clut: null_mut(),
-            g_clut: null_mut(),
-            b_clut: null_mut(),
-            grid_size: Default::default(),
-            output_clut_table_r: null_mut(),
-            output_clut_table_g: null_mut(),
-            output_clut_table_b: null_mut(),
-            output_clut_table_length: Default::default(),
-            input_gamma_table_gray: Default::default(),
-            out_gamma_r: Default::default(),
-            out_gamma_g: Default::default(),
-            out_gamma_b: Default::default(),
-            out_gamma_gray: Default::default(),
-            output_gamma_lut_r: Default::default(),
-            output_gamma_lut_g: Default::default(),
-            output_gamma_lut_b: Default::default(),
-            output_gamma_lut_gray: Default::default(),
-            output_gamma_lut_r_length: Default::default(),
-            output_gamma_lut_g_length: Default::default(),
-            output_gamma_lut_b_length: Default::default(),
-            output_gamma_lut_gray_length: Default::default(),
-            output_table_r: Default::default(),
-            output_table_g: Default::default(),
-            output_table_b: Default::default(),
-            transform_fn: Default::default(),
-        }
-    }
-}
-
 pub type transform_fn_t = Option<
     unsafe extern "C" fn(
         _: *const qcms_transform,
@@ -172,68 +124,6 @@
     ) -> (),
 >;
 
-// 16 is the upperbound, actual is 0..num_in_channels.
-// reversed elements (for mBA)
-/* should lut8Type and lut16Type be different types? */
-// used by lut8Type/lut16Type (mft2) only
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct lutmABType {
-    pub num_in_channels: u8,
-    pub num_out_channels: u8,
-    pub num_grid_points: [u8; 16],
-    pub e00: s15Fixed16Number,
-    pub e01: s15Fixed16Number,
-    pub e02: s15Fixed16Number,
-    pub e03: s15Fixed16Number,
-    pub e10: s15Fixed16Number,
-    pub e11: s15Fixed16Number,
-    pub e12: s15Fixed16Number,
-    pub e13: s15Fixed16Number,
-    pub e20: s15Fixed16Number,
-    pub e21: s15Fixed16Number,
-    pub e22: s15Fixed16Number,
-    pub e23: s15Fixed16Number,
-    pub reversed: bool,
-    pub clut_table: *mut f32,
-    pub a_curves: [*mut curveType; 10],
-    pub b_curves: [*mut curveType; 10],
-    pub m_curves: [*mut curveType; 10],
-    pub clut_table_data: [f32; 0],
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct lutType {
-    pub num_input_channels: u8,
-    pub num_output_channels: u8,
-    pub num_clut_grid_points: u8,
-    pub e00: s15Fixed16Number,
-    pub e01: s15Fixed16Number,
-    pub e02: s15Fixed16Number,
-    pub e10: s15Fixed16Number,
-    pub e11: s15Fixed16Number,
-    pub e12: s15Fixed16Number,
-    pub e20: s15Fixed16Number,
-    pub e21: s15Fixed16Number,
-    pub e22: s15Fixed16Number,
-    pub num_input_table_entries: u16,
-    pub num_output_table_entries: u16,
-    pub input_table: *mut f32,
-    pub clut_table: *mut f32,
-    pub output_table: *mut f32,
-    pub table_data: [f32; 0],
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct XYZNumber {
-    pub X: s15Fixed16Number,
-    pub Y: s15Fixed16Number,
-    pub Z: s15Fixed16Number,
-}
-
 pub type qcms_data_type = libc::c_uint;
 pub const QCMS_DATA_GRAYA_8: qcms_data_type = 4;
 pub const QCMS_DATA_GRAY_8: qcms_data_type = 3;
@@ -831,9 +721,10 @@
     let mut xy_len: i32 = 1;
     let mut x_len: i32 = (*transform).grid_size as i32;
     let mut len: i32 = x_len * x_len;
-    let mut r_table: *mut f32 = (*transform).r_clut;
-    let mut g_table: *mut f32 = (*transform).g_clut;
-    let mut b_table: *mut f32 = (*transform).b_clut;
+    let mut table = (*transform).clut.as_ref().unwrap().as_ptr();
+    let mut r_table: *const f32 = table;
+    let mut g_table: *const f32 = table.offset(1);
+    let mut b_table: *const f32 = table.offset(2);
     let mut c0_r: f32;
     let mut c1_r: f32;
     let mut c2_r: f32;
@@ -1110,10 +1001,6 @@
 #[no_mangle]
 pub unsafe extern "C" fn qcms_transform_release(mut t: *mut qcms_transform) {
     let t = Box::from_raw(t);
-    /* r_clut points to beginning of buffer allocated in qcms_transform_precacheLUT_float */
-    if !(*t).r_clut.is_null() {
-        free((*t).r_clut as *mut libc::c_void);
-    }
     drop(t)
 }
 
@@ -1214,14 +1101,13 @@
     };
 }
 /* Replace the current transformation with a LUT transformation using a given number of sample points */
-#[no_mangle]
-pub unsafe extern "C" fn qcms_transform_precacheLUT_float(
+fn transform_precacheLUT_float(
     mut transform: Box<qcms_transform>,
     mut in_0: &qcms_profile,
     mut out: &qcms_profile,
     mut samples: i32,
     mut in_type: qcms_data_type,
-) -> *mut qcms_transform {
+) -> Option<Box<qcms_transform>> {
     /* The range between which 2 consecutive sample points can be used to interpolate */
     let mut x: u16;
     let mut y: u16;
@@ -1229,39 +1115,22 @@
     let mut l: u32;
     let mut lutSize: u32 = (3 * samples * samples * samples) as u32;
 
-    let mut lut: *mut f32 = 0 as *mut f32;
-
-    let mut src: *mut f32 = malloc(lutSize as usize * ::std::mem::size_of::<f32>()) as *mut f32;
-    let mut dest: *mut f32 = malloc(lutSize as usize * ::std::mem::size_of::<f32>()) as *mut f32;
-    if !src.is_null() && !dest.is_null() {
+    let mut src = Vec::with_capacity(lutSize as usize);
+    let mut dest = vec![0.; lutSize as usize];
+    if true && true {
         /* Prepare a list of points we want to sample */
-        l = 0;
-        x = 0u16;
-        while (x as i32) < samples {
-            y = 0u16;
-            while (y as i32) < samples {
-                z = 0u16;
-                while (z as i32) < samples {
-                    let fresh8 = l;
-                    l = l + 1;
-                    *src.offset(fresh8 as isize) = x as i32 as f32 / (samples - 1) as f32;
-                    let fresh9 = l;
-                    l = l + 1;
-                    *src.offset(fresh9 as isize) = y as i32 as f32 / (samples - 1) as f32;
-                    let fresh10 = l;
-                    l = l + 1;
-                    *src.offset(fresh10 as isize) = z as i32 as f32 / (samples - 1) as f32;
-                    z = z + 1
+        for x in 0..samples {
+            for y in 0..samples {
+                for z in 0..samples {
+                    src.push(x as i32 as f32 / (samples - 1) as f32);
+                    src.push(y as i32 as f32 / (samples - 1) as f32);
+                    src.push(z as i32 as f32 / (samples - 1) as f32);
                 }
-                y = y + 1
             }
-            x = x + 1
         }
-        lut = qcms_chain_transform(in_0, out, src, dest, lutSize as usize);
-        if !lut.is_null() {
-            (*transform).r_clut = &mut *lut.offset(0isize) as *mut f32;
-            (*transform).g_clut = &mut *lut.offset(1isize) as *mut f32;
-            (*transform).b_clut = &mut *lut.offset(2isize) as *mut f32;
+        let lut = unsafe { chain_transform(in_0, out, src, dest, lutSize as usize) };
+        if let Some(lut) = lut {
+            (*transform).clut = Some(lut);
             (*transform).grid_size = samples as u16;
             if in_type == QCMS_DATA_RGBA_8 {
                 (*transform).transform_fn = Some(qcms_transform_data_tetra_clut_rgba)
@@ -1271,20 +1140,11 @@
                 (*transform).transform_fn = Some(qcms_transform_data_tetra_clut_rgb)
             }
             debug_assert!((*transform).transform_fn.is_some());
+        } else {
+            return None;
         }
     }
-    //XXX: qcms_modular_transform_data may return either the src or dest buffer. If so it must not be free-ed
-    // It will be stored in r_clut, which will be cleaned up in qcms_transform_release.
-    if !src.is_null() && lut != src {
-        free(src as *mut libc::c_void);
-    }
-    if !dest.is_null() && lut != dest {
-        free(dest as *mut libc::c_void);
-    }
-    if lut.is_null() {
-        return 0 as *mut qcms_transform;
-    }
-    return Box::into_raw(transform);
+    return Some(transform);
 }
 #[no_mangle]
 pub extern "C" fn qcms_transform_create(
@@ -1336,13 +1196,14 @@
         // This evenly divides 256 into blocks of 8x8x8.
         // TODO For transforming small data sets of about 200x200 or less
         // precaching should be avoided.
-        let mut result: *mut qcms_transform =
-            unsafe { qcms_transform_precacheLUT_float(transform, in_0, out, 33, in_type) };
-        if result.is_null() {
-            debug_assert!(false, "precacheLUT failed");
-            return 0 as *mut qcms_transform;
-        }
-        return result;
+        let mut result = transform_precacheLUT_float(transform, in_0, out, 33, in_type);
+        return match result {
+            Some(result) => Box::into_raw(result),
+            None => {
+                debug_assert!(false, "precacheLUT failed");
+                0 as *mut qcms_transform
+            }
+        };
     }
     if precache {
         (*transform).output_table_r = Some(Arc::clone((*out).output_table_r.as_ref().unwrap()));
diff -Nru firefox-84.0.2+build1/gfx/qcms/src/transform_util.rs firefox-85.0+build1/gfx/qcms/src/transform_util.rs
--- firefox-84.0.2+build1/gfx/qcms/src/transform_util.rs	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/qcms/src/transform_util.rs	2021-01-18 19:58:11.000000000 +0000
@@ -216,7 +216,7 @@
         gamma_table.push((i as f64 / 255.0f64) as f32);
     }
 }
-pub fn build_input_gamma_table(mut TRC: Option<&curveType>) -> Option<Vec<f32>> {
+pub(crate) fn build_input_gamma_table(mut TRC: Option<&curveType>) -> Option<Vec<f32>> {
     let TRC = match TRC {
         Some(TRC) => TRC,
         None => return None,
@@ -398,7 +398,10 @@
         v = v + 1
     }
 }
-pub fn compute_precache(mut trc: &curveType, mut output: &mut [u8; PRECACHE_OUTPUT_SIZE]) -> bool {
+pub(crate) fn compute_precache(
+    mut trc: &curveType,
+    mut output: &mut [u8; PRECACHE_OUTPUT_SIZE],
+) -> bool {
     match trc {
         curveType::Parametric(params) => {
             let mut gamma_table = Vec::with_capacity(256);
@@ -465,7 +468,7 @@
     return output;
 }
 
-pub fn build_output_lut(mut trc: &curveType) -> Vec<u16> {
+pub(crate) fn build_output_lut(mut trc: &curveType) -> Vec<u16> {
     match trc {
         curveType::Parametric(params) => {
             let mut gamma_table = Vec::with_capacity(256);
diff -Nru firefox-84.0.2+build1/gfx/src/FilterSupport.h firefox-85.0+build1/gfx/src/FilterSupport.h
--- firefox-84.0.2+build1/gfx/src/FilterSupport.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/FilterSupport.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,9 @@
 #ifndef __FilterSupport_h
 #define __FilterSupport_h
 
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/Point.h"
 #include "mozilla/gfx/Rect.h"
 #include "nsRegion.h"
 #include "nsTArray.h"
@@ -15,6 +17,7 @@
 namespace mozilla {
 namespace gfx {
 class FilterPrimitiveDescription;
+class FilterNode;
 struct FilterDescription;
 }  // namespace gfx
 }  // namespace mozilla
@@ -98,8 +101,6 @@
 const unsigned short SVG_FECOMPOSITE_OPERATOR_XOR = 5;
 const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
 
-class DrawTarget;
-class SourceSurface;
 struct FilterAttribute;
 
 // Limits
diff -Nru firefox-84.0.2+build1/gfx/src/gfxCrashReporterUtils.cpp firefox-85.0+build1/gfx/src/gfxCrashReporterUtils.cpp
--- firefox-84.0.2+build1/gfx/src/gfxCrashReporterUtils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/gfxCrashReporterUtils.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -78,11 +78,10 @@
   }
 };
 
-class AppendAppNotesRunnable : public CancelableRunnable {
+class AppendAppNotesRunnable : public Runnable {
  public:
   explicit AppendAppNotesRunnable(const nsACString& aFeatureStr)
-      : CancelableRunnable("AppendAppNotesRunnable"),
-        mFeatureString(aFeatureStr) {}
+      : Runnable("AppendAppNotesRunnable"), mFeatureString(aFeatureStr) {}
 
   NS_IMETHOD Run() override {
     CrashReporter::AppendAppNotesToCrashReport(mFeatureString);
diff -Nru firefox-84.0.2+build1/gfx/src/gfxTelemetry.cpp firefox-85.0+build1/gfx/src/gfxTelemetry.cpp
--- firefox-84.0.2+build1/gfx/src/gfxTelemetry.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/gfxTelemetry.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -26,6 +26,8 @@
       return "unavailable-not-built";
     case FeatureStatus::UnavailableNoAngle:
       return "unavailable-no-angle";
+    case FeatureStatus::UnavailableNoWebRender:
+      return "unavailable-no-webrender";
     case FeatureStatus::CrashedInHandler:
       return "crashed";
     case FeatureStatus::Blocked:
diff -Nru firefox-84.0.2+build1/gfx/src/gfxTelemetry.h firefox-85.0+build1/gfx/src/gfxTelemetry.h
--- firefox-84.0.2+build1/gfx/src/gfxTelemetry.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/gfxTelemetry.h	2021-01-18 19:58:11.000000000 +0000
@@ -26,6 +26,7 @@
   UnavailableNoHwCompositing,
   UnavailableNotBuilt,
   UnavailableNoAngle,
+  UnavailableNoWebRender,
 
   // This feature crashed immediately when we tried to initialize it, but we
   // were able to recover via SEH (or something similar).
diff -Nru firefox-84.0.2+build1/gfx/src/nsColor.h firefox-85.0+build1/gfx/src/nsColor.h
--- firefox-84.0.2+build1/gfx/src/nsColor.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsColor.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,9 +7,7 @@
 #ifndef nsColor_h___
 #define nsColor_h___
 
-#include <stddef.h>   // for size_t
 #include <stdint.h>   // for uint8_t, uint32_t
-#include "nscore.h"   // for nsAString
 #include "nsCoord.h"  // for NSToIntRound
 #include "nsStringFwd.h"
 
diff -Nru firefox-84.0.2+build1/gfx/src/nsCoord.h firefox-85.0+build1/gfx/src/nsCoord.h
--- firefox-84.0.2+build1/gfx/src/nsCoord.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsCoord.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,17 +7,13 @@
 #ifndef NSCOORD_H
 #define NSCOORD_H
 
-#include "mozilla/FloatingPoint.h"
-
-#include "nsAlgorithm.h"
-#include "nscore.h"
-#include "nsMathUtils.h"
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
 #include <math.h>
-#include <float.h>
-#include <stdlib.h>
 
-#include "nsDebug.h"
-#include <algorithm>
+#include "mozilla/Assertions.h"
+#include "nsMathUtils.h"
 
 /*
  * Basic type used for the geometry classes.
diff -Nru firefox-84.0.2+build1/gfx/src/nsFont.h firefox-85.0+build1/gfx/src/nsFont.h
--- firefox-84.0.2+build1/gfx/src/nsFont.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsFont.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,19 +7,16 @@
 #ifndef nsFont_h___
 #define nsFont_h___
 
-#include <stdint.h>     // for uint8_t, uint16_t
-#include <sys/types.h>  // for int16_t
+#include <cstdint>
 #include "gfxFontFamilyList.h"
 #include "gfxFontConstants.h"  // for NS_FONT_KERNING_AUTO, etc
-#include "gfxFontFeatures.h"
 #include "gfxFontVariations.h"
 #include "mozilla/FontPropertyTypes.h"
-#include "mozilla/RefPtr.h"  // for RefPtr
 #include "mozilla/ServoStyleConstsInlines.h"
 #include "mozilla/StyleColorInlines.h"  // for StyleRGBA
-#include "nsCoord.h"                    // for nscoord
 #include "nsTArray.h"                   // for nsTArray
 
+struct gfxFontFeature;
 struct gfxFontStyle;
 
 // Font structure.
diff -Nru firefox-84.0.2+build1/gfx/src/nsFontMetrics.h firefox-85.0+build1/gfx/src/nsFontMetrics.h
--- firefox-84.0.2+build1/gfx/src/nsFontMetrics.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsFontMetrics.h	2021-01-18 19:58:11.000000000 +0000
@@ -15,7 +15,8 @@
 #include "nsError.h"             // for nsresult
 #include "nsFont.h"              // for nsFont
 #include "nsISupports.h"         // for NS_INLINE_DECL_REFCOUNTING
-#include "nscore.h"              // for char16_t
+#include "nsStyleConsts.h"
+#include "nscore.h"  // for char16_t
 
 class gfxContext;
 class gfxFontGroup;
diff -Nru firefox-84.0.2+build1/gfx/src/nsITheme.h firefox-85.0+build1/gfx/src/nsITheme.h
--- firefox-84.0.2+build1/gfx/src/nsITheme.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsITheme.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,9 +9,10 @@
 #ifndef nsITheme_h_
 #define nsITheme_h_
 
+#include "mozilla/AlreadyAddRefed.h"
 #include "nsISupports.h"
-#include "nsCOMPtr.h"
-#include "nsColor.h"
+#include "nsID.h"
+#include "nscore.h"
 #include "Units.h"
 
 struct nsRect;
diff -Nru firefox-84.0.2+build1/gfx/src/nsMargin.h firefox-85.0+build1/gfx/src/nsMargin.h
--- firefox-84.0.2+build1/gfx/src/nsMargin.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsMargin.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,7 +8,6 @@
 #define NSMARGIN_H
 
 #include "nsCoord.h"
-#include "nsPoint.h"
 #include "mozilla/gfx/BaseMargin.h"
 #include "mozilla/gfx/Rect.h"
 
diff -Nru firefox-84.0.2+build1/gfx/src/nsPoint.h firefox-85.0+build1/gfx/src/nsPoint.h
--- firefox-84.0.2+build1/gfx/src/nsPoint.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsPoint.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,10 +7,9 @@
 #ifndef NSPOINT_H
 #define NSPOINT_H
 
+#include <cstdint>
 #include "nsCoord.h"
-#include "mozilla/gfx/BaseSize.h"
 #include "mozilla/gfx/BasePoint.h"
-#include "nsSize.h"
 #include "mozilla/gfx/Point.h"
 
 // nsIntPoint represents a point in one of the types of pixels.
diff -Nru firefox-84.0.2+build1/gfx/src/nsRectAbsolute.h firefox-85.0+build1/gfx/src/nsRectAbsolute.h
--- firefox-84.0.2+build1/gfx/src/nsRectAbsolute.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsRectAbsolute.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "mozilla/gfx/RectAbsolute.h"
 #include "nsCoord.h"
-#include "nsPoint.h"
+#include "nsMargin.h"
 #include "nsRect.h"
 
 struct nsRectAbsolute
diff -Nru firefox-84.0.2+build1/gfx/src/nsRect.h firefox-85.0+build1/gfx/src/nsRect.h
--- firefox-84.0.2+build1/gfx/src/nsRect.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsRect.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,19 +7,15 @@
 #ifndef NSRECT_H
 #define NSRECT_H
 
-#include <stdio.h>           // for FILE
 #include <stdint.h>          // for int32_t, int64_t
 #include <algorithm>         // for min/max
 #include "mozilla/Likely.h"  // for MOZ_UNLIKELY
+#include "mozilla/gfx/BaseRect.h"
 #include "mozilla/gfx/Rect.h"
-#include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/Logging.h"
-#include "nsCoord.h"          // for nscoord, etc
-#include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, etc
-#include "nsPoint.h"          // for nsIntPoint, nsPoint
-#include "nsMargin.h"         // for nsIntMargin, nsMargin
-#include "nsSize.h"           // for IntSize, nsSize
-#include "nscore.h"           // for NS_BUILD_REFCNT_LOGGING
+#include "nsCoord.h"      // for nscoord, etc
+#include "nsISupports.h"  // for MOZ_COUNT_CTOR, etc
+#include "nsPoint.h"      // for nsIntPoint, nsPoint
+#include "nsSize.h"       // for IntSize, nsSize
 #if !defined(ANDROID) && (defined(__SSE2__) || defined(_M_X64) || \
                           (defined(_M_IX86_FP) && _M_IX86_FP >= 2))
 #  if defined(_MSC_VER) && !defined(__clang__)
@@ -29,6 +25,8 @@
 #  endif
 #endif
 
+struct nsMargin;
+
 typedef mozilla::gfx::IntRect nsIntRect;
 
 struct nsRect : public mozilla::gfx::BaseRect<nscoord, nsRect, nsPoint, nsSize,
diff -Nru firefox-84.0.2+build1/gfx/src/nsRegion.h firefox-85.0+build1/gfx/src/nsRegion.h
--- firefox-84.0.2+build1/gfx/src/nsRegion.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/nsRegion.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,18 +7,15 @@
 #ifndef nsRegion_h__
 #define nsRegion_h__
 
-#include <stddef.h>     // for size_t
-#include <stdint.h>     // for uint32_t, uint64_t
-#include <sys/types.h>  // for int32_t
+#include <stddef.h>  // for size_t
+#include <stdint.h>  // for uint32_t, uint64_t
 
 #include <ostream>  // for std::ostream
 #include <utility>  // for mozilla::Move
 
-#include "mozilla/ArrayView.h"  // for ArrayView
-#include "mozilla/gfx/Logging.h"
+#include "mozilla/ArrayView.h"      // for ArrayView
 #include "mozilla/gfx/MatrixFwd.h"  // for mozilla::gfx::Matrix4x4
 #include "nsCoord.h"                // for nscoord
-#include "nsError.h"                // for nsresult
 #include "nsMargin.h"               // for nsIntMargin
 #include "nsPoint.h"                // for nsIntPoint, nsPoint
 #include "nsRect.h"                 // for mozilla::gfx::IntRect, nsRect
diff -Nru firefox-84.0.2+build1/gfx/src/X11Util.h firefox-85.0+build1/gfx/src/X11Util.h
--- firefox-84.0.2+build1/gfx/src/X11Util.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/src/X11Util.h	2021-01-18 19:58:11.000000000 +0000
@@ -27,8 +27,12 @@
  */
 inline Display* DefaultXDisplay() {
 #if defined(MOZ_WIDGET_GTK)
-  return GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+  GdkDisplay* gdkDisplay = gdk_display_get_default();
+  if (GDK_IS_X11_DISPLAY(gdkDisplay)) {
+    return GDK_DISPLAY_XDISPLAY(gdkDisplay);
+  }
 #endif
+  return nullptr;
 }
 
 /**
diff -Nru firefox-84.0.2+build1/gfx/tests/browser/browser.ini firefox-85.0+build1/gfx/tests/browser/browser.ini
--- firefox-84.0.2+build1/gfx/tests/browser/browser.ini	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/browser/browser.ini	2021-01-18 19:58:11.000000000 +0000
@@ -1,4 +1,8 @@
 [DEFAULT]
 support-files =
 
+[browser_native_font_cache_macos.js]
+support-files =
+  file_native_font_cache_macos.html
+skip-if = (os != 'mac')
 [browser_windowless_troubleshoot_crash.js]
diff -Nru firefox-84.0.2+build1/gfx/tests/browser/browser_native_font_cache_macos.js firefox-85.0+build1/gfx/tests/browser/browser_native_font_cache_macos.js
--- firefox-84.0.2+build1/gfx/tests/browser/browser_native_font_cache_macos.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/browser/browser_native_font_cache_macos.js	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,115 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async () => {
+  // Create a tab that loads a system font.
+  const CROSS_ORIGIN_DOMAIN = "https://example.com";
+  const TARGET_URL = `${CROSS_ORIGIN_DOMAIN}/browser/gfx/tests/browser/file_native_font_cache_macos.html`;
+  await BrowserTestUtils.withNewTab(
+    { gBrowser, url: TARGET_URL },
+    async browser => {
+      await SpecialPowers.spawn(browser, [], async () => {
+        // Capture a snapshot of the tab, which will load the system font in the
+        // parent process.
+        const TARGET_WIDTH = 200;
+        const TARGET_HEIGHT = 100;
+
+        const rect = new content.window.DOMRect(
+          0,
+          0,
+          TARGET_WIDTH,
+          TARGET_HEIGHT
+        );
+        await SpecialPowers.snapshotContext(content.window, rect, "white");
+      });
+    }
+  );
+
+  // Now create a tab that shows the memory reporter.
+  await BrowserTestUtils.withNewTab(
+    { gBrowser, url: "about:memory" },
+    async browser => {
+      // Click the "Measure" button.
+      await SpecialPowers.spawn(browser, [], () => {
+        let measureButton = content.document.getElementById("measureButton");
+        measureButton.click();
+      });
+
+      // Copy the page text and check for an expected start with string.
+      let copiedText = await new Promise(resolve => {
+        const REPORT_TIMEOUT_MS = 15 * 1e3;
+        const EXPECTED_START_WITH = "Main Process";
+        let mostRecentTextOnClipboard = "";
+
+        SimpleTest.waitForClipboard(
+          textOnClipboard => {
+            mostRecentTextOnClipboard = textOnClipboard;
+            const gotExpected = textOnClipboard.startsWith(EXPECTED_START_WITH);
+            if (!gotExpected) {
+              // Try copying again.
+              EventUtils.synthesizeKey("A", { accelKey: true });
+              EventUtils.synthesizeKey("C", { accelKey: true });
+            }
+            return gotExpected;
+          },
+          () => {
+            EventUtils.synthesizeKey("A", { accelKey: true });
+            EventUtils.synthesizeKey("C", { accelKey: true });
+          },
+          () => {
+            resolve(mostRecentTextOnClipboard);
+          },
+          () => {
+            info(`Didn't find expected text within ${REPORT_TIMEOUT_MS}ms.`);
+            dump("*******ACTUAL*******\n");
+            dump("<<<" + mostRecentTextOnClipboard + ">>>\n");
+            dump("********************\n");
+            resolve("");
+          },
+          "text/unicode",
+          REPORT_TIMEOUT_MS
+        );
+      });
+
+      isnot(copiedText, "", "Got some text from clipboard.");
+
+      // Search the copied text for our desired pattern. Initially, check for
+      // a line with "native-font-resource-mac". If that exists, ensure that it
+      // has less than a maximum MB. If that doesn't exist, check instead for
+      // a line with "gfx" before the "Other Measurements" section. If that
+      // exists, it is tested against the same MB limit. If it doesn't exist,
+      // that is an indication that "gfx" doesn't occur in the first section
+      // "Explicit Allocations', and therefore isn't holding memory at all.
+      const MB_EXCLUSIVE_MAX = 20;
+      const nfrm_line = /^.*?(\d+)\.\d+ MB.*-- native-font-resource-mac/m;
+      const nfrm_match = nfrm_line.exec(copiedText);
+      if (nfrm_match) {
+        const nfrm_mb = nfrm_match[1];
+        ok(
+          nfrm_mb < MB_EXCLUSIVE_MAX,
+          `native-font-resource-mac ${nfrm_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.`
+        );
+      } else {
+        // Figure out where the "Other Measurements" section begins.
+        const om_line = /^Other Measurements$/m;
+        const om_match = om_line.exec(copiedText);
+
+        // Find the first gfx line, and if it occurs before the "Other
+        // Measurements" section, check its size.
+        const gfx_line = /^.*?(\d+)\.\d+ MB.*-- gfx/m;
+        const gfx_match = gfx_line.exec(copiedText);
+        if (gfx_match && gfx_match.index < om_match.index) {
+          const gfx_mb = gfx_match[1];
+          ok(
+            gfx_mb < MB_EXCLUSIVE_MAX,
+            `Explicit Allocations gfx ${gfx_mb} MB should be less than ${MB_EXCLUSIVE_MAX} MB.`
+          );
+        } else {
+          ok(true, "Explicit Allocations gfx is not listed.");
+        }
+      }
+    }
+  );
+});
diff -Nru firefox-84.0.2+build1/gfx/tests/browser/file_native_font_cache_macos.html firefox-85.0+build1/gfx/tests/browser/file_native_font_cache_macos.html
--- firefox-84.0.2+build1/gfx/tests/browser/file_native_font_cache_macos.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/browser/file_native_font_cache_macos.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<style>
+html {
+ font-size: 40px;
+ font-family: apple color emoji;
+}
+</style>
+</head>
+<body>
+��🔥
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/crashtests/1678938-1.html firefox-85.0+build1/gfx/tests/crashtests/1678938-1.html
--- firefox-84.0.2+build1/gfx/tests/crashtests/1678938-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/crashtests/1678938-1.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,9 @@
+<style>
+:first-of-type {
+  filter: saturate(70%);
+  transform: skew(-224.96198773774648grad) matrix3d(79.00629819492802, -0.0, 43.223526565331326, -294.8479790240964, 269.7, 243.87676190037186, 238.83225166324632, 42.507227157006135, 634943.1, 208.66200905121616, 46.19831959954935, -285.43139932334543, -229.39776691490985, -126.46021751791264, 116.46, 137.77);
+  border-block-end-style: double;
+</style>
+<dl>
+<header>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/crashtests/1679477-1.html firefox-85.0+build1/gfx/tests/crashtests/1679477-1.html
--- firefox-84.0.2+build1/gfx/tests/crashtests/1679477-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/crashtests/1679477-1.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,8 @@
+<style>
+* {
+  opacity: 0.4756117524753537;
+  -webkit-perspective: 2px;
+  rotate: 5deg 52 6 4;
+</style>
+<li>
+<iframe>
diff -Nru firefox-84.0.2+build1/gfx/tests/crashtests/783041-2.html firefox-85.0+build1/gfx/tests/crashtests/783041-2.html
--- firefox-84.0.2+build1/gfx/tests/crashtests/783041-2.html	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/crashtests/783041-2.html	2021-01-18 19:58:11.000000000 +0000
@@ -11,23 +11,23 @@
         padding: 5px;
         display: table;
         -moz-transform:translate3d(0, 80px, 0);
-      } 
+      }
       #el0:before {
-        display: -moz-grid;
+        display: -moz-box;
         content: counter(c, hiragana) attr(id);
         counter-increment: c 694;
-      } 
+      }
       #el0:after {
         counter-reset: c 694;
         content: counter(c, cjk-ideographic) attr(id);
-      } 
+      }
       #el1 {
         text-shadow: 0px 20px 0px, 0px -20px 10px;
         line-height: 4px;
         transform: translate3d(0px, -300px, 0px);
         display: table-row-group;
         border-spacing: 7px;
-      } 
+      }
       #el1:after {
         counter-reset: c;
         display: -moz-box;
@@ -36,18 +36,18 @@
       }
       #el2 {
         display: table-row-group;
-        -moz-transform:translate3d(0, 80px, 0); 
+        -moz-transform:translate3d(0, 80px, 0);
       }
       #el2:after {
         content: counter(c, cjk-ideographic) attr(id);
-      } 
+      }
     </style>
     <script>
       function MaybeReload() {
         var countdown = 10;
         if (location.search) {
           countdown = parseInt(location.search.slice(1)) - 1;
-	}		   
+	}
         if (countdown > 0) {
           location.search = countdown;
         }
diff -Nru firefox-84.0.2+build1/gfx/tests/crashtests/crashtests.list firefox-85.0+build1/gfx/tests/crashtests/crashtests.list
--- firefox-84.0.2+build1/gfx/tests/crashtests/crashtests.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/crashtests/crashtests.list	2021-01-18 19:58:11.000000000 +0000
@@ -198,3 +198,6 @@
 load 1650990.html
 skip-if(!webrender||AddressSanitizer) load 1652750-deep-scene-stack.html
 load 1651882.html
+skip-if(!webrender) load 1678938-1.html
+load 1679477-1.html
+
diff -Nru firefox-84.0.2+build1/gfx/tests/gtest/TestConfigManager.cpp firefox-85.0+build1/gfx/tests/gtest/TestConfigManager.cpp
--- firefox-84.0.2+build1/gfx/tests/gtest/TestConfigManager.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/gtest/TestConfigManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -653,7 +653,7 @@
 
 TEST_F(GfxConfigManager, WebRenderIntelAtRefreshRateThreshold) {
   mIsNightly = false;
-  mMockGfxInfo->mMaxRefreshRate = 60;
+  mMockGfxInfo->mMaxRefreshRate = 75;
   mMockGfxInfo->mVendorId = "0x8086";
   ConfigureWebRender();
 
@@ -782,6 +782,144 @@
   ConfigureWebRender();
 
   EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWr.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderForceDisabledEnvvar) {
+  mWrEnvForceDisabled = true;
+  ConfigureWebRender();
+
+  EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWr.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderSoftwareAllowedForceDisabledEnvvar) {
+  mWrEnvForceDisabled = true;
+  mMockGfxInfo->mStatusWrSoftware = nsIGfxInfo::FEATURE_ALLOW_ALWAYS;
+  ConfigureWebRender();
+
+  EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWr.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderSoftwareAllowedForceDisabledPref) {
+  mWrForceDisabled = true;
+  mMockGfxInfo->mStatusWrSoftware = nsIGfxInfo::FEATURE_ALLOW_ALWAYS;
+  ConfigureWebRender();
+
+  EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWr.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderForceSoftwareForceDisabledEnvvar) {
+  mWrEnvForceDisabled = true;
+  mWrSoftwareForceEnabled = true;
+  ConfigureWebRender();
+
+  EXPECT_TRUE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWr.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderForceEnabledEnvvar) {
+  mWrEnvForceEnabled = true;
+  mMockGfxInfo->mStatusWr = nsIGfxInfo::FEATURE_DENIED;
+  ConfigureWebRender();
+
+  EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWr.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderSoftwareAllowedForceEnabledEnvvar) {
+  mWrEnvForceEnabled = true;
+  mMockGfxInfo->mStatusWr = nsIGfxInfo::FEATURE_DENIED;
+  mMockGfxInfo->mStatusWrSoftware = nsIGfxInfo::FEATURE_ALLOW_ALWAYS;
+  ConfigureWebRender();
+
+  EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWr.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderSoftwareAllowedForceEnabledPref) {
+  mWrForceEnabled = true;
+  mMockGfxInfo->mStatusWr = nsIGfxInfo::FEATURE_DENIED;
+  mMockGfxInfo->mStatusWrSoftware = nsIGfxInfo::FEATURE_ALLOW_ALWAYS;
+  ConfigureWebRender();
+
+  EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWr.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrDComp.IsEnabled());
+  EXPECT_TRUE(mFeatures.mWrPartial.IsEnabled());
+  EXPECT_TRUE(mFeatures.mHwCompositing.IsEnabled());
+  EXPECT_TRUE(mFeatures.mGPUProcess.IsEnabled());
+  EXPECT_TRUE(mFeatures.mD3D11HwAngle.IsEnabled());
+  EXPECT_FALSE(mFeatures.mWrSoftware.IsEnabled());
+}
+
+TEST_F(GfxConfigManager, WebRenderForceSoftwareForceEnabledEnvvar) {
+  mWrEnvForceEnabled = true;
+  mWrSoftwareForceEnabled = true;
+  mMockGfxInfo->mStatusWr = nsIGfxInfo::FEATURE_DENIED;
+  ConfigureWebRender();
+
+  EXPECT_FALSE(mFeatures.mWrQualified.IsEnabled());
   EXPECT_TRUE(mFeatures.mWr.IsEnabled());
   EXPECT_TRUE(mFeatures.mWrCompositor.IsEnabled());
   EXPECT_TRUE(mFeatures.mWrAngle.IsEnabled());
diff -Nru firefox-84.0.2+build1/gfx/tests/reftest/1662062-1-no-blurry.html firefox-85.0+build1/gfx/tests/reftest/1662062-1-no-blurry.html
--- firefox-84.0.2+build1/gfx/tests/reftest/1662062-1-no-blurry.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/reftest/1662062-1-no-blurry.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html reftest-resolution="5.0">
+<head>
+  <style>
+    html {
+      scrollbar-width: none;
+    }
+    body {
+      margin: 0;
+    }
+  </style>
+</head>
+<body>
+
+<svg height="100" width="100">
+  <polygon points="50 10 55 20 70 20 60 30 65 45 50 35 35 45 40 30 30 20 45 20" stroke="green" fill="transparent" stroke-width="5"/>
+</svg>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/reftest/1662062-1-ref.html firefox-85.0+build1/gfx/tests/reftest/1662062-1-ref.html
--- firefox-84.0.2+build1/gfx/tests/reftest/1662062-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/reftest/1662062-1-ref.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style>
+    html {
+      scrollbar-width: none;
+    }
+    body {
+      margin: 0;
+    }
+  </style>
+</head>
+<body>
+
+<svg height="500" width="500">
+  <polygon points="250 50 275 100 350 100 300 150 325 225 250 175 175 225 200 150 150 100 225 100" stroke="green" fill="transparent" stroke-width="25"/>
+</svg>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/reftest/1681610.html firefox-85.0+build1/gfx/tests/reftest/1681610.html
--- firefox-84.0.2+build1/gfx/tests/reftest/1681610.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/reftest/1681610.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+      body {
+          margin-left: 100px;
+          font-size: 500%;
+          font-family: Nimbus Sans, sans-serif;
+      }
+      ul {
+          width: 1em; /* This must to be non-zero, for the percentages to work. */
+      }
+      li {
+          /* This clip path is chosen to mask off all the rounded edges of a
+             'disc' list item marker, to hide the anti-aliased pixels along the
+             round edges of the bullets from the reftest. This makes correctly
+             rendered 'disc' and 'square' list item markers appear identical,
+             while a bogus clear pixel in the middle of a 'disc' marker (the
+             present bug) still shows up.
+
+             The exact placement and rendering of the marker is up to the user
+             agent, so these values are specific to Firefox. The right and left
+             inset values fall outside the usual 0%-100% range because the
+             marker appears to the left of the <li>'s border box. */
+          clip-path: inset(44% 159% 44% -74%);
+      }
+    </style>
+  </head>
+  <body>
+    <ul>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+    </ul>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/reftest/1681610-ref.html firefox-85.0+build1/gfx/tests/reftest/1681610-ref.html
--- firefox-84.0.2+build1/gfx/tests/reftest/1681610-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/reftest/1681610-ref.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+      body {
+          margin-left: 100px;
+          font-size: 500%;
+          font-family: Nimbus Sans, sans-serif;
+      }
+      ul {
+          width: 1em; /* This must to be non-zero, for the percentages to work. */
+      }
+      li {
+          /* This clip path is chosen to mask off all the rounded edges of a
+             'disc' list item marker, to hide the anti-aliased pixels along the
+             round edges of the bullets from the reftest. This makes correctly
+             rendered 'disc' and 'square' list item markers appear identical,
+             while a bogus clear pixel in the middle of a 'disc' marker (the
+             present bug) still shows up.
+
+             The exact placement and rendering of the marker is up to the user
+             agent, so these values are specific to Firefox. The right and left
+             inset values fall outside the usual 0%-100% range because the
+             marker appears to the left of the <li>'s border box. */
+          clip-path: inset(44% 159% 44% -74%);
+          list-style-type: square;
+      }
+    </style>
+  </head>
+  <body>
+    <ul>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+    </ul>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/gfx/tests/reftest/reftest.list firefox-85.0+build1/gfx/tests/reftest/reftest.list
--- firefox-84.0.2+build1/gfx/tests/reftest/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/tests/reftest/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -25,3 +25,5 @@
 == 1523080.html 1523080-ref.html
 == 1616444-same-color-different-paths.html 1616444-same-color-different-paths-ref.html
 skip-if(!asyncPan||!webrender||Android) fuzzy-if(winWidget,94-94,3415-3415) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref
+pref(apz.allow_zooming,true) == 1662062-1-no-blurry.html 1662062-1-ref.html
+== 1681610.html 1681610-ref.html
diff -Nru firefox-84.0.2+build1/gfx/thebes/DeviceManagerDx.cpp firefox-85.0+build1/gfx/thebes/DeviceManagerDx.cpp
--- firefox-84.0.2+build1/gfx/thebes/DeviceManagerDx.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/DeviceManagerDx.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/WindowsVersion.h"
 #include "mozilla/gfx/GPUParent.h"
+#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/GraphicsMessages.h"
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/gfxVars.h"
@@ -22,6 +23,7 @@
 #include "mozilla/layers/DeviceAttachmentsD3D11.h"
 #include "mozilla/layers/MLGDeviceD3D11.h"
 #include "mozilla/layers/PaintThread.h"
+#include "mozilla/Preferences.h"
 #include "nsExceptionHandler.h"
 #include "nsPrintfCString.h"
 #include "nsString.h"
@@ -1043,13 +1045,7 @@
     return false;
   }
 
-  if (resetReason != DeviceResetReason::FORCED_RESET) {
-    Telemetry::Accumulate(Telemetry::DEVICE_RESET_REASON,
-                          uint32_t(resetReason));
-  }
-
-  CrashReporter::AnnotateCrashReport(
-      CrashReporter::Annotation::DeviceResetReason, int(resetReason));
+  GPUProcessManager::RecordDeviceReset(resetReason);
 
   bool createCompositorDevice = !!mCompositorDevice;
   bool createContentDevice = !!mContentDevice;
@@ -1114,7 +1110,7 @@
     default:
       MOZ_ASSERT(false);
   }
-  return DeviceResetReason::UNKNOWN;
+  return DeviceResetReason::OTHER;
 }
 
 bool DeviceManagerDx::HasDeviceReset(DeviceResetReason* aOutReason) {
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfx2DGlue.h firefox-85.0+build1/gfx/thebes/gfx2DGlue.h
--- firefox-84.0.2+build1/gfx/thebes/gfx2DGlue.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfx2DGlue.h	2021-01-18 19:58:11.000000000 +0000
@@ -12,8 +12,9 @@
 #include "gfxRect.h"
 #include "gfxTypes.h"
 #include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/Point.h"
 #include "mozilla/gfx/Rect.h"
-#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Types.h"
 
 namespace mozilla {
 namespace gfx {
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxAlphaRecoverySSE2.cpp firefox-85.0+build1/gfx/thebes/gfxAlphaRecoverySSE2.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxAlphaRecoverySSE2.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxAlphaRecoverySSE2.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "gfxAlphaRecovery.h"
 #include "gfxImageSurface.h"
+#include "nsDebug.h"
 #include <emmintrin.h>
 
 // This file should only be compiled on x86 and x64 systems.  Additionally,
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxDWriteFontList.cpp firefox-85.0+build1/gfx/thebes/gfxDWriteFontList.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxDWriteFontList.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxDWriteFontList.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1272,11 +1272,10 @@
                      << aFamily->Key().AsString(SharedFontList()).get();
         continue;
       }
-      SlantStyleRange slant(dwstyle == DWRITE_FONT_STYLE_NORMAL
-                                ? FontSlantStyle::Normal()
-                                : dwstyle == DWRITE_FONT_STYLE_ITALIC
-                                      ? FontSlantStyle::Italic()
-                                      : FontSlantStyle::Oblique());
+      SlantStyleRange slant(
+          dwstyle == DWRITE_FONT_STYLE_NORMAL   ? FontSlantStyle::Normal()
+          : dwstyle == DWRITE_FONT_STYLE_ITALIC ? FontSlantStyle::Italic()
+                                                : FontSlantStyle::Oblique());
       aFaces.AppendElement(fontlist::Face::InitData{
           name, uint16_t(i), false, weight, stretch, slant, charmap});
     }
@@ -1475,6 +1474,7 @@
   if (FAILED(hr)) {
     Telemetry::Accumulate(Telemetry::DWRITEFONT_INIT_PROBLEM,
                           uint32_t(errGDIInterop));
+    mSharedFontList.reset(nullptr);
     return;
   }
 
@@ -1483,6 +1483,7 @@
   if (!mSystemFonts) {
     Telemetry::Accumulate(Telemetry::DWRITEFONT_INIT_PROBLEM,
                           uint32_t(errSystemFontCollection));
+    mSharedFontList.reset(nullptr);
     return;
   }
 #ifdef MOZ_BUNDLED_FONTS
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxDWriteFonts.cpp firefox-85.0+build1/gfx/thebes/gfxDWriteFonts.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxDWriteFonts.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxDWriteFonts.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 #include "gfxDWriteFontList.h"
 #include "gfxContext.h"
 #include "gfxTextRun.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/gfxVars.h"
 
 #include "harfbuzz/hb.h"
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFont.cpp firefox-85.0+build1/gfx/thebes/gfxFont.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxFont.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFont.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,6 +29,7 @@
 #include "gfxGraphiteShaper.h"
 #include "gfxHarfBuzzShaper.h"
 #include "gfxUserFontSet.h"
+#include "nsCRT.h"
 #include "nsSpecialCasingData.h"
 #include "nsTextRunTransformations.h"
 #include "nsUGenCategory.h"
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontEntry.cpp firefox-85.0+build1/gfx/thebes/gfxFontEntry.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxFontEntry.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontEntry.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1367,11 +1367,10 @@
   } else if (SlantStyle().Min().IsOblique()) {
     // Figure out what slant angle we should try to match from the
     // requested style.
-    float angle = aStyle.style.IsNormal()
-                      ? 0.0f
-                      : aStyle.style.IsItalic()
-                            ? FontSlantStyle::Oblique().ObliqueAngle()
-                            : aStyle.style.ObliqueAngle();
+    float angle = aStyle.style.IsNormal() ? 0.0f
+                  : aStyle.style.IsItalic()
+                      ? FontSlantStyle::Oblique().ObliqueAngle()
+                      : aStyle.style.ObliqueAngle();
     // Clamp to the available range, unless the face is a user font
     // with no explicit descriptor.
     if (!(IsUserFont() && (mRangeFlags & RangeFlags::eAutoSlantStyle))) {
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontEntry.h firefox-85.0+build1/gfx/thebes/gfxFontEntry.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontEntry.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontEntry.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,53 +6,64 @@
 #ifndef GFX_FONTENTRY_H
 #define GFX_FONTENTRY_H
 
-#include "gfxTypes.h"
-#include "nsString.h"
-#include "gfxFontConstants.h"
-#include "gfxFontFeatures.h"
+#include <math.h>
+#include <new>
+#include <utility>
+#include "ThebesRLBoxTypes.h"
 #include "gfxFontUtils.h"
 #include "gfxFontVariations.h"
-#include "gfxPlatform.h"
-#include "nsTArray.h"
-#include "nsTHashtable.h"
-#include "mozilla/HashFunctions.h"
-#include "mozilla/MemoryReporting.h"
-#include "MainThreadUtils.h"
-#include "nsUnicodeScriptCodes.h"
-#include "nsDataHashtable.h"
+#include "gfxRect.h"
+#include "gfxTypes.h"
 #include "harfbuzz/hb.h"
+#include "ipc/EnumSerializer.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/FontPropertyTypes.h"
-#include "mozilla/gfx/2D.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/TypedEnumBits.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/WeakPtr.h"
-#include "ThebesRLBoxTypes.h"
-#include <math.h>
-
-typedef struct gr_face gr_face;
-typedef struct FT_MM_Var_ FT_MM_Var;
-
-#ifdef DEBUG
-#  include <stdio.h>
-#endif
+#include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsHashKeys.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsUnicodeScriptCodes.h"
+#include "nscore.h"
 
-struct gfxFontStyle;
+class FontInfoData;
 class gfxContext;
 class gfxFont;
 class gfxFontFamily;
-class gfxUserFontData;
+class gfxPlatformFontList;
 class gfxSVGGlyphs;
-class FontInfoData;
-struct FontListSizes;
+class gfxUserFontData;
 class nsAtom;
+struct FontListSizes;
+struct gfxFontFeature;
+struct gfxFontStyle;
+enum class eFontPresentation : uint8_t;
+
+namespace IPC {
+template <class P>
+struct ParamTraits;
+}
 
 namespace mozilla {
 class SVGContextPaint;
 namespace fontlist {
-struct Family;
 struct Face;
+struct Family;
 }  // namespace fontlist
+namespace gfx {
+struct DeviceColor;
+}
 }  // namespace mozilla
 
+typedef struct gr_face gr_face;
+typedef struct FT_MM_Var_ FT_MM_Var;
+
 #define NO_FONT_LANGUAGE_OVERRIDE 0
 
 class gfxCharacterMap : public gfxSparseBitSet {
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontFamilyList.h firefox-85.0+build1/gfx/thebes/gfxFontFamilyList.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontFamilyList.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontFamilyList.h	2021-01-18 19:58:11.000000000 +0000
@@ -10,13 +10,12 @@
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include "nsString.h"
-#include "nsStyleConsts.h"
 #include "nsUnicharUtils.h"
 #include "nsTArray.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/NotNull.h"
+#include "mozilla/ServoStyleConsts.h"
 #include "mozilla/StaticPtr.h"
-#include "mozilla/TimeStamp.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontFeatures.h firefox-85.0+build1/gfx/thebes/gfxFontFeatures.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontFeatures.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontFeatures.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef GFX_FONT_FEATURES_H
 #define GFX_FONT_FEATURES_H
 
+#include "nsAtom.h"
 #include "nsTHashtable.h"
 #include "nsTArray.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFont.h firefox-85.0+build1/gfx/thebes/gfxFont.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFont.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFont.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,46 +7,76 @@
 #ifndef GFX_FONT_H
 #define GFX_FONT_H
 
-#include "gfxTypes.h"
-#include "gfxFontEntry.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "nsTHashtable.h"
-#include "nsHashKeys.h"
+#include <new>
+#include <utility>
+#include "PLDHashTable.h"
+#include "ThebesRLBoxTypes.h"
+#include "gfxFontVariations.h"
 #include "gfxRect.h"
-#include "nsExpirationTracker.h"
-#include "gfxPlatform.h"
-#include "nsAtom.h"
-#include "mozilla/HashFunctions.h"
-#include "nsIMemoryReporter.h"
-#include "nsIObserver.h"
-#include "mozilla/MemoryReporting.h"
+#include "gfxTypes.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/FontPropertyTypes.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/ServoStyleConsts.h"
 #include "mozilla/TypedEnumBits.h"
-#include <algorithm>
-#include "DrawMode.h"
-#include "nsDataHashtable.h"
-#include "mozilla/gfx/2D.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/gfx/MatrixFwd.h"
+#include "mozilla/gfx/Point.h"
+#include "nsCOMPtr.h"
 #include "nsColor.h"
+#include "nsDataHashtable.h"
+#include "nsExpirationTracker.h"
 #include "nsFontMetrics.h"
-#include "mozilla/ServoUtils.h"
-#include "ThebesRLBoxTypes.h"
-
-typedef struct _cairo cairo_t;
-typedef struct _cairo_scaled_font cairo_scaled_font_t;
+#include "nsHashKeys.h"
+#include "nsIMemoryReporter.h"
+#include "nsIObserver.h"
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsTHashtable.h"
+#include "nsUnicodeScriptCodes.h"
+#include "nscore.h"
 
-#ifdef DEBUG
-#  include <stdio.h>
-#endif
+// Only required for function bodys
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include "mozilla/Assertions.h"
+#include "mozilla/HashFunctions.h"
+#include "mozilla/ServoUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "gfxFontEntry.h"
+#include "gfxFontFeatures.h"
+#include "gfxFontUtils.h"
+#include "gfxPlatform.h"
+#include "nsAtom.h"
+#include "nsDebug.h"
+#include "nsMathUtils.h"
 
-class gfxTextRun;
+class gfxContext;
 class gfxGlyphExtents;
+class gfxMathTable;
 class gfxPattern;
 class gfxShapedText;
 class gfxShapedWord;
 class gfxSkipChars;
-class gfxMathTable;
+class gfxTextRun;
+class nsIEventTarget;
+class nsITimer;
+struct gfxTextRunDrawCallbacks;
+enum class DrawMode : int;
+
+namespace mozilla {
+class SVGContextPaint;
+namespace layout {
+class TextDrawTarget;
+}
+}  // namespace mozilla
+
+typedef struct _cairo cairo_t;
+typedef struct _cairo_scaled_font cairo_scaled_font_t;
 
 #define FONT_MAX_SIZE 2000.0
 
@@ -62,16 +92,6 @@
 #  define OBLIQUE_SKEW_FACTOR 0.25f
 #endif
 
-struct gfxTextRunDrawCallbacks;
-
-namespace mozilla {
-class SVGContextPaint;
-
-namespace layout {
-class TextDrawTarget;
-}
-}  // namespace mozilla
-
 struct gfxFontStyle {
   typedef mozilla::FontStretch FontStretch;
   typedef mozilla::FontSlantStyle FontSlantStyle;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontInfoLoader.h firefox-85.0+build1/gfx/thebes/gfxFontInfoLoader.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontInfoLoader.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontInfoLoader.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,12 +10,11 @@
 #include "nsIObserver.h"
 #include "nsITimer.h"
 #include "nsIThread.h"
-#include "nsRefPtrHashtable.h"
 #include "nsString.h"
-#include "gfxFont.h"
+#include "gfxFontEntry.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/TimeStamp.h"
-#include "nsISupportsImpl.h"
+#include "nsISupports.h"
 
 // data retrieved for a given face
 
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontSrcPrincipal.h firefox-85.0+build1/gfx/thebes/gfxFontSrcPrincipal.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontSrcPrincipal.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontSrcPrincipal.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,9 +7,10 @@
 #define MOZILLA_GFX_FONTSRCPRINCIPAL_H
 
 #include "nsCOMPtr.h"
-#include "nsIPrincipal.h"
 #include "PLDHashTable.h"
 
+class nsIPrincipal;
+
 namespace mozilla {
 namespace net {
 class nsSimpleURI;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontSrcURI.h firefox-85.0+build1/gfx/thebes/gfxFontSrcURI.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontSrcURI.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontSrcURI.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,9 +7,10 @@
 #define MOZILLA_GFX_FONTSRCURI_H
 
 #include "nsCOMPtr.h"
-#include "nsIURI.h"
 #include "PLDHashTable.h"
 
+class nsIURI;
+
 namespace mozilla {
 namespace net {
 class nsSimpleURI;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFontUtils.h firefox-85.0+build1/gfx/thebes/gfxFontUtils.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFontUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFontUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,20 +6,36 @@
 #ifndef GFX_FONT_UTILS_H
 #define GFX_FONT_UTILS_H
 
-#include "gfxFontVariations.h"
+#include <string.h>
+#include <algorithm>
+#include <new>
+#include <utility>
 #include "gfxPlatform.h"
-#include "nsComponentManagerUtils.h"
-#include "nsTArray.h"
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
-#include "mozilla/Encoding.h"
 #include "mozilla/EndianUtils.h"
-#include "mozilla/Likely.h"
+#include "mozilla/FontPropertyTypes.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/UniquePtr.h"
-
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nscore.h"
 #include "zlib.h"
-#include <algorithm>
+
+class PickleIterator;
+class gfxFontEntry;
+struct gfxFontVariationAxis;
+struct gfxFontVariationInstance;
+
+namespace mozilla {
+class Encoding;
+namespace gfx {
+struct DeviceColor;
+}
+}  // namespace mozilla
 
 /* Bug 341128 - w32api defines min/max which causes problems with <bitset> */
 #ifdef __MINGW32__
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFT2FontList.cpp firefox-85.0+build1/gfx/thebes/gfxFT2FontList.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxFT2FontList.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFT2FontList.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -45,6 +45,7 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIMemory.h"
+#include "nsMemory.h"
 #include "gfxFontConstants.h"
 
 #include "mozilla/EndianUtils.h"
@@ -419,7 +420,83 @@
   return rv;
 }
 
+hb_face_t* FT2FontEntry::CreateHBFace() const {
+  hb_face_t* result = nullptr;
+
+  if (mFilename[0] == '/') {
+    // An absolute path means a normal file in the filesystem, so we can use
+    // hb_blob_create_from_file to read it.
+    hb_blob_t* fileBlob = hb_blob_create_from_file(mFilename.get());
+    if (hb_blob_get_length(fileBlob) > 0) {
+      result = hb_face_create(fileBlob, mFTFontIndex);
+    }
+    hb_blob_destroy(fileBlob);
+  } else {
+    // A relative path means an omnijar resource, which we may need to
+    // decompress to a temporary buffer.
+    RefPtr<nsZipArchive> reader = Omnijar::GetReader(Omnijar::Type::GRE);
+    nsZipItem* item = reader->GetItem(mFilename.get());
+    MOZ_ASSERT(item, "failed to find zip entry");
+    if (item) {
+      // TODO(jfkthame):
+      // Check whether the item is compressed; if not, we could just get a
+      // pointer without needing to allocate a buffer and copy the data.
+      // (Currently this configuration isn't used for Gecko on Android.)
+      uint32_t length = item->RealSize();
+      uint8_t* buffer = static_cast<uint8_t*>(malloc(length));
+      if (buffer) {
+        nsZipCursor cursor(item, reader, buffer, length);
+        cursor.Copy(&length);
+        MOZ_ASSERT(length == item->RealSize(), "error reading font");
+        if (length == item->RealSize()) {
+          hb_blob_t* blob =
+              hb_blob_create((const char*)buffer, length,
+                             HB_MEMORY_MODE_READONLY, buffer, free);
+          result = hb_face_create(blob, mFTFontIndex);
+          hb_blob_destroy(blob);
+        }
+      }
+    }
+  }
+
+  return result;
+}
+
 bool FT2FontEntry::HasFontTable(uint32_t aTableTag) {
+  if (mAvailableTables.Count() > 0) {
+    return mAvailableTables.GetEntry(aTableTag);
+  }
+
+  // If we haven't created a FreeType face already, try to avoid that by
+  // reading the available table tags via harfbuzz and caching in a hashset.
+  if (!mFTFace && !mFilename.IsEmpty()) {
+    hb_face_t* face = CreateHBFace();
+    if (face) {
+      // Read table tags in batches; 32 should be enough for most fonts in a
+      // single operation.
+      const unsigned TAG_BUF_LENGTH = 32;
+      hb_tag_t tags[TAG_BUF_LENGTH];
+      unsigned int startOffset = 0;
+      unsigned int totalTables = 0;
+      do {
+        unsigned int count = TAG_BUF_LENGTH;
+        // Updates count to the number of table tags actually retrieved
+        totalTables = hb_face_get_table_tags(face, startOffset, &count, tags);
+        startOffset += count;
+        while (count-- > 0) {
+          mAvailableTables.PutEntry(tags[count]);
+        }
+      } while (startOffset < totalTables);
+      hb_face_destroy(face);
+    } else {
+      // Failed to create the HarfBuzz face! The font is probably broken.
+      // Put a dummy entry in mAvailableTables so that we don't bother
+      // re-trying here.
+      mAvailableTables.PutEntry(uint32_t(-1));
+    }
+    return mAvailableTables.GetEntry(aTableTag);
+  }
+
   RefPtr<SharedFTFace> face = GetFTFace();
   return gfxFT2FontEntryBase::FaceHasTable(face, aTableTag);
 }
@@ -443,47 +520,10 @@
   // If the FT_Face hasn't been instantiated, try to read table directly
   // via harfbuzz API to avoid expensive FT_Face creation.
   if (!mFTFace && !mFilename.IsEmpty()) {
-    hb_blob_t* result = nullptr;
-    if (mFilename[0] == '/') {
-      // An absolute path means a normal file in the filesystem, so we can use
-      // hb_blob_create_from_file to read it.
-      hb_blob_t* fileBlob = hb_blob_create_from_file(mFilename.get());
-      if (hb_blob_get_length(fileBlob) > 0) {
-        hb_face_t* face = hb_face_create(fileBlob, mFTFontIndex);
-        result = hb_face_reference_table(face, aTableTag);
-        hb_face_destroy(face);
-      }
-      hb_blob_destroy(fileBlob);
-    } else {
-      // A relative path means an omnijar resource, which we may need to
-      // decompress to a temporary buffer.
-      RefPtr<nsZipArchive> reader = Omnijar::GetReader(Omnijar::Type::GRE);
-      nsZipItem* item = reader->GetItem(mFilename.get());
-      MOZ_ASSERT(item, "failed to find zip entry");
-      if (item) {
-        // TODO(jfkthame):
-        // Check whether the item is compressed; if not, we could just get a
-        // pointer without needing to allocate a buffer and copy the data.
-        // (Currently this configuration isn't used for Gecko on Android.)
-        uint32_t length = item->RealSize();
-        uint8_t* buffer = static_cast<uint8_t*>(malloc(length));
-        if (buffer) {
-          nsZipCursor cursor(item, reader, buffer, length);
-          cursor.Copy(&length);
-          MOZ_ASSERT(length == item->RealSize(), "error reading font");
-          if (length == item->RealSize()) {
-            hb_blob_t* blob =
-                hb_blob_create((const char*)buffer, length,
-                               HB_MEMORY_MODE_READONLY, buffer, free);
-            hb_face_t* face = hb_face_create(blob, mFTFontIndex);
-            result = hb_face_reference_table(face, aTableTag);
-            hb_face_destroy(face);
-            hb_blob_destroy(blob);
-          }
-        }
-      }
-    }
-    if (result) {
+    hb_face_t* face = CreateHBFace();
+    if (face) {
+      hb_blob_t* result = hb_face_reference_table(face, aTableTag);
+      hb_face_destroy(face);
       return result;
     }
   }
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxFT2FontList.h firefox-85.0+build1/gfx/thebes/gfxFT2FontList.h
--- firefox-84.0.2+build1/gfx/thebes/gfxFT2FontList.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxFT2FontList.h	2021-01-18 19:58:11.000000000 +0000
@@ -80,6 +80,12 @@
 
   FT_MM_Var* GetMMVar() override;
 
+  // Get a harfbuzz face for this font, if possible. The caller is responsible
+  // to destroy the face when no longer needed.
+  // This may be a bit expensive, so avoid calling multiple times if the same
+  // face can be re-used for several purposes instead.
+  hb_face_t* CreateHBFace() const;
+
   /**
    * Append this face's metadata to aFaceList for storage in the FontNameCache
    * (for faster startup).
@@ -105,6 +111,8 @@
 
   mozilla::ThreadSafeWeakPtr<mozilla::gfx::UnscaledFontFreeType> mUnscaledFont;
 
+  nsTHashtable<nsUint32HashKey> mAvailableTables;
+
   bool mHasVariations = false;
   bool mHasVariationsInitialized = false;
   bool mMMVarInitialized = false;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxMacPlatformFontList.mm firefox-85.0+build1/gfx/thebes/gfxMacPlatformFontList.mm
--- firefox-84.0.2+build1/gfx/thebes/gfxMacPlatformFontList.mm	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxMacPlatformFontList.mm	2021-01-18 19:58:11.000000000 +0000
@@ -61,6 +61,7 @@
 #include "nsCharTraits.h"
 #include "nsCocoaFeatures.h"
 #include "nsCocoaUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
 
@@ -1555,10 +1556,9 @@
   aFontStyle.style =
       (traits & NSFontItalicTrait) ? FontSlantStyle::Italic() : FontSlantStyle::Normal();
   aFontStyle.weight = (traits & NSFontBoldTrait) ? FontWeight::Bold() : FontWeight::Normal();
-  aFontStyle.stretch =
-      (traits & NSFontExpandedTrait)
-          ? FontStretch::Expanded()
-          : (traits & NSFontCondensedTrait) ? FontStretch::Condensed() : FontStretch::Normal();
+  aFontStyle.stretch = (traits & NSFontExpandedTrait)    ? FontStretch::Expanded()
+                       : (traits & NSFontCondensedTrait) ? FontStretch::Condensed()
+                                                         : FontStretch::Normal();
   aFontStyle.size = [font pointSize];
   aFontStyle.systemFont = true;
 }
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxPlatform.cpp firefox-85.0+build1/gfx/thebes/gfxPlatform.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxPlatform.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxPlatform.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -39,10 +39,12 @@
 #include "mozilla/Services.h"
 #include "nsAppRunner.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "nsCSSProps.h"
 
 #include "gfxCrashReporterUtils.h"
 #include "gfxPlatform.h"
 
+#include "gfxBlur.h"
 #include "gfxEnv.h"
 #include "gfxTextRun.h"
 #include "gfxUserFontSet.h"
@@ -477,6 +479,8 @@
 
 gfxPlatform::gfxPlatform()
     : mHasVariationFontSupport(false),
+      mTotalPhysicalMemory(~0),
+      mTotalVirtualMemory(~0),
       mAzureCanvasBackendCollector(this, &gfxPlatform::GetAzureBackendInfo),
       mApzSupportCollector(this, &gfxPlatform::GetApzSupportInfo),
       mTilesInfoCollector(this, &gfxPlatform::GetTilesSupportInfo),
@@ -497,7 +501,16 @@
 
   InitBackendPrefs(GetBackendPrefs());
 
-  mTotalSystemMemory = PR_GetPhysicalMemorySize();
+#ifdef XP_WIN
+  MEMORYSTATUSEX status;
+  status.dwLength = sizeof(status);
+  if (GlobalMemoryStatusEx(&status)) {
+    mTotalPhysicalMemory = status.ullTotalPhys;
+    mTotalVirtualMemory = status.ullTotalVirtual;
+  }
+#else
+  mTotalPhysicalMemory = PR_GetPhysicalMemorySize();
+#endif
 
   VRManager::ManagerInit();
 }
@@ -2882,6 +2895,11 @@
                        "WebGPU can only be enabled in nightly",
                        "WEBGPU_DISABLE_NON_NIGHTLY"_ns);
 #endif
+  if (!UseWebRender()) {
+    feature.ForceDisable(FeatureStatus::UnavailableNoWebRender,
+                         "WebGPU can't present without WebRender",
+                         "FEATURE_FAILURE_WEBGPU_NEED_WEBRENDER"_ns);
+  }
 }
 
 void gfxPlatform::InitOMTPConfig() {
@@ -2904,18 +2922,20 @@
                           Preferences::GetBool("layers.omtp.enabled", false,
                                                PrefValueKind::Default));
 
-  if (sizeof(void*) <= sizeof(uint32_t)) {
-    int32_t cpuCores = PR_GetNumberOfProcessors();
-    const uint64_t kMinSystemMemory = 2147483648;  // 2 GB
-    if (cpuCores <= 2) {
-      omtp.ForceDisable(FeatureStatus::Broken,
-                        "OMTP is not supported on 32-bit with <= 2 cores",
-                        "FEATURE_FAILURE_OMTP_32BIT_CORES"_ns);
-    } else if (mTotalSystemMemory < kMinSystemMemory) {
-      omtp.ForceDisable(FeatureStatus::Broken,
-                        "OMTP is not supported on 32-bit with < 2 GB RAM",
-                        "FEATURE_FAILURE_OMTP_32BIT_MEM"_ns);
-    }
+  int32_t cpuCores = PR_GetNumberOfProcessors();
+  const uint64_t kMinSystemMemory = 2147483648;  // 2 GB
+  if (cpuCores <= 2) {
+    omtp.ForceDisable(FeatureStatus::Broken,
+                      "OMTP is not supported with <= 2 cores",
+                      "FEATURE_FAILURE_OMTP_FEW_CORES"_ns);
+  } else if (mTotalPhysicalMemory < kMinSystemMemory) {
+    omtp.ForceDisable(FeatureStatus::Broken,
+                      "OMTP is not supported with < 2 GB RAM",
+                      "FEATURE_FAILURE_OMTP_LOW_PMEM"_ns);
+  } else if (mTotalVirtualMemory < kMinSystemMemory) {
+    omtp.ForceDisable(FeatureStatus::Broken,
+                      "OMTP is not supported with < 2 GB VMEM",
+                      "FEATURE_FAILURE_OMTP_LOW_VMEM"_ns);
   }
 
   if (mContentBackend == BackendType::CAIRO) {
@@ -3286,6 +3306,11 @@
 #ifdef MOZ_WIDGET_ANDROID
   return true;
 #else
+  // If Fission is enabled, OOP iframes require APZ for hittest.  So, we
+  // need to forcibly enable APZ in that case for avoiding users confused.
+  if (FissionAutostart()) {
+    return true;
+  }
   return StaticPrefs::
       layers_async_pan_zoom_enabled_AtStartup_DoNotUseDirectly();
 #endif
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxPlatformFontList.cpp firefox-85.0+build1/gfx/thebes/gfxPlatformFontList.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxPlatformFontList.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxPlatformFontList.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -495,7 +495,7 @@
     bool oldSharedList = mSharedFontList != nullptr;
     mSharedFontList.reset(new fontlist::FontList(mFontlistInitCount));
     InitSharedFontListForPlatform();
-    if (mSharedFontList->Initialized()) {
+    if (mSharedFontList && mSharedFontList->Initialized()) {
       if (mLocalNameTable.Count()) {
         SharedFontList()->SetLocalNames(mLocalNameTable);
         mLocalNameTable.Clear();
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxPlatformGtk.cpp firefox-85.0+build1/gfx/thebes/gfxPlatformGtk.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxPlatformGtk.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxPlatformGtk.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -32,6 +32,7 @@
 #include "mozilla/Monitor.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_layers.h"
+#include "nsIGfxInfo.h"
 #include "nsMathUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsUnicodeProperties.h"
@@ -110,8 +111,11 @@
   MOZ_RELEASE_ASSERT(gPlatformFTLibrary);
   Factory::SetFTLibrary(gPlatformFTLibrary);
 
-  g_signal_connect(gdk_screen_get_default(), "notify::resolution",
-                   G_CALLBACK(screen_resolution_changed), nullptr);
+  GdkScreen* gdkScreen = gdk_screen_get_default();
+  if (gdkScreen) {
+    g_signal_connect(gdkScreen, "notify::resolution",
+                     G_CALLBACK(screen_resolution_changed), nullptr);
+  }
 }
 
 gfxPlatformGtk::~gfxPlatformGtk() {
@@ -702,8 +706,13 @@
   // and fail silently.
   if (gfxConfig::IsEnabled(Feature::HW_COMPOSITING)) {
     bool useGlxVsync = false;
-    // Nvidia doesn't support GLX at the same time as EGL.
-    if (!gfxVars::UseEGL()) {
+
+    nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
+    nsString adapterDriverVendor;
+    gfxInfo->GetAdapterDriverVendor(adapterDriverVendor);
+
+    // Nvidia doesn't support GLX at the same time as EGL but Mesa does.
+    if (!gfxVars::UseEGL() || (adapterDriverVendor.Find("mesa") != -1)) {
       useGlxVsync = gl::sGLXLibrary.SupportsVideoSync();
     }
     if (useGlxVsync) {
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxPlatform.h firefox-85.0+build1/gfx/thebes/gfxPlatform.h
--- firefox-84.0.2+build1/gfx/thebes/gfxPlatform.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxPlatform.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,7 +7,6 @@
 #define GFX_PLATFORM_H
 
 #include "mozilla/FontPropertyTypes.h"
-#include "mozilla/Logging.h"
 #include "mozilla/gfx/Types.h"
 #include "nsTArray.h"
 #include "nsString.h"
@@ -15,9 +14,7 @@
 #include "nsUnicodeScriptCodes.h"
 
 #include "gfxTypes.h"
-#include "gfxBlur.h"
 #include "gfxSkipChars.h"
-#include "nsRect.h"
 
 #include "qcms.h"
 
@@ -25,6 +22,7 @@
 #include "GfxInfoCollector.h"
 
 #include "mozilla/layers/CompositorTypes.h"
+#include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/MemoryPressureObserver.h"
 
 class gfxASurface;
@@ -45,6 +43,7 @@
 
 namespace mozilla {
 class FontFamilyList;
+class LogModule;
 namespace layers {
 class FrameStats;
 }
@@ -147,16 +146,18 @@
 }
 
 enum class DeviceResetReason {
-  OK = 0,
-  HUNG,
-  REMOVED,
-  RESET,
-  DRIVER_ERROR,
-  INVALID_CALL,
+  OK = 0,        // No reset.
+  HUNG,          // Windows specific, guilty device reset.
+  REMOVED,       // Windows specific, device removed or driver upgraded.
+  RESET,         // Guilty device reset.
+  DRIVER_ERROR,  // Innocent device reset.
+  INVALID_CALL,  // Windows specific, guilty device reset.
   OUT_OF_MEMORY,
-  FORCED_RESET,
-  UNKNOWN,
-  D3D9_RESET
+  FORCED_RESET,  // Simulated device reset.
+  OTHER,         // Unrecognized reason for device reset.
+  D3D9_RESET,    // Windows specific, not used.
+  NVIDIA_VIDEO,  // Linux specific, NVIDIA video memory was reset.
+  UNKNOWN,       // GL specific, unknown if guilty or innocent.
 };
 
 enum class ForcedDeviceResetReason {
@@ -926,7 +927,8 @@
   // max number of entries in word cache
   int32_t mWordCacheMaxEntries;
 
-  uint64_t mTotalSystemMemory;
+  uint64_t mTotalPhysicalMemory;
+  uint64_t mTotalVirtualMemory;
 
   // Hardware vsync source. Only valid on parent process
   RefPtr<mozilla::gfx::VsyncSource> mVsyncSource;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxUserFontSet.cpp firefox-85.0+build1/gfx/thebes/gfxUserFontSet.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxUserFontSet.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxUserFontSet.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/Logging.h"
 
+#include "GeckoProfiler.h"
 #include "gfxUserFontSet.h"
 #include "gfxPlatform.h"
 #include "gfxFontConstants.h"
@@ -18,6 +19,7 @@
 #include "mozilla/ServoStyleSet.h"
 #include "mozilla/PostTraversalTask.h"
 #include "gfxOTSUtils.h"
+#include "nsIFontLoadCompleteCallback.h"
 
 using namespace mozilla;
 
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxUserFontSet.h firefox-85.0+build1/gfx/thebes/gfxUserFontSet.h
--- firefox-84.0.2+build1/gfx/thebes/gfxUserFontSet.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxUserFontSet.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,29 +6,53 @@
 #ifndef GFX_USER_FONT_SET_H
 #define GFX_USER_FONT_SET_H
 
+#include <new>
+#include "PLDHashTable.h"
 #include "gfxFontEntry.h"
-#include "gfxFontFamilyList.h"
-#include "gfxFontSrcPrincipal.h"
-#include "gfxFontSrcURI.h"
-#include "nsProxyRelease.h"
-#include "nsRefPtrHashtable.h"
+#include "gfxFontUtils.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/FontPropertyTypes.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
 #include "nsCOMPtr.h"
-#include "nsIFontLoadCompleteCallback.h"
+#include "nsHashKeys.h"
 #include "nsIMemoryReporter.h"
-#include "nsIRunnable.h"
+#include "nsIObserver.h"
 #include "nsIScriptError.h"
-#include "nsIReferrerInfo.h"
-#include "nsURIHashKey.h"
-#include "mozilla/FontPropertyTypes.h"
-#include "mozilla/ServoStyleConsts.h"
-#include "gfxFontConstants.h"
-#include "mozilla/LazyIdleThread.h"
-#include "mozilla/StaticPtr.h"
+#include "nsISupports.h"
+#include "nsRefPtrHashtable.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nscore.h"
+
+// Only needed for function bodies.
+#include <utility>                // for move, forward
+#include "MainThreadUtils.h"      // for NS_IsMainThread
+#include "gfxFontFeatures.h"      // for gfxFontFeature
+#include "gfxFontSrcPrincipal.h"  // for gfxFontSrcPrincipal
+#include "gfxFontSrcURI.h"        // for gfxFontSrcURI
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT_HELPER2, MOZ_ASSERT, MOZ_ASSERT_UNREACHABLE, MOZ_ASSER...
+#include "mozilla/HashFunctions.h"      // for HashBytes, HashGeneric
+#include "mozilla/TimeStamp.h"          // for TimeStamp
+#include "mozilla/gfx/FontVariation.h"  // for FontVariation
+#include "nsDebug.h"                    // for NS_WARNING
+#include "nsIReferrerInfo.h"            // for nsIReferrerInfo
 
 class gfxFont;
+class gfxUserFontSet;
+class nsIFontLoadCompleteCallback;
+class nsIRunnable;
+struct gfxFontStyle;
+struct gfxFontVariationAxis;
+struct gfxFontVariationInstance;
+template <class T>
+class nsMainThreadPtrHandle;
 
 namespace mozilla {
+class LogModule;
 class PostTraversalTask;
+enum class StyleFontDisplay : uint8_t;
 }  // namespace mozilla
 class nsFontFaceLoader;
 
@@ -239,7 +263,7 @@
       const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList, WeightRange aWeight,
       StretchRange aStretch, SlantStyleRange aStyle,
       const nsTArray<gfxFontFeature>& aFeatureSettings,
-      const nsTArray<gfxFontVariation>& aVariationSettings,
+      const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
       uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
       mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags) = 0;
 
@@ -250,7 +274,7 @@
       const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList, WeightRange aWeight,
       StretchRange aStretch, SlantStyleRange aStyle,
       const nsTArray<gfxFontFeature>& aFeatureSettings,
-      const nsTArray<gfxFontVariation>& aVariationSettings,
+      const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
       uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
       mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags);
 
@@ -433,10 +457,10 @@
       }
 
       static uint32_t HashVariations(
-          const nsTArray<gfxFontVariation>& aVariations) {
+          const nsTArray<mozilla::gfx::FontVariation>& aVariations) {
         return mozilla::HashBytes(
             aVariations.Elements(),
-            aVariations.Length() * sizeof(gfxFontVariation));
+            aVariations.Length() * sizeof(mozilla::gfx::FontVariation));
       }
 
       RefPtr<gfxFontSrcURI> mURI;
@@ -499,7 +523,7 @@
       const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList, WeightRange aWeight,
       StretchRange aStretch, SlantStyleRange aStyle,
       const nsTArray<gfxFontFeature>& aFeatureSettings,
-      const nsTArray<gfxFontVariation>& aVariationSettings,
+      const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
       uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
       mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags);
 
@@ -542,35 +566,32 @@
     STATUS_FAILED
   };
 
-  gfxUserFontEntry(gfxUserFontSet* aFontSet,
-                   const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList,
-                   WeightRange aWeight, StretchRange aStretch,
-                   SlantStyleRange aStyle,
-                   const nsTArray<gfxFontFeature>& aFeatureSettings,
-                   const nsTArray<gfxFontVariation>& aVariationSettings,
-                   uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
-                   mozilla::StyleFontDisplay aFontDisplay,
-                   RangeFlags aRangeFlags);
+  gfxUserFontEntry(
+      gfxUserFontSet* aFontSet,
+      const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList, WeightRange aWeight,
+      StretchRange aStretch, SlantStyleRange aStyle,
+      const nsTArray<gfxFontFeature>& aFeatureSettings,
+      const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
+      uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
+      mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags);
 
   virtual ~gfxUserFontEntry();
 
   // Update the attributes of the entry to the given values, without disturbing
   // the associated platform font entry or in-progress downloads.
-  void UpdateAttributes(WeightRange aWeight, StretchRange aStretch,
-                        SlantStyleRange aStyle,
-                        const nsTArray<gfxFontFeature>& aFeatureSettings,
-                        const nsTArray<gfxFontVariation>& aVariationSettings,
-                        uint32_t aLanguageOverride,
-                        gfxCharacterMap* aUnicodeRanges,
-                        mozilla::StyleFontDisplay aFontDisplay,
-                        RangeFlags aRangeFlags);
+  void UpdateAttributes(
+      WeightRange aWeight, StretchRange aStretch, SlantStyleRange aStyle,
+      const nsTArray<gfxFontFeature>& aFeatureSettings,
+      const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
+      uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
+      mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags);
 
   // Return whether the entry matches the given list of attributes
   bool Matches(const nsTArray<gfxFontFaceSrc>& aFontFaceSrcList,
                WeightRange aWeight, StretchRange aStretch,
                SlantStyleRange aStyle,
                const nsTArray<gfxFontFeature>& aFeatureSettings,
-               const nsTArray<gfxFontVariation>& aVariationSettings,
+               const nsTArray<mozilla::gfx::FontVariation>& aVariationSettings,
                uint32_t aLanguageOverride, gfxCharacterMap* aUnicodeRanges,
                mozilla::StyleFontDisplay aFontDisplay, RangeFlags aRangeFlags);
 
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxUtils.cpp firefox-85.0+build1/gfx/thebes/gfxUtils.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxUtils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxUtils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -421,7 +421,7 @@
                                     const SamplingFilter aSamplingFilter,
                                     const SurfaceFormat aFormat,
                                     gfxFloat aOpacity, ExtendMode aExtendMode) {
-  Size scaleFactor = aContext->CurrentMatrix().ScaleFactors(true);
+  Size scaleFactor = aContext->CurrentMatrix().ScaleFactors();
   Matrix scaleMatrix = Matrix::Scaling(scaleFactor.width, scaleFactor.height);
   const float fuzzFactor = 0.01;
 
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxUtils.h firefox-85.0+build1/gfx/thebes/gfxUtils.h
--- firefox-84.0.2+build1/gfx/thebes/gfxUtils.h	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,8 @@
 #ifndef GFX_UTILS_H
 #define GFX_UTILS_H
 
+#include "gfxMatrix.h"
+#include "gfxRect.h"
 #include "gfxTypes.h"
 #include "ImageTypes.h"
 #include "imgIContainer.h"
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxWindowsNativeDrawing.cpp firefox-85.0+build1/gfx/thebes/gfxWindowsNativeDrawing.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxWindowsNativeDrawing.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxWindowsNativeDrawing.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -134,7 +134,7 @@
                                    (int32_t)ceil(mNativeRect.Height() + 1));
       } else {
         // figure out the scale factors
-        mScale = m.ScaleFactors(true);
+        mScale = m.ScaleFactors();
 
         mWorldTransform.eM11 = (FLOAT)mScale.width;
         mWorldTransform.eM12 = 0.0f;
diff -Nru firefox-84.0.2+build1/gfx/thebes/gfxWindowsPlatform.cpp firefox-85.0+build1/gfx/thebes/gfxWindowsPlatform.cpp
--- firefox-84.0.2+build1/gfx/thebes/gfxWindowsPlatform.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/thebes/gfxWindowsPlatform.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 
+#include "gfxBlur.h"
 #include "gfxImageSurface.h"
 #include "gfxWindowsSurface.h"
 
@@ -1662,13 +1663,13 @@
           mVsyncEnabledLock("D3DVsyncEnabledLock"),
           mVsyncEnabled(false),
           mWaitVBlankMonitor(NULL),
-          mIsWindows10OrLater(false) {
+          mIsWindows8OrLater(false) {
       mVsyncThread = new base::Thread("WindowsVsyncThread");
       MOZ_RELEASE_ASSERT(mVsyncThread->Start(),
                          "GFX: Could not start Windows vsync thread");
       SetVsyncRate();
 
-      mIsWindows10OrLater = IsWin10OrLater();
+      mIsWindows8OrLater = IsWin8OrLater();
     }
 
     void SetVsyncRate() {
@@ -1840,7 +1841,7 @@
         }
 
         HRESULT hr = E_FAIL;
-        if (mIsWindows10OrLater &&
+        if (mIsWindows8OrLater &&
             !StaticPrefs::gfx_vsync_force_disable_waitforvblank()) {
           UpdateVBlankOutput();
           if (mWaitVBlankOutput) {
@@ -1936,7 +1937,7 @@
 
     HMONITOR mWaitVBlankMonitor;
     RefPtr<IDXGIOutput> mWaitVBlankOutput;
-    bool mIsWindows10OrLater;
+    bool mIsWindows8OrLater;
   };  // end d3dvsyncdisplay
 
   D3DVsyncSource() { mPrimaryDisplay = new D3DVsyncDisplay(); }
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/PVR.ipdl firefox-85.0+build1/gfx/vr/ipc/PVR.ipdl
--- firefox-84.0.2+build1/gfx/vr/ipc/PVR.ipdl	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/PVR.ipdl	2021-01-18 19:58:11.000000000 +0000
@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 using mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using mozilla::gfx::VRControllerType from "VRMessageUtils.h";
+using mozilla::gfx::VRControllerType from "moz_external_vr.h";
 using mozilla::dom::NativeThreadId from "mozilla/dom/NativeThreadId.h";
 include "VRMessageUtils.h";
 
@@ -13,8 +13,6 @@
 include PrefsTypes;
 include protocol PVRGPU;
 
-include "VRMessageUtils.h";
-
 namespace mozilla {
 namespace gfx {
 
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRGPUChild.cpp firefox-85.0+build1/gfx/vr/ipc/VRGPUChild.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRGPUChild.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRGPUChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "VRGPUChild.h"
 
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "VRManager.h"
 
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRGPUParent.cpp firefox-85.0+build1/gfx/vr/ipc/VRGPUParent.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRGPUParent.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRGPUParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "VRGPUParent.h"
 
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProcessChild.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRManagerChild.cpp firefox-85.0+build1/gfx/vr/ipc/VRManagerChild.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRManagerChild.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRManagerChild.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,11 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "VRManagerChild.h"
+
 #include "VRLayerChild.h"
 #include "VRManagerParent.h"
 #include "VRThread.h"
 #include "VRDisplayClient.h"
 #include "nsGlobalWindow.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/layers/CompositorThread.h"  // for CompositorThread
 #include "mozilla/dom/Navigator.h"
@@ -21,6 +23,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/GamepadManager.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/layers/SyncObject.h"
 #include "mozilla/layers/TextureForwarder.h"
 
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRManagerParent.cpp firefox-85.0+build1/gfx/vr/ipc/VRManagerParent.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRManagerParent.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRManagerParent.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "ipc/VRLayerParent.h"
 #include "mozilla/gfx/PVRManagerParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProtocolTypes.h"
 #include "mozilla/ipc/ProtocolUtils.h"  // for IToplevelProtocol
 #include "mozilla/TimeStamp.h"          // for TimeStamp
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRMessageUtils.h firefox-85.0+build1/gfx/vr/ipc/VRMessageUtils.h
--- firefox-84.0.2+build1/gfx/vr/ipc/VRMessageUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRMessageUtils.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_gfx_vr_VRMessageUtils_h
 #define mozilla_gfx_vr_VRMessageUtils_h
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/GfxMessageUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRProcessManager.cpp firefox-85.0+build1/gfx/vr/ipc/VRProcessManager.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRProcessManager.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRProcessManager.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "VRGPUChild.h"
 #include "VRGPUParent.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/MemoryReportingProcess.h"
 #include "mozilla/Preferences.h"
 
diff -Nru firefox-84.0.2+build1/gfx/vr/ipc/VRProcessParent.cpp firefox-85.0+build1/gfx/vr/ipc/VRProcessParent.cpp
--- firefox-84.0.2+build1/gfx/vr/ipc/VRProcessParent.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/ipc/VRProcessParent.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/MemoryReportRequest.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/GPUChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProtocolTypes.h"
 #include "mozilla/ipc/ProtocolUtils.h"  // for IToplevelProtocol
 #include "mozilla/StaticPrefs_dom.h"
diff -Nru firefox-84.0.2+build1/gfx/vr/service/OculusSession.cpp firefox-85.0+build1/gfx/vr/service/OculusSession.cpp
--- firefox-84.0.2+build1/gfx/vr/service/OculusSession.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/service/OculusSession.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/dom/GamepadEventTypes.h"
 #include "mozilla/dom/GamepadBinding.h"
 #include "mozilla/gfx/DeviceManagerDx.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/SharedLibrary.h"
 #include "OculusSession.h"
 
diff -Nru firefox-84.0.2+build1/gfx/vr/service/OpenVRSession.cpp firefox-85.0+build1/gfx/vr/service/OpenVRSession.cpp
--- firefox-84.0.2+build1/gfx/vr/service/OpenVRSession.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/service/OpenVRSession.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #include <fstream>
 #include "mozilla/JSONWriter.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "nsIThread.h"
 #include "nsString.h"
 
 #include "OpenVRSession.h"
diff -Nru firefox-84.0.2+build1/gfx/vr/service/VRSession.cpp firefox-85.0+build1/gfx/vr/service/VRSession.cpp
--- firefox-84.0.2+build1/gfx/vr/service/VRSession.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/service/VRSession.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -12,7 +12,11 @@
 #  include <d3d11.h>
 #endif  // defined(XP_WIN)
 
-#ifndef MOZILLA_INTERNAL_API
+#if defined(MOZILLA_INTERNAL_API)
+#  if defined(XP_WIN)
+#    include "mozilla/gfx/Logging.h"
+#  endif
+#else
 #  define NS_WARNING(s)
 #endif
 
diff -Nru firefox-84.0.2+build1/gfx/vr/VRDisplayClient.cpp firefox-85.0+build1/gfx/vr/VRDisplayClient.cpp
--- firefox-84.0.2+build1/gfx/vr/VRDisplayClient.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/VRDisplayClient.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/dom/XRInputSourceArray.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/WebXRBinding.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/gfx/vr/VRDisplayPresentation.cpp firefox-85.0+build1/gfx/vr/VRDisplayPresentation.cpp
--- firefox-84.0.2+build1/gfx/vr/VRDisplayPresentation.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/VRDisplayPresentation.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "VRDisplayPresentation.h"
 #include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/XRWebGLLayer.h"
 #include "mozilla/Unused.h"
 #include "VRDisplayClient.h"
diff -Nru firefox-84.0.2+build1/gfx/vr/VRManager.cpp firefox-85.0+build1/gfx/vr/VRManager.cpp
--- firefox-84.0.2+build1/gfx/vr/VRManager.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/VRManager.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "VRManager.h"
 
+#include "GeckoProfiler.h"
 #include "VRManagerParent.h"
 #include "VRShMem.h"
 #include "VRThread.h"
@@ -15,9 +16,12 @@
 #include "mozilla/dom/GamepadEventTypes.h"
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/CompositorThread.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
+#include "nsIObserverService.h"
 
 #include "gfxVR.h"
 #include <cstring>
diff -Nru firefox-84.0.2+build1/gfx/vr/VRManager.h firefox-85.0+build1/gfx/vr/VRManager.h
--- firefox-84.0.2+build1/gfx/vr/VRManager.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/vr/VRManager.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,10 +7,13 @@
 #ifndef GFX_VR_MANAGER_H
 #define GFX_VR_MANAGER_H
 
+#include "nsHashKeys.h"
 #include "nsIObserver.h"
 #include "nsTArray.h"
+#include "nsThreadUtils.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
+#include "mozilla/Monitor.h"
 #include "mozilla/TimeStamp.h"
 #include "gfxVR.h"
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/Cargo.lock firefox-85.0+build1/gfx/webrender_bindings/Cargo.lock
--- firefox-84.0.2+build1/gfx/webrender_bindings/Cargo.lock	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/Cargo.lock	2021-01-18 19:58:11.000000000 +0000
@@ -258,22 +258,12 @@
 
 [[package]]
 name = "cstr"
-version = "0.1.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19f7a08ed4ecd7e077d4cee63937473e6f7cf57b702a9114ef41751b2cbc0f60"
+checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
 dependencies = [
- "cstr-macros",
- "procedural-masquerade",
-]
-
-[[package]]
-name = "cstr-macros"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
-dependencies = [
- "procedural-masquerade",
- "syn",
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -835,12 +825,6 @@
 ]
 
 [[package]]
-name = "procedural-masquerade"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0"
-
-[[package]]
 name = "quote"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/Cargo.toml firefox-85.0+build1/gfx/webrender_bindings/Cargo.toml
--- firefox-84.0.2+build1/gfx/webrender_bindings/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/Cargo.toml	2021-01-18 19:58:11.000000000 +0000
@@ -38,4 +38,4 @@
 core-foundation = "0.9"
 core-graphics = "0.22"
 foreign-types = "0.3.0"
-
+objc = "0.2"
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/DCLayerTree.cpp firefox-85.0+build1/gfx/webrender_bindings/DCLayerTree.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/DCLayerTree.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/DCLayerTree.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -9,6 +9,7 @@
 #include "GLContext.h"
 #include "GLContextEGL.h"
 #include "mozilla/gfx/DeviceManagerDx.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/webrender/RenderD3D11TextureHost.h"
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/DCLayerTree.h firefox-85.0+build1/gfx/webrender_bindings/DCLayerTree.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/DCLayerTree.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/DCLayerTree.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,9 +8,11 @@
 #define MOZILLA_GFX_DCLAYER_TREE_H
 
 #include <unordered_map>
+#include <vector>
 #include <windows.h>
 
 #include "GLTypes.h"
+#include "mozilla/HashFunctions.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorANGLE.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorANGLE.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorANGLE.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorANGLE.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -133,6 +133,10 @@
 }
 
 bool RenderCompositorANGLE::Initialize(nsACString& aError) {
+  // TODO(aosmond): This causes us to lose WebRender because it is unable to
+  // distinguish why we failed and retry once the reset is complete. This does
+  // appear to happen in the wild, so we really should try to do something
+  // differently here.
   if (RenderThread::Get()->IsHandlingDeviceReset()) {
     aError.Assign("RcANGLE(waiting device reset)"_ns);
     return false;
@@ -486,7 +490,8 @@
   if (RenderThread::Get()->SyncObjectNeeded() && mSyncObject) {
     if (!mSyncObject->Synchronize(/* aFallible */ true)) {
       // It's timeout or other error. Handle the device-reset here.
-      RenderThread::Get()->HandleDeviceReset("SyncObject", /* aNotify */ true);
+      RenderThread::Get()->HandleDeviceReset(
+          "SyncObject", nullptr, LOCAL_GL_UNKNOWN_CONTEXT_RESET_ARB);
       return false;
     }
   }
@@ -805,13 +810,29 @@
   return frameId;
 }
 
-bool RenderCompositorANGLE::IsContextLost() {
-  // XXX glGetGraphicsResetStatus sometimes did not work for detecting TDR.
-  // Then this function just uses GetDeviceRemovedReason().
-  if (mDevice->GetDeviceRemovedReason() != S_OK) {
-    return true;
+GLenum RenderCompositorANGLE::IsContextLost(bool aForce) {
+  // glGetGraphicsResetStatus does not always work to detect timeout detection
+  // and recovery (TDR). On Windows, ANGLE itself is just relying upon the same
+  // API, so we should not need to check it separately.
+  auto reason = mDevice->GetDeviceRemovedReason();
+  switch (reason) {
+    case S_OK:
+      return LOCAL_GL_NO_ERROR;
+    case DXGI_ERROR_DEVICE_REMOVED:
+    case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
+      NS_WARNING("Device reset due to system / different device");
+      return LOCAL_GL_INNOCENT_CONTEXT_RESET_ARB;
+    case DXGI_ERROR_DEVICE_HUNG:
+    case DXGI_ERROR_DEVICE_RESET:
+    case DXGI_ERROR_INVALID_CALL:
+      gfxCriticalError() << "Device reset due to WR device: "
+                         << gfx::hexa(reason);
+      return LOCAL_GL_GUILTY_CONTEXT_RESET_ARB;
+    default:
+      gfxCriticalError() << "Device reset with WR device unexpected reason: "
+                         << gfx::hexa(reason);
+      return LOCAL_GL_UNKNOWN_CONTEXT_RESET_ARB;
   }
-  return false;
 }
 
 bool RenderCompositorANGLE::UseCompositor() {
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorANGLE.h firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorANGLE.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorANGLE.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorANGLE.h	2021-01-18 19:58:11.000000000 +0000
@@ -67,7 +67,7 @@
 
   LayoutDeviceIntSize GetBufferSize() override;
 
-  bool IsContextLost() override;
+  GLenum IsContextLost(bool aForce) override;
 
   bool SurfaceOriginIsTopLeft() override { return true; }
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositor.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositor.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositor.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositor.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -186,16 +186,22 @@
 
 bool RenderCompositor::MakeCurrent() { return gl()->MakeCurrent(); }
 
-bool RenderCompositor::IsContextLost() {
-  if (!gl()) {
-    return false;
+GLenum RenderCompositor::IsContextLost(bool aForce) {
+  auto* glc = gl();
+  // GetGraphicsResetStatus may trigger an implicit MakeCurrent if robustness
+  // is not supported, so unless we are forcing, pass on the check.
+  if (!glc || (!aForce && !glc->IsSupported(gl::GLFeature::robustness))) {
+    return LOCAL_GL_NO_ERROR;
   }
-  auto resetStatus = gl()->fGetGraphicsResetStatus();
+  auto resetStatus = glc->fGetGraphicsResetStatus();
   switch (resetStatus) {
     case LOCAL_GL_NO_ERROR:
-      return false;
+      break;
     case LOCAL_GL_INNOCENT_CONTEXT_RESET_ARB:
+      NS_WARNING("Device reset due to system / different context");
+      break;
     case LOCAL_GL_PURGED_CONTEXT_RESET_NV:
+      NS_WARNING("Device reset due to NV video memory purged");
       break;
     case LOCAL_GL_GUILTY_CONTEXT_RESET_ARB:
       gfxCriticalError() << "Device reset due to WR context";
@@ -208,7 +214,7 @@
                          << gfx::hexa(resetStatus);
       break;
   }
-  return true;
+  return resetStatus;
 }
 
 }  // namespace wr
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorD3D11SWGL.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorD3D11SWGL.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorD3D11SWGL.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorD3D11SWGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -225,8 +225,9 @@
   mCompositor->GetDevice()->GetImmediateContext(getter_AddRefs(context));
 
   D3D11_MAPPED_SUBRESOURCE mappedSubresource;
-  DebugOnly<HRESULT> hr = context->Map(mCurrentTile.mStagingTexture, 0,
-                                       D3D11_MAP_WRITE, 0, &mappedSubresource);
+  DebugOnly<HRESULT> hr =
+      context->Map(mCurrentTile.mStagingTexture, 0, D3D11_MAP_READ_WRITE, 0,
+                   &mappedSubresource);
   MOZ_ASSERT(SUCCEEDED(hr));
 
   // aData is expected to contain a pointer to the first pixel within the valid
@@ -304,12 +305,7 @@
   RefPtr<DataTextureSourceD3D11> source = new DataTextureSourceD3D11(
       mCompositor->GetDevice(), gfx::SurfaceFormat::B8G8R8A8, texture);
 
-  // We need to pad our tile textures by 16 bytes since SWGL can read up
-  // to 3 pixels past the end. We don't control the allocation size, so
-  // add an extra row instead.
-  desc.Height += 1;
-
-  desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+  desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ;
   desc.Usage = D3D11_USAGE_STAGING;
   desc.BindFlags = 0;
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorEGL.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorEGL.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorEGL.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorEGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -10,6 +10,7 @@
 #include "GLContextEGL.h"
 #include "GLContextProvider.h"
 #include "GLLibraryEGL.h"
+#include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/BuildConstants.h"
 #include "mozilla/webrender/RenderThread.h"
@@ -244,7 +245,11 @@
 }
 
 size_t RenderCompositorEGL::GetBufferAge() const {
-  return gl::GLContextEGL::Cast(gl())->GetBufferAge();
+  if (!StaticPrefs::
+          gfx_webrender_allow_partial_present_buffer_age_AtStartup()) {
+    return 0;
+  }
+  return gl()->GetBufferAge();
 }
 
 void RenderCompositorEGL::SetBufferDamageRegion(const wr::DeviceIntRect* aRects,
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositor.h firefox-85.0+build1/gfx/webrender_bindings/RenderCompositor.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositor.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositor.h	2021-01-18 19:58:12.000000000 +0000
@@ -101,7 +101,7 @@
 
   layers::SyncObjectHost* GetSyncObject() const { return mSyncObject.get(); }
 
-  virtual bool IsContextLost();
+  virtual GLenum IsContextLost(bool aForce);
 
   virtual bool SupportAsyncScreenshot() { return true; }
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorNative.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorNative.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorNative.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorNative.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -12,15 +12,12 @@
 #include "GLContextProvider.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/CompositionRecorder.h"
+#include "mozilla/layers/NativeLayer.h"
 #include "mozilla/layers/SurfacePool.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/webrender/RenderThread.h"
 #include "mozilla/widget/CompositorWidget.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 namespace mozilla {
 namespace wr {
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorOGL.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorOGL.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorOGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -104,13 +104,13 @@
 }
 
 uint32_t RenderCompositorOGL::GetMaxPartialPresentRects() {
-  return mIsEGL ? gfx::gfxVars::WebRenderMaxPartialPresentRects() : 0;
+  return gfx::gfxVars::WebRenderMaxPartialPresentRects();
 }
 
 bool RenderCompositorOGL::RequestFullRender() { return false; }
 
 bool RenderCompositorOGL::UsePartialPresent() {
-  return mIsEGL && gfx::gfxVars::WebRenderMaxPartialPresentRects() > 0;
+  return gfx::gfxVars::WebRenderMaxPartialPresentRects() > 0;
 }
 
 bool RenderCompositorOGL::ShouldDrawPreviousPartialPresentRegions() {
@@ -118,10 +118,11 @@
 }
 
 size_t RenderCompositorOGL::GetBufferAge() const {
-  if (mIsEGL) {
-    return gl::GLContextEGL::Cast(gl())->GetBufferAge();
+  if (!StaticPrefs::
+          gfx_webrender_allow_partial_present_buffer_age_AtStartup()) {
+    return 0;
   }
-  return 0;
+  return gl()->GetBufferAge();
 }
 
 }  // namespace wr
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorSWGL.h firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorSWGL.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderCompositorSWGL.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderCompositorSWGL.h	2021-01-18 19:58:12.000000000 +0000
@@ -30,6 +30,8 @@
   void CancelFrame() override;
   RenderedFrameId EndFrame(const nsTArray<DeviceIntRect>& aDirtyRects) final;
 
+  bool UsePartialPresent() override { return true; }
+
   void Pause() override;
   bool Resume() override;
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -66,4 +66,9 @@
   mSurface->ReleaseTextures();
 }
 
+void RenderDMABUFTextureHost::ClearCachedResources() {
+  DeleteTextureHandle();
+  mGL = nullptr;
+}
+
 }  // namespace mozilla::wr
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.h firefox-85.0+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderDMABUFTextureHost.h	2021-01-18 19:58:12.000000000 +0000
@@ -26,6 +26,7 @@
   wr::WrExternalImage Lock(uint8_t aChannelIndex, gl::GLContext* aGL,
                            wr::ImageRendering aRendering) override;
   void Unlock() override;
+  void ClearCachedResources() override;
 
  private:
   virtual ~RenderDMABUFTextureHost();
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RendererOGL.cpp firefox-85.0+build1/gfx/webrender_bindings/RendererOGL.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RendererOGL.cpp	2021-01-06 11:23:08.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RendererOGL.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -137,11 +137,6 @@
   }
 }
 
-static void DoNotifyWebRenderContextPurge(
-    layers::CompositorBridgeParent* aBridge) {
-  aBridge->NotifyWebRenderContextPurge();
-}
-
 static void DoWebRenderDisableNativeCompositor(
     layers::CompositorBridgeParent* aBridge) {
   aBridge->NotifyWebRenderDisableNativeCompositor();
@@ -167,9 +162,7 @@
   // XXX set clear color if MOZ_WIDGET_ANDROID is defined.
 
   if (!mCompositor->BeginFrame()) {
-    if (mCompositor->IsContextLost()) {
-      RenderThread::Get()->HandleDeviceReset("BeginFrame", /* aNotify */ true);
-    }
+    CheckGraphicsResetStatus("BeginFrame", /* aForce */ true);
     mCompositor->GetWidget()->PostRender(&widgetContext);
     return RenderedFrameId();
   }
@@ -256,27 +249,18 @@
   return false;
 }
 
-void RendererOGL::CheckGraphicsResetStatus() {
-  if (!mCompositor || !mCompositor->gl()) {
-    return;
-  }
-
-  gl::GLContext* gl = mCompositor->gl();
-  if (gl->IsSupported(gl::GLFeature::robustness)) {
-    GLenum resetStatus = gl->fGetGraphicsResetStatus();
-    if (resetStatus == LOCAL_GL_PURGED_CONTEXT_RESET_NV) {
-      layers::CompositorThread()->Dispatch(
-          NewRunnableFunction("DoNotifyWebRenderContextPurgeRunnable",
-                              &DoNotifyWebRenderContextPurge, mBridge));
+void RendererOGL::CheckGraphicsResetStatus(const char* aCaller, bool aForce) {
+  if (mCompositor) {
+    auto reason = mCompositor->IsContextLost(aForce);
+    if (reason != LOCAL_GL_NO_ERROR) {
+      RenderThread::Get()->HandleDeviceReset(aCaller, mBridge, reason);
     }
   }
 }
 
 void RendererOGL::WaitForGPU() {
   if (!mCompositor->WaitForGPU()) {
-    if (mCompositor->IsContextLost()) {
-      RenderThread::Get()->HandleDeviceReset("WaitForGPU", /* aNotify */ true);
-    }
+    CheckGraphicsResetStatus("WaitForGPU", /* aForce */ true);
   }
 }
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RendererOGL.h firefox-85.0+build1/gfx/webrender_bindings/RendererOGL.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RendererOGL.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RendererOGL.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef MOZILLA_LAYERS_RENDEREROGL_H
 #define MOZILLA_LAYERS_RENDEREROGL_H
 
+#include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/layers/CompositorTypes.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/webrender/RenderThread.h"
@@ -103,7 +104,7 @@
   bool Resume();
 
   /// This can be called on the render thread only.
-  void CheckGraphicsResetStatus();
+  void CheckGraphicsResetStatus(const char* aCaller, bool aForce);
 
   layers::SyncObjectHost* GetSyncObject() const;
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RendererScreenshotGrabber.cpp firefox-85.0+build1/gfx/webrender_bindings/RendererScreenshotGrabber.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RendererScreenshotGrabber.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RendererScreenshotGrabber.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,8 @@
 
 #include "RendererOGL.h"
 
+#include "mozilla/gfx/2D.h"
+
 using mozilla::layers::ProfilerScreenshots;
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderTextureHost.h firefox-85.0+build1/gfx/webrender_bindings/RenderTextureHost.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderTextureHost.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderTextureHost.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,7 @@
 #define MOZILLA_GFX_RENDERTEXTUREHOST_H
 
 #include "GLConsts.h"
+#include "GLTypes.h"
 #include "nsISupportsImpl.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/layers/LayersSurfaces.h"
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderTextureHostSWGL.h firefox-85.0+build1/gfx/webrender_bindings/RenderTextureHostSWGL.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderTextureHostSWGL.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderTextureHostSWGL.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef MOZILLA_GFX_RENDERTEXTUREHOSTSWGL_H
 #define MOZILLA_GFX_RENDERTEXTUREHOSTSWGL_H
 
+#include "GLTypes.h"
 #include "RenderTextureHost.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderThread.cpp firefox-85.0+build1/gfx/webrender_bindings/RenderThread.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderThread.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderThread.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "base/task.h"
 #include "GeckoProfiler.h"
+#include "gfxPlatform.h"
 #include "GLContext.h"
 #include "RenderThread.h"
 #include "nsThreadUtils.h"
@@ -13,6 +14,7 @@
 #include "mozilla/layers/AsyncImagePipelineManager.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/GPUParent.h"
+#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorManagerParent.h"
@@ -439,6 +441,9 @@
     aBridge->GetWrBridge()->RecordFrame();
   }
 
+  aBridge->NotifyDidRender(aCompositeStartId, aCompositeStart, aRenderStart,
+                           aEnd, &aStats);
+
   for (const auto& epoch : aInfo->Raw().epochs) {
     aBridge->NotifyPipelineRendered(epoch.pipeline_id, epoch.epoch,
                                     aCompositeStartId, aCompositeStart,
@@ -491,7 +496,7 @@
     renderer->Update();
   }
   // Check graphics reset status even when rendering is skipped.
-  renderer->CheckGraphicsResetStatus();
+  renderer->CheckGraphicsResetStatus("PostUpdate", /* aForce */ false);
 
   TimeStamp end = TimeStamp::Now();
   RefPtr<const WebRenderPipelineInfo> info = renderer->FlushPipelineInfo();
@@ -787,20 +792,40 @@
   SharedGL();
 }
 
-void RenderThread::HandleDeviceReset(const char* aWhere, bool aNotify) {
+#ifndef XP_WIN
+static DeviceResetReason GLenumToResetReason(GLenum aReason) {
+  switch (aReason) {
+    case LOCAL_GL_NO_ERROR:
+      return DeviceResetReason::FORCED_RESET;
+    case LOCAL_GL_INNOCENT_CONTEXT_RESET_ARB:
+      return DeviceResetReason::DRIVER_ERROR;
+    case LOCAL_GL_PURGED_CONTEXT_RESET_NV:
+      return DeviceResetReason::NVIDIA_VIDEO;
+    case LOCAL_GL_GUILTY_CONTEXT_RESET_ARB:
+      return DeviceResetReason::RESET;
+    case LOCAL_GL_UNKNOWN_CONTEXT_RESET_ARB:
+      return DeviceResetReason::UNKNOWN;
+    case LOCAL_GL_OUT_OF_MEMORY:
+      return DeviceResetReason::OUT_OF_MEMORY;
+    default:
+      return DeviceResetReason::OTHER;
+  }
+}
+#endif
+
+void RenderThread::HandleDeviceReset(const char* aWhere,
+                                     layers::CompositorBridgeParent* aBridge,
+                                     GLenum aReason) {
   MOZ_ASSERT(IsInRenderThread());
 
   if (mHandlingDeviceReset) {
     return;
   }
 
-  if (aNotify) {
-    gfxCriticalNote << "GFX: RenderThread detected a device reset in "
-                    << aWhere;
-    if (XRE_IsGPUProcess()) {
-      gfx::GPUParent::GetSingleton()->NotifyDeviceReset();
-    }
-  }
+#ifndef XP_WIN
+  // On Windows, see DeviceManagerDx::MaybeResetAndReacquireDevices.
+  gfx::GPUProcessManager::RecordDeviceReset(GLenumToResetReason(aReason));
+#endif
 
   {
     MutexAutoLock lock(mRenderTextureMapLock);
@@ -810,9 +835,38 @@
     }
   }
 
-  mHandlingDeviceReset = true;
-  // All RenderCompositors will be destroyed by
-  // GPUChild::RecvNotifyDeviceReset()
+  // On some platforms (i.e. Linux), we may get a device reset just for purging
+  // video memory with NVIDIA devices, because the driver has edge cases it
+  // needs to clear all of it.
+  if (aReason == LOCAL_GL_PURGED_CONTEXT_RESET_NV) {
+    MOZ_ASSERT(aBridge);
+    layers::CompositorThread()->Dispatch(NewRunnableMethod(
+        "CompositorBridgeParent::NotifyWebRenderContextPurge", aBridge,
+        &layers::CompositorBridgeParent::NotifyWebRenderContextPurge));
+    return;
+  }
+
+  mHandlingDeviceReset = aReason != LOCAL_GL_NO_ERROR;
+  if (mHandlingDeviceReset) {
+    // All RenderCompositors will be destroyed by the GPUProcessManager in
+    // either OnRemoteProcessDeviceReset via the GPUChild, or
+    // OnInProcessDeviceReset here directly.
+    gfxCriticalNote << "GFX: RenderThread detected a device reset in "
+                    << aWhere;
+    if (XRE_IsGPUProcess()) {
+      gfx::GPUParent::GetSingleton()->NotifyDeviceReset();
+    } else {
+#ifndef XP_WIN
+      // FIXME(aosmond): Do we need to do this on Windows? nsWindow::OnPaint
+      // seems to do its own detection for the parent process.
+      bool guilty = aReason == LOCAL_GL_GUILTY_CONTEXT_RESET_ARB;
+      NS_DispatchToMainThread(NS_NewRunnableFunction(
+          "gfx::GPUProcessManager::OnInProcessDeviceReset", [guilty]() -> void {
+            gfx::GPUProcessManager::Get()->OnInProcessDeviceReset(guilty);
+          }));
+#endif
+    }
+  }
 }
 
 bool RenderThread::IsHandlingDeviceReset() {
@@ -829,7 +883,7 @@
     // When this function is called GPUProcessManager::SimulateDeviceReset()
     // already triggers destroying all CompositorSessions before re-creating
     // them.
-    HandleDeviceReset("SimulateDeviceReset", /* aNotify */ false);
+    HandleDeviceReset("SimulateDeviceReset", nullptr, LOCAL_GL_NO_ERROR);
   }
 }
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/RenderThread.h firefox-85.0+build1/gfx/webrender_bindings/RenderThread.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/RenderThread.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/RenderThread.h	2021-01-18 19:58:11.000000000 +0000
@@ -11,6 +11,7 @@
 #include "base/platform_thread.h"  // for PlatformThreadId
 #include "base/thread.h"           // for Thread
 #include "base/message_loop.h"
+#include "GLTypes.h"  // for GLenum
 #include "nsISupportsImpl.h"
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 #include "mozilla/gfx/Point.h"
@@ -33,6 +34,7 @@
 class GLContext;
 }  // namespace gl
 namespace layers {
+class CompositorBridgeParent;
 class SurfacePool;
 }  // namespace layers
 namespace wr {
@@ -265,7 +267,9 @@
   void ClearSharedSurfacePool();
 
   /// Can only be called from the render thread.
-  void HandleDeviceReset(const char* aWhere, bool aNotify);
+  void HandleDeviceReset(const char* aWhere,
+                         layers::CompositorBridgeParent* aBridge,
+                         GLenum aReason);
   /// Can only be called from the render thread.
   bool IsHandlingDeviceReset();
   /// Can be called from any thread.
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/src/bindings.rs firefox-85.0+build1/gfx/webrender_bindings/src/bindings.rs
--- firefox-84.0.2+build1/gfx/webrender_bindings/src/bindings.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/src/bindings.rs	2021-01-18 19:58:11.000000000 +0000
@@ -35,10 +35,10 @@
 use tracy_rs::register_thread_with_profiler;
 use webrender::{
     api::units::*, api::*, render_api::*, set_profiler_hooks, AsyncPropertySampler, AsyncScreenshotHandle, Compositor,
-    CompositorCapabilities, CompositorConfig, CompositorSurfaceTransform, DebugFlags, Device, FastHashMap,
-    NativeSurfaceId, NativeSurfaceInfo, NativeTileId, PartialPresentCompositor, PipelineInfo, ProfilerHooks,
-    RecordedFrameHandle, Renderer, RendererOptions, RendererStats, SceneBuilderHooks, ShaderPrecacheFlags, Shaders,
-    ThreadListener, UploadMethod, WrShaders, ONE_TIME_USAGE_HINT,
+    CompositorCapabilities, CompositorConfig, CompositorSurfaceTransform, DebugFlags, Device, NativeSurfaceId,
+    NativeSurfaceInfo, NativeTileId, PartialPresentCompositor, PipelineInfo, ProfilerHooks, RecordedFrameHandle,
+    Renderer, RendererOptions, RendererStats, SceneBuilderHooks, ShaderPrecacheFlags, Shaders, ThreadListener,
+    UploadMethod, WrShaders, ONE_TIME_USAGE_HINT,
 };
 use wr_malloc_size_of::MallocSizeOfOps;
 
@@ -214,7 +214,7 @@
         };
 
         DocumentHandle {
-            api: api,
+            api,
             document_id: doc,
             hit_tester_request,
             hit_tester,
@@ -331,7 +331,7 @@
         let len = slice.len();
         MutByteSlice {
             buffer: slice.as_mut_ptr(),
-            len: len,
+            len,
             _phantom: PhantomData,
         }
     }
@@ -558,7 +558,7 @@
         })
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
         unsafe {
             wr_notifier_wake_up(self.window_id);
         }
@@ -594,7 +594,7 @@
     renderer: &mut Renderer,
     external_image_handler: &mut WrExternalImageHandler,
 ) {
-    renderer.set_external_image_handler(Box::new(external_image_handler.clone()));
+    renderer.set_external_image_handler(Box::new(*external_image_handler));
 }
 
 #[no_mangle]
@@ -797,8 +797,6 @@
     }
 }
 
-type WrPipelineIdEpochs = ThinVec<WrPipelineIdAndEpoch>;
-
 #[repr(C)]
 pub struct WrRemovedPipeline {
     pipeline_id: WrPipelineId,
@@ -915,11 +913,7 @@
     // These callbacks are invoked from the render backend thread (aka the APZ
     // sampler thread)
     fn apz_register_sampler(window_id: WrWindowId);
-    fn apz_sample_transforms(
-        window_id: WrWindowId,
-        transaction: &mut Transaction,
-        epochs_being_rendered: &WrPipelineIdEpochs,
-    );
+    fn apz_sample_transforms(window_id: WrWindowId, generated_frame_id: *const u64, transaction: &mut Transaction);
     fn apz_deregister_sampler(window_id: WrWindowId);
 
     fn omta_register_sampler(window_id: WrWindowId);
@@ -1011,21 +1005,21 @@
         }
     }
 
-    fn sample(
-        &self,
-        _document_id: DocumentId,
-        epochs_being_rendered: &FastHashMap<PipelineId, Epoch>,
-    ) -> Vec<FrameMsg> {
+    fn sample(&self, _document_id: DocumentId, generated_frame_id: Option<u64>) -> Vec<FrameMsg> {
+        let generated_frame_id_value;
+        let generated_frame_id: *const u64 = match generated_frame_id {
+            Some(id) => {
+                generated_frame_id_value = id;
+                &generated_frame_id_value
+            }
+            None => ptr::null_mut(),
+        };
         let mut transaction = Transaction::new();
         unsafe {
             // XXX: When we implement scroll-linked animations, we will probably
             // need to call apz_sample_transforms prior to omta_sample.
             omta_sample(self.window_id, &mut transaction);
-            apz_sample_transforms(
-                self.window_id,
-                &mut transaction,
-                &epochs_being_rendered.iter().map(WrPipelineIdAndEpoch::from).collect(),
-            )
+            apz_sample_transforms(self.window_id, generated_frame_id, &mut transaction)
         };
         transaction.get_frame_ops()
     }
@@ -1193,7 +1187,6 @@
         use_optimized_shaders,
         upload_method,
         cached_programs,
-        false,
         true,
         true,
         None,
@@ -1480,7 +1473,7 @@
     let (gl, sw_gl) = if software {
         let ctx = swgl::Context::from(swgl_context);
         ctx.make_current();
-        (Rc::new(ctx.clone()) as Rc<dyn gl::Gl>, Some(ctx))
+        (Rc::new(ctx) as Rc<dyn gl::Gl>, Some(ctx))
     } else {
         (
             native_gl
@@ -1569,9 +1562,9 @@
         allow_texture_swizzling,
         blob_image_handler: Some(Box::new(Moz2dBlobImageHandler::new(
             workers.clone(),
-            workers_low_priority.clone(),
+            workers_low_priority,
         ))),
-        workers: Some(workers.clone()),
+        workers: Some(workers),
         thread_listener: Some(Box::new(GeckoProfilerThreadListener::new())),
         size_of_op: Some(size_of_op),
         enclosing_size_of_op: Some(enclosing_size_of_op),
@@ -1596,12 +1589,11 @@
         clear_color: Some(color),
         precache_flags,
         namespace_alloc_by_client: true,
-        allow_pixel_local_storage_support: false,
         // SWGL doesn't support the GL_ALWAYS depth comparison function used by
         // `clear_caches_with_quads`, but scissored clears work well.
         clear_caches_with_quads: !software && !allow_scissored_cache_clears,
         start_debug_server,
-        surface_origin_is_top_left: surface_origin_is_top_left,
+        surface_origin_is_top_left,
         compositor_config,
         enable_gpu_markers,
         panic_on_gl_error,
@@ -1613,7 +1605,7 @@
     set_profiler_hooks(Some(&PROFILER_HOOKS));
 
     let window_size = DeviceIntSize::new(window_width, window_height);
-    let notifier = Box::new(CppNotifier { window_id: window_id });
+    let notifier = Box::new(CppNotifier { window_id });
     let (renderer, sender) = match Renderer::new(gl, notifier, opts, shaders) {
         Ok((renderer, sender)) => (renderer, sender),
         Err(e) => {
@@ -1638,7 +1630,7 @@
     )));
     *out_renderer = Box::into_raw(Box::new(renderer));
 
-    return true;
+    true
 }
 
 #[no_mangle]
@@ -1825,8 +1817,8 @@
 }
 
 #[no_mangle]
-pub extern "C" fn wr_transaction_generate_frame(txn: &mut Transaction) {
-    txn.generate_frame();
+pub extern "C" fn wr_transaction_generate_frame(txn: &mut Transaction, id: u64) {
+    txn.generate_frame(id);
 }
 
 #[no_mangle]
@@ -1982,7 +1974,7 @@
         descriptor.into(),
         ImageData::External(ExternalImageData {
             id: external_image_id,
-            channel_index: channel_index,
+            channel_index,
             image_type: *image_type,
         }),
         None,
@@ -2147,7 +2139,7 @@
     } else if let Ok(storage_path) = env::var("MOZ_UPLOAD_DIR") {
         PathBuf::from(storage_path).join(local_dir)
     } else if let Some(storage_path) = dirs::home_dir() {
-        PathBuf::from(storage_path).join(local_dir)
+        storage_path.join(local_dir)
     } else {
         local_dir
     };
@@ -2322,13 +2314,13 @@
 impl WebRenderFrameBuilder {
     pub fn new(root_pipeline_id: WrPipelineId) -> WebRenderFrameBuilder {
         WebRenderFrameBuilder {
-            root_pipeline_id: root_pipeline_id,
+            root_pipeline_id,
             dl_builder: DisplayListBuilder::new(root_pipeline_id),
         }
     }
     pub fn with_capacity(root_pipeline_id: WrPipelineId, capacity: usize) -> WebRenderFrameBuilder {
         WebRenderFrameBuilder {
-            root_pipeline_id: root_pipeline_id,
+            root_pipeline_id,
             dl_builder: DisplayListBuilder::with_capacity(root_pipeline_id, capacity),
         }
     }
@@ -2344,7 +2336,7 @@
     assert!(unsafe { !is_in_render_thread() });
 
     let state = Box::new(WrState {
-        pipeline_id: pipeline_id,
+        pipeline_id,
         frame_builder: WebRenderFrameBuilder::with_capacity(pipeline_id, capacity),
     });
 
@@ -2424,7 +2416,7 @@
     debug_assert!(unsafe { !is_in_render_thread() });
 
     let c_filters = unsafe { make_slice(filters, filter_count) };
-    let mut filters: Vec<FilterOp> = c_filters.iter().map(|c_filter| c_filter.clone()).collect();
+    let mut filters: Vec<FilterOp> = c_filters.iter().copied().collect();
 
     let c_filter_datas = unsafe { make_slice(filter_datas, filter_datas_count) };
     let r_filter_datas: Vec<FilterData> = c_filter_datas
@@ -2443,7 +2435,7 @@
 
     let transform_ref = unsafe { transform.as_ref() };
     let mut transform_binding = match transform_ref {
-        Some(t) => Some(PropertyBinding::Value(t.clone())),
+        Some(t) => Some(PropertyBinding::Value(*t)),
         None => None,
     };
 
@@ -2881,7 +2873,7 @@
     debug_assert!(unsafe { !is_in_render_thread() });
 
     let c_filters = unsafe { make_slice(filters, filter_count) };
-    let filters: Vec<FilterOp> = c_filters.iter().map(|c_filter| c_filter.clone()).collect();
+    let filters: Vec<FilterOp> = c_filters.iter().copied().collect();
 
     let c_filter_datas = unsafe { make_slice(filter_datas, filter_datas_count) };
     let filter_datas: Vec<FilterData> = c_filter_datas
@@ -3252,7 +3244,7 @@
     state
         .frame_builder
         .dl_builder
-        .push_shadow(&parent.to_webrender(state.pipeline_id), shadow.into(), should_inflate);
+        .push_shadow(&parent.to_webrender(state.pipeline_id), shadow, should_inflate);
 }
 
 #[no_mangle]
@@ -3309,11 +3301,11 @@
     debug_assert!(unsafe { is_in_main_thread() });
 
     let border_details = BorderDetails::Normal(NormalBorder {
-        left: left.into(),
-        right: right.into(),
-        top: top.into(),
-        bottom: bottom.into(),
-        radius: radius.into(),
+        left,
+        right,
+        top,
+        bottom,
+        radius,
         do_aa: do_aa == AntialiasBorder::Yes,
     });
 
@@ -3404,12 +3396,10 @@
     let stops_slice = unsafe { make_slice(stops, stops_count) };
     let stops_vector = stops_slice.to_owned();
 
-    let gradient = state.frame_builder.dl_builder.create_gradient(
-        start_point.into(),
-        end_point.into(),
-        stops_vector,
-        extend_mode.into(),
-    );
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_gradient(start_point, end_point, stops_vector, extend_mode);
 
     let border_details = BorderDetails::NinePatch(NinePatchBorder {
         source: NinePatchBorderSource::Gradient(gradient),
@@ -3417,7 +3407,7 @@
         height,
         slice,
         fill,
-        outset: outset.into(),
+        outset,
         repeat_horizontal: RepeatMode::Stretch,
         repeat_vertical: RepeatMode::Stretch,
     });
@@ -3434,7 +3424,7 @@
     state
         .frame_builder
         .dl_builder
-        .push_border(&prim_info, rect, widths.into(), border_details);
+        .push_border(&prim_info, rect, widths, border_details);
 }
 
 #[no_mangle]
@@ -3465,12 +3455,10 @@
         widths.left as i32,
     );
 
-    let gradient = state.frame_builder.dl_builder.create_radial_gradient(
-        center.into(),
-        radius.into(),
-        stops_vector,
-        extend_mode.into(),
-    );
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_radial_gradient(center, radius, stops_vector, extend_mode);
 
     let border_details = BorderDetails::NinePatch(NinePatchBorder {
         source: NinePatchBorderSource::RadialGradient(gradient),
@@ -3478,7 +3466,7 @@
         height: rect.size.height as i32,
         slice,
         fill,
-        outset: outset.into(),
+        outset,
         repeat_horizontal: RepeatMode::Stretch,
         repeat_vertical: RepeatMode::Stretch,
     });
@@ -3495,7 +3483,7 @@
     state
         .frame_builder
         .dl_builder
-        .push_border(&prim_info, rect, widths.into(), border_details);
+        .push_border(&prim_info, rect, widths, border_details);
 }
 
 #[no_mangle]
@@ -3526,11 +3514,10 @@
         widths.left as i32,
     );
 
-    let gradient =
-        state
-            .frame_builder
-            .dl_builder
-            .create_conic_gradient(center.into(), angle, stops_vector, extend_mode.into());
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_conic_gradient(center, angle, stops_vector, extend_mode);
 
     let border_details = BorderDetails::NinePatch(NinePatchBorder {
         source: NinePatchBorderSource::ConicGradient(gradient),
@@ -3538,7 +3525,7 @@
         height: rect.size.height as i32,
         slice,
         fill,
-        outset: outset.into(),
+        outset,
         repeat_horizontal: RepeatMode::Stretch,
         repeat_vertical: RepeatMode::Stretch,
     });
@@ -3555,7 +3542,7 @@
     state
         .frame_builder
         .dl_builder
-        .push_border(&prim_info, rect, widths.into(), border_details);
+        .push_border(&prim_info, rect, widths, border_details);
 }
 
 #[no_mangle]
@@ -3578,12 +3565,10 @@
     let stops_slice = unsafe { make_slice(stops, stops_count) };
     let stops_vector = stops_slice.to_owned();
 
-    let gradient = state.frame_builder.dl_builder.create_gradient(
-        start_point.into(),
-        end_point.into(),
-        stops_vector,
-        extend_mode.into(),
-    );
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_gradient(start_point, end_point, stops_vector, extend_mode);
 
     let space_and_clip = parent.to_webrender(state.pipeline_id);
 
@@ -3597,7 +3582,7 @@
     state
         .frame_builder
         .dl_builder
-        .push_gradient(&prim_info, rect, gradient, tile_size.into(), tile_spacing.into());
+        .push_gradient(&prim_info, rect, gradient, tile_size, tile_spacing);
 }
 
 #[no_mangle]
@@ -3620,12 +3605,10 @@
     let stops_slice = unsafe { make_slice(stops, stops_count) };
     let stops_vector = stops_slice.to_owned();
 
-    let gradient = state.frame_builder.dl_builder.create_radial_gradient(
-        center.into(),
-        radius.into(),
-        stops_vector,
-        extend_mode.into(),
-    );
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_radial_gradient(center, radius, stops_vector, extend_mode);
 
     let space_and_clip = parent.to_webrender(state.pipeline_id);
 
@@ -3662,11 +3645,10 @@
     let stops_slice = unsafe { make_slice(stops, stops_count) };
     let stops_vector = stops_slice.to_owned();
 
-    let gradient =
-        state
-            .frame_builder
-            .dl_builder
-            .create_conic_gradient(center.into(), angle, stops_vector, extend_mode.into());
+    let gradient = state
+        .frame_builder
+        .dl_builder
+        .create_conic_gradient(center, angle, stops_vector, extend_mode);
 
     let space_and_clip = parent.to_webrender(state.pipeline_id);
 
@@ -3917,7 +3899,6 @@
 
     let opts = RendererOptions {
         precache_flags,
-        allow_pixel_local_storage_support: false,
         ..Default::default()
     };
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/src/moz2d_renderer.rs firefox-85.0+build1/gfx/webrender_bindings/src/moz2d_renderer.rs
--- firefox-84.0.2+build1/gfx/webrender_bindings/src/moz2d_renderer.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/src/moz2d_renderer.rs	2021-01-18 19:58:12.000000000 +0000
@@ -60,7 +60,7 @@
 }
 
 /// Debug prints a blob's metadata.
-fn dump_index(blob: &[u8]) -> () {
+fn dump_index(blob: &[u8]) {
     let mut index = BlobReader::new(blob);
     // we might get an empty result here because sub groups are not tightly bound
     // and we'll sometimes have display items that end up with empty bounds in
@@ -107,7 +107,7 @@
 impl<'a> BufReader<'a> {
     /// Creates a reader over the given input.
     fn new(buf: &'a [u8]) -> BufReader<'a> {
-        BufReader { buf: buf, pos: 0 }
+        BufReader { buf, pos: 0 }
     }
 
     /// Transmute-deserializes a value of type T from the stream.
@@ -565,7 +565,7 @@
         let _marker = GeckoProfilerMarker::new(b"BlobRasterization\0");
 
         let requests: Vec<Job> = requests
-            .into_iter()
+            .iter()
             .map(|params| {
                 let command = &self.blob_commands[&params.request.key];
                 let blob = Arc::clone(&command.data);
@@ -613,6 +613,15 @@
     }
 }
 
+// a cross platform wrapper that creates an autorelease pool
+// on macOS
+fn autoreleasepool<T, F: FnOnce() -> T>(f: F) -> T {
+    #[cfg(target_os = "macos")]
+    { objc::rc::autoreleasepool(f) }
+    #[cfg(not(target_os = "macos"))]
+    { f() }
+}
+
 fn rasterize_blob(job: Job) -> (BlobImageRequest, BlobImageResult) {
     let descriptor = job.descriptor;
     let buf_size =
@@ -626,7 +635,7 @@
     };
     assert!(descriptor.rect.size.width > 0 && descriptor.rect.size.height > 0);
 
-    let result = unsafe {
+    let result = autoreleasepool(|| { unsafe {
         if wr_moz2d_render_cb(
             ByteSlice::new(&job.commands[..]),
             descriptor.format,
@@ -650,7 +659,7 @@
         } else {
             panic!("Moz2D replay problem");
         }
-    };
+    }});
 
     (job.request, result)
 }
@@ -789,8 +798,8 @@
     pub fn new(workers: Arc<ThreadPool>, workers_low_priority: Arc<ThreadPool>) -> Self {
         Moz2dBlobImageHandler {
             blob_commands: HashMap::new(),
-            workers: workers,
-            workers_low_priority: workers_low_priority,
+            workers,
+            workers_low_priority,
             enable_multithreading: true,
         }
     }
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/src/program_cache.rs firefox-85.0+build1/gfx/webrender_bindings/src/program_cache.rs
--- firefox-84.0.2+build1/gfx/webrender_bindings/src/program_cache.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/src/program_cache.rs	2021-01-18 19:58:12.000000000 +0000
@@ -253,7 +253,7 @@
 
             let elapsed = start.elapsed();
             info!("Loaded shader in {:?}", elapsed);
-            let elapsed_ms = (elapsed.as_secs() * 1_000) + (elapsed.subsec_nanos() / 1_000_000) as u64;
+            let elapsed_ms = (elapsed.as_secs() * 1_000) + elapsed.subsec_millis() as u64;
 
             if elapsed_ms > MAX_LOAD_TIME_MS {
                 // Loading the startup shaders is taking too long, so bail out now.
@@ -322,7 +322,7 @@
 
         WrProgramCache {
             program_cache,
-            disk_cache: disk_cache,
+            disk_cache,
         }
     }
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/src/swgl_bindings.rs firefox-85.0+build1/gfx/webrender_bindings/src/swgl_bindings.rs
--- firefox-84.0.2+build1/gfx/webrender_bindings/src/swgl_bindings.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/src/swgl_bindings.rs	2021-01-18 19:58:11.000000000 +0000
@@ -10,7 +10,7 @@
 use std::os::raw::c_void;
 use std::ptr;
 use std::rc::Rc;
-use std::sync::atomic::{AtomicIsize, AtomicU32, AtomicU8, Ordering};
+use std::sync::atomic::{AtomicIsize, AtomicPtr, AtomicU32, AtomicU8, Ordering};
 use std::sync::{Arc, Condvar, Mutex, MutexGuard};
 use std::thread;
 use webrender::{
@@ -204,11 +204,10 @@
         // Offset the valid rect to the appropriate surface origin.
         let valid = self.valid_rect.translate(self.origin(surface).to_vector());
         // The destination rect is the valid rect transformed and then clipped.
-        let dest_rect = transform
-            .outer_transformed_rect(&valid.to_f32())?
-            .round_out()
-            .to_i32()
-            .intersection(clip_rect)?;
+        let dest_rect = transform.outer_transformed_rect(&valid.to_f32())?.round_out().to_i32();
+        if !dest_rect.intersects(clip_rect) {
+            return None;
+        }
         // To get a valid source rect, we need to inverse transform the clipped destination rect to find out the effect
         // of the clip rect in source-space. After this, we subtract off the source-space valid rect origin to get
         // a source rect that is now relative to the surface origin rather than absolute.
@@ -371,6 +370,7 @@
         viewport: &DeviceIntRect,
         dest: &DeviceIntRect,
         src: &DeviceIntRect,
+        _clip: &DeviceIntRect,
         surface: &SwSurface,
         tile: &SwTile,
         flip_y: bool,
@@ -443,6 +443,7 @@
     locked_dst: swgl::LockedResource,
     src_rect: DeviceIntRect,
     dst_rect: DeviceIntRect,
+    clipped_dst: DeviceIntRect,
     opaque: bool,
     flip_y: bool,
     filter: ImageRendering,
@@ -457,8 +458,13 @@
         // the following index.
         let band_index = band_index as i32;
         let num_bands = self.num_bands as i32;
-        let band_offset = (self.dst_rect.size.height * band_index) / num_bands;
-        let band_height = (self.dst_rect.size.height * (band_index + 1)) / num_bands - band_offset;
+        let band_offset = (self.clipped_dst.size.height * band_index) / num_bands;
+        let band_height = (self.clipped_dst.size.height * (band_index + 1)) / num_bands - band_offset;
+        // Create a rect that is the intersection of the band with the clipped dest
+        let band_clip = DeviceIntRect::new(
+            DeviceIntPoint::new(self.clipped_dst.origin.x, self.clipped_dst.origin.y + band_offset),
+            DeviceIntSize::new(self.clipped_dst.size.width, band_height),
+        );
         match self.locked_src {
             SwCompositeSource::BGRA(ref resource) => {
                 self.locked_dst.composite(
@@ -474,8 +480,10 @@
                     self.opaque,
                     self.flip_y,
                     image_rendering_to_gl_filter(self.filter),
-                    band_offset,
-                    band_height,
+                    band_clip.origin.x,
+                    band_clip.origin.y,
+                    band_clip.size.width,
+                    band_clip.size.height,
                 );
             }
             SwCompositeSource::YUV(ref y, ref u, ref v, color_space, color_depth) => {
@@ -500,8 +508,10 @@
                     self.dst_rect.size.width,
                     self.dst_rect.size.height,
                     self.flip_y,
-                    band_offset,
-                    band_height,
+                    band_clip.origin.x,
+                    band_clip.origin.y,
+                    band_clip.size.width,
+                    band_clip.size.height,
                 );
             }
         }
@@ -530,6 +540,10 @@
     fn get_mut(&self) -> &mut SwCompositeGraphNode {
         unsafe { &mut *self.0.get() }
     }
+
+    fn get_ptr_mut(&self) -> *mut SwCompositeGraphNode {
+        self.0.get()
+    }
 }
 
 unsafe impl Send for SwCompositeGraphNodeRef {}
@@ -615,9 +629,13 @@
         self.parents.fetch_sub(1, Ordering::SeqCst) <= 1
     }
 
-    fn take_band(&self) -> (u8, bool) {
+    fn take_band(&self) -> Option<u8> {
         let band_index = self.band_index.fetch_add(1, Ordering::SeqCst);
-        (band_index, band_index + 1 >= self.max_bands)
+        if band_index < self.max_bands {
+            Some(band_index)
+        } else {
+            None
+        }
     }
 
     /// Try to take the job from this node for processing and then process it within the current band.
@@ -643,7 +661,7 @@
                 if lock.is_none() {
                     lock = Some(thread.lock());
                 }
-                thread.send_job(lock.as_mut().unwrap(), child, false);
+                thread.send_job(lock.as_mut().unwrap(), child);
             }
         }
     }
@@ -655,12 +673,18 @@
 struct SwCompositeThread {
     /// Queue of available composite jobs
     jobs: Mutex<SwCompositeJobQueue>,
+    /// Cache of the current job being processed. This maintains a pointer to
+    /// the contents of the SwCompositeGraphNodeRef, which is safe due to the
+    /// fact that SwCompositor maintains a strong reference to the contents
+    /// in an SwTile to keep it alive while this is in use.
+    current_job: AtomicPtr<SwCompositeGraphNode>,
     /// Count of unprocessed jobs still in the queue
     job_count: AtomicIsize,
-    /// Condition signaled when there are jobs available to process.
+    /// Condition signaled when either there are jobs available to process or
+    /// there are no more jobs left to process. Otherwise stated, this signals
+    /// when the job queue transitions from an empty to non-empty state or from
+    /// a non-empty to empty state.
     jobs_available: Condvar,
-    /// Condition signaled when there are no more jobs left to process.
-    jobs_completed: Condvar,
 }
 
 /// The SwCompositeThread struct is shared between the SwComposite thread
@@ -679,9 +703,9 @@
     fn new() -> Arc<SwCompositeThread> {
         let info = Arc::new(SwCompositeThread {
             jobs: Mutex::new(SwCompositeJobQueue::new()),
+            current_job: AtomicPtr::new(ptr::null_mut()),
             job_count: AtomicIsize::new(0),
             jobs_available: Condvar::new(),
-            jobs_completed: Condvar::new(),
         });
         let result = info.clone();
         let thread_name = "SwComposite";
@@ -718,7 +742,7 @@
     /// Process a job contained in a dependency graph node received from the job queue.
     /// Any child dependencies will be unblocked as appropriate after processing. The
     /// job count will be updated to reflect this.
-    fn process_job(&self, mut graph_node: SwCompositeGraphNodeRef, band: u8) {
+    fn process_job(&self, graph_node: &mut SwCompositeGraphNode, band: u8) {
         // Do the actual processing of the job contained in this node.
         graph_node.process_job(band);
         // Unblock any child dependencies now that this job has been processed.
@@ -734,6 +758,7 @@
         locked_dst: swgl::LockedResource,
         src_rect: DeviceIntRect,
         dst_rect: DeviceIntRect,
+        clip_rect: DeviceIntRect,
         opaque: bool,
         flip_y: bool,
         filter: ImageRendering,
@@ -742,8 +767,13 @@
     ) {
         // For jobs that would span a sufficiently large destination rectangle, split
         // it into multiple horizontal bands so that multiple threads can process them.
-        let num_bands = if dst_rect.size.width >= 64 && dst_rect.size.height >= 64 {
-            (dst_rect.size.height / 64).min(4) as u8
+        let clipped_dst = match dst_rect.intersection(&clip_rect) {
+            Some(clipped_dst) => clipped_dst,
+            None => return,
+        };
+
+        let num_bands = if clipped_dst.size.width >= 64 && clipped_dst.size.height >= 64 {
+            (clipped_dst.size.height / 64).min(4) as u8
         } else {
             1
         };
@@ -752,6 +782,7 @@
             locked_dst,
             src_rect,
             dst_rect,
+            clipped_dst,
             opaque,
             flip_y,
             filter,
@@ -759,7 +790,7 @@
         };
         self.job_count.fetch_add(num_bands as isize, Ordering::SeqCst);
         if graph_node.set_job(job, num_bands) {
-            self.send_job(job_queue, graph_node, true);
+            self.send_job(job_queue, graph_node);
         }
     }
 
@@ -776,46 +807,76 @@
     }
 
     /// Send a job to the composite thread by adding it to the job queue.
-    /// Optionally signal that this job has been added in case the queue
-    /// was empty and the SwComposite thread is waiting for jobs.
-    fn send_job(&self, queue: &mut SwCompositeJobQueue, job: SwCompositeGraphNodeRef, signal: bool) {
-        if signal && queue.is_empty() {
+    /// Signal that this job has been added in case the queue was empty and the
+    /// SwComposite thread is waiting for jobs.
+    fn send_job(&self, queue: &mut SwCompositeJobQueue, job: SwCompositeGraphNodeRef) {
+        if queue.is_empty() {
             self.jobs_available.notify_all();
         }
         queue.push_back(job);
     }
 
+    /// Try to get a band of work from the currently cached job when available.
+    /// If there is a job, but it has no available bands left, null out the job
+    /// so that other threads do not bother checking the job.
+    fn try_take_job(&self) -> Option<(&mut SwCompositeGraphNode, u8)> {
+        let current_job_ptr = self.current_job.load(Ordering::SeqCst);
+        if let Some(current_job) = unsafe { current_job_ptr.as_mut() } {
+            if let Some(band) = current_job.take_band() {
+                return Some((current_job, band));
+            }
+            self.current_job
+                .compare_and_swap(current_job_ptr, ptr::null_mut(), Ordering::Relaxed);
+        }
+        return None;
+    }
+
     /// Take a job from the queue. Optionally block waiting for jobs to become
     /// available if this is called from the SwComposite thread.
-    fn take_job(&self, wait: bool) -> Option<(SwCompositeGraphNodeRef, u8)> {
+    fn take_job(&self, wait: bool) -> Option<(&mut SwCompositeGraphNode, u8)> {
+        // First try checking the cached job outside the scope of the mutex.
+        // For jobs that have multiple bands, this allows us to avoid having
+        // to lock the mutex multiple times to check the job for each band.
+        if let Some((job, band)) = self.try_take_job() {
+            return Some((job, band));
+        }
         // Lock the job queue while checking for available jobs. The lock
         // won't be held while the job is processed later outside of this
         // function so that other threads can pull from the queue meanwhile.
         let mut jobs = self.lock();
-        if wait {
-            while jobs.is_empty() {
-                match self.job_count.load(Ordering::SeqCst) {
-                    // If waiting inside the SwCompositeThread and we completed all
-                    // available jobs, signal completion.
-                    0 => self.jobs_completed.notify_all(),
-                    // A negative job count signals to exit immediately.
-                    job_count if job_count < 0 => return None,
-                    _ => {}
-                }
-                // The SwCompositeThread needs to wait for jobs to become
-                // available to avoid busy waiting on the queue.
-                jobs = self.jobs_available.wait(jobs).unwrap();
+        loop {
+            // While inside the mutex, check the cached job again to see if it
+            // has been updated.
+            if let Some((job, band)) = self.try_take_job() {
+                return Some((job, band));
+            }
+            // If no cached job was available, try to take a job from the queue
+            // and install it as the current job.
+            if let Some(job) = jobs.pop_front() {
+                self.current_job.store(job.get_ptr_mut(), Ordering::SeqCst);
+                continue;
             }
-        }
-        // Look for a job at the front of the queue. If there is one, take the
-        // next unprocessed band from the job. If this was the last band in the
-        // job, then finally remove it from the queue.
-        if let Some(job) = jobs.front() {
-            let (band, done) = job.take_band();
-            let job = if done { jobs.pop_front().unwrap() } else { job.clone() };
-            Some((job, band))
-        } else {
-            None
+            // Otherwise, the job queue is currently empty. Depending on the
+            // value of the job count we may either wait for jobs to become
+            // available or exit.
+            match self.job_count.load(Ordering::SeqCst) {
+                // If we completed all available jobs, signal completion. If
+                // waiting inside the SwCompositeThread, then block waiting for
+                // more jobs to become available in a new frame. Otherwise,
+                // return immediately.
+                0 => {
+                    self.jobs_available.notify_all();
+                    if !wait {
+                        return None;
+                    }
+                }
+                // A negative job count signals to exit immediately.
+                job_count if job_count < 0 => return None,
+                _ => {}
+            }
+            // The SwCompositeThread needs to wait for jobs to become
+            // available to avoid busy waiting on the queue.
+            jobs = self.jobs_available.wait(jobs).unwrap();
         }
     }
 
@@ -846,12 +907,9 @@
         // If processing synchronously, just wait for the composite thread
         // to complete processing any in-flight jobs, then bail.
         let mut jobs = self.lock();
-        // Wake up the composite thread in case it is blocked waiting on a 0
-        // job count resulting from job stealing while it was blocked.
-        self.jobs_available.notify_all();
         // If the job count is non-zero here, then there are in-flight jobs.
         while self.job_count.load(Ordering::SeqCst) > 0 {
-            jobs = self.jobs_completed.wait(jobs).unwrap();
+            jobs = self.jobs_available.wait(jobs).unwrap();
         }
     }
 
@@ -907,6 +965,7 @@
         // Only create the SwComposite thread if we're neither using OpenGL composition nor a native
         // render compositor. Thus, we are compositing into the main software framebuffer, which in
         // that case benefits from compositing asynchronously while we are updating tiles.
+        assert!(native_gl.is_none() || compositor.is_none());
         let composite_thread = if native_gl.is_none() && compositor.is_none() {
             Some(SwCompositeThread::new())
         } else {
@@ -979,6 +1038,7 @@
     /// in composition.
     fn init_overlaps(
         &self,
+        overlap_id: &NativeSurfaceId,
         overlap_surface: &SwSurface,
         overlap_tile: &SwTile,
         overlap_transform: &CompositorSurfaceTransform,
@@ -992,6 +1052,11 @@
         // on its own future update.
         let mut overlaps = if overlap_tile.invalid.get() { 1 } else { 0 };
         for &(ref id, ref transform, ref clip_rect, _) in &self.frame_surfaces {
+            // We only want to consider surfaces that were added before the current one we're
+            // checking for overlaps. If we find that surface, then we're done.
+            if id == overlap_id {
+                break;
+            }
             // If the surface's clip rect doesn't overlap the tile's rect,
             // then there is no need to check any tiles within the surface.
             if !overlap_rect.intersects(clip_rect) {
@@ -1068,6 +1133,7 @@
                     framebuffer,
                     src_rect,
                     dst_rect,
+                    *clip_rect,
                     surface.is_opaque,
                     flip_y,
                     filter,
@@ -1092,7 +1158,7 @@
                     color_depth: ColorDepth::Color8,
                     size: DeviceIntSize::zero(),
                 };
-                assert!(surface.tiles.len() > 0);
+                assert!(!surface.tiles.is_empty());
                 let mut tile = &mut surface.tiles[0];
                 if unsafe { wr_swgl_lock_composite_surface(self.gl.into(), external_image, &mut info) } {
                     tile.valid_rect = DeviceIntRect::from_size(info.size);
@@ -1307,7 +1373,7 @@
                 native_gl.bind_buffer(gl::PIXEL_UNPACK_BUFFER, tile.pbo_id);
                 native_gl.buffer_data_untyped(
                     gl::PIXEL_UNPACK_BUFFER,
-                    surface.tile_size.area() as isize * 4 + 16,
+                    surface.tile_size.area() as isize * 4,
                     ptr::null(),
                     gl::DYNAMIC_DRAW,
                 );
@@ -1385,7 +1451,7 @@
                         buf = native_gl.map_buffer_range(
                             gl::PIXEL_UNPACK_BUFFER,
                             0,
-                            valid_rect.size.area() as isize * 4 + 16,
+                            valid_rect.size.area() as isize * 4,
                             gl::MAP_WRITE_BIT | gl::MAP_INVALIDATE_BUFFER_BIT,
                         ); // | gl::MAP_UNSYNCHRONIZED_BIT);
                         if buf != ptr::null_mut() {
@@ -1466,7 +1532,7 @@
                 assert!(stride % 4 == 0);
                 let buf = if tile.pbo_id != 0 {
                     native_gl.unmap_buffer(gl::PIXEL_UNPACK_BUFFER);
-                    0 as *mut c_void
+                    std::ptr::null_mut::<c_void>()
                 } else {
                     swbuf
                 };
@@ -1496,21 +1562,6 @@
                     native_gl.bind_buffer(gl::PIXEL_UNPACK_BUFFER, 0);
                 }
 
-                if let Some(compositor) = &mut self.compositor {
-                    let info = compositor.bind(id, tile.dirty_rect, tile.valid_rect);
-                    native_gl.bind_framebuffer(gl::DRAW_FRAMEBUFFER, info.fbo_id);
-
-                    let viewport = dirty.translate(info.origin.to_vector());
-                    let draw_tile = self.draw_tile.as_ref().unwrap();
-                    draw_tile.enable(&viewport);
-                    draw_tile.draw(&viewport, &viewport, &dirty, &surface, &tile, false, gl::LINEAR);
-                    draw_tile.disable();
-
-                    native_gl.bind_framebuffer(gl::DRAW_FRAMEBUFFER, 0);
-
-                    compositor.unbind();
-                }
-
                 native_gl.bind_texture(gl::TEXTURE_2D, 0);
             }
         }
@@ -1552,13 +1603,6 @@
                 self.late_surfaces.push((id, transform, clip_rect, filter));
                 return;
             }
-
-            // Compute overlap dependencies for the surface.
-            if let Some(surface) = self.surfaces.get(&id) {
-                for tile in &surface.tiles {
-                    self.init_overlaps(surface, tile, &transform, &clip_rect);
-                }
-            }
         }
 
         self.frame_surfaces.push((id, transform, clip_rect, filter));
@@ -1569,8 +1613,27 @@
     /// frame will not have overlap dependencies assigned and so must instead
     /// be added to the late_surfaces queue to be processed at the end of the
     /// frame.
-    fn start_compositing(&mut self, _dirty_rects: &[DeviceIntRect]) {
+    fn start_compositing(&mut self, dirty_rects: &[DeviceIntRect]) {
+        if dirty_rects.len() == 1 {
+            // Factor dirty rect into surface clip rects and discard surfaces that are
+            // entirely clipped out.
+            for &mut (ref _id, ref _transform, ref mut clip_rect, _filter) in &mut self.frame_surfaces {
+                *clip_rect = clip_rect.intersection(&dirty_rects[0]).unwrap_or_default();
+            }
+            self.frame_surfaces
+                .retain(|&(_, _, clip_rect, _)| !clip_rect.is_empty());
+        }
+
         if let Some(ref composite_thread) = self.composite_thread {
+            // Compute overlap dependencies for surfaces.
+            for &(ref id, ref transform, ref clip_rect, _filter) in &self.frame_surfaces {
+                if let Some(surface) = self.surfaces.get(id) {
+                    for tile in &surface.tiles {
+                        self.init_overlaps(id, surface, tile, transform, clip_rect);
+                    }
+                }
+            }
+
             composite_thread.start_compositing();
             // Issue any initial composite jobs for the SwComposite thread.
             let mut lock = composite_thread.lock();
@@ -1615,6 +1678,7 @@
                                 &viewport,
                                 &dst_rect,
                                 &src_rect,
+                                clip_rect,
                                 surface,
                                 tile,
                                 flip_y,
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderAPI.cpp firefox-85.0+build1/gfx/webrender_bindings/WebRenderAPI.cpp
--- firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderAPI.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/WebRenderAPI.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -252,8 +252,8 @@
   wr_transaction_clear_display_list(mTxn, aEpoch, aPipelineId);
 }
 
-void TransactionBuilder::GenerateFrame() {
-  wr_transaction_generate_frame(mTxn);
+void TransactionBuilder::GenerateFrame(const VsyncId& aVsyncId) {
+  wr_transaction_generate_frame(mTxn, aVsyncId.mId);
 }
 
 void TransactionBuilder::InvalidateRenderedFrame() {
@@ -1164,9 +1164,12 @@
   // - clips are not cached; borders are
   // - a simple border like this will be drawn as an image
   // - Processing lots of clips is not WebRender's strong point.
+  //
+  // Made the borders thicker than one half the width/height, to avoid
+  // little white dots at the center at some magnifications.
   wr::BorderSide side = {aColor, wr::BorderStyle::Solid};
-  float h = aBounds.size.width / 2;
-  float v = aBounds.size.height / 2;
+  float h = aBounds.size.width * 0.6f;
+  float v = aBounds.size.height * 0.6f;
   wr::LayoutSideOffsets widths = {v, h, v, h};
   wr::BorderRadius radii = {{h, v}, {h, v}, {h, v}, {h, v}};
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderAPI.h firefox-85.0+build1/gfx/webrender_bindings/WebRenderAPI.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderAPI.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/WebRenderAPI.h	2021-01-18 19:58:12.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/layers/ScrollableLayerGuid.h"
 #include "mozilla/layers/SyncObject.h"
 #include "mozilla/layers/CompositionRecorder.h"
+#include "mozilla/MozPromise.h"
 #include "mozilla/Range.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/webrender/webrender_ffi.h"
@@ -24,6 +25,7 @@
 #include "GLTypes.h"
 #include "Units.h"
 
+class gfxContext;
 class nsDisplayItem;
 class nsPaintedDisplayItem;
 class nsDisplayTransform;
@@ -43,6 +45,7 @@
 class DisplayItemCache;
 class WebRenderBridgeParent;
 class RenderRootStateManager;
+class StackingContextHelper;
 struct DisplayListData;
 }  // namespace layers
 
@@ -108,7 +111,7 @@
 
   void ClearDisplayList(Epoch aEpoch, wr::WrPipelineId aPipeline);
 
-  void GenerateFrame();
+  void GenerateFrame(const VsyncId& aVsyncId);
 
   void InvalidateRenderedFrame();
 
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/webrender_ffi.h firefox-85.0+build1/gfx/webrender_bindings/webrender_ffi.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/webrender_ffi.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/webrender_ffi.h	2021-01-18 19:58:11.000000000 +0000
@@ -91,9 +91,9 @@
 void apz_deregister_updater(mozilla::wr::WrWindowId aWindowId);
 
 void apz_register_sampler(mozilla::wr::WrWindowId aWindowId);
-void apz_sample_transforms(
-    mozilla::wr::WrWindowId aWindowId, mozilla::wr::Transaction* aTransaction,
-    const mozilla::wr::WrPipelineIdEpochs* aPipelineEpochs);
+void apz_sample_transforms(mozilla::wr::WrWindowId aWindowId,
+                           const uint64_t* aGeneratedFrameId,
+                           mozilla::wr::Transaction* aTransaction);
 void apz_deregister_sampler(mozilla::wr::WrWindowId aWindowId);
 
 void omta_register_sampler(mozilla::wr::WrWindowId aWindowId);
diff -Nru firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderTypes.h firefox-85.0+build1/gfx/webrender_bindings/WebRenderTypes.h
--- firefox-84.0.2+build1/gfx/webrender_bindings/WebRenderTypes.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/webrender_bindings/WebRenderTypes.h	2021-01-18 19:58:11.000000000 +0000
@@ -19,7 +19,6 @@
 #include "mozilla/PodOperations.h"
 #include "mozilla/Range.h"
 #include "mozilla/TypeTraits.h"
-#include "mozilla/Variant.h"
 #include "Units.h"
 
 namespace mozilla {
@@ -762,6 +761,7 @@
   RENDER,
   NEW_SURFACE,
   VIDEO_OVERLAY,
+  EXCESSIVE_RESETS,
 
   Sentinel /* this must be last for serialization purposes. */
 };
diff -Nru firefox-84.0.2+build1/gfx/wr/Cargo.lock firefox-85.0+build1/gfx/wr/Cargo.lock
--- firefox-84.0.2+build1/gfx/wr/Cargo.lock	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/Cargo.lock	2021-01-18 19:58:12.000000000 +0000
@@ -4,26 +4,29 @@
 name = "adler32"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 
 [[package]]
 name = "aho-corasick"
 version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "andrew"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "line_drawing",
+ "rusttype 0.7.9",
+ "walkdir",
+ "xdg",
+ "xml-rs",
 ]
 
 [[package]]
@@ -35,1076 +38,1189 @@
 name = "ansi_term"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "app_units"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc3ec9d4c47b25a5a9e5c848e053640331c7cedb1637434d75db68b79fee8a7f"
 dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits",
+ "serde",
 ]
 
 [[package]]
 name = "approx"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
 dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits",
 ]
 
 [[package]]
 name = "atty"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "autocfg"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
 [[package]]
 name = "backtrace"
 version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
 dependencies = [
- "backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys",
+ "cfg-if",
+ "libc",
+ "rustc-demangle",
 ]
 
 [[package]]
 name = "backtrace-sys"
 version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "libc",
 ]
 
 [[package]]
 name = "base64"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
 [[package]]
 name = "binary-space-partition"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff"
 
 [[package]]
 name = "bincode"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
 dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
+ "serde",
 ]
 
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
 [[package]]
 name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array",
 ]
 
 [[package]]
 name = "block-padding"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 dependencies = [
- "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools",
 ]
 
 [[package]]
 name = "build-parallel"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b5f8b148c1884e660514fb1205f36b595e96df4daac5ad526a23db44937de77"
 dependencies = [
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils",
+ "jobserver",
+ "num_cpus",
 ]
 
 [[package]]
 name = "byte-tools"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"
 
 [[package]]
 name = "byteorder"
 version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "bytes"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
 dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
+ "iovec",
 ]
 
 [[package]]
 name = "cc"
 version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 dependencies = [
- "jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jobserver",
 ]
 
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "cgl"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
 dependencies = [
- "gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.19",
+ "libc",
 ]
 
 [[package]]
 name = "chrono"
 version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
 dependencies = [
- "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num",
+ "time",
 ]
 
 [[package]]
 name = "clap"
 version = "2.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+ "yaml-rust 0.3.5",
 ]
 
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
 ]
 
 [[package]]
 name = "cmake"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
 ]
 
 [[package]]
 name = "cocoa"
 version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "block",
+ "core-foundation 0.6.4",
+ "core-graphics 0.17.3",
+ "foreign-types",
+ "libc",
+ "objc",
 ]
 
 [[package]]
 name = "compositor"
 version = "0.1.0"
 dependencies = [
- "compositor-windows 0.1.0",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.61.0",
+ "compositor-windows",
+ "gleam 0.13.1",
+ "webrender",
 ]
 
 [[package]]
 name = "compositor-windows"
 version = "0.1.0"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 dependencies = [
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.6.2",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
 dependencies = [
- "core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.7.0",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb"
 dependencies = [
- "core-foundation-sys 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.8.2",
+ "libc",
 ]
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
 
 [[package]]
 name = "core-graphics"
 version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "core-foundation 0.6.4",
+ "foreign-types",
+ "libc",
 ]
 
 [[package]]
 name = "core-graphics"
 version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics-types 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "core-foundation 0.9.0",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
 ]
 
 [[package]]
 name = "core-graphics-types"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "core-foundation 0.9.0",
+ "foreign-types",
+ "libc",
 ]
 
 [[package]]
 name = "core-text"
 version = "19.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
 dependencies = [
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.9.0",
+ "core-graphics 0.22.0",
+ "foreign-types",
+ "libc",
 ]
 
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 
 [[package]]
 name = "crossbeam-channel"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 dependencies = [
- "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "lazy_static",
+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
 version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "cfg-if",
+ "lazy_static",
 ]
 
 [[package]]
 name = "cstr"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cstr-macros 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cstr-macros"
-version = "0.1.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
 dependencies = [
- "procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
 ]
 
 [[package]]
 name = "deflate"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e5d2a2273fed52a7f947ee55b092c4057025d7a3e04e5ecdbd25d6c3fb1bd7"
 dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
+ "byteorder",
 ]
 
 [[package]]
 name = "derive_more"
 version = "0.99.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "syn",
 ]
 
 [[package]]
 name = "digest"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 dependencies = [
- "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array",
 ]
 
 [[package]]
 name = "direct-composition"
 version = "0.1.0"
 dependencies = [
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.61.0",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid",
+ "gleam 0.13.1",
+ "mozangle",
+ "webrender",
+ "winapi 0.3.8",
+ "winit",
 ]
 
 [[package]]
 name = "dlib"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
 dependencies = [
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libloading",
 ]
 
 [[package]]
 name = "downcast-rs"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
 
 [[package]]
 name = "dwrote"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
+ "serde",
+ "serde_derive",
+ "winapi 0.3.8",
+ "wio",
 ]
 
 [[package]]
 name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 
 [[package]]
 name = "env_logger"
 version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
 dependencies = [
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
 ]
 
 [[package]]
 name = "euclid"
 version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ab0e07e345fb061928646949fdf5fb888e5d75a57385e7f5856e45be289e745"
 dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits",
+ "serde",
 ]
 
 [[package]]
 name = "expat-sys"
 version = "2.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
 dependencies = [
- "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake",
+ "pkg-config",
 ]
 
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "font-loader"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52"
 dependencies = [
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation 0.9.0",
+ "core-text",
+ "libc",
+ "servo-fontconfig",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types-shared",
 ]
 
 [[package]]
 name = "foreign-types-shared"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "freetype"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
 dependencies = [
- "freetype-sys 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "freetype-sys",
+ "libc",
 ]
 
 [[package]]
 name = "freetype-sys"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
 dependencies = [
- "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "fuchsia-zircon-sys",
 ]
 
 [[package]]
 name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "fxhash"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
 ]
 
 [[package]]
 name = "generic-array"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 dependencies = [
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typenum",
 ]
 
 [[package]]
 name = "getrandom"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "wasi",
 ]
 
 [[package]]
 name = "gl_generator"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
 dependencies = [
- "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "khronos_api",
+ "log",
+ "xml-rs",
 ]
 
 [[package]]
 name = "gl_generator"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
 dependencies = [
- "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "khronos_api",
+ "log",
+ "xml-rs",
 ]
 
 [[package]]
 name = "gleam"
 version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
 ]
 
 [[package]]
 name = "gleam"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "992c40589d382354958af7c60910026ed4cc3c58751355db21a4c2fbef15727a"
 dependencies = [
- "gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.14.0",
 ]
 
 [[package]]
 name = "glsl"
 version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "766443890761b3c4edcce86cafaac97971b200662fbdd0446eb7c6b99b4401ea"
 dependencies = [
- "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom",
 ]
 
 [[package]]
 name = "glsl-to-cxx"
 version = "0.1.0"
 dependencies = [
- "glsl 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glsl",
 ]
 
 [[package]]
 name = "glslopt"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d225aa75dd999f71df957ded531f8a5df732d7f3fa5be13fe578ecd59e40df2"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
 ]
 
 [[package]]
 name = "glutin"
 version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
 dependencies = [
- "android_glue 0.2.3 (git+https://github.com/rust-windowing/android-rs-glue.git?rev=e3ac6edea5814e1faca0c31ea8fac6877cb929ea)",
- "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_emscripten_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_gles2_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_glx_sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_wgl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "android_glue",
+ "cgl",
+ "cocoa",
+ "core-foundation 0.6.4",
+ "core-graphics 0.17.3",
+ "glutin_egl_sys",
+ "glutin_emscripten_sys",
+ "glutin_gles2_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "lazy_static",
+ "libloading",
+ "objc",
+ "osmesa-sys",
+ "parking_lot",
+ "wayland-client",
+ "winapi 0.3.8",
+ "winit",
 ]
 
 [[package]]
 name = "glutin_egl_sys"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "glutin_emscripten_sys"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1"
 
 [[package]]
 name = "glutin_gles2_sys"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e853d96bebcb8e53e445225c3009758c6f5960d44f2543245f6f07b567dae0"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "objc",
 ]
 
 [[package]]
 name = "glutin_glx_sys"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c243de74d6cf5ea100c788826d2fb9319de315485dd4b310811a663b3809c3"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
+ "x11-dl",
 ]
 
 [[package]]
 name = "glutin_wgl_sys"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a93dba7ee3a0feeac0f437141ff25e71ce2066bcf1a706acab1559ffff94eb6a"
 dependencies = [
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.13.1",
 ]
 
 [[package]]
 name = "hermit-abi"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "httparse"
 version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 
 [[package]]
 name = "humantime"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 dependencies = [
- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error",
 ]
 
 [[package]]
 name = "idna"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
 name = "image"
 version = "0.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfc5483f8d5afd3653b38a196c52294dcb239c3e1a5bade1990353ea13bcf387"
 dependencies = [
- "bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "png 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytemuck",
+ "byteorder",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+ "png",
 ]
 
 [[package]]
 name = "inflate"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
 dependencies = [
- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32",
 ]
 
 [[package]]
 name = "iovec"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "itoa"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 
 [[package]]
 name = "jobserver"
 version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
 
 [[package]]
 name = "khronos_api"
 version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 
 [[package]]
 name = "libc"
 version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
 
 [[package]]
 name = "libloading"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "line_drawing"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
 dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits",
 ]
 
 [[package]]
 name = "linked-hash-map"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 
 [[package]]
 name = "lock_api"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
 dependencies = [
- "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard",
 ]
 
 [[package]]
 name = "log"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "malloc_size_of_derive"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "syn",
+ "synstructure",
 ]
 
 [[package]]
 name = "matches"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
 [[package]]
 name = "memchr"
 version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 
 [[package]]
 name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "memoffset"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
 ]
 
 [[package]]
 name = "minidl"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "647da2489d438eb707e9bcffe0e47fb6f3f355ed288120740fc1e614cfadb9e9"
 
 [[package]]
 name = "mio"
 version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
 ]
 
 [[package]]
 name = "mio-extras"
 version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell",
+ "log",
+ "mio",
+ "slab",
 ]
 
 [[package]]
 name = "miow"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
 ]
 
 [[package]]
 name = "mozangle"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77438925edbca894202489c32351b3cce7e0ab25ae7358af83824440ef5e8e2"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc",
+ "gl_generator 0.13.1",
+ "lazy_static",
+ "walkdir",
 ]
 
 [[package]]
 name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "libc",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "nix"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "cc",
+ "cfg-if",
+ "libc",
+ "void",
 ]
 
 [[package]]
 name = "nom"
 version = "5.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
 dependencies = [
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
+ "version_check",
 ]
 
 [[package]]
 name = "num"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 dependencies = [
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-integer",
+ "num-iter",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-integer"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
 version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "num-integer",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-rational"
 version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
+ "num-integer",
+ "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
 version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
 dependencies = [
- "hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
 ]
 
 [[package]]
 name = "objc"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 dependencies = [
- "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "malloc_buf",
 ]
 
 [[package]]
 name = "opaque-debug"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "ordered-float"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
 dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits",
 ]
 
 [[package]]
@@ -1116,1155 +1232,1020 @@
 name = "osmesa-sys"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
 dependencies = [
- "shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shared_library",
 ]
 
 [[package]]
 name = "parking_lot"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
- "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lock_api",
+ "parking_lot_core",
+ "rustc_version",
 ]
 
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "rustc_version",
+ "smallvec 0.6.13",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "peek-poke"
 version = "0.2.0"
 dependencies = [
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "peek-poke-derive 0.2.1",
+ "euclid",
+ "peek-poke-derive",
 ]
 
 [[package]]
 name = "peek-poke-derive"
 version = "0.2.1"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "syn",
+ "synstructure",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pkg-config"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 
 [[package]]
 name = "plane-split"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3f7075ec146b897b6e0faca47adeb7ed3d4f6eaa8145bf19db17311081b3f63"
 dependencies = [
- "binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "binary-space-partition",
+ "euclid",
+ "log",
+ "num-traits",
 ]
 
 [[package]]
 name = "png"
 version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "910f09135b1ed14bb16be445a8c23ddf0777eca485fbfc7cee00d81fecab158a"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "deflate 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "crc32fast",
+ "deflate",
+ "inflate",
 ]
 
 [[package]]
 name = "ppv-lite86"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0",
 ]
 
 [[package]]
 name = "proc-macro2"
 version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
 dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
-name = "procedural-masquerade"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
 name = "quick-error"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
 ]
 
 [[package]]
 name = "quote"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
 ]
 
 [[package]]
 name = "rand"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 dependencies = [
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng",
+ "libc",
+ "rand_core 0.3.1",
+ "rdrand",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rand"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core 0.5.1",
+ "rand_hc",
 ]
 
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 dependencies = [
- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom",
 ]
 
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
 name = "raw-window-handle"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
 name = "rayon"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 dependencies = [
- "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
 ]
 
 [[package]]
 name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "redox_syscall"
 version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 
 [[package]]
 name = "regex"
 version = "1.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
 dependencies = [
- "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
 version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 
 [[package]]
 name = "ron"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a58080b7bb83b2ea28c3b7a9a994fd5e310330b7c8ca5258d99b98128ecfe4"
 dependencies = [
- "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64",
+ "bitflags",
+ "serde",
 ]
 
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver",
 ]
 
 [[package]]
 name = "rusttype"
 version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
 dependencies = [
- "rusttype 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusttype 0.8.3",
 ]
 
 [[package]]
 name = "rusttype"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
 dependencies = [
- "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "approx",
+ "ordered-float",
+ "stb_truetype",
 ]
 
 [[package]]
 name = "ryu"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
 
 [[package]]
 name = "same-file"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
 version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
 dependencies = [
- "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
 version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae"
 dependencies = [
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
 [[package]]
 name = "serde_derive"
 version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
 version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9"
 dependencies = [
- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
 name = "servo-fontconfig"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-fontconfig-sys 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "servo-fontconfig-sys",
 ]
 
 [[package]]
 name = "servo-fontconfig-sys"
 version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
 dependencies = [
- "expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "freetype-sys 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "expat-sys",
+ "freetype-sys",
+ "pkg-config",
 ]
 
 [[package]]
 name = "sha-1"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
 dependencies = [
- "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "block-buffer",
+ "digest",
+ "fake-simd",
+ "opaque-debug",
 ]
 
 [[package]]
 name = "shared_library"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
 ]
 
 [[package]]
 name = "slab"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
 version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
 dependencies = [
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "smallvec"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a"
 dependencies = [
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde",
 ]
 
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
 dependencies = [
- "andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "andrew",
+ "bitflags",
+ "dlib",
+ "lazy_static",
+ "memmap",
+ "nix",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-protocols",
 ]
 
 [[package]]
 name = "stb_truetype"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
 ]
 
 [[package]]
 name = "strsim"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "svg_fmt"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
 [[package]]
 name = "swgl"
 version = "0.1.0"
 dependencies = [
- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glsl-to-cxx 0.1.0",
- "webrender_build 0.0.1",
+ "cc",
+ "gleam 0.13.1",
+ "glsl-to-cxx",
+ "webrender_build",
 ]
 
 [[package]]
 name = "syn"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "synstructure"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.10",
+ "quote 1.0.3",
+ "syn",
+ "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "termcolor"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 dependencies = [
- "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width",
 ]
 
 [[package]]
 name = "thread_local"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
 ]
 
 [[package]]
 name = "tileview"
 version = "0.1.0"
 dependencies = [
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.61.0",
- "webrender_api 0.61.0",
+ "euclid",
+ "ron",
+ "serde",
+ "webrender",
+ "webrender_api",
 ]
 
 [[package]]
 name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 dependencies = [
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
+ "redox_syscall",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "tracy-rs"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8"
 dependencies = [
- "minidl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "minidl",
 ]
 
 [[package]]
 name = "typenum"
 version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches",
 ]
 
 [[package]]
 name = "unicode-normalization"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 dependencies = [
- "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.3.0",
 ]
 
 [[package]]
 name = "unicode-width"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
 [[package]]
 name = "url"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
 dependencies = [
- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna",
+ "matches",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "uuid"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
 dependencies = [
- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.3",
 ]
 
 [[package]]
 name = "vec_map"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 
 [[package]]
 name = "version_check"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "walkdir"
 version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
- "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file",
+ "winapi 0.3.8",
+ "winapi-util",
 ]
 
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 
 [[package]]
 name = "wayland-client"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-commons"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
 dependencies = [
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-protocols"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-scanner"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
 dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30",
+ "quote 0.6.13",
+ "xml-rs",
 ]
 
 [[package]]
 name = "wayland-sys"
 version = "0.21.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 dependencies = [
- "dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dlib",
+ "lazy_static",
 ]
 
 [[package]]
 name = "webrender"
 version = "0.61.0"
 dependencies = [
- "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "build-parallel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cstr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "freetype 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glslopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "plane-split 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "png 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ron 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "svg_fmt 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracy-rs 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.61.0",
- "webrender_build 0.0.1",
- "wr_malloc_size_of 0.0.1",
- "ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64",
+ "bincode",
+ "bitflags",
+ "build-parallel",
+ "byteorder",
+ "cfg-if",
+ "core-foundation 0.9.0",
+ "core-graphics 0.22.0",
+ "core-text",
+ "cstr",
+ "derive_more",
+ "dwrote",
+ "euclid",
+ "freetype",
+ "fxhash",
+ "gleam 0.13.1",
+ "glslopt",
+ "image",
+ "lazy_static",
+ "libc",
+ "log",
+ "malloc_size_of_derive",
+ "mozangle",
+ "num-traits",
+ "objc 0.2.7",
+ "plane-split",
+ "png",
+ "rand 0.4.6",
+ "rayon",
+ "ron",
+ "serde",
+ "serde_json",
+ "smallvec 1.3.0",
+ "svg_fmt",
+ "time",
+ "tracy-rs",
+ "uuid",
+ "webrender_api",
+ "webrender_build",
+ "wr_malloc_size_of",
+ "ws",
 ]
 
 [[package]]
 name = "webrender-examples"
 version = "0.1.0"
 dependencies = [
- "app_units 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.61.0",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units",
+ "core-foundation 0.7.0",
+ "env_logger",
+ "euclid",
+ "gleam 0.13.1",
+ "glutin",
+ "rayon",
+ "webrender",
+ "winit",
 ]
 
 [[package]]
 name = "webrender_api"
 version = "0.61.0"
 dependencies = [
- "app_units 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "peek-poke 0.2.0",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "wr_malloc_size_of 0.0.1",
+ "app_units",
+ "bitflags",
+ "byteorder",
+ "core-foundation 0.9.0",
+ "core-graphics 0.22.0",
+ "crossbeam-channel",
+ "derive_more",
+ "euclid",
+ "malloc_size_of_derive",
+ "peek-poke",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "time",
+ "wr_malloc_size_of",
 ]
 
 [[package]]
 name = "webrender_build"
 version = "0.0.1"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "lazy_static",
+ "serde",
 ]
 
 [[package]]
 name = "winapi"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
 name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "winit"
 version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
 dependencies = [
- "android_glue 0.2.3 (git+https://github.com/rust-windowing/android-rs-glue.git?rev=e3ac6edea5814e1faca0c31ea8fac6877cb929ea)",
- "backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "android_glue",
+ "backtrace",
+ "bitflags",
+ "cocoa",
+ "core-foundation 0.6.4",
+ "core-graphics 0.17.3",
+ "lazy_static",
+ "libc",
+ "log",
+ "objc",
+ "parking_lot",
+ "percent-encoding",
+ "raw-window-handle",
+ "smithay-client-toolkit",
+ "wayland-client",
+ "winapi 0.3.8",
+ "x11-dl",
 ]
 
 [[package]]
 name = "wio"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
 dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "wr_malloc_size_of"
 version = "0.0.1"
 dependencies = [
- "app_units 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_units",
+ "euclid",
 ]
 
 [[package]]
 name = "wrench"
 version = "0.3.0"
 dependencies = [
- "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "dwrote 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "font-loader 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "osmesa-src 0.2.0 (git+https://github.com/servo/osmesa-src)",
- "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "swgl 0.1.0",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracy-rs 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.61.0",
- "winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64",
+ "chrono",
+ "clap",
+ "core-foundation 0.9.0",
+ "core-graphics 0.22.0",
+ "crossbeam",
+ "dwrote",
+ "env_logger",
+ "font-loader",
+ "gleam 0.13.1",
+ "glutin",
+ "image",
+ "log",
+ "mozangle",
+ "osmesa-src",
+ "osmesa-sys",
+ "semver",
+ "serde",
+ "serde_json",
+ "swgl",
+ "time",
+ "tracy-rs",
+ "webrender",
+ "winit",
+ "yaml-rust 0.4.3",
 ]
 
 [[package]]
 name = "ws"
 version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
 dependencies = [
- "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder",
+ "bytes",
+ "httparse",
+ "log",
+ "mio",
+ "mio-extras",
+ "rand 0.7.3",
+ "sha-1",
+ "slab",
+ "url",
 ]
 
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8",
+ "winapi-build",
 ]
 
 [[package]]
 name = "x11-dl"
 version = "2.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
 dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
+ "libc",
+ "maybe-uninit",
+ "pkg-config",
 ]
 
 [[package]]
 name = "xdg"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
 
 [[package]]
 name = "xml-rs"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23"
 
 [[package]]
 name = "yaml-rust"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
 
 [[package]]
 name = "yaml-rust"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
 dependencies = [
- "linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map",
 ]
-
-[metadata]
-"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
-"checksum andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
-"checksum android_glue 0.2.3 (git+https://github.com/rust-windowing/android-rs-glue.git?rev=e3ac6edea5814e1faca0c31ea8fac6877cb929ea)" = "<none>"
-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum app_units 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc3ec9d4c47b25a5a9e5c848e053640331c7cedb1637434d75db68b79fee8a7f"
-"checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum backtrace 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)" = "b1e692897359247cc6bb902933361652380af0f1b7651ae5c5013407f30e109e"
-"checksum backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
-"checksum base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-"checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff"
-"checksum bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-"checksum build-parallel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4b5f8b148c1884e660514fb1205f36b595e96df4daac5ad526a23db44937de77"
-"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-"checksum bytemuck 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431"
-"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
-"checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
-"checksum cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-"checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-"checksum core-foundation 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb"
-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-"checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-"checksum core-foundation-sys 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
-"checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
-"checksum core-graphics 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"
-"checksum core-graphics-types 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c"
-"checksum core-text 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-"checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
-"checksum crossbeam-channel 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6"
-"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-"checksum cstr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "19f7a08ed4ecd7e077d4cee63937473e6f7cf57b702a9114ef41751b2cbc0f60"
-"checksum cstr-macros 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
-"checksum deflate 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e5d2a2273fed52a7f947ee55b092c4057025d7a3e04e5ecdbd25d6c3fb1bd7"
-"checksum derive_more 0.99.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7"
-"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-"checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
-"checksum downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
-"checksum dwrote 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
-"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38"
-"checksum euclid 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ab0e07e345fb061928646949fdf5fb888e5d75a57385e7f5856e45be289e745"
-"checksum expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-"checksum font-loader 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52"
-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-"checksum freetype 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
-"checksum freetype-sys 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-"checksum gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
-"checksum gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-"checksum gleam 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "992c40589d382354958af7c60910026ed4cc3c58751355db21a4c2fbef15727a"
-"checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
-"checksum glsl 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "766443890761b3c4edcce86cafaac97971b200662fbdd0446eb7c6b99b4401ea"
-"checksum glslopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8d225aa75dd999f71df957ded531f8a5df732d7f3fa5be13fe578ecd59e40df2"
-"checksum glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
-"checksum glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
-"checksum glutin_emscripten_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1"
-"checksum glutin_gles2_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "07e853d96bebcb8e53e445225c3009758c6f5960d44f2543245f6f07b567dae0"
-"checksum glutin_glx_sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "08c243de74d6cf5ea100c788826d2fb9319de315485dd4b310811a663b3809c3"
-"checksum glutin_wgl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a93dba7ee3a0feeac0f437141ff25e71ce2066bcf1a706acab1559ffff94eb6a"
-"checksum hermit-abi 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
-"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-"checksum image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bfc5483f8d5afd3653b38a196c52294dcb239c3e1a5bade1990353ea13bcf387"
-"checksum inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
-"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
-"checksum jobserver 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
-"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-"checksum line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
-"checksum linked-hash-map 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
-"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-"checksum malloc_size_of_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b"
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
-"checksum minidl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "647da2489d438eb707e9bcffe0e47fb6f3f355ed288120740fc1e614cfadb9e9"
-"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
-"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b74826530a7c9fffbe28d27d0499433bd51f67b4f45d658ba23e62499307cc17"
-"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
-"checksum nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
-"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
-"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-"checksum num-iter 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
-"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
-"checksum objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
-"checksum osmesa-src 0.2.0 (git+https://github.com/servo/osmesa-src)" = "<none>"
-"checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-"checksum plane-split 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2211e7ccc9b6260779dd9bad59f7b10889d6361974623b9e405afd7e7e764654"
-"checksum png 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "910f09135b1ed14bb16be445a8c23ddf0777eca485fbfc7cee00d81fecab158a"
-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
-"checksum procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0"
-"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
-"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"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"
-"checksum raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211"
-"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
-"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
-"checksum ron 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a58080b7bb83b2ea28c3b7a9a994fd5e310330b7c8ca5258d99b98128ecfe4"
-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
-"checksum rusttype 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
-"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
-"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
-"checksum serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae"
-"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
-"checksum serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9"
-"checksum servo-fontconfig 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
-"checksum servo-fontconfig-sys 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
-"checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-"checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-"checksum smallvec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05720e22615919e4734f6a99ceae50d00226c3c5aca406e102ebc33298214e0a"
-"checksum smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
-"checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum svg_fmt 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
-"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tracy-rs 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8"
-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
-"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-"checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
-"checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
-"checksum wayland-protocols 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
-"checksum wayland-scanner 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
-"checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
-"checksum wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-"checksum ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94"
-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum x11-dl 2.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
-"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
-"checksum xml-rs 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23"
-"checksum yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
diff -Nru firefox-84.0.2+build1/gfx/wr/direct-composition/Cargo.toml firefox-85.0+build1/gfx/wr/direct-composition/Cargo.toml
--- firefox-84.0.2+build1/gfx/wr/direct-composition/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/direct-composition/Cargo.toml	2021-01-18 19:58:12.000000000 +0000
@@ -8,7 +8,7 @@
 [target.'cfg(windows)'.dependencies]
 euclid = "0.22"
 gleam = "0.13"
-mozangle = {version = "0.3.1", features = ["egl"]}
+mozangle = {version = "0.3.2", features = ["egl"]}
 webrender = {path = "../webrender"}
 winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]}
 winit = "0.19"
diff -Nru firefox-84.0.2+build1/gfx/wr/direct-composition/src/main_windows.rs firefox-85.0+build1/gfx/wr/direct-composition/src/main_windows.rs
--- firefox-84.0.2+build1/gfx/wr/direct-composition/src/main_windows.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/direct-composition/src/main_windows.rs	2021-01-18 19:58:12.000000000 +0000
@@ -169,7 +169,7 @@
             true,
         );
         transaction.set_root_pipeline(pipeline_id);
-        transaction.generate_frame();
+        transaction.generate_frame(0);
         self.api.send_transaction(self.document_id, transaction);
         rx.recv().unwrap();
         let renderer = self.renderer.as_mut().unwrap();
@@ -197,7 +197,7 @@
         Box::new(Clone::clone(self))
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
         self.tx.send(()).unwrap();
         let _ = self.events_proxy.wakeup();
     }
@@ -205,8 +205,8 @@
     fn new_frame_ready(&self,
                        _: api::DocumentId,
                        _: bool,
-                       _: bool,
+                       composite_needed: bool,
                        _: Option<u64>) {
-        self.wake_up();
+        self.wake_up(composite_needed);
     }
 }
diff -Nru firefox-84.0.2+build1/gfx/wr/example-compositor/compositor/src/main.rs firefox-85.0+build1/gfx/wr/example-compositor/compositor/src/main.rs
--- firefox-84.0.2+build1/gfx/wr/example-compositor/compositor/src/main.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/example-compositor/compositor/src/main.rs	2021-01-18 19:58:11.000000000 +0000
@@ -159,7 +159,7 @@
         })
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
     }
 
     fn new_frame_ready(&self,
@@ -417,7 +417,7 @@
         );
     }
 
-    txn.generate_frame();
+    txn.generate_frame(0);
     api.send_transaction(document_id, txn);
 
     // Tick the compositor (in this sample, we don't block on UI events)
@@ -464,7 +464,7 @@
                 }
             }
 
-            txn.generate_frame();
+            txn.generate_frame(0);
             api.send_transaction(document_id, txn);
             current_epoch.0 += 1;
             time += 0.001;
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/animation.rs firefox-85.0+build1/gfx/wr/examples/animation.rs
--- firefox-84.0.2+build1/gfx/wr/examples/animation.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/animation.rs	2021-01-18 19:58:11.000000000 +0000
@@ -195,7 +195,7 @@
                         colors: vec![],
                     },
                 );
-                txn.generate_frame();
+                txn.generate_frame(0);
                 api.send_transaction(document_id, txn);
             }
             _ => (),
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/basic.rs firefox-85.0+build1/gfx/wr/examples/basic.rs
--- firefox-84.0.2+build1/gfx/wr/examples/basic.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/basic.rs	2021-01-18 19:58:12.000000000 +0000
@@ -313,7 +313,7 @@
         }
 
         if !txn.is_empty() {
-            txn.generate_frame();
+            txn.generate_frame(0);
             api.send_transaction(document_id, txn);
         }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/common/boilerplate.rs firefox-85.0+build1/gfx/wr/examples/common/boilerplate.rs
--- firefox-84.0.2+build1/gfx/wr/examples/common/boilerplate.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/common/boilerplate.rs	2021-01-18 19:58:11.000000000 +0000
@@ -30,7 +30,7 @@
         })
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
         #[cfg(not(target_os = "android"))]
         let _ = self.events_proxy.wakeup();
     }
@@ -38,9 +38,9 @@
     fn new_frame_ready(&self,
                        _: DocumentId,
                        _scrolled: bool,
-                       _composite_needed: bool,
+                       composite_needed: bool,
                        _render_time: Option<u64>) {
-        self.wake_up();
+        self.wake_up(composite_needed);
     }
 }
 
@@ -215,7 +215,7 @@
         true,
     );
     txn.set_root_pipeline(pipeline_id);
-    txn.generate_frame();
+    txn.generate_frame(0);
     api.send_transaction(document_id, txn);
 
     println!("Entering event loop");
@@ -312,7 +312,7 @@
                 builder.finalize(),
                 true,
             );
-            txn.generate_frame();
+            txn.generate_frame(0);
         }
         api.send_transaction(document_id, txn);
 
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/document.rs firefox-85.0+build1/gfx/wr/examples/document.rs
--- firefox-84.0.2+build1/gfx/wr/examples/document.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/document.rs	2021-01-18 19:58:12.000000000 +0000
@@ -129,7 +129,7 @@
                 builder.finalize(),
                 true,
             );
-            txn.generate_frame();
+            txn.generate_frame(0);
             api.send_transaction(doc.id, txn);
         }
     }
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/image_resize.rs firefox-85.0+build1/gfx/wr/examples/image_resize.rs
--- firefox-84.0.2+build1/gfx/wr/examples/image_resize.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/image_resize.rs	2021-01-18 19:58:11.000000000 +0000
@@ -104,7 +104,7 @@
                     &DirtyRect::All,
                 );
                 let mut txn = Transaction::new();
-                txn.generate_frame();
+                txn.generate_frame(0);
                 api.send_transaction(document_id, txn);
             }
             _ => {}
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/multiwindow.rs firefox-85.0+build1/gfx/wr/examples/multiwindow.rs
--- firefox-84.0.2+build1/gfx/wr/examples/multiwindow.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/multiwindow.rs	2021-01-18 19:58:11.000000000 +0000
@@ -35,7 +35,7 @@
         })
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
         #[cfg(not(target_os = "android"))]
         let _ = self.events_proxy.wakeup();
     }
@@ -43,9 +43,9 @@
     fn new_frame_ready(&self,
                        _: DocumentId,
                        _scrolled: bool,
-                       _composite_needed: bool,
+                       composite_needed: bool,
                        _render_time: Option<u64>) {
-        self.wake_up();
+        self.wake_up(composite_needed);
     }
 }
 
@@ -285,7 +285,7 @@
             true,
         );
         txn.set_root_pipeline(self.pipeline_id);
-        txn.generate_frame();
+        txn.generate_frame(0);
         api.send_transaction(self.document_id, txn);
 
         renderer.update();
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/scrolling.rs firefox-85.0+build1/gfx/wr/examples/scrolling.rs
--- firefox-84.0.2+build1/gfx/wr/examples/scrolling.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/scrolling.rs	2021-01-18 19:58:12.000000000 +0000
@@ -182,11 +182,11 @@
                         ExternalScrollId(0, PipelineId::dummy()),
                         ScrollClamping::ToContentBounds,
                     );
-                    txn.generate_frame();
+                    txn.generate_frame(0);
                 }
                 if let Some(zoom) = zoom {
                     txn.set_pinch_zoom(ZoomFactor::new(zoom));
-                    txn.generate_frame();
+                    txn.generate_frame(0);
                 }
             }
             winit::WindowEvent::CursorMoved { position: LogicalPosition { x, y }, .. } => {
@@ -207,7 +207,7 @@
                     ScrollClamping::ToContentBounds,
                 );
 
-                txn.generate_frame();
+                txn.generate_frame(0);
             }
             winit::WindowEvent::MouseInput { .. } => {
                 let results = api.hit_test(
diff -Nru firefox-84.0.2+build1/gfx/wr/examples/yuv.rs firefox-85.0+build1/gfx/wr/examples/yuv.rs
--- firefox-84.0.2+build1/gfx/wr/examples/yuv.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/examples/yuv.rs	2021-01-18 19:58:11.000000000 +0000
@@ -114,7 +114,7 @@
                 id: ExternalImageId(0),
                 channel_index: 0,
                 image_type: ExternalImageType::TextureHandle(
-                    TextureTarget::Default,
+                    ImageBufferKind::Texture2D,
                 ),
             }),
             None,
@@ -126,7 +126,7 @@
                 id: ExternalImageId(1),
                 channel_index: 0,
                 image_type: ExternalImageType::TextureHandle(
-                    TextureTarget::Default,
+                    ImageBufferKind::Texture2D,
                 ),
             }),
             None,
@@ -138,7 +138,7 @@
                 id: ExternalImageId(2),
                 channel_index: 0,
                 image_type: ExternalImageType::TextureHandle(
-                    TextureTarget::Default,
+                    ImageBufferKind::Texture2D,
                 ),
             }),
             None,
@@ -150,7 +150,7 @@
                 id: ExternalImageId(3),
                 channel_index: 0,
                 image_type: ExternalImageType::TextureHandle(
-                    TextureTarget::Default,
+                    ImageBufferKind::Texture2D,
                 ),
             }),
             None,
diff -Nru firefox-84.0.2+build1/gfx/wr/glsl-to-cxx/README.md firefox-85.0+build1/gfx/wr/glsl-to-cxx/README.md
--- firefox-84.0.2+build1/gfx/wr/glsl-to-cxx/README.md	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/glsl-to-cxx/README.md	2021-01-18 19:58:12.000000000 +0000
@@ -2,7 +2,8 @@
 
 Translates GLSL to vectorized C++. Intended for use with WebRender software backend.
 
-== Architecture ==
+Architecture
+------------
 GLSL code is parsed by the glsl crate. In hir.rs we traverse the resulting AST
 and build a higher level representation by doing type checking and name
 resolution. The resulting hir tree is traversed by lib.rs to output C++ code.
diff -Nru firefox-84.0.2+build1/gfx/wr/glsl-to-cxx/src/hir.rs firefox-85.0+build1/gfx/wr/glsl-to-cxx/src/hir.rs
--- firefox-84.0.2+build1/gfx/wr/glsl-to-cxx/src/hir.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/glsl-to-cxx/src/hir.rs	2021-01-18 19:58:12.000000000 +0000
@@ -2922,6 +2922,13 @@
     );
     declare_function(
         state,
+        "bvec3",
+        Some("make_bvec3"),
+        Type::new(BVec3),
+        vec![Type::new(Bool)],
+    );
+    declare_function(
+        state,
         "bvec4",
         Some("make_bvec4"),
         Type::new(BVec4),
@@ -3337,6 +3344,9 @@
     declare_function(state, "pow", None, Type::new(Vec3), vec![Type::new(Vec3)]);
     declare_function(state, "pow", None, Type::new(Float), vec![Type::new(Float)]);
     declare_function(state, "exp", None, Type::new(Float), vec![Type::new(Float)]);
+    declare_function(state, "exp2", None, Type::new(Float), vec![Type::new(Float)]);
+    declare_function(state, "log", None, Type::new(Float), vec![Type::new(Float)]);
+    declare_function(state, "log2", None, Type::new(Float), vec![Type::new(Float)]);
     declare_function(
         state,
         "inversesqrt",
@@ -3449,6 +3459,13 @@
         Type::new(Float),
         vec![Type::new(Float)],
     );
+    declare_function(
+        state,
+        "fract",
+        None,
+        Type::new(Vec2),
+        vec![Type::new(Vec2)],
+    );
     declare_function(state, "mod", None, Type::new(Vec2), vec![Type::new(Vec2)]);
     declare_function(state, "mod", None, Type::new(Float), vec![Type::new(Float)]);
 
@@ -3743,6 +3760,60 @@
             vec![Type::new(*s), Type::new(Vec2), Type::new(Vec4), Type::new(Bool),
                  Type::new(Int), Type::new(Vec2), Type::new(Int)],
         );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int)],
+        );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int)],
+        );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int)],
+        );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearColorYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
+        );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearColorYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
+        );
+        declare_function(
+            state,
+            "swgl_commitTextureLinearColorYUV",
+            None,
+            Type::new(Void),
+            vec![Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(*s), Type::new(Vec2), Type::new(Int),
+                 Type::new(Int), Type::new(Int), Type::new(Float)],
+        );
     }
 
     TranslationUnit(tu.0.map(state, translate_external_declaration))
diff -Nru firefox-84.0.2+build1/gfx/wr/peek-poke/peek-poke-derive/src/lib.rs firefox-85.0+build1/gfx/wr/peek-poke/peek-poke-derive/src/lib.rs
--- firefox-84.0.2+build1/gfx/wr/peek-poke/peek-poke-derive/src/lib.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/peek-poke/peek-poke-derive/src/lib.rs	2021-01-18 19:58:12.000000000 +0000
@@ -43,10 +43,7 @@
 
 fn is_struct(s: &Structure) -> bool {
     // a single variant with no prefix is 'struct'
-    match &s.variants()[..] {
-        [v] if v.prefix.is_none() => true,
-        _ => false,
-    }
+    matches!(&s.variants()[..], [v] if v.prefix.is_none())
 }
 
 fn derive_max_size(s: &Structure) -> TokenStream {
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/composite.h firefox-85.0+build1/gfx/wr/swgl/src/composite.h
--- firefox-84.0.2+build1/gfx/wr/swgl/src/composite.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/composite.h	2021-01-18 19:58:12.000000000 +0000
@@ -2,33 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// Load a partial span > 0 and < 4 pixels.
-template <typename V, typename P>
-static ALWAYS_INLINE V partial_load_span(P* src, int span) {
-  return bit_cast<V>(
-      (span >= 2 ? combine(unaligned_load<V2<P>>(src),
-                           V2<P>{span > 2 ? unaligned_load<P>(src + 2) : 0, 0})
-                 : V4<P>{unaligned_load<P>(src), 0, 0, 0}));
-}
-
-// Store a partial span > 0 and < 4 pixels.
-template <typename V, typename P>
-static ALWAYS_INLINE void partial_store_span(P* dst, V src, int span) {
-  auto pixels = bit_cast<V4<P>>(src);
-  if (span >= 2) {
-    unaligned_store(dst, lowHalf(pixels));
-    if (span > 2) {
-      unaligned_store(dst + 2, pixels.z);
-    }
-  } else {
-    unaligned_store(dst, pixels.x);
-  }
-}
-
 template <typename P>
 static inline void scale_row(P* dst, int dstWidth, const P* src, int srcWidth,
-                             int span) {
-  int frac = 0;
+                             int span, int frac) {
   for (P* end = dst + span; dst < end; dst++) {
     *dst = *src;
     // Step source according to width ratio.
@@ -41,7 +17,7 @@
 static NO_INLINE void scale_blit(Texture& srctex, const IntRect& srcReq,
                                  int srcZ, Texture& dsttex,
                                  const IntRect& dstReq, int dstZ, bool invertY,
-                                 int bandOffset, int bandHeight) {
+                                 const IntRect& clipRect) {
   // Cache scaling ratios
   int srcWidth = srcReq.width();
   int srcHeight = srcReq.height();
@@ -55,8 +31,11 @@
       srcWidth, srcHeight, dstWidth, dstHeight, true);
   // Limit dest sampling bounds to overlap source bounds
   dstBounds.intersect(srcBounds);
-  // Check if sampling bounds are empty
-  if (dstBounds.is_empty()) {
+  // Compute the clipped bounds, relative to dstBounds.
+  IntRect clippedDest = dstBounds.intersection(clipRect);
+  clippedDest.offset(-dstBounds.x0, -dstBounds.y0);
+  // Check if clipped sampling bounds are empty
+  if (clippedDest.is_empty()) {
     return;
   }
   // Compute final source bounds from clamped dest sampling bounds
@@ -72,12 +51,16 @@
   if (invertY) {
     destStride = -destStride;
   }
-  int span = dstBounds.width();
-  int frac = srcHeight * bandOffset;
-  dest += destStride * bandOffset;
-  src += srcStride * (frac / dstHeight);
-  frac %= dstHeight;
-  for (int rows = min(dstBounds.height() - bandOffset, bandHeight); rows > 0;
+  int span = clippedDest.width();
+  int fracX = srcWidth * clippedDest.x0;
+  int fracY = srcHeight * clippedDest.y0;
+  dest += destStride * clippedDest.y0;
+  dest += bpp * clippedDest.x0;
+  src += srcStride * (fracY / dstHeight);
+  src += bpp * (fracX / dstWidth);
+  fracY %= dstHeight;
+  fracX %= dstWidth;
+  for (int rows = clippedDest.height(); rows > 0;
        rows--) {
     if (srcWidth == dstWidth) {
       // No scaling, so just do a fast copy.
@@ -86,13 +69,13 @@
       // Do scaling with different source and dest widths.
       switch (bpp) {
         case 1:
-          scale_row((uint8_t*)dest, dstWidth, (uint8_t*)src, srcWidth, span);
+          scale_row((uint8_t*)dest, dstWidth, (uint8_t*)src, srcWidth, span, fracX);
           break;
         case 2:
-          scale_row((uint16_t*)dest, dstWidth, (uint16_t*)src, srcWidth, span);
+          scale_row((uint16_t*)dest, dstWidth, (uint16_t*)src, srcWidth, span, fracX);
           break;
         case 4:
-          scale_row((uint32_t*)dest, dstWidth, (uint32_t*)src, srcWidth, span);
+          scale_row((uint32_t*)dest, dstWidth, (uint32_t*)src, srcWidth, span, fracX);
           break;
         default:
           assert(false);
@@ -101,7 +84,7 @@
     }
     dest += destStride;
     // Step source according to height ratio.
-    for (frac += srcHeight; frac >= dstHeight; frac -= dstHeight) {
+    for (fracY += srcHeight; fracY >= dstHeight; fracY -= dstHeight) {
       src += srcStride;
     }
   }
@@ -158,11 +141,12 @@
 static NO_INLINE void linear_blit(Texture& srctex, const IntRect& srcReq,
                                   int srcZ, Texture& dsttex,
                                   const IntRect& dstReq, int dstZ, bool invertY,
-                                  int bandOffset, int bandHeight) {
+                                  const IntRect& clipRect) {
   assert(srctex.internal_format == GL_RGBA8 ||
          srctex.internal_format == GL_R8 || srctex.internal_format == GL_RG8);
   // Compute valid dest bounds
   IntRect dstBounds = dsttex.sample_bounds(dstReq, invertY);
+  dstBounds.intersect(clipRect);
   // Check if sampling bounds are empty
   if (dstBounds.is_empty()) {
     return;
@@ -190,10 +174,8 @@
   if (invertY) {
     destStride = -destStride;
   }
-  dest += destStride * bandOffset;
-  srcUV.y += srcDUV.y * bandOffset;
   int span = dstBounds.width();
-  for (int rows = min(dstBounds.height() - bandOffset, bandHeight); rows > 0;
+  for (int rows = dstBounds.height(); rows > 0;
        rows--) {
     switch (bpp) {
       case 1:
@@ -240,12 +222,12 @@
 
 static NO_INLINE void linear_composite(Texture& srctex, const IntRect& srcReq,
                                        Texture& dsttex, const IntRect& dstReq,
-                                       bool invertY, int bandOffset,
-                                       int bandHeight) {
+                                       bool invertY, const IntRect& clipRect) {
   assert(srctex.bpp() == 4);
   assert(dsttex.bpp() == 4);
   // Compute valid dest bounds
   IntRect dstBounds = dsttex.sample_bounds(dstReq, invertY);
+  dstBounds.intersect(clipRect);
   // Check if sampling bounds are empty
   if (dstBounds.is_empty()) {
     return;
@@ -270,10 +252,8 @@
   if (invertY) {
     destStride = -destStride;
   }
-  dest += destStride * bandOffset;
-  srcUV.y += srcDUV.y * bandOffset;
   int span = dstBounds.width();
-  for (int rows = min(dstBounds.height() - bandOffset, bandHeight); rows > 0;
+  for (int rows = dstBounds.height(); rows > 0;
        rows--) {
     linear_row_composite((uint32_t*)dest, span, srcUV, srcDUV.x, &sampler);
     dest += destStride;
@@ -311,19 +291,20 @@
   }
   IntRect srcReq = {srcX0, srcY0, srcX1, srcY1};
   IntRect dstReq = {dstX0, dstY0, dstX1, dstY1};
+  IntRect clipRect = {0, 0, dstReq.width(), dstReq.height()};
   if (srcReq.is_empty() || dstReq.is_empty()) {
     return;
   }
   prepare_texture(srctex);
   prepare_texture(dsttex, &dstReq);
-  if (!srcReq.same_size(dstReq) && filter == GL_LINEAR &&
+  if (!srcReq.same_size(dstReq) && srctex.width >= 2 && filter == GL_LINEAR &&
       (srctex.internal_format == GL_RGBA8 || srctex.internal_format == GL_R8 ||
        srctex.internal_format == GL_RG8)) {
     linear_blit(srctex, srcReq, srcfb->layer, dsttex, dstReq, dstfb->layer,
-                invertY, 0, dstReq.height());
+                invertY, dstReq);
   } else {
     scale_blit(srctex, srcReq, srcfb->layer, dsttex, dstReq, dstfb->layer,
-               invertY, 0, dstReq.height());
+               invertY, clipRect);
   }
 }
 
@@ -393,7 +374,7 @@
     dest += 4;
   }
   if (src < end) {
-    WideRGBA8 srcpx = unpack(unaligned_load<PackedRGBA8>(src));
+    WideRGBA8 srcpx = unpack(partial_load_span<PackedRGBA8>(src, end - src));
     WideRGBA8 dstpx = unpack(partial_load_span<PackedRGBA8>(dest, end - src));
     auto r = pack(srcpx + dstpx - muldiv255(dstpx, alphas(srcpx)));
     partial_store_span(dest, r, end - src);
@@ -402,9 +383,9 @@
 
 static NO_INLINE void unscaled_composite(Texture& srctex, const IntRect& srcReq,
                                          Texture& dsttex, const IntRect& dstReq,
-                                         bool invertY, int bandOffset,
-                                         int bandHeight) {
+                                         bool invertY, const IntRect& clipRect) {
   IntRect bounds = dsttex.sample_bounds(dstReq, invertY);
+  bounds.intersect(clipRect);
   bounds.intersect(srctex.sample_bounds(srcReq));
   char* dest = dsttex.sample_ptr(dstReq, bounds, 0, invertY);
   char* src = srctex.sample_ptr(srcReq, bounds, 0);
@@ -413,9 +394,7 @@
   if (invertY) {
     destStride = -destStride;
   }
-  dest += destStride * bandOffset;
-  src += srcStride * bandOffset;
-  for (int rows = min(bounds.height() - bandOffset, bandHeight); rows > 0;
+  for (int rows = bounds.height(); rows > 0;
        rows--) {
     unscaled_row_composite((uint32_t*)dest, (const uint32_t*)src,
                            bounds.width());
@@ -433,7 +412,7 @@
                GLint srcY, GLsizei srcWidth, GLsizei srcHeight, GLint dstX,
                GLint dstY, GLsizei dstWidth, GLsizei dstHeight,
                GLboolean opaque, GLboolean flip, GLenum filter,
-               GLint bandOffset, GLsizei bandHeight) {
+               GLint clipX, GLint clipY, GLsizei clipWidth, GLsizei clipHeight) {
   if (!lockedDst || !lockedSrc) {
     return;
   }
@@ -444,24 +423,26 @@
 
   IntRect srcReq = {srcX, srcY, srcX + srcWidth, srcY + srcHeight};
   IntRect dstReq = {dstX, dstY, dstX + dstWidth, dstY + dstHeight};
+  // Compute clip rect as relative to the dstReq, as that's the same coords
+  // as used for the sampling bounds.
+  IntRect clipRect = {clipX - dstX,
+                      clipY - dstY,
+                      clipX - dstX + clipWidth,
+                      clipY - dstY + clipHeight};
 
   if (opaque) {
     // Ensure we have rows of at least 2 pixels when using the linear filter
     // to avoid overreading the row.
     if (!srcReq.same_size(dstReq) && srctex.width >= 2 && filter == GL_LINEAR) {
-      linear_blit(srctex, srcReq, 0, dsttex, dstReq, 0, flip, bandOffset,
-                  bandHeight);
+      linear_blit(srctex, srcReq, 0, dsttex, dstReq, 0, flip, clipRect);
     } else {
-      scale_blit(srctex, srcReq, 0, dsttex, dstReq, 0, flip, bandOffset,
-                 bandHeight);
+      scale_blit(srctex, srcReq, 0, dsttex, dstReq, 0, flip, clipRect);
     }
   } else {
     if (!srcReq.same_size(dstReq) && srctex.width >= 2) {
-      linear_composite(srctex, srcReq, dsttex, dstReq, flip, bandOffset,
-                       bandHeight);
+      linear_composite(srctex, srcReq, dsttex, dstReq, flip, clipRect);
     } else {
-      unscaled_composite(srctex, srcReq, dsttex, dstReq, flip, bandOffset,
-                         bandHeight);
+      unscaled_composite(srctex, srcReq, dsttex, dstReq, flip, clipRect);
     }
   }
 }
@@ -631,10 +612,10 @@
   assert(sampler->format == TextureFormat::R8);
 
   // Calculate X fraction and clamp X offset into range.
-  I32 fracx = ix & (I32)0x7F;
+  I32 fracx = ix;
   ix >>= 7;
-  fracx &= (ix >= 0 && ix < int32_t(sampler->width) - 1);
-  ix = clampCoord(ix, sampler->width);
+  fracx = ((fracx & (ix >= 0)) | (ix > int32_t(sampler->width) - 2)) & 0x7F;
+  ix = clampCoord(ix, sampler->width - 1);
 
   // Load the sample taps and combine rows.
   auto abcd = linearRowTapsR8(sampler, ix, offsety, stridey, fracy);
@@ -666,10 +647,10 @@
   assert(sampler->stride == sampler2->stride);
 
   // Calculate X fraction and clamp X offset into range.
-  I32 fracx = ix & (I32)0x7F;
+  I32 fracx = ix;
   ix >>= 7;
-  fracx &= (ix >= 0 && ix < int32_t(sampler->width) - 1);
-  ix = clampCoord(ix, sampler->width);
+  fracx = ((fracx & (ix >= 0)) | (ix > int32_t(sampler->width) - 2)) & 0x7F;
+  ix = clampCoord(ix, sampler->width - 1);
 
   // Load the sample taps for the first sampler and combine rows.
   auto abcd = linearRowTapsR8(sampler, ix, offsety, stridey, fracy);
@@ -712,7 +693,26 @@
   int32_t yDU = int32_t((4 << STEP_BITS) * srcDU);
   int32_t cDU = int32_t((4 << STEP_BITS) * chromaDU);
 
-  if (sampler[0].format == TextureFormat::R16) {
+  if (sampler[0].width < 2 || sampler[1].width < 2) {
+    // If the source row has less than 2 pixels, it's not safe to use a linear
+    // filter because it may overread the row. Just convert the single pixel
+    // with nearest filtering and fill the row with it.
+    I16 yuv =
+        CONVERT(round_pixel((Float){
+                    texelFetch(&sampler[0], ivec2(srcUV), 0).x.x,
+                    texelFetch(&sampler[1], ivec2(chromaUV), 0).x.x,
+                    texelFetch(&sampler[2], ivec2(chromaUV), 0).x.x, 1.0f}),
+                I16);
+    auto rgb = YUVConverter<COLOR_SPACE>::convert(zip(I16(yuv.x), I16(yuv.x)),
+                                                  zip(I16(yuv.y), I16(yuv.z)));
+    for (; span >= 4; span -= 4) {
+      unaligned_store(dest, rgb);
+      dest += 4;
+    }
+    if (span > 0) {
+      partial_store_span(dest, rgb, span);
+    }
+  } else if (sampler[0].format == TextureFormat::R16) {
     // Sample each YUV plane, rescale it to fit in low 8 bits of word, and then
     // transform them by the appropriate color space.
     assert(colorDepth > 8);
@@ -800,9 +800,10 @@
                                YUVColorSpace colorSpace, int colorDepth,
                                const IntRect& srcReq, Texture& dsttex,
                                const IntRect& dstReq, bool invertY,
-                               int bandOffset, int bandHeight) {
+                               const IntRect& clipRect) {
   // Compute valid dest bounds
   IntRect dstBounds = dsttex.sample_bounds(dstReq, invertY);
+  dstBounds.intersect(clipRect);
   // Check if sampling bounds are empty
   if (dstBounds.is_empty()) {
     return;
@@ -824,11 +825,14 @@
                           float(utex.height) / ytex.height);
   vec2_scalar chromaUV = srcUV * chromaScale;
   vec2_scalar chromaDUV = srcDUV * chromaScale;
-  // Scale UVs by lerp precision
-  srcUV = linearQuantize(srcUV, 128);
-  srcDUV *= 128.0f;
-  chromaUV = linearQuantize(chromaUV, 128);
-  chromaDUV *= 128.0f;
+  // Scale UVs by lerp precision. If the row has only 1 pixel, then don't
+  // quantize so that we can use nearest filtering instead to avoid overreads.
+  if (ytex.width >= 2 && utex.width >= 2) {
+    srcUV = linearQuantize(srcUV, 128);
+    srcDUV *= 128.0f;
+    chromaUV = linearQuantize(chromaUV, 128);
+    chromaDUV *= 128.0f;
+  }
   // Calculate dest pointer from clamped offsets
   int destStride = dsttex.stride();
   char* dest = dsttex.sample_ptr(dstReq, dstBounds, 0, invertY);
@@ -836,11 +840,8 @@
   if (invertY) {
     destStride = -destStride;
   }
-  dest += destStride * bandOffset;
-  srcUV.y += srcDUV.y * bandOffset;
-  chromaUV.y += chromaDUV.y * bandOffset;
   int span = dstBounds.width();
-  for (int rows = min(dstBounds.height() - bandOffset, bandHeight); rows > 0;
+  for (int rows = dstBounds.height(); rows > 0;
        rows--) {
     switch (colorSpace) {
       case REC_601:
@@ -880,7 +881,7 @@
                   YUVColorSpace colorSpace, GLuint colorDepth, GLint srcX,
                   GLint srcY, GLsizei srcWidth, GLsizei srcHeight, GLint dstX,
                   GLint dstY, GLsizei dstWidth, GLsizei dstHeight,
-                  GLboolean flip, GLint bandOffset, GLsizei bandHeight) {
+                  GLboolean flip, GLint clipX, GLint clipY, GLsizei clipWidth, GLsizei clipHeight) {
   if (!lockedDst || !lockedY || !lockedU || !lockedV) {
     return;
   }
@@ -899,11 +900,17 @@
 
   IntRect srcReq = {srcX, srcY, srcX + srcWidth, srcY + srcHeight};
   IntRect dstReq = {dstX, dstY, dstX + dstWidth, dstY + dstHeight};
+  // Compute clip rect as relative to the dstReq, as that's the same coords
+  // as used for the sampling bounds.
+  IntRect clipRect = {clipX - dstX,
+                      clipY - dstY,
+                      clipX - dstX + clipWidth,
+                      clipY - dstY + clipHeight};
   // For now, always use a linear filter path that would be required for
   // scaling. Further fast-paths for non-scaled video might be desirable in the
   // future.
   linear_convert_yuv(ytex, utex, vtex, colorSpace, colorDepth, srcReq, dsttex,
-                     dstReq, flip, bandOffset, bandHeight);
+                     dstReq, flip, clipRect);
 }
 
 }  // extern "C"
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/gl.cc firefox-85.0+build1/gfx/wr/swgl/src/gl.cc
--- firefox-84.0.2+build1/gfx/wr/swgl/src/gl.cc	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/gl.cc	2021-01-18 19:58:12.000000000 +0000
@@ -22,9 +22,42 @@
 #  define debugf(...) printf(__VA_ARGS__)
 #endif
 
+// #define PRINT_TIMINGS
+
 #ifdef _WIN32
 #  define ALWAYS_INLINE __forceinline
 #  define NO_INLINE __declspec(noinline)
+
+   // Including Windows.h brings a huge amount of namespace polution so just
+   // define a couple of things manually
+   typedef int                 BOOL;
+#  define WINAPI      __stdcall
+#  define DECLSPEC_IMPORT __declspec(dllimport)
+#  define WINBASEAPI DECLSPEC_IMPORT
+   typedef unsigned long       DWORD;
+   typedef long LONG;
+   typedef __int64 LONGLONG;
+#  define DUMMYSTRUCTNAME
+
+   typedef union _LARGE_INTEGER {
+      struct {
+          DWORD LowPart;
+          LONG HighPart;
+      } DUMMYSTRUCTNAME;
+      struct {
+          DWORD LowPart;
+          LONG HighPart;
+      } u;
+      LONGLONG QuadPart;
+   } LARGE_INTEGER;
+   extern "C" {
+    WINBASEAPI BOOL WINAPI
+    QueryPerformanceCounter(LARGE_INTEGER* lpPerformanceCount);
+
+    WINBASEAPI BOOL WINAPI
+    QueryPerformanceFrequency(LARGE_INTEGER* lpFrequency);
+   }
+
 #else
 #  define ALWAYS_INLINE __attribute__((always_inline)) inline
 #  define NO_INLINE __attribute__((noinline))
@@ -73,6 +106,12 @@
     return *this;
   }
 
+  IntRect intersection(const IntRect& o) {
+    IntRect result = *this;
+    result.intersect(o);
+    return result;
+  }
+
   // Scale from source-space to dest-space, optionally rounding inward
   IntRect& scale(int srcWidth, int srcHeight, int dstWidth, int dstHeight,
                  bool roundIn = false) {
@@ -592,7 +631,17 @@
       if (!buf || size > buf_size) {
         // Allocate with a SIMD register-sized tail of padding at the end so we
         // can safely read or write past the end of the texture with SIMD ops.
-        char* new_buf = (char*)realloc(buf, size + sizeof(Float));
+        // Currently only the flat Z-buffer texture needs this padding due to
+        // full-register loads and stores in check_depth and discard_depth. In
+        // case some code in the future accidentally uses a linear filter on a
+        // texture with less than 2 pixels per row, we also add this padding
+        // just to be safe. All other texture types and use-cases should be
+        // safe to omit padding.
+        size_t padding =
+            internal_format == GL_DEPTH_COMPONENT16 || max(width, min_width) < 2
+                ? sizeof(Float)
+                : 0;
+        char* new_buf = (char*)realloc(buf, size + padding);
         assert(new_buf);
         if (new_buf) {
           // Successfully reallocated the buffer, so go ahead and set it.
@@ -1541,7 +1590,15 @@
 #ifdef __MACH__
   return mach_absolute_time();
 #elif defined(_WIN32)
-  return uint64_t(clock()) * (1000000000ULL / CLOCKS_PER_SEC);
+  LARGE_INTEGER time;
+  static bool have_frequency = false;
+  static LARGE_INTEGER frequency;
+  if (!have_frequency) {
+    QueryPerformanceFrequency(&frequency);
+    have_frequency = true;
+  }
+  QueryPerformanceCounter(&time);
+  return time.QuadPart * 1000000000ULL / frequency.QuadPart;
 #else
   return ({
     struct timespec tp;
@@ -2808,34 +2865,73 @@
   }
 }
 
-template <bool DISCARD>
-static inline void discard_output(uint32_t* buf, PackedRGBA8 mask) {
-  PackedRGBA8 dst = unaligned_load<PackedRGBA8>(buf);
-  WideRGBA8 r = pack_pixels_RGBA8();
-  if (blend_key) r = blend_pixels_RGBA8(dst, r);
-  if (DISCARD)
-    mask |= bit_cast<PackedRGBA8>(fragment_shader->swgl_IsPixelDiscarded);
-  unaligned_store(buf, (mask & dst) | (~mask & pack(r)));
+// Load a partial span > 0 and < 4 pixels.
+template <typename V, typename P>
+static ALWAYS_INLINE V partial_load_span(const P* src, int span) {
+  return bit_cast<V>(
+      (span >= 2
+           ? combine(unaligned_load<V2<P>>(src),
+                     V2<P>{span > 2 ? unaligned_load<P>(src + 2) : P(0), 0})
+           : V4<P>{unaligned_load<P>(src), 0, 0, 0}));
+}
+
+// Store a partial span > 0 and < 4 pixels.
+template <typename V, typename P>
+static ALWAYS_INLINE void partial_store_span(P* dst, V src, int span) {
+  auto pixels = bit_cast<V4<P>>(src);
+  if (span >= 2) {
+    unaligned_store(dst, lowHalf(pixels));
+    if (span > 2) {
+      unaligned_store(dst + 2, pixels.z);
+    }
+  } else {
+    unaligned_store(dst, pixels.x);
+  }
 }
 
-template <bool DISCARD>
-static inline void discard_output(uint32_t* buf) {
-  discard_output<DISCARD>(buf, 0);
+// Dispatcher that chooses when to load a full or partial span
+template <int SPAN, typename V, typename P>
+static ALWAYS_INLINE V load_span(const P* src) {
+  if (SPAN >= 4) {
+    return unaligned_load<V, P>(src);
+  } else {
+    return partial_load_span<V, P>(src, SPAN);
+  }
 }
 
-template <>
-inline void discard_output<false>(uint32_t* buf) {
-  WideRGBA8 r = pack_pixels_RGBA8();
-  if (blend_key) r = blend_pixels_RGBA8(unaligned_load<PackedRGBA8>(buf), r);
-  unaligned_store(buf, pack(r));
+// Dispatcher that chooses when to store a full or partial span
+template <int SPAN, typename V, typename P>
+static ALWAYS_INLINE void store_span(P* dst, V src) {
+  if (SPAN >= 4) {
+    unaligned_store<V, P>(dst, src);
+  } else {
+    partial_store_span<V, P>(dst, src, SPAN);
+  }
 }
 
-static inline PackedRGBA8 span_mask_RGBA8(int span) {
-  return bit_cast<PackedRGBA8>(I32(span) < I32{1, 2, 3, 4});
+template <bool DISCARD, int SPAN>
+static ALWAYS_INLINE void discard_output(uint32_t* buf, PackedRGBA8 mask) {
+  WideRGBA8 r = pack_pixels_RGBA8();
+  PackedRGBA8 dst = load_span<SPAN, PackedRGBA8>(buf);
+  if (blend_key) r = blend_pixels_RGBA8(dst, r);
+  if (DISCARD)
+    mask |= bit_cast<PackedRGBA8>(fragment_shader->swgl_IsPixelDiscarded);
+  store_span<SPAN>(buf, (mask & dst) | (~mask & pack(r)));
 }
 
-static inline PackedRGBA8 span_mask(uint32_t*, int span) {
-  return span_mask_RGBA8(span);
+template <bool DISCARD, int SPAN>
+static ALWAYS_INLINE void discard_output(uint32_t* buf) {
+  WideRGBA8 r = pack_pixels_RGBA8();
+  if (DISCARD) {
+    PackedRGBA8 dst = load_span<SPAN, PackedRGBA8>(buf);
+    if (blend_key) r = blend_pixels_RGBA8(dst, r);
+    PackedRGBA8 mask =
+        bit_cast<PackedRGBA8>(fragment_shader->swgl_IsPixelDiscarded);
+    store_span<SPAN>(buf, (mask & dst) | (~mask & pack(r)));
+  } else {
+    if (blend_key) r = blend_pixels_RGBA8(load_span<SPAN, PackedRGBA8>(buf), r);
+    store_span<SPAN>(buf, pack(r));
+  }
 }
 
 static inline WideR8 packR8(I32 a) {
@@ -2870,54 +2966,72 @@
   }
 }
 
-template <bool DISCARD>
+template <bool DISCARD, int SPAN>
 static inline void discard_output(uint8_t* buf, WideR8 mask) {
-  WideR8 dst = unpack(unaligned_load<PackedR8>(buf));
   WideR8 r = pack_pixels_R8();
+  WideR8 dst = unpack(load_span<SPAN, PackedR8>(buf));
   if (blend_key) r = blend_pixels_R8(dst, r);
   if (DISCARD) mask |= packR8(fragment_shader->swgl_IsPixelDiscarded);
-  unaligned_store(buf, pack((mask & dst) | (~mask & r)));
+  store_span<SPAN>(buf, pack((mask & dst) | (~mask & r)));
 }
 
-template <bool DISCARD>
+template <bool DISCARD, int SPAN>
 static inline void discard_output(uint8_t* buf) {
-  discard_output<DISCARD>(buf, 0);
-}
-
-template <>
-inline void discard_output<false>(uint8_t* buf) {
   WideR8 r = pack_pixels_R8();
-  if (blend_key) r = blend_pixels_R8(unpack(unaligned_load<PackedR8>(buf)), r);
-  unaligned_store(buf, pack(r));
-}
-
-static inline WideR8 span_mask_R8(int span) {
-  return bit_cast<WideR8>(WideR8(span) < WideR8{1, 2, 3, 4});
-}
-
-static inline WideR8 span_mask(uint8_t*, int span) {
-  return span_mask_R8(span);
+  if (DISCARD) {
+    WideR8 dst = unpack(load_span<SPAN, PackedR8>(buf));
+    if (blend_key) r = blend_pixels_R8(dst, r);
+    WideR8 mask = packR8(fragment_shader->swgl_IsPixelDiscarded);
+    store_span<SPAN>(buf, pack((mask & dst) | (~mask & r)));
+  } else {
+    if (blend_key)
+      r = blend_pixels_R8(unpack(load_span<SPAN, PackedR8>(buf)), r);
+    store_span<SPAN>(buf, pack(r));
+  }
 }
 
-UNUSED static inline PackedRG8 span_mask_RG8(int span) {
-  return bit_cast<PackedRG8>(I16(span) < I16{1, 2, 3, 4});
+template <bool DISCARD, bool W, typename P, typename M>
+static inline void commit_output(P* buf, M mask) {
+  fragment_shader->run<W>();
+  discard_output<DISCARD, 4>(buf, mask);
 }
 
 template <bool DISCARD, bool W, typename P, typename M>
-static inline void commit_output(P* buf, M mask) {
+static inline void commit_output(P* buf, M mask, int span) {
   fragment_shader->run<W>();
-  discard_output<DISCARD>(buf, mask);
+  switch (span) {
+    case 1:
+      discard_output<DISCARD, 1>(buf, mask);
+      break;
+    case 2:
+      discard_output<DISCARD, 2>(buf, mask);
+      break;
+    default:
+      discard_output<DISCARD, 3>(buf, mask);
+      break;
+  }
 }
 
 template <bool DISCARD, bool W, typename P>
 static inline void commit_output(P* buf) {
   fragment_shader->run<W>();
-  discard_output<DISCARD>(buf);
+  discard_output<DISCARD, 4>(buf);
 }
 
 template <bool DISCARD, bool W, typename P>
 static inline void commit_output(P* buf, int span) {
-  commit_output<DISCARD, W>(buf, span_mask(buf, span));
+  fragment_shader->run<W>();
+  switch (span) {
+    case 1:
+      discard_output<DISCARD, 1>(buf);
+      break;
+    case 2:
+      discard_output<DISCARD, 2>(buf);
+      break;
+    default:
+      discard_output<DISCARD, 3>(buf);
+      break;
+  }
 }
 
 template <bool DISCARD, bool W, typename P, typename Z>
@@ -2937,13 +3051,14 @@
 static inline void commit_output(P* buf, Z z, DepthRun* zbuf, int span) {
   ZMask zmask;
   if (check_depth<DISCARD>(z, zbuf, zmask, span)) {
-    commit_output<DISCARD, W>(buf, convert_zmask(zmask, buf));
+    commit_output<DISCARD, W>(buf, convert_zmask(zmask, buf), span);
     if (DISCARD) {
       discard_depth(z, zbuf, zmask);
     }
   }
 }
 
+#include "composite.h"
 #include "swgl_ext.h"
 
 #pragma GCC diagnostic push
@@ -3037,7 +3152,7 @@
     // it were a full chunk. Mask off only the part of the chunk we want to
     // use.
     if (span > 0) {
-      commit_output<false, false>(buf, span_mask(buf, span));
+      commit_output<false, false>(buf, span);
       buf += span;
     }
     // Skip past any runs that fail the depth test.
@@ -3633,8 +3748,19 @@
         assert(numClip < nump + 2);
         float prevDist = prevCoord - prevSide * prev.w;
         float curDist = curCoord - prevSide * cur.w;
+        // It may happen that after we interpolate by the weight k that due to
+        // floating point rounding we've underestimated the value necessary to
+        // push it over the clipping boundary. Just in case, nudge the mantissa
+        // by a single increment so that we essentially round it up and move it
+        // further inside the clipping boundary. We use nextafter to do this in
+        // a portable fashion.
         float k = prevDist / (prevDist - curDist);
-        outP[numClip] = prev + (cur - prev) * k;
+        Point3D clipped = prev + (cur - prev) * k;
+        if (prevSide * clipped.select(AXIS) > clipped.w) {
+            k = nextafterf(k, 1.0f);
+            clipped = prev + (cur - prev) * k;
+        }
+        outP[numClip] = clipped;
         outInterp[numClip] = prevInterp + (curInterp - prevInterp) * k;
         numClip++;
       }
@@ -3645,8 +3771,17 @@
         assert(numClip < nump + 2);
         float prevDist = prevCoord - curSide * prev.w;
         float curDist = curCoord - curSide * cur.w;
+        // Calculate interpolation weight k and the nudge it inside clipping
+        // boundary with nextafter. Note that since we were previously inside
+        // and now crossing outside, we have to flip the nudge direction for
+        // the weight towards 0 instead of 1.
         float k = prevDist / (prevDist - curDist);
-        outP[numClip] = prev + (cur - prev) * k;
+        Point3D clipped = prev + (cur - prev) * k;
+        if (curSide * clipped.select(AXIS) > clipped.w) {
+            k = nextafterf(k, 0.0f);
+            clipped = prev + (cur - prev) * k;
+        }
+        outP[numClip] = clipped;
         outInterp[numClip] = prevInterp + (curInterp - prevInterp) * k;
         numClip++;
       }
@@ -3713,7 +3848,9 @@
       vec3_scalar(ctx->viewport.x0, ctx->viewport.y0, 0.0f) + scale;
   if (test_none(pos.z <= -pos.w || pos.z >= pos.w)) {
     // No points cross the near or far planes, so no clipping required.
-    // Just divide coords by W and convert to viewport.
+    // Just divide coords by W and convert to viewport. We assume the W
+    // coordinate is non-zero and the reciprocal is finite since it would
+    // otherwise fail the test_none condition.
     Float w = 1.0f / pos.w;
     vec3 screen = pos.sel(X, Y, Z) * w * scale + offset;
     Point3D p[4] = {{screen.x.x, screen.y.x, screen.z.x, w.x},
@@ -3769,6 +3906,11 @@
     // Divide coords by W and convert to viewport.
     for (int i = 0; i < nump; i++) {
       float w = 1.0f / p_clip[i].w;
+      // If the W coord is essentially zero, small enough that division would
+      // result in Inf/NaN, then just set the reciprocal itself to zero so that
+      // the coordinates becomes zeroed out, as the only valid point that
+      // satisfies -W <= X/Y/Z <= W is all zeroes.
+      if(!isfinite(w)) w = 0.0f;
       p_clip[i] = Point3D(p_clip[i].sel(X, Y, Z) * w * scale + offset, w);
     }
     draw_perspective_clipped(nump, p_clip, interp_clip, colortex, layer,
@@ -3793,6 +3935,11 @@
   // Convert output of vertex shader to screen space.
   // Divide coords by W and convert to viewport.
   float w = 1.0f / pos.w.x;
+  // If the W coord is essentially zero, small enough that division would
+  // result in Inf/NaN, then just set the reciprocal itself to zero so that
+  // the coordinates becomes zeroed out, as the only valid point that
+  // satisfies -W <= X/Y/Z <= W is all zeroes.
+  if(!isfinite(w)) w = 0.0f;
   vec2 screen = (pos.sel(X, Y) * w + 1) * 0.5f *
                     vec2_scalar(ctx->viewport.width(), ctx->viewport.height()) +
                 vec2_scalar(ctx->viewport.x0, ctx->viewport.y0);
@@ -3953,8 +4100,8 @@
     v.validate();
   }
 
-#ifndef NDEBUG
-  // uint64_t start = get_time_value();
+#ifdef PRINT_TIMINGS
+  uint64_t start = get_time_value();
 #endif
 
   ctx->shaded_rows = 0;
@@ -4006,17 +4153,23 @@
     q.value += ctx->shaded_pixels;
   }
 
-#ifndef NDEBUG
-  // uint64_t end = get_time_value();
-  // debugf("draw(%d): %fms for %d pixels in %d rows (avg %f pixels/row, %f
-  // ns/pixel)\n", instancecount, double(end - start)/(1000.*1000.),
-  // ctx->shaded_pixels, ctx->shaded_rows,
-  // double(ctx->shaded_pixels)/ctx->shaded_rows, double(end -
-  // start)/max(ctx->shaded_pixels, 1));
+#ifdef PRINT_TIMINGS
+  uint64_t end = get_time_value();
+  printf("%7.3fms draw(%s, %d): %d pixels in %d rows (avg %f pixels/row, %fns/pixel)\n",
+         double(end - start)/(1000.*1000.),
+         ctx->programs[ctx->current_program].impl->get_name(),
+         instancecount,
+         ctx->shaded_pixels, ctx->shaded_rows,
+         double(ctx->shaded_pixels)/ctx->shaded_rows,
+         double(end - start)/max(ctx->shaded_pixels, 1));
 #endif
 }
 
-void Finish() {}
+void Finish() {
+#ifdef PRINT_TIMINGS
+  printf("Finish\n");
+#endif
+}
 
 void MakeCurrent(Context* c) {
   if (ctx == c) {
@@ -4058,4 +4211,3 @@
 
 }  // extern "C"
 
-#include "composite.h"
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/glsl.h firefox-85.0+build1/gfx/wr/swgl/src/glsl.h
--- firefox-84.0.2+build1/gfx/wr/swgl/src/glsl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/glsl.h	2021-01-18 19:58:11.000000000 +0000
@@ -146,6 +146,8 @@
 
 SI Bool if_then_else(int32_t c, Bool t, Bool e) { return c ? t : e; }
 
+SI I16 if_then_else(I16 c, I16 t, I16 e) { return (c & t) | (~c & e); }
+
 template <typename T> SI void swap(T& a, T& b) {
   T t(a);
   a = b;
@@ -359,6 +361,12 @@
     return *this;
   }
 
+  vec2_scalar operator/=(vec2_scalar a) {
+    x /= a.x;
+    y /= a.y;
+    return *this;
+  }
+
   vec2_scalar operator+=(vec2_scalar a) {
     x += a.x;
     y += a.y;
@@ -412,7 +420,7 @@
   constexpr vec2(vec2_scalar s) : x(s.x), y(s.y) {}
   constexpr vec2(vec2_scalar s0, vec2_scalar s1, vec2_scalar s2, vec2_scalar s3)
       : x(Float{s0.x, s1.x, s2.x, s3.x}), y(Float{s0.y, s1.y, s2.y, s3.y}) {}
-  vec2(ivec2 a);
+  explicit vec2(ivec2 a);
   Float x;
   Float y;
 
@@ -639,12 +647,14 @@
 
 float round(float a) { return roundf(a); }
 
-float fract(float a) { return a - floor(a); }
-
 Float round(Float v) { return floor(v + 0.5f); }
 
+float fract(float a) { return a - floor(a); }
+
 Float fract(Float v) { return v - floor(v); }
 
+vec2 fract(vec2 v) { return vec2(fract(v.x), fract(v.y)); }
+
 // X derivatives can be approximated by dFdx(x) = x[1] - x[0].
 // Y derivatives are not easily available since we operate in terms of X spans
 // only. To work around, assume dFdy(p.x) = dFdx(p.y), which only holds for
@@ -692,6 +702,24 @@
   return approx_pow2(l2e * y);
 }
 
+#define exp2 __glsl_exp2
+
+SI float exp2(float x) { return exp2f(x); }
+
+Float exp2(Float x) { return approx_pow2(x); }
+
+#define log __glsl_log
+
+SI float log(float x) { return logf(x); }
+
+Float log(Float x) { return approx_log2(x) * 0.69314718f; }
+
+#define log2 __glsl_log2
+
+SI float log2(float x) { return log2f(x); }
+
+Float log2(Float x) { return approx_log2(x); }
+
 struct ivec4;
 
 struct ivec2_scalar {
@@ -1073,6 +1101,8 @@
   Bool z;
 };
 
+bvec3_scalar make_bvec3(bool n) { return bvec3_scalar{n, n, n}; }
+
 struct bvec4_scalar {
   bool x;
   bool y;
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/swgl_ext.h firefox-85.0+build1/gfx/wr/swgl/src/swgl_ext.h
--- firefox-84.0.2+build1/gfx/wr/swgl/src/swgl_ext.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/swgl_ext.h	2021-01-18 19:58:11.000000000 +0000
@@ -7,6 +7,12 @@
   unaligned_store(buf, pack(r));
 }
 
+static inline void commit_span(uint32_t* buf, PackedRGBA8 r) {
+  if (blend_key)
+    r = pack(blend_pixels_RGBA8(unaligned_load<PackedRGBA8>(buf), unpack(r)));
+  unaligned_store(buf, r);
+}
+
 UNUSED static inline void commit_solid_span(uint32_t* buf, WideRGBA8 r,
                                             int len) {
   if (blend_key) {
@@ -206,6 +212,149 @@
   swgl_commitGaussianBlur(R8, uint8_t, s, p, uv_rect, hori, radius, coeffs, \
                           __VA_ARGS__)
 
+// Convert and pack planar YUV samples to RGB output using a color space
+static ALWAYS_INLINE PackedRGBA8 convertYUV(int colorSpace, U16 y, U16 u, U16 v) {
+  auto yy = V8<int16_t>(zip(y, y));
+  auto uv = V8<int16_t>(zip(u, v));
+  switch (colorSpace) {
+    case REC_601:
+      return YUVConverter<REC_601>::convert(yy, uv);
+    case REC_709:
+      return YUVConverter<REC_709>::convert(yy, uv);
+    case REC_2020:
+      return YUVConverter<REC_2020>::convert(yy, uv);
+    default:
+      return YUVConverter<IDENTITY>::convert(yy, uv);
+  }
+}
+
+// Helper functions to sample from planar YUV textures before converting to RGB
+template <typename S0>
+static inline PackedRGBA8 sampleYUV(S0 sampler0, vec2 uv0, int layer0,
+                                    int colorSpace, int rescaleFactor) {
+  ivec2 i0(uv0);
+  switch (sampler0->format) {
+    case TextureFormat::RGBA8: {
+      auto planar = textureLinearPlanarRGBA8(sampler0, i0, layer0);
+      return convertYUV(colorSpace, highHalf(planar.rg), lowHalf(planar.rg),
+                        lowHalf(planar.ba));
+    }
+    case TextureFormat::YUV422: {
+      auto planar = textureLinearPlanarYUV422(sampler0, i0, layer0);
+      return convertYUV(colorSpace, planar.y, planar.u, planar.v);
+    }
+    default:
+      assert(false);
+      return PackedRGBA8(0);
+  }
+}
+
+template <typename S0, typename C>
+static inline WideRGBA8 sampleColorYUV(S0 sampler0, vec2 uv0, int layer0,
+                                       int colorSpace, int rescaleFactor,
+                                       C color) {
+  return muldiv255(
+      unpack(sampleYUV(sampler0, uv0, layer0, colorSpace, rescaleFactor)),
+      pack_pixels_RGBA8(color));
+}
+
+template <typename S0, typename S1>
+static inline PackedRGBA8 sampleYUV(S0 sampler0, vec2 uv0, int layer0,
+                                    S1 sampler1, vec2 uv1, int layer1,
+                                    int colorSpace, int rescaleFactor) {
+  ivec2 i0(uv0);
+  ivec2 i1(uv1);
+  switch (sampler1->format) {
+    case TextureFormat::RG8: {
+      assert(sampler0->format == TextureFormat::R8);
+      auto y = textureLinearUnpackedR8(sampler0, i0, layer0);
+      auto planar = textureLinearPlanarRG8(sampler1, i1, layer1);
+      return convertYUV(colorSpace, y, lowHalf(planar.rg), highHalf(planar.rg));
+    }
+    case TextureFormat::RGBA8: {
+      assert(sampler0->format == TextureFormat::R8);
+      auto y = textureLinearUnpackedR8(sampler0, i0, layer0);
+      auto planar = textureLinearPlanarRGBA8(sampler1, i1, layer1);
+      return convertYUV(colorSpace, y, lowHalf(planar.ba), highHalf(planar.rg));
+    }
+    default:
+      assert(false);
+      return PackedRGBA8(0);
+  }
+}
+
+template <typename S0, typename S1, typename C>
+static inline WideRGBA8 sampleColorYUV(S0 sampler0, vec2 uv0, int layer0,
+                                       S1 sampler1, vec2 uv1, int layer1,
+                                       int colorSpace, int rescaleFactor,
+                                       C color) {
+  return muldiv255(unpack(sampleYUV(sampler0, uv0, layer0, sampler1, uv1,
+                                    layer1, colorSpace, rescaleFactor)),
+                   pack_pixels_RGBA8(color));
+}
+
+template <typename S0, typename S1, typename S2>
+static inline PackedRGBA8 sampleYUV(S0 sampler0, vec2 uv0, int layer0,
+                                    S1 sampler1, vec2 uv1, int layer1,
+                                    S2 sampler2, vec2 uv2, int layer2,
+                                    int colorSpace, int rescaleFactor) {
+  ivec2 i0(uv0);
+  ivec2 i1(uv1);
+  ivec2 i2(uv2);
+  assert(sampler0->format == sampler1->format &&
+         sampler0->format == sampler2->format);
+  switch (sampler0->format) {
+    case TextureFormat::R8: {
+      auto y = textureLinearUnpackedR8(sampler0, i0, layer0);
+      auto u = textureLinearUnpackedR8(sampler1, i1, layer1);
+      auto v = textureLinearUnpackedR8(sampler2, i2, layer2);
+      return convertYUV(colorSpace, y, u, v);
+    }
+    case TextureFormat::R16: {
+      // The rescaling factor represents how many bits to add to renormalize the
+      // texture to 16 bits, and so the color depth is actually 16 minus the
+      // rescaling factor.
+      // Need to right shift the sample by the amount of bits over 8 it
+      // occupies. On output from textureLinearUnpackedR16, we have lost 1 bit
+      // of precision at the low end already, hence 1 is subtracted from the
+      // color depth.
+      int colorDepth = 16 - rescaleFactor;
+      int rescaleBits = (colorDepth - 1) - 8;
+      auto y = textureLinearUnpackedR16(sampler0, i0, layer0) >> rescaleBits;
+      auto u = textureLinearUnpackedR16(sampler1, i1, layer1) >> rescaleBits;
+      auto v = textureLinearUnpackedR16(sampler2, i2, layer2) >> rescaleBits;
+      return convertYUV(colorSpace, U16(y), U16(u), U16(v));
+    }
+    default:
+      assert(false);
+      return PackedRGBA8(0);
+  }
+}
+
+template <typename S0, typename S1, typename S2, typename C>
+static inline WideRGBA8 sampleColorYUV(S0 sampler0, vec2 uv0, int layer0,
+                                       S1 sampler1, vec2 uv1, int layer1,
+                                       S2 sampler2, vec2 uv2, int layer2,
+                                       int colorSpace, int rescaleFactor,
+                                       C color) {
+  return muldiv255(
+      unpack(sampleYUV(sampler0, uv0, layer0, sampler1, uv1, layer1, sampler2,
+                       uv2, layer2, colorSpace, rescaleFactor)),
+      pack_pixels_RGBA8(color));
+}
+
+// Commit a single chunk of a YUV surface represented by multiple planar
+// textures. This requires a color space specifier selecting how to convert
+// from YUV to RGB output. In the case of HDR formats, a rescaling factor
+// selects how many bits of precision must be utilized on conversion. See the
+// sampleYUV dispatcher functions for the various supported plane
+// configurations this intrinsic accepts.
+#define swgl_commitTextureLinearYUV(...) \
+  swgl_commitChunk(RGBA8, sampleYUV(__VA_ARGS__))
+// Commit a single chunk of a YUV surface scaled by a color.
+#define swgl_commitTextureLinearColorYUV(...) \
+  swgl_commitChunk(RGBA8, sampleColorYUV(__VA_ARGS__))
+
 // Dispatch helper used by the GLSL translator to swgl_drawSpan functions.
 // The number of pixels committed is tracked by checking for the difference in
 // swgl_SpanLength. Any varying interpolants used will be advanced past the
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/swgl_fns.rs firefox-85.0+build1/gfx/wr/swgl/src/swgl_fns.rs
--- firefox-84.0.2+build1/gfx/wr/swgl/src/swgl_fns.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/swgl_fns.rs	2021-01-18 19:58:11.000000000 +0000
@@ -305,8 +305,10 @@
         opaque: GLboolean,
         flip: GLboolean,
         filter: GLenum,
-        band_offset: GLint,
-        band_height: GLsizei,
+        clip_x: GLint,
+        clip_y: GLint,
+        clip_width: GLsizei,
+        clip_height: GLsizei,
     );
     fn CompositeYUV(
         locked_dst: *mut LockedTexture,
@@ -324,8 +326,10 @@
         dst_width: GLsizei,
         dst_height: GLsizei,
         flip: GLboolean,
-        band_offset: GLint,
-        band_height: GLsizei,
+        clip_x: GLint,
+        clip_y: GLint,
+        clip_width: GLsizei,
+        clip_height: GLsizei,
     );
     fn CreateContext() -> *mut c_void;
     fn ReferenceContext(ctx: *mut c_void);
@@ -2369,8 +2373,10 @@
         opaque: bool,
         flip: bool,
         filter: GLenum,
-        band_offset: GLint,
-        band_height: GLsizei,
+        clip_x: GLint,
+        clip_y: GLint,
+        clip_width: GLsizei,
+        clip_height: GLsizei,
     ) {
         unsafe {
             Composite(
@@ -2387,8 +2393,10 @@
                 opaque as GLboolean,
                 flip as GLboolean,
                 filter,
-                band_offset,
-                band_height,
+                clip_x,
+                clip_y,
+                clip_width,
+                clip_height,
             );
         }
     }
@@ -2410,8 +2418,10 @@
         dst_width: GLsizei,
         dst_height: GLsizei,
         flip: bool,
-        band_offset: GLint,
-        band_height: GLsizei,
+        clip_x: GLint,
+        clip_y: GLint,
+        clip_width: GLsizei,
+        clip_height: GLsizei,
     ) {
         unsafe {
             CompositeYUV(
@@ -2430,8 +2440,10 @@
                 dst_width,
                 dst_height,
                 flip as GLboolean,
-                band_offset,
-                band_height,
+                clip_x,
+                clip_y,
+                clip_width,
+                clip_height,
             );
         }
     }
diff -Nru firefox-84.0.2+build1/gfx/wr/swgl/src/texture.h firefox-85.0+build1/gfx/wr/swgl/src/texture.h
--- firefox-84.0.2+build1/gfx/wr/swgl/src/texture.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/swgl/src/texture.h	2021-01-18 19:58:12.000000000 +0000
@@ -504,11 +504,16 @@
 // Convert Y coordinate to a 2^7 scale fraction for interpolation
 SI I16 computeFracY(ivec2 frac) { return CONVERT(frac.y & 0x7F, I16); }
 
+struct WidePlanarRGBA8 {
+  V8<uint16_t> rg;
+  V8<uint16_t> ba;
+};
+
 template <typename S>
-vec4 textureLinearRGBA8(S sampler, vec2 P, int32_t zoffset = 0) {
+SI WidePlanarRGBA8 textureLinearPlanarRGBA8(S sampler, ivec2 i,
+                                            int32_t zoffset = 0) {
   assert(sampler->format == TextureFormat::RGBA8);
 
-  ivec2 i(linearQuantize(P, 128, sampler));
   ivec2 frac = i;
   i >>= 7;
 
@@ -549,9 +554,17 @@
   auto cdh = zipHigh(c0, d0);
   cdl += ((cdh - cdl) * fracx.zwzwzwzw) >> 7;
 
-  auto rg = CONVERT(V8<uint16_t>(zip2Low(abl, cdl)), V8<float>);
-  auto ba = CONVERT(V8<uint16_t>(zip2High(abl, cdl)), V8<float>);
+  auto rg = V8<uint16_t>(zip2Low(abl, cdl));
+  auto ba = V8<uint16_t>(zip2High(abl, cdl));
+  return WidePlanarRGBA8{rg, ba};
+}
 
+template <typename S>
+vec4 textureLinearRGBA8(S sampler, vec2 P, int32_t zoffset = 0) {
+  ivec2 i(linearQuantize(P, 128, sampler));
+  auto planar = textureLinearPlanarRGBA8(sampler, i, zoffset);
+  auto rg = CONVERT(planar.rg, V8<float>);
+  auto ba = CONVERT(planar.ba, V8<float>);
   auto r = lowHalf(rg);
   auto g = highHalf(rg);
   auto b = lowHalf(ba);
@@ -603,11 +616,15 @@
   return vec4(r * (1.0f / 255.0f), 0.0f, 0.0f, 1.0f);
 }
 
+struct WidePlanarRG8 {
+  V8<uint16_t> rg;
+};
+
 template <typename S>
-vec4 textureLinearRG8(S sampler, vec2 P, int32_t zoffset = 0) {
+SI WidePlanarRG8 textureLinearPlanarRG8(S sampler, ivec2 i,
+                                        int32_t zoffset = 0) {
   assert(sampler->format == TextureFormat::RG8);
 
-  ivec2 i(linearQuantize(P, 128, sampler));
   ivec2 frac = i;
   i >>= 7;
 
@@ -651,10 +668,17 @@
   // Blend columns
   abcdl += ((abcdh - abcdl) * fracx.xyzwxyzw) >> 7;
 
-  auto rg = CONVERT(V8<uint16_t>(abcdl), V8<float>) * (1.0f / 255.0f);
+  auto rg = V8<uint16_t>(abcdl);
+  return WidePlanarRG8{rg};
+}
+
+template <typename S>
+vec4 textureLinearRG8(S sampler, vec2 P, int32_t zoffset = 0) {
+  ivec2 i(linearQuantize(P, 128, sampler));
+  auto planar = textureLinearPlanarRG8(sampler, i, zoffset);
+  auto rg = CONVERT(planar.rg, V8<float>) * (1.0f / 255.0f);
   auto r = lowHalf(rg);
   auto g = highHalf(rg);
-
   return vec4(r, g, 0.0f, 1.0f);
 }
 
@@ -781,11 +805,17 @@
   return pixel_float_to_vec4(c0, c1, c2, c3);
 }
 
+struct WidePlanarYUV8 {
+  U16 y;
+  U16 u;
+  U16 v;
+};
+
 template <typename S>
-vec4 textureLinearYUV422(S sampler, vec2 P, int32_t zoffset = 0) {
+SI WidePlanarYUV8 textureLinearPlanarYUV422(S sampler, ivec2 i,
+                                            int32_t zoffset = 0) {
   assert(sampler->format == TextureFormat::YUV422);
 
-  ivec2 i(linearQuantize(P, 128, sampler));
   ivec2 frac = i;
   i >>= 7;
 
@@ -850,14 +880,20 @@
   g0b += ((g1B - g0b) * fracx) >> 7;
   g1r += ((G0R - g1r) * fracx) >> 7;
 
-  auto g0bf = CONVERT(V8<uint16_t>(g0b), V8<float>);
-  auto g1rf = CONVERT(V8<uint16_t>(g1r), V8<float>);
-
   // Choose either g0 or g1 based on selector.
-  return vec4(
-      highHalf(g1rf) * (1.0f / 255.0f),
-      if_then_else(-selector, lowHalf(g1rf), lowHalf(g0bf)) * (1.0f / 255.0f),
-      highHalf(g0bf) * (1.0f / 255.0f), 1.0f);
+  return WidePlanarYUV8{
+      U16(if_then_else(CONVERT(-selector, I16), lowHalf(g1r), lowHalf(g0b))),
+      U16(highHalf(g0b)), U16(highHalf(g1r))};
+}
+
+template <typename S>
+vec4 textureLinearYUV422(S sampler, vec2 P, int32_t zoffset = 0) {
+  ivec2 i(linearQuantize(P, 128, sampler));
+  auto planar = textureLinearPlanarYUV422(sampler, i, zoffset);
+  auto y = CONVERT(planar.y, Float) * (1.0f / 255.0f);
+  auto u = CONVERT(planar.u, Float) * (1.0f / 255.0f);
+  auto v = CONVERT(planar.v, Float) * (1.0f / 255.0f);
+  return vec4(v, y, u, 1.0f);
 }
 
 SI vec4 texture(sampler2D sampler, vec2 P) {
@@ -1022,7 +1058,7 @@
 }
 
 template <typename S>
-static PackedRG8 textureLinearPackedRG8(S sampler, ivec2 i, int zoffset = 0) {
+static WideRG8 textureLinearUnpackedRG8(S sampler, ivec2 i, int zoffset = 0) {
   assert(sampler->format == TextureFormat::RG8);
   ivec2 frac = i & 0x7F;
   i >>= 7;
@@ -1067,7 +1103,12 @@
   // Blend columns
   abcdl += ((abcdh - abcdl) * fracx.xxyyzzww) >> 7;
 
-  return pack(WideRG8(abcdl));
+  return WideRG8(abcdl);
+}
+
+template <typename S>
+static PackedRG8 textureLinearPackedRG8(S sampler, ivec2 i, int zoffset = 0) {
+  return pack(textureLinearUnpackedRG8(sampler, i, zoffset));
 }
 
 template <int N>
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/build.rs firefox-85.0+build1/gfx/wr/webrender/build.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/build.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/build.rs	2021-01-18 19:58:11.000000000 +0000
@@ -120,7 +120,6 @@
             flags.remove(ShaderFeatureFlags::TEXTURE_EXTERNAL);
         }
         flags.remove(ShaderFeatureFlags::DITHERING);
-        flags.remove(ShaderFeatureFlags::PIXEL_LOCAL_STORAGE);
 
         for (shader_name, configs) in get_shader_features(flags) {
             for config in configs {
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/Cargo.toml firefox-85.0+build1/gfx/wr/webrender/Cargo.toml
--- firefox-84.0.2+build1/gfx/wr/webrender/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/Cargo.toml	2021-01-18 19:58:11.000000000 +0000
@@ -31,7 +31,7 @@
 bitflags = "1.2"
 byteorder = "1.0"
 cfg-if = "0.1.2"
-cstr = "0.1.2"
+cstr = "0.2"
 euclid = { version = "0.22.0", features = ["serde"] }
 fxhash = "0.2.1"
 gleam = "0.13.1"
@@ -58,7 +58,7 @@
 derive_more = "0.99"
 
 [dev-dependencies]
-mozangle = "0.3.1"
+mozangle = "0.3.2"
 rand = "0.4"
 
 [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
@@ -72,3 +72,4 @@
 core-foundation = "0.9"
 core-graphics = "0.22"
 core-text = { version = "19", default-features = false }
+objc = "0.2"
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/brush_conic_gradient.glsl firefox-85.0+build1/gfx/wr/webrender/res/brush_conic_gradient.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/brush_conic_gradient.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/brush_conic_gradient.glsl	2021-01-18 19:58:12.000000000 +0000
@@ -10,7 +10,7 @@
 
 flat varying vec2 v_center;
 flat varying float v_start_offset;
-flat varying float v_end_offset;
+flat varying float v_offset_scale;
 flat varying float v_angle;
 
 // Size of the gradient pattern's rectangle, used to compute horizontal and vertical
@@ -73,13 +73,22 @@
     }
 
     v_center = gradient.center_point;
-    v_angle = gradient.angle;
+    v_angle = PI / 2.0 - gradient.angle;
     v_start_offset = gradient.start_end_offset.x;
-    v_end_offset = gradient.start_end_offset.y;
+    if (gradient.start_end_offset.x != gradient.start_end_offset.y) {
+      // Store 1/scale where scale = end_offset - start_offset
+      v_offset_scale = 1.0 / (gradient.start_end_offset.y - gradient.start_end_offset.x);
+    } else {
+      // If scale = 0, we can't get its reciprocal. Instead, just use a zero scale.
+      v_offset_scale = 0.0;
+    }
 
     vec2 tile_repeat = local_rect.size / gradient.stretch_size;
     v_repeated_size = gradient.stretch_size;
 
+    // Normalize UV to 0..1 scale.
+    v_pos /= v_repeated_size;
+
     v_gradient_address = prim_user_data.x;
 
     // Whether to repeat the gradient along the line instead of clamping.
@@ -100,25 +109,27 @@
     vec2 local_pos = max(v_pos, vec2(0.0));
 
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(local_pos, v_repeated_size);
+    vec2 pos = fract(local_pos);
 
-    vec2 prim_size = v_repeated_size * v_tile_repeat;
     // Handle bottom and right inflated edges (see brush_image).
-    if (local_pos.x >= prim_size.x) {
-        pos.x = v_repeated_size.x;
+    if (local_pos.x >= v_tile_repeat.x) {
+        pos.x = 1.0;
     }
-    if (local_pos.y >= prim_size.y) {
-        pos.y = v_repeated_size.y;
+    if (local_pos.y >= v_tile_repeat.y) {
+        pos.y = 1.0;
     }
 #else
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(v_pos, v_repeated_size);
+    vec2 pos = fract(v_pos);
 #endif
 
+    // Rescale UV to actual repetition size. This can't be done in the vertex
+    // shader due to the use of atan() below.
+    pos *= v_repeated_size;
+
     vec2 current_dir = pos - v_center;
-    float current_angle = atan(current_dir.y, current_dir.x) + (PI / 2.0 - v_angle);
-    float offset = mod(current_angle / (2.0 * PI), 1.0) - v_start_offset;
-    offset = offset / (v_end_offset - v_start_offset);
+    float current_angle = atan(current_dir.y, current_dir.x) + v_angle;
+    float offset = (fract(current_angle / (2.0 * PI)) - v_start_offset) * v_offset_scale;
 
     vec4 color = sample_gradient(v_gradient_address,
                                  offset,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/brush_image.glsl firefox-85.0+build1/gfx/wr/webrender/res/brush_image.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/brush_image.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/brush_image.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -221,6 +221,13 @@
     v_uv_bounds = vec4(min_uv, max_uv) / texture_size.xyxy;
 #endif
 
+#ifdef WR_FEATURE_REPETITION
+    // Normalize UV to 0..1 scale only if using repetition. Otherwise, leave
+    // UVs unnormalized since we won't compute a modulus without repetition
+    // enabled.
+    v_uv /= (v_uv_bounds.zw - v_uv_bounds.xy);
+#endif
+
 #ifdef WR_FEATURE_ALPHA_PASS
     v_tile_repeat = repeat.xy;
 
@@ -279,19 +286,19 @@
     vec2 local_uv = max(v_uv * perspective_divisor, vec2(0.0));
 
     // Handle horizontal and vertical repetitions.
-    vec2 repeated_uv = mod(local_uv, uv_size) + v_uv_bounds.xy;
+    vec2 repeated_uv = fract(local_uv) * uv_size + v_uv_bounds.xy;
 
     // This takes care of the bottom and right inflated parts.
     // We do it after the modulo because the latter wraps around the values exactly on
     // the right and bottom edges, which we do not want.
-    if (local_uv.x >= v_tile_repeat.x * uv_size.x) {
+    if (local_uv.x >= v_tile_repeat.x) {
         repeated_uv.x = v_uv_bounds.z;
     }
-    if (local_uv.y >= v_tile_repeat.y * uv_size.y) {
+    if (local_uv.y >= v_tile_repeat.y) {
         repeated_uv.y = v_uv_bounds.w;
     }
 #else
-    vec2 repeated_uv = mod(v_uv * perspective_divisor, uv_size) + v_uv_bounds.xy;
+    vec2 repeated_uv = fract(v_uv * perspective_divisor) * uv_size + v_uv_bounds.xy;
 #endif
 
     return repeated_uv;
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/brush_linear_gradient.glsl firefox-85.0+build1/gfx/wr/webrender/res/brush_linear_gradient.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/brush_linear_gradient.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/brush_linear_gradient.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -10,10 +10,6 @@
 
 flat varying vec2 v_start_point;
 flat varying vec2 v_scale_dir;
-// Size of the gradient pattern's rectangle, used to compute horizontal and vertical
-// repetitions. Not to be confused with another kind of repetition of the pattern
-// which happens along the gradient stops.
-flat varying vec2 v_repeated_size;
 // Repetition along the gradient stops.
 flat varying float v_gradient_repeat;
 
@@ -71,7 +67,16 @@
     v_scale_dir = dir / dot(dir, dir);
 
     vec2 tile_repeat = local_rect.size / gradient.stretch_size;
-    v_repeated_size = gradient.stretch_size;
+
+    // Size of the gradient pattern's rectangle, used to compute horizontal and vertical
+    // repetitions. Not to be confused with another kind of repetition of the pattern
+    // which happens along the gradient stops.
+    vec2 repeated_size = gradient.stretch_size;
+
+    // Normalize UV and offsets to 0..1 scale.
+    v_pos /= repeated_size;
+    v_start_point /= repeated_size;
+    v_scale_dir *= repeated_size;
 
     v_gradient_address = prim_user_data.x;
 
@@ -93,19 +98,18 @@
     vec2 local_pos = max(v_pos, vec2(0.0));
 
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(local_pos, v_repeated_size);
+    vec2 pos = fract(local_pos);
 
-    vec2 prim_size = v_repeated_size * v_tile_repeat;
     // Handle bottom and right inflated edges (see brush_image).
-    if (local_pos.x >= prim_size.x) {
-        pos.x = v_repeated_size.x;
+    if (local_pos.x >= v_tile_repeat.x) {
+        pos.x = 1.0;
     }
-    if (local_pos.y >= prim_size.y) {
-        pos.y = v_repeated_size.y;
+    if (local_pos.y >= v_tile_repeat.y) {
+        pos.y = 1.0;
     }
 #else
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(v_pos, v_repeated_size);
+    vec2 pos = fract(v_pos);
 #endif
 
     float offset = dot(pos - v_start_point, v_scale_dir);
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/brush_radial_gradient.glsl firefox-85.0+build1/gfx/wr/webrender/res/brush_radial_gradient.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/brush_radial_gradient.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/brush_radial_gradient.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -66,7 +66,7 @@
     v_center = gradient.center_start_end_radius.xy;
     v_start_radius = gradient.center_start_end_radius.z;
     if (gradient.center_start_end_radius.z != gradient.center_start_end_radius.w) {
-      // Store 1/rd where rd = end_radius - start_start
+      // Store 1/rd where rd = end_radius - start_radius
       v_radius_scale = 1.0 / (gradient.center_start_end_radius.w - gradient.center_start_end_radius.z);
     } else {
       // If rd = 0, we can't get its reciprocal. Instead, just use a zero scale.
@@ -81,6 +81,9 @@
     v_repeated_size = gradient.stretch_size;
     v_repeated_size.y *=  gradient.ratio_xy;
 
+    // Normalize UV to 0..1 scale.
+    v_pos /= v_repeated_size;
+
     v_gradient_address = prim_user_data.x;
 
     // Whether to repeat the gradient instead of clamping.
@@ -101,21 +104,24 @@
     vec2 local_pos = max(v_pos, vec2(0.0));
 
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(local_pos, v_repeated_size);
+    vec2 pos = fract(local_pos);
 
-    vec2 prim_size = v_repeated_size * v_tile_repeat;
     // Handle bottom and right inflated edges (see brush_image).
-    if (local_pos.x >= prim_size.x) {
-        pos.x = v_repeated_size.x;
+    if (local_pos.x >= v_tile_repeat.x) {
+        pos.x = 1.0;
     }
-    if (local_pos.y >= prim_size.y) {
-        pos.y = v_repeated_size.y;
+    if (local_pos.y >= v_tile_repeat.y) {
+        pos.y = 1.0;
     }
 #else
     // Apply potential horizontal and vertical repetitions.
-    vec2 pos = mod(v_pos, v_repeated_size);
+    vec2 pos = fract(v_pos);
 #endif
 
+    // Rescale UV to actual repetition size. This can't be done in the vertex
+    // shader due to the use of length() below.
+    pos *= v_repeated_size;
+
     // Solve for t in length(pd) = v_start_radius + t * rd
     vec2 pd = pos - v_center;
     float offset = (length(pd) - v_start_radius) * v_radius_scale;
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/brush_yuv_image.glsl firefox-85.0+build1/gfx/wr/webrender/res/brush_yuv_image.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/brush_yuv_image.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/brush_yuv_image.glsl	2021-01-18 19:58:12.000000000 +0000
@@ -26,6 +26,11 @@
 flat varying vec3 vYuvOffsetVector;
 flat varying int vFormat;
 
+#ifdef SWGL
+flat varying int vYuvColorSpace;
+flat varying int vRescaleFactor;
+#endif
+
 #ifdef WR_VERTEX_SHADER
 
 struct YuvPrimitive {
@@ -60,6 +65,14 @@
     vYuvOffsetVector = get_yuv_offset_vector(prim.color_space);
     vFormat = prim.yuv_format;
 
+#ifdef SWGL
+    // swgl_commitTextureLinearYUV needs to know the color space specifier and
+    // also needs to know how many bits of scaling are required to normalize
+    // HDR textures.
+    vYuvColorSpace = prim.color_space;
+    vRescaleFactor = int(log2(prim.coefficient));
+#endif
+
 #ifdef WR_FEATURE_ALPHA_PASS
     vLocalPos = vi.local_pos;
 #endif
@@ -109,4 +122,110 @@
 
     return Fragment(color);
 }
+
+#ifdef SWGL
+void swgl_drawSpanRGBA8() {
+    if (vFormat == YUV_FORMAT_PLANAR) {
+        if (!swgl_isTextureLinear(sColor0) || !swgl_isTextureLinear(sColor1) || !swgl_isTextureLinear(sColor2)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUv_Y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUv_Y));
+
+        int layer1 = swgl_textureLayerOffset(sColor1, vYuvLayers.y);
+        vec2 uv1 = swgl_linearQuantize(sColor1, vUv_U);
+        vec2 min_uv1 = swgl_linearQuantize(sColor1, vUvBounds_U.xy);
+        vec2 max_uv1 = swgl_linearQuantize(sColor1, vUvBounds_U.zw);
+        vec2 step_uv1 = swgl_linearQuantizeStep(sColor1, swgl_interpStep(vUv_U));
+
+        int layer2 = swgl_textureLayerOffset(sColor2, vYuvLayers.z);
+        vec2 uv2 = swgl_linearQuantize(sColor2, vUv_V);
+        vec2 min_uv2 = swgl_linearQuantize(sColor2, vUvBounds_V.xy);
+        vec2 max_uv2 = swgl_linearQuantize(sColor2, vUvBounds_V.zw);
+        vec2 step_uv2 = swgl_linearQuantizeStep(sColor2, swgl_interpStep(vUv_V));
+
+        while (swgl_SpanLength > 0) {
+            #ifdef WR_FEATURE_ALPHA_PASS
+                float alpha = init_transform_fs(vLocalPos) * do_clip();
+                vLocalPos += swgl_interpStep(vLocalPos);
+                vClipMaskUv += swgl_interpStep(vClipMaskUv);
+                swgl_commitTextureLinearColorYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                                 sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                                 sColor2, clamp(uv2, min_uv2, max_uv2), layer2,
+                                                 vYuvColorSpace, vRescaleFactor, alpha);
+            #else
+                swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                            sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                            sColor2, clamp(uv2, min_uv2, max_uv2), layer2,
+                                            vYuvColorSpace, vRescaleFactor);
+            #endif
+            uv0 += step_uv0;
+            uv1 += step_uv1;
+            uv2 += step_uv2;
+        }
+    } else if (vFormat == YUV_FORMAT_NV12) {
+        if (!swgl_isTextureLinear(sColor0) || !swgl_isTextureLinear(sColor1)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUv_Y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUv_Y));
+
+        int layer1 = swgl_textureLayerOffset(sColor1, vYuvLayers.y);
+        vec2 uv1 = swgl_linearQuantize(sColor1, vUv_U);
+        vec2 min_uv1 = swgl_linearQuantize(sColor1, vUvBounds_U.xy);
+        vec2 max_uv1 = swgl_linearQuantize(sColor1, vUvBounds_U.zw);
+        vec2 step_uv1 = swgl_linearQuantizeStep(sColor1, swgl_interpStep(vUv_U));
+
+        while (swgl_SpanLength > 0) {
+            #ifdef WR_FEATURE_ALPHA_PASS
+                float alpha = init_transform_fs(vLocalPos) * do_clip();
+                vLocalPos += swgl_interpStep(vLocalPos);
+                vClipMaskUv += swgl_interpStep(vClipMaskUv);
+                swgl_commitTextureLinearColorYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                                 sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                                 vYuvColorSpace, vRescaleFactor, alpha);
+            #else
+                swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                            sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                            vYuvColorSpace, vRescaleFactor);
+            #endif
+            uv0 += step_uv0;
+            uv1 += step_uv1;
+        }
+    } else if (vFormat == YUV_FORMAT_INTERLEAVED) {
+        if (!swgl_isTextureLinear(sColor0)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUv_Y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUvBounds_Y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUv_Y));
+
+        while (swgl_SpanLength > 0) {
+            #ifdef WR_FEATURE_ALPHA_PASS
+                float alpha = init_transform_fs(vLocalPos) * do_clip();
+                vLocalPos += swgl_interpStep(vLocalPos);
+                vClipMaskUv += swgl_interpStep(vClipMaskUv);
+                swgl_commitTextureLinearColorYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                                 vYuvColorSpace, vRescaleFactor, alpha);
+            #else
+                swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                            vYuvColorSpace, vRescaleFactor);
+            #endif
+            uv0 += step_uv0;
+        }
+    }
+}
+#endif
+
 #endif
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/composite.glsl firefox-85.0+build1/gfx/wr/webrender/res/composite.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/composite.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/composite.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -12,6 +12,10 @@
 flat varying float vYuvCoefficient;
 flat varying int vYuvFormat;
 flat varying vec3 vYuvLayers;
+#ifdef SWGL
+flat varying int vYuvColorSpace;
+flat varying int vRescaleFactor;
+#endif
 varying vec2 vUV_y;
 varying vec2 vUV_u;
 varying vec2 vUV_v;
@@ -63,8 +67,16 @@
     vYuvOffsetVector = get_yuv_offset_vector(yuv_color_space);
     vYuvCoefficient = yuv_coefficient;
     vYuvFormat = yuv_format;
-
     vYuvLayers = aTextureLayers.xyz;
+
+#ifdef SWGL
+    // swgl_commitTextureLinearYUV needs to know the color space specifier and
+    // also needs to know how many bits of scaling are required to normalize
+    // HDR textures.
+    vYuvColorSpace = yuv_color_space;
+    vRescaleFactor = int(log2(yuv_coefficient));
+#endif
+
     write_uv_rect(
         aUvRect0.xy,
         aUvRect0.zw,
@@ -144,4 +156,108 @@
 #endif
     write_output(color);
 }
+
+#ifdef SWGL
+void swgl_drawSpanRGBA8() {
+#ifdef WR_FEATURE_YUV
+    if (vYuvFormat == YUV_FORMAT_PLANAR) {
+        if (!swgl_isTextureLinear(sColor0) || !swgl_isTextureLinear(sColor1) || !swgl_isTextureLinear(sColor2)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUV_y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUV_y));
+
+        int layer1 = swgl_textureLayerOffset(sColor1, vYuvLayers.y);
+        vec2 uv1 = swgl_linearQuantize(sColor1, vUV_u);
+        vec2 min_uv1 = swgl_linearQuantize(sColor1, vUVBounds_u.xy);
+        vec2 max_uv1 = swgl_linearQuantize(sColor1, vUVBounds_u.zw);
+        vec2 step_uv1 = swgl_linearQuantizeStep(sColor1, swgl_interpStep(vUV_u));
+
+        int layer2 = swgl_textureLayerOffset(sColor2, vYuvLayers.z);
+        vec2 uv2 = swgl_linearQuantize(sColor2, vUV_v);
+        vec2 min_uv2 = swgl_linearQuantize(sColor2, vUVBounds_v.xy);
+        vec2 max_uv2 = swgl_linearQuantize(sColor2, vUVBounds_v.zw);
+        vec2 step_uv2 = swgl_linearQuantizeStep(sColor2, swgl_interpStep(vUV_v));
+
+        while (swgl_SpanLength > 0) {
+            swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                        sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                        sColor2, clamp(uv2, min_uv2, max_uv2), layer2,
+                                        vYuvColorSpace, vRescaleFactor);
+            uv0 += step_uv0;
+            uv1 += step_uv1;
+            uv2 += step_uv2;
+        }
+    } else if (vYuvFormat == YUV_FORMAT_NV12) {
+        if (!swgl_isTextureLinear(sColor0) || !swgl_isTextureLinear(sColor1)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUV_y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUV_y));
+
+        int layer1 = swgl_textureLayerOffset(sColor1, vYuvLayers.y);
+        vec2 uv1 = swgl_linearQuantize(sColor1, vUV_u);
+        vec2 min_uv1 = swgl_linearQuantize(sColor1, vUVBounds_u.xy);
+        vec2 max_uv1 = swgl_linearQuantize(sColor1, vUVBounds_u.zw);
+        vec2 step_uv1 = swgl_linearQuantizeStep(sColor1, swgl_interpStep(vUV_u));
+
+        while (swgl_SpanLength > 0) {
+            swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                        sColor1, clamp(uv1, min_uv1, max_uv1), layer1,
+                                        vYuvColorSpace, vRescaleFactor);
+            uv0 += step_uv0;
+            uv1 += step_uv1;
+        }
+    } else if (vYuvFormat == YUV_FORMAT_INTERLEAVED) {
+        if (!swgl_isTextureLinear(sColor0) || !swgl_isTextureLinear(sColor1)) {
+            return;
+        }
+
+        int layer0 = swgl_textureLayerOffset(sColor0, vYuvLayers.x);
+        vec2 uv0 = swgl_linearQuantize(sColor0, vUV_y);
+        vec2 min_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.xy);
+        vec2 max_uv0 = swgl_linearQuantize(sColor0, vUVBounds_y.zw);
+        vec2 step_uv0 = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUV_y));
+
+        while (swgl_SpanLength > 0) {
+            swgl_commitTextureLinearYUV(sColor0, clamp(uv0, min_uv0, max_uv0), layer0,
+                                        vYuvColorSpace, vRescaleFactor);
+            uv0 += step_uv0;
+        }
+    }
+#else
+    if (!swgl_isTextureRGBA8(sColor0) || !swgl_isTextureLinear(sColor0)) {
+        return;
+    }
+
+    int layer = swgl_textureLayerOffset(sColor0, vLayer);
+
+    vec2 uv = swgl_linearQuantize(sColor0, vUv);
+    vec2 min_uv = swgl_linearQuantize(sColor0, vUVBounds.xy);
+    vec2 max_uv = swgl_linearQuantize(sColor0, vUVBounds.zw);
+    vec2 step_uv = swgl_linearQuantizeStep(sColor0, swgl_interpStep(vUv));
+
+    if (vColor != vec4(1.0)) {
+        while (swgl_SpanLength > 0) {
+            swgl_commitTextureLinearColorRGBA8(sColor0, clamp(uv, min_uv, max_uv), vColor, layer);
+            uv += step_uv;
+        }
+    } else {
+        while (swgl_SpanLength > 0) {
+            swgl_commitTextureLinearRGBA8(sColor0, clamp(uv, min_uv, max_uv), layer);
+            uv += step_uv;
+        }
+    }
+#endif
+}
+#endif
+
 #endif
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/cs_clip_image.glsl firefox-85.0+build1/gfx/wr/webrender/res/cs_clip_image.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/cs_clip_image.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/cs_clip_image.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,6 @@
 
 flat varying vec4 vClipMaskUvRect;
 flat varying vec4 vClipMaskUvInnerRect;
-flat varying float vLayer;
 
 #ifdef WR_VERTEX_SHADER
 
@@ -52,7 +51,6 @@
         cmi.shared.device_pixel_scale
     );
     vLocalPos = vi.local_pos;
-    vLayer = res.layer;
     vClipMaskImageUv = (vi.local_pos.xy - cmi.tile_rect.p0 * vi.local_pos.w) / cmi.tile_rect.size;
 
     vec2 texture_size = vec2(textureSize(sColor0, 0));
@@ -79,7 +77,7 @@
     vec2 source_uv = clamp(
         clamped_mask_uv / vLocalPos.w * vClipMaskUvRect.zw + vClipMaskUvRect.xy,
         vClipMaskUvInnerRect.xy, vClipMaskUvInnerRect.zw);
-    float clip_alpha = texture(sColor0, vec3(source_uv, vLayer)).r; //careful: texture has type A8
+    float clip_alpha = texture(sColor0, source_uv).r; //careful: texture has type A8
     oFragColor = vec4(alpha * clip_alpha, 1.0, 1.0, 1.0);
 }
 #endif
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/pls_init.glsl firefox-85.0+build1/gfx/wr/webrender/res/pls_init.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/pls_init.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/pls_init.glsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +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/. */
-
-// Initialize the pixel local storage area by reading the current
-// framebuffer color. We might be able to skip this in future by
-// making the opaque pass also write to pixel local storage.
-
-#define PLS_WRITEONLY
-
-#include shared
-
-#ifdef WR_VERTEX_SHADER
-PER_INSTANCE in vec4 aRect;
-
-void main(void) {
-    vec2 pos = aRect.xy + aPosition.xy * aRect.zw;
-    gl_Position = uTransform * vec4(pos, 0.0, 1.0);
-}
-#endif
-
-#ifdef WR_FRAGMENT_SHADER
-void main(void) {
-    // Store current framebuffer color in our custom PLS struct.
-	PLS.color = gl_LastFragColorARM;
-}
-#endif
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/pls_resolve.glsl firefox-85.0+build1/gfx/wr/webrender/res/pls_resolve.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/pls_resolve.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/pls_resolve.glsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +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/. */
-
-// Write the final value stored in pixel local store out to normal
-// fragment outputs. This will be the color that gets resolved out
-// to main memory.
-
-#define PLS_READONLY
-
-#include shared
-
-#ifdef WR_VERTEX_SHADER
-PER_INSTANCE in vec4 aRect;
-
-void main(void) {
-    vec2 pos = aRect.xy + aPosition.xy * aRect.zw;
-    gl_Position = uTransform * vec4(pos, 0.0, 1.0);
-}
-#endif
-
-#ifdef WR_FRAGMENT_SHADER
-out vec4 oFragColor;
-
-void main(void) {
-	// Write the final color value in pixel local storage out as a fragment color.
-    oFragColor = PLS.color;
-}
-#endif
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/prim_shared.glsl firefox-85.0+build1/gfx/wr/webrender/res/prim_shared.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/prim_shared.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/prim_shared.glsl	2021-01-18 19:58:12.000000000 +0000
@@ -17,6 +17,7 @@
 
 uniform sampler2DArray sPrevPassAlpha;
 uniform sampler2DArray sPrevPassColor;
+uniform sampler2DArray sClipMask;
 
 vec2 clamp_rect(vec2 pt, RectWithSize rect) {
     return clamp(pt, rect.p0, rect.p0 + rect.size);
@@ -271,7 +272,7 @@
     // is still interpolated and becomes a subject of precision-caused
     // fluctuations, see https://bugzilla.mozilla.org/show_bug.cgi?id=1491911
     ivec3 tc = ivec3(mask_uv, vClipMaskUv.z + 0.5);
-    return texelFetch(sPrevPassAlpha, tc, 0).r;
+    return texelFetch(sClipMask, tc, 0).r;
 }
 
 #ifdef WR_FEATURE_DITHERING
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/ps_text_run.glsl firefox-85.0+build1/gfx/wr/webrender/res/ps_text_run.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/ps_text_run.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/ps_text_run.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,6 @@
 
 // Interpolated UV coordinates to sample.
 varying vec2 v_uv;
-flat varying float v_layer;
 
 
 #ifdef WR_FEATURE_GLYPH_TRANSFORM
@@ -256,7 +255,6 @@
     vec2 st1 = res.uv_rect.zw / texture_size;
 
     v_uv = mix(st0, st1, f);
-    v_layer = res.layer;
     v_uv_bounds = (res.uv_rect + vec4(0.5, 0.5, -0.5, -0.5)) / texture_size.xyxy;
 }
 
@@ -267,7 +265,7 @@
 Fragment text_fs(void) {
     Fragment frag;
 
-    vec3 tc = vec3(clamp(v_uv, v_uv_bounds.xy, v_uv_bounds.zw), v_layer);
+    vec2 tc = clamp(v_uv, v_uv_bounds.xy, v_uv_bounds.zw);
     vec4 mask = texture(sColor0, tc);
     mask.rgb = mask.rgb * v_mask_swizzle.x + mask.aaa * v_mask_swizzle.y;
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/res/shared.glsl firefox-85.0+build1/gfx/wr/webrender/res/shared.glsl
--- firefox-84.0.2+build1/gfx/wr/webrender/res/shared.glsl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/res/shared.glsl	2021-01-18 19:58:11.000000000 +0000
@@ -2,16 +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/. */
 
-#ifdef WR_FEATURE_PIXEL_LOCAL_STORAGE
-// For now, we need both extensions here, in order to initialize
-// the PLS to the current framebuffer color. In future, we can
-// possibly remove that requirement, or at least support the
-// other framebuffer fetch extensions that provide the same
-// functionality.
-#extension GL_EXT_shader_pixel_local_storage : require
-#extension GL_ARM_shader_framebuffer_fetch : require
-#endif
-
 #ifdef WR_FEATURE_TEXTURE_EXTERNAL
 // Please check https://www.khronos.org/registry/OpenGL/extensions/OES/OES_EGL_image_external_essl3.txt
 // for this extension.
@@ -66,68 +56,23 @@
 #ifdef WR_FRAGMENT_SHADER
     // Uniform inputs
 
-    #ifdef WR_FEATURE_PIXEL_LOCAL_STORAGE
-        // Define the storage class of the pixel local storage.
-        // If defined as writable, it's a compile time error to
-        // have a normal fragment output variable declared.
-        #if defined(PLS_READONLY)
-            #define PLS_BLOCK __pixel_local_inEXT
-        #elif defined(PLS_WRITEONLY)
-            #define PLS_BLOCK __pixel_local_outEXT
-        #else
-            #define PLS_BLOCK __pixel_localEXT
-        #endif
-
-        // The structure of pixel local storage. Right now, it's
-        // just the current framebuffer color. In future, we have
-        // (at least) 12 bytes of space we can store extra info
-        // here (such as clip mask values).
-        PLS_BLOCK FrameBuffer {
-            layout(rgba8) highp vec4 color;
-        } PLS;
-
-        #ifndef PLS_READONLY
-        // Write the output of a fragment shader to PLS. Applies
-        // premultipled alpha blending by default, since the blender
-        // is disabled when PLS is active.
-        // TODO(gw): Properly support alpha blend mode for webgl / canvas.
-        void write_output(vec4 color) {
-            PLS.color = color + PLS.color * (1.0 - color.a);
-        }
-
-        // Write a raw value straight to PLS, if the fragment shader has
-        // already applied blending.
-        void write_output_raw(vec4 color) {
-            PLS.color = color;
-        }
-        #endif
-
-        #ifndef PLS_WRITEONLY
-        // Retrieve the current framebuffer color. Useful in conjunction with
-        // the write_output_raw function.
-        vec4 get_current_framebuffer_color() {
-            return PLS.color;
-        }
-        #endif
+    // Fragment shader outputs
+    #ifdef WR_FEATURE_ADVANCED_BLEND
+        layout(blend_support_all_equations) out;
+    #endif
+
+    #ifdef WR_FEATURE_DUAL_SOURCE_BLENDING
+        layout(location = 0, index = 0) out vec4 oFragColor;
+        layout(location = 0, index = 1) out vec4 oFragBlend;
     #else
-        // Fragment shader outputs
-        #ifdef WR_FEATURE_ADVANCED_BLEND
-            layout(blend_support_all_equations) out;
-        #endif
-
-        #ifdef WR_FEATURE_DUAL_SOURCE_BLENDING
-            layout(location = 0, index = 0) out vec4 oFragColor;
-            layout(location = 0, index = 1) out vec4 oFragBlend;
-        #else
-            out vec4 oFragColor;
-        #endif
-
-        // Write an output color in normal (non-PLS) shaders.
-        void write_output(vec4 color) {
-            oFragColor = color;
-        }
+        out vec4 oFragColor;
     #endif
 
+    // Write an output color in normal shaders.
+    void write_output(vec4 color) {
+        oFragColor = color;
+    }
+
     #define EPSILON                     0.0001
 
     // "Show Overdraw" color. Premultiplied.
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/batch.rs firefox-85.0+build1/gfx/wr/webrender/src/batch.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/batch.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/batch.rs	2021-01-18 19:58: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/. */
 
-use api::{AlphaType, ClipMode, ExternalImageType, ImageRendering};
+use api::{AlphaType, ClipMode, ExternalImageType, ImageRendering, ImageBufferKind};
 use api::{FontInstanceFlags, YuvColorSpace, YuvFormat, ColorDepth, ColorRange, PremultipliedColorF};
 use api::units::*;
 use crate::clip::{ClipDataStore, ClipNodeFlags, ClipNodeRange, ClipItemKind, ClipStore};
@@ -16,7 +16,7 @@
 use crate::gpu_types::{PrimitiveHeader, PrimitiveHeaderIndex, TransformPaletteId, TransformPalette};
 use crate::gpu_types::{ImageBrushData, get_shader_opacity, BoxShadowData};
 use crate::gpu_types::{ClipMaskInstanceCommon, ClipMaskInstanceImage, ClipMaskInstanceRect, ClipMaskInstanceBoxShadow};
-use crate::internal_types::{FastHashMap, SavedTargetIndex, Swizzle, TextureSource, Filter};
+use crate::internal_types::{FastHashMap, Swizzle, TextureSource, Filter, DeferredResolveIndex};
 use crate::picture::{Picture3DContext, PictureCompositeMode, PicturePrimitive, ClusterFlags};
 use crate::prim_store::{DeferredResolve, PrimitiveInstanceKind, ClipData};
 use crate::prim_store::{VisibleGradientTile, PrimitiveInstance, PrimitiveOpacity, SegmentInstanceIndex};
@@ -26,7 +26,7 @@
 use crate::render_target::RenderTargetContext;
 use crate::render_task_graph::{RenderTaskId, RenderTaskGraph};
 use crate::render_task::RenderTaskAddress;
-use crate::renderer::{BlendMode, ImageBufferKind, ShaderColorMode};
+use crate::renderer::{BlendMode, ShaderColorMode};
 use crate::renderer::{BLOCKS_PER_UV_RECT, MAX_VERTEX_TEXTURE_WIDTH};
 use crate::resource_cache::{CacheItem, GlyphFetchResult, ImageProperties, ImageRequest, ResourceCache};
 use crate::space::SpaceMapper;
@@ -77,24 +77,38 @@
     Brush(BrushBatchKind),
 }
 
-/// Optional textures that can be used as a source in the shaders.
-/// Textures that are not used by the batch are equal to TextureId::invalid().
+/// Input textures for a primitive, without consideration of clip mask
 #[derive(Copy, Clone, Debug)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct BatchTextures {
+pub struct TextureSet {
     pub colors: [TextureSource; 3],
 }
 
-impl BatchTextures {
-    pub fn no_texture() -> Self {
-        BatchTextures {
-            colors: [TextureSource::Invalid; 3],
+impl TextureSet {
+    const UNTEXTURED: TextureSet = TextureSet {
+        colors: [
+            TextureSource::Invalid,
+            TextureSource::Invalid,
+            TextureSource::Invalid,
+        ],
+    };
+
+    /// A textured primitive
+    fn prim_textured(
+        color: TextureSource,
+    ) -> Self {
+        TextureSet {
+            colors: [
+                color,
+                TextureSource::Invalid,
+                TextureSource::Invalid,
+            ],
         }
     }
 
-    pub fn render_target_cache() -> Self {
-        BatchTextures {
+    fn render_target_cache() -> Self {
+        TextureSet {
             colors: [
                 TextureSource::PrevPassColor,
                 TextureSource::PrevPassAlpha,
@@ -103,14 +117,116 @@
         }
     }
 
-    pub fn color(texture: TextureSource) -> Self {
+    fn is_compatible_with(&self, other: &TextureSet) -> bool {
+        self.colors[0].is_compatible(&other.colors[0]) &&
+        self.colors[1].is_compatible(&other.colors[1]) &&
+        self.colors[2].is_compatible(&other.colors[2])
+    }
+}
+
+impl TextureSource {
+    fn combine(&self, other: TextureSource) -> TextureSource {
+        if other == TextureSource::Invalid {
+            *self
+        } else {
+            other
+        }
+    }
+}
+
+/// Optional textures that can be used as a source in the shaders.
+/// Textures that are not used by the batch are equal to TextureId::invalid().
+#[derive(Copy, Clone, Debug)]
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct BatchTextures {
+    pub input: TextureSet,
+    pub clip_mask: TextureSource,
+}
+
+impl BatchTextures {
+    /// Construct a batch texture set referencing render target cache
+    // TODO(gw): Remove me once all tasks reference texture id directly!
+    pub fn render_target_cache(
+        clip_mask: TextureSource,
+    ) -> Self {
+        BatchTextures {
+            input: TextureSet {
+                colors: [
+                    TextureSource::PrevPassColor,
+                    TextureSource::PrevPassAlpha,
+                    TextureSource::Invalid,
+                ],
+            },
+            clip_mask,
+        }
+    }
+
+    /// An empty batch textures (no binding slots set)
+    pub fn empty() -> BatchTextures {
+        BatchTextures {
+            input: TextureSet::UNTEXTURED,
+            clip_mask: TextureSource::Invalid,
+        }
+    }
+
+    /// A textured primitive with optional clip mask
+    pub fn prim_textured(
+        color: TextureSource,
+        clip_mask: TextureSource,
+    ) -> BatchTextures {
+        BatchTextures {
+            input: TextureSet::prim_textured(color),
+            clip_mask,
+        }
+    }
+
+    /// An untextured primitive with optional clip mask
+    pub fn prim_untextured(
+        clip_mask: TextureSource,
+    ) -> BatchTextures {
+        BatchTextures {
+            input: TextureSet::UNTEXTURED,
+            clip_mask,
+        }
+    }
+
+    /// A composite style effect with single input texture
+    pub fn composite_rgb(
+        texture: TextureSource,
+    ) -> BatchTextures {
+        BatchTextures {
+            input: TextureSet {
+                colors: [
+                    texture,
+                    TextureSource::Invalid,
+                    TextureSource::Invalid,
+                ],
+            },
+            clip_mask: TextureSource::Invalid,
+        }
+    }
+
+    /// A composite style effect with up to 3 input textures
+    pub fn composite_yuv(
+        color0: TextureSource,
+        color1: TextureSource,
+        color2: TextureSource,
+    ) -> BatchTextures {
         BatchTextures {
-            colors: [texture, texture, TextureSource::Invalid],
+            input: TextureSet {
+                colors: [color0, color1, color2],
+            },
+            clip_mask: TextureSource::Invalid,
         }
     }
 
     pub fn is_compatible_with(&self, other: &BatchTextures) -> bool {
-        self.colors.iter().zip(other.colors.iter()).all(|(t1, t2)| textures_compatible(*t1, *t2))
+        if !self.clip_mask.is_compatible(&other.clip_mask) {
+            return false;
+        }
+
+        self.input.is_compatible_with(&other.input)
     }
 
     pub fn combine_textures(&self, other: BatchTextures) -> Option<BatchTextures> {
@@ -118,17 +234,24 @@
             return None;
         }
 
-        let mut new_textures = BatchTextures::no_texture();
-        for (i, (color, other_color)) in self.colors.iter().zip(other.colors.iter()).enumerate() {
-            // If these textures are compatible, for each source either both sources are invalid or only one is not invalid.
-            new_textures.colors[i] = if *color == TextureSource::Invalid {
-                *other_color
-            } else {
-                *color
-            };
+        let mut new_textures = BatchTextures::empty();
+
+        new_textures.clip_mask = self.clip_mask.combine(other.clip_mask);
+
+        for i in 0 .. 3 {
+            new_textures.input.colors[i] = self.input.colors[i].combine(other.input.colors[i]);
         }
+
         Some(new_textures)
     }
+
+    fn merge(&mut self, other: &BatchTextures) {
+        self.clip_mask = self.clip_mask.combine(other.clip_mask);
+
+        for (s, o) in self.input.colors.iter_mut().zip(other.input.colors.iter()) {
+            *s = s.combine(*o);
+        }
+    }
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -154,11 +277,6 @@
     }
 }
 
-#[inline]
-fn textures_compatible(t1: TextureSource, t2: TextureSource) -> bool {
-    t1 == TextureSource::Invalid || t2 == TextureSource::Invalid || t1 == t2
-}
-
 pub struct BatchRects {
     /// Union of all of the batch's item rects.
     ///
@@ -204,7 +322,7 @@
 
         if let Some(items) = &self.items {
             items.iter().any(|item| item.intersects(rect))
-        } else {    
+        } else {
             // If we don't have per-item rects it means the batch rect is a good
             // enough approximation and we didn't bother storing per-rect items.
             true
@@ -321,6 +439,7 @@
 
         let batch = &mut self.batches[self.current_batch_index];
         batch.features |= features;
+        batch.key.textures.merge(&key.textures);
 
         &mut batch.instances
     }
@@ -396,6 +515,7 @@
 
         let batch = &mut self.batches[self.current_batch_index];
         batch.features |= features;
+        batch.key.textures.merge(&key.textures);
 
         &mut batch.instances
     }
@@ -451,6 +571,7 @@
     fn merge(&mut self, other: PrimitiveBatch) {
         self.instances.extend(other.instances);
         self.features |= other.features;
+        self.key.textures.merge(&other.key.textures);
     }
 }
 
@@ -528,7 +649,7 @@
 /// texture set and one user data field.
 #[derive(Debug, Copy, Clone)]
 struct SegmentInstanceData {
-    textures: BatchTextures,
+    textures: TextureSet,
     specific_resource_address: i32,
 }
 
@@ -789,10 +910,11 @@
         ctx: &RenderTargetContext,
         gpu_cache: &mut GpuCache,
         prim_headers: &mut PrimitiveHeaders,
+        render_tasks: &RenderTaskGraph,
     ) {
         let batch_params = BrushBatchParameters::shared(
             BrushBatchKind::Solid,
-            BatchTextures::no_texture(),
+            TextureSet::UNTEXTURED,
             [get_shader_opacity(0.0), 0, 0, 0],
             0,
         );
@@ -831,6 +953,7 @@
             prim_info.clip_task_index,
             prim_vis_mask,
             ctx,
+            render_tasks,
         );
     }
 
@@ -868,8 +991,6 @@
         #[cfg(debug_assertions)] //TODO: why is this needed?
         debug_assert_eq!(prim_instance.prepared_frame_id, render_tasks.frame_id());
 
-        let is_chased = prim_instance.is_chased();
-
         let transform_id = transforms
             .get_id(
                 prim_spatial_node_index,
@@ -910,14 +1031,6 @@
             batch_features |= BatchFeatures::ANTIALIASING;
         }
 
-        let clip_task_address = ctx.get_prim_clip_task_address(
-            prim_info.clip_task_index,
-        );
-
-        if is_chased {
-            println!("\tbatch {:?} with bound {:?} and clip task {:?}", prim_rect, bounding_rect, clip_task_address);
-        }
-
         if !bounding_rect.is_empty() {
             debug_assert_eq!(prim_info.clip_chain.pic_spatial_node_index, surface_spatial_node_index,
                 "The primitive's bounding box is specified in a different coordinate system from the current batch!");
@@ -928,6 +1041,11 @@
                 let prim_data = &ctx.data_stores.prim[data_handle];
                 let prim_cache_address = gpu_cache.get_address(&prim_data.gpu_cache_handle);
 
+                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                    prim_info.clip_task_index,
+                    render_tasks,
+                ).unwrap();
+
                 // TODO(gw): We can abstract some of the common code below into
                 //           helper methods, as we port more primitives to make
                 //           use of interning.
@@ -948,7 +1066,7 @@
                 let batch_key = BatchKey {
                     blend_mode: BlendMode::PremultipliedDestOut,
                     kind: BatchKind::Brush(BrushBatchKind::Solid),
-                    textures: BatchTextures::no_texture(),
+                    textures: BatchTextures::prim_untextured(clip_mask_texture_id),
                 };
 
                 self.add_brush_instance_to_batches(
@@ -958,7 +1076,7 @@
                     z_id,
                     INVALID_SEGMENT_INDEX,
                     EdgeAaSegmentMask::all(),
-                    clip_task_address.unwrap(),
+                    clip_task_address,
                     BrushFlags::PERSPECTIVE_INTERPOLATION,
                     prim_header_index,
                     0,
@@ -983,12 +1101,15 @@
                         .get_texture_cache_item(&rt_cache_entry.handle);
                     segment_data.push(
                         SegmentInstanceData {
-                            textures: BatchTextures::color(cache_item.texture_id),
+                            textures: TextureSet::prim_textured(cache_item.texture_id),
                             specific_resource_address: cache_item.uv_rect_handle.as_int(gpu_cache),
                         }
                     );
                 }
 
+                // TODO: it would be less error-prone to get this info from the texture cache.
+                let image_buffer_kind = ImageBufferKind::Texture2D;
+
                 let non_segmented_blend_mode = if !common_data.opacity.is_opaque ||
                     prim_info.clip_task_index != ClipTaskIndex::INVALID ||
                     transform_kind == TransformedRectKind::Complex
@@ -1006,7 +1127,7 @@
                 };
 
                 let batch_params = BrushBatchParameters::instanced(
-                    BrushBatchKind::Image(ImageBufferKind::Texture2DArray),
+                    BrushBatchKind::Image(image_buffer_kind),
                     ImageBrushData {
                         color_mode: ShaderColorMode::Image,
                         alpha_type: AlphaType::PremultipliedAlpha,
@@ -1037,6 +1158,7 @@
                     prim_info.clip_task_index,
                     prim_vis_mask,
                     ctx,
+                    render_tasks,
                 );
             }
             PrimitiveInstanceKind::TextRun { data_handle, run_index, .. } => {
@@ -1085,6 +1207,11 @@
                 );
                 let batchers = &mut self.batchers;
 
+                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                    prim_info.clip_task_index,
+                    render_tasks,
+                ).unwrap();
+
                 ctx.resource_cache.fetch_glyphs(
                     run.used_font.clone(),
                     &glyph_keys,
@@ -1100,13 +1227,10 @@
 
                         let subpx_dir = subpx_dir.limit_by(glyph_format);
 
-                        let textures = BatchTextures {
-                            colors: [
-                                texture_id,
-                                TextureSource::Invalid,
-                                TextureSource::Invalid,
-                            ],
-                        };
+                        let textures = BatchTextures::prim_textured(
+                            texture_id,
+                            clip_mask_texture_id,
+                        );
 
                         let kind = BatchKind::TextRun(glyph_format);
 
@@ -1257,7 +1381,7 @@
                                 for glyph in glyphs {
                                     batch.push(base_instance.build(
                                         render_task_address,
-                                        clip_task_address.unwrap(),
+                                        clip_task_address,
                                         subpx_dir,
                                         glyph.index_in_text_run,
                                         glyph.uv_rect_address,
@@ -1275,6 +1399,11 @@
                 let common_data = &ctx.data_stores.line_decoration[data_handle].common;
                 let prim_cache_address = gpu_cache.get_address(&common_data.gpu_cache_handle);
 
+                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                    prim_info.clip_task_index,
+                    render_tasks,
+                ).unwrap();
+
                 let (batch_kind, textures, prim_user_data, specific_resource_address) = match cache_handle {
                     Some(cache_handle) => {
                         let rt_cache_entry = ctx
@@ -1283,9 +1412,12 @@
                         let cache_item = ctx
                             .resource_cache
                             .get_texture_cache_item(&rt_cache_entry.handle);
-                        let textures = BatchTextures::color(cache_item.texture_id);
+                        let textures = BatchTextures::prim_textured(
+                            cache_item.texture_id,
+                            clip_mask_texture_id,
+                        );
                         (
-                            BrushBatchKind::Image(get_buffer_kind(cache_item.texture_id)),
+                            BrushBatchKind::Image(cache_item.texture_id.image_buffer_kind()),
                             textures,
                             ImageBrushData {
                                 color_mode: ShaderColorMode::Image,
@@ -1299,7 +1431,7 @@
                     None => {
                         (
                             BrushBatchKind::Solid,
-                            BatchTextures::no_texture(),
+                            BatchTextures::prim_untextured(clip_mask_texture_id),
                             [get_shader_opacity(1.0), 0, 0, 0],
                             0,
                         )
@@ -1344,7 +1476,7 @@
                     z_id,
                     INVALID_SEGMENT_INDEX,
                     EdgeAaSegmentMask::all(),
-                    clip_task_address.unwrap(),
+                    clip_task_address,
                     BrushFlags::PERSPECTIVE_INTERPOLATION,
                     prim_header_index,
                     specific_resource_address,
@@ -1382,9 +1514,10 @@
                             };
 
                             // Get clip task, if set, for the picture primitive.
-                            let child_clip_task_address = ctx.get_prim_clip_task_address(
+                            let (child_clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
                                 child_prim_info.clip_task_index,
-                            );
+                                render_tasks,
+                            ).unwrap();
 
                             let prim_header = PrimitiveHeader {
                                 local_rect: pic.precise_local_rect,
@@ -1402,11 +1535,12 @@
                                 .raster_config
                                 .as_ref()
                                 .expect("BUG: 3d primitive was not assigned a surface");
-                            let (uv_rect_address, _) = render_tasks.resolve_surface(
+                            let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                 ctx.surfaces[raster_config.surface_index.0]
                                     .render_tasks
                                     .expect("BUG: no surface")
                                     .root,
+                                clip_mask_texture_id,
                                 gpu_cache,
                             );
 
@@ -1418,13 +1552,13 @@
                                 uv_rect_address.as_int(),
                                 if raster_config.establishes_raster_root { 1 } else { 0 },
                                 0,
-                                child_clip_task_address.unwrap().0 as i32,
+                                child_clip_task_address.0 as i32,
                             ]);
 
                             let key = BatchKey::new(
                                 BatchKind::SplitComposite,
                                 BlendMode::PremultipliedAlpha,
-                                BatchTextures::no_texture(),
+                                textures,
                             );
 
                             self.add_split_composite_instance_to_batches(
@@ -1494,11 +1628,17 @@
                                 assert!(filter.is_visible());
                                 match filter {
                                     Filter::Blur(..) => {
+                                        let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                            prim_info.clip_task_index,
+                                            render_tasks,
+                                        ).unwrap();
+
                                         let kind = BatchKind::Brush(
                                             BrushBatchKind::Image(ImageBufferKind::Texture2DArray)
                                         );
                                         let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                             surface_task.expect("bug: surface must be allocated by now"),
+                                            clip_mask_texture_id,
                                             gpu_cache,
                                         );
                                         let key = BatchKey::new(
@@ -1524,7 +1664,7 @@
                                             z_id,
                                             INVALID_SEGMENT_INDEX,
                                             EdgeAaSegmentMask::empty(),
-                                            clip_task_address.unwrap(),
+                                            clip_task_address,
                                             brush_flags,
                                             prim_header_index,
                                             uv_rect_address.as_int(),
@@ -1532,6 +1672,11 @@
                                         );
                                     }
                                     Filter::DropShadows(shadows) => {
+                                        let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                            prim_info.clip_task_index,
+                                            render_tasks,
+                                        ).unwrap();
+
                                         // Draw an instance per shadow first, following by the content.
 
                                         // The shadows and the content get drawn as a brush image.
@@ -1544,20 +1689,22 @@
                                         let secondary_id = picture.secondary_render_task_id.expect("no secondary!?");
                                         let content_source = {
                                             let secondary_task = &render_tasks[secondary_id];
-                                            let saved_index = secondary_task.saved_index.expect("no saved index!?");
-                                            debug_assert_ne!(saved_index, SavedTargetIndex::PENDING);
-                                            TextureSource::RenderTaskCache(saved_index, Swizzle::default())
+                                            let texture_id = secondary_task.get_target_texture();
+                                            TextureSource::TextureCache(
+                                                texture_id,
+                                                ImageBufferKind::Texture2DArray,
+                                                Swizzle::default(),
+                                            )
                                         };
 
                                         // Build BatchTextures for shadow/content
-                                        let shadow_textures = BatchTextures::render_target_cache();
-                                        let content_textures = BatchTextures {
-                                            colors: [
-                                                content_source,
-                                                TextureSource::Invalid,
-                                                TextureSource::Invalid,
-                                            ],
-                                        };
+                                        let shadow_textures = BatchTextures::render_target_cache(
+                                            clip_mask_texture_id,
+                                        );
+                                        let content_textures = BatchTextures::prim_textured(
+                                            content_source,
+                                            clip_mask_texture_id,
+                                        );
 
                                         // Build batch keys for shadow/content
                                         let shadow_key = BatchKey::new(kind, non_segmented_blend_mode, shadow_textures);
@@ -1603,7 +1750,7 @@
                                                 z_id,
                                                 INVALID_SEGMENT_INDEX,
                                                 EdgeAaSegmentMask::empty(),
-                                                clip_task_address.unwrap(),
+                                                clip_task_address,
                                                 brush_flags,
                                                 shadow_prim_header_index,
                                                 shadow_uv_rect_address,
@@ -1630,7 +1777,7 @@
                                             z_id_content,
                                             INVALID_SEGMENT_INDEX,
                                             EdgeAaSegmentMask::empty(),
-                                            clip_task_address.unwrap(),
+                                            clip_task_address,
                                             brush_flags,
                                             content_prim_header_index,
                                             content_uv_rect_address,
@@ -1638,10 +1785,16 @@
                                         );
                                     }
                                     Filter::Opacity(_, amount) => {
+                                        let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                            prim_info.clip_task_index,
+                                            render_tasks,
+                                        ).unwrap();
+
                                         let amount = (amount * 65536.0) as i32;
 
                                         let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                             surface_task.expect("bug: surface must be allocated by now"),
+                                            clip_mask_texture_id,
                                             gpu_cache,
                                         );
 
@@ -1665,7 +1818,7 @@
                                             z_id,
                                             INVALID_SEGMENT_INDEX,
                                             EdgeAaSegmentMask::empty(),
-                                            clip_task_address.unwrap(),
+                                            clip_task_address,
                                             brush_flags,
                                             prim_header_index,
                                             0,
@@ -1673,6 +1826,11 @@
                                         );
                                     }
                                     _ => {
+                                        let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                            prim_info.clip_task_index,
+                                            render_tasks,
+                                        ).unwrap();
+
                                         // Must be kept in sync with brush_blend.glsl
                                         let filter_mode = filter.as_int();
 
@@ -1712,6 +1870,7 @@
 
                                         let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                             surface_task.expect("bug: surface must be allocated by now"),
+                                            clip_mask_texture_id,
                                             gpu_cache,
                                         );
 
@@ -1741,7 +1900,7 @@
                                             z_id,
                                             INVALID_SEGMENT_INDEX,
                                             EdgeAaSegmentMask::empty(),
-                                            clip_task_address.unwrap(),
+                                            clip_task_address,
                                             brush_flags,
                                             prim_header_index,
                                             0,
@@ -1763,8 +1922,14 @@
 
                                 let user_data = filter_data.gpu_cache_handle.as_int(gpu_cache);
 
+                                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                    prim_info.clip_task_index,
+                                    render_tasks,
+                                ).unwrap();
+
                                 let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                     surface_task.expect("bug: surface must be allocated by now"),
+                                    clip_mask_texture_id,
                                     gpu_cache,
                                 );
 
@@ -1788,7 +1953,7 @@
                                     z_id,
                                     INVALID_SEGMENT_INDEX,
                                     EdgeAaSegmentMask::empty(),
-                                    clip_task_address.unwrap(),
+                                    clip_task_address,
                                     brush_flags,
                                     prim_header_index,
                                     0,
@@ -1796,8 +1961,13 @@
                                 );
                             }
                             PictureCompositeMode::MixBlend(mode) if ctx.use_advanced_blending => {
+                                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                    prim_info.clip_task_index,
+                                    render_tasks,
+                                ).unwrap();
                                 let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                     surface_task.expect("bug: surface must be allocated by now"),
+                                    clip_mask_texture_id,
                                     gpu_cache,
                                 );
                                 let key = BatchKey::new(
@@ -1825,7 +1995,7 @@
                                     z_id,
                                     INVALID_SEGMENT_INDEX,
                                     EdgeAaSegmentMask::empty(),
-                                    clip_task_address.unwrap(),
+                                    clip_task_address,
                                     brush_flags,
                                     prim_header_index,
                                     uv_rect_address.as_int(),
@@ -1833,6 +2003,10 @@
                                 );
                             }
                             PictureCompositeMode::MixBlend(mode) => {
+                                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                    prim_info.clip_task_index,
+                                    render_tasks,
+                                ).unwrap();
                                 let cache_task_id = surface_task.expect("bug: surface must be allocated by now");
                                 let backdrop_id = picture.secondary_render_task_id.expect("no backdrop!?");
 
@@ -1850,7 +2024,7 @@
                                         },
                                     ),
                                     BlendMode::PremultipliedAlpha,
-                                    BatchTextures::no_texture(),
+                                    BatchTextures::prim_untextured(clip_mask_texture_id),
                                 );
                                 let backdrop_task_address: RenderTaskAddress = backdrop_id.into();
                                 let source_task_address: RenderTaskAddress = cache_task_id.into();
@@ -1868,7 +2042,7 @@
                                     z_id,
                                     INVALID_SEGMENT_INDEX,
                                     EdgeAaSegmentMask::empty(),
-                                    clip_task_address.unwrap(),
+                                    clip_task_address,
                                     brush_flags,
                                     prim_header_index,
                                     0,
@@ -1880,15 +2054,22 @@
                                 let uv_rect_address = render_tasks[cache_task_id]
                                     .get_texture_address(gpu_cache)
                                     .as_int();
-                                let textures = match render_tasks[cache_task_id].saved_index {
-                                    Some(saved_index) => BatchTextures {
+                                let cache_render_task = &render_tasks[cache_task_id];
+                                let textures = if cache_render_task.save_target {
+                                    let texture_id = cache_render_task.get_target_texture();
+                                    TextureSet {
                                         colors: [
-                                            TextureSource::RenderTaskCache(saved_index, Swizzle::default()),
+                                            TextureSource::TextureCache(
+                                                texture_id,
+                                                ImageBufferKind::Texture2DArray,
+                                                Swizzle::default(),
+                                            ),
                                             TextureSource::PrevPassAlpha,
                                             TextureSource::Invalid,
-                                        ]
-                                    },
-                                    None => BatchTextures::render_target_cache(),
+                                        ],
+                                    }
+                                } else {
+                                    TextureSet::render_target_cache()
                                 };
                                 let batch_params = BrushBatchParameters::shared(
                                     BrushBatchKind::Image(ImageBufferKind::Texture2DArray),
@@ -1947,14 +2128,21 @@
                                     prim_info.clip_task_index,
                                     prim_vis_mask,
                                     ctx,
+                                    render_tasks,
                                 );
                             }
                             PictureCompositeMode::SvgFilter(..) => {
+                                let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                                    prim_info.clip_task_index,
+                                    render_tasks,
+                                ).unwrap();
+
                                 let kind = BatchKind::Brush(
                                     BrushBatchKind::Image(ImageBufferKind::Texture2DArray)
                                 );
                                 let (uv_rect_address, textures) = render_tasks.resolve_surface(
                                     surface_task.expect("bug: surface must be allocated by now"),
+                                    clip_mask_texture_id,
                                     gpu_cache,
                                 );
                                 let key = BatchKey::new(
@@ -1980,7 +2168,7 @@
                                     z_id,
                                     INVALID_SEGMENT_INDEX,
                                     EdgeAaSegmentMask::empty(),
-                                    clip_task_address.unwrap(),
+                                    clip_task_address,
                                     brush_flags,
                                     prim_header_index,
                                     uv_rect_address.as_int(),
@@ -2023,7 +2211,9 @@
                     return;
                 }
 
-                let textures = BatchTextures::color(cache_item.texture_id);
+                let textures = TextureSet::prim_textured(
+                    cache_item.texture_id,
+                );
                 let prim_cache_address = gpu_cache.get_address(&common_data.gpu_cache_handle);
                 let specified_blend_mode = BlendMode::PremultipliedAlpha;
                 let non_segmented_blend_mode = if !common_data.opacity.is_opaque ||
@@ -2043,7 +2233,7 @@
                 };
 
                 let batch_params = BrushBatchParameters::shared(
-                    BrushBatchKind::Image(get_buffer_kind(cache_item.texture_id)),
+                    BrushBatchKind::Image(cache_item.texture_id.image_buffer_kind()),
                     textures,
                     ImageBrushData {
                         color_mode: ShaderColorMode::Image,
@@ -2074,6 +2264,7 @@
                     prim_info.clip_task_index,
                     prim_vis_mask,
                     ctx,
+                    render_tasks,
                 );
             }
             PrimitiveInstanceKind::Rectangle { data_handle, segment_instance_index, .. } => {
@@ -2091,7 +2282,7 @@
 
                 let batch_params = BrushBatchParameters::shared(
                     BrushBatchKind::Solid,
-                    BatchTextures::no_texture(),
+                    TextureSet::UNTEXTURED,
                     [get_shader_opacity(1.0), 0, 0, 0],
                     0,
                 );
@@ -2131,24 +2322,28 @@
                     prim_info.clip_task_index,
                     prim_vis_mask,
                     ctx,
+                    render_tasks,
                 );
             }
             PrimitiveInstanceKind::YuvImage { data_handle, segment_instance_index, is_compositor_surface, .. } => {
                 if is_compositor_surface {
-                    self.emit_placeholder(prim_rect,
-                                          prim_info,
-                                          prim_vis_mask,
-                                          z_id,
-                                          transform_id,
-                                          batch_features,
-                                          ctx,
-                                          gpu_cache,
-                                          prim_headers);
+                    self.emit_placeholder(
+                        prim_rect,
+                        prim_info,
+                        prim_vis_mask,
+                        z_id,
+                        transform_id,
+                        batch_features,
+                        ctx,
+                        gpu_cache,
+                        prim_headers,
+                        render_tasks,
+                    );
                     return;
                 }
 
                 let yuv_image_data = &ctx.data_stores.yuv_image[data_handle].kind;
-                let mut textures = BatchTextures::no_texture();
+                let mut textures = TextureSet::UNTEXTURED;
                 let mut uv_rect_addresses = [0; 3];
 
                 //yuv channel
@@ -2178,11 +2373,11 @@
                 }
 
                 // All yuv textures should be the same type.
-                let buffer_kind = get_buffer_kind(textures.colors[0]);
+                let buffer_kind = textures.colors[0].image_buffer_kind();
                 assert!(
                     textures.colors[1 .. yuv_image_data.format.get_plane_num()]
                         .iter()
-                        .all(|&tid| buffer_kind == get_buffer_kind(tid))
+                        .all(|&tid| buffer_kind == tid.image_buffer_kind())
                 );
 
                 let kind = BrushBatchKind::YuvImage(
@@ -2253,19 +2448,23 @@
                     prim_info.clip_task_index,
                     prim_vis_mask,
                     ctx,
+                    render_tasks,
                 );
             }
             PrimitiveInstanceKind::Image { data_handle, image_instance_index, is_compositor_surface, .. } => {
                 if is_compositor_surface {
-                    self.emit_placeholder(prim_rect,
-                                          prim_info,
-                                          prim_vis_mask,
-                                          z_id,
-                                          transform_id,
-                                          batch_features,
-                                          ctx,
-                                          gpu_cache,
-                                          prim_headers);
+                    self.emit_placeholder(
+                        prim_rect,
+                        prim_info,
+                        prim_vis_mask,
+                        z_id,
+                        transform_id,
+                        batch_features,
+                        ctx,
+                        gpu_cache,
+                        prim_headers,
+                        render_tasks,
+                    );
                     return;
                 }
                 let image_data = &ctx.data_stores.image[data_handle].kind;
@@ -2318,7 +2517,9 @@
                         return;
                     }
 
-                    let textures = BatchTextures::color(cache_item.texture_id);
+                    let textures = TextureSet::prim_textured(
+                        cache_item.texture_id,
+                    );
 
                     let non_segmented_blend_mode = if !common_data.opacity.is_opaque ||
                         prim_info.clip_task_index != ClipTaskIndex::INVALID ||
@@ -2330,7 +2531,7 @@
                     };
 
                     let batch_params = BrushBatchParameters::shared(
-                        BrushBatchKind::Image(get_buffer_kind(cache_item.texture_id)),
+                        BrushBatchKind::Image(cache_item.texture_id.image_buffer_kind()),
                         textures,
                         prim_user_data,
                         cache_item.uv_rect_handle.as_int(gpu_cache),
@@ -2372,11 +2573,17 @@
                         prim_info.clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 } else {
                     const VECS_PER_SPECIFIC_BRUSH: usize = 3;
                     let max_tiles_per_header = (MAX_VERTEX_TEXTURE_WIDTH - VECS_PER_SPECIFIC_BRUSH) / VECS_PER_SEGMENT;
 
+                    let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                        prim_info.clip_task_index,
+                        render_tasks,
+                    ).unwrap();
+
                     // use temporary block storage since we don't know the number of visible tiles beforehand
                     let mut gpu_blocks = Vec::<GpuBlockData>::with_capacity(3 + max_tiles_per_header * 2);
                     for chunk in image_instance.visible_tiles.chunks(max_tiles_per_header) {
@@ -2406,6 +2613,7 @@
                                 gpu_cache,
                                 deferred_resolves,
                                 request.with_tile(tile.tile_offset),
+                                clip_mask_texture_id,
                             ) {
                                 let batch_key = BatchKey {
                                     blend_mode: specified_blend_mode,
@@ -2419,7 +2627,7 @@
                                     z_id,
                                     i as i32,
                                     tile.edge_flags,
-                                    clip_task_address.unwrap(),
+                                    clip_task_address,
                                     BrushFlags::SEGMENT_RELATIVE | BrushFlags::PERSPECTIVE_INTERPOLATION,
                                     prim_header_index,
                                     uv_rect_address.as_int(),
@@ -2464,8 +2672,18 @@
                             return;
                         }
 
-                        let textures = BatchTextures::color(cache_item.texture_id);
-                        let batch_kind = BrushBatchKind::Image(get_buffer_kind(cache_item.texture_id));
+                        let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                            prim_info.clip_task_index,
+                            render_tasks,
+                        ).unwrap();
+
+                        let textures = BatchTextures::prim_textured(
+                            cache_item.texture_id,
+                            clip_mask_texture_id,
+                        );
+                        let batch_kind = BrushBatchKind::Image(
+                            cache_item.texture_id.image_buffer_kind()
+                        );
                         let prim_user_data = ImageBrushData {
                             color_mode: ShaderColorMode::Image,
                             alpha_type: AlphaType::PremultipliedAlpha,
@@ -2507,7 +2725,7 @@
                             z_id,
                             INVALID_SEGMENT_INDEX,
                             EdgeAaSegmentMask::all(),
-                            clip_task_address.unwrap(),
+                            clip_task_address,
                             BrushFlags::PERSPECTIVE_INTERPOLATION,
                             prim_header_index,
                             specific_resource_address,
@@ -2517,7 +2735,7 @@
                 } else if gradient.visible_tiles_range.is_empty() {
                     let batch_params = BrushBatchParameters::shared(
                         BrushBatchKind::LinearGradient,
-                        BatchTextures::no_texture(),
+                        TextureSet::UNTEXTURED,
                         [
                             prim_data.stops_handle.as_int(gpu_cache),
                             0,
@@ -2555,22 +2773,29 @@
                         prim_info.clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 } else {
                     let visible_tiles = &ctx.scratch.gradient_tiles[gradient.visible_tiles_range];
 
+                    let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                        prim_info.clip_task_index,
+                        render_tasks,
+                    ).unwrap();
+
                     self.add_gradient_tiles(
                         visible_tiles,
                         &prim_data.stops_handle,
                         BrushBatchKind::LinearGradient,
                         specified_blend_mode,
                         bounding_rect,
-                        clip_task_address.unwrap(),
+                        clip_task_address,
                         gpu_cache,
                         &prim_header,
                         prim_headers,
                         z_id,
                         prim_vis_mask,
+                        clip_mask_texture_id,
                     );
                 }
             }
@@ -2597,7 +2822,7 @@
 
                     let batch_params = BrushBatchParameters::shared(
                         BrushBatchKind::RadialGradient,
-                        BatchTextures::no_texture(),
+                        TextureSet::UNTEXTURED,
                         [
                             prim_data.stops_handle.as_int(gpu_cache),
                             0,
@@ -2635,22 +2860,29 @@
                         prim_info.clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 } else {
                     let visible_tiles = &ctx.scratch.gradient_tiles[*visible_tiles_range];
 
+                    let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                        prim_info.clip_task_index,
+                        render_tasks,
+                    ).unwrap();
+
                     self.add_gradient_tiles(
                         visible_tiles,
                         &prim_data.stops_handle,
                         BrushBatchKind::RadialGradient,
                         specified_blend_mode,
                         bounding_rect,
-                        clip_task_address.unwrap(),
+                        clip_task_address,
                         gpu_cache,
                         &prim_header,
                         prim_headers,
                         z_id,
                         prim_vis_mask,
+                        clip_mask_texture_id,
                     );
                 }
             }
@@ -2677,7 +2909,7 @@
 
                     let batch_params = BrushBatchParameters::shared(
                         BrushBatchKind::ConicGradient,
-                        BatchTextures::no_texture(),
+                        TextureSet::UNTEXTURED,
                         [
                             prim_data.stops_handle.as_int(gpu_cache),
                             0,
@@ -2715,22 +2947,29 @@
                         prim_info.clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 } else {
                     let visible_tiles = &ctx.scratch.gradient_tiles[*visible_tiles_range];
 
+                    let (clip_task_address, clip_mask_texture_id) = ctx.get_prim_clip_task_and_texture(
+                        prim_info.clip_task_index,
+                        render_tasks,
+                    ).unwrap();
+
                     self.add_gradient_tiles(
                         visible_tiles,
                         &prim_data.stops_handle,
                         BrushBatchKind::ConicGradient,
                         specified_blend_mode,
                         bounding_rect,
-                        clip_task_address.unwrap(),
+                        clip_task_address,
                         gpu_cache,
                         &prim_header,
                         prim_headers,
                         z_id,
                         prim_vis_mask,
+                        clip_mask_texture_id,
                     );
                 }
             }
@@ -2753,7 +2992,7 @@
                     .get_texture_address(gpu_cache)
                     .as_int();
 
-                let textures = BatchTextures::render_target_cache();
+                let textures = BatchTextures::render_target_cache(TextureSource::Invalid);
                 let batch_key = BatchKey::new(
                     BatchKind::Brush(BrushBatchKind::Image(ImageBufferKind::Texture2DArray)),
                     BlendMode::PremultipliedAlpha,
@@ -2814,44 +3053,48 @@
         clip_task_index: ClipTaskIndex,
         prim_vis_mask: PrimitiveVisibilityMask,
         ctx: &RenderTargetContext,
+        render_tasks: &RenderTaskGraph,
     ) {
         debug_assert!(clip_task_index != ClipTaskIndex::INVALID);
 
         // Get GPU address of clip task for this segment, or None if
         // the entire segment is clipped out.
-        let clip_task_address = match ctx.get_clip_task_address(
+        if let Some((clip_task_address, clip_mask)) = ctx.get_clip_task_and_texture(
             clip_task_index,
             segment_index,
+            render_tasks,
         ) {
-            Some(clip_task_address) => clip_task_address,
-            None => return,
-        };
+            // If a got a valid (or OPAQUE) clip task address, add the segment.
+            let is_inner = segment.edge_flags.is_empty();
+            let needs_blending = !prim_opacity.is_opaque ||
+                                 clip_task_address != OPAQUE_TASK_ADDRESS ||
+                                 (!is_inner && transform_kind == TransformedRectKind::Complex);
+
+            let textures = BatchTextures {
+                input: segment_data.textures,
+                clip_mask,
+            };
 
-        // If a got a valid (or OPAQUE) clip task address, add the segment.
-        let is_inner = segment.edge_flags.is_empty();
-        let needs_blending = !prim_opacity.is_opaque ||
-                             clip_task_address != OPAQUE_TASK_ADDRESS ||
-                             (!is_inner && transform_kind == TransformedRectKind::Complex);
-
-        let batch_key = BatchKey {
-            blend_mode: if needs_blending { alpha_blend_mode } else { BlendMode::None },
-            kind: BatchKind::Brush(batch_kind),
-            textures: segment_data.textures,
-        };
+            let batch_key = BatchKey {
+                blend_mode: if needs_blending { alpha_blend_mode } else { BlendMode::None },
+                kind: BatchKind::Brush(batch_kind),
+                textures,
+            };
 
-        self.add_brush_instance_to_batches(
-            batch_key,
-            features,
-            bounding_rect,
-            z_id,
-            segment_index,
-            segment.edge_flags,
-            clip_task_address,
-            BrushFlags::PERSPECTIVE_INTERPOLATION | segment.brush_flags,
-            prim_header_index,
-            segment_data.specific_resource_address,
-            prim_vis_mask,
-        );
+            self.add_brush_instance_to_batches(
+                batch_key,
+                features,
+                bounding_rect,
+                z_id,
+                segment_index,
+                segment.edge_flags,
+                clip_task_address,
+                BrushFlags::PERSPECTIVE_INTERPOLATION | segment.brush_flags,
+                prim_header_index,
+                segment_data.specific_resource_address,
+                prim_vis_mask,
+            );
+        }
     }
 
     /// Add any segment(s) from a brush to batches.
@@ -2870,6 +3113,7 @@
         clip_task_index: ClipTaskIndex,
         prim_vis_mask: PrimitiveVisibilityMask,
         ctx: &RenderTargetContext,
+        render_tasks: &RenderTaskGraph,
     ) {
         match (brush_segments, &params.segment_data) {
             (Some(ref brush_segments), SegmentDataKind::Instanced(ref segment_data)) => {
@@ -2896,6 +3140,7 @@
                         clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 }
             }
@@ -2921,20 +3166,30 @@
                         clip_task_index,
                         prim_vis_mask,
                         ctx,
+                        render_tasks,
                     );
                 }
             }
             (None, SegmentDataKind::Shared(ref segment_data)) => {
                 // No segments, and thus no per-segment instance data.
                 // Note: the blend mode already takes opacity into account
+
+                let (clip_task_address, clip_mask) = ctx.get_prim_clip_task_and_texture(
+                    clip_task_index,
+                    render_tasks,
+                ).unwrap();
+
+                let textures = BatchTextures {
+                    input: segment_data.textures,
+                    clip_mask,
+                };
+
                 let batch_key = BatchKey {
                     blend_mode: non_segmented_blend_mode,
                     kind: BatchKind::Brush(params.batch_kind),
-                    textures: segment_data.textures,
+                    textures,
                 };
-                let clip_task_address = ctx.get_prim_clip_task_address(
-                    clip_task_index,
-                ).unwrap();
+
                 self.add_brush_instance_to_batches(
                     batch_key,
                     features,
@@ -2970,11 +3225,12 @@
         prim_headers: &mut PrimitiveHeaders,
         z_id: ZBufferId,
         prim_vis_mask: PrimitiveVisibilityMask,
+        clip_mask_texture_id: TextureSource,
     ) {
         let key = BatchKey {
             blend_mode,
             kind: BatchKind::Brush(kind),
-            textures: BatchTextures::no_texture(),
+            textures: BatchTextures::prim_untextured(clip_mask_texture_id),
         };
 
         let user_data = [stops_handle.as_int(gpu_cache), 0, 0, 0];
@@ -3010,6 +3266,7 @@
     gpu_cache: &mut GpuCache,
     deferred_resolves: &mut Vec<DeferredResolve>,
     request: ImageRequest,
+    clip_mask_texture_id: TextureSource,
 ) -> Option<(BrushBatchKind, BatchTextures, GpuCacheAddress)> {
 
     let cache_item = resolve_image(
@@ -3022,9 +3279,12 @@
     if cache_item.texture_id == TextureSource::Invalid {
         None
     } else {
-        let textures = BatchTextures::color(cache_item.texture_id);
+        let textures = BatchTextures::prim_textured(
+            cache_item.texture_id,
+            clip_mask_texture_id,
+        );
         Some((
-            BrushBatchKind::Image(get_buffer_kind(cache_item.texture_id)),
+            BrushBatchKind::Image(cache_item.texture_id.image_buffer_kind()),
             textures,
             gpu_cache.get_address(&cache_item.uv_rect_handle),
         ))
@@ -3065,7 +3325,7 @@
     /// across all segments.
     fn shared(
         batch_kind: BrushBatchKind,
-        textures: BatchTextures,
+        textures: TextureSet,
         prim_user_data: [i32; 4],
         specific_resource_address: i32,
     ) -> Self {
@@ -3086,11 +3346,12 @@
     fn resolve_surface(
         &self,
         task_id: RenderTaskId,
+        clip_mask: TextureSource,
         gpu_cache: &GpuCache,
     ) -> (GpuCacheAddress, BatchTextures) {
         (
             self[task_id].get_texture_address(gpu_cache),
-            BatchTextures::render_target_cache(),
+            BatchTextures::render_target_cache(clip_mask),
         )
     }
 }
@@ -3111,8 +3372,22 @@
                     // the deferred resolves list to be patched by
                     // the render thread...
                     let cache_handle = gpu_cache.push_deferred_per_frame_blocks(BLOCKS_PER_UV_RECT);
+
+                    let deferred_resolve_index = DeferredResolveIndex(deferred_resolves.len() as u32);
+
+                    let image_buffer_kind = match external_image.image_type {
+                        ExternalImageType::TextureHandle(target) => {
+                            target
+                        }
+                        ExternalImageType::Buffer => {
+                            // The ExternalImageType::Buffer should be handled by resource_cache.
+                            // It should go through the non-external case.
+                            panic!("Unexpected non-texture handle type");
+                        }
+                    };
+
                     let cache_item = CacheItem {
-                        texture_id: TextureSource::External(external_image),
+                        texture_id: TextureSource::External(deferred_resolve_index, image_buffer_kind),
                         uv_rect_handle: cache_handle,
                         uv_rect: DeviceIntRect::new(
                             DeviceIntPoint::zero(),
@@ -3538,59 +3813,48 @@
     }
 }
 
-// TODO(gw): This should probably be a method on TextureSource
-pub fn get_buffer_kind(texture: TextureSource) -> ImageBufferKind {
-    match texture {
-        TextureSource::External(ext_image) => {
-            match ext_image.image_type {
-                ExternalImageType::TextureHandle(target) => {
-                    target.into()
-                }
-                ExternalImageType::Buffer => {
-                    // The ExternalImageType::Buffer should be handled by resource_cache.
-                    // It should go through the non-external case.
-                    panic!("Unexpected non-texture handle type");
-                }
-            }
-        }
-        _ => ImageBufferKind::Texture2DArray,
-    }
-}
-
 impl<'a, 'rc> RenderTargetContext<'a, 'rc> {
     /// Retrieve the GPU task address for a given clip task instance.
     /// Returns None if the segment was completely clipped out.
     /// Returns Some(OPAQUE_TASK_ADDRESS) if no clip mask is needed.
     /// Returns Some(task_address) if there was a valid clip mask.
-    fn get_clip_task_address(
+    fn get_clip_task_and_texture(
         &self,
         clip_task_index: ClipTaskIndex,
         offset: i32,
-    ) -> Option<RenderTaskAddress> {
-        let address = match self.scratch.clip_mask_instances[clip_task_index.0 as usize + offset as usize] {
+        render_tasks: &RenderTaskGraph,
+    ) -> Option<(RenderTaskAddress, TextureSource)> {
+        match self.scratch.clip_mask_instances[clip_task_index.0 as usize + offset as usize] {
             ClipMaskKind::Mask(task_id) => {
-                task_id.into()
+                Some((
+                    task_id.into(),
+                    TextureSource::TextureCache(
+                        render_tasks[task_id].get_target_texture(),
+                        ImageBufferKind::Texture2DArray,
+                        Swizzle::default(),
+                    )
+                ))
             }
             ClipMaskKind::None => {
-                OPAQUE_TASK_ADDRESS
+                Some((OPAQUE_TASK_ADDRESS, TextureSource::Invalid))
             }
             ClipMaskKind::Clipped => {
-                return None;
+                None
             }
-        };
-
-        Some(address)
+        }
     }
 
     /// Helper function to get the clip task address for a
     /// non-segmented primitive.
-    fn get_prim_clip_task_address(
+    fn get_prim_clip_task_and_texture(
         &self,
         clip_task_index: ClipTaskIndex,
-    ) -> Option<RenderTaskAddress> {
-        self.get_clip_task_address(
+        render_tasks: &RenderTaskGraph,
+    ) -> Option<(RenderTaskAddress, TextureSource)> {
+        self.get_clip_task_and_texture(
             clip_task_index,
             0,
+            render_tasks,
         )
     }
 }
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/composite.rs firefox-85.0+build1/gfx/wr/webrender/src/composite.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/composite.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/composite.rs	2021-01-18 19:58:12.000000000 +0000
@@ -2,16 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use api::{ColorF, YuvColorSpace, YuvFormat, ImageRendering, ExternalImageId};
+use api::{ColorF, YuvColorSpace, YuvFormat, ImageRendering, ExternalImageId, ImageBufferKind};
 use api::units::*;
-use crate::batch::{resolve_image, get_buffer_kind};
+use crate::batch::{resolve_image};
 use euclid::Transform3D;
 use crate::gpu_cache::GpuCache;
 use crate::gpu_types::{ZBufferId, ZBufferIdGenerator};
 use crate::internal_types::TextureSource;
 use crate::picture::{ImageDependency, ResolvedSurfaceTexture, TileCacheInstance, TileId, TileSurface};
 use crate::prim_store::DeferredResolve;
-use crate::renderer::ImageBufferKind;
 use crate::resource_cache::{ImageRequest, ResourceCache};
 use crate::util::Preallocator;
 use crate::tile_cache::PictureCacheDebugInfo;
@@ -158,9 +157,13 @@
 
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub struct ResolvedExternalSurfaceIndex(pub usize);
 
+impl ResolvedExternalSurfaceIndex {
+    pub const INVALID: ResolvedExternalSurfaceIndex = ResolvedExternalSurfaceIndex(usize::MAX);
+}
+
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub enum ResolvedExternalSurfaceColorData {
@@ -349,7 +352,6 @@
 #[derive(PartialEq, Clone)]
 pub struct CompositeSurfaceDescriptor {
     pub surface_id: Option<NativeSurfaceId>,
-    pub offset: DevicePoint,
     pub clip_rect: DeviceRect,
     pub transform: CompositorSurfaceTransform,
     // A list of image keys and generations that this compositor surface
@@ -529,7 +531,14 @@
 
             // Accumulate this tile into the overall surface bounds. This is used below
             // to clamp the size of the supplied clip rect to a reasonable value.
-            surface_device_rect = surface_device_rect.union(&device_rect);
+            // NOTE: This clip rect must include the device_valid_rect rather than
+            //       the tile device rect. This ensures that in the case of a picture
+            //       cache slice that is smaller than a single tile, the clip rect in
+            //       the composite descriptor will change if the position of that slice
+            //       is changed. Otherwise, WR may conclude that no composite is needed
+            //       if the tile itself was not invalidated due to changing content.
+            //       See bug #1675414 for more detail.
+            surface_device_rect = surface_device_rect.union(&tile.device_valid_rect);
 
             let descriptor = CompositeTileDescriptor {
                 surface_kind: surface.into(),
@@ -597,11 +606,12 @@
             self.descriptor.surfaces.push(
                 CompositeSurfaceDescriptor {
                     surface_id: tile_cache.native_surface.as_ref().map(|s| s.opaque),
-                    offset: tile_cache.device_position,
                     clip_rect: surface_clip_rect,
-                    transform: CompositorSurfaceTransform::translation(tile_cache.device_position.x,
-                                                                              tile_cache.device_position.y,
-                                                                              0.0),
+                    transform: CompositorSurfaceTransform::translation(
+                        tile_cache.device_position.x,
+                        tile_cache.device_position.y,
+                        0.0,
+                    ),
                     image_dependencies: [ImageDependency::INVALID; 3],
                     image_rendering: ImageRendering::CrispEdges,
                     tile_descriptors: opaque_tile_descriptors,
@@ -612,14 +622,11 @@
         // For each compositor surface that was promoted, build the
         // information required for the compositor to draw it
         for external_surface in &tile_cache.external_surfaces {
+            let clip_rect = external_surface
+                .clip_rect
+                .intersection(&device_clip_rect)
+                .unwrap_or_else(DeviceRect::zero);
 
-            let mut planes = [
-                ExternalPlaneDescriptor::invalid(),
-                ExternalPlaneDescriptor::invalid(),
-                ExternalPlaneDescriptor::invalid(),
-            ];
-
-            // Step through the image keys, and build a plane descriptor for each
             let required_plane_count =
                 match external_surface.dependency {
                     ExternalSurfaceDependency::Yuv { format, .. } => {
@@ -629,7 +636,6 @@
                         1
                     }
                 };
-            let mut valid_plane_count = 0;
 
             let mut image_dependencies = [ImageDependency::INVALID; 3];
 
@@ -643,102 +649,37 @@
                     }
                 };
                 image_dependencies[i] = dependency;
+            }
 
-                let request = ImageRequest {
-                    key: dependency.key,
-                    rendering: external_surface.image_rendering,
-                    tile: None,
-                };
-
-                let cache_item = resolve_image(
-                    request,
+            // Get a new z_id for each compositor surface, to ensure correct ordering
+            // when drawing with the simple (Draw) compositor, and to schedule compositing
+            // of any required updates into the surfaces.
+            let needs_external_surface_update = match self.compositor_kind {
+                CompositorKind::Draw { .. } => true,
+                _ => external_surface.update_params.is_some(),
+            };
+            let external_surface_index = if needs_external_surface_update {
+                let external_surface_index = self.compute_external_surface_dependencies(
+                    &external_surface,
+                    &image_dependencies,
+                    required_plane_count,
                     resource_cache,
                     gpu_cache,
                     deferred_resolves,
                 );
-
-                if cache_item.texture_id != TextureSource::Invalid {
-                    valid_plane_count += 1;
-                    let plane = &mut planes[i];
-                    *plane = ExternalPlaneDescriptor {
-                        texture: cache_item.texture_id,
-                        texture_layer: cache_item.texture_layer,
-                        uv_rect: cache_item.uv_rect.into(),
-                    };
+                if external_surface_index == ResolvedExternalSurfaceIndex::INVALID {
+                    continue;
                 }
-            }
-
-            // Check if there are valid images added for each YUV plane
-            if valid_plane_count < required_plane_count {
-                warn!("Warnings: skip a YUV/RGB compositor surface, found {}/{} valid images",
-                    valid_plane_count,
-                    required_plane_count,
-                );
-                continue;
-            }
-
-            let clip_rect = external_surface
-                .clip_rect
-                .intersection(&device_clip_rect)
-                .unwrap_or_else(DeviceRect::zero);
-
-            // Get a new z_id for each compositor surface, to ensure correct ordering
-            // when drawing with the simple (Draw) compositor.
-
-            let surface = CompositeTileSurface::ExternalSurface {
-                external_surface_index: ResolvedExternalSurfaceIndex(self.external_surfaces.len()),
+                external_surface_index
+            } else {
+                ResolvedExternalSurfaceIndex::INVALID
             };
 
-            // If the external surface descriptor reports that the native surface
-            // needs to be updated, create an update params tuple for the renderer
-            // to use.
-            let update_params = external_surface.update_params.map(|surface_size| {
-                (
-                    external_surface.native_surface_id.expect("bug: no native surface!"),
-                    surface_size
-                )
-            });
-
-            match external_surface.dependency {
-                ExternalSurfaceDependency::Yuv{ color_space, format, rescale, .. } => {
-
-                    let image_buffer_kind = get_buffer_kind(planes[0].texture);
-
-                    self.external_surfaces.push(ResolvedExternalSurface {
-                        color_data: ResolvedExternalSurfaceColorData::Yuv {
-                            image_dependencies,
-                            planes,
-                            color_space,
-                            format,
-                            rescale,
-                        },
-                        image_buffer_kind,
-                        update_params,
-                    });
-                },
-                ExternalSurfaceDependency::Rgb{ flip_y, .. } => {
-
-                    let image_buffer_kind = get_buffer_kind(planes[0].texture);
-
-                    // Only propagate flip_y if the compositor doesn't support transforms,
-                    // since otherwise it'll be handled as part of the transform.
-                    self.external_surfaces.push(ResolvedExternalSurface {
-                        color_data: ResolvedExternalSurfaceColorData::Rgb {
-                            image_dependency: image_dependencies[0],
-                            plane: planes[0],
-                            flip_y: flip_y && !self.compositor_kind.supports_transforms(),
-                        },
-                        image_buffer_kind,
-                        update_params,
-                    });
-                },
-            }
-
             let tile = CompositeTile {
-                surface,
+                surface: CompositeTileSurface::ExternalSurface { external_surface_index },
                 rect: external_surface.surface_rect,
-                valid_rect: external_surface.device_rect.translate(-external_surface.device_rect.origin.to_vector()),
-                dirty_rect: external_surface.device_rect.translate(-external_surface.device_rect.origin.to_vector()),
+                valid_rect: external_surface.surface_rect.translate(-external_surface.surface_rect.origin.to_vector()),
+                dirty_rect: external_surface.surface_rect.translate(-external_surface.surface_rect.origin.to_vector()),
                 clip_rect,
                 transform: Some(external_surface.transform),
                 z_id: external_surface.z_id,
@@ -750,7 +691,6 @@
             self.descriptor.surfaces.push(
                 CompositeSurfaceDescriptor {
                     surface_id: external_surface.native_surface_id,
-                    offset: tile.rect.origin,
                     clip_rect,
                     transform: external_surface.transform,
                     image_dependencies: image_dependencies,
@@ -767,11 +707,12 @@
             self.descriptor.surfaces.push(
                 CompositeSurfaceDescriptor {
                     surface_id: tile_cache.native_surface.as_ref().map(|s| s.alpha),
-                    offset: tile_cache.device_position,
                     clip_rect: surface_clip_rect,
-                    transform: CompositorSurfaceTransform::translation(tile_cache.device_position.x,
-                                                                              tile_cache.device_position.y,
-                                                                              0.0),
+                    transform: CompositorSurfaceTransform::translation(
+                        tile_cache.device_position.x,
+                        tile_cache.device_position.y,
+                        0.0,
+                    ),
                     image_dependencies: [ImageDependency::INVALID; 3],
                     image_rendering: ImageRendering::CrispEdges,
                     tile_descriptors: alpha_tile_descriptors,
@@ -780,6 +721,105 @@
         }
     }
 
+    fn compute_external_surface_dependencies(
+        &mut self,
+        external_surface: &ExternalSurfaceDescriptor,
+        image_dependencies: &[ImageDependency; 3],
+        required_plane_count: usize,
+        resource_cache: &ResourceCache,
+        gpu_cache: &mut GpuCache,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+    ) -> ResolvedExternalSurfaceIndex {
+        let mut planes = [
+            ExternalPlaneDescriptor::invalid(),
+            ExternalPlaneDescriptor::invalid(),
+            ExternalPlaneDescriptor::invalid(),
+        ];
+
+        let mut valid_plane_count = 0;
+        for i in 0 .. required_plane_count {
+            let request = ImageRequest {
+                key: image_dependencies[i].key,
+                rendering: external_surface.image_rendering,
+                tile: None,
+            };
+
+            let cache_item = resolve_image(
+                request,
+                resource_cache,
+                gpu_cache,
+                deferred_resolves,
+            );
+
+            if cache_item.texture_id != TextureSource::Invalid {
+                valid_plane_count += 1;
+                let plane = &mut planes[i];
+                *plane = ExternalPlaneDescriptor {
+                    texture: cache_item.texture_id,
+                    texture_layer: cache_item.texture_layer,
+                    uv_rect: cache_item.uv_rect.into(),
+                };
+            }
+        }
+
+        // Check if there are valid images added for each YUV plane
+        if valid_plane_count < required_plane_count {
+            warn!("Warnings: skip a YUV/RGB compositor surface, found {}/{} valid images",
+                valid_plane_count,
+                required_plane_count,
+            );
+            return ResolvedExternalSurfaceIndex::INVALID;
+        }
+            
+        let external_surface_index = ResolvedExternalSurfaceIndex(self.external_surfaces.len());
+
+        // If the external surface descriptor reports that the native surface
+        // needs to be updated, create an update params tuple for the renderer
+        // to use.
+        let update_params = external_surface.update_params.map(|surface_size| {
+            (
+                external_surface.native_surface_id.expect("bug: no native surface!"),
+                surface_size
+            )
+        });
+
+        match external_surface.dependency {
+            ExternalSurfaceDependency::Yuv{ color_space, format, rescale, .. } => {
+
+                let image_buffer_kind = planes[0].texture.image_buffer_kind();
+
+                self.external_surfaces.push(ResolvedExternalSurface {
+                    color_data: ResolvedExternalSurfaceColorData::Yuv {
+                        image_dependencies: *image_dependencies,
+                        planes,
+                        color_space,
+                        format,
+                        rescale,
+                    },
+                    image_buffer_kind,
+                    update_params,
+                });
+            },
+            ExternalSurfaceDependency::Rgb{ flip_y, .. } => {
+
+                let image_buffer_kind = planes[0].texture.image_buffer_kind();
+
+                // Only propagate flip_y if the compositor doesn't support transforms,
+                // since otherwise it'll be handled as part of the transform.
+                self.external_surfaces.push(ResolvedExternalSurface {
+                    color_data: ResolvedExternalSurfaceColorData::Rgb {
+                        image_dependency: image_dependencies[0],
+                        plane: planes[0],
+                        flip_y: flip_y && !self.compositor_kind.supports_transforms(),
+                    },
+                    image_buffer_kind,
+                    update_params,
+                });
+            },
+        }
+        external_surface_index
+    }
+
     /// Add a tile to the appropriate array, depending on tile properties and compositor mode.
     fn push_tile(
         &mut self,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/debug_render.rs firefox-85.0+build1/gfx/wr/webrender/src/debug_render.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/debug_render.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/debug_render.rs	2021-01-18 19:58: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/. */
 
-use api::{ColorU, ColorF, ImageFormat, TextureTarget};
+use api::{ColorU, ColorF, ImageFormat, ImageBufferKind};
 use api::units::*;
 use crate::debug_font_data;
 use crate::device::{Device, Program, Texture, TextureSlot, VertexDescriptor, ShaderError, VAO};
@@ -140,7 +140,7 @@
         let tri_vao = device.create_vao(&DESC_COLOR);
 
         let font_texture = device.create_texture(
-            TextureTarget::Array,
+            ImageBufferKind::Texture2DArray,
             ImageFormat::R8,
             debug_font_data::BMP_WIDTH,
             debug_font_data::BMP_HEIGHT,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/device/gl.rs firefox-85.0+build1/gfx/wr/webrender/src/device/gl.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/device/gl.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/device/gl.rs	2021-01-18 19:58:12.000000000 +0000
@@ -4,7 +4,7 @@
 
 use super::super::shader_source::{OPTIMIZED_SHADERS, UNOPTIMIZED_SHADERS};
 use api::{ColorF, ImageDescriptor, ImageFormat};
-use api::{MixBlendMode, TextureTarget, VoidPtrToSizeFn};
+use api::{MixBlendMode, ImageBufferKind, VoidPtrToSizeFn};
 use api::units::*;
 use euclid::default::Transform3D;
 use gleam::gl;
@@ -150,12 +150,12 @@
     (pixels as usize) * 4
 }
 
-pub fn get_gl_target(target: TextureTarget) -> gl::GLuint {
+pub fn get_gl_target(target: ImageBufferKind) -> gl::GLuint {
     match target {
-        TextureTarget::Default => gl::TEXTURE_2D,
-        TextureTarget::Array => gl::TEXTURE_2D_ARRAY,
-        TextureTarget::Rect => gl::TEXTURE_RECTANGLE,
-        TextureTarget::External => gl::TEXTURE_EXTERNAL_OES,
+        ImageBufferKind::Texture2D => gl::TEXTURE_2D,
+        ImageBufferKind::Texture2DArray => gl::TEXTURE_2D_ARRAY,
+        ImageBufferKind::TextureRect => gl::TEXTURE_RECTANGLE,
+        ImageBufferKind::TextureExternal => gl::TEXTURE_EXTERNAL_OES,
     }
 }
 
@@ -383,7 +383,7 @@
 impl ExternalTexture {
     pub fn new(
         id: u32,
-        target: TextureTarget,
+        target: ImageBufferKind,
         swizzle: Swizzle,
         uv_rect: TexelRect,
     ) -> Self {
@@ -486,6 +486,10 @@
         self.last_frame_used == frame_id
     }
 
+    pub fn is_render_target(&self) -> bool {
+        !self.fbos.is_empty()
+    }
+
     /// Returns true if this texture was used within `threshold` frames of
     /// the current frame.
     pub fn used_recently(&self, current_frame_id: GpuFrameId, threshold: usize) -> bool {
@@ -941,10 +945,6 @@
     /// bound to a non-0th layer of a texture array. This is buggy on
     /// Adreno devices.
     pub supports_blit_to_texture_array: bool,
-    /// Whether we can use the pixel local storage functionality that
-    /// is available on some mobile GPUs. This allows fast access to
-    /// the per-pixel tile memory.
-    pub supports_pixel_local_storage: bool,
     /// Whether advanced blend equations are supported.
     pub supports_advanced_blend_equation: bool,
     /// Whether dual-source blending is supported.
@@ -1317,7 +1317,6 @@
         use_optimized_shaders: bool,
         upload_method: UploadMethod,
         cached_programs: Option<Rc<ProgramCache>>,
-        allow_pixel_local_storage_support: bool,
         allow_texture_storage_support: bool,
         allow_texture_swizzling: bool,
         dump_shader_source: Option<String>,
@@ -1497,12 +1496,11 @@
             color_formats, bgra_formats, bgra8_sampling_swizzle, texture_storage_usage, depth_format);
 
         // On Mali-T devices glCopyImageSubData appears to stall the pipeline until any pending
-        // renders to the source texture have completed. Using an alternative such as
-        // glBlitFramebuffer is preferable on such devices, so pretend we don't support
-        // glCopyImageSubData. See bug 1669494.
-        // We cannot do the same on Mali-G devices, because glBlitFramebuffer can cause corruption.
-        // See bug 1669960.
-        let supports_copy_image_sub_data = if renderer_name.starts_with("Mali-T") {
+        // renders to the source texture have completed. On Mali-G, it has been observed to
+        // indefinitely hang in some circumstances. Using an alternative such as glBlitFramebuffer
+        // is preferable on such devices, so pretend we don't support glCopyImageSubData.
+        // See bugs 1669494 and 1677757.
+        let supports_copy_image_sub_data = if renderer_name.starts_with("Mali") {
             false
         } else {
             supports_extension(&extensions, "GL_EXT_copy_image") ||
@@ -1526,17 +1524,6 @@
         // a non-0th layer of a texture array is not supported.
         let supports_blit_to_texture_array = !renderer_name.starts_with("Adreno");
 
-        // Check if the device supports the two extensions needed in order to use
-        // pixel local storage.
-        // TODO(gw): Consider if we can remove fb fetch / init, by using PLS for opaque pass too.
-        // TODO(gw): Support EXT_shader_framebuffer_fetch as well.
-        let ext_pixel_local_storage = supports_extension(&extensions, "GL_EXT_shader_pixel_local_storage");
-        let ext_framebuffer_fetch = supports_extension(&extensions, "GL_ARM_shader_framebuffer_fetch");
-        let supports_pixel_local_storage =
-            allow_pixel_local_storage_support &&
-            ext_framebuffer_fetch &&
-            ext_pixel_local_storage;
-
         // KHR_blend_equation_advanced renders incorrectly on Adreno
         // devices. This has only been confirmed up to Adreno 5xx, and has been
         // fixed for Android 9, so this condition could be made more specific.
@@ -1615,7 +1602,6 @@
                 supports_copy_image_sub_data,
                 supports_buffer_storage,
                 supports_blit_to_texture_array,
-                supports_pixel_local_storage,
                 supports_advanced_blend_equation,
                 supports_dual_source_blending,
                 supports_khr_debug,
@@ -2223,7 +2209,7 @@
 
     pub fn create_texture(
         &mut self,
-        target: TextureTarget,
+        target: ImageBufferKind,
         format: ImageFormat,
         mut width: i32,
         mut height: i32,
@@ -2392,8 +2378,10 @@
             .tex_parameter_i(target, gl::TEXTURE_WRAP_T, gl::CLAMP_TO_EDGE as gl::GLint);
     }
 
-    /// Copies the contents from one renderable texture to another.
-    pub fn blit_renderable_texture(
+    /// Copies the entire contents of one texture to another. The dest texture must be at least
+    /// as large as the source texture in each dimension. No scaling is performed, so if the dest
+    /// texture is larger than the source texture then some of its pixels will not be written to.
+    pub fn copy_entire_texture(
         &mut self,
         dst: &mut Texture,
         src: &Texture,
@@ -2403,32 +2391,77 @@
         debug_assert!(dst.size.height >= src.size.height);
         debug_assert!(dst.layer_count >= src.layer_count);
 
+        self.copy_texture_sub_region(
+            src,
+            0,
+            0,
+            0,
+            dst,
+            0,
+            0,
+            0,
+            src.size.width as _,
+            src.size.height as _,
+            src.layer_count as _,
+        );
+    }
+
+    /// Copies the specified subregion from src_texture to dest_texture.
+    pub fn copy_texture_sub_region(
+        &mut self,
+        src_texture: &Texture,
+        src_x: usize,
+        src_y: usize,
+        src_z: LayerIndex,
+        dest_texture: &Texture,
+        dest_x: usize,
+        dest_y: usize,
+        dest_z: LayerIndex,
+        width: usize,
+        height: usize,
+        depth: LayerIndex,
+    ) {
         if self.capabilities.supports_copy_image_sub_data {
-            assert_ne!(src.id, dst.id,
-                    "glCopyImageSubData's behaviour is undefined if src and dst images are identical and the rectangles overlap.");
+            assert_ne!(
+                src_texture.id, dest_texture.id,
+                "glCopyImageSubData's behaviour is undefined if src and dst images are identical and the rectangles overlap."
+            );
             unsafe {
-                self.gl.copy_image_sub_data(src.id, src.target, 0,
-                                            0, 0, 0,
-                                            dst.id, dst.target, 0,
-                                            0, 0, 0,
-                                            src.size.width as _, src.size.height as _, src.layer_count);
+                self.gl.copy_image_sub_data(
+                    src_texture.id,
+                    src_texture.target,
+                    0,
+                    src_x as _,
+                    src_y as _,
+                    src_z as _,
+                    dest_texture.id,
+                    dest_texture.target,
+                    0,
+                    dest_x as _,
+                    dest_y as _,
+                    dest_z as _,
+                    width as _,
+                    height as _,
+                    depth as _,
+                );
             }
         } else {
-            let rect = FramebufferIntRect::new(
-                FramebufferIntPoint::zero(),
-                device_size_as_framebuffer_size(src.get_dimensions()),
-            );
-            for layer in 0..src.layer_count.min(dst.layer_count) as LayerIndex {
+            for i in 0..depth as LayerIndex {
+                let src_offset = FramebufferIntPoint::new(src_x as i32, src_y as i32);
+                let dest_offset = FramebufferIntPoint::new(dest_x as i32, dest_y as i32);
+                let size = FramebufferIntSize::new(width as i32, height as i32);
+
                 self.blit_render_target(
-                    ReadTarget::from_texture(src, layer),
-                    rect,
-                    DrawTarget::from_texture(dst, layer, false),
-                    rect,
-                    TextureFilter::Linear
+                    ReadTarget::from_texture(src_texture, src_z + i),
+                    FramebufferIntRect::new(src_offset, size),
+                    DrawTarget::from_texture(dest_texture, dest_z + i, false),
+                    FramebufferIntRect::new(dest_offset, size),
+                    // In most cases the filter shouldn't matter, as there is no scaling involved
+                    // in the blit. We were previously using Linear, but this caused issues when
+                    // blitting RGBAF32 textures on Mali, so use Nearest to be safe.
+                    TextureFilter::Nearest,
                 );
             }
-            self.reset_draw_target();
-            self.reset_read_target();
         }
     }
 
@@ -3095,7 +3128,7 @@
     }
 
     pub fn attach_read_texture_external(
-        &mut self, texture_id: gl::GLuint, target: TextureTarget, layer_id: i32
+        &mut self, texture_id: gl::GLuint, target: ImageBufferKind, layer_id: i32
     ) {
         self.attach_read_texture_raw(texture_id, get_gl_target(target), layer_id)
     }
@@ -3653,18 +3686,6 @@
         supports_extension(&self.extensions, extension)
     }
 
-    /// Enable the pixel local storage functionality. Caller must
-    /// have already confirmed the device supports this.
-    pub fn enable_pixel_local_storage(&mut self, enable: bool) {
-        debug_assert!(self.capabilities.supports_pixel_local_storage);
-
-        if enable {
-            self.gl.enable(gl::SHADER_PIXEL_LOCAL_STORAGE_EXT);
-        } else {
-            self.gl.disable(gl::SHADER_PIXEL_LOCAL_STORAGE_EXT);
-        }
-    }
-
     pub fn echo_driver_messages(&self) {
         if self.capabilities.supports_khr_debug {
             Device::log_driver_messages(self.gl());
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/frame_builder.rs firefox-85.0+build1/gfx/wr/webrender/src/frame_builder.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/frame_builder.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/frame_builder.rs	2021-01-18 19:58:11.000000000 +0000
@@ -10,11 +10,11 @@
 use crate::composite::{CompositorKind, CompositeState, CompositeStatePreallocator};
 use crate::debug_render::DebugItem;
 use crate::gpu_cache::{GpuCache, GpuCacheHandle};
-use crate::gpu_types::{PrimitiveHeaders, TransformPalette, UvRectKind, ZBufferIdGenerator};
+use crate::gpu_types::{PrimitiveHeaders, TransformPalette, ZBufferIdGenerator};
 use crate::gpu_types::TransformData;
-use crate::internal_types::{FastHashMap, PlaneSplitter, SavedTargetIndex};
+use crate::internal_types::{CacheTextureId, FastHashMap, PlaneSplitter};
 use crate::picture::{DirtyRegion, PictureUpdateState, SliceId, TileCacheInstance};
-use crate::picture::{SurfaceRenderTasks, SurfaceInfo, SurfaceIndex, ROOT_SURFACE_INDEX};
+use crate::picture::{SurfaceInfo, SurfaceIndex, ROOT_SURFACE_INDEX};
 use crate::picture::{BackdropKind, SubpixelMode, TileCacheLogger, RasterConfig, PictureCompositeMode};
 use crate::prepare::prepare_primitives;
 use crate::prim_store::{PictureIndex, PrimitiveDebugId};
@@ -24,8 +24,8 @@
 use crate::render_target::{RenderTarget, PictureCacheTarget, TextureCacheRenderTarget};
 use crate::render_target::{RenderTargetContext, RenderTargetKind};
 use crate::render_task_graph::{RenderTaskId, RenderTaskGraph, RenderTaskGraphCounters};
-use crate::render_task_graph::{RenderPassKind, RenderPass};
-use crate::render_task::{RenderTask, RenderTaskLocation, RenderTaskKind};
+use crate::render_task_graph::RenderPass;
+use crate::render_task::{RenderTaskLocation, RenderTaskKind};
 use crate::resource_cache::{ResourceCache};
 use crate::scene::{BuiltScene, SceneProperties};
 use crate::space::SpaceMapper;
@@ -185,6 +185,7 @@
     pub dirty_region_stack: Vec<DirtyRegion>,
     pub composite_state: &'a mut CompositeState,
     pub num_visible_primitives: u32,
+    pub render_task_roots: &'a mut Vec<RenderTaskId>,
 }
 
 impl<'a> FrameBuildingState<'a> {
@@ -258,11 +259,12 @@
         tile_cache_logger: &mut TileCacheLogger,
         tile_caches: &mut FastHashMap<SliceId, Box<TileCacheInstance>>,
         profile: &mut TransactionProfile,
-    ) -> Option<RenderTaskId> {
+        render_task_roots: &mut Vec<RenderTaskId>,
+    ) {
         profile_scope!("build_layer_screen_rects_and_cull_layers");
 
         if scene.prim_store.pictures.is_empty() {
-            return None
+            return
         }
 
         scratch.begin_frame();
@@ -284,21 +286,6 @@
             fb_config: &scene.config,
         };
 
-        let root_render_task_id = render_tasks.add().init(
-            RenderTask::new_picture(
-                RenderTaskLocation::Fixed(scene.output_rect),
-                scene.output_rect.size.to_f32(),
-                scene.root_pic_index,
-                DevicePoint::zero(),
-                UvRectKind::Rect,
-                ROOT_SPATIAL_NODE_INDEX,
-                global_device_pixel_scale,
-                PrimitiveVisibilityMask::all(),
-                None,
-                None,
-            )
-        );
-
         // Construct a dummy root surface, that represents the
         // main framebuffer surface.
         let root_surface = SurfaceInfo::new(
@@ -388,17 +375,9 @@
             dirty_region_stack: scratch.frame.dirty_region_stack.take(),
             composite_state,
             num_visible_primitives: 0,
+            render_task_roots,
         };
 
-        frame_state
-            .surfaces
-            .first_mut()
-            .unwrap()
-            .render_tasks = Some(SurfaceRenderTasks {
-                root: root_render_task_id,
-                port: root_render_task_id,
-            });
-
         // Push a default dirty region which culls primitives
         // against the screen world rect, in absence of any
         // other dirty regions.
@@ -468,12 +447,9 @@
 
             resource_cache.block_until_all_resources_added(
                 gpu_cache,
-                render_tasks,
                 profile,
             );
         }
-
-        Some(root_render_task_id)
     }
 
     pub fn build(
@@ -530,7 +506,8 @@
 
         self.composite_state_prealloc.preallocate(&mut composite_state);
 
-        let main_render_task_id = self.build_layer_screen_rects_and_cull_layers(
+        let mut render_task_roots = Vec::new();
+        self.build_layer_screen_rects_and_cull_layers(
             scene,
             screen_world_rect,
             resource_cache,
@@ -546,6 +523,7 @@
             tile_cache_logger,
             tile_caches,
             profile,
+            &mut render_task_roots,
         );
 
         profile.start_time(profiler::FRAME_BATCHING_TIME);
@@ -561,7 +539,7 @@
             profile_marker!("Batching");
 
             passes = render_tasks.generate_passes(
-                main_render_task_id,
+                &render_task_roots,
                 output_size,
                 scene.config.gpu_supports_fast_clears,
             );
@@ -571,6 +549,15 @@
             let use_dual_source_blending = scene.config.dual_source_blending_is_enabled &&
                                            scene.config.dual_source_blending_is_supported;
 
+            // As an incremental approach to moving to a proper DAG for render tasks, we
+            // implement the existing saved texture functionality here.
+
+            // Textures that are marked for saving until the end of the frame
+            let mut saved_texture_ids = Vec::new();
+            // Textures that are written to on this pass and should be returned / invalidated
+            // on the following pass.
+            let mut active_texture_ids = Vec::new();
+
             for pass in &mut passes {
                 let mut ctx = RenderTargetContext {
                     global_device_pixel_scale,
@@ -591,6 +578,7 @@
 
                 build_render_pass(
                     pass,
+                    output_size,
                     &mut ctx,
                     gpu_cache,
                     &mut render_tasks,
@@ -602,18 +590,92 @@
                     &mut composite_state,
                 );
 
-                match pass.kind {
-                    RenderPassKind::MainFramebuffer { .. } => {}
-                    RenderPassKind::OffScreen {
-                        ref texture_cache,
-                        ref picture_cache,
-                        ..
-                    } => {
-                        has_texture_cache_tasks |= !texture_cache.is_empty();
-                        has_texture_cache_tasks |= !picture_cache.is_empty();
+                has_texture_cache_tasks |= !pass.texture_cache.is_empty();
+                has_texture_cache_tasks |= !pass.picture_cache.is_empty();
+
+                // Check which textures in this pass need to be saved until the end of
+                // the frame. This will all disappear once render task graph is a full DAG.
+                let mut save_color = false;
+                let mut save_alpha = false;
+
+                for task_id in &pass.tasks {
+                    let task = &render_tasks[*task_id];
+                    match task.target_kind() {
+                        RenderTargetKind::Color => {
+                            save_color |= task.save_target;
+                        }
+                        RenderTargetKind::Alpha => {
+                            save_alpha |= task.save_target;
+                        }
+                    }
+                }
+
+                // Return previous frame's textures to the target pool, so they are available
+                // for use on subsequent passes. Also include these in the list for the renderer
+                // to immediately invalidate once they are no longer used.
+                for texture_id in active_texture_ids.drain(..) {
+                    resource_cache.return_render_target_to_pool(texture_id);
+                    pass.textures_to_invalidate.push(texture_id);
+                }
+
+                if let Some(texture_id) = pass.color.texture_id {
+                    if save_color {
+                        saved_texture_ids.push(texture_id);
+                    } else {
+                        active_texture_ids.push(texture_id);
                     }
                 }
+
+                if let Some(texture_id) = pass.alpha.texture_id {
+                    if save_alpha {
+                        saved_texture_ids.push(texture_id);
+                    } else {
+                        active_texture_ids.push(texture_id);
+                    }
+                }
+            }
+
+            assert!(active_texture_ids.is_empty());
+
+            // At the end of the pass loop, return any saved textures to the pool. Also
+            // add them to the final pass to invalidate those textures (which will be the
+            // pass that writes to picture cache tiles or texture cache targets). This is
+            // mostly implicit in the current scheme, but will become a lot clearer and
+            // more explicit once we implement the full render task DAG.
+
+            for texture_id in saved_texture_ids.drain(..) {
+                resource_cache.return_render_target_to_pool(texture_id);
+                passes.last_mut().unwrap().textures_to_invalidate.push(texture_id);
             }
+
+            let mut ctx = RenderTargetContext {
+                global_device_pixel_scale,
+                prim_store: &scene.prim_store,
+                resource_cache,
+                use_dual_source_blending,
+                use_advanced_blending: scene.config.gpu_supports_advanced_blend,
+                break_advanced_blend_batches: !scene.config.advanced_blend_is_coherent,
+                batch_lookback_count: scene.config.batch_lookback_count,
+                spatial_tree: &scene.spatial_tree,
+                data_stores,
+                surfaces: &scratch.frame.surfaces,
+                scratch: &mut scratch.primitive,
+                screen_world_rect,
+                globals: &self.globals,
+                tile_caches,
+            };
+
+            self.build_composite_pass(
+                scene,
+                &mut ctx,
+                gpu_cache,
+                &render_tasks,
+                &mut deferred_resolves,
+                &mut transform_palette,
+                &mut prim_headers,
+                &mut z_generator,
+                &mut composite_state,
+            );
         }
 
         profile.end_time(profiler::FRAME_BATCHING_TIME);
@@ -644,6 +706,67 @@
             composite_state,
         }
     }
+
+    /// This is a temporary method that does the minimal amount of work to
+    /// invoke the existing batch builder code to produce the composite
+    /// state for the main pass.
+    // TODO(gw): Remove the code to create the tile cache composite state
+    //           from batch building next, and this can then be simplified too.
+    fn build_composite_pass(
+        &self,
+        scene: &BuiltScene,
+        ctx: &RenderTargetContext,
+        gpu_cache: &mut GpuCache,
+        render_tasks: &RenderTaskGraph,
+        deferred_resolves: &mut Vec<DeferredResolve>,
+        transforms: &mut TransformPalette,
+        prim_headers: &mut PrimitiveHeaders,
+        z_generator: &mut ZBufferIdGenerator,
+        composite_state: &mut CompositeState,
+    ) {
+        let pic = &ctx.prim_store.pictures[scene.root_pic_index.0];
+
+        let alpha_batch_builder = AlphaBatchBuilder::new(
+            scene.output_rect.size,
+            false,
+            0,
+            RenderTaskId::INVALID,
+            RenderTaskId::INVALID.into(),
+            PrimitiveVisibilityMask::all(),
+            0,
+        );
+
+        let mut batch_builder = BatchBuilder::new(
+            vec![alpha_batch_builder],
+        );
+
+        batch_builder.add_pic_to_batch(
+            pic,
+            ctx,
+            gpu_cache,
+            render_tasks,
+            deferred_resolves,
+            prim_headers,
+            transforms,
+            ROOT_SPATIAL_NODE_INDEX,
+            ROOT_SPATIAL_NODE_INDEX,
+            z_generator,
+            composite_state,
+        );
+
+        let alpha_batch_builders = batch_builder.finalize();
+        let mut merged_batches = Vec::new();
+        let mut alpha_batch_container = AlphaBatchContainer::new(None);
+
+        for batcher in alpha_batch_builders {
+            batcher.build(
+                &mut merged_batches,
+                &mut alpha_batch_container,
+                scene.output_rect,
+                None,
+            );
+        }
+    }
 }
 
 /// Processes this pass to prepare it for rendering.
@@ -653,6 +776,7 @@
 /// target.
 pub fn build_render_pass(
     pass: &mut RenderPass,
+    screen_size: DeviceIntSize,
     ctx: &mut RenderTargetContext,
     gpu_cache: &mut GpuCache,
     render_tasks: &mut RenderTaskGraph,
@@ -665,317 +789,296 @@
 ) {
     profile_scope!("build_render_pass");
 
-    match pass.kind {
-        RenderPassKind::MainFramebuffer { ref mut main_target, .. } => {
-            profile_scope!("MainFrameBuffer");
-            for &task_id in &pass.tasks {
-                profile_scope!("task");
-                assert_eq!(render_tasks[task_id].target_kind(), RenderTargetKind::Color);
-                main_target.add_task(
-                    task_id,
-                    ctx,
-                    gpu_cache,
-                    render_tasks,
-                    clip_store,
-                    transforms,
-                    deferred_resolves,
-                );
-            }
-            main_target.build(
-                ctx,
-                gpu_cache,
-                render_tasks,
-                deferred_resolves,
-                prim_headers,
-                transforms,
-                z_generator,
-                composite_state,
-            );
-        }
-        RenderPassKind::OffScreen {
-            ref mut color,
-            ref mut alpha,
-            ref mut texture_cache,
-            ref mut picture_cache,
-        } => {
-            profile_scope!("OffScreen");
-            let saved_color = if pass.tasks.iter().any(|&task_id| {
-                let t = &render_tasks[task_id];
-                t.target_kind() == RenderTargetKind::Color && t.saved_index.is_some()
-            }) {
-                Some(render_tasks.save_target())
-            } else {
-                None
-            };
-            let saved_alpha = if pass.tasks.iter().any(|&task_id| {
-                let t = &render_tasks[task_id];
-                t.target_kind() == RenderTargetKind::Alpha && t.saved_index.is_some()
-            }) {
-                Some(render_tasks.save_target())
-            } else {
-                None
-            };
-
-            // Collect a list of picture cache tasks, keyed by picture index.
-            // This allows us to only walk that picture root once, adding the
-            // primitives to all relevant batches at the same time.
-            let mut picture_cache_tasks = FastHashMap::default();
-
-            // Step through each task, adding to batches as appropriate.
-            for &task_id in &pass.tasks {
-                let (target_kind, texture_target, layer) = {
-                    let task = &mut render_tasks[task_id];
-                    let target_kind = task.target_kind();
-
-                    // Find a target to assign this task to, or create a new
-                    // one if required.
-                    let (texture_target, layer) = match task.location {
-                        RenderTaskLocation::TextureCache { texture, layer, .. } => {
-                            (Some(texture), layer)
-                        }
-                        RenderTaskLocation::Fixed(..) => {
-                            (None, 0)
-                        }
-                        RenderTaskLocation::Dynamic(ref mut origin, size) => {
-                            let (target_index, alloc_origin) =  match target_kind {
-                                RenderTargetKind::Color => color.allocate(size),
-                                RenderTargetKind::Alpha => alpha.allocate(size),
-                            };
-                            *origin = Some((alloc_origin, target_index));
-                            (None, target_index.0)
+    // Collect a list of picture cache tasks, keyed by picture index.
+    // This allows us to only walk that picture root once, adding the
+    // primitives to all relevant batches at the same time.
+    let mut picture_cache_tasks = FastHashMap::default();
+
+    // Step through each task, adding to batches as appropriate.
+    for &task_id in &pass.tasks {
+        let (target_kind, texture_target, layer) = {
+            let task = &mut render_tasks[task_id];
+            let target_kind = task.target_kind();
+
+            // Find a target to assign this task to, or create a new
+            // one if required.
+            let (texture_target, layer) = match task.location {
+                RenderTaskLocation::TextureCache { texture, layer, .. } => {
+                    (Some(texture), layer)
+                }
+                RenderTaskLocation::Dynamic(ref mut origin, size) => {
+                    let (target_index, alloc_origin) =  match target_kind {
+                        RenderTargetKind::Color => pass.color.allocate(size),
+                        RenderTargetKind::Alpha => pass.alpha.allocate(size),
+                    };
+                    *origin = Some((alloc_origin, CacheTextureId::INVALID, target_index));
+                    (None, target_index.0)
+                }
+                RenderTaskLocation::PictureCache { .. } => {
+                    // For picture cache tiles, just store them in the map
+                    // of picture cache tasks, to be handled below.
+                    let pic_index = match task.kind {
+                        RenderTaskKind::Picture(ref info) => {
+                            info.pic_index
                         }
-                        RenderTaskLocation::PictureCache { .. } => {
-                            // For picture cache tiles, just store them in the map
-                            // of picture cache tasks, to be handled below.
-                            let pic_index = match task.kind {
-                                RenderTaskKind::Picture(ref info) => {
-                                    info.pic_index
-                                }
-                                _ => {
-                                    unreachable!();
-                                }
-                            };
-
-                            picture_cache_tasks
-                                .entry(pic_index)
-                                .or_insert_with(Vec::new)
-                                .push(task_id);
-
-                            continue;
+                        _ => {
+                            unreachable!();
                         }
                     };
 
-                    // Replace the pending saved index with a real one
-                    if let Some(index) = task.saved_index {
-                        assert_eq!(index, SavedTargetIndex::PENDING);
-                        task.saved_index = match target_kind {
-                            RenderTargetKind::Color => saved_color,
-                            RenderTargetKind::Alpha => saved_alpha,
-                        };
-                    }
+                    picture_cache_tasks
+                        .entry(pic_index)
+                        .or_insert_with(Vec::new)
+                        .push(task_id);
 
-                    // Give the render task an opportunity to add any
-                    // information to the GPU cache, if appropriate.
-                    task.write_gpu_blocks(gpu_cache);
+                    continue;
+                }
+            };
 
-                    (target_kind, texture_target, layer)
-                };
+            // Give the render task an opportunity to add any
+            // information to the GPU cache, if appropriate.
+            let (target_rect, target_index) = task.get_target_rect();
+            task.kind.write_gpu_blocks(
+                target_rect,
+                target_index,
+                gpu_cache,
+            );
 
-                match texture_target {
-                    Some(texture_target) => {
-                        let texture = texture_cache
-                            .entry((texture_target, layer))
-                            .or_insert_with(||
-                                TextureCacheRenderTarget::new(target_kind)
-                            );
-                        texture.add_task(task_id, render_tasks);
+            (target_kind, texture_target, layer)
+        };
+
+        match texture_target {
+            Some(texture_target) => {
+                let texture = pass.texture_cache
+                    .entry((texture_target, layer))
+                    .or_insert_with(||
+                        TextureCacheRenderTarget::new(target_kind)
+                    );
+                texture.add_task(task_id, render_tasks);
+            }
+            None => {
+                match target_kind {
+                    RenderTargetKind::Color => {
+                        pass.color.targets[layer].add_task(
+                            task_id,
+                            ctx,
+                            gpu_cache,
+                            render_tasks,
+                            clip_store,
+                            transforms,
+                            deferred_resolves,
+                        )
                     }
-                    None => {
-                        match target_kind {
-                            RenderTargetKind::Color => {
-                                color.targets[layer].add_task(
-                                    task_id,
-                                    ctx,
-                                    gpu_cache,
-                                    render_tasks,
-                                    clip_store,
-                                    transforms,
-                                    deferred_resolves,
-                                )
-                            }
-                            RenderTargetKind::Alpha => {
-                                alpha.targets[layer].add_task(
-                                    task_id,
-                                    ctx,
-                                    gpu_cache,
-                                    render_tasks,
-                                    clip_store,
-                                    transforms,
-                                    deferred_resolves,
-                                )
-                            }
-                        }
+                    RenderTargetKind::Alpha => {
+                        pass.alpha.targets[layer].add_task(
+                            task_id,
+                            ctx,
+                            gpu_cache,
+                            render_tasks,
+                            clip_store,
+                            transforms,
+                            deferred_resolves,
+                        )
                     }
                 }
             }
+        }
+    }
+
+    // For each picture in this pass that has picture cache tiles, create
+    // a batcher per task, and then build batches for each of the tasks
+    // at the same time.
+    for (pic_index, task_ids) in picture_cache_tasks {
+        profile_scope!("picture_cache_task");
+        let pic = &ctx.prim_store.pictures[pic_index.0];
+
+        // Extract raster/surface spatial nodes for this surface.
+        let (root_spatial_node_index, surface_spatial_node_index, tile_cache) = match pic.raster_config {
+            Some(RasterConfig { surface_index, composite_mode: PictureCompositeMode::TileCache { slice_id }, .. }) => {
+                let surface = &ctx.surfaces[surface_index.0];
+                (
+                    surface.raster_spatial_node_index,
+                    surface.surface_spatial_node_index,
+                    &ctx.tile_caches[&slice_id],
+                )
+            }
+            _ => {
+                unreachable!();
+            }
+        };
 
-            // For each picture in this pass that has picture cache tiles, create
-            // a batcher per task, and then build batches for each of the tasks
-            // at the same time.
-            for (pic_index, task_ids) in picture_cache_tasks {
-                profile_scope!("picture_cache_task");
-                let pic = &ctx.prim_store.pictures[pic_index.0];
-
-                // Extract raster/surface spatial nodes for this surface.
-                let (root_spatial_node_index, surface_spatial_node_index, tile_cache) = match pic.raster_config {
-                    Some(RasterConfig { surface_index, composite_mode: PictureCompositeMode::TileCache { slice_id }, .. }) => {
-                        let surface = &ctx.surfaces[surface_index.0];
-                        (
-                            surface.raster_spatial_node_index,
-                            surface.surface_spatial_node_index,
-                            &ctx.tile_caches[&slice_id],
-                        )
-                    }
-                    _ => {
-                        unreachable!();
-                    }
-                };
+        // Determine the clear color for this picture cache.
+        // If the entire tile cache is opaque, we can skip clear completely.
+        // If it's the first layer, clear it to white to allow subpixel AA on that
+        // first layer even if it's technically transparent.
+        // Otherwise, clear to transparent and composite with alpha.
+        // TODO(gw): We can detect per-tile opacity for the clear color here
+        //           which might be a significant win on some pages?
+        let forced_opaque = match tile_cache.background_color {
+            Some(color) => color.a >= 1.0,
+            None => false,
+        };
+        let mut clear_color = if forced_opaque {
+            Some(ColorF::WHITE)
+        } else {
+            Some(ColorF::TRANSPARENT)
+        };
 
-                // Determine the clear color for this picture cache.
-                // If the entire tile cache is opaque, we can skip clear completely.
-                // If it's the first layer, clear it to white to allow subpixel AA on that
-                // first layer even if it's technically transparent.
-                // Otherwise, clear to transparent and composite with alpha.
-                // TODO(gw): We can detect per-tile opacity for the clear color here
-                //           which might be a significant win on some pages?
-                let forced_opaque = match tile_cache.background_color {
-                    Some(color) => color.a >= 1.0,
-                    None => false,
-                };
-                let mut clear_color = if forced_opaque {
-                    Some(ColorF::WHITE)
-                } else {
-                    Some(ColorF::TRANSPARENT)
-                };
+        // If this picture cache has a valid color backdrop, we will use
+        // that as the clear color, skipping the draw of the backdrop
+        // primitive (and anything prior to it) during batching.
+        if let Some(BackdropKind::Color { color }) = tile_cache.backdrop.kind {
+            clear_color = Some(color);
+        }
 
-                // If this picture cache has a valid color backdrop, we will use
-                // that as the clear color, skipping the draw of the backdrop
-                // primitive (and anything prior to it) during batching.
-                if let Some(BackdropKind::Color { color }) = tile_cache.backdrop.kind {
-                    clear_color = Some(color);
-                }
+        // Create an alpha batcher for each of the tasks of this picture.
+        let mut batchers = Vec::new();
+        for task_id in &task_ids {
+            let task_id = *task_id;
+            let vis_mask = match render_tasks[task_id].kind {
+                RenderTaskKind::Picture(ref info) => info.vis_mask,
+                _ => unreachable!(),
+            };
+            batchers.push(AlphaBatchBuilder::new(
+                screen_size,
+                ctx.break_advanced_blend_batches,
+                ctx.batch_lookback_count,
+                task_id,
+                task_id.into(),
+                vis_mask,
+                0,
+            ));
+        }
+
+        // Run the batch creation code for this picture, adding items to
+        // all relevant per-task batchers.
+        let mut batch_builder = BatchBuilder::new(batchers);
+        {
+        profile_scope!("add_pic_to_batch");
+        batch_builder.add_pic_to_batch(
+            pic,
+            ctx,
+            gpu_cache,
+            render_tasks,
+            deferred_resolves,
+            prim_headers,
+            transforms,
+            root_spatial_node_index,
+            surface_spatial_node_index,
+            z_generator,
+            composite_state,
+        );
+        }
 
-                // Create an alpha batcher for each of the tasks of this picture.
-                let mut batchers = Vec::new();
-                for task_id in &task_ids {
-                    let task_id = *task_id;
-                    let vis_mask = match render_tasks[task_id].kind {
-                        RenderTaskKind::Picture(ref info) => info.vis_mask,
+        // Create picture cache targets, one per render task, and assign
+        // the correct batcher to them.
+        let batchers = batch_builder.finalize();
+        for (task_id, batcher) in task_ids.into_iter().zip(batchers.into_iter()) {
+            profile_scope!("task");
+            let task = &render_tasks[task_id];
+            let (target_rect, _) = task.get_target_rect();
+
+            match task.location {
+                RenderTaskLocation::PictureCache { ref surface, .. } => {
+                    // TODO(gw): The interface here is a bit untidy since it's
+                    //           designed to support batch merging, which isn't
+                    //           relevant for picture cache targets. We
+                    //           can restructure / tidy this up a bit.
+                    let (scissor_rect, valid_rect)  = match render_tasks[task_id].kind {
+                        RenderTaskKind::Picture(ref info) => {
+                            (
+                                info.scissor_rect.expect("bug: must be set for cache tasks"),
+                                info.valid_rect.expect("bug: must be set for cache tasks"),
+                            )
+                        }
                         _ => unreachable!(),
                     };
-                    batchers.push(AlphaBatchBuilder::new(
-                        pass.screen_size,
-                        ctx.break_advanced_blend_batches,
-                        ctx.batch_lookback_count,
-                        task_id,
-                        task_id.into(),
-                        vis_mask,
-                        0,
-                    ));
-                }
+                    let mut batch_containers = Vec::new();
+                    let mut alpha_batch_container = AlphaBatchContainer::new(Some(scissor_rect));
+                    batcher.build(
+                        &mut batch_containers,
+                        &mut alpha_batch_container,
+                        target_rect,
+                        None,
+                    );
+                    debug_assert!(batch_containers.is_empty());
+
+                    let target = PictureCacheTarget {
+                        surface: surface.clone(),
+                        clear_color,
+                        alpha_batch_container,
+                        dirty_rect: scissor_rect,
+                        valid_rect,
+                    };
 
-                // Run the batch creation code for this picture, adding items to
-                // all relevant per-task batchers.
-                let mut batch_builder = BatchBuilder::new(batchers);
-                {
-                profile_scope!("add_pic_to_batch");
-                batch_builder.add_pic_to_batch(
-                    pic,
-                    ctx,
-                    gpu_cache,
-                    render_tasks,
-                    deferred_resolves,
-                    prim_headers,
-                    transforms,
-                    root_spatial_node_index,
-                    surface_spatial_node_index,
-                    z_generator,
-                    composite_state,
-                );
+                    pass.picture_cache.push(target);
+                }
+                _ => {
+                    unreachable!()
                 }
+            }
+        }
+    }
 
-                // Create picture cache targets, one per render task, and assign
-                // the correct batcher to them.
-                let batchers = batch_builder.finalize();
-                for (task_id, batcher) in task_ids.into_iter().zip(batchers.into_iter()) {
-                    profile_scope!("task");
-                    let task = &render_tasks[task_id];
-                    let (target_rect, _) = task.get_target_rect();
-
-                    match task.location {
-                        RenderTaskLocation::PictureCache { ref surface, .. } => {
-                            // TODO(gw): The interface here is a bit untidy since it's
-                            //           designed to support batch merging, which isn't
-                            //           relevant for picture cache targets. We
-                            //           can restructure / tidy this up a bit.
-                            let (scissor_rect, valid_rect)  = match render_tasks[task_id].kind {
-                                RenderTaskKind::Picture(ref info) => {
-                                    (
-                                        info.scissor_rect.expect("bug: must be set for cache tasks"),
-                                        info.valid_rect.expect("bug: must be set for cache tasks"),
-                                    )
-                                }
-                                _ => unreachable!(),
-                            };
-                            let mut batch_containers = Vec::new();
-                            let mut alpha_batch_container = AlphaBatchContainer::new(Some(scissor_rect));
-                            batcher.build(
-                                &mut batch_containers,
-                                &mut alpha_batch_container,
-                                target_rect,
-                                None,
-                            );
-                            debug_assert!(batch_containers.is_empty());
-
-                            let target = PictureCacheTarget {
-                                surface: surface.clone(),
-                                clear_color,
-                                alpha_batch_container,
-                                dirty_rect: scissor_rect,
-                                valid_rect,
-                            };
+    pass.color.build(
+        ctx,
+        gpu_cache,
+        render_tasks,
+        deferred_resolves,
+        prim_headers,
+        transforms,
+        z_generator,
+        composite_state,
+    );
+    pass.alpha.build(
+        ctx,
+        gpu_cache,
+        render_tasks,
+        deferred_resolves,
+        prim_headers,
+        transforms,
+        z_generator,
+        composite_state,
+    );
+
+    // Now that the passes have been built, we know what the texture_id is for this surface
+    // (since we know the layer count and texture size). Step through the tasks on this
+    // texture and store that in the task location. This is used so that tasks that get added
+    // on following passes can directly access and reference the texture_id, rather than
+    // referring to PrevPassAlpha/Color. Again, this will become a lot simpler once we
+    // have the full DAG in place (and once sub-passes are individual textures rather than
+    // a single texture array).
+
+    for &task_id in &pass.tasks {
+        let task = &mut render_tasks[task_id];
+        let target_kind = task.target_kind();
+
+        match task.location {
+            RenderTaskLocation::TextureCache { .. } |
+            RenderTaskLocation::PictureCache { .. } => {}
 
-                            picture_cache.push(target);
-                        }
-                        _ => {
-                            unreachable!()
-                        }
+            RenderTaskLocation::Dynamic(None, _) => {
+                unreachable!();
+            }
+
+            RenderTaskLocation::Dynamic(Some((_, ref mut texture_id, _)), _) => {
+                assert_eq!(*texture_id, CacheTextureId::INVALID);
+
+                match target_kind {
+                    RenderTargetKind::Color => {
+                        *texture_id = pass
+                            .color
+                            .texture_id
+                            .expect("bug: color texture must be allocated by now");
+                    }
+                    RenderTargetKind::Alpha => {
+                        *texture_id = pass
+                            .alpha
+                            .texture_id
+                            .expect("bug: alpha texture must be allocated by now");
                     }
                 }
             }
-
-            color.build(
-                ctx,
-                gpu_cache,
-                render_tasks,
-                deferred_resolves,
-                saved_color,
-                prim_headers,
-                transforms,
-                z_generator,
-                composite_state,
-            );
-            alpha.build(
-                ctx,
-                gpu_cache,
-                render_tasks,
-                deferred_resolves,
-                saved_alpha,
-                prim_headers,
-                transforms,
-                z_generator,
-                composite_state,
-            );
         }
     }
 }
@@ -1028,17 +1131,11 @@
 
     // Returns true if this frame doesn't alter what is on screen currently.
     pub fn is_nop(&self) -> bool {
-        // When picture caching is enabled, the first (main framebuffer) pass
-        // consists of compositing tiles only (whether via the simple compositor
-        // or the native OS compositor). If there are no other passes, that
-        // implies that none of the picture cache tiles were updated, and thus
-        // the frame content must be exactly the same as last frame. If this is
-        // true, drawing this frame is a no-op and can be skipped.
-
-        if self.passes.len() > 1 {
-            return false;
-        }
-
-        true
+        // If there are no off-screen passes, that implies that there are no
+        // picture cache tiles, and no texture cache tasks being updates. If this
+        // is the case, we can consider the frame a nop (higher level checks
+        // test if a composite is needed due to picture cache surfaces moving
+        // or external surfaces being updated).
+        self.passes.is_empty()
     }
 }
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/glyph_rasterizer/mod.rs firefox-85.0+build1/gfx/wr/webrender/src/glyph_rasterizer/mod.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/glyph_rasterizer/mod.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/glyph_rasterizer/mod.rs	2021-01-18 19:58:11.000000000 +0000
@@ -218,8 +218,6 @@
         glyph_cache: &mut GlyphCache,
         texture_cache: &mut TextureCache,
         gpu_cache: &mut GpuCache,
-        _: &mut RenderTaskCache,
-        _: &mut RenderTaskGraph,
         profile: &mut TransactionProfile,
     ) {
         profile.start_time(profiler::GLYPH_RESOLVE_TIME);
@@ -1153,7 +1151,7 @@
         let mut glyph_rasterizer = GlyphRasterizer::new(workers).unwrap();
         let mut glyph_cache = GlyphCache::new();
         let mut gpu_cache = GpuCache::new_for_testing();
-        let mut texture_cache = TextureCache::new_for_testing(2048, 1024, FORMAT);
+        let mut texture_cache = TextureCache::new_for_testing(2048, FORMAT);
         let mut render_task_cache = RenderTaskCache::new();
         let mut render_task_tree = RenderTaskGraph::new(FrameId::INVALID, &RenderTaskGraphCounters::new());
         let mut font_file =
@@ -1205,10 +1203,91 @@
 
         glyph_rasterizer.resolve_glyphs(
             &mut glyph_cache,
-            &mut TextureCache::new_for_testing(4096, 1024, FORMAT),
+            &mut TextureCache::new_for_testing(4096, FORMAT),
+            &mut gpu_cache,
+            &mut TransactionProfile::new(),
+        );
+    }
+
+    #[test]
+    fn rasterize_large_glyphs() {
+        // This test loads a font from disc and rasterize a few glyphs with a size of 200px to check
+        // that the texture cache handles them properly.
+        use rayon::ThreadPoolBuilder;
+        use std::fs::File;
+        use std::io::Read;
+        use crate::texture_cache::TextureCache;
+        use crate::glyph_cache::GlyphCache;
+        use crate::gpu_cache::GpuCache;
+        use crate::render_task_cache::RenderTaskCache;
+        use crate::render_task_graph::{RenderTaskGraph, RenderTaskGraphCounters};
+        use crate::profiler::TransactionProfile;
+        use api::{FontKey, FontInstanceKey, FontSize, FontTemplate, FontRenderMode,
+                  IdNamespace, ColorU};
+        use api::units::DevicePoint;
+        use crate::render_backend::FrameId;
+        use std::sync::Arc;
+        use crate::glyph_rasterizer::{FORMAT, FontInstance, BaseFontInstance, GlyphKey, GlyphRasterizer};
+
+        let worker = ThreadPoolBuilder::new()
+            .thread_name(|idx|{ format!("WRWorker#{}", idx) })
+            .build();
+        let workers = Arc::new(worker.unwrap());
+        let mut glyph_rasterizer = GlyphRasterizer::new(workers).unwrap();
+        let mut glyph_cache = GlyphCache::new();
+        let mut gpu_cache = GpuCache::new_for_testing();
+        let mut texture_cache = TextureCache::new_for_testing(2048, FORMAT);
+        let mut render_task_cache = RenderTaskCache::new();
+        let mut render_task_tree = RenderTaskGraph::new(FrameId::INVALID, &RenderTaskGraphCounters::new());
+        let mut font_file =
+            File::open("../wrench/reftests/text/VeraBd.ttf").expect("Couldn't open font file");
+        let mut font_data = vec![];
+        font_file
+            .read_to_end(&mut font_data)
+            .expect("failed to read font file");
+
+        let font_key = FontKey::new(IdNamespace(0), 0);
+        glyph_rasterizer.add_font(font_key, FontTemplate::Raw(Arc::new(font_data), 0));
+
+        let font = FontInstance::from_base(Arc::new(BaseFontInstance {
+            instance_key: FontInstanceKey(IdNamespace(0), 0),
+            font_key,
+            size: FontSize::from_f32_px(200.0),
+            bg_color: ColorU::new(0, 0, 0, 0),
+            render_mode: FontRenderMode::Subpixel,
+            flags: Default::default(),
+            synthetic_italics: Default::default(),
+            platform_options: None,
+            variations: Vec::new(),
+        }));
+
+        let subpx_dir = font.get_subpx_dir();
+
+        let mut glyph_keys = Vec::with_capacity(10);
+        for i in 0 .. 10 {
+            glyph_keys.push(GlyphKey::new(
+                i,
+                DevicePoint::zero(),
+                subpx_dir,
+            ));
+        }
+
+        glyph_rasterizer.request_glyphs(
+            &mut glyph_cache,
+            font.clone(),
+            &glyph_keys,
+            &mut texture_cache,
             &mut gpu_cache,
             &mut render_task_cache,
             &mut render_task_tree,
+        );
+
+        glyph_rasterizer.delete_font(font_key);
+
+        glyph_rasterizer.resolve_glyphs(
+            &mut glyph_cache,
+            &mut TextureCache::new_for_testing(4096, FORMAT),
+            &mut gpu_cache,
             &mut TransactionProfile::new(),
         );
     }
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/gpu_types.rs firefox-85.0+build1/gfx/wr/webrender/src/gpu_types.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/gpu_types.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/gpu_types.rs	2021-01-18 19:58:12.000000000 +0000
@@ -231,26 +231,6 @@
     data: [i32; 4],
 }
 
-/// Vertex format for resolve style operations with pixel local storage.
-#[derive(Debug, Clone)]
-#[repr(C)]
-pub struct ResolveInstanceData {
-    rect: [f32; 4],
-}
-
-impl ResolveInstanceData {
-    pub fn new(rect: DeviceIntRect) -> Self {
-        ResolveInstanceData {
-            rect: [
-                rect.origin.x as f32,
-                rect.origin.y as f32,
-                rect.size.width as f32,
-                rect.size.height as f32,
-            ],
-        }
-    }
-}
-
 /// Vertex format for picture cache composite shader.
 /// When editing the members, update desc::COMPOSITE
 /// so its list of instance_attributes matches:
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/guillotine_allocator.rs firefox-85.0+build1/gfx/wr/webrender/src/guillotine_allocator.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/guillotine_allocator.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/guillotine_allocator.rs	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,279 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+
+//TODO: gather real-world statistics on the bin usage in order to assist the decision
+// on where to place the size thresholds.
+
+/// This is an optimization tweak to enable looking through all the free rectangles in a bin
+/// and choosing the smallest, as opposed to picking the first match.
+const FIND_SMALLEST_AREA: bool = false;
+
+const NUM_BINS: usize = 3;
+/// The minimum number of pixels on each side that we require for rects to be classified as
+/// particular bin of freelists.
+const MIN_RECT_AXIS_SIZES: [i32; NUM_BINS] = [1, 16, 32];
+
+#[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
+struct FreeListBin(u8);
+
+#[derive(Debug, Clone, Copy)]
+struct FreeListIndex(usize);
+
+impl FreeListBin {
+    fn for_size(size: &DeviceIntSize) -> Self {
+        MIN_RECT_AXIS_SIZES
+            .iter()
+            .enumerate()
+            .rev()
+            .find(|(_, &min_size)| min_size <= size.width && min_size <= size.height)
+            .map(|(id, _)| FreeListBin(id as u8))
+            .expect("Unable to find a bin!")
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct FreeRectSlice(pub u32);
+
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct FreeRect {
+    slice: FreeRectSlice,
+    rect: DeviceIntRect,
+}
+
+/// A texture allocator using the guillotine algorithm.
+///
+/// See sections 2.2 and 2.2.5 in "A Thousand Ways to Pack the Bin - A Practical Approach to Two-
+/// Dimensional Rectangle Bin Packing":
+///
+///    http://clb.demon.fi/files/RectangleBinPack.pdf
+///
+/// This approach was chosen because of its simplicity and good performance.
+///
+/// Note: the allocations are spread across multiple textures, and also are binned
+/// orthogonally in order to speed up the search.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct GuillotineAllocator {
+    bins: [Vec<FreeRect>; NUM_BINS],
+}
+
+impl GuillotineAllocator {
+    pub fn new(initial_size: Option<DeviceIntSize>) -> Self {
+        let mut allocator = GuillotineAllocator {
+            bins: [
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+            ],
+        };
+
+        if let Some(initial_size) = initial_size {
+            allocator.push(
+                FreeRectSlice(0),
+                initial_size.into(),
+            );
+        }
+
+        allocator
+    }
+
+    fn push(&mut self, slice: FreeRectSlice, rect: DeviceIntRect) {
+        let id = FreeListBin::for_size(&rect.size).0 as usize;
+        self.bins[id].push(FreeRect {
+            slice,
+            rect,
+        })
+    }
+
+    /// Find a suitable rect in the free list. We choose the smallest such rect
+    /// in terms of area (Best-Area-Fit, BAF).
+    fn find_index_of_best_rect(
+        &self,
+        requested_dimensions: &DeviceIntSize,
+    ) -> Option<(FreeListBin, FreeListIndex)> {
+        let start_bin = FreeListBin::for_size(requested_dimensions);
+        (start_bin.0 .. NUM_BINS as u8)
+            .find_map(|id| if FIND_SMALLEST_AREA {
+                let mut smallest_index_and_area = None;
+                for (candidate_index, candidate) in self.bins[id as usize].iter().enumerate() {
+                    if requested_dimensions.width > candidate.rect.size.width ||
+                        requested_dimensions.height > candidate.rect.size.height
+                    {
+                        continue;
+                    }
+
+                    let candidate_area = candidate.rect.size.area();
+                    match smallest_index_and_area {
+                        Some((_, area)) if candidate_area >= area => continue,
+                        _ => smallest_index_and_area = Some((candidate_index, candidate_area)),
+                    }
+                }
+
+                smallest_index_and_area
+                    .map(|(index, _)| (FreeListBin(id), FreeListIndex(index)))
+            } else {
+                self.bins[id as usize]
+                    .iter()
+                    .position(|candidate| {
+                        requested_dimensions.width <= candidate.rect.size.width &&
+                        requested_dimensions.height <= candidate.rect.size.height
+                    })
+                    .map(|index| (FreeListBin(id), FreeListIndex(index)))
+            })
+    }
+
+    // Split that results in the single largest area (Min Area Split Rule, MINAS).
+    fn split_guillotine(&mut self, chosen: &FreeRect, requested_dimensions: &DeviceIntSize) {
+        let candidate_free_rect_to_right = DeviceIntRect::new(
+            DeviceIntPoint::new(
+                chosen.rect.origin.x + requested_dimensions.width,
+                chosen.rect.origin.y,
+            ),
+            DeviceIntSize::new(
+                chosen.rect.size.width - requested_dimensions.width,
+                requested_dimensions.height,
+            ),
+        );
+        let candidate_free_rect_to_bottom = DeviceIntRect::new(
+            DeviceIntPoint::new(
+                chosen.rect.origin.x,
+                chosen.rect.origin.y + requested_dimensions.height,
+            ),
+            DeviceIntSize::new(
+                requested_dimensions.width,
+                chosen.rect.size.height - requested_dimensions.height,
+            ),
+        );
+
+        // Guillotine the rectangle.
+        let new_free_rect_to_right;
+        let new_free_rect_to_bottom;
+        if candidate_free_rect_to_right.size.area() > candidate_free_rect_to_bottom.size.area() {
+            new_free_rect_to_right = DeviceIntRect::new(
+                candidate_free_rect_to_right.origin,
+                DeviceIntSize::new(
+                    candidate_free_rect_to_right.size.width,
+                    chosen.rect.size.height,
+                ),
+            );
+            new_free_rect_to_bottom = candidate_free_rect_to_bottom
+        } else {
+            new_free_rect_to_right = candidate_free_rect_to_right;
+            new_free_rect_to_bottom = DeviceIntRect::new(
+                candidate_free_rect_to_bottom.origin,
+                DeviceIntSize::new(
+                    chosen.rect.size.width,
+                    candidate_free_rect_to_bottom.size.height,
+                ),
+            )
+        }
+
+        // Add the guillotined rects back to the free list.
+        if !new_free_rect_to_right.is_empty() {
+            self.push(chosen.slice, new_free_rect_to_right);
+        }
+        if !new_free_rect_to_bottom.is_empty() {
+            self.push(chosen.slice, new_free_rect_to_bottom);
+        }
+    }
+
+    pub fn allocate(
+        &mut self, requested_dimensions: &DeviceIntSize
+    ) -> Option<(FreeRectSlice, DeviceIntPoint)> {
+        if requested_dimensions.width == 0 || requested_dimensions.height == 0 {
+            return Some((FreeRectSlice(0), DeviceIntPoint::new(0, 0)));
+        }
+        let (bin, index) = self.find_index_of_best_rect(requested_dimensions)?;
+
+        // Remove the rect from the free list and decide how to guillotine it.
+        let chosen = self.bins[bin.0 as usize].swap_remove(index.0);
+        self.split_guillotine(&chosen, requested_dimensions);
+
+        // Return the result.
+        Some((chosen.slice, chosen.rect.origin))
+    }
+
+    /// Add a new slice to the allocator, and immediately allocate a rect from it.
+    pub fn extend(
+        &mut self,
+        slice: FreeRectSlice,
+        total_size: DeviceIntSize,
+        requested_dimensions: DeviceIntSize,
+    ) {
+        self.split_guillotine(
+            &FreeRect { slice, rect: total_size.into() },
+            &requested_dimensions
+        );
+    }
+}
+
+#[cfg(test)]
+fn random_fill(count: usize, texture_size: i32) -> f32 {
+    use rand::{thread_rng, Rng};
+
+    let total_rect = DeviceIntRect::new(
+        DeviceIntPoint::zero(),
+        DeviceIntSize::new(texture_size, texture_size),
+    );
+    let mut rng = thread_rng();
+    let mut allocator = GuillotineAllocator::new(None);
+
+    // check for empty allocation
+    assert_eq!(
+        allocator.allocate(&DeviceIntSize::new(0, 12)),
+        Some((FreeRectSlice(0), DeviceIntPoint::zero())),
+    );
+
+    let mut slices: Vec<Vec<DeviceIntRect>> = Vec::new();
+    let mut requested_area = 0f32;
+    // fill up the allocator
+    for _ in 0 .. count {
+        let size = DeviceIntSize::new(
+            rng.gen_range(1, texture_size),
+            rng.gen_range(1, texture_size),
+        );
+        requested_area += size.area() as f32;
+
+        match allocator.allocate(&size) {
+            Some((slice, origin)) => {
+                let rect = DeviceIntRect::new(origin, size);
+                assert_eq!(None, slices[slice.0 as usize].iter().find(|r| r.intersects(&rect)));
+                assert!(total_rect.contains_rect(&rect));
+                slices[slice.0 as usize].push(rect);
+            }
+            None => {
+                allocator.extend(FreeRectSlice(slices.len() as u32), total_rect.size, size);
+                let rect = DeviceIntRect::new(DeviceIntPoint::zero(), size);
+                slices.push(vec![rect]);
+            }
+        }
+    }
+    // validate the free rects
+    for (i, free_vecs) in allocator.bins.iter().enumerate() {
+        for fr in free_vecs {
+            assert_eq!(FreeListBin(i as u8), FreeListBin::for_size(&fr.rect.size));
+            assert_eq!(None, slices[fr.slice.0 as usize].iter().find(|r| r.intersects(&fr.rect)));
+            assert!(total_rect.contains_rect(&fr.rect));
+            slices[fr.slice.0 as usize].push(fr.rect);
+        }
+    }
+
+    let allocated_area = slices.len() as f32 * (texture_size * texture_size) as f32;
+    requested_area / allocated_area
+}
+
+#[test]
+fn test_small() {
+    random_fill(100, 100);
+}
+
+#[test]
+fn test_large() {
+    random_fill(1000, 10000);
+}
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/internal_types.rs firefox-85.0+build1/gfx/wr/webrender/src/internal_types.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/internal_types.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/internal_types.rs	2021-01-18 19:58:11.000000000 +0000
@@ -2,8 +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/. */
 
-use api::{ColorF, DocumentId, ExternalImageData, ExternalImageId, PrimitiveFlags};
-use api::{ImageFormat, NotificationRequest, Shadow, FilterOp};
+use api::{ColorF, DocumentId, ExternalImageId, PrimitiveFlags};
+use api::{ImageFormat, NotificationRequest, Shadow, FilterOp, ImageBufferKind};
 use api::units::*;
 use api;
 use crate::render_api::DebugCommand;
@@ -233,7 +233,11 @@
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct CacheTextureId(pub u64);
+pub struct CacheTextureId(pub u32);
+
+impl CacheTextureId {
+    pub const INVALID: CacheTextureId = CacheTextureId(!0);
+}
 
 /// Canonical type for texture layer indices.
 ///
@@ -248,20 +252,10 @@
 /// the device module when making calls into the platform layer.
 pub type LayerIndex = usize;
 
-/// Identifies a render pass target that is persisted until the end of the frame.
-///
-/// By default, only the targets of the immediately-preceding pass are bound as
-/// inputs to the next pass. However, tasks can opt into having their target
-/// preserved in a list until the end of the frame, and this type specifies the
-/// index in that list.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct SavedTargetIndex(pub usize);
-
-impl SavedTargetIndex {
-    pub const PENDING: Self = SavedTargetIndex(!0);
-}
+pub struct DeferredResolveIndex(pub u32);
 
 /// Identifies the source of an input texture to a shader.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
@@ -271,22 +265,46 @@
     /// Equivalent to `None`, allowing us to avoid using `Option`s everywhere.
     Invalid,
     /// An entry in the texture cache.
-    TextureCache(CacheTextureId, Swizzle),
+    TextureCache(CacheTextureId, ImageBufferKind, Swizzle),
     /// An external image texture, mananged by the embedding.
-    External(ExternalImageData),
+    External(DeferredResolveIndex, ImageBufferKind),
     /// The alpha target of the immediately-preceding pass.
     PrevPassAlpha,
     /// The color target of the immediately-preceding pass.
     PrevPassColor,
-    /// A render target from an earlier pass. Unlike the immediately-preceding
-    /// passes, these are not made available automatically, but are instead
-    /// opt-in by the `RenderTask` (see `mark_for_saving()`).
-    RenderTaskCache(SavedTargetIndex, Swizzle),
     /// Select a dummy 1x1 white texture. This can be used by image
     /// shaders that want to draw a solid color.
     Dummy,
 }
 
+impl TextureSource {
+    pub fn image_buffer_kind(&self) -> ImageBufferKind {
+        match *self {
+            TextureSource::TextureCache(_, image_buffer_kind, _) => image_buffer_kind,
+
+            TextureSource::External(_, image_buffer_kind) => image_buffer_kind,
+
+            // Render tasks use texture arrays for now.
+            TextureSource::PrevPassAlpha
+            | TextureSource::PrevPassColor
+            | TextureSource::Dummy => ImageBufferKind::Texture2DArray,
+
+
+            TextureSource::Invalid => ImageBufferKind::Texture2D,
+        }
+    }
+
+    #[inline]
+    pub fn is_compatible(
+        &self,
+        other: &TextureSource,
+    ) -> bool {
+        *self == TextureSource::Invalid ||
+        *other == TextureSource::Invalid ||
+        self == other
+    }
+}
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
@@ -323,6 +341,7 @@
     pub layer_count: i32,
     pub format: ImageFormat,
     pub filter: TextureFilter,
+    pub target: ImageBufferKind,
     /// Indicates whether this corresponds to one of the shared texture caches.
     pub is_shared_cache: bool,
     /// If true, this texture requires a depth target.
@@ -334,10 +353,6 @@
 pub enum TextureCacheAllocationKind {
     /// Performs an initial texture allocation.
     Alloc(TextureCacheAllocInfo),
-    /// Reallocates the texture. The existing live texture with the same id
-    /// will be deallocated and its contents blitted over. The new size must
-    /// be greater than the old size.
-    Realloc(TextureCacheAllocInfo),
     /// Reallocates the texture without preserving its contents.
     Reset(TextureCacheAllocInfo),
     /// Frees the texture and the corresponding cache ID.
@@ -436,28 +451,6 @@
 
     /// Pushes a reallocation operation onto the list, potentially coalescing
     /// with previous operations.
-    pub fn push_realloc(&mut self, id: CacheTextureId, info: TextureCacheAllocInfo) {
-        self.debug_assert_coalesced(id);
-
-        // Coallesce this realloc into a previous alloc or realloc, if available.
-        if let Some(cur) = self.allocations.iter_mut().find(|x| x.id == id) {
-            match cur.kind {
-                TextureCacheAllocationKind::Alloc(ref mut i) => *i = info,
-                TextureCacheAllocationKind::Realloc(ref mut i) => *i = info,
-                TextureCacheAllocationKind::Reset(ref mut i) => *i = info,
-                TextureCacheAllocationKind::Free => panic!("Reallocating freed texture"),
-            }
-            return
-        }
-
-        self.allocations.push(TextureCacheAllocation {
-            id,
-            kind: TextureCacheAllocationKind::Realloc(info),
-        });
-    }
-
-    /// Pushes a reallocation operation onto the list, potentially coalescing
-    /// with previous operations.
     pub fn push_reset(&mut self, id: CacheTextureId, info: TextureCacheAllocInfo) {
         self.debug_assert_coalesced(id);
 
@@ -470,10 +463,6 @@
                 TextureCacheAllocationKind::Alloc(ref mut i) => *i = info,
                 TextureCacheAllocationKind::Reset(ref mut i) => *i = info,
                 TextureCacheAllocationKind::Free => panic!("Resetting freed texture"),
-                TextureCacheAllocationKind::Realloc(_) => {
-                    // Reset takes precedence over realloc
-                    cur.kind = TextureCacheAllocationKind::Reset(info);
-                }
             }
             return
         }
@@ -499,7 +488,6 @@
         match removed_kind {
             Some(TextureCacheAllocationKind::Alloc(..)) => { /* no-op! */ },
             Some(TextureCacheAllocationKind::Free) => panic!("Double free"),
-            Some(TextureCacheAllocationKind::Realloc(..)) |
             Some(TextureCacheAllocationKind::Reset(..)) |
             None => {
                 self.allocations.push(TextureCacheAllocation {
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/lib.rs firefox-85.0+build1/gfx/wr/webrender/src/lib.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/lib.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/lib.rs	2021-01-18 19:58:11.000000000 +0000
@@ -126,7 +126,8 @@
 mod shade;
 mod spatial_node;
 mod storage;
-mod texture_allocator;
+mod guillotine_allocator;
+mod slab_allocator;
 mod texture_cache;
 mod tile_cache;
 mod util;
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/lru_cache.rs firefox-85.0+build1/gfx/wr/webrender/src/lru_cache.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/lru_cache.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/lru_cache.rs	2021-01-18 19:58:11.000000000 +0000
@@ -123,6 +123,20 @@
             })
     }
 
+    /// Return a reference to the oldest item in the cache, keeping it in the cache.
+    /// If the cache is empty, or all elements in the cache have manual eviction enabled,
+    /// this will return None.
+    pub fn peek_oldest(&self) -> Option<&T> {
+        self.lru
+            .peek_front()
+            .map(|handle| {
+                let entry = self.entries.get(handle);
+                // We should only find elements in this list with valid LRU location
+                debug_assert!(entry.lru_index.is_some());
+                &entry.value
+            })
+    }
+
     /// Remove the oldest item from the cache. This is used to select elements to
     /// be evicted. If the cache is empty, or all elements in the cache have manual
     /// eviction enabled, this will return None
@@ -382,6 +396,11 @@
         item_index
     }
 
+    /// Returns a reference to the oldest element, or None if the list is empty.
+    fn peek_front(&self) -> Option<&H> {
+        self.head.map(|head| self.items[head.as_usize()].handle.as_ref().unwrap())
+    }
+
     /// Remove the oldest element from the front of the LRU list. Returns None
     /// if the list is empty.
     fn pop_front(
@@ -527,6 +546,32 @@
 }
 
 #[test]
+fn test_lru_tracker_push_peek() {
+    // Push elements, peek and ensure:
+    // - peek_oldest returns None before first element pushed
+    // - peek_oldest returns oldest element
+    // - subsequent calls to peek_oldest return same element (nothing was removed)
+    struct CacheMarker;
+    const NUM_ELEMENTS: usize = 50;
+
+    let mut cache: LRUCache<usize, CacheMarker> = LRUCache::new();
+    cache.validate();
+
+    assert_eq!(cache.peek_oldest(), None);
+
+    for i in 0 .. NUM_ELEMENTS {
+        cache.push_new(i);
+    }
+    cache.validate();
+
+    assert_eq!(cache.peek_oldest(), Some(&0));
+    assert_eq!(cache.peek_oldest(), Some(&0));
+
+    cache.pop_oldest();
+    assert_eq!(cache.peek_oldest(), Some(&1));
+}
+
+#[test]
 fn test_lru_tracker_push_pop() {
     // Push elements, pop them all off and ensure:
     // - Returned in oldest order
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/picture.rs firefox-85.0+build1/gfx/wr/webrender/src/picture.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/picture.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/picture.rs	2021-01-18 19:58:12.000000000 +0000
@@ -122,7 +122,7 @@
 use crate::render_backend::{DataStores, FrameId};
 use crate::render_task_graph::RenderTaskId;
 use crate::render_target::RenderTargetKind;
-use crate::render_task::{RenderTask, RenderTaskLocation, BlurTaskCache, ClearMode};
+use crate::render_task::{BlurTask, RenderTask, RenderTaskLocation, BlurTaskCache, RenderTaskKind};
 use crate::resource_cache::{ResourceCache, ImageGeneration};
 use crate::space::{SpaceMapper, SpaceSnapper};
 use crate::scene::SceneProperties;
@@ -4916,7 +4916,7 @@
                         // Adjust the size to avoid introducing sampling errors during the down-scaling passes.
                         // what would be even better is to rasterize the picture at the down-scaled size
                         // directly.
-                        device_rect.size = RenderTask::adjusted_blur_source_size(
+                        device_rect.size = BlurTask::adjusted_blur_source_size(
                             device_rect.size,
                             blur_std_deviation,
                         );
@@ -4939,18 +4939,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = device_rect.size.to_i32();
+
                         let picture_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, device_rect.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                device_rect.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    device_rect.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
@@ -4959,7 +4964,6 @@
                             picture_task_id,
                             frame_state.render_tasks,
                             RenderTargetKind::Color,
-                            ClearMode::Transparent,
                             None,
                             original_size.to_i32(),
                         );
@@ -4981,7 +4985,7 @@
                                 .intersection(&unclipped)
                                 .unwrap();
 
-                        device_rect.size = RenderTask::adjusted_blur_source_size(
+                        device_rect.size = BlurTask::adjusted_blur_source_size(
                             device_rect.size,
                             DeviceSize::new(
                                 max_std_deviation * scale_factors.0,
@@ -5006,18 +5010,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = device_rect.size.to_i32();
+
                         let picture_task_id = frame_state.render_tasks.add().init({
-                            let mut picture_task = RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, device_rect.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                device_rect.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            let mut picture_task = RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    device_rect.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                ),
                             );
                             picture_task.mark_for_saving();
 
@@ -5041,7 +5050,6 @@
                                 picture_task_id,
                                 frame_state.render_tasks,
                                 RenderTargetKind::Color,
-                                ClearMode::Transparent,
                                 Some(&mut blur_tasks),
                                 device_rect.size.to_i32(),
                             );
@@ -5068,7 +5076,10 @@
                         );
 
                         let readback_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_readback(clipped.size.to_i32())
+                            RenderTask::new_dynamic(
+                                clipped.size.to_i32(),
+                                RenderTaskKind::new_readback(),
+                            )
                         );
 
                         frame_state.render_tasks.add_dependency(
@@ -5078,18 +5089,23 @@
 
                         self.secondary_render_task_id = Some(readback_task_id);
 
+                        let task_size = clipped.size.to_i32();
+
                         let render_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, clipped.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                clipped.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    clipped.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
@@ -5113,18 +5129,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = clipped.size.to_i32();
+
                         let render_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, clipped.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                clipped.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    clipped.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
@@ -5147,18 +5168,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = clipped.size.to_i32();
+
                         let render_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, clipped.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                clipped.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    clipped.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
@@ -5417,28 +5443,30 @@
                                     .round()
                                     .to_i32();
 
+                                let task_size = tile_cache.current_tile_size;
+
                                 let render_task_id = frame_state.render_tasks.add().init(
-                                    RenderTask::new_picture(
+                                    RenderTask::new(
                                         RenderTaskLocation::PictureCache {
-                                            size: tile_cache.current_tile_size,
+                                            size: task_size,
                                             surface,
                                         },
-                                        tile_cache.current_tile_size.to_f32(),
-                                        pic_index,
-                                        content_origin,
-                                        UvRectKind::Rect,
-                                        surface_spatial_node_index,
-                                        device_pixel_scale,
-                                        *visibility_mask,
-                                        Some(scissor_rect),
-                                        Some(valid_rect),
-                                    )
+                                        RenderTaskKind::new_picture(
+                                            task_size,
+                                            tile_cache.current_tile_size.to_f32(),
+                                            pic_index,
+                                            content_origin,
+                                            UvRectKind::Rect,
+                                            surface_spatial_node_index,
+                                            device_pixel_scale,
+                                            *visibility_mask,
+                                            Some(scissor_rect),
+                                            Some(valid_rect),
+                                        )
+                                    ),
                                 );
 
-                                frame_state.render_tasks.add_dependency(
-                                    frame_state.surfaces[parent_surface_index.0].render_tasks.unwrap().port,
-                                    render_task_id,
-                                );
+                                frame_state.render_task_roots.push(render_task_id);
 
                                 if first {
                                     // TODO(gw): Maybe we can restructure this code to avoid the
@@ -5511,18 +5539,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = clipped.size.to_i32();
+
                         let render_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, clipped.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                clipped.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    clipped.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
@@ -5546,18 +5579,23 @@
                             device_pixel_scale,
                         );
 
+                        let task_size = clipped.size.to_i32();
+
                         let picture_task_id = frame_state.render_tasks.add().init(
-                            RenderTask::new_picture(
-                                RenderTaskLocation::Dynamic(None, clipped.size.to_i32()),
-                                unclipped.size,
-                                pic_index,
-                                clipped.origin,
-                                uv_rect_kind,
-                                surface_spatial_node_index,
-                                device_pixel_scale,
-                                PrimitiveVisibilityMask::all(),
-                                None,
-                                None,
+                            RenderTask::new_dynamic(
+                                task_size,
+                                RenderTaskKind::new_picture(
+                                    task_size,
+                                    unclipped.size,
+                                    pic_index,
+                                    clipped.origin,
+                                    uv_rect_kind,
+                                    surface_spatial_node_index,
+                                    device_pixel_scale,
+                                    PrimitiveVisibilityMask::all(),
+                                    None,
+                                    None,
+                                )
                             )
                         );
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/platform/macos/font.rs firefox-85.0+build1/gfx/wr/webrender/src/platform/macos/font.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/platform/macos/font.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/platform/macos/font.rs	2021-01-18 19:58:11.000000000 +0000
@@ -19,7 +19,7 @@
 use core_graphics::geometry::{CG_AFFINE_TRANSFORM_IDENTITY, CGRect};
 use core_text::{self, font_descriptor::CTFontDescriptorCreateCopyWithAttributes};
 use core_text::font::{CTFont, CTFontRef};
-use core_text::font_descriptor::CTFontDescriptor;
+use core_text::font_descriptor::{CTFontDescriptor, CTFontSymbolicTraits};
 use core_text::font_descriptor::{kCTFontDefaultOrientation, kCTFontColorGlyphsTrait};
 use euclid::default::Size2D;
 use crate::gamma_lut::{ColorLut, GammaLut};
@@ -41,7 +41,11 @@
 
 pub struct FontContext {
     desc_or_fonts: FastHashMap<FontKey, DescOrFont>,
-    ct_fonts: FastHashMap<(FontKey, FontSize, Vec<FontVariation>), CTFont>,
+    // Table mapping a sized font key with variations to its instantiated CoreText font.
+    // We also cache the symbolic traits for the given CT font when it is instantiated.
+    // This avoids an expensive bottleneck accessing the symbolic traits every time we
+    // need to rasterize a glyph or access its dimensions.
+    ct_fonts: FastHashMap<(FontKey, FontSize, Vec<FontVariation>), (CTFont, CTFontSymbolicTraits)>,
     #[allow(dead_code)]
     graphics_context: GraphicsContext,
     #[allow(dead_code)]
@@ -339,8 +343,7 @@
     }
 }
 
-fn is_bitmap_font(ct_font: &CTFont) -> bool {
-    let traits = ct_font.symbolic_traits();
+fn is_bitmap_font(traits: CTFontSymbolicTraits) -> bool {
     (traits & kCTFontColorGlyphsTrait) != 0
 }
 
@@ -417,16 +420,20 @@
         font_key: FontKey,
         size: f64,
         variations: &[FontVariation],
-    ) -> Option<CTFont> {
-        match self.ct_fonts.entry((font_key, FontSize::from_f64_px(size), variations.to_vec())) {
-            Entry::Occupied(entry) => Some((*entry.get()).clone()),
-            Entry::Vacant(entry) => {
-                let desc_or_font = self.desc_or_fonts.get(&font_key)?;
-                let ct_font = new_ct_font_with_variations(desc_or_font, size, variations);
-                entry.insert(ct_font.clone());
-                Some(ct_font)
+    ) -> Option<(CTFont, CTFontSymbolicTraits)> {
+        // Interacting with CoreText can create autorelease garbage.
+        objc::rc::autoreleasepool(|| {
+            match self.ct_fonts.entry((font_key, FontSize::from_f64_px(size), variations.to_vec())) {
+                Entry::Occupied(entry) => Some((*entry.get()).clone()),
+                Entry::Vacant(entry) => {
+                    let desc_or_font = self.desc_or_fonts.get(&font_key)?;
+                    let ct_font = new_ct_font_with_variations(desc_or_font, size, variations);
+                    let traits = ct_font.symbolic_traits();
+                    entry.insert((ct_font.clone(), traits));
+                    Some((ct_font, traits))
+                }
             }
-        }
+        })
     }
 
     pub fn get_glyph_index(&mut self, font_key: FontKey, ch: char) -> Option<u32> {
@@ -434,7 +441,7 @@
         let mut glyph = 0;
 
         self.get_ct_font(font_key, 16.0, &[])
-            .and_then(|ref ct_font| {
+            .and_then(|(ct_font, _)| {
                 unsafe {
                     let result = ct_font.get_glyphs_for_characters(&character, &mut glyph, 1);
 
@@ -455,9 +462,9 @@
         let (x_scale, y_scale) = font.transform.compute_scale().unwrap_or((1.0, 1.0));
         let size = font.size.to_f64_px() * y_scale;
         self.get_ct_font(font.font_key, size, &font.variations)
-            .and_then(|ref ct_font| {
+            .and_then(|(ct_font, traits)| {
                 let glyph = key.index() as CGGlyph;
-                let bitmap = is_bitmap_font(ct_font);
+                let bitmap = is_bitmap_font(traits);
                 let (mut shape, (x_offset, y_offset)) = if bitmap {
                     (FontTransform::identity(), (0.0, 0.0))
                 } else {
@@ -498,7 +505,7 @@
                 };
                 let extra_strikes = font.get_extra_strikes(strike_scale);
                 let metrics = get_glyph_metrics(
-                    ct_font,
+                    &ct_font,
                     transform.as_ref(),
                     glyph,
                     x_offset,
@@ -604,10 +611,12 @@
     }
 
     pub fn rasterize_glyph(&mut self, font: &FontInstance, key: &GlyphKey) -> GlyphRasterResult {
+        objc::rc::autoreleasepool(|| {
         let (x_scale, y_scale) = font.transform.compute_scale().unwrap_or((1.0, 1.0));
         let size = font.size.to_f64_px() * y_scale;
-        let ct_font = self.get_ct_font(font.font_key, size, &font.variations).ok_or(GlyphRasterError::LoadFailed)?;
-        let glyph_type = if is_bitmap_font(&ct_font) {
+        let (ct_font, traits) =
+            self.get_ct_font(font.font_key, size, &font.variations).ok_or(GlyphRasterError::LoadFailed)?;
+        let glyph_type = if is_bitmap_font(traits) {
             GlyphType::Bitmap
         } else {
             GlyphType::Vector
@@ -846,7 +855,7 @@
                 GlyphType::Vector => font.get_glyph_format(),
             },
             bytes: rasterized_pixels,
-        })
+        })})
     }
 }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/prepare.rs firefox-85.0+build1/gfx/wr/webrender/src/prepare.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/prepare.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/prepare.rs	2021-01-18 19:58:12.000000000 +0000
@@ -30,7 +30,7 @@
 use crate::prim_store::*;
 use crate::render_backend::DataStores;
 use crate::render_task_cache::{RenderTaskCacheKeyKind, RenderTaskCacheEntryHandle, RenderTaskCacheKey, to_cache_size};
-use crate::render_task::RenderTask;
+use crate::render_task::{RenderTask, RenderTaskKind};
 use crate::segment::SegmentBuilder;
 use crate::space::SpaceMapper;
 use crate::texture_cache::TEXTURE_REGION_DIMENSIONS;
@@ -360,12 +360,14 @@
                     None,
                     false,
                     |render_tasks| {
-                        render_tasks.add().init(RenderTask::new_line_decoration(
+                        render_tasks.add().init(RenderTask::new_dynamic(
                             task_size,
-                            cache_key.style,
-                            cache_key.orientation,
-                            cache_key.wavy_line_thickness.to_f32_px(),
-                            LayoutSize::from_au(cache_key.size),
+                            RenderTaskKind::new_line_decoration(
+                                cache_key.style,
+                                cache_key.orientation,
+                                cache_key.wavy_line_thickness.to_f32_px(),
+                                LayoutSize::from_au(cache_key.size),
+                            ),
                         ))
                     }
                 ));
@@ -494,13 +496,15 @@
                     None,
                     false,          // TODO(gw): We don't calculate opacity for borders yet!
                     |render_tasks| {
-                        render_tasks.add().init(RenderTask::new_border_segment(
+                        render_tasks.add().init(RenderTask::new_dynamic(
                             cache_size,
-                            build_border_instances(
-                                &segment.cache_key,
-                                cache_size,
-                                &border_data.border,
-                                scale,
+                            RenderTaskKind::new_border_segment(
+                                build_border_instances(
+                                    &segment.cache_key,
+                                    cache_size,
+                                    &border_data.border,
+                                    scale,
+                                )
                             ),
                         ))
                     }
@@ -820,12 +824,14 @@
                                         None,
                                         is_opaque,
                                         |render_tasks| {
-                                            render_tasks.add().init(RenderTask::new_gradient(
+                                            render_tasks.add().init(RenderTask::new_dynamic(
                                                 task_size,
-                                                segment_stops,
-                                                orientation,
-                                                segment_start_point,
-                                                segment_end_point,
+                                                RenderTaskKind::new_gradient(
+                                                    segment_stops,
+                                                    orientation,
+                                                    segment_start_point,
+                                                    segment_end_point,
+                                                ),
                                             ))
                                         }),
                                     local_rect: local_rect,
@@ -1484,19 +1490,24 @@
             unadjusted_device_rect,
             device_pixel_scale,
         );
+        let task_size = device_rect.size.to_i32();
 
-        let clip_task_id = RenderTask::new_mask(
-            device_rect,
-            instance.vis.clip_chain.clips_range,
-            root_spatial_node_index,
-            frame_state.clip_store,
-            frame_state.gpu_cache,
-            frame_state.resource_cache,
-            frame_state.render_tasks,
-            &mut data_stores.clip,
-            device_pixel_scale,
-            frame_context.fb_config,
+        let clip_task = RenderTask::new_dynamic(
+            task_size,
+            RenderTaskKind::new_mask(
+                device_rect,
+                instance.vis.clip_chain.clips_range,
+                root_spatial_node_index,
+                frame_state.clip_store,
+                frame_state.gpu_cache,
+                frame_state.resource_cache,
+                frame_state.render_tasks,
+                &mut data_stores.clip,
+                device_pixel_scale,
+                frame_context.fb_config,
+            ),
         );
+        let clip_task_id = frame_state.render_tasks.add().init(clip_task);
         if instance.is_chased() {
             println!("\tcreated task {:?} with device rect {:?}",
                 clip_task_id, device_rect);
@@ -1570,19 +1581,24 @@
     };
 
     let (device_rect, device_pixel_scale) = adjust_mask_scale_for_max_size(device_rect, device_pixel_scale);
+    let task_size = device_rect.size.to_i32();
 
-    let clip_task_id = RenderTask::new_mask(
-        device_rect,
-        clip_chain.clips_range,
-        root_spatial_node_index,
-        frame_state.clip_store,
-        frame_state.gpu_cache,
-        frame_state.resource_cache,
-        frame_state.render_tasks,
-        clip_data_store,
-        device_pixel_scale,
-        frame_context.fb_config,
+    let clip_task = RenderTask::new_dynamic(
+        task_size,
+        RenderTaskKind::new_mask(
+            device_rect,
+            clip_chain.clips_range,
+            root_spatial_node_index,
+            frame_state.clip_store,
+            frame_state.gpu_cache,
+            frame_state.resource_cache,
+            frame_state.render_tasks,
+            clip_data_store,
+            device_pixel_scale,
+            frame_context.fb_config,
+        ),
     );
+    let clip_task_id = frame_state.render_tasks.add().init(clip_task);
     let port = frame_state
         .surfaces[surface_index.0]
         .render_tasks
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/profiler.rs firefox-85.0+build1/gfx/wr/webrender/src/profiler.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/profiler.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/profiler.rs	2021-01-18 19:58:11.000000000 +0000
@@ -284,7 +284,7 @@
             float("Texture cache RGBA8 linear mem", "MB", TEXTURE_CACHE_RGBA8_LINEAR_MEM, expected(0.0..100.0)),
             int("Texture cache RGBA8 nearest regions", "", TEXTURE_CACHE_RGBA8_NEAREST_REGIONS, expected(0..100)),
             float("Texture cache RGBA8 nearest mem", "MB", TEXTURE_CACHE_RGBA8_NEAREST_MEM, expected(0.0..100.0)),
-            float("Texture cache shared mem", "", TEXTURE_CACHE_SHARED_MEM, expected(0.0..100.0)),
+            float("Texture cache shared mem", "MB", TEXTURE_CACHE_SHARED_MEM, expected(0.0..100.0)),
             float("Texture cache standalone mem", "MB", TEXTURE_CACHE_STANDALONE_MEM, expected(0.0..100.0)),
 
 
@@ -316,7 +316,7 @@
             int("Interned filter data", "", INTERNED_FILTER_DATA, Expected::none()),
             int("Interned backdrops", "", INTERNED_BACKDROPS, Expected::none()),
 
-            int("Texture cache glyphs regions", "", TEXTURE_CACHE_RGBA8_GLYPHS_REGIONS, expected(0..100)),
+            int("Texture cache glyphs regions", "", TEXTURE_CACHE_RGBA8_GLYPHS_REGIONS, expected(0..257)),
             float("Texture cache glyphs mem", "MB", TEXTURE_CACHE_RGBA8_GLYPHS_MEM, expected(0.0..100.0)),
         ];
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_api.rs firefox-85.0+build1/gfx/wr/webrender/src/render_api.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_api.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_api.rs	2021-01-18 19:58:12.000000000 +0000
@@ -106,6 +106,38 @@
     }
 }
 
+/// Whether to generate a frame, and if so, an id that allows tracking this
+/// transaction through the various frame stages.
+#[derive(Clone, Debug)]
+pub enum GenerateFrame {
+    /// Generate a frame if something changed.
+    Yes {
+        /// An id that allows tracking the frame transaction through the various
+        /// frame stages. Specified by the caller of generate_frame().
+        id: u64,
+    },
+    /// Don't generate a frame even if something has changed.
+    No,
+}
+
+impl GenerateFrame {
+    ///
+    pub fn as_bool(&self) -> bool {
+        match self {
+            GenerateFrame::Yes { .. } => true,
+            GenerateFrame::No => false,
+        }
+    }
+
+    /// Return the frame ID, if a frame is generated.
+    pub fn id(&self) -> Option<u64> {
+        match self {
+            GenerateFrame::Yes { id } => Some(*id),
+            GenerateFrame::No => None,
+        }
+    }
+}
+
 /// A Transaction is a group of commands to apply atomically to a document.
 ///
 /// This mechanism ensures that:
@@ -127,8 +159,10 @@
     /// it will be applied directly on the render backend.
     use_scene_builder_thread: bool,
 
-    ///
-    generate_frame: bool,
+    /// Whether to generate a frame, and if so, an id that allows tracking this
+    /// transaction through the various frame stages. Specified by the caller of
+    /// generate_frame().
+    generate_frame: GenerateFrame,
 
     /// Set to true in order to force re-rendering even if WebRender can't internally
     /// detect that something has changed.
@@ -146,7 +180,7 @@
             resource_updates: Vec::new(),
             notifications: Vec::new(),
             use_scene_builder_thread: true,
-            generate_frame: false,
+            generate_frame: GenerateFrame::No,
             invalidate_rendered_frame: false,
             low_priority: false,
         }
@@ -171,7 +205,7 @@
 
     /// Returns true if the transaction has no effect.
     pub fn is_empty(&self) -> bool {
-        !self.generate_frame &&
+        !self.generate_frame.as_bool() &&
             !self.invalidate_rendered_frame &&
             self.scene_ops.is_empty() &&
             self.frame_ops.is_empty() &&
@@ -342,8 +376,8 @@
     /// as to when happened.
     ///
     /// [notifier]: trait.RenderNotifier.html#tymethod.new_frame_ready
-    pub fn generate_frame(&mut self) {
-        self.generate_frame = true;
+    pub fn generate_frame(&mut self, id: u64) {
+        self.generate_frame = GenerateFrame::Yes{ id };
     }
 
     /// Invalidate rendered frame. It ensure that frame will be rendered during
@@ -556,7 +590,7 @@
     /// Updates to resources that persist across display lists.
     pub resource_updates: Vec<ResourceUpdate>,
     /// Whether to trigger frame building and rendering if something has changed.
-    pub generate_frame: bool,
+    pub generate_frame: GenerateFrame,
     /// Whether to force frame building and rendering even if no changes are internally
     /// observed.
     pub invalidate_rendered_frame: bool,
@@ -579,7 +613,7 @@
 
 impl fmt::Debug for TransactionMsg {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        writeln!(f, "threaded={}, genframe={}, invalidate={}, low_priority={}",
+        writeln!(f, "threaded={}, genframe={:?}, invalidate={}, low_priority={}",
                         self.use_scene_builder_thread,
                         self.generate_frame,
                         self.invalidate_rendered_frame,
@@ -603,7 +637,7 @@
 impl TransactionMsg {
     /// Returns true if this transaction has no effect.
     pub fn is_empty(&self) -> bool {
-        !self.generate_frame &&
+        !self.generate_frame.as_bool() &&
             !self.invalidate_rendered_frame &&
             self.scene_ops.is_empty() &&
             self.frame_ops.is_empty() &&
@@ -844,13 +878,15 @@
         ///
         const IMAGES = 0b1;
         ///
-        const GLYPHS = 0b01;
+        const GLYPHS = 0b10;
         ///
-        const GLYPH_DIMENSIONS = 0b001;
+        const GLYPH_DIMENSIONS = 0b100;
         ///
-        const RENDER_TASKS = 0b0001;
+        const RENDER_TASKS = 0b1000;
         ///
-        const TEXTURE_CACHE = 0b00001;
+        const TEXTURE_CACHE = 0b10000;
+        /// Clear render target pool
+        const RENDER_TARGETS = 0b100000;
     }
 }
 
@@ -1228,7 +1264,7 @@
             frame_ops: vec![msg],
             resource_updates: Vec::new(),
             notifications: Vec::new(),
-            generate_frame: false,
+            generate_frame: GenerateFrame::No,
             invalidate_rendered_frame: false,
             use_scene_builder_thread: false,
             low_priority: false,
@@ -1247,7 +1283,7 @@
             frame_ops: Vec::new(),
             resource_updates: Vec::new(),
             notifications: Vec::new(),
-            generate_frame: false,
+            generate_frame: GenerateFrame::No,
             invalidate_rendered_frame: false,
             use_scene_builder_thread: false,
             low_priority: false,
@@ -1285,7 +1321,7 @@
         self.resources.update(&mut transaction);
 
         transaction.use_scene_builder_thread |= !transaction.scene_ops.is_empty();
-        if transaction.generate_frame {
+        if transaction.generate_frame.as_bool() {
             transaction.profile.start_time(profiler::API_SEND_TIME);
             transaction.profile.start_time(profiler::TOTAL_FRAME_CPU_TIME);
         }
@@ -1310,7 +1346,7 @@
             .map(|(txn, id)| {
                 let mut txn = txn.finalize(id);
                 self.resources.update(&mut txn);
-                if txn.generate_frame {
+                if txn.generate_frame.as_bool() {
                     txn.profile.start_time(profiler::API_SEND_TIME);
                     txn.profile.start_time(profiler::TOTAL_FRAME_CPU_TIME);
                 }
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_backend.rs firefox-85.0+build1/gfx/wr/webrender/src/render_backend.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_backend.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_backend.rs	2021-01-18 19:58:12.000000000 +0000
@@ -1010,6 +1010,7 @@
                 txn.frame_ops.take(),
                 txn.notifications.take(),
                 txn.render_frame,
+                None,
                 txn.invalidate_rendered_frame,
                 frame_counter,
                 has_built_scene,
@@ -1066,7 +1067,7 @@
                     memory_pressure: true,
                 };
                 self.result_tx.send(msg).unwrap();
-                self.notifier.wake_up();
+                self.notifier.wake_up(false);
             }
             ApiMsg::ReportMemory(tx) => {
                 self.report_memory(tx);
@@ -1210,7 +1211,7 @@
                     _ => ResultMsg::DebugCommand(option),
                 };
                 self.result_tx.send(msg).unwrap();
-                self.notifier.wake_up();
+                self.notifier.wake_up(true);
             }
             ApiMsg::UpdateDocuments(transaction_msgs) => {
                 self.prepare_transactions(
@@ -1308,7 +1309,7 @@
             SceneBuilderResult::DocumentsForDebugger(json) => {
                 let msg = ResultMsg::DebugOutput(DebugOutput::FetchDocuments(json));
                 self.result_tx.send(msg).unwrap();
-                self.notifier.wake_up();
+                self.notifier.wake_up(false);
             }
         }
 
@@ -1347,7 +1348,7 @@
 
         let mut built_frame = false;
         for mut txn in txns {
-            if txn.generate_frame {
+            if txn.generate_frame.as_bool() {
                 txn.profile.end_time(profiler::API_SEND_TIME);
             }
 
@@ -1358,7 +1359,8 @@
                 txn.resource_updates.take(),
                 txn.frame_ops.take(),
                 txn.notifications.take(),
-                txn.generate_frame,
+                txn.generate_frame.as_bool(),
+                txn.generate_frame.id(),
                 txn.invalidate_rendered_frame,
                 frame_counter,
                 false
@@ -1395,6 +1397,7 @@
                     Vec::default(),
                     Vec::default(),
                     false,
+                    None,
                     false,
                     frame_counter,
                     false);
@@ -1414,6 +1417,7 @@
         mut frame_ops: Vec<FrameMsg>,
         mut notifications: Vec<NotificationRequest>,
         mut render_frame: bool,
+        generated_frame_id: Option<u64>,
         invalidate_rendered_frame: bool,
         frame_counter: &mut u32,
         has_built_scene: bool,
@@ -1430,8 +1434,7 @@
         // async transforms.
         if requested_frame || has_built_scene {
             if let Some(ref sampler) = self.sampler {
-                frame_ops.append(&mut sampler.sample(document_id,
-                                                     &doc.scene.pipeline_epochs));
+                frame_ops.append(&mut sampler.sample(document_id, generated_frame_id));
             }
         }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/renderer.rs firefox-85.0+build1/gfx/wr/webrender/src/renderer.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/renderer.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/renderer.rs	2021-01-18 19:58:11.000000000 +0000
@@ -35,11 +35,13 @@
 //! calling `DrawTarget::to_framebuffer_rect`
 
 use api::{BlobImageHandler, ColorF, ColorU, MixBlendMode};
-use api::{DocumentId, Epoch, ExternalImageHandler, ExternalImageId};
-use api::{ExternalImageSource, ExternalImageType, ExternalImageType::TextureHandle, FontRenderMode, ImageFormat};
+use api::{DocumentId, Epoch, ExternalImageHandler};
+#[cfg(feature = "replay")]
+use api::ExternalImageId;
+use api::{ExternalImageSource, ExternalImageType, FontRenderMode, ImageFormat};
 use api::{PipelineId, ImageRendering, Checkpoint, NotificationRequest};
 use api::{VoidPtrToSizeFn, PremultipliedColorF};
-use api::{RenderNotifier, TextureTarget, SharedFontInstanceMap};
+use api::{RenderNotifier, ImageBufferKind, SharedFontInstanceMap};
 #[cfg(feature = "replay")]
 use api::ExternalImage;
 use api::units::*;
@@ -70,11 +72,11 @@
 use crate::gpu_cache::{GpuBlockData, GpuCacheUpdate, GpuCacheUpdateList};
 use crate::gpu_cache::{GpuCacheDebugChunk, GpuCacheDebugCmd};
 use crate::gpu_types::{PrimitiveHeaderI, PrimitiveHeaderF, PrimitiveInstanceData, ScalingInstance, SvgFilterInstance};
-use crate::gpu_types::{ClearInstance, CompositeInstance, ResolveInstanceData, TransformData, ZBufferId};
+use crate::gpu_types::{ClearInstance, CompositeInstance, TransformData, ZBufferId};
 use crate::internal_types::{TextureSource, ResourceCacheError};
 use crate::internal_types::{CacheTextureId, DebugOutput, FastHashMap, FastHashSet, LayerIndex, RenderedDocument, ResultMsg};
 use crate::internal_types::{TextureCacheAllocationKind, TextureCacheUpdate, TextureUpdateList, TextureUpdateSource};
-use crate::internal_types::{RenderTargetInfo, SavedTargetIndex, Swizzle};
+use crate::internal_types::{RenderTargetInfo, Swizzle, DeferredResolveIndex};
 use malloc_size_of::MallocSizeOfOps;
 use crate::picture::{self, ResolvedSurfaceTexture};
 use crate::prim_store::DeferredResolve;
@@ -89,13 +91,11 @@
 use crate::scene_builder_thread::{SceneBuilderThread, SceneBuilderThreadChannels, LowPrioritySceneBuilderThread};
 use crate::screen_capture::AsyncScreenshotGrabber;
 use crate::shade::{Shaders, WrShaders};
-use smallvec::SmallVec;
-use crate::texture_allocator::{ArrayAllocationTracker, FreeRectSlice};
+use crate::guillotine_allocator::{GuillotineAllocator, FreeRectSlice};
 use crate::texture_cache::TextureCache;
 use crate::render_target::{AlphaRenderTarget, ColorRenderTarget, PictureCacheTarget};
-use crate::render_target::{RenderTarget, TextureCacheRenderTarget, RenderTargetList};
+use crate::render_target::{RenderTarget, TextureCacheRenderTarget};
 use crate::render_target::{RenderTargetKind, BlitJob, BlitJobSource};
-use crate::render_task_graph::RenderPassKind;
 use crate::tile_cache::PictureCacheDebugInfo;
 use crate::util::drain_filter;
 
@@ -366,6 +366,7 @@
     Dither,
     PrimitiveHeadersF,
     PrimitiveHeadersI,
+    ClipMask,
 }
 
 impl TextureSampler {
@@ -395,6 +396,7 @@
             TextureSampler::Dither => TextureSlot(8),
             TextureSampler::PrimitiveHeadersF => TextureSlot(9),
             TextureSampler::PrimitiveHeadersI => TextureSlot(10),
+            TextureSampler::ClipMask => TextureSlot(11),
         }
     }
 }
@@ -1096,28 +1098,6 @@
     pub version: String,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub enum ImageBufferKind {
-    Texture2D = 0,
-    TextureRect = 1,
-    TextureExternal = 2,
-    Texture2DArray = 3,
-}
-
-//TODO: those types are the same, so let's merge them
-impl From<TextureTarget> for ImageBufferKind {
-    fn from(target: TextureTarget) -> Self {
-        match target {
-            TextureTarget::Default => ImageBufferKind::Texture2D,
-            TextureTarget::Rect => ImageBufferKind::TextureRect,
-            TextureTarget::Array => ImageBufferKind::Texture2DArray,
-            TextureTarget::External => ImageBufferKind::TextureExternal,
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct GpuProfile {
     pub frame_id: GpuFrameId,
@@ -1172,13 +1152,6 @@
     },
 }
 
-/// A Texture that has been initialized by the `device` module and is ready to
-/// be used.
-struct ActiveTexture {
-    texture: Texture,
-    saved_index: Option<SavedTargetIndex>,
-}
-
 /// Helper struct for resolving device Textures for use during rendering passes.
 ///
 /// Manages the mapping between the at-a-distance texture handles used by the
@@ -1189,7 +1162,7 @@
     texture_cache_map: FastHashMap<CacheTextureId, Texture>,
 
     /// Map of external image IDs to native textures.
-    external_images: FastHashMap<(ExternalImageId, u8), ExternalTexture>,
+    external_images: FastHashMap<DeferredResolveIndex, ExternalTexture>,
 
     /// A special 1x1 dummy texture used for shaders that expect to work with
     /// the output of the previous pass but are actually running in the first
@@ -1197,37 +1170,15 @@
     dummy_cache_texture: Texture,
 
     /// The outputs of the previous pass, if applicable.
-    prev_pass_color: Option<ActiveTexture>,
-    prev_pass_alpha: Option<ActiveTexture>,
-
-    /// Saved render targets from previous passes. This is used when a pass
-    /// needs access to the result of a pass other than the immediately-preceding
-    /// one. In this case, the `RenderTask` will get a non-`None` `saved_index`,
-    /// which will cause the resulting render target to be persisted in this list
-    /// (at that index) until the end of the frame.
-    saved_targets: Vec<Texture>,
-
-    /// Pool of idle render target textures ready for re-use.
-    ///
-    /// Naively, it would seem like we only ever need two pairs of (color,
-    /// alpha) render targets: one for the output of the previous pass (serving
-    /// as input to the current pass), and one for the output of the current
-    /// pass. However, there are cases where the output of one pass is used as
-    /// the input to multiple future passes. For example, drop-shadows draw the
-    /// picture in pass X, then reference it in pass X+1 to create the blurred
-    /// shadow, and pass the results of both X and X+1 to pass X+2 draw the
-    /// actual content.
-    ///
-    /// See the comments in `allocate_target_texture` for more insight on why
-    /// reuse is a win.
-    render_target_pool: Vec<Texture>,
+    prev_pass_color: Option<CacheTextureId>,
+    prev_pass_alpha: Option<CacheTextureId>,
 }
 
 impl TextureResolver {
     fn new(device: &mut Device) -> TextureResolver {
         let dummy_cache_texture = device
             .create_texture(
-                TextureTarget::Array,
+                ImageBufferKind::Texture2DArray,
                 ImageFormat::RGBA8,
                 1,
                 1,
@@ -1246,8 +1197,6 @@
             dummy_cache_texture,
             prev_pass_alpha: None,
             prev_pass_color: None,
-            saved_targets: Vec::default(),
-            render_target_pool: Vec::new(),
         }
     }
 
@@ -1257,135 +1206,26 @@
         for (_id, texture) in self.texture_cache_map {
             device.delete_texture(texture);
         }
-
-        for texture in self.render_target_pool {
-            device.delete_texture(texture);
-        }
     }
 
     fn begin_frame(&mut self) {
         assert!(self.prev_pass_color.is_none());
         assert!(self.prev_pass_alpha.is_none());
-        assert!(self.saved_targets.is_empty());
-    }
-
-    fn end_frame(&mut self, device: &mut Device, frame_id: GpuFrameId) {
-        // return the cached targets to the pool
-        self.end_pass(device, None, None);
-        // return the saved targets as well
-        while let Some(target) = self.saved_targets.pop() {
-            self.return_to_pool(device, target);
-        }
-
-        // GC the render target pool, if it's currently > 32 MB in size.
-        //
-        // We use a simple scheme whereby we drop any texture that hasn't been used
-        // in the last 60 frames, until we are below the size threshold. This should
-        // generally prevent any sustained build-up of unused textures, unless we don't
-        // generate frames for a long period. This can happen when the window is
-        // minimized, and we probably want to flush all the WebRender caches in that case [1].
-        // There is also a second "red line" memory threshold which prevents
-        // memory exhaustion if many render targets are allocated within a small
-        // number of frames. For now this is set at 320 MB (10x the normal memory threshold).
-        //
-        // [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1494099
-        self.gc_targets(
-            device,
-            frame_id,
-            32 * 1024 * 1024,
-            32 * 1024 * 1024 * 10,
-            60,
-        );
-    }
-
-    /// Transfers ownership of a render target back to the pool.
-    fn return_to_pool(&mut self, device: &mut Device, target: Texture) {
-        device.invalidate_render_target(&target);
-        self.render_target_pool.push(target);
-    }
-
-    /// Frees any memory possible, in the event of a memory pressure signal.
-    fn on_memory_pressure(
-        &mut self,
-        device: &mut Device,
-    ) {
-        // Clear all textures in the render target pool
-        for target in self.render_target_pool.drain(..) {
-            device.delete_texture(target);
-        }
-    }
-
-    /// Drops all targets from the render target pool that do not satisfy the predicate.
-    pub fn gc_targets(
-        &mut self,
-        device: &mut Device,
-        current_frame_id: GpuFrameId,
-        total_bytes_threshold: usize,
-        total_bytes_red_line_threshold: usize,
-        frames_threshold: usize,
-    ) {
-        // Get the total GPU memory size used by the current render target pool
-        let mut rt_pool_size_in_bytes: usize = self.render_target_pool
-            .iter()
-            .map(|t| t.size_in_bytes())
-            .sum();
-
-        // If the total size of the pool is less than the threshold, don't bother
-        // trying to GC any targets
-        if rt_pool_size_in_bytes <= total_bytes_threshold {
-            return;
-        }
-
-        // Sort the current pool by age, so that we remove oldest textures first
-        self.render_target_pool.sort_by_key(|t| t.last_frame_used());
-
-        // We can't just use retain() because `Texture` requires manual cleanup.
-        let mut retained_targets = SmallVec::<[Texture; 8]>::new();
-
-        for target in self.render_target_pool.drain(..) {
-            // Drop oldest textures until we are under the allowed size threshold.
-            // However, if it's been used in very recently, it is always kept around,
-            // which ensures we don't thrash texture allocations on pages that do
-            // require a very large render target pool and are regularly changing.
-            if (rt_pool_size_in_bytes > total_bytes_red_line_threshold) ||
-               (rt_pool_size_in_bytes > total_bytes_threshold &&
-                !target.used_recently(current_frame_id, frames_threshold))
-            {
-                rt_pool_size_in_bytes -= target.size_in_bytes();
-                device.delete_texture(target);
-            } else {
-                retained_targets.push(target);
-            }
-        }
-
-        self.render_target_pool.extend(retained_targets);
     }
 
     fn end_pass(
         &mut self,
         device: &mut Device,
-        a8_texture: Option<ActiveTexture>,
-        rgba8_texture: Option<ActiveTexture>,
+        textures_to_invalidate: &[CacheTextureId],
+        a8_texture: Option<CacheTextureId>,
+        rgba8_texture: Option<CacheTextureId>,
     ) {
-        // If we have cache textures from previous pass, return them to the pool.
-        // Also assign the pool index of those cache textures to last pass's index because this is
-        // the result of last pass.
-        // Note: the order here is important, needs to match the logic in `RenderPass::build()`.
-        if let Some(at) = self.prev_pass_color.take() {
-            if let Some(index) = at.saved_index {
-                assert_eq!(self.saved_targets.len(), index.0);
-                self.saved_targets.push(at.texture);
-            } else {
-                self.return_to_pool(device, at.texture);
-            }
-        }
-        if let Some(at) = self.prev_pass_alpha.take() {
-            if let Some(index) = at.saved_index {
-                assert_eq!(self.saved_targets.len(), index.0);
-                self.saved_targets.push(at.texture);
-            } else {
-                self.return_to_pool(device, at.texture);
-            }
+        // For any texture that is no longer needed, immediately
+        // invalidate it so that tiled GPUs don't need to resolve it
+        // back to memory.
+        for texture_id in textures_to_invalidate {
+            let render_target = &self.texture_cache_map[texture_id];
+            device.invalidate_render_target(render_target);
         }
 
         // We have another pass to process, make these textures available
@@ -1407,7 +1247,7 @@
             }
             TextureSource::PrevPassAlpha => {
                 let texture = match self.prev_pass_alpha {
-                    Some(ref at) => &at.texture,
+                    Some(ref id) => &self.texture_cache_map[id],
                     None => &self.dummy_cache_texture,
                 };
                 let swizzle = Swizzle::default();
@@ -1416,47 +1256,25 @@
             }
             TextureSource::PrevPassColor => {
                 let texture = match self.prev_pass_color {
-                    Some(ref at) => &at.texture,
+                    Some(ref id) => &self.texture_cache_map[id],
                     None => &self.dummy_cache_texture,
                 };
                 let swizzle = Swizzle::default();
                 device.bind_texture(sampler, texture, swizzle);
                 swizzle
             }
-            TextureSource::External(external_image) => {
+            TextureSource::External(ref index, _) => {
                 let texture = self.external_images
-                    .get(&(external_image.id, external_image.channel_index))
+                    .get(index)
                     .expect("BUG: External image should be resolved by now");
                 device.bind_external_texture(sampler, texture);
                 Swizzle::default()
             }
-            TextureSource::TextureCache(index, swizzle) => {
+            TextureSource::TextureCache(index, _, swizzle) => {
                 let texture = &self.texture_cache_map[&index];
                 device.bind_texture(sampler, texture, swizzle);
                 swizzle
             }
-            TextureSource::RenderTaskCache(saved_index, swizzle) => {
-                if saved_index.0 < self.saved_targets.len() {
-                    let texture = &self.saved_targets[saved_index.0];
-                    device.bind_texture(sampler, texture, swizzle)
-                } else {
-                    // Check if this saved index is referring to a the prev pass
-                    if Some(saved_index) == self.prev_pass_color.as_ref().and_then(|at| at.saved_index) {
-                        let texture = match self.prev_pass_color {
-                            Some(ref at) => &at.texture,
-                            None => &self.dummy_cache_texture,
-                        };
-                        device.bind_texture(sampler, texture, swizzle);
-                    } else if Some(saved_index) == self.prev_pass_alpha.as_ref().and_then(|at| at.saved_index) {
-                        let texture = match self.prev_pass_alpha {
-                            Some(ref at) => &at.texture,
-                            None => &self.dummy_cache_texture,
-                        };
-                        device.bind_texture(sampler, texture, swizzle);
-                    }
-                }
-                swizzle
-            }
         }
     }
 
@@ -1471,14 +1289,14 @@
             }
             TextureSource::PrevPassAlpha => Some((
                 match self.prev_pass_alpha {
-                    Some(ref at) => &at.texture,
+                    Some(ref id) => &self.texture_cache_map[id],
                     None => &self.dummy_cache_texture,
                 },
                 Swizzle::default(),
             )),
             TextureSource::PrevPassColor => Some((
                 match self.prev_pass_color {
-                    Some(ref at) => &at.texture,
+                    Some(ref id) => &self.texture_cache_map[id],
                     None => &self.dummy_cache_texture,
                 },
                 Swizzle::default(),
@@ -1486,12 +1304,9 @@
             TextureSource::External(..) => {
                 panic!("BUG: External textures cannot be resolved, they can only be bound.");
             }
-            TextureSource::TextureCache(index, swizzle) => {
+            TextureSource::TextureCache(index, _, swizzle) => {
                 Some((&self.texture_cache_map[&index], swizzle))
             }
-            TextureSource::RenderTaskCache(saved_index, swizzle) => {
-                Some((&self.saved_targets[saved_index.0], swizzle))
-            }
         }
     }
 
@@ -1503,9 +1318,9 @@
         default_value: TexelRect,
     ) -> TexelRect {
         match source {
-            TextureSource::External(ref external_image) => {
+            TextureSource::External(ref index, _) => {
                 let texture = self.external_images
-                    .get(&(external_image.id, external_image.channel_index))
+                    .get(index)
                     .expect("BUG: External image should be resolved by now");
                 texture.get_uv_rect()
             }
@@ -1523,9 +1338,6 @@
         for t in self.texture_cache_map.values() {
             report.texture_cache_textures += t.size_in_bytes();
         }
-        for t in self.render_target_pool.iter() {
-            report.render_target_textures += t.size_in_bytes();
-        }
 
         report
     }
@@ -1648,7 +1460,7 @@
             _ => Some(RenderTargetInfo { has_depth: false }),
         };
         let mut texture = device.create_texture(
-            TextureTarget::Default,
+            ImageBufferKind::Texture2D,
             ImageFormat::RGBAF32,
             new_size.width,
             new_size.height,
@@ -1657,9 +1469,9 @@
             1,
         );
 
-        // Blit the contents of the previous texture, if applicable.
+        // Copy the contents of the previous texture, if applicable.
         if let Some(blit_source) = blit_source {
-            device.blit_renderable_texture(&mut texture, &blit_source);
+            device.copy_entire_texture(&mut texture, &blit_source);
             device.delete_texture(blit_source);
         }
 
@@ -1938,7 +1750,7 @@
             }
 
             let texture = device.create_texture(
-                TextureTarget::Default,
+                ImageBufferKind::Texture2D,
                 self.format,
                 MAX_VERTEX_TEXTURE_WIDTH as i32,
                 // Ensure height is at least two to work around
@@ -2415,7 +2227,6 @@
             options.use_optimized_shaders,
             options.upload_method.clone(),
             options.cached_programs.take(),
-            options.allow_pixel_local_storage_support,
             options.allow_texture_storage_support,
             options.allow_texture_swizzling,
             options.dump_shader_source.take(),
@@ -2427,10 +2238,7 @@
         let swizzle_settings = device.swizzle_settings();
         let use_dual_source_blending =
             device.get_capabilities().supports_dual_source_blending &&
-            options.allow_dual_source_blending &&
-            // If using pixel local storage, subpixel AA isn't supported (we disable it on all
-            // mobile devices explicitly anyway).
-            !device.get_capabilities().supports_pixel_local_storage;
+            options.allow_dual_source_blending;
         let ext_blend_equation_advanced =
             options.allow_advanced_blend_equation &&
             device.get_capabilities().supports_advanced_blend_equation;
@@ -2453,7 +2261,6 @@
             return Err(RendererError::MaxTextureSize);
         }
         let max_texture_size = device.max_texture_size();
-        let max_texture_layers = device.max_texture_layers();
 
         device.begin_frame();
 
@@ -2531,7 +2338,7 @@
             ];
 
             let texture = device.create_texture(
-                TextureTarget::Default,
+                ImageBufferKind::Texture2D,
                 ImageFormat::R8,
                 8,
                 8,
@@ -2770,7 +2577,6 @@
 
             let texture_cache = TextureCache::new(
                 max_texture_size,
-                max_texture_layers,
                 picture_tile_size,
                 color_cache_formats,
                 swizzle_settings,
@@ -3095,7 +2901,6 @@
                     // the device module asserts if we delete textures while
                     // not in a frame.
                     if memory_pressure {
-                        self.texture_resolver.on_memory_pressure(&mut self.device);
                         self.texture_upload_pbo_pool.on_memory_pressure(&mut self.device);
                     }
 
@@ -3304,16 +3109,9 @@
         for (_, render_doc) in &self.active_documents {
             for pass in &render_doc.frame.passes {
                 let mut debug_targets = Vec::new();
-                match pass.kind {
-                    RenderPassKind::MainFramebuffer { ref main_target, .. } => {
-                        debug_targets.push(Self::debug_color_target(main_target));
-                    }
-                    RenderPassKind::OffScreen { ref alpha, ref color, ref texture_cache, .. } => {
-                        debug_targets.extend(alpha.targets.iter().map(Self::debug_alpha_target));
-                        debug_targets.extend(color.targets.iter().map(Self::debug_color_target));
-                        debug_targets.extend(texture_cache.iter().map(|(_, target)| Self::debug_texture_cache_target(target)));
-                    }
-                }
+                debug_targets.extend(pass.alpha.targets.iter().map(Self::debug_alpha_target));
+                debug_targets.extend(pass.color.targets.iter().map(Self::debug_color_target));
+                debug_targets.extend(pass.texture_cache.iter().map(|(_, target)| Self::debug_texture_cache_target(target)));
 
                 debug_passes.add(debug_server::Pass { targets: debug_targets });
             }
@@ -3667,11 +3465,6 @@
             self.update_debug_overlay(device_size);
         }
 
-        #[cfg(feature = "replay")]
-        self.texture_resolver.external_images.extend(
-            self.owned_external_images.iter().map(|(key, value)| (*key, value.clone()))
-        );
-
         let frame = &mut active_doc.frame;
         let profile = &mut active_doc.profile;
         assert!(self.current_compositor_kind == frame.composite_state.compositor_kind);
@@ -3681,7 +3474,7 @@
                     "Cleared texture cache without sending new document frame.");
         }
 
-        match self.prepare_gpu_cache(frame) {
+        match self.prepare_gpu_cache(&frame.deferred_resolves) {
             Ok(..) => {
                 assert!(frame.gpu_cache_frame_id <= self.gpu_cache_frame_id,
                     "Received frame depends on a later GPU cache epoch ({:?}) than one we received last via `UpdateGpuCache` ({:?})",
@@ -3720,7 +3513,7 @@
             }
         }
 
-        self.unlock_external_images();
+        self.unlock_external_images(&frame.deferred_resolves);
 
         let _gm = self.gpu_profiler.start_marker("end frame");
         self.gpu_profiler.end_frame();
@@ -3810,12 +3603,6 @@
                 surface_origin_is_top_left,
             );
         }
-        // See comment for texture_resolver.begin_frame() for explanation
-        // of why this must be done after all rendering, including debug
-        // overlays. The end_frame() call implicitly calls end_pass(), which
-        // should ensure any left over render targets get invalidated and
-        // returned to the pool correctly.
-        self.texture_resolver.end_frame(&mut self.device, cpu_frame_id);
         self.texture_upload_pbo_pool.end_frame(&mut self.device);
         self.device.end_frame();
 
@@ -3946,7 +3733,10 @@
         self.profile.set(profiler::GPU_CACHE_BLOCKS_UPDATED, updated_blocks);
     }
 
-    fn prepare_gpu_cache(&mut self, frame: &Frame) -> Result<(), RendererError> {
+    fn prepare_gpu_cache(
+        &mut self,
+        deferred_resolves: &[DeferredResolve],
+    ) -> Result<(), RendererError> {
         if self.pending_gpu_cache_clear {
             let use_scatter =
                 matches!(self.gpu_cache_texture.bus, GpuCacheBus::Scatter { .. });
@@ -3956,7 +3746,7 @@
             self.pending_gpu_cache_clear = false;
         }
 
-        let deferred_update_list = self.update_deferred_resolves(&frame.deferred_resolves);
+        let deferred_update_list = self.update_deferred_resolves(deferred_resolves);
         self.pending_gpu_cache_updates.extend(deferred_update_list);
 
         self.update_gpu_cache();
@@ -3985,20 +3775,18 @@
             for allocation in update_list.allocations {
                 match allocation.kind {
                     TextureCacheAllocationKind::Alloc(_) => add_event_marker(c_str!("TextureCacheAlloc")),
-                    TextureCacheAllocationKind::Realloc(_) => add_event_marker(c_str!("TextureCacheRealloc")),
                     TextureCacheAllocationKind::Reset(_) => add_event_marker(c_str!("TextureCacheReset")),
                     TextureCacheAllocationKind::Free => add_event_marker(c_str!("TextureCacheFree")),
                 };
                 let old = match allocation.kind {
                     TextureCacheAllocationKind::Alloc(ref info) |
-                    TextureCacheAllocationKind::Realloc(ref info) |
                     TextureCacheAllocationKind::Reset(ref info) => {
                         // Create a new native texture, as requested by the texture cache.
                         //
                         // Ensure no PBO is bound when creating the texture storage,
                         // or GL will attempt to read data from there.
                         let mut texture = self.device.create_texture(
-                            TextureTarget::Array,
+                            info.target,
                             info.format,
                             info.width,
                             info.height,
@@ -4041,12 +3829,6 @@
                     TextureCacheAllocationKind::Alloc(_) => {
                         assert!(old.is_none(), "Renderer and backend disagree!");
                     }
-                    TextureCacheAllocationKind::Realloc(_) => {
-                        self.device.blit_renderable_texture(
-                            self.texture_resolver.texture_cache_map.get_mut(&allocation.id).unwrap(),
-                            old.as_ref().unwrap(),
-                        );
-                    }
                     TextureCacheAllocationKind::Reset(_) |
                     TextureCacheAllocationKind::Free => {
                         assert!(old.is_some(), "Renderer and backend disagree!");
@@ -4069,13 +3851,14 @@
             pub struct BatchUploadCopy<'a> {
                 // Index within batch_upload_textures
                 src_texture_index: usize,
-                src_rect: DeviceIntRect,
+                src_offset: DeviceIntPoint,
                 // We store the texture ID as well as a reference to the texture so that we
                 // can easily sort the copies to group them by destination target.
                 dest_texture_id: CacheTextureId,
                 dest_texture: &'a Texture,
-                dest_layer_index: usize,
-                dest_rect: DeviceIntRect,
+                dest_layer_index: LayerIndex,
+                dest_offset: DeviceIntPoint,
+                size: DeviceIntSize,
             }
             // A list of copies that must be performed from the temporary textures to the texture cache.
             let mut batch_upload_copies = Vec::new();
@@ -4155,7 +3938,7 @@
 
                     if use_batch_upload {
                         let (allocator, buffers) = batch_upload_buffers.entry(texture.get_format())
-                            .or_insert_with(|| (ArrayAllocationTracker::new(), Vec::new()));
+                            .or_insert_with(|| (GuillotineAllocator::new(None), Vec::new()));
 
                         // Allocate a region within the staging buffer for this update. If there is
                         // no room in an existing buffer then allocate another texture and buffer.
@@ -4166,7 +3949,7 @@
                                 allocator.extend(new_slice, BATCH_UPLOAD_TEXTURE_SIZE, rect.size);
 
                                 let staging_texture = device.create_texture(
-                                    TextureTarget::Default,
+                                    ImageBufferKind::Texture2D,
                                     texture.get_format(),
                                     BATCH_UPLOAD_TEXTURE_SIZE.width,
                                     BATCH_UPLOAD_TEXTURE_SIZE.height,
@@ -4199,11 +3982,12 @@
 
                         batch_upload_copies.push(BatchUploadCopy {
                             src_texture_index: buffer.texture_index,
-                            src_rect: allocated_rect,
+                            src_offset: allocated_rect.origin,
                             dest_texture_id: texture_id,
                             dest_texture: texture,
-                            dest_layer_index: layer_index as usize,
-                            dest_rect: rect,
+                            dest_layer_index: layer_index as LayerIndex,
+                            dest_offset: rect.origin,
+                            size: rect.size,
                         });
 
                         unsafe {
@@ -4274,19 +4058,18 @@
             // Sort them by destination and source to minimize framebuffer binding changes.
             batch_upload_copies.sort_unstable_by_key(|b| (b.dest_texture_id.0, b.dest_layer_index, b.src_texture_index));
             for copy in batch_upload_copies {
-                // Currently this code-path is only used for Mali-Gxx, where using glCopyImageSubData caused
-                // the driver to hang, but glBlitFramebuffer worked correctly. As more platforms start to
-                // use this path we should make this decision based on the platform support.
-                device.blit_render_target(
-                    ReadTarget::from_texture(&batch_upload_textures[copy.src_texture_index], 0),
-                    device_rect_as_framebuffer_rect(&copy.src_rect),
-                    DrawTarget::from_texture(
-                        copy.dest_texture,
-                        copy.dest_layer_index,
-                        false
-                    ),
-                    device_rect_as_framebuffer_rect(&copy.dest_rect),
-                    TextureFilter::Nearest,
+                device.copy_texture_sub_region(
+                    &batch_upload_textures[copy.src_texture_index],
+                    copy.src_offset.x as _,
+                    copy.src_offset.y as _,
+                    0,
+                    copy.dest_texture,
+                    copy.dest_offset.x as _,
+                    copy.dest_offset.y as _,
+                    copy.dest_layer_index,
+                    copy.size.width as _,
+                    copy.size.height as _,
+                    1,
                 );
             }
 
@@ -4313,23 +4096,20 @@
     }
 
     fn bind_textures(&mut self, textures: &BatchTextures) {
-        let mut swizzles = [Swizzle::default(); 3];
-        for i in 0 .. textures.colors.len() {
-            let swizzle = self.texture_resolver.bind(
-                &textures.colors[i],
+        for i in 0 .. 3 {
+            self.texture_resolver.bind(
+                &textures.input.colors[i],
                 TextureSampler::color(i),
                 &mut self.device,
             );
-            if cfg!(debug_assertions) {
-                swizzles[i] = swizzle;
-                for j in 0 .. i {
-                    if textures.colors[j] == textures.colors[i] && swizzles[j] != swizzle {
-                        error!("Swizzling conflict in {:?}", textures);
-                    }
-                }
-            }
         }
 
+        self.texture_resolver.bind(
+            &textures.clip_mask,
+            TextureSampler::ClipMask,
+            &mut self.device,
+        );
+
         // TODO: this probably isn't the best place for this.
         if let Some(ref texture) = self.dither_matrix_texture {
             self.device.bind_texture(TextureSampler::Dither, texture, Swizzle::default());
@@ -4517,22 +4297,7 @@
         let _timer = self.gpu_profiler.start_timer(GPU_TAG_SCALE);
 
         for (source, instances) in scalings {
-            let target = match *source {
-                TextureSource::External(external_image) => {
-                    match external_image.image_type {
-                        TextureHandle(texture_target) => {
-                            texture_target
-                        },
-                        _ => {
-                            TextureTarget::Array
-                        }
-                    }
-                },
-                _ => {
-                    TextureTarget::Array
-                }
-            };
-            let buffer_kind = ImageBufferKind::from(target);
+            let buffer_kind = source.image_buffer_kind();
 
             self.shaders
                 .borrow_mut()
@@ -4546,7 +4311,7 @@
             self.draw_instanced_batch(
                 instances,
                 VertexArrayKind::Scale,
-                &BatchTextures::color(*source),
+                &BatchTextures::composite_rgb(*source),
                 stats,
             );
         }
@@ -4630,7 +4395,7 @@
                     self.draw_instanced_batch(
                         &[instance],
                         VertexArrayKind::Clear,
-                        &BatchTextures::no_texture(),
+                        &BatchTextures::empty(),
                         stats,
                     );
                     if clear_color.is_none() {
@@ -4733,23 +4498,6 @@
             let mut prev_blend_mode = BlendMode::None;
             let shaders_rc = self.shaders.clone();
 
-            // If the device supports pixel local storage, initialize the PLS buffer for
-            // the transparent pass. This involves reading the current framebuffer value
-            // and storing that in PLS.
-            // TODO(gw): This is quite expensive and relies on framebuffer fetch being
-            //           available. We can probably switch the opaque pass over to use
-            //           PLS too, and remove this pass completely.
-            if self.device.get_capabilities().supports_pixel_local_storage {
-                // TODO(gw): If using PLS, the fixed function blender is disabled. It's possible
-                //           we could take advantage of this by skipping batching on the blend
-                //           mode in these cases.
-                self.init_pixel_local_storage(
-                    alpha_batch_container.task_rect,
-                    projection,
-                    stats,
-                );
-            }
-
             for batch in &alpha_batch_container.alpha_batches {
                 if should_skip_batch(&batch.key.kind, self.debug_flags) {
                     continue;
@@ -4874,17 +4622,6 @@
                 }
             }
 
-            // If the device supports pixel local storage, resolve the PLS values.
-            // This pass reads the final PLS color value, and writes it to a normal
-            // fragment output.
-            if self.device.get_capabilities().supports_pixel_local_storage {
-                self.resolve_pixel_local_storage(
-                    alpha_batch_container.task_rect,
-                    projection,
-                    stats,
-                );
-            }
-
             self.set_blend(false, framebuffer_kind);
             self.gpu_profiler.finish_sampler(transparent_sampler);
         }
@@ -4968,13 +4705,11 @@
                             &mut self.renderer_errors
                         );
 
-                    let textures = BatchTextures {
-                        colors: [
-                            planes[0].texture,
-                            planes[1].texture,
-                            planes[2].texture,
-                        ],
-                    };
+                    let textures = BatchTextures::composite_yuv(
+                        planes[0].texture,
+                        planes[1].texture,
+                        planes[2].texture,
+                    );
 
                     // When the texture is an external texture, the UV rect is not known when
                     // the external surface descriptor is created, because external textures
@@ -4982,9 +4717,9 @@
                     // the frame render. To handle this, query the texture resolver for the
                     // UV rect if it's an external texture, otherwise use the default UV rect.
                     let uv_rects = [
-                        self.texture_resolver.get_uv_rect(&textures.colors[0], planes[0].uv_rect),
-                        self.texture_resolver.get_uv_rect(&textures.colors[1], planes[1].uv_rect),
-                        self.texture_resolver.get_uv_rect(&textures.colors[2], planes[2].uv_rect),
+                        self.texture_resolver.get_uv_rect(&textures.input.colors[0], planes[0].uv_rect),
+                        self.texture_resolver.get_uv_rect(&textures.input.colors[1], planes[1].uv_rect),
+                        self.texture_resolver.get_uv_rect(&textures.input.colors[2], planes[2].uv_rect),
                     ];
 
                     let instance = CompositeInstance::new_yuv(
@@ -5007,7 +4742,6 @@
                     ( textures, instance )
                 },
                 ResolvedExternalSurfaceColorData::Rgb{ ref plane, flip_y, .. } => {
-
                     self.shaders
                         .borrow_mut()
                         .get_composite_shader(
@@ -5019,8 +4753,8 @@
                             &mut self.renderer_errors
                         );
 
-                    let textures = BatchTextures::color(plane.texture);
-                    let mut uv_rect = self.texture_resolver.get_uv_rect(&textures.colors[0], plane.uv_rect);
+                    let textures = BatchTextures::composite_rgb(plane.texture);
+                    let mut uv_rect = self.texture_resolver.get_uv_rect(&textures.input.colors[0], plane.uv_rect);
                     if flip_y {
                         let y = uv_rect.uv0.y;
                         uv_rect.uv0.y = uv_rect.uv1.y;
@@ -5076,7 +4810,7 @@
             );
 
         let mut current_shader_params = (CompositeSurfaceFormat::Rgba, ImageBufferKind::Texture2DArray);
-        let mut current_textures = BatchTextures::no_texture();
+        let mut current_textures = BatchTextures::empty();
         let mut instances = Vec::new();
 
         for tile in tiles_iter {
@@ -5106,6 +4840,8 @@
             // Work out the draw params based on the tile surface
             let (instance, textures, shader_params) = match tile.surface {
                 CompositeTileSurface::Color { color } => {
+                    let dummy = TextureSource::Dummy;
+                    let image_buffer_kind = dummy.image_buffer_kind();
                     (
                         CompositeInstance::new(
                             tile.rect,
@@ -5114,11 +4850,13 @@
                             0.0,
                             tile.z_id,
                         ),
-                        BatchTextures::color(TextureSource::Dummy),
-                        (CompositeSurfaceFormat::Rgba, ImageBufferKind::Texture2DArray),
+                        BatchTextures::composite_rgb(dummy),
+                        (CompositeSurfaceFormat::Rgba, image_buffer_kind),
                     )
                 }
                 CompositeTileSurface::Clear => {
+                    let dummy = TextureSource::Dummy;
+                    let image_buffer_kind = dummy.image_buffer_kind();
                     (
                         CompositeInstance::new(
                             tile.rect,
@@ -5127,8 +4865,8 @@
                             0.0,
                             tile.z_id,
                         ),
-                        BatchTextures::color(TextureSource::Dummy),
-                        (CompositeSurfaceFormat::Rgba, ImageBufferKind::Texture2DArray),
+                        BatchTextures::composite_rgb(dummy),
+                        (CompositeSurfaceFormat::Rgba, image_buffer_kind),
                     )
                 }
                 CompositeTileSurface::Texture { surface: ResolvedSurfaceTexture::TextureCache { texture, layer } } => {
@@ -5140,7 +4878,7 @@
                             layer as f32,
                             tile.z_id,
                         ),
-                        BatchTextures::color(texture),
+                        BatchTextures::composite_rgb(texture),
                         (CompositeSurfaceFormat::Rgba, ImageBufferKind::Texture2DArray),
                     )
                 }
@@ -5149,14 +4887,11 @@
 
                     match surface.color_data {
                         ResolvedExternalSurfaceColorData::Yuv{ ref planes, color_space, format, rescale, .. } => {
-
-                            let textures = BatchTextures {
-                                colors: [
-                                    planes[0].texture,
-                                    planes[1].texture,
-                                    planes[2].texture,
-                                ],
-                            };
+                            let textures = BatchTextures::composite_yuv(
+                                planes[0].texture,
+                                planes[1].texture,
+                                planes[2].texture,
+                            );
 
                             // When the texture is an external texture, the UV rect is not known when
                             // the external surface descriptor is created, because external textures
@@ -5164,9 +4899,9 @@
                             // the frame render. To handle this, query the texture resolver for the
                             // UV rect if it's an external texture, otherwise use the default UV rect.
                             let uv_rects = [
-                                self.texture_resolver.get_uv_rect(&textures.colors[0], planes[0].uv_rect),
-                                self.texture_resolver.get_uv_rect(&textures.colors[1], planes[1].uv_rect),
-                                self.texture_resolver.get_uv_rect(&textures.colors[2], planes[2].uv_rect),
+                                self.texture_resolver.get_uv_rect(&textures.input.colors[0], planes[0].uv_rect),
+                                self.texture_resolver.get_uv_rect(&textures.input.colors[1], planes[1].uv_rect),
+                                self.texture_resolver.get_uv_rect(&textures.input.colors[2], planes[2].uv_rect),
                             ];
 
                             (
@@ -5206,7 +4941,7 @@
                                     tile.z_id,
                                     uv_rect,
                                 ),
-                                BatchTextures::color(plane.texture),
+                                BatchTextures::composite_rgb(plane.texture),
                                 (CompositeSurfaceFormat::Rgba, surface.image_buffer_kind),
                             )
                         },
@@ -5454,7 +5189,7 @@
                 self.draw_instanced_batch(
                     &target.vertical_blurs,
                     VertexArrayKind::Blur,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5463,7 +5198,7 @@
                 self.draw_instanced_batch(
                     &target.horizontal_blurs,
                     VertexArrayKind::Blur,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5522,7 +5257,7 @@
             self.draw_instanced_batch(
                 &list.slow_rectangles,
                 VertexArrayKind::ClipRect,
-                &BatchTextures::no_texture(),
+                &BatchTextures::empty(),
                 stats,
             );
         }
@@ -5536,20 +5271,15 @@
             self.draw_instanced_batch(
                 &list.fast_rectangles,
                 VertexArrayKind::ClipRect,
-                &BatchTextures::no_texture(),
+                &BatchTextures::empty(),
                 stats,
             );
         }
+
         // draw box-shadow clips
         for (mask_texture_id, items) in list.box_shadows.iter() {
             let _gm2 = self.gpu_profiler.start_marker("box-shadows");
-            let textures = BatchTextures {
-                colors: [
-                    *mask_texture_id,
-                    TextureSource::Invalid,
-                    TextureSource::Invalid,
-                ],
-            };
+            let textures = BatchTextures::composite_rgb(*mask_texture_id);
             self.shaders.borrow_mut().cs_clip_box_shadow
                 .bind(&mut self.device, projection, &mut self.renderer_errors);
             self.draw_instanced_batch(
@@ -5563,13 +5293,7 @@
         // draw image masks
         for (mask_texture_id, items) in list.images.iter() {
             let _gm2 = self.gpu_profiler.start_marker("clip images");
-            let textures = BatchTextures {
-                colors: [
-                    *mask_texture_id,
-                    TextureSource::Invalid,
-                    TextureSource::Invalid,
-                ],
-            };
+            let textures = BatchTextures::composite_rgb(*mask_texture_id);
             self.shaders.borrow_mut().cs_clip_image
                 .bind(&mut self.device, projection, &mut self.renderer_errors);
             self.draw_instanced_batch(
@@ -5645,7 +5369,7 @@
                 self.draw_instanced_batch(
                     &target.vertical_blurs,
                     VertexArrayKind::Blur,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5654,7 +5378,7 @@
                 self.draw_instanced_batch(
                     &target.horizontal_blurs,
                     VertexArrayKind::Blur,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5707,41 +5431,33 @@
     ) {
         profile_scope!("draw_texture_cache_target");
 
-        let texture_source = TextureSource::TextureCache(*texture, Swizzle::default());
-        let projection = {
-            let (texture, _) = self.texture_resolver
-                .resolve(&texture_source)
-                .expect("BUG: invalid target texture");
-            let target_size = texture.get_dimensions();
-
-            Transform3D::ortho(
-                0.0,
-                target_size.width as f32,
-                0.0,
-                target_size.height as f32,
-                self.device.ortho_near_plane(),
-                self.device.ortho_far_plane(),
-            )
-        };
-
         self.device.disable_depth();
         self.device.disable_depth_write();
 
         self.set_blend(false, FramebufferKind::Other);
 
+        let texture = &self.texture_resolver.texture_cache_map[texture];
+        let target_size = texture.get_dimensions();
+
+        let projection = Transform3D::ortho(
+            0.0,
+            target_size.width as f32,
+            0.0,
+            target_size.height as f32,
+            self.device.ortho_near_plane(),
+            self.device.ortho_far_plane(),
+        );
+
+        let draw_target = DrawTarget::from_texture(
+            texture,
+            layer,
+            false,
+        );
+        self.device.bind_draw_target(draw_target);
+
         {
             let _timer = self.gpu_profiler.start_timer(GPU_TAG_CLEAR);
 
-            let (texture, _) = self.texture_resolver
-                .resolve(&texture_source)
-                .expect("BUG: invalid target texture");
-            let draw_target = DrawTarget::from_texture(
-                texture,
-                layer,
-                false,
-            );
-            self.device.bind_draw_target(draw_target);
-
             self.device.disable_depth();
             self.device.disable_depth_write();
             self.set_blend(false, FramebufferKind::Other);
@@ -5766,7 +5482,7 @@
                 self.draw_instanced_batch(
                     &instances,
                     VertexArrayKind::Clear,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             } else {
@@ -5806,7 +5522,7 @@
                 self.draw_instanced_batch(
                     &target.border_segments_solid,
                     VertexArrayKind::Border,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5821,7 +5537,7 @@
                 self.draw_instanced_batch(
                     &target.border_segments_complex,
                     VertexArrayKind::Border,
-                    &BatchTextures::no_texture(),
+                    &BatchTextures::empty(),
                     stats,
                 );
             }
@@ -5845,7 +5561,7 @@
             self.draw_instanced_batch(
                 &target.line_decorations,
                 VertexArrayKind::LineDecoration,
-                &BatchTextures::no_texture(),
+                &BatchTextures::empty(),
                 stats,
             );
 
@@ -5867,7 +5583,7 @@
             self.draw_instanced_batch(
                 &target.gradients,
                 VertexArrayKind::Gradient,
-                &BatchTextures::no_texture(),
+                &BatchTextures::empty(),
                 stats,
             );
         }
@@ -5887,7 +5603,7 @@
             self.draw_instanced_batch(
                 &target.horizontal_blurs,
                 VertexArrayKind::Blur,
-                &BatchTextures::no_texture(),
+                &BatchTextures::empty(),
                 stats,
             );
         }
@@ -5915,7 +5631,7 @@
             debug_commands: Vec::new(),
         };
 
-        for deferred_resolve in deferred_resolves {
+        for (i, deferred_resolve) in deferred_resolves.iter().enumerate() {
             self.gpu_profiler.place_marker("deferred resolve");
             let props = &deferred_resolve.image_properties;
             let ext_image = props
@@ -5965,7 +5681,7 @@
 
             self.texture_resolver
                 .external_images
-                .insert((ext_image.id, ext_image.channel_index), texture);
+                .insert(DeferredResolveIndex(i as u32), texture);
 
             list.updates.push(GpuCacheUpdate::Copy {
                 block_index: list.blocks.len(),
@@ -5979,14 +5695,21 @@
         Some(list)
     }
 
-    fn unlock_external_images(&mut self) {
+    fn unlock_external_images(
+        &mut self,
+        deferred_resolves: &[DeferredResolve],
+    ) {
         if !self.texture_resolver.external_images.is_empty() {
             let handler = self.external_image_handler
                 .as_mut()
                 .expect("Found external image, but no handler set!");
 
-            for (ext_data, _) in self.texture_resolver.external_images.drain() {
-                handler.unlock(ext_data.0, ext_data.1);
+            for (index, _) in self.texture_resolver.external_images.drain() {
+                let props = &deferred_resolves[index.0 as usize].image_properties;
+                let ext_image = props
+                    .external_image
+                    .expect("BUG: Deferred resolves must be external images!");
+                handler.unlock(ext_image.id, ext_image.channel_index);
             }
         }
     }
@@ -6041,11 +5764,11 @@
                     let transformed_dirty_rect = if let Some(transform) = tile.transform {
                         transform.outer_transformed_rect(&tile_dirty_rect)
                     } else {
-                        Some(tile_dirty_rect)
+                        Some(tile_dirty_rect)
                     };
 
                     if let Some(dirty_rect) = transformed_dirty_rect {
-                        combined_dirty_rect = combined_dirty_rect.union(&dirty_rect);
+                        combined_dirty_rect = combined_dirty_rect.union(&dirty_rect);
                     }
                 }
 
@@ -6100,85 +5823,6 @@
         partial_present_mode
     }
 
-    /// Allocates a texture to be used as the output for a rendering pass.
-    ///
-    /// We make an effort to reuse render target textures across passes and
-    /// across frames when the format and dimensions match. Because we use
-    /// immutable storage, we can't resize textures.
-    ///
-    /// We could consider approaches to re-use part of a larger target, if
-    /// available. However, we'd need to be careful about eviction. Currently,
-    /// render targets are freed if they haven't been used in 30 frames. If we
-    /// used partial targets, we'd need to track how _much_ of the target has
-    /// been used in the last 30 frames, since we could otherwise end up
-    /// keeping an enormous target alive indefinitely by constantly using it
-    /// in situations where a much smaller target would suffice.
-    fn allocate_target_texture<T: RenderTarget>(
-        &mut self,
-        list: &mut RenderTargetList<T>,
-    ) -> Option<ActiveTexture> {
-        if list.targets.is_empty() {
-            return None
-        }
-
-        // Get a bounding rect of all the layers, and round it up to a multiple
-        // of 256. This improves render target reuse when resizing the window,
-        // since we don't need to create a new render target for each slightly-
-        // larger frame.
-        let mut bounding_rect = DeviceIntRect::zero();
-        for t in list.targets.iter() {
-            bounding_rect = t.used_rect().union(&bounding_rect);
-        }
-        debug_assert_eq!(bounding_rect.origin, DeviceIntPoint::zero());
-        let dimensions = DeviceIntSize::new(
-            (bounding_rect.size.width + 255) & !255,
-            (bounding_rect.size.height + 255) & !255,
-        );
-
-        self.profile.inc(profiler::USED_TARGETS);
-
-        // Try finding a match in the existing pool. If there's no match, we'll
-        // create a new texture.
-        let selector = TargetSelector {
-            size: dimensions,
-            num_layers: list.targets.len(),
-            format: list.format,
-        };
-        let index = self.texture_resolver.render_target_pool
-            .iter()
-            .position(|texture| {
-                selector == TargetSelector {
-                    size: texture.get_dimensions(),
-                    num_layers: texture.get_layer_count() as usize,
-                    format: texture.get_format(),
-                }
-            });
-
-        let rt_info = RenderTargetInfo { has_depth: list.needs_depth() };
-        let texture = if let Some(idx) = index {
-            let mut t = self.texture_resolver.render_target_pool.swap_remove(idx);
-            self.device.reuse_render_target::<u8>(&mut t, rt_info);
-            t
-        } else {
-            self.profile.inc(profiler::CREATED_TARGETS);
-            self.device.create_texture(
-                TextureTarget::Array,
-                list.format,
-                dimensions.width,
-                dimensions.height,
-                TextureFilter::Linear,
-                Some(rt_info),
-                list.targets.len() as _,
-            )
-        };
-
-        list.check_ready(&texture);
-        Some(ActiveTexture {
-            texture,
-            saved_index: list.saved_index.clone(),
-        })
-    }
-
     fn bind_frame_data(&mut self, frame: &mut Frame) {
         profile_scope!("bind_frame_data");
 
@@ -6339,253 +5983,210 @@
                 &mut self.device,
             );
 
-            match pass.kind {
-                RenderPassKind::MainFramebuffer { .. } => {
-                    profile_scope!("main target");
-
-                    if let Some(device_size) = device_size {
-                        results.stats.color_target_count += 1;
-                        results.picture_cache_debug = mem::replace(
-                            &mut frame.composite_state.picture_cache_debug,
-                            PictureCacheDebugInfo::new(),
-                        );
+            profile_scope!("offscreen target");
 
-                        let size = frame.device_rect.size.to_f32();
-                        let surface_origin_is_top_left = self.device.surface_origin_is_top_left();
-                        let (bottom, top) = if surface_origin_is_top_left {
-                          (0.0, size.height)
-                        } else {
-                          (size.height, 0.0)
-                        };
+            // If this frame has already been drawn, then any texture
+            // cache targets have already been updated and can be
+            // skipped this time.
+            if !frame.has_been_rendered {
+                for (&(texture_id, target_index), target) in &pass.texture_cache {
+                    self.draw_texture_cache_target(
+                        &texture_id,
+                        target_index,
+                        target,
+                        &frame.render_tasks,
+                        &mut results.stats,
+                    );
+                }
 
-                        let projection = Transform3D::ortho(
-                            0.0,
-                            size.width,
-                            bottom,
-                            top,
-                            self.device.ortho_near_plane(),
-                            self.device.ortho_far_plane(),
-                        );
+                if !pass.picture_cache.is_empty() {
+                    self.profile.inc(profiler::COLOR_PASSES);
+                }
 
-                        let fb_scale = Scale::<_, _, FramebufferPixel>::new(1i32);
-                        let mut fb_rect = frame.device_rect * fb_scale;
+                // Draw picture caching tiles for this pass.
+                for picture_target in &pass.picture_cache {
+                    results.stats.color_target_count += 1;
 
-                        if !surface_origin_is_top_left {
-                            fb_rect.origin.y = device_size.height - fb_rect.origin.y - fb_rect.size.height;
+                    let draw_target = match picture_target.surface {
+                        ResolvedSurfaceTexture::TextureCache { ref texture, layer } => {
+                            let (texture, _) = self.texture_resolver
+                                .resolve(texture)
+                                .expect("bug");
+
+                            DrawTarget::from_texture(
+                                texture,
+                                layer as usize,
+                                true,
+                            )
                         }
+                        ResolvedSurfaceTexture::Native { id, size } => {
+                            let surface_info = match self.current_compositor_kind {
+                                CompositorKind::Native { .. } => {
+                                    let compositor = self.compositor_config.compositor().unwrap();
+                                    compositor.bind(
+                                        id,
+                                        picture_target.dirty_rect,
+                                        picture_target.valid_rect,
+                                    )
+                                }
+                                CompositorKind::Draw { .. } => {
+                                    unreachable!();
+                                }
+                            };
 
-                        let draw_target = DrawTarget::Default {
-                            rect: fb_rect,
-                            total_size: device_size * fb_scale,
-                            surface_origin_is_top_left,
-                        };
+                            DrawTarget::NativeSurface {
+                                offset: surface_info.origin,
+                                external_fbo_id: surface_info.fbo_id,
+                                dimensions: size,
+                            }
+                        }
+                    };
+
+                    let projection = Transform3D::ortho(
+                        0.0,
+                        draw_target.dimensions().width as f32,
+                        0.0,
+                        draw_target.dimensions().height as f32,
+                        self.device.ortho_near_plane(),
+                        self.device.ortho_far_plane(),
+                    );
 
-                        // If we have a native OS compositor, then make use of that interface
-                        // to specify how to composite each of the picture cache surfaces.
+                    self.draw_picture_cache_target(
+                        picture_target,
+                        draw_target,
+                        &projection,
+                        &frame.render_tasks,
+                        &mut results.stats,
+                    );
+
+                    // Native OS surfaces must be unbound at the end of drawing to them
+                    if let ResolvedSurfaceTexture::Native { .. } = picture_target.surface {
                         match self.current_compositor_kind {
                             CompositorKind::Native { .. } => {
-                                // We have already queued surfaces for early native composition by this point.
-                                // All that is left is to finally update any external native surfaces that were
-                                // invalidated so that composition can complete.
-                                self.update_external_native_surfaces(
-                                    &frame.composite_state.external_surfaces,
-                                    results,
-                                );
+                                let compositor = self.compositor_config.compositor().unwrap();
+                                compositor.unbind();
                             }
                             CompositorKind::Draw { .. } => {
-                                self.composite_simple(
-                                    &frame.composite_state,
-                                    draw_target,
-                                    &projection,
-                                    results,
-                                    present_mode,
-                                );
+                                unreachable!();
                             }
                         }
-                    } else {
-                        // Rendering a frame without presenting it will confuse the partial
-                        // present logic, so force a full present for the next frame.
-                        self.force_redraw();
                     }
                 }
-                RenderPassKind::OffScreen {
-                    ref mut alpha,
-                    ref mut color,
-                    ref mut texture_cache,
-                    ref mut picture_cache,
-                } => {
-                    profile_scope!("offscreen target");
-
-                    let alpha_tex = self.allocate_target_texture(alpha);
-                    let color_tex = self.allocate_target_texture(color);
-
-                    // If this frame has already been drawn, then any texture
-                    // cache targets have already been updated and can be
-                    // skipped this time.
-                    if !frame.has_been_rendered {
-                        for (&(texture_id, target_index), target) in texture_cache {
-                            self.draw_texture_cache_target(
-                                &texture_id,
-                                target_index,
-                                target,
-                                &frame.render_tasks,
-                                &mut results.stats,
-                            );
-                        }
-
-                        if !picture_cache.is_empty() {
-                            self.profile.inc(profiler::COLOR_PASSES);
-                        }
-
-                        // Draw picture caching tiles for this pass.
-                        for picture_target in picture_cache {
-                            results.stats.color_target_count += 1;
-
-                            let draw_target = match picture_target.surface {
-                                ResolvedSurfaceTexture::TextureCache { ref texture, layer } => {
-                                    let (texture, _) = self.texture_resolver
-                                        .resolve(texture)
-                                        .expect("bug");
-
-                                    DrawTarget::from_texture(
-                                        texture,
-                                        layer as usize,
-                                        true,
-                                    )
-                                }
-                                ResolvedSurfaceTexture::Native { id, size } => {
-                                    let surface_info = match self.current_compositor_kind {
-                                        CompositorKind::Native { .. } => {
-                                            let compositor = self.compositor_config.compositor().unwrap();
-                                            compositor.bind(
-                                                id,
-                                                picture_target.dirty_rect,
-                                                picture_target.valid_rect,
-                                            )
-                                        }
-                                        CompositorKind::Draw { .. } => {
-                                            unreachable!();
-                                        }
-                                    };
-
-                                    DrawTarget::NativeSurface {
-                                        offset: surface_info.origin,
-                                        external_fbo_id: surface_info.fbo_id,
-                                        dimensions: size,
-                                    }
-                                }
-                            };
+            }
 
-                            let projection = Transform3D::ortho(
-                                0.0,
-                                draw_target.dimensions().width as f32,
-                                0.0,
-                                draw_target.dimensions().height as f32,
-                                self.device.ortho_near_plane(),
-                                self.device.ortho_far_plane(),
-                            );
+            for (target_index, target) in pass.alpha.targets.iter().enumerate() {
+                results.stats.alpha_target_count += 1;
 
-                            self.draw_picture_cache_target(
-                                picture_target,
-                                draw_target,
-                                &projection,
-                                &frame.render_tasks,
-                                &mut results.stats,
-                            );
+                let texture_id = pass
+                    .alpha
+                    .texture_id
+                    .expect("bug: no surface for pass");
+
+                let alpha_tex = self.texture_resolver
+                    .texture_cache_map
+                    .get_mut(&texture_id)
+                    .expect("bug: texture not allocated");
+
+                let draw_target = DrawTarget::from_texture(
+                    alpha_tex,
+                    target_index,
+                    false,
+                );
 
-                            // Native OS surfaces must be unbound at the end of drawing to them
-                            if let ResolvedSurfaceTexture::Native { .. } = picture_target.surface {
-                                match self.current_compositor_kind {
-                                    CompositorKind::Native { .. } => {
-                                        let compositor = self.compositor_config.compositor().unwrap();
-                                        compositor.unbind();
-                                    }
-                                    CompositorKind::Draw { .. } => {
-                                        unreachable!();
-                                    }
-                                }
-                            }
-                        }
-                    }
+                let projection = Transform3D::ortho(
+                    0.0,
+                    draw_target.dimensions().width as f32,
+                    0.0,
+                    draw_target.dimensions().height as f32,
+                    self.device.ortho_near_plane(),
+                    self.device.ortho_far_plane(),
+                );
 
-                    for (target_index, target) in alpha.targets.iter().enumerate() {
-                        results.stats.alpha_target_count += 1;
-                        let draw_target = DrawTarget::from_texture(
-                            &alpha_tex.as_ref().unwrap().texture,
-                            target_index,
-                            false,
-                        );
+                self.draw_alpha_target(
+                    draw_target,
+                    target,
+                    &projection,
+                    &frame.render_tasks,
+                    &mut results.stats,
+                );
+            }
 
-                        let projection = Transform3D::ortho(
-                            0.0,
-                            draw_target.dimensions().width as f32,
-                            0.0,
-                            draw_target.dimensions().height as f32,
-                            self.device.ortho_near_plane(),
-                            self.device.ortho_far_plane(),
-                        );
+            let color_rt_info = RenderTargetInfo { has_depth: pass.color.needs_depth() };
 
-                        self.draw_alpha_target(
-                            draw_target,
-                            target,
-                            &projection,
-                            &frame.render_tasks,
-                            &mut results.stats,
-                        );
-                    }
+            for (target_index, target) in pass.color.targets.iter().enumerate() {
+                results.stats.color_target_count += 1;
 
-                    for (target_index, target) in color.targets.iter().enumerate() {
-                        results.stats.color_target_count += 1;
-                        let draw_target = DrawTarget::from_texture(
-                            &color_tex.as_ref().unwrap().texture,
-                            target_index,
-                            target.needs_depth(),
-                        );
+                let texture_id = pass
+                    .color
+                    .texture_id
+                    .expect("bug: no surface for pass");
+
+                let color_tex = self.texture_resolver
+                    .texture_cache_map
+                    .get_mut(&texture_id)
+                    .expect("bug: texture not allocated");
+
+                self.device.reuse_render_target::<u8>(
+                    color_tex,
+                    color_rt_info,
+                );
 
-                        let projection = Transform3D::ortho(
-                            0.0,
-                            draw_target.dimensions().width as f32,
-                            0.0,
-                            draw_target.dimensions().height as f32,
-                            self.device.ortho_near_plane(),
-                            self.device.ortho_far_plane(),
-                        );
+                let draw_target = DrawTarget::from_texture(
+                    color_tex,
+                    target_index,
+                    target.needs_depth(),
+                );
 
-                        let clear_depth = if target.needs_depth() {
-                            Some(1.0)
-                        } else {
-                            None
-                        };
+                let projection = Transform3D::ortho(
+                    0.0,
+                    draw_target.dimensions().width as f32,
+                    0.0,
+                    draw_target.dimensions().height as f32,
+                    self.device.ortho_near_plane(),
+                    self.device.ortho_far_plane(),
+                );
 
-                        self.draw_color_target(
-                            draw_target,
-                            target,
-                            Some([0.0, 0.0, 0.0, 0.0]),
-                            clear_depth,
-                            &frame.render_tasks,
-                            &projection,
-                            &mut results.stats,
-                        );
-                    }
+                let clear_depth = if target.needs_depth() {
+                    Some(1.0)
+                } else {
+                    None
+                };
 
-                    // Only end the pass here and invalidate previous textures for
-                    // off-screen targets. Deferring return of the inputs to the
-                    // frame buffer until the implicit end_pass in end_frame allows
-                    // debug draw overlays to be added without triggering a copy
-                    // resolve stage in mobile / tiled GPUs.
-                    self.texture_resolver.end_pass(
-                        &mut self.device,
-                        alpha_tex,
-                        color_tex,
-                    );
-                }
+                self.draw_color_target(
+                    draw_target,
+                    target,
+                    Some([0.0, 0.0, 0.0, 0.0]),
+                    clear_depth,
+                    &frame.render_tasks,
+                    &projection,
+                    &mut results.stats,
+                );
             }
+
+            // Only end the pass here and invalidate previous textures for
+            // off-screen targets. Deferring return of the inputs to the
+            // frame buffer until the implicit end_pass in end_frame allows
+            // debug draw overlays to be added without triggering a copy
+            // resolve stage in mobile / tiled GPUs.
+            self.texture_resolver.end_pass(
+                &mut self.device,
+                &pass.textures_to_invalidate,
+                pass.alpha.texture_id,
+                pass.color.texture_id,
+            );
             {
                 profile_scope!("gl.flush");
                 self.device.gl().flush();
             }
         }
 
+        self.composite_frame(
+            frame,
+            device_size,
+            results,
+            present_mode,
+        );
+
         if let Some(device_size) = device_size {
             self.draw_frame_debug_items(&frame.debug_items);
             self.draw_render_target_debug(device_size);
@@ -6598,68 +6199,79 @@
         frame.has_been_rendered = true;
     }
 
-    /// Initialize the PLS block, by reading the current framebuffer color.
-    pub fn init_pixel_local_storage(
+    fn composite_frame(
         &mut self,
-        task_rect: DeviceIntRect,
-        projection: &default::Transform3D<f32>,
-        stats: &mut RendererStats,
+        frame: &mut Frame,
+        device_size: Option<DeviceIntSize>,
+        results: &mut RenderResults,
+        present_mode: Option<PartialPresentMode>,
     ) {
-        self.device.enable_pixel_local_storage(true);
+        profile_scope!("main target");
 
-        self.shaders
-            .borrow_mut()
-            .pls_init
-            .as_mut()
-            .unwrap()
-            .bind(
-                &mut self.device,
-                projection,
-                &mut self.renderer_errors,
+        if let Some(device_size) = device_size {
+            results.stats.color_target_count += 1;
+            results.picture_cache_debug = mem::replace(
+                &mut frame.composite_state.picture_cache_debug,
+                PictureCacheDebugInfo::new(),
             );
 
-        let instances = [
-            ResolveInstanceData::new(task_rect),
-        ];
-
-        self.draw_instanced_batch(
-            &instances,
-            VertexArrayKind::Resolve,
-            &BatchTextures::no_texture(),
-            stats,
-        );
-    }
+            let size = frame.device_rect.size.to_f32();
+            let surface_origin_is_top_left = self.device.surface_origin_is_top_left();
+            let (bottom, top) = if surface_origin_is_top_left {
+              (0.0, size.height)
+            } else {
+              (size.height, 0.0)
+            };
 
-    /// Resolve the current PLS structure, writing it to a fragment color output.
-    pub fn resolve_pixel_local_storage(
-        &mut self,
-        task_rect: DeviceIntRect,
-        projection: &default::Transform3D<f32>,
-        stats: &mut RendererStats,
-    ) {
-        self.shaders
-            .borrow_mut()
-            .pls_resolve
-            .as_mut()
-            .unwrap()
-            .bind(
-                &mut self.device,
-                projection,
-                &mut self.renderer_errors,
+            let projection = Transform3D::ortho(
+                0.0,
+                size.width,
+                bottom,
+                top,
+                self.device.ortho_near_plane(),
+                self.device.ortho_far_plane(),
             );
 
-        let instances = [
-            ResolveInstanceData::new(task_rect),
-        ];
+            let fb_scale = Scale::<_, _, FramebufferPixel>::new(1i32);
+            let mut fb_rect = frame.device_rect * fb_scale;
 
-        self.draw_instanced_batch(
-            &instances,
-            VertexArrayKind::Resolve,
-            &BatchTextures::no_texture(),
-            stats,
-        );
+            if !surface_origin_is_top_left {
+                fb_rect.origin.y = device_size.height - fb_rect.origin.y - fb_rect.size.height;
+            }
 
-        self.device.enable_pixel_local_storage(false);
+            let draw_target = DrawTarget::Default {
+                rect: fb_rect,
+                total_size: device_size * fb_scale,
+                surface_origin_is_top_left,
+            };
+
+            // If we have a native OS compositor, then make use of that interface
+            // to specify how to composite each of the picture cache surfaces.
+            match self.current_compositor_kind {
+                CompositorKind::Native { .. } => {
+                    // We have already queued surfaces for early native composition by this point.
+                    // All that is left is to finally update any external native surfaces that were
+                    // invalidated so that composition can complete.
+                    self.update_external_native_surfaces(
+                        &frame.composite_state.external_surfaces,
+                        results,
+                    );
+                }
+                CompositorKind::Draw { .. } => {
+                    self.composite_simple(
+                        &frame.composite_state,
+                        draw_target,
+                        &projection,
+                        results,
+                        present_mode,
+                    );
+                }
+            }
+        } else {
+            // Rendering a frame without presenting it will confuse the partial
+            // present logic, so force a full present for the next frame.
+            self.force_redraw();
+        }
     }
 
     pub fn debug_renderer(&mut self) -> Option<&mut DebugRenderer> {
@@ -6743,8 +6355,11 @@
             None => return,
         };
 
-        let textures =
-            self.texture_resolver.render_target_pool.iter().collect::<Vec<&Texture>>();
+        let textures = self.texture_resolver
+            .texture_cache_map
+            .values()
+            .filter(|texture| { texture.is_render_target() })
+            .collect::<Vec<&Texture>>();
 
         Self::do_debug_blit(
             &mut self.device,
@@ -6806,7 +6421,7 @@
 
         if self.zoom_debug_texture.is_none() {
             let texture = self.device.create_texture(
-                TextureTarget::Default,
+                ImageBufferKind::Texture2D,
                 ImageFormat::BGRA8,
                 source_rect.size.width,
                 source_rect.size.height,
@@ -7292,8 +6907,7 @@
     /// This is called for each transaction with the generate_frame flag set
     /// (i.e. that will trigger a render). The list of frame messages returned
     /// are processed as though they were part of the original transaction.
-    fn sample(&self, document_id: DocumentId,
-              doc: &FastHashMap<PipelineId, Epoch>) -> Vec<FrameMsg>;
+    fn sample(&self, document_id: DocumentId, generated_frame_id: Option<u64>) -> Vec<FrameMsg>;
     /// This is called exactly once, when the render backend thread is about to
     /// terminate.
     fn deregister(&self);
@@ -7355,11 +6969,6 @@
     pub gpu_supports_fast_clears: bool,
     pub allow_dual_source_blending: bool,
     pub allow_advanced_blend_equation: bool,
-    /// If true, allow WR to use pixel local storage if the device supports it.
-    /// For now, this defaults to false since the code is still experimental
-    /// and not complete. This option will probably be removed once support is
-    /// complete, and WR can implicitly choose whether to make use of PLS.
-    pub allow_pixel_local_storage_support: bool,
     /// If true, allow textures to be initialized with glTexStorage.
     /// This affects VRAM consumption and data upload paths.
     pub allow_texture_storage_support: bool,
@@ -7437,7 +7046,6 @@
             gpu_supports_fast_clears: false,
             allow_dual_source_blending: true,
             allow_advanced_blend_equation: false,
-            allow_pixel_local_storage_support: false,
             allow_texture_storage_support: true,
             allow_texture_swizzling: true,
             clear_caches_with_quads: true,
@@ -7643,7 +7251,7 @@
 
     #[cfg(feature = "replay")]
     fn load_texture(
-        target: TextureTarget,
+        target: ImageBufferKind,
         plain: &PlainTexture,
         rt_info: Option<RenderTargetInfo>,
         root: &PathBuf,
@@ -7906,7 +7514,7 @@
             for (id, texture) in renderer.textures {
                 info!("\t{}", texture.data);
                 let t = Self::load_texture(
-                    TextureTarget::Array,
+                    ImageBufferKind::Texture2DArray,
                     &texture,
                     Some(RenderTargetInfo { has_depth: texture.has_depth }),
                     &root,
@@ -7920,7 +7528,7 @@
                 self.device.delete_texture(t);
             }
             let (t, gpu_cache_data) = Self::load_texture(
-                TextureTarget::Default,
+                ImageBufferKind::Texture2D,
                 &renderer.gpu_cache,
                 Some(RenderTargetInfo { has_depth: false }),
                 &root,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_target.rs firefox-85.0+build1/gfx/wr/webrender/src/render_target.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_target.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_target.rs	2021-01-18 19:58:11.000000000 +0000
@@ -4,7 +4,7 @@
 
 
 use api::units::*;
-use api::{ColorF, PremultipliedColorF, ImageFormat, LineOrientation, BorderStyle};
+use api::{ColorF, PremultipliedColorF, ImageFormat, LineOrientation, BorderStyle, ImageBufferKind};
 use crate::batch::{AlphaBatchBuilder, AlphaBatchContainer, BatchTextures, resolve_image};
 use crate::batch::{ClipBatcher, BatchBuilder};
 use crate::spatial_tree::{SpatialTree, ROOT_SPATIAL_NODE_INDEX};
@@ -15,16 +15,16 @@
 use crate::gpu_cache::{GpuCache, GpuCacheAddress};
 use crate::gpu_types::{BorderInstance, SvgFilterInstance, BlurDirection, BlurInstance, PrimitiveHeaders, ScalingInstance};
 use crate::gpu_types::{TransformPalette, ZBufferIdGenerator};
-use crate::internal_types::{FastHashMap, TextureSource, LayerIndex, Swizzle, SavedTargetIndex};
+use crate::internal_types::{FastHashMap, TextureSource, LayerIndex, Swizzle, CacheTextureId};
 use crate::picture::{SliceId, SurfaceInfo, ResolvedSurfaceTexture, TileCacheInstance};
 use crate::prim_store::{PrimitiveStore, DeferredResolve, PrimitiveScratchBuffer};
 use crate::prim_store::gradient::GRADIENT_FP_STOPS;
 use crate::render_backend::DataStores;
-use crate::render_task::{RenderTaskKind, RenderTaskAddress, ClearMode, BlitSource};
+use crate::render_task::{RenderTaskKind, RenderTaskAddress, BlitSource};
 use crate::render_task::{RenderTask, ScalingTask, SvgFilterInfo};
 use crate::render_task_graph::{RenderTaskGraph, RenderTaskId};
 use crate::resource_cache::ResourceCache;
-use crate::texture_allocator::{ArrayAllocationTracker, FreeRectSlice};
+use crate::guillotine_allocator::{GuillotineAllocator, FreeRectSlice};
 use crate::visibility::PrimitiveVisibilityMask;
 use std::{cmp, mem};
 
@@ -158,7 +158,7 @@
 /// previous pass it depends on.
 ///
 /// Note that in some cases (like drop-shadows), we can depend on the output of
-/// a pass earlier than the immediately-preceding pass. See `SavedTargetIndex`.
+/// a pass earlier than the immediately-preceding pass.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub struct RenderTargetList<T> {
@@ -173,8 +173,8 @@
     /// allocator for the next slice to be just large enough to accomodate it.
     pub max_dynamic_size: DeviceIntSize,
     pub targets: Vec<T>,
-    pub saved_index: Option<SavedTargetIndex>,
-    pub alloc_tracker: ArrayAllocationTracker,
+    pub alloc_tracker: GuillotineAllocator,
+    pub texture_id: Option<CacheTextureId>,
     gpu_supports_fast_clears: bool,
 }
 
@@ -189,8 +189,8 @@
             format,
             max_dynamic_size: DeviceIntSize::new(0, 0),
             targets: Vec::new(),
-            saved_index: None,
-            alloc_tracker: ArrayAllocationTracker::new(),
+            alloc_tracker: GuillotineAllocator::new(None),
+            texture_id: None,
             gpu_supports_fast_clears,
         }
     }
@@ -201,14 +201,20 @@
         gpu_cache: &mut GpuCache,
         render_tasks: &mut RenderTaskGraph,
         deferred_resolves: &mut Vec<DeferredResolve>,
-        saved_index: Option<SavedTargetIndex>,
         prim_headers: &mut PrimitiveHeaders,
         transforms: &mut TransformPalette,
         z_generator: &mut ZBufferIdGenerator,
         composite_state: &mut CompositeState,
     ) {
-        debug_assert_eq!(None, self.saved_index);
-        self.saved_index = saved_index;
+        if self.targets.is_empty() {
+            return;
+        }
+
+        // Get a bounding rect of all the layers, and round it up to a multiple
+        // of 256. This improves render target reuse when resizing the window,
+        // since we don't need to create a new render target for each slightly-
+        // larger frame.
+        let mut bounding_rect = DeviceIntRect::zero();
 
         for target in &mut self.targets {
             target.build(
@@ -221,7 +227,24 @@
                 z_generator,
                 composite_state,
             );
+
+            bounding_rect = target.used_rect().union(&bounding_rect);
         }
+
+        debug_assert_eq!(bounding_rect.origin, DeviceIntPoint::zero());
+        let dimensions = DeviceIntSize::new(
+            (bounding_rect.size.width + 255) & !255,
+            (bounding_rect.size.height + 255) & !255,
+        );
+
+        let texture_id = ctx.resource_cache.get_or_create_render_target_from_pool(
+            dimensions,
+            self.targets.len(),
+            self.format,
+        );
+
+        assert!(self.texture_id.is_none());
+        self.texture_id = Some(texture_id);
     }
 
     pub fn allocate(
@@ -342,15 +365,6 @@
             profile_scope!("alpha_task");
             let task = &render_tasks[*task_id];
 
-            match task.clear_mode {
-                ClearMode::One |
-                ClearMode::Zero => {
-                    panic!("bug: invalid clear mode for color task");
-                }
-                ClearMode::DontCare |
-                ClearMode::Transparent => {}
-            }
-
             match task.kind {
                 RenderTaskKind::Picture(ref pic_task) => {
                     let pic = &ctx.prim_store.pictures[pic_task.pic_index.0];
@@ -542,8 +556,7 @@
 
                 let target_rect = task
                     .get_target_rect()
-                    .0
-                    .inner_rect(task_info.padding);
+                    .0;
                 self.blits.push(BlitJob {
                     source,
                     target_rect,
@@ -619,19 +632,6 @@
         let task = &render_tasks[task_id];
         let (target_rect, _) = task.get_target_rect();
 
-        match task.clear_mode {
-            ClearMode::Zero => {
-                self.zero_clears.push(task_id);
-            }
-            ClearMode::One => {
-                self.one_clears.push(task_id);
-            }
-            ClearMode::DontCare => {}
-            ClearMode::Transparent => {
-                panic!("bug: invalid clear mode for alpha task");
-            }
-        }
-
         match task.kind {
             RenderTaskKind::Readback |
             RenderTaskKind::Picture(..) |
@@ -643,6 +643,7 @@
                 panic!("BUG: should not be added to alpha target!");
             }
             RenderTaskKind::VerticalBlur(..) => {
+                self.zero_clears.push(task_id);
                 add_blur_instances(
                     &mut self.vertical_blurs,
                     BlurDirection::Vertical,
@@ -651,6 +652,7 @@
                 );
             }
             RenderTaskKind::HorizontalBlur(..) => {
+                self.zero_clears.push(task_id);
                 add_blur_instances(
                     &mut self.horizontal_blurs,
                     BlurDirection::Horizontal,
@@ -659,6 +661,9 @@
                 );
             }
             RenderTaskKind::CacheMask(ref task_info) => {
+                if task_info.clear_to_one {
+                    self.one_clears.push(task_id);
+                }
                 self.clip_batcher.add(
                     task_info.clip_node_range,
                     task_info.root_spatial_node_index,
@@ -676,6 +681,9 @@
                 );
             }
             RenderTaskKind::ClipRegion(ref region_task) => {
+                if region_task.clear_to_one {
+                    self.one_clears.push(task_id);
+                }
                 let device_rect = DeviceRect::new(
                     DevicePoint::zero(),
                     target_rect.size.to_f32(),
@@ -804,7 +812,7 @@
                         // task to this target.
                         self.blits.push(BlitJob {
                             source: BlitJobSource::RenderTask(task_id),
-                            target_rect: target_rect.0.inner_rect(task_info.padding),
+                            target_rect: target_rect.0,
                         });
                     }
                 }
@@ -951,19 +959,33 @@
     input_2_task: Option<RenderTaskId>,
     extra_data_address: Option<GpuCacheAddress>,
 ) {
-    let mut textures = BatchTextures::no_texture();
+    let mut textures = BatchTextures::empty();
+
+    if let Some(id) = input_1_task {
+        let task = &render_tasks[id];
 
-    if let Some(saved_index) = input_1_task.map(|id| &render_tasks[id].saved_index) {
-        textures.colors[0] = match saved_index {
-            Some(saved_index) => TextureSource::RenderTaskCache(*saved_index, Swizzle::default()),
-            None => TextureSource::PrevPassColor,
+        textures.input.colors[0] = if task.save_target {
+            TextureSource::TextureCache(
+                task.get_target_texture(),
+                ImageBufferKind::Texture2DArray,
+                Swizzle::default(),
+            )
+        } else {
+            TextureSource::PrevPassColor
         };
     }
 
-    if let Some(saved_index) = input_2_task.map(|id| &render_tasks[id].saved_index) {
-        textures.colors[1] = match saved_index {
-            Some(saved_index) => TextureSource::RenderTaskCache(*saved_index, Swizzle::default()),
-            None => TextureSource::PrevPassColor,
+    if let Some(id) = input_2_task {
+        let task = &render_tasks[id];
+
+        textures.input.colors[1] = if task.save_target {
+            TextureSource::TextureCache(
+                task.get_target_texture(),
+                ImageBufferKind::Texture2DArray,
+                Swizzle::default(),
+            )
+        } else {
+            TextureSource::PrevPassColor
         };
     }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_task_cache.rs firefox-85.0+build1/gfx/wr/webrender/src/render_task_cache.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_task_cache.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_task_cache.rs	2021-01-18 19:58:12.000000000 +0000
@@ -121,7 +121,6 @@
     ) {
         // Find out what size to alloc in the texture cache.
         let size = match render_task.location {
-            RenderTaskLocation::Fixed(..) |
             RenderTaskLocation::PictureCache { .. } |
             RenderTaskLocation::TextureCache { .. } => {
                 panic!("BUG: dynamic task was expected");
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_task_graph.rs firefox-85.0+build1/gfx/wr/webrender/src/render_task_graph.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_task_graph.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_task_graph.rs	2021-01-18 19:58:11.000000000 +0000
@@ -5,9 +5,9 @@
 
 use api::ImageFormat;
 use api::units::*;
-use crate::internal_types::{CacheTextureId, FastHashMap, SavedTargetIndex};
+use crate::internal_types::{CacheTextureId, FastHashMap};
 use crate::render_backend::FrameId;
-use crate::render_target::{RenderTarget, RenderTargetKind, RenderTargetList, ColorRenderTarget};
+use crate::render_target::{RenderTargetKind, RenderTargetList, ColorRenderTarget};
 use crate::render_target::{PictureCacheTarget, TextureCacheRenderTarget, AlphaRenderTarget};
 use crate::render_task::{BlitSource, RenderTask, RenderTaskKind, RenderTaskData};
 use crate::render_task::{RenderTaskLocation};
@@ -24,7 +24,6 @@
     ///
     /// We render these unconditionally before-rendering the rest of the tree.
     pub cacheable_render_tasks: Vec<RenderTaskId>,
-    next_saved: SavedTargetIndex,
     frame_id: FrameId,
 }
 
@@ -55,7 +54,6 @@
             tasks: Vec::with_capacity(counters.tasks_len + extra_items),
             task_data: Vec::with_capacity(counters.task_data_len + extra_items),
             cacheable_render_tasks: Vec::with_capacity(counters.cacheable_render_tasks_len + extra_items),
-            next_saved: SavedTargetIndex(0),
             frame_id,
         }
     }
@@ -89,7 +87,7 @@
     /// earlier than the ones that depend on them.
     pub fn generate_passes(
         &mut self,
-        main_render_task: Option<RenderTaskId>,
+        render_task_roots: &[RenderTaskId],
         screen_size: DeviceIntSize,
         gpu_supports_fast_clears: bool,
     ) -> Vec<RenderPass> {
@@ -101,21 +99,16 @@
                 &self.cacheable_render_tasks[..],
                 screen_size,
                 gpu_supports_fast_clears,
-                false,
-                &mut passes,
-            );
-        }
-
-        if let Some(main_task) = main_render_task {
-            self.generate_passes_impl(
-                &[main_task],
-                screen_size,
-                gpu_supports_fast_clears,
-                true,
                 &mut passes,
             );
         }
 
+        self.generate_passes_impl(
+            render_task_roots,
+            screen_size,
+            gpu_supports_fast_clears,
+            &mut passes,
+        );
 
         self.resolve_target_conflicts(&mut passes);
 
@@ -130,7 +123,6 @@
         root_tasks: &[RenderTaskId],
         screen_size: DeviceIntSize,
         gpu_supports_fast_clears: bool,
-        for_main_framebuffer: bool,
         passes: &mut Vec<RenderPass>,
     ) {
         // We recursively visit tasks from the roots (main and cached render tasks), to figure out
@@ -187,15 +179,10 @@
         }
 
         let offset = passes.len();
+        let pass_count = max_depth as usize + 1;
 
-        passes.reserve(max_depth as usize + 1);
-        for _ in 0..max_depth {
-            passes.alloc().init(RenderPass::new_off_screen(screen_size, gpu_supports_fast_clears));
-        }
-
-        if for_main_framebuffer {
-            passes.alloc().init(RenderPass::new_main_framebuffer(screen_size, gpu_supports_fast_clears));
-        } else {
+        passes.reserve(pass_count);
+        for _ in 0 .. pass_count {
             passes.alloc().init(RenderPass::new_off_screen(screen_size, gpu_supports_fast_clears));
         }
 
@@ -338,16 +325,16 @@
     pub fn write_task_data(&mut self) {
         profile_scope!("write_task_data");
         for task in &self.tasks {
-            self.task_data.push(task.write_task_data());
+            let (target_rect, target_index) = task.get_target_rect();
+            self.task_data.push(
+                task.kind.write_task_data(
+                    target_rect,
+                    target_index,
+                )
+            );
         }
     }
 
-    pub fn save_target(&mut self) -> SavedTargetIndex {
-        let id = self.next_saved;
-        self.next_saved.0 += 1;
-        id
-    }
-
     #[cfg(debug_assertions)]
     pub fn frame_id(&self) -> FrameId {
         self.frame_id
@@ -397,24 +384,6 @@
     };
 }
 
-/// Contains the set of `RenderTarget`s specific to the kind of pass.
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub enum RenderPassKind {
-    /// The final pass to the main frame buffer, where we have a single color
-    /// target for display to the user.
-    MainFramebuffer {
-        main_target: ColorRenderTarget,
-    },
-    /// An intermediate pass, where we may have multiple targets.
-    OffScreen {
-        alpha: RenderTargetList<AlphaRenderTarget>,
-        color: RenderTargetList<ColorRenderTarget>,
-        texture_cache: FastHashMap<(CacheTextureId, usize), TextureCacheRenderTarget>,
-        picture_cache: Vec<PictureCacheTarget>,
-    },
-}
-
 /// A render pass represents a set of rendering operations that don't depend on one
 /// another.
 ///
@@ -423,55 +392,38 @@
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub struct RenderPass {
-    /// The kind of pass, as well as the set of targets associated with that
-    /// kind of pass.
-    pub kind: RenderPassKind,
+    /// The subpasses that describe targets being rendered to in this pass
+    pub alpha: RenderTargetList<AlphaRenderTarget>,
+    pub color: RenderTargetList<ColorRenderTarget>,
+    pub texture_cache: FastHashMap<(CacheTextureId, usize), TextureCacheRenderTarget>,
+    pub picture_cache: Vec<PictureCacheTarget>,
     /// The set of tasks to be performed in this pass, as indices into the
     /// `RenderTaskGraph`.
     pub tasks: Vec<RenderTaskId>,
-    /// Screen size in device pixels - used for opaque alpha batch break threshold.
-    pub screen_size: DeviceIntSize,
+    pub textures_to_invalidate: Vec<CacheTextureId>,
 }
 
 impl RenderPass {
-    /// Creates a pass for the main framebuffer. There is only one of these, and
-    /// it is always the last pass.
-    pub fn new_main_framebuffer(
-        screen_size: DeviceIntSize,
-        gpu_supports_fast_clears: bool,
-    ) -> Self {
-        let main_target = ColorRenderTarget::new(screen_size, gpu_supports_fast_clears);
-        RenderPass {
-            kind: RenderPassKind::MainFramebuffer {
-                main_target,
-            },
-            tasks: vec![],
-            screen_size,
-        }
-    }
-
     /// Creates an intermediate off-screen pass.
     pub fn new_off_screen(
         screen_size: DeviceIntSize,
         gpu_supports_fast_clears: bool,
     ) -> Self {
         RenderPass {
-            kind: RenderPassKind::OffScreen {
-                color: RenderTargetList::new(
-                    screen_size,
-                    ImageFormat::RGBA8,
-                    gpu_supports_fast_clears,
-                ),
-                alpha: RenderTargetList::new(
-                    screen_size,
-                    ImageFormat::R8,
-                    gpu_supports_fast_clears,
-                ),
-                texture_cache: FastHashMap::default(),
-                picture_cache: Vec::new(),
-            },
+            color: RenderTargetList::new(
+                screen_size,
+                ImageFormat::RGBA8,
+                gpu_supports_fast_clears,
+            ),
+            alpha: RenderTargetList::new(
+                screen_size,
+                ImageFormat::R8,
+                gpu_supports_fast_clears,
+            ),
+            texture_cache: FastHashMap::default(),
+            picture_cache: Vec::new(),
             tasks: vec![],
-            screen_size,
+            textures_to_invalidate: Vec::new(),
         }
     }
 
@@ -483,19 +435,17 @@
         target_kind: RenderTargetKind,
         location: &RenderTaskLocation,
     ) {
-        if let RenderPassKind::OffScreen { ref mut color, ref mut alpha, .. } = self.kind {
-            // If this will be rendered to a dynamically-allocated region on an
-            // off-screen render target, update the max-encountered size. We don't
-            // need to do this for things drawn to the texture cache, since those
-            // don't affect our render target allocation.
-            if location.is_dynamic() {
-                let max_size = match target_kind {
-                    RenderTargetKind::Color => &mut color.max_dynamic_size,
-                    RenderTargetKind::Alpha => &mut alpha.max_dynamic_size,
-                };
-                max_size.width = cmp::max(max_size.width, size.width);
-                max_size.height = cmp::max(max_size.height, size.height);
-            }
+        // If this will be rendered to a dynamically-allocated region on an
+        // off-screen render target, update the max-encountered size. We don't
+        // need to do this for things drawn to the texture cache, since those
+        // don't affect our render target allocation.
+        if location.is_dynamic() {
+            let max_size = match target_kind {
+                RenderTargetKind::Color => &mut self.color.max_dynamic_size,
+                RenderTargetKind::Alpha => &mut self.alpha.max_dynamic_size,
+            };
+            max_size.width = cmp::max(max_size.width, size.width);
+            max_size.height = cmp::max(max_size.height, size.height);
         }
 
         self.tasks.push(task_id);
@@ -543,7 +493,7 @@
             let tx = rect.x + rect.w / 2.0;
             let ty = rect.y + 10.0;
 
-            let saved = if task.saved_index.is_some() { " (Saved)" } else { "" };
+            let saved = if task.save_target { " (Saved)" } else { "" };
             let label = text(tx, ty, format!("{}{}", task.kind.as_str(), saved));
             let size = text(tx, ty + 12.0, format!("{:?}", task.location.size()));
 
@@ -686,7 +636,7 @@
 }
 
 #[cfg(test)]
-use euclid::{size2, rect};
+use euclid::size2;
 #[cfg(test)]
 use smallvec::SmallVec;
 
@@ -695,6 +645,30 @@
     RenderTaskLocation::Dynamic(None, size2(w, h))
 }
 
+#[cfg(test)]
+fn pic_cache_location(
+    surface_id: u64,
+    x: i32,
+    y: i32,
+) -> RenderTaskLocation {
+    use crate::picture::ResolvedSurfaceTexture;
+    use crate::composite::{NativeSurfaceId, NativeTileId};
+
+    let size = DeviceIntSize::new(512, 512);
+
+    RenderTaskLocation::PictureCache {
+        size,
+        surface: ResolvedSurfaceTexture::Native {
+            id: NativeTileId {
+                surface_id: NativeSurfaceId(surface_id),
+                x,
+                y,
+            },
+            size,
+        },
+    }
+}
+
 #[test]
 fn diamond_task_graph() {
     // A simple diamon shaped task graph.
@@ -716,13 +690,13 @@
 
     let main_pic = tasks.add().init(RenderTask::new_test(
         color,
-        RenderTaskLocation::Fixed(rect(0, 0, 3200, 1800)),
+        pic_cache_location(0, 0, 0),
         smallvec![b1, b2],
     ));
 
     let initial_number_of_tasks = tasks.tasks.len();
 
-    let passes = tasks.generate_passes(Some(main_pic), size2(3200, 1800), true);
+    let passes = tasks.generate_passes(&[main_pic], size2(3200, 1800), true);
 
     // We should not have added any blits.
     assert_eq!(tasks.tasks.len(), initial_number_of_tasks);
@@ -773,13 +747,13 @@
 
     let main_pic = tasks.add().init(RenderTask::new_test(
         color,
-        RenderTaskLocation::Fixed(rect(0, 0, 3200, 1800)),
+        pic_cache_location(0, 0, 0),
         smallvec![hblur1, hblur2, hblur3, hblur4],
     ));
 
     let initial_number_of_tasks = tasks.tasks.len();
 
-    let passes = tasks.generate_passes(Some(main_pic), size2(3200, 1800), true);
+    let passes = tasks.generate_passes(&[main_pic], size2(3200, 1800), true);
 
     // We should have added a single blit task.
     assert_eq!(tasks.tasks.len(), initial_number_of_tasks + 1);
@@ -819,7 +793,7 @@
     assert_eq!(passes[7].tasks, vec![main_pic]);
 
     // See vblur4's comment above.
-    assert!(tasks[scale2].saved_index.is_some());
+    assert!(tasks[scale2].save_target);
 }
 
 #[test]
@@ -841,13 +815,13 @@
 
     let main_pic = tasks.add().init(RenderTask::new_test(
         color,
-        RenderTaskLocation::Fixed(rect(0, 0, 3200, 1800)),
+        pic_cache_location(0, 0, 0),
         smallvec![b2],
     ));
 
     let initial_number_of_tasks = tasks.tasks.len();
 
-    let passes = tasks.generate_passes(Some(main_pic), size2(3200, 1800), true);
+    let passes = tasks.generate_passes(&[main_pic], size2(3200, 1800), true);
 
     // We should not have added any blits.
     assert_eq!(tasks.tasks.len(), initial_number_of_tasks);
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/render_task.rs firefox-85.0+build1/gfx/wr/webrender/src/render_task.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/render_task.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/render_task.rs	2021-01-18 19:58:11.000000000 +0000
@@ -11,7 +11,7 @@
 use crate::frame_builder::FrameBuilderConfig;
 use crate::gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle};
 use crate::gpu_types::{BorderInstance, ImageSource, UvRectKind};
-use crate::internal_types::{CacheTextureId, FastHashMap, LayerIndex, SavedTargetIndex};
+use crate::internal_types::{CacheTextureId, FastHashMap, LayerIndex};
 use crate::picture::ResolvedSurfaceTexture;
 use crate::prim_store::{ClipData, PictureIndex};
 use crate::prim_store::image::ImageCacheKey;
@@ -56,10 +56,6 @@
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub enum RenderTaskLocation {
-    /// The `RenderTask` should be drawn to a fixed region in a specific render
-    /// target. This is used for the root `RenderTask`, where the main
-    /// framebuffer is used as the render target.
-    Fixed(DeviceIntRect),
     /// The `RenderTask` should be drawn to a target provided by the atlas
     /// allocator. This is the most common case.
     ///
@@ -68,7 +64,7 @@
     /// build phase, we invoke `RenderTargetList::alloc()` and store the
     /// resulting location in the first member. That location identifies the
     /// render target and the offset of the allocated region within that target.
-    Dynamic(Option<(DeviceIntPoint, RenderTargetIndex)>, DeviceIntSize),
+    Dynamic(Option<(DeviceIntPoint, CacheTextureId, RenderTargetIndex)>, DeviceIntSize),
     /// The output of the `RenderTask` will be persisted beyond this frame, and
     /// thus should be drawn into the `TextureCache`.
     TextureCache {
@@ -101,7 +97,6 @@
 
     pub fn size(&self) -> DeviceIntSize {
         match self {
-            RenderTaskLocation::Fixed(rect) => rect.size,
             RenderTaskLocation::Dynamic(_, size) => *size,
             RenderTaskLocation::TextureCache { rect, .. } => rect.size,
             RenderTaskLocation::PictureCache { size, .. } => *size,
@@ -110,9 +105,8 @@
 
     pub fn to_source_rect(&self) -> (DeviceIntRect, LayerIndex) {
         match *self {
-            RenderTaskLocation::Fixed(rect) => (rect, 0),
             RenderTaskLocation::Dynamic(None, _) => panic!("Expected position to be set for the task!"),
-            RenderTaskLocation::Dynamic(Some((origin, layer)), size) => (DeviceIntRect::new(origin, size), layer.0 as LayerIndex),
+            RenderTaskLocation::Dynamic(Some((origin, _, layer)), size) => (DeviceIntRect::new(origin, size), layer.0 as LayerIndex),
             RenderTaskLocation::TextureCache { rect, layer, .. } => (rect, layer),
             RenderTaskLocation::PictureCache { .. } => {
                 panic!("bug: picture cache tasks should never be a source!");
@@ -129,6 +123,7 @@
     pub root_spatial_node_index: SpatialNodeIndex,
     pub clip_node_range: ClipNodeRange,
     pub device_pixel_scale: DevicePixelScale,
+    pub clear_to_one: bool,
 }
 
 #[derive(Debug)]
@@ -138,6 +133,7 @@
     pub local_pos: LayoutPoint,
     pub device_pixel_scale: DevicePixelScale,
     pub clip_data: ClipData,
+    pub clear_to_one: bool,
 }
 
 #[cfg_attr(feature = "capture", derive(Serialize))]
@@ -174,6 +170,25 @@
         pt.add_item(format!("std deviation: {}", self.blur_std_deviation));
         pt.add_item(format!("target: {:?}", self.target_kind));
     }
+
+    // In order to do the blur down-scaling passes without introducing errors, we need the
+    // source of each down-scale pass to be a multuple of two. If need be, this inflates
+    // the source size so that each down-scale pass will sample correctly.
+    pub fn adjusted_blur_source_size(original_size: DeviceSize, mut std_dev: DeviceSize) -> DeviceSize {
+        let mut adjusted_size = original_size;
+        let mut scale_factor = 1.0;
+        while std_dev.width > MAX_BLUR_STD_DEVIATION && std_dev.height > MAX_BLUR_STD_DEVIATION {
+            if adjusted_size.width < MIN_DOWNSCALING_RT_SIZE as f32 ||
+               adjusted_size.height < MIN_DOWNSCALING_RT_SIZE as f32 {
+                break;
+            }
+            std_dev = std_dev * 0.5;
+            scale_factor *= 2.0;
+            adjusted_size = (original_size.to_f32() / scale_factor).ceil();
+        }
+
+        adjusted_size * scale_factor
+    }
 }
 
 #[derive(Debug)]
@@ -211,7 +226,6 @@
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub struct BlitTask {
     pub source: BlitSource,
-    pub padding: DeviceIntSideOffsets,
 }
 
 #[derive(Debug)]
@@ -307,100 +321,9 @@
             RenderTaskKind::Test(..) => "Test",
         }
     }
-}
-
-#[derive(Debug, Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub enum ClearMode {
-    // Applicable to color and alpha targets.
-    Zero,
-    One,
-    /// This task doesn't care what it is cleared to - it will completely overwrite it.
-    DontCare,
-
-    // Applicable to color targets only.
-    Transparent,
-}
-
-/// In order to avoid duplicating the down-scaling and blur passes when a picture has several blurs,
-/// we use a local (primitive-level) cache of the render tasks generated for a single shadowed primitive
-/// in a single frame.
-pub type BlurTaskCache = FastHashMap<BlurTaskKey, RenderTaskId>;
-
-/// Since we only use it within a single primitive, the key only needs to contain the down-scaling level
-/// and the blur std deviation.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum BlurTaskKey {
-    DownScale(u32),
-    Blur { downscale_level: u32, stddev_x: u32, stddev_y: u32 },
-}
-
-impl BlurTaskKey {
-    fn downscale_and_blur(downscale_level: u32, blur_stddev: DeviceSize) -> Self {
-        // Quantise the std deviations and store it as integers to work around
-        // Eq and Hash's f32 allergy.
-        // The blur radius is rounded before RenderTask::new_blur so we don't need
-        // a lot of precision.
-        const QUANTIZATION_FACTOR: f32 = 1024.0;
-        let stddev_x = (blur_stddev.width * QUANTIZATION_FACTOR) as u32;
-        let stddev_y = (blur_stddev.height * QUANTIZATION_FACTOR) as u32;
-        BlurTaskKey::Blur { downscale_level, stddev_x, stddev_y }
-    }
-}
-
-// The majority of render tasks have 0, 1 or 2 dependencies, except for pictures that
-// typically have dozens to hundreds of dependencies. SmallVec with 2 inline elements
-// avoids many tiny heap allocations in pages with a lot of text shadows and other
-// types of render tasks.
-pub type TaskDependencies = SmallVec<[RenderTaskId;2]>;
-
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct RenderTask {
-    pub location: RenderTaskLocation,
-    pub children: TaskDependencies,
-    pub kind: RenderTaskKind,
-    pub clear_mode: ClearMode,
-    pub saved_index: Option<SavedTargetIndex>,
-}
-
-impl RenderTask {
-    #[inline]
-    pub fn with_dynamic_location(
-        size: DeviceIntSize,
-        children: TaskDependencies,
-        kind: RenderTaskKind,
-        clear_mode: ClearMode,
-    ) -> Self {
-        render_task_sanity_check(&size);
-
-        RenderTask {
-            location: RenderTaskLocation::Dynamic(None, size),
-            children,
-            kind,
-            clear_mode,
-            saved_index: None,
-        }
-    }
-
-    #[cfg(test)]
-    pub fn new_test(
-        target: RenderTargetKind,
-        location: RenderTaskLocation,
-        children: TaskDependencies,
-    ) -> Self {
-        RenderTask {
-            location,
-            children,
-            kind: RenderTaskKind::Test(target),
-            clear_mode: ClearMode::Transparent,
-            saved_index: None,
-        }
-    }
 
     pub fn new_picture(
-        location: RenderTaskLocation,
+        size: DeviceIntSize,
         unclipped_size: DeviceSize,
         pic_index: PictureIndex,
         content_origin: DevicePoint,
@@ -411,118 +334,77 @@
         scissor_rect: Option<DeviceIntRect>,
         valid_rect: Option<DeviceIntRect>,
     ) -> Self {
-        let size = match location {
-            RenderTaskLocation::Dynamic(_, size) => size,
-            RenderTaskLocation::Fixed(rect) => rect.size,
-            RenderTaskLocation::TextureCache { rect, .. } => rect.size,
-            RenderTaskLocation::PictureCache { size, .. } => size,
-        };
-
         render_task_sanity_check(&size);
 
         let can_merge = size.width as f32 >= unclipped_size.width &&
                         size.height as f32 >= unclipped_size.height;
 
-        RenderTask {
-            location,
-            children: TaskDependencies::new(),
-            kind: RenderTaskKind::Picture(PictureTask {
-                pic_index,
-                content_origin,
-                can_merge,
-                uv_rect_handle: GpuCacheHandle::new(),
-                uv_rect_kind,
-                surface_spatial_node_index,
-                device_pixel_scale,
-                vis_mask,
-                scissor_rect,
-                valid_rect,
-            }),
-            clear_mode: ClearMode::Transparent,
-            saved_index: None,
-        }
+        RenderTaskKind::Picture(PictureTask {
+            pic_index,
+            content_origin,
+            can_merge,
+            uv_rect_handle: GpuCacheHandle::new(),
+            uv_rect_kind,
+            surface_spatial_node_index,
+            device_pixel_scale,
+            vis_mask,
+            scissor_rect,
+            valid_rect,
+        })
     }
 
     pub fn new_gradient(
-        size: DeviceIntSize,
         stops: [GradientStopKey; GRADIENT_FP_STOPS],
         orientation: LineOrientation,
         start_point: f32,
         end_point: f32,
     ) -> Self {
-        RenderTask::with_dynamic_location(
-            size,
-            TaskDependencies::new(),
-            RenderTaskKind::Gradient(GradientTask {
-                stops,
-                orientation,
-                start_point,
-                end_point,
-            }),
-            ClearMode::DontCare,
-        )
+        RenderTaskKind::Gradient(GradientTask {
+            stops,
+            orientation,
+            start_point,
+            end_point,
+        })
     }
 
-    pub fn new_readback(size: DeviceIntSize) -> Self {
-        RenderTask::with_dynamic_location(
-            size,
-            TaskDependencies::new(),
-            RenderTaskKind::Readback,
-            ClearMode::Transparent,
-        )
+    pub fn new_readback() -> Self {
+        RenderTaskKind::Readback
     }
 
-    pub fn new_blit(
-        size: DeviceIntSize,
-        source: BlitSource,
+    pub fn new_line_decoration(
+        style: LineStyle,
+        orientation: LineOrientation,
+        wavy_line_thickness: f32,
+        local_size: LayoutSize,
     ) -> Self {
-        RenderTask::new_blit_with_padding(size, DeviceIntSideOffsets::zero(), source)
+        RenderTaskKind::LineDecoration(LineDecorationTask {
+            style,
+            orientation,
+            wavy_line_thickness,
+            local_size,
+        })
     }
 
-    pub fn new_blit_with_padding(
-        padded_size: DeviceIntSize,
-        padding: DeviceIntSideOffsets,
-        source: BlitSource,
+    pub fn new_border_segment(
+        instances: Vec<BorderInstance>,
     ) -> Self {
-        // If this blit uses a render task as a source,
-        // ensure it's added as a child task. This will
-        // ensure it gets allocated in the correct pass
-        // and made available as an input when this task
-        // executes.
-        let children = match source {
-            BlitSource::RenderTask { task_id } => smallvec![task_id],
-            BlitSource::Image { .. } => smallvec![],
-        };
-
-        RenderTask::with_dynamic_location(
-            padded_size,
-            children,
-            RenderTaskKind::Blit(BlitTask {
-                source,
-                padding,
-            }),
-            ClearMode::Transparent,
-        )
+        RenderTaskKind::Border(BorderTask {
+            instances,
+        })
     }
 
-    pub fn new_line_decoration(
-        size: DeviceIntSize,
-        style: LineStyle,
-        orientation: LineOrientation,
-        wavy_line_thickness: f32,
-        local_size: LayoutSize,
+    pub fn new_rounded_rect_mask(
+        local_pos: LayoutPoint,
+        clip_data: ClipData,
+        device_pixel_scale: DevicePixelScale,
+        fb_config: &FrameBuilderConfig,
     ) -> Self {
-        RenderTask::with_dynamic_location(
-            size,
-            TaskDependencies::new(),
-            RenderTaskKind::LineDecoration(LineDecorationTask {
-                style,
-                orientation,
-                wavy_line_thickness,
-                local_size,
-            }),
-            ClearMode::Transparent,
-        )
+        RenderTaskKind::ClipRegion(ClipRegionTask {
+            local_pos,
+            device_pixel_scale,
+            clip_data,
+            clear_to_one: fb_config.gpu_supports_fast_clears,
+        })
     }
 
     pub fn new_mask(
@@ -536,7 +418,7 @@
         clip_data_store: &mut ClipDataStore,
         device_pixel_scale: DevicePixelScale,
         fb_config: &FrameBuilderConfig,
-    ) -> RenderTaskId {
+    ) -> Self {
         // Step through the clip sources that make up this mask. If we find
         // any box-shadow clip sources, request that image from the render
         // task cache. This allows the blurred box-shadow rect to be cached
@@ -579,12 +461,14 @@
                             );
 
                             // Draw the rounded rect.
-                            let mask_task_id = render_tasks.add().init(RenderTask::new_rounded_rect_mask(
+                            let mask_task_id = render_tasks.add().init(RenderTask::new_dynamic(
                                 cache_size,
-                                source.minimal_shadow_rect.origin,
-                                clip_data,
-                                device_pixel_scale,
-                                fb_config,
+                                RenderTaskKind::new_rounded_rect_mask(
+                                    source.minimal_shadow_rect.origin,
+                                    clip_data,
+                                    device_pixel_scale,
+                                    fb_config,
+                                ),
                             ));
 
                             // Blur it
@@ -593,7 +477,6 @@
                                 mask_task_id,
                                 render_tasks,
                                 RenderTargetKind::Alpha,
-                                ClearMode::Zero,
                                 None,
                                 cache_size,
                             )
@@ -615,72 +498,305 @@
             }
         }
 
-        // If we have a potentially tiled clip mask, clear the mask area first. Otherwise,
-        // the first (primary) clip mask will overwrite all the clip mask pixels with
-        // blending disabled to set to the initial value.
-        let clear_mode = if needs_clear {
-            ClearMode::One
-        } else {
-            ClearMode::DontCare
-        };
-
-        render_tasks.add().init(
-            RenderTask::with_dynamic_location(
-                outer_rect.size.to_i32(),
-                smallvec![],
-                RenderTaskKind::CacheMask(CacheMaskTask {
-                    actual_rect: outer_rect,
-                    clip_node_range,
-                    root_spatial_node_index,
-                    device_pixel_scale,
-                }),
-                clear_mode,
-            )
+        // If we have a potentially tiled clip mask, clear the mask area first. Otherwise,
+        // the first (primary) clip mask will overwrite all the clip mask pixels with
+        // blending disabled to set to the initial value.
+        RenderTaskKind::CacheMask(CacheMaskTask {
+            actual_rect: outer_rect,
+            clip_node_range,
+            root_spatial_node_index,
+            device_pixel_scale,
+            clear_to_one: needs_clear,
+        })
+    }
+
+    // Write (up to) 8 floats of data specific to the type
+    // of render task that is provided to the GPU shaders
+    // via a vertex texture.
+    pub fn write_task_data(
+        &self,
+        target_rect: DeviceIntRect,
+        target_index: RenderTargetIndex,
+    ) -> RenderTaskData {
+        // NOTE: The ordering and layout of these structures are
+        //       required to match both the GPU structures declared
+        //       in prim_shared.glsl, and also the uses in submit_batch()
+        //       in renderer.rs.
+        // TODO(gw): Maybe there's a way to make this stuff a bit
+        //           more type-safe. Although, it will always need
+        //           to be kept in sync with the GLSL code anyway.
+
+        let data = match self {
+            RenderTaskKind::Picture(ref task) => {
+                // Note: has to match `PICTURE_TYPE_*` in shaders
+                [
+                    task.device_pixel_scale.0,
+                    task.content_origin.x,
+                    task.content_origin.y,
+                ]
+            }
+            RenderTaskKind::CacheMask(ref task) => {
+                [
+                    task.device_pixel_scale.0,
+                    task.actual_rect.origin.x,
+                    task.actual_rect.origin.y,
+                ]
+            }
+            RenderTaskKind::ClipRegion(ref task) => {
+                [
+                    task.device_pixel_scale.0,
+                    0.0,
+                    0.0,
+                ]
+            }
+            RenderTaskKind::VerticalBlur(ref task) |
+            RenderTaskKind::HorizontalBlur(ref task) => {
+                [
+                    task.blur_std_deviation,
+                    task.blur_region.width as f32,
+                    task.blur_region.height as f32,
+                ]
+            }
+            RenderTaskKind::Readback |
+            RenderTaskKind::Scaling(..) |
+            RenderTaskKind::Border(..) |
+            RenderTaskKind::LineDecoration(..) |
+            RenderTaskKind::Gradient(..) |
+            RenderTaskKind::Blit(..) => {
+                [0.0; 3]
+            }
+
+
+            RenderTaskKind::SvgFilter(ref task) => {
+                match task.info {
+                    SvgFilterInfo::Opacity(opacity) => [opacity, 0.0, 0.0],
+                    SvgFilterInfo::Offset(offset) => [offset.x, offset.y, 0.0],
+                    _ => [0.0; 3]
+                }
+            }
+
+            #[cfg(test)]
+            RenderTaskKind::Test(..) => {
+                unreachable!();
+            }
+        };
+
+        RenderTaskData {
+            data: [
+                target_rect.origin.x as f32,
+                target_rect.origin.y as f32,
+                target_rect.size.width as f32,
+                target_rect.size.height as f32,
+                target_index.0 as f32,
+                data[0],
+                data[1],
+                data[2],
+            ]
+        }
+    }
+
+    pub fn write_gpu_blocks(
+        &mut self,
+        target_rect: DeviceIntRect,
+        target_index: RenderTargetIndex,
+        gpu_cache: &mut GpuCache,
+    ) {
+        profile_scope!("write_gpu_blocks");
+
+        let (cache_handle, uv_rect_kind) = match self {
+            RenderTaskKind::HorizontalBlur(ref mut info) |
+            RenderTaskKind::VerticalBlur(ref mut info) => {
+                (&mut info.uv_rect_handle, info.uv_rect_kind)
+            }
+            RenderTaskKind::Picture(ref mut info) => {
+                (&mut info.uv_rect_handle, info.uv_rect_kind)
+            }
+            RenderTaskKind::SvgFilter(ref mut info) => {
+                (&mut info.uv_rect_handle, info.uv_rect_kind)
+            }
+            RenderTaskKind::Readback |
+            RenderTaskKind::Scaling(..) |
+            RenderTaskKind::Blit(..) |
+            RenderTaskKind::ClipRegion(..) |
+            RenderTaskKind::Border(..) |
+            RenderTaskKind::CacheMask(..) |
+            RenderTaskKind::Gradient(..) |
+            RenderTaskKind::LineDecoration(..) => {
+                return;
+            }
+            #[cfg(test)]
+            RenderTaskKind::Test(..) => {
+                panic!("RenderTask tests aren't expected to exercise this code");
+            }
+        };
+
+        if let Some(mut request) = gpu_cache.request(cache_handle) {
+            let p0 = target_rect.min().to_f32();
+            let p1 = target_rect.max().to_f32();
+            let image_source = ImageSource {
+                p0,
+                p1,
+                texture_layer: target_index.0 as f32,
+                user_data: [0.0; 3],
+                uv_rect_kind,
+            };
+            image_source.write_gpu_blocks(&mut request);
+        }
+
+        if let RenderTaskKind::SvgFilter(ref mut filter_task) = self {
+            match filter_task.info {
+                SvgFilterInfo::ColorMatrix(ref matrix) => {
+                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
+                    if let Some(mut request) = gpu_cache.request(handle) {
+                        for i in 0..5 {
+                            request.push([matrix[i*4], matrix[i*4+1], matrix[i*4+2], matrix[i*4+3]]);
+                        }
+                    }
+                }
+                SvgFilterInfo::DropShadow(color) |
+                SvgFilterInfo::Flood(color) => {
+                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
+                    if let Some(mut request) = gpu_cache.request(handle) {
+                        request.push(color.to_array());
+                    }
+                }
+                SvgFilterInfo::ComponentTransfer(ref data) => {
+                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
+                    if let Some(request) = gpu_cache.request(handle) {
+                        data.update(request);
+                    }
+                }
+                SvgFilterInfo::Composite(ref operator) => {
+                    if let CompositeOperator::Arithmetic(k_vals) = operator {
+                        let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
+                        if let Some(mut request) = gpu_cache.request(handle) {
+                            request.push(*k_vals);
+                        }
+                    }
+                }
+                _ => {},
+            }
+        }
+    }
+}
+
+/// In order to avoid duplicating the down-scaling and blur passes when a picture has several blurs,
+/// we use a local (primitive-level) cache of the render tasks generated for a single shadowed primitive
+/// in a single frame.
+pub type BlurTaskCache = FastHashMap<BlurTaskKey, RenderTaskId>;
+
+/// Since we only use it within a single primitive, the key only needs to contain the down-scaling level
+/// and the blur std deviation.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub enum BlurTaskKey {
+    DownScale(u32),
+    Blur { downscale_level: u32, stddev_x: u32, stddev_y: u32 },
+}
+
+impl BlurTaskKey {
+    fn downscale_and_blur(downscale_level: u32, blur_stddev: DeviceSize) -> Self {
+        // Quantise the std deviations and store it as integers to work around
+        // Eq and Hash's f32 allergy.
+        // The blur radius is rounded before RenderTask::new_blur so we don't need
+        // a lot of precision.
+        const QUANTIZATION_FACTOR: f32 = 1024.0;
+        let stddev_x = (blur_stddev.width * QUANTIZATION_FACTOR) as u32;
+        let stddev_y = (blur_stddev.height * QUANTIZATION_FACTOR) as u32;
+        BlurTaskKey::Blur { downscale_level, stddev_x, stddev_y }
+    }
+}
+
+// The majority of render tasks have 0, 1 or 2 dependencies, except for pictures that
+// typically have dozens to hundreds of dependencies. SmallVec with 2 inline elements
+// avoids many tiny heap allocations in pages with a lot of text shadows and other
+// types of render tasks.
+pub type TaskDependencies = SmallVec<[RenderTaskId;2]>;
+
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct RenderTask {
+    pub location: RenderTaskLocation,
+    pub children: TaskDependencies,
+    pub kind: RenderTaskKind,
+    pub save_target: bool,
+}
+
+impl RenderTask {
+    pub fn new(
+        location: RenderTaskLocation,
+        kind: RenderTaskKind,
+    ) -> Self {
+        render_task_sanity_check(&location.size());
+
+        RenderTask {
+            location,
+            children: TaskDependencies::new(),
+            kind,
+            save_target: false,
+        }
+    }
+
+    pub fn new_dynamic(
+        size: DeviceIntSize,
+        kind: RenderTaskKind,
+    ) -> Self {
+        RenderTask::new(
+            RenderTaskLocation::Dynamic(None, size),
+            kind,
         )
     }
 
-    pub fn new_rounded_rect_mask(
+    #[inline]
+    fn new_dynamic_with_children(
         size: DeviceIntSize,
-        local_pos: LayoutPoint,
-        clip_data: ClipData,
-        device_pixel_scale: DevicePixelScale,
-        fb_config: &FrameBuilderConfig,
+        children: TaskDependencies,
+        kind: RenderTaskKind,
     ) -> Self {
-        let clear_mode = if fb_config.gpu_supports_fast_clears {
-            ClearMode::One
-        } else {
-            ClearMode::DontCare
-        };
+        render_task_sanity_check(&size);
 
-        RenderTask::with_dynamic_location(
-            size,
-            TaskDependencies::new(),
-            RenderTaskKind::ClipRegion(ClipRegionTask {
-                local_pos,
-                device_pixel_scale,
-                clip_data,
-            }),
-            clear_mode,
-        )
+        RenderTask {
+            location: RenderTaskLocation::Dynamic(None, size),
+            children,
+            kind,
+            save_target: false,
+        }
     }
 
-    // In order to do the blur down-scaling passes without introducing errors, we need the
-    // source of each down-scale pass to be a multuple of two. If need be, this inflates
-    // the source size so that each down-scale pass will sample correctly.
-    pub fn adjusted_blur_source_size(original_size: DeviceSize, mut std_dev: DeviceSize) -> DeviceSize {
-        let mut adjusted_size = original_size;
-        let mut scale_factor = 1.0;
-        while std_dev.width > MAX_BLUR_STD_DEVIATION && std_dev.height > MAX_BLUR_STD_DEVIATION {
-            if adjusted_size.width < MIN_DOWNSCALING_RT_SIZE as f32 ||
-               adjusted_size.height < MIN_DOWNSCALING_RT_SIZE as f32 {
-                break;
-            }
-            std_dev = std_dev * 0.5;
-            scale_factor *= 2.0;
-            adjusted_size = (original_size.to_f32() / scale_factor).ceil();
+    #[cfg(test)]
+    pub fn new_test(
+        target: RenderTargetKind,
+        location: RenderTaskLocation,
+        children: TaskDependencies,
+    ) -> Self {
+        RenderTask {
+            location,
+            children,
+            kind: RenderTaskKind::Test(target),
+            save_target: false,
         }
+    }
 
-        adjusted_size * scale_factor
+    pub fn new_blit(
+        size: DeviceIntSize,
+        source: BlitSource,
+    ) -> Self {
+        // If this blit uses a render task as a source,
+        // ensure it's added as a child task. This will
+        // ensure it gets allocated in the correct pass
+        // and made available as an input when this task
+        // executes.
+        let children = match source {
+            BlitSource::RenderTask { task_id } => smallvec![task_id],
+            BlitSource::Image { .. } => smallvec![],
+        };
+
+        RenderTask::new_dynamic_with_children(
+            size,
+            children,
+            RenderTaskKind::Blit(BlitTask {
+                source,
+            }),
+        )
     }
 
     // Construct a render task to apply a blur to a primitive.
@@ -706,7 +822,6 @@
         src_task_id: RenderTaskId,
         render_tasks: &mut RenderTaskGraph,
         target_kind: RenderTargetKind,
-        clear_mode: ClearMode,
         mut blur_cache: Option<&mut BlurTaskCache>,
         blur_region: DeviceIntSize,
     ) -> RenderTaskId {
@@ -762,7 +877,7 @@
         let blur_region = blur_region / (scale_factor as i32);
 
         let blur_task_id = cached_task.unwrap_or_else(|| {
-            let blur_task_v = render_tasks.add().init(RenderTask::with_dynamic_location(
+            let blur_task_v = render_tasks.add().init(RenderTask::new_dynamic_with_children(
                 adjusted_blur_target_size,
                 smallvec![downscaling_src_task_id],
                 RenderTaskKind::VerticalBlur(BlurTask {
@@ -772,10 +887,9 @@
                     blur_region,
                     uv_rect_kind,
                 }),
-                clear_mode,
             ));
 
-            render_tasks.add().init(RenderTask::with_dynamic_location(
+            render_tasks.add().init(RenderTask::new_dynamic_with_children(
                 adjusted_blur_target_size,
                 smallvec![blur_task_v],
                 RenderTaskKind::HorizontalBlur(BlurTask {
@@ -785,7 +899,6 @@
                     blur_region,
                     uv_rect_kind,
                 }),
-                clear_mode,
             ))
         });
 
@@ -796,20 +909,6 @@
         blur_task_id
     }
 
-    pub fn new_border_segment(
-        size: DeviceIntSize,
-        instances: Vec<BorderInstance>,
-    ) -> Self {
-        RenderTask::with_dynamic_location(
-            size,
-            TaskDependencies::new(),
-            RenderTaskKind::Border(BorderTask {
-                instances,
-            }),
-            ClearMode::Transparent,
-        )
-    }
-
     pub fn new_scaling(
         src_task_id: RenderTaskId,
         render_tasks: &mut RenderTaskGraph,
@@ -838,7 +937,7 @@
         };
 
         render_tasks.add().init(
-            RenderTask::with_dynamic_location(
+            RenderTask::new_dynamic_with_children(
                 padded_size,
                 children,
                 RenderTaskKind::Scaling(ScalingTask {
@@ -847,7 +946,6 @@
                     uv_rect_kind,
                     padding,
                 }),
-                ClearMode::DontCare,
             )
         )
     }
@@ -981,7 +1079,6 @@
                         )),
                         render_tasks,
                         RenderTargetKind::Color,
-                        ClearMode::Transparent,
                         None,
                         content_size,
                     )
@@ -1050,7 +1147,6 @@
                         offset_task_id,
                         render_tasks,
                         RenderTargetKind::Color,
-                        ClearMode::Transparent,
                         None,
                         content_size,
                     );
@@ -1158,7 +1254,7 @@
         uv_rect_kind: UvRectKind,
         info: SvgFilterInfo,
     ) -> Self {
-        RenderTask::with_dynamic_location(
+        RenderTask::new_dynamic_with_children(
             target_size,
             tasks,
             RenderTaskKind::SvgFilter(SvgFilterTask {
@@ -1167,7 +1263,6 @@
                 uv_rect_kind,
                 info,
             }),
-            ClearMode::Transparent,
         )
     }
 
@@ -1210,95 +1305,6 @@
         }
     }
 
-    // Write (up to) 8 floats of data specific to the type
-    // of render task that is provided to the GPU shaders
-    // via a vertex texture.
-    pub fn write_task_data(&self) -> RenderTaskData {
-        // NOTE: The ordering and layout of these structures are
-        //       required to match both the GPU structures declared
-        //       in prim_shared.glsl, and also the uses in submit_batch()
-        //       in renderer.rs.
-        // TODO(gw): Maybe there's a way to make this stuff a bit
-        //           more type-safe. Although, it will always need
-        //           to be kept in sync with the GLSL code anyway.
-
-        let data = match self.kind {
-            RenderTaskKind::Picture(ref task) => {
-                // Note: has to match `PICTURE_TYPE_*` in shaders
-                [
-                    task.device_pixel_scale.0,
-                    task.content_origin.x,
-                    task.content_origin.y,
-                ]
-            }
-            RenderTaskKind::CacheMask(ref task) => {
-                [
-                    task.device_pixel_scale.0,
-                    task.actual_rect.origin.x,
-                    task.actual_rect.origin.y,
-                ]
-            }
-            RenderTaskKind::ClipRegion(ref task) => {
-                [
-                    task.device_pixel_scale.0,
-                    0.0,
-                    0.0,
-                ]
-            }
-            RenderTaskKind::VerticalBlur(ref task) |
-            RenderTaskKind::HorizontalBlur(ref task) => {
-                [
-                    task.blur_std_deviation,
-                    task.blur_region.width as f32,
-                    task.blur_region.height as f32,
-                ]
-            }
-            RenderTaskKind::Readback |
-            RenderTaskKind::Scaling(..) |
-            RenderTaskKind::Border(..) |
-            RenderTaskKind::LineDecoration(..) |
-            RenderTaskKind::Gradient(..) |
-            RenderTaskKind::Blit(..) => {
-                [0.0; 3]
-            }
-
-
-            RenderTaskKind::SvgFilter(ref task) => {
-                match task.info {
-                    SvgFilterInfo::Opacity(opacity) => [opacity, 0.0, 0.0],
-                    SvgFilterInfo::Offset(offset) => [offset.x, offset.y, 0.0],
-                    _ => [0.0; 3]
-                }
-            }
-
-            #[cfg(test)]
-            RenderTaskKind::Test(..) => {
-                unreachable!();
-            }
-        };
-
-        let (mut target_rect, target_index) = self.get_target_rect();
-        // The primitives inside a fixed-location render task
-        // are already placed to their corresponding positions,
-        // so the shader doesn't need to shift by the origin.
-        if let RenderTaskLocation::Fixed(_) = self.location {
-            target_rect.origin = DeviceIntPoint::origin();
-        }
-
-        RenderTaskData {
-            data: [
-                target_rect.origin.x as f32,
-                target_rect.origin.y as f32,
-                target_rect.size.width as f32,
-                target_rect.size.height as f32,
-                target_index.0 as f32,
-                data[0],
-                data[1],
-                data[2],
-            ]
-        }
-    }
-
     pub fn get_texture_address(&self, gpu_cache: &GpuCache) -> GpuCacheAddress {
         match self.kind {
             RenderTaskKind::Picture(ref info) => {
@@ -1329,19 +1335,25 @@
     }
 
     pub fn get_dynamic_size(&self) -> DeviceIntSize {
+        self.location.size()
+    }
+
+    pub fn get_target_texture(&self) -> CacheTextureId {
         match self.location {
-            RenderTaskLocation::Fixed(..) => DeviceIntSize::zero(),
-            RenderTaskLocation::Dynamic(_, size) => size,
-            RenderTaskLocation::TextureCache { rect, .. } => rect.size,
-            RenderTaskLocation::PictureCache { size, .. } => size,
+            RenderTaskLocation::Dynamic(Some((_, texture_id, _)), _) => {
+                assert_ne!(texture_id, CacheTextureId::INVALID);
+                texture_id
+            }
+            RenderTaskLocation::Dynamic(None, _) |
+            RenderTaskLocation::TextureCache { .. } |
+            RenderTaskLocation::PictureCache { .. } => {
+                unreachable!();
+            }
         }
     }
 
     pub fn get_target_rect(&self) -> (DeviceIntRect, RenderTargetIndex) {
         match self.location {
-            RenderTaskLocation::Fixed(rect) => {
-                (rect, RenderTargetIndex(0))
-            }
             // Previously, we only added render tasks after the entire
             // primitive chain was determined visible. This meant that
             // we could assert any render task in the list was also
@@ -1356,7 +1368,7 @@
             // TODO(gw): Consider some kind of tag or other method
             //           to mark a task as unused explicitly. This
             //           would allow us to restore this debug check.
-            RenderTaskLocation::Dynamic(Some((origin, target_index)), size) => {
+            RenderTaskLocation::Dynamic(Some((origin, _, target_index)), size) => {
                 (DeviceIntRect::new(origin, size), target_index)
             }
             RenderTaskLocation::Dynamic(None, _) => {
@@ -1413,89 +1425,6 @@
         }
     }
 
-    pub fn write_gpu_blocks(
-        &mut self,
-        gpu_cache: &mut GpuCache,
-    ) {
-        profile_scope!("write_gpu_blocks");
-        let (target_rect, target_index) = self.get_target_rect();
-
-        let (cache_handle, uv_rect_kind) = match self.kind {
-            RenderTaskKind::HorizontalBlur(ref mut info) |
-            RenderTaskKind::VerticalBlur(ref mut info) => {
-                (&mut info.uv_rect_handle, info.uv_rect_kind)
-            }
-            RenderTaskKind::Picture(ref mut info) => {
-                (&mut info.uv_rect_handle, info.uv_rect_kind)
-            }
-            RenderTaskKind::SvgFilter(ref mut info) => {
-                (&mut info.uv_rect_handle, info.uv_rect_kind)
-            }
-            RenderTaskKind::Readback |
-            RenderTaskKind::Scaling(..) |
-            RenderTaskKind::Blit(..) |
-            RenderTaskKind::ClipRegion(..) |
-            RenderTaskKind::Border(..) |
-            RenderTaskKind::CacheMask(..) |
-            RenderTaskKind::Gradient(..) |
-            RenderTaskKind::LineDecoration(..) => {
-                return;
-            }
-            #[cfg(test)]
-            RenderTaskKind::Test(..) => {
-                panic!("RenderTask tests aren't expected to exercise this code");
-            }
-        };
-
-        if let Some(mut request) = gpu_cache.request(cache_handle) {
-            let p0 = target_rect.min().to_f32();
-            let p1 = target_rect.max().to_f32();
-            let image_source = ImageSource {
-                p0,
-                p1,
-                texture_layer: target_index.0 as f32,
-                user_data: [0.0; 3],
-                uv_rect_kind,
-            };
-            image_source.write_gpu_blocks(&mut request);
-        }
-
-        if let RenderTaskKind::SvgFilter(ref mut filter_task) = self.kind {
-            match filter_task.info {
-                SvgFilterInfo::ColorMatrix(ref matrix) => {
-                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
-                    if let Some(mut request) = gpu_cache.request(handle) {
-                        for i in 0..5 {
-                            request.push([matrix[i*4], matrix[i*4+1], matrix[i*4+2], matrix[i*4+3]]);
-                        }
-                    }
-                }
-                SvgFilterInfo::DropShadow(color) |
-                SvgFilterInfo::Flood(color) => {
-                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
-                    if let Some(mut request) = gpu_cache.request(handle) {
-                        request.push(color.to_array());
-                    }
-                }
-                SvgFilterInfo::ComponentTransfer(ref data) => {
-                    let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
-                    if let Some(request) = gpu_cache.request(handle) {
-                        data.update(request);
-                    }
-                }
-                SvgFilterInfo::Composite(ref operator) => {
-                    if let CompositeOperator::Arithmetic(k_vals) = operator {
-                        let handle = filter_task.extra_gpu_cache_handle.get_or_insert_with(GpuCacheHandle::new);
-                        if let Some(mut request) = gpu_cache.request(handle) {
-                            request.push(*k_vals);
-                        }
-                    }
-                }
-                _ => {},
-            }
-        }
-    }
-
     #[cfg(feature = "debugger")]
     pub fn print_with<T: PrintTreePrinter>(&self, pt: &mut T, tree: &RenderTaskGraph) -> bool {
         match self.kind {
@@ -1547,7 +1476,6 @@
             }
         }
 
-        pt.add_item(format!("clear to: {:?}", self.clear_mode));
         pt.add_item(format!("dimensions: {:?}", self.location.size()));
 
         for &child_id in &self.children {
@@ -1564,9 +1492,8 @@
     #[inline]
     pub fn mark_for_saving(&mut self) {
         match self.location {
-            RenderTaskLocation::Fixed(..) |
             RenderTaskLocation::Dynamic(..) => {
-                self.saved_index = Some(SavedTargetIndex::PENDING);
+                self.save_target = true;
             }
             RenderTaskLocation::TextureCache { .. } |
             RenderTaskLocation::PictureCache { .. } => {
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/resource_cache.rs firefox-85.0+build1/gfx/wr/webrender/src/resource_cache.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/resource_cache.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/resource_cache.rs	2021-01-18 19:58: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/. */
 
-use api::{BlobImageResources, BlobImageRequest, RasterizedBlobImage};
+use api::{BlobImageResources, BlobImageRequest, RasterizedBlobImage, ImageFormat};
 use api::{DebugFlags, FontInstanceKey, FontKey, FontTemplate, GlyphIndex};
 use api::{ExternalImageData, ExternalImageType, ExternalImageId, BlobImageResult, FontInstanceData};
 use api::{DirtyRect, GlyphDimensions, IdNamespace, DEFAULT_TILE_SIZE};
@@ -25,7 +25,7 @@
 use crate::glyph_rasterizer::{GLYPH_FLASHING, FontInstance, GlyphFormat, GlyphKey, GlyphRasterizer};
 use crate::gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle};
 use crate::gpu_types::UvRectKind;
-use crate::internal_types::{FastHashMap, FastHashSet, TextureSource, ResourceUpdateList};
+use crate::internal_types::{CacheTextureId, FastHashMap, FastHashSet, TextureSource, ResourceUpdateList};
 use crate::profiler::{self, TransactionProfile, bytes_to_mb};
 use crate::render_backend::{FrameId, FrameStamp};
 use crate::render_task_graph::{RenderTaskGraph, RenderTaskId};
@@ -422,6 +422,30 @@
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct BlobImageRasterizerEpoch(usize);
 
+/// Internal information about allocated render targets in the pool
+struct RenderTarget {
+    size: DeviceIntSize,
+    num_layers: usize,
+    format: ImageFormat,
+    texture_id: CacheTextureId,
+    /// If true, this is currently leant out, and not available to other passes
+    is_active: bool,
+    last_frame_used: FrameId,
+}
+
+impl RenderTarget {
+    fn size_in_bytes(&self) -> usize {
+        let bpp = self.format.bytes_per_pixel() as usize;
+        self.num_layers * (self.size.width * self.size.height) as usize * bpp
+    }
+
+    /// Returns true if this texture was used within `threshold` frames of
+    /// the current frame.
+    pub fn used_recently(&self, current_frame_id: FrameId, threshold: usize) -> bool {
+        self.last_frame_used + threshold >= current_frame_id
+    }
+}
+
 /// High-level container for resources managed by the `RenderBackend`.
 ///
 /// This includes a variety of things, including images, fonts, and glyphs,
@@ -464,6 +488,9 @@
 
     image_templates_memory: usize,
     font_templates_memory: usize,
+
+    /// A pool of render targets for use by the render task graph
+    render_target_pool: Vec<RenderTarget>,
 }
 
 impl ResourceCache {
@@ -497,6 +524,7 @@
             capture_dirty: true,
             image_templates_memory: 0,
             font_templates_memory: 0,
+            render_target_pool: Vec::new(),
         }
     }
 
@@ -1168,7 +1196,6 @@
     pub fn block_until_all_resources_added(
         &mut self,
         gpu_cache: &mut GpuCache,
-        render_tasks: &mut RenderTaskGraph,
         profile: &mut TransactionProfile,
     ) {
         profile_scope!("block_until_all_resources_added");
@@ -1180,8 +1207,6 @@
             &mut self.cached_glyphs,
             &mut self.texture_cache,
             gpu_cache,
-            &mut self.cached_render_tasks,
-            render_tasks,
             profile,
         );
 
@@ -1408,6 +1433,25 @@
         debug_assert_eq!(self.state, State::QueryResources);
         profile_scope!("end_frame");
         self.state = State::Idle;
+
+        // GC the render target pool, if it's currently > 32 MB in size.
+        //
+        // We use a simple scheme whereby we drop any texture that hasn't been used
+        // in the last 60 frames, until we are below the size threshold. This should
+        // generally prevent any sustained build-up of unused textures, unless we don't
+        // generate frames for a long period. This can happen when the window is
+        // minimized, and we probably want to flush all the WebRender caches in that case [1].
+        // There is also a second "red line" memory threshold which prevents
+        // memory exhaustion if many render targets are allocated within a small
+        // number of frames. For now this is set at 320 MB (10x the normal memory threshold).
+        //
+        // [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1494099
+        self.gc_render_targets(
+            32 * 1024 * 1024,
+            32 * 1024 * 1024 * 10,
+            60,
+        );
+
         self.texture_cache.end_frame(profile);
     }
 
@@ -1434,6 +1478,9 @@
         if what.contains(ClearCache::TEXTURE_CACHE) {
             self.texture_cache.clear_all();
         }
+        if what.contains(ClearCache::RENDER_TARGETS) {
+            self.clear_render_target_pool();
+        }
     }
 
     pub fn clear_namespace(&mut self, namespace: IdNamespace) {
@@ -1525,6 +1572,120 @@
             assert!(!self.rasterized_blob_images.keys().any(&blob_f));
         }
     }
+
+    /// Get a render target from the pool, or allocate a new one if none are
+    /// currently available that match the requested parameters.
+    pub fn get_or_create_render_target_from_pool(
+        &mut self,
+        size: DeviceIntSize,
+        num_layers: usize,
+        format: ImageFormat,
+    ) -> CacheTextureId {
+        for target in &mut self.render_target_pool {
+            if target.size == size &&
+               target.num_layers == num_layers &&
+               target.format == format &&
+               !target.is_active {
+                // Found a target that's not currently in use which matches. Update
+                // the last_frame_used for GC purposes.
+                target.is_active = true;
+                target.last_frame_used = self.current_frame_id;
+                return target.texture_id;
+            }
+        }
+
+        // Need to create a new render target and add it to the pool
+
+        let texture_id = self.texture_cache.alloc_render_target(
+            size,
+            num_layers,
+            format,
+        );
+
+        self.render_target_pool.push(RenderTarget {
+            size,
+            num_layers,
+            format,
+            texture_id,
+            is_active: true,
+            last_frame_used: self.current_frame_id,
+        });
+
+        texture_id
+    }
+
+    /// Return a render target to the pool.
+    pub fn return_render_target_to_pool(
+        &mut self,
+        id: CacheTextureId,
+    ) {
+        let target = self.render_target_pool
+            .iter_mut()
+            .find(|t| t.texture_id == id)
+            .expect("bug: invalid render target id");
+
+        assert!(target.is_active);
+        target.is_active = false;
+    }
+
+    /// Clear all current render targets (e.g. on memory pressure)
+    fn clear_render_target_pool(
+        &mut self,
+    ) {
+        for target in self.render_target_pool.drain(..) {
+            debug_assert!(!target.is_active);
+            self.texture_cache.free_render_target(target.texture_id);
+        }
+    }
+
+    /// Garbage collect and remove old render targets from the pool that haven't
+    /// been used for some time.
+    fn gc_render_targets(
+        &mut self,
+        total_bytes_threshold: usize,
+        total_bytes_red_line_threshold: usize,
+        frames_threshold: usize,
+    ) {
+        // Get the total GPU memory size used by the current render target pool
+        let mut rt_pool_size_in_bytes: usize = self.render_target_pool
+            .iter()
+            .map(|t| t.size_in_bytes())
+            .sum();
+
+        // If the total size of the pool is less than the threshold, don't bother
+        // trying to GC any targets
+        if rt_pool_size_in_bytes <= total_bytes_threshold {
+            return;
+        }
+
+        // Sort the current pool by age, so that we remove oldest textures first
+        self.render_target_pool.sort_by_key(|t| t.last_frame_used);
+
+        // We can't just use retain() because `RenderTarget` requires manual cleanup.
+        let mut retained_targets = SmallVec::<[RenderTarget; 8]>::new();
+
+        for target in self.render_target_pool.drain(..) {
+            debug_assert!(!target.is_active);
+
+            // Drop oldest textures until we are under the allowed size threshold.
+            // However, if it's been used in very recently, it is always kept around,
+            // which ensures we don't thrash texture allocations on pages that do
+            // require a very large render target pool and are regularly changing.
+            let above_red_line = rt_pool_size_in_bytes > total_bytes_red_line_threshold;
+            let above_threshold = rt_pool_size_in_bytes > total_bytes_threshold;
+            let used_recently = target.used_recently(self.current_frame_id, frames_threshold);
+            let used_this_frame = target.last_frame_used == self.current_frame_id;
+
+            if !used_this_frame && (above_red_line || (above_threshold && !used_recently)) {
+                rt_pool_size_in_bytes -= target.size_in_bytes();
+                self.texture_cache.free_render_target(target.texture_id);
+            } else {
+                retained_targets.push(target);
+            }
+        }
+
+        self.render_target_pool.extend(retained_targets);
+    }
 }
 
 impl Drop for ResourceCache {
@@ -1808,7 +1969,6 @@
                 self.current_frame_id = FrameId::INVALID;
                 self.texture_cache = TextureCache::new(
                     self.texture_cache.max_texture_size(),
-                    self.texture_cache.max_texture_layers(),
                     self.texture_cache.default_picture_tile_size(),
                     self.texture_cache.color_formats(),
                     self.texture_cache.swizzle_settings(),
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/scene_builder_thread.rs firefox-85.0+build1/gfx/wr/webrender/src/scene_builder_thread.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/scene_builder_thread.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/scene_builder_thread.rs	2021-01-18 19:58:11.000000000 +0000
@@ -687,7 +687,7 @@
 
         Box::new(BuiltTransaction {
             document_id: txn.document_id,
-            render_frame: txn.generate_frame,
+            render_frame: txn.generate_frame.as_bool(),
             invalidate_rendered_frame: txn.invalidate_rendered_frame,
             built_scene,
             view: doc.view,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/screen_capture.rs firefox-85.0+build1/gfx/wr/webrender/src/screen_capture.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/screen_capture.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/screen_capture.rs	2021-01-18 19:58:11.000000000 +0000
@@ -6,7 +6,7 @@
 
 use std::collections::HashMap;
 
-use api::{ImageFormat, TextureTarget};
+use api::{ImageFormat, ImageBufferKind};
 use api::units::*;
 use gleam::gl::GlType;
 
@@ -248,7 +248,7 @@
         // texture is the wrong size, then create a new one.
         if level == self.scaling_textures.len() || self.scaling_textures[level].get_dimensions() != texture_size {
             let texture = device.create_texture(
-                TextureTarget::Default,
+                ImageBufferKind::Texture2D,
                 image_format,
                 texture_size.width,
                 texture_size.height,
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/shade.rs firefox-85.0+build1/gfx/wr/webrender/src/shade.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/shade.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/shade.rs	2021-01-18 19:58:12.000000000 +0000
@@ -2,6 +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/. */
 
+use api::ImageBufferKind;
 use crate::batch::{BatchKey, BatchKind, BrushBatchKind, BatchFeatures};
 use crate::composite::CompositeSurfaceFormat;
 use crate::device::{Device, Program, ShaderError};
@@ -9,7 +10,7 @@
 use crate::glyph_rasterizer::GlyphFormat;
 use crate::renderer::{
     desc,
-    BlendMode, DebugFlags, ImageBufferKind, RendererError, RendererOptions,
+    BlendMode, DebugFlags, RendererError, RendererOptions,
     TextureSampler, VertexArrayKind, ShaderPrecacheFlags,
 };
 
@@ -21,25 +22,23 @@
 
 use webrender_build::shader::{ShaderFeatures, ShaderFeatureFlags, get_shader_features};
 
-impl ImageBufferKind {
-    pub(crate) fn get_feature_string(&self) -> &'static str {
-        match *self {
-            ImageBufferKind::Texture2D => "TEXTURE_2D",
-            ImageBufferKind::Texture2DArray => "",
-            ImageBufferKind::TextureRect => "TEXTURE_RECT",
-            ImageBufferKind::TextureExternal => "TEXTURE_EXTERNAL",
-        }
+pub(crate) fn get_feature_string(kind: ImageBufferKind) -> &'static str {
+    match kind {
+        ImageBufferKind::Texture2D => "TEXTURE_2D",
+        ImageBufferKind::Texture2DArray => "",
+        ImageBufferKind::TextureRect => "TEXTURE_RECT",
+        ImageBufferKind::TextureExternal => "TEXTURE_EXTERNAL",
     }
+}
 
-    fn has_platform_support(&self, gl_type: &GlType) -> bool {
-        match (*self, gl_type) {
-            (ImageBufferKind::Texture2D, _) => true,
-            (ImageBufferKind::Texture2DArray, _) => true,
-            (ImageBufferKind::TextureRect, &GlType::Gles) => false,
-            (ImageBufferKind::TextureRect, &GlType::Gl) => true,
-            (ImageBufferKind::TextureExternal, &GlType::Gles) => true,
-            (ImageBufferKind::TextureExternal, &GlType::Gl) => false,
-        }
+fn has_platform_support(kind: ImageBufferKind, gl_type: &GlType) -> bool {
+    match (kind, gl_type) {
+        (ImageBufferKind::Texture2D, _) => true,
+        (ImageBufferKind::Texture2DArray, _) => true,
+        (ImageBufferKind::TextureRect, &GlType::Gles) => false,
+        (ImageBufferKind::TextureRect, &GlType::Gl) => true,
+        (ImageBufferKind::TextureExternal, &GlType::Gles) => true,
+        (ImageBufferKind::TextureExternal, &GlType::Gl) => false,
     }
 }
 
@@ -56,7 +55,6 @@
 const DITHERING_FEATURE: &str = "DITHERING";
 const DUAL_SOURCE_FEATURE: &str = "DUAL_SOURCE_BLENDING";
 const FAST_PATH_FEATURE: &str = "FAST_PATH";
-const PIXEL_LOCAL_STORAGE_FEATURE: &str = "PIXEL_LOCAL_STORAGE";
 
 pub(crate) enum ShaderKind {
     Primitive,
@@ -267,6 +265,7 @@
                             ("sGpuCache", TextureSampler::GpuCache),
                             ("sPrimitiveHeadersF", TextureSampler::PrimitiveHeadersF),
                             ("sPrimitiveHeadersI", TextureSampler::PrimitiveHeadersI),
+                            ("sClipMask", TextureSampler::ClipMask),
                         ],
                     );
                 }
@@ -311,7 +310,6 @@
         shader_list: &ShaderFeatures,
         use_advanced_blend: bool,
         use_dual_source: bool,
-        use_pixel_local_storage: bool,
     ) -> Result<Self, ShaderError> {
         let opaque_features = features.to_vec();
         let opaque = LazilyCompiledShader::new(
@@ -325,9 +323,6 @@
 
         let mut alpha_features = opaque_features.to_vec();
         alpha_features.push(ALPHA_FEATURE);
-        if use_pixel_local_storage {
-            alpha_features.push(PIXEL_LOCAL_STORAGE_FEATURE);
-        }
 
         let alpha = LazilyCompiledShader::new(
             ShaderKind::Brush,
@@ -447,6 +442,7 @@
     ) -> Result<Self, ShaderError> {
         let mut simple_features = features.to_vec();
         simple_features.push("ALPHA_PASS");
+        simple_features.push("TEXTURE_2D");
 
         let simple = LazilyCompiledShader::new(
             ShaderKind::Text,
@@ -460,6 +456,7 @@
         let mut glyph_transform_features = features.to_vec();
         glyph_transform_features.push("GLYPH_TRANSFORM");
         glyph_transform_features.push("ALPHA_PASS");
+        glyph_transform_features.push("TEXTURE_2D");
 
         let glyph_transform = LazilyCompiledShader::new(
             ShaderKind::Text,
@@ -472,6 +469,7 @@
 
         let mut debug_overdraw_features = features.to_vec();
         debug_overdraw_features.push("DEBUG_OVERDRAW");
+        debug_overdraw_features.push("TEXTURE_2D");
 
         let debug_overdraw = LazilyCompiledShader::new(
             ShaderKind::Text,
@@ -574,12 +572,6 @@
     pub ps_text_run: TextShader,
     pub ps_text_run_dual_source: Option<TextShader>,
 
-    // Helper shaders for pixel local storage render paths.
-    // pls_init: Initialize pixel local storage, based on current framebuffer value.
-    // pls_resolve: Convert pixel local storage, writing out to fragment value.
-    pub pls_init: Option<LazilyCompiledShader>,
-    pub pls_resolve: Option<LazilyCompiledShader>,
-
     ps_split_composite: LazilyCompiledShader,
     pub ps_clear: LazilyCompiledShader,
 
@@ -604,16 +596,9 @@
         gl_type: GlType,
         options: &RendererOptions,
     ) -> Result<Self, ShaderError> {
-        let use_pixel_local_storage = device
-            .get_capabilities()
-            .supports_pixel_local_storage;
-        // If using PLS, we disable all subpixel AA implicitly. Subpixel AA is always
-        // disabled on mobile devices anyway, due to uncertainty over the subpixel
-        // layout configuration.
         let use_dual_source_blending =
             device.get_capabilities().supports_dual_source_blending &&
-            options.allow_dual_source_blending &&
-            !use_pixel_local_storage;
+            options.allow_dual_source_blending;
         let use_advanced_blend_equation =
             device.get_capabilities().supports_advanced_blend_equation &&
             options.allow_advanced_blend_equation;
@@ -622,7 +607,6 @@
             GlType::Gl => ShaderFeatureFlags::GL,
             GlType::Gles => ShaderFeatureFlags::GLES | ShaderFeatureFlags::TEXTURE_EXTERNAL,
         };
-        shader_flags.set(ShaderFeatureFlags::PIXEL_LOCAL_STORAGE, use_pixel_local_storage);
         shader_flags.set(ShaderFeatureFlags::ADVANCED_BLEND_EQUATION, use_advanced_blend_equation);
         shader_flags.set(ShaderFeatureFlags::DUAL_SOURCE_BLENDING, use_dual_source_blending);
         shader_flags.set(ShaderFeatureFlags::DITHERING, options.enable_dithering);
@@ -636,7 +620,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_blend = BrushShader::new(
@@ -647,7 +630,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_mix_blend = BrushShader::new(
@@ -658,7 +640,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_conic_gradient = BrushShader::new(
@@ -673,7 +654,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_radial_gradient = BrushShader::new(
@@ -688,7 +668,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_linear_gradient = BrushShader::new(
@@ -703,7 +682,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_opacity_aa = BrushShader::new(
@@ -714,7 +692,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let brush_opacity = BrushShader::new(
@@ -725,7 +702,6 @@
             &shader_list,
             false /* advanced blend */,
             false /* dual source */,
-            use_pixel_local_storage,
         )?;
 
         let cs_blur_a8 = LazilyCompiledShader::new(
@@ -776,7 +752,7 @@
         let cs_clip_box_shadow = LazilyCompiledShader::new(
             ShaderKind::ClipCache(VertexArrayKind::ClipBoxShadow),
             "cs_clip_box_shadow",
-            &[],
+            &["TEXTURE_2D"],
             device,
             options.precache_flags,
             &shader_list,
@@ -785,38 +761,12 @@
         let cs_clip_image = LazilyCompiledShader::new(
             ShaderKind::ClipCache(VertexArrayKind::ClipImage),
             "cs_clip_image",
-            &[],
+            &["TEXTURE_2D"],
             device,
             options.precache_flags,
             &shader_list,
         )?;
 
-        let pls_init = if use_pixel_local_storage {
-            Some(LazilyCompiledShader::new(
-                ShaderKind::Resolve,
-                "pls_init",
-                &[PIXEL_LOCAL_STORAGE_FEATURE],
-                device,
-                options.precache_flags,
-                &shader_list,
-            )?)
-        } else {
-            None
-        };
-
-        let pls_resolve = if use_pixel_local_storage {
-            Some(LazilyCompiledShader::new(
-                ShaderKind::Resolve,
-                "pls_resolve",
-                &[PIXEL_LOCAL_STORAGE_FEATURE],
-                device,
-                options.precache_flags,
-                &shader_list,
-            )?)
-        } else {
-            None
-        };
-
         let mut cs_scale = Vec::new();
         let scale_shader_num = IMAGE_BUFFER_KINDS.len();
         // PrimitiveShader is not clonable. Use push() to initialize the vec.
@@ -824,8 +774,8 @@
             cs_scale.push(None);
         }
         for image_buffer_kind in &IMAGE_BUFFER_KINDS {
-            if image_buffer_kind.has_platform_support(&gl_type) {
-                let feature_string = image_buffer_kind.get_feature_string();
+            if has_platform_support(*image_buffer_kind, &gl_type) {
+                let feature_string = get_feature_string(*image_buffer_kind);
 
                 let mut features = Vec::new();
                 if feature_string != "" {
@@ -851,21 +801,16 @@
         // TODO(gw): The split composite + text shader are special cases - the only
         //           shaders used during normal scene rendering that aren't a brush
         //           shader. Perhaps we can unify these in future?
-        let mut extra_prim_features = Vec::new();
-        if use_pixel_local_storage {
-            extra_prim_features.push(PIXEL_LOCAL_STORAGE_FEATURE);
-        }
 
         let ps_text_run = TextShader::new("ps_text_run",
             device,
-            &extra_prim_features,
+            &[],
             options.precache_flags,
             &shader_list,
         )?;
 
         let ps_text_run_dual_source = if use_dual_source_blending {
-            let mut dual_source_features = extra_prim_features.clone();
-            dual_source_features.push(DUAL_SOURCE_FEATURE);
+            let dual_source_features = vec![DUAL_SOURCE_FEATURE];
             Some(TextShader::new("ps_text_run",
                 device,
                 &dual_source_features,
@@ -879,7 +824,7 @@
         let ps_split_composite = LazilyCompiledShader::new(
             ShaderKind::Primitive,
             "ps_split_composite",
-            &extra_prim_features,
+            &[],
             device,
             options.precache_flags,
             &shader_list,
@@ -888,7 +833,7 @@
         let ps_clear = LazilyCompiledShader::new(
             ShaderKind::Clear,
             "ps_clear",
-            &extra_prim_features,
+            &[],
             device,
             options.precache_flags,
             &shader_list,
@@ -904,11 +849,11 @@
             brush_fast_image.push(None);
         }
         for buffer_kind in 0 .. IMAGE_BUFFER_KINDS.len() {
-            if !IMAGE_BUFFER_KINDS[buffer_kind].has_platform_support(&gl_type) {
+            if !has_platform_support(IMAGE_BUFFER_KINDS[buffer_kind], &gl_type) {
                 continue;
             }
 
-            let feature_string = IMAGE_BUFFER_KINDS[buffer_kind].get_feature_string();
+            let feature_string = get_feature_string(IMAGE_BUFFER_KINDS[buffer_kind]);
             if feature_string != "" {
                 image_features.push(feature_string);
             }
@@ -921,7 +866,6 @@
                 &shader_list,
                 use_advanced_blend_equation,
                 use_dual_source_blending,
-                use_pixel_local_storage,
             )?);
 
             image_features.push("REPETITION");
@@ -935,7 +879,6 @@
                 &shader_list,
                 use_advanced_blend_equation,
                 use_dual_source_blending,
-                use_pixel_local_storage,
             )?);
 
             image_features.clear();
@@ -955,10 +898,10 @@
             composite_rgba.push(None);
         }
         for image_buffer_kind in &IMAGE_BUFFER_KINDS {
-            if image_buffer_kind.has_platform_support(&gl_type) {
+            if has_platform_support(*image_buffer_kind, &gl_type) {
                 yuv_features.push("YUV");
 
-                let feature_string = image_buffer_kind.get_feature_string();
+                let feature_string = get_feature_string(*image_buffer_kind);
                 if feature_string != "" {
                     yuv_features.push(feature_string);
                     rgba_features.push(feature_string);
@@ -972,7 +915,6 @@
                     &shader_list,
                     false /* advanced blend */,
                     false /* dual source */,
-                    use_pixel_local_storage,
                 )?;
 
                 let composite_yuv_shader = LazilyCompiledShader::new(
@@ -1065,8 +1007,6 @@
             cs_clip_rectangle_fast,
             cs_clip_box_shadow,
             cs_clip_image,
-            pls_init,
-            pls_resolve,
             ps_text_run,
             ps_text_run_dual_source,
             ps_split_composite,
@@ -1197,12 +1137,6 @@
         self.cs_clip_rectangle_fast.deinit(device);
         self.cs_clip_box_shadow.deinit(device);
         self.cs_clip_image.deinit(device);
-        if let Some(shader) = self.pls_init {
-            shader.deinit(device);
-        }
-        if let Some(shader) = self.pls_resolve {
-            shader.deinit(device);
-        }
         self.ps_text_run.deinit(device);
         if let Some(shader) = self.ps_text_run_dual_source {
             shader.deinit(device);
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/slab_allocator.rs firefox-85.0+build1/gfx/wr/webrender/src/slab_allocator.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/slab_allocator.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/slab_allocator.rs	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,378 @@
+/* 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 euclid::{point2, size2, default::Box2D};
+use api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
+use std::cmp;
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct AllocId(u32);
+
+fn pack_alloc_id(region_index: usize, location: TextureLocation) -> AllocId {
+    AllocId(
+        region_index as u32 & 0xFFFF
+        | (location.0 as u32) << 16
+        | (location.1 as u32) << 24
+    )
+}
+
+fn unpack_alloc_id(id: AllocId) -> (usize, TextureLocation) {
+    (
+        (id.0 & 0xFFFF) as usize,
+        TextureLocation(
+            ((id.0 >> 16) & 0xFF) as u8,
+            ((id.0 >> 24) & 0xFF) as u8,
+        ),
+    )
+}
+
+#[derive(Copy, Clone, Debug)]
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub enum SlabSizes {
+    Default,
+    Glyphs,
+}
+
+impl SlabSizes {
+    fn get(&self, requested_size: DeviceIntSize) -> SlabSize {
+        match *self {
+            SlabSizes::Default => Self::default_slab_size(requested_size),
+            SlabSizes::Glyphs => Self::glyphs_slab_size(requested_size),
+        }
+    }
+
+    fn default_slab_size(size: DeviceIntSize) -> SlabSize {
+        fn quantize_dimension(size: i32) -> i32 {
+            match size {
+                0 => unreachable!(),
+                1..=16 => 16,
+                17..=32 => 32,
+                33..=64 => 64,
+                65..=128 => 128,
+                129..=256 => 256,
+                257..=512 => 512,
+                _ => panic!("Invalid dimensions for cache!"),
+            }
+        }
+
+
+        let x_size = quantize_dimension(size.width);
+        let y_size = quantize_dimension(size.height);
+
+        let (width, height) = match (x_size, y_size) {
+            // Special cased rectangular slab pages.
+            (512, 0..=64) => (512, 64),
+            (512, 128) => (512, 128),
+            (512, 256) => (512, 256),
+            (0..=64, 512) => (64, 512),
+            (128, 512) => (128, 512),
+            (256, 512) => (256, 512),
+
+            // If none of those fit, use a square slab size.
+            (x_size, y_size) => {
+                let square_size = cmp::max(x_size, y_size);
+                (square_size, square_size)
+            }
+        };
+
+        SlabSize {
+            width,
+            height,
+        }
+    }
+
+    fn glyphs_slab_size(size: DeviceIntSize) -> SlabSize {
+        fn quantize_dimension(size: i32) -> i32 {
+            match size {
+                0 => unreachable!(),
+                1..=8 => 8,
+                9..=16 => 16,
+                17..=32 => 32,
+                33..=64 => 64,
+                65..=128 => 128,
+                _ => panic!("Invalid dimensions for cache!"),
+            }
+        }
+
+
+        let x_size = quantize_dimension(size.width);
+        let y_size = quantize_dimension(size.height);
+
+        let (width, height) = match (x_size, y_size) {
+            // Special cased rectangular slab pages.
+            (8, 16) => (8, 16),
+            (16, 32) => (16, 32),
+
+            // If none of those fit, use a square slab size.
+            (x_size, y_size) => {
+                let square_size = cmp::max(x_size, y_size);
+                (square_size, square_size)
+            }
+        };
+
+        SlabSize {
+            width,
+            height,
+        }
+    }
+}
+
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Copy, Clone, PartialEq)]
+struct SlabSize {
+    width: i32,
+    height: i32,
+}
+
+impl SlabSize {
+    fn invalid() -> SlabSize {
+        SlabSize {
+            width: 0,
+            height: 0,
+        }
+    }
+}
+
+// The x/y location within a texture region of an allocation.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+struct TextureLocation(pub u8, pub u8);
+
+impl TextureLocation {
+    fn new(x: i32, y: i32) -> Self {
+        debug_assert!(x >= 0 && y >= 0 && x < 0x100 && y < 0x100);
+        TextureLocation(x as u8, y as u8)
+    }
+}
+
+/// A region is a rectangular part of a texture cache texture, split into fixed-size slabs.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+struct TextureRegion {
+    index: usize,
+    slab_size: SlabSize,
+    offset: DeviceIntPoint,
+    free_slots: Vec<TextureLocation>,
+    total_slot_count: usize,
+}
+
+impl TextureRegion {
+    fn new(index: usize, offset: DeviceIntPoint) -> Self {
+        TextureRegion {
+            index,
+            slab_size: SlabSize::invalid(),
+            offset,
+            free_slots: Vec::new(),
+            total_slot_count: 0,
+        }
+    }
+
+    // Initialize a region to be an allocator for a specific slab size.
+    fn init(&mut self, slab_size: SlabSize, region_size: i32, empty_regions: &mut usize) {
+        debug_assert!(self.slab_size == SlabSize::invalid());
+        debug_assert!(self.free_slots.is_empty());
+
+        self.slab_size = slab_size;
+        let slots_per_x_axis = region_size / self.slab_size.width;
+        let slots_per_y_axis = region_size / self.slab_size.height;
+
+        // Add each block to a freelist.
+        for y in 0 .. slots_per_y_axis {
+            for x in 0 .. slots_per_x_axis {
+                self.free_slots.push(TextureLocation::new(x, y));
+            }
+        }
+
+        self.total_slot_count = self.free_slots.len();
+        *empty_regions -= 1;
+    }
+
+    // Deinit a region, allowing it to become a region with
+    // a different allocator size.
+    fn deinit(&mut self, empty_regions: &mut usize) {
+        self.slab_size = SlabSize::invalid();
+        self.free_slots.clear();
+        self.total_slot_count = 0;
+        *empty_regions += 1;
+    }
+
+    fn is_empty(&self) -> bool {
+        self.slab_size == SlabSize::invalid()
+    }
+
+    // Attempt to allocate a fixed size block from this region.
+    fn alloc(&mut self) -> Option<(DeviceIntPoint, TextureLocation)> {
+        debug_assert!(self.slab_size != SlabSize::invalid());
+
+        self.free_slots.pop().map(|location| {(
+            point2(
+                self.offset.x + self.slab_size.width * location.0 as i32,
+                self.offset.y + self.slab_size.height * location.1 as i32,
+            ),
+            location,
+        )})
+    }
+
+    // Free a block in this region.
+    fn free(&mut self, location: TextureLocation, empty_regions: &mut usize) {
+        self.free_slots.push(location);
+
+        // If this region is completely unused, deinit it
+        // so that it can become a different slab size
+        // as required.
+        if self.free_slots.len() == self.total_slot_count {
+            self.deinit(empty_regions);
+        }
+    }
+}
+
+/// A 2D texture divided into regions.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct SlabAllocator {
+    regions: Vec<TextureRegion>,
+    size: i32,
+    region_size: i32,
+    empty_regions: usize,
+    slab_sizes: SlabSizes,
+}
+
+impl SlabAllocator {
+    pub fn new(size: i32, region_size: i32, slab_sizes: SlabSizes) -> Self {
+        let regions_per_row = size / region_size;
+        let num_regions = (regions_per_row * regions_per_row) as usize;
+
+        let mut regions = Vec::with_capacity(num_regions);
+
+        for index in 0..num_regions {
+            let offset = point2(
+                (index as i32 % regions_per_row) * region_size,
+                (index as i32 / regions_per_row) * region_size,
+            );
+
+            regions.push(TextureRegion::new(index, offset));
+        }
+
+        SlabAllocator {
+            regions,
+            region_size,
+            size,
+            empty_regions: num_regions,
+            slab_sizes,
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.empty_regions == self.regions.len()
+    }
+
+    // Returns the region index and allocated rect.
+    pub fn allocate(&mut self, size: DeviceIntSize) -> Option<(AllocId, DeviceIntRect)> {
+        let slab_size = self.slab_sizes.get(size);
+
+        // Keep track of the location of an empty region,
+        // in case we need to select a new empty region
+        // after the loop.
+        let mut empty_region_index = None;
+
+        let allocated_size = size2(slab_size.width, slab_size.height);
+
+        // Run through the existing regions of this size, and see if
+        // we can find a free block in any of them.
+        for (i, region) in self.regions.iter_mut().enumerate() {
+            if region.is_empty() {
+                empty_region_index = Some(i);
+            } else if region.slab_size == slab_size {
+                if let Some((origin, location)) = region.alloc() {
+                    return Some((
+                        pack_alloc_id(region.index, location),
+                        DeviceIntRect {
+                            origin,
+                            size: allocated_size,
+                        }
+                    ));
+                }
+            }
+        }
+
+        if let Some(empty_region_index) = empty_region_index {
+            let region = &mut self.regions[empty_region_index];
+            region.init(slab_size, self.region_size, &mut self.empty_regions);
+            let (origin, location) = region.alloc().unwrap();
+
+            return Some((
+                pack_alloc_id(region.index, location),
+                DeviceIntRect {
+                    origin,
+                    size: allocated_size,
+                },
+            ))
+        }
+
+        None
+    }
+
+    pub fn deallocate(&mut self, id: AllocId) -> DeviceIntSize {
+        let (region_index, location) = unpack_alloc_id(id);
+
+        let region = &mut self.regions[region_index];
+        let size = size2(region.slab_size.width, region.slab_size.height);
+
+        region.free(location, &mut self.empty_regions);
+
+        size
+    }
+
+    pub fn num_regions(&self) -> usize {
+        self.regions.len()
+    }
+
+    pub fn dump_as_svg(&self, rect: &Box2D<f32>, output: &mut dyn std::io::Write) -> std::io::Result<()> {
+        use svg_fmt::*;
+
+        let region_spacing = 5.0;
+        let text_spacing = 15.0;
+        let regions_per_row = (self.size / self.region_size) as usize;
+        let wh = rect.size().width.min(rect.size().height);
+        let region_wh = (wh - region_spacing) / regions_per_row as f32 - region_spacing;
+
+        let x0 = rect.min.x;
+        let y0 = rect.min.y;
+
+        for (idx, region) in self.regions.iter().enumerate() {
+            let slab_size = region.slab_size;
+            let x = x0 + (idx % regions_per_row) as f32 * (region_wh + region_spacing);
+
+            let y = y0 + text_spacing + (idx / regions_per_row) as f32 * (region_wh + region_spacing);
+
+            let texture_background = if region.is_empty() { rgb(30, 30, 30) } else { rgb(40, 40, 130) };
+            writeln!(output, "    {}", rectangle(x, y, region_wh, region_wh).inflate(1.0, 1.0).fill(rgb(10, 10, 10)))?;
+            writeln!(output, "    {}", rectangle(x, y, region_wh, region_wh).fill(texture_background))?;
+
+            let sw = (slab_size.width as f32 / self.region_size as f32) * region_wh;
+            let sh = (slab_size.height as f32 / self.region_size as f32) * region_wh;
+
+            for slot in &region.free_slots {
+                let sx = x + slot.0 as f32 * sw;
+                let sy = y + slot.1 as f32 * sh;
+
+                // Allocation slot.
+                writeln!(output, "    {}", rectangle(sx, sy, sw, sh).inflate(-0.5, -0.5).fill(rgb(30, 30, 30)))?;
+            }
+
+            if slab_size.width != 0 {
+                let region_text = format!("{}x{}", slab_size.width, slab_size.height);
+                let tx = x + 1.0;
+                let ty = y + region_wh - 1.0;
+                writeln!(output, "    {}", text(tx, ty, region_text).color(rgb(230, 230, 230)))?;
+            }
+        }
+
+        Ok(())
+    }
+}
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/texture_allocator.rs firefox-85.0+build1/gfx/wr/webrender/src/texture_allocator.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/texture_allocator.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/texture_allocator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
-
-//TODO: gather real-world statistics on the bin usage in order to assist the decision
-// on where to place the size thresholds.
-
-/// This is an optimization tweak to enable looking through all the free rectangles in a bin
-/// and choosing the smallest, as opposed to picking the first match.
-const FIND_SMALLEST_AREA: bool = false;
-
-const NUM_BINS: usize = 3;
-/// The minimum number of pixels on each side that we require for rects to be classified as
-/// particular bin of freelists.
-const MIN_RECT_AXIS_SIZES: [i32; NUM_BINS] = [1, 16, 32];
-
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd)]
-struct FreeListBin(u8);
-
-#[derive(Debug, Clone, Copy)]
-struct FreeListIndex(usize);
-
-impl FreeListBin {
-    fn for_size(size: &DeviceIntSize) -> Self {
-        MIN_RECT_AXIS_SIZES
-            .iter()
-            .enumerate()
-            .rev()
-            .find(|(_, &min_size)| min_size <= size.width && min_size <= size.height)
-            .map(|(id, _)| FreeListBin(id as u8))
-            .expect("Unable to find a bin!")
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct FreeRectSlice(pub u32);
-
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct FreeRect {
-    slice: FreeRectSlice,
-    rect: DeviceIntRect,
-}
-
-/// A texture allocator using the guillotine algorithm with the rectangle merge improvement. See
-/// sections 2.2 and 2.2.5 in "A Thousand Ways to Pack the Bin - A Practical Approach to Two-
-/// Dimensional Rectangle Bin Packing":
-///
-///    http://clb.demon.fi/files/RectangleBinPack.pdf
-///
-/// This approach was chosen because of its simplicity, good performance, and easy support for
-/// dynamic texture deallocation.
-///
-/// Note: the allocations are spread across multiple textures, and also are binned
-/// orthogonally in order to speed up the search.
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct ArrayAllocationTracker {
-    bins: [Vec<FreeRect>; NUM_BINS],
-}
-
-impl ArrayAllocationTracker {
-    pub fn new() -> Self {
-        ArrayAllocationTracker {
-            bins: [
-                Vec::new(),
-                Vec::new(),
-                Vec::new(),
-            ],
-        }
-    }
-
-    fn push(&mut self, slice: FreeRectSlice, rect: DeviceIntRect) {
-        let id = FreeListBin::for_size(&rect.size).0 as usize;
-        self.bins[id].push(FreeRect {
-            slice,
-            rect,
-        })
-    }
-
-    /// Find a suitable rect in the free list. We choose the smallest such rect
-    /// in terms of area (Best-Area-Fit, BAF).
-    fn find_index_of_best_rect(
-        &self,
-        requested_dimensions: &DeviceIntSize,
-    ) -> Option<(FreeListBin, FreeListIndex)> {
-        let start_bin = FreeListBin::for_size(requested_dimensions);
-        (start_bin.0 .. NUM_BINS as u8)
-            .find_map(|id| if FIND_SMALLEST_AREA {
-                let mut smallest_index_and_area = None;
-                for (candidate_index, candidate) in self.bins[id as usize].iter().enumerate() {
-                    if requested_dimensions.width > candidate.rect.size.width ||
-                        requested_dimensions.height > candidate.rect.size.height
-                    {
-                        continue;
-                    }
-
-                    let candidate_area = candidate.rect.size.area();
-                    match smallest_index_and_area {
-                        Some((_, area)) if candidate_area >= area => continue,
-                        _ => smallest_index_and_area = Some((candidate_index, candidate_area)),
-                    }
-                }
-
-                smallest_index_and_area
-                    .map(|(index, _)| (FreeListBin(id), FreeListIndex(index)))
-            } else {
-                self.bins[id as usize]
-                    .iter()
-                    .position(|candidate| {
-                        requested_dimensions.width <= candidate.rect.size.width &&
-                        requested_dimensions.height <= candidate.rect.size.height
-                    })
-                    .map(|index| (FreeListBin(id), FreeListIndex(index)))
-            })
-    }
-
-    // Split that results in the single largest area (Min Area Split Rule, MINAS).
-    fn split_guillotine(&mut self, chosen: &FreeRect, requested_dimensions: &DeviceIntSize) {
-        let candidate_free_rect_to_right = DeviceIntRect::new(
-            DeviceIntPoint::new(
-                chosen.rect.origin.x + requested_dimensions.width,
-                chosen.rect.origin.y,
-            ),
-            DeviceIntSize::new(
-                chosen.rect.size.width - requested_dimensions.width,
-                requested_dimensions.height,
-            ),
-        );
-        let candidate_free_rect_to_bottom = DeviceIntRect::new(
-            DeviceIntPoint::new(
-                chosen.rect.origin.x,
-                chosen.rect.origin.y + requested_dimensions.height,
-            ),
-            DeviceIntSize::new(
-                requested_dimensions.width,
-                chosen.rect.size.height - requested_dimensions.height,
-            ),
-        );
-
-        // Guillotine the rectangle.
-        let new_free_rect_to_right;
-        let new_free_rect_to_bottom;
-        if candidate_free_rect_to_right.size.area() > candidate_free_rect_to_bottom.size.area() {
-            new_free_rect_to_right = DeviceIntRect::new(
-                candidate_free_rect_to_right.origin,
-                DeviceIntSize::new(
-                    candidate_free_rect_to_right.size.width,
-                    chosen.rect.size.height,
-                ),
-            );
-            new_free_rect_to_bottom = candidate_free_rect_to_bottom
-        } else {
-            new_free_rect_to_right = candidate_free_rect_to_right;
-            new_free_rect_to_bottom = DeviceIntRect::new(
-                candidate_free_rect_to_bottom.origin,
-                DeviceIntSize::new(
-                    chosen.rect.size.width,
-                    candidate_free_rect_to_bottom.size.height,
-                ),
-            )
-        }
-
-        // Add the guillotined rects back to the free list.
-        if !new_free_rect_to_right.is_empty() {
-            self.push(chosen.slice, new_free_rect_to_right);
-        }
-        if !new_free_rect_to_bottom.is_empty() {
-            self.push(chosen.slice, new_free_rect_to_bottom);
-        }
-    }
-
-    pub fn allocate(
-        &mut self, requested_dimensions: &DeviceIntSize
-    ) -> Option<(FreeRectSlice, DeviceIntPoint)> {
-        if requested_dimensions.width == 0 || requested_dimensions.height == 0 {
-            return Some((FreeRectSlice(0), DeviceIntPoint::new(0, 0)));
-        }
-        let (bin, index) = self.find_index_of_best_rect(requested_dimensions)?;
-
-        // Remove the rect from the free list and decide how to guillotine it.
-        let chosen = self.bins[bin.0 as usize].swap_remove(index.0);
-        self.split_guillotine(&chosen, requested_dimensions);
-
-        // Return the result.
-        Some((chosen.slice, chosen.rect.origin))
-    }
-
-    /// Add a new slice to the allocator, and immediately allocate a rect from it.
-    pub fn extend(
-        &mut self,
-        slice: FreeRectSlice,
-        total_size: DeviceIntSize,
-        requested_dimensions: DeviceIntSize,
-    ) {
-        self.split_guillotine(
-            &FreeRect { slice, rect: total_size.into() },
-            &requested_dimensions
-        );
-    }
-}
-
-#[cfg(test)]
-fn random_fill(count: usize, texture_size: i32) -> f32 {
-    use rand::{thread_rng, Rng};
-
-    let total_rect = DeviceIntRect::new(
-        DeviceIntPoint::zero(),
-        DeviceIntSize::new(texture_size, texture_size),
-    );
-    let mut rng = thread_rng();
-    let mut allocator = ArrayAllocationTracker::new();
-
-    // check for empty allocation
-    assert_eq!(
-        allocator.allocate(&DeviceIntSize::new(0, 12)),
-        Some((FreeRectSlice(0), DeviceIntPoint::zero())),
-    );
-
-    let mut slices: Vec<Vec<DeviceIntRect>> = Vec::new();
-    let mut requested_area = 0f32;
-    // fill up the allocator
-    for _ in 0 .. count {
-        let size = DeviceIntSize::new(
-            rng.gen_range(1, texture_size),
-            rng.gen_range(1, texture_size),
-        );
-        requested_area += size.area() as f32;
-
-        match allocator.allocate(&size) {
-            Some((slice, origin)) => {
-                let rect = DeviceIntRect::new(origin, size);
-                assert_eq!(None, slices[slice.0 as usize].iter().find(|r| r.intersects(&rect)));
-                assert!(total_rect.contains_rect(&rect));
-                slices[slice.0 as usize].push(rect);
-            }
-            None => {
-                allocator.extend(FreeRectSlice(slices.len() as u32), total_rect.size, size);
-                let rect = DeviceIntRect::new(DeviceIntPoint::zero(), size);
-                slices.push(vec![rect]);
-            }
-        }
-    }
-    // validate the free rects
-    for (i, free_vecs) in allocator.bins.iter().enumerate() {
-        for fr in free_vecs {
-            assert_eq!(FreeListBin(i as u8), FreeListBin::for_size(&fr.rect.size));
-            assert_eq!(None, slices[fr.slice.0 as usize].iter().find(|r| r.intersects(&fr.rect)));
-            assert!(total_rect.contains_rect(&fr.rect));
-            slices[fr.slice.0 as usize].push(fr.rect);
-        }
-    }
-
-    let allocated_area = slices.len() as f32 * (texture_size * texture_size) as f32;
-    requested_area / allocated_area
-}
-
-#[test]
-fn test_small() {
-    random_fill(100, 100);
-}
-
-#[test]
-fn test_large() {
-    random_fill(1000, 10000);
-}
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender/src/texture_cache.rs firefox-85.0+build1/gfx/wr/webrender/src/texture_cache.rs
--- firefox-84.0.2+build1/gfx/wr/webrender/src/texture_cache.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender/src/texture_cache.rs	2021-01-18 19:58:11.000000000 +0000
@@ -2,11 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use api::{DirtyRect, ExternalImageType, ImageFormat};
+use api::{DirtyRect, ExternalImageType, ImageFormat, ImageBufferKind};
 use api::{DebugFlags, ImageDescriptor};
 use api::units::*;
 #[cfg(test)]
 use api::{DocumentId, IdNamespace};
+use euclid::point2;
 use crate::device::{TextureFilter, TextureFormatPair};
 use crate::freelist::{FreeListHandle, WeakFreeListHandle};
 use crate::gpu_cache::{GpuCache, GpuCacheHandle};
@@ -20,9 +21,9 @@
 use crate::profiler::{self, TransactionProfile};
 use crate::render_backend::FrameStamp;
 use crate::resource_cache::{CacheItem, CachedImageData};
+use crate::slab_allocator::*;
 use smallvec::SmallVec;
 use std::cell::Cell;
-use std::cmp;
 use std::mem;
 use std::rc::Rc;
 
@@ -38,18 +39,15 @@
     Text,
 }
 
-/// The size of each region/layer in shared cache texture arrays.
+/// The size of each region in shared cache texture arrays.
 pub const TEXTURE_REGION_DIMENSIONS: i32 = 512;
+pub const GLYPH_TEXTURE_REGION_DIMENSIONS: i32 = 128;
 
 const PICTURE_TEXTURE_SLICE_COUNT: usize = 8;
 
 /// The chosen image format for picture tiles.
 const PICTURE_TILE_FORMAT: ImageFormat = ImageFormat::RGBA8;
 
-/// The number of pixels in a region. Derived from the above.
-const TEXTURE_REGION_PIXELS: usize =
-    (TEXTURE_REGION_DIMENSIONS as usize) * (TEXTURE_REGION_DIMENSIONS as usize);
-
 /// Items in the texture cache can either be standalone textures,
 /// or a sub-rect inside the shared cache.
 #[derive(Debug)]
@@ -69,8 +67,8 @@
     Cache {
         /// Origin within the texture layer where this item exists.
         origin: DeviceIntPoint,
-        /// The layer index of the texture array.
-        layer_index: usize,
+        /// ID of the allocation specific to its allocator.
+        alloc_id: AllocId,
     },
 }
 
@@ -79,7 +77,7 @@
         match *self {
             EntryDetails::Standalone { .. }  => (0, DeviceIntPoint::zero()),
             EntryDetails::Picture { layer_index, .. } => (layer_index, DeviceIntPoint::zero()),
-            EntryDetails::Cache { origin, layer_index, .. } => (layer_index, origin),
+            EntryDetails::Cache { origin, .. } => (0, origin),
         }
     }
 }
@@ -238,11 +236,11 @@
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 struct SharedTextures {
-    array_color8_nearest: TextureArray,
-    array_alpha8_linear: TextureArray,
-    array_alpha16_linear: TextureArray,
-    array_color8_linear: TextureArray,
-    array_color8_glyphs: TextureArray,
+    color8_nearest: TextureUnits,
+    alpha8_linear: TextureUnits,
+    alpha16_linear: TextureUnits,
+    color8_linear: TextureUnits,
+    color8_glyphs: TextureUnits,
 }
 
 impl SharedTextures {
@@ -252,69 +250,82 @@
             // Used primarily for cached shadow masks. There can be lots of
             // these on some pages like francine, but most pages don't use it
             // much.
-            array_alpha8_linear: TextureArray::new(
+            alpha8_linear: TextureUnits::new(
                 TextureFormatPair::from(ImageFormat::R8),
                 TextureFilter::Linear,
-                8,
+                1024,
+                TEXTURE_REGION_DIMENSIONS,
+                SlabSizes::Default,
             ),
             // Used for experimental hdr yuv texture support, but not used in
             // production Firefox.
-            array_alpha16_linear: TextureArray::new(
+            alpha16_linear: TextureUnits::new(
                 TextureFormatPair::from(ImageFormat::R16),
                 TextureFilter::Linear,
-                1,
+                TEXTURE_REGION_DIMENSIONS,
+                TEXTURE_REGION_DIMENSIONS,
+                SlabSizes::Default,
             ),
             // The primary cache for images, etc.
-            array_color8_linear: TextureArray::new(
+            color8_linear: TextureUnits::new(
                 color_formats.clone(),
                 TextureFilter::Linear,
-                16,
+                2048,
+                TEXTURE_REGION_DIMENSIONS,
+                SlabSizes::Default,
             ),
             // The cache for glyphs (separate to help with batching).
-            array_color8_glyphs: TextureArray::new(
+            color8_glyphs: TextureUnits::new(
                 color_formats.clone(),
                 TextureFilter::Linear,
-                16,
+                2048,
+                GLYPH_TEXTURE_REGION_DIMENSIONS,
+                SlabSizes::Glyphs,
             ),
             // Used for image-rendering: crisp. This is mostly favicons, which
             // are small. Some other images use it too, but those tend to be
             // larger than 512x512 and thus don't use the shared cache anyway.
-            array_color8_nearest: TextureArray::new(
+            color8_nearest: TextureUnits::new(
                 color_formats,
                 TextureFilter::Nearest,
-                1,
+                TEXTURE_REGION_DIMENSIONS,
+                TEXTURE_REGION_DIMENSIONS,
+                SlabSizes::Default,
             ),
         }
     }
 
     /// Clears each texture in the set, with the given set of pending updates.
     fn clear(&mut self, updates: &mut TextureUpdateList) {
-        self.array_alpha8_linear.clear(updates);
-        self.array_alpha16_linear.clear(updates);
-        self.array_color8_linear.clear(updates);
-        self.array_color8_nearest.clear(updates);
-        self.array_color8_glyphs.clear(updates);
+        self.alpha8_linear.clear(updates);
+        self.alpha16_linear.clear(updates);
+        self.color8_linear.clear(updates);
+        self.color8_nearest.clear(updates);
+        self.color8_glyphs.clear(updates);
     }
 
     /// Returns a mutable borrow for the shared texture array matching the parameters.
     fn select(
-        &mut self, external_format: ImageFormat, filter: TextureFilter, shader: TargetShader,
-    ) -> &mut TextureArray {
+        &mut self, size: DeviceIntSize, external_format: ImageFormat, filter: TextureFilter, shader: TargetShader,
+    ) -> &mut TextureUnits {
         match external_format {
             ImageFormat::R8 => {
                 assert_eq!(filter, TextureFilter::Linear);
-                &mut self.array_alpha8_linear
+                &mut self.alpha8_linear
             }
             ImageFormat::R16 => {
                 assert_eq!(filter, TextureFilter::Linear);
-                &mut self.array_alpha16_linear
+                &mut self.alpha16_linear
             }
             ImageFormat::RGBA8 |
             ImageFormat::BGRA8 => {
+                let max = size.width.max(size.height);
                 match (filter, shader) {
-                    (TextureFilter::Linear, TargetShader::Text) => &mut self.array_color8_glyphs,
-                    (TextureFilter::Linear, _) => &mut self.array_color8_linear,
-                    (TextureFilter::Nearest, _) => &mut self.array_color8_nearest,
+                    (TextureFilter::Linear, TargetShader::Text) if max <= GLYPH_TEXTURE_REGION_DIMENSIONS => {
+                        &mut self.color8_glyphs
+                    }
+                    (TextureFilter::Linear, _) => &mut self.color8_linear,
+                    (TextureFilter::Nearest, _) => &mut self.color8_nearest,
                     _ => panic!("Unexpexcted filter {:?}", filter),
                 }
             }
@@ -452,9 +463,6 @@
     /// Maximum texture size supported by hardware.
     max_texture_size: i32,
 
-    /// Maximum number of texture layers supported by hardware.
-    max_texture_layers: usize,
-
     /// Settings on using texture unit swizzling.
     swizzle: Option<SwizzleSettings>,
 
@@ -507,39 +515,10 @@
 
     pub fn new(
         max_texture_size: i32,
-        mut max_texture_layers: usize,
         default_picture_tile_size: DeviceIntSize,
         color_formats: TextureFormatPair<ImageFormat>,
         swizzle: Option<SwizzleSettings>,
     ) -> Self {
-        // On MBP integrated Intel GPUs, texture arrays appear to be
-        // implemented as a single texture of stacked layers, and that
-        // texture appears to be subject to the texture size limit. As such,
-        // allocating more than 32 512x512 regions results in a dimension
-        // longer than 16k (the max texture size), causing incorrect behavior.
-        //
-        // So we clamp the number of layers on mac. This results in maximum
-        // texture array size of 32MB, which isn't ideal but isn't terrible
-        // either. OpenGL on mac is not long for this earth, so this may be
-        // good enough until we have WebRender on gfx-rs (on Metal).
-        //
-        // On all platforms, we also clamp the number of textures per layer to 16
-        // to avoid the cost of resizing large texture arrays (at the expense
-        // of batching efficiency).
-        //
-        // Note that we could also define this more generally in terms of
-        // |max_texture_size / TEXTURE_REGION_DIMENSION|, except:
-        //   * max_texture_size is actually clamped beyond the device limit
-        //     by Gecko to 8192, so we'd need to thread the raw device value
-        //     here, and:
-        //   * The bug we're working around is likely specific to a single
-        //     driver family, and those drivers are also likely to share
-        //     the same max texture size of 16k. If we do encounter a driver
-        //     with the same bug but a lower max texture size, we might need
-        //     to rethink our strategy anyway, since a limit below 32MB might
-        //     start to introduce performance issues.
-        max_texture_layers = max_texture_layers.min(16);
-
         let pending_updates = TextureUpdateList::new();
 
         // Shared texture cache controls swizzling on a per-entry basis, assuming that
@@ -557,7 +536,6 @@
                 default_picture_tile_size,
             ),
             max_texture_size,
-            max_texture_layers,
             swizzle,
             debug_flags: DebugFlags::empty(),
             next_id: next_texture_id,
@@ -577,12 +555,10 @@
     #[cfg(test)]
     pub fn new_for_testing(
         max_texture_size: i32,
-        max_texture_layers: usize,
         image_format: ImageFormat,
     ) -> Self {
         let mut cache = Self::new(
             max_texture_size,
-            max_texture_layers,
             crate::picture::TILE_SIZE_DEFAULT,
             TextureFormatPair::from(image_format),
             None,
@@ -648,41 +624,47 @@
         // Release of empty shared textures is done at the end of the frame. That way, if the
         // eviction at the start of the frame frees up a texture, that is then subsequently
         // used during the frame, we avoid doing a free/alloc for it.
-        self.shared_textures.array_alpha8_linear.release_empty_textures(&mut self.pending_updates);
-        self.shared_textures.array_alpha16_linear.release_empty_textures(&mut self.pending_updates);
-        self.shared_textures.array_color8_linear.release_empty_textures(&mut self.pending_updates);
-        self.shared_textures.array_color8_nearest.release_empty_textures(&mut self.pending_updates);
-        self.shared_textures.array_color8_glyphs.release_empty_textures(&mut self.pending_updates);
+        self.shared_textures.alpha8_linear.release_empty_textures(&mut self.pending_updates);
+        self.shared_textures.alpha16_linear.release_empty_textures(&mut self.pending_updates);
+        self.shared_textures.color8_linear.release_empty_textures(&mut self.pending_updates);
+        self.shared_textures.color8_nearest.release_empty_textures(&mut self.pending_updates);
+        self.shared_textures.color8_glyphs.release_empty_textures(&mut self.pending_updates);
 
-        self.shared_textures.array_alpha8_linear.update_profile(
+        self.shared_textures.alpha8_linear.update_profile(
             profiler::TEXTURE_CACHE_A8_REGIONS,
             profiler::TEXTURE_CACHE_A8_MEM,
             profile,
         );
-        self.shared_textures.array_alpha16_linear.update_profile(
+        self.shared_textures.alpha16_linear.update_profile(
             profiler::TEXTURE_CACHE_A16_REGIONS,
             profiler::TEXTURE_CACHE_A16_MEM,
             profile,
         );
-        self.shared_textures.array_color8_linear.update_profile(
+        self.shared_textures.color8_linear.update_profile(
             profiler::TEXTURE_CACHE_RGBA8_LINEAR_REGIONS,
             profiler::TEXTURE_CACHE_RGBA8_LINEAR_MEM,
             profile,
         );
-        self.shared_textures.array_color8_nearest.update_profile(
+        self.shared_textures.color8_nearest.update_profile(
             profiler::TEXTURE_CACHE_RGBA8_NEAREST_REGIONS,
             profiler::TEXTURE_CACHE_RGBA8_NEAREST_MEM,
             profile,
         );
-        self.shared_textures.array_color8_glyphs.update_profile(
+        self.shared_textures.color8_glyphs.update_profile(
             profiler::TEXTURE_CACHE_RGBA8_GLYPHS_REGIONS,
             profiler::TEXTURE_CACHE_RGBA8_GLYPHS_MEM,
             profile,
         );
         self.picture_textures.update_profile(profile);
 
-        profile.set(profiler::TEXTURE_CACHE_SHARED_MEM, self.shared_bytes_allocated);
-        profile.set(profiler::TEXTURE_CACHE_STANDALONE_MEM, self.standalone_bytes_allocated);
+        profile.set(
+            profiler::TEXTURE_CACHE_SHARED_MEM,
+            profiler::bytes_to_mb(self.shared_bytes_allocated),
+        );
+        profile.set(
+            profiler::TEXTURE_CACHE_STANDALONE_MEM,
+            profiler::bytes_to_mb(self.standalone_bytes_allocated),
+        );
 
         self.now = FrameStamp::INVALID;
     }
@@ -720,13 +702,8 @@
     }
 
     #[cfg(feature = "replay")]
-    pub fn max_texture_layers(&self) -> usize {
-        self.max_texture_layers
-    }
-
-    #[cfg(feature = "replay")]
     pub fn color_formats(&self) -> TextureFormatPair<ImageFormat> {
-        self.shared_textures.array_color8_linear.formats.clone()
+        self.shared_textures.color8_linear.formats.clone()
     }
 
     #[cfg(feature = "replay")]
@@ -810,13 +787,12 @@
             // texture format (thus avoiding the conversion by the driver).
             // Otherwise, pass the external format to the driver.
             let use_upload_format = self.swizzle.is_none();
-            let (layer_index, origin) = entry.details.describe();
+            let (_, origin) = entry.details.describe();
             let op = TextureCacheUpdate::new_update(
                 data,
                 &descriptor,
                 origin,
                 entry.size,
-                layer_index as i32,
                 use_upload_format,
                 &dirty_rect,
             );
@@ -855,7 +831,11 @@
         let (texture_id, layer_index, uv_rect, swizzle, uv_rect_handle, user_data) = self.get_cache_location(handle);
         CacheItem {
             uv_rect_handle,
-            texture_id: TextureSource::TextureCache(texture_id, swizzle),
+            texture_id: TextureSource::TextureCache(
+                texture_id,
+                ImageBufferKind::Texture2D,
+                swizzle,
+            ),
             uv_rect,
             texture_layer: layer_index as i32,
             user_data,
@@ -913,11 +893,11 @@
     }
 
     pub fn dump_color8_linear_as_svg(&self, output: &mut dyn std::io::Write) -> std::io::Result<()> {
-        self.shared_textures.array_color8_linear.dump_as_svg(output)
+        self.shared_textures.color8_linear.dump_as_svg(output)
     }
 
     pub fn dump_glyphs_as_svg(&self, output: &mut dyn std::io::Write) -> std::io::Result<()> {
-        self.shared_textures.array_color8_glyphs.dump_as_svg(output)
+        self.shared_textures.color8_glyphs.dump_as_svg(output)
     }
 
     /// Expire picture cache tiles that haven't been referenced in the last frame.
@@ -958,19 +938,25 @@
         // Keep evicting while memory is above the threshold, and we haven't
         // reached a maximum number of evictions this frame.
         while self.should_continue_evicting(eviction_count) {
-            match self.lru_cache.pop_oldest() {
-                Some(entry) => {
-                    entry.evict();
-                    self.free(&entry);
-                    eviction_count += 1;
-                }
-                None => {
-                    // It's possible that we could fail to pop an item from the LRU list to evict, if every
-                    // item in the cache is set to manual eviction mode. In this case, just break out of the
-                    // loop as there's nothing we can do until the calling code manually evicts items to
-                    // reduce the allocated cache size.
-                    break;
-                }
+            let should_evict = match self.lru_cache.peek_oldest() {
+                // Only evict this item if it wasn't used in the previous frame. The reason being that if it
+                // was used the previous frame then it will likely be used in this frame too, and we don't
+                // want to be continually evicting and reuploading the item every frame.
+                Some(entry) => entry.last_access.frame_id() < self.now.frame_id() - 1,
+                // It's possible that we could fail to pop an item from the LRU list to evict, if every
+                // item in the cache is set to manual eviction mode. In this case, just break out of the
+                // loop as there's nothing we can do until the calling code manually evicts items to
+                // reduce the allocated cache size.
+                None => false,
+            };
+
+            if should_evict {
+                let entry = self.lru_cache.pop_oldest().unwrap();
+                entry.evict();
+                self.free(&entry);
+                eviction_count += 1;
+            } else {
+                break;
             }
         }
     }
@@ -1025,16 +1011,22 @@
                 // This is a standalone texture allocation. Free it directly.
                 self.pending_updates.push_free(entry.texture_id);
             }
-            EntryDetails::Cache { origin, layer_index, .. } => {
+            EntryDetails::Cache { origin, alloc_id, .. } => {
                 // Free the block in the given region.
-                let texture_array = self.shared_textures.select(entry.input_format, entry.filter, entry.shader);
+                let texture_array = self.shared_textures.select(
+                    entry.size,
+                    entry.input_format,
+                    entry.filter,
+                    entry.shader,
+                );
                 let unit = texture_array.units
                     .iter_mut()
                     .find(|unit| unit.texture_id == entry.texture_id)
                     .expect("Unable to find the associated texture array unit");
-                let region = &mut unit.regions[layer_index];
 
-                self.shared_bytes_allocated -= region.slab_size.size_in_bytes(texture_array.formats.internal);
+                let bpp = texture_array.formats.internal.bytes_per_pixel();
+                let slab_size = unit.allocator.deallocate(alloc_id);
+                self.shared_bytes_allocated -= (slab_size.width * slab_size.height * bpp) as usize;
 
                 if self.debug_flags.contains(
                     DebugFlags::TEXTURE_CACHE_DBG |
@@ -1043,12 +1035,11 @@
                     self.pending_updates.push_debug_clear(
                         entry.texture_id,
                         origin,
-                        region.slab_size.width,
-                        region.slab_size.height,
-                        layer_index,
+                        slab_size.width,
+                        slab_size.height,
+                        0,
                     );
                 }
-                region.free(origin, &mut unit.empty_regions);
             }
         }
     }
@@ -1058,13 +1049,20 @@
         &mut self,
         params: &CacheAllocParams,
     ) -> CacheEntry {
-        // Mutably borrow the correct texture.
-        let texture_array = self.shared_textures.select(
+        let units = self.shared_textures.select(
+            params.descriptor.size,
             params.descriptor.format,
             params.filter,
             params.shader,
         );
-        let swizzle = if texture_array.formats.external == params.descriptor.format {
+
+        let (texture_id, alloc_id, allocated_rect) = units.allocate(
+            params.descriptor.size,
+            &mut self.pending_updates,
+            &mut self.next_id,
+        );
+
+        let swizzle = if units.formats.external == params.descriptor.format {
             Swizzle::default()
         } else {
             match self.swizzle {
@@ -1073,59 +1071,26 @@
             }
         };
 
-        let max_texture_layers = self.max_texture_layers;
-        let slab_size = SlabSize::new(params.descriptor.size);
-
-        let mut info = TextureCacheAllocInfo {
-            width: TEXTURE_REGION_DIMENSIONS,
-            height: TEXTURE_REGION_DIMENSIONS,
-            format: texture_array.formats.internal,
-            filter: texture_array.filter,
-            layer_count: 1,
-            is_shared_cache: true,
-            has_depth: false,
-        };
-
-        let unit_index = if let Some(index) = texture_array.units
-            .iter()
-            .position(|unit| unit.can_alloc(slab_size))
-        {
-            index
-        } else if let Some(index) = texture_array.units
-            .iter()
-            .position(|unit| unit.regions.len() < max_texture_layers)
-        {
-            let unit = &mut texture_array.units[index];
-
-            unit.push_regions(texture_array.layers_per_allocation);
-
-            info.layer_count = unit.regions.len() as i32;
-            self.pending_updates.push_realloc(unit.texture_id, info);
-
-            index
-        } else {
-            let index = texture_array.units.len();
-            texture_array.units.push(TextureArrayUnit {
-                texture_id: self.next_id,
-                regions: Vec::new(),
-                empty_regions: 0,
-            });
-
-            let unit = &mut texture_array.units[index];
-
-            unit.push_regions(texture_array.layers_per_allocation);
-
-            info.layer_count = unit.regions.len() as i32;
-            self.pending_updates.push_alloc(self.next_id, info);
-            self.next_id.0 += 1;
-            index
-        };
-
-        self.shared_bytes_allocated += slab_size.size_in_bytes(texture_array.formats.internal);
+        let bpp = units.formats.internal.bytes_per_pixel();
+        self.shared_bytes_allocated += (allocated_rect.size.area() * bpp) as usize;
 
-        // Do the allocation. This can fail and return None
-        // if there are no free slots or regions available.
-        texture_array.alloc(params, unit_index, self.now, swizzle, params.shader)
+        CacheEntry {
+            size: params.descriptor.size,
+            user_data: params.user_data,
+            last_access: self.now,
+            details: EntryDetails::Cache {
+                origin: allocated_rect.origin,
+                alloc_id,
+            },
+            uv_rect_handle: GpuCacheHandle::new(),
+            input_format: params.descriptor.format,
+            filter: params.filter,
+            swizzle,
+            texture_id,
+            eviction_notice: None,
+            uv_rect_kind: params.uv_rect_kind,
+            shader: params.shader
+        }
     }
 
     // Returns true if the given image descriptor *may* be
@@ -1159,6 +1124,41 @@
         allowed_in_shared_cache
     }
 
+    /// Allocate a render target via the pending updates sent to the renderer
+    pub fn alloc_render_target(
+        &mut self,
+        size: DeviceIntSize,
+        num_layers: usize,
+        format: ImageFormat,
+    ) -> CacheTextureId {
+        let texture_id = self.next_id;
+        self.next_id.0 += 1;
+
+        // Push a command to allocate device storage of the right size / format.
+        let info = TextureCacheAllocInfo {
+            target: ImageBufferKind::Texture2DArray,
+            width: size.width,
+            height: size.height,
+            format,
+            filter: TextureFilter::Linear,
+            layer_count: num_layers as i32,
+            is_shared_cache: false,
+            has_depth: false,
+        };
+
+        self.pending_updates.push_alloc(texture_id, info);
+
+        texture_id
+    }
+
+    /// Free an existing render target
+    pub fn free_render_target(
+        &mut self,
+        id: CacheTextureId,
+    ) {
+        self.pending_updates.push_free(id);
+    }
+
     /// Allocates a new standalone cache entry.
     fn allocate_standalone_entry(
         &mut self,
@@ -1169,6 +1169,7 @@
 
         // Push a command to allocate device storage of the right size / format.
         let info = TextureCacheAllocInfo {
+            target: ImageBufferKind::Texture2D,
             width: params.descriptor.size.width,
             height: params.descriptor.size.height,
             format: params.descriptor.format,
@@ -1275,11 +1276,11 @@
     }
 
     pub fn shared_alpha_expected_format(&self) -> ImageFormat {
-        self.shared_textures.array_alpha8_linear.formats.external
+        self.shared_textures.alpha8_linear.formats.external
     }
 
     pub fn shared_color_expected_format(&self) -> ImageFormat {
-        self.shared_textures.array_color8_linear.formats.external
+        self.shared_textures.color8_linear.formats.external
     }
 
 
@@ -1288,212 +1289,107 @@
     }
 }
 
+/// A number of 2D textures (single layer), each with a number of
+/// regions that can act as a slab allocator.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-#[derive(Copy, Clone, PartialEq)]
-struct SlabSize {
-    width: i32,
-    height: i32,
-}
-
-impl SlabSize {
-    fn new(size: DeviceIntSize) -> Self {
-        let x_size = quantize_dimension(size.width);
-        let y_size = quantize_dimension(size.height);
-
-        assert!(x_size > 0 && x_size <= TEXTURE_REGION_DIMENSIONS);
-        assert!(y_size > 0 && y_size <= TEXTURE_REGION_DIMENSIONS);
-
-        let (width, height) = match (x_size, y_size) {
-            // Special cased rectangular slab pages.
-            (512, 0..=64) => (512, 64),
-            (512, 128) => (512, 128),
-            (512, 256) => (512, 256),
-            (0..=64, 512) => (64, 512),
-            (128, 512) => (128, 512),
-            (256, 512) => (256, 512),
-
-            // If none of those fit, use a square slab size.
-            (x_size, y_size) => {
-                let square_size = cmp::max(x_size, y_size);
-                (square_size, square_size)
-            }
-        };
-
-        SlabSize {
-            width,
-            height,
-        }
-    }
-
-    fn size_in_bytes(&self, format: ImageFormat) -> usize {
-        let bpp = format.bytes_per_pixel();
-        (self.width * self.height * bpp) as usize
-    }
-
-    fn invalid() -> SlabSize {
-        SlabSize {
-            width: 0,
-            height: 0,
-        }
-    }
-}
-
-// The x/y location within a texture region of an allocation.
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-struct TextureLocation(u8, u8);
-
-impl TextureLocation {
-    fn new(x: i32, y: i32) -> Self {
-        debug_assert!(x >= 0 && y >= 0 && x < 0x100 && y < 0x100);
-        TextureLocation(x as u8, y as u8)
-    }
-}
-
-/// A region corresponds to a layer in a shared cache texture.
-///
-/// All allocations within a region are of the same size.
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-struct TextureRegion {
-    layer_index: usize,
-    slab_size: SlabSize,
-    free_slots: Vec<TextureLocation>,
-    total_slot_count: usize,
-}
-
-impl TextureRegion {
-    fn new(layer_index: usize) -> Self {
-        TextureRegion {
-            layer_index,
-            slab_size: SlabSize::invalid(),
-            free_slots: Vec::new(),
-            total_slot_count: 0,
-        }
-    }
-
-    // Initialize a region to be an allocator for a specific slab size.
-    fn init(&mut self, slab_size: SlabSize, empty_regions: &mut usize) {
-        debug_assert!(self.slab_size == SlabSize::invalid());
-        debug_assert!(self.free_slots.is_empty());
-
-        self.slab_size = slab_size;
-        let slots_per_x_axis = TEXTURE_REGION_DIMENSIONS / self.slab_size.width;
-        let slots_per_y_axis = TEXTURE_REGION_DIMENSIONS / self.slab_size.height;
-
-        // Add each block to a freelist.
-        for y in 0 .. slots_per_y_axis {
-            for x in 0 .. slots_per_x_axis {
-                self.free_slots.push(TextureLocation::new(x, y));
-            }
-        }
-
-        self.total_slot_count = self.free_slots.len();
-        *empty_regions -= 1;
-    }
-
-    // Deinit a region, allowing it to become a region with
-    // a different allocator size.
-    fn deinit(&mut self, empty_regions: &mut usize) {
-        self.slab_size = SlabSize::invalid();
-        self.free_slots.clear();
-        self.total_slot_count = 0;
-        *empty_regions += 1;
-    }
-
-    fn is_empty(&self) -> bool {
-        self.slab_size == SlabSize::invalid()
-    }
-
-    // Attempt to allocate a fixed size block from this region.
-    fn alloc(&mut self) -> Option<DeviceIntPoint> {
-        debug_assert!(self.slab_size != SlabSize::invalid());
-
-        self.free_slots.pop().map(|location| {
-            DeviceIntPoint::new(
-                self.slab_size.width * location.0 as i32,
-                self.slab_size.height * location.1 as i32,
-            )
-        })
-    }
-
-    // Free a block in this region.
-    fn free(&mut self, point: DeviceIntPoint, empty_regions: &mut usize) {
-        let x = point.x / self.slab_size.width;
-        let y = point.y / self.slab_size.height;
-        self.free_slots.push(TextureLocation::new(x, y));
-
-        // If this region is completely unused, deinit it
-        // so that it can become a different slab size
-        // as required.
-        if self.free_slots.len() == self.total_slot_count {
-            self.deinit(empty_regions);
-        }
-    }
-}
-
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-struct TextureArrayUnit {
+struct TextureUnit {
+    allocator: SlabAllocator,
     texture_id: CacheTextureId,
-    regions: Vec<TextureRegion>,
-    empty_regions: usize,
 }
 
-impl TextureArrayUnit {
-    /// Adds a new empty region to the array.
-    fn push_regions(&mut self, count: i32) {
-        assert!(self.empty_regions <= self.regions.len());
-        for _ in 0..count {
-            let index = self.regions.len();
-            self.regions.push(TextureRegion::new(index));
-            self.empty_regions += 1;
-        }
-    }
-
-    /// Returns true if we can allocate the given entry.
-    fn can_alloc(&self, slab_size: SlabSize) -> bool {
-        self.empty_regions != 0 || self.regions.iter().any(|region| {
-            region.slab_size == slab_size && !region.free_slots.is_empty()
-        })
-    }
-
-    fn is_empty(&self) -> bool {
-        self.empty_regions == self.regions.len()
-    }
-}
-
-/// A texture array contains a number of textures, each with a number of
-/// layers, where each layer contains a region that can act as a slab allocator.
+/// A number of 2D textures (single layer), each with a number of
+/// regions that can act as a slab allocator.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-struct TextureArray {
+struct TextureUnits {
     filter: TextureFilter,
     formats: TextureFormatPair<ImageFormat>,
-    units: SmallVec<[TextureArrayUnit; 1]>,
-    layers_per_allocation: i32,
+    units: SmallVec<[TextureUnit; 1]>,
+    size: i32,
+    region_size: i32,
+    slab_sizes: SlabSizes,
 }
 
-impl TextureArray {
+impl TextureUnits {
     fn new(
         formats: TextureFormatPair<ImageFormat>,
         filter: TextureFilter,
-        layers_per_allocation: i32,
+        size: i32,
+        region_size: i32,
+        slab_sizes: SlabSizes,
     ) -> Self {
-        TextureArray {
+        TextureUnits {
             formats,
             filter,
             units: SmallVec::new(),
-            layers_per_allocation,
+            size,
+            region_size,
+            slab_sizes,
         }
     }
 
     /// Returns the number of GPU bytes consumed by this texture array.
     fn size_in_bytes(&self) -> usize {
         let bpp = self.formats.internal.bytes_per_pixel() as usize;
-        let num_regions: usize = self.units.iter().map(|u| u.regions.len()).sum();
-        num_regions * TEXTURE_REGION_PIXELS * bpp
+        (self.size * self.size) as usize * bpp
+    }
+
+    fn add_texture(&mut self, texture_id: CacheTextureId) -> usize {
+
+        let unit_index = self.units.len();
+        self.units.push(TextureUnit {
+            allocator: SlabAllocator::new(self.size, self.region_size, self.slab_sizes),
+            texture_id,
+        });
+
+        unit_index
+    }
+
+    /// Returns the texture id, region index and allocated rect.
+    ///
+    /// Adds a new texture if there's no spot available.
+    fn allocate(
+        &mut self,
+        requested_size: DeviceIntSize,
+        pending_updates: &mut TextureUpdateList,
+        next_id: &mut CacheTextureId,
+    ) -> (CacheTextureId, AllocId, DeviceIntRect) {
+        let mut allocation = None;
+        for unit in &mut self.units {
+            if let Some((alloc_id, rect)) = unit.allocator.allocate(requested_size) {
+                allocation = Some((unit.texture_id, alloc_id, rect));
+                break;
+            }
+        }
+
+        allocation.unwrap_or_else(|| {
+            let texture_id = *next_id;
+            next_id.0 += 1;
+
+            pending_updates.push_alloc(
+                texture_id,
+                TextureCacheAllocInfo {
+                    target: ImageBufferKind::Texture2D,
+                    width: self.size,
+                    height: self.size,
+                    format: self.formats.internal,
+                    filter: self.filter,
+                    layer_count: 1,
+                    is_shared_cache: true,
+                    has_depth: false,
+                },
+            );
+
+            let unit_index = self.add_texture(texture_id);
+
+            let (alloc_id, rect) = self.units[unit_index]
+                .allocator
+                .allocate(requested_size)
+                .unwrap();
+
+            (texture_id, alloc_id, rect)
+        })
     }
 
     fn clear(&mut self, updates: &mut TextureUpdateList) {
@@ -1504,7 +1400,7 @@
 
     fn release_empty_textures(&mut self, updates: &mut TextureUpdateList) {
         self.units.retain(|unit| {
-            if unit.is_empty() {
+            if unit.allocator.is_empty() {
                 updates.push_free(unit.texture_id);
 
                 false
@@ -1515,96 +1411,24 @@
     }
 
     fn update_profile(&self, count_idx: usize, mem_idx: usize, profile: &mut TransactionProfile) {
-        let num_regions: usize = self.units.iter().map(|u| u.regions.len()).sum();
+        let num_regions: usize = self.units.iter().map(|u| u.allocator.num_regions()).sum();
         profile.set(count_idx, num_regions);
         profile.set(mem_idx, profiler::bytes_to_mb(self.size_in_bytes()));
     }
 
-    /// Allocate space in this texture array.
-    fn alloc(
-        &mut self,
-        params: &CacheAllocParams,
-        unit_index: usize,
-        now: FrameStamp,
-        swizzle: Swizzle,
-        shader: TargetShader,
-    ) -> CacheEntry {
-        // Quantize the size of the allocation to select a region to
-        // allocate from.
-        let slab_size = SlabSize::new(params.descriptor.size);
-        let unit = &mut self.units[unit_index];
-
-        // TODO(gw): For simplicity, the initial implementation just
-        //           has a single vec<> of regions. We could easily
-        //           make this more efficient by storing a list of
-        //           regions for each slab size specifically...
-
-        // Keep track of the location of an empty region,
-        // in case we need to select a new empty region
-        // after the loop.
-        let mut empty_region_index = None;
-        let mut entry_details = None;
-
-        // Run through the existing regions of this size, and see if
-        // we can find a free block in any of them.
-        for (i, region) in unit.regions.iter_mut().enumerate() {
-            if region.is_empty() {
-                empty_region_index = Some(i);
-            } else if region.slab_size == slab_size {
-                if let Some(location) = region.alloc() {
-                    entry_details = Some(EntryDetails::Cache {
-                        layer_index: region.layer_index,
-                        origin: location,
-                    });
-                    break;
-                }
-            }
-        }
-
-        // Find a region of the right size and try to allocate from it.
-        let details = match entry_details {
-            Some(details) => details,
-            None => {
-                let region = &mut unit.regions[empty_region_index.unwrap()];
-                region.init(slab_size, &mut unit.empty_regions);
-                EntryDetails::Cache {
-                    layer_index: region.layer_index,
-                    origin: region.alloc().unwrap(),
-                }
-            }
-        };
-
-        CacheEntry {
-            size: params.descriptor.size,
-            user_data: params.user_data,
-            last_access: now,
-            details,
-            uv_rect_handle: GpuCacheHandle::new(),
-            input_format: params.descriptor.format,
-            filter: self.filter,
-            swizzle,
-            texture_id: unit.texture_id,
-            eviction_notice: None,
-            uv_rect_kind: params.uv_rect_kind,
-            shader
-        }
-    }
-
-
     #[allow(dead_code)]
     pub fn dump_as_svg(&self, output: &mut dyn std::io::Write) -> std::io::Result<()> {
         use svg_fmt::*;
+        use euclid::default::Box2D;
 
         let num_arrays = self.units.len() as f32;
-        let num_layers = self.layers_per_allocation as f32;
 
         let text_spacing = 15.0;
-        let array_spacing = 60.0;
-        let layer_spacing = 10.0;
-        let layer_size = 100.0;
+        let unit_spacing = 30.0;
+        let texture_size = self.size as f32 / 2.0;
 
-        let svg_w = array_spacing * 2.0 + num_layers * (layer_size + layer_spacing);
-        let svg_h = layer_spacing * 2.0 + num_arrays * (text_spacing * 2.0 + array_spacing + layer_size);
+        let svg_w = unit_spacing * 2.0 + texture_size;
+        let svg_h = unit_spacing + num_arrays * (texture_size + text_spacing + unit_spacing);
 
         writeln!(output, "{}", BeginSvg { w: svg_w, h: svg_h })?;
 
@@ -1616,49 +1440,21 @@
                 .fill(rgb(50, 50, 50))
         )?;
 
-        let mut x = array_spacing;
-        let mut y = array_spacing;
+        let mut y = unit_spacing;
         for unit in &self.units {
-            writeln!(output, "    {}", text(x, y, format!("{:?}", unit.texture_id)).color(rgb(230, 230, 230)))?;
-            for region in &unit.regions {
-                let slab_size = region.slab_size;
-
-                let y = y + text_spacing;
-
-                let region_text = if slab_size.width == 0 {
-                    "(empty)".to_string()
-                } else {
-                    format!("{}x{}", slab_size.width, slab_size.height)
-                };
+            writeln!(output, "    {}", text(unit_spacing, y, format!("{:?}", unit.texture_id)).color(rgb(230, 230, 230)))?;
 
-                writeln!(output, "    {}", text(x, y, region_text).color(rgb(230, 230, 230)))?;
-
-                let y = y + text_spacing;
-
-                // Texture array layer.
-                let layer_background = if region.is_empty() { rgb(30, 30, 30) } else { rgb(40, 40, 130) };
-                writeln!(output, "    {}", rectangle(x, y, layer_size, layer_size).inflate(1.0, 1.0).fill(rgb(10, 10, 10)))?;
-                writeln!(output, "    {}", rectangle(x, y, layer_size, layer_size).fill(layer_background))?;
-
-                let sw = (slab_size.width as f32 / 512.0) * layer_size;
-                let sh = (slab_size.height as f32 / 512.0) * layer_size;
-
-                for slot in &region.free_slots {
-                    let sx = x + slot.0 as f32 * sw;
-                    let sy = y + slot.1 as f32 * sh;
-
-                    // Allocation slot.
-                    writeln!(output, "    {}", rectangle(sx, sy, sw, sh).inflate(-0.5, -0.5).fill(rgb(30, 30, 30)))?;
-                }
+            let rect = Box2D {
+                min: point2(unit_spacing, y),
+                max: point2(unit_spacing + texture_size, y + texture_size),
+            };
 
-                x += layer_spacing + layer_size;
-            }
+            unit.allocator.dump_as_svg(&rect, output)?;
 
-            y += array_spacing + layer_size;
-            x = array_spacing;
+            y += unit_spacing + texture_size + text_spacing;
         }
 
-        writeln!(output, "{}", EndSvg)
+        writeln!(output, "{}", EndSvg)  
     }
 }
 
@@ -1686,6 +1482,7 @@
 impl WholeTextureArray {
     fn to_info(&self) -> TextureCacheAllocInfo {
         TextureCacheAllocInfo {
+            target: ImageBufferKind::Texture2DArray,
             width: self.size.width,
             height: self.size.height,
             format: self.format,
@@ -1764,7 +1561,6 @@
         descriptor: &ImageDescriptor,
         origin: DeviceIntPoint,
         size: DeviceIntSize,
-        layer_index: i32,
         use_upload_format: bool,
         dirty_rect: &ImageDirtyRect,
     ) -> TextureCacheUpdate {
@@ -1814,7 +1610,7 @@
                     stride: Some(stride),
                     offset,
                     format_override,
-                    layer_index,
+                    layer_index: 0,
                 }
             }
             DirtyRect::All => {
@@ -1824,22 +1620,9 @@
                     stride: descriptor.stride,
                     offset: descriptor.offset,
                     format_override,
-                    layer_index,
+                    layer_index: 0,
                 }
             }
         }
     }
 }
-
-fn quantize_dimension(size: i32) -> i32 {
-    match size {
-        0 => unreachable!(),
-        1..=16 => 16,
-        17..=32 => 32,
-        33..=64 => 64,
-        65..=128 => 128,
-        129..=256 => 256,
-        257..=512 => 512,
-        _ => panic!("Invalid dimensions for cache!"),
-    }
-}
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender_api/src/image.rs firefox-85.0+build1/gfx/wr/webrender_api/src/image.rs
--- firefox-84.0.2+build1/gfx/wr/webrender_api/src/image.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender_api/src/image.rs	2021-01-18 19:58:11.000000000 +0000
@@ -102,26 +102,26 @@
 
 /// Specifies the type of texture target in driver terms.
 #[repr(u8)]
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum TextureTarget {
+#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
+pub enum ImageBufferKind {
     /// Standard texture. This maps to GL_TEXTURE_2D in OpenGL.
-    Default = 0,
-    /// Array texture. This maps to GL_TEXTURE_2D_ARRAY in OpenGL. See
-    /// https://www.khronos.org/opengl/wiki/Array_Texture for background
-    /// on Array textures.
-    Array = 1,
+    Texture2D = 0,
     /// Rectangle texture. This maps to GL_TEXTURE_RECTANGLE in OpenGL. This
     /// is similar to a standard texture, with a few subtle differences
     /// (no mipmaps, non-power-of-two dimensions, different coordinate space)
     /// that make it useful for representing the kinds of textures we use
     /// in WebRender. See https://www.khronos.org/opengl/wiki/Rectangle_Texture
     /// for background on Rectangle textures.
-    Rect = 2,
+    TextureRect = 1,
     /// External texture. This maps to GL_TEXTURE_EXTERNAL_OES in OpenGL, which
     /// is an extension. This is used for image formats that OpenGL doesn't
     /// understand, particularly YUV. See
     /// https://www.khronos.org/registry/OpenGL/extensions/OES/OES_EGL_image_external.txt
-    External = 3,
+    TextureExternal = 2,
+    /// Array texture. This maps to GL_TEXTURE_2D_ARRAY in OpenGL. See
+    /// https://www.khronos.org/opengl/wiki/Array_Texture for background
+    /// on Array textures.
+    Texture2DArray = 3,
 }
 
 /// Storage format identifier for externally-managed images.
@@ -129,7 +129,7 @@
 #[derive(Debug, Copy, Clone, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum ExternalImageType {
     /// The image is texture-backed.
-    TextureHandle(TextureTarget),
+    TextureHandle(ImageBufferKind),
     /// The image is heap-allocated by the embedding.
     Buffer,
 }
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender_api/src/lib.rs firefox-85.0+build1/gfx/wr/webrender_api/src/lib.rs
--- firefox-84.0.2+build1/gfx/wr/webrender_api/src/lib.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender_api/src/lib.rs	2021-01-18 19:58:12.000000000 +0000
@@ -199,7 +199,10 @@
     fn clone(&self) -> Box<dyn RenderNotifier>;
     /// Wake the thread containing the `Renderer` up (after updates have been put
     /// in the renderer's queue).
-    fn wake_up(&self);
+    fn wake_up(
+        &self,
+        composite_needed: bool,
+    );
     /// Notify the thread containing the `Renderer` that a new frame is ready.
     fn new_frame_ready(&self, _: DocumentId, scrolled: bool, composite_needed: bool, render_time_ns: Option<u64>);
     /// A Gecko-specific notification mechanism to get some code executed on the
diff -Nru firefox-84.0.2+build1/gfx/wr/webrender_build/src/shader_features.rs firefox-85.0+build1/gfx/wr/webrender_build/src/shader_features.rs
--- firefox-84.0.2+build1/gfx/wr/webrender_build/src/shader_features.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/webrender_build/src/shader_features.rs	2021-01-18 19:58:12.000000000 +0000
@@ -12,10 +12,9 @@
 
         const ADVANCED_BLEND_EQUATION = 1 << 8;
         const DUAL_SOURCE_BLENDING = 1 << 9;
-        const PIXEL_LOCAL_STORAGE = 1 << 10;
-        const DITHERING = 1 << 11;
-        const TEXTURE_EXTERNAL = 1 << 12;
-        const DEBUG = 1 << 13;
+        const DITHERING = 1 << 10;
+        const TEXTURE_EXTERNAL = 1 << 11;
+        const DEBUG = 1 << 12;
     }
 }
 
@@ -35,7 +34,7 @@
     }
 
     fn add(&mut self, feature: &'a str) {
-        assert!(!feature.contains(","));
+        assert!(!feature.contains(','));
         self.list.push(feature);
     }
 
@@ -54,7 +53,7 @@
     }
 
     fn finish(&mut self) -> String {
-        self.list.sort();
+        self.list.sort_unstable();
         self.list.join(",")
     }
 }
@@ -65,9 +64,8 @@
 
     // Clip shaders
     shaders.insert("cs_clip_rectangle", vec![String::new(), "FAST_PATH".to_string()]);
-    for name in &["cs_clip_image", "cs_clip_box_shadow"] {
-        shaders.insert(name, vec![String::new()]);
-    }
+    shaders.insert("cs_clip_image", vec!["TEXTURE_2D".to_string()]);
+    shaders.insert("cs_clip_box_shadow", vec!["TEXTURE_2D".to_string()]);
 
     // Cache shaders
     shaders.insert("cs_blur", vec!["ALPHA_TARGET".to_string(), "COLOR_TARGET".to_string()]);
@@ -78,16 +76,6 @@
 
     let mut base_prim_features = FeatureList::new();
 
-    // Pixel local storage shaders
-    if flags.contains(ShaderFeatureFlags::PIXEL_LOCAL_STORAGE) {
-        let feature = "PIXEL_LOCAL_STORAGE";
-        for name in &["pls_init", "pls_resolve"] {
-            shaders.insert(name, vec![feature.to_string()]);
-        }
-
-        base_prim_features.add(feature);
-    }
-
     // Brush shaders
     let mut brush_alpha_features = base_prim_features.with("ALPHA_PASS");
     for name in &["brush_solid", "brush_blend", "brush_mix_blend"] {
@@ -186,7 +174,7 @@
     }
     let mut text_features: Vec<String> = Vec::new();
     for text_type in &text_types {
-        let mut list = base_prim_features.clone();
+        let mut list = base_prim_features.with("TEXTURE_2D");
         if !text_type.is_empty() {
             list.add(text_type);
         }
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/android.txt firefox-85.0+build1/gfx/wr/wrench/android.txt
--- firefox-84.0.2+build1/gfx/wr/wrench/android.txt	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/android.txt	2021-01-18 19:58:11.000000000 +0000
@@ -10,9 +10,10 @@
     - Install both the i686-linux-android and armv7-linux-androideabi rust
       targets, as the APK will include native libraries with both architectures.
 
-    - Don't install currently published version of cargo-apk (it doesn't support newer NDKs).
-      Instead, install the git master version like so:
-        cargo install --git https://github.com/rust-windowing/android-rs-glue cargo-apk
+    - Don't install currently published version of cargo-apk as it doesn't work with the
+      version of winit and glutin we are using.
+      Instead, install the git master version of our fork like so:
+        cargo install --git https://github.com/jamienicol/android-rs-glue cargo-apk
 
     - Consider adding ~/.mozbuild/android-sdk-linux/platform-tools to your path, for the adb commands below.
 
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/Cargo.toml firefox-85.0+build1/gfx/wr/wrench/Cargo.toml
--- firefox-84.0.2+build1/gfx/wr/wrench/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/Cargo.toml	2021-01-18 19:58:11.000000000 +0000
@@ -43,7 +43,7 @@
 
 [target.'cfg(target_os = "windows")'.dependencies]
 dwrote = "0.11"
-mozangle = { version = "0.3.1", features = ["egl"] }
+mozangle = { version = "0.3.2", features = ["egl"] }
 
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
 font-loader = "0.11"
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/invalidation/composite_nop_1.yaml firefox-85.0+build1/gfx/wr/wrench/invalidation/composite_nop_1.yaml
--- firefox-84.0.2+build1/gfx/wr/wrench/invalidation/composite_nop_1.yaml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/invalidation/composite_nop_1.yaml	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,6 @@
+---
+root:
+  items:
+    - type: rect
+      color: red
+      bounds: 100 100 100 100
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/invalidation/composite_nop_2.yaml firefox-85.0+build1/gfx/wr/wrench/invalidation/composite_nop_2.yaml
--- firefox-84.0.2+build1/gfx/wr/wrench/invalidation/composite_nop_2.yaml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/invalidation/composite_nop_2.yaml	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,6 @@
+---
+root:
+  items:
+    - type: rect
+      color: red
+      bounds: 100 120 100 100
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/border/border-suite-2.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/border/border-suite-2.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/border/border-suite.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/border/border-suite.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/border/dotted-corner-small-radius.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/border/dotted-corner-small-radius.png differ
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/border/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/border/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/border/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/border/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -21,7 +21,7 @@
 platform(linux,mac) == border-image-round.yaml border-image-round-ref.png
 == border-image-crash.yaml border-image-crash-ref.yaml
 fuzzy(1,5000) == border-image-fill.yaml border-image-fill-ref.png
-fuzzy(2,25326) == border-image-fill-2.yaml border-image-fill-2-ref.png
+fuzzy(2,25360) == border-image-fill-2.yaml border-image-fill-2-ref.png
 == border-no-bogus-line.yaml border-no-bogus-line-ref.png
 platform(linux,mac) == dotted-corner-small-radius.yaml dotted-corner-small-radius.png
 fuzzy-if(platform(swgl),1,20) == overlapping.yaml overlapping.png
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/boxshadow/box-shadow-large-blur-radius-3.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/boxshadow/box-shadow-large-blur-radius-3.png differ
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/filters/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/filters/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/filters/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/filters/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -60,7 +60,7 @@
 platform(linux,mac) == fuzzy(5,35250) svg-filter-drop-shadow-rotate.yaml svg-filter-drop-shadow-rotate-ref.yaml
 platform(linux,mac) fuzzy(3,3184) == svg-filter-blur-transforms.yaml svg-filter-blur-transforms.png
 platform(linux,mac) == svg-filter-drop-shadow-on-viewport-edge.yaml svg-filter-drop-shadow-on-viewport-edge.png
-platform(linux,mac) == svg-filter-drop-shadow-perspective.yaml svg-filter-drop-shadow-perspective.png
+fuzzy(1,1) platform(linux,mac) == svg-filter-drop-shadow-perspective.yaml svg-filter-drop-shadow-perspective.png
 == backdrop-filter-basic.yaml backdrop-filter-basic-ref.yaml
 platform(linux,mac) == backdrop-filter-perspective.yaml backdrop-filter-perspective.png
 platform(linux,max) == svg-filter-offset.yaml svg-filter-offset-ref.yaml
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/gradient/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/gradient/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/gradient/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/gradient/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -1,5 +1,5 @@
 platform(linux,mac) == premultiplied-aligned.yaml premultiplied-aligned.png
-platform(linux,mac) == premultiplied-angle.yaml premultiplied-angle.png
+fuzzy(1,500) platform(linux,mac) == premultiplied-angle.yaml premultiplied-angle.png
 platform(linux,mac) == premultiplied-radial.yaml premultiplied-radial.png
 platform(linux,mac) == premultiplied-conic.yaml premultiplied-conic.png
 
@@ -67,7 +67,7 @@
 
 fuzzy(1,17) == tiling-conic-1.yaml tiling-conic-1-ref.yaml
 fuzzy(1,1) == tiling-conic-2.yaml tiling-conic-2-ref.yaml
-fuzzy(1,3) == tiling-conic-3.yaml tiling-conic-3-ref.yaml
+fuzzy(1,7) == tiling-conic-3.yaml tiling-conic-3-ref.yaml
 
 == radial-zero-size-1.yaml radial-zero-size-ref.yaml
 == radial-zero-size-2.yaml radial-zero-size-ref.yaml
@@ -81,7 +81,7 @@
 
 == conic.yaml conic-ref.yaml
 fuzzy(1,57) == conic-simple.yaml conic-simple.png
-fuzzy(255,166) == conic-angle.yaml conic-angle.png
+fuzzy(255,302) == conic-angle.yaml conic-angle.png
 == conic-center.yaml conic-center.png
 fuzzy(1,2) == conic-angle-wraparound.yaml conic-angle.yaml
 fuzzy(1,1) == conic-angle-wraparound-negative.yaml conic-angle.yaml
@@ -93,7 +93,7 @@
 fuzzy-range(<=1,*195000) == gradient_cache_5stops.yaml gradient_cache_5stops_ref.yaml
 fuzzy-range(<=1,*171840) == gradient_cache_5stops_vertical.yaml gradient_cache_5stops_vertical_ref.yaml
 == gradient_cache_hardstop.yaml gradient_cache_hardstop_ref.yaml
-== gradient_cache_hardstop_clip.yaml gradient_cache_hardstop_clip_ref.yaml
+fuzzy-range(<=1,1) == gradient_cache_hardstop_clip.yaml gradient_cache_hardstop_clip_ref.yaml
 == gradient_cache_clamp.yaml gradient_cache_clamp_ref.yaml
 == gradient_cache_repeat.yaml gradient_cache_repeat_ref.yaml
 
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/image/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/image/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/image/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/image/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -6,9 +6,10 @@
 platform(linux,mac) options(allow-mipmaps) == downscale.yaml downscale.png
 skip_on(android,device) fuzzy-if(platform(swgl),1,20) == segments.yaml segments.png
 platform(linux,mac) == yuv.yaml yuv.png
+platform(linux,mac) fuzzy(1,6000) fuzzy-if(platform(swgl),1,205000) == yuv-clip.yaml yuv.png
 skip_on(android,device) == tiled-clip-chain.yaml tiled-clip-chain-ref.yaml
 skip_on(android,device) == tiled-complex-clip.yaml tiled-complex-clip-ref.yaml
 platform(linux,mac) == texture-rect.yaml texture-rect-ref.yaml
 platform(linux) == occlusion.yaml occlusion.png
 # allow slight lerp change where the squares meet, but catch lerping problems on the boundary (should clamp)
-fuzzy-range(<=1,*450) == rgb_composite.yaml rgb_composite_ref.yaml
+fuzzy-range(<=2,*450) == rgb_composite.yaml rgb_composite_ref.yaml
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/image/yuv-clip.yaml firefox-85.0+build1/gfx/wr/wrench/reftests/image/yuv-clip.yaml
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/image/yuv-clip.yaml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/image/yuv-clip.yaml	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,24 @@
+root:
+  items:
+    - type: clip
+      bounds: [0, 0, 1314, 650]
+      complex:
+            - rect: [0, 0, 1314, 650]
+      items:
+        - type: yuv-image
+          format: planar
+          src-y: spacex-y.png
+          src-u: spacex-u.png
+          src-v: spacex-v.png
+          bounds: [10, 10, 427, 640]
+
+        - type: yuv-image
+          format: interleaved
+          src: spacex-yuv.png
+          bounds: [447, 10, 427, 640]
+
+        - type: yuv-image
+          format: nv12
+          src-y: spacex-y.png
+          src-uv: spacex-uv.png
+          bounds: [887, 10, 427, 640]
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/text/decorations-suite.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/text/decorations-suite.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/text/raster-space.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/text/raster-space.png differ
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/text/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/text/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/text/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/text/reftest.list	2021-01-18 19:58:12.000000000 +0000
@@ -14,9 +14,9 @@
 != shadow-clipped-text.yaml blank.yaml
 != non-opaque.yaml non-opaque-notref.yaml
 == decorations.yaml decorations-ref.yaml
-skip_on(android,device) fuzzy(1,3001) fuzzy-if(platform(swgl),3,13867) == decorations-suite.yaml decorations-suite.png  # Fails on Pixel2
+skip_on(android,device) fuzzy(1,3001) fuzzy-if(platform(swgl),3,14624) == decorations-suite.yaml decorations-suite.png  # Fails on Pixel2
 == 1658.yaml 1658-ref.yaml
-fuzzy(1,6) fuzzy-if(platform(swgl),1,391) == split-batch.yaml split-batch-ref.yaml
+fuzzy(1,393) == split-batch.yaml split-batch-ref.yaml
 # Next 3 tests affected by bug 1548099 on Android
 skip_on(android) == shadow-red.yaml shadow-red-ref.yaml
 skip_on(android) fuzzy(1,999) fuzzy-if(platform(swgl),2,1081) == shadow-grey.yaml shadow-grey-ref.yaml
@@ -61,7 +61,7 @@
 == shadow-clip.yaml shadow-clip-ref.yaml
 == shadow-fast-clip.yaml shadow-fast-clip-ref.yaml
 skip_on(android,device) == shadow-partial-glyph.yaml shadow-partial-glyph-ref.yaml  # Fails on Pixel2
-fuzzy(1,120) platform(linux) == shadow-transforms.yaml shadow-transforms.png
+fuzzy(2,120) platform(linux) == shadow-transforms.yaml shadow-transforms.png
 fuzzy(1,200) platform(linux) == raster-space.yaml raster-space.png
 skip_on(android) skip_on(mac,>=10.14) != allow-subpixel.yaml allow-subpixel-ref.yaml  # Android: we don't enable sub-px aa on this platform.
 skip_on(android,device) == bg-color.yaml bg-color-ref.yaml  # Fails on Pixel2
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/text/shadow-transforms.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/text/shadow-transforms.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/near-plane-clip.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/near-plane-clip.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/nested-preserve-3d.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/nested-preserve-3d.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/nested-rotate-x-flat.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/nested-rotate-x-flat.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/nested-rotate-x.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/nested-rotate-x.png differ
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/reftest.list firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/reftest.list
--- firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -14,7 +14,7 @@
 platform(linux,mac) fuzzy(1,5) zoom(4) == border-zoom.yaml border-zoom.png
 platform(linux) fuzzy(1,520) == perspective-origin.yaml perspective-origin.png
 platform(linux,mac) color_targets(3) alpha_targets(0) fuzzy(1,180) == screen-space-blit.yaml screen-space-blit.png
-platform(linux,mac) fuzzy(1,331) color_targets(2) alpha_targets(0) == screen-space-blit-trivial.yaml screen-space-blit-trivial.png
+platform(linux,mac) fuzzy(1,346) color_targets(2) alpha_targets(0) == screen-space-blit-trivial.yaml screen-space-blit-trivial.png
 platform(linux) fuzzy(11,4592) == screen-space-blur.yaml screen-space-blur.png
 platform(linux,mac) == nested-rotate-x.yaml nested-rotate-x.png
 platform(linux,mac) != nested-rotate-x.yaml nested-rotate-x-flat.yaml
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/gfx/wr/wrench/reftests/transforms/rotated-image.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/gfx/wr/wrench/reftests/transforms/rotated-image.png differ
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/src/main.rs firefox-85.0+build1/gfx/wr/wrench/src/main.rs
--- firefox-84.0.2+build1/gfx/wr/wrench/src/main.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/src/main.rs	2021-01-18 19:58:12.000000000 +0000
@@ -305,15 +305,15 @@
 }
 
 #[cfg(feature = "software")]
-fn make_software_context() -> Option<swgl::Context> {
+fn make_software_context() -> swgl::Context {
     let ctx = swgl::Context::create();
     ctx.make_current();
-    Some(ctx)
+    ctx
 }
 
 #[cfg(not(feature = "software"))]
-fn make_software_context() -> Option<swgl::Context> {
-    None
+fn make_software_context() -> swgl::Context {
+    panic!("software feature not enabled")
 }
 
 fn make_window(
@@ -326,7 +326,7 @@
     software: bool,
 ) -> WindowWrapper {
     let sw_ctx = if software {
-        make_software_context()
+        Some(make_software_context())
     } else {
         None
     };
@@ -436,7 +436,9 @@
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum NotifierEvent {
-    WakeUp,
+    WakeUp {
+        composite_needed: bool,
+    },
     ShutDown,
 }
 
@@ -452,8 +454,14 @@
         })
     }
 
-    fn wake_up(&self) {
-        self.tx.send(NotifierEvent::WakeUp).unwrap();
+    fn wake_up(
+        &self,
+        composite_needed: bool,
+    ) {
+        let msg = NotifierEvent::WakeUp {
+            composite_needed,
+        };
+        self.tx.send(msg).unwrap();
     }
 
     fn shut_down(&self) {
@@ -463,11 +471,11 @@
     fn new_frame_ready(&self,
                        _: DocumentId,
                        _scrolled: bool,
-                       _composite_needed: bool,
+                       composite_needed: bool,
                        _render_time: Option<u64>) {
         // TODO(gw): Refactor wrench so that it can take advantage of cases
         //           where no composite is required when appropriate.
-        self.wake_up();
+        self.wake_up(composite_needed);
     }
 }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/src/rawtest.rs firefox-85.0+build1/gfx/wr/wrench/src/rawtest.rs
--- firefox-84.0.2+build1/gfx/wr/wrench/src/rawtest.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/src/rawtest.rs	2021-01-18 19:58:11.000000000 +0000
@@ -107,7 +107,7 @@
         );
         epoch.0 += 1;
 
-        txn.generate_frame();
+        txn.generate_frame(0);
         self.wrench.api.send_transaction(self.wrench.document_id, txn);
     }
 
@@ -1239,7 +1239,7 @@
             builder.finalize(),
             false,
         );
-        txn.generate_frame();
+        txn.generate_frame(0);
 
         self.wrench.api.send_transaction(self.wrench.document_id, txn);
 
@@ -1274,7 +1274,7 @@
         // 6. rebuild the scene and compare again
         let mut txn = Transaction::new();
         txn.set_root_pipeline(captured.root_pipeline_id.unwrap());
-        txn.generate_frame();
+        txn.generate_frame(0);
         self.wrench.api.send_transaction(captured.document_id, txn);
         let pixels2 = self.render_and_get_pixels(window_rect);
         self.compare_pixels(pixels0, pixels2, window_rect.size);
@@ -1305,12 +1305,12 @@
             builder.finalize(),
             false,
         );
-        txn.generate_frame();
+        txn.generate_frame(0);
         self.wrench.api.send_transaction(doc_id, txn);
 
         // Ensure we get a notification from rendering the above, even though
         // there are zero visible pixels
-        assert!(self.rx.recv().unwrap() == NotifierEvent::WakeUp);
+        assert!(self.rx.recv().unwrap() == NotifierEvent::WakeUp { composite_needed: true });
     }
 
 
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/src/test_invalidation.rs firefox-85.0+build1/gfx/wr/wrench/src/test_invalidation.rs
--- firefox-84.0.2+build1/gfx/wr/wrench/src/test_invalidation.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/src/test_invalidation.rs	2021-01-18 19:58:12.000000000 +0000
@@ -17,6 +17,11 @@
     rx: Receiver<NotifierEvent>,
 }
 
+struct RenderResult {
+    pc_debug: PictureCacheDebugInfo,
+    composite_needed: bool,
+}
+
 // Convenience method to build a picture rect
 fn pr(x: f32, y: f32, w: f32, h: f32) -> PictureRect {
     PictureRect::new(
@@ -44,6 +49,7 @@
     ) {
         // List all invalidation tests here
         self.test_basic();
+        self.test_composite_nop();
     }
 
     /// Simple validation / proof of concept of invalidation testing
@@ -52,7 +58,7 @@
     ) {
         // Render basic.yaml, ensure that the valid/dirty rects are as expected
         let results = self.render_yaml("basic");
-        let tile_info = results.slice(0).tile(0, 0).as_dirty();
+        let tile_info = results.pc_debug.slice(0).tile(0, 0).as_dirty();
         assert_eq!(
             tile_info.local_valid_rect,
             pr(100.0, 100.0, 500.0, 100.0),
@@ -64,22 +70,60 @@
 
         // Render it again and ensure the tile was considered valid (no rasterization was done)
         let results = self.render_yaml("basic");
-        assert_eq!(*results.slice(0).tile(0, 0), TileDebugInfo::Valid);
+        assert_eq!(*results.pc_debug.slice(0).tile(0, 0), TileDebugInfo::Valid);
+    }
+
+    /// Ensure WR detects composites are needed for position changes within a single tile.
+    fn test_composite_nop(
+        &mut self,
+    ) {
+        // Render composite_nop_1.yaml, ensure that the valid/dirty rects are as expected
+        let results = self.render_yaml("composite_nop_1");
+        let tile_info = results.pc_debug.slice(0).tile(0, 0).as_dirty();
+        assert_eq!(
+            tile_info.local_valid_rect,
+            pr(100.0, 100.0, 100.0, 100.0),
+        );
+        assert_eq!(
+            tile_info.local_dirty_rect,
+            pr(100.0, 100.0, 100.0, 100.0),
+        );
+
+        // Render composite_nop_2.yaml, ensure that the valid/dirty rects are as expected
+        let results = self.render_yaml("composite_nop_2");
+        let tile_info = results.pc_debug.slice(0).tile(0, 0).as_dirty();
+        assert_eq!(
+            tile_info.local_valid_rect,
+            pr(100.0, 120.0, 100.0, 100.0),
+        );
+        assert_eq!(
+            tile_info.local_dirty_rect,
+            pr(100.0, 120.0, 100.0, 100.0),
+        );
+
+        // Main part of this test - ensure WR detects a composite is required in this case
+        assert!(results.composite_needed);
     }
 
     /// Render a YAML file, and return the picture cache debug info
     fn render_yaml(
         &mut self,
         filename: &str,
-    ) -> PictureCacheDebugInfo {
+    ) -> RenderResult {
         let path = format!("invalidation/{}.yaml", filename);
         let mut reader = YamlFrameReader::new(&PathBuf::from(path));
 
         reader.do_frame(self.wrench);
-        self.rx.recv().unwrap();
+        let composite_needed = match self.rx.recv().unwrap() {
+            NotifierEvent::WakeUp { composite_needed } => composite_needed,
+            NotifierEvent::ShutDown => unreachable!(),
+        };
         let results = self.wrench.render();
         self.window.swap_buffers();
 
-        results.picture_cache_debug
+        RenderResult {
+            pc_debug: results.picture_cache_debug,
+            composite_needed,
+        }
     }
 }
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/src/wrench.rs firefox-85.0+build1/gfx/wr/wrench/src/wrench.rs
--- firefox-84.0.2+build1/gfx/wr/wrench/src/wrench.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/src/wrench.rs	2021-01-18 19:58:11.000000000 +0000
@@ -96,7 +96,7 @@
         Box::new(Notifier(self.0.clone()))
     }
 
-    fn wake_up(&self) {
+    fn wake_up(&self, _composite_needed: bool) {
         self.update(false);
     }
 
@@ -606,7 +606,7 @@
             txn.scroll_node_with_id(*offset, *id, ScrollClamping::NoClamping);
         }
 
-        txn.generate_frame();
+        txn.generate_frame(0);
         self.api.send_transaction(self.document_id, txn);
     }
 
@@ -627,7 +627,7 @@
     pub fn refresh(&mut self) {
         self.begin_frame();
         let mut txn = Transaction::new();
-        txn.generate_frame();
+        txn.generate_frame(0);
         self.api.send_transaction(self.document_id, txn);
     }
 
diff -Nru firefox-84.0.2+build1/gfx/wr/wrench/src/yaml_frame_reader.rs firefox-85.0+build1/gfx/wr/wrench/src/yaml_frame_reader.rs
--- firefox-84.0.2+build1/gfx/wr/wrench/src/yaml_frame_reader.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/gfx/wr/wrench/src/yaml_frame_reader.rs	2021-01-18 19:58:11.000000000 +0000
@@ -105,7 +105,7 @@
     pub fn add_image(&mut self,
         device: &webrender::Device,
         desc: ImageDescriptor,
-        target: TextureTarget,
+        target: ImageBufferKind,
         image_data: ImageData,
     ) -> ImageData {
         let (image_id, channel_idx) = match image_data {
@@ -754,13 +754,13 @@
             // ensure it gets created as such
             let external_target = match item["external-target"].as_str() {
                 Some(ref s) => match &s[..] {
-                    "2d" => TextureTarget::Default,
-                    "array" => TextureTarget::Array,
-                    "rect" => TextureTarget::Rect,
+                    "2d" => ImageBufferKind::Texture2D,
+                    "array" => ImageBufferKind::Texture2DArray,
+                    "rect" => ImageBufferKind::TextureRect,
                     _ => panic!("Unsupported external texture target."),
                 }
                 None => {
-                    TextureTarget::Default
+                    ImageBufferKind::Texture2D
                 }
             };
 
diff -Nru firefox-84.0.2+build1/.git-blame-ignore-revs firefox-85.0+build1/.git-blame-ignore-revs
--- firefox-84.0.2+build1/.git-blame-ignore-revs	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/.git-blame-ignore-revs	2021-01-18 19:58:08.000000000 +0000
@@ -1915,3 +1915,12 @@
 # e46822faf5d85ea1ca89fc153aaf5a83ce0418b5 - Ricky Stewart - Bug 1672023 - Remove excluded files from `black.yml`
 f1e360978f1a755728ff09137fc1f78297f09d5c # cinnabar
 210585edd26491e28ecbdc383f7232b95af651fc # gecko-dev
+# e52e5ee6f9d6217f3be04a71ff089148116f8fb0 - Simon Giesecke - Bug 1648010 - Remove NS_NAMED_LITERAL_CSTRING and NS_NAMED_LITERAL_STRING macros. r=froydnj
+33b73e74865afd879307cb3bd3f99082e53fb2cd # cinnabar
+9364b353d4f6b940d780f843d8b6c19380c4aef8 # gecko-dev
+# 3d7ffaefcd5a6c10988a1ecc3b75c3d55e1cd9e2 - Simon Giesecke - Bug 1648010 - Fix uses of NS_LITERAL_STRING with C string literals. r=geckoview-reviewers,agi,froydnj
+93915a549a0f426ad10763023c4cbed88a73d4d2 # cinnabar
+e3c223da3e69fdfbfc5bffa1cb6608f9acc256c6 # gecko-dev
+# 3f8100fb74318f9e0b3b6351ade737994d13bcf8 - Simon Giesecke - Bug 1648010 - Replace uses of NS_LITERAL_STRING/NS_LITERAL_CSTRING macros by _ns literals. r=geckoview-reviewers,jgilbert,agi,hsivonen,froydnj
+fbd56b0ecced359f8239f737a6dfad1a72eb6001 # cinnabar
+cd8b8939b911b3c28c13de23fde7201a8452499b # gecko-dev
diff -Nru firefox-84.0.2+build1/.gitignore firefox-85.0+build1/.gitignore
--- firefox-84.0.2+build1/.gitignore	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/.gitignore	2021-01-18 19:58:08.000000000 +0000
@@ -90,12 +90,6 @@
 # Local Gradle configuration properties.
 /local.properties
 
-# Python virtualenv artifacts.
-third_party/python/psutil/**/*.so
-third_party/python/psutil/**/*.pyd
-third_party/python/psutil/build/
-third_party/python/psutil/tmp/
-
 # Ignore chrome.manifest files from the devtools loader
 devtools/client/chrome.manifest
 devtools/shared/chrome.manifest
diff -Nru firefox-84.0.2+build1/hal/HalSensor.h firefox-85.0+build1/hal/HalSensor.h
--- firefox-84.0.2+build1/hal/HalSensor.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/hal/HalSensor.h	2021-01-18 19:58:12.000000000 +0000
@@ -40,7 +40,7 @@
 }  // namespace hal
 }  // namespace mozilla
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 namespace IPC {
 /**
diff -Nru firefox-84.0.2+build1/hal/HalTypes.h firefox-85.0+build1/hal/HalTypes.h
--- firefox-84.0.2+build1/hal/HalTypes.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/hal/HalTypes.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,7 +6,7 @@
 #ifndef mozilla_hal_Types_h
 #define mozilla_hal_Types_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/Observer.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/hal/HalWakeLock.cpp firefox-85.0+build1/hal/HalWakeLock.cpp
--- firefox-84.0.2+build1/hal/HalWakeLock.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/hal/HalWakeLock.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Hal.h"
+#include "base/process_util.h"
 #include "mozilla/HalWakeLock.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
@@ -12,6 +13,7 @@
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIPropertyBag2.h"
+#include "nsIObserver.h"
 #include "nsIObserverService.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/hal/sandbox/PHal.ipdl firefox-85.0+build1/hal/sandbox/PHal.ipdl
--- firefox-84.0.2+build1/hal/sandbox/PHal.ipdl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/hal/sandbox/PHal.ipdl	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 include protocol PContent;
 include protocol PBrowser;
 
+include "mozilla/dom/ReferrerInfoUtils.h";
 include "mozilla/GfxMessageUtils.h";
 
 using hal::ScreenOrientation from "mozilla/HalScreenConfiguration.h";
diff -Nru firefox-84.0.2+build1/.hg-annotate-ignore-revs firefox-85.0+build1/.hg-annotate-ignore-revs
--- firefox-84.0.2+build1/.hg-annotate-ignore-revs	2021-01-06 11:23:05.000000000 +0000
+++ firefox-85.0+build1/.hg-annotate-ignore-revs	2021-01-18 19:58:07.000000000 +0000
@@ -405,3 +405,6 @@
 9006d6f3cb29754037aa0b5ef4c9b2ae67006459 - Bogdan Tara - Backed out 10 changesets (bug 1654103, bug 1672023, bug 1518999) for PanZoomControllerTest.touchEventForResult gv-junit failures CLOSED TREE
 994ae8e4833c90447d91f0e26a718573cff5a514 - Ricky Stewart - Bug 1654103: Standardize on Black for Python code in `mozilla-central`.
 e46822faf5d85ea1ca89fc153aaf5a83ce0418b5 - Ricky Stewart - Bug 1672023 - Remove excluded files from `black.yml`
+e52e5ee6f9d6217f3be04a71ff089148116f8fb0 - Simon Giesecke - Bug 1648010 - Remove NS_NAMED_LITERAL_CSTRING and NS_NAMED_LITERAL_STRING macros. r=froydnj
+3d7ffaefcd5a6c10988a1ecc3b75c3d55e1cd9e2 - Simon Giesecke - Bug 1648010 - Fix uses of NS_LITERAL_STRING with C string literals. r=geckoview-reviewers,agi,froydnj
+3f8100fb74318f9e0b3b6351ade737994d13bcf8 - Simon Giesecke - Bug 1648010 - Replace uses of NS_LITERAL_STRING/NS_LITERAL_CSTRING macros by _ns literals. r=geckoview-reviewers,jgilbert,agi,hsivonen,froydnj
diff -Nru firefox-84.0.2+build1/image/build/nsImageModule.cpp firefox-85.0+build1/image/build/nsImageModule.cpp
--- firefox-84.0.2+build1/image/build/nsImageModule.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/build/nsImageModule.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,11 +7,13 @@
 #include "nsImageModule.h"
 
 #include "mozilla/ModuleUtils.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_image.h"
 
 #include "DecodePool.h"
 #include "ImageFactory.h"
 #include "nsICategoryManager.h"
+#include "nsServiceManagerUtils.h"
 #include "ShutdownTracker.h"
 #include "SurfaceCache.h"
 #include "imgLoader.h"
diff -Nru firefox-84.0.2+build1/image/ClippedImage.cpp firefox-85.0+build1/image/ClippedImage.cpp
--- firefox-84.0.2+build1/image/ClippedImage.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/ClippedImage.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "ImageRegion.h"
 #include "Orientation.h"
+#include "gfxContext.h"
 #include "gfxDrawable.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
diff -Nru firefox-84.0.2+build1/image/DecodePool.cpp firefox-85.0+build1/image/DecodePool.cpp
--- firefox-84.0.2+build1/image/DecodePool.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/DecodePool.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_image.h"
 #include "mozilla/TaskController.h"
 #include "mozilla/TimeStamp.h"
@@ -22,6 +23,7 @@
 #include "prsystem.h"
 
 #include "Decoder.h"
+#include "GeckoProfiler.h"
 #include "IDecodingTask.h"
 #include "RasterImage.h"
 
diff -Nru firefox-84.0.2+build1/image/decoders/icon/mac/nsIconChannelCocoa.mm firefox-85.0+build1/image/decoders/icon/mac/nsIconChannelCocoa.mm
--- firefox-84.0.2+build1/image/decoders/icon/mac/nsIconChannelCocoa.mm	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/decoders/icon/mac/nsIconChannelCocoa.mm	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsIconChannel.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/EndianUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIIconURI.h"
 #include "nsIInputStream.h"
 #include "nsIInterfaceRequestor.h"
diff -Nru firefox-84.0.2+build1/image/decoders/icon/win/nsIconChannel.cpp firefox-85.0+build1/image/decoders/icon/win/nsIconChannel.cpp
--- firefox-84.0.2+build1/image/decoders/icon/win/nsIconChannel.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/decoders/icon/win/nsIconChannel.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Monitor.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsIconChannel.h"
 #include "nsIIconURI.h"
 #include "nsIInterfaceRequestor.h"
@@ -21,6 +22,7 @@
 #include "nsNetCID.h"
 #include "nsIFile.h"
 #include "nsIFileURL.h"
+#include "nsIInputStream.h"
 #include "nsIMIMEService.h"
 #include "nsCExternalHandlerService.h"
 #include "nsDirectoryServiceDefs.h"
diff -Nru firefox-84.0.2+build1/image/decoders/nsJPEGDecoder.cpp firefox-85.0+build1/image/decoders/nsJPEGDecoder.cpp
--- firefox-84.0.2+build1/image/decoders/nsJPEGDecoder.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/decoders/nsJPEGDecoder.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -441,23 +441,59 @@
       if (mState == JPEG_DECOMPRESS_PROGRESSIVE) {
         LOG_SCOPE((mozilla::LogModule*)sJPEGLog,
                   "nsJPEGDecoder::Write -- JPEG_DECOMPRESS_PROGRESSIVE case");
-
+        auto AllComponentsSeen = [](jpeg_decompress_struct& mInfo) {
+          bool all_components_seen = true;
+          if (mInfo.coef_bits) {
+            for (int c = 0; c < mInfo.num_components; ++c) {
+              bool current_component_seen = mInfo.coef_bits[c][0] != -1;
+              all_components_seen &= current_component_seen;
+            }
+          }
+          return all_components_seen;
+        };
         int status;
+        int scan_to_display_first = 0;
+        bool all_components_seen;
+        all_components_seen = AllComponentsSeen(mInfo);
+        if (all_components_seen) {
+          scan_to_display_first = mInfo.input_scan_number;
+        }
+
         do {
           status = jpeg_consume_input(&mInfo);
+
+          if (status == JPEG_REACHED_SOS || status == JPEG_REACHED_EOI ||
+              status == JPEG_SUSPENDED) {
+            // record the first scan where all components are present
+            all_components_seen = AllComponentsSeen(mInfo);
+            if (!scan_to_display_first && all_components_seen) {
+              scan_to_display_first = mInfo.input_scan_number;
+            }
+          }
         } while ((status != JPEG_SUSPENDED) && (status != JPEG_REACHED_EOI));
 
+        if (!all_components_seen) {
+          return Transition::ContinueUnbuffered(
+              State::JPEG_DATA);  // I/O suspension
+        }
+        // make sure we never try to access the non-exsitent scan 0
+        if (!scan_to_display_first) {
+          scan_to_display_first = 1;
+        }
         while (mState != JPEG_DONE) {
           if (mInfo.output_scanline == 0) {
             int scan = mInfo.input_scan_number;
 
             // if we haven't displayed anything yet (output_scan_number==0)
             // and we have enough data for a complete scan, force output
-            // of the last full scan
-            if ((mInfo.output_scan_number == 0) && (scan > 1) &&
-                (status != JPEG_REACHED_EOI))
+            // of the last full scan,  but only if this last scan has seen
+            // DC data from all components
+            if ((mInfo.output_scan_number == 0) &&
+                (scan > scan_to_display_first) &&
+                (status != JPEG_REACHED_EOI)) {
               scan--;
-
+            }
+            MOZ_ASSERT(scan > 0, "scan number to small!");
             if (!jpeg_start_output(&mInfo, scan)) {
               MOZ_LOG(sJPEGDecoderAccountingLog, LogLevel::Debug,
                       ("} (I/O suspension after jpeg_start_output() -"
diff -Nru firefox-84.0.2+build1/image/DynamicImage.cpp firefox-85.0+build1/image/DynamicImage.cpp
--- firefox-84.0.2+build1/image/DynamicImage.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/DynamicImage.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DynamicImage.h"
+#include "gfxContext.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
diff -Nru firefox-84.0.2+build1/image/FrameAnimator.cpp firefox-85.0+build1/image/FrameAnimator.cpp
--- firefox-84.0.2+build1/image/FrameAnimator.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/FrameAnimator.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -341,6 +341,10 @@
   }
 
   result.Surface().Reset();
+
+  // Calling Reset on the surface of the animation can cause discarding surface
+  // providers to throw out all their frames so refresh our state.
+  aState.UpdateStateInternal(result, mSize);
 }
 
 RefreshResult FrameAnimator::RequestRefresh(AnimationState& aState,
diff -Nru firefox-84.0.2+build1/image/Image.cpp firefox-85.0+build1/image/Image.cpp
--- firefox-84.0.2+build1/image/Image.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/Image.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,8 +7,10 @@
 
 #include "imgRequest.h"
 #include "Layers.h"  // for LayerManager
+#include "nsIObserverService.h"
 #include "nsRefreshDriver.h"
 #include "nsContentUtils.h"
+#include "mozilla/Services.h"
 #include "mozilla/SizeOfState.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Tuple.h"  // for Tie
diff -Nru firefox-84.0.2+build1/image/Image.h firefox-85.0+build1/image/Image.h
--- firefox-84.0.2+build1/image/Image.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/Image.h	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/SizeOfState.h"
 #include "mozilla/ThreadSafeWeakPtr.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Tuple.h"
diff -Nru firefox-84.0.2+build1/image/ImageMemoryReporter.cpp firefox-85.0+build1/image/ImageMemoryReporter.cpp
--- firefox-84.0.2+build1/image/ImageMemoryReporter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/ImageMemoryReporter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ImageMemoryReporter.h"
 #include "Image.h"
+#include "base/process_util.h"
 #include "mozilla/layers/SharedSurfacesParent.h"
 #include "mozilla/StaticPrefs_image.h"
 #include "nsIMemoryReporter.h"
diff -Nru firefox-84.0.2+build1/image/ImageRegion.h firefox-85.0+build1/image/ImageRegion.h
--- firefox-84.0.2+build1/image/ImageRegion.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/ImageRegion.h	2021-01-18 19:58:11.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef mozilla_image_ImageRegion_h
 #define mozilla_image_ImageRegion_h
 
+#include "gfxMatrix.h"
 #include "gfxRect.h"
 #include "mozilla/gfx/Types.h"
 
diff -Nru firefox-84.0.2+build1/image/imgIContainer.idl firefox-85.0+build1/image/imgIContainer.idl
--- firefox-84.0.2+build1/image/imgIContainer.idl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgIContainer.idl	2021-01-18 19:58:11.000000000 +0000
@@ -10,18 +10,25 @@
 
 %{C++
 #include "ImgDrawResult.h"
-#include "gfxContext.h"
-#include "gfxMatrix.h"
-#include "gfxRect.h"
-#include "mozilla/gfx/2D.h"
+#include "gfxPoint.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/AspectRatio.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "nsRect.h"
 #include "nsSize.h"
+#include "nsTArray.h"
 #include "limits.h"
 
+class gfxContext;
+
 namespace mozilla {
+struct AspectRatio;
+
+namespace gfx {
+class SourceSurface;
+}
+
 namespace layers {
 class LayerManager;
 class ImageContainer;
diff -Nru firefox-84.0.2+build1/image/imgLoader.cpp firefox-85.0+build1/image/imgLoader.cpp
--- firefox-84.0.2+build1/image/imgLoader.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgLoader.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -33,6 +33,7 @@
 #include "mozilla/layers/CompositorManagerChild.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
 #include "nsIApplicationCache.h"
@@ -55,6 +56,7 @@
 #include "nsMimeTypes.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
+#include "nsProxyRelease.h"
 #include "nsQueryObject.h"
 #include "nsReadableUtils.h"
 #include "nsStreamUtils.h"
diff -Nru firefox-84.0.2+build1/image/imgLoader.h firefox-85.0+build1/image/imgLoader.h
--- firefox-84.0.2+build1/image/imgLoader.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgLoader.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/CORSMode.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/UniquePtr.h"
 
@@ -34,7 +33,9 @@
 class imgMemoryReporter;
 
 namespace mozilla {
-namespace image {}  // namespace image
+namespace dom {
+class Document;
+}
 }  // namespace mozilla
 
 class imgCacheEntry {
diff -Nru firefox-84.0.2+build1/image/imgRequest.cpp firefox-85.0+build1/image/imgRequest.cpp
--- firefox-84.0.2+build1/image/imgRequest.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgRequest.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -31,6 +31,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 
 #include "plstr.h"   // PL_strcasestr(...)
diff -Nru firefox-84.0.2+build1/image/imgRequest.h firefox-85.0+build1/image/imgRequest.h
--- firefox-84.0.2+build1/image/imgRequest.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgRequest.h	2021-01-18 19:58:11.000000000 +0000
@@ -62,12 +62,13 @@
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
 
-      [[nodiscard]] nsresult
-      Init(nsIURI* aURI, nsIURI* aFinalURI, bool aHadInsecureRedirect,
-           nsIRequest* aRequest, nsIChannel* aChannel,
-           imgCacheEntry* aCacheEntry, mozilla::dom::Document* aLoadingDocument,
-           nsIPrincipal* aTriggeringPrincipal, int32_t aCORSMode,
-           nsIReferrerInfo* aReferrerInfo);
+  [[nodiscard]] nsresult Init(nsIURI* aURI, nsIURI* aFinalURI,
+                              bool aHadInsecureRedirect, nsIRequest* aRequest,
+                              nsIChannel* aChannel, imgCacheEntry* aCacheEntry,
+                              mozilla::dom::Document* aLoadingDocument,
+                              nsIPrincipal* aTriggeringPrincipal,
+                              int32_t aCORSMode,
+                              nsIReferrerInfo* aReferrerInfo);
 
   void ClearLoader();
 
diff -Nru firefox-84.0.2+build1/image/imgRequestProxy.cpp firefox-85.0+build1/image/imgRequestProxy.cpp
--- firefox-84.0.2+build1/image/imgRequestProxy.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgRequestProxy.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -1171,6 +1171,13 @@
   return owner->GetValidator();
 }
 
+nsITimedChannel* imgRequestProxy::TimedChannel() {
+  if (!GetOwner()) {
+    return nullptr;
+  }
+  return GetOwner()->GetTimedChannel();
+}
+
 ////////////////// imgRequestProxyStatic methods
 
 class StaticBehaviour : public ProxyBehaviour {
diff -Nru firefox-84.0.2+build1/image/imgRequestProxy.h firefox-85.0+build1/image/imgRequestProxy.h
--- firefox-84.0.2+build1/image/imgRequestProxy.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgRequestProxy.h	2021-01-18 19:58:11.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "imgIRequest.h"
 
-#include "nsILoadGroup.h"
+#include "nsIPrincipal.h"
 #include "nsISupportsPriority.h"
 #include "nsITimedChannel.h"
 #include "nsCOMPtr.h"
@@ -19,7 +19,6 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/gfx/Rect.h"
 
-#include "imgRequest.h"
 #include "IProgressObserver.h"
 
 #define NS_IMGREQUESTPROXY_CID                       \
@@ -31,6 +30,7 @@
 
 class imgCacheValidator;
 class imgINotificationObserver;
+class imgRequest;
 class imgStatusNotifyRunnable;
 class ProxyBehaviour;
 
@@ -172,12 +172,7 @@
   //   (b) whether mOwner has instantiated its image yet
   already_AddRefed<ProgressTracker> GetProgressTracker() const;
 
-  nsITimedChannel* TimedChannel() {
-    if (!GetOwner()) {
-      return nullptr;
-    }
-    return GetOwner()->GetTimedChannel();
-  }
+  nsITimedChannel* TimedChannel();
 
   already_AddRefed<Image> GetImage() const;
   bool HasImage() const;
diff -Nru firefox-84.0.2+build1/image/imgTools.cpp firefox-85.0+build1/image/imgTools.cpp
--- firefox-84.0.2+build1/image/imgTools.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/imgTools.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -18,6 +18,7 @@
 #include "imgICache.h"
 #include "imgIContainer.h"
 #include "imgIEncoder.h"
+#include "nsComponentManagerUtils.h"
 #include "nsNetUtil.h"  // for NS_NewBufferedInputStream
 #include "nsStreamUtils.h"
 #include "nsStringStream.h"
diff -Nru firefox-84.0.2+build1/image/ISurfaceProvider.h firefox-85.0+build1/image/ISurfaceProvider.h
--- firefox-84.0.2+build1/image/ISurfaceProvider.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/ISurfaceProvider.h	2021-01-18 19:58:11.000000000 +0000
@@ -16,7 +16,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Variant.h"
 #include "mozilla/gfx/2D.h"
 
 #include "imgFrame.h"
diff -Nru firefox-84.0.2+build1/image/OrientedImage.cpp firefox-85.0+build1/image/OrientedImage.cpp
--- firefox-84.0.2+build1/image/OrientedImage.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/OrientedImage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include "gfx2DGlue.h"
+#include "gfxContext.h"
 #include "gfxDrawable.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
diff -Nru firefox-84.0.2+build1/image/RasterImage.cpp firefox-85.0+build1/image/RasterImage.cpp
--- firefox-84.0.2+build1/image/RasterImage.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/RasterImage.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -78,7 +78,7 @@
       mFramesNotified(0),
 #endif
       mSourceBuffer(MakeNotNull<SourceBuffer*>()) {
-  SetHandledOrientation(StaticPrefs::image_honor_orientation_metadata());
+  StoreHandledOrientation(StaticPrefs::image_honor_orientation_metadata());
 }
 
 //******************************************************************************
@@ -112,10 +112,10 @@
                 !(aFlags & INIT_FLAG_DISCARDABLE));
 
   // Store initialization data
-  SetDiscardable(!!(aFlags & INIT_FLAG_DISCARDABLE));
-  SetWantFullDecode(!!(aFlags & INIT_FLAG_DECODE_IMMEDIATELY));
-  SetTransient(!!(aFlags & INIT_FLAG_TRANSIENT));
-  SetSyncLoad(!!(aFlags & INIT_FLAG_SYNC_LOAD));
+  StoreDiscardable(!!(aFlags & INIT_FLAG_DISCARDABLE));
+  StoreWantFullDecode(!!(aFlags & INIT_FLAG_DECODE_IMMEDIATELY));
+  StoreTransient(!!(aFlags & INIT_FLAG_TRANSIENT));
+  StoreSyncLoad(!!(aFlags & INIT_FLAG_SYNC_LOAD));
 
   // Use the MIME type to select a decoder type, and make sure there *is* a
   // decoder for this MIME type.
@@ -126,7 +126,7 @@
   }
 
   // Lock this image's surfaces in the SurfaceCache if we're not discardable.
-  if (!GetDiscardable()) {
+  if (!LoadDiscardable()) {
     mLockCount++;
     SurfaceCache::LockImage(ImageKey(this));
   }
@@ -171,7 +171,7 @@
   }
 
   if (res.mAnimationFinished) {
-    SetAnimationFinished(true);
+    StoreAnimationFinished(true);
     EvaluateAnimation();
   }
 }
@@ -225,7 +225,7 @@
 
 //******************************************************************************
 size_t RasterImage::GetNativeSizesLength() const {
-  if (mError || !GetHasSize()) {
+  if (mError || !LoadHasSize()) {
     return 0;
   }
 
@@ -261,7 +261,7 @@
 RasterImage::GetOrientation() { return mOrientation; }
 
 NS_IMETHODIMP_(bool)
-RasterImage::HandledOrientation() { return GetHandledOrientation(); }
+RasterImage::HandledOrientation() { return LoadHandledOrientation(); }
 
 //******************************************************************************
 NS_IMETHODIMP
@@ -334,7 +334,7 @@
   LookupResult result =
       LookupFrameInternal(requestedSize, aFlags, aPlaybackType, aMarkUsed);
 
-  if (!result && !GetHasSize()) {
+  if (!result && !LoadHasSize()) {
     // We can't request a decode without knowing our intrinsic size. Give up.
     return LookupResult(MatchType::NOT_FOUND);
   }
@@ -382,7 +382,7 @@
   // Sync decoding guarantees that we got the frame, but if it's owned by an
   // async decoder that's currently running, the contents of the frame may not
   // be available yet. Make sure we get everything.
-  if (GetAllSourceData() && syncDecode) {
+  if (LoadAllSourceData() && syncDecode) {
     result.Surface()->WaitUntilFinished();
   }
 
@@ -515,7 +515,7 @@
   // images. This is true even though we check for animation during the
   // metadata decode, because we may still discover animation only during the
   // full decode for corrupt images.
-  if (!GetHasBeenDecoded()) {
+  if (!LoadHasBeenDecoded()) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
@@ -616,7 +616,7 @@
 
 Tuple<ImgDrawResult, IntSize> RasterImage::GetImageContainerSize(
     LayerManager* aManager, const IntSize& aRequestedSize, uint32_t aFlags) {
-  if (!GetHasSize()) {
+  if (!LoadHasSize()) {
     return MakeTuple(ImgDrawResult::NOT_READY, IntSize(0, 0));
   }
 
@@ -671,7 +671,7 @@
   // surface than mSize. If mSize > aRequestedSize, and mSize > maxTextureSize,
   // we still want to use image containers if aRequestedSize <= maxTextureSize.
   int32_t maxTextureSize = aManager->GetMaxTextureSize();
-  if (!GetHasSize() || aRequestedSize.IsEmpty() ||
+  if (!LoadHasSize() || aRequestedSize.IsEmpty() ||
       min(mSize.width, aRequestedSize.width) > maxTextureSize ||
       min(mSize.height, aRequestedSize.height) > maxTextureSize) {
     return false;
@@ -725,7 +725,7 @@
     Orientation orientation = aMetadata.GetOrientation();
 
     // If we already have a size, check the new size against the old one.
-    if (GetHasSize() &&
+    if (LoadHasSize() &&
         (metadataSize != ToUnoriented(mSize) || orientation != mOrientation)) {
       NS_WARNING(
           "Image changed size or orientation on redecode! "
@@ -742,10 +742,10 @@
       mNativeSizes.AppendElement(
           ToOriented(UnorientedIntSize::FromUnknownSize(nativeSize)));
     }
-    SetHasSize(true);
+    StoreHasSize(true);
   }
 
-  if (GetHasSize() && aMetadata.HasAnimation() && !mAnimationState) {
+  if (LoadHasSize() && aMetadata.HasAnimation() && !mAnimationState) {
     // We're becoming animated, so initialize animation stuff.
     mAnimationState.emplace(mAnimationMode);
     mFrameAnimator =
@@ -813,16 +813,16 @@
 
   // If we're not ready to animate, then set mPendingAnimation, which will cause
   // us to start animating if and when we do become ready.
-  SetPendingAnimation(!mAnimationState ||
-                      mAnimationState->KnownFrameCount() < 1);
-  if (GetPendingAnimation()) {
+  StorePendingAnimation(!mAnimationState ||
+                        mAnimationState->KnownFrameCount() < 1);
+  if (LoadPendingAnimation()) {
     return NS_OK;
   }
 
   // Don't bother to animate if we're displaying the first frame forever.
   if (mAnimationState->GetCurrentAnimationFrameIndex() == 0 &&
       mAnimationState->FirstFrameTimeout() == FrameTimeout::Forever()) {
-    SetAnimationFinished(true);
+    StoreAnimationFinished(true);
     return NS_ERROR_ABORT;
   }
 
@@ -855,14 +855,14 @@
     return NS_ERROR_FAILURE;
   }
 
-  SetPendingAnimation(false);
+  StorePendingAnimation(false);
 
   if (mAnimationMode == kDontAnimMode || !mAnimationState ||
       mAnimationState->GetCurrentAnimationFrameIndex() == 0) {
     return NS_OK;
   }
 
-  SetAnimationFinished(false);
+  StoreAnimationFinished(false);
 
   if (mAnimating) {
     StopAnimation();
@@ -915,7 +915,7 @@
   MOZ_ASSERT(NS_IsMainThread());
 
   // Record that we have all the data we're going to get now.
-  SetAllSourceData(true);
+  StoreAllSourceData(true);
 
   // Let decoders know that there won't be any more data coming.
   mSourceBuffer->Complete(aStatus);
@@ -925,9 +925,9 @@
   // decoder could delay this image's load event quite a bit), or if this image
   // is transient.
   bool canSyncDecodeMetadata =
-      GetSyncLoad() || GetTransient() || DecodePool::NumberOfCores() < 2;
+      LoadSyncLoad() || LoadTransient() || DecodePool::NumberOfCores() < 2;
 
-  if (canSyncDecodeMetadata && !GetHasSize()) {
+  if (canSyncDecodeMetadata && !LoadHasSize()) {
     // We're loading this image synchronously, so it needs to be usable after
     // this call returns.  Since we haven't gotten our size yet, we need to do a
     // synchronous metadata decode here.
@@ -948,7 +948,7 @@
 
   Progress loadProgress = LoadCompleteProgress(aLastPart, mError, finalStatus);
 
-  if (!GetHasSize() && !mError) {
+  if (!LoadHasSize() && !mError) {
     // We don't have our size yet, so we'll fire the load event in SetSize().
     MOZ_ASSERT(!canSyncDecodeMetadata,
                "Firing load async after metadata sync decode?");
@@ -962,10 +962,10 @@
 }
 
 void RasterImage::NotifyForLoadEvent(Progress aProgress) {
-  MOZ_ASSERT(GetHasSize() || mError,
+  MOZ_ASSERT(LoadHasSize() || mError,
              "Need to know size before firing load event");
   MOZ_ASSERT(
-      !GetHasSize() || (mProgressTracker->GetProgress() & FLAG_SIZE_AVAILABLE),
+      !LoadHasSize() || (mProgressTracker->GetProgress() & FLAG_SIZE_AVAILABLE),
       "Should have notified that the size is available if we have it");
 
   // If we encountered an error, make sure we notify for that as well.
@@ -981,9 +981,9 @@
                                            nsIInputStream* aInputStream,
                                            uint64_t, uint32_t aCount) {
   nsresult rv = mSourceBuffer->AppendFromInputStream(aInputStream, aCount);
-  if (NS_SUCCEEDED(rv) && !GetSomeSourceData()) {
-    SetSomeSourceData(true);
-    if (!GetSyncLoad()) {
+  if (NS_SUCCEEDED(rv) && !LoadSomeSourceData()) {
+    StoreSomeSourceData(true);
+    if (!LoadSyncLoad()) {
       // Create an async metadata decoder and verify we succeed in doing so.
       rv = DecodeMetadata(DECODE_FLAGS_DEFAULT);
     }
@@ -1049,7 +1049,7 @@
 }
 
 bool RasterImage::CanDiscard() {
-  return GetAllSourceData() &&
+  return LoadAllSourceData() &&
          // Can discard animated images if the pref is set
          (!mAnimationState ||
           StaticPrefs::image_mem_animated_discardable_AtStartup());
@@ -1061,8 +1061,8 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (!GetHasSize()) {
-    SetWantFullDecode(true);
+  if (!LoadHasSize()) {
+    StoreWantFullDecode(true);
     return NS_OK;
   }
 
@@ -1077,8 +1077,8 @@
     return false;
   }
 
-  if (!GetHasSize()) {
-    SetWantFullDecode(true);
+  if (!LoadHasSize()) {
+    StoreWantFullDecode(true);
     return false;
   }
 
@@ -1141,8 +1141,8 @@
     return result;
   }
 
-  if (!GetHasSize()) {
-    SetWantFullDecode(true);
+  if (!LoadHasSize()) {
+    StoreWantFullDecode(true);
     return LookupResult(MatchType::NOT_FOUND);
   }
 
@@ -1150,7 +1150,7 @@
   // explicitly trading off flashing for responsiveness in the case that we're
   // redecoding an image (see bug 845147).
   bool shouldSyncDecodeIfFast =
-      !GetHasBeenDecoded() && (aFlags & FLAG_SYNC_DECODE_IF_FAST);
+      !LoadHasBeenDecoded() && (aFlags & FLAG_SYNC_DECODE_IF_FAST);
 
   uint32_t flags =
       shouldSyncDecodeIfFast ? aFlags : aFlags & ~FLAG_SYNC_DECODE_IF_FAST;
@@ -1193,8 +1193,8 @@
   }
 
   // If we don't have a size yet, we can't do any other decoding.
-  if (!GetHasSize()) {
-    SetWantFullDecode(true);
+  if (!LoadHasSize()) {
+    StoreWantFullDecode(true);
     return;
   }
 
@@ -1212,10 +1212,10 @@
   if (aFlags & FLAG_ASYNC_NOTIFY) {
     decoderFlags |= DecoderFlags::ASYNC_NOTIFY;
   }
-  if (GetTransient()) {
+  if (LoadTransient()) {
     decoderFlags |= DecoderFlags::IMAGE_IS_TRANSIENT;
   }
-  if (GetHasBeenDecoded()) {
+  if (LoadHasBeenDecoded()) {
     decoderFlags |= DecoderFlags::IS_REDECODE;
   }
   if ((aFlags & FLAG_SYNC_DECODE) || !(aFlags & FLAG_HIGH_QUALITY_SCALING)) {
@@ -1281,7 +1281,7 @@
   mDecodeCount++;
 
   // We're ready to decode; start the decoder.
-  aOutRanSync = LaunchDecodingTask(task, this, aFlags, GetAllSourceData());
+  aOutRanSync = LaunchDecodingTask(task, this, aFlags, LoadAllSourceData());
 }
 
 NS_IMETHODIMP
@@ -1290,7 +1290,7 @@
     return NS_ERROR_FAILURE;
   }
 
-  MOZ_ASSERT(!GetHasSize(), "Should not do unnecessary metadata decodes");
+  MOZ_ASSERT(!LoadHasSize(), "Should not do unnecessary metadata decodes");
 
   // Create a decoder.
   RefPtr<IDecodingTask> task = DecoderFactory::CreateMetadataDecoder(
@@ -1302,13 +1302,13 @@
   }
 
   // We're ready to decode; start the decoder.
-  LaunchDecodingTask(task, this, aFlags, GetAllSourceData());
+  LaunchDecodingTask(task, this, aFlags, LoadAllSourceData());
   return NS_OK;
 }
 
 void RasterImage::RecoverFromInvalidFrames(const UnorientedIntSize& aSize,
                                            uint32_t aFlags) {
-  if (!GetHasSize()) {
+  if (!LoadHasSize()) {
     return;
   }
 
@@ -1350,7 +1350,7 @@
   // Check basic requirements: downscale-during-decode is enabled, Skia is
   // available, this image isn't transient, we have all the source data and know
   // our size, and the flags allow us to do it.
-  if (!GetHasSize() || GetTransient() || !HaveSkia() ||
+  if (!LoadHasSize() || LoadTransient() || !HaveSkia() ||
       !StaticPrefs::image_downscale_during_decode_enabled() ||
       !(aFlags & imgIContainer::FLAG_HIGH_QUALITY_SCALING)) {
     return false;
@@ -1553,8 +1553,8 @@
 
 NS_IMETHODIMP
 RasterImage::RequestDiscard() {
-  if (GetDiscardable() &&  // Enabled at creation time...
-      mLockCount == 0 &&   // ...not temporarily disabled...
+  if (LoadDiscardable() &&  // Enabled at creation time...
+      mLockCount == 0 &&    // ...not temporarily disabled...
       CanDiscard()) {
     Discard();
   }
@@ -1621,7 +1621,7 @@
 
 bool RasterImage::ShouldAnimate() {
   return ImageResource::ShouldAnimate() && mAnimationState &&
-         mAnimationState->KnownFrameCount() >= 1 && !GetAnimationFinished();
+         mAnimationState->KnownFrameCount() >= 1 && !LoadAnimationFinished();
 }
 
 #ifdef DEBUG
@@ -1656,7 +1656,7 @@
     }
 
     // If we should start animating right now, do so.
-    if (mAnimationState && aFrameCount == Some(1u) && GetPendingAnimation() &&
+    if (mAnimationState && aFrameCount == Some(1u) && LoadPendingAnimation() &&
         ShouldAnimate()) {
       StartAnimation();
     }
@@ -1707,12 +1707,12 @@
     return;
   }
 
-  MOZ_ASSERT(mError || GetHasSize() || !aMetadata.HasSize(),
+  MOZ_ASSERT(mError || LoadHasSize() || !aMetadata.HasSize(),
              "SetMetadata should've gotten a size");
 
   if (!aStatus.mWasMetadataDecode && aStatus.mFinished) {
     // Flag that we've been decoded before.
-    SetHasBeenDecoded(true);
+    StoreHasBeenDecoded(true);
   }
 
   // Send out any final notifications.
@@ -1727,12 +1727,12 @@
     }
 
     // If we should start animating right now, do so.
-    if (mAnimationState && aFrameCount == Some(1u) && GetPendingAnimation() &&
+    if (mAnimationState && aFrameCount == Some(1u) && LoadPendingAnimation() &&
         ShouldAnimate()) {
       StartAnimation();
     }
 
-    if (mAnimationState && GetHasBeenDecoded()) {
+    if (mAnimationState && LoadHasBeenDecoded()) {
       // We've finished a full decode of all animation frames and our
       // AnimationState has been notified about them all, so let it know not to
       // expect anymore.
@@ -1769,7 +1769,7 @@
   if (aStatus.mHadError &&
       (!mAnimationState || mAnimationState->KnownFrameCount() == 0)) {
     DoError();
-  } else if (aStatus.mWasMetadataDecode && !GetHasSize()) {
+  } else if (aStatus.mWasMetadataDecode && !LoadHasSize()) {
     DoError();
   }
 
@@ -1782,8 +1782,8 @@
     }
 
     // If we were a metadata decode and a full decode was requested, do it.
-    if (GetWantFullDecode()) {
-      SetWantFullDecode(false);
+    if (LoadWantFullDecode()) {
+      StoreWantFullDecode(false);
       RequestDecodeForSize(mSize.ToUnknownSize(),
                            DECODE_FLAGS_DEFAULT | FLAG_HIGH_QUALITY_SCALING,
                            FRAME_CURRENT);
diff -Nru firefox-84.0.2+build1/image/RasterImage.h firefox-85.0+build1/image/RasterImage.h
--- firefox-84.0.2+build1/image/RasterImage.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/RasterImage.h	2021-01-18 19:58:12.000000000 +0000
@@ -398,7 +398,7 @@
    * Orientation that indicates no transformation is needed.
    */
   Orientation UsedOrientation() const {
-    return GetHandledOrientation() ? mOrientation : Orientation();
+    return LoadHandledOrientation() ? mOrientation : Orientation();
   }
 
   // Functions to convert between oriented and unoriented pixels.
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/image/test/crashtests/1676172-1.gif and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/image/test/crashtests/1676172-1.gif differ
diff -Nru firefox-84.0.2+build1/image/test/crashtests/1676172-1.html firefox-85.0+build1/image/test/crashtests/1676172-1.html
--- firefox-84.0.2+build1/image/test/crashtests/1676172-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/image/test/crashtests/1676172-1.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,45 @@
+<html class="reftest-wait">
+<head>
+<script>
+function setup() {
+	setTimeout(finish, 1500);
+}
+function finish() {
+	window.stop();
+	document.documentElement.className = "";
+}
+</script>
+<style>
+	iframe {
+		width: 100px;
+		height: 100px;
+	}
+</style>
+</head>
+<body onload="setup();">
+<script>
+let numiframes = 30;
+// On some platforms too many animating and reloading gifs means we don't ever
+// get enough time to serve paints so that there is never a period of time
+// where there are no paints pending, so the reftest harness can't end the
+// test. So we limit the number on those platforms, since we only need one
+// iframe to reproduce the bug this is okay, more iframes just give more
+// chance of reproducing it on any given run.
+if (navigator.appVersion.includes("Windows")) {
+	numiframes = 16;
+}
+if (navigator.platform.includes("Linux")) {
+	numiframes = 10;
+}
+if (navigator.appVersion.includes("Android")) {
+	numiframes = 2;
+}
+for (let i = 0; i < numiframes; i++) {
+	let ifr = document.createElement("iframe");
+	document.body.appendChild(ifr)
+	ifr.src = "1676172-1-iframe.html?" + i;
+}
+setTimeout(finish, 1500);
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/image/test/crashtests/1676172-1-iframe.html firefox-85.0+build1/image/test/crashtests/1676172-1-iframe.html
--- firefox-84.0.2+build1/image/test/crashtests/1676172-1-iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/image/test/crashtests/1676172-1-iframe.html	2021-01-18 19:58:11.000000000 +0000
@@ -0,0 +1,13 @@
+<html>
+<head>
+    <script>
+      document.addEventListener('DOMContentLoaded', () => {
+        const image = document.createElementNS('http://www.w3.org/1999/xhtml', 'img')
+        var extra = document.location.search.substr(1);
+        image.setAttribute('src', '1676172-1.gif' + '?' + extra)
+        document.documentElement.appendChild(image)
+        setTimeout('location.reload()', 400)
+      })
+    </script>
+</head>
+</html>
diff -Nru firefox-84.0.2+build1/image/test/crashtests/crashtests.list firefox-85.0+build1/image/test/crashtests/crashtests.list
--- firefox-84.0.2+build1/image/test/crashtests/crashtests.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/test/crashtests/crashtests.list	2021-01-18 19:58:12.000000000 +0000
@@ -67,3 +67,4 @@
 
 HTTP load 1634839-1.html
 HTTP load 1634839-2.html
+pref(image.animated.decode-on-demand.batch-size,1) pref(image.animated.decode-on-demand.threshold-kb,0) HTTP load 1676172-1.html
diff -Nru firefox-84.0.2+build1/image/test/gtest/Common.cpp firefox-85.0+build1/image/test/gtest/Common.cpp
--- firefox-84.0.2+build1/image/test/gtest/Common.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/test/gtest/Common.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -10,6 +10,8 @@
 #include "gfxPlatform.h"
 
 #include "imgITools.h"
+#include "mozilla/Preferences.h"
+#include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFile.h"
 #include "nsIInputStream.h"
diff -Nru firefox-84.0.2+build1/image/test/gtest/TestDecoders.cpp firefox-85.0+build1/image/test/gtest/TestDecoders.cpp
--- firefox-84.0.2+build1/image/test/gtest/TestDecoders.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/test/gtest/TestDecoders.cpp	2021-01-18 19:58:11.000000000 +0000
@@ -14,6 +14,7 @@
 #include "ImageOps.h"
 #include "imgIContainer.h"
 #include "ImageFactory.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/gfx/2D.h"
 #include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/image/test/reftest/jpeg/non-interleaved_progressive-1-halfred-ref.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/image/test/reftest/jpeg/non-interleaved_progressive-1-halfred-ref.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/image/test/reftest/jpeg/non-interleaved_progressive-1.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/image/test/reftest/jpeg/non-interleaved_progressive-1.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/image/test/reftest/jpeg/non-interleaved_progressive-2.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/image/test/reftest/jpeg/non-interleaved_progressive-2.jpg differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/image/test/reftest/jpeg/non-interleaved_progressive-2-white-ref.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/image/test/reftest/jpeg/non-interleaved_progressive-2-white-ref.png differ
diff -Nru firefox-84.0.2+build1/image/test/reftest/jpeg/reftest.list firefox-85.0+build1/image/test/reftest/jpeg/reftest.list
--- firefox-84.0.2+build1/image/test/reftest/jpeg/reftest.list	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/image/test/reftest/jpeg/reftest.list	2021-01-18 19:58:11.000000000 +0000
@@ -63,3 +63,6 @@
 # frames for each part. So we have this testcase to test those different
 # codepaths.
 HTTP == webcam-simulacrum.html blue.html
+
+== non-interleaved_progressive-1.jpg non-interleaved_progressive-1-halfred-ref.png
+== non-interleaved_progressive-2.jpg non-interleaved_progressive-2-white-ref.png
diff -Nru firefox-84.0.2+build1/intl/l10n/docs/fluent/review.rst firefox-85.0+build1/intl/l10n/docs/fluent/review.rst
--- firefox-84.0.2+build1/intl/l10n/docs/fluent/review.rst	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/docs/fluent/review.rst	2021-01-18 19:58:12.000000000 +0000
@@ -12,7 +12,7 @@
 working with FTL (Fluent) files. As such, it’s not meant to replace the
 `existing extensive documentation`__ about Fluent.
 
-__ ./fluent_tutorial.html
+__ ./tutorial.html
 
 `Herald`_ is used to set the group `fluent-reviewers`_ as blocking reviewer for
 any patch modifying FTL files committed to Phabricator. The person from this
diff -Nru firefox-84.0.2+build1/intl/l10n/FluentBundle.cpp firefox-85.0+build1/intl/l10n/FluentBundle.cpp
--- firefox-84.0.2+build1/intl/l10n/FluentBundle.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/FluentBundle.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #include "FluentBundle.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/UnionTypes.h"
+#include "nsIInputStream.h"
 #include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "unicode/numberformatter.h"
diff -Nru firefox-84.0.2+build1/intl/l10n/FluentBundle.h firefox-85.0+build1/intl/l10n/FluentBundle.h
--- firefox-84.0.2+build1/intl/l10n/FluentBundle.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/FluentBundle.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_intl_l10n_FluentBundle_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/FluentBinding.h"
@@ -19,6 +18,7 @@
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 struct FluentMessage;
diff -Nru firefox-84.0.2+build1/intl/l10n/FluentResource.h firefox-85.0+build1/intl/l10n/FluentResource.h
--- firefox-84.0.2+build1/intl/l10n/FluentResource.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/FluentResource.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_intl_l10n_FluentResource_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/FluentBinding.h"
diff -Nru firefox-84.0.2+build1/intl/l10n/L10nRegistry.cpp firefox-85.0+build1/intl/l10n/L10nRegistry.cpp
--- firefox-84.0.2+build1/intl/l10n/L10nRegistry.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/L10nRegistry.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsIChannel.h"
 #include "nsILoadInfo.h"
 #include "nsIStreamLoader.h"
+#include "nsNetUtil.h"
 #include "nsString.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/intl/l10n/L10nRegistry.jsm firefox-85.0+build1/intl/l10n/L10nRegistry.jsm
--- firefox-84.0.2+build1/intl/l10n/L10nRegistry.jsm	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/L10nRegistry.jsm	2021-01-18 19:58:12.000000000 +0000
@@ -118,6 +118,14 @@
     }
   }
 
+  /**
+   * Empty the sources to mimic shutdown for testing from xpcshell.
+   */
+  clearSources() {
+    this.sources = new Map();
+    Services.locale.availableLocales = this.getAvailableLocales();
+  }
+
   handleEvent(event) {
     if (event.type === "change") {
       if (event.changedKeys.includes("L10nRegistry:Sources")) {
diff -Nru firefox-84.0.2+build1/intl/l10n/Localization.cpp firefox-85.0+build1/intl/l10n/Localization.cpp
--- firefox-84.0.2+build1/intl/l10n/Localization.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/Localization.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -6,8 +6,12 @@
 
 #include "Localization.h"
 #include "nsImportModule.h"
+#include "nsIObserverService.h"
 #include "nsContentUtils.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 
 #define INTL_APP_LOCALES_CHANGED "intl:app-locales-changed"
 #define L10N_PSEUDO_PREF "intl.l10n.pseudo"
diff -Nru firefox-84.0.2+build1/intl/l10n/Localization.h firefox-85.0+build1/intl/l10n/Localization.h
--- firefox-84.0.2+build1/intl/l10n/Localization.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/l10n/Localization.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,7 +10,6 @@
 #include "nsWeakReference.h"
 #include "nsIObserver.h"
 #include "mozILocalization.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/LocalizationBinding.h"
 #include "mozilla/dom/PromiseNativeHandler.h"
@@ -20,6 +19,8 @@
 using namespace mozilla::dom;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace intl {
 
 typedef Record<nsCString, Nullable<OwningUTF8StringOrDouble>> L10nArgs;
diff -Nru firefox-84.0.2+build1/intl/locale/OSPreferences.cpp firefox-85.0+build1/intl/locale/OSPreferences.cpp
--- firefox-84.0.2+build1/intl/locale/OSPreferences.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/locale/OSPreferences.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -499,8 +499,17 @@
     return NS_OK;
   }
 
+  // If the locale is not specified, default to first regional prefs locale
+  const nsACString* locale = &aLocale;
+  AutoTArray<nsCString, 10> rpLocales;
+  if (aLocale.IsEmpty()) {
+    LocaleService::GetInstance()->GetRegionalPrefsLocales(rpLocales);
+    MOZ_ASSERT(rpLocales.Length() > 0);
+    locale = &rpLocales[0];
+  }
+
   // Create a cache key from the locale + style options
-  nsAutoCString key(aLocale);
+  nsAutoCString key(*locale);
   key.Append(':');
   key.AppendInt(aDateFormatStyle);
   key.Append(':');
@@ -512,9 +521,9 @@
     return NS_OK;
   }
 
-  if (!OverrideDateTimePattern(dateStyle, timeStyle, aLocale, pattern)) {
-    if (!ReadDateTimePattern(dateStyle, timeStyle, aLocale, pattern)) {
-      if (!GetDateTimePatternForStyle(dateStyle, timeStyle, aLocale, pattern)) {
+  if (!OverrideDateTimePattern(dateStyle, timeStyle, *locale, pattern)) {
+    if (!ReadDateTimePattern(dateStyle, timeStyle, *locale, pattern)) {
+      if (!GetDateTimePatternForStyle(dateStyle, timeStyle, *locale, pattern)) {
         return NS_ERROR_FAILURE;
       }
     }
diff -Nru firefox-84.0.2+build1/intl/locale/tests/gtest/TestOSPreferences.cpp firefox-85.0+build1/intl/locale/tests/gtest/TestOSPreferences.cpp
--- firefox-84.0.2+build1/intl/locale/tests/gtest/TestOSPreferences.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/locale/tests/gtest/TestOSPreferences.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -77,7 +77,22 @@
     }
   }
 
-  ASSERT_TRUE(1);
+  // If the locale is not specified, we should get the pattern corresponding to
+  // the first regional prefs locale.
+  AutoTArray<nsCString, 10> rpLocales;
+  LocaleService::GetInstance()->GetRegionalPrefsLocales(rpLocales);
+  ASSERT_TRUE(rpLocales.Length() > 0);
+
+  nsAutoCString rpLocalePattern;
+  ASSERT_TRUE(NS_SUCCEEDED(
+      osprefs->GetDateTimePattern(mozIOSPreferences::dateTimeFormatStyleLong,
+                                  mozIOSPreferences::dateTimeFormatStyleLong,
+                                  rpLocales[0], rpLocalePattern)));
+  ASSERT_TRUE(NS_SUCCEEDED(
+      osprefs->GetDateTimePattern(mozIOSPreferences::dateTimeFormatStyleLong,
+                                  mozIOSPreferences::dateTimeFormatStyleLong,
+                                  nsDependentCString(""), pattern)));
+  ASSERT_EQ(rpLocalePattern, pattern);
 }
 
 /**
diff -Nru firefox-84.0.2+build1/intl/strres/nsStringBundle.cpp firefox-85.0+build1/intl/strres/nsStringBundle.cpp
--- firefox-84.0.2+build1/intl/strres/nsStringBundle.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/strres/nsStringBundle.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsNetUtil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsServiceManagerUtils.h"
+#include "nsIChannel.h"
 #include "nsIInputStream.h"
 #include "nsIURI.h"
 #include "nsIObserverService.h"
diff -Nru firefox-84.0.2+build1/intl/tzdata/GIT-INFO firefox-85.0+build1/intl/tzdata/GIT-INFO
--- firefox-84.0.2+build1/intl/tzdata/GIT-INFO	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/tzdata/GIT-INFO	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,5 @@
-commit 6f3ba24de06047e73291b790f6623b282d392d30
+commit 2bbcdff9a6c3b0e89183728ad7460746d455495d
 Author: Yoshito Umaoka <yumaoka@users.noreply.github.com>
-Date:   Thu Oct 22 12:52:08 2020 -0400
+Date:   Wed Jan 6 13:38:58 2021 -0500
 
-    ICU-21350 tz database 2020d updates in icu-data (#14)
+    ICU-21448 Update ICU tzdata in icu-data repo to 2020f (#16)
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/be/metaZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/be/metaZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/be/windowsZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/be/windowsZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/be/zoneinfo64.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/be/zoneinfo64.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/ee/metaZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/ee/metaZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/ee/windowsZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/ee/windowsZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/ee/zoneinfo64.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/ee/zoneinfo64.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/le/metaZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/le/metaZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/le/windowsZones.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/le/windowsZones.res differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/intl/tzdata/source/le/zoneinfo64.res and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/intl/tzdata/source/le/zoneinfo64.res differ
diff -Nru firefox-84.0.2+build1/intl/tzdata/source/metaZones.txt firefox-85.0+build1/intl/tzdata/source/metaZones.txt
--- firefox-84.0.2+build1/intl/tzdata/source/metaZones.txt	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/tzdata/source/metaZones.txt	2021-01-18 19:58:12.000000000 +0000
@@ -1665,11 +1665,11 @@
             {
                 "America_Eastern",
                 "1970-01-01 00:00",
-                "2015-11-01 06:00",
+                "2015-03-08 07:00",
             }
             {
                 "Atlantic",
-                "2015-11-01 06:00",
+                "2015-03-08 07:00",
                 "2018-03-11 07:00",
             }
             {
@@ -4055,18 +4055,6 @@
         "Europe:Volgograd"{
             {
                 "Volgograd",
-                "1970-01-01 00:00",
-                "1992-03-28 22:00",
-            }
-            {
-                "Moscow",
-                "1992-03-28 22:00",
-                "2018-10-27 23:00",
-            }
-            {
-                "Volgograd",
-                "2018-10-27 23:00",
-                "9999-12-31 23:59",
             }
         }
         "Europe:Warsaw"{
diff -Nru firefox-84.0.2+build1/intl/tzdata/source/windowsZones.txt firefox-85.0+build1/intl/tzdata/source/windowsZones.txt
--- firefox-84.0.2+build1/intl/tzdata/source/windowsZones.txt	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/tzdata/source/windowsZones.txt	2021-01-18 19:58:12.000000000 +0000
@@ -674,10 +674,6 @@
         }
         "US Mountain Standard Time"{
             001{"America/Phoenix"}
-            CA{
-                "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre"
-                "ek America/Fort_Nelson"
-            }
             MX{"America/Hermosillo"}
             US{"America/Phoenix"}
             ZZ{"Etc/GMT+7"}
@@ -814,5 +810,12 @@
             001{"Asia/Yakutsk"}
             RU{"Asia/Yakutsk Asia/Khandyga"}
         }
+        "Yukon Standard Time"{
+            001{"America/Whitehorse"}
+            CA{
+                "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre"
+                "ek America/Fort_Nelson"
+            }
+        }
     }
 }
diff -Nru firefox-84.0.2+build1/intl/tzdata/source/zoneinfo64.txt firefox-85.0+build1/intl/tzdata/source/zoneinfo64.txt
--- firefox-84.0.2+build1/intl/tzdata/source/zoneinfo64.txt	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/intl/tzdata/source/zoneinfo64.txt	2021-01-18 19:58:12.000000000 +0000
@@ -3,17 +3,17 @@
 // License & terms of use: http://www.unicode.org/copyright.html
 //---------------------------------------------------------
 // Build tool:  tz2icu
-// Build date:  Wed Oct 21 21:13:50 2020
+// Build date:  Mon Jan  4 23:38:49 2021
 // tz database: ftp://ftp.iana.org/tz/
-// tz version:  2020d
-// ICU version: 68.1
+// tz version:  2020f
+// ICU version: 68.2
 //---------------------------------------------------------
 // >> !!! >>   THIS IS A MACHINE-GENERATED FILE   << !!! <<
 // >> !!! >>>            DO NOT EDIT             <<< !!! <<
 //---------------------------------------------------------
 
 zoneinfo64:table(nofallback) {
- TZVersion { "2020d" }
+ TZVersion { "2020f" }
  Zones:array { 
   /* ACT */ :int { 356 } //Z#0
   /* AET */ :int { 368 } //Z#1
@@ -27,9 +27,9 @@
     links:intvector { 5, 11, 13, 21, 22, 27, 38, 51, 52, 55, 348 }
   } //Z#5
   /* Africa/Accra */ :table {
-    trans:intvector { -1640995148, -1556841600, -1546388400, -1525305600, -1514852400, -1493769600, -1483316400, -1462233600, -1451780400, -1430611200, -1420158000, -1399075200, -1388622000, -1367539200, -1357086000, -1336003200, -1325550000, -1304380800, -1293927600, -1272844800, -1262391600, -1241308800, -1230855600, -1209772800, -1199319600, -1178150400, -1167697200, -1146614400, -1136161200, -1115078400, -1104625200, -1083542400, -1073089200, -1051920000, -1041466800, -1020384000, -1009930800, -988848000, -978394800, -957312000, -946858800, -925689600, -915236400, -894153600, -883700400, -862617600, -852164400 }
-    typeOffsets:intvector { -52, 0, 0, 0, 0, 1200 }
-    typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    trans:intvector { -1709337548, -1581206400, -1577917200, -1556834400, -1546294800, -1525298400, -1514758800, -1493762400, -1483222800, -1462226400, -1451686800, -1430604000, -1420064400, -1399068000, -1388528400, -1367532000, -1356992400, -1335996000, -1325456400, -1304373600, -1293834000, -1272837600, -1262298000, -1241301600, -1230762000, -1209765600, -1199226000, -1178143200, -1167603600, -1146607200, -1136067600, -1115071200, -1104531600, -1083535200, -1072995600, -1051912800, -1041373200, -1020376800, -1009837200, -988840800, -978301200, -957304800, -946765200, -936309600, -915142800, -904773600, -883606800, -880329600, -756952200, -610149600, -599610600, -578613600, -568074600, -546991200, -536452200, -515455200, -504916200, -483919200, -473380200, -452383200, -441844200 }
+    typeOffsets:intvector { -52, 0, 0, 0, 0, 1200, 0, 1800, 1800, 0 }
+    typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010401030103010301030103010301" }
   } //Z#6
   /* Africa/Addis_Ababa */ :int { 48 } //Z#7
   /* Africa/Algiers */ :table {
@@ -108,9 +108,9 @@
   /* Africa/Kigali */ :int { 43 } //Z#34
   /* Africa/Kinshasa */ :int { 36 } //Z#35
   /* Africa/Lagos */ :table {
-    trans:intvector { -1588464816 }
-    typeOffsets:intvector { 816, 0, 3600, 0 }
-    typeMap:bin { "01" }
+    trans:intvector { -2035584815, -1940889600, -1767226415, -1588465800 }
+    typeOffsets:intvector { 815, 0, 0, 0, 1800, 0, 3600, 0 }
+    typeMap:bin { "01000203" }
     links:intvector { 12, 16, 25, 35, 36, 37, 39, 42, 50, 53 }
   } //Z#36
   /* Africa/Libreville */ :int { 36 } //Z#37
@@ -134,9 +134,9 @@
     typeMap:bin { "0102" }
   } //Z#47
   /* Africa/Nairobi */ :table {
-    trans:intvector { -1309746436, -1262314800, -946780200, -315629100 }
+    trans:intvector { -1946168836, -1309746600, -1261969200, -1041388200, -865305900 }
     typeOffsets:intvector { 8836, 0, 9000, 0, 9900, 0, 10800, 0 }
-    typeMap:bin { "03010203" }
+    typeMap:bin { "0103010203" }
     links:intvector { 7, 9, 10, 23, 24, 32, 46, 48, 397, 516, 520, 525 }
   } //Z#48
   /* Africa/Ndjamena */ :table {
@@ -318,9 +318,9 @@
     typeMap:bin { "0102010201020102010201020102010201020102010201020102010201" }
   } //Z#84
   /* America/Belize */ :table {
-    trans:intvector { -1822500432, -1616954400, -1606069800, -1585504800, -1574015400, -1554055200, -1542565800, -1522605600, -1511116200, -1490551200, -1479666600, -1459101600, -1448217000, -1427652000, -1416162600, -1396202400, -1384713000, -1364752800, -1353263400, -1333303200, -1321813800, -1301248800, -1290364200, -1269799200, -1258914600, -1238349600, -1226860200, -1206900000, -1195410600, -1175450400, -1163961000, -1143396000, -1132511400, -1111946400, -1101061800, -1080496800, -1069612200, -1049047200, -1037557800, -1017597600, -1006108200, -986148000, -974658600, -954093600, -943209000, -922644000, -911759400, -891194400, -879705000, -859744800, -848255400, 123919200, 129618000, 409039200, 413874000 }
+    trans:intvector { -1822500432, -1616954400, -1606069800, -1585504800, -1574015400, -1554055200, -1542565800, -1522605600, -1511116200, -1490551200, -1479666600, -1459101600, -1448217000, -1427652000, -1416162600, -1396202400, -1384713000, -1364752800, -1353263400, -1333303200, -1321813800, -1301248800, -1290364200, -1269799200, -1258914600, -1238349600, -1226860200, -1206900000, -1195410600, -1175450400, -1163961000, -1143396000, -1132511400, -1111946400, -1101061800, -1080496800, -1069612200, -1049047200, -1037557800, -1017597600, -1006108200, -986148000, -974658600, -954093600, -943209000, -922644000, -911759400, -891194400, -879705000, -868212000, -758746800, -701892000, -690402600, -670442400, -658953000, -638992800, -627503400, -606938400, -596053800, -575488800, -564604200, -544039200, -532549800, -512589600, -501100200, -481140000, -469650600, -449690400, -438201000, -417636000, -406751400, -386186400, -375301800, -354736800, -343247400, -323287200, -311797800, -291837600, -280348200, -259783200, -248898600, -228333600, -217449000, -196884000, -185999400, -165434400, -153945000, -133984800, -122495400, -102535200, -91045800, -70480800, -59596200, 123919200, 129618000, 409039200, 413874000 }
     typeOffsets:intvector { -21168, 0, -21600, 0, -21600, 1800, -21600, 3600 }
-    typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020103010301" }
+    typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201030102010201020102010201020102010201020102010201020102010201020102010201020102010201020103010301" }
   } //Z#85
   /* America/Blanc-Sablon */ :table {
     transPre32:intvector { -1, 1581070604 }
@@ -510,9 +510,9 @@
   } //Z#121
   /* America/Grand_Turk */ :table {
     transPre32:intvector { -1, 1770462768 }
-    trans:intvector { -1827687170, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1520751600, 1541311200 }
+    trans:intvector { -1827687170, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000, 1205046000, 1225605600, 1236495600, 1257055200, 1268550000, 1289109600, 1299999600, 1320559200, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1520751600, 1541311200 }
     typeOffsets:intvector { -17072, 0, -18430, 0, -18000, 0, -18000, 3600, -14400, 0 }
-    typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203040302" }
+    typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302040302" }
     finalRule { "US" }
     finalRaw:int { -18000 }
     finalYear:int { 2019 }
@@ -819,9 +819,9 @@
   /* America/Montreal */ :int { 218 } //Z#170
   /* America/Montserrat */ :int { 187 } //Z#171
   /* America/Nassau */ :table {
-    trans:intvector { -1825095030, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
+    trans:intvector { -1825095030, -873140400, -788904000, -786222000, -763848000, -179341200, -163620000, -147891600, -131565600, -116442000, -100116000, -84387600, -68666400, -52938000, -37216800, -21488400, -5767200, 9961200, 25682400, 41410800, 57736800, 73465200, 89186400, 104914800, 120636000, 136364400, 152085600, 167814000, 183535200, 199263600, 215589600, 230713200, 247039200, 262767600, 278488800, 294217200, 309938400, 325666800, 341388000, 357116400, 372837600, 388566000, 404892000, 420015600, 436341600, 452070000, 467791200, 483519600, 499240800, 514969200, 530690400, 544604400, 562140000, 576054000, 594194400, 607503600, 625644000, 638953200, 657093600, 671007600, 688543200, 702457200, 719992800, 733906800, 752047200, 765356400, 783496800, 796806000, 814946400, 828860400, 846396000, 860310000, 877845600, 891759600, 909295200, 923209200, 941349600, 954658800, 972799200, 986108400, 1004248800, 1018162800, 1035698400, 1049612400, 1067148000, 1081062000, 1099202400, 1112511600, 1130652000, 1143961200, 1162101600, 1173596400, 1194156000 }
     typeOffsets:intvector { -18570, 0, -18000, 0, -18000, 3600 }
-    typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
     finalRule { "US" }
     finalRaw:int { -18000 }
     finalYear:int { 2008 }
@@ -1176,7 +1176,7 @@
   } //Z#228
   /* Antarctica/Macquarie */ :table {
     transPre32:intvector { -1, 2080708096 }
-    trans:intvector { -1680508800, -1665392400, -1601719200, -687052800, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000, 1238860800, 1254585600, 1301760000, 1317484800 }
+    trans:intvector { -1680508800, -1665388800, -1601719200, -687052800, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000, 1238860800, 1254585600, 1301760000, 1317484800 }
     typeOffsets:intvector { 0, 0, 36000, 0, 36000, 3600 }
     typeMap:bin { "0102010001020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
     finalRule { "AT" }
@@ -1363,9 +1363,9 @@
   } //Z#268
   /* Asia/Gaza */ :table {
     transPre32:intvector { -1, 2109557424 }
-    trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 }
+    trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1219957200, 1238104800, 1252015200, 1269640860, 1281474000, 1301608860, 1312146000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 }
     typeOffsets:intvector { 8272, 0, 7200, 0, 7200, 3600 }
-    typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
     finalRule { "Palestine" }
     finalRaw:int { 7200 }
     finalYear:int { 2021 }
@@ -1373,9 +1373,9 @@
   /* Asia/Harbin */ :int { 315 } //Z#270
   /* Asia/Hebron */ :table {
     transPre32:intvector { -1, 2109557273 }
-    trans:intvector { -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 }
+    trans:intvector { -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -81313200, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 924213600, 939934800, 956268000, 971989200, 987717600, 1003438800, 1019167200, 1034888400, 1050616800, 1066338000, 1082066400, 1096581600, 1113516000, 1128380400, 1143842400, 1158872400, 1175378400, 1189638000, 1206655200, 1220216400, 1238104800, 1252015200, 1269554400, 1281474000, 1301608860, 1312146000, 1314655200, 1317330000, 1333058400, 1348178400, 1364508000, 1380229200, 1395957600, 1414098000, 1427493600, 1445551200, 1458946800, 1477692000, 1490396400, 1509141600, 1521846000, 1540591200, 1553810400, 1572037200, 1585346400, 1603490400 }
     typeOffsets:intvector { 8423, 0, 7200, 0, 7200, 3600 }
-    typeMap:bin { "01020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
     finalRule { "Palestine" }
     finalRaw:int { 7200 }
     finalYear:int { 2021 }
@@ -1415,9 +1415,9 @@
   } //Z#278
   /* Asia/Jerusalem */ :table {
     transPre32:intvector { -1, 1454818042 }
-    trans:intvector { -1641003640, -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -681962400, -673243200, -667962000, -652327200, -636426000, -622087200, -608947200, -591847200, -572486400, -558576000, -542851200, -527731200, -514425600, -490845600, -482986800, -459475200, -451537200, -428551200, -418262400, -400032000, -387428400, 142380000, 150843600, 167176800, 178664400, 334015200, 337644000, 452556000, 462232800, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1112313600, 1128812400, 1143763200, 1159657200, 1175212800, 1189897200, 1206662400, 1223161200, 1238112000, 1254006000, 1269561600, 1284246000, 1301616000, 1317510000, 1333065600, 1348354800, 1364515200, 1382828400 }
+    trans:intvector { -1641003640, -933638400, -923097600, -919036800, -857347200, -844300800, -825811200, -812678400, -794188800, -779846400, -762652800, -748310400, -731116800, -681955200, -673228800, -667958400, -652320000, -636422400, -622080000, -608947200, -591840000, -572486400, -558576000, -542851200, -527731200, -514425600, -490838400, -482976000, -459388800, -451526400, -428544000, -418262400, -400118400, -387417600, 142380000, 150843600, 167176800, 178664400, 334101600, 337730400, 452642400, 462319200, 482277600, 494370000, 516751200, 526424400, 545436000, 558478800, 576626400, 589323600, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1112313600, 1128812400, 1143763200, 1159657200, 1175212800, 1189897200, 1206662400, 1223161200, 1238112000, 1254006000, 1269561600, 1284246000, 1301616000, 1317510000, 1333065600, 1348354800, 1364515200, 1382828400 }
     typeOffsets:intvector { 8454, 0, 7200, 0, 7200, 3600, 7200, 7200, 8440, 0 }
-    typeMap:bin { "040102010201020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    typeMap:bin { "0401020102010201020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
     finalRule { "Zion" }
     finalRaw:int { 7200 }
     finalYear:int { 2014 }
@@ -1704,9 +1704,9 @@
     finalYear:int { 1997 }
   } //Z#338
   /* Atlantic/Bermuda */ :table {
-    trans:intvector { -1262281242, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 }
-    typeOffsets:intvector { -15558, 0, -14400, 0, -14400, 3600 }
-    typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+    trans:intvector { -1664307642, -1648932042, -1632080442, -1618692042, -1262281242, -882727200, -858538800, -845229600, -825879600, -814384800, -793825200, -782935200, -762375600, -713988000, -703710000, -681933600, -672865200, -650484000, -641415600, -618429600, -609966000, -586980000, -578516400, -555530400, -546462000, -429127200, -415825200, 136360800, 152082000, 167810400, 183531600, 199260000, 215586000, 230709600, 247035600, 262764000, 278485200, 294213600, 309934800, 325663200, 341384400, 357112800, 372834000, 388562400, 404888400, 420012000, 436338000, 452066400, 467787600, 483516000, 499237200, 514965600, 530686800, 544600800, 562136400, 576050400, 594190800, 607500000, 625640400, 638949600, 657090000, 671004000, 688539600, 702453600, 719989200, 733903200, 752043600, 765352800, 783493200, 796802400, 814942800, 828856800, 846392400, 860306400, 877842000, 891756000, 909291600, 923205600, 941346000, 954655200, 972795600, 986104800, 1004245200, 1018159200, 1035694800, 1049608800, 1067144400, 1081058400, 1099198800, 1112508000, 1130648400, 1143957600, 1162098000, 1173592800, 1194152400 }
+    typeOffsets:intvector { -15558, 0, -15558, 3600, -14400, 0, -14400, 3600 }
+    typeMap:bin { "0100010002030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
     finalRule { "US" }
     finalRaw:int { -14400 }
     finalYear:int { 2008 }
@@ -1763,7 +1763,7 @@
   /* Australia/ACT */ :int { 368 } //Z#350
   /* Australia/Adelaide */ :table {
     transPre32:intvector { -1, 1930857236, -1, 2064778096 }
-    trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 384280200, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 637691400, 657045000, 667931400, 688494600, 701195400, 719944200, 731435400, 751998600, 764094600, 783448200, 796149000, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
+    trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 384280200, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 637691400, 657045000, 667931400, 688494600, 701195400, 719944200, 731435400, 751998600, 764094600, 783448200, 796149000, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
     typeOffsets:intvector { 33260, 0, 32400, 0, 34200, 0, 34200, 3600 }
     typeMap:bin { "01020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203" }
     finalRule { "AS" }
@@ -1773,14 +1773,14 @@
   } //Z#351
   /* Australia/Brisbane */ :table {
     transPre32:intvector { -1, 1928175368 }
-    trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200 }
+    trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200 }
     typeOffsets:intvector { 36728, 0, 36000, 0, 36000, 3600 }
     typeMap:bin { "0102010201020102010201020102010201" }
     links:intvector { 352, 366 }
   } //Z#352
   /* Australia/Broken_Hill */ :table {
     transPre32:intvector { -1, 1930856548, -1, 1980016096, -1, 2064778096 }
-    trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 386699400, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 636481800, 657045000, 667931400, 688494600, 699381000, 719944200, 731435400, 751998600, 762885000, 783448200, 794334600, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
+    trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800, 57688200, 67969800, 89137800, 100024200, 120587400, 131473800, 152037000, 162923400, 183486600, 194977800, 215541000, 226427400, 246990600, 257877000, 278440200, 289326600, 309889800, 320776200, 341339400, 352225800, 372789000, 386699400, 404843400, 415729800, 436293000, 447179400, 467742600, 478629000, 499192200, 511288200, 530037000, 542737800, 562091400, 574792200, 594145800, 606241800, 625595400, 636481800, 657045000, 667931400, 688494600, 699381000, 719944200, 731435400, 751998600, 762885000, 783448200, 794334600, 814897800, 828203400, 846347400, 859653000, 877797000, 891102600, 909246600, 922552200, 941301000, 954001800, 972750600, 985451400, 1004200200, 1017505800, 1035649800, 1048955400, 1067099400, 1080405000, 1099153800, 1111854600, 1130603400, 1143909000, 1162053000, 1174753800, 1193502600, 1207413000, 1223137800 }
     typeOffsets:intvector { 33948, 0, 32400, 0, 34200, 0, 34200, 3600, 36000, 0 }
     typeMap:bin { "0401020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203" }
     finalRule { "AS" }
@@ -1789,42 +1789,34 @@
     links:intvector { 353, 372 }
   } //Z#353
   /* Australia/Canberra */ :int { 368 } //Z#354
-  /* Australia/Currie */ :table {
-    transPre32:intvector { -1, 1949172768 }
-    trans:intvector { -1680508800, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 }
-    typeOffsets:intvector { 34528, 0, 36000, 0, 36000, 3600 }
-    typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
-    finalRule { "AT" }
-    finalRaw:int { 36000 }
-    finalYear:int { 2009 }
-  } //Z#355
+  /* Australia/Currie */ :int { 358 } //Z#355
   /* Australia/Darwin */ :table {
     transPre32:intvector { -1, 1930859096, -1, 2064778096 }
-    trans:intvector { -1672565340, -1665390600, -883639800, -876126600, -860398200, -844677000, -828343800, -813227400 }
+    trans:intvector { -1672558200, -1665387000, -883639800, -876123000, -860398200, -844673400, -828343800, -813223800 }
     typeOffsets:intvector { 31400, 0, 32400, 0, 34200, 0, 34200, 3600 }
     typeMap:bin { "01020302030203020302" }
     links:intvector { 0, 356, 364 }
   } //Z#356
   /* Australia/Eucla */ :table {
     transPre32:intvector { -1, 1957038768 }
-    trans:intvector { -1672562640, -1665387900, -883637100, -876123900, -860395500, -844674300, 152039700, 162926100, 436295700, 447182100, 690311700, 699383700, 1165079700, 1174756500, 1193505300, 1206810900, 1224954900, 1238260500 }
+    trans:intvector { -1672555500, -1665384300, -883637100, -876120300, -860395500, -844670700, 152039700, 162926100, 436295700, 447182100, 690311700, 699383700, 1165079700, 1174756500, 1193505300, 1206810900, 1224954900, 1238260500 }
     typeOffsets:intvector { 30928, 0, 31500, 0, 31500, 3600 }
     typeMap:bin { "01020102010201020102010201020102010201" }
   } //Z#357
   /* Australia/Hobart */ :table {
     transPre32:intvector { -1, 1949171940 }
-    trans:intvector { -1680508800, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 }
+    trans:intvector { -1680508800, -1665388800, -1646640000, -1635753600, -1615190400, -1604304000, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, -71136000, -55411200, -37267200, -25776000, -5817600, 5673600, 25632000, 37728000, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386092800, 404841600, 417542400, 436291200, 447177600, 467740800, 478627200, 499190400, 510076800, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 670348800, 686678400, 701798400, 718128000, 733248000, 749577600, 764697600, 781027200, 796147200, 812476800, 828201600, 844531200, 859651200, 875980800, 891100800, 907430400, 922550400, 938880000, 954000000, 967305600, 985449600, 1002384000, 1017504000, 1033833600, 1048953600, 1065283200, 1080403200, 1096732800, 1111852800, 1128182400, 1143907200, 1159632000, 1174752000, 1191686400, 1207411200, 1223136000 }
     typeOffsets:intvector { 35356, 0, 36000, 0, 36000, 3600 }
-    typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
+    typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
     finalRule { "AT" }
     finalRaw:int { 36000 }
     finalYear:int { 2009 }
-    links:intvector { 358, 369 }
+    links:intvector { 355, 358, 369 }
   } //Z#358
   /* Australia/LHI */ :int { 361 } //Z#359
   /* Australia/Lindeman */ :table {
     transPre32:intvector { -1, 1928176340 }
-    trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200 }
+    trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200 }
     typeOffsets:intvector { 35756, 0, 36000, 0, 36000, 3600 }
     typeMap:bin { "010201020102010201020102010201020102010201" }
   } //Z#360
@@ -1840,7 +1832,7 @@
   } //Z#361
   /* Australia/Melbourne */ :table {
     transPre32:intvector { -1, 1930855704 }
-    trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 384278400, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 561484800, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 796147200, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
+    trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 384278400, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 561484800, 574790400, 594144000, 606240000, 625593600, 637689600, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 796147200, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
     typeOffsets:intvector { 34792, 0, 36000, 0, 36000, 3600 }
     typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
     finalRule { "AV" }
@@ -1852,7 +1844,7 @@
   /* Australia/North */ :int { 356 } //Z#364
   /* Australia/Perth */ :table {
     transPre32:intvector { -1, 1957041892 }
-    trans:intvector { -1672559940, -1665385200, -883634400, -876121200, -860392800, -844671600, 152042400, 162928800, 436298400, 447184800, 690314400, 699386400, 1165082400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200 }
+    trans:intvector { -1672552800, -1665381600, -883634400, -876117600, -860392800, -844668000, 152042400, 162928800, 436298400, 447184800, 690314400, 699386400, 1165082400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200 }
     typeOffsets:intvector { 27804, 0, 28800, 0, 28800, 3600 }
     typeMap:bin { "01020102010201020102010201020102010201" }
     links:intvector { 365, 371 }
@@ -1861,7 +1853,7 @@
   /* Australia/South */ :int { 351 } //Z#367
   /* Australia/Sydney */ :table {
     transPre32:intvector { -1, 1930854204 }
-    trans:intvector { -1672567140, -1665392400, -883641600, -876128400, -860400000, -844678800, -828345600, -813229200, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386697600, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 794332800, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
+    trans:intvector { -1672560000, -1665388800, -883641600, -876124800, -860400000, -844675200, -828345600, -813225600, 57686400, 67968000, 89136000, 100022400, 120585600, 131472000, 152035200, 162921600, 183484800, 194976000, 215539200, 226425600, 246988800, 257875200, 278438400, 289324800, 309888000, 320774400, 341337600, 352224000, 372787200, 386697600, 404841600, 415728000, 436291200, 447177600, 467740800, 478627200, 499190400, 511286400, 530035200, 542736000, 562089600, 574790400, 594144000, 606240000, 625593600, 636480000, 657043200, 667929600, 688492800, 699379200, 719942400, 731433600, 751996800, 762883200, 783446400, 794332800, 814896000, 828201600, 846345600, 859651200, 877795200, 891100800, 909244800, 922550400, 941299200, 954000000, 967305600, 985449600, 1004198400, 1017504000, 1035648000, 1048953600, 1067097600, 1080403200, 1099152000, 1111852800, 1130601600, 1143907200, 1162051200, 1174752000, 1193500800, 1207411200, 1223136000 }
     typeOffsets:intvector { 36292, 0, 36000, 0, 36000, 3600 }
     typeMap:bin { "010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102" }
     finalRule { "AN" }
@@ -2390,9 +2382,9 @@
     finalYear:int { 2004 }
   } //Z#497
   /* Europe/Volgograd */ :table {
-    trans:intvector { -1577761060, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1540681200 }
+    trans:intvector { -1577761060, -1247540400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 701820000, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400, 1540681200, 1609020000 }
     typeOffsets:intvector { 10660, 0, 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
-    typeMap:bin { "01030403040304030403040304030403020102010201030201020102010201020102010201020102010201020102010201020102010201020102010201030103" }
+    typeMap:bin { "0103040304030403040304030403040302010201020103020102010201020102010201020102010201020102010201020102010201020102010201020103010301" }
   } //Z#498
   /* Europe/Warsaw */ :table {
     trans:intvector { -1717032240, -1693706400, -1680483600, -1663455600, -1650150000, -1632006000, -1618700400, -1600473600, -1587168000, -1501725600, -931734000, -857257200, -844556400, -828226800, -812502000, -796608000, -778726800, -762660000, -748486800, -733273200, -715215600, -701910000, -684975600, -670460400, -654130800, -639010800, -397094400, -386812800, -371088000, -355363200, -334195200, -323308800, -307584000, -291859200, -271296000, -260409600, -239846400, -228960000, -208396800, -197510400, -176342400, -166060800, 228873600, 243993600, 260323200, 276048000, 291772800, 307497600, 323827200, 338947200, 354672000, 370396800, 386121600, 401846400, 417571200, 433296000, 449020800, 465350400, 481075200, 496800000, 512524800, 528249600, 543974400, 559699200, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 }
@@ -2463,7 +2455,7 @@
     typeMap:bin { "01" }
   } //Z#521
   /* Indian/Mahe */ :table {
-    trans:intvector { -2006653308 }
+    trans:intvector { -1988163708 }
     typeOffsets:intvector { 13308, 0, 14400, 0 }
     typeMap:bin { "01" }
   } //Z#522
@@ -2584,9 +2576,9 @@
     links:intvector { 395, 557 }
   } //Z#557
   /* Pacific/Efate */ :table {
-    trans:intvector { -1829387596, 433256400, 448977600, 467298000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 }
+    trans:intvector { -1829387596, 125409600, 133876800, 433256400, 448977600, 464706000, 480427200, 496760400, 511876800, 528210000, 543931200, 559659600, 575380800, 591109200, 606830400, 622558800, 638280000, 654008400, 669729600, 686062800, 696340800, 719931600, 727790400 }
     typeOffsets:intvector { 40396, 0, 39600, 0, 39600, 3600 }
-    typeMap:bin { "010201020102010201020102010201020102010201" }
+    typeMap:bin { "0102010201020102010201020102010201020102010201" }
   } //Z#558
   /* Pacific/Enderbury */ :table {
     transPre32:intvector { -1, 2117555556 }
diff -Nru firefox-84.0.2+build1/intl/tzdata/VERSION firefox-85.0+build1/intl/tzdata/VERSION
--- firefox-84.0.2+build1/intl/tzdata/VERSION	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/tzdata/VERSION	2021-01-18 19:58:12.000000000 +0000
@@ -1 +1 @@
-2020d
+2020f
diff -Nru firefox-84.0.2+build1/intl/unicharutil/util/nsUnicharUtils.cpp firefox-85.0+build1/intl/unicharutil/util/nsUnicharUtils.cpp
--- firefox-84.0.2+build1/intl/unicharutil/util/nsUnicharUtils.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/intl/unicharutil/util/nsUnicharUtils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -196,8 +196,9 @@
 int32_t nsCaseInsensitiveStringComparator(const char16_t* lhs,
                                           const char16_t* rhs, uint32_t lLength,
                                           uint32_t rLength) {
-  return (lLength == rLength) ? CaseInsensitiveCompare(lhs, rhs, lLength)
-                              : (lLength > rLength) ? 1 : -1;
+  return (lLength == rLength)  ? CaseInsensitiveCompare(lhs, rhs, lLength)
+         : (lLength > rLength) ? 1
+                               : -1;
 }
 
 int32_t nsCaseInsensitiveUTF8StringComparator(const char* lhs, const char* rhs,
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/message_pump_libevent.cc firefox-85.0+build1/ipc/chromium/src/base/message_pump_libevent.cc
--- firefox-84.0.2+build1/ipc/chromium/src/base/message_pump_libevent.cc	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/message_pump_libevent.cc	2021-01-18 19:58:12.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsDependentSubstring.h"
 #include "event.h"
 #include "mozilla/UniquePtr.h"
+#include "GeckoProfiler.h"
 
 // This macro checks that the _EVENT_SIZEOF_* constants defined in
 // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct.
@@ -106,6 +107,8 @@
 
 // Called if a byte is received on the wakeup pipe.
 void MessagePumpLibevent::OnWakeup(int socket, short flags, void* context) {
+  AUTO_PROFILER_LABEL("MessagePumpLibevent::OnWakeup", OTHER);
+
   base::MessagePumpLibevent* that =
       static_cast<base::MessagePumpLibevent*>(context);
   DCHECK(that->wakeup_pipe_out_ == socket);
@@ -235,6 +238,8 @@
 
 void MessagePumpLibevent::OnLibeventNotification(int fd, short flags,
                                                  void* context) {
+  AUTO_PROFILER_LABEL("MessagePumpLibevent::OnLibeventNotification", OTHER);
+
   Watcher* watcher = static_cast<Watcher*>(context);
 
   if (flags & EV_WRITE) {
@@ -302,6 +307,8 @@
 
 void MessagePumpLibevent::OnLibeventSignalNotification(int sig, short flags,
                                                        void* context) {
+  AUTO_PROFILER_LABEL("MessagePumpLibevent::OnLibeventSignalNotification", OTHER);
+
   DCHECK(sig > 0);
   DCHECK(EV_SIGNAL == flags);
   DCHECK(context);
@@ -333,6 +340,7 @@
 
     // EVLOOP_ONCE tells libevent to only block once,
     // but to service all pending events when it wakes up.
+    AUTO_PROFILER_LABEL("MessagePumpLibevent::Run::Wait", IDLE);
     if (delayed_work_time_.is_null()) {
       event_base_loop(event_base_, EVLOOP_ONCE);
     } else {
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/process_util.h firefox-85.0+build1/ipc/chromium/src/base/process_util.h
--- firefox-84.0.2+build1/ipc/chromium/src/base/process_util.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/process_util.h	2021-01-18 19:58:12.000000000 +0000
@@ -13,6 +13,7 @@
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
+#  include "mozilla/ipc/EnvironmentMap.h"
 #  include <windows.h>
 #  include <tlhelp32.h>
 #elif defined(OS_LINUX) || defined(__GLIBC__)
@@ -23,19 +24,18 @@
 #  include <mach/mach.h>
 #endif
 
-#include <functional>
+#include <cstddef>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/process.h"
 
 #include "mozilla/UniquePtr.h"
-#include "mozilla/ipc/EnvironmentMap.h"
 
 #if defined(MOZ_ENABLE_FORKSERVER)
-#  include "nsString.h"
+#  include "nsStringFwd.h"
 #  include "mozilla/Tuple.h"
 #  include "mozilla/ipc/FileDescriptorShuffle.h"
 
@@ -50,6 +50,8 @@
 struct kinfo_proc;
 #endif
 
+class CommandLine;
+
 namespace base {
 
 enum ProcessArchitecture {
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/process_util_linux.cc firefox-85.0+build1/ipc/chromium/src/base/process_util_linux.cc
--- firefox-84.0.2+build1/ipc/chromium/src/base/process_util_linux.cc	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/process_util_linux.cc	2021-01-18 19:58:12.000000000 +0000
@@ -31,6 +31,7 @@
 using namespace mozilla::ipc;
 #endif
 
+#include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "mozilla/ipc/FileDescriptor.h"
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/process_util_mac.mm firefox-85.0+build1/ipc/chromium/src/base/process_util_mac.mm
--- firefox-84.0.2+build1/ipc/chromium/src/base/process_util_mac.mm	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/process_util_mac.mm	2021-01-18 19:58:12.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include <string>
 
+#include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "mozilla/ipc/FileDescriptorShuffle.h"
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/process_util_posix.cc firefox-85.0+build1/ipc/chromium/src/base/process_util_posix.cc
--- firefox-84.0.2+build1/ipc/chromium/src/base/process_util_posix.cc	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/process_util_posix.cc	2021-01-18 19:58:12.000000000 +0000
@@ -20,6 +20,7 @@
 #include <set>
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/base/process_util_win.cc firefox-85.0+build1/ipc/chromium/src/base/process_util_win.cc
--- firefox-84.0.2+build1/ipc/chromium/src/base/process_util_win.cc	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/base/process_util_win.cc	2021-01-18 19:58:12.000000000 +0000
@@ -18,6 +18,7 @@
 #  define STDOUT_FILENO 1
 #endif
 
+#include "base/command_line.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/win_util.h"
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/child_thread.cc firefox-85.0+build1/ipc/chromium/src/chrome/common/child_thread.cc
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/child_thread.cc	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/child_thread.cc	2021-01-18 19:58:12.000000000 +0000
@@ -9,7 +9,7 @@
 #include "chrome/common/child_process.h"
 
 ChildThread::ChildThread(Thread::Options options)
-    : Thread("Chrome_ChildThread"),
+    : Thread("IPC I/O Child"),
       owner_loop_(MessageLoop::current()),
       options_(options) {
   DCHECK(owner_loop_);
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel.h firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel.h
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,14 +7,20 @@
 #ifndef CHROME_COMMON_IPC_CHANNEL_H_
 #define CHROME_COMMON_IPC_CHANNEL_H_
 
-#include <string>
-
+#include <cstdint>
 #include <queue>
-#include "chrome/common/ipc_message.h"
+#include "base/basictypes.h"
+#include "build/build_config.h"
 #include "mozilla/UniquePtr.h"
 
+#ifdef OS_WIN
+#  include <string>
+#endif
+
 namespace IPC {
 
+class Message;
+
 //------------------------------------------------------------------------------
 
 class Channel {
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_posix.cc firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_posix.cc	2021-01-18 19:58:12.000000000 +0000
@@ -32,6 +32,7 @@
 #include "chrome/common/file_descriptor_set_posix.h"
 #include "chrome/common/ipc_channel_utils.h"
 #include "chrome/common/ipc_message_utils.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/StaticMutex.h"
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_utils.cc firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_utils.cc	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_utils.cc	2021-01-18 19:58:12.000000000 +0000
@@ -6,12 +6,9 @@
 
 #include "chrome/common/ipc_channel_utils.h"
 
+#include "GeckoProfiler.h"
 #include "chrome/common/ipc_message.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 namespace IPC {
 
 void AddIPCProfilerMarker(const Message& aMessage, int32_t aOtherPid,
@@ -25,11 +22,19 @@
       return;
     }
 
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "IPC", IPC, IPCMarkerPayload,
-        (aOtherPid, aMessage.seqno(), aMessage.type(),
-         mozilla::ipc::UnknownSide, aDirection, aPhase, aMessage.is_sync(),
-         mozilla::TimeStamp::NowUnfuzzed()));
+    if (profiler_is_locked_on_current_thread()) {
+      // One of the profiler mutexes is locked on this thread, don't record
+      // markers, because we don't want to expose profiler IPCs due to the
+      // profiler itself, and also to avoid possible re-entrancy issues.
+      return;
+    }
+
+    // The current timestamp must be given to the `IPCMarker` payload.
+    const mozilla::TimeStamp now = mozilla::TimeStamp::NowUnfuzzed();
+    PROFILER_MARKER("IPC", IPC, mozilla::MarkerTiming::InstantAt(now),
+                    IPCMarker, now, now, aOtherPid, aMessage.seqno(),
+                    aMessage.type(), mozilla::ipc::UnknownSide, aDirection,
+                    aPhase, aMessage.is_sync());
   }
 #endif
 }
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_win.h firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_win.h
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_channel_win.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_channel_win.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,7 @@
 #define CHROME_COMMON_IPC_CHANNEL_WIN_H_
 
 #include "chrome/common/ipc_channel.h"
+#include "chrome/common/ipc_message.h"
 
 #include <string>
 
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_message.h firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_message.h
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_message.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_message.h	2021-01-18 19:58:12.000000000 +0000
@@ -120,9 +120,9 @@
                           Constructor constructor, Sync sync,
                           Interrupt interrupt, Reply reply)
         : mFlags(level | (priority << 2) |
-                 (compression == COMPRESSION_ENABLED
-                      ? COMPRESS_BIT
-                      : compression == COMPRESSION_ALL ? COMPRESSALL_BIT : 0) |
+                 (compression == COMPRESSION_ENABLED ? COMPRESS_BIT
+                  : compression == COMPRESSION_ALL   ? COMPRESSALL_BIT
+                                                     : 0) |
                  (constructor == CONSTRUCTOR ? CONSTRUCTOR_BIT : 0) |
                  (sync == SYNC ? SYNC_BIT : 0) |
                  (interrupt == INTERRUPT ? INTERRUPT_BIT : 0) |
@@ -137,10 +137,9 @@
     }
 
     MessageCompression Compression() const {
-      return ((mFlags & COMPRESS_BIT)
-                  ? COMPRESSION_ENABLED
-                  : (mFlags & COMPRESSALL_BIT) ? COMPRESSION_ALL
-                                               : COMPRESSION_NONE);
+      return ((mFlags & COMPRESS_BIT)      ? COMPRESSION_ENABLED
+              : (mFlags & COMPRESSALL_BIT) ? COMPRESSION_ALL
+                                           : COMPRESSION_NONE);
     }
 
     bool IsConstructor() const { return (mFlags & CONSTRUCTOR_BIT) != 0; }
diff -Nru firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_message_utils.h firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_message_utils.h
--- firefox-84.0.2+build1/ipc/chromium/src/chrome/common/ipc_message_utils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/chromium/src/chrome/common/ipc_message_utils.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,16 +7,19 @@
 #ifndef CHROME_COMMON_IPC_MESSAGE_UTILS_H_
 #define CHROME_COMMON_IPC_MESSAGE_UTILS_H_
 
+#include <cstdint>
+#include <map>
 #include <string>
 #include <type_traits>
-#include <vector>
-#include <map>
-
-#include "base/file_path.h"
-#include "base/process.h"
+#include <utility>
+#include "ErrorList.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "base/pickle.h"
 #include "base/string_util.h"
-#include "base/string16.h"
-#include "base/time.h"
+#include "build/build_config.h"
+#include "chrome/common/ipc_message.h"
 
 #if defined(OS_POSIX)
 #  include "chrome/common/file_descriptor_set_posix.h"
@@ -24,7 +27,6 @@
 #if defined(OS_WIN)
 #  include "windows.h"
 #endif
-#include "chrome/common/ipc_message.h"
 
 template <typename T>
 class RefPtr;
diff -Nru firefox-84.0.2+build1/ipc/contentproc/plugin-container.cpp firefox-85.0+build1/ipc/contentproc/plugin-container.cpp
--- firefox-84.0.2+build1/ipc/contentproc/plugin-container.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/contentproc/plugin-container.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
 #include "mozilla/Bootstrap.h"
+#include "XREChildData.h"
 
 #ifdef XP_WIN
 #  include <windows.h>
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundImpl.cpp firefox-85.0+build1/ipc/glue/BackgroundImpl.cpp
--- firefox-84.0.2+build1/ipc/glue/BackgroundImpl.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundImpl.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentChild.h"
@@ -27,6 +28,7 @@
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRef.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/ProtocolTypes.h"
 #include "mozilla/net/SocketProcessChild.h"
 #include "mozilla/net/SocketProcessBridgeChild.h"
@@ -587,7 +589,7 @@
   ~ShutdownObserver() { AssertIsOnMainThread(); }
 };
 
-class ChildImpl::SendInitBackgroundRunnable final : public CancelableRunnable {
+class ChildImpl::SendInitBackgroundRunnable final : public DiscardableRunnable {
   nsCOMPtr<nsISerialEventTarget> mOwningEventTarget;
   RefPtr<StrongWorkerRef> mWorkerRef;
   Endpoint<PBackgroundParent> mParent;
@@ -614,7 +616,8 @@
       Endpoint<PBackgroundParent>&& aParent,
       std::function<void(Endpoint<PBackgroundParent>&& aParent)>&& aFunc,
       unsigned int aThreadLocalIndex)
-      : CancelableRunnable("Background::ChildImpl::SendInitBackgroundRunnable"),
+      : DiscardableRunnable(
+            "Background::ChildImpl::SendInitBackgroundRunnable"),
         mOwningEventTarget(GetCurrentSerialEventTarget()),
         mParent(std::move(aParent)),
         mMutex("SendInitBackgroundRunnable::mMutex"),
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundParent.h firefox-85.0+build1/ipc/glue/BackgroundParent.h
--- firefox-84.0.2+build1/ipc/glue/BackgroundParent.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundParent.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,6 +10,11 @@
 #include "base/process.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ipc/Transport.h"
+#include "nsTArrayForwardDeclare.h"
+
+#ifdef DEBUG
+#  include "nsXULAppAPI.h"
+#endif
 
 template <class>
 struct already_AddRefed;
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundParentImpl.cpp firefox-85.0+build1/ipc/glue/BackgroundParentImpl.cpp
--- firefox-84.0.2+build1/ipc/glue/BackgroundParentImpl.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundParentImpl.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -57,6 +57,7 @@
 #include "mozilla/dom/simpledb/ActorsParent.h"
 #include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/ipc/BackgroundUtils.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/IPCStreamAlloc.h"
 #include "mozilla/ipc/IdleSchedulerParent.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
@@ -1106,6 +1107,22 @@
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult
+BackgroundParentImpl::RecvPropagateBackgroundSessionStorageManager(
+    const uint64_t& aCurrentTopContextId, const uint64_t& aTargetTopContextId) {
+  AssertIsInMainOrSocketProcess();
+  AssertIsOnBackgroundThread();
+
+  if (BackgroundParent::IsOtherProcessActor(this)) {
+    return IPC_FAIL(this, "Wrong actor");
+  }
+
+  mozilla::dom::RecvPropagateBackgroundSessionStorageManager(
+      aCurrentTopContextId, aTargetTopContextId);
+
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult
 BackgroundParentImpl::RecvRemoveBackgroundSessionStorageManager(
     const uint64_t& aTopContextId) {
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundParentImpl.h firefox-85.0+build1/ipc/glue/BackgroundParentImpl.h
--- firefox-84.0.2+build1/ipc/glue/BackgroundParentImpl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundParentImpl.h	2021-01-18 19:58:12.000000000 +0000
@@ -316,6 +316,10 @@
   mozilla::ipc::IPCResult RecvShutdownBackgroundSessionStorageManagers()
       override;
 
+  mozilla::ipc::IPCResult RecvPropagateBackgroundSessionStorageManager(
+      const uint64_t& aCurrentTopContextId,
+      const uint64_t& aTargetTopContextId) override;
+
   mozilla::ipc::IPCResult RecvRemoveBackgroundSessionStorageManager(
       const uint64_t& aTopContextId) override;
 
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundUtils.cpp firefox-85.0+build1/ipc/glue/BackgroundUtils.cpp
--- firefox-84.0.2+build1/ipc/glue/BackgroundUtils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundUtils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,6 +29,7 @@
 #include "mozilla/dom/nsCSPContext.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/WindowGlobalParent.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/ipc/glue/BackgroundUtils.h firefox-85.0+build1/ipc/glue/BackgroundUtils.h
--- firefox-84.0.2+build1/ipc/glue/BackgroundUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BackgroundUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/BasePrincipal.h"
+#include "mozilla/OriginAttributes.h"
 #include "nsCOMPtr.h"
 #include "nscore.h"
 
@@ -48,6 +48,11 @@
 }  // namespace IPC
 
 namespace mozilla {
+
+namespace dom {
+class Document;
+}
+
 namespace net {
 class ChildLoadInfoForwarderArgs;
 class LoadInfoArgs;
diff -Nru firefox-84.0.2+build1/ipc/glue/BrowserProcessSubThread.cpp firefox-85.0+build1/ipc/glue/BrowserProcessSubThread.cpp
--- firefox-84.0.2+build1/ipc/glue/BrowserProcessSubThread.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/BrowserProcessSubThread.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -19,7 +19,7 @@
 
 // Friendly names for the well-known threads.
 static const char* kBrowserThreadNames[BrowserProcessSubThread::ID_COUNT] = {
-    "Gecko_IOThread",  // IO
+    "IPC I/O Parent",  // IO
 };
 
 /* static */
diff -Nru firefox-84.0.2+build1/ipc/glue/CrashReporterHelper.h firefox-85.0+build1/ipc/glue/CrashReporterHelper.h
--- firefox-84.0.2+build1/ipc/glue/CrashReporterHelper.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/CrashReporterHelper.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/UniquePtr.h"
 #include "nsExceptionHandler.h"
 #include "nsICrashService.h"
+#include "nsPrintfCString.h"
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/ipc/glue/Endpoint.h firefox-85.0+build1/ipc/glue/Endpoint.h
--- firefox-84.0.2+build1/ipc/glue/Endpoint.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/Endpoint.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,239 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef IPC_GLUE_ENDPOINT_H_
+#define IPC_GLUE_ENDPOINT_H_
+
+#include <utility>
+#include "CrashAnnotations.h"
+#include "base/process.h"
+#include "base/process_util.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/ipc/MessageLink.h"
+#include "mozilla/ipc/Transport.h"
+#include "nsXULAppAPI.h"
+#include "nscore.h"
+
+namespace IPC {
+template <class P>
+struct ParamTraits;
+}
+
+namespace mozilla {
+namespace ipc {
+
+struct PrivateIPDLInterface {};
+
+/**
+ * An endpoint represents one end of a partially initialized IPDL channel. To
+ * set up a new top-level protocol:
+ *
+ * Endpoint<PFooParent> parentEp;
+ * Endpoint<PFooChild> childEp;
+ * nsresult rv;
+ * rv = PFoo::CreateEndpoints(parentPid, childPid, &parentEp, &childEp);
+ *
+ * You're required to pass in parentPid and childPid, which are the pids of the
+ * processes in which the parent and child endpoints will be used.
+ *
+ * Endpoints can be passed in IPDL messages or sent to other threads using
+ * PostTask. Once an Endpoint has arrived at its destination process and thread,
+ * you need to create the top-level actor and bind it to the endpoint:
+ *
+ * FooParent* parent = new FooParent();
+ * bool rv1 = parentEp.Bind(parent, processActor);
+ * bool rv2 = parent->SendBar(...);
+ *
+ * (See Bind below for an explanation of processActor.) Once the actor is bound
+ * to the endpoint, it can send and receive messages.
+ */
+template <class PFooSide>
+class Endpoint {
+ public:
+  typedef base::ProcessId ProcessId;
+
+  Endpoint()
+      : mValid(false),
+        mMode(static_cast<mozilla::ipc::Transport::Mode>(0)),
+        mMyPid(0),
+        mOtherPid(0) {}
+
+  Endpoint(const PrivateIPDLInterface&, mozilla::ipc::Transport::Mode aMode,
+           TransportDescriptor aTransport, ProcessId aMyPid,
+           ProcessId aOtherPid)
+      : mValid(true),
+        mMode(aMode),
+        mTransport(aTransport),
+        mMyPid(aMyPid),
+        mOtherPid(aOtherPid) {}
+
+  Endpoint(Endpoint&& aOther)
+      : mValid(aOther.mValid),
+        mTransport(aOther.mTransport),
+        mMyPid(aOther.mMyPid),
+        mOtherPid(aOther.mOtherPid) {
+    if (aOther.mValid) {
+      mMode = aOther.mMode;
+    }
+    aOther.mValid = false;
+  }
+
+  Endpoint& operator=(Endpoint&& aOther) {
+    mValid = aOther.mValid;
+    if (aOther.mValid) {
+      mMode = aOther.mMode;
+    }
+    mTransport = aOther.mTransport;
+    mMyPid = aOther.mMyPid;
+    mOtherPid = aOther.mOtherPid;
+
+    aOther.mValid = false;
+    return *this;
+  }
+
+  ~Endpoint() {
+    if (mValid) {
+      CloseDescriptor(mTransport);
+    }
+  }
+
+  ProcessId OtherPid() const { return mOtherPid; }
+
+  // This method binds aActor to this endpoint. After this call, the actor can
+  // be used to send and receive messages. The endpoint becomes invalid.
+  bool Bind(PFooSide* aActor) {
+    MOZ_RELEASE_ASSERT(mValid);
+    MOZ_RELEASE_ASSERT(mMyPid == base::GetCurrentProcId());
+
+    UniquePtr<Transport> transport =
+        mozilla::ipc::OpenDescriptor(mTransport, mMode);
+    if (!transport) {
+      return false;
+    }
+    if (!aActor->Open(
+            std::move(transport), mOtherPid, XRE_GetIOMessageLoop(),
+            mMode == Transport::MODE_SERVER ? ParentSide : ChildSide)) {
+      return false;
+    }
+    mValid = false;
+    return true;
+  }
+
+  bool IsValid() const { return mValid; }
+
+ private:
+  friend struct IPC::ParamTraits<Endpoint<PFooSide>>;
+
+  Endpoint(const Endpoint&) = delete;
+  Endpoint& operator=(const Endpoint&) = delete;
+
+  bool mValid;
+  mozilla::ipc::Transport::Mode mMode;
+  TransportDescriptor mTransport;
+  ProcessId mMyPid, mOtherPid;
+};
+
+#if defined(XP_MACOSX)
+void AnnotateCrashReportWithErrno(CrashReporter::Annotation tag, int error);
+#else
+static inline void AnnotateCrashReportWithErrno(CrashReporter::Annotation tag,
+                                                int error) {}
+#endif
+
+// This function is used internally to create a pair of Endpoints. See the
+// comment above Endpoint for a description of how it might be used.
+template <class PFooParent, class PFooChild>
+nsresult CreateEndpoints(const PrivateIPDLInterface& aPrivate,
+                         base::ProcessId aParentDestPid,
+                         base::ProcessId aChildDestPid,
+                         Endpoint<PFooParent>* aParentEndpoint,
+                         Endpoint<PFooChild>* aChildEndpoint) {
+  MOZ_RELEASE_ASSERT(aParentDestPid);
+  MOZ_RELEASE_ASSERT(aChildDestPid);
+
+  TransportDescriptor parentTransport, childTransport;
+  nsresult rv;
+  if (NS_FAILED(rv = CreateTransport(aParentDestPid, &parentTransport,
+                                     &childTransport))) {
+    AnnotateCrashReportWithErrno(
+        CrashReporter::Annotation::IpcCreateEndpointsNsresult, int(rv));
+    return rv;
+  }
+
+  *aParentEndpoint =
+      Endpoint<PFooParent>(aPrivate, mozilla::ipc::Transport::MODE_SERVER,
+                           parentTransport, aParentDestPid, aChildDestPid);
+
+  *aChildEndpoint =
+      Endpoint<PFooChild>(aPrivate, mozilla::ipc::Transport::MODE_CLIENT,
+                          childTransport, aChildDestPid, aParentDestPid);
+
+  return NS_OK;
+}
+
+/**
+ * A managed endpoint represents one end of a partially initialized managed
+ * IPDL actor. It is used for situations where the usual IPDL Constructor
+ * methods do not give sufficient control over the construction of actors, such
+ * as when constructing actors within replies, or constructing multiple related
+ * actors simultaneously.
+ *
+ * FooParent* parent = new FooParent();
+ * ManagedEndpoint<PFooChild> childEp = parentMgr->OpenPFooEndpoint(parent);
+ *
+ * ManagedEndpoints should be sent using IPDL messages or other mechanisms to
+ * the other side of the manager channel. Once the ManagedEndpoint has arrived
+ * at its destination, you can create the actor, and bind it to the endpoint.
+ *
+ * FooChild* child = new FooChild();
+ * childMgr->BindPFooEndpoint(childEp, child);
+ *
+ * WARNING: If the remote side of an endpoint has not been bound before it
+ * begins to receive messages, an IPC routing error will occur, likely causing
+ * a browser crash.
+ */
+template <class PFooSide>
+class ManagedEndpoint {
+ public:
+  ManagedEndpoint() : mId(0) {}
+
+  ManagedEndpoint(const PrivateIPDLInterface&, int32_t aId) : mId(aId) {}
+
+  ManagedEndpoint(ManagedEndpoint&& aOther) : mId(aOther.mId) {
+    aOther.mId = 0;
+  }
+
+  ManagedEndpoint& operator=(ManagedEndpoint&& aOther) {
+    mId = aOther.mId;
+    aOther.mId = 0;
+    return *this;
+  }
+
+  bool IsValid() const { return mId != 0; }
+
+  Maybe<int32_t> ActorId() const { return IsValid() ? Some(mId) : Nothing(); }
+
+  bool operator==(const ManagedEndpoint& _o) const { return mId == _o.mId; }
+
+ private:
+  friend struct IPC::ParamTraits<ManagedEndpoint<PFooSide>>;
+
+  ManagedEndpoint(const ManagedEndpoint&) = delete;
+  ManagedEndpoint& operator=(const ManagedEndpoint&) = delete;
+
+  // The routing ID for the to-be-created endpoint.
+  int32_t mId;
+
+  // XXX(nika): Might be nice to have other info for assertions?
+  // e.g. mManagerId, mManagerType, etc.
+};
+
+}  // namespace ipc
+}  // namespace mozilla
+
+#endif  // IPC_GLUE_ENDPOINT_H_
diff -Nru firefox-84.0.2+build1/ipc/glue/EnumSerializer.h firefox-85.0+build1/ipc/glue/EnumSerializer.h
--- firefox-84.0.2+build1/ipc/glue/EnumSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/EnumSerializer.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,167 @@
+/* -*- 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 __IPC_GLUE_ENUMSERIALIZER_H__
+#define __IPC_GLUE_ENUMSERIALIZER_H__
+
+#include "CrashAnnotations.h"
+#include "chrome/common/ipc_message_utils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/IntegerTypeTraits.h"
+#include "nsExceptionHandler.h"
+#include "nsLiteralString.h"
+#include "nsString.h"
+#include "nsTLiteralString.h"
+
+class PickleIterator;
+
+namespace IPC {
+class Message;
+}
+
+#ifdef _MSC_VER
+#  pragma warning(disable : 4800)
+#endif
+
+namespace IPC {
+
+/**
+ * Generic enum serializer.
+ *
+ * Consider using the specializations below, such as ContiguousEnumSerializer.
+ *
+ * This is a generic serializer for any enum type used in IPDL.
+ * Programmers can define ParamTraits<E> for enum type E by deriving
+ * EnumSerializer<E, MyEnumValidator> where MyEnumValidator is a struct
+ * that has to define a static IsLegalValue function returning whether
+ * a given value is a legal value of the enum type at hand.
+ *
+ * \sa https://developer.mozilla.org/en/IPDL/Type_Serialization
+ */
+template <typename E, typename EnumValidator>
+struct EnumSerializer {
+  typedef E paramType;
+  typedef typename mozilla::UnsignedStdintTypeForSize<sizeof(paramType)>::Type
+      uintParamType;
+
+  static void Write(Message* aMsg, const paramType& aValue) {
+    MOZ_RELEASE_ASSERT(EnumValidator::IsLegalValue(aValue));
+    WriteParam(aMsg, uintParamType(aValue));
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    uintParamType value;
+    if (!ReadParam(aMsg, aIter, &value)) {
+      CrashReporter::AnnotateCrashReport(
+          CrashReporter::Annotation::IPCReadErrorReason, "Bad iter"_ns);
+      return false;
+    } else if (!EnumValidator::IsLegalValue(paramType(value))) {
+      CrashReporter::AnnotateCrashReport(
+          CrashReporter::Annotation::IPCReadErrorReason, "Illegal value"_ns);
+      return false;
+    }
+    *aResult = paramType(value);
+    return true;
+  }
+};
+
+template <typename E, E MinLegal, E HighBound>
+class ContiguousEnumValidator {
+  // Silence overzealous -Wtype-limits bug in GCC fixed in GCC 4.8:
+  // "comparison of unsigned expression >= 0 is always true"
+  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11856
+  template <typename T>
+  static bool IsLessThanOrEqual(T a, T b) {
+    return a <= b;
+  }
+
+ public:
+  static bool IsLegalValue(E e) {
+    return IsLessThanOrEqual(MinLegal, e) && e < HighBound;
+  }
+};
+
+template <typename E, E MinLegal, E MaxLegal>
+class ContiguousEnumValidatorInclusive {
+  // Silence overzealous -Wtype-limits bug in GCC fixed in GCC 4.8:
+  // "comparison of unsigned expression >= 0 is always true"
+  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11856
+  template <typename T>
+  static bool IsLessThanOrEqual(T a, T b) {
+    return a <= b;
+  }
+
+ public:
+  static bool IsLegalValue(E e) {
+    return IsLessThanOrEqual(MinLegal, e) && e <= MaxLegal;
+  }
+};
+
+template <typename E, E AllBits>
+struct BitFlagsEnumValidator {
+  static bool IsLegalValue(E e) { return (e & AllBits) == e; }
+};
+
+/**
+ * Specialization of EnumSerializer for enums with contiguous enum values.
+ *
+ * Provide two values: MinLegal, HighBound. An enum value x will be
+ * considered legal if MinLegal <= x < HighBound.
+ *
+ * For example, following is definition of serializer for enum type FOO.
+ * \code
+ * enum FOO { FOO_FIRST, FOO_SECOND, FOO_LAST, NUM_FOO };
+ *
+ * template <>
+ * struct ParamTraits<FOO>:
+ *     public ContiguousEnumSerializer<FOO, FOO_FIRST, NUM_FOO> {};
+ * \endcode
+ * FOO_FIRST, FOO_SECOND, and FOO_LAST are valid value.
+ */
+template <typename E, E MinLegal, E HighBound>
+struct ContiguousEnumSerializer
+    : EnumSerializer<E, ContiguousEnumValidator<E, MinLegal, HighBound>> {};
+
+/**
+ * This is similar to ContiguousEnumSerializer, but the last template
+ * parameter is expected to be the highest legal value, rather than a
+ * sentinel value. This is intended to support enumerations that don't
+ * have sentinel values.
+ */
+template <typename E, E MinLegal, E MaxLegal>
+struct ContiguousEnumSerializerInclusive
+    : EnumSerializer<E,
+                     ContiguousEnumValidatorInclusive<E, MinLegal, MaxLegal>> {
+};
+
+/**
+ * Specialization of EnumSerializer for enums representing bit flags.
+ *
+ * Provide one value: AllBits. An enum value x will be
+ * considered legal if (x & AllBits) == x;
+ *
+ * Example:
+ * \code
+ * enum FOO {
+ *   FOO_FIRST =  1 << 0,
+ *   FOO_SECOND = 1 << 1,
+ *   FOO_LAST =   1 << 2,
+ *   ALL_BITS =   (1 << 3) - 1
+ * };
+ *
+ * template <>
+ * struct ParamTraits<FOO>:
+ *     public BitFlagsEnumSerializer<FOO, FOO::ALL_BITS> {};
+ * \endcode
+ */
+template <typename E, E AllBits>
+struct BitFlagsEnumSerializer
+    : EnumSerializer<E, BitFlagsEnumValidator<E, AllBits>> {};
+
+} /* namespace IPC */
+
+#endif /* __IPC_GLUE_ENUMSERIALIZER_H__ */
diff -Nru firefox-84.0.2+build1/ipc/glue/FileDescriptor.cpp firefox-85.0+build1/ipc/glue/FileDescriptor.cpp
--- firefox-84.0.2+build1/ipc/glue/FileDescriptor.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/FileDescriptor.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #include "FileDescriptor.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/ipc/ProtocolMessageUtils.h"
 #include "nsDebug.h"
 
 #ifdef XP_WIN
diff -Nru firefox-84.0.2+build1/ipc/glue/FileDescriptor.h firefox-85.0+build1/ipc/glue/FileDescriptor.h
--- firefox-84.0.2+build1/ipc/glue/FileDescriptor.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/FileDescriptor.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,9 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/process.h"
-#include "ipc/IPCMessageUtils.h"
 #include "mozilla/UniquePtrExtensions.h"
-#include "mozilla/ipc/IPDLParamTraits.h"
 
 #ifdef XP_UNIX
 #  include "base/file_descriptor_posix.h"
@@ -98,16 +96,6 @@
   UniquePlatformHandle mHandle;
 };
 
-template <>
-struct IPDLParamTraits<FileDescriptor> {
-  typedef FileDescriptor paramType;
-
-  static void Write(IPC::Message* aMsg, IProtocol* aActor,
-                    const paramType& aParam);
-  static bool Read(const IPC::Message* aMsg, PickleIterator* aIter,
-                   IProtocol* aActor, paramType* aResult);
-};
-
 }  // namespace ipc
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/ipc/glue/ForkServer.cpp firefox-85.0+build1/ipc/glue/ForkServer.cpp
--- firefox-84.0.2+build1/ipc/glue/ForkServer.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ForkServer.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/Logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "mozilla/BlockingResourceBase.h"
+#include "mozilla/ipc/ProtocolMessageUtils.h"
 #include "nsTraceRefcnt.h"
 
 #include <string.h>
diff -Nru firefox-84.0.2+build1/ipc/glue/ForkServiceChild.cpp firefox-85.0+build1/ipc/glue/ForkServiceChild.cpp
--- firefox-84.0.2+build1/ipc/glue/ForkServiceChild.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ForkServiceChild.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/ipc/IPDLParamTraits.h"
 #include "mozilla/Logging.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
+#include "mozilla/ipc/ProtocolMessageUtils.h"
 #include "mozilla/StaticPrefs_dom.h"
 
 #include <unistd.h>
@@ -44,7 +45,7 @@
 void ForkServiceChild::StopForkServer() { sForkServiceChild = nullptr; }
 
 ForkServiceChild::ForkServiceChild(int aFd, GeckoChildProcessHost* aProcess)
-    : mWaitForHello(true), mProcess(aProcess) {
+    : mWaitForHello(true), mFailed(false), mProcess(aProcess) {
   mTcver = MakeUnique<MiniTransceiver>(aFd);
 }
 
@@ -75,6 +76,7 @@
   if (!mTcver->Send(msg)) {
     MOZ_LOG(gForkServiceLog, LogLevel::Verbose,
             ("the pipe to the fork server is closed or having errors"));
+    OnError();
     return false;
   }
 
@@ -82,6 +84,7 @@
   if (!mTcver->Recv(reply)) {
     MOZ_LOG(gForkServiceLog, LogLevel::Verbose,
             ("the pipe to the fork server is closed or having errors"));
+    OnError();
     return false;
   }
   OnMessageReceived(std::move(reply));
@@ -105,6 +108,11 @@
   message.EndRead(iter__, message.type());
 }
 
+void ForkServiceChild::OnError() {
+  mFailed = true;
+  ForkServerLauncher::RestartForkServer();
+}
+
 NS_IMPL_ISUPPORTS(ForkServerLauncher, nsIObserver)
 
 bool ForkServerLauncher::mHaveStartedClient = false;
@@ -157,5 +165,18 @@
   return NS_OK;
 }
 
+void ForkServerLauncher::RestartForkServer() {
+  // Restart fork server
+  NS_SUCCEEDED(NS_DispatchToMainThreadQueue(
+      NS_NewRunnableFunction("OnForkServerError",
+                             [] {
+                               if (mSingleton) {
+                                 ForkServiceChild::StopForkServer();
+                                 ForkServiceChild::StartForkServer();
+                               }
+                             }),
+      EventQueuePriority::Idle));
+}
+
 }  // namespace ipc
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/ipc/glue/ForkServiceChild.h firefox-85.0+build1/ipc/glue/ForkServiceChild.h
--- firefox-84.0.2+build1/ipc/glue/ForkServiceChild.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ForkServiceChild.h	2021-01-18 19:58:12.000000000 +0000
@@ -58,16 +58,21 @@
   /**
    * Return the singleton.
    */
-  static ForkServiceChild* Get() { return sForkServiceChild.get(); }
+  static ForkServiceChild* Get() {
+    auto child = sForkServiceChild.get();
+    return child == nullptr || child->mFailed ? nullptr : child;
+  }
 
  private:
   // Called when a message is received.
   void OnMessageReceived(IPC::Message&& message);
+  void OnError();
 
   UniquePtr<MiniTransceiver> mTcver;
   static UniquePtr<ForkServiceChild> sForkServiceChild;
   pid_t mRecvPid;
   bool mWaitForHello;
+  bool mFailed;  // The forkserver has crashed or disconnected.
   GeckoChildProcessHost* mProcess;
 };
 
@@ -83,8 +88,11 @@
   static already_AddRefed<ForkServerLauncher> Create();
 
  private:
+  friend class ForkServiceChild;
   virtual ~ForkServerLauncher();
 
+  static void RestartForkServer();
+
   static bool mHaveStartedClient;
   static StaticRefPtr<ForkServerLauncher> mSingleton;
 };
diff -Nru firefox-84.0.2+build1/ipc/glue/GeckoChildProcessHost.cpp firefox-85.0+build1/ipc/glue/GeckoChildProcessHost.cpp
--- firefox-84.0.2+build1/ipc/glue/GeckoChildProcessHost.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/GeckoChildProcessHost.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -12,33 +12,27 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/process_watcher.h"
 #ifdef MOZ_WIDGET_COCOA
-#  include "chrome/common/mach_ipc_mac.h"
+#  include "SharedMemoryBasic.h"
 #  include "base/rand_util.h"
+#  include "chrome/common/mach_ipc_mac.h"
 #  include "nsILocalFileMac.h"
-#  include "SharedMemoryBasic.h"
 #endif
 
+#include "GeckoProfiler.h"
 #include "MainThreadUtils.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Sprintf.h"
-#include "prenv.h"
 #include "nsXPCOMPrivate.h"
+#include "prenv.h"
 
 #if defined(MOZ_SANDBOX)
 #  include "mozilla/SandboxSettings.h"
 #  include "nsAppDirectoryServiceDefs.h"
 #endif
 
-#include "nsExceptionHandler.h"
-
-#include "nsDirectoryService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsIFile.h"
-#include "nsPrintfCString.h"
-#include "nsIObserverService.h"
+#include <sys/stat.h>
 
-#include "mozilla/ipc/BrowserProcessSubThread.h"
-#include "mozilla/ipc/EnvironmentMap.h"
-#include "mozilla/net/SocketProcessHost.h"
+#include "ProtocolUtils.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Maybe.h"
@@ -50,18 +44,26 @@
 #include "mozilla/StaticMutex.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/Telemetry.h"
-#include "ProtocolUtils.h"
-#include <sys/stat.h>
+#include "mozilla/ipc/BrowserProcessSubThread.h"
+#include "mozilla/ipc/EnvironmentMap.h"
+#include "mozilla/net/SocketProcessHost.h"
+#include "nsDirectoryService.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsExceptionHandler.h"
+#include "nsIFile.h"
+#include "nsIObserverService.h"
+#include "nsPrintfCString.h"
 
 #ifdef XP_WIN
-#  include "nsIWinTaskbar.h"
 #  include <stdlib.h>
+
+#  include "nsIWinTaskbar.h"
 #  define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1"
 
 #  if defined(MOZ_SANDBOX)
+#    include "WinUtils.h"
 #    include "mozilla/Preferences.h"
 #    include "mozilla/sandboxing/sandboxLogging.h"
-#    include "WinUtils.h"
 #    if defined(_ARM64_)
 #      include "mozilla/remoteSandboxBroker.h"
 #    endif
@@ -79,10 +81,10 @@
 #  include "nsMacUtilsImpl.h"
 #endif
 
-#include "nsTArray.h"
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsNativeCharsetUtils.h"
+#include "nsTArray.h"
 #include "nscore.h"  // for NS_FREE_PERMANENT_DATA
 #include "private/pprio.h"
 
@@ -696,65 +698,66 @@
   // to be sure that all of our post-launch processing on |this| happens before
   // mHandlePromise notifies.
   MOZ_ASSERT(mHandlePromise == nullptr);
-  RefPtr<ProcessHandlePromise::Private> p =
-      new ProcessHandlePromise::Private(__func__);
-  mHandlePromise = p;
-
-  mozilla::InvokeAsync<GeckoChildProcessHost*>(
-      IOThread(), launcher.get(), __func__, &BaseProcessLauncher::Launch, this)
-      ->Then(
-          IOThread(), __func__,
-          [this, p](const LaunchResults aResults) {
-            {
-              if (!OpenPrivilegedHandle(base::GetProcId(aResults.mHandle))
+  mHandlePromise =
+      mozilla::InvokeAsync<GeckoChildProcessHost*>(
+          IOThread(), launcher.get(), __func__, &BaseProcessLauncher::Launch,
+          this)
+          ->Then(
+              IOThread(), __func__,
+              [this](const LaunchResults& aResults) {
+                {
+                  if (!OpenPrivilegedHandle(base::GetProcId(aResults.mHandle))
 #ifdef XP_WIN
-                  // If we failed in opening the process handle, try harder by
-                  // duplicating one.
-                  && !::DuplicateHandle(::GetCurrentProcess(), aResults.mHandle,
-                                        ::GetCurrentProcess(),
-                                        &mChildProcessHandle,
-                                        PROCESS_DUP_HANDLE | PROCESS_TERMINATE |
-                                            PROCESS_QUERY_INFORMATION |
-                                            PROCESS_VM_READ | SYNCHRONIZE,
-                                        FALSE, 0)
+                      // If we failed in opening the process handle, try harder
+                      // by duplicating one.
+                      && !::DuplicateHandle(
+                             ::GetCurrentProcess(), aResults.mHandle,
+                             ::GetCurrentProcess(), &mChildProcessHandle,
+                             PROCESS_DUP_HANDLE | PROCESS_TERMINATE |
+                                 PROCESS_QUERY_INFORMATION | PROCESS_VM_READ |
+                                 SYNCHRONIZE,
+                             FALSE, 0)
 #endif  // XP_WIN
-              ) {
-                MOZ_CRASH("cannot open handle to child process");
-              }
+                  ) {
+                    MOZ_CRASH("cannot open handle to child process");
+                  }
 
 #ifdef XP_MACOSX
-              this->mChildTask = aResults.mChildTask;
+                  this->mChildTask = aResults.mChildTask;
 #endif
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
-              this->mSandboxBroker = aResults.mSandboxBroker;
+                  this->mSandboxBroker = aResults.mSandboxBroker;
 #endif
 
-              MonitorAutoLock lock(mMonitor);
-              // The OnChannel{Connected,Error} may have already advanced the
-              // state.
-              if (mProcessState < PROCESS_CREATED) {
-                mProcessState = PROCESS_CREATED;
-              }
-              lock.Notify();
-            }
-            p->Resolve(aResults.mHandle, __func__);
-          },
-          [this, p](const LaunchError aError) {
-            // WaitUntilConnected might be waiting for us to signal.
-            // If something failed let's set the error state and notify.
-            CHROMIUM_LOG(ERROR)
-                << "Failed to launch "
-                << XRE_GeckoProcessTypeToString(mProcessType) << " subprocess";
-            Telemetry::Accumulate(
-                Telemetry::SUBPROCESS_LAUNCH_FAILURE,
-                nsDependentCString(XRE_GeckoProcessTypeToString(mProcessType)));
-            {
-              MonitorAutoLock lock(mMonitor);
-              mProcessState = PROCESS_ERROR;
-              lock.Notify();
-            }
-            p->Reject(aError, __func__);
-          });
+                  MonitorAutoLock lock(mMonitor);
+                  // The OnChannel{Connected,Error} may have already advanced
+                  // the state.
+                  if (mProcessState < PROCESS_CREATED) {
+                    mProcessState = PROCESS_CREATED;
+                  }
+                  lock.Notify();
+                }
+                return ProcessHandlePromise::CreateAndResolve(aResults.mHandle,
+                                                              __func__);
+              },
+              [this](const LaunchError aError) {
+                // WaitUntilConnected might be waiting for us to signal.
+                // If something failed let's set the error state and notify.
+                CHROMIUM_LOG(ERROR)
+                    << "Failed to launch "
+                    << XRE_GeckoProcessTypeToString(mProcessType)
+                    << " subprocess";
+                Telemetry::Accumulate(
+                    Telemetry::SUBPROCESS_LAUNCH_FAILURE,
+                    nsDependentCString(
+                        XRE_GeckoProcessTypeToString(mProcessType)));
+                {
+                  MonitorAutoLock lock(mMonitor);
+                  mProcessState = PROCESS_ERROR;
+                  lock.Notify();
+                }
+                return ProcessHandlePromise::CreateAndReject(aError, __func__);
+              });
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/ipc/glue/GeckoChildProcessHost.h firefox-85.0+build1/ipc/glue/GeckoChildProcessHost.h
--- firefox-84.0.2+build1/ipc/glue/GeckoChildProcessHost.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/GeckoChildProcessHost.h	2021-01-18 19:58:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "base/process_util.h"
 #include "base/waitable_event.h"
 #include "chrome/common/child_process_host.h"
+#include "chrome/common/ipc_message.h"
 
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/Atomics.h"
@@ -18,6 +19,7 @@
 #include "mozilla/LinkedList.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/MozPromise.h"
+#include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
 
diff -Nru firefox-84.0.2+build1/ipc/glue/IdleSchedulerParent.cpp firefox-85.0+build1/ipc/glue/IdleSchedulerParent.cpp
--- firefox-84.0.2+build1/ipc/glue/IdleSchedulerParent.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IdleSchedulerParent.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -4,7 +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/ScopeExit.h"
 #include "mozilla/StaticPrefs_page_load.h"
 #include "mozilla/Unused.h"
 #include "mozilla/ipc/IdleSchedulerParent.h"
diff -Nru firefox-84.0.2+build1/ipc/glue/InputStreamParams.ipdlh firefox-85.0+build1/ipc/glue/InputStreamParams.ipdlh
--- firefox-84.0.2+build1/ipc/glue/InputStreamParams.ipdlh	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/InputStreamParams.ipdlh	2021-01-18 19:58:12.000000000 +0000
@@ -8,8 +8,7 @@
 include protocol PParentToChildStream;
 include protocol PRemoteLazyInputStream;
 
-using struct mozilla::void_t
-  from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCCore.h firefox-85.0+build1/ipc/glue/IPCCore.h
--- firefox-84.0.2+build1/ipc/glue/IPCCore.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCCore.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,22 @@
+/* -*- 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 IPC_GLUE_IPCCORE_H_
+#define IPC_GLUE_IPCCORE_H_
+
+namespace mozilla {
+
+struct void_t {
+  constexpr bool operator==(const void_t&) const { return true; }
+};
+
+struct null_t {
+  constexpr bool operator==(const null_t&) const { return true; }
+};
+
+}  // namespace mozilla
+
+#endif  // IPC_GLUE_IPCCORE_H_
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCMessageUtils.cpp firefox-85.0+build1/ipc/glue/IPCMessageUtils.cpp
--- firefox-84.0.2+build1/ipc/glue/IPCMessageUtils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCMessageUtils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -5,6 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "IPCMessageUtils.h"
+
+#include <cstddef>
 #include "mozilla/CheckedInt.h"
 
 namespace IPC {
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCMessageUtils.h firefox-85.0+build1/ipc/glue/IPCMessageUtils.h
--- firefox-84.0.2+build1/ipc/glue/IPCMessageUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCMessageUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,44 +7,19 @@
 #ifndef __IPC_GLUE_IPCMESSAGEUTILS_H__
 #define __IPC_GLUE_IPCMESSAGEUTILS_H__
 
-#include "base/process_util.h"
+#include <cstdint>
+#include <string>
+#include <type_traits>
+#include "build/build_config.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/common/ipc_message_utils.h"
+#include "mozilla/MacroForEach.h"
+#include "mozilla/ipc/IPCCore.h"
 
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/DebugOnly.h"
-#include "mozilla/dom/ipc/StructuredCloneData.h"
-#include "mozilla/BitSet.h"
-#include "mozilla/EnumSet.h"
-#include "mozilla/EnumTypeTraits.h"
-#include "mozilla/IntegerRange.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/net/WebSocketFrame.h"
-#include "mozilla/TimeStamp.h"
-#ifdef XP_WIN
-#  include "mozilla/TimeStamp_windows.h"
-#endif
-#include "mozilla/IntegerTypeTraits.h"
-#include "mozilla/Vector.h"
-
-#include <limits>
-#include <stdint.h>
-#include <type_traits>
-#include <unordered_map>
-#include <vector>
+class PickleIterator;
 
-#include "nsDebug.h"
-#include "nsExceptionHandler.h"
-#include "nsHashKeys.h"
-#include "nsID.h"
-#include "nsILoadInfo.h"
-#include "nsIWidget.h"
-#include "nsMemory.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "nsTHashtable.h"
-#include "js/StructuredClone.h"
-#include "nsCSSPropertyID.h"
+// XXX Things that are not necessary if moving implementations to the cpp file
+#include "base/string_util.h"
 
 #ifdef _MSC_VER
 #  pragma warning(disable : 4800)
@@ -62,182 +37,18 @@
 #endif
 
 namespace mozilla {
+template <typename...>
+class Variant;
 
-// This is a cross-platform approximation to HANDLE, which we expect
-// to be typedef'd to void* or thereabouts.
-typedef uintptr_t WindowsHandle;
-
-// XXX there are out of place and might be generally useful.  Could
-// move to nscore.h or something.
-struct void_t {
-  bool operator==(const void_t&) const { return true; }
-};
-struct null_t {
-  bool operator==(const null_t&) const { return true; }
-};
-
-struct SerializedStructuredCloneBuffer final {
-  SerializedStructuredCloneBuffer() = default;
-
-  SerializedStructuredCloneBuffer(SerializedStructuredCloneBuffer&&) = default;
-  SerializedStructuredCloneBuffer& operator=(
-      SerializedStructuredCloneBuffer&&) = default;
-
-  SerializedStructuredCloneBuffer(const SerializedStructuredCloneBuffer&) =
-      delete;
-  SerializedStructuredCloneBuffer& operator=(
-      const SerializedStructuredCloneBuffer& aOther) = delete;
-
-  bool operator==(const SerializedStructuredCloneBuffer& aOther) const {
-    // The copy assignment operator and the equality operator are
-    // needed by the IPDL generated code. We relied on the copy
-    // assignment operator at some places but we never use the
-    // equality operator.
-    return false;
-  }
-
-  JSStructuredCloneData data{JS::StructuredCloneScope::Unassigned};
-};
-
+namespace detail {
+template <typename...>
+struct VariantTag;
+}
 }  // namespace mozilla
 
 namespace IPC {
 
 /**
- * Generic enum serializer.
- *
- * Consider using the specializations below, such as ContiguousEnumSerializer.
- *
- * This is a generic serializer for any enum type used in IPDL.
- * Programmers can define ParamTraits<E> for enum type E by deriving
- * EnumSerializer<E, MyEnumValidator> where MyEnumValidator is a struct
- * that has to define a static IsLegalValue function returning whether
- * a given value is a legal value of the enum type at hand.
- *
- * \sa https://developer.mozilla.org/en/IPDL/Type_Serialization
- */
-template <typename E, typename EnumValidator>
-struct EnumSerializer {
-  typedef E paramType;
-  typedef typename mozilla::UnsignedStdintTypeForSize<sizeof(paramType)>::Type
-      uintParamType;
-
-  static void Write(Message* aMsg, const paramType& aValue) {
-    MOZ_RELEASE_ASSERT(EnumValidator::IsLegalValue(aValue));
-    WriteParam(aMsg, uintParamType(aValue));
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    uintParamType value;
-    if (!ReadParam(aMsg, aIter, &value)) {
-      CrashReporter::AnnotateCrashReport(
-          CrashReporter::Annotation::IPCReadErrorReason, "Bad iter"_ns);
-      return false;
-    } else if (!EnumValidator::IsLegalValue(paramType(value))) {
-      CrashReporter::AnnotateCrashReport(
-          CrashReporter::Annotation::IPCReadErrorReason, "Illegal value"_ns);
-      return false;
-    }
-    *aResult = paramType(value);
-    return true;
-  }
-};
-
-template <typename E, E MinLegal, E HighBound>
-class ContiguousEnumValidator {
-  // Silence overzealous -Wtype-limits bug in GCC fixed in GCC 4.8:
-  // "comparison of unsigned expression >= 0 is always true"
-  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11856
-  template <typename T>
-  static bool IsLessThanOrEqual(T a, T b) {
-    return a <= b;
-  }
-
- public:
-  static bool IsLegalValue(E e) {
-    return IsLessThanOrEqual(MinLegal, e) && e < HighBound;
-  }
-};
-
-template <typename E, E MinLegal, E MaxLegal>
-class ContiguousEnumValidatorInclusive {
-  // Silence overzealous -Wtype-limits bug in GCC fixed in GCC 4.8:
-  // "comparison of unsigned expression >= 0 is always true"
-  // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11856
-  template <typename T>
-  static bool IsLessThanOrEqual(T a, T b) {
-    return a <= b;
-  }
-
- public:
-  static bool IsLegalValue(E e) {
-    return IsLessThanOrEqual(MinLegal, e) && e <= MaxLegal;
-  }
-};
-
-template <typename E, E AllBits>
-struct BitFlagsEnumValidator {
-  static bool IsLegalValue(E e) { return (e & AllBits) == e; }
-};
-
-/**
- * Specialization of EnumSerializer for enums with contiguous enum values.
- *
- * Provide two values: MinLegal, HighBound. An enum value x will be
- * considered legal if MinLegal <= x < HighBound.
- *
- * For example, following is definition of serializer for enum type FOO.
- * \code
- * enum FOO { FOO_FIRST, FOO_SECOND, FOO_LAST, NUM_FOO };
- *
- * template <>
- * struct ParamTraits<FOO>:
- *     public ContiguousEnumSerializer<FOO, FOO_FIRST, NUM_FOO> {};
- * \endcode
- * FOO_FIRST, FOO_SECOND, and FOO_LAST are valid value.
- */
-template <typename E, E MinLegal, E HighBound>
-struct ContiguousEnumSerializer
-    : EnumSerializer<E, ContiguousEnumValidator<E, MinLegal, HighBound>> {};
-
-/**
- * This is similar to ContiguousEnumSerializer, but the last template
- * parameter is expected to be the highest legal value, rather than a
- * sentinel value. This is intended to support enumerations that don't
- * have sentinel values.
- */
-template <typename E, E MinLegal, E MaxLegal>
-struct ContiguousEnumSerializerInclusive
-    : EnumSerializer<E,
-                     ContiguousEnumValidatorInclusive<E, MinLegal, MaxLegal>> {
-};
-
-/**
- * Specialization of EnumSerializer for enums representing bit flags.
- *
- * Provide one value: AllBits. An enum value x will be
- * considered legal if (x & AllBits) == x;
- *
- * Example:
- * \code
- * enum FOO {
- *   FOO_FIRST =  1 << 0,
- *   FOO_SECOND = 1 << 1,
- *   FOO_LAST =   1 << 2,
- *   ALL_BITS =   (1 << 3) - 1
- * };
- *
- * template <>
- * struct ParamTraits<FOO>:
- *     public BitFlagsEnumSerializer<FOO, FOO::ALL_BITS> {};
- * \endcode
- */
-template <typename E, E AllBits>
-struct BitFlagsEnumSerializer
-    : EnumSerializer<E, BitFlagsEnumValidator<E, AllBits>> {};
-
-/**
  * A helper class for serializing plain-old data (POD) structures.
  * The memory representation of the structure is written to and read from
  * the serialized stream directly, without individual processing of the
@@ -339,523 +150,6 @@
 #endif  // !defined(OS_POSIX)
 
 template <>
-struct ParamTraits<nsACString> {
-  typedef nsACString paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    bool isVoid = aParam.IsVoid();
-    aMsg->WriteBool(isVoid);
-
-    if (isVoid)
-      // represents a nullptr pointer
-      return;
-
-    uint32_t length = aParam.Length();
-    WriteParam(aMsg, length);
-    aMsg->WriteBytes(aParam.BeginReading(), length);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    bool isVoid;
-    if (!aMsg->ReadBool(aIter, &isVoid)) return false;
-
-    if (isVoid) {
-      aResult->SetIsVoid(true);
-      return true;
-    }
-
-    uint32_t length;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-    if (!aMsg->HasBytesAvailable(aIter, length)) {
-      return false;
-    }
-    aResult->SetLength(length);
-
-    return aMsg->ReadBytesInto(aIter, aResult->BeginWriting(), length);
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    if (aParam.IsVoid())
-      aLog->append(L"(NULL)");
-    else
-      aLog->append(UTF8ToWide(aParam.BeginReading()));
-  }
-};
-
-template <>
-struct ParamTraits<nsAString> {
-  typedef nsAString paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    bool isVoid = aParam.IsVoid();
-    aMsg->WriteBool(isVoid);
-
-    if (isVoid)
-      // represents a nullptr pointer
-      return;
-
-    uint32_t length = aParam.Length();
-    WriteParam(aMsg, length);
-    aMsg->WriteBytes(aParam.BeginReading(), length * sizeof(char16_t));
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    bool isVoid;
-    if (!aMsg->ReadBool(aIter, &isVoid)) return false;
-
-    if (isVoid) {
-      aResult->SetIsVoid(true);
-      return true;
-    }
-
-    uint32_t length;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-
-    mozilla::CheckedInt<uint32_t> byteLength =
-        mozilla::CheckedInt<uint32_t>(length) * sizeof(char16_t);
-    if (!byteLength.isValid() ||
-        !aMsg->HasBytesAvailable(aIter, byteLength.value())) {
-      return false;
-    }
-
-    aResult->SetLength(length);
-
-    return aMsg->ReadBytesInto(aIter, aResult->BeginWriting(),
-                               byteLength.value());
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    if (aParam.IsVoid())
-      aLog->append(L"(NULL)");
-    else {
-#ifdef WCHAR_T_IS_UTF16
-      aLog->append(reinterpret_cast<const wchar_t*>(aParam.BeginReading()));
-#else
-      uint32_t length = aParam.Length();
-      for (uint32_t index = 0; index < length; index++) {
-        aLog->push_back(std::wstring::value_type(aParam[index]));
-      }
-#endif
-    }
-  }
-};
-
-template <>
-struct ParamTraits<nsCString> : ParamTraits<nsACString> {
-  typedef nsCString paramType;
-};
-
-template <>
-struct ParamTraits<nsLiteralCString> : ParamTraits<nsACString> {
-  typedef nsLiteralCString paramType;
-};
-
-#ifdef MOZILLA_INTERNAL_API
-
-template <>
-struct ParamTraits<nsAutoCString> : ParamTraits<nsCString> {
-  typedef nsAutoCString paramType;
-};
-
-#endif  // MOZILLA_INTERNAL_API
-
-template <>
-struct ParamTraits<nsString> : ParamTraits<nsAString> {
-  typedef nsString paramType;
-};
-
-template <>
-struct ParamTraits<nsLiteralString> : ParamTraits<nsAString> {
-  typedef nsLiteralString paramType;
-};
-
-template <>
-struct ParamTraits<nsDependentSubstring> : ParamTraits<nsAString> {
-  typedef nsDependentSubstring paramType;
-};
-
-template <>
-struct ParamTraits<nsDependentCSubstring> : ParamTraits<nsACString> {
-  typedef nsDependentCSubstring paramType;
-};
-
-#ifdef MOZILLA_INTERNAL_API
-
-template <>
-struct ParamTraits<nsAutoString> : ParamTraits<nsString> {
-  typedef nsAutoString paramType;
-};
-
-#endif  // MOZILLA_INTERNAL_API
-
-template <>
-struct ParamTraits<nsTHashtable<nsUint64HashKey>> {
-  typedef nsTHashtable<nsUint64HashKey> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    uint32_t count = aParam.Count();
-    WriteParam(aMsg, count);
-    for (auto iter = aParam.ConstIter(); !iter.Done(); iter.Next()) {
-      WriteParam(aMsg, iter.Get()->GetKey());
-    }
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    uint32_t count;
-    if (!ReadParam(aMsg, aIter, &count)) {
-      return false;
-    }
-    paramType table(count);
-    for (uint32_t i = 0; i < count; ++i) {
-      uint64_t key;
-      if (!ReadParam(aMsg, aIter, &key)) {
-        return false;
-      }
-      table.PutEntry(key);
-    }
-    *aResult = std::move(table);
-    return true;
-  }
-};
-
-// Pickle::ReadBytes and ::WriteBytes take the length in ints, so we must
-// ensure there is no overflow. This returns |false| if it would overflow.
-// Otherwise, it returns |true| and places the byte length in |aByteLength|.
-bool ByteLengthIsValid(uint32_t aNumElements, size_t aElementSize,
-                       int* aByteLength);
-
-// Note: IPDL will sometimes codegen specialized implementations of
-// nsTArray serialization and deserialization code in
-// implementSpecialArrayPickling(). This is needed when ParamTraits<E>
-// is not defined.
-template <typename E>
-struct ParamTraits<nsTArray<E>> {
-  typedef nsTArray<E> paramType;
-
-  // We write arrays of integer or floating-point data using a single pickling
-  // call, rather than writing each element individually.  We deliberately do
-  // not use mozilla::IsPod here because it is perfectly reasonable to have
-  // a data structure T for which IsPod<T>::value is true, yet also have a
-  // ParamTraits<T> specialization.
-  static const bool sUseWriteBytes =
-      (std::is_integral_v<E> || std::is_floating_point_v<E>);
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    uint32_t length = aParam.Length();
-    WriteParam(aMsg, length);
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
-      aMsg->WriteBytes(aParam.Elements(), pickledLength);
-    } else {
-      const E* elems = aParam.Elements();
-      for (uint32_t index = 0; index < length; index++) {
-        WriteParam(aMsg, elems[index]);
-      }
-    }
-  }
-
-  // This method uses infallible allocation so that an OOM failure will
-  // show up as an OOM crash rather than an IPC FatalError.
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    uint32_t length;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
-        return false;
-      }
-
-      E* elements = aResult->AppendElements(length);
-      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
-    } else {
-      // Each ReadParam<E> may read more than 1 byte each; this is an attempt
-      // to minimally validate that the length isn't much larger than what's
-      // actually available in aMsg.
-      if (!aMsg->HasBytesAvailable(aIter, length)) {
-        return false;
-      }
-
-      aResult->SetCapacity(length);
-
-      for (uint32_t index = 0; index < length; index++) {
-        E* element = aResult->AppendElement();
-        if (!ReadParam(aMsg, aIter, element)) {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    for (uint32_t index = 0; index < aParam.Length(); index++) {
-      if (index) {
-        aLog->append(L" ");
-      }
-      LogParam(aParam[index], aLog);
-    }
-  }
-};
-
-template <typename E>
-struct ParamTraits<CopyableTArray<E>> : ParamTraits<nsTArray<E>> {};
-
-template <typename E>
-struct ParamTraits<FallibleTArray<E>> {
-  typedef FallibleTArray<E> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, static_cast<const nsTArray<E>&>(aParam));
-  }
-
-  // Deserialize the array infallibly, but return a FallibleTArray.
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    nsTArray<E> temp;
-    if (!ReadParam(aMsg, aIter, &temp)) return false;
-
-    *aResult = std::move(temp);
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    LogParam(static_cast<const nsTArray<E>&>(aParam), aLog);
-  }
-};
-
-template <typename E, size_t N>
-struct ParamTraits<AutoTArray<E, N>> : ParamTraits<nsTArray<E>> {
-  typedef AutoTArray<E, N> paramType;
-};
-
-template <typename E, size_t N>
-struct ParamTraits<CopyableAutoTArray<E, N>> : ParamTraits<AutoTArray<E, N>> {};
-
-template <typename E, size_t N, typename AP>
-struct ParamTraits<mozilla::Vector<E, N, AP>> {
-  typedef mozilla::Vector<E, N, AP> paramType;
-
-  // We write arrays of integer or floating-point data using a single pickling
-  // call, rather than writing each element individually.  We deliberately do
-  // not use mozilla::IsPod here because it is perfectly reasonable to have
-  // a data structure T for which IsPod<T>::value is true, yet also have a
-  // ParamTraits<T> specialization.
-  static const bool sUseWriteBytes =
-      (std::is_integral_v<E> || std::is_floating_point_v<E>);
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    uint32_t length = aParam.length();
-    WriteParam(aMsg, length);
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
-      aMsg->WriteBytes(aParam.begin(), pickledLength);
-      return;
-    }
-
-    for (const E& elem : aParam) {
-      WriteParam(aMsg, elem);
-    }
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    uint32_t length;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
-        return false;
-      }
-
-      if (!aResult->resizeUninitialized(length)) {
-        // So that OOM failure shows up as OOM crash instead of IPC FatalError.
-        NS_ABORT_OOM(length * sizeof(E));
-      }
-
-      E* elements = aResult->begin();
-      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
-    }
-
-    // Each ReadParam<E> may read more than 1 byte each; this is an attempt
-    // to minimally validate that the length isn't much larger than what's
-    // actually available in aMsg.
-    if (!aMsg->HasBytesAvailable(aIter, length)) {
-      return false;
-    }
-
-    if (!aResult->resize(length)) {
-      // So that OOM failure shows up as OOM crash instead of IPC FatalError.
-      NS_ABORT_OOM(length * sizeof(E));
-    }
-
-    for (uint32_t index = 0; index < length; ++index) {
-      if (!ReadParam(aMsg, aIter, &((*aResult)[index]))) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    for (uint32_t index = 0, len = aParam.length(); index < len; ++index) {
-      if (index) {
-        aLog->append(L" ");
-      }
-      LogParam(aParam[index], aLog);
-    }
-  }
-};
-
-template <typename E>
-struct ParamTraits<std::vector<E>> {
-  typedef std::vector<E> paramType;
-
-  // We write arrays of integer or floating-point data using a single pickling
-  // call, rather than writing each element individually.  We deliberately do
-  // not use mozilla::IsPod here because it is perfectly reasonable to have
-  // a data structure T for which IsPod<T>::value is true, yet also have a
-  // ParamTraits<T> specialization.
-  static const bool sUseWriteBytes =
-      (std::is_integral_v<E> || std::is_floating_point_v<E>);
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    uint32_t length = aParam.size();
-    WriteParam(aMsg, length);
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
-      aMsg->WriteBytes(aParam.data(), pickledLength);
-      return;
-    }
-
-    for (const E& elem : aParam) {
-      WriteParam(aMsg, elem);
-    }
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    uint32_t length;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-
-    if (sUseWriteBytes) {
-      int pickledLength = 0;
-      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
-        return false;
-      }
-
-      aResult->resize(length);
-
-      E* elements = aResult->data();
-      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
-    }
-
-    // Each ReadParam<E> may read more than 1 byte each; this is an attempt
-    // to minimally validate that the length isn't much larger than what's
-    // actually available in aMsg.
-    if (!aMsg->HasBytesAvailable(aIter, length)) {
-      return false;
-    }
-
-    aResult->resize(length);
-
-    for (uint32_t index = 0; index < length; ++index) {
-      if (!ReadParam(aMsg, aIter, &((*aResult)[index]))) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    for (uint32_t index = 0, len = aParam.size(); index < len; ++index) {
-      if (index) {
-        aLog->append(L" ");
-      }
-      LogParam(aParam[index], aLog);
-    }
-  }
-};
-
-template <typename K, typename V>
-struct ParamTraits<std::unordered_map<K, V>> final {
-  using T = std::unordered_map<K, V>;
-
-  static void Write(Message* const msg, const T& in) {
-    WriteParam(msg, in.size());
-    for (const auto& pair : in) {
-      WriteParam(msg, pair.first);
-      WriteParam(msg, pair.second);
-    }
-  }
-
-  static bool Read(const Message* const msg, PickleIterator* const itr,
-                   T* const out) {
-    size_t size = 0;
-    if (!ReadParam(msg, itr, &size)) return false;
-    T map;
-    map.reserve(size);
-    for (const auto i : mozilla::IntegerRange(size)) {
-      std::pair<K, V> pair;
-      mozilla::Unused << i;
-      if (!ReadParam(msg, itr, &(pair.first)) ||
-          !ReadParam(msg, itr, &(pair.second))) {
-        return false;
-      }
-      map.insert(std::move(pair));
-    }
-    *out = std::move(map);
-    return true;
-  }
-};
-
-template <>
-struct ParamTraits<float> {
-  typedef float paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    aMsg->WriteBytes(&aParam, sizeof(paramType));
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return aMsg->ReadBytesInto(aIter, aResult, sizeof(*aResult));
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(StringPrintf(L"%g", aParam));
-  }
-};
-
-template <>
-struct ParamTraits<nsCSSPropertyID>
-    : public ContiguousEnumSerializer<nsCSSPropertyID, eCSSProperty_UNKNOWN,
-                                      eCSSProperty_COUNT> {};
-
-template <>
 struct ParamTraits<mozilla::void_t> {
   typedef mozilla::void_t paramType;
   static void Write(Message* aMsg, const paramType& aParam) {}
@@ -877,408 +171,6 @@
   }
 };
 
-template <>
-struct ParamTraits<nsID> {
-  typedef nsID paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.m0);
-    WriteParam(aMsg, aParam.m1);
-    WriteParam(aMsg, aParam.m2);
-    for (unsigned int i = 0; i < mozilla::ArrayLength(aParam.m3); i++) {
-      WriteParam(aMsg, aParam.m3[i]);
-    }
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    if (!ReadParam(aMsg, aIter, &(aResult->m0)) ||
-        !ReadParam(aMsg, aIter, &(aResult->m1)) ||
-        !ReadParam(aMsg, aIter, &(aResult->m2)))
-      return false;
-
-    for (unsigned int i = 0; i < mozilla::ArrayLength(aResult->m3); i++)
-      if (!ReadParam(aMsg, aIter, &(aResult->m3[i]))) return false;
-
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(L"{");
-    aLog->append(
-        StringPrintf(L"%8.8X-%4.4X-%4.4X-", aParam.m0, aParam.m1, aParam.m2));
-    for (unsigned int i = 0; i < mozilla::ArrayLength(aParam.m3); i++)
-      aLog->append(StringPrintf(L"%2.2X", aParam.m3[i]));
-    aLog->append(L"}");
-  }
-};
-
-template <>
-struct ParamTraits<mozilla::TimeDuration> {
-  typedef mozilla::TimeDuration paramType;
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.mValue);
-  }
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return ReadParam(aMsg, aIter, &aResult->mValue);
-  };
-};
-
-template <>
-struct ParamTraits<mozilla::TimeStamp> {
-  typedef mozilla::TimeStamp paramType;
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.mValue);
-  }
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return ReadParam(aMsg, aIter, &aResult->mValue);
-  };
-};
-
-#ifdef XP_WIN
-
-template <>
-struct ParamTraits<mozilla::TimeStampValue> {
-  typedef mozilla::TimeStampValue paramType;
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.mGTC);
-    WriteParam(aMsg, aParam.mQPC);
-    WriteParam(aMsg, aParam.mUsedCanonicalNow);
-    WriteParam(aMsg, aParam.mIsNull);
-    WriteParam(aMsg, aParam.mHasQPC);
-  }
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return (ReadParam(aMsg, aIter, &aResult->mGTC) &&
-            ReadParam(aMsg, aIter, &aResult->mQPC) &&
-            ReadParam(aMsg, aIter, &aResult->mUsedCanonicalNow) &&
-            ReadParam(aMsg, aIter, &aResult->mIsNull) &&
-            ReadParam(aMsg, aIter, &aResult->mHasQPC));
-  }
-};
-
-#else
-
-template <>
-struct ParamTraits<mozilla::TimeStamp63Bit> {
-  typedef mozilla::TimeStamp63Bit paramType;
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.mUsedCanonicalNow);
-    WriteParam(aMsg, aParam.mTimeStamp);
-  }
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    bool success = true;
-    uint64_t result;
-
-    success &= ReadParam(aMsg, aIter, &result);
-    aResult->mUsedCanonicalNow = result & 0x01;
-
-    success &= ReadParam(aMsg, aIter, &result);
-    aResult->mTimeStamp = result & 0x7FFFFFFFFFFFFFFF;
-
-    return success;
-  }
-};
-
-#endif
-
-template <>
-struct ParamTraits<mozilla::dom::ipc::StructuredCloneData> {
-  typedef mozilla::dom::ipc::StructuredCloneData paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    aParam.WriteIPCParams(aMsg);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return aResult->ReadIPCParams(aMsg, aIter);
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    LogParam(aParam.DataLength(), aLog);
-  }
-};
-
-template <>
-struct ParamTraits<mozilla::net::WebSocketFrameData> {
-  typedef mozilla::net::WebSocketFrameData paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    aParam.WriteIPCParams(aMsg);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return aResult->ReadIPCParams(aMsg, aIter);
-  }
-};
-
-template <>
-struct ParamTraits<JSStructuredCloneData> {
-  typedef JSStructuredCloneData paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    MOZ_ASSERT(!(aParam.Size() % sizeof(uint64_t)));
-    WriteParam(aMsg, aParam.Size());
-    aParam.ForEachDataChunk([&](const char* aData, size_t aSize) {
-      return aMsg->WriteBytes(aData, aSize, sizeof(uint64_t));
-    });
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    size_t length = 0;
-    if (!ReadParam(aMsg, aIter, &length)) {
-      return false;
-    }
-    MOZ_ASSERT(!(length % sizeof(uint64_t)));
-
-    mozilla::BufferList<InfallibleAllocPolicy> buffers(0, 0, 4096);
-
-    // Borrowing is not suitable to use for IPC to hand out data
-    // because we often want to store the data somewhere for
-    // processing after IPC has released the underlying buffers. One
-    // case is PContentChild::SendGetXPCOMProcessAttributes. We can't
-    // return a borrowed buffer because the out param outlives the
-    // IPDL callback.
-    if (length &&
-        !aMsg->ExtractBuffers(aIter, length, &buffers, sizeof(uint64_t))) {
-      return false;
-    }
-
-    bool success;
-    mozilla::BufferList<js::SystemAllocPolicy> out =
-        buffers.MoveFallible<js::SystemAllocPolicy>(&success);
-    if (!success) {
-      return false;
-    }
-
-    *aResult = JSStructuredCloneData(
-        std::move(out), JS::StructuredCloneScope::DifferentProcess);
-
-    return true;
-  }
-};
-
-template <>
-struct ParamTraits<mozilla::SerializedStructuredCloneBuffer> {
-  typedef mozilla::SerializedStructuredCloneBuffer paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.data);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return ReadParam(aMsg, aIter, &aResult->data);
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    LogParam(aParam.data.Size(), aLog);
-  }
-};
-
-template <>
-struct ParamTraits<nsIWidget::TouchPointerState>
-    : public BitFlagsEnumSerializer<nsIWidget::TouchPointerState,
-                                    nsIWidget::TouchPointerState::ALL_BITS> {};
-
-template <class T>
-struct ParamTraits<mozilla::Maybe<T>> {
-  typedef mozilla::Maybe<T> paramType;
-
-  static void Write(Message* msg, const paramType& param) {
-    if (param.isSome()) {
-      WriteParam(msg, true);
-      WriteParam(msg, param.value());
-    } else {
-      WriteParam(msg, false);
-    }
-  }
-
-  static bool Read(const Message* msg, PickleIterator* iter,
-                   paramType* result) {
-    bool isSome;
-    if (!ReadParam(msg, iter, &isSome)) {
-      return false;
-    }
-    if (isSome) {
-      T tmp;
-      if (!ReadParam(msg, iter, &tmp)) {
-        return false;
-      }
-      *result = mozilla::Some(std::move(tmp));
-    } else {
-      *result = mozilla::Nothing();
-    }
-    return true;
-  }
-};
-
-template <typename T, typename U>
-struct ParamTraits<mozilla::EnumSet<T, U>> {
-  typedef mozilla::EnumSet<T, U> paramType;
-  typedef U serializedType;
-
-  static void Write(Message* msg, const paramType& param) {
-    MOZ_RELEASE_ASSERT(IsLegalValue(param.serialize()));
-    WriteParam(msg, param.serialize());
-  }
-
-  static bool Read(const Message* msg, PickleIterator* iter,
-                   paramType* result) {
-    serializedType tmp;
-
-    if (ReadParam(msg, iter, &tmp)) {
-      if (IsLegalValue(tmp)) {
-        result->deserialize(tmp);
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  static constexpr serializedType AllEnumBits() {
-    return ~serializedType(0) >> (std::numeric_limits<serializedType>::digits -
-                                  (mozilla::MaxEnumValue<T>::value + 1));
-  }
-
-  static constexpr bool IsLegalValue(const serializedType value) {
-    static_assert(mozilla::MaxEnumValue<T>::value <
-                      std::numeric_limits<serializedType>::digits,
-                  "Enum max value is not in the range!");
-    static_assert(
-        std::is_unsigned<decltype(mozilla::MaxEnumValue<T>::value)>::value,
-        "Type of MaxEnumValue<T>::value specialization should be unsigned!");
-
-    return (value & AllEnumBits()) == value;
-  }
-};
-
-template <class... Ts>
-struct ParamTraits<mozilla::Variant<Ts...>> {
-  typedef mozilla::Variant<Ts...> paramType;
-  using Tag = typename mozilla::detail::VariantTag<Ts...>::Type;
-
-  static void Write(Message* msg, const paramType& param) {
-    WriteParam(msg, param.tag);
-    param.match([msg](const auto& t) { WriteParam(msg, t); });
-  }
-
-  // Because VariantReader is a nested struct, we need the dummy template
-  // parameter to avoid making VariantReader<0> an explicit specialization,
-  // which is not allowed for a nested class template
-  template <size_t N, typename dummy = void>
-  struct VariantReader {
-    using Next = VariantReader<N - 1>;
-
-    static bool Read(const Message* msg, PickleIterator* iter, Tag tag,
-                     paramType* result) {
-      // Since the VariantReader specializations start at N , we need to
-      // subtract one to look at N - 1, the first valid tag.  This means our
-      // comparisons are off by 1.  If we get to N = 0 then we have failed to
-      // find a match to the tag.
-      if (tag == N - 1) {
-        // Recall, even though the template parameter is N, we are
-        // actually interested in the N - 1 tag.
-        // Default construct our field within the result outparameter and
-        // directly deserialize into the variant. Note that this means that
-        // every type in Ts needs to be default constructible
-        return ReadParam(msg, iter, &result->template emplace<N - 1>());
-      } else {
-        return Next::Read(msg, iter, tag, result);
-      }
-    }
-
-  };  // VariantReader<N>
-
-  // Since we are conditioning on tag = N - 1 in the preceding specialization,
-  // if we get to `VariantReader<0, dummy>` we have failed to find
-  // a matching tag.
-  template <typename dummy>
-  struct VariantReader<0, dummy> {
-    static bool Read(const Message* msg, PickleIterator* iter, Tag tag,
-                     paramType* result) {
-      return false;
-    }
-  };
-
-  static bool Read(const Message* msg, PickleIterator* iter,
-                   paramType* result) {
-    Tag tag;
-    if (ReadParam(msg, iter, &tag)) {
-      return VariantReader<sizeof...(Ts)>::Read(msg, iter, tag, result);
-    }
-    return false;
-  }
-};
-
-template <typename T>
-struct ParamTraits<mozilla::dom::Optional<T>> {
-  typedef mozilla::dom::Optional<T> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    if (aParam.WasPassed()) {
-      WriteParam(aMsg, true);
-      WriteParam(aMsg, aParam.Value());
-      return;
-    }
-
-    WriteParam(aMsg, false);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    bool wasPassed = false;
-
-    if (!ReadParam(aMsg, aIter, &wasPassed)) {
-      return false;
-    }
-
-    aResult->Reset();
-
-    if (wasPassed) {
-      if (!ReadParam(aMsg, aIter, &aResult->Construct())) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-};
-
-struct CrossOriginOpenerPolicyValidator {
-  static bool IsLegalValue(nsILoadInfo::CrossOriginOpenerPolicy e) {
-    return e == nsILoadInfo::OPENER_POLICY_UNSAFE_NONE ||
-           e == nsILoadInfo::OPENER_POLICY_SAME_ORIGIN ||
-           e == nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_ALLOW_POPUPS ||
-           e == nsILoadInfo::
-                    OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP;
-  }
-};
-
-template <>
-struct ParamTraits<nsILoadInfo::CrossOriginOpenerPolicy>
-    : EnumSerializer<nsILoadInfo::CrossOriginOpenerPolicy,
-                     CrossOriginOpenerPolicyValidator> {};
-
-struct CrossOriginEmbedderPolicyValidator {
-  static bool IsLegalValue(nsILoadInfo::CrossOriginEmbedderPolicy e) {
-    return e == nsILoadInfo::EMBEDDER_POLICY_NULL ||
-           e == nsILoadInfo::EMBEDDER_POLICY_REQUIRE_CORP;
-  }
-};
-
-template <>
-struct ParamTraits<nsILoadInfo::CrossOriginEmbedderPolicy>
-    : EnumSerializer<nsILoadInfo::CrossOriginEmbedderPolicy,
-                     CrossOriginEmbedderPolicyValidator> {};
-
 // Helper class for reading bitfields.
 // If T has bitfields members, derive ParamTraits<T> from BitfieldHelper<T>.
 template <typename ParamType>
@@ -1298,27 +190,6 @@
   }
 };
 
-template <size_t N, typename Word>
-struct ParamTraits<mozilla::BitSet<N, Word>> {
-  typedef mozilla::BitSet<N, Word> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    for (Word word : aParam.Storage()) {
-      WriteParam(aMsg, word);
-    }
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    for (Word& word : aResult->Storage()) {
-      if (!ReadParam(aMsg, aIter, &word)) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
 // A couple of recursive helper functions, allows syntax like:
 // WriteParams(aMsg, aParam.foo, aParam.bar, aParam.baz)
 // ReadParams(aMsg, aIter, aParam.foo, aParam.bar, aParam.baz)
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCMessageUtilsSpecializations.h firefox-85.0+build1/ipc/glue/IPCMessageUtilsSpecializations.h
--- firefox-84.0.2+build1/ipc/glue/IPCMessageUtilsSpecializations.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCMessageUtilsSpecializations.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,931 @@
+/* -*- 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 __IPC_GLUE_IPCMESSAGEUTILSSPECIALIZATIONS_H__
+#define __IPC_GLUE_IPCMESSAGEUTILSSPECIALIZATIONS_H__
+
+#include <cstdint>
+#include <cstdlib>
+#include <limits>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+#include "chrome/common/ipc_message.h"
+#include "chrome/common/ipc_message_utils.h"
+#include "ipc/EnumSerializer.h"
+#include "ipc/IPCMessageUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BitSet.h"
+#include "mozilla/EnumSet.h"
+#include "mozilla/EnumTypeTraits.h"
+#include "mozilla/IntegerRange.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/TimeStamp.h"
+#ifdef XP_WIN
+#  include "mozilla/TimeStamp_windows.h"
+#endif
+#include "mozilla/Unused.h"
+#include "mozilla/Vector.h"
+#include "mozilla/dom/ipc/StructuredCloneData.h"
+#include "nsCSSPropertyID.h"
+#include "nsDebug.h"
+#include "nsHashKeys.h"
+#include "nsID.h"
+#include "nsILoadInfo.h"
+#include "nsIThread.h"
+#include "nsLiteralString.h"
+#include "nsString.h"
+#include "nsTArray.h"
+#include "nsTHashtable.h"
+
+// XXX Includes that are only required by implementations which could be moved
+// to the cpp file.
+#include "base/string_util.h"    // for StringPrintf
+#include "mozilla/ArrayUtils.h"  // for ArrayLength
+#include "mozilla/CheckedInt.h"
+
+#ifdef _MSC_VER
+#  pragma warning(disable : 4800)
+#endif
+
+namespace mozilla {
+template <typename... Ts>
+class Variant;
+
+namespace detail {
+template <typename... Ts>
+struct VariantTag;
+}
+}  // namespace mozilla
+
+namespace mozilla::dom {
+template <typename T>
+class Optional;
+}
+
+namespace IPC {
+
+template <>
+struct ParamTraits<nsACString> {
+  typedef nsACString paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    bool isVoid = aParam.IsVoid();
+    aMsg->WriteBool(isVoid);
+
+    if (isVoid)
+      // represents a nullptr pointer
+      return;
+
+    uint32_t length = aParam.Length();
+    WriteParam(aMsg, length);
+    aMsg->WriteBytes(aParam.BeginReading(), length);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    bool isVoid;
+    if (!aMsg->ReadBool(aIter, &isVoid)) return false;
+
+    if (isVoid) {
+      aResult->SetIsVoid(true);
+      return true;
+    }
+
+    uint32_t length;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+    if (!aMsg->HasBytesAvailable(aIter, length)) {
+      return false;
+    }
+    aResult->SetLength(length);
+
+    return aMsg->ReadBytesInto(aIter, aResult->BeginWriting(), length);
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    if (aParam.IsVoid())
+      aLog->append(L"(NULL)");
+    else
+      aLog->append(UTF8ToWide(aParam.BeginReading()));
+  }
+};
+
+template <>
+struct ParamTraits<nsAString> {
+  typedef nsAString paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    bool isVoid = aParam.IsVoid();
+    aMsg->WriteBool(isVoid);
+
+    if (isVoid)
+      // represents a nullptr pointer
+      return;
+
+    uint32_t length = aParam.Length();
+    WriteParam(aMsg, length);
+    aMsg->WriteBytes(aParam.BeginReading(), length * sizeof(char16_t));
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    bool isVoid;
+    if (!aMsg->ReadBool(aIter, &isVoid)) return false;
+
+    if (isVoid) {
+      aResult->SetIsVoid(true);
+      return true;
+    }
+
+    uint32_t length;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+
+    mozilla::CheckedInt<uint32_t> byteLength =
+        mozilla::CheckedInt<uint32_t>(length) * sizeof(char16_t);
+    if (!byteLength.isValid() ||
+        !aMsg->HasBytesAvailable(aIter, byteLength.value())) {
+      return false;
+    }
+
+    aResult->SetLength(length);
+
+    return aMsg->ReadBytesInto(aIter, aResult->BeginWriting(),
+                               byteLength.value());
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    if (aParam.IsVoid())
+      aLog->append(L"(NULL)");
+    else {
+#ifdef WCHAR_T_IS_UTF16
+      aLog->append(reinterpret_cast<const wchar_t*>(aParam.BeginReading()));
+#else
+      uint32_t length = aParam.Length();
+      for (uint32_t index = 0; index < length; index++) {
+        aLog->push_back(std::wstring::value_type(aParam[index]));
+      }
+#endif
+    }
+  }
+};
+
+template <>
+struct ParamTraits<nsCString> : ParamTraits<nsACString> {
+  typedef nsCString paramType;
+};
+
+template <>
+struct ParamTraits<nsLiteralCString> : ParamTraits<nsACString> {
+  typedef nsLiteralCString paramType;
+};
+
+#ifdef MOZILLA_INTERNAL_API
+
+template <>
+struct ParamTraits<nsAutoCString> : ParamTraits<nsCString> {
+  typedef nsAutoCString paramType;
+};
+
+#endif  // MOZILLA_INTERNAL_API
+
+template <>
+struct ParamTraits<nsString> : ParamTraits<nsAString> {
+  typedef nsString paramType;
+};
+
+template <>
+struct ParamTraits<nsLiteralString> : ParamTraits<nsAString> {
+  typedef nsLiteralString paramType;
+};
+
+template <>
+struct ParamTraits<nsDependentSubstring> : ParamTraits<nsAString> {
+  typedef nsDependentSubstring paramType;
+};
+
+template <>
+struct ParamTraits<nsDependentCSubstring> : ParamTraits<nsACString> {
+  typedef nsDependentCSubstring paramType;
+};
+
+#ifdef MOZILLA_INTERNAL_API
+
+template <>
+struct ParamTraits<nsAutoString> : ParamTraits<nsString> {
+  typedef nsAutoString paramType;
+};
+
+#endif  // MOZILLA_INTERNAL_API
+
+template <>
+struct ParamTraits<nsTHashtable<nsUint64HashKey>> {
+  typedef nsTHashtable<nsUint64HashKey> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    uint32_t count = aParam.Count();
+    WriteParam(aMsg, count);
+    for (auto iter = aParam.ConstIter(); !iter.Done(); iter.Next()) {
+      WriteParam(aMsg, iter.Get()->GetKey());
+    }
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    uint32_t count;
+    if (!ReadParam(aMsg, aIter, &count)) {
+      return false;
+    }
+    paramType table(count);
+    for (uint32_t i = 0; i < count; ++i) {
+      uint64_t key;
+      if (!ReadParam(aMsg, aIter, &key)) {
+        return false;
+      }
+      table.PutEntry(key);
+    }
+    *aResult = std::move(table);
+    return true;
+  }
+};
+
+// Pickle::ReadBytes and ::WriteBytes take the length in ints, so we must
+// ensure there is no overflow. This returns |false| if it would overflow.
+// Otherwise, it returns |true| and places the byte length in |aByteLength|.
+bool ByteLengthIsValid(uint32_t aNumElements, size_t aElementSize,
+                       int* aByteLength);
+
+// Note: IPDL will sometimes codegen specialized implementations of
+// nsTArray serialization and deserialization code in
+// implementSpecialArrayPickling(). This is needed when ParamTraits<E>
+// is not defined.
+template <typename E>
+struct ParamTraits<nsTArray<E>> {
+  typedef nsTArray<E> paramType;
+
+  // We write arrays of integer or floating-point data using a single pickling
+  // call, rather than writing each element individually.  We deliberately do
+  // not use mozilla::IsPod here because it is perfectly reasonable to have
+  // a data structure T for which IsPod<T>::value is true, yet also have a
+  // ParamTraits<T> specialization.
+  static const bool sUseWriteBytes =
+      (std::is_integral_v<E> || std::is_floating_point_v<E>);
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    uint32_t length = aParam.Length();
+    WriteParam(aMsg, length);
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
+      aMsg->WriteBytes(aParam.Elements(), pickledLength);
+    } else {
+      const E* elems = aParam.Elements();
+      for (uint32_t index = 0; index < length; index++) {
+        WriteParam(aMsg, elems[index]);
+      }
+    }
+  }
+
+  // This method uses infallible allocation so that an OOM failure will
+  // show up as an OOM crash rather than an IPC FatalError.
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    uint32_t length;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
+        return false;
+      }
+
+      E* elements = aResult->AppendElements(length);
+      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
+    } else {
+      // Each ReadParam<E> may read more than 1 byte each; this is an attempt
+      // to minimally validate that the length isn't much larger than what's
+      // actually available in aMsg.
+      if (!aMsg->HasBytesAvailable(aIter, length)) {
+        return false;
+      }
+
+      aResult->SetCapacity(length);
+
+      for (uint32_t index = 0; index < length; index++) {
+        E* element = aResult->AppendElement();
+        if (!ReadParam(aMsg, aIter, element)) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    for (uint32_t index = 0; index < aParam.Length(); index++) {
+      if (index) {
+        aLog->append(L" ");
+      }
+      LogParam(aParam[index], aLog);
+    }
+  }
+};
+
+template <typename E>
+struct ParamTraits<CopyableTArray<E>> : ParamTraits<nsTArray<E>> {};
+
+template <typename E>
+struct ParamTraits<FallibleTArray<E>> {
+  typedef FallibleTArray<E> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, static_cast<const nsTArray<E>&>(aParam));
+  }
+
+  // Deserialize the array infallibly, but return a FallibleTArray.
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    nsTArray<E> temp;
+    if (!ReadParam(aMsg, aIter, &temp)) return false;
+
+    *aResult = std::move(temp);
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    LogParam(static_cast<const nsTArray<E>&>(aParam), aLog);
+  }
+};
+
+template <typename E, size_t N>
+struct ParamTraits<AutoTArray<E, N>> : ParamTraits<nsTArray<E>> {
+  typedef AutoTArray<E, N> paramType;
+};
+
+template <typename E, size_t N>
+struct ParamTraits<CopyableAutoTArray<E, N>> : ParamTraits<AutoTArray<E, N>> {};
+
+template <typename E, size_t N, typename AP>
+struct ParamTraits<mozilla::Vector<E, N, AP>> {
+  typedef mozilla::Vector<E, N, AP> paramType;
+
+  // We write arrays of integer or floating-point data using a single pickling
+  // call, rather than writing each element individually.  We deliberately do
+  // not use mozilla::IsPod here because it is perfectly reasonable to have
+  // a data structure T for which IsPod<T>::value is true, yet also have a
+  // ParamTraits<T> specialization.
+  static const bool sUseWriteBytes =
+      (std::is_integral_v<E> || std::is_floating_point_v<E>);
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    uint32_t length = aParam.length();
+    WriteParam(aMsg, length);
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
+      aMsg->WriteBytes(aParam.begin(), pickledLength);
+      return;
+    }
+
+    for (const E& elem : aParam) {
+      WriteParam(aMsg, elem);
+    }
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    uint32_t length;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
+        return false;
+      }
+
+      if (!aResult->resizeUninitialized(length)) {
+        // So that OOM failure shows up as OOM crash instead of IPC FatalError.
+        NS_ABORT_OOM(length * sizeof(E));
+      }
+
+      E* elements = aResult->begin();
+      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
+    }
+
+    // Each ReadParam<E> may read more than 1 byte each; this is an attempt
+    // to minimally validate that the length isn't much larger than what's
+    // actually available in aMsg.
+    if (!aMsg->HasBytesAvailable(aIter, length)) {
+      return false;
+    }
+
+    if (!aResult->resize(length)) {
+      // So that OOM failure shows up as OOM crash instead of IPC FatalError.
+      NS_ABORT_OOM(length * sizeof(E));
+    }
+
+    for (uint32_t index = 0; index < length; ++index) {
+      if (!ReadParam(aMsg, aIter, &((*aResult)[index]))) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    for (uint32_t index = 0, len = aParam.length(); index < len; ++index) {
+      if (index) {
+        aLog->append(L" ");
+      }
+      LogParam(aParam[index], aLog);
+    }
+  }
+};
+
+template <typename E>
+struct ParamTraits<std::vector<E>> {
+  typedef std::vector<E> paramType;
+
+  // We write arrays of integer or floating-point data using a single pickling
+  // call, rather than writing each element individually.  We deliberately do
+  // not use mozilla::IsPod here because it is perfectly reasonable to have
+  // a data structure T for which IsPod<T>::value is true, yet also have a
+  // ParamTraits<T> specialization.
+  static const bool sUseWriteBytes =
+      (std::is_integral_v<E> || std::is_floating_point_v<E>);
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    uint32_t length = aParam.size();
+    WriteParam(aMsg, length);
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      MOZ_RELEASE_ASSERT(ByteLengthIsValid(length, sizeof(E), &pickledLength));
+      aMsg->WriteBytes(aParam.data(), pickledLength);
+      return;
+    }
+
+    for (const E& elem : aParam) {
+      WriteParam(aMsg, elem);
+    }
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    uint32_t length;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+
+    if (sUseWriteBytes) {
+      int pickledLength = 0;
+      if (!ByteLengthIsValid(length, sizeof(E), &pickledLength)) {
+        return false;
+      }
+
+      aResult->resize(length);
+
+      E* elements = aResult->data();
+      return aMsg->ReadBytesInto(aIter, elements, pickledLength);
+    }
+
+    // Each ReadParam<E> may read more than 1 byte each; this is an attempt
+    // to minimally validate that the length isn't much larger than what's
+    // actually available in aMsg.
+    if (!aMsg->HasBytesAvailable(aIter, length)) {
+      return false;
+    }
+
+    aResult->resize(length);
+
+    for (uint32_t index = 0; index < length; ++index) {
+      if (!ReadParam(aMsg, aIter, &((*aResult)[index]))) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    for (uint32_t index = 0, len = aParam.size(); index < len; ++index) {
+      if (index) {
+        aLog->append(L" ");
+      }
+      LogParam(aParam[index], aLog);
+    }
+  }
+};
+
+template <typename K, typename V>
+struct ParamTraits<std::unordered_map<K, V>> final {
+  using T = std::unordered_map<K, V>;
+
+  static void Write(Message* const msg, const T& in) {
+    WriteParam(msg, in.size());
+    for (const auto& pair : in) {
+      WriteParam(msg, pair.first);
+      WriteParam(msg, pair.second);
+    }
+  }
+
+  static bool Read(const Message* const msg, PickleIterator* const itr,
+                   T* const out) {
+    size_t size = 0;
+    if (!ReadParam(msg, itr, &size)) return false;
+    T map;
+    map.reserve(size);
+    for (const auto i : mozilla::IntegerRange(size)) {
+      std::pair<K, V> pair;
+      mozilla::Unused << i;
+      if (!ReadParam(msg, itr, &(pair.first)) ||
+          !ReadParam(msg, itr, &(pair.second))) {
+        return false;
+      }
+      map.insert(std::move(pair));
+    }
+    *out = std::move(map);
+    return true;
+  }
+};
+
+template <>
+struct ParamTraits<float> {
+  typedef float paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    aMsg->WriteBytes(&aParam, sizeof(paramType));
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return aMsg->ReadBytesInto(aIter, aResult, sizeof(*aResult));
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(StringPrintf(L"%g", aParam));
+  }
+};
+
+template <>
+struct ParamTraits<nsCSSPropertyID>
+    : public ContiguousEnumSerializer<nsCSSPropertyID, eCSSProperty_UNKNOWN,
+                                      eCSSProperty_COUNT> {};
+
+template <>
+struct ParamTraits<nsID> {
+  typedef nsID paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.m0);
+    WriteParam(aMsg, aParam.m1);
+    WriteParam(aMsg, aParam.m2);
+    for (unsigned int i = 0; i < mozilla::ArrayLength(aParam.m3); i++) {
+      WriteParam(aMsg, aParam.m3[i]);
+    }
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    if (!ReadParam(aMsg, aIter, &(aResult->m0)) ||
+        !ReadParam(aMsg, aIter, &(aResult->m1)) ||
+        !ReadParam(aMsg, aIter, &(aResult->m2)))
+      return false;
+
+    for (unsigned int i = 0; i < mozilla::ArrayLength(aResult->m3); i++)
+      if (!ReadParam(aMsg, aIter, &(aResult->m3[i]))) return false;
+
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(L"{");
+    aLog->append(
+        StringPrintf(L"%8.8X-%4.4X-%4.4X-", aParam.m0, aParam.m1, aParam.m2));
+    for (unsigned int i = 0; i < mozilla::ArrayLength(aParam.m3); i++)
+      aLog->append(StringPrintf(L"%2.2X", aParam.m3[i]));
+    aLog->append(L"}");
+  }
+};
+
+template <>
+struct ParamTraits<mozilla::TimeDuration> {
+  typedef mozilla::TimeDuration paramType;
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mValue);
+  }
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->mValue);
+  };
+};
+
+template <>
+struct ParamTraits<mozilla::TimeStamp> {
+  typedef mozilla::TimeStamp paramType;
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mValue);
+  }
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->mValue);
+  };
+};
+
+#ifdef XP_WIN
+
+template <>
+struct ParamTraits<mozilla::TimeStampValue> {
+  typedef mozilla::TimeStampValue paramType;
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mGTC);
+    WriteParam(aMsg, aParam.mQPC);
+    WriteParam(aMsg, aParam.mUsedCanonicalNow);
+    WriteParam(aMsg, aParam.mIsNull);
+    WriteParam(aMsg, aParam.mHasQPC);
+  }
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return (ReadParam(aMsg, aIter, &aResult->mGTC) &&
+            ReadParam(aMsg, aIter, &aResult->mQPC) &&
+            ReadParam(aMsg, aIter, &aResult->mUsedCanonicalNow) &&
+            ReadParam(aMsg, aIter, &aResult->mIsNull) &&
+            ReadParam(aMsg, aIter, &aResult->mHasQPC));
+  }
+};
+
+#else
+
+template <>
+struct ParamTraits<mozilla::TimeStamp63Bit> {
+  typedef mozilla::TimeStamp63Bit paramType;
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mUsedCanonicalNow);
+    WriteParam(aMsg, aParam.mTimeStamp);
+  }
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    bool success = true;
+    uint64_t result;
+
+    success &= ReadParam(aMsg, aIter, &result);
+    aResult->mUsedCanonicalNow = result & 0x01;
+
+    success &= ReadParam(aMsg, aIter, &result);
+    aResult->mTimeStamp = result & 0x7FFFFFFFFFFFFFFF;
+
+    return success;
+  }
+};
+
+#endif
+
+template <>
+struct ParamTraits<mozilla::dom::ipc::StructuredCloneData> {
+  typedef mozilla::dom::ipc::StructuredCloneData paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    aParam.WriteIPCParams(aMsg);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return aResult->ReadIPCParams(aMsg, aIter);
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    LogParam(aParam.DataLength(), aLog);
+  }
+};
+
+template <class T>
+struct ParamTraits<mozilla::Maybe<T>> {
+  typedef mozilla::Maybe<T> paramType;
+
+  static void Write(Message* msg, const paramType& param) {
+    if (param.isSome()) {
+      WriteParam(msg, true);
+      WriteParam(msg, param.value());
+    } else {
+      WriteParam(msg, false);
+    }
+  }
+
+  static bool Read(const Message* msg, PickleIterator* iter,
+                   paramType* result) {
+    bool isSome;
+    if (!ReadParam(msg, iter, &isSome)) {
+      return false;
+    }
+    if (isSome) {
+      T tmp;
+      if (!ReadParam(msg, iter, &tmp)) {
+        return false;
+      }
+      *result = mozilla::Some(std::move(tmp));
+    } else {
+      *result = mozilla::Nothing();
+    }
+    return true;
+  }
+};
+
+template <typename T, typename U>
+struct ParamTraits<mozilla::EnumSet<T, U>> {
+  typedef mozilla::EnumSet<T, U> paramType;
+  typedef U serializedType;
+
+  static void Write(Message* msg, const paramType& param) {
+    MOZ_RELEASE_ASSERT(IsLegalValue(param.serialize()));
+    WriteParam(msg, param.serialize());
+  }
+
+  static bool Read(const Message* msg, PickleIterator* iter,
+                   paramType* result) {
+    serializedType tmp;
+
+    if (ReadParam(msg, iter, &tmp)) {
+      if (IsLegalValue(tmp)) {
+        result->deserialize(tmp);
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  static constexpr serializedType AllEnumBits() {
+    return ~serializedType(0) >> (std::numeric_limits<serializedType>::digits -
+                                  (mozilla::MaxEnumValue<T>::value + 1));
+  }
+
+  static constexpr bool IsLegalValue(const serializedType value) {
+    static_assert(mozilla::MaxEnumValue<T>::value <
+                      std::numeric_limits<serializedType>::digits,
+                  "Enum max value is not in the range!");
+    static_assert(
+        std::is_unsigned<decltype(mozilla::MaxEnumValue<T>::value)>::value,
+        "Type of MaxEnumValue<T>::value specialization should be unsigned!");
+
+    return (value & AllEnumBits()) == value;
+  }
+};
+
+template <class... Ts>
+struct ParamTraits<mozilla::Variant<Ts...>> {
+  typedef mozilla::Variant<Ts...> paramType;
+  using Tag = typename mozilla::detail::VariantTag<Ts...>::Type;
+
+  static void Write(Message* msg, const paramType& param) {
+    WriteParam(msg, param.tag);
+    param.match([msg](const auto& t) { WriteParam(msg, t); });
+  }
+
+  // Because VariantReader is a nested struct, we need the dummy template
+  // parameter to avoid making VariantReader<0> an explicit specialization,
+  // which is not allowed for a nested class template
+  template <size_t N, typename dummy = void>
+  struct VariantReader {
+    using Next = VariantReader<N - 1>;
+
+    static bool Read(const Message* msg, PickleIterator* iter, Tag tag,
+                     paramType* result) {
+      // Since the VariantReader specializations start at N , we need to
+      // subtract one to look at N - 1, the first valid tag.  This means our
+      // comparisons are off by 1.  If we get to N = 0 then we have failed to
+      // find a match to the tag.
+      if (tag == N - 1) {
+        // Recall, even though the template parameter is N, we are
+        // actually interested in the N - 1 tag.
+        // Default construct our field within the result outparameter and
+        // directly deserialize into the variant. Note that this means that
+        // every type in Ts needs to be default constructible
+        return ReadParam(msg, iter, &result->template emplace<N - 1>());
+      } else {
+        return Next::Read(msg, iter, tag, result);
+      }
+    }
+
+  };  // VariantReader<N>
+
+  // Since we are conditioning on tag = N - 1 in the preceding specialization,
+  // if we get to `VariantReader<0, dummy>` we have failed to find
+  // a matching tag.
+  template <typename dummy>
+  struct VariantReader<0, dummy> {
+    static bool Read(const Message* msg, PickleIterator* iter, Tag tag,
+                     paramType* result) {
+      return false;
+    }
+  };
+
+  static bool Read(const Message* msg, PickleIterator* iter,
+                   paramType* result) {
+    Tag tag;
+    if (ReadParam(msg, iter, &tag)) {
+      return VariantReader<sizeof...(Ts)>::Read(msg, iter, tag, result);
+    }
+    return false;
+  }
+};
+
+template <typename T>
+struct ParamTraits<mozilla::dom::Optional<T>> {
+  typedef mozilla::dom::Optional<T> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    if (aParam.WasPassed()) {
+      WriteParam(aMsg, true);
+      WriteParam(aMsg, aParam.Value());
+      return;
+    }
+
+    WriteParam(aMsg, false);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    bool wasPassed = false;
+
+    if (!ReadParam(aMsg, aIter, &wasPassed)) {
+      return false;
+    }
+
+    aResult->Reset();
+
+    if (wasPassed) {
+      if (!ReadParam(aMsg, aIter, &aResult->Construct())) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+};
+
+struct CrossOriginOpenerPolicyValidator {
+  static bool IsLegalValue(nsILoadInfo::CrossOriginOpenerPolicy e) {
+    return e == nsILoadInfo::OPENER_POLICY_UNSAFE_NONE ||
+           e == nsILoadInfo::OPENER_POLICY_SAME_ORIGIN ||
+           e == nsILoadInfo::OPENER_POLICY_SAME_ORIGIN_ALLOW_POPUPS ||
+           e == nsILoadInfo::
+                    OPENER_POLICY_SAME_ORIGIN_EMBEDDER_POLICY_REQUIRE_CORP;
+  }
+};
+
+template <>
+struct ParamTraits<nsILoadInfo::CrossOriginOpenerPolicy>
+    : EnumSerializer<nsILoadInfo::CrossOriginOpenerPolicy,
+                     CrossOriginOpenerPolicyValidator> {};
+
+struct CrossOriginEmbedderPolicyValidator {
+  static bool IsLegalValue(nsILoadInfo::CrossOriginEmbedderPolicy e) {
+    return e == nsILoadInfo::EMBEDDER_POLICY_NULL ||
+           e == nsILoadInfo::EMBEDDER_POLICY_REQUIRE_CORP;
+  }
+};
+
+template <>
+struct ParamTraits<nsILoadInfo::CrossOriginEmbedderPolicy>
+    : EnumSerializer<nsILoadInfo::CrossOriginEmbedderPolicy,
+                     CrossOriginEmbedderPolicyValidator> {};
+
+template <size_t N, typename Word>
+struct ParamTraits<mozilla::BitSet<N, Word>> {
+  typedef mozilla::BitSet<N, Word> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    for (Word word : aParam.Storage()) {
+      WriteParam(aMsg, word);
+    }
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    for (Word& word : aResult->Storage()) {
+      if (!ReadParam(aMsg, aIter, &word)) {
+        return false;
+      }
+    }
+    return true;
+  }
+};
+
+} /* namespace IPC */
+
+#endif /* __IPC_GLUE_IPCMESSAGEUTILSSPECIALIZATIONS_H__ */
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCStreamSource.cpp firefox-85.0+build1/ipc/glue/IPCStreamSource.cpp
--- firefox-84.0.2+build1/ipc/glue/IPCStreamSource.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCStreamSource.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 #include "BackgroundParent.h"  // for AssertIsOnBackgroundThread
 #include "mozilla/UniquePtr.h"
 #include "mozilla/dom/RemoteWorkerService.h"
+#include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "nsIAsyncInputStream.h"
 #include "nsICancelableRunnable.h"
@@ -22,12 +23,13 @@
 namespace mozilla {
 namespace ipc {
 
-class IPCStreamSource::Callback final : public nsIInputStreamCallback,
-                                        public nsIRunnable,
-                                        public nsICancelableRunnable {
+class IPCStreamSource::Callback final : public DiscardableRunnable,
+                                        public nsIInputStreamCallback {
  public:
   explicit Callback(IPCStreamSource* aSource)
-      : mSource(aSource), mOwningEventTarget(GetCurrentSerialEventTarget()) {
+      : DiscardableRunnable("IPCStreamSource::Callback"),
+        mSource(aSource),
+        mOwningEventTarget(GetCurrentSerialEventTarget()) {
     MOZ_ASSERT(mSource);
   }
 
@@ -59,12 +61,9 @@
     return NS_OK;
   }
 
-  nsresult Cancel() override {
-    // Cancel() gets called when the Worker thread is being shutdown.  We have
-    // nothing to do here because IPCStreamChild handles this case via
-    // the WorkerRef.
-    return NS_OK;
-  }
+  // OnDiscard() gets called when the Worker thread is being shutdown.  We have
+  // nothing to do here because IPCStreamChild handles this case via
+  // the WorkerRef.
 
   void ClearSource() {
     MOZ_ASSERT(mOwningEventTarget->IsOnCurrentThread());
@@ -87,11 +86,11 @@
 
   nsCOMPtr<nsISerialEventTarget> mOwningEventTarget;
 
-  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
 };
 
-NS_IMPL_ISUPPORTS(IPCStreamSource::Callback, nsIInputStreamCallback,
-                  nsIRunnable, nsICancelableRunnable);
+NS_IMPL_ISUPPORTS_INHERITED(IPCStreamSource::Callback, DiscardableRunnable,
+                            nsIInputStreamCallback);
 
 IPCStreamSource::IPCStreamSource(nsIAsyncInputStream* aInputStream)
     : mStream(aInputStream), mState(ePending) {
diff -Nru firefox-84.0.2+build1/ipc/glue/IPCTypes.h firefox-85.0+build1/ipc/glue/IPCTypes.h
--- firefox-84.0.2+build1/ipc/glue/IPCTypes.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/IPCTypes.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,20 @@
+/* -*- 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 IPC_GLUE_IPCTYPES_H_
+#define IPC_GLUE_IPCTYPES_H_
+
+#include <cstdint>
+
+namespace mozilla {
+
+// This is a cross-platform approximation to HANDLE, which we expect
+// to be typedef'd to void* or thereabouts.
+typedef uintptr_t WindowsHandle;
+
+}  // namespace mozilla
+
+#endif  // IPC_GLUE_IPCTYPES_H_
diff -Nru firefox-84.0.2+build1/ipc/glue/MessageChannel.cpp firefox-85.0+build1/ipc/glue/MessageChannel.cpp
--- firefox-84.0.2+build1/ipc/glue/MessageChannel.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/MessageChannel.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include <utility>
 
+#include "CrashAnnotations.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DebugOnly.h"
@@ -18,6 +19,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
+#include "mozilla/StaticMutex.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtrExtensions.h"
@@ -28,19 +30,20 @@
 #include "nsContentUtils.h"
 #include "nsDataHashtable.h"
 #include "nsDebug.h"
+#include "nsExceptionHandler.h"
 #include "nsIMemoryReporter.h"
 #include "nsISupportsImpl.h"
 #include "nsPrintfCString.h"
 
+#ifdef OS_WIN
+#  include "mozilla/gfx/Logging.h"
+#endif
+
 #ifdef MOZ_TASK_TRACER
 #  include "GeckoTaskTracer.h"
 using namespace mozilla::tasktracer;
 #endif
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 // Undo the damage done by mozzconf.h
 #undef compress
 
@@ -157,9 +160,9 @@
   InterruptFrame(Direction direction, const Message* msg)
       : mMessageName(msg->name()),
         mMessageRoutingId(msg->routing_id()),
-        mMesageSemantics(msg->is_interrupt()
-                             ? INTR_SEMS
-                             : msg->is_sync() ? SYNC_SEMS : ASYNC_SEMS),
+        mMesageSemantics(msg->is_interrupt() ? INTR_SEMS
+                         : msg->is_sync()    ? SYNC_SEMS
+                                             : ASYNC_SEMS),
         mDirection(direction),
         mMoved(false) {
     MOZ_RELEASE_ASSERT(mMessageName);
@@ -203,9 +206,9 @@
                 const char** name) const {
     *id = mMessageRoutingId;
     *dir = (IN_MESSAGE == mDirection) ? "in" : "out";
-    *sems = (INTR_SEMS == mMesageSemantics)
-                ? "intr"
-                : (SYNC_SEMS == mMesageSemantics) ? "sync" : "async";
+    *sems = (INTR_SEMS == mMesageSemantics)   ? "intr"
+            : (SYNC_SEMS == mMesageSemantics) ? "sync"
+                                              : "async";
     *name = mMessageName;
   }
 
@@ -2788,12 +2791,16 @@
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_feature_active(ProfilerFeature::IPCMessages)) {
     int32_t pid = mListener->OtherPidMaybeInvalid();
-    if (pid != kInvalidProcessId) {
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          "IPC", IPC, IPCMarkerPayload,
-          (pid, aMessage.seqno(), aMessage.type(), mSide, aDirection,
-           MessagePhase::Endpoint, aMessage.is_sync(),
-           TimeStamp::NowUnfuzzed()));
+    // Only record markers for IPCs with a valid pid.
+    // And if one of the profiler mutexes is locked on this thread, don't record
+    // markers, because we don't want to expose profiler IPCs due to the
+    // profiler itself, and also to avoid possible re-entrancy issues.
+    if (pid != kInvalidProcessId && !profiler_is_locked_on_current_thread()) {
+      // The current timestamp must be given to the `IPCMarker` payload.
+      const TimeStamp now = TimeStamp::NowUnfuzzed();
+      PROFILER_MARKER("IPC", IPC, MarkerTiming::InstantAt(now), IPCMarker, now,
+                      now, pid, aMessage.seqno(), aMessage.type(), mSide,
+                      aDirection, MessagePhase::Endpoint, aMessage.is_sync());
     }
   }
 #endif
diff -Nru firefox-84.0.2+build1/ipc/glue/MessageChannel.h firefox-85.0+build1/ipc/glue/MessageChannel.h
--- firefox-84.0.2+build1/ipc/glue/MessageChannel.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/MessageChannel.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,33 +8,37 @@
 #ifndef ipc_glue_MessageChannel_h
 #define ipc_glue_MessageChannel_h 1
 
-#include "base/basictypes.h"
-#include "base/message_loop.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/DebugOnly.h"
+#include "mozilla/LinkedList.h"
 #include "mozilla/Monitor.h"
-#include "mozilla/MozPromise.h"
 #include "mozilla/Vector.h"
 #if defined(OS_WIN)
 #  include "mozilla/ipc/Neutering.h"
 #endif  // defined(OS_WIN)
-#include <math.h>
 
-#include <deque>
 #include <functional>
 #include <map>
 #include <stack>
 #include <vector>
 
-#include "MessageLink.h"
+#include "MessageLink.h"  // for HasResultCodes
 #include "mozilla/ipc/Transport.h"
 
-class nsIEventTarget;
+#ifdef MOZ_GECKO_PROFILER
+#  include "mozilla/BaseProfilerMarkers.h"
+#endif
+
+class MessageLoop;
+
+namespace IPC {
+template <typename T>
+struct ParamTraits;
+}
 
 namespace mozilla {
 namespace ipc {
 
-class MessageChannel;
 class IToplevelProtocol;
 class ActorLifecycleProxy;
 
@@ -879,4 +883,74 @@
           mozilla::ipc::ResponseRejectReason::EndGuard_> {};
 }  // namespace IPC
 
+#ifdef MOZ_GECKO_PROFILER
+namespace geckoprofiler::markers {
+
+struct IPCMarker {
+  static constexpr mozilla::Span<const char> MarkerTypeName() {
+    return mozilla::MakeStringSpan("IPC");
+  }
+  static void StreamJSONMarkerData(
+      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+      mozilla::TimeStamp aStart, mozilla::TimeStamp aEnd, int32_t aOtherPid,
+      int32_t aMessageSeqno, IPC::Message::msgid_t aMessageType,
+      mozilla::ipc::Side aSide, mozilla::ipc::MessageDirection aDirection,
+      mozilla::ipc::MessagePhase aPhase, bool aSync) {
+    using namespace mozilla::ipc;
+    // This payload still streams a startTime and endTime property because it
+    // made the migration to MarkerTiming on the front-end easier.
+    aWriter.TimeProperty("startTime", aStart);
+    aWriter.TimeProperty("endTime", aEnd);
+
+    aWriter.IntProperty("otherPid", aOtherPid);
+    aWriter.IntProperty("messageSeqno", aMessageSeqno);
+    aWriter.StringProperty(
+        "messageType",
+        mozilla::MakeStringSpan(IPC::StringFromIPCMessageType(aMessageType)));
+    aWriter.StringProperty("side", IPCSideToString(aSide));
+    aWriter.StringProperty("direction",
+                           aDirection == MessageDirection::eSending
+                               ? mozilla::MakeStringSpan("sending")
+                               : mozilla::MakeStringSpan("receiving"));
+    aWriter.StringProperty("phase", IPCPhaseToString(aPhase));
+    aWriter.BoolProperty("sync", aSync);
+  }
+  static mozilla::MarkerSchema MarkerTypeDisplay() {
+    return mozilla::MarkerSchema::SpecialFrontendLocation{};
+  }
+
+ private:
+  static mozilla::Span<const char> IPCSideToString(mozilla::ipc::Side aSide) {
+    switch (aSide) {
+      case mozilla::ipc::ParentSide:
+        return mozilla::MakeStringSpan("parent");
+      case mozilla::ipc::ChildSide:
+        return mozilla::MakeStringSpan("child");
+      case mozilla::ipc::UnknownSide:
+        return mozilla::MakeStringSpan("unknown");
+      default:
+        MOZ_ASSERT_UNREACHABLE("Invalid IPC side");
+        return mozilla::MakeStringSpan("<invalid IPC side>");
+    }
+  }
+
+  static mozilla::Span<const char> IPCPhaseToString(
+      mozilla::ipc::MessagePhase aPhase) {
+    switch (aPhase) {
+      case mozilla::ipc::MessagePhase::Endpoint:
+        return mozilla::MakeStringSpan("endpoint");
+      case mozilla::ipc::MessagePhase::TransferStart:
+        return mozilla::MakeStringSpan("transferStart");
+      case mozilla::ipc::MessagePhase::TransferEnd:
+        return mozilla::MakeStringSpan("transferEnd");
+      default:
+        MOZ_ASSERT_UNREACHABLE("Invalid IPC phase");
+        return mozilla::MakeStringSpan("<invalid IPC phase>");
+    }
+  }
+};
+
+}  // namespace geckoprofiler::markers
+#endif
+
 #endif  // ifndef ipc_glue_MessageChannel_h
diff -Nru firefox-84.0.2+build1/ipc/glue/MessageLink.h firefox-85.0+build1/ipc/glue/MessageLink.h
--- firefox-84.0.2+build1/ipc/glue/MessageLink.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/MessageLink.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,13 +8,16 @@
 #ifndef ipc_glue_MessageLink_h
 #define ipc_glue_MessageLink_h 1
 
-#include "base/basictypes.h"
+#include <cstdint>
 #include "base/message_loop.h"
-
-#include "mozilla/WeakPtr.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/ipc/Transport.h"
 
+namespace IPC {
+class Message;
+}
+
 namespace mozilla {
 namespace ipc {
 
diff -Nru firefox-84.0.2+build1/ipc/glue/moz.build firefox-85.0+build1/ipc/glue/moz.build
--- firefox-84.0.2+build1/ipc/glue/moz.build	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/moz.build	2021-01-18 19:58:12.000000000 +0000
@@ -21,6 +21,7 @@
     "CrashReporterHost.h",
     "CrossProcessMutex.h",
     "CrossProcessSemaphore.h",
+    "Endpoint.h",
     "EnvironmentMap.h",
     "FileDescriptor.h",
     "FileDescriptorSetChild.h",
@@ -31,21 +32,27 @@
     "IdleSchedulerParent.h",
     "InputStreamUtils.h",
     "IOThreadChild.h",
+    "IPCCore.h",
     "IPCStreamAlloc.h",
     "IPCStreamDestination.h",
     "IPCStreamSource.h",
     "IPCStreamUtils.h",
+    "IPCTypes.h",
     "IPDLParamTraits.h",
     "LibrarySandboxPreload.h",
     "MessageChannel.h",
     "MessageLink.h",
     "Neutering.h",
     "ProcessChild.h",
+    "ProtocolMessageUtils.h",
     "ProtocolUtils.h",
+    "ProtocolUtilsFwd.h",
     "ScopedXREEmbed.h",
+    "SerializedStructuredCloneBuffer.h",
     "SharedMemory.h",
     "SharedMemoryBasic.h",
     "Shmem.h",
+    "ShmemMessageUtils.h",
     "TaintingIPCUtils.h",
     "TaskFactory.h",
     "Transport.h",
@@ -136,7 +143,9 @@
     ]
 
 EXPORTS.ipc += [
+    "EnumSerializer.h",
     "IPCMessageUtils.h",
+    "IPCMessageUtilsSpecializations.h",
 ]
 
 UNIFIED_SOURCES += [
diff -Nru firefox-84.0.2+build1/ipc/glue/PBackground.ipdl firefox-85.0+build1/ipc/glue/PBackground.ipdl
--- firefox-84.0.2+build1/ipc/glue/PBackground.ipdl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/PBackground.ipdl	2021-01-18 19:58:12.000000000 +0000
@@ -65,6 +65,7 @@
 include MIDITypes;
 
 include "mozilla/dom/cache/IPCUtils.h";
+include "mozilla/dom/quota/SerializationHelpers.h";
 include "mozilla/layers/LayersMessageUtils.h";
 
 using mozilla::dom::cache::Namespace
@@ -202,6 +203,8 @@
 
   async ShutdownBackgroundSessionStorageManagers();
 
+  async PropagateBackgroundSessionStorageManager(uint64_t currentTopContextId, uint64_t targetTopContextId);
+
   async RemoveBackgroundSessionStorageManager(uint64_t topContextId);
 
   async PFileSystemRequest(FileSystemParams params);
diff -Nru firefox-84.0.2+build1/ipc/glue/PBackgroundSharedTypes.ipdlh firefox-85.0+build1/ipc/glue/PBackgroundSharedTypes.ipdlh
--- firefox-84.0.2+build1/ipc/glue/PBackgroundSharedTypes.ipdlh	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/PBackgroundSharedTypes.ipdlh	2021-01-18 19:58:12.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 using mozilla::OriginAttributes from "mozilla/ipc/BackgroundUtils.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/ipc/glue/ProcessUtils.h firefox-85.0+build1/ipc/glue/ProcessUtils.h
--- firefox-84.0.2+build1/ipc/glue/ProcessUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ProcessUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "FileDescriptor.h"
 #include "base/shared_memory.h"
+#include "mozilla/Maybe.h"
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/ipc/glue/ProtocolMessageUtils.h firefox-85.0+build1/ipc/glue/ProtocolMessageUtils.h
--- firefox-84.0.2+build1/ipc/glue/ProtocolMessageUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ProtocolMessageUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,147 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef IPC_GLUE_PROTOCOLMESSAGEUTILS_H
+#define IPC_GLUE_PROTOCOLMESSAGEUTILS_H
+
+#include <stdint.h>
+#include <string>
+#include "base/string_util.h"
+#include "chrome/common/ipc_channel.h"
+#include "chrome/common/ipc_message_utils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ipc/Transport.h"
+
+class PickleIterator;
+
+namespace mozilla::ipc {
+class FileDescriptor;
+template <class PFooSide>
+class Endpoint;
+template <class PFooSide>
+class ManagedEndpoint;
+template <typename P>
+struct IPDLParamTraits;
+}  // namespace mozilla::ipc
+
+namespace IPC {
+
+class Message;
+
+template <>
+struct ParamTraits<mozilla::ipc::ActorHandle> {
+  typedef mozilla::ipc::ActorHandle paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    IPC::WriteParam(aMsg, aParam.mId);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    int id;
+    if (IPC::ReadParam(aMsg, aIter, &id)) {
+      aResult->mId = id;
+      return true;
+    }
+    return false;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(StringPrintf(L"(%d)", aParam.mId));
+  }
+};
+
+template <class PFooSide>
+struct ParamTraits<mozilla::ipc::Endpoint<PFooSide>> {
+  typedef mozilla::ipc::Endpoint<PFooSide> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    IPC::WriteParam(aMsg, aParam.mValid);
+    if (!aParam.mValid) {
+      return;
+    }
+
+    IPC::WriteParam(aMsg, static_cast<uint32_t>(aParam.mMode));
+
+    // We duplicate the descriptor so that our own file descriptor remains
+    // valid after the write. An alternative would be to set
+    // aParam.mTransport.mValid to false, but that won't work because aParam
+    // is const.
+    mozilla::ipc::TransportDescriptor desc =
+        mozilla::ipc::DuplicateDescriptor(aParam.mTransport);
+    IPC::WriteParam(aMsg, desc);
+
+    IPC::WriteParam(aMsg, aParam.mMyPid);
+    IPC::WriteParam(aMsg, aParam.mOtherPid);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    MOZ_RELEASE_ASSERT(!aResult->mValid);
+
+    if (!IPC::ReadParam(aMsg, aIter, &aResult->mValid)) {
+      return false;
+    }
+    if (!aResult->mValid) {
+      // Object is empty, but read succeeded.
+      return true;
+    }
+
+    uint32_t mode;
+    if (!IPC::ReadParam(aMsg, aIter, &mode) ||
+        !IPC::ReadParam(aMsg, aIter, &aResult->mTransport) ||
+        !IPC::ReadParam(aMsg, aIter, &aResult->mMyPid) ||
+        !IPC::ReadParam(aMsg, aIter, &aResult->mOtherPid)) {
+      return false;
+    }
+    aResult->mMode = Channel::Mode(mode);
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(StringPrintf(L"Endpoint"));
+  }
+};
+
+template <class PFooSide>
+struct ParamTraits<mozilla::ipc::ManagedEndpoint<PFooSide>> {
+  typedef mozilla::ipc::ManagedEndpoint<PFooSide> paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    IPC::WriteParam(aMsg, aParam.mId);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    MOZ_RELEASE_ASSERT(aResult->mId == 0);
+
+    if (!IPC::ReadParam(aMsg, aIter, &aResult->mId)) {
+      return false;
+    }
+    return true;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(StringPrintf(L"ManagedEndpoint"));
+  }
+};
+
+}  // namespace IPC
+
+namespace mozilla::ipc {
+template <>
+struct IPDLParamTraits<FileDescriptor> {
+  typedef FileDescriptor paramType;
+
+  static void Write(IPC::Message* aMsg, IProtocol* aActor,
+                    const paramType& aParam);
+  static bool Read(const IPC::Message* aMsg, PickleIterator* aIter,
+                   IProtocol* aActor, paramType* aResult);
+};
+}  // namespace mozilla::ipc
+
+#endif  // IPC_GLUE_PROTOCOLMESSAGEUTILS_H
diff -Nru firefox-84.0.2+build1/ipc/glue/ProtocolUtils.cpp firefox-85.0+build1/ipc/glue/ProtocolUtils.cpp
--- firefox-84.0.2+build1/ipc/glue/ProtocolUtils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ProtocolUtils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -14,6 +14,7 @@
 
 #include "mozilla/IntegerPrintfMacros.h"
 
+#include "mozilla/ipc/ProtocolMessageUtils.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 
 #include "mozilla/ipc/MessageChannel.h"
diff -Nru firefox-84.0.2+build1/ipc/glue/ProtocolUtilsFwd.h firefox-85.0+build1/ipc/glue/ProtocolUtilsFwd.h
--- firefox-84.0.2+build1/ipc/glue/ProtocolUtilsFwd.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ProtocolUtilsFwd.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,16 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_ipc_ProtocolUtilsFwd_h
+#define mozilla_ipc_ProtocolUtilsFwd_h 1
+
+namespace mozilla::ipc {
+
+class IProtocol;
+
+}  // namespace mozilla::ipc
+
+#endif  // mozilla_ipc_ProtocolUtilsFwd_h
diff -Nru firefox-84.0.2+build1/ipc/glue/ProtocolUtils.h firefox-85.0+build1/ipc/glue/ProtocolUtils.h
--- firefox-84.0.2+build1/ipc/glue/ProtocolUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ProtocolUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,40 +7,43 @@
 #ifndef mozilla_ipc_ProtocolUtils_h
 #define mozilla_ipc_ProtocolUtils_h 1
 
-#include "base/process.h"
-#include "base/process_util.h"
-#include "chrome/common/ipc_message_utils.h"
-
-#include "prenv.h"
-
+#include <cstddef>
+#include <cstdint>
+#include <utility>
 #include "IPCMessageStart.h"
+#include "base/basictypes.h"
+#include "base/process.h"
+#include "chrome/common/ipc_message.h"
 #include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ipc/ByteBuf.h"
-#include "mozilla/ipc/FileDescriptor.h"
-#include "mozilla/ipc/MessageChannel.h"
-#include "mozilla/ipc/Shmem.h"
-#include "mozilla/ipc/Transport.h"
-#include "mozilla/ipc/MessageLink.h"
-#include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/MozPromise.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/NotNull.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/Scoped.h"
 #include "mozilla/UniquePtr.h"
-#include "MainThreadUtils.h"
-
+#include "mozilla/ipc/MessageChannel.h"
+#include "mozilla/ipc/MessageLink.h"
+#include "mozilla/ipc/SharedMemory.h"
+#include "mozilla/ipc/Shmem.h"
 #include "nsDataHashtable.h"
-#include "nsHashKeys.h"
+#include "nsDebug.h"
+#include "nsISupports.h"
+#include "nsTArrayForwardDeclare.h"
+#include "nsTHashtable.h"
+
+// XXX Things that could be replaced by a forward header
+#include "mozilla/ipc/Transport.h"  // for Transport
+
+// XXX Things that could be moved to ProtocolUtils.cpp
+#include "base/process_util.h"  // for CloseProcessHandle
+#include "prenv.h"              // for PR_GetEnv
 
 #if defined(ANDROID) && defined(DEBUG)
 #  include <android/log.h>
 #endif
 
 template <typename T>
-class nsTHashtable;
-template <typename T>
 class nsPtrHashKey;
 
 // WARNING: this takes into account the private, special-message-type
@@ -67,7 +70,10 @@
 
 }  // namespace
 
+class MessageLoop;
+class PickleIterator;
 class nsISerialEventTarget;
+class nsUint32HashKey;
 
 namespace mozilla {
 class SchedulerGroup;
@@ -86,8 +92,6 @@
 class ProtocolFuzzerHelper;
 #endif
 
-class MessageChannel;
-
 #ifdef XP_WIN
 const base::ProcessHandle kInvalidProcessHandle = INVALID_HANDLE_VALUE;
 
@@ -372,6 +376,9 @@
 template <class PFooSide>
 class Endpoint;
 
+template <class PFooSide>
+class ManagedEndpoint;
+
 /**
  * All top-level protocols should inherit this class.
  *
@@ -617,8 +624,6 @@
 
 MOZ_NEVER_INLINE void SentinelReadError(const char* aElementName);
 
-struct PrivateIPDLInterface {};
-
 #if defined(XP_WIN)
 // This is a restricted version of Windows' DuplicateHandle() function
 // that works inside the sandbox and can send handles but not retrieve
@@ -635,210 +640,6 @@
  */
 void AnnotateSystemError();
 
-/**
- * An endpoint represents one end of a partially initialized IPDL channel. To
- * set up a new top-level protocol:
- *
- * Endpoint<PFooParent> parentEp;
- * Endpoint<PFooChild> childEp;
- * nsresult rv;
- * rv = PFoo::CreateEndpoints(parentPid, childPid, &parentEp, &childEp);
- *
- * You're required to pass in parentPid and childPid, which are the pids of the
- * processes in which the parent and child endpoints will be used.
- *
- * Endpoints can be passed in IPDL messages or sent to other threads using
- * PostTask. Once an Endpoint has arrived at its destination process and thread,
- * you need to create the top-level actor and bind it to the endpoint:
- *
- * FooParent* parent = new FooParent();
- * bool rv1 = parentEp.Bind(parent, processActor);
- * bool rv2 = parent->SendBar(...);
- *
- * (See Bind below for an explanation of processActor.) Once the actor is bound
- * to the endpoint, it can send and receive messages.
- */
-template <class PFooSide>
-class Endpoint {
- public:
-  typedef base::ProcessId ProcessId;
-
-  Endpoint()
-      : mValid(false),
-        mMode(static_cast<mozilla::ipc::Transport::Mode>(0)),
-        mMyPid(0),
-        mOtherPid(0) {}
-
-  Endpoint(const PrivateIPDLInterface&, mozilla::ipc::Transport::Mode aMode,
-           TransportDescriptor aTransport, ProcessId aMyPid,
-           ProcessId aOtherPid)
-      : mValid(true),
-        mMode(aMode),
-        mTransport(aTransport),
-        mMyPid(aMyPid),
-        mOtherPid(aOtherPid) {}
-
-  Endpoint(Endpoint&& aOther)
-      : mValid(aOther.mValid),
-        mTransport(aOther.mTransport),
-        mMyPid(aOther.mMyPid),
-        mOtherPid(aOther.mOtherPid) {
-    if (aOther.mValid) {
-      mMode = aOther.mMode;
-    }
-    aOther.mValid = false;
-  }
-
-  Endpoint& operator=(Endpoint&& aOther) {
-    mValid = aOther.mValid;
-    if (aOther.mValid) {
-      mMode = aOther.mMode;
-    }
-    mTransport = aOther.mTransport;
-    mMyPid = aOther.mMyPid;
-    mOtherPid = aOther.mOtherPid;
-
-    aOther.mValid = false;
-    return *this;
-  }
-
-  ~Endpoint() {
-    if (mValid) {
-      CloseDescriptor(mTransport);
-    }
-  }
-
-  ProcessId OtherPid() const { return mOtherPid; }
-
-  // This method binds aActor to this endpoint. After this call, the actor can
-  // be used to send and receive messages. The endpoint becomes invalid.
-  bool Bind(PFooSide* aActor) {
-    MOZ_RELEASE_ASSERT(mValid);
-    MOZ_RELEASE_ASSERT(mMyPid == base::GetCurrentProcId());
-
-    UniquePtr<Transport> transport =
-        mozilla::ipc::OpenDescriptor(mTransport, mMode);
-    if (!transport) {
-      return false;
-    }
-    if (!aActor->Open(
-            std::move(transport), mOtherPid, XRE_GetIOMessageLoop(),
-            mMode == Transport::MODE_SERVER ? ParentSide : ChildSide)) {
-      return false;
-    }
-    mValid = false;
-    return true;
-  }
-
-  bool IsValid() const { return mValid; }
-
- private:
-  friend struct IPC::ParamTraits<Endpoint<PFooSide>>;
-
-  Endpoint(const Endpoint&) = delete;
-  Endpoint& operator=(const Endpoint&) = delete;
-
-  bool mValid;
-  mozilla::ipc::Transport::Mode mMode;
-  TransportDescriptor mTransport;
-  ProcessId mMyPid, mOtherPid;
-};
-
-#if defined(XP_MACOSX)
-void AnnotateCrashReportWithErrno(CrashReporter::Annotation tag, int error);
-#else
-static inline void AnnotateCrashReportWithErrno(CrashReporter::Annotation tag,
-                                                int error) {}
-#endif
-
-// This function is used internally to create a pair of Endpoints. See the
-// comment above Endpoint for a description of how it might be used.
-template <class PFooParent, class PFooChild>
-nsresult CreateEndpoints(const PrivateIPDLInterface& aPrivate,
-                         base::ProcessId aParentDestPid,
-                         base::ProcessId aChildDestPid,
-                         Endpoint<PFooParent>* aParentEndpoint,
-                         Endpoint<PFooChild>* aChildEndpoint) {
-  MOZ_RELEASE_ASSERT(aParentDestPid);
-  MOZ_RELEASE_ASSERT(aChildDestPid);
-
-  TransportDescriptor parentTransport, childTransport;
-  nsresult rv;
-  if (NS_FAILED(rv = CreateTransport(aParentDestPid, &parentTransport,
-                                     &childTransport))) {
-    AnnotateCrashReportWithErrno(
-        CrashReporter::Annotation::IpcCreateEndpointsNsresult, int(rv));
-    return rv;
-  }
-
-  *aParentEndpoint =
-      Endpoint<PFooParent>(aPrivate, mozilla::ipc::Transport::MODE_SERVER,
-                           parentTransport, aParentDestPid, aChildDestPid);
-
-  *aChildEndpoint =
-      Endpoint<PFooChild>(aPrivate, mozilla::ipc::Transport::MODE_CLIENT,
-                          childTransport, aChildDestPid, aParentDestPid);
-
-  return NS_OK;
-}
-
-/**
- * A managed endpoint represents one end of a partially initialized managed
- * IPDL actor. It is used for situations where the usual IPDL Constructor
- * methods do not give sufficient control over the construction of actors, such
- * as when constructing actors within replies, or constructing multiple related
- * actors simultaneously.
- *
- * FooParent* parent = new FooParent();
- * ManagedEndpoint<PFooChild> childEp = parentMgr->OpenPFooEndpoint(parent);
- *
- * ManagedEndpoints should be sent using IPDL messages or other mechanisms to
- * the other side of the manager channel. Once the ManagedEndpoint has arrived
- * at its destination, you can create the actor, and bind it to the endpoint.
- *
- * FooChild* child = new FooChild();
- * childMgr->BindPFooEndpoint(childEp, child);
- *
- * WARNING: If the remote side of an endpoint has not been bound before it
- * begins to receive messages, an IPC routing error will occur, likely causing
- * a browser crash.
- */
-template <class PFooSide>
-class ManagedEndpoint {
- public:
-  ManagedEndpoint() : mId(0) {}
-
-  ManagedEndpoint(const PrivateIPDLInterface&, int32_t aId) : mId(aId) {}
-
-  ManagedEndpoint(ManagedEndpoint&& aOther) : mId(aOther.mId) {
-    aOther.mId = 0;
-  }
-
-  ManagedEndpoint& operator=(ManagedEndpoint&& aOther) {
-    mId = aOther.mId;
-    aOther.mId = 0;
-    return *this;
-  }
-
-  bool IsValid() const { return mId != 0; }
-
-  Maybe<int32_t> ActorId() const { return IsValid() ? Some(mId) : Nothing(); }
-
-  bool operator==(const ManagedEndpoint& _o) const { return mId == _o.mId; }
-
- private:
-  friend struct IPC::ParamTraits<ManagedEndpoint<PFooSide>>;
-
-  ManagedEndpoint(const ManagedEndpoint&) = delete;
-  ManagedEndpoint& operator=(const ManagedEndpoint&) = delete;
-
-  // The routing ID for the to-be-created endpoint.
-  int32_t mId;
-
-  // XXX(nika): Might be nice to have other info for assertions?
-  // e.g. mManagerId, mManagerType, etc.
-};
-
 // The ActorLifecycleProxy is a helper type used internally by IPC to maintain a
 // maybe-owning reference to an IProtocol object. For well-behaved actors
 // which are not freed until after their `Dealloc` method is called, a
@@ -924,106 +725,4 @@
 
 }  // namespace mozilla
 
-namespace IPC {
-
-template <>
-struct ParamTraits<mozilla::ipc::ActorHandle> {
-  typedef mozilla::ipc::ActorHandle paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    IPC::WriteParam(aMsg, aParam.mId);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    int id;
-    if (IPC::ReadParam(aMsg, aIter, &id)) {
-      aResult->mId = id;
-      return true;
-    }
-    return false;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(StringPrintf(L"(%d)", aParam.mId));
-  }
-};
-
-template <class PFooSide>
-struct ParamTraits<mozilla::ipc::Endpoint<PFooSide>> {
-  typedef mozilla::ipc::Endpoint<PFooSide> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    IPC::WriteParam(aMsg, aParam.mValid);
-    if (!aParam.mValid) {
-      return;
-    }
-
-    IPC::WriteParam(aMsg, static_cast<uint32_t>(aParam.mMode));
-
-    // We duplicate the descriptor so that our own file descriptor remains
-    // valid after the write. An alternative would be to set
-    // aParam.mTransport.mValid to false, but that won't work because aParam
-    // is const.
-    mozilla::ipc::TransportDescriptor desc =
-        mozilla::ipc::DuplicateDescriptor(aParam.mTransport);
-    IPC::WriteParam(aMsg, desc);
-
-    IPC::WriteParam(aMsg, aParam.mMyPid);
-    IPC::WriteParam(aMsg, aParam.mOtherPid);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    MOZ_RELEASE_ASSERT(!aResult->mValid);
-
-    if (!IPC::ReadParam(aMsg, aIter, &aResult->mValid)) {
-      return false;
-    }
-    if (!aResult->mValid) {
-      // Object is empty, but read succeeded.
-      return true;
-    }
-
-    uint32_t mode;
-    if (!IPC::ReadParam(aMsg, aIter, &mode) ||
-        !IPC::ReadParam(aMsg, aIter, &aResult->mTransport) ||
-        !IPC::ReadParam(aMsg, aIter, &aResult->mMyPid) ||
-        !IPC::ReadParam(aMsg, aIter, &aResult->mOtherPid)) {
-      return false;
-    }
-    aResult->mMode = Channel::Mode(mode);
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(StringPrintf(L"Endpoint"));
-  }
-};
-
-template <class PFooSide>
-struct ParamTraits<mozilla::ipc::ManagedEndpoint<PFooSide>> {
-  typedef mozilla::ipc::ManagedEndpoint<PFooSide> paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    IPC::WriteParam(aMsg, aParam.mId);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    MOZ_RELEASE_ASSERT(aResult->mId == 0);
-
-    if (!IPC::ReadParam(aMsg, aIter, &aResult->mId)) {
-      return false;
-    }
-    return true;
-  }
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(StringPrintf(L"ManagedEndpoint"));
-  }
-};
-
-}  // namespace IPC
-
 #endif  // mozilla_ipc_ProtocolUtils_h
diff -Nru firefox-84.0.2+build1/ipc/glue/SerializedStructuredCloneBuffer.h firefox-85.0+build1/ipc/glue/SerializedStructuredCloneBuffer.h
--- firefox-84.0.2+build1/ipc/glue/SerializedStructuredCloneBuffer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/SerializedStructuredCloneBuffer.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,130 @@
+/* -*- 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 __IPC_GLUE_SERIALIZEDSTRUCTUREDCLONEBUFFER_H__
+#define __IPC_GLUE_SERIALIZEDSTRUCTUREDCLONEBUFFER_H__
+
+#include <algorithm>
+#include <cstdint>
+#include <cstdlib>
+#include <string>
+#include <utility>
+#include "chrome/common/ipc_message.h"
+#include "chrome/common/ipc_message_utils.h"
+#include "js/AllocPolicy.h"
+#include "js/StructuredClone.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/BufferList.h"
+#include "mozilla/Vector.h"
+#include "mozilla/mozalloc.h"
+class PickleIterator;
+
+namespace mozilla {
+template <typename...>
+class Variant;
+
+namespace detail {
+template <typename...>
+struct VariantTag;
+}
+}  // namespace mozilla
+
+namespace mozilla {
+
+struct SerializedStructuredCloneBuffer final {
+  SerializedStructuredCloneBuffer() = default;
+
+  SerializedStructuredCloneBuffer(SerializedStructuredCloneBuffer&&) = default;
+  SerializedStructuredCloneBuffer& operator=(
+      SerializedStructuredCloneBuffer&&) = default;
+
+  SerializedStructuredCloneBuffer(const SerializedStructuredCloneBuffer&) =
+      delete;
+  SerializedStructuredCloneBuffer& operator=(
+      const SerializedStructuredCloneBuffer& aOther) = delete;
+
+  bool operator==(const SerializedStructuredCloneBuffer& aOther) const {
+    // The copy assignment operator and the equality operator are
+    // needed by the IPDL generated code. We relied on the copy
+    // assignment operator at some places but we never use the
+    // equality operator.
+    return false;
+  }
+
+  JSStructuredCloneData data{JS::StructuredCloneScope::Unassigned};
+};
+
+}  // namespace mozilla
+
+namespace IPC {
+template <>
+struct ParamTraits<JSStructuredCloneData> {
+  typedef JSStructuredCloneData paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    MOZ_ASSERT(!(aParam.Size() % sizeof(uint64_t)));
+    WriteParam(aMsg, aParam.Size());
+    aParam.ForEachDataChunk([&](const char* aData, size_t aSize) {
+      return aMsg->WriteBytes(aData, aSize, sizeof(uint64_t));
+    });
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    size_t length = 0;
+    if (!ReadParam(aMsg, aIter, &length)) {
+      return false;
+    }
+    MOZ_ASSERT(!(length % sizeof(uint64_t)));
+
+    mozilla::BufferList<InfallibleAllocPolicy> buffers(0, 0, 4096);
+
+    // Borrowing is not suitable to use for IPC to hand out data
+    // because we often want to store the data somewhere for
+    // processing after IPC has released the underlying buffers. One
+    // case is PContentChild::SendGetXPCOMProcessAttributes. We can't
+    // return a borrowed buffer because the out param outlives the
+    // IPDL callback.
+    if (length &&
+        !aMsg->ExtractBuffers(aIter, length, &buffers, sizeof(uint64_t))) {
+      return false;
+    }
+
+    bool success;
+    mozilla::BufferList<js::SystemAllocPolicy> out =
+        buffers.MoveFallible<js::SystemAllocPolicy>(&success);
+    if (!success) {
+      return false;
+    }
+
+    *aResult = JSStructuredCloneData(
+        std::move(out), JS::StructuredCloneScope::DifferentProcess);
+
+    return true;
+  }
+};
+
+template <>
+struct ParamTraits<mozilla::SerializedStructuredCloneBuffer> {
+  typedef mozilla::SerializedStructuredCloneBuffer paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.data);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->data);
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    LogParam(aParam.data.Size(), aLog);
+  }
+};
+
+}  // namespace IPC
+
+#endif /* __IPC_GLUE_SERIALIZEDSTRUCTUREDCLONEBUFFER_H__ */
diff -Nru firefox-84.0.2+build1/ipc/glue/Shmem.cpp firefox-85.0+build1/ipc/glue/Shmem.cpp
--- firefox-84.0.2+build1/ipc/glue/Shmem.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/Shmem.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include "ProtocolUtils.h"
 #include "SharedMemoryBasic.h"
-
+#include "ShmemMessageUtils.h"
 #include "mozilla/Unused.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/ipc/glue/Shmem.h firefox-85.0+build1/ipc/glue/Shmem.h
--- firefox-84.0.2+build1/ipc/glue/Shmem.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/Shmem.h	2021-01-18 19:58:12.000000000 +0000
@@ -15,9 +15,7 @@
 #include "nscore.h"
 #include "nsDebug.h"
 
-#include "ipc/IPCMessageUtils.h"
 #include "mozilla/ipc/SharedMemory.h"
-#include "mozilla/ipc/IPDLParamTraits.h"
 #include "mozilla/UniquePtr.h"
 
 /**
@@ -61,6 +59,9 @@
 
 namespace ipc {
 
+template <typename P>
+struct IPDLParamTraits;
+
 class Shmem final {
   friend struct IPDLParamTraits<mozilla::ipc::Shmem>;
 #ifdef DEBUG
@@ -203,19 +204,6 @@
   id_t mId;
 };
 
-template <>
-struct IPDLParamTraits<Shmem> {
-  typedef Shmem paramType;
-
-  static void Write(IPC::Message* aMsg, IProtocol* aActor, paramType&& aParam);
-  static bool Read(const IPC::Message* aMsg, PickleIterator* aIter,
-                   IProtocol* aActor, paramType* aResult);
-
-  static void Log(const paramType& aParam, std::wstring* aLog) {
-    aLog->append(L"(shmem segment)");
-  }
-};
-
 }  // namespace ipc
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/ipc/glue/ShmemMessageUtils.h firefox-85.0+build1/ipc/glue/ShmemMessageUtils.h
--- firefox-84.0.2+build1/ipc/glue/ShmemMessageUtils.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/ShmemMessageUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,33 @@
+/* -*- 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_ipc_ShmemMessageUtils_h
+#define mozilla_ipc_ShmemMessageUtils_h
+
+#include "ipc/IPCMessageUtils.h"
+#include "mozilla/ipc/IPDLParamTraits.h"
+#include "mozilla/ipc/Shmem.h"
+
+namespace mozilla {
+namespace ipc {
+
+template <>
+struct IPDLParamTraits<Shmem> {
+  typedef Shmem paramType;
+
+  static void Write(IPC::Message* aMsg, IProtocol* aActor, paramType&& aParam);
+  static bool Read(const IPC::Message* aMsg, PickleIterator* aIter,
+                   IProtocol* aActor, paramType* aResult);
+
+  static void Log(const paramType& aParam, std::wstring* aLog) {
+    aLog->append(L"(shmem segment)");
+  }
+};
+
+}  // namespace ipc
+}  // namespace mozilla
+
+#endif  // ifndef mozilla_ipc_ShmemMessageUtils_h
diff -Nru firefox-84.0.2+build1/ipc/glue/Transport_posix.cpp firefox-85.0+build1/ipc/glue/Transport_posix.cpp
--- firefox-84.0.2+build1/ipc/glue/Transport_posix.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/Transport_posix.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "base/eintr_wrapper.h"
 
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/Transport.h"
 #include "mozilla/ipc/FileDescriptor.h"
 #include "ProtocolUtils.h"
diff -Nru firefox-84.0.2+build1/ipc/glue/TransportSecurityInfoUtils.h firefox-85.0+build1/ipc/glue/TransportSecurityInfoUtils.h
--- firefox-84.0.2+build1/ipc/glue/TransportSecurityInfoUtils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/TransportSecurityInfoUtils.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,6 +10,9 @@
 
 namespace IPC {
 
+template <typename>
+struct ParamTraits;
+
 template <>
 struct ParamTraits<nsITransportSecurityInfo*> {
   static void Write(Message* aMsg, nsITransportSecurityInfo* aParam);
diff -Nru firefox-84.0.2+build1/ipc/glue/Transport_win.h firefox-85.0+build1/ipc/glue/Transport_win.h
--- firefox-84.0.2+build1/ipc/glue/Transport_win.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/Transport_win.h	2021-01-18 19:58:12.000000000 +0000
@@ -12,6 +12,7 @@
 #include "base/process.h"
 #include "ipc/IPCMessageUtils.h"
 #include "nsWindowsHelpers.h"
+#include "nsXULAppAPI.h"
 
 namespace mozilla {
 namespace ipc {
diff -Nru firefox-84.0.2+build1/ipc/glue/URIParams.ipdlh firefox-85.0+build1/ipc/glue/URIParams.ipdlh
--- firefox-84.0.2+build1/ipc/glue/URIParams.ipdlh	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/URIParams.ipdlh	2021-01-18 19:58:12.000000000 +0000
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 include PBackgroundSharedTypes;
 
diff -Nru firefox-84.0.2+build1/ipc/glue/WindowsMessageLoop.cpp firefox-85.0+build1/ipc/glue/WindowsMessageLoop.cpp
--- firefox-84.0.2+build1/ipc/glue/WindowsMessageLoop.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/glue/WindowsMessageLoop.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -16,6 +16,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/dom/JSExecutionManager.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/mscom/Utils.h"
 #include "mozilla/PaintTracker.h"
diff -Nru firefox-84.0.2+build1/ipc/ipdl/ipdl/builtin.py firefox-85.0+build1/ipc/ipdl/ipdl/builtin.py
--- firefox-84.0.2+build1/ipc/ipdl/ipdl/builtin.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/ipdl/ipdl/builtin.py	2021-01-18 19:58:12.000000000 +0000
@@ -40,21 +40,31 @@
 )
 
 
+# XXX(Bug 1677487) Can we restrict including ByteBuf.h, FileDescriptor.h,
+# MozPromise.h and Shmem.h to those protocols that really use them?
 HeaderIncludes = (
     "mozilla/Attributes.h",
     "IPCMessageStart.h",
-    "ipc/IPCMessageUtils.h",
     "mozilla/RefPtr.h",
     "nsString.h",
     "nsTArray.h",
-    "mozilla/ipc/ProtocolUtils.h",
-    "mozilla/ipc/TaintingIPCUtils.h",
     "nsTHashtable.h",
+    "mozilla/MozPromise.h",
     "mozilla/OperatorNewExtensions.h",
     "mozilla/UniquePtr.h",
+    "mozilla/ipc/ByteBuf.h",
+    "mozilla/ipc/FileDescriptor.h",
+    "mozilla/ipc/ProtocolUtilsFwd.h",
+    "mozilla/ipc/Shmem.h",
 )
 
 CppIncludes = (
+    "ipc/IPCMessageUtils.h",
     "nsIFile.h",
     "GeckoProfiler.h",
+    "mozilla/ipc/Endpoint.h",
+    "mozilla/ipc/ProtocolMessageUtils.h",
+    "mozilla/ipc/ProtocolUtils.h",
+    "mozilla/ipc/ShmemMessageUtils.h",
+    "mozilla/ipc/TaintingIPCUtils.h",
 )
diff -Nru firefox-84.0.2+build1/ipc/ipdl/ipdl/lower.py firefox-85.0+build1/ipc/ipdl/ipdl/lower.py
--- firefox-84.0.2+build1/ipc/ipdl/ipdl/lower.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/ipdl/ipdl/lower.py	2021-01-18 19:58:12.000000000 +0000
@@ -1658,6 +1658,11 @@
                     for h in self.cppIncludeHeaders
                 ]
                 + [Whitespace.NL]
+                + [
+                    CppDirective("include", '"%s"' % filename)
+                    for filename in ipdl.builtin.CppIncludes
+                ]
+                + [Whitespace.NL]
             )
         )
 
@@ -3540,11 +3545,6 @@
             + setToIncludes(self.externalIncludes)
         )
 
-        cppheaders = [
-            CppDirective("include", '"%s"' % filename)
-            for filename in ipdl.builtin.CppIncludes
-        ]
-
         cf.addthings(
             (
                 [Whitespace.NL]
@@ -3553,7 +3553,10 @@
                     for inc in self.protocolCxxIncludes
                 ]
                 + [Whitespace.NL]
-                + cppheaders
+                + [
+                    CppDirective("include", '"%s"' % filename)
+                    for filename in ipdl.builtin.CppIncludes
+                ]
                 + [Whitespace.NL]
             )
         )
@@ -3588,7 +3591,7 @@
             self.nonForwardDeclaredHeaders.add(using.header)
 
     def visitCxxInclude(self, inc):
-        self.nonForwardDeclaredHeaders.add(inc.file)
+        self.externalIncludes.add(inc.file)
 
     def visitInclude(self, inc):
         ip = inc.tu.protocol
diff -Nru firefox-84.0.2+build1/ipc/ipdl/test/cxx/PTestDataStructuresCommon.ipdlh firefox-85.0+build1/ipc/ipdl/test/cxx/PTestDataStructuresCommon.ipdlh
--- firefox-84.0.2+build1/ipc/ipdl/test/cxx/PTestDataStructuresCommon.ipdlh	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/ipdl/test/cxx/PTestDataStructuresCommon.ipdlh	2021-01-18 19:58:12.000000000 +0000
@@ -1,6 +1,6 @@
 include protocol PTestDataStructuresSub;
 
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 using nsIntRegion from "nsRegion.h";
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/ipc/ipdl/test/cxx/PTestJSON.ipdl firefox-85.0+build1/ipc/ipdl/test/cxx/PTestJSON.ipdl
--- firefox-84.0.2+build1/ipc/ipdl/test/cxx/PTestJSON.ipdl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/ipdl/test/cxx/PTestJSON.ipdl	2021-01-18 19:58:12.000000000 +0000
@@ -1,7 +1,7 @@
 include protocol PTestHandle;
 
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using struct mozilla::null_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using struct mozilla::null_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace _ipdltest {
diff -Nru firefox-84.0.2+build1/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl firefox-85.0+build1/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl
--- firefox-84.0.2+build1/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,5 @@
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
-using struct mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 protocol PmultipleUsingCxxTypes {
 child:
diff -Nru firefox-84.0.2+build1/ipc/mscom/ActivationContext.h firefox-85.0+build1/ipc/mscom/ActivationContext.h
--- firefox-84.0.2+build1/ipc/mscom/ActivationContext.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/mscom/ActivationContext.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,9 +10,9 @@
 #include <utility>
 
 #include "mozilla/Attributes.h"
-#include "mozilla/Result.h"
 
 #if defined(MOZILLA_INTERNAL_API)
+#  include "mozilla/ResultVariant.h"
 #  include "nsString.h"
 #endif  // defined(MOZILLA_INTERNAL_API)
 
diff -Nru firefox-84.0.2+build1/ipc/mscom/AsyncInvoker.h firefox-85.0+build1/ipc/mscom/AsyncInvoker.h
--- firefox-84.0.2+build1/ipc/mscom/AsyncInvoker.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/mscom/AsyncInvoker.h	2021-01-18 19:58:12.000000000 +0000
@@ -370,17 +370,14 @@
    *                 performance penalty associated with that.
    */
   explicit AsyncInvoker(SyncInterface* aSyncObj,
-                        const Maybe<bool>& aIsProxy = Nothing())
-      : mSyncObj(ResolveIsProxy(aSyncObj, aIsProxy) ? nullptr : aSyncObj) {
+                        const Maybe<bool>& aIsProxy = Nothing()) {
     MOZ_ASSERT(aSyncObj);
 
-    if (mSyncObj) {
-      return;
-    }
-
     RefPtr<ICallFactory> callFactory;
-    if (FAILED(aSyncObj->QueryInterface(IID_ICallFactory,
+    if ((aIsProxy.isSome() && !aIsProxy.value()) ||
+        FAILED(aSyncObj->QueryInterface(IID_ICallFactory,
                                         getter_AddRefs(callFactory)))) {
+      mSyncObj = aSyncObj;
       return;
     }
 
@@ -436,13 +433,6 @@
   AsyncInvoker& operator=(AsyncInvoker&& aOther) = delete;
 
  private:
-  static bool ResolveIsProxy(SyncInterface* aSyncObj,
-                             const Maybe<bool>& aIsProxy) {
-    MOZ_ASSERT(aSyncObj);
-    return aIsProxy.isSome() ? aIsProxy.value() : IsProxy(aSyncObj);
-  }
-
- private:
   RefPtr<SyncInterface> mSyncObj;
 };
 
diff -Nru firefox-84.0.2+build1/ipc/mscom/ProfilerMarkers.cpp firefox-85.0+build1/ipc/mscom/ProfilerMarkers.cpp
--- firefox-84.0.2+build1/ipc/mscom/ProfilerMarkers.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/mscom/ProfilerMarkers.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -11,16 +11,22 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/mscom/Utils.h"
 #include "mozilla/Services.h"
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsISupportsImpl.h"
+#include "nsString.h"
 #include "nsXULAppAPI.h"
 
 #include <objbase.h>
 #include <objidlbase.h>
 
+#ifdef MOZ_GECKO_PROFILER
+#  include "mozilla/ProfilerMarkerTypes.h"
+#endif
+
 // {9DBE6B28-E5E7-4FDE-AF00-9404604E74DC}
 static const GUID GUID_MozProfilerMarkerExtension = {
     0x9dbe6b28, 0xe5e7, 0x4fde, {0xaf, 0x0, 0x94, 0x4, 0x60, 0x4e, 0x74, 0xdc}};
@@ -31,7 +37,7 @@
   ~ProfilerMarkerChannelHook() = default;
 
  public:
-  ProfilerMarkerChannelHook() : mRefCnt(0), mMainThreadORPCDepth(0) {}
+  ProfilerMarkerChannelHook() : mRefCnt(0) {}
 
   // IUnknown
   STDMETHODIMP QueryInterface(REFIID aIid, void** aOutInterface) override;
@@ -58,10 +64,6 @@
    *
    * Finally, our implementation responds to any request matching our extension
    * ID, however we only care about main thread COM calls.
-   *
-   * Further note that COM allows re-entrancy, however for our purposes we only
-   * care about the outermost IPC call on the main thread, so we use the
-   * mMainThreadORPCDepth variable to track that.
    */
 
   // IChannelHook
@@ -92,8 +94,10 @@
                    void* aDataBuf, HRESULT aFault) override {}
 
  private:
+  void BuildMarkerName(REFIID aIid, nsACString& aOutMarkerName);
+
+ private:
   mozilla::Atomic<ULONG> mRefCnt;
-  ULONG mMainThreadORPCDepth;
 };
 
 HRESULT ProfilerMarkerChannelHook::QueryInterface(REFIID aIid,
@@ -118,16 +122,23 @@
   return result;
 }
 
+void ProfilerMarkerChannelHook::BuildMarkerName(REFIID aIid,
+                                                nsACString& aOutMarkerName) {
+  aOutMarkerName.AssignLiteral("ORPC Call for ");
+
+  nsAutoCString iidStr;
+  mozilla::mscom::DiagnosticNameForIID(aIid, iidStr);
+  aOutMarkerName.Append(iidStr);
+}
+
 void ProfilerMarkerChannelHook::ClientGetSize(REFGUID aExtensionId, REFIID aIid,
                                               ULONG* aOutDataSize) {
   if (aExtensionId == GUID_MozProfilerMarkerExtension) {
     if (NS_IsMainThread()) {
-      if (!mMainThreadORPCDepth) {
-        PROFILER_TRACING_MARKER("MSCOM", "ORPC Call", IPC,
-                                TRACING_INTERVAL_START);
-      }
-
-      ++mMainThreadORPCDepth;
+      nsAutoCString markerName;
+      BuildMarkerName(aIid, markerName);
+      PROFILER_MARKER(markerName, IPC, mozilla::MarkerTiming::IntervalStart(),
+                      Tracing, "MSCOM");
     }
 
     if (aOutDataSize) {
@@ -140,12 +151,11 @@
 void ProfilerMarkerChannelHook::ClientNotify(REFGUID aExtensionId, REFIID aIid,
                                              ULONG aDataSize, void* aDataBuffer,
                                              DWORD aDataRep, HRESULT aFault) {
-  if (aExtensionId == GUID_MozProfilerMarkerExtension && NS_IsMainThread()) {
-    MOZ_ASSERT(mMainThreadORPCDepth > 0);
-    --mMainThreadORPCDepth;
-    if (!mMainThreadORPCDepth) {
-      PROFILER_TRACING_MARKER("MSCOM", "ORPC Call", IPC, TRACING_INTERVAL_END);
-    }
+  if (NS_IsMainThread() && aExtensionId == GUID_MozProfilerMarkerExtension) {
+    nsAutoCString markerName;
+    BuildMarkerName(aIid, markerName);
+    PROFILER_MARKER(markerName, IPC, mozilla::MarkerTiming::IntervalEnd(),
+                    Tracing, "MSCOM");
   }
 }
 
diff -Nru firefox-84.0.2+build1/ipc/mscom/Utils.cpp firefox-85.0+build1/ipc/mscom/Utils.cpp
--- firefox-84.0.2+build1/ipc/mscom/Utils.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/mscom/Utils.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -28,6 +28,8 @@
 #include <shlwapi.h>
 #include <winnt.h>
 
+#include <utility>
+
 #if defined(_MSC_VER)
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 #endif
@@ -317,6 +319,82 @@
   }
 }
 
+// Undocumented IIDs that are relevant for diagnostic purposes
+static const IID IID_ISCMLocalActivator = {
+    0x00000136,
+    0x0000,
+    0x0000,
+    {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
+static const IID IID_IRundown = {
+    0x00000134,
+    0x0000,
+    0x0000,
+    {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
+static const IID IID_IRemUnknown = {
+    0x00000131,
+    0x0000,
+    0x0000,
+    {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
+static const IID IID_IRemUnknown2 = {
+    0x00000143,
+    0x0000,
+    0x0000,
+    {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
+
+struct IIDToLiteralMapEntry {
+  constexpr IIDToLiteralMapEntry(REFIID aIid, nsLiteralCString&& aStr)
+      : mIid(aIid), mStr(std::forward<nsLiteralCString>(aStr)) {}
+
+  REFIID mIid;
+  const nsLiteralCString mStr;
+};
+
+/**
+ * Given the name of an interface, the IID_ENTRY macro generates a pair
+ * containing a reference to the interface ID and a stringified version of
+ * the interface name.
+ *
+ * For example:
+ *
+ *   {IID_ENTRY(IUnknown)}
+ * is expanded to:
+ *   {IID_IUnknown, "IUnknown"_ns}
+ *
+ */
+// clang-format off
+#  define IID_ENTRY_STRINGIFY(iface) #iface##_ns
+#  define IID_ENTRY(iface) IID_##iface, IID_ENTRY_STRINGIFY(iface)
+// clang-format on
+
+// Mapping of selected IIDs to friendly, human readable descriptions for each
+// interface.
+static constexpr IIDToLiteralMapEntry sIidDiagStrs[] = {
+    {IID_ENTRY(IUnknown)},
+    {IID_IRemUnknown, "cross-apartment IUnknown"_ns},
+    {IID_IRundown, "cross-apartment object management"_ns},
+    {IID_ISCMLocalActivator, "out-of-process object instantiation"_ns},
+    {IID_IRemUnknown2, "cross-apartment IUnknown"_ns}};
+
+#  undef IID_ENTRY
+#  undef IID_ENTRY_STRINGIFY
+
+void DiagnosticNameForIID(REFIID aIid, nsACString& aOutString) {
+  // If the IID matches something in sIidDiagStrs, output its string.
+  for (const auto& curEntry : sIidDiagStrs) {
+    if (curEntry.mIid == aIid) {
+      aOutString.Assign(curEntry.mStr);
+      return;
+    }
+  }
+
+  // Otherwise just convert the IID to string form and output that.
+  nsAutoString strIid;
+  GUIDToString(aIid, strIid);
+
+  aOutString.AssignLiteral("IID ");
+  AppendUTF16toUTF8(strIid, aOutString);
+}
+
 #else
 
 void GUIDToString(REFGUID aGuid,
diff -Nru firefox-84.0.2+build1/ipc/mscom/Utils.h firefox-85.0+build1/ipc/mscom/Utils.h
--- firefox-84.0.2+build1/ipc/mscom/Utils.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/mscom/Utils.h	2021-01-18 19:58:12.000000000 +0000
@@ -105,6 +105,15 @@
 bool IsClassThreadAwareInprocServer(REFCLSID aClsid);
 
 void GUIDToString(REFGUID aGuid, nsAString& aOutString);
+
+/**
+ * Converts an IID to a human-readable string for the purposes of diagnostic
+ * tools such as the profiler. For some special cases, we output a friendly
+ * string that describes the purpose of the interface. If no such description
+ * exists, we simply fall back to outputting the IID as a string formatted by
+ * GUIDToString().
+ */
+void DiagnosticNameForIID(REFIID aIid, nsACString& aOutString);
 #else
 void GUIDToString(REFGUID aGuid,
                   wchar_t (&aOutBuf)[kGuidRegFormatCharLenInclNul]);
diff -Nru firefox-84.0.2+build1/ipc/testshell/TestShellParent.h firefox-85.0+build1/ipc/testshell/TestShellParent.h
--- firefox-84.0.2+build1/ipc/testshell/TestShellParent.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/testshell/TestShellParent.h	2021-01-18 19:58:12.000000000 +0000
@@ -13,6 +13,7 @@
 
 #include "js/TypeDecls.h"
 #include "js/RootingAPI.h"
+#include "js/Value.h"
 #include "nsString.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/ipc/testshell/XPCShellEnvironment.cpp firefox-85.0+build1/ipc/testshell/XPCShellEnvironment.cpp
--- firefox-84.0.2+build1/ipc/testshell/XPCShellEnvironment.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/ipc/testshell/XPCShellEnvironment.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include "mozilla/Utf8.h"  // mozilla::Utf8Unit
 #include "mozilla/XPCOM.h"
+#include "mozilla/dom/ScriptSettings.h"
 
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
diff -Nru firefox-84.0.2+build1/js/app.mozbuild firefox-85.0+build1/js/app.mozbuild
--- firefox-84.0.2+build1/js/app.mozbuild	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/app.mozbuild	2021-01-18 19:58:12.000000000 +0000
@@ -23,6 +23,7 @@
     '/config/external/nspr',
     '/config/external/zlib',
     '/memory',
+    '/mfbt',
     '/mozglue',
 ]
 
diff -Nru firefox-84.0.2+build1/js/moz.configure firefox-85.0+build1/js/moz.configure
--- firefox-84.0.2+build1/js/moz.configure	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/moz.configure	2021-01-18 19:58:12.000000000 +0000
@@ -456,22 +456,6 @@
 set_config("JS_MASM_VERBOSE", depends_if("--enable-masm-verbose")(lambda _: True))
 
 
-option(
-    "--enable-more-deterministic",
-    env="JS_MORE_DETERMINISTIC",
-    help="Enable changes that make the shell more deterministic",
-)
-
-
-@depends("--enable-more-deterministic")
-def more_deterministic(value):
-    if value:
-        return True
-
-
-set_define("JS_MORE_DETERMINISTIC", more_deterministic)
-
-
 # CTypes
 # =======================================================
 @depends(js_standalone)
@@ -742,17 +726,13 @@
 # Support for WebAssembly SIMD
 # =====================================================
 
-# Currently off by default for ARM64 (whether simulator or hardware)
-# and not properly supported by Cranelift, but can be enabled so as
-# to be tested with baseline.
-
 
 @depends("--enable-jit", "--enable-simulator", target)
 def default_wasm_simd(jit_enabled, simulator, target):
     if not jit_enabled or simulator:
         return
 
-    if target.cpu in ("x86_64", "x86"):
+    if target.cpu in ("x86_64", "x86", "aarch64"):
         return True
 
 
@@ -978,3 +958,26 @@
     "ENABLE_WASM_TYPE_REFLECTIONS",
     depends_if("--enable-wasm-type-reflections")(lambda x: True),
 )
+
+# Support for WebAssembly exceptions
+# ==================================
+
+
+@depends(milestone.is_nightly, "--enable-wasm-multi-value")
+def default_wasm_exceptions(is_nightly, multi_value):
+    if multi_value and is_nightly:
+        return True
+
+
+option(
+    "--enable-wasm-exceptions",
+    default=default_wasm_exceptions,
+    help="{Enable|Disable} WebAssembly exceptions",
+)
+
+set_config(
+    "ENABLE_WASM_EXCEPTIONS", depends_if("--enable-wasm-exceptions")(lambda x: True)
+)
+set_define(
+    "ENABLE_WASM_EXCEPTIONS", depends_if("--enable-wasm-exceptions")(lambda x: True)
+)
diff -Nru firefox-84.0.2+build1/js/public/AllocPolicy.h firefox-85.0+build1/js/public/AllocPolicy.h
--- firefox-84.0.2+build1/js/public/AllocPolicy.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/AllocPolicy.h	2021-01-18 19:58:12.000000000 +0000
@@ -187,6 +187,21 @@
   }
 };
 
+/*
+ * A replacement for MallocAllocPolicy that allocates in the JS heap and adds no
+ * extra behaviours.
+ *
+ * This is currently used for allocating source buffers for parsing. Since these
+ * are temporary and will not be freed by GC, the memory is not tracked by the
+ * usual accounting.
+ */
+class MallocAllocPolicy : public AllocPolicyBase {
+ public:
+  void reportAllocOverflow() const {}
+
+  MOZ_MUST_USE bool checkSimulatedOOM() const { return true; }
+};
+
 } /* namespace js */
 
 #endif /* js_AllocPolicy_h */
diff -Nru firefox-84.0.2+build1/js/public/CompileOptions.h firefox-85.0+build1/js/public/CompileOptions.h
--- firefox-84.0.2+build1/js/public/CompileOptions.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/CompileOptions.h	2021-01-18 19:58:12.000000000 +0000
@@ -132,6 +132,7 @@
   bool nonSyntacticScope = false;
   bool privateClassFields = false;
   bool privateClassMethods = false;
+  bool topLevelAwait = false;
 
   // True if transcoding to XDR should use Stencil instead of JSScripts.
   bool useStencilXDR = false;
diff -Nru firefox-84.0.2+build1/js/public/ContextOptions.h firefox-85.0+build1/js/public/ContextOptions.h
--- firefox-84.0.2+build1/js/public/ContextOptions.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/ContextOptions.h	2021-01-18 19:58:12.000000000 +0000
@@ -30,6 +30,7 @@
         wasmGc_(false),
         wasmMultiValue_(false),
         wasmSimd_(false),
+        wasmExceptions_(false),
         testWasmAwaitTier2_(false),
         throwOnAsmJSValidationFailure_(false),
         disableIon_(false),
@@ -46,7 +47,8 @@
 #endif
         fuzzing_(false),
         privateClassFields_(false),
-        privateClassMethods_(false) {
+        privateClassMethods_(false),
+        topLevelAwait_(false) {
   }
 
   bool asmJS() const { return asmJS_; }
@@ -125,6 +127,10 @@
   // Defined out-of-line because it depends on a compile-time option
   ContextOptions& setWasmSimd(bool flag);
 
+  bool wasmExceptions() const { return wasmExceptions_; }
+  // Defined out-of-line because it depends on a compile-time option
+  ContextOptions& setWasmExceptions(bool flag);
+
   bool throwOnAsmJSValidationFailure() const {
     return throwOnAsmJSValidationFailure_;
   }
@@ -158,6 +164,12 @@
     return *this;
   }
 
+  bool topLevelAwait() const { return topLevelAwait_; }
+  ContextOptions& setTopLevelAwait(bool enabled) {
+    topLevelAwait_ = enabled;
+    return *this;
+  }
+
   // Override to allow disabling the eval restriction security checks for
   // this context.
   bool disableEvalSecurityChecks() const { return disableEvalSecurityChecks_; }
@@ -251,6 +263,7 @@
   bool wasmGc_ : 1;
   bool wasmMultiValue_ : 1;
   bool wasmSimd_ : 1;
+  bool wasmExceptions_ : 1;
   bool testWasmAwaitTier2_ : 1;
   bool throwOnAsmJSValidationFailure_ : 1;
   bool disableIon_ : 1;
@@ -268,6 +281,7 @@
   bool fuzzing_ : 1;
   bool privateClassFields_ : 1;
   bool privateClassMethods_ : 1;
+  bool topLevelAwait_ : 1;
 };
 
 JS_PUBLIC_API ContextOptions& ContextOptionsRef(JSContext* cx);
diff -Nru firefox-84.0.2+build1/js/public/experimental/CTypes.h firefox-85.0+build1/js/public/experimental/CTypes.h
--- firefox-84.0.2+build1/js/public/experimental/CTypes.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/experimental/CTypes.h	2021-01-18 19:58:12.000000000 +0000
@@ -13,10 +13,7 @@
 
 #include "jstypes.h"  // JS_PUBLIC_API, JS_FRIEND_API
 
-#include "js/RootingAPI.h"  // JS::Handle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSObject;
+#include "js/TypeDecls.h"
 
 namespace JS {
 
diff -Nru firefox-84.0.2+build1/js/public/experimental/Intl.h firefox-85.0+build1/js/public/experimental/Intl.h
--- firefox-84.0.2+build1/js/public/experimental/Intl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/public/experimental/Intl.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,10 +9,7 @@
 
 #include "jstypes.h"  // JS_FRIEND_API
 
-#include "js/RootingAPI.h"  // JS::Handle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSObject;
+#include "js/TypeDecls.h"
 
 namespace JS {
 
diff -Nru firefox-84.0.2+build1/js/public/experimental/TypedData.h firefox-85.0+build1/js/public/experimental/TypedData.h
--- firefox-84.0.2+build1/js/public/experimental/TypedData.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/experimental/TypedData.h	2021-01-18 19:58:12.000000000 +0000
@@ -379,6 +379,27 @@
     JSObject* obj, bool* isSharedMemory, const JS::AutoRequireNoGC&);
 
 /**
+ * Return a "fixed" pointer (one that will not move during a GC) to the
+ * ArrayBufferView's data. Note that this will not keep the object alive; the
+ * holding object should be rooted or traced. If the view is storing the data
+ * inline, this will copy the data to the provided buffer, returning nullptr if
+ * bufSize is inadequate.
+ *
+ * Avoid using this unless necessary. JS_GetArrayBufferViewData is simpler and
+ * more efficient because it requires the caller to ensure that a GC will not
+ * occur and thus does not need to handle movable data.
+ */
+extern JS_FRIEND_API uint8_t* JS_GetArrayBufferViewFixedData(
+    JSObject* obj, uint8_t* buffer, size_t bufSize);
+
+/**
+ * If the bufSize passed to JS_GetArrayBufferViewFixedData is at least this
+ * many bytes, then any copied data is guaranteed to fit into the provided
+ * buffer.
+ */
+extern JS_FRIEND_API size_t JS_MaxMovableTypedArraySize();
+
+/**
  * Return the ArrayBuffer or SharedArrayBuffer underlying an ArrayBufferView.
  * This may return a detached buffer.  |obj| must be an object that would
  * return true for JS_IsArrayBufferViewObject().
diff -Nru firefox-84.0.2+build1/js/public/friend/ErrorNumbers.msg firefox-85.0+build1/js/public/friend/ErrorNumbers.msg
--- firefox-84.0.2+build1/js/public/friend/ErrorNumbers.msg	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/friend/ErrorNumbers.msg	2021-01-18 19:58:12.000000000 +0000
@@ -211,6 +211,8 @@
 MSG_DEF(JSMSG_AS_AFTER_RESERVED_WORD,  1, JSEXN_SYNTAXERR, "missing keyword 'as' after reserved word '{0}'")
 MSG_DEF(JSMSG_AWAIT_IN_PARAMETER,      0, JSEXN_SYNTAXERR, "await expression can't be used in parameter")
 MSG_DEF(JSMSG_AWAIT_OUTSIDE_ASYNC,     0, JSEXN_SYNTAXERR, "await is only valid in async functions and async generators")
+MSG_DEF(JSMSG_AWAIT_OUTSIDE_ASYNC_OR_MODULE, 0, JSEXN_SYNTAXERR, "await is only valid in async functions, async generators and modules")
+MSG_DEF(JSMSG_TOP_LEVEL_AWAIT_NOT_SUPPORTED, 0, JSEXN_SYNTAXERR, "top level await is not currently supported")
 MSG_DEF(JSMSG_BAD_ARROW_ARGS,          0, JSEXN_SYNTAXERR, "invalid arrow-function arguments (parentheses around the arrow-function may help)")
 MSG_DEF(JSMSG_BAD_BINDING,             1, JSEXN_SYNTAXERR, "redefining {0} is deprecated")
 MSG_DEF(JSMSG_BAD_COALESCE_MIXING,     0, JSEXN_SYNTAXERR, "cannot use `??` unparenthesized within `||` and `&&` expressions")
@@ -410,6 +412,7 @@
 MSG_DEF(JSMSG_WASM_NO_SHMEM_COMPILE,   0, JSEXN_WASMCOMPILEERROR, "shared memory is disabled")
 MSG_DEF(JSMSG_WASM_BAD_IMPORT_TYPE,    2, JSEXN_WASMLINKERROR, "import object field '{0}' is not a {1}")
 MSG_DEF(JSMSG_WASM_BAD_IMPORT_SIG,     2, JSEXN_WASMLINKERROR, "imported function '{0}.{1}' signature mismatch")
+MSG_DEF(JSMSG_WASM_BAD_EXN_SIG,        2, JSEXN_WASMLINKERROR, "imported exception '{0}.{1}' signature mismatch")
 MSG_DEF(JSMSG_WASM_BAD_IMP_SIZE,       1, JSEXN_WASMLINKERROR, "imported {0} with incompatible size")
 MSG_DEF(JSMSG_WASM_BAD_IMP_MAX,        1, JSEXN_WASMLINKERROR, "imported {0} with incompatible maximum size")
 MSG_DEF(JSMSG_WASM_IMP_SHARED_REQD,    0, JSEXN_WASMLINKERROR, "imported unshared memory but shared required")
@@ -452,13 +455,12 @@
 MSG_DEF(JSMSG_WASM_TEXT_FAIL,          1, JSEXN_SYNTAXERR,   "wasm text error: {0}")
 MSG_DEF(JSMSG_WASM_MISSING_MAXIMUM,    0, JSEXN_TYPEERR,     "'shared' is true but maximum is not specified")
 MSG_DEF(JSMSG_WASM_GLOBAL_IMMUTABLE,   0, JSEXN_TYPEERR,     "can't set value of immutable global")
-MSG_DEF(JSMSG_WASM_TYPEREF_FROM_JS,    0, JSEXN_TYPEERR,     "conversion from JavaScript value to WebAssembly typed ref unimplemented")
-MSG_DEF(JSMSG_WASM_TYPEREF_TO_JS,      0, JSEXN_TYPEERR,     "conversion from WebAssembly typed ref to JavaScript value unimplemented")
 MSG_DEF(JSMSG_WASM_WRONG_NUMBER_OF_VALUES, 2, JSEXN_TYPEERR, "wrong number of values returned by JavaScript to WebAssembly (expected {0}, got {1})")
 MSG_DEF(JSMSG_WASM_NONSHARED_WAIT ,    0, JSEXN_WASMRUNTIMEERROR, "atomic wait on non-shared memory")
 MSG_DEF(JSMSG_WASM_NULL_REQUIRED,      0, JSEXN_TYPEERR,     "nullref requires a null value")
 MSG_DEF(JSMSG_WASM_SUPPLY_ONLY_ONE,    2, JSEXN_TYPEERR,     "exactly one of {0} and {1} must be supplied")
 MSG_DEF(JSMSG_WASM_MISSING_REQUIRED,   1, JSEXN_TYPEERR,     "Missing required argument {0}")
+MSG_DEF(JSMSG_WASM_EXN_CONSTRUCTOR,    0, JSEXN_WASMRUNTIMEERROR, "cannot call WebAssembly.Exception")
 
 // Proxy
 MSG_DEF(JSMSG_BAD_TRAP_RETURN_VALUE,   2, JSEXN_TYPEERR,"trap {1} for {0} returned a primitive value")
@@ -606,19 +608,14 @@
 MSG_DEF(JSMSG_DUPLICATE_CAPTURE_NAME,      0, JSEXN_SYNTAXERR, "duplicate capture group name in regular expression")
 MSG_DEF(JSMSG_INVALID_NAMED_REF,           0, JSEXN_SYNTAXERR, "invalid named reference in regular expression")
 MSG_DEF(JSMSG_INVALID_NAMED_CAPTURE_REF,   0, JSEXN_SYNTAXERR, "invalid named capture reference in regular expression")
+MSG_DEF(JSMSG_INCOMPATIBLE_REGEXP_GETTER, 2, JSEXN_TYPEERR, "RegExp.prototype.{0} getter called on non-RegExp object: {1}")
 
 // Self-hosting
 MSG_DEF(JSMSG_DEFAULT_LOCALE_ERROR,    0, JSEXN_ERR, "internal error getting the default locale")
 MSG_DEF(JSMSG_NO_SUCH_SELF_HOSTED_PROP,1, JSEXN_ERR, "No such property on self-hosted object: {0}")
 
 // Typed object
-MSG_DEF(JSMSG_INVALID_PROTOTYPE,       0, JSEXN_TYPEERR, "prototype field is not an object")
-MSG_DEF(JSMSG_TYPEDOBJECT_BAD_ARGS,    0, JSEXN_TYPEERR, "invalid arguments")
-MSG_DEF(JSMSG_TYPEDOBJECT_BINARYARRAY_BAD_INDEX, 0, JSEXN_RANGEERR, "invalid or out-of-range index")
-MSG_DEF(JSMSG_TYPEDOBJECT_HANDLE_UNATTACHED, 0, JSEXN_TYPEERR, "handle unattached")
-MSG_DEF(JSMSG_TYPEDOBJECT_TOO_BIG,     0, JSEXN_ERR, "Type is too large to allocate")
 MSG_DEF(JSMSG_TYPEDOBJECT_SETTING_IMMUTABLE, 0, JSEXN_ERR, "setting immutable field")
-MSG_DEF(JSMSG_TYPEDOBJECT_NOT_CONSTRUCTIBLE, 0, JSEXN_TYPEERR, "not constructible")
 
 // Array
 MSG_DEF(JSMSG_TOO_LONG_ARRAY,         0, JSEXN_TYPEERR, "Too long array")
diff -Nru firefox-84.0.2+build1/js/public/friend/JSMEnvironment.h firefox-85.0+build1/js/public/friend/JSMEnvironment.h
--- firefox-84.0.2+build1/js/public/friend/JSMEnvironment.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/friend/JSMEnvironment.h	2021-01-18 19:58:12.000000000 +0000
@@ -17,12 +17,8 @@
 
 #include "jstypes.h"  // JS_FRIEND_API, JS_PUBLIC_API
 
-#include "js/GCVector.h"    // JS::StackGCVector
-#include "js/RootingAPI.h"  // JS::Handle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSObject;
-class JS_PUBLIC_API JSScript;
+#include "js/GCVector.h"  // JS::StackGCVector
+#include "js/TypeDecls.h"
 
 // A 'JSMEnvironment' refers to an environment chain constructed for JSM loading
 // in a shared global. Internally it is a NonSyntacticVariablesObject with a
diff -Nru firefox-84.0.2+build1/js/public/GCAPI.h firefox-85.0+build1/js/public/GCAPI.h
--- firefox-84.0.2+build1/js/public/GCAPI.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/GCAPI.h	2021-01-18 19:58:12.000000000 +0000
@@ -385,6 +385,12 @@
    * nursery.)
    */
   JSGC_PRETENURE_STRING_THRESHOLD = 42,
+
+  /**
+   * If the finalization rate of the tenured strings exceeds this threshold,
+   * string will be allocated in nursery.
+   */
+  JSGC_STOP_PRETENURE_STRING_THRESHOLD = 43,
 } JSGCParamKey;
 
 /*
@@ -508,7 +514,7 @@
   D(DOM_WINDOW_UTILS, FIRST_FIREFOX_REASON) \
   D(COMPONENT_UTILS, 34)                    \
   D(MEM_PRESSURE, 35)                       \
-  D(CC_WAITING, 36)                         \
+  D(CC_FINISHED, 36)                        \
   D(CC_FORCED, 37)                          \
   D(LOAD_END, 38)                           \
   D(UNUSED3, 39)                            \
@@ -573,7 +579,7 @@
 /**
  * Schedule the given zone to be collected as part of the next GC.
  */
-extern JS_PUBLIC_API void PrepareZoneForGC(Zone* zone);
+extern JS_PUBLIC_API void PrepareZoneForGC(JSContext* cx, Zone* zone);
 
 /**
  * Schedule all zones to be collected in the next GC.
@@ -597,7 +603,7 @@
  * Undoes the effect of the Prepare methods above. The given zone will not be
  * collected in the next GC.
  */
-extern JS_PUBLIC_API void SkipZoneForGC(Zone* zone);
+extern JS_PUBLIC_API void SkipZoneForGC(JSContext* cx, Zone* zone);
 
 /*
  * Non-Incremental GC:
diff -Nru firefox-84.0.2+build1/js/public/GCVector.h firefox-85.0+build1/js/public/GCVector.h
--- firefox-84.0.2+build1/js/public/GCVector.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/GCVector.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Vector.h"
 
+#include "js/AllocPolicy.h"
 #include "js/GCPolicyAPI.h"
 #include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
@@ -156,6 +157,24 @@
     }
   }
 
+  bool traceWeak(JSTracer* trc) {
+    T* src = begin();
+    T* dst = begin();
+    while (src != end()) {
+      if (GCPolicy<T>::traceWeak(trc, src)) {
+        if (src != dst) {
+          *dst = std::move(*src);
+        }
+        dst++;
+      }
+      src++;
+    }
+
+    MOZ_ASSERT(dst <= end());
+    shrinkBy(end() - dst);
+    return !empty();
+  }
+
   bool needsSweep() const { return !this->empty(); }
 
   void sweep() {
diff -Nru firefox-84.0.2+build1/js/public/MemoryMetrics.h firefox-85.0+build1/js/public/MemoryMetrics.h
--- firefox-84.0.2+build1/js/public/MemoryMetrics.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/MemoryMetrics.h	2021-01-18 19:58:12.000000000 +0000
@@ -624,12 +624,10 @@
   MACRO(Other, GCHeapAdmin, gcHeapArenaAdmin)              \
   MACRO(Other, GCHeapUsed, jitCodesGCHeap)                 \
   MACRO(Other, GCHeapUsed, objectGroupsGCHeap)             \
-  MACRO(Other, MallocHeap, objectGroupsMallocHeap)         \
   MACRO(Other, GCHeapUsed, scopesGCHeap)                   \
   MACRO(Other, MallocHeap, scopesMallocHeap)               \
   MACRO(Other, GCHeapUsed, regExpSharedsGCHeap)            \
   MACRO(Other, MallocHeap, regExpSharedsMallocHeap)        \
-  MACRO(Other, MallocHeap, typePool)                       \
   MACRO(Other, MallocHeap, regexpZone)                     \
   MACRO(Other, MallocHeap, jitZone)                        \
   MACRO(Other, MallocHeap, baselineStubsOptimized)         \
@@ -712,24 +710,21 @@
   // actually guaranteed. But for Servo, at least, it's a moot point because
   // it doesn't provide an ObjectPrivateVisitor so the value will always be
   // zero.
-#define FOR_EACH_SIZE(MACRO)                                  \
-  MACRO(Private, MallocHeap, objectsPrivate)                  \
-  MACRO(Other, GCHeapUsed, scriptsGCHeap)                     \
-  MACRO(Other, MallocHeap, scriptsMallocHeapData)             \
-  MACRO(Other, MallocHeap, baselineData)                      \
-  MACRO(Other, MallocHeap, baselineStubsFallback)             \
-  MACRO(Other, MallocHeap, ionData)                           \
-  MACRO(Other, MallocHeap, jitScripts)                        \
-  MACRO(Other, MallocHeap, typeInferenceAllocationSiteTables) \
-  MACRO(Other, MallocHeap, typeInferenceArrayTypeTables)      \
-  MACRO(Other, MallocHeap, typeInferenceObjectTypeTables)     \
-  MACRO(Other, MallocHeap, realmObject)                       \
-  MACRO(Other, MallocHeap, realmTables)                       \
-  MACRO(Other, MallocHeap, innerViewsTable)                   \
-  MACRO(Other, MallocHeap, objectMetadataTable)               \
-  MACRO(Other, MallocHeap, savedStacksSet)                    \
-  MACRO(Other, MallocHeap, varNamesSet)                       \
-  MACRO(Other, MallocHeap, nonSyntacticLexicalScopesTable)    \
+#define FOR_EACH_SIZE(MACRO)                               \
+  MACRO(Private, MallocHeap, objectsPrivate)               \
+  MACRO(Other, GCHeapUsed, scriptsGCHeap)                  \
+  MACRO(Other, MallocHeap, scriptsMallocHeapData)          \
+  MACRO(Other, MallocHeap, baselineData)                   \
+  MACRO(Other, MallocHeap, baselineStubsFallback)          \
+  MACRO(Other, MallocHeap, ionData)                        \
+  MACRO(Other, MallocHeap, jitScripts)                     \
+  MACRO(Other, MallocHeap, realmObject)                    \
+  MACRO(Other, MallocHeap, realmTables)                    \
+  MACRO(Other, MallocHeap, innerViewsTable)                \
+  MACRO(Other, MallocHeap, objectMetadataTable)            \
+  MACRO(Other, MallocHeap, savedStacksSet)                 \
+  MACRO(Other, MallocHeap, varNamesSet)                    \
+  MACRO(Other, MallocHeap, nonSyntacticLexicalScopesTable) \
   MACRO(Other, MallocHeap, jitRealm)
 
   RealmStats() = default;
diff -Nru firefox-84.0.2+build1/js/public/Modules.h firefox-85.0+build1/js/public/Modules.h
--- firefox-84.0.2+build1/js/public/Modules.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/Modules.h	2021-01-18 19:58:12.000000000 +0000
@@ -90,10 +90,24 @@
 /**
  * This must be called after a dynamic import operation is complete.
  *
- * If |status| is Failed, any pending exception on the context will be used to
+ * If |evaluationPromise| is rejected, the rejection reason will be used to
  * complete the user's promise.
  */
 extern JS_PUBLIC_API bool FinishDynamicModuleImport(
+    JSContext* cx, Handle<JSObject*> evaluationPromise,
+    Handle<Value> referencingPrivate, Handle<JSString*> specifier,
+    Handle<JSObject*> promise);
+
+/**
+ * This must be called after a dynamic import operation is complete.
+ *
+ * This is used so that Top Level Await functionality can be turned off
+ * entirely. It will be removed in bug#1676612.
+ *
+ * If |status| is Failed, any pending exception on the context will be used to
+ * complete the user's promise.
+ */
+extern JS_PUBLIC_API bool FinishDynamicModuleImport_NoTLA(
     JSContext* cx, DynamicImportStatus status, Handle<Value> referencingPrivate,
     Handle<JSString*> specifier, Handle<JSObject*> promise);
 
@@ -137,16 +151,32 @@
                                             Handle<JSObject*> moduleRecord);
 
 /*
- * Perform the ModuleEvaluate operation on the given source text module record.
+ * Perform the ModuleEvaluate operation on the given source text module record
+ * and returns a bool. A result value is returned in result and is either
+ * undefined (and ignored) or a promise (if Top Level Await is enabled).
  *
- * This does nothing if this module has already been evaluated. Otherwise, it
- * transitively evaluates all dependences of this module and then evaluates this
- * module.
+ * If this module has already been evaluated, it returns the evaluation
+ * promise. Otherwise, it transitively evaluates all dependences of this module
+ * and then evaluates this module.
  *
  * ModuleInstantiate must have completed prior to calling this.
  */
 extern JS_PUBLIC_API bool ModuleEvaluate(JSContext* cx,
-                                         Handle<JSObject*> moduleRecord);
+                                         Handle<JSObject*> moduleRecord,
+                                         MutableHandleValue rval);
+
+/*
+ * If a module evaluation fails, unwrap the resulting evaluation promise
+ * and rethrow.
+ *
+ * This does nothing if this module succeeds in evaluation. Otherwise, it
+ * takes the reason for the module throwing, unwraps it and throws it as a
+ * regular error rather than as an uncaught promise.
+ *
+ * ModuleEvaluate must have completed prior to calling this.
+ */
+extern JS_PUBLIC_API bool ThrowOnModuleEvaluationFailure(
+    JSContext* cx, Handle<JSObject*> evaluationPromise);
 
 /*
  * Get a list of the module specifiers used by a source text module
diff -Nru firefox-84.0.2+build1/js/public/ProtoKey.h firefox-85.0+build1/js/public/ProtoKey.h
--- firefox-84.0.2+build1/js/public/ProtoKey.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/ProtoKey.h	2021-01-18 19:58:12.000000000 +0000
@@ -121,6 +121,7 @@
   REAL(WasmMemory, OCLASP(WasmMemory))                                        \
   REAL(WasmTable, OCLASP(WasmTable))                                          \
   REAL(WasmGlobal, OCLASP(WasmGlobal))                                        \
+  REAL(WasmException, OCLASP(WasmException))                                  \
   REAL(FinalizationRegistry, OCLASP(FinalizationRegistry))                    \
   REAL(WeakRef, OCLASP(WeakRef))                                              \
   REAL(Iterator, OCLASP(Iterator))                                            \
diff -Nru firefox-84.0.2+build1/js/public/Proxy.h firefox-85.0+build1/js/public/Proxy.h
--- firefox-84.0.2+build1/js/public/Proxy.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/Proxy.h	2021-01-18 19:58:12.000000000 +0000
@@ -583,10 +583,6 @@
     JSContext* cx, const BaseProxyHandler* handler, JS::HandleValue priv,
     JSObject* proto, const ProxyOptions& options = ProxyOptions());
 
-JS_FRIEND_API JSObject* NewSingletonProxyObject(
-    JSContext* cx, const BaseProxyHandler* handler, JS::HandleValue priv,
-    JSObject* proto, const ProxyOptions& options = ProxyOptions());
-
 JSObject* RenewProxyObject(JSContext* cx, JSObject* obj,
                            BaseProxyHandler* handler, const JS::Value& priv);
 
diff -Nru firefox-84.0.2+build1/js/public/RootingAPI.h firefox-85.0+build1/js/public/RootingAPI.h
--- firefox-84.0.2+build1/js/public/RootingAPI.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/RootingAPI.h	2021-01-18 19:58:12.000000000 +0000
@@ -925,15 +925,22 @@
   Limit
 };
 
-// Our instantiations of Rooted<void*> and PersistentRooted<void*> require an
-// instantiation of MapTypeToRootKind.
+namespace detail {
+// Dummy type to store root list entry pointers as. This code does not just use
+// the actual type, because then eg JSObject* and JSFunction* would be assumed
+// to never alias but they do (they are stored in the same list). Also, do not
+// use `void*` so that `Rooted<void*>` is a compile error.
+struct RootListEntry;
+}  // namespace detail
+
 template <>
-struct MapTypeToRootKind<void*> {
+struct MapTypeToRootKind<detail::RootListEntry*> {
   static const RootKind kind = RootKind::Traceable;
 };
 
 using RootedListHeads =
-    mozilla::EnumeratedArray<RootKind, RootKind::Limit, Rooted<void*>*>;
+    mozilla::EnumeratedArray<RootKind, RootKind::Limit,
+                             Rooted<detail::RootListEntry*>*>;
 
 using AutoRooterListHeads =
     mozilla::EnumeratedArray<AutoGCRooterKind, AutoGCRooterKind::Limit,
@@ -1073,7 +1080,7 @@
   inline void registerWithRootLists(RootedListHeads& roots) {
     this->stack = &roots[JS::MapTypeToRootKind<T>::kind];
     this->prev = *stack;
-    *stack = reinterpret_cast<Rooted<void*>*>(this);
+    *stack = reinterpret_cast<Rooted<detail::RootListEntry*>*>(this);
   }
 
   inline RootedListHeads& rootLists(RootingContext* cx) {
@@ -1123,7 +1130,8 @@
   }
 
   ~Rooted() {
-    MOZ_ASSERT(*stack == reinterpret_cast<Rooted<void*>*>(this));
+    MOZ_ASSERT(*stack ==
+               reinterpret_cast<Rooted<detail::RootListEntry*>*>(this));
     *stack = prev;
   }
 
@@ -1155,12 +1163,12 @@
 
  private:
   /*
-   * These need to be templated on void* to avoid aliasing issues between, for
-   * example, Rooted<JSObject> and Rooted<JSFunction>, which use the same
-   * stack head pointer for different classes.
+   * These need to be templated on RootListEntry* to avoid aliasing issues
+   * between, for example, Rooted<JSObject*> and Rooted<JSFunction*>, which use
+   * the same stack head pointer for different classes.
    */
-  Rooted<void*>** stack;
-  Rooted<void*>* prev;
+  Rooted<detail::RootListEntry*>** stack;
+  Rooted<detail::RootListEntry*>* prev;
 
   Ptr ptr;
 
@@ -1289,11 +1297,13 @@
   ptr = root->address();
 }
 
-JS_PUBLIC_API void AddPersistentRoot(RootingContext* cx, RootKind kind,
-                                     PersistentRooted<void*>* root);
-
-JS_PUBLIC_API void AddPersistentRoot(JSRuntime* rt, RootKind kind,
-                                     PersistentRooted<void*>* root);
+JS_PUBLIC_API void AddPersistentRoot(
+    RootingContext* cx, RootKind kind,
+    PersistentRooted<detail::RootListEntry*>* root);
+
+JS_PUBLIC_API void AddPersistentRoot(
+    JSRuntime* rt, RootKind kind,
+    PersistentRooted<detail::RootListEntry*>* root);
 
 /**
  * A copyable, assignable global GC root type with arbitrary lifetime, an
@@ -1342,15 +1352,17 @@
   void registerWithRootLists(RootingContext* cx) {
     MOZ_ASSERT(!initialized());
     JS::RootKind kind = JS::MapTypeToRootKind<T>::kind;
-    AddPersistentRoot(cx, kind,
-                      reinterpret_cast<JS::PersistentRooted<void*>*>(this));
+    AddPersistentRoot(
+        cx, kind,
+        reinterpret_cast<JS::PersistentRooted<detail::RootListEntry*>*>(this));
   }
 
   void registerWithRootLists(JSRuntime* rt) {
     MOZ_ASSERT(!initialized());
     JS::RootKind kind = JS::MapTypeToRootKind<T>::kind;
-    AddPersistentRoot(rt, kind,
-                      reinterpret_cast<JS::PersistentRooted<void*>*>(this));
+    AddPersistentRoot(
+        rt, kind,
+        reinterpret_cast<JS::PersistentRooted<detail::RootListEntry*>*>(this));
   }
 
  public:
diff -Nru firefox-84.0.2+build1/js/public/ScalarType.h firefox-85.0+build1/js/public/ScalarType.h
--- firefox-84.0.2+build1/js/public/ScalarType.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/ScalarType.h	2021-01-18 19:58:12.000000000 +0000
@@ -17,9 +17,8 @@
 
 namespace Scalar {
 
-// Scalar types that can appear in typed arrays and typed objects.
+// Scalar types that can appear in typed arrays.
 // The enum values must be kept in sync with:
-//  * the JS_SCALARTYPEREPR constants
 //  * the TYPEDARRAY_KIND constants
 //  * the SCTAG_TYPED_ARRAY constants
 //  * JS_FOR_EACH_TYPEDARRAY
@@ -125,6 +124,40 @@
   }
   MOZ_CRASH("invalid scalar type");
 }
+
+static inline const char* name(Type atype) {
+  switch (atype) {
+    case Int8:
+      return "Int8";
+    case Uint8:
+      return "Uint8";
+    case Int16:
+      return "Int16";
+    case Uint16:
+      return "Uint16";
+    case Int32:
+      return "Int32";
+    case Uint32:
+      return "Uint32";
+    case Float32:
+      return "Float32";
+    case Float64:
+      return "Float64";
+    case Uint8Clamped:
+      return "Uint8Clamped";
+    case BigInt64:
+      return "BigInt64";
+    case BigUint64:
+      return "BigUint64";
+    case MaxTypedArrayViewType:
+      return "MaxTypedArrayViewType";
+    case Int64:
+      return "Int64";
+    case Simd128:
+      return "Simd128";
+  }
+  MOZ_CRASH("invalid scalar type");
+}
 
 }  // namespace Scalar
 
diff -Nru firefox-84.0.2+build1/js/public/SliceBudget.h firefox-85.0+build1/js/public/SliceBudget.h
--- firefox-84.0.2+build1/js/public/SliceBudget.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/SliceBudget.h	2021-01-18 19:58:12.000000000 +0000
@@ -65,6 +65,11 @@
   /* Instantiate as SliceBudget(WorkBudget(n)). */
   explicit SliceBudget(WorkBudget work);
 
+  explicit SliceBudget(mozilla::TimeDuration time)
+  : SliceBudget(TimeBudget(time.ToMilliseconds()))
+  {}
+
+
   void makeUnlimited() {
     MOZ_ASSERT(unlimitedDeadline);
     deadline = unlimitedDeadline;
diff -Nru firefox-84.0.2+build1/js/public/Symbol.h firefox-85.0+build1/js/public/Symbol.h
--- firefox-84.0.2+build1/js/public/Symbol.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/public/Symbol.h	2021-01-18 19:58:12.000000000 +0000
@@ -15,10 +15,7 @@
 
 #include "jstypes.h"  // JS_PUBLIC_API
 
-#include "js/RootingAPI.h"  // JS::Handle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSString;
+#include "js/TypeDecls.h"
 
 namespace JS {
 
diff -Nru firefox-84.0.2+build1/js/public/Transcoding.h firefox-85.0+build1/js/public/Transcoding.h
--- firefox-84.0.2+build1/js/public/Transcoding.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/Transcoding.h	2021-01-18 19:58:12.000000000 +0000
@@ -17,11 +17,7 @@
 #include <stddef.h>  // size_t
 #include <stdint.h>  // uint8_t, uint32_t
 
-#include "js/RootingAPI.h"  // JS::Handle, JS::MutableHandle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSObject;
-class JS_PUBLIC_API JSScript;
+#include "js/TypeDecls.h"
 
 namespace JS {
 
diff -Nru firefox-84.0.2+build1/js/public/Value.h firefox-85.0+build1/js/public/Value.h
--- firefox-84.0.2+build1/js/public/Value.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/public/Value.h	2021-01-18 19:58:12.000000000 +0000
@@ -11,8 +11,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
-#include "mozilla/Compiler.h"
-#include "mozilla/EndianUtils.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Likely.h"
 #include "mozilla/Maybe.h"
@@ -22,9 +20,8 @@
 #include "js-config.h"
 #include "jstypes.h"
 
-#include "js/GCAPI.h"
 #include "js/RootingAPI.h"
-#include "js/Utility.h"
+#include "js/TypeDecls.h"
 
 namespace JS {
 class JS_PUBLIC_API Value;
diff -Nru firefox-84.0.2+build1/js/rust/build.rs firefox-85.0+build1/js/rust/build.rs
--- firefox-84.0.2+build1/js/rust/build.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/rust/build.rs	2021-01-18 19:58:12.000000000 +0000
@@ -215,6 +215,7 @@
     "JS::Compartment",
     "JS::Latin1Char",
     "JS::detail::RootedPtr",
+    "JS::detail::RootListEntry",
     "JS::MutableHandle",
     "JS::MutableHandleObject",
     "JS::MutableHandleValue",
@@ -387,7 +388,6 @@
     "JS_NewObject",
     "JS_NewObjectWithGivenProto",
     "JS_NewObjectWithoutMetadata",
-    "JS_NewObjectWithUniqueType",
     "JS_NewPlainObject",
     "JS::NewPromiseObject",
     "JS_NewStringCopyN",
diff -Nru firefox-84.0.2+build1/js/rust/Cargo.toml firefox-85.0+build1/js/rust/Cargo.toml
--- firefox-84.0.2+build1/js/rust/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/rust/Cargo.toml	2021-01-18 19:58:12.000000000 +0000
@@ -6,7 +6,7 @@
 license = "MPL-2.0"
 
 [build-dependencies]
-env_logger = {version = "0.6", default-features = false} # disable `regex` to reduce code size
+env_logger = {version = "0.8", default-features = false} # disable `regex` to reduce code size
 bindgen = {version = "0.53", default-features = false, features = ["runtime"]} # disable `logging` to reduce code size
 cmake = "0.1"
 glob = "0.3"
diff -Nru firefox-84.0.2+build1/js/rust/src/rust.rs firefox-85.0+build1/js/rust/src/rust.rs
--- firefox-84.0.2+build1/js/rust/src/rust.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/rust/src/rust.rs	2021-01-18 19:58:12.000000000 +0000
@@ -366,7 +366,7 @@
 
     unsafe fn get_root_stack(
         cx: *mut JSContext,
-    ) -> *mut *mut JS::Rooted<*mut ::std::os::raw::c_void>
+    ) -> *mut *mut JS::Rooted<*mut JS::detail::RootListEntry>
     where
         T: RootKind,
     {
diff -Nru firefox-84.0.2+build1/js/rust/tests/rooting.rs firefox-85.0+build1/js/rust/tests/rooting.rs
--- firefox-84.0.2+build1/js/rust/tests/rooting.rs	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/rust/tests/rooting.rs	2021-01-18 19:58:12.000000000 +0000
@@ -31,7 +31,7 @@
                                                        &c_option));
         let _ar = js::ar::AutoRealm::with_obj(cx, global.get());
         rooted!(in(cx) let prototype_proto = JS::GetRealmObjectPrototype(cx));
-        rooted!(in(cx) let proto = JS_NewObjectWithUniqueType(cx,
+        rooted!(in(cx) let proto = JS_NewObjectWithGivenProto(cx,
                                                               &CLASS as *const _,
                                                               prototype_proto.handle()));
         define_methods(cx, proto.handle(), &METHODS[..]).unwrap();
diff -Nru firefox-84.0.2+build1/js/src/builtin/Array.cpp firefox-85.0+build1/js/src/builtin/Array.cpp
--- firefox-84.0.2+build1/js/src/builtin/Array.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Array.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -54,7 +54,6 @@
 #include "vm/IsGivenTypeObject-inl.h"
 #include "vm/JSAtom-inl.h"
 #include "vm/NativeObject-inl.h"
-#include "vm/ObjectGroup-inl.h"  // JSObject::setSingleton
 
 using namespace js;
 
@@ -539,13 +538,10 @@
     if (index <= UINT32_MAX) {
       uint32_t idx = uint32_t(index);
       if (idx < aobj->getDenseInitializedLength()) {
-        if (!aobj->maybeCopyElementsForWrite(cx)) {
-          return false;
-        }
         if (idx + 1 == aobj->getDenseInitializedLength()) {
           aobj->setDenseInitializedLengthMaybeNonExtensible(cx, idx);
         } else {
-          aobj->setDenseElementHole(cx, idx);
+          aobj->setDenseElementHole(idx);
         }
         if (!SuppressDeletedElement(cx, obj, idx)) {
           return false;
@@ -674,10 +670,6 @@
                         ObjectOpResult& result) {
   MOZ_ASSERT(id == NameToId(cx->names().length));
 
-  if (!arr->maybeCopyElementsForWrite(cx)) {
-    return false;
-  }
-
   // Step 1.
   uint32_t newLen;
   if (attrs & JSPROP_IGNORE_VALUE) {
@@ -772,10 +764,6 @@
     // (non-configurable) elements.
     if (!arr->isIndexed() && !arr->denseElementsMaybeInIteration() &&
         !arr->denseElementsAreSealed()) {
-      if (!arr->maybeCopyElementsForWrite(cx)) {
-        return false;
-      }
-
       uint32_t oldCapacity = arr->getDenseCapacity();
       uint32_t oldInitializedLength = arr->getDenseInitializedLength();
       MOZ_ASSERT(oldCapacity >= oldInitializedLength);
@@ -908,7 +896,7 @@
 
   // Update array length. Technically we should have been doing this
   // throughout the loop, in step 19.d.iii.
-  arr->setLength(cx, newLen);
+  arr->setLength(newLen);
 
   // Step 20.
   if (attrs & JSPROP_READONLY) {
@@ -961,7 +949,7 @@
   if (index >= length) {
     MOZ_ASSERT(arr->lengthIsWritable(),
                "how'd this element get added if length is non-writable?");
-    arr->setLength(cx, index + 1);
+    arr->setLength(index + 1);
   }
   return true;
 }
@@ -1522,10 +1510,8 @@
 }
 
 /* vector must point to rooted memory. */
-static bool SetArrayElements(
-    JSContext* cx, HandleObject obj, uint64_t start, uint32_t count,
-    const Value* vector,
-    ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update) {
+static bool SetArrayElements(JSContext* cx, HandleObject obj, uint64_t start,
+                             uint32_t count, const Value* vector) {
   MOZ_ASSERT(count <= MAX_ARRAY_INDEX);
   MOZ_ASSERT(start + count < uint64_t(DOUBLE_INTEGRAL_PRECISION_LIMIT));
 
@@ -1535,8 +1521,8 @@
 
   if (!ObjectMayHaveExtraIndexedProperties(obj) && start <= UINT32_MAX) {
     NativeObject* nobj = &obj->as<NativeObject>();
-    DenseElementResult result = nobj->setOrExtendDenseElements(
-        cx, uint32_t(start), vector, count, updateTypes);
+    DenseElementResult result =
+        nobj->setOrExtendDenseElements(cx, uint32_t(start), vector, count);
     if (result != DenseElementResult::Incomplete) {
       return result == DenseElementResult::Success;
     }
@@ -1592,11 +1578,7 @@
     }
 
     /* Fill out the array's initialized length to its proper length. */
-    obj->ensureDenseInitializedLength(cx, length, 0);
-  } else {
-    if (!obj->maybeCopyElementsForWrite(cx)) {
-      return DenseElementResult::Failure;
-    }
+    obj->ensureDenseInitializedLength(length, 0);
   }
 
   if (!obj->denseElementsMaybeInIteration() &&
@@ -1612,7 +1594,7 @@
       return true;
     }
 
-    obj->setDenseElementHole(cx, index);
+    obj->setDenseElementHole(index);
     return SuppressDeletedProperty(cx, obj, INT_TO_JSID(index));
   };
 
@@ -2119,11 +2101,11 @@
 
     if (obj->is<ArrayObject>() &&
         start + count >= obj->as<ArrayObject>().length()) {
-      obj->as<ArrayObject>().setLengthInt32(start + count);
+      obj->as<ArrayObject>().setLength(start + count);
     }
 
     for (uint32_t i = 0; i < count; i++) {
-      nobj->setDenseElementWithType(cx, start + i, UndefinedHandleValue);
+      nobj->setDenseElement(start + i, UndefinedHandleValue);
     }
 
     return true;
@@ -2215,11 +2197,9 @@
     undefs = 0;
     bool allStrings = true;
     bool allInts = true;
-    bool extraIndexed;
     RootedValue v(cx);
     if (IsPackedArray(obj)) {
       HandleArrayObject array = obj.as<ArrayObject>();
-      extraIndexed = false;
 
       for (uint32_t i = 0; i < len; i++) {
         if (!CheckForInterrupt(cx)) {
@@ -2237,8 +2217,6 @@
         allInts = allInts && v.isInt32();
       }
     } else {
-      extraIndexed = ObjectMayHaveExtraIndexedProperties(obj);
-
       for (uint32_t i = 0; i < len; i++) {
         if (!CheckForInterrupt(cx)) {
           return false;
@@ -2308,13 +2286,7 @@
       }
     }
 
-    // We can omit the type update when neither collecting the elements
-    // nor calling the default comparator can execute a (getter) function
-    // that might run user code.
-    ShouldUpdateTypes updateTypes = !extraIndexed && (allStrings || allInts)
-                                        ? ShouldUpdateTypes::DontUpdate
-                                        : ShouldUpdateTypes::Update;
-    if (!SetArrayElements(cx, obj, 0, uint32_t(n), vec.begin(), updateTypes)) {
+    if (!SetArrayElements(cx, obj, 0, uint32_t(n), vec.begin())) {
       return false;
     }
   }
@@ -2351,8 +2323,8 @@
   }
 
   arr->setDenseInitializedLength(length + 1);
-  arr->setLengthInt32(length + 1);
-  arr->initDenseElementWithType(cx, length, v);
+  arr->setLength(length + 1);
+  arr->initDenseElement(length, v);
   return true;
 }
 
@@ -2465,7 +2437,6 @@
   MOZ_ASSERT(arr->isExtensible());
   MOZ_ASSERT(arr->lengthIsWritable());
   MOZ_ASSERT_IF(jit::JitOptions.warpBuilder, IsPackedArray(arr));
-  MOZ_ASSERT(!arr->denseElementsAreCopyOnWrite());
   MOZ_ASSERT(!arr->denseElementsHaveMaybeInIterationFlag());
 
   size_t initlen = arr->getDenseInitializedLength();
@@ -2487,19 +2458,6 @@
   }
 }
 
-static MOZ_MUST_USE bool MoveDenseElements(JSContext* cx, NativeObject* obj,
-                                           uint32_t dstStart, uint32_t srcStart,
-                                           uint32_t length) {
-  MOZ_ASSERT(obj->isExtensible());
-
-  if (!obj->maybeCopyElementsForWrite(cx)) {
-    return false;
-  }
-
-  obj->moveDenseElements(dstStart, srcStart, length);
-  return true;
-}
-
 static DenseElementResult ArrayShiftDenseKernel(JSContext* cx, HandleObject obj,
                                                 MutableHandleValue rval) {
   if (!IsPackedArray(obj) && ObjectMayHaveExtraIndexedProperties(obj)) {
@@ -2529,9 +2487,7 @@
     return DenseElementResult::Success;
   }
 
-  if (!MoveDenseElements(cx, nobj, 0, 1, initlen - 1)) {
-    return DenseElementResult::Failure;
-  }
+  nobj->moveDenseElements(0, 1, initlen - 1);
 
   SetInitializedLength(cx, nobj, initlen - 1);
   return DenseElementResult::Success;
@@ -2679,7 +2635,7 @@
         }
       }
       for (uint32_t i = 0; i < args.length(); i++) {
-        nobj->setDenseElementWithType(cx, i, args[i]);
+        nobj->setDenseElement(i, args[i]);
       }
       optimized = true;
     } while (false);
@@ -2815,16 +2771,16 @@
     newlength = std::min<uint32_t>(initlen - begin, count);
   }
 
-  ArrayObject* narr = NewFullyAllocatedArrayTryReuseGroup(cx, obj, newlength);
+  ArrayObject* narr = NewDenseFullyAllocatedArray(cx, newlength);
   if (!narr) {
     return nullptr;
   }
 
   MOZ_ASSERT(count >= narr->length());
-  narr->setLength(cx, count);
+  narr->setLength(count);
 
   if (newlength > 0) {
-    narr->initDenseElements(cx, obj, begin, newlength);
+    narr->initDenseElements(obj, begin, newlength);
   }
 
   return narr;
@@ -2862,7 +2818,7 @@
 
           break;
         }
-        result->setDenseElementWithType(cx, index, value);
+        result->setDenseElement(index, value);
       }
     }
     startIndex = index + 1;
@@ -2971,7 +2927,7 @@
       }
     } else {
       /* Step 9. */
-      arr = NewFullyAllocatedArrayTryReuseGroup(cx, obj, count);
+      arr = NewDenseFullyAllocatedArray(cx, count);
       if (!arr) {
         return false;
       }
@@ -3038,11 +2994,8 @@
       /* Steps 15.a-b. */
       HandleArrayObject arr = obj.as<ArrayObject>();
       if (targetIndex != 0 || !arr->tryShiftDenseElements(sourceIndex)) {
-        if (!MoveDenseElements(cx, arr, uint32_t(targetIndex),
-                               uint32_t(sourceIndex),
-                               uint32_t(len - sourceIndex))) {
-          return false;
-        }
+        arr->moveDenseElements(uint32_t(targetIndex), uint32_t(sourceIndex),
+                               uint32_t(len - sourceIndex));
       }
 
       /* Steps 15.c-d. */
@@ -3382,11 +3335,6 @@
   }
   result->setDenseInitializedLength(count);
 
-  MOZ_ASSERT(result->group()->unknownPropertiesDontCheckGeneration(),
-             "The default array group has unknown properties, so we can "
-             "directly initialize the"
-             "dense elements without needing to update the indexed type set.");
-
   for (uint32_t index = 0; index < count; index++) {
     const Value& v = argsobj->element(begin + index);
     result->initDenseElement(index, v);
@@ -3447,8 +3395,7 @@
     }
   }
 
-  RootedArrayObject narr(cx,
-                         NewPartlyAllocatedArrayTryReuseGroup(cx, obj, count));
+  RootedArrayObject narr(cx, NewDensePartlyAllocatedArray(cx, count));
   if (!narr) {
     return false;
   }
@@ -3596,12 +3543,12 @@
       if (!result->ensureElements(cx, newlength)) {
         return false;
       }
-      result->initDenseElements(cx, arr, begin, newlength);
+      result->initDenseElements(arr, begin, newlength);
     }
   }
 
   MOZ_ASSERT(count >= result->length());
-  result->setLength(cx, count);
+  result->setLength(count);
 
   return true;
 }
@@ -3645,8 +3592,8 @@
 
 static bool ArrayFromCallArgs(JSContext* cx, CallArgs& args,
                               HandleObject proto = nullptr) {
-  ArrayObject* obj = NewCopiedArrayForCallingAllocationSite(
-      cx, args.array(), args.length(), proto);
+  ArrayObject* obj =
+      NewDenseCopiedArray(cx, args.length(), args.array(), proto);
   if (!obj) {
     return false;
   }
@@ -3754,6 +3701,11 @@
     JS_SELF_HOSTED_FN("flatMap", "ArrayFlatMap", 1, 0),
     JS_SELF_HOSTED_FN("flat", "ArrayFlat", 0, 0),
 
+/* Proposal */
+#ifdef NIGHTLY_BUILD
+    JS_SELF_HOSTED_FN("at", "ArrayAt", 1, 0),
+#endif
+
     JS_FS_END};
 
 static const JSFunctionSpec array_static_methods[] = {
@@ -3804,8 +3756,7 @@
     }
   }
 
-  ArrayObject* obj =
-      NewPartlyAllocatedArrayForCallingAllocationSite(cx, length, proto);
+  ArrayObject* obj = NewDensePartlyAllocatedArray(cx, length, proto);
   if (!obj) {
     return false;
   }
@@ -3846,9 +3797,8 @@
   }
 
   uint32_t length = uint32_t(lengthInt);
-  RootedObjectGroup group(cx, templateObject->group());
-  ArrayObject* res = NewPartlyAllocatedArrayTryUseGroup(cx, group, length);
-  MOZ_ASSERT_IF(res, res->realm() == group->realm());
+  ArrayObject* res = NewDensePartlyAllocatedArray(cx, length);
+  MOZ_ASSERT_IF(res, res->realm() == templateObject->realm());
   return res;
 }
 
@@ -3878,24 +3828,11 @@
   RootedArrayObject arrayProto(
       cx, ArrayObject::createArray(cx, gc::AllocKind::OBJECT4, gc::TenuredHeap,
                                    shape, group, 0, metadata));
-  if (!arrayProto || !JSObject::setSingleton(cx, arrayProto) ||
-      !JSObject::setDelegate(cx, arrayProto) ||
+  if (!arrayProto || !JSObject::setDelegate(cx, arrayProto) ||
       !AddLengthProperty(cx, arrayProto)) {
     return nullptr;
   }
 
-  /*
-   * The default 'new' group of Array.prototype is required by type inference
-   * to have unknown properties, to simplify handling of e.g. heterogenous
-   * arrays in JSON and script literals and allows setDenseArrayElement to
-   * be used without updating the indexed type set for such default arrays.
-   */
-  ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-  if (!JSObject::setNewGroupUnknown(cx, realm, &ArrayObject::class_,
-                                    arrayProto)) {
-    return nullptr;
-  }
-
   return arrayProto;
 }
 
@@ -3903,7 +3840,7 @@
                                JS::HandleObject proto) {
   // Add Array.prototype[@@unscopables]. ECMA-262 draft (2016 Mar 19) 22.1.3.32.
   RootedObject unscopables(
-      cx, NewSingletonObjectWithGivenProto<PlainObject>(cx, nullptr));
+      cx, NewTenuredObjectWithGivenProto<PlainObject>(cx, nullptr));
   if (!unscopables) {
     return false;
   }
@@ -4008,7 +3945,7 @@
         /* Fixup the elements pointer and length, which may be incorrect. */
         ArrayObject* arr = &obj->as<ArrayObject>();
         arr->setFixedElements();
-        arr->setLength(cx, length);
+        arr->setLength(length);
         if (maxLength > 0 &&
             !EnsureNewArrayElements(cx, arr, std::min(maxLength, length))) {
           return nullptr;
@@ -4052,9 +3989,7 @@
     EmptyShape::insertInitialShape(cx, shape, proto);
   }
 
-  if (newKind == SingletonObject && !JSObject::setSingleton(cx, arr)) {
-    return nullptr;
-  }
+  MOZ_ASSERT(newKind != SingletonObject);
 
   if (isCachable) {
     NewObjectCache& cache = cx->caches().newObjectCache;
@@ -4088,6 +4023,13 @@
   return NewArray<UINT32_MAX>(cx, length, proto, newKind);
 }
 
+ArrayObject* js::NewDensePartlyAllocatedArray(
+    JSContext* cx, uint32_t length, HandleObject proto /* = nullptr */,
+    NewObjectKind newKind /* = GenericObject */) {
+  return NewArray<ArrayObject::EagerAllocationMaxLength>(cx, length, proto,
+                                                         newKind);
+}
+
 ArrayObject* JS_FASTCALL js::NewDenseUnallocatedArray(
     JSContext* cx, uint32_t length, HandleObject proto /* = nullptr */,
     NewObjectKind newKind /* = GenericObject */) {
@@ -4141,173 +4083,9 @@
   return arr;
 }
 
-ArrayObject* js::NewDenseCopyOnWriteArray(JSContext* cx,
-                                          HandleArrayObject templateObject) {
-  MOZ_ASSERT(!gc::IsInsideNursery(templateObject));
-
-  gc::InitialHeap heap = GetInitialHeap(GenericObject, templateObject->group());
-
-  ArrayObject* arr =
-      ArrayObject::createCopyOnWriteArray(cx, heap, templateObject);
-  if (!arr) {
-    return nullptr;
-  }
-
-  probes::CreateObject(cx, arr);
-  return arr;
-}
-
-// Return a new array with the specified length and allocated capacity (up to
-// maxLength), using the specified group if possible. If the specified group
-// cannot be used, ensure that the created array at least has the given
-// [[Prototype]].
-template <uint32_t maxLength>
-static inline ArrayObject* NewArrayTryUseGroup(
-    JSContext* cx, HandleObjectGroup group, size_t length,
-    NewObjectKind newKind = GenericObject) {
-  MOZ_ASSERT(newKind != SingletonObject);
-
-  {
-    AutoSweepObjectGroup sweep(group);
-    if (group->shouldPreTenure(sweep)) {
-      newKind = TenuredObject;
-    }
-  }
-
-  RootedObject proto(cx, group->proto().toObject());
-  ArrayObject* res = NewArray<maxLength>(cx, length, proto, newKind);
-  if (!res) {
-    return nullptr;
-  }
-
-  res->setGroup(group);
-
-  // If the length calculation overflowed, make sure that is marked for the
-  // new group.
-  if (res->length() > INT32_MAX) {
-    res->setLength(cx, res->length());
-  }
-
-  return res;
-}
-
-ArrayObject* js::NewFullyAllocatedArrayTryUseGroup(JSContext* cx,
-                                                   HandleObjectGroup group,
-                                                   size_t length,
-                                                   NewObjectKind newKind) {
-  return NewArrayTryUseGroup<UINT32_MAX>(cx, group, length, newKind);
-}
-
-ArrayObject* js::NewPartlyAllocatedArrayTryUseGroup(JSContext* cx,
-                                                    HandleObjectGroup group,
-                                                    size_t length) {
-  return NewArrayTryUseGroup<ArrayObject::EagerAllocationMaxLength>(cx, group,
-                                                                    length);
-}
-
-static bool CanReuseGroupForNewArray(JSObject* obj, JSContext* cx) {
-  if (!obj->is<ArrayObject>()) {
-    return false;
-  }
-  if (obj->as<ArrayObject>().realm() != cx->realm()) {
-    return false;
-  }
-  if (obj->staticPrototype() != cx->global()->maybeGetArrayPrototype()) {
-    return false;
-  }
-  return true;
-}
-
-// Return a new array with the default prototype and specified allocated
-// capacity and length. If possible, try to reuse the group of the input
-// object. The resulting array will either reuse the input object's group or
-// will have unknown property types.
-template <uint32_t maxLength>
-static inline ArrayObject* NewArrayTryReuseGroup(
-    JSContext* cx, HandleObject obj, size_t length,
-    NewObjectKind newKind = GenericObject) {
-  if (!CanReuseGroupForNewArray(obj, cx)) {
-    return NewArray<maxLength>(cx, length, nullptr, newKind);
-  }
-
-  RootedObjectGroup group(cx, JSObject::getGroup(cx, obj));
-  if (!group) {
-    return nullptr;
-  }
-
-  return NewArrayTryUseGroup<maxLength>(cx, group, length, newKind);
-}
-
-ArrayObject* js::NewFullyAllocatedArrayTryReuseGroup(JSContext* cx,
-                                                     HandleObject obj,
-                                                     size_t length,
-                                                     NewObjectKind newKind) {
-  return NewArrayTryReuseGroup<UINT32_MAX>(cx, obj, length, newKind);
-}
-
-ArrayObject* js::NewPartlyAllocatedArrayTryReuseGroup(JSContext* cx,
-                                                      HandleObject obj,
-                                                      size_t length) {
-  return NewArrayTryReuseGroup<ArrayObject::EagerAllocationMaxLength>(cx, obj,
-                                                                      length);
-}
-
-ArrayObject* js::NewFullyAllocatedArrayForCallingAllocationSite(
-    JSContext* cx, size_t length, NewObjectKind newKind) {
-  RootedObjectGroup group(
-      cx, ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Array));
-  if (!group) {
-    return nullptr;
-  }
-  return NewArrayTryUseGroup<UINT32_MAX>(cx, group, length, newKind);
-}
-
-ArrayObject* js::NewPartlyAllocatedArrayForCallingAllocationSite(
-    JSContext* cx, size_t length, HandleObject proto) {
-  RootedObjectGroup group(
-      cx, ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Array, proto));
-  if (!group) {
-    return nullptr;
-  }
-  return NewArrayTryUseGroup<ArrayObject::EagerAllocationMaxLength>(cx, group,
-                                                                    length);
-}
-
-ArrayObject* js::NewCopiedArrayTryUseGroup(JSContext* cx,
-                                           HandleObjectGroup group,
-                                           const Value* vp, size_t length,
-                                           NewObjectKind newKind,
-                                           ShouldUpdateTypes updateTypes) {
-  ArrayObject* obj =
-      NewFullyAllocatedArrayTryUseGroup(cx, group, length, newKind);
-  if (!obj) {
-    return nullptr;
-  }
-
-  DenseElementResult result =
-      obj->setOrExtendDenseElements(cx, 0, vp, length, updateTypes);
-  if (result == DenseElementResult::Failure) {
-    return nullptr;
-  }
-
-  MOZ_ASSERT(result == DenseElementResult::Success);
-  return obj;
-}
-
-ArrayObject* js::NewCopiedArrayForCallingAllocationSite(
-    JSContext* cx, const Value* vp, size_t length,
-    HandleObject proto /* = nullptr */) {
-  RootedObjectGroup group(
-      cx, ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Array, proto));
-  if (!group) {
-    return nullptr;
-  }
-  return NewCopiedArrayTryUseGroup(cx, group, vp, length);
-}
-
+// TODO(no-TI): clean up.
 ArrayObject* js::NewArrayWithGroup(JSContext* cx, uint32_t length,
-                                   HandleObjectGroup group,
-                                   bool convertDoubleElements) {
+                                   HandleObjectGroup group) {
   // Ion can call this with a group from a different realm when calling
   // another realm's Array constructor.
   Maybe<AutoRealm> ar;
@@ -4316,16 +4094,7 @@
     ar.emplace(cx, group);
   }
 
-  ArrayObject* res = NewFullyAllocatedArrayTryUseGroup(cx, group, length);
-  if (!res) {
-    return nullptr;
-  }
-
-  if (convertDoubleElements) {
-    res->setShouldConvertDoubleElements();
-  }
-
-  return res;
+  return NewDenseFullyAllocatedArray(cx, length);
 }
 
 #ifdef DEBUG
diff -Nru firefox-84.0.2+build1/js/src/builtin/Array.h firefox-85.0+build1/js/src/builtin/Array.h
--- firefox-84.0.2+build1/js/src/builtin/Array.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Array.h	2021-01-18 19:58:12.000000000 +0000
@@ -69,6 +69,12 @@
     JSContext* cx, uint32_t length, HandleObject proto = nullptr,
     NewObjectKind newKind = GenericObject);
 
+// Create a dense array with length == 'length', initialized length set to 0,
+// and capacity == 'length' clamped to EagerAllocationMaxLength.
+extern ArrayObject* NewDensePartlyAllocatedArray(
+    JSContext* cx, uint32_t length, HandleObject proto = nullptr,
+    NewObjectKind newKind = GenericObject);
+
 // Create a dense array from the given array values, which must be rooted.
 extern ArrayObject* NewDenseCopiedArray(JSContext* cx, uint32_t length,
                                         const Value* values,
@@ -79,44 +85,8 @@
 extern ArrayObject* NewDenseFullyAllocatedArrayWithTemplate(
     JSContext* cx, uint32_t length, ArrayObject* templateObject);
 
-// Create a dense array with the same copy-on-write elements as another object.
-extern ArrayObject* NewDenseCopyOnWriteArray(JSContext* cx,
-                                             HandleArrayObject templateObject);
-
-extern ArrayObject* NewFullyAllocatedArrayTryUseGroup(
-    JSContext* cx, HandleObjectGroup group, size_t length,
-    NewObjectKind newKind = GenericObject);
-
-extern ArrayObject* NewPartlyAllocatedArrayTryUseGroup(JSContext* cx,
-                                                       HandleObjectGroup group,
-                                                       size_t length);
-
-extern ArrayObject* NewFullyAllocatedArrayTryReuseGroup(
-    JSContext* cx, HandleObject obj, size_t length,
-    NewObjectKind newKind = GenericObject);
-
-extern ArrayObject* NewPartlyAllocatedArrayTryReuseGroup(JSContext* cx,
-                                                         HandleObject obj,
-                                                         size_t length);
-
-extern ArrayObject* NewFullyAllocatedArrayForCallingAllocationSite(
-    JSContext* cx, size_t length, NewObjectKind newKind = GenericObject);
-
-extern ArrayObject* NewPartlyAllocatedArrayForCallingAllocationSite(
-    JSContext* cx, size_t length, HandleObject proto);
-
-extern ArrayObject* NewCopiedArrayTryUseGroup(
-    JSContext* cx, HandleObjectGroup group, const Value* vp, size_t length,
-    NewObjectKind newKind = GenericObject,
-    ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update);
-
-extern ArrayObject* NewCopiedArrayForCallingAllocationSite(
-    JSContext* cx, const Value* vp, size_t length,
-    HandleObject proto = nullptr);
-
 extern ArrayObject* NewArrayWithGroup(JSContext* cx, uint32_t length,
-                                      HandleObjectGroup group,
-                                      bool convertDoubleElements);
+                                      HandleObjectGroup group);
 
 extern bool ToLength(JSContext* cx, HandleValue v, uint64_t* out);
 
diff -Nru firefox-84.0.2+build1/js/src/builtin/Array.js firefox-85.0+build1/js/src/builtin/Array.js
--- firefox-84.0.2+build1/js/src/builtin/Array.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Array.js	2021-01-18 19:58:12.000000000 +0000
@@ -1140,3 +1140,32 @@
     // Step 4.
     return targetIndex;
 }
+
+// https://github.com/tc39/proposal-relative-indexing-method
+// Array.prototype.at ( index )
+function ArrayAt(index) {
+     // Step 1.
+    var O = ToObject(this);
+
+    // Step 2.
+    var len = ToLength(O.length);
+
+    // Step 3.
+    var relativeIndex = ToInteger(index);
+
+    // Steps 4-5.
+    var k;
+    if (relativeIndex >= 0) {
+        k = relativeIndex;
+    } else {
+        k = len + relativeIndex;
+    }
+
+    // Step 6.
+    if (k < 0 || k >= len) {
+        return undefined;
+    }
+
+    // Step 7.
+    return O[k];
+}
diff -Nru firefox-84.0.2+build1/js/src/builtin/AtomicsObject.cpp firefox-85.0+build1/js/src/builtin/AtomicsObject.cpp
--- firefox-84.0.2+build1/js/src/builtin/AtomicsObject.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/AtomicsObject.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -1075,7 +1075,7 @@
   if (!proto) {
     return nullptr;
   }
-  return NewSingletonObjectWithGivenProto(cx, &AtomicsObject::class_, proto);
+  return NewTenuredObjectWithGivenProto(cx, &AtomicsObject::class_, proto);
 }
 
 static const ClassSpec AtomicsClassSpec = {CreateAtomicsObject, nullptr,
diff -Nru firefox-84.0.2+build1/js/src/builtin/DataViewObject.cpp firefox-85.0+build1/js/src/builtin/DataViewObject.cpp
--- firefox-84.0.2+build1/js/src/builtin/DataViewObject.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/DataViewObject.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -26,6 +26,7 @@
 #include "js/friend/ErrorMessages.h"    // js::GetErrorMessage, JSMSG_*
 #include "js/PropertySpec.h"
 #include "js/Wrapper.h"
+#include "util/DifferentialTesting.h"
 #include "util/Windows.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/GlobalObject.h"
@@ -455,12 +456,10 @@
     return false;
   }
 
-#ifdef JS_MORE_DETERMINISTIC
   // See the comment in ElementSpecific::doubleToNative.
-  if (TypeIsFloatingPoint<NativeType>()) {
+  if (js::SupportDifferentialTesting() && TypeIsFloatingPoint<NativeType>()) {
     value = JS::CanonicalizeNaN(value);
   }
-#endif
 
   // Step 6.
   bool isLittleEndian = args.length() >= 3 && ToBoolean(args[2]);
diff -Nru firefox-84.0.2+build1/js/src/builtin/HandlerFunction-inl.h firefox-85.0+build1/js/src/builtin/HandlerFunction-inl.h
--- firefox-84.0.2+build1/js/src/builtin/HandlerFunction-inl.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/HandlerFunction-inl.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,113 @@
+/* -*- 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/. */
+
+/*
+ * Handler for operations that act on a target object, and possibly upon
+ * an extra value.
+ */
+
+#ifndef builtin_HandlerFunction_inl_h
+#define builtin_HandlerFunction_inl_h
+
+#include "mozilla/Attributes.h"  // MOZ_MUST_USE
+
+#include <stddef.h>  // size_t
+
+#include "gc/AllocKind.h"    // js::gc::AllocKind
+#include "js/CallArgs.h"     // JS::CallArgs
+#include "js/RootingAPI.h"   // JS::Handle, JS::Rooted
+#include "js/Value.h"        // JS::ObjectValue
+#include "vm/JSContext.h"    // JSContext
+#include "vm/JSFunction.h"   // JSFunction, js::Native, js::NewNativeFunction
+#include "vm/JSObject.h"     // JSObject
+#include "vm/ObjectGroup.h"  // js::GenericObject
+#include "vm/StringType.h"   // js::PropertyName
+
+#include "vm/JSContext-inl.h"  // JSContext::check
+
+namespace js {
+
+// Handler functions are extended functions, that close over a target object and
+// (optionally) over an extra object, storing those objects in the function's
+// extended slots.
+constexpr size_t HandlerFunctionSlot_Target = 0;
+constexpr size_t HandlerFunctionSlot_Extra = 1;
+
+static_assert(HandlerFunctionSlot_Extra < FunctionExtended::NUM_EXTENDED_SLOTS,
+              "handler function slots shouldn't exceed available extended "
+              "slots");
+
+inline MOZ_MUST_USE JSFunction* NewHandler(JSContext* cx, Native handler,
+                                           JS::Handle<JSObject*> target) {
+  cx->check(target);
+
+  JS::Handle<PropertyName*> funName = cx->names().empty;
+  JS::Rooted<JSFunction*> handlerFun(
+      cx, NewNativeFunction(cx, handler, 0, funName,
+                            gc::AllocKind::FUNCTION_EXTENDED, GenericObject));
+  if (!handlerFun) {
+    return nullptr;
+  }
+  handlerFun->setExtendedSlot(HandlerFunctionSlot_Target,
+                              JS::ObjectValue(*target));
+  return handlerFun;
+}
+
+inline MOZ_MUST_USE JSFunction* NewHandlerWithExtra(
+    JSContext* cx, Native handler, JS::Handle<JSObject*> target,
+    JS::Handle<JSObject*> extra) {
+  cx->check(extra);
+  JSFunction* handlerFun = NewHandler(cx, handler, target);
+  if (handlerFun) {
+    handlerFun->setExtendedSlot(HandlerFunctionSlot_Extra,
+                                JS::ObjectValue(*extra));
+  }
+  return handlerFun;
+}
+
+inline MOZ_MUST_USE JSFunction* NewHandlerWithExtraValue(
+    JSContext* cx, Native handler, JS::Handle<JSObject*> target,
+    JS::Handle<JS::Value> extra) {
+  cx->check(extra);
+  JSFunction* handlerFun = NewHandler(cx, handler, target);
+  if (handlerFun) {
+    handlerFun->setExtendedSlot(HandlerFunctionSlot_Extra, extra);
+  }
+  return handlerFun;
+}
+
+/**
+ * Within the call of a handler function that "closes over" a target value that
+ * is always a |T*| object (and never a wrapper around one), return that |T*|.
+ */
+template <class T>
+inline MOZ_MUST_USE T* TargetFromHandler(const JS::CallArgs& args) {
+  JSFunction& func = args.callee().as<JSFunction>();
+  return &func.getExtendedSlot(HandlerFunctionSlot_Target).toObject().as<T>();
+}
+
+/**
+ * Within the call of a handler function that "closes over" a target value and
+ * an extra value, return that extra value.
+ */
+inline MOZ_MUST_USE JS::Value ExtraValueFromHandler(const JS::CallArgs& args) {
+  JSFunction& func = args.callee().as<JSFunction>();
+  return func.getExtendedSlot(HandlerFunctionSlot_Extra);
+}
+
+/**
+ * Within the call of a handler function that "closes over" a target value and
+ * an extra value, where that extra value is always a |T*| object (and never a
+ * wrapper around one), return that |T*|.
+ */
+template <class T>
+inline MOZ_MUST_USE T* ExtraFromHandler(const JS::CallArgs& args) {
+  return &ExtraValueFromHandler(args).toObject().as<T>();
+}
+
+}  // namespace js
+
+#endif  // builtin_HandlerFunction_inl_h
diff -Nru firefox-84.0.2+build1/js/src/builtin/intl/Collator.js firefox-85.0+build1/js/src/builtin/intl/Collator.js
--- firefox-84.0.2+build1/js/src/builtin/intl/Collator.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/intl/Collator.js	2021-01-18 19:58:12.000000000 +0000
@@ -119,6 +119,7 @@
     //     opt: // opt object computed in InitializeCollator
     //       {
     //         localeMatcher: "lookup" / "best fit",
+    //         co: string matching a Unicode extension type / undefined
     //         kn: true / false / undefined,
     //         kf: "upper" / "lower" / "false" / undefined
     //       }
@@ -158,6 +159,12 @@
     var matcher = GetOption(options, "localeMatcher", "string", ["lookup", "best fit"], "best fit");
     opt.localeMatcher = matcher;
 
+    // https://github.com/tc39/ecma402/pull/459
+    var collation = GetOption(options, "collation", "string", undefined, undefined);
+    if (collation !== undefined)
+        collation = intl_ValidateAndCanonicalizeUnicodeExtensionType(collation, "collation", "co");
+    opt.co = collation;
+
     // Steps 11-13.
     var numericValue = GetOption(options, "numeric", "boolean", undefined, undefined);
     if (numericValue !== undefined)
diff -Nru firefox-84.0.2+build1/js/src/builtin/intl/IntlObject.cpp firefox-85.0+build1/js/src/builtin/intl/IntlObject.cpp
--- firefox-84.0.2+build1/js/src/builtin/intl/IntlObject.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/intl/IntlObject.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -422,7 +422,7 @@
   if (!result) {
     return false;
   }
-  result->ensureDenseInitializedLength(cx, 0, keys->length());
+  result->ensureDenseInitializedLength(0, keys->length());
 
   UErrorCode status = U_ZERO_ERROR;
 
@@ -807,7 +807,7 @@
 
   // The |Intl| object is just a plain object with some "static" function
   // properties and some constructor properties.
-  return NewSingletonObjectWithGivenProto(cx, &IntlClass, proto);
+  return NewTenuredObjectWithGivenProto(cx, &IntlClass, proto);
 }
 
 /**
diff -Nru firefox-84.0.2+build1/js/src/builtin/intl/Locale.cpp firefox-85.0+build1/js/src/builtin/intl/Locale.cpp
--- firefox-84.0.2+build1/js/src/builtin/intl/Locale.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/intl/Locale.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -24,6 +24,7 @@
 #include "jsapi.h"
 #include "jsfriendapi.h"
 
+#include "builtin/Boolean.h"
 #include "builtin/intl/CommonFunctions.h"
 #include "builtin/intl/LanguageTag.h"
 #include "builtin/String.h"
diff -Nru firefox-84.0.2+build1/js/src/builtin/intl/NumberFormat.js firefox-85.0+build1/js/src/builtin/intl/NumberFormat.js
--- firefox-84.0.2+build1/js/src/builtin/intl/NumberFormat.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/intl/NumberFormat.js	2021-01-18 19:58:12.000000000 +0000
@@ -181,18 +181,33 @@
         // Step 12.a (Omitted).
 
         // Step 12.b.
-        mnfd = DefaultNumberOption(mnfd, 0, 20, mnfdDefault);
+        mnfd = DefaultNumberOption(mnfd, 0, 20, undefined);
 
         // Step 12.c.
-        const mxfdActualDefault = std_Math_max(mnfd, mxfdDefault);
+        mxfd = DefaultNumberOption(mxfd, 0, 20, undefined);
 
-        // Step 12.d.
-        mxfd = DefaultNumberOption(mxfd, mnfd, 20, mxfdActualDefault);
+        // Steps 12.d-e.
+        // Inlined DefaultNumberOption, only the fallback case applies here.
+        if (mnfd === undefined) {
+            assert(mxfd !== undefined, "mxfd isn't undefined when mnfd is undefined");
+            mnfd = std_Math_min(mnfdDefault, mxfd);
+        }
 
-        // Step 12.e.
+        // Step 12.f.
+        // Inlined DefaultNumberOption, only the fallback case applies here.
+        else if (mxfd === undefined) {
+            mxfd = std_Math_max(mxfdDefault, mnfd);
+        }
+
+        // Step 12.g.
+        else if (mnfd > mxfd) {
+            ThrowRangeError(JSMSG_INVALID_DIGITS_VALUE, mxfd);
+        }
+
+        // Step 12.h.
         lazyData.minimumFractionDigits = mnfd;
 
-        // Step 12.f.
+        // Step 12.i.
         lazyData.maximumFractionDigits = mxfd;
     }
 
diff -Nru firefox-84.0.2+build1/js/src/builtin/intl/TimeZoneDataGenerated.h firefox-85.0+build1/js/src/builtin/intl/TimeZoneDataGenerated.h
--- firefox-84.0.2+build1/js/src/builtin/intl/TimeZoneDataGenerated.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/intl/TimeZoneDataGenerated.h	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,5 @@
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
+// tzdata version = 2020f
 
 #ifndef builtin_intl_TimeZoneDataGenerated_h
 #define builtin_intl_TimeZoneDataGenerated_h
diff -Nru firefox-84.0.2+build1/js/src/builtin/JSON.cpp firefox-85.0+build1/js/src/builtin/JSON.cpp
--- firefox-84.0.2+build1/js/src/builtin/JSON.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/JSON.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -1121,7 +1121,7 @@
   if (!proto) {
     return nullptr;
   }
-  return NewSingletonObjectWithGivenProto(cx, &JSONClass, proto);
+  return NewTenuredObjectWithGivenProto(cx, &JSONClass, proto);
 }
 
 static const ClassSpec JSONClassSpec = {
diff -Nru firefox-84.0.2+build1/js/src/builtin/MapObject.cpp firefox-85.0+build1/js/src/builtin/MapObject.cpp
--- firefox-84.0.2+build1/js/src/builtin/MapObject.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/MapObject.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -332,8 +332,6 @@
     return true;
   }
 
-  // Note: we don't need to call setDenseElementWithType because
-  // MapIteratorObject::createResultPair gave the elements unknown-types.
   switch (mapIterator->kind()) {
     case MapObject::Keys:
       resultPairObj->setDenseElement(0, range->front().key.get());
@@ -361,21 +359,10 @@
     return nullptr;
   }
 
-  Rooted<TaggedProto> proto(cx, resultPairObj->taggedProto());
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, resultPairObj->realm(), resultPairObj->getClass(), proto);
-  if (!group) {
-    return nullptr;
-  }
-  resultPairObj->setGroup(group);
-
   resultPairObj->setDenseInitializedLength(2);
   resultPairObj->initDenseElement(0, NullValue());
   resultPairObj->initDenseElement(1, NullValue());
 
-  // See comments in MapIteratorObject::next.
-  AddTypePropertyId(cx, resultPairObj, JSID_VOID, TypeSet::UnknownType());
-
   return resultPairObj;
 }
 
@@ -1133,8 +1120,6 @@
     return true;
   }
 
-  // Note: we don't need to call setDenseElementWithType because
-  // SetIteratorObject::createResult gave the elements unknown-types.
   resultObj->setDenseElement(0, range->front().get());
   range->popFront();
   return false;
@@ -1148,20 +1133,9 @@
     return nullptr;
   }
 
-  Rooted<TaggedProto> proto(cx, resultObj->taggedProto());
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, resultObj->realm(), resultObj->getClass(), proto);
-  if (!group) {
-    return nullptr;
-  }
-  resultObj->setGroup(group);
-
   resultObj->setDenseInitializedLength(1);
   resultObj->initDenseElement(0, NullValue());
 
-  // See comments in SetIteratorObject::next.
-  AddTypePropertyId(cx, resultObj, JSID_VOID, TypeSet::UnknownType());
-
   return resultObj;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/builtin/Module.js firefox-85.0+build1/js/src/builtin/Module.js
--- firefox-84.0.2+build1/js/src/builtin/Module.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Module.js	2021-01-18 19:58:12.000000000 +0000
@@ -575,6 +575,8 @@
     if (!IsObject(this) || !IsModule(this))
         return callFunction(CallModuleMethodIfWrapped, this, "ModuleEvaluate");
 
+    const isTopLevelAwaitEnabled = IsTopLevelAwaitEnabled();
+
     // Step 2
     let module = this;
 
@@ -586,12 +588,37 @@
         ThrowInternalError(JSMSG_BAD_MODULE_STATUS);
     }
 
+    let capability = undefined;
+    if (isTopLevelAwaitEnabled) {
+      // Top-level Await Step 4
+      if (module.status === MODULE_STATUS_EVALUATED) {
+        module = GetAsyncCycleRoot(module);
+      }
+
+      // Top-level Await Step 5
+      if (module.topLevelCapability) {
+        return module.topLevelCapability;
+      }
+
+      capability = CreateTopLevelCapability(module);
+    }
+
     // Step 4
     let stack = [];
 
     // Steps 5-6
     try {
         InnerModuleEvaluation(module, stack, 0);
+        if (isTopLevelAwaitEnabled) {
+          if (!module.asyncEvaluating) {
+            ModuleTopLevelCapabilityResolve(module);
+          }
+          // Steps 7-8
+          assert(module.status === MODULE_STATUS_EVALUATED,
+                 "Bad module status after successful evaluation");
+          assert(stack.length === 0,
+                 "Stack should be empty after successful evaluation");
+        }
     } catch (error) {
         for (let i = 0; i < stack.length; i++) {
             let m = stack[i];
@@ -607,23 +634,23 @@
         assert(module.status === MODULE_STATUS_EVALUATED_ERROR,
                "Bad module status after failed evaluation");
 
-        throw error;
+        if (isTopLevelAwaitEnabled) {
+          ModuleTopLevelCapabilityReject(module, error);
+        } else {
+          throw error;
+        }
     }
 
-    // Steps 7-8
-    assert(module.status === MODULE_STATUS_EVALUATED,
-           "Bad module status after successful evaluation");
-    assert(stack.length === 0,
-           "Stack should be empty after successful evaluation");
-
     // Step 9
-    return undefined;
+    return capability;
 }
 
 // https://tc39.es/ecma262/#sec-innermoduleevaluation
 // ES2020 15.2.1.16.2.1 InnerModuleEvaluation
 function InnerModuleEvaluation(module, stack, index)
 {
+    const isTopLevelAwaitEnabled = IsTopLevelAwaitEnabled();
+
     // Step 1
     // TODO: Support module records other than Cyclic Module Records.
 
@@ -648,6 +675,11 @@
     // Steps 6-8
     UnsafeSetReservedSlot(module, MODULE_OBJECT_DFS_INDEX_SLOT, index);
     UnsafeSetReservedSlot(module, MODULE_OBJECT_DFS_ANCESTOR_INDEX_SLOT, index);
+
+    if (isTopLevelAwaitEnabled) {
+      UnsafeSetReservedSlot(module, MODULE_OBJECT_PENDING_ASYNC_DEPENDENCIES_SLOT, 0);
+    }
+
     index++;
 
     // Step 9
@@ -677,11 +709,41 @@
             UnsafeSetReservedSlot(module, MODULE_OBJECT_DFS_ANCESTOR_INDEX_SLOT,
                                   std_Math_min(module.dfsAncestorIndex,
                                                requiredModule.dfsAncestorIndex));
+        } else {
+          if (isTopLevelAwaitEnabled) {
+            requiredModule = GetAsyncCycleRoot(requiredModule);
+            assert(requiredModule.status === MODULE_STATUS_EVALUATED,
+                  `Bad module status in InnerModuleEvaluation: ${requiredModule.status}`);
+            if (requiredModule.evaluationError) {
+              throw GetModuleEvaluationError(module);
+            }
+          }
+        }
+        if (isTopLevelAwaitEnabled) {
+          if (requiredModule.asyncEvaluating) {
+              UnsafeSetReservedSlot(module,
+                                    MODULE_OBJECT_PENDING_ASYNC_DEPENDENCIES_SLOT,
+                                    module.pendingAsyncDependencies + 1);
+              AppendAsyncParentModule(requiredModule, module);
+          }
         }
     }
 
-    // Step 11
-    ExecuteModule(module);
+    if (isTopLevelAwaitEnabled) {
+      if (module.pendingAsyncDependencies > 0) {
+        UnsafeSetReservedSlot(module, MODULE_OBJECT_ASYNC_EVALUATING_SLOT, true);
+      } else {
+        if (module.async) {
+          ExecuteAsyncModule(module);
+        } else {
+          // Step 11
+          ExecuteModule(module);
+        }
+      }
+    } else {
+      // Step 11
+      ExecuteModule(module);
+    }
 
     // Step 12
     assert(CountArrayValues(stack, module) === 1,
@@ -703,3 +765,17 @@
     // Step 15
     return index;
 }
+
+// https://tc39.es/proposal-top-level-await/#sec-execute-async-module
+function ExecuteAsyncModule(module) {
+  // Steps 1-3.
+  assert(module.status == MODULE_STATUS_EVALUATING ||
+         module.status == MODULE_STATUS_EVALUATED, "bad status for async module");
+  assert(module.async, "module is not async");
+  UnsafeSetReservedSlot(module, MODULE_OBJECT_ASYNC_EVALUATING_SLOT, true);
+
+  // Step 4-11 done in AsyncAwait opcode
+
+  ExecuteModule(module);
+}
+
diff -Nru firefox-84.0.2+build1/js/src/builtin/ModuleObject.cpp firefox-85.0+build1/js/src/builtin/ModuleObject.cpp
--- firefox-84.0.2+build1/js/src/builtin/ModuleObject.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/ModuleObject.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,8 +29,10 @@
 #include "vm/SelfHosting.h"
 #include "vm/SharedStencil.h"  // js::GCThingIndex
 
+#include "builtin/HandlerFunction-inl.h"  // js::ExtraValueFromHandler, js::NewHandler{,WithExtraValue}, js::TargetFromHandler
 #include "vm/JSObject-inl.h"
 #include "vm/JSScript-inl.h"
+#include "vm/List-inl.h"
 #include "vm/NativeObject-inl.h"
 
 using namespace js;
@@ -391,7 +393,7 @@
   options.setLazyProto(true);
   Rooted<UniquePtr<IndirectBindingMap>> rootedBindings(cx, std::move(bindings));
   RootedObject object(
-      cx, NewSingletonProxyObject(cx, &proxyHandler, priv, nullptr, options));
+      cx, NewProxyObject(cx, &proxyHandler, priv, nullptr, options));
   if (!object) {
     return nullptr;
   }
@@ -734,6 +736,23 @@
   return value.isObject() && value.toObject().is<ModuleObject>();
 }
 
+// Declared as static function instead of ModuleObject method in order to
+// avoid recursive #include dependency between frontend and VM.
+static frontend::FunctionDeclarationVector* GetFunctionDeclarations(
+    ModuleObject* module) {
+  Value value = module->getReservedSlot(ModuleObject::FunctionDeclarationsSlot);
+  if (value.isUndefined()) {
+    return nullptr;
+  }
+
+  return static_cast<frontend::FunctionDeclarationVector*>(value.toPrivate());
+}
+
+static void InitFunctionDeclarations(
+    ModuleObject* module, frontend::FunctionDeclarationVector&& decls) {
+  *GetFunctionDeclarations(module) = std::move(decls);
+}
+
 /* static */
 ModuleObject* ModuleObject::create(JSContext* cx) {
   RootedObject proto(
@@ -773,7 +792,7 @@
     fop->delete_(obj, &self->importBindings(), MemoryUse::ModuleBindingMap);
   }
   if (frontend::FunctionDeclarationVector* funDecls =
-          self->functionDeclarations()) {
+          GetFunctionDeclarations(self)) {
     // Not tracked as these may move between zones on merge.
     fop->deleteUntracked(funDecls);
   }
@@ -821,18 +840,13 @@
               .as<ScriptSourceObject>();
 }
 
-frontend::FunctionDeclarationVector* ModuleObject::functionDeclarations() {
-  Value value = getReservedSlot(FunctionDeclarationsSlot);
-  if (value.isUndefined()) {
-    return nullptr;
-  }
-
-  return static_cast<frontend::FunctionDeclarationVector*>(value.toPrivate());
-}
-
-void ModuleObject::initFunctionDeclarations(
-    frontend::FunctionDeclarationVector&& decls) {
-  *functionDeclarations() = std::move(decls);
+bool ModuleObject::initAsyncSlots(JSContext* cx, bool isAsync,
+                                  HandleObject asyncParentModulesList) {
+  initReservedSlot(AsyncSlot, BooleanValue(isAsync));
+  initReservedSlot(AsyncEvaluatingSlot, BooleanValue(false));
+  initReservedSlot(AsyncParentModulesSlot,
+                   ObjectValue(*asyncParentModulesList));
+  return true;
 }
 
 void ModuleObject::initScriptSlots(HandleScript script) {
@@ -959,10 +973,77 @@
   return status;
 }
 
+bool ModuleObject::isAsync() const {
+  return getReservedSlot(AsyncSlot).toBoolean();
+}
+
+bool ModuleObject::isAsyncEvaluating() const {
+  return getReservedSlot(AsyncEvaluatingSlot).toBoolean();
+}
+
+void ModuleObject::setAsyncEvaluating(bool isEvaluating) {
+  return setReservedSlot(AsyncEvaluatingSlot, BooleanValue(isEvaluating));
+}
+
+uint32_t ModuleObject::dfsIndex() const {
+  return getReservedSlot(DFSIndexSlot).toInt32();
+}
+
+uint32_t ModuleObject::dfsAncestorIndex() const {
+  return getReservedSlot(DFSAncestorIndexSlot).toInt32();
+}
+
+JSObject* ModuleObject::topLevelCapability() const {
+  return &getReservedSlot(TopLevelCapabilitySlot).toObject();
+}
+
+PromiseObject* ModuleObject::createTopLevelCapability(
+    JSContext* cx, HandleModuleObject module) {
+  MOZ_ASSERT(module->getReservedSlot(TopLevelCapabilitySlot).isUndefined());
+  Rooted<PromiseObject*> resultPromise(cx, CreatePromiseObjectForAsync(cx));
+  if (!resultPromise) {
+    return nullptr;
+  }
+  module->setInitialTopLevelCapability(resultPromise);
+  return resultPromise;
+}
+
+void ModuleObject::setInitialTopLevelCapability(HandleObject promiseObj) {
+  initReservedSlot(TopLevelCapabilitySlot, ObjectValue(*promiseObj));
+}
+
+inline ListObject* ModuleObject::asyncParentModules() const {
+  return &getReservedSlot(AsyncParentModulesSlot).toObject().as<ListObject>();
+}
+
+bool ModuleObject::appendAsyncParentModule(JSContext* cx,
+                                           HandleModuleObject self,
+                                           HandleModuleObject parent) {
+  Rooted<Value> parentValue(cx, ObjectValue(*parent));
+  return self->asyncParentModules()->append(cx, parentValue);
+}
+
+uint32_t ModuleObject::pendingAsyncDependencies() const {
+  return getReservedSlot(PendingAsyncDependenciesSlot).toInt32();
+}
+
+void ModuleObject::setPendingAsyncDependencies(uint32_t newValue) {
+  return setReservedSlot(PendingAsyncDependenciesSlot, NumberValue(newValue));
+}
+
+bool ModuleObject::hasTopLevelCapability() const {
+  return !getReservedSlot(TopLevelCapabilitySlot).isUndefined();
+}
+
 bool ModuleObject::hadEvaluationError() const {
   return status() == MODULE_STATUS_EVALUATED_ERROR;
 }
 
+void ModuleObject::setEvaluationError(HandleValue newValue) {
+  setReservedSlot(StatusSlot, Int32Value(MODULE_STATUS_EVALUATED_ERROR));
+  return setReservedSlot(EvaluationErrorSlot, newValue);
+}
+
 Value ModuleObject::evaluationError() const {
   MOZ_ASSERT(hadEvaluationError());
   return getReservedSlot(EvaluationErrorSlot);
@@ -1007,7 +1088,8 @@
   }
 #endif
   // |self| initially manages this vector.
-  frontend::FunctionDeclarationVector* funDecls = self->functionDeclarations();
+  frontend::FunctionDeclarationVector* funDecls =
+      GetFunctionDeclarations(self.get());
   if (!funDecls) {
     JS_ReportErrorASCII(
         cx, "Module function declarations have already been instantiated");
@@ -1045,7 +1127,8 @@
 bool ModuleObject::execute(JSContext* cx, HandleModuleObject self,
                            MutableHandleValue rval) {
 #ifdef DEBUG
-  MOZ_ASSERT(self->status() == MODULE_STATUS_EVALUATING);
+  MOZ_ASSERT(self->status() == MODULE_STATUS_EVALUATING ||
+             self->status() == MODULE_STATUS_EVALUATED);
   if (!AssertFrozen(cx, self)) {
     return false;
   }
@@ -1104,22 +1187,25 @@
 }
 
 static bool InvokeSelfHostedMethod(JSContext* cx, HandleModuleObject self,
-                                   HandlePropertyName name) {
+                                   HandlePropertyName name,
+                                   MutableHandleValue rval) {
   RootedValue thisv(cx, ObjectValue(*self));
   FixedInvokeArgs<0> args(cx);
 
-  RootedValue ignored(cx);
-  return CallSelfHostedFunction(cx, name, thisv, args, &ignored);
+  return CallSelfHostedFunction(cx, name, thisv, args, rval);
 }
 
 /* static */
 bool ModuleObject::Instantiate(JSContext* cx, HandleModuleObject self) {
-  return InvokeSelfHostedMethod(cx, self, cx->names().ModuleInstantiate);
+  RootedValue ignored(cx);
+  return InvokeSelfHostedMethod(cx, self, cx->names().ModuleInstantiate,
+                                &ignored);
 }
 
 /* static */
-bool ModuleObject::Evaluate(JSContext* cx, HandleModuleObject self) {
-  return InvokeSelfHostedMethod(cx, self, cx->names().ModuleEvaluate);
+bool ModuleObject::Evaluate(JSContext* cx, HandleModuleObject self,
+                            MutableHandleValue rval) {
+  return InvokeSelfHostedMethod(cx, self, cx->names().ModuleEvaluate, rval);
 }
 
 /* static */
@@ -1149,6 +1235,14 @@
 DEFINE_GETTER_FUNCTIONS(ModuleObject, starExportEntries, StarExportEntriesSlot)
 DEFINE_GETTER_FUNCTIONS(ModuleObject, dfsIndex, DFSIndexSlot)
 DEFINE_GETTER_FUNCTIONS(ModuleObject, dfsAncestorIndex, DFSAncestorIndexSlot)
+DEFINE_GETTER_FUNCTIONS(ModuleObject, async, AsyncSlot)
+DEFINE_GETTER_FUNCTIONS(ModuleObject, topLevelCapability,
+                        TopLevelCapabilitySlot)
+DEFINE_GETTER_FUNCTIONS(ModuleObject, asyncEvaluating, AsyncEvaluatingSlot)
+DEFINE_GETTER_FUNCTIONS(ModuleObject, asyncParentModules,
+                        AsyncParentModulesSlot)
+DEFINE_GETTER_FUNCTIONS(ModuleObject, pendingAsyncDependencies,
+                        PendingAsyncDependenciesSlot)
 
 /* static */
 bool GlobalObject::initModuleProto(JSContext* cx,
@@ -1165,6 +1259,12 @@
       JS_PSG("starExportEntries", ModuleObject_starExportEntriesGetter, 0),
       JS_PSG("dfsIndex", ModuleObject_dfsIndexGetter, 0),
       JS_PSG("dfsAncestorIndex", ModuleObject_dfsAncestorIndexGetter, 0),
+      JS_PSG("async", ModuleObject_asyncGetter, 0),
+      JS_PSG("topLevelCapability", ModuleObject_topLevelCapabilityGetter, 0),
+      JS_PSG("asyncEvaluating", ModuleObject_asyncEvaluatingGetter, 0),
+      JS_PSG("asyncParentModules", ModuleObject_asyncParentModulesGetter, 0),
+      JS_PSG("pendingAsyncDependencies",
+             ModuleObject_pendingAsyncDependenciesGetter, 0),
       JS_PS_END};
 
   static const JSFunctionSpec protoFunctions[] = {
@@ -1212,6 +1312,10 @@
   return true;
 }
 
+void ModuleBuilder::noteAsync(frontend::StencilModuleMetadata& metadata) {
+  metadata.isAsync = true;
+}
+
 bool ModuleBuilder::buildTables(frontend::StencilModuleMetadata& metadata) {
   // https://tc39.es/ecma262/#sec-parsemodule
   // 15.2.1.17.1 ParseModule, Steps 4-11.
@@ -1294,7 +1398,7 @@
     return nullptr;
   }
 
-  resultArray->ensureDenseInitializedLength(cx, 0, vector.length());
+  resultArray->ensureDenseInitializedLength(0, vector.length());
 
   RootedAtom specifier(cx);
   RootedAtom localName(cx);
@@ -1404,7 +1508,16 @@
     js::ReportOutOfMemory(cx);
     return false;
   }
-  module->initFunctionDeclarations(std::move(functionDeclsCopy));
+  InitFunctionDeclarations(module.get(), std::move(functionDeclsCopy));
+
+  Rooted<ListObject*> asyncParentModulesList(cx, ListObject::create(cx));
+  if (!asyncParentModulesList) {
+    return false;
+  }
+
+  if (!module->initAsyncSlots(cx, isAsync, asyncParentModulesList)) {
+    return false;
+  }
 
   module->initImportExportData(
       requestedModulesObject, importEntriesObject, localExportEntriesObject,
@@ -1831,6 +1944,189 @@
   return result;
 }
 
+// https://tc39.es/proposal-top-level-await/#sec-getasynccycleroot
+ModuleObject* js::GetAsyncCycleRoot(ModuleObject* module) {
+  // Step 1.
+  MOZ_ASSERT(module->status() == MODULE_STATUS_EVALUATED);
+
+  // Step 2.
+  if (module->asyncParentModules()->empty()) {
+    return module;
+  }
+
+  // Step 3.
+  ModuleObject* currentModule = module;
+  while (currentModule->dfsIndex() > currentModule->dfsAncestorIndex()) {
+    MOZ_ASSERT(!currentModule->asyncParentModules()->empty());
+    ModuleObject* nextCycleModule = &currentModule->asyncParentModules()
+                                         ->get(0)
+                                         .toObject()
+                                         .as<ModuleObject>();
+    MOZ_ASSERT(nextCycleModule->dfsAncestorIndex() <=
+               currentModule->dfsAncestorIndex());
+    currentModule = nextCycleModule;
+  }
+
+  // Step 4.
+  MOZ_ASSERT(currentModule->dfsIndex() == currentModule->dfsAncestorIndex());
+
+  // Step 5.
+  return currentModule;
+}
+
+bool js::AsyncModuleExecutionFulfilledHandler(JSContext* cx, unsigned argc,
+                                              Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  JSFunction& func = args.callee().as<JSFunction>();
+
+  Rooted<ModuleObject*> module(
+      cx, &func.getExtendedSlot(FunctionExtended::MODULE_SLOT)
+               .toObject()
+               .as<ModuleObject>());
+  AsyncModuleExecutionFulfilled(cx, module);
+  args.rval().setUndefined();
+  return true;
+}
+
+bool js::AsyncModuleExecutionRejectedHandler(JSContext* cx, unsigned argc,
+                                             Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  JSFunction& func = args.callee().as<JSFunction>();
+  Rooted<ModuleObject*> module(
+      cx, &func.getExtendedSlot(FunctionExtended::MODULE_SLOT)
+               .toObject()
+               .as<ModuleObject>());
+  AsyncModuleExecutionRejected(cx, module, args.get(0));
+  args.rval().setUndefined();
+  return true;
+}
+
+// Top Level Await
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionfulfilled
+void js::AsyncModuleExecutionFulfilled(JSContext* cx,
+                                       HandleModuleObject module) {
+  // Step 1.
+  MOZ_ASSERT(module->status() == MODULE_STATUS_EVALUATED);
+
+  // Step 2.
+  if (!module->isAsyncEvaluating()) {
+    MOZ_ASSERT(module->hadEvaluationError());
+    return;
+  }
+
+  // Step 3.
+  MOZ_ASSERT(!module->hadEvaluationError());
+
+  // Step 4.
+  module->setAsyncEvaluating(false);
+
+  // Step 5.
+  uint32_t length = module->asyncParentModules()->length();
+  Rooted<ModuleObject*> m(cx);
+  Rooted<ModuleObject*> cycleRoot(cx);
+  RootedValue result(cx);
+  for (uint32_t i = 0; i < length; i++) {
+    m = &module->asyncParentModules()->get(i).toObject().as<ModuleObject>();
+
+    if (module->dfsIndex() != module->dfsAncestorIndex()) {
+      MOZ_ASSERT(m->dfsAncestorIndex() <= module->dfsAncestorIndex());
+    }
+
+    m->setPendingAsyncDependencies(m->pendingAsyncDependencies() - 1);
+
+    if (m->pendingAsyncDependencies() == 0 && !m->hadEvaluationError()) {
+      MOZ_ASSERT(m->isAsyncEvaluating());
+
+      cycleRoot = GetAsyncCycleRoot(m);
+
+      if (cycleRoot->hadEvaluationError()) {
+        return;
+      }
+
+      if (m->isAsync()) {
+        // Steps for ExecuteAsyncModule
+        MOZ_ASSERT(m->status() == MODULE_STATUS_EVALUATING ||
+                   m->status() == MODULE_STATUS_EVALUATED);
+        MOZ_ASSERT(m->isAsync());
+        MOZ_ASSERT(m->isAsyncEvaluating());
+        ModuleObject::execute(cx, m, &result);
+      } else {
+        if (ModuleObject::execute(cx, m, &result)) {
+          AsyncModuleExecutionFulfilled(cx, m);
+        } else {
+          AsyncModuleExecutionRejected(cx, m, result);
+        }
+      }
+    }
+  }
+
+  // Step 6.
+  if (module->hasTopLevelCapability()) {
+    MOZ_ASSERT(module->dfsIndex() == module->dfsAncestorIndex());
+    ModuleObject::topLevelCapabilityResolve(cx, module);
+  }
+
+  // Return undefined.
+}
+
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionrejected
+void js::AsyncModuleExecutionRejected(JSContext* cx, HandleModuleObject module,
+                                      HandleValue error) {
+  // Step 1.
+  MOZ_ASSERT(module->status() == MODULE_STATUS_EVALUATED);
+
+  // Step 2.
+  if (!module->isAsyncEvaluating()) {
+    MOZ_ASSERT(module->hadEvaluationError());
+    return;
+  }
+
+  // Step 3.
+  MOZ_ASSERT(!module->hadEvaluationError());
+
+  // Step 4.
+  module->setEvaluationError(error);
+
+  // Step 5.
+  module->setAsyncEvaluating(false);
+
+  // Step 6.
+  uint32_t length = module->asyncParentModules()->length();
+  Rooted<ModuleObject*> parent(cx);
+  for (uint32_t i = 0; i < length; i++) {
+    parent =
+        &module->asyncParentModules()->get(i).toObject().as<ModuleObject>();
+    if (module->dfsIndex() != module->dfsAncestorIndex()) {
+      MOZ_ASSERT(parent->dfsAncestorIndex() == module->dfsAncestorIndex());
+    }
+    AsyncModuleExecutionRejected(cx, parent, error);
+  }
+
+  // Step 7.
+  if (module->hasTopLevelCapability()) {
+    MOZ_ASSERT(module->dfsIndex() == module->dfsAncestorIndex());
+    ModuleObject::topLevelCapabilityReject(cx, module, error);
+  }
+
+  // Return undefined.
+}
+
+bool ModuleObject::topLevelCapabilityResolve(JSContext* cx,
+                                             HandleModuleObject module) {
+  RootedValue rval(cx);
+  Rooted<PromiseObject*> promise(
+      cx, &module->topLevelCapability()->as<PromiseObject>());
+  return AsyncFunctionReturned(cx, promise, rval);
+}
+
+bool ModuleObject::topLevelCapabilityReject(JSContext* cx,
+                                            HandleModuleObject module,
+                                            HandleValue error) {
+  Rooted<PromiseObject*> promise(
+      cx, &module->topLevelCapability()->as<PromiseObject>());
+  return AsyncFunctionThrown(cx, promise, error);
+}
+
 JSObject* js::StartDynamicModuleImport(JSContext* cx, HandleScript script,
                                        HandleValue specifierArg) {
   RootedObject promiseConstructor(cx, JS::GetPromiseConstructor(cx));
@@ -1887,11 +2183,156 @@
   return promise;
 }
 
+static bool OnRootModuleRejected(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  HandleValue error = args.get(0);
+
+  js::ReportExceptionClosure reportExn(error);
+  PrepareScriptEnvironmentAndInvoke(cx, cx->global(), reportExn);
+
+  args.rval().setUndefined();
+  return true;
+};
+
+bool js::OnModuleEvaluationFailure(JSContext* cx,
+                                   HandleObject evaluationPromise) {
+  if (evaluationPromise == nullptr) {
+    return false;
+  }
+
+  RootedFunction onRejected(
+      cx, NewHandler(cx, OnRootModuleRejected, evaluationPromise));
+  if (!onRejected) {
+    return false;
+  }
+
+  return JS::AddPromiseReactions(cx, evaluationPromise, nullptr, onRejected);
+}
+
+// Adjustment for Top-level await;
+// See: https://github.com/tc39/proposal-dynamic-import/pull/71/files
+static bool OnResolvedDynamicModule(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.get(0).isUndefined());
+
+  // This is a hack to allow us to have the 2 extra variables needed
+  // for FinishDynamicModuleImport in the resolve callback.
+  Rooted<ListObject*> resolvedModuleParams(cx,
+                                           ExtraFromHandler<ListObject>(args));
+  MOZ_ASSERT(resolvedModuleParams->length() == 2);
+  RootedValue referencingPrivate(cx, resolvedModuleParams->get(0));
+  RootedString specifier(cx, resolvedModuleParams->get(1).toString());
+
+  Rooted<PromiseObject*> promise(cx, TargetFromHandler<PromiseObject>(args));
+
+  auto releasePrivate = mozilla::MakeScopeExit(
+      [&] { cx->runtime()->releaseScriptPrivate(referencingPrivate); });
+
+  RootedObject result(cx,
+                      CallModuleResolveHook(cx, referencingPrivate, specifier));
+
+  if (!result) {
+    return RejectPromiseWithPendingError(cx, promise);
+  }
+
+  RootedModuleObject module(cx, &result->as<ModuleObject>());
+  if (module->status() != MODULE_STATUS_EVALUATED) {
+    JS_ReportErrorASCII(
+        cx, "Unevaluated or errored module returned by module resolve hook");
+    return RejectPromiseWithPendingError(cx, promise);
+  }
+
+  MOZ_ASSERT(module->topLevelCapability()->as<PromiseObject>().state() ==
+             JS::PromiseState::Fulfilled);
+
+  RootedObject ns(cx, ModuleObject::GetOrCreateModuleNamespace(cx, module));
+  if (!ns) {
+    return RejectPromiseWithPendingError(cx, promise);
+  }
+
+  args.rval().setUndefined();
+  RootedValue value(cx, ObjectValue(*ns));
+  return PromiseObject::resolve(cx, promise, value);
+};
+
+static bool OnRejectedDynamicModule(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  HandleValue error = args.get(0);
+
+  RootedValue referencingPrivate(cx, ExtraValueFromHandler(args));
+  Rooted<PromiseObject*> promise(cx, TargetFromHandler<PromiseObject>(args));
+
+  auto releasePrivate = mozilla::MakeScopeExit(
+      [&] { cx->runtime()->releaseScriptPrivate(referencingPrivate); });
+
+  args.rval().setUndefined();
+  return PromiseObject::reject(cx, promise, error);
+};
+
+bool FinishDynamicModuleImport_impl(JSContext* cx,
+                                    HandleObject evaluationPromise,
+                                    HandleValue referencingPrivate,
+                                    HandleString specifier,
+                                    HandleObject promiseArg) {
+  Rooted<ListObject*> resolutionArgs(cx, ListObject::create(cx));
+  if (!resolutionArgs->append(cx, referencingPrivate)) {
+    return false;
+  }
+  Rooted<Value> stringValue(cx, StringValue(specifier));
+  if (!resolutionArgs->append(cx, stringValue)) {
+    return false;
+  }
+
+  Rooted<Value> resolutionArgsValue(cx, ObjectValue(*resolutionArgs));
+
+  RootedFunction onResolved(
+      cx, NewHandlerWithExtraValue(cx, OnResolvedDynamicModule, promiseArg,
+                                   resolutionArgsValue));
+  if (!onResolved) {
+    return false;
+  }
+
+  RootedFunction onRejected(
+      cx, NewHandlerWithExtraValue(cx, OnRejectedDynamicModule, promiseArg,
+                                   referencingPrivate));
+  if (!onRejected) {
+    return false;
+  }
+
+  return JS::AddPromiseReactionsIgnoringUnhandledRejection(
+      cx, evaluationPromise, onResolved, onRejected);
+}
+
 bool js::FinishDynamicModuleImport(JSContext* cx,
-                                   JS::DynamicImportStatus status,
+                                   HandleObject evaluationPromise,
                                    HandleValue referencingPrivate,
                                    HandleString specifier,
                                    HandleObject promiseArg) {
+  // If we do not have an evaluation promise for the module, we can assume that
+  // evaluation has failed or been interrupted -- we can reject the dynamic
+  // module.
+  auto releasePrivate = mozilla::MakeScopeExit(
+      [&] { cx->runtime()->releaseScriptPrivate(referencingPrivate); });
+
+  if (!evaluationPromise) {
+    Handle<PromiseObject*> promise = promiseArg.as<PromiseObject>();
+    return RejectPromiseWithPendingError(cx, promise);
+  }
+
+  if (!FinishDynamicModuleImport_impl(cx, evaluationPromise, referencingPrivate,
+                                      specifier, promiseArg)) {
+    return false;
+  }
+
+  releasePrivate.release();
+  return true;
+}
+
+bool js::FinishDynamicModuleImport_NoTLA(JSContext* cx,
+                                         JS::DynamicImportStatus status,
+                                         HandleValue referencingPrivate,
+                                         HandleString specifier,
+                                         HandleObject promiseArg) {
   MOZ_ASSERT_IF(cx->isExceptionPending(),
                 status == JS::DynamicImportStatus::Failed);
 
@@ -2086,7 +2527,7 @@
     localExportEntries = &module->localExportEntries();
     indirectExportEntries = &module->indirectExportEntries();
     starExportEntries = &module->starExportEntries();
-    funcDecls = module->functionDeclarations();
+    funcDecls = GetFunctionDeclarations(module.get());
 
     requestedModulesLength = requestedModules->length();
     importEntriesLength = importEntries->length();
@@ -2192,7 +2633,7 @@
     MOZ_TRY(xdr->codeUint32(&funIndex));
 
     if (mode == XDR_DECODE) {
-      if (!module->functionDeclarations()->append(funIndex)) {
+      if (!GetFunctionDeclarations(module.get())->append(funIndex)) {
         ReportOutOfMemory(cx);
         return xdr->fail(JS::TranscodeResult_Throw);
       }
@@ -2207,6 +2648,23 @@
                                  starExportEntries);
   }
 
+  /* isAsync Slot */
+  uint8_t isAsyncModule = 0;
+  if (mode == XDR_ENCODE) {
+    isAsyncModule = module->isAsync() ? 1 : 0;
+  }
+
+  MOZ_TRY(xdr->codeUint8(&isAsyncModule));
+
+  if (mode == XDR_DECODE) {
+    Rooted<ListObject*> asyncParentModulesList(cx, ListObject::create(cx));
+    if (!asyncParentModulesList) {
+      return xdr->fail(JS::TranscodeResult_Throw);
+    }
+
+    module->initAsyncSlots(cx, isAsyncModule == 1, asyncParentModulesList);
+  }
+
   modp.set(module);
   return Ok();
 }
diff -Nru firefox-84.0.2+build1/js/src/builtin/ModuleObject.h firefox-85.0+build1/js/src/builtin/ModuleObject.h
--- firefox-84.0.2+build1/js/src/builtin/ModuleObject.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/ModuleObject.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,23 +7,45 @@
 #ifndef builtin_ModuleObject_h
 #define builtin_ModuleObject_h
 
-#include "mozilla/Maybe.h"
+#include "mozilla/HashTable.h"  // mozilla::{HashMap, DefaultHasher}
+#include "mozilla/Maybe.h"      // mozilla::Maybe
 
-#include "jsapi.h"
+#include <stddef.h>  // size_t
+#include <stdint.h>  // int32_t, uint32_t
 
-#include "builtin/SelfHostingDefines.h"
-#include "frontend/Stencil.h"
-#include "gc/ZoneAllocator.h"
-#include "js/GCVector.h"
-#include "js/Id.h"
-#include "js/Modules.h"
-#include "js/UniquePtr.h"
-#include "vm/JSAtom.h"
-#include "vm/NativeObject.h"
-#include "vm/ProxyObject.h"
+#include "builtin/SelfHostingDefines.h"  // MODULE_OBJECT_*
+#include "gc/Barrier.h"                  // HeapPtr, PreBarrieredId
+#include "gc/Rooting.h"                  // HandleAtom, HandleArrayObject
+#include "gc/ZoneAllocator.h"            // ZoneAllocPolicy
+#include "js/Class.h"                    // JSClass, ObjectOpResult
+#include "js/GCVector.h"                 // GCVector
+#include "js/Id.h"                       // jsid
+#include "js/Modules.h"                  // JS::DynamicImportStatus
+#include "js/PropertyDescriptor.h"       // PropertyDescriptor
+#include "js/Proxy.h"                    // BaseProxyHandler
+#include "js/RootingAPI.h"               // Rooted, Handle, MutableHandle
+#include "js/TypeDecls.h"  // HandleValue, HandleId, HandleObject, HandleScript, MutableHandleValue, MutableHandleIdVector, MutableHandleObject
+#include "js/UniquePtr.h"  // UniquePtr
+#include "js/Value.h"      // JS::Value
+#include "vm/JSAtom.h"     // JSAtom
+#include "vm/JSObject.h"   // JSObject
+#include "vm/List.h"       // ListObject
+#include "vm/NativeObject.h"   // NativeObject
+#include "vm/PromiseObject.h"  // js::PromiseObject
+#include "vm/ProxyObject.h"    // ProxyObject
+#include "vm/Xdr.h"            // XDRMode, XDRResult, XDRState
+
+class JSFreeOp;
+class JSScript;
+class JSTracer;
 
 namespace js {
 
+class ArrayObject;
+class Shape;
+class Scope;
+class ScriptSourceObject;
+
 class ModuleEnvironmentObject;
 class ModuleObject;
 
@@ -154,8 +176,9 @@
     HeapPtr<Shape*> shape;
   };
 
-  using Map = HashMap<PreBarrieredId, Binding, DefaultHasher<PreBarrieredId>,
-                      ZoneAllocPolicy>;
+  using Map =
+      mozilla::HashMap<PreBarrieredId, Binding,
+                       mozilla::DefaultHasher<PreBarrieredId>, ZoneAllocPolicy>;
 
   mozilla::Maybe<Map> map_;
 };
@@ -248,6 +271,11 @@
     FunctionDeclarationsSlot,
     DFSIndexSlot,
     DFSAncestorIndexSlot,
+    AsyncSlot,
+    AsyncEvaluatingSlot,
+    TopLevelCapabilitySlot,
+    AsyncParentModulesSlot,
+    PendingAsyncDependenciesSlot,
     SlotCount
   };
 
@@ -261,6 +289,14 @@
                 "DFSIndexSlot must match self-hosting define");
   static_assert(DFSAncestorIndexSlot == MODULE_OBJECT_DFS_ANCESTOR_INDEX_SLOT,
                 "DFSAncestorIndexSlot must match self-hosting define");
+  static_assert(AsyncEvaluatingSlot == MODULE_OBJECT_ASYNC_EVALUATING_SLOT,
+                "AsyncEvaluatingSlot must match self-hosting define");
+  static_assert(TopLevelCapabilitySlot ==
+                    MODULE_OBJECT_TOP_LEVEL_CAPABILITY_SLOT,
+                "topLevelCapabilitySlot must match self-hosting define");
+  static_assert(PendingAsyncDependenciesSlot ==
+                    MODULE_OBJECT_PENDING_ASYNC_DEPENDENCIES_SLOT,
+                "PendingAsyncDependenciesSlot must match self-hosting define");
 
   static const JSClass class_;
 
@@ -293,6 +329,8 @@
   ModuleEnvironmentObject* environment() const;
   ModuleNamespaceObject* namespace_();
   ModuleStatus status() const;
+  uint32_t dfsIndex() const;
+  uint32_t dfsAncestorIndex() const;
   bool hadEvaluationError() const;
   Value evaluationError() const;
   JSObject* metaObject() const;
@@ -304,8 +342,33 @@
   ArrayObject& starExportEntries() const;
   IndirectBindingMap& importBindings();
 
+  static PromiseObject* createTopLevelCapability(JSContext* cx,
+                                                 HandleModuleObject module);
+  bool isAsync() const;
+  void setAsync(bool isAsync);
+  bool isAsyncEvaluating() const;
+  void setAsyncEvaluating(bool isEvaluating);
+  void setEvaluationError(HandleValue newValue);
+  void setPendingAsyncDependencies(uint32_t newValue);
+  void setInitialTopLevelCapability(HandleObject promiseObj);
+  bool hasTopLevelCapability() const;
+  JSObject* topLevelCapability() const;
+  ListObject* asyncParentModules() const;
+  uint32_t pendingAsyncDependencies() const;
+
+  static bool appendAsyncParentModule(JSContext* cx, HandleModuleObject self,
+                                      HandleModuleObject parent);
+
+  static bool topLevelCapabilityResolve(JSContext* cx,
+                                        HandleModuleObject module);
+  static bool topLevelCapabilityReject(JSContext* cx, HandleModuleObject module,
+                                       HandleValue error);
+
   static bool Instantiate(JSContext* cx, HandleModuleObject self);
-  static bool Evaluate(JSContext* cx, HandleModuleObject self);
+
+  // Start evaluating the module. If TLA is enabled, rval will be a promise
+  static bool Evaluate(JSContext* cx, HandleModuleObject self,
+                       MutableHandleValue rval);
 
   static ModuleNamespaceObject* GetOrCreateModuleNamespace(
       JSContext* cx, HandleModuleObject self);
@@ -327,8 +390,11 @@
 
   static bool createEnvironment(JSContext* cx, HandleModuleObject self);
 
-  frontend::FunctionDeclarationVector* functionDeclarations();
-  void initFunctionDeclarations(frontend::FunctionDeclarationVector&& decls);
+  bool initAsyncSlots(JSContext* cx, bool isAsync,
+                      HandleObject asyncParentModulesList);
+
+  // NOTE: accessor for FunctionDeclarationsSlot is defined inside
+  // ModuleObject.cpp as static function.
 
  private:
   static const JSClassOps classOps_;
@@ -344,13 +410,41 @@
 JSObject* CallModuleResolveHook(JSContext* cx, HandleValue referencingPrivate,
                                 HandleString specifier);
 
+// https://tc39.es/proposal-top-level-await/#sec-getasynccycleroot
+ModuleObject* GetAsyncCycleRoot(ModuleObject* module);
+
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionfulfilled
+void AsyncModuleExecutionFulfilled(JSContext* cx, HandleModuleObject module);
+
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionrejected
+void AsyncModuleExecutionRejected(JSContext* cx, HandleModuleObject module,
+                                  HandleValue error);
+
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionfulfilled
+bool AsyncModuleExecutionFulfilledHandler(JSContext* cx, unsigned argc,
+                                          Value* vp);
+
+// https://tc39.es/proposal-top-level-await/#sec-asyncmodulexecutionrejected
+bool AsyncModuleExecutionRejectedHandler(JSContext* cx, unsigned argc,
+                                         Value* vp);
+
 JSObject* StartDynamicModuleImport(JSContext* cx, HandleScript script,
                                    HandleValue specifier);
 
-bool FinishDynamicModuleImport(JSContext* cx, JS::DynamicImportStatus status,
+bool OnModuleEvaluationFailure(JSContext* cx, HandleObject evaluationPromise);
+
+bool FinishDynamicModuleImport(JSContext* cx, HandleObject evaluationPromise,
                                HandleValue referencingPrivate,
                                HandleString specifier, HandleObject promise);
 
+// This is used so that Top Level Await functionality can be turned off
+// entirely. It will be removed in bug#1676612.
+bool FinishDynamicModuleImport_NoTLA(JSContext* cx,
+                                     JS::DynamicImportStatus status,
+                                     HandleValue referencingPrivate,
+                                     HandleString specifier,
+                                     HandleObject promise);
+
 template <XDRMode mode>
 XDRResult XDRModuleObject(XDRState<mode>* xdr, MutableHandleModuleObject modp);
 
diff -Nru firefox-84.0.2+build1/js/src/builtin/Object.cpp firefox-85.0+build1/js/src/builtin/Object.cpp
--- firefox-84.0.2+build1/js/src/builtin/Object.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Object.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -25,12 +25,15 @@
 #include "util/StringBuffer.h"
 #include "util/Text.h"
 #include "vm/AsyncFunction.h"
+#include "vm/BooleanObject.h"
 #include "vm/DateObject.h"
 #include "vm/EqualityOperations.h"  // js::SameValue
 #include "vm/ErrorObject.h"
 #include "vm/JSContext.h"
+#include "vm/NumberObject.h"
 #include "vm/PlainObject.h"  // js::PlainObject
 #include "vm/RegExpObject.h"
+#include "vm/StringObject.h"
 #include "vm/ToSource.h"  // js::ValueToSource
 
 #include "vm/JSObject-inl.h"
@@ -1023,22 +1026,10 @@
   // object literals ({}).
   gc::AllocKind allocKind = GuessObjectGCKind(0);
 
-  if (!proto) {
-    // Object.create(null) is common, optimize it by using an allocation
-    // site specific ObjectGroup. Because GetCallerInitGroup is pretty
-    // slow, the caller can pass in the group if it's known and we use that
-    // instead.
-    RootedObjectGroup ngroup(cx, group);
-    if (!ngroup) {
-      ngroup = ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Null);
-      if (!ngroup) {
-        return nullptr;
-      }
-    }
-
-    MOZ_ASSERT(!ngroup->proto().toObjectOrNull());
-
-    return NewObjectWithGroup<PlainObject>(cx, ngroup, allocKind, newKind);
+  // Use a faster allocation path if the group is known.
+  if (group) {
+    MOZ_ASSERT(group->proto().toObjectOrNull() == proto);
+    return NewObjectWithGroup<PlainObject>(cx, group, allocKind, newKind);
   }
 
   return NewObjectWithGivenProtoAndKinds<PlainObject>(cx, proto, allocKind,
@@ -1760,7 +1751,7 @@
     return false;
   }
 
-  array->ensureDenseInitializedLength(cx, 0, keys.length());
+  array->ensureDenseInitializedLength(0, keys.length());
 
   RootedValue val(cx);
   for (size_t i = 0, len = keys.length(); i < len; i++) {
@@ -2014,7 +2005,7 @@
   /* Create the Object function now that we have a [[Prototype]] for it. */
   JSFunction* fun = NewNativeConstructor(
       cx, obj_construct, 1, HandlePropertyName(cx->names().Object),
-      gc::AllocKind::FUNCTION, SingletonObject);
+      gc::AllocKind::FUNCTION, TenuredObject);
   if (!fun) {
     return nullptr;
   }
@@ -2032,7 +2023,7 @@
    * prototype of the created object.
    */
   RootedPlainObject objectProto(
-      cx, NewSingletonObjectWithGivenProto<PlainObject>(cx, nullptr));
+      cx, NewTenuredObjectWithGivenProto<PlainObject>(cx, nullptr));
   if (!objectProto) {
     return nullptr;
   }
@@ -2045,17 +2036,6 @@
              "should have been able to make a fresh Object.prototype's "
              "[[Prototype]] immutable");
 
-  /*
-   * The default 'new' type of Object.prototype is required by type inference
-   * to have unknown properties, to simplify handling of e.g. heterogenous
-   * objects in JSON and script literals.
-   */
-  ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-  if (!JSObject::setNewGroupUnknown(cx, realm, &PlainObject::class_,
-                                    objectProto)) {
-    return nullptr;
-  }
-
   return objectProto;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/builtin/Promise.cpp firefox-85.0+build1/js/src/builtin/Promise.cpp
--- firefox-84.0.2+build1/js/src/builtin/Promise.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Promise.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -2711,7 +2711,7 @@
       if (!valuesArray) {
         return nullptr;
       }
-      valuesArray->ensureDenseInitializedLength(cx, 0, promiseCount);
+      valuesArray->ensureDenseInitializedLength(0, promiseCount);
 
       values.initialize(valuesArray);
     }
@@ -5702,7 +5702,13 @@
   if (iter.done()) {
     return false;
   }
-  MOZ_ASSERT(iter.isFunctionFrame());
+
+  if (!iter.isFunctionFrame() && iter.isModuleFrame()) {
+    // The iterator is not a function frame, it is a module frame.
+    // Ignore this optimization for now.
+    return true;
+  }
+
   MOZ_ASSERT(iter.calleeTemplate()->isAsync());
 
 #ifdef DEBUG
diff -Nru firefox-84.0.2+build1/js/src/builtin/Reflect.cpp firefox-85.0+build1/js/src/builtin/Reflect.cpp
--- firefox-84.0.2+build1/js/src/builtin/Reflect.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Reflect.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -224,7 +224,7 @@
   if (!proto) {
     return nullptr;
   }
-  return NewSingletonObjectWithGivenProto<PlainObject>(cx, proto);
+  return NewTenuredObjectWithGivenProto<PlainObject>(cx, proto);
 }
 
 static const ClassSpec ReflectClassSpec = {CreateReflectObject, nullptr,
diff -Nru firefox-84.0.2+build1/js/src/builtin/ReflectParse.cpp firefox-85.0+build1/js/src/builtin/ReflectParse.cpp
--- firefox-84.0.2+build1/js/src/builtin/ReflectParse.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/ReflectParse.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -1313,9 +1313,10 @@
                                       bool isMethod, TokenPos* pos,
                                       MutableHandleValue dst) {
   RootedValue kindName(cx);
-  if (!atomValue(
-          kind == PROP_INIT ? "init" : kind == PROP_GETTER ? "get" : "set",
-          &kindName)) {
+  if (!atomValue(kind == PROP_INIT     ? "init"
+                 : kind == PROP_GETTER ? "get"
+                                       : "set",
+                 &kindName)) {
     return false;
   }
 
@@ -1439,10 +1440,10 @@
   MOZ_ASSERT(kind > VARDECL_ERR && kind < VARDECL_LIMIT);
 
   RootedValue array(cx), kindName(cx);
-  if (!newArray(elts, &array) ||
-      !atomValue(
-          kind == VARDECL_CONST ? "const" : kind == VARDECL_LET ? "let" : "var",
-          &kindName)) {
+  if (!newArray(elts, &array) || !atomValue(kind == VARDECL_CONST ? "const"
+                                            : kind == VARDECL_LET ? "let"
+                                                                  : "var",
+                                            &kindName)) {
     return false;
   }
 
@@ -1566,9 +1567,10 @@
                               bool isStatic, TokenPos* pos,
                               MutableHandleValue dst) {
   RootedValue kindName(cx);
-  if (!atomValue(
-          kind == PROP_INIT ? "method" : kind == PROP_GETTER ? "get" : "set",
-          &kindName)) {
+  if (!atomValue(kind == PROP_INIT     ? "method"
+                 : kind == PROP_GETTER ? "get"
+                                       : "set",
+                 &kindName)) {
     return false;
   }
 
@@ -3783,7 +3785,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(cx, allocScope, options,
-                                              compilationInfo.get().stencil);
+                                              compilationInfo.get());
 
   Parser<FullParseHandler, char16_t> parser(
       cx, options, chars.begin().get(), chars.length(),
diff -Nru firefox-84.0.2+build1/js/src/builtin/RegExp.cpp firefox-85.0+build1/js/src/builtin/RegExp.cpp
--- firefox-84.0.2+build1/js/src/builtin/RegExp.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/RegExp.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -85,7 +85,6 @@
     RootedPlainObject groupsTemplate(cx, re->getGroupsTemplate());
     if (groupsTemplate->inDictionaryMode()) {
       groups = NewObjectWithGivenProto<PlainObject>(cx, nullptr);
-      groups->setGroup(groupsTemplate->group());
       groupsInDictionaryMode = true;
     } else {
       JS_TRY_VAR_OR_RETURN_FALSE(
@@ -663,184 +662,133 @@
   return true;
 }
 
-MOZ_ALWAYS_INLINE bool IsRegExpPrototype(HandleValue v, JSContext* cx) {
-  return (v.isObject() &&
-          cx->global()->maybeGetRegExpPrototype() == &v.toObject());
-}
-
-// ES 2017 draft 21.2.5.4.
-MOZ_ALWAYS_INLINE bool regexp_global_impl(JSContext* cx, const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
+// This is a specialized implementation of "UnwrapAndTypeCheckThis" for RegExp
+// getters that need to return a special value for same-realm
+// %RegExp.prototype%.
+template <typename Fn>
+static bool RegExpGetter(JSContext* cx, CallArgs& args, const char* methodName,
+                         Fn&& fn,
+                         HandleValue fallbackValue = UndefinedHandleValue) {
+  JSObject* obj = nullptr;
+  if (args.thisv().isObject()) {
+    obj = &args.thisv().toObject();
+    if (IsWrapper(obj)) {
+      obj = CheckedUnwrapStatic(obj);
+      if (!obj) {
+        ReportAccessDenied(cx);
+        return false;
+      }
+    }
+  }
 
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->global());
-  return true;
-}
+  if (obj) {
+    // Step 4ff
+    if (obj->is<RegExpObject>()) {
+      return fn(&obj->as<RegExpObject>());
+    }
 
-bool js::regexp_global(JSContext* cx, unsigned argc, JS::Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
+    // Step 3.a. "If SameValue(R, %RegExp.prototype%) is true, return
+    // undefined."
+    // Or `return "(?:)"` for get RegExp.prototype.source.
+    if (obj == cx->global()->maybeGetRegExpPrototype()) {
+      args.rval().set(fallbackValue);
+      return true;
+    }
 
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
-    return true;
+    // fall-through
   }
 
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_global_impl>(cx, args);
+  // Step 2. and Step 3.b.
+  JS_ReportErrorNumberLatin1(cx, GetErrorMessage, nullptr,
+                             JSMSG_INCOMPATIBLE_REGEXP_GETTER, methodName,
+                             InformalValueTypeName(args.thisv()));
+  return false;
 }
 
-// ES 2017 draft 21.2.5.5.
-MOZ_ALWAYS_INLINE bool regexp_ignoreCase_impl(JSContext* cx,
-                                              const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->ignoreCase());
-  return true;
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.5 get RegExp.prototype.global
+bool js::regexp_global(JSContext* cx, unsigned argc, JS::Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return RegExpGetter(cx, args, "global", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->global());
+    return true;
+  });
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.6 get RegExp.prototype.ignoreCase
 bool js::regexp_ignoreCase(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
+  return RegExpGetter(cx, args, "ignoreCase", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->ignoreCase());
     return true;
-  }
-
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_ignoreCase_impl>(cx, args);
-}
-
-// ES 2017 draft 21.2.5.7.
-MOZ_ALWAYS_INLINE bool regexp_multiline_impl(JSContext* cx,
-                                             const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->multiline());
-  return true;
+  });
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.9 get RegExp.prototype.multiline
 bool js::regexp_multiline(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
+  return RegExpGetter(cx, args, "multiline", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->multiline());
     return true;
-  }
-
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_multiline_impl>(cx, args);
-}
-
-// ES 2017 draft 21.2.5.10.
-MOZ_ALWAYS_INLINE bool regexp_source_impl(JSContext* cx, const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Step 5.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  RootedAtom src(cx, reObj->getSource());
-  if (!src) {
-    return false;
-  }
-
-  // Step 7.
-  JSString* str = EscapeRegExpPattern(cx, src);
-  if (!str) {
-    return false;
-  }
-
-  args.rval().setString(str);
-  return true;
+  });
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.12 get RegExp.prototype.source
 static bool regexp_source(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
+  // Step 3.a. Return "(?:)" for %RegExp.prototype%.
+  RootedValue fallback(cx, StringValue(cx->names().emptyRegExp));
+  return RegExpGetter(
+      cx, args, "source",
+      [cx, args](RegExpObject* unwrapped) {
+        RootedAtom src(cx, unwrapped->getSource());
+        MOZ_ASSERT(src);
+        // Mark potentially cross-compartment JSAtom.
+        cx->markAtom(src);
+
+        // Step 7.
+        JSString* escaped = EscapeRegExpPattern(cx, src);
+        if (!escaped) {
+          return false;
+        }
 
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setString(cx->names().emptyRegExp);
-    return true;
-  }
-
-  // Steps 1-4.
-  return CallNonGenericMethod<IsRegExpObject, regexp_source_impl>(cx, args);
-}
-
-// ES 2020 draft 21.2.5.3.
-MOZ_ALWAYS_INLINE bool regexp_dotAll_impl(JSContext* cx, const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->dotAll());
-  return true;
+        args.rval().setString(escaped);
+        return true;
+      },
+      fallback);
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.3 get RegExp.prototype.dotAll
 bool js::regexp_dotAll(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
+  return RegExpGetter(cx, args, "dotAll", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->dotAll());
     return true;
-  }
-
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_dotAll_impl>(cx, args);
-}
-
-// ES 2017 draft 21.2.5.12.
-MOZ_ALWAYS_INLINE bool regexp_sticky_impl(JSContext* cx, const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->sticky());
-  return true;
+  });
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.14 get RegExp.prototype.sticky
 bool js::regexp_sticky(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
+  return RegExpGetter(cx, args, "sticky", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->sticky());
     return true;
-  }
-
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_sticky_impl>(cx, args);
-}
-
-// ES 2017 draft 21.2.5.15.
-MOZ_ALWAYS_INLINE bool regexp_unicode_impl(JSContext* cx,
-                                           const CallArgs& args) {
-  MOZ_ASSERT(IsRegExpObject(args.thisv()));
-
-  // Steps 4-6.
-  RegExpObject* reObj = &args.thisv().toObject().as<RegExpObject>();
-  args.rval().setBoolean(reObj->unicode());
-  return true;
+  });
 }
 
+// ES2021 draft rev 0b3a808af87a9123890767152a26599cc8fde161
+// 21.2.5.17 get RegExp.prototype.unicode
 bool js::regexp_unicode(JSContext* cx, unsigned argc, JS::Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-
-  // Step 3.a.
-  if (IsRegExpPrototype(args.thisv(), cx)) {
-    args.rval().setUndefined();
+  return RegExpGetter(cx, args, "unicode", [args](RegExpObject* unwrapped) {
+    args.rval().setBoolean(unwrapped->unicode());
     return true;
-  }
-
-  // Steps 1-3.
-  return CallNonGenericMethod<IsRegExpObject, regexp_unicode_impl>(cx, args);
+  });
 }
 
 const JSPropertySpec js::regexp_properties[] = {
diff -Nru firefox-84.0.2+build1/js/src/builtin/SelfHostingDefines.h firefox-85.0+build1/js/src/builtin/SelfHostingDefines.h
--- firefox-84.0.2+build1/js/src/builtin/SelfHostingDefines.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/SelfHostingDefines.h	2021-01-18 19:58:12.000000000 +0000
@@ -110,6 +110,9 @@
 #define MODULE_OBJECT_EVALUATION_ERROR_SLOT 4
 #define MODULE_OBJECT_DFS_INDEX_SLOT 14
 #define MODULE_OBJECT_DFS_ANCESTOR_INDEX_SLOT 15
+#define MODULE_OBJECT_ASYNC_EVALUATING_SLOT 17
+#define MODULE_OBJECT_TOP_LEVEL_CAPABILITY_SLOT 18
+#define MODULE_OBJECT_PENDING_ASYNC_DEPENDENCIES_SLOT 20
 
 // rev b012019fea18f29737a67c36911340a3e25bfc63
 // 15.2.1.16 Cyclic Module Records
diff -Nru firefox-84.0.2+build1/js/src/builtin/Stream.cpp firefox-85.0+build1/js/src/builtin/Stream.cpp
--- firefox-84.0.2+build1/js/src/builtin/Stream.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/Stream.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,7 +29,7 @@
 #include "vm/PromiseObject.h"  // js::PromiseObject, js::PromiseResolvedWithUndefined
 #include "vm/SelfHosting.h"
 
-#include "builtin/streams/HandlerFunction-inl.h"  // js::NewHandler
+#include "builtin/HandlerFunction-inl.h"  // js::NewHandler
 #include "builtin/streams/ReadableStreamReader-inl.h"  // js::Unwrap{ReaderFromStream{,NoThrow},StreamFromReader}
 #include "vm/Compartment-inl.h"
 #include "vm/List-inl.h"  // js::ListObject, js::StoreNewListInFixedSlot
@@ -421,7 +421,7 @@
 
     MOZ_RELEASE_ASSERT(unwrappedStream->mode() ==
                        JS::ReadableStreamMode::ExternalSource);
-#if 0   // disable user-defined byte streams
+#if 0  // disable user-defined byte streams
         if (unwrappedStream->mode() == JS::ReadableStreamMode::ExternalSource)
 #endif  // user-defined byte streams
     {
@@ -448,7 +448,7 @@
       queueTotalSize = queueTotalSize - bytesWritten;
     }
 
-#if 0   // disable user-defined byte streams
+#if 0  // disable user-defined byte streams
         else {
             // Step 3.b: Let entry be the first element of this.[[queue]].
             // Step 3.c: Remove entry from this.[[queue]], shifting all other
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/HandlerFunction-inl.h firefox-85.0+build1/js/src/builtin/streams/HandlerFunction-inl.h
--- firefox-84.0.2+build1/js/src/builtin/streams/HandlerFunction-inl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/HandlerFunction-inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +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/. */
-
-/*
- * Stream handler for operations that act on a target object, and possibly upon
- * an extra value.
- */
-
-#ifndef builtin_streams_HandlerFunction_inl_h
-#define builtin_streams_HandlerFunction_inl_h
-
-#include "mozilla/Attributes.h"  // MOZ_MUST_USE
-
-#include <stddef.h>  // size_t
-
-#include "gc/AllocKind.h"    // js::gc::AllocKind
-#include "js/CallArgs.h"     // JS::CallArgs
-#include "js/RootingAPI.h"   // JS::Handle, JS::Rooted
-#include "js/Value.h"        // JS::ObjectValue
-#include "vm/JSContext.h"    // JSContext
-#include "vm/JSFunction.h"   // JSFunction, js::Native, js::NewNativeFunction
-#include "vm/JSObject.h"     // JSObject
-#include "vm/ObjectGroup.h"  // js::GenericObject
-#include "vm/StringType.h"   // js::PropertyName
-
-#include "vm/JSContext-inl.h"  // JSContext::check
-
-namespace js {
-
-// Handler functions are extended functions, that close over a target object and
-// (optionally) over an extra object, storing those objects in the function's
-// extended slots.
-constexpr size_t StreamHandlerFunctionSlot_Target = 0;
-constexpr size_t StreamHandlerFunctionSlot_Extra = 1;
-
-static_assert(StreamHandlerFunctionSlot_Extra <
-                  FunctionExtended::NUM_EXTENDED_SLOTS,
-              "handler function slots shouldn't exceed available extended "
-              "slots");
-
-inline MOZ_MUST_USE JSFunction* NewHandler(JSContext* cx, Native handler,
-                                           JS::Handle<JSObject*> target) {
-  cx->check(target);
-
-  JS::Handle<PropertyName*> funName = cx->names().empty;
-  JS::Rooted<JSFunction*> handlerFun(
-      cx, NewNativeFunction(cx, handler, 0, funName,
-                            gc::AllocKind::FUNCTION_EXTENDED, GenericObject));
-  if (!handlerFun) {
-    return nullptr;
-  }
-  handlerFun->setExtendedSlot(StreamHandlerFunctionSlot_Target,
-                              JS::ObjectValue(*target));
-  return handlerFun;
-}
-
-inline MOZ_MUST_USE JSFunction* NewHandlerWithExtra(
-    JSContext* cx, Native handler, JS::Handle<JSObject*> target,
-    JS::Handle<JSObject*> extra) {
-  cx->check(extra);
-  JSFunction* handlerFun = NewHandler(cx, handler, target);
-  if (handlerFun) {
-    handlerFun->setExtendedSlot(StreamHandlerFunctionSlot_Extra,
-                                JS::ObjectValue(*extra));
-  }
-  return handlerFun;
-}
-
-inline MOZ_MUST_USE JSFunction* NewHandlerWithExtraValue(
-    JSContext* cx, Native handler, JS::Handle<JSObject*> target,
-    JS::Handle<JS::Value> extra) {
-  cx->check(extra);
-  JSFunction* handlerFun = NewHandler(cx, handler, target);
-  if (handlerFun) {
-    handlerFun->setExtendedSlot(StreamHandlerFunctionSlot_Extra, extra);
-  }
-  return handlerFun;
-}
-
-/**
- * Within the call of a handler function that "closes over" a target value that
- * is always a |T*| object (and never a wrapper around one), return that |T*|.
- */
-template <class T>
-inline MOZ_MUST_USE T* TargetFromHandler(const JS::CallArgs& args) {
-  JSFunction& func = args.callee().as<JSFunction>();
-  return &func.getExtendedSlot(StreamHandlerFunctionSlot_Target)
-              .toObject()
-              .as<T>();
-}
-
-/**
- * Within the call of a handler function that "closes over" a target value and
- * an extra value, return that extra value.
- */
-inline MOZ_MUST_USE JS::Value ExtraValueFromHandler(const JS::CallArgs& args) {
-  JSFunction& func = args.callee().as<JSFunction>();
-  return func.getExtendedSlot(StreamHandlerFunctionSlot_Extra);
-}
-
-/**
- * Within the call of a handler function that "closes over" a target value and
- * an extra value, where that extra value is always a |T*| object (and never a
- * wrapper around one), return that |T*|.
- */
-template <class T>
-inline MOZ_MUST_USE T* ExtraFromHandler(const JS::CallArgs& args) {
-  return &ExtraValueFromHandler(args).toObject().as<T>();
-}
-
-}  // namespace js
-
-#endif  // builtin_streams_HandlerFunction_inl_h
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/PipeToState.cpp firefox-85.0+build1/js/src/builtin/streams/PipeToState.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/PipeToState.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/PipeToState.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -31,7 +31,7 @@
 #include "vm/PromiseObject.h"  // js::PromiseObject
 #include "vm/Runtime.h"        // JSRuntime
 
-#include "builtin/streams/HandlerFunction-inl.h"  // js::ExtraValueFromHandler, js::NewHandler{,WithExtraValue}, js::TargetFromHandler
+#include "builtin/HandlerFunction-inl.h"  // js::ExtraValueFromHandler, js::NewHandler{,WithExtraValue}, js::TargetFromHandler
 #include "builtin/streams/ReadableStreamReader-inl.h"  // js::UnwrapReaderFromStream, js::UnwrapStreamFromReader
 #include "builtin/streams/WritableStream-inl.h"  // js::UnwrapWriterFromStream
 #include "builtin/streams/WritableStreamDefaultWriter-inl.h"  // js::UnwrapStreamFromWriter
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamDefaultController.cpp firefox-85.0+build1/js/src/builtin/streams/ReadableStreamDefaultController.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamDefaultController.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/ReadableStreamDefaultController.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -34,7 +34,7 @@
 #include "vm/PromiseObject.h"  // js::PromiseObject, js::PromiseResolvedWithUndefined
 #include "vm/SelfHosting.h"
 
-#include "builtin/streams/HandlerFunction-inl.h"  // js::TargetFromHandler
+#include "builtin/HandlerFunction-inl.h"  // js::TargetFromHandler
 #include "builtin/streams/MiscellaneousOperations-inl.h"  // js::PromiseCall
 #include "builtin/streams/ReadableStreamReader-inl.h"  // js::UnwrapReaderFromStream
 #include "vm/Compartment-inl.h"  // JS::Compartment::wrap, js::UnwrapAnd{DowncastObject,TypeCheckThis}
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamDefaultControllerOperations.cpp firefox-85.0+build1/js/src/builtin/streams/ReadableStreamDefaultControllerOperations.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamDefaultControllerOperations.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/ReadableStreamDefaultControllerOperations.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -34,7 +34,7 @@
 #include "vm/Runtime.h"        // JSAtomState
 #include "vm/SavedFrame.h"  // js::SavedFrame
 
-#include "builtin/streams/HandlerFunction-inl.h"          // js::NewHandler
+#include "builtin/HandlerFunction-inl.h"                  // js::NewHandler
 #include "builtin/streams/MiscellaneousOperations-inl.h"  // js::PromiseCall
 #include "vm/Compartment-inl.h"  // JS::Compartment::wrap, js::UnwrapCalleeSlot
 #include "vm/JSContext-inl.h"    // JSContext::check
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamOperations.cpp firefox-85.0+build1/js/src/builtin/streams/ReadableStreamOperations.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/ReadableStreamOperations.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/ReadableStreamOperations.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,7 +29,7 @@
 #include "vm/ObjectOperations.h"  // js::GetProperty
 #include "vm/PromiseObject.h"  // js::PromiseObject, js::PromiseResolvedWithUndefined
 
-#include "builtin/streams/HandlerFunction-inl.h"  // js::NewHandler, js::TargetFromHandler
+#include "builtin/HandlerFunction-inl.h"  // js::NewHandler, js::TargetFromHandler
 #include "builtin/streams/MiscellaneousOperations-inl.h"  // js::ResolveUnwrappedPromiseWithValue
 #include "builtin/streams/ReadableStreamReader-inl.h"  // js::UnwrapReaderFromStream
 #include "vm/Compartment-inl.h"  // JS::Compartment::wrap, js::Unwrap{Callee,Internal}Slot
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/WritableStreamDefaultControllerOperations.cpp firefox-85.0+build1/js/src/builtin/streams/WritableStreamDefaultControllerOperations.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/WritableStreamDefaultControllerOperations.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/WritableStreamDefaultControllerOperations.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -29,7 +29,7 @@
 #include "vm/PromiseObject.h"  // js::PromiseObject, js::PromiseResolvedWithUndefined
 #include "vm/Runtime.h"        // JSAtomState
 
-#include "builtin/streams/HandlerFunction-inl.h"  // js::TargetFromHandler
+#include "builtin/HandlerFunction-inl.h"  // js::TargetFromHandler
 #include "builtin/streams/MiscellaneousOperations-inl.h"  // js::PromiseCall
 #include "builtin/streams/QueueWithSizes-inl.h"           // js::PeekQueueValue
 #include "vm/Compartment-inl.h"  // JS::Compartment::wrap
diff -Nru firefox-84.0.2+build1/js/src/builtin/streams/WritableStreamOperations.cpp firefox-85.0+build1/js/src/builtin/streams/WritableStreamOperations.cpp
--- firefox-84.0.2+build1/js/src/builtin/streams/WritableStreamOperations.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/streams/WritableStreamOperations.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -30,8 +30,8 @@
 #include "vm/List.h"         // js::ListObject
 #include "vm/PromiseObject.h"  // js::PromiseObject, js::PromiseResolvedWithUndefined
 
-#include "builtin/Promise-inl.h"  // js::SetSettledPromiseIsHandled
-#include "builtin/streams/HandlerFunction-inl.h"  // js::NewHandler, js::TargetFromHandler
+#include "builtin/HandlerFunction-inl.h"  // js::NewHandler, js::TargetFromHandler
+#include "builtin/Promise-inl.h"          // js::SetSettledPromiseIsHandled
 #include "builtin/streams/MiscellaneousOperations-inl.h"  // js::ResolveUnwrappedPromiseWithUndefined, js::RejectUnwrappedPromiseWithError
 #include "builtin/streams/WritableStream-inl.h"  // js::UnwrapWriterFromStream
 #include "builtin/streams/WritableStreamDefaultWriter-inl.h"  // js::WritableStreamDefaultWriter::closedPromise
diff -Nru firefox-84.0.2+build1/js/src/builtin/String.cpp firefox-85.0+build1/js/src/builtin/String.cpp
--- firefox-84.0.2+build1/js/src/builtin/String.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/String.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -65,7 +65,6 @@
 #include "vm/Interpreter-inl.h"
 #include "vm/StringObject-inl.h"
 #include "vm/StringType-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 
@@ -3299,30 +3298,9 @@
   return ReplaceAll<Latin1Char, Latin1Char>(cx, str, search, repl);
 }
 
-static ArrayObject* NewFullyAllocatedStringArray(JSContext* cx,
-                                                 HandleObjectGroup group,
-                                                 uint32_t length) {
-  ArrayObject* array = NewFullyAllocatedArrayTryUseGroup(cx, group, length);
-  if (!array) {
-    return nullptr;
-  }
-
-  // Only string values will be added to this array. Inform TI early about
-  // the element type, so we can directly initialize all elements using
-  // NativeObject::initDenseElement() instead of the slightly more expensive
-  // NativeObject::initDenseElementWithType() method.
-  // Since this function is never called to create a zero-length array, it's
-  // always necessary and correct to call AddTypePropertyId here.
-  MOZ_ASSERT(length > 0);
-  AddTypePropertyId(cx, array, JSID_VOID, TypeSet::StringType());
-
-  return array;
-}
-
 static ArrayObject* SingleElementStringArray(JSContext* cx,
-                                             HandleObjectGroup group,
                                              HandleLinearString str) {
-  ArrayObject* array = NewFullyAllocatedStringArray(cx, group, 1);
+  ArrayObject* array = NewDenseFullyAllocatedArray(cx, 1);
   if (!array) {
     return nullptr;
   }
@@ -3333,8 +3311,7 @@
 
 // ES 2016 draft Mar 25, 2016 21.1.3.17 steps 4, 8, 12-18.
 static ArrayObject* SplitHelper(JSContext* cx, HandleLinearString str,
-                                uint32_t limit, HandleLinearString sep,
-                                HandleObjectGroup group) {
+                                uint32_t limit, HandleLinearString sep) {
   size_t strLength = str->length();
   size_t sepLength = sep->length();
   MOZ_ASSERT(sepLength != 0);
@@ -3346,11 +3323,11 @@
 
     // Step 12.b.
     if (match != -1) {
-      return NewFullyAllocatedArrayTryUseGroup(cx, group, 0);
+      return NewDenseEmptyArray(cx);
     }
 
     // Steps 12.c-e.
-    return SingleElementStringArray(cx, group, str);
+    return SingleElementStringArray(cx, str);
   }
 
   // Step 3 (reordered).
@@ -3409,8 +3386,7 @@
 
     // Step 14.c.ii.5.
     if (splits.length() == limit) {
-      return NewCopiedArrayTryUseGroup(cx, group, splits.begin(),
-                                       splits.length());
+      return NewDenseCopiedArray(cx, splits.length(), splits.begin());
     }
 
     // Step 14.c.ii.6.
@@ -3430,15 +3406,15 @@
   }
 
   // Step 18.
-  return NewCopiedArrayTryUseGroup(cx, group, splits.begin(), splits.length());
+  return NewDenseCopiedArray(cx, splits.length(), splits.begin());
 }
 
 // Fast-path for splitting a string into a character array via split("").
 static ArrayObject* CharSplitHelper(JSContext* cx, HandleLinearString str,
-                                    uint32_t limit, HandleObjectGroup group) {
+                                    uint32_t limit) {
   size_t strLength = str->length();
   if (strLength == 0) {
-    return NewFullyAllocatedArrayTryUseGroup(cx, group, 0);
+    return NewDenseEmptyArray(cx);
   }
 
   js::StaticStrings& staticStrings = cx->staticStrings();
@@ -3447,8 +3423,7 @@
              "Neither limit nor strLength is zero, so resultlen is greater "
              "than zero.");
 
-  RootedArrayObject splits(cx,
-                           NewFullyAllocatedStringArray(cx, group, resultlen));
+  RootedArrayObject splits(cx, NewDenseFullyAllocatedArray(cx, resultlen));
   if (!splits) {
     return nullptr;
   }
@@ -3464,7 +3439,7 @@
       splits->initDenseElement(i, StringValue(staticStrings.getUnit(c)));
     }
   } else {
-    splits->ensureDenseInitializedLength(cx, 0, resultlen);
+    splits->ensureDenseInitializedLength(0, resultlen);
 
     for (size_t i = 0; i < resultlen; ++i) {
       JSString* sub = staticStrings.getUnitStringForElement(cx, str, i);
@@ -3481,7 +3456,7 @@
 template <typename TextChar>
 static MOZ_ALWAYS_INLINE ArrayObject* SplitSingleCharHelper(
     JSContext* cx, HandleLinearString str, const TextChar* text,
-    uint32_t textLen, char16_t patCh, HandleObjectGroup group) {
+    uint32_t textLen, char16_t patCh) {
   // Count the number of occurrences of patCh within text.
   uint32_t count = 0;
   for (size_t index = 0; index < textLen; index++) {
@@ -3492,16 +3467,15 @@
 
   // Handle zero-occurrence case - return input string in an array.
   if (count == 0) {
-    return SingleElementStringArray(cx, group, str);
+    return SingleElementStringArray(cx, str);
   }
 
   // Create the result array for the substring values.
-  RootedArrayObject splits(cx,
-                           NewFullyAllocatedStringArray(cx, group, count + 1));
+  RootedArrayObject splits(cx, NewDenseFullyAllocatedArray(cx, count + 1));
   if (!splits) {
     return nullptr;
   }
-  splits->ensureDenseInitializedLength(cx, 0, count + 1);
+  splits->ensureDenseInitializedLength(0, count + 1);
 
   // Add substrings.
   uint32_t splitsIndex = 0;
@@ -3531,8 +3505,7 @@
 
 // ES 2016 draft Mar 25, 2016 21.1.3.17 steps 4, 8, 12-18.
 static ArrayObject* SplitSingleCharHelper(JSContext* cx, HandleLinearString str,
-                                          char16_t ch,
-                                          HandleObjectGroup group) {
+                                          char16_t ch) {
   // Step 12.
   size_t strLength = str->length();
 
@@ -3543,14 +3516,15 @@
 
   if (linearChars.isLatin1()) {
     return SplitSingleCharHelper(cx, str, linearChars.latin1Chars(), strLength,
-                                 ch, group);
+                                 ch);
   }
 
   return SplitSingleCharHelper(cx, str, linearChars.twoByteChars(), strLength,
-                               ch, group);
+                               ch);
 }
 
 // ES 2016 draft Mar 25, 2016 21.1.3.17 steps 4, 8, 12-18.
+// TODO(no-TI): remove unused group argument.
 ArrayObject* js::StringSplitString(JSContext* cx, HandleObjectGroup group,
                                    HandleString str, HandleString sep,
                                    uint32_t limit) {
@@ -3567,15 +3541,15 @@
   }
 
   if (linearSep->length() == 0) {
-    return CharSplitHelper(cx, linearStr, limit, group);
+    return CharSplitHelper(cx, linearStr, limit);
   }
 
   if (linearSep->length() == 1 && limit >= static_cast<uint32_t>(INT32_MAX)) {
     char16_t ch = linearSep->latin1OrTwoByteChar(0);
-    return SplitSingleCharHelper(cx, linearStr, ch, group);
+    return SplitSingleCharHelper(cx, linearStr, ch);
   }
 
-  return SplitHelper(cx, linearStr, limit, linearSep, group);
+  return SplitHelper(cx, linearStr, limit, linearSep);
 }
 
 static const JSFunctionSpec string_methods[] = {
@@ -3625,6 +3599,10 @@
     JS_SELF_HOSTED_FN("concat", "String_concat", 1, 0),
     JS_SELF_HOSTED_FN("slice", "String_slice", 2, 0),
 
+#ifdef NIGHTLY_BUILD
+    JS_SELF_HOSTED_FN("at", "String_at", 1, 0),
+#endif
+
     /* HTML string methods. */
     JS_SELF_HOSTED_FN("bold", "String_bold", 0, 0),
     JS_SELF_HOSTED_FN("italics", "String_italics", 0, 0),
diff -Nru firefox-84.0.2+build1/js/src/builtin/String.js firefox-85.0+build1/js/src/builtin/String.js
--- firefox-84.0.2+build1/js/src/builtin/String.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/String.js	2021-01-18 19:58:12.000000000 +0000
@@ -937,6 +937,39 @@
     return resultString;
 }
 
+// https://github.com/tc39/proposal-relative-indexing-method
+// String.prototype.at ( index )
+function String_at(index) {
+    // Step 1.
+    if (this === undefined || this === null)
+        ThrowIncompatibleMethod("at", this);
+
+    // Step 2.
+    var string = ToString(this);
+
+    // Step 3.
+    var len = string.length;
+
+    // Step 4.
+    var relativeIndex = ToInteger(index);
+
+    // Steps 5-6.
+    var k;
+    if (relativeIndex >= 0) {
+        k = relativeIndex;
+    } else {
+        k = len + relativeIndex;
+    }
+
+    // Step 7.
+    if (k < 0 || k >= len) {
+        return undefined;
+    }
+
+    // Step 8.
+    return string[k];
+}
+
 // ES6 draft 2014-04-27 B.2.3.3
 function String_big() {
     if (this === undefined || this === null)
diff -Nru firefox-84.0.2+build1/js/src/builtin/TestingFunctions.cpp firefox-85.0+build1/js/src/builtin/TestingFunctions.cpp
--- firefox-84.0.2+build1/js/src/builtin/TestingFunctions.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/TestingFunctions.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Casting.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Span.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/TextUtils.h"
@@ -50,6 +51,7 @@
 #include "jit/BaselineJIT.h"
 #include "jit/Disassemble.h"
 #include "jit/InlinableNatives.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/JitRuntime.h"
 #include "jit/TrialInlining.h"
@@ -88,6 +90,7 @@
 #  include "unicode/utypes.h"
 #  include "unicode/uversion.h"
 #endif
+#include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
 #include "vm/AsyncFunction.h"
@@ -185,6 +188,12 @@
     return false;
   }
 
+  bool topLevelAwait = cx->options().topLevelAwait();
+  if (!JS_SetProperty(cx, info, "topLevelAwait",
+                      topLevelAwait ? TrueHandleValue : FalseHandleValue)) {
+    return false;
+  }
+
   bool offThreadParseGlobal = js::UseOffThreadParseGlobal();
   if (!JS_SetProperty(
           cx, info, "offThreadParseGlobal",
@@ -417,15 +426,6 @@
     return false;
   }
 
-#ifdef JS_MORE_DETERMINISTIC
-  value = BooleanValue(true);
-#else
-  value = BooleanValue(false);
-#endif
-  if (!JS_SetProperty(cx, info, "more-deterministic", value)) {
-    return false;
-  }
-
 #ifdef MOZ_PROFILING
   value = BooleanValue(true);
 #else
@@ -497,7 +497,8 @@
 
 static bool IsTypeInferenceEnabled(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-  args.rval().setBoolean(js::IsTypeInferenceEnabled());
+  // TODO(no-TI): remove testing function.
+  args.rval().setBoolean(false);
   return true;
 }
 
@@ -557,7 +558,7 @@
         return false;
       }
     } else if (arg.isObject()) {
-      PrepareZoneForGC(UncheckedUnwrap(&arg.toObject())->zone());
+      PrepareZoneForGC(cx, UncheckedUnwrap(&arg.toObject())->zone());
       zone = true;
     }
   }
@@ -586,9 +587,7 @@
     }
   }
 
-#ifndef JS_MORE_DETERMINISTIC
   size_t preBytes = cx->runtime()->gc.heapSize.bytes();
-#endif
 
   if (zone) {
     PrepareForDebugGC(cx->runtime());
@@ -599,10 +598,10 @@
   JS::NonIncrementalGC(cx, gckind, reason);
 
   char buf[256] = {'\0'};
-#ifndef JS_MORE_DETERMINISTIC
-  SprintfLiteral(buf, "before %zu, after %zu\n", preBytes,
-                 cx->runtime()->gc.heapSize.bytes());
-#endif
+  if (!js::SupportDifferentialTesting()) {
+    SprintfLiteral(buf, "before %zu, after %zu\n", preBytes,
+                   cx->runtime()->gc.heapSize.bytes());
+  }
   return ReturnStringCopy(cx, args, buf);
 }
 
@@ -854,6 +853,12 @@
   return true;
 }
 
+static bool WasmExceptionsEnabled(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  args.rval().setBoolean(wasm::ExceptionsAvailable(cx));
+  return true;
+}
+
 static bool WasmMultiValueEnabled(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setBoolean(wasm::MultiValuesAvailable(cx));
@@ -1752,7 +1757,7 @@
   if (args[0].isObject()) {
     // Ensure that |zone| is collected during the next GC.
     Zone* zone = UncheckedUnwrap(&args[0].toObject())->zone();
-    PrepareZoneForGC(zone);
+    PrepareZoneForGC(cx, zone);
   } else if (args[0].isString()) {
     // This allows us to schedule the atoms zone for GC.
     Zone* zone = args[0].toString()->zoneFromAnyThread();
@@ -1761,7 +1766,7 @@
       ReportUsageErrorASCII(cx, callee, "Specified zone not accessible for GC");
       return false;
     }
-    PrepareZoneForGC(zone);
+    PrepareZoneForGC(cx, zone);
   } else {
     RootedObject callee(cx, &args.callee());
     ReportUsageErrorASCII(cx, callee,
@@ -3057,11 +3062,11 @@
 }
 
 static bool Terminate(JSContext* cx, unsigned arg, Value* vp) {
-#ifdef JS_MORE_DETERMINISTIC
-  // Print a message to stderr in more-deterministic builds to help jsfunfuzz
+  // Print a message to stderr in differential testing to help jsfunfuzz
   // find uncatchable-exception bugs.
-  fprintf(stderr, "terminate called\n");
-#endif
+  if (js::SupportDifferentialTesting()) {
+    fprintf(stderr, "terminate called\n");
+  }
 
   JS_ClearPendingException(cx);
   return false;
@@ -3339,6 +3344,22 @@
   return true;
 }
 
+static bool testingFunc_invalidate(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+
+  // If the topmost frame is Ion/Warp, find the IonScript and invalidate it.
+  FrameIter iter(cx);
+  if (!iter.done() && iter.isIon()) {
+    while (!iter.isPhysicalJitFrame()) {
+      ++iter;
+    }
+    js::jit::Invalidate(cx, iter.script());
+  }
+
+  args.rval().setUndefined();
+  return true;
+}
+
 static constexpr unsigned JitWarmupResetLimit = 20;
 static_assert(JitWarmupResetLimit <=
                   unsigned(JSScript::MutableFlags::WarmupResets_MASK),
@@ -3946,16 +3967,18 @@
 
 static bool HelperThreadCount(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-#ifdef JS_MORE_DETERMINISTIC
-  // Always return 0 to get consistent output with and without --no-threads.
-  args.rval().setInt32(0);
-#else
+
+  if (js::SupportDifferentialTesting()) {
+    // Always return 0 to get consistent output with and without --no-threads.
+    args.rval().setInt32(0);
+    return true;
+  }
+
   if (CanUseExtraThreads()) {
     args.rval().setInt32(HelperThreadState().threadCount);
   } else {
     args.rval().setInt32(0);
   }
-#endif
   return true;
 }
 
@@ -4038,6 +4061,14 @@
 #ifdef NIGHTLY_BUILD
 static bool ObjectAddress(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
+
+  if (js::SupportDifferentialTesting()) {
+    RootedObject callee(cx, &args.callee());
+    ReportUsageErrorASCII(cx, callee,
+                          "Function unavailable in differential testing mode.");
+    return false;
+  }
+
   if (args.length() != 1) {
     RootedObject callee(cx, &args.callee());
     ReportUsageErrorASCII(cx, callee, "Wrong number of arguments");
@@ -4049,20 +4080,23 @@
     return false;
   }
 
-#  ifdef JS_MORE_DETERMINISTIC
-  args.rval().setInt32(0);
-  return true;
-#  else
   void* ptr = js::UncheckedUnwrap(&args[0].toObject(), true);
   char buffer[64];
   SprintfLiteral(buffer, "%p", ptr);
 
   return ReturnStringCopy(cx, args, buffer);
-#  endif
 }
 
 static bool SharedAddress(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
+
+  if (js::SupportDifferentialTesting()) {
+    RootedObject callee(cx, &args.callee());
+    ReportUsageErrorASCII(cx, callee,
+                          "Function unavailable in differential testing mode.");
+    return false;
+  }
+
   if (args.length() != 1) {
     RootedObject callee(cx, &args.callee());
     ReportUsageErrorASCII(cx, callee, "Wrong number of arguments");
@@ -4074,9 +4108,6 @@
     return false;
   }
 
-#  ifdef JS_MORE_DETERMINISTIC
-  args.rval().setString(cx->staticStrings().getUint(0));
-#  else
   RootedObject obj(cx, CheckedUnwrapStatic(&args[0].toObject()));
   if (!obj) {
     ReportAccessDenied(cx);
@@ -4098,7 +4129,6 @@
   }
 
   args.rval().setString(str);
-#  endif
 
   return true;
 }
@@ -4385,7 +4415,7 @@
   if (!result) {
     return false;
   }
-  result->ensureDenseInitializedLength(cx, 0, length);
+  result->ensureDenseInitializedLength(0, length);
 
   // Walk |nodes| and |edges| in the stored order, and construct the result
   // array in start-to-target order.
@@ -4582,7 +4612,7 @@
   if (!results) {
     return false;
   }
-  results->ensureDenseInitializedLength(cx, 0, length);
+  results->ensureDenseInitializedLength(0, length);
 
   for (size_t i = 0; i < length; i++) {
     size_t numPaths = values[i].length();
@@ -4592,7 +4622,7 @@
     if (!pathsArray) {
       return false;
     }
-    pathsArray->ensureDenseInitializedLength(cx, 0, numPaths);
+    pathsArray->ensureDenseInitializedLength(0, numPaths);
 
     for (size_t j = 0; j < numPaths; j++) {
       size_t pathLength = values[i][j].length();
@@ -4602,7 +4632,7 @@
       if (!path) {
         return false;
       }
-      path->ensureDenseInitializedLength(cx, 0, pathLength);
+      path->ensureDenseInitializedLength(0, pathLength);
 
       for (size_t k = 0; k < pathLength; k++) {
         RootedPlainObject part(cx, NewBuiltinClassInstance<PlainObject>(cx));
@@ -5054,7 +5084,9 @@
 
   /* Instantiate the stencil. */
   Rooted<frontend::CompilationGCOutput> output(cx);
-  if (!compilationInfos.get().instantiateStencils(cx, output.get())) {
+  Rooted<frontend::CompilationGCOutput> outputForDelazification(cx);
+  if (!compilationInfos.get().instantiateStencils(
+          cx, output.get(), outputForDelazification.get())) {
     return false;
   }
 
@@ -5323,6 +5355,24 @@
 }
 #endif  // DEBUG
 
+static bool NurseryStringsEnabled(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  args.rval().setBoolean(cx->zone()->allocNurseryStrings);
+  return true;
+}
+
+static bool IsNurseryAllocated(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  if (!args.get(0).isGCThing()) {
+    JS_ReportErrorASCII(
+        cx, "The function takes one argument, which must be a GC thing");
+    return false;
+  }
+
+  args.rval().setBoolean(IsInsideNursery(args[0].toGCThing()));
+  return true;
+}
+
 static bool GetLcovInfo(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -5960,117 +6010,6 @@
   return true;
 }
 
-static bool MonitorType(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  RootedObject callee(cx, &args.callee());
-
-  // First argument must be either a scripted function or null/undefined (in
-  // this case we use the caller's script).
-  RootedFunction fun(cx);
-  RootedScript script(cx);
-  if (args.get(0).isNullOrUndefined()) {
-    script = cx->currentScript();
-    if (!script) {
-      ReportUsageErrorASCII(cx, callee, "No scripted caller");
-      return false;
-    }
-  } else {
-    if (!IsFunctionObject(args.get(0), fun.address()) ||
-        !fun->isInterpreted()) {
-      ReportUsageErrorASCII(
-          cx, callee,
-          "First argument must be a scripted function or null/undefined");
-      return false;
-    }
-
-    script = JSFunction::getOrCreateScript(cx, fun);
-    if (!script) {
-      return false;
-    }
-  }
-
-  int32_t index;
-  if (!ToInt32(cx, args.get(1), &index)) {
-    return false;
-  }
-
-  if (index < 0 || uint32_t(index) >= jit::JitScript::NumTypeSets(script)) {
-    ReportUsageErrorASCII(cx, callee, "Index out of range");
-    return false;
-  }
-
-  RootedValue val(cx, args.get(2));
-
-  // If val is "unknown" or "unknownObject" we mark the TypeSet as unknown or
-  // unknownObject, respectively.
-  bool unknown = false;
-  bool unknownObject = false;
-  if (val.isString()) {
-    if (!JS_StringEqualsLiteral(cx, val.toString(), "unknown", &unknown)) {
-      return false;
-    }
-    if (!JS_StringEqualsLiteral(cx, val.toString(), "unknownObject",
-                                &unknownObject)) {
-      return false;
-    }
-  }
-
-  // Avoid assertion failures if TI or Baseline Interpreter is disabled or if we
-  // can't Baseline Interpret this script.
-  if (!IsTypeInferenceEnabled() || !jit::IsBaselineInterpreterEnabled() ||
-      !jit::CanBaselineInterpretScript(script)) {
-    args.rval().setUndefined();
-    return true;
-  }
-
-  AutoRealm ar(cx, script);
-
-  if (!cx->realm()->ensureJitRealmExists(cx)) {
-    return false;
-  }
-
-  jit::AutoKeepJitScripts keepJitScript(cx);
-  if (!script->ensureHasJitScript(cx, keepJitScript)) {
-    return false;
-  }
-
-  AutoEnterAnalysis enter(cx);
-  AutoSweepJitScript sweep(script);
-  StackTypeSet* typeSet = script->jitScript()->typeArray(sweep) + index;
-  if (unknown) {
-    typeSet->addType(sweep, cx, TypeSet::UnknownType());
-  } else if (unknownObject) {
-    typeSet->addType(sweep, cx, TypeSet::AnyObjectType());
-  } else {
-    typeSet->addType(sweep, cx, TypeSet::GetValueType(val));
-  }
-
-  args.rval().setUndefined();
-  return true;
-}
-
-static bool MarkObjectPropertiesUnknown(JSContext* cx, unsigned argc,
-                                        Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  RootedObject callee(cx, &args.callee());
-
-  if (!args.get(0).isObject()) {
-    ReportUsageErrorASCII(cx, callee, "Argument must be an object");
-    return false;
-  }
-
-  RootedObject obj(cx, &args[0].toObject());
-  RootedObjectGroup group(cx, JSObject::getGroup(cx, obj));
-  if (!group) {
-    return false;
-  }
-
-  MarkObjectGroupUnknownProperties(cx, group);
-
-  args.rval().setUndefined();
-  return true;
-}
-
 static bool EncodeAsUtf8InBuffer(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (!args.requireAtLeast(cx, "encodeAsUtf8InBuffer", 2)) {
@@ -6090,7 +6029,7 @@
   if (!array) {
     return false;
   }
-  array->ensureDenseInitializedLength(cx, 0, 2);
+  array->ensureDenseInitializedLength(0, 2);
 
   uint32_t length;
   bool isSharedMemory;
@@ -6215,14 +6154,12 @@
 
   const char* returnedStr = nullptr;
   do {
-#ifdef JS_MORE_DETERMINISTIC
     // In order to check for differential behaviour, baselineCompile should have
     // the same output whether --no-baseline is used or not.
-    if (fuzzingSafe) {
-      returnedStr = "skipped (fuzzing-safe)";
+    if (js::SupportDifferentialTesting()) {
+      returnedStr = "skipped (differential testing)";
       break;
     }
-#endif
 
     AutoRealm ar(cx, script);
     if (script->hasBaselineScript()) {
@@ -6880,6 +6817,10 @@
 "wasmMultiValueEnabled()",
 "  Returns a boolean indicating whether the WebAssembly multi-value proposal is enabled."),
 
+    JS_FN_HELP("wasmExceptionsEnabled", WasmExceptionsEnabled, 1, 0,
+"wasmExceptionsEnabled()",
+"  Returns a boolean indicating whether the WebAssembly exceptions proposal is enabled."),
+
 #if defined(ENABLE_WASM_SIMD) && defined(DEBUG)
     JS_FN_HELP("wasmSimdAnalysis", WasmSimdAnalysis, 1, 0,
 "wasmSimdAnalysis(...)",
@@ -6966,6 +6907,9 @@
 "  Start a counter to bail once after passing the given amount of possible bailout positions in\n"
 "  ionmonkey.\n"),
 
+    JS_FN_HELP("invalidate", testingFunc_invalidate, 0, 0,
+"invalidate()",
+"  Force an immediate invalidation (if running in Warp)."),
 
     JS_FN_HELP("inJit", testingFunc_inJit, 0, 0,
 "inJit()",
@@ -7214,6 +7158,15 @@
 "  some fidelity."),
 #endif // DEBUG
 
+    JS_FN_HELP("nurseryStringsEnabled", NurseryStringsEnabled, 0, 0,
+"nurseryStringsEnabled()",
+"  Return whether strings are currently allocated in the nursery for current\n"
+"  global\n"),
+
+    JS_FN_HELP("isNurseryAllocated", IsNurseryAllocated, 1, 0,
+"isNurseryAllocated(thing)",
+"  Return whether a GC thing is nursery allocated.\n"),
+
     JS_FN_HELP("getLcovInfo", GetLcovInfo, 1, 0,
 "getLcovInfo(global)",
 "  Generate LCOV tracefile for the given compartment.  If no global are provided then\n"
@@ -7297,14 +7250,6 @@
 "  Returns an object containing a copy of all global lexical bindings.\n"
 "  Example use: let x = 1; assertEq(globalLexicals().x, 1);\n"),
 
-    JS_FN_HELP("monitorType", MonitorType, 3, 0,
-"monitorType(fun, index, val)",
-"  Adds val's type to the index'th StackTypeSet of the function's\n"
-"  JitScript.\n"
-"  If fun is null or undefined, the caller's script is used.\n"
-"  If the value is the string 'unknown' or 'unknownObject'\n"
-"  the TypeSet is marked as unknown or unknownObject, respectively.\n"),
-
     JS_FN_HELP("baselineCompile", BaselineCompile, 2, 0,
 "baselineCompile([fun/code], forceDebugInstrumentation=false)",
 "  Baseline-compiles the given JS function or script.\n"
@@ -7315,10 +7260,6 @@
 "  The interpreter will enter the new jitcode at the loop header unless\n"
 "  baselineCompile returned a string or threw an error.\n"),
 
-    JS_FN_HELP("markObjectPropertiesUnknown", MarkObjectPropertiesUnknown, 1, 0,
-"markObjectPropertiesUnknown(obj)",
-"  Mark all objects in obj's object group as having unknown properties.\n"),
-
     JS_FN_HELP("encodeAsUtf8InBuffer", EncodeAsUtf8InBuffer, 2, 0,
 "encodeAsUtf8InBuffer(str, uint8Array)",
 "  Encode as many whole code points from the string str into the provided\n"
diff -Nru firefox-84.0.2+build1/js/src/builtin/TypedArray.js firefox-85.0+build1/js/src/builtin/TypedArray.js
--- firefox-84.0.2+build1/js/src/builtin/TypedArray.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/builtin/TypedArray.js	2021-01-18 19:58:12.000000000 +0000
@@ -1337,6 +1337,45 @@
     return TypedArraySpeciesCreateWithBuffer(obj, buffer, beginByteOffset, newLength);
 }
 
+// https://tc39.es/proposal-relative-indexing-method
+// %TypedArray%.prototype.at ( index )
+function TypedArrayAt(index) {
+    // Step 1.
+    var obj = this;
+
+    // Step 2.
+    // This function is not generic.
+    if (!IsObject(obj) || !IsTypedArray(obj)) {
+        return callFunction(CallTypedArrayMethodIfWrapped, obj, index,
+                            "TypedArrayAt");
+    }
+    GetAttachedArrayBuffer(obj);
+
+    // If we got here, `this` is either a typed array or a wrapper for one.
+
+    // Step 3.
+    var len = TypedArrayLength(obj);
+
+    // Step 4.
+    var relativeIndex = ToInteger(index);
+
+    // Steps 5-6.
+    var k;
+    if (relativeIndex >= 0) {
+        k = relativeIndex;
+    } else {
+        k = len + relativeIndex;
+    }
+
+    // Step 7.
+    if (k < 0 || k >= len) {
+        return undefined;
+    }
+
+    // Step 8.
+    return obj[k];
+}
+
 // ES6 draft rev30 (2014/12/24) 22.2.3.30 %TypedArray%.prototype.values()
 //
 // Uncloned functions with `$` prefix are allocated as extended function
diff -Nru firefox-84.0.2+build1/js/src/debugger/Debugger.cpp firefox-85.0+build1/js/src/debugger/Debugger.cpp
--- firefox-84.0.2+build1/js/src/debugger/Debugger.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/debugger/Debugger.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -55,8 +55,9 @@
 #include "gc/ZoneAllocator.h"            // for ZoneAllocPolicy
 #include "jit/BaselineDebugModeOSR.h"  // for RecompileOnStackBaselineScriptsForDebugMode
 #include "jit/BaselineJIT.h"           // for FinishDiscardBaselineScript
-#include "jit/Ion.h"                   // for JitContext
-#include "jit/JitScript.h"             // for JitScript
+#include "jit/Invalidation.h"         // for RecompileInfoVector
+#include "jit/Ion.h"                  // for JitContext
+#include "jit/JitScript.h"            // for JitScript
 #include "jit/JSJitFrameIter.h"       // for InlineFrameIterator
 #include "jit/RematerializedFrame.h"  // for RematerializedFrame
 #include "js/Conversions.h"           // for ToBoolean, ToUint32
@@ -100,7 +101,6 @@
 #include "vm/Scope.h"                 // for Scope
 #include "vm/StringType.h"            // for JSString, PropertyName
 #include "vm/TraceLogging.h"          // for TraceLoggerForCurrentThread
-#include "vm/TypeInference.h"         // for TypeZone
 #include "vm/WrapperObject.h"         // for CrossCompartmentWrapperObject
 #include "wasm/WasmDebug.h"           // for DebugState
 #include "wasm/WasmInstance.h"        // for Instance
@@ -126,7 +126,6 @@
 #include "vm/ObjectOperations-inl.h"  // for GetProperty, HasProperty
 #include "vm/Realm-inl.h"             // for AutoRealm::AutoRealm
 #include "vm/Stack-inl.h"             // for AbstractFramePtr::script
-#include "vm/TypeInference-inl.h"     // for AutoEnterAnalysis
 
 namespace js {
 
@@ -650,8 +649,14 @@
   if (!p) {
     Rooted<AbstractGeneratorObject*> genObj(cx);
     if (referent.isGeneratorFrame()) {
-      AutoRealm ar(cx, referent.callee());
-      genObj = GetGeneratorObjectForFrame(cx, referent);
+      if (referent.isFunctionFrame()) {
+        AutoRealm ar(cx, referent.callee());
+        genObj = GetGeneratorObjectForFrame(cx, referent);
+      } else {
+        MOZ_ASSERT(referent.isModuleFrame());
+        AutoRealm ar(cx, referent.script()->module());
+        genObj = GetGeneratorObjectForFrame(cx, referent);
+      }
 
       // If this frame has a generator associated with it, but no on-stack
       // Debugger.Frame object was found, there should not be a suspended
@@ -3129,13 +3134,14 @@
 
 static bool AppendAndInvalidateScript(JSContext* cx, Zone* zone,
                                       JSScript* script,
+                                      jit::RecompileInfoVector& invalid,
                                       Vector<JSScript*>& scripts) {
-  // Enter the script's realm as addPendingRecompile attempts to
+  // Enter the script's realm as AddPendingInvalidation attempts to
   // cancel off-thread compilations, whose books are kept on the
   // script's realm.
   MOZ_ASSERT(script->zone() == zone);
   AutoRealm ar(cx, script);
-  zone->types.addPendingRecompile(cx, script);
+  AddPendingInvalidation(invalid, script);
   return scripts.append(script);
 }
 
@@ -3153,10 +3159,10 @@
   // Iterate through observable scripts, invalidating their Ion scripts and
   // appending them to a vector for discarding their baseline scripts later.
   {
-    AutoEnterAnalysis enter(fop, zone);
+    RecompileInfoVector invalid;
     if (JSScript* script = obs.singleScriptForZoneInvalidation()) {
       if (obs.shouldRecompileOrInvalidate(script)) {
-        if (!AppendAndInvalidateScript(cx, zone, script, scripts)) {
+        if (!AppendAndInvalidateScript(cx, zone, script, invalid, scripts)) {
           return false;
         }
       }
@@ -3168,12 +3174,13 @@
         }
         JSScript* script = base->asJSScript();
         if (obs.shouldRecompileOrInvalidate(script)) {
-          if (!AppendAndInvalidateScript(cx, zone, script, scripts)) {
+          if (!AppendAndInvalidateScript(cx, zone, script, invalid, scripts)) {
             return false;
           }
         }
       }
     }
+    Invalidate(cx, invalid);
   }
 
   // Code below this point must be infallible to ensure the active bit of
@@ -4513,7 +4520,7 @@
   if (!arrobj) {
     return false;
   }
-  arrobj->ensureDenseInitializedLength(cx, 0, count);
+  arrobj->ensureDenseInitializedLength(0, count);
   for (i = 0; i < count; i++) {
     RootedValue v(cx, debuggees[i]);
     if (!dbg->wrapDebuggeeValue(cx, &v)) {
@@ -5523,7 +5530,7 @@
     return false;
   }
 
-  result->ensureDenseInitializedLength(cx, 0, resultLength);
+  result->ensureDenseInitializedLength(0, resultLength);
 
   for (size_t i = 0; i < scripts.length(); i++) {
     JSObject* scriptObject = dbg->wrapScript(cx, scripts[i]);
@@ -5651,7 +5658,7 @@
     return false;
   }
 
-  result->ensureDenseInitializedLength(cx, 0, resultLength);
+  result->ensureDenseInitializedLength(0, resultLength);
 
   size_t i = 0;
   for (auto iter = sources.get().iter(); !iter.done(); iter.next()) {
@@ -5872,7 +5879,7 @@
     return false;
   }
 
-  result->ensureDenseInitializedLength(cx, 0, length);
+  result->ensureDenseInitializedLength(0, length);
 
   for (size_t i = 0; i < length; i++) {
     RootedValue debuggeeVal(cx, ObjectValue(*query.objects[i]));
@@ -6030,7 +6037,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(cx, allocScope, options,
-                                              compilationInfo.get().stencil);
+                                              compilationInfo.get());
 
   JS::AutoSuppressWarningReporter suppressWarnings(cx);
   frontend::Parser<frontend::FullParseHandler, char16_t> parser(
diff -Nru firefox-84.0.2+build1/js/src/debugger/DebuggerMemory.cpp firefox-85.0+build1/js/src/debugger/DebuggerMemory.cpp
--- firefox-84.0.2+build1/js/src/debugger/DebuggerMemory.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/debugger/DebuggerMemory.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -204,7 +204,7 @@
   if (!result) {
     return false;
   }
-  result->ensureDenseInitializedLength(cx, 0, length);
+  result->ensureDenseInitializedLength(0, length);
 
   for (size_t i = 0; i < length; i++) {
     RootedPlainObject obj(cx, NewBuiltinClassInstance<PlainObject>(cx));
diff -Nru firefox-84.0.2+build1/js/src/debugger/Frame.cpp firefox-85.0+build1/js/src/debugger/Frame.cpp
--- firefox-84.0.2+build1/js/src/debugger/Frame.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/debugger/Frame.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -688,6 +688,7 @@
 
     AbstractGeneratorObject& genObj =
         frame->generatorInfo()->unwrappedGenerator();
+    AutoRealm ar(cx, &genObj);
     JSScript* script = frame->generatorInfo()->generatorScript();
 
     if (!GetThisValueForDebuggerSuspendedGeneratorMaybeOptimizedOut(
diff -Nru firefox-84.0.2+build1/js/src/debugger/Object.cpp firefox-85.0+build1/js/src/debugger/Object.cpp
--- firefox-84.0.2+build1/js/src/debugger/Object.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/debugger/Object.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -2378,6 +2378,11 @@
 
   Rooted<GlobalObject*> referent(cx, &object->referent()->as<GlobalObject>());
 
+  // Shape::search can end up allocating a new BaseShape in Shape::cachify so
+  // we need to be in the right compartment here.
+  Maybe<AutoRealm> ar;
+  EnterDebuggeeObjectRealm(cx, ar, referent);
+
   RootedObject globalLexical(cx, &referent->lexicalEnvironment());
   RootedObject pobj(cx);
   Rooted<PropertyResult> prop(cx);
diff -Nru firefox-84.0.2+build1/js/src/debugger/Script.cpp firefox-85.0+build1/js/src/debugger/Script.cpp
--- firefox-84.0.2+build1/js/src/debugger/Script.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/debugger/Script.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -48,6 +48,7 @@
 #include "vm/BytecodeUtil-inl.h"  // for BytecodeRangeWithPosition
 #include "vm/JSAtom-inl.h"        // for ValueToId
 #include "vm/JSObject-inl.h"  // for NewBuiltinClassInstance, NewObjectWithGivenProto, NewTenuredObjectWithGivenProto
+#include "vm/JSScript-inl.h"  // for JSScript::global
 #include "vm/ObjectOperations-inl.h"  // for GetProperty
 #include "vm/Realm-inl.h"             // for AutoRealm::AutoRealm
 
@@ -1373,10 +1374,7 @@
     case JSOp::InitAliasedLexical:
     case JSOp::SetIntrinsic:
     case JSOp::InitGLexical:
-    case JSOp::DefVar:
-    case JSOp::DefLet:
-    case JSOp::DefConst:
-    case JSOp::DefFun:
+    case JSOp::GlobalOrEvalDeclInstantiation:
     case JSOp::SetFunName:
     case JSOp::MutateProto:
     case JSOp::DynamicImport:
@@ -1458,10 +1456,8 @@
     case JSOp::PopN:
     case JSOp::DupAt:
     case JSOp::NewArray:
-    case JSOp::NewArrayCopyOnWrite:
     case JSOp::NewInit:
     case JSOp::NewObject:
-    case JSOp::NewObjectWithGroup:
     case JSOp::InitElem:
     case JSOp::InitHiddenElem:
     case JSOp::InitLockedElem:
@@ -1508,8 +1504,6 @@
     case JSOp::Int32:
     case JSOp::LoopHead:
     case JSOp::GetElem:
-    case JSOp::CallElem:
-    case JSOp::Length:
     case JSOp::Not:
     case JSOp::FunctionThis:
     case JSOp::GlobalThis:
@@ -1519,7 +1513,6 @@
     case JSOp::GetPropSuper:
     case JSOp::GetElemSuper:
     case JSOp::GetProp:
-    case JSOp::CallProp:
     case JSOp::RegExp:
     case JSOp::CallSiteObj:
     case JSOp::Object:
@@ -1528,7 +1521,6 @@
     case JSOp::TypeofExpr:
     case JSOp::ToAsyncIter:
     case JSOp::ToPropertyKey:
-    case JSOp::IterNext:
     case JSOp::Lambda:
     case JSOp::LambdaArrow:
     case JSOp::PushLexicalEnv:
@@ -1571,7 +1563,6 @@
     case JSOp::CheckThis:
     case JSOp::CheckReturn:
     case JSOp::CheckThisReinit:
-    case JSOp::CheckGlobalOrEvalDecl:
     case JSOp::SuperFun:
     case JSOp::SpreadSuperCall:
     case JSOp::SuperCall:
diff -Nru firefox-84.0.2+build1/js/src/devtools/automation/variants/nowarpdebug firefox-85.0+build1/js/src/devtools/automation/variants/nowarpdebug
--- firefox-84.0.2+build1/js/src/devtools/automation/variants/nowarpdebug	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/automation/variants/nowarpdebug	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-{
-    "configure-args": "--enable-rust-simd",
-    "debug": true,
-    "compiler": "clang",
-    "env": {
-        "JSTESTS_EXTRA_ARGS": "--jitflags=nowarp"
-    },
-    "conditional-configure-args": {
-        "linux64": "--enable-clang-plugin"
-    }
-}
diff -Nru firefox-84.0.2+build1/js/src/devtools/automation/variants/warpdebug firefox-85.0+build1/js/src/devtools/automation/variants/warpdebug
--- firefox-84.0.2+build1/js/src/devtools/automation/variants/warpdebug	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/automation/variants/warpdebug	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-{
-    "configure-args": "--enable-rust-simd",
-    "debug": true,
-    "env": {
-        "JITTEST_EXTRA_ARGS": "--jitflags=warp"
-    },
-    "skip-tests": {
-        "all": ["jstests", "jsapitests"]
-    }
-}
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/analyze.py firefox-85.0+build1/js/src/devtools/rootAnalysis/analyze.py
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/analyze.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/analyze.py	2021-01-18 19:58:12.000000000 +0000
@@ -362,29 +362,11 @@
 if "ANALYZED_OBJDIR" in os.environ:
     data["objdir"] = os.environ["ANALYZED_OBJDIR"]
 
+if "GECKO_PATH" in os.environ:
+    data["source"] = os.environ["GECKO_PATH"]
 if "SOURCE" in os.environ:
     data["source"] = os.environ["SOURCE"]
 
-if data.get("sixgill_bin"):
-    if not data.get("source"):
-        path = subprocess.check_output(
-            [
-                "sh",
-                "-c",
-                data["sixgill_bin"] + "/xdbkeys file_source.xdb | grep jsapi.cpp",
-            ]
-        ).decode()
-        data["source"] = path.replace("\n", "").replace("/js/src/jsapi.cpp", "")
-    if not data.get("objdir"):
-        path = subprocess.check_output(
-            [
-                "sh",
-                "-c",
-                data["sixgill_bin"] + "/xdbkeys file_source.xdb | grep jsapi.h",
-            ]
-        ).decode()
-        data["objdir"] = path.replace("\n", "").replace("/jsapi.h", "")
-
 steps = [
     "dbs",
     "gcTypes",
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/analyzeRoots.js firefox-85.0+build1/js/src/devtools/rootAnalysis/analyzeRoots.js
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/analyzeRoots.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/analyzeRoots.js	2021-01-18 19:58:12.000000000 +0000
@@ -182,11 +182,15 @@
     switch (edge.Kind) {
 
     case "Assign": {
+        // Detect `Return := nullptr`.
         if (isReturningImmobileValue(edge, variable))
             return 0;
         const [lhs, rhs] = edge.Exp;
+        // Detect `lhs := ...variable...`
         if (expressionUsesVariable(rhs, variable))
             return src;
+        // Detect `...variable... := rhs` but not `variable := rhs`. The latter
+        // overwrites the previous value of `variable` without using it.
         if (expressionUsesVariable(lhs, variable) && !expressionIsVariable(lhs, variable))
             return src;
         return 0;
@@ -276,6 +280,16 @@
     return exp.Kind == "Var" && sameVariable(exp.Variable, variable);
 }
 
+function expressionIsMethodOnVariable(exp, variable)
+{
+    // This might be calling a method on a base class, in which case exp will
+    // be an unnamed field of the variable instead of the variable itself.
+    while (exp.Kind == "Fld" && exp.Field.Name[0].startsWith("field:"))
+        exp = exp.Exp[0];
+
+    return exp.Kind == "Var" && sameVariable(exp.Variable, variable);
+}
+
 // Return whether the edge terminates the live range of a variable's value when
 // searching in reverse through the CFG, by setting it to some new value.
 // Examples of killing 'obj's live range:
@@ -453,33 +467,32 @@
     if (edge.Type.Kind == 'Function' &&
         edge.Type.TypeFunctionCSU &&
         edge.PEdgeCallInstance &&
-        edge.PEdgeCallInstance.Exp.Kind == 'Var' &&
-        expressionIsVariable(edge.PEdgeCallInstance.Exp, variable))
-    do {
+        expressionIsMethodOnVariable(edge.PEdgeCallInstance.Exp, variable))
+    {
         const typeName = edge.Type.TypeFunctionCSU.Type.Name;
         const m = typeName.match(/^(((\w|::)+?)(\w+))</);
-        if (!m)
-            break;
-        const [, type, namespace,, classname] = m;
-
-        // special-case: the initial constructor that doesn't provide a value.
-        // Useful for things like Maybe<T>.
-        if (callee.Kind == 'Var' &&
-            typesWithSafeConstructors.has(type) &&
-            callee.Variable.Name[0].includes(`${namespace}${classname}<T>::${classname}()`))
-        {
-            return true;
-        }
+        if (m) {
+            const [, type, namespace,, classname] = m;
 
-        // special-case: UniquePtr::reset() and similar.
-        if (callee.Kind == 'Var' &&
-            type in resetterMethods &&
-            resetterMethods[type].has(callee.Variable.Name[1]))
-        {
-            return true;
-        }
+            // special-case: the initial constructor that doesn't provide a value.
+            // Useful for things like Maybe<T>.
+            const ctorName = `${namespace}${classname}<T>::${classname}()`;
+            if (callee.Kind == 'Var' &&
+                typesWithSafeConstructors.has(type) &&
+                callee.Variable.Name[0].includes(ctorName))
+            {
+                return true;
+            }
 
-    } while(0);
+            // special-case: UniquePtr::reset() and similar.
+            if (callee.Kind == 'Var' &&
+                type in resetterMethods &&
+                resetterMethods[type].has(callee.Variable.Name[1]))
+            {
+                return true;
+            }
+        }
+    }
 
     // special-case: passing UniquePtr<T> by value.
     if (edge.Type.Kind == 'Function' &&
@@ -631,7 +644,7 @@
                 // iteration.
                 worklist.push({body: body, ppoint: body.Index[1],
                                gcInfo: gcInfo, why: entry});
-            } else if (variable.Kind == "Arg" && gcInfo) {
+            } else if ((variable.Kind == "Arg" || variable.Kind == "This") && gcInfo) {
                 // The scope of arguments starts at the beginning of the
                 // function
                 return entry;
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/annotations.js firefox-85.0+build1/js/src/devtools/rootAnalysis/annotations.js
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/annotations.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/annotations.js	2021-01-18 19:58:12.000000000 +0000
@@ -31,6 +31,7 @@
     'mozilla::UniquePtr': new Set(["reset"]),
     'js::UniquePtr': new Set(["reset"]),
     'mozilla::dom::Nullable': new Set(["SetNull"]),
+    'mozilla::dom::TypedArray_base': new Set(["Reset"]),
 };
 
 function indirectCallCannotGC(fullCaller, fullVariable)
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/mach_commands.py firefox-85.0+build1/js/src/devtools/rootAnalysis/mach_commands.py
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/mach_commands.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/mach_commands.py	2021-01-18 19:58:12.000000000 +0000
@@ -318,6 +318,9 @@
         # hazard mozconfigs need to find binaries in .mozbuild
         env["MOZBUILD_STATE_PATH"] = self.state_dir
 
+        # Suppress the gathering of sources, to save disk space and memory.
+        env["XGILL_NO_SOURCE"] = "1"
+
         self.setup_env_for_tools(env)
 
         if "haz_objdir" in kwargs:
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp firefox-85.0+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/t/hazards/source.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -316,3 +316,11 @@
     consume(std::move(unsafe10));
   }
 }
+
+// Make sure `this` is live at the beginning of a function.
+class Subcell : public Cell {
+  int method() {
+    GC();
+    return f;  // this->f
+  }
+};
diff -Nru firefox-84.0.2+build1/js/src/devtools/rootAnalysis/t/hazards/test.py firefox-85.0+build1/js/src/devtools/rootAnalysis/t/hazards/test.py
--- firefox-84.0.2+build1/js/src/devtools/rootAnalysis/t/hazards/test.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/devtools/rootAnalysis/t/hazards/test.py	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,7 @@
 # flake8: noqa: F821
 
+from collections import defaultdict
+
 test.compile("source.cpp")
 test.run_analysis_script("gcTypes")
 
@@ -10,6 +12,7 @@
 assert "void suppressedFunction()" not in gcFunctions
 assert "void halfSuppressedFunction()" in gcFunctions
 assert "void unsuppressedFunction()" in gcFunctions
+assert "int32 Subcell::method()" in gcFunctions
 assert "Cell* f()" in gcFunctions
 
 hazards = test.load_hazards()
@@ -21,11 +24,12 @@
 assert "cell5" not in hazmap
 assert "cell6" not in hazmap
 assert "<returnvalue>" in hazmap
+assert "this" in hazmap
 
-# All hazards should be in f(), loopy(), and safevals()
+# All hazards should be in f(), loopy(), safevals(), and method()
 assert hazmap["cell2"].function == "Cell* f()"
 print(len(set(haz.function for haz in hazards)))
-assert len(set(haz.function for haz in hazards)) == 3
+assert len(set(haz.function for haz in hazards)) == 4
 
 # Check that the correct GC call is reported for each hazard. (cell3 has a
 # hazard from two different GC calls; it doesn't really matter which is
@@ -43,6 +47,7 @@
 # Type names are handy to have in the report.
 assert hazmap["cell2"].type == "Cell*"
 assert hazmap["<returnvalue>"].type == "Cell*"
+assert hazmap["this"].type == "Subcell*"
 
 # loopy hazards. See comments in source.
 assert "haz1" not in hazmap
@@ -66,3 +71,13 @@
 assert "safe8" not in hazmap
 assert "safe9" not in hazmap
 assert "safe10" not in hazmap
+
+# method hazard.
+
+byfunc = defaultdict(lambda: defaultdict(dict))
+for haz in hazards:
+    byfunc[haz.function][haz.variable] = haz
+
+methhaz = byfunc["int32 Subcell::method()"]
+assert "this" in methhaz
+assert methhaz["this"].type == "Subcell*"
diff -Nru firefox-84.0.2+build1/js/src/doc/Debugger/Debugger.Memory.md firefox-85.0+build1/js/src/doc/Debugger/Debugger.Memory.md
--- firefox-84.0.2+build1/js/src/doc/Debugger/Debugger.Memory.md	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/doc/Debugger/Debugger.Memory.md	2021-01-18 19:58:12.000000000 +0000
@@ -176,7 +176,7 @@
 * `"DOM_WINDOW_UTILS"`
 * `"COMPONENT_UTILS"`
 * `"MEM_PRESSURE"`
-* `"CC_WAITING"`
+* `"CC_FINISHED"`
 * `"CC_FORCED"`
 * `"LOAD_END"`
 * `"PAGE_HIDE"`
diff -Nru firefox-84.0.2+build1/js/src/frontend/AsyncEmitter.cpp firefox-85.0+build1/js/src/frontend/AsyncEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/AsyncEmitter.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/AsyncEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,198 @@
+/* -*- 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 "frontend/AsyncEmitter.h"
+
+#include "mozilla/Assertions.h"  // MOZ_ASSERT
+
+#include "frontend/BytecodeEmitter.h"     // BytecodeEmitter
+#include "frontend/NameOpEmitter.h"       // NameOpEmitter
+#include "vm/AsyncFunctionResolveKind.h"  // AsyncFunctionResolveKind
+#include "vm/Opcodes.h"                   // JSOp
+
+using namespace js;
+using namespace js::frontend;
+
+bool AsyncEmitter::prepareForParamsWithExpression() {
+  MOZ_ASSERT(state_ == State::Start);
+#ifdef DEBUG
+  state_ = State::Parameters;
+#endif
+
+  rejectTryCatch_.emplace(bce_, TryEmitter::Kind::TryCatch,
+                          TryEmitter::ControlKind::NonSyntactic);
+  return rejectTryCatch_->emitTry();
+}
+
+bool AsyncEmitter::prepareForParamsWithoutExpression() {
+  MOZ_ASSERT(state_ == State::Start);
+#ifdef DEBUG
+  state_ = State::Parameters;
+#endif
+  return true;
+}
+
+bool AsyncEmitter::emitParamsEpilogue() {
+  MOZ_ASSERT(state_ == State::Parameters);
+
+  if (rejectTryCatch_) {
+    // If we get here, we need to reset the TryEmitter. Parameters can't reuse
+    // the reject try-catch block from the function body, because the body
+    // may have pushed an additional var-environment. This messes up scope
+    // resolution for the |.generator| variable, because we'd need different
+    // hops to reach |.generator| depending on whether the error was thrown
+    // from the parameters or the function body.
+    if (!emitRejectCatch()) {
+      return false;
+    }
+  }
+
+#ifdef DEBUG
+  state_ = State::PostParams;
+#endif
+  return true;
+}
+
+bool AsyncEmitter::prepareForModule() {
+  // Unlike functions, modules do not have params that we need to worry about.
+  // Instead, this code is for setting up the required generator that will be
+  // used for top level await. Before we can start using top-level await in
+  // modules, we need to emit a
+  // |.generator| which we can use to pause and resume execution.
+  MOZ_ASSERT(state_ == State::Start);
+  MOZ_ASSERT(
+      bce_->lookupName(bce_->cx->parserNames().dotGenerator).hasKnownSlot());
+
+  NameOpEmitter noe(bce_, bce_->cx->parserNames().dotGenerator,
+                    NameOpEmitter::Kind::Initialize);
+  if (!noe.prepareForRhs()) {
+    //        [stack]
+    return false;
+  }
+  if (!bce_->emit1(JSOp::Generator)) {
+    //        [stack] GEN
+    return false;
+  }
+  if (!noe.emitAssignment()) {
+    //        [stack] GEN
+    return false;
+  }
+  if (!bce_->emit1(JSOp::Pop)) {
+    //        [stack]
+    return false;
+  }
+
+#ifdef DEBUG
+  state_ = State::ModulePrologue;
+#endif
+
+  return true;
+}
+
+bool AsyncEmitter::prepareForBody() {
+  MOZ_ASSERT(state_ == State::PostParams || state_ == State::ModulePrologue);
+
+  rejectTryCatch_.emplace(bce_, TryEmitter::Kind::TryCatch,
+                          TryEmitter::ControlKind::NonSyntactic);
+#ifdef DEBUG
+  state_ = State::Body;
+#endif
+  return rejectTryCatch_->emitTry();
+}
+
+bool AsyncEmitter::emitEnd() {
+#ifdef DEBUG
+  MOZ_ASSERT(state_ == State::Body);
+#endif
+
+  if (!emitFinalYield()) {
+    return false;
+  }
+
+  if (!emitRejectCatch()) {
+    return false;
+  }
+
+#ifdef DEBUG
+  state_ = State::End;
+#endif
+  return true;
+}
+
+bool AsyncEmitter::emitFinalYield() {
+  if (!bce_->emit1(JSOp::Undefined)) {
+    //            [stack] UNDEF
+    return false;
+  }
+
+  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
+    //          [stack] UNDEF GEN
+    return false;
+  }
+
+  if (!bce_->emit2(JSOp::AsyncResolve,
+                   uint8_t(AsyncFunctionResolveKind::Fulfill))) {
+    //          [stack] PROMISE
+    return false;
+  }
+
+  if (!bce_->emit1(JSOp::SetRval)) {
+    //            [stack]
+    return false;
+  }
+
+  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
+    //            [stack] GEN
+    return false;
+  }
+
+  if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
+    //            [stack]
+    return false;
+  }
+
+  return true;
+}
+
+bool AsyncEmitter::emitRejectCatch() {
+  if (!rejectTryCatch_->emitCatch()) {
+    //              [stack] EXC
+    return false;
+  }
+
+  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
+    //              [stack] EXC GEN
+    return false;
+  }
+
+  if (!bce_->emit2(JSOp::AsyncResolve,
+                   uint8_t(AsyncFunctionResolveKind::Reject))) {
+    //              [stack] PROMISE
+    return false;
+  }
+
+  if (!bce_->emit1(JSOp::SetRval)) {
+    //              [stack]
+    return false;
+  }
+
+  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
+    //              [stack] GEN
+    return false;
+  }
+
+  if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
+    //              [stack]
+    return false;
+  }
+
+  if (!rejectTryCatch_->emitEnd()) {
+    return false;
+  }
+
+  rejectTryCatch_.reset();
+  return true;
+}
diff -Nru firefox-84.0.2+build1/js/src/frontend/AsyncEmitter.h firefox-85.0+build1/js/src/frontend/AsyncEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/AsyncEmitter.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/AsyncEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,163 @@
+/* -*- 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 frontend_AsyncEmitter_h
+#define frontend_AsyncEmitter_h
+
+#include "mozilla/Attributes.h"  // MOZ_STACK_CLASS, MOZ_MUST_USE
+
+#include "frontend/TryEmitter.h"  // TryEmitter
+
+namespace js {
+namespace frontend {
+
+struct BytecodeEmitter;
+
+// Class for emitting Bytecode associated with the AsyncFunctionGenerator.
+//
+// Usage:
+//
+//   For an async function, the params have to be handled separately,
+//   because the body may have pushed an additional var environment, changing
+//   the number of hops required to reach the |.generator| variable. In order
+//   to handle this, we can't reuse the same TryCatch emitter.
+//
+//   Simple case - For a function without expression parameters:
+//   `async function f(<params>) {<body>}`,
+//     AsyncEmitter ae(this);
+//
+//     ae.prepareForParamsWithoutExpression();
+//     // Emit Params.
+//     ...
+//     ae.paramsEpilogue(); // We need to emit the epilogue before the extra
+//     VarScope emitExtraBodyVarScope();
+//
+//     // Emit new scope
+//     ae.prepareForBody();
+//
+//     // Emit body of the Function.
+//
+//     ae.emitEnd();
+//
+//   Complex case - For a function with expression parameters:
+//   `async function f(<expression>) {<body>}`,
+//     AsyncEmitter ae(this);
+//
+//     ae.prepareForParamsWithExpression();
+//
+//     // Emit Params.
+//     ...
+//     ae.paramsEpilogue(); // We need to emit the epilogue before the extra
+//                          // VarScope
+//     emitExtraBodyVarScope();
+//
+//     // Emit new scope
+//     ae.prepareForBody();
+//
+//     // Emit body of the Function.
+//     ...
+//     ae.emitEnd();
+//
+//
+//   Async Module case - For a module with `await` in the top level:
+//     AsyncEmitter ae(this);
+//     ae.prepareForModule(); // prepareForModule is used to setup the generator
+//                            // for the async module.
+//     switchToMain();
+//     ...
+//
+//     // Emit new scope
+//     ae.prepareForBody();
+//
+//     // Emit body of the Script.
+//
+//     ae.emitEnd();
+//
+
+class MOZ_STACK_CLASS AsyncEmitter {
+ private:
+  BytecodeEmitter* bce_;
+
+  // try-catch block for async function parameter and body.
+  mozilla::Maybe<TryEmitter> rejectTryCatch_;
+
+#ifdef DEBUG
+  // The state of this emitter.
+  //
+  //    +-------+
+  //    | Start |-+
+  //    +-------+ |
+  //              |
+  //   +----------+
+  //   |
+  //   | [Parameters with Expression]
+  //   |   prepareForParamsWithExpression    +------------+
+  //   +-------------------------------------| Parameters |-->+
+  //   |                                     +------------+   |
+  //   |                                                      |
+  //   | [Parameters Without Expression]                      |
+  //   |   prepareForParamsWithoutExpression +------------+   |
+  //   +-------------------------------------| Parameters |-->+
+  //   |                                     +------------+   |
+  //   | [Modules]                                            |
+  //   |   prepareForModule  +----------------+               |
+  //   +-------------------->| ModulePrologue |--+            |
+  //                         +----------------+  |            |
+  //                                             |            |
+  //                                             |            |
+  //   +-----------------------------------------+            |
+  //   |                                                      |
+  //   |                                                      |
+  //   V                     +------------+  paramsEpilogue   |
+  //   +<--------------------| PostParams |<------------------+
+  //   |                     +------------+
+  //   |
+  //   | [Script body]
+  //   |   prepareForBody    +---------+
+  //   +-------------------->|  Body   |--------+
+  //                         +---------+        |  <emit script body>
+  //   +----------------------------------------+
+  //   |
+  //   |  emitEnd             +-----+
+  //   +--------------------->| End |
+  //                          +-----+
+
+  enum class State {
+    // The initial state.
+    Start,
+
+    Parameters,
+
+    ModulePrologue,
+
+    PostParams,
+
+    Body,
+
+    End,
+  };
+
+  State state_ = State::Start;
+#endif
+
+  MOZ_MUST_USE bool emitRejectCatch();
+  MOZ_MUST_USE bool emitFinalYield();
+
+ public:
+  explicit AsyncEmitter(BytecodeEmitter* bce) : bce_(bce){};
+
+  MOZ_MUST_USE bool prepareForParamsWithoutExpression();
+  MOZ_MUST_USE bool prepareForParamsWithExpression();
+  MOZ_MUST_USE bool prepareForModule();
+  MOZ_MUST_USE bool emitParamsEpilogue();
+  MOZ_MUST_USE bool prepareForBody();
+  MOZ_MUST_USE bool emitEnd();
+};
+
+} /* namespace frontend */
+} /* namespace js */
+
+#endif /* frontend_AsyncEmitter_h */
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeCompilation.h firefox-85.0+build1/js/src/frontend/BytecodeCompilation.h
--- firefox-84.0.2+build1/js/src/frontend/BytecodeCompilation.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeCompilation.h	2021-01-18 19:58:12.000000000 +0000
@@ -75,16 +75,18 @@
 extern bool PrepareForInstantiate(JSContext* cx,
                                   CompilationInfo& compilationInfo,
                                   CompilationGCOutput& gcOutput);
-extern bool PrepareForInstantiate(JSContext* cx,
-                                  CompilationInfoVector& compilationInfos,
-                                  CompilationGCOutput& gcOutput);
+extern bool PrepareForInstantiate(
+    JSContext* cx, CompilationInfoVector& compilationInfos,
+    CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification);
 
 extern bool InstantiateStencils(JSContext* cx, CompilationInfo& compilationInfo,
                                 CompilationGCOutput& gcOutput);
 
 extern bool InstantiateStencils(JSContext* cx,
                                 CompilationInfoVector& compilationInfos,
-                                CompilationGCOutput& gcOutput);
+                                CompilationGCOutput& gcOutput,
+                                CompilationGCOutput& gcOutputForDelazification);
 
 extern JSScript* CompileGlobalScript(JSContext* cx,
                                      const JS::ReadOnlyCompileOptions& options,
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeCompiler.cpp firefox-85.0+build1/js/src/frontend/BytecodeCompiler.cpp
--- firefox-84.0.2+build1/js/src/frontend/BytecodeCompiler.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeCompiler.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -100,13 +100,13 @@
  protected:
   explicit SourceAwareCompiler(JSContext* cx, LifoAllocScope& allocScope,
                                const JS::ReadOnlyCompileOptions& options,
-                               CompilationStencil& stencil,
+                               CompilationInfo& compilationInfo,
                                SourceText<Unit>& sourceBuffer,
                                js::Scope* enclosingScope = nullptr,
                                JSObject* enclosingEnv = nullptr)
       : sourceBuffer_(sourceBuffer),
-        compilationState_(cx, allocScope, options, stencil, enclosingScope,
-                          enclosingEnv) {
+        compilationState_(cx, allocScope, options, compilationInfo,
+                          enclosingScope, enclosingEnv) {
     MOZ_ASSERT(sourceBuffer_.get() != nullptr);
   }
 
@@ -161,12 +161,12 @@
  public:
   explicit ScriptCompiler(JSContext* cx, LifoAllocScope& allocScope,
                           const JS::ReadOnlyCompileOptions& options,
-                          CompilationStencil& stencil,
+                          CompilationInfo& compilationInfo,
                           SourceText<Unit>& sourceBuffer,
                           js::Scope* enclosingScope = nullptr,
                           JSObject* enclosingEnv = nullptr)
-      : Base(cx, allocScope, options, stencil, sourceBuffer, enclosingScope,
-             enclosingEnv) {}
+      : Base(cx, allocScope, options, compilationInfo, sourceBuffer,
+             enclosingScope, enclosingEnv) {}
 
   using Base::createSourceAndParser;
 
@@ -250,9 +250,8 @@
   AutoAssertReportedException assertException(cx);
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
-  frontend::ScriptCompiler<Unit> compiler(cx, allocScope,
-                                          compilationInfo.input.options,
-                                          compilationInfo.stencil, srcBuf);
+  frontend::ScriptCompiler<Unit> compiler(
+      cx, allocScope, compilationInfo.input.options, compilationInfo, srcBuf);
 
   if (!compiler.createSourceAndParser(cx, compilationInfo)) {
     return false;
@@ -330,7 +329,7 @@
     AutoGeckoProfilerEntry pseudoFrame(cx, "stencil instantiate",
                                        JS::ProfilingCategoryPair::JS_Parsing);
 
-    if (!compilationInfo.instantiateStencils(cx, gcOutput)) {
+    if (!CompilationInfo::instantiateStencils(cx, compilationInfo, gcOutput)) {
       return false;
     }
   }
@@ -349,14 +348,16 @@
   return true;
 }
 
-bool frontend::InstantiateStencils(JSContext* cx,
-                                   CompilationInfoVector& compilationInfos,
-                                   CompilationGCOutput& gcOutput) {
+bool frontend::InstantiateStencils(
+    JSContext* cx, CompilationInfoVector& compilationInfos,
+    CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification_) {
   {
     AutoGeckoProfilerEntry pseudoFrame(cx, "stencil instantiate",
                                        JS::ProfilingCategoryPair::JS_Parsing);
 
-    if (!compilationInfos.instantiateStencils(cx, gcOutput)) {
+    if (!compilationInfos.instantiateStencils(cx, gcOutput,
+                                              gcOutputForDelazification_)) {
       return false;
     }
   }
@@ -382,16 +383,18 @@
   AutoGeckoProfilerEntry pseudoFrame(cx, "stencil instantiate",
                                      JS::ProfilingCategoryPair::JS_Parsing);
 
-  return compilationInfo.prepareForInstantiate(cx, gcOutput);
+  return CompilationInfo::prepareForInstantiate(cx, compilationInfo, gcOutput);
 }
 
-bool frontend::PrepareForInstantiate(JSContext* cx,
-                                     CompilationInfoVector& compilationInfos,
-                                     CompilationGCOutput& gcOutput) {
+bool frontend::PrepareForInstantiate(
+    JSContext* cx, CompilationInfoVector& compilationInfos,
+    CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification_) {
   AutoGeckoProfilerEntry pseudoFrame(cx, "stencil instantiate",
                                      JS::ProfilingCategoryPair::JS_Parsing);
 
-  return compilationInfos.prepareForInstantiate(cx, gcOutput);
+  return compilationInfos.prepareForInstantiate(cx, gcOutput,
+                                                gcOutputForDelazification_);
 }
 
 template <typename Unit>
@@ -450,7 +453,7 @@
 
   frontend::ScriptCompiler<Unit> compiler(
       cx, allocScope, compilationInfo.get().input.options,
-      compilationInfo.get().stencil, srcBuf, enclosingScope, enclosingEnv);
+      compilationInfo.get(), srcBuf, enclosingScope, enclosingEnv);
   if (!compiler.createSourceAndParser(cx, compilationInfo.get())) {
     return nullptr;
   }
@@ -497,12 +500,12 @@
  public:
   explicit ModuleCompiler(JSContext* cx, LifoAllocScope& allocScope,
                           const JS::ReadOnlyCompileOptions& options,
-                          CompilationStencil& stencil,
+                          CompilationInfo& compilationInfo,
                           SourceText<Unit>& sourceBuffer,
                           js::Scope* enclosingScope = nullptr,
                           JSObject* enclosingEnv = nullptr)
-      : Base(cx, allocScope, options, stencil, sourceBuffer, enclosingScope,
-             enclosingEnv) {}
+      : Base(cx, allocScope, options, compilationInfo, sourceBuffer,
+             enclosingScope, enclosingEnv) {}
 
   bool compile(JSContext* cx, CompilationInfo& compilationInfo);
 };
@@ -525,12 +528,12 @@
  public:
   explicit StandaloneFunctionCompiler(JSContext* cx, LifoAllocScope& allocScope,
                                       const JS::ReadOnlyCompileOptions& options,
-                                      CompilationStencil& stencil,
+                                      CompilationInfo& compilationInfo,
                                       SourceText<Unit>& sourceBuffer,
                                       js::Scope* enclosingScope = nullptr,
                                       JSObject* enclosingEnv = nullptr)
-      : Base(cx, allocScope, options, stencil, sourceBuffer, enclosingScope,
-             enclosingEnv) {}
+      : Base(cx, allocScope, options, compilationInfo, sourceBuffer,
+             enclosingScope, enclosingEnv) {}
 
   using Base::createSourceAndParser;
 
@@ -758,8 +761,6 @@
   }
 
   ModuleBuilder builder(cx, parser.ptr());
-  StencilModuleMetadata& moduleMetadata =
-      compilationInfo.stencil.moduleMetadata;
 
   uint32_t len = this->sourceBuffer_.length();
   SourceExtent extent =
@@ -781,6 +782,8 @@
     return false;
   }
 
+  StencilModuleMetadata& moduleMetadata =
+      *compilationInfo.stencil.moduleMetadata;
   builder.finishFunctionDecls(moduleMetadata);
 
   MOZ_ASSERT_IF(!cx->isHelperThreadContext(), !cx->isExceptionPending());
@@ -864,7 +867,7 @@
             .functionFlags.isAsmJSNative());
   }
 
-  if (!compilationInfo.instantiateStencils(cx, gcOutput)) {
+  if (!CompilationInfo::instantiateStencils(cx, compilationInfo, gcOutput)) {
     return false;
   }
 
@@ -893,7 +896,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   ModuleCompiler<Unit> compiler(cx, allocScope, compilationInfo.input.options,
-                                compilationInfo.stencil, srcBuf);
+                                compilationInfo, srcBuf);
   if (!compiler.compile(cx, compilationInfo)) {
     return false;
   }
@@ -1019,7 +1022,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(
-      cx, allocScope, compilationInfo.input.options, compilationInfo.stencil,
+      cx, allocScope, compilationInfo.input.options, compilationInfo,
       fun->enclosingScope());
 
   Parser<FullParseHandler, Unit> parser(
@@ -1085,7 +1088,8 @@
       static_cast<uint32_t>(compilationInfo.input.lazy->immutableFlags());
 
   Rooted<CompilationGCOutput> gcOutput(cx);
-  if (!compilationInfo.instantiateStencils(cx, gcOutput.get())) {
+  if (!CompilationInfo::instantiateStencils(cx, compilationInfo,
+                                            gcOutput.get())) {
     return false;
   }
 
@@ -1119,7 +1123,7 @@
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   StandaloneFunctionCompiler<char16_t> compiler(
       cx, allocScope, compilationInfo.get().input.options,
-      compilationInfo.get().stencil, srcBuf, enclosingScope);
+      compilationInfo.get(), srcBuf, enclosingScope);
   if (!compiler.createSourceAndParser(cx, compilationInfo.get())) {
     return nullptr;
   }
@@ -1213,7 +1217,7 @@
 
 void CompilationInfoVector::trace(JSTracer* trc) {
   initial.trace(trc);
-  delazifications.trace(trc);
+  delazificationAtomCache.trace(trc);
 }
 
 void CompilationGCOutput::trace(JSTracer* trc) {
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeEmitter.cpp firefox-85.0+build1/js/src/frontend/BytecodeEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/BytecodeEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -128,12 +128,7 @@
       perScriptData_(cx, compilationInfo),
       compilationInfo(compilationInfo),
       compilationState(compilationState),
-      emitterMode(emitterMode) {
-  if (IsTypeInferenceEnabled() && sc->isFunctionBox()) {
-    // Functions have IC entries for type monitoring |this| and arguments.
-    bytecodeSection().setNumICEntries(sc->asFunctionBox()->nargs() + 1);
-  }
-}
+      emitterMode(emitterMode) {}
 
 BytecodeEmitter::BytecodeEmitter(BytecodeEmitter* parent,
                                  BCEParserHandle* handle, SharedContext* sc,
@@ -189,13 +184,14 @@
   return innermostEmitterScope()->locationBoundInScope(name, target);
 }
 
-Maybe<NameLocation> BytecodeEmitter::locationOfNameBoundInFunctionScope(
+template <typename T>
+Maybe<NameLocation> BytecodeEmitter::locationOfNameBoundInScopeType(
     const ParserAtom* name, EmitterScope* source) {
-  EmitterScope* funScope = source;
-  while (!funScope->scope(this).is<FunctionScope>()) {
-    funScope = funScope->enclosingInFrame();
+  EmitterScope* aScope = source;
+  while (!aScope->scope(this).is<T>()) {
+    aScope = aScope->enclosingInFrame();
   }
-  return source->locationBoundInScope(name, funScope);
+  return source->locationBoundInScope(name, aScope);
 }
 
 bool BytecodeEmitter::markStepBreakpoint() {
@@ -260,10 +256,6 @@
     return false;
   }
 
-  if (BytecodeOpHasTypeSet(op)) {
-    bytecodeSection().incrementNumTypeSets();
-  }
-
   if (BytecodeOpHasIC(op)) {
     // Even if every bytecode op is a JOF_IC op and the function has ARGC_LIMIT
     // arguments, numICEntries cannot overflow.
@@ -926,11 +918,6 @@
   MOZ_ASSERT_IF(op == JSOp::GetName || op == JSOp::GetGName,
                 atom != cx->parserNames().dotGenerator);
 
-  if (op == JSOp::GetProp && atom == cx->parserNames().length) {
-    /* Specialize length accesses for the interpreter. */
-    op = JSOp::Length;
-  }
-
   GCThingIndex index;
   if (!makeAtomIndex(atom, &index)) {
     return false;
@@ -1549,12 +1536,9 @@
   return findInnermostNestableControl<LoopControl>();
 }
 
-bool BytecodeEmitter::checkRunOnceContext() {
-  return sc->treatAsRunOnce() && !isInLoop();
-}
-
 bool BytecodeEmitter::checkSingletonContext() {
-  return sc->isTopLevelContext() && checkRunOnceContext();
+  MOZ_ASSERT_IF(sc->treatAsRunOnce(), sc->isTopLevelContext());
+  return sc->treatAsRunOnce() && !isInLoop();
 }
 
 bool BytecodeEmitter::needsImplicitThis() {
@@ -1654,41 +1638,50 @@
   va_end(args);
 }
 
-bool BytecodeEmitter::iteratorResultShape(GCThingIndex* shape) {
-  // Use |NoValues| to keep the flags consistent with their usage for normal
-  // object literal creation, where |NoValues| is always used in conjunction
-  // with |NewObject|.
-  ObjLiteralFlags flags{ObjLiteralFlag::NoValues};
+bool BytecodeEmitter::addObjLiteralData(ObjLiteralWriter& writer,
+                                        GCThingIndex* outIndex) {
+  size_t len = writer.getCode().size();
+  auto* code = compilationInfo.alloc.newArrayUninitialized<uint8_t>(len);
+  if (!code) {
+    js::ReportOutOfMemory(cx);
+    return false;
+  }
+  memcpy(code, writer.getCode().data(), len);
 
   ObjLiteralIndex objIndex(compilationInfo.stencil.objLiteralData.length());
   if (uint32_t(objIndex) >= TaggedScriptThingIndex::IndexLimit) {
     ReportAllocationOverflow(cx);
     return false;
   }
-  if (!compilationInfo.stencil.objLiteralData.emplaceBack()) {
+  if (!compilationInfo.stencil.objLiteralData.emplaceBack(code, len,
+                                                          writer.getFlags())) {
     js::ReportOutOfMemory(cx);
     return false;
   }
-  ObjLiteralStencil& data = compilationInfo.stencil.objLiteralData.back();
 
-  data.writer().beginObject(flags);
+  return perScriptData().gcThingList().append(objIndex, outIndex);
+}
+
+bool BytecodeEmitter::iteratorResultShape(GCThingIndex* outShape) {
+  // Use |NoValues| to keep the flags consistent with their usage for normal
+  // object literal creation, where |NoValues| is always used in conjunction
+  // with |NewObject|.
+  ObjLiteralFlags flags{ObjLiteralFlag::NoValues};
+
+  ObjLiteralWriter writer;
+  writer.beginObject(flags);
 
   using WellKnownName = js::frontend::WellKnownParserAtoms;
   for (auto name : {&WellKnownName::value, &WellKnownName::done}) {
     const ParserAtom* propName = cx->parserNames().*name;
+    writer.setPropName(propName);
 
-    uint32_t propNameIndex = 0;
-    if (!data.addAtom(cx, propName, &propNameIndex)) {
-      return false;
-    }
-    data.writer().setPropName(propNameIndex);
-
-    if (!data.writer().propWithUndefinedValue(cx)) {
+    if (!writer.propWithUndefinedValue(cx)) {
       return false;
     }
   }
 
-  return perScriptData().gcThingList().append(objIndex, shape);
+  return addObjLiteralData(writer, outShape);
 }
 
 bool BytecodeEmitter::emitPrepareIteratorResult() {
@@ -1858,11 +1851,11 @@
       this,
       kind == ParseNodeKind::PostIncrementExpr
           ? PropOpEmitter::Kind::PostIncrement
-          : kind == ParseNodeKind::PreIncrementExpr
-                ? PropOpEmitter::Kind::PreIncrement
-                : kind == ParseNodeKind::PostDecrementExpr
-                      ? PropOpEmitter::Kind::PostDecrement
-                      : PropOpEmitter::Kind::PreDecrement,
+      : kind == ParseNodeKind::PreIncrementExpr
+          ? PropOpEmitter::Kind::PreIncrement
+      : kind == ParseNodeKind::PostDecrementExpr
+          ? PropOpEmitter::Kind::PostDecrement
+          : PropOpEmitter::Kind::PreDecrement,
       isSuper ? PropOpEmitter::ObjKind::Super : PropOpEmitter::ObjKind::Other);
   if (!poe.prepareForObj()) {
     return false;
@@ -1896,11 +1889,11 @@
   NameOpEmitter noe(this, nameAtom,
                     kind == ParseNodeKind::PostIncrementExpr
                         ? NameOpEmitter::Kind::PostIncrement
-                        : kind == ParseNodeKind::PreIncrementExpr
-                              ? NameOpEmitter::Kind::PreIncrement
-                              : kind == ParseNodeKind::PostDecrementExpr
-                                    ? NameOpEmitter::Kind::PostDecrement
-                                    : NameOpEmitter::Kind::PreDecrement);
+                    : kind == ParseNodeKind::PreIncrementExpr
+                        ? NameOpEmitter::Kind::PreIncrement
+                    : kind == ParseNodeKind::PostDecrementExpr
+                        ? NameOpEmitter::Kind::PostDecrement
+                        : NameOpEmitter::Kind::PreDecrement);
   if (!noe.emitIncDec()) {
     return false;
   }
@@ -1976,11 +1969,11 @@
       this,
       kind == ParseNodeKind::PostIncrementExpr
           ? ElemOpEmitter::Kind::PostIncrement
-          : kind == ParseNodeKind::PreIncrementExpr
-                ? ElemOpEmitter::Kind::PreIncrement
-                : kind == ParseNodeKind::PostDecrementExpr
-                      ? ElemOpEmitter::Kind::PostDecrement
-                      : ElemOpEmitter::Kind::PreDecrement,
+      : kind == ParseNodeKind::PreIncrementExpr
+          ? ElemOpEmitter::Kind::PreIncrement
+      : kind == ParseNodeKind::PostDecrementExpr
+          ? ElemOpEmitter::Kind::PostDecrement
+          : ElemOpEmitter::Kind::PreDecrement,
       isSuper ? ElemOpEmitter::ObjKind::Super : ElemOpEmitter::ObjKind::Other,
       isPrivate ? NameVisibility::Private : NameVisibility::Public);
   if (!emitElemObjAndKey(elemExpr, isSuper, eoe)) {
@@ -2396,6 +2389,76 @@
   return emitHoistedFunctionsInList(&body->as<ListNode>());
 }
 
+// For Global and sloppy-Eval scripts, this performs most of the steps of the
+// spec's [GlobalDeclarationInstantiation] and [EvalDeclarationInstantiation]
+// operations.
+//
+// Note that while strict-Eval is handled in the same part of the spec, it never
+// fails for global-redeclaration checks so those scripts initialize directly in
+// their bytecode.
+bool BytecodeEmitter::emitDeclarationInstantiation(ParseNode* body) {
+  if (sc->isModuleContext()) {
+    // ES Modules have dedicated variable and lexial environments and therefore
+    // do not have to perform redeclaration checks. We initialize their bindings
+    // elsewhere in bytecode.
+    return true;
+  }
+
+  if (sc->isEvalContext() && sc->strict()) {
+    // Strict Eval has a dedicated variables (and lexical) environment and
+    // therefore does not have to perform redeclaration checks. We initialize
+    // their bindings elsewhere in the bytecode.
+    return true;
+  }
+
+  // If we have no variables bindings, then we are done!
+  if (sc->isGlobalContext()) {
+    if (!sc->asGlobalContext()->bindings) {
+      return true;
+    }
+  } else {
+    MOZ_ASSERT(sc->isEvalContext());
+
+    if (!sc->asEvalContext()->bindings) {
+      return true;
+    }
+  }
+
+#if DEBUG
+  // There should be no emitted functions yet.
+  for (const auto& thing : perScriptData().gcThingList().objects()) {
+    MOZ_ASSERT(thing.isEmptyGlobalScope() || thing.isScope());
+  }
+#endif
+
+  // Emit the hoisted functions to gc-things list. There is no bytecode
+  // generated yet to bind them.
+  if (!defineHoistedTopLevelFunctions(body)) {
+    return false;
+  }
+
+  // Save the last GCThingIndex emitted. The hoisted functions are contained in
+  // the gc-things list up until this point. This set of gc-things also contain
+  // initial scopes (of which there must be at least one).
+  MOZ_ASSERT(perScriptData().gcThingList().length() > 0);
+  GCThingIndex lastFun =
+      GCThingIndex(perScriptData().gcThingList().length() - 1);
+
+#if DEBUG
+  for (const auto& thing : perScriptData().gcThingList().objects()) {
+    MOZ_ASSERT(thing.isEmptyGlobalScope() || thing.isScope() ||
+               thing.isFunction());
+  }
+#endif
+
+  // Check for declaration conflicts and initialize the bindings.
+  if (!emitGCIndexOp(JSOp::GlobalOrEvalDeclInstantiation, lastFun)) {
+    return false;
+  }
+
+  return true;
+}
+
 bool BytecodeEmitter::emitScript(ParseNode* body) {
   AutoFrontendTraceLog traceLog(cx, TraceLogger_BytecodeEmission,
                                 parser->errorReporter(), body);
@@ -2406,6 +2469,7 @@
 
   TDZCheckCache tdzCache(this);
   EmitterScope emitterScope(this);
+  Maybe<AsyncEmitter> topLevelAwait;
   if (sc->isGlobalContext()) {
     if (!emitterScope.enterGlobal(this, sc->asGlobalContext())) {
       return false;
@@ -2419,6 +2483,9 @@
     if (!emitterScope.enterModule(this, sc->asModuleContext())) {
       return false;
     }
+    if (sc->asModuleContext()->isAsync()) {
+      topLevelAwait.emplace(this);
+    }
   }
 
   setFunctionBodyEndPos(body->pn_pos.end);
@@ -2426,10 +2493,14 @@
   bool isSloppyEval = sc->isEvalContext() && !sc->strict();
   if (isSloppyEval && body->is<LexicalScopeNode>() &&
       !body->as<LexicalScopeNode>().isEmptyScope()) {
-    // Sloppy eval scripts may need to emit DEFFUNs in the prologue. If there is
-    // an immediately enclosed lexical scope, we need to enter the lexical
-    // scope in the prologue for the DEFFUNs to pick up the right
-    // environment chain.
+    // Sloppy eval scripts may emit hoisted functions bindings with a
+    // `JSOp::GlobalOrEvalDeclInstantiation` opcode below. If this eval needs a
+    // top-level lexical environment, we must ensure that environment is created
+    // before those functions are created and bound.
+    //
+    // This differs from the global-script case below because the global-lexical
+    // environment exists outside the script itself. In the case of strict eval
+    // scripts, the `emitterScope` above is already sufficient.
     EmitterScope lexicalEmitterScope(this);
     LexicalScopeNode* scope = &body->as<LexicalScopeNode>();
 
@@ -2438,7 +2509,7 @@
       return false;
     }
 
-    if (!defineHoistedTopLevelFunctions(scope->scopeBody())) {
+    if (!emitDeclarationInstantiation(scope->scopeBody())) {
       return false;
     }
 
@@ -2459,8 +2530,11 @@
       return false;
     }
   } else {
-    if (sc->isGlobalContext() || isSloppyEval) {
-      if (!defineHoistedTopLevelFunctions(body)) {
+    if (!emitDeclarationInstantiation(body)) {
+      return false;
+    }
+    if (topLevelAwait) {
+      if (!topLevelAwait->prepareForModule()) {
         return false;
       }
     }
@@ -2469,7 +2543,14 @@
       return false;
     }
 
+    if (topLevelAwait) {
+      if (!topLevelAwait->prepareForBody()) {
+        return false;
+      }
+    }
+
     if (!emitTree(body)) {
+      // [stack]
       return false;
     }
 
@@ -2477,6 +2558,13 @@
       return false;
     }
   }
+
+  if (topLevelAwait) {
+    if (!topLevelAwait->emitEnd()) {
+      return false;
+    }
+  }
+
   if (!markSimpleBreakpoint()) {
     return false;
   }
@@ -2510,9 +2598,9 @@
 
   return ImmutableScriptData::new_(
       cx, mainOffset(), maxFixedSlots, nslots, bodyScopeIndex,
-      bytecodeSection().numICEntries(), bytecodeSection().numTypeSets(),
-      isFunction, funLength, bytecodeSection().code(),
-      bytecodeSection().notes(), bytecodeSection().resumeOffsetList().span(),
+      bytecodeSection().numICEntries(), isFunction, funLength,
+      bytecodeSection().code(), bytecodeSection().notes(),
+      bytecodeSection().resumeOffsetList().span(),
       bytecodeSection().scopeNoteList().span(),
       bytecodeSection().tryNoteList().span());
 }
@@ -2825,8 +2913,11 @@
     const Maybe<uint32_t>& callSourceCoordOffset,
     IteratorKind iterKind /* = IteratorKind::Sync */,
     bool allowSelfHosted /* = false */) {
-  MOZ_ASSERT(allowSelfHosted || emitterMode != BytecodeEmitter::SelfHosting,
-             ".next() iteration is prohibited in self-hosted code because it "
+  // TODO: migrate Module code to cpp, to avoid having the extra check here.
+  MOZ_ASSERT(allowSelfHosted || emitterMode != BytecodeEmitter::SelfHosting ||
+                 (sc->isModuleContext() && sc->asModuleContext()->isAsync()),
+             ".next() iteration is prohibited in non-module self-hosted code "
+             "because it"
              "can run user-modifiable iteration code");
 
   //                [stack] ... NEXT ITER
@@ -2954,7 +3045,7 @@
   // Step 4.
   //
   // Get the "return" method.
-  if (!emitAtomOp(JSOp::CallProp, cx->parserNames().return_)) {
+  if (!emitAtomOp(JSOp::GetProp, cx->parserNames().return_)) {
     //              [stack] ... ITER RET
     return false;
   }
@@ -4174,8 +4265,8 @@
       bool isSuper = prop->isSuper();
       poe.emplace(this,
                   isCompound ? PropOpEmitter::Kind::CompoundAssignment
-                             : isInit ? PropOpEmitter::Kind::PropInit
-                                      : PropOpEmitter::Kind::SimpleAssignment,
+                  : isInit   ? PropOpEmitter::Kind::PropInit
+                             : PropOpEmitter::Kind::SimpleAssignment,
                   isSuper ? PropOpEmitter::ObjKind::Super
                           : PropOpEmitter::ObjKind::Other);
       if (!poe->prepareForObj()) {
@@ -4205,8 +4296,8 @@
       bool isPrivate = elem->key().isKind(ParseNodeKind::PrivateName);
       eoe.emplace(this,
                   isCompound ? ElemOpEmitter::Kind::CompoundAssignment
-                             : isInit ? ElemOpEmitter::Kind::PropInit
-                                      : ElemOpEmitter::Kind::SimpleAssignment,
+                  : isInit   ? ElemOpEmitter::Kind::PropInit
+                             : ElemOpEmitter::Kind::SimpleAssignment,
                   isSuper ? ElemOpEmitter::ObjKind::Super
                           : ElemOpEmitter::ObjKind::Other,
                   isPrivate ? NameVisibility::Private : NameVisibility::Public);
@@ -4385,6 +4476,8 @@
 }
 
 bool BytecodeEmitter::emitShortCircuitAssignment(AssignmentNode* node) {
+  TDZCheckCache tdzCache(this);
+
   JSOp op;
   switch (node->getKind()) {
     case ParseNodeKind::CoalesceAssignExpr:
@@ -4616,7 +4709,7 @@
 }
 
 bool BytecodeEmitter::emitCallSiteObjectArray(ListNode* cookedOrRaw,
-                                              GCThingIndex* arrayIndex) {
+                                              GCThingIndex* outArrayIndex) {
   uint32_t count = cookedOrRaw->count();
   ParseNode* pn = cookedOrRaw->head();
 
@@ -4629,33 +4722,24 @@
     MOZ_ASSERT(cookedOrRaw->isKind(ParseNodeKind::ArrayExpr));
   }
 
-  ObjLiteralIndex objIndex(compilationInfo.stencil.objLiteralData.length());
-  if (uint32_t(objIndex) >= TaggedScriptThingIndex::IndexLimit) {
-    ReportAllocationOverflow(cx);
-    return false;
-  }
-  if (!compilationInfo.stencil.objLiteralData.emplaceBack()) {
-    js::ReportOutOfMemory(cx);
-    return false;
-  }
-  ObjLiteralStencil& data = compilationInfo.stencil.objLiteralData.back();
+  ObjLiteralWriter writer;
 
   ObjLiteralFlags flags(ObjLiteralFlag::Array);
-  data.writer().beginObject(flags);
-  data.writer().beginDenseArrayElements();
+  writer.beginObject(flags);
+  writer.beginDenseArrayElements();
 
   size_t idx;
   for (idx = 0; pn; idx++, pn = pn->pn_next) {
     MOZ_ASSERT(pn->isKind(ParseNodeKind::TemplateStringExpr) ||
                pn->isKind(ParseNodeKind::RawUndefinedExpr));
 
-    if (!emitObjLiteralValue(&data, pn)) {
+    if (!emitObjLiteralValue(writer, pn)) {
       return false;
     }
   }
   MOZ_ASSERT(idx == count);
 
-  return perScriptData().gcThingList().append(objIndex, arrayIndex);
+  return addObjLiteralData(writer, outArrayIndex);
 }
 
 bool BytecodeEmitter::emitCallSiteObject(CallSiteNode* callSiteObj) {
@@ -4827,22 +4911,31 @@
   }
 
 if_again:
+  ParseNode* testNode = ifNode->kid1();
+  auto conditionKind = IfEmitter::ConditionKind::Positive;
+  if (testNode->isKind(ParseNodeKind::NotExpr)) {
+    testNode = testNode->as<UnaryNode>().kid();
+    conditionKind = IfEmitter::ConditionKind::Negative;
+  }
+
   if (!markStepBreakpoint()) {
     return false;
   }
 
-  /* Emit code for the condition before pushing stmtInfo. */
-  if (!emitTree(ifNode->kid1())) {
+  // Emit code for the condition before pushing stmtInfo.
+  // NOTE: NotExpr of testNode may be unwrapped, and in that case the negation
+  //       is handled by conditionKind.
+  if (!emitTree(testNode)) {
     return false;
   }
 
   ParseNode* elseNode = ifNode->kid3();
   if (elseNode) {
-    if (!ifThenElse.emitThenElse()) {
+    if (!ifThenElse.emitThenElse(conditionKind)) {
       return false;
     }
   } else {
-    if (!ifThenElse.emitThen()) {
+    if (!ifThenElse.emitThen(conditionKind)) {
       return false;
     }
   }
@@ -5097,7 +5190,7 @@
     //              [stack] OBJ OBJ @@ITERATOR
     return false;
   }
-  if (!emitElemOpBase(JSOp::CallElem)) {
+  if (!emitElemOpBase(JSOp::GetElem)) {
     //              [stack] OBJ ITERFN
     return false;
   }
@@ -5138,7 +5231,7 @@
     //              [stack] OBJ OBJ @@ASYNCITERATOR
     return false;
   }
-  if (!emitElemOpBase(JSOp::CallElem)) {
+  if (!emitElemOpBase(JSOp::GetElem)) {
     //              [stack] OBJ ITERFN
     return false;
   }
@@ -5148,11 +5241,8 @@
     //              [stack] OBJ ITERFN !UNDEF-OR-NULL
     return false;
   }
-  if (!emit1(JSOp::Not)) {
-    //              [stack] OBJ ITERFN UNDEF-OR-NULL
-    return false;
-  }
-  if (!ifAsyncIterIsUndefined.emitThenElse()) {
+  if (!ifAsyncIterIsUndefined.emitThenElse(
+          IfEmitter::ConditionKind::Negative)) {
     //              [stack] OBJ ITERFN
     return false;
   }
@@ -5169,7 +5259,7 @@
     //              [stack] OBJ OBJ @@ITERATOR
     return false;
   }
-  if (!emitElemOpBase(JSOp::CallElem)) {
+  if (!emitElemOpBase(JSOp::GetElem)) {
     //              [stack] OBJ ITERFN
     return false;
   }
@@ -5407,9 +5497,9 @@
   unsigned iflags = forOfLoop->iflags();
   IteratorKind iterKind =
       (iflags & JSITER_FORAWAITOF) ? IteratorKind::Async : IteratorKind::Sync;
-  MOZ_ASSERT_IF(iterKind == IteratorKind::Async, sc->asFunctionBox());
+  MOZ_ASSERT_IF(iterKind == IteratorKind::Async, sc->isSuspendableContext());
   MOZ_ASSERT_IF(iterKind == IteratorKind::Async,
-                sc->asFunctionBox()->isAsync());
+                sc->asSuspendableContext()->isAsync());
 
   ParseNode* forHeadExpr = forOfHead->kid3();
 
@@ -5742,33 +5832,6 @@
       funbox->setMemberInitializers(*memberInitializers);
     }
 
-    // A function is a run-once lambda if the following all hold:
-    //  - Enclosing script must be run-once lambda or run-once top-level.
-    //        `SharedContext::treatAsRunOnce()`
-    //  - Function definition must not be in a loop.
-    //        `BytecodeEmitter::isInLoop() == false`
-    //  - Function must be an IIFE like "(function(){ })()".
-    //        `CallOrNewEmitter::state == State::FunctionCallee`
-    //  - Function must not match `shouldSuppressRunOnce` conditions.
-    //
-    // NOTE: This is a heuristic and through trick such as `fun.caller` it may
-    //       still be run more than once. The VM must accomodate this.
-    // NOTE: For a lazy function, this will be applied to any existing function
-    //       in UpdateEmittedInnerFunctions().
-    bool isRunOnceLambda =
-        emittingRunOnceLambda && !funbox->shouldSuppressRunOnce();
-    funbox->setTreatAsRunOnce(isRunOnceLambda);
-
-    // Mark functions which are expected to only have one instance as singletons
-    // functions. These function instances will then always have a unique script
-    // of which they are the canonical function. This improves type-inferrence
-    // precision. CloneFunctionObject will make a deep clone of the function and
-    // script as needed if our prediction is wrong.
-    //
-    // NOTE: This heuristic is arbitrary, but some debugger tests rely on the
-    //       current behaviour and need to be updated if the condiditons change.
-    funbox->setIsSingleton(checkRunOnceContext());
-
     if (!funbox->emitBytecode) {
       return fe.emitLazy();
       //            [stack] FUN?
@@ -6002,7 +6065,8 @@
       return false;
     }
 
-    if (sc->asFunctionBox()->isAsync() && sc->asFunctionBox()->isGenerator()) {
+    if (sc->asSuspendableContext()->isAsync() &&
+        sc->asSuspendableContext()->isGenerator()) {
       if (!emitAwaitInInnermostScope()) {
         return false;
       }
@@ -6068,7 +6132,7 @@
   if (needsFinalYield) {
     // We know that .generator is on the function scope, as we just exited
     // all nested scopes.
-    NameLocation loc = *locationOfNameBoundInFunctionScope(
+    NameLocation loc = *locationOfNameBoundInScopeType<FunctionScope>(
         cx->parserNames().dotGenerator, varEmitterScope);
 
     // Resolve the return value before emitting the final yield.
@@ -6118,7 +6182,13 @@
 }
 
 bool BytecodeEmitter::emitGetDotGeneratorInScope(EmitterScope& currentScope) {
-  NameLocation loc = *locationOfNameBoundInFunctionScope(
+  if (!sc->isFunction() && sc->isModuleContext() &&
+      sc->asModuleContext()->isAsync()) {
+    NameLocation loc = *locationOfNameBoundInScopeType<ModuleScope>(
+        cx->parserNames().dotGenerator, &currentScope);
+    return emitGetNameAtLocation(cx->parserNames().dotGenerator, loc);
+  }
+  NameLocation loc = *locationOfNameBoundInScopeType<FunctionScope>(
       cx->parserNames().dotGenerator, &currentScope);
   return emitGetNameAtLocation(cx->parserNames().dotGenerator, loc);
 }
@@ -6169,7 +6239,7 @@
   }
 
   // 25.5.3.7 AsyncGeneratorYield step 5.
-  if (sc->asFunctionBox()->isAsync()) {
+  if (sc->asSuspendableContext()->isAsync()) {
     MOZ_ASSERT(!needsIteratorResult);
     if (!emitAwaitInInnermostScope()) {
       //            [stack] RESULT
@@ -6206,7 +6276,7 @@
 }
 
 bool BytecodeEmitter::emitAwaitInInnermostScope(UnaryNode* awaitNode) {
-  MOZ_ASSERT(sc->isFunctionBox());
+  MOZ_ASSERT(sc->isSuspendableContext());
   MOZ_ASSERT(awaitNode->isKind(ParseNodeKind::AwaitExpr));
 
   if (!emitTree(awaitNode->kid())) {
@@ -6221,18 +6291,13 @@
     return false;
   }
 
-  if (!emit1(JSOp::Not)) {
-    //              [stack] VALUE_OR_RESOLVED !CANSKIP
-    return false;
-  }
-
   InternalIfEmitter ifCanSkip(this);
-  if (!ifCanSkip.emitThen()) {
+  if (!ifCanSkip.emitThen(IfEmitter::ConditionKind::Negative)) {
     //              [stack] VALUE_OR_RESOLVED
     return false;
   }
 
-  if (sc->asFunctionBox()->needsPromiseResult()) {
+  if (sc->asSuspendableContext()->needsPromiseResult()) {
     if (!emitGetDotGeneratorInScope(currentScope)) {
       //            [stack] VALUE GENERATOR
       return false;
@@ -6269,13 +6334,14 @@
 // 14.4.14 Runtime Semantics: Evaluation
 // YieldExpression : yield* AssignmentExpression
 bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
-  MOZ_ASSERT(sc->isFunctionBox());
-  MOZ_ASSERT(sc->asFunctionBox()->isGenerator());
+  MOZ_ASSERT(sc->isSuspendableContext());
+  MOZ_ASSERT(sc->asSuspendableContext()->isGenerator());
 
   // Step 1.
-  IteratorKind iterKind =
-      sc->asFunctionBox()->isAsync() ? IteratorKind::Async : IteratorKind::Sync;
-  bool needsIteratorResult = sc->asFunctionBox()->needsIteratorResult();
+  IteratorKind iterKind = sc->asSuspendableContext()->isAsync()
+                              ? IteratorKind::Async
+                              : IteratorKind::Sync;
+  bool needsIteratorResult = sc->asSuspendableContext()->needsIteratorResult();
 
   // Steps 2-5.
   if (!emitTree(iter)) {
@@ -6412,7 +6478,7 @@
       //            [stack] NEXT ITER RECEIVED ITER ITER
       return false;
     }
-    if (!emitAtomOp(JSOp::CallProp, cx->parserNames().throw_)) {
+    if (!emitAtomOp(JSOp::GetProp, cx->parserNames().throw_)) {
       //            [stack] NEXT ITER RECEIVED ITER THROW
       return false;
     }
@@ -6520,7 +6586,7 @@
       //            [stack] NEXT ITER RECEIVED ITER ITER
       return false;
     }
-    if (!emitAtomOp(JSOp::CallProp, cx->parserNames().return_)) {
+    if (!emitAtomOp(JSOp::GetProp, cx->parserNames().return_)) {
       //            [stack] NEXT ITER RECEIVED ITER RET
       return false;
     }
@@ -7868,11 +7934,6 @@
    * First, emit code for the left operand to evaluate the callable or
    * constructable object expression.
    *
-   * For operator new, we emit JSOp::GetProp instead of JSOp::CallProp, etc.
-   * This is necessary to interpose the lambda-initialized method read
-   * barrier -- see the code in jsinterp.cpp for JSOp::Lambda followed by
-   * JSOp::{Set,Init}Prop.
-   *
    * Then (or in a call case that has no explicit reference-base
    * object) we emit JSOp::Undefined to produce the undefined |this|
    * value required for calls (which non-strict mode functions
@@ -8424,11 +8485,20 @@
     return false;
   }
 
-  if (!emitTree(&conditional.condition())) {
+  ParseNode* conditionNode = &conditional.condition();
+  auto conditionKind = IfEmitter::ConditionKind::Positive;
+  if (conditionNode->isKind(ParseNodeKind::NotExpr)) {
+    conditionNode = conditionNode->as<UnaryNode>().kid();
+    conditionKind = IfEmitter::ConditionKind::Negative;
+  }
+
+  // NOTE: NotExpr of conditionNode may be unwrapped, and in that case the
+  //       negation is handled by conditionKind.
+  if (!emitTree(conditionNode)) {
     return false;
   }
 
-  if (!cond.emitThenElse()) {
+  if (!cond.emitThenElse(conditionKind)) {
     return false;
   }
 
@@ -8696,11 +8766,10 @@
             }
           }
 
-          FunctionPrefixKind prefix = accessorType == AccessorType::None
-                                          ? FunctionPrefixKind::None
-                                          : accessorType == AccessorType::Getter
-                                                ? FunctionPrefixKind::Get
-                                                : FunctionPrefixKind::Set;
+          FunctionPrefixKind prefix =
+              accessorType == AccessorType::None     ? FunctionPrefixKind::None
+              : accessorType == AccessorType::Getter ? FunctionPrefixKind::Get
+                                                     : FunctionPrefixKind::Set;
 
           if (!emitAnonymousFunctionWithComputedName(propVal, prefix)) {
             //      [stack] CTOR? OBJ CTOR? KEY VAL
@@ -8847,18 +8916,9 @@
 
 bool BytecodeEmitter::emitPropertyListObjLiteral(ListNode* obj,
                                                  ObjLiteralFlags flags) {
-  ObjLiteralIndex objIndex(compilationInfo.stencil.objLiteralData.length());
-  if (uint32_t(objIndex) >= TaggedScriptThingIndex::IndexLimit) {
-    ReportAllocationOverflow(cx);
-    return false;
-  }
-  if (!compilationInfo.stencil.objLiteralData.emplaceBack()) {
-    js::ReportOutOfMemory(cx);
-    return false;
-  }
-  ObjLiteralStencil& data = compilationInfo.stencil.objLiteralData.back();
+  ObjLiteralWriter writer;
 
-  data.writer().beginObject(flags);
+  writer.beginObject(flags);
   bool noValues = flags.contains(ObjLiteralFlag::NoValues);
   bool singleton = flags.contains(ObjLiteralFlag::Singleton);
 
@@ -8867,11 +8927,7 @@
     ParseNode* key = prop->left();
 
     if (key->is<NameNode>()) {
-      uint32_t propNameIndex = 0;
-      if (!data.addAtom(cx, key->as<NameNode>().atom(), &propNameIndex)) {
-        return false;
-      }
-      data.writer().setPropName(propNameIndex);
+      writer.setPropName(key->as<NameNode>().atom());
     } else {
       double numValue = key->as<NumericLiteral>().value();
       int32_t i = 0;
@@ -8880,34 +8936,32 @@
       MOZ_ASSERT(numIsInt);
       MOZ_ASSERT(
           ObjLiteralWriter::arrayIndexInRange(i));  // checked previously.
-      data.writer().setPropIndex(i);
+      writer.setPropIndex(i);
     }
 
     if (noValues) {
-      if (!data.writer().propWithUndefinedValue(cx)) {
+      if (!writer.propWithUndefinedValue(cx)) {
         return false;
       }
     } else {
       ParseNode* value = prop->right();
-      if (!emitObjLiteralValue(&data, value)) {
+      if (!emitObjLiteralValue(writer, value)) {
         return false;
       }
     }
   }
 
   GCThingIndex index;
-  if (!perScriptData().gcThingList().append(objIndex, &index)) {
+  if (!addObjLiteralData(writer, &index)) {
     return false;
   }
 
-  bool isInnerSingleton = flags.contains(ObjLiteralFlag::IsInnerSingleton);
+  // TODO(no-TI): remove IsInnerSingleton flag.
 
   // JSOp::Object may only be used by (top-level) run-once scripts.
   MOZ_ASSERT_IF(singleton, compilationInfo.input.options.isRunOnce);
 
-  JSOp op = singleton
-                ? JSOp::Object
-                : isInnerSingleton ? JSOp::NewObjectWithGroup : JSOp::NewObject;
+  JSOp op = singleton ? JSOp::Object : JSOp::NewObject;
   if (!emitGCIndexOp(op, index)) {
     //              [stack] OBJ
     return false;
@@ -8923,18 +8977,9 @@
   // with |NewObject|.
   ObjLiteralFlags flags{ObjLiteralFlag::NoValues};
 
-  ObjLiteralIndex objIndex(compilationInfo.stencil.objLiteralData.length());
-  if (uint32_t(objIndex) >= TaggedScriptThingIndex::IndexLimit) {
-    ReportAllocationOverflow(cx);
-    return false;
-  }
-  if (!compilationInfo.stencil.objLiteralData.emplaceBack()) {
-    js::ReportOutOfMemory(cx);
-    return false;
-  }
-  ObjLiteralStencil& data = compilationInfo.stencil.objLiteralData.back();
+  ObjLiteralWriter writer;
 
-  data.writer().beginObject(flags);
+  writer.beginObject(flags);
 
   for (ParseNode* member : pattern->contents()) {
     if (member->isKind(ParseNodeKind::Spread)) {
@@ -8950,19 +8995,15 @@
       atom = key->as<NameNode>().atom();
     }
 
-    uint32_t propNameIndex = 0;
-    if (!data.addAtom(cx, atom, &propNameIndex)) {
-      return false;
-    }
-    data.writer().setPropName(propNameIndex);
+    writer.setPropName(atom);
 
-    if (!data.writer().propWithUndefinedValue(cx)) {
+    if (!writer.propWithUndefinedValue(cx)) {
       return false;
     }
   }
 
   GCThingIndex index;
-  if (!perScriptData().gcThingList().append(objIndex, &index)) {
+  if (!addObjLiteralData(writer, &index)) {
     return false;
   }
 
@@ -8980,37 +9021,28 @@
 }
 
 bool BytecodeEmitter::emitObjLiteralArray(ParseNode* arrayHead, bool isCow) {
-  ObjLiteralIndex objIndex(compilationInfo.stencil.objLiteralData.length());
-  if (uint32_t(objIndex) >= TaggedScriptThingIndex::IndexLimit) {
-    ReportAllocationOverflow(cx);
-    return false;
-  }
-  if (!compilationInfo.stencil.objLiteralData.emplaceBack()) {
-    js::ReportOutOfMemory(cx);
-    return false;
-  }
-  ObjLiteralStencil& data = compilationInfo.stencil.objLiteralData.back();
+  ObjLiteralWriter writer;
 
   ObjLiteralFlags flags(ObjLiteralFlag::Array);
   if (isCow) {
+    // TODO(no-TI): remove.
     flags += ObjLiteralFlag::ArrayCOW;
   }
-  data.writer().beginObject(flags);
+  writer.beginObject(flags);
 
-  data.writer().beginDenseArrayElements();
+  writer.beginDenseArrayElements();
   for (ParseNode* elem = arrayHead; elem; elem = elem->pn_next) {
-    if (!emitObjLiteralValue(&data, elem)) {
+    if (!emitObjLiteralValue(writer, elem)) {
       return false;
     }
   }
 
   GCThingIndex index;
-  if (!perScriptData().gcThingList().append(objIndex, &index)) {
+  if (!addObjLiteralData(writer, &index)) {
     return false;
   }
 
-  JSOp op = isCow ? JSOp::NewArrayCopyOnWrite : JSOp::Object;
-  if (!emitGCIndexOp(op, index)) {
+  if (!emitGCIndexOp(JSOp::Object, index)) {
     //              [stack] OBJ
     return false;
   }
@@ -9028,7 +9060,7 @@
          value->isKind(ParseNodeKind::TemplateStringExpr);
 }
 
-bool BytecodeEmitter::emitObjLiteralValue(ObjLiteralStencil* data,
+bool BytecodeEmitter::emitObjLiteralValue(ObjLiteralWriter& writer,
                                           ParseNode* value) {
   MOZ_ASSERT(isRHSObjLiteralCompatible(value));
   if (value->isKind(ParseNodeKind::NumberExpr)) {
@@ -9040,32 +9072,28 @@
     } else {
       v.setDouble(numValue);
     }
-    if (!data->writer().propWithConstNumericValue(cx, v)) {
+    if (!writer.propWithConstNumericValue(cx, v)) {
       return false;
     }
   } else if (value->isKind(ParseNodeKind::TrueExpr)) {
-    if (!data->writer().propWithTrueValue(cx)) {
+    if (!writer.propWithTrueValue(cx)) {
       return false;
     }
   } else if (value->isKind(ParseNodeKind::FalseExpr)) {
-    if (!data->writer().propWithFalseValue(cx)) {
+    if (!writer.propWithFalseValue(cx)) {
       return false;
     }
   } else if (value->isKind(ParseNodeKind::NullExpr)) {
-    if (!data->writer().propWithNullValue(cx)) {
+    if (!writer.propWithNullValue(cx)) {
       return false;
     }
   } else if (value->isKind(ParseNodeKind::RawUndefinedExpr)) {
-    if (!data->writer().propWithUndefinedValue(cx)) {
+    if (!writer.propWithUndefinedValue(cx)) {
       return false;
     }
   } else if (value->isKind(ParseNodeKind::StringExpr) ||
              value->isKind(ParseNodeKind::TemplateStringExpr)) {
-    uint32_t valueAtomIndex = 0;
-    if (!data->addAtom(cx, value->as<NameNode>().atom(), &valueAtomIndex)) {
-      return false;
-    }
-    if (!data->writer().propWithAtomValue(cx, valueAtomIndex)) {
+    if (!writer.propWithAtomValue(cx, value->as<NameNode>().atom())) {
       return false;
     }
   } else {
@@ -9508,9 +9536,6 @@
       return false;
     }
 
-    // Don't use CallElem here, because the receiver of the call != the
-    // receiver of this getelem. (Specifically, the call receiver is `this`,
-    // and the receiver of this getelem is `.initializers`)
     if (!emit1(JSOp::GetElem)) {
       //            [stack] ARRAY? FUNC
       return false;
@@ -9570,9 +9595,6 @@
       return false;
     }
 
-    // Don't use CallElem here, because the receiver of the call != the receiver
-    // of this getelem. (Specifically, the call receiver is `ctor`, and the
-    // receiver of this getelem is `.staticInitializers`)
     if (!emit1(JSOp::GetElem)) {
       //            [stack] CTOR ARRAY? FUNC
       return false;
@@ -9768,22 +9790,9 @@
 
 bool BytecodeEmitter::emitArrayLiteral(ListNode* array) {
   bool isSingleton = checkSingletonContext();
-  if (!array->hasNonConstInitializer() && array->head()) {
-    // If the array consists entirely of primitive values, make a
-    // template object with copy on write elements that can be reused
-    // every time the initializer executes. In non-singleton mode, don't do
-    // this if the array is small: copying the elements lazily is not worth it
-    // in that case.
-    // Note: for now we don't use COW arrays if TI is disabled. We probably need
-    // a BaseShape flag to optimize this better without TI. See bug 1626854.
-    static const size_t MinElementsForCopyOnWrite = 5;
-    if (IsTypeInferenceEnabled() &&
-        emitterMode != BytecodeEmitter::SelfHosting &&
-        (array->count() >= MinElementsForCopyOnWrite || isSingleton) &&
-        isArrayObjLiteralCompatible(array->head())) {
-      return emitObjLiteralArray(array->head(), /* isCow = */ !isSingleton);
-    }
-  }
+
+  // TODO(no-TI): remove COW arrays. See if we can use JSOp::Object for arrays
+  // again.
 
   return emitArray(array->head(), array->count(),
                    /* isInner = */ isSingleton);
@@ -10563,8 +10572,6 @@
 
   switch (op) {
     case JSOp::GetProp:
-    case JSOp::CallProp:
-    case JSOp::Length:
       return emitInstrumentationSlow(
           InstrumentationKind::GetProperty, [=](uint32_t pushed) {
             return emitDupAt(pushed) && emitAtomOp(JSOp::String, atomIndex);
@@ -10577,7 +10584,6 @@
                    emitAtomOp(JSOp::String, atomIndex) && emitDupAt(pushed + 2);
           });
     case JSOp::GetElem:
-    case JSOp::CallElem:
       return emitInstrumentationSlow(
           InstrumentationKind::GetElement,
           [=](uint32_t pushed) { return emitDupAt(pushed + 1, 2); });
@@ -11280,8 +11286,7 @@
 
   // Copy the TaggedScriptThingIndex data from the emitter to the stencil.
   mozilla::Span<TaggedScriptThingIndex> stencilThings =
-      NewScriptThingSpanUninitialized(cx, compilationInfo.stencil.alloc,
-                                      ngcthings);
+      NewScriptThingSpanUninitialized(cx, compilationInfo.alloc, ngcthings);
   if (stencilThings.empty()) {
     return false;
   }
@@ -11303,7 +11308,14 @@
   // Update flags specific to functions.
   if (sc->isFunctionBox()) {
     FunctionBox* funbox = sc->asFunctionBox();
-    funbox->copyScriptFields(*script);
+    MOZ_ASSERT(script == &funbox->functionStencil());
+    funbox->copyUpdatedImmutableFlags();
+    MOZ_ASSERT(funbox->extent().sourceStart == script->extent.sourceStart);
+    MOZ_ASSERT(funbox->extent().sourceEnd == script->extent.sourceEnd);
+    MOZ_ASSERT(funbox->extent().toStringStart == script->extent.toStringStart);
+    MOZ_ASSERT(funbox->extent().toStringEnd == script->extent.toStringEnd);
+    MOZ_ASSERT(funbox->extent().lineno == script->extent.lineno);
+    MOZ_ASSERT(funbox->extent().column == script->extent.column);
     MOZ_ASSERT(script->isFunction());
   } else {
     sc->copyScriptFields(*script);
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeEmitter.h firefox-85.0+build1/js/src/frontend/BytecodeEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/BytecodeEmitter.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -135,9 +135,6 @@
   // Script contains finally block.
   bool hasTryFinally = false;
 
-  // True while emitting a lambda which is only expected to run once.
-  bool emittingRunOnceLambda = false;
-
   enum EmitterMode {
     Normal,
 
@@ -223,14 +220,18 @@
   mozilla::Maybe<NameLocation> locationOfNameBoundInScope(
       const ParserAtom* name, EmitterScope* target);
 
-  // Get the location of a name known to be bound in the function scope,
+  // Get the location of a name known to be bound in a given scope,
   // starting at the source scope.
-  mozilla::Maybe<NameLocation> locationOfNameBoundInFunctionScope(
+  template <typename T>
+  mozilla::Maybe<NameLocation> locationOfNameBoundInScopeType(
       const ParserAtom* name, EmitterScope* source);
 
+  // Get the location of a name known to be bound in the function scope,
+  // starting at the source scope.
   mozilla::Maybe<NameLocation> locationOfNameBoundInFunctionScope(
       const ParserAtom* name) {
-    return locationOfNameBoundInFunctionScope(name, innermostEmitterScope());
+    return locationOfNameBoundInScopeType<FunctionScope>(
+        name, innermostEmitterScope());
   }
 
   void setVarEmitterScope(EmitterScope* emitterScope) {
@@ -273,10 +274,6 @@
   bool isInLoop();
   MOZ_MUST_USE bool checkSingletonContext();
 
-  // Check whether our function is in a run-once context (a toplevel
-  // run-one script or a run-once lambda).
-  MOZ_MUST_USE bool checkRunOnceContext();
-
   bool needsImplicitThis();
 
   MOZ_MUST_USE bool emitThisEnvironmentCallee();
@@ -362,6 +359,8 @@
       ParseNode* pn, OptionalEmitter& oe,
       ValueUsage valueUsage = ValueUsage::WantValue);
 
+  MOZ_MUST_USE bool emitDeclarationInstantiation(ParseNode* body);
+
   // Emit global, eval, or module code for tree rooted at body. Always
   // encompasses the entire source.
   MOZ_MUST_USE bool emitScript(ParseNode* body);
@@ -505,7 +504,7 @@
   // Is a field value OBJLITERAL-compatible?
   MOZ_MUST_USE bool isRHSObjLiteralCompatible(ParseNode* value);
 
-  MOZ_MUST_USE bool emitObjLiteralValue(ObjLiteralStencil* data,
+  MOZ_MUST_USE bool emitObjLiteralValue(ObjLiteralWriter& writer,
                                         ParseNode* value);
 
   enum class FieldPlacement { Instance, Static };
@@ -560,7 +559,13 @@
 
   MOZ_MUST_USE bool emitPrepareIteratorResult();
   MOZ_MUST_USE bool emitFinishIteratorResult(bool done);
-  MOZ_MUST_USE bool iteratorResultShape(GCThingIndex* shape);
+  MOZ_MUST_USE bool iteratorResultShape(GCThingIndex* outShape);
+
+  // Convert and add `writer` data to stencil.
+  // Iff it suceeds, `outIndex` out parameter is initialized to the index of the
+  // object in GC things vector.
+  MOZ_MUST_USE bool addObjLiteralData(ObjLiteralWriter& writer,
+                                      GCThingIndex* outIndex);
 
   MOZ_MUST_USE bool emitGetDotGeneratorInInnermostScope() {
     return emitGetDotGeneratorInScope(*innermostEmitterScope());
@@ -699,7 +704,7 @@
   MOZ_MUST_USE bool emitInitializer(ParseNode* initializer, ParseNode* pattern);
 
   MOZ_MUST_USE bool emitCallSiteObjectArray(ListNode* cookedOrRaw,
-                                            GCThingIndex* arrayIndex);
+                                            GCThingIndex* outArrayIndex);
   MOZ_MUST_USE bool emitCallSiteObject(CallSiteNode* callSiteObj);
   MOZ_MUST_USE bool emitTemplateString(ListNode* templateString);
   MOZ_MUST_USE bool emitAssignmentOrInit(ParseNodeKind kind, ParseNode* lhs,
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeSection.cpp firefox-85.0+build1/js/src/frontend/BytecodeSection.cpp
--- firefox-84.0.2+build1/js/src/frontend/BytecodeSection.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeSection.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -53,15 +53,14 @@
 }
 
 bool js::frontend::EmitScriptThingsVector(
-    JSContext* cx, CompilationInfo& compilationInfo,
+    JSContext* cx, CompilationInput& input, CompilationStencil& stencil,
     CompilationGCOutput& gcOutput,
     mozilla::Span<const TaggedScriptThingIndex> things,
     mozilla::Span<JS::GCCellPtr> output) {
   MOZ_ASSERT(things.size() <= INDEX_LIMIT);
   MOZ_ASSERT(things.size() == output.size());
 
-  auto& atomCache = compilationInfo.input.atomCache;
-  auto& stencil = compilationInfo.stencil;
+  auto& atomCache = input.atomCache;
 
   for (uint32_t i = 0; i < things.size(); i++) {
     const auto& thing = things[i];
@@ -161,7 +160,7 @@
 
 JSObject* ObjLiteralStencil::create(JSContext* cx,
                                     CompilationAtomCache& atomCache) const {
-  return InterpretObjLiteral(cx, atomCache, atoms_, writer_);
+  return InterpretObjLiteral(cx, atomCache, code_, flags_);
 }
 
 BytecodeSection::BytecodeSection(JSContext* cx, uint32_t lineNum,
diff -Nru firefox-84.0.2+build1/js/src/frontend/BytecodeSection.h firefox-85.0+build1/js/src/frontend/BytecodeSection.h
--- firefox-84.0.2+build1/js/src/frontend/BytecodeSection.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/BytecodeSection.h	2021-01-18 19:58:12.000000000 +0000
@@ -128,7 +128,7 @@
 };
 
 MOZ_MUST_USE bool EmitScriptThingsVector(
-    JSContext* cx, CompilationInfo& compilationInfo,
+    JSContext* cx, CompilationInput& input, CompilationStencil& stencil,
     CompilationGCOutput& gcOutput,
     mozilla::Span<const TaggedScriptThingIndex> things,
     mozilla::Span<JS::GCCellPtr> output);
@@ -306,12 +306,6 @@
   }
   void setNumICEntries(uint32_t entries) { numICEntries_ = entries; }
 
-  uint32_t numTypeSets() const { return numTypeSets_; }
-  void incrementNumTypeSets() {
-    MOZ_ASSERT(numTypeSets_ != UINT32_MAX, "Shouldn't overflow");
-    numTypeSets_++;
-  }
-
  private:
   // ---- Bytecode ----
 
@@ -391,9 +385,6 @@
   // Number of ICEntries in the script. There's one ICEntry for each JOF_IC op
   // and, if the script is a function, for |this| and each formal argument.
   uint32_t numICEntries_ = 0;
-
-  // Number of JOF_TYPESET opcodes generated.
-  uint32_t numTypeSets_ = 0;
 };
 
 // Data that is not directly associated with specific opcode/index inside
diff -Nru firefox-84.0.2+build1/js/src/frontend/CallOrNewEmitter.cpp firefox-85.0+build1/js/src/frontend/CallOrNewEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/CallOrNewEmitter.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/CallOrNewEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -17,16 +17,6 @@
 
 using mozilla::Maybe;
 
-AutoEmittingRunOnceLambda::AutoEmittingRunOnceLambda(BytecodeEmitter* bce)
-    : bce_(bce) {
-  MOZ_ASSERT(!bce_->emittingRunOnceLambda);
-  bce_->emittingRunOnceLambda = true;
-}
-
-AutoEmittingRunOnceLambda::~AutoEmittingRunOnceLambda() {
-  bce_->emittingRunOnceLambda = false;
-}
-
 CallOrNewEmitter::CallOrNewEmitter(BytecodeEmitter* bce, JSOp op,
                                    ArgumentsKind argumentsKind,
                                    ValueUsage valueUsage)
@@ -83,18 +73,6 @@
 bool CallOrNewEmitter::prepareForFunctionCallee() {
   MOZ_ASSERT(state_ == State::Start);
 
-  // Top level lambdas which are immediately invoked should be treated as
-  // only running once. Every time they execute we will create new types and
-  // scripts for their contents, to increase the quality of type information
-  // within them and enable more backend optimizations. Note that this does
-  // not depend on the lambda being invoked at most once (it may be named or
-  // be accessed via foo.caller indirection), as multiple executions will
-  // just cause the inner scripts to be repeatedly cloned.
-  MOZ_ASSERT(!bce_->emittingRunOnceLambda);
-  if (bce_->checkRunOnceContext()) {
-    autoEmittingRunOnceLambda_.emplace(bce_);
-  }
-
   state_ = State::FunctionCallee;
   return true;
 }
@@ -151,7 +129,6 @@
       }
       break;
     case State::FunctionCallee:
-      autoEmittingRunOnceLambda_.reset();
       needsThis = true;
       break;
     case State::SuperCallee:
@@ -228,11 +205,7 @@
       //            [stack] CALLEE THIS ARG0 OPTIMIZED
       return false;
     }
-    if (!bce_->emit1(JSOp::Not)) {
-      //            [stack] CALLEE THIS ARG0 !OPTIMIZED
-      return false;
-    }
-    if (!ifNotOptimizable_->emitThen()) {
+    if (!ifNotOptimizable_->emitThen(IfEmitter::ConditionKind::Negative)) {
       //            [stack] CALLEE THIS ARG0
       return false;
     }
diff -Nru firefox-84.0.2+build1/js/src/frontend/CallOrNewEmitter.h firefox-85.0+build1/js/src/frontend/CallOrNewEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/CallOrNewEmitter.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/CallOrNewEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -25,14 +25,6 @@
 
 struct BytecodeEmitter;
 
-class MOZ_RAII AutoEmittingRunOnceLambda {
-  BytecodeEmitter* bce_;
-
- public:
-  explicit AutoEmittingRunOnceLambda(BytecodeEmitter* bce);
-  ~AutoEmittingRunOnceLambda();
-};
-
 // Class for emitting bytecode for call or new expression.
 //
 // Usage: (check for the return value is omitted for simplicity)
@@ -170,8 +162,6 @@
   // The branch for spread call optimization.
   mozilla::Maybe<InternalIfEmitter> ifNotOptimizable_;
 
-  mozilla::Maybe<AutoEmittingRunOnceLambda> autoEmittingRunOnceLambda_;
-
   mozilla::Maybe<PropOpEmitter> poe_;
   mozilla::Maybe<ElemOpEmitter> eoe_;
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/CompilationInfo.h firefox-85.0+build1/js/src/frontend/CompilationInfo.h
--- firefox-84.0.2+build1/js/src/frontend/CompilationInfo.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/CompilationInfo.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/Span.h"
-#include "mozilla/Variant.h"
 
 #include "builtin/ModuleObject.h"
 #include "ds/LifoAlloc.h"
@@ -18,7 +17,6 @@
 #include "frontend/SharedContext.h"
 #include "frontend/Stencil.h"
 #include "frontend/UsedNameTracker.h"
-#include "js/GCVariant.h"
 #include "js/GCVector.h"
 #include "js/HashTable.h"
 #include "js/RealmOptions.h"
@@ -93,13 +91,16 @@
 };
 
 struct CompilationAtomCache {
+ public:
+  using AtomCacheVector = JS::GCVector<JSAtom*, 0, js::SystemAllocPolicy>;
+
  private:
   // Atoms lowered into or converted from CompilationStencil.parserAtomData.
   //
   // This field is here instead of in CompilationGCOutput because atoms lowered
   // from JSAtom is part of input (enclosing scope bindings, lazy function name,
   // etc), and having 2 vectors in both input/output is error prone.
-  JS::GCVector<JSAtom*, 0, js::SystemAllocPolicy> atoms_;
+  AtomCacheVector atoms_;
 
  public:
   JSAtom* getExistingAtomAt(ParserAtomIndex index) const;
@@ -110,6 +111,9 @@
   bool setAtomAt(JSContext* cx, ParserAtomIndex index, JSAtom* atom);
   bool allocate(JSContext* cx, size_t length);
 
+  void stealBuffer(AtomCacheVector& atoms);
+  void returnBuffer(AtomCacheVector& atoms);
+
   void trace(JSTracer* trc);
 } JS_HAZ_GC_POINTER;
 
@@ -204,7 +208,7 @@
   void trace(JSTracer* trc);
 } JS_HAZ_GC_POINTER;
 
-struct CompilationStencil;
+struct CompilationInfo;
 
 struct MOZ_RAII CompilationState {
   // Until we have dealt with Atoms in the front end, we need to hold
@@ -221,16 +225,13 @@
 
   CompilationState(JSContext* cx, LifoAllocScope& frontendAllocScope,
                    const JS::ReadOnlyCompileOptions& options,
-                   CompilationStencil& stencil, Scope* enclosingScope = nullptr,
+                   CompilationInfo& compilationInfo,
+                   Scope* enclosingScope = nullptr,
                    JSObject* enclosingEnv = nullptr);
 };
 
 // The top level struct of stencil.
 struct CompilationStencil {
-  // This holds allocations that do not require destructors to be run but are
-  // live until the stencil is released.
-  LifoAlloc alloc;
-
   // Hold onto the RegExpStencil, BigIntStencil, and ObjLiteralStencil that are
   // allocated during parse to ensure correct destruction.
   Vector<RegExpStencil, 0, js::SystemAllocPolicy> regExpData;
@@ -254,7 +255,7 @@
   Vector<ScopeStencil, 0, js::SystemAllocPolicy> scopeData;
 
   // Module metadata if this is a module compile.
-  StencilModuleMetadata moduleMetadata;
+  mozilla::Maybe<StencilModuleMetadata> moduleMetadata;
 
   // AsmJS modules generated by parsing.
   HashMap<FunctionIndex, RefPtr<const JS::WasmModule>,
@@ -266,26 +267,10 @@
   // was generated in original parse but not used by stencil.
   ParserAtomVector parserAtomData;
 
-  // Parameterized chunk size to use for LifoAlloc.
-  static constexpr size_t LifoAllocChunkSize = 512;
-
-  CompilationStencil() : alloc(LifoAllocChunkSize) {}
+  CompilationStencil() = default;
 
-  // We need a move-constructor to work with Rooted, but must be explicit in
-  // order to steal the LifoAlloc data.
-  CompilationStencil(CompilationStencil&& other) noexcept
-      : alloc(LifoAllocChunkSize),
-        regExpData(std::move(other.regExpData)),
-        bigIntData(std::move(other.bigIntData)),
-        objLiteralData(std::move(other.objLiteralData)),
-        scriptData(std::move(other.scriptData)),
-        scopeData(std::move(other.scopeData)),
-        moduleMetadata(std::move(other.moduleMetadata)),
-        asmJS(std::move(other.asmJS)),
-        parserAtomData(std::move(other.parserAtomData)) {
-    // Steal the data from the LifoAlloc.
-    alloc.steal(&other.alloc);
-  }
+  // We need a move-constructor to work with Rooted.
+  CompilationStencil(CompilationStencil&& other) = default;
 
   const ParserAtom* getParserAtomAt(JSContext* cx,
                                     TaggedParserAtomIndex taggedIndex) const;
@@ -345,19 +330,19 @@
     Iterator(const CompilationStencil& stencil, CompilationGCOutput& gcOutput,
              size_t index)
         : index_(index), stencil_(stencil), gcOutput_(gcOutput) {
-      skipNonFunctions();
+      MOZ_ASSERT(index == stencil.scriptData.length());
     }
 
    public:
     explicit Iterator(const CompilationStencil& stencil,
                       CompilationGCOutput& gcOutput)
         : stencil_(stencil), gcOutput_(gcOutput) {
-      skipNonFunctions();
+      skipTopLevelNonFunction();
     }
 
     Iterator operator++() {
       next();
-      skipNonFunctions();
+      assertFunction();
       return *this;
     }
 
@@ -366,14 +351,19 @@
       index_++;
     }
 
-    void skipNonFunctions() {
-      size_t length = stencil_.scriptData.length();
-      while (index_ < length) {
-        if (stencil_.scriptData[index_].isFunction()) {
-          return;
-        }
+    void assertFunction() {
+      if (index_ < stencil_.scriptData.length()) {
+        MOZ_ASSERT(stencil_.scriptData[index_].isFunction());
+      }
+    }
 
-        index_++;
+    void skipTopLevelNonFunction() {
+      MOZ_ASSERT(index_ == 0);
+      if (stencil_.scriptData.length()) {
+        if (!stencil_.scriptData[0].isFunction()) {
+          next();
+          assertFunction();
+        }
       }
     }
 
@@ -411,6 +401,13 @@
 struct CompilationInfo {
   static constexpr FunctionIndex TopLevelIndex = FunctionIndex(0);
 
+  // This holds allocations that do not require destructors to be run but are
+  // live until the stencil is released.
+  LifoAlloc alloc;
+
+  // Parameterized chunk size to use for LifoAlloc.
+  static constexpr size_t LifoAllocChunkSize = 512;
+
   CompilationInput input;
   CompilationStencil stencil;
 
@@ -431,31 +428,44 @@
 
   // Construct a CompilationInfo
   CompilationInfo(JSContext* cx, const JS::ReadOnlyCompileOptions& options)
-      : input(options) {}
+      : alloc(LifoAllocChunkSize), input(options) {}
 
-  MOZ_MUST_USE bool prepareInputAndStencilForInstantiate(JSContext* cx);
-  MOZ_MUST_USE bool prepareGCOutputForInstantiate(
-      JSContext* cx, CompilationGCOutput& gcOutput);
-
-  MOZ_MUST_USE bool prepareForInstantiate(JSContext* cx,
-                                          CompilationGCOutput& gcOutput);
-  MOZ_MUST_USE bool instantiateStencils(JSContext* cx,
-                                        CompilationGCOutput& gcOutput);
-  MOZ_MUST_USE bool instantiateStencilsAfterPreparation(
-      JSContext* cx, CompilationGCOutput& gcOutput);
+  static MOZ_MUST_USE bool prepareInputAndStencilForInstantiate(
+      JSContext* cx, CompilationInput& input, CompilationStencil& stencil);
+  static MOZ_MUST_USE bool prepareGCOutputForInstantiate(
+      JSContext* cx, CompilationStencil& stencil,
+      CompilationGCOutput& gcOutput);
+
+  static MOZ_MUST_USE bool prepareForInstantiate(
+      JSContext* cx, CompilationInfo& compilationInfo,
+      CompilationGCOutput& gcOutput);
+  static MOZ_MUST_USE bool instantiateStencils(JSContext* cx,
+                                               CompilationInfo& compilationInfo,
+                                               CompilationGCOutput& gcOutput);
+  static MOZ_MUST_USE bool instantiateStencilsAfterPreparation(
+      JSContext* cx, CompilationInput& input, CompilationStencil& stencil,
+      CompilationGCOutput& gcOutput);
 
   MOZ_MUST_USE bool serializeStencils(JSContext* cx, JS::TranscodeBuffer& buf,
                                       bool* succeededOut = nullptr);
 
-  // Move constructor is necessary to use Rooted.
-  CompilationInfo(CompilationInfo&&) = default;
+  // Move constructor is necessary to use Rooted, but must be explicit in
+  // order to steal the LifoAlloc data
+  CompilationInfo(CompilationInfo&& other) noexcept
+      : alloc(LifoAllocChunkSize),
+        input(std::move(other.input)),
+        stencil(std::move(other.stencil)) {
+    // Steal the data from the LifoAlloc.
+    alloc.steal(&other.alloc);
+  }
 
   // To avoid any misuses, make sure this is neither copyable or assignable.
   CompilationInfo(const CompilationInfo&) = delete;
   CompilationInfo& operator=(const CompilationInfo&) = delete;
   CompilationInfo& operator=(CompilationInfo&&) = delete;
 
-  ScriptStencilIterable functionScriptStencils(CompilationGCOutput& gcOutput) {
+  static ScriptStencilIterable functionScriptStencils(
+      CompilationStencil& stencil, CompilationGCOutput& gcOutput) {
     return ScriptStencilIterable(stencil, gcOutput);
   }
 
@@ -475,29 +485,44 @@
 
   MOZ_MUST_USE bool buildDelazificationIndices(JSContext* cx);
 
+  // Parameterized chunk size to use for LifoAlloc.
+  static constexpr size_t LifoAllocChunkSize = 512;
+
  public:
-  frontend::CompilationInfo initial;
-  GCVector<frontend::CompilationInfo, 0, js::SystemAllocPolicy> delazifications;
+  CompilationInfo initial;
+  LifoAlloc allocForDelazifications;
+  Vector<CompilationStencil, 0, js::SystemAllocPolicy> delazifications;
   FunctionIndexVector delazificationIndices;
+  CompilationAtomCache::AtomCacheVector delazificationAtomCache;
 
   CompilationInfoVector(JSContext* cx,
                         const JS::ReadOnlyCompileOptions& options)
-      : initial(cx, options) {}
+      : initial(cx, options), allocForDelazifications(LifoAllocChunkSize) {}
 
   // Move constructor is necessary to use Rooted.
-  CompilationInfoVector(CompilationInfoVector&&) = default;
+  CompilationInfoVector(CompilationInfoVector&& other) noexcept
+      : initial(std::move(other.initial)),
+        allocForDelazifications(LifoAllocChunkSize),
+        delazifications(std::move(other.delazifications)),
+        delazificationAtomCache(std::move(other.delazificationAtomCache)) {
+    // Steal the data from the LifoAlloc.
+    allocForDelazifications.steal(&other.allocForDelazifications);
+  }
 
   // To avoid any misuses, make sure this is neither copyable or assignable.
   CompilationInfoVector(const CompilationInfoVector&) = delete;
   CompilationInfoVector& operator=(const CompilationInfoVector&) = delete;
   CompilationInfoVector& operator=(CompilationInfoVector&&) = delete;
 
-  MOZ_MUST_USE bool prepareForInstantiate(JSContext* cx,
-                                          CompilationGCOutput& gcOutput);
-  MOZ_MUST_USE bool instantiateStencils(JSContext* cx,
-                                        CompilationGCOutput& gcOutput);
+  MOZ_MUST_USE bool prepareForInstantiate(
+      JSContext* cx, CompilationGCOutput& gcOutput,
+      CompilationGCOutput& gcOutputForDelazification);
+  MOZ_MUST_USE bool instantiateStencils(
+      JSContext* cx, CompilationGCOutput& gcOutput,
+      CompilationGCOutput& gcOutputForDelazification);
   MOZ_MUST_USE bool instantiateStencilsAfterPreparation(
-      JSContext* cx, CompilationGCOutput& gcOutput);
+      JSContext* cx, CompilationGCOutput& gcOutput,
+      CompilationGCOutput& gcOutputForDelazification);
 
   MOZ_MUST_USE bool deserializeStencils(JSContext* cx,
                                         const JS::TranscodeRange& range,
diff -Nru firefox-84.0.2+build1/js/src/frontend/ElemOpEmitter.cpp firefox-85.0+build1/js/src/frontend/ElemOpEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/ElemOpEmitter.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ElemOpEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -125,8 +125,6 @@
   JSOp op;
   if (isSuper()) {
     op = JSOp::GetElemSuper;
-  } else if (isCall()) {
-    op = JSOp::CallElem;
   } else {
     op = JSOp::GetElem;
   }
@@ -236,12 +234,11 @@
 
   MOZ_ASSERT_IF(isPropInit(), !isSuper());
 
-  JSOp setOp = isPropInit()
-                   ? JSOp::InitElem
-                   : isSuper() ? bce_->sc->strict() ? JSOp::StrictSetElemSuper
-                                                    : JSOp::SetElemSuper
-                               : bce_->sc->strict() ? JSOp::StrictSetElem
-                                                    : JSOp::SetElem;
+  JSOp setOp = isPropInit() ? JSOp::InitElem
+               : isSuper()  ? bce_->sc->strict() ? JSOp::StrictSetElemSuper
+                                                 : JSOp::SetElemSuper
+               : bce_->sc->strict() ? JSOp::StrictSetElem
+                                    : JSOp::SetElem;
   if (!bce_->emitElemOpBase(setOp, ShouldInstrument::Yes)) {
     //              [stack] ELEM
     return false;
diff -Nru firefox-84.0.2+build1/js/src/frontend/EmitterScope.cpp firefox-85.0+build1/js/src/frontend/EmitterScope.cpp
--- firefox-84.0.2+build1/js/src/frontend/EmitterScope.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/EmitterScope.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -529,8 +529,8 @@
   auto createScope = [kind, bindings, firstFrameSlot, bce](
                          JSContext* cx, mozilla::Maybe<ScopeIndex> enclosing,
                          ScopeIndex* index) {
-    return ScopeStencil::createForLexicalScope(cx, bce->compilationInfo.stencil,
-                                               kind, bindings, firstFrameSlot,
+    return ScopeStencil::createForLexicalScope(cx, bce->compilationInfo, kind,
+                                               bindings, firstFrameSlot,
                                                enclosing, index);
   };
   if (!internScopeCreationData(bce, createScope)) {
@@ -590,8 +590,8 @@
                          JSContext* cx, mozilla::Maybe<ScopeIndex> enclosing,
                          ScopeIndex* index) {
     return ScopeStencil::createForLexicalScope(
-        cx, bce->compilationInfo.stencil, scopeKind,
-        funbox->namedLambdaBindings(), LOCALNO_LIMIT, enclosing, index);
+        cx, bce->compilationInfo, scopeKind, funbox->namedLambdaBindings(),
+        LOCALNO_LIMIT, enclosing, index);
   };
   if (!internScopeCreationData(bce, createScope)) {
     return false;
@@ -680,7 +680,7 @@
                                    mozilla::Maybe<ScopeIndex> enclosing,
                                    ScopeIndex* index) {
     return ScopeStencil::createForFunctionScope(
-        cx, bce->compilationInfo.stencil, funbox->functionScopeBindings(),
+        cx, bce->compilationInfo, funbox->functionScopeBindings(),
         funbox->hasParameterExprs,
         funbox->needsCallObjectRegardlessOfBindings(), funbox->index(),
         funbox->isArrow(), enclosing, index);
@@ -752,7 +752,7 @@
                          JSContext* cx, mozilla::Maybe<ScopeIndex> enclosing,
                          ScopeIndex* index) {
     return ScopeStencil::createForVarScope(
-        cx, bce->compilationInfo.stencil, ScopeKind::FunctionBodyVar,
+        cx, bce->compilationInfo, ScopeKind::FunctionBodyVar,
         funbox->extraVarScopeBindings(), firstFrameSlot,
         funbox->needsExtraBodyVarEnvironmentRegardlessOfBindings(), enclosing,
         index);
@@ -775,30 +775,6 @@
   return checkEnvironmentChainLength(bce);
 }
 
-class DynamicBindingIter : public ParserBindingIter {
- public:
-  explicit DynamicBindingIter(GlobalSharedContext* sc)
-      : ParserBindingIter(*sc->bindings) {}
-
-  explicit DynamicBindingIter(EvalSharedContext* sc)
-      : ParserBindingIter(*sc->bindings, /* strict = */ false) {
-    MOZ_ASSERT(!sc->strict());
-  }
-
-  JSOp bindingOp() const {
-    switch (kind()) {
-      case BindingKind::Var:
-        return JSOp::DefVar;
-      case BindingKind::Let:
-        return JSOp::DefLet;
-      case BindingKind::Const:
-        return JSOp::DefConst;
-      default:
-        MOZ_CRASH("Bad BindingKind");
-    }
-  }
-};
-
 bool EmitterScope::enterGlobal(BytecodeEmitter* bce,
                                GlobalSharedContext* globalsc) {
   MOZ_ASSERT(this == bce->innermostEmitterScopeNoCheck());
@@ -831,7 +807,7 @@
                                      mozilla::Maybe<ScopeIndex> enclosing,
                                      ScopeIndex* index) {
     MOZ_ASSERT(enclosing.isNothing());
-    return ScopeStencil::createForGlobalScope(cx, bce->compilationInfo.stencil,
+    return ScopeStencil::createForGlobalScope(cx, bce->compilationInfo,
                                               globalsc->scopeKind(),
                                               globalsc->bindings, index);
   };
@@ -843,29 +819,17 @@
   MOZ_ASSERT(bce->bodyScopeIndex == GCThingIndex::outermostScopeIndex(),
              "Global scope must be index 0");
 
-  // Resolve binding names and emit Def{Var,Let,Const} prologue ops.
+  // Resolve binding names.
+  //
+  // NOTE: BytecodeEmitter::emitDeclarationInstantiation will emit the
+  //       redeclaration check and initialize these bindings.
   if (globalsc->bindings) {
-    // Check for declaration conflicts before the Def* ops.
-    if (!bce->emit1(JSOp::CheckGlobalOrEvalDecl)) {
-      return false;
-    }
-
-    for (DynamicBindingIter bi(globalsc); bi; bi++) {
+    for (ParserBindingIter bi(*globalsc->bindings); bi; bi++) {
       NameLocation loc = NameLocation::fromBinding(bi.kind(), bi.location());
       const ParserAtom* name = bi.name();
       if (!putNameInCache(bce, name, loc)) {
         return false;
       }
-
-      // Define the name in the prologue. Do not emit DefVar for
-      // functions that we'll emit DefFun for.
-      if (bi.isTopLevelFunction()) {
-        continue;
-      }
-
-      if (!bce->emitAtomOp(bi.bindingOp(), name)) {
-        return false;
-      }
     }
   }
 
@@ -900,9 +864,8 @@
                                    ScopeIndex* index) {
     ScopeKind scopeKind =
         evalsc->strict() ? ScopeKind::StrictEval : ScopeKind::Eval;
-    return ScopeStencil::createForEvalScope(cx, bce->compilationInfo.stencil,
-                                            scopeKind, evalsc->bindings,
-                                            enclosing, index);
+    return ScopeStencil::createForEvalScope(cx, bce->compilationInfo, scopeKind,
+                                            evalsc->bindings, enclosing, index);
   };
   if (!internBodyScopeCreationData(bce, createScope)) {
     return false;
@@ -913,31 +876,9 @@
       return false;
     }
   } else {
-    // Resolve binding names and emit DefVar prologue ops if we don't have
-    // an environment (i.e., a sloppy eval).
-    // Eval scripts always have their own lexical scope, but non-strict
-    // scopes may introduce 'var' bindings to the nearest var scope.
-    //
-    // TODO: We may optimize strict eval bindings in the future to be on
-    // the frame. For now, handle everything dynamically.
-    if (!hasEnvironment() && evalsc->bindings) {
-      // Check for declaration conflicts before the DefVar ops.
-      if (!bce->emit1(JSOp::CheckGlobalOrEvalDecl)) {
-        return false;
-      }
-
-      for (DynamicBindingIter bi(evalsc); bi; bi++) {
-        MOZ_ASSERT(bi.bindingOp() == JSOp::DefVar);
-
-        if (bi.isTopLevelFunction()) {
-          continue;
-        }
-
-        if (!bce->emitAtomOp(JSOp::DefVar, bi.name())) {
-          return false;
-        }
-      }
-    }
+    // NOTE: BytecodeEmitter::emitDeclarationInstantiation will emit the
+    //       redeclaration check and initialize these bindings for sloppy
+    //       eval.
 
     // As an optimization, if the eval does not have its own var
     // environment and is directly enclosed in a global scope, then all
@@ -1008,7 +949,7 @@
                                      mozilla::Maybe<ScopeIndex> enclosing,
                                      ScopeIndex* index) {
     return ScopeStencil::createForModuleScope(
-        cx, bce->compilationInfo.stencil, modulesc->bindings, enclosing, index);
+        cx, bce->compilationInfo, modulesc->bindings, enclosing, index);
   };
   if (!internBodyScopeCreationData(bce, createScope)) {
     return false;
@@ -1029,8 +970,8 @@
 
   auto createScope = [bce](JSContext* cx, mozilla::Maybe<ScopeIndex> enclosing,
                            ScopeIndex* index) {
-    return ScopeStencil::createForWithScope(cx, bce->compilationInfo.stencil,
-                                            enclosing, index);
+    return ScopeStencil::createForWithScope(cx, bce->compilationInfo, enclosing,
+                                            index);
   };
   if (!internScopeCreationData(bce, createScope)) {
     return false;
diff -Nru firefox-84.0.2+build1/js/src/frontend/FoldConstants.cpp firefox-85.0+build1/js/src/frontend/FoldConstants.cpp
--- firefox-84.0.2+build1/js/src/frontend/FoldConstants.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/FoldConstants.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -1242,11 +1242,8 @@
       // Replace with concatenation if we multiple nodes.
       if (accum.length() > 1) {
         // Construct the concatenated atom.
-        const ParserAtom* combination =
-            info.parserAtoms
-                .concatAtoms(info.cx,
-                             mozilla::Range(accum.begin(), accum.length()))
-                .unwrapOr(nullptr);
+        const ParserAtom* combination = info.parserAtoms.concatAtoms(
+            info.cx, mozilla::Range(accum.begin(), accum.length()));
         if (!combination) {
           return false;
         }
diff -Nru firefox-84.0.2+build1/js/src/frontend/ForInEmitter.cpp firefox-85.0+build1/js/src/frontend/ForInEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/ForInEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ForInEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -93,11 +93,6 @@
 #endif
   MOZ_ASSERT(loopDepth_ >= 2);
 
-  if (!bce_->emit1(JSOp::IterNext)) {
-    //              [stack] ITER ITERVAL
-    return false;
-  }
-
 #ifdef DEBUG
   state_ = State::Initialize;
 #endif
diff -Nru firefox-84.0.2+build1/js/src/frontend/Frontend2.cpp firefox-85.0+build1/js/src/frontend/Frontend2.cpp
--- firefox-84.0.2+build1/js/src/frontend/Frontend2.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/Frontend2.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -65,7 +65,7 @@
         smoosh_get_atom_at(result, i));
     auto len = smoosh_get_atom_len_at(result, i);
     const ParserAtom* atom =
-        compilationState.parserAtoms.internUtf8(cx, s, len).unwrapOr(nullptr);
+        compilationState.parserAtoms.internUtf8(cx, s, len);
     if (!atom) {
       return false;
     }
@@ -115,7 +115,7 @@
 bool ConvertScopeStencil(JSContext* cx, const SmooshResult& result,
                          Vector<const ParserAtom*>& allAtoms,
                          CompilationInfo& compilationInfo) {
-  LifoAlloc& alloc = compilationInfo.stencil.alloc;
+  LifoAlloc& alloc = compilationInfo.alloc;
 
   if (result.scopes.len > TaggedScriptThingIndex::IndexLimit) {
     ReportAllocationOverflow(cx);
@@ -145,7 +145,7 @@
         data->length = numBindings;
 
         if (!ScopeStencil::createForGlobalScope(
-                cx, compilationInfo.stencil, ScopeKind::Global, data, &index)) {
+                cx, compilationInfo, ScopeKind::Global, data, &index)) {
           return false;
         }
         break;
@@ -171,7 +171,7 @@
         uint32_t firstFrameSlot = var.first_frame_slot;
         ScopeIndex enclosingIndex(var.enclosing);
         if (!ScopeStencil::createForVarScope(
-                cx, compilationInfo.stencil, ScopeKind::FunctionBodyVar, data,
+                cx, compilationInfo, ScopeKind::FunctionBodyVar, data,
                 firstFrameSlot, var.function_has_extensible_scope,
                 mozilla::Some(enclosingIndex), &index)) {
           return false;
@@ -200,8 +200,8 @@
         uint32_t firstFrameSlot = lexical.first_frame_slot;
         ScopeIndex enclosingIndex(lexical.enclosing);
         if (!ScopeStencil::createForLexicalScope(
-                cx, compilationInfo.stencil, ScopeKind::Lexical, data,
-                firstFrameSlot, mozilla::Some(enclosingIndex), &index)) {
+                cx, compilationInfo, ScopeKind::Lexical, data, firstFrameSlot,
+                mozilla::Some(enclosingIndex), &index)) {
           return false;
         }
         break;
@@ -234,9 +234,9 @@
 
         ScopeIndex enclosingIndex(function.enclosing);
         if (!ScopeStencil::createForFunctionScope(
-                cx, compilationInfo.stencil, data, hasParameterExprs,
-                needsEnvironment, functionIndex, isArrow,
-                mozilla::Some(enclosingIndex), &index)) {
+                cx, compilationInfo, data, hasParameterExprs, needsEnvironment,
+                functionIndex, isArrow, mozilla::Some(enclosingIndex),
+                &index)) {
           return false;
         }
         break;
@@ -310,8 +310,7 @@
     const mozilla::Utf8Unit* sUtf8 =
         reinterpret_cast<const mozilla::Utf8Unit*>(s);
     const ParserAtom* atom =
-        compilationState.parserAtoms.internUtf8(cx, sUtf8, len)
-            .unwrapOr(nullptr);
+        compilationState.parserAtoms.internUtf8(cx, sUtf8, len);
     if (!atom) {
       return false;
     }
@@ -350,8 +349,7 @@
   return ImmutableScriptData::new_(
       cx, smooshScriptData.main_offset, smooshScriptData.nfixed,
       smooshScriptData.nslots, GCThingIndex(smooshScriptData.body_scope_index),
-      smooshScriptData.num_ic_entries, smooshScriptData.num_bytecode_type_sets,
-      isFunction, smooshScriptData.fun_length,
+      smooshScriptData.num_ic_entries, isFunction, smooshScriptData.fun_length,
       mozilla::Span(smooshScriptData.bytecode.data,
                     smooshScriptData.bytecode.len),
       mozilla::Span<const SrcNote>(), mozilla::Span<const uint32_t>(),
@@ -479,12 +477,10 @@
       script.lazyFunctionEnclosingScopeIndex_ = mozilla::Some(ScopeIndex(
           smooshScript.lazy_function_enclosing_scope_index.AsSome()));
     }
-    script.isStandaloneFunction = smooshScript.is_standalone_function;
     script.wasFunctionEmitted = smooshScript.was_function_emitted;
-    script.isSingletonFunction = smooshScript.is_singleton_function;
   }
 
-  if (!ConvertGCThings(cx, result, smooshScript, compilationInfo.stencil.alloc,
+  if (!ConvertGCThings(cx, result, smooshScript, compilationInfo.alloc,
                        allAtoms, script)) {
     return false;
   }
@@ -576,7 +572,7 @@
 
   Vector<const ParserAtom*> allAtoms(cx);
   CompilationState compilationState(
-      cx, allocScope, compilationInfo.input.options, compilationInfo.stencil);
+      cx, allocScope, compilationInfo.input.options, compilationInfo);
   if (!ConvertAtoms(cx, result, compilationState, allAtoms)) {
     return false;
   }
@@ -646,7 +642,7 @@
     return false;
   }
 
-  if (!compilationInfo.instantiateStencils(cx, gcOutput)) {
+  if (!CompilationInfo::instantiateStencils(cx, compilationInfo, gcOutput)) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/FunctionEmitter.cpp firefox-85.0+build1/js/src/frontend/FunctionEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/FunctionEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/FunctionEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -7,8 +7,10 @@
 #include "frontend/FunctionEmitter.h"
 
 #include "mozilla/Assertions.h"  // MOZ_ASSERT
+#include "mozilla/Unused.h"
 
 #include "builtin/ModuleObject.h"          // ModuleObject
+#include "frontend/AsyncEmitter.h"         // AsyncEmitter
 #include "frontend/BytecodeEmitter.h"      // BytecodeEmitter
 #include "frontend/FunctionSyntaxKind.h"   // FunctionSyntaxKind
 #include "frontend/ModuleSharedContext.h"  // ModuleSharedContext
@@ -307,14 +309,11 @@
   MOZ_ASSERT(syntaxKind_ == FunctionSyntaxKind::Statement);
   MOZ_ASSERT(bce_->inPrologue());
 
-  if (!bce_->emitGCIndexOp(JSOp::Lambda, index)) {
-    //              [stack] FUN
-    return false;
-  }
-  if (!bce_->emit1(JSOp::DefFun)) {
-    //              [stack]
-    return false;
-  }
+  // NOTE: The `index` is not directly stored as an opcode, but we collect the
+  // range of indices in `BytecodeEmitter::emitDeclarationInstantiation` instead
+  // of discrete indices.
+  mozilla::Unused << index;
+
   return true;
 }
 
@@ -357,6 +356,10 @@
     }
   }
 
+  if (funbox_->needsPromiseResult()) {
+    asyncEmitter_.emplace(bce_);
+  }
+
   if (bodyEnd_) {
     bce_->setFunctionBodyEndPos(*bodyEnd_);
   }
@@ -398,14 +401,15 @@
     }
   }
 
-  // Parameters can't reuse the reject try-catch block from the function body,
-  // because the body may have pushed an additional var-environment. This
-  // messes up scope resolution for the |.generator| variable, because we'd
-  // need different hops to reach |.generator| depending on whether the error
-  // was thrown from the parameters or the function body.
-  if (funbox_->hasParameterExprs && funbox_->needsPromiseResult()) {
-    if (!emitAsyncFunctionRejectPrologue()) {
-      return false;
+  if (funbox_->needsPromiseResult()) {
+    if (funbox_->hasParameterExprs) {
+      if (!asyncEmitter_->prepareForParamsWithExpression()) {
+        return false;
+      }
+    } else {
+      if (!asyncEmitter_->prepareForParamsWithoutExpression()) {
+        return false;
+      }
     }
   }
 
@@ -420,8 +424,8 @@
 
   //                [stack]
 
-  if (rejectTryCatch_) {
-    if (!emitAsyncFunctionRejectEpilogue()) {
+  if (funbox_->needsPromiseResult()) {
+    if (!asyncEmitter_->emitParamsEpilogue()) {
       return false;
     }
   }
@@ -432,7 +436,7 @@
   }
 
   if (funbox_->needsPromiseResult()) {
-    if (!emitAsyncFunctionRejectPrologue()) {
+    if (!asyncEmitter_->prepareForBody()) {
       return false;
     }
   }
@@ -452,47 +456,6 @@
   return true;
 }
 
-bool FunctionScriptEmitter::emitAsyncFunctionRejectPrologue() {
-  rejectTryCatch_.emplace(bce_, TryEmitter::Kind::TryCatch,
-                          TryEmitter::ControlKind::NonSyntactic);
-  return rejectTryCatch_->emitTry();
-}
-
-bool FunctionScriptEmitter::emitAsyncFunctionRejectEpilogue() {
-  if (!rejectTryCatch_->emitCatch()) {
-    //              [stack] EXC
-    return false;
-  }
-
-  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
-    //              [stack] EXC GEN
-    return false;
-  }
-  if (!bce_->emit2(JSOp::AsyncResolve,
-                   uint8_t(AsyncFunctionResolveKind::Reject))) {
-    //              [stack] PROMISE
-    return false;
-  }
-  if (!bce_->emit1(JSOp::SetRval)) {
-    //              [stack]
-    return false;
-  }
-  if (!bce_->emitGetDotGeneratorInInnermostScope()) {
-    //              [stack] GEN
-    return false;
-  }
-  if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
-    //              [stack]
-    return false;
-  }
-
-  if (!rejectTryCatch_->emitEnd()) {
-    return false;
-  }
-  rejectTryCatch_.reset();
-  return true;
-}
-
 bool FunctionScriptEmitter::emitExtraBodyVarScope() {
   //                [stack]
 
@@ -561,58 +524,73 @@
 
 bool FunctionScriptEmitter::emitEndBody() {
   MOZ_ASSERT(state_ == State::Body);
-
   //                [stack]
 
   if (funbox_->needsFinalYield()) {
     // If we fall off the end of a generator, do a final yield.
-    bool needsIteratorResult = funbox_->needsIteratorResult();
-    if (needsIteratorResult) {
+    if (funbox_->needsIteratorResult()) {
+      MOZ_ASSERT(!funbox_->needsPromiseResult());
+      // Emit final yield bytecode for generators, for example:
+      // function gen * () { ... }
       if (!bce_->emitPrepareIteratorResult()) {
         //          [stack] RESULT
         return false;
       }
-    }
 
-    if (!bce_->emit1(JSOp::Undefined)) {
-      //            [stack] RESULT? UNDEF
-      return false;
-    }
+      if (!bce_->emit1(JSOp::Undefined)) {
+        //            [stack] RESULT? UNDEF
+        return false;
+      }
 
-    if (needsIteratorResult) {
       if (!bce_->emitFinishIteratorResult(true)) {
         //          [stack] RESULT
         return false;
       }
-    }
 
-    if (funbox_->needsPromiseResult()) {
+      if (!bce_->emit1(JSOp::SetRval)) {
+        //            [stack]
+        return false;
+      }
+
       if (!bce_->emitGetDotGeneratorInInnermostScope()) {
-        //          [stack] RVAL GEN
+        //            [stack] GEN
         return false;
       }
 
-      if (!bce_->emit2(JSOp::AsyncResolve,
-                       uint8_t(AsyncFunctionResolveKind::Fulfill))) {
-        //          [stack] PROMISE
+      // No need to check for finally blocks, etc as in EmitReturn.
+      if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
+        //            [stack]
+        return false;
+      }
+    } else if (funbox_->needsPromiseResult()) {
+      // Emit final yield bytecode for async functions, for example:
+      // async function deferred() { ... }
+      if (!asyncEmitter_->emitEnd()) {
+        return false;
+      }
+    } else {
+      // Emit final yield bytecode for async generators, for example:
+      // async function asyncgen * () { ... }
+      if (!bce_->emit1(JSOp::Undefined)) {
+        //            [stack] RESULT? UNDEF
         return false;
       }
-    }
 
-    if (!bce_->emit1(JSOp::SetRval)) {
-      //            [stack]
-      return false;
-    }
+      if (!bce_->emit1(JSOp::SetRval)) {
+        //            [stack]
+        return false;
+      }
 
-    if (!bce_->emitGetDotGeneratorInInnermostScope()) {
-      //            [stack] GEN
-      return false;
-    }
+      if (!bce_->emitGetDotGeneratorInInnermostScope()) {
+        //            [stack] GEN
+        return false;
+      }
 
-    // No need to check for finally blocks, etc as in EmitReturn.
-    if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
-      //            [stack]
-      return false;
+      // No need to check for finally blocks, etc as in EmitReturn.
+      if (!bce_->emitYieldOp(JSOp::FinalYieldRval)) {
+        //            [stack]
+        return false;
+      }
     }
   } else {
     // Non-generator functions just return |undefined|. The
@@ -638,12 +616,6 @@
       return false;
     }
   }
-
-  if (rejectTryCatch_) {
-    if (!emitAsyncFunctionRejectEpilogue()) {
-      return false;
-    }
-  }
 
   if (extraBodyVarEmitterScope_) {
     if (!extraBodyVarEmitterScope_->leave(bce_)) {
diff -Nru firefox-84.0.2+build1/js/src/frontend/FunctionEmitter.h firefox-85.0+build1/js/src/frontend/FunctionEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/FunctionEmitter.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/FunctionEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -11,12 +11,12 @@
 
 #include <stdint.h>  // uint16_t, uint32_t
 
+#include "frontend/AsyncEmitter.h"        // AsyncEmitter
 #include "frontend/DefaultEmitter.h"      // DefaultEmitter
 #include "frontend/EmitterScope.h"        // EmitterScope
 #include "frontend/FunctionSyntaxKind.h"  // FunctionSyntaxKind
 #include "frontend/SharedContext.h"       // FunctionBox, TopLevelFunction
 #include "frontend/TDZCheckCache.h"       // TDZCheckCache
-#include "frontend/TryEmitter.h"          // TryEmitter
 #include "gc/Rooting.h"                   // JS::Rooted, JS::Handle
 #include "vm/BytecodeUtil.h"              // JSOp
 #include "vm/JSAtom.h"                    // JSAtom
@@ -185,7 +185,7 @@
   mozilla::Maybe<TDZCheckCache> tdzCache_;
 
   // try-catch block for async function parameter and body.
-  mozilla::Maybe<TryEmitter> rejectTryCatch_;
+  mozilla::Maybe<AsyncEmitter> asyncEmitter_;
 
   // See the comment for constructor.
   mozilla::Maybe<uint32_t> paramStart_;
@@ -254,11 +254,6 @@
 
  private:
   MOZ_MUST_USE bool emitExtraBodyVarScope();
-
-  // Async functions have implicit try-catch blocks to convert exceptions
-  // into promise rejections.
-  MOZ_MUST_USE bool emitAsyncFunctionRejectPrologue();
-  MOZ_MUST_USE bool emitAsyncFunctionRejectEpilogue();
 };
 
 // Class for emitting function parameters.
@@ -321,7 +316,7 @@
   //              |                                             |
   // +------------+                                             |
   // |                                                          |
-  // | [single binding, wihtout default]                        |
+  // | [single binding, without default]                        |
   // |   emitSimple                                             |
   // +--------------------------------------------------------->+
   // |                                                          ^
diff -Nru firefox-84.0.2+build1/js/src/frontend/IfEmitter.cpp firefox-85.0+build1/js/src/frontend/IfEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/IfEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/IfEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -14,23 +14,25 @@
 
 using mozilla::Maybe;
 
-BranchEmitterBase::BranchEmitterBase(BytecodeEmitter* bce, Kind kind)
-    : bce_(bce), kind_(kind) {}
+BranchEmitterBase::BranchEmitterBase(BytecodeEmitter* bce,
+                                     LexicalKind lexicalKind)
+    : bce_(bce), lexicalKind_(lexicalKind) {}
 
-IfEmitter::IfEmitter(BytecodeEmitter* bce, Kind kind)
-    : BranchEmitterBase(bce, kind) {}
+IfEmitter::IfEmitter(BytecodeEmitter* bce, LexicalKind lexicalKind)
+    : BranchEmitterBase(bce, lexicalKind) {}
 
 IfEmitter::IfEmitter(BytecodeEmitter* bce)
-    : IfEmitter(bce, Kind::MayContainLexicalAccessInBranch) {}
+    : IfEmitter(bce, LexicalKind::MayContainLexicalAccessInBranch) {}
 
-bool BranchEmitterBase::emitThenInternal() {
+bool BranchEmitterBase::emitThenInternal(ConditionKind conditionKind) {
   // The end of TDZCheckCache for cond for else-if.
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     tdzCache_.reset();
   }
 
   // Emit a branch-if-false around the then part.
-  if (!bce_->emitJump(JSOp::IfEq, &jumpAroundThen_)) {
+  JSOp op = conditionKind == ConditionKind::Positive ? JSOp::IfEq : JSOp::IfNe;
+  if (!bce_->emitJump(op, &jumpAroundThen_)) {
     return false;
   }
 
@@ -39,7 +41,7 @@
   thenDepth_ = bce_->bytecodeSection().stackDepth();
 
   // Enclose then-branch with TDZCheckCache.
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     tdzCache_.emplace(bce_);
   }
 
@@ -61,7 +63,7 @@
   calculateOrCheckPushed();
 
   // The end of TDZCheckCache for then-clause.
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     MOZ_ASSERT(tdzCache_.isSome());
     tdzCache_.reset();
   }
@@ -85,7 +87,7 @@
   bce_->bytecodeSection().setStackDepth(thenDepth_);
 
   // Enclose else-branch with TDZCheckCache.
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     tdzCache_.emplace(bce_);
   }
 
@@ -94,7 +96,7 @@
 
 bool BranchEmitterBase::emitEndInternal() {
   // The end of TDZCheckCache for then or else-clause.
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     MOZ_ASSERT(tdzCache_.isSome());
     tdzCache_.reset();
   }
@@ -134,15 +136,16 @@
   return true;
 }
 
-bool IfEmitter::emitThen() {
+bool IfEmitter::emitThen(
+    ConditionKind conditionKind /* = ConditionKind::Positive */) {
   MOZ_ASSERT(state_ == State::If || state_ == State::ElseIf);
 
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     MOZ_ASSERT_IF(state_ == State::ElseIf, tdzCache_.isSome());
     MOZ_ASSERT_IF(state_ != State::ElseIf, tdzCache_.isNothing());
   }
 
-  if (!emitThenInternal()) {
+  if (!emitThenInternal(conditionKind)) {
     return false;
   }
 
@@ -152,15 +155,16 @@
   return true;
 }
 
-bool IfEmitter::emitThenElse() {
+bool IfEmitter::emitThenElse(
+    ConditionKind conditionKind /* = ConditionKind::Positive */) {
   MOZ_ASSERT(state_ == State::If || state_ == State::ElseIf);
 
-  if (kind_ == Kind::MayContainLexicalAccessInBranch) {
+  if (lexicalKind_ == LexicalKind::MayContainLexicalAccessInBranch) {
     MOZ_ASSERT_IF(state_ == State::ElseIf, tdzCache_.isSome());
     MOZ_ASSERT_IF(state_ != State::ElseIf, tdzCache_.isNothing());
   }
 
-  if (!emitThenInternal()) {
+  if (!emitThenInternal(conditionKind)) {
     return false;
   }
 
@@ -222,7 +226,7 @@
 }
 
 InternalIfEmitter::InternalIfEmitter(BytecodeEmitter* bce)
-    : IfEmitter(bce, Kind::NoLexicalAccessInBranch) {
+    : IfEmitter(bce, LexicalKind::NoLexicalAccessInBranch) {
 #ifdef DEBUG
   // Skip emitIf (see the comment above InternalIfEmitter declaration).
   state_ = State::If;
@@ -230,7 +234,7 @@
 }
 
 CondEmitter::CondEmitter(BytecodeEmitter* bce)
-    : BranchEmitterBase(bce, Kind::MayContainLexicalAccessInBranch) {}
+    : BranchEmitterBase(bce, LexicalKind::MayContainLexicalAccessInBranch) {}
 
 bool CondEmitter::emitCond() {
   MOZ_ASSERT(state_ == State::Start);
@@ -240,9 +244,10 @@
   return true;
 }
 
-bool CondEmitter::emitThenElse() {
+bool CondEmitter::emitThenElse(
+    ConditionKind conditionKind /* = ConditionKind::Positive */) {
   MOZ_ASSERT(state_ == State::Cond);
-  if (!emitThenInternal()) {
+  if (!emitThenInternal(conditionKind)) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/IfEmitter.h firefox-85.0+build1/js/src/frontend/IfEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/IfEmitter.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/IfEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -37,6 +37,8 @@
   // same number of values.
   int32_t thenDepth_ = 0;
 
+  enum class ConditionKind { Positive, Negative };
+
   // Whether the then-clause, the else-clause, or else-if condition may
   // contain declaration or access to lexical variables, which means they
   // should have their own TDZCheckCache.  Basically TDZCheckCache should be
@@ -46,7 +48,7 @@
   // for them.
   //
   // See the comment for TDZCheckCache class for more details.
-  enum class Kind {
+  enum class LexicalKind {
     // For syntactic branches (if, if-else, and conditional expression),
     // which basically may contain declaration or accesses to lexical
     // variables inside then-clause, else-clause, and else-if condition.
@@ -56,7 +58,7 @@
     // inside then-clause, else-clause, nor else-if condition.
     NoLexicalAccessInBranch
   };
-  Kind kind_;
+  LexicalKind lexicalKind_;
 
   mozilla::Maybe<TDZCheckCache> tdzCache_;
 
@@ -67,9 +69,9 @@
 #endif
 
  protected:
-  BranchEmitterBase(BytecodeEmitter* bce, Kind kind);
+  BranchEmitterBase(BytecodeEmitter* bce, LexicalKind lexicalKind);
 
-  MOZ_MUST_USE bool emitThenInternal();
+  MOZ_MUST_USE bool emitThenInternal(ConditionKind conditionKind);
   void calculateOrCheckPushed();
   MOZ_MUST_USE bool emitElseInternal();
   MOZ_MUST_USE bool emitEndInternal();
@@ -103,6 +105,14 @@
 //     emit(then_block);
 //     ifThen.emitEnd();
 //
+//   `if (!cond) then_block`
+//     IfEmitter ifThen(this);
+//     ifThen.emitIf(Some(offset_of_if));
+//     emit(cond);
+//     ifThen.emitThen(IfEmitter::ConditionKind::Negative);
+//     emit(then_block);
+//     ifThen.emitEnd();
+//
 //   `if (cond) then_block else else_block`
 //     IfEmitter ifThenElse(this);
 //     ifThen.emitIf(Some(offset_of_if));
@@ -132,6 +142,9 @@
 //     ifThenElse.emitEnd();
 //
 class MOZ_STACK_CLASS IfEmitter : public BranchEmitterBase {
+ public:
+  using ConditionKind = BranchEmitterBase::ConditionKind;
+
  protected:
 #ifdef DEBUG
   // The state of this emitter.
@@ -184,7 +197,7 @@
 
  protected:
   // For InternalIfEmitter.
-  IfEmitter(BytecodeEmitter* bce, Kind kind);
+  IfEmitter(BytecodeEmitter* bce, LexicalKind lexicalKind);
 
  public:
   explicit IfEmitter(BytecodeEmitter* bce);
@@ -201,8 +214,10 @@
   // Can be Nothing() if not available.
   MOZ_MUST_USE bool emitIf(const mozilla::Maybe<uint32_t>& ifPos);
 
-  MOZ_MUST_USE bool emitThen();
-  MOZ_MUST_USE bool emitThenElse();
+  MOZ_MUST_USE bool emitThen(
+      ConditionKind conditionKind = ConditionKind::Positive);
+  MOZ_MUST_USE bool emitThenElse(
+      ConditionKind conditionKind = ConditionKind::Positive);
 
   MOZ_MUST_USE bool emitElseIf(const mozilla::Maybe<uint32_t>& ifPos);
   MOZ_MUST_USE bool emitElse();
@@ -285,7 +300,8 @@
   explicit CondEmitter(BytecodeEmitter* bce);
 
   MOZ_MUST_USE bool emitCond();
-  MOZ_MUST_USE bool emitThenElse();
+  MOZ_MUST_USE bool emitThenElse(
+      ConditionKind conditionKind = ConditionKind::Positive);
   MOZ_MUST_USE bool emitElse();
   MOZ_MUST_USE bool emitEnd();
 };
diff -Nru firefox-84.0.2+build1/js/src/frontend/ModuleSharedContext.h firefox-85.0+build1/js/src/frontend/ModuleSharedContext.h
--- firefox-84.0.2+build1/js/src/frontend/ModuleSharedContext.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ModuleSharedContext.h	2021-01-18 19:58:12.000000000 +0000
@@ -14,6 +14,7 @@
 #include "frontend/SharedContext.h"  // js::frontend::SharedContext
 #include "js/RootingAPI.h"           // JS::Handle, JS::Rooted
 #include "vm/Scope.h"                // js::{Module,}Scope
+#include "vm/StencilEnums.h"         // ImmutableScriptFlagsEnum
 
 namespace js {
 
@@ -23,7 +24,7 @@
 
 struct CompilationInfo;
 
-class MOZ_STACK_CLASS ModuleSharedContext : public SharedContext {
+class MOZ_STACK_CLASS ModuleSharedContext : public SuspendableContext {
  public:
   ParserModuleScopeData* bindings;
   ModuleBuilder& builder;
diff -Nru firefox-84.0.2+build1/js/src/frontend/moz.build firefox-85.0+build1/js/src/frontend/moz.build
--- firefox-84.0.2+build1/js/src/frontend/moz.build	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/moz.build	2021-01-18 19:58:12.000000000 +0000
@@ -25,6 +25,7 @@
 
 UNIFIED_SOURCES += [
     "AbstractScopePtr.cpp",
+    "AsyncEmitter.cpp",
     "BytecodeCompiler.cpp",
     "BytecodeControlStructures.cpp",
     "BytecodeEmitter.cpp",
@@ -77,3 +78,6 @@
 SOURCES += [
     "Parser.cpp",
 ]
+
+if CONFIG["FUZZING_INTERFACES"] and CONFIG["LIBFUZZER"]:
+    include("/tools/fuzzing/libfuzzer-config.mozbuild")
diff -Nru firefox-84.0.2+build1/js/src/frontend/NameAnalysisTypes.h firefox-85.0+build1/js/src/frontend/NameAnalysisTypes.h
--- firefox-84.0.2+build1/js/src/frontend/NameAnalysisTypes.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/NameAnalysisTypes.h	2021-01-18 19:58:12.000000000 +0000
@@ -7,11 +7,18 @@
 #ifndef frontend_NameAnalysisTypes_h
 #define frontend_NameAnalysisTypes_h
 
+#include "mozilla/Assertions.h"  // MOZ_ASSERT, MOZ_CRASH
+#include "mozilla/Casting.h"     // mozilla::AssertedCast
+
+#include <stdint.h>  // uint8_t, uint16_t, uint32_t
 #include <type_traits>
 
-#include "frontend/ParserAtom.h"
-#include "vm/BytecodeUtil.h"
-#include "vm/Scope.h"
+#include "frontend/ParserAtom.h"     // ParserAtom
+#include "js/AllocPolicy.h"          // SystemAllocPolicy
+#include "js/Vector.h"               // Vector
+#include "vm/BindingKind.h"          // BindingKind, BindingLocation
+#include "vm/BytecodeFormatFlags.h"  // JOF_ENVCOORD
+#include "vm/BytecodeUtil.h"  // ENVCOORD_HOPS_BITS, ENVCOORD_SLOT_BITS, GET_ENVCOORD_HOPS, GET_ENVCOORD_SLOT, ENVCOORD_HOPS_LEN, JOF_OPTYPE, JSOp, LOCALNO_LIMIT
 
 namespace js {
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/ObjLiteral.cpp firefox-85.0+build1/js/src/frontend/ObjLiteral.cpp
--- firefox-84.0.2+build1/js/src/frontend/ObjLiteral.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ObjLiteral.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -25,7 +25,6 @@
 namespace js {
 
 static void InterpretObjLiteralValue(JSContext* cx,
-                                     const ObjLiteralAtomVector& atoms,
                                      frontend::CompilationAtomCache& atomCache,
                                      const ObjLiteralInsn& insn,
                                      JS::Value* valOut) {
@@ -34,8 +33,8 @@
       *valOut = insn.getConstValue();
       return;
     case ObjLiteralOpcode::ConstAtom: {
-      uint32_t index = insn.getAtomIndex();
-      JSAtom* jsatom = atomCache.getExistingAtomAt(cx, atoms[index]);
+      frontend::TaggedParserAtomIndex index = insn.getAtomIndex();
+      JSAtom* jsatom = atomCache.getExistingAtomAt(cx, index);
       MOZ_ASSERT(jsatom);
       *valOut = StringValue(jsatom);
       return;
@@ -59,10 +58,7 @@
 
 static JSObject* InterpretObjLiteralObj(
     JSContext* cx, frontend::CompilationAtomCache& atomCache,
-    const ObjLiteralAtomVector& atoms,
     const mozilla::Span<const uint8_t> literalInsns, ObjLiteralFlags flags) {
-  bool specificGroup = flags.contains(ObjLiteralFlag::SpecificGroup);
-  bool singleton = flags.contains(ObjLiteralFlag::Singleton);
   bool noValues = flags.contains(ObjLiteralFlag::NoValues);
 
   ObjLiteralReader reader(literalInsns);
@@ -79,14 +75,14 @@
       propId = INT_TO_JSID(insn.getKey().getArrayIndex());
     } else {
       JSAtom* jsatom =
-          atomCache.getExistingAtomAt(cx, atoms[insn.getKey().getAtomIndex()]);
+          atomCache.getExistingAtomAt(cx, insn.getKey().getAtomIndex());
       MOZ_ASSERT(jsatom);
       propId = AtomToId(jsatom);
     }
 
     JS::Value propVal;
     if (!noValues) {
-      InterpretObjLiteralValue(cx, atoms, atomCache, insn, &propVal);
+      InterpretObjLiteralValue(cx, atomCache, insn, &propVal);
     }
 
     if (!properties.emplaceBack(propId, propVal)) {
@@ -94,21 +90,15 @@
     }
   }
 
-  if (specificGroup) {
-    return ObjectGroup::newPlainObject(
-        cx, properties.begin(), properties.length(),
-        singleton ? SingletonObject : TenuredObject);
-  }
-
+  // TODO(no-TI): remove SpecificGroup and Singleton from ObjLiteralFlag.
   return NewPlainObjectWithProperties(cx, properties.begin(),
                                       properties.length(), TenuredObject);
 }
 
 static JSObject* InterpretObjLiteralArray(
     JSContext* cx, frontend::CompilationAtomCache& atomCache,
-    const ObjLiteralAtomVector& atoms,
     const mozilla::Span<const uint8_t> literalInsns, ObjLiteralFlags flags) {
-  bool isCow = flags.contains(ObjLiteralFlag::ArrayCOW);
+  // TODO(no-TI): remove ArrayCOW.
   ObjLiteralReader reader(literalInsns);
   ObjLiteralInsn insn;
 
@@ -118,35 +108,24 @@
     MOZ_ASSERT(insn.isValid());
 
     JS::Value propVal;
-    InterpretObjLiteralValue(cx, atoms, atomCache, insn, &propVal);
+    InterpretObjLiteralValue(cx, atomCache, insn, &propVal);
     if (!elements.append(propVal)) {
       return nullptr;
     }
   }
 
-  ObjectGroup::NewArrayKind arrayKind =
-      isCow ? ObjectGroup::NewArrayKind::CopyOnWrite
-            : ObjectGroup::NewArrayKind::Normal;
-  RootedObject result(
-      cx, ObjectGroup::newArrayObject(cx, elements.begin(), elements.length(),
-                                      NewObjectKind::TenuredObject, arrayKind));
-  if (!result) {
-    return nullptr;
-  }
-
-  return result;
+  return NewDenseCopiedArray(cx, elements.length(), elements.begin(),
+                             /* proto = */ nullptr,
+                             NewObjectKind::TenuredObject);
 }
 
 JSObject* InterpretObjLiteral(JSContext* cx,
                               frontend::CompilationAtomCache& atomCache,
-                              const ObjLiteralAtomVector& atoms,
                               const mozilla::Span<const uint8_t> literalInsns,
                               ObjLiteralFlags flags) {
   return flags.contains(ObjLiteralFlag::Array)
-             ? InterpretObjLiteralArray(cx, atomCache, atoms, literalInsns,
-                                        flags)
-             : InterpretObjLiteralObj(cx, atomCache, atoms, literalInsns,
-                                      flags);
+             ? InterpretObjLiteralArray(cx, atomCache, literalInsns, flags)
+             : InterpretObjLiteralObj(cx, atomCache, literalInsns, flags);
 }
 
 #if defined(DEBUG) || defined(JS_JITSPEW)
@@ -183,25 +162,16 @@
   }
 }
 
-void ObjLiteralWriter::dump() {
-  js::Fprinter out(stderr);
-  js::JSONPrinter json(out);
-  dump(json);
-}
-
-void ObjLiteralWriter::dump(js::JSONPrinter& json) {
-  json.beginObject();
-  dumpFields(json);
-  json.endObject();
-}
-
-void ObjLiteralWriter::dumpFields(js::JSONPrinter& json) {
+static void DumpObjLiteral(js::JSONPrinter& json,
+                           frontend::CompilationStencil* compilationStencil,
+                           mozilla::Span<const uint8_t> code,
+                           const ObjLiteralFlags& flags) {
   json.beginListProperty("flags");
-  DumpObjLiteralFlagsItems(json, flags_);
+  DumpObjLiteralFlagsItems(json, flags);
   json.endList();
 
   json.beginListProperty("code");
-  ObjLiteralReader reader(getCode());
+  ObjLiteralReader reader(code);
   ObjLiteralInsn insn;
   while (reader.readInsn(&insn)) {
     json.beginObject();
@@ -209,8 +179,10 @@
     if (insn.getKey().isNone()) {
       json.nullProperty("key");
     } else if (insn.getKey().isAtomIndex()) {
-      uint32_t index = insn.getKey().getAtomIndex();
-      json.formatProperty("key", "ConstAtom(%u)", index);
+      frontend::TaggedParserAtomIndex index = insn.getKey().getAtomIndex();
+      json.beginObjectProperty("key");
+      DumpTaggedParserAtomIndex(json, index, compilationStencil);
+      json.endObject();
     } else if (insn.getKey().isArrayIndex()) {
       uint32_t index = insn.getKey().getArrayIndex();
       json.formatProperty("key", "ArrayIndex(%u)", index);
@@ -223,8 +195,10 @@
         break;
       }
       case ObjLiteralOpcode::ConstAtom: {
-        uint32_t index = insn.getAtomIndex();
-        json.formatProperty("op", "ConstAtom(%u)", index);
+        frontend::TaggedParserAtomIndex index = insn.getAtomIndex();
+        json.beginObjectProperty("op");
+        DumpTaggedParserAtomIndex(json, index, compilationStencil);
+        json.endObject();
         break;
       }
       case ObjLiteralOpcode::Null:
@@ -249,6 +223,24 @@
   json.endList();
 }
 
+void ObjLiteralWriter::dump() {
+  js::Fprinter out(stderr);
+  js::JSONPrinter json(out);
+  dump(json, nullptr);
+}
+
+void ObjLiteralWriter::dump(js::JSONPrinter& json,
+                            frontend::CompilationStencil* compilationStencil) {
+  json.beginObject();
+  dumpFields(json, compilationStencil);
+  json.endObject();
+}
+
+void ObjLiteralWriter::dumpFields(
+    js::JSONPrinter& json, frontend::CompilationStencil* compilationStencil) {
+  DumpObjLiteral(json, compilationStencil, getCode(), flags_);
+}
+
 void ObjLiteralStencil::dump() {
   js::Fprinter out(stderr);
   js::JSONPrinter json(out);
@@ -264,15 +256,7 @@
 
 void ObjLiteralStencil::dumpFields(
     js::JSONPrinter& json, frontend::CompilationStencil* compilationStencil) {
-  writer_.dumpFields(json);
-
-  json.beginListProperty("atoms");
-  for (auto& atom : atoms_) {
-    json.beginObject();
-    frontend::DumpTaggedParserAtomIndex(json, atom, compilationStencil);
-    json.endObject();
-  }
-  json.endList();
+  DumpObjLiteral(json, compilationStencil, code_, flags_);
 }
 
 #endif  // defined(DEBUG) || defined(JS_JITSPEW)
diff -Nru firefox-84.0.2+build1/js/src/frontend/ObjLiteral.h firefox-85.0+build1/js/src/frontend/ObjLiteral.h
--- firefox-84.0.2+build1/js/src/frontend/ObjLiteral.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ObjLiteral.h	2021-01-18 19:58:12.000000000 +0000
@@ -204,7 +204,7 @@
 
 struct ObjLiteralReaderBase;
 
-// Property name (as an atom index) or an integer index.  Only used for
+// Property name (as TaggedParserAtomIndex) or an integer index.  Only used for
 // object-type literals; array literals do not require the index (the sequence
 // is always dense, with no holes, so the index is implicit). For the latter
 // case, we have a `None` placeholder.
@@ -229,8 +229,8 @@
       : ObjLiteralKey(value, isArrayIndex ? ArrayIndex : AtomIndex) {}
   ObjLiteralKey(const ObjLiteralKey& other) = default;
 
-  static ObjLiteralKey fromPropName(uint32_t atomIndex) {
-    return ObjLiteralKey(atomIndex, false);
+  static ObjLiteralKey fromPropName(frontend::TaggedParserAtomIndex atomIndex) {
+    return ObjLiteralKey(*atomIndex.rawData(), false);
   }
   static ObjLiteralKey fromArrayIndex(uint32_t index) {
     return ObjLiteralKey(index, true);
@@ -241,9 +241,9 @@
   bool isAtomIndex() const { return type_ == AtomIndex; }
   bool isArrayIndex() const { return type_ == ArrayIndex; }
 
-  uint32_t getAtomIndex() const {
+  frontend::TaggedParserAtomIndex getAtomIndex() const {
     MOZ_ASSERT(isAtomIndex());
-    return value_;
+    return frontend::TaggedParserAtomIndex::fromRaw(value_);
   }
   uint32_t getArrayIndex() const {
     MOZ_ASSERT(isArrayIndex());
@@ -256,10 +256,9 @@
 struct ObjLiteralWriterBase {
  protected:
   friend struct ObjLiteralReaderBase;  // for access to mask and shift.
-  static const uint32_t ATOM_INDEX_MASK = 0x007fffff;
+  static const uint32_t ATOM_INDEX_MASK = 0x7fffffff;
   // If set, the atom index field is an array index, not an atom index.
-  static const uint32_t INDEXED_PROP = 0x00800000;
-  static const int OP_SHIFT = 24;
+  static const uint32_t INDEXED_PROP = 0x80000000;
 
  public:
   using CodeVector = Vector<uint8_t, 64, js::SystemAllocPolicy>;
@@ -272,6 +271,15 @@
 
   uint32_t curOffset() const { return code_.length(); }
 
+ private:
+  MOZ_MUST_USE bool pushByte(JSContext* cx, uint8_t data) {
+    if (!code_.append(data)) {
+      js::ReportOutOfMemory(cx);
+      return false;
+    }
+    return true;
+  }
+
   MOZ_MUST_USE bool prepareBytes(JSContext* cx, size_t len, uint8_t** p) {
     size_t offset = code_.length();
     if (!code_.growByUninitialized(len)) {
@@ -293,12 +301,12 @@
     return true;
   }
 
+ public:
   MOZ_MUST_USE bool pushOpAndName(JSContext* cx, ObjLiteralOpcode op,
                                   ObjLiteralKey key) {
-    uint32_t data = (key.rawIndex() & ATOM_INDEX_MASK) |
-                    (key.isArrayIndex() ? INDEXED_PROP : 0) |
-                    (static_cast<uint8_t>(op) << OP_SHIFT);
-    return pushRawData(cx, data);
+    uint8_t opdata = static_cast<uint8_t>(op);
+    uint32_t data = key.rawIndex() | (key.isArrayIndex() ? INDEXED_PROP : 0);
+    return pushByte(cx, opdata) && pushRawData(cx, data);
   }
 
   MOZ_MUST_USE bool pushValueArg(JSContext* cx, const JS::Value& value) {
@@ -308,8 +316,9 @@
     return pushRawData(cx, data);
   }
 
-  MOZ_MUST_USE bool pushAtomArg(JSContext* cx, uint32_t atomIndex) {
-    return pushRawData(cx, atomIndex);
+  MOZ_MUST_USE bool pushAtomArg(JSContext* cx,
+                                frontend::TaggedParserAtomIndex atomIndex) {
+    return pushRawData(cx, *atomIndex.rawData());
   }
 };
 
@@ -324,22 +333,17 @@
 
   void clear() { code_.clear(); }
 
-  // For XDR decoding.
   using CodeVector = typename ObjLiteralWriterBase::CodeVector;
-  void initializeForXDR(CodeVector&& code, uint8_t flags) {
-    code_ = std::move(code);
-    flags_.deserialize(flags);
-  }
 
   mozilla::Span<const uint8_t> getCode() const { return code_; }
   ObjLiteralFlags getFlags() const { return flags_; }
 
   void beginObject(ObjLiteralFlags flags) { flags_ = flags; }
-  void setPropName(uint32_t propName) {
+  void setPropName(const frontend::ParserAtom* propName) {
     // Only valid in object-mode.
     MOZ_ASSERT(!flags_.contains(ObjLiteralFlag::Array));
-    MOZ_ASSERT(propName <= ATOM_INDEX_MASK);
-    nextKey_ = ObjLiteralKey::fromPropName(propName);
+    propName->markUsedByStencil();
+    nextKey_ = ObjLiteralKey::fromPropName(propName->toIndex());
   }
   void setPropIndex(uint32_t propIndex) {
     // Only valid in object-mode.
@@ -361,9 +365,11 @@
     return pushOpAndName(cx, ObjLiteralOpcode::ConstValue, nextKey_) &&
            pushValueArg(cx, value);
   }
-  MOZ_MUST_USE bool propWithAtomValue(JSContext* cx, uint32_t value) {
+  MOZ_MUST_USE bool propWithAtomValue(JSContext* cx,
+                                      const frontend::ParserAtom* value) {
+    value->markUsedByStencil();
     return pushOpAndName(cx, ObjLiteralOpcode::ConstAtom, nextKey_) &&
-           pushAtomArg(cx, value);
+           pushAtomArg(cx, value->toIndex());
   }
   MOZ_MUST_USE bool propWithNullValue(JSContext* cx) {
     return pushOpAndName(cx, ObjLiteralOpcode::Null, nextKey_);
@@ -384,8 +390,10 @@
 
 #if defined(DEBUG) || defined(JS_JITSPEW)
   void dump();
-  void dump(JSONPrinter& json);
-  void dumpFields(JSONPrinter& json);
+  void dump(JSONPrinter& json,
+            frontend::CompilationStencil* compilationStencil);
+  void dumpFields(JSONPrinter& json,
+                  frontend::CompilationStencil* compilationStencil);
 #endif
 
  private:
@@ -398,6 +406,15 @@
   mozilla::Span<const uint8_t> data_;
   size_t cursor_;
 
+  MOZ_MUST_USE bool readByte(uint8_t* b) {
+    if (cursor_ + 1 > data_.Length()) {
+      return false;
+    }
+    *b = *data_.From(cursor_).data();
+    cursor_ += 1;
+    return true;
+  }
+
   MOZ_MUST_USE bool readBytes(size_t size, const uint8_t** p) {
     if (cursor_ + size > data_.Length()) {
       return false;
@@ -423,18 +440,21 @@
       : data_(data), cursor_(0) {}
 
   MOZ_MUST_USE bool readOpAndKey(ObjLiteralOpcode* op, ObjLiteralKey* key) {
-    uint32_t data;
-    if (!readRawData(&data)) {
+    uint8_t opbyte;
+    if (!readByte(&opbyte)) {
       return false;
     }
-    uint8_t opbyte =
-        static_cast<uint8_t>(data >> ObjLiteralWriterBase::OP_SHIFT);
     if (MOZ_UNLIKELY(opbyte > static_cast<uint8_t>(ObjLiteralOpcode::MAX))) {
       return false;
     }
     *op = static_cast<ObjLiteralOpcode>(opbyte);
+
+    uint32_t data;
+    if (!readRawData(&data)) {
+      return false;
+    }
     bool isArray = data & ObjLiteralWriterBase::INDEXED_PROP;
-    uint32_t rawIndex = data & ObjLiteralWriterBase::ATOM_INDEX_MASK;
+    uint32_t rawIndex = data & ~ObjLiteralWriterBase::INDEXED_PROP;
     *key = ObjLiteralKey(rawIndex, isArray);
     return true;
   }
@@ -448,8 +468,8 @@
     return true;
   }
 
-  MOZ_MUST_USE bool readAtomArg(uint32_t* atomIndex) {
-    return readRawData(atomIndex);
+  MOZ_MUST_USE bool readAtomArg(frontend::TaggedParserAtomIndex* atomIndex) {
+    return readRawData(atomIndex->rawData());
   }
 };
 
@@ -462,7 +482,7 @@
     explicit Arg(uint64_t raw_) : raw(raw_) {}
 
     JS::Value constValue;
-    uint32_t atomIndex;
+    frontend::TaggedParserAtomIndex atomIndex;
     uint64_t raw;
   } arg_;
 
@@ -479,7 +499,8 @@
     MOZ_ASSERT(!hasAtomIndex());
     arg_.constValue = value;
   }
-  ObjLiteralInsn(ObjLiteralOpcode op, ObjLiteralKey key, uint32_t atomIndex)
+  ObjLiteralInsn(ObjLiteralOpcode op, ObjLiteralKey key,
+                 frontend::TaggedParserAtomIndex atomIndex)
       : op_(op), key_(key), arg_(0) {
     MOZ_ASSERT(!hasConstValue());
     MOZ_ASSERT(hasAtomIndex());
@@ -522,7 +543,7 @@
     MOZ_ASSERT(hasConstValue());
     return arg_.constValue;
   }
-  uint32_t getAtomIndex() const {
+  frontend::TaggedParserAtomIndex getAtomIndex() const {
     MOZ_ASSERT(isValid());
     MOZ_ASSERT(hasAtomIndex());
     return arg_.atomIndex;
@@ -551,7 +572,7 @@
       return true;
     }
     if (ObjLiteralOpcodeHasAtomArg(op)) {
-      uint32_t atomIndex;
+      frontend::TaggedParserAtomIndex atomIndex;
       if (!readAtomArg(&atomIndex)) {
         return false;
       }
@@ -563,44 +584,22 @@
   }
 };
 
-using ObjLiteralAtomVector =
-    Vector<frontend::TaggedParserAtomIndex, 4, js::SystemAllocPolicy>;
-
 JSObject* InterpretObjLiteral(JSContext* cx,
                               frontend::CompilationAtomCache& atomCache,
-                              const ObjLiteralAtomVector& atoms,
                               const mozilla::Span<const uint8_t> insns,
                               ObjLiteralFlags flags);
 
-inline JSObject* InterpretObjLiteral(JSContext* cx,
-                                     frontend::CompilationAtomCache& atomCache,
-                                     const ObjLiteralAtomVector& atoms,
-                                     const ObjLiteralWriter& writer) {
-  return InterpretObjLiteral(cx, atomCache, atoms, writer.getCode(),
-                             writer.getFlags());
-}
-
 class ObjLiteralStencil {
   friend class frontend::StencilXDR;
 
-  ObjLiteralWriter writer_;
-  ObjLiteralAtomVector atoms_;
+  mozilla::Span<uint8_t> code_;
+  ObjLiteralFlags flags_;
 
  public:
   ObjLiteralStencil() = default;
 
-  ObjLiteralWriter& writer() { return writer_; }
-
-  bool addAtom(JSContext* cx, const frontend::ParserAtom* atom,
-               uint32_t* index) {
-    *index = atoms_.length();
-    atom->markUsedByStencil();
-    if (!atoms_.append(atom->toIndex())) {
-      js::ReportOutOfMemory(cx);
-      return false;
-    }
-    return true;
-  }
+  ObjLiteralStencil(uint8_t* code, size_t length, const ObjLiteralFlags& flags)
+      : code_(mozilla::Span(code, length)), flags_(flags) {}
 
   JSObject* create(JSContext* cx,
                    frontend::CompilationAtomCache& atomCache) const;
diff -Nru firefox-84.0.2+build1/js/src/frontend/OptionalEmitter.cpp firefox-85.0+build1/js/src/frontend/OptionalEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/OptionalEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/OptionalEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -16,7 +16,7 @@
 using namespace js::frontend;
 
 OptionalEmitter::OptionalEmitter(BytecodeEmitter* bce, int32_t initialDepth)
-    : bce_(bce), initialDepth_(initialDepth) {}
+    : bce_(bce), tdzCache_(bce), initialDepth_(initialDepth) {}
 
 bool OptionalEmitter::emitJumpShortCircuit() {
   MOZ_ASSERT(state_ == State::Start || state_ == State::ShortCircuit ||
diff -Nru firefox-84.0.2+build1/js/src/frontend/OptionalEmitter.h firefox-85.0+build1/js/src/frontend/OptionalEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/OptionalEmitter.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/OptionalEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Attributes.h"
 #include "frontend/IfEmitter.h"  // IfEmitter, InternalIfEmitter, CondEmitter
+#include "frontend/TDZCheckCache.h"
 
 namespace js {
 namespace frontend {
@@ -146,6 +147,8 @@
  private:
   BytecodeEmitter* bce_;
 
+  TDZCheckCache tdzCache_;
+
   // jumptarget for ShortCircuiting code, which has null or undefined values
   JumpList jumpShortCircuit_;
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParseContext.cpp firefox-85.0+build1/js/src/frontend/ParseContext.cpp
--- firefox-84.0.2+build1/js/src/frontend/ParseContext.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParseContext.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -701,6 +701,21 @@
   return true;
 }
 
+bool ParseContext::declareTopLevelDotGeneratorName() {
+  // Provide a .generator binding on the module scope for compatibility with
+  // generator code, which expect to find it on the CallObject for normal
+  // generators.
+  MOZ_ASSERT(
+      sc()->isModuleContext(),
+      "Tried to declare top level dot generator in a non-module context.");
+  ParseContext::Scope& modScope = varScope();
+  const ParserName* dotGenerator = sc()->cx_->parserNames().dotGenerator;
+  AddDeclaredNamePtr p = modScope.lookupDeclaredNameForAdd(dotGenerator);
+  return p ||
+         modScope.addDeclaredName(this, p, dotGenerator, DeclarationKind::Var,
+                                  DeclaredNameInfo::npos, ClosedOver::Yes);
+}
+
 }  // namespace frontend
 
 }  // namespace js
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParseContext.h firefox-85.0+build1/js/src/frontend/ParseContext.h
--- firefox-84.0.2+build1/js/src/frontend/ParseContext.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParseContext.h	2021-01-18 19:58:12.000000000 +0000
@@ -11,6 +11,7 @@
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/CompilationInfo.h"
 #include "frontend/ErrorReporter.h"
+#include "frontend/ModuleSharedContext.h"
 #include "frontend/NameAnalysisTypes.h"  // DeclaredNameInfo
 #include "frontend/NameCollections.h"
 #include "frontend/SharedContext.h"
@@ -477,6 +478,27 @@
   // be at top level.
   bool atTopLevel() { return atBodyLevel() && sc_->isTopLevelContext(); }
 
+  bool atModuleTopLevel() {
+    // True if we are at the topmost level of an entire module.
+    //
+    // For example, this is used to determine if an await statement should
+    // mark a module as an async module during parsing.
+    //
+    // Example module:
+    //   import x from "y";
+    //
+    //   await x.foo(); // mark as Top level await.
+    //
+    //   if (cond) {
+    //     await x.bar(); // mark as Top level await.
+    //   }
+    //
+    //   async function z() {
+    //     await x.baz(); // do not mark as Top level await.
+    //   }
+    return sc_->isModuleContext() && sc_->isTopLevelContext();
+  }
+
   void setSuperScopeNeedsHomeObject() {
     MOZ_ASSERT(sc_->allowSuperProperty());
     superScopeNeedsHomeObject_ = true;
@@ -499,7 +521,8 @@
   }
 
   bool isAsync() const {
-    return sc_->isFunctionBox() && sc_->asFunctionBox()->isAsync();
+    return sc_->isSuspendableContext() &&
+           sc_->asSuspendableContext()->isAsync();
   }
 
   bool isGeneratorOrAsync() const { return isGenerator() || isAsync(); }
@@ -543,6 +566,7 @@
   bool declareFunctionArgumentsObject(const UsedNameTracker& usedNames,
                                       bool canSkipLazyClosedOverBindings);
   bool declareDotGeneratorName();
+  bool declareTopLevelDotGeneratorName();
 
  private:
   MOZ_MUST_USE bool isVarRedeclaredInInnermostScope(
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParseContext-inl.h firefox-85.0+build1/js/src/frontend/ParseContext-inl.h
--- firefox-84.0.2+build1/js/src/frontend/ParseContext-inl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParseContext-inl.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,6 +8,9 @@
 #define frontend_ParseContext_inl_h
 
 #include "frontend/ParseContext.h"
+
+#include "mozilla/ResultVariant.h"
+
 #include "frontend/Parser.h"
 #include "vm/JSContext.h"
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParseNode.h firefox-85.0+build1/js/src/frontend/ParseNode.h
--- firefox-84.0.2+build1/js/src/frontend/ParseNode.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParseNode.h	2021-01-18 19:58:12.000000000 +0000
@@ -1078,8 +1078,14 @@
   TernaryNode(ParseNodeKind kind, ParseNode* kid1, ParseNode* kid2,
               ParseNode* kid3)
       : TernaryNode(kind, kid1, kid2, kid3,
-                    TokenPos((kid1 ? kid1 : kid2 ? kid2 : kid3)->pn_pos.begin,
-                             (kid3 ? kid3 : kid2 ? kid2 : kid1)->pn_pos.end)) {}
+                    TokenPos((kid1   ? kid1
+                              : kid2 ? kid2
+                                     : kid3)
+                                 ->pn_pos.begin,
+                             (kid3   ? kid3
+                              : kid2 ? kid2
+                                     : kid1)
+                                 ->pn_pos.end)) {}
 
   TernaryNode(ParseNodeKind kind, ParseNode* kid1, ParseNode* kid2,
               ParseNode* kid3, const TokenPos& pos)
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParserAtom.cpp firefox-85.0+build1/js/src/frontend/ParserAtom.cpp
--- firefox-84.0.2+build1/js/src/frontend/ParserAtom.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParserAtom.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -109,8 +109,6 @@
 namespace js {
 namespace frontend {
 
-static JS::OOM PARSER_ATOMS_OOM;
-
 JSAtom* GetWellKnownAtom(JSContext* cx, WellKnownAtomId atomId) {
 #define ASSERT_OFFSET_(idpart, id, text)       \
   static_assert(offsetof(JSAtomState, id) ==   \
@@ -132,19 +130,34 @@
   return (&cx->names().abort)[int32_t(atomId)];
 }
 
-mozilla::GenericErrorResult<OOM> RaiseParserAtomsOOMError(JSContext* cx) {
-  js::ReportOutOfMemory(cx);
-  return mozilla::Err(PARSER_ATOMS_OOM);
+#ifdef DEBUG
+void TaggedParserAtomIndex::validateRaw() {
+  if (isParserAtomIndex()) {
+    MOZ_ASSERT(toParserAtomIndex().index < IndexLimit);
+  } else if (isWellKnownAtomId()) {
+    MOZ_ASSERT(uint32_t(toWellKnownAtomId()) <
+               uint32_t(WellKnownAtomId::Limit));
+  } else if (isStaticParserString1()) {
+    MOZ_ASSERT(size_t(toStaticParserString1()) <
+               WellKnownParserAtoms_ROM::ASCII_STATIC_LIMIT);
+  } else if (isStaticParserString2()) {
+    MOZ_ASSERT(size_t(toStaticParserString2()) <
+               WellKnownParserAtoms_ROM::NUM_LENGTH2_ENTRIES);
+  } else {
+    MOZ_ASSERT(isNull());
+  }
 }
+#endif
 
 template <typename CharT, typename SeqCharT>
-/* static */ JS::Result<ParserAtomEntry*, OOM> ParserAtomEntry::allocate(
+/* static */ ParserAtomEntry* ParserAtomEntry::allocate(
     JSContext* cx, LifoAlloc& alloc, InflatedChar16Sequence<SeqCharT> seq,
     uint32_t length, HashNumber hash) {
   constexpr size_t HeaderSize = sizeof(ParserAtomEntry);
   void* raw = alloc.alloc(HeaderSize + (sizeof(CharT) * length));
   if (!raw) {
-    return RaiseParserAtomsOOMError(cx);
+    js::ReportOutOfMemory(cx);
+    return nullptr;
   }
 
   constexpr bool hasTwoByteChars = (sizeof(CharT) == 2);
@@ -307,47 +320,54 @@
       alloc_(alloc),
       entries_(entries) {}
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::addEntry(
-    JSContext* cx, EntrySet::AddPtr& addPtr, ParserAtomEntry* entry) {
+const ParserAtom* ParserAtomsTable::addEntry(JSContext* cx,
+                                             EntrySet::AddPtr& addPtr,
+                                             ParserAtomEntry* entry) {
   MOZ_ASSERT(!addPtr);
   ParserAtomIndex index = ParserAtomIndex(entries_.length());
   if (size_t(index) >= TaggedParserAtomIndex::IndexLimit) {
     ReportAllocationOverflow(cx);
-    return mozilla::Err(PARSER_ATOMS_OOM);
+    return nullptr;
   }
   if (!entries_.append(entry)) {
-    return RaiseParserAtomsOOMError(cx);
+    js::ReportOutOfMemory(cx);
+    return nullptr;
   }
   entry->setParserAtomIndex(index);
   if (!entrySet_.add(addPtr, entry)) {
-    return RaiseParserAtomsOOMError(cx);
+    js::ReportOutOfMemory(cx);
+    return nullptr;
   }
   return entry->asAtom();
 }
 
 template <typename AtomCharT, typename SeqCharT>
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internChar16Seq(
+const ParserAtom* ParserAtomsTable::internChar16Seq(
     JSContext* cx, EntrySet::AddPtr& addPtr, HashNumber hash,
     InflatedChar16Sequence<SeqCharT> seq, uint32_t length) {
   MOZ_ASSERT(!addPtr);
 
-  ParserAtomEntry* entry;
-  MOZ_TRY_VAR(entry, ParserAtomEntry::allocate<AtomCharT>(cx, alloc_, seq,
-                                                          length, hash));
+  ParserAtomEntry* entry =
+      ParserAtomEntry::allocate<AtomCharT>(cx, alloc_, seq, length, hash);
+  if (!entry) {
+    return nullptr;
+  }
   return addEntry(cx, addPtr, entry);
 }
 
 static const uint16_t MAX_LATIN1_CHAR = 0xff;
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internAscii(
-    JSContext* cx, const char* asciiPtr, uint32_t length) {
+const ParserAtom* ParserAtomsTable::internAscii(JSContext* cx,
+                                                const char* asciiPtr,
+                                                uint32_t length) {
   // ASCII strings are strict subsets of Latin1 strings.
   const Latin1Char* latin1Ptr = reinterpret_cast<const Latin1Char*>(asciiPtr);
   return internLatin1(cx, latin1Ptr, length);
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internLatin1(
-    JSContext* cx, const Latin1Char* latin1Ptr, uint32_t length) {
+const ParserAtom* ParserAtomsTable::internLatin1(JSContext* cx,
+                                                 const Latin1Char* latin1Ptr,
+                                                 uint32_t length) {
   // Check for tiny strings which are abundant in minified code.
   if (const ParserAtom* tiny = wellKnownTable_.lookupTiny(latin1Ptr, length)) {
     return tiny;
@@ -388,13 +408,13 @@
   return true;
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomVectorBuilder::internLatin1At(
+const ParserAtom* ParserAtomVectorBuilder::internLatin1At(
     JSContext* cx, const Latin1Char* latin1Ptr, HashNumber hash,
     uint32_t length, ParserAtomIndex index) {
   return internAt<Latin1Char, Latin1Char>(cx, latin1Ptr, hash, length, index);
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomVectorBuilder::internChar16At(
+const ParserAtom* ParserAtomVectorBuilder::internChar16At(
     JSContext* cx, LittleEndianChars twoByteLE, HashNumber hash,
     uint32_t length, ParserAtomIndex index) {
 #ifdef DEBUG
@@ -415,9 +435,11 @@
 }
 
 template <typename CharT, typename SeqCharT, typename InputCharsT>
-JS::Result<const ParserAtom*, OOM> ParserAtomVectorBuilder::internAt(
-    JSContext* cx, InputCharsT chars, HashNumber hash, uint32_t length,
-    ParserAtomIndex index) {
+const ParserAtom* ParserAtomVectorBuilder::internAt(JSContext* cx,
+                                                    InputCharsT chars,
+                                                    HashNumber hash,
+                                                    uint32_t length,
+                                                    ParserAtomIndex index) {
   InflatedChar16Sequence<SeqCharT> seq(chars, length);
 
 #ifdef DEBUG
@@ -427,17 +449,21 @@
   MOZ_ASSERT(wellKnownTable_.lookupChar16Seq(lookup) == nullptr);
 #endif
 
-  ParserAtomEntry* entry;
-  MOZ_TRY_VAR(entry,
-              ParserAtomEntry::allocate<CharT>(cx, *alloc_, seq, length, hash));
+  ParserAtomEntry* entry =
+      ParserAtomEntry::allocate<CharT>(cx, *alloc_, seq, length, hash);
+  if (!entry) {
+    return nullptr;
+  }
+
   entry->setParserAtomIndex(index);
   entries_[index] = entry;
 
   return entry->asAtom();
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internUtf8(
-    JSContext* cx, const mozilla::Utf8Unit* utf8Ptr, uint32_t nbyte) {
+const ParserAtom* ParserAtomsTable::internUtf8(JSContext* cx,
+                                               const mozilla::Utf8Unit* utf8Ptr,
+                                               uint32_t nbyte) {
   // Check for tiny strings which are abundant in minified code.
   // NOTE: The tiny atoms are all ASCII-only so we can directly look at the
   //        UTF-8 data without worrying about surrogates.
@@ -485,8 +511,9 @@
                                            length);
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internChar16(
-    JSContext* cx, const char16_t* char16Ptr, uint32_t length) {
+const ParserAtom* ParserAtomsTable::internChar16(JSContext* cx,
+                                                 const char16_t* char16Ptr,
+                                                 uint32_t length) {
   // Check for tiny strings which are abundant in minified code.
   if (const ParserAtom* tiny = wellKnownTable_.lookupTiny(char16Ptr, length)) {
     return tiny;
@@ -524,20 +551,19 @@
                                            length);
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::internJSAtom(
+const ParserAtom* ParserAtomsTable::internJSAtom(
     JSContext* cx, CompilationInfo& compilationInfo, JSAtom* atom) {
   const ParserAtom* parserAtom;
   {
     JS::AutoCheckCannotGC nogc;
 
-    auto result =
+    parserAtom =
         atom->hasLatin1Chars()
             ? internLatin1(cx, atom->latin1Chars(nogc), atom->length())
             : internChar16(cx, atom->twoByteChars(nogc), atom->length());
-    if (result.isErr()) {
-      return result;
+    if (!parserAtom) {
+      return nullptr;
     }
-    parserAtom = result.unwrap();
   }
 
   if (parserAtom->isParserAtomIndex()) {
@@ -546,7 +572,7 @@
 
     if (!atomCache.hasAtomAt(index)) {
       if (!atomCache.setAtomAt(cx, index, atom)) {
-        return mozilla::Err(PARSER_ATOMS_OOM);
+        return nullptr;
       }
     }
   }
@@ -557,7 +583,7 @@
   return parserAtom;
 }
 
-JS::Result<const ParserAtom*, OOM> ParserAtomsTable::concatAtoms(
+const ParserAtom* ParserAtomsTable::concatAtoms(
     JSContext* cx, mozilla::Range<const ParserAtom*> atoms) {
   MOZ_ASSERT(atoms.length() >= 2,
              "concatAtoms should only be used for multiple inputs");
@@ -571,7 +597,8 @@
     }
     // Overflow check here, length
     if (atom->length() >= (ParserAtomEntry::MAX_LENGTH - catLen)) {
-      return RaiseParserAtomsOOMError(cx);
+      js::ReportOutOfMemory(cx);
+      return nullptr;
     }
     catLen += atom->length();
   }
@@ -907,7 +934,7 @@
   /* Decode the character data. */
   MOZ_ASSERT(mode == XDR_DECODE);
   JSContext* cx = xdr->cx();
-  JS::Result<const ParserAtom*, JS::OOM> mbAtom(nullptr);
+  const ParserAtom* atom = nullptr;
   if (latin1) {
     const Latin1Char* chars = nullptr;
     if (length) {
@@ -915,19 +942,16 @@
       MOZ_TRY(xdr->peekData(&ptr, length * sizeof(Latin1Char)));
       chars = reinterpret_cast<const Latin1Char*>(ptr);
     }
-    mbAtom =
-        xdr->frontendAtoms().internLatin1At(cx, chars, hash, length, index);
+    atom = xdr->frontendAtoms().internLatin1At(cx, chars, hash, length, index);
   } else {
     const uint8_t* twoByteCharsLE = nullptr;
     if (length) {
       MOZ_TRY(xdr->peekData(&twoByteCharsLE, length * sizeof(char16_t)));
     }
     LittleEndianChars leTwoByte(twoByteCharsLE);
-    mbAtom =
+    atom =
         xdr->frontendAtoms().internChar16At(cx, leTwoByte, hash, length, index);
   }
-
-  const ParserAtom* atom = mbAtom.unwrapOr(nullptr);
   if (!atom) {
     return xdr->fail(JS::TranscodeResult_Throw);
   }
diff -Nru firefox-84.0.2+build1/js/src/frontend/ParserAtom.h firefox-85.0+build1/js/src/frontend/ParserAtom.h
--- firefox-84.0.2+build1/js/src/frontend/ParserAtom.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/ParserAtom.h	2021-01-18 19:58:12.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/DebugOnly.h"      // mozilla::DebugOnly
 #include "mozilla/HashFunctions.h"  // HashString
 #include "mozilla/Range.h"          // mozilla::Range
-#include "mozilla/Variant.h"        // mozilla::Variant
 
 #include "ds/LifoAlloc.h"         // LifoAlloc
 #include "frontend/TypedIndex.h"  // TypedIndex
@@ -33,8 +32,6 @@
 
 class ParserAtomsTable;
 
-mozilla::GenericErrorResult<OOM> RaiseParserAtomsOOMError(JSContext* cx);
-
 // An index to map WellKnownParserAtoms to cx->names().
 // This is consistent across multiple compilation.
 //
@@ -138,8 +135,16 @@
   }
   static TaggedParserAtomIndex null() { return TaggedParserAtomIndex(); }
 
+#ifdef DEBUG
+  void validateRaw();
+#endif
+
   static TaggedParserAtomIndex fromRaw(uint32_t data) {
-    return TaggedParserAtomIndex(data);
+    auto result = TaggedParserAtomIndex(data);
+#ifdef DEBUG
+    result.validateRaw();
+#endif
+    return result;
   }
 
   bool isParserAtomIndex() const {
@@ -256,9 +261,9 @@
   ParserAtomEntry(ParserAtomEntry&& other) = delete;
 
   template <typename CharT, typename SeqCharT>
-  static JS::Result<ParserAtomEntry*, OOM> allocate(
-      JSContext* cx, LifoAlloc& alloc, InflatedChar16Sequence<SeqCharT> seq,
-      uint32_t length, HashNumber hash);
+  static ParserAtomEntry* allocate(JSContext* cx, LifoAlloc& alloc,
+                                   InflatedChar16Sequence<SeqCharT> seq,
+                                   uint32_t length, HashNumber hash);
 
   ParserAtom* asAtom() { return reinterpret_cast<ParserAtom*>(this); }
   const ParserAtom* asAtom() const {
@@ -674,34 +679,33 @@
  private:
   // Internal APIs for interning to the table after well-known atoms cases have
   // been tested.
-  JS::Result<const ParserAtom*, OOM> addEntry(JSContext* cx,
-                                              EntrySet::AddPtr& addPtr,
-                                              ParserAtomEntry* entry);
+  const ParserAtom* addEntry(JSContext* cx, EntrySet::AddPtr& addPtr,
+                             ParserAtomEntry* entry);
   template <typename AtomCharT, typename SeqCharT>
-  JS::Result<const ParserAtom*, OOM> internChar16Seq(
-      JSContext* cx, EntrySet::AddPtr& addPtr, HashNumber hash,
-      InflatedChar16Sequence<SeqCharT> seq, uint32_t length);
+  const ParserAtom* internChar16Seq(JSContext* cx, EntrySet::AddPtr& addPtr,
+                                    HashNumber hash,
+                                    InflatedChar16Sequence<SeqCharT> seq,
+                                    uint32_t length);
 
  public:
-  JS::Result<const ParserAtom*, OOM> internAscii(JSContext* cx,
-                                                 const char* asciiPtr,
-                                                 uint32_t length);
+  const ParserAtom* internAscii(JSContext* cx, const char* asciiPtr,
+                                uint32_t length);
 
-  JS::Result<const ParserAtom*, OOM> internLatin1(
-      JSContext* cx, const JS::Latin1Char* latin1Ptr, uint32_t length);
+  const ParserAtom* internLatin1(JSContext* cx, const JS::Latin1Char* latin1Ptr,
+                                 uint32_t length);
 
-  JS::Result<const ParserAtom*, OOM> internUtf8(
-      JSContext* cx, const mozilla::Utf8Unit* utf8Ptr, uint32_t nbyte);
+  const ParserAtom* internUtf8(JSContext* cx, const mozilla::Utf8Unit* utf8Ptr,
+                               uint32_t nbyte);
 
-  JS::Result<const ParserAtom*, OOM> internChar16(JSContext* cx,
-                                                  const char16_t* char16Ptr,
-                                                  uint32_t length);
+  const ParserAtom* internChar16(JSContext* cx, const char16_t* char16Ptr,
+                                 uint32_t length);
 
-  JS::Result<const ParserAtom*, OOM> internJSAtom(
-      JSContext* cx, CompilationInfo& compilationInfo, JSAtom* atom);
+  const ParserAtom* internJSAtom(JSContext* cx,
+                                 CompilationInfo& compilationInfo,
+                                 JSAtom* atom);
 
-  JS::Result<const ParserAtom*, OOM> concatAtoms(
-      JSContext* cx, mozilla::Range<const ParserAtom*> atoms);
+  const ParserAtom* concatAtoms(JSContext* cx,
+                                mozilla::Range<const ParserAtom*> atoms);
 
   const ParserAtom* getWellKnown(WellKnownAtomId atomId) const;
   const ParserAtom* getStatic1(StaticParserString1 s) const;
@@ -726,19 +730,20 @@
   bool resize(JSContext* cx, size_t count);
   size_t length() const { return entries_.length(); }
 
-  JS::Result<const ParserAtom*, OOM> internLatin1At(
-      JSContext* cx, const JS::Latin1Char* latin1Ptr, HashNumber hash,
-      uint32_t length, ParserAtomIndex index);
-
-  JS::Result<const ParserAtom*, OOM> internChar16At(
-      JSContext* cx, const LittleEndianChars twoByteLE, HashNumber hash,
-      uint32_t length, ParserAtomIndex index);
+  const ParserAtom* internLatin1At(JSContext* cx,
+                                   const JS::Latin1Char* latin1Ptr,
+                                   HashNumber hash, uint32_t length,
+                                   ParserAtomIndex index);
+
+  const ParserAtom* internChar16At(JSContext* cx,
+                                   const LittleEndianChars twoByteLE,
+                                   HashNumber hash, uint32_t length,
+                                   ParserAtomIndex index);
 
  private:
   template <typename CharT, typename SeqCharT, typename InputCharsT>
-  JS::Result<const ParserAtom*, OOM> internAt(JSContext* cx, InputCharsT chars,
-                                              HashNumber hash, uint32_t length,
-                                              ParserAtomIndex index);
+  const ParserAtom* internAt(JSContext* cx, InputCharsT chars, HashNumber hash,
+                             uint32_t length, ParserAtomIndex index);
 
  public:
   const ParserAtom* getWellKnown(WellKnownAtomId atomId) const;
diff -Nru firefox-84.0.2+build1/js/src/frontend/Parser.cpp firefox-85.0+build1/js/src/frontend/Parser.cpp
--- firefox-84.0.2+build1/js/src/frontend/Parser.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/Parser.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -23,7 +23,6 @@
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Range.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Utf8.h"
@@ -842,14 +841,14 @@
       // TODO-Stencil
       //   After closed-over-bindings are snapshotted in the handler,
       //   remove this.
-      auto mbNameId = this->compilationState_.parserAtoms.internJSAtom(
-          cx_, this->getCompilationInfo(), name);
-      if (mbNameId.isErr()) {
+      const ParserAtom* parserAtom =
+          this->compilationState_.parserAtoms.internJSAtom(
+              cx_, this->getCompilationInfo(), name);
+      if (!parserAtom) {
         return false;
       }
-      const ParserName* nameId = mbNameId.unwrap()->asName();
 
-      scope.lookupDeclaredName(nameId)->value()->setClosedOver();
+      scope.lookupDeclaredName(parserAtom->asName())->value()->setClosedOver();
       MOZ_ASSERT(slotCount > 0);
       slotCount--;
     }
@@ -1708,6 +1707,8 @@
     ModuleSharedContext* modulesc) {
   MOZ_ASSERT(checkOptionsCalled_);
 
+  this->compilationInfo_.stencil.moduleMetadata.emplace();
+
   SourceParseContext modulepc(this, modulesc, nullptr);
   if (!modulepc.init()) {
     return null();
@@ -1733,6 +1734,16 @@
   MOZ_ASSERT(stmtList->isKind(ParseNodeKind::StatementList));
   moduleNode->setBody(&stmtList->as<ListNode>());
 
+  if (pc_->isAsync()) {
+    if (!noteUsedName(cx_->parserNames().dotGenerator)) {
+      return null();
+    }
+
+    if (!pc_->declareTopLevelDotGeneratorName()) {
+      return null();
+    }
+  }
+
   TokenKind tt;
   if (!tokenStream.getToken(&tt, TokenStream::SlashIsRegExp)) {
     return null();
@@ -1742,15 +1753,21 @@
     return null();
   }
 
+  // Set the module to async if an await keyword was found at the top level.
+  if (pc_->isAsync()) {
+    pc_->sc()->asModuleContext()->builder.noteAsync(
+        *this->compilationInfo_.stencil.moduleMetadata);
+  }
+
   // Generate the Import/Export tables and store in CompilationInfo.
   if (!modulesc->builder.buildTables(
-          this->compilationInfo_.stencil.moduleMetadata)) {
+          *this->compilationInfo_.stencil.moduleMetadata)) {
     return null();
   }
 
   // Check exported local bindings exist and mark them as closed over.
   StencilModuleMetadata& moduleMetadata =
-      this->compilationInfo_.stencil.moduleMetadata;
+      *this->compilationInfo_.stencil.moduleMetadata;
   for (auto entry : moduleMetadata.localExportEntries) {
     const ParserAtom* nameId =
         this->compilationInfo_.stencil.getParserAtomAt(cx_, entry.localName);
@@ -1941,6 +1958,7 @@
 
   funbox->finishScriptFlags();
   funbox->copyFunctionFields(script);
+  funbox->copyScriptFields(script);
 
   return true;
 }
@@ -1990,7 +2008,7 @@
 
   // Allocate the `stencilThings` array without initializing it yet.
   mozilla::Span<TaggedScriptThingIndex> stencilThings =
-      NewScriptThingSpanUninitialized(cx_, compilationInfo_.stencil.alloc,
+      NewScriptThingSpanUninitialized(cx_, compilationInfo_.alloc,
                                       ngcthings.value());
   if (stencilThings.empty()) {
     return false;
@@ -2158,7 +2176,7 @@
   }
 
   // Function is not syntactically part of another script.
-  funbox->setIsStandalone(true);
+  MOZ_ASSERT(funbox->index() == CompilationInfo::TopLevelIndex);
 
   funbox->initStandalone(this->compilationState_.scopeContext, flags,
                          syntaxKind);
@@ -2335,7 +2353,11 @@
      * we'd throw a confusing "unexpected token: (unexpected token)" error.
      */
     if (!pc_->isAsync() && anyChars.currentToken().type == TokenKind::Await) {
-      error(JSMSG_AWAIT_OUTSIDE_ASYNC);
+      if (!options().topLevelAwait) {
+        error(JSMSG_AWAIT_OUTSIDE_ASYNC);
+        return false;
+      }
+      error(JSMSG_AWAIT_OUTSIDE_ASYNC_OR_MODULE);
       return false;
     }
     if (!yieldExpressionsSupported() &&
@@ -2399,8 +2421,7 @@
 
   const ParserAtom* atoms[2] = {prefix, propAtom};
   auto atomsRange = mozilla::Range(atoms, 2);
-  return this->compilationState_.parserAtoms.concatAtoms(cx_, atomsRange)
-      .unwrapOr(nullptr);
+  return this->compilationState_.parserAtoms.concatAtoms(cx_, atomsRange);
 }
 
 template <class ParseHandler, typename Unit>
@@ -2744,10 +2765,8 @@
   // TODO-Stencil: Consider for snapshotting.
   const ParserAtom* displayAtom = nullptr;
   if (fun->displayAtom()) {
-    displayAtom =
-        this->compilationState_.parserAtoms
-            .internJSAtom(cx_, this->compilationInfo_, fun->displayAtom())
-            .unwrapOr(nullptr);
+    displayAtom = this->compilationState_.parserAtoms.internJSAtom(
+        cx_, this->compilationInfo_, fun->displayAtom());
     if (!displayAtom) {
       return false;
     }
@@ -3236,10 +3255,8 @@
   // TODO-Stencil: Consider for snapshotting.
   const ParserAtom* displayAtom = nullptr;
   if (fun->displayAtom()) {
-    displayAtom =
-        this->compilationState_.parserAtoms
-            .internJSAtom(cx_, this->compilationInfo_, fun->displayAtom())
-            .unwrapOr(nullptr);
+    displayAtom = this->compilationState_.parserAtoms.internJSAtom(
+        cx_, this->compilationInfo_, fun->displayAtom());
     if (!displayAtom) {
       return null();
     }
@@ -3755,10 +3772,10 @@
       if (pc_->isFunctionBox()) {
         FunctionBox* funbox = pc_->functionBox();
         if (!funbox->hasSimpleParameterList()) {
-          const char* parameterKind =
-              funbox->hasDestructuringArgs
-                  ? "destructuring"
-                  : funbox->hasParameterExprs ? "default" : "rest";
+          const char* parameterKind = funbox->hasDestructuringArgs
+                                          ? "destructuring"
+                                      : funbox->hasParameterExprs ? "default"
+                                                                  : "rest";
           errorAt(directivePos.begin, JSMSG_STRICT_NON_SIMPLE_PARAMS,
                   parameterKind);
           return false;
@@ -6265,12 +6282,19 @@
   IteratorKind iterKind = IteratorKind::Sync;
   unsigned iflags = 0;
 
-  if (pc_->isAsync()) {
+  if (pc_->isAsync() ||
+      (options().topLevelAwait && pc_->sc()->isModuleContext())) {
     bool matched;
     if (!tokenStream.matchToken(&matched, TokenKind::Await)) {
       return null();
     }
 
+    // If we come across a top level await here, mark the module as async.
+    if (matched && pc_->sc()->isModuleContext() && !pc_->isAsync()) {
+      pc_->sc()->asModuleContext()->setIsAsync();
+      MOZ_ASSERT(pc_->isAsync());
+    }
+
     if (matched) {
       iflags |= JSITER_FORAWAITOF;
       iterKind = IteratorKind::Async;
@@ -6639,7 +6663,6 @@
   uint32_t begin = pos().begin;
 
   MOZ_ASSERT(pc_->isFunctionBox());
-  pc_->functionBox()->usesReturn = true;
 
   // Parse an optional operand.
   //
@@ -7900,7 +7923,6 @@
   handler_.setFunctionFormalParametersAndBody(funNode, argsbody);
   setFunctionStartAtCurrentToken(funbox);
   funbox->setArgCount(0);
-  funbox->usesThis = true;
 
   // Note both the stored private method body and it's private name as being
   // used in the initializer. They will be emitted into the method body in the
@@ -8037,7 +8059,6 @@
   handler_.setFunctionFormalParametersAndBody(funNode, argsbody);
   funbox->setArgCount(0);
 
-  funbox->usesThis = true;
   NameNodeType thisName = newThisName();
   if (!thisName) {
     return null();
@@ -8270,6 +8291,19 @@
     }
 
     default: {
+      // If we encounter an await in a module, and the module is not marked
+      // as async, mark the module as async.
+      if (tt == TokenKind::Await && !pc_->isAsync()) {
+        if (pc_->atModuleTopLevel()) {
+          if (!options().topLevelAwait) {
+            error(JSMSG_TOP_LEVEL_AWAIT_NOT_SUPPORTED);
+            return null();
+          }
+          pc_->sc()->asModuleContext()->setIsAsync();
+          MOZ_ASSERT(pc_->isAsync());
+        }
+      }
+
       // Avoid getting next token with SlashIsDiv.
       if (tt == TokenKind::Await && pc_->isAsync()) {
         return expressionStatement(yieldHandling);
@@ -8514,6 +8548,19 @@
     }
 
     default: {
+      // If we encounter an await in a module, and the module is not marked
+      // as async, mark the module as async.
+      if (tt == TokenKind::Await && !pc_->isAsync()) {
+        if (pc_->atModuleTopLevel()) {
+          if (!options().topLevelAwait) {
+            error(JSMSG_TOP_LEVEL_AWAIT_NOT_SUPPORTED);
+            return null();
+          }
+          pc_->sc()->asModuleContext()->setIsAsync();
+          MOZ_ASSERT(pc_->isAsync());
+        }
+      }
+
       // Avoid getting next token with SlashIsDiv.
       if (tt == TokenKind::Await && pc_->isAsync()) {
         return expressionStatement(yieldHandling);
@@ -9522,6 +9569,16 @@
     }
 
     case TokenKind::Await: {
+      // If we encounter an await in a module, mark it as async.
+      if (!pc_->isAsync() && pc_->sc()->isModule()) {
+        if (!options().topLevelAwait) {
+          error(JSMSG_TOP_LEVEL_AWAIT_NOT_SUPPORTED);
+          return null();
+        }
+        pc_->sc()->asModuleContext()->setIsAsync();
+        MOZ_ASSERT(pc_->isAsync());
+      }
+
       if (pc_->isAsync()) {
         if (inParametersOfAsyncFunction()) {
           error(JSMSG_AWAIT_IN_PARAMETER);
@@ -9998,9 +10055,6 @@
     // syntax.
     if (prop == cx_->parserNames().apply) {
       op = JSOp::FunApply;
-      if (pc_->isFunctionBox()) {
-        pc_->functionBox()->usesApply = true;
-      }
     } else if (prop == cx_->parserNames().call) {
       op = JSOp::FunCall;
     }
@@ -10296,9 +10350,8 @@
     }
   }
 
-  const ParserAtom* atom = this->compilationState_.parserAtoms
-                               .internChar16(cx_, chars.begin(), chars.length())
-                               .unwrapOr(nullptr);
+  const ParserAtom* atom = this->compilationState_.parserAtoms.internChar16(
+      cx_, chars.begin(), chars.length());
   if (!atom) {
     return nullptr;
   }
@@ -11430,9 +11483,6 @@
     case TokenKind::False:
       return handler_.newBooleanLiteral(false, pos());
     case TokenKind::This: {
-      if (pc_->isFunctionBox()) {
-        pc_->functionBox()->usesThis = true;
-      }
       NameNodeType thisName = null();
       if (pc_->sc()->hasFunctionThisBinding()) {
         thisName = newThisName();
diff -Nru firefox-84.0.2+build1/js/src/frontend/Parser.h firefox-85.0+build1/js/src/frontend/Parser.h
--- firefox-84.0.2+build1/js/src/frontend/Parser.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/Parser.h	2021-01-18 19:58:12.000000000 +0000
@@ -267,7 +267,7 @@
  public:
   CompilationInfo& getCompilationInfo() { return compilationInfo_; }
 
-  LifoAlloc& stencilAlloc() { return compilationInfo_.stencil.alloc; }
+  LifoAlloc& stencilAlloc() { return compilationInfo_.alloc; }
 
   JSAtom* liftParserAtomToJSAtom(const ParserAtom* parserAtom) {
     return parserAtom->toJSAtom(cx_, compilationInfo_.input.atomCache);
@@ -708,6 +708,7 @@
   using Base::hasValidSimpleStrictParameterNames;
   using Base::isUnexpectedEOF_;
   using Base::nameIsArgumentsOrEval;
+  using Base::newDotGeneratorName;
   using Base::newFunction;
   using Base::newFunctionBox;
   using Base::newName;
@@ -750,6 +751,7 @@
   using Base::anyChars;
   using Base::cx_;
   using Base::handler_;
+  using Base::noteUsedName;
   using Base::pc_;
   using Base::usedNames_;
 
@@ -758,13 +760,11 @@
   using Base::finishFunction;
   using Base::identifierReference;
   using Base::leaveInnerFunction;
-  using Base::newDotGeneratorName;
   using Base::newInternalDotName;
   using Base::newThisName;
   using Base::nextTokenContinuesLetDeclaration;
   using Base::noSubstitutionTaggedTemplate;
   using Base::noteDestructuredPositionalFormalParameter;
-  using Base::noteUsedName;
   using Base::prefixAccessorName;
   using Base::privateNameReference;
   using Base::processExport;
@@ -1648,6 +1648,7 @@
   using Base::newName;
   using Base::newVarScopeData;
   using Base::noteDeclaredName;
+  using Base::noteUsedName;
   using Base::null;
   using Base::propagateFreeNamesAndMarkClosedOverBindings;
   using Base::statementList;
diff -Nru firefox-84.0.2+build1/js/src/frontend/PropOpEmitter.cpp firefox-85.0+build1/js/src/frontend/PropOpEmitter.cpp
--- firefox-84.0.2+build1/js/src/frontend/PropOpEmitter.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/PropOpEmitter.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -19,12 +19,7 @@
     : bce_(bce), kind_(kind), objKind_(objKind) {}
 
 bool PropOpEmitter::prepareAtomIndex(const ParserAtom* prop) {
-  if (!bce_->makeAtomIndex(prop, &propAtomIndex_)) {
-    return false;
-  }
-  isLength_ = prop == bce_->cx->parserNames().length;
-
-  return true;
+  return bce_->makeAtomIndex(prop, &propAtomIndex_);
 }
 
 bool PropOpEmitter::prepareForObj() {
@@ -71,14 +66,7 @@
     }
   }
 
-  JSOp op;
-  if (isSuper()) {
-    op = JSOp::GetPropSuper;
-  } else if (isCall()) {
-    op = JSOp::CallProp;
-  } else {
-    op = isLength_ ? JSOp::Length : JSOp::GetProp;
-  }
+  JSOp op = isSuper() ? JSOp::GetPropSuper : JSOp::GetProp;
   if (!bce_->emitAtomOp(op, propAtomIndex_, ShouldInstrument::Yes)) {
     //              [stack] # if Get
     //              [stack] PROP
@@ -185,12 +173,11 @@
   }
 
   MOZ_ASSERT_IF(isPropInit(), !isSuper());
-  JSOp setOp = isPropInit()
-                   ? JSOp::InitProp
-                   : isSuper() ? bce_->sc->strict() ? JSOp::StrictSetPropSuper
-                                                    : JSOp::SetPropSuper
-                               : bce_->sc->strict() ? JSOp::StrictSetProp
-                                                    : JSOp::SetProp;
+  JSOp setOp = isPropInit() ? JSOp::InitProp
+               : isSuper()  ? bce_->sc->strict() ? JSOp::StrictSetPropSuper
+                                                 : JSOp::SetPropSuper
+               : bce_->sc->strict() ? JSOp::StrictSetProp
+                                    : JSOp::SetProp;
   if (!bce_->emitAtomOp(setOp, propAtomIndex_, ShouldInstrument::Yes)) {
     //              [stack] VAL
     return false;
@@ -234,10 +221,10 @@
     return false;
   }
 
-  JSOp setOp =
-      isSuper()
-          ? bce_->sc->strict() ? JSOp::StrictSetPropSuper : JSOp::SetPropSuper
-          : bce_->sc->strict() ? JSOp::StrictSetProp : JSOp::SetProp;
+  JSOp setOp = isSuper() ? bce_->sc->strict() ? JSOp::StrictSetPropSuper
+                                              : JSOp::SetPropSuper
+               : bce_->sc->strict() ? JSOp::StrictSetProp
+                                    : JSOp::SetProp;
   if (!bce_->emitAtomOp(setOp, propAtomIndex_, ShouldInstrument::Yes)) {
     //              [stack] N? N+1
     return false;
diff -Nru firefox-84.0.2+build1/js/src/frontend/PropOpEmitter.h firefox-85.0+build1/js/src/frontend/PropOpEmitter.h
--- firefox-84.0.2+build1/js/src/frontend/PropOpEmitter.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/PropOpEmitter.h	2021-01-18 19:58:12.000000000 +0000
@@ -128,9 +128,6 @@
   // The index for the property name's atom.
   GCThingIndex propAtomIndex_;
 
-  // Whether the property name is `length` or not.
-  bool isLength_ = false;
-
 #ifdef DEBUG
   // The state of this emitter.
   //
diff -Nru firefox-84.0.2+build1/js/src/frontend/SharedContext.cpp firefox-85.0+build1/js/src/frontend/SharedContext.cpp
--- firefox-84.0.2+build1/js/src/frontend/SharedContext.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/SharedContext.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -224,34 +224,36 @@
   inWith_ = compilationState.scopeContext.inWith;
 }
 
+SuspendableContext::SuspendableContext(JSContext* cx, Kind kind,
+                                       CompilationInfo& compilationInfo,
+                                       Directives directives,
+                                       SourceExtent extent, bool isGenerator,
+                                       bool isAsync)
+    : SharedContext(cx, kind, compilationInfo, directives, extent) {
+  setFlag(ImmutableFlags::IsGenerator, isGenerator);
+  setFlag(ImmutableFlags::IsAsync, isAsync);
+}
+
 FunctionBox::FunctionBox(JSContext* cx, SourceExtent extent,
                          CompilationInfo& compilationInfo,
                          Directives directives, GeneratorKind generatorKind,
                          FunctionAsyncKind asyncKind, const ParserAtom* atom,
                          FunctionFlags flags, FunctionIndex index)
-    : SharedContext(cx, Kind::FunctionBox, compilationInfo, directives, extent),
+    : SuspendableContext(cx, Kind::FunctionBox, compilationInfo, directives,
+                         extent, generatorKind == GeneratorKind::Generator,
+                         asyncKind == FunctionAsyncKind::AsyncFunction),
       atom_(atom),
       funcDataIndex_(index),
       flags_(FunctionFlags::clearMutableflags(flags)),
       emitBytecode(false),
-      isStandalone_(false),
       wasEmitted_(false),
-      isSingleton_(false),
       isAnnexB(false),
       useAsm(false),
       hasParameterExprs(false),
       hasDestructuringArgs(false),
       hasDuplicateParameters(false),
       hasExprBody_(false),
-      usesApply(false),
-      usesThis(false),
-      usesReturn(false),
-      isFunctionFieldCopiedToStencil(false) {
-  setFlag(ImmutableFlags::IsGenerator,
-          generatorKind == GeneratorKind::Generator);
-  setFlag(ImmutableFlags::IsAsync,
-          asyncKind == FunctionAsyncKind::AsyncFunction);
-}
+      isFunctionFieldCopiedToStencil(false) {}
 
 void FunctionBox::initFromLazyFunction(JSFunction* fun) {
   BaseScript* lazy = fun->baseScript();
@@ -384,8 +386,9 @@
                                          CompilationInfo& compilationInfo,
                                          ModuleBuilder& builder,
                                          SourceExtent extent)
-    : SharedContext(cx, Kind::Module, compilationInfo, Directives(true),
-                    extent),
+    : SuspendableContext(cx, Kind::Module, compilationInfo, Directives(true),
+                         extent, /* isGenerator = */ false,
+                         /* isAsync = */ false),
       bindings(nullptr),
       builder(builder) {
   thisBinding_ = ThisBinding::Module;
@@ -410,13 +413,10 @@
 
   using ImmutableFlags = ImmutableScriptFlagsEnum;
   immutableFlags_.setFlag(ImmutableFlags::HasMappedArgsObj, hasMappedArgsObj());
-  immutableFlags_.setFlag(ImmutableFlags::IsLikelyConstructorWrapper,
-                          isLikelyConstructorWrapper());
 }
 
 void FunctionBox::copyScriptFields(ScriptStencil& script) {
   MOZ_ASSERT(&script == &functionStencil());
-  MOZ_ASSERT(!isAsmJSModule());
 
   SharedContext::copyScriptFields(script);
 
@@ -436,9 +436,7 @@
   script.functionFlags = flags_;
   script.nargs = nargs_;
   script.lazyFunctionEnclosingScopeIndex_ = enclosingScopeIndex_;
-  script.isStandaloneFunction = isStandalone_;
   script.wasFunctionEmitted = wasEmitted_;
-  script.isSingletonFunction = isSingleton_;
 
   isFunctionFieldCopiedToStencil = true;
 }
@@ -477,10 +475,5 @@
   script.wasFunctionEmitted = wasEmitted_;
 }
 
-void FunctionBox::copyUpdatedIsSingleton() {
-  ScriptStencil& script = functionStencil();
-  script.isSingletonFunction = isSingleton_;
-}
-
 }  // namespace frontend
 }  // namespace js
diff -Nru firefox-84.0.2+build1/js/src/frontend/SharedContext.h firefox-85.0+build1/js/src/frontend/SharedContext.h
--- firefox-84.0.2+build1/js/src/frontend/SharedContext.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/SharedContext.h	2021-01-18 19:58:12.000000000 +0000
@@ -108,6 +108,7 @@
 class GlobalSharedContext;
 class EvalSharedContext;
 class ModuleSharedContext;
+class SuspendableContext;
 
 using ParserBindingName = AbstractBindingName<const ParserAtom>;
 using ParserBindingIter = AbstractBindingIter<const ParserAtom>;
@@ -230,6 +231,8 @@
   inline FunctionBox* asFunctionBox();
   bool isModuleContext() const { return isModule(); }
   inline ModuleSharedContext* asModuleContext();
+  bool isSuspendableContext() const { return isFunction() || isModule(); }
+  inline SuspendableContext* asSuspendableContext();
   bool isGlobalContext() const {
     return !(isFunction() || isModule() || isForEval());
   }
@@ -316,7 +319,23 @@
 
 enum class HasHeritage { No, Yes };
 
-class FunctionBox : public SharedContext {
+class SuspendableContext : public SharedContext {
+ public:
+  SuspendableContext(JSContext* cx, Kind kind, CompilationInfo& compilationInfo,
+                     Directives directives, SourceExtent extent,
+                     bool isGenerator, bool isAsync);
+
+  IMMUTABLE_FLAG_GETTER_SETTER(isAsync, IsAsync)
+  IMMUTABLE_FLAG_GETTER_SETTER(isGenerator, IsGenerator)
+
+  bool needsFinalYield() const { return isGenerator() || isAsync(); }
+  bool needsDotGeneratorName() const { return isGenerator() || isAsync(); }
+  bool needsClearSlotsOnExit() const { return isGenerator() || isAsync(); }
+  bool needsIteratorResult() const { return isGenerator() && !isAsync(); }
+  bool needsPromiseResult() const { return isAsync() && !isGenerator(); }
+};
+
+class FunctionBox : public SuspendableContext {
   friend struct GCThingList;
 
   // If this FunctionBox refers to a lazy child of the function being
@@ -375,19 +394,11 @@
   // compilation.
   bool emitBytecode : 1;
 
-  // This function is a standalone function that is not syntactically part of
-  // another script. Eg. Created by `new Function("")`.
-  bool isStandalone_ : 1;
-
   // This is set by the BytecodeEmitter of the enclosing script when a reference
   // to this function is generated. This is also used to determine a hoisted
   // function already is referenced by the bytecode.
   bool wasEmitted_ : 1;
 
-  // This function should be marked as a singleton. It is expected to be defined
-  // at most once. This is a heuristic only and does not affect correctness.
-  bool isSingleton_ : 1;
-
   // Need to emit a synthesized Annex B assignment
   bool isAnnexB : 1;
 
@@ -403,11 +414,6 @@
   // Arrow function with expression body like: `() => 1`.
   bool hasExprBody_ : 1;
 
-  // Analysis for use in heuristics.
-  bool usesApply : 1;   // Contains an f.apply() call
-  bool usesThis : 1;    // Contains 'this'
-  bool usesReturn : 1;  // Contains a 'return' statement
-
   // Tracks if function-related fields are already copied to ScriptStencil.
   // If this field is true, modification to those fields should be synced with
   // ScriptStencil by copyUpdated* methods.
@@ -450,12 +456,6 @@
 
   void setEnclosingScopeForInnerLazyFunction(ScopeIndex scopeIndex);
 
-  bool isStandalone() const { return isStandalone_; }
-  void setIsStandalone(bool isStandalone) {
-    MOZ_ASSERT(!isFunctionFieldCopiedToStencil);
-    isStandalone_ = isStandalone;
-  }
-
   bool wasEmitted() const { return wasEmitted_; }
   void setWasEmitted(bool wasEmitted) {
     wasEmitted_ = wasEmitted;
@@ -464,14 +464,6 @@
     }
   }
 
-  bool isSingleton() const { return isSingleton_; }
-  void setIsSingleton(bool isSingleton) {
-    isSingleton_ = isSingleton;
-    if (isFunctionFieldCopiedToStencil) {
-      copyUpdatedIsSingleton();
-    }
-  }
-
   MOZ_MUST_USE bool setAsmJSModule(const JS::WasmModule* module);
   bool isAsmJSModule() const { return flags_.isAsmJSNative(); }
 
@@ -494,7 +486,6 @@
   IMMUTABLE_FLAG_GETTER_SETTER(argumentsHasVarBinding, ArgumentsHasVarBinding)
   // AlwaysNeedsArgsObj: custom logic below.
   // HasMappedArgsObj: custom logic below.
-  // IsLikelyConstructorWrapper: custom logic below.
 
   bool needsCallObjectRegardlessOfBindings() const {
     // Always create a CallObject if:
@@ -510,10 +501,6 @@
     return funHasExtensibleScope();
   }
 
-  bool isLikelyConstructorWrapper() const {
-    return argumentsHasVarBinding() && usesApply && usesThis && !usesReturn;
-  }
-
   GeneratorKind generatorKind() const {
     return isGenerator() ? GeneratorKind::Generator
                          : GeneratorKind::NotGenerator;
@@ -606,13 +593,6 @@
     setFlag(ImmutableFlags::IsFieldInitializer);
   }
 
-  void setTreatAsRunOnce(bool treatAsRunOnce) {
-    immutableFlags_.setFlag(ImmutableFlags::TreatAsRunOnce, treatAsRunOnce);
-    if (isScriptFieldCopiedToStencil) {
-      copyUpdatedImmutableFlags();
-    }
-  }
-
   bool hasSimpleParameterList() const {
     return !hasRest() && !hasParameterExprs && !hasDestructuringArgs;
   }
@@ -621,15 +601,6 @@
     return !strict() && hasSimpleParameterList();
   }
 
-  bool shouldSuppressRunOnce() const {
-    // These heuristics suppress the run-once optimization if we expect that
-    // script-cloning will have more impact than TI type-precision would gain.
-    //
-    // See also: Bug 864218
-    return explicitName() || argumentsHasVarBinding() || isGenerator() ||
-           isAsync();
-  }
-
   // Return whether this or an enclosing function is being parsed and
   // validated as asm.js. Note: if asm.js validation fails, this will be false
   // while the function is being reparsed. This flag can be used to disable
@@ -695,8 +666,6 @@
   void copyScriptFields(ScriptStencil& script);
   void copyFunctionFields(ScriptStencil& script);
 
-  // * setTreatAsRunOnce can be called to a lazy function, while emitting
-  //   enclosing script
   // * setCtorFunctionHasThisBinding can be called to a class constructor
   //   with a lazy function, while parsing enclosing class
   void copyUpdatedImmutableFlags();
@@ -722,10 +691,6 @@
   // * setWasEmitted can be called to a lazy function, while emitting
   //   enclosing script
   void copyUpdatedWasEmitted();
-
-  // * setIsSingleton can be called to a lazy function, while emitting
-  //   enclosing script
-  void copyUpdatedIsSingleton();
 };
 
 #undef FLAG_GETTER_SETTER
@@ -736,6 +701,11 @@
   return static_cast<FunctionBox*>(this);
 }
 
+inline SuspendableContext* SharedContext::asSuspendableContext() {
+  MOZ_ASSERT(isSuspendableContext());
+  return static_cast<SuspendableContext*>(this);
+}
+
 }  // namespace frontend
 }  // namespace js
 
diff -Nru firefox-84.0.2+build1/js/src/frontend/smoosh/Cargo.toml firefox-85.0+build1/js/src/frontend/smoosh/Cargo.toml
--- firefox-84.0.2+build1/js/src/frontend/smoosh/Cargo.toml	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/smoosh/Cargo.toml	2021-01-18 19:58:12.000000000 +0000
@@ -10,14 +10,14 @@
 log = "0.4"
 # Setup RUST_LOG logging.
 # Disable regex feature for code size.
-env_logger = {version = "0.6", default-features = false}
+env_logger = {version = "0.8", default-features = false}
 # For non-jsparagus developers.
-jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "1dc60327164a3f64f87180147b1f3a2a9cc74276" }
+jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24" }
 # For local development, replace above with
 # jsparagus = { path = "{path to jsparagus}" }
 
 [build-dependencies]
 # For non-jsparagus developers.
-jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "1dc60327164a3f64f87180147b1f3a2a9cc74276" }
+jsparagus = { git = "https://github.com/mozilla-spidermonkey/jsparagus", rev = "d910c7a0f2f836cc70ed14bb92b8d0437b4e4a24" }
 # For local development, replace above with
 # jsparagus = { path = "{path to jsparagus}" }
diff -Nru firefox-84.0.2+build1/js/src/frontend/smoosh/src/lib.rs firefox-85.0+build1/js/src/frontend/smoosh/src/lib.rs
--- firefox-84.0.2+build1/js/src/frontend/smoosh/src/lib.rs	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/smoosh/src/lib.rs	2021-01-18 19:58:12.000000000 +0000
@@ -294,7 +294,6 @@
     pub body_scope_index: u32,
     pub num_ic_entries: u32,
     pub fun_length: u16,
-    pub num_bytecode_type_sets: u32,
     pub bytecode: CVec<u8>,
     pub scope_notes: CVec<SmooshScopeNote>,
 }
@@ -472,7 +471,6 @@
     let body_scope_index = script_data.body_scope_index;
     let num_ic_entries = script_data.num_ic_entries;
     let fun_length = script_data.fun_length;
-    let num_bytecode_type_sets = script_data.num_bytecode_type_sets;
 
     let bytecode = CVec::from(script_data.bytecode);
 
@@ -491,7 +489,6 @@
         body_scope_index,
         num_ic_entries,
         fun_length,
-        num_bytecode_type_sets,
         bytecode,
         scope_notes,
     }
diff -Nru firefox-84.0.2+build1/js/src/frontend/Stencil.cpp firefox-85.0+build1/js/src/frontend/Stencil.cpp
--- firefox-84.0.2+build1/js/src/frontend/Stencil.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/Stencil.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -8,6 +8,8 @@
 
 #include "mozilla/RefPtr.h"  // RefPtr
 
+#include <memory>  // std::uninitialized_fill
+
 #include "frontend/AbstractScopePtr.h"  // ScopeIndex
 #include "frontend/BytecodeSection.h"   // EmitScriptThingsVector
 #include "frontend/CompilationInfo.h"  // CompilationInfo, CompilationInfoVector, CompilationGCOutput
@@ -147,7 +149,8 @@
   MOZ_CRASH("Not an enclosing intra-frame scope");
 }
 
-static bool CreateLazyScript(JSContext* cx, CompilationInfo& compilationInfo,
+static bool CreateLazyScript(JSContext* cx, CompilationInput& input,
+                             CompilationStencil& stencil,
                              CompilationGCOutput& gcOutput,
                              const ScriptStencil& script,
                              HandleFunction function) {
@@ -161,7 +164,7 @@
     return false;
   }
 
-  if (!EmitScriptThingsVector(cx, compilationInfo, gcOutput, script.gcThings,
+  if (!EmitScriptThingsVector(cx, input, stencil, gcOutput, script.gcThings,
                               lazy->gcthingsForInit())) {
     return false;
   }
@@ -171,8 +174,8 @@
   return true;
 }
 
-static JSFunction* CreateFunction(JSContext* cx,
-                                  CompilationInfo& compilationInfo,
+static JSFunction* CreateFunction(JSContext* cx, CompilationInput& input,
+                                  CompilationStencil& stencil,
                                   const ScriptStencil& script,
                                   FunctionIndex functionIndex) {
   GeneratorKind generatorKind =
@@ -200,8 +203,7 @@
 
   RootedAtom displayAtom(cx);
   if (script.functionAtom) {
-    displayAtom.set(compilationInfo.input.atomCache.getExistingAtomAt(
-        cx, script.functionAtom));
+    displayAtom.set(input.atomCache.getExistingAtomAt(cx, script.functionAtom));
     MOZ_ASSERT(displayAtom);
   }
   RootedFunction fun(
@@ -214,7 +216,7 @@
 
   if (isAsmJS) {
     RefPtr<const JS::WasmModule> asmJS =
-        compilationInfo.stencil.asmJS.lookup(functionIndex)->value();
+        stencil.asmJS.lookup(functionIndex)->value();
 
     JSObject* moduleObj = asmJS->createObjectForAsmJS(cx);
     if (!moduleObj) {
@@ -228,18 +230,17 @@
   return fun;
 }
 
-static bool InstantiateAtoms(JSContext* cx, CompilationInfo& compilationInfo) {
-  return InstantiateMarkedAtoms(cx, compilationInfo.stencil.parserAtomData,
-                                compilationInfo.input.atomCache);
+static bool InstantiateAtoms(JSContext* cx, CompilationInput& input,
+                             CompilationStencil& stencil) {
+  return InstantiateMarkedAtoms(cx, stencil.parserAtomData, input.atomCache);
 }
 
 static bool InstantiateScriptSourceObject(JSContext* cx,
-                                          CompilationInfo& compilationInfo,
+                                          CompilationInput& input,
                                           CompilationGCOutput& gcOutput) {
-  MOZ_ASSERT(compilationInfo.input.source());
+  MOZ_ASSERT(input.source());
 
-  gcOutput.sourceObject =
-      ScriptSourceObject::create(cx, compilationInfo.input.source());
+  gcOutput.sourceObject = ScriptSourceObject::create(cx, input.source());
   if (!gcOutput.sourceObject) {
     return false;
   }
@@ -255,8 +256,7 @@
   // until after we've merged compartments.
   if (!cx->isHelperThreadContext()) {
     Rooted<ScriptSourceObject*> sourceObject(cx, gcOutput.sourceObject);
-    if (!ScriptSourceObject::initFromOptions(cx, sourceObject,
-                                             compilationInfo.input.options)) {
+    if (!ScriptSourceObject::initFromOptions(cx, sourceObject, input.options)) {
       return false;
     }
   }
@@ -265,19 +265,17 @@
 }
 
 // Instantiate ModuleObject if this is a module compile.
-static bool MaybeInstantiateModule(JSContext* cx,
-                                   CompilationInfo& compilationInfo,
+static bool MaybeInstantiateModule(JSContext* cx, CompilationInput& input,
+                                   CompilationStencil& stencil,
                                    CompilationGCOutput& gcOutput) {
-  if (compilationInfo.stencil.scriptData[CompilationInfo::TopLevelIndex]
-          .isModule()) {
+  if (stencil.scriptData[CompilationInfo::TopLevelIndex].isModule()) {
     gcOutput.module = ModuleObject::create(cx);
     if (!gcOutput.module) {
       return false;
     }
 
     Rooted<ModuleObject*> module(cx, gcOutput.module);
-    if (!compilationInfo.stencil.moduleMetadata.initModule(
-            cx, compilationInfo.input.atomCache, module)) {
+    if (!stencil.moduleMetadata->initModule(cx, input.atomCache, module)) {
       return false;
     }
   }
@@ -286,17 +284,17 @@
 }
 
 // Instantiate JSFunctions for each FunctionBox.
-static bool InstantiateFunctions(JSContext* cx,
-                                 CompilationInfo& compilationInfo,
+static bool InstantiateFunctions(JSContext* cx, CompilationInput& input,
+                                 CompilationStencil& stencil,
                                  CompilationGCOutput& gcOutput) {
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
+  for (auto item : CompilationInfo::functionScriptStencils(stencil, gcOutput)) {
     auto& scriptStencil = item.script;
     auto functionIndex = item.functionIndex;
 
     MOZ_ASSERT(!item.function);
 
     JSFunction* fun =
-        CreateFunction(cx, compilationInfo, scriptStencil, functionIndex);
+        CreateFunction(cx, input, stencil, scriptStencil, functionIndex);
     if (!fun) {
       return false;
     }
@@ -311,7 +309,8 @@
 // This should be called after InstantiateFunctions, given FunctionScope needs
 // associated JSFunction pointer, and also should be called before
 // InstantiateScriptStencils, given JSScript needs Scope pointer in gc things.
-static bool InstantiateScopes(JSContext* cx, CompilationInfo& compilationInfo,
+static bool InstantiateScopes(JSContext* cx, CompilationInput& input,
+                              CompilationStencil& stencil,
                               CompilationGCOutput& gcOutput) {
   // While allocating Scope object from ScopeStencil, Scope object for the
   // enclosing Scope should already be allocated.
@@ -325,8 +324,8 @@
   //
   // If the enclosing scope is Scope*, it's CompilationInput.enclosingScope.
 
-  for (const ScopeStencil& scd : compilationInfo.stencil.scopeData) {
-    Scope* scope = scd.createScope(cx, compilationInfo.input, gcOutput);
+  for (const ScopeStencil& scd : stencil.scopeData) {
+    Scope* scope = scd.createScope(cx, input, gcOutput);
     if (!scope) {
       return false;
     }
@@ -336,70 +335,16 @@
   return true;
 }
 
-// JSFunctions have a default ObjectGroup when they are created. Once their
-// enclosing script is compiled, we have more precise heuristic information and
-// now compute their final group. These functions have not been exposed to
-// script before this point.
-//
-// As well, anonymous functions may have either an "inferred" or a "guessed"
-// name assigned to them. This name isn't known until the enclosing function is
-// compiled so we must update it here.
-static bool SetTypeAndNameForExposedFunctions(JSContext* cx,
-                                              CompilationInfo& compilationInfo,
-                                              CompilationGCOutput& gcOutput) {
-  Rooted<JSFunction*> fun(cx);
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
-    auto& scriptStencil = item.script;
-    fun = item.function;
-    if (!scriptStencil.functionFlags.hasBaseScript()) {
-      continue;
-    }
-
-    // If the function was not referenced by enclosing script's bytecode, we do
-    // not generate a BaseScript for it. For example, `(function(){});`.
-    if (!scriptStencil.wasFunctionEmitted &&
-        !scriptStencil.isStandaloneFunction) {
-      continue;
-    }
-
-    if (!JSFunction::setTypeForScriptedFunction(
-            cx, fun, scriptStencil.isSingletonFunction)) {
-      return false;
-    }
-
-    // Inferred and Guessed names are computed by BytecodeEmitter and so may
-    // need to be applied to existing JSFunctions during delazification.
-    if (fun->displayAtom() == nullptr) {
-      JSAtom* funcAtom = nullptr;
-      if (scriptStencil.functionFlags.hasInferredName() ||
-          scriptStencil.functionFlags.hasGuessedAtom()) {
-        funcAtom = compilationInfo.input.atomCache.getExistingAtomAt(
-            cx, scriptStencil.functionAtom);
-        MOZ_ASSERT(funcAtom);
-      }
-      if (scriptStencil.functionFlags.hasInferredName()) {
-        fun->setInferredName(funcAtom);
-      }
-
-      if (scriptStencil.functionFlags.hasGuessedAtom()) {
-        fun->setGuessedAtom(funcAtom);
-      }
-    }
-  }
-
-  return true;
-}
-
 // Instantiate js::BaseScripts from ScriptStencils for inner functions of the
 // compilation. Note that standalone functions and functions being delazified
 // are handled below with other top-levels.
-static bool InstantiateScriptStencils(JSContext* cx,
-                                      CompilationInfo& compilationInfo,
+static bool InstantiateScriptStencils(JSContext* cx, CompilationInput& input,
+                                      CompilationStencil& stencil,
                                       CompilationGCOutput& gcOutput) {
-  MOZ_ASSERT(compilationInfo.input.lazy == nullptr);
+  MOZ_ASSERT(input.lazy == nullptr);
 
   Rooted<JSFunction*> fun(cx);
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
+  for (auto item : CompilationInfo::functionScriptStencils(stencil, gcOutput)) {
     auto& scriptStencil = item.script;
     fun = item.function;
     if (scriptStencil.sharedData) {
@@ -412,9 +357,9 @@
         continue;
       }
 
-      RootedScript script(cx,
-                          JSScript::fromStencil(cx, compilationInfo, gcOutput,
-                                                scriptStencil, fun));
+      RootedScript script(
+          cx, JSScript::fromStencil(cx, input, stencil, gcOutput, scriptStencil,
+                                    fun));
       if (!script) {
         return false;
       }
@@ -429,8 +374,7 @@
       MOZ_ASSERT(fun->isAsmJSNative());
     } else {
       MOZ_ASSERT(fun->isIncomplete());
-      if (!CreateLazyScript(cx, compilationInfo, gcOutput, scriptStencil,
-                            fun)) {
+      if (!CreateLazyScript(cx, input, stencil, gcOutput, scriptStencil, fun)) {
         return false;
       }
     }
@@ -441,10 +385,11 @@
 
 // Instantiate the Stencil for the top-level script of the compilation. This
 // includes standalone functions and functions being delazified.
-static bool InstantiateTopLevel(JSContext* cx, CompilationInfo& compilationInfo,
+static bool InstantiateTopLevel(JSContext* cx, CompilationInput& input,
+                                CompilationStencil& stencil,
                                 CompilationGCOutput& gcOutput) {
   const ScriptStencil& scriptStencil =
-      compilationInfo.stencil.scriptData[CompilationInfo::TopLevelIndex];
+      stencil.scriptData[CompilationInfo::TopLevelIndex];
   RootedFunction fun(cx);
   if (scriptStencil.isFunction()) {
     fun = gcOutput.functions[CompilationInfo::TopLevelIndex];
@@ -457,11 +402,11 @@
 
   MOZ_ASSERT(scriptStencil.sharedData);
 
-  if (compilationInfo.input.lazy) {
-    gcOutput.script = JSScript::CastFromLazy(compilationInfo.input.lazy);
+  if (input.lazy) {
+    gcOutput.script = JSScript::CastFromLazy(input.lazy);
 
     Rooted<JSScript*> script(cx, gcOutput.script);
-    if (!JSScript::fullyInitFromStencil(cx, compilationInfo, gcOutput, script,
+    if (!JSScript::fullyInitFromStencil(cx, input, stencil, gcOutput, script,
                                         scriptStencil, fun)) {
       return false;
     }
@@ -475,7 +420,7 @@
   }
 
   gcOutput.script =
-      JSScript::fromStencil(cx, compilationInfo, gcOutput, scriptStencil, fun);
+      JSScript::fromStencil(cx, input, stencil, gcOutput, scriptStencil, fun);
   if (!gcOutput.script) {
     return false;
   }
@@ -513,9 +458,10 @@
 // to update it with information determined by the BytecodeEmitter. This applies
 // to both initial and delazification parses. The functions being update may or
 // may not have bytecode at this point.
-static void UpdateEmittedInnerFunctions(CompilationInfo& compilationInfo,
+static void UpdateEmittedInnerFunctions(JSContext* cx, CompilationInput& input,
+                                        CompilationStencil& stencil,
                                         CompilationGCOutput& gcOutput) {
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
+  for (auto item : CompilationInfo::functionScriptStencils(stencil, gcOutput)) {
     auto& scriptStencil = item.script;
     auto& fun = item.function;
     if (!scriptStencil.wasFunctionEmitted) {
@@ -533,21 +479,37 @@
       ScopeIndex index = *scriptStencil.lazyFunctionEnclosingScopeIndex_;
       Scope* scope = gcOutput.scopes[index];
       script->setEnclosingScope(scope);
-      script->initTreatAsRunOnce(scriptStencil.immutableFlags.hasFlag(
-          ImmutableScriptFlagsEnum::TreatAsRunOnce));
 
       if (scriptStencil.memberInitializers) {
         script->setMemberInitializers(*scriptStencil.memberInitializers);
       }
+
+      // Inferred and Guessed names are computed by BytecodeEmitter and so may
+      // need to be applied to existing JSFunctions during delazification.
+      if (fun->displayAtom() == nullptr) {
+        JSAtom* funcAtom = nullptr;
+        if (scriptStencil.functionFlags.hasInferredName() ||
+            scriptStencil.functionFlags.hasGuessedAtom()) {
+          funcAtom =
+              input.atomCache.getExistingAtomAt(cx, scriptStencil.functionAtom);
+          MOZ_ASSERT(funcAtom);
+        }
+        if (scriptStencil.functionFlags.hasInferredName()) {
+          fun->setInferredName(funcAtom);
+        }
+        if (scriptStencil.functionFlags.hasGuessedAtom()) {
+          fun->setGuessedAtom(funcAtom);
+        }
+      }
     }
   }
 }
 
 // During initial parse we must link lazy-functions-inside-lazy-functions to
 // their enclosing script.
-static void LinkEnclosingLazyScript(CompilationInfo& compilationInfo,
+static void LinkEnclosingLazyScript(CompilationStencil& stencil,
                                     CompilationGCOutput& gcOutput) {
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
+  for (auto item : CompilationInfo::functionScriptStencils(stencil, gcOutput)) {
     auto& scriptStencil = item.script;
     auto& fun = item.function;
     if (!scriptStencil.functionFlags.hasBaseScript()) {
@@ -573,21 +535,15 @@
 #ifdef DEBUG
 // Some fields aren't used in delazification, given the target functions and
 // scripts are already instantiated, but they still should match.
-static void AssertDelazificationFieldsMatch(CompilationInfo& compilationInfo,
+static void AssertDelazificationFieldsMatch(CompilationStencil& stencil,
                                             CompilationGCOutput& gcOutput) {
-  for (auto item : compilationInfo.functionScriptStencils(gcOutput)) {
+  for (auto item : CompilationInfo::functionScriptStencils(stencil, gcOutput)) {
     auto& scriptStencil = item.script;
     auto& fun = item.function;
 
     BaseScript* script = fun->baseScript();
 
-    // TreatAsRunOnce is updated by UpdateEmittedInnerFunctions.
-    uint32_t acceptableDifferenceForScript =
-        uint32_t(ImmutableScriptFlagsEnum::TreatAsRunOnce);
-    MOZ_ASSERT(
-        (uint32_t(script->immutableFlags()) | acceptableDifferenceForScript) ==
-        (uint32_t(scriptStencil.immutableFlags) |
-         acceptableDifferenceForScript));
+    MOZ_ASSERT(script->immutableFlags() == scriptStencil.immutableFlags);
 
     MOZ_ASSERT(script->extent().sourceStart ==
                scriptStencil.extent.sourceStart);
@@ -599,7 +555,7 @@
     MOZ_ASSERT(script->extent().lineno == scriptStencil.extent.lineno);
     MOZ_ASSERT(script->extent().column == scriptStencil.extent.column);
 
-    // Names are updated by SetTypeAndNameForExposedFunctions.
+    // Names are updated by UpdateInnerFunctions.
     constexpr uint16_t HAS_INFERRED_NAME =
         uint16_t(FunctionFlags::Flags::HAS_INFERRED_NAME);
     constexpr uint16_t HAS_GUESSED_ATOM =
@@ -628,14 +584,14 @@
 // When delazifying, use the existing JSFunctions. The initial and delazifying
 // parse are required to generate the same sequence of functions for lazy
 // parsing to work at all.
-static void FunctionsFromExistingLazy(CompilationInfo& compilationInfo,
+static void FunctionsFromExistingLazy(CompilationInput& input,
                                       CompilationGCOutput& gcOutput) {
-  MOZ_ASSERT(compilationInfo.input.lazy);
+  MOZ_ASSERT(input.lazy);
 
   size_t idx = 0;
-  gcOutput.functions[idx++] = compilationInfo.input.lazy->function();
+  gcOutput.functions[idx++] = input.lazy->function();
 
-  for (JS::GCCellPtr elem : compilationInfo.input.lazy->gcthings()) {
+  for (JS::GCCellPtr elem : input.lazy->gcthings()) {
     if (!elem.is<JSObject>()) {
       continue;
     }
@@ -645,35 +601,40 @@
   MOZ_ASSERT(idx == gcOutput.functions.length());
 }
 
+/* static */
 bool CompilationInfo::instantiateStencils(JSContext* cx,
+                                          CompilationInfo& compilationInfo,
                                           CompilationGCOutput& gcOutput) {
-  if (!preparationIsPerformed) {
-    if (!prepareForInstantiate(cx, gcOutput)) {
+  if (!compilationInfo.preparationIsPerformed) {
+    if (!prepareForInstantiate(cx, compilationInfo, gcOutput)) {
       return false;
     }
   }
 
-  return instantiateStencilsAfterPreparation(cx, gcOutput);
+  return instantiateStencilsAfterPreparation(cx, compilationInfo.input,
+                                             compilationInfo.stencil, gcOutput);
 }
 
+/* static */
 bool CompilationInfo::instantiateStencilsAfterPreparation(
-    JSContext* cx, CompilationGCOutput& gcOutput) {
+    JSContext* cx, CompilationInput& input, CompilationStencil& stencil,
+    CompilationGCOutput& gcOutput) {
   if (!gcOutput.functions.resize(stencil.scriptData.length())) {
     ReportOutOfMemory(cx);
     return false;
   }
 
-  if (!InstantiateAtoms(cx, *this)) {
+  if (!InstantiateAtoms(cx, input, stencil)) {
     return false;
   }
 
   if (input.lazy) {
     MOZ_ASSERT(!stencil.scriptData[CompilationInfo::TopLevelIndex].isModule());
 
-    FunctionsFromExistingLazy(*this, gcOutput);
+    FunctionsFromExistingLazy(input, gcOutput);
 
 #ifdef DEBUG
-    AssertDelazificationFieldsMatch(*this, gcOutput);
+    AssertDelazificationFieldsMatch(stencil, gcOutput);
 #endif
   } else {
     if (stencil.scriptData[CompilationInfo::TopLevelIndex].isModule()) {
@@ -683,43 +644,39 @@
                  ModuleScope::EnclosingEnvironmentChainLength);
     }
 
-    if (!InstantiateScriptSourceObject(cx, *this, gcOutput)) {
+    if (!InstantiateScriptSourceObject(cx, input, gcOutput)) {
       return false;
     }
 
-    if (!MaybeInstantiateModule(cx, *this, gcOutput)) {
+    if (!MaybeInstantiateModule(cx, input, stencil, gcOutput)) {
       return false;
     }
 
-    if (!InstantiateFunctions(cx, *this, gcOutput)) {
+    if (!InstantiateFunctions(cx, input, stencil, gcOutput)) {
       return false;
     }
   }
 
-  if (!InstantiateScopes(cx, *this, gcOutput)) {
-    return false;
-  }
-
-  if (!SetTypeAndNameForExposedFunctions(cx, *this, gcOutput)) {
+  if (!InstantiateScopes(cx, input, stencil, gcOutput)) {
     return false;
   }
 
   if (!input.lazy) {
-    if (!InstantiateScriptStencils(cx, *this, gcOutput)) {
+    if (!InstantiateScriptStencils(cx, input, stencil, gcOutput)) {
       return false;
     }
   }
 
-  if (!InstantiateTopLevel(cx, *this, gcOutput)) {
+  if (!InstantiateTopLevel(cx, input, stencil, gcOutput)) {
     return false;
   }
 
   // Must be infallible from here forward.
 
-  UpdateEmittedInnerFunctions(*this, gcOutput);
+  UpdateEmittedInnerFunctions(cx, input, stencil, gcOutput);
 
   if (!input.lazy) {
-    LinkEnclosingLazyScript(*this, gcOutput);
+    LinkEnclosingLazyScript(stencil, gcOutput);
   }
 
   return true;
@@ -746,7 +703,7 @@
 
   for (size_t i = 0; i < delazifications.length(); i++) {
     const auto& delazification = delazifications[i];
-    auto key = toFunctionKey(delazification.stencil.scriptData[0].extent);
+    auto key = toFunctionKey(delazification.scriptData[0].extent);
     keyToIndex.putNewInfallible(key, i);
   }
 
@@ -764,18 +721,22 @@
   return true;
 }
 
-bool CompilationInfoVector::instantiateStencils(JSContext* cx,
-                                                CompilationGCOutput& gcOutput) {
-  if (!prepareForInstantiate(cx, gcOutput)) {
+bool CompilationInfoVector::instantiateStencils(
+    JSContext* cx, CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification) {
+  if (!prepareForInstantiate(cx, gcOutput, gcOutputForDelazification)) {
     return false;
   }
 
-  return instantiateStencilsAfterPreparation(cx, gcOutput);
+  return instantiateStencilsAfterPreparation(cx, gcOutput,
+                                             gcOutputForDelazification);
 }
 
 bool CompilationInfoVector::instantiateStencilsAfterPreparation(
-    JSContext* cx, CompilationGCOutput& gcOutput) {
-  if (!initial.instantiateStencilsAfterPreparation(cx, gcOutput)) {
+    JSContext* cx, CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification) {
+  if (!CompilationInfo::instantiateStencilsAfterPreparation(
+          cx, initial.input, initial.stencil, gcOutput)) {
     return false;
   }
 
@@ -789,36 +750,43 @@
     BaseScript* lazy = fun->baseScript();
     MOZ_ASSERT(!lazy->hasBytecode());
 
-    // CompilationInfo.input for delazification isn't initialized when
-    // decoding.
-    delazification.input.initFromLazy(lazy);
-
-    Rooted<CompilationGCOutput> gcOutputForDelazification(cx);
-    if (!delazification.prepareGCOutputForInstantiate(
-            cx, gcOutputForDelazification.get())) {
+    Rooted<CompilationInput> input(cx, CompilationInput(initial.input.options));
+    input.get().initFromLazy(lazy);
+
+    input.get().atomCache.stealBuffer(delazificationAtomCache);
+
+    if (!CompilationInfo::prepareGCOutputForInstantiate(
+            cx, delazification, gcOutputForDelazification)) {
       return false;
     }
-    if (!delazification.instantiateStencilsAfterPreparation(
-            cx, gcOutputForDelazification.get())) {
+    if (!CompilationInfo::instantiateStencilsAfterPreparation(
+            cx, input.get(), delazification, gcOutputForDelazification)) {
       return false;
     }
+
+    // Destroy elements, without unreserving.
+    gcOutputForDelazification.functions.clear();
+    gcOutputForDelazification.scopes.clear();
+
+    input.get().atomCache.returnBuffer(delazificationAtomCache);
   }
 
   return true;
 }
 
-bool CompilationInfo::prepareInputAndStencilForInstantiate(JSContext* cx) {
+/* static */
+bool CompilationInfo::prepareInputAndStencilForInstantiate(
+    JSContext* cx, CompilationInput& input, CompilationStencil& stencil) {
   if (!input.atomCache.allocate(cx, stencil.parserAtomData.length())) {
     return false;
   }
 
-  preparationIsPerformed = true;
-
   return true;
 }
 
+/* static */
 bool CompilationInfo::prepareGCOutputForInstantiate(
-    JSContext* cx, CompilationGCOutput& gcOutput) {
+    JSContext* cx, CompilationStencil& stencil, CompilationGCOutput& gcOutput) {
   if (!gcOutput.functions.reserve(stencil.scriptData.length())) {
     ReportOutOfMemory(cx);
     return false;
@@ -831,29 +799,59 @@
   return true;
 }
 
+/* static */
 bool CompilationInfo::prepareForInstantiate(JSContext* cx,
+                                            CompilationInfo& compilationInfo,
                                             CompilationGCOutput& gcOutput) {
-  if (!prepareInputAndStencilForInstantiate(cx)) {
+  auto& input = compilationInfo.input;
+  auto& stencil = compilationInfo.stencil;
+
+  if (!prepareInputAndStencilForInstantiate(cx, input, stencil)) {
     return false;
   }
-  if (!prepareGCOutputForInstantiate(cx, gcOutput)) {
+  if (!prepareGCOutputForInstantiate(cx, stencil, gcOutput)) {
     return false;
   }
+
+  compilationInfo.preparationIsPerformed = true;
   return true;
 }
 
 bool CompilationInfoVector::prepareForInstantiate(
-    JSContext* cx, CompilationGCOutput& gcOutput) {
-  if (!initial.prepareForInstantiate(cx, gcOutput)) {
+    JSContext* cx, CompilationGCOutput& gcOutput,
+    CompilationGCOutput& gcOutputForDelazification) {
+  if (!CompilationInfo::prepareForInstantiate(cx, initial, gcOutput)) {
     return false;
   }
 
+  size_t maxScriptDataLength = 0;
+  size_t maxScopeDataLength = 0;
+  size_t maxParserAtomDataLength = 0;
   for (auto& delazification : delazifications) {
-    if (!delazification.prepareInputAndStencilForInstantiate(cx)) {
-      return false;
+    if (maxParserAtomDataLength < delazification.parserAtomData.length()) {
+      maxParserAtomDataLength = delazification.parserAtomData.length();
+    }
+    if (maxScriptDataLength < delazification.scriptData.length()) {
+      maxScriptDataLength = delazification.scriptData.length();
+    }
+    if (maxScopeDataLength < delazification.scopeData.length()) {
+      maxScopeDataLength = delazification.scopeData.length();
     }
   }
 
+  if (!delazificationAtomCache.resize(maxParserAtomDataLength)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+  if (!gcOutput.functions.reserve(maxScriptDataLength)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+  if (!gcOutput.scopes.reserve(maxScopeDataLength)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+
   if (!buildDelazificationIndices(cx)) {
     return false;
   }
@@ -921,14 +919,15 @@
 CompilationState::CompilationState(JSContext* cx,
                                    LifoAllocScope& frontendAllocScope,
                                    const JS::ReadOnlyCompileOptions& options,
-                                   CompilationStencil& stencil,
+                                   CompilationInfo& compilationInfo,
                                    Scope* enclosingScope /* = nullptr */,
                                    JSObject* enclosingEnv /* = nullptr */)
     : directives(options.forceStrictMode()),
       scopeContext(cx, enclosingScope, enclosingEnv),
       usedNames(cx),
       allocScope(frontendAllocScope),
-      parserAtoms(cx->runtime(), stencil.alloc, stencil.parserAtomData) {}
+      parserAtoms(cx->runtime(), compilationInfo.alloc,
+                  compilationInfo.stencil.parserAtomData) {}
 
 #if defined(DEBUG) || defined(JS_JITSPEW)
 
@@ -999,6 +998,7 @@
     GenericPrinter& out = json.beginStringProperty("atom");
     WellKnownParserAtoms::getStatic2(index)->dumpCharsNoQuote(out);
     json.endString();
+    return;
   }
 
   MOZ_ASSERT(taggedIndex.isNull());
@@ -1306,6 +1306,8 @@
     json.value("FunctionIndex(%zu)", size_t(index));
   }
   json.endList();
+
+  json.boolProperty("isAsync", isAsync);
 }
 
 static void DumpImmutableScriptFlags(js::JSONPrinter& json,
@@ -1397,9 +1399,6 @@
         case ImmutableScriptFlagsEnum::HasMappedArgsObj:
           json.value("HasMappedArgsObj");
           break;
-        case ImmutableScriptFlagsEnum::IsLikelyConstructorWrapper:
-          json.value("IsLikelyConstructorWrapper");
-          break;
         default:
           json.value("Unknown(%x)", i);
           break;
@@ -1481,9 +1480,6 @@
         case FunctionFlags::Flags::RESOLVED_LENGTH:
           json.value("RESOLVED_LENGTH");
           break;
-        case FunctionFlags::Flags::NEW_SCRIPT_CLEARED:
-          json.value("NEW_SCRIPT_CLEARED");
-          break;
         default:
           json.value("Unknown(%x)", i);
           break;
@@ -1594,9 +1590,8 @@
       json.property("lazyFunctionEnclosingScopeIndex", "Nothing");
     }
 
-    json.boolProperty("isStandaloneFunction", isStandaloneFunction);
     json.boolProperty("wasFunctionEmitted", wasFunctionEmitted);
-    json.boolProperty("isSingletonFunction", isSingletonFunction);
+    json.boolProperty("allowRelazify", allowRelazify);
   }
 }
 
@@ -1644,7 +1639,7 @@
 
   if (scriptData[CompilationInfo::TopLevelIndex].isModule()) {
     json.beginObjectProperty("moduleMetadata");
-    moduleMetadata.dumpFields(json, this);
+    moduleMetadata->dumpFields(json, this);
     json.endObject();
   }
 
@@ -1738,6 +1733,16 @@
   return true;
 }
 
+void CompilationAtomCache::stealBuffer(AtomCacheVector& atoms) {
+  atoms_ = std::move(atoms);
+  // Destroy elements, without unreserving.
+  atoms_.clear();
+}
+
+void CompilationAtomCache::returnBuffer(AtomCacheVector& atoms) {
+  atoms = std::move(atoms_);
+}
+
 const ParserAtom* CompilationStencil::getParserAtomAt(
     JSContext* cx, TaggedParserAtomIndex taggedIndex) const {
   if (taggedIndex.isParserAtomIndex()) {
diff -Nru firefox-84.0.2+build1/js/src/frontend/Stencil.h firefox-85.0+build1/js/src/frontend/Stencil.h
--- firefox-84.0.2+build1/js/src/frontend/Stencil.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/Stencil.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,18 +8,21 @@
 #define frontend_Stencil_h
 
 #include "mozilla/Assertions.h"  // MOZ_ASSERT
+#include "mozilla/Attributes.h"  // MOZ_MUST_USE
 #include "mozilla/Maybe.h"       // mozilla::{Maybe, Nothing}
 #include "mozilla/Range.h"       // mozilla::Range
 #include "mozilla/Span.h"        // mozilla::Span
+#include "mozilla/Variant.h"     // mozilla::Variant
 
-#include <stdint.h>  // char16_t, uint8_t, uint32_t
-#include <stdlib.h>  // size_t
+#include <stddef.h>  // size_t
+#include <stdint.h>  // char16_t, uint8_t, uint16_t, uint32_t
 
 #include "frontend/AbstractScopePtr.h"    // AbstractScopePtr, ScopeIndex
 #include "frontend/FunctionSyntaxKind.h"  // FunctionSyntaxKind
 #include "frontend/ObjLiteral.h"          // ObjLiteralStencil
-#include "frontend/ParserAtom.h"          // TaggedParserAtomIndex
+#include "frontend/ParserAtom.h"          // ParserAtom, TaggedParserAtomIndex
 #include "frontend/TypedIndex.h"          // TypedIndex
+#include "js/AllocPolicy.h"               // SystemAllocPolicy
 #include "js/RegExpFlags.h"               // JS::RegExpFlags
 #include "js/RootingAPI.h"                // Handle
 #include "js/TypeDecls.h"                 // JSContext
@@ -30,15 +33,15 @@
 #include "vm/BigIntType.h"                // ParseBigIntLiteral
 #include "vm/FunctionFlags.h"             // FunctionFlags
 #include "vm/GeneratorAndAsyncKind.h"     // GeneratorKind, FunctionAsyncKind
-#include "vm/JSScript.h"                  // MemberInitializers
-#include "vm/Scope.h"  // BaseScopeData, FunctionScope, LexicalScope, VarScope, GlobalScope, EvalScope, ModuleScope
-#include "vm/ScopeKind.h"  // ScopeKind
-#include "vm/SharedStencil.h"  // ImmutableScriptFlags, GCThingIndex, js::SharedImmutableScriptData
-#include "vm/StencilEnums.h"  // ImmutableScriptFlagsEnum
+#include "vm/Scope.h"  // Scope, BaseScopeData, FunctionScope, LexicalScope, VarScope, GlobalScope, EvalScope, ModuleScope
+#include "vm/ScopeKind.h"      // ScopeKind
+#include "vm/SharedStencil.h"  // ImmutableScriptFlags, GCThingIndex, js::SharedImmutableScriptData, MemberInitializers, SourceExtent
+#include "vm/StencilEnums.h"   // ImmutableScriptFlagsEnum
 
 namespace js {
 
 class JSONPrinter;
+class RegExpObject;
 
 namespace frontend {
 
@@ -203,44 +206,44 @@
         isArrow_(isArrow),
         data_(data) {}
 
-  static bool createForFunctionScope(JSContext* cx, CompilationStencil& stencil,
-                                     ParserFunctionScopeData* dataArg,
-                                     bool hasParameterExprs,
-                                     bool needsEnvironment,
-                                     FunctionIndex functionIndex, bool isArrow,
-                                     mozilla::Maybe<ScopeIndex> enclosing,
-                                     ScopeIndex* index);
-
-  static bool createForLexicalScope(JSContext* cx, CompilationStencil& stencil,
-                                    ScopeKind kind,
-                                    ParserLexicalScopeData* dataArg,
-                                    uint32_t firstFrameSlot,
-                                    mozilla::Maybe<ScopeIndex> enclosing,
-                                    ScopeIndex* index);
+  static bool createForFunctionScope(
+      JSContext* cx, CompilationInfo& compilationInfo,
+      ParserFunctionScopeData* dataArg, bool hasParameterExprs,
+      bool needsEnvironment, FunctionIndex functionIndex, bool isArrow,
+      mozilla::Maybe<ScopeIndex> enclosing, ScopeIndex* index);
+
+  static bool createForLexicalScope(
+      JSContext* cx, CompilationInfo& compilationInfo, ScopeKind kind,
+      ParserLexicalScopeData* dataArg, uint32_t firstFrameSlot,
+      mozilla::Maybe<ScopeIndex> enclosing, ScopeIndex* index);
 
   static bool createForVarScope(JSContext* cx,
-                                frontend::CompilationStencil& stencil,
+                                frontend::CompilationInfo& compilationInfo,
                                 ScopeKind kind, ParserVarScopeData* dataArg,
                                 uint32_t firstFrameSlot, bool needsEnvironment,
                                 mozilla::Maybe<ScopeIndex> enclosing,
                                 ScopeIndex* index);
 
-  static bool createForGlobalScope(JSContext* cx, CompilationStencil& stencil,
+  static bool createForGlobalScope(JSContext* cx,
+                                   CompilationInfo& compilationInfo,
                                    ScopeKind kind,
                                    ParserGlobalScopeData* dataArg,
                                    ScopeIndex* index);
 
-  static bool createForEvalScope(JSContext* cx, CompilationStencil& stencil,
+  static bool createForEvalScope(JSContext* cx,
+                                 CompilationInfo& compilationInfo,
                                  ScopeKind kind, ParserEvalScopeData* dataArg,
                                  mozilla::Maybe<ScopeIndex> enclosing,
                                  ScopeIndex* index);
 
-  static bool createForModuleScope(JSContext* cx, CompilationStencil& stencil,
+  static bool createForModuleScope(JSContext* cx,
+                                   CompilationInfo& compilationInfo,
                                    ParserModuleScopeData* dataArg,
                                    mozilla::Maybe<ScopeIndex> enclosing,
                                    ScopeIndex* index);
 
-  static bool createForWithScope(JSContext* cx, CompilationStencil& stencil,
+  static bool createForWithScope(JSContext* cx,
+                                 CompilationInfo& compilationInfo,
                                  mozilla::Maybe<ScopeIndex> enclosing,
                                  ScopeIndex* index);
 
@@ -401,6 +404,8 @@
   EntryVector indirectExportEntries;
   EntryVector starExportEntries;
   FunctionDeclarationVector functionDecls;
+  // Set to true if the module has a top-level await keyword.
+  bool isAsync = false;
 
   StencilModuleMetadata() = default;
 
@@ -594,18 +599,10 @@
   // successfully.)
   mozilla::Maybe<ScopeIndex> lazyFunctionEnclosingScopeIndex_;
 
-  // This function is a standalone function that is not syntactically part of
-  // another script. Eg. Created by `new Function("")`.
-  bool isStandaloneFunction : 1;
-
   // This is set by the BytecodeEmitter of the enclosing script when a reference
   // to this function is generated.
   bool wasFunctionEmitted : 1;
 
-  // This function should be marked as a singleton. It is expected to be defined
-  // at most once. This is a heuristic only and does not affect correctness.
-  bool isSingletonFunction : 1;
-
   // If this is for the root of delazification, this represents
   // MutableScriptFlagsEnum::AllowRelazify value of the script *after*
   // delazification.
@@ -614,11 +611,7 @@
 
   // End of fields.
 
-  ScriptStencil()
-      : isStandaloneFunction(false),
-        wasFunctionEmitted(false),
-        isSingletonFunction(false),
-        allowRelazify(false) {}
+  ScriptStencil() : wasFunctionEmitted(false), allowRelazify(false) {}
 
   bool isFunction() const {
     bool result = functionFlags.toRaw() != 0x0000;
diff -Nru firefox-84.0.2+build1/js/src/frontend/StencilXdr.cpp firefox-85.0+build1/js/src/frontend/StencilXdr.cpp
--- firefox-84.0.2+build1/js/src/frontend/StencilXdr.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/StencilXdr.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -6,8 +6,10 @@
 
 #include "frontend/StencilXdr.h"  // StencilXDR
 
-#include <memory>
-#include <type_traits>
+#include <stddef.h>     // size_t
+#include <stdint.h>     // uint8_t, uint16_t, uint32_t
+#include <type_traits>  // std::has_unique_object_representations
+#include <utility>      // std::forward
 
 #include "vm/JSScript.h"      // js::CheckCompileOptionsMatch
 #include "vm/StencilEnums.h"  // js::ImmutableScriptFlagsEnum
@@ -23,9 +25,7 @@
     HasSharedData,
     HasFunctionAtom,
     HasScopeIndex,
-    IsStandaloneFunction,
     WasFunctionEmitted,
-    IsSingletonFunction,
     AllowRelazify,
   };
 
@@ -71,15 +71,9 @@
     xdrFields.scopeIndex =
         stencil.lazyFunctionEnclosingScopeIndex_.valueOr(ScopeIndex());
 
-    if (stencil.isStandaloneFunction) {
-      xdrFlags |= 1 << uint8_t(XdrFlags::IsStandaloneFunction);
-    }
     if (stencil.wasFunctionEmitted) {
       xdrFlags |= 1 << uint8_t(XdrFlags::WasFunctionEmitted);
     }
-    if (stencil.isSingletonFunction) {
-      xdrFlags |= 1 << uint8_t(XdrFlags::IsSingletonFunction);
-    }
     if (stencil.allowRelazify) {
       xdrFlags |= 1 << uint8_t(XdrFlags::AllowRelazify);
     }
@@ -136,15 +130,9 @@
       stencil.lazyFunctionEnclosingScopeIndex_.emplace(xdrFields.scopeIndex);
     }
 
-    if (xdrFlags & (1 << uint8_t(XdrFlags::IsStandaloneFunction))) {
-      stencil.isStandaloneFunction = true;
-    }
     if (xdrFlags & (1 << uint8_t(XdrFlags::WasFunctionEmitted))) {
       stencil.wasFunctionEmitted = true;
     }
-    if (xdrFlags & (1 << uint8_t(XdrFlags::IsSingletonFunction))) {
-      stencil.isSingletonFunction = true;
-    }
     if (xdrFlags & (1 << uint8_t(XdrFlags::AllowRelazify))) {
       stencil.allowRelazify = true;
     }
@@ -496,33 +484,35 @@
   return Ok();
 }
 
-template <XDRMode mode>
-static XDRResult XDRObjLiteralWriter(XDRState<mode>* xdr,
-                                     ObjLiteralWriter& writer) {
-  uint8_t flags = 0;
-  uint32_t length = 0;
-
-  if (mode == XDR_ENCODE) {
-    flags = writer.getFlags().serialize();
-    length = writer.getCode().size();
-  }
+template <XDRMode mode, typename T>
+static XDRResult XDRSpanContent(XDRState<mode>* xdr, mozilla::Span<T>& span) {
+#ifdef __cpp_lib_has_unique_object_representations
+  static_assert(std::has_unique_object_representations<T>(),
+                "span item structure must be fully packed");
+#endif
 
-  MOZ_TRY(xdr->codeUint8(&flags));
-  MOZ_TRY(xdr->codeUint32(&length));
+  uint32_t size;
 
   if (mode == XDR_ENCODE) {
-    MOZ_TRY(xdr->codeBytes((void*)writer.getCode().data(), length));
-    return Ok();
+    MOZ_ASSERT(span.size() <= UINT32_MAX);
+    size = span.size();
   }
 
-  MOZ_ASSERT(mode == XDR_DECODE);
-  ObjLiteralWriter::CodeVector codeVec;
-  if (!codeVec.appendN(0, length)) {
-    return xdr->fail(JS::TranscodeResult_Throw);
+  MOZ_TRY(xdr->codeUint32(&size));
+
+  if (mode == XDR_DECODE) {
+    MOZ_ASSERT(span.empty());
+    if (size > 0) {
+      auto* p = xdr->stencilAlloc().template newArrayUninitialized<T>(size);
+      if (!p) {
+        js::ReportOutOfMemory(xdr->cx());
+        return xdr->fail(JS::TranscodeResult_Throw);
+      }
+      span = mozilla::Span(p, size);
+    }
   }
-  MOZ_TRY(xdr->codeBytes(codeVec.begin(), length));
 
-  writer.initializeForXDR(std::move(codeVec), flags);
+  MOZ_TRY(xdr->codeBytes(span.data(), sizeof(T) * size));
 
   return Ok();
 }
@@ -588,6 +578,19 @@
     }
   }
 
+  uint8_t isAsync = 0;
+  if (mode == XDR_ENCODE) {
+    if (stencil.isAsync) {
+      isAsync = stencil.isAsync ? 1 : 0;
+    }
+  }
+
+  MOZ_TRY(xdr->codeUint8(&isAsync));
+
+  if (mode == XDR_DECODE) {
+    stencil.isAsync = isAsync == 1;
+  }
+
   return Ok();
 }
 
@@ -722,13 +725,18 @@
 template <XDRMode mode>
 /* static */ XDRResult StencilXDR::ObjLiteral(XDRState<mode>* xdr,
                                               ObjLiteralStencil& stencil) {
-  MOZ_TRY(XDRObjLiteralWriter(xdr, stencil.writer_));
+  uint8_t flags = 0;
 
-  MOZ_TRY(XDRVector(xdr, stencil.atoms_));
-  for (auto& entry : stencil.atoms_) {
-    MOZ_TRY(XDRTaggedParserAtomIndex(xdr, &entry));
+  if (mode == XDR_ENCODE) {
+    flags = stencil.flags_.serialize();
+  }
+  MOZ_TRY(xdr->codeUint8(&flags));
+  if (mode == XDR_DECODE) {
+    stencil.flags_.deserialize(flags);
   }
 
+  MOZ_TRY(XDRSpanContent(xdr, stencil.code_));
+
   return Ok();
 }
 
@@ -884,7 +892,11 @@
   }
 
   if (stencil.scriptData[CompilationInfo::TopLevelIndex].isModule()) {
-    MOZ_TRY(XDRStencilModuleMetadata(xdr, stencil.moduleMetadata));
+    if (mode == XDR_DECODE) {
+      stencil.moduleMetadata.emplace();
+    }
+
+    MOZ_TRY(XDRStencilModuleMetadata(xdr, *stencil.moduleMetadata));
   }
 
   return Ok();
diff -Nru firefox-84.0.2+build1/js/src/frontend/TokenStream.cpp firefox-85.0+build1/js/src/frontend/TokenStream.cpp
--- firefox-84.0.2+build1/js/src/frontend/TokenStream.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/TokenStream.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -552,11 +552,10 @@
     : TokenStreamCharsShared(cx, pasrerAtoms),
       sourceUnits(units, length, startOffset) {}
 
-template <>
-MOZ_MUST_USE bool TokenStreamCharsBase<char16_t>::
-    fillCharBufferFromSourceNormalizingAsciiLineBreaks(const char16_t* cur,
-                                                       const char16_t* end) {
-  MOZ_ASSERT(this->charBuffer.length() == 0);
+bool FillCharBufferFromSourceNormalizingAsciiLineBreaks(CharBuffer& charBuffer,
+                                                        const char16_t* cur,
+                                                        const char16_t* end) {
+  MOZ_ASSERT(charBuffer.length() == 0);
 
   while (cur < end) {
     char16_t ch = *cur++;
@@ -567,7 +566,7 @@
       }
     }
 
-    if (!this->charBuffer.append(ch)) {
+    if (!charBuffer.append(ch)) {
       return false;
     }
   }
@@ -576,11 +575,10 @@
   return true;
 }
 
-template <>
-MOZ_MUST_USE bool TokenStreamCharsBase<Utf8Unit>::
-    fillCharBufferFromSourceNormalizingAsciiLineBreaks(const Utf8Unit* cur,
-                                                       const Utf8Unit* end) {
-  MOZ_ASSERT(this->charBuffer.length() == 0);
+bool FillCharBufferFromSourceNormalizingAsciiLineBreaks(CharBuffer& charBuffer,
+                                                        const Utf8Unit* cur,
+                                                        const Utf8Unit* end) {
+  MOZ_ASSERT(charBuffer.length() == 0);
 
   while (cur < end) {
     Utf8Unit unit = *cur++;
@@ -593,7 +591,7 @@
         }
       }
 
-      if (!this->charBuffer.append(ch)) {
+      if (!charBuffer.append(ch)) {
         return false;
       }
 
@@ -604,7 +602,7 @@
     MOZ_ASSERT(ch.isSome(),
                "provided source text should already have been validated");
 
-    if (!appendCodePointToCharBuffer(ch.value())) {
+    if (!AppendCodePointToCharBuffer(charBuffer, ch.value())) {
       return false;
     }
   }
@@ -1736,26 +1734,22 @@
     return true;
   }
 
-  // We might have hit an error while processing some source code feature
-  // that's accumulating text into |this->charBuffer| -- e.g. we could be
-  // halfway into a regular expression literal, then encounter invalid UTF-8.
-  // Thus we must clear |this->charBuffer| of prior work.
-  this->charBuffer.clear();
+  CharBuffer lineOfContext(cx);
 
   const Unit* encodedWindow = sourceUnits.codeUnitPtrAt(encodedWindowStart);
-  if (!fillCharBufferFromSourceNormalizingAsciiLineBreaks(
-          encodedWindow, encodedWindow + encodedWindowLength)) {
+  if (!FillCharBufferFromSourceNormalizingAsciiLineBreaks(
+          lineOfContext, encodedWindow, encodedWindow + encodedWindowLength)) {
     return false;
   }
 
-  size_t utf16WindowLength = this->charBuffer.length();
+  size_t utf16WindowLength = lineOfContext.length();
 
   // The windowed string is null-terminated.
-  if (!this->charBuffer.append('\0')) {
+  if (!lineOfContext.append('\0')) {
     return false;
   }
 
-  err->lineOfContext.reset(this->charBuffer.extractOrCopyRawBuffer());
+  err->lineOfContext.reset(lineOfContext.extractOrCopyRawBuffer());
   if (!err->lineOfContext) {
     return false;
   }
@@ -2080,7 +2074,7 @@
                "maintain line-info/flags for EOL");
     this->sourceUnits.consumeKnownCodePoint(peeked);
 
-    if (!appendCodePointToCharBuffer(peeked.codePoint())) {
+    if (!AppendCodePointToCharBuffer(this->charBuffer, peeked.codePoint())) {
       return false;
     }
   } while (true);
@@ -2167,8 +2161,11 @@
   return false;
 };
 
-MOZ_MUST_USE bool TokenStreamCharsShared::appendCodePointToCharBuffer(
-    uint32_t codePoint) {
+bool AppendCodePointToCharBuffer(CharBuffer& charBuffer, uint32_t codePoint) {
+  MOZ_ASSERT(codePoint <= unicode::NonBMPMax,
+             "should only be processing code points validly decoded from UTF-8 "
+             "or WTF-16 source text (surrogate code points permitted)");
+
   char16_t units[2];
   unsigned numUnits = 0;
   unicode::UTF16Encode(codePoint, units, &numUnits);
@@ -2231,7 +2228,7 @@
       }
     }
 
-    if (!appendCodePointToCharBuffer(codePoint)) {
+    if (!AppendCodePointToCharBuffer(this->charBuffer, codePoint)) {
       return false;
     }
   } while (true);
@@ -2617,7 +2614,7 @@
       return false;
     }
 
-    return this->appendCodePointToCharBuffer(codePoint);
+    return AppendCodePointToCharBuffer(this->charBuffer, codePoint);
   };
 
   auto ReportUnterminatedRegExp = [this](int32_t unit) {
@@ -2741,7 +2738,7 @@
     if (unit == '_') {
       continue;
     }
-    if (!this->appendCodePointToCharBuffer(unit)) {
+    if (!AppendCodePointToCharBuffer(this->charBuffer, unit)) {
       return false;
     }
   }
@@ -3438,7 +3435,7 @@
         MOZ_ASSERT(!IsLineTerminator(cp));
       }
 
-      if (!appendCodePointToCharBuffer(cp)) {
+      if (!AppendCodePointToCharBuffer(this->charBuffer, cp)) {
         return false;
       }
 
@@ -3468,7 +3465,8 @@
         // LineContinuation represents no code points, so don't append
         // in this case.
         if (codePoint != '\n') {
-          if (!appendCodePointToCharBuffer(AssertedCast<char32_t>(codePoint))) {
+          if (!AppendCodePointToCharBuffer(this->charBuffer,
+                                           AssertedCast<char32_t>(codePoint))) {
             return false;
           }
         }
@@ -3595,7 +3593,7 @@
             }
 
             MOZ_ASSERT(code <= unicode::NonBMPMax);
-            if (!appendCodePointToCharBuffer(code)) {
+            if (!AppendCodePointToCharBuffer(this->charBuffer, code)) {
               return false;
             }
 
@@ -3743,8 +3741,8 @@
   MOZ_ASSERT_IF(!parsingTemplate, !templateHead);
 
   TokenKind kind = !parsingTemplate ? TokenKind::String
-                                    : templateHead ? TokenKind::TemplateHead
-                                                   : TokenKind::NoSubsTemplate;
+                   : templateHead   ? TokenKind::TemplateHead
+                                    : TokenKind::NoSubsTemplate;
   newAtomToken(kind, atom, start, modifier, out);
   return true;
 }
diff -Nru firefox-84.0.2+build1/js/src/frontend/TokenStream.h firefox-85.0+build1/js/src/frontend/TokenStream.h
--- firefox-84.0.2+build1/js/src/frontend/TokenStream.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/frontend/TokenStream.h	2021-01-18 19:58:13.000000000 +0000
@@ -1026,9 +1026,10 @@
   static constexpr uint8_t maxUnitsLength = 4;
 
   static constexpr size_t lengthInUnits(char32_t codePoint) {
-    return codePoint < 0x80
-               ? 1
-               : codePoint < 0x800 ? 2 : codePoint < 0x10000 ? 3 : 4;
+    return codePoint < 0x80      ? 1
+           : codePoint < 0x800   ? 2
+           : codePoint < 0x10000 ? 3
+                                 : 4;
   }
 };
 
@@ -1502,12 +1503,44 @@
   MOZ_ASSERT(last == 0xA8 || last == 0xA9);
 }
 
-class TokenStreamCharsShared {
-  // Using char16_t (not Unit) is a simplifying decision that hopefully
-  // eliminates the need for a UTF-8 regular expression parser and makes
-  // |copyCharBufferTo| markedly simpler.
-  using CharBuffer = Vector<char16_t, 32>;
+/**
+ * An all-purpose buffer type for accumulating text during tokenizing.
+ *
+ * In principle we could make this buffer contain |char16_t|, |Utf8Unit|, or
+ * |Unit|.  We use |char16_t| because:
+ *
+ *   * we don't have a UTF-8 regular expression parser, so in general regular
+ *     expression text must be copied to a separate UTF-16 buffer to parse it,
+ *     and
+ *   * |TokenStreamCharsShared::copyCharBufferTo|, which copies a shared
+ *     |CharBuffer| to a |char16_t*|, is simpler if it doesn't have to convert.
+ */
+using CharBuffer = Vector<char16_t, 32>;
 
+/**
+ * Append the provided code point (in the range [U+0000, U+10FFFF], surrogate
+ * code points included) to the buffer.
+ */
+extern MOZ_MUST_USE bool AppendCodePointToCharBuffer(CharBuffer& charBuffer,
+                                                     uint32_t codePoint);
+
+/**
+ * Accumulate the range of UTF-16 text (lone surrogates permitted, because JS
+ * allows them in source text) into |charBuffer|.  Normalize '\r', '\n', and
+ * "\r\n" into '\n'.
+ */
+extern MOZ_MUST_USE bool FillCharBufferFromSourceNormalizingAsciiLineBreaks(
+    CharBuffer& charBuffer, const char16_t* cur, const char16_t* end);
+
+/**
+ * Accumulate the range of previously-validated UTF-8 text into |charBuffer|.
+ * Normalize '\r', '\n', and "\r\n" into '\n'.
+ */
+extern MOZ_MUST_USE bool FillCharBufferFromSourceNormalizingAsciiLineBreaks(
+    CharBuffer& charBuffer, const mozilla::Utf8Unit* cur,
+    const mozilla::Utf8Unit* end);
+
+class TokenStreamCharsShared {
  protected:
   JSContext* cx;
 
@@ -1525,8 +1558,6 @@
   explicit TokenStreamCharsShared(JSContext* cx, ParserAtomsTable* parserAtoms)
       : cx(cx), charBuffer(cx), parserAtoms(parserAtoms) {}
 
-  MOZ_MUST_USE bool appendCodePointToCharBuffer(uint32_t codePoint);
-
   MOZ_MUST_USE bool copyCharBufferTo(
       JSContext* cx, UniquePtr<char16_t[], JS::FreePolicy>* destination);
 
@@ -1542,14 +1573,14 @@
 
   const ParserAtom* drainCharBufferIntoAtom() {
     // Add to parser atoms table.
-    auto maybeId = this->parserAtoms->internChar16(cx, charBuffer.begin(),
-                                                   charBuffer.length());
-    if (maybeId.isErr()) {
+    const ParserAtom* atom = this->parserAtoms->internChar16(
+        cx, charBuffer.begin(), charBuffer.length());
+    if (!atom) {
       return nullptr;
     }
 
     charBuffer.clear();
-    return maybeId.unwrap();
+    return atom;
   }
 
  protected:
@@ -1655,14 +1686,6 @@
   inline void consumeKnownCodeUnit(T) = delete;
 
   /**
-   * Accumulate the provided range of already-validated text (valid UTF-8, or
-   * anything if Unit is char16_t because JS allows lone surrogates) into
-   * |charBuffer|.  Normalize '\r', '\n', and "\r\n" into '\n'.
-   */
-  MOZ_MUST_USE bool fillCharBufferFromSourceNormalizingAsciiLineBreaks(
-      const Unit* cur, const Unit* end);
-
-  /**
    * Add a null-terminated line of context to error information, for the line
    * in |sourceUnits| that contains |offset|.  Also record the window's
    * length and the offset of the error in the window.  (Don't bother adding
@@ -1700,16 +1723,14 @@
 MOZ_ALWAYS_INLINE const ParserAtom*
 TokenStreamCharsBase<char16_t>::atomizeSourceChars(
     mozilla::Span<const char16_t> units) {
-  return this->parserAtoms->internChar16(cx, units.data(), units.size())
-      .unwrapOr(nullptr);
+  return this->parserAtoms->internChar16(cx, units.data(), units.size());
 }
 
 template <>
 /* static */ MOZ_ALWAYS_INLINE const ParserAtom*
 TokenStreamCharsBase<mozilla::Utf8Unit>::atomizeSourceChars(
     mozilla::Span<const mozilla::Utf8Unit> units) {
-  return this->parserAtoms->internUtf8(cx, units.data(), units.size())
-      .unwrapOr(nullptr);
+  return this->parserAtoms->internUtf8(cx, units.data(), units.size());
 }
 
 template <typename Unit>
@@ -1918,7 +1939,6 @@
 
  protected:
   using CharsBase::addLineOfContext;
-  using CharsBase::fillCharBufferFromSourceNormalizingAsciiLineBreaks;
   using CharsBase::matchCodeUnit;
   using CharsBase::matchLineTerminator;
   using TokenStreamCharsShared::drainCharBufferIntoAtom;
@@ -2146,7 +2166,8 @@
     // Template literals normalize only '\r' and "\r\n" to '\n'; Unicode
     // separators don't need special handling.
     // https://tc39.github.io/ecma262/#sec-static-semantics-tv-and-trv
-    if (!fillCharBufferFromSourceNormalizingAsciiLineBreaks(cur, end)) {
+    if (!FillCharBufferFromSourceNormalizingAsciiLineBreaks(this->charBuffer,
+                                                            cur, end)) {
       return nullptr;
     }
 
@@ -2433,10 +2454,8 @@
  private:
   using CharsBase::atomizeSourceChars;
   using GeneralCharsBase::badToken;
-  using TokenStreamCharsShared::appendCodePointToCharBuffer;
   // Deliberately don't |using| |charBuffer| because of bug 1472569.  :-(
   using CharsBase::consumeKnownCodeUnit;
-  using CharsBase::fillCharBufferFromSourceNormalizingAsciiLineBreaks;
   using CharsBase::matchCodeUnit;
   using CharsBase::matchLineTerminator;
   using CharsBase::peekCodeUnit;
diff -Nru firefox-84.0.2+build1/js/src/fuzz-tests/tests.cpp firefox-85.0+build1/js/src/fuzz-tests/tests.cpp
--- firefox-84.0.2+build1/js/src/fuzz-tests/tests.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/fuzz-tests/tests.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -67,6 +67,10 @@
   }
 }
 
+#ifdef LIBFUZZER
+static void jsfuzz_atexit() { JS_ShutDown(); }
+#endif
+
 int main(int argc, char* argv[]) {
   if (!JS_Init()) {
     fprintf(stderr, "Error: Call to jsfuzz_init() failed\n");
@@ -78,6 +82,11 @@
     return 1;
   }
 
+#ifdef LIBFUZZER
+  // This is required because libFuzzer can exit() in various cases
+  std::atexit(jsfuzz_atexit);
+#endif
+
   const char* fuzzerEnv = getenv("FUZZER");
   if (!fuzzerEnv) {
     fprintf(stderr,
diff -Nru firefox-84.0.2+build1/js/src/fuzz-tests/testWasm.cpp firefox-85.0+build1/js/src/fuzz-tests/testWasm.cpp
--- firefox-84.0.2+build1/js/src/fuzz-tests/testWasm.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/fuzz-tests/testWasm.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -252,6 +252,9 @@
     size_t currentTableExportId = 0;
     size_t currentMemoryExportId = 0;
     size_t currentGlobalExportId = 0;
+#ifdef ENABLE_WASM_EXCEPTIONS
+    size_t currentEventExportId = 0;
+#endif
 
     for (const Import& import : importVec) {
       // First try to get the namespace object, create one if this is the
@@ -321,6 +324,17 @@
               return 0;
             }
             break;
+
+#ifdef ENABLE_WASM_EXCEPTIONS
+          case DefinitionKind::Event:
+            // TODO: Pass a dummy defaultValue
+            if (!assignImportKind<WasmExceptionObject>(
+                    import, obj, lastExportsObj, lastExportIds,
+                    &currentEventExportId, exportsLength, nullValue)) {
+              return 0;
+            }
+            break;
+#endif
         }
       }
     }
@@ -421,7 +435,7 @@
           Rooted<WasmGlobalObject*> global(gCx,
                                            &propObj->as<WasmGlobalObject>());
           if (global->type() != ValType::I64) {
-            global->value(gCx, &lastReturnVal);
+            global->val().get().toJSValue(gCx, &lastReturnVal);
           }
         }
       }
diff -Nru firefox-84.0.2+build1/js/src/gc/Allocator.cpp firefox-85.0+build1/js/src/gc/Allocator.cpp
--- firefox-84.0.2+build1/js/src/gc/Allocator.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Allocator.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -20,6 +20,7 @@
 #include "vm/JSContext.h"
 #include "vm/Runtime.h"
 #include "vm/StringType.h"
+#include "vm/TraceLogging.h"
 
 #include "gc/ArenaList-inl.h"
 #include "gc/Heap-inl.h"
diff -Nru firefox-84.0.2+build1/js/src/gc/ArenaList.h firefox-85.0+build1/js/src/gc/ArenaList.h
--- firefox-84.0.2+build1/js/src/gc/ArenaList.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/ArenaList.h	2021-01-18 19:58:12.000000000 +0000
@@ -61,16 +61,18 @@
 };
 
 /*
- * Arena lists have a head and a cursor. The cursor conceptually lies on arena
- * boundaries, i.e. before the first arena, between two arenas, or after the
- * last arena.
+ * Arena lists contain a singly linked lists of arenas starting from a head
+ * pointer.
+ *
+ * They also have a cursor, which conceptually lies on arena boundaries,
+ * i.e. before the first arena, between two arenas, or after the last arena.
  *
  * Arenas are usually sorted in order of increasing free space, with the cursor
  * following the Arena currently being allocated from. This ordering should not
  * be treated as an invariant, however, as the free lists may be cleared,
  * leaving arenas previously used for allocation partially full. Sorting order
  * is restored during sweeping.
-
+ *
  * Arenas following the cursor should not be full.
  */
 class ArenaList {
@@ -99,20 +101,26 @@
   Arena* head_;
   Arena** cursorp_;
 
-  inline void copy(const ArenaList& other);
+  // Transfers the contents of |other| to this list and clears |other|.
+  inline void moveFrom(ArenaList& other);
 
  public:
   inline ArenaList();
-  inline ArenaList(const ArenaList& other);
+  inline ArenaList(ArenaList&& other);
+  inline ~ArenaList();
 
-  inline ArenaList& operator=(const ArenaList& other);
+  inline ArenaList& operator=(ArenaList&& other);
+
+  // It doesn't make sense for arenas to be present in more than one list, so
+  // list copy operations are not provided.
+  ArenaList(const ArenaList& other) = delete;
+  ArenaList& operator=(const ArenaList& other) = delete;
 
   inline explicit ArenaList(const SortedArenaListSegment& segment);
 
   inline void check() const;
 
   inline void clear();
-  inline ArenaList copyAndClear();
   inline bool isEmpty() const;
 
   // This returns nullptr if the list is empty.
@@ -121,8 +129,6 @@
   inline bool isCursorAtHead() const;
   inline bool isCursorAtEnd() const;
 
-  inline void moveCursorToEnd();
-
   // This can return nullptr.
   inline Arena* arenaAfterCursor() const;
 
@@ -138,8 +144,9 @@
   // Inserts |a| at the cursor, then moves the cursor past it.
   inline void insertBeforeCursor(Arena* a);
 
-  // This inserts |other|, which must be full, at the cursor of |this|.
-  inline ArenaList& insertListWithCursorAtEnd(const ArenaList& other);
+  // This inserts the contents of |other|, which must be full, at the cursor of
+  // |this| and clears |other|.
+  inline ArenaList& insertListWithCursorAtEnd(ArenaList& other);
 
   Arena* removeRemainingArenas(Arena** arenap);
   Arena** pickArenasToRelocate(size_t& arenaTotalOut, size_t& relocTotalOut);
@@ -277,10 +284,6 @@
   // processing before they are swept.
   ZoneData<Arena*> gcShapeArenasToUpdate;
   ZoneData<Arena*> gcAccessorShapeArenasToUpdate;
-  ZoneData<Arena*> gcScriptArenasToUpdate;
-  ZoneData<Arena*> gcNewScriptArenasToUpdate;
-  ZoneData<Arena*> gcObjectGroupArenasToUpdate;
-  ZoneData<Arena*> gcNewObjectGroupArenasToUpdate;
 
   // The list of empty arenas which are collected during the sweep phase and
   // released at the end of sweeping every sweep group.
diff -Nru firefox-84.0.2+build1/js/src/gc/ArenaList-inl.h firefox-85.0+build1/js/src/gc/ArenaList-inl.h
--- firefox-84.0.2+build1/js/src/gc/ArenaList-inl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/ArenaList-inl.h	2021-01-18 19:58:12.000000000 +0000
@@ -21,17 +21,23 @@
 
 inline js::gc::ArenaList::ArenaList() { clear(); }
 
-void js::gc::ArenaList::copy(const ArenaList& other) {
+inline js::gc::ArenaList::ArenaList(ArenaList&& other) { moveFrom(other); }
+
+inline js::gc::ArenaList::~ArenaList() { MOZ_ASSERT(isEmpty()); }
+
+void js::gc::ArenaList::moveFrom(ArenaList& other) {
   other.check();
+
   head_ = other.head_;
   cursorp_ = other.isCursorAtHead() ? &head_ : other.cursorp_;
+  other.clear();
+
   check();
 }
 
-inline js::gc::ArenaList::ArenaList(const ArenaList& other) { copy(other); }
-
-js::gc::ArenaList& js::gc::ArenaList::operator=(const ArenaList& other) {
-  copy(other);
+js::gc::ArenaList& js::gc::ArenaList::operator=(ArenaList&& other) {
+  MOZ_ASSERT(isEmpty());
+  moveFrom(other);
   return *this;
 }
 
@@ -59,12 +65,6 @@
   check();
 }
 
-js::gc::ArenaList js::gc::ArenaList::copyAndClear() {
-  ArenaList result = *this;
-  clear();
-  return result;
-}
-
 bool js::gc::ArenaList::isEmpty() const {
   check();
   return !head_;
@@ -85,12 +85,6 @@
   return !*cursorp_;
 }
 
-void js::gc::ArenaList::moveCursorToEnd() {
-  while (!isCursorAtEnd()) {
-    cursorp_ = &(*cursorp_)->next;
-  }
-}
-
 js::gc::Arena* js::gc::ArenaList::arenaAfterCursor() const {
   check();
   return *cursorp_;
@@ -128,18 +122,22 @@
 }
 
 js::gc::ArenaList& js::gc::ArenaList::insertListWithCursorAtEnd(
-    const ArenaList& other) {
+    ArenaList& other) {
   check();
   other.check();
   MOZ_ASSERT(other.isCursorAtEnd());
-  if (other.isCursorAtHead()) {
+
+  if (other.isEmpty()) {
     return *this;
   }
+
   // Insert the full arenas of |other| after those of |this|.
   *other.cursorp_ = *cursorp_;
   *cursorp_ = other.head_;
   cursorp_ = other.cursorp_;
   check();
+
+  other.clear();
   return *this;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/gc/Barrier.cpp firefox-85.0+build1/js/src/gc/Barrier.cpp
--- firefox-84.0.2+build1/js/src/gc/Barrier.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Barrier.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -65,11 +65,6 @@
   return jcx && jcx->inIonBackend();
 }
 
-bool CurrentThreadIsIonCompilingSafeForMinorGC() {
-  jit::JitContext* jcx = jit::MaybeGetJitContext();
-  return jcx && jcx->inIonBackendSafeForMinorGC();
-}
-
 bool CurrentThreadIsGCMarking() {
   JSContext* cx = MaybeGetJSContext();
   return cx && cx->gcUse == JSContext::GCUse::Marking;
diff -Nru firefox-84.0.2+build1/js/src/gc/Barrier.h firefox-85.0+build1/js/src/gc/Barrier.h
--- firefox-84.0.2+build1/js/src/gc/Barrier.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Barrier.h	2021-01-18 19:58:12.000000000 +0000
@@ -309,7 +309,6 @@
 // a helper thread.
 bool CurrentThreadIsIonCompiling();
 
-bool CurrentThreadIsIonCompilingSafeForMinorGC();
 bool CurrentThreadIsGCSweeping();
 bool CurrentThreadIsGCFinalizing();
 bool CurrentThreadIsTouchingGrayThings();
@@ -920,26 +919,10 @@
 class HeapSlotArray {
   HeapSlot* array;
 
-  // Whether writes may be performed to the slots in this array. This helps
-  // to control how object elements which may be copy on write are used.
-#ifdef DEBUG
-  bool allowWrite_;
-#endif
-
  public:
-  explicit HeapSlotArray(HeapSlot* array, bool allowWrite)
-      : array(array)
-#ifdef DEBUG
-        ,
-        allowWrite_(allowWrite)
-#endif
-  {
-  }
+  explicit HeapSlotArray(HeapSlot* array) : array(array) {}
 
-  HeapSlot* begin() const {
-    MOZ_ASSERT(allowWrite());
-    return array;
-  }
+  HeapSlot* begin() const { return array; }
 
   operator const Value*() const {
     static_assert(sizeof(GCPtr<Value>) == sizeof(Value));
@@ -949,19 +932,10 @@
   operator HeapSlot*() const { return begin(); }
 
   HeapSlotArray operator+(int offset) const {
-    return HeapSlotArray(array + offset, allowWrite());
+    return HeapSlotArray(array + offset);
   }
   HeapSlotArray operator+(uint32_t offset) const {
-    return HeapSlotArray(array + offset, allowWrite());
-  }
-
- private:
-  bool allowWrite() const {
-#ifdef DEBUG
-    return allowWrite_;
-#else
-    return true;
-#endif
+    return HeapSlotArray(array + offset);
   }
 };
 
diff -Nru firefox-84.0.2+build1/js/src/gc/Cell.h firefox-85.0+build1/js/src/gc/Cell.h
--- firefox-84.0.2+build1/js/src/gc/Cell.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Cell.h	2021-01-18 19:58:13.000000000 +0000
@@ -8,6 +8,7 @@
 #define gc_Cell_h
 
 #include "mozilla/Atomics.h"
+#include "mozilla/EndianUtils.h"
 
 #include <type_traits>
 
@@ -153,9 +154,9 @@
   MOZ_ALWAYS_INLINE bool isMarkedAtLeast(gc::MarkColor color) const;
 
   MOZ_ALWAYS_INLINE CellColor color() const {
-    return isMarkedBlack()
-               ? CellColor::Black
-               : isMarkedGray() ? CellColor::Gray : CellColor::White;
+    return isMarkedBlack()  ? CellColor::Black
+           : isMarkedGray() ? CellColor::Gray
+                            : CellColor::White;
   }
 
   inline JSRuntime* runtimeFromMainThread() const;
@@ -239,9 +240,9 @@
 
   // Same as Cell::color, but skips nursery checks.
   MOZ_ALWAYS_INLINE CellColor color() const {
-    return isMarkedBlack()
-               ? CellColor::Black
-               : isMarkedGray() ? CellColor::Gray : CellColor::White;
+    return isMarkedBlack()  ? CellColor::Black
+           : isMarkedGray() ? CellColor::Gray
+                            : CellColor::White;
   }
 
   // The return value indicates if the cell went from unmarked to marked.
diff -Nru firefox-84.0.2+build1/js/src/gc/FreeOp.h firefox-85.0+build1/js/src/gc/FreeOp.h
--- firefox-84.0.2+build1/js/src/gc/FreeOp.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/FreeOp.h	2021-01-18 19:58:12.000000000 +0000
@@ -38,11 +38,6 @@
 
   JSRuntime* runtime_;
 
-  // We may accumulate a set of deferred free operations to be performed when
-  // the JSFreeOp is destroyed. This only applies to non-default JSFreeOps that
-  // are stack allocated and used during GC sweeping.
-  js::Vector<void*, 0, js::SystemAllocPolicy> freeLaterList;
-
   js::jit::JitPoisonRangeVector jitPoisonRanges;
 
   const bool isDefault;
@@ -81,22 +76,6 @@
   // js::AddCellMemory.
   void free_(Cell* cell, void* p, size_t nbytes, MemoryUse use);
 
-  // Deprecated. Where possible, memory should be tracked against the owning GC
-  // thing by calling js::AddCellMemory and the memory freed with freeLater()
-  // below.
-  void freeUntrackedLater(void* p) { queueForFreeLater(p); }
-
-  // Queue memory that was associated with a GC thing using js::AddCellMemory to
-  // be freed when the JSFreeOp is destroyed.
-  //
-  // This should not be called on the default JSFreeOps returned by
-  // JSRuntime/JSContext::defaultFreeOp() since these are not destroyed until
-  // the runtime itself is destroyed.
-  //
-  // This is used to ensure that copy-on-write object elements are not freed
-  // until all objects that refer to them have been finalized.
-  void freeLater(Cell* cell, void* p, size_t nbytes, MemoryUse use);
-
   bool appendJitPoisonRange(const js::jit::JitPoisonRange& range) {
     // JSFreeOps other than the defaultFreeOp() are constructed on the stack,
     // and won't hold onto the pointers to free indefinitely.
@@ -169,9 +148,6 @@
   // Update the memory accounting for a GC for memory freed by some other
   // method.
   void removeCellMemory(Cell* cell, size_t nbytes, MemoryUse use);
-
- private:
-  void queueForFreeLater(void* p);
 };
 
 #endif  // gc_FreeOp_h
diff -Nru firefox-84.0.2+build1/js/src/gc/FreeOp-inl.h firefox-85.0+build1/js/src/gc/FreeOp-inl.h
--- firefox-84.0.2+build1/js/src/gc/FreeOp-inl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/FreeOp-inl.h	2021-01-18 19:58:12.000000000 +0000
@@ -19,27 +19,6 @@
   }
 }
 
-inline void JSFreeOp::freeLater(Cell* cell, void* p, size_t nbytes,
-                                MemoryUse use) {
-  if (p) {
-    removeCellMemory(cell, nbytes, use);
-    queueForFreeLater(p);
-  }
-}
-
-inline void JSFreeOp::queueForFreeLater(void* p) {
-  // Default JSFreeOps are not constructed on the stack, and will hold onto the
-  // pointers to free indefinitely.
-  MOZ_ASSERT(!isDefaultFreeOp());
-
-  // It's not safe to free this allocation immediately, so we must crash if we
-  // can't append to the list.
-  js::AutoEnterOOMUnsafeRegion oomUnsafe;
-  if (!freeLaterList.append(p)) {
-    oomUnsafe.crash("JSFreeOp::freeLater");
-  }
-}
-
 template <class T>
 inline void JSFreeOp::release(Cell* cell, T* p, size_t nbytes, MemoryUse use) {
   if (p) {
diff -Nru firefox-84.0.2+build1/js/src/gc/GC.cpp firefox-85.0+build1/js/src/gc/GC.cpp
--- firefox-84.0.2+build1/js/src/gc/GC.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GC.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -230,9 +230,11 @@
 #include "jit/JitRealm.h"
 #include "jit/JitRuntime.h"
 #include "jit/JitZone.h"
-#include "js/Object.h"  // JS::GetClass
+#include "jit/MacroAssembler.h"  // js::jit::CodeAlignment
+#include "js/Object.h"           // JS::GetClass
 #include "js/SliceBudget.h"
 #include "proxy/DeadObjectProxy.h"
+#include "util/DifferentialTesting.h"
 #include "util/Poison.h"
 #include "util/Windows.h"
 #include "vm/BigIntType.h"
@@ -464,7 +466,7 @@
 
   FreeSpan newListHead;
   FreeSpan* newListTail = &newListHead;
-  size_t nmarked = 0;
+  size_t nmarked = 0, nfinalized = 0;
 
   for (ArenaCellIterUnderFinalize cell(this); !cell.done(); cell.next()) {
     T* t = cell.as<T>();
@@ -484,9 +486,16 @@
       AlwaysPoison(t, JS_SWEPT_TENURED_PATTERN, thingSize,
                    MemCheckKind::MakeUndefined);
       gcprobes::TenuredFinalize(t);
+      nfinalized++;
     }
   }
 
+  if (thingKind == AllocKind::STRING ||
+      thingKind == AllocKind::FAT_INLINE_STRING) {
+    zone->markedStrings += nmarked;
+    zone->finalizedStrings += nfinalized;
+  }
+
   if (nmarked == 0) {
     // Do nothing. The caller will update the arena appropriately.
     MOZ_ASSERT(newListTail == &newListHead);
@@ -993,9 +1002,6 @@
     "    19: (YieldBeforeSweepingCaches) Incremental GC in two slices that "
     "yields\n"
     "        before sweeping weak caches\n"
-    "    20: (YieldBeforeSweepingTypes) Incremental GC in two slices that "
-    "yields\n"
-    "        before sweeping type information\n"
     "    21: (YieldBeforeSweepingObjects) Incremental GC in two slices that "
     "yields\n"
     "        before sweeping foreground finalized objects\n"
@@ -1018,7 +1024,6 @@
     ZealMode::IncrementalMultipleSlices,
     ZealMode::YieldBeforeSweepingAtoms,
     ZealMode::YieldBeforeSweepingCaches,
-    ZealMode::YieldBeforeSweepingTypes,
     ZealMode::YieldBeforeSweepingObjects,
     ZealMode::YieldBeforeSweepingNonObjects,
     ZealMode::YieldBeforeSweepingShapeTrees};
@@ -1529,6 +1534,8 @@
       return tunables.pretenureGroupThreshold();
     case JSGC_PRETENURE_STRING_THRESHOLD:
       return uint32_t(tunables.pretenureStringThreshold() * 100);
+    case JSGC_STOP_PRETENURE_STRING_THRESHOLD:
+      return uint32_t(tunables.stopPretenureStringThreshold() * 100);
     case JSGC_MIN_LAST_DITCH_GC_PERIOD:
       return tunables.minLastDitchGCPeriod().ToSeconds();
     case JSGC_ZONE_ALLOC_DELAY_KB:
@@ -1948,18 +1955,6 @@
             srcNative->getElementsHeader()->numShiftedElements();
         dstNative->setFixedElements(numShifted);
       }
-
-      // For copy-on-write objects that own their elements, fix up the
-      // owner pointer to point to the relocated object.
-      // Copy-on-write objects that don't own their elements have their elements
-      // pointer fixed up by JSObject::fixupAfterMovingGC.
-      if (srcNative->denseElementsAreCopyOnWrite()) {
-        GCPtrNativeObject& owner =
-            dstNative->getElementsHeader()->ownerObject();
-        if (owner == srcNative) {
-          owner = dstNative;
-        }
-      }
     } else if (srcObj->is<ProxyObject>()) {
       if (srcObj->as<ProxyObject>().usingInlineValueArray()) {
         dstObj->as<ProxyObject>().setInlineValueArray();
@@ -2221,29 +2216,8 @@
   discardJitCode(fop);
 }
 
-void GCRuntime::sweepTypesAfterCompacting(Zone* zone) {
-  zone->beginSweepTypes();
-
-  AutoClearTypeInferenceStateOnOOM oom(zone);
-
-  for (auto base = zone->cellIterUnsafe<BaseScript>(); !base.done();
-       base.next()) {
-    if (!base->hasJitScript()) {
-      continue;
-    }
-    AutoSweepJitScript sweep(base->asJSScript());
-  }
-  for (auto group = zone->cellIterUnsafe<ObjectGroup>(); !group.done();
-       group.next()) {
-    AutoSweepObjectGroup sweep(group);
-  }
-
-  zone->types.endSweep(rt);
-}
-
 void GCRuntime::sweepZoneAfterCompacting(MovingTracer* trc, Zone* zone) {
   MOZ_ASSERT(zone->isCollecting());
-  sweepTypesAfterCompacting(zone);
   sweepFinalizationRegistries(zone);
   zone->weakRefMap().sweep(&storeBuffer());
 
@@ -2764,10 +2738,6 @@
       incrementalSweptArenas(zone),
       gcShapeArenasToUpdate(zone, nullptr),
       gcAccessorShapeArenasToUpdate(zone, nullptr),
-      gcScriptArenasToUpdate(zone, nullptr),
-      gcNewScriptArenasToUpdate(zone, nullptr),
-      gcObjectGroupArenasToUpdate(zone, nullptr),
-      gcNewObjectGroupArenasToUpdate(zone, nullptr),
       savedEmptyArenas(zone, nullptr) {
   for (auto i : AllAllocKinds()) {
     concurrentUse(i) = ConcurrentUse::None;
@@ -2775,7 +2745,7 @@
   }
 }
 
-void ReleaseArenaList(JSRuntime* rt, Arena* arena, const AutoLockGC& lock) {
+void ReleaseArenas(JSRuntime* rt, Arena* arena, const AutoLockGC& lock) {
   Arena* next;
   for (; arena; arena = next) {
     next = arena->next;
@@ -2783,6 +2753,12 @@
   }
 }
 
+void ReleaseArenaList(JSRuntime* rt, ArenaList& arenaList,
+                      const AutoLockGC& lock) {
+  ReleaseArenas(rt, arenaList.head(), lock);
+  arenaList.clear();
+}
+
 ArenaLists::~ArenaLists() {
   AutoLockGC lock(runtime());
 
@@ -2792,11 +2768,11 @@
      * the background finalization is disabled.
      */
     MOZ_ASSERT(concurrentUse(i) == ConcurrentUse::None);
-    ReleaseArenaList(runtime(), arenaList(i).head(), lock);
+    ReleaseArenaList(runtime(), arenaList(i), lock);
   }
-  ReleaseArenaList(runtime(), incrementalSweptArenas.ref().head(), lock);
+  ReleaseArenaList(runtime(), incrementalSweptArenas.ref(), lock);
 
-  ReleaseArenaList(runtime(), savedEmptyArenas, lock);
+  ReleaseArenas(runtime(), savedEmptyArenas, lock);
 }
 
 void ArenaLists::queueForForegroundSweep(JSFreeOp* fop,
@@ -2835,8 +2811,7 @@
   if (arenasToSweep(thingKind)) {
     concurrentUse(thingKind) = ConcurrentUse::BackgroundFinalize;
   } else {
-    arenaList(thingKind) = newArenasInMarkPhase(thingKind);
-    newArenasInMarkPhase(thingKind).clear();
+    arenaList(thingKind) = std::move(newArenasInMarkPhase(thingKind));
   }
 }
 
@@ -2879,8 +2854,8 @@
                ConcurrentUse::BackgroundFinalize);
 
     // Join |al| and |finalized| into a single list.
-    ArenaList allocatedDuringSweep = al;
-    al = finalized;
+    ArenaList allocatedDuringSweep = std::move(al);
+    al = std::move(finalized);
     al.insertListWithCursorAtEnd(lists->newArenasInMarkPhase(thingKind));
     al.insertListWithCursorAtEnd(allocatedDuringSweep);
 
@@ -2900,11 +2875,6 @@
 void ArenaLists::queueForegroundThingsForSweep() {
   gcShapeArenasToUpdate = arenasToSweep(AllocKind::SHAPE);
   gcAccessorShapeArenasToUpdate = arenasToSweep(AllocKind::ACCESSOR_SHAPE);
-  gcObjectGroupArenasToUpdate = arenasToSweep(AllocKind::OBJECT_GROUP);
-  gcNewObjectGroupArenasToUpdate =
-      newArenasInMarkPhase(AllocKind::OBJECT_GROUP).head();
-  gcScriptArenasToUpdate = arenasToSweep(AllocKind::SCRIPT);
-  gcNewScriptArenasToUpdate = newArenasInMarkPhase(AllocKind::SCRIPT).head();
 }
 
 void ArenaLists::checkGCStateNotInUse() {
@@ -2933,10 +2903,6 @@
 void ArenaLists::checkNoArenasToUpdate() {
   MOZ_ASSERT(!gcShapeArenasToUpdate);
   MOZ_ASSERT(!gcAccessorShapeArenasToUpdate);
-  MOZ_ASSERT(!gcScriptArenasToUpdate);
-  MOZ_ASSERT(!gcNewScriptArenasToUpdate);
-  MOZ_ASSERT(!gcObjectGroupArenasToUpdate);
-  MOZ_ASSERT(!gcNewObjectGroupArenasToUpdate);
 }
 
 void ArenaLists::checkNoArenasToUpdateForKind(AllocKind kind) {
@@ -2948,14 +2914,6 @@
     case AllocKind::ACCESSOR_SHAPE:
       MOZ_ASSERT(!gcShapeArenasToUpdate);
       break;
-    case AllocKind::SCRIPT:
-      MOZ_ASSERT(!gcScriptArenasToUpdate);
-      MOZ_ASSERT(!gcNewScriptArenasToUpdate);
-      break;
-    case AllocKind::OBJECT_GROUP:
-      MOZ_ASSERT(!gcObjectGroupArenasToUpdate);
-      MOZ_ASSERT(!gcNewObjectGroupArenasToUpdate);
-      break;
     default:
       break;
   }
@@ -3183,7 +3141,7 @@
   }
 
   stats().recordTrigger(used, threshold);
-  PrepareZoneForGC(zone);
+  zone->scheduleGC();
   requestMajorGC(reason);
   return true;
 }
@@ -3603,6 +3561,10 @@
 
 void Zone::destroy(JSFreeOp* fop) {
   MOZ_ASSERT(compartments().empty());
+  JSRuntime* rt = fop->runtime();
+  if (auto callback = rt->destroyZoneCallback) {
+    callback(fop, this);
+  }
   // Bug 1560019: Malloc memory associated with a zone but not with a specific
   // GC thing is not currently tracked.
   fop->deleteUntracked(this);
@@ -4144,6 +4106,9 @@
   for (GCZonesIter zone(this); !zone.done(); zone.next()) {
     zone->arenas.clearFreeLists();
     zone->arenas.checkGCStateNotInUse();
+
+    zone->markedStrings = 0;
+    zone->finalizedStrings = 0;
   }
 
   marker.start();
@@ -5252,14 +5217,6 @@
       }
     }
   }
-
-  {
-    gcstats::AutoPhase ap1(stats(), gcstats::PhaseKind::SWEEP_TYPES);
-    gcstats::AutoPhase ap2(stats(), gcstats::PhaseKind::SWEEP_TYPES_BEGIN);
-    for (SweepGroupZonesIter zone(this); !zone.done(); zone.next()) {
-      zone->beginSweepTypes();
-    }
-  }
 }
 
 using WeakCacheTaskVector =
@@ -5335,8 +5292,6 @@
 
   using namespace gcstats;
 
-  MOZ_ASSERT(!storeBuffer().hasTypeSetPointers());
-
   AutoSCC scc(stats(), sweepGroupIndex);
 
   bool sweepingAtoms = false;
@@ -5608,19 +5563,22 @@
   // to check is long gone.
   if (!FinalizeArenas(fop, &arenasToSweep(thingKind), sweepList, thingKind,
                       sliceBudget)) {
+    // Copy the current contents of sweepList so that ArenaIter can find them.
     incrementalSweptArenaKind = thingKind;
+    incrementalSweptArenas.ref().clear();
     incrementalSweptArenas = sweepList.toArenaList();
     return false;
   }
 
-  // Clear any previous incremental sweep state we may have saved.
+  // Clear the list of swept arenas now these are moving back to the main arena
+  // lists.
   incrementalSweptArenaKind = AllocKind::LIMIT;
   incrementalSweptArenas.ref().clear();
 
   sweepList.extractEmpty(&savedEmptyArenas.ref());
 
   ArenaList& al = arenaList(thingKind);
-  ArenaList allocatedDuringSweep = al;
+  ArenaList allocatedDuringSweep = std::move(al);
   al = sweepList.toArenaList();
   al.insertListWithCursorAtEnd(newArenasInMarkPhase(thingKind));
   al.insertListWithCursorAtEnd(allocatedDuringSweep);
@@ -5680,14 +5638,6 @@
   }
 }
 
-static void SweepThing(JSFreeOp* fop, BaseScript* script) {
-  AutoSweepJitScript sweep(script);
-}
-
-static void SweepThing(JSFreeOp* fop, ObjectGroup* group) {
-  AutoSweepObjectGroup sweep(group);
-}
-
 template <typename T>
 static bool SweepArenaList(JSFreeOp* fop, Arena** arenasToSweep,
                            SliceBudget& sliceBudget) {
@@ -5712,54 +5662,6 @@
   return true;
 }
 
-IncrementalProgress GCRuntime::sweepTypeInformation(JSFreeOp* fop,
-                                                    SliceBudget& budget) {
-  // Sweep dead type information stored in scripts and object groups, but
-  // don't finalize them yet. We have to sweep dead information from both live
-  // and dead scripts and object groups, so that no dead references remain in
-  // them. Type inference can end up crawling these zones again, such as for
-  // TypeCompartment::markSetsUnknown, and if this happens after sweeping for
-  // the sweep group finishes we won't be able to determine which things in
-  // the zone are live.
-
-  MOZ_ASSERT(!storeBuffer().hasTypeSetPointers());
-
-  gcstats::AutoPhase ap1(stats(), gcstats::PhaseKind::SWEEP_COMPARTMENTS);
-  gcstats::AutoPhase ap2(stats(), gcstats::PhaseKind::SWEEP_TYPES);
-
-  ArenaLists& al = sweepZone->arenas;
-
-  AutoClearTypeInferenceStateOnOOM oom(sweepZone);
-
-  if (!SweepArenaList<BaseScript>(fop, &al.gcScriptArenasToUpdate.ref(),
-                                  budget)) {
-    return NotFinished;
-  }
-
-  if (!SweepArenaList<BaseScript>(fop, &al.gcNewScriptArenasToUpdate.ref(),
-                                  budget)) {
-    return NotFinished;
-  }
-
-  if (!SweepArenaList<ObjectGroup>(fop, &al.gcObjectGroupArenasToUpdate.ref(),
-                                   budget)) {
-    return NotFinished;
-  }
-
-  if (!SweepArenaList<ObjectGroup>(
-          fop, &al.gcNewObjectGroupArenasToUpdate.ref(), budget)) {
-    return NotFinished;
-  }
-
-  // Finish sweeping type information in the zone.
-  {
-    gcstats::AutoPhase ap(stats(), gcstats::PhaseKind::SWEEP_TYPES_END);
-    sweepZone->types.endSweep(rt);
-  }
-
-  return Finished;
-}
-
 void GCRuntime::startSweepingAtomsTable() {
   auto& maybeAtoms = maybeAtomsToSweep.ref();
   MOZ_ASSERT(maybeAtoms.isNothing());
@@ -6211,9 +6113,7 @@
           Call(&GCRuntime::sweepWeakCaches),
           ForEachZoneInSweepGroup(
               rt, &sweepZone.ref(),
-              Sequence(MaybeYield(ZealMode::YieldBeforeSweepingTypes),
-                       Call(&GCRuntime::sweepTypeInformation),
-                       MaybeYield(ZealMode::YieldBeforeSweepingObjects),
+              Sequence(MaybeYield(ZealMode::YieldBeforeSweepingObjects),
                        ForEachAllocKind(ForegroundObjectFinalizePhase.kinds,
                                         &sweepAllocKind.ref(),
                                         Call(&GCRuntime::finalizeAllocKind)),
@@ -6430,6 +6330,8 @@
   schedulingState.updateHighFrequencyMode(lastGCEndTime_, currentTime,
                                           tunables);
 
+  maybeStopStringPretenuring();
+
   {
     AutoLockGC lock(this);
 
@@ -6461,6 +6363,35 @@
   lastGCEndTime_ = currentTime;
 }
 
+void GCRuntime::maybeStopStringPretenuring() {
+  for (GCZonesIter zone(this); !zone.done(); zone.next()) {
+    if (zone->allocNurseryStrings) {
+      continue;
+    }
+
+    // Count the number of strings before the major GC.
+    size_t numStrings = zone->markedStrings + zone->finalizedStrings;
+    double rate = double(zone->finalizedStrings) / double(numStrings);
+    if (rate > tunables.stopPretenureStringThreshold()) {
+      CancelOffThreadIonCompile(zone);
+      bool preserving = zone->isPreservingCode();
+      zone->setPreservingCode(false);
+      zone->discardJitCode(rt->defaultFreeOp());
+      zone->setPreservingCode(preserving);
+      for (RealmsInZoneIter r(zone); !r.done(); r.next()) {
+        if (jit::JitRealm* jitRealm = r->jitRealm()) {
+          jitRealm->discardStubs();
+          jitRealm->setStringsCanBeInNursery(true);
+        }
+      }
+
+      zone->markedStrings = 0;
+      zone->finalizedStrings = 0;
+      zone->allocNurseryStrings = true;
+    }
+  }
+}
+
 void GCRuntime::updateGCThresholdsAfterCollection(const AutoLockGC& lock) {
   for (GCZonesIter zone(this); !zone.done(); zone.next()) {
     zone->clearGCSliceThresholds();
@@ -7059,7 +6990,10 @@
 }
 
 void GCRuntime::maybeIncreaseSliceBudget(SliceBudget& budget) {
-#ifndef JS_MORE_DETERMINISTIC
+  if (js::SupportDifferentialTesting()) {
+    return;
+  }
+
   // Increase time budget for long-running incremental collections. Enforce a
   // minimum time budget that increases linearly with time/slice count up to a
   // maximum.
@@ -7084,7 +7018,6 @@
       budget = SliceBudget(TimeBudget(minBudget));
     }
   }
-#endif  // JS_MORE_DETERMINISTIC
 }
 
 static void ScheduleZones(GCRuntime* gc) {
@@ -7259,8 +7192,7 @@
 
   bool nonIncremental = nonincrementalByAPI || budget.isUnlimited();
 
-  bool shouldCollectForSweeping = storeBuffer().hasTypeSetPointers() ||
-                                  storeBuffer().mayHavePointersToDeadCells();
+  bool shouldCollectForSweeping = storeBuffer().mayHavePointersToDeadCells();
 
   switch (incrementalState) {
     case State::NotActive:
@@ -7950,13 +7882,10 @@
         JSObject* targetProto =
             global->getPrototypeForOffThreadPlaceholder(obj);
         MOZ_ASSERT(targetProto->isDelegate());
-        MOZ_ASSERT_IF(targetProto->isNewGroupUnknown(),
-                      obj->isNewGroupUnknown());
         group->setProtoUnchecked(TaggedProto(targetProto));
       }
     }
 
-    group->setGeneration(target->zone()->types.generation);
     group->realm_ = target;
   }
 
@@ -7995,11 +7924,6 @@
   target->zone()->adoptUniqueIds(source->zone());
   target->zone()->adoptMallocBytes(source->zone());
 
-  // Merge other info in source's zone into target's zone.
-  target->zone()->types.typeLifoAlloc().transferFrom(
-      &source->zone()->types.typeLifoAlloc());
-  MOZ_RELEASE_ASSERT(source->zone()->types.sweepTypeLifoAlloc.ref().isEmpty());
-
   // Atoms which are marked in source's zone are now marked in target's zone.
   atomMarking.adoptMarkedAtoms(target->zone(), source->zone());
 
@@ -8345,27 +8269,53 @@
 }
 #endif
 
-JS_PUBLIC_API void JS::PrepareZoneForGC(Zone* zone) { zone->scheduleGC(); }
+#ifdef DEBUG
+bool GCRuntime::hasZone(Zone* target) {
+  for (AllZonesIter zone(this); !zone.done(); zone.next()) {
+    if (zone == target) {
+      return true;
+    }
+  }
+  return false;
+}
+#endif
+
+JS_PUBLIC_API void JS::PrepareZoneForGC(JSContext* cx, Zone* zone) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  MOZ_ASSERT(cx->runtime()->gc.hasZone(zone));
+
+  zone->scheduleGC();
+}
 
 JS_PUBLIC_API void JS::PrepareForFullGC(JSContext* cx) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   for (ZonesIter zone(cx->runtime(), WithAtoms); !zone.done(); zone.next()) {
     zone->scheduleGC();
   }
 }
 
 JS_PUBLIC_API void JS::PrepareForIncrementalGC(JSContext* cx) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   if (!JS::IsIncrementalGCInProgress(cx)) {
     return;
   }
 
   for (ZonesIter zone(cx->runtime(), WithAtoms); !zone.done(); zone.next()) {
     if (zone->wasGCStarted()) {
-      PrepareZoneForGC(zone);
+      zone->scheduleGC();
     }
   }
 }
 
 JS_PUBLIC_API bool JS::IsGCScheduled(JSContext* cx) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   for (ZonesIter zone(cx->runtime(), WithAtoms); !zone.done(); zone.next()) {
     if (zone->isGCScheduled()) {
       return true;
@@ -8375,38 +8325,60 @@
   return false;
 }
 
-JS_PUBLIC_API void JS::SkipZoneForGC(Zone* zone) { zone->unscheduleGC(); }
+JS_PUBLIC_API void JS::SkipZoneForGC(JSContext* cx, Zone* zone) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  MOZ_ASSERT(cx->runtime()->gc.hasZone(zone));
+
+  zone->unscheduleGC();
+}
 
 JS_PUBLIC_API void JS::NonIncrementalGC(JSContext* cx,
                                         JSGCInvocationKind gckind,
                                         GCReason reason) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
   MOZ_ASSERT(gckind == GC_NORMAL || gckind == GC_SHRINK);
+
   cx->runtime()->gc.gc(gckind, reason);
 }
 
 JS_PUBLIC_API void JS::StartIncrementalGC(JSContext* cx,
                                           JSGCInvocationKind gckind,
                                           GCReason reason, int64_t millis) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
   MOZ_ASSERT(gckind == GC_NORMAL || gckind == GC_SHRINK);
+
   cx->runtime()->gc.startGC(gckind, reason, millis);
 }
 
 JS_PUBLIC_API void JS::IncrementalGCSlice(JSContext* cx, GCReason reason,
                                           int64_t millis) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   cx->runtime()->gc.gcSlice(reason, millis);
 }
 
 JS_PUBLIC_API bool JS::IncrementalGCHasForegroundWork(JSContext* cx) {
-  MOZ_ASSERT(!JS::RuntimeHeapIsBusy());
+  AssertHeapIsIdle();
   CHECK_THREAD(cx);
+
   return cx->runtime()->gc.hasForegroundWork();
 }
 
 JS_PUBLIC_API void JS::FinishIncrementalGC(JSContext* cx, GCReason reason) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   cx->runtime()->gc.finishGC(reason);
 }
 
 JS_PUBLIC_API void JS::AbortIncrementalGC(JSContext* cx) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+
   if (IsIncrementalGCInProgress(cx)) {
     cx->runtime()->gc.abortGC();
   }
@@ -8651,7 +8623,7 @@
   return true;
 }
 
-#ifdef JS_MORE_DETERMINISTIC
+#ifdef DEBUG
 static bool DummyGetter(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setUndefined();
@@ -8681,11 +8653,14 @@
                  {"sliceCount", GCSliceCountGetter}};
 
   for (auto pair : getters) {
-#ifdef JS_MORE_DETERMINISTIC
-    JSNative getter = DummyGetter;
-#else
     JSNative getter = pair.getter;
+
+#ifdef DEBUG
+    if (js::SupportDifferentialTesting()) {
+      getter = DummyGetter;
+    }
 #endif
+
     if (!JS_DefineProperty(cx, obj, pair.name, getter, nullptr,
                            JSPROP_ENUMERATE)) {
       return nullptr;
@@ -8712,11 +8687,14 @@
                      {"gcNumber", ZoneGCNumberGetter}};
 
   for (auto pair : zoneGetters) {
-#ifdef JS_MORE_DETERMINISTIC
-    JSNative getter = DummyGetter;
-#else
     JSNative getter = pair.getter;
+
+#ifdef DEBUG
+    if (js::SupportDifferentialTesting()) {
+      getter = DummyGetter;
+    }
 #endif
+
     if (!JS_DefineProperty(cx, zoneObj, pair.name, getter, nullptr,
                            JSPROP_ENUMERATE)) {
       return nullptr;
diff -Nru firefox-84.0.2+build1/js/src/gc/GCEnum.h firefox-85.0+build1/js/src/gc/GCEnum.h
--- firefox-84.0.2+build1/js/src/gc/GCEnum.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GCEnum.h	2021-01-18 19:58:12.000000000 +0000
@@ -55,7 +55,6 @@
   D(YieldBeforeSweepingAtoms, 17)      \
   D(CheckGrayMarking, 18)              \
   D(YieldBeforeSweepingCaches, 19)     \
-  D(YieldBeforeSweepingTypes, 20)      \
   D(YieldBeforeSweepingObjects, 21)    \
   D(YieldBeforeSweepingNonObjects, 22) \
   D(YieldBeforeSweepingShapeTrees, 23) \
@@ -116,7 +115,6 @@
   _(TypeDescrTraceList)                    \
   _(NativeIterator)                        \
   _(JitScript)                             \
-  _(ObjectGroupAddendum)                   \
   _(ScriptDebugScript)                     \
   _(BreakpointSite)                        \
   _(Breakpoint)                            \
@@ -131,6 +129,8 @@
   _(WasmResolveResponseClosure)            \
   _(WasmModule)                            \
   _(WasmTableTable)                        \
+  _(WasmExceptionTag)                      \
+  _(WasmExceptionType)                     \
   _(FileObjectFile)                        \
   _(Debugger)                              \
   _(DebuggerFrameGeneratorInfo)            \
diff -Nru firefox-84.0.2+build1/js/src/gc/GCInternals.h firefox-85.0+build1/js/src/gc/GCInternals.h
--- firefox-84.0.2+build1/js/src/gc/GCInternals.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GCInternals.h	2021-01-18 19:58:12.000000000 +0000
@@ -285,35 +285,6 @@
   // complaining about TenureCounts being held live across a minor GC.
 } JS_HAZ_NON_GC_POINTER;
 
-// Keep rough track of how many times we tenure objects in particular groups
-// during minor collections, using a fixed size hash for efficiency at the cost
-// of potential collisions.
-struct TenureCountCache {
-  static const size_t EntryShift = 4;
-  static const size_t EntryCount = 1 << EntryShift;
-
-  TenureCount entries[EntryCount] = {};  // zeroes
-
-  TenureCountCache() = default;
-
-  HashNumber hash(ObjectGroup* group) {
-#if JS_BITS_PER_WORD == 32
-    static const size_t ZeroBits = 3;
-#else
-    static const size_t ZeroBits = 4;
-#endif
-
-    uintptr_t word = uintptr_t(group);
-    MOZ_ASSERT((word & ((1 << ZeroBits) - 1)) == 0);
-    word >>= ZeroBits;
-    return HashNumber((word >> EntryShift) ^ word);
-  }
-
-  TenureCount& findEntry(ObjectGroup* group) {
-    return entries[hash(group) % EntryCount];
-  }
-};
-
 extern void DelayCrossCompartmentGrayMarking(JSObject* src);
 
 inline bool IsOOMReason(JS::GCReason reason) {
diff -Nru firefox-84.0.2+build1/js/src/gc/GCMarker.h firefox-85.0+build1/js/src/gc/GCMarker.h
--- firefox-84.0.2+build1/js/src/gc/GCMarker.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GCMarker.h	2021-01-18 19:58:13.000000000 +0000
@@ -290,6 +290,15 @@
     traverseEdge(source, target);
   }
 
+  template <typename S, typename T>
+  void checkTraversedEdge(S source, T* target);
+
+#ifdef DEBUG
+  // We can't check atom marking if the helper thread lock is already held by
+  // the current thread. This allows us to disable the check.
+  void setCheckAtomMarking(bool check);
+#endif
+
   /*
    * Care must be taken changing the mark color from gray to black. The cycle
    * collector depends on the invariant that there are no black to gray edges
@@ -501,6 +510,12 @@
   /* Assert that start and stop are called with correct ordering. */
   MainThreadOrGCTaskData<bool> started;
 
+  /*
+   * Whether to check that atoms traversed are present in atom marking
+   * bitmap.
+   */
+  MainThreadOrGCTaskData<bool> checkAtomMarking;
+
   /* The test marking queue might want to be marking a particular color. */
   mozilla::Maybe<js::gc::MarkColor> queueMarkColor;
 
diff -Nru firefox-84.0.2+build1/js/src/gc/GCProbes.h firefox-85.0+build1/js/src/gc/GCProbes.h
--- firefox-84.0.2+build1/js/src/gc/GCProbes.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GCProbes.h	2021-01-18 19:58:12.000000000 +0000
@@ -36,7 +36,6 @@
 inline void TenuredFinalize(gc::Cell* thing) {
 }  // May be called off main thread.
 inline void MajorGCEnd() {}
-inline void TypeNewScript(ObjectGroup* group) {}
 
 }  // namespace gcprobes
 }  // namespace gc
diff -Nru firefox-84.0.2+build1/js/src/gc/GCRuntime.h firefox-85.0+build1/js/src/gc/GCRuntime.h
--- firefox-84.0.2+build1/js/src/gc/GCRuntime.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GCRuntime.h	2021-01-18 19:58:12.000000000 +0000
@@ -382,7 +382,9 @@
   void unlockGC() { lock.unlock(); }
 
 #ifdef DEBUG
-  bool currentThreadHasLockedGC() const { return lock.ownedByCurrentThread(); }
+  void assertCurrentThreadHasLockedGC() const {
+    lock.assertOwnedByCurrentThread();
+  }
 #endif  // DEBUG
 
   void setAlwaysPreserveCode() { alwaysPreserveCode = true; }
@@ -534,6 +536,8 @@
   // Crawl the heap to check whether an arbitary pointer is within a cell of
   // the given kind.
   bool isPointerWithinTenuredCell(void* ptr, JS::TraceKind traceKind);
+
+  bool hasZone(Zone* target);
 #endif
 
   // Queue memory memory to be freed on a background thread if possible.
@@ -748,7 +752,6 @@
   void sweepWeakRefs();
   IncrementalProgress endSweepingSweepGroup(JSFreeOp* fop, SliceBudget& budget);
   IncrementalProgress performSweepActions(SliceBudget& sliceBudget);
-  IncrementalProgress sweepTypeInformation(JSFreeOp* fop, SliceBudget& budget);
   void startSweepingAtomsTable();
   IncrementalProgress sweepAtomsTable(JSFreeOp* fop, SliceBudget& budget);
   IncrementalProgress sweepWeakCaches(JSFreeOp* fop, SliceBudget& budget);
@@ -772,7 +775,6 @@
                                    SliceBudget& sliceBudget,
                                    AutoGCSession& session);
   void endCompactPhase();
-  void sweepTypesAfterCompacting(Zone* zone);
   void sweepZoneAfterCompacting(MovingTracer* trc, Zone* zone);
   bool canRelocateZone(Zone* zone) const;
   MOZ_MUST_USE bool relocateArenas(Zone* zone, JS::GCReason reason,
@@ -797,6 +799,7 @@
   void maybeRequestGCAfterBackgroundTask(const AutoLockHelperThreadState& lock);
   void cancelRequestedGCAfterBackgroundTask();
   void finishCollection();
+  void maybeStopStringPretenuring();
   IncrementalProgress joinSweepMarkTask();
 
 #ifdef JS_GC_ZEAL
@@ -1236,7 +1239,6 @@
          hasZealMode(ZealMode::YieldBeforeSweeping) ||
          hasZealMode(ZealMode::YieldBeforeSweepingAtoms) ||
          hasZealMode(ZealMode::YieldBeforeSweepingCaches) ||
-         hasZealMode(ZealMode::YieldBeforeSweepingTypes) ||
          hasZealMode(ZealMode::YieldBeforeSweepingObjects) ||
          hasZealMode(ZealMode::YieldBeforeSweepingNonObjects) ||
          hasZealMode(ZealMode::YieldBeforeSweepingShapeTrees) ||
diff -Nru firefox-84.0.2+build1/js/src/gc/GenerateStatsPhases.py firefox-85.0+build1/js/src/gc/GenerateStatsPhases.py
--- firefox-84.0.2+build1/js/src/gc/GenerateStatsPhases.py	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/GenerateStatsPhases.py	2021-01-18 19:58:12.000000000 +0000
@@ -181,19 +181,6 @@
                     PhaseKind("SWEEP_JIT_DATA", "Sweep JIT Data", 65),
                     PhaseKind("SWEEP_WEAK_CACHES", "Sweep Weak Caches", 66),
                     PhaseKind("SWEEP_MISC", "Sweep Miscellaneous", 29),
-                    PhaseKind(
-                        "SWEEP_TYPES",
-                        "Sweep type information",
-                        30,
-                        [
-                            PhaseKind(
-                                "SWEEP_TYPES_BEGIN",
-                                "Sweep type tables and compilations",
-                                31,
-                            ),
-                            PhaseKind("SWEEP_TYPES_END", "Free type arena", 32),
-                        ],
-                    ),
                     JoinParallelTasksPhaseKind,
                 ],
             ),
diff -Nru firefox-84.0.2+build1/js/src/gc/Marking.cpp firefox-85.0+build1/js/src/gc/Marking.cpp
--- firefox-84.0.2+build1/js/src/gc/Marking.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Marking.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -49,6 +49,7 @@
 #include "gc/WeakMap-inl.h"
 #include "gc/Zone-inl.h"
 #include "vm/GeckoProfiler-inl.h"
+#include "vm/JSScript-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/PlainObject-inl.h"  // js::PlainObject
 #include "vm/Realm-inl.h"
@@ -1085,8 +1086,15 @@
 }
 }  // namespace js
 
+#ifdef DEBUG
+void GCMarker::setCheckAtomMarking(bool check) {
+  MOZ_ASSERT(check != checkAtomMarking);
+  checkAtomMarking = check;
+}
+#endif
+
 template <typename S, typename T>
-static inline void CheckTraversedEdge(S source, T* target) {
+inline void GCMarker::checkTraversedEdge(S source, T* target) {
 #ifdef DEBUG
   // Atoms and Symbols do not have or mark their internal pointers,
   // respectively.
@@ -1111,12 +1119,10 @@
 
   // If we are marking an atom, that atom must be marked in the source zone's
   // atom bitmap.
-  if (!sourceZone->isAtomsZone() && targetZone->isAtomsZone()) {
-    // We can't currently check this if the helper thread lock is held.
-    if (!gHelperThreadLock.ownedByCurrentThread()) {
-      MOZ_ASSERT(target->runtimeFromAnyThread()->gc.atomMarking.atomIsMarked(
-          sourceZone, reinterpret_cast<TenuredCell*>(target)));
-    }
+  if (checkAtomMarking && !sourceZone->isAtomsZone() &&
+      targetZone->isAtomsZone()) {
+    MOZ_ASSERT(target->runtimeFromAnyThread()->gc.atomMarking.atomIsMarked(
+        sourceZone, reinterpret_cast<TenuredCell*>(target)));
   }
 
   // If we have access to a compartment pointer for both things, they must
@@ -1128,7 +1134,7 @@
 
 template <typename S, typename T>
 void js::GCMarker::traverseEdge(S source, T* target) {
-  CheckTraversedEdge(source, target);
+  checkTraversedEdge(source, target);
   traverse(target);
 }
 
@@ -1243,7 +1249,7 @@
     // must point to this shape or an anscestor.  Since these pointers will
     // be traced by this loop they do not need to be traced here as well.
     BaseShape* base = shape->base();
-    CheckTraversedEdge(shape, base);
+    checkTraversedEdge(shape, base);
     if (mark(base)) {
       MOZ_ASSERT(base->canSkipMarkingShapeCache(shape));
       base->traceChildrenSkipShapeCache(this);
@@ -1530,17 +1536,6 @@
 }
 
 void js::ObjectGroup::traceChildren(JSTracer* trc) {
-  AutoSweepObjectGroup sweep(this);
-
-  if (!trc->canSkipJsids()) {
-    unsigned count = getPropertyCount(sweep);
-    for (unsigned i = 0; i < count; i++) {
-      if (ObjectGroup::Property* prop = getProperty(sweep, i)) {
-        TraceEdge(trc, &prop->id, "group_property");
-      }
-    }
-  }
-
   if (proto().isObject()) {
     TraceEdge(trc, &proto(), "group_proto");
   }
@@ -1550,34 +1545,14 @@
     TraceManuallyBarrieredEdge(trc, &global, "group_global");
   }
 
-  if (newScript(sweep)) {
-    newScript(sweep)->trace(trc);
-  }
-
-  if (maybePreliminaryObjects(sweep)) {
-    maybePreliminaryObjects(sweep)->trace(trc);
-  }
-
   if (JSObject* descr = maybeTypeDescr()) {
     TraceManuallyBarrieredEdge(trc, &descr, "group_type_descr");
-    MOZ_ASSERT(js::IsTypeDescrClass(MaybeForwardedObjectClass(descr)));
+    MOZ_ASSERT(MaybeForwardedObjectClass(descr) == &js::TypeDescr::class_);
     setTypeDescr(static_cast<TypeDescr*>(descr));
   }
-
-  if (JSObject* fun = maybeInterpretedFunction()) {
-    TraceManuallyBarrieredEdge(trc, &fun, "group_function");
-    setInterpretedFunction(&MaybeForwardedObjectAs<JSFunction>(fun));
-  }
 }
-void js::GCMarker::lazilyMarkChildren(ObjectGroup* group) {
-  AutoSweepObjectGroup sweep(group);
-  unsigned count = group->getPropertyCount(sweep);
-  for (unsigned i = 0; i < count; i++) {
-    if (ObjectGroup::Property* prop = group->getProperty(sweep, i)) {
-      traverseEdge(group, prop->id.get());
-    }
-  }
 
+void js::GCMarker::lazilyMarkChildren(ObjectGroup* group) {
   if (group->proto().isObject()) {
     traverseEdge(group, group->proto().toObject());
   }
@@ -1587,21 +1562,9 @@
     traverseEdge(group, static_cast<JSObject*>(global));
   }
 
-  if (group->newScript(sweep)) {
-    group->newScript(sweep)->trace(this);
-  }
-
-  if (group->maybePreliminaryObjects(sweep)) {
-    group->maybePreliminaryObjects(sweep)->trace(this);
-  }
-
   if (TypeDescr* descr = group->maybeTypeDescr()) {
     traverseEdge(group, static_cast<JSObject*>(descr));
   }
-
-  if (JSFunction* fun = group->maybeInterpretedFunction()) {
-    traverseEdge(group, static_cast<JSObject*>(fun));
-  }
 }
 
 void JS::BigInt::traceChildren(JSTracer* trc) {}
@@ -1883,49 +1846,6 @@
   return true;
 }
 
-inline static bool ObjectDenseElementsMayBeMarkable(NativeObject* nobj) {
-  /*
-   * For arrays that are large enough it's worth checking the type information
-   * to see if the object's elements contain any GC pointers.  If not, we
-   * don't need to trace them.
-   */
-  const unsigned MinElementsLength = 32;
-  if (nobj->getDenseInitializedLength() < MinElementsLength ||
-      nobj->isSingleton()) {
-    return true;
-  }
-
-  ObjectGroup* group = nobj->group();
-  if (group->needsSweep() || group->unknownPropertiesDontCheckGeneration()) {
-    return true;
-  }
-
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  // This typeset doesn't escape this function so avoid sweeping here.
-  HeapTypeSet* typeSet = group->maybeGetPropertyDontCheckGeneration(JSID_VOID);
-  if (!typeSet) {
-    return true;
-  }
-
-  static const uint32_t flagMask = TYPE_FLAG_STRING | TYPE_FLAG_SYMBOL |
-                                   TYPE_FLAG_LAZYARGS | TYPE_FLAG_ANYOBJECT |
-                                   TYPE_FLAG_BIGINT;
-  bool mayBeMarkable =
-      typeSet->hasAnyFlag(flagMask) || typeSet->getObjectCount() != 0;
-
-#ifdef DEBUG
-  if (!mayBeMarkable) {
-    const Value* elements = nobj->getDenseElementsAllowCopyOnWrite();
-    for (unsigned i = 0; i < nobj->getDenseInitializedLength(); i++) {
-      MOZ_ASSERT(!elements[i].isGCThing());
-    }
-  }
-#endif
-
-  return mayBeMarkable;
-}
-
 static inline void CheckForCompartmentMismatch(JSObject* obj, JSObject* obj2) {
 #ifdef DEBUG
   if (MOZ_UNLIKELY(obj->compartment() != obj2->compartment())) {
@@ -1993,7 +1913,7 @@
         }
 
         case SlotsOrElementsKind::Elements: {
-          base = nobj->getDenseElementsAllowCopyOnWrite();
+          base = nobj->getDenseElements();
 
           // Account for shifted elements.
           size_t numShifted = nobj->getElementsHeader()->numShiftedElements();
@@ -2089,7 +2009,7 @@
   }
 
   markImplicitEdges(obj);
-  traverseEdge(obj, obj->groupRaw());
+  traverseEdge(obj, obj->group());
 
   CallTraceHook(this, obj);
 
@@ -2108,19 +2028,7 @@
       break;
     }
 
-    if (nobj->denseElementsAreCopyOnWrite()) {
-      JSObject* owner = nobj->getElementsHeader()->ownerObject();
-      if (owner != nobj) {
-        traverseEdge(obj, owner);
-        break;
-      }
-    }
-
-    if (!ObjectDenseElementsMayBeMarkable(nobj)) {
-      break;
-    }
-
-    base = nobj->getDenseElementsAllowCopyOnWrite();
+    base = nobj->getDenseElements();
     kind = SlotsOrElementsKind::Elements;
     index = 0;
     end = nobj->getDenseInitializedLength();
@@ -2489,6 +2397,7 @@
 #ifdef DEBUG
       ,
       markLaterArenas(0),
+      checkAtomMarking(true),
       strictCompartmentChecking(false),
       markQueue(rt),
       queuePos(0)
@@ -3200,11 +3109,8 @@
     return;
   }
 
-  // Note: the contents of copy on write elements pointers are filled in
-  // during parsing and cannot contain nursery pointers.
   NativeObject* nobj = &obj->as<NativeObject>();
-  if (!nobj->hasEmptyElements() && !nobj->denseElementsAreCopyOnWrite() &&
-      ObjectDenseElementsMayBeMarkable(nobj)) {
+  if (!nobj->hasEmptyElements()) {
     HeapSlotArray elements = nobj->getDenseElements();
     Value* elems = elements.begin()->unbarrieredAddress();
     traceSlots(elems, elems + nobj->getDenseInitializedLength());
@@ -3422,7 +3328,7 @@
 size_t js::TenuringTracer::moveElementsToTenured(NativeObject* dst,
                                                  NativeObject* src,
                                                  AllocKind dstKind) {
-  if (src->hasEmptyElements() || src->denseElementsAreCopyOnWrite()) {
+  if (src->hasEmptyElements()) {
     return 0;
   }
 
@@ -3658,19 +3564,10 @@
   return dst;
 }
 
-void js::Nursery::collectToFixedPoint(TenuringTracer& mover,
-                                      TenureCountCache& tenureCounts) {
+void js::Nursery::collectToFixedPoint(TenuringTracer& mover) {
   for (RelocationOverlay* p = mover.objHead; p; p = p->next()) {
     auto* obj = static_cast<JSObject*>(p->forwardingAddress());
     mover.traceObject(obj);
-
-    TenureCount& entry = tenureCounts.findEntry(obj->groupRaw());
-    if (entry.group == obj->groupRaw()) {
-      entry.count++;
-    } else if (!entry.group) {
-      entry.group = obj->groupRaw();
-      entry.count = 1;
-    }
   }
 
   for (StringRelocationOverlay* p = mover.stringHead; p; p = p->next()) {
diff -Nru firefox-84.0.2+build1/js/src/gc/Marking-inl.h firefox-85.0+build1/js/src/gc/Marking-inl.h
--- firefox-84.0.2+build1/js/src/gc/Marking-inl.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Marking-inl.h	2021-01-18 19:58:12.000000000 +0000
@@ -96,7 +96,7 @@
 }
 
 inline const JSClass* MaybeForwardedObjectClass(const JSObject* obj) {
-  return MaybeForwarded(obj->groupRaw())->clasp();
+  return MaybeForwarded(obj->group())->clasp();
 }
 
 template <typename T>
diff -Nru firefox-84.0.2+build1/js/src/gc/Nursery.cpp firefox-85.0+build1/js/src/gc/Nursery.cpp
--- firefox-84.0.2+build1/js/src/gc/Nursery.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Nursery.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -25,13 +25,13 @@
 #include "gc/PublicIterators.h"
 #include "jit/JitFrames.h"
 #include "jit/JitRealm.h"
+#include "util/DifferentialTesting.h"
 #include "util/Poison.h"
 #include "vm/ArrayObject.h"
 #include "vm/JSONPrinter.h"
 #include "vm/Realm.h"
 #include "vm/Time.h"
 #include "vm/TypedArrayObject.h"
-#include "vm/TypeInference.h"
 
 #include "gc/Marking-inl.h"
 #include "gc/Zone-inl.h"
@@ -218,11 +218,8 @@
       enableProfiling_(false),
       canAllocateStrings_(true),
       canAllocateBigInts_(true),
-      reportTenurings_(0),
       minorGCTriggerReason_(JS::GCReason::NO_REASON),
-#ifndef JS_MORE_DETERMINISTIC
       smoothedGrowthFactor(1.0),
-#endif
       decommitTask(gc)
 #ifdef JS_GC_ZEAL
       ,
@@ -240,8 +237,7 @@
 }
 
 bool js::Nursery::init(AutoLockGCBgAlloc& lock) {
-  char* env = getenv("JS_GC_PROFILE_NURSERY");
-  if (env) {
+  if (char* env = getenv("JS_GC_PROFILE_NURSERY")) {
     if (0 == strcmp(env, "help")) {
       fprintf(stderr,
               "JS_GC_PROFILE_NURSERY=N\n"
@@ -252,18 +248,6 @@
     profileThreshold_ = TimeDuration::FromMicroseconds(atoi(env));
   }
 
-  env = getenv("JS_GC_REPORT_TENURING");
-  if (env) {
-    if (0 == strcmp(env, "help")) {
-      fprintf(stderr,
-              "JS_GC_REPORT_TENURING=N\n"
-              "\tAfter a minor GC, report any ObjectGroups with at least N "
-              "instances tenured.\n");
-      exit(0);
-    }
-    reportTenurings_ = atoi(env);
-  }
-
   if (!gc->storeBuffer().enable()) {
     return false;
   }
@@ -834,10 +818,6 @@
                   stats().allocsSinceMinorGCTenured());
   }
 
-  if (stats().getStat(gcstats::STAT_OBJECT_GROUPS_PRETENURED)) {
-    json.property("groups_pretenured",
-                  stats().getStat(gcstats::STAT_OBJECT_GROUPS_PRETENURED));
-  }
   if (stats().getStat(gcstats::STAT_NURSERY_STRING_REALMS_DISABLED)) {
     json.property(
         "nursery_string_realms_disabled",
@@ -1007,9 +987,8 @@
   // isEmpty() will become true, so use another variable to keep track of the
   // old empty state.
   bool wasEmpty = isEmpty();
-  TenureCountCache tenureCounts;
   if (!wasEmpty) {
-    CollectionResult result = doCollection(reason, tenureCounts);
+    CollectionResult result = doCollection(reason);
     previousGC.reason = reason;
     previousGC.tenuredBytes = result.tenuredBytes;
     previousGC.tenuredCells = result.tenuredCells;
@@ -1038,8 +1017,7 @@
       validPromotionRate && promotionRate > tunables().pretenureThreshold();
 
   startProfile(ProfileKey::Pretenure);
-  size_t pretenureCount =
-      doPretenuring(rt, reason, tenureCounts, highPromotionRate);
+  doPretenuring(rt, reason, highPromotionRate);
   endProfile(ProfileKey::Pretenure);
 
   // We ignore gcMaxBytes when allocating for minor collection. However, if we
@@ -1053,7 +1031,7 @@
   gc->incMinorGcNumber();
 
   TimeDuration totalTime = profileDurations_[ProfileKey::Total];
-  sendTelemetry(reason, totalTime, wasEmpty, pretenureCount, promotionRate);
+  sendTelemetry(reason, totalTime, wasEmpty, promotionRate);
 
   stats().endNurseryCollection(reason);
   gcprobes::MinorGCEnd();
@@ -1063,15 +1041,10 @@
   if (enableProfiling_ && totalTime >= profileThreshold_) {
     printCollectionProfile(reason, promotionRate);
   }
-
-  if (reportTenurings_) {
-    printTenuringData(tenureCounts);
-  }
 }
 
 void js::Nursery::sendTelemetry(JS::GCReason reason, TimeDuration totalTime,
-                                bool wasEmpty, size_t pretenureCount,
-                                double promotionRate) {
+                                bool wasEmpty, double promotionRate) {
   JSRuntime* rt = runtime();
   rt->addTelemetry(JS_TELEMETRY_GC_MINOR_REASON, uint32_t(reason));
   if (totalTime.ToMilliseconds() > 1.0) {
@@ -1081,7 +1054,7 @@
   rt->addTelemetry(JS_TELEMETRY_GC_NURSERY_BYTES, committed());
 
   if (!wasEmpty) {
-    rt->addTelemetry(JS_TELEMETRY_GC_PRETENURE_COUNT_2, pretenureCount);
+    rt->addTelemetry(JS_TELEMETRY_GC_PRETENURE_COUNT_2, 0);
     rt->addTelemetry(JS_TELEMETRY_GC_NURSERY_PROMOTION_RATE,
                      promotionRate * 100);
   }
@@ -1100,18 +1073,7 @@
   printProfileDurations(profileDurations_);
 }
 
-void js::Nursery::printTenuringData(const TenureCountCache& tenureCounts) {
-  for (const auto& entry : tenureCounts.entries) {
-    if (entry.count >= reportTenurings_) {
-      fprintf(stderr, "  %u x ", entry.count);
-      AutoSweepObjectGroup sweep(entry.group);
-      entry.group->print(sweep);
-    }
-  }
-}
-
-js::Nursery::CollectionResult js::Nursery::doCollection(
-    JS::GCReason reason, TenureCountCache& tenureCounts) {
+js::Nursery::CollectionResult js::Nursery::doCollection(JS::GCReason reason) {
   JSRuntime* rt = runtime();
   AutoGCSession session(gc, JS::HeapState::MinorCollecting);
   AutoSetThreadIsPerformingGC performingGC;
@@ -1125,15 +1087,6 @@
   // Mark the store buffer. This must happen first.
   StoreBuffer& sb = gc->storeBuffer();
 
-  // The MIR graph only contains nursery pointers if cancelIonCompilations()
-  // is set on the store buffer, in which case we cancel all compilations
-  // of such graphs.
-  startProfile(ProfileKey::CancelIonCompilations);
-  if (sb.cancelIonCompilations()) {
-    js::CancelOffThreadIonCompilesUsingNurseryPointers(rt);
-  }
-  endProfile(ProfileKey::CancelIonCompilations);
-
   // Strings in the whole cell buffer must be traced first, in order to mark
   // tenured dependent strings' bases as non-deduplicatable. The rest of
   // nursery collection (whole non-string cells, edges, etc.) can happen later.
@@ -1177,7 +1130,7 @@
   // to the nursery, then those nursery objects get moved as well, until no
   // objects are left to move. That is, we iterate to a fixed point.
   startProfile(ProfileKey::CollectToFP);
-  collectToFixedPoint(mover, tenureCounts);
+  collectToFixedPoint(mover);
   endProfile(ProfileKey::CollectToFP);
 
   // Sweep to update any pointers to nursery objects that have now been
@@ -1228,25 +1181,21 @@
   return {mover.tenuredSize, mover.tenuredCells};
 }
 
-size_t js::Nursery::doPretenuring(JSRuntime* rt, JS::GCReason reason,
-                                  const TenureCountCache& tenureCounts,
-                                  bool highPromotionRate) {
+void js::Nursery::doPretenuring(JSRuntime* rt, JS::GCReason reason,
+                                bool highPromotionRate) {
   // If we are promoting the nursery, or exhausted the store buffer with
   // pointers to nursery things, which will force a collection well before
   // the nursery is full, look for object groups that are getting promoted
   // excessively and try to pretenure them.
 
-  bool pretenureObj = false;
   bool pretenureStr = false;
   bool pretenureBigInt = false;
   if (tunables().attemptPretenuring()) {
     // Should we check for pretenuring regardless of GCReason?
+    // Use 3MB as the threshold so the pretenuring can be applied on Android.
     bool pretenureAll =
-        highPromotionRate && previousGC.nurseryUsedBytes >= 4 * 1024 * 1024;
+        highPromotionRate && previousGC.nurseryUsedBytes >= 3 * 1024 * 1024;
 
-    pretenureObj =
-        pretenureAll ||
-        IsFullStoreBufferReason(reason, JS::GCReason::FULL_CELL_PTR_OBJ_BUFFER);
     pretenureStr =
         pretenureAll ||
         IsFullStoreBufferReason(reason, JS::GCReason::FULL_CELL_PTR_STR_BUFFER);
@@ -1255,27 +1204,6 @@
                             reason, JS::GCReason::FULL_CELL_PTR_BIGINT_BUFFER);
   }
 
-  size_t pretenureCount = 0;
-
-  if (pretenureObj) {
-    JSContext* cx = rt->mainContextFromOwnThread();
-    uint32_t threshold = tunables().pretenureGroupThreshold();
-    for (auto& entry : tenureCounts.entries) {
-      if (entry.count < threshold) {
-        continue;
-      }
-
-      ObjectGroup* group = entry.group;
-      AutoRealm ar(cx, group);
-      AutoSweepObjectGroup sweep(group);
-      if (group->canPreTenure(sweep)) {
-        group->setShouldPreTenure(sweep, cx);
-        pretenureCount++;
-      }
-    }
-  }
-  stats().setStat(gcstats::STAT_OBJECT_GROUPS_PRETENURED, pretenureCount);
-
   mozilla::Maybe<AutoGCSession> session;
   uint32_t numStringsTenured = 0;
   uint32_t numNurseryStringRealmsDisabled = 0;
@@ -1337,8 +1265,6 @@
   stats().setStat(gcstats::STAT_NURSERY_BIGINT_REALMS_DISABLED,
                   numNurseryBigIntRealmsDisabled);
   stats().setStat(gcstats::STAT_BIGINTS_TENURED, numBigIntsTenured);
-
-  return pretenureCount;
 }
 
 bool js::Nursery::registerMallocedBuffer(void* buffer, size_t nbytes) {
@@ -1576,13 +1502,11 @@
 
   // Calculate the fraction of time spent collecting the nursery.
   double timeFraction = 0.0;
-#ifndef JS_MORE_DETERMINISTIC
-  if (lastResizeTime) {
+  if (lastResizeTime && !js::SupportDifferentialTesting()) {
     TimeDuration collectorTime = now - collectionStartTime();
     TimeDuration totalTime = now - lastResizeTime;
     timeFraction = collectorTime.ToSeconds() / totalTime.ToSeconds();
   }
-#endif
 
   // Adjust the nursery size to try to achieve a target promotion rate and
   // collector time goals.
@@ -1596,17 +1520,16 @@
   static const double GrowthRange = 2.0;
   growthFactor = ClampDouble(growthFactor, 1.0 / GrowthRange, GrowthRange);
 
-#ifndef JS_MORE_DETERMINISTIC
   // Use exponential smoothing on the desired growth rate to take into account
   // the promotion rate from recent previous collections.
   if (lastResizeTime &&
-      now - lastResizeTime < TimeDuration::FromMilliseconds(200)) {
+      now - lastResizeTime < TimeDuration::FromMilliseconds(200) &&
+      !js::SupportDifferentialTesting()) {
     growthFactor = 0.75 * smoothedGrowthFactor + 0.25 * growthFactor;
   }
 
   lastResizeTime = now;
   smoothedGrowthFactor = growthFactor;
-#endif
 
   // Leave size untouched if we are close to the promotion goal.
   static const double GoalWidth = 1.5;
@@ -1623,10 +1546,12 @@
 }
 
 void js::Nursery::clearRecentGrowthData() {
-#ifndef JS_MORE_DETERMINISTIC
+  if (js::SupportDifferentialTesting()) {
+    return;
+  }
+
   lastResizeTime = TimeStamp();
   smoothedGrowthFactor = 1.0;
-#endif
 }
 
 /* static */
diff -Nru firefox-84.0.2+build1/js/src/gc/Nursery.h firefox-85.0+build1/js/src/gc/Nursery.h
--- firefox-84.0.2+build1/js/src/gc/Nursery.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Nursery.h	2021-01-18 19:58:12.000000000 +0000
@@ -25,7 +25,6 @@
 #define FOR_EACH_NURSERY_PROFILE_TIME(_)      \
   /* Key                       Header text */ \
   _(Total, "total")                           \
-  _(CancelIonCompilations, "canIon")          \
   _(TraceValues, "mkVals")                    \
   _(TraceCells, "mkClls")                     \
   _(TraceSlots, "mkSlts")                     \
@@ -70,7 +69,6 @@
 class MinorCollectionTracer;
 class RelocationOverlay;
 class StringRelocationOverlay;
-struct TenureCountCache;
 enum class AllocKind : uint8_t;
 class TenuredCell;
 }  // namespace gc
@@ -480,9 +478,6 @@
   // Whether we will nursery-allocate BigInts.
   bool canAllocateBigInts_;
 
-  // Report ObjectGroups with at least this many instances tenured.
-  int64_t reportTenurings_;
-
   // Whether and why a collection of this nursery has been requested. This is
   // mutable as it is set by the store buffer, which otherwise cannot modify
   // anything in the nursery.
@@ -519,10 +514,8 @@
   };
   PreviousGC previousGC;
 
-#ifndef JS_MORE_DETERMINISTIC
   mozilla::TimeStamp lastResizeTime;
   double smoothedGrowthFactor;
-#endif
 
   // Calculate the promotion rate of the most recent minor GC.
   // The valid_for_tenuring parameter is used to return whether this
@@ -682,17 +675,14 @@
     size_t tenuredBytes;
     size_t tenuredCells;
   };
-  CollectionResult doCollection(JS::GCReason reason,
-                                gc::TenureCountCache& tenureCounts);
+  CollectionResult doCollection(JS::GCReason reason);
 
-  size_t doPretenuring(JSRuntime* rt, JS::GCReason reason,
-                       const gc::TenureCountCache& tenureCounts,
-                       bool highPromotionRate);
+  void doPretenuring(JSRuntime* rt, JS::GCReason reason,
+                     bool highPromotionRate);
 
   // Move the object at |src| in the Nursery to an already-allocated cell
   // |dst| in Tenured.
-  void collectToFixedPoint(TenuringTracer& trc,
-                           gc::TenureCountCache& tenureCounts);
+  void collectToFixedPoint(TenuringTracer& trc);
 
   // The dependent string chars needs to be relocated if the base which it's
   // using chars from has been deduplicated.
@@ -739,11 +729,9 @@
   void freeChunksFrom(unsigned firstFreeChunk);
 
   void sendTelemetry(JS::GCReason reason, mozilla::TimeDuration totalTime,
-                     bool wasEmpty, size_t pretenureCount,
-                     double promotionRate);
+                     bool wasEmpty, double promotionRate);
 
   void printCollectionProfile(JS::GCReason reason, double promotionRate);
-  void printTenuringData(const gc::TenureCountCache& tenureCounts);
 
   // Profile recording and printing.
   void maybeClearProfileDurations();
diff -Nru firefox-84.0.2+build1/js/src/gc/ParallelWork.h firefox-85.0+build1/js/src/gc/ParallelWork.h
--- firefox-84.0.2+build1/js/src/gc/ParallelWork.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/ParallelWork.h	2021-01-18 19:58:12.000000000 +0000
@@ -8,7 +8,6 @@
 #define gc_ParallelWork_h
 
 #include "mozilla/Maybe.h"
-#include "mozilla/Variant.h"
 
 #include "gc/GC.h"
 #include "gc/GCParallelTask.h"
@@ -116,7 +115,7 @@
   }
 
   ~AutoRunParallelWork() {
-    MOZ_ASSERT(gHelperThreadLock.ownedByCurrentThread());
+    gHelperThreadLock.assertOwnedByCurrentThread();
 
     for (size_t i = 0; i < tasksStarted; i++) {
       gc->joinTask(*tasks[i], phaseKind, lock);
diff -Nru firefox-84.0.2+build1/js/src/gc/RootMarking.cpp firefox-85.0+build1/js/src/gc/RootMarking.cpp
--- firefox-84.0.2+build1/js/src/gc/RootMarking.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/RootMarking.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -75,9 +75,9 @@
 }
 
 template <typename T>
-static inline void TraceExactStackRootList(JSTracer* trc,
-                                           JS::Rooted<void*>* listHead,
-                                           const char* name) {
+static inline void TraceExactStackRootList(
+    JSTracer* trc, JS::Rooted<JS::detail::RootListEntry*>* listHead,
+    const char* name) {
   auto* typedList = reinterpret_cast<JS::Rooted<T>*>(listHead);
   for (JS::Rooted<T>* root = typedList; root; root = root->previous()) {
     root->trace(trc, name);
@@ -112,7 +112,8 @@
 
 template <typename T>
 static inline void TracePersistentRootedList(
-    JSTracer* trc, LinkedList<PersistentRooted<void*>>& list,
+    JSTracer* trc,
+    LinkedList<PersistentRooted<JS::detail::RootListEntry*>>& list,
     const char* name) {
   auto& typedList = reinterpret_cast<LinkedList<PersistentRooted<T>>&>(list);
   for (PersistentRooted<T>* root : typedList) {
@@ -144,7 +145,7 @@
 
 template <typename T>
 static void FinishPersistentRootedChain(
-    LinkedList<PersistentRooted<void*>>& listArg) {
+    LinkedList<PersistentRooted<JS::detail::RootListEntry*>>& listArg) {
   auto& list = reinterpret_cast<LinkedList<PersistentRooted<T>>&>(listArg);
   while (!list.isEmpty()) {
     list.getFirst()->reset();
@@ -634,13 +635,15 @@
   }
 }
 
-JS_PUBLIC_API void JS::AddPersistentRoot(JS::RootingContext* cx, RootKind kind,
-                                         PersistentRooted<void*>* root) {
+JS_PUBLIC_API void JS::AddPersistentRoot(
+    JS::RootingContext* cx, RootKind kind,
+    PersistentRooted<JS::detail::RootListEntry*>* root) {
   static_cast<JSContext*>(cx)->runtime()->heapRoots.ref()[kind].insertBack(
       root);
 }
 
-JS_PUBLIC_API void JS::AddPersistentRoot(JSRuntime* rt, RootKind kind,
-                                         PersistentRooted<void*>* root) {
+JS_PUBLIC_API void JS::AddPersistentRoot(
+    JSRuntime* rt, RootKind kind,
+    PersistentRooted<JS::detail::RootListEntry*>* root) {
   rt->heapRoots.ref()[kind].insertBack(root);
 }
diff -Nru firefox-84.0.2+build1/js/src/gc/Scheduling.cpp firefox-85.0+build1/js/src/gc/Scheduling.cpp
--- firefox-84.0.2+build1/js/src/gc/Scheduling.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Scheduling.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -64,6 +64,8 @@
       pretenureThreshold_(TuningDefaults::PretenureThreshold),
       pretenureGroupThreshold_(TuningDefaults::PretenureGroupThreshold),
       pretenureStringThreshold_(TuningDefaults::PretenureStringThreshold),
+      stopPretenureStringThreshold_(
+          TuningDefaults::StopPretenureStringThreshold),
       minLastDitchGCPeriod_(
           TimeDuration::FromSeconds(TuningDefaults::MinLastDitchGCPeriod)),
       mallocThresholdBase_(TuningDefaults::MallocThresholdBase),
@@ -200,6 +202,12 @@
       }
       pretenureStringThreshold_ = value / 100.0;
       break;
+    case JSGC_STOP_PRETENURE_STRING_THRESHOLD:
+      if (value == 0 || value > 100) {
+        return false;
+      }
+      stopPretenureStringThreshold_ = value / 100.0;
+      break;
     case JSGC_MIN_LAST_DITCH_GC_PERIOD:
       minLastDitchGCPeriod_ = TimeDuration::FromSeconds(value);
       break;
diff -Nru firefox-84.0.2+build1/js/src/gc/Scheduling.h firefox-85.0+build1/js/src/gc/Scheduling.h
--- firefox-84.0.2+build1/js/src/gc/Scheduling.h	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Scheduling.h	2021-01-18 19:58:12.000000000 +0000
@@ -108,9 +108,9 @@
  *  Correctness reasons:
  *
  *   3) Do a GC now because correctness depends on some GC property. For
- *      example, CC_WAITING is where the embedding requires the mark bits
- *      to be set correct. Also, EVICT_NURSERY where we need to work on the
- *      tenured heap.
+ *      example, CC_FORCED is where the embedding requires the mark bits to be
+ *      set correctly. Also, EVICT_NURSERY where we need to work on the tenured
+ *      heap.
  *
  *   4) Do a GC because we are shutting down: e.g. SHUTDOWN_CC or DESTROY_*.
  *
@@ -318,6 +318,7 @@
 #include "js/HeapAPI.h"
 #include "js/SliceBudget.h"
 #include "threading/ProtectedData.h"
+#include "util/DifferentialTesting.h"
 
 namespace js {
 
@@ -415,6 +416,9 @@
 /* JSGC_PRETENURE_STRING_THRESHOLD */
 static const double PretenureStringThreshold = 0.55;
 
+/* JSGC_STOP_PRETENURE_STRING_THRESHOLD */
+static const double StopPretenureStringThreshold = 0.9;
+
 /* JSGC_MIN_LAST_DITCH_GC_PERIOD */
 static const auto MinLastDitchGCPeriod = 60;  // in seconds
 
@@ -562,6 +566,14 @@
   MainThreadData<double> pretenureStringThreshold_;
 
   /*
+   * JSGC_STOP_PRETENURE_STRING_THRESHOLD
+   *
+   * If the finalization rate of the tenured strings exceeds this threshold,
+   * string will be allocated in nursery.
+   */
+  MainThreadData<double> stopPretenureStringThreshold_;
+
+  /*
    * JSGC_MIN_LAST_DITCH_GC_PERIOD
    *
    * Last ditch GC is skipped if allocation failure occurs less than this many
@@ -624,6 +636,9 @@
   double pretenureThreshold() const { return pretenureThreshold_; }
   uint32_t pretenureGroupThreshold() const { return pretenureGroupThreshold_; }
   double pretenureStringThreshold() const { return pretenureStringThreshold_; }
+  double stopPretenureStringThreshold() const {
+    return stopPretenureStringThreshold_;
+  }
 
   mozilla::TimeDuration minLastDitchGCPeriod() const {
     return minLastDitchGCPeriod_;
@@ -669,11 +684,13 @@
   void updateHighFrequencyMode(const mozilla::TimeStamp& lastGCTime,
                                const mozilla::TimeStamp& currentTime,
                                const GCSchedulingTunables& tunables) {
-#ifndef JS_MORE_DETERMINISTIC
+    if (js::SupportDifferentialTesting()) {
+      return;
+    }
+
     inHighFrequencyGCMode_ =
         !lastGCTime.IsNull() &&
         lastGCTime + tunables.highFrequencyThreshold() > currentTime;
-#endif
   }
 };
 
diff -Nru firefox-84.0.2+build1/js/src/gc/Statistics.h firefox-85.0+build1/js/src/gc/Statistics.h
--- firefox-84.0.2+build1/js/src/gc/Statistics.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Statistics.h	2021-01-18 19:58:12.000000000 +0000
@@ -54,9 +54,6 @@
   // Number of strings tenured.
   STAT_STRINGS_TENURED,
 
-  // Number of object types pretenured this minor GC.
-  STAT_OBJECT_GROUPS_PRETENURED,
-
   // Number of realms that had nursery strings disabled due to large numbers
   // being tenured.
   STAT_NURSERY_STRING_REALMS_DISABLED,
diff -Nru firefox-84.0.2+build1/js/src/gc/StoreBuffer.cpp firefox-85.0+build1/js/src/gc/StoreBuffer.cpp
--- firefox-84.0.2+build1/js/src/gc/StoreBuffer.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/StoreBuffer.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -80,8 +80,6 @@
       nursery_(nursery),
       aboutToOverflow_(false),
       enabled_(false),
-      cancelIonCompilations_(false),
-      hasTypeSetPointers_(false),
       mayHavePointersToDeadCells_(false)
 #ifdef DEBUG
       ,
@@ -134,8 +132,6 @@
   }
 
   aboutToOverflow_ = false;
-  cancelIonCompilations_ = false;
-  hasTypeSetPointers_ = false;
   mayHavePointersToDeadCells_ = false;
 
   bufferVal.clear();
diff -Nru firefox-84.0.2+build1/js/src/gc/StoreBuffer.h firefox-85.0+build1/js/src/gc/StoreBuffer.h
--- firefox-84.0.2+build1/js/src/gc/StoreBuffer.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/StoreBuffer.h	2021-01-18 19:58:13.000000000 +0000
@@ -420,7 +420,7 @@
 #ifdef DEBUG
     if (JS::RuntimeHeapIsBusy()) {
       MOZ_ASSERT(!CurrentThreadIsGCMarking());
-      MOZ_ASSERT(lock_.ownedByCurrentThread());
+      lock_.assertOwnedByCurrentThread();
     } else {
       MOZ_ASSERT(CurrentThreadCanAccessRuntime(runtime_));
     }
@@ -464,8 +464,6 @@
 
   bool aboutToOverflow_;
   bool enabled_;
-  bool cancelIonCompilations_;
-  bool hasTypeSetPointers_;
   bool mayHavePointersToDeadCells_;
 #ifdef DEBUG
   bool mEntered; /* For ReentrancyGuard. */
@@ -489,15 +487,6 @@
   /* Get the overflowed status. */
   bool isAboutToOverflow() const { return aboutToOverflow_; }
 
-  bool cancelIonCompilations() const { return cancelIonCompilations_; }
-
-  /*
-   * Type inference data structures are moved during sweeping, so if we we are
-   * to sweep them then we must make sure that the storebuffer has no pointers
-   * into them.
-   */
-  bool hasTypeSetPointers() const { return hasTypeSetPointers_; }
-
   /*
    * Brain transplants may add whole cell buffer entires for dead cells. We must
    * evict the nursery prior to sweeping arenas if any such entries are present.
@@ -536,8 +525,6 @@
     put(bufferGeneric, t);
   }
 
-  void setShouldCancelIonCompilations() { cancelIonCompilations_ = true; }
-  void setHasTypeSetPointers() { hasTypeSetPointers_ = true; }
   void setMayHavePointersToDeadCells() { mayHavePointersToDeadCells_ = true; }
 
   /* Methods to trace the source of all edges in the store buffer. */
diff -Nru firefox-84.0.2+build1/js/src/gc/Tracer.cpp firefox-85.0+build1/js/src/gc/Tracer.cpp
--- firefox-84.0.2+build1/js/src/gc/Tracer.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Tracer.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -23,9 +23,7 @@
 
 #include "gc/GC-inl.h"
 #include "gc/Marking-inl.h"
-#include "vm/ObjectGroup-inl.h"
 #include "vm/Realm-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::gc;
diff -Nru firefox-84.0.2+build1/js/src/gc/Zone.cpp firefox-85.0+build1/js/src/gc/Zone.cpp
--- firefox-84.0.2+build1/js/src/gc/Zone.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Zone.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -15,6 +15,7 @@
 #include "gc/PublicIterators.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/JitZone.h"
 #include "vm/Runtime.h"
@@ -146,11 +147,12 @@
       helperThreadUse_(HelperThreadUse::None),
       helperThreadOwnerContext_(nullptr),
       arenas(this),
-      types(this),
       data(this, nullptr),
       tenuredStrings(this, 0),
       tenuredBigInts(this, 0),
       nurseryAllocatedStrings(this, 0),
+      markedStrings(this, 0),
+      finalizedStrings(this, 0),
       allocNurseryStrings(this, true),
       allocNurseryBigInts(this, true),
       suppressAllocationMetadataBuilder(this, false),
@@ -254,8 +256,6 @@
   }
 }
 
-void Zone::beginSweepTypes() { types.beginSweep(); }
-
 template <class Pred>
 static void EraseIf(js::gc::WeakEntryVector& entries, Pred pred) {
   auto* begin = entries.begin();
@@ -479,10 +479,6 @@
     // stubs because the optimizedStubSpace will be purged below.
     if (discardBaselineCode) {
       jitScript->purgeOptimizedStubs(script);
-
-      // ICs were purged so the script will need to warm back up before it can
-      // be inlined during Ion compilation.
-      jitScript->clearIonCompiledOrInlined();
     }
 
     // Finally, reset the active flag.
@@ -658,12 +654,11 @@
 }
 
 void Zone::addSizeOfIncludingThis(
-    mozilla::MallocSizeOf mallocSizeOf, JS::CodeSizes* code, size_t* typePool,
-    size_t* regexpZone, size_t* jitZone, size_t* baselineStubsOptimized,
-    size_t* uniqueIdMap, size_t* shapeCaches, size_t* atomsMarkBitmaps,
-    size_t* compartmentObjects, size_t* crossCompartmentWrappersTables,
-    size_t* compartmentsPrivateData, size_t* scriptCountsMapArg) {
-  *typePool += types.typeLifoAlloc().sizeOfExcludingThis(mallocSizeOf);
+    mozilla::MallocSizeOf mallocSizeOf, JS::CodeSizes* code, size_t* regexpZone,
+    size_t* jitZone, size_t* baselineStubsOptimized, size_t* uniqueIdMap,
+    size_t* shapeCaches, size_t* atomsMarkBitmaps, size_t* compartmentObjects,
+    size_t* crossCompartmentWrappersTables, size_t* compartmentsPrivateData,
+    size_t* scriptCountsMapArg) {
   *regexpZone += regExps().sizeOfExcludingThis(mallocSizeOf);
   if (jitZone_) {
     jitZone_->addSizeOfIncludingThis(mallocSizeOf, code, jitZone,
diff -Nru firefox-84.0.2+build1/js/src/gc/Zone.h firefox-85.0+build1/js/src/gc/Zone.h
--- firefox-84.0.2+build1/js/src/gc/Zone.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gc/Zone.h	2021-01-18 19:58:12.000000000 +0000
@@ -21,7 +21,6 @@
 #include "js/GCHashTable.h"
 #include "vm/AtomsTable.h"
 #include "vm/JSFunction.h"
-#include "vm/TypeInference.h"
 
 namespace js {
 
@@ -194,8 +193,6 @@
  public:
   js::gc::ArenaLists arenas;
 
-  js::TypeZone types;
-
   // Per-zone data for use by an embedder.
   js::ZoneData<void*> data;
 
@@ -204,6 +201,10 @@
 
   js::ZoneOrIonCompileData<uint64_t> nurseryAllocatedStrings;
 
+  // Number of marked/finalzied JSString/JSFatInlineString during major GC.
+  js::ZoneOrGCTaskData<size_t> markedStrings;
+  js::ZoneOrGCTaskData<size_t> finalizedStrings;
+
   js::ZoneData<bool> allocNurseryStrings;
   js::ZoneData<bool> allocNurseryBigInts;
 
@@ -399,7 +400,7 @@
       ShouldDiscardJitScripts discardJitScripts = KeepJitScripts);
 
   void addSizeOfIncludingThis(
-      mozilla::MallocSizeOf mallocSizeOf, JS::CodeSizes* code, size_t* typePool,
+      mozilla::MallocSizeOf mallocSizeOf, JS::CodeSizes* code,
       size_t* regexpZone, size_t* jitZone, size_t* baselineStubsOptimized,
       size_t* uniqueIdMap, size_t* shapeCaches, size_t* atomsMarkBitmaps,
       size_t* compartmentObjects, size_t* crossCompartmentWrappersTables,
@@ -420,8 +421,6 @@
                                       std::forward<Args>(args)...);
   }
 
-  void beginSweepTypes();
-
   bool hasMarkedRealms();
 
   void scheduleGC() {
diff -Nru firefox-84.0.2+build1/js/src/gdb/mozilla/jitsrc.py firefox-85.0+build1/js/src/gdb/mozilla/jitsrc.py
--- firefox-84.0.2+build1/js/src/gdb/mozilla/jitsrc.py	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gdb/mozilla/jitsrc.py	2021-01-18 19:58:12.000000000 +0000
@@ -79,6 +79,13 @@
         "0",
         "0",
     ),
+    (
+        "<unnamed>",
+        1,
+        "js::jit::AssemblerBufferWithConstantPools<.*>::executableCopy",
+        "&cur->instructions[0]",
+        "dest",
+    ),
 ]
 
 
@@ -97,7 +104,8 @@
             b.enabled = True
 
     def search_stack(self, base_name, hops, name, src, dst, address):
-        if not re.match(base_name, gdb.newest_frame().name()):
+        current_frame_name = gdb.newest_frame().name() or "<unnamed>"
+        if not re.match(base_name, current_frame_name):
             return None
         f = gdb.newest_frame()
         for _ in range(hops):
diff -Nru firefox-84.0.2+build1/js/src/gdb/tests/test-GCCellPtr.cpp firefox-85.0+build1/js/src/gdb/tests/test-GCCellPtr.cpp
--- firefox-84.0.2+build1/js/src/gdb/tests/test-GCCellPtr.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/gdb/tests/test-GCCellPtr.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -24,7 +24,7 @@
   JS::Rooted<JSString*> empty(cx, JS_NewStringCopyN(cx, nullptr, 0));
   JS::Rooted<JS::Symbol*> unique(cx, JS::NewSymbol(cx, nullptr));
   JS::Rooted<JS::BigInt*> zeroBigInt(cx, JS::BigInt::zero(cx));
-  JS::Rooted<js::ObjectGroup*> rootedObjGroup(cx, JSObject::getGroup(cx, glob));
+  JS::Rooted<js::ObjectGroup*> rootedObjGroup(cx, glob->group());
   JS::Rooted<js::RegExpObject*> regExp(
       cx, js::RegExpObject::create(cx, u"", 0, JS::RegExpFlags{},
                                    js::GenericObject));
diff -Nru firefox-84.0.2+build1/js/src/irregexp/RegExpShim.cpp firefox-85.0+build1/js/src/irregexp/RegExpShim.cpp
--- firefox-84.0.2+build1/js/src/irregexp/RegExpShim.cpp	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/irregexp/RegExpShim.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -225,7 +225,7 @@
   if (!array) {
     oomUnsafe.crash("Irregexp NewFixedArray");
   }
-  array->ensureDenseInitializedLength(cx(), 0, length);
+  array->ensureDenseInitializedLength(0, length);
   return Handle<FixedArray>(JS::ObjectValue(*array), this);
 }
 
diff -Nru firefox-84.0.2+build1/js/src/irregexp/RegExpShim.h firefox-85.0+build1/js/src/irregexp/RegExpShim.h
--- firefox-84.0.2+build1/js/src/irregexp/RegExpShim.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/irregexp/RegExpShim.h	2021-01-18 19:58:13.000000000 +0000
@@ -33,6 +33,7 @@
 #include "js/RegExpFlags.h"
 #include "js/Value.h"
 #include "threading/ExclusiveData.h"
+#include "util/DifferentialTesting.h"
 #include "vm/JSContext.h"
 #include "vm/MutexIDs.h"
 #include "vm/NativeObject.h"
@@ -1094,14 +1095,12 @@
   // Use this to check for stack-overflows in C++ code.
   bool HasOverflowed() {
     bool overflowed = !js::CheckRecursionLimitDontReport(cx_);
-#ifdef JS_MORE_DETERMINISTIC
-    if (overflowed) {
+    if (overflowed && js::SupportDifferentialTesting()) {
       // We don't report overrecursion here, but we throw an exception later
       // and this still affects differential testing. Mimic ReportOverRecursed
       // (the fuzzers check for this particular string).
       fprintf(stderr, "ReportOverRecursed called\n");
     }
-#endif
     return overflowed;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/ABIFunctionList-inl.h firefox-85.0+build1/js/src/jit/ABIFunctionList-inl.h
--- firefox-84.0.2+build1/js/src/jit/ABIFunctionList-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/ABIFunctionList-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -129,7 +129,6 @@
   _(js::jit::GetNativeDataPropertyPure<false>)                        \
   _(js::jit::GetNativeDataPropertyPure<true>)                         \
   _(js::jit::GlobalHasLiveOnDebuggerStatement)                        \
-  _(js::jit::GroupHasPropertyTypes)                                   \
   _(js::jit::HandleCodeCoverageAtPC)                                  \
   _(js::jit::HandleCodeCoverageAtPrologue)                            \
   _(js::jit::HandleException)                                         \
diff -Nru firefox-84.0.2+build1/js/src/jit/AliasAnalysis.cpp firefox-85.0+build1/js/src/jit/AliasAnalysis.cpp
--- firefox-84.0.2+build1/js/src/jit/AliasAnalysis.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/AliasAnalysis.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -76,178 +76,6 @@
 #endif
 }
 
-// Unwrap any slot or element to its corresponding object.
-static inline const MDefinition* MaybeUnwrap(const MDefinition* object) {
-  while (object->isSlots() || object->isElements() ||
-         object->isConvertElementsToDoubles()) {
-    MOZ_ASSERT(object->numOperands() == 1);
-    object = object->getOperand(0);
-  }
-
-  if (object->isArrayBufferViewElements()) {
-    return nullptr;
-  }
-  if (object->isConstantElements()) {
-    return nullptr;
-  }
-
-  return object;
-}
-
-// Get the object of any load/store. Returns nullptr if not tied to
-// an object.
-static inline const MDefinition* GetObject(const MDefinition* ins) {
-  if (ins->getAliasSet().isNone()) {
-    return nullptr;
-  }
-  MOZ_ASSERT(ins->getAliasSet().isStore() || ins->getAliasSet().isLoad());
-
-  // Note: only return the object if that object owns that property.
-  // I.e. the property isn't on the prototype chain.
-  const MDefinition* object = nullptr;
-  switch (ins->op()) {
-    case MDefinition::Opcode::InitializedLength:
-    case MDefinition::Opcode::LoadElement:
-    case MDefinition::Opcode::LoadUnboxedScalar:
-    case MDefinition::Opcode::LoadDataViewElement:
-    case MDefinition::Opcode::StoreElement:
-    case MDefinition::Opcode::StoreHoleValueElement:
-    case MDefinition::Opcode::StoreUnboxedScalar:
-    case MDefinition::Opcode::StoreDataViewElement:
-    case MDefinition::Opcode::SetInitializedLength:
-    case MDefinition::Opcode::AddAndStoreSlot:
-    case MDefinition::Opcode::AllocateAndStoreSlot:
-    case MDefinition::Opcode::ArrayLength:
-    case MDefinition::Opcode::SetArrayLength:
-    case MDefinition::Opcode::Slots:
-    case MDefinition::Opcode::Elements:
-    case MDefinition::Opcode::MaybeCopyElementsForWrite:
-    case MDefinition::Opcode::MaybeToDoubleElement:
-    case MDefinition::Opcode::ArrayBufferByteLengthInt32:
-    case MDefinition::Opcode::ArrayBufferViewLength:
-    case MDefinition::Opcode::ArrayBufferViewByteOffset:
-    case MDefinition::Opcode::ArrayPopShift:
-    case MDefinition::Opcode::ArrayPush:
-    case MDefinition::Opcode::LoadTypedArrayElementHole:
-    case MDefinition::Opcode::StoreTypedArrayElementHole:
-    case MDefinition::Opcode::LoadFixedSlot:
-    case MDefinition::Opcode::LoadFixedSlotAndUnbox:
-    case MDefinition::Opcode::StoreFixedSlot:
-    case MDefinition::Opcode::GetPropertyPolymorphic:
-    case MDefinition::Opcode::SetPropertyPolymorphic:
-    case MDefinition::Opcode::GuardShape:
-    case MDefinition::Opcode::GuardReceiverPolymorphic:
-    case MDefinition::Opcode::GuardObjectGroup:
-    case MDefinition::Opcode::GuardObjectIdentity:
-    case MDefinition::Opcode::GuardProto:
-    case MDefinition::Opcode::GuardNullProto:
-    case MDefinition::Opcode::LoadDynamicSlot:
-    case MDefinition::Opcode::StoreDynamicSlot:
-    case MDefinition::Opcode::InArray:
-    case MDefinition::Opcode::LoadElementHole:
-    case MDefinition::Opcode::ArrayBufferViewElements:
-    case MDefinition::Opcode::CopyLexicalEnvironmentObject:
-    case MDefinition::Opcode::IsPackedArray:
-    case MDefinition::Opcode::SuperFunction:
-    case MDefinition::Opcode::InitHomeObject:
-    case MDefinition::Opcode::HomeObjectSuperBase:
-    case MDefinition::Opcode::ObjectStaticProto:
-    case MDefinition::Opcode::GuardNoDenseElements:
-    case MDefinition::Opcode::GuardElementNotHole:
-    case MDefinition::Opcode::GuardArrayIsPacked:
-    case MDefinition::Opcode::GuardFunctionFlags:
-    case MDefinition::Opcode::GuardFunctionIsNonBuiltinCtor:
-    case MDefinition::Opcode::GuardFunctionKind:
-    case MDefinition::Opcode::ArgumentsObjectLength:
-    case MDefinition::Opcode::FunctionLength:
-    case MDefinition::Opcode::FunctionName:
-    case MDefinition::Opcode::GuardArgumentsObjectNotOverriddenIterator:
-      object = ins->getOperand(0);
-      break;
-    case MDefinition::Opcode::GetPropertyCache:
-    case MDefinition::Opcode::CallGetProperty:
-    case MDefinition::Opcode::GetDOMProperty:
-    case MDefinition::Opcode::GetDOMMember:
-    case MDefinition::Opcode::LoadDOMExpandoValue:
-    case MDefinition::Opcode::LoadDOMExpandoValueGuardGeneration:
-    case MDefinition::Opcode::LoadDOMExpandoValueIgnoreGeneration:
-    case MDefinition::Opcode::GuardDOMExpandoMissingOrGuardShape:
-    case MDefinition::Opcode::Call:
-    case MDefinition::Opcode::Throw:
-    case MDefinition::Opcode::ThrowRuntimeLexicalError:
-    case MDefinition::Opcode::GetArgumentsObjectArg:
-    case MDefinition::Opcode::SetArgumentsObjectArg:
-    case MDefinition::Opcode::LoadArgumentsObjectArg:
-    case MDefinition::Opcode::CreateThis:
-    case MDefinition::Opcode::NewArrayDynamicLength:
-    case MDefinition::Opcode::NewTypedArrayDynamicLength:
-    case MDefinition::Opcode::CheckObjCoercible:
-    case MDefinition::Opcode::ToObject:
-    case MDefinition::Opcode::MegamorphicLoadSlot:
-    case MDefinition::Opcode::MegamorphicLoadSlotByValue:
-    case MDefinition::Opcode::MegamorphicStoreSlot:
-    case MDefinition::Opcode::MegamorphicHasProp:
-    case MDefinition::Opcode::CompareExchangeTypedArrayElement:
-    case MDefinition::Opcode::AtomicExchangeTypedArrayElement:
-    case MDefinition::Opcode::AtomicTypedArrayElementBinop:
-    case MDefinition::Opcode::LoadWrapperTarget:
-    case MDefinition::Opcode::GuardHasGetterSetter:
-    case MDefinition::Opcode::AsmJSLoadHeap:
-    case MDefinition::Opcode::AsmJSStoreHeap:
-    case MDefinition::Opcode::WasmHeapBase:
-    case MDefinition::Opcode::WasmLoadTls:
-    case MDefinition::Opcode::WasmLoad:
-    case MDefinition::Opcode::WasmStore:
-    case MDefinition::Opcode::WasmCompareExchangeHeap:
-    case MDefinition::Opcode::WasmAtomicBinopHeap:
-    case MDefinition::Opcode::WasmAtomicExchangeHeap:
-    case MDefinition::Opcode::WasmLoadGlobalVar:
-    case MDefinition::Opcode::WasmLoadGlobalCell:
-    case MDefinition::Opcode::WasmStoreGlobalVar:
-    case MDefinition::Opcode::WasmStoreGlobalCell:
-    case MDefinition::Opcode::WasmStoreRef:
-    case MDefinition::Opcode::WasmStoreStackResult:
-      return nullptr;
-    default:
-#ifdef DEBUG
-      // Crash when the default aliasSet is overriden, but when not added in the
-      // list above.
-      if (!ins->hasDefaultAliasSet()) {
-        MOZ_CRASH(
-            "Overridden getAliasSet without updating AliasAnalysis GetObject");
-      }
-#endif
-
-      return nullptr;
-  }
-
-  MOZ_ASSERT(!ins->hasDefaultAliasSet());
-  object = MaybeUnwrap(object);
-  MOZ_ASSERT_IF(object, object->type() == MIRType::Object);
-  return object;
-}
-
-// Generic comparing if a load aliases a store using TI information.
-MDefinition::AliasType AliasAnalysis::genericMightAlias(
-    const MDefinition* load, const MDefinition* store) {
-  const MDefinition* loadObject = GetObject(load);
-  const MDefinition* storeObject = GetObject(store);
-  if (!loadObject || !storeObject) {
-    return MDefinition::AliasType::MayAlias;
-  }
-
-  if (!loadObject->resultTypeSet() || !storeObject->resultTypeSet()) {
-    return MDefinition::AliasType::MayAlias;
-  }
-
-  if (loadObject->resultTypeSet()->objectsIntersect(
-          storeObject->resultTypeSet())) {
-    return MDefinition::AliasType::MayAlias;
-  }
-
-  return MDefinition::AliasType::NoAlias;
-}
-
 // Whether there might be a path from src to dest, excluding loop backedges.
 // This is approximate and really ought to depend on precomputed reachability
 // information.
@@ -399,9 +227,7 @@
           MInstructionVector& aliasedStores = stores[*iter];
           for (int i = aliasedStores.length() - 1; i >= 0; i--) {
             MInstruction* store = aliasedStores[i];
-            if (genericMightAlias(*def, store) !=
-                    MDefinition::AliasType::NoAlias &&
-                def->mightAlias(store) != MDefinition::AliasType::NoAlias &&
+            if (def->mightAlias(store) != MDefinition::AliasType::NoAlias &&
                 BlockMightReach(store->block(), *block)) {
               if (lastStore->id() < store->id()) {
                 lastStore = store;
@@ -451,9 +277,7 @@
             if (store->id() < firstLoopIns->id()) {
               break;
             }
-            if (genericMightAlias(ins, store) !=
-                    MDefinition::AliasType::NoAlias &&
-                ins->mightAlias(store) != MDefinition::AliasType::NoAlias) {
+            if (ins->mightAlias(store) != MDefinition::AliasType::NoAlias) {
               hasAlias = true;
               IonSpewDependency(ins, store, "aliases", "store in loop body");
               break;
diff -Nru firefox-84.0.2+build1/js/src/jit/AliasAnalysis.h firefox-85.0+build1/js/src/jit/AliasAnalysis.h
--- firefox-84.0.2+build1/js/src/jit/AliasAnalysis.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/AliasAnalysis.h	2021-01-18 19:58:13.000000000 +0000
@@ -29,9 +29,6 @@
       : mir(mir), graph_(graph), loop_(nullptr) {}
 
   MOZ_MUST_USE bool analyze();
-
-  static MDefinition::AliasType genericMightAlias(const MDefinition* load,
-                                                  const MDefinition* store);
 };
 
 // Iterates over the flags in an AliasSet.
diff -Nru firefox-84.0.2+build1/js/src/jit/arm/Assembler-arm.h firefox-85.0+build1/js/src/jit/arm/Assembler-arm.h
--- firefox-84.0.2+build1/js/src/jit/arm/Assembler-arm.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm/Assembler-arm.h	2021-01-18 19:58:13.000000000 +0000
@@ -2189,16 +2189,6 @@
   return true;
 }
 
-#if !defined(JS_CODEGEN_ARM_HARDFP) || defined(JS_SIMULATOR_ARM)
-
-static inline uint32_t GetArgStackDisp(uint32_t arg) {
-  MOZ_ASSERT(!UseHardFpABI());
-  MOZ_ASSERT(arg >= NumIntArgRegs);
-  return (arg - NumIntArgRegs) * sizeof(intptr_t);
-}
-
-#endif
-
 #if defined(JS_CODEGEN_ARM_HARDFP) || defined(JS_SIMULATOR_ARM)
 
 static inline bool GetFloat32ArgReg(uint32_t usedIntArgs,
@@ -2222,47 +2212,6 @@
   return true;
 }
 
-static inline uint32_t GetIntArgStackDisp(uint32_t usedIntArgs,
-                                          uint32_t usedFloatArgs,
-                                          uint32_t* padding) {
-  MOZ_ASSERT(UseHardFpABI());
-  MOZ_ASSERT(usedIntArgs >= NumIntArgRegs);
-  uint32_t doubleSlots =
-      std::max(0, (int32_t)usedFloatArgs - (int32_t)NumFloatArgRegs);
-  doubleSlots *= 2;
-  int intSlots = usedIntArgs - NumIntArgRegs;
-  return (intSlots + doubleSlots + *padding) * sizeof(intptr_t);
-}
-
-static inline uint32_t GetFloat32ArgStackDisp(uint32_t usedIntArgs,
-                                              uint32_t usedFloatArgs,
-                                              uint32_t* padding) {
-  MOZ_ASSERT(UseHardFpABI());
-  MOZ_ASSERT(usedFloatArgs >= NumFloatArgRegs);
-  uint32_t intSlots = 0;
-  if (usedIntArgs > NumIntArgRegs) {
-    intSlots = usedIntArgs - NumIntArgRegs;
-  }
-  uint32_t float32Slots = usedFloatArgs - NumFloatArgRegs;
-  return (intSlots + float32Slots + *padding) * sizeof(intptr_t);
-}
-
-static inline uint32_t GetDoubleArgStackDisp(uint32_t usedIntArgs,
-                                             uint32_t usedFloatArgs,
-                                             uint32_t* padding) {
-  MOZ_ASSERT(UseHardFpABI());
-  MOZ_ASSERT(usedFloatArgs >= NumFloatArgRegs);
-  uint32_t intSlots = 0;
-  if (usedIntArgs > NumIntArgRegs) {
-    intSlots = usedIntArgs - NumIntArgRegs;
-    // Update the amount of padding required.
-    *padding += (*padding + usedIntArgs) % 2;
-  }
-  uint32_t doubleSlots = usedFloatArgs - NumFloatArgRegs;
-  doubleSlots *= 2;
-  return (intSlots + doubleSlots + *padding) * sizeof(intptr_t);
-}
-
 #endif
 
 class DoubleEncoder {
diff -Nru firefox-84.0.2+build1/js/src/jit/arm/Lowering-arm.cpp firefox-85.0+build1/js/src/jit/arm/Lowering-arm.cpp
--- firefox-84.0.2+build1/js/src/jit/arm/Lowering-arm.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm/Lowering-arm.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -341,7 +341,7 @@
       LDivPowTwoI* lir =
           new (alloc()) LDivPowTwoI(useRegisterAtStart(div->lhs()), shift);
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       define(lir, div);
       return;
@@ -352,7 +352,7 @@
     LDivI* lir = new (alloc())
         LDivI(useRegister(div->lhs()), useRegister(div->rhs()), temp());
     if (div->fallible()) {
-      assignSnapshot(lir, BailoutKind::DoubleOutput);
+      assignSnapshot(lir, div->bailoutKind());
     }
     define(lir, div);
     return;
@@ -362,7 +362,7 @@
                                            useFixedAtStart(div->rhs(), r1));
 
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
 
   defineReturn(lir, div);
@@ -371,7 +371,7 @@
 void LIRGeneratorARM::lowerMulI(MMul* mul, MDefinition* lhs, MDefinition* rhs) {
   LMulI* lir = new (alloc()) LMulI;
   if (mul->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mul->bailoutKind());
   }
   lowerForALU(lir, mul, lhs, rhs);
 }
@@ -389,7 +389,7 @@
       LModPowTwoI* lir =
           new (alloc()) LModPowTwoI(useRegister(mod->lhs()), shift);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
       return;
@@ -399,7 +399,7 @@
       LModMaskI* lir = new (alloc())
           LModMaskI(useRegister(mod->lhs()), temp(), temp(), shift + 1);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
       return;
@@ -410,7 +410,7 @@
     LModI* lir =
         new (alloc()) LModI(useRegister(mod->lhs()), useRegister(mod->rhs()));
     if (mod->fallible()) {
-      assignSnapshot(lir, BailoutKind::DoubleOutput);
+      assignSnapshot(lir, mod->bailoutKind());
     }
     define(lir, mod);
     return;
@@ -421,7 +421,7 @@
                               useFixedAtStart(mod->rhs(), r1), tempFixed(r2));
 
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
 
   defineReturn(lir, mod);
@@ -510,7 +510,7 @@
   MDefinition* power = mir->power();
 
   auto* lir = new (alloc()) LPowOfTwoI(base, useRegister(power));
-  assignSnapshot(lir, BailoutKind::PrecisionLoss);
+  assignSnapshot(lir, mir->bailoutKind());
   define(lir, mir);
 }
 
@@ -534,7 +534,7 @@
     lir->setOperand(0, useRegister(lhs));
     lir->setOperand(1, useRegister(rhs));
     if (div->fallible()) {
-      assignSnapshot(lir, BailoutKind::DoubleOutput);
+      assignSnapshot(lir, div->bailoutKind());
     }
     define(lir, div);
     return;
@@ -544,7 +544,7 @@
       LSoftUDivOrMod(useFixedAtStart(lhs, r0), useFixedAtStart(rhs, r1));
 
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
 
   defineReturn(lir, div);
@@ -559,7 +559,7 @@
     lir->setOperand(0, useRegister(lhs));
     lir->setOperand(1, useRegister(rhs));
     if (mod->fallible()) {
-      assignSnapshot(lir, BailoutKind::DoubleOutput);
+      assignSnapshot(lir, mod->bailoutKind());
     }
     define(lir, mod);
     return;
@@ -569,7 +569,7 @@
       LSoftUDivOrMod(useFixedAtStart(lhs, r0), useFixedAtStart(rhs, r1));
 
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
 
   defineReturn(lir, mod);
diff -Nru firefox-84.0.2+build1/js/src/jit/arm/MacroAssembler-arm.cpp firefox-85.0+build1/js/src/jit/arm/MacroAssembler-arm.cpp
--- firefox-84.0.2+build1/js/src/jit/arm/MacroAssembler-arm.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm/MacroAssembler-arm.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -6019,7 +6019,7 @@
   MOZ_ASSERT(!access.isWidenSimd128Load());
 
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   Scalar::Type type = access.type();
 
@@ -6093,7 +6093,7 @@
   MOZ_ASSERT(ptr == ptrScratch);
 
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   unsigned byteSize = access.byteSize();
   Scalar::Type type = access.type();
@@ -6103,9 +6103,9 @@
     ScratchRegisterScope scratch(asMasm());
     // We need to store the high word of an Int64 first, so always adjust the
     // pointer to point to the high word in this case.  The adjustment is always
-    // OK because MaxOffsetGuardLimit is computed so that we can add up to
+    // OK because wasmMaxOffsetGuardLimit is computed so that we can add up to
     // sizeof(LargestValue)-1 without skipping past the guard page, and we
-    // assert above that offset < MaxOffsetGuardLimit.
+    // assert above that offset < wasmMaxOffsetGuardLimit.
     if (type == Scalar::Int64) {
       offset += INT64HIGH_OFFSET;
     }
@@ -6164,7 +6164,7 @@
   MOZ_ASSERT(!access.isWidenSimd128Load());
 
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   if (offset) {
     ScratchRegisterScope scratch(asMasm());
@@ -6256,7 +6256,7 @@
                 valOrTmp != val64.high && valOrTmp != val64.low);
 
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   unsigned byteSize = access.byteSize();
   MOZ_ASSERT(byteSize == 8 || byteSize == 4 || byteSize == 2);
diff -Nru firefox-84.0.2+build1/js/src/jit/arm/SharedICHelpers-arm.h firefox-85.0+build1/js/src/jit/arm/SharedICHelpers-arm.h
--- firefox-84.0.2+build1/js/src/jit/arm/SharedICHelpers-arm.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm/SharedICHelpers-arm.h	2021-01-18 19:58:13.000000000 +0000
@@ -39,22 +39,6 @@
   *callOffset = CodeOffset(masm.currentOffset());
 }
 
-inline void EmitEnterTypeMonitorIC(
-    MacroAssembler& masm,
-    size_t monitorStubOffset = ICMonitoredStub::offsetOfFirstMonitorStub()) {
-  // This is expected to be called from within an IC, when ICStubReg is
-  // properly initialized to point to the stub.
-  masm.loadPtr(Address(ICStubReg, (uint32_t)monitorStubOffset), ICStubReg);
-
-  // Load stubcode pointer from BaselineStubEntry.
-  // R2 won't be active when we call ICs, so we can use r0.
-  static_assert(R2 == ValueOperand(r1, r0));
-  masm.loadPtr(Address(ICStubReg, ICStub::offsetOfStubCode()), r0);
-
-  // Jump to the stubcode.
-  masm.branch(r0);
-}
-
 inline void EmitReturnFromIC(MacroAssembler& masm) { masm.ma_mov(lr, pc); }
 
 inline void EmitBaselineLeaveStubFrame(MacroAssembler& masm,
diff -Nru firefox-84.0.2+build1/js/src/jit/arm/Simulator-arm.h firefox-85.0+build1/js/src/jit/arm/Simulator-arm.h
--- firefox-84.0.2+build1/js/src/jit/arm/Simulator-arm.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm/Simulator-arm.h	2021-01-18 19:58:13.000000000 +0000
@@ -609,17 +609,17 @@
     // Technically we need the lock to access the innards of the
     // icache, not to take its address, but the latter condition
     // serves as a useful complement to the former.
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->icache_;
   }
 
   static Redirection* redirection() {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->redirection_;
   }
 
   static void setRedirection(js::jit::Redirection* redirection) {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     singleton_->redirection_ = redirection;
   }
 };
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/CodeGenerator-arm64.cpp firefox-85.0+build1/js/src/jit/arm64/CodeGenerator-arm64.cpp
--- firefox-84.0.2+build1/js/src/jit/arm64/CodeGenerator-arm64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/CodeGenerator-arm64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -74,14 +74,14 @@
   MBasicBlock* mirTrue = test->ifTrue();
   MBasicBlock* mirFalse = test->ifFalse();
 
-  masm.test32(input, input);
-
   // Jump to the True block if NonZero.
   // Jump to the False block if Zero.
   if (isNextBlock(mirFalse->lir())) {
-    jumpToBlock(mirTrue, Assembler::NonZero);
+    masm.branch32(Assembler::NonZero, input, Imm32(0),
+                  getJumpLabelForBranch(mirTrue));
   } else {
-    jumpToBlock(mirFalse, Assembler::Zero);
+    masm.branch32(Assembler::Zero, input, Imm32(0),
+                  getJumpLabelForBranch(mirFalse));
     if (!isNextBlock(mirTrue->lir())) {
       jumpToBlock(mirTrue);
     }
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/Lowering-arm64.cpp firefox-85.0+build1/js/src/jit/arm64/Lowering-arm64.cpp
--- firefox-84.0.2+build1/js/src/jit/arm64/Lowering-arm64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/Lowering-arm64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -218,7 +218,7 @@
     if (rhs != 0 && uint32_t(1) << shift == mozilla::Abs(rhs)) {
       LDivPowTwoI* lir = new (alloc()) LDivPowTwoI(lhs, shift, rhs < 0);
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       define(lir, div);
       return;
@@ -226,7 +226,7 @@
     if (rhs != 0) {
       LDivConstantI* lir = new (alloc()) LDivConstantI(lhs, rhs, temp());
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       define(lir, div);
       return;
@@ -236,7 +236,7 @@
   LDivI* lir = new (alloc())
       LDivI(useRegister(div->lhs()), useRegister(div->rhs()), temp());
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
   define(lir, div);
 }
@@ -245,7 +245,7 @@
                                   MDefinition* rhs) {
   LMulI* lir = new (alloc()) LMulI;
   if (mul->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mul->bailoutKind());
   }
   lowerForALU(lir, mul, lhs, rhs);
 }
@@ -263,7 +263,7 @@
       LModPowTwoI* lir =
           new (alloc()) LModPowTwoI(useRegister(mod->lhs()), shift);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
       return;
@@ -271,7 +271,7 @@
       LModMaskI* lir = new (alloc())
           LModMaskI(useRegister(mod->lhs()), temp(), temp(), shift + 1);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
     }
@@ -280,7 +280,7 @@
   LModI* lir =
       new (alloc()) LModI(useRegister(mod->lhs()), useRegister(mod->rhs()));
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
   define(lir, mod);
 }
@@ -332,7 +332,7 @@
   MDefinition* power = mir->power();
 
   auto* lir = new (alloc()) LPowOfTwoI(base, useRegister(power));
-  assignSnapshot(lir, BailoutKind::PrecisionLoss);
+  assignSnapshot(lir, mir->bailoutKind());
   define(lir, mir);
 }
 
@@ -361,7 +361,7 @@
     if (rhs != 0 && uint32_t(1) << shift == mozilla::Abs(rhs)) {
       LDivPowTwoI* lir = new (alloc()) LDivPowTwoI(lhs, shift, false);
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       define(lir, div);
       return;
@@ -369,7 +369,7 @@
 
     LUDivConstantI* lir = new (alloc()) LUDivConstantI(lhs, rhs, temp());
     if (div->fallible()) {
-      assignSnapshot(lir, BailoutKind::DoubleOutput);
+      assignSnapshot(lir, div->bailoutKind());
     }
     define(lir, div);
     return;
@@ -384,7 +384,7 @@
 
   LUDiv* lir = new (alloc()) LUDiv(lhs, rhs, remainder);
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
   define(lir, div);
 }
@@ -393,7 +393,7 @@
   LUMod* lir = new (alloc())
       LUMod(useRegister(mod->getOperand(0)), useRegister(mod->getOperand(1)));
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
   define(lir, mod);
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64.cpp firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64.cpp
--- firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -23,6 +23,20 @@
 namespace js {
 namespace jit {
 
+enum class Width { _32 = 32, _64 = 64 };
+
+static inline ARMRegister X(Register r) { return ARMRegister(r, 64); }
+
+static inline ARMRegister X(MacroAssembler& masm, RegisterOrSP r) {
+  return masm.toARMRegister(r, 64);
+}
+
+static inline ARMRegister W(Register r) { return ARMRegister(r, 32); }
+
+static inline ARMRegister R(Register r, Width w) {
+  return ARMRegister(r, unsigned(w));
+}
+
 void MacroAssemblerCompat::boxValue(JSValueType type, Register src,
                                     Register dest) {
 #ifdef DEBUG
@@ -86,7 +100,7 @@
 }
 
 void MacroAssemblerCompat::mov(CodeLabel* label, Register dest) {
-  BufferOffset bo = movePatchablePtr(ImmPtr(/* placeholder */ nullptr), dest);
+  BufferOffset bo = movePatchablePtr(ImmWord(/* placeholder */ 0), dest);
   label->patchAt()->bind(bo.getOffset());
   label->setLinkMode(CodeLabel::MoveImmediate);
 }
@@ -332,33 +346,42 @@
 
 void MacroAssemblerCompat::wasmLoadImpl(const wasm::MemoryAccessDesc& access,
                                         Register memoryBase_, Register ptr_,
-                                        Register ptrScratch_,
                                         AnyRegister outany, Register64 out64) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
-
-  // Not yet supported: not used by baseline compiler
-  MOZ_ASSERT(!access.isSplatSimd128Load());
-  MOZ_ASSERT(!access.isWidenSimd128Load());
-
-  MOZ_ASSERT(ptr_ == ptrScratch_);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   ARMRegister memoryBase(memoryBase_, 64);
   ARMRegister ptr(ptr_, 64);
   if (offset) {
-    Add(ptr, ptr, Operand(offset));
+    vixl::UseScratchRegisterScope temps(this);
+    ARMRegister scratch = temps.AcquireX();
+    Add(scratch, ptr, Operand(offset));
+    MemOperand srcAddr(memoryBase, scratch);
+    wasmLoadImpl(access, srcAddr, outany, out64);
+  } else {
+    MemOperand srcAddr(memoryBase, ptr);
+    wasmLoadImpl(access, srcAddr, outany, out64);
   }
+}
 
-  asMasm().memoryBarrierBefore(access.sync());
+void MacroAssemblerCompat::wasmLoadImpl(const wasm::MemoryAccessDesc& access,
+                                        MemOperand srcAddr, AnyRegister outany,
+                                        Register64 out64) {
+  // Not yet supported: not used by baseline compiler
+  MOZ_ASSERT(!access.isSplatSimd128Load());
+  MOZ_ASSERT(!access.isWidenSimd128Load());
 
-  // Reg+Reg addressing is directly encodable in one Load instruction, hence
-  // the AutoForbidPoolsAndNops will ensure that the access metadata is emitted
-  // at the address of the Load.
-  MemOperand srcAddr(memoryBase, ptr);
+  asMasm().memoryBarrierBefore(access.sync());
 
   {
+    // Reg+Reg addressing is directly encodable in one Load instruction, hence
+    // the AutoForbidPoolsAndNops will ensure that the access metadata is
+    // emitted at the address of the Load.  The AutoForbidPoolsAndNops will
+    // assert if we emit more than one instruction.
+
     AutoForbidPoolsAndNops afp(this,
                                /* max number of instructions in scope = */ 1);
+
     append(access, asMasm().currentOffset());
     switch (access.type()) {
       case Scalar::Int8:
@@ -410,29 +433,38 @@
 
 void MacroAssemblerCompat::wasmStoreImpl(const wasm::MemoryAccessDesc& access,
                                          AnyRegister valany, Register64 val64,
-                                         Register memoryBase_, Register ptr_,
-                                         Register ptrScratch_) {
+                                         Register memoryBase_, Register ptr_) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
-
-  MOZ_ASSERT(ptr_ == ptrScratch_);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
 
   ARMRegister memoryBase(memoryBase_, 64);
   ARMRegister ptr(ptr_, 64);
   if (offset) {
-    Add(ptr, ptr, Operand(offset));
+    vixl::UseScratchRegisterScope temps(this);
+    ARMRegister scratch = temps.AcquireX();
+    Add(scratch, ptr, Operand(offset));
+    MemOperand destAddr(memoryBase, scratch);
+    wasmStoreImpl(access, destAddr, valany, val64);
+  } else {
+    MemOperand destAddr(memoryBase, ptr);
+    wasmStoreImpl(access, destAddr, valany, val64);
   }
+}
 
+void MacroAssemblerCompat::wasmStoreImpl(const wasm::MemoryAccessDesc& access,
+                                         MemOperand dstAddr, AnyRegister valany,
+                                         Register64 val64) {
   asMasm().memoryBarrierBefore(access.sync());
 
-  // Reg+Reg addressing is directly encodable in one Store instruction, hence
-  // the AutoForbidPoolsAndNops will ensure that the access metadata is emitted
-  // at the address of the Store.
-  MemOperand dstAddr(memoryBase, ptr);
-
   {
+    // Reg+Reg addressing is directly encodable in one Store instruction, hence
+    // the AutoForbidPoolsAndNops will ensure that the access metadata is
+    // emitted at the address of the Store.  The AutoForbidPoolsAndNops will
+    // assert if we emit more than one instruction.
+
     AutoForbidPoolsAndNops afp(this,
                                /* max number of instructions in scope = */ 1);
+
     append(access, asMasm().currentOffset());
     switch (access.type()) {
       case Scalar::Int8:
@@ -1677,28 +1709,26 @@
 
 void MacroAssembler::wasmLoad(const wasm::MemoryAccessDesc& access,
                               Register memoryBase, Register ptr,
-                              Register ptrScratch, AnyRegister output) {
-  wasmLoadImpl(access, memoryBase, ptr, ptrScratch, output,
-               Register64::Invalid());
+                              AnyRegister output) {
+  wasmLoadImpl(access, memoryBase, ptr, output, Register64::Invalid());
 }
 
 void MacroAssembler::wasmLoadI64(const wasm::MemoryAccessDesc& access,
                                  Register memoryBase, Register ptr,
-                                 Register ptrScratch, Register64 output) {
-  wasmLoadImpl(access, memoryBase, ptr, ptrScratch, AnyRegister(), output);
+                                 Register64 output) {
+  wasmLoadImpl(access, memoryBase, ptr, AnyRegister(), output);
 }
 
 void MacroAssembler::wasmStore(const wasm::MemoryAccessDesc& access,
                                AnyRegister value, Register memoryBase,
-                               Register ptr, Register ptrScratch) {
-  wasmStoreImpl(access, value, Register64::Invalid(), memoryBase, ptr,
-                ptrScratch);
+                               Register ptr) {
+  wasmStoreImpl(access, value, Register64::Invalid(), memoryBase, ptr);
 }
 
 void MacroAssembler::wasmStoreI64(const wasm::MemoryAccessDesc& access,
                                   Register64 value, Register memoryBase,
-                                  Register ptr, Register ptrScratch) {
-  wasmStoreImpl(access, AnyRegister(), value, memoryBase, ptr, ptrScratch);
+                                  Register ptr) {
+  wasmStoreImpl(access, AnyRegister(), value, memoryBase, ptr);
 }
 
 void MacroAssembler::enterFakeExitFrameForWasm(Register cxreg, Register scratch,
@@ -1753,20 +1783,6 @@
 // The computed MemOperand must be Reg+0 because the load/store exclusive
 // instructions only take a single pointer register.
 
-enum class Width { _32 = 32, _64 = 64 };
-
-static inline ARMRegister X(Register r) { return ARMRegister(r, 64); }
-
-static inline ARMRegister X(MacroAssembler& masm, RegisterOrSP r) {
-  return masm.toARMRegister(r, 64);
-}
-
-static inline ARMRegister W(Register r) { return ARMRegister(r, 32); }
-
-static inline ARMRegister R(Register r, Width w) {
-  return ARMRegister(r, unsigned(w));
-}
-
 static MemOperand ComputePointerForAtomic(MacroAssembler& masm,
                                           const Address& address,
                                           Register scratch) {
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64.h firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64.h
--- firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64.h	2021-01-18 19:58:13.000000000 +0000
@@ -2018,11 +2018,13 @@
   Address ToType(Address value) { return value; }
 
   void wasmLoadImpl(const wasm::MemoryAccessDesc& access, Register memoryBase,
-                    Register ptr, Register ptrScratch, AnyRegister outany,
-                    Register64 out64);
+                    Register ptr, AnyRegister outany, Register64 out64);
+  void wasmLoadImpl(const wasm::MemoryAccessDesc& access, MemOperand srcAddr,
+                    AnyRegister outany, Register64 out64);
   void wasmStoreImpl(const wasm::MemoryAccessDesc& access, AnyRegister valany,
-                     Register64 val64, Register memoryBase, Register ptr,
-                     Register ptrScratch);
+                     Register64 val64, Register memoryBase, Register ptr);
+  void wasmStoreImpl(const wasm::MemoryAccessDesc& access, MemOperand destAddr,
+                     AnyRegister valany, Register64 val64);
 
   // Emit a BLR or NOP instruction. ToggleCall can be used to patch
   // this instruction.
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64-inl.h firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64-inl.h
--- firefox-84.0.2+build1/js/src/jit/arm64/MacroAssembler-arm64-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/MacroAssembler-arm64-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -820,8 +820,14 @@
 template <class L>
 void MacroAssembler::branch32(Condition cond, Register lhs, Imm32 imm,
                               L label) {
-  cmp32(lhs, imm);
-  B(label, cond);
+  if (imm.value == 0 && cond == Assembler::Equal) {
+    Cbz(ARMRegister(lhs, 32), label);
+  } else if (imm.value == 0 && cond == Assembler::NotEqual) {
+    Cbnz(ARMRegister(lhs, 32), label);
+  } else {
+    cmp32(lhs, imm);
+    B(label, cond);
+  }
 }
 
 void MacroAssembler::branch32(Condition cond, Register lhs, const Address& rhs,
@@ -889,8 +895,14 @@
 
 void MacroAssembler::branch64(Condition cond, Register64 lhs, Imm64 val,
                               Label* success, Label* fail) {
-  Cmp(ARMRegister(lhs.reg, 64), val.value);
-  B(success, cond);
+  if (val.value == 0 && cond == Assembler::Equal) {
+    Cbz(ARMRegister(lhs.reg, 64), success);
+  } else if (val.value == 0 && cond == Assembler::NotEqual) {
+    Cbnz(ARMRegister(lhs.reg, 64), success);
+  } else {
+    Cmp(ARMRegister(lhs.reg, 64), val.value);
+    B(success, cond);
+  }
   if (fail) {
     B(fail);
   }
@@ -934,14 +946,26 @@
 
 void MacroAssembler::branchPtr(Condition cond, Register lhs, Imm32 rhs,
                                Label* label) {
-  cmpPtr(lhs, rhs);
-  B(label, cond);
+  if (rhs.value == 0 && cond == Assembler::Equal) {
+    Cbz(ARMRegister(lhs, 64), label);
+  } else if (rhs.value == 0 && cond == Assembler::NotEqual) {
+    Cbnz(ARMRegister(lhs, 64), label);
+  } else {
+    cmpPtr(lhs, rhs);
+    B(label, cond);
+  }
 }
 
 void MacroAssembler::branchPtr(Condition cond, Register lhs, ImmPtr rhs,
                                Label* label) {
-  cmpPtr(lhs, rhs);
-  B(label, cond);
+  if (rhs.value == 0 && cond == Assembler::Equal) {
+    Cbz(ARMRegister(lhs, 64), label);
+  } else if (rhs.value == 0 && cond == Assembler::NotEqual) {
+    Cbnz(ARMRegister(lhs, 64), label);
+  } else {
+    cmpPtr(lhs, rhs);
+    B(label, cond);
+  }
 }
 
 void MacroAssembler::branchPtr(Condition cond, Register lhs, ImmGCPtr rhs,
@@ -955,8 +979,14 @@
 
 void MacroAssembler::branchPtr(Condition cond, Register lhs, ImmWord rhs,
                                Label* label) {
-  cmpPtr(lhs, rhs);
-  B(label, cond);
+  if (rhs.value == 0 && cond == Assembler::Equal) {
+    Cbz(ARMRegister(lhs, 64), label);
+  } else if (rhs.value == 0 && cond == Assembler::NotEqual) {
+    Cbnz(ARMRegister(lhs, 64), label);
+  } else {
+    cmpPtr(lhs, rhs);
+    B(label, cond);
+  }
 }
 
 template <class L>
@@ -1178,14 +1208,16 @@
                                   L label) {
   MOZ_ASSERT(cond == Zero || cond == NonZero || cond == Signed ||
              cond == NotSigned);
-  // x86 prefers |test foo, foo| to |cmp foo, #0|.
-  // Convert the former to the latter for ARM.
-  if (lhs == rhs && (cond == Zero || cond == NonZero)) {
-    cmp32(lhs, Imm32(0));
+  // The x86-biased front end prefers |test foo, foo| to |cmp foo, #0|.  We look
+  // for the former pattern and expand as Cbz/Cbnz when possible.
+  if (lhs == rhs && cond == Zero) {
+    Cbz(ARMRegister(lhs, 32), label);
+  } else if (lhs == rhs && cond == NonZero) {
+    Cbnz(ARMRegister(lhs, 32), label);
   } else {
     test32(lhs, rhs);
+    B(label, cond);
   }
-  B(label, cond);
 }
 
 template <class L>
@@ -1217,8 +1249,17 @@
 template <class L>
 void MacroAssembler::branchTestPtr(Condition cond, Register lhs, Register rhs,
                                    L label) {
-  Tst(ARMRegister(lhs, 64), Operand(ARMRegister(rhs, 64)));
-  B(label, cond);
+  // See branchTest32.
+  MOZ_ASSERT(cond == Zero || cond == NonZero || cond == Signed ||
+             cond == NotSigned);
+  if (lhs == rhs && cond == Zero) {
+    Cbz(ARMRegister(lhs, 64), label);
+  } else if (lhs == rhs && cond == NonZero) {
+    Cbnz(ARMRegister(lhs, 64), label);
+  } else {
+    Tst(ARMRegister(lhs, 64), Operand(ARMRegister(rhs, 64)));
+    B(label, cond);
+  }
 }
 
 void MacroAssembler::branchTestPtr(Condition cond, Register lhs, Imm32 rhs,
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/SharedICHelpers-arm64.h firefox-85.0+build1/js/src/jit/arm64/SharedICHelpers-arm64.h
--- firefox-84.0.2+build1/js/src/jit/arm64/SharedICHelpers-arm64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/SharedICHelpers-arm64.h	2021-01-18 19:58:13.000000000 +0000
@@ -39,22 +39,6 @@
   *callOffset = CodeOffset(masm.currentOffset());
 }
 
-inline void EmitEnterTypeMonitorIC(
-    MacroAssembler& masm,
-    size_t monitorStubOffset = ICMonitoredStub::offsetOfFirstMonitorStub()) {
-  // This is expected to be called from within an IC, when ICStubReg is
-  // properly initialized to point to the stub.
-  masm.loadPtr(Address(ICStubReg, (uint32_t)monitorStubOffset), ICStubReg);
-
-  // Load stubcode pointer from BaselineStubEntry.
-  // R2 won't be active when we call ICs, so we can use r0.
-  static_assert(R2 == ValueOperand(r0));
-  masm.loadPtr(Address(ICStubReg, ICStub::offsetOfStubCode()), r0);
-
-  // Jump to the stubcode.
-  masm.Br(x0);
-}
-
 inline void EmitReturnFromIC(MacroAssembler& masm) {
   masm.abiret();  // Defaults to lr.
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h firefox-85.0+build1/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h
--- firefox-84.0.2+build1/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/vixl/MozBaseAssembler-vixl.h	2021-01-18 19:58:13.000000000 +0000
@@ -27,13 +27,23 @@
 #ifndef jit_arm64_vixl_MozBaseAssembler_vixl_h
 #define jit_arm64_vixl_MozBaseAssembler_vixl_h
 
-#include "jit/arm64/vixl/Constants-vixl.h"
-#include "jit/arm64/vixl/Instructions-vixl.h"
 
-#include "jit/Label.h"
-#include "jit/shared/Assembler-shared.h"
-#include "jit/shared/Disassembler-shared.h"
-#include "jit/shared/IonAssemblerBufferWithConstantPools.h"
+#include "mozilla/Assertions.h"  // MOZ_ASSERT
+#include "mozilla/Sprintf.h"     // SprintfLiteral
+
+#include <stddef.h>  // size_t
+#include <stdint.h>  // uint8_t, uint32_t
+#include <string.h>  // strstr
+
+#include "jit/arm64/vixl/Constants-vixl.h"     // vixl::{HINT, NOP, ImmHint_offset}
+#include "jit/arm64/vixl/Globals-vixl.h"       // VIXL_ASSERT
+#include "jit/arm64/vixl/Instructions-vixl.h"  // vixl::{Instruction, NumShortBranchRangeTypes, Instr, ImmBranchRangeType}
+
+#include "jit/Label.h"                       // jit::Label
+#include "jit/shared/Assembler-shared.h"     // jit::AssemblerShared
+#include "jit/shared/Disassembler-shared.h"  // jit::DisassemblerSpew
+#include "jit/shared/IonAssemblerBuffer.h"   // jit::BufferOffset
+#include "jit/shared/IonAssemblerBufferWithConstantPools.h"  // jit::AssemblerBufferWithConstantPools
 
 namespace vixl {
 
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp firefox-85.0+build1/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
--- firefox-84.0.2+build1/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -981,7 +981,7 @@
 
 #ifdef JS_CACHE_SIMULATOR_ARM64
 void SimulatorProcess::recordICacheFlush(void* start, size_t length) {
-  MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+  singleton_->lock_.assertOwnedByCurrentThread();
   AutoEnterOOMUnsafeRegion oomUnsafe;
   ICacheFlush range{start, length};
   for (auto& s : singleton_->pendingFlushes_) {
@@ -992,14 +992,14 @@
 }
 
 void SimulatorProcess::membarrier() {
-  MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+  singleton_->lock_.assertOwnedByCurrentThread();
   for (auto& s : singleton_->pendingFlushes_) {
     s.thread->pendingCacheRequests = true;
   }
 }
 
 SimulatorProcess::ICacheFlushes& SimulatorProcess::getICacheFlushes(Simulator* sim) {
-  MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+  singleton_->lock_.assertOwnedByCurrentThread();
   for (auto& s : singleton_->pendingFlushes_) {
     if (s.thread == sim) {
       return s.records;
@@ -1009,14 +1009,14 @@
 }
 
 bool SimulatorProcess::registerSimulator(Simulator* sim) {
-  MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+  singleton_->lock_.assertOwnedByCurrentThread();
   ICacheFlushes empty;
   SimFlushes simFlushes{sim, std::move(empty)};
   return singleton_->pendingFlushes_.append(std::move(simFlushes));
 }
 
 void SimulatorProcess::unregisterSimulator(Simulator* sim) {
-  MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+  singleton_->lock_.assertOwnedByCurrentThread();
   for (auto& s : singleton_->pendingFlushes_) {
     if (s.thread == sim) {
       singleton_->pendingFlushes_.erase(&s);
diff -Nru firefox-84.0.2+build1/js/src/jit/arm64/vixl/Simulator-vixl.h firefox-85.0+build1/js/src/jit/arm64/vixl/Simulator-vixl.h
--- firefox-84.0.2+build1/js/src/jit/arm64/vixl/Simulator-vixl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/arm64/vixl/Simulator-vixl.h	2021-01-18 19:58:13.000000000 +0000
@@ -2530,12 +2530,12 @@
 #endif
 
   static void setRedirection(vixl::Redirection* redirection) {
-    MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+    singleton_->lock_.assertOwnedByCurrentThread();
     singleton_->redirection_ = redirection;
   }
 
   static vixl::Redirection* redirection() {
-    MOZ_ASSERT(singleton_->lock_.ownedByCurrentThread());
+    singleton_->lock_.assertOwnedByCurrentThread();
     return singleton_->redirection_;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/AutoDetectInvalidation.cpp firefox-85.0+build1/js/src/jit/AutoDetectInvalidation.cpp
--- firefox-84.0.2+build1/js/src/jit/AutoDetectInvalidation.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/AutoDetectInvalidation.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +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 "jit/AutoDetectInvalidation.h"
-
-#include "jit/JitFrames.h"
-#include "vm/JSContext.h"
-
-#include "vm/JSScript-inl.h"
-
-namespace js::jit {
-
-AutoDetectInvalidation::AutoDetectInvalidation(JSContext* cx,
-                                               MutableHandleValue rval)
-    : cx_(cx),
-      ionScript_(GetTopJitJSScript(cx)->ionScript()),
-      rval_(rval),
-      disabled_(false) {}
-
-void AutoDetectInvalidation::setReturnOverride() {
-  cx_->setIonReturnOverride(rval_.get());
-}
-
-}  // namespace js::jit
diff -Nru firefox-84.0.2+build1/js/src/jit/AutoDetectInvalidation.h firefox-85.0+build1/js/src/jit/AutoDetectInvalidation.h
--- firefox-84.0.2+build1/js/src/jit/AutoDetectInvalidation.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/AutoDetectInvalidation.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +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 jit_AutoDetectInvalidation_h
-#define jit_AutoDetectInvalidation_h
-
-#include "mozilla/Assertions.h"
-#include "mozilla/Likely.h"
-
-#include "NamespaceImports.h"
-
-#include "jit/IonScript.h"
-#include "js/RootingAPI.h"
-#include "js/TypeDecls.h"
-
-namespace js::jit {
-
-class AutoDetectInvalidation {
-  JSContext* cx_;
-  IonScript* ionScript_;
-  MutableHandleValue rval_;
-  bool disabled_;
-
-  void setReturnOverride();
-
- public:
-  AutoDetectInvalidation(JSContext* cx, MutableHandleValue rval,
-                         IonScript* ionScript)
-      : cx_(cx), ionScript_(ionScript), rval_(rval), disabled_(false) {
-    MOZ_ASSERT(ionScript);
-  }
-
-  AutoDetectInvalidation(JSContext* cx, MutableHandleValue rval);
-
-  void disable() {
-    MOZ_ASSERT(!disabled_);
-    disabled_ = true;
-  }
-
-  bool shouldSetReturnOverride() const {
-    return !disabled_ && ionScript_->invalidated();
-  }
-
-  ~AutoDetectInvalidation() {
-    if (MOZ_UNLIKELY(shouldSetReturnOverride())) {
-      setReturnOverride();
-    }
-  }
-};
-
-}  // namespace js::jit
-
-#endif /* jit_AutoDetectInvalidation_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/Bailouts.cpp firefox-85.0+build1/js/src/jit/Bailouts.cpp
--- firefox-84.0.2+build1/js/src/jit/Bailouts.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Bailouts.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/ScopeExit.h"
 
 #include "jit/BaselineJIT.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/JitFrames.h"
 #include "jit/JitRuntime.h"
@@ -42,7 +43,6 @@
 bool jit::Bailout(BailoutStack* sp, BaselineBailoutInfo** bailoutInfo) {
   JSContext* cx = TlsContext.get();
   MOZ_ASSERT(bailoutInfo);
-  MOZ_ASSERT(!cx->hasIonReturnOverride());
 
   // We don't have an exit frame.
   MOZ_ASSERT(IsInRange(FAKE_EXITFP_FOR_BAILOUT, 0, 0x1000) &&
@@ -147,7 +147,11 @@
                                       bailoutInfo, /*exceptionInfo=*/nullptr);
   MOZ_ASSERT_IF(success, *bailoutInfo != nullptr);
 
-  if (!success) {
+  if (success) {
+    // Update the bailout kind.
+    (*bailoutInfo)->bailoutKind =
+        mozilla::Some(BailoutKind::OnStackInvalidation);
+  } else {
     MOZ_ASSERT(cx->isExceptionPending());
 
     // If the bailout failed, then bailout trampoline will pop the
@@ -288,8 +292,8 @@
       // the first execution bailout can be related to an inlined script,
       // so there is no need to penalize the caller.
       if (bailoutKind != BailoutKind::FirstExecution &&
-          !script->hadFrequentBailouts()) {
-        script->setHadFrequentBailouts();
+          !script->hadLICMInvalidation()) {
+        script->setHadLICMInvalidation();
       }
 
       JitSpew(JitSpew_IonInvalidate, "Invalidating due to too many bailouts");
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineBailouts.cpp firefox-85.0+build1/js/src/jit/BaselineBailouts.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineBailouts.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineBailouts.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -13,6 +13,7 @@
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
 #include "jit/CalleeToken.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/IonScript.h"
 #include "jit/JitFrames.h"
@@ -22,6 +23,7 @@
 #include "jit/mips64/Simulator-mips64.h"
 #include "jit/Recover.h"
 #include "jit/RematerializedFrame.h"
+#include "jit/SharedICRegisters.h"
 #include "js/friend/StackLimits.h"  // js::CheckRecursionLimitWithStackPointerDontReport, js::ReportOverRecursed
 #include "js/Utility.h"
 #include "util/Memory.h"
@@ -366,8 +368,6 @@
 
   void setResumeAddr(void* resumeAddr) { header_->resumeAddr = resumeAddr; }
 
-  void setMonitorPC(jsbytecode* pc) { header_->monitorPC = pc; }
-
   void setFrameSizeOfInnerMostFrame(uint32_t size) {
     header_->frameSizeOfInnerMostFrame = size;
   }
@@ -606,114 +606,84 @@
     flags |= BaselineFrame::DEBUGGEE;
   }
 
+  // Get |envChain|.
   JSObject* envChain = nullptr;
-  Value returnValue = UndefinedValue();
-  ArgumentsObject* argsObj = nullptr;
-
-  BailoutKind bailoutKind = iter_.bailoutKind();
-  if (bailoutKind == BailoutKind::ArgumentCheck) {
-    // We may fail before the envChain slot is set. Skip it and use
-    // the function's initial environment.  This will be fixed up
-    // later if needed in |FinishBailoutToBaseline|, which calls
-    // |EnsureHasEnvironmentObjects|.
-    JitSpew(JitSpew_BaselineBailouts,
-            "      BailoutKind::ArgumentCheck! Using function's environment");
-    envChain = fun_->environment();
-
-    // Skip envChain.
-    iter_.skip();
-
-    // Skip return value.
-    iter_.skip();
-
-    // Scripts with |argumentsHasVarBinding| have an extra slot.
-    // Skip argsObj if present.
-    if (script_->argumentsHasVarBinding()) {
-      JitSpew(JitSpew_BaselineBailouts,
-              "      BailoutKind::ArgumentCheck for script with "
-              "argumentsHasVarBinding! "
-              "Using empty arguments object");
-      iter_.skip();
+  Value envChainSlot = iter_.read();
+  if (envChainSlot.isObject()) {
+    // The env slot has been updated from UndefinedValue. It must be the
+    // complete initial environment.
+    envChain = &envChainSlot.toObject();
+
+    // Set the HAS_INITIAL_ENV flag if needed.
+    if (fun_ && fun_->needsFunctionEnvironmentObjects()) {
+      MOZ_ASSERT(fun_->nonLazyScript()->initialEnvironmentShape());
+      MOZ_ASSERT(!fun_->needsExtraBodyVarEnvironment());
+      flags |= BaselineFrame::HAS_INITIAL_ENV;
     }
   } else {
-    // Get |envChain|.
-    Value envChainSlot = iter_.read();
-    if (envChainSlot.isObject()) {
-      // The env slot has been updated from UndefinedValue. It must be the
-      // complete initial environment.
-      envChain = &envChainSlot.toObject();
-
-      // Set the HAS_INITIAL_ENV flag if needed.
-      if (fun_ && fun_->needsFunctionEnvironmentObjects()) {
-        MOZ_ASSERT(fun_->nonLazyScript()->initialEnvironmentShape());
-        MOZ_ASSERT(!fun_->needsExtraBodyVarEnvironment());
-        flags |= BaselineFrame::HAS_INITIAL_ENV;
-      }
-    } else {
-      MOZ_ASSERT(envChainSlot.isUndefined() ||
-                 envChainSlot.isMagic(JS_OPTIMIZED_OUT));
-      MOZ_ASSERT(envChainSlotCanBeOptimized());
-
-      // The env slot has been optimized out.
-      // Get it from the function or script.
-      if (fun_) {
-        envChain = fun_->environment();
-      } else if (script_->module()) {
-        envChain = script_->module()->environment();
-      } else {
-        // For global scripts without a non-syntactic env the env
-        // chain is the script's global lexical environment. (We do
-        // not compile scripts with a non-syntactic global scope).
-        // Also note that it's invalid to resume into the prologue in
-        // this case because the prologue expects the env chain in R1
-        // for eval and global scripts.
-        MOZ_ASSERT(!script_->isForEval());
-        MOZ_ASSERT(!script_->hasNonSyntacticScope());
-        envChain = &(script_->global().lexicalEnvironment());
-      }
-    }
-
-    // Get |returnValue| if present.
-    if (script_->noScriptRval()) {
-      // Don't use the return value (likely a JS_OPTIMIZED_OUT MagicValue) to
-      // not confuse Baseline.
-      iter_.skip();
+    MOZ_ASSERT(envChainSlot.isUndefined() ||
+               envChainSlot.isMagic(JS_OPTIMIZED_OUT));
+    MOZ_ASSERT(envChainSlotCanBeOptimized());
+
+    // The env slot has been optimized out.
+    // Get it from the function or script.
+    if (fun_) {
+      envChain = fun_->environment();
+    } else if (script_->module()) {
+      envChain = script_->module()->environment();
     } else {
-      returnValue = iter_.read();
-      flags |= BaselineFrame::HAS_RVAL;
-    }
-
-    // Get |argsObj| if present.
-    if (script_->argumentsHasVarBinding()) {
-      Value maybeArgsObj = iter_.read();
-      MOZ_ASSERT(maybeArgsObj.isObject() || maybeArgsObj.isUndefined() ||
-                 maybeArgsObj.isMagic(JS_OPTIMIZED_OUT));
-      if (maybeArgsObj.isObject()) {
-        argsObj = &maybeArgsObj.toObject().as<ArgumentsObject>();
-      }
+      // For global scripts without a non-syntactic env the env
+      // chain is the script's global lexical environment. (We do
+      // not compile scripts with a non-syntactic global scope).
+      // Also note that it's invalid to resume into the prologue in
+      // this case because the prologue expects the env chain in R1
+      // for eval and global scripts.
+      MOZ_ASSERT(!script_->isForEval());
+      MOZ_ASSERT(!script_->hasNonSyntacticScope());
+      envChain = &(script_->global().lexicalEnvironment());
     }
   }
-  MOZ_ASSERT(envChain);
 
   // Write |envChain|.
+  MOZ_ASSERT(envChain);
   JitSpew(JitSpew_BaselineBailouts, "      EnvChain=%p", envChain);
   blFrame()->setEnvironmentChain(envChain);
 
+  // Get |returnValue| if present.
+  Value returnValue = UndefinedValue();
+  if (script_->noScriptRval()) {
+    // Don't use the return value (likely a JS_OPTIMIZED_OUT MagicValue) to
+    // not confuse Baseline.
+    iter_.skip();
+  } else {
+    returnValue = iter_.read();
+    flags |= BaselineFrame::HAS_RVAL;
+  }
+
   // Write |returnValue|.
   JitSpew(JitSpew_BaselineBailouts, "      ReturnValue=%016" PRIx64,
           *((uint64_t*)&returnValue));
   blFrame()->setReturnValue(returnValue);
 
+  // Get |argsObj| if present.
+  ArgumentsObject* argsObj = nullptr;
+  if (script_->argumentsHasVarBinding()) {
+    Value maybeArgsObj = iter_.read();
+    MOZ_ASSERT(maybeArgsObj.isObject() || maybeArgsObj.isUndefined() ||
+               maybeArgsObj.isMagic(JS_OPTIMIZED_OUT));
+    if (maybeArgsObj.isObject()) {
+      argsObj = &maybeArgsObj.toObject().as<ArgumentsObject>();
+    }
+  }
+
   // Note: we do not need to initialize the scratchValue field in BaselineFrame.
 
   // Write |flags|.
   blFrame()->setFlags(flags);
 
   // Write |icScript|.
-  if (JitOptions.warpBuilder) {
-    JitSpew(JitSpew_BaselineBailouts, "      ICScript=%p", icScript_);
-    blFrame()->setICScript(icScript_);
-  }
+  JitSpew(JitSpew_BaselineBailouts, "      ICScript=%p", icScript_);
+  blFrame()->setICScript(icScript_);
 
   // initArgsObjUnchecked modifies the frame's flags, so call it after setFlags.
   if (argsObj) {
@@ -912,17 +882,7 @@
           exprStackSlots());
   for (uint32_t i = 0; i < exprStackSlots(); i++) {
     Value v;
-
-    if (!iter_.moreFrames() && i == exprStackSlots() - 1 &&
-        cx_->hasIonReturnOverride()) {
-      // If coming from an invalidation bailout, and this is the topmost
-      // value, and a value override has been specified, don't read from the
-      // iterator. Otherwise, we risk using a garbage value.
-      // TODO(post-Warp): Remove value overrides and AutoDetectInvalidation.
-      iter_.skip();
-      JitSpew(JitSpew_BaselineBailouts, "      [Return Override]");
-      v = cx_->takeIonReturnOverride();
-    } else if (propagatingIonExceptionForDebugMode()) {
+    if (propagatingIonExceptionForDebugMode()) {
       // If we are in the middle of propagating an exception from Ion by
       // bailing to baseline due to debug mode, we might not have all
       // the stack if we are at the newest frame.
@@ -1146,16 +1106,6 @@
     return false;
   }
 
-  // Ensure we have a TypeMonitor fallback stub so we don't crash in JIT code
-  // when we try to enter it. See callers of offsetOfFallbackMonitorStub.
-  if (BytecodeOpHasTypeSet(op_) && IsTypeInferenceEnabled()) {
-    ICFallbackStub* fallbackStub = icEntry.fallbackStub();
-    if (!fallbackStub->toMonitoredFallbackStub()->getFallbackMonitorStub(
-            cx_, script_)) {
-      return false;
-    }
-  }
-
   // Push return address into ICCall_Scripted stub, immediately after the call.
   void* baselineCallReturnAddr = getStubReturnAddress();
   MOZ_ASSERT(baselineCallReturnAddr);
@@ -1312,11 +1262,6 @@
     blFrame()->setInterpreterFields(script_, throwPC);
     resumeAddr = baselineInterp.interpretOpAddr().value;
   } else {
-    // If the opcode is monitored we should monitor the top stack value when
-    // we finish the bailout in FinishBailoutToBaseline.
-    if (resumeAfter() && BytecodeOpHasTypeSet(op_)) {
-      setMonitorPC(pc_);
-    }
     jsbytecode* resumePC = getResumePC();
     blFrame()->setInterpreterFields(script_, resumePC);
     resumeAddr = baselineInterp.interpretOpAddr().value;
@@ -1817,61 +1762,6 @@
   Invalidate(cx, outerScript);
 }
 
-static void HandleBoundsCheckFailure(JSContext* cx, HandleScript outerScript,
-                                     HandleScript innerScript) {
-  JitSpew(JitSpew_IonBailouts,
-          "Bounds check failure %s:%u:%u, inlined into %s:%u:%u",
-          innerScript->filename(), innerScript->lineno(), innerScript->column(),
-          outerScript->filename(), outerScript->lineno(),
-          outerScript->column());
-
-  if (!innerScript->failedBoundsCheck()) {
-    innerScript->setFailedBoundsCheck();
-  }
-
-  InvalidateAfterBailout(cx, outerScript, "bounds check failure");
-  if (innerScript->hasIonScript()) {
-    Invalidate(cx, innerScript);
-  }
-}
-
-static void HandleShapeGuardFailure(JSContext* cx, HandleScript outerScript,
-                                    HandleScript innerScript) {
-  if (JitOptions.warpBuilder) {
-    // Warp handles this by invalidating when the IC stub changes.
-    return;
-  }
-
-  JitSpew(JitSpew_IonBailouts,
-          "Shape guard failure %s:%u:%u, inlined into %s:%u:%u",
-          innerScript->filename(), innerScript->lineno(), innerScript->column(),
-          outerScript->filename(), outerScript->lineno(),
-          outerScript->column());
-
-  // TODO: Currently this mimic's Ion's handling of this case.  Investigate
-  // setting the flag on innerScript as opposed to outerScript, and maybe
-  // invalidating both inner and outer scripts, instead of just the outer one.
-  outerScript->setFailedShapeGuard();
-
-  InvalidateAfterBailout(cx, outerScript, "shape guard failure");
-}
-
-static void HandleBaselineInfoBailout(JSContext* cx, HandleScript outerScript,
-                                      HandleScript innerScript) {
-  if (JitOptions.warpBuilder) {
-    // Warp handles this by invalidating when the IC stub changes.
-    return;
-  }
-
-  JitSpew(JitSpew_IonBailouts,
-          "Baseline info failure %s:%u:%u, inlined into %s:%u:%u",
-          innerScript->filename(), innerScript->lineno(), innerScript->column(),
-          outerScript->filename(), outerScript->lineno(),
-          outerScript->column());
-
-  InvalidateAfterBailout(cx, outerScript, "invalid baseline info");
-}
-
 static void HandleLexicalCheckFailure(JSContext* cx, HandleScript outerScript,
                                       HandleScript innerScript) {
   JitSpew(JitSpew_IonBailouts,
@@ -1964,29 +1854,6 @@
     return false;
   }
 
-  // Monitor the top stack value if we are resuming after a JOF_TYPESET op.
-  if (jsbytecode* monitorPC = bailoutInfo->monitorPC) {
-    MOZ_ASSERT(BytecodeOpHasTypeSet(JSOp(*monitorPC)));
-    MOZ_ASSERT(GetNextPc(monitorPC) == topFrame->interpreterPC());
-
-    RootedScript script(cx, topFrame->script());
-    uint32_t monitorOffset = script->pcToOffset(monitorPC);
-    ICEntry& icEntry = script->jitScript()->icEntryFromPCOffset(monitorOffset);
-    ICFallbackStub* fallbackStub = icEntry.fallbackStub();
-
-    // Not every monitored op has a monitored fallback stub, e.g.
-    // JSOp::NewObject, which always returns the same type for a
-    // particular script/pc location.
-    if (fallbackStub->isMonitoredFallback()) {
-      ICMonitoredFallbackStub* stub = fallbackStub->toMonitoredFallbackStub();
-      uint32_t frameSize = bailoutInfo->frameSizeOfInnerMostFrame;
-      RootedValue val(cx, topFrame->topStackValue(frameSize));
-      if (!TypeMonitorResult(cx, stub, topFrame, script, monitorPC, val)) {
-        return false;
-      }
-    }
-  }
-
   // Create arguments objects for bailed out frames, to maintain the invariant
   // that script->needsArgsObj() implies frame->hasArgsObj().
   RootedScript innerScript(cx, nullptr);
@@ -2114,58 +1981,64 @@
           innerScript->getWarmUpCount(), (unsigned)bailoutKind);
 
   switch (bailoutKind) {
-    // Normal bailouts.
+    case BailoutKind::TranspiledCacheIR:
+      // Do nothing. The baseline fallback code will invalidate the script
+      // if necessary to prevent bailout loops.
+      break;
+
+    case BailoutKind::SpeculativePhi:
+      // A value of an unexpected type flowed into a phi.
+      MOZ_ASSERT(!outerScript->hadSpeculativePhiBailout());
+      outerScript->setHadSpeculativePhiBailout();
+      InvalidateAfterBailout(cx, outerScript, "phi specialization failure");
+      break;
+
+    case BailoutKind::TypePolicy:
+      // A conversion inserted by a type policy failed.
+      // TODO: invalidate and disable recompilation if this happens too often.
+      break;
+
+    case BailoutKind::LICM:
+      // LICM may cause spurious bailouts by hoisting unreachable
+      // guards past branches.  To prevent bailout loops, when an
+      // instruction hoisted by LICM bails out, we set a flag on the
+      // IonScript and resume in baseline. If the guard would have
+      // been executed anyway, then the baseline fallback code will
+      // invalidate the script. Otherwise, the next time we reach this
+      // point, we will invalidate the script and disable LICM.
+      MOZ_ASSERT(!outerScript->hadLICMInvalidation());
+      if (outerScript->hasIonScript()) {
+        if (outerScript->ionScript()->hadLICMBailout()) {
+          outerScript->setHadLICMInvalidation();
+          InvalidateAfterBailout(cx, outerScript, "LICM failure");
+        } else {
+          outerScript->ionScript()->setHadLICMBailout();
+        }
+      }
+      break;
+
+    case BailoutKind::HoistBoundsCheck:
+      // An instruction hoisted or generated by tryHoistBoundsCheck bailed out.
+      MOZ_ASSERT(!outerScript->failedBoundsCheck());
+      outerScript->setFailedBoundsCheck();
+      InvalidateAfterBailout(cx, outerScript, "bounds check failure");
+      break;
+
+    case BailoutKind::EagerTruncation:
+      // An eager truncation generated by range analysis bailed out.
+      MOZ_ASSERT(!outerScript->hadEagerTruncationBailout());
+      outerScript->setHadEagerTruncationBailout();
+      InvalidateAfterBailout(cx, outerScript, "eager range analysis failure");
+      break;
+
+    case BailoutKind::TooManyArguments:
+      // A funapply or spread call had more than JIT_ARGS_LENGTH_MAX arguments.
+      // TODO: Invalidate and disable recompilation if this happens too often.
+      break;
+
     case BailoutKind::Inevitable:
     case BailoutKind::DuringVMCall:
-    case BailoutKind::TooManyArguments:
-    case BailoutKind::DynamicNameNotFound:
-    case BailoutKind::Overflow:
-    case BailoutKind::Round:
-    case BailoutKind::NonPrimitiveInput:
-    case BailoutKind::PrecisionLoss:
-    case BailoutKind::TypeBarrierO:
-    case BailoutKind::TypeBarrierV:
-    case BailoutKind::ValueGuard:
-    case BailoutKind::NullOrUndefinedGuard:
-    case BailoutKind::Hole:
-    case BailoutKind::NoDenseElementsGuard:
-    case BailoutKind::NegativeIndex:
-    case BailoutKind::NonInt32Input:
-    case BailoutKind::NonNumericInput:
-    case BailoutKind::NonBooleanInput:
-    case BailoutKind::NonObjectInput:
-    case BailoutKind::NonStringInput:
-    case BailoutKind::NonSymbolInput:
-    case BailoutKind::NonBigIntInput:
     case BailoutKind::Debugger:
-    case BailoutKind::SpecificAtomGuard:
-    case BailoutKind::SpecificSymbolGuard:
-    case BailoutKind::StringToIndexGuard:
-    case BailoutKind::StringToInt32Guard:
-    case BailoutKind::StringToDoubleGuard:
-    case BailoutKind::NonInt32ArrayLength:
-    case BailoutKind::FunctionLength:
-    case BailoutKind::FunctionName:
-    case BailoutKind::InvalidCodePoint:
-    case BailoutKind::ProtoGuard:
-    case BailoutKind::ProxyGuard:
-    case BailoutKind::NotProxyGuard:
-    case BailoutKind::NotDOMProxyGuard:
-    case BailoutKind::NotArrayBufferMaybeSharedGuard:
-    case BailoutKind::TypedArrayGuard:
-    case BailoutKind::MegamorphicAccess:
-    case BailoutKind::ArgumentsObjectAccess:
-    case BailoutKind::ArrayPopShift:
-    case BailoutKind::ArraySlice:
-    case BailoutKind::TagNotEqualGuard:
-    case BailoutKind::FunctionFlagsGuard:
-    case BailoutKind::FunctionIsNonBuiltinCtorGuard:
-    case BailoutKind::FunctionKindGuard:
-    case BailoutKind::FunctionScriptGuard:
-    case BailoutKind::PackedArrayGuard:
-    case BailoutKind::HasGetterSetterGuard:
-    case BailoutKind::DOMExpandoValueGenerationGuard:
-    case BailoutKind::DOMExpandoMissingOrShapeGuard:
       // Do nothing.
       break;
 
@@ -2175,37 +2048,25 @@
       // script.
       break;
 
-    // Invalid assumption based on baseline code.
-    case BailoutKind::OverflowInvalidate:
-      outerScript->setHadOverflowBailout();
-      [[fallthrough]];
-    case BailoutKind::DoubleOutput:
-    case BailoutKind::ObjectIdentityOrTypeGuard:
-      HandleBaselineInfoBailout(cx, outerScript, innerScript);
-      break;
-
     case BailoutKind::NotOptimizedArgumentsGuard:
       // Optimized-arguments escaped to a slow path. Disable the optimization to
       // prevent bailout loops.
       JSScript::argumentsOptimizationFailed(cx, innerScript);
       break;
 
-    case BailoutKind::ArgumentCheck:
-      // Do nothing, bailout will resume before the argument monitor ICs.
-      break;
-    case BailoutKind::BoundsCheck:
-      HandleBoundsCheckFailure(cx, outerScript, innerScript);
-      break;
-    case BailoutKind::ShapeGuard:
-      HandleShapeGuardFailure(cx, outerScript, innerScript);
-      break;
     case BailoutKind::UninitializedLexical:
       HandleLexicalCheckFailure(cx, outerScript, innerScript);
       break;
+
     case BailoutKind::IonExceptionDebugMode:
       // Return false to resume in HandleException with reconstructed
       // baseline frame.
       return false;
+
+    case BailoutKind::OnStackInvalidation:
+      // The script has already been invalidated. There is nothing left to do.
+      break;
+
     default:
       MOZ_CRASH("Unknown bailout kind!");
   }
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineCacheIRCompiler.cpp firefox-85.0+build1/js/src/jit/BaselineCacheIRCompiler.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineCacheIRCompiler.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineCacheIRCompiler.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -52,13 +52,12 @@
 }
 
 // BaselineCacheIRCompiler compiles CacheIR to BaselineIC native code.
-BaselineCacheIRCompiler::BaselineCacheIRCompiler(
-    JSContext* cx, const CacheIRWriter& writer, uint32_t stubDataOffset,
-    BaselineCacheIRStubKind stubKind)
+BaselineCacheIRCompiler::BaselineCacheIRCompiler(JSContext* cx,
+                                                 const CacheIRWriter& writer,
+                                                 uint32_t stubDataOffset)
     : CacheIRCompiler(cx, writer, stubDataOffset, Mode::Baseline,
                       StubFieldPolicy::Address),
-      makesGCCalls_(false),
-      kind_(stubKind) {}
+      makesGCCalls_(false) {}
 
 // AutoStubFrame methods
 AutoStubFrame::AutoStubFrame(BaselineCacheIRCompiler& compiler)
@@ -136,18 +135,6 @@
   EmitBaselineTailCallVM(code, masm, argSize);
 }
 
-static size_t GetEnteredOffset(BaselineCacheIRStubKind kind) {
-  switch (kind) {
-    case BaselineCacheIRStubKind::Regular:
-      return ICCacheIR_Regular::offsetOfEnteredCount();
-    case BaselineCacheIRStubKind::Updated:
-      return ICCacheIR_Updated::offsetOfEnteredCount();
-    case BaselineCacheIRStubKind::Monitored:
-      return ICCacheIR_Monitored::offsetOfEnteredCount();
-  }
-  MOZ_CRASH("unhandled BaselineCacheIRStubKind");
-}
-
 JitCode* BaselineCacheIRCompiler::compile() {
 #ifndef JS_USE_LINK_REGISTER
   // The first value contains the return addres,
@@ -159,7 +146,7 @@
 #endif
   // Count stub entries: We count entries rather than successes as it much
   // easier to ensure ICStubReg is valid at entry than at exit.
-  Address enteredCount(ICStubReg, GetEnteredOffset(kind_));
+  Address enteredCount(ICStubReg, ICCacheIRStub::offsetOfEnteredCount());
   masm.add32(Imm32(1), enteredCount);
 
   CacheIRReader reader(writer_);
@@ -860,93 +847,20 @@
   return true;
 }
 
-bool BaselineCacheIRCompiler::callTypeUpdateIC(
-    Register obj, ValueOperand val, Register scratch,
-    LiveGeneralRegisterSet saveRegs) {
-  // Ensure the stack is empty for the VM call below.
-  allocator.discardStack(masm);
-
-  if (!IsTypeInferenceEnabled()) {
-    return true;
-  }
-
-  // R0 contains the value that needs to be typechecked.
-  MOZ_ASSERT(val == R0);
-  MOZ_ASSERT(scratch == R1.scratchReg());
-
-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-  static const bool CallClobbersTailReg = false;
-#else
-  static const bool CallClobbersTailReg = true;
-#endif
-
-  // Call the first type update stub.
-  if (CallClobbersTailReg) {
-    masm.push(ICTailCallReg);
-  }
-  masm.push(ICStubReg);
-  masm.loadPtr(Address(ICStubReg, ICCacheIR_Updated::offsetOfFirstUpdateStub()),
-               ICStubReg);
-  masm.call(Address(ICStubReg, ICStub::offsetOfStubCode()));
-  masm.pop(ICStubReg);
-  if (CallClobbersTailReg) {
-    masm.pop(ICTailCallReg);
-  }
-
-  // The update IC will store 0 or 1 in |scratch|, R1.scratchReg(), reflecting
-  // if the value in R0 type-checked properly or not.
-  Label done;
-  masm.branch32(Assembler::Equal, scratch, Imm32(1), &done);
-
-  AutoStubFrame stubFrame(*this);
-  stubFrame.enter(masm, scratch, CallCanGC::CanNotGC);
-
-  masm.PushRegsInMask(saveRegs);
-
-  masm.Push(val);
-  masm.Push(TypedOrValueRegister(MIRType::Object, AnyRegister(obj)));
-  masm.Push(ICStubReg);
-
-  // Load previous frame pointer, push BaselineFrame*.
-  masm.loadPtr(Address(BaselineFrameReg, 0), scratch);
-  masm.pushBaselineFramePtr(scratch, scratch);
-
-  using Fn = bool (*)(JSContext*, BaselineFrame*, ICCacheIR_Updated*,
-                      HandleValue, HandleValue);
-  callVM<Fn, DoTypeUpdateFallback>(masm);
-
-  masm.PopRegsInMask(saveRegs);
-
-  stubFrame.leave(masm);
-
-  masm.bind(&done);
-  return true;
-}
-
 bool BaselineCacheIRCompiler::emitStoreSlotShared(bool isFixed,
                                                   ObjOperandId objId,
                                                   uint32_t offsetOffset,
                                                   ValOperandId rhsId) {
-  Address offsetAddr = stubAddress(offsetOffset);
-
-  // Allocate the fixed registers first. These need to be fixed for
-  // callTypeUpdateIC.
-  AutoScratchRegister scratch1(allocator, masm, R1.scratchReg());
-  ValueOperand val = allocator.useFixedValueRegister(masm, rhsId, R0);
-
   Register obj = allocator.useRegister(masm, objId);
+  ValueOperand val = allocator.useValueRegister(masm, rhsId);
+
+  AutoScratchRegister scratch1(allocator, masm);
   Maybe<AutoScratchRegister> scratch2;
   if (!isFixed) {
     scratch2.emplace(allocator, masm);
   }
 
-  LiveGeneralRegisterSet saveRegs;
-  saveRegs.add(obj);
-  saveRegs.add(val);
-  if (!callTypeUpdateIC(obj, val, scratch1, saveRegs)) {
-    return false;
-  }
-
+  Address offsetAddr = stubAddress(offsetOffset);
   masm.load32(offsetAddr, scratch1);
 
   if (isFixed) {
@@ -980,27 +894,20 @@
 
 bool BaselineCacheIRCompiler::emitAddAndStoreSlotShared(
     CacheOp op, ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-    Maybe<uint32_t> numNewSlotsOffset) {
-  Address offsetAddr = stubAddress(offsetOffset);
-
-  // Allocate the fixed registers first. These need to be fixed for
-  // callTypeUpdateIC.
-  AutoScratchRegister scratch1(allocator, masm, R1.scratchReg());
-  ValueOperand val = allocator.useFixedValueRegister(masm, rhsId, R0);
-
+    uint32_t newShapeOffset, Maybe<uint32_t> numNewSlotsOffset) {
   Register obj = allocator.useRegister(masm, objId);
+  ValueOperand val = allocator.useValueRegister(masm, rhsId);
+
+  AutoScratchRegister scratch1(allocator, masm);
   AutoScratchRegister scratch2(allocator, masm);
 
-  Address newGroupAddr = stubAddress(newGroupOffset);
   Address newShapeAddr = stubAddress(newShapeOffset);
+  Address offsetAddr = stubAddress(offsetOffset);
 
   if (op == CacheOp::AllocateAndStoreDynamicSlot) {
     // We have to (re)allocate dynamic slots. Do this first, as it's the
-    // only fallible operation here. This simplifies the callTypeUpdateIC
-    // call below: it does not have to worry about saving registers used by
-    // failure paths. Note that growSlotsPure is fallible but does
-    // not GC.
+    // only fallible operation here. Note that growSlotsPure is fallible but
+    // does not GC.
     Address numNewSlotsAddr = stubAddress(*numNewSlotsOffset);
 
     FailurePath* failure;
@@ -1029,30 +936,6 @@
     masm.branchIfFalseBool(scratch1, failure->label());
   }
 
-  LiveGeneralRegisterSet saveRegs;
-  saveRegs.add(obj);
-  saveRegs.add(val);
-  if (!callTypeUpdateIC(obj, val, scratch1, saveRegs)) {
-    return false;
-  }
-
-  if (changeGroup) {
-    // Changing object's group from a partially to fully initialized group,
-    // per the acquired properties analysis. Only change the group if the
-    // old group still has a newScript. This only applies to PlainObjects.
-    Label noGroupChange;
-    masm.branchIfObjGroupHasNoAddendum(obj, scratch1, &noGroupChange);
-
-    // Update the object's group.
-    masm.loadPtr(newGroupAddr, scratch1);
-    masm.storeObjGroup(scratch1, obj,
-                       [](MacroAssembler& masm, const Address& addr) {
-                         EmitPreBarrier(masm, addr, MIRType::ObjectGroup);
-                       });
-
-    masm.bind(&noGroupChange);
-  }
-
   // Update the object's shape.
   masm.loadPtr(newShapeAddr, scratch1);
   masm.storeObjShape(scratch1, obj,
@@ -1080,32 +963,30 @@
 
 bool BaselineCacheIRCompiler::emitAddAndStoreFixedSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
+    uint32_t newShapeOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   Maybe<uint32_t> numNewSlotsOffset = mozilla::Nothing();
-  return emitAddAndStoreSlotShared(
-      CacheOp::AddAndStoreFixedSlot, objId, offsetOffset, rhsId, changeGroup,
-      newGroupOffset, newShapeOffset, numNewSlotsOffset);
+  return emitAddAndStoreSlotShared(CacheOp::AddAndStoreFixedSlot, objId,
+                                   offsetOffset, rhsId, newShapeOffset,
+                                   numNewSlotsOffset);
 }
 
 bool BaselineCacheIRCompiler::emitAddAndStoreDynamicSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
+    uint32_t newShapeOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   Maybe<uint32_t> numNewSlotsOffset = mozilla::Nothing();
-  return emitAddAndStoreSlotShared(
-      CacheOp::AddAndStoreDynamicSlot, objId, offsetOffset, rhsId, changeGroup,
-      newGroupOffset, newShapeOffset, numNewSlotsOffset);
+  return emitAddAndStoreSlotShared(CacheOp::AddAndStoreDynamicSlot, objId,
+                                   offsetOffset, rhsId, newShapeOffset,
+                                   numNewSlotsOffset);
 }
 
 bool BaselineCacheIRCompiler::emitAllocateAndStoreDynamicSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-    uint32_t numNewSlotsOffset) {
+    uint32_t newShapeOffset, uint32_t numNewSlotsOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   return emitAddAndStoreSlotShared(CacheOp::AllocateAndStoreDynamicSlot, objId,
-                                   offsetOffset, rhsId, changeGroup,
-                                   newGroupOffset, newShapeOffset,
+                                   offsetOffset, rhsId, newShapeOffset,
                                    mozilla::Some(numNewSlotsOffset));
 }
 
@@ -1114,13 +995,11 @@
                                                     ValOperandId rhsId) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
 
-  // Allocate the fixed registers first. These need to be fixed for
-  // callTypeUpdateIC.
-  AutoScratchRegister scratch(allocator, masm, R1.scratchReg());
-  ValueOperand val = allocator.useFixedValueRegister(masm, rhsId, R0);
-
   Register obj = allocator.useRegister(masm, objId);
   Register index = allocator.useRegister(masm, indexId);
+  ValueOperand val = allocator.useValueRegister(masm, rhsId);
+
+  AutoScratchRegister scratch(allocator, masm);
 
   FailurePath* failure;
   if (!addFailurePath(&failure)) {
@@ -1140,42 +1019,7 @@
   BaseObjectElementIndex element(scratch, index);
   masm.branchTestMagic(Assembler::Equal, element, failure->label());
 
-  if (IsTypeInferenceEnabled()) {
-    // Perform a single test to see if we either need to convert double
-    // elements or clone the copy on write elements in the object.
-    Label noSpecialHandling;
-    Address elementsFlags(scratch, ObjectElements::offsetOfFlags());
-    masm.branchTest32(Assembler::Zero, elementsFlags,
-                      Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS |
-                            ObjectElements::COPY_ON_WRITE),
-                      &noSpecialHandling);
-
-    // Fail if we need to clone copy on write elements.
-    masm.branchTest32(Assembler::NonZero, elementsFlags,
-                      Imm32(ObjectElements::COPY_ON_WRITE), failure->label());
-
-    // We need to convert int32 values being stored into doubles. Note
-    // that double arrays are only created by IonMonkey. It's fine to
-    // convert the value in place in Baseline. We can't do this in
-    // Ion.
-    masm.convertInt32ValueToDouble(val);
-
-    masm.bind(&noSpecialHandling);
-  }
-
-  // Call the type update IC. After this everything must be infallible as we
-  // don't save all registers here.
-  LiveGeneralRegisterSet saveRegs;
-  saveRegs.add(obj);
-  saveRegs.add(index);
-  saveRegs.add(val);
-  if (!callTypeUpdateIC(obj, val, scratch, saveRegs)) {
-    return false;
-  }
-
-  // Perform the store. Reload obj->elements because callTypeUpdateIC
-  // used the scratch register.
-  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch);
+  // Perform the store.
   EmitPreBarrier(masm, element, MIRType::Value);
   masm.storeValue(val, element);
 
@@ -1210,19 +1054,18 @@
 #endif
 }
 
+// TODO(no-TI): try to merge with IonCacheIRCompiler version
 bool BaselineCacheIRCompiler::emitStoreDenseElementHole(ObjOperandId objId,
                                                         Int32OperandId indexId,
                                                         ValOperandId rhsId,
                                                         bool handleAdd) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
 
-  // Allocate the fixed registers first. These need to be fixed for
-  // callTypeUpdateIC.
-  AutoScratchRegister scratch(allocator, masm, R1.scratchReg());
-  ValueOperand val = allocator.useFixedValueRegister(masm, rhsId, R0);
-
   Register obj = allocator.useRegister(masm, objId);
   Register index = allocator.useRegister(masm, indexId);
+  ValueOperand val = allocator.useValueRegister(masm, rhsId);
+
+  AutoScratchRegister scratch(allocator, masm);
 
   FailurePath* failure;
   if (!addFailurePath(&failure)) {
@@ -1241,23 +1084,16 @@
   Address initLength(scratch, ObjectElements::offsetOfInitializedLength());
   Address elementsFlags(scratch, ObjectElements::offsetOfFlags());
 
-  if (IsTypeInferenceEnabled()) {
-    // Check for copy-on-write elements. Note that this stub is not attached for
-    // non-extensible objects, so the shape guard ensures there are no sealed or
-    // frozen elements.
-    masm.branchTest32(Assembler::NonZero, elementsFlags,
-                      Imm32(ObjectElements::COPY_ON_WRITE), failure->label());
-  }
-
   // We don't have enough registers on x86 so use InvalidReg. This will emit
   // slightly less efficient code on x86.
   Register spectreTemp = InvalidReg;
 
+  Label storeSkipPreBarrier;
   if (handleAdd) {
     // Bounds check.
-    Label capacityOk, outOfBounds;
+    Label inBounds, outOfBounds;
     masm.spectreBoundsCheck32(index, initLength, spectreTemp, &outOfBounds);
-    masm.jump(&capacityOk);
+    masm.jump(&inBounds);
 
     // If we're out-of-bounds, only handle the index == initLength case.
     masm.bind(&outOfBounds);
@@ -1265,10 +1101,10 @@
 
     // If index < capacity, we can add a dense element inline. If not we
     // need to allocate more elements.
-    Label allocElement;
+    Label allocElement, addNewElement;
     Address capacity(scratch, ObjectElements::offsetOfCapacity());
     masm.spectreBoundsCheck32(index, capacity, spectreTemp, &allocElement);
-    masm.jump(&capacityOk);
+    masm.jump(&addNewElement);
 
     masm.bind(&allocElement);
 
@@ -1291,49 +1127,7 @@
     // Load the reallocated elements pointer.
     masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch);
 
-    masm.bind(&capacityOk);
-
-    // We increment initLength after the callTypeUpdateIC call, to ensure
-    // the type update code doesn't read uninitialized memory.
-  } else {
-    // Fail if index >= initLength.
-    masm.spectreBoundsCheck32(index, initLength, spectreTemp, failure->label());
-  }
-
-  if (IsTypeInferenceEnabled()) {
-    // Check if we have to convert a double element.
-    Label noConversion;
-    masm.branchTest32(Assembler::Zero, elementsFlags,
-                      Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS),
-                      &noConversion);
-
-    // We need to convert int32 values being stored into doubles. Note
-    // that double arrays are only created by IonMonkey. It's fine to
-    // convert the value in place in Baseline. We can't do this in
-    // Ion.
-    masm.convertInt32ValueToDouble(val);
-
-    masm.bind(&noConversion);
-  }
-
-  // Call the type update IC. After this everything must be infallible as we
-  // don't save all registers here.
-  LiveGeneralRegisterSet saveRegs;
-  saveRegs.add(obj);
-  saveRegs.add(index);
-  saveRegs.add(val);
-  if (!callTypeUpdateIC(obj, val, scratch, saveRegs)) {
-    return false;
-  }
-
-  // Reload obj->elements as callTypeUpdateIC used the scratch register.
-  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch);
-
-  Label doStore;
-  if (handleAdd) {
-    // If index == initLength, increment initLength.
-    Label inBounds;
-    masm.branch32(Assembler::NotEqual, initLength, index, &inBounds);
+    masm.bind(&addNewElement);
 
     // Increment initLength.
     masm.add32(Imm32(1), initLength);
@@ -1346,14 +1140,17 @@
     masm.bind(&skipIncrementLength);
 
     // Skip EmitPreBarrier as the memory is uninitialized.
-    masm.jump(&doStore);
+    masm.jump(&storeSkipPreBarrier);
 
     masm.bind(&inBounds);
+  } else {
+    // Fail if index >= initLength.
+    masm.spectreBoundsCheck32(index, initLength, spectreTemp, failure->label());
   }
 
   EmitPreBarrier(masm, element, MIRType::Value);
 
-  masm.bind(&doStore);
+  masm.bind(&storeSkipPreBarrier);
   masm.storeValue(val, element);
 
   emitPostBarrierElement(obj, val, scratch, index);
@@ -1364,13 +1161,12 @@
                                             ValOperandId rhsId) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
 
-  // Allocate the fixed registers first. These need to be fixed for
-  // callTypeUpdateIC.
-  AutoScratchRegister scratch(allocator, masm, R1.scratchReg());
-  ValueOperand val = allocator.useFixedValueRegister(masm, rhsId, R0);
-
+  AutoOutputRegister output(*this);
   Register obj = allocator.useRegister(masm, objId);
-  AutoScratchRegister scratchLength(allocator, masm);
+  ValueOperand val = allocator.useValueRegister(masm, rhsId);
+
+  AutoScratchRegisterMaybeOutput scratchLength(allocator, masm, output);
+  AutoScratchRegisterMaybeOutputType scratch(allocator, masm, output);
 
   FailurePath* failure;
   if (!addFailurePath(&failure)) {
@@ -1388,14 +1184,6 @@
   Address elementsLength(scratch, ObjectElements::offsetOfLength());
   Address elementsFlags(scratch, ObjectElements::offsetOfFlags());
 
-  if (IsTypeInferenceEnabled()) {
-    // Check for copy-on-write elements. Note that this stub is not attached for
-    // non-extensible objects, so the shape guard ensures there are no sealed or
-    // frozen elements.
-    masm.branchTest32(Assembler::NonZero, elementsFlags,
-                      Imm32(ObjectElements::COPY_ON_WRITE), failure->label());
-  }
-
   // Fail if length != initLength.
   masm.load32(elementsInitLength, scratchLength);
   masm.branch32(Assembler::NotEqual, elementsLength, scratchLength,
@@ -1403,10 +1191,10 @@
 
   // If scratchLength < capacity, we can add a dense element inline. If not we
   // need to allocate more elements.
-  Label capacityOk, allocElement;
+  Label allocElement, addNewElement;
   Address capacity(scratch, ObjectElements::offsetOfCapacity());
   masm.spectreBoundsCheck32(scratchLength, capacity, InvalidReg, &allocElement);
-  masm.jump(&capacityOk);
+  masm.jump(&addNewElement);
 
   masm.bind(&allocElement);
 
@@ -1428,39 +1216,10 @@
   // Load the reallocated elements pointer.
   masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch);
 
-  masm.bind(&capacityOk);
-
-  if (IsTypeInferenceEnabled()) {
-    // Check if we have to convert a double element.
-    Label noConversion;
-    masm.branchTest32(Assembler::Zero, elementsFlags,
-                      Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS),
-                      &noConversion);
-
-    // We need to convert int32 values being stored into doubles. Note
-    // that double arrays are only created by IonMonkey. It's fine to
-    // convert the value in place in Baseline. We can't do this in
-    // Ion.
-    masm.convertInt32ValueToDouble(val);
-
-    masm.bind(&noConversion);
-  }
-
-  // Call the type update IC. After this everything must be infallible as we
-  // don't save all registers here.
-  LiveGeneralRegisterSet saveRegs;
-  saveRegs.add(obj);
-  saveRegs.add(val);
-  if (!callTypeUpdateIC(obj, val, scratch, saveRegs)) {
-    return false;
-  }
-
-  // Reload obj->elements as callTypeUpdateIC used the scratch register.
-  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch);
+  masm.bind(&addNewElement);
 
   // Increment initLength and length.
   masm.add32(Imm32(1), elementsInitLength);
-  masm.load32(elementsLength, scratchLength);
   masm.add32(Imm32(1), elementsLength);
 
   // Store the value.
@@ -1470,7 +1229,7 @@
 
   // Return value is new length.
   masm.add32(Imm32(1), scratchLength);
-  masm.tagValue(JSVAL_TYPE_INT32, scratchLength, val);
+  masm.tagValue(JSVAL_TYPE_INT32, scratchLength, output.valueReg());
 
   return true;
 }
@@ -2218,17 +1977,6 @@
   return true;
 }
 
-bool BaselineCacheIRCompiler::emitTypeMonitorResult() {
-  JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
-  allocator.discardStack(masm);
-  if (IsTypeInferenceEnabled()) {
-    EmitEnterTypeMonitorIC(masm);
-  } else {
-    EmitReturnFromIC(masm);
-  }
-  return true;
-}
-
 bool BaselineCacheIRCompiler::emitReturnFromIC() {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   allocator.discardStack(masm);
@@ -2381,17 +2129,14 @@
     return false;
   }
 
-  // Baseline ICs monitor values when needed, so returning doubles is fine.
-  allowDoubleResult_.emplace(true);
-
   size_t numInputs = writer_.numInputOperands();
   MOZ_ASSERT(numInputs == NumInputsForCacheKind(kind));
 
   // Baseline passes the first 2 inputs in R0/R1, other Values are stored on
   // the stack.
   size_t numInputsInRegs = std::min(numInputs, size_t(2));
-  AllocatableGeneralRegisterSet available(
-      ICStubCompiler::availableGeneralRegs(numInputsInRegs));
+  AllocatableGeneralRegisterSet available =
+      BaselineICAvailableGeneralRegs(numInputsInRegs);
 
   switch (kind) {
     case CacheKind::NewObject:
@@ -2463,28 +2208,24 @@
 }
 
 static void ResetEnteredCounts(ICFallbackStub* stub) {
-  for (ICStubIterator iter = stub->beginChain(); !iter.atEnd(); iter++) {
-    switch (iter->kind()) {
-      case ICStub::CacheIR_Regular:
-        iter->toCacheIR_Regular()->resetEnteredCount();
-        break;
-      case ICStub::CacheIR_Updated:
-        iter->toCacheIR_Updated()->resetEnteredCount();
-        break;
-      case ICStub::CacheIR_Monitored:
-        iter->toCacheIR_Monitored()->resetEnteredCount();
-        break;
-      default:
-        break;
-    }
+  for (ICStubIterator iter = stub->beginChain(); *iter != stub; iter++) {
+    iter->toCacheIRStub()->resetEnteredCount();
   }
   stub->resetEnteredCount();
 }
 
+static ICStubSpace* StubSpaceForStub(bool makesGCCalls, JSScript* script,
+                                     ICScript* icScript) {
+  if (makesGCCalls) {
+    return icScript->fallbackStubSpace();
+  }
+  return script->zone()->jitZone()->optimizedStubSpace();
+}
+
 ICStub* js::jit::AttachBaselineCacheIRStub(
     JSContext* cx, const CacheIRWriter& writer, CacheKind kind,
-    BaselineCacheIRStubKind stubKind, JSScript* outerScript, ICScript* icScript,
-    ICFallbackStub* stub, bool* attached) {
+    JSScript* outerScript, ICScript* icScript, ICFallbackStub* stub,
+    bool* attached) {
   // We shouldn't GC or report OOM (or any other exception) here.
   AutoAssertNoPendingException aanpe(cx);
   JS::AutoCheckCannotGC nogc;
@@ -2502,18 +2243,7 @@
   MOZ_ASSERT(stub->numOptimizedStubs() < MaxOptimizedCacheIRStubs);
 #endif
 
-  uint32_t stubDataOffset = 0;
-  switch (stubKind) {
-    case BaselineCacheIRStubKind::Monitored:
-      stubDataOffset = sizeof(ICCacheIR_Monitored);
-      break;
-    case BaselineCacheIRStubKind::Regular:
-      stubDataOffset = sizeof(ICCacheIR_Regular);
-      break;
-    case BaselineCacheIRStubKind::Updated:
-      stubDataOffset = sizeof(ICCacheIR_Updated);
-      break;
-  }
+  uint32_t stubDataOffset = sizeof(ICCacheIRStub);
 
   JitZone* jitZone = cx->zone()->jitZone();
 
@@ -2530,7 +2260,7 @@
   if (!code) {
     // We have to generate stub code.
     JitContext jctx(cx, nullptr);
-    BaselineCacheIRCompiler comp(cx, writer, stubDataOffset, stubKind);
+    BaselineCacheIRCompiler comp(cx, writer, stubDataOffset);
     if (!comp.init(kind)) {
       return nullptr;
     }
@@ -2565,48 +2295,14 @@
   // Ensure we don't attach duplicate stubs. This can happen if a stub failed
   // for some reason and the IR generator doesn't check for exactly the same
   // conditions.
-  for (ICStubConstIterator iter = stub->beginChainConst(); !iter.atEnd();
+  for (ICStubConstIterator iter = stub->beginChainConst(); *iter != stub;
        iter++) {
-    switch (stubKind) {
-      case BaselineCacheIRStubKind::Regular: {
-        if (!iter->isCacheIR_Regular()) {
-          continue;
-        }
-        auto otherStub = iter->toCacheIR_Regular();
-        if (otherStub->stubInfo() != stubInfo) {
-          continue;
-        }
-        if (!writer.stubDataEquals(otherStub->stubDataStart())) {
-          continue;
-        }
-        break;
-      }
-      case BaselineCacheIRStubKind::Monitored: {
-        if (!iter->isCacheIR_Monitored()) {
-          continue;
-        }
-        auto otherStub = iter->toCacheIR_Monitored();
-        if (otherStub->stubInfo() != stubInfo) {
-          continue;
-        }
-        if (!writer.stubDataEquals(otherStub->stubDataStart())) {
-          continue;
-        }
-        break;
-      }
-      case BaselineCacheIRStubKind::Updated: {
-        if (!iter->isCacheIR_Updated()) {
-          continue;
-        }
-        auto otherStub = iter->toCacheIR_Updated();
-        if (otherStub->stubInfo() != stubInfo) {
-          continue;
-        }
-        if (!writer.stubDataEquals(otherStub->stubDataStart())) {
-          continue;
-        }
-        break;
-      }
+    auto otherStub = iter->toCacheIRStub();
+    if (otherStub->stubInfo() != stubInfo) {
+      continue;
+    }
+    if (!writer.stubDataEquals(otherStub->stubDataStart())) {
+      continue;
     }
 
     // We found a stub that's exactly the same as the stub we're about to
@@ -2623,8 +2319,8 @@
 
   size_t bytesNeeded = stubInfo->stubDataOffset() + stubInfo->stubDataSize();
 
-  ICStubSpace* stubSpace = ICStubCompiler::StubSpaceForStub(
-      stubInfo->makesGCCalls(), outerScript, icScript);
+  ICStubSpace* stubSpace =
+      StubSpaceForStub(stubInfo->makesGCCalls(), outerScript, icScript);
   void* newStubMem = stubSpace->alloc(bytesNeeded);
   if (!newStubMem) {
     return nullptr;
@@ -2648,57 +2344,17 @@
       break;
   }
 
-  switch (stubKind) {
-    case BaselineCacheIRStubKind::Regular: {
-      auto newStub = new (newStubMem) ICCacheIR_Regular(code, stubInfo);
-      writer.copyStubData(newStub->stubDataStart());
-      stub->addNewStub(newStub);
-      *attached = true;
-      return newStub;
-    }
-    case BaselineCacheIRStubKind::Monitored: {
-      ICStub* monitorStub = nullptr;
-      if (IsTypeInferenceEnabled()) {
-        ICTypeMonitor_Fallback* typeMonitorFallback =
-            stub->toMonitoredFallbackStub()->getFallbackMonitorStub(
-                cx, outerScript);
-        if (!typeMonitorFallback) {
-          cx->recoverFromOutOfMemory();
-          return nullptr;
-        }
-        monitorStub = typeMonitorFallback->firstMonitorStub();
-      }
-      auto newStub =
-          new (newStubMem) ICCacheIR_Monitored(code, monitorStub, stubInfo);
-      writer.copyStubData(newStub->stubDataStart());
-      stub->addNewStub(newStub);
-      *attached = true;
-      return newStub;
-    }
-    case BaselineCacheIRStubKind::Updated: {
-      auto newStub = new (newStubMem) ICCacheIR_Updated(code, stubInfo);
-      if (!newStub->initUpdatingChain(cx, stubSpace)) {
-        cx->recoverFromOutOfMemory();
-        return nullptr;
-      }
-      writer.copyStubData(newStub->stubDataStart());
-      stub->addNewStub(newStub);
-      *attached = true;
-      return newStub;
-    }
-  }
-
-  MOZ_CRASH("Invalid kind");
+  auto newStub = new (newStubMem) ICCacheIRStub(code, stubInfo);
+  writer.copyStubData(newStub->stubDataStart());
+  stub->addNewStub(newStub);
+  *attached = true;
+  return newStub;
 }
 
-template <typename Base>
-uint8_t* ICCacheIR_Trait<Base>::stubDataStart() {
+uint8_t* ICCacheIRStub::stubDataStart() {
   return reinterpret_cast<uint8_t*>(this) + stubInfo_->stubDataOffset();
 }
 
-template uint8_t* ICCacheIR_Trait<ICStub>::stubDataStart();
-template uint8_t* ICCacheIR_Trait<ICMonitoredStub>::stubDataStart();
-
 bool BaselineCacheIRCompiler::emitCallStringObjectConcatResult(
     ValOperandId lhsId, ValOperandId rhsId) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineCacheIRCompiler.h firefox-85.0+build1/js/src/jit/BaselineCacheIRCompiler.h
--- firefox-84.0.2+build1/js/src/jit/BaselineCacheIRCompiler.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineCacheIRCompiler.h	2021-01-18 19:58:13.000000000 +0000
@@ -19,35 +19,26 @@
 class ICFallbackStub;
 class ICStub;
 
-enum class BaselineCacheIRStubKind { Regular, Monitored, Updated };
-
 ICStub* AttachBaselineCacheIRStub(JSContext* cx, const CacheIRWriter& writer,
-                                  CacheKind kind,
-                                  BaselineCacheIRStubKind stubKind,
-                                  JSScript* outerScript, ICScript* icScript,
-                                  ICFallbackStub* stub, bool* attached);
+                                  CacheKind kind, JSScript* outerScript,
+                                  ICScript* icScript, ICFallbackStub* stub,
+                                  bool* attached);
 
 // BaselineCacheIRCompiler compiles CacheIR to BaselineIC native code.
 class MOZ_RAII BaselineCacheIRCompiler : public CacheIRCompiler {
   bool makesGCCalls_;
-  BaselineCacheIRStubKind kind_;
 
   void tailCallVMInternal(MacroAssembler& masm, TailCallVMFunctionId id);
 
   template <typename Fn, Fn fn>
   void tailCallVM(MacroAssembler& masm);
 
-  MOZ_MUST_USE bool callTypeUpdateIC(Register obj, ValueOperand val,
-                                     Register scratch,
-                                     LiveGeneralRegisterSet saveRegs);
-
   MOZ_MUST_USE bool emitStoreSlotShared(bool isFixed, ObjOperandId objId,
                                         uint32_t offsetOffset,
                                         ValOperandId rhsId);
   MOZ_MUST_USE bool emitAddAndStoreSlotShared(
       CacheOp op, ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-      bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-      mozilla::Maybe<uint32_t> numNewSlotsOffset);
+      uint32_t newShapeOffset, mozilla::Maybe<uint32_t> numNewSlotsOffset);
 
   bool updateArgc(CallFlags flags, Register argcReg, Register scratch);
   void loadStackObject(ArgumentKind kind, CallFlags flags, size_t stackPushed,
@@ -93,8 +84,7 @@
   friend class AutoStubFrame;
 
   BaselineCacheIRCompiler(JSContext* cx, const CacheIRWriter& writer,
-                          uint32_t stubDataOffset,
-                          BaselineCacheIRStubKind stubKind);
+                          uint32_t stubDataOffset);
 
   MOZ_MUST_USE bool init(CacheKind kind);
 
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineCodeGen.cpp firefox-85.0+build1/js/src/jit/BaselineCodeGen.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineCodeGen.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineCodeGen.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -42,13 +42,13 @@
 #include "debugger/DebugAPI-inl.h"
 #include "jit/ABIFunctionList-inl.h"
 #include "jit/BaselineFrameInfo-inl.h"
+#include "jit/JitScript-inl.h"
 #include "jit/MacroAssembler-inl.h"
 #include "jit/SharedICHelpers-inl.h"
 #include "jit/VMFunctionList-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/JSScript-inl.h"
 #include "vm/NativeObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -222,8 +222,8 @@
     }
   }
 
-  // Pin analysis info during compilation.
-  AutoEnterAnalysis autoEnterAnalysis(cx);
+  // Suppress GC during compilation.
+  gc::AutoSuppressGC suppressGC(cx);
 
   MOZ_ASSERT(!script->hasBaselineScript());
 
@@ -561,7 +561,7 @@
   } while (entry->pcOffset() < pcOffset);
 
   MOZ_RELEASE_ASSERT(entry->pcOffset() == pcOffset);
-  MOZ_ASSERT_IF(!entry->isForPrologue(), BytecodeOpHasIC(JSOp(*handler.pc())));
+  MOZ_ASSERT(BytecodeOpHasIC(JSOp(*handler.pc())));
 
   // Load stub pointer into ICStubReg.
   if (JitOptions.warpBuilder) {
@@ -576,10 +576,7 @@
   CodeOffset returnOffset;
   EmitCallIC(masm, &returnOffset);
 
-  RetAddrEntry::Kind kind = entry->isForPrologue()
-                                ? RetAddrEntry::Kind::PrologueIC
-                                : RetAddrEntry::Kind::IC;
-
+  RetAddrEntry::Kind kind = RetAddrEntry::Kind::IC;
   if (!handler.retAddrEntries().emplaceBack(pcOffset, kind, returnOffset)) {
     ReportOutOfMemory(cx);
     return false;
@@ -1062,23 +1059,6 @@
   LoadInt32Operand(masm, dest);
 }
 
-template <>
-void BaselineCompilerCodeGen::loadInt32IndexBytecodeOperand(ValueOperand dest) {
-  uint32_t index = GET_UINT32(handler.pc());
-  MOZ_ASSERT(index <= INT32_MAX,
-             "the bytecode emitter must fail to compile code that would "
-             "produce an index exceeding int32_t range");
-  masm.moveValue(Int32Value(AssertedCast<int32_t>(index)), dest);
-}
-
-template <>
-void BaselineInterpreterCodeGen::loadInt32IndexBytecodeOperand(
-    ValueOperand dest) {
-  Register scratch = dest.scratchReg();
-  LoadInt32Operand(masm, scratch);
-  masm.tagValue(JSVAL_TYPE_INT32, scratch, dest);
-}
-
 template <typename Handler>
 bool BaselineCodeGen<Handler>::emitDebugPrologue() {
   auto ifDebuggee = [this]() {
@@ -1532,99 +1512,6 @@
   return true;
 }
 
-template <>
-bool BaselineCompilerCodeGen::emitArgumentTypeChecks() {
-  if (!IsTypeInferenceEnabled()) {
-    return true;
-  }
-
-  if (!handler.function()) {
-    return true;
-  }
-
-  frame.pushThis();
-  frame.popRegsAndSync(1);
-
-  if (!emitNextIC()) {
-    return false;
-  }
-
-  size_t nargs = handler.function()->nargs();
-
-  for (size_t i = 0; i < nargs; i++) {
-    frame.pushArg(i);
-    frame.popRegsAndSync(1);
-
-    if (!emitNextIC()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-template <>
-bool BaselineInterpreterCodeGen::emitArgumentTypeChecks() {
-  if (!IsTypeInferenceEnabled()) {
-    return true;
-  }
-
-  Register scratch1 = R1.scratchReg();
-
-  // If the script is not a function, we're done.
-  Label done;
-  masm.loadPtr(frame.addressOfCalleeToken(), scratch1);
-  masm.branchTestPtr(Assembler::NonZero, scratch1, Imm32(CalleeTokenScriptBit),
-                     &done);
-
-  // CalleeToken_Function or CalleeToken_FunctionConstructing.
-  masm.andPtr(Imm32(uint32_t(CalleeTokenMask)), scratch1);
-
-  // The frame's scratch slot is used to store two 32-bit values: nargs (lower
-  // half) and the argument index (upper half).
-  masm.load16ZeroExtend(Address(scratch1, JSFunction::offsetOfNargs()),
-                        scratch1);
-  masm.store32(scratch1, frame.addressOfScratchValueLow32());
-
-  // Type check |this|.
-  masm.loadValue(frame.addressOfThis(), R0);
-  if (!emitNextIC()) {
-    return false;
-  }
-  frame.bumpInterpreterICEntry();
-
-  // Type check arguments. Scratch1 holds the next argument's index.
-  masm.move32(Imm32(0), scratch1);
-
-  // Bounds check.
-  Label top;
-  masm.bind(&top);
-  masm.branch32(Assembler::Equal, frame.addressOfScratchValueLow32(), scratch1,
-                &done);
-  {
-    // Load the argument, increment argument index and store the index in the
-    // scratch slot.
-    BaseValueIndex addr(BaselineFrameReg, scratch1,
-                        BaselineFrame::offsetOfArg(0));
-    masm.loadValue(addr, R0);
-    masm.add32(Imm32(1), scratch1);
-    masm.store32(scratch1, frame.addressOfScratchValueHigh32());
-
-    // Type check the argument.
-    if (!emitNextIC()) {
-      return false;
-    }
-    frame.bumpInterpreterICEntry();
-
-    // Restore argument index.
-    masm.load32(frame.addressOfScratchValueHigh32(), scratch1);
-    masm.jump(&top);
-  }
-
-  masm.bind(&done);
-  return true;
-}
-
 bool BaselineCompiler::emitDebugTrap() {
   MOZ_ASSERT(compileDebugInstrumentation());
   MOZ_ASSERT(frame.numUnsyncedSlots() == 0);
@@ -1783,11 +1670,6 @@
 }
 
 template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_IterNext() {
-  return true;
-}
-
-template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_NopDestructuring() {
   return true;
 }
@@ -2953,67 +2835,114 @@
   return true;
 }
 
-template <>
-bool BaselineCompilerCodeGen::emit_NewArrayCopyOnWrite() {
-  // This is like the interpreter implementation, but we can call
-  // getOrFixupCopyOnWriteObject at compile-time.
-
-  RootedScript scriptRoot(cx, handler.script());
-  JSObject* obj =
-      ObjectGroup::getOrFixupCopyOnWriteObject(cx, scriptRoot, handler.pc());
-  if (!obj) {
-    return false;
-  }
-
-  prepareVMCall();
-
-  pushArg(ImmGCPtr(obj));
-
-  using Fn = ArrayObject* (*)(JSContext*, HandleArrayObject);
-  if (!callVM<Fn, js::NewDenseCopyOnWriteArray>()) {
-    return false;
+static void MarkElementsNonPackedIfHoleValue(MacroAssembler& masm,
+                                             Register elements,
+                                             ValueOperand val) {
+  Label notHole;
+  masm.branchTestMagic(Assembler::NotEqual, val, &notHole);
+  {
+    Address elementsFlags(elements, ObjectElements::offsetOfFlags());
+    masm.or32(Imm32(ObjectElements::NON_PACKED), elementsFlags);
   }
-
-  // Box and push return value.
-  masm.tagValue(JSVAL_TYPE_OBJECT, ReturnReg, R0);
-  frame.push(R0);
-  return true;
+  masm.bind(&notHole);
 }
 
 template <>
-bool BaselineInterpreterCodeGen::emit_NewArrayCopyOnWrite() {
-  prepareVMCall();
+bool BaselineInterpreterCodeGen::emit_InitElemArray() {
+  // Pop value into R0, keep the object on the stack.
+  frame.popRegsAndSync(1);
 
-  pushBytecodePCArg();
-  pushScriptArg();
+  // Load object in R2.
+  Register obj = R2.scratchReg();
+  masm.unboxObject(frame.addressOfStackValue(-1), obj);
+
+  // Load index in R1.
+  Register index = R1.scratchReg();
+  LoadInt32Operand(masm, index);
+
+  // Store the Value. No pre-barrier because this is an initialization.
+  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), obj);
+  masm.storeValue(R0, BaseObjectElementIndex(obj, index));
+
+  // Bump initialized length.
+  Address initLength(obj, ObjectElements::offsetOfInitializedLength());
+  masm.add32(Imm32(1), index);
+  masm.store32(index, initLength);
 
-  using Fn = ArrayObject* (*)(JSContext*, HandleScript, jsbytecode*);
-  if (!callVM<Fn, NewArrayCopyOnWriteOperation>()) {
-    return false;
-  }
+  // Mark elements as NON_PACKED if we stored the hole value.
+  MarkElementsNonPackedIfHoleValue(masm, obj, R0);
 
-  // Box and push return value.
-  masm.tagValue(JSVAL_TYPE_OBJECT, ReturnReg, R0);
-  frame.push(R0);
+  // Post-barrier.
+  Label skipBarrier;
+  Register scratch = index;
+  masm.branchValueIsNurseryCell(Assembler::NotEqual, R0, scratch, &skipBarrier);
+  {
+    masm.unboxObject(frame.addressOfStackValue(-1), obj);
+    masm.branchPtrInNurseryChunk(Assembler::Equal, obj, scratch, &skipBarrier);
+    MOZ_ASSERT(obj == R2.scratchReg(), "post barrier expects object in R2");
+    masm.call(&postBarrierSlot_);
+  }
+  masm.bind(&skipBarrier);
   return true;
 }
 
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_InitElemArray() {
-  // Keep the object and rhs on the stack.
-  frame.syncStack(0);
+template <>
+bool BaselineCompilerCodeGen::emit_InitElemArray() {
+  // Pop value into R0, keep the object on the stack.
+  Maybe<Value> knownValue = frame.knownStackValue(-1);
+  frame.popRegsAndSync(1);
 
-  // Load object in R0, index in R1.
-  masm.loadValue(frame.addressOfStackValue(-2), R0);
-  loadInt32IndexBytecodeOperand(R1);
+  // Load object in R2.
+  Register obj = R2.scratchReg();
+  masm.unboxObject(frame.addressOfStackValue(-1), obj);
 
-  // Call IC.
-  if (!emitNextIC()) {
-    return false;
+  uint32_t index = GET_UINT32(handler.pc());
+  MOZ_ASSERT(index <= INT32_MAX,
+             "the bytecode emitter must fail to compile code that would "
+             "produce an index exceeding int32_t range");
+
+  // Store the Value. No pre-barrier because this is an initialization.
+  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), obj);
+  masm.storeValue(R0, Address(obj, index * sizeof(Value)));
+
+  // Bump initialized length.
+  Address initLength(obj, ObjectElements::offsetOfInitializedLength());
+  masm.store32(Imm32(index + 1), initLength);
+
+  // Mark elements as NON_PACKED if we stored the hole value. We know this
+  // statically except when debugger instrumentation is enabled because that
+  // forces a stack-sync (which discards constants and known types) for each op.
+  if (knownValue && knownValue->isMagic(JS_ELEMENTS_HOLE)) {
+    Address elementsFlags(obj, ObjectElements::offsetOfFlags());
+    masm.or32(Imm32(ObjectElements::NON_PACKED), elementsFlags);
+  } else if (handler.compileDebugInstrumentation()) {
+    MarkElementsNonPackedIfHoleValue(masm, obj, R0);
+  } else {
+#ifdef DEBUG
+    Label notHole;
+    masm.branchTestMagic(Assembler::NotEqual, R0, &notHole);
+    masm.assumeUnreachable("Unexpected hole value");
+    masm.bind(&notHole);
+#endif
   }
 
-  // Pop the rhs, so that the object is on the top of the stack.
-  frame.pop();
+  // Post-barrier.
+  if (knownValue) {
+    MOZ_ASSERT(JS::GCPolicy<Value>::isTenured(*knownValue));
+  } else {
+    Label skipBarrier;
+    Register scratch = R1.scratchReg();
+    masm.branchValueIsNurseryCell(Assembler::NotEqual, R0, scratch,
+                                  &skipBarrier);
+    {
+      masm.unboxObject(frame.addressOfStackValue(-1), obj);
+      masm.branchPtrInNurseryChunk(Assembler::Equal, obj, scratch,
+                                   &skipBarrier);
+      MOZ_ASSERT(obj == R2.scratchReg(), "post barrier expects object in R2");
+      masm.call(&postBarrierSlot_);
+    }
+    masm.bind(&skipBarrier);
+  }
   return true;
 }
 
@@ -3023,11 +2952,6 @@
 }
 
 template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_NewObjectWithGroup() {
-  return emitNewObject();
-}
-
-template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_NewInit() {
   return emitNewObject();
 }
@@ -3166,11 +3090,6 @@
 }
 
 template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_CallElem() {
-  return emit_GetElem();
-}
-
-template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_SetElem() {
   // Store RHS in the scratch slot.
   frame.storeStackValue(-1, frame.addressOfScratchValue(), R2);
@@ -3511,16 +3430,6 @@
 }
 
 template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_CallProp() {
-  return emit_GetProp();
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_Length() {
-  return emit_GetProp();
-}
-
-template <typename Handler>
 bool BaselineCodeGen<Handler>::emit_GetBoundName() {
   return emit_GetProp();
 }
@@ -3687,13 +3596,6 @@
 bool BaselineCodeGen<Handler>::emit_GetAliasedVar() {
   emitGetAliasedVar(R0);
 
-  if (IsTypeInferenceEnabled() && handler.maybeIonCompileable()) {
-    // No need to monitor types if we know Ion can't compile this script.
-    if (!emitNextIC()) {
-      return false;
-    }
-  }
-
   frame.push(R0);
   return true;
 }
@@ -3907,13 +3809,6 @@
     }
   }
 
-  if (IsTypeInferenceEnabled() && handler.maybeIonCompileable()) {
-    // No need to monitor types if we know Ion can't compile this script.
-    if (!emitNextIC()) {
-      return false;
-    }
-  }
-
   frame.push(R0);
   return true;
 }
@@ -3936,11 +3831,6 @@
     return false;
   }
 
-  // Enter the type monitor IC.
-  if (IsTypeInferenceEnabled() && !emitNextIC()) {
-    return false;
-  }
-
   frame.push(R0);
   return true;
 }
@@ -3973,77 +3863,19 @@
 }
 
 template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_DefVar() {
-  frame.syncStack(0);
-
-  masm.loadPtr(frame.addressOfEnvironmentChain(), R0.scratchReg());
-
-  prepareVMCall();
-
-  pushBytecodePCArg();
-  pushScriptArg();
-  pushArg(R0.scratchReg());
-
-  using Fn = bool (*)(JSContext*, HandleObject, HandleScript, jsbytecode*);
-  return callVM<Fn, DefVarOperation>();
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emitDefLexical(JSOp op) {
-  MOZ_ASSERT(op == JSOp::DefConst || op == JSOp::DefLet);
-
+bool BaselineCodeGen<Handler>::emit_GlobalOrEvalDeclInstantiation() {
   frame.syncStack(0);
 
-  masm.loadPtr(frame.addressOfEnvironmentChain(), R0.scratchReg());
-
-  prepareVMCall();
-
-  pushBytecodePCArg();
-  pushScriptArg();
-  pushArg(R0.scratchReg());
-
-  using Fn = bool (*)(JSContext*, HandleObject, HandleScript, jsbytecode*);
-  return callVM<Fn, DefLexicalOperation>();
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_DefConst() {
-  return emitDefLexical(JSOp::DefConst);
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_DefLet() {
-  return emitDefLexical(JSOp::DefLet);
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_DefFun() {
-  frame.popRegsAndSync(1);
-  masm.unboxObject(R0, R0.scratchReg());
-  masm.loadPtr(frame.addressOfEnvironmentChain(), R1.scratchReg());
-
   prepareVMCall();
 
+  loadInt32LengthBytecodeOperand(R0.scratchReg());
   pushArg(R0.scratchReg());
-  pushArg(R1.scratchReg());
-  pushScriptArg();
-
-  using Fn = bool (*)(JSContext*, HandleScript, HandleObject, HandleFunction);
-  return callVM<Fn, DefFunOperation>();
-}
-
-template <typename Handler>
-bool BaselineCodeGen<Handler>::emit_CheckGlobalOrEvalDecl() {
-  frame.syncStack(0);
-
-  prepareVMCall();
-
   pushScriptArg();
   masm.loadPtr(frame.addressOfEnvironmentChain(), R0.scratchReg());
   pushArg(R0.scratchReg());
 
-  using Fn = bool (*)(JSContext*, HandleObject, HandleScript);
-  return callVM<Fn, js::CheckGlobalOrEvalDeclarationConflicts>();
+  using Fn = bool (*)(JSContext*, HandleObject, HandleScript, GCThingIndex);
+  return callVM<Fn, js::GlobalOrEvalDeclInstantiation>();
 }
 
 template <typename Handler>
@@ -6709,10 +6541,6 @@
 
   warmUpCheckPrologueOffset_ = CodeOffset(masm.currentOffset());
 
-  if (!emitArgumentTypeChecks()) {
-    return false;
-  }
-
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineCodeGen.h firefox-85.0+build1/js/src/jit/BaselineCodeGen.h
--- firefox-84.0.2+build1/js/src/jit/BaselineCodeGen.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineCodeGen.h	2021-01-18 19:58:13.000000000 +0000
@@ -87,7 +87,6 @@
   void pushUint16BytecodeOperandArg(Register scratch);
 
   void loadInt32LengthBytecodeOperand(Register dest);
-  void loadInt32IndexBytecodeOperand(ValueOperand dest);
   void loadNumFormalArguments(Register dest);
 
   // Loads the current JSScript* in dest.
@@ -231,7 +230,6 @@
   MOZ_MUST_USE bool emitSetPropSuper(bool strict);
 
   MOZ_MUST_USE bool emitBindName(JSOp op);
-  MOZ_MUST_USE bool emitDefLexical(JSOp op);
 
   // Try to bake in the result of GETGNAME/BINDGNAME instead of using an IC.
   // Return true if we managed to optimize the op.
@@ -256,7 +254,6 @@
   MOZ_MUST_USE bool emitEpilogue();
   MOZ_MUST_USE bool emitOutOfLinePostBarrierSlot();
   MOZ_MUST_USE bool emitStackCheck();
-  MOZ_MUST_USE bool emitArgumentTypeChecks();
   MOZ_MUST_USE bool emitDebugPrologue();
   MOZ_MUST_USE bool emitDebugEpilogue();
 
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineDebugModeOSR.cpp firefox-85.0+build1/js/src/jit/BaselineDebugModeOSR.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineDebugModeOSR.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineDebugModeOSR.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -9,6 +9,7 @@
 #include "jit/BaselineFrame.h"
 #include "jit/BaselineIC.h"
 #include "jit/BaselineJIT.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/JitcodeMap.h"
 #include "jit/JitFrames.h"
@@ -16,10 +17,10 @@
 #include "jit/JSJitFrameIter.h"
 #include "jit/PerfSpewer.h"
 
+#include "jit/JitScript-inl.h"
 #include "jit/JSJitFrameIter-inl.h"
 #include "jit/MacroAssembler-inl.h"
 #include "vm/Stack-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -179,8 +180,6 @@
   switch (kind) {
     case RetAddrEntry::Kind::IC:
       return "IC";
-    case RetAddrEntry::Kind::PrologueIC:
-      return "prologue IC";
     case RetAddrEntry::Kind::CallVM:
       return "callVM";
     case RetAddrEntry::Kind::StackCheck:
@@ -354,7 +353,6 @@
                                    pc);
             break;
           }
-          case RetAddrEntry::Kind::PrologueIC:
           case RetAddrEntry::Kind::NonOpCallVM:
           case RetAddrEntry::Kind::Invalid:
             // These cannot trigger BaselineDebugModeOSR.
@@ -466,7 +464,7 @@
 
   // No need to cancel off-thread Ion compiles again, we already did it
   // above.
-  Invalidate(zone->types, cx->runtime()->defaultFreeOp(), invalid,
+  Invalidate(cx, invalid,
              /* resetUses = */ true, /* cancelOffThread = */ false);
   return true;
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineFrame.h firefox-85.0+build1/js/src/jit/BaselineFrame.h
--- firefox-84.0.2+build1/js/src/jit/BaselineFrame.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineFrame.h	2021-01-18 19:58:13.000000000 +0000
@@ -300,10 +300,7 @@
   void setInterpreterFieldsForPrologue(JSScript* script);
 
   ICScript* icScript() const;
-  void setICScript(ICScript* icScript) {
-    MOZ_ASSERT(JitOptions.warpBuilder);
-    icScript_ = icScript;
-  }
+  void setICScript(ICScript* icScript) { icScript_ = icScript; }
 
   JSScript* invalidationScript() const;
 
@@ -365,7 +362,9 @@
   bool isGlobalFrame() const { return script()->isGlobalCode(); }
   bool isModuleFrame() const { return script()->isModule(); }
   bool isEvalFrame() const { return script()->isForEval(); }
-  bool isFunctionFrame() const { return CalleeTokenIsFunction(calleeToken()); }
+  bool isFunctionFrame() const {
+    return CalleeTokenIsFunction(calleeToken()) && !isModuleFrame();
+  }
   bool isDebuggerEvalFrame() const { return false; }
 
   JitFrameLayout* framePrefix() const {
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineFrameInfo.h firefox-85.0+build1/js/src/jit/BaselineFrameInfo.h
--- firefox-84.0.2+build1/js/src/jit/BaselineFrameInfo.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineFrameInfo.h	2021-01-18 19:58:13.000000000 +0000
@@ -8,6 +8,7 @@
 #define jit_BaselineFrameInfo_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 
 #include <new>
 
@@ -344,6 +345,14 @@
     return peek(depth)->hasKnownType(type);
   }
 
+  mozilla::Maybe<Value> knownStackValue(int32_t depth) const {
+    StackValue* val = peek(depth);
+    if (val->kind() == StackValue::Constant) {
+      return mozilla::Some(val->constant());
+    }
+    return mozilla::Nothing();
+  }
+
   void storeStackValue(int32_t depth, const Address& dest,
                        const ValueOperand& scratch);
 
@@ -376,6 +385,10 @@
     return false;
   }
 
+  mozilla::Maybe<Value> knownStackValue(int32_t depth) const {
+    return mozilla::Nothing();
+  }
+
   Address addressOfStackValue(int depth) const {
     MOZ_ASSERT(depth < 0);
     return Address(masm.getStackPointer(),
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineIC.cpp firefox-85.0+build1/js/src/jit/BaselineIC.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineIC.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineIC.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -9,7 +9,6 @@
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/TemplateLib.h"
 #include "mozilla/Unused.h"
@@ -35,6 +34,7 @@
 #  include "jit/PerfSpewer.h"
 #endif
 #include "jit/SharedICHelpers.h"
+#include "jit/SharedICRegisters.h"
 #include "jit/VMFunctions.h"
 #include "js/Conversions.h"
 #include "js/friend/ErrorMessages.h"  // JSMSG_*
@@ -71,10 +71,18 @@
 
 // Class used to emit all Baseline IC fallback code when initializing the
 // JitRuntime.
-class MOZ_RAII FallbackICCodeCompiler final : public ICStubCompilerBase {
+class MOZ_RAII FallbackICCodeCompiler final {
   BaselineICFallbackCode& code;
   MacroAssembler& masm;
 
+  JSContext* cx;
+  bool inStubFrame_ = false;
+
+#ifdef DEBUG
+  bool entersStubFrame_ = false;
+  uint32_t framePushedAtEnterStubFrame_ = 0;
+#endif
+
   MOZ_MUST_USE bool emitCall(bool isSpread, bool isConstructing);
   MOZ_MUST_USE bool emitGetElem(bool hasReceiver);
   MOZ_MUST_USE bool emitGetProp(bool hasReceiver);
@@ -82,13 +90,82 @@
  public:
   FallbackICCodeCompiler(JSContext* cx, BaselineICFallbackCode& code,
                          MacroAssembler& masm)
-      : ICStubCompilerBase(cx), code(code), masm(masm) {}
+      : code(code), masm(masm), cx(cx) {}
 
 #define DEF_METHOD(kind) MOZ_MUST_USE bool emit_##kind();
   IC_BASELINE_FALLBACK_CODE_KIND_LIST(DEF_METHOD)
 #undef DEF_METHOD
+
+  void pushCallArguments(MacroAssembler& masm,
+                         AllocatableGeneralRegisterSet regs, Register argcReg,
+                         bool isConstructing);
+
+  // Push a payload specialized per compiler needed to execute stubs.
+  void PushStubPayload(MacroAssembler& masm, Register scratch);
+  void pushStubPayload(MacroAssembler& masm, Register scratch);
+
+  // Emits a tail call to a VMFunction wrapper.
+  MOZ_MUST_USE bool tailCallVMInternal(MacroAssembler& masm,
+                                       TailCallVMFunctionId id);
+
+  template <typename Fn, Fn fn>
+  MOZ_MUST_USE bool tailCallVM(MacroAssembler& masm);
+
+  // Emits a normal (non-tail) call to a VMFunction wrapper.
+  MOZ_MUST_USE bool callVMInternal(MacroAssembler& masm, VMFunctionId id);
+
+  template <typename Fn, Fn fn>
+  MOZ_MUST_USE bool callVM(MacroAssembler& masm);
+
+  // A stub frame is used when a stub wants to call into the VM without
+  // performing a tail call. This is required for the return address
+  // to pc mapping to work.
+  void enterStubFrame(MacroAssembler& masm, Register scratch);
+  void assumeStubFrame();
+  void leaveStubFrame(MacroAssembler& masm, bool calledIntoIon = false);
 };
 
+AllocatableGeneralRegisterSet BaselineICAvailableGeneralRegs(size_t numInputs) {
+  AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All());
+#if defined(JS_CODEGEN_ARM)
+  MOZ_ASSERT(!regs.has(BaselineStackReg));
+  MOZ_ASSERT(!regs.has(ICTailCallReg));
+  regs.take(BaselineSecondScratchReg);
+#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
+  MOZ_ASSERT(!regs.has(BaselineStackReg));
+  MOZ_ASSERT(!regs.has(ICTailCallReg));
+  MOZ_ASSERT(!regs.has(BaselineSecondScratchReg));
+#elif defined(JS_CODEGEN_ARM64)
+  MOZ_ASSERT(!regs.has(PseudoStackPointer));
+  MOZ_ASSERT(!regs.has(RealStackPointer));
+  MOZ_ASSERT(!regs.has(ICTailCallReg));
+#else
+  MOZ_ASSERT(!regs.has(BaselineStackReg));
+#endif
+  regs.take(BaselineFrameReg);
+  regs.take(ICStubReg);
+#ifdef JS_CODEGEN_X64
+  regs.take(ExtractTemp0);
+  regs.take(ExtractTemp1);
+#endif
+
+  switch (numInputs) {
+    case 0:
+      break;
+    case 1:
+      regs.take(R0);
+      break;
+    case 2:
+      regs.take(R0);
+      regs.take(R1);
+      break;
+    default:
+      MOZ_CRASH("Invalid numInputs");
+  }
+
+  return regs;
+}
+
 #ifdef JS_JITSPEW
 void FallbackICSpew(JSContext* cx, ICFallbackStub* stub, const char* fmt, ...) {
   if (JitSpewEnabled(JitSpew_BaselineICFallback)) {
@@ -109,28 +186,6 @@
         script->getWarmUpCount(), stub->numOptimizedStubs(), fmtbuf);
   }
 }
-
-void TypeFallbackICSpew(JSContext* cx, ICTypeMonitor_Fallback* stub,
-                        const char* fmt, ...) {
-  if (JitSpewEnabled(JitSpew_BaselineICFallback)) {
-    RootedScript script(cx, GetTopJitJSScript(cx));
-    jsbytecode* pc = stub->icEntry()->pc(script);
-
-    char fmtbuf[100];
-    va_list args;
-    va_start(args, fmt);
-    (void)VsprintfLiteral(fmtbuf, fmt, args);
-    va_end(args);
-
-    JitSpew(JitSpew_BaselineICFallback,
-            "Type monitor fallback hit for (%s:%u:%u) "
-            "(pc=%zu,line=%u,uses=%u,stubs=%d): %s",
-            script->filename(), script->lineno(), script->column(),
-            script->pcToOffset(pc), PCToLineNumber(script, pc),
-            script->getWarmUpCount(), (int)stub->numOptimizedMonitorStubs(),
-            fmtbuf);
-  }
-}
 #endif  // JS_JITSPEW
 
 ICFallbackStub* ICEntry::fallbackStub() const {
@@ -142,9 +197,12 @@
   // If we have filled our padding with a magic value, check it now.
   MOZ_DIAGNOSTIC_ASSERT(traceMagic_ == EXPECTED_TRACE_MAGIC);
 #endif
-  for (ICStub* stub = firstStub(); stub; stub = stub->next()) {
-    stub->trace(trc);
+  ICStub* stub = firstStub();
+  while (!stub->isFallback()) {
+    stub->toCacheIRStub()->trace(trc);
+    stub = stub->next();
   }
+  stub->toFallbackStub()->trace(trc);
 }
 
 // Allocator for Baseline IC fallback stubs. These stubs use trampoline code
@@ -168,31 +226,6 @@
   }
 };
 
-// Helper method called by lambda expressions `addIC` and `addPrologueIC` in
-// `JitScript::initICEntriesAndBytecodeTypeMap`.
-static bool AddICImpl(JSContext* cx, ICScript* icScript, uint32_t offset,
-                      ICStub* stub, uint32_t& icEntryIndex) {
-  if (!stub) {
-    MOZ_ASSERT(cx->isExceptionPending());
-    mozilla::Unused << cx;  // Silence -Wunused-lambda-capture in opt builds.
-    return false;
-  }
-
-  // Initialize the ICEntry.
-  ICEntry& entryRef = icScript->icEntry(icEntryIndex);
-  icEntryIndex++;
-  new (&entryRef) ICEntry(stub, offset);
-
-  // Fix up pointers from fallback stubs to the ICEntry.
-  if (stub->isFallback()) {
-    stub->toFallbackStub()->fixupICEntry(&entryRef);
-  } else {
-    stub->toTypeMonitor_Fallback()->fixupICEntry(&entryRef);
-  }
-
-  return true;
-}
-
 bool ICScript::initICEntries(JSContext* cx, JSScript* script) {
   MOZ_ASSERT(cx->realm()->jitRealm());
   MOZ_ASSERT(jit::IsBaselineInterpreterEnabled());
@@ -207,37 +240,24 @@
   using Kind = BaselineICFallbackKind;
 
   auto addIC = [cx, this, script, &icEntryIndex](BytecodeLocation loc,
-                                                 ICStub* stub) {
+                                                 ICFallbackStub* stub) {
+    if (MOZ_UNLIKELY(!stub)) {
+      MOZ_ASSERT(cx->isExceptionPending());
+      mozilla::Unused << cx;  // Silence -Wunused-lambda-capture in opt builds.
+      return false;
+    }
+
+    // Initialize the ICEntry.
     uint32_t offset = loc.bytecodeToOffset(script);
-    return AddICImpl(cx, this, offset, stub, icEntryIndex);
-  };
+    ICEntry& entryRef = this->icEntry(icEntryIndex);
+    icEntryIndex++;
+    new (&entryRef) ICEntry(stub, offset);
 
-  // Lambda expression for adding ICs for non-op ICs
-  auto addPrologueIC = [cx, this, &icEntryIndex](ICStub* stub) {
-    return AddICImpl(cx, this, ICEntry::ProloguePCOffset, stub, icEntryIndex);
+    // Fix up pointers from fallback stubs to the ICEntry.
+    stub->fixupICEntry(&entryRef);
+    return true;
   };
 
-  if (IsTypeInferenceEnabled()) {
-    // Add ICEntries and fallback stubs for this/argument type checks.
-    // Note: we pass a nullptr pc to indicate this is a non-op IC.
-    // See ICEntry::NonOpPCOffset.
-    if (JSFunction* fun = script->function()) {
-      ICStub* stub =
-          alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor, nullptr, 0);
-      if (!addPrologueIC(stub)) {
-        return false;
-      }
-
-      for (size_t i = 0; i < fun->nargs(); i++) {
-        ICStub* stub = alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor,
-                                                             nullptr, i + 1);
-        if (!addPrologueIC(stub)) {
-          return false;
-        }
-      }
-    }
-  }
-
   // For JOF_IC ops: initialize ICEntries and fallback stubs.
   for (BytecodeLocation loc : js::AllBytecodesIterable(script)) {
     JSOp op = loc.getOp();
@@ -255,7 +275,7 @@
       case JSOp::Or:
       case JSOp::IfEq:
       case JSOp::IfNe: {
-        ICStub* stub = alloc.newStub<ICToBool_Fallback>(Kind::ToBool);
+        auto* stub = alloc.newStub<ICToBool_Fallback>(Kind::ToBool);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -267,7 +287,7 @@
       case JSOp::Inc:
       case JSOp::Dec:
       case JSOp::ToNumeric: {
-        ICStub* stub = alloc.newStub<ICUnaryArith_Fallback>(Kind::UnaryArith);
+        auto* stub = alloc.newStub<ICUnaryArith_Fallback>(Kind::UnaryArith);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -285,7 +305,7 @@
       case JSOp::Div:
       case JSOp::Mod:
       case JSOp::Pow: {
-        ICStub* stub = alloc.newStub<ICBinaryArith_Fallback>(Kind::BinaryArith);
+        auto* stub = alloc.newStub<ICBinaryArith_Fallback>(Kind::BinaryArith);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -299,29 +319,32 @@
       case JSOp::Ge:
       case JSOp::StrictEq:
       case JSOp::StrictNe: {
-        ICStub* stub = alloc.newStub<ICCompare_Fallback>(Kind::Compare);
+        auto* stub = alloc.newStub<ICCompare_Fallback>(Kind::Compare);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::NewArray: {
-        ObjectGroup* group = ObjectGroup::allocationSiteGroup(
-            cx, script, loc.toRawBytecode(), JSProto_Array);
+        JSObject* proto =
+            GlobalObject::getOrCreateArrayPrototype(cx, cx->global());
+        if (!proto) {
+          return false;
+        }
+        ObjectGroup* group = ObjectGroup::defaultNewGroup(
+            cx, &ArrayObject::class_, TaggedProto(proto));
         if (!group) {
           return false;
         }
-        ICStub* stub =
-            alloc.newStub<ICNewArray_Fallback>(Kind::NewArray, group);
+        auto* stub = alloc.newStub<ICNewArray_Fallback>(Kind::NewArray, group);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::NewObject:
-      case JSOp::NewObjectWithGroup:
       case JSOp::NewInit: {
-        ICStub* stub = alloc.newStub<ICNewObject_Fallback>(Kind::NewObject);
+        auto* stub = alloc.newStub<ICNewObject_Fallback>(Kind::NewObject);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -330,11 +353,10 @@
       case JSOp::InitElem:
       case JSOp::InitHiddenElem:
       case JSOp::InitLockedElem:
-      case JSOp::InitElemArray:
       case JSOp::InitElemInc:
       case JSOp::SetElem:
       case JSOp::StrictSetElem: {
-        ICStub* stub = alloc.newStub<ICSetElem_Fallback>(Kind::SetElem);
+        auto* stub = alloc.newStub<ICSetElem_Fallback>(Kind::SetElem);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -350,60 +372,57 @@
       case JSOp::StrictSetName:
       case JSOp::SetGName:
       case JSOp::StrictSetGName: {
-        ICStub* stub = alloc.newStub<ICSetProp_Fallback>(Kind::SetProp);
+        auto* stub = alloc.newStub<ICSetProp_Fallback>(Kind::SetProp);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::GetProp:
-      case JSOp::CallProp:
-      case JSOp::Length:
       case JSOp::GetBoundName: {
-        ICStub* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetProp);
+        auto* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetProp);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::GetPropSuper: {
-        ICStub* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetPropSuper);
+        auto* stub = alloc.newStub<ICGetProp_Fallback>(Kind::GetPropSuper);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
-      case JSOp::GetElem:
-      case JSOp::CallElem: {
-        ICStub* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElem);
+      case JSOp::GetElem: {
+        auto* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElem);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::GetElemSuper: {
-        ICStub* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElemSuper);
+        auto* stub = alloc.newStub<ICGetElem_Fallback>(Kind::GetElemSuper);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::In: {
-        ICStub* stub = alloc.newStub<ICIn_Fallback>(Kind::In);
+        auto* stub = alloc.newStub<ICIn_Fallback>(Kind::In);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::HasOwn: {
-        ICStub* stub = alloc.newStub<ICHasOwn_Fallback>(Kind::HasOwn);
+        auto* stub = alloc.newStub<ICHasOwn_Fallback>(Kind::HasOwn);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::CheckPrivateField: {
-        ICStub* stub = alloc.newStub<ICCheckPrivateField_Fallback>(
+        auto* stub = alloc.newStub<ICCheckPrivateField_Fallback>(
             Kind::CheckPrivateField);
         if (!addIC(loc, stub)) {
           return false;
@@ -412,7 +431,7 @@
       }
       case JSOp::GetName:
       case JSOp::GetGName: {
-        ICStub* stub = alloc.newStub<ICGetName_Fallback>(Kind::GetName);
+        auto* stub = alloc.newStub<ICGetName_Fallback>(Kind::GetName);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -420,24 +439,14 @@
       }
       case JSOp::BindName:
       case JSOp::BindGName: {
-        ICStub* stub = alloc.newStub<ICBindName_Fallback>(Kind::BindName);
-        if (!addIC(loc, stub)) {
-          return false;
-        }
-        break;
-      }
-      case JSOp::GetAliasedVar:
-      case JSOp::GetImport: {
-        ICStub* stub =
-            alloc.newStub<ICTypeMonitor_Fallback>(Kind::TypeMonitor, nullptr);
+        auto* stub = alloc.newStub<ICBindName_Fallback>(Kind::BindName);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::GetIntrinsic: {
-        ICStub* stub =
-            alloc.newStub<ICGetIntrinsic_Fallback>(Kind::GetIntrinsic);
+        auto* stub = alloc.newStub<ICGetIntrinsic_Fallback>(Kind::GetIntrinsic);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -450,7 +459,7 @@
       case JSOp::FunApply:
       case JSOp::Eval:
       case JSOp::StrictEval: {
-        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::Call);
+        auto* stub = alloc.newStub<ICCall_Fallback>(Kind::Call);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -458,7 +467,7 @@
       }
       case JSOp::SuperCall:
       case JSOp::New: {
-        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::CallConstructing);
+        auto* stub = alloc.newStub<ICCall_Fallback>(Kind::CallConstructing);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -467,7 +476,7 @@
       case JSOp::SpreadCall:
       case JSOp::SpreadEval:
       case JSOp::StrictSpreadEval: {
-        ICStub* stub = alloc.newStub<ICCall_Fallback>(Kind::SpreadCall);
+        auto* stub = alloc.newStub<ICCall_Fallback>(Kind::SpreadCall);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -475,7 +484,7 @@
       }
       case JSOp::SpreadSuperCall:
       case JSOp::SpreadNew: {
-        ICStub* stub =
+        auto* stub =
             alloc.newStub<ICCall_Fallback>(Kind::SpreadCallConstructing);
         if (!addIC(loc, stub)) {
           return false;
@@ -483,7 +492,7 @@
         break;
       }
       case JSOp::Instanceof: {
-        ICStub* stub = alloc.newStub<ICInstanceOf_Fallback>(Kind::InstanceOf);
+        auto* stub = alloc.newStub<ICInstanceOf_Fallback>(Kind::InstanceOf);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -491,14 +500,14 @@
       }
       case JSOp::Typeof:
       case JSOp::TypeofExpr: {
-        ICStub* stub = alloc.newStub<ICTypeOf_Fallback>(Kind::TypeOf);
+        auto* stub = alloc.newStub<ICTypeOf_Fallback>(Kind::TypeOf);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::ToPropertyKey: {
-        ICStub* stub =
+        auto* stub =
             alloc.newStub<ICToPropertyKey_Fallback>(Kind::ToPropertyKey);
         if (!addIC(loc, stub)) {
           return false;
@@ -506,14 +515,14 @@
         break;
       }
       case JSOp::Iter: {
-        ICStub* stub = alloc.newStub<ICGetIterator_Fallback>(Kind::GetIterator);
+        auto* stub = alloc.newStub<ICGetIterator_Fallback>(Kind::GetIterator);
         if (!addIC(loc, stub)) {
           return false;
         }
         break;
       }
       case JSOp::OptimizeSpreadCall: {
-        ICStub* stub = alloc.newStub<ICOptimizeSpreadCall_Fallback>(
+        auto* stub = alloc.newStub<ICOptimizeSpreadCall_Fallback>(
             Kind::OptimizeSpreadCall);
         if (!addIC(loc, stub)) {
           return false;
@@ -521,14 +530,11 @@
         break;
       }
       case JSOp::Rest: {
-        ArrayObject* templateObject = ObjectGroup::newArrayObject(
-            cx, nullptr, 0, TenuredObject,
-            ObjectGroup::NewArrayKind::UnknownIndex);
+        ArrayObject* templateObject = NewTenuredDenseEmptyArray(cx);
         if (!templateObject) {
           return false;
         }
-        ICStub* stub =
-            alloc.newStub<ICRest_Fallback>(Kind::Rest, templateObject);
+        auto* stub = alloc.newStub<ICRest_Fallback>(Kind::Rest, templateObject);
         if (!addIC(loc, stub)) {
           return false;
         }
@@ -581,11 +587,13 @@
   unlinked_ = true;
 }
 
-/* static */
-bool ICStub::NonCacheIRStubMakesGCCalls(Kind kind) {
-  MOZ_ASSERT(IsValidKind(kind));
-  MOZ_ASSERT(!IsCacheIRKind(kind));
+bool ICStub::makesGCCalls() const {
+  if (!isFallback()) {
+    return toCacheIRStub()->stubInfo()->makesGCCalls();
+  }
 
+  Kind kind = toFallbackStub()->kind();
+  MOZ_ASSERT(IsValidKind(kind));
   switch (kind) {
     case Call_Fallback:
     // These three fallback stubs don't actually make non-tail calls,
@@ -600,30 +608,13 @@
   }
 }
 
-bool ICStub::makesGCCalls() const {
-  switch (kind()) {
-    case CacheIR_Regular:
-      return toCacheIR_Regular()->stubInfo()->makesGCCalls();
-    case CacheIR_Monitored:
-      return toCacheIR_Monitored()->stubInfo()->makesGCCalls();
-    case CacheIR_Updated:
-      return toCacheIR_Updated()->stubInfo()->makesGCCalls();
-    default:
-      return NonCacheIRStubMakesGCCalls(kind());
-  }
-}
-
+// TODO(no-TI): move enteredCount_ to base class if it doesn't affect
+// sizeof(ICFallbackStub).
 uint32_t ICStub::getEnteredCount() const {
-  switch (kind()) {
-    case CacheIR_Regular:
-      return toCacheIR_Regular()->enteredCount();
-    case CacheIR_Updated:
-      return toCacheIR_Updated()->enteredCount();
-    case CacheIR_Monitored:
-      return toCacheIR_Monitored()->enteredCount();
-    default:
-      return toFallbackStub()->enteredCount();
+  if (isFallback()) {
+    return toFallbackStub()->enteredCount();
   }
+  return toCacheIRStub()->enteredCount();
 }
 
 void ICFallbackStub::trackNotAttached(JSContext* cx, JSScript* script) {
@@ -646,68 +637,22 @@
   }
 }
 
-void ICStub::updateCode(JitCode* code) {
-  // Write barrier on the old code.
-  gc::PreWriteBarrier(jitCode());
-  stubCode_ = code->raw();
+void ICCacheIRStub::trace(JSTracer* trc) {
+  JitCode* stubJitCode = jitCode();
+  TraceManuallyBarrieredEdge(trc, &stubJitCode, "baseline-ic-stub-code");
+
+  TraceCacheIRStub(trc, static_cast<ICStub*>(this), stubInfo());
 }
 
-/* static */
-void ICStub::trace(JSTracer* trc) {
+void ICFallbackStub::trace(JSTracer* trc) {
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
   checkTraceMagic();
 #endif
-  // Fallback stubs use runtime-wide trampoline code we don't need to trace.
-  if (!usesTrampolineCode()) {
-    JitCode* stubJitCode = jitCode();
-    TraceManuallyBarrieredEdge(trc, &stubJitCode, "baseline-ic-stub-code");
-  }
-
-  // If the stub is a monitored fallback stub, then trace the monitor ICs
-  // hanging off of that stub.  We don't need to worry about the regular
-  // monitored stubs, because the regular monitored stubs will always have a
-  // monitored fallback stub that references the same stub chain.
-  if (isMonitoredFallback()) {
-    ICTypeMonitor_Fallback* lastMonStub =
-        toMonitoredFallbackStub()->maybeFallbackMonitorStub();
-    if (lastMonStub) {
-      for (ICStubConstIterator iter(lastMonStub->firstMonitorStub());
-           !iter.atEnd(); iter++) {
-        MOZ_ASSERT_IF(iter->next() == nullptr, *iter == lastMonStub);
-        iter->trace(trc);
-      }
-    }
-  }
 
-  if (isUpdated()) {
-    for (ICStubConstIterator iter(toUpdatedStub()->firstUpdateStub());
-         !iter.atEnd(); iter++) {
-      MOZ_ASSERT_IF(iter->next() == nullptr, iter->isTypeUpdate_Fallback());
-      iter->trace(trc);
-    }
-  }
+  // Fallback stubs use runtime-wide trampoline code we don't need to trace.
+  MOZ_ASSERT(usesTrampolineCode());
 
   switch (kind()) {
-    case ICStub::TypeMonitor_SingleObject: {
-      ICTypeMonitor_SingleObject* monitorStub = toTypeMonitor_SingleObject();
-      TraceEdge(trc, &monitorStub->object(), "baseline-monitor-singleton");
-      break;
-    }
-    case ICStub::TypeMonitor_ObjectGroup: {
-      ICTypeMonitor_ObjectGroup* monitorStub = toTypeMonitor_ObjectGroup();
-      TraceEdge(trc, &monitorStub->group(), "baseline-monitor-group");
-      break;
-    }
-    case ICStub::TypeUpdate_SingleObject: {
-      ICTypeUpdate_SingleObject* updateStub = toTypeUpdate_SingleObject();
-      TraceEdge(trc, &updateStub->object(), "baseline-update-singleton");
-      break;
-    }
-    case ICStub::TypeUpdate_ObjectGroup: {
-      ICTypeUpdate_ObjectGroup* updateStub = toTypeUpdate_ObjectGroup();
-      TraceEdge(trc, &updateStub->group(), "baseline-update-group");
-      break;
-    }
     case ICStub::NewArray_Fallback: {
       ICNewArray_Fallback* stub = toNewArray_Fallback();
       TraceNullableEdge(trc, &stub->templateObject(),
@@ -727,20 +672,6 @@
       TraceEdge(trc, &stub->templateObject(), "baseline-rest-template");
       break;
     }
-    case ICStub::CacheIR_Regular:
-      TraceCacheIRStub(trc, this, toCacheIR_Regular()->stubInfo());
-      break;
-    case ICStub::CacheIR_Monitored:
-      TraceCacheIRStub(trc, this, toCacheIR_Monitored()->stubInfo());
-      break;
-    case ICStub::CacheIR_Updated: {
-      ICCacheIR_Updated* stub = toCacheIR_Updated();
-      TraceNullableEdge(trc, &stub->updateStubGroup(),
-                        "baseline-update-stub-group");
-      TraceEdge(trc, &stub->updateStubId(), "baseline-update-stub-id");
-      TraceCacheIRStub(trc, this, stub->stubInfo());
-      break;
-    }
     default:
       break;
   }
@@ -750,8 +681,7 @@
 // stubs.
 template <typename IRGenerator, typename... Args>
 static void TryAttachStub(const char* name, JSContext* cx, BaselineFrame* frame,
-                          ICFallbackStub* stub, BaselineCacheIRStubKind kind,
-                          Args&&... args) {
+                          ICFallbackStub* stub, Args&&... args) {
   if (stub->state().maybeTransition()) {
     stub->discardStubs(cx, frame->invalidationScript());
   }
@@ -768,7 +698,7 @@
       case AttachDecision::Attach: {
         ICStub* newStub =
             AttachBaselineCacheIRStub(cx, gen.writerRef(), gen.cacheKind(),
-                                      kind, script, icScript, stub, &attached);
+                                      script, icScript, stub, &attached);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached %s CacheIR stub", name);
         }
@@ -803,23 +733,9 @@
   if (zone->needsIncrementalBarrier()) {
     // We are removing edges from ICStub to gcthings. Perform one final trace
     // of the stub for incremental GC, as it must know about those edges.
-    stub->trace(zone->barrierTracer());
+    stub->toCacheIRStub()->trace(zone->barrierTracer());
   }
 
-  if (IsTypeInferenceEnabled() && stub->makesGCCalls() && stub->isMonitored()) {
-    // This stub can make calls so we can return to it if it's on the stack.
-    // We just have to reset its firstMonitorStub_ field to avoid a stale
-    // pointer when purgeOptimizedStubs destroys all optimized monitor
-    // stubs (unlinked stubs won't be updated).
-    ICTypeMonitor_Fallback* monitorFallback =
-        toMonitoredFallbackStub()->maybeFallbackMonitorStub();
-    MOZ_ASSERT(monitorFallback);
-    stub->toMonitoredStub()->resetFirstMonitorStub(monitorFallback);
-  }
-
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  stub->checkTraceMagic();
-#endif
 #ifdef DEBUG
   // Poison stub code to ensure we don't call this stub again. However, if
   // this stub can make calls, a pointer to it may be stored in a stub frame
@@ -837,896 +753,106 @@
   }
 }
 
-void ICTypeMonitor_Fallback::resetMonitorStubChain(Zone* zone) {
-  if (zone->needsIncrementalBarrier()) {
-    // We are removing edges from monitored stubs to gcthings (JitCode).
-    // Perform one final trace of all monitor stubs for incremental GC,
-    // as it must know about those edges.
-    for (ICStub* s = firstMonitorStub_; !s->isTypeMonitor_Fallback();
-         s = s->next()) {
-      s->trace(zone->barrierTracer());
-    }
-  }
-
-  firstMonitorStub_ = this;
-  numOptimizedMonitorStubs_ = 0;
-
-  if (hasFallbackStub_) {
-    lastMonitorStubPtrAddr_ = nullptr;
-
-    // Reset firstMonitorStub_ field of all monitored stubs.
-    for (ICStubConstIterator iter = mainFallbackStub_->beginChainConst();
-         !iter.atEnd(); iter++) {
-      if (!iter->isMonitored()) {
-        continue;
-      }
-      iter->toMonitoredStub()->resetFirstMonitorStub(this);
-    }
-  } else {
-    icEntry_->setFirstStub(this);
-    lastMonitorStubPtrAddr_ = icEntry_->addressOfFirstStub();
-  }
-}
-
-void ICCacheIR_Updated::resetUpdateStubChain(Zone* zone) {
-  while (!firstUpdateStub_->isTypeUpdate_Fallback()) {
-    if (zone->needsIncrementalBarrier()) {
-      // We are removing edges from update stubs to gcthings (JitCode).
-      // Perform one final trace of all update stubs for incremental GC,
-      // as it must know about those edges.
-      firstUpdateStub_->trace(zone->barrierTracer());
-    }
-    firstUpdateStub_ = firstUpdateStub_->next();
-  }
-
-  numOptimizedStubs_ = 0;
-}
-
-ICMonitoredStub::ICMonitoredStub(Kind kind, JitCode* stubCode,
-                                 ICStub* firstMonitorStub)
-    : ICStub(kind, ICStub::Monitored, stubCode),
-      firstMonitorStub_(firstMonitorStub) {
-  if (IsTypeInferenceEnabled()) {
-    // In order to silence Coverity - null pointer dereference checker
-    MOZ_ASSERT(firstMonitorStub_);
-    // If the first monitored stub is a ICTypeMonitor_Fallback stub, then
-    // double check that _its_ firstMonitorStub is the same as this one.
-    MOZ_ASSERT_IF(
-        firstMonitorStub_->isTypeMonitor_Fallback(),
-        firstMonitorStub_->toTypeMonitor_Fallback()->firstMonitorStub() ==
-            firstMonitorStub_);
-  } else {
-    MOZ_ASSERT(!firstMonitorStub_);
-  }
-}
-
-bool ICMonitoredFallbackStub::initMonitoringChain(JSContext* cx,
-                                                  JSScript* script) {
-  MOZ_ASSERT(fallbackMonitorStub_ == nullptr);
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  ICStubSpace* space = script->jitScript()->fallbackStubSpace();
-  FallbackStubAllocator alloc(cx, *space);
-  auto* stub = alloc.newStub<ICTypeMonitor_Fallback>(
-      BaselineICFallbackKind::TypeMonitor, this);
-  if (!stub) {
-    return false;
-  }
-
-  fallbackMonitorStub_ = stub;
-  return true;
-}
-
-bool TypeMonitorResult(JSContext* cx, ICMonitoredFallbackStub* stub,
-                       BaselineFrame* frame, HandleScript script,
-                       jsbytecode* pc, HandleValue val) {
-  if (!IsTypeInferenceEnabled()) {
-    return true;
-  }
-
-  ICTypeMonitor_Fallback* typeMonitorFallback =
-      stub->getFallbackMonitorStub(cx, script);
-  if (!typeMonitorFallback) {
-    return false;
-  }
-
-  AutoSweepJitScript sweep(script);
-  StackTypeSet* types = script->jitScript()->bytecodeTypes(sweep, script, pc);
-  JitScript::MonitorBytecodeType(cx, script, pc, types, val);
-
-  return typeMonitorFallback->addMonitorStubForValue(cx, frame, types, val);
-}
-
-bool ICCacheIR_Updated::initUpdatingChain(JSContext* cx, ICStubSpace* space) {
-  MOZ_ASSERT(firstUpdateStub_ == nullptr);
-
-  FallbackStubAllocator alloc(cx, *space);
-  auto* stub =
-      alloc.newStub<ICTypeUpdate_Fallback>(BaselineICFallbackKind::TypeUpdate);
-  if (!stub) {
-    return false;
-  }
-
-  firstUpdateStub_ = stub;
-  return true;
-}
-
-/* static */
-ICStubSpace* ICStubCompiler::StubSpaceForStub(bool makesGCCalls,
-                                              JSScript* script,
-                                              ICScript* icScript) {
-  if (makesGCCalls) {
-    return icScript ? icScript->fallbackStubSpace()
-                    : script->jitScript()->fallbackStubSpace();
-  }
-  return script->zone()->jitZone()->optimizedStubSpace();
-}
-
 static void InitMacroAssemblerForICStub(StackMacroAssembler& masm) {
 #ifndef JS_USE_LINK_REGISTER
   // The first value contains the return addres,
   // which we pull into ICTailCallReg for tail calls.
   masm.adjustFrame(sizeof(intptr_t));
-#endif
-#ifdef JS_CODEGEN_ARM
-  masm.setSecondScratchReg(BaselineSecondScratchReg);
-#endif
-}
-
-JitCode* ICStubCompiler::getStubCode() {
-  JitRealm* realm = cx->realm()->jitRealm();
-
-  // Check for existing cached stubcode.
-  uint32_t stubKey = getKey();
-  JitCode* stubCode = realm->getStubCode(stubKey);
-  if (stubCode) {
-    return stubCode;
-  }
-
-  // Compile new stubcode.
-  JitContext jctx(cx, nullptr);
-  StackMacroAssembler masm;
-  InitMacroAssemblerForICStub(masm);
-
-  if (!generateStubCode(masm)) {
-    return nullptr;
-  }
-  Linker linker(masm);
-  Rooted<JitCode*> newStubCode(cx, linker.newCode(cx, CodeKind::Baseline));
-  if (!newStubCode) {
-    return nullptr;
-  }
-
-  // Cache newly compiled stubcode.
-  if (!realm->putStubCode(cx, stubKey, newStubCode)) {
-    return nullptr;
-  }
-
-  MOZ_ASSERT(entersStubFrame_ == ICStub::NonCacheIRStubMakesGCCalls(kind));
-  MOZ_ASSERT(!inStubFrame_);
-
-#ifdef JS_ION_PERF
-  writePerfSpewerJitCodeProfile(newStubCode, "BaselineIC");
-#endif
-
-  return newStubCode;
-}
-
-bool ICStubCompilerBase::tailCallVMInternal(MacroAssembler& masm,
-                                            TailCallVMFunctionId id) {
-  TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
-  const VMFunctionData& fun = GetVMFunction(id);
-  MOZ_ASSERT(fun.expectTailCall == TailCall);
-  uint32_t argSize = fun.explicitStackSlots() * sizeof(void*);
-  EmitBaselineTailCallVM(code, masm, argSize);
-  return true;
-}
-
-bool ICStubCompilerBase::callVMInternal(MacroAssembler& masm, VMFunctionId id) {
-  MOZ_ASSERT(inStubFrame_);
-
-  TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
-  MOZ_ASSERT(GetVMFunction(id).expectTailCall == NonTailCall);
-
-  EmitBaselineCallVM(code, masm);
-  return true;
-}
-
-template <typename Fn, Fn fn>
-bool ICStubCompilerBase::callVM(MacroAssembler& masm) {
-  VMFunctionId id = VMFunctionToId<Fn, fn>::id;
-  return callVMInternal(masm, id);
-}
-
-template <typename Fn, Fn fn>
-bool ICStubCompilerBase::tailCallVM(MacroAssembler& masm) {
-  TailCallVMFunctionId id = TailCallVMFunctionToId<Fn, fn>::id;
-  return tailCallVMInternal(masm, id);
-}
-
-void ICStubCompilerBase::enterStubFrame(MacroAssembler& masm,
-                                        Register scratch) {
-  EmitBaselineEnterStubFrame(masm, scratch);
-#ifdef DEBUG
-  framePushedAtEnterStubFrame_ = masm.framePushed();
-#endif
-
-  MOZ_ASSERT(!inStubFrame_);
-  inStubFrame_ = true;
-
-#ifdef DEBUG
-  entersStubFrame_ = true;
-#endif
-}
-
-void ICStubCompilerBase::assumeStubFrame() {
-  MOZ_ASSERT(!inStubFrame_);
-  inStubFrame_ = true;
-
-#ifdef DEBUG
-  entersStubFrame_ = true;
-
-  // |framePushed| isn't tracked precisely in ICStubs, so simply assume it to
-  // be STUB_FRAME_SIZE so that assertions don't fail in leaveStubFrame.
-  framePushedAtEnterStubFrame_ = STUB_FRAME_SIZE;
-#endif
-}
-
-void ICStubCompilerBase::leaveStubFrame(MacroAssembler& masm,
-                                        bool calledIntoIon) {
-  MOZ_ASSERT(entersStubFrame_ && inStubFrame_);
-  inStubFrame_ = false;
-
-#ifdef DEBUG
-  masm.setFramePushed(framePushedAtEnterStubFrame_);
-  if (calledIntoIon) {
-    masm.adjustFrame(sizeof(intptr_t));  // Calls into ion have this extra.
-  }
-#endif
-  EmitBaselineLeaveStubFrame(masm, calledIntoIon);
-}
-
-void ICStubCompilerBase::pushStubPayload(MacroAssembler& masm,
-                                         Register scratch) {
-  if (inStubFrame_) {
-    masm.loadPtr(Address(BaselineFrameReg, 0), scratch);
-    masm.pushBaselineFramePtr(scratch, scratch);
-  } else {
-    masm.pushBaselineFramePtr(BaselineFrameReg, scratch);
-  }
-}
-
-void ICStubCompilerBase::PushStubPayload(MacroAssembler& masm,
-                                         Register scratch) {
-  pushStubPayload(masm, scratch);
-  masm.adjustFrame(sizeof(intptr_t));
-}
-
-// TypeMonitor_Fallback
-//
-
-bool ICTypeMonitor_Fallback::addMonitorStubForValue(JSContext* cx,
-                                                    BaselineFrame* frame,
-                                                    StackTypeSet* types,
-                                                    HandleValue val) {
-  MOZ_ASSERT(types);
-
-  if (MOZ_UNLIKELY(val.isMagic())) {
-    return true;
-  }
-
-  // Don't attach too many SingleObject/ObjectGroup stubs. If the value is a
-  // primitive or if we will attach an any-object stub, we can handle this
-  // with a single PrimitiveSet or AnyValue stub so we always optimize.
-  if (numOptimizedMonitorStubs_ >= MAX_OPTIMIZED_STUBS && val.isObject() &&
-      !types->unknownObject()) {
-    return true;
-  }
-
-  bool wasDetachedMonitorChain = lastMonitorStubPtrAddr_ == nullptr;
-  MOZ_ASSERT_IF(wasDetachedMonitorChain, numOptimizedMonitorStubs_ == 0);
-
-  if (types->unknown()) {
-    // The TypeSet got marked as unknown so attach a stub that always
-    // succeeds.
-
-    // Check for existing TypeMonitor_AnyValue stubs.
-    for (ICStubConstIterator iter(firstMonitorStub()); !iter.atEnd(); iter++) {
-      if (iter->isTypeMonitor_AnyValue()) {
-        return true;
-      }
-    }
-
-    // Discard existing stubs.
-    resetMonitorStubChain(cx->zone());
-    wasDetachedMonitorChain = (lastMonitorStubPtrAddr_ == nullptr);
-
-    ICTypeMonitor_AnyValue::Compiler compiler(cx);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(frame->script()));
-    if (!stub) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  Added TypeMonitor stub %p for any value",
-            stub);
-    addOptimizedMonitorStub(stub);
-
-  } else if (val.isPrimitive() || types->unknownObject()) {
-    ValueType type = val.type();
-
-    // Check for existing TypeMonitor stub.
-    ICTypeMonitor_PrimitiveSet* existingStub = nullptr;
-    for (ICStubConstIterator iter(firstMonitorStub()); !iter.atEnd(); iter++) {
-      if (iter->isTypeMonitor_PrimitiveSet()) {
-        existingStub = iter->toTypeMonitor_PrimitiveSet();
-        if (existingStub->containsType(type)) {
-          return true;
-        }
-      }
-    }
-
-    if (val.isObject()) {
-      // Check for existing SingleObject/ObjectGroup stubs and discard
-      // stubs if we find one. Ideally we would discard just these stubs,
-      // but unlinking individual type monitor stubs is somewhat
-      // complicated.
-      MOZ_ASSERT(types->unknownObject());
-      bool hasObjectStubs = false;
-      for (ICStubConstIterator iter(firstMonitorStub()); !iter.atEnd();
-           iter++) {
-        if (iter->isTypeMonitor_SingleObject() ||
-            iter->isTypeMonitor_ObjectGroup()) {
-          hasObjectStubs = true;
-          break;
-        }
-      }
-      if (hasObjectStubs) {
-        resetMonitorStubChain(cx->zone());
-        wasDetachedMonitorChain = (lastMonitorStubPtrAddr_ == nullptr);
-        existingStub = nullptr;
-      }
-    }
-
-    ICTypeMonitor_PrimitiveSet::Compiler compiler(cx, existingStub, type);
-    ICStub* stub =
-        existingStub ? compiler.updateStub()
-                     : compiler.getStub(compiler.getStubSpace(frame->script()));
-    if (!stub) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC,
-            "  %s TypeMonitor stub %p for primitive type %u",
-            existingStub ? "Modified existing" : "Created new", stub,
-            static_cast<uint8_t>(type));
-
-    if (!existingStub) {
-      MOZ_ASSERT(!hasStub(TypeMonitor_PrimitiveSet));
-      addOptimizedMonitorStub(stub);
-    }
-
-  } else if (val.toObject().isSingleton()) {
-    RootedObject obj(cx, &val.toObject());
-
-    // Check for existing TypeMonitor stub.
-    for (ICStubConstIterator iter(firstMonitorStub()); !iter.atEnd(); iter++) {
-      if (iter->isTypeMonitor_SingleObject() &&
-          iter->toTypeMonitor_SingleObject()->object() == obj) {
-        return true;
-      }
-    }
-
-    ICTypeMonitor_SingleObject::Compiler compiler(cx, obj);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(frame->script()));
-    if (!stub) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  Added TypeMonitor stub %p for singleton %p",
-            stub, obj.get());
-
-    addOptimizedMonitorStub(stub);
-
-  } else {
-    RootedObjectGroup group(cx, val.toObject().group());
-
-    // Check for existing TypeMonitor stub.
-    for (ICStubConstIterator iter(firstMonitorStub()); !iter.atEnd(); iter++) {
-      if (iter->isTypeMonitor_ObjectGroup() &&
-          iter->toTypeMonitor_ObjectGroup()->group() == group) {
-        return true;
-      }
-    }
-
-    ICTypeMonitor_ObjectGroup::Compiler compiler(cx, group);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(frame->script()));
-    if (!stub) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC,
-            "  Added TypeMonitor stub %p for ObjectGroup %p", stub,
-            group.get());
-
-    addOptimizedMonitorStub(stub);
-  }
-
-  bool firstMonitorStubAdded =
-      wasDetachedMonitorChain && (numOptimizedMonitorStubs_ > 0);
-
-  if (firstMonitorStubAdded) {
-    // Was an empty monitor chain before, but a new stub was added.  This is the
-    // only time that any main stubs' firstMonitorStub fields need to be updated
-    // to refer to the newly added monitor stub.
-    ICStub* firstStub = mainFallbackStub_->icEntry()->firstStub();
-    for (ICStubConstIterator iter(firstStub); !iter.atEnd(); iter++) {
-      // Non-monitored stubs are used if the result has always the same type,
-      // e.g. a StringLength stub will always return int32.
-      if (!iter->isMonitored()) {
-        continue;
-      }
-
-      // Since we just added the first optimized monitoring stub, any
-      // existing main stub's |firstMonitorStub| MUST be pointing to the
-      // fallback monitor stub (i.e. this stub).
-      MOZ_ASSERT(iter->toMonitoredStub()->firstMonitorStub() == this);
-      iter->toMonitoredStub()->updateFirstMonitorStub(firstMonitorStub_);
-    }
-  }
-
-  return true;
-}
-
-bool DoTypeMonitorFallback(JSContext* cx, BaselineFrame* frame,
-                           ICTypeMonitor_Fallback* stub, HandleValue value,
-                           MutableHandleValue res) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  JSScript* script = frame->script();
-  jsbytecode* pc = stub->icEntry()->pc(script);
-  TypeFallbackICSpew(cx, stub, "TypeMonitor");
-
-  // Copy input value to res.
-  res.set(value);
-
-  JitScript* jitScript = script->jitScript();
-  AutoSweepJitScript sweep(script);
-
-  StackTypeSet* types;
-  uint32_t argument;
-  if (stub->monitorsArgument(&argument)) {
-    MOZ_ASSERT(pc == script->code());
-    types = jitScript->argTypes(sweep, script, argument);
-    JitScript::MonitorArgType(cx, script, argument, value);
-  } else if (stub->monitorsThis()) {
-    MOZ_ASSERT(pc == script->code());
-    types = jitScript->thisTypes(sweep, script);
-    JitScript::MonitorThisType(cx, script, value);
-  } else {
-    types = jitScript->bytecodeTypes(sweep, script, pc);
-    JitScript::MonitorBytecodeType(cx, script, pc, types, value);
-  }
-
-  return stub->addMonitorStubForValue(cx, frame, types, value);
-}
-
-bool FallbackICCodeCompiler::emit_TypeMonitor() {
-  static_assert(R0 == JSReturnOperand);
-
-  // Restore the tail call register.
-  EmitRestoreTailCallReg(masm);
-
-  masm.pushValue(R0);
-  masm.push(ICStubReg);
-  masm.pushBaselineFramePtr(BaselineFrameReg, R0.scratchReg());
-
-  using Fn = bool (*)(JSContext*, BaselineFrame*, ICTypeMonitor_Fallback*,
-                      HandleValue, MutableHandleValue);
-  return tailCallVM<Fn, DoTypeMonitorFallback>(masm);
-}
-
-bool ICTypeMonitor_PrimitiveSet::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label success;
-  if ((flags_ & TypeToFlag(ValueType::Int32)) &&
-      !(flags_ & TypeToFlag(ValueType::Double))) {
-    masm.branchTestInt32(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Double)) {
-    masm.branchTestNumber(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Undefined)) {
-    masm.branchTestUndefined(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Boolean)) {
-    masm.branchTestBoolean(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::String)) {
-    masm.branchTestString(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Symbol)) {
-    masm.branchTestSymbol(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::BigInt)) {
-    masm.branchTestBigInt(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Object)) {
-    masm.branchTestObject(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Null)) {
-    masm.branchTestNull(Assembler::Equal, R0, &success);
-  }
-
-  EmitStubGuardFailure(masm);
-
-  masm.bind(&success);
-  EmitReturnFromIC(masm);
-  return true;
-}
-
-static void MaybeWorkAroundAmdBug(MacroAssembler& masm) {
-  // Attempt to work around an AMD bug (see bug 1034706 and bug 1281759), by
-  // inserting 32-bytes of NOPs.
-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-  if (CPUInfo::NeedAmdBugWorkaround()) {
-    masm.nop(9);
-    masm.nop(9);
-    masm.nop(9);
-    masm.nop(5);
-  }
-#endif
-}
-
-bool ICTypeMonitor_SingleObject::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label failure;
-  masm.branchTestObject(Assembler::NotEqual, R0, &failure);
-  MaybeWorkAroundAmdBug(masm);
-
-  // Guard on the object's identity.
-  Register obj = masm.extractObject(R0, ExtractTemp0);
-  Address expectedObject(ICStubReg,
-                         ICTypeMonitor_SingleObject::offsetOfObject());
-  masm.branchPtr(Assembler::NotEqual, expectedObject, obj, &failure);
-  MaybeWorkAroundAmdBug(masm);
-
-  EmitReturnFromIC(masm);
-  MaybeWorkAroundAmdBug(masm);
-
-  masm.bind(&failure);
-  EmitStubGuardFailure(masm);
-  return true;
-}
-
-bool ICTypeMonitor_ObjectGroup::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label failure;
-  masm.branchTestObject(Assembler::NotEqual, R0, &failure);
-  MaybeWorkAroundAmdBug(masm);
-
-  // Guard on the object's ObjectGroup. No Spectre mitigations are needed
-  // here: we're just recording type information for Ion compilation and
-  // it's safe to speculatively return.
-  Register obj = masm.extractObject(R0, ExtractTemp0);
-  Address expectedGroup(ICStubReg, ICTypeMonitor_ObjectGroup::offsetOfGroup());
-  masm.branchTestObjGroupNoSpectreMitigations(
-      Assembler::NotEqual, obj, expectedGroup, R1.scratchReg(), &failure);
-  MaybeWorkAroundAmdBug(masm);
-
-  EmitReturnFromIC(masm);
-  MaybeWorkAroundAmdBug(masm);
-
-  masm.bind(&failure);
-  EmitStubGuardFailure(masm);
-  return true;
-}
-
-bool ICTypeMonitor_AnyValue::Compiler::generateStubCode(MacroAssembler& masm) {
-  EmitReturnFromIC(masm);
-  return true;
-}
-
-bool ICCacheIR_Updated::addUpdateStubForValue(JSContext* cx,
-                                              HandleScript outerScript,
-                                              HandleObject obj,
-                                              HandleObjectGroup group,
-                                              HandleId id, HandleValue val) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  EnsureTrackPropertyTypes(cx, obj, id);
-
-  // Make sure that undefined values are explicitly included in the property
-  // types for an object if generating a stub to write an undefined value.
-  if (val.isUndefined() && CanHaveEmptyPropertyTypesForOwnProperty(obj)) {
-    MOZ_ASSERT(obj->group() == group);
-    AddTypePropertyId(cx, obj, id, val);
-  }
-
-  bool unknown = false, unknownObject = false;
-  AutoSweepObjectGroup sweep(group);
-  if (group->unknownProperties(sweep)) {
-    unknown = unknownObject = true;
-  } else {
-    if (HeapTypeSet* types = group->maybeGetProperty(sweep, id)) {
-      unknown = types->unknown();
-      unknownObject = types->unknownObject();
-    } else {
-      // We don't record null/undefined types for certain TypedObject
-      // properties. In these cases |types| is allowed to be nullptr
-      // without implying unknown types. See DoTypeUpdateFallback.
-      MOZ_ASSERT(obj->is<TypedObject>());
-      MOZ_ASSERT(val.isNullOrUndefined());
-    }
-  }
-  MOZ_ASSERT_IF(unknown, unknownObject);
-
-  // Don't attach too many SingleObject/ObjectGroup stubs unless we can
-  // replace them with a single PrimitiveSet or AnyValue stub.
-  if (numOptimizedStubs_ >= MAX_OPTIMIZED_STUBS && val.isObject() &&
-      !unknownObject) {
-    return true;
-  }
-
-  if (unknown) {
-    // Attach a stub that always succeeds. We should not have a
-    // TypeUpdate_AnyValue stub yet.
-    MOZ_ASSERT(!hasTypeUpdateStub(TypeUpdate_AnyValue));
-
-    // Discard existing stubs.
-    resetUpdateStubChain(cx->zone());
-
-    ICTypeUpdate_AnyValue::Compiler compiler(cx);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(outerScript));
-    if (!stub) {
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  Added TypeUpdate stub %p for any value",
-            stub);
-    addOptimizedUpdateStub(stub);
-
-  } else if (val.isPrimitive() || unknownObject) {
-    ValueType type = val.type();
-
-    // Check for existing TypeUpdate stub.
-    ICTypeUpdate_PrimitiveSet* existingStub = nullptr;
-    for (ICStubConstIterator iter(firstUpdateStub_); !iter.atEnd(); iter++) {
-      if (iter->isTypeUpdate_PrimitiveSet()) {
-        existingStub = iter->toTypeUpdate_PrimitiveSet();
-        MOZ_ASSERT(!existingStub->containsType(type));
-      }
-    }
-
-    if (val.isObject()) {
-      // Discard existing ObjectGroup/SingleObject stubs.
-      resetUpdateStubChain(cx->zone());
-      if (existingStub) {
-        addOptimizedUpdateStub(existingStub);
-      }
-    }
-
-    ICTypeUpdate_PrimitiveSet::Compiler compiler(cx, existingStub, type);
-    ICStub* stub = existingStub
-                       ? compiler.updateStub()
-                       : compiler.getStub(compiler.getStubSpace(outerScript));
-    if (!stub) {
-      return false;
-    }
-    if (!existingStub) {
-      MOZ_ASSERT(!hasTypeUpdateStub(TypeUpdate_PrimitiveSet));
-      addOptimizedUpdateStub(stub);
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  %s TypeUpdate stub %p for primitive type %d",
-            existingStub ? "Modified existing" : "Created new", stub,
-            static_cast<uint8_t>(type));
-
-  } else if (val.toObject().isSingleton()) {
-    RootedObject obj(cx, &val.toObject());
-
-#ifdef DEBUG
-    // We should not have a stub for this object.
-    for (ICStubConstIterator iter(firstUpdateStub_); !iter.atEnd(); iter++) {
-      MOZ_ASSERT_IF(iter->isTypeUpdate_SingleObject(),
-                    iter->toTypeUpdate_SingleObject()->object() != obj);
-    }
-#endif
-
-    ICTypeUpdate_SingleObject::Compiler compiler(cx, obj);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(outerScript));
-    if (!stub) {
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  Added TypeUpdate stub %p for singleton %p",
-            stub, obj.get());
-
-    addOptimizedUpdateStub(stub);
-
-  } else {
-    RootedObjectGroup group(cx, val.toObject().group());
-
-#ifdef DEBUG
-    // We should not have a stub for this group.
-    for (ICStubConstIterator iter(firstUpdateStub_); !iter.atEnd(); iter++) {
-      MOZ_ASSERT_IF(iter->isTypeUpdate_ObjectGroup(),
-                    iter->toTypeUpdate_ObjectGroup()->group() != group);
-    }
-#endif
-
-    ICTypeUpdate_ObjectGroup::Compiler compiler(cx, group);
-    ICStub* stub = compiler.getStub(compiler.getStubSpace(outerScript));
-    if (!stub) {
-      return false;
-    }
-
-    JitSpew(JitSpew_BaselineIC, "  Added TypeUpdate stub %p for ObjectGroup %p",
-            stub, group.get());
-
-    addOptimizedUpdateStub(stub);
-  }
-
-  return true;
-}
-
-//
-// TypeUpdate_Fallback
-//
-bool DoTypeUpdateFallback(JSContext* cx, BaselineFrame* frame,
-                          ICCacheIR_Updated* stub, HandleValue objval,
-                          HandleValue value) {
-  // This can get called from optimized stubs. Therefore it is not allowed to
-  // gc.
-  JS::AutoCheckCannotGC nogc;
-
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  FallbackICSpew(cx, stub->getChainFallback(), "TypeUpdate(%s)",
-                 ICStub::KindString(stub->kind()));
-
-  MOZ_ASSERT(stub->isCacheIR_Updated());
-
-  RootedScript script(cx, frame->script());
-  RootedObject obj(cx, &objval.toObject());
-
-  RootedId id(cx, stub->toCacheIR_Updated()->updateStubId());
-  MOZ_ASSERT(id.get() != JSID_EMPTY);
-
-  // The group should match the object's group.
-  RootedObjectGroup group(cx, stub->toCacheIR_Updated()->updateStubGroup());
-#ifdef DEBUG
-  MOZ_ASSERT(obj->group() == group);
-#endif
-
-  JSObject* maybeSingleton = obj->isSingleton() ? obj.get() : nullptr;
-  AddTypePropertyId(cx, group, maybeSingleton, id, value);
-
-  if (MOZ_UNLIKELY(
-          !stub->addUpdateStubForValue(cx, script, obj, group, id, value))) {
-    // The calling JIT code assumes this function is infallible (for
-    // instance we may reallocate dynamic slots before calling this),
-    // so ignore OOMs if we failed to attach a stub.
-    cx->recoverFromOutOfMemory();
-  }
-
-  return true;
+#endif
+#ifdef JS_CODEGEN_ARM
+  masm.setSecondScratchReg(BaselineSecondScratchReg);
+#endif
 }
 
-bool FallbackICCodeCompiler::emit_TypeUpdate() {
-  // Just store false into R1.scratchReg() and return.
-  masm.move32(Imm32(0), R1.scratchReg());
-  EmitReturnFromIC(masm);
+bool FallbackICCodeCompiler::tailCallVMInternal(MacroAssembler& masm,
+                                                TailCallVMFunctionId id) {
+  TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
+  const VMFunctionData& fun = GetVMFunction(id);
+  MOZ_ASSERT(fun.expectTailCall == TailCall);
+  uint32_t argSize = fun.explicitStackSlots() * sizeof(void*);
+  EmitBaselineTailCallVM(code, masm, argSize);
   return true;
 }
 
-bool ICTypeUpdate_PrimitiveSet::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label success;
-  if ((flags_ & TypeToFlag(ValueType::Int32)) &&
-      !(flags_ & TypeToFlag(ValueType::Double))) {
-    masm.branchTestInt32(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Double)) {
-    masm.branchTestNumber(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Undefined)) {
-    masm.branchTestUndefined(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::Boolean)) {
-    masm.branchTestBoolean(Assembler::Equal, R0, &success);
-  }
-
-  if (flags_ & TypeToFlag(ValueType::String)) {
-    masm.branchTestString(Assembler::Equal, R0, &success);
-  }
+bool FallbackICCodeCompiler::callVMInternal(MacroAssembler& masm,
+                                            VMFunctionId id) {
+  MOZ_ASSERT(inStubFrame_);
 
-  if (flags_ & TypeToFlag(ValueType::Symbol)) {
-    masm.branchTestSymbol(Assembler::Equal, R0, &success);
-  }
+  TrampolinePtr code = cx->runtime()->jitRuntime()->getVMWrapper(id);
+  MOZ_ASSERT(GetVMFunction(id).expectTailCall == NonTailCall);
 
-  if (flags_ & TypeToFlag(ValueType::BigInt)) {
-    masm.branchTestBigInt(Assembler::Equal, R0, &success);
-  }
+  EmitBaselineCallVM(code, masm);
+  return true;
+}
 
-  if (flags_ & TypeToFlag(ValueType::Object)) {
-    masm.branchTestObject(Assembler::Equal, R0, &success);
-  }
+template <typename Fn, Fn fn>
+bool FallbackICCodeCompiler::callVM(MacroAssembler& masm) {
+  VMFunctionId id = VMFunctionToId<Fn, fn>::id;
+  return callVMInternal(masm, id);
+}
 
-  if (flags_ & TypeToFlag(ValueType::Null)) {
-    masm.branchTestNull(Assembler::Equal, R0, &success);
-  }
+template <typename Fn, Fn fn>
+bool FallbackICCodeCompiler::tailCallVM(MacroAssembler& masm) {
+  TailCallVMFunctionId id = TailCallVMFunctionToId<Fn, fn>::id;
+  return tailCallVMInternal(masm, id);
+}
 
-  EmitStubGuardFailure(masm);
+void FallbackICCodeCompiler::enterStubFrame(MacroAssembler& masm,
+                                            Register scratch) {
+  EmitBaselineEnterStubFrame(masm, scratch);
+#ifdef DEBUG
+  framePushedAtEnterStubFrame_ = masm.framePushed();
+#endif
 
-  // Type matches, load true into R1.scratchReg() and return.
-  masm.bind(&success);
-  masm.mov(ImmWord(1), R1.scratchReg());
-  EmitReturnFromIC(masm);
+  MOZ_ASSERT(!inStubFrame_);
+  inStubFrame_ = true;
 
-  return true;
+#ifdef DEBUG
+  entersStubFrame_ = true;
+#endif
 }
 
-bool ICTypeUpdate_SingleObject::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label failure;
-  masm.branchTestObject(Assembler::NotEqual, R0, &failure);
-
-  // Guard on the object's identity.
-  Register obj = masm.extractObject(R0, R1.scratchReg());
-  Address expectedObject(ICStubReg,
-                         ICTypeUpdate_SingleObject::offsetOfObject());
-  masm.branchPtr(Assembler::NotEqual, expectedObject, obj, &failure);
+void FallbackICCodeCompiler::assumeStubFrame() {
+  MOZ_ASSERT(!inStubFrame_);
+  inStubFrame_ = true;
 
-  // Identity matches, load true into R1.scratchReg() and return.
-  masm.mov(ImmWord(1), R1.scratchReg());
-  EmitReturnFromIC(masm);
+#ifdef DEBUG
+  entersStubFrame_ = true;
 
-  masm.bind(&failure);
-  EmitStubGuardFailure(masm);
-  return true;
+  // |framePushed| isn't tracked precisely in ICStubs, so simply assume it to
+  // be STUB_FRAME_SIZE so that assertions don't fail in leaveStubFrame.
+  framePushedAtEnterStubFrame_ = STUB_FRAME_SIZE;
+#endif
 }
 
-bool ICTypeUpdate_ObjectGroup::Compiler::generateStubCode(
-    MacroAssembler& masm) {
-  Label failure;
-
-  Register scratch1 = R1.scratchReg();
-  masm.fallibleUnboxObject(R0, scratch1, &failure);
-
-  // Guard on the object's ObjectGroup.
-  Address expectedGroup(ICStubReg, ICTypeUpdate_ObjectGroup::offsetOfGroup());
-  masm.branchTestObjGroup(Assembler::NotEqual, scratch1, expectedGroup,
-                          scratch1, R0.payloadOrValueReg(), &failure);
+void FallbackICCodeCompiler::leaveStubFrame(MacroAssembler& masm,
+                                            bool calledIntoIon) {
+  MOZ_ASSERT(entersStubFrame_ && inStubFrame_);
+  inStubFrame_ = false;
 
-  // Group matches, load true into R1.scratchReg() and return.
-  masm.mov(ImmWord(1), R1.scratchReg());
-  EmitReturnFromIC(masm);
+#ifdef DEBUG
+  masm.setFramePushed(framePushedAtEnterStubFrame_);
+  if (calledIntoIon) {
+    masm.adjustFrame(sizeof(intptr_t));  // Calls into ion have this extra.
+  }
+#endif
+  EmitBaselineLeaveStubFrame(masm, calledIntoIon);
+}
 
-  masm.bind(&failure);
-  EmitStubGuardFailure(masm);
-  return true;
+void FallbackICCodeCompiler::pushStubPayload(MacroAssembler& masm,
+                                             Register scratch) {
+  if (inStubFrame_) {
+    masm.loadPtr(Address(BaselineFrameReg, 0), scratch);
+    masm.pushBaselineFramePtr(scratch, scratch);
+  } else {
+    masm.pushBaselineFramePtr(BaselineFrameReg, scratch);
+  }
 }
 
-bool ICTypeUpdate_AnyValue::Compiler::generateStubCode(MacroAssembler& masm) {
-  // AnyValue always matches so return true.
-  masm.mov(ImmWord(1), R1.scratchReg());
-  EmitReturnFromIC(masm);
-  return true;
+void FallbackICCodeCompiler::PushStubPayload(MacroAssembler& masm,
+                                             Register scratch) {
+  pushStubPayload(masm, scratch);
+  masm.adjustFrame(sizeof(intptr_t));
 }
 
 //
@@ -1741,8 +867,7 @@
 
   MOZ_ASSERT(!arg.isBoolean());
 
-  TryAttachStub<ToBoolIRGenerator>("ToBool", cx, frame, stub,
-                                   BaselineCacheIRStubKind::Regular, arg);
+  TryAttachStub<ToBoolIRGenerator>("ToBool", cx, frame, stub, arg);
 
   bool cond = ToBoolean(arg);
   ret.setBoolean(cond);
@@ -1766,81 +891,6 @@
   return tailCallVM<Fn, DoToBoolFallback>(masm);
 }
 
-static void StripPreliminaryObjectStubs(JSContext* cx, ICFallbackStub* stub,
-                                        JSScript* script) {
-  // Before the new script properties analysis has been performed on a type,
-  // all instances of that type have the maximum number of fixed slots.
-  // Afterwards, the objects (even the preliminary ones) might be changed
-  // to reduce the number of fixed slots they have. If we generate stubs for
-  // both the old and new number of fixed slots, the stub will look
-  // polymorphic to IonBuilder when it is actually monomorphic. To avoid
-  // this, strip out any stubs for preliminary objects before attaching a new
-  // stub which isn't on a preliminary object.
-
-  for (ICStubIterator iter = stub->beginChain(); !iter.atEnd(); iter++) {
-    if (iter->isCacheIR_Regular() &&
-        iter->toCacheIR_Regular()->hasPreliminaryObject()) {
-      iter.unlink(cx, script);
-    } else if (iter->isCacheIR_Monitored() &&
-               iter->toCacheIR_Monitored()->hasPreliminaryObject()) {
-      iter.unlink(cx, script);
-    } else if (iter->isCacheIR_Updated() &&
-               iter->toCacheIR_Updated()->hasPreliminaryObject()) {
-      iter.unlink(cx, script);
-    }
-  }
-}
-
-static bool TryAttachGetPropStub(const char* name, JSContext* cx,
-                                 BaselineFrame* frame, ICFallbackStub* stub,
-                                 CacheKind kind, HandleValue val,
-                                 HandleValue idVal, HandleValue receiver) {
-  bool attached = false;
-
-  if (stub->state().maybeTransition()) {
-    stub->discardStubs(cx, frame->invalidationScript());
-  }
-
-  if (stub->state().canAttachStub()) {
-    RootedScript script(cx, frame->script());
-    ICScript* icScript = frame->icScript();
-    jsbytecode* pc = stub->icEntry()->pc(script);
-
-    GetPropIRGenerator gen(cx, script, pc, stub->state().mode(), kind, val,
-                           idVal, receiver, GetPropertyResultFlags::All);
-    switch (gen.tryAttachStub()) {
-      case AttachDecision::Attach: {
-        ICStub* newStub =
-            AttachBaselineCacheIRStub(cx, gen.writerRef(), gen.cacheKind(),
-                                      BaselineCacheIRStubKind::Monitored,
-                                      script, icScript, stub, &attached);
-        if (newStub) {
-          JitSpew(JitSpew_BaselineIC, "  Attached %s CacheIR stub", name);
-          if (gen.shouldNotePreliminaryObjectStub()) {
-            newStub->toCacheIR_Monitored()->notePreliminaryObject();
-          } else if (gen.shouldUnlinkPreliminaryObjectStubs()) {
-            StripPreliminaryObjectStubs(cx, stub, frame->invalidationScript());
-          }
-        }
-      } break;
-      case AttachDecision::NoAction:
-        break;
-      case AttachDecision::TemporarilyUnoptimizable:
-        attached = true;
-        break;
-      case AttachDecision::Deferred:
-        MOZ_ASSERT_UNREACHABLE("No deferred GetProp stubs");
-        break;
-    }
-
-    if (!attached) {
-      stub->trackNotAttached(cx, frame->invalidationScript());
-    }
-  }
-
-  return attached;
-}
-
 //
 // GetElem_Fallback
 //
@@ -1850,13 +900,12 @@
                        HandleValue rhs, MutableHandleValue res) {
   stub->incrementEnteredCount();
 
-  RootedScript script(cx, frame->script());
-  jsbytecode* pc = stub->icEntry()->pc(frame->script());
-
-  JSOp op = JSOp(*pc);
-  FallbackICSpew(cx, stub, "GetElem(%s)", CodeName(op));
+  FallbackICSpew(cx, stub, "GetElem");
 
-  MOZ_ASSERT(op == JSOp::GetElem || op == JSOp::CallElem);
+#ifdef DEBUG
+  jsbytecode* pc = stub->icEntry()->pc(frame->script());
+  MOZ_ASSERT(JSOp(*pc) == JSOp::GetElem);
+#endif
 
   // Don't pass lhs directly, we need it when generating stubs.
   RootedValue lhsCopy(cx, lhs);
@@ -1864,49 +913,19 @@
   bool isOptimizedArgs = false;
   if (lhs.isMagic(JS_OPTIMIZED_ARGUMENTS)) {
     // Handle optimized arguments[i] access.
-    if (!GetElemOptimizedArguments(cx, frame, &lhsCopy, rhs, res,
-                                   &isOptimizedArgs)) {
-      return false;
-    }
-    if (isOptimizedArgs) {
-      if (!TypeMonitorResult(cx, stub, frame, script, pc, res)) {
-        return false;
-      }
-    }
+    isOptimizedArgs =
+        MaybeGetElemOptimizedArguments(cx, frame, &lhsCopy, rhs, res);
   }
 
-  bool attached = TryAttachGetPropStub("GetElem", cx, frame, stub,
-                                       CacheKind::GetElem, lhs, rhs, lhs);
+  TryAttachStub<GetPropIRGenerator>("GetElem", cx, frame, stub,
+                                    CacheKind::GetElem, lhs, rhs, lhs);
 
   if (!isOptimizedArgs) {
-    if (!GetElementOperation(cx, op, lhsCopy, rhs, res)) {
-      return false;
-    }
-
-    if (!TypeMonitorResult(cx, stub, frame, script, pc, res)) {
+    if (!GetElementOperation(cx, lhsCopy, rhs, res)) {
       return false;
     }
   }
 
-  if (attached) {
-    return true;
-  }
-
-  // GetElem operations which could access negative indexes generally can't
-  // be optimized without the potential for bailouts, as we can't statically
-  // determine that an object has no properties on such indexes.
-  if (rhs.isNumber() && rhs.toNumber() < 0) {
-    stub->noteNegativeIndex();
-  }
-
-  // GetElem operations which could access non-integer indexes generally can't
-  // be optimized without the potential for bailouts.
-  int32_t representable;
-  if (rhs.isNumber() && rhs.isDouble() &&
-      !mozilla::NumberEqualsInt32(rhs.toDouble(), &representable)) {
-    stub->setSawNonIntegerIndex();
-  }
-
   return true;
 }
 
@@ -1924,40 +943,13 @@
 
   MOZ_ASSERT(op == JSOp::GetElemSuper);
 
-  bool attached =
-      TryAttachGetPropStub("GetElemSuper", cx, frame, stub,
-                           CacheKind::GetElemSuper, lhs, rhs, receiver);
+  TryAttachStub<GetPropIRGenerator>("GetElemSuper", cx, frame, stub,
+                                    CacheKind::GetElemSuper, lhs, rhs,
+                                    receiver);
 
   // |lhs| is [[HomeObject]].[[Prototype]] which must be Object
   RootedObject lhsObj(cx, &lhs.toObject());
-  if (!GetObjectElementOperation(cx, op, lhsObj, receiver, rhs, res)) {
-    return false;
-  }
-
-  if (!TypeMonitorResult(cx, stub, frame, script, pc, res)) {
-    return false;
-  }
-
-  if (attached) {
-    return true;
-  }
-
-  // GetElem operations which could access negative indexes generally can't
-  // be optimized without the potential for bailouts, as we can't statically
-  // determine that an object has no properties on such indexes.
-  if (rhs.isNumber() && rhs.toNumber() < 0) {
-    stub->noteNegativeIndex();
-  }
-
-  // GetElem operations which could access non-integer indexes generally can't
-  // be optimized without the potential for bailouts.
-  int32_t representable;
-  if (rhs.isNumber() && rhs.isDouble() &&
-      !mozilla::NumberEqualsInt32(rhs.toDouble(), &representable)) {
-    stub->setSawNonIntegerIndex();
-  }
-
-  return true;
+  return GetObjectElementOperation(cx, op, lhsObj, receiver, rhs, res);
 }
 
 bool FallbackICCodeCompiler::emitGetElem(bool hasReceiver) {
@@ -2021,22 +1013,7 @@
 
   leaveStubFrame(masm, true);
 
-  if (!IsTypeInferenceEnabled()) {
-    EmitReturnFromIC(masm);
-    return true;
-  }
-
-  // When we get here, ICStubReg contains the ICGetElem_Fallback stub,
-  // which we can't use to enter the TypeMonitor IC, because it's a
-  // MonitoredFallbackStub instead of a MonitoredStub. So, we cheat. Note that
-  // we must have a non-null fallbackMonitorStub here because
-  // BaselineStackBuilder::buildStubFrame delazifies the stub when bailing out.
-  masm.loadPtr(Address(ICStubReg,
-                       ICMonitoredFallbackStub::offsetOfFallbackMonitorStub()),
-               ICStubReg);
-  EmitEnterTypeMonitorIC(masm,
-                         ICTypeMonitor_Fallback::offsetOfFirstMonitorStub());
-
+  EmitReturnFromIC(masm);
   return true;
 }
 
@@ -2048,14 +1025,6 @@
   return emitGetElem(/* hasReceiver = */ true);
 }
 
-static void SetUpdateStubData(ICCacheIR_Updated* stub,
-                              const PropertyTypeCheckInfo* info) {
-  if (info->isSet()) {
-    stub->updateStubGroup() = info->group();
-    stub->updateStubId() = info->id();
-  }
-}
-
 bool DoSetElemFallback(JSContext* cx, BaselineFrame* frame,
                        ICSetElem_Fallback* stub, Value* stack, HandleValue objv,
                        HandleValue index, HandleValue rhs) {
@@ -2071,8 +1040,7 @@
 
   MOZ_ASSERT(op == JSOp::SetElem || op == JSOp::StrictSetElem ||
              op == JSOp::InitElem || op == JSOp::InitHiddenElem ||
-             op == JSOp::InitLockedElem || op == JSOp::InitElemArray ||
-             op == JSOp::InitElemInc);
+             op == JSOp::InitLockedElem || op == JSOp::InitElemInc);
 
   int objvIndex = -3;
   RootedObject obj(
@@ -2082,10 +1050,6 @@
   }
 
   RootedShape oldShape(cx, obj->shape());
-  RootedObjectGroup oldGroup(cx, JSObject::getGroup(cx, obj));
-  if (!oldGroup) {
-    return false;
-  }
 
   // We cannot attach a stub if the operation executed after the stub
   // is attached may throw.
@@ -2105,23 +1069,10 @@
     switch (gen.tryAttachStub()) {
       case AttachDecision::Attach: {
         ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(),
-            BaselineCacheIRStubKind::Updated, frame->script(), icScript, stub,
-            &attached);
+            cx, gen.writerRef(), gen.cacheKind(), frame->script(), icScript,
+            stub, &attached);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached SetElem CacheIR stub");
-
-          SetUpdateStubData(newStub->toCacheIR_Updated(), gen.typeCheckInfo());
-
-          if (gen.shouldNotePreliminaryObjectStub()) {
-            newStub->toCacheIR_Updated()->notePreliminaryObject();
-          } else if (gen.shouldUnlinkPreliminaryObjectStubs()) {
-            StripPreliminaryObjectStubs(cx, stub, frame->invalidationScript());
-          }
-
-          if (gen.attachedTypedArrayOOBStub()) {
-            stub->noteHasTypedArrayOOB();
-          }
         }
       } break;
       case AttachDecision::NoAction:
@@ -2141,24 +1092,14 @@
     if (!InitElemOperation(cx, pc, obj, index, rhs)) {
       return false;
     }
-  } else if (op == JSOp::InitElemArray) {
-    MOZ_ASSERT(uint32_t(index.toInt32()) <= INT32_MAX,
-               "the bytecode emitter must fail to compile code that would "
-               "produce JSOp::InitElemArray with an index exceeding "
-               "int32_t range");
-    MOZ_ASSERT(uint32_t(index.toInt32()) == GET_UINT32(pc));
-    if (!InitArrayElemOperation(cx, pc, obj.as<ArrayObject>(), index.toInt32(),
-                                rhs)) {
-      return false;
-    }
   } else if (op == JSOp::InitElemInc) {
-    if (!InitArrayElemOperation(cx, pc, obj.as<ArrayObject>(), index.toInt32(),
-                                rhs)) {
+    if (!InitElemIncOperation(cx, obj.as<ArrayObject>(), index.toInt32(),
+                              rhs)) {
       return false;
     }
   } else {
-    if (!SetObjectElement(cx, obj, index, rhs, objv,
-                          JSOp(*pc) == JSOp::StrictSetElem, script, pc)) {
+    if (!SetObjectElementWithReceiver(cx, obj, index, rhs, objv,
+                                      JSOp(*pc) == JSOp::StrictSetElem)) {
       return false;
     }
   }
@@ -2190,25 +1131,16 @@
                            stub->state().mode(), objv, index, rhs);
 
     MOZ_ASSERT(deferType == DeferType::AddSlot);
-    AttachDecision decision = gen.tryAttachAddSlotStub(oldGroup, oldShape);
+    AttachDecision decision = gen.tryAttachAddSlotStub(oldShape);
 
     switch (decision) {
       case AttachDecision::Attach: {
         ICScript* icScript = frame->icScript();
         ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(),
-            BaselineCacheIRStubKind::Updated, frame->script(), icScript, stub,
-            &attached);
+            cx, gen.writerRef(), gen.cacheKind(), frame->script(), icScript,
+            stub, &attached);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached SetElem CacheIR stub");
-
-          SetUpdateStubData(newStub->toCacheIR_Updated(), gen.typeCheckInfo());
-
-          if (gen.shouldNotePreliminaryObjectStub()) {
-            newStub->toCacheIR_Updated()->notePreliminaryObject();
-          } else if (gen.shouldUnlinkPreliminaryObjectStubs()) {
-            StripPreliminaryObjectStubs(cx, stub, frame->invalidationScript());
-          }
         }
       } break;
       case AttachDecision::NoAction:
@@ -2279,9 +1211,8 @@
     return false;
   }
 
-  TryAttachStub<HasPropIRGenerator>("In", cx, frame, stub,
-                                    BaselineCacheIRStubKind::Regular,
-                                    CacheKind::In, key, objValue);
+  TryAttachStub<HasPropIRGenerator>("In", cx, frame, stub, CacheKind::In, key,
+                                    objValue);
 
   RootedObject obj(cx, &objValue.toObject());
   bool cond = false;
@@ -2323,7 +1254,6 @@
   FallbackICSpew(cx, stub, "HasOwn");
 
   TryAttachStub<HasPropIRGenerator>("HasOwn", cx, frame, stub,
-                                    BaselineCacheIRStubKind::Regular,
                                     CacheKind::HasOwn, keyValue, objValue);
 
   bool found;
@@ -2369,9 +1299,9 @@
 
   MOZ_ASSERT(keyValue.isSymbol() && keyValue.toSymbol()->isPrivateName());
 
-  TryAttachStub<CheckPrivateFieldIRGenerator>(
-      "CheckPrivate", cx, frame, stub, BaselineCacheIRStubKind::Regular,
-      CacheKind::CheckPrivateField, keyValue, objValue);
+  TryAttachStub<CheckPrivateFieldIRGenerator>("CheckPrivate", cx, frame, stub,
+                                              CacheKind::CheckPrivateField,
+                                              keyValue, objValue);
 
   bool result;
   if (!CheckPrivateFieldOperation(cx, pc, objValue, keyValue, &result)) {
@@ -2418,9 +1348,7 @@
 
   RootedPropertyName name(cx, script->getName(pc));
 
-  TryAttachStub<GetNameIRGenerator>("GetName", cx, frame, stub,
-                                    BaselineCacheIRStubKind::Monitored,
-                                    envChain, name);
+  TryAttachStub<GetNameIRGenerator>("GetName", cx, frame, stub, envChain, name);
 
   static_assert(JSOpLength_GetGName == JSOpLength_GetName,
                 "Otherwise our check for JSOp::Typeof isn't ok");
@@ -2434,7 +1362,7 @@
     }
   }
 
-  return TypeMonitorResult(cx, stub, frame, script, pc, res);
+  return true;
 }
 
 bool FallbackICCodeCompiler::emit_GetName() {
@@ -2468,8 +1396,7 @@
 
   RootedPropertyName name(cx, frame->script()->getName(pc));
 
-  TryAttachStub<BindNameIRGenerator>("BindName", cx, frame, stub,
-                                     BaselineCacheIRStubKind::Regular, envChain,
+  TryAttachStub<BindNameIRGenerator>("BindName", cx, frame, stub, envChain,
                                      name);
 
   RootedObject scope(cx);
@@ -2515,14 +1442,7 @@
     return false;
   }
 
-  // An intrinsic operation will always produce the same result, so only
-  // needs to be monitored once. Attach a stub to load the resulting constant
-  // directly.
-
-  JitScript::MonitorBytecodeType(cx, script, pc, res);
-
-  TryAttachStub<GetIntrinsicIRGenerator>("GetIntrinsic", cx, frame, stub,
-                                         BaselineCacheIRStubKind::Regular, res);
+  TryAttachStub<GetIntrinsicIRGenerator>("GetIntrinsic", cx, frame, stub, res);
 
   return true;
 }
@@ -2549,7 +1469,7 @@
   // Handle arguments.length and arguments.callee on optimized arguments, as
   // it is not an object.
   if (val.isMagic(JS_OPTIMIZED_ARGUMENTS) && IsOptimizedArguments(frame, val)) {
-    if (op == JSOp::Length) {
+    if (name == cx->names().length) {
       res.setInt32(frame->numActualArgs());
     } else {
       MOZ_ASSERT(name == cx->names().callee);
@@ -2564,8 +1484,7 @@
         return false;
       }
     } else {
-      MOZ_ASSERT(op == JSOp::GetProp || op == JSOp::CallProp ||
-                 op == JSOp::Length);
+      MOZ_ASSERT(op == JSOp::GetProp);
       if (!GetProperty(cx, val, name, res)) {
         return false;
       }
@@ -2585,20 +1504,15 @@
   JSOp op = JSOp(*pc);
   FallbackICSpew(cx, stub, "GetProp(%s)", CodeName(op));
 
-  MOZ_ASSERT(op == JSOp::GetProp || op == JSOp::CallProp ||
-             op == JSOp::Length || op == JSOp::GetBoundName);
+  MOZ_ASSERT(op == JSOp::GetProp || op == JSOp::GetBoundName);
 
   RootedPropertyName name(cx, script->getName(pc));
   RootedValue idVal(cx, StringValue(name));
 
-  TryAttachGetPropStub("GetProp", cx, frame, stub, CacheKind::GetProp, val,
-                       idVal, val);
+  TryAttachStub<GetPropIRGenerator>("GetProp", cx, frame, stub,
+                                    CacheKind::GetProp, val, idVal, val);
 
-  if (!ComputeGetPropResult(cx, frame, op, name, val, res)) {
-    return false;
-  }
-
-  return TypeMonitorResult(cx, stub, frame, script, pc, res);
+  return ComputeGetPropResult(cx, frame, op, name, val, res);
 }
 
 bool DoGetPropSuperFallback(JSContext* cx, BaselineFrame* frame,
@@ -2615,8 +1529,9 @@
   RootedPropertyName name(cx, script->getName(pc));
   RootedValue idVal(cx, StringValue(name));
 
-  TryAttachGetPropStub("GetPropSuper", cx, frame, stub, CacheKind::GetPropSuper,
-                       val, idVal, receiver);
+  TryAttachStub<GetPropIRGenerator>("GetPropSuper", cx, frame, stub,
+                                    CacheKind::GetPropSuper, val, idVal,
+                                    receiver);
 
   // |val| is [[HomeObject]].[[Prototype]] which must be Object
   RootedObject valObj(cx, &val.toObject());
@@ -2624,7 +1539,7 @@
     return false;
   }
 
-  return TypeMonitorResult(cx, stub, frame, script, pc, res);
+  return true;
 }
 
 bool FallbackICCodeCompiler::emitGetProp(bool hasReceiver) {
@@ -2675,22 +1590,7 @@
 
   leaveStubFrame(masm, true);
 
-  if (!IsTypeInferenceEnabled()) {
-    EmitReturnFromIC(masm);
-    return true;
-  }
-
-  // When we get here, ICStubReg contains the ICGetProp_Fallback stub,
-  // which we can't use to enter the TypeMonitor IC, because it's a
-  // MonitoredFallbackStub instead of a MonitoredStub. So, we cheat. Note that
-  // we must have a non-null fallbackMonitorStub here because
-  // BaselineStackBuilder::buildStubFrame delazifies the stub when bailing out.
-  masm.loadPtr(Address(ICStubReg,
-                       ICMonitoredFallbackStub::offsetOfFallbackMonitorStub()),
-               ICStubReg);
-  EmitEnterTypeMonitorIC(masm,
-                         ICTypeMonitor_Fallback::offsetOfFirstMonitorStub());
-
+  EmitReturnFromIC(masm);
   return true;
 }
 
@@ -2734,10 +1634,6 @@
     return false;
   }
   RootedShape oldShape(cx, obj->shape());
-  RootedObjectGroup oldGroup(cx, JSObject::getGroup(cx, obj));
-  if (!oldGroup) {
-    return false;
-  }
 
   DeferType deferType = DeferType::None;
   bool attached = false;
@@ -2753,19 +1649,10 @@
       case AttachDecision::Attach: {
         ICScript* icScript = frame->icScript();
         ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(),
-            BaselineCacheIRStubKind::Updated, frame->script(), icScript, stub,
-            &attached);
+            cx, gen.writerRef(), gen.cacheKind(), frame->script(), icScript,
+            stub, &attached);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached SetProp CacheIR stub");
-
-          SetUpdateStubData(newStub->toCacheIR_Updated(), gen.typeCheckInfo());
-
-          if (gen.shouldNotePreliminaryObjectStub()) {
-            newStub->toCacheIR_Updated()->notePreliminaryObject();
-          } else if (gen.shouldUnlinkPreliminaryObjectStubs()) {
-            StripPreliminaryObjectStubs(cx, stub, frame->invalidationScript());
-          }
         }
       } break;
       case AttachDecision::NoAction:
@@ -2832,25 +1719,16 @@
                            stub->state().mode(), lhs, idVal, rhs);
 
     MOZ_ASSERT(deferType == DeferType::AddSlot);
-    AttachDecision decision = gen.tryAttachAddSlotStub(oldGroup, oldShape);
+    AttachDecision decision = gen.tryAttachAddSlotStub(oldShape);
 
     switch (decision) {
       case AttachDecision::Attach: {
         ICScript* icScript = frame->icScript();
         ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(),
-            BaselineCacheIRStubKind::Updated, frame->script(), icScript, stub,
-            &attached);
+            cx, gen.writerRef(), gen.cacheKind(), frame->script(), icScript,
+            stub, &attached);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached SetElem CacheIR stub");
-
-          SetUpdateStubData(newStub->toCacheIR_Updated(), gen.typeCheckInfo());
-
-          if (gen.shouldNotePreliminaryObjectStub()) {
-            newStub->toCacheIR_Updated()->notePreliminaryObject();
-          } else if (gen.shouldUnlinkPreliminaryObjectStubs()) {
-            StripPreliminaryObjectStubs(cx, stub, frame->invalidationScript());
-          }
         }
       } break;
       case AttachDecision::NoAction:
@@ -2951,7 +1829,6 @@
 
   bool canAttachStub = stub->state().canAttachStub();
   bool handled = false;
-  bool deferred = false;
 
   // Only bother to try optimizing JSOp::Call with CacheIR if the chain is still
   // allowed to attach stubs.
@@ -2965,24 +1842,21 @@
         break;
       case AttachDecision::Attach: {
         ICScript* icScript = frame->icScript();
-        ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(), gen.cacheIRStubKind(), script,
-            icScript, stub, &handled);
+        ICStub* newStub =
+            AttachBaselineCacheIRStub(cx, gen.writerRef(), gen.cacheKind(),
+                                      script, icScript, stub, &handled);
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached Call CacheIR stub");
-
-          // If it's an updated stub, initialize it.
-          if (gen.cacheIRStubKind() == BaselineCacheIRStubKind::Updated) {
-            SetUpdateStubData(newStub->toCacheIR_Updated(),
-                              gen.typeCheckInfo());
-          }
         }
       } break;
       case AttachDecision::TemporarilyUnoptimizable:
         handled = true;
         break;
       case AttachDecision::Deferred:
-        deferred = true;
+        MOZ_CRASH("No deferred Call stubs");
+    }
+    if (!handled) {
+      stub->trackNotAttached(cx, frame->invalidationScript());
     }
   }
 
@@ -3014,49 +1888,6 @@
     res.set(callArgs.rval());
   }
 
-  if (!TypeMonitorResult(cx, stub, frame, script, pc, res)) {
-    return false;
-  }
-
-  // Try to transition again in case we called this IC recursively.
-  if (stub->state().maybeTransition()) {
-    stub->discardStubs(cx, frame->invalidationScript());
-  }
-  canAttachStub = stub->state().canAttachStub();
-
-  if (deferred && canAttachStub) {
-    HandleValueArray args = HandleValueArray::fromMarkedLocation(argc, vp + 2);
-    bool isFirstStub = stub->newStubIsFirstStub();
-    CallIRGenerator gen(cx, script, pc, op, stub->state().mode(), isFirstStub,
-                        argc, callee, callArgs.thisv(), newTarget, args);
-    switch (gen.tryAttachDeferredStub(res)) {
-      case AttachDecision::Attach: {
-        ICScript* icScript = frame->icScript();
-        ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(), gen.cacheIRStubKind(), script,
-            icScript, stub, &handled);
-        if (newStub) {
-          JitSpew(JitSpew_BaselineIC, "  Attached Call CacheIR stub");
-
-          // If it's an updated stub, initialize it.
-          if (gen.cacheIRStubKind() == BaselineCacheIRStubKind::Updated) {
-            SetUpdateStubData(newStub->toCacheIR_Updated(),
-                              gen.typeCheckInfo());
-          }
-        }
-      } break;
-      case AttachDecision::NoAction:
-        break;
-      case AttachDecision::TemporarilyUnoptimizable:
-      case AttachDecision::Deferred:
-        MOZ_ASSERT_UNREACHABLE("Impossible attach decision");
-        break;
-    }
-  }
-
-  if (!handled && canAttachStub) {
-    stub->trackNotAttached(cx, frame->invalidationScript());
-  }
   return true;
 }
 
@@ -3102,18 +1933,12 @@
         break;
       case AttachDecision::Attach: {
         ICScript* icScript = frame->icScript();
-        ICStub* newStub = AttachBaselineCacheIRStub(
-            cx, gen.writerRef(), gen.cacheKind(), gen.cacheIRStubKind(), script,
-            icScript, stub, &handled);
+        ICStub* newStub =
+            AttachBaselineCacheIRStub(cx, gen.writerRef(), gen.cacheKind(),
+                                      script, icScript, stub, &handled);
 
         if (newStub) {
           JitSpew(JitSpew_BaselineIC, "  Attached Spread Call CacheIR stub");
-
-          // If it's an updated stub, initialize it.
-          if (gen.cacheIRStubKind() == BaselineCacheIRStubKind::Updated) {
-            SetUpdateStubData(newStub->toCacheIR_Updated(),
-                              gen.typeCheckInfo());
-          }
         }
       } break;
       case AttachDecision::TemporarilyUnoptimizable:
@@ -3128,18 +1953,13 @@
     }
   }
 
-  if (!SpreadCallOperation(cx, script, pc, thisv, callee, arr, newTarget,
-                           res)) {
-    return false;
-  }
-
-  return TypeMonitorResult(cx, stub, frame, script, pc, res);
+  return SpreadCallOperation(cx, script, pc, thisv, callee, arr, newTarget,
+                             res);
 }
 
-void ICStubCompilerBase::pushCallArguments(MacroAssembler& masm,
-                                           AllocatableGeneralRegisterSet regs,
-                                           Register argcReg,
-                                           bool isConstructing) {
+void FallbackICCodeCompiler::pushCallArguments(
+    MacroAssembler& masm, AllocatableGeneralRegisterSet regs, Register argcReg,
+    bool isConstructing) {
   MOZ_ASSERT(!regs.has(argcReg));
 
   // argPtr initially points to the last argument.
@@ -3185,7 +2005,7 @@
   // right-to-left so duplicate them on the stack in reverse order.
   // |this| and callee are pushed last.
 
-  AllocatableGeneralRegisterSet regs(availableGeneralRegs(0));
+  AllocatableGeneralRegisterSet regs = BaselineICAvailableGeneralRegs(0);
 
   if (MOZ_UNLIKELY(isSpread)) {
     // Push a stub frame so that we can perform a non-tail call.
@@ -3293,23 +2113,7 @@
     masm.bind(&skipThisReplace);
   }
 
-  if (!IsTypeInferenceEnabled()) {
-    EmitReturnFromIC(masm);
-    return true;
-  }
-
-  // At this point, ICStubReg points to the ICCall_Fallback stub, which is NOT
-  // a MonitoredStub, but rather a MonitoredFallbackStub.  To use
-  // EmitEnterTypeMonitorIC, first load the ICTypeMonitor_Fallback stub into
-  // ICStubReg.  Then, use EmitEnterTypeMonitorIC with a custom struct offset.
-  // Note that we must have a non-null fallbackMonitorStub here because
-  // BaselineStackBuilder::buildStubFrame delazifies the stub when bailing out.
-  masm.loadPtr(Address(ICStubReg,
-                       ICMonitoredFallbackStub::offsetOfFallbackMonitorStub()),
-               ICStubReg);
-  EmitEnterTypeMonitorIC(masm,
-                         ICTypeMonitor_Fallback::offsetOfFirstMonitorStub());
-
+  EmitReturnFromIC(masm);
   return true;
 }
 
@@ -3339,8 +2143,7 @@
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "GetIterator");
 
-  TryAttachStub<GetIteratorIRGenerator>(
-      "GetIterator", cx, frame, stub, BaselineCacheIRStubKind::Regular, value);
+  TryAttachStub<GetIteratorIRGenerator>("GetIterator", cx, frame, stub, value);
 
   JSObject* iterobj = ValueToIterator(cx, value);
   if (!iterobj) {
@@ -3376,9 +2179,8 @@
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "OptimizeSpreadCall");
 
-  TryAttachStub<OptimizeSpreadCallIRGenerator>(
-      "OptimizeSpreadCall", cx, frame, stub, BaselineCacheIRStubKind::Regular,
-      value);
+  TryAttachStub<OptimizeSpreadCallIRGenerator>("OptimizeSpreadCall", cx, frame,
+                                               stub, value);
 
   bool optimized;
   if (!OptimizeSpreadCall(cx, value, &optimized)) {
@@ -3435,13 +2237,7 @@
     return true;
   }
 
-  // For functions, keep track of the |prototype| property in type information,
-  // for use during Ion compilation.
-  EnsureTrackPropertyTypes(cx, obj, NameToId(cx->names().prototype));
-
-  TryAttachStub<InstanceOfIRGenerator>("InstanceOf", cx, frame, stub,
-                                       BaselineCacheIRStubKind::Regular, lhs,
-                                       obj);
+  TryAttachStub<InstanceOfIRGenerator>("InstanceOf", cx, frame, stub, lhs, obj);
   return true;
 }
 
@@ -3472,8 +2268,7 @@
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "TypeOf");
 
-  TryAttachStub<TypeOfIRGenerator>("TypeOf", cx, frame, stub,
-                                   BaselineCacheIRStubKind::Regular, val);
+  TryAttachStub<TypeOfIRGenerator>("TypeOf", cx, frame, stub, val);
 
   JSType type = js::TypeOfValue(val);
   RootedString string(cx, TypeName(type, cx->names()));
@@ -3503,8 +2298,8 @@
   stub->incrementEnteredCount();
   FallbackICSpew(cx, stub, "ToPropertyKey");
 
-  TryAttachStub<ToPropertyKeyIRGenerator>(
-      "ToPropertyKey", cx, frame, stub, BaselineCacheIRStubKind::Regular, val);
+  TryAttachStub<ToPropertyKeyIRGenerator>("ToPropertyKey", cx, frame, stub,
+                                          val);
 
   return ToPropertyKeyOperation(cx, val, res);
 }
@@ -3521,22 +2316,6 @@
   return tailCallVM<Fn, DoToPropertyKeyFallback>(masm);
 }
 
-ICTypeMonitor_SingleObject::ICTypeMonitor_SingleObject(JitCode* stubCode,
-                                                       JSObject* obj)
-    : ICStub(TypeMonitor_SingleObject, stubCode), obj_(obj) {}
-
-ICTypeMonitor_ObjectGroup::ICTypeMonitor_ObjectGroup(JitCode* stubCode,
-                                                     ObjectGroup* group)
-    : ICStub(TypeMonitor_ObjectGroup, stubCode), group_(group) {}
-
-ICTypeUpdate_SingleObject::ICTypeUpdate_SingleObject(JitCode* stubCode,
-                                                     JSObject* obj)
-    : ICStub(TypeUpdate_SingleObject, stubCode), obj_(obj) {}
-
-ICTypeUpdate_ObjectGroup::ICTypeUpdate_ObjectGroup(JitCode* stubCode,
-                                                   ObjectGroup* group)
-    : ICStub(TypeUpdate_ObjectGroup, stubCode), group_(group) {}
-
 //
 // Rest_Fallback
 //
@@ -3548,9 +2327,7 @@
   unsigned numRest = numActuals > numFormals ? numActuals - numFormals : 0;
   Value* rest = frame->argv() + numFormals;
 
-  ArrayObject* obj =
-      ObjectGroup::newArrayObject(cx, rest, numRest, GenericObject,
-                                  ObjectGroup::NewArrayKind::UnknownIndex);
+  ArrayObject* obj = NewDenseCopiedArray(cx, numRest, rest);
   if (!obj) {
     return false;
   }
@@ -3629,13 +2406,8 @@
   }
   MOZ_ASSERT(res.isNumeric());
 
-  if (res.isDouble()) {
-    stub->setSawDoubleResult();
-  }
-
-  TryAttachStub<UnaryArithIRGenerator>("UnaryArith", cx, frame, stub,
-                                       BaselineCacheIRStubKind::Regular, op,
-                                       val, res);
+  TryAttachStub<UnaryArithIRGenerator>("UnaryArith", cx, frame, stub, op, val,
+                                       res);
   return true;
 }
 
@@ -3753,13 +2525,8 @@
       MOZ_CRASH("Unhandled baseline arith op");
   }
 
-  if (ret.isDouble()) {
-    stub->setSawDoubleResult();
-  }
-
-  TryAttachStub<BinaryArithIRGenerator>("BinaryArith", cx, frame, stub,
-                                        BaselineCacheIRStubKind::Regular, op,
-                                        lhs, rhs, ret);
+  TryAttachStub<BinaryArithIRGenerator>("BinaryArith", cx, frame, stub, op, lhs,
+                                        rhs, ret);
   return true;
 }
 
@@ -3854,9 +2621,7 @@
 
   ret.setBoolean(out);
 
-  TryAttachStub<CompareIRGenerator>("Compare", cx, frame, stub,
-                                    BaselineCacheIRStubKind::Regular, op, lhs,
-                                    rhs);
+  TryAttachStub<CompareIRGenerator>("Compare", cx, frame, stub, op, lhs, rhs);
   return true;
 }
 
@@ -3945,23 +2710,19 @@
 
   RootedObject templateObject(cx, stub->templateObject());
   if (templateObject) {
-    MOZ_ASSERT(
-        !templateObject->group()->maybePreliminaryObjectsDontCheckGeneration());
     obj = NewObjectOperationWithTemplate(cx, templateObject);
   } else {
     RootedScript script(cx, frame->script());
     jsbytecode* pc = stub->icEntry()->pc(script);
     obj = NewObjectOperation(cx, script, pc);
 
-    if (obj && !obj->isSingleton() &&
-        !obj->group()->maybePreliminaryObjectsDontCheckGeneration()) {
+    if (obj && !obj->isSingleton()) {
       templateObject = NewObjectOperation(cx, script, pc, TenuredObject);
       if (!templateObject) {
         return false;
       }
 
       TryAttachStub<NewObjectIRGenerator>("NewObject", cx, frame, stub,
-                                          BaselineCacheIRStubKind::Regular,
                                           JSOp(*pc), templateObject);
 
       stub->setTemplateObject(templateObject);
@@ -4024,30 +2785,13 @@
   return true;
 }
 
+// TODO(no-TI): no longer need this and cacheIRStubData in base class.
 const CacheIRStubInfo* ICStub::cacheIRStubInfo() const {
-  switch (kind()) {
-    case ICStub::CacheIR_Regular:
-      return toCacheIR_Regular()->stubInfo();
-    case ICStub::CacheIR_Monitored:
-      return toCacheIR_Monitored()->stubInfo();
-    case ICStub::CacheIR_Updated:
-      return toCacheIR_Updated()->stubInfo();
-    default:
-      MOZ_CRASH("Not a CacheIR stub");
-  }
+  return toCacheIRStub()->stubInfo();
 }
 
 const uint8_t* ICStub::cacheIRStubData() {
-  switch (kind()) {
-    case ICStub::CacheIR_Regular:
-      return toCacheIR_Regular()->stubDataStart();
-    case ICStub::CacheIR_Monitored:
-      return toCacheIR_Monitored()->stubDataStart();
-    case ICStub::CacheIR_Updated:
-      return toCacheIR_Updated()->stubDataStart();
-    default:
-      MOZ_CRASH("Not a CacheIR stub");
-  }
+  return toCacheIRStub()->stubDataStart();
 }
 
 }  // namespace jit
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineIC.h firefox-85.0+build1/js/src/jit/BaselineIC.h
--- firefox-84.0.2+build1/js/src/jit/BaselineIC.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineIC.h	2021-01-18 19:58:13.000000000 +0000
@@ -25,7 +25,6 @@
 #include "jit/Registers.h"
 #include "jit/RegisterSets.h"
 #include "jit/shared/Assembler-shared.h"
-#include "jit/SharedICRegisters.h"
 #include "js/TypeDecls.h"
 #include "js/Value.h"
 #include "vm/ArrayObject.h"
@@ -35,8 +34,6 @@
 
 namespace js {
 
-class StackTypeSet;
-
 MOZ_COLD void ReportOutOfMemory(JSContext* cx);
 
 namespace jit {
@@ -110,118 +107,9 @@
 //                                                          Shared
 //                                                          Stub Code
 //
-//
-// Type ICs
-// ========
-//
-// Type ICs are otherwise regular ICs that are actually nested within
-// other IC chains.  They serve to optimize locations in the code where the
-// baseline compiler would have otherwise had to perform a type Monitor
-// operation (e.g. the result of GetProp, GetElem, etc.), or locations where the
-// baseline compiler would have had to modify a heap typeset using the type of
-// an input value (e.g. SetProp, SetElem, etc.)
-//
-// There are two kinds of Type ICs: Monitor and Update.
-//
-// Note that type stub bodies are no-ops.  The stubs only exist for their
-// guards, and their existence simply signifies that the typeset (implicit)
-// that is being checked already contains that type.
-//
-// TypeMonitor ICs
-// ---------------
-// Monitor ICs are shared between stubs in the general IC, and monitor the
-// resulting types of getter operations (call returns, getprop outputs, etc.)
-//
-//        +-----------+     +-----------+     +-----------+     +-----------+
-//   ---->| Stub 1    |---->| Stub 2    |---->| Stub 3    |---->| FB Stub   |
-//        +-----------+     +-----------+     +-----------+     +-----------+
-//             |                  |                 |                  |
-//             |------------------/-----------------/                  |
-//             v                                                       |
-//        +-----------+     +-----------+     +-----------+            |
-//        | Type 1    |---->| Type 2    |---->| Type FB   |            |
-//        +-----------+     +-----------+     +-----------+            |
-//             |                 |                  |                  |
-//  <----------/-----------------/------------------/------------------/
-//                r e t u r n    p a t h
-//
-// After an optimized IC stub successfully executes, it passes control to the
-// type stub chain to check the resulting type.  If no type stub succeeds, and
-// the monitor fallback stub is reached, the monitor fallback stub performs a
-// manual monitor, and also adds the appropriate type stub to the chain.
-//
-// The IC's main fallback, in addition to generating new mainline stubs, also
-// generates type stubs as reflected by its returned value.
-//
-// NOTE: The type IC chain returns directly to the mainline code, not back to
-// the stub it was entered from.  Thus, entering a type IC is a matter of a
-// |jump|, not a |call|.  This allows us to safely call a VM Monitor function
-// from within the monitor IC's fallback chain, since the return address (needed
-// for stack inspection) is preserved.
-//
-//
-// TypeUpdate ICs
-// --------------
-// Update ICs update heap typesets and monitor the input types of setter
-// operations (setelem, setprop inputs, etc.).  Unlike monitor ICs, they are not
-// shared between stubs on an IC, but instead are kept track of on a per-stub
-// basis.
-//
-// This is because the main stubs for the operation will each identify a
-// potentially different ObjectGroup to update.  New input types must be tracked
-// on a group-to- group basis.
-//
-// Type-update ICs cannot be called in tail position (they must return to the
-// the stub that called them so that the stub may continue to perform its
-// original purpose).  This means that any VMCall to perform a manual type
-// update from C++ must be done from within the main IC stub.  This necessitates
-// that the stub enter a "BaselineStub" frame before making the call.
-//
-// If the type-update IC chain could itself make the VMCall, then the
-// BaselineStub frame must be entered before calling the type-update chain, and
-// exited afterward.  This is very expensive for a common case where we expect
-// the type-update fallback to not be called.  To avoid the cost of entering and
-// exiting a BaselineStub frame when using the type-update IC chain, we design
-// the chain to not perform any VM-calls in its fallback.
-//
-// Instead, the type-update IC chain is responsible for returning 1 or 0,
-// depending on if a type is represented in the chain or not.  The fallback stub
-// simply returns 0, and all other optimized stubs return 1. If the chain
-// returns 1, then the IC stub goes ahead and performs its operation. If the
-// chain returns 0, then the IC stub performs a call to the fallback function
-// inline (doing the requisite BaselineStub frame enter/exit).
-// This allows us to avoid the expensive subfram enter/exit in the common case.
-//
-//                                 r e t u r n    p a t h
-//   <--------------.-----------------.-----------------.-----------------.
-//                  |                 |                 |                 |
-//        +-----------+     +-----------+     +-----------+     +-----------+
-//   ---->| Stub 1    |---->| Stub 2    |---->| Stub 3    |---->| FB Stub   |
-//        +-----------+     +-----------+     +-----------+     +-----------+
-//          |   ^             |   ^             |   ^
-//          |   |             |   |             |   |
-//          |   |             |   |             |   |----------------.
-//          |   |             |   |             v   |1               |0
-//          |   |             |   |         +-----------+    +-----------+
-//          |   |             |   |         | Type 3.1  |--->|    FB 3   |
-//          |   |             |   |         +-----------+    +-----------+
-//          |   |             |   |
-//          |   |             |   \-------------.-----------------.
-//          |   |             |   |             |                 |
-//          |   |             v   |1            |1                |0
-//          |   |         +-----------+     +-----------+     +-----------+
-//          |   |         | Type 2.1  |---->| Type 2.2  |---->|    FB 2   |
-//          |   |         +-----------+     +-----------+     +-----------+
-//          |   |
-//          |   \-------------.-----------------.
-//          |   |             |                 |
-//          v   |1            |1                |0
-//     +-----------+     +-----------+     +-----------+
-//     | Type 1.1  |---->| Type 1.2  |---->|   FB 1    |
-//     +-----------+     +-----------+     +-----------+
-//
 
 class ICStub;
+class ICCacheIRStub;
 class ICFallbackStub;
 
 #define FORWARD_DECLARE_STUBS(kindName) class IC##kindName;
@@ -231,11 +119,8 @@
 #ifdef JS_JITSPEW
 void FallbackICSpew(JSContext* cx, ICFallbackStub* stub, const char* fmt, ...)
     MOZ_FORMAT_PRINTF(3, 4);
-void TypeFallbackICSpew(JSContext* cx, ICTypeMonitor_Fallback* stub,
-                        const char* fmt, ...) MOZ_FORMAT_PRINTF(3, 4);
 #else
 #  define FallbackICSpew(...)
-#  define TypeFallbackICSpew(...)
 #endif
 
 // An entry in the BaselineScript IC descriptor table. There's one ICEntry per
@@ -244,8 +129,7 @@
   // A pointer to the first IC stub for this instruction.
   ICStub* firstStub_;
 
-  // The PC offset of this IC's bytecode op within the JSScript or
-  // ProloguePCOffset if this is a prologue IC.
+  // The PC offset of this IC's bytecode op within the JSScript.
   uint32_t pcOffset_;
 
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
@@ -258,11 +142,6 @@
 #endif
 
  public:
-  // Prologue ICs are Baseline ICs used for function argument/this type
-  // monitoring in the script's prologue. Note: the last bytecode op in a script
-  // is always a return so UINT32_MAX is never a valid bytecode offset.
-  static constexpr uint32_t ProloguePCOffset = UINT32_MAX;
-
   ICEntry(ICStub* firstStub, uint32_t pcOffset)
       : firstStub_(firstStub), pcOffset_(pcOffset) {}
 
@@ -275,9 +154,7 @@
 
   void setFirstStub(ICStub* stub) { firstStub_ = stub; }
 
-  uint32_t pcOffset() const {
-    return pcOffset_ == ProloguePCOffset ? 0 : pcOffset_;
-  }
+  uint32_t pcOffset() const { return pcOffset_; }
   jsbytecode* pc(JSScript* script) const {
     return script->offsetToPC(pcOffset());
   }
@@ -288,14 +165,9 @@
 
   inline ICStub** addressOfFirstStub() { return &firstStub_; }
 
-  bool isForPrologue() const { return pcOffset_ == ProloguePCOffset; }
-
   void trace(JSTracer* trc);
 };
 
-class ICMonitoredStub;
-class ICMonitoredFallbackStub;
-
 // Constant iterator that traverses arbitrary chains of ICStubs.
 // No requirements are made of the ICStub used to construct this
 // iterator, aside from that the stub be part of a nullptr-terminated
@@ -407,6 +279,7 @@
   friend class ICFallbackStub;
 
  public:
+  // TODO(no-TI): move to ICFallbackStub, make enum class.
   enum Kind : uint16_t {
     INVALID = 0,
 #define DEF_ENUM_KIND(kindName) kindName,
@@ -416,10 +289,6 @@
   };
 
   static bool IsValidKind(Kind k) { return (k > INVALID) && (k < LIMIT); }
-  static bool IsCacheIRKind(Kind k) {
-    return k == CacheIR_Regular || k == CacheIR_Monitored ||
-           k == CacheIR_Updated;
-  }
 
   static const char* KindString(Kind k) {
     switch (k) {
@@ -433,19 +302,6 @@
     }
   }
 
-  enum Trait : uint16_t {
-    Regular = 0x0,
-    Fallback = 0x1,
-    Monitored = 0x2,
-    MonitoredFallback = 0x3,
-    Updated = 0x4
-  };
-
-  void updateCode(JitCode* stubCode);
-  void trace(JSTracer* trc);
-
-  static const uint16_t EXPECTED_TRACE_MAGIC = 0b1100011;
-
   template <typename T, typename... Args>
   static T* New(JSContext* cx, ICStubSpace* space, JitCode* code,
                 Args&&... args) {
@@ -477,80 +333,16 @@
   // either be a fallback or inert IC stub.
   ICStub* next_ = nullptr;
 
-  // A 16-bit field usable by subtypes of ICStub for subtype-specific small-info
-  uint16_t extra_ = 0;
-
-  // A 16-bit field storing the trait and kind.
-  // Unused bits are filled with a magic value and verified when tracing.
-  uint16_t traitKindBits_;
-
-  static const uint16_t TRAIT_OFFSET = 0;
-  static const uint16_t TRAIT_BITS = 3;
-  static const uint16_t TRAIT_MASK = (1 << TRAIT_BITS) - 1;
-  static const uint16_t KIND_OFFSET = TRAIT_OFFSET + TRAIT_BITS;
-  static const uint16_t KIND_BITS = 6;
-  static const uint16_t KIND_MASK = (1 << KIND_BITS) - 1;
-  static const uint16_t MAGIC_OFFSET = KIND_OFFSET + KIND_BITS;
-  static const uint16_t MAGIC_BITS = 7;
-  static const uint16_t MAGIC_MASK = (1 << MAGIC_BITS) - 1;
-  static const uint16_t EXPECTED_MAGIC = 0b1100011;
-
-  static_assert(LIMIT <= (1 << KIND_BITS), "Not enough kind bits");
-  static_assert(LIMIT > (1 << (KIND_BITS - 1)), "Too many kind bits");
-  static_assert(TRAIT_BITS + KIND_BITS + MAGIC_BITS == 16, "Unused bits");
-
-  inline ICStub(Kind kind, uint8_t* stubCode) : stubCode_(stubCode) {
-    setTraitKind(Regular, kind);
+  explicit ICStub(uint8_t* stubCode) : stubCode_(stubCode) {
     MOZ_ASSERT(stubCode != nullptr);
   }
 
-  inline ICStub(Kind kind, JitCode* stubCode) : ICStub(kind, stubCode->raw()) {
+  explicit ICStub(JitCode* stubCode) : ICStub(stubCode->raw()) {
     MOZ_ASSERT(stubCode != nullptr);
   }
 
-  inline ICStub(Kind kind, Trait trait, uint8_t* stubCode)
-      : stubCode_(stubCode) {
-    setTraitKind(trait, kind);
-    MOZ_ASSERT(stubCode != nullptr);
-  }
-
-  inline ICStub(Kind kind, Trait trait, JitCode* stubCode)
-      : ICStub(kind, trait, stubCode->raw()) {
-    MOZ_ASSERT(stubCode != nullptr);
-  }
-
-  inline Trait trait() const {
-    return (Trait)((traitKindBits_ >> TRAIT_OFFSET) & TRAIT_MASK);
-  }
-
-  inline void setTraitKind(Trait trait, Kind kind) {
-    traitKindBits_ = (trait << TRAIT_OFFSET) | (kind << KIND_OFFSET) |
-                     (EXPECTED_MAGIC << MAGIC_OFFSET);
-  }
-
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  inline void checkTraceMagic() {
-    uint16_t magic = (traitKindBits_ >> MAGIC_OFFSET) & MAGIC_MASK;
-    MOZ_DIAGNOSTIC_ASSERT(magic == EXPECTED_MAGIC);
-  }
-#endif
-
  public:
-  inline Kind kind() const {
-    return (Kind)((traitKindBits_ >> KIND_OFFSET) & KIND_MASK);
-  }
-
-  inline bool isFallback() const {
-    return trait() == Fallback || trait() == MonitoredFallback;
-  }
-
-  inline bool isMonitored() const { return trait() == Monitored; }
-
-  inline bool isUpdated() const { return trait() == Updated; }
-
-  inline bool isMonitoredFallback() const {
-    return trait() == MonitoredFallback;
-  }
+  inline bool isFallback() const { return next_ == nullptr; }
 
   inline const ICFallbackStub* toFallbackStub() const {
     MOZ_ASSERT(isFallback());
@@ -562,65 +354,27 @@
     return reinterpret_cast<ICFallbackStub*>(this);
   }
 
-  inline const ICMonitoredStub* toMonitoredStub() const {
-    MOZ_ASSERT(isMonitored());
-    return reinterpret_cast<const ICMonitoredStub*>(this);
-  }
-
-  inline ICMonitoredStub* toMonitoredStub() {
-    MOZ_ASSERT(isMonitored());
-    return reinterpret_cast<ICMonitoredStub*>(this);
+  ICCacheIRStub* toCacheIRStub() {
+    MOZ_ASSERT(!isFallback());
+    return reinterpret_cast<ICCacheIRStub*>(this);
+  }
+  const ICCacheIRStub* toCacheIRStub() const {
+    MOZ_ASSERT(!isFallback());
+    return reinterpret_cast<const ICCacheIRStub*>(this);
   }
 
-  inline const ICMonitoredFallbackStub* toMonitoredFallbackStub() const {
-    MOZ_ASSERT(isMonitoredFallback());
-    return reinterpret_cast<const ICMonitoredFallbackStub*>(this);
-  }
-
-  inline ICMonitoredFallbackStub* toMonitoredFallbackStub() {
-    MOZ_ASSERT(isMonitoredFallback());
-    return reinterpret_cast<ICMonitoredFallbackStub*>(this);
-  }
-
-  inline const ICCacheIR_Updated* toUpdatedStub() const {
-    MOZ_ASSERT(isUpdated());
-    return reinterpret_cast<const ICCacheIR_Updated*>(this);
-  }
-
-  inline ICCacheIR_Updated* toUpdatedStub() {
-    MOZ_ASSERT(isUpdated());
-    return reinterpret_cast<ICCacheIR_Updated*>(this);
-  }
-
-#define KIND_METHODS(kindName)                                    \
-  inline bool is##kindName() const { return kind() == kindName; } \
-  inline const IC##kindName* to##kindName() const {               \
-    MOZ_ASSERT(is##kindName());                                   \
-    return reinterpret_cast<const IC##kindName*>(this);           \
-  }                                                               \
-  inline IC##kindName* to##kindName() {                           \
-    MOZ_ASSERT(is##kindName());                                   \
-    return reinterpret_cast<IC##kindName*>(this);                 \
-  }
-  IC_BASELINE_STUB_KIND_LIST(KIND_METHODS)
-#undef KIND_METHODS
-
   inline ICStub* next() const { return next_; }
 
   inline bool hasNext() const { return next_ != nullptr; }
 
-  inline void setNext(ICStub* stub) {
-    // Note: next_ only needs to be changed under the compilation lock for
-    // non-type-monitor/update ICs.
-    next_ = stub;
-  }
+  inline void setNext(ICStub* stub) { next_ = stub; }
 
   inline ICStub** addressOfNext() { return &next_; }
 
   bool usesTrampolineCode() const {
     // All fallback code is stored in a single JitCode instance, so we can't
     // call JitCode::FromExecutable on the raw pointer.
-    return isFallback() || isTypeMonitor_Fallback() || isTypeUpdate_Fallback();
+    return isFallback();
   }
   JitCode* jitCode() {
     MOZ_ASSERT(!usesTrampolineCode());
@@ -629,7 +383,6 @@
 
   inline uint8_t* rawStubCode() const { return stubCode_; }
 
-  // This method is not valid on TypeUpdate stub chains!
   inline ICFallbackStub* getChainFallback() {
     ICStub* lastStub = this;
     while (lastStub->next_) {
@@ -649,9 +402,6 @@
     return offsetof(ICStub, stubCode_);
   }
 
-  static inline size_t offsetOfExtra() { return offsetof(ICStub, extra_); }
-
-  static bool NonCacheIRStubMakesGCCalls(Kind kind);
   bool makesGCCalls() const;
 
   // Returns the number of times this stub has been entered. Must only be called
@@ -681,26 +431,66 @@
   // The IC entry in JitScript for this linked list of stubs.
   ICEntry* icEntry_ = nullptr;
 
-  // The state of this IC
-  ICState state_{};
-
   // Counts the number of times the stub was entered
   //
   // See Bug 1494473 comment 6 for a mechanism to handle overflow if overflow
   // becomes a concern.
   uint32_t enteredCount_ = 0;
 
-  ICFallbackStub(Kind kind, TrampolinePtr stubCode)
-      : ICStub(kind, ICStub::Fallback, stubCode.value) {}
+  // The state of this IC
+  ICState state_{};
+
+  // A 16-bit field storing the kind.
+  // Unused bits are filled with a magic value and verified when tracing.
+  uint16_t kindBits_;
+
+  static const uint16_t KIND_OFFSET = 0;
+  static const uint16_t KIND_BITS = 5;
+  static const uint16_t KIND_MASK = (1 << KIND_BITS) - 1;
+  static const uint16_t MAGIC_OFFSET = KIND_OFFSET + KIND_BITS;
+  static const uint16_t MAGIC_BITS = 11;
+  static const uint16_t MAGIC_MASK = (1 << MAGIC_BITS) - 1;
+  static const uint16_t EXPECTED_MAGIC = 0b10011100011;
+
+  static_assert(LIMIT <= (1 << KIND_BITS), "Not enough kind bits");
+  static_assert(LIMIT > (1 << (KIND_BITS - 1)), "Too many kind bits");
+  static_assert(KIND_BITS + MAGIC_BITS == 16, "Unused bits");
 
-  ICFallbackStub(Kind kind, Trait trait, TrampolinePtr stubCode)
-      : ICStub(kind, trait, stubCode.value) {
-    MOZ_ASSERT(trait == ICStub::Fallback || trait == ICStub::MonitoredFallback);
+  ICFallbackStub(Kind kind, TrampolinePtr stubCode) : ICStub(stubCode.value) {
+    setKind(kind);
+  }
+
+  inline void setKind(Kind kind) {
+    kindBits_ = (kind << KIND_OFFSET) | (EXPECTED_MAGIC << MAGIC_OFFSET);
   }
 
  public:
   inline ICEntry* icEntry() const { return icEntry_; }
 
+  inline Kind kind() const {
+    return (Kind)((kindBits_ >> KIND_OFFSET) & KIND_MASK);
+  }
+
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+  inline void checkTraceMagic() {
+    uint16_t magic = (kindBits_ >> MAGIC_OFFSET) & MAGIC_MASK;
+    MOZ_DIAGNOSTIC_ASSERT(magic == EXPECTED_MAGIC);
+  }
+#endif
+
+#define KIND_METHODS(kindName)                                    \
+  inline bool is##kindName() const { return kind() == kindName; } \
+  inline const IC##kindName* to##kindName() const {               \
+    MOZ_ASSERT(is##kindName());                                   \
+    return reinterpret_cast<const IC##kindName*>(this);           \
+  }                                                               \
+  inline IC##kindName* to##kindName() {                           \
+    MOZ_ASSERT(is##kindName());                                   \
+    return reinterpret_cast<IC##kindName*>(this);                 \
+  }
+  IC_BASELINE_STUB_KIND_LIST(KIND_METHODS)
+#undef KIND_METHODS
+
   inline size_t numOptimizedStubs() const { return state_.numOptimizedStubs(); }
 
   bool newStubIsFirstStub() const {
@@ -710,6 +500,8 @@
 
   ICState& state() { return state_; }
 
+  void trace(JSTracer* trc);
+
   // The icEntry_ field can't be initialized when the stub is created since we
   // won't know the ICEntry address until we add the stub to JitScript. This
   // method allows this field to be fixed up at that point.
@@ -759,12 +551,7 @@
   void resetEnteredCount() { enteredCount_ = 0; }
 };
 
-// Shared trait for all CacheIR stubs.
-template <typename Base>
-class ICCacheIR_Trait : public Base {
-  // Flags stored in the uint16_t extra_ field in ICStub.
-  static constexpr uint16_t PreliminaryObjectBit = 1 << 0;
-
+class ICCacheIRStub : public ICStub {
  protected:
   const CacheIRStubInfo* stubInfo_;
 
@@ -775,9 +562,8 @@
   uint32_t enteredCount_ = 0;
 
  public:
-  template <typename... Args>
-  explicit ICCacheIR_Trait(const CacheIRStubInfo* stubInfo, Args&&... args)
-      : Base(args...), stubInfo_(stubInfo) {}
+  ICCacheIRStub(JitCode* stubCode, const CacheIRStubInfo* stubInfo)
+      : ICStub(stubCode), stubInfo_(stubInfo) {}
 
   const CacheIRStubInfo* stubInfo() const { return stubInfo_; }
   uint8_t* stubDataStart();
@@ -787,741 +573,14 @@
   uint32_t enteredCount() const { return enteredCount_; }
   void resetEnteredCount() { enteredCount_ = 0; }
 
-  void notePreliminaryObject() { this->extra_ |= PreliminaryObjectBit; }
-  bool hasPreliminaryObject() const {
-    return (this->extra_ & PreliminaryObjectBit) != 0;
-  }
+  void trace(JSTracer* trc);
 
   static constexpr size_t offsetOfEnteredCount() {
-    using T = ICCacheIR_Trait<Base>;
-    return offsetof(T, enteredCount_);
-  }
-};
-
-// Base class for Trait::Regular CacheIR stubs
-class ICCacheIR_Regular : public ICCacheIR_Trait<ICStub> {
-  using Base = ICCacheIR_Trait<ICStub>;
-
- public:
-  ICCacheIR_Regular(JitCode* stubCode, const CacheIRStubInfo* stubInfo)
-      : Base(stubInfo, ICStub::CacheIR_Regular, stubCode) {}
-};
-
-// Monitored stubs are IC stubs that feed a single resulting value out to a
-// type monitor operation.
-class ICMonitoredStub : public ICStub {
- protected:
-  // Pointer to the start of the type monitoring stub chain.
-  ICStub* firstMonitorStub_;
-
-  ICMonitoredStub(Kind kind, JitCode* stubCode, ICStub* firstMonitorStub);
-
- public:
-  inline void updateFirstMonitorStub(ICStub* monitorStub) {
-    // This should only be called once: when the first optimized monitor stub
-    // is added to the type monitor IC chain.
-    MOZ_ASSERT(firstMonitorStub_ &&
-               firstMonitorStub_->isTypeMonitor_Fallback());
-    firstMonitorStub_ = monitorStub;
-  }
-  inline void resetFirstMonitorStub(ICStub* monitorFallback) {
-    MOZ_ASSERT(monitorFallback->isTypeMonitor_Fallback());
-    firstMonitorStub_ = monitorFallback;
-  }
-  inline ICStub* firstMonitorStub() const { return firstMonitorStub_; }
-
-  static inline size_t offsetOfFirstMonitorStub() {
-    return offsetof(ICMonitoredStub, firstMonitorStub_);
-  }
-};
-
-class ICCacheIR_Monitored : public ICCacheIR_Trait<ICMonitoredStub> {
-  using Base = ICCacheIR_Trait<ICMonitoredStub>;
-
- public:
-  ICCacheIR_Monitored(JitCode* stubCode, ICStub* firstMonitorStub,
-                      const CacheIRStubInfo* stubInfo)
-      : Base(stubInfo, ICStub::CacheIR_Monitored, stubCode, firstMonitorStub) {}
-};
-
-class ICCacheIR_Updated : public ICCacheIR_Trait<ICStub> {
-  using Base = ICCacheIR_Trait<ICStub>;
-
-  uint32_t numOptimizedStubs_;
-
-  GCPtrObjectGroup updateStubGroup_;
-  GCPtrId updateStubId_;
-
-  // Pointer to the start of the type updating stub chain.
-  ICStub* firstUpdateStub_;
-
-  static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
- public:
-  ICCacheIR_Updated(JitCode* stubCode, const CacheIRStubInfo* stubInfo)
-      : Base(stubInfo, ICStub::CacheIR_Updated, ICStub::Updated, stubCode),
-        numOptimizedStubs_(0),
-        updateStubGroup_(nullptr),
-        updateStubId_(JSID_EMPTY),
-        firstUpdateStub_(nullptr) {}
-
-  GCPtrObjectGroup& updateStubGroup() { return updateStubGroup_; }
-  GCPtrId& updateStubId() { return updateStubId_; }
-
-  inline ICStub* firstUpdateStub() const { return firstUpdateStub_; }
-
-  static inline size_t offsetOfFirstUpdateStub() {
-    return offsetof(ICCacheIR_Updated, firstUpdateStub_);
-  }
-
-  inline uint32_t numOptimizedStubs() const { return numOptimizedStubs_; }
-
-  MOZ_MUST_USE bool initUpdatingChain(JSContext* cx, ICStubSpace* space);
-
-  MOZ_MUST_USE bool addUpdateStubForValue(JSContext* cx, HandleScript script,
-                                          HandleObject obj,
-                                          HandleObjectGroup group, HandleId id,
-                                          HandleValue val);
-
-  void addOptimizedUpdateStub(ICStub* stub) {
-    if (firstUpdateStub_->isTypeUpdate_Fallback()) {
-      stub->setNext(firstUpdateStub_);
-      firstUpdateStub_ = stub;
-    } else {
-      ICStub* iter = firstUpdateStub_;
-      MOZ_ASSERT(iter->next() != nullptr);
-      while (!iter->next()->isTypeUpdate_Fallback()) {
-        iter = iter->next();
-      }
-      MOZ_ASSERT(iter->next()->next() == nullptr);
-      stub->setNext(iter->next());
-      iter->setNext(stub);
-    }
-
-    numOptimizedStubs_++;
-  }
-
-  void resetUpdateStubChain(Zone* zone);
-
-  bool hasTypeUpdateStub(ICStub::Kind kind) {
-    ICStub* stub = firstUpdateStub_;
-    do {
-      if (stub->kind() == kind) {
-        return true;
-      }
-
-      stub = stub->next();
-    } while (stub);
-
-    return false;
-  }
-};
-
-// Base class for stubcode compilers.
-class ICStubCompilerBase {
- protected:
-  JSContext* cx;
-  bool inStubFrame_ = false;
-
-#ifdef DEBUG
-  bool entersStubFrame_ = false;
-  uint32_t framePushedAtEnterStubFrame_ = 0;
-#endif
-
-  explicit ICStubCompilerBase(JSContext* cx) : cx(cx) {}
-
-  void pushCallArguments(MacroAssembler& masm,
-                         AllocatableGeneralRegisterSet regs, Register argcReg,
-                         bool isConstructing);
-
-  // Push a payload specialized per compiler needed to execute stubs.
-  void PushStubPayload(MacroAssembler& masm, Register scratch);
-  void pushStubPayload(MacroAssembler& masm, Register scratch);
-
-  // Emits a tail call to a VMFunction wrapper.
-  MOZ_MUST_USE bool tailCallVMInternal(MacroAssembler& masm,
-                                       TailCallVMFunctionId id);
-
-  template <typename Fn, Fn fn>
-  MOZ_MUST_USE bool tailCallVM(MacroAssembler& masm);
-
-  // Emits a normal (non-tail) call to a VMFunction wrapper.
-  MOZ_MUST_USE bool callVMInternal(MacroAssembler& masm, VMFunctionId id);
-
-  template <typename Fn, Fn fn>
-  MOZ_MUST_USE bool callVM(MacroAssembler& masm);
-
-  // A stub frame is used when a stub wants to call into the VM without
-  // performing a tail call. This is required for the return address
-  // to pc mapping to work.
-  void enterStubFrame(MacroAssembler& masm, Register scratch);
-  void assumeStubFrame();
-  void leaveStubFrame(MacroAssembler& masm, bool calledIntoIon = false);
-
- public:
-  static inline AllocatableGeneralRegisterSet availableGeneralRegs(
-      size_t numInputs) {
-    AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All());
-#if defined(JS_CODEGEN_ARM)
-    MOZ_ASSERT(!regs.has(BaselineStackReg));
-    MOZ_ASSERT(!regs.has(ICTailCallReg));
-    regs.take(BaselineSecondScratchReg);
-#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
-    MOZ_ASSERT(!regs.has(BaselineStackReg));
-    MOZ_ASSERT(!regs.has(ICTailCallReg));
-    MOZ_ASSERT(!regs.has(BaselineSecondScratchReg));
-#elif defined(JS_CODEGEN_ARM64)
-    MOZ_ASSERT(!regs.has(PseudoStackPointer));
-    MOZ_ASSERT(!regs.has(RealStackPointer));
-    MOZ_ASSERT(!regs.has(ICTailCallReg));
-#else
-    MOZ_ASSERT(!regs.has(BaselineStackReg));
-#endif
-    regs.take(BaselineFrameReg);
-    regs.take(ICStubReg);
-#ifdef JS_CODEGEN_X64
-    regs.take(ExtractTemp0);
-    regs.take(ExtractTemp1);
-#endif
-
-    switch (numInputs) {
-      case 0:
-        break;
-      case 1:
-        regs.take(R0);
-        break;
-      case 2:
-        regs.take(R0);
-        regs.take(R1);
-        break;
-      default:
-        MOZ_CRASH("Invalid numInputs");
-    }
-
-    return regs;
-  }
-};
-
-class ICStubCompiler : public ICStubCompilerBase {
-  // Prevent GC in the middle of stub compilation.
-  js::gc::AutoSuppressGC suppressGC;
-
- protected:
-  ICStub::Kind kind;
-
-  // By default the stubcode key is just the kind.
-  virtual int32_t getKey() const { return static_cast<int32_t>(kind); }
-
-  virtual MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) = 0;
-
-  JitCode* getStubCode();
-
-  ICStubCompiler(JSContext* cx, ICStub::Kind kind)
-      : ICStubCompilerBase(cx), suppressGC(cx), kind(kind) {}
-
- protected:
-  template <typename T, typename... Args>
-  T* newStub(Args&&... args) {
-    return ICStub::New<T>(cx, std::forward<Args>(args)...);
-  }
-
- public:
-  virtual ICStub* getStub(ICStubSpace* space) = 0;
-
-  static ICStubSpace* StubSpaceForStub(bool makesGCCalls, JSScript* script,
-                                       ICScript* icScript);
-
-  ICStubSpace* getStubSpace(JSScript* outerScript) {
-    MOZ_ASSERT(IsTypeInferenceEnabled());
-    return StubSpaceForStub(ICStub::NonCacheIRStubMakesGCCalls(kind),
-                            outerScript, /*icScript = */ nullptr);
-  }
-};
-
-// Monitored fallback stubs - as the name implies.
-class ICMonitoredFallbackStub : public ICFallbackStub {
- protected:
-  // Pointer to the fallback monitor stub. Created lazily by
-  // getFallbackMonitorStub if needed.
-  ICTypeMonitor_Fallback* fallbackMonitorStub_;
-
-  ICMonitoredFallbackStub(Kind kind, TrampolinePtr stubCode)
-      : ICFallbackStub(kind, ICStub::MonitoredFallback, stubCode),
-        fallbackMonitorStub_(nullptr) {}
-
- public:
-  MOZ_MUST_USE bool initMonitoringChain(JSContext* cx, JSScript* script);
-
-  ICTypeMonitor_Fallback* maybeFallbackMonitorStub() const {
-    return fallbackMonitorStub_;
-  }
-  ICTypeMonitor_Fallback* getFallbackMonitorStub(JSContext* cx,
-                                                 JSScript* script) {
-    if (!fallbackMonitorStub_ && !initMonitoringChain(cx, script)) {
-      return nullptr;
-    }
-    MOZ_ASSERT(fallbackMonitorStub_);
-    return fallbackMonitorStub_;
-  }
-
-  static inline size_t offsetOfFallbackMonitorStub() {
-    return offsetof(ICMonitoredFallbackStub, fallbackMonitorStub_);
-  }
-};
-
-// TypeCheckPrimitiveSetStub
-//   Base class for IC stubs (TypeUpdate or TypeMonitor) that check that a given
-//   value's type falls within a set of primitive types.
-
-class TypeCheckPrimitiveSetStub : public ICStub {
-  friend class ICStubSpace;
-
- protected:
-  inline static uint16_t TypeToFlag(ValueType type) {
-    return 1u << static_cast<unsigned>(type);
-  }
-
-  inline static uint16_t ValidFlags() {
-    return ((TypeToFlag(ValueType::Object) << 1) - 1) &
-           ~(TypeToFlag(ValueType::Magic) |
-             TypeToFlag(ValueType::PrivateGCThing));
-  }
-
-  TypeCheckPrimitiveSetStub(Kind kind, JitCode* stubCode, uint16_t flags)
-      : ICStub(kind, stubCode) {
-    MOZ_ASSERT(kind == TypeMonitor_PrimitiveSet ||
-               kind == TypeUpdate_PrimitiveSet);
-    MOZ_ASSERT(flags && !(flags & ~ValidFlags()));
-    extra_ = flags;
-  }
-
-  TypeCheckPrimitiveSetStub* updateTypesAndCode(uint16_t flags, JitCode* code) {
-    MOZ_ASSERT(flags && !(flags & ~ValidFlags()));
-    if (!code) {
-      return nullptr;
-    }
-    extra_ = flags;
-    updateCode(code);
-    return this;
-  }
-
- public:
-  uint16_t typeFlags() const { return extra_; }
-
-  bool containsType(ValueType type) const {
-    MOZ_ASSERT(type != ValueType::Magic && type != ValueType::PrivateGCThing);
-    return extra_ & TypeToFlag(type);
-  }
-
-  ICTypeMonitor_PrimitiveSet* toMonitorStub() {
-    return toTypeMonitor_PrimitiveSet();
-  }
-
-  ICTypeUpdate_PrimitiveSet* toUpdateStub() {
-    return toTypeUpdate_PrimitiveSet();
-  }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    TypeCheckPrimitiveSetStub* existingStub_;
-    uint16_t flags_;
-
-    virtual int32_t getKey() const override {
-      return static_cast<int32_t>(kind) | (static_cast<int32_t>(flags_) << 16);
-    }
-
-   public:
-    Compiler(JSContext* cx, Kind kind, TypeCheckPrimitiveSetStub* existingStub,
-             ValueType type)
-        : ICStubCompiler(cx, kind),
-          existingStub_(existingStub),
-          flags_((existingStub ? existingStub->typeFlags() : 0) |
-                 TypeToFlag(type)) {
-      MOZ_ASSERT_IF(existingStub_, flags_ != existingStub_->typeFlags());
-    }
-
-    TypeCheckPrimitiveSetStub* updateStub() {
-      MOZ_ASSERT(existingStub_);
-      return existingStub_->updateTypesAndCode(flags_, getStubCode());
-    }
-  };
-};
-
-// TypeMonitor
-
-// The TypeMonitor fallback stub is not always a regular fallback stub. When
-// used for monitoring the values pushed by a bytecode it doesn't hold a
-// pointer to the IC entry, but rather back to the main fallback stub for the
-// IC (from which a pointer to the IC entry can be retrieved). When monitoring
-// the types of 'this', arguments or other values with no associated IC, there
-// is no main fallback stub, and the IC entry is referenced directly.
-class ICTypeMonitor_Fallback : public ICStub {
-  friend class ICStubSpace;
-
-  static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
-  // Pointer to the main fallback stub for the IC or to the main IC entry,
-  // depending on hasFallbackStub.
-  union {
-    ICMonitoredFallbackStub* mainFallbackStub_;
-    ICEntry* icEntry_;
-  };
-
-  // Pointer to the first monitor stub.
-  ICStub* firstMonitorStub_;
-
-  // Address of the last monitor stub's field pointing to this
-  // fallback monitor stub.  This will get updated when new
-  // monitor stubs are created and added.
-  ICStub** lastMonitorStubPtrAddr_;
-
-  // Count of optimized type monitor stubs in this chain.
-  uint32_t numOptimizedMonitorStubs_ : 7;
-
-  // Whether this has a fallback stub referring to the IC entry.
-  bool hasFallbackStub_ : 1;
-
-  // Index of 'this' or argument which is being monitored, or BYTECODE_INDEX
-  // if this is monitoring the types of values pushed at some bytecode.
-  uint32_t argumentIndex_ : 23;
-
-  static const uint32_t BYTECODE_INDEX = (1 << 23) - 1;
-
-  ICTypeMonitor_Fallback(TrampolinePtr stubCode,
-                         ICMonitoredFallbackStub* mainFallbackStub,
-                         uint32_t argumentIndex = BYTECODE_INDEX)
-      : ICStub(ICStub::TypeMonitor_Fallback, stubCode.value),
-        mainFallbackStub_(mainFallbackStub),
-        firstMonitorStub_(thisFromCtor()),
-        lastMonitorStubPtrAddr_(nullptr),
-        numOptimizedMonitorStubs_(0),
-        hasFallbackStub_(mainFallbackStub != nullptr),
-        argumentIndex_(argumentIndex) {}
-
-  ICTypeMonitor_Fallback* thisFromCtor() { return this; }
-
-  void addOptimizedMonitorStub(ICStub* stub) {
-    stub->setNext(this);
-
-    MOZ_ASSERT((lastMonitorStubPtrAddr_ != nullptr) ==
-               (numOptimizedMonitorStubs_ || !hasFallbackStub_));
-
-    if (lastMonitorStubPtrAddr_) {
-      *lastMonitorStubPtrAddr_ = stub;
-    }
-
-    if (numOptimizedMonitorStubs_ == 0) {
-      MOZ_ASSERT(firstMonitorStub_ == this);
-      firstMonitorStub_ = stub;
-    } else {
-      MOZ_ASSERT(firstMonitorStub_ != nullptr);
-    }
-
-    lastMonitorStubPtrAddr_ = stub->addressOfNext();
-    numOptimizedMonitorStubs_++;
-  }
-
- public:
-  bool hasStub(ICStub::Kind kind) {
-    ICStub* stub = firstMonitorStub_;
-    do {
-      if (stub->kind() == kind) {
-        return true;
-      }
-
-      stub = stub->next();
-    } while (stub);
-
-    return false;
-  }
-
-  inline ICFallbackStub* mainFallbackStub() const {
-    MOZ_ASSERT(hasFallbackStub_);
-    return mainFallbackStub_;
-  }
-
-  inline ICEntry* icEntry() const {
-    return hasFallbackStub_ ? mainFallbackStub()->icEntry() : icEntry_;
-  }
-
-  inline ICStub* firstMonitorStub() const { return firstMonitorStub_; }
-
-  static inline size_t offsetOfFirstMonitorStub() {
-    return offsetof(ICTypeMonitor_Fallback, firstMonitorStub_);
-  }
-
-  inline uint32_t numOptimizedMonitorStubs() const {
-    return numOptimizedMonitorStubs_;
-  }
-
-  inline bool monitorsThis() const { return argumentIndex_ == 0; }
-
-  inline bool monitorsArgument(uint32_t* pargument) const {
-    if (argumentIndex_ > 0 && argumentIndex_ < BYTECODE_INDEX) {
-      *pargument = argumentIndex_ - 1;
-      return true;
-    }
-    return false;
+    return offsetof(ICCacheIRStub, enteredCount_);
   }
-
-  inline bool monitorsBytecode() const {
-    return argumentIndex_ == BYTECODE_INDEX;
-  }
-
-  // Fixup the IC entry as for a normal fallback stub, for this/arguments.
-  void fixupICEntry(ICEntry* icEntry) {
-    MOZ_ASSERT(!hasFallbackStub_);
-    MOZ_ASSERT(icEntry_ == nullptr);
-    MOZ_ASSERT(lastMonitorStubPtrAddr_ == nullptr);
-    icEntry_ = icEntry;
-    lastMonitorStubPtrAddr_ = icEntry_->addressOfFirstStub();
-  }
-
-  // Create a new monitor stub for the type of the given value, and
-  // add it to this chain.
-  MOZ_MUST_USE bool addMonitorStubForValue(JSContext* cx, BaselineFrame* frame,
-                                           StackTypeSet* types,
-                                           HandleValue val);
-
-  void resetMonitorStubChain(Zone* zone);
 };
 
-class ICTypeMonitor_PrimitiveSet : public TypeCheckPrimitiveSetStub {
-  friend class ICStubSpace;
-
-  ICTypeMonitor_PrimitiveSet(JitCode* stubCode, uint16_t flags)
-      : TypeCheckPrimitiveSetStub(TypeMonitor_PrimitiveSet, stubCode, flags) {}
-
- public:
-  class Compiler : public TypeCheckPrimitiveSetStub::Compiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, ICTypeMonitor_PrimitiveSet* existingStub,
-             ValueType type)
-        : TypeCheckPrimitiveSetStub::Compiler(cx, TypeMonitor_PrimitiveSet,
-                                              existingStub, type) {}
-
-    ICTypeMonitor_PrimitiveSet* updateStub() {
-      TypeCheckPrimitiveSetStub* stub =
-          this->TypeCheckPrimitiveSetStub::Compiler::updateStub();
-      if (!stub) {
-        return nullptr;
-      }
-      return stub->toMonitorStub();
-    }
-
-    ICTypeMonitor_PrimitiveSet* getStub(ICStubSpace* space) override {
-      MOZ_ASSERT(!existingStub_);
-      return newStub<ICTypeMonitor_PrimitiveSet>(space, getStubCode(), flags_);
-    }
-  };
-};
-
-class ICTypeMonitor_SingleObject : public ICStub {
-  friend class ICStubSpace;
-
-  GCPtrObject obj_;
-
-  ICTypeMonitor_SingleObject(JitCode* stubCode, JSObject* obj);
-
- public:
-  GCPtrObject& object() { return obj_; }
-
-  static size_t offsetOfObject() {
-    return offsetof(ICTypeMonitor_SingleObject, obj_);
-  }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    HandleObject obj_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, HandleObject obj)
-        : ICStubCompiler(cx, TypeMonitor_SingleObject), obj_(obj) {}
-
-    ICTypeMonitor_SingleObject* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeMonitor_SingleObject>(space, getStubCode(), obj_);
-    }
-  };
-};
-
-class ICTypeMonitor_ObjectGroup : public ICStub {
-  friend class ICStubSpace;
-
-  GCPtrObjectGroup group_;
-
-  ICTypeMonitor_ObjectGroup(JitCode* stubCode, ObjectGroup* group);
-
- public:
-  GCPtrObjectGroup& group() { return group_; }
-
-  static size_t offsetOfGroup() {
-    return offsetof(ICTypeMonitor_ObjectGroup, group_);
-  }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    HandleObjectGroup group_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, HandleObjectGroup group)
-        : ICStubCompiler(cx, TypeMonitor_ObjectGroup), group_(group) {}
-
-    ICTypeMonitor_ObjectGroup* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeMonitor_ObjectGroup>(space, getStubCode(), group_);
-    }
-  };
-};
-
-class ICTypeMonitor_AnyValue : public ICStub {
-  friend class ICStubSpace;
-
-  explicit ICTypeMonitor_AnyValue(JitCode* stubCode)
-      : ICStub(TypeMonitor_AnyValue, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, TypeMonitor_AnyValue) {}
-
-    ICTypeMonitor_AnyValue* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeMonitor_AnyValue>(space, getStubCode());
-    }
-  };
-};
-
-// TypeUpdate
-
-// The TypeUpdate fallback is not a regular fallback, since it just
-// forwards to a different entry point in the main fallback stub.
-class ICTypeUpdate_Fallback : public ICStub {
-  friend class ICStubSpace;
-
-  explicit ICTypeUpdate_Fallback(TrampolinePtr stubCode)
-      : ICStub(ICStub::TypeUpdate_Fallback, stubCode.value) {}
-};
-
-class ICTypeUpdate_PrimitiveSet : public TypeCheckPrimitiveSetStub {
-  friend class ICStubSpace;
-
-  ICTypeUpdate_PrimitiveSet(JitCode* stubCode, uint16_t flags)
-      : TypeCheckPrimitiveSetStub(TypeUpdate_PrimitiveSet, stubCode, flags) {}
-
- public:
-  class Compiler : public TypeCheckPrimitiveSetStub::Compiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, ICTypeUpdate_PrimitiveSet* existingStub,
-             ValueType type)
-        : TypeCheckPrimitiveSetStub::Compiler(cx, TypeUpdate_PrimitiveSet,
-                                              existingStub, type) {}
-
-    ICTypeUpdate_PrimitiveSet* updateStub() {
-      TypeCheckPrimitiveSetStub* stub =
-          this->TypeCheckPrimitiveSetStub::Compiler::updateStub();
-      if (!stub) {
-        return nullptr;
-      }
-      return stub->toUpdateStub();
-    }
-
-    ICTypeUpdate_PrimitiveSet* getStub(ICStubSpace* space) override {
-      MOZ_ASSERT(!existingStub_);
-      return newStub<ICTypeUpdate_PrimitiveSet>(space, getStubCode(), flags_);
-    }
-  };
-};
-
-// Type update stub to handle a singleton object.
-class ICTypeUpdate_SingleObject : public ICStub {
-  friend class ICStubSpace;
-
-  GCPtrObject obj_;
-
-  ICTypeUpdate_SingleObject(JitCode* stubCode, JSObject* obj);
-
- public:
-  GCPtrObject& object() { return obj_; }
-
-  static size_t offsetOfObject() {
-    return offsetof(ICTypeUpdate_SingleObject, obj_);
-  }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    HandleObject obj_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, HandleObject obj)
-        : ICStubCompiler(cx, TypeUpdate_SingleObject), obj_(obj) {}
-
-    ICTypeUpdate_SingleObject* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeUpdate_SingleObject>(space, getStubCode(), obj_);
-    }
-  };
-};
-
-// Type update stub to handle a single ObjectGroup.
-class ICTypeUpdate_ObjectGroup : public ICStub {
-  friend class ICStubSpace;
-
-  GCPtrObjectGroup group_;
-
-  ICTypeUpdate_ObjectGroup(JitCode* stubCode, ObjectGroup* group);
-
- public:
-  GCPtrObjectGroup& group() { return group_; }
-
-  static size_t offsetOfGroup() {
-    return offsetof(ICTypeUpdate_ObjectGroup, group_);
-  }
-
-  class Compiler : public ICStubCompiler {
-   protected:
-    HandleObjectGroup group_;
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    Compiler(JSContext* cx, HandleObjectGroup group)
-        : ICStubCompiler(cx, TypeUpdate_ObjectGroup), group_(group) {}
-
-    ICTypeUpdate_ObjectGroup* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeUpdate_ObjectGroup>(space, getStubCode(), group_);
-    }
-  };
-};
-
-class ICTypeUpdate_AnyValue : public ICStub {
-  friend class ICStubSpace;
-
-  explicit ICTypeUpdate_AnyValue(JitCode* stubCode)
-      : ICStub(TypeUpdate_AnyValue, stubCode) {}
-
- public:
-  class Compiler : public ICStubCompiler {
-   protected:
-    MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
-
-   public:
-    explicit Compiler(JSContext* cx)
-        : ICStubCompiler(cx, TypeUpdate_AnyValue) {}
-
-    ICTypeUpdate_AnyValue* getStub(ICStubSpace* space) override {
-      return newStub<ICTypeUpdate_AnyValue>(space, getStubCode());
-    }
-  };
-};
+AllocatableGeneralRegisterSet BaselineICAvailableGeneralRegs(size_t numInputs);
 
 // ToBool
 //      JSOp::IfNe
@@ -1531,30 +590,17 @@
 
   explicit ICToBool_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::ToBool_Fallback, stubCode) {}
-
- public:
-  static const uint32_t MAX_OPTIMIZED_STUBS = 8;
 };
 
 // GetElem
 //      JSOp::GetElem
 //      JSOp::GetElemSuper
 
-class ICGetElem_Fallback : public ICMonitoredFallbackStub {
+class ICGetElem_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
   explicit ICGetElem_Fallback(TrampolinePtr stubCode)
-      : ICMonitoredFallbackStub(ICStub::GetElem_Fallback, stubCode) {}
-
-  static const uint16_t EXTRA_NEGATIVE_INDEX = 0x1;
-  static const uint16_t SAW_NON_INTEGER_INDEX_BIT = 0x2;
-
- public:
-  void noteNegativeIndex() { extra_ |= EXTRA_NEGATIVE_INDEX; }
-  bool hasNegativeIndex() const { return extra_ & EXTRA_NEGATIVE_INDEX; }
-
-  void setSawNonIntegerIndex() { extra_ |= SAW_NON_INTEGER_INDEX_BIT; }
-  bool sawNonIntegerIndex() const { return extra_ & SAW_NON_INTEGER_INDEX_BIT; }
+      : ICFallbackStub(ICStub::GetElem_Fallback, stubCode) {}
 };
 
 // SetElem
@@ -1566,16 +612,6 @@
 
   explicit ICSetElem_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(ICStub::SetElem_Fallback, stubCode) {}
-
-  static const size_t HasDenseAddFlag = 0x1;
-  static const size_t HasTypedArrayOOBFlag = 0x2;
-
- public:
-  void noteHasDenseAdd() { extra_ |= HasDenseAddFlag; }
-  bool hasDenseAdd() const { return extra_ & HasDenseAddFlag; }
-
-  void noteHasTypedArrayOOB() { extra_ |= HasTypedArrayOOBFlag; }
-  bool hasTypedArrayOOB() const { return extra_ & HasTypedArrayOOBFlag; }
 };
 
 // In
@@ -1608,11 +644,11 @@
 // GetName
 //      JSOp::GetName
 //      JSOp::GetGName
-class ICGetName_Fallback : public ICMonitoredFallbackStub {
+class ICGetName_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
   explicit ICGetName_Fallback(TrampolinePtr stubCode)
-      : ICMonitoredFallbackStub(ICStub::GetName_Fallback, stubCode) {}
+      : ICFallbackStub(ICStub::GetName_Fallback, stubCode) {}
 };
 
 // BindName
@@ -1626,32 +662,22 @@
 
 // GetIntrinsic
 //      JSOp::GetIntrinsic
-class ICGetIntrinsic_Fallback : public ICMonitoredFallbackStub {
+class ICGetIntrinsic_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
   explicit ICGetIntrinsic_Fallback(TrampolinePtr stubCode)
-      : ICMonitoredFallbackStub(ICStub::GetIntrinsic_Fallback, stubCode) {}
+      : ICFallbackStub(ICStub::GetIntrinsic_Fallback, stubCode) {}
 };
 
 // GetProp
 //     JSOp::GetProp
 //     JSOp::GetPropSuper
 
-class ICGetProp_Fallback : public ICMonitoredFallbackStub {
+class ICGetProp_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
   explicit ICGetProp_Fallback(TrampolinePtr stubCode)
-      : ICMonitoredFallbackStub(ICStub::GetProp_Fallback, stubCode) {}
-
- public:
-  // Whether this bytecode op called a getter. This is used by IonBuilder.
-  // To improve performance, the flag is not set if WarpBuilder is enabled.
-  static const size_t ACCESSED_GETTER_BIT = 1;
-
-  void noteAccessedGetter() { extra_ |= (1u << ACCESSED_GETTER_BIT); }
-  bool hasAccessedGetter() const {
-    return extra_ & (1u << ACCESSED_GETTER_BIT);
-  }
+      : ICFallbackStub(ICStub::GetProp_Fallback, stubCode) {}
 };
 
 // SetProp
@@ -1683,15 +709,11 @@
 //      JSOp::SpreadEval
 //      JSOp::SpreadStrictEval
 
-class ICCall_Fallback : public ICMonitoredFallbackStub {
+class ICCall_Fallback : public ICFallbackStub {
   friend class ICStubSpace;
 
- public:
-  static const uint32_t MAX_OPTIMIZED_STUBS = 16;
-
- private:
   explicit ICCall_Fallback(TrampolinePtr stubCode)
-      : ICMonitoredFallbackStub(ICStub::Call_Fallback, stubCode) {}
+      : ICFallbackStub(ICStub::Call_Fallback, stubCode) {}
 };
 
 // IC for constructing an iterator from an input value.
@@ -1745,8 +767,6 @@
         templateObject_(templateObject) {}
 
  public:
-  static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
   GCPtrArrayObject& templateObject() { return templateObject_; }
 };
 
@@ -1763,10 +783,6 @@
 
   explicit ICUnaryArith_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(UnaryArith_Fallback, stubCode) {}
-
- public:
-  bool sawDoubleResult() { return extra_; }
-  void setSawDoubleResult() { extra_ = 1; }
 };
 
 // Compare
@@ -1796,14 +812,6 @@
 
   explicit ICBinaryArith_Fallback(TrampolinePtr stubCode)
       : ICFallbackStub(BinaryArith_Fallback, stubCode) {}
-
-  static const uint16_t SAW_DOUBLE_RESULT_BIT = 0x1;
-
- public:
-  static const uint32_t MAX_OPTIMIZED_STUBS = 8;
-
-  bool sawDoubleResult() const { return extra_ & SAW_DOUBLE_RESULT_BIT; }
-  void setSawDoubleResult() { extra_ |= SAW_DOUBLE_RESULT_BIT; }
 };
 
 // JSOp::NewArray
@@ -1857,16 +865,6 @@
 
 struct IonOsrTempData;
 
-extern MOZ_MUST_USE bool TypeMonitorResult(JSContext* cx,
-                                           ICMonitoredFallbackStub* stub,
-                                           BaselineFrame* frame,
-                                           HandleScript script, jsbytecode* pc,
-                                           HandleValue val);
-
-extern bool DoTypeUpdateFallback(JSContext* cx, BaselineFrame* frame,
-                                 ICCacheIR_Updated* stub, HandleValue objval,
-                                 HandleValue value);
-
 extern bool DoCallFallback(JSContext* cx, BaselineFrame* frame,
                            ICCall_Fallback* stub, uint32_t argc, Value* vp,
                            MutableHandleValue res);
@@ -1875,10 +873,6 @@
                                  ICCall_Fallback* stub, Value* vp,
                                  MutableHandleValue res);
 
-extern bool DoTypeMonitorFallback(JSContext* cx, BaselineFrame* frame,
-                                  ICTypeMonitor_Fallback* stub,
-                                  HandleValue value, MutableHandleValue res);
-
 extern bool DoToBoolFallback(JSContext* cx, BaselineFrame* frame,
                              ICToBool_Fallback* stub, HandleValue arg,
                              MutableHandleValue ret);
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineICList.h firefox-85.0+build1/js/src/jit/BaselineICList.h
--- firefox-84.0.2+build1/js/src/jit/BaselineICList.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineICList.h	2021-01-18 19:58:13.000000000 +0000
@@ -10,21 +10,9 @@
 namespace js {
 namespace jit {
 
-// List of Baseline IC stub kinds. The stub kind determines the structure of the
-// ICStub data.
+// List of Baseline IC fallback stub kinds. The stub kind determines which
+// class (deriving from ICFallbackStub) this is.
 #define IC_BASELINE_STUB_KIND_LIST(_) \
-  _(TypeMonitor_Fallback)             \
-  _(TypeMonitor_SingleObject)         \
-  _(TypeMonitor_ObjectGroup)          \
-  _(TypeMonitor_PrimitiveSet)         \
-  _(TypeMonitor_AnyValue)             \
-                                      \
-  _(TypeUpdate_Fallback)              \
-  _(TypeUpdate_SingleObject)          \
-  _(TypeUpdate_ObjectGroup)           \
-  _(TypeUpdate_PrimitiveSet)          \
-  _(TypeUpdate_AnyValue)              \
-                                      \
   _(NewArray_Fallback)                \
   _(NewObject_Fallback)               \
                                       \
@@ -65,11 +53,7 @@
                                       \
   _(Compare_Fallback)                 \
                                       \
-  _(GetProp_Fallback)                 \
-                                      \
-  _(CacheIR_Regular)                  \
-  _(CacheIR_Monitored)                \
-  _(CacheIR_Updated)
+  _(GetProp_Fallback)
 
 // List of fallback trampolines. Each of these fallback trampolines exists as
 // part of the JitRuntime. Note that some fallback stubs in previous list may
@@ -77,8 +61,6 @@
 // constructing/spread variants here with different calling conventions needing
 // different trampolines.
 #define IC_BASELINE_FALLBACK_CODE_KIND_LIST(_) \
-  _(TypeMonitor)                               \
-  _(TypeUpdate)                                \
   _(NewArray)                                  \
   _(NewObject)                                 \
   _(ToBool)                                    \
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineInspector.cpp firefox-85.0+build1/js/src/jit/BaselineInspector.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineInspector.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineInspector.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1614 +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 "jit/BaselineInspector.h"
-
-#include "mozilla/Array.h"
-#include "mozilla/DebugOnly.h"
-
-#include "jit/BaselineIC.h"
-#include "jit/CacheIRCompiler.h"
-
-#include "vm/EnvironmentObject-inl.h"
-#include "vm/JSScript-inl.h"
-#include "vm/ObjectGroup-inl.h"
-#include "vm/ReceiverGuard-inl.h"
-
-using namespace js;
-using namespace js::jit;
-
-using mozilla::DebugOnly;
-
-bool SetElemICInspector::sawOOBDenseWrite() const {
-  if (!icEntry_) {
-    return false;
-  }
-
-  // Check for a write hole bit on the SetElem_Fallback stub.
-  ICStub* stub = icEntry_->fallbackStub();
-  if (stub->isSetElem_Fallback()) {
-    return stub->toSetElem_Fallback()->hasDenseAdd();
-  }
-
-  return false;
-}
-
-bool SetElemICInspector::sawOOBTypedArrayWrite() const {
-  if (!icEntry_) {
-    return false;
-  }
-
-  ICStub* stub = icEntry_->fallbackStub();
-  if (stub->isSetElem_Fallback()) {
-    return stub->toSetElem_Fallback()->hasTypedArrayOOB();
-  }
-
-  return false;
-}
-
-template <typename S, typename T>
-static bool VectorAppendNoDuplicate(S& list, T value) {
-  for (size_t i = 0; i < list.length(); i++) {
-    if (list[i] == value) {
-      return true;
-    }
-  }
-  return list.append(value);
-}
-
-static bool AddReceiver(const ReceiverGuard& receiver,
-                        BaselineInspector::ReceiverVector& receivers) {
-  return VectorAppendNoDuplicate(receivers, receiver);
-}
-
-static bool GetCacheIRReceiverForNativeReadSlot(ICCacheIR_Monitored* stub,
-                                                ReceiverGuard* receiver) {
-  // We match:
-  //
-  //   GuardToObject 0
-  //   GuardShape 0
-  //   LoadFixedSlotResult 0 or LoadDynamicSlotResult 0
-
-  *receiver = ReceiverGuard();
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return false;
-  }
-
-  if (reader.matchOp(CacheOp::GuardShape, objId)) {
-    receiver->setShape(
-        stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset()));
-    return reader.matchOpEither(CacheOp::LoadFixedSlotResult,
-                                CacheOp::LoadDynamicSlotResult);
-  }
-
-  return false;
-}
-
-static bool GetCacheIRReceiverForNativeSetSlot(ICCacheIR_Updated* stub,
-                                               ReceiverGuard* receiver) {
-  // We match:
-  //
-  //   GuardToObject 0
-  //   GuardGroup 0
-  //   GuardShape 0
-  //   StoreFixedSlot 0 or StoreDynamicSlot 0
-  *receiver = ReceiverGuard();
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return false;
-  }
-
-  if (!reader.matchOp(CacheOp::GuardGroup, objId)) {
-    return false;
-  }
-  ObjectGroup* group =
-      stub->stubInfo()->getStubField<ObjectGroup*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::GuardShape, objId)) {
-    return false;
-  }
-  Shape* shape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOpEither(CacheOp::StoreFixedSlot,
-                            CacheOp::StoreDynamicSlot)) {
-    return false;
-  }
-
-  *receiver = ReceiverGuard(group, shape);
-  return true;
-}
-
-JitScript* BaselineInspector::jitScript() const { return script->jitScript(); }
-
-ICEntry& BaselineInspector::icEntryFromPC(jsbytecode* pc) {
-  ICEntry* entry = maybeICEntryFromPC(pc);
-  MOZ_ASSERT(entry);
-  return *entry;
-}
-
-ICEntry* BaselineInspector::maybeICEntryFromPC(jsbytecode* pc) {
-  MOZ_ASSERT(isValidPC(pc));
-  ICEntry* ent = jitScript()->maybeICEntryFromPCOffset(script->pcToOffset(pc),
-                                                       prevLookedUpEntry);
-  if (!ent) {
-    return nullptr;
-  }
-
-  MOZ_ASSERT(!ent->isForPrologue());
-  prevLookedUpEntry = ent;
-  return ent;
-}
-
-bool BaselineInspector::maybeInfoForPropertyOp(jsbytecode* pc,
-                                               ReceiverVector& receivers) {
-  // Return a list of the receivers seen by the baseline IC for the current
-  // op. Empty lists indicate no receivers are known, or there was an
-  // uncacheable access.
-  MOZ_ASSERT(receivers.empty());
-
-  MOZ_ASSERT(isValidPC(pc));
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  ICStub* stub = entry.firstStub();
-  while (stub->next()) {
-    ReceiverGuard receiver;
-    if (stub->isCacheIR_Monitored()) {
-      if (!GetCacheIRReceiverForNativeReadSlot(stub->toCacheIR_Monitored(),
-                                               &receiver)) {
-        receivers.clear();
-        return true;
-      }
-    } else if (stub->isCacheIR_Updated()) {
-      if (!GetCacheIRReceiverForNativeSetSlot(stub->toCacheIR_Updated(),
-                                              &receiver)) {
-        receivers.clear();
-        return true;
-      }
-    } else {
-      receivers.clear();
-      return true;
-    }
-
-    if (!AddReceiver(receiver, receivers)) {
-      return false;
-    }
-
-    stub = stub->next();
-  }
-
-  if (stub->toFallbackStub()->state().hasFailures()) {
-    receivers.clear();
-  }
-
-  // Don't inline if there are more than 5 receivers.
-  if (receivers.length() > 5) {
-    receivers.clear();
-  }
-
-  return true;
-}
-
-ICStub* BaselineInspector::monomorphicStub(jsbytecode* pc) {
-  // IonBuilder::analyzeNewLoopTypes may call this (via expectedResultType
-  // below) on code that's unreachable, according to BytecodeAnalysis. Use
-  // maybeICEntryFromPC to handle this.
-  const ICEntry* entry = maybeICEntryFromPC(pc);
-  if (!entry) {
-    return nullptr;
-  }
-
-  ICStub* stub = entry->firstStub();
-  ICStub* next = stub->next();
-
-  if (!next || !next->isFallback()) {
-    return nullptr;
-  }
-
-  return stub;
-}
-
-bool BaselineInspector::dimorphicStub(jsbytecode* pc, ICStub** pfirst,
-                                      ICStub** psecond) {
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  ICStub* stub = entry.firstStub();
-  ICStub* next = stub->next();
-  ICStub* after = next ? next->next() : nullptr;
-
-  if (!after || !after->isFallback()) {
-    return false;
-  }
-
-  *pfirst = stub;
-  *psecond = next;
-  return true;
-}
-
-// Process the type guards in the stub in order to reveal the
-// underlying operation.
-static void SkipBinaryGuards(CacheIRReader& reader, bool* sawStringOperand) {
-  while (true) {
-    // Two skip opcodes
-    if (reader.matchOp(CacheOp::GuardNonDoubleType) ||
-        reader.matchOp(CacheOp::TruncateDoubleToUInt32) ||
-        reader.matchOp(CacheOp::GuardBooleanToInt32) ||
-        reader.matchOp(CacheOp::LoadInt32Constant)) {
-      reader.skip();  // Skip over operandId
-      reader.skip();  // Skip over result/type.
-      continue;
-    }
-    if (reader.matchOp(CacheOp::GuardStringToNumber) ||
-        reader.matchOp(CacheOp::GuardStringToInt32)) {
-      if (sawStringOperand) {
-        *sawStringOperand = true;
-      }
-      reader.skip();  // Skip over operandId
-      reader.skip();  // Skip over result.
-      continue;
-    }
-
-    // One skip
-    if (reader.matchOp(CacheOp::GuardToInt32) ||
-        reader.matchOp(CacheOp::GuardIsNumber) ||
-        reader.matchOp(CacheOp::GuardToString) ||
-        reader.matchOp(CacheOp::GuardToObject) ||
-        reader.matchOp(CacheOp::GuardToBigInt) ||
-        reader.matchOp(CacheOp::GuardToBoolean) ||
-        reader.matchOp(CacheOp::GuardIsNullOrUndefined)) {
-      reader.skip();  // Skip over operandId
-      continue;
-    }
-    return;
-  }
-}
-
-static MIRType ParseCacheIRStub(ICStub* stub,
-                                bool* sawStringOperand = nullptr) {
-  ICCacheIR_Regular* cacheirStub = stub->toCacheIR_Regular();
-  CacheIRReader reader(cacheirStub->stubInfo());
-  SkipBinaryGuards(reader, sawStringOperand);
-  switch (reader.readOp()) {
-    case CacheOp::LoadUndefinedResult:
-      return MIRType::Undefined;
-    case CacheOp::LoadBooleanResult:
-      return MIRType::Boolean;
-    case CacheOp::LoadStringResult:
-    case CacheOp::CallStringConcatResult:
-    case CacheOp::CallStringObjectConcatResult:
-    case CacheOp::CallInt32ToString:
-    case CacheOp::BooleanToString:
-    case CacheOp::CallNumberToString:
-      return MIRType::String;
-    case CacheOp::LoadDoubleResult:
-    case CacheOp::DoubleAddResult:
-    case CacheOp::DoubleSubResult:
-    case CacheOp::DoubleMulResult:
-    case CacheOp::DoubleDivResult:
-    case CacheOp::DoubleModResult:
-    case CacheOp::DoublePowResult:
-    case CacheOp::DoubleNegationResult:
-    case CacheOp::DoubleIncResult:
-    case CacheOp::DoubleDecResult:
-      return MIRType::Double;
-    case CacheOp::LoadInt32Result:
-    case CacheOp::Int32AddResult:
-    case CacheOp::Int32SubResult:
-    case CacheOp::Int32MulResult:
-    case CacheOp::Int32DivResult:
-    case CacheOp::Int32ModResult:
-    case CacheOp::Int32PowResult:
-    case CacheOp::Int32BitOrResult:
-    case CacheOp::Int32BitXorResult:
-    case CacheOp::Int32BitAndResult:
-    case CacheOp::Int32LeftShiftResult:
-    case CacheOp::Int32RightShiftResult:
-    case CacheOp::Int32NotResult:
-    case CacheOp::Int32NegationResult:
-    case CacheOp::Int32IncResult:
-    case CacheOp::Int32DecResult:
-      return MIRType::Int32;
-    // Int32URightShiftResult may return a double under some
-    // circumstances.
-    case CacheOp::Int32URightShiftResult:
-      reader.skip();  // Skip over lhs
-      reader.skip();  // Skip over rhs
-      return reader.readByte() == 0 ? MIRType::Int32 : MIRType::Double;
-    case CacheOp::BigIntAddResult:
-    case CacheOp::BigIntSubResult:
-    case CacheOp::BigIntMulResult:
-    case CacheOp::BigIntDivResult:
-    case CacheOp::BigIntModResult:
-    case CacheOp::BigIntPowResult:
-    case CacheOp::BigIntBitOrResult:
-    case CacheOp::BigIntBitXorResult:
-    case CacheOp::BigIntBitAndResult:
-    case CacheOp::BigIntLeftShiftResult:
-    case CacheOp::BigIntRightShiftResult:
-    case CacheOp::BigIntNotResult:
-    case CacheOp::BigIntNegationResult:
-    case CacheOp::BigIntIncResult:
-    case CacheOp::BigIntDecResult:
-      return MIRType::BigInt;
-    case CacheOp::LoadValueResult:
-      return MIRType::Value;
-    default:
-      MOZ_CRASH("Unknown op");
-      return MIRType::None;
-  }
-}
-
-MIRType BaselineInspector::expectedResultType(jsbytecode* pc) {
-  // Look at the IC entries for this op to guess what type it will produce,
-  // returning MIRType::None otherwise. Note that IonBuilder may call this
-  // for bytecode ops that are unreachable and don't have a Baseline IC, see
-  // comment in monomorphicStub.
-
-  ICStub* stub = monomorphicStub(pc);
-  if (!stub) {
-    return MIRType::None;
-  }
-
-  switch (stub->kind()) {
-    case ICStub::CacheIR_Regular:
-      return ParseCacheIRStub(stub);
-    default:
-      return MIRType::None;
-  }
-}
-
-// Return the MIRtype corresponding to the guard the reader is pointing
-// to, and ensure that afterwards the reader is pointing to the next op
-// (consume operands).
-//
-// An expected parameter is provided to allow GuardType to check we read
-// the guard from the expected operand in debug builds.
-static bool GuardType(CacheIRReader& reader,
-                      mozilla::Array<MIRType, 2>& guardType) {
-  CacheOp op = reader.readOp();
-  uint8_t guardOperand = reader.readByte();
-
-  // We only have two entries for guard types.
-  if (guardOperand > 1) {
-    return false;
-  }
-
-  // Already assigned this guard a type, fail.
-  if (guardType[guardOperand] != MIRType::None) {
-    return false;
-  }
-
-  switch (op) {
-    // 0 Skip cases
-    case CacheOp::GuardToString:
-      guardType[guardOperand] = MIRType::String;
-      break;
-    case CacheOp::GuardToSymbol:
-      guardType[guardOperand] = MIRType::Symbol;
-      break;
-    case CacheOp::GuardToBigInt:
-      guardType[guardOperand] = MIRType::BigInt;
-      break;
-    case CacheOp::GuardToBoolean:
-      guardType[guardOperand] = MIRType::Boolean;
-      break;
-    case CacheOp::GuardToInt32:
-      guardType[guardOperand] = MIRType::Int32;
-      break;
-    case CacheOp::GuardIsNumber:
-      guardType[guardOperand] = MIRType::Double;
-      break;
-    case CacheOp::GuardIsUndefined:
-      guardType[guardOperand] = MIRType::Undefined;
-      break;
-    // 1 skip
-    case CacheOp::GuardBooleanToInt32:
-      guardType[guardOperand] = MIRType::Boolean;
-      // Skip over result
-      reader.skip();
-      break;
-    // Unknown op --
-    default:
-      return false;
-  }
-  return true;
-}
-
-// This code works for all Compare ICs where the pattern is
-//
-//  <Guard LHS/RHS>
-//  <Guard RHS/LHS>
-//  <CompareResult>
-//
-// in other cases (like StrictlyDifferentTypes) it will just
-// return CompareUnknown
-static MCompare::CompareType ParseCacheIRStubForCompareType(
-    ICCacheIR_Regular* stub) {
-  CacheIRReader reader(stub->stubInfo());
-
-  // Two element array to allow parsing the guards
-  // in whichever order they appear.
-  mozilla::Array<MIRType, 2> guards = {MIRType::None, MIRType::None};
-
-  // Parse out two guards
-  if (!GuardType(reader, guards)) {
-    return MCompare::Compare_Unknown;
-  }
-  if (!GuardType(reader, guards)) {
-    return MCompare::Compare_Unknown;
-  }
-
-  // The lhs and rhs ids are asserted in
-  // CompareIRGenerator::tryAttachStub.
-  MIRType lhs_guard = guards[0];
-  MIRType rhs_guard = guards[1];
-
-  if (lhs_guard == rhs_guard) {
-    if (lhs_guard == MIRType::Int32) {
-      return MCompare::Compare_Int32;
-    }
-    if (lhs_guard == MIRType::Double) {
-      return MCompare::Compare_Double;
-    }
-    return MCompare::Compare_Unknown;
-  }
-
-  if ((lhs_guard == MIRType::Int32 && rhs_guard == MIRType::Boolean) ||
-      (lhs_guard == MIRType::Boolean && rhs_guard == MIRType::Int32)) {
-    // RHS is converting
-    if (rhs_guard == MIRType::Boolean) {
-      return MCompare::Compare_Int32MaybeCoerceRHS;
-    }
-
-    return MCompare::Compare_Int32MaybeCoerceLHS;
-  }
-
-  if ((lhs_guard == MIRType::Double && rhs_guard == MIRType::Undefined) ||
-      (lhs_guard == MIRType::Undefined && rhs_guard == MIRType::Double)) {
-    // RHS is converting
-    if (rhs_guard == MIRType::Undefined) {
-      return MCompare::Compare_DoubleMaybeCoerceRHS;
-    }
-
-    return MCompare::Compare_DoubleMaybeCoerceLHS;
-  }
-
-  return MCompare::Compare_Unknown;
-}
-
-static bool CoercingCompare(MCompare::CompareType type) {
-  // Prefer the coercing types if they exist, otherwise just use first's type.
-  if (type == MCompare::Compare_DoubleMaybeCoerceLHS ||
-      type == MCompare::Compare_DoubleMaybeCoerceRHS ||
-      type == MCompare::Compare_Int32MaybeCoerceLHS ||
-      type == MCompare::Compare_Int32MaybeCoerceRHS) {
-    return true;
-  }
-  return false;
-}
-
-static MCompare::CompareType CompatibleType(MCompare::CompareType first,
-                                            MCompare::CompareType second) {
-  // Caller should have dealt with this case.
-  MOZ_ASSERT(first != second);
-
-  // Prefer the coercing types if they exist, otherwise, return Double,
-  // which is the general cover.
-  if (CoercingCompare(first)) {
-    return first;
-  }
-
-  if (CoercingCompare(second)) {
-    return second;
-  }
-
-  // At this point we expect a Double/Int32 pair, so we return Double.
-  MOZ_ASSERT(first == MCompare::Compare_Int32 ||
-             first == MCompare::Compare_Double);
-  MOZ_ASSERT(second == MCompare::Compare_Int32 ||
-             second == MCompare::Compare_Double);
-  MOZ_ASSERT(first != second);
-
-  return MCompare::Compare_Double;
-}
-
-MCompare::CompareType BaselineInspector::expectedCompareType(jsbytecode* pc) {
-  ICStub* first = monomorphicStub(pc);
-  ICStub* second = nullptr;
-  if (!first && !dimorphicStub(pc, &first, &second)) {
-    return MCompare::Compare_Unknown;
-  }
-
-  if (ICStub* fallback = second ? second->next() : first->next()) {
-    MOZ_ASSERT(fallback->isFallback());
-    if (fallback->toFallbackStub()->state().hasFailures()) {
-      return MCompare::Compare_Unknown;
-    }
-  }
-
-  MCompare::CompareType first_type =
-      ParseCacheIRStubForCompareType(first->toCacheIR_Regular());
-  if (!second) {
-    return first_type;
-  }
-
-  MCompare::CompareType second_type =
-      ParseCacheIRStubForCompareType(second->toCacheIR_Regular());
-
-  if (first_type == MCompare::Compare_Unknown ||
-      second_type == MCompare::Compare_Unknown) {
-    return MCompare::Compare_Unknown;
-  }
-
-  if (first_type == second_type) {
-    return first_type;
-  }
-
-  return CompatibleType(first_type, second_type);
-}
-
-static bool TryToSpecializeBinaryArithOp(ICStub** stubs, uint32_t nstubs,
-                                         MIRType* result) {
-  DebugOnly<bool> sawInt32 = false;
-  bool sawDouble = false;
-  bool sawOther = false;
-  bool sawStringOperand = false;
-
-  for (uint32_t i = 0; i < nstubs; i++) {
-    switch (stubs[i]->kind()) {
-      case ICStub::CacheIR_Regular:
-        switch (ParseCacheIRStub(stubs[i], &sawStringOperand)) {
-          case MIRType::Double:
-            sawDouble = true;
-            break;
-          case MIRType::Int32:
-            sawInt32 = true;
-            break;
-          default:
-            sawOther = true;
-            break;
-        }
-        break;
-      default:
-        sawOther = true;
-        break;
-    }
-  }
-
-  if (sawOther) {
-    return false;
-  }
-
-  // Ion doesn't support string operands for binary arithmetic operations, so
-  // return false when we did see one. We don't test for strings in Ion itself,
-  // because Ion generally doesn't have sufficient type information when it
-  // falls back to the baseline inspector.
-  if (sawStringOperand) {
-    return false;
-  }
-
-  if (sawDouble) {
-    *result = MIRType::Double;
-    return true;
-  }
-
-  MOZ_ASSERT(sawInt32);
-  *result = MIRType::Int32;
-  return true;
-}
-
-MIRType BaselineInspector::expectedBinaryArithSpecialization(jsbytecode* pc) {
-  MIRType result;
-  ICStub* stubs[2];
-
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICFallbackStub* stub = entry.fallbackStub();
-  if (stub->state().hasFailures()) {
-    return MIRType::None;
-  }
-
-  stubs[0] = monomorphicStub(pc);
-  if (stubs[0]) {
-    if (TryToSpecializeBinaryArithOp(stubs, 1, &result)) {
-      return result;
-    }
-  }
-
-  if (dimorphicStub(pc, &stubs[0], &stubs[1])) {
-    if (TryToSpecializeBinaryArithOp(stubs, 2, &result)) {
-      return result;
-    }
-  }
-
-  return MIRType::None;
-}
-
-bool BaselineInspector::hasSeenNonIntegerIndex(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* stub = entry.fallbackStub();
-
-  MOZ_ASSERT(stub->isGetElem_Fallback());
-
-  return stub->toGetElem_Fallback()->sawNonIntegerIndex();
-}
-
-bool BaselineInspector::hasSeenNegativeIndexGetElement(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* stub = entry.fallbackStub();
-
-  if (stub->isGetElem_Fallback()) {
-    return stub->toGetElem_Fallback()->hasNegativeIndex();
-  }
-  return false;
-}
-
-bool BaselineInspector::hasSeenAccessedGetter(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* stub = entry.fallbackStub();
-
-  if (stub->isGetProp_Fallback()) {
-    return stub->toGetProp_Fallback()->hasAccessedGetter();
-  }
-  return false;
-}
-
-bool BaselineInspector::hasSeenDoubleResult(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* stub = entry.fallbackStub();
-
-  MOZ_ASSERT(stub->isUnaryArith_Fallback() || stub->isBinaryArith_Fallback());
-
-  if (stub->isUnaryArith_Fallback()) {
-    return stub->toUnaryArith_Fallback()->sawDoubleResult();
-  }
-  return stub->toBinaryArith_Fallback()->sawDoubleResult();
-}
-
-static bool MaybeArgumentReader(ICStub* stub, CacheOp targetOp,
-                                mozilla::Maybe<CacheIRReader>& argReader) {
-  MOZ_ASSERT(ICStub::IsCacheIRKind(stub->kind()));
-
-  CacheIRReader stubReader(stub->cacheIRStubInfo());
-  while (stubReader.more()) {
-    CacheOp op = stubReader.readOp();
-    uint32_t argLength = CacheIROpInfos[size_t(op)].argLength;
-
-    if (op == targetOp) {
-      MOZ_ASSERT(argReader.isNothing(),
-                 "Multiple instances of an op are not currently supported");
-      const uint8_t* argStart = stubReader.currentPosition();
-      argReader.emplace(argStart, argStart + argLength);
-    }
-
-    // Advance to next opcode.
-    stubReader.skip(argLength);
-  }
-  return argReader.isSome();
-}
-
-template <typename Filter>
-JSObject* MaybeTemplateObject(ICStub* stub, MetaTwoByteKind kind,
-                              Filter filter) {
-  const CacheIRStubInfo* stubInfo = stub->cacheIRStubInfo();
-  mozilla::Maybe<CacheIRReader> argReader;
-  if (!MaybeArgumentReader(stub, CacheOp::MetaTwoByte, argReader) ||
-      argReader->metaKind<MetaTwoByteKind>() != kind ||
-      !filter(*argReader, stubInfo)) {
-    return nullptr;
-  }
-  return stubInfo->getStubField<JSObject*>(stub, argReader->stubOffset());
-}
-
-JSObject* BaselineInspector::getTemplateObject(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    switch (stub->kind()) {
-      case ICStub::NewArray_Fallback:
-        return stub->toNewArray_Fallback()->templateObject();
-      case ICStub::NewObject_Fallback:
-        return stub->toNewObject_Fallback()->templateObject();
-      case ICStub::Rest_Fallback:
-        return stub->toRest_Fallback()->templateObject();
-      case ICStub::CacheIR_Regular:
-      case ICStub::CacheIR_Monitored:
-      case ICStub::CacheIR_Updated: {
-        auto filter = [](CacheIRReader& reader, const CacheIRStubInfo* info) {
-          mozilla::Unused << reader.stubOffset();  // Skip callee
-          return true;
-        };
-        JSObject* result = MaybeTemplateObject(
-            stub, MetaTwoByteKind::ScriptedTemplateObject, filter);
-        if (result) {
-          return result;
-        }
-      } break;
-      default:
-        break;
-    }
-  }
-
-  return nullptr;
-}
-
-ObjectGroup* BaselineInspector::getTemplateObjectGroup(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    switch (stub->kind()) {
-      case ICStub::NewArray_Fallback:
-        return stub->toNewArray_Fallback()->templateGroup();
-      default:
-        break;
-    }
-  }
-
-  return nullptr;
-}
-
-JSFunction* BaselineInspector::getSingleCallee(jsbytecode* pc) {
-  MOZ_ASSERT(IsConstructPC(pc));
-
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* stub = entry.firstStub();
-
-  if (entry.fallbackStub()->state().hasFailures()) {
-    return nullptr;
-  }
-
-  if (stub->next() != entry.fallbackStub()) {
-    return nullptr;
-  }
-
-  if (ICStub::IsCacheIRKind(stub->kind())) {
-    const CacheIRStubInfo* stubInfo = stub->cacheIRStubInfo();
-    mozilla::Maybe<CacheIRReader> argReader;
-    if (!MaybeArgumentReader(stub, CacheOp::MetaTwoByte, argReader) ||
-        argReader->metaKind<MetaTwoByteKind>() !=
-            MetaTwoByteKind::ScriptedTemplateObject) {
-      return nullptr;
-    }
-    // The callee is the first stub field in a ScriptedTemplateObject meta op.
-    return stubInfo->getStubField<JSFunction*>(stub, argReader->stubOffset());
-  }
-  return nullptr;
-}
-
-JSObject* BaselineInspector::getTemplateObjectForNative(jsbytecode* pc,
-                                                        Native native) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    if (ICStub::IsCacheIRKind(stub->kind())) {
-      auto filter = [stub, native](CacheIRReader& reader,
-                                   const CacheIRStubInfo* info) {
-        JSFunction* callee =
-            info->getStubField<JSFunction*>(stub, reader.stubOffset());
-        return callee->native() == native;
-      };
-      JSObject* result = MaybeTemplateObject(
-          stub, MetaTwoByteKind::NativeTemplateObject, filter);
-      if (result) {
-        return result;
-      }
-    }
-  }
-
-  return nullptr;
-}
-
-LexicalEnvironmentObject* BaselineInspector::templateNamedLambdaObject() {
-  JSObject* res = jitScript()->templateEnvironment();
-  if (script->bodyScope()->hasEnvironment()) {
-    res = res->enclosingEnvironment();
-  }
-  MOZ_ASSERT(res);
-
-  return &res->as<LexicalEnvironmentObject>();
-}
-
-CallObject* BaselineInspector::templateCallObject() {
-  JSObject* res = jitScript()->templateEnvironment();
-  MOZ_ASSERT(res);
-
-  return &res->as<CallObject>();
-}
-
-static bool MatchCacheIRReceiverGuard(CacheIRReader& reader, ICStub* stub,
-                                      const CacheIRStubInfo* stubInfo,
-                                      ObjOperandId objId,
-                                      ReceiverGuard* receiver) {
-  // This matches the CacheIR emitted in TestMatchingReceiver.
-  //
-  // Either:
-  //
-  //   GuardShape objId
-  //
-  *receiver = ReceiverGuard();
-
-  if (reader.matchOp(CacheOp::GuardShape, objId)) {
-    // The first case.
-    receiver->setShape(
-        stubInfo->getStubField<Shape*>(stub, reader.stubOffset()));
-    return true;
-  }
-  return false;
-}
-
-static bool AddCacheIRGlobalGetter(ICCacheIR_Monitored* stub, bool innerized,
-                                   JSObject** holder_, Shape** holderShape_,
-                                   JSFunction** commonGetter,
-                                   Shape** globalShape_, bool* isOwnProperty,
-                                   BaselineInspector::ReceiverVector& receivers,
-                                   JSScript* script) {
-  // We are matching on the IR generated by tryAttachGlobalNameGetter:
-  //
-  //   GuardShape objId
-  //   globalId = LoadEnclosingEnvironment objId
-  //   GuardShape globalId
-  //   <holderId = LoadObject <holder>>
-  //   <GuardShape holderId>
-  //   CallNativeGetterResult globalId
-
-  if (innerized) {
-    return false;
-  }
-
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardShape, objId)) {
-    return false;
-  }
-  Shape* globalLexicalShape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::LoadEnclosingEnvironment, objId)) {
-    return false;
-  }
-  ObjOperandId globalId = reader.objOperandId();
-
-  if (!reader.matchOp(CacheOp::GuardShape, globalId)) {
-    return false;
-  }
-  Shape* globalShape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-  MOZ_ASSERT(globalShape->getObjectClass()->flags & JSCLASS_IS_GLOBAL);
-
-  JSObject* holder = &script->global();
-  Shape* holderShape = globalShape;
-  if (reader.matchOp(CacheOp::LoadObject)) {
-    ObjOperandId holderId = reader.objOperandId();
-    holder = stub->stubInfo()
-                 ->getStubField<JSObject*>(stub, reader.stubOffset())
-                 .get();
-
-    if (!reader.matchOp(CacheOp::GuardShape, holderId)) {
-      return false;
-    }
-    holderShape =
-        stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-  }
-
-  // This guard will always fail, try the next stub.
-  if (holder->as<NativeObject>().lastProperty() != holderShape) {
-    return true;
-  }
-
-  if (!reader.matchOp(CacheOp::CallNativeGetterResult, globalId)) {
-    return false;
-  }
-  size_t offset = reader.stubOffset();
-  JSFunction* getter = &stub->stubInfo()
-                            ->getStubField<JSObject*>(stub, offset)
-                            ->as<JSFunction>();
-
-  ReceiverGuard receiver;
-  receiver.setShape(globalLexicalShape);
-  if (!AddReceiver(receiver, receivers)) {
-    return false;
-  }
-
-  if (!*commonGetter) {
-    *holder_ = holder;
-    *holderShape_ = holderShape;
-    *commonGetter = getter;
-    *globalShape_ = globalShape;
-
-    // This is always false, because the getters never live on the
-    // globalLexical.
-    *isOwnProperty = false;
-  } else if (*isOwnProperty || holderShape != *holderShape_ ||
-             globalShape != *globalShape_) {
-    return false;
-  } else {
-    MOZ_ASSERT(*commonGetter == getter);
-  }
-
-  return true;
-}
-
-static bool GuardSpecificAtomOrSymbol(CacheIRReader& reader, ICStub* stub,
-                                      const CacheIRStubInfo* stubInfo,
-                                      ValOperandId keyId, jsid id) {
-  // Try to match an id guard emitted by IRGenerator::emitIdGuard.
-  if (JSID_IS_ATOM(id)) {
-    if (!reader.matchOp(CacheOp::GuardToString, keyId)) {
-      return false;
-    }
-    if (!reader.matchOp(CacheOp::GuardSpecificAtom, keyId)) {
-      return false;
-    }
-    JSString* str =
-        stubInfo->getStubField<JSString*>(stub, reader.stubOffset()).get();
-    if (AtomToId(&str->asAtom()) != id) {
-      return false;
-    }
-  } else {
-    MOZ_ASSERT(JSID_IS_SYMBOL(id));
-    if (!reader.matchOp(CacheOp::GuardToSymbol, keyId)) {
-      return false;
-    }
-    if (!reader.matchOp(CacheOp::GuardSpecificSymbol, keyId)) {
-      return false;
-    }
-    JS::Symbol* sym =
-        stubInfo->getStubField<JS::Symbol*>(stub, reader.stubOffset()).get();
-    if (SYMBOL_TO_JSID(sym) != id) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static bool AddCacheIRGetPropFunction(
-    ICCacheIR_Monitored* stub, jsid id, bool innerized, JSObject** holder,
-    Shape** holderShape, JSFunction** commonGetter, Shape** globalShape,
-    bool* isOwnProperty, BaselineInspector::ReceiverVector& receivers,
-    JSScript* script) {
-  // We match either an own getter:
-  //
-  //   GuardToObject objId
-  //   [..Id Guard..]
-  //   [..WindowProxy innerization..]
-  //   <GuardReceiver objId>
-  //   (Call(Scripted|Native)Getter|TypedArrayLength)Result objId
-  //
-  // Or a getter on the prototype:
-  //
-  //   GuardToObject objId
-  //   [..Id Guard..]
-  //   [..WindowProxy innerization..]
-  //   <GuardReceiver objId>
-  //   LoadObject holderId
-  //   GuardShape holderId
-  //   (Call(Scripted|Native)Getter|TypedArrayLength)Result objId
-  //
-  // If |innerized| is true, we replaced a WindowProxy with the Window
-  // object and we're only interested in Baseline getter stubs that performed
-  // the same optimization. This means we expect the following ops for the
-  // [..WindowProxy innerization..] above:
-  //
-  //   GuardClass objId WindowProxy
-  //   objId = LoadWrapperTarget objId
-  //   GuardSpecificObject objId, <global>
-  //
-  // If we test for a specific jsid, [..Id Guard..] is implemented through:
-  //   GuardIs(String|Symbol) keyId
-  //   GuardSpecific(Atom|Symbol) keyId, <atom|symbol>
-
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return AddCacheIRGlobalGetter(stub, innerized, holder, holderShape,
-                                  commonGetter, globalShape, isOwnProperty,
-                                  receivers, script);
-  }
-
-  if (!JSID_IS_EMPTY(id)) {
-    ValOperandId keyId = ValOperandId(1);
-    if (!GuardSpecificAtomOrSymbol(reader, stub, stub->stubInfo(), keyId, id)) {
-      return false;
-    }
-  }
-
-  if (innerized) {
-    if (!reader.matchOp(CacheOp::GuardClass, objId) ||
-        reader.guardClassKind() != GuardClassKind::WindowProxy) {
-      return false;
-    }
-
-    if (!reader.matchOp(CacheOp::LoadWrapperTarget, objId)) {
-      return false;
-    }
-    objId = reader.objOperandId();
-
-    if (!reader.matchOp(CacheOp::GuardSpecificObject, objId)) {
-      return false;
-    }
-    DebugOnly<JSObject*> obj =
-        stub->stubInfo()
-            ->getStubField<JSObject*>(stub, reader.stubOffset())
-            .get();
-    MOZ_ASSERT(obj->is<GlobalObject>());
-  }
-
-  ReceiverGuard receiver;
-  if (!MatchCacheIRReceiverGuard(reader, stub, stub->stubInfo(), objId,
-                                 &receiver)) {
-    return false;
-  }
-
-  if (reader.matchOp(CacheOp::CallScriptedGetterResult, objId) ||
-      reader.matchOp(CacheOp::CallNativeGetterResult, objId) ||
-      reader.matchOp(CacheOp::LoadTypedArrayLengthResult, objId)) {
-    // This is an own property getter, the first case.
-    MOZ_ASSERT(receiver.getShape());
-    MOZ_ASSERT(!receiver.getGroup());
-
-    size_t offset = reader.stubOffset();
-    JSFunction* getter = &stub->stubInfo()
-                              ->getStubField<JSObject*>(stub, offset)
-                              ->as<JSFunction>();
-
-    if (*commonGetter && (!*isOwnProperty || *globalShape ||
-                          *holderShape != receiver.getShape())) {
-      return false;
-    }
-
-    MOZ_ASSERT_IF(*commonGetter, *commonGetter == getter);
-    *holder = nullptr;
-    *holderShape = receiver.getShape();
-    *commonGetter = getter;
-    *isOwnProperty = true;
-    return true;
-  }
-
-  if (!reader.matchOp(CacheOp::LoadObject)) {
-    return false;
-  }
-  ObjOperandId holderId = reader.objOperandId();
-  JSObject* obj =
-      stub->stubInfo()->getStubField<JSObject*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::GuardShape, holderId)) {
-    return false;
-  }
-  Shape* objShape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::CallScriptedGetterResult, objId) &&
-      !reader.matchOp(CacheOp::CallNativeGetterResult, objId) &&
-      !reader.matchOp(CacheOp::LoadTypedArrayLengthResult, objId)) {
-    return false;
-  }
-
-  // A getter on the prototype.
-  size_t offset = reader.stubOffset();
-  JSFunction* getter = &stub->stubInfo()
-                            ->getStubField<JSObject*>(stub, offset)
-                            ->as<JSFunction>();
-
-  Shape* thisGlobalShape = nullptr;
-  if (getter->isNative() && receiver.getShape() &&
-      (receiver.getShape()->getObjectClass()->flags & JSCLASS_IS_GLOBAL)) {
-    thisGlobalShape = receiver.getShape();
-  }
-
-  if (*commonGetter && (*isOwnProperty || *globalShape != thisGlobalShape ||
-                        *holderShape != objShape)) {
-    return false;
-  }
-
-  MOZ_ASSERT_IF(*commonGetter, *commonGetter == getter);
-
-  if (obj->as<NativeObject>().lastProperty() != objShape) {
-    // Skip this stub as the shape is no longer correct.
-    return true;
-  }
-
-  if (!AddReceiver(receiver, receivers)) {
-    return false;
-  }
-
-  *holder = obj;
-  *holderShape = objShape;
-  *commonGetter = getter;
-  *isOwnProperty = false;
-  return true;
-}
-
-bool BaselineInspector::commonGetPropFunction(
-    jsbytecode* pc, jsid id, bool innerized, JSObject** holder,
-    Shape** holderShape, JSFunction** commonGetter, Shape** globalShape,
-    bool* isOwnProperty, ReceiverVector& receivers) {
-  MOZ_ASSERT(IsGetPropPC(pc) || IsGetElemPC(pc) || JSOp(*pc) == JSOp::GetGName);
-  MOZ_ASSERT(receivers.empty());
-
-  // Only GetElem operations need to guard against a specific property id.
-  if (!IsGetElemPC(pc)) {
-    id = JSID_EMPTY;
-  }
-
-  *globalShape = nullptr;
-  *commonGetter = nullptr;
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    if (stub->isCacheIR_Monitored()) {
-      if (!AddCacheIRGetPropFunction(
-              stub->toCacheIR_Monitored(), id, innerized, holder, holderShape,
-              commonGetter, globalShape, isOwnProperty, receivers, script)) {
-        return false;
-      }
-    } else if (stub->isFallback()) {
-      // If we have an unoptimizable access, don't try to optimize.
-      if (stub->toFallbackStub()->state().hasFailures()) {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  }
-
-  if (!*commonGetter) {
-    return false;
-  }
-
-  MOZ_ASSERT(*isOwnProperty == !*holder);
-  MOZ_ASSERT(*isOwnProperty == receivers.empty());
-  return true;
-}
-
-static JSFunction* GetMegamorphicGetterSetterFunction(
-    ICStub* stub, const CacheIRStubInfo* stubInfo, jsid id, bool isGetter) {
-  // We match:
-  //
-  //   GuardToObject objId
-  //   [..Id Guard..]
-  //   GuardHasGetterSetter objId propShape
-  //
-  // propShape has the getter/setter we're interested in.
-  //
-  // If we test for a specific jsid, [..Id Guard..] is implemented through:
-  //   GuardIs(String|Symbol) keyId
-  //   GuardSpecific(Atom|Symbol) keyId, <atom|symbol>
-
-  CacheIRReader reader(stubInfo);
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return nullptr;
-  }
-
-  if (!JSID_IS_EMPTY(id)) {
-    ValOperandId keyId = ValOperandId(1);
-    if (!GuardSpecificAtomOrSymbol(reader, stub, stubInfo, keyId, id)) {
-      return nullptr;
-    }
-  }
-
-  if (!reader.matchOp(CacheOp::GuardHasGetterSetter, objId)) {
-    return nullptr;
-  }
-  Shape* propShape = stubInfo->getStubField<Shape*>(stub, reader.stubOffset());
-
-  JSObject* obj =
-      isGetter ? propShape->getterObject() : propShape->setterObject();
-  return &obj->as<JSFunction>();
-}
-
-bool BaselineInspector::megamorphicGetterSetterFunction(
-    jsbytecode* pc, jsid id, bool isGetter, JSFunction** getterOrSetter) {
-  MOZ_ASSERT(IsGetPropPC(pc) || IsGetElemPC(pc) || IsSetPropPC(pc) ||
-             JSOp(*pc) == JSOp::GetGName || JSOp(*pc) == JSOp::InitGLexical ||
-             JSOp(*pc) == JSOp::InitProp || JSOp(*pc) == JSOp::InitLockedProp ||
-             JSOp(*pc) == JSOp::InitHiddenProp);
-
-  // Only GetElem operations need to guard against a specific property id.
-  if (!IsGetElemPC(pc)) {
-    id = JSID_EMPTY;
-  }
-
-  *getterOrSetter = nullptr;
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    if (stub->isCacheIR_Monitored()) {
-      MOZ_ASSERT(isGetter);
-      JSFunction* getter = GetMegamorphicGetterSetterFunction(
-          stub, stub->toCacheIR_Monitored()->stubInfo(), id, isGetter);
-      if (!getter || (*getterOrSetter && *getterOrSetter != getter)) {
-        return false;
-      }
-      *getterOrSetter = getter;
-      continue;
-    }
-    if (stub->isCacheIR_Updated()) {
-      MOZ_ASSERT(!isGetter);
-      JSFunction* setter = GetMegamorphicGetterSetterFunction(
-          stub, stub->toCacheIR_Updated()->stubInfo(), id, isGetter);
-      if (!setter || (*getterOrSetter && *getterOrSetter != setter)) {
-        return false;
-      }
-      *getterOrSetter = setter;
-      continue;
-    }
-    if (stub->isFallback()) {
-      if (stub->toFallbackStub()->state().hasFailures()) {
-        return false;
-      }
-      if (stub->toFallbackStub()->state().mode() !=
-          ICState::Mode::Megamorphic) {
-        return false;
-      }
-      continue;
-    }
-
-    return false;
-  }
-
-  if (!*getterOrSetter) {
-    return false;
-  }
-
-  return true;
-}
-
-static bool AddCacheIRSetPropFunction(
-    ICCacheIR_Updated* stub, JSObject** holder, Shape** holderShape,
-    JSFunction** commonSetter, bool* isOwnProperty,
-    BaselineInspector::ReceiverVector& receivers) {
-  // We match either an own setter:
-  //
-  //   GuardToObject objId
-  //   <GuardReceiver objId>
-  //   Call(Scripted|Native)Setter objId
-  //
-  // Or a setter on the prototype:
-  //
-  //   GuardToObject objId
-  //   <GuardReceiver objId>
-  //   LoadObject holderId
-  //   GuardShape holderId
-  //   Call(Scripted|Native)Setter objId
-
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return false;
-  }
-
-  ReceiverGuard receiver;
-  if (!MatchCacheIRReceiverGuard(reader, stub, stub->stubInfo(), objId,
-                                 &receiver)) {
-    return false;
-  }
-
-  if (reader.matchOp(CacheOp::CallScriptedSetter, objId) ||
-      reader.matchOp(CacheOp::CallNativeSetter, objId)) {
-    // This is an own property setter, the first case.
-    MOZ_ASSERT(receiver.getShape());
-    MOZ_ASSERT(!receiver.getGroup());
-
-    size_t offset = reader.stubOffset();
-    JSFunction* setter = &stub->stubInfo()
-                              ->getStubField<JSObject*>(stub, offset)
-                              ->as<JSFunction>();
-
-    if (*commonSetter &&
-        (!*isOwnProperty || *holderShape != receiver.getShape())) {
-      return false;
-    }
-
-    MOZ_ASSERT_IF(*commonSetter, *commonSetter == setter);
-    *holder = nullptr;
-    *holderShape = receiver.getShape();
-    *commonSetter = setter;
-    *isOwnProperty = true;
-    return true;
-  }
-
-  if (!reader.matchOp(CacheOp::LoadObject)) {
-    return false;
-  }
-  ObjOperandId holderId = reader.objOperandId();
-  JSObject* obj =
-      stub->stubInfo()->getStubField<JSObject*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::GuardShape, holderId)) {
-    return false;
-  }
-  Shape* objShape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::CallScriptedSetter, objId) &&
-      !reader.matchOp(CacheOp::CallNativeSetter, objId)) {
-    return false;
-  }
-
-  // A setter on the prototype.
-  size_t offset = reader.stubOffset();
-  JSFunction* setter = &stub->stubInfo()
-                            ->getStubField<JSObject*>(stub, offset)
-                            ->as<JSFunction>();
-
-  if (*commonSetter && (*isOwnProperty || *holderShape != objShape)) {
-    return false;
-  }
-
-  MOZ_ASSERT_IF(*commonSetter, *commonSetter == setter);
-
-  if (obj->as<NativeObject>().lastProperty() != objShape) {
-    // Skip this stub as the shape is no longer correct.
-    return true;
-  }
-
-  if (!AddReceiver(receiver, receivers)) {
-    return false;
-  }
-
-  *holder = obj;
-  *holderShape = objShape;
-  *commonSetter = setter;
-  *isOwnProperty = false;
-  return true;
-}
-
-bool BaselineInspector::commonSetPropFunction(jsbytecode* pc, JSObject** holder,
-                                              Shape** holderShape,
-                                              JSFunction** commonSetter,
-                                              bool* isOwnProperty,
-                                              ReceiverVector& receivers) {
-  MOZ_ASSERT(IsSetPropPC(pc) || JSOp(*pc) == JSOp::InitGLexical ||
-             JSOp(*pc) == JSOp::InitProp || JSOp(*pc) == JSOp::InitLockedProp ||
-             JSOp(*pc) == JSOp::InitHiddenProp);
-  MOZ_ASSERT(receivers.empty());
-
-  *commonSetter = nullptr;
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    if (stub->isCacheIR_Updated()) {
-      if (!AddCacheIRSetPropFunction(stub->toCacheIR_Updated(), holder,
-                                     holderShape, commonSetter, isOwnProperty,
-                                     receivers)) {
-        return false;
-      }
-    } else if (!stub->isFallback() ||
-               stub->toFallbackStub()->state().hasFailures()) {
-      // We have an unoptimizable access, so don't try to optimize.
-      return false;
-    }
-  }
-
-  if (!*commonSetter) {
-    return false;
-  }
-
-  MOZ_ASSERT(*isOwnProperty == !*holder);
-  return true;
-}
-
-static bool GetCacheIRReceiverForProtoReadSlot(ICCacheIR_Monitored* stub,
-                                               ReceiverGuard* receiver,
-                                               JSObject** holderResult) {
-  // We match:
-  //
-  //   GuardToObject 0
-  //   <ReceiverGuard>
-  //   1: LoadObject holder
-  //   GuardShape 1
-  //   LoadFixedSlotResult 1 or LoadDynamicSlotResult 1
-
-  *receiver = ReceiverGuard();
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId objId = ObjOperandId(0);
-  if (!reader.matchOp(CacheOp::GuardToObject, objId)) {
-    return false;
-  }
-
-  if (!MatchCacheIRReceiverGuard(reader, stub, stub->stubInfo(), objId,
-                                 receiver)) {
-    return false;
-  }
-
-  if (!reader.matchOp(CacheOp::LoadObject)) {
-    return false;
-  }
-  ObjOperandId holderId = reader.objOperandId();
-  JSObject* holder = stub->stubInfo()
-                         ->getStubField<JSObject*>(stub, reader.stubOffset())
-                         .get();
-
-  if (!reader.matchOp(CacheOp::GuardShape, holderId)) {
-    return false;
-  }
-  Shape* holderShape =
-      stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOpEither(CacheOp::LoadFixedSlotResult,
-                            CacheOp::LoadDynamicSlotResult)) {
-    return false;
-  }
-  if (reader.objOperandId() != holderId) {
-    return false;
-  }
-
-  if (holder->shape() != holderShape) {
-    return false;
-  }
-  if (*holderResult && *holderResult != holder) {
-    return false;
-  }
-
-  *holderResult = holder;
-  return true;
-}
-
-bool BaselineInspector::maybeInfoForProtoReadSlot(jsbytecode* pc,
-                                                  ReceiverVector& receivers,
-                                                  JSObject** holder) {
-  // This is like maybeInfoForPropertyOp, but for when the property exists on
-  // the prototype.
-
-  MOZ_ASSERT(receivers.empty());
-  MOZ_ASSERT(!*holder);
-
-  MOZ_ASSERT(isValidPC(pc));
-  const ICEntry& entry = icEntryFromPC(pc);
-
-  ICStub* stub = entry.firstStub();
-  while (stub->next()) {
-    ReceiverGuard receiver;
-    if (stub->isCacheIR_Monitored()) {
-      if (!GetCacheIRReceiverForProtoReadSlot(stub->toCacheIR_Monitored(),
-                                              &receiver, holder)) {
-        receivers.clear();
-        return true;
-      }
-    } else {
-      receivers.clear();
-      return true;
-    }
-
-    if (!AddReceiver(receiver, receivers)) {
-      return false;
-    }
-
-    stub = stub->next();
-  }
-
-  if (stub->toFallbackStub()->state().hasFailures()) {
-    receivers.clear();
-  }
-
-  // Don't inline if there are more than 5 receivers.
-  if (receivers.length() > 5) {
-    receivers.clear();
-  }
-
-  MOZ_ASSERT_IF(!receivers.empty(), *holder);
-  return true;
-}
-
-static MIRType GetCacheIRExpectedInputType(ICCacheIR_Monitored* stub) {
-  CacheIRReader reader(stub->stubInfo());
-
-  if (reader.matchOp(CacheOp::GuardToObject, ValOperandId(0))) {
-    return MIRType::Object;
-  }
-  if (reader.matchOp(CacheOp::GuardToString, ValOperandId(0))) {
-    return MIRType::String;
-  }
-  if (reader.matchOp(CacheOp::GuardIsNumber, ValOperandId(0))) {
-    return MIRType::Double;
-  }
-  if (reader.matchOp(CacheOp::GuardNonDoubleType, ValOperandId(0))) {
-    ValueType type = reader.valueType();
-    return MIRTypeFromValueType(JSValueType(type));
-  }
-  if (reader.matchOp(CacheOp::GuardMagicValue)) {
-    // This can happen if we attached a lazy-args Baseline IC stub but then
-    // called JSScript::argumentsOptimizationFailed.
-    return MIRType::Value;
-  }
-
-  MOZ_ASSERT_UNREACHABLE("Unexpected instruction");
-  return MIRType::Value;
-}
-
-MIRType BaselineInspector::expectedPropertyAccessInputType(jsbytecode* pc) {
-  const ICEntry& entry = icEntryFromPC(pc);
-  MIRType type = MIRType::None;
-
-  for (ICStub* stub = entry.firstStub(); stub; stub = stub->next()) {
-    MIRType stubType = MIRType::None;
-    if (stub->isCacheIR_Monitored()) {
-      stubType = GetCacheIRExpectedInputType(stub->toCacheIR_Monitored());
-      if (stubType == MIRType::Value) {
-        return MIRType::Value;
-      }
-    } else if (stub->isGetElem_Fallback() || stub->isGetProp_Fallback()) {
-      // If we have an unoptimizable access, don't try to optimize.
-      if (stub->toFallbackStub()->state().hasFailures()) {
-        return MIRType::Value;
-      }
-    } else {
-      MOZ_CRASH("Unexpected stub");
-    }
-
-    if (type != MIRType::None) {
-      if (type != stubType) {
-        return MIRType::Value;
-      }
-    } else {
-      type = stubType;
-    }
-  }
-
-  return (type == MIRType::None) ? MIRType::Value : type;
-}
-
-bool BaselineInspector::instanceOfData(jsbytecode* pc, Shape** shape,
-                                       uint32_t* slot,
-                                       JSObject** prototypeObject) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::Instanceof);
-
-  const ICEntry& entry = icEntryFromPC(pc);
-  ICStub* firstStub = entry.firstStub();
-
-  // Ensure singleton instanceof stub
-  if (!firstStub->next() || !firstStub->isCacheIR_Regular() ||
-      !firstStub->next()->isInstanceOf_Fallback() ||
-      firstStub->next()->toInstanceOf_Fallback()->state().hasFailures()) {
-    return false;
-  }
-
-  ICCacheIR_Regular* stub = entry.firstStub()->toCacheIR_Regular();
-  CacheIRReader reader(stub->stubInfo());
-
-  ObjOperandId rhsId = ObjOperandId(1);
-  ObjOperandId resId = ObjOperandId(2);
-
-  if (!reader.matchOp(CacheOp::GuardToObject, rhsId)) {
-    return false;
-  }
-
-  if (!reader.matchOp(CacheOp::GuardShape, rhsId)) {
-    return false;
-  }
-
-  *shape = stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
-
-  if (!reader.matchOp(CacheOp::LoadObject, resId)) {
-    return false;
-  }
-
-  *prototypeObject = stub->stubInfo()
-                         ->getStubField<JSObject*>(stub, reader.stubOffset())
-                         .get();
-
-  if (IsInsideNursery(*prototypeObject)) {
-    return false;
-  }
-
-  if (!reader.matchOp(CacheOp::GuardDynamicSlotIsSpecificObject, rhsId)) {
-    return false;
-  }
-
-  reader.skip();  // Skip over the protoID;
-
-  *slot = stub->stubInfo()->getStubRawWord(stub, reader.stubOffset());
-
-  return true;
-}
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineInspector.h firefox-85.0+build1/js/src/jit/BaselineInspector.h
--- firefox-84.0.2+build1/js/src/jit/BaselineInspector.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineInspector.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +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 jit_BaselineInspector_h
-#define jit_BaselineInspector_h
-
-#include "jit/BaselineIC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/MIR.h"
-
-namespace js {
-namespace jit {
-
-class BaselineInspector;
-
-class ICInspector {
- protected:
-  BaselineInspector* inspector_;
-  jsbytecode* pc_;
-  ICEntry* icEntry_;
-
-  ICInspector(BaselineInspector* inspector, jsbytecode* pc, ICEntry* icEntry)
-      : inspector_(inspector), pc_(pc), icEntry_(icEntry) {}
-};
-
-class SetElemICInspector : public ICInspector {
- public:
-  SetElemICInspector(BaselineInspector* inspector, jsbytecode* pc,
-                     ICEntry* icEntry)
-      : ICInspector(inspector, pc, icEntry) {}
-
-  bool sawOOBDenseWrite() const;
-  bool sawOOBTypedArrayWrite() const;
-};
-
-class BaselineInspector {
- private:
-  JSScript* script;
-  ICEntry* prevLookedUpEntry;
-
- public:
-  explicit BaselineInspector(JSScript* script)
-      : script(script), prevLookedUpEntry(nullptr) {
-    MOZ_ASSERT(script);
-  }
-
-  JitScript* jitScript() const;
-
- private:
-#ifdef DEBUG
-  bool isValidPC(jsbytecode* pc) { return script->containsPC(pc); }
-#endif
-
-  ICEntry& icEntryFromPC(jsbytecode* pc);
-  ICEntry* maybeICEntryFromPC(jsbytecode* pc);
-
-  template <typename ICInspectorType>
-  ICInspectorType makeICInspector(jsbytecode* pc,
-                                  ICStub::Kind expectedFallbackKind) {
-    ICEntry* ent = &icEntryFromPC(pc);
-    MOZ_ASSERT(ent->fallbackStub()->kind() == expectedFallbackKind);
-    return ICInspectorType(this, pc, ent);
-  }
-
-  ICStub* monomorphicStub(jsbytecode* pc);
-  MOZ_MUST_USE bool dimorphicStub(jsbytecode* pc, ICStub** pfirst,
-                                  ICStub** psecond);
-
- public:
-  typedef Vector<ReceiverGuard, 4, JitAllocPolicy> ReceiverVector;
-  typedef Vector<ObjectGroup*, 4, JitAllocPolicy> ObjectGroupVector;
-  MOZ_MUST_USE bool maybeInfoForPropertyOp(jsbytecode* pc,
-                                           ReceiverVector& receivers);
-
-  MOZ_MUST_USE bool maybeInfoForProtoReadSlot(jsbytecode* pc,
-                                              ReceiverVector& receivers,
-                                              JSObject** holder);
-
-  SetElemICInspector setElemICInspector(jsbytecode* pc) {
-    return makeICInspector<SetElemICInspector>(pc, ICStub::SetElem_Fallback);
-  }
-
-  MIRType expectedResultType(jsbytecode* pc);
-  MCompare::CompareType expectedCompareType(jsbytecode* pc);
-  MIRType expectedBinaryArithSpecialization(jsbytecode* pc);
-  MIRType expectedPropertyAccessInputType(jsbytecode* pc);
-
-  bool hasSeenNegativeIndexGetElement(jsbytecode* pc);
-  bool hasSeenNonIntegerIndex(jsbytecode* pc);
-  bool hasSeenAccessedGetter(jsbytecode* pc);
-  bool hasSeenDoubleResult(jsbytecode* pc);
-
-  JSObject* getTemplateObject(jsbytecode* pc);
-  JSObject* getTemplateObjectForNative(jsbytecode* pc, Native native);
-
-  // Sometimes the group a template object will have is known, even if the
-  // object itself isn't.
-  ObjectGroup* getTemplateObjectGroup(jsbytecode* pc);
-
-  JSFunction* getSingleCallee(jsbytecode* pc);
-
-  LexicalEnvironmentObject* templateNamedLambdaObject();
-  CallObject* templateCallObject();
-
-  // If |innerized| is true, we're doing a GETPROP on a WindowProxy and
-  // IonBuilder unwrapped/innerized it to do the lookup on the Window (the
-  // global object) instead. In this case we should only look for Baseline
-  // stubs that performed the same optimization.
-  MOZ_MUST_USE bool commonGetPropFunction(
-      jsbytecode* pc, jsid id, bool innerized, JSObject** holder,
-      Shape** holderShape, JSFunction** commonGetter, Shape** globalShape,
-      bool* isOwnProperty, ReceiverVector& receivers);
-
-  MOZ_MUST_USE bool megamorphicGetterSetterFunction(
-      jsbytecode* pc, jsid id, bool isGetter, JSFunction** getterOrSetter);
-
-  MOZ_MUST_USE bool commonSetPropFunction(jsbytecode* pc, JSObject** holder,
-                                          Shape** holderShape,
-                                          JSFunction** commonSetter,
-                                          bool* isOwnProperty,
-                                          ReceiverVector& receivers);
-
-  MOZ_MUST_USE bool instanceOfData(jsbytecode* pc, Shape** shape,
-                                   uint32_t* slot, JSObject** prototypeObject);
-};
-
-}  // namespace jit
-}  // namespace js
-
-#endif /* jit_BaselineInspector_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineJIT.cpp firefox-85.0+build1/js/src/jit/BaselineJIT.cpp
--- firefox-84.0.2+build1/js/src/jit/BaselineJIT.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineJIT.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -31,6 +31,7 @@
 
 #include "debugger/DebugAPI-inl.h"
 #include "gc/GC-inl.h"
+#include "jit/JitScript-inl.h"
 #include "jit/MacroAssembler-inl.h"
 #include "vm/BytecodeUtil-inl.h"
 #include "vm/GeckoProfiler-inl.h"
@@ -151,8 +152,6 @@
     data.osrFrame->clearRunningInJit();
   }
 
-  MOZ_ASSERT(!cx->hasIonReturnOverride());
-
   // Jit callers wrap primitive constructor return, except for derived
   // class constructors, which are forced to do it themselves.
   if (!data.result.isMagic() && data.constructing &&
diff -Nru firefox-84.0.2+build1/js/src/jit/BaselineJIT.h firefox-85.0+build1/js/src/jit/BaselineJIT.h
--- firefox-84.0.2+build1/js/src/jit/BaselineJIT.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BaselineJIT.h	2021-01-18 19:58:13.000000000 +0000
@@ -113,9 +113,6 @@
     // An IC for a JOF_IC op.
     IC,
 
-    // A prologue IC.
-    PrologueIC,
-
     // A callVM for an op.
     CallVM,
 
@@ -463,10 +460,6 @@
   // The native code address to resume into.
   void* resumeAddr = nullptr;
 
-  // If non-null, we have to type monitor the top stack value for this pc (we
-  // resume right after it).
-  jsbytecode* monitorPC = nullptr;
-
   // The bytecode pc of try block and fault block.
   jsbytecode* tryPC = nullptr;
   jsbytecode* faultPC = nullptr;
diff -Nru firefox-84.0.2+build1/js/src/jit/BytecodeAnalysis.cpp firefox-85.0+build1/js/src/jit/BytecodeAnalysis.cpp
--- firefox-84.0.2+build1/js/src/jit/BytecodeAnalysis.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/BytecodeAnalysis.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -266,14 +266,11 @@
       case JSOp::SetAliasedVar:
       case JSOp::Lambda:
       case JSOp::LambdaArrow:
-      case JSOp::DefFun:
-      case JSOp::DefVar:
-      case JSOp::DefLet:
-      case JSOp::DefConst:
       case JSOp::PushLexicalEnv:
       case JSOp::PopLexicalEnv:
       case JSOp::ImplicitThis:
       case JSOp::FunWithProto:
+      case JSOp::GlobalOrEvalDeclInstantiation:
         result.usesEnvironmentChain = true;
         break;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIRCompiler.cpp firefox-85.0+build1/js/src/jit/CacheIRCompiler.cpp
--- firefox-84.0.2+build1/js/src/jit/CacheIRCompiler.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIRCompiler.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -1960,21 +1960,7 @@
     return false;
   }
 
-  Address shape(obj, JSObject::offsetOfShape());
-  masm.loadPtr(shape, scratch);
-
-  Address baseShape(scratch, Shape::offsetOfBaseShape());
-  masm.loadPtr(baseShape, scratch);
-
-  Address baseShapeFlags(scratch, BaseShape::offsetOfFlags());
-  masm.loadPtr(baseShapeFlags, scratch);
-
-  masm.and32(Imm32(js::BaseShape::NOT_EXTENSIBLE), scratch);
-
-  // Spectre-style checks are not needed here because we do not
-  // interpret data based on this check.
-  masm.branch32(Assembler::Equal, scratch, Imm32(js::BaseShape::NOT_EXTENSIBLE),
-                failure->label());
+  masm.branchIfObjectNotExtensible(obj, scratch, failure->label());
   return true;
 }
 
@@ -4927,9 +4913,8 @@
 
       masm.tagValue(JSVAL_TYPE_BIGINT, *bigInt, output.valueReg());
     } else {
-      bool allowDouble = *allowDoubleResult_ && allowDoubleForUint32;
       masm.loadFromTypedArray(elementType, source, output.valueReg(),
-                              allowDouble, scratch1, failure->label());
+                              allowDoubleForUint32, scratch1, failure->label());
     }
   } else {
     bool needGpr =
@@ -6970,20 +6955,48 @@
   return true;
 }
 
-bool CacheIRCompiler::emitGuardGroupHasUnanalyzedNewScript(
-    uint32_t groupOffset) {
+bool CacheIRCompiler::emitGuardWasmArg(ValOperandId argId,
+                                       wasm::ValType::Kind kind) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
-  StubFieldOffset group(groupOffset, StubField::Type::ObjectGroup);
-  AutoScratchRegister scratch1(allocator, masm);
-  AutoScratchRegister scratch2(allocator, masm);
+
+  // All values can be boxed as AnyRef.
+  if (kind == wasm::ValType::Ref) {
+    return true;
+  }
+  MOZ_ASSERT(kind != wasm::ValType::V128);
+
+  ValueOperand arg = allocator.useValueRegister(masm, argId);
 
   FailurePath* failure;
   if (!addFailurePath(&failure)) {
     return false;
   }
 
-  emitLoadStubField(group, scratch1);
-  masm.guardGroupHasUnanalyzedNewScript(scratch1, scratch2, failure->label());
+  // Check that the argument can be converted to the Wasm type in Warp code
+  // without bailing out.
+  Label done;
+  switch (kind) {
+    case wasm::ValType::I32:
+    case wasm::ValType::F32:
+    case wasm::ValType::F64: {
+      // Argument must be number, bool, or undefined.
+      masm.branchTestNumber(Assembler::Equal, arg, &done);
+      masm.branchTestBoolean(Assembler::Equal, arg, &done);
+      masm.branchTestUndefined(Assembler::NotEqual, arg, failure->label());
+      break;
+    }
+    case wasm::ValType::I64: {
+      // Argument must be bigint, bool, or string.
+      masm.branchTestBigInt(Assembler::Equal, arg, &done);
+      masm.branchTestBoolean(Assembler::Equal, arg, &done);
+      masm.branchTestString(Assembler::NotEqual, arg, failure->label());
+      break;
+    }
+    default:
+      MOZ_CRASH("Unexpected kind");
+  }
+  masm.bind(&done);
+
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIRCompiler.h firefox-85.0+build1/js/src/jit/CacheIRCompiler.h
--- firefox-84.0.2+build1/js/src/jit/CacheIRCompiler.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIRCompiler.h	2021-01-18 19:58:13.000000000 +0000
@@ -726,9 +726,6 @@
   mozilla::Maybe<TypedOrValueRegister> outputUnchecked_;
   Mode mode_;
 
-  // Whether this IC may read double values from uint32 arrays.
-  mozilla::Maybe<bool> allowDoubleResult_;
-
   // Distance from the IC to the stub data; mostly will be
   // sizeof(stubType)
   uint32_t stubDataOffset_;
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIR.cpp firefox-85.0+build1/js/src/jit/CacheIR.cpp
--- firefox-84.0.2+build1/js/src/jit/CacheIR.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIR.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -47,7 +47,6 @@
 #include "vm/JSScript-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/StringObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -224,14 +223,11 @@
 GetPropIRGenerator::GetPropIRGenerator(JSContext* cx, HandleScript script,
                                        jsbytecode* pc, ICState::Mode mode,
                                        CacheKind cacheKind, HandleValue val,
-                                       HandleValue idVal, HandleValue receiver,
-                                       GetPropertyResultFlags resultFlags)
+                                       HandleValue idVal, HandleValue receiver)
     : IRGenerator(cx, script, pc, cacheKind, mode),
       val_(val),
       idVal_(idVal),
-      receiver_(receiver),
-      resultFlags_(resultFlags),
-      preliminaryObjectAction_(PreliminaryObjectAction::None) {}
+      receiver_(receiver) {}
 
 static void EmitLoadSlotResult(CacheIRWriter& writer, ObjOperandId holderId,
                                NativeObject* holder, Shape* shape) {
@@ -345,9 +341,6 @@
 }
 
 AttachDecision GetPropIRGenerator::tryAttachStub() {
-  // Idempotent ICs should call tryAttachIdempotentStub instead.
-  MOZ_ASSERT(!idempotent());
-
   AutoAssertNoPendingException aanpe(cx_);
 
   ValOperandId valId(writer.setInputOperandId(0));
@@ -441,33 +434,6 @@
   return AttachDecision::NoAction;
 }
 
-AttachDecision GetPropIRGenerator::tryAttachIdempotentStub() {
-  // For idempotent ICs, only attach stubs which we can be sure have no side
-  // effects and produce a result which the MIR in the calling code is able
-  // to handle, since we do not have a pc to explicitly monitor the result.
-
-  MOZ_ASSERT(idempotent());
-
-  RootedObject obj(cx_, &val_.toObject());
-  RootedId id(cx_, NameToId(idVal_.toString()->asAtom().asPropertyName()));
-
-  ValOperandId valId(writer.setInputOperandId(0));
-  ObjOperandId objId = writer.guardToObject(valId);
-
-  ValOperandId receiverId = valId;
-  TRY_ATTACH(tryAttachNative(obj, objId, id, receiverId));
-
-  // Object lengths are supported only if int32 results are allowed.
-  TRY_ATTACH(tryAttachObjectLength(obj, objId, id));
-
-  // Also support native data properties on DOMProxy prototypes.
-  if (GetProxyStubType(cx_, obj, id) == ProxyStubType::DOMUnshadowed) {
-    return tryAttachDOMProxyUnshadowed(obj, objId, id, receiverId);
-  }
-
-  return AttachDecision::NoAction;
-}
-
 static bool IsCacheableProtoChain(JSObject* obj, JSObject* holder) {
   while (obj != holder) {
     /*
@@ -548,18 +514,16 @@
 }
 
 static bool CheckHasNoSuchOwnProperty(JSContext* cx, JSObject* obj, jsid id) {
-  if (obj->isNative()) {
-    // Don't handle proto chains with resolve hooks.
-    if (ClassMayResolveId(cx->names(), obj->getClass(), id, obj)) {
-      return false;
-    }
-    if (obj->as<NativeObject>().contains(cx, id)) {
-      return false;
-    }
-  } else {
+  if (!obj->isNative()) {
+    return false;
+  }
+  // Don't handle proto chains with resolve hooks.
+  if (ClassMayResolveId(cx->names(), obj->getClass(), id, obj)) {
+    return false;
+  }
+  if (obj->as<NativeObject>().contains(cx, id)) {
     return false;
   }
-
   return true;
 }
 
@@ -570,56 +534,20 @@
       return false;
     }
 
-    if (!curObj->isNative()) {
-      // Non-native objects are only handled as the original receiver.
-      if (curObj != obj) {
-        return false;
-      }
-    }
-
     curObj = curObj->staticPrototype();
   } while (curObj);
 
   return true;
 }
 
-// Return whether obj is in some PreliminaryObjectArray and has a structure
-// that might change in the future.
-static bool IsPreliminaryObject(JSObject* obj) {
-  if (obj->isSingleton()) {
-    return false;
-  }
-
-  AutoSweepObjectGroup sweep(obj->group());
-  TypeNewScript* newScript = obj->group()->newScript(sweep);
-  if (newScript && !newScript->analyzed()) {
-    return true;
-  }
-
-  if (obj->group()->maybePreliminaryObjects(sweep)) {
-    return true;
-  }
-
-  return false;
-}
-
 static bool IsCacheableNoProperty(JSContext* cx, JSObject* obj,
                                   JSObject* holder, Shape* shape, jsid id,
-                                  jsbytecode* pc,
-                                  GetPropertyResultFlags resultFlags) {
+                                  jsbytecode* pc) {
   MOZ_ASSERT(!shape);
   MOZ_ASSERT(!holder);
 
-  // Idempotent ICs may only attach missing-property stubs if undefined
-  // results are explicitly allowed, since no monitoring is done of the
-  // cache result.
-  if (!pc && !(resultFlags & GetPropertyResultFlags::AllowUndefined)) {
-    return false;
-  }
-
   // If we're doing a name lookup, we have to throw a ReferenceError.
-  // Note that Ion does not generate idempotent caches for JSOp::GetBoundName.
-  if (pc && JSOp(*pc) == JSOp::GetBoundName) {
+  if (JSOp(*pc) == JSOp::GetBoundName) {
     return false;
   }
 
@@ -628,8 +556,8 @@
 
 static NativeGetPropCacheability CanAttachNativeGetProp(
     JSContext* cx, HandleObject obj, HandleId id,
-    MutableHandleNativeObject holder, MutableHandleShape shape, jsbytecode* pc,
-    GetPropertyResultFlags resultFlags) {
+    MutableHandleNativeObject holder, MutableHandleShape shape,
+    jsbytecode* pc) {
   MOZ_ASSERT(JSID_IS_STRING(id) || JSID_IS_SYMBOL(id));
 
   // The lookup needs to be universally pure, otherwise we risk calling hooks
@@ -653,16 +581,11 @@
       return CanAttachReadSlot;
     }
 
-    // Idempotent ICs cannot call getters, see tryAttachIdempotentStub.
-    if (pc && (resultFlags & GetPropertyResultFlags::Monitored)) {
-      return IsCacheableGetPropCall(obj, holder, shape);
-    }
-
-    return CanAttachNone;
+    return IsCacheableGetPropCall(obj, holder, shape);
   }
 
   if (!prop.isFound()) {
-    if (IsCacheableNoProperty(cx, obj, holder, shape, id, pc, resultFlags)) {
+    if (IsCacheableNoProperty(cx, obj, holder, shape, id, pc)) {
       return CanAttachReadSlot;
     }
   }
@@ -677,7 +600,7 @@
   // otherwise checking the group is sufficient. This can be used if object
   // is not ShapedObject or if Shape has UNCACHEABLE_PROTO flag set.
 
-  ObjectGroup* group = obj->groupRaw();
+  ObjectGroup* group = obj->group();
 
   if (group->hasUncacheableProto()) {
     if (JSObject* proto = obj->staticPrototype()) {
@@ -1007,25 +930,6 @@
   }
 }
 
-static void EmitReadSlotReturn(CacheIRWriter& writer, JSObject*,
-                               JSObject* holder, Shape* shape,
-                               bool wrapResult = false) {
-  // Slot access.
-  if (holder) {
-    MOZ_ASSERT(shape);
-    if (wrapResult) {
-      writer.wrapResult();
-    }
-    writer.typeMonitorResult();
-  } else {
-    // Normally for this op, the result would have to be monitored by TI.
-    // However, since this stub ALWAYS returns UndefinedValue(), and we can be
-    // sure that undefined is already registered with the type-set, this can be
-    // avoided.
-    writer.returnFromIC();
-  }
-}
-
 static void EmitCallGetterResultNoGuards(JSContext* cx, CacheIRWriter& writer,
                                          JSObject* obj, JSObject* holder,
                                          Shape* shape,
@@ -1036,12 +940,12 @@
   switch (IsCacheableGetPropCall(obj, holder, shape)) {
     case CanAttachNativeGetter: {
       writer.callNativeGetterResult(receiverId, target, sameRealm);
-      writer.typeMonitorResult();
+      writer.returnFromIC();
       break;
     }
     case CanAttachScriptedGetter: {
       writer.callScriptedGetterResult(receiverId, target, sameRealm);
-      writer.typeMonitorResult();
+      writer.returnFromIC();
       break;
     }
     default:
@@ -1139,7 +1043,7 @@
                                             ObjOperandId objId) {
   JSFunction* getter = &shape->getterValue().toObject().as<JSFunction>();
   writer.callDOMGetterResult(objId, getter->jitInfo());
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 }
 
 static void EmitCallDOMGetterResult(JSContext* cx, CacheIRWriter& writer,
@@ -1158,12 +1062,8 @@
                                                      bool handleMissing) {
   MOZ_ASSERT(mode_ == ICState::Mode::Megamorphic);
 
-  // The stub handles the missing-properties case only if we're seeing one
-  // now, to make sure Ion ICs correctly monitor the undefined type. Without
-  // TI we don't use type monitoring so always allow |undefined|.
-  if (!IsTypeInferenceEnabled()) {
-    handleMissing = true;
-  }
+  // TODO(no-TI): remove.
+  handleMissing = true;
 
   if (cacheKind_ == CacheKind::GetProp ||
       cacheKind_ == CacheKind::GetPropSuper) {
@@ -1175,7 +1075,7 @@
     writer.megamorphicLoadSlotByValueResult(objId, getElemKeyValueId(),
                                             handleMissing);
   }
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached(handleMissing ? "MegamorphicMissingNativeSlot"
                               : "MegamorphicNativeSlot");
@@ -1189,7 +1089,7 @@
   RootedNativeObject holder(cx_);
 
   NativeGetPropCacheability type =
-      CanAttachNativeGetProp(cx_, obj, id, &holder, &shape, pc_, resultFlags_);
+      CanAttachNativeGetProp(cx_, obj, id, &holder, &shape, pc_);
   switch (type) {
     case CanAttachNone:
       return AttachDecision::NoAction;
@@ -1200,23 +1100,13 @@
       }
 
       maybeEmitIdGuard(id);
-      if (holder) {
-        EnsureTrackPropertyTypes(cx_, holder, id);
-        // See the comment in StripPreliminaryObjectStubs.
-        if (IsPreliminaryObject(obj)) {
-          preliminaryObjectAction_ = PreliminaryObjectAction::NotePreliminary;
-        } else {
-          preliminaryObjectAction_ = PreliminaryObjectAction::Unlink;
-        }
-      }
       EmitReadSlotResult(writer, obj, holder, shape, objId);
-      EmitReadSlotReturn(writer, obj, holder, shape);
+      writer.returnFromIC();
 
       trackAttached("NativeSlot");
       return AttachDecision::Attach;
     case CanAttachScriptedGetter:
     case CanAttachNativeGetter: {
-      MOZ_ASSERT(!idempotent());
       maybeEmitIdGuard(id);
 
       if (!isSuper() &&
@@ -1297,8 +1187,8 @@
   Handle<GlobalObject*> windowObj = cx_->global();
   RootedShape shape(cx_);
   RootedNativeObject holder(cx_);
-  NativeGetPropCacheability type = CanAttachNativeGetProp(
-      cx_, windowObj, id, &holder, &shape, pc_, resultFlags_);
+  NativeGetPropCacheability type =
+      CanAttachNativeGetProp(cx_, windowObj, id, &holder, &shape, pc_);
   switch (type) {
     case CanAttachNone:
       return AttachDecision::NoAction;
@@ -1308,7 +1198,7 @@
       ObjOperandId windowObjId =
           GuardAndLoadWindowProxyWindow(writer, objId, windowObj);
       EmitReadSlotResult(writer, windowObj, holder, shape, windowObjId);
-      EmitReadSlotReturn(writer, windowObj, holder, shape);
+      writer.returnFromIC();
 
       trackAttached("WindowProxySlot");
       return AttachDecision::Attach;
@@ -1391,25 +1281,13 @@
   {
     AutoRealm ar(cx_, unwrapped);
 
-    NativeGetPropCacheability canCache = CanAttachNativeGetProp(
-        cx_, unwrapped, id, &holder, &shape, pc_, resultFlags_);
+    NativeGetPropCacheability canCache =
+        CanAttachNativeGetProp(cx_, unwrapped, id, &holder, &shape, pc_);
     if (canCache != CanAttachReadSlot) {
       return AttachDecision::NoAction;
     }
 
-    if (holder) {
-      // Need to be in the compartment of the holder to
-      // call EnsureTrackPropertyTypes
-      EnsureTrackPropertyTypes(cx_, holder, id);
-      if (unwrapped == holder) {
-        // See the comment in StripPreliminaryObjectStubs.
-        if (IsPreliminaryObject(unwrapped)) {
-          preliminaryObjectAction_ = PreliminaryObjectAction::NotePreliminary;
-        } else {
-          preliminaryObjectAction_ = PreliminaryObjectAction::Unlink;
-        }
-      }
-    } else {
+    if (!holder) {
       // UNCACHEABLE_PROTO may result in guards against specific
       // (cross-compartment) prototype objects, so don't try to attach IC if we
       // see the flag at all.
@@ -1433,7 +1311,8 @@
   ObjOperandId unwrappedId = wrapperTargetId;
   EmitReadSlotResult<SlotReadType::CrossCompartment>(writer, unwrapped, holder,
                                                      shape, unwrappedId);
-  EmitReadSlotReturn(writer, unwrapped, holder, shape, /* wrapResult = */ true);
+  writer.wrapResult();
+  writer.returnFromIC();
 
   trackAttached("CCWSlot");
   return AttachDecision::Attach;
@@ -1559,7 +1438,7 @@
   bool sameRealm = cx_->realm() == getter->as<JSFunction>().realm();
   writer.callNativeGetterResult(receiverId, &getter->as<JSFunction>(),
                                 sameRealm);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("XrayGetter");
   return AttachDecision::Attach;
@@ -1589,7 +1468,7 @@
     writer.proxyGetByValueResult(objId, getElemKeyValueId());
   }
 
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("GenericProxy");
   return AttachDecision::Attach;
@@ -1637,8 +1516,8 @@
   // Try to do the lookup on the expando object.
   RootedNativeObject holder(cx_);
   RootedShape propShape(cx_);
-  NativeGetPropCacheability canCache = CanAttachNativeGetProp(
-      cx_, expandoObj, id, &holder, &propShape, pc_, resultFlags_);
+  NativeGetPropCacheability canCache =
+      CanAttachNativeGetProp(cx_, expandoObj, id, &holder, &propShape, pc_);
   if (canCache == CanAttachNone) {
     return AttachDecision::NoAction;
   }
@@ -1656,7 +1535,7 @@
     // Load from the expando's slots.
     EmitLoadSlotResult(writer, expandoObjId, &expandoObj->as<NativeObject>(),
                        propShape);
-    writer.typeMonitorResult();
+    writer.returnFromIC();
   } else {
     // Call the getter. Note that we pass objId, the DOM proxy, as |this|
     // and not the expando object.
@@ -1679,7 +1558,7 @@
   maybeEmitIdGuard(id);
   TestMatchingProxyReceiver(writer, &obj->as<ProxyObject>(), objId);
   writer.proxyGetResult(objId, id);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("DOMProxyShadowed");
   return AttachDecision::Attach;
@@ -1733,8 +1612,8 @@
 
   RootedNativeObject holder(cx_);
   RootedShape shape(cx_);
-  NativeGetPropCacheability canCache = CanAttachNativeGetProp(
-      cx_, checkObj, id, &holder, &shape, pc_, resultFlags_);
+  NativeGetPropCacheability canCache =
+      CanAttachNativeGetProp(cx_, checkObj, id, &holder, &shape, pc_);
   if (canCache == CanAttachNone) {
     return AttachDecision::NoAction;
   }
@@ -1756,7 +1635,7 @@
 
     if (canCache == CanAttachReadSlot) {
       EmitLoadSlotResult(writer, holderId, holder, shape);
-      writer.typeMonitorResult();
+      writer.returnFromIC();
     } else {
       // EmitCallGetterResultNoGuards expects |obj| to be the object the
       // property is on to do some checks. Since we actually looked at
@@ -1773,7 +1652,7 @@
     // proxy get call.
     MOZ_ASSERT(!isSuper());
     writer.proxyGetResult(objId, id);
-    writer.typeMonitorResult();
+    writer.returnFromIC();
   }
 
   trackAttached("DOMProxyUnshadowed");
@@ -1825,13 +1704,7 @@
     return AttachDecision::NoAction;
   }
 
-  if (!(resultFlags_ & GetPropertyResultFlags::AllowInt32)) {
-    return AttachDecision::NoAction;
-  }
-
   if (obj->is<ArrayObject>()) {
-    // Make sure int32 is added to the TypeSet before we attach a stub, so
-    // the stub can return int32 values without monitoring the result.
     if (obj->as<ArrayObject>().length() > INT32_MAX) {
       return AttachDecision::NoAction;
     }
@@ -1875,19 +1748,19 @@
     return AttachDecision::NoAction;
   }
 
-  // Receiver should be the object.
-  if (isSuper()) {
+  if (mode_ != ICState::Mode::Specialized) {
     return AttachDecision::NoAction;
   }
 
-  if (!(resultFlags_ & GetPropertyResultFlags::AllowInt32)) {
+  // Receiver should be the object.
+  if (isSuper()) {
     return AttachDecision::NoAction;
   }
 
   RootedShape shape(cx_);
   RootedNativeObject holder(cx_);
   NativeGetPropCacheability type =
-      CanAttachNativeGetProp(cx_, obj, id, &holder, &shape, pc_, resultFlags_);
+      CanAttachNativeGetProp(cx_, obj, id, &holder, &shape, pc_);
   if (type != CanAttachNativeGetter) {
     return AttachDecision::NoAction;
   }
@@ -1969,17 +1842,11 @@
   writer.guardClass(objId, GuardClassKind::JSFunction);
   if (isLength) {
     writer.loadFunctionLengthResult(objId);
-
-    // Doesn't need to be monitored, because it always returns an int32.
     writer.returnFromIC();
-
     trackAttached("FunctionLength");
   } else {
     writer.loadFunctionNameResult(objId);
-
-    // Doesn't need to be monitored, because it always returns a string.
     writer.returnFromIC();
-
     trackAttached("FunctionName");
   }
   return AttachDecision::Attach;
@@ -2019,7 +1886,7 @@
 
   ObjOperandId iterId = writer.loadObject(&iterator.toObject());
   writer.loadObjectResult(iterId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("ArgumentsObjectIterator");
   return AttachDecision::Attach;
@@ -2044,17 +1911,13 @@
     return AttachDecision::NoAction;
   }
 
-  if (IsIonEnabled(cx_)) {
-    EnsureTrackPropertyTypes(cx_, env, shape->propid());
-  }
-
   // Check for the specific namespace object.
   maybeEmitIdGuard(id);
   writer.guardSpecificObject(objId, ns);
 
   ObjOperandId envId = writer.loadObject(env);
   EmitLoadSlotResult(writer, envId, env, shape);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("ModuleNamespace");
   return AttachDecision::Attach;
@@ -2102,19 +1965,12 @@
 
   RootedShape shape(cx_);
   RootedNativeObject holder(cx_);
-  NativeGetPropCacheability type = CanAttachNativeGetProp(
-      cx_, proto, id, &holder, &shape, pc_, resultFlags_);
+  NativeGetPropCacheability type =
+      CanAttachNativeGetProp(cx_, proto, id, &holder, &shape, pc_);
   switch (type) {
     case CanAttachNone:
       return AttachDecision::NoAction;
     case CanAttachReadSlot: {
-      if (holder) {
-        // Instantiate this property, for use during Ion compilation.
-        if (IsIonEnabled(cx_)) {
-          EnsureTrackPropertyTypes(cx_, holder, id);
-        }
-      }
-
       if (val_.isNumber()) {
         writer.guardIsNumber(valId);
       } else {
@@ -2124,15 +1980,13 @@
 
       ObjOperandId protoId = writer.loadObject(proto);
       EmitReadSlotResult(writer, proto, holder, shape, protoId);
-      EmitReadSlotReturn(writer, proto, holder, shape);
+      writer.returnFromIC();
 
       trackAttached("PrimitiveSlot");
       return AttachDecision::Attach;
     }
     case CanAttachScriptedGetter:
     case CanAttachNativeGetter: {
-      MOZ_ASSERT(!idempotent());
-
       if (val_.isNumber()) {
         writer.guardIsNumber(valId);
       } else {
@@ -2236,13 +2090,13 @@
 
   if (JSID_IS_ATOM(id, cx_->names().length)) {
     writer.loadFrameNumActualArgsResult();
-    writer.returnFromIC();
   } else {
     MOZ_ASSERT(JSID_IS_ATOM(id, cx_->names().callee));
     writer.loadFrameCalleeResult();
-    writer.typeMonitorResult();
   }
 
+  writer.returnFromIC();
+
   trackAttached("MagicArgumentsName");
   return AttachDecision::Attach;
 }
@@ -2260,7 +2114,7 @@
 
   Int32OperandId int32IndexId = writer.guardToInt32Index(indexId);
   writer.loadFrameArgumentResult(int32IndexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("MagicArgument");
   return AttachDecision::Attach;
@@ -2294,10 +2148,6 @@
     return AttachDecision::NoAction;
   }
 
-  if (!(resultFlags_ & GetPropertyResultFlags::Monitored)) {
-    return AttachDecision::NoAction;
-  }
-
   if (args->is<MappedArgumentsObject>()) {
     writer.guardClass(objId, GuardClassKind::MappedArguments);
   } else {
@@ -2306,7 +2156,7 @@
   }
 
   writer.loadArgumentsObjectArgResult(objId, indexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("ArgumentsObjectArg");
   return AttachDecision::Attach;
@@ -2326,12 +2176,17 @@
 
   TestMatchingNativeReceiver(writer, nobj, objId);
   writer.loadDenseElementResult(objId, indexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("DenseElement");
   return AttachDecision::Attach;
 }
 
+static bool ClassCanHaveExtraProperties(const JSClass* clasp) {
+  return clasp->getResolve() || clasp->getOpsLookupProperty() ||
+         clasp->getOpsGetProperty() || IsTypedArrayClass(clasp);
+}
+
 static bool CanAttachDenseElementHole(NativeObject* obj, bool ownProp,
                                       bool allowIndexedReceiver = false) {
   // Make sure the objects on the prototype don't have any indexed properties
@@ -2394,7 +2249,7 @@
   GeneratePrototypeHoleGuards(writer, nobj, objId,
                               /* alwaysGuardFirstProto = */ false);
   writer.loadDenseElementHoleResult(objId, indexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("DenseElementHole");
   return AttachDecision::Attach;
@@ -2457,7 +2312,7 @@
   // to check that the receiving object has the property.
 
   writer.callGetSparseElementResult(objId, indexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("GetSparseElement");
   return AttachDecision::Attach;
@@ -2500,18 +2355,12 @@
 
   // Don't handle out-of-bounds accesses here because we have to ensure the
   // |undefined| type is monitored. See also tryAttachTypedArrayNonInt32Index.
+  // TODO(no-TI): Monitoring?
   bool allowDoubleForUint32 = AllowDoubleForUint32Array(tarr, index);
   writer.loadTypedArrayElementResult(objId, indexId, tarr->type(),
                                      /* handleOOB = */ false,
                                      allowDoubleForUint32);
-
-  // Reading from Uint32Array may produce an int32 now but a double value
-  // later, so ensure we monitor the result.
-  if (tarr->type() == Scalar::Type::Uint32) {
-    writer.typeMonitorResult();
-  } else {
-    writer.returnFromIC();
-  }
+  writer.returnFromIC();
 
   trackAttached("TypedElement");
   return AttachDecision::Attach;
@@ -2548,9 +2397,7 @@
   writer.loadTypedArrayElementResult(objId, indexId, tarr->type(),
                                      /* handleOOB = */ true,
                                      allowDoubleForUint32);
-
-  // Always monitor the result when out-of-bounds accesses are expected.
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("TypedArrayNonInt32Index");
   return AttachDecision::Attach;
@@ -2574,7 +2421,7 @@
   }
   writer.guardIndexGreaterThanDenseInitLength(objId, indexId);
   writer.callNativeGetElementResult(objId, indexId);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached(mode_ == ICState::Mode::Megamorphic
                     ? "GenericElementMegamorphic"
@@ -2603,7 +2450,7 @@
   MOZ_ASSERT(cacheKind_ == CacheKind::GetElem);
   MOZ_ASSERT(!isSuper());
   writer.proxyGetByValueResult(objId, getElemKeyValueId());
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("ProxyElement");
   return AttachDecision::Attach;
@@ -2736,11 +2583,6 @@
     return AttachDecision::NoAction;
   }
 
-  // Instantiate this global property, for use during Ion compilation.
-  if (IsIonEnabled(cx_)) {
-    EnsureTrackPropertyTypes(cx_, holder, id);
-  }
-
   if (holder == globalLexical) {
     // There is no need to guard on the shape. Lexical bindings are
     // non-configurable, and this stub cannot be shared across globals.
@@ -2773,7 +2615,7 @@
     EmitLoadSlotResult(writer, holderId, holder, shape);
   }
 
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("GlobalNameValue");
   return AttachDecision::Attach;
@@ -2804,10 +2646,6 @@
     return AttachDecision::NoAction;
   }
 
-  if (IsIonEnabled(cx_)) {
-    EnsureTrackPropertyTypes(cx_, holder, id);
-  }
-
   // Shape guard for global lexical.
   writer.guardShape(objId, globalLexical->lastProperty());
 
@@ -2921,7 +2759,7 @@
         holder->dynamicSlotIndex(shape->slot()) * sizeof(Value);
     writer.loadEnvironmentDynamicSlotResult(lastObjId, dynamicSlotOffset);
   }
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
   trackAttached("EnvironmentName");
   return AttachDecision::Attach;
@@ -3302,8 +3140,8 @@
   bool hasOwn = (cacheKind_ == CacheKind::HasOwn);
 
   // Check that property doesn't exist on |obj| or it's prototype chain. These
-  // checks allow Native/Typed objects with a NativeObject prototype
-  // chain. They return NoAction if unknown such as resolve hooks or proxies.
+  // checks allow NativeObjects with a NativeObject prototype chain. They return
+  // NoAction if unknown such as resolve hooks or proxies.
   if (hasOwn) {
     if (!CheckHasNoSuchOwnProperty(cx_, obj, key)) {
       return AttachDecision::NoAction;
@@ -3508,17 +3346,11 @@
 SetPropIRGenerator::SetPropIRGenerator(JSContext* cx, HandleScript script,
                                        jsbytecode* pc, CacheKind cacheKind,
                                        ICState::Mode mode, HandleValue lhsVal,
-                                       HandleValue idVal, HandleValue rhsVal,
-                                       bool needsTypeBarrier,
-                                       bool maybeHasExtraIndexedProps)
+                                       HandleValue idVal, HandleValue rhsVal)
     : IRGenerator(cx, script, pc, cacheKind, mode),
       lhsVal_(lhsVal),
       idVal_(idVal),
-      rhsVal_(rhsVal),
-      typeCheckInfo_(cx, needsTypeBarrier),
-      preliminaryObjectAction_(PreliminaryObjectAction::None),
-      attachedTypedArrayOOBStub_(false),
-      maybeHasExtraIndexedProps_(maybeHasExtraIndexedProps) {}
+      rhsVal_(rhsVal) {}
 
 AttachDecision SetPropIRGenerator::tryAttachStub() {
   AutoAssertNoPendingException aanpe(cx_);
@@ -3619,9 +3451,7 @@
   return shape;
 }
 
-static bool CanAttachNativeSetSlot(JSContext* cx, JSOp op, HandleObject obj,
-                                   HandleId id,
-                                   bool* isTemporarilyUnoptimizable,
+static bool CanAttachNativeSetSlot(JSOp op, HandleObject obj, HandleId id,
                                    MutableHandleShape propShape) {
   if (!obj->isNative()) {
     return false;
@@ -3632,22 +3462,6 @@
     return false;
   }
 
-  ObjectGroup* group = JSObject::getGroup(cx, obj);
-  if (!group) {
-    cx->recoverFromOutOfMemory();
-    return false;
-  }
-
-  // For some property writes, such as the initial overwrite of global
-  // properties, TI will not mark the property as having been
-  // overwritten. Don't attach a stub in this case, so that we don't
-  // execute another write to the property without TI seeing that write.
-  EnsureTrackPropertyTypes(cx, obj, id);
-  if (!PropertyHasBeenMarkedNonConstant(obj, id)) {
-    *isTemporarilyUnoptimizable = true;
-    return false;
-  }
-
   return true;
 }
 
@@ -3677,18 +3491,16 @@
                                                           HandleId id,
                                                           ValOperandId rhsId) {
   RootedShape propShape(cx_);
-  bool isTemporarilyUnoptimizable = false;
-  if (!CanAttachNativeSetSlot(cx_, JSOp(*pc_), obj, id,
-                              &isTemporarilyUnoptimizable, &propShape)) {
-    return isTemporarilyUnoptimizable ? AttachDecision::TemporarilyUnoptimizable
-                                      : AttachDecision::NoAction;
+  if (!CanAttachNativeSetSlot(JSOp(*pc_), obj, id, &propShape)) {
+    return AttachDecision::NoAction;
   }
 
   // Don't attach a megamorphic store slot stub for ops like JSOp::InitElem.
   if (mode_ == ICState::Mode::Megamorphic && cacheKind_ == CacheKind::SetProp &&
       IsPropertySetOp(JSOp(*pc_))) {
+    // TODO(no-TI): remove needsTypeBarrier from MegamorphicStoreSlot.
     writer.megamorphicStoreSlot(objId, JSID_TO_ATOM(id)->asPropertyName(),
-                                rhsId, typeCheckInfo_.needsTypeBarrier());
+                                rhsId, /* needsTypeBarrier = */ false);
     writer.returnFromIC();
     trackAttached("MegamorphicNativeSlot");
     return AttachDecision::Attach;
@@ -3696,24 +3508,11 @@
 
   maybeEmitIdGuard(id);
 
-  // If we need a property type barrier (always in Baseline, sometimes in
-  // Ion), guard on both the shape and the group. If Ion knows the property
-  // types match, we don't need the group guard.
   NativeObject* nobj = &obj->as<NativeObject>();
-  if (typeCheckInfo_.needsTypeBarrier()) {
-    writer.guardGroupForTypeBarrier(objId, nobj->group());
-  }
   if (!IsGlobalLexicalSetGName(JSOp(*pc_), nobj, propShape)) {
     TestMatchingNativeReceiver(writer, nobj, objId);
   }
 
-  if (IsPreliminaryObject(obj)) {
-    preliminaryObjectAction_ = PreliminaryObjectAction::NotePreliminary;
-  } else {
-    preliminaryObjectAction_ = PreliminaryObjectAction::Unlink;
-  }
-
-  typeCheckInfo_.set(nobj->group(), id);
   EmitStoreSlotAndReturn(writer, objId, nobj, propShape, rhsId);
 
   trackAttached("NativeSlot");
@@ -3967,17 +3766,11 @@
     return AttachDecision::NoAction;
   }
 
-  if (typeCheckInfo_.needsTypeBarrier()) {
-    writer.guardGroupForTypeBarrier(objId, nobj->group());
-  }
   TestMatchingNativeReceiver(writer, nobj, objId);
 
   writer.storeDenseElement(objId, indexId, rhsId);
   writer.returnFromIC();
 
-  // Type inference uses JSID_VOID for the element types.
-  typeCheckInfo_.set(nobj->group(), JSID_VOID);
-
   trackAttached("SetDenseElement");
   return AttachDecision::Attach;
 }
@@ -4084,23 +3877,16 @@
     return AttachDecision::NoAction;
   }
 
-  if (typeCheckInfo_.needsTypeBarrier()) {
-    writer.guardGroupForTypeBarrier(objId, nobj->group());
-  }
   TestMatchingNativeReceiver(writer, nobj, objId);
 
-  // Also shape guard the proto chain, unless this is an InitElem or we know
-  // the proto chain has no indexed props.
-  if (IsPropertySetOp(op) && maybeHasExtraIndexedProps_) {
+  // Also shape guard the proto chain, unless this is an InitElem.
+  if (IsPropertySetOp(op)) {
     ShapeGuardProtoChain(writer, obj, objId);
   }
 
   writer.storeDenseElementHole(objId, indexId, rhsId, isAdd);
   writer.returnFromIC();
 
-  // Type inference uses JSID_VOID for the element types.
-  typeCheckInfo_.set(nobj->group(), JSID_VOID);
-
   trackAttached(isAdd ? "AddDenseElement" : "StoreDenseElementHole");
   return AttachDecision::Attach;
 }
@@ -4215,10 +4001,6 @@
                                 handleOutOfBounds);
   writer.returnFromIC();
 
-  if (handleOutOfBounds) {
-    attachedTypedArrayOOBStub_ = true;
-  }
-
   trackAttached(handleOutOfBounds ? "SetTypedElementOOB" : "SetTypedElement");
   return AttachDecision::Attach;
 }
@@ -4256,8 +4038,6 @@
                                 handleOutOfBounds);
   writer.returnFromIC();
 
-  attachedTypedArrayOOBStub_ = true;
-
   trackAttached("SetTypedElementNonInt32Index");
   return AttachDecision::Attach;
 }
@@ -4360,19 +4140,13 @@
     expandoObj = &expandoAndGeneration->expando.toObject();
   }
 
-  bool isTemporarilyUnoptimizable = false;
-
   RootedShape propShape(cx_);
-  if (CanAttachNativeSetSlot(cx_, JSOp(*pc_), expandoObj, id,
-                             &isTemporarilyUnoptimizable, &propShape)) {
+  if (CanAttachNativeSetSlot(JSOp(*pc_), expandoObj, id, &propShape)) {
     maybeEmitIdGuard(id);
     ObjOperandId expandoObjId =
         guardDOMProxyExpandoObjectAndShape(obj, objId, expandoVal, expandoObj);
 
     NativeObject* nativeExpandoObj = &expandoObj->as<NativeObject>();
-    writer.guardGroupForTypeBarrier(expandoObjId, nativeExpandoObj->group());
-    typeCheckInfo_.set(nativeExpandoObj->group(), id);
-
     EmitStoreSlotAndReturn(writer, expandoObjId, nativeExpandoObj, propShape,
                            rhsId);
     trackAttached("DOMProxyExpandoSlot");
@@ -4394,8 +4168,7 @@
     return AttachDecision::Attach;
   }
 
-  return isTemporarilyUnoptimizable ? AttachDecision::TemporarilyUnoptimizable
-                                    : AttachDecision::NoAction;
+  return AttachDecision::NoAction;
 }
 
 AttachDecision SetPropIRGenerator::tryAttachProxy(HandleObject obj,
@@ -4499,11 +4272,8 @@
   Handle<GlobalObject*> windowObj = cx_->global();
 
   RootedShape propShape(cx_);
-  bool isTemporarilyUnoptimizable = false;
-  if (!CanAttachNativeSetSlot(cx_, JSOp(*pc_), windowObj, id,
-                              &isTemporarilyUnoptimizable, &propShape)) {
-    return isTemporarilyUnoptimizable ? AttachDecision::TemporarilyUnoptimizable
-                                      : AttachDecision::NoAction;
+  if (!CanAttachNativeSetSlot(JSOp(*pc_), windowObj, id, &propShape)) {
+    return AttachDecision::NoAction;
   }
 
   maybeEmitIdGuard(id);
@@ -4511,8 +4281,6 @@
   ObjOperandId windowObjId =
       GuardAndLoadWindowProxyWindow(writer, objId, windowObj);
   writer.guardShape(windowObjId, windowObj->lastProperty());
-  writer.guardGroupForTypeBarrier(windowObjId, windowObj->group());
-  typeCheckInfo_.set(windowObj->group(), id);
 
   EmitStoreSlotAndReturn(writer, windowObjId, windowObj, propShape, rhsId);
 
@@ -4600,8 +4368,7 @@
   return true;
 }
 
-AttachDecision SetPropIRGenerator::tryAttachAddSlotStub(
-    HandleObjectGroup oldGroup, HandleShape oldShape) {
+AttachDecision SetPropIRGenerator::tryAttachAddSlotStub(HandleShape oldShape) {
   ValOperandId objValId(writer.setInputOperandId(0));
   ValOperandId rhsValId;
   if (cacheKind_ == CacheKind::SetProp) {
@@ -4662,25 +4429,6 @@
   ObjOperandId objId = writer.guardToObject(objValId);
   maybeEmitIdGuard(id);
 
-  if (IsTypeInferenceEnabled()) {
-    // Guard on the group for the property type barrier and group change.
-    writer.guardGroup(objId, oldGroup);
-  }
-
-  // If we are adding a property to an object for which the new script
-  // properties analysis hasn't been performed yet, make sure the stub fails
-  // after we run the analysis as a group change may be required here. The
-  // group change is not required for correctness but improves type
-  // information elsewhere.
-  AutoSweepObjectGroup sweep(oldGroup);
-  if (oldGroup->newScript(sweep) && !oldGroup->newScript(sweep)->analyzed()) {
-    writer.guardGroupHasUnanalyzedNewScript(oldGroup);
-    MOZ_ASSERT(IsPreliminaryObject(obj));
-    preliminaryObjectAction_ = PreliminaryObjectAction::NotePreliminary;
-  } else {
-    preliminaryObjectAction_ = PreliminaryObjectAction::Unlink;
-  }
-
   // Shape guard the object.
   writer.guardShape(objId, oldShape);
 
@@ -4693,36 +4441,26 @@
 
   ShapeGuardProtoChain(writer, obj, objId);
 
-  ObjectGroup* newGroup = obj->group();
-
-  // Check if we have to change the object's group. We only have to change from
-  // a partially to fully initialized group if the object is a PlainObject.
-  bool changeGroup = oldGroup != newGroup;
-  MOZ_ASSERT_IF(changeGroup, obj->is<PlainObject>());
-
   if (holder->isFixedSlot(propShape->slot())) {
     size_t offset = NativeObject::getFixedSlotOffset(propShape->slot());
-    writer.addAndStoreFixedSlot(objId, offset, rhsValId, changeGroup, newGroup,
-                                propShape);
+    writer.addAndStoreFixedSlot(objId, offset, rhsValId, propShape);
     trackAttached("AddSlot");
   } else {
     size_t offset = holder->dynamicSlotIndex(propShape->slot()) * sizeof(Value);
     uint32_t numOldSlots = NativeObject::calculateDynamicSlots(oldShape);
     uint32_t numNewSlots = holder->numDynamicSlots();
     if (numOldSlots == numNewSlots) {
-      writer.addAndStoreDynamicSlot(objId, offset, rhsValId, changeGroup,
-                                    newGroup, propShape);
+      writer.addAndStoreDynamicSlot(objId, offset, rhsValId, propShape);
       trackAttached("AddSlot");
     } else {
       MOZ_ASSERT(numNewSlots > numOldSlots);
-      writer.allocateAndStoreDynamicSlot(objId, offset, rhsValId, changeGroup,
-                                         newGroup, propShape, numNewSlots);
+      writer.allocateAndStoreDynamicSlot(objId, offset, rhsValId, propShape,
+                                         numNewSlots);
       trackAttached("AllocateSlot");
     }
   }
   writer.returnFromIC();
 
-  typeCheckInfo_.set(oldGroup, id);
   return AttachDecision::Attach;
 }
 
@@ -5137,9 +4875,7 @@
       callee_(callee),
       thisval_(thisval),
       newTarget_(newTarget),
-      args_(args),
-      typeCheckInfo_(cx, /* needsTypeBarrier = */ true),
-      cacheIRStubKind_(BaselineCacheIRStubKind::Regular) {}
+      args_(args) {}
 
 void CallIRGenerator::emitNativeCalleeGuard(HandleFunction callee) {
   // Note: we rely on GuardSpecificFunction to also guard against the same
@@ -5191,10 +4927,6 @@
     return AttachDecision::NoAction;
   }
 
-  if (thisobj->hasLazyGroup()) {
-    return AttachDecision::NoAction;
-  }
-
   auto* thisarray = &thisobj->as<ArrayObject>();
 
   // Check for other indexed properties or class hooks.
@@ -5233,15 +4965,7 @@
       writer.loadArgumentFixedSlot(ArgumentKind::This, argc_);
   ObjOperandId thisObjId = writer.guardToObject(thisValId);
 
-  // This is a soft assert, documenting the fact that we pass 'true'
-  // for needsTypeBarrier when constructing typeCheckInfo_ for CallIRGenerator.
-  // Can be removed safely if the assumption becomes false.
-  MOZ_ASSERT_IF(IsTypeInferenceEnabled(), typeCheckInfo_.needsTypeBarrier());
-
-  // Guard that the group and shape matches.
-  if (typeCheckInfo_.needsTypeBarrier()) {
-    writer.guardGroupForTypeBarrier(thisObjId, thisobj->group());
-  }
+  // Guard that the shape matches.
   TestMatchingNativeReceiver(writer, thisarray, thisObjId);
 
   // Guard proto chain shapes.
@@ -5253,11 +4977,6 @@
 
   writer.returnFromIC();
 
-  // Set the type-check info, and the stub kind to Updated
-  typeCheckInfo_.set(thisobj->group(), JSID_VOID);
-
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Updated;
-
   trackAttached("ArrayPush");
   return AttachDecision::Attach;
 }
@@ -5277,7 +4996,6 @@
   // Other conditions:
   //
   // * The array length needs to be writable because we're changing it.
-  // * The elements must not be copy-on-write because we're deleting an element.
   // * The array must be extensible. Non-extensible arrays require preserving
   //   the |initializedLength == capacity| invariant on ObjectElements.
   //   See NativeObject::shrinkCapacityToInitializedLength.
@@ -5285,8 +5003,8 @@
   // * There must not be a for-in iterator for the elements because the IC stub
   //   does not suppress deleted properties.
   ArrayObject* arr = &thisval_.toObject().as<ArrayObject>();
-  if (!arr->lengthIsWritable() || arr->denseElementsAreCopyOnWrite() ||
-      !arr->isExtensible() || arr->denseElementsHaveMaybeInIterationFlag()) {
+  if (!arr->lengthIsWritable() || !arr->isExtensible() ||
+      arr->denseElementsHaveMaybeInIterationFlag()) {
     return AttachDecision::NoAction;
   }
 
@@ -5308,8 +5026,7 @@
     writer.packedArrayShiftResult(objId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("ArrayPopShift");
   return AttachDecision::Attach;
@@ -5360,13 +5077,6 @@
 
   writer.returnFromIC();
 
-  // The result of this stub does not need to be monitored because it will
-  // always return a string.  We will add String to the stack typeset when
-  // attaching this stub.
-
-  // Set the stub kind to Regular
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
-
   trackAttached("ArrayJoin");
   return AttachDecision::Attach;
 }
@@ -5400,7 +5110,7 @@
   }
 
   JSObject* templateObj =
-      NewFullyAllocatedArrayTryReuseGroup(cx_, arr, 0, TenuredObject);
+      NewDenseFullyAllocatedArray(cx_, 0, /* proto = */ nullptr, TenuredObject);
   if (!templateObj) {
     cx_->recoverFromOutOfMemory();
     return AttachDecision::NoAction;
@@ -5442,8 +5152,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("ArraySlice");
   return AttachDecision::Attach;
@@ -5464,11 +5173,7 @@
   // Check if the argument is an Array and return result.
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   writer.isArrayResult(argId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ArrayIsArray");
   return AttachDecision::Attach;
@@ -5541,11 +5246,7 @@
 
   writer.loadDataViewValueResult(objId, int32OffsetId, boolLittleEndianId, type,
                                  allowDoubleForUint32);
-
-  // This stub does not need to be monitored, because it returns the same type
-  // as this call.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("DataViewGet");
   return AttachDecision::Attach;
@@ -5617,10 +5318,7 @@
 
   writer.storeDataViewValueResult(objId, int32OffsetId, numericValueId,
                                   boolLittleEndianId, type);
-
-  // This stub doesn't need type monitoring, it always returns |undefined|.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("DataViewSet");
   return AttachDecision::Attach;
@@ -5672,9 +5370,7 @@
       MOZ_CRASH("unexpected native");
   }
 
-  // For simplicity just monitor all stubs.
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("UnsafeGetReservedSlot");
   return AttachDecision::Attach;
@@ -5714,7 +5410,6 @@
 
   // This stub always returns undefined.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("UnsafeSetReservedSlot");
   return AttachDecision::Attach;
@@ -5743,11 +5438,6 @@
   writer.callIsSuspendedGeneratorResult(valId);
   writer.returnFromIC();
 
-  // This stub does not need to be monitored, because it always
-  // returns Boolean. The stack typeset will be updated when we
-  // attach the stub.
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
-
   trackAttached("IsSuspendedGenerator");
   return AttachDecision::Attach;
 }
@@ -5779,10 +5469,7 @@
 
   // Return the object.
   writer.loadObjectResult(objId);
-
-  // Monitor the returned object.
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   if (native == InlinableNative::IntrinsicToObject) {
     trackAttached("ToObject");
@@ -5816,11 +5503,7 @@
 
   // Return the int32.
   writer.loadInt32Result(int32Id);
-
-  // This stub does not need to be monitored, because it always
-  // returns an int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ToInteger");
   return AttachDecision::Attach;
@@ -5847,11 +5530,7 @@
   bool isMax = true;
   Int32OperandId maxId = writer.int32MinMax(isMax, int32ArgId, zeroId);
   writer.loadInt32Result(maxId);
-
-  // This stub does not need to be monitored, because it always returns an
-  // int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ToLength");
   return AttachDecision::Attach;
@@ -5869,11 +5548,7 @@
   // Type check the argument and return result.
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   writer.isObjectResult(argId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsObject");
   return AttachDecision::Attach;
@@ -5893,11 +5568,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   ObjOperandId objArgId = writer.guardToObject(argId);
   writer.isPackedArrayResult(objArgId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsPackedArray");
   return AttachDecision::Attach;
@@ -5915,11 +5586,7 @@
   // Check if the argument is callable and return result.
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   writer.isCallableResult(argId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsCallable");
   return AttachDecision::Attach;
@@ -5945,11 +5612,7 @@
 
   // Check if the argument is a constructor and return result.
   writer.isConstructorResult(objId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsConstructor");
   return AttachDecision::Attach;
@@ -5974,10 +5637,7 @@
   ObjOperandId objId = writer.guardToObject(argId);
   writer.guardIsNotProxy(objId);
   writer.isCrossRealmArrayConstructorResult(objId);
-
-  // This stub does not need to be monitored, it always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsCrossRealmArrayConstructor");
   return AttachDecision::Attach;
@@ -6009,10 +5669,7 @@
 
   // Return the object.
   writer.loadObjectResult(objId);
-
-  // Monitor the returned object.
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("GuardToClass");
   return AttachDecision::Attach;
@@ -6044,10 +5701,7 @@
   }
 
   writer.hasClassResult(objId, clasp);
-
-  // Return without type monitoring, because this always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("HasClass");
   return AttachDecision::Attach;
@@ -6084,24 +5738,19 @@
   switch (native) {
     case InlinableNative::RegExpMatcher:
       writer.callRegExpMatcherResult(reId, inputId, lastIndexId);
-      writer.typeMonitorResult();
-      cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+      writer.returnFromIC();
       trackAttached("RegExpMatcher");
       break;
 
     case InlinableNative::RegExpSearcher:
-      // No type monitoring because this always returns an int32.
       writer.callRegExpSearcherResult(reId, inputId, lastIndexId);
       writer.returnFromIC();
-      cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
       trackAttached("RegExpSearcher");
       break;
 
     case InlinableNative::RegExpTester:
-      // No type monitoring because this always returns an int32.
       writer.callRegExpTesterResult(reId, inputId, lastIndexId);
       writer.returnFromIC();
-      cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
       trackAttached("RegExpTester");
       break;
 
@@ -6127,10 +5776,7 @@
   ObjOperandId protoId = writer.guardToObject(arg0Id);
 
   writer.regExpPrototypeOptimizableResult(protoId);
-
-  // No type monitoring because this always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("RegExpPrototypeOptimizable");
   return AttachDecision::Attach;
@@ -6155,10 +5801,7 @@
   ObjOperandId protoId = writer.guardToObject(arg1Id);
 
   writer.regExpInstanceOptimizableResult(regexpId, protoId);
-
-  // No type monitoring because this always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("RegExpInstanceOptimizable");
   return AttachDecision::Attach;
@@ -6179,10 +5822,7 @@
   StringOperandId strId = writer.guardToString(arg0Id);
 
   writer.getFirstDollarIndexResult(strId);
-
-  // No type monitoring because this always returns an int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("GetFirstDollarIndex");
   return AttachDecision::Attach;
@@ -6211,10 +5851,7 @@
   Int32OperandId lengthId = writer.guardToInt32(arg2Id);
 
   writer.callSubstringKernelResult(strId, beginId, lengthId);
-
-  // No type monitoring because this always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("SubstringKernel");
   return AttachDecision::Attach;
@@ -6245,10 +5882,7 @@
 
   writer.guardProto(objId, proto);
   writer.loadBooleanResult(true);
-
-  // No type monitoring because this always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ObjectHasPrototype");
   return AttachDecision::Attach;
@@ -6273,11 +5907,7 @@
 
   // Return the string.
   writer.loadStringResult(strId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("String");
   return AttachDecision::Attach;
@@ -6318,8 +5948,7 @@
   }
 
   writer.newStringObjectResult(templateObj, strId);
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("StringConstructor");
   return AttachDecision::Attach;
@@ -6350,10 +5979,7 @@
 
   // Return the string
   writer.loadStringResult(strId);
-
-  // This stub doesn't need to be monitored, because it always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringToStringValueOf");
   return AttachDecision::Attach;
@@ -6382,10 +6008,7 @@
   StringOperandId replacementId = writer.guardToString(arg2Id);
 
   writer.stringReplaceStringResult(strId, patternId, replacementId);
-
-  // No type monitoring because this always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringReplaceString");
   return AttachDecision::Attach;
@@ -6416,9 +6039,7 @@
   StringOperandId separatorId = writer.guardToString(arg1Id);
 
   writer.stringSplitStringResult(strId, separatorId, group);
-
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("StringSplitString");
   return AttachDecision::Attach;
@@ -6460,11 +6081,6 @@
 
   writer.returnFromIC();
 
-  // This stub does not need to be monitored, because it always
-  // returns a string for charAt or int32_t for charCodeAt.
-  // The stack typeset will be updated when we attach the stub.
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
-
   if (kind == StringChar::CodeAt) {
     trackAttached("StringCharCodeAt");
   } else {
@@ -6502,11 +6118,7 @@
 
   // Return string created from code.
   writer.stringFromCharCodeResult(codeId);
-
-  // This stub does not need to be monitored, because it always
-  // returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringFromCharCode");
   return AttachDecision::Attach;
@@ -6537,10 +6149,7 @@
 
   // Return string created from code point.
   writer.stringFromCodePointResult(codeId);
-
-  // This stub doesn't need to be monitored, because it always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringFromCodePoint");
   return AttachDecision::Attach;
@@ -6571,10 +6180,7 @@
 
   // Return string converted to lower-case.
   writer.stringToLowerCaseResult(strId);
-
-  // This stub doesn't need to be monitored, because it always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringToLowerCase");
   return AttachDecision::Attach;
@@ -6605,10 +6211,7 @@
 
   // Return string converted to upper-case.
   writer.stringToUpperCaseResult(strId);
-
-  // This stub doesn't need to be monitored, because it always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("StringToUpperCase");
   return AttachDecision::Attach;
@@ -6634,7 +6237,6 @@
   writer.mathRandomResult(rng);
 
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathRandom");
   return AttachDecision::Attach;
@@ -6668,11 +6270,7 @@
     writer.mathAbsNumberResult(numberId);
   }
 
-  // The INT_MIN case and implementation details of the C++ abs
-  // make this a bit tricky. We probably can just remove monitoring
-  // in the future completely, so do the easy thing right now.
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathAbs");
   return AttachDecision::Attach;
@@ -6701,10 +6299,7 @@
     int32Id = writer.truncateDoubleToUInt32(numId);
   }
   writer.mathClz32Result(int32Id);
-
-  // Math.clz32 always returns an int32 so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathClz32");
   return AttachDecision::Attach;
@@ -6742,10 +6337,7 @@
     }
   }
 
-  // The stub's return type matches the current return value so we don't need
-  // type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathSign");
   return AttachDecision::Attach;
@@ -6778,10 +6370,7 @@
     int32Arg1Id = writer.truncateDoubleToUInt32(numArg1Id);
   }
   writer.mathImulResult(int32Arg0Id, int32Arg1Id);
-
-  // Math.imul always returns int32 so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathImul");
   return AttachDecision::Attach;
@@ -6814,8 +6403,7 @@
     writer.mathFloorNumberResult(numberId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathFloor");
   return AttachDecision::Attach;
@@ -6848,8 +6436,7 @@
     writer.mathCeilNumberResult(numberId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathCeil");
   return AttachDecision::Attach;
@@ -6882,8 +6469,7 @@
     writer.mathTruncNumberResult(numberId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathTrunc");
   return AttachDecision::Attach;
@@ -6916,8 +6502,7 @@
     writer.mathFunctionNumberResult(numberId, UnaryMathFunction::Round);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathRound");
   return AttachDecision::Attach;
@@ -6939,10 +6524,7 @@
       writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   NumberOperandId numberId = writer.guardIsNumber(argumentId);
   writer.mathSqrtNumberResult(numberId);
-
-  // Math.sqrt always returns a double so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathSqrt");
   return AttachDecision::Attach;
@@ -6964,10 +6546,7 @@
       writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   NumberOperandId numberId = writer.guardIsNumber(argumentId);
   writer.mathFRoundNumberResult(numberId);
-
-  // Math.fround always returns a double so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathFRound");
   return AttachDecision::Attach;
@@ -7022,8 +6601,7 @@
     writer.doublePowResult(baseNumberId, exponentNumberId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("MathPow");
   return AttachDecision::Attach;
@@ -7079,9 +6657,7 @@
       MOZ_CRASH("Unexpected number of arguments to hypot function.");
   }
 
-  // Math.hypot always returns a double so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathHypot");
   return AttachDecision::Attach;
@@ -7106,10 +6682,7 @@
   NumberOperandId xNumberId = writer.guardIsNumber(xId);
 
   writer.mathAtan2NumberResult(yNumberId, xNumberId);
-
-  // Math.atan2 always returns a double so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathAtan2");
   return AttachDecision::Attach;
@@ -7159,8 +6732,7 @@
     writer.loadDoubleResult(resId);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached(isMax ? "MathMax" : "MathMin");
   return AttachDecision::Attach;
@@ -7187,10 +6759,7 @@
       writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   NumberOperandId numberId = writer.guardIsNumber(argumentId);
   writer.mathFunctionNumberResult(numberId, fun);
-
-  // These functions always return a double so we don't need type monitoring.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("MathFunction");
   return AttachDecision::Attach;
@@ -7238,10 +6807,7 @@
 
   // Return the string.
   writer.loadStringResult(strId);
-
-  // This stub doesn't need to be monitored, because it always returns a string.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("NumberToString");
   return AttachDecision::Attach;
@@ -7269,9 +6835,7 @@
   ObjOperandId objId = writer.guardToObject(argumentId);
 
   writer.reflectGetPrototypeOfResult(objId);
-
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("ReflectGetPrototypeOf");
   return AttachDecision::Attach;
@@ -7376,11 +6940,7 @@
 
   writer.atomicsCompareExchangeResult(objId, int32IndexId, int32ExpectedId,
                                       int32ReplacementId, typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsCompareExchange");
   return AttachDecision::Attach;
@@ -7457,11 +7017,7 @@
 
   writer.atomicsExchangeResult(objId, int32IndexId, int32ValueId,
                                typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsExchange");
   return AttachDecision::Attach;
@@ -7479,11 +7035,7 @@
 
   writer.atomicsAddResult(objId, int32IndexId, int32ValueId,
                           typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsAdd");
   return AttachDecision::Attach;
@@ -7501,11 +7053,7 @@
 
   writer.atomicsSubResult(objId, int32IndexId, int32ValueId,
                           typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsSub");
   return AttachDecision::Attach;
@@ -7523,11 +7071,7 @@
 
   writer.atomicsAndResult(objId, int32IndexId, int32ValueId,
                           typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsAnd");
   return AttachDecision::Attach;
@@ -7544,11 +7088,7 @@
   auto* typedArray = &args_[0].toObject().as<TypedArrayObject>();
 
   writer.atomicsOrResult(objId, int32IndexId, int32ValueId, typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsOr");
   return AttachDecision::Attach;
@@ -7566,11 +7106,7 @@
 
   writer.atomicsXorResult(objId, int32IndexId, int32ValueId,
                           typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsXor");
   return AttachDecision::Attach;
@@ -7615,11 +7151,7 @@
   Int32OperandId int32IndexId = writer.guardToInt32Index(indexId);
 
   writer.atomicsLoadResult(objId, int32IndexId, typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or, for uint32, a double.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsLoad");
   return AttachDecision::Attach;
@@ -7687,11 +7219,7 @@
 
   writer.atomicsStoreResult(objId, int32IndexId, int32ValueId,
                             typedArray->type());
-
-  // This stub doesn't need to be monitored, because it always returns an int32
-  // or the result is not observed.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsStore");
   return AttachDecision::Attach;
@@ -7720,10 +7248,7 @@
   Int32OperandId int32ValueId = writer.guardToInt32(valueId);
 
   writer.atomicsIsLockFreeResult(int32ValueId);
-
-  // This stub doesn't need to be monitored, because it always returns a bool.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AtomicsIsLockFree");
   return AttachDecision::Attach;
@@ -7750,9 +7275,7 @@
     writer.loadValueTruthyResult(valId);
   }
 
-  // This stub doesn't need to be monitored, because it always returns a bool.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("Boolean");
   return AttachDecision::Attach;
@@ -7772,10 +7295,7 @@
 
   writer.bailout();
   writer.loadUndefinedResult();
-
-  // This stub doesn't need to be monitored, it always returns undefined.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("Bailout");
   return AttachDecision::Attach;
@@ -7797,10 +7317,7 @@
 
   // NOP when not in IonMonkey.
   writer.loadUndefinedResult();
-
-  // This stub doesn't need to be monitored, it always returns undefined.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AssertFloat32");
   return AttachDecision::Attach;
@@ -7826,10 +7343,7 @@
   ValOperandId valId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
 
   writer.assertRecoveredOnBailoutResult(valId, mustBeRecovered);
-
-  // This stub doesn't need to be monitored, it always returns undefined.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("AssertRecoveredOnBailout");
   return AttachDecision::Attach;
@@ -7927,10 +7441,7 @@
     }
   }
 
-  // This stub does not need to be monitored, because it always returns a
-  // boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ObjectIs");
   return AttachDecision::Attach;
@@ -7962,11 +7473,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
 
   writer.loadInstanceOfObjectResult(argId, thisObjId);
-
-  // This stub does not need to be monitored, because it always returns a
-  // boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ObjectIsPrototypeOf");
   return AttachDecision::Attach;
@@ -8028,8 +7535,7 @@
     }
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   if (isScripted) {
     trackAttached("Scripted fun_call");
@@ -8054,10 +7560,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   ObjOperandId objArgId = writer.guardToObject(argId);
   writer.isTypedArrayResult(objArgId, isPossiblyWrapped);
-
-  // This stub does not need to be monitored because it always returns a bool.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached(isPossiblyWrapped ? "IsPossiblyWrappedTypedArray"
                                   : "IsTypedArray");
@@ -8078,10 +7581,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   ObjOperandId objArgId = writer.guardToObject(argId);
   writer.isTypedArrayConstructorResult(objArgId);
-
-  // This stub does not need to be monitored because it always returns a bool.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsTypedArrayConstructor");
   return AttachDecision::Attach;
@@ -8102,10 +7602,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   ObjOperandId objArgId = writer.guardToObject(argId);
   writer.typedArrayByteOffsetResult(objArgId);
-
-  // This stub does not need to be monitored because it always returns int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("TypedArrayByteOffset");
   return AttachDecision::Attach;
@@ -8126,10 +7623,7 @@
   ValOperandId argId = writer.loadArgumentFixedSlot(ArgumentKind::Arg0, argc_);
   ObjOperandId objArgId = writer.guardToObject(argId);
   writer.typedArrayElementShiftResult(objArgId);
-
-  // This stub does not need to be monitored because it always returns int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("TypedArrayElementShift");
   return AttachDecision::Attach;
@@ -8164,10 +7658,7 @@
   // Note: the "getter" argument is a hint for IonBuilder. Just pass |callee|,
   // the field isn't used for this intrinsic call.
   writer.loadTypedArrayLengthResult(objArgId, callee);
-
-  // This stub does not need to be monitored because it always returns int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("TypedArrayLength");
   return AttachDecision::Attach;
@@ -8200,10 +7691,7 @@
   }
 
   writer.loadArrayBufferByteLengthInt32Result(objArgId);
-
-  // This stub does not need to be monitored because it always returns int32.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ArrayBufferByteLength");
   return AttachDecision::Attach;
@@ -8220,10 +7708,7 @@
   // Note: we don't need to call emitNativeCalleeGuard for intrinsics.
 
   writer.frameIsConstructingResult();
-
-  // This stub does not need to be monitored, it always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("IsConstructing");
   return AttachDecision::Attach;
@@ -8253,10 +7738,7 @@
   ObjOperandId objResultArrId = writer.guardToObject(resultArrId);
 
   writer.getNextMapSetEntryForIteratorResult(objIterId, objResultArrId, isMap);
-
-  // This stub does not need to be monitored, it always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("GetNextMapSetEntryForIterator");
   return AttachDecision::Attach;
@@ -8290,10 +7772,7 @@
 
   writer.finishBoundFunctionInitResult(objBoundId, objTargetId,
                                        int32ArgCountId);
-
-  // This stub does not need to be monitored, it always returns |undefined|.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("FinishBoundFunctionInit");
   return AttachDecision::Attach;
@@ -8320,8 +7799,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
   writer.newArrayIteratorResult(templateObj);
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("NewArrayIterator");
   return AttachDecision::Attach;
@@ -8348,8 +7826,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
   writer.newStringIteratorResult(templateObj);
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("NewStringIterator");
   return AttachDecision::Attach;
@@ -8376,8 +7853,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
   writer.newRegExpStringIteratorResult(templateObj);
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("NewRegExpStringIterator");
   return AttachDecision::Attach;
@@ -8412,10 +7888,7 @@
   // Ensure that proto[slot] == nextFun.
   writer.guardDynamicSlotIsSpecificObject(protoId, nextId, slot);
   writer.loadBooleanResult(true);
-
-  // This stub does not need to be monitored, it always returns a boolean.
   writer.returnFromIC();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Regular;
 
   trackAttached("ArrayIteratorPrototypeOptimizable");
   return AttachDecision::Attach;
@@ -8458,8 +7931,7 @@
   }
 
   writer.objectCreateResult(templateObj);
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("ObjectCreate");
   return AttachDecision::Attach;
@@ -8486,8 +7958,8 @@
   JSObject* templateObj;
   {
     AutoRealm ar(cx_, callee);
-    templateObj = NewFullyAllocatedArrayForCallingAllocationSite(cx_, length,
-                                                                 TenuredObject);
+    templateObj = NewDenseFullyAllocatedArray(
+        cx_, length, /* proto = */ nullptr, TenuredObject);
     if (!templateObj) {
       cx_->recoverFromOutOfMemory();
       return AttachDecision::NoAction;
@@ -8520,8 +7992,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("ArrayConstructor");
   return AttachDecision::Attach;
@@ -8623,8 +8094,7 @@
     writer.metaNativeTemplateObject(callee, templateObj);
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   trackAttached("TypedArrayConstructor");
   return AttachDecision::Attach;
@@ -8716,8 +8186,7 @@
     }
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   if (isScripted) {
     trackAttached("Scripted fun_apply");
@@ -8766,6 +8235,7 @@
 
   // If there are too many arguments, don't optimize (we won't be able to store
   // the arguments in the LIR node).
+  static_assert(wasm::MaxArgsForJitInlineCall <= ArgumentKindArgIndexLimit);
   if (sig.args().length() > wasm::MaxArgsForJitInlineCall) {
     return AttachDecision::NoAction;
   }
@@ -8801,8 +8271,6 @@
 
   // Check that all arguments can be converted to the Wasm type in Warp code
   // without bailing out.
-  // TODO(post-Warp): we should emit CacheIR instructions to check this to
-  // prevent bailout loops.
   for (size_t i = 0; i < sig.args().length(); i++) {
     Value argVal = i < argc_ ? args_[i] : UndefinedValue();
     switch (sig.args()[i].kind()) {
@@ -8815,7 +8283,7 @@
         }
         break;
       case wasm::ValType::I64:
-        if (!argVal.isBigInt() && !argVal.isString()) {
+        if (!argVal.isBigInt() && !argVal.isBoolean() && !argVal.isString()) {
           return AttachDecision::NoAction;
         }
         break;
@@ -8823,6 +8291,8 @@
         MOZ_CRASH("Function should not have a Wasm JitEntry");
       case wasm::ValType::Ref:
         // All values can be boxed as AnyRef.
+        MOZ_ASSERT(sig.args()[i].refTypeKind() == wasm::RefType::Extern,
+                   "Unexpected type for Wasm JitEntry");
         break;
     }
   }
@@ -8835,17 +8305,24 @@
 
   // Load the callee and ensure it is an object
   ValOperandId calleeValId =
-      writer.loadArgumentDynamicSlot(ArgumentKind::Callee, argcId, flags);
+      writer.loadArgumentFixedSlot(ArgumentKind::Callee, argc_, flags);
   ObjOperandId calleeObjId = writer.guardToObject(calleeValId);
 
   // Ensure the callee is this Wasm function.
   emitCalleeGuard(calleeObjId, calleeFunc);
 
+  // Guard the argument types.
+  uint32_t guardedArgs = std::min<uint32_t>(sig.args().length(), argc_);
+  for (uint32_t i = 0; i < guardedArgs; i++) {
+    ArgumentKind argKind = ArgumentKindForArgIndex(i);
+    ValOperandId argId = writer.loadArgumentFixedSlot(argKind, argc_, flags);
+    writer.guardWasmArg(argId, sig.args()[i].kind());
+  }
+
   writer.callWasmFunction(calleeObjId, argcId, flags, &funcExport,
                           inst.object());
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
   trackAttached("WasmCall");
 
   return AttachDecision::Attach;
@@ -9254,35 +8731,16 @@
     return ScriptedThisResult::NoAction;
   }
 
-  if (!GetPropertyPure(cx_, newTarget, NameToId(cx_->names().prototype),
-                       protov.address())) {
-    // The lazy prototype property hasn't been resolved yet.
-    MOZ_ASSERT(newTarget->as<JSFunction>().needsPrototypeProperty());
-    return ScriptedThisResult::TemporarilyUnoptimizable;
+  if (!GetProperty(cx_, newTarget, newTarget, cx_->names().prototype,
+                   &protov)) {
+    cx_->clearPendingException();
+    return ScriptedThisResult::NoAction;
   }
 
   if (!protov.isObject()) {
     return ScriptedThisResult::NoAction;
   }
 
-  {
-    AutoRealm ar(cx_, calleeFunc);
-    TaggedProto proto(&protov.toObject());
-    ObjectGroup* group = ObjectGroup::defaultNewGroup(cx_, &PlainObject::class_,
-                                                      proto, newTarget);
-    if (!group) {
-      cx_->clearPendingException();
-      return ScriptedThisResult::NoAction;
-    }
-
-    AutoSweepObjectGroup sweep(group);
-    if (group->newScript(sweep) && !group->newScript(sweep)->analyzed()) {
-      // The new script analysis has not been done on this function.
-      // Don't attach until after the analysis has been done.
-      return ScriptedThisResult::TemporarilyUnoptimizable;
-    }
-  }
-
   PlainObject* thisObject =
       CreateThisForFunction(cx_, calleeFunc, newTarget, TenuredObject);
   if (!thisObject) {
@@ -9338,12 +8796,6 @@
     return AttachDecision::NoAction;
   }
 
-  // Keep track of the function's |prototype| property in type
-  // information, for use during Ion compilation.
-  if (IsIonEnabled(cx_)) {
-    EnsureTrackPropertyTypes(cx_, calleeFunc, NameToId(cx_->names().prototype));
-  }
-
   RootedObject templateObj(cx_);
   if (isConstructing && isSpecialized) {
     switch (getThisForScripted(calleeFunc, &templateObj)) {
@@ -9352,8 +8804,6 @@
       case ScriptedThisResult::UninitializedThis:
         flags.setNeedsUninitializedThis();
         break;
-      case ScriptedThisResult::TemporarilyUnoptimizable:
-        return AttachDecision::TemporarilyUnoptimizable;
       case ScriptedThisResult::NoAction:
         return AttachDecision::NoAction;
     }
@@ -9411,9 +8861,8 @@
   }
 
   writer.callScriptedFunction(calleeObjId, argcId, flags);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
   if (isSpecialized) {
     trackAttached("Call scripted func");
   } else {
@@ -9443,54 +8892,8 @@
 
   // Check for natives to which template objects can be attached. This is
   // done to provide templates to Ion for inlining these natives later on.
+  // TODO(no-TI): IonBuilder template objects.
   switch (calleeFunc->jitInfo()->inlinableNative) {
-    case InlinableNative::Array: {
-      // Note: the template array won't be used if its length is inaccurately
-      // computed here.  (We allocate here because compilation may occur on a
-      // separate thread where allocation is impossible.)
-
-      if (args_.length() <= 1) {
-        // This case is handled by tryAttachArrayConstructor.
-        return true;
-      }
-
-      size_t count = args_.length();
-      if (count > ArrayObject::EagerAllocationMaxLength) {
-        return true;
-      }
-
-      // With this and other array templates, analyze the group so that
-      // we don't end up with a template whose structure might change later.
-      res.set(NewFullyAllocatedArrayForCallingAllocationSite(cx_, count,
-                                                             TenuredObject));
-      return !!res;
-    }
-
-    case InlinableNative::ArraySlice: {
-      if (!thisval_.isObject()) {
-        return true;
-      }
-
-      RootedObject obj(cx_, &thisval_.toObject());
-      if (obj->isSingleton()) {
-        return true;
-      }
-
-      if (IsPackedArray(obj)) {
-        // This case is handled by tryAttachArraySlice.
-        return true;
-      }
-
-      // TODO(Warp): Support non-packed arrays in tryAttachArraySlice if they're
-      // common in user code.
-      if (JitOptions.warpBuilder) {
-        return true;
-      }
-
-      res.set(NewFullyAllocatedArrayTryReuseGroup(cx_, obj, 0, TenuredObject));
-      return !!res;
-    }
-
     case InlinableNative::String: {
       if (!isConstructing) {
         return true;
@@ -9593,8 +8996,7 @@
     trackAttached("CallAnyNative");
   }
 
-  writer.typeMonitorResult();
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
+  writer.returnFromIC();
 
   if (templateObj) {
     MOZ_ASSERT(isSpecialized);
@@ -9642,9 +9044,8 @@
   writer.guardAnyClass(calleeObjId, calleeObj->getClass());
 
   writer.callClassHook(calleeObjId, argcId, hook, flags);
-  writer.typeMonitorResult();
+  writer.returnFromIC();
 
-  cacheIRStubKind_ = BaselineCacheIRStubKind::Monitored;
   trackAttached("Call native func");
 
   return AttachDecision::Attach;
@@ -9702,19 +9103,6 @@
   return tryAttachCallNative(calleeFunc);
 }
 
-AttachDecision CallIRGenerator::tryAttachDeferredStub(HandleValue result) {
-  AutoAssertNoPendingException aanpe(cx_);
-
-  // Ensure that the opcode makes sense.
-  MOZ_ASSERT(op_ == JSOp::Call || op_ == JSOp::CallIgnoresRv);
-
-  // Ensure that the mode makes sense.
-  MOZ_ASSERT(mode_ == ICState::Mode::Specialized);
-
-  MOZ_ASSERT_UNREACHABLE("No deferred functions currently exist");
-  return AttachDecision::NoAction;
-}
-
 void CallIRGenerator::trackAttached(const char* name) {
 #ifdef JS_CACHEIR_SPEW
   if (const CacheIRSpewer::Guard& sp = CacheIRSpewer::Guard(*this, name)) {
@@ -11348,13 +10736,6 @@
     return AttachDecision::NoAction;
   }
 
-  // Don't attach stub if group is pretenured, as the stub
-  // won't succeed.
-  AutoSweepObjectGroup sweep(templateObject_->group());
-  if (templateObject_->group()->shouldPreTenure(sweep)) {
-    trackAttached(IRGenerator::NotAttached);
-    return AttachDecision::NoAction;
-  }
   // Stub doesn't support metadata builder
   if (cx_->realm()->hasAllocationMetadataBuilder()) {
     trackAttached(IRGenerator::NotAttached);
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIR.h firefox-85.0+build1/js/src/jit/CacheIR.h
--- firefox-84.0.2+build1/js/src/jit/CacheIR.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIR.h	2021-01-18 19:58:13.000000000 +0000
@@ -407,9 +407,21 @@
   Arg1,
   Arg2,
   Arg3,
+  Arg4,
+  Arg5,
+  Arg6,
+  Arg7,
   NumKinds
 };
 
+const uint8_t ArgumentKindArgIndexLimit =
+    uint8_t(ArgumentKind::NumKinds) - uint8_t(ArgumentKind::Arg0);
+
+inline ArgumentKind ArgumentKindForArgIndex(uint32_t idx) {
+  MOZ_ASSERT(idx < ArgumentKindArgIndexLimit);
+  return ArgumentKind(uint32_t(ArgumentKind::Arg0) + idx);
+}
+
 // This function calculates the index of an argument based on the call flags.
 // addArgc is an out-parameter, indicating whether the value of argc should
 // be added to the return value to find the actual index.
@@ -461,6 +473,14 @@
       return flags.isConstructing() + hasArgumentArray - 3;
     case ArgumentKind::Arg3:
       return flags.isConstructing() + hasArgumentArray - 4;
+    case ArgumentKind::Arg4:
+      return flags.isConstructing() + hasArgumentArray - 5;
+    case ArgumentKind::Arg5:
+      return flags.isConstructing() + hasArgumentArray - 6;
+    case ArgumentKind::Arg6:
+      return flags.isConstructing() + hasArgumentArray - 7;
+    case ArgumentKind::Arg7:
+      return flags.isConstructing() + hasArgumentArray - 8;
     case ArgumentKind::NewTarget:
       MOZ_ASSERT(flags.isConstructing());
       *addArgc = false;
@@ -686,6 +706,11 @@
   }
   void writeStaticStringImm(const char* str) { writePointer(str); }
 
+  void writeWasmValTypeImm(wasm::ValType::Kind kind) {
+    static_assert(unsigned(wasm::TypeCode::Limit) <= UINT8_MAX);
+    buffer_.writeByte(uint8_t(kind));
+  }
+
   uint32_t newOperandId() { return nextOperandId_++; }
 
   CacheIRWriter(const CacheIRWriter&) = delete;
@@ -818,14 +843,6 @@
     guardGroup(obj, group);
   }
 
-  void guardGroupForTypeBarrier(ObjOperandId obj, ObjectGroup* group) {
-    // Typesets will always be a super-set of any typesets previously seen
-    // for this group. If the type/group of a value being stored to a
-    // property in this group is not known, a TypeUpdate IC chain should be
-    // used as well.
-    guardGroup(obj, group);
-  }
-
   void guardGroupForLayout(ObjOperandId obj, ObjectGroup* group) {
     // NOTE: Comment in guardGroupForTypeBarrier also applies.
     MOZ_ASSERT(IsTypedObjectClass(group->clasp()));
@@ -1098,6 +1115,9 @@
   GuardClassKind guardClassKind() { return GuardClassKind(buffer_.readByte()); }
   JSValueType jsValueType() { return JSValueType(buffer_.readByte()); }
   ValueType valueType() { return ValueType(buffer_.readByte()); }
+  wasm::ValType::Kind wasmValType() {
+    return wasm::ValType::Kind(buffer_.readByte());
+  }
 
   Scalar::Type scalarType() { return Scalar::Type(buffer_.readByte()); }
   uint32_t typeDescrKey() { return buffer_.readByte(); }
@@ -1245,49 +1265,11 @@
   static constexpr char* NotAttached = nullptr;
 };
 
-// Flags used to describe what values a GetProperty cache may produce.
-enum class GetPropertyResultFlags {
-  None = 0,
-
-  // Values produced by this cache will go through a type barrier,
-  // so the cache may produce any type of value that is compatible with its
-  // result operand.
-  Monitored = 1 << 0,
-
-  // Whether particular primitives may be produced by this cache.
-  AllowUndefined = 1 << 1,
-  AllowInt32 = 1 << 2,
-  AllowDouble = 1 << 3,
-
-  All = Monitored | AllowUndefined | AllowInt32 | AllowDouble
-};
-
-static inline bool operator&(GetPropertyResultFlags a,
-                             GetPropertyResultFlags b) {
-  return static_cast<int>(a) & static_cast<int>(b);
-}
-
-static inline GetPropertyResultFlags operator|(GetPropertyResultFlags a,
-                                               GetPropertyResultFlags b) {
-  return static_cast<GetPropertyResultFlags>(static_cast<int>(a) |
-                                             static_cast<int>(b));
-}
-
-static inline GetPropertyResultFlags& operator|=(GetPropertyResultFlags& lhs,
-                                                 GetPropertyResultFlags b) {
-  lhs = lhs | b;
-  return lhs;
-}
-
 // GetPropIRGenerator generates CacheIR for a GetProp IC.
 class MOZ_RAII GetPropIRGenerator : public IRGenerator {
   HandleValue val_;
   HandleValue idVal_;
   HandleValue receiver_;
-  GetPropertyResultFlags resultFlags_;
-
-  enum class PreliminaryObjectAction { None, Unlink, NotePreliminary };
-  PreliminaryObjectAction preliminaryObjectAction_;
 
   AttachDecision tryAttachNative(HandleObject obj, ObjOperandId objId,
                                  HandleId id, ValOperandId receiverId);
@@ -1381,10 +1363,6 @@
             cacheKind_ == CacheKind::GetElemSuper);
   }
 
-  // No pc if idempotent, as there can be multiple bytecode locations
-  // due to GVN.
-  bool idempotent() const { return pc_ == nullptr; }
-
   // If this is a GetElem cache, emit instructions to guard the incoming Value
   // matches |id|.
   void maybeEmitIdGuard(jsid id);
@@ -1394,19 +1372,9 @@
  public:
   GetPropIRGenerator(JSContext* cx, HandleScript script, jsbytecode* pc,
                      ICState::Mode mode, CacheKind cacheKind, HandleValue val,
-                     HandleValue idVal, HandleValue receiver,
-                     GetPropertyResultFlags resultFlags);
+                     HandleValue idVal, HandleValue receiver);
 
   AttachDecision tryAttachStub();
-  AttachDecision tryAttachIdempotentStub();
-
-  bool shouldUnlinkPreliminaryObjectStubs() const {
-    return preliminaryObjectAction_ == PreliminaryObjectAction::Unlink;
-  }
-
-  bool shouldNotePreliminaryObjectStub() const {
-    return preliminaryObjectAction_ == PreliminaryObjectAction::NotePreliminary;
-  }
 };
 
 // GetNameIRGenerator generates CacheIR for a GetName IC.
@@ -1446,58 +1414,11 @@
   AttachDecision tryAttachStub();
 };
 
-// Information used by SetProp/SetElem stubs to check/update property types.
-class MOZ_RAII PropertyTypeCheckInfo {
-  RootedObjectGroup group_;
-  RootedId id_;
-  bool needsTypeBarrier_;
-
-  PropertyTypeCheckInfo(const PropertyTypeCheckInfo&) = delete;
-  void operator=(const PropertyTypeCheckInfo&) = delete;
-
- public:
-  PropertyTypeCheckInfo(JSContext* cx, bool needsTypeBarrier)
-      : group_(cx), id_(cx), needsTypeBarrier_(needsTypeBarrier) {
-    if (!IsTypeInferenceEnabled()) {
-      needsTypeBarrier_ = false;
-    }
-  }
-
-  bool needsTypeBarrier() const { return needsTypeBarrier_; }
-  bool isSet() const { return group_ != nullptr; }
-
-  ObjectGroup* group() const {
-    MOZ_ASSERT(isSet());
-    return group_;
-  }
-
-  jsid id() const {
-    MOZ_ASSERT(isSet());
-    return id_;
-  }
-
-  void set(ObjectGroup* group, jsid id) {
-    MOZ_ASSERT(!group_);
-    MOZ_ASSERT(group);
-    if (needsTypeBarrier_) {
-      group_ = group;
-      id_ = id;
-    }
-  }
-};
-
 // SetPropIRGenerator generates CacheIR for a SetProp IC.
 class MOZ_RAII SetPropIRGenerator : public IRGenerator {
   HandleValue lhsVal_;
   HandleValue idVal_;
   HandleValue rhsVal_;
-  PropertyTypeCheckInfo typeCheckInfo_;
-
-  enum class PreliminaryObjectAction { None, Unlink, NotePreliminary };
-  PreliminaryObjectAction preliminaryObjectAction_;
-  bool attachedTypedArrayOOBStub_;
-
-  bool maybeHasExtraIndexedProps_;
 
  public:
   enum class DeferType { None, AddSlot };
@@ -1584,27 +1505,12 @@
  public:
   SetPropIRGenerator(JSContext* cx, HandleScript script, jsbytecode* pc,
                      CacheKind cacheKind, ICState::Mode mode,
-                     HandleValue lhsVal, HandleValue idVal, HandleValue rhsVal,
-                     bool needsTypeBarrier = true,
-                     bool maybeHasExtraIndexedProps = true);
+                     HandleValue lhsVal, HandleValue idVal, HandleValue rhsVal);
 
   AttachDecision tryAttachStub();
-  AttachDecision tryAttachAddSlotStub(HandleObjectGroup oldGroup,
-                                      HandleShape oldShape);
+  AttachDecision tryAttachAddSlotStub(HandleShape oldShape);
   void trackAttached(const char* name);
 
-  bool shouldUnlinkPreliminaryObjectStubs() const {
-    return preliminaryObjectAction_ == PreliminaryObjectAction::Unlink;
-  }
-
-  bool shouldNotePreliminaryObjectStub() const {
-    return preliminaryObjectAction_ == PreliminaryObjectAction::NotePreliminary;
-  }
-
-  const PropertyTypeCheckInfo* typeCheckInfo() const { return &typeCheckInfo_; }
-
-  bool attachedTypedArrayOOBStub() const { return attachedTypedArrayOOBStub_; }
-
   DeferType deferType() const { return deferType_; }
 };
 
@@ -1730,7 +1636,6 @@
 enum class StringChar { CodeAt, At };
 enum class ScriptedThisResult {
   NoAction,
-  TemporarilyUnoptimizable,
   UninitializedThis,
   TemplateObject
 };
@@ -1744,8 +1649,6 @@
   HandleValue thisval_;
   HandleValue newTarget_;
   HandleValueArray args_;
-  PropertyTypeCheckInfo typeCheckInfo_;
-  BaselineCacheIRStubKind cacheIRStubKind_;
 
   ScriptedThisResult getThisForScripted(HandleFunction calleeFunc,
                                         MutableHandleObject result);
@@ -1884,12 +1787,6 @@
                   HandleValue newTarget, HandleValueArray args);
 
   AttachDecision tryAttachStub();
-
-  AttachDecision tryAttachDeferredStub(HandleValue result);
-
-  BaselineCacheIRStubKind cacheIRStubKind() const { return cacheIRStubKind_; }
-
-  const PropertyTypeCheckInfo* typeCheckInfo() const { return &typeCheckInfo_; }
 };
 
 class MOZ_RAII CompareIRGenerator : public IRGenerator {
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIRHealth.cpp firefox-85.0+build1/js/src/jit/CacheIRHealth.cpp
--- firefox-84.0.2+build1/js/src/jit/CacheIRHealth.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIRHealth.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -79,23 +79,21 @@
   while (stub && !stub->isFallback()) {
     spew->beginObject();
     {
-      uint32_t count;
-      if (js::jit::GetStubEnteredCount(stub, &count)) {
-        Happiness stubHappiness = spewStubHealth(spew, stub);
-        if (stubHappiness < entryHappiness) {
-          entryHappiness = stubHappiness;
-        }
-
-        if (count > 0 && sawNonZeroCount) {
-          // More than one stub has a hit count greater than zero.
-          // This is sad because we do not Warp transpile in this case.
-          entryHappiness = Sad;
-        } else if (count > 0 && !sawNonZeroCount) {
-          sawNonZeroCount = true;
-        }
+      uint32_t count = stub->getEnteredCount();
+      Happiness stubHappiness = spewStubHealth(spew, stub);
+      if (stubHappiness < entryHappiness) {
+        entryHappiness = stubHappiness;
+      }
 
-        spew->property("hitCount", count);
+      if (count > 0 && sawNonZeroCount) {
+        // More than one stub has a hit count greater than zero.
+        // This is sad because we do not Warp transpile in this case.
+        entryHappiness = Sad;
+      } else if (count > 0 && !sawNonZeroCount) {
+        sawNonZeroCount = true;
       }
+
+      spew->property("hitCount", count);
     }
 
     spew->endObject();
@@ -170,8 +168,7 @@
     len = cs.length;
     MOZ_ASSERT(len);
 
-    if (entry && (entry->firstStub()->isFallback() ||
-                  ICStub::IsCacheIRKind(entry->firstStub()->kind()))) {
+    if (entry) {
       Happiness entryHappiness =
           spewJSOpAndCacheIRHealth(spew, script, entry, next, op);
 
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIROps.yaml firefox-85.0+build1/js/src/jit/CacheIROps.yaml
--- firefox-84.0.2+build1/js/src/jit/CacheIROps.yaml	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIROps.yaml	2021-01-18 19:58:13.000000000 +0000
@@ -74,12 +74,6 @@
 # If there's an argument named 'result', the generated CacheIRWriter method will
 # return a new OperandId of this type.
 
-- name: TypeMonitorResult
-  shared: false
-  transpile: true
-  cost_estimate: 1
-  args:
-
 - name: ReturnFromIC
   shared: false
   transpile: true
@@ -366,14 +360,14 @@
 
 - name: GuardIsExtensible
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 1
   args:
     obj: ObjId
 
 - name: GuardIsNativeObject
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 1
   args:
     obj: ObjId
@@ -536,16 +530,9 @@
     obj: ObjId
     shape: ShapeField
 
-- name: GuardGroupHasUnanalyzedNewScript
-  shared: true
-  transpile: false
-  cost_estimate: 1
-  args:
-    group: GroupField
-
 - name: GuardIndexIsNonNegative
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 1
   args:
     index: Int32Id
@@ -560,7 +547,7 @@
 
 - name: GuardIndexIsValidUpdateOrAdd
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 1
   args:
     obj: ObjId
@@ -568,7 +555,7 @@
 
 - name: GuardIndexGreaterThanDenseInitLength
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 1
   args:
     obj: ObjId
@@ -845,8 +832,6 @@
     obj: ObjId
     offset: RawInt32Field
     rhs: ValId
-    changeGroup: BoolImm
-    newGroup: GroupField
     newShape: ShapeField
 
 - name: AddAndStoreDynamicSlot
@@ -857,8 +842,6 @@
     obj: ObjId
     offset: RawInt32Field
     rhs: ValId
-    changeGroup: BoolImm
-    newGroup: GroupField
     newShape: ShapeField
 
 - name: AllocateAndStoreDynamicSlot
@@ -869,8 +852,6 @@
     obj: ObjId
     offset: RawInt32Field
     rhs: ValId
-    changeGroup: BoolImm
-    newGroup: GroupField
     newShape: ShapeField
     numNewSlots: RawInt32Field
 
@@ -1495,7 +1476,7 @@
 
 - name: CallAddOrUpdateSparseElementHelper
   shared: false
-  transpile: false
+  transpile: true
   cost_estimate: 5
   args:
     obj: ObjId
@@ -1548,6 +1529,14 @@
     funcExport: RawPointerField
     instance: ObjectField
 
+- name: GuardWasmArg
+  shared: true
+  transpile: true
+  cost_estimate: 2
+  args:
+    arg: ValId
+    type: WasmValTypeImm
+
 - name: CallNativeFunction
   shared: false
   transpile: true
@@ -1654,7 +1643,7 @@
 
 - name: CallGetSparseElementResult
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 5
   args:
     obj: ObjId
@@ -1678,7 +1667,7 @@
 
 - name: LoadDenseElementHoleExistsResult
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 2
   args:
     obj: ObjId
@@ -1951,7 +1940,7 @@
 
 - name: CallObjectHasSparseElementResult
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 4
   args:
     obj: ObjId
@@ -1959,7 +1948,7 @@
 
 - name: CallNativeGetElementResult
   shared: true
-  transpile: false
+  transpile: true
   cost_estimate: 5
   args:
     obj: ObjId
diff -Nru firefox-84.0.2+build1/js/src/jit/CacheIRSpewer.cpp firefox-85.0+build1/js/src/jit/CacheIRSpewer.cpp
--- firefox-84.0.2+build1/js/src/jit/CacheIRSpewer.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CacheIRSpewer.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -113,6 +113,9 @@
   void spewGuardClassKindImm(const char* name, GuardClassKind kind) {
     out_.printf("%s GuardClassKind(%u)", name, unsigned(kind));
   }
+  void spewWasmValTypeImm(const char* name, wasm::ValType::Kind kind) {
+    out_.printf("%s WasmValTypeKind(%u)", name, unsigned(kind));
+  }
 
  public:
   CacheIROpsJitSpewer(GenericPrinter& out, const char* prefix)
@@ -248,6 +251,9 @@
   void spewGuardClassKindImm(const char* name, GuardClassKind kind) {
     spewArgImpl(name, "Imm", unsigned(kind));
   }
+  void spewWasmValTypeImm(const char* name, wasm::ValType::Kind kind) {
+    spewArgImpl(name, "Imm", unsigned(kind));
+  }
 
  public:
   explicit CacheIROpsJSONSpewer(JSONPrinter& j) : j_(j) {}
@@ -424,8 +430,6 @@
                      nobj->getDenseInitializedLength());
           j.property("denseCapacity", nobj->getDenseCapacity());
           j.property("denseElementsAreSealed", nobj->denseElementsAreSealed());
-          j.property("denseElementsAreCopyOnWrite",
-                     nobj->denseElementsAreCopyOnWrite());
           j.property("denseElementsAreFrozen", nobj->denseElementsAreFrozen());
         }
         j.endObject();
diff -Nru firefox-84.0.2+build1/js/src/jit/CodeGenerator.cpp firefox-85.0+build1/js/src/jit/CodeGenerator.cpp
--- firefox-84.0.2+build1/js/src/jit/CodeGenerator.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CodeGenerator.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -35,6 +35,7 @@
 #include "jit/BaselineCodeGen.h"
 #include "jit/CompileInfo.h"
 #include "jit/InlineScriptTree.h"
+#include "jit/Invalidation.h"
 #include "jit/IonIC.h"
 #include "jit/IonOptimizationLevels.h"
 #include "jit/IonScript.h"
@@ -43,6 +44,7 @@
 #include "jit/JitRealm.h"
 #include "jit/JitRuntime.h"
 #include "jit/JitSpewer.h"
+#include "jit/JitZone.h"
 #include "jit/Linker.h"
 #include "jit/Lowering.h"
 #include "jit/MIRGenerator.h"
@@ -70,6 +72,7 @@
 #include "vm/PlainObject.h"  // js::PlainObject
 #include "vm/RegExpObject.h"
 #include "vm/RegExpStatics.h"
+#include "vm/StringObject.h"
 #include "vm/StringType.h"
 #include "vm/TraceLogging.h"
 #include "vm/TypedArrayObject.h"
@@ -589,12 +592,8 @@
 
   DataPtr<IonIC> cache(this, cacheIndex);
   MInstruction* mir = lir->mirRaw()->toInstruction();
-  if (mir->resumePoint()) {
-    cache->setScriptedLocation(mir->block()->info().script(),
-                               mir->resumePoint()->pc());
-  } else {
-    cache->setIdempotent();
-  }
+  cache->setScriptedLocation(mir->block()->info().script(),
+                             mir->resumePoint()->pc());
 
   Register temp = cache->scratchRegisterForEntryJump();
   icInfo_.back().icOffsetForJump = masm.movWithPatch(ImmWord(-1), temp);
@@ -1406,7 +1405,8 @@
                  int(mightBeString) + int(mightBeSymbol) + int(mightBeDouble) +
                  int(mightBeBigInt);
 
-  MOZ_ASSERT_IF(!valueMIR->emptyResultTypeSet(), tagCount > 0);
+  // TODO(no-TI): clean up this function.
+  MOZ_ASSERT(tagCount > 0);
 
   // If we know we're null or undefined, we're definitely falsy, no
   // need to even check the tag.
@@ -1621,113 +1621,6 @@
                   falsy, ool, input);
 }
 
-void CodeGenerator::visitFunctionDispatch(LFunctionDispatch* lir) {
-  MFunctionDispatch* mir = lir->mir();
-  Register input = ToRegister(lir->input());
-
-  // Compare function pointers
-  for (size_t i = 0; i < mir->numCases(); i++) {
-    MOZ_ASSERT(i < mir->numCases());
-    LBlock* target = skipTrivialBlocks(mir->getCaseBlock(i))->lir();
-    if (ObjectGroup* funcGroup = mir->getCaseObjectGroup(i)) {
-      masm.branchTestObjGroupUnsafe(Assembler::Equal, input, funcGroup,
-                                    target->label());
-    } else {
-      JSFunction* func = mir->getCase(i);
-      masm.branchPtr(Assembler::Equal, input, ImmGCPtr(func), target->label());
-    }
-  }
-
-  // If at the end, and we have a fallback, we can jump to the fallback block.
-  if (mir->hasFallback()) {
-    masm.jump(skipTrivialBlocks(mir->getFallback())->lir()->label());
-    return;
-  }
-
-  // Otherwise, crash.
-  masm.assumeUnreachable("Did not match input function!");
-}
-
-void CodeGenerator::visitObjectGroupDispatch(LObjectGroupDispatch* lir) {
-  MObjectGroupDispatch* mir = lir->mir();
-  Register input = ToRegister(lir->input());
-  Register temp = ToRegister(lir->temp());
-
-  // Load the incoming ObjectGroup in temp.
-  masm.loadObjGroupUnsafe(input, temp);
-
-  // Compare ObjectGroups.
-  MacroAssembler::BranchGCPtr lastBranch;
-  LBlock* lastBlock = nullptr;
-  InlinePropertyTable* propTable = mir->propTable();
-  for (size_t i = 0; i < mir->numCases(); i++) {
-    JSFunction* func = mir->getCase(i);
-    LBlock* target = skipTrivialBlocks(mir->getCaseBlock(i))->lir();
-
-    DebugOnly<bool> found = false;
-    // Find the function in the prop table.
-    for (size_t j = 0; j < propTable->numEntries(); j++) {
-      if (propTable->getFunction(j) != func) {
-        continue;
-      }
-
-      // Emit the previous prop's jump.
-      if (lastBranch.isInitialized()) {
-        lastBranch.emit(masm);
-      }
-
-      // Setup jump for next iteration.
-      ObjectGroup* group = propTable->getObjectGroup(j);
-      lastBranch = MacroAssembler::BranchGCPtr(
-          Assembler::Equal, temp, ImmGCPtr(group), target->label());
-      lastBlock = target;
-      found = true;
-    }
-    MOZ_ASSERT(found);
-  }
-
-  // At this point the final case branch hasn't been emitted.
-
-  // Jump to fallback block if we have an unknown ObjectGroup. If there's no
-  // fallback block, we should have handled all cases.
-  if (!mir->hasFallback()) {
-    MOZ_ASSERT(lastBranch.isInitialized());
-
-    Label ok;
-    // Change the target of the branch to OK.
-    lastBranch.relink(&ok);
-    lastBranch.emit(masm);
-    masm.assumeUnreachable("Unexpected ObjectGroup");
-    masm.bind(&ok);
-
-    // If we don't naturally fall through to the target,
-    // then jump to the target.
-    if (!isNextBlock(lastBlock)) {
-      masm.jump(lastBlock->label());
-    }
-    return;
-  }
-
-  LBlock* fallback = skipTrivialBlocks(mir->getFallback())->lir();
-  // This should only happen if we have zero cases. We're done then.
-  if (!lastBranch.isInitialized()) {
-    if (!isNextBlock(fallback)) {
-      masm.jump(fallback->label());
-    }
-    return;
-  }
-
-  // If we don't match the last object group and we have a fallback,
-  // we should jump to it.
-  lastBranch.invertCondition();
-  lastBranch.relink(fallback->label());
-  lastBranch.emit(masm);
-
-  if (!isNextBlock(lastBlock)) {
-    masm.jump(lastBlock->label());
-  }
-}
-
 void CodeGenerator::visitBooleanToString(LBooleanToString* lir) {
   Register input = ToRegister(lir->input());
   Register output = ToRegister(lir->output());
@@ -2457,9 +2350,9 @@
   auto newGCString = [&](FallbackKind kind) {
     uint32_t flags = kind == FallbackKind::InlineString
                          ? JSString::INIT_THIN_INLINE_FLAGS
-                         : kind == FallbackKind::FatInlineString
-                               ? JSString::INIT_FAT_INLINE_FLAGS
-                               : JSString::INIT_DEPENDENT_FLAGS;
+                     : kind == FallbackKind::FatInlineString
+                         ? JSString::INIT_FAT_INLINE_FLAGS
+                         : JSString::INIT_DEPENDENT_FLAGS;
     if (encoding_ == CharEncoding::Latin1) {
       flags |= JSString::LATIN1_CHARS_BIT;
     }
@@ -3706,8 +3599,6 @@
       lir, ArgList(ImmGCPtr(info.funUnsafe()), envChain, newTarget),
       StoreRegisterTo(output));
 
-  MOZ_ASSERT(!info.useSingletonForClone);
-
   if (info.singletonType) {
     // If the function has a singleton type, this instruction will only be
     // executed once so we don't bother inlining it.
@@ -3899,8 +3790,6 @@
   masm.andPtr(Imm32(0x1), output);
 }
 
-void CodeGenerator::visitStart(LStart* lir) {}
-
 void CodeGenerator::visitReturn(LReturn* lir) {
 #if defined(JS_NUNBOX32)
   DebugOnly<LAllocation*> type = lir->getOperand(TYPE_INDEX);
@@ -4335,64 +4224,6 @@
   masm.loadPtr(elements, ToRegister(lir->output()));
 }
 
-void CodeGenerator::visitConvertElementsToDoubles(
-    LConvertElementsToDoubles* lir) {
-  Register elements = ToRegister(lir->elements());
-
-  using Fn = void (*)(JSContext*, uintptr_t);
-  OutOfLineCode* ool = oolCallVM<Fn, ObjectElements::ConvertElementsToDoubles>(
-      lir, ArgList(elements), StoreNothing());
-
-  Address convertedAddress(elements, ObjectElements::offsetOfFlags());
-  Imm32 bit(ObjectElements::CONVERT_DOUBLE_ELEMENTS);
-  masm.branchTest32(Assembler::Zero, convertedAddress, bit, ool->entry());
-  masm.bind(ool->rejoin());
-}
-
-void CodeGenerator::visitMaybeToDoubleElement(LMaybeToDoubleElement* lir) {
-  Register elements = ToRegister(lir->elements());
-  Register value = ToRegister(lir->value());
-  ValueOperand out = ToOutValue(lir);
-
-  FloatRegister temp = ToFloatRegister(lir->tempFloat());
-  Label convert, done;
-
-  // If the CONVERT_DOUBLE_ELEMENTS flag is set, convert the int32
-  // value to double. Else, just box it.
-  masm.branchTest32(Assembler::NonZero,
-                    Address(elements, ObjectElements::offsetOfFlags()),
-                    Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS), &convert);
-
-  masm.tagValue(JSVAL_TYPE_INT32, value, out);
-  masm.jump(&done);
-
-  masm.bind(&convert);
-  masm.convertInt32ToDouble(value, temp);
-  masm.boxDouble(temp, out, temp);
-
-  masm.bind(&done);
-}
-
-void CodeGenerator::visitMaybeCopyElementsForWrite(
-    LMaybeCopyElementsForWrite* lir) {
-  Register object = ToRegister(lir->object());
-  Register temp = ToRegister(lir->temp());
-
-  using Fn = bool (*)(JSContext*, NativeObject*);
-  OutOfLineCode* ool = oolCallVM<Fn, NativeObject::CopyElementsForWrite>(
-      lir, ArgList(object), StoreNothing());
-
-  if (lir->mir()->checkNative()) {
-    masm.branchIfNonNativeObj(object, temp, ool->rejoin());
-  }
-
-  masm.loadPtr(Address(object, NativeObject::offsetOfElements()), temp);
-  masm.branchTest32(Assembler::NonZero,
-                    Address(temp, ObjectElements::offsetOfFlags()),
-                    Imm32(ObjectElements::COPY_ON_WRITE), ool->entry());
-  masm.bind(ool->rejoin());
-}
-
 void CodeGenerator::visitFunctionEnvironment(LFunctionEnvironment* lir) {
   Address environment(ToRegister(lir->function()),
                       JSFunction::offsetOfEnvironment());
@@ -4489,6 +4320,15 @@
   bailoutFrom(&bail, guard->snapshot());
 }
 
+void CodeGenerator::visitGuardIsNativeObject(LGuardIsNativeObject* guard) {
+  Register obj = ToRegister(guard->input());
+  Register temp = ToRegister(guard->temp());
+
+  Label bail;
+  masm.branchIfNonNativeObj(obj, temp, &bail);
+  bailoutFrom(&bail, guard->snapshot());
+}
+
 void CodeGenerator::visitGuardIsProxy(LGuardIsProxy* guard) {
   Register obj = ToRegister(guard->input());
   Register temp = ToRegister(guard->temp());
@@ -5110,51 +4950,6 @@
   emitCreateBigInt(lir, Scalar::BigInt64, input, output, temp);
 }
 
-void CodeGenerator::visitTypeBarrierV(LTypeBarrierV* lir) {
-  ValueOperand operand = ToValue(lir, LTypeBarrierV::Input);
-  Register unboxScratch = ToTempRegisterOrInvalid(lir->unboxTemp());
-  Register objScratch = ToTempRegisterOrInvalid(lir->objTemp());
-
-  // guardObjectType may zero the payload/Value register on speculative paths
-  // (we should have a defineReuseInput allocation in this case).
-  Register spectreRegToZero = operand.payloadOrValueReg();
-
-  Label miss;
-  masm.guardTypeSet(operand, lir->mir()->resultTypeSet(),
-                    lir->mir()->barrierKind(), unboxScratch, objScratch,
-                    spectreRegToZero, &miss);
-  bailoutFrom(&miss, lir->snapshot());
-}
-
-void CodeGenerator::visitTypeBarrierO(LTypeBarrierO* lir) {
-  Register obj = ToRegister(lir->object());
-  Register scratch = ToTempRegisterOrInvalid(lir->temp());
-  Label miss, ok;
-
-  if (lir->mir()->type() == MIRType::ObjectOrNull) {
-    masm.comment("Object or Null");
-    Label* nullTarget =
-        lir->mir()->resultTypeSet()->mightBeMIRType(MIRType::Null) ? &ok
-                                                                   : &miss;
-    masm.branchTestPtr(Assembler::Zero, obj, obj, nullTarget);
-  } else {
-    MOZ_ASSERT(lir->mir()->type() == MIRType::Object);
-    MOZ_ASSERT(lir->mir()->barrierKind() != BarrierKind::TypeTagOnly);
-  }
-
-  if (lir->mir()->barrierKind() != BarrierKind::TypeTagOnly) {
-    masm.comment("Type tag only");
-    // guardObjectType may zero the object register on speculative paths
-    // (we should have a defineReuseInput allocation in this case).
-    Register spectreRegToZero = obj;
-    masm.guardObjectType(obj, lir->mir()->resultTypeSet(), scratch,
-                         spectreRegToZero, &miss);
-  }
-
-  bailoutFrom(&miss, lir->snapshot());
-  masm.bind(&ok);
-}
-
 void CodeGenerator::visitGuardValue(LGuardValue* lir) {
   ValueOperand input = ToValue(lir, LGuardValue::Input);
   Value expected = lir->mir()->expected();
@@ -5892,16 +5687,10 @@
 #endif
   }
 
-  // Load jitCodeRaw for callee if exists. See visitCallKnown.
-  if (call->mir()->needsArgCheck()) {
-    masm.branchIfFunctionHasNoJitEntry(calleereg, call->mir()->isConstructing(),
-                                       &invoke);
-    masm.loadJitCodeRaw(calleereg, objreg);
-  } else {
-    // NOTE: We checked that canonical function script had a valid JitScript.
-    // This will not be tossed without all Ion code being tossed first.
-    masm.loadJitCodeNoArgCheck(calleereg, objreg);
-  }
+  // Load jitCodeRaw for callee if it exists.
+  masm.branchIfFunctionHasNoJitEntry(calleereg, call->mir()->isConstructing(),
+                                     &invoke);
+  masm.loadJitCodeRaw(calleereg, objreg);
 
   // Target may be a different realm even if same compartment.
   if (call->mir()->maybeCrossRealm()) {
@@ -6009,13 +5798,7 @@
     masm.switchToObjectRealm(calleereg, objreg);
   }
 
-  if (call->mir()->needsArgCheck()) {
-    masm.loadJitCodeRaw(calleereg, objreg);
-  } else {
-    // NOTE: We checked that canonical function script had a valid JitScript.
-    // This will not be tossed without all Ion code being tossed first.
-    masm.loadJitCodeNoArgCheck(calleereg, objreg);
-  }
+  masm.loadJitCodeRaw(calleereg, objreg);
 
   // Nestle the StackPointer up to the argument vector.
   masm.freeStack(unusedStack);
@@ -6647,89 +6430,6 @@
   callVM<Fn, DirectEvalStringFromIon>(lir);
 }
 
-void CodeGenerator::generateArgumentsChecks(bool assert) {
-  // This function can be used the normal way to check the argument types,
-  // before entering the function and bailout when arguments don't match.
-  // For debug purpose, this is can also be used to force/check that the
-  // arguments are correct. Upon fail it will hit a breakpoint.
-
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-
-  MIRGraph& mir = gen->graph();
-  MResumePoint* rp = mir.entryResumePoint();
-
-  // No registers are allocated yet, so it's safe to grab anything.
-  AllocatableGeneralRegisterSet temps(GeneralRegisterSet::All());
-  Register temp1 = temps.takeAny();
-  Register temp2 = temps.takeAny();
-
-  masm.debugAssertContextRealm(gen->realm->realmPtr(), temp1);
-
-  const CompileInfo& info = gen->outerInfo();
-
-  Label miss;
-  for (uint32_t i = info.startArgSlot(); i < info.endArgSlot(); i++) {
-    // All initial parameters are guaranteed to be MParameters.
-    MParameter* param = rp->getOperand(i)->toParameter();
-    const TypeSet* types = param->resultTypeSet();
-    if (!types || types->unknown()) {
-      continue;
-    }
-
-    // Calculate the offset on the stack of the argument.
-    // (i - info.startArgSlot())    - Compute index of arg within arg vector.
-    // ... * sizeof(Value)          - Scale by value size.
-    // ArgToStackOffset(...)        - Compute displacement within arg vector.
-    int32_t offset =
-        ArgToStackOffset((i - info.startArgSlot()) * sizeof(Value));
-    Address argAddr(masm.getStackPointer(), offset);
-
-    // guardObjectType will zero the stack pointer register on speculative
-    // paths.
-    Register spectreRegToZero = AsRegister(masm.getStackPointer());
-    masm.guardTypeSet(argAddr, types, BarrierKind::TypeSet, temp1, temp2,
-                      spectreRegToZero, &miss);
-  }
-
-  if (miss.used()) {
-    if (assert) {
-#ifdef DEBUG
-      Label success;
-      masm.jump(&success);
-      masm.bind(&miss);
-
-      // Check for cases where the type set guard might have missed due to
-      // changing object groups.
-      for (uint32_t i = info.startArgSlot(); i < info.endArgSlot(); i++) {
-        MParameter* param = rp->getOperand(i)->toParameter();
-        const TemporaryTypeSet* types = param->resultTypeSet();
-        if (!types || types->unknown()) {
-          continue;
-        }
-
-        Label skip;
-        Address addr(
-            masm.getStackPointer(),
-            ArgToStackOffset((i - info.startArgSlot()) * sizeof(Value)));
-        masm.branchTestObject(Assembler::NotEqual, addr, &skip);
-        Register obj = masm.extractObject(addr, temp1);
-        masm.guardTypeSetMightBeIncomplete(types, obj, temp1, &success);
-        masm.bind(&skip);
-      }
-
-      masm.assumeUnreachable("Argument check fail.");
-      masm.bind(&success);
-#else
-      MOZ_CRASH("Shouldn't get here in opt builds");
-#endif
-    } else {
-      bailoutFrom(&miss, graph.entrySnapshot());
-    }
-  }
-}
-
 // Out-of-line path to report over-recursed error and fail.
 class CheckOverRecursedFailure : public OutOfLineCodeBase<CodeGenerator> {
   LInstruction* lir_;
@@ -6772,46 +6472,6 @@
   masm.bind(ool->rejoin());
 }
 
-void CodeGenerator::visitDefVar(LDefVar* lir) {
-  Register envChain = ToRegister(lir->environmentChain());
-
-  JSScript* script = current->mir()->info().script();
-  jsbytecode* pc = lir->mir()->resumePoint()->pc();
-
-  pushArg(ImmPtr(pc));        // jsbytecode*
-  pushArg(ImmGCPtr(script));  // JSScript*
-  pushArg(envChain);          // JSObject*
-
-  using Fn = bool (*)(JSContext*, HandleObject, HandleScript, jsbytecode*);
-  callVM<Fn, DefVarOperation>(lir);
-}
-
-void CodeGenerator::visitDefLexical(LDefLexical* lir) {
-  Register envChain = ToRegister(lir->environmentChain());
-
-  JSScript* script = current->mir()->info().script();
-  jsbytecode* pc = lir->mir()->resumePoint()->pc();
-
-  pushArg(ImmPtr(pc));        // jsbytecode*
-  pushArg(ImmGCPtr(script));  // JSScript*
-  pushArg(envChain);          // JSObject*
-
-  using Fn = bool (*)(JSContext*, HandleObject, HandleScript, jsbytecode*);
-  callVM<Fn, DefLexicalOperation>(lir);
-}
-
-void CodeGenerator::visitDefFun(LDefFun* lir) {
-  Register envChain = ToRegister(lir->environmentChain());
-
-  Register fun = ToRegister(lir->fun());
-  pushArg(fun);
-  pushArg(envChain);
-  pushArg(ImmGCPtr(current->mir()->info().script()));
-
-  using Fn = bool (*)(JSContext*, HandleScript, HandleObject, HandleFunction);
-  callVM<Fn, DefFunOperation>(lir);
-}
-
 void CodeGenerator::visitCheckOverRecursedFailure(
     CheckOverRecursedFailure* ool) {
   // The OOL path is hit if the recursion depth has been exceeded.
@@ -6970,37 +6630,6 @@
   Label done;
   branchIfInvalidated(temp, &done);
 
-  const TemporaryTypeSet* typeset = mir->resultTypeSet();
-  if ((type == MIRType::Object || type == MIRType::ObjectOrNull) && typeset &&
-      !typeset->unknownObject()) {
-    // We have a result TypeSet, assert this object is in it.
-    Label miss, ok;
-    if (type == MIRType::ObjectOrNull) {
-      masm.branchPtr(Assembler::Equal, input, ImmWord(0), &ok);
-    }
-    if (typeset->getObjectCount() > 0) {
-      masm.guardObjectType(input, typeset, temp, input, &miss);
-    } else {
-      masm.jump(&miss);
-    }
-    masm.jump(&ok);
-
-    masm.bind(&miss);
-    masm.guardTypeSetMightBeIncomplete(typeset, input, temp, &ok);
-
-    switch (mir->op()) {
-#  define MIR_OP(op)                                                \
-    case MDefinition::Opcode::op:                                   \
-      masm.assumeUnreachable(                                       \
-          #op " instruction returned object with unexpected type"); \
-      break;
-      MIR_OPCODE_LIST(MIR_OP)
-#  undef MIR_OP
-    }
-
-    masm.bind(&ok);
-  }
-
 #  ifndef JS_SIMULATOR
   // Check that we have a valid GC pointer.
   // Disable for wasm because we don't have a context on wasm compilation
@@ -7067,37 +6696,6 @@
   Label done;
   branchIfInvalidated(temp1, &done);
 
-  const TemporaryTypeSet* typeset = mir->resultTypeSet();
-  if (typeset && !typeset->unknown()) {
-    // We have a result TypeSet, assert this value is in it.
-    Label miss, ok;
-    masm.guardTypeSet(input, typeset, BarrierKind::TypeSet, temp1, temp2,
-                      input.payloadOrValueReg(), &miss);
-    masm.jump(&ok);
-
-    masm.bind(&miss);
-
-    // Check for cases where the type set guard might have missed due to
-    // changing object groups.
-    Label realMiss;
-    masm.branchTestObject(Assembler::NotEqual, input, &realMiss);
-    Register payload = masm.extractObject(input, temp1);
-    masm.guardTypeSetMightBeIncomplete(typeset, payload, temp1, &ok);
-    masm.bind(&realMiss);
-
-    switch (mir->op()) {
-#  define MIR_OP(op)                                               \
-    case MDefinition::Opcode::op:                                  \
-      masm.assumeUnreachable(                                      \
-          #op " instruction returned value with unexpected type"); \
-      break;
-      MIR_OPCODE_LIST(MIR_OP)
-#  undef MIR_OP
-    }
-
-    masm.bind(&ok);
-  }
-
   // Check that we have a valid GC pointer.
   if (JitOptions.fullDebugChecks) {
     saveVolatile();
@@ -7181,9 +6779,6 @@
   if (!lir->snapshot()) {
     return;
   }
-  if (lir->isStart()) {
-    return;
-  }
   if (lir->isOsiPoint()) {
     return;
   }
@@ -7260,6 +6855,10 @@
             current->mir()->isLoopHeader() ? " (loop header)" : "");
 #endif
 
+    if (current->mir()->isLoopHeader() && gen->compilingWasm()) {
+      masm.nopAlign(CodeAlignment);
+    }
+
     masm.bind(current->label());
 
     mozilla::Maybe<ScriptCountBlockState> blockCounts;
@@ -7276,10 +6875,6 @@
     }
 #endif
 
-    if (current->mir()->isLoopHeader() && gen->compilingWasm()) {
-      masm.nopAlign(CodeAlignment);
-    }
-
     for (LInstructionIterator iter = current->begin(); iter != current->end();
          iter++) {
       if (!alloc().ensureBallast()) {
@@ -7375,11 +6970,10 @@
   JSObject* templateObject = lir->mir()->templateObject();
 
   if (templateObject) {
-    pushArg(Imm32(lir->mir()->convertDoubleElements()));
     pushArg(ImmGCPtr(templateObject->group()));
     pushArg(Imm32(lir->mir()->length()));
 
-    using Fn = ArrayObject* (*)(JSContext*, uint32_t, HandleObjectGroup, bool);
+    using Fn = ArrayObject* (*)(JSContext*, uint32_t, HandleObjectGroup);
     callVM<Fn, NewArrayWithGroup>(lir);
   } else {
     pushArg(Imm32(GenericObject));
@@ -7460,9 +7054,6 @@
   addOutOfLineCode(ool, lir->mir());
 
   TemplateObject templateObject(lir->mir()->templateObject());
-  if (lir->mir()->convertDoubleElements()) {
-    templateObject.setConvertDoubleElements();
-  }
 #ifdef DEBUG
   size_t numInlineElements = gc::GetGCKindSlots(templateObject.getAllocKind()) -
                              ObjectElements::VALUES_PER_HEADER;
@@ -7480,24 +7071,6 @@
   masm.jump(ool->rejoin());
 }
 
-void CodeGenerator::visitNewArrayCopyOnWrite(LNewArrayCopyOnWrite* lir) {
-  Register objReg = ToRegister(lir->output());
-  Register tempReg = ToRegister(lir->temp());
-  ArrayObject* templateObject = lir->mir()->templateObject();
-  gc::InitialHeap initialHeap = lir->mir()->initialHeap();
-
-  // If we have a template object, we can inline call object creation.
-  using Fn = ArrayObject* (*)(JSContext*, HandleArrayObject);
-  OutOfLineCode* ool = oolCallVM<Fn, js::NewDenseCopyOnWriteArray>(
-      lir, ArgList(ImmGCPtr(templateObject)), StoreRegisterTo(objReg));
-
-  TemplateObject templateObj(templateObject);
-  templateObj.setDenseElementsAreCopyOnWrite();
-  masm.createGCObject(objReg, tempReg, templateObj, initialHeap, ool->entry());
-
-  masm.bind(ool->rejoin());
-}
-
 void CodeGenerator::visitNewArrayDynamicLength(LNewArrayDynamicLength* lir) {
   Register lengthReg = ToRegister(lir->length());
   Register objReg = ToRegister(lir->output());
@@ -7896,19 +7469,6 @@
   masm.bind(ool->rejoin());
 }
 
-void CodeGenerator::visitInitElem(LInitElem* lir) {
-  Register objReg = ToRegister(lir->getObject());
-
-  pushArg(ToValue(lir, LInitElem::ValueIndex));
-  pushArg(ToValue(lir, LInitElem::IdIndex));
-  pushArg(objReg);
-  pushArg(ImmPtr(lir->mir()->resumePoint()->pc()));
-
-  using Fn = bool (*)(JSContext * cx, jsbytecode * pc, HandleObject obj,
-                      HandleValue id, HandleValue value);
-  callVM<Fn, InitElemOperation>(lir);
-}
-
 void CodeGenerator::visitInitElemGetterSetter(LInitElemGetterSetter* lir) {
   Register obj = ToRegister(lir->object());
   Register value = ToRegister(lir->value());
@@ -10807,136 +10367,21 @@
   masm.jump(ool->rejoin());
 }
 
-void CodeGenerator::emitArrayPopShift(LInstruction* lir,
-                                      const MArrayPopShift* mir, Register obj,
-                                      Register elementsTemp,
-                                      Register lengthTemp,
-                                      TypedOrValueRegister out) {
-  OutOfLineCode* ool;
-
-  using Fn = bool (*)(JSContext*, HandleObject, MutableHandleValue);
-  if (mir->mode() == MArrayPopShift::Pop) {
-    ool =
-        oolCallVM<Fn, jit::ArrayPopDense>(lir, ArgList(obj), StoreValueTo(out));
-  } else {
-    MOZ_ASSERT(mir->mode() == MArrayPopShift::Shift);
-    ool = oolCallVM<Fn, jit::ArrayShiftDense>(lir, ArgList(obj),
-                                              StoreValueTo(out));
-  }
-
-  // VM call if a write barrier is necessary.
-  masm.branchTestNeedsIncrementalBarrier(Assembler::NonZero, ool->entry());
-
-  // Load elements and initializedLength, and VM call if
-  // length != initializedLength.
-  masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), elementsTemp);
-  masm.load32(
-      Address(elementsTemp, ObjectElements::offsetOfInitializedLength()),
-      lengthTemp);
-
-  Address lengthAddr(elementsTemp, ObjectElements::offsetOfLength());
-  masm.branch32(Assembler::NotEqual, lengthAddr, lengthTemp, ool->entry());
-
-  // Test for length != 0. On zero length either take a VM call or generate
-  // an undefined value, depending on whether the call is known to produce
-  // undefined.
-  Label done;
-  if (mir->maybeUndefined()) {
-    Label notEmpty;
-    masm.branchTest32(Assembler::NonZero, lengthTemp, lengthTemp, &notEmpty);
-
-    // According to the spec we need to set the length 0 (which is already 0).
-    // This is observable when the array length is made non-writable.
-    // Handle this case in the OOL.
-    Address elementFlags(elementsTemp, ObjectElements::offsetOfFlags());
-    Imm32 bit(ObjectElements::NONWRITABLE_ARRAY_LENGTH);
-    masm.branchTest32(Assembler::NonZero, elementFlags, bit, ool->entry());
-
-    masm.moveValue(UndefinedValue(), out.valueReg());
-    masm.jump(&done);
-    masm.bind(&notEmpty);
-  } else {
-    masm.branchTest32(Assembler::Zero, lengthTemp, lengthTemp, ool->entry());
-  }
-
-  masm.sub32(Imm32(1), lengthTemp);
-
-  if (mir->mode() == MArrayPopShift::Pop) {
-    BaseObjectElementIndex addr(elementsTemp, lengthTemp);
-    masm.loadElementTypedOrValue(addr, out, mir->needsHoleCheck(),
-                                 ool->entry());
-  } else {
-    MOZ_ASSERT(mir->mode() == MArrayPopShift::Shift);
-    Address addr(elementsTemp, 0);
-    masm.loadElementTypedOrValue(addr, out, mir->needsHoleCheck(),
-                                 ool->entry());
-  }
-
-  // Handle the failure cases when the array length is non-writable or the
-  // object is sealed in the OOL path. (Unlike in the adding-an-element cases,
-  // we can't rely on the capacity <= length invariant for such arrays to
-  // avoid an explicit check.)
-  Address elementFlags(elementsTemp, ObjectElements::offsetOfFlags());
-  Imm32 bits(ObjectElements::NONWRITABLE_ARRAY_LENGTH | ObjectElements::SEALED);
-  masm.branchTest32(Assembler::NonZero, elementFlags, bits, ool->entry());
-
-  if (mir->mode() == MArrayPopShift::Shift) {
-    // Don't save the elementsTemp register.
-    LiveRegisterSet temps;
-    temps.add(elementsTemp);
-
-    saveVolatile(temps);
-    using Fn = void (*)(ArrayObject * arr);
-    masm.setupUnalignedABICall(elementsTemp);
-    masm.passABIArg(obj);
-    masm.callWithABI<Fn, js::ArrayShiftMoveElements>();
-    restoreVolatile(temps);
-
-    // Reload elementsTemp as ArrayShiftMoveElements may have moved it.
-    masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), elementsTemp);
-  }
-
-  // Now adjust length and initializedLength.
-  masm.store32(lengthTemp,
-               Address(elementsTemp, ObjectElements::offsetOfLength()));
-  masm.store32(
-      lengthTemp,
-      Address(elementsTemp, ObjectElements::offsetOfInitializedLength()));
-
-  masm.bind(&done);
-  masm.bind(ool->rejoin());
-}
-
-void CodeGenerator::visitArrayPopShiftV(LArrayPopShiftV* lir) {
+void CodeGenerator::visitArrayPopShift(LArrayPopShift* lir) {
   Register obj = ToRegister(lir->object());
   Register temp1 = ToRegister(lir->temp0());
   Register temp2 = ToRegister(lir->temp1());
-  TypedOrValueRegister out(ToOutValue(lir));
+  ValueOperand out = ToOutValue(lir);
 
-  if (JitOptions.warpBuilder) {
-    Label bail;
-    if (lir->mir()->mode() == MArrayPopShift::Pop) {
-      masm.packedArrayPop(obj, out.valueReg(), temp1, temp2, &bail);
-    } else {
-      MOZ_ASSERT(lir->mir()->mode() == MArrayPopShift::Shift);
-      LiveRegisterSet volatileRegs = liveVolatileRegs(lir);
-      masm.packedArrayShift(obj, out.valueReg(), temp1, temp2, volatileRegs,
-                            &bail);
-    }
-    bailoutFrom(&bail, lir->snapshot());
+  Label bail;
+  if (lir->mir()->mode() == MArrayPopShift::Pop) {
+    masm.packedArrayPop(obj, out, temp1, temp2, &bail);
   } else {
-    emitArrayPopShift(lir, lir->mir(), obj, temp1, temp2, out);
+    MOZ_ASSERT(lir->mir()->mode() == MArrayPopShift::Shift);
+    LiveRegisterSet volatileRegs = liveVolatileRegs(lir);
+    masm.packedArrayShift(obj, out, temp1, temp2, volatileRegs, &bail);
   }
-}
-
-void CodeGenerator::visitArrayPopShiftT(LArrayPopShiftT* lir) {
-  Register obj = ToRegister(lir->object());
-  Register elements = ToRegister(lir->temp0());
-  Register length = ToRegister(lir->temp1());
-  TypedOrValueRegister out(lir->mir()->type(), ToAnyRegister(lir->output()));
-
-  MOZ_ASSERT(!JitOptions.warpBuilder);
-  emitArrayPopShift(lir, lir->mir(), obj, elements, length, out);
+  bailoutFrom(&bail, lir->snapshot());
 }
 
 void CodeGenerator::emitArrayPush(LInstruction* lir, Register obj,
@@ -10953,22 +10398,10 @@
 
   // TODO(post-Warp): reuse/share the CacheIR implementation when IonBuilder and
   // TI are gone (bug 1654180).
-  if (!IsTypeInferenceEnabled()) {
-    // Bailout if the incremented length does not fit in int32.
-    bailoutCmp32(Assembler::AboveOrEqual, length, Imm32(INT32_MAX),
-                 lir->snapshot());
-  }
 
-#ifdef DEBUG
-  // Assert that there are no copy-on-write elements.
-  Label success;
-  Address elementsFlags(elementsTemp, ObjectElements::offsetOfFlags());
-  masm.branchTest32(Assembler::Zero, elementsFlags,
-                    Imm32(ObjectElements::COPY_ON_WRITE), &success);
-  masm.assumeUnreachable(
-      "ArrayPush must not be used with copy-on-write elements");
-  masm.bind(&success);
-#endif
+  // Bailout if the incremented length does not fit in int32.
+  bailoutCmp32(Assembler::AboveOrEqual, length, Imm32(INT32_MAX),
+               lir->snapshot());
 
   // Guard length == initializedLength.
   Address initLength(elementsTemp, ObjectElements::offsetOfInitializedLength());
@@ -11038,9 +10471,6 @@
   masm.createGCObject(temp1, temp2, templateObject, lir->mir()->initialHeap(),
                       &fail);
 
-  // Fixup the group of the result in case it doesn't match the template object.
-  masm.copyObjGroupNoPreBarrier(object, temp1, temp2);
-
   masm.jump(&call);
   {
     masm.bind(&fail);
@@ -11388,7 +10818,7 @@
   return true;
 }
 
-bool CodeGenerator::generateWasm(wasm::FuncTypeIdDesc funcTypeId,
+bool CodeGenerator::generateWasm(wasm::TypeIdDesc funcTypeId,
                                  wasm::BytecodeOffset trapOffset,
                                  const wasm::ArgTypeVector& argTypes,
                                  const MachineState& trapExitLayout,
@@ -11516,37 +10946,10 @@
     return false;
   }
 
-  // Before generating any code, we generate type checks for all parameters.
-  // This comes before deoptTable_, because we can't use deopt tables without
-  // creating the actual frame.
-  generateArgumentsChecks();
-
   if (frameClass_ != FrameSizeClass::None()) {
     deoptTable_.emplace(gen->jitRuntime()->getBailoutTable(frameClass_));
   }
 
-  if (IsTypeInferenceEnabled()) {
-    // Skip over the alternative entry to IonScript code.
-    Label skipPrologue;
-    masm.jump(&skipPrologue);
-
-    // An alternative entry to the IonScript code, which doesn't test the
-    // arguments.
-    masm.flushBuffer();
-    setSkipArgCheckEntryOffset(masm.size());
-    masm.setFramePushed(0);
-    if (!generatePrologue()) {
-      return false;
-    }
-
-    masm.bind(&skipPrologue);
-  }
-
-#ifdef DEBUG
-  // Assert that the argument types are correct.
-  generateArgumentsChecks(/* assert = */ true);
-#endif
-
   // Reset native => bytecode map table with top-level script and startPc.
   if (!addNativeToBytecodeEntry(startSite)) {
     return false;
@@ -11593,13 +10996,15 @@
   return !masm.oom();
 }
 
-static bool AddInlinedCompilations(HandleScript script,
+static bool AddInlinedCompilations(JSContext* cx, HandleScript script,
                                    IonCompilationId compilationId,
                                    const WarpSnapshot* snapshot,
                                    bool* isValid) {
   MOZ_ASSERT(!*isValid);
   RecompileInfo recompileInfo(script, compilationId);
 
+  JitZone* jitZone = cx->zone()->jitZone();
+
   for (const auto* scriptSnapshot : snapshot->scripts()) {
     JSScript* inlinedScript = scriptSnapshot->script();
     if (inlinedScript == script) {
@@ -11617,9 +11022,7 @@
       return true;
     }
 
-    AutoSweepJitScript sweep(inlinedScript);
-    if (!inlinedScript->jitScript()->addInlinedCompilation(sweep,
-                                                           recompileInfo)) {
+    if (!jitZone->addInlinedCompilation(recompileInfo, inlinedScript)) {
       return false;
     }
   }
@@ -11628,8 +11031,7 @@
   return true;
 }
 
-bool CodeGenerator::link(JSContext* cx, CompilerConstraintList* constraints,
-                         const WarpSnapshot* snapshot) {
+bool CodeGenerator::link(JSContext* cx, const WarpSnapshot* snapshot) {
   // We cancel off-thread Ion compilations in a few places during GC, but if
   // this compilation was performed off-thread it will already have been
   // removed from the relevant lists by this point. Don't allow GC here.
@@ -11663,25 +11065,20 @@
 
   IonCompilationId compilationId =
       cx->runtime()->jitRuntime()->nextCompilationId();
-  cx->zone()->types.currentCompilationIdRef().emplace(compilationId);
+  JitZone* jitZone = cx->zone()->jitZone();
+  jitZone->currentCompilationIdRef().emplace(compilationId);
   auto resetCurrentId = mozilla::MakeScopeExit(
-      [cx] { cx->zone()->types.currentCompilationIdRef().reset(); });
+      [jitZone] { jitZone->currentCompilationIdRef().reset(); });
 
   // Record constraints. If an error occured, returns false and potentially
   // prevent future compilations. Otherwise, if an invalidation occured, then
   // skip the current compilation.
   bool isValid = false;
 
-  if (JitOptions.warpBuilder) {
-    // If an inlined script is invalidated (for example, by attaching
-    // a debugger), we must also invalidate the parent IonScript.
-    if (!AddInlinedCompilations(script, compilationId, snapshot, &isValid)) {
-      return false;
-    }
-  } else {
-    if (!FinishCompilation(cx, script, constraints, compilationId, &isValid)) {
-      return false;
-    }
+  // If an inlined script is invalidated (for example, by attaching
+  // a debugger), we must also invalidate the parent IonScript.
+  if (!AddInlinedCompilations(cx, script, compilationId, snapshot, &isValid)) {
+    return false;
   }
   if (!isValid) {
     return true;
@@ -11785,7 +11182,6 @@
   }
 
   ionScript->setMethod(code);
-  ionScript->setSkipArgCheckEntryOffset(getSkipArgCheckEntryOffset());
 
   // If the Gecko Profiler is enabled, mark IonScript as having been
   // instrumented accordingly.
@@ -11998,27 +11394,6 @@
   callVM<Fn, BindVarOperation>(lir);
 }
 
-void CodeGenerator::visitCallGetProperty(LCallGetProperty* lir) {
-  pushArg(ImmGCPtr(lir->mir()->name()));
-  pushArg(ToValue(lir, LCallGetProperty::Value));
-
-  using Fn =
-      bool (*)(JSContext*, HandleValue, HandlePropertyName, MutableHandleValue);
-  callVM<Fn, GetValueProperty>(lir);
-}
-
-void CodeGenerator::visitCallGetElement(LCallGetElement* lir) {
-  pushArg(ToValue(lir, LCallGetElement::RhsInput));
-  pushArg(ToValue(lir, LCallGetElement::LhsInput));
-
-  uint8_t op = *lir->mir()->resumePoint()->pc();
-  pushArg(Imm32(op));
-
-  using Fn =
-      bool (*)(JSContext*, JSOp, HandleValue, HandleValue, MutableHandleValue);
-  callVM<Fn, GetElementOperation>(lir);
-}
-
 void CodeGenerator::visitCallSetElement(LCallSetElement* lir) {
   Register obj = ToRegister(lir->getOperand(0));
   pushArg(Imm32(lir->mir()->strict()));
@@ -12032,21 +11407,6 @@
   callVM<Fn, js::SetObjectElementWithReceiver>(lir);
 }
 
-void CodeGenerator::visitCallInitElementArray(LCallInitElementArray* lir) {
-  pushArg(ToValue(lir, LCallInitElementArray::Value));
-  if (lir->index()->isConstant()) {
-    pushArg(Imm32(ToInt32(lir->index())));
-  } else {
-    pushArg(ToRegister(lir->index()));
-  }
-  pushArg(ToRegister(lir->object()));
-  pushArg(ImmPtr(lir->mir()->resumePoint()->pc()));
-
-  using Fn = bool (*)(JSContext*, jsbytecode*, HandleArrayObject, uint32_t,
-                      HandleValue);
-  callVM<Fn, js::InitElementArray>(lir);
-}
-
 void CodeGenerator::visitLoadFixedSlotV(LLoadFixedSlotV* ins) {
   const Register obj = ToRegister(ins->getOperand(0));
   size_t slot = ins->mir()->slot();
@@ -12266,10 +11626,11 @@
   addIC(ins, allocateIC(ic));
 }
 
-void CodeGenerator::addGetPropertyCache(
-    LInstruction* ins, LiveRegisterSet liveRegs, TypedOrValueRegister value,
-    const ConstantOrRegister& id, TypedOrValueRegister output,
-    Register maybeTemp, GetPropertyResultFlags resultFlags) {
+void CodeGenerator::addGetPropertyCache(LInstruction* ins,
+                                        LiveRegisterSet liveRegs,
+                                        TypedOrValueRegister value,
+                                        const ConstantOrRegister& id,
+                                        ValueOperand output) {
   CacheKind kind = CacheKind::GetElem;
   if (id.constant() && id.value().isString()) {
     JSString* idString = id.value().toString();
@@ -12278,15 +11639,16 @@
       kind = CacheKind::GetProp;
     }
   }
-  IonGetPropertyIC cache(kind, liveRegs, value, id, output, maybeTemp,
-                         resultFlags);
+  IonGetPropertyIC cache(kind, liveRegs, value, id, output);
   addIC(ins, allocateIC(cache));
 }
 
-void CodeGenerator::addSetPropertyCache(
-    LInstruction* ins, LiveRegisterSet liveRegs, Register objReg, Register temp,
-    const ConstantOrRegister& id, const ConstantOrRegister& value, bool strict,
-    bool needsPostBarrier, bool needsTypeBarrier, bool guardHoles) {
+void CodeGenerator::addSetPropertyCache(LInstruction* ins,
+                                        LiveRegisterSet liveRegs,
+                                        Register objReg, Register temp,
+                                        const ConstantOrRegister& id,
+                                        const ConstantOrRegister& value,
+                                        bool strict) {
   CacheKind kind = CacheKind::SetElem;
   if (id.constant() && id.value().isString()) {
     JSString* idString = id.value().toString();
@@ -12295,8 +11657,7 @@
       kind = CacheKind::SetProp;
     }
   }
-  IonSetPropertyIC cache(kind, liveRegs, objReg, temp, id, value, strict,
-                         needsPostBarrier, needsTypeBarrier, guardHoles);
+  IonSetPropertyIC cache(kind, liveRegs, objReg, temp, id, value, strict);
   addIC(ins, allocateIC(cache));
 }
 
@@ -12314,83 +11675,28 @@
   return TypedOrValueRegister(type, ToAnyRegister(value));
 }
 
-static GetPropertyResultFlags IonGetPropertyICFlags(
-    const MGetPropertyCache* mir) {
-  GetPropertyResultFlags flags = GetPropertyResultFlags::None;
-  if (mir->monitoredResult()) {
-    flags |= GetPropertyResultFlags::Monitored;
-  }
-
-  if (mir->type() == MIRType::Value) {
-    if (TemporaryTypeSet* types = mir->resultTypeSet()) {
-      if (types->hasType(TypeSet::UndefinedType())) {
-        flags |= GetPropertyResultFlags::AllowUndefined;
-      }
-      if (types->hasType(TypeSet::Int32Type())) {
-        flags |= GetPropertyResultFlags::AllowInt32;
-      }
-      if (types->hasType(TypeSet::DoubleType())) {
-        flags |= GetPropertyResultFlags::AllowDouble;
-      }
-    } else {
-      flags |= GetPropertyResultFlags::AllowUndefined |
-               GetPropertyResultFlags::AllowInt32 |
-               GetPropertyResultFlags::AllowDouble;
-    }
-  } else if (mir->type() == MIRType::Int32) {
-    flags |= GetPropertyResultFlags::AllowInt32;
-  } else if (mir->type() == MIRType::Double) {
-    flags |= GetPropertyResultFlags::AllowInt32 |
-             GetPropertyResultFlags::AllowDouble;
-  }
-
-  // If WarpBuilder is enabled the IC should support all possible results.
-  MOZ_ASSERT_IF(JitOptions.warpBuilder, flags == GetPropertyResultFlags::All);
-
-  return flags;
-}
-
-void CodeGenerator::visitGetPropertyCacheV(LGetPropertyCacheV* ins) {
+void CodeGenerator::visitGetPropertyCache(LGetPropertyCache* ins) {
   LiveRegisterSet liveRegs = ins->safepoint()->liveRegs();
   TypedOrValueRegister value =
-      toConstantOrRegister(ins, LGetPropertyCacheV::Value,
+      toConstantOrRegister(ins, LGetPropertyCache::Value,
                            ins->mir()->value()->type())
           .reg();
-  ConstantOrRegister id = toConstantOrRegister(ins, LGetPropertyCacheV::Id,
+  ConstantOrRegister id = toConstantOrRegister(ins, LGetPropertyCache::Id,
                                                ins->mir()->idval()->type());
-  TypedOrValueRegister output(ToOutValue(ins));
-  Register maybeTemp = ToTempRegisterOrInvalid(ins->temp());
-
-  addGetPropertyCache(ins, liveRegs, value, id, output, maybeTemp,
-                      IonGetPropertyICFlags(ins->mir()));
-}
-
-void CodeGenerator::visitGetPropertyCacheT(LGetPropertyCacheT* ins) {
-  LiveRegisterSet liveRegs = ins->safepoint()->liveRegs();
-  TypedOrValueRegister value =
-      toConstantOrRegister(ins, LGetPropertyCacheV::Value,
-                           ins->mir()->value()->type())
-          .reg();
-  ConstantOrRegister id = toConstantOrRegister(ins, LGetPropertyCacheT::Id,
-                                               ins->mir()->idval()->type());
-  TypedOrValueRegister output(ins->mir()->type(),
-                              ToAnyRegister(ins->getDef(0)));
-  Register maybeTemp = ToTempRegisterOrInvalid(ins->temp());
-
-  addGetPropertyCache(ins, liveRegs, value, id, output, maybeTemp,
-                      IonGetPropertyICFlags(ins->mir()));
+  ValueOperand output = ToOutValue(ins);
+  addGetPropertyCache(ins, liveRegs, value, id, output);
 }
 
-void CodeGenerator::visitGetPropSuperCacheV(LGetPropSuperCacheV* ins) {
+void CodeGenerator::visitGetPropSuperCache(LGetPropSuperCache* ins) {
   LiveRegisterSet liveRegs = ins->safepoint()->liveRegs();
   Register obj = ToRegister(ins->obj());
   TypedOrValueRegister receiver =
-      toConstantOrRegister(ins, LGetPropSuperCacheV::Receiver,
+      toConstantOrRegister(ins, LGetPropSuperCache::Receiver,
                            ins->mir()->receiver()->type())
           .reg();
-  ConstantOrRegister id = toConstantOrRegister(ins, LGetPropSuperCacheV::Id,
+  ConstantOrRegister id = toConstantOrRegister(ins, LGetPropSuperCache::Id,
                                                ins->mir()->idval()->type());
-  TypedOrValueRegister output(ToOutValue(ins));
+  ValueOperand output = ToOutValue(ins);
 
   CacheKind kind = CacheKind::GetElemSuper;
   if (id.constant() && id.value().isString()) {
@@ -12445,24 +11751,6 @@
   addIC(ins, allocateIC(cache));
 }
 
-void CodeGenerator::visitCallSetProperty(LCallSetProperty* ins) {
-  ConstantOrRegister value =
-      TypedOrValueRegister(ToValue(ins, LCallSetProperty::Value));
-
-  const Register objReg = ToRegister(ins->getOperand(0));
-
-  pushArg(ImmPtr(ins->mir()->resumePoint()->pc()));
-  pushArg(Imm32(ins->mir()->strict()));
-
-  pushArg(value);
-  pushArg(ImmGCPtr(ins->mir()->name()));
-  pushArg(objReg);
-
-  using Fn = bool (*)(JSContext*, HandleObject, HandlePropertyName,
-                      const HandleValue, bool, jsbytecode*);
-  callVM<Fn, jit::SetProperty>(ins);
-}
-
 void CodeGenerator::visitCallDeleteProperty(LCallDeleteProperty* lir) {
   pushArg(ImmGCPtr(lir->mir()->name()));
   pushArg(ToValue(lir, LCallDeleteProperty::Value));
@@ -12498,8 +11786,7 @@
                                                   ins->mir()->value()->type());
 
   addSetPropertyCache(ins, liveRegs, objReg, temp, id, value,
-                      ins->mir()->strict(), ins->mir()->needsPostBarrier(),
-                      ins->mir()->needsTypeBarrier(), ins->mir()->guardHoles());
+                      ins->mir()->strict());
 }
 
 void CodeGenerator::visitThrow(LThrow* lir) {
@@ -12546,7 +11833,8 @@
                       unsigned(testNull) + unsigned(testString) +
                       unsigned(testSymbol) + unsigned(testBigInt);
 
-  MOZ_ASSERT_IF(!input->emptyResultTypeSet(), numTests > 0);
+  // TODO(no-TI): clean this up.
+  MOZ_ASSERT(numTests > 0);
 
   OutOfLineTypeOfV* ool = nullptr;
   if (testObject) {
@@ -13650,55 +12938,43 @@
   Register initLength = ToRegister(lir->initLength());
   Register output = ToRegister(lir->output());
 
-  // When the array is not packed we need to do a hole check in addition to the
-  // bounds check.
   Label falseBranch, done, trueBranch;
 
-  OutOfLineCode* ool = nullptr;
-  Label* failedInitLength = &falseBranch;
-
   if (lir->index()->isConstant()) {
     int32_t index = ToInt32(lir->index());
 
-    MOZ_ASSERT_IF(index < 0, mir->needsNegativeIntCheck());
-    if (mir->needsNegativeIntCheck()) {
-      using Fn = bool (*)(JSContext*, int32_t, HandleObject, bool*);
-      ool = oolCallVM<Fn, OperatorInI>(
-          lir, ArgList(Imm32(index), ToRegister(lir->object())),
-          StoreRegisterTo(output));
-      failedInitLength = ool->entry();
+    if (index < 0) {
+      MOZ_ASSERT(mir->needsNegativeIntCheck());
+      bailout(lir->snapshot());
+      return;
     }
 
     masm.branch32(Assembler::BelowOrEqual, initLength, Imm32(index),
-                  failedInitLength);
-    if (mir->needsHoleCheck()) {
-      NativeObject::elementsSizeMustNotOverflow();
-      Address address = Address(elements, index * sizeof(Value));
-      masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
-    }
+                  &falseBranch);
+
+    NativeObject::elementsSizeMustNotOverflow();
+    Address address = Address(elements, index * sizeof(Value));
+    masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
   } else {
-    Label negativeIntCheck;
     Register index = ToRegister(lir->index());
 
+    Label negativeIntCheck;
+    Label* failedInitLength = &falseBranch;
     if (mir->needsNegativeIntCheck()) {
       failedInitLength = &negativeIntCheck;
     }
 
     masm.branch32(Assembler::BelowOrEqual, initLength, index, failedInitLength);
-    if (mir->needsHoleCheck()) {
-      BaseObjectElementIndex address(elements, ToRegister(lir->index()));
-      masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
-    }
-    masm.jump(&trueBranch);
+
+    BaseObjectElementIndex address(elements, index);
+    masm.branchTestMagic(Assembler::Equal, address, &falseBranch);
 
     if (mir->needsNegativeIntCheck()) {
+      masm.jump(&trueBranch);
       masm.bind(&negativeIntCheck);
-      using Fn = bool (*)(JSContext*, int32_t, HandleObject, bool*);
-      ool = oolCallVM<Fn, OperatorInI>(
-          lir, ArgList(index, ToRegister(lir->object())),
-          StoreRegisterTo(output));
 
-      masm.branch32(Assembler::LessThan, index, Imm32(0), ool->entry());
+      bailoutCmp32(Assembler::LessThan, index, Imm32(0), lir->snapshot());
+
       masm.jump(&falseBranch);
     }
   }
@@ -13710,10 +12986,6 @@
   masm.bind(&falseBranch);
   masm.move32(Imm32(0), output);
   masm.bind(&done);
-
-  if (ool) {
-    masm.bind(ool->rejoin());
-  }
 }
 
 void CodeGenerator::visitGuardElementNotHole(LGuardElementNotHole* lir) {
@@ -14813,12 +14085,13 @@
   callVM<Fn, jit::ThrowRuntimeLexicalError>(ins);
 }
 
-void CodeGenerator::visitGlobalNameConflictsCheck(
-    LGlobalNameConflictsCheck* ins) {
-  pushArg(ImmGCPtr(ins->mirRaw()->block()->info().script()));
+void CodeGenerator::visitGlobalDeclInstantiation(
+    LGlobalDeclInstantiation* ins) {
+  pushArg(ImmPtr(ins->mir()->resumePoint()->pc()));
+  pushArg(ImmGCPtr(ins->mir()->block()->info().script()));
 
-  using Fn = bool (*)(JSContext*, HandleScript);
-  callVM<Fn, GlobalNameConflictsCheckFromIon>(ins);
+  using Fn = bool (*)(JSContext*, HandleScript, jsbytecode*);
+  callVM<Fn, GlobalDeclInstantiationFromIon>(ins);
 }
 
 void CodeGenerator::visitDebugger(LDebugger* ins) {
@@ -15369,6 +14642,143 @@
   bailoutIfFalseBool(ReturnReg, lir->snapshot());
 }
 
+void CodeGenerator::visitGuardIsExtensible(LGuardIsExtensible* lir) {
+  Register object = ToRegister(lir->object());
+  Register temp = ToRegister(lir->temp());
+
+  Label bail;
+  masm.branchIfObjectNotExtensible(object, temp, &bail);
+  bailoutFrom(&bail, lir->snapshot());
+}
+
+void CodeGenerator::visitGuardIndexIsNonNegative(
+    LGuardIndexIsNonNegative* lir) {
+  Register index = ToRegister(lir->index());
+
+  bailoutCmp32(Assembler::LessThan, index, Imm32(0), lir->snapshot());
+}
+
+void CodeGenerator::visitGuardIndexGreaterThanDenseInitLength(
+    LGuardIndexGreaterThanDenseInitLength* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+  Register temp = ToRegister(lir->temp());
+  Register spectreTemp = ToTempRegisterOrInvalid(lir->spectreTemp());
+
+  // Load obj->elements.
+  masm.loadPtr(Address(object, NativeObject::offsetOfElements()), temp);
+
+  // Ensure index >= initLength.
+  Label outOfBounds;
+  Address capacity(temp, ObjectElements::offsetOfInitializedLength());
+  masm.spectreBoundsCheck32(index, capacity, spectreTemp, &outOfBounds);
+  bailout(lir->snapshot());
+  masm.bind(&outOfBounds);
+}
+
+void CodeGenerator::visitGuardIndexIsValidUpdateOrAdd(
+    LGuardIndexIsValidUpdateOrAdd* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+  Register temp = ToRegister(lir->temp());
+  Register spectreTemp = ToTempRegisterOrInvalid(lir->spectreTemp());
+
+  // Load obj->elements.
+  masm.loadPtr(Address(object, NativeObject::offsetOfElements()), temp);
+
+  Label success;
+
+  // If length is writable, branch to &success.  All indices are writable.
+  Address flags(temp, ObjectElements::offsetOfFlags());
+  masm.branchTest32(Assembler::Zero, flags,
+                    Imm32(ObjectElements::Flags::NONWRITABLE_ARRAY_LENGTH),
+                    &success);
+
+  // Otherwise, ensure index is in bounds.
+  Label bail;
+  Address length(temp, ObjectElements::offsetOfLength());
+  masm.spectreBoundsCheck32(index, length, spectreTemp, &bail);
+  masm.bind(&success);
+
+  bailoutFrom(&bail, lir->snapshot());
+}
+
+void CodeGenerator::visitCallAddOrUpdateSparseElement(
+    LCallAddOrUpdateSparseElement* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+  ValueOperand value = ToValue(lir, LCallAddOrUpdateSparseElement::ValueIndex);
+
+  pushArg(Imm32(lir->mir()->strict()));
+  pushArg(value);
+  pushArg(index);
+  pushArg(object);
+
+  using Fn =
+      bool (*)(JSContext*, HandleArrayObject, int32_t, HandleValue, bool);
+  callVM<Fn, js::AddOrUpdateSparseElementHelper>(lir);
+}
+
+void CodeGenerator::visitCallGetSparseElement(LCallGetSparseElement* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+
+  pushArg(index);
+  pushArg(object);
+
+  using Fn =
+      bool (*)(JSContext*, HandleArrayObject, int32_t, MutableHandleValue);
+  callVM<Fn, js::GetSparseElementHelper>(lir);
+}
+
+void CodeGenerator::visitCallNativeGetElement(LCallNativeGetElement* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+
+  pushArg(index);
+  pushArg(TypedOrValueRegister(MIRType::Object, AnyRegister(object)));
+  pushArg(object);
+
+  using Fn = bool (*)(JSContext*, HandleNativeObject, HandleValue, int32_t,
+                      MutableHandleValue);
+  callVM<Fn, js::NativeGetElement>(lir);
+}
+
+void CodeGenerator::visitCallObjectHasSparseElement(
+    LCallObjectHasSparseElement* lir) {
+  Register object = ToRegister(lir->object());
+  Register index = ToRegister(lir->index());
+  Register temp1 = ToRegister(lir->temp1());
+  Register temp2 = ToRegister(lir->temp2());
+  Register output = ToRegister(lir->output());
+
+  masm.reserveStack(sizeof(Value));
+  masm.moveStackPtrTo(temp2);
+
+  using Fn = bool (*)(JSContext*, NativeObject*, int32_t, Value*);
+  masm.setupUnalignedABICall(temp1);
+  masm.loadJSContext(temp1);
+  masm.passABIArg(temp1);
+  masm.passABIArg(object);
+  masm.passABIArg(index);
+  masm.passABIArg(temp2);
+  masm.callWithABI<Fn, HasNativeElementPure>();
+  masm.mov(ReturnReg, temp1);
+
+  Label bail, ok;
+  uint32_t framePushed = masm.framePushed();
+  masm.branchIfTrueBool(temp1, &ok);
+  masm.adjustStack(sizeof(Value));
+  masm.jump(&bail);
+
+  masm.bind(&ok);
+  masm.setFramePushed(framePushed);
+  masm.unboxBoolean(Address(masm.getStackPointer(), 0), output);
+  masm.adjustStack(sizeof(Value));
+
+  bailoutFrom(&bail, lir->snapshot());
+}
+
 template <size_t NumDefs>
 void CodeGenerator::emitIonToWasmCallBase(LIonToWasmCallBase<NumDefs>* lir) {
   wasm::JitCallStackArgVector stackArgs;
diff -Nru firefox-84.0.2+build1/js/src/jit/CodeGenerator.h firefox-85.0+build1/js/src/jit/CodeGenerator.h
--- firefox-84.0.2+build1/js/src/jit/CodeGenerator.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CodeGenerator.h	2021-01-18 19:58:13.000000000 +0000
@@ -69,7 +69,6 @@
 class OutOfLineBoxNonStrictThis;
 
 class CodeGenerator final : public CodeGeneratorSpecific {
-  void generateArgumentsChecks(bool assert = false);
   MOZ_MUST_USE bool generateBody();
 
   ConstantOrRegister toConstantOrRegister(LInstruction* lir, size_t n,
@@ -97,7 +96,7 @@
   ~CodeGenerator();
 
   MOZ_MUST_USE bool generate();
-  MOZ_MUST_USE bool generateWasm(wasm::FuncTypeIdDesc funcTypeId,
+  MOZ_MUST_USE bool generateWasm(wasm::TypeIdDesc funcTypeId,
                                  wasm::BytecodeOffset trapOffset,
                                  const wasm::ArgTypeVector& argTys,
                                  const MachineState& trapExitLayout,
@@ -105,8 +104,7 @@
                                  wasm::FuncOffsets* offsets,
                                  wasm::StackMaps* stackMaps);
 
-  MOZ_MUST_USE bool link(JSContext* cx, CompilerConstraintList* constraints,
-                         const WarpSnapshot* snapshot);
+  MOZ_MUST_USE bool link(JSContext* cx, const WarpSnapshot* snapshot);
 
   void emitOOLTestObject(Register objreg, Label* ifTruthy, Label* ifFalsy,
                          Register scratch);
@@ -209,9 +207,6 @@
   template <typename T>
   void emitStoreElementHoleV(T* lir);
 
-  void emitArrayPopShift(LInstruction* lir, const MArrayPopShift* mir,
-                         Register obj, Register elementsTemp,
-                         Register lengthTemp, TypedOrValueRegister out);
   void emitArrayPush(LInstruction* lir, Register obj,
                      const ConstantOrRegister& value, Register elementsTemp,
                      Register length, Register spectreTemp);
@@ -242,15 +237,11 @@
 
   void addGetPropertyCache(LInstruction* ins, LiveRegisterSet liveRegs,
                            TypedOrValueRegister value,
-                           const ConstantOrRegister& id,
-                           TypedOrValueRegister output, Register maybeTemp,
-                           GetPropertyResultFlags flags);
+                           const ConstantOrRegister& id, ValueOperand output);
   void addSetPropertyCache(LInstruction* ins, LiveRegisterSet liveRegs,
                            Register objReg, Register temp,
                            const ConstantOrRegister& id,
-                           const ConstantOrRegister& value, bool strict,
-                           bool needsPostBarrier, bool needsTypeBarrier,
-                           bool guardHoles);
+                           const ConstantOrRegister& value, bool strict);
 
   MOZ_MUST_USE bool generateBranchV(const ValueOperand& value, Label* ifTrue,
                                     Label* ifFalse, FloatRegister fr);
diff -Nru firefox-84.0.2+build1/js/src/jit/CompileInfo.h firefox-85.0+build1/js/src/jit/CompileInfo.h
--- firefox-84.0.2+build1/js/src/jit/CompileInfo.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CompileInfo.h	2021-01-18 19:58:13.000000000 +0000
@@ -7,18 +7,35 @@
 #ifndef jit_CompileInfo_h
 #define jit_CompileInfo_h
 
-#include "mozilla/Maybe.h"
+#include "mozilla/Assertions.h"  // MOZ_ASSERT
+#include "mozilla/Maybe.h"       // mozilla::Maybe, mozilla::Some
 
-#include <algorithm>
+#include <algorithm>  // std::max
+#include <stdint.h>   // uint32_t
 
-#include "jit/CompileWrappers.h"
-#include "jit/JitAllocPolicy.h"
-#include "jit/JitFrames.h"
-#include "jit/Registers.h"
-#include "vm/JSAtomState.h"
-#include "vm/JSFunction.h"
+#include "jit/CompileWrappers.h"  // CompileRuntime
+#include "jit/JitFrames.h"        // MinJITStackSize
+#include "js/TypeDecls.h"         // jsbytecode
+#include "vm/BindingKind.h"       // BindingLocation
+#include "vm/BytecodeUtil.h"      // JSOp
+#include "vm/JSAtomState.h"       // JSAtomState
+#include "vm/JSFunction.h"        // JSFunction
+#include "vm/JSScript.h"          // JSScript, PCToLineNumber
+#include "vm/Scope.h"             // BindingIter
+
+class JSAtom;
+class JSObject;
+
+namespace JS {
+class BigInt;
+}  // namespace JS
 
 namespace js {
+
+class ModuleObject;
+class PropertyName;
+class RegExpObject;
+
 namespace jit {
 
 class InlineScriptTree;
@@ -52,12 +69,6 @@
   Analysis_None,
 
   /*
-   * MIR analysis performed when invoking 'new' on a script, to determine
-   * definite properties. Used by the optimizing JIT.
-   */
-  Analysis_DefiniteProperties,
-
-  /*
    * MIR analysis performed when executing a script which uses its arguments,
    * when it is not known whether a lazy arguments value can be used.
    */
@@ -75,8 +86,10 @@
         osrPc_(osrPc),
         analysisMode_(analysisMode),
         scriptNeedsArgsObj_(scriptNeedsArgsObj),
-        hadOverflowBailout_(script->hadOverflowBailout()),
-        hadFrequentBailouts_(script->hadFrequentBailouts()),
+        hadEagerTruncationBailout_(script->hadEagerTruncationBailout()),
+        hadSpeculativePhiBailout_(script->hadSpeculativePhiBailout()),
+        hadLICMInvalidation_(script->hadLICMInvalidation()),
+        hadBoundsCheckBailout_(script->failedBoundsCheck()),
         mayReadFrameArgsDirectly_(script->mayReadFrameArgsDirectly()),
         isDerivedClassConstructor_(script->isDerivedClassConstructor()),
         inlineScriptTree_(inlineScriptTree) {
@@ -136,8 +149,10 @@
         osrPc_(nullptr),
         analysisMode_(Analysis_None),
         scriptNeedsArgsObj_(false),
-        hadOverflowBailout_(false),
-        hadFrequentBailouts_(false),
+        hadEagerTruncationBailout_(false),
+        hadSpeculativePhiBailout_(false),
+        hadLICMInvalidation_(false),
+        hadBoundsCheckBailout_(false),
         mayReadFrameArgsDirectly_(false),
         inlineScriptTree_(nullptr),
         needsBodyEnvironmentObject_(false),
@@ -364,8 +379,10 @@
 
   // Check previous bailout states to prevent doing the same bailout in the
   // next compilation.
-  bool hadOverflowBailout() const { return hadOverflowBailout_; }
-  bool hadFrequentBailouts() const { return hadFrequentBailouts_; }
+  bool hadEagerTruncationBailout() const { return hadEagerTruncationBailout_; }
+  bool hadSpeculativePhiBailout() const { return hadSpeculativePhiBailout_; }
+  bool hadLICMInvalidation() const { return hadLICMInvalidation_; }
+  bool hadBoundsCheckBailout() const { return hadBoundsCheckBailout_; }
   bool mayReadFrameArgsDirectly() const { return mayReadFrameArgsDirectly_; }
 
   bool isDerivedClassConstructor() const { return isDerivedClassConstructor_; }
@@ -389,8 +406,10 @@
 
   // Record the state of previous bailouts in order to prevent compiling the
   // same function identically the next time.
-  bool hadOverflowBailout_;
-  bool hadFrequentBailouts_;
+  bool hadEagerTruncationBailout_;
+  bool hadSpeculativePhiBailout_;
+  bool hadLICMInvalidation_;
+  bool hadBoundsCheckBailout_;
 
   bool mayReadFrameArgsDirectly_;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/CompileInfo-inl.h firefox-85.0+build1/js/src/jit/CompileInfo-inl.h
--- firefox-84.0.2+build1/js/src/jit/CompileInfo-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CompileInfo-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -26,8 +26,6 @@
   switch (mode) {
     case Analysis_None:
       return "Analysis_None";
-    case Analysis_DefiniteProperties:
-      return "Analysis_DefiniteProperties";
     case Analysis_ArgumentsUsage:
       return "Analysis_ArgumentsUsage";
     default:
diff -Nru firefox-84.0.2+build1/js/src/jit/CompileWrappers.cpp firefox-85.0+build1/js/src/jit/CompileWrappers.cpp
--- firefox-84.0.2+build1/js/src/jit/CompileWrappers.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CompileWrappers.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -162,12 +162,6 @@
          zone()->allocNurseryBigInts;
 }
 
-void CompileZone::setMinorGCShouldCancelIonCompilations() {
-  MOZ_ASSERT(CurrentThreadCanAccessZone(zone()));
-  JSRuntime* rt = zone()->runtimeFromMainThread();
-  rt->gc.storeBuffer().setShouldCancelIonCompilations();
-}
-
 uintptr_t CompileZone::nurseryCellHeader(JS::TraceKind kind) {
   return gc::NurseryCellHeader::MakeValue(zone(), kind);
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/CompileWrappers.h firefox-85.0+build1/js/src/jit/CompileWrappers.h
--- firefox-84.0.2+build1/js/src/jit/CompileWrappers.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/CompileWrappers.h	2021-01-18 19:58:13.000000000 +0000
@@ -112,7 +112,6 @@
 
   bool canNurseryAllocateStrings();
   bool canNurseryAllocateBigInts();
-  void setMinorGCShouldCancelIonCompilations();
 
   uintptr_t nurseryCellHeader(JS::TraceKind kind);
 };
diff -Nru firefox-84.0.2+build1/js/src/jit/FoldLinearArithConstants.cpp firefox-85.0+build1/js/src/jit/FoldLinearArithConstants.cpp
--- firefox-84.0.2+build1/js/src/jit/FoldLinearArithConstants.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/FoldLinearArithConstants.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -70,6 +70,7 @@
   add->block()->insertBefore(add, rhs);
 
   MAdd* addNew = MAdd::New(alloc, sum.term, rhs, add->truncateKind());
+  addNew->setBailoutKind(add->bailoutKind());
 
   add->replaceAllLiveUsesWith(addNew);
   add->block()->insertBefore(add, addNew);
diff -Nru firefox-84.0.2+build1/js/src/jit/GenerateCacheIRFiles.py firefox-85.0+build1/js/src/jit/GenerateCacheIRFiles.py
--- firefox-84.0.2+build1/js/src/jit/GenerateCacheIRFiles.py	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/GenerateCacheIRFiles.py	2021-01-18 19:58:13.000000000 +0000
@@ -97,6 +97,7 @@
     "ScalarTypeImm": ("Scalar::Type", "writeScalarTypeImm"),
     "MetaTwoByteKindImm": ("MetaTwoByteKind", "writeMetaTwoByteKindImm"),
     "UnaryMathFunctionImm": ("UnaryMathFunction", "writeUnaryMathFunctionImm"),
+    "WasmValTypeImm": ("wasm::ValType::Kind", "writeWasmValTypeImm"),
     "Int32Imm": ("int32_t", "writeInt32Imm"),
     "UInt32Imm": ("uint32_t", "writeUInt32Imm"),
     "JSNativeImm": ("JSNative", "writeJSNativeImm"),
@@ -191,6 +192,7 @@
     "ScalarTypeImm": ("Scalar::Type", "", "reader.scalarType()"),
     "MetaTwoByteKindImm": ("MetaTwoByteKind", "", "reader.metaKind<MetaTwoByteKind>()"),
     "UnaryMathFunctionImm": ("UnaryMathFunction", "", "reader.unaryMathFunction()"),
+    "WasmValTypeImm": ("wasm::ValType::Kind", "", "reader.wasmValType()"),
     "Int32Imm": ("int32_t", "", "reader.int32Immediate()"),
     "UInt32Imm": ("uint32_t", "", "reader.uint32Immediate()"),
     "JSNativeImm": ("JSNative", "", "reinterpret_cast<JSNative>(reader.pointer())"),
@@ -271,6 +273,7 @@
     "ScalarTypeImm": "spewScalarTypeImm",
     "MetaTwoByteKindImm": "spewMetaTwoByteKindImm",
     "UnaryMathFunctionImm": "spewUnaryMathFunctionImm",
+    "WasmValTypeImm": "spewWasmValTypeImm",
     "Int32Imm": "spewInt32Imm",
     "UInt32Imm": "spewUInt32Imm",
     "JSNativeImm": "spewJSNativeImm",
@@ -402,6 +405,7 @@
     "ValueTypeImm": 1,
     "GuardClassKindImm": 1,
     "JSWhyMagicImm": 1,
+    "WasmValTypeImm": 1,
     "Int32Imm": 4,
     "UInt32Imm": 4,
     "JSNativeImm": "sizeof(uintptr_t)",
diff -Nru firefox-84.0.2+build1/js/src/jit/InlinableNatives.cpp firefox-85.0+build1/js/src/jit/InlinableNatives.cpp
--- firefox-84.0.2+build1/js/src/jit/InlinableNatives.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/InlinableNatives.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -16,6 +16,7 @@
 #  include "builtin/intl/RelativeTimeFormat.h"
 #endif
 #include "builtin/MapObject.h"
+#include "js/experimental/JitInfo.h"
 #include "vm/ArrayBufferObject.h"
 #include "vm/AsyncIteration.h"
 #include "vm/Iteration.h"
@@ -24,6 +25,15 @@
 using namespace js;
 using namespace js::jit;
 
+#define ADD_NATIVE(native)                   \
+  const JSJitInfo js::jit::JitInfo_##native{ \
+      {nullptr},                             \
+      {uint16_t(InlinableNative::native)},   \
+      {0},                                   \
+      JSJitInfo::InlinableNative};
+INLINABLE_NATIVE_LIST(ADD_NATIVE)
+#undef ADD_NATIVE
+
 const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
   switch (native) {
 #ifdef JS_HAS_INTL_API
diff -Nru firefox-84.0.2+build1/js/src/jit/InlineScriptTree.h firefox-85.0+build1/js/src/jit/InlineScriptTree.h
--- firefox-84.0.2+build1/js/src/jit/InlineScriptTree.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/InlineScriptTree.h	2021-01-18 19:58:13.000000000 +0000
@@ -44,13 +44,14 @@
         children_(nullptr),
         nextCallee_(nullptr) {}
 
-  static InlineScriptTree* New(TempAllocator* allocator,
-                               InlineScriptTree* caller, jsbytecode* callerPc,
-                               JSScript* script);
+  static inline InlineScriptTree* New(TempAllocator* allocator,
+                                      InlineScriptTree* caller,
+                                      jsbytecode* callerPc, JSScript* script);
 
-  InlineScriptTree* addCallee(TempAllocator* allocator, jsbytecode* callerPc,
-                              JSScript* calleeScript);
-  void removeCallee(InlineScriptTree* callee);
+  inline InlineScriptTree* addCallee(TempAllocator* allocator,
+                                     jsbytecode* callerPc,
+                                     JSScript* calleeScript);
+  inline void removeCallee(InlineScriptTree* callee);
 
   InlineScriptTree* caller() const { return caller_; }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/Invalidation.h firefox-85.0+build1/js/src/jit/Invalidation.h
--- firefox-84.0.2+build1/js/src/jit/Invalidation.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Invalidation.h	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,59 @@
+/* -*- 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 jit_Invalidation_h
+#define jit_Invalidation_h
+
+#include "jit/IonTypes.h"
+#include "js/AllocPolicy.h"
+#include "js/GCVector.h"
+
+namespace js {
+namespace jit {
+
+class IonScript;
+
+class RecompileInfo {
+  JSScript* script_;
+  IonCompilationId id_;
+
+ public:
+  RecompileInfo(JSScript* script, IonCompilationId id)
+      : script_(script), id_(id) {}
+
+  JSScript* script() const { return script_; }
+
+  IonScript* maybeIonScriptToInvalidate() const;
+
+  bool traceWeak(JSTracer* trc);
+
+  bool operator==(const RecompileInfo& other) const {
+    return script_ == other.script_ && id_ == other.id_;
+  }
+};
+
+// The RecompileInfoVector has a MinInlineCapacity of one so that invalidating a
+// single IonScript doesn't require an allocation.
+using RecompileInfoVector = JS::GCVector<RecompileInfo, 1, SystemAllocPolicy>;
+
+// Called from Zone::discardJitCode().
+void InvalidateAll(JSFreeOp* fop, JS::Zone* zone);
+void FinishInvalidation(JSFreeOp* fop, JSScript* script);
+
+// Add compilations involving |script| (outer script or inlined) to the vector.
+void AddPendingInvalidation(jit::RecompileInfoVector& invalid,
+                            JSScript* script);
+
+// Walk the stack and invalidate active Ion frames for the invalid scripts.
+void Invalidate(JSContext* cx, const RecompileInfoVector& invalid,
+                bool resetUses = true, bool cancelOffThread = true);
+void Invalidate(JSContext* cx, JSScript* script, bool resetUses = true,
+                bool cancelOffThread = true);
+
+}  // namespace jit
+}  // namespace js
+
+#endif /* jit_Invalidation_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/IonAnalysis.cpp firefox-85.0+build1/js/src/jit/IonAnalysis.cpp
--- firefox-84.0.2+build1/js/src/jit/IonAnalysis.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonAnalysis.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -10,12 +10,10 @@
 #include <utility>  // for ::std::pair
 
 #include "jit/AliasAnalysis.h"
-#include "jit/BaselineInspector.h"
 #include "jit/BaselineJIT.h"
 #include "jit/CompileInfo.h"
 #include "jit/InlineScriptTree.h"
 #include "jit/Ion.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonOptimizationLevels.h"
 #include "jit/LIR.h"
 #include "jit/Lowering.h"
@@ -26,13 +24,13 @@
 #include "vm/PlainObject.h"  // js::PlainObject
 #include "vm/RegExpObject.h"
 #include "vm/SelfHosting.h"
-#include "vm/TypeInference.h"
 
+#include "jit/InlineScriptTree-inl.h"
+#include "jit/JitScript-inl.h"
 #include "jit/shared/Lowering-shared-inl.h"
 #include "vm/BytecodeUtil-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/JSScript-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -723,55 +721,13 @@
 //
 // 1) phi(a, a)
 //     can get replaced by a
-//
-// 2) phi(filtertypeset(a, type1), filtertypeset(a, type1))
-//     equals filtertypeset(a, type1)
-//
-// 3) phi(a, filtertypeset(a, type1))
-//     equals filtertypeset(a, type1 union type(a))
-//     equals filtertypeset(a, type(a))
-//     equals a
-//
-// 4) phi(filtertypeset(a, type1), filtertypeset(a, type2))
-//    equals filtertypeset(a, type1 union type2)
-//
-//    This is the special case. We can only replace this with 'a' iif
-//    type(a) == type1 union type2. Since optimizations could have
-//    happened based on a more specific phi type.
 static bool IsPhiRedudantFilter(MPhi* phi) {
-  // Handle (1) and (2)
+  // TODO(no-TI): clean up.
   if (phi->operandIfRedundant()) {
     return true;
   }
 
-  // Handle (3)
-  bool onlyFilters = false;
-  MDefinition* a = phi->getOperand(0);
-  if (a->isFilterTypeSet()) {
-    a = a->toFilterTypeSet()->input();
-    onlyFilters = true;
-  }
-
-  for (size_t i = 1; i < phi->numOperands(); i++) {
-    MDefinition* operand = phi->getOperand(i);
-    if (operand == a) {
-      onlyFilters = false;
-      continue;
-    }
-    if (operand->isFilterTypeSet() &&
-        operand->toFilterTypeSet()->input() == a) {
-      continue;
-    }
-    return false;
-  }
-  if (!onlyFilters) {
-    return true;
-  }
-
-  // Handle (4)
-  MOZ_ASSERT(onlyFilters);
-  return EqualTypes(a->type(), a->resultTypeSet(), phi->type(),
-                    phi->resultTypeSet());
+  return false;
 }
 
 // Determine whether phiBlock/testBlock simply compute a phi and perform a
@@ -1001,9 +957,6 @@
 
     if (!redundant) {
       redundant = (*iter)->getOperand(0);
-      if (redundant->isFilterTypeSet()) {
-        redundant = redundant->toFilterTypeSet()->input();
-      }
     }
 
     (*iter)->replaceAllUsesWith(redundant);
@@ -1201,8 +1154,7 @@
       // parameter passing might be live. Rewriting uses of these terms
       // in resume points may affect the interpreter's behavior. Rather
       // than doing a more sophisticated analysis, just ignore these.
-      if (ins->isUnbox() || ins->isParameter() || ins->isTypeBarrier() ||
-          ins->isBoxNonStrictThis() || ins->isFilterTypeSet()) {
+      if (ins->isUnbox() || ins->isParameter() || ins->isBoxNonStrictThis()) {
         continue;
       }
 
@@ -1357,9 +1309,7 @@
          iter != block->rend();) {
       MInstruction* inst = *iter++;
       if (js::jit::IsDiscardable(inst)) {
-        {
-          block->discard(inst);
-        }
+        block->discard(inst);
       }
     }
   }
@@ -1594,6 +1544,9 @@
   bool specializeValidFloatOps();
   bool tryEmitFloatOperations();
 
+  bool shouldSpecializeOsrPhis() const;
+  MIRType guessPhiType(MPhi* phi, bool* hasInputsWithEmptyTypes) const;
+
  public:
   TypeAnalyzer(MIRGenerator* mir, MIRGraph& graph) : mir(mir), graph(graph) {}
 
@@ -1602,7 +1555,7 @@
 
 } /* anonymous namespace */
 
-static bool ShouldSpecializeOsrPhis() {
+bool TypeAnalyzer::shouldSpecializeOsrPhis() const {
   // [SMDOC] WarpBuilder OSR Phi Type Specialization
   //
   // IonBuilder does type specialization while building MIR. This includes
@@ -1640,7 +1593,7 @@
   // OSR phi specialization happens in three steps:
   //
   // (1) Specialize phis but ignore MOsrValue phi inputs. In other words,
-  //     pretend the OSR entry block doesn't exist. See GuessPhiType.
+  //     pretend the OSR entry block doesn't exist. See guessPhiType.
   //
   // (2) Once phi specialization is done, look at the types of loop header phis
   //     and add these types to the corresponding preheader phis. This way, the
@@ -1657,11 +1610,12 @@
   //
   //     * TypeAnalyzer::replaceRedundantPhi: adds a type guard for values that
   //       can't be unboxed (null/undefined/magic Values).
-  return JitOptions.warpBuilder;
+  return JitOptions.warpBuilder && !mir->outerInfo().hadSpeculativePhiBailout();
 }
 
 // Try to specialize this phi based on its non-cyclic inputs.
-static MIRType GuessPhiType(MPhi* phi, bool* hasInputsWithEmptyTypes) {
+MIRType TypeAnalyzer::guessPhiType(MPhi* phi,
+                                   bool* hasInputsWithEmptyTypes) const {
 #ifdef DEBUG
   // Check that different magic constants aren't flowing together. Ignore
   // JS_OPTIMIZED_OUT, since an operand could be legitimately optimized
@@ -1700,15 +1654,11 @@
       }
     }
 
-    // Ignore operands which we've never observed.
-    if (in->resultTypeSet() && in->resultTypeSet()->empty()) {
-      *hasInputsWithEmptyTypes = true;
-      continue;
-    }
+    // TODO(no-TI): remove hasInputsWithEmptyTypes.
 
-    // See ShouldSpecializeOsrPhis comment. This is the first step mentioned
+    // See shouldSpecializeOsrPhis comment. This is the first step mentioned
     // there.
-    if (ShouldSpecializeOsrPhis() && in->isOsrValue()) {
+    if (shouldSpecializeOsrPhis() && in->isOsrValue()) {
       // TODO(post-Warp): simplify float32 handling in this function or (better)
       // make the float32 analysis a stand-alone optimization pass instead of
       // complicating type analysis. See bug 1655773.
@@ -1846,7 +1796,7 @@
       }
 
       bool hasInputsWithEmptyTypes;
-      MIRType type = GuessPhiType(*phi, &hasInputsWithEmptyTypes);
+      MIRType type = guessPhiType(*phi, &hasInputsWithEmptyTypes);
       phi->specialize(type);
       if (type == MIRType::None) {
         // We tried to guess the type but failed because all operands are
@@ -1875,7 +1825,7 @@
     }
 
     // When two phis have a cyclic dependency and inputs that have an empty
-    // typeset (which are ignored by GuessPhiType), we may still have to
+    // typeset (which are ignored by guessPhiType), we may still have to
     // specialize these to MIRType::Value.
     while (!phisWithEmptyInputTypes.empty()) {
       if (mir->shouldCancel("Specialize Phis (phisWithEmptyInputTypes)")) {
@@ -1892,8 +1842,8 @@
     }
   } while (!phiWorklist_.empty());
 
-  if (ShouldSpecializeOsrPhis() && graph.osrBlock()) {
-    // See ShouldSpecializeOsrPhis comment. This is the second step, propagating
+  if (shouldSpecializeOsrPhis() && graph.osrBlock()) {
+    // See shouldSpecializeOsrPhis comment. This is the second step, propagating
     // loop header phi types to preheader phis.
     MBasicBlock* preHeader = graph.osrPreHeaderBlock();
     MBasicBlock* header = preHeader->getSingleSuccessor();
@@ -1972,6 +1922,7 @@
 
             MUnbox* unbox =
                 MUnbox::New(alloc(), in, MIRType::Double, MUnbox::Fallible);
+            unbox->setBailoutKind(BailoutKind::SpeculativePhi);
             in->block()->insertBefore(in->block()->lastIns(), unbox);
             replacement = MToFloat32::New(alloc(), in);
           }
@@ -1990,6 +1941,7 @@
           replacement = MUnbox::New(alloc(), in, phiType, MUnbox::Fallible);
         }
 
+        replacement->setBailoutKind(BailoutKind::SpeculativePhi);
         in->block()->insertBefore(in->block()->lastIns(), replacement);
         phi->replaceOperand(i, replacement);
       }
@@ -2074,14 +2026,15 @@
   block->insertBefore(*(block->begin()), c);
   phi->justReplaceAllUsesWith(c);
 
-  if (ShouldSpecializeOsrPhis() && block == graph.osrPreHeaderBlock()) {
-    // See ShouldSpecializeOsrPhis comment. This is part of the third step,
+  if (shouldSpecializeOsrPhis() && block == graph.osrPreHeaderBlock()) {
+    // See shouldSpecializeOsrPhis comment. This is part of the third step,
     // guard the incoming MOsrValue is of this type.
     MBasicBlock* osrBlock = graph.osrBlock();
     MOZ_ASSERT(block->getPredecessor(1) == osrBlock);
     MDefinition* def = phi->getOperand(1);
     if (def->isOsrValue()) {
       MGuardValue* guard = MGuardValue::New(alloc(), def, v);
+      guard->setBailoutKind(BailoutKind::SpeculativePhi);
       osrBlock->insertBefore(osrBlock->lastIns(), guard);
     } else {
       MOZ_ASSERT(def->isConstant());
@@ -3529,110 +3482,7 @@
 
   dominating->setMinimum(newMinimum);
   dominating->setMaximum(newMaximum);
-  return true;
-}
-
-static void TryEliminateTypeBarrierFromTest(MTypeBarrier* barrier,
-                                            bool filtersNull,
-                                            bool filtersUndefined, MTest* test,
-                                            BranchDirection direction,
-                                            bool* eliminated) {
-  MOZ_ASSERT(filtersNull || filtersUndefined);
-
-  // Watch for code patterns similar to 'if (x.f) { ... = x.f }'.  If x.f
-  // is either an object or null/undefined, there will be a type barrier on
-  // the latter read as the null/undefined value is never realized there.
-  // The type barrier can be eliminated, however, by looking at tests
-  // performed on the result of the first operation that filter out all
-  // types that have been seen in the first access but not the second.
-
-  // A test 'if (x.f)' filters both null and undefined.
-
-  // Disregard the possible unbox added before the Typebarrier for checking.
-  MDefinition* input = barrier->input();
-  MUnbox* inputUnbox = nullptr;
-  if (input->isUnbox() && input->toUnbox()->mode() != MUnbox::Fallible) {
-    inputUnbox = input->toUnbox();
-    input = inputUnbox->input();
-  }
-
-  MDefinition* subject = nullptr;
-  bool removeUndefined;
-  bool removeNull;
-  test->filtersUndefinedOrNull(direction == TRUE_BRANCH, &subject,
-                               &removeUndefined, &removeNull);
-
-  // The Test doesn't filter undefined nor null.
-  if (!subject) {
-    return;
-  }
-
-  // Make sure the subject equals the input to the TypeBarrier.
-  if (subject != input) {
-    return;
-  }
-
-  // When the TypeBarrier filters undefined, the test must at least also do,
-  // this, before the TypeBarrier can get removed.
-  if (!removeUndefined && filtersUndefined) {
-    return;
-  }
-
-  // When the TypeBarrier filters null, the test must at least also do,
-  // this, before the TypeBarrier can get removed.
-  if (!removeNull && filtersNull) {
-    return;
-  }
-
-  // Eliminate the TypeBarrier. The possible TypeBarrier unboxing is kept,
-  // but made infallible.
-  *eliminated = true;
-  if (inputUnbox) {
-    inputUnbox->makeInfallible();
-  }
-  barrier->replaceAllUsesWith(barrier->input());
-}
-
-static bool TryEliminateTypeBarrier(MTypeBarrier* barrier, bool* eliminated) {
-  MOZ_ASSERT(!*eliminated);
-
-  const TemporaryTypeSet* barrierTypes = barrier->resultTypeSet();
-  const TemporaryTypeSet* inputTypes = barrier->input()->resultTypeSet();
-
-  // Disregard the possible unbox added before the Typebarrier.
-  if (barrier->input()->isUnbox() &&
-      barrier->input()->toUnbox()->mode() != MUnbox::Fallible) {
-    inputTypes = barrier->input()->toUnbox()->input()->resultTypeSet();
-  }
-
-  if (!barrierTypes || !inputTypes) {
-    return true;
-  }
-
-  bool filtersNull = barrierTypes->filtersType(inputTypes, TypeSet::NullType());
-  bool filtersUndefined =
-      barrierTypes->filtersType(inputTypes, TypeSet::UndefinedType());
-
-  if (!filtersNull && !filtersUndefined) {
-    return true;
-  }
-
-  MBasicBlock* block = barrier->block();
-  while (true) {
-    BranchDirection direction;
-    MTest* test = block->immediateDominatorBranch(&direction);
-
-    if (test) {
-      TryEliminateTypeBarrierFromTest(barrier, filtersNull, filtersUndefined,
-                                      test, direction, eliminated);
-    }
-
-    MBasicBlock* previous = block->immediateDominator();
-    if (previous == block) {
-      break;
-    }
-    block = previous;
-  }
+  dominating->setBailoutKind(BailoutKind::HoistBoundsCheck);
 
   return true;
 }
@@ -3643,104 +3493,10 @@
     return true;
   }
 
-  // Check if this definition can only produce object or null values.
-  TemporaryTypeSet* types = def->resultTypeSet();
-  if (!types) {
-    return true;
-  }
-  if (types->baseFlags() & ~(TYPE_FLAG_NULL | TYPE_FLAG_ANYOBJECT)) {
-    return true;
-  }
-
-  MDefinitionVector eliminateList(def->block()->graph().alloc());
-
-  for (MUseDefIterator iter(def); iter; ++iter) {
-    MDefinition* ndef = iter.def();
-    switch (ndef->op()) {
-      case MDefinition::Opcode::Compare:
-        if (ndef->toCompare()->compareType() != MCompare::Compare_Null) {
-          return true;
-        }
-        break;
-      case MDefinition::Opcode::Test:
-        break;
-      case MDefinition::Opcode::PostWriteBarrier:
-        break;
-      case MDefinition::Opcode::StoreFixedSlot:
-        break;
-      case MDefinition::Opcode::StoreDynamicSlot:
-        break;
-      case MDefinition::Opcode::ToObjectOrNull:
-        if (!eliminateList.append(ndef->toToObjectOrNull())) {
-          return false;
-        }
-        break;
-      case MDefinition::Opcode::Unbox:
-        if (ndef->type() != MIRType::Object) {
-          return true;
-        }
-        break;
-      case MDefinition::Opcode::TypeBarrier:
-        // For now, only handle type barriers which are not consumed
-        // anywhere and only test that the value is null.
-        if (ndef->hasUses() ||
-            ndef->resultTypeSet()->getKnownMIRType() != MIRType::Null) {
-          return true;
-        }
-        break;
-      default:
-        return true;
-    }
-  }
-
-  // On punboxing systems we are better off leaving the value boxed if it
-  // is only stored back to the heap.
-#ifdef JS_PUNBOX64
-  bool foundUse = false;
-  for (MUseDefIterator iter(def); iter; ++iter) {
-    MDefinition* ndef = iter.def();
-    if (!ndef->isStoreFixedSlot() && !ndef->isStoreDynamicSlot()) {
-      foundUse = true;
-      break;
-    }
-  }
-  if (!foundUse) {
-    return true;
-  }
-#endif  // JS_PUNBOX64
-
-  def->setResultType(MIRType::ObjectOrNull);
-
-  // Fixup the result type of MTypeBarrier uses.
-  for (MUseDefIterator iter(def); iter; ++iter) {
-    MDefinition* ndef = iter.def();
-    if (ndef->isTypeBarrier()) {
-      ndef->setResultType(MIRType::ObjectOrNull);
-    }
-  }
-
-  // Eliminate MToObjectOrNull instruction uses.
-  for (size_t i = 0; i < eliminateList.length(); i++) {
-    MDefinition* ndef = eliminateList[i];
-    ndef->replaceAllUsesWith(def);
-    if (!peliminateList->append(ndef)) {
-      return false;
-    }
-  }
-
+  // TODO(no-TI): remove more code.
   return true;
 }
 
-static inline MDefinition* PassthroughOperand(MDefinition* def) {
-  if (def->isConvertElementsToDoubles()) {
-    return def->toConvertElementsToDoubles()->elements();
-  }
-  if (def->isMaybeCopyElementsForWrite()) {
-    return def->toMaybeCopyElementsForWrite()->object();
-  }
-  return nullptr;
-}
-
 // Eliminate checks which are redundant given each other or other instructions.
 //
 // A type barrier is considered redundant if all missing types have been tested
@@ -3798,11 +3554,6 @@
             return false;
           }
           break;
-        case MDefinition::Opcode::TypeBarrier:
-          if (!TryEliminateTypeBarrier(def->toTypeBarrier(), &eliminated)) {
-            return false;
-          }
-          break;
         case MDefinition::Opcode::LoadFixedSlot:
         case MDefinition::Opcode::LoadDynamicSlot:
           if (!TryOptimizeLoadObjectOrNull(def, &eliminateList)) {
@@ -3810,12 +3561,6 @@
           }
           break;
         default:
-          // Now that code motion passes have finished, replace
-          // instructions which pass through one of their operands
-          // (and perform additional checks) with that operand.
-          if (MDefinition* passthrough = PassthroughOperand(def)) {
-            def->replaceAllUsesWith(passthrough);
-          }
           break;
       }
 
@@ -3897,10 +3642,6 @@
       switch (ins->op()) {
         case MDefinition::Opcode::ConstantElements:
           continue;
-        case MDefinition::Opcode::ConvertElementsToDoubles:
-          // EliminateRedundantChecks should have replaced all uses.
-          MOZ_ASSERT(!ins->hasUses());
-          continue;
         case MDefinition::Opcode::Elements:
         case MDefinition::Opcode::ArrayBufferViewElements:
           MOZ_ASSERT(ins->numOperands() == 1);
@@ -4100,7 +3841,8 @@
 }
 
 MDefinition* jit::ConvertLinearSum(TempAllocator& alloc, MBasicBlock* block,
-                                   const LinearSum& sum) {
+                                   const LinearSum& sum,
+                                   BailoutKind bailoutKind) {
   MDefinition* def = nullptr;
 
   for (size_t i = 0; i < sum.numTerms(); i++) {
@@ -4109,6 +3851,7 @@
     if (term.scale == 1) {
       if (def) {
         def = MAdd::New(alloc, def, term.term, MIRType::Int32);
+        def->setBailoutKind(bailoutKind);
         block->insertAtEnd(def->toInstruction());
         def->computeRange(alloc);
       } else {
@@ -4121,6 +3864,7 @@
         def->computeRange(alloc);
       }
       def = MSub::New(alloc, def, term.term, MIRType::Int32);
+      def->setBailoutKind(bailoutKind);
       block->insertAtEnd(def->toInstruction());
       def->computeRange(alloc);
     } else {
@@ -4128,10 +3872,12 @@
       MConstant* factor = MConstant::New(alloc, Int32Value(term.scale));
       block->insertAtEnd(factor);
       MMul* mul = MMul::New(alloc, term.term, factor, MIRType::Int32);
+      mul->setBailoutKind(bailoutKind);
       block->insertAtEnd(mul);
       mul->computeRange(alloc);
       if (def) {
         def = MAdd::New(alloc, def, mul, MIRType::Int32);
+        def->setBailoutKind(bailoutKind);
         block->insertAtEnd(def->toInstruction());
         def->computeRange(alloc);
       } else {
@@ -4149,364 +3895,6 @@
   return def;
 }
 
-static bool AnalyzePoppedThis(JSContext* cx, DPAConstraintInfo& constraintInfo,
-                              ObjectGroup* group, MDefinition* thisValue,
-                              MInstruction* ins, bool definitelyExecuted,
-                              HandlePlainObject baseobj,
-                              Vector<TypeNewScriptInitializer>* initializerList,
-                              Vector<PropertyName*>* accessedProperties,
-                              bool* phandled) {
-  // Determine the effect that a use of the |this| value when calling |new|
-  // on a script has on the properties definitely held by the new object.
-
-  if (ins->isCallSetProperty()) {
-    MCallSetProperty* setprop = ins->toCallSetProperty();
-
-    if (setprop->object() != thisValue) {
-      return true;
-    }
-
-    if (setprop->name() == cx->names().prototype ||
-        setprop->name() == cx->names().proto ||
-        setprop->name() == cx->names().constructor) {
-      return true;
-    }
-
-    // Ignore assignments to properties that were already written to.
-    if (baseobj->lookup(cx, NameToId(setprop->name()))) {
-      *phandled = true;
-      return true;
-    }
-
-    // Don't add definite properties for properties that were already
-    // read in the constructor.
-    for (size_t i = 0; i < accessedProperties->length(); i++) {
-      if ((*accessedProperties)[i] == setprop->name()) {
-        return true;
-      }
-    }
-
-    // Assignments to new properties must always execute.
-    if (!definitelyExecuted) {
-      return true;
-    }
-
-    RootedId id(cx, NameToId(setprop->name()));
-    bool added = false;
-    if (!AddClearDefiniteGetterSetterForPrototypeChain(cx, constraintInfo,
-                                                       group, id, &added)) {
-      return false;
-    }
-    if (!added) {
-      // The prototype chain already contains a getter/setter for this
-      // property, or type information is too imprecise.
-      return true;
-    }
-
-    // Add the property to the object, being careful not to update type
-    // information.
-    DebugOnly<unsigned> slotSpan = baseobj->slotSpan();
-    MOZ_ASSERT(!baseobj->containsPure(id));
-    if (!NativeObject::addDataProperty(cx, baseobj, id, SHAPE_INVALID_SLOT,
-                                       JSPROP_ENUMERATE)) {
-      return false;
-    }
-    MOZ_ASSERT(baseobj->slotSpan() != slotSpan);
-    MOZ_ASSERT(!baseobj->inDictionaryMode());
-
-    Vector<MResumePoint*> callerResumePoints(cx);
-    for (MResumePoint* rp = ins->block()->callerResumePoint(); rp;
-         rp = rp->block()->callerResumePoint()) {
-      if (!callerResumePoints.append(rp)) {
-        return false;
-      }
-    }
-
-    for (int i = callerResumePoints.length() - 1; i >= 0; i--) {
-      MResumePoint* rp = callerResumePoints[i];
-      JSScript* script = rp->block()->info().script();
-      TypeNewScriptInitializer entry(TypeNewScriptInitializer::SETPROP_FRAME,
-                                     script->pcToOffset(rp->pc()));
-      if (!initializerList->append(entry)) {
-        return false;
-      }
-    }
-
-    JSScript* script = ins->block()->info().script();
-    TypeNewScriptInitializer entry(
-        TypeNewScriptInitializer::SETPROP,
-        script->pcToOffset(setprop->resumePoint()->pc()));
-    if (!initializerList->append(entry)) {
-      return false;
-    }
-
-    *phandled = true;
-    return true;
-  }
-
-  if (ins->isCallGetProperty()) {
-    MCallGetProperty* get = ins->toCallGetProperty();
-
-    /*
-     * Properties can be read from the 'this' object if the following hold:
-     *
-     * - The read is not on a getter along the prototype chain, which
-     *   could cause 'this' to escape.
-     *
-     * - The accessed property is either already a definite property or
-     *   is not later added as one. Since the definite properties are
-     *   added to the object at the point of its creation, reading a
-     *   definite property before it is assigned could incorrectly hit.
-     */
-    RootedId id(cx, NameToId(get->name()));
-    if (!baseobj->lookup(cx, id) && !accessedProperties->append(get->name())) {
-      return false;
-    }
-
-    bool added = false;
-    if (!AddClearDefiniteGetterSetterForPrototypeChain(cx, constraintInfo,
-                                                       group, id, &added)) {
-      return false;
-    }
-    if (!added) {
-      // The |this| value can escape if any property reads it does go
-      // through a getter.
-      return true;
-    }
-
-    *phandled = true;
-    return true;
-  }
-
-  if (ins->isPostWriteBarrier()) {
-    *phandled = true;
-    return true;
-  }
-
-  return true;
-}
-
-static int CmpInstructions(const void* a, const void* b) {
-  return (*static_cast<MInstruction* const*>(a))->id() -
-         (*static_cast<MInstruction* const*>(b))->id();
-}
-
-bool jit::AnalyzeNewScriptDefiniteProperties(
-    JSContext* cx, DPAConstraintInfo& constraintInfo, HandleFunction fun,
-    ObjectGroup* group, HandlePlainObject baseobj,
-    Vector<TypeNewScriptInitializer>* initializerList) {
-  MOZ_ASSERT(cx->zone()->types.activeAnalysis);
-
-  // When invoking 'new' on the specified script, try to find some properties
-  // which will definitely be added to the created object before it has a
-  // chance to escape and be accessed elsewhere.
-
-  RootedScript script(cx, JSFunction::getOrCreateScript(cx, fun));
-  if (!script) {
-    return false;
-  }
-
-  if (!jit::IsIonEnabled(cx) || !jit::IsBaselineJitEnabled(cx) ||
-      !CanBaselineInterpretScript(script)) {
-    return true;
-  }
-
-  static const uint32_t MAX_SCRIPT_SIZE = 2000;
-  if (script->length() > MAX_SCRIPT_SIZE) {
-    return true;
-  }
-
-  TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
-  TraceLoggerEvent event(TraceLogger_AnnotateScripts, script);
-  AutoTraceLog logScript(logger, event);
-  AutoTraceLog logCompile(logger, TraceLogger_IonAnalysis);
-
-  Vector<PropertyName*> accessedProperties(cx);
-
-  LifoAlloc alloc(TempAllocator::PreferredLifoChunkSize);
-  TempAllocator temp(&alloc);
-  JitContext jctx(cx, &temp);
-
-  if (!jit::CanLikelyAllocateMoreExecutableMemory()) {
-    return true;
-  }
-
-  if (!cx->realm()->ensureJitRealmExists(cx)) {
-    return false;
-  }
-
-  AutoKeepJitScripts keepJitScript(cx);
-  if (!script->ensureHasJitScript(cx, keepJitScript)) {
-    return false;
-  }
-
-  JitScript::MonitorThisType(cx, script, TypeSet::ObjectType(group));
-
-  MIRGraph graph(&temp);
-  InlineScriptTree* inlineScriptTree =
-      InlineScriptTree::New(&temp, nullptr, nullptr, script);
-  if (!inlineScriptTree) {
-    return false;
-  }
-
-  CompileInfo info(CompileRuntime::get(cx->runtime()), script, fun,
-                   /* osrPc = */ nullptr, Analysis_DefiniteProperties,
-                   script->needsArgsObj(), inlineScriptTree);
-
-  const OptimizationInfo* optimizationInfo =
-      IonOptimizations.get(OptimizationLevel::Full);
-
-  CompilerConstraintList* constraints = NewCompilerConstraintList(temp);
-  if (!constraints) {
-    ReportOutOfMemory(cx);
-    return false;
-  }
-
-  BaselineInspector inspector(script);
-  const JitCompileOptions options(cx);
-
-  MIRGenerator mirGen(CompileRealm::get(cx->realm()), options, &temp, &graph,
-                      &info, optimizationInfo);
-  IonBuilder builder(cx, mirGen, &info, constraints, &inspector,
-                     /* baselineFrame = */ nullptr);
-
-  AbortReasonOr<Ok> buildResult = builder.build();
-  if (buildResult.isErr()) {
-    AbortReason reason = buildResult.unwrapErr();
-    if (cx->isThrowingOverRecursed() || cx->isThrowingOutOfMemory()) {
-      return false;
-    }
-    if (reason == AbortReason::Alloc) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-    MOZ_ASSERT(!cx->isExceptionPending());
-    return true;
-  }
-
-  FinishDefinitePropertiesAnalysis(cx, constraints);
-
-  if (!SplitCriticalEdges(graph)) {
-    ReportOutOfMemory(cx);
-    return false;
-  }
-
-  RenumberBlocks(graph);
-
-  if (!BuildDominatorTree(graph)) {
-    ReportOutOfMemory(cx);
-    return false;
-  }
-
-  if (!EliminatePhis(&mirGen, graph, AggressiveObservability)) {
-    ReportOutOfMemory(cx);
-    return false;
-  }
-
-  MDefinition* thisValue = graph.entryBlock()->getSlot(info.thisSlot());
-
-  // Get a list of instructions using the |this| value in the order they
-  // appear in the graph.
-  Vector<MInstruction*, 4> instructions(cx);
-
-  for (MUseDefIterator uses(thisValue); uses; uses++) {
-    MDefinition* use = uses.def();
-
-    // Don't track |this| through assignments to phis.
-    if (!use->isInstruction()) {
-      return true;
-    }
-
-    if (!instructions.append(use->toInstruction())) {
-      return false;
-    }
-  }
-
-  // Sort the instructions to visit in increasing order.
-  qsort(instructions.begin(), instructions.length(), sizeof(MInstruction*),
-        CmpInstructions);
-
-  // Find all exit blocks in the graph.
-  Vector<MBasicBlock*> exitBlocks(cx);
-  for (MBasicBlockIterator block(graph.begin()); block != graph.end();
-       block++) {
-    if (!block->numSuccessors() && !exitBlocks.append(*block)) {
-      return false;
-    }
-  }
-
-  // id of the last block which added a new property.
-  size_t lastAddedBlock = 0;
-
-  for (size_t i = 0; i < instructions.length(); i++) {
-    MInstruction* ins = instructions[i];
-
-    // Track whether the use of |this| is in unconditional code, i.e.
-    // the block dominates all graph exits.
-    bool definitelyExecuted = true;
-    for (size_t i = 0; i < exitBlocks.length(); i++) {
-      for (MBasicBlock* exit = exitBlocks[i]; exit != ins->block();
-           exit = exit->immediateDominator()) {
-        if (exit == exit->immediateDominator()) {
-          definitelyExecuted = false;
-          break;
-        }
-      }
-    }
-
-    // Also check to see if the instruction is inside a loop body. Even if
-    // an access will always execute in the script, if it executes multiple
-    // times then we can get confused when rolling back objects while
-    // clearing the new script information.
-    if (ins->block()->loopDepth() != 0) {
-      definitelyExecuted = false;
-    }
-
-    bool handled = false;
-    size_t slotSpan = baseobj->slotSpan();
-    if (!AnalyzePoppedThis(cx, constraintInfo, group, thisValue, ins,
-                           definitelyExecuted, baseobj, initializerList,
-                           &accessedProperties, &handled)) {
-      return false;
-    }
-    if (!handled) {
-      break;
-    }
-
-    if (slotSpan != baseobj->slotSpan()) {
-      MOZ_ASSERT(ins->block()->id() >= lastAddedBlock);
-      lastAddedBlock = ins->block()->id();
-    }
-  }
-
-  if (baseobj->slotSpan() != 0) {
-    // We found some definite properties, but their correctness is still
-    // contingent on the correct frames being inlined. Add constraints to
-    // invalidate the definite properties if additional functions could be
-    // called at the inline frame sites.
-    for (MBasicBlockIterator block(graph.begin()); block != graph.end();
-         block++) {
-      // Inlining decisions made after the last new property was added to
-      // the object don't need to be frozen.
-      if (block->id() > lastAddedBlock) {
-        break;
-      }
-      if (MResumePoint* rp = block->callerResumePoint()) {
-        if (block->numPredecessors() == 1 &&
-            block->getPredecessor(0) == rp->block()) {
-          JSScript* caller = rp->block()->info().script();
-          JSScript* callee = block->info().script();
-          if (!constraintInfo.addInliningConstraint(caller, callee)) {
-            return false;
-          }
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
 static bool ArgumentsUseCanBeLazy(JSContext* cx, JSScript* script,
                                   MInstruction* ins, size_t index,
                                   bool* argumentsContentsObserved) {
@@ -4521,18 +3909,11 @@
   }
 
   // arguments[i] can read fp->unaliasedActual(i) directly.
-  if (JitOptions.warpBuilder) {
-    if (ins->isGetPropertyCache() && index == 0 &&
-        IsGetElemPC(ins->resumePoint()->pc())) {
-      script->setUninlineable();
-      *argumentsContentsObserved = true;
-      return true;
-    }
-  } else {
-    if (ins->isCallGetElement() && index == 0) {
-      *argumentsContentsObserved = true;
-      return true;
-    }
+  if (ins->isGetPropertyCache() && index == 0 &&
+      IsGetElemPC(ins->resumePoint()->pc())) {
+    script->setUninlineable();
+    *argumentsContentsObserved = true;
+    return true;
   }
 
   // MGetArgumentsObjectArg needs to be considered as a use that allows
@@ -4554,17 +3935,10 @@
     return false;
   };
 
-  if (JitOptions.warpBuilder) {
-    if (ins->isGetPropertyCache() && index == 0) {
-      MDefinition* id = ins->toGetPropertyCache()->idval();
-      if (id->isConstant() && id->type() == MIRType::String &&
-          getPropCanBeLazy(id->toConstant()->toString())) {
-        return true;
-      }
-    }
-  } else {
-    if (ins->isCallGetProperty() && index == 0 &&
-        getPropCanBeLazy(ins->toCallGetProperty()->name())) {
+  if (ins->isGetPropertyCache() && index == 0) {
+    MDefinition* id = ins->toGetPropertyCache()->idval();
+    if (id->isConstant() && id->type() == MIRType::String &&
+        getPropCanBeLazy(id->toConstant()->toString())) {
       return true;
     }
   }
@@ -4574,7 +3948,7 @@
 
 bool jit::AnalyzeArgumentsUsage(JSContext* cx, JSScript* scriptArg) {
   RootedScript script(cx, scriptArg);
-  AutoEnterAnalysis enter(cx);
+  gc::AutoSuppressGC suppressGC(cx);
 
   MOZ_ASSERT(script->needsArgsAnalysis());
   MOZ_ASSERT(script->argumentsHasVarBinding());
@@ -4649,7 +4023,7 @@
   MIRGenerator mirGen(CompileRealm::get(cx->realm()), options, &temp, &graph,
                       &info, optimizationInfo);
 
-  if (JitOptions.warpBuilder) {
+  {
     WarpOracle oracle(cx, mirGen, script);
 
     AbortReasonOr<WarpSnapshot*> result = oracle.createSnapshot();
@@ -4672,30 +4046,6 @@
       ReportOutOfMemory(cx);
       return false;
     }
-  } else {
-    CompilerConstraintList* constraints = NewCompilerConstraintList(temp);
-    if (!constraints) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-
-    BaselineInspector inspector(script);
-    IonBuilder builder(nullptr, mirGen, &info, constraints, &inspector,
-                       /* baselineFrame = */ nullptr);
-
-    AbortReasonOr<Ok> buildResult = builder.build();
-    if (buildResult.isErr()) {
-      AbortReason reason = buildResult.unwrapErr();
-      if (cx->isThrowingOverRecursed() || cx->isThrowingOutOfMemory()) {
-        return false;
-      }
-      if (reason == AbortReason::Alloc) {
-        ReportOutOfMemory(cx);
-        return false;
-      }
-      MOZ_ASSERT(!cx->isExceptionPending());
-      return true;
-    }
   }
 
   if (!SplitCriticalEdges(graph)) {
@@ -4940,7 +4290,7 @@
 
       MIRType type = unbox->type();
       MUnbox::Mode mode = unbox->mode();
-      BailoutKind bailoutKind = unbox->bailoutKindUnchecked();
+      BailoutKind bailoutKind = unbox->bailoutKind();
 
       MInstruction* replacement;
       switch (load->op()) {
diff -Nru firefox-84.0.2+build1/js/src/jit/IonAnalysis.h firefox-85.0+build1/js/src/jit/IonAnalysis.h
--- firefox-84.0.2+build1/js/src/jit/IonAnalysis.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonAnalysis.h	2021-01-18 19:58:13.000000000 +0000
@@ -22,11 +22,9 @@
 
 namespace js {
 
-class DPAConstraintInfo;
 class GenericPrinter;
 class ObjectGroup;
 class PlainObject;
-class TypeNewScriptInitializer;
 
 namespace jit {
 
@@ -169,12 +167,7 @@
 // Convert all components of a linear sum (except the constant)
 // and add any new instructions to the end of block.
 MDefinition* ConvertLinearSum(TempAllocator& alloc, MBasicBlock* block,
-                              const LinearSum& sum);
-
-MOZ_MUST_USE bool AnalyzeNewScriptDefiniteProperties(
-    JSContext* cx, DPAConstraintInfo& constraintInfo, JS::HandleFunction fun,
-    ObjectGroup* group, JS::Handle<PlainObject*> baseobj,
-    Vector<TypeNewScriptInitializer>* initializerList);
+                              const LinearSum& sum, BailoutKind bailoutKind);
 
 MOZ_MUST_USE bool AnalyzeArgumentsUsage(JSContext* cx, JSScript* script);
 
diff -Nru firefox-84.0.2+build1/js/src/jit/IonBuilder.cpp firefox-85.0+build1/js/src/jit/IonBuilder.cpp
--- firefox-84.0.2+build1/js/src/jit/IonBuilder.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonBuilder.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,12928 +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 "jit/IonBuilder.h"
-
-#include "mozilla/DebugOnly.h"
-#include "mozilla/ScopeExit.h"
-
-#include <algorithm>
-
-#include "builtin/Eval.h"
-#include "builtin/ModuleObject.h"
-#include "frontend/SourceNotes.h"
-#include "jit/BaselineFrame.h"
-#include "jit/BaselineInspector.h"
-#include "jit/CacheIR.h"
-#include "jit/CompileInfo.h"
-#include "jit/InlineScriptTree.h"
-#include "jit/Ion.h"
-#include "jit/IonOptimizationLevels.h"
-#include "jit/JitSpewer.h"
-#include "jit/Lowering.h"
-#include "jit/MIRGraph.h"
-#include "js/experimental/JitInfo.h"  // JSJitInfo
-#include "js/friend/ErrorMessages.h"  // JSMSG_*
-#include "js/Object.h"                // JS::GetReservedSlot
-#include "js/ScalarType.h"            // js::Scalar::Type
-#include "util/CheckedArithmetic.h"
-#include "vm/ArgumentsObject.h"
-#include "vm/BuiltinObjectKind.h"
-#include "vm/BytecodeIterator.h"
-#include "vm/BytecodeLocation.h"
-#include "vm/BytecodeUtil.h"
-#include "vm/Instrumentation.h"
-#include "vm/Opcodes.h"
-#include "vm/PlainObject.h"  // js::PlainObject
-#include "vm/RegExpStatics.h"
-#include "vm/SelfHosting.h"
-#include "vm/TraceLogging.h"
-#include "wasm/TypedObject.h"
-
-#include "gc/Nursery-inl.h"
-#include "jit/CompileInfo-inl.h"
-#include "jit/InlineScriptTree-inl.h"
-#include "jit/shared/Lowering-shared-inl.h"
-#include "vm/BytecodeIterator-inl.h"
-#include "vm/BytecodeLocation-inl.h"
-#include "vm/BytecodeUtil-inl.h"
-#include "vm/EnvironmentObject-inl.h"
-#include "vm/JSScript-inl.h"
-#include "vm/NativeObject-inl.h"
-#include "vm/ObjectGroup-inl.h"
-
-using namespace js;
-using namespace js::jit;
-
-using mozilla::AssertedCast;
-using mozilla::DebugOnly;
-using mozilla::Maybe;
-using mozilla::Nothing;
-
-class jit::BaselineFrameInspector {
- public:
-  TypeSet::Type thisType;
-  JSObject* singletonEnvChain;
-
-  Vector<TypeSet::Type, 4, JitAllocPolicy> argTypes;
-  Vector<TypeSet::Type, 4, JitAllocPolicy> varTypes;
-
-  explicit BaselineFrameInspector(TempAllocator* temp)
-      : thisType(TypeSet::UndefinedType()),
-        singletonEnvChain(nullptr),
-        argTypes(*temp),
-        varTypes(*temp) {}
-};
-
-BaselineFrameInspector* jit::NewBaselineFrameInspector(TempAllocator* temp,
-                                                       BaselineFrame* frame,
-                                                       uint32_t frameSize) {
-  MOZ_ASSERT(frame);
-
-  BaselineFrameInspector* inspector =
-      temp->lifoAlloc()->new_<BaselineFrameInspector>(temp);
-  if (!inspector) {
-    return nullptr;
-  }
-
-  // Note: copying the actual values into a temporary structure for use
-  // during compilation could capture nursery pointers, so the values' types
-  // are recorded instead.
-
-  if (frame->isFunctionFrame()) {
-    inspector->thisType =
-        TypeSet::GetMaybeUntrackedValueType(frame->thisArgument());
-  }
-
-  if (frame->environmentChain()->isSingleton()) {
-    inspector->singletonEnvChain = frame->environmentChain();
-  }
-
-  JSScript* script = frame->script();
-
-  if (script->function()) {
-    if (!inspector->argTypes.reserve(frame->numFormalArgs())) {
-      return nullptr;
-    }
-    for (size_t i = 0; i < frame->numFormalArgs(); i++) {
-      if (script->formalIsAliased(i)) {
-        inspector->argTypes.infallibleAppend(TypeSet::UndefinedType());
-      } else if (!script->argsObjAliasesFormals()) {
-        TypeSet::Type type =
-            TypeSet::GetMaybeUntrackedValueType(frame->unaliasedFormal(i));
-        inspector->argTypes.infallibleAppend(type);
-      } else if (frame->hasArgsObj()) {
-        TypeSet::Type type =
-            TypeSet::GetMaybeUntrackedValueType(frame->argsObj().arg(i));
-        inspector->argTypes.infallibleAppend(type);
-      } else {
-        inspector->argTypes.infallibleAppend(TypeSet::UndefinedType());
-      }
-    }
-  }
-
-  uint32_t numValueSlots = frame->numValueSlots(frameSize);
-  if (!inspector->varTypes.reserve(numValueSlots)) {
-    return nullptr;
-  }
-  for (size_t i = 0; i < numValueSlots; i++) {
-    TypeSet::Type type =
-        TypeSet::GetMaybeUntrackedValueType(*frame->valueSlot(i));
-    inspector->varTypes.infallibleAppend(type);
-  }
-
-  return inspector;
-}
-
-IonBuilder::IonBuilder(JSContext* analysisContext, MIRGenerator& mirGen,
-                       CompileInfo* info, CompilerConstraintList* constraints,
-                       BaselineInspector* inspector,
-                       BaselineFrameInspector* baselineFrame,
-                       size_t inliningDepth, uint32_t loopDepth)
-    : actionableAbortScript_(nullptr),
-      actionableAbortPc_(nullptr),
-      actionableAbortMessage_(nullptr),
-      analysisContext(analysisContext),
-      baselineFrame_(baselineFrame),
-      constraints_(constraints),
-      mirGen_(mirGen),
-      tiOracle_(this, constraints),
-      realm(mirGen.realm),
-      info_(info),
-      optimizationInfo_(&mirGen.optimizationInfo()),
-      alloc_(&mirGen.alloc()),
-      graph_(&mirGen.graph()),
-      thisTypes(nullptr),
-      argTypes(nullptr),
-      typeArray(nullptr),
-      typeArrayHint(0),
-      bytecodeTypeMap(nullptr),
-      loopDepth_(loopDepth),
-      loopStack_(*alloc_),
-      trackedOptimizationSites_(*alloc_),
-      abortedPreliminaryGroups_(*alloc_),
-      callerResumePoint_(nullptr),
-      callerBuilder_(nullptr),
-      iterators_(*alloc_),
-      loopHeaders_(*alloc_),
-      inspector(inspector),
-      inliningDepth_(inliningDepth),
-      inlinedBytecodeLength_(0),
-      numLoopRestarts_(0),
-      failedBoundsCheck_(info_->script()->failedBoundsCheck()),
-      failedShapeGuard_(info_->script()->failedShapeGuard()),
-      failedLexicalCheck_(info_->script()->failedLexicalCheck()),
-#ifdef DEBUG
-      hasLazyArguments_(false),
-#endif
-      inlineCallInfo_(nullptr),
-      maybeFallbackFunctionGetter_(nullptr) {
-  script_ = info_->script();
-  pc = script_->code();
-
-  // The script must have a JitScript. Compilation requires a BaselineScript
-  // too.
-  MOZ_ASSERT(script_->hasJitScript());
-  MOZ_ASSERT_IF(!info_->isAnalysis(), script_->hasBaselineScript());
-
-  MOZ_ASSERT(!!analysisContext ==
-             (info_->analysisMode() == Analysis_DefiniteProperties));
-  MOZ_ASSERT(script_->numBytecodeTypeSets() < JSScript::MaxBytecodeTypeSets);
-
-  if (!info_->isAnalysis()) {
-    script()->jitScript()->setIonCompiledOrInlined();
-  }
-}
-
-mozilla::GenericErrorResult<AbortReason> IonBuilder::abort(AbortReason r) {
-  auto res = mirGen_.abort(r);
-  [[maybe_unused]] unsigned line, column;
-#ifdef DEBUG
-  line = PCToLineNumber(script(), pc, &column);
-#else
-  line = script()->lineno();
-  column = script()->column();
-#endif
-  JitSpew(JitSpew_IonAbort, "aborted @ %s:%u:%u", script()->filename(), line,
-          column);
-  return res;
-}
-
-mozilla::GenericErrorResult<AbortReason> IonBuilder::abort(AbortReason r,
-                                                           const char* message,
-                                                           ...) {
-  // Don't call PCToLineNumber in release builds.
-  va_list ap;
-  va_start(ap, message);
-  auto res = mirGen_.abortFmt(r, message, ap);
-  va_end(ap);
-  [[maybe_unused]] unsigned line, column;
-#ifdef DEBUG
-  line = PCToLineNumber(script(), pc, &column);
-#else
-  line = script()->lineno();
-  column = script()->column();
-#endif
-  JitSpew(JitSpew_IonAbort, "aborted @ %s:%u:%u", script()->filename(), line,
-          column);
-  return res;
-}
-
-IonBuilder* IonBuilder::outermostBuilder() {
-  IonBuilder* builder = this;
-  while (builder->callerBuilder_) {
-    builder = builder->callerBuilder_;
-  }
-  return builder;
-}
-
-void IonBuilder::spew(const char* message) {
-  // Don't call PCToLineNumber in release builds.
-#ifdef DEBUG
-  JitSpew(JitSpew_IonMIR, "%s @ %s:%u", message, script()->filename(),
-          PCToLineNumber(script(), pc));
-#endif
-}
-
-JSFunction* IonBuilder::getSingleCallTarget(TemporaryTypeSet* calleeTypes) {
-  if (!calleeTypes) {
-    return nullptr;
-  }
-
-  TemporaryTypeSet::ObjectKey* key = calleeTypes->maybeSingleObject();
-  if (!key || key->clasp() != &JSFunction::class_) {
-    return nullptr;
-  }
-
-  if (key->isSingleton()) {
-    return &key->singleton()->as<JSFunction>();
-  }
-
-  if (JSFunction* fun = key->group()->maybeInterpretedFunction()) {
-    return fun;
-  }
-
-  return nullptr;
-}
-
-AbortReasonOr<Ok> IonBuilder::getPolyCallTargets(TemporaryTypeSet* calleeTypes,
-                                                 bool constructing,
-                                                 InliningTargets& targets,
-                                                 uint32_t maxTargets) {
-  MOZ_ASSERT(targets.empty());
-
-  if (!calleeTypes) {
-    return Ok();
-  }
-
-  if (calleeTypes->baseFlags() != 0) {
-    return Ok();
-  }
-
-  unsigned objCount = calleeTypes->getObjectCount();
-
-  if (objCount == 0 || objCount > maxTargets) {
-    return Ok();
-  }
-
-  if (!targets.reserve(objCount)) {
-    return abort(AbortReason::Alloc);
-  }
-  for (unsigned i = 0; i < objCount; i++) {
-    JSObject* obj = calleeTypes->getSingleton(i);
-    ObjectGroup* group = nullptr;
-    if (obj) {
-      MOZ_ASSERT(obj->isSingleton());
-    } else {
-      group = calleeTypes->getGroup(i);
-      if (!group) {
-        continue;
-      }
-
-      obj = group->maybeInterpretedFunction();
-      if (!obj) {
-        targets.clear();
-        return Ok();
-      }
-
-      MOZ_ASSERT(!obj->isSingleton());
-    }
-
-    // Don't optimize if the callee is not callable or constructable per
-    // the manner it is being invoked, so that CallKnown does not have to
-    // handle these cases (they will always throw).
-    if (constructing ? !obj->isConstructor() : !obj->isCallable()) {
-      targets.clear();
-      return Ok();
-    }
-
-    targets.infallibleAppend(InliningTarget(obj, group));
-  }
-
-  return Ok();
-}
-
-IonBuilder::InliningDecision IonBuilder::DontInline(JSScript* targetScript,
-                                                    const char* reason) {
-  if (targetScript) {
-    JitSpew(JitSpew_Inlining, "Cannot inline %s:%u:%u %s",
-            targetScript->filename(), targetScript->lineno(),
-            targetScript->column(), reason);
-  } else {
-    JitSpew(JitSpew_Inlining, "Cannot inline: %s", reason);
-  }
-
-  return InliningDecision_DontInline;
-}
-
-/*
- * |hasCommonInliningPath| determines whether the current inlining path has been
- * seen before based on the sequence of scripts in the chain of |IonBuilder|s.
- *
- * An inlining path for a function |f| is the sequence of functions whose
- * inlinings precede |f| up to any previous occurrences of |f|.
- * So, if we have the chain of inlinings
- *
- *          f1 -> f2 -> f -> f3 -> f4 -> f5 -> f
- *          --------         --------------
- *
- * the inlining paths for |f| are [f2, f1] and [f5, f4, f3].
- * When attempting to inline |f|, we find all existing inlining paths for |f|
- * and check whether they share a common prefix with the path created were |f|
- * inlined.
- *
- * For example, given mutually recursive functions |f| and |g|, a possible
- * inlining is
- *
- *                           +---- Inlining stopped here...
- *                           |
- *                           v
- *          a -> f -> g -> f \ -> g -> f -> g -> ...
- *
- * where the vertical bar denotes the termination of inlining.
- * Inlining is terminated because we have already observed the inlining path
- * [f] when inlining function |g|. Note that this will inline recursive
- * functions such as |fib| only one level, as |fib| has a zero length inlining
- * path which trivially prefixes all inlining paths.
- *
- */
-bool IonBuilder::hasCommonInliningPath(const JSScript* scriptToInline) {
-  // Find all previous inlinings of the |scriptToInline| and check for common
-  // inlining paths with the top of the inlining stack.
-  for (IonBuilder* it = this->callerBuilder_; it; it = it->callerBuilder_) {
-    if (it->script() != scriptToInline) {
-      continue;
-    }
-
-    // This only needs to check the top of each stack for a match,
-    // as a match of length one ensures a common prefix.
-    IonBuilder* path = it->callerBuilder_;
-    if (!path || this->script() == path->script()) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-IonBuilder::InliningDecision IonBuilder::canInlineTarget(JSFunction* target,
-                                                         CallInfo& callInfo) {
-  if (!optimizationInfo().inlineInterpreted()) {
-    return InliningDecision_DontInline;
-  }
-
-  if (TraceLogTextIdEnabled(TraceLogger_InlinedScripts)) {
-    return DontInline(nullptr,
-                      "Tracelogging of inlined scripts is enabled"
-                      "but Tracelogger cannot do that yet.");
-  }
-
-  if (!target->isInterpreted()) {
-    return DontInline(nullptr, "Non-interpreted target");
-  }
-
-  // Never inline scripted cross-realm calls.
-  if (target->realm() != script()->realm()) {
-    return DontInline(nullptr, "Cross-realm call");
-  }
-
-  if (info().analysisMode() != Analysis_DefiniteProperties) {
-    // If |this| or an argument has an empty resultTypeSet, don't bother
-    // inlining, as the call is currently unreachable due to incomplete type
-    // information. This does not apply to the definite properties analysis,
-    // in that case we want to inline anyway.
-
-    if (callInfo.thisArg()->emptyResultTypeSet()) {
-      return DontInline(nullptr, "Empty TypeSet for |this|");
-    }
-
-    for (size_t i = 0; i < callInfo.argc(); i++) {
-      if (callInfo.getArg(i)->emptyResultTypeSet()) {
-        return DontInline(nullptr, "Empty TypeSet for argument");
-      }
-    }
-  }
-
-  // Allow constructing lazy scripts when performing the definite properties
-  // analysis, as baseline has not been used to warm the caller up yet.
-  if (target->isInterpreted() &&
-      info().analysisMode() == Analysis_DefiniteProperties) {
-    RootedFunction fun(analysisContext, target);
-    RootedScript script(analysisContext,
-                        JSFunction::getOrCreateScript(analysisContext, fun));
-    if (!script) {
-      return InliningDecision_Error;
-    }
-
-    if (CanBaselineInterpretScript(script)) {
-      AutoKeepJitScripts keepJitScript(analysisContext);
-      if (!script->ensureHasJitScript(analysisContext, keepJitScript)) {
-        return InliningDecision_Error;
-      }
-    }
-  }
-
-  if (!target->hasBytecode()) {
-    return DontInline(nullptr, "Lazy script");
-  }
-
-  JSScript* inlineScript = target->nonLazyScript();
-  if (callInfo.constructing()) {
-    if (!target->isConstructor()) {
-      return DontInline(inlineScript, "Callee is not a constructor");
-    }
-
-    // Don't inline if creating |this| for this target is complicated, for
-    // example when the newTarget.prototype lookup may be effectful.
-    if (!target->constructorNeedsUninitializedThis() &&
-        callInfo.getNewTarget() != callInfo.callee()) {
-      JSFunction* newTargetFun =
-          getSingleCallTarget(callInfo.getNewTarget()->resultTypeSet());
-      if (!newTargetFun) {
-        return DontInline(inlineScript, "Constructing with unknown newTarget");
-      }
-      if (!newTargetFun->hasNonConfigurablePrototypeDataProperty()) {
-        return DontInline(inlineScript,
-                          "Constructing with effectful newTarget.prototype");
-      }
-    } else {
-      // At this point, the target is either a function that requires an
-      // uninitialized-this (bound function or derived class constructor) or a
-      // scripted constructor with a non-configurable .prototype data property
-      // (self-hosted built-in constructor, non-self-hosted scripted function).
-      MOZ_ASSERT(target->constructorNeedsUninitializedThis() ||
-                 target->hasNonConfigurablePrototypeDataProperty());
-    }
-  }
-
-  if (!callInfo.constructing() && target->isClassConstructor()) {
-    return DontInline(inlineScript, "Not constructing class constructor");
-  }
-
-  if (!CanIonInlineScript(inlineScript)) {
-    return DontInline(inlineScript, "Disabled Ion compilation");
-  }
-
-  if (info().isAnalysis()) {
-    // Analysis requires only a JitScript.
-    if (!inlineScript->hasJitScript()) {
-      return DontInline(inlineScript, "No JitScript");
-    }
-  } else {
-    // Compilation requires a BaselineScript.
-    if (!inlineScript->hasBaselineScript()) {
-      return DontInline(inlineScript, "No baseline jitcode");
-    }
-  }
-
-  // Don't inline functions with a higher optimization level.
-  if (!isHighestOptimizationLevel()) {
-    OptimizationLevel level = optimizationLevel();
-    if (inlineScript->hasIonScript() &&
-        (inlineScript->ionScript()->isRecompiling() ||
-         inlineScript->ionScript()->optimizationLevel() > level)) {
-      return DontInline(inlineScript, "More optimized");
-    }
-    if (IonOptimizations.levelForScript(inlineScript, nullptr) > level) {
-      return DontInline(inlineScript, "Should be more optimized");
-    }
-  }
-
-  if (TooManyFormalArguments(target->nargs())) {
-    return DontInline(inlineScript, "Too many args");
-  }
-
-  // We check the number of actual arguments against the maximum number of
-  // formal arguments as we do not want to encode all actual arguments in the
-  // callerResumePoint.
-  if (TooManyFormalArguments(callInfo.argc())) {
-    return DontInline(inlineScript, "Too many actual args");
-  }
-
-  if (hasCommonInliningPath(inlineScript)) {
-    return DontInline(inlineScript, "Common inlining path");
-  }
-
-  if (inlineScript->uninlineable()) {
-    return DontInline(inlineScript, "Uninlineable script");
-  }
-
-  if (inlineScript->needsArgsObj()) {
-    return DontInline(inlineScript, "Script that needs an arguments object");
-  }
-
-  if (inlineScript->isDebuggee()) {
-    return DontInline(inlineScript, "Script is debuggee");
-  }
-
-  return InliningDecision_Inline;
-}
-
-AbortReasonOr<Ok> IonBuilder::analyzeNewLoopTypes(MBasicBlock* entry) {
-  MOZ_ASSERT(!entry->isDead());
-  MOZ_ASSERT(JSOp(*pc) == JSOp::LoopHead);
-
-  // The phi inputs at the loop head only reflect types for variables that
-  // were present at the start of the loop. If the variable changes to a new
-  // type within the loop body, and that type is carried around to the loop
-  // head, then we need to know about the new type up front.
-  //
-  // Since SSA information hasn't been constructed for the loop body yet, we
-  // need a separate analysis to pick out the types that might flow around
-  // the loop header. This is a best-effort analysis that may either over-
-  // or under-approximate the set of such types.
-  //
-  // Over-approximating the types may lead to inefficient generated code, and
-  // under-approximating the types will cause the loop body to be analyzed
-  // multiple times as the correct types are deduced (see finishLoop).
-
-  // If we restarted processing of an outer loop then get loop header types
-  // directly from the last time we have previously processed this loop. This
-  // both avoids repeated work from the bytecode traverse below, and will
-  // also pick up types discovered while previously building the loop body.
-  bool foundEntry = false;
-  for (size_t i = 0; i < loopHeaders_.length(); i++) {
-    if (loopHeaders_[i].pc == pc) {
-      MBasicBlock* oldEntry = loopHeaders_[i].header;
-
-      // If this block has been discarded, its resume points will have
-      // already discarded their operands.
-      if (oldEntry->isDead()) {
-        loopHeaders_[i].header = entry;
-        foundEntry = true;
-        break;
-      }
-
-      MResumePoint* oldEntryRp = oldEntry->entryResumePoint();
-      size_t stackDepth = oldEntryRp->stackDepth();
-      for (size_t slot = 0; slot < stackDepth; slot++) {
-        MDefinition* oldDef = oldEntryRp->getOperand(slot);
-        if (!oldDef->isPhi()) {
-          MOZ_ASSERT(oldDef->block()->id() < oldEntry->id());
-          MOZ_ASSERT(oldDef == entry->getSlot(slot));
-          continue;
-        }
-        MPhi* oldPhi = oldDef->toPhi();
-        MPhi* newPhi = entry->getSlot(slot)->toPhi();
-        if (!newPhi->addBackedgeType(alloc(), oldPhi->type(),
-                                     oldPhi->resultTypeSet())) {
-          return abort(AbortReason::Alloc);
-        }
-      }
-
-      // Update the most recent header for this loop encountered, in case
-      // new types flow to the phis and the loop is processed at least
-      // three times.
-      loopHeaders_[i].header = entry;
-      return Ok();
-    }
-  }
-  if (!foundEntry) {
-    if (!loopHeaders_.append(LoopHeader(pc, entry))) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  // Get the start and end bytecode locations.
-  BytecodeLocation start(script_, pc);
-  BytecodeLocation end(script_, script_->codeEnd());
-
-  // Iterate the bytecode quickly to seed possible types in the loopheader.
-  Maybe<BytecodeLocation> last;
-  Maybe<BytecodeLocation> earlier;
-
-  for (auto it : BytecodeLocationRange(start, end)) {
-    if (IsBackedgeForLoopHead(it.toRawBytecode(), pc)) {
-      break;
-    }
-    MOZ_TRY(analyzeNewLoopTypesForLocation(entry, it, last, earlier));
-    earlier = last;
-    last = mozilla::Some(it);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::analyzeNewLoopTypesForLocation(
-    MBasicBlock* entry, const BytecodeLocation loc,
-    const Maybe<BytecodeLocation>& last_,
-    const Maybe<BytecodeLocation>& earlier) {
-  // Unfortunately Maybe<> cannot be passed as by-value argument so make a copy
-  // here.
-  Maybe<BytecodeLocation> last = last_;
-
-  // We're only interested in JSOp::SetLocal and JSOp::SetArg.
-  uint32_t slot;
-  if (loc.is(JSOp::SetLocal)) {
-    slot = info().localSlot(loc.local());
-  } else if (loc.is(JSOp::SetArg)) {
-    slot = info().argSlotUnchecked(loc.arg());
-  } else {
-    return Ok();
-  }
-  if (slot >= info().firstStackSlot()) {
-    return Ok();
-  }
-
-  // Ensure there is a |last| instruction.
-  if (!last) {
-    return Ok();
-  }
-  MOZ_ASSERT(last->isValid(script_));
-
-  // Analyze the |last| bytecode instruction to try to dermine the type of this
-  // local/argument.
-
-  MPhi* phi = entry->getSlot(slot)->toPhi();
-
-  auto addPhiBackedgeType =
-      [&](MIRType type, TemporaryTypeSet* typeSet) -> AbortReasonOr<Ok> {
-    if (!phi->addBackedgeType(alloc(), type, typeSet)) {
-      return abort(AbortReason::Alloc);
-    }
-    return Ok();
-  };
-
-  // If it's a JSOp::Pos or JSOp::ToNumeric, use its operand instead.
-  if (last->is(JSOp::Pos) || last->is(JSOp::ToNumeric)) {
-    MOZ_ASSERT(earlier);
-    last = earlier;
-  }
-
-  // If the |last| op had a TypeSet, use it.
-  if (last->opHasTypeSet()) {
-    TemporaryTypeSet* typeSet = bytecodeTypes(last->toRawBytecode());
-    if (typeSet->empty()) {
-      return Ok();
-    }
-    return addPhiBackedgeType(typeSet->getKnownMIRType(), typeSet);
-  }
-
-  // If the |last| op was a JSOp::GetLocal or JSOp::GetArg, use that slot's
-  // type.
-  if (last->is(JSOp::GetLocal) || last->is(JSOp::GetArg)) {
-    uint32_t slot = (last->is(JSOp::GetLocal))
-                        ? info().localSlot(last->local())
-                        : info().argSlotUnchecked(last->arg());
-    if (slot >= info().firstStackSlot()) {
-      return Ok();
-    }
-    MPhi* otherPhi = entry->getSlot(slot)->toPhi();
-    if (!otherPhi->hasBackedgeType()) {
-      return Ok();
-    }
-    return addPhiBackedgeType(otherPhi->type(), otherPhi->resultTypeSet());
-  }
-
-  // If the |last| op has a known type (determined statically or from
-  // BaselineInspector), use that.
-  MIRType type = MIRType::None;
-  switch (last->getOp()) {
-    case JSOp::Void:
-    case JSOp::Undefined:
-      type = MIRType::Undefined;
-      break;
-    case JSOp::GImplicitThis:
-      if (!script()->hasNonSyntacticScope()) {
-        type = MIRType::Undefined;
-      }
-      break;
-    case JSOp::Null:
-      type = MIRType::Null;
-      break;
-    case JSOp::Zero:
-    case JSOp::One:
-    case JSOp::Int8:
-    case JSOp::Int32:
-    case JSOp::Uint16:
-    case JSOp::Uint24:
-    case JSOp::ResumeIndex:
-      type = MIRType::Int32;
-      break;
-    case JSOp::BitAnd:
-    case JSOp::BitOr:
-    case JSOp::BitXor:
-    case JSOp::BitNot:
-    case JSOp::Rsh:
-    case JSOp::Lsh:
-      type = inspector->expectedResultType(last->toRawBytecode());
-      break;
-    case JSOp::Ursh:
-      // Unsigned right shift is not applicable to BigInts, so we don't need
-      // to query the baseline inspector for the possible result types.
-      type = MIRType::Int32;
-      break;
-    case JSOp::False:
-    case JSOp::True:
-    case JSOp::Eq:
-    case JSOp::Ne:
-    case JSOp::Lt:
-    case JSOp::Le:
-    case JSOp::Gt:
-    case JSOp::Ge:
-    case JSOp::Not:
-    case JSOp::StrictEq:
-    case JSOp::StrictNe:
-    case JSOp::In:
-    case JSOp::Instanceof:
-    case JSOp::HasOwn:
-      type = MIRType::Boolean;
-      break;
-    case JSOp::Double:
-      type = MIRType::Double;
-      break;
-    case JSOp::IterNext:
-    case JSOp::String:
-    case JSOp::ToString:
-    case JSOp::Typeof:
-    case JSOp::TypeofExpr:
-      type = MIRType::String;
-      break;
-    case JSOp::Symbol:
-      type = MIRType::Symbol;
-      break;
-    case JSOp::Add:
-    case JSOp::Sub:
-    case JSOp::Mul:
-    case JSOp::Div:
-    case JSOp::Mod:
-    case JSOp::Neg:
-    case JSOp::Inc:
-    case JSOp::Dec:
-      type = inspector->expectedResultType(last->toRawBytecode());
-      break;
-    case JSOp::BigInt:
-      type = MIRType::BigInt;
-      break;
-    default:
-      break;
-  }
-
-  if (type == MIRType::None) {
-    return Ok();
-  }
-
-  return addPhiBackedgeType(type, /* typeSet = */ nullptr);
-}
-
-AbortReasonOr<Ok> IonBuilder::init() {
-  {
-    LifoAlloc::AutoFallibleScope fallibleAllocator(alloc().lifoAlloc());
-    if (!JitScript::FreezeTypeSets(constraints(), script(), &thisTypes,
-                                   &argTypes, &typeArray)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  if (!alloc().ensureBallast()) {
-    return abort(AbortReason::Alloc);
-  }
-
-  {
-    JSContext* cx = TlsContext.get();
-    RootedScript rootedScript(cx, script());
-    if (!rootedScript->jitScript()->ensureHasCachedIonData(cx, rootedScript)) {
-      return abort(AbortReason::Error);
-    }
-  }
-
-  if (inlineCallInfo_) {
-    // If we're inlining, the actual this/argument types are not necessarily
-    // a subset of the script's observed types. |argTypes| is never accessed
-    // for inlined scripts, so we just null it.
-    thisTypes = inlineCallInfo_->thisArg()->resultTypeSet();
-    argTypes = nullptr;
-  }
-
-  bytecodeTypeMap = script()->jitScript()->bytecodeTypeMap();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::build() {
-  // Spew IC info for inlined script, but only when actually compiling,
-  // not when analyzing it.
-#ifdef JS_STRUCTURED_SPEW
-  if (!info().isAnalysis()) {
-    JitSpewBaselineICStats(script(), "To-Be-Compiled");
-  }
-#endif
-
-  MOZ_TRY(init());
-
-  // The JitScript-based inlining heuristics only affect the highest
-  // optimization level. Other levels do almost no inlining and we don't want to
-  // overwrite data from the highest optimization tier.
-  if (isHighestOptimizationLevel()) {
-    script()->jitScript()->resetMaxInliningDepth();
-  }
-
-  MBasicBlock* entry;
-  MOZ_TRY_VAR(entry, newBlock(info().firstStackSlot(), pc));
-  MOZ_TRY(setCurrentAndSpecializePhis(entry));
-
-#ifdef JS_JITSPEW
-  if (info().isAnalysis()) {
-    JitSpew(JitSpew_IonScripts, "Analyzing script %s:%u:%u (%p) %s",
-            script()->filename(), script()->lineno(), script()->column(),
-            (void*)script(), AnalysisModeString(info().analysisMode()));
-  } else {
-    JitSpew(JitSpew_IonScripts,
-            "%sompiling script %s:%u:%u (%p) (warmup-counter=%" PRIu32
-            ", level=%s)",
-            (script()->hasIonScript() ? "Rec" : "C"), script()->filename(),
-            script()->lineno(), script()->column(), (void*)script(),
-            script()->getWarmUpCount(),
-            OptimizationLevelString(optimizationLevel()));
-  }
-#endif
-
-  MOZ_TRY(initParameters());
-  initLocals();
-
-  // Initialize something for the env chain. We can bail out before the
-  // start instruction, but the snapshot is encoded *at* the start
-  // instruction, which means generating any code that could load into
-  // registers is illegal.
-  MInstruction* env = MConstant::New(alloc(), UndefinedValue());
-  current->add(env);
-  current->initSlot(info().environmentChainSlot(), env);
-
-  // Initialize the return value.
-  MInstruction* returnValue = MConstant::New(alloc(), UndefinedValue());
-  current->add(returnValue);
-  current->initSlot(info().returnValueSlot(), returnValue);
-
-  // Initialize the arguments object slot to undefined if necessary.
-  if (info().hasArguments()) {
-    MInstruction* argsObj = MConstant::New(alloc(), UndefinedValue());
-    current->add(argsObj);
-    current->initSlot(info().argsObjSlot(), argsObj);
-  }
-
-  // Emit the start instruction, so we can begin real instructions.
-  current->add(MStart::New(alloc()));
-
-  // Guard against over-recursion. Do this before we start unboxing, since
-  // this will create an OSI point that will read the incoming argument
-  // values, which is nice to do before their last real use, to minimize
-  // register/stack pressure.
-  MCheckOverRecursed* check = MCheckOverRecursed::New(alloc());
-  current->add(check);
-  MResumePoint* entryRpCopy =
-      MResumePoint::Copy(alloc(), current->entryResumePoint());
-  if (!entryRpCopy) {
-    return abort(AbortReason::Alloc);
-  }
-  check->setResumePoint(entryRpCopy);
-
-  // Parameters have been checked to correspond to the typeset, now we unbox
-  // what we can in an infallible manner.
-  MOZ_TRY(rewriteParameters());
-
-  // It's safe to start emitting actual IR, so now build the env chain.
-  MOZ_TRY(initEnvironmentChain());
-  if (info().needsArgsObj()) {
-    initArgumentsObject();
-  }
-
-  // The type analysis phase attempts to insert unbox operations near
-  // definitions of values. It also attempts to replace uses in resume points
-  // with the narrower, unboxed variants. However, we must prevent this
-  // replacement from happening on values in the entry snapshot. Otherwise we
-  // could get this:
-  //
-  //       v0 = MParameter(0)
-  //       v1 = MParameter(1)
-  //       --   ResumePoint(v2, v3)
-  //       v2 = Unbox(v0, INT32)
-  //       v3 = Unbox(v1, INT32)
-  //
-  // So we attach the initial resume point to each parameter, which the type
-  // analysis explicitly checks (this is the same mechanism used for
-  // effectful operations).
-  for (uint32_t i = 0; i < info().endArgSlot(); i++) {
-    MInstruction* ins = current->getEntrySlot(i)->toInstruction();
-    if (ins->type() != MIRType::Value) {
-      continue;
-    }
-
-    MResumePoint* entryRpCopy =
-        MResumePoint::Copy(alloc(), current->entryResumePoint());
-    if (!entryRpCopy) {
-      return abort(AbortReason::Alloc);
-    }
-    ins->setResumePoint(entryRpCopy);
-  }
-
-#ifdef DEBUG
-  // lazyArguments should never be accessed in |argsObjAliasesFormals| scripts.
-  if (info().hasArguments() && !info().argsObjAliasesFormals()) {
-    hasLazyArguments_ = true;
-  }
-#endif
-
-  insertRecompileCheck(pc);
-
-  auto clearLastPriorResumePoint = mozilla::MakeScopeExit([&] {
-    // Discard unreferenced & pre-allocated resume points.
-    replaceMaybeFallbackFunctionGetter(nullptr);
-  });
-
-  MOZ_TRY(traverseBytecode());
-
-  if (isHighestOptimizationLevel() &&
-      inlinedBytecodeLength_ > script_->jitScript()->inlinedBytecodeLength()) {
-    script_->jitScript()->setInlinedBytecodeLength(inlinedBytecodeLength_);
-  }
-
-  MOZ_TRY(maybeAddOsrTypeBarriers());
-
-  if (!MPhi::markIteratorPhis(iterators_)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (!info().isAnalysis() && !abortedPreliminaryGroups().empty()) {
-    return abort(AbortReason::PreliminaryObjects);
-  }
-
-  MOZ_ASSERT(loopDepth_ == 0);
-  MOZ_ASSERT(loopStack_.empty());
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::buildInline(IonBuilder* callerBuilder,
-                                          MResumePoint* callerResumePoint,
-                                          CallInfo& callInfo) {
-  inlineCallInfo_ = &callInfo;
-
-  // Spew IC info for inlined script, but only when actually compiling,
-  // not when analyzing it.
-#ifdef JS_STRUCTURED_SPEW
-  if (!info().isAnalysis()) {
-    JitSpewBaselineICStats(script(), "To-Be-Inlined");
-  }
-#endif
-
-  MOZ_TRY(init());
-
-  JitSpew(JitSpew_IonScripts, "Inlining script %s:%u:%u (%p)",
-          script()->filename(), script()->lineno(), script()->column(),
-          (void*)script());
-
-  callerBuilder_ = callerBuilder;
-  callerResumePoint_ = callerResumePoint;
-
-  if (callerBuilder->failedBoundsCheck_) {
-    failedBoundsCheck_ = true;
-  }
-
-  if (callerBuilder->failedShapeGuard_) {
-    failedShapeGuard_ = true;
-  }
-
-  if (callerBuilder->failedLexicalCheck_) {
-    failedLexicalCheck_ = true;
-  }
-
-  // Generate single entrance block.
-  MBasicBlock* entry;
-  MOZ_TRY_VAR(entry, newBlock(info().firstStackSlot(), pc));
-  MOZ_TRY(setCurrentAndSpecializePhis(entry));
-
-  current->setCallerResumePoint(callerResumePoint);
-
-  // Connect the entrance block to the last block in the caller's graph.
-  MBasicBlock* predecessor = callerBuilder->current;
-  MOZ_ASSERT(predecessor == callerResumePoint->block());
-
-  predecessor->end(MGoto::New(alloc(), current));
-  if (!current->addPredecessorWithoutPhis(predecessor)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Initialize env chain slot to Undefined.  It's set later by
-  // |initEnvironmentChain|.
-  MInstruction* env = MConstant::New(alloc(), UndefinedValue());
-  current->add(env);
-  current->initSlot(info().environmentChainSlot(), env);
-
-  // Initialize |return value| slot.
-  MInstruction* returnValue = MConstant::New(alloc(), UndefinedValue());
-  current->add(returnValue);
-  current->initSlot(info().returnValueSlot(), returnValue);
-
-  // Initialize |arguments| slot.
-  if (info().hasArguments()) {
-    MInstruction* argsObj = MConstant::New(alloc(), UndefinedValue());
-    current->add(argsObj);
-    current->initSlot(info().argsObjSlot(), argsObj);
-  }
-
-  // Initialize |this| slot.
-  current->initSlot(info().thisSlot(), callInfo.thisArg());
-
-  JitSpew(JitSpew_Inlining, "Initializing %u arg slots", info().nargs());
-
-  // NB: Ion does not inline functions which |needsArgsObj|.  So using argSlot()
-  // instead of argSlotUnchecked() below is OK
-  MOZ_ASSERT(!info().needsArgsObj());
-
-  // Initialize actually set arguments.
-  uint32_t existing_args = std::min<uint32_t>(callInfo.argc(), info().nargs());
-  for (size_t i = 0; i < existing_args; ++i) {
-    MDefinition* arg = callInfo.getArg(i);
-    current->initSlot(info().argSlot(i), arg);
-  }
-
-  // Pass Undefined for missing arguments
-  for (size_t i = callInfo.argc(); i < info().nargs(); ++i) {
-    MConstant* arg = MConstant::New(alloc(), UndefinedValue());
-    current->add(arg);
-    current->initSlot(info().argSlot(i), arg);
-  }
-
-  JitSpew(JitSpew_Inlining, "Initializing %u locals", info().nlocals());
-
-  initLocals();
-
-  JitSpew(JitSpew_Inlining,
-          "Inline entry block MResumePoint %p, %u stack slots",
-          (void*)current->entryResumePoint(),
-          current->entryResumePoint()->stackDepth());
-
-  // +2 for the env chain and |this|, maybe another +1 for arguments object
-  // slot.
-  MOZ_ASSERT(current->entryResumePoint()->stackDepth() == info().totalSlots());
-
-#ifdef DEBUG
-  if (script_->argumentsHasVarBinding()) {
-    hasLazyArguments_ = true;
-  }
-#endif
-
-  insertRecompileCheck(pc);
-
-  // Initialize the env chain now that all resume points operands are
-  // initialized.
-  MOZ_TRY(initEnvironmentChain(callInfo.callee()));
-
-  auto clearLastPriorResumePoint = mozilla::MakeScopeExit([&] {
-    // Discard unreferenced & pre-allocated resume points.
-    replaceMaybeFallbackFunctionGetter(nullptr);
-  });
-
-  MOZ_TRY(traverseBytecode());
-
-  MOZ_ASSERT(iterators_.empty(), "Iterators should be added to outer builder");
-
-  if (!info().isAnalysis() && !abortedPreliminaryGroups().empty()) {
-    return abort(AbortReason::PreliminaryObjects);
-  }
-
-  return Ok();
-}
-
-void IonBuilder::rewriteParameter(uint32_t slotIdx, MDefinition* param) {
-  MOZ_ASSERT(param->isParameter() || param->isGetArgumentsObjectArg());
-
-  TemporaryTypeSet* types = param->resultTypeSet();
-  MDefinition* actual = ensureDefiniteType(param, types->getKnownMIRType());
-  if (actual == param) {
-    return;
-  }
-
-  // Careful! We leave the original MParameter in the entry resume point. The
-  // arguments still need to be checked unless proven otherwise at the call
-  // site, and these checks can bailout. We can end up:
-  //   v0 = Parameter(0)
-  //   v1 = Unbox(v0, INT32)
-  //   --   ResumePoint(v0)
-  //
-  // As usual, it would be invalid for v1 to be captured in the initial
-  // resume point, rather than v0.
-  current->rewriteSlot(slotIdx, actual);
-}
-
-// Apply Type Inference information to parameters early on, unboxing them if
-// they have a definitive type. The actual guards will be emitted by the code
-// generator, explicitly, as part of the function prologue.
-AbortReasonOr<Ok> IonBuilder::rewriteParameters() {
-  MOZ_ASSERT(info().environmentChainSlot() == 0);
-
-  // If this JSScript is not the code of a function, then skip the
-  // initialization of function parameters.
-  if (!info().funMaybeLazy()) {
-    return Ok();
-  }
-
-  for (uint32_t i = info().startArgSlot(); i < info().endArgSlot(); i++) {
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-    MDefinition* param = current->getSlot(i);
-    rewriteParameter(i, param);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::initParameters() {
-  // If this JSScript is not the code of a function, then skip the
-  // initialization of function parameters.
-  if (!info().funMaybeLazy()) {
-    return Ok();
-  }
-
-  // If we are doing OSR on a frame which initially executed in the
-  // interpreter and didn't accumulate type information, try to use that OSR
-  // frame to determine possible initial types for 'this' and parameters.
-
-  if (thisTypes->empty() && baselineFrame_) {
-    TypeSet::Type type = baselineFrame_->thisType;
-    if (type.isSingletonUnchecked()) {
-      checkNurseryObject(type.singleton());
-    }
-    thisTypes->addType(type, alloc_->lifoAlloc());
-  }
-
-  MParameter* param =
-      MParameter::New(alloc(), MParameter::THIS_SLOT, thisTypes);
-  current->add(param);
-  current->initSlot(info().thisSlot(), param);
-
-  for (uint32_t i = 0; i < info().nargs(); i++) {
-    TemporaryTypeSet* types = &argTypes[i];
-    if (types->empty() && baselineFrame_ &&
-        !script_->jitScript()->modifiesArguments()) {
-      TypeSet::Type type = baselineFrame_->argTypes[i];
-      if (type.isSingletonUnchecked()) {
-        checkNurseryObject(type.singleton());
-      }
-      types->addType(type, alloc_->lifoAlloc());
-    }
-
-    param = MParameter::New(alloc().fallible(), i, types);
-    if (!param) {
-      return abort(AbortReason::Alloc);
-    }
-    current->add(param);
-    current->initSlot(info().argSlotUnchecked(i), param);
-  }
-
-  return Ok();
-}
-
-void IonBuilder::initLocals() {
-  // Initialize all frame slots to undefined. Lexical bindings are temporal
-  // dead zoned in bytecode.
-
-  if (info().nlocals() == 0) {
-    return;
-  }
-
-  MConstant* undef = MConstant::New(alloc(), UndefinedValue());
-  current->add(undef);
-
-  for (uint32_t i = 0; i < info().nlocals(); i++) {
-    current->initSlot(info().localSlot(i), undef);
-  }
-}
-
-bool IonBuilder::usesEnvironmentChain() {
-  return script()->jitScript()->usesEnvironmentChain();
-}
-
-AbortReasonOr<Ok> IonBuilder::initEnvironmentChain(MDefinition* callee) {
-  MInstruction* env = nullptr;
-
-  // If the script doesn't use the envchain, then it's already initialized
-  // from earlier.  However, always make a env chain when |needsArgsObj| is true
-  // for the script, since arguments object construction requires the env chain
-  // to be passed in.
-  if (!info().needsArgsObj() && !usesEnvironmentChain()) {
-    return Ok();
-  }
-
-  // The env chain is only tracked in scripts that have NAME opcodes which
-  // will try to access the env. For other scripts, the env instructions
-  // will be held live by resume points and code will still be generated for
-  // them, so just use a constant undefined value.
-
-  if (JSFunction* fun = info().funMaybeLazy()) {
-    if (!callee) {
-      MCallee* calleeIns = MCallee::New(alloc());
-      current->add(calleeIns);
-      callee = calleeIns;
-    }
-    env = MFunctionEnvironment::New(alloc(), callee);
-    current->add(env);
-
-    // This reproduce what is done in CallObject::createForFunction. Skip
-    // this for the arguments analysis, as the script might not have a
-    // baseline script with template objects yet.
-    if (fun->needsSomeEnvironmentObject() &&
-        info().analysisMode() != Analysis_ArgumentsUsage) {
-      if (fun->needsNamedLambdaEnvironment()) {
-        env = createNamedLambdaObject(callee, env);
-      }
-
-      // TODO: Parameter expression-induced extra var environment not
-      // yet handled.
-      if (fun->needsExtraBodyVarEnvironment()) {
-        return abort(AbortReason::Disable, "Extra var environment unsupported");
-      }
-
-      if (fun->needsCallObject()) {
-        MOZ_TRY_VAR(env, createCallObject(callee, env));
-      }
-    }
-  } else if (ModuleObject* module = info().module()) {
-    // Modules use a pre-created env object.
-    env = constant(ObjectValue(module->initialEnvironment()));
-  } else {
-    // For global scripts without a non-syntactic global scope, the env
-    // chain is the global lexical env.
-    MOZ_ASSERT(!script()->isForEval());
-    MOZ_ASSERT(!script()->hasNonSyntacticScope());
-    env = constant(ObjectValue(script()->global().lexicalEnvironment()));
-  }
-
-  // Update the environment slot from UndefinedValue only after initial
-  // environment is created so that bailout doesn't see a partial env.
-  // See: |BaselineStackBuilder::buildBaselineFrame|
-  current->setEnvironmentChain(env);
-  return Ok();
-}
-
-void IonBuilder::initArgumentsObject() {
-  JitSpew(JitSpew_IonMIR,
-          "%s:%u:%u - Emitting code to initialize arguments object! block=%p",
-          script()->filename(), script()->lineno(), script()->column(),
-          current);
-  MOZ_ASSERT(info().needsArgsObj());
-
-  bool mapped = script()->hasMappedArgsObj();
-  ArgumentsObject* templateObj =
-      script()->realm()->maybeArgumentsTemplateObject(mapped);
-
-  MCreateArgumentsObject* argsObj = MCreateArgumentsObject::New(
-      alloc(), current->environmentChain(), templateObj);
-  current->add(argsObj);
-  current->setArgumentsObject(argsObj);
-}
-
-AbortReasonOr<Ok> IonBuilder::addOsrValueTypeBarrier(
-    uint32_t slot, MInstruction** def_, MIRType type,
-    TemporaryTypeSet* typeSet) {
-  MInstruction*& def = *def_;
-  MBasicBlock* osrBlock = def->block();
-
-  // Clear bogus type information added in newOsrPreheader().
-  def->setResultType(MIRType::Value);
-  def->setResultTypeSet(nullptr);
-
-  if (typeSet && !typeSet->unknown()) {
-    MInstruction* barrier = MTypeBarrier::New(alloc(), def, typeSet);
-    osrBlock->insertBefore(osrBlock->lastIns(), barrier);
-    osrBlock->rewriteSlot(slot, barrier);
-    def = barrier;
-
-    // If the TypeSet is more precise than |type|, adjust |type| for the
-    // code below.
-    if (type == MIRType::Value) {
-      type = barrier->type();
-    }
-  } else if (type == MIRType::Null || type == MIRType::Undefined ||
-             type == MIRType::MagicOptimizedArguments) {
-    // No unbox instruction will be added below, so check the type by
-    // adding a type barrier for a singleton type set.
-    TypeSet::Type ntype = TypeSet::PrimitiveType(type);
-    LifoAlloc* lifoAlloc = alloc().lifoAlloc();
-    typeSet = lifoAlloc->new_<TemporaryTypeSet>(lifoAlloc, ntype);
-    if (!typeSet) {
-      return abort(AbortReason::Alloc);
-    }
-    MInstruction* barrier = MTypeBarrier::New(alloc(), def, typeSet);
-    osrBlock->insertBefore(osrBlock->lastIns(), barrier);
-    osrBlock->rewriteSlot(slot, barrier);
-    def = barrier;
-  }
-
-  // The following guards aren't directly linked into the usedef chain,
-  // however in the OSR block we need to ensure they're not optimized out, so we
-  // mark them as implicitly used.
-  switch (type) {
-    case MIRType::Null:
-    case MIRType::Undefined:
-    case MIRType::MagicOptimizedArguments:
-      def->setImplicitlyUsed();
-      break;
-    default:
-      break;
-  }
-
-  // Unbox the OSR value to the type expected by the loop header.
-  //
-  // The only specialized types that can show up here are MIRTypes with a
-  // corresponding TypeSet::Type because NewBaselineFrameInspector and
-  // newPendingLoopHeader use TypeSet::Type for Values from the BaselineFrame.
-  // This means magic values other than MagicOptimizedArguments are represented
-  // as UnknownType() and MIRType::Value. See also TypeSet::IsUntrackedValue.
-  switch (type) {
-    case MIRType::Boolean:
-    case MIRType::Int32:
-    case MIRType::Double:
-    case MIRType::String:
-    case MIRType::Symbol:
-    case MIRType::BigInt:
-    case MIRType::Object:
-      if (type != def->type()) {
-        MUnbox* unbox = MUnbox::New(alloc(), def, type, MUnbox::Fallible);
-        osrBlock->insertBefore(osrBlock->lastIns(), unbox);
-        osrBlock->rewriteSlot(slot, unbox);
-        def = unbox;
-      }
-      break;
-
-    case MIRType::Value:
-      // Nothing to do.
-      break;
-
-    case MIRType::Null: {
-      MConstant* c = MConstant::New(alloc(), NullValue());
-      osrBlock->insertBefore(osrBlock->lastIns(), c);
-      osrBlock->rewriteSlot(slot, c);
-      def = c;
-      break;
-    }
-
-    case MIRType::Undefined: {
-      MConstant* c = MConstant::New(alloc(), UndefinedValue());
-      osrBlock->insertBefore(osrBlock->lastIns(), c);
-      osrBlock->rewriteSlot(slot, c);
-      def = c;
-      break;
-    }
-
-    case MIRType::MagicOptimizedArguments: {
-      MOZ_ASSERT(hasLazyArguments_);
-      MConstant* lazyArg =
-          MConstant::New(alloc(), MagicValue(JS_OPTIMIZED_ARGUMENTS));
-      osrBlock->insertBefore(osrBlock->lastIns(), lazyArg);
-      osrBlock->rewriteSlot(slot, lazyArg);
-      def = lazyArg;
-      break;
-    }
-
-    default:
-      MOZ_CRASH("Unexpected type");
-  }
-
-  MOZ_ASSERT(def == osrBlock->getSlot(slot));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::maybeAddOsrTypeBarriers() {
-  if (!info().osrPc()) {
-    return Ok();
-  }
-
-  // The loop has successfully been processed, and the loop header phis
-  // have their final type. Add unboxes and type barriers in the OSR
-  // block to check that the values have the appropriate type, and update
-  // the types in the preheader.
-
-  MBasicBlock* osrBlock = graph().osrBlock();
-  MOZ_ASSERT(osrBlock);
-
-  MBasicBlock* preheader = osrBlock->getSuccessor(0);
-  MBasicBlock* header = preheader->getSuccessor(0);
-  static const size_t OSR_PHI_POSITION = 1;
-  MOZ_ASSERT(preheader->getPredecessor(OSR_PHI_POSITION) == osrBlock);
-
-  MResumePoint* headerRp = header->entryResumePoint();
-  size_t stackDepth = headerRp->stackDepth();
-  MOZ_ASSERT(stackDepth == osrBlock->stackDepth());
-  for (uint32_t slot = info().startArgSlot(); slot < stackDepth; slot++) {
-    // Aliased slots are never accessed, since they need to go through
-    // the callobject. The typebarriers are added there and can be
-    // discarded here.
-    if (info().isSlotAliased(slot)) {
-      continue;
-    }
-
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    MInstruction* def = osrBlock->getSlot(slot)->toInstruction();
-    MPhi* preheaderPhi = preheader->getSlot(slot)->toPhi();
-    MPhi* headerPhi = headerRp->getOperand(slot)->toPhi();
-
-    MIRType type = headerPhi->type();
-    TemporaryTypeSet* typeSet = headerPhi->resultTypeSet();
-
-    MOZ_TRY(addOsrValueTypeBarrier(slot, &def, type, typeSet));
-
-    preheaderPhi->replaceOperand(OSR_PHI_POSITION, def);
-    preheaderPhi->setResultType(type);
-    preheaderPhi->setResultTypeSet(typeSet);
-  }
-
-  return Ok();
-}
-
-#ifdef DEBUG
-// In debug builds, after compiling a bytecode op, this class is used to check
-// that all values popped by this opcode either:
-//
-//   (1) Have the ImplicitlyUsed flag set on them.
-//   (2) Have more uses than before compiling this op (the value is
-//       used as operand of a new MIR instruction).
-//
-// This is used to catch problems where IonBuilder pops a value without
-// adding any SSA uses and doesn't call setImplicitlyUsedUnchecked on it.
-class MOZ_RAII PoppedValueUseChecker {
-  Vector<MDefinition*, 4, SystemAllocPolicy> popped_;
-  Vector<size_t, 4, SystemAllocPolicy> poppedUses_;
-  MBasicBlock* current_;
-  jsbytecode* pc_;
-
- public:
-  PoppedValueUseChecker(MBasicBlock* current, jsbytecode* pc)
-      : current_(current), pc_(pc) {}
-
-  MOZ_MUST_USE bool init() {
-    unsigned nuses = GetUseCount(pc_);
-
-    for (unsigned i = 0; i < nuses; i++) {
-      MDefinition* def = current_->peek(-int32_t(i + 1));
-      if (!popped_.append(def) || !poppedUses_.append(def->defUseCount())) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  void checkAfterOp() {
-    JSOp op = JSOp(*pc_);
-
-    // Don't require SSA uses for values popped by these ops.
-    switch (op) {
-      case JSOp::Pop:
-      case JSOp::PopN:
-      case JSOp::DupAt:
-      case JSOp::Dup:
-      case JSOp::Dup2:
-      case JSOp::Pick:
-      case JSOp::Unpick:
-      case JSOp::Swap:
-      case JSOp::SetArg:
-      case JSOp::SetLocal:
-      case JSOp::InitLexical:
-      case JSOp::SetRval:
-      case JSOp::Void:
-        // Basic stack/local/argument management opcodes.
-        return;
-
-      case JSOp::Case:
-      case JSOp::Default:
-        // These ops have to pop the switch value when branching but don't
-        // actually use it.
-        return;
-
-      default:
-        break;
-    }
-
-    for (size_t i = 0; i < popped_.length(); i++) {
-      switch (op) {
-        case JSOp::Pos:
-        case JSOp::ToNumeric:
-        case JSOp::ToPropertyKey:
-        case JSOp::ToString:
-          // These ops may leave their input on the stack without setting
-          // the ImplicitlyUsed flag. If this value will be popped immediately,
-          // we may replace it with |undefined|, but the difference is
-          // not observable.
-          MOZ_ASSERT(i == 0);
-          if (current_->peek(-1) == popped_[0]) {
-            break;
-          }
-          [[fallthrough]];
-
-        default:
-          MOZ_ASSERT(popped_[i]->isImplicitlyUsed() ||
-                     // First value popped by JSOp::EndIter is not used at all,
-                     // it's similar to JSOp::Pop above.
-                     (op == JSOp::EndIter && i == 0) ||
-                     popped_[i]->defUseCount() > poppedUses_[i]);
-          break;
-      }
-    }
-  }
-};
-#endif
-
-AbortReasonOr<Ok> IonBuilder::traverseBytecode() {
-  // See the "Control Flow handling in IonBuilder" comment in IonBuilder.h for
-  // more information.
-
-  MOZ_TRY(startTraversingBlock(current));
-
-  const jsbytecode* const codeEnd = script()->codeEnd();
-
-  while (true) {
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    // Skip unreachable ops (for example code after a 'return' or 'throw') until
-    // we get to the next jump target.
-    if (hasTerminatedBlock()) {
-      while (!BytecodeIsJumpTarget(JSOp(*pc))) {
-        // Finish any "broken" loops with an unreachable backedge. For example:
-        //
-        //   do {
-        //     ...
-        //     return;
-        //     ...
-        //   } while (x);
-        //
-        // This loop never actually loops.
-        if (!loopStack_.empty() &&
-            IsBackedgeForLoopHead(pc, loopStack_.back().header()->pc())) {
-          MOZ_ASSERT(loopDepth_ > 0);
-          loopDepth_--;
-          loopStack_.popBack();
-        }
-
-        pc = GetNextPc(pc);
-        if (pc == codeEnd) {
-          return Ok();
-        }
-      }
-    }
-
-#ifdef DEBUG
-    PoppedValueUseChecker useChecker(current, pc);
-    if (!useChecker.init()) {
-      return abort(AbortReason::Alloc);
-    }
-#endif
-
-    MOZ_ASSERT(script()->containsPC(pc));
-    nextpc = GetNextPc(pc);
-
-    // Nothing in inspectOpcode() is allowed to advance the pc.
-    JSOp op = JSOp(*pc);
-    bool restarted = false;
-    MOZ_TRY(inspectOpcode(op, &restarted));
-
-#ifdef DEBUG
-    if (!restarted) {
-      useChecker.checkAfterOp();
-    }
-#endif
-
-    if (nextpc == codeEnd) {
-      return Ok();
-    }
-
-    pc = nextpc;
-    MOZ_ASSERT(script()->containsPC(pc));
-
-    if (!hasTerminatedBlock()) {
-      current->updateTrackedSite(bytecodeSite(pc));
-    }
-  }
-
-  // The iloop above never breaks, so this point is unreachable.  Don't add code
-  // here, or you'll trigger compile errors about unreachable code with some
-  // compilers!
-}
-
-AbortReasonOr<Ok> IonBuilder::startTraversingBlock(MBasicBlock* block) {
-  block->setLoopDepth(loopDepth_);
-
-  if (block->pc() && script()->hasScriptCounts()) {
-    block->setHitCount(script()->getHitCount(block->pc()));
-  }
-
-  // Optimization to move a predecessor that only has this block as successor
-  // just before this block.  Skip this optimization if the previous block is
-  // not part of the same function, as we might have to backtrack on inlining
-  // failures.
-  if (block->numPredecessors() == 1 &&
-      block->getPredecessor(0)->numSuccessors() == 1 &&
-      !block->getPredecessor(0)->outerResumePoint()) {
-    graph().removeBlockFromList(block->getPredecessor(0));
-    graph().addBlock(block->getPredecessor(0));
-  }
-
-  MOZ_TRY(setCurrentAndSpecializePhis(block));
-
-  graph().addBlock(block);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_goto(bool* restarted) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::Goto);
-
-  if (IsBackedgePC(pc)) {
-    return visitBackEdge(restarted);
-  }
-
-  jsbytecode* target = pc + GET_JUMP_OFFSET(pc);
-  return visitGoto(target);
-}
-
-AbortReasonOr<Ok> IonBuilder::addPendingEdge(const PendingEdge& edge,
-                                             jsbytecode* target) {
-  PendingEdgesMap::AddPtr p = pendingEdges_.lookupForAdd(target);
-  if (p) {
-    if (!p->value().append(edge)) {
-      return abort(AbortReason::Alloc);
-    }
-    return Ok();
-  }
-
-  PendingEdges edges;
-  static_assert(PendingEdges::InlineLength >= 1,
-                "Appending one element should be infallible");
-  MOZ_ALWAYS_TRUE(edges.append(edge));
-
-  if (!pendingEdges_.add(p, target, std::move(edges))) {
-    return abort(AbortReason::Alloc);
-  }
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitGoto(jsbytecode* target) {
-  current->end(MGoto::New(alloc(), nullptr));
-  MOZ_TRY(addPendingEdge(PendingEdge::NewGoto(current), target));
-  setTerminatedBlock();
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_loophead() {
-  // All loops have the following bytecode structure:
-  //
-  //    LoopHead
-  //    ...
-  //    IfNe/Goto to LoopHead
-
-  MOZ_ASSERT(JSOp(*pc) == JSOp::LoopHead);
-
-  if (hasTerminatedBlock()) {
-    // The whole loop is unreachable.
-    return Ok();
-  }
-
-  bool osr = pc == info().osrPc();
-  if (osr) {
-    MBasicBlock* preheader;
-    MOZ_TRY_VAR(preheader, newOsrPreheader(current, pc));
-    current->end(MGoto::New(alloc(), preheader));
-    MOZ_TRY(setCurrentAndSpecializePhis(preheader));
-  }
-
-  loopDepth_++;
-  MBasicBlock* header;
-  MOZ_TRY_VAR(header, newPendingLoopHeader(current, pc, osr));
-  current->end(MGoto::New(alloc(), header));
-
-  if (!loopStack_.emplaceBack(header)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  MOZ_TRY(analyzeNewLoopTypes(header));
-
-  MOZ_TRY(startTraversingBlock(header));
-  return emitLoopHeadInstructions(pc);
-}
-
-AbortReasonOr<Ok> IonBuilder::visitBackEdge(bool* restarted) {
-  MOZ_ASSERT(loopDepth_ > 0);
-  loopDepth_--;
-
-  MBasicBlock* header = loopStack_.back().header();
-  current->end(MGoto::New(alloc(), header));
-
-  // Compute phis in the loop header and propagate them throughout the loop,
-  // including the successor.
-  AbortReason r = header->setBackedge(alloc(), current);
-  switch (r) {
-    case AbortReason::NoAbort:
-      loopStack_.popBack();
-      setTerminatedBlock();
-      return Ok();
-
-    case AbortReason::Disable:
-      // If there are types for variables on the backedge that were not
-      // present at the original loop header, then uses of the variables'
-      // phis may have generated incorrect nodes. The new types have been
-      // incorporated into the header phis, so remove all blocks for the
-      // loop body and restart with the new types.
-      *restarted = true;
-      MOZ_TRY(restartLoop(header));
-      return Ok();
-
-    default:
-      return abort(r);
-  }
-}
-
-AbortReasonOr<Ok> IonBuilder::emitLoopHeadInstructions(jsbytecode* pc) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::LoopHead);
-
-  MInterruptCheck* check = MInterruptCheck::New(alloc());
-  current->add(check);
-  insertRecompileCheck(pc);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::inspectOpcode(JSOp op, bool* restarted) {
-  // Add not yet implemented opcodes at the bottom of the switch!
-  switch (op) {
-    case JSOp::NopDestructuring:
-    case JSOp::Lineno:
-    case JSOp::Nop:
-      return Ok();
-
-    case JSOp::TryDestructuring:
-      // Set the hasTryBlock flag to turn off optimizations that eliminate dead
-      // resume points operands because the exception handler code for
-      // TryNoteKind::Destructuring is effectively a (specialized) catch-block.
-      graph().setHasTryBlock();
-      return Ok();
-
-    case JSOp::LoopHead:
-      return jsop_loophead();
-
-    case JSOp::Undefined:
-      // If this ever changes, change what JSOp::GImplicitThis does too.
-      pushConstant(UndefinedValue());
-      return Ok();
-
-    case JSOp::Try:
-      return visitTry();
-
-    case JSOp::Default:
-      current->pop();
-      return visitGoto(pc + GET_JUMP_OFFSET(pc));
-
-    case JSOp::Goto:
-      return jsop_goto(restarted);
-
-    case JSOp::IfNe:
-    case JSOp::IfEq:
-    case JSOp::And:
-    case JSOp::Or:
-    case JSOp::Case:
-      return visitTest(op, restarted);
-
-    case JSOp::Coalesce:
-      return jsop_coalesce();
-
-    case JSOp::Return:
-    case JSOp::RetRval:
-      return visitReturn(op);
-
-    case JSOp::Throw:
-      return visitThrow();
-
-    case JSOp::JumpTarget:
-      return visitJumpTarget(op);
-
-    case JSOp::TableSwitch:
-      return visitTableSwitch();
-
-    case JSOp::BitNot:
-      return jsop_bitnot();
-
-    case JSOp::BitAnd:
-    case JSOp::BitOr:
-    case JSOp::BitXor:
-    case JSOp::Lsh:
-    case JSOp::Rsh:
-    case JSOp::Ursh:
-      return jsop_bitop(op);
-
-    case JSOp::Add:
-    case JSOp::Sub:
-    case JSOp::Mul:
-    case JSOp::Div:
-    case JSOp::Mod:
-      return jsop_binary_arith(op);
-
-    case JSOp::Pow:
-      return jsop_pow();
-
-    case JSOp::Pos:
-      return jsop_pos();
-
-    case JSOp::ToNumeric:
-      return jsop_tonumeric();
-
-    case JSOp::Neg:
-      return jsop_neg();
-
-    case JSOp::Inc:
-    case JSOp::Dec:
-      return jsop_inc_or_dec(op);
-
-    case JSOp::ToString:
-      return jsop_tostring();
-
-    case JSOp::DefVar:
-      return jsop_defvar();
-
-    case JSOp::DefLet:
-    case JSOp::DefConst:
-      return jsop_deflexical();
-
-    case JSOp::DefFun:
-      return jsop_deffun();
-
-    case JSOp::CheckGlobalOrEvalDecl:
-      return jsop_checkGlobalOrEvalDecl();
-
-    case JSOp::Eq:
-    case JSOp::Ne:
-    case JSOp::StrictEq:
-    case JSOp::StrictNe:
-    case JSOp::Lt:
-    case JSOp::Le:
-    case JSOp::Gt:
-    case JSOp::Ge:
-      return jsop_compare(op);
-
-    case JSOp::Double:
-      pushConstant(GET_INLINE_VALUE(pc));
-      return Ok();
-
-    case JSOp::BigInt:
-      pushConstant(BigIntValue(info().getBigInt(pc)));
-      return Ok();
-
-    case JSOp::String:
-      pushConstant(StringValue(info().getAtom(pc)));
-      return Ok();
-
-    case JSOp::Symbol: {
-      unsigned which = GET_UINT8(pc);
-      JS::Symbol* sym = realm->runtime()->wellKnownSymbols().get(which);
-      pushConstant(SymbolValue(sym));
-      return Ok();
-    }
-
-    case JSOp::Zero:
-      pushConstant(Int32Value(0));
-      return Ok();
-
-    case JSOp::One:
-      pushConstant(Int32Value(1));
-      return Ok();
-
-    case JSOp::Null:
-      pushConstant(NullValue());
-      return Ok();
-
-    case JSOp::Void:
-      current->pop();
-      pushConstant(UndefinedValue());
-      return Ok();
-
-    case JSOp::Hole:
-      pushConstant(MagicValue(JS_ELEMENTS_HOLE));
-      return Ok();
-
-    case JSOp::False:
-      pushConstant(BooleanValue(false));
-      return Ok();
-
-    case JSOp::True:
-      pushConstant(BooleanValue(true));
-      return Ok();
-
-    case JSOp::Arguments:
-      return jsop_arguments();
-
-    case JSOp::Rest:
-      return jsop_rest();
-
-    case JSOp::GetArg:
-      return jsop_getarg(GET_ARGNO(pc));
-
-    case JSOp::SetArg:
-      return jsop_setarg(GET_ARGNO(pc));
-
-    case JSOp::GetLocal:
-      current->pushLocal(GET_LOCALNO(pc));
-      return Ok();
-
-    case JSOp::SetLocal:
-      current->setLocal(GET_LOCALNO(pc));
-      return Ok();
-
-    case JSOp::ThrowSetConst:
-      return jsop_throwsetconst();
-
-    case JSOp::CheckLexical:
-    case JSOp::CheckAliasedLexical:
-      return jsop_checklexical();
-
-    case JSOp::InitLexical:
-      current->setLocal(GET_LOCALNO(pc));
-      return Ok();
-
-    case JSOp::InitGLexical: {
-      MOZ_ASSERT(!script()->hasNonSyntacticScope());
-      MDefinition* value = current->pop();
-      current->push(
-          constant(ObjectValue(script()->global().lexicalEnvironment())));
-      current->push(value);
-      return jsop_setprop(info().getAtom(pc)->asPropertyName());
-    }
-
-    case JSOp::InitAliasedLexical:
-      return jsop_setaliasedvar(EnvironmentCoordinate(pc));
-
-    case JSOp::Uninitialized:
-      pushConstant(MagicValue(JS_UNINITIALIZED_LEXICAL));
-      return Ok();
-
-    case JSOp::Pop: {
-      MDefinition* def = current->pop();
-
-      // Pop opcodes frequently appear where values are killed, e.g. after
-      // SET* opcodes. Place a resume point afterwards to avoid capturing
-      // the dead value in later snapshots, except in places where that
-      // resume point is obviously unnecessary.
-      if (JSOp(pc[JSOpLength_Pop]) == JSOp::Pop) {
-        return Ok();
-      }
-      if (def->isConstant()) {
-        return Ok();
-      }
-      return maybeInsertResume();
-    }
-
-    case JSOp::PopN:
-      for (uint32_t i = 0, n = GET_UINT16(pc); i < n; i++) {
-        current->pop();
-      }
-      return Ok();
-
-    case JSOp::DupAt:
-      current->pushSlot(current->stackDepth() - 1 - GET_UINT24(pc));
-      return Ok();
-
-    case JSOp::NewArray:
-      return jsop_newarray(GET_UINT32(pc));
-
-    case JSOp::NewArrayCopyOnWrite:
-      return jsop_newarray_copyonwrite();
-
-    case JSOp::NewInit:
-    case JSOp::NewObject:
-    case JSOp::NewObjectWithGroup:
-      return jsop_newobject();
-
-    case JSOp::InitElem:
-    case JSOp::InitHiddenElem:
-    case JSOp::InitLockedElem:
-      return jsop_initelem();
-
-    case JSOp::InitElemInc:
-      return jsop_initelem_inc();
-
-    case JSOp::InitElemArray:
-      return jsop_initelem_array();
-
-    case JSOp::InitProp:
-    case JSOp::InitLockedProp:
-    case JSOp::InitHiddenProp: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_initprop(name);
-    }
-
-    case JSOp::MutateProto: {
-      return jsop_mutateproto();
-    }
-
-    case JSOp::InitPropGetter:
-    case JSOp::InitHiddenPropGetter:
-    case JSOp::InitPropSetter:
-    case JSOp::InitHiddenPropSetter: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_initprop_getter_setter(name);
-    }
-
-    case JSOp::InitElemGetter:
-    case JSOp::InitHiddenElemGetter:
-    case JSOp::InitElemSetter:
-    case JSOp::InitHiddenElemSetter:
-      return jsop_initelem_getter_setter();
-
-    case JSOp::FunCall:
-      return jsop_funcall(GET_ARGC(pc));
-
-    case JSOp::FunApply:
-      return jsop_funapply(GET_ARGC(pc));
-
-    case JSOp::SpreadCall:
-      return jsop_spreadcall();
-
-    case JSOp::SpreadNew:
-    case JSOp::SpreadSuperCall:
-      return jsop_spreadnew();
-
-    case JSOp::Call:
-    case JSOp::CallIgnoresRv:
-    case JSOp::CallIter:
-    case JSOp::New:
-    case JSOp::SuperCall:
-      MOZ_TRY(jsop_call(GET_ARGC(pc),
-                        JSOp(*pc) == JSOp::New || JSOp(*pc) == JSOp::SuperCall,
-                        JSOp(*pc) == JSOp::CallIgnoresRv));
-      return Ok();
-
-    case JSOp::Eval:
-    case JSOp::StrictEval:
-      return jsop_eval(GET_ARGC(pc));
-
-    case JSOp::Int8:
-      pushConstant(Int32Value(GET_INT8(pc)));
-      return Ok();
-
-    case JSOp::Uint16:
-      pushConstant(Int32Value(GET_UINT16(pc)));
-      return Ok();
-
-    case JSOp::GetGName: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      if (!script()->hasNonSyntacticScope()) {
-        return jsop_getgname(name);
-      }
-      return jsop_getname(name);
-    }
-
-    case JSOp::SetGName:
-    case JSOp::StrictSetGName: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      JSObject* obj = nullptr;
-      if (!script()->hasNonSyntacticScope()) {
-        obj = testGlobalLexicalBinding(name);
-      }
-      if (obj) {
-        return setStaticName(obj, name);
-      }
-      return jsop_setprop(name);
-    }
-
-    case JSOp::GetName: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_getname(name);
-    }
-
-    case JSOp::GetIntrinsic: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_intrinsic(name);
-    }
-
-    case JSOp::GetImport: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_getimport(name);
-    }
-
-    case JSOp::BindGName:
-      if (!script()->hasNonSyntacticScope()) {
-        if (JSObject* env = testGlobalLexicalBinding(info().getName(pc))) {
-          pushConstant(ObjectValue(*env));
-          return Ok();
-        }
-      }
-      // Fall through to JSOp::BindName
-      [[fallthrough]];
-    case JSOp::BindName:
-      return jsop_bindname(info().getName(pc));
-
-    case JSOp::BindVar:
-      return jsop_bindvar();
-
-    case JSOp::Dup:
-      current->pushSlot(current->stackDepth() - 1);
-      return Ok();
-
-    case JSOp::Dup2:
-      return jsop_dup2();
-
-    case JSOp::Swap:
-      current->swapAt(-1);
-      return Ok();
-
-    case JSOp::Pick:
-      current->pick(-GET_INT8(pc));
-      return Ok();
-
-    case JSOp::Unpick:
-      current->unpick(-GET_INT8(pc));
-      return Ok();
-
-    case JSOp::GetAliasedVar:
-      return jsop_getaliasedvar(EnvironmentCoordinate(pc));
-
-    case JSOp::SetAliasedVar:
-      return jsop_setaliasedvar(EnvironmentCoordinate(pc));
-
-    case JSOp::Uint24:
-    case JSOp::ResumeIndex:
-      pushConstant(Int32Value(GET_UINT24(pc)));
-      return Ok();
-
-    case JSOp::Int32:
-      pushConstant(Int32Value(GET_INT32(pc)));
-      return Ok();
-
-    case JSOp::GetElem:
-    case JSOp::CallElem:
-      MOZ_TRY(jsop_getelem());
-      if (op == JSOp::CallElem) {
-        MOZ_TRY(improveThisTypesForCall());
-      }
-      return Ok();
-
-    case JSOp::SetElem:
-    case JSOp::StrictSetElem:
-      return jsop_setelem();
-
-    case JSOp::Length:
-      return jsop_length();
-
-    case JSOp::Not:
-      return jsop_not();
-
-    case JSOp::FunctionThis:
-      return jsop_functionthis();
-
-    case JSOp::GlobalThis:
-      return jsop_globalthis();
-
-    case JSOp::Callee: {
-      MDefinition* callee = getCallee();
-      current->push(callee);
-      return Ok();
-    }
-
-    case JSOp::EnvCallee:
-      return jsop_envcallee();
-
-    case JSOp::SuperBase:
-      return jsop_superbase();
-
-    case JSOp::GetPropSuper: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_getprop_super(name);
-    }
-
-    case JSOp::GetElemSuper:
-      return jsop_getelem_super();
-
-    case JSOp::GetProp:
-    case JSOp::CallProp: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      MOZ_TRY(jsop_getprop(name));
-      if (op == JSOp::CallProp) {
-        MOZ_TRY(improveThisTypesForCall());
-      }
-      return Ok();
-    }
-
-    case JSOp::SetProp:
-    case JSOp::StrictSetProp:
-    case JSOp::SetName:
-    case JSOp::StrictSetName: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_setprop(name);
-    }
-
-    case JSOp::DelProp:
-    case JSOp::StrictDelProp: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_delprop(name);
-    }
-
-    case JSOp::DelElem:
-    case JSOp::StrictDelElem:
-      return jsop_delelem();
-
-    case JSOp::RegExp:
-      return jsop_regexp(info().getRegExp(pc));
-
-    case JSOp::CallSiteObj:
-      pushConstant(ObjectValue(*info().getObject(pc)));
-      return Ok();
-
-    case JSOp::Object:
-      return jsop_object(info().getObject(pc));
-
-    case JSOp::ClassConstructor:
-      return jsop_classconstructor();
-
-    case JSOp::DerivedConstructor:
-      return jsop_derivedclassconstructor();
-
-    case JSOp::Typeof:
-    case JSOp::TypeofExpr:
-      return jsop_typeof();
-
-    case JSOp::ToAsyncIter:
-      return jsop_toasynciter();
-
-    case JSOp::ToPropertyKey:
-      return jsop_topropertykey();
-
-    case JSOp::IterNext:
-      return jsop_iternext();
-
-    case JSOp::Lambda:
-      return jsop_lambda(info().getFunction(pc));
-
-    case JSOp::LambdaArrow:
-      return jsop_lambda_arrow(info().getFunction(pc));
-
-    case JSOp::SetFunName:
-      return jsop_setfunname(GET_UINT8(pc));
-
-    case JSOp::PushLexicalEnv:
-      return jsop_pushlexicalenv(GET_GCTHING_INDEX(pc));
-
-    case JSOp::PopLexicalEnv:
-      current->setEnvironmentChain(walkEnvironmentChain(1));
-      return Ok();
-
-    case JSOp::FreshenLexicalEnv:
-      return jsop_copylexicalenv(true);
-
-    case JSOp::RecreateLexicalEnv:
-      return jsop_copylexicalenv(false);
-
-    case JSOp::Iter:
-      return jsop_iter();
-
-    case JSOp::MoreIter:
-      return jsop_itermore();
-
-    case JSOp::IsNoIter:
-      return jsop_isnoiter();
-
-    case JSOp::EndIter:
-      return jsop_iterend();
-
-    case JSOp::In:
-      return jsop_in();
-
-    case JSOp::HasOwn:
-      return jsop_hasown();
-
-    case JSOp::CheckPrivateField:
-      return jsop_checkprivatefield();
-
-    case JSOp::SetRval:
-      MOZ_ASSERT(!script()->noScriptRval());
-      current->setSlot(info().returnValueSlot(), current->pop());
-      return Ok();
-
-    case JSOp::Instanceof:
-      return jsop_instanceof();
-
-    case JSOp::DebugLeaveLexicalEnv:
-      return Ok();
-
-    case JSOp::Debugger:
-      return jsop_debugger();
-
-    case JSOp::GImplicitThis:
-      if (!script()->hasNonSyntacticScope()) {
-        pushConstant(UndefinedValue());
-        return Ok();
-      }
-      // Fallthrough to ImplicitThis in non-syntactic scope case
-      [[fallthrough]];
-    case JSOp::ImplicitThis: {
-      PropertyName* name = info().getAtom(pc)->asPropertyName();
-      return jsop_implicitthis(name);
-    }
-
-    case JSOp::NewTarget:
-      return jsop_newtarget();
-
-    case JSOp::CheckIsObj:
-      return jsop_checkisobj(GET_UINT8(pc));
-
-    case JSOp::CheckObjCoercible:
-      return jsop_checkobjcoercible();
-
-    case JSOp::DebugCheckSelfHosted: {
-#ifdef DEBUG
-      MDebugCheckSelfHosted* check =
-          MDebugCheckSelfHosted::New(alloc(), current->pop());
-      current->add(check);
-      current->push(check);
-      MOZ_TRY(resumeAfter(check));
-#endif
-      return Ok();
-    }
-
-    case JSOp::IsConstructing:
-      pushConstant(MagicValue(JS_IS_CONSTRUCTING));
-      return Ok();
-
-    case JSOp::OptimizeSpreadCall:
-      return jsop_optimize_spreadcall();
-
-    case JSOp::ImportMeta:
-      return jsop_importmeta();
-
-    case JSOp::DynamicImport:
-      return jsop_dynamic_import();
-
-    case JSOp::InstrumentationActive:
-      return jsop_instrumentation_active();
-
-    case JSOp::InstrumentationCallback:
-      return jsop_instrumentation_callback();
-
-    case JSOp::InstrumentationScriptId:
-      return jsop_instrumentation_scriptid();
-
-    case JSOp::CheckClassHeritage:
-      return jsop_checkclassheritage();
-
-    case JSOp::FunWithProto:
-      return jsop_funwithproto(info().getFunction(pc));
-
-    case JSOp::ObjWithProto:
-      return jsop_objwithproto();
-
-    case JSOp::BuiltinObject:
-      return jsop_builtinobject();
-
-    case JSOp::CheckReturn:
-      return jsop_checkreturn();
-
-    case JSOp::CheckThis:
-      return jsop_checkthis();
-
-    case JSOp::CheckThisReinit:
-      return jsop_checkthisreinit();
-
-    case JSOp::SuperFun:
-      return jsop_superfun();
-
-    case JSOp::InitHomeObject:
-      return jsop_inithomeobject();
-
-    // ===== NOT Yet Implemented =====
-    // Read below!
-
-    // With
-    case JSOp::EnterWith:
-    case JSOp::LeaveWith:
-
-    // Spread
-    case JSOp::SpreadEval:
-    case JSOp::StrictSpreadEval:
-
-    // Super
-    case JSOp::SetPropSuper:
-    case JSOp::SetElemSuper:
-    case JSOp::StrictSetPropSuper:
-    case JSOp::StrictSetElemSuper:
-
-    // Environments (bug 1366470)
-    case JSOp::PushVarEnv:
-
-    // Compound assignment
-    case JSOp::GetBoundName:
-
-    // Generators / Async (bug 1317690)
-    case JSOp::Exception:
-    case JSOp::IsGenClosing:
-    case JSOp::InitialYield:
-    case JSOp::Yield:
-    case JSOp::FinalYieldRval:
-    case JSOp::Resume:
-    case JSOp::ResumeKind:
-    case JSOp::CheckResumeKind:
-    case JSOp::AfterYield:
-    case JSOp::Await:
-    case JSOp::TrySkipAwait:
-    case JSOp::Generator:
-    case JSOp::AsyncAwait:
-    case JSOp::AsyncResolve:
-
-    // Misc
-    case JSOp::DelName:
-    case JSOp::Finally:
-    case JSOp::GetRval:
-    case JSOp::Gosub:
-    case JSOp::Retsub:
-    case JSOp::SetIntrinsic:
-    case JSOp::ThrowMsg:
-      // === !! WARNING WARNING WARNING !! ===
-      // Do you really want to sacrifice performance by not implementing this
-      // operation in the optimizing compiler?
-      break;
-
-    case JSOp::ForceInterpreter:
-      // Intentionally not implemented.
-      break;
-  }
-
-#ifdef DEBUG
-  return abort(AbortReason::Disable, "Unsupported opcode: %s", CodeName(op));
-#else
-  return abort(AbortReason::Disable, "Unsupported opcode: %d",
-               int(uint8_t(op)));
-#endif
-}
-
-AbortReasonOr<Ok> IonBuilder::restartLoop(MBasicBlock* header) {
-  AutoTraceLog logCompile(TraceLoggerForCurrentThread(),
-                          TraceLogger_IonBuilderRestartLoop);
-
-  spew("New types at loop header, restarting loop body");
-
-  if (JitOptions.limitScriptSize) {
-    if (++numLoopRestarts_ >= MAX_LOOP_RESTARTS) {
-      return abort(AbortReason::Disable,
-                   "Aborted while processing control flow");
-    }
-  }
-
-  // Restore slots to entry state.
-  size_t stackDepth = header->entryResumePoint()->stackDepth();
-  for (size_t slot = 0; slot < stackDepth; slot++) {
-    MDefinition* loopDef = header->entryResumePoint()->getOperand(slot);
-    header->setSlot(slot, loopDef);
-  }
-
-  // Remove phi operands.
-  for (MPhiIterator phi = header->phisBegin(); phi != header->phisEnd();
-       phi++) {
-    phi->removeOperand(phi->numOperands() - 1);
-  }
-
-  // Discard unreferenced & pre-allocated resume points.
-  replaceMaybeFallbackFunctionGetter(nullptr);
-
-  // Remove all blocks in the loop body other than the header, which has phis
-  // of the appropriate type and incoming edges to preserve.
-  if (!graph().removeSuccessorBlocks(header)) {
-    return abort(AbortReason::Alloc);
-  }
-  graph().removeBlockFromList(header);
-
-  // Remove all instructions from the header itself, and all resume points
-  // except the entry resume point.
-  header->discardAllInstructions();
-  header->discardAllResumePoints(/* discardEntry = */ false);
-  header->setStackDepth(header->getPredecessor(0)->stackDepth());
-
-  loopDepth_ = header->loopDepth();
-
-  // Don't specializePhis(), as the header has been visited before and the
-  // phis have already had their type set.
-  setCurrent(header);
-  graph().addBlock(current);
-
-  jsbytecode* loopHead = header->pc();
-  MOZ_ASSERT(JSOp(*loopHead) == JSOp::LoopHead);
-
-  // Since we discarded the header's instructions above, emit them again. This
-  // includes the interrupt check.
-  MOZ_TRY(emitLoopHeadInstructions(loopHead));
-  nextpc = GetNextPc(loopHead);
-
-  // Remove loop header and dead blocks from pendingBlocks.
-  for (PendingEdgesMap::Range r = pendingEdges_.all(); !r.empty();
-       r.popFront()) {
-    PendingEdges& blocks = r.front().value();
-    for (size_t i = blocks.length(); i > 0; i--) {
-      PendingEdge& block = blocks[i - 1];
-      if (block.block() == header || block.block()->isDead()) {
-        blocks.erase(&block);
-      }
-    }
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::replaceTypeSet(MDefinition* subject,
-                                             TemporaryTypeSet* type,
-                                             MTest* test) {
-  if (type->unknown()) {
-    return Ok();
-  }
-
-  MOZ_ASSERT(!type->hasType(TypeSet::MagicArgType()));
-
-  // Don't emit MFilterTypeSet if it doesn't improve the typeset.
-  if (subject->resultTypeSet()) {
-    if (subject->resultTypeSet()->equals(type)) {
-      return Ok();
-    }
-  } else {
-    TemporaryTypeSet oldTypes(alloc_->lifoAlloc(), subject->type());
-    if (oldTypes.equals(type)) {
-      return Ok();
-    }
-  }
-
-  MInstruction* replace = nullptr;
-  MDefinition* ins;
-
-  for (uint32_t i = 0; i < current->stackDepth(); i++) {
-    ins = current->getSlot(i);
-
-    // Instead of creating a new MFilterTypeSet, try to update the old one.
-    if (ins->isFilterTypeSet() && ins->getOperand(0) == subject &&
-        ins->dependency() == test) {
-      TemporaryTypeSet* intersect = TypeSet::intersectSets(
-          ins->resultTypeSet(), type, alloc_->lifoAlloc());
-      if (!intersect) {
-        return abort(AbortReason::Alloc);
-      }
-
-      ins->toFilterTypeSet()->setResultType(intersect->getKnownMIRType());
-      ins->toFilterTypeSet()->setResultTypeSet(intersect);
-
-      if (ins->type() == MIRType::Undefined) {
-        current->setSlot(i, constant(UndefinedValue()));
-      } else if (ins->type() == MIRType::Null) {
-        current->setSlot(i, constant(NullValue()));
-      } else if (ins->type() == MIRType::MagicOptimizedArguments) {
-        current->setSlot(i, constant(MagicValue(JS_OPTIMIZED_ARGUMENTS)));
-      } else {
-        MOZ_ASSERT(!IsMagicType(ins->type()));
-      }
-      continue;
-    }
-
-    if (ins == subject) {
-      if (!replace) {
-        replace = MFilterTypeSet::New(alloc(), subject, type);
-        current->add(replace);
-
-        // Make sure we don't hoist it above the MTest, we can use the
-        // 'dependency' of an MInstruction. This is normally used by
-        // Alias Analysis, but won't get overwritten, since this
-        // instruction doesn't have an AliasSet.
-        replace->setDependency(test);
-
-        if (replace->type() == MIRType::Undefined) {
-          replace = constant(UndefinedValue());
-        } else if (replace->type() == MIRType::Null) {
-          replace = constant(NullValue());
-        } else if (replace->type() == MIRType::MagicOptimizedArguments) {
-          replace = constant(MagicValue(JS_OPTIMIZED_ARGUMENTS));
-        } else {
-          MOZ_ASSERT(!IsMagicType(ins->type()));
-        }
-      }
-      current->setSlot(i, replace);
-    }
-  }
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::improveTypesAtCompare(MCompare* ins,
-                                                    bool trueBranch,
-                                                    MTest* test) {
-  if (ins->compareType() == MCompare::Compare_Undefined ||
-      ins->compareType() == MCompare::Compare_Null) {
-    return improveTypesAtNullOrUndefinedCompare(ins, trueBranch, test);
-  }
-
-  if ((ins->lhs()->isTypeOf() || ins->rhs()->isTypeOf()) &&
-      (ins->lhs()->isConstant() || ins->rhs()->isConstant())) {
-    return improveTypesAtTypeOfCompare(ins, trueBranch, test);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::improveTypesAtTypeOfCompare(MCompare* ins,
-                                                          bool trueBranch,
-                                                          MTest* test) {
-  MTypeOf* typeOf =
-      ins->lhs()->isTypeOf() ? ins->lhs()->toTypeOf() : ins->rhs()->toTypeOf();
-  MConstant* constant = ins->lhs()->isConstant() ? ins->lhs()->toConstant()
-                                                 : ins->rhs()->toConstant();
-
-  if (constant->type() != MIRType::String) {
-    return Ok();
-  }
-
-  bool equal = ins->jsop() == JSOp::Eq || ins->jsop() == JSOp::StrictEq;
-  bool notEqual = ins->jsop() == JSOp::Ne || ins->jsop() == JSOp::StrictNe;
-
-  if (notEqual) {
-    trueBranch = !trueBranch;
-  }
-
-  // Relational compares not supported.
-  if (!equal && !notEqual) {
-    return Ok();
-  }
-
-  MDefinition* subject = typeOf->input();
-  TemporaryTypeSet* inputTypes = subject->resultTypeSet();
-
-  // Create temporary typeset equal to the type if there is no resultTypeSet.
-  TemporaryTypeSet tmp;
-  if (!inputTypes) {
-    if (subject->type() == MIRType::Value) {
-      return Ok();
-    }
-    inputTypes = &tmp;
-    tmp.addType(TypeSet::PrimitiveOrAnyObjectType(subject->type()),
-                alloc_->lifoAlloc());
-  }
-
-  if (inputTypes->unknown() || inputTypes->hasType(TypeSet::MagicArgType())) {
-    return Ok();
-  }
-
-  // Note: we cannot remove the AnyObject type in the false branch,
-  // since there are multiple ways to get an object. That is the reason
-  // for the 'trueBranch' test.
-  TemporaryTypeSet filter;
-  const JSAtomState& names = mirGen_.runtime->names();
-  if (constant->toString() == TypeName(JSTYPE_UNDEFINED, names)) {
-    filter.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
-    if (typeOf->inputMaybeCallableOrEmulatesUndefined() && trueBranch) {
-      filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
-    }
-  } else if (constant->toString() == TypeName(JSTYPE_BOOLEAN, names)) {
-    filter.addType(TypeSet::BooleanType(), alloc_->lifoAlloc());
-  } else if (constant->toString() == TypeName(JSTYPE_NUMBER, names)) {
-    filter.addType(TypeSet::Int32Type(), alloc_->lifoAlloc());
-    filter.addType(TypeSet::DoubleType(), alloc_->lifoAlloc());
-  } else if (constant->toString() == TypeName(JSTYPE_STRING, names)) {
-    filter.addType(TypeSet::StringType(), alloc_->lifoAlloc());
-  } else if (constant->toString() == TypeName(JSTYPE_SYMBOL, names)) {
-    filter.addType(TypeSet::SymbolType(), alloc_->lifoAlloc());
-  } else if (constant->toString() == TypeName(JSTYPE_BIGINT, names)) {
-    filter.addType(TypeSet::BigIntType(), alloc_->lifoAlloc());
-  } else if (constant->toString() == TypeName(JSTYPE_OBJECT, names)) {
-    filter.addType(TypeSet::NullType(), alloc_->lifoAlloc());
-    if (trueBranch) {
-      filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
-    }
-  } else if (constant->toString() == TypeName(JSTYPE_FUNCTION, names)) {
-    if (typeOf->inputMaybeCallableOrEmulatesUndefined() && trueBranch) {
-      filter.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
-    }
-  } else {
-    return Ok();
-  }
-
-  TemporaryTypeSet* type;
-  if (trueBranch) {
-    type = TypeSet::intersectSets(&filter, inputTypes, alloc_->lifoAlloc());
-  } else {
-    type = TypeSet::removeSet(inputTypes, &filter, alloc_->lifoAlloc());
-  }
-
-  if (!type) {
-    return abort(AbortReason::Alloc);
-  }
-
-  return replaceTypeSet(subject, type, test);
-}
-
-AbortReasonOr<Ok> IonBuilder::improveTypesAtNullOrUndefinedCompare(
-    MCompare* ins, bool trueBranch, MTest* test) {
-  MOZ_ASSERT(ins->compareType() == MCompare::Compare_Undefined ||
-             ins->compareType() == MCompare::Compare_Null);
-
-  // altersUndefined/Null represents if we can filter/set Undefined/Null.
-  bool altersUndefined, altersNull;
-  JSOp op = ins->jsop();
-
-  switch (op) {
-    case JSOp::StrictNe:
-    case JSOp::StrictEq:
-      altersUndefined = ins->compareType() == MCompare::Compare_Undefined;
-      altersNull = ins->compareType() == MCompare::Compare_Null;
-      break;
-    case JSOp::Ne:
-    case JSOp::Eq:
-      altersUndefined = altersNull = true;
-      break;
-    default:
-      MOZ_CRASH("Relational compares not supported");
-  }
-
-  MDefinition* subject = ins->lhs();
-  TemporaryTypeSet* inputTypes = subject->resultTypeSet();
-
-  MOZ_ASSERT(IsNullOrUndefined(ins->rhs()->type()));
-
-  // Create temporary typeset equal to the type if there is no resultTypeSet.
-  TemporaryTypeSet tmp;
-  if (!inputTypes) {
-    if (subject->type() == MIRType::Value) {
-      return Ok();
-    }
-    inputTypes = &tmp;
-    tmp.addType(TypeSet::PrimitiveOrAnyObjectType(subject->type()),
-                alloc_->lifoAlloc());
-  }
-
-  if (inputTypes->unknown() || inputTypes->hasType(TypeSet::MagicArgType())) {
-    return Ok();
-  }
-
-  TemporaryTypeSet* type;
-
-  // Decide if we need to filter the type or set it.
-  if ((op == JSOp::StrictEq || op == JSOp::Eq) ^ trueBranch) {
-    // Remove undefined/null
-    TemporaryTypeSet remove;
-    if (altersUndefined) {
-      remove.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
-    }
-    if (altersNull) {
-      remove.addType(TypeSet::NullType(), alloc_->lifoAlloc());
-    }
-
-    type = TypeSet::removeSet(inputTypes, &remove, alloc_->lifoAlloc());
-  } else {
-    // Set undefined/null.
-    TemporaryTypeSet base;
-    if (altersUndefined) {
-      base.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
-      // If TypeSet emulates undefined, then we cannot filter the objects.
-      if (inputTypes->maybeEmulatesUndefined(constraints())) {
-        base.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
-      }
-    }
-
-    if (altersNull) {
-      base.addType(TypeSet::NullType(), alloc_->lifoAlloc());
-    }
-
-    type = TypeSet::intersectSets(&base, inputTypes, alloc_->lifoAlloc());
-  }
-
-  if (!type) {
-    return abort(AbortReason::Alloc);
-  }
-
-  return replaceTypeSet(subject, type, test);
-}
-
-AbortReasonOr<Ok> IonBuilder::improveTypesAtTestSuccessor(
-    MTest* test, MBasicBlock* successor) {
-  MOZ_ASSERT(successor->numPredecessors() == 1);
-  MOZ_ASSERT(test->block() == successor->getPredecessor(0));
-
-  MOZ_ASSERT(test->ifTrue() == successor || test->ifFalse() == successor);
-  bool trueBranch = test->ifTrue() == successor;
-
-  return improveTypesAtTest(test->getOperand(0), trueBranch, test);
-}
-
-AbortReasonOr<Ok> IonBuilder::improveTypesAtTest(MDefinition* ins,
-                                                 bool trueBranch, MTest* test) {
-  // We explore the test condition to try and deduce as much type information
-  // as possible.
-
-  // All branches of this switch that don't want to fall through to the
-  // default behavior must return.  The default behavior assumes that a true
-  // test means the incoming ins is not null or undefined and that a false
-  // tests means it's one of null, undefined, false, 0, "", and objects
-  // emulating undefined
-  switch (ins->op()) {
-    case MDefinition::Opcode::Not:
-      return improveTypesAtTest(ins->toNot()->getOperand(0), !trueBranch, test);
-    case MDefinition::Opcode::IsObject: {
-      MDefinition* subject = ins->getOperand(0);
-      TemporaryTypeSet* oldType = subject->resultTypeSet();
-
-      // Create temporary typeset equal to the type if there is no
-      // resultTypeSet.
-      TemporaryTypeSet tmp;
-      if (!oldType) {
-        if (subject->type() == MIRType::Value) {
-          return Ok();
-        }
-        oldType = &tmp;
-        tmp.addType(TypeSet::PrimitiveOrAnyObjectType(subject->type()),
-                    alloc_->lifoAlloc());
-      }
-
-      if (oldType->unknown() || oldType->hasType(TypeSet::MagicArgType())) {
-        return Ok();
-      }
-
-      TemporaryTypeSet* type = nullptr;
-      if (trueBranch) {
-        type = oldType->cloneObjectsOnly(alloc_->lifoAlloc());
-      } else {
-        type = oldType->cloneWithoutObjects(alloc_->lifoAlloc());
-      }
-
-      if (!type) {
-        return abort(AbortReason::Alloc);
-      }
-
-      return replaceTypeSet(subject, type, test);
-    }
-    case MDefinition::Opcode::IsNullOrUndefined: {
-      MDefinition* subject = ins->getOperand(0);
-      TemporaryTypeSet* oldType = subject->resultTypeSet();
-
-      // Create temporary typeset equal to the type if there is no
-      // resultTypeSet.
-      TemporaryTypeSet tmp;
-      if (!oldType) {
-        if (subject->type() == MIRType::Value) {
-          return Ok();
-        }
-        oldType = &tmp;
-        tmp.addType(TypeSet::PrimitiveOrAnyObjectType(subject->type()),
-                    alloc_->lifoAlloc());
-      }
-
-      // If ins does not have a typeset we return as we cannot optimize.
-      if (oldType->unknown() || oldType->hasType(TypeSet::MagicArgType())) {
-        return Ok();
-      }
-
-      // Decide either to set or remove.
-      TemporaryTypeSet filter;
-      filter.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
-      filter.addType(TypeSet::NullType(), alloc_->lifoAlloc());
-
-      TemporaryTypeSet* type;
-      if (trueBranch) {
-        type = TypeSet::intersectSets(&filter, oldType, alloc_->lifoAlloc());
-      } else {
-        type = TypeSet::removeSet(oldType, &filter, alloc_->lifoAlloc());
-      }
-
-      if (!type) {
-        return abort(AbortReason::Alloc);
-      }
-
-      return replaceTypeSet(subject, type, test);
-    }
-
-    case MDefinition::Opcode::Compare:
-      return improveTypesAtCompare(ins->toCompare(), trueBranch, test);
-
-    default:
-      break;
-  }
-
-  // By default MTest tests ToBoolean(input). As a result in the true branch we
-  // can filter undefined and null. In false branch we can only encounter
-  // undefined, null, false, 0, "" and objects that emulate undefined.
-
-  TemporaryTypeSet* oldType = ins->resultTypeSet();
-  TemporaryTypeSet* type;
-
-  // Create temporary typeset equal to the type if there is no resultTypeSet.
-  TemporaryTypeSet tmp;
-  if (!oldType) {
-    if (ins->type() == MIRType::Value) {
-      return Ok();
-    }
-    oldType = &tmp;
-    tmp.addType(TypeSet::PrimitiveOrAnyObjectType(ins->type()),
-                alloc_->lifoAlloc());
-  }
-
-  // If ins does not have a typeset we return as we cannot optimize.
-  if (oldType->unknown() || oldType->hasType(TypeSet::MagicArgType())) {
-    return Ok();
-  }
-
-  // Decide either to set or remove.
-  if (trueBranch) {
-    TemporaryTypeSet remove;
-    remove.addType(TypeSet::UndefinedType(), alloc_->lifoAlloc());
-    remove.addType(TypeSet::NullType(), alloc_->lifoAlloc());
-    type = TypeSet::removeSet(oldType, &remove, alloc_->lifoAlloc());
-  } else {
-    TemporaryTypeSet base;
-    base.addType(TypeSet::UndefinedType(),
-                 alloc_->lifoAlloc());  // ToBoolean(undefined) == false
-    base.addType(TypeSet::NullType(),
-                 alloc_->lifoAlloc());  // ToBoolean(null) == false
-    base.addType(TypeSet::BooleanType(),
-                 alloc_->lifoAlloc());  // ToBoolean(false) == false
-    base.addType(TypeSet::Int32Type(),
-                 alloc_->lifoAlloc());  // ToBoolean(0) == false
-    base.addType(TypeSet::DoubleType(),
-                 alloc_->lifoAlloc());  // ToBoolean(0.0) == false
-    base.addType(TypeSet::StringType(),
-                 alloc_->lifoAlloc());  // ToBoolean("") == false
-    base.addType(TypeSet::BigIntType(),
-                 alloc_->lifoAlloc());  // ToBoolean(0n) == false
-
-    // If the typeset does emulate undefined, then we cannot filter out
-    // objects.
-    if (oldType->maybeEmulatesUndefined(constraints())) {
-      base.addType(TypeSet::AnyObjectType(), alloc_->lifoAlloc());
-    }
-
-    type = TypeSet::intersectSets(&base, oldType, alloc_->lifoAlloc());
-  }
-
-  if (!type) {
-    return abort(AbortReason::Alloc);
-  }
-
-  return replaceTypeSet(ins, type, test);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_dup2() {
-  uint32_t lhsSlot = current->stackDepth() - 2;
-  uint32_t rhsSlot = current->stackDepth() - 1;
-  current->pushSlot(lhsSlot);
-  current->pushSlot(rhsSlot);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitTestBackedge(JSOp op, bool* restarted) {
-  MOZ_ASSERT(op == JSOp::IfNe);
-  MOZ_ASSERT(loopDepth_ > 0);
-
-  MDefinition* ins = current->pop();
-
-  jsbytecode* loopHead = pc + GET_JUMP_OFFSET(pc);
-  MOZ_ASSERT(JSOp(*loopHead) == JSOp::LoopHead);
-
-  jsbytecode* successorPC = GetNextPc(pc);
-
-  // We can finish the loop now. Use the loophead pc instead of the current pc
-  // because the stack depth at the start of that op matches the current stack
-  // depth (after popping our operand).
-  MBasicBlock* backedge;
-  MOZ_TRY_VAR(backedge, newBlock(current, loopHead));
-
-  current->end(newTest(ins, backedge, nullptr));
-  MOZ_TRY(addPendingEdge(PendingEdge::NewTestFalse(current, op), successorPC));
-
-  MOZ_TRY(startTraversingBlock(backedge));
-  return visitBackEdge(restarted);
-}
-
-AbortReasonOr<Ok> IonBuilder::visitTest(JSOp op, bool* restarted) {
-  MOZ_ASSERT(op == JSOp::IfEq || op == JSOp::IfNe || op == JSOp::And ||
-             op == JSOp::Or || op == JSOp::Case);
-
-  if (IsBackedgePC(pc)) {
-    return visitTestBackedge(op, restarted);
-  }
-
-  jsbytecode* target1 = GetNextPc(pc);
-  jsbytecode* target2 = pc + GET_JUMP_OFFSET(pc);
-
-  // JSOp::And and JSOp::Or inspect the top stack value but don't pop it.
-  // Also note that JSOp::Case must pop a second value on the true-branch (the
-  // input to the switch-statement). This conditional pop happens in
-  // visitJumpTarget.
-  bool mustKeepCondition = (op == JSOp::And || op == JSOp::Or);
-  MDefinition* ins = mustKeepCondition ? current->peek(-1) : current->pop();
-
-  // If this op always branches to the same pc we treat this as a JSOp::Goto.
-  if (target1 == target2) {
-    ins->setImplicitlyUsedUnchecked();
-    return visitGoto(target1);
-  }
-
-  MTest* mir = newTest(ins, nullptr, nullptr);
-  current->end(mir);
-
-  if (TestTrueTargetIsJoinPoint(op)) {
-    std::swap(target1, target2);
-  }
-
-  MOZ_TRY(addPendingEdge(PendingEdge::NewTestTrue(current, op), target1));
-  MOZ_TRY(addPendingEdge(PendingEdge::NewTestFalse(current, op), target2));
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_coalesce() {
-  jsbytecode* target1 = GetNextPc(pc);
-  jsbytecode* target2 = pc + GET_JUMP_OFFSET(pc);
-  MOZ_ASSERT(target2 > target1);
-
-  MDefinition* ins = current->peek(-1);
-
-  MIsNullOrUndefined* isNullOrUndefined = MIsNullOrUndefined::New(alloc(), ins);
-  current->add(isNullOrUndefined);
-
-  MTest* mir = newTest(isNullOrUndefined, nullptr, nullptr);
-  current->end(mir);
-
-  MOZ_TRY(addPendingEdge(PendingEdge::NewTestTrue(current, JSOp::Coalesce),
-                         target1));
-  MOZ_TRY(addPendingEdge(PendingEdge::NewTestFalse(current, JSOp::Coalesce),
-                         target2));
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitTry() {
-  // We don't support try-finally.
-  if (script()->jitScript()->hasTryFinally()) {
-    return abort(AbortReason::Disable, "Try-finally not supported");
-  }
-
-  // Try-catch within inline frames is not yet supported.
-  if (isInlineBuilder()) {
-    return abort(AbortReason::Disable, "Try-catch during inlining");
-  }
-
-  // Try-catch during analyses is not yet supported. Code within the 'catch'
-  // block is not accounted for.
-  if (info().isAnalysis()) {
-    return abort(AbortReason::Disable, "Try-catch during analysis");
-  }
-
-  graph().setHasTryBlock();
-
-  MBasicBlock* tryBlock;
-  MOZ_TRY_VAR(tryBlock, newBlock(current, GetNextPc(pc)));
-
-  current->end(MGoto::New(alloc(), tryBlock));
-
-  return startTraversingBlock(tryBlock);
-}
-
-AbortReasonOr<Ok> IonBuilder::visitJumpTarget(JSOp op) {
-  PendingEdgesMap::Ptr p = pendingEdges_.lookup(pc);
-  if (!p) {
-    // No (reachable) jumps so this is just a no-op.
-    return Ok();
-  }
-
-  PendingEdges edges(std::move(p->value()));
-  pendingEdges_.remove(p);
-
-  // Loop-restarts may clear the list rather than remove the map entry entirely.
-  // This is to reduce allocator churn since it is likely the list will be
-  // filled in again in the general case.
-  if (edges.empty()) {
-    return Ok();
-  }
-
-  MBasicBlock* joinBlock = nullptr;
-
-  // Create join block if there's fall-through from the previous bytecode op.
-  if (!hasTerminatedBlock()) {
-    MOZ_TRY_VAR(joinBlock, newBlock(current, pc));
-    current->end(MGoto::New(alloc(), joinBlock));
-    setTerminatedBlock();
-  }
-
-  auto addEdge = [&](MBasicBlock* pred, size_t numToPop) -> AbortReasonOr<Ok> {
-    if (joinBlock) {
-      MOZ_ASSERT(pred->stackDepth() - numToPop == joinBlock->stackDepth());
-      if (!joinBlock->addPredecessorPopN(alloc(), pred, numToPop)) {
-        return abort(AbortReason::Alloc);
-      }
-      return Ok();
-    }
-    MOZ_TRY_VAR(joinBlock, newBlockPopN(pred, pc, numToPop));
-    return Ok();
-  };
-
-  // When a block is terminated with an MTest instruction we can end up with the
-  // following triangle structure:
-  //
-  //        testBlock
-  //         /    |
-  //     block    |
-  //         \    |
-  //        joinBlock
-  //
-  // Although this is fine for correctness, it has the following issues:
-  //
-  // 1) The FoldTests pass is unable to optimize this pattern. This matters for
-  //    short-circuit operations (JSOp::And, JSOp::Coalesce, etc).
-  //
-  // 2) We can't easily use improveTypesAtTest to improve type information in
-  //    this case:
-  //
-  //        var obj = ...;
-  //        if (obj === null) {
-  //          obj = {};
-  //        }
-  //        ... obj must be non-null ...
-  //
-  // To fix these issues, we create an empty block to get a diamond structure:
-  //
-  //        testBlock
-  //         /    |
-  //     block  emptyBlock
-  //         \    |
-  //        joinBlock
-  auto createEmptyBlockForTest =
-      [&](MBasicBlock* pred, size_t successor,
-          size_t numToPop) -> AbortReasonOr<MBasicBlock*> {
-    MOZ_ASSERT(joinBlock);
-
-    MBasicBlock* emptyBlock;
-    MOZ_TRY_VAR(emptyBlock, newBlockPopN(pred, pc, numToPop));
-    MOZ_ASSERT(emptyBlock->stackDepth() == joinBlock->stackDepth());
-
-    MTest* test = pred->lastIns()->toTest();
-    test->initSuccessor(successor, emptyBlock);
-
-    MOZ_TRY(startTraversingBlock(emptyBlock));
-    MOZ_TRY(improveTypesAtTestSuccessor(test, emptyBlock));
-
-    emptyBlock->end(MGoto::New(alloc(), joinBlock));
-    setTerminatedBlock();
-
-    return emptyBlock;
-  };
-
-  for (const PendingEdge& edge : edges) {
-    MBasicBlock* source = edge.block();
-    MControlInstruction* lastIns = source->lastIns();
-    switch (edge.kind()) {
-      case PendingEdge::Kind::TestTrue: {
-        // JSOp::Case must pop the value when branching to the true-target.
-        // If we create an empty block, we have to pop the value there instead
-        // of as part of the emptyBlock -> joinBlock edge so stack depths match
-        // the current depth.
-        const size_t numToPop = (edge.testOp() == JSOp::Case) ? 1 : 0;
-
-        const size_t successor = 0;  // true-branch
-        if (joinBlock && TestTrueTargetIsJoinPoint(edge.testOp())) {
-          MBasicBlock* pred;
-          MOZ_TRY_VAR(pred,
-                      createEmptyBlockForTest(source, successor, numToPop));
-          MOZ_TRY(addEdge(pred, 0));
-        } else {
-          MOZ_TRY(addEdge(source, numToPop));
-          lastIns->toTest()->initSuccessor(successor, joinBlock);
-        }
-        continue;
-      }
-
-      case PendingEdge::Kind::TestFalse: {
-        const size_t numToPop = 0;
-        const size_t successor = 1;  // false-branch
-        if (joinBlock && !TestTrueTargetIsJoinPoint(edge.testOp())) {
-          MBasicBlock* pred;
-          MOZ_TRY_VAR(pred,
-                      createEmptyBlockForTest(source, successor, numToPop));
-          MOZ_TRY(addEdge(pred, 0));
-        } else {
-          MOZ_TRY(addEdge(source, numToPop));
-          lastIns->toTest()->initSuccessor(successor, joinBlock);
-        }
-        continue;
-      }
-
-      case PendingEdge::Kind::Goto:
-        MOZ_TRY(addEdge(source, 0));
-        lastIns->toGoto()->initSuccessor(0, joinBlock);
-        continue;
-    }
-    MOZ_CRASH("Invalid kind");
-  }
-
-  MOZ_ASSERT(joinBlock);
-  MOZ_TRY(startTraversingBlock(joinBlock));
-
-  // If the join block has just one predecessor with an MTest, try to improve
-  // type information.
-  if (joinBlock->numPredecessors() == 1) {
-    MBasicBlock* pred = joinBlock->getPredecessor(0);
-    if (pred->lastIns()->isTest()) {
-      MTest* test = pred->lastIns()->toTest();
-      MOZ_TRY(improveTypesAtTestSuccessor(test, joinBlock));
-    }
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitReturn(JSOp op) {
-  MDefinition* def;
-  switch (op) {
-    case JSOp::Return:
-      // Return the last instruction.
-      def = current->pop();
-      break;
-
-    case JSOp::RetRval:
-      // Return undefined eagerly if script doesn't use return value.
-      if (script()->noScriptRval()) {
-        MInstruction* ins = MConstant::New(alloc(), UndefinedValue());
-        current->add(ins);
-        def = ins;
-        break;
-      }
-
-      def = current->getSlot(info().returnValueSlot());
-      break;
-
-    default:
-      MOZ_CRASH("unknown return op");
-  }
-
-  MReturn* ret = MReturn::New(alloc(), def);
-  current->end(ret);
-
-  if (!graph().addReturn(current)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitThrow() {
-  MDefinition* def = current->pop();
-
-  MThrow* ins = MThrow::New(alloc(), def);
-  current->add(ins);
-  MOZ_TRY(resumeAfter(ins));
-
-  // Terminate the block.
-  current->end(MUnreachable::New(alloc()));
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::visitTableSwitch() {
-  jsbytecode* defaultpc = pc + GET_JUMP_OFFSET(pc);
-
-  int32_t low = GET_JUMP_OFFSET(pc + JUMP_OFFSET_LEN * 1);
-  int32_t high = GET_JUMP_OFFSET(pc + JUMP_OFFSET_LEN * 2);
-  size_t numCases = high - low + 1;
-
-  // Create MIR instruction.
-  MDefinition* ins = current->pop();
-  MTableSwitch* tableswitch = MTableSwitch::New(alloc(), ins, low, high);
-  current->end(tableswitch);
-
-  MBasicBlock* switchBlock = current;
-
-  // Create |default| block.
-  {
-    MBasicBlock* defaultBlock;
-    MOZ_TRY_VAR(defaultBlock, newBlock(switchBlock, defaultpc));
-
-    size_t index;
-    if (!tableswitch->addDefault(defaultBlock, &index)) {
-      return abort(AbortReason::Alloc);
-    }
-    MOZ_ASSERT(index == 0);
-
-    MOZ_TRY(startTraversingBlock(defaultBlock));
-
-    defaultBlock->end(MGoto::New(alloc(), nullptr));
-    MOZ_TRY(addPendingEdge(PendingEdge::NewGoto(defaultBlock), defaultpc));
-  }
-
-  // Create blocks for all cases.
-  for (size_t i = 0; i < numCases; i++) {
-    jsbytecode* casepc = script()->tableSwitchCasePC(pc, i);
-
-    MBasicBlock* caseBlock;
-    MOZ_TRY_VAR(caseBlock, newBlock(switchBlock, casepc));
-
-    size_t index;
-    if (!tableswitch->addSuccessor(caseBlock, &index)) {
-      return abort(AbortReason::Alloc);
-    }
-    if (!tableswitch->addCase(index)) {
-      return abort(AbortReason::Alloc);
-    }
-
-    MOZ_TRY(startTraversingBlock(caseBlock));
-
-    // If this is an actual case statement, optimize by replacing the
-    // input to the switch case with the actual number of the case.
-    MConstant* constant = MConstant::New(alloc(), Int32Value(low + int32_t(i)));
-    caseBlock->add(constant);
-    for (uint32_t j = 0; j < caseBlock->stackDepth(); j++) {
-      if (ins != caseBlock->getSlot(j)) {
-        continue;
-      }
-
-      constant->setDependency(ins);
-      caseBlock->setSlot(j, constant);
-    }
-
-    caseBlock->end(MGoto::New(alloc(), nullptr));
-    MOZ_TRY(addPendingEdge(PendingEdge::NewGoto(caseBlock), casepc));
-  }
-
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-void IonBuilder::pushConstant(const Value& v) { current->push(constant(v)); }
-
-static inline bool SimpleBitOpOperand(MDefinition* op) {
-  return op->definitelyType({MIRType::Undefined, MIRType::Null,
-                             MIRType::Boolean, MIRType::Int32, MIRType::Double,
-                             MIRType::Float32, MIRType::String});
-}
-
-AbortReasonOr<Ok> IonBuilder::bitnotTrySpecialized(bool* emitted,
-                                                   MDefinition* input) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a specialized bitnot instruction based on the input type
-  // of the operand.
-
-  if (!SimpleBitOpOperand(input)) {
-    return Ok();
-  }
-
-  MBitNot* ins = MBitNot::New(alloc(), input);
-
-  current->add(ins);
-  current->push(ins);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_bitnot() {
-  bool emitted = false;
-
-  MDefinition* input = current->pop();
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(bitnotTrySpecialized(&emitted, input));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  return arithUnaryBinaryCache(JSOp::BitNot, nullptr, input);
-}
-
-AbortReasonOr<Ok> IonBuilder::binaryBitOpTrySpecialized(bool* emitted, JSOp op,
-                                                        MDefinition* left,
-                                                        MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a specialized binary instruction based on the input types
-  // of the operands.
-
-  // Anything complex - objects, symbols, and bigints - are not specialized
-  if (!SimpleBitOpOperand(left) || !SimpleBitOpOperand(right)) {
-    return Ok();
-  }
-
-  MBinaryBitwiseInstruction* ins;
-  switch (op) {
-    case JSOp::BitAnd:
-      ins = MBitAnd::New(alloc(), left, right, MIRType::Int32);
-      break;
-
-    case JSOp::BitOr:
-      ins = MBitOr::New(alloc(), left, right, MIRType::Int32);
-      break;
-
-    case JSOp::BitXor:
-      ins = MBitXor::New(alloc(), left, right, MIRType::Int32);
-      break;
-
-    case JSOp::Lsh:
-      ins = MLsh::New(alloc(), left, right, MIRType::Int32);
-      break;
-
-    case JSOp::Rsh:
-      ins = MRsh::New(alloc(), left, right, MIRType::Int32);
-      break;
-
-    case JSOp::Ursh: {
-      MIRType specialization = MIRType::Int32;
-      if (inspector->hasSeenDoubleResult(pc)) {
-        specialization = MIRType::Double;
-      }
-      ins = MUrsh::New(alloc(), left, right, specialization);
-      break;
-    }
-
-    default:
-      MOZ_CRASH("unexpected bitop");
-  }
-
-  current->add(ins);
-  current->push(ins);
-  if (ins->isEffectful()) {
-    MOZ_TRY(resumeAfter(ins));
-  }
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_bitop(JSOp op) {
-  // Pop inputs.
-  MDefinition* right = current->pop();
-  MDefinition* left = current->pop();
-
-  bool emitted = false;
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(binaryBitOpTrySpecialized(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  return arithUnaryBinaryCache(op, left, right);
-}
-
-MDefinition::Opcode BinaryJSOpToMDefinition(JSOp op) {
-  switch (op) {
-    case JSOp::Add:
-      return MDefinition::Opcode::Add;
-    case JSOp::Sub:
-      return MDefinition::Opcode::Sub;
-    case JSOp::Mul:
-      return MDefinition::Opcode::Mul;
-    case JSOp::Div:
-      return MDefinition::Opcode::Div;
-    case JSOp::Mod:
-      return MDefinition::Opcode::Mod;
-    default:
-      MOZ_CRASH("unexpected binary opcode");
-  }
-}
-
-AbortReasonOr<Ok> IonBuilder::binaryArithTryConcat(bool* emitted, JSOp op,
-                                                   MDefinition* left,
-                                                   MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to convert an addition into a concat operation if the inputs
-  // indicate this might be a concatenation.
-
-  // Only try to replace this with concat when we have an addition.
-  if (op != JSOp::Add) {
-    return Ok();
-  }
-
-  // Make sure one of the inputs is a string.
-  if (left->type() != MIRType::String && right->type() != MIRType::String) {
-    return Ok();
-  }
-
-  // The non-string input (if present) should be atleast easily coercible to
-  // string.
-  std::initializer_list<MIRType> coercibleToString = {
-      MIRType::Undefined, MIRType::Null,    MIRType::Boolean, MIRType::Int32,
-      MIRType::Double,    MIRType::Float32, MIRType::String,  MIRType::BigInt,
-  };
-  if (right->type() != MIRType::String &&
-      !right->definitelyType(coercibleToString)) {
-    return Ok();
-  }
-  if (left->type() != MIRType::String &&
-      !left->definitelyType(coercibleToString)) {
-    return Ok();
-  }
-
-  MConcat* ins = MConcat::New(alloc(), left, right);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(maybeInsertResume());
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::powTrySpecialized(bool* emitted,
-                                                MDefinition* base,
-                                                MDefinition* power,
-                                                MIRType outputType) {
-  // Typechecking.
-  MDefinition* output = nullptr;
-  MIRType baseType = base->type();
-  MIRType powerType = power->type();
-
-  if (outputType != MIRType::Int32 && outputType != MIRType::Double) {
-    return Ok();
-  }
-  if (!IsNumberType(baseType)) {
-    return Ok();
-  }
-  if (!IsNumberType(powerType)) {
-    return Ok();
-  }
-
-  MPow* pow = MPow::New(alloc(), base, power, MIRType::Double);
-  current->add(pow);
-  output = pow;
-
-  // Cast to the right type
-  if (outputType == MIRType::Int32 && output->type() != MIRType::Int32) {
-    auto* toInt = MToNumberInt32::New(alloc(), output);
-    current->add(toInt);
-    output = toInt;
-  }
-  if (outputType == MIRType::Double && output->type() != MIRType::Double) {
-    MToDouble* toDouble = MToDouble::New(alloc(), output);
-    current->add(toDouble);
-    output = toDouble;
-  }
-
-  current->push(output);
-  *emitted = true;
-  return Ok();
-}
-
-MIRType IonBuilder::binaryArithNumberSpecialization(MDefinition* left,
-                                                    MDefinition* right) {
-  // Try to specialize as int32.
-  if (left->type() == MIRType::Int32 && right->type() == MIRType::Int32 &&
-      !inspector->hasSeenDoubleResult(pc)) {
-    return MIRType::Int32;
-  }
-  return MIRType::Double;
-}
-
-AbortReasonOr<MBinaryArithInstruction*> IonBuilder::binaryArithEmitSpecialized(
-    MDefinition::Opcode op, MIRType specialization, MDefinition* left,
-    MDefinition* right) {
-  auto* ins =
-      MBinaryArithInstruction::New(alloc(), op, left, right, specialization);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_ASSERT(!ins->isEffectful());
-  MOZ_TRY(maybeInsertResume());
-
-  return ins;
-}
-
-AbortReasonOr<Ok> IonBuilder::binaryArithTrySpecialized(bool* emitted, JSOp op,
-                                                        MDefinition* left,
-                                                        MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a specialized binary instruction based on the input types
-  // of the operands.
-
-  // Anything complex - strings, symbols, and objects - are not specialized
-  if (!SimpleArithOperand(left) || !SimpleArithOperand(right)) {
-    return Ok();
-  }
-
-  // One of the inputs need to be a number.
-  if (!IsNumberType(left->type()) && !IsNumberType(right->type())) {
-    return Ok();
-  }
-
-  MDefinition::Opcode defOp = BinaryJSOpToMDefinition(op);
-  MIRType specialization = binaryArithNumberSpecialization(left, right);
-  MBinaryArithInstruction* ins;
-  MOZ_TRY_VAR(ins,
-              binaryArithEmitSpecialized(defOp, specialization, left, right));
-
-  // Relax int32 to double if, despite the fact that we have int32 operands and
-  // we've never seen a double result, we know the result may overflow or be a
-  // double.
-  if (specialization == MIRType::Int32 && ins->constantDoubleResult(alloc())) {
-    ins->setSpecialization(MIRType::Double);
-  }
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::binaryArithTrySpecializedOnBaselineInspector(
-    bool* emitted, JSOp op, MDefinition* left, MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a specialized binary instruction speculating the
-  // type using the baseline caches.
-
-  MIRType specialization = inspector->expectedBinaryArithSpecialization(pc);
-  if (specialization == MIRType::None) {
-    return Ok();
-  }
-
-  MDefinition::Opcode defOp = BinaryJSOpToMDefinition(op);
-  MOZ_TRY(binaryArithEmitSpecialized(defOp, specialization, left, right));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::arithUnaryBinaryCache(JSOp op, MDefinition* left,
-                                                    MDefinition* right) {
-  MInstruction* stub = nullptr;
-  switch (JSOp(*pc)) {
-    case JSOp::Pos:
-    case JSOp::Neg:
-    case JSOp::BitNot:
-      MOZ_ASSERT_IF(op == JSOp::Mul,
-                    left->maybeConstantValue() &&
-                        (left->maybeConstantValue()->toInt32() == -1 ||
-                         left->maybeConstantValue()->toInt32() == 1));
-      MOZ_ASSERT_IF(op != JSOp::Mul, !left);
-      stub = MUnaryCache::New(alloc(), right);
-      break;
-    case JSOp::Add:
-    case JSOp::Sub:
-    case JSOp::Mul:
-    case JSOp::Div:
-    case JSOp::Mod:
-    case JSOp::Pow:
-    case JSOp::BitAnd:
-    case JSOp::BitOr:
-    case JSOp::BitXor:
-    case JSOp::Lsh:
-    case JSOp::Rsh:
-    case JSOp::Ursh:
-      stub = MBinaryCache::New(alloc(), left, right, MIRType::Value);
-      break;
-    default:
-      MOZ_CRASH("unsupported arith");
-  }
-
-  current->add(stub);
-  current->push(stub);
-
-  // Decrease type from 'any type' to 'empty type' when one of the operands
-  // is 'empty typed'.
-  maybeMarkEmpty(stub);
-
-  return resumeAfter(stub);
-}
-
-MDefinition* IonBuilder::maybeConvertToNumber(MDefinition* def) {
-  // Try converting strings to numbers during IonBuilder MIR construction,
-  // because MIR foldsTo-folding runs off-main thread.
-  if (def->type() == MIRType::String && def->isConstant()) {
-    JSContext* cx = TlsContext.get();
-    double d;
-    if (StringToNumberPure(cx, def->toConstant()->toString(), &d)) {
-      def->setImplicitlyUsedUnchecked();
-      return constant(NumberValue(d));
-    }
-  }
-  return def;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_binary_arith(JSOp op, MDefinition* left,
-                                                MDefinition* right) {
-  bool emitted = false;
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(binaryArithTryConcat(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-
-    if (op != JSOp::Add) {
-      left = maybeConvertToNumber(left);
-      right = maybeConvertToNumber(right);
-    }
-
-    MOZ_TRY(binaryArithTrySpecialized(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(binaryArithTrySpecializedOnBaselineInspector(&emitted, op, left,
-                                                         right));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  return arithUnaryBinaryCache(op, left, right);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_binary_arith(JSOp op) {
-  MDefinition* right = current->pop();
-  MDefinition* left = current->pop();
-
-  return jsop_binary_arith(op, left, right);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_pow() {
-  MDefinition* exponent = current->pop();
-  MDefinition* base = current->pop();
-
-  bool emitted = false;
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(powTrySpecialized(&emitted, base, exponent, MIRType::Double));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  return arithUnaryBinaryCache(JSOp::Pow, base, exponent);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_pos() {
-  if (IsNumberType(current->peek(-1)->type())) {
-    // Already int32 or double. Set the operand as implicitly used so it
-    // doesn't get optimized out if it has no other uses, as we could bail
-    // out.
-    current->peek(-1)->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  // Compile +x as 1 * x.
-  MDefinition* value = current->pop();
-  MConstant* one = MConstant::New(alloc(), Int32Value(1));
-  current->add(one);
-
-  return jsop_binary_arith(JSOp::Mul, one, value);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_neg() {
-  // Since JSOp::Neg does not use a slot, we cannot push the MConstant.
-  // The MConstant is therefore passed to JSOp::Mul without slot traffic.
-  MConstant* negator = MConstant::New(alloc(), Int32Value(-1));
-  current->add(negator);
-
-  MDefinition* right = current->pop();
-
-  return jsop_binary_arith(JSOp::Mul, negator, right);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_tonumeric() {
-  MDefinition* peeked = current->peek(-1);
-
-  if (IsNumericType(peeked->type())) {
-    // Elide the ToNumeric as we already unboxed the value.
-    peeked->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  LifoAlloc* lifoAlloc = alloc().lifoAlloc();
-  TemporaryTypeSet* types = lifoAlloc->new_<TemporaryTypeSet>();
-  if (!types) {
-    return abort(AbortReason::Alloc);
-  }
-
-  types->addType(TypeSet::Int32Type(), lifoAlloc);
-  types->addType(TypeSet::DoubleType(), lifoAlloc);
-  types->addType(TypeSet::BigIntType(), lifoAlloc);
-
-  if (peeked->type() == MIRType::Value && peeked->resultTypeSet() &&
-      peeked->resultTypeSet()->isSubset(types)) {
-    // Elide the ToNumeric because the arg is already a boxed numeric.
-    peeked->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  // Otherwise, pop the value and add an MUnaryCache.
-  MDefinition* popped = current->pop();
-  MInstruction* ins = MUnaryCache::New(alloc(), popped);
-  ins->setResultTypeSet(types);  // Improve type information for the result.
-  current->add(ins);
-  current->push(ins);
-
-  // ToNumeric is effectful for objects (calls valueOf), so add a resume point.
-  return resumeAfter(ins);
-}
-
-MDefinition* IonBuilder::unaryArithConvertToBinary(JSOp op,
-                                                   MDefinition::Opcode* defOp) {
-  switch (op) {
-    case JSOp::Inc: {
-      *defOp = MDefinition::Opcode::Add;
-      MConstant* right = MConstant::New(alloc(), Int32Value(1));
-      current->add(right);
-      return right;
-    }
-    case JSOp::Dec: {
-      *defOp = MDefinition::Opcode::Sub;
-      MConstant* right = MConstant::New(alloc(), Int32Value(1));
-      current->add(right);
-      return right;
-    }
-    default:
-      MOZ_CRASH("unexpected unary opcode");
-  }
-}
-
-AbortReasonOr<Ok> IonBuilder::unaryArithTrySpecialized(bool* emitted, JSOp op,
-                                                       MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to convert Inc(x) or Dec(x) to Add(x,1) or Sub(x,1) if the operand is a
-  // number.
-
-  if (!IsNumberType(value->type())) {
-    return Ok();
-  }
-
-  MDefinition::Opcode defOp;
-  MDefinition* rhs = unaryArithConvertToBinary(op, &defOp);
-  MIRType specialization = binaryArithNumberSpecialization(value, rhs);
-  MOZ_TRY(binaryArithEmitSpecialized(defOp, specialization, value, rhs));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::unaryArithTrySpecializedOnBaselineInspector(
-    bool* emitted, JSOp op, MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a specialized binary instruction speculating the
-  // type using the baseline caches.
-
-  MIRType specialization = inspector->expectedBinaryArithSpecialization(pc);
-  if (specialization == MIRType::None) {
-    return Ok();
-  }
-
-  MDefinition::Opcode defOp;
-  MDefinition* rhs = unaryArithConvertToBinary(op, &defOp);
-  MOZ_TRY(binaryArithEmitSpecialized(defOp, specialization, value, rhs));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_inc_or_dec(JSOp op) {
-  bool emitted = false;
-  MDefinition* value = current->pop();
-
-  MOZ_TRY(unaryArithTrySpecialized(&emitted, op, value));
-  if (emitted) {
-    return Ok();
-  }
-
-  MOZ_TRY(unaryArithTrySpecializedOnBaselineInspector(&emitted, op, value));
-  if (emitted) {
-    return Ok();
-  }
-
-  MInstruction* stub = MUnaryCache::New(alloc(), value);
-  current->add(stub);
-  current->push(stub);
-
-  // Decrease type from 'any type' to 'empty type' when one of the operands
-  // is 'empty typed'.
-  maybeMarkEmpty(stub);
-
-  return resumeAfter(stub);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_tostring() {
-  if (current->peek(-1)->type() == MIRType::String) {
-    return Ok();
-  }
-
-  MDefinition* value = current->pop();
-  MToString* ins =
-      MToString::New(alloc(), value, MToString::SideEffectHandling::Supported);
-  current->add(ins);
-  current->push(ins);
-  if (ins->isEffectful()) {
-    MOZ_TRY(resumeAfter(ins));
-  }
-  return Ok();
-}
-
-IonBuilder::InliningResult IonBuilder::inlineScriptedCall(CallInfo& callInfo,
-                                                          JSFunction* target) {
-  MOZ_ASSERT(target->hasBytecode());
-  MOZ_ASSERT(IsIonInlinableOp(JSOp(*pc)));
-
-  MBasicBlock::BackupPoint backup(current);
-  if (!backup.init(alloc())) {
-    return abort(AbortReason::Alloc);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // Create new |this| on the caller-side for inlined constructors.
-  if (callInfo.constructing()) {
-    MDefinition* thisDefn =
-        createThis(target, callInfo.callee(), callInfo.getNewTarget(),
-                   /* inlining = */ true);
-    callInfo.setThis(thisDefn);
-  }
-
-  // Capture formals in the outer resume point.
-  if (!callInfo.pushCallStack(current)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  MResumePoint* outerResumePoint =
-      MResumePoint::New(alloc(), current, pc, MResumePoint::Outer);
-  if (!outerResumePoint) {
-    return abort(AbortReason::Alloc);
-  }
-  current->setOuterResumePoint(outerResumePoint);
-
-  // Pop formals again, except leave |callee| on stack for duration of call.
-  callInfo.popCallStack(current);
-  current->push(callInfo.callee());
-
-  JSScript* calleeScript = target->nonLazyScript();
-  BaselineInspector inspector(calleeScript);
-
-  // Improve type information of |this| when not set.
-  if (callInfo.constructing() && !callInfo.thisArg()->resultTypeSet()) {
-    AutoSweepJitScript sweep(calleeScript);
-    StackTypeSet* types =
-        calleeScript->jitScript()->thisTypes(sweep, calleeScript);
-    if (!types->unknown()) {
-      TemporaryTypeSet* clonedTypes = types->clone(alloc_->lifoAlloc());
-      if (!clonedTypes) {
-        return abort(AbortReason::Alloc);
-      }
-      MTypeBarrier* barrier =
-          MTypeBarrier::New(alloc(), callInfo.thisArg(), clonedTypes);
-      current->add(barrier);
-      if (barrier->type() == MIRType::Undefined) {
-        callInfo.setThis(constant(UndefinedValue()));
-      } else if (barrier->type() == MIRType::Null) {
-        callInfo.setThis(constant(NullValue()));
-      } else {
-        callInfo.setThis(barrier);
-      }
-    }
-  }
-
-  // Start inlining.
-  LifoAlloc* lifoAlloc = alloc_->lifoAlloc();
-  InlineScriptTree* inlineScriptTree =
-      info().inlineScriptTree()->addCallee(alloc_, pc, calleeScript);
-  if (!inlineScriptTree) {
-    return abort(AbortReason::Alloc);
-  }
-  CompileInfo* info = lifoAlloc->new_<CompileInfo>(
-      mirGen_.runtime, calleeScript, target, (jsbytecode*)nullptr,
-      this->info().analysisMode(),
-      /* needsArgsObj = */ false, inlineScriptTree);
-  if (!info) {
-    return abort(AbortReason::Alloc);
-  }
-
-  MIRGraphReturns returns(alloc());
-  AutoAccumulateReturns aar(graph(), returns);
-
-  // Build the graph.
-  IonBuilder inlineBuilder(analysisContext, mirGen_, info, constraints(),
-                           &inspector, nullptr, inliningDepth_ + 1, loopDepth_);
-  AbortReasonOr<Ok> result =
-      inlineBuilder.buildInline(this, outerResumePoint, callInfo);
-  if (result.isErr()) {
-    if (analysisContext && analysisContext->isExceptionPending()) {
-      JitSpew(JitSpew_IonAbort, "Inline builder raised exception.");
-      MOZ_ASSERT(result.unwrapErr() == AbortReason::Error);
-      return Err(result.unwrapErr());
-    }
-
-    // Inlining the callee failed. Mark the callee as uninlineable only if
-    // the inlining was aborted for a non-exception reason.
-    switch (result.unwrapErr()) {
-      case AbortReason::Disable:
-        calleeScript->setUninlineable();
-        if (!JitOptions.disableInlineBacktracking) {
-          MBasicBlock* block = backup.restore();
-          if (!block) {
-            return abort(AbortReason::Alloc);
-          }
-          setCurrent(block);
-          return InliningStatus_NotInlined;
-        }
-        return abort(AbortReason::Inlining);
-
-      case AbortReason::PreliminaryObjects: {
-        const ObjectGroupVector& groups =
-            inlineBuilder.abortedPreliminaryGroups();
-        MOZ_ASSERT(!groups.empty());
-        for (size_t i = 0; i < groups.length(); i++) {
-          addAbortedPreliminaryGroup(groups[i]);
-        }
-        return Err(result.unwrapErr());
-      }
-
-      case AbortReason::Alloc:
-      case AbortReason::Inlining:
-      case AbortReason::Error:
-        return Err(result.unwrapErr());
-
-      case AbortReason::NoAbort:
-        MOZ_CRASH("Abort with AbortReason::NoAbort");
-        return abort(AbortReason::Error);
-    }
-  }
-
-  if (returns.empty()) {
-    // Inlining of functions that have no exit is not supported.
-    calleeScript->setUninlineable();
-    if (!JitOptions.disableInlineBacktracking) {
-      MBasicBlock* block = backup.restore();
-      if (!block) {
-        return abort(AbortReason::Alloc);
-      }
-      setCurrent(block);
-      return InliningStatus_NotInlined;
-    }
-    return abort(AbortReason::Inlining);
-  }
-
-  // Create return block.
-  jsbytecode* postCall = GetNextPc(pc);
-  MBasicBlock* returnBlock;
-  MOZ_TRY_VAR(returnBlock, newBlock(current->stackDepth(), postCall));
-  graph().addBlock(returnBlock);
-  returnBlock->setCallerResumePoint(callerResumePoint_);
-
-  // Inherit the slots from current and pop |fun|.
-  returnBlock->inheritSlots(current);
-  returnBlock->pop();
-
-  // Accumulate return values.
-  MDefinition* retvalDefn =
-      patchInlinedReturns(target, callInfo, returns, returnBlock);
-  if (!retvalDefn) {
-    return abort(AbortReason::Alloc);
-  }
-  returnBlock->push(retvalDefn);
-
-  // Initialize entry slots now that the stack has been fixed up.
-  if (!returnBlock->initEntrySlots(alloc())) {
-    return abort(AbortReason::Alloc);
-  }
-
-  MOZ_TRY(setCurrentAndSpecializePhis(returnBlock));
-
-  return InliningStatus_Inlined;
-}
-
-MDefinition* IonBuilder::patchInlinedReturn(JSFunction* target,
-                                            CallInfo& callInfo,
-                                            MBasicBlock* exit,
-                                            MBasicBlock* bottom) {
-  // Replaces the MReturn in the exit block with an MGoto.
-  MDefinition* rdef = exit->lastIns()->toReturn()->input();
-  exit->discardLastIns();
-
-  // Constructors must be patched by the caller to always return an object.
-  if (callInfo.constructing()) {
-    if (target->isDerivedClassConstructor()) {
-      // Derived class constructors contain extra bytecode to ensure an object
-      // is always returned, so no additional patching is needed.
-    } else if (rdef->type() == MIRType::Value) {
-      // Unknown return: dynamically detect objects.
-      MReturnFromCtor* filter =
-          MReturnFromCtor::New(alloc(), rdef, callInfo.thisArg());
-      exit->add(filter);
-      rdef = filter;
-    } else if (rdef->type() != MIRType::Object) {
-      // Known non-object return: force |this|.
-      rdef = callInfo.thisArg();
-    }
-  } else if (callInfo.isSetter()) {
-    // Setters return their argument, not whatever value is returned.
-    rdef = callInfo.getArg(0);
-  }
-
-  if (!callInfo.isSetter()) {
-    rdef = specializeInlinedReturn(rdef, exit);
-  }
-
-  MGoto* replacement = MGoto::New(alloc(), bottom);
-  exit->end(replacement);
-  if (!bottom->addPredecessorWithoutPhis(exit)) {
-    return nullptr;
-  }
-
-  return rdef;
-}
-
-MDefinition* IonBuilder::specializeInlinedReturn(MDefinition* rdef,
-                                                 MBasicBlock* exit) {
-  // Remove types from the return definition that weren't observed.
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  // The observed typeset doesn't contain extra information.
-  if (types->empty() || types->unknown()) {
-    return rdef;
-  }
-
-  // Decide if specializing is needed using the result typeset if available,
-  // else use the result type.
-
-  if (rdef->resultTypeSet()) {
-    // Don't specialize if return typeset is a subset of the
-    // observed typeset. The return typeset is already more specific.
-    if (rdef->resultTypeSet()->isSubset(types)) {
-      return rdef;
-    }
-  } else {
-    MIRType observedType = types->getKnownMIRType();
-
-    // Don't specialize if type is MIRType::Float32 and TI reports
-    // MIRType::Double. Float is more specific than double.
-    if (observedType == MIRType::Double && rdef->type() == MIRType::Float32) {
-      return rdef;
-    }
-
-    // Don't specialize if types are inaccordance, except for MIRType::Value
-    // and MIRType::Object (when not unknown object), since the typeset
-    // contains more specific information.
-    if (observedType == rdef->type() && observedType != MIRType::Value &&
-        (observedType != MIRType::Object || types->unknownObject())) {
-      return rdef;
-    }
-  }
-
-  setCurrent(exit);
-
-  MTypeBarrier* barrier = nullptr;
-  rdef = addTypeBarrier(rdef, types, BarrierKind::TypeSet, &barrier);
-  if (barrier) {
-    barrier->setNotMovable();
-  }
-
-  return rdef;
-}
-
-MDefinition* IonBuilder::patchInlinedReturns(JSFunction* target,
-                                             CallInfo& callInfo,
-                                             MIRGraphReturns& returns,
-                                             MBasicBlock* bottom) {
-  // Replaces MReturns with MGotos, returning the MDefinition
-  // representing the return value, or nullptr.
-  MOZ_ASSERT(returns.length() > 0);
-
-  if (returns.length() == 1) {
-    return patchInlinedReturn(target, callInfo, returns[0], bottom);
-  }
-
-  // Accumulate multiple returns with a phi.
-  MPhi* phi = MPhi::New(alloc());
-  if (!phi->reserveLength(returns.length())) {
-    return nullptr;
-  }
-
-  for (size_t i = 0; i < returns.length(); i++) {
-    MDefinition* rdef =
-        patchInlinedReturn(target, callInfo, returns[i], bottom);
-    if (!rdef) {
-      return nullptr;
-    }
-    phi->addInput(rdef);
-  }
-
-  bottom->addPhi(phi);
-  return phi;
-}
-
-IonBuilder::InliningDecision IonBuilder::makeInliningDecision(
-    JSObject* targetArg, CallInfo& callInfo) {
-  // When there is no target, inlining is impossible.
-  if (targetArg == nullptr) {
-    return InliningDecision_DontInline;
-  }
-
-  // Inlining non-function targets is handled by inlineNonFunctionCall().
-  if (!targetArg->is<JSFunction>()) {
-    return InliningDecision_Inline;
-  }
-
-  JSFunction* target = &targetArg->as<JSFunction>();
-
-  // Never inline during the arguments usage analysis.
-  if (info().analysisMode() == Analysis_ArgumentsUsage) {
-    return InliningDecision_DontInline;
-  }
-
-  // Native functions provide their own detection in inlineNativeCall().
-  if (target->isNative()) {
-    return InliningDecision_Inline;
-  }
-
-  // Determine whether inlining is possible at callee site
-  InliningDecision decision = canInlineTarget(target, callInfo);
-  if (decision != InliningDecision_Inline) {
-    return decision;
-  }
-
-  // Heuristics!
-  JSScript* targetScript = target->nonLazyScript();
-
-  // Callee must not be excessively large.
-  // This heuristic also applies to the callsite as a whole.
-  bool offThread = mirGen_.options.offThreadCompilationAvailable();
-  if (targetScript->length() >
-      optimizationInfo().inlineMaxBytecodePerCallSite(offThread)) {
-    return DontInline(targetScript, "Vetoed: callee excessively large");
-  }
-
-  // Callee must have been called a few times to have somewhat stable
-  // type information, except for definite properties analysis,
-  // as the caller has not run yet.
-  if (targetScript->getWarmUpCount() <
-          optimizationInfo().inliningWarmUpThreshold() &&
-      !targetScript->jitScript()->ionCompiledOrInlined() &&
-      info().analysisMode() != Analysis_DefiniteProperties) {
-    JitSpew(JitSpew_Inlining,
-            "Cannot inline %s:%u:%u: callee is insufficiently hot.",
-            targetScript->filename(), targetScript->lineno(),
-            targetScript->column());
-    return InliningDecision_WarmUpCountTooLow;
-  }
-
-  // Don't inline if the callee is known to inline a lot of code, to avoid
-  // huge MIR graphs.
-  uint32_t inlinedBytecodeLength =
-      targetScript->jitScript()->inlinedBytecodeLength();
-  if (inlinedBytecodeLength >
-      optimizationInfo().inlineMaxCalleeInlinedBytecodeLength()) {
-    return DontInline(targetScript,
-                      "Vetoed: callee inlinedBytecodeLength is too big");
-  }
-
-  IonBuilder* outerBuilder = outermostBuilder();
-
-  // Cap the total bytecode length we inline under a single script, to avoid
-  // excessive inlining in pathological cases.
-  size_t totalBytecodeLength =
-      outerBuilder->inlinedBytecodeLength_ + targetScript->length();
-  if (totalBytecodeLength > optimizationInfo().inlineMaxTotalBytecodeLength()) {
-    return DontInline(targetScript,
-                      "Vetoed: exceeding max total bytecode length");
-  }
-
-  // Cap the inlining depth.
-
-  uint32_t maxInlineDepth;
-  if (JitOptions.isSmallFunction(targetScript)) {
-    maxInlineDepth = optimizationInfo().smallFunctionMaxInlineDepth();
-  } else {
-    maxInlineDepth = optimizationInfo().maxInlineDepth();
-
-    // Caller must not be excessively large.
-    if (script()->length() >=
-        optimizationInfo().inliningMaxCallerBytecodeLength()) {
-      return DontInline(targetScript, "Vetoed: caller excessively large");
-    }
-  }
-
-  JitScript* outerJitScript = outermostBuilder()->script()->jitScript();
-  if (inliningDepth_ >= maxInlineDepth) {
-    // We hit the depth limit and won't inline this function. Give the
-    // outermost script a max inlining depth of 0, so that it won't be
-    // inlined in other scripts. This heuristic is currently only used
-    // when we're inlining scripts with loops, see the comment below.
-    // These heuristics only apply to the highest optimization level.
-    if (isHighestOptimizationLevel()) {
-      outerJitScript->setMaxInliningDepth(0);
-    }
-
-    return DontInline(targetScript, "Vetoed: exceeding allowed inline depth");
-  }
-
-  // Inlining functions with loops can be complicated. For instance, if we're
-  // close to the inlining depth limit and we inline the function f below, we
-  // can no longer inline the call to g:
-  //
-  //   function f() {
-  //      while (cond) {
-  //          g();
-  //      }
-  //   }
-  //
-  // If the loop has many iterations, it's more efficient to call f and inline
-  // g in f.
-  //
-  // To avoid this problem, we record a separate max inlining depth for each
-  // script, indicating at which depth we won't be able to inline all functions
-  // we inlined this time. This solves the issue above, because we will only
-  // inline f if it means we can also inline g.
-  //
-  // These heuristics only apply to the highest optimization level: other tiers
-  // do very little inlining and performance is not as much of a concern there.
-  if (isHighestOptimizationLevel() && targetScript->hasLoops() &&
-      inliningDepth_ >= targetScript->jitScript()->maxInliningDepth()) {
-    return DontInline(targetScript,
-                      "Vetoed: exceeding allowed script inline depth");
-  }
-
-  // Update the max depth at which we can inline the outer script.
-  MOZ_ASSERT(maxInlineDepth > inliningDepth_);
-  uint32_t scriptInlineDepth = maxInlineDepth - inliningDepth_ - 1;
-  if (scriptInlineDepth < outerJitScript->maxInliningDepth() &&
-      isHighestOptimizationLevel()) {
-    outerJitScript->setMaxInliningDepth(scriptInlineDepth);
-  }
-
-  // End of heuristics, we will inline this function.
-
-  outerBuilder->inlinedBytecodeLength_ += targetScript->length();
-
-  return InliningDecision_Inline;
-}
-
-AbortReasonOr<Ok> IonBuilder::selectInliningTargets(
-    const InliningTargets& targets, CallInfo& callInfo, BoolVector& choiceSet,
-    uint32_t* numInlineable) {
-  *numInlineable = 0;
-  uint32_t totalSize = 0;
-
-  // For each target, ask whether it may be inlined.
-  if (!choiceSet.reserve(targets.length())) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Don't inline polymorphic sites during the definite properties analysis.
-  // AddClearDefiniteFunctionUsesInScript depends on this for correctness.
-  if (info().analysisMode() == Analysis_DefiniteProperties &&
-      targets.length() > 1) {
-    return Ok();
-  }
-
-  for (size_t i = 0; i < targets.length(); i++) {
-    JSObject* target = targets[i].target;
-
-    bool inlineable;
-    InliningDecision decision = makeInliningDecision(target, callInfo);
-    switch (decision) {
-      case InliningDecision_Error:
-        return abort(AbortReason::Error);
-      case InliningDecision_DontInline:
-      case InliningDecision_WarmUpCountTooLow:
-        inlineable = false;
-        break;
-      case InliningDecision_Inline:
-        inlineable = true;
-        break;
-      default:
-        MOZ_CRASH("Unhandled InliningDecision value!");
-    }
-
-    if (target->is<JSFunction>()) {
-      // Enforce a maximum inlined bytecode limit at the callsite.
-      if (inlineable && target->as<JSFunction>().isInterpreted()) {
-        totalSize += target->as<JSFunction>().nonLazyScript()->length();
-        bool offThread = mirGen_.options.offThreadCompilationAvailable();
-        if (totalSize >
-            optimizationInfo().inlineMaxBytecodePerCallSite(offThread)) {
-          inlineable = false;
-        }
-      }
-    } else {
-      // Non-function targets are not supported by polymorphic inlining.
-      inlineable = false;
-    }
-
-    // Only use a group guard and inline the target if we will recompile when
-    // the target function gets a new group.
-    if (inlineable && targets[i].group) {
-      ObjectGroup* group = targets[i].group;
-      TypeSet::ObjectKey* key = TypeSet::ObjectKey::get(group);
-      if (!key->hasStableClassAndProto(constraints())) {
-        inlineable = false;
-      }
-    }
-
-    choiceSet.infallibleAppend(inlineable);
-    if (inlineable) {
-      *numInlineable += 1;
-    }
-  }
-
-  MOZ_ASSERT(choiceSet.length() == targets.length());
-  return Ok();
-}
-
-static bool CanInlineGetPropertyCache(MGetPropertyCache* cache,
-                                      MDefinition* thisDef) {
-  if (cache->value()->type() != MIRType::Object) {
-    return false;
-  }
-
-  if (cache->value() != thisDef) {
-    return false;
-  }
-
-  InlinePropertyTable* table = cache->propTable();
-  if (!table) {
-    return false;
-  }
-  if (table->numEntries() == 0) {
-    return false;
-  }
-  return true;
-}
-
-class WrapMGetPropertyCache {
-  MGetPropertyCache* cache_;
-
- private:
-  void discardPriorResumePoint() {
-    if (!cache_) {
-      return;
-    }
-
-    InlinePropertyTable* propTable = cache_->propTable();
-    if (!propTable) {
-      return;
-    }
-    MResumePoint* rp = propTable->takePriorResumePoint();
-    if (!rp) {
-      return;
-    }
-    cache_->block()->discardPreAllocatedResumePoint(rp);
-  }
-
- public:
-  explicit WrapMGetPropertyCache(MGetPropertyCache* cache) : cache_(cache) {}
-
-  ~WrapMGetPropertyCache() { discardPriorResumePoint(); }
-
-  MGetPropertyCache* get() { return cache_; }
-  MGetPropertyCache* operator->() { return get(); }
-
-  // This function returns the cache given to the constructor if the
-  // GetPropertyCache can be moved into the ObjectGroup fallback path.
-  MGetPropertyCache* moveableCache(bool hasTypeBarrier, MDefinition* thisDef) {
-    // If we have unhandled uses of the MGetPropertyCache, then we cannot
-    // move it to the ObjectGroup fallback path.
-    if (!hasTypeBarrier) {
-      if (cache_->hasUses()) {
-        return nullptr;
-      }
-    } else {
-      // There is the TypeBarrier consumer, so we check that this is the
-      // only consumer.
-      MOZ_ASSERT(cache_->hasUses());
-      if (!cache_->hasOneUse()) {
-        return nullptr;
-      }
-    }
-
-    // If the this-object is not identical to the object of the
-    // MGetPropertyCache, then we cannot use the InlinePropertyTable, or if
-    // we do not yet have enough information from the ObjectGroup.
-    if (!CanInlineGetPropertyCache(cache_, thisDef)) {
-      return nullptr;
-    }
-
-    MGetPropertyCache* ret = cache_;
-    cache_ = nullptr;
-    return ret;
-  }
-};
-
-MGetPropertyCache* IonBuilder::getInlineableGetPropertyCache(
-    CallInfo& callInfo) {
-  if (callInfo.constructing()) {
-    return nullptr;
-  }
-
-  MDefinition* thisDef = callInfo.thisArg();
-  if (thisDef->type() != MIRType::Object) {
-    return nullptr;
-  }
-
-  MDefinition* funcDef = callInfo.callee();
-  if (funcDef->type() != MIRType::Object) {
-    return nullptr;
-  }
-
-  // MGetPropertyCache with no uses may be optimized away.
-  if (funcDef->isGetPropertyCache()) {
-    WrapMGetPropertyCache cache(funcDef->toGetPropertyCache());
-    return cache.moveableCache(/* hasTypeBarrier = */ false, thisDef);
-  }
-
-  // Optimize away the following common pattern:
-  // MTypeBarrier[MIRType::Object] <- MGetPropertyCache
-  if (funcDef->isTypeBarrier()) {
-    MTypeBarrier* barrier = funcDef->toTypeBarrier();
-    if (barrier->hasUses()) {
-      return nullptr;
-    }
-    if (barrier->type() != MIRType::Object) {
-      return nullptr;
-    }
-    if (!barrier->input()->isGetPropertyCache()) {
-      return nullptr;
-    }
-
-    WrapMGetPropertyCache cache(barrier->input()->toGetPropertyCache());
-    return cache.moveableCache(/* hasTypeBarrier = */ true, thisDef);
-  }
-
-  return nullptr;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineSingleCall(CallInfo& callInfo,
-                                                        JSObject* targetArg) {
-  InliningStatus status;
-  if (!targetArg->is<JSFunction>()) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSFunction* target = &targetArg->as<JSFunction>();
-  if (target->isNative()) {
-    MOZ_TRY_VAR(status, inlineNativeCall(callInfo, target));
-    return status;
-  }
-
-  return inlineScriptedCall(callInfo, target);
-}
-
-IonBuilder::InliningResult IonBuilder::inlineCallsite(
-    const InliningTargets& targets, CallInfo& callInfo) {
-  if (targets.empty()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Is the function provided by an MGetPropertyCache?
-  // If so, the cache may be movable to a fallback path, with a dispatch
-  // instruction guarding on the incoming ObjectGroup.
-  WrapMGetPropertyCache propCache(getInlineableGetPropertyCache(callInfo));
-  keepFallbackFunctionGetter(propCache.get());
-
-  // Inline single targets -- unless they derive from a cache, in which case
-  // avoiding the cache and guarding is still faster.
-  if (!propCache.get() && targets.length() == 1) {
-    JSObject* target = targets[0].target;
-
-    InliningDecision decision = makeInliningDecision(target, callInfo);
-    switch (decision) {
-      case InliningDecision_Error:
-        return abort(AbortReason::Error);
-      case InliningDecision_DontInline:
-        return InliningStatus_NotInlined;
-      case InliningDecision_WarmUpCountTooLow:
-        return InliningStatus_WarmUpCountTooLow;
-      case InliningDecision_Inline:
-        break;
-    }
-
-    // Inlining will elminate uses of the original callee, but it needs to
-    // be preserved in phis if we bail out.  Mark the old callee definition as
-    // implicitly used to ensure this happens.
-    callInfo.callee()->setImplicitlyUsedUnchecked();
-
-    // If the callee is not going to be a lambda (which may vary across
-    // different invocations), then the callee definition can be replaced by a
-    // constant.
-    if (target->isSingleton()) {
-      // Replace the function with an MConstant.
-      MConstant* constFun = constant(ObjectValue(*target));
-      if (callInfo.constructing() &&
-          callInfo.getNewTarget() == callInfo.callee()) {
-        callInfo.setNewTarget(constFun);
-      }
-      callInfo.setCallee(constFun);
-    }
-
-    return inlineSingleCall(callInfo, target);
-  }
-
-  // Choose a subset of the targets for polymorphic inlining.
-  BoolVector choiceSet(alloc());
-  uint32_t numInlined;
-  MOZ_TRY(selectInliningTargets(targets, callInfo, choiceSet, &numInlined));
-  if (numInlined == 0) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Perform a polymorphic dispatch.
-  MOZ_TRY(inlineCalls(callInfo, targets, choiceSet, propCache.get()));
-
-  return InliningStatus_Inlined;
-}
-
-AbortReasonOr<Ok> IonBuilder::inlineGenericFallback(
-    const Maybe<CallTargets>& targets, CallInfo& callInfo,
-    MBasicBlock* dispatchBlock) {
-  // Generate a new block with all arguments on-stack.
-  MBasicBlock* fallbackBlock;
-  MOZ_TRY_VAR(fallbackBlock, newBlock(dispatchBlock, pc));
-  graph().addBlock(fallbackBlock);
-
-  // Create a new CallInfo to track modified state within this block.
-  CallInfo fallbackInfo(alloc(), pc, callInfo.constructing(),
-                        callInfo.ignoresReturnValue());
-  if (!fallbackInfo.init(callInfo)) {
-    return abort(AbortReason::Alloc);
-  }
-  fallbackInfo.popCallStack(fallbackBlock);
-
-  // Generate an MCall, which uses stateful |current|.
-  MOZ_TRY(setCurrentAndSpecializePhis(fallbackBlock));
-  MOZ_TRY(makeCall(targets, fallbackInfo));
-
-  // Pass return block to caller as |current|.
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::inlineObjectGroupFallback(
-    const Maybe<CallTargets>& targets, CallInfo& callInfo,
-    MBasicBlock* dispatchBlock, MObjectGroupDispatch* dispatch,
-    MGetPropertyCache* cache, MBasicBlock** fallbackTarget) {
-  // Getting here implies the following:
-  // 1. The callee is an MGetPropertyCache, or an MGetPropertyCache
-  //    followed by an MTypeBarrier.
-  MOZ_ASSERT(callInfo.callee()->isGetPropertyCache() ||
-             callInfo.callee()->isTypeBarrier());
-
-  // 2. The MGetPropertyCache has inlineable cases by guarding on the
-  // ObjectGroup.
-  MOZ_ASSERT(dispatch->numCases() > 0);
-
-  // 3. The MGetPropertyCache (and, if applicable, MTypeBarrier) only
-  //    have at most a single use.
-  MOZ_ASSERT_IF(callInfo.callee()->isGetPropertyCache(), !cache->hasUses());
-  MOZ_ASSERT_IF(callInfo.callee()->isTypeBarrier(), cache->hasOneUse());
-
-  // This means that no resume points yet capture the MGetPropertyCache,
-  // so everything from the MGetPropertyCache up until the call is movable.
-  // We now move the MGetPropertyCache and friends into a fallback path.
-  MOZ_ASSERT(cache->idempotent());
-
-  // Create a new CallInfo to track modified state within the fallback path.
-  CallInfo fallbackInfo(alloc(), pc, callInfo.constructing(),
-                        callInfo.ignoresReturnValue());
-  if (!fallbackInfo.init(callInfo)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Capture stack prior to the call operation. This captures the function.
-  MResumePoint* preCallResumePoint =
-      MResumePoint::New(alloc(), dispatchBlock, pc, MResumePoint::ResumeAt);
-  if (!preCallResumePoint) {
-    return abort(AbortReason::Alloc);
-  }
-
-  DebugOnly<size_t> preCallFuncIndex =
-      preCallResumePoint->stackDepth() - callInfo.numFormals();
-  MOZ_ASSERT(preCallResumePoint->getOperand(preCallFuncIndex) ==
-             fallbackInfo.callee());
-
-  // In the dispatch block, replace the function's slot entry with Undefined.
-  MConstant* undefined = MConstant::New(alloc(), UndefinedValue());
-  dispatchBlock->add(undefined);
-  dispatchBlock->rewriteAtDepth(-int(callInfo.numFormals()), undefined);
-
-  // Construct a block that does nothing but remove formals from the stack.
-  // This is effectively changing the entry resume point of the later fallback
-  // block.
-  MBasicBlock* prepBlock;
-  MOZ_TRY_VAR(prepBlock, newBlock(dispatchBlock, pc));
-  graph().addBlock(prepBlock);
-  fallbackInfo.popCallStack(prepBlock);
-
-  // Construct a block into which the MGetPropertyCache can be moved.
-  // This is subtle: the pc and resume point are those of the MGetPropertyCache!
-  InlinePropertyTable* propTable = cache->propTable();
-  MResumePoint* priorResumePoint = propTable->takePriorResumePoint();
-  MOZ_ASSERT(propTable->pc() != nullptr);
-  MOZ_ASSERT(priorResumePoint != nullptr);
-  MBasicBlock* getPropBlock;
-  MOZ_TRY_VAR(getPropBlock,
-              newBlock(prepBlock, propTable->pc(), priorResumePoint));
-  graph().addBlock(getPropBlock);
-
-  prepBlock->end(MGoto::New(alloc(), getPropBlock));
-
-  // Since the getPropBlock inherited the stack from right before the
-  // MGetPropertyCache, the target of the MGetPropertyCache is still on the
-  // stack.
-  DebugOnly<MDefinition*> checkObject = getPropBlock->pop();
-  MOZ_ASSERT(checkObject == cache->value());
-
-  // Move the MGetPropertyCache and friends into the getPropBlock.
-  if (fallbackInfo.callee()->isGetPropertyCache()) {
-    MOZ_ASSERT(fallbackInfo.callee()->toGetPropertyCache() == cache);
-    getPropBlock->addFromElsewhere(cache);
-    getPropBlock->push(cache);
-  } else {
-    MTypeBarrier* barrier = callInfo.callee()->toTypeBarrier();
-    MOZ_ASSERT(barrier->type() == MIRType::Object);
-    MOZ_ASSERT(barrier->input()->isGetPropertyCache());
-    MOZ_ASSERT(barrier->input()->toGetPropertyCache() == cache);
-
-    getPropBlock->addFromElsewhere(cache);
-    getPropBlock->addFromElsewhere(barrier);
-    getPropBlock->push(barrier);
-  }
-
-  // Construct an end block with the correct resume point.
-  MBasicBlock* preCallBlock;
-  MOZ_TRY_VAR(preCallBlock, newBlock(getPropBlock, pc, preCallResumePoint));
-  graph().addBlock(preCallBlock);
-  getPropBlock->end(MGoto::New(alloc(), preCallBlock));
-
-  // Now inline the MCallGeneric, using preCallBlock as the dispatch point.
-  MOZ_TRY(inlineGenericFallback(targets, fallbackInfo, preCallBlock));
-
-  // inlineGenericFallback() set the return block as |current|.
-  preCallBlock->end(MGoto::New(alloc(), current));
-  *fallbackTarget = prepBlock;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::inlineCalls(CallInfo& callInfo,
-                                          const InliningTargets& targets,
-                                          BoolVector& choiceSet,
-                                          MGetPropertyCache* maybeCache) {
-  // Only handle polymorphic inlining.
-  MOZ_ASSERT(IsIonInlinableOp(JSOp(*pc)));
-  MOZ_ASSERT(choiceSet.length() == targets.length());
-  MOZ_ASSERT_IF(!maybeCache, targets.length() >= 2);
-  MOZ_ASSERT_IF(maybeCache, targets.length() >= 1);
-  MOZ_ASSERT_IF(maybeCache, maybeCache->value()->type() == MIRType::Object);
-
-  MBasicBlock* dispatchBlock = current;
-  callInfo.setImplicitlyUsedUnchecked();
-  if (!callInfo.pushCallStack(dispatchBlock)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Patch any InlinePropertyTable to only contain functions that are
-  // inlineable. The InlinePropertyTable will also be patched at the end to
-  // exclude native functions that vetoed inlining.
-  if (maybeCache) {
-    InlinePropertyTable* propTable = maybeCache->propTable();
-    propTable->trimToTargets(targets);
-    if (propTable->numEntries() == 0) {
-      maybeCache = nullptr;
-    }
-  }
-
-  // Generate a dispatch based on guard kind.
-  MDispatchInstruction* dispatch;
-  if (maybeCache) {
-    dispatch = MObjectGroupDispatch::New(alloc(), maybeCache->value(),
-                                         maybeCache->propTable());
-    callInfo.callee()->setImplicitlyUsedUnchecked();
-  } else {
-    dispatch = MFunctionDispatch::New(alloc(), callInfo.callee());
-  }
-
-  MOZ_ASSERT(dispatchBlock->stackDepth() >= callInfo.numFormals());
-  uint32_t stackDepth = dispatchBlock->stackDepth() - callInfo.numFormals() + 1;
-
-  // Generate a return block to host the rval-collecting MPhi.
-  jsbytecode* postCall = GetNextPc(pc);
-  MBasicBlock* returnBlock;
-  MOZ_TRY_VAR(returnBlock, newBlock(stackDepth, postCall));
-  graph().addBlock(returnBlock);
-  returnBlock->setCallerResumePoint(callerResumePoint_);
-
-  // Set up stack, used to manually create a post-call resume point.
-  returnBlock->inheritSlots(dispatchBlock);
-  callInfo.popCallStack(returnBlock);
-
-  MPhi* retPhi = MPhi::New(alloc());
-  returnBlock->addPhi(retPhi);
-  returnBlock->push(retPhi);
-
-  // Create a resume point from current stack state.
-  if (!returnBlock->initEntrySlots(alloc())) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Reserve the capacity for the phi.
-  // Note: this is an upperbound. Unreachable targets and uninlineable natives
-  // are also counted.
-  uint32_t count = 1;  // Possible fallback block.
-  for (uint32_t i = 0; i < targets.length(); i++) {
-    if (choiceSet[i]) {
-      count++;
-    }
-  }
-  if (!retPhi->reserveLength(count)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Inline each of the inlineable targets.
-  for (uint32_t i = 0; i < targets.length(); i++) {
-    // Target must be inlineable.
-    if (!choiceSet[i]) {
-      continue;
-    }
-
-    // Target must be reachable by the MDispatchInstruction.
-    JSFunction* target = &targets[i].target->as<JSFunction>();
-    if (maybeCache && !maybeCache->propTable()->hasFunction(target)) {
-      choiceSet[i] = false;
-      continue;
-    }
-
-    MBasicBlock* inlineBlock;
-    MOZ_TRY_VAR(inlineBlock, newBlock(dispatchBlock, pc));
-    graph().addBlock(inlineBlock);
-
-    // Create a function MConstant to use in the entry ResumePoint. If we
-    // can't use a constant, add a no-op MPolyInlineGuard, to prevent
-    // hoisting env chain gets above the dispatch instruction.
-    MInstruction* funcDef;
-    if (target->isSingleton()) {
-      funcDef = MConstant::New(alloc(), ObjectValue(*target), constraints());
-    } else {
-      funcDef = MPolyInlineGuard::New(alloc(), callInfo.callee());
-    }
-
-    funcDef->setImplicitlyUsedUnchecked();
-    dispatchBlock->add(funcDef);
-
-    // Use the inlined callee in the inline resume point and on stack.
-    int funIndex =
-        inlineBlock->entryResumePoint()->stackDepth() - callInfo.numFormals();
-    inlineBlock->entryResumePoint()->replaceOperand(funIndex, funcDef);
-    inlineBlock->rewriteSlot(funIndex, funcDef);
-
-    // Create a new CallInfo to track modified state within the inline block.
-    CallInfo inlineInfo(alloc(), pc, callInfo.constructing(),
-                        callInfo.ignoresReturnValue());
-    if (!inlineInfo.init(callInfo)) {
-      return abort(AbortReason::Alloc);
-    }
-    inlineInfo.popCallStack(inlineBlock);
-    inlineInfo.setCallee(funcDef);
-
-    if (callInfo.constructing() &&
-        callInfo.getNewTarget() == callInfo.callee()) {
-      inlineInfo.setNewTarget(funcDef);
-    }
-
-    if (maybeCache) {
-      // Assign the 'this' value a TypeSet specialized to the groups that
-      // can generate this inlining target.
-      MOZ_ASSERT(callInfo.thisArg() == maybeCache->value());
-      TemporaryTypeSet* thisTypes =
-          maybeCache->propTable()->buildTypeSetForFunction(alloc(), target);
-      if (!thisTypes) {
-        return abort(AbortReason::Alloc);
-      }
-
-      MFilterTypeSet* filter =
-          MFilterTypeSet::New(alloc(), inlineInfo.thisArg(), thisTypes);
-      inlineBlock->add(filter);
-      inlineInfo.setThis(filter);
-    }
-
-    // Inline the call into the inlineBlock.
-    MOZ_TRY(setCurrentAndSpecializePhis(inlineBlock));
-    InliningStatus status;
-    MOZ_TRY_VAR(status, inlineSingleCall(inlineInfo, target));
-
-    // Natives may veto inlining.
-    if (status == InliningStatus_NotInlined) {
-      MOZ_ASSERT(current == inlineBlock);
-      graph().removeBlock(inlineBlock);
-      choiceSet[i] = false;
-      continue;
-    }
-
-    // inlineSingleCall() changed |current| to the inline return block.
-    MBasicBlock* inlineReturnBlock = current;
-    setCurrent(dispatchBlock);
-
-    // Connect the inline path to the returnBlock.
-    if (!dispatch->addCase(target, targets[i].group, inlineBlock)) {
-      return abort(AbortReason::Alloc);
-    }
-
-    MDefinition* retVal = inlineReturnBlock->peek(-1);
-    retPhi->addInput(retVal);
-    inlineReturnBlock->end(MGoto::New(alloc(), returnBlock));
-    if (!returnBlock->addPredecessorWithoutPhis(inlineReturnBlock)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  // Patch the InlinePropertyTable to not dispatch to vetoed paths.
-  bool useFallback;
-  if (maybeCache) {
-    InlinePropertyTable* propTable = maybeCache->propTable();
-    propTable->trimTo(targets, choiceSet);
-
-    if (propTable->numEntries() == 0 || !propTable->hasPriorResumePoint()) {
-      // Output a generic fallback path.
-      MOZ_ASSERT_IF(propTable->numEntries() == 0, dispatch->numCases() == 0);
-      maybeCache = nullptr;
-      useFallback = true;
-    } else {
-      // We need a fallback path if the ObjectGroup dispatch does not
-      // handle all incoming objects.
-      useFallback = false;
-      TemporaryTypeSet* objectTypes = maybeCache->value()->resultTypeSet();
-      for (uint32_t i = 0; i < objectTypes->getObjectCount(); i++) {
-        TypeSet::ObjectKey* obj = objectTypes->getObject(i);
-        if (!obj) {
-          continue;
-        }
-
-        if (!obj->isGroup()) {
-          useFallback = true;
-          break;
-        }
-
-        if (!propTable->hasObjectGroup(obj->group())) {
-          useFallback = true;
-          break;
-        }
-      }
-
-      if (!useFallback) {
-        // The object group dispatch handles all possible incoming
-        // objects, so the cache and barrier will not be reached and
-        // can be eliminated.
-        if (callInfo.callee()->isGetPropertyCache()) {
-          MOZ_ASSERT(callInfo.callee() == maybeCache);
-        } else {
-          MTypeBarrier* barrier = callInfo.callee()->toTypeBarrier();
-          MOZ_ASSERT(!barrier->hasUses());
-          MOZ_ASSERT(barrier->type() == MIRType::Object);
-          MOZ_ASSERT(barrier->input()->isGetPropertyCache());
-          MOZ_ASSERT(barrier->input()->toGetPropertyCache() == maybeCache);
-          barrier->block()->discard(barrier);
-        }
-
-        MOZ_ASSERT(!maybeCache->hasUses());
-        maybeCache->block()->discard(maybeCache);
-      }
-    }
-  } else {
-    useFallback = dispatch->numCases() < targets.length();
-  }
-
-  // If necessary, generate a fallback path.
-  if (useFallback) {
-    // Annotate the fallback call with the target information.
-    Maybe<CallTargets> remainingTargets;
-    remainingTargets.emplace(alloc());
-    for (uint32_t i = 0; i < targets.length(); i++) {
-      if (!maybeCache && choiceSet[i]) {
-        continue;
-      }
-
-      JSObject* target = targets[i].target;
-      if (!target->is<JSFunction>()) {
-        remainingTargets = Nothing();
-        break;
-      }
-      if (!remainingTargets->append(&target->as<JSFunction>())) {
-        return abort(AbortReason::Alloc);
-      }
-    }
-
-    // Generate fallback blocks, and set |current| to the fallback return block.
-    if (maybeCache) {
-      MBasicBlock* fallbackTarget;
-      MOZ_TRY(inlineObjectGroupFallback(
-          remainingTargets, callInfo, dispatchBlock,
-          dispatch->toObjectGroupDispatch(), maybeCache, &fallbackTarget));
-      dispatch->addFallback(fallbackTarget);
-    } else {
-      MOZ_TRY(inlineGenericFallback(remainingTargets, callInfo, dispatchBlock));
-      dispatch->addFallback(current);
-    }
-
-    MBasicBlock* fallbackReturnBlock = current;
-
-    // Connect fallback case to return infrastructure.
-    MDefinition* retVal = fallbackReturnBlock->peek(-1);
-    retPhi->addInput(retVal);
-    fallbackReturnBlock->end(MGoto::New(alloc(), returnBlock));
-    if (!returnBlock->addPredecessorWithoutPhis(fallbackReturnBlock)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  // Finally add the dispatch instruction.
-  // This must be done at the end so that add() may be called above.
-  dispatchBlock->end(dispatch);
-
-  // Check the depth change: +1 for retval
-  MOZ_ASSERT(returnBlock->stackDepth() ==
-             dispatchBlock->stackDepth() - callInfo.numFormals() + 1);
-
-  graph().moveBlockToEnd(returnBlock);
-  return setCurrentAndSpecializePhis(returnBlock);
-}
-
-MInstruction* IonBuilder::createNamedLambdaObject(MDefinition* callee,
-                                                  MDefinition* env) {
-  // Get a template CallObject that we'll use to generate inline object
-  // creation.
-  LexicalEnvironmentObject* templateObj =
-      inspector->templateNamedLambdaObject();
-
-  // One field is added to the function to handle its name.  This cannot be a
-  // dynamic slot because there is still plenty of room on the NamedLambda
-  // object.
-  MOZ_ASSERT(!templateObj->hasDynamicSlots());
-
-  // Allocate the actual object. It is important that no intervening
-  // instructions could potentially bailout, thus leaking the dynamic slots
-  // pointer.
-  MInstruction* declEnvObj = MNewNamedLambdaObject::New(alloc(), templateObj);
-  current->add(declEnvObj);
-
-  // Initialize the object's reserved slots. No post barrier is needed here:
-  // the object will be allocated in the nursery if possible, and if the
-  // tenured heap is used instead, a minor collection will have been performed
-  // that moved env/callee to the tenured heap.
-  current->add(MStoreFixedSlot::New(
-      alloc(), declEnvObj, NamedLambdaObject::enclosingEnvironmentSlot(), env));
-  current->add(MStoreFixedSlot::New(alloc(), declEnvObj,
-                                    NamedLambdaObject::lambdaSlot(), callee));
-
-  return declEnvObj;
-}
-
-AbortReasonOr<MInstruction*> IonBuilder::createCallObject(MDefinition* callee,
-                                                          MDefinition* env) {
-  // Get a template CallObject that we'll use to generate inline object
-  // creation.
-  CallObject* templateObj = inspector->templateCallObject();
-  MConstant* templateCst =
-      MConstant::NewConstraintlessObject(alloc(), templateObj);
-  current->add(templateCst);
-
-  // Allocate the object.
-  MNewCallObject* callObj = MNewCallObject::New(alloc(), templateCst);
-  current->add(callObj);
-
-  // Initialize the object's reserved slots. No post barrier is needed here,
-  // for the same reason as in createNamedLambdaObject.
-  current->add(MStoreFixedSlot::New(
-      alloc(), callObj, CallObject::enclosingEnvironmentSlot(), env));
-  current->add(
-      MStoreFixedSlot::New(alloc(), callObj, CallObject::calleeSlot(), callee));
-
-  // Copy closed-over argument slots if there aren't parameter expressions.
-  MSlots* slots = nullptr;
-  for (PositionalFormalParameterIter fi(script()); fi; fi++) {
-    if (!fi.closedOver()) {
-      continue;
-    }
-
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    unsigned slot = fi.location().slot();
-    unsigned formal = fi.argumentSlot();
-    unsigned numFixedSlots = templateObj->numFixedSlots();
-    MDefinition* param;
-    if (script()->functionHasParameterExprs()) {
-      param = constant(MagicValue(JS_UNINITIALIZED_LEXICAL));
-    } else {
-      param = current->getSlot(info().argSlotUnchecked(formal));
-    }
-    if (slot >= numFixedSlots) {
-      if (!slots) {
-        slots = MSlots::New(alloc(), callObj);
-        current->add(slots);
-      }
-      current->add(
-          MStoreDynamicSlot::New(alloc(), slots, slot - numFixedSlots, param));
-    } else {
-      current->add(MStoreFixedSlot::New(alloc(), callObj, slot, param));
-    }
-  }
-
-  return AbortReasonOr<MInstruction*>(callObj);
-}
-
-MDefinition* IonBuilder::createThisScripted(MDefinition* callee,
-                                            MDefinition* newTarget) {
-  // Get callee.prototype.
-  //
-  // This instruction MUST be idempotent: since it does not correspond to an
-  // explicit operation in the bytecode, we cannot use resumeAfter().
-  // Getters may not override |prototype| fetching, so this operation is
-  // indeed idempotent.
-  //
-  // Note: GetPropertyCache can trigger a GC, and thus invalidation.
-  MConstant* id = constant(StringValue(names().prototype));
-  MGetPropertyCache* getPropCache =
-      MGetPropertyCache::New(alloc(), newTarget, id,
-                              /* monitored = */ false);
-  getPropCache->setIdempotent();
-  current->add(getPropCache);
-
-  // Create this from prototype
-  MCreateThisWithProto* createThis =
-      MCreateThisWithProto::New(alloc(), callee, newTarget, getPropCache);
-  current->add(createThis);
-
-  return createThis;
-}
-
-JSObject* IonBuilder::getSingletonPrototype(JSFunction* target) {
-  TypeSet::ObjectKey* targetKey = TypeSet::ObjectKey::get(target);
-  if (targetKey->unknownProperties()) {
-    return nullptr;
-  }
-
-  jsid protoid = NameToId(names().prototype);
-  HeapTypeSetKey protoProperty = targetKey->property(protoid);
-
-  return protoProperty.singleton(constraints());
-}
-
-MDefinition* IonBuilder::createThisScriptedSingleton(JSFunction* target) {
-  if (!target->hasBytecode()) {
-    return nullptr;
-  }
-
-  // Get the singleton prototype (if exists)
-  JSObject* proto = getSingletonPrototype(target);
-  if (!proto) {
-    return nullptr;
-  }
-
-  JSObject* templateObject = inspector->getTemplateObject(pc);
-  if (!templateObject) {
-    return nullptr;
-  }
-  if (!templateObject->is<PlainObject>()) {
-    return nullptr;
-  }
-  if (templateObject->staticPrototype() != proto) {
-    return nullptr;
-  }
-  if (templateObject->nonCCWRealm() != target->realm()) {
-    return nullptr;
-  }
-
-  TypeSet::ObjectKey* templateObjectKey =
-      TypeSet::ObjectKey::get(templateObject->group());
-  if (templateObjectKey->hasFlags(constraints(),
-                                  OBJECT_FLAG_NEW_SCRIPT_CLEARED)) {
-    return nullptr;
-  }
-
-  JSScript* targetScript = target->nonLazyScript();
-  JitScript* jitScript = targetScript->maybeJitScript();
-  if (!jitScript) {
-    return nullptr;
-  }
-
-  AutoSweepJitScript sweep(targetScript);
-  StackTypeSet* thisTypes = jitScript->thisTypes(sweep, targetScript);
-  if (!thisTypes->hasType(TypeSet::ObjectType(templateObject))) {
-    return nullptr;
-  }
-
-  // Generate an inline path to create a new |this| object with
-  // the given singleton prototype.
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  MCreateThisWithTemplate* createThis = MCreateThisWithTemplate::New(
-      alloc(), constraints(), templateConst,
-      templateObject->group()->initialHeap(constraints()));
-  current->add(templateConst);
-  current->add(createThis);
-
-  return createThis;
-}
-
-MDefinition* IonBuilder::createThisScriptedBaseline(MDefinition* callee) {
-  // Try to inline |this| creation based on Baseline feedback.
-
-  JSFunction* target = inspector->getSingleCallee(pc);
-  if (!target || !target->hasBytecode()) {
-    return nullptr;
-  }
-
-  if (target->constructorNeedsUninitializedThis()) {
-    return nullptr;
-  }
-
-  JSObject* templateObject = inspector->getTemplateObject(pc);
-  if (!templateObject) {
-    return nullptr;
-  }
-  if (!templateObject->is<PlainObject>()) {
-    return nullptr;
-  }
-  if (templateObject->nonCCWRealm() != target->realm()) {
-    return nullptr;
-  }
-
-  Shape* shape = target->lookupPure(realm->runtime()->names().prototype);
-  if (!shape || !shape->isDataProperty()) {
-    return nullptr;
-  }
-
-  Value protov = target->getSlot(shape->slot());
-  if (!protov.isObject()) {
-    return nullptr;
-  }
-
-  JSObject* proto = checkNurseryObject(&protov.toObject());
-  if (proto != templateObject->staticPrototype()) {
-    return nullptr;
-  }
-
-  TypeSet::ObjectKey* templateObjectKey =
-      TypeSet::ObjectKey::get(templateObject->group());
-  if (templateObjectKey->hasFlags(constraints(),
-                                  OBJECT_FLAG_NEW_SCRIPT_CLEARED)) {
-    return nullptr;
-  }
-
-  JSScript* targetScript = target->nonLazyScript();
-  JitScript* jitScript = targetScript->maybeJitScript();
-  if (!jitScript) {
-    return nullptr;
-  }
-
-  AutoSweepJitScript sweep(targetScript);
-  StackTypeSet* thisTypes = jitScript->thisTypes(sweep, targetScript);
-  if (!thisTypes->hasType(TypeSet::ObjectType(templateObject))) {
-    return nullptr;
-  }
-
-  // Shape guard.
-  callee = addShapeGuard(callee, target->lastProperty());
-
-  // Guard callee.prototype == proto.
-  MOZ_ASSERT(shape->numFixedSlots() == 0, "Must be a dynamic slot");
-  MSlots* slots = MSlots::New(alloc(), callee);
-  current->add(slots);
-  MLoadDynamicSlot* prototype =
-      MLoadDynamicSlot::New(alloc(), slots, shape->slot());
-  current->add(prototype);
-  MDefinition* protoConst = constant(ObjectValue(*proto));
-  MGuardObjectIdentity* guard =
-      MGuardObjectIdentity::New(alloc(), prototype, protoConst,
-                                /* bailOnEquality = */ false);
-  current->add(guard);
-
-  // Generate an inline path to create a new |this| object with
-  // the given prototype.
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  MCreateThisWithTemplate* createThis = MCreateThisWithTemplate::New(
-      alloc(), constraints(), templateConst,
-      templateObject->group()->initialHeap(constraints()));
-  current->add(templateConst);
-  current->add(createThis);
-
-  return createThis;
-}
-
-MDefinition* IonBuilder::createThisSlow(MDefinition* callee,
-                                        MDefinition* newTarget, bool inlining) {
-  // Call jit::CreateThisFromIon. This may return a NullValue for |this| that
-  // LCallGeneric has to check for if we can't create |this| inline.
-  MOZ_ASSERT(!inlining);
-  MCreateThis* createThis = MCreateThis::New(alloc(), callee, newTarget);
-  current->add(createThis);
-  return createThis;
-}
-
-MDefinition* IonBuilder::createThis(JSFunction* target, MDefinition* callee,
-                                    MDefinition* newTarget, bool inlining) {
-  // getPolyCallTargets ensures |target| is a constructor.
-  MOZ_ASSERT_IF(target, target->isConstructor());
-
-  // Can't inline without a known target function.
-  MOZ_ASSERT_IF(inlining, target);
-
-  // Create |this| for unknown target.
-  if (!target) {
-    if (callee == newTarget) {
-      if (MDefinition* createThis = createThisScriptedBaseline(callee)) {
-        return createThis;
-      }
-    }
-    return createThisSlow(callee, newTarget, inlining);
-  }
-
-  // Handle known native functions, bound functions and derived class
-  // constructors. Note: proxies are already excluded since target has type
-  // JSFunction.
-  if (target->isNative()) {
-    MOZ_ASSERT(target->isNativeWithoutJitEntry(),
-               "Natives with JitEntry are not supported for constructor calls");
-    return constant(MagicValue(JS_IS_CONSTRUCTING));
-  }
-  if (target->constructorNeedsUninitializedThis()) {
-    return constant(MagicValue(JS_UNINITIALIZED_LEXICAL));
-  }
-
-  if (callee == newTarget) {
-    // We must not have an effectful .prototype lookup when inlining.
-    MOZ_ASSERT_IF(inlining, target->hasNonConfigurablePrototypeDataProperty());
-
-    // Try baking in the prototype.
-    if (MDefinition* createThis = createThisScriptedSingleton(target)) {
-      return createThis;
-    }
-    if (MDefinition* createThis = createThisScriptedBaseline(callee)) {
-      return createThis;
-    }
-  }
-
-  // We can use createThisScripted if newTarget is known to be a function with a
-  // (builtin, getter-free) .prototype property and the callee is not one of the
-  // isNative/constructorNeedsUninitializedThis cases handled above.
-  JSFunction* newTargetFun =
-      callee == newTarget ? target
-                          : getSingleCallTarget(newTarget->resultTypeSet());
-  if (newTargetFun && newTargetFun->hasNonConfigurablePrototypeDataProperty()) {
-    return createThisScripted(callee, newTarget);
-  }
-
-  // The .prototype lookup may be effectful, so we can't inline the call.
-  MOZ_ASSERT(!inlining);
-  return createThisSlow(callee, newTarget, inlining);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_funcall(uint32_t argc) {
-  // Stack for JSOp::FunCall:
-  // 1:      arg0
-  // ...
-  // argc:   argN
-  // argc+1: JSFunction*, the 'f' in |f.call()|, in |this| position.
-  // argc+2: The native 'call' function.
-
-  int calleeDepth = -((int)argc + 2);
-  int funcDepth = -((int)argc + 1);
-
-  // If |Function.prototype.call| may be overridden, don't optimize callsite.
-  TemporaryTypeSet* calleeTypes = current->peek(calleeDepth)->resultTypeSet();
-  JSFunction* native = getSingleCallTarget(calleeTypes);
-  if (!native || !native->isNative() || native->native() != &fun_call) {
-    CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                      /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-    if (!callInfo.init(current, argc)) {
-      return abort(AbortReason::Alloc);
-    }
-    return makeCall(native, callInfo);
-  }
-  current->peek(calleeDepth)->setImplicitlyUsedUnchecked();
-
-  // Extract call target.
-  TemporaryTypeSet* funTypes = current->peek(funcDepth)->resultTypeSet();
-  JSFunction* target = getSingleCallTarget(funTypes);
-
-  CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                    /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-
-  // Save prior call stack in case we need to resolve during bailout
-  // recovery of inner inlined function. This includes the JSFunction and the
-  // 'call' native function.
-  if (!callInfo.savePriorCallStack(current, argc + 2)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Shimmy the slots down to remove the native 'call' function.
-  current->shimmySlots(funcDepth - 1);
-
-  bool zeroArguments = (argc == 0);
-
-  // If no |this| argument was provided, explicitly pass Undefined.
-  // Pushing is safe here, since one stack slot has been removed.
-  if (zeroArguments) {
-    pushConstant(UndefinedValue());
-  } else {
-    // |this| becomes implicit in the call.
-    argc -= 1;
-  }
-
-  if (!callInfo.init(current, argc)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Try to inline the call.
-  if (!zeroArguments) {
-    InliningDecision decision = makeInliningDecision(target, callInfo);
-    switch (decision) {
-      case InliningDecision_Error:
-        return abort(AbortReason::Error);
-      case InliningDecision_DontInline:
-      case InliningDecision_WarmUpCountTooLow:
-        break;
-      case InliningDecision_Inline: {
-        InliningStatus status;
-        MOZ_TRY_VAR(status, inlineSingleCall(callInfo, target));
-        if (status == InliningStatus_Inlined) {
-          return Ok();
-        }
-        break;
-      }
-    }
-  }
-
-  // Call without inlining.
-  return makeCall(target, callInfo);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_funapply(uint32_t argc) {
-  int calleeDepth = -((int)argc + 2);
-
-  TemporaryTypeSet* calleeTypes = current->peek(calleeDepth)->resultTypeSet();
-  JSFunction* native = getSingleCallTarget(calleeTypes);
-  if (argc != 2 || info().analysisMode() == Analysis_ArgumentsUsage) {
-    CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                      /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-    if (!callInfo.init(current, argc)) {
-      return abort(AbortReason::Alloc);
-    }
-    return makeCall(native, callInfo);
-  }
-
-  // Disable compilation if the second argument to |apply| cannot be guaranteed
-  // to be either definitely |arguments| or definitely not |arguments|.
-  MDefinition* argument = current->peek(-1);
-  if (script()->argumentsHasVarBinding() &&
-      argument->mightBeType(MIRType::MagicOptimizedArguments) &&
-      argument->type() != MIRType::MagicOptimizedArguments) {
-    return abort(AbortReason::Disable, "fun.apply with MaybeArguments");
-  }
-
-  // Fallback to regular call if arg 2 is not definitely |arguments|.
-  if (argument->type() != MIRType::MagicOptimizedArguments) {
-    // Optimize fun.apply(self, array) if the length is sane and there are no
-    // holes.
-    TemporaryTypeSet* objTypes = argument->resultTypeSet();
-    if (native && native->isNative() && native->native() == fun_apply &&
-        objTypes &&
-        objTypes->getKnownClass(constraints()) == &ArrayObject::class_ &&
-        !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&
-        ElementAccessIsPacked(constraints(), argument)) {
-      return jsop_funapplyarray(argc);
-    }
-
-    CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                      /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-    if (!callInfo.init(current, argc)) {
-      return abort(AbortReason::Alloc);
-    }
-    return makeCall(native, callInfo);
-  }
-
-  if ((!native || !native->isNative() || native->native() != fun_apply) &&
-      info().analysisMode() != Analysis_DefiniteProperties) {
-    return abort(AbortReason::Disable, "fun.apply speculation failed");
-  }
-
-  // Use funapply that definitely uses |arguments|
-  return jsop_funapplyarguments(argc);
-}
-
-static void AssertSpreadArgIsArray(MDefinition* argument,
-                                   CompilerConstraintList* constraints) {
-#ifdef DEBUG
-  // If we know class, ensure it is what we expected
-  if (TemporaryTypeSet* objTypes = argument->resultTypeSet()) {
-    if (const JSClass* clasp = objTypes->getKnownClass(constraints)) {
-      MOZ_ASSERT(clasp == &ArrayObject::class_);
-    }
-  }
-#endif
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_spreadcall() {
-  MDefinition* argArr = current->pop();
-  MDefinition* argThis = current->pop();
-  MDefinition* argFunc = current->pop();
-
-  // The arguments array is constructed by a JSOp::NewArray and not
-  // leaked to user. The complications of spread call iterator behaviour are
-  // handled when the user objects are expanded and copied into this hidden
-  // array.
-  AssertSpreadArgIsArray(argArr, constraints());
-
-  // Extract call target.
-  TemporaryTypeSet* funTypes = argFunc->resultTypeSet();
-  JSFunction* target = getSingleCallTarget(funTypes);
-  WrappedFunction* wrappedTarget =
-      target ? new (alloc()) WrappedFunction(target) : nullptr;
-
-  // Dense elements of argument array
-  MElements* elements = MElements::New(alloc(), argArr);
-  current->add(elements);
-
-  MApplyArray* apply =
-      MApplyArray::New(alloc(), wrappedTarget, argFunc, elements, argThis);
-  current->add(apply);
-  current->push(apply);
-  MOZ_TRY(resumeAfter(apply));
-
-  if (target && target->realm() == script()->realm()) {
-    apply->setNotCrossRealm();
-  }
-  if (BytecodeIsPopped(pc)) {
-    apply->setIgnoresReturnValue();
-  }
-
-  // TypeBarrier the call result
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(apply, types, BarrierKind::TypeSet);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_spreadnew() {
-  MDefinition* newTarget = current->pop();
-  MDefinition* argArr = current->pop();
-  MDefinition* thisValue = current->pop();
-  MDefinition* callee = current->pop();
-
-  // The arguments array is constructed by JSOp::NewArray and not leaked to the
-  // user. The complications of spread call iterator behaviour are handled when
-  // the user objects are expanded and copied into this hidden array.
-  AssertSpreadArgIsArray(argArr, constraints());
-
-  // Extract call target.
-  TemporaryTypeSet* funTypes = callee->resultTypeSet();
-  JSFunction* target = getSingleCallTarget(funTypes);
-  if (target && !target->isConstructor()) {
-    // Don't optimize when the target doesn't support construct calls.
-    target = nullptr;
-  }
-  WrappedFunction* wrappedTarget =
-      target ? new (alloc()) WrappedFunction(target) : nullptr;
-
-  // Inline the constructor on the caller-side.
-  MDefinition* create = createThis(target, callee, newTarget, false);
-  thisValue->setImplicitlyUsedUnchecked();
-
-  // Dense elements of the argument array.
-  MElements* elements = MElements::New(alloc(), argArr);
-  current->add(elements);
-
-  auto* apply = MConstructArray::New(alloc(), wrappedTarget, callee, elements,
-                                     create, newTarget);
-  current->add(apply);
-  current->push(apply);
-  MOZ_TRY(resumeAfter(apply));
-
-  if (target && target->realm() == script()->realm()) {
-    apply->setNotCrossRealm();
-  }
-
-  // TypeBarrier the call result.
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(apply, types, BarrierKind::TypeSet);
-}
-
-bool IonBuilder::propertyIsConstantFunction(NativeObject* nobj, jsid id,
-                                            bool (*test)(IonBuilder* builder,
-                                                         JSFunction* fun)) {
-  if (!nobj->isSingleton()) {
-    return false;
-  }
-
-  TypeSet::ObjectKey* objKey = TypeSet::ObjectKey::get(nobj);
-  if (analysisContext) {
-    objKey->ensureTrackedProperty(analysisContext, id);
-  }
-
-  if (objKey->unknownProperties()) {
-    return false;
-  }
-
-  HeapTypeSetKey property = objKey->property(id);
-  Value value = UndefinedValue();
-  if (!property.constant(constraints(), &value)) {
-    return false;
-  }
-  return value.isObject() && value.toObject().is<JSFunction>() &&
-         test(this, &value.toObject().as<JSFunction>());
-}
-
-bool IonBuilder::ensureArrayPrototypeIteratorNotModified() {
-  NativeObject* obj = script()->global().maybeGetArrayPrototype();
-  if (!obj) {
-    return false;
-  }
-
-  jsid id = SYMBOL_TO_JSID(realm->runtime()->wellKnownSymbols().iterator);
-  return propertyIsConstantFunction(obj, id, [](auto* builder, auto* fun) {
-    CompileRuntime* runtime = builder->mirGen().runtime;
-    return IsSelfHostedFunctionWithName(fun, runtime->names().ArrayValues);
-  });
-}
-
-bool IonBuilder::ensureArrayIteratorPrototypeNextNotModified() {
-  NativeObject* obj = script()->global().maybeGetArrayIteratorPrototype();
-  if (!obj) {
-    return false;
-  }
-
-  jsid id = NameToId(mirGen_.runtime->names().next);
-  return propertyIsConstantFunction(obj, id, [](auto* builder, auto* fun) {
-    return IsSelfHostedFunctionWithName(
-        fun, builder->mirGen().runtime->names().ArrayIteratorNext);
-  });
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_optimize_spreadcall() {
-  MDefinition* arr = current->peek(-1);
-
-  bool result = false;
-  do {
-    // Inline with MIsPackedArray if the conditions described in
-    // js::OptimizeSpreadCall() are all met or can be expressed through
-    // compiler constraints.
-
-    // The argument is an array.
-    TemporaryTypeSet* types = arr->resultTypeSet();
-    if (!types || types->getKnownClass(constraints()) != &ArrayObject::class_) {
-      break;
-    }
-
-    // The array's prototype is Array.prototype.
-    JSObject* proto;
-    if (!types->getCommonPrototype(constraints(), &proto)) {
-      break;
-    }
-    NativeObject* arrayProto = script()->global().maybeGetArrayPrototype();
-    if (!arrayProto || arrayProto != proto) {
-      break;
-    }
-
-    // The array doesn't define an own @@iterator property.
-    jsid id = SYMBOL_TO_JSID(realm->runtime()->wellKnownSymbols().iterator);
-    bool res;
-    MOZ_TRY_VAR(res, testNotDefinedProperty(arr, id, true));
-    if (!res) {
-      break;
-    }
-
-    // Array.prototype[@@iterator] is not modified.
-    if (!ensureArrayPrototypeIteratorNotModified()) {
-      break;
-    }
-
-    // %ArrayIteratorPrototype%.next is not modified.
-    if (!ensureArrayIteratorPrototypeNextNotModified()) {
-      break;
-    }
-
-    result = true;
-  } while (false);
-
-  if (result) {
-    auto* ins = MIsPackedArray::New(alloc(), arr);
-    current->add(ins);
-    current->push(ins);
-    return Ok();
-  }
-
-  auto* ins = MOptimizeSpreadCallCache::New(alloc(), arr);
-  current->add(ins);
-  current->push(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_funapplyarray(uint32_t argc) {
-  MOZ_ASSERT(argc == 2);
-
-  int funcDepth = -((int)argc + 1);
-
-  // Extract call target.
-  TemporaryTypeSet* funTypes = current->peek(funcDepth)->resultTypeSet();
-  JSFunction* target = getSingleCallTarget(funTypes);
-
-  // Pop the array agument
-  MDefinition* argObj = current->pop();
-
-  MElements* elements = MElements::New(alloc(), argObj);
-  current->add(elements);
-
-  // Pop the |this| argument.
-  MDefinition* argThis = current->pop();
-
-  // Unwrap the (JSFunction *) parameter.
-  MDefinition* argFunc = current->pop();
-
-  // Pop apply function.
-  MDefinition* nativeFunc = current->pop();
-  nativeFunc->setImplicitlyUsedUnchecked();
-
-  WrappedFunction* wrappedTarget =
-      target ? new (alloc()) WrappedFunction(target) : nullptr;
-  MApplyArray* apply =
-      MApplyArray::New(alloc(), wrappedTarget, argFunc, elements, argThis);
-  current->add(apply);
-  current->push(apply);
-  MOZ_TRY(resumeAfter(apply));
-
-  if (target && target->realm() == script()->realm()) {
-    apply->setNotCrossRealm();
-  }
-  if (BytecodeIsPopped(pc)) {
-    apply->setIgnoresReturnValue();
-  }
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(apply, types, BarrierKind::TypeSet);
-}
-
-bool CallInfo::savePriorCallStack(MBasicBlock* current, size_t peekDepth) {
-  MOZ_ASSERT(priorArgs_.empty());
-  if (!priorArgs_.reserve(peekDepth)) {
-    return false;
-  }
-  while (peekDepth) {
-    priorArgs_.infallibleAppend(current->peek(0 - int32_t(peekDepth)));
-    peekDepth--;
-  }
-  return true;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_funapplyarguments(uint32_t argc) {
-  // Stack for JSOp::FunApply:
-  // 1:      Vp
-  // 2:      This
-  // argc+1: JSFunction*, the 'f' in |f.call()|, in |this| position.
-  // argc+2: The native 'apply' function.
-
-  int funcDepth = -((int)argc + 1);
-
-  // Extract call target.
-  TemporaryTypeSet* funTypes = current->peek(funcDepth)->resultTypeSet();
-  JSFunction* target = getSingleCallTarget(funTypes);
-
-  // When this script isn't inlined, use MApplyArgs,
-  // to copy the arguments from the stack and call the function
-  if (inliningDepth_ == 0 &&
-      info().analysisMode() != Analysis_DefiniteProperties) {
-    // The array argument corresponds to the arguments object. As the JIT
-    // is implicitly reading the arguments object in the next instruction,
-    // we need to prevent the deletion of the arguments object from resume
-    // points, so that Baseline will behave correctly after a bailout.
-    MDefinition* vp = current->pop();
-    vp->setImplicitlyUsedUnchecked();
-
-    MDefinition* argThis = current->pop();
-
-    // Unwrap the (JSFunction*) parameter.
-    MDefinition* argFunc = current->pop();
-
-    // Pop apply function.
-    MDefinition* nativeFunc = current->pop();
-    nativeFunc->setImplicitlyUsedUnchecked();
-
-    MArgumentsLength* numArgs = MArgumentsLength::New(alloc());
-    current->add(numArgs);
-
-    WrappedFunction* wrappedTarget =
-        target ? new (alloc()) WrappedFunction(target) : nullptr;
-    MApplyArgs* apply =
-        MApplyArgs::New(alloc(), wrappedTarget, argFunc, numArgs, argThis);
-    current->add(apply);
-    current->push(apply);
-    MOZ_TRY(resumeAfter(apply));
-
-    if (target && target->realm() == script()->realm()) {
-      apply->setNotCrossRealm();
-    }
-    if (BytecodeIsPopped(pc)) {
-      apply->setIgnoresReturnValue();
-    }
-
-    TemporaryTypeSet* types = bytecodeTypes(pc);
-    return pushTypeBarrier(apply, types, BarrierKind::TypeSet);
-  }
-
-  // When inlining we have the arguments the function gets called with
-  // and can optimize even more, by just calling the functions with the args.
-  // We also try this path when doing the definite properties analysis, as we
-  // can inline the apply() target and don't care about the actual arguments
-  // that were passed in.
-
-  CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                    /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-  if (!callInfo.savePriorCallStack(current, 4)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Vp
-  MDefinition* vp = current->pop();
-  vp->setImplicitlyUsedUnchecked();
-
-  // Arguments
-  if (inliningDepth_) {
-    if (!callInfo.setArgs(inlineCallInfo_->argv())) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  // Pop this.
-  MDefinition* argThis = current->pop();
-  callInfo.setThis(argThis);
-
-  // Pop callee.
-  MDefinition* argFunc = current->pop();
-  callInfo.setCallee(argFunc);
-
-  // Pop apply function.
-  MDefinition* nativeFunc = current->pop();
-  nativeFunc->setImplicitlyUsedUnchecked();
-
-  // Try to inline the call.
-  InliningDecision decision = makeInliningDecision(target, callInfo);
-  switch (decision) {
-    case InliningDecision_Error:
-      return abort(AbortReason::Error);
-    case InliningDecision_DontInline:
-    case InliningDecision_WarmUpCountTooLow:
-      break;
-    case InliningDecision_Inline: {
-      InliningStatus status;
-      MOZ_TRY_VAR(status, inlineSingleCall(callInfo, target));
-      if (status == InliningStatus_Inlined) {
-        return Ok();
-      }
-    }
-  }
-
-  return makeCall(target, callInfo);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_call(uint32_t argc, bool constructing,
-                                        bool ignoresReturnValue) {
-  // If this call has never executed, try to seed the observed type set
-  // based on how the call result is used.
-  TemporaryTypeSet* observed = bytecodeTypes(pc);
-  if (observed->empty()) {
-    if (BytecodeFlowsToBitop(pc)) {
-      observed->addType(TypeSet::Int32Type(), alloc_->lifoAlloc());
-    } else if (JSOp(*GetNextPc(pc)) == JSOp::Pos) {
-      // Note: this is lame, overspecialized on the code patterns used
-      // by asm.js and should be replaced by a more general mechanism.
-      // See bug 870847.
-      observed->addType(TypeSet::DoubleType(), alloc_->lifoAlloc());
-    }
-  }
-
-  int calleeDepth = -((int)argc + 2 + constructing);
-
-  // Acquire known call target if existent.
-  InliningTargets targets(alloc());
-  TemporaryTypeSet* calleeTypes = current->peek(calleeDepth)->resultTypeSet();
-  if (calleeTypes) {
-    MOZ_TRY(getPolyCallTargets(calleeTypes, constructing, targets, 4));
-  }
-
-  CallInfo callInfo(alloc(), pc, constructing, ignoresReturnValue);
-  if (!callInfo.init(current, argc)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Try inlining
-  InliningStatus status;
-  MOZ_TRY_VAR(status, inlineCallsite(targets, callInfo));
-  if (status == InliningStatus_Inlined) {
-    return Ok();
-  }
-
-  // Discard unreferenced & pre-allocated resume points.
-  replaceMaybeFallbackFunctionGetter(nullptr);
-
-  // No inline, just make the call.
-  Maybe<CallTargets> callTargets;
-  if (!targets.empty()) {
-    callTargets.emplace(alloc());
-    for (const InliningTarget& target : targets) {
-      if (!target.target->is<JSFunction>()) {
-        callTargets = Nothing();
-        break;
-      }
-      if (!callTargets->append(&target.target->as<JSFunction>())) {
-        return abort(AbortReason::Alloc);
-      }
-    }
-  }
-
-  if (status == InliningStatus_WarmUpCountTooLow && callTargets &&
-      callTargets->length() == 1 && isHighestOptimizationLevel()) {
-    JSFunction* target = callTargets.ref()[0];
-    MRecompileCheck* check =
-        MRecompileCheck::New(alloc(), target->nonLazyScript(),
-                             optimizationInfo().inliningRecompileThreshold(),
-                             MRecompileCheck::RecompileCheckType::Inlining);
-    current->add(check);
-  }
-
-  return makeCall(callTargets, callInfo);
-}
-
-AbortReasonOr<bool> IonBuilder::testShouldDOMCall(TypeSet* inTypes,
-                                                  JSFunction* func,
-                                                  JSJitInfo::OpType opType) {
-  if (!func->isNative() || !func->hasJitInfo()) {
-    return false;
-  }
-
-  // If all the DOM objects flowing through are legal with this
-  // property, we can bake in a call to the bottom half of the DOM
-  // accessor
-  DOMInstanceClassHasProtoAtDepth instanceChecker =
-      realm->runtime()->DOMcallbacks()->instanceClassMatchesProto;
-
-  const JSJitInfo* jinfo = func->jitInfo();
-  if (jinfo->type() != opType) {
-    return false;
-  }
-
-  for (unsigned i = 0; i < inTypes->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = inTypes->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    if (!key->hasStableClassAndProto(constraints())) {
-      return false;
-    }
-
-    if (!instanceChecker(key->clasp(), jinfo->protoID, jinfo->depth)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static bool ArgumentTypesMatch(MDefinition* def, StackTypeSet* calleeTypes) {
-  MOZ_ASSERT(calleeTypes);
-
-  if (calleeTypes->unknown()) {
-    return true;
-  }
-
-  if (TypeSet::IsUntrackedMIRType(def->type())) {
-    // The TypeSet has to be marked as unknown. See JitScript::MonitorThisType.
-    return false;
-  }
-
-  if (def->resultTypeSet()) {
-    MOZ_ASSERT(def->type() == MIRType::Value || def->mightBeType(def->type()));
-    return def->resultTypeSet()->isSubset(calleeTypes);
-  }
-
-  if (def->type() == MIRType::Value) {
-    return false;
-  }
-
-  if (def->type() == MIRType::Object) {
-    return calleeTypes->unknownObject();
-  }
-
-  return calleeTypes->mightBeMIRType(def->type());
-}
-
-bool IonBuilder::testNeedsArgumentCheck(JSFunction* target,
-                                        CallInfo& callInfo) {
-  // If we have a known target, check if the caller arg types are a subset of
-  // callee. Since typeset accumulates and can't decrease that means we don't
-  // need to check the arguments anymore.
-
-  if (!target->hasBytecode()) {
-    return true;
-  }
-
-  JSScript* targetScript = target->nonLazyScript();
-  JitScript* jitScript = targetScript->maybeJitScript();
-  if (!jitScript) {
-    return true;
-  }
-
-  AutoSweepJitScript sweep(targetScript);
-  if (!ArgumentTypesMatch(callInfo.thisArg(),
-                          jitScript->thisTypes(sweep, targetScript))) {
-    return true;
-  }
-  uint32_t expected_args = std::min<uint32_t>(callInfo.argc(), target->nargs());
-  for (size_t i = 0; i < expected_args; i++) {
-    if (!ArgumentTypesMatch(callInfo.getArg(i),
-                            jitScript->argTypes(sweep, targetScript, i))) {
-      return true;
-    }
-  }
-  for (size_t i = callInfo.argc(); i < target->nargs(); i++) {
-    StackTypeSet* types = jitScript->argTypes(sweep, targetScript, i);
-    if (!types->mightBeMIRType(MIRType::Undefined)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-AbortReasonOr<MCall*> IonBuilder::makeCallHelper(
-    const Maybe<CallTargets>& targets, CallInfo& callInfo) {
-  // This function may be called with mutated stack.
-  // Querying TI for popped types is invalid.
-
-  MOZ_ASSERT_IF(targets, !targets->empty());
-
-  JSFunction* target = nullptr;
-  if (targets && targets->length() == 1) {
-    target = targets.ref()[0];
-  }
-
-  bool isDOMCall = false;
-  DOMObjectKind objKind = DOMObjectKind::Unknown;
-  if (target && !callInfo.constructing()) {
-    // We know we have a single call target.  Check whether the "this" types
-    // are DOM types and our function a DOM function, and if so flag the
-    // MCall accordingly.
-    TemporaryTypeSet* thisTypes = callInfo.thisArg()->resultTypeSet();
-    if (thisTypes && thisTypes->getKnownMIRType() == MIRType::Object &&
-        thisTypes->isDOMClass(constraints(), &objKind)) {
-      MOZ_TRY_VAR(isDOMCall,
-                  testShouldDOMCall(thisTypes, target, JSJitInfo::Method));
-    }
-  }
-
-  bool needsThisCheck = false;
-  if (callInfo.constructing()) {
-    // Inline the this-object allocation on the caller-side.
-    MDefinition* create =
-        createThis(target, callInfo.callee(), callInfo.getNewTarget(),
-                   /* inlining = */ false);
-    callInfo.thisArg()->setImplicitlyUsedUnchecked();
-    callInfo.setThis(create);
-    needsThisCheck = create->isCreateThis();
-    if (needsThisCheck) {
-      // We have to use the LCallGeneric path.
-      target = nullptr;
-    }
-  }
-
-  uint32_t targetArgs = callInfo.argc();
-
-  // Collect number of missing arguments provided that the target is
-  // scripted. Native functions are passed an explicit 'argc' parameter.
-  if (target && target->hasJitEntry()) {
-    targetArgs = std::max<uint32_t>(target->nargs(), callInfo.argc());
-  }
-
-  WrappedFunction* wrappedTarget =
-      target ? new (alloc()) WrappedFunction(target) : nullptr;
-
-  MCall* call = MCall::New(alloc(), wrappedTarget,
-                           targetArgs + 1 + callInfo.constructing(),
-                           callInfo.argc(), callInfo.constructing(),
-                           callInfo.ignoresReturnValue(), isDOMCall, objKind);
-  if (!call) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (callInfo.constructing()) {
-    if (needsThisCheck) {
-      call->setNeedsThisCheck();
-    }
-    call->addArg(targetArgs + 1, callInfo.getNewTarget());
-  }
-
-  // Explicitly pad any missing arguments with |undefined|.
-  // This permits skipping the argumentsRectifier.
-  MOZ_ASSERT_IF(target && targetArgs > callInfo.argc(), target->hasJitEntry());
-  for (int i = targetArgs; i > (int)callInfo.argc(); i--) {
-    MConstant* undef = constant(UndefinedValue());
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-    call->addArg(i, undef);
-  }
-
-  // Add explicit arguments.
-  // Skip addArg(0) because it is reserved for this
-  for (int32_t i = callInfo.argc() - 1; i >= 0; i--) {
-    call->addArg(i + 1, callInfo.getArg(i));
-  }
-
-  // Now that we've told it about all the args, compute whether it's movable
-  call->computeMovable();
-
-  // Pass |this| and function.
-  MDefinition* thisArg = callInfo.thisArg();
-  call->addArg(0, thisArg);
-
-  if (targets) {
-    // The callee must be one of the target JSFunctions, so we don't need a
-    // Class check.
-    call->disableClassCheck();
-
-    // Determine whether we can skip the callee's prologue type checks and
-    // whether we have to switch realms.
-    bool needArgCheck = false;
-    bool maybeCrossRealm = false;
-    for (JSFunction* target : targets.ref()) {
-      if (testNeedsArgumentCheck(target, callInfo)) {
-        needArgCheck = true;
-      }
-      if (target->realm() != script()->realm()) {
-        maybeCrossRealm = true;
-      }
-    }
-    if (!needArgCheck) {
-      call->disableArgCheck();
-    }
-    if (!maybeCrossRealm) {
-      call->setNotCrossRealm();
-    }
-  }
-
-  call->initCallee(callInfo.callee());
-
-  current->add(call);
-  return call;
-}
-
-static bool DOMCallNeedsBarrier(const JSJitInfo* jitinfo,
-                                TemporaryTypeSet* types) {
-  MOZ_ASSERT(jitinfo->type() != JSJitInfo::InlinableNative);
-
-  // If the return type of our DOM native is in "types" already, we don't
-  // actually need a barrier.
-  if (jitinfo->returnType() == JSVAL_TYPE_UNKNOWN) {
-    return true;
-  }
-
-  // JSVAL_TYPE_OBJECT doesn't tell us much; we still have to barrier on the
-  // actual type of the object.
-  if (jitinfo->returnType() == JSVAL_TYPE_OBJECT) {
-    return true;
-  }
-
-  // No need for a barrier if we're already expecting the type we'll produce.
-  return MIRTypeFromValueType(jitinfo->returnType()) !=
-         types->getKnownMIRType();
-}
-
-AbortReasonOr<Ok> IonBuilder::makeCall(const Maybe<CallTargets>& targets,
-                                       CallInfo& callInfo) {
-#ifdef DEBUG
-  // Constructor calls to non-constructors should throw. We don't want to use
-  // CallKnown in this case.
-  if (callInfo.constructing() && targets) {
-    for (JSFunction* target : targets.ref()) {
-      MOZ_ASSERT(target->isConstructor());
-    }
-  }
-#endif
-
-  MCall* call;
-  MOZ_TRY_VAR(call, makeCallHelper(targets, callInfo));
-
-  current->push(call);
-  if (call->isEffectful()) {
-    MOZ_TRY(resumeAfter(call));
-  }
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  if (call->isCallDOMNative()) {
-    return pushDOMTypeBarrier(call, types,
-                              call->getSingleTarget()->rawNativeJSFunction());
-  }
-
-  return pushTypeBarrier(call, types, BarrierKind::TypeSet);
-}
-
-AbortReasonOr<Ok> IonBuilder::makeCall(JSFunction* target, CallInfo& callInfo) {
-  Maybe<CallTargets> targets;
-  if (target) {
-    targets.emplace(alloc());
-    if (!targets->append(target)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-  return makeCall(targets, callInfo);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_eval(uint32_t argc) {
-  int calleeDepth = -((int)argc + 2);
-  TemporaryTypeSet* calleeTypes = current->peek(calleeDepth)->resultTypeSet();
-
-  // Emit a normal call if the eval has never executed. This keeps us from
-  // disabling compilation for the script when testing with --ion-eager.
-  if (calleeTypes && calleeTypes->empty()) {
-    return jsop_call(argc, /* constructing = */ false, false);
-  }
-
-  JSFunction* target = getSingleCallTarget(calleeTypes);
-  if (!target) {
-    return abort(AbortReason::Disable, "No single callee for eval()");
-  }
-
-  if (script()->global().valueIsEval(ObjectValue(*target))) {
-    if (argc != 1) {
-      return abort(AbortReason::Disable,
-                   "Direct eval with more than one argument");
-    }
-
-    if (!info().funMaybeLazy()) {
-      return abort(AbortReason::Disable, "Direct eval in global code");
-    }
-
-    if (info().funMaybeLazy()->isArrow()) {
-      return abort(AbortReason::Disable, "Direct eval from arrow function");
-    }
-
-    CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                      /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-    if (!callInfo.init(current, argc)) {
-      return abort(AbortReason::Alloc);
-    }
-    callInfo.setImplicitlyUsedUnchecked();
-
-    callInfo.callee()->setImplicitlyUsedUnchecked();
-
-    MDefinition* envChain = current->environmentChain();
-    MDefinition* string = callInfo.getArg(0);
-
-    // Direct eval acts as identity on non-string types according to
-    // ES5 15.1.2.1 step 1.
-    if (!string->mightBeType(MIRType::String)) {
-      current->push(string);
-      TemporaryTypeSet* types = bytecodeTypes(pc);
-      return pushTypeBarrier(string, types, BarrierKind::TypeSet);
-    }
-
-    MOZ_TRY(jsop_newtarget());
-    MDefinition* newTargetValue = current->pop();
-
-    // Try to pattern match 'eval(v + "()")'. In this case v is likely a
-    // name on the env chain and the eval is performing a call on that
-    // value. Use an env chain lookup rather than a full eval.
-    if (string->isConcat() &&
-        string->getOperand(1)->type() == MIRType::String &&
-        string->getOperand(1)->maybeConstantValue()) {
-      JSAtom* atom =
-          &string->getOperand(1)->maybeConstantValue()->toString()->asAtom();
-
-      if (StringEqualsLiteral(atom, "()")) {
-        MDefinition* name = string->getOperand(0);
-        MInstruction* dynamicName =
-            MGetDynamicName::New(alloc(), envChain, name);
-        current->add(dynamicName);
-
-        current->push(dynamicName);
-        current->push(constant(UndefinedValue()));  // thisv
-
-        CallInfo evalCallInfo(alloc(), pc, /* constructing = */ false,
-                              /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-        if (!evalCallInfo.init(current, /* argc = */ 0)) {
-          return abort(AbortReason::Alloc);
-        }
-
-        return makeCall(nullptr, evalCallInfo);
-      }
-    }
-
-    MInstruction* ins =
-        MCallDirectEval::New(alloc(), envChain, string, newTargetValue, pc);
-    current->add(ins);
-    current->push(ins);
-
-    TemporaryTypeSet* types = bytecodeTypes(pc);
-    MOZ_TRY(resumeAfter(ins));
-    return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-  }
-
-  return jsop_call(argc, /* constructing = */ false, false);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_compare(JSOp op) {
-  MDefinition* right = current->pop();
-  MDefinition* left = current->pop();
-
-  return jsop_compare(op, left, right);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_compare(JSOp op, MDefinition* left,
-                                           MDefinition* right) {
-  bool emitted = false;
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(compareTrySpecialized(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-    MOZ_TRY(compareTryBitwise(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-    MOZ_TRY(
-        compareTrySpecializedOnBaselineInspector(&emitted, op, left, right));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  MOZ_TRY(compareTryBinaryStub(&emitted, left, right));
-  if (emitted) {
-    return Ok();
-  }
-
-  // Not possible to optimize. Do a slow vm call.
-  MCompare* ins = MCompare::New(alloc(), left, right, op);
-  ins->cacheOperandMightEmulateUndefined(constraints());
-
-  current->add(ins);
-  current->push(ins);
-  if (ins->isEffectful()) {
-    MOZ_TRY(resumeAfter(ins));
-  }
-
-  return Ok();
-}
-
-static bool ObjectOrSimplePrimitive(MDefinition* op) {
-  // Return true if op is either undefined/null/boolean/int32/symbol or an
-  // object.
-  return op->definitelyType({MIRType::Undefined, MIRType::Null,
-                             MIRType::Boolean, MIRType::Int32, MIRType::Symbol,
-                             MIRType::Object});
-}
-
-AbortReasonOr<Ok> IonBuilder::compareTrySpecialized(bool* emitted, JSOp op,
-                                                    MDefinition* left,
-                                                    MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit an compare based on the input types.
-
-  MCompare::CompareType type = MCompare::determineCompareType(op, left, right);
-  if (type == MCompare::Compare_Unknown) {
-    return Ok();
-  }
-
-  MCompare* ins = MCompare::New(alloc(), left, right, op);
-  ins->setCompareType(type);
-  ins->cacheOperandMightEmulateUndefined(constraints());
-
-  // Some compare types need to have the specific type in the rhs.
-  // Swap operands if that is not the case.
-  if (type == MCompare::Compare_StrictString &&
-      right->type() != MIRType::String) {
-    ins->swapOperands();
-  } else if (type == MCompare::Compare_Null && right->type() != MIRType::Null) {
-    ins->swapOperands();
-  } else if (type == MCompare::Compare_Undefined &&
-             right->type() != MIRType::Undefined) {
-    ins->swapOperands();
-  } else if (type == MCompare::Compare_Boolean &&
-             right->type() != MIRType::Boolean) {
-    ins->swapOperands();
-  }
-
-  // Replace inputs with unsigned variants if needed.
-  if (type == MCompare::Compare_UInt32) {
-    ins->replaceWithUnsignedOperands();
-  }
-
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_ASSERT(!ins->isEffectful());
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::compareTryBitwise(bool* emitted, JSOp op,
-                                                MDefinition* left,
-                                                MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a bitwise compare. Check if a bitwise compare equals the wanted
-  // result for all observed operand types.
-
-  // Only allow loose and strict equality.
-  if (op != JSOp::Eq && op != JSOp::Ne && op != JSOp::StrictEq &&
-      op != JSOp::StrictNe) {
-    return Ok();
-  }
-
-  // Only primitive (not double/string) or objects are supported.
-  // I.e. Undefined/Null/Boolean/Int32/Symbol and Object
-  if (!ObjectOrSimplePrimitive(left) || !ObjectOrSimplePrimitive(right)) {
-    return Ok();
-  }
-
-  // In the loose comparison more values could be the same,
-  // but value comparison reporting otherwise.
-  if (op == JSOp::Eq || op == JSOp::Ne) {
-    // Objects that emulate undefined are not supported.
-    if (left->maybeEmulatesUndefined(constraints()) ||
-        right->maybeEmulatesUndefined(constraints())) {
-      return Ok();
-    }
-
-    // Undefined compared loosy to Null is not supported,
-    // because tag is different, but value can be the same (undefined == null).
-    if ((left->mightBeType(MIRType::Undefined) &&
-         right->mightBeType(MIRType::Null)) ||
-        (left->mightBeType(MIRType::Null) &&
-         right->mightBeType(MIRType::Undefined))) {
-      return Ok();
-    }
-
-    // Int32 compared loosy to Boolean is not supported,
-    // because tag is different, but value can be the same (1 == true).
-    if ((left->mightBeType(MIRType::Int32) &&
-         right->mightBeType(MIRType::Boolean)) ||
-        (left->mightBeType(MIRType::Boolean) &&
-         right->mightBeType(MIRType::Int32))) {
-      return Ok();
-    }
-
-    // For loosy comparison of an object with a Boolean/Number/String/Symbol
-    // the valueOf the object is taken. Therefore not supported.
-    bool simpleLHS = left->mightBeType(MIRType::Boolean) ||
-                     left->mightBeType(MIRType::Int32) ||
-                     left->mightBeType(MIRType::Symbol);
-    bool simpleRHS = right->mightBeType(MIRType::Boolean) ||
-                     right->mightBeType(MIRType::Int32) ||
-                     right->mightBeType(MIRType::Symbol);
-    if ((left->mightBeType(MIRType::Object) && simpleRHS) ||
-        (right->mightBeType(MIRType::Object) && simpleLHS)) {
-      return Ok();
-    }
-  }
-
-  MCompare* ins = MCompare::New(alloc(), left, right, op);
-  ins->setCompareType(MCompare::Compare_Bitwise);
-  ins->cacheOperandMightEmulateUndefined(constraints());
-
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_ASSERT(!ins->isEffectful());
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::compareTrySpecializedOnBaselineInspector(
-    bool* emitted, JSOp op, MDefinition* left, MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Not supported for call expressions.
-  if (IsInvokePC(pc)) {
-    return Ok();
-  }
-
-  // Try to specialize based on any baseline caches that have been generated
-  // for the opcode. These will cause the instruction's type policy to insert
-  // fallible unboxes to the appropriate input types.
-
-  // Strict equality isn't supported.
-  if (op == JSOp::StrictEq || op == JSOp::StrictNe) {
-    return Ok();
-  }
-
-  MCompare::CompareType type = inspector->expectedCompareType(pc);
-  if (type == MCompare::Compare_Unknown) {
-    return Ok();
-  }
-
-  MCompare* ins = MCompare::New(alloc(), left, right, op);
-  ins->setCompareType(type);
-  ins->cacheOperandMightEmulateUndefined(constraints());
-
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_ASSERT(!ins->isEffectful());
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::compareTryBinaryStub(bool* emitted,
-                                                   MDefinition* left,
-                                                   MDefinition* right) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Try to emit a CacheIR Stub.
-  if (JitOptions.disableCacheIR) {
-    return Ok();
-  }
-
-  if (IsInvokePC(pc)) {
-    return Ok();
-  }
-
-  MBinaryCache* stub =
-      MBinaryCache::New(alloc(), left, right, MIRType::Boolean);
-  current->add(stub);
-  current->push(stub);
-  MOZ_TRY(resumeAfter(stub));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::newArrayTryTemplateObject(
-    bool* emitted, JSObject* templateObject, uint32_t length) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!templateObject) {
-    return Ok();
-  }
-
-  MOZ_ASSERT(length <= NativeObject::MAX_DENSE_ELEMENTS_COUNT);
-
-  size_t arraySlots =
-      gc::GetGCKindSlots(templateObject->asTenured().getAllocKind()) -
-      ObjectElements::VALUES_PER_HEADER;
-
-  if (length > arraySlots) {
-    return Ok();
-  }
-
-  // Emit fastpath.
-
-  gc::InitialHeap heap = templateObject->group()->initialHeap(constraints());
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  current->add(templateConst);
-
-  MNewArray* ins =
-      MNewArray::New(alloc(), constraints(), length, templateConst, heap, pc);
-  current->add(ins);
-  current->push(ins);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::newArrayTryVM(bool* emitted,
-                                            JSObject* templateObject,
-                                            uint32_t length) {
-  MOZ_ASSERT(*emitted == false);
-
-  gc::InitialHeap heap = gc::DefaultHeap;
-  MConstant* templateConst = MConstant::New(alloc(), NullValue());
-
-  if (templateObject) {
-    heap = templateObject->group()->initialHeap(constraints());
-    templateConst = MConstant::NewConstraintlessObject(alloc(), templateObject);
-  }
-
-  current->add(templateConst);
-
-  MNewArray* ins =
-      MNewArray::NewVM(alloc(), constraints(), length, templateConst, heap, pc);
-  current->add(ins);
-  current->push(ins);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_newarray(uint32_t length) {
-  JSObject* templateObject = inspector->getTemplateObject(pc);
-  MOZ_TRY(jsop_newarray(templateObject, length));
-
-  // Improve resulting typeset.
-  ObjectGroup* templateGroup = inspector->getTemplateObjectGroup(pc);
-  if (templateGroup) {
-    TemporaryTypeSet* types =
-        MakeSingletonTypeSet(alloc(), constraints(), templateGroup);
-    current->peek(-1)->setResultTypeSet(types);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_newarray(JSObject* templateObject,
-                                            uint32_t length) {
-  bool emitted = false;
-
-  MOZ_TRY(newArrayTryTemplateObject(&emitted, templateObject, length));
-  if (emitted) {
-    return Ok();
-  }
-
-  MOZ_TRY(newArrayTryVM(&emitted, templateObject, length));
-  if (emitted) {
-    return Ok();
-  }
-
-  MOZ_CRASH("newarray should have been emited");
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_newarray_copyonwrite() {
-  ArrayObject* templateObject = ObjectGroup::getCopyOnWriteObject(script(), pc);
-
-  // The baseline compiler should have ensured the template object has a type
-  // with the copy on write flag set already. During the arguments usage
-  // analysis the baseline compiler hasn't run yet, however, though in this
-  // case the template object's type doesn't matter.
-  ObjectGroup* group = templateObject->group();
-  MOZ_ASSERT_IF(
-      info().analysisMode() != Analysis_ArgumentsUsage,
-      group->hasAllFlagsDontCheckGeneration(OBJECT_FLAG_COPY_ON_WRITE));
-
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  current->add(templateConst);
-
-  MNewArrayCopyOnWrite* ins = MNewArrayCopyOnWrite::New(
-      alloc(), constraints(), templateConst, group->initialHeap(constraints()));
-
-  current->add(ins);
-  current->push(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::newObjectTryTemplateObject(
-    bool* emitted, JSObject* templateObject) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!templateObject) {
-    return Ok();
-  }
-
-  // Emit fastpath.
-
-  MNewObject::Mode mode;
-  if (JSOp(*pc) == JSOp::NewObject || JSOp(*pc) == JSOp::NewObjectWithGroup ||
-      JSOp(*pc) == JSOp::NewInit) {
-    mode = MNewObject::ObjectLiteral;
-  } else {
-    mode = MNewObject::ObjectCreate;
-  }
-
-  gc::InitialHeap heap = templateObject->group()->initialHeap(constraints());
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  current->add(templateConst);
-
-  MNewObject* ins =
-      MNewObject::New(alloc(), constraints(), templateConst, heap, mode);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::newObjectTryVM(bool* emitted,
-                                             JSObject* templateObject) {
-  // Emit a VM call.
-  MOZ_ASSERT(JSOp(*pc) == JSOp::NewObject ||
-             JSOp(*pc) == JSOp::NewObjectWithGroup ||
-             JSOp(*pc) == JSOp::NewInit);
-
-  gc::InitialHeap heap = gc::DefaultHeap;
-  MConstant* templateConst = MConstant::New(alloc(), NullValue());
-
-  if (templateObject) {
-    heap = templateObject->group()->initialHeap(constraints());
-    templateConst = MConstant::NewConstraintlessObject(alloc(), templateObject);
-  }
-
-  current->add(templateConst);
-
-  MNewObject* ins = MNewObject::NewVM(alloc(), constraints(), templateConst,
-                                      heap, MNewObject::ObjectLiteral);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_newobject() {
-  bool emitted = false;
-
-  JSObject* templateObject = inspector->getTemplateObject(pc);
-
-  MOZ_TRY(newObjectTryTemplateObject(&emitted, templateObject));
-  if (emitted) {
-    return Ok();
-  }
-
-  MOZ_TRY(newObjectTryVM(&emitted, templateObject));
-  if (emitted) {
-    return Ok();
-  }
-
-  MOZ_CRASH("newobject should have been emited");
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initelem() {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::InitElem || JSOp(*pc) == JSOp::InitHiddenElem ||
-             JSOp(*pc) == JSOp::InitLockedElem);
-
-  MDefinition* value = current->pop();
-  MDefinition* id = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  bool emitted = false;
-
-  if (!forceInlineCaches() && JSOp(*pc) == JSOp::InitElem) {
-    MOZ_TRY(initOrSetElemTryDense(&emitted, obj, id, value,
-                                  /* writeHole = */ true));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  MOZ_TRY(initOrSetElemTryCache(&emitted, obj, id, value));
-  if (emitted) {
-    return Ok();
-  }
-
-  MInitElem* initElem = MInitElem::New(alloc(), obj, id, value);
-  current->add(initElem);
-
-  return resumeAfter(initElem);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initelem_inc() {
-  MDefinition* value = current->pop();
-  MDefinition* id = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  MAdd* nextId = MAdd::New(alloc(), id, constantInt(1), MDefinition::Truncate);
-  current->add(nextId);
-  current->push(nextId);
-
-  return initArrayElement(obj, id, value);
-}
-
-AbortReasonOr<Ok> IonBuilder::initArrayElement(MDefinition* obj,
-                                               MDefinition* id,
-                                               MDefinition* value) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::InitElemArray ||
-             JSOp(*pc) == JSOp::InitElemInc);
-
-  bool emitted = false;
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(initArrayElemTryFastPath(&emitted, obj, id, value));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(initOrSetElemTryDense(&emitted, obj, id, value,
-                                  /* writeHole = */ true));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  MOZ_TRY(initOrSetElemTryCache(&emitted, obj, id, value));
-  if (emitted) {
-    return Ok();
-  }
-
-  MCallInitElementArray* initElem =
-      MCallInitElementArray::New(alloc(), obj, id, value);
-  current->add(initElem);
-
-  return resumeAfter(initElem);
-}
-
-AbortReasonOr<Ok> IonBuilder::initArrayElemTryFastPath(bool* emitted,
-                                                       MDefinition* obj,
-                                                       MDefinition* id,
-                                                       MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-  MOZ_ASSERT(JSOp(*pc) == JSOp::InitElemArray ||
-             JSOp(*pc) == JSOp::InitElemInc);
-
-  // Make sure that arrays have the type being written to them by the
-  // intializer, and that arrays are marked as non-packed when writing holes
-  // to them during initialization.
-
-  if (!obj->isNewArray()) {
-    return Ok();
-  }
-
-  if (shouldAbortOnPreliminaryGroups(obj)) {
-    return Ok();
-  }
-
-  if (!obj->resultTypeSet() || obj->resultTypeSet()->unknownObject() ||
-      obj->resultTypeSet()->getObjectCount() != 1) {
-    return Ok();
-  }
-
-  TypeSet::ObjectKey* initializer = obj->resultTypeSet()->getObject(0);
-  if (value->type() == MIRType::MagicHole) {
-    if (!initializer->hasFlags(constraints(), OBJECT_FLAG_NON_PACKED)) {
-      return Ok();
-    }
-  } else if (!initializer->unknownProperties()) {
-    HeapTypeSetKey elemTypes = initializer->property(JSID_VOID);
-    if (!TypeSetIncludes(elemTypes.maybeTypes(), value->type(),
-                         value->resultTypeSet())) {
-      elemTypes.freeze(constraints());
-      return Ok();
-    }
-  }
-
-  MOZ_TRY(initArrayElementFastPath(obj->toNewArray(), id, value,
-                                   /* addResumePoint = */ true));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initelem_array() {
-  MDefinition* value = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  uint32_t index = GET_UINT32(pc);
-  MOZ_ASSERT(index <= INT32_MAX,
-             "the bytecode emitter must fail to compile code that would "
-             "produce JSOp::InitElemArray with an index exceeding "
-             "int32_t range");
-
-  MConstant* id = MConstant::New(alloc(), Int32Value(index));
-  current->add(id);
-
-  return initArrayElement(obj, id, value);
-}
-
-AbortReasonOr<Ok> IonBuilder::initArrayElementFastPath(
-    MNewArray* obj, MDefinition* id, MDefinition* value,
-    bool addResumePointAndIncrementInitializedLength) {
-  // Get the elements vector.
-  MElements* elements = MElements::New(alloc(), obj);
-  current->add(elements);
-
-  if (needsPostBarrier(value)) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, value));
-  }
-
-  if (obj->convertDoubleElements()) {
-    MInstruction* valueDouble = MToDouble::New(alloc(), value);
-    current->add(valueDouble);
-    value = valueDouble;
-  }
-
-  // Store the value.
-  if (value->type() == MIRType::MagicHole) {
-    value->setImplicitlyUsedUnchecked();
-    auto* store = MStoreHoleValueElement::New(alloc(), elements, id);
-    current->add(store);
-  } else {
-    auto* store = MStoreElement::New(alloc(), elements, id, value,
-                                     /* needsHoleCheck = */ false);
-    current->add(store);
-  }
-
-  if (addResumePointAndIncrementInitializedLength) {
-    // Update the initialized length. (The template object for this
-    // array has the array's ultimate length, so the length field is
-    // already correct: no updating needed.)
-    MSetInitializedLength* initLength =
-        MSetInitializedLength::New(alloc(), elements, id);
-    current->add(initLength);
-
-    MOZ_TRY(resumeAfter(initLength));
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_mutateproto() {
-  MDefinition* value = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  MMutateProto* mutate = MMutateProto::New(alloc(), obj, value);
-  current->add(mutate);
-  return resumeAfter(mutate);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initprop(PropertyName* name) {
-  bool useFastPath = false;
-
-  MDefinition* obj = current->peek(-2);
-  if (obj->isNewObject()) {
-    if (JSObject* templateObject = obj->toNewObject()->templateObject()) {
-      if (templateObject->is<PlainObject>()) {
-        if (templateObject->as<PlainObject>().containsPure(name)) {
-          useFastPath = true;
-        }
-      }
-    }
-  }
-  MInstructionReverseIterator last = current->rbegin();
-
-  if (useFastPath && !forceInlineCaches()) {
-    // This is definitely initializing an 'own' property of the object, treat
-    // it as an assignment.
-    MOZ_TRY(jsop_setprop(name));
-  } else {
-    MDefinition* value = current->pop();
-    MDefinition* obj = current->pop();
-
-    bool barrier = PropertyWriteNeedsTypeBarrier(alloc(), constraints(),
-                                                 current, &obj, name, &value,
-                                                 /* canModify = */ true);
-
-    bool emitted = false;
-    MOZ_TRY(setPropTryCache(&emitted, obj, name, value, barrier));
-    MOZ_ASSERT(emitted == true);
-  }
-
-  // SetProp pushed the value, instead of the object. Fix this on the stack,
-  // and check the most recent resume point to see if it needs updating too.
-  current->pop();
-  current->push(obj);
-  for (MInstructionReverseIterator riter = current->rbegin(); riter != last;
-       riter++) {
-    if (MResumePoint* resumePoint = riter->resumePoint()) {
-      MOZ_ASSERT(resumePoint->pc() == pc);
-      if (resumePoint->mode() == MResumePoint::ResumeAfter) {
-        size_t index = resumePoint->numOperands() - 1;
-        resumePoint->replaceOperand(index, obj);
-      }
-      break;
-    }
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initprop_getter_setter(PropertyName* name) {
-  MDefinition* value = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  MInitPropGetterSetter* init =
-      MInitPropGetterSetter::New(alloc(), obj, name, value);
-  current->add(init);
-  return resumeAfter(init);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_initelem_getter_setter() {
-  MDefinition* value = current->pop();
-  MDefinition* id = current->pop();
-  MDefinition* obj = current->peek(-1);
-
-  MInitElemGetterSetter* init =
-      MInitElemGetterSetter::New(alloc(), obj, id, value);
-  current->add(init);
-  return resumeAfter(init);
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newBlock(
-    size_t stackDepth, jsbytecode* pc, MBasicBlock* maybePredecessor) {
-  MOZ_ASSERT_IF(maybePredecessor, maybePredecessor->stackDepth() == stackDepth);
-
-  MBasicBlock* block =
-      MBasicBlock::New(graph(), stackDepth, info(), maybePredecessor,
-                       bytecodeSite(pc), MBasicBlock::NORMAL);
-  if (!block) {
-    return abort(AbortReason::Alloc);
-  }
-
-  block->setLoopDepth(loopDepth_);
-  return block;
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newBlock(
-    MBasicBlock* predecessor, jsbytecode* pc, MResumePoint* priorResumePoint) {
-  MBasicBlock* block = MBasicBlock::NewWithResumePoint(
-      graph(), info(), predecessor, bytecodeSite(pc), priorResumePoint);
-  if (!block) {
-    return abort(AbortReason::Alloc);
-  }
-
-  block->setLoopDepth(loopDepth_);
-  return block;
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newBlockPopN(MBasicBlock* predecessor,
-                                                     jsbytecode* pc,
-                                                     uint32_t popped) {
-  MBasicBlock* block =
-      MBasicBlock::NewPopN(graph(), info(), predecessor, bytecodeSite(pc),
-                           MBasicBlock::NORMAL, popped);
-  if (!block) {
-    return abort(AbortReason::Alloc);
-  }
-
-  block->setLoopDepth(loopDepth_);
-  return block;
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newBlockAfter(
-    MBasicBlock* at, size_t stackDepth, jsbytecode* pc,
-    MBasicBlock* maybePredecessor) {
-  MOZ_ASSERT_IF(maybePredecessor, maybePredecessor->stackDepth() == stackDepth);
-
-  MBasicBlock* block =
-      MBasicBlock::New(graph(), stackDepth, info(), maybePredecessor,
-                       bytecodeSite(pc), MBasicBlock::NORMAL);
-  if (!block) {
-    return abort(AbortReason::Alloc);
-  }
-
-  block->setLoopDepth(loopDepth_);
-  block->setHitCount(0);  // osr block
-  graph().insertBlockAfter(at, block);
-  return block;
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newOsrPreheader(
-    MBasicBlock* predecessor, jsbytecode* loopHead) {
-  MOZ_ASSERT(JSOp(*loopHead) == JSOp::LoopHead);
-  MOZ_ASSERT(loopHead == info().osrPc());
-
-  // Create two blocks: one for the OSR entry with no predecessors, one for
-  // the preheader, which has the OSR entry block as a predecessor. The
-  // OSR block is always the second block (with id 1).
-  MBasicBlock* osrBlock;
-  MOZ_TRY_VAR(osrBlock, newBlockAfter(*graph().begin(),
-                                      predecessor->stackDepth(), loopHead));
-  MBasicBlock* preheader;
-  MOZ_TRY_VAR(preheader, newBlock(predecessor, loopHead));
-
-  graph().addBlock(preheader);
-
-  // Give the pre-header the same hit count as the code before the loop.
-  if (predecessor->getHitState() == MBasicBlock::HitState::Count) {
-    preheader->setHitCount(predecessor->getHitCount());
-  }
-
-  MOsrEntry* entry = MOsrEntry::New(alloc());
-  osrBlock->add(entry);
-
-  // Initialize |envChain|.
-  {
-    uint32_t slot = info().environmentChainSlot();
-
-    MInstruction* envv;
-    if (usesEnvironmentChain()) {
-      envv = MOsrEnvironmentChain::New(alloc(), entry);
-    } else {
-      // Use an undefined value if the script does not need its env
-      // chain, to match the type that is already being tracked for the
-      // slot.
-      envv = MConstant::New(alloc(), UndefinedValue());
-    }
-
-    osrBlock->add(envv);
-    osrBlock->initSlot(slot, envv);
-  }
-  // Initialize |return value|
-  {
-    MInstruction* returnValue;
-    if (!script()->noScriptRval()) {
-      returnValue = MOsrReturnValue::New(alloc(), entry);
-    } else {
-      returnValue = MConstant::New(alloc(), UndefinedValue());
-    }
-    osrBlock->add(returnValue);
-    osrBlock->initSlot(info().returnValueSlot(), returnValue);
-  }
-
-  // Initialize arguments object.
-  bool needsArgsObj = info().needsArgsObj();
-  MInstruction* argsObj = nullptr;
-  if (info().hasArguments()) {
-    if (needsArgsObj) {
-      argsObj = MOsrArgumentsObject::New(alloc(), entry);
-    } else {
-      argsObj = MConstant::New(alloc(), UndefinedValue());
-    }
-    osrBlock->add(argsObj);
-    osrBlock->initSlot(info().argsObjSlot(), argsObj);
-  }
-
-  if (info().funMaybeLazy()) {
-    // Initialize |this| parameter.
-    MParameter* thisv =
-        MParameter::New(alloc(), MParameter::THIS_SLOT, nullptr);
-    osrBlock->add(thisv);
-    osrBlock->initSlot(info().thisSlot(), thisv);
-
-    // Initialize arguments.
-    for (uint32_t i = 0; i < info().nargs(); i++) {
-      uint32_t slot =
-          needsArgsObj ? info().argSlotUnchecked(i) : info().argSlot(i);
-
-      // Only grab arguments from the arguments object if the arguments object
-      // aliases formals.  If the argsobj does not alias formals, then the
-      // formals may have been assigned to during interpretation, and that
-      // change will not be reflected in the argsobj.
-      if (needsArgsObj && info().argsObjAliasesFormals()) {
-        MOZ_ASSERT(argsObj && argsObj->isOsrArgumentsObject());
-        // If this is an aliased formal, then the arguments object
-        // contains a hole at this index.  Any references to this
-        // variable in the jitcode will come from JSOp::*AliasedVar
-        // opcodes, so the slot itself can be set to undefined.  If
-        // it's not aliased, it must be retrieved from the arguments
-        // object.
-        MInstruction* osrv;
-        if (script()->formalIsAliased(i)) {
-          osrv = MConstant::New(alloc(), UndefinedValue());
-        } else {
-          osrv = MGetArgumentsObjectArg::New(alloc(), argsObj, i);
-        }
-
-        osrBlock->add(osrv);
-        osrBlock->initSlot(slot, osrv);
-      } else {
-        MParameter* arg = MParameter::New(alloc(), i, nullptr);
-        osrBlock->add(arg);
-        osrBlock->initSlot(slot, arg);
-      }
-    }
-  }
-
-  // Initialize locals.
-  for (uint32_t i = 0; i < info().nlocals(); i++) {
-    uint32_t slot = info().localSlot(i);
-    ptrdiff_t offset = BaselineFrame::reverseOffsetOfLocal(i);
-
-    MOsrValue* osrv = MOsrValue::New(alloc().fallible(), entry, offset);
-    if (!osrv) {
-      return abort(AbortReason::Alloc);
-    }
-    osrBlock->add(osrv);
-    osrBlock->initSlot(slot, osrv);
-  }
-
-  // Initialize stack.
-  uint32_t numStackSlots = preheader->stackDepth() - info().firstStackSlot();
-  for (uint32_t i = 0; i < numStackSlots; i++) {
-    uint32_t slot = info().stackSlot(i);
-    ptrdiff_t offset =
-        BaselineFrame::reverseOffsetOfLocal(info().nlocals() + i);
-
-    MOsrValue* osrv = MOsrValue::New(alloc().fallible(), entry, offset);
-    if (!osrv) {
-      return abort(AbortReason::Alloc);
-    }
-    osrBlock->add(osrv);
-    osrBlock->initSlot(slot, osrv);
-  }
-
-  // Create an MStart to hold the first valid MResumePoint.
-  MStart* start = MStart::New(alloc());
-  osrBlock->add(start);
-
-  // MOsrValue instructions are infallible, so the first MResumePoint must
-  // occur after they execute, at the point of the MStart.
-  MOZ_TRY(resumeAt(start, loopHead));
-
-  // Link the same MResumePoint from the MStart to each MOsrValue.
-  // This causes logic in ShouldSpecializeInput() to not replace Uses with
-  // Unboxes in the MResumePiont, so that the MStart always sees Values.
-  if (!osrBlock->linkOsrValues(start)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Clone types of the other predecessor of the pre-header to the osr block,
-  // such as pre-header phi's won't discard specialized type of the
-  // predecessor.
-  MOZ_ASSERT(predecessor->stackDepth() == osrBlock->stackDepth());
-  MOZ_ASSERT(info().environmentChainSlot() == 0);
-
-  // Treat the OSR values as having the same type as the existing values
-  // coming in to the loop. These will be fixed up with appropriate
-  // unboxing and type barriers in finishLoop, once the possible types
-  // at the loop header are known.
-  for (uint32_t i = info().startArgSlot(); i < osrBlock->stackDepth(); i++) {
-    MDefinition* existing = current->getSlot(i);
-    MDefinition* def = osrBlock->getSlot(i);
-    MOZ_ASSERT_IF(!needsArgsObj || !info().isSlotAliased(i),
-                  def->type() == MIRType::Value);
-
-    // Aliased slots are never accessed, since they need to go through
-    // the callobject. No need to type them here.
-    if (info().isSlotAliased(i)) {
-      continue;
-    }
-
-    def->setResultType(existing->type());
-    def->setResultTypeSet(existing->resultTypeSet());
-  }
-
-  // Finish the osrBlock.
-  osrBlock->end(MGoto::New(alloc(), preheader));
-  if (!preheader->addPredecessor(alloc(), osrBlock)) {
-    return abort(AbortReason::Alloc);
-  }
-  graph().setOsrBlock(osrBlock);
-
-  return preheader;
-}
-
-AbortReasonOr<MBasicBlock*> IonBuilder::newPendingLoopHeader(
-    MBasicBlock* predecessor, jsbytecode* pc, bool osr) {
-  MBasicBlock* block = MBasicBlock::NewPendingLoopHeader(
-      graph(), info(), predecessor, bytecodeSite(pc));
-  if (!block) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (osr) {
-    // Incorporate type information from the OSR frame into the loop
-    // header. The OSR frame may have unexpected types due to type changes
-    // within the loop body or due to incomplete profiling information,
-    // in which case this may avoid restarts of loop analysis or bailouts
-    // during the OSR itself.
-
-    MOZ_ASSERT(info().firstLocalSlot() - info().firstArgSlot() ==
-               baselineFrame_->argTypes.length());
-    MOZ_ASSERT(block->stackDepth() - info().firstLocalSlot() ==
-               baselineFrame_->varTypes.length());
-
-    // Unbox the MOsrValue if it is known to be unboxable.
-    for (uint32_t i = info().startArgSlot(); i < block->stackDepth(); i++) {
-      // The value of aliased args and slots are in the callobject. So we can't
-      // the value from the baseline frame.
-      if (info().isSlotAliased(i)) {
-        continue;
-      }
-
-      MPhi* phi = block->getSlot(i)->toPhi();
-
-      // Get the type from the baseline frame.
-      TypeSet::Type existingType = TypeSet::UndefinedType();
-      uint32_t arg = i - info().firstArgSlot();
-      uint32_t var = i - info().firstLocalSlot();
-      if (info().funMaybeLazy() && i == info().thisSlot()) {
-        existingType = baselineFrame_->thisType;
-      } else if (arg < info().nargs()) {
-        existingType = baselineFrame_->argTypes[arg];
-      } else {
-        existingType = baselineFrame_->varTypes[var];
-      }
-
-      if (existingType.isSingletonUnchecked()) {
-        checkNurseryObject(existingType.singleton());
-      }
-
-      // Extract typeset from value.
-      LifoAlloc* lifoAlloc = alloc().lifoAlloc();
-      LifoAlloc::AutoFallibleScope fallibleAllocator(lifoAlloc);
-      TemporaryTypeSet* typeSet =
-          lifoAlloc->new_<TemporaryTypeSet>(lifoAlloc, existingType);
-      if (!typeSet) {
-        return abort(AbortReason::Alloc);
-      }
-      MIRType type = typeSet->getKnownMIRType();
-      if (!phi->addBackedgeType(alloc(), type, typeSet)) {
-        return abort(AbortReason::Alloc);
-      }
-    }
-  }
-
-  // The exception handler has code to close iterators for certain loops. We
-  // need to mark the phis (and phis these iterators flow into) as having
-  // implicit uses so that Ion does not optimize them away (replace with the
-  // JS_OPTIMIZED_OUT MagicValue).
-  // See ProcessTryNotes in vm/Interpreter.cpp.
-  MOZ_ASSERT(block->stackDepth() >= info().firstStackSlot());
-  bool emptyStack = block->stackDepth() == info().firstStackSlot();
-  if (!emptyStack) {
-    for (TryNoteIterAllNoGC tni(script(), pc); !tni.done(); ++tni) {
-      const TryNote& tn = **tni;
-
-      // Stop if we reach an outer loop because outer loops were already
-      // processed when we visited their loop headers.
-      if (tn.isLoop()) {
-        BytecodeLocation tnStart = script()->offsetToLocation(tn.start);
-        if (tnStart.toRawBytecode() != pc) {
-          MOZ_ASSERT(tnStart.is(JSOp::LoopHead));
-          MOZ_ASSERT(tnStart.toRawBytecode() < pc);
-          break;
-        }
-      }
-
-      switch (tn.kind()) {
-        case TryNoteKind::Destructuring:
-        case TryNoteKind::ForIn: {
-          // For for-in loops we add the iterator object to iterators_. For
-          // destructuring loops we add the "done" value that's on top of the
-          // stack and used in the exception handler.
-          MOZ_ASSERT(tn.stackDepth >= 1);
-          uint32_t slot = info().stackSlot(tn.stackDepth - 1);
-          MPhi* phi = block->getSlot(slot)->toPhi();
-          if (!outermostBuilder()->iterators_.append(phi)) {
-            return abort(AbortReason::Alloc);
-          }
-          break;
-        }
-        default:
-          break;
-      }
-    }
-  }
-
-  return block;
-}
-
-MTest* IonBuilder::newTest(MDefinition* ins, MBasicBlock* ifTrue,
-                           MBasicBlock* ifFalse) {
-  MTest* test = MTest::New(alloc(), ins, ifTrue, ifFalse);
-  test->cacheOperandMightEmulateUndefined(constraints());
-  return test;
-}
-
-// A resume point is a mapping of stack slots to MDefinitions. It is used to
-// capture the environment such that if a guard fails, and IonMonkey needs
-// to exit back to the interpreter, the interpreter state can be
-// reconstructed.
-//
-// We capture stack state at critical points:
-//   * (1) At the beginning of every basic block.
-//   * (2) After every effectful operation.
-//
-// As long as these two properties are maintained, instructions can
-// be moved, hoisted, or, eliminated without problems, and ops without side
-// effects do not need to worry about capturing state at precisely the
-// right point in time.
-//
-// Effectful instructions, of course, need to capture state after completion,
-// where the interpreter will not attempt to repeat the operation. For this,
-// ResumeAfter must be used. The state is attached directly to the effectful
-// instruction to ensure that no intermediate instructions could be injected
-// in between by a future analysis pass.
-//
-// During LIR construction, if an instruction can bail back to the interpreter,
-// we create an LSnapshot, which uses the last known resume point to request
-// register/stack assignments for every live value.
-AbortReasonOr<Ok> IonBuilder::resume(MInstruction* ins, jsbytecode* pc,
-                                     MResumePoint::Mode mode) {
-  MOZ_ASSERT(ins->isEffectful() || !ins->isMovable());
-
-  MResumePoint* resumePoint =
-      MResumePoint::New(alloc(), ins->block(), pc, mode);
-  if (!resumePoint) {
-    return abort(AbortReason::Alloc);
-  }
-  ins->setResumePoint(resumePoint);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::resumeAt(MInstruction* ins, jsbytecode* pc) {
-  return resume(ins, pc, MResumePoint::ResumeAt);
-}
-
-AbortReasonOr<Ok> IonBuilder::resumeAfter(MInstruction* ins) {
-  return resume(ins, pc, MResumePoint::ResumeAfter);
-}
-
-AbortReasonOr<Ok> IonBuilder::maybeInsertResume() {
-  // Create a resume point at the current position, without an existing
-  // effectful instruction. This resume point is not necessary for correct
-  // behavior (see above), but is added to avoid holding any values from the
-  // previous resume point which are now dead. This shortens the live ranges
-  // of such values and improves register allocation.
-  //
-  // This optimization is not performed outside of loop bodies, where good
-  // register allocation is not as critical, in order to avoid creating
-  // excessive resume points.
-
-  if (loopDepth_ == 0) {
-    return Ok();
-  }
-
-  MNop* ins = MNop::New(alloc());
-  current->add(ins);
-
-  return resumeAfter(ins);
-}
-
-void IonBuilder::maybeMarkEmpty(MDefinition* ins) {
-  MOZ_ASSERT(ins->type() == MIRType::Value);
-
-  // When one of the operands has no type information, mark the output
-  // as having no possible types too. This is to avoid degrading
-  // subsequent analysis.
-  for (size_t i = 0; i < ins->numOperands(); i++) {
-    if (!ins->getOperand(i)->emptyResultTypeSet()) {
-      continue;
-    }
-
-    TemporaryTypeSet* types = alloc().lifoAlloc()->new_<TemporaryTypeSet>();
-    if (types) {
-      ins->setResultTypeSet(types);
-      return;
-    }
-  }
-}
-
-// Return whether property lookups can be performed effectlessly on clasp.
-static bool ClassHasEffectlessLookup(const JSClass* clasp) {
-  return IsTypedObjectClass(clasp) ||
-         (clasp->isNative() && !clasp->getOpsLookupProperty());
-}
-
-// Return whether an object might have a property for name which is not
-// accounted for by type information.
-static bool ObjectHasExtraOwnProperty(CompileRealm* realm,
-                                      TypeSet::ObjectKey* object, jsid id) {
-  // Some typed object properties are not reflected in type information.
-  if (object->isGroup() && object->group()->maybeTypeDescr()) {
-    return object->group()->typeDescr().hasProperty(realm->runtime()->names(),
-                                                    id);
-  }
-
-  const JSClass* clasp = object->clasp();
-
-  // Array |length| properties are not reflected in type information.
-  if (clasp == &ArrayObject::class_) {
-    return JSID_IS_ATOM(id, realm->runtime()->names().length);
-  }
-
-  // Resolve hooks can install new properties on objects on demand.
-  JSObject* singleton = object->isSingleton() ? object->singleton() : nullptr;
-  return ClassMayResolveId(realm->runtime()->names(), clasp, id, singleton);
-}
-
-void IonBuilder::insertRecompileCheck(jsbytecode* pc) {
-  MOZ_ASSERT(pc == script()->code() || JSOp(*pc) == JSOp::LoopHead);
-
-  // No need for recompile checks if this is the highest optimization level or
-  // if we're performing an analysis instead of compilation.
-  OptimizationLevel curLevel = optimizationLevel();
-  if (IonOptimizations.isLastLevel(curLevel) || info().isAnalysis()) {
-    return;
-  }
-
-  MOZ_ASSERT(!JitOptions.disableOptimizationLevels);
-
-  // Add recompile check. See MRecompileCheck::RecompileCheckType for how this
-  // works.
-
-  MRecompileCheck::RecompileCheckType type;
-  if (JSOp(*pc) == JSOp::LoopHead) {
-    type = MRecompileCheck::RecompileCheckType::OptimizationLevelOSR;
-  } else if (this != outermostBuilder()) {
-    type = MRecompileCheck::RecompileCheckType::OptimizationLevelInlined;
-  } else {
-    type = MRecompileCheck::RecompileCheckType::OptimizationLevel;
-  }
-
-  // Add recompile check to recompile when the warm-up count reaches the
-  // threshold of the next optimization level.
-  OptimizationLevel nextLevel = IonOptimizations.nextLevel(curLevel);
-  const OptimizationInfo* info = IonOptimizations.get(nextLevel);
-  uint32_t warmUpThreshold = info->recompileWarmUpThreshold(script(), pc);
-  MRecompileCheck* check =
-      MRecompileCheck::New(alloc(), script(), warmUpThreshold, type);
-  current->add(check);
-}
-
-JSObject* IonBuilder::testSingletonProperty(JSObject* obj, jsid id) {
-  // We would like to completely no-op property/global accesses which can
-  // produce only a particular JSObject. When indicating the access result is
-  // definitely an object, type inference does not account for the
-  // possibility that the property is entirely missing from the input object
-  // and its prototypes (if this happens, a semantic trigger would be hit and
-  // the pushed types updated, even if there is no type barrier).
-  //
-  // If the access definitely goes through obj, either directly or on the
-  // prototype chain, and the object has singleton type, then the type
-  // information for that property reflects the value that will definitely be
-  // read on accesses to the object. If the property is later deleted or
-  // reconfigured as a getter/setter then the type information for the
-  // property will change and trigger invalidation.
-
-  while (obj) {
-    if (!alloc().ensureBallast()) {
-      return nullptr;
-    }
-
-    if (!ClassHasEffectlessLookup(obj->getClass())) {
-      return nullptr;
-    }
-
-    TypeSet::ObjectKey* objKey = TypeSet::ObjectKey::get(obj);
-    if (analysisContext) {
-      objKey->ensureTrackedProperty(analysisContext, id);
-    }
-
-    if (objKey->unknownProperties()) {
-      return nullptr;
-    }
-
-    HeapTypeSetKey property = objKey->property(id);
-    if (property.isOwnProperty(constraints())) {
-      if (obj->isSingleton()) {
-        return property.singleton(constraints());
-      }
-      return nullptr;
-    }
-
-    if (ObjectHasExtraOwnProperty(realm, objKey, id)) {
-      return nullptr;
-    }
-
-    obj = checkNurseryObject(obj->staticPrototype());
-  }
-
-  return nullptr;
-}
-
-JSObject* IonBuilder::testSingletonPropertyTypes(MDefinition* obj, jsid id) {
-  // As for TestSingletonProperty, but the input is any value in a type set
-  // rather than a specific object.
-
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (types && types->unknownObject()) {
-    return nullptr;
-  }
-
-  JSObject* objectSingleton = types ? types->maybeSingleton() : nullptr;
-  if (objectSingleton) {
-    return testSingletonProperty(objectSingleton, id);
-  }
-
-  MIRType objType = obj->type();
-  if (objType == MIRType::Value && types) {
-    objType = types->getKnownMIRType();
-  }
-
-  JSProtoKey key;
-  switch (objType) {
-    case MIRType::String:
-      key = JSProto_String;
-      break;
-
-    case MIRType::Symbol:
-      key = JSProto_Symbol;
-      break;
-
-    case MIRType::BigInt:
-      key = JSProto_BigInt;
-      break;
-
-    case MIRType::Int32:
-    case MIRType::Double:
-      key = JSProto_Number;
-      break;
-
-    case MIRType::Boolean:
-      key = JSProto_Boolean;
-      break;
-
-    case MIRType::Object: {
-      if (!types) {
-        return nullptr;
-      }
-
-      // For property accesses which may be on many objects, we just need to
-      // find a prototype common to all the objects; if that prototype
-      // has the singleton property, the access will not be on a missing
-      // property.
-      JSObject* singleton = nullptr;
-      for (unsigned i = 0; i < types->getObjectCount(); i++) {
-        TypeSet::ObjectKey* key = types->getObject(i);
-        if (!key) {
-          continue;
-        }
-
-        if (!alloc().ensureBallast()) {
-          return nullptr;
-        }
-
-        if (analysisContext) {
-          key->ensureTrackedProperty(analysisContext, id);
-        }
-
-        const JSClass* clasp = key->clasp();
-        if (!ClassHasEffectlessLookup(clasp) ||
-            ObjectHasExtraOwnProperty(realm, key, id)) {
-          return nullptr;
-        }
-        if (key->unknownProperties()) {
-          return nullptr;
-        }
-        HeapTypeSetKey property = key->property(id);
-        if (property.isOwnProperty(constraints())) {
-          return nullptr;
-        }
-
-        if (JSObject* proto =
-                checkNurseryObject(key->proto().toObjectOrNull())) {
-          // Test this type.
-          JSObject* thisSingleton = testSingletonProperty(proto, id);
-          if (!thisSingleton) {
-            return nullptr;
-          }
-          if (singleton) {
-            if (thisSingleton != singleton) {
-              return nullptr;
-            }
-          } else {
-            singleton = thisSingleton;
-          }
-        } else {
-          // Can't be on the prototype chain with no prototypes...
-          return nullptr;
-        }
-      }
-      return singleton;
-    }
-    default:
-      return nullptr;
-  }
-
-  if (JSObject* proto = script()->global().maybeGetPrototype(key)) {
-    return testSingletonProperty(proto, id);
-  }
-
-  return nullptr;
-}
-
-AbortReasonOr<bool> IonBuilder::testNotDefinedProperty(
-    MDefinition* obj, jsid id, bool ownProperty /* = false */) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (!types || types->unknownObject() ||
-      types->getKnownMIRType() != MIRType::Object) {
-    return false;
-  }
-
-  for (unsigned i = 0, count = types->getObjectCount(); i < count; i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    while (true) {
-      if (!alloc().ensureBallast()) {
-        return abort(AbortReason::Alloc);
-      }
-
-      if (!key->hasStableClassAndProto(constraints()) ||
-          key->unknownProperties()) {
-        return false;
-      }
-
-      const JSClass* clasp = key->clasp();
-      if (!ClassHasEffectlessLookup(clasp) ||
-          ObjectHasExtraOwnProperty(realm, key, id)) {
-        return false;
-      }
-
-      // If the object is a singleton, we can do a lookup now to avoid
-      // unnecessary invalidations later on, in case the property types
-      // have not yet been instantiated.
-      if (key->isSingleton() && key->singleton()->is<NativeObject>() &&
-          key->singleton()->as<NativeObject>().lookupPure(id)) {
-        return false;
-      }
-
-      HeapTypeSetKey property = key->property(id);
-      if (property.isOwnProperty(constraints())) {
-        return false;
-      }
-
-      // If we only care about own properties don't check the proto.
-      if (ownProperty) {
-        break;
-      }
-
-      JSObject* proto = checkNurseryObject(key->proto().toObjectOrNull());
-      if (!proto) {
-        break;
-      }
-      key = TypeSet::ObjectKey::get(proto);
-    }
-  }
-
-  return true;
-}
-
-AbortReasonOr<Ok> IonBuilder::pushTypeBarrier(MDefinition* def,
-                                              TemporaryTypeSet* observed,
-                                              BarrierKind kind) {
-  MOZ_ASSERT(def == current->peek(-1));
-
-  MDefinition* replace = addTypeBarrier(current->pop(), observed, kind);
-  if (!replace) {
-    return abort(AbortReason::Alloc);
-  }
-
-  current->push(replace);
-  return Ok();
-}
-
-// Given an observed type set, annotates the IR as much as possible:
-// (1) If no type information is provided, the given value is returned.
-// (2) If a single type definitely exists, and no type barrier is needed,
-//     then an infallible unbox instruction is returned.
-// (3) If a type barrier is needed, but has an unknown type set, the given
-//     value is returned.
-// (4) Lastly, a type barrier instruction is added and returned.
-MDefinition* IonBuilder::addTypeBarrier(MDefinition* def,
-                                        TemporaryTypeSet* observed,
-                                        BarrierKind kind,
-                                        MTypeBarrier** pbarrier) {
-  // Barriers are never needed for instructions whose result will not be used.
-  if (BytecodeIsPopped(pc)) {
-    return def;
-  }
-
-  // If the instruction has no side effects, we'll resume the entire operation.
-  // The actual type barrier will occur in the interpreter. If the
-  // instruction is effectful, even if it has a singleton type, there
-  // must be a resume point capturing the original def, and resuming
-  // to that point will explicitly monitor the new type.
-  if (kind == BarrierKind::NoBarrier) {
-    MDefinition* replace = ensureDefiniteType(def, observed->getKnownMIRType());
-    replace->setResultTypeSet(observed);
-    return replace;
-  }
-
-  if (observed->unknown()) {
-    return def;
-  }
-
-  MTypeBarrier* barrier = MTypeBarrier::New(alloc(), def, observed, kind);
-  current->add(barrier);
-
-  if (pbarrier) {
-    *pbarrier = barrier;
-  }
-
-  if (barrier->type() == MIRType::Undefined) {
-    return constant(UndefinedValue());
-  }
-  if (barrier->type() == MIRType::Null) {
-    return constant(NullValue());
-  }
-
-  return barrier;
-}
-
-AbortReasonOr<Ok> IonBuilder::pushDOMTypeBarrier(MInstruction* ins,
-                                                 TemporaryTypeSet* observed,
-                                                 JSFunction* func) {
-  MOZ_ASSERT(func && func->isNative() && func->hasJitInfo());
-
-  const JSJitInfo* jitinfo = func->jitInfo();
-  bool barrier = DOMCallNeedsBarrier(jitinfo, observed);
-  // Need to be a bit careful: if jitinfo->returnType is JSVAL_TYPE_DOUBLE but
-  // types->getKnownMIRType() is MIRType::Int32, then don't unconditionally
-  // unbox as a double.  Instead, go ahead and barrier on having an int type,
-  // since we know we need a barrier anyway due to the type mismatch.  This is
-  // the only situation in which TI actually has more information about the
-  // JSValueType than codegen can, short of jitinfo->returnType just being
-  // JSVAL_TYPE_UNKNOWN.
-  MDefinition* replace = ins;
-  if (jitinfo->returnType() != JSVAL_TYPE_DOUBLE ||
-      observed->getKnownMIRType() != MIRType::Int32) {
-    replace =
-        ensureDefiniteType(ins, MIRTypeFromValueType(jitinfo->returnType()));
-    if (replace != ins) {
-      current->pop();
-      current->push(replace);
-    }
-  } else {
-    MOZ_ASSERT(barrier);
-  }
-
-  return pushTypeBarrier(
-      replace, observed,
-      barrier ? BarrierKind::TypeSet : BarrierKind::NoBarrier);
-}
-
-MDefinition* IonBuilder::ensureDefiniteType(MDefinition* def,
-                                            MIRType definiteType) {
-  MInstruction* replace;
-  switch (definiteType) {
-    case MIRType::Undefined:
-      def->setImplicitlyUsedUnchecked();
-      replace = MConstant::New(alloc(), UndefinedValue());
-      break;
-
-    case MIRType::Null:
-      def->setImplicitlyUsedUnchecked();
-      replace = MConstant::New(alloc(), NullValue());
-      break;
-
-    case MIRType::Value:
-      return def;
-
-    default: {
-      if (def->type() != MIRType::Value) {
-        if (def->type() == MIRType::Int32 && definiteType == MIRType::Double) {
-          replace = MToDouble::New(alloc(), def);
-          break;
-        }
-        return def;
-      }
-      replace = MUnbox::New(alloc(), def, definiteType, MUnbox::Infallible);
-      break;
-    }
-  }
-
-  current->add(replace);
-  return replace;
-}
-
-static size_t NumFixedSlots(JSObject* object) {
-  // Note: we can't use object->numFixedSlots() here, as this will read the
-  // shape and can race with the main thread if we are building off thread.
-  // The allocation kind and object class (which goes through the type) can
-  // be read freely, however.
-  gc::AllocKind kind = object->asTenured().getAllocKind();
-  return gc::GetGCKindSlots(kind, object->getClass());
-}
-
-static bool IsUninitializedGlobalLexicalSlot(JSObject* obj,
-                                             PropertyName* name) {
-  LexicalEnvironmentObject& globalLexical = obj->as<LexicalEnvironmentObject>();
-  MOZ_ASSERT(globalLexical.isGlobal());
-  Shape* shape = globalLexical.lookupPure(name);
-  if (!shape) {
-    return false;
-  }
-  return globalLexical.getSlot(shape->slot()).isMagic(JS_UNINITIALIZED_LEXICAL);
-}
-
-AbortReasonOr<Ok> IonBuilder::getStaticName(bool* emitted,
-                                            JSObject* staticObject,
-                                            PropertyName* name,
-                                            MDefinition* lexicalCheck) {
-  MOZ_ASSERT(*emitted == false);
-
-  jsid id = NameToId(name);
-
-  bool isGlobalLexical =
-      staticObject->is<LexicalEnvironmentObject>() &&
-      staticObject->as<LexicalEnvironmentObject>().isGlobal();
-  MOZ_ASSERT(isGlobalLexical || staticObject->is<GlobalObject>());
-  MOZ_ASSERT(staticObject->isSingleton());
-
-  // Always emit the lexical check. This could be optimized, but is
-  // currently not for simplicity's sake.
-  if (lexicalCheck) {
-    return Ok();
-  }
-
-  TypeSet::ObjectKey* staticKey = TypeSet::ObjectKey::get(staticObject);
-  if (analysisContext) {
-    staticKey->ensureTrackedProperty(analysisContext, NameToId(name));
-  }
-
-  if (staticKey->unknownProperties()) {
-    return Ok();
-  }
-
-  HeapTypeSetKey property = staticKey->property(id);
-  if (!property.maybeTypes() || !property.maybeTypes()->definiteProperty() ||
-      property.nonData(constraints())) {
-    // The property has been reconfigured as non-configurable, non-enumerable
-    // or non-writable.
-    return Ok();
-  }
-
-  // Don't optimize global lexical bindings if they aren't initialized at
-  // compile time.
-  if (isGlobalLexical && IsUninitializedGlobalLexicalSlot(staticObject, name)) {
-    return Ok();
-  }
-
-  *emitted = true;
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  BarrierKind barrier = PropertyReadNeedsTypeBarrier(
-      analysisContext, alloc(), constraints(), staticKey, name, types,
-      /* updateObserved = */ true);
-
-  if (barrier == BarrierKind::NoBarrier) {
-    // Try to inline properties holding a known constant object.
-    JSObject* singleton = types->maybeSingleton();
-    if (singleton) {
-      if (testSingletonProperty(staticObject, id) == singleton) {
-        pushConstant(ObjectValue(*singleton));
-        return Ok();
-      }
-    }
-
-    // Try to inline properties that have never been overwritten.
-    Value constantValue;
-    if (property.constant(constraints(), &constantValue)) {
-      pushConstant(constantValue);
-      return Ok();
-    }
-  }
-
-  MOZ_TRY(loadStaticSlot(staticObject, barrier, types,
-                         property.maybeTypes()->definiteSlot()));
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::loadStaticSlot(JSObject* staticObject,
-                                             BarrierKind barrier,
-                                             TemporaryTypeSet* types,
-                                             uint32_t slot) {
-  if (barrier == BarrierKind::NoBarrier) {
-    // Try to inline properties that can only have one value.
-    MIRType knownType = types->getKnownMIRType();
-    if (knownType == MIRType::Undefined) {
-      pushConstant(UndefinedValue());
-      return Ok();
-    }
-    if (knownType == MIRType::Null) {
-      pushConstant(NullValue());
-      return Ok();
-    }
-  }
-
-  MInstruction* obj = constant(ObjectValue(*staticObject));
-
-  MIRType rvalType = types->getKnownMIRType();
-  if (barrier != BarrierKind::NoBarrier) {
-    rvalType = MIRType::Value;
-  }
-
-  return loadSlot(obj, slot, NumFixedSlots(staticObject), rvalType, barrier,
-                  types);
-}
-
-// Whether a write of the given value may need a post-write barrier for GC
-// purposes.
-bool IonBuilder::needsPostBarrier(MDefinition* value) {
-  CompileZone* zone = realm->zone();
-  if (value->mightBeType(MIRType::Object)) {
-    return true;
-  }
-  if (value->mightBeType(MIRType::String) &&
-      zone->canNurseryAllocateStrings()) {
-    return true;
-  }
-  if (value->mightBeType(MIRType::BigInt) &&
-      zone->canNurseryAllocateBigInts()) {
-    return true;
-  }
-  return false;
-}
-
-AbortReasonOr<Ok> IonBuilder::setStaticName(JSObject* staticObject,
-                                            PropertyName* name) {
-  jsid id = NameToId(name);
-
-  bool isGlobalLexical =
-      staticObject->is<LexicalEnvironmentObject>() &&
-      staticObject->as<LexicalEnvironmentObject>().isGlobal();
-  MOZ_ASSERT(isGlobalLexical || staticObject->is<GlobalObject>());
-
-  MDefinition* value = current->peek(-1);
-
-  TypeSet::ObjectKey* staticKey = TypeSet::ObjectKey::get(staticObject);
-  if (staticKey->unknownProperties()) {
-    return jsop_setprop(name);
-  }
-
-  HeapTypeSetKey property = staticKey->property(id);
-  if (!property.maybeTypes() || !property.maybeTypes()->definiteProperty() ||
-      property.nonData(constraints()) || property.nonWritable(constraints())) {
-    // The property has been reconfigured as non-configurable, non-enumerable
-    // or non-writable.
-    return jsop_setprop(name);
-  }
-
-  if (!CanWriteProperty(alloc(), constraints(), property, value)) {
-    return jsop_setprop(name);
-  }
-
-  // Don't optimize global lexical bindings if they aren't initialized at
-  // compile time.
-  if (isGlobalLexical && IsUninitializedGlobalLexicalSlot(staticObject, name)) {
-    return jsop_setprop(name);
-  }
-
-  current->pop();
-
-  // Pop the bound object on the stack. This is usually a constant but it can
-  // be a phi if loops are involved, for example: x = [...arr];
-  MDefinition* obj = current->pop();
-  MOZ_ASSERT(obj->isConstant() || obj->isPhi());
-  MOZ_ASSERT_IF(obj->isConstant(),
-                &obj->toConstant()->toObject() == staticObject);
-
-  if (needsPostBarrier(value)) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, value));
-  }
-
-  // If the property has a known type, we may be able to optimize typed stores
-  // by not storing the type tag.
-  MIRType slotType = MIRType::None;
-  MIRType knownType = property.knownMIRType(constraints());
-  if (knownType != MIRType::Value) {
-    slotType = knownType;
-  }
-
-  bool needsPreBarrier = property.needsBarrier(constraints());
-  return storeSlot(obj, property.maybeTypes()->definiteSlot(),
-                   NumFixedSlots(staticObject), value, needsPreBarrier,
-                   slotType);
-}
-
-JSObject* IonBuilder::testGlobalLexicalBinding(PropertyName* name) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::BindGName || JSOp(*pc) == JSOp::GetGName ||
-             JSOp(*pc) == JSOp::SetGName || JSOp(*pc) == JSOp::StrictSetGName);
-
-  // The global isn't the global lexical env's prototype, but its enclosing
-  // env. Test for the existence of |name| manually on the global lexical
-  // env. If it is not found, look for it on the global itself.
-
-  NativeObject* obj = &script()->global().lexicalEnvironment();
-  TypeSet::ObjectKey* lexicalKey = TypeSet::ObjectKey::get(obj);
-  jsid id = NameToId(name);
-  if (analysisContext) {
-    lexicalKey->ensureTrackedProperty(analysisContext, id);
-  }
-
-  // If the property is not found on the global lexical env but it is found
-  // on the global and is configurable, try to freeze the typeset for its
-  // non-existence.  If we don't have type information then fail.
-  //
-  // In the case that it is found on the global but is non-configurable,
-  // the binding cannot be shadowed by a global lexical binding.
-  Maybe<HeapTypeSetKey> lexicalProperty;
-  if (!lexicalKey->unknownProperties()) {
-    lexicalProperty.emplace(lexicalKey->property(id));
-  }
-  Shape* shape = obj->lookupPure(name);
-  if (shape) {
-    if ((JSOp(*pc) != JSOp::GetGName && !shape->writable()) ||
-        obj->getSlot(shape->slot()).isMagic(JS_UNINITIALIZED_LEXICAL)) {
-      return nullptr;
-    }
-  } else {
-    shape = script()->global().lookupPure(name);
-    if (!shape || shape->configurable()) {
-      if (lexicalProperty.isSome()) {
-        MOZ_ALWAYS_FALSE(lexicalProperty->isOwnProperty(constraints()));
-      } else {
-        return nullptr;
-      }
-    }
-    obj = &script()->global();
-  }
-
-  return obj;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getgname(PropertyName* name) {
-  // Optimize undefined/NaN/Infinity first.
-  if (name == names().undefined) {
-    pushConstant(UndefinedValue());
-    return Ok();
-  }
-  if (name == names().NaN) {
-    pushConstant(JS::NaNValue());
-    return Ok();
-  }
-  if (name == names().Infinity) {
-    pushConstant(JS::InfinityValue());
-    return Ok();
-  }
-
-  if (JSObject* obj = testGlobalLexicalBinding(name)) {
-    bool emitted = false;
-    MOZ_TRY(getStaticName(&emitted, obj, name));
-    if (emitted) {
-      return Ok();
-    }
-
-    if (!forceInlineCaches() && obj->is<GlobalObject>()) {
-      TemporaryTypeSet* types = bytecodeTypes(pc);
-      MDefinition* globalObj = constant(ObjectValue(*obj));
-      MOZ_TRY(
-          getPropTryCommonGetter(&emitted, globalObj, NameToId(name), types));
-      if (emitted) {
-        return Ok();
-      }
-    }
-  }
-
-  return jsop_getname(name);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getname(PropertyName* name) {
-  MDefinition* object;
-  if (IsGlobalOp(JSOp(*pc)) && !script()->hasNonSyntacticScope()) {
-    object = constant(ObjectValue(script()->global().lexicalEnvironment()));
-  } else {
-    object = current->environmentChain();
-  }
-
-  MGetNameCache* ins = MGetNameCache::New(alloc(), object);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_intrinsic(PropertyName* name) {
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  Value vp = UndefinedValue();
-  // If the intrinsic value doesn't yet exist, we generate code to get
-  // it and monitor the result.
-  if (!script()->global().maybeExistingIntrinsicValue(name, &vp)) {
-    MCallGetIntrinsicValue* ins = MCallGetIntrinsicValue::New(alloc(), name);
-
-    current->add(ins);
-    current->push(ins);
-
-    MOZ_TRY(resumeAfter(ins));
-
-    return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-  }
-
-  // Otherwise, we can bake in the intrinsic.
-  pushConstant(vp);
-
-  // Make sure that TI agrees with us on the type.
-  if (!types->hasType(TypeSet::GetValueType(vp))) {
-    types->addType(TypeSet::GetValueType(vp), alloc().lifoAlloc());
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getimport(PropertyName* name) {
-  ModuleEnvironmentObject* env = GetModuleEnvironmentForScript(script());
-  MOZ_ASSERT(env);
-
-  Shape* shape;
-  ModuleEnvironmentObject* targetEnv;
-  MOZ_ALWAYS_TRUE(env->lookupImport(NameToId(name), &targetEnv, &shape));
-
-  // We always use a type barrier because the slot's value can be modified by
-  // JSOP_SETALIASEDVAR without triggering type updates. This matches
-  // JSOP_GETALIASEDVAR.
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  BarrierKind barrier = BarrierKind::TypeSet;
-  MOZ_TRY(loadStaticSlot(targetEnv, barrier, types, shape->slot()));
-
-  // In the rare case where this import hasn't been initialized already (we
-  // have an import cycle where modules reference each other's imports), emit
-  // a check.
-  if (targetEnv->getSlot(shape->slot()).isMagic(JS_UNINITIALIZED_LEXICAL)) {
-    MDefinition* checked;
-    MOZ_TRY_VAR(checked, addLexicalCheck(current->pop()));
-    current->push(checked);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_bindname(PropertyName* name) {
-  MDefinition* envChain;
-  if (IsGlobalOp(JSOp(*pc)) && !script()->hasNonSyntacticScope()) {
-    envChain = constant(ObjectValue(script()->global().lexicalEnvironment()));
-  } else {
-    envChain = current->environmentChain();
-  }
-
-  MBindNameCache* ins = MBindNameCache::New(alloc(), envChain);
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_bindvar() {
-  MOZ_ASSERT(usesEnvironmentChain());
-  MCallBindVar* ins = MCallBindVar::New(alloc(), current->environmentChain());
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-static MIRType GetElemKnownType(bool needsHoleCheck, TemporaryTypeSet* types) {
-  MIRType knownType = types->getKnownMIRType();
-
-  // Null and undefined have no payload so they can't be specialized.
-  // Since folding null/undefined while building SSA is not safe (see the
-  // comment in IsPhiObservable), we just add an untyped load instruction
-  // and rely on pushTypeBarrier and DCE to replace it with a null/undefined
-  // constant.
-  if (knownType == MIRType::Undefined || knownType == MIRType::Null) {
-    knownType = MIRType::Value;
-  }
-
-  // Different architectures may want typed element reads which require
-  // hole checks to be done as either value or typed reads.
-  if (needsHoleCheck && !LIRGenerator::allowTypedElementHoleCheck()) {
-    knownType = MIRType::Value;
-  }
-
-  return knownType;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getelem() {
-  MDefinition* index = current->pop();
-  MDefinition* obj = current->pop();
-
-  // Always use a call if we are performing analysis and not actually
-  // emitting code, to simplify later analysis.
-  if (info().isAnalysis() || shouldAbortOnPreliminaryGroups(obj)) {
-    MInstruction* ins = MCallGetElement::New(alloc(), obj, index);
-
-    current->add(ins);
-    current->push(ins);
-
-    MOZ_TRY(resumeAfter(ins));
-
-    TemporaryTypeSet* types = bytecodeTypes(pc);
-    return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-  }
-
-  bool emitted = false;
-
-  // Handle lazy-arguments first. We have to do this even if forceInlineCaches
-  // is true (lazy arguments cannot escape to the IC). Like the code in
-  // IonBuilder::jsop_getprop, we only do this if we're not in analysis mode,
-  // to avoid unnecessary analysis aborts.
-  if (obj->mightBeType(MIRType::MagicOptimizedArguments) &&
-      !info().isAnalysis()) {
-    MOZ_TRY(getElemTryArguments(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryArgumentsInlinedConstant(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryArgumentsInlinedIndex(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    if (script()->argumentsHasVarBinding()) {
-      return abort(AbortReason::Disable,
-                   "Type is not definitely lazy arguments.");
-    }
-  }
-
-  obj = maybeUnboxForPropertyAccess(obj);
-
-  if (!forceInlineCaches()) {
-    // Note: no trackOptimizationAttempt call is needed, getElemTryGetProp
-    // will call it.
-    MOZ_TRY(getElemTryGetProp(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryCallSiteObject(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryDense(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryTypedArray(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(getElemTryString(&emitted, obj, index));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  return getElemAddCache(obj, index);
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryGetProp(bool* emitted, MDefinition* obj,
-                                                MDefinition* index) {
-  // If index is a constant string or symbol, try to optimize this GetElem
-  // as a GetProp.
-
-  MOZ_ASSERT(*emitted == false);
-
-  MConstant* indexConst = index->maybeConstantValue();
-  jsid id;
-  if (!indexConst || !ValueToIdPure(indexConst->toJSValue(), &id)) {
-    return Ok();
-  }
-
-  if (id != IdToTypeId(id)) {
-    return Ok();
-  }
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  MOZ_TRY(getPropTryConstant(emitted, obj, id, types));
-  if (*emitted) {
-    index->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  MOZ_TRY(getPropTryNotDefined(emitted, obj, id, types));
-  if (*emitted) {
-    index->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  MOZ_TRY(getPropTryCommonGetter(emitted, obj, id, types));
-  if (*emitted) {
-    index->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryDense(bool* emitted, MDefinition* obj,
-                                              MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!ElementAccessIsDenseNative(constraints(), obj, index)) {
-    return Ok();
-  }
-
-  // Don't generate a fast path if there have been bounds check failures
-  // and this access might be on a sparse property.
-  bool hasExtraIndexedProperty;
-  MOZ_TRY_VAR(hasExtraIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-  if (hasExtraIndexedProperty && failedBoundsCheck_) {
-    return Ok();
-  }
-
-  // Don't generate a fast path if this pc has seen negative
-  // or floating-point indexes accessed which will not appear
-  // to be extra indexed properties.
-  if (inspector->hasSeenNonIntegerIndex(pc)) {
-    return Ok();
-  }
-  if (inspector->hasSeenNegativeIndexGetElement(pc)) {
-    return Ok();
-  }
-
-  MOZ_TRY(jsop_getelem_dense(obj, index));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryTypedArray(bool* emitted,
-                                                   MDefinition* obj,
-                                                   MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  Scalar::Type arrayType;
-  if (!ElementAccessIsTypedArray(constraints(), obj, index, &arrayType)) {
-    return Ok();
-  }
-
-  // Emit typed getelem variant.
-  MOZ_TRY(jsop_getelem_typed(obj, index, arrayType));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryCallSiteObject(bool* emitted,
-                                                       MDefinition* obj,
-                                                       MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!obj->isConstant() || obj->type() != MIRType::Object) {
-    return Ok();
-  }
-
-  if (!index->isConstant() || index->type() != MIRType::Int32) {
-    return Ok();
-  }
-
-  JSObject* cst = &obj->toConstant()->toObject();
-  if (!cst->is<ArrayObject>()) {
-    return Ok();
-  }
-
-  // Technically this code would work with any kind of frozen array,
-  // in pratice it is usually a CallSiteObject.
-
-  ArrayObject* array = &cst->as<ArrayObject>();
-  if (array->lengthIsWritable() || array->hasEmptyElements() ||
-      !array->denseElementsAreFrozen()) {
-    return Ok();
-  }
-
-  int32_t idx = index->toConstant()->toInt32();
-  if (idx < 0 || !array->containsDenseElement(uint32_t(idx))) {
-    return Ok();
-  }
-
-  const Value& v = array->getDenseElement(uint32_t(idx));
-  // Strings should have been atomized by the parser.
-  if (!v.isString() || !v.toString()->isAtom()) {
-    return Ok();
-  }
-
-  obj->setImplicitlyUsedUnchecked();
-  index->setImplicitlyUsedUnchecked();
-
-  pushConstant(v);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryString(bool* emitted, MDefinition* obj,
-                                               MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (obj->type() != MIRType::String || !IsNumberType(index->type())) {
-    return Ok();
-  }
-
-  // If the index is expected to be out-of-bounds, don't optimize to avoid
-  // frequent bailouts.
-  if (bytecodeTypes(pc)->hasType(TypeSet::UndefinedType())) {
-    return Ok();
-  }
-
-  // Emit fast path for string[index].
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), index);
-  current->add(idInt32);
-  index = idInt32;
-
-  MStringLength* length = MStringLength::New(alloc(), obj);
-  current->add(length);
-
-  index = addBoundsCheck(index, length);
-
-  MCharCodeAt* charCode = MCharCodeAt::New(alloc(), obj, index);
-  current->add(charCode);
-
-  MFromCharCode* result = MFromCharCode::New(alloc(), charCode);
-  current->add(result);
-  current->push(result);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryArguments(bool* emitted,
-                                                  MDefinition* obj,
-                                                  MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (inliningDepth_ > 0) {
-    return Ok();
-  }
-
-  if (obj->type() != MIRType::MagicOptimizedArguments) {
-    return Ok();
-  }
-
-  // Emit GetFrameArgument.
-
-  MOZ_ASSERT(!info().argsObjAliasesFormals());
-
-  // Type Inference has guaranteed this is an optimized arguments object.
-  obj->setImplicitlyUsedUnchecked();
-
-  // To ensure that we are not looking above the number of actual arguments.
-  MArgumentsLength* length = MArgumentsLength::New(alloc());
-  current->add(length);
-
-  // Ensure index is an integer.
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), index);
-  current->add(idInt32);
-  index = idInt32;
-
-  // Bailouts if we read more than the number of actual arguments.
-  index = addBoundsCheck(index, length);
-
-  // Load the argument from the actual arguments.
-  auto* load = MGetFrameArgument::New(alloc(), index);
-  current->add(load);
-  current->push(load);
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  MOZ_TRY(pushTypeBarrier(load, types, BarrierKind::TypeSet));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryArgumentsInlinedConstant(
-    bool* emitted, MDefinition* obj, MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (inliningDepth_ == 0) {
-    return Ok();
-  }
-
-  if (obj->type() != MIRType::MagicOptimizedArguments) {
-    return Ok();
-  }
-
-  MConstant* indexConst = index->maybeConstantValue();
-  if (!indexConst || indexConst->type() != MIRType::Int32) {
-    return Ok();
-  }
-
-  // Emit inlined arguments.
-  obj->setImplicitlyUsedUnchecked();
-
-  MOZ_ASSERT(!info().argsObjAliasesFormals());
-
-  // When the id is constant, we can just return the corresponding inlined
-  // argument
-  MOZ_ASSERT(inliningDepth_ > 0);
-
-  int32_t id = indexConst->toInt32();
-  index->setImplicitlyUsedUnchecked();
-
-  if (id < (int32_t)inlineCallInfo_->argc() && id >= 0) {
-    current->push(inlineCallInfo_->getArg(id));
-  } else {
-    pushConstant(UndefinedValue());
-  }
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemTryArgumentsInlinedIndex(
-    bool* emitted, MDefinition* obj, MDefinition* index) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (inliningDepth_ == 0) {
-    return Ok();
-  }
-
-  if (obj->type() != MIRType::MagicOptimizedArguments) {
-    return Ok();
-  }
-
-  if (!IsNumberType(index->type())) {
-    return Ok();
-  }
-
-  // Currently, we do not support any arguments vector larger than 10, as this
-  // is being translated into code at the call site, and it would be better to
-  // store the arguments contiguously on the stack.
-  if (inlineCallInfo_->argc() > 10) {
-    return abort(AbortReason::Disable,
-                 "NYI get argument element with too many arguments");
-  }
-
-  // Emit inlined arguments.
-  obj->setImplicitlyUsedUnchecked();
-
-  MOZ_ASSERT(!info().argsObjAliasesFormals());
-
-  // Ensure index is an integer.
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), index);
-  current->add(idInt32);
-  index = idInt32;
-
-  // Bailout if we read more than the number of actual arguments. This bailout
-  // cannot re-enter because reading out of bounds arguments will disable the
-  // lazy arguments optimization for this script, when this code would be
-  // executed in Baseline. (see GetElemOptimizedArguments)
-  index = addBoundsCheck(index, constantInt(inlineCallInfo_->argc()));
-
-  // Get an instruction to represent the state of the argument vector.
-  MInstruction* args =
-      MArgumentState::New(alloc().fallible(), inlineCallInfo_->argv());
-  if (!args) {
-    return abort(AbortReason::Alloc);
-  }
-  current->add(args);
-
-  // Select a value to pick from a vector.
-  MInstruction* load = MLoadElementFromState::New(alloc(), args, index);
-  current->add(load);
-  current->push(load);
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getElemAddCache(MDefinition* obj,
-                                              MDefinition* index) {
-  // Emit GetPropertyCache.
-
-  MGetPropertyCache* ins = MGetPropertyCache::New(alloc(), obj, index,
-                                                  /* monitoredResult = */ true);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  // We always barrier getElem to handle missing elements, as type inference
-  // doesn't handle missing properties (see Bug 1488786)
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  MOZ_TRY(pushTypeBarrier(ins, types, BarrierKind::TypeSet));
-
-  return Ok();
-}
-
-TemporaryTypeSet* IonBuilder::computeHeapType(const TemporaryTypeSet* objTypes,
-                                              const jsid id) {
-  if (objTypes->unknownObject() || objTypes->getObjectCount() == 0) {
-    return nullptr;
-  }
-
-  TemporaryTypeSet* acc = nullptr;
-  LifoAlloc* lifoAlloc = alloc().lifoAlloc();
-
-  Vector<HeapTypeSetKey, 4, SystemAllocPolicy> properties;
-  if (!properties.reserve(objTypes->getObjectCount())) {
-    return nullptr;
-  }
-
-  for (unsigned i = 0; i < objTypes->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = objTypes->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return nullptr;
-    }
-
-    HeapTypeSetKey property = key->property(id);
-    HeapTypeSet* currentSet = property.maybeTypes();
-
-    if (!currentSet || currentSet->unknown()) {
-      return nullptr;
-    }
-
-    properties.infallibleAppend(property);
-
-    if (acc) {
-      acc = TypeSet::unionSets(acc, currentSet, lifoAlloc);
-    } else {
-      TemporaryTypeSet empty;
-      acc = TypeSet::unionSets(&empty, currentSet, lifoAlloc);
-    }
-
-    if (!acc) {
-      return nullptr;
-    }
-  }
-
-  // Freeze all the properties associated with the refined type set.
-  for (HeapTypeSetKey* i = properties.begin(); i != properties.end(); i++) {
-    i->freeze(constraints());
-  }
-
-  return acc;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getelem_dense(MDefinition* obj,
-                                                 MDefinition* index) {
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  MOZ_ASSERT(index->type() == MIRType::Int32 ||
-             index->type() == MIRType::Double);
-
-  BarrierKind barrier = PropertyReadNeedsTypeBarrier(
-      analysisContext, alloc(), constraints(), obj, nullptr, types);
-  bool needsHoleCheck = !ElementAccessIsPacked(constraints(), obj);
-
-  // Reads which are on holes in the object do not have to bail out if
-  // undefined values have been observed at this access site and the access
-  // cannot hit another indexed property on the object or its prototypes.
-  bool readOutOfBounds = false;
-  if (types->hasType(TypeSet::UndefinedType())) {
-    bool hasExtraIndexedProperty;
-    MOZ_TRY_VAR(hasExtraIndexedProperty,
-                ElementAccessHasExtraIndexedProperty(this, obj));
-    readOutOfBounds = !hasExtraIndexedProperty;
-  }
-
-  MIRType knownType = MIRType::Value;
-  if (barrier == BarrierKind::NoBarrier) {
-    knownType = GetElemKnownType(needsHoleCheck, types);
-  }
-
-  // Ensure index is an integer.
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), index);
-  current->add(idInt32);
-  index = idInt32;
-
-  // Get the elements vector.
-  MInstruction* elements = MElements::New(alloc(), obj);
-  current->add(elements);
-
-  // Note: to help GVN, use the original MElements instruction and not
-  // MConvertElementsToDoubles as operand. This is fine because converting
-  // elements to double does not change the initialized length.
-  MInstruction* initLength = initializedLength(elements);
-
-  // If we can load the element as a definite double, make sure to check that
-  // the array has been converted to homogenous doubles first.
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-  bool inBounds = !readOutOfBounds && !needsHoleCheck;
-
-  if (inBounds) {
-    TemporaryTypeSet* heapTypes = computeHeapType(objTypes, JSID_VOID);
-    if (heapTypes && heapTypes->isSubset(types)) {
-      knownType = heapTypes->getKnownMIRType();
-      types = heapTypes;
-    }
-  }
-
-  bool loadDouble = barrier == BarrierKind::NoBarrier && loopDepth_ &&
-                    inBounds && knownType == MIRType::Double && objTypes &&
-                    objTypes->convertDoubleElements(constraints()) ==
-                        TemporaryTypeSet::AlwaysConvertToDoubles;
-  if (loadDouble) {
-    elements = addConvertElementsToDoubles(elements);
-  }
-
-  MInstruction* load;
-
-  if (!readOutOfBounds) {
-    // This load should not return undefined, so likely we're reading
-    // in-bounds elements, and the array is packed or its holes are not
-    // read. This is the best case: we can separate the bounds check for
-    // hoisting.
-    index = addBoundsCheck(index, initLength);
-
-    load =
-        MLoadElement::New(alloc(), elements, index, needsHoleCheck, loadDouble);
-    current->add(load);
-  } else {
-    // This load may return undefined, so assume that we *can* read holes,
-    // or that we can read out-of-bounds accesses. In this case, the bounds
-    // check is part of the opcode.
-    load = MLoadElementHole::New(alloc(), elements, index, initLength,
-                                 needsHoleCheck);
-    current->add(load);
-
-    // If maybeUndefined was true, the typeset must have undefined, and
-    // then either additional types or a barrier. This means we should
-    // never have a typed version of LoadElementHole.
-    MOZ_ASSERT(knownType == MIRType::Value);
-  }
-
-  if (knownType != MIRType::Value) {
-    load->setResultType(knownType);
-    load->setResultTypeSet(types);
-  }
-
-  current->push(load);
-  return pushTypeBarrier(load, types, barrier);
-}
-
-MInstruction* IonBuilder::addArrayBufferByteLength(MDefinition* obj) {
-  auto* ins = MArrayBufferByteLengthInt32::New(alloc(), obj);
-  current->add(ins);
-  return ins;
-}
-
-TypedArrayObject* IonBuilder::tryTypedArrayEmbedConstantElements(
-    MDefinition* obj) {
-  JSObject* object = nullptr;
-  if (MConstant* objConst = obj->maybeConstantValue()) {
-    if (objConst->type() == MIRType::Object) {
-      object = &objConst->toObject();
-    }
-  } else if (TemporaryTypeSet* types = obj->resultTypeSet()) {
-    object = types->maybeSingleton();
-  }
-  if (!object || !object->isSingleton()) {
-    return nullptr;
-  }
-
-  TypedArrayObject* tarr = &object->as<TypedArrayObject>();
-
-  // TypedArrays are only singletons when created with a (Shared)ArrayBuffer
-  // and a length greater or equal to |SINGLETON_BYTE_LENGTH|.
-  MOZ_ASSERT(tarr->hasBuffer());
-  MOZ_ASSERT(tarr->byteLength().get() >=
-                 TypedArrayObject::SINGLETON_BYTE_LENGTH ||
-             tarr->hasDetachedBuffer());
-
-  // TypedArrays using an ArrayBuffer don't have nursery-allocated data, see
-  // |ArrayBufferViewObject::init(...)|.
-  MOZ_ASSERT(!tarr->runtimeFromMainThread()->gc.nursery().isInside(
-      tarr->dataPointerEither()));
-
-  // The 'data' pointer of TypedArrayObject can change in rare circumstances
-  // (ArrayBufferObject::setNewData).
-  TypeSet::ObjectKey* tarrKey = TypeSet::ObjectKey::get(tarr);
-  if (tarrKey->unknownProperties()) {
-    return nullptr;
-  }
-  if (!tarr->isSharedMemory()) {
-    tarrKey->watchStateChangeForTypedArrayData(constraints());
-  }
-  return tarr;
-}
-
-void IonBuilder::addTypedArrayLengthAndData(MDefinition* obj,
-                                            BoundsChecking checking,
-                                            MDefinition** index,
-                                            MInstruction** length,
-                                            MInstruction** elements) {
-  MOZ_ASSERT((index != nullptr) == (elements != nullptr));
-
-  if (TypedArrayObject* tarr = tryTypedArrayEmbedConstantElements(obj)) {
-    // Bug 979449 - Optimistically embed the elements and use TI to
-    //              invalidate if we move them.
-
-    obj->setImplicitlyUsedUnchecked();
-
-    int32_t len = AssertedCast<int32_t>(tarr->length().deprecatedGetUint32());
-    *length = MConstant::New(alloc(), Int32Value(len));
-    current->add(*length);
-
-    if (index) {
-      if (checking == DoBoundsCheck) {
-        *index = addBoundsCheck(*index, *length);
-      }
-
-      *elements = MConstantElements::New(alloc(), tarr->dataPointerEither());
-      current->add(*elements);
-    }
-    return;
-  }
-
-  *length = MArrayBufferViewLength::New(alloc(), obj);
-  current->add(*length);
-
-  if (index) {
-    if (checking == DoBoundsCheck) {
-      *index = addBoundsCheck(*index, *length);
-    }
-
-    *elements = MArrayBufferViewElements::New(alloc(), obj);
-    current->add(*elements);
-  }
-}
-
-void IonBuilder::addDataViewData(MDefinition* obj, Scalar::Type type,
-                                 MDefinition** index, MInstruction** elements) {
-  MInstruction* length = MArrayBufferViewLength::New(alloc(), obj);
-  current->add(length);
-
-  // Adjust the length to account for accesses near the end of the dataview.
-  if (size_t byteSize = Scalar::byteSize(type); byteSize > 1) {
-    // To ensure |0 <= index && index + byteSize <= length|, we can either emit
-    // |BoundsCheck(index, length)| followed by
-    // |BoundsCheck(index + (byteSize - 1), length)|, or alternatively emit
-    // |BoundsCheck(index, Max(length - (byteSize - 1), 0))|. The latter should
-    // result in faster code when LICM moves the length adjustment and also
-    // ensures Spectre index masking occurs after all bounds checks.
-
-    auto* byteSizeMinusOne = MConstant::New(alloc(), Int32Value(byteSize - 1));
-    current->add(byteSizeMinusOne);
-
-    length = MSub::New(alloc(), length, byteSizeMinusOne, MIRType::Int32);
-    length->toSub()->setTruncateKind(MDefinition::Truncate);
-    current->add(length);
-
-    // |length| mustn't be negative for MBoundsCheck.
-    auto* zero = MConstant::New(alloc(), Int32Value(0));
-    current->add(zero);
-
-    length = MMinMax::New(alloc(), length, zero, MIRType::Int32, true);
-    current->add(length);
-  }
-
-  *index = addBoundsCheck(*index, length);
-
-  *elements = MArrayBufferViewElements::New(alloc(), obj);
-  current->add(*elements);
-}
-
-MInstruction* IonBuilder::addTypedArrayByteOffset(MDefinition* obj) {
-  MInstruction* byteOffset;
-  if (TypedArrayObject* tarr = tryTypedArrayEmbedConstantElements(obj)) {
-    obj->setImplicitlyUsedUnchecked();
-
-    int32_t offset =
-        AssertedCast<int32_t>(tarr->byteOffset().deprecatedGetUint32());
-    byteOffset = MConstant::New(alloc(), Int32Value(offset));
-  } else {
-    byteOffset = MArrayBufferViewByteOffset::New(alloc(), obj);
-  }
-
-  current->add(byteOffset);
-  return byteOffset;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getelem_typed(MDefinition* obj,
-                                                 MDefinition* index,
-                                                 Scalar::Type arrayType) {
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  bool maybeUndefined = types->hasType(TypeSet::UndefinedType());
-
-  // Reading from an Uint32Array will result in a double for values
-  // that don't fit in an int32. We have to bailout if this happens
-  // and the instruction is not known to return a double.
-  bool allowDouble = types->hasType(TypeSet::DoubleType());
-
-  if (!maybeUndefined) {
-    // Assume the index is in range, so that we can hoist the length,
-    // elements vector and bounds check.
-
-    // Ensure the index is an integer. This is a stricter requirement than
-    // enforcing that it is a TypedArray index via MTypedArrayIndexToInt32,
-    // because any double which isn't exactly representable as an int32 will
-    // lead to a bailout. But it's okay to have this stricter requirement here,
-    // since any non-int32 index is equivalent to an out-of-bounds access, which
-    // will lead to a bailout anyway.
-    MInstruction* indexInt32 = MToNumberInt32::New(alloc(), index);
-    current->add(indexInt32);
-    index = indexInt32;
-
-    // If we are reading in-bounds elements, we can use knowledge about
-    // the array type to determine the result type, even if the opcode has
-    // never executed. The known pushed type is only used to distinguish
-    // uint32 reads that may produce either doubles or integers.
-    MIRType knownType = MIRTypeForArrayBufferViewRead(arrayType, allowDouble);
-
-    // Get length, bounds-check, then get elements, and add all instructions.
-    MInstruction* length;
-    MInstruction* elements;
-    addTypedArrayLengthAndData(obj, DoBoundsCheck, &index, &length, &elements);
-
-    // Load the element.
-    MLoadUnboxedScalar* load =
-        MLoadUnboxedScalar::New(alloc(), elements, index, arrayType);
-    current->add(load);
-    current->push(load);
-
-    // Note: we can ignore the type barrier here, we know the type must
-    // be valid and unbarriered.
-    load->setResultType(knownType);
-    return Ok();
-  } else {
-    // Ensure the index is a TypedArray index.
-    auto* indexInt32 = MTypedArrayIndexToInt32::New(alloc(), index);
-    current->add(indexInt32);
-    index = indexInt32;
-
-    // We need a type barrier if the array's element type has never been
-    // observed (we've only read out-of-bounds values). Note that for
-    // Uint32Array, we only check for int32: if allowDouble is false we
-    // will bailout when we read a double.
-    BarrierKind barrier = BarrierKind::TypeSet;
-    switch (arrayType) {
-      case Scalar::Int8:
-      case Scalar::Uint8:
-      case Scalar::Uint8Clamped:
-      case Scalar::Int16:
-      case Scalar::Uint16:
-      case Scalar::Int32:
-      case Scalar::Uint32:
-        if (types->hasType(TypeSet::Int32Type())) {
-          barrier = BarrierKind::NoBarrier;
-        }
-        break;
-      case Scalar::Float32:
-      case Scalar::Float64:
-        if (allowDouble) {
-          barrier = BarrierKind::NoBarrier;
-        }
-        break;
-      case Scalar::BigInt64:
-      case Scalar::BigUint64:
-        if (types->hasType(TypeSet::BigIntType())) {
-          barrier = BarrierKind::NoBarrier;
-        }
-        break;
-      default:
-        MOZ_CRASH("Unknown typed array type");
-    }
-
-    // Assume we will read out-of-bound values. In this case the
-    // bounds check will be part of the instruction, and the instruction
-    // will always return a Value.
-    MLoadTypedArrayElementHole* load = MLoadTypedArrayElementHole::New(
-        alloc(), obj, index, arrayType, allowDouble);
-    current->add(load);
-    current->push(load);
-
-    return pushTypeBarrier(load, types, barrier);
-  }
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setelem() {
-  bool emitted = false;
-
-  MDefinition* value = current->pop();
-  MDefinition* index = current->pop();
-  MDefinition* object = current->pop();
-
-  if (shouldAbortOnPreliminaryGroups(object)) {
-    MInstruction* ins =
-        MCallSetElement::New(alloc(), object, index, value, IsStrictSetPC(pc));
-    current->add(ins);
-    current->push(value);
-    return resumeAfter(ins);
-  }
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(setElemTryTypedArray(&emitted, object, index, value));
-    if (emitted) {
-      return Ok();
-    }
-
-    SetElemICInspector icInspect(inspector->setElemICInspector(pc));
-    bool writeHole = icInspect.sawOOBDenseWrite();
-    MOZ_TRY(initOrSetElemTryDense(&emitted, object, index, value, writeHole));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(setElemTryArguments(&emitted, object));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  if (script()->argumentsHasVarBinding() &&
-      object->mightBeType(MIRType::MagicOptimizedArguments) &&
-      info().analysisMode() != Analysis_ArgumentsUsage) {
-    return abort(AbortReason::Disable,
-                 "Type is not definitely lazy arguments.");
-  }
-
-  MOZ_TRY(initOrSetElemTryCache(&emitted, object, index, value));
-  if (emitted) {
-    return Ok();
-  }
-
-  // Emit call.
-  MInstruction* ins =
-      MCallSetElement::New(alloc(), object, index, value, IsStrictSetPC(pc));
-  current->add(ins);
-  current->push(value);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::setElemTryTypedArray(bool* emitted,
-                                                   MDefinition* object,
-                                                   MDefinition* index,
-                                                   MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-
-  Scalar::Type arrayType;
-  if (!ElementAccessIsTypedArray(constraints(), object, index, &arrayType)) {
-    return Ok();
-  }
-
-  // Emit typed setelem variant.
-  MOZ_TRY(jsop_setelem_typed(arrayType, object, index, value));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::initOrSetElemTryDense(bool* emitted,
-                                                    MDefinition* object,
-                                                    MDefinition* index,
-                                                    MDefinition* value,
-                                                    bool writeHole) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (value->type() == MIRType::MagicHole) {
-    return Ok();
-  }
-
-  if (!ElementAccessIsDenseNative(constraints(), object, index)) {
-    return Ok();
-  }
-
-  if (PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &object,
-                                    nullptr, &value, /* canModify = */ true)) {
-    return Ok();
-  }
-
-  if (!object->resultTypeSet()) {
-    return Ok();
-  }
-
-  TemporaryTypeSet::DoubleConversion conversion =
-      object->resultTypeSet()->convertDoubleElements(constraints());
-
-  // If AmbiguousDoubleConversion, only handle int32 values for now.
-  if (conversion == TemporaryTypeSet::AmbiguousDoubleConversion &&
-      value->type() != MIRType::Int32) {
-    return Ok();
-  }
-
-  // Don't generate a fast path if there have been bounds check failures
-  // and this access might be on a sparse property.
-  bool hasExtraIndexedProperty;
-  MOZ_TRY_VAR(hasExtraIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, object));
-  if (hasExtraIndexedProperty && failedBoundsCheck_) {
-    return Ok();
-  }
-
-  // Emit dense setelem variant.
-  return initOrSetElemDense(conversion, object, index, value, writeHole,
-                            emitted);
-}
-
-AbortReasonOr<Ok> IonBuilder::setElemTryArguments(bool* emitted,
-                                                  MDefinition* object) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (object->type() != MIRType::MagicOptimizedArguments) {
-    return Ok();
-  }
-
-  // Arguments are not supported yet.
-  return abort(AbortReason::Disable, "NYI arguments[]=");
-}
-
-AbortReasonOr<Ok> IonBuilder::initOrSetElemTryCache(bool* emitted,
-                                                    MDefinition* object,
-                                                    MDefinition* index,
-                                                    MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!object->mightBeType(MIRType::Object)) {
-    return Ok();
-  }
-
-  if (value->type() == MIRType::MagicHole) {
-    return Ok();
-  }
-
-  bool barrier = true;
-  if (index->type() == MIRType::Int32 &&
-      !PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &object,
-                                     nullptr, &value, /* canModify = */ true)) {
-    barrier = false;
-  }
-
-  // We can avoid worrying about holes in the IC if we know a priori we are safe
-  // from them. If TI can guard that there are no indexed properties on the
-  // prototype chain, we know that we aren't missing any setters by overwriting
-  // the hole with another value.
-  bool guardHoles;
-  MOZ_TRY_VAR(guardHoles, ElementAccessHasExtraIndexedProperty(this, object));
-
-  // Make sure the object being written to doesn't have copy on write elements.
-  const JSClass* clasp =
-      object->resultTypeSet()
-          ? object->resultTypeSet()->getKnownClass(constraints())
-          : nullptr;
-  bool checkNative = !clasp || !clasp->isNative();
-  object = addMaybeCopyElementsForWrite(object, checkNative);
-
-  // Emit SetPropertyCache.
-  bool strict = JSOp(*pc) == JSOp::StrictSetElem;
-  MSetPropertyCache* ins =
-      MSetPropertyCache::New(alloc(), object, index, value, strict,
-                             needsPostBarrier(value), barrier, guardHoles);
-  current->add(ins);
-
-  // Push value back onto stack. Init ops keep their object on stack.
-  if (!IsPropertyInitOp(JSOp(*pc))) {
-    current->push(value);
-  }
-
-  MOZ_TRY(resumeAfter(ins));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::initOrSetElemDense(
-    TemporaryTypeSet::DoubleConversion conversion, MDefinition* obj,
-    MDefinition* id, MDefinition* value, bool writeHole, bool* emitted) {
-  MOZ_ASSERT(*emitted == false);
-
-  MIRType elementType = DenseNativeElementType(constraints(), obj);
-  bool packed = ElementAccessIsPacked(constraints(), obj);
-
-  // Writes which are on holes in the object do not have to bail out if they
-  // cannot hit another indexed property on the object or its prototypes.
-  bool hasExtraIndexedProperty;
-  MOZ_TRY_VAR(hasExtraIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-
-  bool mayBeNonExtensible =
-      ElementAccessMightBeNonExtensible(constraints(), obj);
-
-  if (mayBeNonExtensible) {
-    // FallibleStoreElement does not know how to deal with extra indexed
-    // properties on the prototype. This case should be rare so we fall back
-    // to an IC.
-    if (hasExtraIndexedProperty) {
-      return Ok();
-    }
-
-    // Don't optimize InitElem (DefineProperty) on potentially non-extensible
-    // objects: when the array is sealed, we have to throw an exception.
-    if (IsPropertyInitOp(JSOp(*pc))) {
-      return Ok();
-    }
-  }
-
-  *emitted = true;
-
-  // Ensure id is an integer.
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), id);
-  current->add(idInt32);
-  id = idInt32;
-
-  if (needsPostBarrier(value)) {
-    current->add(MPostWriteElementBarrier::New(alloc(), obj, value, id));
-  }
-
-  // Copy the elements vector if necessary.
-  obj = addMaybeCopyElementsForWrite(obj, /* checkNative = */ false);
-
-  // Get the elements vector.
-  MElements* elements = MElements::New(alloc(), obj);
-  current->add(elements);
-
-  // Ensure the value is a double, if double conversion might be needed.
-  MDefinition* newValue = value;
-  switch (conversion) {
-    case TemporaryTypeSet::AlwaysConvertToDoubles:
-    case TemporaryTypeSet::MaybeConvertToDoubles: {
-      MInstruction* valueDouble = MToDouble::New(alloc(), value);
-      current->add(valueDouble);
-      newValue = valueDouble;
-      break;
-    }
-
-    case TemporaryTypeSet::AmbiguousDoubleConversion: {
-      MOZ_ASSERT(value->type() == MIRType::Int32);
-      MInstruction* maybeDouble =
-          MMaybeToDoubleElement::New(alloc(), elements, value);
-      current->add(maybeDouble);
-      newValue = maybeDouble;
-      break;
-    }
-
-    case TemporaryTypeSet::DontConvertToDoubles:
-      break;
-
-    default:
-      MOZ_CRASH("Unknown double conversion");
-  }
-
-  // Use MStoreElementHole if this SetElem has written to out-of-bounds
-  // indexes in the past. Otherwise, use MStoreElement so that we can hoist
-  // the initialized length and bounds check.
-  // If an object may have been made non-extensible, no previous expectations
-  // hold and we fallback to MFallibleStoreElement.
-  MInstruction* store;
-  MStoreElementCommon* common = nullptr;
-  if (writeHole && !hasExtraIndexedProperty && !mayBeNonExtensible) {
-    MStoreElementHole* ins =
-        MStoreElementHole::New(alloc(), obj, elements, id, newValue);
-    store = ins;
-    common = ins;
-
-    current->add(ins);
-  } else if (mayBeNonExtensible) {
-    MOZ_ASSERT(
-        !hasExtraIndexedProperty,
-        "FallibleStoreElement codegen assumes no extra indexed properties");
-
-    bool needsHoleCheck = !packed;
-    MFallibleStoreElement* ins = MFallibleStoreElement::New(
-        alloc(), obj, elements, id, newValue, needsHoleCheck);
-    store = ins;
-    common = ins;
-
-    current->add(ins);
-  } else {
-    MInstruction* initLength = initializedLength(elements);
-
-    id = addBoundsCheck(id, initLength);
-    bool needsHoleCheck = !packed && hasExtraIndexedProperty;
-
-    MStoreElement* ins =
-        MStoreElement::New(alloc(), elements, id, newValue, needsHoleCheck);
-    store = ins;
-    common = ins;
-
-    current->add(store);
-  }
-
-  // Push value back onto stack. Init ops keep their object on stack.
-  if (!IsPropertyInitOp(JSOp(*pc))) {
-    current->push(value);
-  }
-
-  MOZ_TRY(resumeAfter(store));
-
-  if (common) {
-    // Determine whether a write barrier is required.
-    if (obj->resultTypeSet()->propertyNeedsBarrier(constraints(), JSID_VOID)) {
-      common->setNeedsBarrier();
-    }
-
-    if (elementType != MIRType::None && packed) {
-      common->setElementType(elementType);
-    }
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setelem_typed(Scalar::Type arrayType,
-                                                 MDefinition* obj,
-                                                 MDefinition* id,
-                                                 MDefinition* value) {
-  SetElemICInspector icInspect(inspector->setElemICInspector(pc));
-  bool expectOOB = icInspect.sawOOBTypedArrayWrite();
-
-  if (expectOOB) {
-    spew("Emitting OOB TypedArray SetElem");
-  }
-
-  // Ensure id is an integer. Just as in |jsop_getelem_typed|, use either
-  // MTypedArrayIndexToInt32 or MToNumberInt32 depending on whether or not
-  // out-of-bounds accesses are to be expected.
-  MInstruction* idInt32;
-  if (expectOOB) {
-    idInt32 = MTypedArrayIndexToInt32::New(alloc(), id);
-  } else {
-    idInt32 = MToNumberInt32::New(alloc(), id);
-  }
-  current->add(idInt32);
-  id = idInt32;
-
-  // Get length, bounds-check, then get elements, and add all instructions.
-  MInstruction* length;
-  MInstruction* elements;
-  BoundsChecking checking = expectOOB ? SkipBoundsCheck : DoBoundsCheck;
-  addTypedArrayLengthAndData(obj, checking, &id, &length, &elements);
-
-  // Clamp value to [0, 255] for Uint8ClampedArray.
-  MDefinition* toWrite = value;
-  if (arrayType == Scalar::Uint8Clamped) {
-    toWrite = MClampToUint8::New(alloc(), value);
-    current->add(toWrite->toInstruction());
-  }
-
-  // Store the value.
-  MInstruction* ins;
-  if (expectOOB) {
-    ins = MStoreTypedArrayElementHole::New(alloc(), elements, length, id,
-                                           toWrite, arrayType);
-  } else {
-    ins = MStoreUnboxedScalar::New(alloc(), elements, id, toWrite, arrayType);
-  }
-
-  current->add(ins);
-  current->push(value);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_length() {
-  if (jsop_length_fastPath()) {
-    return Ok();
-  }
-
-  PropertyName* name = info().getAtom(pc)->asPropertyName();
-  return jsop_getprop(name);
-}
-
-bool IonBuilder::jsop_length_fastPath() {
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  if (types->getKnownMIRType() != MIRType::Int32) {
-    return false;
-  }
-
-  MDefinition* obj = current->peek(-1);
-
-  if (shouldAbortOnPreliminaryGroups(obj)) {
-    return false;
-  }
-
-  if (obj->mightBeType(MIRType::String)) {
-    if (obj->mightBeType(MIRType::Object)) {
-      return false;
-    }
-    current->pop();
-    MStringLength* ins = MStringLength::New(alloc(), obj);
-    current->add(ins);
-    current->push(ins);
-    return true;
-  }
-
-  if (obj->mightBeType(MIRType::Object)) {
-    TemporaryTypeSet* objTypes = obj->resultTypeSet();
-
-    // Compute the length for array objects.
-    if (objTypes &&
-        objTypes->getKnownClass(constraints()) == &ArrayObject::class_ &&
-        !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW)) {
-      current->pop();
-      MElements* elements = MElements::New(alloc(), obj);
-      current->add(elements);
-
-      // Read length.
-      MArrayLength* length = MArrayLength::New(alloc(), elements);
-      current->add(length);
-      current->push(length);
-      return true;
-    }
-  }
-
-  return false;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_arguments() {
-  if (info().needsArgsObj()) {
-    current->push(current->argumentsObject());
-    return Ok();
-  }
-
-  MOZ_ASSERT(hasLazyArguments_);
-  MConstant* lazyArg =
-      MConstant::New(alloc(), MagicValue(JS_OPTIMIZED_ARGUMENTS));
-  current->add(lazyArg);
-  current->push(lazyArg);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_newtarget() {
-  MOZ_ASSERT(info().funMaybeLazy());
-
-  if (info().funMaybeLazy()->isArrow()) {
-    MArrowNewTarget* arrowNewTarget =
-        MArrowNewTarget::New(alloc(), getCallee());
-    current->add(arrowNewTarget);
-    current->push(arrowNewTarget);
-    return Ok();
-  }
-
-  if (inliningDepth_ == 0) {
-    MNewTarget* newTarget = MNewTarget::New(alloc());
-    current->add(newTarget);
-    current->push(newTarget);
-    return Ok();
-  }
-
-  if (!inlineCallInfo_->constructing()) {
-    pushConstant(UndefinedValue());
-    return Ok();
-  }
-
-  current->push(inlineCallInfo_->getNewTarget());
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_rest() {
-  if (info().analysisMode() == Analysis_ArgumentsUsage) {
-    // There's no BaselineScript with the template object. Just push a
-    // dummy value, it does not affect the arguments analysis.
-    MUnknownValue* unknown = MUnknownValue::New(alloc());
-    current->add(unknown);
-    current->push(unknown);
-    return Ok();
-  }
-
-  ArrayObject* templateObject =
-      &inspector->getTemplateObject(pc)->as<ArrayObject>();
-
-  if (inliningDepth_ == 0) {
-    // We don't know anything about the callee.
-    MArgumentsLength* numActuals = MArgumentsLength::New(alloc());
-    current->add(numActuals);
-
-    // Pass in the number of actual arguments, the number of formals (not
-    // including the rest parameter slot itself), and the template object.
-    MRest* rest = MRest::New(alloc(), constraints(), numActuals,
-                             info().nargs() - 1, templateObject);
-    current->add(rest);
-    current->push(rest);
-    return Ok();
-  }
-
-  // We know the exact number of arguments the callee pushed.
-  unsigned numActuals = inlineCallInfo_->argc();
-  unsigned numFormals = info().nargs() - 1;
-  unsigned numRest = numActuals > numFormals ? numActuals - numFormals : 0;
-
-  MOZ_TRY(jsop_newarray(numRest));
-
-  if (numRest == 0) {
-    // No more updating to do. (Note that in this one case the length from
-    // the template object is already correct.)
-    return Ok();
-  }
-
-  MDefinition* array = current->peek(-1);
-  MElements* elements = MElements::New(alloc(), array);
-  current->add(elements);
-
-  // Unroll the argument copy loop. We don't need to do any bounds or hole
-  // checking here.
-  MConstant* index = nullptr;
-  for (unsigned i = numFormals; i < numActuals; i++) {
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    index = MConstant::New(alloc(), Int32Value(i - numFormals));
-    current->add(index);
-
-    MDefinition* arg = inlineCallInfo_->argv()[i];
-    MStoreElement* store = MStoreElement::New(alloc(), elements, index, arg,
-                                              /* needsHoleCheck = */ false);
-    current->add(store);
-
-    if (needsPostBarrier(arg)) {
-      current->add(MPostWriteBarrier::New(alloc(), array, arg));
-    }
-  }
-
-  // The array's length is incorrectly 0 now, from the template object created
-  // by BaselineCompiler::emit_Rest() before the actual argument count was
-  // known. Set the correct length now that we know that count.
-  MSetArrayLength* length = MSetArrayLength::New(alloc(), elements, index);
-  current->add(length);
-
-  // Update the initialized length for all the (necessarily non-hole)
-  // elements added.
-  MSetInitializedLength* initLength =
-      MSetInitializedLength::New(alloc(), elements, index);
-  current->add(initLength);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkisobj(uint8_t kind) {
-  MDefinition* toCheck = current->peek(-1);
-
-  if (toCheck->type() == MIRType::Object) {
-    toCheck->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  MCheckIsObj* check = MCheckIsObj::New(alloc(), current->pop(), kind);
-  current->add(check);
-  current->push(check);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkobjcoercible() {
-  MDefinition* toCheck = current->peek(-1);
-
-  if (!toCheck->mightBeType(MIRType::Undefined) &&
-      !toCheck->mightBeType(MIRType::Null)) {
-    toCheck->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  MOZ_ASSERT(toCheck->type() == MIRType::Value ||
-             toCheck->type() == MIRType::Null ||
-             toCheck->type() == MIRType::Undefined);
-
-  // If we want to squeeze more perf here, we can throw without checking,
-  // if IsNullOrUndefined(toCheck->type()). Since this is a failure case,
-  // it should be OK.
-  MCheckObjCoercible* check = MCheckObjCoercible::New(alloc(), current->pop());
-  current->add(check);
-  current->push(check);
-  return resumeAfter(check);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkclassheritage() {
-  auto* ins = MCheckClassHeritage::New(alloc(), current->pop());
-  current->add(ins);
-  current->push(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkthis() {
-  auto* ins = MCheckThis::New(alloc(), current->pop());
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkthisreinit() {
-  auto* ins = MCheckThisReinit::New(alloc(), current->pop());
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-uint32_t IonBuilder::getDefiniteSlot(TemporaryTypeSet* types, jsid id,
-                                     uint32_t* pnfixed) {
-  if (!types || types->unknownObject() || !types->objectOrSentinel()) {
-    return UINT32_MAX;
-  }
-
-  uint32_t slot = UINT32_MAX;
-
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return UINT32_MAX;
-    }
-
-    if (key->isSingleton()) {
-      return UINT32_MAX;
-    }
-
-    HeapTypeSetKey property = key->property(id);
-    if (!property.maybeTypes() || !property.maybeTypes()->definiteProperty() ||
-        property.nonData(constraints())) {
-      return UINT32_MAX;
-    }
-
-    // Definite slots will always be fixed slots when they are in the
-    // allowable range for fixed slots.
-    size_t nfixed = NativeObject::MAX_FIXED_SLOTS;
-
-    uint32_t propertySlot = property.maybeTypes()->definiteSlot();
-    if (slot == UINT32_MAX) {
-      slot = propertySlot;
-      *pnfixed = nfixed;
-    } else if (slot != propertySlot || nfixed != *pnfixed) {
-      return UINT32_MAX;
-    }
-  }
-
-  return slot;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_not() {
-  MDefinition* value = current->pop();
-
-  MNot* ins = MNot::New(alloc(), value, constraints());
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_envcallee() {
-  uint8_t numHops = GET_UINT8(pc);
-  MDefinition* env = walkEnvironmentChain(numHops);
-  MInstruction* callee =
-      MLoadFixedSlot::New(alloc(), env, CallObject::calleeSlot());
-  current->add(callee);
-  current->push(callee);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_superbase() {
-  MDefinition* callee = current->pop();
-
-  auto* homeObject = MHomeObject::New(alloc(), callee);
-  current->add(homeObject);
-
-  auto* superBase = MHomeObjectSuperBase::New(alloc(), homeObject);
-  current->add(superBase);
-  current->push(superBase);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getprop_super(PropertyName* name) {
-  MDefinition* obj = current->pop();
-  MDefinition* receiver = current->pop();
-
-  MConstant* id = constant(StringValue(name));
-  auto* ins = MGetPropSuperCache::New(alloc(), obj, receiver, id);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getelem_super() {
-  MDefinition* obj = current->pop();
-  MDefinition* id = current->pop();
-  MDefinition* receiver = current->pop();
-
-#if defined(JS_CODEGEN_X86)
-  if (mirGen_.instrumentedProfiling()) {
-    return abort(AbortReason::Disable,
-                 "profiling functions with GETELEM_SUPER is disabled on x86");
-  }
-#endif
-
-  auto* ins = MGetPropSuperCache::New(alloc(), obj, receiver, id);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(ins, types, BarrierKind::TypeSet);
-}
-
-NativeObject* IonBuilder::commonPrototypeWithGetterSetter(
-    TemporaryTypeSet* types, jsid id, bool isGetter, JSFunction* getterOrSetter,
-    bool* guardGlobal) {
-  // If there's a single object on the proto chain of all objects in |types|
-  // that contains a property |id| with |getterOrSetter| getter or setter
-  // function, return that object.
-
-  // No sense looking if we don't know what's going on.
-  if (!types || types->unknownObject()) {
-    return nullptr;
-  }
-  *guardGlobal = false;
-
-  NativeObject* foundProto = nullptr;
-  for (unsigned i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    while (key) {
-      if (key->unknownProperties()) {
-        return nullptr;
-      }
-
-      const JSClass* clasp = key->clasp();
-      if (!ClassHasEffectlessLookup(clasp)) {
-        return nullptr;
-      }
-      JSObject* singleton = key->isSingleton() ? key->singleton() : nullptr;
-      if (ObjectHasExtraOwnProperty(realm, key, id)) {
-        if (!singleton || !singleton->is<GlobalObject>()) {
-          return nullptr;
-        }
-        *guardGlobal = true;
-      }
-
-      // Look for a getter/setter on the class itself which may need
-      // to be called.
-      if (isGetter && clasp->getOpsGetProperty()) {
-        return nullptr;
-      }
-      if (!isGetter && clasp->getOpsSetProperty()) {
-        return nullptr;
-      }
-
-      // If we have a singleton, check if it contains the getter or
-      // setter we're looking for. Note that we don't need to add any
-      // type constraints as the caller will add a Shape guard for the
-      // holder and type constraints for other objects on the proto
-      // chain.
-      //
-      // If the object is not a singleton, we fall back to the code below
-      // and check whether the property is missing. That's fine because
-      // we're looking for a getter or setter on the proto chain and
-      // these objects are singletons.
-      if (singleton) {
-        if (!singleton->is<NativeObject>()) {
-          return nullptr;
-        }
-
-        NativeObject* singletonNative = &singleton->as<NativeObject>();
-        if (Shape* propShape = singletonNative->lookupPure(id)) {
-          // We found a property. Check if it's the getter or setter
-          // we're looking for.
-          Value getterSetterVal = ObjectValue(*getterOrSetter);
-          if (isGetter) {
-            if (propShape->getterOrUndefined() != getterSetterVal) {
-              return nullptr;
-            }
-          } else {
-            if (propShape->setterOrUndefined() != getterSetterVal) {
-              return nullptr;
-            }
-          }
-
-          if (!foundProto) {
-            foundProto = singletonNative;
-          } else if (foundProto != singletonNative) {
-            return nullptr;
-          }
-          break;
-        }
-      }
-
-      // Test for isOwnProperty() without freezing. If we end up
-      // optimizing, freezePropertiesForCommonPropFunc will freeze the
-      // property type sets later on.
-      HeapTypeSetKey property = key->property(id);
-      if (TypeSet* types = property.maybeTypes()) {
-        if (!types->empty() || types->nonDataProperty()) {
-          return nullptr;
-        }
-      }
-      if (singleton) {
-        if (CanHaveEmptyPropertyTypesForOwnProperty(singleton)) {
-          MOZ_ASSERT(singleton->is<GlobalObject>());
-          *guardGlobal = true;
-        }
-      }
-
-      JSObject* proto = checkNurseryObject(key->proto().toObjectOrNull());
-      if (foundProto && proto == foundProto) {
-        // We found an object on the proto chain that's known to have
-        // the getter or setter property, so we can stop looking.
-        break;
-      }
-
-      if (!proto) {
-        // The getter or setter being searched for did not show up on
-        // the object's prototype chain.
-        return nullptr;
-      }
-      key = TypeSet::ObjectKey::get(proto);
-    }
-  }
-
-  return foundProto;
-}
-
-AbortReasonOr<Ok> IonBuilder::freezePropertiesForCommonPrototype(
-    TemporaryTypeSet* types, jsid id, JSObject* foundProto,
-    bool allowEmptyTypesforGlobal) {
-  for (unsigned i = 0; i < types->getObjectCount(); i++) {
-    // If we found a Singleton object's own-property, there's nothing to
-    // freeze.
-    if (types->getSingleton(i) == foundProto) {
-      continue;
-    }
-
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    while (true) {
-      if (!alloc().ensureBallast()) {
-        return abort(AbortReason::Alloc);
-      }
-
-      HeapTypeSetKey property = key->property(id);
-      MOZ_ALWAYS_TRUE(
-          !property.isOwnProperty(constraints(), allowEmptyTypesforGlobal));
-
-      // Don't mark the proto. It will be held down by the shape
-      // guard. This allows us to use properties found on prototypes
-      // with properties unknown to TI.
-      if (key->proto() == TaggedProto(foundProto)) {
-        break;
-      }
-      key = TypeSet::ObjectKey::get(key->proto().toObjectOrNull());
-    }
-  }
-  return Ok();
-}
-
-AbortReasonOr<bool> IonBuilder::testCommonGetterSetter(
-    TemporaryTypeSet* types, jsid id, bool isGetter, JSFunction* getterOrSetter,
-    MDefinition** guard, Shape* globalShape /* = nullptr*/,
-    MDefinition** globalGuard /* = nullptr */) {
-  MOZ_ASSERT(getterOrSetter);
-  MOZ_ASSERT_IF(globalShape, globalGuard);
-  bool guardGlobal;
-
-  // Check if all objects being accessed will lookup the name through
-  // foundProto.
-  NativeObject* foundProto = commonPrototypeWithGetterSetter(
-      types, id, isGetter, getterOrSetter, &guardGlobal);
-  if (!foundProto || (guardGlobal && !globalShape)) {
-    return false;
-  }
-
-  // We can optimize the getter/setter, so freeze all involved properties to
-  // ensure there isn't a lower shadowing getter or setter installed in the
-  // future.
-  MOZ_TRY(
-      freezePropertiesForCommonPrototype(types, id, foundProto, guardGlobal));
-
-  // Add a shape guard on the prototype we found the property on. The rest of
-  // the prototype chain is guarded by TI freezes, except when name is a global
-  // name. In this case, we also have to guard on the globals shape to be able
-  // to optimize, because the way global property sets are handled means
-  // freezing doesn't work for what we want here. Note that a shape guard is
-  // good enough here, even in the proxy case, because we have ensured there
-  // are no lookup hooks for this property.
-  if (guardGlobal) {
-    JSObject* obj = &script()->global();
-    MDefinition* globalObj = constant(ObjectValue(*obj));
-    *globalGuard = addShapeGuard(globalObj, globalShape);
-  }
-
-  // If the getter/setter is not configurable we don't have to guard on the
-  // proto's shape.
-  Shape* propShape = foundProto->lookupPure(id);
-  MOZ_ASSERT_IF(isGetter, propShape->getterObject() == getterOrSetter);
-  MOZ_ASSERT_IF(!isGetter, propShape->setterObject() == getterOrSetter);
-  if (propShape && !propShape->configurable()) {
-    return true;
-  }
-
-  MInstruction* wrapper = constant(ObjectValue(*foundProto));
-  *guard = addShapeGuard(wrapper, foundProto->lastProperty());
-  return true;
-}
-
-void IonBuilder::replaceMaybeFallbackFunctionGetter(MGetPropertyCache* cache) {
-  // Discard the last prior resume point of the previous MGetPropertyCache.
-  WrapMGetPropertyCache rai(maybeFallbackFunctionGetter_);
-  maybeFallbackFunctionGetter_ = cache;
-}
-
-AbortReasonOr<Ok> IonBuilder::annotateGetPropertyCache(
-    MDefinition* obj, PropertyName* name, MGetPropertyCache* getPropCache,
-    TemporaryTypeSet* objTypes, TemporaryTypeSet* pushedTypes) {
-  // Ensure every pushed value is a singleton.
-  if (pushedTypes->unknownObject() || pushedTypes->baseFlags() != 0) {
-    return Ok();
-  }
-
-  for (unsigned i = 0; i < pushedTypes->getObjectCount(); i++) {
-    if (pushedTypes->getGroup(i) != nullptr) {
-      return Ok();
-    }
-  }
-
-  // Object's typeset should be a proper object
-  if (!objTypes || objTypes->baseFlags() || objTypes->unknownObject()) {
-    return Ok();
-  }
-
-  unsigned int objCount = objTypes->getObjectCount();
-  if (objCount == 0) {
-    return Ok();
-  }
-
-  InlinePropertyTable* inlinePropTable =
-      getPropCache->initInlinePropertyTable(alloc(), pc);
-  if (!inlinePropTable) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Ensure that the relevant property typeset for each group is
-  // is a single-object typeset containing a JSFunction
-  for (unsigned int i = 0; i < objCount; i++) {
-    ObjectGroup* group = objTypes->getGroup(i);
-    if (!group) {
-      continue;
-    }
-    TypeSet::ObjectKey* key = TypeSet::ObjectKey::get(group);
-    if (key->unknownProperties() || !key->proto().isObject()) {
-      continue;
-    }
-    JSObject* proto = checkNurseryObject(key->proto().toObject());
-
-    const JSClass* clasp = key->clasp();
-    if (!ClassHasEffectlessLookup(clasp) ||
-        ObjectHasExtraOwnProperty(realm, key, NameToId(name))) {
-      continue;
-    }
-
-    HeapTypeSetKey ownTypes = key->property(NameToId(name));
-    if (ownTypes.isOwnProperty(constraints())) {
-      continue;
-    }
-
-    JSObject* singleton = testSingletonProperty(proto, NameToId(name));
-    if (!singleton || !singleton->is<JSFunction>()) {
-      continue;
-    }
-
-    // Don't add cases corresponding to non-observed pushes
-    if (!pushedTypes->hasType(TypeSet::ObjectType(singleton))) {
-      continue;
-    }
-
-    if (!inlinePropTable->addEntry(alloc(), group,
-                                   &singleton->as<JSFunction>())) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  if (inlinePropTable->numEntries() == 0) {
-    getPropCache->clearInlinePropertyTable();
-    return Ok();
-  }
-
-#ifdef JS_JITSPEW
-  if (inlinePropTable->numEntries() > 0) {
-    JitSpew(JitSpew_Inlining,
-            "Annotated GetPropertyCache with %d/%d inline cases",
-            (int)inlinePropTable->numEntries(), (int)objCount);
-  }
-#endif
-
-  // If we successfully annotated the GetPropertyCache and there are inline
-  // cases, then keep a resume point of the state right before this instruction
-  // for use later when we have to bail out to this point in the fallback case
-  // of a PolyInlineDispatch.
-  if (inlinePropTable->numEntries() > 0) {
-    // Push the object back onto the stack temporarily to capture the resume
-    // point.
-    current->push(obj);
-    MResumePoint* resumePoint =
-        MResumePoint::New(alloc(), current, pc, MResumePoint::ResumeAt);
-    if (!resumePoint) {
-      return abort(AbortReason::Alloc);
-    }
-    inlinePropTable->setPriorResumePoint(resumePoint);
-    replaceMaybeFallbackFunctionGetter(getPropCache);
-    current->pop();
-  }
-  return Ok();
-}
-
-// Returns true if an idempotent cache has ever invalidated this script
-// or an outer script.
-bool IonBuilder::invalidatedIdempotentCache() {
-  IonBuilder* builder = this;
-  do {
-    if (builder->script()->invalidatedIdempotentCache()) {
-      return true;
-    }
-    builder = builder->callerBuilder_;
-  } while (builder);
-
-  return false;
-}
-
-AbortReasonOr<Ok> IonBuilder::loadSlot(MDefinition* obj, size_t slot,
-                                       size_t nfixed, MIRType rvalType,
-                                       BarrierKind barrier,
-                                       TemporaryTypeSet* types) {
-  if (slot < nfixed) {
-    MLoadFixedSlot* load = MLoadFixedSlot::New(alloc(), obj, slot);
-    current->add(load);
-    current->push(load);
-
-    load->setResultType(rvalType);
-    return pushTypeBarrier(load, types, barrier);
-  }
-
-  MSlots* slots = MSlots::New(alloc(), obj);
-  current->add(slots);
-
-  MLoadDynamicSlot* load = MLoadDynamicSlot::New(alloc(), slots, slot - nfixed);
-  current->add(load);
-  current->push(load);
-
-  load->setResultType(rvalType);
-  return pushTypeBarrier(load, types, barrier);
-}
-
-AbortReasonOr<Ok> IonBuilder::loadSlot(MDefinition* obj, Shape* shape,
-                                       MIRType rvalType, BarrierKind barrier,
-                                       TemporaryTypeSet* types) {
-  return loadSlot(obj, shape->slot(), shape->numFixedSlots(), rvalType, barrier,
-                  types);
-}
-
-AbortReasonOr<Ok> IonBuilder::storeSlot(
-    MDefinition* obj, size_t slot, size_t nfixed, MDefinition* value,
-    bool needsBarrier, MIRType slotType /* = MIRType::None */) {
-  if (slot < nfixed) {
-    MStoreFixedSlot* store = MStoreFixedSlot::New(alloc(), obj, slot, value);
-    current->add(store);
-    current->push(value);
-    if (needsBarrier) {
-      store->setNeedsBarrier();
-    }
-    return resumeAfter(store);
-  }
-
-  MSlots* slots = MSlots::New(alloc(), obj);
-  current->add(slots);
-
-  MStoreDynamicSlot* store =
-      MStoreDynamicSlot::New(alloc(), slots, slot - nfixed, value);
-  current->add(store);
-  current->push(value);
-  if (needsBarrier) {
-    store->setNeedsBarrier();
-  }
-  if (slotType != MIRType::None) {
-    store->setSlotType(slotType);
-  }
-  return resumeAfter(store);
-}
-
-AbortReasonOr<Ok> IonBuilder::storeSlot(
-    MDefinition* obj, Shape* shape, MDefinition* value, bool needsBarrier,
-    MIRType slotType /* = MIRType::None */) {
-  MOZ_ASSERT(shape->writable());
-  return storeSlot(obj, shape->slot(), shape->numFixedSlots(), value,
-                   needsBarrier, slotType);
-}
-
-bool IonBuilder::shouldAbortOnPreliminaryGroups(MDefinition* obj) {
-  // Watch for groups which still have preliminary object information and
-  // have not had the new script properties or unboxed layout analyses
-  // performed. Normally this is done after a small number of the objects
-  // have been created, but if only a few have been created we can still
-  // perform the analysis with a smaller object population. The analysis can
-  // have side effects so we will end up aborting compilation after building
-  // finishes and retrying later.
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return false;
-  }
-
-  bool preliminary = false;
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (ObjectGroup* group = key->maybeGroup()) {
-      if (group->hasUnanalyzedPreliminaryObjects()) {
-        addAbortedPreliminaryGroup(group);
-        preliminary = true;
-      }
-    }
-  }
-
-  return preliminary;
-}
-
-MDefinition* IonBuilder::maybeUnboxForPropertyAccess(MDefinition* def) {
-  if (def->type() != MIRType::Value) {
-    return def;
-  }
-
-  MIRType type = inspector->expectedPropertyAccessInputType(pc);
-  if (type == MIRType::Value || !def->mightBeType(type)) {
-    return def;
-  }
-
-  MUnbox* unbox = MUnbox::New(alloc(), def, type, MUnbox::Fallible);
-  current->add(unbox);
-
-  // Fixup type information for a common case where a property call
-  // is converted to the following bytecodes
-  //
-  //      a.foo()
-  // ================= Compiles to ================
-  //      GetLocal "a" (or similar)
-  //      Dup
-  //      CallProp "foo"
-  //      Swap
-  //      Call 0
-  //
-  // If we have better type information to unbox the first copy going into
-  // the CallProp operation, we can replace the duplicated copy on the
-  // stack as well.
-  if (JSOp(*pc) == JSOp::CallProp || JSOp(*pc) == JSOp::CallElem) {
-    uint32_t idx = current->stackDepth() - 1;
-    MOZ_ASSERT(current->getSlot(idx) == def);
-    current->setSlot(idx, unbox);
-  }
-
-  return unbox;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getprop(PropertyName* name) {
-  bool emitted = false;
-
-  MDefinition* obj = current->pop();
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-
-  if (!info().isAnalysis()) {
-    // The calls below can abort compilation, so we only try this if we're
-    // not analyzing.
-    // Try to optimize arguments.length.
-    MOZ_TRY(getPropTryArgumentsLength(&emitted, obj));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to optimize arguments.callee.
-    MOZ_TRY(getPropTryArgumentsCallee(&emitted, obj, name));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  obj = maybeUnboxForPropertyAccess(obj);
-
-  BarrierKind barrier = PropertyReadNeedsTypeBarrier(
-      analysisContext, alloc(), constraints(), obj, name, types);
-
-  // Try to optimize to a specific constant.
-  if (barrier == BarrierKind::NoBarrier) {
-    MOZ_TRY(getPropTryInferredConstant(&emitted, obj, name, types));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  // Always use a call if we are performing analysis and
-  // not actually emitting code, to simplify later analysis. Also skip deeper
-  // analysis if there are no known types for this operation, as it will
-  // always invalidate when executing.
-  if (info().isAnalysis() || types->empty() ||
-      shouldAbortOnPreliminaryGroups(obj)) {
-    MCallGetProperty* call = MCallGetProperty::New(alloc(), obj, name);
-    current->add(call);
-
-    // During the definite properties analysis we can still try to bake in
-    // constants read off the prototype chain, to allow inlining later on.
-    // In this case we still need the getprop call so that the later
-    // analysis knows when the |this| value has been read from.
-    if (info().isAnalysis()) {
-      MOZ_TRY(getPropTryConstant(&emitted, obj, NameToId(name), types));
-      if (emitted) {
-        return Ok();
-      }
-    }
-
-    current->push(call);
-    MOZ_TRY(resumeAfter(call));
-    return pushTypeBarrier(call, types, BarrierKind::TypeSet);
-  }
-
-  // Try to optimize accesses on outer window proxies, for example window.foo.
-  // This needs to come before the various strategies getPropTryInnerize tries
-  // internally, since some of those strategies will "succeed" in silly ways
-  // even for an outer object.
-  MOZ_TRY(getPropTryInnerize(&emitted, obj, name, types));
-  if (emitted) {
-    return Ok();
-  }
-
-  if (!forceInlineCaches()) {
-    // Try to hardcode known constants.
-    MOZ_TRY(getPropTryConstant(&emitted, obj, NameToId(name), types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to hardcode known not-defined
-    MOZ_TRY(getPropTryNotDefined(&emitted, obj, NameToId(name), types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to emit loads from definite slots.
-    MOZ_TRY(getPropTryDefiniteSlot(&emitted, obj, name, barrier, types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to inline a common property getter, or make a call.
-    MOZ_TRY(getPropTryCommonGetter(&emitted, obj, NameToId(name), types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to emit a monomorphic/polymorphic access based on baseline caches.
-    MOZ_TRY(getPropTryInlineAccess(&emitted, obj, name, barrier, types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to emit a property access on the prototype based on baseline
-    // caches.
-    MOZ_TRY(getPropTryInlineProtoAccess(&emitted, obj, name, types));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to emit loads from a module namespace.
-    MOZ_TRY(getPropTryModuleNamespace(&emitted, obj, name, barrier, types));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  // Emit a polymorphic cache.
-  return getPropAddCache(obj, name, barrier, types);
-}
-
-AbortReasonOr<Ok> IonBuilder::improveThisTypesForCall() {
-  // After a CallProp (or CallElem) for obj.prop(), the this-value and callee
-  // for the call are on top of the stack:
-  //
-  // ... [this: obj], [callee: obj.prop]
-  //
-  // If obj is null or undefined, obj.prop would have thrown an exception so
-  // at this point we can remove null and undefined from obj's TypeSet, to
-  // improve type information for the call that will follow.
-
-  MOZ_ASSERT(JSOp(*pc) == JSOp::CallProp || JSOp(*pc) == JSOp::CallElem);
-
-  // Ensure |this| has types {object, null/undefined}. For simplicity don't
-  // optimize if the callee is a Phi (this can happen in rare cases after
-  // inlining a scripted getter).
-  MDefinition* thisDef = current->peek(-2);
-  MDefinition* calleeDef = current->peek(-1);
-  if (thisDef->type() != MIRType::Value ||
-      !thisDef->mightBeType(MIRType::Object) || !thisDef->resultTypeSet() ||
-      !thisDef->resultTypeSet()->objectOrSentinel() || calleeDef->isPhi()) {
-    return Ok();
-  }
-
-  // Remove null/undefined from the TypeSet.
-  TemporaryTypeSet* types =
-      thisDef->resultTypeSet()->cloneObjectsOnly(alloc_->lifoAlloc());
-  if (!types) {
-    return abort(AbortReason::Alloc);
-  }
-
-  MFilterTypeSet* filter = MFilterTypeSet::New(alloc(), thisDef, types);
-  current->add(filter);
-  current->rewriteAtDepth(-2, filter);
-
-  // FilterTypeSetPolicy::adjustInputs will insert an infallible Unbox(Object)
-  // for the input. Don't hoist this unbox above the getprop or getelem
-  // operation.
-  filter->setDependency(calleeDef);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::checkIsDefinitelyOptimizedArguments(
-    MDefinition* obj, bool* isOptimizedArgs) {
-  if (obj->type() != MIRType::MagicOptimizedArguments) {
-    if (script()->argumentsHasVarBinding() &&
-        obj->mightBeType(MIRType::MagicOptimizedArguments)) {
-      return abort(AbortReason::Disable,
-                   "Type is not definitely lazy arguments.");
-    }
-
-    *isOptimizedArgs = false;
-    return Ok();
-  }
-
-  *isOptimizedArgs = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryInferredConstant(
-    bool* emitted, MDefinition* obj, PropertyName* name,
-    TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  // Need a result typeset to optimize.
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-  if (!objTypes) {
-    return Ok();
-  }
-
-  JSObject* singleton = objTypes->maybeSingleton();
-  if (!singleton) {
-    return Ok();
-  }
-
-  TypeSet::ObjectKey* key = TypeSet::ObjectKey::get(singleton);
-  if (key->unknownProperties()) {
-    return Ok();
-  }
-
-  HeapTypeSetKey property = key->property(NameToId(name));
-
-  Value constantValue = UndefinedValue();
-  if (property.constant(constraints(), &constantValue)) {
-    spew("Optimized constant property");
-    obj->setImplicitlyUsedUnchecked();
-    pushConstant(constantValue);
-    types->addType(TypeSet::GetValueType(constantValue), alloc_->lifoAlloc());
-    *emitted = true;
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryArgumentsLength(bool* emitted,
-                                                        MDefinition* obj) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (JSOp(*pc) != JSOp::Length) {
-    return Ok();
-  }
-
-  bool isOptimizedArgs = false;
-  MOZ_TRY(checkIsDefinitelyOptimizedArguments(obj, &isOptimizedArgs));
-  if (!isOptimizedArgs) {
-    return Ok();
-  }
-
-  *emitted = true;
-
-  obj->setImplicitlyUsedUnchecked();
-
-  // We don't know anything from the callee
-  if (inliningDepth_ == 0) {
-    MInstruction* ins = MArgumentsLength::New(alloc());
-    current->add(ins);
-    current->push(ins);
-    return Ok();
-  }
-
-  // We are inlining and know the number of arguments the callee pushed
-  pushConstant(Int32Value(inlineCallInfo_->argv().length()));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryArgumentsCallee(bool* emitted,
-                                                        MDefinition* obj,
-                                                        PropertyName* name) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (name != names().callee) {
-    return Ok();
-  }
-
-  bool isOptimizedArgs = false;
-  MOZ_TRY(checkIsDefinitelyOptimizedArguments(obj, &isOptimizedArgs));
-  if (!isOptimizedArgs) {
-    return Ok();
-  }
-
-  MOZ_ASSERT(script()->hasMappedArgsObj());
-
-  obj->setImplicitlyUsedUnchecked();
-  current->push(getCallee());
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryConstant(bool* emitted,
-                                                 MDefinition* obj, jsid id,
-                                                 TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!types->mightBeMIRType(MIRType::Object)) {
-    // If we have not observed an object result here, don't look for a
-    // singleton constant.
-    return Ok();
-  }
-
-  JSObject* singleton = testSingletonPropertyTypes(obj, id);
-  if (!singleton) {
-    return Ok();
-  }
-
-  // Property access is a known constant -- safe to emit.
-  obj->setImplicitlyUsedUnchecked();
-
-  pushConstant(ObjectValue(*singleton));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryNotDefined(bool* emitted,
-                                                   MDefinition* obj, jsid id,
-                                                   TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (!types->mightBeMIRType(MIRType::Undefined)) {
-    // Only optimize if we expect this property access to return undefined.
-    return Ok();
-  }
-
-  bool res;
-  MOZ_TRY_VAR(res, testNotDefinedProperty(obj, id));
-  if (!res) {
-    return Ok();
-  }
-
-  obj->setImplicitlyUsedUnchecked();
-  pushConstant(UndefinedValue());
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryDefiniteSlot(bool* emitted,
-                                                     MDefinition* obj,
-                                                     PropertyName* name,
-                                                     BarrierKind barrier,
-                                                     TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  uint32_t nfixed;
-  uint32_t slot =
-      getDefiniteSlot(obj->resultTypeSet(), NameToId(name), &nfixed);
-  if (slot == UINT32_MAX) {
-    return Ok();
-  }
-
-  if (obj->type() != MIRType::Object) {
-    MGuardObject* guard = MGuardObject::New(alloc(), obj);
-    current->add(guard);
-    obj = guard;
-  }
-
-  MInstruction* load;
-  if (slot < nfixed) {
-    load = MLoadFixedSlot::New(alloc(), obj, slot);
-  } else {
-    MInstruction* slots = MSlots::New(alloc(), obj);
-    current->add(slots);
-
-    load = MLoadDynamicSlot::New(alloc(), slots, slot - nfixed);
-  }
-
-  if (barrier == BarrierKind::NoBarrier) {
-    load->setResultType(types->getKnownMIRType());
-  }
-
-  current->add(load);
-  current->push(load);
-
-  MOZ_TRY(pushTypeBarrier(load, types, barrier));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryModuleNamespace(
-    bool* emitted, MDefinition* obj, PropertyName* name, BarrierKind barrier,
-    TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-  if (!objTypes) {
-    return Ok();
-  }
-
-  JSObject* singleton = objTypes->maybeSingleton();
-  if (!singleton) {
-    return Ok();
-  }
-
-  if (!singleton->is<ModuleNamespaceObject>()) {
-    return Ok();
-  }
-
-  ModuleNamespaceObject* ns = &singleton->as<ModuleNamespaceObject>();
-  ModuleEnvironmentObject* env;
-  Shape* shape;
-  if (!ns->bindings().lookup(NameToId(name), &env, &shape)) {
-    return Ok();
-  }
-
-  obj->setImplicitlyUsedUnchecked();
-  MConstant* envConst = constant(ObjectValue(*env));
-  uint32_t slot = shape->slot();
-  uint32_t nfixed = env->numFixedSlots();
-
-  MIRType rvalType = types->getKnownMIRType();
-  if (barrier != BarrierKind::NoBarrier || IsNullOrUndefined(rvalType)) {
-    rvalType = MIRType::Value;
-  }
-
-  MOZ_TRY(loadSlot(envConst, slot, nfixed, rvalType, barrier, types));
-
-  *emitted = true;
-  return Ok();
-}
-
-MDefinition* IonBuilder::addShapeGuardsForGetterSetter(
-    MDefinition* obj, JSObject* holder, Shape* holderShape,
-    const BaselineInspector::ReceiverVector& receivers, bool isOwnProperty) {
-  MOZ_ASSERT(isOwnProperty == !holder);
-  MOZ_ASSERT(holderShape);
-
-  if (isOwnProperty) {
-    MOZ_ASSERT(receivers.empty());
-    return addShapeGuard(obj, holderShape);
-  }
-
-  MDefinition* holderDef = constant(ObjectValue(*holder));
-  addShapeGuard(holderDef, holderShape);
-
-  return addGuardReceiverPolymorphic(obj, receivers);
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryCommonGetter(bool* emitted,
-                                                     MDefinition* obj, jsid id,
-                                                     TemporaryTypeSet* types,
-                                                     bool innerized) {
-  MOZ_ASSERT(*emitted == false);
-
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-
-  JSFunction* commonGetter = nullptr;
-  MDefinition* guard = nullptr;
-  MDefinition* globalGuard = nullptr;
-
-  {
-    Shape* lastProperty = nullptr;
-    Shape* globalShape = nullptr;
-    JSObject* foundProto = nullptr;
-    bool isOwnProperty = false;
-    BaselineInspector::ReceiverVector receivers(alloc());
-    if (inspector->commonGetPropFunction(
-            pc, id, innerized, &foundProto, &lastProperty, &commonGetter,
-            &globalShape, &isOwnProperty, receivers)) {
-      bool canUseTIForGetter = false;
-      if (!isOwnProperty) {
-        // If it's not an own property, try to use TI to avoid shape guards.
-        // For own properties we use the path below.
-        MOZ_TRY_VAR(canUseTIForGetter,
-                    testCommonGetterSetter(objTypes, id,
-                                           /* isGetter = */ true, commonGetter,
-                                           &guard, globalShape, &globalGuard));
-      }
-      if (!canUseTIForGetter) {
-        // If it's an own property or type information is bad, we can still
-        // optimize the getter if we shape guard.
-        obj = addShapeGuardsForGetterSetter(obj, foundProto, lastProperty,
-                                            receivers, isOwnProperty);
-        if (!obj) {
-          return abort(AbortReason::Alloc);
-        }
-      }
-    } else if (inspector->megamorphicGetterSetterFunction(
-                   pc, id, /* isGetter = */ true, &commonGetter)) {
-      // Try to use TI to guard on this getter.
-      bool canUseTIForGetter = false;
-      MOZ_TRY_VAR(canUseTIForGetter,
-                  testCommonGetterSetter(objTypes, id, /* isGetter = */ true,
-                                         commonGetter, &guard));
-      if (!canUseTIForGetter) {
-        return Ok();
-      }
-    } else {
-      // The Baseline IC didn't have any information we can use.
-      return Ok();
-    }
-  }
-
-  DOMObjectKind objKind = DOMObjectKind::Unknown;
-  bool isDOM = objTypes && objTypes->isDOMClass(constraints(), &objKind);
-  if (isDOM) {
-    MOZ_TRY_VAR(isDOM,
-                testShouldDOMCall(objTypes, commonGetter, JSJitInfo::Getter));
-  }
-
-  if (isDOM) {
-    const JSJitInfo* jitinfo = commonGetter->jitInfo();
-    // We don't support MGetDOMProperty/MGetDOMMember on things that might
-    // be proxies when the value might be in a slot, because the
-    // CodeGenerator code for LGetDOMProperty/LGetDOMMember doesn't handle
-    // that case correctly.
-    if (objKind == DOMObjectKind::Native ||
-        (!jitinfo->isAlwaysInSlot && !jitinfo->isLazilyCachedInSlot)) {
-      MInstruction* get;
-      if (jitinfo->isAlwaysInSlot) {
-        // If our object is a singleton and we know the property is
-        // constant (which is true if and only if the get doesn't alias
-        // anything), we can just read the slot here and use that
-        // constant.
-        JSObject* singleton = objTypes->maybeSingleton();
-        if (singleton && jitinfo->aliasSet() == JSJitInfo::AliasNone) {
-          size_t slot = jitinfo->slotIndex;
-          *emitted = true;
-          pushConstant(JS::GetReservedSlot(singleton, slot));
-          return Ok();
-        }
-
-        // We can't use MLoadFixedSlot here because it might not have
-        // the right aliasing behavior; we want to alias DOM setters as
-        // needed.
-        get = MGetDOMMember::New(alloc(), jitinfo, obj, guard, globalGuard);
-      } else {
-        get = MGetDOMProperty::New(alloc(), jitinfo, objKind,
-                                   commonGetter->realm(), obj, guard,
-                                   globalGuard);
-      }
-      if (!get) {
-        return abort(AbortReason::Alloc);
-      }
-      current->add(get);
-      current->push(get);
-
-      if (get->isEffectful()) {
-        MOZ_TRY(resumeAfter(get));
-      }
-
-      MOZ_TRY(pushDOMTypeBarrier(get, types, commonGetter));
-
-      *emitted = true;
-      return Ok();
-    }
-  }
-
-  // Don't call the getter with a primitive value.
-  if (obj->type() != MIRType::Object) {
-    MGuardObject* guardObj = MGuardObject::New(alloc(), obj);
-    current->add(guardObj);
-    obj = guardObj;
-  }
-
-  // Spoof stack to expected state for call.
-
-  // Make sure there's enough room
-  if (!current->ensureHasSlots(2)) {
-    return abort(AbortReason::Alloc);
-  }
-  current->push(constant(ObjectValue(*commonGetter)));
-
-  current->push(obj);
-
-  CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                    /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-  if (!callInfo.init(current, 0)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (commonGetter->isNative()) {
-    InliningStatus status;
-    MOZ_TRY_VAR(status, inlineNativeGetter(callInfo, commonGetter));
-    switch (status) {
-      case InliningStatus_WarmUpCountTooLow:
-      case InliningStatus_NotInlined:
-        break;
-      case InliningStatus_Inlined:
-        *emitted = true;
-        return Ok();
-    }
-  }
-
-  // Inline if we can, otherwise, forget it and just generate a call.
-  if (commonGetter->isInterpreted()) {
-    InliningDecision decision = makeInliningDecision(commonGetter, callInfo);
-    switch (decision) {
-      case InliningDecision_Error:
-        return abort(AbortReason::Error);
-      case InliningDecision_DontInline:
-      case InliningDecision_WarmUpCountTooLow:
-        break;
-      case InliningDecision_Inline: {
-        InliningStatus status;
-        MOZ_TRY_VAR(status, inlineScriptedCall(callInfo, commonGetter));
-        if (status == InliningStatus_Inlined) {
-          *emitted = true;
-          return Ok();
-        }
-        break;
-      }
-    }
-  }
-
-  MOZ_TRY(makeCall(commonGetter, callInfo));
-
-  *emitted = true;
-  return Ok();
-}
-
-bool IonBuilder::canInlinePropertyOpShapes(
-    const BaselineInspector::ReceiverVector& receivers) {
-  if (receivers.empty()) {
-    return false;
-  }
-
-  for (size_t i = 0; i < receivers.length(); i++) {
-    // We inline the property access as long as the shape is not in
-    // dictionary mode. We cannot be sure that the shape is still a
-    // lastProperty, and calling Shape::search() on dictionary mode
-    // shapes that aren't lastProperty is invalid.
-    if (receivers[i].getShape() && receivers[i].getShape()->inDictionary()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static Shape* PropertyShapesHaveSameSlot(
-    const BaselineInspector::ReceiverVector& receivers, jsid id) {
-  Shape* firstShape = nullptr;
-  for (size_t i = 0; i < receivers.length(); i++) {
-    if (receivers[i].getGroup()) {
-      return nullptr;
-    }
-
-    Shape* shape = receivers[i].getShape()->searchLinear(id);
-    MOZ_ASSERT(shape);
-
-    if (i == 0) {
-      firstShape = shape;
-    } else if (shape->slot() != firstShape->slot() ||
-               shape->numFixedSlots() != firstShape->numFixedSlots()) {
-      return nullptr;
-    }
-  }
-
-  return firstShape;
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryInlineAccess(bool* emitted,
-                                                     MDefinition* obj,
-                                                     PropertyName* name,
-                                                     BarrierKind barrier,
-                                                     TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  BaselineInspector::ReceiverVector receivers(alloc());
-  if (!inspector->maybeInfoForPropertyOp(pc, receivers)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (!canInlinePropertyOpShapes(receivers)) {
-    return Ok();
-  }
-
-  MIRType rvalType = types->getKnownMIRType();
-  if (barrier != BarrierKind::NoBarrier || IsNullOrUndefined(rvalType)) {
-    rvalType = MIRType::Value;
-  }
-
-  if (receivers.length() == 1) {
-    if (!receivers[0].getGroup()) {
-      // Monomorphic load from a native object.
-      spew("Inlining monomorphic native GETPROP");
-
-      obj = addShapeGuard(obj, receivers[0].getShape());
-
-      Shape* shape = receivers[0].getShape()->searchLinear(NameToId(name));
-      MOZ_ASSERT(shape);
-
-      MOZ_TRY(loadSlot(obj, shape, rvalType, barrier, types));
-
-      *emitted = true;
-      return Ok();
-    }
-
-    return Ok();
-  }
-
-  MOZ_ASSERT(receivers.length() > 1);
-  spew("Inlining polymorphic GETPROP");
-
-  if (Shape* propShape =
-          PropertyShapesHaveSameSlot(receivers, NameToId(name))) {
-    obj = addGuardReceiverPolymorphic(obj, receivers);
-    if (!obj) {
-      return abort(AbortReason::Alloc);
-    }
-
-    MOZ_TRY(loadSlot(obj, propShape, rvalType, barrier, types));
-
-    *emitted = true;
-    return Ok();
-  }
-
-  MGetPropertyPolymorphic* load =
-      MGetPropertyPolymorphic::New(alloc(), obj, name);
-  current->add(load);
-  current->push(load);
-
-  for (size_t i = 0; i < receivers.length(); i++) {
-    Shape* propShape = nullptr;
-    if (receivers[i].getShape()) {
-      propShape = receivers[i].getShape()->searchLinear(NameToId(name));
-      MOZ_ASSERT(propShape);
-    }
-    if (!load->addReceiver(receivers[i], propShape)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  if (failedShapeGuard_) {
-    load->setNotMovable();
-  }
-
-  load->setResultType(rvalType);
-  MOZ_TRY(pushTypeBarrier(load, types, barrier));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryInlineProtoAccess(
-    bool* emitted, MDefinition* obj, PropertyName* name,
-    TemporaryTypeSet* types) {
-  MOZ_ASSERT(*emitted == false);
-
-  BaselineInspector::ReceiverVector receivers(alloc());
-  JSObject* holder = nullptr;
-  if (!inspector->maybeInfoForProtoReadSlot(pc, receivers, &holder)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (!canInlinePropertyOpShapes(receivers)) {
-    return Ok();
-  }
-
-  MOZ_ASSERT(holder);
-  holder = checkNurseryObject(holder);
-
-  BarrierKind barrier;
-  MOZ_TRY_VAR(barrier,
-              PropertyReadOnPrototypeNeedsTypeBarrier(this, obj, name, types));
-
-  MIRType rvalType = types->getKnownMIRType();
-  if (barrier != BarrierKind::NoBarrier || IsNullOrUndefined(rvalType)) {
-    rvalType = MIRType::Value;
-  }
-
-  // Guard on the receiver shapes/groups.
-  obj = addGuardReceiverPolymorphic(obj, receivers);
-  if (!obj) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Guard on the holder's shape.
-  MInstruction* holderDef = constant(ObjectValue(*holder));
-  Shape* holderShape = holder->as<NativeObject>().shape();
-  holderDef = addShapeGuard(holderDef, holderShape);
-
-  Shape* propShape = holderShape->searchLinear(NameToId(name));
-  MOZ_ASSERT(propShape);
-
-  MOZ_TRY(loadSlot(holderDef, propShape, rvalType, barrier, types));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropAddCache(MDefinition* obj,
-                                              PropertyName* name,
-                                              BarrierKind barrier,
-                                              TemporaryTypeSet* types) {
-  // PropertyReadNeedsTypeBarrier only accounts for object types, so for now
-  // always insert a barrier if the input is not known to be an object.
-  if (obj->type() != MIRType::Object) {
-    barrier = BarrierKind::TypeSet;
-  }
-
-  // Since getters have no guaranteed return values, we must barrier in order to
-  // be able to attach stubs for them.
-  if (inspector->hasSeenAccessedGetter(pc)) {
-    barrier = BarrierKind::TypeSet;
-  }
-
-  // Caches can read values from prototypes, so update the barrier to
-  // reflect such possible values.
-  if (barrier != BarrierKind::TypeSet) {
-    BarrierKind protoBarrier;
-    MOZ_TRY_VAR(protoBarrier, PropertyReadOnPrototypeNeedsTypeBarrier(
-                                  this, obj, name, types));
-    if (protoBarrier != BarrierKind::NoBarrier) {
-      MOZ_ASSERT(barrier <= protoBarrier);
-      barrier = protoBarrier;
-    }
-  }
-
-  // Ensure we insert a type barrier for reads from typed objects, as type
-  // information does not account for the initial undefined/null types.
-  if (barrier != BarrierKind::TypeSet && !types->unknown()) {
-    MOZ_ASSERT(obj->resultTypeSet());
-    switch (obj->resultTypeSet()->forAllClasses(constraints(),
-                                                IsTypedObjectClass)) {
-      case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-      case TemporaryTypeSet::ForAllResult::EMPTY:
-        break;
-      case TemporaryTypeSet::ForAllResult::ALL_TRUE:
-      case TemporaryTypeSet::ForAllResult::MIXED:
-        barrier = BarrierKind::TypeSet;
-        break;
-    }
-  }
-
-  MConstant* id = constant(StringValue(name));
-  MGetPropertyCache* load =
-      MGetPropertyCache::New(alloc(), obj, id, barrier == BarrierKind::TypeSet);
-
-  // Try to mark the cache as idempotent.
-  if (obj->type() == MIRType::Object && !invalidatedIdempotentCache()) {
-    if (PropertyReadIsIdempotent(constraints(), obj, name)) {
-      load->setIdempotent();
-    }
-  }
-
-  // When we are in the context of making a call from the value returned from
-  // a property, we query the typeObject for the given property name to fill
-  // the InlinePropertyTable of the GetPropertyCache.  This information is
-  // then used in inlineCallsite and inlineCalls, if the "this" definition is
-  // matching the "object" definition of the GetPropertyCache (see
-  // CanInlineGetPropertyCache).
-  //
-  // If this GetPropertyCache is idempotent, then we can dispatch to the right
-  // function only by checking the typed object, instead of querying the value
-  // of the property.  Thus this GetPropertyCache can be moved into the
-  // fallback path (see inlineObjectGroupFallback).  Otherwise, we always have
-  // to do the GetPropertyCache, and we can dispatch based on the JSFunction
-  // value.
-  if (JSOp(*pc) == JSOp::CallProp && load->idempotent()) {
-    MOZ_TRY(
-        annotateGetPropertyCache(obj, name, load, obj->resultTypeSet(), types));
-  }
-
-  current->add(load);
-  current->push(load);
-
-  if (load->isEffectful()) {
-    MOZ_TRY(resumeAfter(load));
-  }
-
-  MIRType rvalType = types->getKnownMIRType();
-  if (barrier != BarrierKind::NoBarrier) {
-    rvalType = MIRType::Value;
-  } else {
-    load->setResultTypeSet(types);
-    if (IsNullOrUndefined(rvalType)) {
-      rvalType = MIRType::Value;
-    }
-  }
-  load->setResultType(rvalType);
-
-  if (JSOp(*pc) != JSOp::CallProp || !IsNullOrUndefined(obj->type())) {
-    // Due to inlining, it's possible the observed TypeSet is non-empty,
-    // even though we know |obj| is null/undefined and the MCallGetProperty
-    // will throw. Don't push a TypeBarrier in this case, to avoid
-    // inlining the following (unreachable) JSOp::Call.
-    MOZ_TRY(pushTypeBarrier(load, types, barrier));
-  }
-
-  return Ok();
-}
-
-MDefinition* IonBuilder::tryInnerizeWindow(MDefinition* obj) {
-  // Try to optimize accesses on outer window proxies (window.foo, for
-  // example) to go directly to the inner window, the global.
-  //
-  // Callers should be careful not to pass the global object to getters or
-  // setters that require the WindowProxy.
-
-  if (obj->type() != MIRType::Object) {
-    return obj;
-  }
-
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (!types) {
-    return obj;
-  }
-
-  JSObject* singleton = types->maybeSingleton();
-  if (!singleton) {
-    return obj;
-  }
-
-  if (!IsWindowProxyForScriptGlobal(script(), singleton)) {
-    return obj;
-  }
-
-  // When we navigate, the WindowProxy is brain transplanted and we'll mark
-  // its ObjectGroup as having unknown properties. The type constraint we add
-  // here will invalidate JIT code when this happens.
-  TypeSet::ObjectKey* key = TypeSet::ObjectKey::get(singleton);
-  if (key->hasFlags(constraints(), OBJECT_FLAG_UNKNOWN_PROPERTIES)) {
-    return obj;
-  }
-
-  obj->setImplicitlyUsedUnchecked();
-  return constant(ObjectValue(script()->global()));
-}
-
-AbortReasonOr<Ok> IonBuilder::getPropTryInnerize(bool* emitted,
-                                                 MDefinition* obj,
-                                                 PropertyName* name,
-                                                 TemporaryTypeSet* types) {
-  // See the comment in tryInnerizeWindow for how this works.
-
-  // Note that it's important that we do this _before_ we'd try to
-  // do the optimizations below on obj normally, since some of those
-  // optimizations have fallback paths that are slower than the path
-  // we'd produce here.
-
-  MOZ_ASSERT(*emitted == false);
-
-  MDefinition* inner = tryInnerizeWindow(obj);
-  if (inner == obj) {
-    return Ok();
-  }
-
-  if (!forceInlineCaches()) {
-    MOZ_TRY(getPropTryConstant(emitted, inner, NameToId(name), types));
-    if (*emitted) {
-      return Ok();
-    }
-    MOZ_TRY(getStaticName(emitted, &script()->global(), name));
-    if (*emitted) {
-      return Ok();
-    }
-    MOZ_TRY(getPropTryCommonGetter(emitted, inner, NameToId(name), types,
-                                   /* innerized = */ true));
-    if (*emitted) {
-      return Ok();
-    }
-  }
-
-  // Passing the inner object to GetProperty IC is safe, see the
-  // needsOuterizedThisObject check in IsCacheableGetPropCallNative.
-  BarrierKind barrier = PropertyReadNeedsTypeBarrier(
-      analysisContext, alloc(), constraints(), inner, name, types);
-  MOZ_TRY(getPropAddCache(inner, name, barrier, types));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setprop(PropertyName* name) {
-  MDefinition* value = current->pop();
-  MDefinition* obj = current->pop();
-
-  bool emitted = false;
-
-  // Always use a call if we are doing the definite properties analysis and
-  // not actually emitting code, to simplify later analysis.
-  if (info().isAnalysis() || shouldAbortOnPreliminaryGroups(obj)) {
-    bool strict = IsStrictSetPC(pc);
-    MInstruction* ins =
-        MCallSetProperty::New(alloc(), obj, value, name, strict);
-    current->add(ins);
-    current->push(value);
-    return resumeAfter(ins);
-  }
-
-  if (!forceInlineCaches()) {
-    // Try to inline a common property setter, or make a call.
-    MOZ_TRY(setPropTryCommonSetter(&emitted, obj, name, value));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-  bool barrier = PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current,
-                                               &obj, name, &value,
-                                               /* canModify = */ true);
-
-  if (!forceInlineCaches()) {
-    // Try to emit store from definite slots.
-    MOZ_TRY(setPropTryDefiniteSlot(&emitted, obj, name, value, barrier));
-    if (emitted) {
-      return Ok();
-    }
-
-    // Try to emit a monomorphic/polymorphic store based on baseline caches.
-    MOZ_TRY(
-        setPropTryInlineAccess(&emitted, obj, name, value, barrier, objTypes));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  // Emit a polymorphic cache.
-  MOZ_TRY(setPropTryCache(&emitted, obj, name, value, barrier));
-  MOZ_ASSERT(emitted == true);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::setPropTryCommonSetter(bool* emitted,
-                                                     MDefinition* obj,
-                                                     PropertyName* name,
-                                                     MDefinition* value) {
-  MOZ_ASSERT(*emitted == false);
-
-  TemporaryTypeSet* objTypes = obj->resultTypeSet();
-  JSFunction* commonSetter = nullptr;
-  MDefinition* guard = nullptr;
-
-  {
-    Shape* lastProperty = nullptr;
-    JSObject* foundProto = nullptr;
-    bool isOwnProperty;
-    BaselineInspector::ReceiverVector receivers(alloc());
-    if (inspector->commonSetPropFunction(pc, &foundProto, &lastProperty,
-                                         &commonSetter, &isOwnProperty,
-                                         receivers)) {
-      bool canUseTIForSetter = false;
-      if (!isOwnProperty) {
-        // If it's not an own property, try to use TI to avoid shape guards.
-        // For own properties we use the path below.
-        MOZ_TRY_VAR(canUseTIForSetter,
-                    testCommonGetterSetter(objTypes, NameToId(name),
-                                           /* isGetter = */ false, commonSetter,
-                                           &guard));
-      }
-      if (!canUseTIForSetter) {
-        // If it's an own property or type information is bad, we can still
-        // optimize the setter if we shape guard.
-        obj = addShapeGuardsForGetterSetter(obj, foundProto, lastProperty,
-                                            receivers, isOwnProperty);
-        if (!obj) {
-          return abort(AbortReason::Alloc);
-        }
-      }
-    } else if (inspector->megamorphicGetterSetterFunction(
-                   pc, NameToId(name), /* isGetter = */ false, &commonSetter)) {
-      // Try to use TI to guard on this setter.
-      bool canUseTIForSetter = false;
-      MOZ_TRY_VAR(
-          canUseTIForSetter,
-          testCommonGetterSetter(objTypes, NameToId(name),
-                                 /* isGetter = */ false, commonSetter, &guard));
-      if (!canUseTIForSetter) {
-        return Ok();
-      }
-    } else {
-      // The Baseline IC didn't have any information we can use.
-      return Ok();
-    }
-  }
-
-  // Emit common setter.
-
-  // Setters can be called even if the property write needs a type
-  // barrier, as calling the setter does not actually write any data
-  // properties.
-
-  // Try emitting dom call.
-  MOZ_TRY(
-      setPropTryCommonDOMSetter(emitted, obj, value, commonSetter, objTypes));
-  if (*emitted) {
-    return Ok();
-  }
-
-  // Don't call the setter with a primitive value.
-  if (obj->type() != MIRType::Object) {
-    MGuardObject* guardObj = MGuardObject::New(alloc(), obj);
-    current->add(guardObj);
-    obj = guardObj;
-  }
-
-  // Dummy up the stack, as in getprop. We are pushing an extra value, so
-  // ensure there is enough space.
-  if (!current->ensureHasSlots(3)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  current->push(constant(ObjectValue(*commonSetter)));
-  current->push(obj);
-  current->push(value);
-
-  // Call the setter. Note that we have to push the original value, not
-  // the setter's return value.
-  CallInfo callInfo(alloc(), pc, /* constructing = */ false,
-                    /* ignoresReturnValue = */ BytecodeIsPopped(pc));
-  if (!callInfo.init(current, 1)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // Ensure that we know we are calling a setter in case we inline it.
-  callInfo.markAsSetter();
-
-  // Inline the setter if we can.
-  if (commonSetter->isInterpreted()) {
-    InliningDecision decision = makeInliningDecision(commonSetter, callInfo);
-    switch (decision) {
-      case InliningDecision_Error:
-        return abort(AbortReason::Error);
-      case InliningDecision_DontInline:
-      case InliningDecision_WarmUpCountTooLow:
-        break;
-      case InliningDecision_Inline: {
-        InliningStatus status;
-        MOZ_TRY_VAR(status, inlineScriptedCall(callInfo, commonSetter));
-        if (status == InliningStatus_Inlined) {
-          *emitted = true;
-          return Ok();
-        }
-      }
-    }
-  }
-
-  Maybe<CallTargets> targets;
-  targets.emplace(alloc());
-  if (!targets->append(commonSetter)) {
-    return abort(AbortReason::Alloc);
-  }
-  MCall* call;
-  MOZ_TRY_VAR(call, makeCallHelper(targets, callInfo));
-
-  current->push(value);
-  MOZ_TRY(resumeAfter(call));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::setPropTryCommonDOMSetter(
-    bool* emitted, MDefinition* obj, MDefinition* value, JSFunction* setter,
-    TemporaryTypeSet* objTypes) {
-  MOZ_ASSERT(*emitted == false);
-
-  DOMObjectKind objKind = DOMObjectKind::Unknown;
-  if (!objTypes || !objTypes->isDOMClass(constraints(), &objKind)) {
-    return Ok();
-  }
-
-  bool isDOM = false;
-  MOZ_TRY_VAR(isDOM, testShouldDOMCall(objTypes, setter, JSJitInfo::Setter));
-  if (!isDOM) {
-    return Ok();
-  }
-
-  // Emit SetDOMProperty.
-  MOZ_ASSERT(setter->jitInfo()->type() == JSJitInfo::Setter);
-  MSetDOMProperty* set = MSetDOMProperty::New(
-      alloc(), setter->jitInfo()->setter, objKind, setter->realm(), obj, value);
-
-  current->add(set);
-  current->push(value);
-
-  MOZ_TRY(resumeAfter(set));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::setPropTryDefiniteSlot(bool* emitted,
-                                                     MDefinition* obj,
-                                                     PropertyName* name,
-                                                     MDefinition* value,
-                                                     bool barrier) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (barrier) {
-    return Ok();
-  }
-
-  uint32_t nfixed;
-  uint32_t slot =
-      getDefiniteSlot(obj->resultTypeSet(), NameToId(name), &nfixed);
-  if (slot == UINT32_MAX) {
-    return Ok();
-  }
-
-  bool writeBarrier = false;
-  for (size_t i = 0; i < obj->resultTypeSet()->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = obj->resultTypeSet()->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    HeapTypeSetKey property = key->property(NameToId(name));
-    if (property.nonWritable(constraints())) {
-      return Ok();
-    }
-    writeBarrier |= property.needsBarrier(constraints());
-  }
-
-  if (needsPostBarrier(value)) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, value));
-  }
-
-  MInstruction* store;
-  if (slot < nfixed) {
-    store = MStoreFixedSlot::New(alloc(), obj, slot, value);
-    if (writeBarrier) {
-      store->toStoreFixedSlot()->setNeedsBarrier();
-    }
-  } else {
-    MInstruction* slots = MSlots::New(alloc(), obj);
-    current->add(slots);
-
-    store = MStoreDynamicSlot::New(alloc(), slots, slot - nfixed, value);
-    if (writeBarrier) {
-      store->toStoreDynamicSlot()->setNeedsBarrier();
-    }
-  }
-
-  current->add(store);
-  current->push(value);
-
-  MOZ_TRY(resumeAfter(store));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::setPropTryInlineAccess(
-    bool* emitted, MDefinition* obj, PropertyName* name, MDefinition* value,
-    bool barrier, TemporaryTypeSet* objTypes) {
-  MOZ_ASSERT(*emitted == false);
-
-  if (barrier) {
-    return Ok();
-  }
-
-  BaselineInspector::ReceiverVector receivers(alloc());
-  if (!inspector->maybeInfoForPropertyOp(pc, receivers)) {
-    return abort(AbortReason::Alloc);
-  }
-
-  if (!canInlinePropertyOpShapes(receivers)) {
-    return Ok();
-  }
-
-  if (receivers.length() == 1) {
-    if (!receivers[0].getGroup()) {
-      // Monomorphic store to a native object.
-      spew("Inlining monomorphic native SETPROP");
-
-      obj = addShapeGuard(obj, receivers[0].getShape());
-
-      Shape* shape = receivers[0].getShape()->searchLinear(NameToId(name));
-      MOZ_ASSERT(shape);
-
-      if (needsPostBarrier(value)) {
-        current->add(MPostWriteBarrier::New(alloc(), obj, value));
-      }
-
-      bool needsPreBarrier =
-          objTypes->propertyNeedsBarrier(constraints(), NameToId(name));
-      MOZ_TRY(storeSlot(obj, shape, value, needsPreBarrier));
-
-      *emitted = true;
-      return Ok();
-    }
-  }
-
-  MOZ_ASSERT(receivers.length() > 1);
-  spew("Inlining polymorphic SETPROP");
-
-  if (Shape* propShape =
-          PropertyShapesHaveSameSlot(receivers, NameToId(name))) {
-    obj = addGuardReceiverPolymorphic(obj, receivers);
-    if (!obj) {
-      return abort(AbortReason::Alloc);
-    }
-
-    if (needsPostBarrier(value)) {
-      current->add(MPostWriteBarrier::New(alloc(), obj, value));
-    }
-
-    bool needsPreBarrier =
-        objTypes->propertyNeedsBarrier(constraints(), NameToId(name));
-    MOZ_TRY(storeSlot(obj, propShape, value, needsPreBarrier));
-
-    *emitted = true;
-    return Ok();
-  }
-
-  if (needsPostBarrier(value)) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, value));
-  }
-
-  MSetPropertyPolymorphic* ins =
-      MSetPropertyPolymorphic::New(alloc(), obj, value, name);
-  current->add(ins);
-  current->push(value);
-
-  for (size_t i = 0; i < receivers.length(); i++) {
-    Shape* propShape = nullptr;
-    if (receivers[i].getShape()) {
-      propShape = receivers[i].getShape()->searchLinear(NameToId(name));
-      MOZ_ASSERT(propShape);
-    }
-    if (!ins->addReceiver(receivers[i], propShape)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  if (objTypes->propertyNeedsBarrier(constraints(), NameToId(name))) {
-    ins->setNeedsBarrier();
-  }
-
-  MOZ_TRY(resumeAfter(ins));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::setPropTryCache(bool* emitted, MDefinition* obj,
-                                              PropertyName* name,
-                                              MDefinition* value,
-                                              bool barrier) {
-  MOZ_ASSERT(*emitted == false);
-
-  bool strict = IsStrictSetPC(pc);
-
-  MConstant* id = constant(StringValue(name));
-  MSetPropertyCache* ins = MSetPropertyCache::New(
-      alloc(), obj, id, value, strict, needsPostBarrier(value), barrier,
-      /* guardHoles = */ false);
-  current->add(ins);
-  current->push(value);
-
-  MOZ_TRY(resumeAfter(ins));
-
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_delprop(PropertyName* name) {
-  MDefinition* obj = current->pop();
-
-  bool strict = JSOp(*pc) == JSOp::StrictDelProp;
-  MInstruction* ins = MDeleteProperty::New(alloc(), obj, name, strict);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_delelem() {
-  MDefinition* index = current->pop();
-  MDefinition* obj = current->pop();
-
-  bool strict = JSOp(*pc) == JSOp::StrictDelElem;
-  MDeleteElement* ins = MDeleteElement::New(alloc(), obj, index, strict);
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_regexp(RegExpObject* reobj) {
-  MOZ_ASSERT(!IsInsideNursery(reobj));
-
-  // Determine this while we're still on the main thread to avoid races.
-  bool hasShared = reobj->hasShared();
-
-  MRegExp* regexp = MRegExp::New(alloc(), constraints(), reobj, hasShared);
-  current->add(regexp);
-  current->push(regexp);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_object(JSObject* obj) {
-  pushConstant(ObjectValue(*obj));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_classconstructor() {
-  MClassConstructor* constructor = MClassConstructor::New(alloc(), pc);
-  current->add(constructor);
-  current->push(constructor);
-  return resumeAfter(constructor);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_derivedclassconstructor() {
-  MDefinition* prototype = current->pop();
-
-  auto* constructor = MDerivedClassConstructor::New(alloc(), prototype, pc);
-  current->add(constructor);
-  current->push(constructor);
-  return resumeAfter(constructor);
-}
-
-static LambdaFunctionInfo LambdaInfoFromFunction(JSFunction* fun) {
-  return LambdaFunctionInfo(fun, fun->baseScript(), fun->flags(), fun->nargs(),
-                            fun->isSingleton(),
-                            ObjectGroup::useSingletonForClone(fun));
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_lambda(JSFunction* fun) {
-  MOZ_ASSERT(usesEnvironmentChain());
-  MOZ_ASSERT(!fun->isArrow());
-
-  if (IsAsmJSModule(fun)) {
-    return abort(AbortReason::Disable, "Lambda is an asm.js module function");
-  }
-
-  MConstant* cst = MConstant::NewConstraintlessObject(alloc(), fun);
-  current->add(cst);
-  auto* ins = MLambda::New(alloc(), constraints(), current->environmentChain(),
-                           cst, LambdaInfoFromFunction(fun));
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_lambda_arrow(JSFunction* fun) {
-  MOZ_ASSERT(usesEnvironmentChain());
-  MOZ_ASSERT(fun->isArrow());
-  MOZ_ASSERT(!fun->isNative());
-
-  MDefinition* newTargetDef = current->pop();
-  MConstant* cst = MConstant::NewConstraintlessObject(alloc(), fun);
-  current->add(cst);
-  auto* ins =
-      MLambdaArrow::New(alloc(), constraints(), current->environmentChain(),
-                        newTargetDef, cst, LambdaInfoFromFunction(fun));
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_funwithproto(JSFunction* fun) {
-  MOZ_ASSERT(usesEnvironmentChain());
-  MOZ_ASSERT(!fun->isArrow());
-  MOZ_ASSERT(!fun->isNative());
-
-  MDefinition* proto = current->pop();
-  MConstant* cst = MConstant::NewConstraintlessObject(alloc(), fun);
-  current->add(cst);
-  auto* ins =
-      MFunctionWithProto::New(alloc(), current->environmentChain(), proto, cst);
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setfunname(uint8_t prefixKind) {
-  MDefinition* name = current->pop();
-  MDefinition* fun = current->pop();
-  MOZ_ASSERT(fun->type() == MIRType::Object);
-
-  MSetFunName* ins = MSetFunName::New(alloc(), fun, name, prefixKind);
-
-  current->add(ins);
-  current->push(fun);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_pushlexicalenv(GCThingIndex index) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  LexicalScope* scope = &script()->getScope(index)->as<LexicalScope>();
-  MNewLexicalEnvironmentObject* ins = MNewLexicalEnvironmentObject::New(
-      alloc(), current->environmentChain(), scope);
-
-  current->add(ins);
-  current->setEnvironmentChain(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_copylexicalenv(bool copySlots) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MCopyLexicalEnvironmentObject* ins = MCopyLexicalEnvironmentObject::New(
-      alloc(), current->environmentChain(), copySlots);
-
-  current->add(ins);
-  current->setEnvironmentChain(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getarg(uint32_t arg) {
-  if (info().argsObjAliasesFormals()) {
-    auto* getArg =
-        MGetArgumentsObjectArg::New(alloc(), current->argumentsObject(), arg);
-    current->add(getArg);
-    current->push(getArg);
-  } else {
-    current->pushArg(arg);
-  }
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setarg(uint32_t arg) {
-  MOZ_ASSERT(script()->jitScript()->modifiesArguments());
-  MDefinition* val = current->peek(-1);
-
-  if (!info().argumentsAliasesFormals()) {
-    MOZ_ASSERT(!info().argsObjAliasesFormals());
-
-    // |arguments| is never referenced within this function. No arguments object
-    // is created in this case, so we don't need to worry about synchronizing
-    // the argument values when writing to them.
-    MOZ_ASSERT_IF(!info().hasArguments(), !info().needsArgsObj());
-
-    // The arguments object doesn't map to the actual argument values, so we
-    // also don't need to worry about synchronizing them.
-    // Directly writing to a positional formal parameter is only possible when
-    // the |arguments| contents are never observed, otherwise we can't
-    // reconstruct the original parameter values when we access them through
-    // |arguments[i]|. AnalyzeArgumentsUsage ensures this is handled correctly.
-    MOZ_ASSERT_IF(info().hasArguments(), !info().hasMappedArgsObj());
-
-    current->setArg(arg);
-    return Ok();
-  }
-
-  MOZ_ASSERT(info().hasArguments() && info().hasMappedArgsObj(),
-             "arguments aliases formals when an arguments binding is present "
-             "and the arguments object is mapped");
-
-  // |needsArgsObj()| is true when analyzing arguments usage, so the
-  // JSOp::SetArg bytecode will always emit a |MSetArgumentsObjectArg| node.
-  MOZ_ASSERT_IF(info().analysisMode() == Analysis_ArgumentsUsage,
-                info().needsArgsObj());
-
-  // When |ArgumentsUseCanBeLazy()| in IonAnalysis then inspects all |arguments|
-  // uses, the |MSetArgumentsObjectArg| usage will prevent the script from using
-  // lazy arguments and an actual arguments object is created.
-  MOZ_ASSERT(info().needsArgsObj(),
-             "unexpected JSOp::SetArg with lazy arguments");
-
-  MOZ_ASSERT(
-      info().argsObjAliasesFormals(),
-      "argsObjAliasesFormals() is true iff a mapped arguments object is used");
-
-  // If an arguments object is in use, and it aliases formals, then all SETARGs
-  // must go through the arguments object.
-  if (needsPostBarrier(val)) {
-    current->add(
-        MPostWriteBarrier::New(alloc(), current->argumentsObject(), val));
-  }
-  auto* ins = MSetArgumentsObjectArg::New(alloc(), current->argumentsObject(),
-                                          arg, val);
-  current->add(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_defvar() {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::DefVar);
-
-  // Pass the EnvironmentChain.
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefVar* defvar = MDefVar::New(alloc(), current->environmentChain());
-  current->add(defvar);
-
-  return resumeAfter(defvar);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_deflexical() {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::DefLet || JSOp(*pc) == JSOp::DefConst);
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefinition* env = current->environmentChain();
-  MDefLexical* defLexical = MDefLexical::New(alloc(), env);
-  current->add(defLexical);
-
-  return resumeAfter(defLexical);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_deffun() {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefFun* deffun =
-      MDefFun::New(alloc(), current->pop(), current->environmentChain());
-  current->add(deffun);
-
-  return resumeAfter(deffun);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkGlobalOrEvalDecl() {
-  MOZ_ASSERT(!script()->isForEval(), "Eval scripts not supported");
-  auto* redeclCheck = MGlobalNameConflictsCheck::New(alloc());
-  current->add(redeclCheck);
-  return resumeAfter(redeclCheck);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_throwsetconst() {
-  MInstruction* lexicalError =
-      MThrowRuntimeLexicalError::New(alloc(), JSMSG_BAD_CONST_ASSIGN);
-  current->add(lexicalError);
-  MOZ_TRY(resumeAfter(lexicalError));
-
-  // Terminate the block.
-  current->end(MUnreachable::New(alloc()));
-  setTerminatedBlock();
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checklexical() {
-  JSOp op = JSOp(*pc);
-  MOZ_ASSERT(op == JSOp::CheckLexical || op == JSOp::CheckAliasedLexical);
-
-  MDefinition* val = current->peek(-1);
-  MDefinition* lexical;
-  MOZ_TRY_VAR(lexical, addLexicalCheck(val));
-  current->pop();
-  current->push(lexical);
-
-  if (op == JSOp::CheckLexical) {
-    // Set the local slot so that a subsequent GetLocal without a CheckLexical
-    // (the frontend can elide lexical checks) doesn't let a definition with
-    // MIRType::MagicUninitializedLexical escape to arbitrary MIR instructions.
-    // Note that in this case the GetLocal would be unreachable because we throw
-    // an exception here, but we still generate MIR instructions for it.
-    uint32_t slot = info().localSlot(GET_LOCALNO(pc));
-    current->setSlot(slot, lexical);
-  }
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_functionthis() {
-  MOZ_ASSERT(info().funMaybeLazy());
-  MOZ_ASSERT(!info().funMaybeLazy()->isArrow());
-
-  if (script()->strict()) {
-    // No need to wrap primitive |this| in strict mode.
-    current->pushSlot(info().thisSlot());
-    return Ok();
-  }
-
-  if (thisTypes && (thisTypes->getKnownMIRType() == MIRType::Object ||
-                    (thisTypes->empty() && baselineFrame_ &&
-                     baselineFrame_->thisType.isSomeObject()))) {
-    // This is safe, because if the entry type of |this| is an object, it
-    // will necessarily be an object throughout the entire function. OSR
-    // can introduce a phi, but this phi will be specialized.
-    current->pushSlot(info().thisSlot());
-    return Ok();
-  }
-
-  // If we are doing an analysis, we might not yet know the type of |this|.
-  // Instead of bailing out just push the |this| slot, as this code won't
-  // actually execute and it does not matter whether |this| is primitive.
-  if (info().isAnalysis()) {
-    current->pushSlot(info().thisSlot());
-    return Ok();
-  }
-
-  // Hard case: |this| may be a primitive we have to wrap.
-  MDefinition* def = current->getSlot(info().thisSlot());
-
-  if (def->type() == MIRType::Object) {
-    current->push(def);
-    return Ok();
-  }
-
-  // Beyond this point we may need to access non-syntactic global. Ion doesn't
-  // currently support this so just abort.
-  if (script()->hasNonSyntacticScope()) {
-    return abort(AbortReason::Disable,
-                 "JSOp::FunctionThis would need non-syntactic global");
-  }
-
-  LexicalEnvironmentObject* globalLexical =
-      &script()->global().lexicalEnvironment();
-  JSObject* globalThis = globalLexical->thisObject();
-
-  if (IsNullOrUndefined(def->type())) {
-    pushConstant(ObjectValue(*globalThis));
-    return Ok();
-  }
-
-  MBoxNonStrictThis* thisObj = MBoxNonStrictThis::New(alloc(), def, globalThis);
-  current->add(thisObj);
-  current->push(thisObj);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_globalthis() {
-  if (script()->hasNonSyntacticScope()) {
-    // Ion does not compile global scripts with a non-syntactic scope, but
-    // we can end up here when we're compiling an arrow function.
-    return abort(AbortReason::Disable,
-                 "JSOp::GlobalThis in script with non-syntactic scope");
-  }
-
-  LexicalEnvironmentObject* globalLexical =
-      &script()->global().lexicalEnvironment();
-  pushConstant(ObjectValue(*globalLexical->thisObject()));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_typeof() {
-  MDefinition* input = current->pop();
-  MTypeOf* ins = MTypeOf::New(alloc(), input);
-
-  ins->cacheInputMaybeCallableOrEmulatesUndefined(constraints());
-
-  current->add(ins);
-  current->push(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_toasynciter() {
-  MDefinition* nextMethod = current->pop();
-  MDefinition* iterator = current->pop();
-  MOZ_ASSERT(iterator->type() == MIRType::Object);
-
-  MToAsyncIter* ins = MToAsyncIter::New(alloc(), iterator, nextMethod);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_topropertykey() {
-  // No-op if the index is trivally convertable to a PropertyKey.
-  MIRType type = current->peek(-1)->type();
-  if (type == MIRType::Int32 || type == MIRType::String ||
-      type == MIRType::Symbol) {
-    return Ok();
-  }
-
-  MDefinition* index = current->pop();
-  auto* ins = MToPropertyKeyCache::New(alloc(), index);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_iter() {
-  MDefinition* obj = current->pop();
-  MInstruction* ins = MGetIteratorCache::New(alloc(), obj);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_itermore() {
-  MDefinition* iter = current->peek(-1);
-  MInstruction* ins = MIteratorMore::New(alloc(), iter);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_isnoiter() {
-  MDefinition* def = current->peek(-1);
-  MOZ_ASSERT(def->isIteratorMore());
-
-  MInstruction* ins = MIsNoIter::New(alloc(), def);
-  current->add(ins);
-  current->push(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_iterend() {
-  current->pop();  // Iterator value is not used.
-  MDefinition* iter = current->pop();
-
-  MInstruction* ins = MIteratorEnd::New(alloc(), iter);
-  current->add(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_iternext() {
-  MDefinition* def = current->pop();
-  MOZ_ASSERT(def->type() == MIRType::Value);
-
-  // The value must be a string.
-  MInstruction* unbox =
-      MUnbox::New(alloc(), def, MIRType::String, MUnbox::Infallible);
-  current->add(unbox);
-  current->push(unbox);
-
-  return Ok();
-}
-
-MDefinition* IonBuilder::walkEnvironmentChain(unsigned hops) {
-  MDefinition* env = current->getSlot(info().environmentChainSlot());
-
-  for (unsigned i = 0; i < hops; i++) {
-    MInstruction* ins = MEnclosingEnvironment::New(alloc(), env);
-    current->add(ins);
-    env = ins;
-  }
-
-  return env;
-}
-
-MDefinition* IonBuilder::getAliasedVar(EnvironmentCoordinate ec) {
-  MDefinition* obj = walkEnvironmentChain(ec.hops());
-
-  MInstruction* load;
-  if (EnvironmentObject::nonExtensibleIsFixedSlot(ec)) {
-    load = MLoadFixedSlot::New(alloc(), obj, ec.slot());
-  } else {
-    MInstruction* slots = MSlots::New(alloc(), obj);
-    current->add(slots);
-
-    uint32_t slot = EnvironmentObject::nonExtensibleDynamicSlotIndex(ec);
-    load = MLoadDynamicSlot::New(alloc(), slots, slot);
-  }
-
-  current->add(load);
-  return load;
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_getaliasedvar(EnvironmentCoordinate ec) {
-  MDefinition* load = getAliasedVar(ec);
-  current->push(load);
-
-  TemporaryTypeSet* types = bytecodeTypes(pc);
-  return pushTypeBarrier(load, types, BarrierKind::TypeSet);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_setaliasedvar(EnvironmentCoordinate ec) {
-  MDefinition* rval = current->peek(-1);
-  MDefinition* obj = walkEnvironmentChain(ec.hops());
-
-  if (needsPostBarrier(rval)) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, rval));
-  }
-
-  MInstruction* store;
-  if (EnvironmentObject::nonExtensibleIsFixedSlot(ec)) {
-    store = MStoreFixedSlot::NewBarriered(alloc(), obj, ec.slot(), rval);
-  } else {
-    MInstruction* slots = MSlots::New(alloc(), obj);
-    current->add(slots);
-
-    uint32_t slot = EnvironmentObject::nonExtensibleDynamicSlotIndex(ec);
-    store = MStoreDynamicSlot::NewBarriered(alloc(), slots, slot, rval);
-  }
-
-  current->add(store);
-  return resumeAfter(store);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_in() {
-  MDefinition* obj = current->pop();
-  MDefinition* id = current->pop();
-
-  if (!forceInlineCaches()) {
-    bool emitted = false;
-
-    MOZ_TRY(inTryDense(&emitted, obj, id));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(hasTryNotDefined(&emitted, obj, id, /* ownProperty = */ false));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(hasTryDefiniteSlotOrUnboxed(&emitted, obj, id));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  MInCache* ins = MInCache::New(alloc(), id, obj);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::inTryDense(bool* emitted, MDefinition* obj,
-                                         MDefinition* id) {
-  MOZ_ASSERT(!*emitted);
-
-  if (shouldAbortOnPreliminaryGroups(obj)) {
-    return Ok();
-  }
-
-  if (!ElementAccessIsDenseNative(constraints(), obj, id)) {
-    return Ok();
-  }
-
-  bool hasExtraIndexedProperty;
-  MOZ_TRY_VAR(hasExtraIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-  if (hasExtraIndexedProperty) {
-    return Ok();
-  }
-
-  *emitted = true;
-
-  bool needsHoleCheck = !ElementAccessIsPacked(constraints(), obj);
-
-  // Ensure id is an integer.
-  MInstruction* idInt32 = MToNumberInt32::New(alloc(), id);
-  current->add(idInt32);
-  id = idInt32;
-
-  // Get the elements vector.
-  MElements* elements = MElements::New(alloc(), obj);
-  current->add(elements);
-
-  MInstruction* initLength = initializedLength(elements);
-
-  // If there are no holes, speculate the InArray check will not fail.
-  if (!needsHoleCheck && !failedBoundsCheck_) {
-    addBoundsCheck(idInt32, initLength);
-    pushConstant(BooleanValue(true));
-    return Ok();
-  }
-
-  // Check if id < initLength and elem[id] not a hole.
-  MInArray* ins =
-      MInArray::New(alloc(), elements, id, initLength, obj, needsHoleCheck);
-
-  current->add(ins);
-  current->push(ins);
-
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::hasTryNotDefined(bool* emitted, MDefinition* obj,
-                                               MDefinition* id,
-                                               bool ownProperty) {
-  // Fold |id in obj| to |false|, if we know the object (or an object on its
-  // prototype chain) does not have this property.
-
-  MOZ_ASSERT(!*emitted);
-
-  MConstant* idConst = id->maybeConstantValue();
-  jsid propId;
-  if (!idConst || !ValueToIdPure(idConst->toJSValue(), &propId)) {
-    return Ok();
-  }
-
-  if (propId != IdToTypeId(propId)) {
-    return Ok();
-  }
-
-  bool res;
-  MOZ_TRY_VAR(res, testNotDefinedProperty(obj, propId, ownProperty));
-  if (!res) {
-    return Ok();
-  }
-
-  *emitted = true;
-
-  pushConstant(BooleanValue(false));
-  obj->setImplicitlyUsedUnchecked();
-  id->setImplicitlyUsedUnchecked();
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::hasTryDefiniteSlotOrUnboxed(bool* emitted,
-                                                          MDefinition* obj,
-                                                          MDefinition* id) {
-  // Fold |id in obj| to |true|, when obj definitely contains a property with
-  // that name.
-  MOZ_ASSERT(!*emitted);
-
-  if (obj->type() != MIRType::Object) {
-    return Ok();
-  }
-
-  MConstant* idConst = id->maybeConstantValue();
-  jsid propId;
-  if (!idConst || !ValueToIdPure(idConst->toJSValue(), &propId)) {
-    return Ok();
-  }
-
-  if (propId != IdToTypeId(propId)) {
-    return Ok();
-  }
-
-  // Try finding a native definite slot first.
-  uint32_t nfixed;
-  uint32_t slot = getDefiniteSlot(obj->resultTypeSet(), propId, &nfixed);
-  if (slot == UINT32_MAX) {
-    return Ok();
-  }
-
-  *emitted = true;
-
-  pushConstant(BooleanValue(true));
-  obj->setImplicitlyUsedUnchecked();
-  id->setImplicitlyUsedUnchecked();
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_hasown() {
-  MDefinition* obj = current->pop();
-  MDefinition* id = current->pop();
-
-  if (!forceInlineCaches()) {
-    bool emitted = false;
-
-    MOZ_TRY(hasTryNotDefined(&emitted, obj, id, /* ownProperty = */ true));
-    if (emitted) {
-      return Ok();
-    }
-
-    MOZ_TRY(hasTryDefiniteSlotOrUnboxed(&emitted, obj, id));
-    if (emitted) {
-      return Ok();
-    }
-  }
-
-  MHasOwnCache* ins = MHasOwnCache::New(alloc(), obj, id);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkprivatefield() {
-  MDefinition* id = current->peek(-1);
-  MDefinition* obj = current->peek(-2);
-
-  MCheckPrivateFieldCache* ins = MCheckPrivateFieldCache::New(alloc(), obj, id);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  return Ok();
-}
-
-AbortReasonOr<bool> IonBuilder::hasOnProtoChain(TypeSet::ObjectKey* key,
-                                                JSObject* protoObject,
-                                                bool* onProto) {
-  MOZ_ASSERT(protoObject);
-
-  while (true) {
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    if (!key->hasStableClassAndProto(constraints()) ||
-        !key->clasp()->isNative()) {
-      return false;
-    }
-
-    JSObject* proto = checkNurseryObject(key->proto().toObjectOrNull());
-    if (!proto) {
-      *onProto = false;
-      return true;
-    }
-
-    if (proto == protoObject) {
-      *onProto = true;
-      return true;
-    }
-
-    key = TypeSet::ObjectKey::get(proto);
-  }
-
-  MOZ_CRASH("Unreachable");
-}
-
-AbortReasonOr<Ok> IonBuilder::tryFoldInstanceOf(bool* emitted, MDefinition* lhs,
-                                                JSObject* protoObject) {
-  // Try to fold the js::IsPrototypeOf part of the instanceof operation.
-  MOZ_ASSERT(*emitted == false);
-
-  if (!lhs->mightBeType(MIRType::Object)) {
-    // If the lhs is a primitive, the result is false.
-    lhs->setImplicitlyUsedUnchecked();
-    pushConstant(BooleanValue(false));
-    *emitted = true;
-    return Ok();
-  }
-
-  TemporaryTypeSet* lhsTypes = lhs->resultTypeSet();
-  if (!lhsTypes || lhsTypes->unknownObject()) {
-    return Ok();
-  }
-
-  // We can fold if either all objects have protoObject on their proto chain
-  // or none have.
-  bool isFirst = true;
-  bool knownIsInstance = false;
-
-  for (unsigned i = 0; i < lhsTypes->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = lhsTypes->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    bool checkSucceeded;
-    bool isInstance;
-    MOZ_TRY_VAR(checkSucceeded, hasOnProtoChain(key, protoObject, &isInstance));
-    if (!checkSucceeded) {
-      return Ok();
-    }
-
-    if (isFirst) {
-      knownIsInstance = isInstance;
-      isFirst = false;
-    } else if (knownIsInstance != isInstance) {
-      // Some of the objects have protoObject on their proto chain and
-      // others don't, so we can't optimize this.
-      return Ok();
-    }
-  }
-
-  if (knownIsInstance && lhsTypes->getKnownMIRType() != MIRType::Object) {
-    // The result is true for all objects, but the lhs might be a primitive.
-    // We can't fold this completely but we can use a much faster IsObject
-    // test.
-    MIsObject* isObject = MIsObject::New(alloc(), lhs);
-    current->add(isObject);
-    current->push(isObject);
-    *emitted = true;
-    return Ok();
-  }
-
-  lhs->setImplicitlyUsedUnchecked();
-  pushConstant(BooleanValue(knownIsInstance));
-  *emitted = true;
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_instanceof() {
-  MDefinition* rhs = current->pop();
-  MDefinition* obj = current->pop();
-  bool emitted = false;
-
-  // If this is an 'x instanceof function' operation and we can determine the
-  // exact function and prototype object being tested for, use a typed path.
-  do {
-    TemporaryTypeSet* rhsTypes = rhs->resultTypeSet();
-    JSObject* rhsObject = rhsTypes ? rhsTypes->maybeSingleton() : nullptr;
-    if (!rhsObject || !rhsObject->is<JSFunction>() ||
-        rhsObject->isBoundFunction()) {
-      break;
-    }
-
-    // Refuse to optimize anything whose [[Prototype]] isn't Function.prototype
-    // since we can't guarantee that it uses the default @@hasInstance method.
-    if (rhsObject->hasUncacheableProto() || !rhsObject->hasStaticPrototype()) {
-      break;
-    }
-
-    Value funProto = script()->global().getPrototype(JSProto_Function);
-    if (!funProto.isObject() ||
-        rhsObject->staticPrototype() != &funProto.toObject()) {
-      break;
-    }
-
-    // If the user has supplied their own @@hasInstance method we shouldn't
-    // clobber it.
-    JSFunction* fun = &rhsObject->as<JSFunction>();
-    const WellKnownSymbols* symbols = &realm->runtime()->wellKnownSymbols();
-    if (!js::FunctionHasDefaultHasInstance(fun, *symbols)) {
-      break;
-    }
-
-    // Ensure that we will bail if the @@hasInstance property or [[Prototype]]
-    // change.
-    TypeSet::ObjectKey* rhsKey = TypeSet::ObjectKey::get(rhsObject);
-    if (!rhsKey->hasStableClassAndProto(constraints())) {
-      break;
-    }
-
-    if (rhsKey->unknownProperties()) {
-      break;
-    }
-
-    HeapTypeSetKey hasInstanceObject =
-        rhsKey->property(SYMBOL_TO_JSID(symbols->hasInstance));
-    if (hasInstanceObject.isOwnProperty(constraints())) {
-      break;
-    }
-
-    HeapTypeSetKey protoProperty =
-        rhsKey->property(NameToId(names().prototype));
-    JSObject* protoObject = protoProperty.singleton(constraints());
-    if (!protoObject) {
-      break;
-    }
-
-    rhs->setImplicitlyUsedUnchecked();
-
-    MOZ_TRY(tryFoldInstanceOf(&emitted, obj, protoObject));
-    if (emitted) {
-      return Ok();
-    }
-
-    MConstant* protoConst = constant(ObjectValue(*protoObject));
-    MInstanceOf* ins = MInstanceOf::New(alloc(), obj, protoConst);
-
-    current->add(ins);
-    current->push(ins);
-
-    return resumeAfter(ins);
-  } while (false);
-
-  // Try to inline a fast path based on Baseline ICs.
-  do {
-    Shape* shape;
-    uint32_t slot;
-    JSObject* protoObject;
-    if (!inspector->instanceOfData(pc, &shape, &slot, &protoObject)) {
-      break;
-    }
-
-    // Shape guard.
-    rhs = addShapeGuard(rhs, shape);
-
-    // Guard .prototype == protoObject.
-    MOZ_ASSERT(shape->numFixedSlots() == 0, "Must be a dynamic slot");
-    MSlots* slots = MSlots::New(alloc(), rhs);
-    current->add(slots);
-    MLoadDynamicSlot* prototype = MLoadDynamicSlot::New(alloc(), slots, slot);
-    current->add(prototype);
-    MConstant* protoConst =
-        MConstant::NewConstraintlessObject(alloc(), protoObject);
-    current->add(protoConst);
-    MGuardObjectIdentity* guard =
-        MGuardObjectIdentity::New(alloc(), prototype, protoConst,
-                                  /* bailOnEquality = */ false);
-    current->add(guard);
-
-    MOZ_TRY(tryFoldInstanceOf(&emitted, obj, protoObject));
-    if (emitted) {
-      return Ok();
-    }
-
-    MInstanceOf* ins = MInstanceOf::New(alloc(), obj, protoConst);
-    current->add(ins);
-    current->push(ins);
-    return resumeAfter(ins);
-  } while (false);
-
-  MInstanceOfCache* ins = MInstanceOfCache::New(alloc(), obj, rhs);
-
-  current->add(ins);
-  current->push(ins);
-
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_debugger() {
-  // The |debugger;| statement will bail out to Baseline if the realm is a
-  // debuggee realm with an onDebuggerStatement hook.
-  MDebugger* debugger = MDebugger::New(alloc());
-  current->add(debugger);
-  return resumeAfter(debugger);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_implicitthis(PropertyName* name) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MImplicitThis* implicitThis =
-      MImplicitThis::New(alloc(), current->environmentChain(), name);
-  current->add(implicitThis);
-  current->push(implicitThis);
-
-  return resumeAfter(implicitThis);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_importmeta() {
-  if (info().analysisMode() == Analysis_ArgumentsUsage) {
-    // The meta object may not have been created yet. Just push a dummy
-    // value, it does not affect the arguments analysis.
-    MUnknownValue* unknown = MUnknownValue::New(alloc());
-    current->add(unknown);
-    current->push(unknown);
-    return Ok();
-  }
-
-  ModuleObject* module = GetModuleObjectForScript(script());
-  MOZ_ASSERT(module);
-
-  MModuleMetadata* meta = MModuleMetadata::New(alloc(), module);
-  current->add(meta);
-  current->push(meta);
-  return resumeAfter(meta);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_dynamic_import() {
-  MDefinition* specifier = current->pop();
-
-  MDynamicImport* ins = MDynamicImport::New(alloc(), specifier);
-  current->add(ins);
-  current->push(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_instrumentation_active() {
-  // All IonScripts in the realm are discarded when instrumentation activity
-  // changes, so we can treat the value we get as a constant.
-  bool active = RealmInstrumentation::isActive(&script()->global());
-  pushConstant(BooleanValue(active));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_instrumentation_callback() {
-  JSObject* obj = RealmInstrumentation::getCallback(&script()->global());
-  MOZ_ASSERT(obj);
-  pushConstant(ObjectValue(*obj));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_instrumentation_scriptid() {
-  // Getting the script ID requires interacting with the Debugger used for
-  // instrumentation, but cannot run script.
-  JSContext* cx = TlsContext.get();
-
-  int32_t scriptId;
-  RootedScript script(cx, this->script());
-  if (!RealmInstrumentation::getScriptId(cx, cx->global(), script, &scriptId)) {
-    return abort(AbortReason::Error);
-  }
-  pushConstant(Int32Value(scriptId));
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_objwithproto() {
-  auto* ins = MObjectWithProto::New(alloc(), current->pop());
-  current->add(ins);
-  current->push(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_builtinobject() {
-  auto kind = BuiltinObjectKind(GET_UINT8(pc));
-
-  // Bake in the built-in if it exists.
-  if (JSObject* builtin = MaybeGetBuiltinObject(&script()->global(), kind)) {
-    pushConstant(ObjectValue(*builtin));
-    return Ok();
-  }
-
-  // Otherwise emit code to generate it.
-  auto* ins = MBuiltinObject::New(alloc(), kind);
-  current->add(ins);
-  current->push(ins);
-  return resumeAfter(ins);
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_checkreturn() {
-  MOZ_ASSERT(!script()->noScriptRval());
-
-  MDefinition* returnValue = current->getSlot(info().returnValueSlot());
-  MDefinition* thisValue = current->pop();
-
-  if (returnValue->type() == MIRType::Object) {
-    thisValue->setImplicitlyUsedUnchecked();
-    return Ok();
-  }
-
-  if (returnValue->type() == MIRType::Undefined &&
-      !thisValue->mightBeMagicType()) {
-    // The return value mustn't be optimized out, otherwise baseline may see the
-    // optimized-out magic value when it re-executes this op after a bailout.
-    returnValue->setImplicitlyUsedUnchecked();
-    thisValue->setImplicitlyUsedUnchecked();
-    current->setSlot(info().returnValueSlot(), thisValue);
-    return Ok();
-  }
-
-  auto* ins = MCheckReturn::New(alloc(), returnValue, thisValue);
-  current->add(ins);
-  current->setSlot(info().returnValueSlot(), ins);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_superfun() {
-  MDefinition* callee = current->pop();
-
-  do {
-    TemporaryTypeSet* calleeTypes = callee->resultTypeSet();
-    if (!calleeTypes) {
-      break;
-    }
-
-    TemporaryTypeSet::ObjectKey* calleeKey = calleeTypes->maybeSingleObject();
-    if (!calleeKey) {
-      break;
-    }
-
-    JSObject* calleeObj;
-    if (calleeKey->isSingleton()) {
-      calleeObj = calleeKey->singleton();
-    } else {
-      calleeObj = calleeKey->group()->maybeInterpretedFunction();
-    }
-    if (!calleeObj) {
-      break;
-    }
-
-    // Refuse to optimize if the prototype is uncacheable.
-    if (calleeObj->hasUncacheableProto() || !calleeObj->hasStaticPrototype()) {
-      break;
-    }
-
-    // The prototype must be a constructor.
-    JSObject* proto = calleeObj->staticPrototype();
-    if (!proto || !proto->isConstructor()) {
-      break;
-    }
-
-    // Add a constraint to ensure we're notified when the prototype changes.
-    if (!calleeKey->hasStableClassAndProto(constraints())) {
-      break;
-    }
-
-    callee->setImplicitlyUsedUnchecked();
-
-    pushConstant(ObjectValue(*proto));
-
-    return Ok();
-  } while (false);
-
-  auto* ins = MSuperFunction::New(alloc(), callee);
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-AbortReasonOr<Ok> IonBuilder::jsop_inithomeobject() {
-  MDefinition* homeObject = current->pop();
-  MDefinition* function = current->pop();
-
-  if (needsPostBarrier(homeObject)) {
-    current->add(MPostWriteBarrier::New(alloc(), function, homeObject));
-  }
-
-  auto* ins = MInitHomeObject::New(alloc(), function, homeObject);
-  current->add(ins);
-  current->push(ins);
-  return Ok();
-}
-
-MInstruction* IonBuilder::addConvertElementsToDoubles(MDefinition* elements) {
-  MInstruction* convert = MConvertElementsToDoubles::New(alloc(), elements);
-  current->add(convert);
-  return convert;
-}
-
-MDefinition* IonBuilder::addMaybeCopyElementsForWrite(MDefinition* object,
-                                                      bool checkNative) {
-  if (!ElementAccessMightBeCopyOnWrite(constraints(), object)) {
-    return object;
-  }
-  MInstruction* copy =
-      MMaybeCopyElementsForWrite::New(alloc(), object, checkNative);
-  current->add(copy);
-  return copy;
-}
-
-MInstruction* IonBuilder::addBoundsCheck(MDefinition* index,
-                                         MDefinition* length) {
-  MInstruction* check = MBoundsCheck::New(alloc(), index, length);
-  current->add(check);
-
-  // If a bounds check failed in the past, don't optimize bounds checks.
-  if (failedBoundsCheck_) {
-    check->setNotMovable();
-  }
-
-  if (JitOptions.spectreIndexMasking) {
-    // Use a separate MIR instruction for the index masking. Doing this as
-    // part of MBoundsCheck would be unsound because bounds checks can be
-    // optimized or eliminated completely. Consider this:
-    //
-    //   for (var i = 0; i < x; i++)
-    //        res = arr[i];
-    //
-    // If we can prove |x < arr.length|, we are able to eliminate the bounds
-    // check, but we should not get rid of the index masking because the
-    // |i < x| branch could still be mispredicted.
-    //
-    // Using a separate instruction lets us eliminate the bounds check
-    // without affecting the index masking.
-    check = MSpectreMaskIndex::New(alloc(), check, length);
-    current->add(check);
-  }
-
-  return check;
-}
-
-MInstruction* IonBuilder::addShapeGuard(MDefinition* obj, Shape* const shape) {
-  MGuardShape* guard = MGuardShape::New(alloc(), obj, shape);
-  current->add(guard);
-
-  // If a shape guard failed in the past, don't optimize shape guard.
-  if (failedShapeGuard_) {
-    guard->setNotMovable();
-  }
-
-  return guard;
-}
-
-MInstruction* IonBuilder::addGuardReceiverPolymorphic(
-    MDefinition* obj, const BaselineInspector::ReceiverVector& receivers) {
-  if (receivers.length() == 1) {
-    if (!receivers[0].getGroup()) {
-      // Monomorphic guard on a native object.
-      return addShapeGuard(obj, receivers[0].getShape());
-    }
-  }
-
-  MGuardReceiverPolymorphic* guard =
-      MGuardReceiverPolymorphic::New(alloc(), obj);
-  current->add(guard);
-
-  if (failedShapeGuard_) {
-    guard->setNotMovable();
-  }
-
-  for (size_t i = 0; i < receivers.length(); i++) {
-    if (!guard->addReceiver(receivers[i])) {
-      return nullptr;
-    }
-  }
-
-  return guard;
-}
-
-TemporaryTypeSet* IonBuilder::bytecodeTypes(jsbytecode* pc) {
-  return JitScript::BytecodeTypes(script(), pc, bytecodeTypeMap, &typeArrayHint,
-                                  typeArray);
-}
-
-void IonBuilder::checkNurseryCell(gc::Cell* cell) {
-  // If we try to use any nursery pointers during compilation, make sure that
-  // the main thread will cancel this compilation before performing a minor
-  // GC. All constants used during compilation should either go through this
-  // function or should come from a type set (which has a similar barrier).
-  if (cell && IsInsideNursery(cell)) {
-    realm->zone()->setMinorGCShouldCancelIonCompilations();
-    mirGen().setNotSafeForMinorGC();
-  }
-}
-
-JSObject* IonBuilder::checkNurseryObject(JSObject* obj) {
-  checkNurseryCell(obj);
-  return obj;
-}
-
-MConstant* IonBuilder::constant(const Value& v) {
-  MOZ_ASSERT(!v.isString() || v.toString()->isAtom(),
-             "Handle non-atomized strings outside IonBuilder.");
-
-  if (v.isGCThing()) {
-    checkNurseryCell(v.toGCThing());
-  }
-
-  MConstant* c = MConstant::New(alloc(), v, constraints());
-  current->add(c);
-  return c;
-}
-
-MConstant* IonBuilder::constantInt(int32_t i) {
-  return constant(Int32Value(i));
-}
-
-MInstruction* IonBuilder::initializedLength(MDefinition* elements) {
-  MInstruction* res = MInitializedLength::New(alloc(), elements);
-  current->add(res);
-  return res;
-}
-
-MInstruction* IonBuilder::setInitializedLength(MDefinition* obj, size_t count) {
-  MOZ_ASSERT(count);
-
-  // MSetInitializedLength takes the index of the last element, rather
-  // than the count itself.
-  MInstruction* elements = MElements::New(alloc(), obj);
-  current->add(elements);
-  MInstruction* res = MSetInitializedLength::New(
-      alloc(), elements, constant(Int32Value(count - 1)));
-  current->add(res);
-  return res;
-}
-
-MDefinition* IonBuilder::getCallee() {
-  if (inliningDepth_ == 0) {
-    MInstruction* callee = MCallee::New(alloc());
-    current->add(callee);
-    return callee;
-  }
-
-  return inlineCallInfo_->callee();
-}
-
-void IonBuilder::addAbortedPreliminaryGroup(ObjectGroup* group) {
-  for (size_t i = 0; i < abortedPreliminaryGroups_.length(); i++) {
-    if (group == abortedPreliminaryGroups_[i]) {
-      return;
-    }
-  }
-  AutoEnterOOMUnsafeRegion oomUnsafe;
-  if (!abortedPreliminaryGroups_.append(group)) {
-    oomUnsafe.crash("addAbortedPreliminaryGroup");
-  }
-}
-
-AbortReasonOr<MDefinition*> IonBuilder::addLexicalCheck(MDefinition* input) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::CheckLexical ||
-             JSOp(*pc) == JSOp::CheckAliasedLexical ||
-             JSOp(*pc) == JSOp::GetImport);
-
-  // If we're guaranteed to not be JS_UNINITIALIZED_LEXICAL, no need to check.
-  if (input->type() == MIRType::MagicUninitializedLexical) {
-    // Mark the input as implicitly used so the JS_UNINITIALIZED_LEXICAL
-    // magic value will be preserved on bailout.
-    input->setImplicitlyUsedUnchecked();
-    MInstruction* lexicalCheck =
-        MThrowRuntimeLexicalError::New(alloc(), JSMSG_UNINITIALIZED_LEXICAL);
-    current->add(lexicalCheck);
-    MOZ_TRY(resumeAfter(lexicalCheck));
-    return constant(UndefinedValue());
-  }
-
-  if (input->type() == MIRType::Value) {
-    MInstruction* lexicalCheck = MLexicalCheck::New(alloc(), input);
-    current->add(lexicalCheck);
-    if (failedLexicalCheck_) {
-      lexicalCheck->setNotMovableUnchecked();
-    }
-    return lexicalCheck;
-  }
-
-  input->setImplicitlyUsedUnchecked();
-  return input;
-}
-
-MDefinition* IonBuilder::convertToBoolean(MDefinition* input) {
-  // Convert to bool with the '!!' idiom
-  MNot* resultInverted = MNot::New(alloc(), input, constraints());
-  current->add(resultInverted);
-  MNot* result = MNot::New(alloc(), resultInverted, constraints());
-  current->add(result);
-
-  return result;
-}
diff -Nru firefox-84.0.2+build1/js/src/jit/IonBuilder.h firefox-85.0+build1/js/src/jit/IonBuilder.h
--- firefox-84.0.2+build1/js/src/jit/IonBuilder.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonBuilder.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1176 +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 jit_IonBuilder_h
-#define jit_IonBuilder_h
-
-// This file declares the data structures for building a MIRGraph from a
-// JSScript.
-
-#include "mozilla/Maybe.h"
-
-#include "jsfriendapi.h"
-
-#include "jit/BaselineInspector.h"
-#include "jit/CompileInfo.h"
-#include "jit/InlineScriptTree.h"
-#include "jit/IonAnalysis.h"
-#include "jit/IonOptimizationLevels.h"
-#include "jit/MIR.h"
-#include "jit/MIRBuilderShared.h"
-#include "jit/MIRGenerator.h"
-#include "jit/MIRGraph.h"
-#include "jit/TIOracle.h"
-#include "js/experimental/JitInfo.h"  // JSJitInfo
-#include "js/ScalarType.h"            // js::Scalar::Type
-#include "vm/SharedStencil.h"         // GCThingIndex
-
-namespace js {
-
-class TypedArrayObject;
-
-namespace jit {
-
-class CodeGenerator;
-class CallInfo;
-class BaselineFrameInspector;
-
-enum class InlinableNative : uint16_t;
-
-// Records information about a baseline frame for compilation that is stable
-// when later used off thread.
-BaselineFrameInspector* NewBaselineFrameInspector(TempAllocator* temp,
-                                                  BaselineFrame* frame,
-                                                  uint32_t frameSize);
-
-using CallTargets = Vector<JSFunction*, 6, JitAllocPolicy>;
-
-// [SMDOC] Control Flow handling in IonBuilder
-//
-// IonBuilder traverses the script's bytecode and compiles each instruction to
-// corresponding MIR instructions. Handling control flow bytecode ops requires
-// some special machinery:
-//
-// Forward branches
-// ----------------
-// Most branches in the bytecode are forward branches to a JSOp::JumpTarget
-// instruction that we have not inspected yet. We compile them in two phases:
-//
-// 1) When compiling the source instruction: the MBasicBlock is terminated
-//    with a control instruction that has a nullptr successor block. We also add
-//    a PendingEdge instance to the PendingEdges list for the target bytecode
-//    location.
-//
-// 2) When finally compiling the JSOp::JumpTarget: IonBuilder::visitJumpTarget
-//    creates the target block and uses the list of PendingEdges to 'link' the
-//    blocks.
-//
-// Loops
-// -----
-// Loops complicate this a bit:
-//
-// * Because of IonBuilder's single pass design, we sometimes have to 'restart'
-//   a loop when we find new types for locals, arguments, or stack slots while
-//   compiling the loop body. When this happens the loop has to be recompiled
-//   from the beginning.
-//
-// * Loops may be nested within other loops, so we track loop states in a stack
-//   per IonBuilder.
-//
-// Unreachable/dead code
-// ---------------------
-// Some bytecode instructions never fall through to the next instruction, for
-// example JSOp::Return, JSOp::Goto, or JSOp::Throw. Code after such
-// instructions is guaranteed to be dead so IonBuilder skips it until it gets to
-// a jump target instruction with pending edges.
-//
-// Note: The frontend may generate unnecessary JSOp::JumpTarget instructions we
-// can ignore when they have no incoming pending edges.
-//
-// Try-catch
-// ---------
-// IonBuilder supports scripts with try-catch by only compiling the try-block
-// and bailing out (to the Baseline Interpreter) from the exception handler
-// whenever we need to execute the catch-block.
-//
-// Because we don't compile the catch-block and the code after the try-catch may
-// only be reachable via the catch-block, Baseline's BytecodeAnalysis ensures
-// Baseline does not attempt OSR into Ion/Warp when loops are only reachable via
-// catch/finally blocks.
-//
-// Finally-blocks are currently not supported by Ion.
-
-class MOZ_STACK_CLASS IonBuilder {
- public:
-  IonBuilder(JSContext* analysisContext, MIRGenerator& mirGen,
-             CompileInfo* info, CompilerConstraintList* constraints,
-             BaselineInspector* inspector,
-             BaselineFrameInspector* baselineFrame, size_t inliningDepth = 0,
-             uint32_t loopDepth = 0);
-
-  // Callers of build() and buildInline() should always check whether the
-  // call overrecursed, if false is returned.  Overrecursion is not
-  // signaled as OOM and will not in general be caught by OOM paths.
-  AbortReasonOr<Ok> build();
-  AbortReasonOr<Ok> buildInline(IonBuilder* callerBuilder,
-                                MResumePoint* callerResumePoint,
-                                CallInfo& callInfo);
-
-  mozilla::GenericErrorResult<AbortReason> abort(AbortReason r);
-  mozilla::GenericErrorResult<AbortReason> abort(AbortReason r,
-                                                 const char* message, ...)
-      MOZ_FORMAT_PRINTF(3, 4);
-
- private:
-  AbortReasonOr<Ok> traverseBytecode();
-  AbortReasonOr<Ok> startTraversingBlock(MBasicBlock* block);
-  AbortReasonOr<Ok> processIterators();
-  AbortReasonOr<Ok> inspectOpcode(JSOp op, bool* restarted);
-  uint32_t readIndex(jsbytecode* pc);
-  JSAtom* readAtom(jsbytecode* pc);
-
-  void spew(const char* message);
-
-  JSFunction* getSingleCallTarget(TemporaryTypeSet* calleeTypes);
-  AbortReasonOr<Ok> getPolyCallTargets(TemporaryTypeSet* calleeTypes,
-                                       bool constructing,
-                                       InliningTargets& targets,
-                                       uint32_t maxTargets);
-
-  AbortReasonOr<Ok> analyzeNewLoopTypes(MBasicBlock* entry);
-  AbortReasonOr<Ok> analyzeNewLoopTypesForLocation(
-      MBasicBlock* entry, const BytecodeLocation loc,
-      const mozilla::Maybe<BytecodeLocation>& last_,
-      const mozilla::Maybe<BytecodeLocation>& earlier);
-
-  AbortReasonOr<MBasicBlock*> newBlock(size_t stackDepth, jsbytecode* pc,
-                                       MBasicBlock* maybePredecessor = nullptr);
-  AbortReasonOr<MBasicBlock*> newBlock(MBasicBlock* predecessor, jsbytecode* pc,
-                                       MResumePoint* priorResumePoint);
-  AbortReasonOr<MBasicBlock*> newBlockPopN(MBasicBlock* predecessor,
-                                           jsbytecode* pc, uint32_t popped);
-  AbortReasonOr<MBasicBlock*> newBlockAfter(
-      MBasicBlock* at, size_t stackDepth, jsbytecode* pc,
-      MBasicBlock* maybePredecessor = nullptr);
-  AbortReasonOr<MBasicBlock*> newOsrPreheader(MBasicBlock* header,
-                                              jsbytecode* loopHead);
-  AbortReasonOr<MBasicBlock*> newPendingLoopHeader(MBasicBlock* predecessor,
-                                                   jsbytecode* pc, bool osr);
-
-  AbortReasonOr<MBasicBlock*> newBlock(MBasicBlock* predecessor,
-                                       jsbytecode* pc) {
-    return newBlock(predecessor->stackDepth(), pc, predecessor);
-  }
-
-  AbortReasonOr<Ok> addPendingEdge(const PendingEdge& edge, jsbytecode* target);
-
-  AbortReasonOr<Ok> jsop_loophead();
-
-  AbortReasonOr<Ok> visitJumpTarget(JSOp op);
-  AbortReasonOr<Ok> visitTest(JSOp op, bool* restarted);
-  AbortReasonOr<Ok> visitTestBackedge(JSOp op, bool* restarted);
-  AbortReasonOr<Ok> visitReturn(JSOp op);
-  AbortReasonOr<Ok> visitGoto(jsbytecode* target);
-  AbortReasonOr<Ok> visitBackEdge(bool* restarted);
-  AbortReasonOr<Ok> visitTry();
-  AbortReasonOr<Ok> visitThrow();
-  AbortReasonOr<Ok> visitTableSwitch();
-
-  // We want to make sure that our MTest instructions all check whether the
-  // thing being tested might emulate undefined.  So we funnel their creation
-  // through this method, to make sure that happens.  We don't want to just do
-  // the check in MTest::New, because that can run on background compilation
-  // threads, and we're not sure it's safe to touch that part of the typeset
-  // from a background thread.
-  MTest* newTest(MDefinition* ins, MBasicBlock* ifTrue, MBasicBlock* ifFalse);
-
-  // Incorporates a type/typeSet into an OSR value for a loop, after the loop
-  // body has been processed.
-  AbortReasonOr<Ok> addOsrValueTypeBarrier(uint32_t slot, MInstruction** def,
-                                           MIRType type,
-                                           TemporaryTypeSet* typeSet);
-  AbortReasonOr<Ok> maybeAddOsrTypeBarriers();
-
-  AbortReasonOr<Ok> emitLoopHeadInstructions(jsbytecode* pc);
-
-  // Restarts processing of a loop if the type information at its header was
-  // incomplete.
-  AbortReasonOr<Ok> restartLoop(MBasicBlock* header);
-
-  // Please see the Big Honkin' Comment about how resume points work in
-  // IonBuilder.cpp, near the definition for this function.
-  AbortReasonOr<Ok> resume(MInstruction* ins, jsbytecode* pc,
-                           MResumePoint::Mode mode);
-  AbortReasonOr<Ok> resumeAt(MInstruction* ins, jsbytecode* pc);
-  AbortReasonOr<Ok> resumeAfter(MInstruction* ins);
-  AbortReasonOr<Ok> maybeInsertResume();
-
-  void insertRecompileCheck(jsbytecode* pc);
-
-  bool usesEnvironmentChain();
-
-  AbortReasonOr<Ok> initParameters();
-  void initLocals();
-  void rewriteParameter(uint32_t slotIdx, MDefinition* param);
-  AbortReasonOr<Ok> rewriteParameters();
-  AbortReasonOr<Ok> initEnvironmentChain(MDefinition* callee = nullptr);
-  void initArgumentsObject();
-  void pushConstant(const Value& v);
-
-  MConstant* constant(const Value& v);
-  MConstant* constantInt(int32_t i);
-  MInstruction* initializedLength(MDefinition* elements);
-  MInstruction* setInitializedLength(MDefinition* obj, size_t count);
-
-  // Improve the type information at tests
-  AbortReasonOr<Ok> improveTypesAtTest(MDefinition* ins, bool trueBranch,
-                                       MTest* test);
-  AbortReasonOr<Ok> improveTypesAtTestSuccessor(MTest* test,
-                                                MBasicBlock* successor);
-  AbortReasonOr<Ok> improveTypesAtCompare(MCompare* ins, bool trueBranch,
-                                          MTest* test);
-  AbortReasonOr<Ok> improveTypesAtNullOrUndefinedCompare(MCompare* ins,
-                                                         bool trueBranch,
-                                                         MTest* test);
-  AbortReasonOr<Ok> improveTypesAtTypeOfCompare(MCompare* ins, bool trueBranch,
-                                                MTest* test);
-
-  AbortReasonOr<Ok> replaceTypeSet(MDefinition* subject, TemporaryTypeSet* type,
-                                   MTest* test);
-
-  // Add a guard which ensure that the set of type which goes through this
-  // generated code correspond to the observed types for the bytecode.
-  MDefinition* addTypeBarrier(MDefinition* def, TemporaryTypeSet* observed,
-                              BarrierKind kind,
-                              MTypeBarrier** pbarrier = nullptr);
-  AbortReasonOr<Ok> pushTypeBarrier(MDefinition* def,
-                                    TemporaryTypeSet* observed,
-                                    BarrierKind kind);
-
-  // As pushTypeBarrier, but will compute the needBarrier boolean itself based
-  // on observed and the JSFunction that we're planning to call. The
-  // JSFunction must be a DOM method or getter.
-  AbortReasonOr<Ok> pushDOMTypeBarrier(MInstruction* ins,
-                                       TemporaryTypeSet* observed,
-                                       JSFunction* func);
-
-  // If definiteType is not known or def already has the right type, just
-  // returns def.  Otherwise, returns an MInstruction that has that definite
-  // type, infallibly unboxing ins as needed.  The new instruction will be
-  // added to |current| in this case.
-  MDefinition* ensureDefiniteType(MDefinition* def, MIRType definiteType);
-
-  void maybeMarkEmpty(MDefinition* ins);
-
-  JSObject* getSingletonPrototype(JSFunction* target);
-
-  MDefinition* createThisScripted(MDefinition* callee, MDefinition* newTarget);
-  MDefinition* createThisScriptedSingleton(JSFunction* target);
-  MDefinition* createThisScriptedBaseline(MDefinition* callee);
-  MDefinition* createThisSlow(MDefinition* callee, MDefinition* newTarget,
-                              bool inlining);
-  MDefinition* createThis(JSFunction* target, MDefinition* callee,
-                          MDefinition* newTarget, bool inlining);
-  MInstruction* createNamedLambdaObject(MDefinition* callee,
-                                        MDefinition* envObj);
-  AbortReasonOr<MInstruction*> createCallObject(MDefinition* callee,
-                                                MDefinition* envObj);
-
-  // Returns true if a property hasn't been overwritten and matches the given
-  // predicate. Adds type constraints to ensure recompilation happens if the
-  // property value ever changes.
-  bool propertyIsConstantFunction(NativeObject* nobj, jsid id,
-                                  bool (*test)(IonBuilder* builder,
-                                               JSFunction* fun));
-
-  bool ensureArrayPrototypeIteratorNotModified();
-  bool ensureArrayIteratorPrototypeNextNotModified();
-
-  MDefinition* walkEnvironmentChain(unsigned hops);
-
-  MInstruction* addConvertElementsToDoubles(MDefinition* elements);
-  MDefinition* addMaybeCopyElementsForWrite(MDefinition* object,
-                                            bool checkNative);
-
-  MInstruction* addBoundsCheck(MDefinition* index, MDefinition* length);
-
-  MInstruction* addShapeGuard(MDefinition* obj, Shape* const shape);
-
-  MInstruction* addGuardReceiverPolymorphic(
-      MDefinition* obj, const BaselineInspector::ReceiverVector& receivers);
-
-  bool invalidatedIdempotentCache();
-
-  AbortReasonOr<Ok> loadSlot(MDefinition* obj, size_t slot, size_t nfixed,
-                             MIRType rvalType, BarrierKind barrier,
-                             TemporaryTypeSet* types);
-  AbortReasonOr<Ok> loadSlot(MDefinition* obj, Shape* shape, MIRType rvalType,
-                             BarrierKind barrier, TemporaryTypeSet* types);
-  AbortReasonOr<Ok> storeSlot(MDefinition* obj, size_t slot, size_t nfixed,
-                              MDefinition* value, bool needsBarrier,
-                              MIRType slotType = MIRType::None);
-  AbortReasonOr<Ok> storeSlot(MDefinition* obj, Shape* shape,
-                              MDefinition* value, bool needsBarrier,
-                              MIRType slotType = MIRType::None);
-  bool shouldAbortOnPreliminaryGroups(MDefinition* obj);
-
-  MDefinition* tryInnerizeWindow(MDefinition* obj);
-  MDefinition* maybeUnboxForPropertyAccess(MDefinition* def);
-
-  // jsop_getprop() helpers.
-  AbortReasonOr<Ok> checkIsDefinitelyOptimizedArguments(MDefinition* obj,
-                                                        bool* isOptimizedArgs);
-  AbortReasonOr<Ok> getPropTryInferredConstant(bool* emitted, MDefinition* obj,
-                                               PropertyName* name,
-                                               TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryArgumentsLength(bool* emitted, MDefinition* obj);
-  AbortReasonOr<Ok> getPropTryArgumentsCallee(bool* emitted, MDefinition* obj,
-                                              PropertyName* name);
-  AbortReasonOr<Ok> getPropTryConstant(bool* emitted, MDefinition* obj, jsid id,
-                                       TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryNotDefined(bool* emitted, MDefinition* obj,
-                                         jsid id, TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryDefiniteSlot(bool* emitted, MDefinition* obj,
-                                           PropertyName* name,
-                                           BarrierKind barrier,
-                                           TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryModuleNamespace(bool* emitted, MDefinition* obj,
-                                              PropertyName* name,
-                                              BarrierKind barrier,
-                                              TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryCommonGetter(bool* emitted, MDefinition* obj,
-                                           jsid id, TemporaryTypeSet* types,
-                                           bool innerized = false);
-  AbortReasonOr<Ok> getPropTryInlineAccess(bool* emitted, MDefinition* obj,
-                                           PropertyName* name,
-                                           BarrierKind barrier,
-                                           TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryInlineProtoAccess(bool* emitted, MDefinition* obj,
-                                                PropertyName* name,
-                                                TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropTryInnerize(bool* emitted, MDefinition* obj,
-                                       PropertyName* name,
-                                       TemporaryTypeSet* types);
-  AbortReasonOr<Ok> getPropAddCache(MDefinition* obj, PropertyName* name,
-                                    BarrierKind barrier,
-                                    TemporaryTypeSet* types);
-
-  // jsop_setprop() helpers.
-  AbortReasonOr<Ok> setPropTryCommonSetter(bool* emitted, MDefinition* obj,
-                                           PropertyName* name,
-                                           MDefinition* value);
-  AbortReasonOr<Ok> setPropTryCommonDOMSetter(bool* emitted, MDefinition* obj,
-                                              MDefinition* value,
-                                              JSFunction* setter,
-                                              TemporaryTypeSet* objTypes);
-  AbortReasonOr<Ok> setPropTryDefiniteSlot(bool* emitted, MDefinition* obj,
-                                           PropertyName* name,
-                                           MDefinition* value, bool barrier);
-  AbortReasonOr<Ok> setPropTryInlineAccess(bool* emitted, MDefinition* obj,
-                                           PropertyName* name,
-                                           MDefinition* value, bool barrier,
-                                           TemporaryTypeSet* objTypes);
-  AbortReasonOr<Ok> setPropTryCache(bool* emitted, MDefinition* obj,
-                                    PropertyName* name, MDefinition* value,
-                                    bool barrier);
-
-  AbortReasonOr<Ok> arithUnaryBinaryCache(JSOp op, MDefinition* left,
-                                          MDefinition* right);
-
-  // jsop_binary_arith helpers.
-  MBinaryArithInstruction* binaryArithInstruction(JSOp op, MDefinition* left,
-                                                  MDefinition* right);
-  MIRType binaryArithNumberSpecialization(MDefinition* left,
-                                          MDefinition* right);
-  AbortReasonOr<Ok> binaryArithTryConcat(bool* emitted, JSOp op,
-                                         MDefinition* left, MDefinition* right);
-  AbortReasonOr<MBinaryArithInstruction*> binaryArithEmitSpecialized(
-      MDefinition::Opcode op, MIRType specialization, MDefinition* left,
-      MDefinition* right);
-  AbortReasonOr<Ok> binaryArithTrySpecialized(bool* emitted, JSOp op,
-                                              MDefinition* left,
-                                              MDefinition* right);
-  AbortReasonOr<Ok> binaryArithTrySpecializedOnBaselineInspector(
-      bool* emitted, JSOp op, MDefinition* left, MDefinition* right);
-  MDefinition* maybeConvertToNumber(MDefinition* def);
-
-  // jsop_bitop helpers.
-  AbortReasonOr<Ok> binaryBitOpTrySpecialized(bool* emitted, JSOp op,
-                                              MDefinition* left,
-                                              MDefinition* right);
-
-  // jsop_bitnot helpers.
-  AbortReasonOr<Ok> bitnotTrySpecialized(bool* emitted, MDefinition* input);
-
-  // jsop_inc_or_dec helpers.
-  MDefinition* unaryArithConvertToBinary(JSOp op, MDefinition::Opcode* defOp);
-  AbortReasonOr<Ok> unaryArithTrySpecialized(bool* emitted, JSOp op,
-                                             MDefinition* value);
-  AbortReasonOr<Ok> unaryArithTrySpecializedOnBaselineInspector(
-      bool* emitted, JSOp op, MDefinition* value);
-
-  // jsop_pow helpers.
-  AbortReasonOr<Ok> powTrySpecialized(bool* emitted, MDefinition* base,
-                                      MDefinition* power, MIRType outputType);
-
-  // jsop_compare helpers.
-  AbortReasonOr<Ok> compareTrySpecialized(bool* emitted, JSOp op,
-                                          MDefinition* left,
-                                          MDefinition* right);
-  AbortReasonOr<Ok> compareTryBitwise(bool* emitted, JSOp op, MDefinition* left,
-                                      MDefinition* right);
-  AbortReasonOr<Ok> compareTrySpecializedOnBaselineInspector(
-      bool* emitted, JSOp op, MDefinition* left, MDefinition* right);
-  AbortReasonOr<Ok> compareTryBinaryStub(bool* emitted, MDefinition* left,
-                                         MDefinition* right);
-
-  // jsop_newarray helpers.
-  AbortReasonOr<Ok> newArrayTryTemplateObject(bool* emitted,
-                                              JSObject* templateObject,
-                                              uint32_t length);
-  AbortReasonOr<Ok> newArrayTryVM(bool* emitted, JSObject* templateObject,
-                                  uint32_t length);
-
-  // jsop_newobject helpers.
-  AbortReasonOr<Ok> newObjectTryTemplateObject(bool* emitted,
-                                               JSObject* templateObject);
-  AbortReasonOr<Ok> newObjectTryVM(bool* emitted, JSObject* templateObject);
-
-  // jsop_in/jsop_hasown helpers.
-  AbortReasonOr<Ok> inTryDense(bool* emitted, MDefinition* obj,
-                               MDefinition* id);
-  AbortReasonOr<Ok> hasTryNotDefined(bool* emitted, MDefinition* obj,
-                                     MDefinition* id, bool ownProperty);
-  AbortReasonOr<Ok> hasTryDefiniteSlotOrUnboxed(bool* emitted, MDefinition* obj,
-                                                MDefinition* id);
-
-  // jsop_setelem() helpers.
-  AbortReasonOr<Ok> setElemTryTypedArray(bool* emitted, MDefinition* object,
-                                         MDefinition* index,
-                                         MDefinition* value);
-  AbortReasonOr<Ok> initOrSetElemTryDense(bool* emitted, MDefinition* object,
-                                          MDefinition* index,
-                                          MDefinition* value, bool writeHole);
-  AbortReasonOr<Ok> setElemTryArguments(bool* emitted, MDefinition* object);
-  AbortReasonOr<Ok> initOrSetElemTryCache(bool* emitted, MDefinition* object,
-                                          MDefinition* index,
-                                          MDefinition* value);
-
-  AbortReasonOr<Ok> initArrayElemTryFastPath(bool* emitted, MDefinition* obj,
-                                             MDefinition* id,
-                                             MDefinition* value);
-
-  AbortReasonOr<Ok> initArrayElementFastPath(
-      MNewArray* obj, MDefinition* id, MDefinition* value,
-      bool addResumePointAndIncrementInitializedLength);
-
-  AbortReasonOr<Ok> initArrayElement(MDefinition* obj, MDefinition* id,
-                                     MDefinition* value);
-
-  // jsop_getelem() helpers.
-  AbortReasonOr<Ok> getElemTryDense(bool* emitted, MDefinition* obj,
-                                    MDefinition* index);
-  AbortReasonOr<Ok> getElemTryGetProp(bool* emitted, MDefinition* obj,
-                                      MDefinition* index);
-  AbortReasonOr<Ok> getElemTryTypedArray(bool* emitted, MDefinition* obj,
-                                         MDefinition* index);
-  AbortReasonOr<Ok> getElemTryCallSiteObject(bool* emitted, MDefinition* obj,
-                                             MDefinition* index);
-  AbortReasonOr<Ok> getElemTryString(bool* emitted, MDefinition* obj,
-                                     MDefinition* index);
-  AbortReasonOr<Ok> getElemTryArguments(bool* emitted, MDefinition* obj,
-                                        MDefinition* index);
-  AbortReasonOr<Ok> getElemTryArgumentsInlinedConstant(bool* emitted,
-                                                       MDefinition* obj,
-                                                       MDefinition* index);
-  AbortReasonOr<Ok> getElemTryArgumentsInlinedIndex(bool* emitted,
-                                                    MDefinition* obj,
-                                                    MDefinition* index);
-  AbortReasonOr<Ok> getElemAddCache(MDefinition* obj, MDefinition* index);
-
-  TemporaryTypeSet* computeHeapType(const TemporaryTypeSet* objTypes,
-                                    const jsid id);
-
-  enum BoundsChecking { DoBoundsCheck, SkipBoundsCheck };
-
-  MInstruction* addArrayBufferByteLength(MDefinition* obj);
-
-  TypedArrayObject* tryTypedArrayEmbedConstantElements(MDefinition* obj);
-
-  // Add instructions to compute a typed array's length and data.  Also
-  // optionally convert |*index| into a bounds-checked definition, if
-  // requested.
-  //
-  // If you only need the array's length, use addTypedArrayLength below.
-  void addTypedArrayLengthAndData(MDefinition* obj, BoundsChecking checking,
-                                  MDefinition** index, MInstruction** length,
-                                  MInstruction** elements);
-
-  // Add an instruction to compute a typed array's length to the current
-  // block.  If you also need the typed array's data, use the above method
-  // instead.
-  MInstruction* addTypedArrayLength(MDefinition* obj) {
-    MInstruction* length;
-    addTypedArrayLengthAndData(obj, SkipBoundsCheck, nullptr, &length, nullptr);
-    return length;
-  }
-
-  // Add instructions to compute a data view's data and convert |*index| into a
-  // bounds-checked definition.
-  void addDataViewData(MDefinition* obj, Scalar::Type type, MDefinition** index,
-                       MInstruction** elements);
-
-  // Add an instruction to compute a typed array's byte offset to the current
-  // block.
-  MInstruction* addTypedArrayByteOffset(MDefinition* obj);
-
-  AbortReasonOr<Ok> improveThisTypesForCall();
-
-  MDefinition* getCallee();
-  MDefinition* getAliasedVar(EnvironmentCoordinate ec);
-  AbortReasonOr<MDefinition*> addLexicalCheck(MDefinition* input);
-
-  MDefinition* convertToBoolean(MDefinition* input);
-
-  AbortReasonOr<Ok> tryFoldInstanceOf(bool* emitted, MDefinition* lhs,
-                                      JSObject* protoObject);
-  AbortReasonOr<bool> hasOnProtoChain(TypeSet::ObjectKey* key,
-                                      JSObject* protoObject, bool* onProto);
-
-  AbortReasonOr<Ok> jsop_add(MDefinition* left, MDefinition* right);
-  AbortReasonOr<Ok> jsop_bitnot();
-  AbortReasonOr<Ok> jsop_bitop(JSOp op);
-  AbortReasonOr<Ok> jsop_binary_arith(JSOp op);
-  AbortReasonOr<Ok> jsop_binary_arith(JSOp op, MDefinition* left,
-                                      MDefinition* right);
-  AbortReasonOr<Ok> jsop_pow();
-  AbortReasonOr<Ok> jsop_pos();
-  AbortReasonOr<Ok> jsop_neg();
-  AbortReasonOr<Ok> jsop_tonumeric();
-  AbortReasonOr<Ok> jsop_inc_or_dec(JSOp op);
-  AbortReasonOr<Ok> jsop_tostring();
-  AbortReasonOr<Ok> jsop_getarg(uint32_t arg);
-  AbortReasonOr<Ok> jsop_setarg(uint32_t arg);
-  AbortReasonOr<Ok> jsop_defvar();
-  AbortReasonOr<Ok> jsop_deflexical();
-  AbortReasonOr<Ok> jsop_deffun();
-  AbortReasonOr<Ok> jsop_checkGlobalOrEvalDecl();
-  AbortReasonOr<Ok> jsop_notearg();
-  AbortReasonOr<Ok> jsop_throwsetconst();
-  AbortReasonOr<Ok> jsop_checklexical();
-  AbortReasonOr<Ok> jsop_checkaliasedlexical(EnvironmentCoordinate ec);
-  AbortReasonOr<Ok> jsop_funcall(uint32_t argc);
-  AbortReasonOr<Ok> jsop_funapply(uint32_t argc);
-  AbortReasonOr<Ok> jsop_funapplyarguments(uint32_t argc);
-  AbortReasonOr<Ok> jsop_funapplyarray(uint32_t argc);
-  AbortReasonOr<Ok> jsop_spreadcall();
-  AbortReasonOr<Ok> jsop_spreadnew();
-  AbortReasonOr<Ok> jsop_optimize_spreadcall();
-  AbortReasonOr<Ok> jsop_call(uint32_t argc, bool constructing,
-                              bool ignoresReturnValue);
-  AbortReasonOr<Ok> jsop_eval(uint32_t argc);
-  AbortReasonOr<Ok> jsop_label();
-  AbortReasonOr<Ok> jsop_andor(JSOp op);
-  AbortReasonOr<Ok> jsop_dup2();
-  AbortReasonOr<Ok> jsop_goto(bool* restarted);
-  AbortReasonOr<Ok> jsop_loophead(jsbytecode* pc);
-  AbortReasonOr<Ok> jsop_compare(JSOp op);
-  AbortReasonOr<Ok> jsop_compare(JSOp op, MDefinition* left,
-                                 MDefinition* right);
-  AbortReasonOr<Ok> getStaticName(bool* emitted, JSObject* staticObject,
-                                  PropertyName* name,
-                                  MDefinition* lexicalCheck = nullptr);
-  AbortReasonOr<Ok> loadStaticSlot(JSObject* staticObject, BarrierKind barrier,
-                                   TemporaryTypeSet* types, uint32_t slot);
-  AbortReasonOr<Ok> setStaticName(JSObject* staticObject, PropertyName* name);
-  AbortReasonOr<Ok> jsop_getgname(PropertyName* name);
-  AbortReasonOr<Ok> jsop_getname(PropertyName* name);
-  AbortReasonOr<Ok> jsop_intrinsic(PropertyName* name);
-  AbortReasonOr<Ok> jsop_getimport(PropertyName* name);
-  AbortReasonOr<Ok> jsop_bindname(PropertyName* name);
-  AbortReasonOr<Ok> jsop_bindvar();
-  AbortReasonOr<Ok> jsop_getelem();
-  AbortReasonOr<Ok> jsop_getelem_dense(MDefinition* obj, MDefinition* index);
-  AbortReasonOr<Ok> jsop_getelem_typed(MDefinition* obj, MDefinition* index,
-                                       Scalar::Type arrayType);
-  AbortReasonOr<Ok> jsop_setelem();
-  AbortReasonOr<Ok> initOrSetElemDense(
-      TemporaryTypeSet::DoubleConversion conversion, MDefinition* object,
-      MDefinition* index, MDefinition* value, bool writeHole, bool* emitted);
-  AbortReasonOr<Ok> jsop_setelem_typed(Scalar::Type arrayType,
-                                       MDefinition* object, MDefinition* index,
-                                       MDefinition* value);
-  AbortReasonOr<Ok> jsop_length();
-  bool jsop_length_fastPath();
-  AbortReasonOr<Ok> jsop_arguments();
-  AbortReasonOr<Ok> jsop_arguments_getelem();
-  AbortReasonOr<Ok> jsop_rest();
-  AbortReasonOr<Ok> jsop_not();
-  AbortReasonOr<Ok> jsop_envcallee();
-  AbortReasonOr<Ok> jsop_superbase();
-  AbortReasonOr<Ok> jsop_getprop_super(PropertyName* name);
-  AbortReasonOr<Ok> jsop_getelem_super();
-  AbortReasonOr<Ok> jsop_getprop(PropertyName* name);
-  AbortReasonOr<Ok> jsop_setprop(PropertyName* name);
-  AbortReasonOr<Ok> jsop_delprop(PropertyName* name);
-  AbortReasonOr<Ok> jsop_delelem();
-  AbortReasonOr<Ok> jsop_newarray(uint32_t length);
-  AbortReasonOr<Ok> jsop_newarray(JSObject* templateObject, uint32_t length);
-  AbortReasonOr<Ok> jsop_newarray_copyonwrite();
-  AbortReasonOr<Ok> jsop_newobject();
-  AbortReasonOr<Ok> jsop_initelem();
-  AbortReasonOr<Ok> jsop_initelem_inc();
-  AbortReasonOr<Ok> jsop_initelem_array();
-  AbortReasonOr<Ok> jsop_initelem_getter_setter();
-  AbortReasonOr<Ok> jsop_mutateproto();
-  AbortReasonOr<Ok> jsop_initprop(PropertyName* name);
-  AbortReasonOr<Ok> jsop_initprop_getter_setter(PropertyName* name);
-  AbortReasonOr<Ok> jsop_regexp(RegExpObject* reobj);
-  AbortReasonOr<Ok> jsop_object(JSObject* obj);
-  AbortReasonOr<Ok> jsop_classconstructor();
-  AbortReasonOr<Ok> jsop_derivedclassconstructor();
-  AbortReasonOr<Ok> jsop_lambda(JSFunction* fun);
-  AbortReasonOr<Ok> jsop_lambda_arrow(JSFunction* fun);
-  AbortReasonOr<Ok> jsop_funwithproto(JSFunction* fun);
-  AbortReasonOr<Ok> jsop_setfunname(uint8_t prefixKind);
-  AbortReasonOr<Ok> jsop_pushlexicalenv(GCThingIndex index);
-  AbortReasonOr<Ok> jsop_copylexicalenv(bool copySlots);
-  AbortReasonOr<Ok> jsop_functionthis();
-  AbortReasonOr<Ok> jsop_globalthis();
-  AbortReasonOr<Ok> jsop_typeof();
-  AbortReasonOr<Ok> jsop_toasync();
-  AbortReasonOr<Ok> jsop_toasynciter();
-  AbortReasonOr<Ok> jsop_topropertykey();
-  AbortReasonOr<Ok> jsop_iter();
-  AbortReasonOr<Ok> jsop_itermore();
-  AbortReasonOr<Ok> jsop_isnoiter();
-  AbortReasonOr<Ok> jsop_iterend();
-  AbortReasonOr<Ok> jsop_iternext();
-  AbortReasonOr<Ok> jsop_in();
-  AbortReasonOr<Ok> jsop_hasown();
-  AbortReasonOr<Ok> jsop_checkprivatefield();
-  AbortReasonOr<Ok> jsop_instanceof();
-  AbortReasonOr<Ok> jsop_getaliasedvar(EnvironmentCoordinate ec);
-  AbortReasonOr<Ok> jsop_setaliasedvar(EnvironmentCoordinate ec);
-  AbortReasonOr<Ok> jsop_debugger();
-  AbortReasonOr<Ok> jsop_newtarget();
-  AbortReasonOr<Ok> jsop_checkisobj(uint8_t kind);
-  AbortReasonOr<Ok> jsop_checkiscallable(uint8_t kind);
-  AbortReasonOr<Ok> jsop_checkobjcoercible();
-  AbortReasonOr<Ok> jsop_checkclassheritage();
-  AbortReasonOr<Ok> jsop_pushcallobj();
-  AbortReasonOr<Ok> jsop_implicitthis(PropertyName* name);
-  AbortReasonOr<Ok> jsop_importmeta();
-  AbortReasonOr<Ok> jsop_dynamic_import();
-  AbortReasonOr<Ok> jsop_instrumentation_active();
-  AbortReasonOr<Ok> jsop_instrumentation_callback();
-  AbortReasonOr<Ok> jsop_instrumentation_scriptid();
-  AbortReasonOr<Ok> jsop_coalesce();
-  AbortReasonOr<Ok> jsop_objwithproto();
-  AbortReasonOr<Ok> jsop_builtinobject();
-  AbortReasonOr<Ok> jsop_checkreturn();
-  AbortReasonOr<Ok> jsop_checkthis();
-  AbortReasonOr<Ok> jsop_checkthisreinit();
-  AbortReasonOr<Ok> jsop_superfun();
-  AbortReasonOr<Ok> jsop_inithomeobject();
-
-  /* Inlining. */
-
-  enum InliningStatus {
-    InliningStatus_NotInlined,
-    InliningStatus_WarmUpCountTooLow,
-    InliningStatus_Inlined
-  };
-  using InliningResult = AbortReasonOr<InliningStatus>;
-
-  enum InliningDecision {
-    InliningDecision_Error,
-    InliningDecision_Inline,
-    InliningDecision_DontInline,
-    InliningDecision_WarmUpCountTooLow
-  };
-
-  static InliningDecision DontInline(JSScript* targetScript,
-                                     const char* reason);
-
-  // Helper function for canInlineTarget
-  bool hasCommonInliningPath(const JSScript* scriptToInline);
-
-  // Oracles.
-  InliningDecision canInlineTarget(JSFunction* target, CallInfo& callInfo);
-  InliningDecision makeInliningDecision(JSObject* target, CallInfo& callInfo);
-  AbortReasonOr<Ok> selectInliningTargets(const InliningTargets& targets,
-                                          CallInfo& callInfo,
-                                          BoolVector& choiceSet,
-                                          uint32_t* numInlineable);
-
-  OptimizationLevel optimizationLevel() const {
-    return optimizationInfo().level();
-  }
-  bool isHighestOptimizationLevel() const {
-    return IonOptimizations.isLastLevel(optimizationLevel());
-  }
-
-  // Native inlining helpers.
-  // The typeset for the return value of our function.  These are
-  // the types it's been observed returning in the past.
-  TemporaryTypeSet* getInlineReturnTypeSet();
-  // The known MIR type of getInlineReturnTypeSet.
-  MIRType getInlineReturnType();
-
-  // Array natives.
-  InliningResult inlineArray(CallInfo& callInfo, Realm* targetRealm);
-  InliningResult inlineArrayIsArray(CallInfo& callInfo);
-  InliningResult inlineArrayPopShift(CallInfo& callInfo,
-                                     MArrayPopShift::Mode mode);
-  InliningResult inlineArrayPush(CallInfo& callInfo);
-  InliningResult inlineArraySlice(CallInfo& callInfo);
-  InliningResult inlineArrayJoin(CallInfo& callInfo);
-
-  // Boolean natives.
-  InliningResult inlineBoolean(CallInfo& callInfo);
-
-  // DataView natives.
-  InliningResult inlineDataViewGet(CallInfo& callInfo, Scalar::Type type);
-  InliningResult inlineDataViewSet(CallInfo& callInfo, Scalar::Type type);
-
-  // Iterator intrinsics.
-  InliningResult inlineNewIterator(CallInfo& callInfo, MNewIterator::Type type);
-  InliningResult inlineArrayIteratorPrototypeOptimizable(CallInfo& callInfo);
-
-  // Math natives.
-  InliningResult inlineMathAbs(CallInfo& callInfo);
-  InliningResult inlineMathFloor(CallInfo& callInfo);
-  InliningResult inlineMathCeil(CallInfo& callInfo);
-  InliningResult inlineMathClz32(CallInfo& callInfo);
-  InliningResult inlineMathRound(CallInfo& callInfo);
-  InliningResult inlineMathSqrt(CallInfo& callInfo);
-  InliningResult inlineMathAtan2(CallInfo& callInfo);
-  InliningResult inlineMathHypot(CallInfo& callInfo);
-  InliningResult inlineMathMinMax(CallInfo& callInfo, bool max);
-  InliningResult inlineMathPow(CallInfo& callInfo);
-  InliningResult inlineMathRandom(CallInfo& callInfo);
-  InliningResult inlineMathImul(CallInfo& callInfo);
-  InliningResult inlineMathFRound(CallInfo& callInfo);
-  InliningResult inlineMathTrunc(CallInfo& callInfo);
-  InliningResult inlineMathSign(CallInfo& callInfo);
-  InliningResult inlineMathFunction(CallInfo& callInfo,
-                                    UnaryMathFunction function);
-
-  // String natives.
-  InliningResult inlineStringObject(CallInfo& callInfo);
-  InliningResult inlineStrCharCodeAt(CallInfo& callInfo);
-  InliningResult inlineStrFromCharCode(CallInfo& callInfo);
-  InliningResult inlineStrFromCodePoint(CallInfo& callInfo);
-  InliningResult inlineStrCharAt(CallInfo& callInfo);
-  InliningResult inlineStringConvertCase(CallInfo& callInfo,
-                                         MStringConvertCase::Mode mode);
-
-  // String intrinsics.
-  InliningResult inlineStringReplaceString(CallInfo& callInfo);
-  InliningResult inlineConstantStringSplitString(CallInfo& callInfo);
-  InliningResult inlineStringSplitString(CallInfo& callInfo);
-
-  // Reflect natives.
-  InliningResult inlineReflectGetPrototypeOf(CallInfo& callInfo);
-
-  // RegExp intrinsics.
-  InliningResult inlineRegExpMatcher(CallInfo& callInfo);
-  InliningResult inlineRegExpSearcher(CallInfo& callInfo);
-  InliningResult inlineRegExpTester(CallInfo& callInfo);
-  InliningResult inlineIsRegExpObject(CallInfo& callInfo);
-  InliningResult inlineIsPossiblyWrappedRegExpObject(CallInfo& callInfo);
-  InliningResult inlineRegExpPrototypeOptimizable(CallInfo& callInfo);
-  InliningResult inlineRegExpInstanceOptimizable(CallInfo& callInfo);
-  InliningResult inlineGetFirstDollarIndex(CallInfo& callInfo);
-
-  // Object natives and intrinsics.
-  InliningResult inlineObject(CallInfo& callInfo);
-  InliningResult inlineObjectCreate(CallInfo& callInfo);
-  InliningResult inlineObjectIs(CallInfo& callInfo);
-  InliningResult inlineObjectIsPrototypeOf(CallInfo& callInfo);
-  InliningResult inlineObjectToString(CallInfo& callInfo);
-  InliningResult inlineDefineDataProperty(CallInfo& callInfo);
-
-  // Atomics natives.
-  InliningResult inlineAtomicsCompareExchange(CallInfo& callInfo);
-  InliningResult inlineAtomicsExchange(CallInfo& callInfo);
-  InliningResult inlineAtomicsLoad(CallInfo& callInfo);
-  InliningResult inlineAtomicsStore(CallInfo& callInfo);
-  InliningResult inlineAtomicsBinop(CallInfo& callInfo, InlinableNative target);
-  InliningResult inlineAtomicsIsLockFree(CallInfo& callInfo);
-
-  // Slot intrinsics.
-  InliningResult inlineUnsafeSetReservedSlot(CallInfo& callInfo);
-  InliningResult inlineUnsafeGetReservedSlot(CallInfo& callInfo,
-                                             MIRType knownValueType);
-
-  // Map and Set intrinsics.
-  InliningResult inlineGetNextEntryForIterator(
-      CallInfo& callInfo, MGetNextEntryForIterator::Mode mode);
-
-  // ArrayBuffer intrinsics.
-  InliningResult inlineArrayBufferByteLength(CallInfo& callInfo);
-  InliningResult inlinePossiblyWrappedArrayBufferByteLength(CallInfo& callInfo);
-
-  // TypedArray intrinsics.
-  enum WrappingBehavior { AllowWrappedTypedArrays, RejectWrappedTypedArrays };
-  InliningResult inlineTypedArray(CallInfo& callInfo, Native native);
-  InliningResult inlineIsTypedArrayConstructor(CallInfo& callInfo);
-  InliningResult inlineIsTypedArrayHelper(CallInfo& callInfo,
-                                          WrappingBehavior wrappingBehavior);
-  InliningResult inlineIsTypedArray(CallInfo& callInfo);
-  InliningResult inlineIsPossiblyWrappedTypedArray(CallInfo& callInfo);
-  InliningResult inlineTypedArrayLength(CallInfo& callInfo);
-  InliningResult inlinePossiblyWrappedTypedArrayLength(CallInfo& callInfo);
-  InliningResult inlineTypedArrayByteOffset(CallInfo& callInfo);
-  InliningResult inlineTypedArrayElementShift(CallInfo& callInfo);
-
-  // Utility intrinsics.
-  InliningResult inlineIsCallable(CallInfo& callInfo);
-  InliningResult inlineIsConstructor(CallInfo& callInfo);
-  InliningResult inlineIsObject(CallInfo& callInfo);
-  InliningResult inlineToObject(CallInfo& callInfo);
-  InliningResult inlineIsCrossRealmArrayConstructor(CallInfo& callInfo);
-  InliningResult inlineToInteger(CallInfo& callInfo);
-  InliningResult inlineToLength(CallInfo& callInfo);
-  InliningResult inlineDump(CallInfo& callInfo);
-  InliningResult inlineGuardToClass(CallInfo& callInfo, InlinableNative native);
-  InliningResult inlineIsConstructing(CallInfo& callInfo);
-  InliningResult inlineSubstringKernel(CallInfo& callInfo);
-  InliningResult inlineObjectHasPrototype(CallInfo& callInfo);
-  InliningResult inlineFinishBoundFunctionInit(CallInfo& callInfo);
-  InliningResult inlineIsPackedArray(CallInfo& callInfo);
-  InliningResult inlineWasmCall(CallInfo& callInfo, JSFunction* target);
-
-  // Testing functions.
-  InliningResult inlineBailout(CallInfo& callInfo);
-  InliningResult inlineAssertFloat32(CallInfo& callInfo);
-  InliningResult inlineAssertRecoveredOnBailout(CallInfo& callInfo);
-
-  // Bind function.
-  InliningResult inlineBoundFunction(CallInfo& callInfo, JSFunction* target);
-
-  // Main inlining functions
-  InliningResult inlineNativeCall(CallInfo& callInfo, JSFunction* target);
-  InliningResult inlineNativeGetter(CallInfo& callInfo, JSFunction* target);
-  InliningResult inlineScriptedCall(CallInfo& callInfo, JSFunction* target);
-  InliningResult inlineSingleCall(CallInfo& callInfo, JSObject* target);
-
-  // Call functions
-  InliningResult inlineCallsite(const InliningTargets& targets,
-                                CallInfo& callInfo);
-  AbortReasonOr<Ok> inlineCalls(CallInfo& callInfo,
-                                const InliningTargets& targets,
-                                BoolVector& choiceSet,
-                                MGetPropertyCache* maybeCache);
-
-  // Inlining helpers.
-  AbortReasonOr<Ok> inlineGenericFallback(
-      const mozilla::Maybe<CallTargets>& targets, CallInfo& callInfo,
-      MBasicBlock* dispatchBlock);
-  AbortReasonOr<Ok> inlineObjectGroupFallback(
-      const mozilla::Maybe<CallTargets>& targets, CallInfo& callInfo,
-      MBasicBlock* dispatchBlock, MObjectGroupDispatch* dispatch,
-      MGetPropertyCache* cache, MBasicBlock** fallbackTarget);
-
-  enum AtomicCheckResult { DontCheckAtomicResult, DoCheckAtomicResult };
-
-  bool atomicsMeetsPreconditions(
-      CallInfo& callInfo, Scalar::Type* arrayElementType,
-      TemporaryTypeSet::TypedArraySharedness* sharedness,
-      AtomicCheckResult checkResult = DoCheckAtomicResult);
-  void atomicsCheckBounds(CallInfo& callInfo, MInstruction** elements,
-                          MDefinition** index);
-
-  bool testNeedsArgumentCheck(JSFunction* target, CallInfo& callInfo);
-
-  AbortReasonOr<MCall*> makeCallHelper(
-      const mozilla::Maybe<CallTargets>& targets, CallInfo& callInfo);
-  AbortReasonOr<Ok> makeCall(const mozilla::Maybe<CallTargets>& targets,
-                             CallInfo& callInfo);
-  AbortReasonOr<Ok> makeCall(JSFunction* target, CallInfo& callInfo);
-
-  MDefinition* patchInlinedReturn(JSFunction* target, CallInfo& callInfo,
-                                  MBasicBlock* exit, MBasicBlock* bottom);
-  MDefinition* patchInlinedReturns(JSFunction* target, CallInfo& callInfo,
-                                   MIRGraphReturns& returns,
-                                   MBasicBlock* bottom);
-  MDefinition* specializeInlinedReturn(MDefinition* rdef, MBasicBlock* exit);
-
-  NativeObject* commonPrototypeWithGetterSetter(TemporaryTypeSet* types,
-                                                jsid id, bool isGetter,
-                                                JSFunction* getterOrSetter,
-                                                bool* guardGlobal);
-  AbortReasonOr<Ok> freezePropertiesForCommonPrototype(
-      TemporaryTypeSet* types, jsid id, JSObject* foundProto,
-      bool allowEmptyTypesForGlobal);
-  /*
-   * Callers must pass a non-null globalGuard if they pass a non-null
-   * globalShape.
-   */
-  AbortReasonOr<bool> testCommonGetterSetter(
-      TemporaryTypeSet* types, jsid id, bool isGetter,
-      JSFunction* getterOrSetter, MDefinition** guard,
-      Shape* globalShape = nullptr, MDefinition** globalGuard = nullptr);
-  AbortReasonOr<bool> testShouldDOMCall(TypeSet* inTypes, JSFunction* func,
-                                        JSJitInfo::OpType opType);
-
-  MDefinition* addShapeGuardsForGetterSetter(
-      MDefinition* obj, JSObject* holder, Shape* holderShape,
-      const BaselineInspector::ReceiverVector& receivers, bool isOwnProperty);
-
-  AbortReasonOr<Ok> annotateGetPropertyCache(MDefinition* obj,
-                                             PropertyName* name,
-                                             MGetPropertyCache* getPropCache,
-                                             TemporaryTypeSet* objTypes,
-                                             TemporaryTypeSet* pushedTypes);
-
-  MGetPropertyCache* getInlineableGetPropertyCache(CallInfo& callInfo);
-
-  JSObject* testGlobalLexicalBinding(PropertyName* name);
-
-  JSObject* testSingletonProperty(JSObject* obj, jsid id);
-  JSObject* testSingletonPropertyTypes(MDefinition* obj, jsid id);
-
-  AbortReasonOr<bool> testNotDefinedProperty(MDefinition* obj, jsid id,
-                                             bool ownProperty = false);
-
-  uint32_t getDefiniteSlot(TemporaryTypeSet* types, jsid id, uint32_t* pnfixed);
-
-  AbortReasonOr<Ok> checkPreliminaryGroups(MDefinition* obj);
-  AbortReasonOr<Ok> freezePropTypeSets(TemporaryTypeSet* types,
-                                       JSObject* foundProto,
-                                       PropertyName* name);
-  bool canInlinePropertyOpShapes(
-      const BaselineInspector::ReceiverVector& receivers);
-
-  TemporaryTypeSet* bytecodeTypes(jsbytecode* pc);
-
-  // Use one of the below methods for updating the current block, rather than
-  // updating |current| directly. setCurrent() should only be used in cases
-  // where the block cannot have phis whose type needs to be computed.
-
-  AbortReasonOr<Ok> setCurrentAndSpecializePhis(MBasicBlock* block) {
-    MOZ_ASSERT(block);
-    if (!block->specializePhis(alloc())) {
-      return abort(AbortReason::Alloc);
-    }
-    setCurrent(block);
-    return Ok();
-  }
-
-  void setCurrent(MBasicBlock* block) {
-    MOZ_ASSERT(block);
-    current = block;
-  }
-
-  bool hasTerminatedBlock() const { return current == nullptr; }
-  void setTerminatedBlock() { current = nullptr; }
-
-  // A builder is inextricably tied to a particular script.
-  JSScript* script_;
-
-  // Some aborts are actionable (e.g., using an unsupported bytecode). When
-  // optimization tracking is enabled, the location and message of the abort
-  // are recorded here so they may be propagated to the script's
-  // corresponding JitcodeGlobalEntry::BaselineEntry.
-  JSScript* actionableAbortScript_;
-  jsbytecode* actionableAbortPc_;
-  const char* actionableAbortMessage_;
-
- public:
-  using ObjectGroupVector = Vector<ObjectGroup*, 0, JitAllocPolicy>;
-
-  void checkNurseryCell(gc::Cell* cell);
-  JSObject* checkNurseryObject(JSObject* obj);
-
-  JSScript* script() const { return script_; }
-
-  TIOracle& tiOracle() { return tiOracle_; }
-
-  CompilerConstraintList* constraints() { return constraints_; }
-
-  bool isInlineBuilder() const { return callerBuilder_ != nullptr; }
-
-  const JSAtomState& names() { return realm->runtime()->names(); }
-
-  bool hadActionableAbort() const {
-    MOZ_ASSERT(!actionableAbortScript_ ||
-               (actionableAbortPc_ && actionableAbortMessage_));
-    return actionableAbortScript_ != nullptr;
-  }
-
-  void actionableAbortLocationAndMessage(JSScript** abortScript,
-                                         jsbytecode** abortPc,
-                                         const char** abortMessage) {
-    MOZ_ASSERT(hadActionableAbort());
-    *abortScript = actionableAbortScript_;
-    *abortPc = actionableAbortPc_;
-    *abortMessage = actionableAbortMessage_;
-  }
-
- private:
-  AbortReasonOr<Ok> init();
-
-  JSContext* analysisContext;
-  BaselineFrameInspector* baselineFrame_;
-
-  // Constraints for recording dependencies on type information.
-  CompilerConstraintList* constraints_;
-
-  MIRGenerator& mirGen_;
-  TIOracle tiOracle_;
-
-  CompileRealm* realm;
-  const CompileInfo* info_;
-  const OptimizationInfo* optimizationInfo_;
-  TempAllocator* alloc_;
-  MIRGraph* graph_;
-
-  TemporaryTypeSet* thisTypes;
-  TemporaryTypeSet* argTypes;
-  TemporaryTypeSet* typeArray;
-  uint32_t typeArrayHint;
-  uint32_t* bytecodeTypeMap;
-
-  jsbytecode* pc;
-  jsbytecode* nextpc = nullptr;
-
-  // The current MIR block. This can be nullptr after a block has been
-  // terminated, for example right after a 'return' or 'break' statement.
-  MBasicBlock* current = nullptr;
-
-  uint32_t loopDepth_;
-
-  PendingEdgesMap pendingEdges_;
-  LoopStateStack loopStack_;
-
-  Vector<BytecodeSite*, 0, JitAllocPolicy> trackedOptimizationSites_;
-
-  ObjectGroupVector abortedPreliminaryGroups_;
-
-  BytecodeSite* bytecodeSite(jsbytecode* pc) {
-    MOZ_ASSERT(info().inlineScriptTree()->script()->containsPC(pc));
-    return new (alloc()) BytecodeSite(info().inlineScriptTree(), pc);
-  }
-
-  /* Information used for inline-call builders. */
-  MResumePoint* callerResumePoint_;
-  jsbytecode* callerPC() {
-    return callerResumePoint_ ? callerResumePoint_->pc() : nullptr;
-  }
-  IonBuilder* callerBuilder_;
-
-  IonBuilder* outermostBuilder();
-
-  struct LoopHeader {
-    jsbytecode* pc;
-    MBasicBlock* header;
-
-    LoopHeader(jsbytecode* pc, MBasicBlock* header) : pc(pc), header(header) {}
-  };
-
-  PhiVector iterators_;
-  Vector<LoopHeader, 0, JitAllocPolicy> loopHeaders_;
-
-  BaselineInspector* inspector;
-
-  size_t inliningDepth_;
-
-  // Total bytecode length of all inlined scripts. Only tracked for the
-  // outermost builder.
-  size_t inlinedBytecodeLength_;
-
-  // Cutoff to disable compilation if excessive time is spent reanalyzing
-  // loop bodies to compute a fixpoint of the types for loop variables.
-  static const size_t MAX_LOOP_RESTARTS = 40;
-  size_t numLoopRestarts_;
-
-  // True if script->failedBoundsCheck is set for the current script or
-  // an outer script.
-  bool failedBoundsCheck_;
-
-  // True if script->failedShapeGuard is set for the current script or
-  // an outer script.
-  bool failedShapeGuard_;
-
-  // True if script->failedLexicalCheck_ is set for the current script or
-  // an outer script.
-  bool failedLexicalCheck_;
-
-#ifdef DEBUG
-  // If this script uses the lazy arguments object.
-  bool hasLazyArguments_;
-#endif
-
-  // If this is an inline builder, the call info for the builder.
-  const CallInfo* inlineCallInfo_;
-
-  // When compiling a call with multiple targets, we are first creating a
-  // MGetPropertyCache.  This MGetPropertyCache is following the bytecode, and
-  // is used to recover the JSFunction.  In some cases, the Type of the object
-  // which own the property is enough for dispatching to the right function.
-  // In such cases we do not have read the property, except when the type
-  // object is unknown.
-  //
-  // As an optimization, we can dispatch a call based on the object group,
-  // without doing the MGetPropertyCache.  This is what is achieved by
-  // |IonBuilder::inlineCalls|.  As we might not know all the functions, we
-  // are adding a fallback path, where this MGetPropertyCache would be moved
-  // into.
-  //
-  // In order to build the fallback path, we have to capture a resume point
-  // ahead, for the potential fallback path.  This resume point is captured
-  // while building MGetPropertyCache.  It is capturing the state of Baseline
-  // before the execution of the MGetPropertyCache, such as we can safely do
-  // it in the fallback path.
-  //
-  // This field is used to discard the resume point if it is not used for
-  // building a fallback path.
-
-  // Discard the prior resume point while setting a new MGetPropertyCache.
-  void replaceMaybeFallbackFunctionGetter(MGetPropertyCache* cache);
-
-  // Discard the MGetPropertyCache if it is handled by WrapMGetPropertyCache.
-  void keepFallbackFunctionGetter(MGetPropertyCache* cache) {
-    if (cache == maybeFallbackFunctionGetter_) {
-      maybeFallbackFunctionGetter_ = nullptr;
-    }
-  }
-
-  MGetPropertyCache* maybeFallbackFunctionGetter_;
-
-  bool needsPostBarrier(MDefinition* value);
-
-  void addAbortedPreliminaryGroup(ObjectGroup* group);
-
-  MIRGraph& graph() { return *graph_; }
-  const CompileInfo& info() const { return *info_; }
-
-  const OptimizationInfo& optimizationInfo() const {
-    return *optimizationInfo_;
-  }
-
-  bool forceInlineCaches() {
-    return MOZ_UNLIKELY(JitOptions.forceInlineCaches);
-  }
-
- public:
-  MIRGenerator& mirGen() { return mirGen_; }
-  TempAllocator& alloc() { return *alloc_; }
-
-  // When aborting with AbortReason::PreliminaryObjects, all groups with
-  // preliminary objects which haven't been analyzed yet.
-  const ObjectGroupVector& abortedPreliminaryGroups() const {
-    return abortedPreliminaryGroups_;
-  }
-};
-
-}  // namespace jit
-}  // namespace js
-
-#endif /* jit_IonBuilder_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/IonCacheIRCompiler.cpp firefox-85.0+build1/js/src/jit/IonCacheIRCompiler.cpp
--- firefox-84.0.2+build1/js/src/jit/IonCacheIRCompiler.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonCacheIRCompiler.cpp	2021-01-18 19:58:12.000000000 +0000
@@ -30,7 +30,6 @@
 #include "jit/MacroAssembler-inl.h"
 #include "jit/VMFunctionList-inl.h"
 #include "vm/Realm-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -44,15 +43,15 @@
 namespace jit {
 
 // IonCacheIRCompiler compiles CacheIR to IonIC native code.
-IonCacheIRCompiler::IonCacheIRCompiler(
-    JSContext* cx, const CacheIRWriter& writer, IonIC* ic, IonScript* ionScript,
-    const PropertyTypeCheckInfo* typeCheckInfo, uint32_t stubDataOffset)
+IonCacheIRCompiler::IonCacheIRCompiler(JSContext* cx,
+                                       const CacheIRWriter& writer, IonIC* ic,
+                                       IonScript* ionScript,
+                                       uint32_t stubDataOffset)
     : CacheIRCompiler(cx, writer, stubDataOffset, Mode::Ion,
                       StubFieldPolicy::Constant),
       writer_(writer),
       ic_(ic),
       ionScript_(ionScript),
-      typeCheckInfo_(typeCheckInfo),
       savedLiveRegs_(false) {
   MOZ_ASSERT(ic_);
   MOZ_ASSERT(ionScript_);
@@ -76,10 +75,6 @@
   callVMInternal(masm, id);
 }
 
-bool IonCacheIRCompiler::needsPostBarrier() const {
-  return ic_->asSetPropertyIC()->needsPostBarrier();
-}
-
 void IonCacheIRCompiler::pushStubCodePointer() {
   stubJitCodeOffset_.emplace(masm.PushWithPatch(ImmPtr((void*)-1)));
 }
@@ -287,23 +282,13 @@
     case CacheKind::GetProp:
     case CacheKind::GetElem: {
       IonGetPropertyIC* ic = ic_->asGetPropertyIC();
-      TypedOrValueRegister output = ic->output();
-
-      if (output.hasValue()) {
-        available.add(output.valueReg());
-      } else if (!output.typedReg().isFloat()) {
-        available.add(output.typedReg().gpr());
-      }
+      ValueOperand output = ic->output();
 
-      if (ic->maybeTemp() != InvalidReg) {
-        available.add(ic->maybeTemp());
-      }
+      available.add(output);
 
       liveRegs_.emplace(ic->liveRegs());
       outputUnchecked_.emplace(output);
 
-      allowDoubleResult_.emplace(ic->allowDoubleResult());
-
       MOZ_ASSERT(numInputs == 1 || numInputs == 2);
 
       allocator.initInputLocation(0, ic->value());
@@ -315,15 +300,13 @@
     case CacheKind::GetPropSuper:
     case CacheKind::GetElemSuper: {
       IonGetPropSuperIC* ic = ic_->asGetPropSuperIC();
-      TypedOrValueRegister output = ic->output();
+      ValueOperand output = ic->output();
 
-      available.add(output.valueReg());
+      available.add(output);
 
       liveRegs_.emplace(ic->liveRegs());
       outputUnchecked_.emplace(output);
 
-      allowDoubleResult_.emplace(true);
-
       MOZ_ASSERT(numInputs == 2 || numInputs == 3);
 
       allocator.initInputLocation(0, ic->object(), JSVAL_TYPE_OBJECT);
@@ -1269,149 +1252,6 @@
   return true;
 }
 
-static void EmitCheckPropertyTypes(MacroAssembler& masm,
-                                   const PropertyTypeCheckInfo* typeCheckInfo,
-                                   Register obj, const ConstantOrRegister& val,
-                                   const LiveRegisterSet& liveRegs,
-                                   Label* failures) {
-  // Emit code to check |val| is part of the property's HeapTypeSet.
-
-  if (!typeCheckInfo->isSet()) {
-    return;
-  }
-
-  ObjectGroup* group = typeCheckInfo->group();
-  AutoSweepObjectGroup sweep(group);
-  if (group->unknownProperties(sweep)) {
-    return;
-  }
-
-  jsid id = typeCheckInfo->id();
-  HeapTypeSet* propTypes = group->maybeGetProperty(sweep, id);
-  if (propTypes && propTypes->unknown()) {
-    return;
-  }
-
-  // Use the object register as scratch, as we don't need it here.
-  masm.Push(obj);
-  Register scratch1 = obj;
-
-  // We may also need a scratch register for guardTypeSet. Additionally,
-  // spectreRegToZero is the register that may be zeroed on speculatively
-  // executed paths.
-  Register objScratch = InvalidReg;
-  Register spectreRegToZero = InvalidReg;
-  if (propTypes && !propTypes->unknownObject() &&
-      propTypes->getObjectCount() > 0) {
-    AllocatableGeneralRegisterSet regs(GeneralRegisterSet::All());
-    if (!val.constant()) {
-      TypedOrValueRegister valReg = val.reg();
-      if (valReg.hasValue()) {
-        regs.take(valReg.valueReg());
-        spectreRegToZero = valReg.valueReg().payloadOrValueReg();
-      } else if (!valReg.typedReg().isFloat()) {
-        regs.take(valReg.typedReg().gpr());
-        spectreRegToZero = valReg.typedReg().gpr();
-      }
-    }
-    regs.take(scratch1);
-    objScratch = regs.takeAny();
-    masm.Push(objScratch);
-  }
-
-  bool checkTypeSet = true;
-  Label failedFastPath;
-
-  if (propTypes && !propTypes->nonConstantProperty()) {
-    masm.jump(&failedFastPath);
-  }
-
-  if (val.constant()) {
-    // If the input is a constant, then don't bother if the barrier will always
-    // fail.
-    if (!propTypes || !propTypes->hasType(TypeSet::GetValueType(val.value()))) {
-      masm.jump(&failedFastPath);
-    }
-    checkTypeSet = false;
-  } else {
-    // We can do the same trick as above for primitive types of specialized
-    // registers.
-    TypedOrValueRegister reg = val.reg();
-    if (reg.hasTyped() && reg.type() != MIRType::Object) {
-      MIRType type = reg.type();
-      if (!propTypes || !propTypes->hasType(TypeSet::PrimitiveType(type))) {
-        masm.jump(&failedFastPath);
-      }
-      checkTypeSet = false;
-    }
-  }
-
-  Label done;
-  if (checkTypeSet) {
-    TypedOrValueRegister valReg = val.reg();
-    if (propTypes) {
-      // guardTypeSet can read from type sets without triggering read barriers.
-      TypeSet::readBarrier(propTypes);
-      masm.guardTypeSet(valReg, propTypes, BarrierKind::TypeSet, scratch1,
-                        objScratch, spectreRegToZero, &failedFastPath);
-      masm.jump(&done);
-    } else {
-      masm.jump(&failedFastPath);
-    }
-  }
-
-  if (failedFastPath.used()) {
-    // The inline type check failed. Do a callWithABI to check the current
-    // TypeSet in case the type was added after we generated this stub.
-    masm.bind(&failedFastPath);
-
-    AllocatableRegisterSet regs(GeneralRegisterSet::Volatile(),
-                                liveRegs.fpus());
-    LiveRegisterSet save(regs.asLiveSet());
-    masm.PushRegsInMask(save);
-
-    regs.takeUnchecked(scratch1);
-
-    // Push |val| first to make sure everything is fine if |val| aliases
-    // scratch2.
-    Register scratch2 = regs.takeAnyGeneral();
-    masm.Push(val);
-    masm.moveStackPtrTo(scratch2);
-
-    Register scratch3 = regs.takeAnyGeneral();
-    masm.Push(id, scratch3);
-    masm.moveStackPtrTo(scratch3);
-
-    using Fn = bool (*)(ObjectGroup * group, jsid * id, Value * v);
-    masm.setupUnalignedABICall(scratch1);
-    masm.movePtr(ImmGCPtr(group), scratch1);
-    masm.passABIArg(scratch1);
-    masm.passABIArg(scratch3);
-    masm.passABIArg(scratch2);
-    masm.callWithABI<Fn, GroupHasPropertyTypes>();
-    masm.mov(ReturnReg, scratch1);
-
-    masm.adjustStack(sizeof(Value) + sizeof(jsid));
-
-    LiveRegisterSet ignore;
-    ignore.add(scratch1);
-    masm.PopRegsInMaskIgnore(save, ignore);
-
-    masm.branchIfTrueBool(scratch1, &done);
-    if (objScratch != InvalidReg) {
-      masm.pop(objScratch);
-    }
-    masm.pop(obj);
-    masm.jump(failures);
-  }
-
-  masm.bind(&done);
-  if (objScratch != InvalidReg) {
-    masm.Pop(objScratch);
-  }
-  masm.Pop(obj);
-}
-
 bool IonCacheIRCompiler::emitStoreFixedSlot(ObjOperandId objId,
                                             uint32_t offsetOffset,
                                             ValOperandId rhsId) {
@@ -1419,28 +1259,12 @@
   Register obj = allocator.useRegister(masm, objId);
   int32_t offset = int32StubField(offsetOffset);
   ConstantOrRegister val = allocator.useConstantOrRegister(masm, rhsId);
-
-  Maybe<AutoScratchRegister> scratch;
-  if (needsPostBarrier()) {
-    scratch.emplace(allocator, masm);
-  }
-
-  if (typeCheckInfo_->isSet()) {
-    FailurePath* failure;
-    if (!addFailurePath(&failure)) {
-      return false;
-    }
-
-    EmitCheckPropertyTypes(masm, typeCheckInfo_, obj, val, *liveRegs_,
-                           failure->label());
-  }
+  AutoScratchRegister scratch(allocator, masm);
 
   Address slot(obj, offset);
   EmitPreBarrier(masm, slot, MIRType::Value);
   masm.storeConstantOrRegister(val, slot);
-  if (needsPostBarrier()) {
-    emitPostBarrierSlot(obj, val, scratch.ref());
-  }
+  emitPostBarrierSlot(obj, val, scratch);
   return true;
 }
 
@@ -1453,30 +1277,17 @@
   ConstantOrRegister val = allocator.useConstantOrRegister(masm, rhsId);
   AutoScratchRegister scratch(allocator, masm);
 
-  if (typeCheckInfo_->isSet()) {
-    FailurePath* failure;
-    if (!addFailurePath(&failure)) {
-      return false;
-    }
-
-    EmitCheckPropertyTypes(masm, typeCheckInfo_, obj, val, *liveRegs_,
-                           failure->label());
-  }
-
   masm.loadPtr(Address(obj, NativeObject::offsetOfSlots()), scratch);
   Address slot(scratch, offset);
   EmitPreBarrier(masm, slot, MIRType::Value);
   masm.storeConstantOrRegister(val, slot);
-  if (needsPostBarrier()) {
-    emitPostBarrierSlot(obj, val, scratch);
-  }
+  emitPostBarrierSlot(obj, val, scratch);
   return true;
 }
 
 bool IonCacheIRCompiler::emitAddAndStoreSlotShared(
     CacheOp op, ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-    Maybe<uint32_t> numNewSlotsOffset) {
+    uint32_t newShapeOffset, Maybe<uint32_t> numNewSlotsOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   Register obj = allocator.useRegister(masm, objId);
   int32_t offset = int32StubField(offsetOffset);
@@ -1489,21 +1300,18 @@
     scratch2.emplace(allocator, masm);
   }
 
-  ObjectGroup* newGroup = groupStubField(newGroupOffset);
   Shape* newShape = shapeStubField(newShapeOffset);
 
-  FailurePath* failure;
-  if (!addFailurePath(&failure)) {
-    return false;
-  }
-
-  EmitCheckPropertyTypes(masm, typeCheckInfo_, obj, val, *liveRegs_,
-                         failure->label());
-
   if (op == CacheOp::AllocateAndStoreDynamicSlot) {
     // We have to (re)allocate dynamic slots. Do this first, as it's the
     // only fallible operation here. Note that growSlotsPure is
     // fallible but does not GC.
+
+    FailurePath* failure;
+    if (!addFailurePath(&failure)) {
+      return false;
+    }
+
     int32_t numNewSlots = int32StubField(*numNewSlotsOffset);
     MOZ_ASSERT(numNewSlots > 0);
 
@@ -1528,22 +1336,6 @@
     masm.branchIfFalseBool(scratch1, failure->label());
   }
 
-  if (changeGroup) {
-    // Changing object's group from a partially to fully initialized group,
-    // per the acquired properties analysis. Only change the group if the
-    // old group still has a newScript. This only applies to PlainObjects.
-    Label noGroupChange;
-    masm.branchIfObjGroupHasNoAddendum(obj, scratch1, &noGroupChange);
-
-    // Update the object's group.
-    masm.storeObjGroup(newGroup, obj,
-                       [](MacroAssembler& masm, const Address& addr) {
-                         EmitPreBarrier(masm, addr, MIRType::ObjectGroup);
-                       });
-
-    masm.bind(&noGroupChange);
-  }
-
   // Update the object's shape.
   masm.storeObjShape(newShape, obj,
                      [](MacroAssembler& masm, const Address& addr) {
@@ -1563,113 +1355,53 @@
     masm.storeConstantOrRegister(val, slot);
   }
 
-  if (needsPostBarrier()) {
-    emitPostBarrierSlot(obj, val, scratch1);
-  }
+  emitPostBarrierSlot(obj, val, scratch1);
 
   return true;
 }
 
-bool IonCacheIRCompiler::emitAddAndStoreFixedSlot(
-    ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
+bool IonCacheIRCompiler::emitAddAndStoreFixedSlot(ObjOperandId objId,
+                                                  uint32_t offsetOffset,
+                                                  ValOperandId rhsId,
+                                                  uint32_t newShapeOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   Maybe<uint32_t> numNewSlotsOffset = mozilla::Nothing();
-  return emitAddAndStoreSlotShared(
-      CacheOp::AddAndStoreFixedSlot, objId, offsetOffset, rhsId, changeGroup,
-      newGroupOffset, newShapeOffset, numNewSlotsOffset);
+  return emitAddAndStoreSlotShared(CacheOp::AddAndStoreFixedSlot, objId,
+                                   offsetOffset, rhsId, newShapeOffset,
+                                   numNewSlotsOffset);
 }
 
-bool IonCacheIRCompiler::emitAddAndStoreDynamicSlot(
-    ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
+bool IonCacheIRCompiler::emitAddAndStoreDynamicSlot(ObjOperandId objId,
+                                                    uint32_t offsetOffset,
+                                                    ValOperandId rhsId,
+                                                    uint32_t newShapeOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   Maybe<uint32_t> numNewSlotsOffset = mozilla::Nothing();
-  return emitAddAndStoreSlotShared(
-      CacheOp::AddAndStoreDynamicSlot, objId, offsetOffset, rhsId, changeGroup,
-      newGroupOffset, newShapeOffset, numNewSlotsOffset);
+  return emitAddAndStoreSlotShared(CacheOp::AddAndStoreDynamicSlot, objId,
+                                   offsetOffset, rhsId, newShapeOffset,
+                                   numNewSlotsOffset);
 }
 
 bool IonCacheIRCompiler::emitAllocateAndStoreDynamicSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-    uint32_t numNewSlotsOffset) {
+    uint32_t newShapeOffset, uint32_t numNewSlotsOffset) {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   return emitAddAndStoreSlotShared(CacheOp::AllocateAndStoreDynamicSlot, objId,
-                                   offsetOffset, rhsId, changeGroup,
-                                   newGroupOffset, newShapeOffset,
+                                   offsetOffset, rhsId, newShapeOffset,
                                    mozilla::Some(numNewSlotsOffset));
 }
 
 static void EmitStoreDenseElement(MacroAssembler& masm,
                                   const ConstantOrRegister& value,
-                                  Register elements,
                                   BaseObjectElementIndex target) {
-  // If the ObjectElements::CONVERT_DOUBLE_ELEMENTS flag is set, int32 values
-  // have to be converted to double first. If the value is not int32, it can
-  // always be stored directly.
-
-  Address elementsFlags(elements, ObjectElements::offsetOfFlags());
   if (value.constant()) {
     Value v = value.value();
-    Label done;
-    if (IsTypeInferenceEnabled()) {
-      if (v.isInt32()) {
-        Label dontConvert;
-        masm.branchTest32(Assembler::Zero, elementsFlags,
-                          Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS),
-                          &dontConvert);
-        masm.storeValue(DoubleValue(v.toInt32()), target);
-        masm.jump(&done);
-        masm.bind(&dontConvert);
-      }
-    }
     masm.storeValue(v, target);
-    masm.bind(&done);
     return;
   }
 
   TypedOrValueRegister reg = value.reg();
-  if (!IsTypeInferenceEnabled() ||
-      (reg.hasTyped() && reg.type() != MIRType::Int32)) {
-    masm.storeTypedOrValue(reg, target);
-    return;
-  }
-
-  Label convert, storeValue, done;
-  masm.branchTest32(Assembler::NonZero, elementsFlags,
-                    Imm32(ObjectElements::CONVERT_DOUBLE_ELEMENTS), &convert);
-  masm.bind(&storeValue);
   masm.storeTypedOrValue(reg, target);
-  masm.jump(&done);
-
-  masm.bind(&convert);
-  ScratchDoubleScope fpscratch(masm);
-  if (reg.hasValue()) {
-    masm.branchTestInt32(Assembler::NotEqual, reg.valueReg(), &storeValue);
-    masm.int32ValueToDouble(reg.valueReg(), fpscratch);
-    masm.boxDouble(fpscratch, target);
-  } else {
-    MOZ_ASSERT(reg.type() == MIRType::Int32);
-    masm.convertInt32ToDouble(reg.typedReg().gpr(), fpscratch);
-    masm.boxDouble(fpscratch, target);
-  }
-
-  masm.bind(&done);
-}
-
-static void EmitAssertNoCopyOnWriteElements(MacroAssembler& masm,
-                                            Register elementsReg) {
-#ifdef DEBUG
-  // IonBuilder::initOrSetElemTryCache ensures we have no copy-on-write
-  // elements. Assert this in debug builds.
-  Address elementsFlags(elementsReg, ObjectElements::offsetOfFlags());
-  Label ok;
-  masm.branchTest32(Assembler::Zero, elementsFlags,
-                    Imm32(ObjectElements::COPY_ON_WRITE), &ok);
-  masm.assumeUnreachable("Unexpected copy-on-write elements in Ion IC!");
-  masm.bind(&ok);
-#endif
 }
 
 static void EmitAssertExtensibleElements(MacroAssembler& masm,
@@ -1715,14 +1447,9 @@
     return false;
   }
 
-  EmitCheckPropertyTypes(masm, typeCheckInfo_, obj, val, *liveRegs_,
-                         failure->label());
-
   // Load obj->elements in scratch1.
   masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch1);
 
-  EmitAssertNoCopyOnWriteElements(masm, scratch1);
-
   // Bounds check.
   Address initLength(scratch1, ObjectElements::offsetOfInitializedLength());
   masm.spectreBoundsCheck32(index, initLength, spectreScratch,
@@ -1733,10 +1460,8 @@
   masm.branchTestMagic(Assembler::Equal, element, failure->label());
 
   EmitPreBarrier(masm, element, MIRType::Value);
-  EmitStoreDenseElement(masm, val, scratch1, element);
-  if (needsPostBarrier()) {
-    emitPostBarrierElement(obj, val, scratch1, index);
-  }
+  EmitStoreDenseElement(masm, val, element);
+  emitPostBarrierElement(obj, val, scratch1, index);
   return true;
 }
 
@@ -1761,14 +1486,9 @@
     return false;
   }
 
-  EmitCheckPropertyTypes(masm, typeCheckInfo_, obj, val, *liveRegs_,
-                         failure->label());
-
   // Load obj->elements in scratch1.
   masm.loadPtr(Address(obj, NativeObject::offsetOfElements()), scratch1);
 
-  EmitAssertNoCopyOnWriteElements(masm, scratch1);
-
   EmitAssertExtensibleElements(masm, scratch1);
   if (handleAdd) {
     EmitAssertWritableArrayLengthElements(masm, scratch1);
@@ -1840,10 +1560,8 @@
   EmitPreBarrier(masm, element, MIRType::Value);
 
   masm.bind(&doStore);
-  EmitStoreDenseElement(masm, val, scratch1, element);
-  if (needsPostBarrier()) {
-    emitPostBarrierElement(obj, val, scratch1, index);
-  }
+  EmitStoreDenseElement(masm, val, element);
+  emitPostBarrierElement(obj, val, scratch1, index);
   return true;
 }
 
@@ -2170,11 +1888,6 @@
   return true;
 }
 
-bool IonCacheIRCompiler::emitTypeMonitorResult() {
-  JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
-  return emitReturnFromIC();
-}
-
 bool IonCacheIRCompiler::emitReturnFromIC() {
   JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
   if (!savedLiveRegs_) {
@@ -2288,18 +2001,13 @@
 
 void IonIC::attachCacheIRStub(JSContext* cx, const CacheIRWriter& writer,
                               CacheKind kind, IonScript* ionScript,
-                              bool* attached,
-                              const PropertyTypeCheckInfo* typeCheckInfo) {
+                              bool* attached) {
   // We shouldn't GC or report OOM (or any other exception) here.
   AutoAssertNoPendingException aanpe(cx);
   JS::AutoCheckCannotGC nogc;
 
   MOZ_ASSERT(!*attached);
 
-  // SetProp/SetElem stubs must have non-null typeCheckInfo.
-  MOZ_ASSERT(!!typeCheckInfo ==
-             (kind == CacheKind::SetProp || kind == CacheKind::SetElem));
-
   // Do nothing if the IR generator failed or triggered a GC that invalidated
   // the script.
   if (writer.failed() || ionScript->invalidated()) {
@@ -2345,13 +2053,6 @@
     if (!writer.stubDataEquals(stub->stubDataStart())) {
       continue;
     }
-    if (typeCheckInfo && typeCheckInfo->needsTypeBarrier()) {
-      // We have a stub that requires property type checks. In this case the
-      // stub will likely handle more cases in the future and we shouldn't
-      // deoptimize.
-      MOZ_ASSERT(IsTypeInferenceEnabled());
-      *attached = true;
-    }
     return;
   }
 
@@ -2373,8 +2074,7 @@
   writer.copyStubData(newStub->stubDataStart());
 
   JitContext jctx(cx, nullptr);
-  IonCacheIRCompiler compiler(cx, writer, this, ionScript, typeCheckInfo,
-                              stubDataOffset);
+  IonCacheIRCompiler compiler(cx, writer, this, ionScript, stubDataOffset);
   if (!compiler.init()) {
     return;
   }
diff -Nru firefox-84.0.2+build1/js/src/jit/IonCacheIRCompiler.h firefox-85.0+build1/js/src/jit/IonCacheIRCompiler.h
--- firefox-84.0.2+build1/js/src/jit/IonCacheIRCompiler.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonCacheIRCompiler.h	2021-01-18 19:58:13.000000000 +0000
@@ -23,9 +23,7 @@
   friend class AutoCallVM;
 
   IonCacheIRCompiler(JSContext* cx, const CacheIRWriter& writer, IonIC* ic,
-                     IonScript* ionScript,
-                     const PropertyTypeCheckInfo* typeCheckInfo,
-                     uint32_t stubDataOffset);
+                     IonScript* ionScript, uint32_t stubDataOffset);
 
   MOZ_MUST_USE bool init();
   JitCode* compile(IonICStub* stub);
@@ -39,10 +37,6 @@
   IonIC* ic_;
   IonScript* ionScript_;
 
-  // Information necessary to generate property type checks. Non-null iff
-  // this is a SetProp/SetElem stub.
-  const PropertyTypeCheckInfo* typeCheckInfo_;
-
   Vector<CodeOffset, 4, SystemAllocPolicy> nextCodeOffsets_;
   mozilla::Maybe<LiveRegisterSet> liveRegs_;
   mozilla::Maybe<CodeOffset> stubJitCodeOffset_;
@@ -62,10 +56,7 @@
 
   MOZ_MUST_USE bool emitAddAndStoreSlotShared(
       CacheOp op, ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-      bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-      mozilla::Maybe<uint32_t> numNewSlotsOffset);
-
-  bool needsPostBarrier() const;
+      uint32_t newShapeOffset, mozilla::Maybe<uint32_t> numNewSlotsOffset);
 
   void pushStubCodePointer();
 
diff -Nru firefox-84.0.2+build1/js/src/jit/IonCompileTask.cpp firefox-85.0+build1/js/src/jit/IonCompileTask.cpp
--- firefox-84.0.2+build1/js/src/jit/IonCompileTask.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonCompileTask.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -73,10 +73,8 @@
 }
 
 IonCompileTask::IonCompileTask(MIRGenerator& mirGen, bool scriptHasIonScript,
-                               CompilerConstraintList* constraints,
                                WarpSnapshot* snapshot)
     : mirGen_(mirGen),
-      constraints_(constraints),
       snapshot_(snapshot),
       scriptHasIonScript_(scriptHasIonScript) {}
 
diff -Nru firefox-84.0.2+build1/js/src/jit/IonCompileTask.h firefox-85.0+build1/js/src/jit/IonCompileTask.h
--- firefox-84.0.2+build1/js/src/jit/IonCompileTask.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonCompileTask.h	2021-01-18 19:58:13.000000000 +0000
@@ -15,9 +15,6 @@
 #include "vm/HelperThreadTask.h"
 
 namespace js {
-
-class CompilerConstraintList;
-
 namespace jit {
 
 class CodeGenerator;
@@ -35,7 +32,6 @@
   // performed by FinishOffThreadTask().
   CodeGenerator* backgroundCodegen_ = nullptr;
 
-  CompilerConstraintList* constraints_ = nullptr;
   MRootList* rootList_ = nullptr;
   WarpSnapshot* snapshot_ = nullptr;
 
@@ -45,14 +41,12 @@
 
  public:
   explicit IonCompileTask(MIRGenerator& mirGen, bool scriptHasIonScript,
-                          CompilerConstraintList* constraints,
                           WarpSnapshot* snapshot);
 
   JSScript* script() { return mirGen_.outerInfo().script(); }
   MIRGenerator& mirGen() { return mirGen_; }
   TempAllocator& alloc() { return mirGen_.alloc(); }
   bool scriptHasIonScript() const { return scriptHasIonScript_; }
-  CompilerConstraintList* constraints() { return constraints_; }
   WarpSnapshot* snapshot() { return snapshot_; }
 
   size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf);
diff -Nru firefox-84.0.2+build1/js/src/jit/Ion.cpp firefox-85.0+build1/js/src/jit/Ion.cpp
--- firefox-84.0.2+build1/js/src/jit/Ion.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Ion.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -21,7 +21,6 @@
 #include "jit/AutoWritableJitCode.h"
 #include "jit/BacktrackingAllocator.h"
 #include "jit/BaselineFrame.h"
-#include "jit/BaselineInspector.h"
 #include "jit/BaselineJIT.h"
 #include "jit/CacheIRSpewer.h"
 #include "jit/CodeGenerator.h"
@@ -32,8 +31,8 @@
 #include "jit/FoldLinearArithConstants.h"
 #include "jit/InlineScriptTree.h"
 #include "jit/InstructionReordering.h"
+#include "jit/Invalidation.h"
 #include "jit/IonAnalysis.h"
-#include "jit/IonBuilder.h"
 #include "jit/IonCompileTask.h"
 #include "jit/IonIC.h"
 #include "jit/IonOptimizationLevels.h"
@@ -71,6 +70,7 @@
 
 #include "debugger/DebugAPI-inl.h"
 #include "gc/GC-inl.h"
+#include "jit/InlineScriptTree-inl.h"
 #include "jit/MacroAssembler-inl.h"
 #include "jit/SafepointIndex-inl.h"
 #include "jit/shared/Lowering-shared-inl.h"
@@ -333,15 +333,13 @@
 }
 
 static bool LinkCodeGen(JSContext* cx, CodeGenerator* codegen,
-                        HandleScript script,
-                        CompilerConstraintList* constraints,
-                        const WarpSnapshot* snapshot) {
+                        HandleScript script, const WarpSnapshot* snapshot) {
   TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
   TraceLoggerEvent event(TraceLogger_AnnotateScripts, script);
   AutoTraceLog logScript(logger, event);
   AutoTraceLog logLink(logger, TraceLogger_IonLinking);
 
-  if (!codegen->link(cx, constraints, snapshot)) {
+  if (!codegen->link(cx, snapshot)) {
     return false;
   }
 
@@ -356,8 +354,7 @@
 
   JitContext jctx(cx, &task->alloc());
   RootedScript script(cx, task->script());
-  return LinkCodeGen(cx, codegen, script, task->constraints(),
-                     task->snapshot());
+  return LinkCodeGen(cx, codegen, script, task->snapshot());
 }
 
 void jit::LinkIonScript(JSContext* cx, HandleScript calleeScript) {
@@ -377,10 +374,10 @@
   }
 
   {
-    AutoEnterAnalysis enterTypes(cx);
+    gc::AutoSuppressGC suppressGC(cx);
     if (!LinkBackgroundCodeGen(cx, task)) {
       // Silently ignore OOM during code generation. The assembly code
-      // doesn't has code to handle it after linking happened. So it's
+      // doesn't have code to handle it after linking happened. So it's
       // not OK to throw a catchable exception from there.
       cx->clearPendingException();
     }
@@ -455,8 +452,97 @@
   }
 }
 
+bool JitZone::addInlinedCompilation(const RecompileInfo& info,
+                                    JSScript* inlined) {
+  MOZ_ASSERT(inlined != info.script());
+
+  auto p = inlinedCompilations_.lookupForAdd(inlined);
+  if (p) {
+    auto& compilations = p->value();
+    if (!compilations.empty() && compilations.back() == info) {
+      return true;
+    }
+    return compilations.append(info);
+  }
+
+  RecompileInfoVector compilations;
+  if (!compilations.append(info)) {
+    return false;
+  }
+  return inlinedCompilations_.add(p, inlined, std::move(compilations));
+}
+
+void jit::AddPendingInvalidation(RecompileInfoVector& invalid,
+                                 JSScript* script) {
+  MOZ_ASSERT(script);
+
+  CancelOffThreadIonCompile(script);
+
+  // Let the script warm up again before attempting another compile.
+  script->resetWarmUpCounterToDelayIonCompilation();
+
+  JitScript* jitScript = script->maybeJitScript();
+  if (!jitScript) {
+    return;
+  }
+
+  auto addPendingInvalidation = [&invalid](const RecompileInfo& info) {
+    AutoEnterOOMUnsafeRegion oomUnsafe;
+    if (!invalid.append(info)) {
+      // BUG 1536159: For diagnostics, compute the size of the failed
+      // allocation. This presumes the vector growth strategy is to double. This
+      // is only used for crash reporting so not a problem if we get it wrong.
+      size_t allocSize = 2 * sizeof(RecompileInfo) * invalid.capacity();
+      oomUnsafe.crash(allocSize, "Could not update RecompileInfoVector");
+    }
+  };
+
+  // Trigger invalidation of the IonScript.
+  if (jitScript->hasIonScript()) {
+    RecompileInfo info(script, jitScript->ionScript()->compilationId());
+    addPendingInvalidation(info);
+  }
+
+  // Trigger invalidation of any callers inlining this script.
+  auto* inlinedCompilations =
+      script->zone()->jitZone()->maybeInlinedCompilations(script);
+  if (inlinedCompilations) {
+    for (const RecompileInfo& info : *inlinedCompilations) {
+      addPendingInvalidation(info);
+    }
+    script->zone()->jitZone()->removeInlinedCompilations(script);
+  }
+}
+
+IonScript* RecompileInfo::maybeIonScriptToInvalidate() const {
+  // Make sure this is not called under CodeGenerator::link (before the
+  // IonScript is created).
+  MOZ_ASSERT_IF(
+      script_->zone()->jitZone()->currentCompilationId(),
+      script_->zone()->jitZone()->currentCompilationId().ref() != id_);
+
+  if (!script_->hasIonScript() ||
+      script_->ionScript()->compilationId() != id_) {
+    return nullptr;
+  }
+
+  return script_->ionScript();
+}
+
+bool RecompileInfo::traceWeak(JSTracer* trc) {
+  // Sweep the RecompileInfo if either the script is dead or the IonScript has
+  // been invalidated.
+
+  if (!TraceManuallyBarrieredWeakEdge(trc, &script_, "RecompileInfo::script")) {
+    return false;
+  }
+
+  return maybeIonScriptToInvalidate() != nullptr;
+}
+
 void JitZone::traceWeak(JSTracer* trc) {
   baselineCacheIRStubCodes_.traceWeak(trc);
+  inlinedCompilations_.traceWeak(trc);
 }
 
 size_t JitRealm::sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const {
@@ -498,14 +584,6 @@
   // mutating executable data.
   MOZ_ASSERT(!gc::IsMovableKind(gc::AllocKind::JITCODE));
   jitCode_ = jitCode;
-
-#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-  // On AMD Bobcat processors that may have eratas, insert a NOP slide to reduce
-  // crashes
-  if (CPUInfo::NeedAmdBugWorkaround()) {
-    memset((char*)&nops_, X86Encoding::OneByteOpcodeID::OP_NOP, sizeof(nops_));
-  }
-#endif
 }
 
 template <AllowGC allowGC>
@@ -1127,10 +1205,10 @@
 
   if (mir->optimizationInfo().licmEnabled()) {
     AutoTraceLog log(logger, TraceLogger_LICM);
-    // LICM can hoist instructions from conditional branches and trigger
-    // repeated bailouts. Disable it if this script is known to bailout
-    // frequently.
-    if (!mir->outerInfo().hadFrequentBailouts()) {
+    // LICM can hoist instructions from conditional branches and
+    // trigger bailouts. Disable it if bailing out of a hoisted
+    // instruction has previously invalidated this script.
+    if (!mir->outerInfo().hadLICMInvalidation()) {
       if (!LICM(mir, graph)) {
         return false;
       }
@@ -1473,7 +1551,7 @@
 
 CodeGenerator* CompileBackEnd(MIRGenerator* mir, WarpSnapshot* snapshot) {
   // Everything in CompileBackEnd can potentially run on a helper thread.
-  AutoEnterIonBackend enter(mir->safeForMinorGC());
+  AutoEnterIonBackend enter;
   AutoSpewEndFunction spewEndFunction(mir);
 
   MOZ_ASSERT(!!snapshot == JitOptions.warpBuilder);
@@ -1528,84 +1606,10 @@
   TrackIonAbort(cx, script, script->code(), message);
 }
 
-static AbortReason BuildMIR(JSContext* cx, MIRGenerator* mirGen,
-                            CompileInfo* info,
-                            CompilerConstraintList* constraints,
-                            BaselineFrame* baselineFrame,
-                            uint32_t baselineFrameSize) {
-  BaselineFrameInspector* baselineFrameInspector = nullptr;
-  if (baselineFrame) {
-    baselineFrameInspector = NewBaselineFrameInspector(
-        &mirGen->alloc(), baselineFrame, baselineFrameSize);
-    if (!baselineFrameInspector) {
-      return AbortReason::Alloc;
-    }
-  }
-
-  SpewBeginFunction(mirGen, info->script());
-
-  BaselineInspector inspector(info->script());
-  IonBuilder builder((JSContext*)nullptr, *mirGen, info, constraints,
-                     &inspector, baselineFrameInspector);
-
-  AbortReasonOr<Ok> buildResult = Ok();
-  {
-    AutoEnterAnalysis enter(cx);
-    buildResult = builder.build();
-  }
-
-  if (buildResult.isErr()) {
-    AbortReason reason = buildResult.unwrapErr();
-    mirGen->graphSpewer().endFunction();
-    if (reason == AbortReason::PreliminaryObjects) {
-      // Some group was accessed which has associated preliminary objects
-      // to analyze. Do this now and we will try to build again shortly.
-      const IonBuilder::ObjectGroupVector& groups =
-          builder.abortedPreliminaryGroups();
-      for (size_t i = 0; i < groups.length(); i++) {
-        ObjectGroup* group = groups[i];
-        AutoRealm ar(cx, group);
-        AutoSweepObjectGroup sweep(group);
-        if (auto* newScript = group->newScript(sweep)) {
-          if (!newScript->maybeAnalyze(cx, group, nullptr,
-                                       /* force = */ true)) {
-            return AbortReason::Alloc;
-          }
-        } else if (auto* preliminaryObjects =
-                       group->maybePreliminaryObjects(sweep)) {
-          preliminaryObjects->maybeAnalyze(cx, group, /* force = */ true);
-        } else {
-          MOZ_CRASH("Unexpected aborted preliminary group");
-        }
-      }
-    }
-
-    if (builder.hadActionableAbort()) {
-      JSScript* abortScript;
-      jsbytecode* abortPc;
-      const char* abortMessage;
-      builder.actionableAbortLocationAndMessage(&abortScript, &abortPc,
-                                                &abortMessage);
-      TrackIonAbort(cx, abortScript, abortPc, abortMessage);
-    }
-
-    if (cx->isThrowingOverRecursed()) {
-      // Non-analysis compilations should never fail with stack overflow.
-      MOZ_CRASH("Stack overflow during compilation");
-    }
-
-    return reason;
-  }
-
-  AssertBasicGraphCoherency(mirGen->graph());
-  return AbortReason::NoAbort;
-}
-
 static AbortReasonOr<WarpSnapshot*> CreateWarpSnapshot(JSContext* cx,
                                                        MIRGenerator* mirGen,
                                                        HandleScript script) {
-  // Suppress GC. This matches the AutoEnterAnalysis (which suppresses GC) in
-  // BuildMIR.
+  // Suppress GC during compilation.
   gc::AutoSuppressGC suppressGC(cx);
 
   SpewBeginFunction(mirGen, script);
@@ -1673,11 +1677,6 @@
     return AbortReason::Alloc;
   }
 
-  CompilerConstraintList* constraints = NewCompilerConstraintList(*temp);
-  if (!constraints) {
-    return AbortReason::Alloc;
-  }
-
   const OptimizationInfo* optimizationInfo =
       IonOptimizations.get(optimizationLevel);
   const JitCompileOptions options(cx);
@@ -1691,10 +1690,6 @@
 
   const bool scriptHasIonScript = script->hasIonScript();
 
-  if (cx->runtime()->gc.storeBuffer().cancelIonCompilations()) {
-    mirGen->setNotSafeForMinorGC();
-  }
-
   MOZ_ASSERT(recompile == script->hasIonScript());
   MOZ_ASSERT(script->canIonCompile());
 
@@ -1706,21 +1701,11 @@
     script->jitScript()->setHadIonOSR();
   }
 
-  WarpSnapshot* snapshot = nullptr;
-  if (JitOptions.warpBuilder) {
-    AbortReasonOr<WarpSnapshot*> result =
-        CreateWarpSnapshot(cx, mirGen, script);
-    if (result.isErr()) {
-      return result.unwrapErr();
-    }
-    snapshot = result.unwrap();
-  } else {
-    AbortReason reason = BuildMIR(cx, mirGen, info, constraints, baselineFrame,
-                                  baselineFrameSize);
-    if (reason != AbortReason::NoAbort) {
-      return reason;
-    }
+  AbortReasonOr<WarpSnapshot*> result = CreateWarpSnapshot(cx, mirGen, script);
+  if (result.isErr()) {
+    return result.unwrapErr();
   }
+  WarpSnapshot* snapshot = result.unwrap();
 
   // If possible, compile the script off thread.
   if (options.offThreadCompilationAvailable()) {
@@ -1729,8 +1714,8 @@
             ". (Compiled on background thread.)",
             script->filename(), script->lineno(), script->column());
 
-    IonCompileTask* task = alloc->new_<IonCompileTask>(
-        *mirGen, scriptHasIonScript, constraints, snapshot);
+    IonCompileTask* task =
+        alloc->new_<IonCompileTask>(*mirGen, scriptHasIonScript, snapshot);
     if (!task) {
       return AbortReason::Alloc;
     }
@@ -1761,7 +1746,7 @@
 
   bool succeeded = false;
   {
-    AutoEnterAnalysis enter(cx);
+    gc::AutoSuppressGC suppressGC(cx);
     UniquePtr<CodeGenerator> codegen(CompileBackEnd(mirGen, snapshot));
     if (!codegen) {
       JitSpew(JitSpew_IonAbort, "Failed during back-end compilation.");
@@ -1771,7 +1756,7 @@
       return AbortReason::Disable;
     }
 
-    succeeded = LinkCodeGen(cx, codegen.get(), script, constraints, snapshot);
+    succeeded = LinkCodeGen(cx, codegen.get(), script, snapshot);
   }
 
   if (succeeded) {
@@ -1809,7 +1794,8 @@
   if (script->isForEval()) {
     // Eval frames are not yet supported. Supporting this will require new
     // logic in pushBailoutFrame to deal with linking prev.
-    // Additionally, JSOp::DefVar support will require baking in isEvalFrame().
+    // Additionally, JSOp::GlobalOrEvalDeclInstantiation support will require
+    // baking in isEvalFrame().
     *reason = "eval script";
     return false;
   }
@@ -1840,13 +1826,6 @@
     return false;
   }
 
-  if (script->numBytecodeTypeSets() >= JSScript::MaxBytecodeTypeSets) {
-    // In this case multiple bytecode ops can share a single observed
-    // TypeSet (see bug 1303710).
-    *reason = "too many typesets";
-    return false;
-  }
-
   return true;
 }
 
@@ -2611,9 +2590,8 @@
   }
 }
 
-void jit::Invalidate(TypeZone& types, JSFreeOp* fop,
-                     const RecompileInfoVector& invalid, bool resetUses,
-                     bool cancelOffThread) {
+void jit::Invalidate(JSContext* cx, const RecompileInfoVector& invalid,
+                     bool resetUses, bool cancelOffThread) {
   JitSpew(JitSpew_IonInvalidate, "Start invalidation.");
 
   // Add an invalidation reference to all invalidated IonScripts to indicate
@@ -2624,7 +2602,7 @@
       CancelOffThreadIonCompile(info.script());
     }
 
-    IonScript* ionScript = info.maybeIonScriptToInvalidate(types);
+    IonScript* ionScript = info.maybeIonScriptToInvalidate();
     if (!ionScript) {
       continue;
     }
@@ -2645,7 +2623,7 @@
     return;
   }
 
-  JSContext* cx = TlsContext.get();
+  JSFreeOp* fop = cx->defaultFreeOp();
   for (JitActivationIterator iter(cx); !iter.done(); ++iter) {
     InvalidateActivation(fop, iter, false);
   }
@@ -2654,7 +2632,7 @@
   // IonScript will be immediately destroyed. Otherwise, it will be held live
   // until its last invalidated frame is destroyed.
   for (const RecompileInfo& info : invalid) {
-    IonScript* ionScript = info.maybeIonScriptToInvalidate(types);
+    IonScript* ionScript = info.maybeIonScriptToInvalidate();
     if (!ionScript) {
       continue;
     }
@@ -2678,18 +2656,12 @@
   // Finally, null out jitScript->ionScript_ for IonScripts that are still on
   // the stack.
   for (const RecompileInfo& info : invalid) {
-    if (IonScript* ionScript = info.maybeIonScriptToInvalidate(types)) {
+    if (IonScript* ionScript = info.maybeIonScriptToInvalidate()) {
       ClearIonScriptAfterInvalidation(cx, info.script(), ionScript, resetUses);
     }
   }
 }
 
-void jit::Invalidate(JSContext* cx, const RecompileInfoVector& invalid,
-                     bool resetUses, bool cancelOffThread) {
-  jit::Invalidate(cx->zone()->types, cx->runtime()->defaultFreeOp(), invalid,
-                  resetUses, cancelOffThread);
-}
-
 void jit::IonScript::invalidate(JSContext* cx, JSScript* script, bool resetUses,
                                 const char* reason) {
   // Note: we could short circuit here if we already invalidated this
diff -Nru firefox-84.0.2+build1/js/src/jit/Ion.h firefox-85.0+build1/js/src/jit/Ion.h
--- firefox-84.0.2+build1/js/src/jit/Ion.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Ion.h	2021-01-18 19:58:13.000000000 +0000
@@ -28,7 +28,6 @@
 #include "vm/JSContext.h"
 #include "vm/JSFunction.h"
 #include "vm/JSScript.h"
-#include "vm/TypeInference.h"
 
 namespace js {
 
@@ -66,15 +65,6 @@
 
 MethodStatus Recompile(JSContext* cx, HandleScript script, bool force);
 
-// Walk the stack and invalidate active Ion frames for the invalid scripts.
-void Invalidate(TypeZone& types, JSFreeOp* fop,
-                const RecompileInfoVector& invalid, bool resetUses = true,
-                bool cancelOffThread = true);
-void Invalidate(JSContext* cx, const RecompileInfoVector& invalid,
-                bool resetUses = true, bool cancelOffThread = true);
-void Invalidate(JSContext* cx, JSScript* script, bool resetUses = true,
-                bool cancelOffThread = true);
-
 class MIRGenerator;
 class LIRGraph;
 class CodeGenerator;
@@ -122,10 +112,10 @@
 // backend compilation.
 class MOZ_RAII AutoEnterIonBackend {
  public:
-  explicit AutoEnterIonBackend(bool safeForMinorGC) {
+  AutoEnterIonBackend() {
 #ifdef DEBUG
     JitContext* jcx = GetJitContext();
-    jcx->enterIonBackend(safeForMinorGC);
+    jcx->enterIonBackend();
 #endif
   }
 
@@ -148,14 +138,8 @@
     return false;
   }
 
-  // If TI is disabled, Ion can only be used if WarpBuilder is enabled.
-  if (MOZ_LIKELY(IsTypeInferenceEnabled())) {
-    MOZ_ASSERT(!JitOptions.warpBuilder,
-               "Shouldn't enable WarpBuilder without disabling TI!");
-  } else {
-    if (!JitOptions.warpBuilder) {
-      return false;
-    }
+  if (!JitOptions.warpBuilder) {
+    return false;
   }
 
   if (MOZ_LIKELY(JitOptions.ion)) {
diff -Nru firefox-84.0.2+build1/js/src/jit/IonIC.cpp firefox-85.0+build1/js/src/jit/IonIC.cpp
--- firefox-84.0.2+build1/js/src/jit/IonIC.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonIC.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "jit/IonIC.h"
 
-#include "jit/AutoDetectInvalidation.h"
 #include "jit/CacheIRCompiler.h"
 #include "jit/VMFunctions.h"
 #include "util/DiagnosticAssertions.h"
@@ -32,20 +31,11 @@
 Register IonIC::scratchRegisterForEntryJump() {
   switch (kind_) {
     case CacheKind::GetProp:
-    case CacheKind::GetElem: {
-      Register temp = asGetPropertyIC()->maybeTemp();
-      if (temp != InvalidReg) {
-        return temp;
-      }
-      TypedOrValueRegister output = asGetPropertyIC()->output();
-      return output.hasValue() ? output.valueReg().scratchReg()
-                               : output.typedReg().gpr();
-    }
+    case CacheKind::GetElem:
+      return asGetPropertyIC()->output().scratchReg();
     case CacheKind::GetPropSuper:
-    case CacheKind::GetElemSuper: {
-      TypedOrValueRegister output = asGetPropSuperIC()->output();
-      return output.valueReg().scratchReg();
-    }
+    case CacheKind::GetElemSuper:
+      return asGetPropSuperIC()->output().scratchReg();
     case CacheKind::SetProp:
     case CacheKind::SetElem:
       return asSetPropertyIC()->temp();
@@ -130,8 +120,8 @@
 
 // This helper handles ICState updates/transitions while attaching CacheIR
 // stubs.
-template <typename IRGenerator, typename IC, typename... Args>
-static void TryAttachIonStub(JSContext* cx, IC* ic, IonScript* ionScript,
+template <typename IRGenerator, typename... Args>
+static void TryAttachIonStub(JSContext* cx, IonIC* ic, IonScript* ionScript,
                              Args&&... args) {
   if (ic->state().maybeTransition()) {
     ic->discardStubs(cx->zone(), ionScript);
@@ -166,77 +156,13 @@
 bool IonGetPropertyIC::update(JSContext* cx, HandleScript outerScript,
                               IonGetPropertyIC* ic, HandleValue val,
                               HandleValue idVal, MutableHandleValue res) {
-  // Override the return value if we are invalidated (bug 728188).
   IonScript* ionScript = outerScript->ionScript();
-  AutoDetectInvalidation adi(cx, res, ionScript);
 
   // Optimized-arguments and other magic values must not escape to Ion ICs.
   MOZ_ASSERT(!val.isMagic());
 
-  // If the IC is idempotent, we will redo the op in the interpreter.
-  if (ic->idempotent()) {
-    adi.disable();
-  }
-
-  if (ic->state().maybeTransition()) {
-    ic->discardStubs(cx->zone(), ionScript);
-  }
-
-  bool attached = false;
-  if (ic->state().canAttachStub()) {
-    jsbytecode* pc = ic->idempotent() ? nullptr : ic->pc();
-    GetPropIRGenerator gen(cx, outerScript, pc, ic->state().mode(), ic->kind(),
-                           val, idVal, val, ic->resultFlags());
-    switch (ic->idempotent() ? gen.tryAttachIdempotentStub()
-                             : gen.tryAttachStub()) {
-      case AttachDecision::Attach:
-        ic->attachCacheIRStub(cx, gen.writerRef(), gen.cacheKind(), ionScript,
-                              &attached);
-        break;
-      case AttachDecision::NoAction:
-        break;
-      case AttachDecision::TemporarilyUnoptimizable:
-        attached = true;
-        break;
-      case AttachDecision::Deferred:
-        MOZ_ASSERT_UNREACHABLE("No deferred GetProp stubs");
-        break;
-    }
-    if (!attached) {
-      ic->state().trackNotAttached();
-    }
-  }
-
-  if (!attached && ic->idempotent()) {
-    // Invalidate the cache if the property was not found, or was found on
-    // a non-native object. This ensures:
-    // 1) The property read has no observable side-effects.
-    // 2) There's no need to dynamically monitor the return type. This would
-    //    be complicated since (due to GVN) there can be multiple pc's
-    //    associated with a single idempotent cache.
-    JitSpew(JitSpew_IonIC, "Invalidating from idempotent cache %s:%u:%u",
-            outerScript->filename(), outerScript->lineno(),
-            outerScript->column());
-
-    outerScript->setInvalidatedIdempotentCache();
-
-    // Do not re-invalidate if the lookup already caused invalidation.
-    if (outerScript->hasIonScript()) {
-      Invalidate(cx, outerScript);
-    }
-
-    // IonBuilder::createScriptedThis does not use InvalidedIdempotentCache
-    // flag so prevent bailout-loop by disabling Ion for the script.
-    MOZ_ASSERT(ic->kind() == CacheKind::GetProp);
-    if (idVal.toString()->asAtom().asPropertyName() == cx->names().prototype) {
-      if (val.isObject() && val.toObject().is<JSFunction>()) {
-        outerScript->disableIon();
-      }
-    }
-
-    // We will redo the potentially effectful lookup in Baseline.
-    return true;
-  }
+  TryAttachIonStub<GetPropIRGenerator>(cx, ic, ionScript, ic->kind(), val,
+                                       idVal, val);
 
   if (ic->kind() == CacheKind::GetProp) {
     RootedPropertyName name(cx, idVal.toString()->asAtom().asPropertyName());
@@ -245,18 +171,11 @@
     }
   } else {
     MOZ_ASSERT(ic->kind() == CacheKind::GetElem);
-    if (!GetElementOperation(cx, JSOp(*ic->pc()), val, idVal, res)) {
+    if (!GetElementOperation(cx, val, idVal, res)) {
       return false;
     }
   }
 
-  if (!ic->idempotent()) {
-    // Monitor changes to cache entry.
-    if (!ic->monitoredResult()) {
-      JitScript::MonitorBytecodeType(cx, ic->script(), ic->pc(), res);
-    }
-  }
-
   return true;
 }
 
@@ -265,18 +184,15 @@
                                IonGetPropSuperIC* ic, HandleObject obj,
                                HandleValue receiver, HandleValue idVal,
                                MutableHandleValue res) {
-  // Override the return value if we are invalidated (bug 728188).
   IonScript* ionScript = outerScript->ionScript();
-  AutoDetectInvalidation adi(cx, res, ionScript);
 
   if (ic->state().maybeTransition()) {
     ic->discardStubs(cx->zone(), ionScript);
   }
 
   RootedValue val(cx, ObjectValue(*obj));
-  TryAttachIonStub<GetPropIRGenerator, IonGetPropSuperIC>(
-      cx, ic, ionScript, ic->kind(), val, idVal, receiver,
-      GetPropertyResultFlags::All);
+  TryAttachIonStub<GetPropIRGenerator>(cx, ic, ionScript, ic->kind(), val,
+                                       idVal, receiver);
 
   if (ic->kind() == CacheKind::GetPropSuper) {
     RootedPropertyName name(cx, idVal.toString()->asAtom().asPropertyName());
@@ -294,8 +210,6 @@
     }
   }
 
-  // Monitor changes to cache entry.
-  JitScript::MonitorBytecodeType(cx, ic->script(), ic->pc(), res);
   return true;
 }
 
@@ -306,7 +220,6 @@
   using DeferType = SetPropIRGenerator::DeferType;
 
   RootedShape oldShape(cx);
-  RootedObjectGroup oldGroup(cx);
   IonScript* ionScript = outerScript->ionScript();
 
   bool attached = false;
@@ -318,21 +231,16 @@
 
   if (ic->state().canAttachStub()) {
     oldShape = obj->shape();
-    oldGroup = JSObject::getGroup(cx, obj);
-    if (!oldGroup) {
-      return false;
-    }
 
     RootedValue objv(cx, ObjectValue(*obj));
     RootedScript script(cx, ic->script());
     jsbytecode* pc = ic->pc();
     SetPropIRGenerator gen(cx, script, pc, ic->kind(), ic->state().mode(), objv,
-                           idVal, rhs, ic->needsTypeBarrier(),
-                           ic->guardHoles());
+                           idVal, rhs);
     switch (gen.tryAttachStub()) {
       case AttachDecision::Attach:
         ic->attachCacheIRStub(cx, gen.writerRef(), gen.cacheKind(), ionScript,
-                              &attached, gen.typeCheckInfo());
+                              &attached);
         break;
       case AttachDecision::NoAction:
         break;
@@ -348,9 +256,9 @@
 
   jsbytecode* pc = ic->pc();
   if (ic->kind() == CacheKind::SetElem) {
-    if (JSOp(*pc) == JSOp::InitElemInc || JSOp(*pc) == JSOp::InitElemArray) {
-      if (!InitArrayElemOperation(cx, pc, obj.as<ArrayObject>(),
-                                  idVal.toInt32(), rhs)) {
+    if (JSOp(*pc) == JSOp::InitElemInc) {
+      if (!InitElemIncOperation(cx, obj.as<ArrayObject>(), idVal.toInt32(),
+                                rhs)) {
         return false;
       }
     } else if (IsPropertyInitOp(JSOp(*pc))) {
@@ -404,15 +312,14 @@
     RootedScript script(cx, ic->script());
     jsbytecode* pc = ic->pc();
     SetPropIRGenerator gen(cx, script, pc, ic->kind(), ic->state().mode(), objv,
-                           idVal, rhs, ic->needsTypeBarrier(),
-                           ic->guardHoles());
+                           idVal, rhs);
     MOZ_ASSERT(deferType == DeferType::AddSlot);
-    AttachDecision decision = gen.tryAttachAddSlotStub(oldGroup, oldShape);
+    AttachDecision decision = gen.tryAttachAddSlotStub(oldShape);
 
     switch (decision) {
       case AttachDecision::Attach:
         ic->attachCacheIRStub(cx, gen.writerRef(), gen.cacheKind(), ionScript,
-                              &attached, gen.typeCheckInfo());
+                              &attached);
         break;
       case AttachDecision::NoAction:
         gen.trackAttached(IRGenerator::NotAttached);
@@ -438,8 +345,7 @@
   jsbytecode* pc = ic->pc();
   RootedPropertyName name(cx, ic->script()->getName(pc));
 
-  TryAttachIonStub<GetNameIRGenerator, IonGetNameIC>(cx, ic, ionScript,
-                                                     envChain, name);
+  TryAttachIonStub<GetNameIRGenerator>(cx, ic, ionScript, envChain, name);
 
   RootedObject obj(cx);
   RootedObject holder(cx);
@@ -471,8 +377,7 @@
   jsbytecode* pc = ic->pc();
   RootedPropertyName name(cx, ic->script()->getName(pc));
 
-  TryAttachIonStub<BindNameIRGenerator, IonBindNameIC>(cx, ic, ionScript,
-                                                       envChain, name);
+  TryAttachIonStub<BindNameIRGenerator>(cx, ic, ionScript, envChain, name);
 
   RootedObject holder(cx);
   if (!LookupNameUnqualified(cx, name, envChain, &holder)) {
@@ -487,8 +392,7 @@
                                    IonGetIteratorIC* ic, HandleValue value) {
   IonScript* ionScript = outerScript->ionScript();
 
-  TryAttachIonStub<GetIteratorIRGenerator, IonGetIteratorIC>(cx, ic, ionScript,
-                                                             value);
+  TryAttachIonStub<GetIteratorIRGenerator>(cx, ic, ionScript, value);
 
   return ValueToIterator(cx, value);
 }
@@ -499,8 +403,7 @@
                                      HandleValue value, bool* result) {
   IonScript* ionScript = outerScript->ionScript();
 
-  TryAttachIonStub<OptimizeSpreadCallIRGenerator, IonOptimizeSpreadCallIC>(
-      cx, ic, ionScript, value);
+  TryAttachIonStub<OptimizeSpreadCallIRGenerator>(cx, ic, ionScript, value);
 
   return OptimizeSpreadCall(cx, value, result);
 }
@@ -511,8 +414,8 @@
                          int32_t* res) {
   IonScript* ionScript = outerScript->ionScript();
 
-  TryAttachIonStub<HasPropIRGenerator, IonHasOwnIC>(
-      cx, ic, ionScript, CacheKind::HasOwn, idVal, val);
+  TryAttachIonStub<HasPropIRGenerator>(cx, ic, ionScript, CacheKind::HasOwn,
+                                       idVal, val);
 
   bool found;
   if (!HasOwnProperty(cx, val, idVal, &found)) {
@@ -530,7 +433,7 @@
   IonScript* ionScript = outerScript->ionScript();
   jsbytecode* pc = ic->pc();
 
-  TryAttachIonStub<CheckPrivateFieldIRGenerator, IonCheckPrivateFieldIC>(
+  TryAttachIonStub<CheckPrivateFieldIRGenerator>(
       cx, ic, ionScript, CacheKind::CheckPrivateField, idVal, val);
 
   return CheckPrivateFieldOperation(cx, pc, val, idVal, res);
@@ -542,8 +445,8 @@
   IonScript* ionScript = outerScript->ionScript();
   RootedValue objV(cx, ObjectValue(*obj));
 
-  TryAttachIonStub<HasPropIRGenerator, IonInIC>(cx, ic, ionScript,
-                                                CacheKind::In, key, objV);
+  TryAttachIonStub<HasPropIRGenerator>(cx, ic, ionScript, CacheKind::In, key,
+                                       objV);
 
   return OperatorIn(cx, key, obj, res);
 }
@@ -553,8 +456,7 @@
                              HandleObject rhs, bool* res) {
   IonScript* ionScript = outerScript->ionScript();
 
-  TryAttachIonStub<InstanceOfIRGenerator, IonInstanceOfIC>(cx, ic, ionScript,
-                                                           lhs, rhs);
+  TryAttachIonStub<InstanceOfIRGenerator>(cx, ic, ionScript, lhs, rhs);
 
   return HasInstance(cx, rhs, lhs, res);
 }
@@ -565,8 +467,7 @@
                                 MutableHandleValue res) {
   IonScript* ionScript = outerScript->ionScript();
 
-  TryAttachIonStub<ToPropertyKeyIRGenerator, IonToPropertyKeyIC>(
-      cx, ic, ionScript, val);
+  TryAttachIonStub<ToPropertyKeyIRGenerator>(cx, ic, ionScript, val);
 
   return ToPropertyKeyOperation(cx, val, res);
 }
@@ -626,8 +527,7 @@
   }
   MOZ_ASSERT(res.isNumeric());
 
-  TryAttachIonStub<UnaryArithIRGenerator, IonUnaryArithIC>(cx, ic, ionScript,
-                                                           op, val, res);
+  TryAttachIonStub<UnaryArithIRGenerator>(cx, ic, ionScript, op, val, res);
 
   return true;
 }
@@ -719,8 +619,8 @@
       MOZ_CRASH("Unhandled binary arith op");
   }
 
-  TryAttachIonStub<BinaryArithIRGenerator, IonBinaryArithIC>(cx, ic, ionScript,
-                                                             op, lhs, rhs, ret);
+  TryAttachIonStub<BinaryArithIRGenerator>(cx, ic, ionScript, op, lhs, rhs,
+                                           ret);
 
   return true;
 }
@@ -786,8 +686,7 @@
       return false;
   }
 
-  TryAttachIonStub<CompareIRGenerator, IonCompareIC>(cx, ic, ionScript, op, lhs,
-                                                     rhs);
+  TryAttachIonStub<CompareIRGenerator>(cx, ic, ionScript, op, lhs, rhs);
 
   return true;
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/IonIC.h firefox-85.0+build1/js/src/jit/IonIC.h
--- firefox-84.0.2+build1/js/src/jit/IonIC.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonIC.h	2021-01-18 19:58:13.000000000 +0000
@@ -79,7 +79,7 @@
   // The first optimized stub, or nullptr.
   IonICStub* firstStub_;
 
-  // Location of this IC, nullptr for idempotent caches.
+  // Location of this IC.
   JSScript* script_;
   jsbytecode* pc_;
 
@@ -92,7 +92,6 @@
   uint32_t fallbackOffset_;
 
   CacheKind kind_;
-  bool idempotent_ : 1;
   ICState state_;
 
  protected:
@@ -104,7 +103,6 @@
         rejoinOffset_(0),
         fallbackOffset_(0),
         kind_(kind),
-        idempotent_(false),
         state_() {}
 
   void attachStub(IonICStub* newStub, JitCode* code);
@@ -137,9 +135,6 @@
   CacheKind kind() const { return kind_; }
   uint8_t** codeRawPtr() { return &codeRaw_; }
 
-  bool idempotent() const { return idempotent_; }
-  void setIdempotent() { idempotent_ = true; }
-
   void setFallbackOffset(CodeOffset offset) {
     fallbackOffset_ = offset.offset();
   }
@@ -219,8 +214,7 @@
   void trace(JSTracer* trc, IonScript* ionScript);
 
   void attachCacheIRStub(JSContext* cx, const CacheIRWriter& writer,
-                         CacheKind kind, IonScript* ionScript, bool* attached,
-                         const PropertyTypeCheckInfo* typeCheckInfo = nullptr);
+                         CacheKind kind, IonScript* ionScript, bool* attached);
 };
 
 class IonGetPropertyIC : public IonIC {
@@ -229,36 +223,22 @@
 
   TypedOrValueRegister value_;
   ConstantOrRegister id_;
-  TypedOrValueRegister output_;
-  Register maybeTemp_;  // Might be InvalidReg.
-
-  GetPropertyResultFlags resultFlags_;
+  ValueOperand output_;
 
  public:
   IonGetPropertyIC(CacheKind kind, LiveRegisterSet liveRegs,
                    TypedOrValueRegister value, const ConstantOrRegister& id,
-                   TypedOrValueRegister output, Register maybeTemp,
-                   GetPropertyResultFlags resultFlags)
+                   ValueOperand output)
       : IonIC(kind),
         liveRegs_(liveRegs),
         value_(value),
         id_(id),
-        output_(output),
-        maybeTemp_(maybeTemp),
-        resultFlags_(resultFlags) {}
+        output_(output) {}
 
   TypedOrValueRegister value() const { return value_; }
   ConstantOrRegister id() const { return id_; }
-  TypedOrValueRegister output() const { return output_; }
-  Register maybeTemp() const { return maybeTemp_; }
+  ValueOperand output() const { return output_; }
   LiveRegisterSet liveRegs() const { return liveRegs_; }
-  GetPropertyResultFlags resultFlags() const { return resultFlags_; }
-  bool monitoredResult() const {
-    return resultFlags_ & GetPropertyResultFlags::Monitored;
-  }
-  bool allowDoubleResult() const {
-    return resultFlags_ & GetPropertyResultFlags::AllowDouble;
-  }
 
   static MOZ_MUST_USE bool update(JSContext* cx, HandleScript outerScript,
                                   IonGetPropertyIC* ic, HandleValue val,
@@ -271,12 +251,12 @@
   Register object_;
   TypedOrValueRegister receiver_;
   ConstantOrRegister id_;
-  TypedOrValueRegister output_;
+  ValueOperand output_;
 
  public:
   IonGetPropSuperIC(CacheKind kind, LiveRegisterSet liveRegs, Register object,
                     TypedOrValueRegister receiver, const ConstantOrRegister& id,
-                    TypedOrValueRegister output)
+                    ValueOperand output)
       : IonIC(kind),
         liveRegs_(liveRegs),
         object_(object),
@@ -287,7 +267,7 @@
   Register object() const { return object_; }
   TypedOrValueRegister receiver() const { return receiver_; }
   ConstantOrRegister id() const { return id_; }
-  TypedOrValueRegister output() const { return output_; }
+  ValueOperand output() const { return output_; }
   LiveRegisterSet liveRegs() const { return liveRegs_; }
 
   static MOZ_MUST_USE bool update(JSContext* cx, HandleScript outerScript,
@@ -304,26 +284,18 @@
   ConstantOrRegister id_;
   ConstantOrRegister rhs_;
   bool strict_ : 1;
-  bool needsPostBarrier_ : 1;
-  bool needsTypeBarrier_ : 1;
-  bool guardHoles_ : 1;
 
  public:
   IonSetPropertyIC(CacheKind kind, LiveRegisterSet liveRegs, Register object,
                    Register temp, const ConstantOrRegister& id,
-                   const ConstantOrRegister& rhs, bool strict,
-                   bool needsPostBarrier, bool needsTypeBarrier,
-                   bool guardHoles)
+                   const ConstantOrRegister& rhs, bool strict)
       : IonIC(kind),
         liveRegs_(liveRegs),
         object_(object),
         temp_(temp),
         id_(id),
         rhs_(rhs),
-        strict_(strict),
-        needsPostBarrier_(needsPostBarrier),
-        needsTypeBarrier_(needsTypeBarrier),
-        guardHoles_(guardHoles) {}
+        strict_(strict) {}
 
   LiveRegisterSet liveRegs() const { return liveRegs_; }
   Register object() const { return object_; }
@@ -333,9 +305,6 @@
   Register temp() const { return temp_; }
 
   bool strict() const { return strict_; }
-  bool needsPostBarrier() const { return needsPostBarrier_; }
-  bool needsTypeBarrier() const { return needsTypeBarrier_; }
-  bool guardHoles() const { return guardHoles_; }
 
   static MOZ_MUST_USE bool update(JSContext* cx, HandleScript outerScript,
                                   IonSetPropertyIC* ic, HandleObject obj,
diff -Nru firefox-84.0.2+build1/js/src/jit/IonScript.h firefox-85.0+build1/js/src/jit/IonScript.h
--- firefox-84.0.2+build1/js/src/jit/IonScript.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonScript.h	2021-01-18 19:58:13.000000000 +0000
@@ -83,9 +83,6 @@
   // Offset to OSR entrypoint from method_->raw(), or 0.
   uint32_t osrEntryOffset_ = 0;
 
-  // Offset to entrypoint skipping type arg check from method_->raw().
-  uint32_t skipArgCheckEntryOffset_ = 0;
-
   // Offset of the invalidation epilogue (which pushes this IonScript
   // and calls the invalidation thunk).
   uint32_t invalidateEpilogueOffset_ = 0;
@@ -99,6 +96,11 @@
   // Number of times this script bailed out without invalidation.
   uint32_t numBailouts_ = 0;
 
+  // Flag set if we have bailed out from an instruction hoisted by
+  // LICM.  If this happens twice without triggering a CacheIR
+  // invalidation, we will disable LICM.
+  bool hadLICMBailout_ = false;
+
   // Flag set if IonScript was compiled with profiling enabled.
   bool hasProfilingInstrumentation_ = false;
 
@@ -310,13 +312,6 @@
     osrEntryOffset_ = offset;
   }
   uint32_t osrEntryOffset() const { return osrEntryOffset_; }
-  void setSkipArgCheckEntryOffset(uint32_t offset) {
-    MOZ_ASSERT(!skipArgCheckEntryOffset_);
-    skipArgCheckEntryOffset_ = offset;
-  }
-  uint32_t getSkipArgCheckEntryOffset() const {
-    return skipArgCheckEntryOffset_;
-  }
   bool containsCodeAddress(uint8_t* addr) const {
     return method()->raw() <= addr &&
            addr <= method()->raw() + method()->instructionsSize();
@@ -347,6 +342,10 @@
   bool bailoutExpected() const {
     return numBailouts_ >= JitOptions.frequentBailoutThreshold;
   }
+
+  void setHadLICMBailout() { hadLICMBailout_ = true; }
+  bool hadLICMBailout() const { return hadLICMBailout_; }
+
   void setHasProfilingInstrumentation() { hasProfilingInstrumentation_ = true; }
   void clearHasProfilingInstrumentation() {
     hasProfilingInstrumentation_ = false;
diff -Nru firefox-84.0.2+build1/js/src/jit/IonTypes.h firefox-85.0+build1/js/src/jit/IonTypes.h
--- firefox-84.0.2+build1/js/src/jit/IonTypes.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/IonTypes.h	2021-01-18 19:58:13.000000000 +0000
@@ -58,8 +58,38 @@
 
 // Different kinds of bailouts.
 enum class BailoutKind : uint8_t {
-  // Normal bailouts, that don't need to be handled specially when restarting
-  // in baseline.
+  Unknown,
+
+  // An instruction generated by the transpiler. If this instruction bails out,
+  // attaching a new stub in baseline will invalidate the current Warp script
+  // and avoid a bailout loop.
+  TranspiledCacheIR,
+
+  // An optimistic unbox on the cold path for a non-Value phi failed. If this
+  // instruction bails out, we will invalidate the script and mark the
+  // HadSpeculativePhiBailout flag on the script.
+  SpeculativePhi,
+
+  // A conversion inserted by a type policy. If this instruction bails out,
+  // we expect to throw an error. If this happens too frequently, we will
+  // invalidate the current Warp script and disable recompilation.
+  TypePolicy,
+
+  // An instruction hoisted by LICM.  If this instruction bails out, we will
+  // bail out to baseline to see if we attach a new stub. If we do, then the
+  // more than once, we will invalidate the current Warp script and
+  // mark the hadLICMInvalidation flag on the script.
+  LICM,
+
+  // An instruction created or hoisted by tryHoistBoundsCheck.
+  // If this instruction bails out, we will invalidate the current Warp script
+  // and mark the HoistBoundsCheckBailout flag on the script.
+  HoistBoundsCheck,
+
+  // An eager truncation generated by range analysis.
+  // If this instruction bails out, we will invalidate the current Warp script
+  // and mark the EagerTruncationBailout flag on the script.
+  EagerTruncation,
 
   // An inevitable bailout (MBail instruction or type barrier that always bails)
   Inevitable,
@@ -69,326 +99,67 @@
   // We just lump them together.
   DuringVMCall,
 
-  // Too many arguments for apply calls.
+  // A spread call or funapply had more than JIT_ARGS_LENGTH_MAX arguments.
+  // We bail out to handle this in the VM. If this happens too frequently,
+  // we will invalidate the current Warp script and disable recompilation.
   TooManyArguments,
 
-  // Dynamic scope chain lookup produced |undefined|
-  DynamicNameNotFound,
-
-  // Bailout on overflow, but don't immediately invalidate.
-  // Used for abs, sub and LoadUnboxedScalar (when loading a uint32 that
-  // doesn't fit in an int32).
-  Overflow,
-
-  // floor, ceiling and round bail if input is NaN, if output would be -0 or
-  // doesn't fit in int32 range
-  Round,
-
-  // Non-primitive value used as input for ToDouble, ToInt32, ToString, etc.
-  // For ToInt32, can also mean that input can't be converted without precision
-  // loss (e.g. 5.5).
-  NonPrimitiveInput,
-
-  // For ToInt32, would lose precision when converting (e.g. 5.5).
-  PrecisionLoss,
-
-  // We tripped a type barrier (object was not in the expected TypeSet)
-  TypeBarrierO,
-  // We tripped a type barrier (value was not in the expected TypeSet)
-  TypeBarrierV,
-
-  // We hit a hole in an array.
-  Hole,
-
-  // The object has dense array elements
-  NoDenseElementsGuard,
-
-  // Array access with negative index
-  NegativeIndex,
-
-  // Pretty specific case:
-  //  - need a type barrier on a property write
-  //  - all but one of the observed types have property types that reflect
-  //    the value
-  //  - we need to guard that we're not given an object of that one other type
-  //    also used for the unused GuardClass instruction
-  ObjectIdentityOrTypeGuard,
-
-  // JSString was not equal to the expected JSAtom
-  SpecificAtomGuard,
-
-  // Symbol was not equal the expected JS::Symbol.
-  SpecificSymbolGuard,
-
-  // Bailout triggered by MGuardStringToIndex.
-  StringToIndexGuard,
-
-  // Bailout triggered by MGuardStringToInt32.
-  StringToInt32Guard,
-
-  // Bailout triggered by MGuardStringToDouble.
-  StringToDoubleGuard,
-
-  // Unbox expects a given type, bails out if it doesn't get it.
-  NonInt32Input,
-  NonNumericInput,  // unboxing a double works with int32 too
-  NonBooleanInput,
-  NonObjectInput,
-  NonStringInput,
-  NonSymbolInput,
-  NonBigIntInput,
-
-  // We hit a |debugger;| statement.
+  // We hit an active |debugger;| statement.
   Debugger,
 
   // We hit this code for the first time.
   FirstExecution,
 
-  // Array length did not fit in int32.
-  NonInt32ArrayLength,
-
-  // Function length not available ("length" property was redefined or function
-  // has a lazy script) or did not fit in int32.
-  FunctionLength,
-
-  // Function name not available ("name" property was redefined)
-  FunctionName,
-
-  // Bailout triggered by MFromCodePoint
-  InvalidCodePoint,
-
-  // END Normal bailouts
-
-  // Bailouts caused by invalid assumptions based on Baseline code.
-  // Causes immediate invalidation.
-
-  // Like BailoutKind::Overflow, but causes immediate invalidation.
-  OverflowInvalidate,
-
-  // Used for integer division, multiplication and modulo.
-  // If there's a remainder, bails to return a double.
-  // Can also signal overflow or result of -0.
-  // Can also signal division by 0 (returns inf, a double).
-  DoubleOutput,
-
-  // END Invalid assumptions bailouts
-
-  // A bailout at the very start of a function indicates that there may be
-  // a type mismatch in the arguments that necessitates a reflow.
-  ArgumentCheck,
-
-  // A bailout triggered by a bounds-check failure.
-  BoundsCheck,
-
-  // A shape guard based on TI information failed.
-  // (We saw an object whose shape does not match that / any of those observed
-  // by the baseline IC.)
-  ShapeGuard,
-
-  // Bailout triggered by MGuardProto or MGuardNullProto.
-  ProtoGuard,
-
-  // Bailout triggered by MGuardIsProxy.
-  ProxyGuard,
-
-  // Bailout triggered by MGuardIsNotProxy.
-  NotProxyGuard,
-
-  // Bailout triggered by MGuardIsNotDOMProxy.
-  NotDOMProxyGuard,
-
-  // Bailout triggered by MGuardIsNotArrayBufferMaybeShared.
-  NotArrayBufferMaybeSharedGuard,
-
-  // Bailout triggered by MGuardIsTypedArray.
-  TypedArrayGuard,
-
-  // Bailout triggered by a megamorphic load or store.
-  MegamorphicAccess,
-
-  // Bailout triggered by MLoadArgumentsObjectArg and MArgumentsObjectLength.
-  ArgumentsObjectAccess,
-
-  // Bailout triggered by MArrayPopShift.
-  ArrayPopShift,
-
-  // Bailout triggered by MArraySlice.
-  ArraySlice,
-
-  // Bailout triggered by MGuardValue.
-  ValueGuard,
-
-  // Bailout triggered by MGuardNotOptimizedArguments.
+  // A bailout triggered by MGuardNotOptimizedArguments. We will call
+  // argumentsOptimizationFailed to invalidate the script.
   NotOptimizedArgumentsGuard,
 
-  // Bailout triggered by MGuardNullOrUndefined.
-  NullOrUndefinedGuard,
-
-  // Bailout triggered by MGuardTagNotEqual.
-  TagNotEqualGuard,
-
-  // Bailout triggered by MGuardFunctionFlags.
-  FunctionFlagsGuard,
-
-  // Bailout triggered by MGuardFunctionIsNonBuiltinCtor.
-  FunctionIsNonBuiltinCtorGuard,
-
-  // Bailout triggered by MGuardFunctionKind.
-  FunctionKindGuard,
-
-  // Bailout triggered by MGuardFunctionScript.
-  FunctionScriptGuard,
-
-  // Bailout triggered by MGuardArrayIsPacked
-  PackedArrayGuard,
-
-  // Bailout triggered by MGuardHasGetterSetter
-  HasGetterSetterGuard,
-
-  // Bailout triggered by MLoadDOMExpandoValueGuardGeneration
-  DOMExpandoValueGenerationGuard,
-
-  // Bailout triggered by MGuardDOMExpandoMissingOrGuardShape
-  DOMExpandoMissingOrShapeGuard,
-
-  // When we're trying to use an uninitialized lexical.
+  // A lexical check failed. We will set lexical checks as unmovable.
   UninitializedLexical,
 
   // A bailout to baseline from Ion on exception to handle Debugger hooks.
   IonExceptionDebugMode,
 
+  // We returned to a stack frame after invalidating its IonScript.
+  OnStackInvalidation,
+
   Limit
 };
 
 inline const char* BailoutKindString(BailoutKind kind) {
   switch (kind) {
-    // Normal bailouts.
+    case BailoutKind::Unknown:
+      return "Unknown";
+    case BailoutKind::TranspiledCacheIR:
+      return "TranspiledCacheIR";
+    case BailoutKind::SpeculativePhi:
+      return "SpeculativePhi";
+    case BailoutKind::TypePolicy:
+      return "TypePolicy";
+    case BailoutKind::LICM:
+      return "LICM";
+    case BailoutKind::HoistBoundsCheck:
+      return "HoistBoundsCheck";
+    case BailoutKind::EagerTruncation:
+      return "EagerTruncation";
     case BailoutKind::Inevitable:
       return "Inevitable";
     case BailoutKind::DuringVMCall:
       return "DuringVMCall";
     case BailoutKind::TooManyArguments:
       return "TooManyArguments";
-    case BailoutKind::DynamicNameNotFound:
-      return "DynamicNameNotFound";
-    case BailoutKind::Overflow:
-      return "Overflow";
-    case BailoutKind::Round:
-      return "Round";
-    case BailoutKind::NonPrimitiveInput:
-      return "NonPrimitiveInput";
-    case BailoutKind::PrecisionLoss:
-      return "PrecisionLoss";
-    case BailoutKind::TypeBarrierO:
-      return "TypeBarrierO";
-    case BailoutKind::TypeBarrierV:
-      return "TypeBarrierV";
-    case BailoutKind::Hole:
-      return "Hole";
-    case BailoutKind::NoDenseElementsGuard:
-      return "NoDenseElementsGuard";
-    case BailoutKind::NegativeIndex:
-      return "NegativeIndex";
-    case BailoutKind::ObjectIdentityOrTypeGuard:
-      return "ObjectIdentityOrTypeGuard";
-    case BailoutKind::SpecificAtomGuard:
-      return "SpecifcAtomGuard";
-    case BailoutKind::SpecificSymbolGuard:
-      return "SpecificSymbolGuard";
-    case BailoutKind::StringToIndexGuard:
-      return "StringToIndexGuard";
-    case BailoutKind::StringToInt32Guard:
-      return "StringToInt32Guard";
-    case BailoutKind::StringToDoubleGuard:
-      return "StringToDoubleGuard";
-    case BailoutKind::NonInt32Input:
-      return "NonInt32Input";
-    case BailoutKind::NonNumericInput:
-      return "NonNumericInput";
-    case BailoutKind::NonBooleanInput:
-      return "NonBooleanInput";
-    case BailoutKind::NonObjectInput:
-      return "NonObjectInput";
-    case BailoutKind::NonStringInput:
-      return "NonStringInput";
-    case BailoutKind::NonSymbolInput:
-      return "NonSymbolInput";
-    case BailoutKind::NonBigIntInput:
-      return "NonBigIntInput";
     case BailoutKind::Debugger:
       return "Debugger";
     case BailoutKind::FirstExecution:
       return "FirstExecution";
-    case BailoutKind::NonInt32ArrayLength:
-      return "NonInt32ArrayLength";
-    case BailoutKind::FunctionLength:
-      return "FunctionLength";
-    case BailoutKind::FunctionName:
-      return "FunctionName";
-    case BailoutKind::InvalidCodePoint:
-      return "InvalidCodePoint";
-
-    // Bailouts caused by invalid assumptions.
-    case BailoutKind::OverflowInvalidate:
-      return "OverflowInvalidate";
-    case BailoutKind::DoubleOutput:
-      return "DoubleOutput";
-
-    // Other bailouts.
-    case BailoutKind::ArgumentCheck:
-      return "ArgumentCheck";
-    case BailoutKind::BoundsCheck:
-      return "BoundsCheck";
-    case BailoutKind::ShapeGuard:
-      return "ShapeGuard";
-    case BailoutKind::ProtoGuard:
-      return "ProtoGuard";
-    case BailoutKind::ProxyGuard:
-      return "ProxyGuard";
-    case BailoutKind::NotProxyGuard:
-      return "NotProxyGuard";
-    case BailoutKind::NotDOMProxyGuard:
-      return "NotDOMProxyGuard";
-    case BailoutKind::NotArrayBufferMaybeSharedGuard:
-      return "NotArrayBufferMaybeSharedGuard";
-    case BailoutKind::TypedArrayGuard:
-      return "TypedArrayGuard";
-    case BailoutKind::MegamorphicAccess:
-      return "MegamorphicAccess";
-    case BailoutKind::ArgumentsObjectAccess:
-      return "ArgumentsObjectAccess";
-    case BailoutKind::ArrayPopShift:
-      return "ArrayPopShift";
-    case BailoutKind::ArraySlice:
-      return "ArraySlice";
-    case BailoutKind::ValueGuard:
-      return "ValueGuard";
     case BailoutKind::NotOptimizedArgumentsGuard:
       return "NotOptimizedArgumentsGuard";
-    case BailoutKind::NullOrUndefinedGuard:
-      return "NullOrUndefinedGuard";
-    case BailoutKind::TagNotEqualGuard:
-      return "TagNotEqualGuard";
-    case BailoutKind::FunctionFlagsGuard:
-      return "FunctionFlagsGuard";
-    case BailoutKind::FunctionIsNonBuiltinCtorGuard:
-      return "FunctionIsNonBuiltinCtorGuard";
-    case BailoutKind::FunctionKindGuard:
-      return "FunctionKindGuard";
-    case BailoutKind::FunctionScriptGuard:
-      return "FunctionScriptGuard";
-    case BailoutKind::PackedArrayGuard:
-      return "PackedArrayGuard";
-    case BailoutKind::HasGetterSetterGuard:
-      return "HasGetterSetterGuard";
-    case BailoutKind::DOMExpandoValueGenerationGuard:
-      return "DOMExpandoValueGenerationGuard";
-    case BailoutKind::DOMExpandoMissingOrShapeGuard:
-      return "DOMExpandoMissingOrShapeGuard";
     case BailoutKind::UninitializedLexical:
       return "UninitializedLexical";
     case BailoutKind::IonExceptionDebugMode:
       return "IonExceptionDebugMode";
+    case BailoutKind::OnStackInvalidation:
+      return "OnStackInvalidation";
 
     case BailoutKind::Limit:
       break;
diff -Nru firefox-84.0.2+build1/js/src/jit/JitCode.h firefox-85.0+build1/js/src/jit/JitCode.h
--- firefox-84.0.2+build1/js/src/jit/JitCode.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitCode.h	2021-01-18 19:58:13.000000000 +0000
@@ -33,12 +33,6 @@
   // Link back to corresponding gcthing
   JitCode* jitCode_;
 
-  // !!! NOTE !!!
-  // If we are running on AMD Bobcat, insert a NOP-slide at end of the JitCode
-  // header so we can try to recover when the CPU screws up the branch landing
-  // site. See Bug 1281759.
-  void* nops_;
-
   void init(JitCode* jitCode);
 
   static JitCodeHeader* FromExecutable(uint8_t* buffer) {
diff -Nru firefox-84.0.2+build1/js/src/jit/JitcodeMap.cpp firefox-85.0+build1/js/src/jit/JitcodeMap.cpp
--- firefox-84.0.2+build1/js/src/jit/JitcodeMap.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitcodeMap.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -25,7 +25,6 @@
 #include "vm/BytecodeLocation-inl.h"
 #include "vm/GeckoProfiler-inl.h"
 #include "vm/JSScript-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using mozilla::Maybe;
 
@@ -137,6 +136,14 @@
   scriptList_ = nullptr;
 }
 
+void JitcodeGlobalEntry::BaselineEntry::trackIonAbort(jsbytecode* pc,
+                                                      const char* message) {
+  MOZ_ASSERT(script_->containsPC(pc));
+  MOZ_ASSERT(message);
+  ionAbortPc_ = pc;
+  ionAbortMessage_ = message;
+}
+
 void* JitcodeGlobalEntry::BaselineEntry::canonicalNativeAddrFor(
     void* ptr) const {
   // TODO: We can't yet normalize Baseline addresses until we unify
@@ -562,6 +569,7 @@
   }
 }
 
+// TODO(no-TI): remove this and IfUnmarked.
 struct Unconditionally {
   template <typename T>
   static bool ShouldTrace(JSRuntime* rt, T* thingp) {
@@ -576,12 +584,6 @@
   }
 };
 
-template <>
-bool IfUnmarked::ShouldTrace<TypeSet::Type>(JSRuntime* rt,
-                                            TypeSet::Type* type) {
-  return !TypeSet::IsTypeMarked(rt, type);
-}
-
 bool JitcodeGlobalTable::markIteratively(GCMarker* marker) {
   // JitcodeGlobalTable must keep entries that are in the sampler buffer
   // alive. This conditionality is akin to holding the entries weakly.
diff -Nru firefox-84.0.2+build1/js/src/jit/JitcodeMap.h firefox-85.0+build1/js/src/jit/JitcodeMap.h
--- firefox-84.0.2+build1/js/src/jit/JitcodeMap.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitcodeMap.h	2021-01-18 19:58:13.000000000 +0000
@@ -7,12 +7,31 @@
 #ifndef jit_JitcodeMap_h
 #define jit_JitcodeMap_h
 
-#include "jit/CompactBuffer.h"
-#include "jit/ExecutableAllocator.h"
-#include "jit/shared/Assembler-shared.h"
-#include "vm/BytecodeLocation.h"  // for BytecodeLocation
+#include "mozilla/Assertions.h"  // MOZ_ASSERT, MOZ_ASSERT_IF, MOZ_CRASH
+
+#include <stddef.h>  // size_t
+#include <stdint.h>  // uint8_t, uint32_t, uint64_t
+
+#include "jit/CompactBuffer.h"  // CompactBufferReader, CompactBufferWriter
+#include "jit/shared/Assembler-shared.h"  // CodeOffset
+#include "js/AllocPolicy.h"               // SystemAllocPolicy
+#include "js/TypeDecls.h"                 // jsbytecode
+#include "js/Vector.h"                    // Vector
+#include "vm/BytecodeLocation.h"          // BytecodeLocation
+
+class JSScript;
+class JSTracer;
+struct JSRuntime;
+class JSScript;
+
+namespace JS {
+class Zone;
+}  // namespace JS
 
 namespace js {
+
+class GCMarker;
+
 namespace jit {
 
 class InlineScriptTree;
@@ -309,12 +328,7 @@
 
     const char* str() const { return str_; }
 
-    void trackIonAbort(jsbytecode* pc, const char* message) {
-      MOZ_ASSERT(script_->containsPC(pc));
-      MOZ_ASSERT(message);
-      ionAbortPc_ = pc;
-      ionAbortMessage_ = message;
-    }
+    void trackIonAbort(jsbytecode* pc, const char* message);
 
     bool hadIonAbort() const {
       MOZ_ASSERT(!ionAbortPc_ || ionAbortMessage_);
diff -Nru firefox-84.0.2+build1/js/src/jit/JitContext.h firefox-85.0+build1/js/src/jit/JitContext.h
--- firefox-84.0.2+build1/js/src/jit/JitContext.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitContext.h	2021-01-18 19:58:13.000000000 +0000
@@ -30,14 +30,35 @@
   Method_Compiled
 };
 
+// Use only even, non-zero values for errors, to allow using the UnusedZero and
+// HasFreeLSB optimizations for mozilla::Result (see specializations of
+// UnusedZero/HasFreeLSB below).
 enum class AbortReason : uint8_t {
-  Alloc,
-  Inlining,
-  PreliminaryObjects,
-  Disable,
-  Error,
-  NoAbort
+  NoAbort,
+  Alloc = 2,
+  Inlining = 4,
+  PreliminaryObjects = 6,
+  Disable = 8,
+  Error = 10,
 };
+}  // namespace jit
+}  // namespace js
+
+namespace mozilla::detail {
+
+template <>
+struct UnusedZero<js::jit::AbortReason> : UnusedZeroEnum<js::jit::AbortReason> {
+};
+
+template <>
+struct HasFreeLSB<js::jit::AbortReason> {
+  static const bool value = true;
+};
+
+}  // namespace mozilla::detail
+
+namespace js {
+namespace jit {
 
 template <typename V>
 using AbortReasonOr = mozilla::Result<V, AbortReason>;
@@ -46,8 +67,12 @@
 
 static_assert(sizeof(AbortReasonOr<Ok>) <= sizeof(uintptr_t),
               "Unexpected size of AbortReasonOr<Ok>");
+static_assert(mozilla::detail::SelectResultImpl<bool, AbortReason>::value ==
+              mozilla::detail::PackingStrategy::NullIsOk);
 static_assert(sizeof(AbortReasonOr<bool>) <= sizeof(uintptr_t),
               "Unexpected size of AbortReasonOr<bool>");
+static_assert(sizeof(AbortReasonOr<uint16_t*>) == sizeof(uintptr_t),
+              "Unexpected size of AbortReasonOr<uint16_t*>");
 
 // A JIT context is needed to enter into either an JIT method or an instance
 // of a JIT compiler. It points to a temporary allocator and the active
@@ -62,13 +87,9 @@
 #ifdef DEBUG
   // Whether this thread is actively Ion compiling (does not include Wasm or
   // IonBuilder).
+  // TODO(no-TI): fix IonBuilder references in comments.
   bool inIonBackend_ = false;
 
-  // Whether this thread is actively Ion compiling in a context where a minor
-  // GC could happen simultaneously. If this is true, this thread cannot use
-  // any pointers into the nursery.
-  bool inIonBackendSafeForMinorGC_ = false;
-
   bool isCompilingWasm_ = false;
   bool oom_ = false;
 #endif
@@ -112,20 +133,13 @@
 
   bool inIonBackend() const { return inIonBackend_; }
 
-  bool inIonBackendSafeForMinorGC() const {
-    return inIonBackendSafeForMinorGC_;
-  }
-
-  void enterIonBackend(bool safeForMinorGC) {
+  void enterIonBackend() {
     MOZ_ASSERT(!inIonBackend_);
-    MOZ_ASSERT(!inIonBackendSafeForMinorGC_);
     inIonBackend_ = true;
-    inIonBackendSafeForMinorGC_ = safeForMinorGC;
   }
   void leaveIonBackend() {
     MOZ_ASSERT(inIonBackend_);
     inIonBackend_ = false;
-    inIonBackendSafeForMinorGC_ = false;
   }
 #endif
 };
diff -Nru firefox-84.0.2+build1/js/src/jit/Jit.cpp firefox-85.0+build1/js/src/jit/Jit.cpp
--- firefox-84.0.2+build1/js/src/jit/Jit.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Jit.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -110,8 +110,6 @@
                         result.address());
   }
 
-  MOZ_ASSERT(!cx->hasIonReturnOverride());
-
   // Release temporary buffer used for OSR into Ion.
   cx->runtime()->jitRuntime()->freeIonOsrTempData();
 
diff -Nru firefox-84.0.2+build1/js/src/jit/JitFrames.cpp firefox-85.0+build1/js/src/jit/JitFrames.cpp
--- firefox-84.0.2+build1/js/src/jit/JitFrames.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitFrames.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -37,7 +37,6 @@
 #include "vm/JSObject.h"
 #include "vm/JSScript.h"
 #include "vm/TraceLogging.h"
-#include "vm/TypeInference.h"
 #include "wasm/WasmBuiltins.h"
 #include "wasm/WasmInstance.h"
 
@@ -47,7 +46,6 @@
 #include "vm/GeckoProfiler-inl.h"
 #include "vm/JSScript-inl.h"
 #include "vm/Probes-inl.h"
-#include "vm/TypeInference-inl.h"
 
 namespace js {
 namespace jit {
@@ -596,14 +594,6 @@
 
   JitSpew(JitSpew_IonInvalidate, "handling exception");
 
-  // Clear any Ion return override that's been set.
-  // This may happen if a callVM function causes an invalidation (setting the
-  // override), and then fails, bypassing the bailout handlers that would
-  // otherwise clear the return override.
-  if (cx->hasIonReturnOverride()) {
-    cx->takeIonReturnOverride();
-  }
-
   JitActivation* activation = cx->activation()->asJit();
 
 #ifdef CHECK_OSIPOINT_REGISTERS
@@ -1020,7 +1010,11 @@
 
   if (ICStub* stub = layout->maybeStubPtr()) {
     MOZ_ASSERT(stub->makesGCCalls());
-    stub->trace(trc);
+    if (stub->isFallback()) {
+      stub->toFallbackStub()->trace(trc);
+    } else {
+      stub->toCacheIRStub()->trace(trc);
+    }
   }
 }
 
@@ -1912,9 +1906,10 @@
       return true;
     }
 
-    // Use AutoEnterAnalysis to avoid invoking the object metadata callback,
-    // which could try to walk the stack while bailing out.
-    AutoEnterAnalysis enter(cx);
+    // Avoid invoking the object metadata callback, which could try to walk the
+    // stack while bailing out.
+    gc::AutoSuppressGC suppressGC(cx);
+    js::AutoSuppressAllocationMetadataBuilder suppressMetadata(cx);
 
     // Fill with the results of recover instructions.
     SnapshotIterator s(*this);
diff -Nru firefox-84.0.2+build1/js/src/jit/JitOptions.cpp firefox-85.0+build1/js/src/jit/JitOptions.cpp
--- firefox-84.0.2+build1/js/src/jit/JitOptions.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitOptions.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -345,13 +345,6 @@
   smallFunctionMaxBytecodeLength = 2000;
 }
 
-void DefaultJitOptions::setWarpEnabled(bool enable) {
-  // WarpBuilder doesn't use optimization levels.
-  warpBuilder = enable;
-  disableOptimizationLevels = enable;
-  normalIonWarmUpThreshold = enable ? 1500 : 1000;
-}
-
 void DefaultJitOptions::setNormalIonWarmUpThreshold(uint32_t warmUpThreshold) {
   normalIonWarmUpThreshold = warmUpThreshold;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/JitOptions.h firefox-85.0+build1/js/src/jit/JitOptions.h
--- firefox-84.0.2+build1/js/src/jit/JitOptions.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitOptions.h	2021-01-18 19:58:13.000000000 +0000
@@ -131,7 +131,6 @@
   void resetFullIonWarmUpThreshold();
   void enableGvn(bool val);
   void setFastWarmUp();
-  void setWarpEnabled(bool enable);
 
   bool eagerIonCompilation() const { return normalIonWarmUpThreshold == 0; }
 };
@@ -147,9 +146,6 @@
 }
 
 }  // namespace jit
-
-inline bool IsTypeInferenceEnabled() { return !jit::JitOptions.warpBuilder; }
-
 }  // namespace js
 
 #endif /* jit_JitOptions_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/JitScript.cpp firefox-85.0+build1/js/src/jit/JitScript.cpp
--- firefox-84.0.2+build1/js/src/jit/JitScript.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitScript.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -25,7 +25,6 @@
 #include "vm/FrameIter.h"  // js::OnlyJSJitFrameIter
 #include "vm/JSScript.h"
 #include "vm/Stack.h"
-#include "vm/TypeInference.h"
 #include "wasm/WasmInstance.h"
 
 #include "gc/FreeOp-inl.h"
@@ -33,48 +32,18 @@
 #include "vm/BytecodeIterator-inl.h"
 #include "vm/BytecodeLocation-inl.h"
 #include "vm/JSScript-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
 
 using mozilla::CheckedInt;
 
-/* static */
-size_t JitScript::NumTypeSets(JSScript* script) {
-  // We rely on |num| not overflowing below.
-  static_assert(JSScript::MaxBytecodeTypeSets == UINT16_MAX,
-                "JSScript typesets should have safe range to avoid overflow");
-  static_assert(JSFunction::NArgsBits == 16,
-                "JSFunction nargs should have safe range to avoid overflow");
-
-  if (!IsTypeInferenceEnabled()) {
-    return 0;
-  }
-
-  size_t num = script->numBytecodeTypeSets() + 1 /* this */;
-  if (JSFunction* fun = script->function()) {
-    num += fun->nargs();
-  }
-
-  return num;
-}
-
-JitScript::JitScript(JSScript* script, Offset typeSetOffset,
-                     Offset bytecodeTypeMapOffset, Offset endOffset,
+JitScript::JitScript(JSScript* script, Offset endOffset,
                      const char* profileString)
     : profileString_(profileString),
-      typeSetOffset_(typeSetOffset),
-      bytecodeTypeMapOffset_(bytecodeTypeMapOffset),
       endOffset_(endOffset),
-      icScript_(script->getWarmUpCount(), typeSetOffset - offsetOfICScript(),
+      icScript_(script->getWarmUpCount(), endOffset - offsetOfICScript(),
                 /*depth=*/0) {
-  setTypesGeneration(script->zone()->types.generation);
-
-  if (IsTypeInferenceEnabled()) {
-    initElements<StackTypeSet>(typeSetOffset, numTypeSets());
-  }
-
   // Ensure the baselineScript_ and ionScript_ fields match the BaselineDisabled
   // and IonDisabled script flags.
   if (!script->canBaselineCompile()) {
@@ -94,7 +63,7 @@
   MOZ_ASSERT_IF(IsBaselineInterpreterEnabled(),
                 CanBaselineInterpretScript(this));
 
-  AutoEnterAnalysis enter(cx);
+  gc::AutoSuppressGC suppressGC(cx);
 
   // Run the arguments-analysis if needed. Both the Baseline Interpreter and
   // Compiler rely on this.
@@ -116,14 +85,10 @@
     }
   }
 
-  size_t numTypeSets = JitScript::NumTypeSets(this);
-
   static_assert(sizeof(JitScript) % sizeof(uintptr_t) == 0,
                 "Trailing arrays must be aligned properly");
   static_assert(sizeof(ICEntry) % sizeof(uintptr_t) == 0,
                 "Trailing arrays must be aligned properly");
-  static_assert(sizeof(StackTypeSet) % sizeof(uintptr_t) == 0,
-                "Trailing arrays must be aligned properly");
 
   static_assert(
       sizeof(JitScript) == offsetof(JitScript, icScript_) + sizeof(ICScript),
@@ -132,10 +97,6 @@
   // Calculate allocation size.
   CheckedInt<uint32_t> allocSize = sizeof(JitScript);
   allocSize += CheckedInt<uint32_t>(numICEntries()) * sizeof(ICEntry);
-  if (IsTypeInferenceEnabled()) {
-    allocSize += CheckedInt<uint32_t>(numTypeSets) * sizeof(StackTypeSet);
-    allocSize += CheckedInt<uint32_t>(numBytecodeTypeSets()) * sizeof(uint32_t);
-  }
   if (!allocSize.isValid()) {
     ReportAllocationOverflow(cx);
     return false;
@@ -147,17 +108,11 @@
     return false;
   }
 
-  uint32_t typeSetOffset = sizeof(JitScript) + numICEntries() * sizeof(ICEntry);
-  uint32_t bytecodeTypeMapOffset =
-      typeSetOffset + numTypeSets * sizeof(StackTypeSet);
   UniquePtr<JitScript> jitScript(
-      new (raw) JitScript(this, typeSetOffset, bytecodeTypeMapOffset,
-                          allocSize.value(), profileString));
+      new (raw) JitScript(this, allocSize.value(), profileString));
 
-  // Sanity check the length computations.
+  // Sanity check the length computation.
   MOZ_ASSERT(jitScript->numICEntries() == numICEntries());
-  MOZ_ASSERT_IF(IsTypeInferenceEnabled(),
-                jitScript->numTypeSets() == numTypeSets);
 
   // We need to call prepareForDestruction on JitScript before we |delete| it.
   auto prepareForDestruction = mozilla::MakeScopeExit(
@@ -167,10 +122,6 @@
     return false;
   }
 
-  if (IsTypeInferenceEnabled()) {
-    jitScript->initBytecodeTypeMap(this);
-  }
-
   prepareForDestruction.release();
   warmUpData_.initJitScript(jitScript.release());
   AddCellMemory(this, allocSize.value(), MemoryUse::JitScript);
@@ -179,34 +130,13 @@
   // Baseline Interpreter code.
   updateJitCodeRaw(cx->runtime());
 
-#ifdef DEBUG
-  if (IsTypeInferenceEnabled()) {
-    AutoSweepJitScript sweep(this);
-    StackTypeSet* typeArray = this->jitScript()->typeArrayDontCheckGeneration();
-    for (unsigned i = 0; i < numBytecodeTypeSets(); i++) {
-      InferSpew(ISpewOps, "typeSet: %sT%p%s bytecode%u %p",
-                InferSpewColor(&typeArray[i]), &typeArray[i],
-                InferSpewColorReset(), i, this);
-    }
-    StackTypeSet* thisTypes = this->jitScript()->thisTypes(sweep, this);
-    InferSpew(ISpewOps, "typeSet: %sT%p%s this %p", InferSpewColor(thisTypes),
-              thisTypes, InferSpewColorReset(), this);
-    unsigned nargs = function() ? function()->nargs() : 0;
-    for (unsigned i = 0; i < nargs; i++) {
-      StackTypeSet* types = this->jitScript()->argTypes(sweep, this, i);
-      InferSpew(ISpewOps, "typeSet: %sT%p%s arg%u %p", InferSpewColor(types),
-                types, InferSpewColorReset(), i, this);
-    }
-  }
-#endif
-
   return true;
 }
 
 void JSScript::maybeReleaseJitScript(JSFreeOp* fop) {
   MOZ_ASSERT(hasJitScript());
 
-  if (zone()->types.keepJitScripts || jitScript()->hasBaselineScript() ||
+  if (zone()->jitZone()->keepJitScripts() || jitScript()->hasBaselineScript() ||
       jitScript()->active()) {
     return;
   }
@@ -347,67 +277,8 @@
   }
 }
 
-#ifdef DEBUG
-void JitScript::printTypes(JSContext* cx, HandleScript script) {
-  AutoSweepJitScript sweep(script);
-  MOZ_ASSERT(script->jitScript() == this);
-
-  AutoEnterAnalysis enter(nullptr, script->zone());
-  Fprinter out(stderr);
-
-  if (script->function()) {
-    fprintf(stderr, "Function");
-  } else if (script->isForEval()) {
-    fprintf(stderr, "Eval");
-  } else {
-    fprintf(stderr, "Main");
-  }
-  fprintf(stderr, " %#" PRIxPTR " %s:%u ", uintptr_t(script.get()),
-          script->filename(), script->lineno());
-
-  if (script->function()) {
-    if (JSAtom* name = script->function()->explicitName()) {
-      name->dumpCharsNoNewline(out);
-    }
-  }
-
-  fprintf(stderr, "\n    this:");
-  thisTypes(sweep, script)->print();
-
-  for (uint32_t i = 0; script->function() && i < script->function()->nargs();
-       i++) {
-    fprintf(stderr, "\n    arg%u:", i);
-    argTypes(sweep, script, i)->print();
-  }
-  fprintf(stderr, "\n");
-
-  for (BytecodeLocation it : AllBytecodesIterable(script)) {
-    {
-      fprintf(stderr, "%p:", script.get());
-      Sprinter sprinter(cx);
-      if (!sprinter.init()) {
-        return;
-      }
-      Disassemble1(cx, script, it.toRawBytecode(), it.bytecodeToOffset(script),
-                   true, &sprinter);
-      fprintf(stderr, "%s", sprinter.string());
-    }
-
-    if (it.opHasTypeSet()) {
-      StackTypeSet* types = bytecodeTypes(sweep, script, it.toRawBytecode());
-      fprintf(stderr, "  typeset %u:", uint32_t(types - typeArray(sweep)));
-      types->print();
-      fprintf(stderr, "\n");
-    }
-  }
-
-  fprintf(stderr, "\n");
-}
-#endif /* DEBUG */
-
 /* static */
 void JitScript::Destroy(Zone* zone, JitScript* script) {
-  script->unlinkDependentWasmImports();
   script->prepareForDestruction(zone);
 
   js_delete(script);
@@ -434,13 +305,6 @@
         if (entryOffset < pcOffset) {
           return 1;
         }
-        if (entry.isForPrologue()) {
-          // Prologue ICEntries are used for function argument type checks.
-          // Ignore these entries and return 1 because these entries appear in
-          // the ICEntry list before the other ICEntry (if any) at offset 0.
-          MOZ_ASSERT(entryOffset == 0);
-          return 1;
-        }
         return 0;
       },
       loc);
@@ -458,7 +322,6 @@
   MOZ_ASSERT(mid < numICEntries());
 
   ICEntry& entry = icEntry(mid);
-  MOZ_ASSERT(!entry.isForPrologue());
   MOZ_ASSERT(entry.pcOffset() == pcOffset);
   return &entry;
 }
@@ -479,7 +342,7 @@
     ICEntry* lastEntry = &icEntry(numICEntries() - 1);
     ICEntry* curEntry = prevLookedUpEntry;
     while (curEntry >= firstEntry && curEntry <= lastEntry) {
-      if (curEntry->pcOffset() == pcOffset && !curEntry->isForPrologue()) {
+      if (curEntry->pcOffset() == pcOffset) {
         return curEntry;
       }
       curEntry++;
@@ -503,7 +366,7 @@
   // pcOffset does not necessarily have an ICEntry, so we want to return the
   // first ICEntry for which the following is true:
   //
-  //    !entry.isForPrologue() && entry.pcOffset() >= pcOffset
+  //    entry.pcOffset() >= pcOffset
   //
   // Fortunately, ComputeBinarySearchMid returns exactly this entry.
 
@@ -512,7 +375,6 @@
 
   if (mid < numICEntries()) {
     ICEntry& entry = icEntry(mid);
-    MOZ_ASSERT(!entry.isForPrologue());
     MOZ_ASSERT(entry.pcOffset() >= pcOffset);
     return &entry;
   }
@@ -551,39 +413,25 @@
       lastStub = lastStub->next();
     }
 
-    if (lastStub->isFallback()) {
-      // Unlink all stubs allocated in the optimized space.
-      ICStub* stub = entry.firstStub();
-      ICStub* prev = nullptr;
-
-      while (stub->next()) {
-        if (!stub->allocatedInFallbackSpace()) {
-          // Note: this is called when discarding JIT code, after invalidating
-          // all Warp code, so we don't need to check for that here.
-          lastStub->toFallbackStub()->clearUsedByTranspiler();
-          lastStub->toFallbackStub()->unlinkStubDontInvalidateWarp(zone, prev,
-                                                                   stub);
-          stub = stub->next();
-          continue;
-        }
+    MOZ_ASSERT(lastStub->isFallback());
+
+    // Unlink all stubs allocated in the optimized space.
+    ICStub* stub = entry.firstStub();
+    ICStub* prev = nullptr;
 
-        prev = stub;
+    while (stub->next()) {
+      if (!stub->allocatedInFallbackSpace()) {
+        // Note: this is called when discarding JIT code, after invalidating
+        // all Warp code, so we don't need to check for that here.
+        lastStub->toFallbackStub()->clearUsedByTranspiler();
+        lastStub->toFallbackStub()->unlinkStubDontInvalidateWarp(zone, prev,
+                                                                 stub);
         stub = stub->next();
+        continue;
       }
 
-      if (lastStub->isMonitoredFallback()) {
-        // Monitor stubs can't make calls, so are always in the
-        // optimized stub space.
-        ICTypeMonitor_Fallback* lastMonStub =
-            lastStub->toMonitoredFallbackStub()->maybeFallbackMonitorStub();
-        if (lastMonStub) {
-          lastMonStub->resetMonitorStubChain(zone);
-        }
-      }
-    } else if (lastStub->isTypeMonitor_Fallback()) {
-      lastStub->toTypeMonitor_Fallback()->resetMonitorStubChain(zone);
-    } else {
-      MOZ_CRASH("Unknown fallback stub");
+      prev = stub;
+      stub = stub->next();
     }
   }
 
@@ -600,60 +448,6 @@
 #endif
 }
 
-void JitScript::noteAccessedGetter(uint32_t pcOffset) {
-  ICEntry& entry = icEntryFromPCOffset(pcOffset);
-  ICFallbackStub* stub = entry.fallbackStub();
-
-  if (stub->isGetProp_Fallback()) {
-    stub->toGetProp_Fallback()->noteAccessedGetter();
-  }
-}
-
-void JitScript::noteHasDenseAdd(uint32_t pcOffset) {
-  ICEntry& entry = icEntryFromPCOffset(pcOffset);
-  ICFallbackStub* stub = entry.fallbackStub();
-
-  if (stub->isSetElem_Fallback()) {
-    stub->toSetElem_Fallback()->noteHasDenseAdd();
-  }
-}
-
-void JitScript::unlinkDependentWasmImports() {
-  // Remove any links from wasm::Instances that contain optimized FFI calls into
-  // this JitScript.
-  if (dependentWasmImports_) {
-    for (DependentWasmImport& dep : *dependentWasmImports_) {
-      dep.instance->deoptimizeImportExit(dep.importIndex);
-    }
-    dependentWasmImports_.reset();
-  }
-}
-
-bool JitScript::addDependentWasmImport(JSContext* cx, wasm::Instance& instance,
-                                       uint32_t idx) {
-  if (!dependentWasmImports_) {
-    dependentWasmImports_ = cx->make_unique<Vector<DependentWasmImport>>(cx);
-    if (!dependentWasmImports_) {
-      return false;
-    }
-  }
-  return dependentWasmImports_->emplaceBack(instance, idx);
-}
-
-void JitScript::removeDependentWasmImport(wasm::Instance& instance,
-                                          uint32_t idx) {
-  if (!dependentWasmImports_) {
-    return;
-  }
-
-  for (DependentWasmImport& dep : *dependentWasmImports_) {
-    if (dep.instance == &instance && dep.importIndex == idx) {
-      dependentWasmImports_->erase(&dep);
-      break;
-    }
-  }
-}
-
 JitScript::CachedIonData::CachedIonData(EnvironmentObject* templateEnv,
                                         IonBytecodeInfo bytecodeInfo)
     : templateEnv(templateEnv), bytecodeInfo(bytecodeInfo) {}
@@ -751,25 +545,11 @@
   script->updateJitCodeRaw(fop->runtime());
 }
 
-#if defined(JS_STRUCTURED_SPEW) || defined(JS_CACHEIR_SPEW)
-bool jit::GetStubEnteredCount(ICStub* stub, uint32_t* count) {
-  if (ICStub::IsCacheIRKind(stub->kind())) {
-    *count = stub->getEnteredCount();
-    return true;
-  }
-  return false;
-}
-#endif  // JS_STRUCTURED_SPEW || JS_CACHEIR_SPEW
-
 #ifdef JS_STRUCTURED_SPEW
 static bool HasEnteredCounters(ICEntry& entry) {
   ICStub* stub = entry.firstStub();
-  while (stub && !stub->isFallback()) {
-    uint32_t count;
-    if (GetStubEnteredCount(stub, &count)) {
-      return true;
-    }
-    stub = stub->next();
+  if (stub && !stub->isFallback()) {
+    return true;
   }
   return false;
 }
@@ -806,12 +586,8 @@
     spew->beginListProperty("counts");
     ICStub* stub = entry.firstStub();
     while (stub && !stub->isFallback()) {
-      uint32_t count;
-      if (GetStubEnteredCount(stub, &count)) {
-        spew->value(count);
-      } else {
-        spew->value("?");
-      }
+      uint32_t count = stub->getEnteredCount();
+      spew->value(count);
       stub = stub->next();
     }
     spew->endList();
@@ -867,29 +643,6 @@
   }
 }
 
-void JitScript::initBytecodeTypeMap(JSScript* script) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(jit::IsBaselineInterpreterEnabled());
-  MOZ_ASSERT(numICEntries() == script->numICEntries());
-
-  // Index of the next bytecode type map entry to initialize.
-  uint32_t typeMapIndex = 0;
-  uint32_t* const typeMap = bytecodeTypeMap();
-
-  // For JOF_TYPESET ops: initialize bytecode type map entries.
-  for (BytecodeLocation loc : js::AllBytecodesIterable(script)) {
-    JSOp op = loc.getOp();
-    // Note: if the script is very large there will be more JOF_TYPESET ops
-    // than bytecode type sets. See JSScript::MaxBytecodeTypeSets.
-    if (BytecodeOpHasTypeSet(op) &&
-        typeMapIndex < JSScript::MaxBytecodeTypeSets) {
-      typeMap[typeMapIndex] = loc.bytecodeToOffset(script);
-      typeMapIndex++;
-    }
-  }
-  MOZ_ASSERT(typeMapIndex == script->numBytecodeTypeSets());
-}
-
 InliningRoot* JitScript::getOrCreateInliningRoot(JSContext* cx,
                                                  JSScript* script) {
   if (!inliningRoot_) {
diff -Nru firefox-84.0.2+build1/js/src/jit/JitScript.h firefox-85.0+build1/js/src/jit/JitScript.h
--- firefox-84.0.2+build1/js/src/jit/JitScript.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitScript.h	2021-01-18 19:58:13.000000000 +0000
@@ -15,22 +15,13 @@
 #include "js/UniquePtr.h"
 #include "util/TrailingArray.h"
 #include "vm/EnvironmentObject.h"
-#include "vm/TypeInference.h"
 
 class JS_PUBLIC_API JSScript;
 
 namespace js {
 namespace jit {
 
-// Describes a single wasm::ImportExit which jumps (via an import with
-// the given index) directly to a JitScript.
-struct DependentWasmImport {
-  wasm::Instance* instance;
-  size_t importIndex;
-
-  DependentWasmImport(wasm::Instance& instance, size_t importIndex)
-      : instance(&instance), importIndex(importIndex) {}
-};
+class JitZone;
 
 // Information about a script's bytecode, used by IonBuilder. This is cached
 // in JitScript.
@@ -215,58 +206,34 @@
 // JitScript. Other stubs are stored in the optimized stub space stored in
 // JitZone and can be purged more eagerly. See JitScript::purgeOptimizedStubs.
 //
-// An ICScript contains a list of IC entries, in the following order:
-//
-//   - Type monitor IC for |this|.
-//   - Type monitor IC for each formal argument.
-//   - IC for each JOF_IC bytecode op.
+// An ICScript contains a list of IC entries. There's one IC for each JOF_IC
+// bytecode op.
 //
 // The ICScript also contains the warmUpCount for the script.
 //
-// Type Inference Data
-// ===================
-// JitScript also contains Type Inference data, most importantly:
-//
-// * An array of StackTypeSets for type monitoring of |this|, formal arguments,
-//   JOF_TYPESET ops. These TypeSets record the types we observed and have
-//   constraints to trigger invalidation of Ion code when the TypeSets change.
-//
-// * The bytecode type map to map from StackTypeSet index to bytecode offset.
-//
-// * List of Ion compilations inlining this script, for invalidation.
-//
-// The StackTypeSet array and bytecode type map are empty when TI is disabled.
+// Inlining Data
+// =============
+// JitScript also contains a list of Warp compilations inlining this script, for
+// invalidation.
 //
 // Memory Layout
 // =============
 // JitScript contains an ICScript as the last field. ICScript has a trailing
-// (variable length) ICEntry array. Following the ICScript, JitScript has
-// several additional trailing arrays. The memory layout is as follows:
+// (variable length) ICEntry array. The memory layout is as follows:
 //
 //  Item                    | Offset
 //  ------------------------+------------------------
 //  JitScript               | 0
 //  -->ICScript  (field)    |
 //     ICEntry[]            | icEntriesOffset()
-//  StackTypeSet[]          | typeSetOffset()
-//  uint32_t[]              | bytecodeTypeMapOffset()
-//    (= bytecode type map) |
 //
-// These offsets are also used to compute numICEntries and numTypeSets.
+// These offsets are also used to compute numICEntries.
 class alignas(uintptr_t) JitScript final : public TrailingArray {
   friend class ::JSScript;
 
   // Allocated space for fallback IC stubs.
   FallbackICStubSpace fallbackStubSpace_ = {};
 
-  // Like JSScript::jitCodeRaw_ but when the script has an IonScript this can
-  // point to a separate entry point that skips the argument type checks.
-  uint8_t* jitCodeSkipArgCheck_ = nullptr;
-
-  // If non-null, the list of wasm::Modules that contain an optimized call
-  // directly to this script.
-  js::UniquePtr<Vector<DependentWasmImport>> dependentWasmImports_;
-
   // Profile string used by the profiler for Baseline Interpreter frames.
   const char* profileString_ = nullptr;
 
@@ -274,29 +241,11 @@
   // analyzed by IonBuilder. This is done lazily to improve performance and
   // memory usage as most scripts are never Ion-compiled.
   struct CachedIonData {
-    // The freeze constraints added to stack type sets will only directly
-    // invalidate the script containing those stack type sets. This Vector
-    // contains compilations that inlined this script, so we can invalidate
-    // them as well.
-    RecompileInfoVector inlinedCompilations_;
-
     // For functions with a call object, template objects to use for the call
     // object and decl env object (linked via the call object's enclosing
     // scope).
     const HeapPtr<EnvironmentObject*> templateEnv = nullptr;
 
-    // The total bytecode length of all scripts we inlined when we Ion-compiled
-    // this script. 0 if Ion did not compile this script or if we didn't inline
-    // anything.
-    uint16_t inlinedBytecodeLength = 0;
-
-    // The max inlining depth where we can still inline all functions we inlined
-    // when we Ion-compiled this script. This starts as UINT8_MAX, since we have
-    // no data yet, and won't affect inlining heuristics in that case. The value
-    // is updated when we Ion-compile this script. See makeInliningDecision for
-    // more info.
-    uint8_t maxInliningDepth = UINT8_MAX;
-
     // Analysis information based on the script and its bytecode.
     IonBytecodeInfo bytecodeInfo = {};
 
@@ -317,36 +266,14 @@
   // IonCompilingScriptPtr or a valid IonScript*.
   IonScript* ionScript_ = nullptr;
 
-  // Offset of the StackTypeSet array.
-  Offset typeSetOffset_ = 0;
-
-  // Offset of the bytecode type map.
-  Offset bytecodeTypeMapOffset_ = 0;
-
   // The size of this allocation.
   Offset endOffset_ = 0;
 
-  // This field is used to avoid binary searches for the sought entry when
-  // bytecode map queries are in linear order.
-  uint32_t bytecodeTypeMapHint_ = 0;
-
   struct Flags {
     // Flag set when discarding JIT code to indicate this script is on the stack
     // and type information and JIT code should not be discarded.
     bool active : 1;
 
-    // Generation for type sweeping. If out of sync with the TypeZone's
-    // generation, this JitScript needs to be swept.
-    bool typesGeneration : 1;
-
-    // Whether freeze constraints for stack type sets have been generated.
-    bool hasFreezeConstraints : 1;
-
-    // Flag set if this script has ever been Ion compiled, either directly or
-    // inlined into another script. This is cleared when the script's type
-    // information or caches are cleared.
-    bool ionCompiledOrInlined : 1;
-
     // True if this script entered Ion via OSR at a loop header.
     bool hadIonOSR : 1;
   };
@@ -358,23 +285,10 @@
   // End of fields.
 
   Offset icEntriesOffset() const { return offsetOfICEntries(); }
-  Offset typeSetOffset() const { return typeSetOffset_; }
-  Offset bytecodeTypeMapOffset() const { return bytecodeTypeMapOffset_; }
   Offset endOffset() const { return endOffset_; }
 
   ICEntry* icEntries() { return icScript_.icEntries(); }
 
-  StackTypeSet* typeArrayDontCheckGeneration() {
-    MOZ_ASSERT(IsTypeInferenceEnabled());
-    return offsetToPointer<StackTypeSet>(typeSetOffset());
-  }
-
-  uint32_t typesGeneration() const { return uint32_t(flags_.typesGeneration); }
-  void setTypesGeneration(uint32_t generation) {
-    MOZ_ASSERT(generation <= 1);
-    flags_.typesGeneration = generation;
-  }
-
   bool hasCachedIonData() const { return !!cachedIonData_; }
 
   CachedIonData& cachedIonData() {
@@ -387,9 +301,7 @@
   }
 
  public:
-  JitScript(JSScript* script, Offset typeSetOffset,
-            Offset bytecodeTypeMapOffset, Offset endOffset,
-            const char* profileString);
+  JitScript(JSScript* script, Offset endOffset, const char* profileString);
 
 #ifdef DEBUG
   ~JitScript() {
@@ -403,54 +315,12 @@
   }
 #endif
 
-  void initBytecodeTypeMap(JSScript* script);
-
   MOZ_MUST_USE bool ensureHasCachedIonData(JSContext* cx, HandleScript script);
 
-  bool hasFreezeConstraints(const js::AutoSweepJitScript& sweep) const {
-    MOZ_ASSERT(sweep.jitScript() == this);
-    return flags_.hasFreezeConstraints;
-  }
-  void setHasFreezeConstraints(const js::AutoSweepJitScript& sweep) {
-    MOZ_ASSERT(sweep.jitScript() == this);
-    flags_.hasFreezeConstraints = true;
-  }
-
-  inline bool typesNeedsSweep(Zone* zone) const;
-  void sweepTypes(const js::AutoSweepJitScript& sweep, Zone* zone);
-
-  void setIonCompiledOrInlined() { flags_.ionCompiledOrInlined = true; }
-  void clearIonCompiledOrInlined() { flags_.ionCompiledOrInlined = false; }
-  bool ionCompiledOrInlined() const { return flags_.ionCompiledOrInlined; }
-
   void setHadIonOSR() { flags_.hadIonOSR = true; }
   bool hadIonOSR() const { return flags_.hadIonOSR; }
 
-  RecompileInfoVector* maybeInlinedCompilations(
-      const js::AutoSweepJitScript& sweep) {
-    MOZ_ASSERT(sweep.jitScript() == this);
-    if (!hasCachedIonData()) {
-      return nullptr;
-    }
-    return &cachedIonData().inlinedCompilations_;
-  }
-  MOZ_MUST_USE bool addInlinedCompilation(const js::AutoSweepJitScript& sweep,
-                                          RecompileInfo info) {
-    MOZ_ASSERT(sweep.jitScript() == this);
-    auto& inlinedCompilations = cachedIonData().inlinedCompilations_;
-    if (!inlinedCompilations.empty() && inlinedCompilations.back() == info) {
-      return true;
-    }
-    return inlinedCompilations.append(info);
-  }
-
   uint32_t numICEntries() const { return icScript_.numICEntries(); }
-  uint32_t numTypeSets() const {
-    MOZ_ASSERT(IsTypeInferenceEnabled());
-    return numElements<StackTypeSet>(typeSetOffset(), bytecodeTypeMapOffset());
-  }
-
-  uint32_t* bytecodeTypeMapHint() { return &bytecodeTypeMapHint_; }
 
   bool active() const { return flags_.active; }
   void setActive() { flags_.active = true; }
@@ -463,89 +333,10 @@
     return profileString_;
   }
 
-  /* Array of type sets for variables and JOF_TYPESET ops. */
-  StackTypeSet* typeArray(const js::AutoSweepJitScript& sweep) {
-    MOZ_ASSERT(sweep.jitScript() == this);
-    return typeArrayDontCheckGeneration();
-  }
-
-  uint32_t* bytecodeTypeMap() {
-    MOZ_ASSERT(IsTypeInferenceEnabled());
-    return offsetToPointer<uint32_t>(bytecodeTypeMapOffset());
-  }
-
-  inline StackTypeSet* thisTypes(const AutoSweepJitScript& sweep,
-                                 JSScript* script);
-  inline StackTypeSet* argTypes(const AutoSweepJitScript& sweep,
-                                JSScript* script, unsigned i);
-
-  static size_t NumTypeSets(JSScript* script);
-
-  /* Get the type set for values observed at an opcode. */
-  inline StackTypeSet* bytecodeTypes(const AutoSweepJitScript& sweep,
-                                     JSScript* script, jsbytecode* pc);
-
-  template <typename TYPESET>
-  static inline TYPESET* BytecodeTypes(JSScript* script, jsbytecode* pc,
-                                       uint32_t* bytecodeMap, uint32_t* hint,
-                                       TYPESET* typeArray);
-
-  /*
-   * Monitor a bytecode pushing any value. This must be called for any opcode
-   * which is JOF_TYPESET, and where either the script has not been analyzed
-   * by type inference or where the pc has type barriers. For simplicity, we
-   * always monitor JOF_TYPESET opcodes in the interpreter and stub calls,
-   * and only look at barriers when generating JIT code for the script.
-   */
-  static void MonitorBytecodeType(JSContext* cx, JSScript* script,
-                                  jsbytecode* pc, const js::Value& val);
-  static void MonitorBytecodeType(JSContext* cx, JSScript* script,
-                                  jsbytecode* pc, TypeSet::Type type);
-
-  static inline void MonitorBytecodeType(JSContext* cx, JSScript* script,
-                                         jsbytecode* pc, StackTypeSet* types,
-                                         const js::Value& val);
-
- private:
-  static void MonitorBytecodeTypeSlow(JSContext* cx, JSScript* script,
-                                      jsbytecode* pc, StackTypeSet* types,
-                                      TypeSet::Type type);
-
-  static void MonitorMagicValueBytecodeType(JSContext* cx, JSScript* script,
-                                            jsbytecode* pc,
-                                            const js::Value& rval);
-
- public:
-  /* Monitor an assignment at a SETELEM on a non-integer identifier. */
-  static inline void MonitorAssign(JSContext* cx, HandleObject obj, jsid id);
-
-  /* Add a type for a variable in a script. */
-  static inline void MonitorThisType(JSContext* cx, JSScript* script,
-                                     TypeSet::Type type);
-  static inline void MonitorThisType(JSContext* cx, JSScript* script,
-                                     const js::Value& value);
-  static inline void MonitorArgType(JSContext* cx, JSScript* script,
-                                    unsigned arg, TypeSet::Type type);
-  static inline void MonitorArgType(JSContext* cx, JSScript* script,
-                                    unsigned arg, const js::Value& value);
-
-  /*
-   * Freeze all the stack type sets in a script, for a compilation. Returns
-   * copies of the type sets which will be checked against the actual ones
-   * under FinishCompilation, to detect any type changes.
-   */
-  static bool FreezeTypeSets(CompilerConstraintList* constraints,
-                             JSScript* script, TemporaryTypeSet** pThisTypes,
-                             TemporaryTypeSet** pArgTypes,
-                             TemporaryTypeSet** pBytecodeTypes);
-
   static void Destroy(Zone* zone, JitScript* script);
 
   static constexpr Offset offsetOfICEntries() { return sizeof(JitScript); }
 
-  static constexpr size_t offsetOfJitCodeSkipArgCheck() {
-    return offsetof(JitScript, jitCodeSkipArgCheck_);
-  }
   static constexpr size_t offsetOfBaselineScript() {
     return offsetof(JitScript, baselineScript_);
   }
@@ -563,10 +354,6 @@
   void incWarmUpCount(uint32_t amount) { icScript_.warmUpCount_ += amount; }
   void resetWarmUpCount(uint32_t count);
 
-#ifdef DEBUG
-  void printTypes(JSContext* cx, HandleScript script);
-#endif
-
   void prepareForDestruction(Zone* zone) {
     // When the script contains pointers to nursery things, the store buffer can
     // contain entries that point into the fallback stub space. Since we can
@@ -590,13 +377,6 @@
 
   ICEntry& icEntry(size_t index) { return icScript_.icEntry(index); }
 
-  // Used to inform IonBuilder that a getter has been used and we must
-  // use a type barrier.
-  void noteAccessedGetter(uint32_t pcOffset);
-  // Used to inform IonBuilder that a SetElem has written to out-of-bounds
-  // indices, to determine whether we need a hole check.
-  void noteHasDenseAdd(uint32_t pcOffset);
-
   void trace(JSTracer* trc);
   void purgeOptimizedStubs(JSScript* script);
 
@@ -619,12 +399,6 @@
     return icScript_.icEntryFromPCOffset(pcOffset, prevLookedUpEntry);
   }
 
-  MOZ_MUST_USE bool addDependentWasmImport(JSContext* cx,
-                                           wasm::Instance& instance,
-                                           uint32_t idx);
-  void removeDependentWasmImport(wasm::Instance& instance, uint32_t idx);
-  void unlinkDependentWasmImports();
-
   size_t allocBytes() const { return endOffset(); }
 
   EnvironmentObject* templateEnvironment() const {
@@ -641,26 +415,6 @@
     return cachedIonData().bytecodeInfo.hasTryFinally;
   }
 
-  uint8_t maxInliningDepth() const {
-    return hasCachedIonData() ? cachedIonData().maxInliningDepth : UINT8_MAX;
-  }
-  void resetMaxInliningDepth() { cachedIonData().maxInliningDepth = UINT8_MAX; }
-
-  void setMaxInliningDepth(uint32_t depth) {
-    MOZ_ASSERT(depth <= UINT8_MAX);
-    cachedIonData().maxInliningDepth = depth;
-  }
-
-  uint16_t inlinedBytecodeLength() const {
-    return hasCachedIonData() ? cachedIonData().inlinedBytecodeLength : 0;
-  }
-  void setInlinedBytecodeLength(uint32_t len) {
-    if (len > UINT16_MAX) {
-      len = UINT16_MAX;
-    }
-    cachedIonData().inlinedBytecodeLength = len;
-  }
-
  private:
   // Methods to set baselineScript_ to a BaselineScript*, nullptr, or
   // BaselineDisabledScriptPtr.
@@ -742,7 +496,7 @@
 
 // Ensures no JitScripts are purged in the current zone.
 class MOZ_RAII AutoKeepJitScripts {
-  TypeZone& zone_;
+  jit::JitZone* zone_;
   bool prev_;
 
   AutoKeepJitScripts(const AutoKeepJitScripts&) = delete;
@@ -757,10 +511,6 @@
 // during GC.
 void MarkActiveJitScripts(Zone* zone);
 
-#if defined(JS_STRUCTURED_SPEW) || defined(JS_CACHEIR_SPEW)
-bool GetStubEnteredCount(ICStub* stub, uint32_t* count);
-#endif
-
 #ifdef JS_STRUCTURED_SPEW
 void JitSpewBaselineICStats(JSScript* script, const char* dumpReason);
 #endif
diff -Nru firefox-84.0.2+build1/js/src/jit/JitScript-inl.h firefox-85.0+build1/js/src/jit/JitScript-inl.h
--- firefox-84.0.2+build1/js/src/jit/JitScript-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitScript-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -11,91 +11,23 @@
 
 #include "mozilla/BinarySearch.h"
 
+#include "jit/JitZone.h"
 #include "vm/BytecodeUtil.h"
 #include "vm/JSScript.h"
-#include "vm/TypeInference.h"
 
 #include "vm/JSContext-inl.h"
 
 namespace js {
 namespace jit {
 
-inline StackTypeSet* JitScript::thisTypes(const AutoSweepJitScript& sweep,
-                                          JSScript* script) {
-  return typeArray(sweep) + script->numBytecodeTypeSets();
-}
-
-/*
- * Note: for non-escaping arguments, argTypes reflect only the initial type of
- * the variable (e.g. passed values for argTypes, or undefined for localTypes)
- * and not types from subsequent assignments.
- */
-
-inline StackTypeSet* JitScript::argTypes(const AutoSweepJitScript& sweep,
-                                         JSScript* script, unsigned i) {
-  MOZ_ASSERT(i < script->function()->nargs());
-  return typeArray(sweep) + script->numBytecodeTypeSets() + 1 /* this */ + i;
-}
-
-template <typename TYPESET>
-/* static */ inline TYPESET* JitScript::BytecodeTypes(JSScript* script,
-                                                      jsbytecode* pc,
-                                                      uint32_t* bytecodeMap,
-                                                      uint32_t* hint,
-                                                      TYPESET* typeArray) {
-  MOZ_ASSERT(BytecodeOpHasTypeSet(JSOp(*pc)));
-  uint32_t offset = script->pcToOffset(pc);
-
-  // See if this pc is the next typeset opcode after the last one looked up.
-  size_t numBytecodeTypeSets = script->numBytecodeTypeSets();
-  if ((*hint + 1) < numBytecodeTypeSets && bytecodeMap[*hint + 1] == offset) {
-    (*hint)++;
-    return typeArray + *hint;
-  }
-
-  // See if this pc is the same as the last one looked up.
-  if (bytecodeMap[*hint] == offset) {
-    return typeArray + *hint;
-  }
-
-  // Fall back to a binary search.  We'll either find the exact offset, or
-  // there are more JOF_TYPESET opcodes than nTypeSets in the script (as can
-  // happen if the script is very long) and we'll use the last location.
-  size_t loc;
-  bool found =
-      mozilla::BinarySearch(bytecodeMap, 0, numBytecodeTypeSets, offset, &loc);
-  if (found) {
-    MOZ_ASSERT(bytecodeMap[loc] == offset);
-  } else {
-    MOZ_ASSERT(numBytecodeTypeSets == JSScript::MaxBytecodeTypeSets);
-    loc = numBytecodeTypeSets - 1;
-  }
-
-  *hint = mozilla::AssertedCast<uint32_t>(loc);
-  return typeArray + *hint;
-}
-
-inline StackTypeSet* JitScript::bytecodeTypes(const AutoSweepJitScript& sweep,
-                                              JSScript* script,
-                                              jsbytecode* pc) {
-  MOZ_ASSERT(CurrentThreadCanAccessZone(script->zone()));
-  return BytecodeTypes(script, pc, bytecodeTypeMap(), bytecodeTypeMapHint(),
-                       typeArray(sweep));
-}
-
 inline AutoKeepJitScripts::AutoKeepJitScripts(JSContext* cx)
-    : zone_(cx->zone()->types), prev_(zone_.keepJitScripts) {
-  zone_.keepJitScripts = true;
+    : zone_(cx->zone()->jitZone()), prev_(zone_->keepJitScripts()) {
+  zone_->setKeepJitScripts(true);
 }
 
 inline AutoKeepJitScripts::~AutoKeepJitScripts() {
-  MOZ_ASSERT(zone_.keepJitScripts);
-  zone_.keepJitScripts = prev_;
-}
-
-inline bool JitScript::typesNeedsSweep(Zone* zone) const {
-  MOZ_ASSERT(!js::TlsContext.get()->inUnsafeCallWithABI);
-  return typesGeneration() != zone->types.generation;
+  MOZ_ASSERT(zone_->keepJitScripts());
+  zone_->setKeepJitScripts(prev_);
 }
 
 }  // namespace jit
diff -Nru firefox-84.0.2+build1/js/src/jit/JitZone.h firefox-85.0+build1/js/src/jit/JitZone.h
--- firefox-84.0.2+build1/js/src/jit/JitZone.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JitZone.h	2021-01-18 19:58:13.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/HashFunctions.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 
 #include <stddef.h>
@@ -19,6 +20,7 @@
 #include "gc/Barrier.h"
 #include "jit/ExecutableAllocator.h"
 #include "jit/ICStubSpace.h"
+#include "jit/Invalidation.h"
 #include "js/AllocPolicy.h"
 #include "js/GCHashTable.h"
 #include "js/HashTable.h"
@@ -98,7 +100,18 @@
   // Executable allocator for all code except wasm code.
   MainThreadData<ExecutableAllocator> execAlloc_;
 
+  // HashMap that maps scripts to compilations inlining those scripts.
+  using InlinedScriptMap =
+      GCHashMap<WeakHeapPtr<BaseScript*>, RecompileInfoVector,
+                MovableCellHasher<WeakHeapPtr<BaseScript*>>, SystemAllocPolicy>;
+  InlinedScriptMap inlinedCompilations_;
+
+  mozilla::Maybe<IonCompilationId> currentCompilationId_;
+  bool keepJitScripts_ = false;
+
  public:
+  ~JitZone() { MOZ_ASSERT(!keepJitScripts_); }
+
   void traceWeak(JSTracer* trc);
 
   void addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
@@ -140,11 +153,29 @@
 
   ExecutableAllocator& execAlloc() { return execAlloc_.ref(); }
   const ExecutableAllocator& execAlloc() const { return execAlloc_.ref(); }
-};
 
-// Called from Zone::discardJitCode().
-void InvalidateAll(JSFreeOp* fop, JS::Zone* zone);
-void FinishInvalidation(JSFreeOp* fop, JSScript* script);
+  MOZ_MUST_USE bool addInlinedCompilation(const RecompileInfo& info,
+                                          JSScript* inlined);
+
+  RecompileInfoVector* maybeInlinedCompilations(JSScript* inlined) {
+    auto p = inlinedCompilations_.lookup(inlined);
+    return p ? &p->value() : nullptr;
+  }
+
+  void removeInlinedCompilations(JSScript* inlined) {
+    inlinedCompilations_.remove(inlined);
+  }
+
+  bool keepJitScripts() const { return keepJitScripts_; }
+  void setKeepJitScripts(bool keep) { keepJitScripts_ = keep; }
+
+  mozilla::Maybe<IonCompilationId> currentCompilationId() const {
+    return currentCompilationId_;
+  }
+  mozilla::Maybe<IonCompilationId>& currentCompilationIdRef() {
+    return currentCompilationId_;
+  }
+};
 
 }  // namespace jit
 }  // namespace js
diff -Nru firefox-84.0.2+build1/js/src/jit/JSJitFrameIter.cpp firefox-85.0+build1/js/src/jit/JSJitFrameIter.cpp
--- firefox-84.0.2+build1/js/src/jit/JSJitFrameIter.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/JSJitFrameIter.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -14,6 +14,7 @@
 #include "jit/JitFrames.h"
 #include "jit/JitRuntime.h"
 #include "jit/JitScript.h"
+#include "jit/MacroAssembler.h"  // js::jit::Assembler::GetPointer
 #include "jit/SafepointIndex.h"
 #include "jit/Safepoints.h"
 #include "jit/ScriptFromCalleeToken.h"
diff -Nru firefox-84.0.2+build1/js/src/jit/KnownClass.cpp firefox-85.0+build1/js/src/jit/KnownClass.cpp
--- firefox-84.0.2+build1/js/src/jit/KnownClass.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/KnownClass.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -21,7 +21,7 @@
 
   switch (def->op()) {
     case MDefinition::Opcode::NewArray:
-    case MDefinition::Opcode::NewArrayCopyOnWrite:
+    case MDefinition::Opcode::NewArrayDynamicLength:
       return KnownClass::Array;
 
     case MDefinition::Opcode::NewObject:
diff -Nru firefox-84.0.2+build1/js/src/jit/LICM.cpp firefox-85.0+build1/js/src/jit/LICM.cpp
--- firefox-84.0.2+build1/js/src/jit/LICM.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/LICM.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -150,6 +150,7 @@
 #endif
 
     opIns->block()->moveBefore(hoistPoint, opIns);
+    opIns->setBailoutKind(BailoutKind::LICM);
   }
 }
 
@@ -190,6 +191,7 @@
 
     // Move the instruction to the hoistPoint.
     block->moveBefore(hoistPoint, ins);
+    ins->setBailoutKind(BailoutKind::LICM);
   }
 }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/Linker.cpp firefox-85.0+build1/js/src/jit/Linker.cpp
--- firefox-84.0.2+build1/js/src/jit/Linker.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Linker.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -21,8 +21,6 @@
     return fail(cx);
   }
 
-  masm.performPendingReadBarriers();
-
   static const size_t ExecutableAllocatorAlignment = sizeof(void*);
   static_assert(CodeAlignment >= ExecutableAllocatorAlignment,
                 "Unexpected alignment requirements");
diff -Nru firefox-84.0.2+build1/js/src/jit/LIR.cpp firefox-85.0+build1/js/src/jit/LIR.cpp
--- firefox-84.0.2+build1/js/src/jit/LIR.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/LIR.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -29,7 +29,6 @@
       numInstructions_(1),  // First id is 1.
       localSlotCount_(0),
       argumentSlotCount_(0),
-      entrySnapshot_(nullptr),
       mir_(*mir) {}
 
 bool LIRGraph::addConstantToPool(const Value& v, uint32_t* index) {
diff -Nru firefox-84.0.2+build1/js/src/jit/LIR.h firefox-85.0+build1/js/src/jit/LIR.h
--- firefox-84.0.2+build1/js/src/jit/LIR.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/LIR.h	2021-01-18 19:58:13.000000000 +0000
@@ -1826,7 +1826,7 @@
   // constantPool_ is a mozilla::Vector, not a js::Vector, because
   // js::Vector<Value> is prohibited as unsafe. This particular Vector of
   // Values is safe because it is only used within the scope of an
-  // AutoEnterAnalysis (in IonCompile), which inhibits GC.
+  // AutoSuppressGC (in IonCompile), which inhibits GC.
   mozilla::Vector<Value, 0, JitAllocPolicy> constantPool_;
   typedef HashMap<Value, uint32_t, ValueHasher, JitAllocPolicy> ConstantPoolMap;
   ConstantPoolMap constantPoolMap_;
@@ -1840,9 +1840,6 @@
   // Number of stack slots needed for argument construction for calls.
   uint32_t argumentSlotCount_;
 
-  // Snapshot taken before any LIR has been lowered.
-  LSnapshot* entrySnapshot_;
-
   MIRGraph& mir_;
 
  public:
@@ -1898,14 +1895,7 @@
   MOZ_MUST_USE bool addConstantToPool(const Value& v, uint32_t* index);
   size_t numConstants() const { return constantPool_.length(); }
   Value* constantPool() { return &constantPool_[0]; }
-  void setEntrySnapshot(LSnapshot* snapshot) {
-    MOZ_ASSERT(!entrySnapshot_);
-    entrySnapshot_ = snapshot;
-  }
-  LSnapshot* entrySnapshot() const {
-    MOZ_ASSERT(entrySnapshot_);
-    return entrySnapshot_;
-  }
+
   bool noteNeedsSafepoint(LInstruction* ins);
   size_t numNonCallSafepoints() const { return nonCallSafepoints_.length(); }
   LInstruction* getNonCallSafepoint(size_t i) const {
diff -Nru firefox-84.0.2+build1/js/src/jit/Lowering.cpp firefox-85.0+build1/js/src/jit/Lowering.cpp
--- firefox-84.0.2+build1/js/src/jit/Lowering.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Lowering.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -13,10 +13,12 @@
 
 #include <type_traits>
 
+#include "jit/IonOptimizationLevels.h"
 #include "jit/JitSpewer.h"
 #include "jit/LIR.h"
 #include "jit/MIR.h"
 #include "jit/MIRGraph.h"
+#include "jit/SharedICRegisters.h"
 #include "js/experimental/JitInfo.h"  // JSJitInfo
 #include "util/Memory.h"
 #include "wasm/WasmTypes.h"
@@ -128,42 +130,12 @@
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitDefVar(MDefVar* ins) {
-  LDefVar* lir =
-      new (alloc()) LDefVar(useRegisterAtStart(ins->environmentChain()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
-void LIRGenerator::visitDefLexical(MDefLexical* ins) {
-  LDefLexical* lir =
-      new (alloc()) LDefLexical(useRegisterAtStart(ins->environmentChain()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
-void LIRGenerator::visitDefFun(MDefFun* ins) {
-  MDefinition* fun = ins->fun();
-  MOZ_ASSERT(fun->type() == MIRType::Object);
-
-  LDefFun* lir = new (alloc()) LDefFun(
-      useRegisterAtStart(fun), useRegisterAtStart(ins->environmentChain()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
 void LIRGenerator::visitNewArray(MNewArray* ins) {
   LNewArray* lir = new (alloc()) LNewArray(temp());
   define(lir, ins);
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitNewArrayCopyOnWrite(MNewArrayCopyOnWrite* ins) {
-  LNewArrayCopyOnWrite* lir = new (alloc()) LNewArrayCopyOnWrite(temp());
-  define(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
 void LIRGenerator::visitNewArrayDynamicLength(MNewArrayDynamicLength* ins) {
   MDefinition* length = ins->length();
   MOZ_ASSERT(length->type() == MIRType::Int32);
@@ -249,14 +221,6 @@
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitInitElem(MInitElem* ins) {
-  LInitElem* lir = new (alloc())
-      LInitElem(useRegisterAtStart(ins->getObject()),
-                useBoxAtStart(ins->getId()), useBoxAtStart(ins->getValue()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
 void LIRGenerator::visitInitElemGetterSetter(MInitElemGetterSetter* ins) {
   LInitElemGetterSetter* lir = new (alloc()) LInitElemGetterSetter(
       useRegisterAtStart(ins->object()), useBoxAtStart(ins->idValue()),
@@ -334,7 +298,7 @@
 
   auto* lir = new (alloc())
       LLoadArgumentsObjectArg(useRegister(argsObj), useRegister(index), temp());
-  assignSnapshot(lir, BailoutKind::ArgumentsObjectAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   defineBox(lir, ins);
 }
 
@@ -343,7 +307,7 @@
   MOZ_ASSERT(argsObj->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LArgumentsObjectLength(useRegister(argsObj));
-  assignSnapshot(lir, BailoutKind::ArgumentsObjectAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -354,7 +318,7 @@
 
   auto* lir = new (alloc())
       LGuardArgumentsObjectNotOverriddenIterator(useRegister(argsObj), temp());
-  assignSnapshot(lir, BailoutKind::ArgumentsObjectAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, argsObj);
 }
@@ -500,7 +464,7 @@
       tempFixed(CallTempReg2));  // stack counter register
 
   // Bailout is needed in the case of too many values in the arguments array.
-  assignSnapshot(lir, BailoutKind::TooManyArguments);
+  assignSnapshot(lir, apply->bailoutKind());
 
   defineReturn(lir, apply);
   assignSafepoint(lir, apply);
@@ -522,7 +486,7 @@
 
   // Bailout is needed in the case of too many values in the array, or empty
   // space at the end of the array.
-  assignSnapshot(lir, BailoutKind::TooManyArguments);
+  assignSnapshot(lir, apply->bailoutKind());
 
   defineReturn(lir, apply);
   assignSafepoint(lir, apply);
@@ -547,7 +511,7 @@
 
   // Bailout is needed in the case of too many values in the array, or empty
   // space at the end of the array.
-  assignSnapshot(lir, BailoutKind::TooManyArguments);
+  assignSnapshot(lir, mir->bailoutKind());
 
   defineReturn(lir, mir);
   assignSafepoint(lir, mir);
@@ -566,7 +530,7 @@
 
 void LIRGenerator::visitEncodeSnapshot(MEncodeSnapshot* mir) {
   LEncodeSnapshot* lir = new (alloc()) LEncodeSnapshot();
-  assignSnapshot(lir, BailoutKind::Inevitable);
+  assignSnapshot(lir, mir->bailoutKind());
   add(lir, mir);
 }
 
@@ -607,7 +571,7 @@
                       tempFixed(CallTempReg0), tempFixed(CallTempReg1),
                       tempFixed(CallTempReg2));
 
-  assignSnapshot(lir, BailoutKind::DynamicNameNotFound);
+  assignSnapshot(lir, ins->bailoutKind());
   defineReturn(lir, ins);
 }
 
@@ -955,18 +919,6 @@
   }
 }
 
-void LIRGenerator::visitFunctionDispatch(MFunctionDispatch* ins) {
-  LFunctionDispatch* lir =
-      new (alloc()) LFunctionDispatch(useRegister(ins->input()));
-  add(lir, ins);
-}
-
-void LIRGenerator::visitObjectGroupDispatch(MObjectGroupDispatch* ins) {
-  LObjectGroupDispatch* lir =
-      new (alloc()) LObjectGroupDispatch(useRegister(ins->input()), temp());
-  add(lir, ins);
-}
-
 static inline bool CanEmitCompareAtUses(MInstruction* ins) {
   if (!ins->canEmitAtUses()) {
     return false;
@@ -1301,7 +1253,7 @@
     LShiftI* lir = new (alloc()) LShiftI(op);
     if (op == JSOp::Ursh) {
       if (ins->toUrsh()->fallible()) {
-        assignSnapshot(lir, BailoutKind::OverflowInvalidate);
+        assignSnapshot(lir, ins->bailoutKind());
       }
     }
     lowerForShift(lir, ins, lhs, rhs);
@@ -1364,7 +1316,7 @@
     lir = new (alloc()) LFloorF(useRegister(ins->input()));
   }
 
-  assignSnapshot(lir, BailoutKind::Round);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -1379,7 +1331,7 @@
     lir = new (alloc()) LCeilF(useRegister(ins->input()));
   }
 
-  assignSnapshot(lir, BailoutKind::Round);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -1394,7 +1346,7 @@
     lir = new (alloc()) LRoundF(useRegister(ins->input()), tempFloat32());
   }
 
-  assignSnapshot(lir, BailoutKind::Round);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -1409,7 +1361,7 @@
     lir = new (alloc()) LTruncF(useRegister(ins->input()));
   }
 
-  assignSnapshot(lir, BailoutKind::Round);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -1465,7 +1417,7 @@
       lir = new (alloc()) LAbsI(useRegisterAtStart(num));
       // needed to handle abs(INT32_MIN)
       if (ins->fallible()) {
-        assignSnapshot(lir, BailoutKind::Overflow);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       break;
     case MIRType::Float32:
@@ -1603,7 +1555,7 @@
 
     auto* lir = new (alloc())
         LPowII(useRegister(input), useRegister(power), temp(), temp());
-    assignSnapshot(lir, BailoutKind::PrecisionLoss);
+    assignSnapshot(lir, ins->bailoutKind());
     define(lir, ins);
     return;
   }
@@ -1641,7 +1593,7 @@
     MOZ_ASSERT(ins->input()->type() == MIRType::Double);
 
     auto* lir = new (alloc()) LSignDI(useRegister(ins->input()), tempDouble());
-    assignSnapshot(lir, BailoutKind::PrecisionLoss);
+    assignSnapshot(lir, ins->bailoutKind());
     define(lir, ins);
   }
 }
@@ -1711,7 +1663,7 @@
     LAddI* lir = new (alloc()) LAddI;
 
     if (ins->fallible()) {
-      assignSnapshot(lir, BailoutKind::OverflowInvalidate);
+      assignSnapshot(lir, ins->bailoutKind());
     }
 
     lowerForALU(lir, ins, lhs, rhs);
@@ -1756,7 +1708,7 @@
 
     LSubI* lir = new (alloc()) LSubI;
     if (ins->fallible()) {
-      assignSnapshot(lir, BailoutKind::Overflow);
+      assignSnapshot(lir, ins->bailoutKind());
     }
 
     lowerForALU(lir, ins, lhs, rhs);
@@ -2000,7 +1952,7 @@
 
   LFromCodePoint* lir =
       new (alloc()) LFromCodePoint(useRegister(codePoint), temp(), temp());
-  assignSnapshot(lir, BailoutKind::InvalidCodePoint);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
   assignSafepoint(lir, ins);
 }
@@ -2014,17 +1966,7 @@
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitStart(MStart* start) {
-  LStart* lir = new (alloc()) LStart;
-
-  // Create a snapshot that captures the initial state of the function.
-  assignSnapshot(lir, BailoutKind::ArgumentCheck);
-  if (start->block()->graph().entryBlock() == start->block()) {
-    lirGraph_.setEntrySnapshot(lir->snapshot());
-  }
-
-  add(lir);
-}
+void LIRGenerator::visitStart(MStart* start) {}
 
 void LIRGenerator::visitNop(MNop* nop) {}
 
@@ -2068,7 +2010,7 @@
   switch (opd->type()) {
     case MIRType::Value: {
       LValueToDouble* lir = new (alloc()) LValueToDouble(useBox(opd));
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
@@ -2121,7 +2063,7 @@
   switch (opd->type()) {
     case MIRType::Value: {
       LValueToFloat32* lir = new (alloc()) LValueToFloat32(useBox(opd));
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
@@ -2173,9 +2115,12 @@
     case MIRType::Value: {
       auto* lir = new (alloc()) LValueToInt32(useBox(opd), tempDouble(), temp(),
                                               LValueToInt32::NORMAL);
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
-      assignSafepoint(lir, convert);
+      if (lir->mode() == LValueToInt32::TRUNCATE ||
+          lir->mode() == LValueToInt32::TRUNCATE_NOWRAP) {
+        assignSafepoint(lir, convert);
+      }
       break;
     }
 
@@ -2197,14 +2142,14 @@
 
     case MIRType::Float32: {
       LFloat32ToInt32* lir = new (alloc()) LFloat32ToInt32(useRegister(opd));
-      assignSnapshot(lir, BailoutKind::PrecisionLoss);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
 
     case MIRType::Double: {
       LDoubleToInt32* lir = new (alloc()) LDoubleToInt32(useRegister(opd));
-      assignSnapshot(lir, BailoutKind::PrecisionLoss);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
@@ -2230,7 +2175,7 @@
     case MIRType::Value: {
       auto* lir = new (alloc()) LValueToInt32(useBox(opd), tempDouble(), temp(),
                                               LValueToInt32::TRUNCATE_NOWRAP);
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       assignSafepoint(lir, convert);
       break;
@@ -2248,14 +2193,14 @@
 
     case MIRType::Float32: {
       auto* lir = new (alloc()) LFloat32ToIntegerInt32(useRegister(opd));
-      assignSnapshot(lir, BailoutKind::Overflow);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
 
     case MIRType::Double: {
       auto* lir = new (alloc()) LDoubleToIntegerInt32(useRegister(opd));
-      assignSnapshot(lir, BailoutKind::Overflow);
+      assignSnapshot(lir, convert->bailoutKind());
       define(lir, convert);
       break;
     }
@@ -2280,7 +2225,7 @@
     case MIRType::Value: {
       LValueToInt32* lir = new (alloc()) LValueToInt32(
           useBox(opd), tempDouble(), temp(), LValueToInt32::TRUNCATE);
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, truncate->bailoutKind());
       define(lir, truncate);
       assignSafepoint(lir, truncate);
       break;
@@ -2321,7 +2266,7 @@
   switch (opd->type()) {
     case MIRType::Value: {
       auto* lir = new (alloc()) LValueToBigInt(useBox(opd));
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, ins->bailoutKind());
       define(lir, ins);
       assignSafepoint(lir, ins);
       break;
@@ -2342,7 +2287,7 @@
   switch (opd->type()) {
     case MIRType::Value: {
       auto* lir = new (alloc()) LValueToInt64(useBox(opd), temp());
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, ins->bailoutKind());
       defineInt64(lir, ins);
       assignSafepoint(lir, ins);
       break;
@@ -2478,7 +2423,7 @@
       LValueToString* lir =
           new (alloc()) LValueToString(useBox(opd), tempToUnbox());
       if (ins->needsSnapshot()) {
-        assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       define(lir, ins);
       assignSafepoint(lir, ins);
@@ -2653,12 +2598,9 @@
 }
 
 void LIRGenerator::visitLambda(MLambda* ins) {
-  if (ins->info().singletonType || ins->info().useSingletonForClone) {
+  if (ins->info().singletonType) {
     // If the function has a singleton type, this instruction will only be
     // executed once so we don't bother inlining it.
-    //
-    // If UseSingletonForClone is true, we will assign a singleton type to
-    // the clone and we have to clone the script, we can't do that inline.
     LLambdaForSingleton* lir = new (alloc())
         LLambdaForSingleton(useRegisterAtStart(ins->environmentChain()));
     defineReturn(lir, ins);
@@ -2749,32 +2691,6 @@
          ins);
 }
 
-void LIRGenerator::visitConvertElementsToDoubles(
-    MConvertElementsToDoubles* ins) {
-  LInstruction* check =
-      new (alloc()) LConvertElementsToDoubles(useRegister(ins->elements()));
-  add(check, ins);
-  assignSafepoint(check, ins);
-}
-
-void LIRGenerator::visitMaybeToDoubleElement(MMaybeToDoubleElement* ins) {
-  MOZ_ASSERT(ins->elements()->type() == MIRType::Elements);
-  MOZ_ASSERT(ins->value()->type() == MIRType::Int32);
-
-  LMaybeToDoubleElement* lir = new (alloc())
-      LMaybeToDoubleElement(useRegisterAtStart(ins->elements()),
-                            useRegisterAtStart(ins->value()), tempDouble());
-  defineBox(lir, ins);
-}
-
-void LIRGenerator::visitMaybeCopyElementsForWrite(
-    MMaybeCopyElementsForWrite* ins) {
-  LInstruction* check = new (alloc())
-      LMaybeCopyElementsForWrite(useRegister(ins->object()), temp());
-  add(check, ins);
-  assignSafepoint(check, ins);
-}
-
 void LIRGenerator::visitLoadDynamicSlot(MLoadDynamicSlot* ins) {
   switch (ins->type()) {
     case MIRType::Value:
@@ -2875,84 +2791,6 @@
   }
 }
 
-void LIRGenerator::visitFilterTypeSet(MFilterTypeSet* ins) {
-  redefine(ins, ins->input());
-}
-
-void LIRGenerator::visitTypeBarrier(MTypeBarrier* ins) {
-  // Requesting a non-GC pointer is safe here since we never re-enter C++
-  // from inside a type barrier test.
-
-  const TemporaryTypeSet* types = ins->resultTypeSet();
-
-  MIRType inputType = ins->getOperand(0)->type();
-  MOZ_ASSERT(inputType == ins->type());
-
-  // Handle typebarrier that will always bail.
-  // (Emit LBail for visibility).
-  if (ins->alwaysBails()) {
-    LBail* bail = new (alloc()) LBail();
-    assignSnapshot(bail, BailoutKind::Inevitable);
-    add(bail, ins);
-    redefine(ins, ins->input());
-    return;
-  }
-
-  bool hasSpecificObjects =
-      !types->unknownObject() && types->getObjectCount() > 0;
-
-  // Handle typebarrier with Value as input.
-  if (inputType == MIRType::Value) {
-    LDefinition objTemp =
-        hasSpecificObjects ? temp() : LDefinition::BogusTemp();
-    if (ins->canRedefineInput()) {
-      LTypeBarrierV* barrier = new (alloc())
-          LTypeBarrierV(useBox(ins->input()), tempToUnbox(), objTemp);
-      assignSnapshot(barrier, BailoutKind::TypeBarrierV);
-      add(barrier, ins);
-      redefine(ins, ins->input());
-    } else {
-      LTypeBarrierV* barrier = new (alloc())
-          LTypeBarrierV(useBoxAtStart(ins->input()), tempToUnbox(), objTemp);
-      assignSnapshot(barrier, BailoutKind::TypeBarrierV);
-      defineBoxReuseInput(barrier, ins, 0);
-    }
-    return;
-  }
-
-  // The payload needs to be tested if it either might be null or might have
-  // an object that should be excluded from the barrier.
-  bool needsObjectBarrier = false;
-  if (inputType == MIRType::ObjectOrNull) {
-    needsObjectBarrier = true;
-  }
-  if (inputType == MIRType::Object &&
-      !types->hasType(TypeSet::AnyObjectType()) &&
-      ins->barrierKind() != BarrierKind::TypeTagOnly) {
-    needsObjectBarrier = true;
-  }
-
-  if (needsObjectBarrier) {
-    LDefinition tmp = hasSpecificObjects ? temp() : LDefinition::BogusTemp();
-    if (ins->canRedefineInput()) {
-      LTypeBarrierO* barrier =
-          new (alloc()) LTypeBarrierO(useRegister(ins->input()), tmp);
-      assignSnapshot(barrier, BailoutKind::TypeBarrierO);
-      add(barrier, ins);
-      redefine(ins, ins->getOperand(0));
-    } else {
-      LTypeBarrierO* barrier =
-          new (alloc()) LTypeBarrierO(useRegisterAtStart(ins->input()), tmp);
-      assignSnapshot(barrier, BailoutKind::TypeBarrierO);
-      defineReuseInput(barrier, ins, 0);
-    }
-    return;
-  }
-
-  // Handle remaining cases: No-op, unbox did everything.
-  redefine(ins, ins->getOperand(0));
-}
-
 // Returns true iff |def| is a constant that's either not a GC thing or is not
 // allocated in the nursery.
 static bool IsNonNurseryConstant(MDefinition* def) {
@@ -3094,7 +2932,7 @@
   MOZ_ASSERT(ins->elements()->type() == MIRType::Elements);
   auto* lir = new (alloc()) LArrayLength(useRegisterAtStart(ins->elements()));
   if (JitOptions.warpBuilder) {
-    assignSnapshot(lir, BailoutKind::NonInt32ArrayLength);
+    assignSnapshot(lir, ins->bailoutKind());
   }
   define(lir, ins);
 }
@@ -3113,7 +2951,7 @@
   MOZ_ASSERT(ins->function()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LFunctionLength(useRegister(ins->function()));
-  assignSnapshot(lir, BailoutKind::FunctionLength);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -3121,7 +2959,7 @@
   MOZ_ASSERT(ins->function()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LFunctionName(useRegister(ins->function()));
-  assignSnapshot(lir, BailoutKind::FunctionName);
+  assignSnapshot(lir, ins->bailoutKind());
   define(lir, ins);
 }
 
@@ -3132,7 +2970,6 @@
                                                     useRegister(ins->result()),
                                                     temp(), temp(), temp());
   define(lir, ins);
-  assignSafepoint(lir, ins);
 }
 
 void LIRGenerator::visitArrayBufferByteLengthInt32(
@@ -3284,7 +3121,7 @@
     check = new (alloc()) LBoundsCheck(useRegisterOrConstant(ins->index()),
                                        useAnyOrConstant(ins->length()));
   }
-  assignSnapshot(check, BailoutKind::BoundsCheck);
+  assignSnapshot(check, ins->bailoutKind());
   add(check, ins);
 }
 
@@ -3307,7 +3144,7 @@
 
   LInstruction* check =
       new (alloc()) LBoundsCheckLower(useRegister(ins->index()));
-  assignSnapshot(check, BailoutKind::BoundsCheck);
+  assignSnapshot(check, ins->bailoutKind());
   add(check, ins);
 }
 
@@ -3318,16 +3155,13 @@
   MOZ_ASSERT(ins->object()->type() == MIRType::Object);
   MOZ_ASSERT(ins->type() == MIRType::Boolean);
 
-  LAllocation object;
+  auto* lir = new (alloc()) LInArray(useRegister(ins->elements()),
+                                     useRegisterOrConstant(ins->index()),
+                                     useRegister(ins->initLength()));
   if (ins->needsNegativeIntCheck()) {
-    object = useRegister(ins->object());
+    assignSnapshot(lir, ins->bailoutKind());
   }
-
-  LInArray* lir = new (alloc()) LInArray(
-      useRegister(ins->elements()), useRegisterOrConstant(ins->index()),
-      useRegister(ins->initLength()), object);
   define(lir, ins);
-  assignSafepoint(lir, ins);
 }
 
 void LIRGenerator::visitGuardElementNotHole(MGuardElementNotHole* ins) {
@@ -3337,7 +3171,7 @@
   auto* guard = new (alloc())
       LGuardElementNotHole(useRegisterAtStart(ins->elements()),
                            useRegisterOrConstantAtStart(ins->index()));
-  assignSnapshot(guard, BailoutKind::Hole);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
 }
 
@@ -3350,7 +3184,7 @@
       LLoadElementV* lir = new (alloc()) LLoadElementV(
           useRegister(ins->elements()), useRegisterOrConstant(ins->index()));
       if (ins->fallible()) {
-        assignSnapshot(lir, BailoutKind::Hole);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       defineBox(lir, ins);
       break;
@@ -3363,7 +3197,7 @@
       LLoadElementT* lir = new (alloc()) LLoadElementT(
           useRegister(ins->elements()), useRegisterOrConstant(ins->index()));
       if (ins->fallible()) {
-        assignSnapshot(lir, BailoutKind::Hole);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       define(lir, ins);
       break;
@@ -3381,7 +3215,7 @@
       LLoadElementHole(useRegister(ins->elements()), useRegister(ins->index()),
                        useRegister(ins->initLength()));
   if (ins->needsNegativeIntCheck()) {
-    assignSnapshot(lir, BailoutKind::NegativeIndex);
+    assignSnapshot(lir, ins->bailoutKind());
   }
   defineBox(lir, ins);
 }
@@ -3471,7 +3305,7 @@
       LInstruction* lir =
           new (alloc()) LStoreElementV(elements, index, useBox(ins->value()));
       if (ins->fallible()) {
-        assignSnapshot(lir, BailoutKind::Hole);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       add(lir, ins);
       break;
@@ -3481,7 +3315,7 @@
       const LAllocation value = useRegisterOrNonDoubleConstant(ins->value());
       LInstruction* lir = new (alloc()) LStoreElementT(elements, index, value);
       if (ins->fallible()) {
-        assignSnapshot(lir, BailoutKind::Hole);
+        assignSnapshot(lir, ins->bailoutKind());
       }
       add(lir, ins);
       break;
@@ -3573,32 +3407,15 @@
 }
 
 void LIRGenerator::visitArrayPopShift(MArrayPopShift* ins) {
-  LUse object = useRegister(ins->object());
+  MOZ_ASSERT(ins->type() == MIRType::Value);
 
-  switch (ins->type()) {
-    case MIRType::Value: {
-      LArrayPopShiftV* lir =
-          new (alloc()) LArrayPopShiftV(object, temp(), temp());
-      if (JitOptions.warpBuilder) {
-        assignSnapshot(lir, BailoutKind::ArrayPopShift);
-      }
-      defineBox(lir, ins);
-      if (!JitOptions.warpBuilder || ins->mode() == MArrayPopShift::Shift) {
-        assignSafepoint(lir, ins);
-      }
-      break;
-    }
-    case MIRType::Undefined:
-    case MIRType::Null:
-      MOZ_CRASH("typed load must have a payload");
+  auto* lir =
+      new (alloc()) LArrayPopShift(useRegister(ins->object()), temp(), temp());
+  assignSnapshot(lir, ins->bailoutKind());
+  defineBox(lir, ins);
 
-    default: {
-      LArrayPopShiftT* lir =
-          new (alloc()) LArrayPopShiftT(object, temp(), temp());
-      define(lir, ins);
-      assignSafepoint(lir, ins);
-      break;
-    }
+  if (ins->mode() == MArrayPopShift::Shift) {
+    assignSafepoint(lir, ins);
   }
 }
 
@@ -3614,11 +3431,8 @@
     case MIRType::Value: {
       LArrayPushV* lir = new (alloc())
           LArrayPushV(object, useBox(ins->value()), temp(), spectreTemp);
-      // With Warp (and without TI) we will bailout before pushing
-      // if the length would overflow INT32_MAX.
-      if (!IsTypeInferenceEnabled()) {
-        assignSnapshot(lir, BailoutKind::Overflow);
-      }
+      // We will bailout before pushing if the length would overflow INT32_MAX.
+      assignSnapshot(lir, ins->bailoutKind());
       define(lir, ins);
       assignSafepoint(lir, ins);
       break;
@@ -3628,9 +3442,7 @@
       const LAllocation value = useRegisterOrNonDoubleConstant(ins->value());
       LArrayPushT* lir =
           new (alloc()) LArrayPushT(object, value, temp(), spectreTemp);
-      if (!IsTypeInferenceEnabled()) {
-        assignSnapshot(lir, BailoutKind::Overflow);
-      }
+      assignSnapshot(lir, ins->bailoutKind());
       define(lir, ins);
       assignSafepoint(lir, ins);
       break;
@@ -3649,7 +3461,7 @@
       useRegisterAtStart(ins->end()), tempFixed(CallTempReg0),
       tempFixed(CallTempReg1));
   if (JitOptions.warpBuilder) {
-    assignSnapshot(lir, BailoutKind::ArraySlice);
+    assignSnapshot(lir, ins->bailoutKind());
   }
   defineReturn(lir, ins);
   assignSafepoint(lir, ins);
@@ -3708,7 +3520,7 @@
 
     auto* lir = new (alloc()) LLoadUnboxedScalar(elements, index, tempDef);
     if (ins->fallible()) {
-      assignSnapshot(lir, BailoutKind::Overflow);
+      assignSnapshot(lir, ins->bailoutKind());
     }
     define(lir, ins);
   } else {
@@ -3768,7 +3580,7 @@
   auto* lir = new (alloc())
       LLoadDataViewElement(elements, index, littleEndian, tempDef, temp64Def);
   if (ins->fallible()) {
-    assignSnapshot(lir, BailoutKind::Overflow);
+    assignSnapshot(lir, ins->bailoutKind());
   }
   define(lir, ins);
   if (Scalar::isBigIntType(ins->storageType())) {
@@ -3800,7 +3612,7 @@
     case MIRType::Value: {
       LClampVToUint8* lir =
           new (alloc()) LClampVToUint8(useBox(in), tempDouble());
-      assignSnapshot(lir, BailoutKind::NonPrimitiveInput);
+      assignSnapshot(lir, ins->bailoutKind());
       define(lir, ins);
       assignSafepoint(lir, ins);
       break;
@@ -3824,7 +3636,7 @@
   if (!Scalar::isBigIntType(ins->arrayType())) {
     auto* lir = new (alloc()) LLoadTypedArrayElementHole(object, index, temp());
     if (ins->fallible()) {
-      assignSnapshot(lir, BailoutKind::Overflow);
+      assignSnapshot(lir, ins->bailoutKind());
     }
     defineBox(lir, ins);
   } else {
@@ -4046,7 +3858,7 @@
   auto* lir = new (alloc()) LAllocateAndStoreSlot(
       useRegisterAtStart(ins->object()), useBoxAtStart(ins->value()),
       tempFixed(CallTempReg0), tempFixed(CallTempReg1));
-  assignSnapshot(lir, BailoutKind::DuringVMCall);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
 }
 
@@ -4094,8 +3906,8 @@
       id->type() == MIRType::String || id->type() == MIRType::Symbol;
 
   auto* lir = new (alloc())
-      LGetPropSuperCacheV(useRegister(obj), useBoxOrTyped(receiver),
-                          useBoxOrTypedOrConstant(id, useConstId));
+      LGetPropSuperCache(useRegister(obj), useBoxOrTyped(receiver),
+                         useBoxOrTypedOrConstant(id, useConstId));
   defineBox(lir, ins);
   assignSafepoint(lir, ins);
 }
@@ -4109,37 +3921,19 @@
   MOZ_ASSERT(id->type() == MIRType::String || id->type() == MIRType::Symbol ||
              id->type() == MIRType::Int32 || id->type() == MIRType::Value);
 
-  if (ins->monitoredResult()) {
-    // Emit an overrecursed check: this is necessary because the cache can
-    // attach a scripted getter stub that calls this script recursively.
-    gen->setNeedsOverrecursedCheck();
-  }
+  // Emit an overrecursed check: this is necessary because the cache can
+  // attach a scripted getter stub that calls this script recursively.
+  gen->setNeedsOverrecursedCheck();
 
   // If this is a GetProp, the id is a constant string. Allow passing it as a
   // constant to reduce register allocation pressure.
   bool useConstId =
       id->type() == MIRType::String || id->type() == MIRType::Symbol;
 
-  // We need a temp register if we can't use the output register as scratch.
-  // See IonIC::scratchRegisterForEntryJump.
-  LDefinition maybeTemp = LDefinition::BogusTemp();
-  if (ins->type() == MIRType::Double) {
-    maybeTemp = temp();
-  }
-
-  if (ins->type() == MIRType::Value) {
-    LGetPropertyCacheV* lir = new (alloc())
-        LGetPropertyCacheV(useBoxOrTyped(value),
-                           useBoxOrTypedOrConstant(id, useConstId), maybeTemp);
-    defineBox(lir, ins);
-    assignSafepoint(lir, ins);
-  } else {
-    LGetPropertyCacheT* lir = new (alloc())
-        LGetPropertyCacheT(useBoxOrTyped(value),
-                           useBoxOrTypedOrConstant(id, useConstId), maybeTemp);
-    define(lir, ins);
-    assignSafepoint(lir, ins);
-  }
+  auto* lir = new (alloc()) LGetPropertyCache(
+      useBoxOrTyped(value), useBoxOrTypedOrConstant(id, useConstId));
+  defineBox(lir, ins);
+  assignSafepoint(lir, ins);
 }
 
 void LIRGenerator::visitGetPropertyPolymorphic(MGetPropertyPolymorphic* ins) {
@@ -4148,12 +3942,12 @@
   if (ins->type() == MIRType::Value) {
     LGetPropertyPolymorphicV* lir = new (alloc())
         LGetPropertyPolymorphicV(useRegister(ins->object()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     defineBox(lir, ins);
   } else {
     LGetPropertyPolymorphicT* lir = new (alloc())
         LGetPropertyPolymorphicT(useRegister(ins->object()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     define(lir, ins);
   }
 }
@@ -4164,13 +3958,13 @@
   if (ins->value()->type() == MIRType::Value) {
     LSetPropertyPolymorphicV* lir = new (alloc()) LSetPropertyPolymorphicV(
         useRegister(ins->object()), useBox(ins->value()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     add(lir, ins);
   } else {
     LAllocation value = useRegisterOrConstant(ins->value());
     LSetPropertyPolymorphicT* lir = new (alloc()) LSetPropertyPolymorphicT(
         useRegister(ins->object()), value, ins->value()->type(), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     add(lir, ins);
   }
 }
@@ -4197,7 +3991,7 @@
 void LIRGenerator::visitGuardObjectIdentity(MGuardObjectIdentity* ins) {
   LGuardObjectIdentity* guard = new (alloc()) LGuardObjectIdentity(
       useRegister(ins->object()), useRegister(ins->expected()));
-  assignSnapshot(guard, BailoutKind::ObjectIdentityOrTypeGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, ins->object());
 }
@@ -4205,7 +3999,7 @@
 void LIRGenerator::visitGuardSpecificFunction(MGuardSpecificFunction* ins) {
   auto* guard = new (alloc()) LGuardSpecificFunction(
       useRegister(ins->function()), useRegister(ins->expected()));
-  assignSnapshot(guard, BailoutKind::ObjectIdentityOrTypeGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, ins->function());
 }
@@ -4213,7 +4007,7 @@
 void LIRGenerator::visitGuardSpecificAtom(MGuardSpecificAtom* ins) {
   auto* guard =
       new (alloc()) LGuardSpecificAtom(useRegister(ins->str()), temp());
-  assignSnapshot(guard, BailoutKind::SpecificAtomGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, ins->str());
   assignSafepoint(guard, ins);
@@ -4221,7 +4015,7 @@
 
 void LIRGenerator::visitGuardSpecificSymbol(MGuardSpecificSymbol* ins) {
   auto* guard = new (alloc()) LGuardSpecificSymbol(useRegister(ins->symbol()));
-  assignSnapshot(guard, BailoutKind::SpecificSymbolGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, ins->symbol());
 }
@@ -4229,7 +4023,7 @@
 void LIRGenerator::visitGuardStringToIndex(MGuardStringToIndex* ins) {
   MOZ_ASSERT(ins->string()->type() == MIRType::String);
   auto* guard = new (alloc()) LGuardStringToIndex(useRegister(ins->string()));
-  assignSnapshot(guard, BailoutKind::StringToIndexGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   define(guard, ins);
   assignSafepoint(guard, ins);
 }
@@ -4238,7 +4032,7 @@
   MOZ_ASSERT(ins->string()->type() == MIRType::String);
   auto* guard =
       new (alloc()) LGuardStringToInt32(useRegister(ins->string()), temp());
-  assignSnapshot(guard, BailoutKind::StringToInt32Guard);
+  assignSnapshot(guard, ins->bailoutKind());
   define(guard, ins);
   assignSafepoint(guard, ins);
 }
@@ -4247,7 +4041,7 @@
   MOZ_ASSERT(ins->string()->type() == MIRType::String);
   auto* guard = new (alloc())
       LGuardStringToDouble(useRegister(ins->string()), temp(), temp());
-  assignSnapshot(guard, BailoutKind::StringToDoubleGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   define(guard, ins);
   assignSafepoint(guard, ins);
 }
@@ -4255,7 +4049,7 @@
 void LIRGenerator::visitGuardNoDenseElements(MGuardNoDenseElements* ins) {
   auto* guard =
       new (alloc()) LGuardNoDenseElements(useRegister(ins->object()), temp());
-  assignSnapshot(guard, BailoutKind::NoDenseElementsGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, ins->object());
 }
@@ -4266,12 +4060,12 @@
   if (JitOptions.spectreObjectMitigationsMisc) {
     auto* lir =
         new (alloc()) LGuardShape(useRegisterAtStart(ins->object()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     defineReuseInput(lir, ins, 0);
   } else {
     auto* lir = new (alloc())
         LGuardShape(useRegister(ins->object()), LDefinition::BogusTemp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     add(lir, ins);
     redefine(ins, ins->object());
   }
@@ -4283,7 +4077,7 @@
 
   auto* lir = new (alloc()) LGuardProto(useRegister(ins->object()),
                                         useRegister(ins->expected()), temp());
-  assignSnapshot(lir, BailoutKind::ProtoGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4292,7 +4086,17 @@
   MOZ_ASSERT(ins->object()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LGuardNullProto(useRegister(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::ProtoGuard);
+  assignSnapshot(lir, ins->bailoutKind());
+  add(lir, ins);
+  redefine(ins, ins->object());
+}
+
+void LIRGenerator::visitGuardIsNativeObject(MGuardIsNativeObject* ins) {
+  MOZ_ASSERT(ins->object()->type() == MIRType::Object);
+
+  auto* lir =
+      new (alloc()) LGuardIsNativeObject(useRegister(ins->object()), temp());
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4301,7 +4105,7 @@
   MOZ_ASSERT(ins->object()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LGuardIsProxy(useRegister(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::ProxyGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4311,7 +4115,7 @@
 
   auto* lir =
       new (alloc()) LGuardIsNotProxy(useRegister(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::NotProxyGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4321,7 +4125,7 @@
 
   auto* lir =
       new (alloc()) LGuardIsNotDOMProxy(useRegister(ins->proxy()), temp());
-  assignSnapshot(lir, BailoutKind::NotDOMProxyGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->proxy());
 }
@@ -4387,7 +4191,7 @@
   auto* lir = new (alloc()) LMegamorphicLoadSlot(
       useRegisterAtStart(ins->object()), tempFixed(CallTempReg0),
       tempFixed(CallTempReg1), tempFixed(CallTempReg2));
-  assignSnapshot(lir, BailoutKind::MegamorphicAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   defineReturn(lir, ins);
 }
 
@@ -4398,7 +4202,7 @@
   auto* lir = new (alloc()) LMegamorphicLoadSlotByValue(
       useRegisterAtStart(ins->object()), useBoxAtStart(ins->idVal()),
       tempFixed(CallTempReg0), tempFixed(CallTempReg1));
-  assignSnapshot(lir, BailoutKind::MegamorphicAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   defineReturn(lir, ins);
 }
 
@@ -4409,7 +4213,7 @@
       LMegamorphicStoreSlot(useRegisterAtStart(ins->object()),
                             useBoxAtStart(ins->rhs()), tempFixed(CallTempReg0),
                             tempFixed(CallTempReg1), tempFixed(CallTempReg2));
-  assignSnapshot(lir, BailoutKind::MegamorphicAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
 }
 
@@ -4419,7 +4223,7 @@
   auto* lir = new (alloc()) LMegamorphicHasProp(
       useRegisterAtStart(ins->object()), useBoxAtStart(ins->idVal()),
       tempFixed(CallTempReg0), tempFixed(CallTempReg1));
-  assignSnapshot(lir, BailoutKind::MegamorphicAccess);
+  assignSnapshot(lir, ins->bailoutKind());
   defineReturn(lir, ins);
 }
 
@@ -4429,7 +4233,7 @@
 
   auto* lir = new (alloc())
       LGuardIsNotArrayBufferMaybeShared(useRegister(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::NotArrayBufferMaybeSharedGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4439,7 +4243,7 @@
 
   auto* lir =
       new (alloc()) LGuardIsTypedArray(useRegister(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::TypedArrayGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->object());
 }
@@ -4495,12 +4299,12 @@
   if (JitOptions.spectreObjectMitigationsMisc) {
     auto* lir = new (alloc())
         LGuardReceiverPolymorphic(useRegisterAtStart(ins->object()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     defineReuseInput(lir, ins, 0);
   } else {
     auto* lir = new (alloc())
         LGuardReceiverPolymorphic(useRegister(ins->object()), temp());
-    assignSnapshot(lir, BailoutKind::ShapeGuard);
+    assignSnapshot(lir, ins->bailoutKind());
     add(lir, ins);
     redefine(ins, ins->object());
   }
@@ -4509,7 +4313,7 @@
 void LIRGenerator::visitGuardValue(MGuardValue* ins) {
   MOZ_ASSERT(ins->value()->type() == MIRType::Value);
   auto* lir = new (alloc()) LGuardValue(useBox(ins->value()));
-  assignSnapshot(lir, BailoutKind::ValueGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->value());
 }
@@ -4518,7 +4322,7 @@
     MGuardNotOptimizedArguments* ins) {
   MOZ_ASSERT(ins->value()->type() == MIRType::Value);
   auto* lir = new (alloc()) LGuardNotOptimizedArguments(useBox(ins->value()));
-  assignSnapshot(lir, BailoutKind::NotOptimizedArgumentsGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->value());
 }
@@ -4526,7 +4330,7 @@
 void LIRGenerator::visitGuardNullOrUndefined(MGuardNullOrUndefined* ins) {
   MOZ_ASSERT(ins->value()->type() == MIRType::Value);
   auto* lir = new (alloc()) LGuardNullOrUndefined(useBox(ins->value()));
-  assignSnapshot(lir, BailoutKind::NullOrUndefinedGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->value());
 }
@@ -4535,7 +4339,7 @@
   MOZ_ASSERT(ins->function()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LGuardFunctionFlags(useRegister(ins->function()));
-  assignSnapshot(lir, BailoutKind::FunctionFlagsGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->function());
 }
@@ -4546,7 +4350,7 @@
 
   auto* lir = new (alloc())
       LGuardFunctionIsNonBuiltinCtor(useRegister(ins->function()), temp());
-  assignSnapshot(lir, BailoutKind::FunctionIsNonBuiltinCtorGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->function());
 }
@@ -4556,7 +4360,7 @@
 
   auto* lir =
       new (alloc()) LGuardFunctionKind(useRegister(ins->function()), temp());
-  assignSnapshot(lir, BailoutKind::FunctionKindGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->function());
 }
@@ -4565,7 +4369,7 @@
   MOZ_ASSERT(ins->function()->type() == MIRType::Object);
 
   auto* lir = new (alloc()) LGuardFunctionScript(useRegister(ins->function()));
-  assignSnapshot(lir, BailoutKind::FunctionScriptGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->function());
 }
@@ -4614,30 +4418,6 @@
   add(lir, ins);
 }
 
-void LIRGenerator::visitCallGetProperty(MCallGetProperty* ins) {
-  LCallGetProperty* lir =
-      new (alloc()) LCallGetProperty(useBoxAtStart(ins->value()));
-  defineReturn(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
-void LIRGenerator::visitCallGetElement(MCallGetElement* ins) {
-  MOZ_ASSERT(ins->lhs()->type() == MIRType::Value);
-  MOZ_ASSERT(ins->rhs()->type() == MIRType::Value);
-
-  LCallGetElement* lir = new (alloc())
-      LCallGetElement(useBoxAtStart(ins->lhs()), useBoxAtStart(ins->rhs()));
-  defineReturn(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
-void LIRGenerator::visitCallSetProperty(MCallSetProperty* ins) {
-  LInstruction* lir = new (alloc()) LCallSetProperty(
-      useRegisterAtStart(ins->object()), useBoxAtStart(ins->value()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
 void LIRGenerator::visitDeleteProperty(MDeleteProperty* ins) {
   LCallDeleteProperty* lir =
       new (alloc()) LCallDeleteProperty(useBoxAtStart(ins->value()));
@@ -4691,14 +4471,6 @@
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitCallInitElementArray(MCallInitElementArray* ins) {
-  LCallInitElementArray* lir = new (alloc()) LCallInitElementArray(
-      useRegisterAtStart(ins->object()),
-      useRegisterOrConstantAtStart(ins->index()), useBoxAtStart(ins->value()));
-  add(lir, ins);
-  assignSafepoint(lir, ins);
-}
-
 void LIRGenerator::visitGetIteratorCache(MGetIteratorCache* ins) {
   MDefinition* value = ins->value();
   MOZ_ASSERT(value->type() == MIRType::Object ||
@@ -4723,7 +4495,6 @@
   LIteratorMore* lir =
       new (alloc()) LIteratorMore(useRegister(ins->iterator()), temp());
   defineBox(lir, ins);
-  assignSafepoint(lir, ins);
 }
 
 void LIRGenerator::visitIsNoIter(MIsNoIter* ins) {
@@ -4735,7 +4506,6 @@
   LIteratorEnd* lir = new (alloc())
       LIteratorEnd(useRegister(ins->iterator()), temp(), temp(), temp());
   add(lir, ins);
-  assignSafepoint(lir, ins);
 }
 
 void LIRGenerator::visitStringLength(MStringLength* ins) {
@@ -4970,7 +4740,7 @@
   MOZ_ASSERT(ins->type() == MIRType::Object);
   LGuardToClass* lir =
       new (alloc()) LGuardToClass(useRegisterAtStart(ins->object()), temp());
-  assignSnapshot(lir, BailoutKind::TypeBarrierO);
+  assignSnapshot(lir, ins->bailoutKind());
   defineReuseInput(lir, ins, 0);
 }
 
@@ -5416,7 +5186,7 @@
   MOZ_ASSERT(ins->proxy()->type() == MIRType::Object);
   auto* lir = new (alloc())
       LLoadDOMExpandoValueGuardGeneration(useRegisterAtStart(ins->proxy()));
-  assignSnapshot(lir, BailoutKind::DOMExpandoValueGenerationGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   defineBox(lir, ins);
 }
 
@@ -5433,7 +5203,7 @@
   MOZ_ASSERT(ins->expando()->type() == MIRType::Value);
   auto* lir = new (alloc())
       LGuardDOMExpandoMissingOrGuardShape(useBox(ins->expando()), temp());
-  assignSnapshot(lir, BailoutKind::DOMExpandoMissingOrShapeGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->expando());
 }
@@ -5460,9 +5230,8 @@
   assignSafepoint(lir, ins);
 }
 
-void LIRGenerator::visitGlobalNameConflictsCheck(
-    MGlobalNameConflictsCheck* ins) {
-  LGlobalNameConflictsCheck* lir = new (alloc()) LGlobalNameConflictsCheck();
+void LIRGenerator::visitGlobalDeclInstantiation(MGlobalDeclInstantiation* ins) {
+  LGlobalDeclInstantiation* lir = new (alloc()) LGlobalDeclInstantiation();
   add(lir, ins);
   assignSafepoint(lir, ins);
 }
@@ -5470,7 +5239,7 @@
 void LIRGenerator::visitDebugger(MDebugger* ins) {
   LDebugger* lir =
       new (alloc()) LDebugger(tempFixed(CallTempReg0), tempFixed(CallTempReg1));
-  assignSnapshot(lir, BailoutKind::Debugger);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
 }
 
@@ -5571,7 +5340,7 @@
 
   auto* lir = new (alloc())
       LGuardArrayIsPacked(useRegister(ins->array()), temp(), temp());
-  assignSnapshot(lir, BailoutKind::PackedArrayGuard);
+  assignSnapshot(lir, ins->bailoutKind());
   add(lir, ins);
   redefine(ins, ins->array());
 }
@@ -5658,7 +5427,7 @@
 
   auto* guard =
       new (alloc()) LGuardTagNotEqual(useRegister(lhs), useRegister(rhs));
-  assignSnapshot(guard, BailoutKind::TagNotEqualGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
 }
 
@@ -5676,10 +5445,124 @@
   auto* guard = new (alloc())
       LGuardHasGetterSetter(useRegisterAtStart(object), tempFixed(CallTempReg0),
                             tempFixed(CallTempReg1));
-  assignSnapshot(guard, BailoutKind::HasGetterSetterGuard);
+  assignSnapshot(guard, ins->bailoutKind());
   add(guard, ins);
   redefine(ins, object);
-  assignSafepoint(guard, ins);
+}
+
+void LIRGenerator::visitGuardIsExtensible(MGuardIsExtensible* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  auto* guard = new (alloc()) LGuardIsExtensible(useRegister(object), temp());
+  assignSnapshot(guard, ins->bailoutKind());
+  add(guard, ins);
+  redefine(ins, object);
+}
+
+void LIRGenerator::visitGuardIndexIsNonNegative(MGuardIndexIsNonNegative* ins) {
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  auto* guard = new (alloc()) LGuardIndexIsNonNegative(useRegister(index));
+  assignSnapshot(guard, ins->bailoutKind());
+  add(guard, ins);
+  redefine(ins, index);
+}
+
+void LIRGenerator::visitGuardIndexGreaterThanDenseInitLength(
+    MGuardIndexGreaterThanDenseInitLength* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  LDefinition spectreTemp =
+      BoundsCheckNeedsSpectreTemp() ? temp() : LDefinition::BogusTemp();
+
+  auto* guard = new (alloc()) LGuardIndexGreaterThanDenseInitLength(
+      useRegister(object), useRegister(index), temp(), spectreTemp);
+  assignSnapshot(guard, ins->bailoutKind());
+  add(guard, ins);
+  redefine(ins, index);
+}
+
+void LIRGenerator::visitGuardIndexIsValidUpdateOrAdd(
+    MGuardIndexIsValidUpdateOrAdd* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  LDefinition spectreTemp =
+      BoundsCheckNeedsSpectreTemp() ? temp() : LDefinition::BogusTemp();
+
+  auto* guard = new (alloc()) LGuardIndexIsValidUpdateOrAdd(
+      useRegister(object), useRegister(index), temp(), spectreTemp);
+  assignSnapshot(guard, ins->bailoutKind());
+  add(guard, ins);
+  redefine(ins, index);
+}
+
+void LIRGenerator::visitCallAddOrUpdateSparseElement(
+    MCallAddOrUpdateSparseElement* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  MDefinition* value = ins->value();
+  MOZ_ASSERT(value->type() == MIRType::Value);
+
+  auto* lir = new (alloc()) LCallAddOrUpdateSparseElement(
+      useRegisterAtStart(object), useRegisterAtStart(index),
+      useBoxAtStart(value));
+  add(lir, ins);
+  assignSafepoint(lir, ins);
+}
+
+void LIRGenerator::visitCallGetSparseElement(MCallGetSparseElement* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  auto* lir = new (alloc()) LCallGetSparseElement(useRegisterAtStart(object),
+                                                  useRegisterAtStart(index));
+  defineReturn(lir, ins);
+  assignSafepoint(lir, ins);
+}
+
+void LIRGenerator::visitCallNativeGetElement(MCallNativeGetElement* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  auto* lir = new (alloc()) LCallNativeGetElement(useRegisterAtStart(object),
+                                                  useRegisterAtStart(index));
+  defineReturn(lir, ins);
+  assignSafepoint(lir, ins);
+}
+
+void LIRGenerator::visitCallObjectHasSparseElement(
+    MCallObjectHasSparseElement* ins) {
+  MDefinition* object = ins->object();
+  MOZ_ASSERT(object->type() == MIRType::Object);
+
+  MDefinition* index = ins->index();
+  MOZ_ASSERT(index->type() == MIRType::Int32);
+
+  auto* lir = new (alloc()) LCallObjectHasSparseElement(
+      useRegisterAtStart(object), useRegisterAtStart(index),
+      tempFixed(CallTempReg0), tempFixed(CallTempReg1));
+  assignSnapshot(lir, ins->bailoutKind());
+  defineReturn(lir, ins);
 }
 
 void LIRGenerator::visitConstant(MConstant* ins) {
diff -Nru firefox-84.0.2+build1/js/src/jit/MacroAssembler.cpp firefox-85.0+build1/js/src/jit/MacroAssembler.cpp
--- firefox-84.0.2+build1/js/src/jit/MacroAssembler.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MacroAssembler.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -29,6 +29,7 @@
 #include "jit/MIR.h"
 #include "jit/MoveEmitter.h"
 #include "jit/SharedICHelpers.h"
+#include "jit/SharedICRegisters.h"
 #include "jit/Simulator.h"
 #include "js/Conversions.h"
 #include "js/friend/DOMProxy.h"  // JS::ExpandoAndGeneration
@@ -40,6 +41,7 @@
 #include "vm/TraceLogging.h"
 #include "vm/TypedArrayObject.h"
 #include "wasm/WasmTypes.h"
+#include "wasm/WasmValidate.h"
 
 #include "gc/Nursery-inl.h"
 #include "jit/ABIFunctionList-inl.h"
@@ -47,7 +49,6 @@
 #include "jit/TemplateObject-inl.h"
 #include "vm/Interpreter-inl.h"
 #include "vm/JSObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -57,365 +58,6 @@
 
 using mozilla::CheckedInt;
 
-template <typename T>
-static void EmitTypeCheck(MacroAssembler& masm, Assembler::Condition cond,
-                          const T& src, TypeSet::Type type, Label* label) {
-  if (type.isAnyObject()) {
-    masm.branchTestObject(cond, src, label);
-    return;
-  }
-  switch (type.primitive()) {
-    case ValueType::Double:
-      // TI double type includes int32.
-      masm.branchTestNumber(cond, src, label);
-      break;
-    case ValueType::Int32:
-      masm.branchTestInt32(cond, src, label);
-      break;
-    case ValueType::Boolean:
-      masm.branchTestBoolean(cond, src, label);
-      break;
-    case ValueType::String:
-      masm.branchTestString(cond, src, label);
-      break;
-    case ValueType::Symbol:
-      masm.branchTestSymbol(cond, src, label);
-      break;
-    case ValueType::BigInt:
-      masm.branchTestBigInt(cond, src, label);
-      break;
-    case ValueType::Null:
-      masm.branchTestNull(cond, src, label);
-      break;
-    case ValueType::Undefined:
-      masm.branchTestUndefined(cond, src, label);
-      break;
-    case ValueType::Magic:
-      masm.branchTestMagic(cond, src, label);
-      break;
-    case ValueType::PrivateGCThing:
-    case ValueType::Object:
-      MOZ_CRASH("Unexpected type");
-  }
-}
-
-template <typename Source>
-void MacroAssembler::guardTypeSet(const Source& address, const TypeSet* types,
-                                  BarrierKind kind, Register unboxScratch,
-                                  Register objScratch,
-                                  Register spectreRegToZero, Label* miss) {
-  // unboxScratch may be InvalidReg on 32-bit platforms. It should only be
-  // used for extracting the Value tag or payload.
-  //
-  // objScratch may be InvalidReg if the TypeSet does not contain specific
-  // objects to guard on. It should only be used for guardObjectType.
-  //
-  // spectreRegToZero is a register that will be zeroed by guardObjectType on
-  // speculatively executed paths.
-
-  MOZ_ASSERT(kind == BarrierKind::TypeTagOnly || kind == BarrierKind::TypeSet);
-  MOZ_ASSERT(!types->unknown());
-
-  Label matched;
-  TypeSet::Type tests[] = {TypeSet::Int32Type(),    TypeSet::UndefinedType(),
-                           TypeSet::BooleanType(),  TypeSet::StringType(),
-                           TypeSet::SymbolType(),   TypeSet::BigIntType(),
-                           TypeSet::NullType(),     TypeSet::MagicArgType(),
-                           TypeSet::AnyObjectType()};
-
-  // The double type also implies Int32.
-  // So replace the int32 test with the double one.
-  if (types->hasType(TypeSet::DoubleType())) {
-    MOZ_ASSERT(types->hasType(TypeSet::Int32Type()));
-    tests[0] = TypeSet::DoubleType();
-  }
-
-  unsigned numBranches = 0;
-  for (size_t i = 0; i < mozilla::ArrayLength(tests); i++) {
-    if (types->hasType(tests[i])) {
-      numBranches++;
-    }
-  }
-
-  if (!types->unknownObject() && types->getObjectCount() > 0) {
-    numBranches++;
-  }
-
-  if (numBranches == 0) {
-    MOZ_ASSERT(types->empty());
-    jump(miss);
-    return;
-  }
-
-  Register tag = extractTag(address, unboxScratch);
-
-  // Emit all typed tests.
-  for (size_t i = 0; i < mozilla::ArrayLength(tests); i++) {
-    if (!types->hasType(tests[i])) {
-      continue;
-    }
-
-    if (--numBranches > 0) {
-      EmitTypeCheck(*this, Equal, tag, tests[i], &matched);
-    } else {
-      EmitTypeCheck(*this, NotEqual, tag, tests[i], miss);
-    }
-  }
-
-  // If we don't have specific objects to check for, we're done.
-  if (numBranches == 0) {
-    MOZ_ASSERT(types->unknownObject() || types->getObjectCount() == 0);
-    bind(&matched);
-    return;
-  }
-
-  // Test specific objects.
-  MOZ_ASSERT(objScratch != InvalidReg);
-  MOZ_ASSERT(objScratch != unboxScratch);
-
-  MOZ_ASSERT(numBranches == 1);
-  branchTestObject(NotEqual, tag, miss);
-
-  if (kind != BarrierKind::TypeTagOnly) {
-    Register obj = extractObject(address, unboxScratch);
-    guardObjectType(obj, types, objScratch, spectreRegToZero, miss);
-  } else {
-#ifdef DEBUG
-    Label fail;
-    Register obj = extractObject(address, unboxScratch);
-    guardObjectType(obj, types, objScratch, spectreRegToZero, &fail);
-    jump(&matched);
-
-    bind(&fail);
-    guardTypeSetMightBeIncomplete(types, obj, objScratch, &matched);
-    assumeUnreachable("Unexpected object type");
-#endif
-  }
-
-  bind(&matched);
-}
-
-template <>
-void MacroAssembler::guardTypeSet(const TypedOrValueRegister& reg,
-                                  const TypeSet* types, BarrierKind kind,
-                                  Register unboxScratch, Register objScratch,
-                                  Register spectreRegToZero, Label* miss) {
-  // See guardTypeSet comments above. This is a specialization for
-  // TypedOrValueRegister.
-
-  MOZ_ASSERT(kind == BarrierKind::TypeTagOnly || kind == BarrierKind::TypeSet);
-  MOZ_ASSERT(!types->unknown());
-
-  if (reg.hasValue()) {
-    guardTypeSet(reg.valueReg(), types, kind, unboxScratch, objScratch,
-                 spectreRegToZero, miss);
-    return;
-  }
-
-  MIRType valType = reg.type();
-  MOZ_ASSERT(valType != MIRType::Value);
-
-  if (valType != MIRType::Object) {
-    // Barrier always either succeeds or fails.
-    if (!types->hasType(TypeSet::PrimitiveType(valType))) {
-      jump(miss);
-    }
-    return;
-  }
-
-  if (types->unknownObject()) {
-    // Barrier always succeeds.
-    return;
-  }
-
-  if (types->getObjectCount() == 0) {
-    // Barrier always fails.
-    jump(miss);
-    return;
-  }
-
-  if (kind == BarrierKind::TypeTagOnly) {
-    // Barrier always succeeds. Assert the type matches in DEBUG builds.
-#ifdef DEBUG
-    Label fail, matched;
-    Register obj = reg.typedReg().gpr();
-    guardObjectType(obj, types, objScratch, spectreRegToZero, &fail);
-    jump(&matched);
-
-    bind(&fail);
-    guardTypeSetMightBeIncomplete(types, obj, objScratch, &matched);
-    assumeUnreachable("Unexpected object type");
-
-    bind(&matched);
-#endif
-    return;
-  }
-
-  MOZ_ASSERT(kind == BarrierKind::TypeSet);
-  MOZ_ASSERT(objScratch != InvalidReg);
-
-  // Test specific objects.
-  Register obj = reg.typedReg().gpr();
-  guardObjectType(obj, types, objScratch, spectreRegToZero, miss);
-}
-
-#ifdef DEBUG
-// guardTypeSetMightBeIncomplete is only used in DEBUG builds. If this ever
-// changes, we need to make sure it's Spectre-safe.
-void MacroAssembler::guardTypeSetMightBeIncomplete(const TypeSet* types,
-                                                   Register obj,
-                                                   Register scratch,
-                                                   Label* label) {
-  // Type set guards might miss when an object's group changes. In this case
-  // either its old group's properties will become unknown, or it will change
-  // to a native object with an original unboxed group. Jump to label if this
-  // might have happened for the input object.
-
-  if (types->unknownObject()) {
-    jump(label);
-    return;
-  }
-
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    if (JSObject* singleton = getSingletonAndDelayBarrier(types, i)) {
-      movePtr(ImmGCPtr(singleton), scratch);
-      loadPtr(Address(scratch, JSObject::offsetOfGroup()), scratch);
-    } else if (ObjectGroup* group = getGroupAndDelayBarrier(types, i)) {
-      movePtr(ImmGCPtr(group), scratch);
-    } else {
-      continue;
-    }
-    branchTest32(Assembler::NonZero,
-                 Address(scratch, ObjectGroup::offsetOfFlags()),
-                 Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), label);
-  }
-}
-#endif
-
-void MacroAssembler::guardObjectType(Register obj, const TypeSet* types,
-                                     Register scratch,
-                                     Register spectreRegToZero, Label* miss) {
-  MOZ_ASSERT(obj != scratch);
-  MOZ_ASSERT(!types->unknown());
-  MOZ_ASSERT(!types->hasType(TypeSet::AnyObjectType()));
-  MOZ_ASSERT_IF(types->getObjectCount() > 0, scratch != InvalidReg);
-
-  // Note: this method elides read barriers on values read from type sets, as
-  // this may be called off thread during Ion compilation. This is
-  // safe to do as the final JitCode object will be allocated during the
-  // incremental GC (or the compilation canceled before we start sweeping),
-  // see CodeGenerator::link. Other callers should use TypeSet::readBarrier
-  // to trigger the barrier on the contents of type sets passed in here.
-  Label matched;
-
-  bool hasSingletons = false;
-  bool hasObjectGroups = false;
-  unsigned numBranches = 0;
-
-  unsigned count = types->getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    if (types->hasGroup(i)) {
-      hasObjectGroups = true;
-      numBranches++;
-    } else if (types->hasSingleton(i)) {
-      hasSingletons = true;
-      numBranches++;
-    }
-  }
-
-  if (numBranches == 0) {
-    jump(miss);
-    return;
-  }
-
-  if (JitOptions.spectreObjectMitigationsBarriers) {
-    move32(Imm32(0), scratch);
-  }
-
-  if (hasSingletons) {
-    for (unsigned i = 0; i < count; i++) {
-      JSObject* singleton = getSingletonAndDelayBarrier(types, i);
-      if (!singleton) {
-        continue;
-      }
-
-      if (JitOptions.spectreObjectMitigationsBarriers) {
-        if (--numBranches > 0) {
-          Label next;
-          branchPtr(NotEqual, obj, ImmGCPtr(singleton), &next);
-          spectreMovePtr(NotEqual, scratch, spectreRegToZero);
-          jump(&matched);
-          bind(&next);
-        } else {
-          branchPtr(NotEqual, obj, ImmGCPtr(singleton), miss);
-          spectreMovePtr(NotEqual, scratch, spectreRegToZero);
-        }
-      } else {
-        if (--numBranches > 0) {
-          branchPtr(Equal, obj, ImmGCPtr(singleton), &matched);
-        } else {
-          branchPtr(NotEqual, obj, ImmGCPtr(singleton), miss);
-        }
-      }
-    }
-  }
-
-  if (hasObjectGroups) {
-    comment("has object groups");
-
-    // If Spectre mitigations are enabled, we use the scratch register as
-    // zero register. Without mitigations we can use it to store the group.
-    Address groupAddr(obj, JSObject::offsetOfGroup());
-    if (!JitOptions.spectreObjectMitigationsBarriers) {
-      loadPtr(groupAddr, scratch);
-    }
-
-    for (unsigned i = 0; i < count; i++) {
-      ObjectGroup* group = getGroupAndDelayBarrier(types, i);
-      if (!group) {
-        continue;
-      }
-
-      if (!pendingObjectGroupReadBarriers_.append(group)) {
-        setOOM();
-        return;
-      }
-
-      if (JitOptions.spectreObjectMitigationsBarriers) {
-        if (--numBranches > 0) {
-          Label next;
-          branchPtr(NotEqual, groupAddr, ImmGCPtr(group), &next);
-          spectreMovePtr(NotEqual, scratch, spectreRegToZero);
-          jump(&matched);
-          bind(&next);
-        } else {
-          branchPtr(NotEqual, groupAddr, ImmGCPtr(group), miss);
-          spectreMovePtr(NotEqual, scratch, spectreRegToZero);
-        }
-      } else {
-        if (--numBranches > 0) {
-          branchPtr(Equal, scratch, ImmGCPtr(group), &matched);
-        } else {
-          branchPtr(NotEqual, scratch, ImmGCPtr(group), miss);
-        }
-      }
-    }
-  }
-
-  MOZ_ASSERT(numBranches == 0);
-
-  bind(&matched);
-}
-
-template void MacroAssembler::guardTypeSet(
-    const Address& address, const TypeSet* types, BarrierKind kind,
-    Register unboxScratch, Register objScratch, Register spectreRegToZero,
-    Label* miss);
-template void MacroAssembler::guardTypeSet(
-    const ValueOperand& value, const TypeSet* types, BarrierKind kind,
-    Register unboxScratch, Register objScratch, Register spectreRegToZero,
-    Label* miss);
-
 TrampolinePtr MacroAssembler::preBarrierTrampoline(MIRType type) {
   const JitRuntime* rt = GetJitContext()->runtime->jitRuntime();
   return rt->preBarrier(type);
@@ -791,13 +433,6 @@
     const NativeTemplateObject& ntemplate =
         templateObj.asNativeTemplateObject();
     nDynamicSlots = ntemplate.numDynamicSlots();
-
-    // Arrays with copy on write elements do not need fixed space for an
-    // elements header. The template object, which owns the original
-    // elements, might have another allocation kind.
-    if (ntemplate.denseElementsAreCopyOnWrite()) {
-      allocKind = gc::AllocKind::OBJECT0_BACKGROUND;
-    }
   }
 
   allocateObject(obj, temp, allocKind, nDynamicSlots, initialHeap, fail);
@@ -1196,9 +831,7 @@
   if (templateObj.isNative()) {
     const NativeTemplateObject& ntemplate =
         templateObj.asNativeTemplateObject();
-    MOZ_ASSERT_IF(!ntemplate.denseElementsAreCopyOnWrite(),
-                  !ntemplate.hasDynamicElements());
-    MOZ_ASSERT_IF(ntemplate.convertDoubleElements(), ntemplate.isArrayObject());
+    MOZ_ASSERT(!ntemplate.hasDynamicElements());
 
     // If the object has dynamic slots, the slots member has already been
     // filled in.
@@ -1207,10 +840,7 @@
                Address(obj, NativeObject::offsetOfSlots()));
     }
 
-    if (ntemplate.denseElementsAreCopyOnWrite()) {
-      storePtr(ImmPtr(ntemplate.getDenseElements()),
-               Address(obj, NativeObject::offsetOfElements()));
-    } else if (ntemplate.isArrayObject()) {
+    if (ntemplate.isArrayObject()) {
       int elementsOffset = NativeObject::offsetOfFixedElements();
 
       computeEffectiveAddress(Address(obj, elementsOffset), temp);
@@ -1225,9 +855,7 @@
                                ObjectElements::offsetOfInitializedLength()));
       store32(Imm32(ntemplate.getArrayLength()),
               Address(obj, elementsOffset + ObjectElements::offsetOfLength()));
-      store32(Imm32(ntemplate.convertDoubleElements()
-                        ? ObjectElements::CONVERT_DOUBLE_ELEMENTS
-                        : 0),
+      store32(Imm32(0),
               Address(obj, elementsOffset + ObjectElements::offsetOfFlags()));
       MOZ_ASSERT(!ntemplate.hasPrivate());
     } else if (ntemplate.isArgumentsObject()) {
@@ -1929,26 +1557,6 @@
   loadPtr(Address(dest, offsetof(JSContext, activation_)), dest);
 }
 
-void MacroAssembler::guardGroupHasUnanalyzedNewScript(Register group,
-                                                      Register scratch,
-                                                      Label* fail) {
-  Label noNewScript;
-  load32(Address(group, ObjectGroup::offsetOfFlags()), scratch);
-  and32(Imm32(OBJECT_FLAG_ADDENDUM_MASK), scratch);
-  branch32(Assembler::NotEqual, scratch,
-           Imm32(uint32_t(ObjectGroup::Addendum_NewScript)
-                 << OBJECT_FLAG_ADDENDUM_SHIFT),
-           &noNewScript);
-
-  // Guard group->newScript()->preliminaryObjects is non-nullptr.
-  loadPtr(Address(group, ObjectGroup::offsetOfAddendum()), scratch);
-  branchPtr(Assembler::Equal,
-            Address(scratch, TypeNewScript::offsetOfPreliminaryObjects()),
-            ImmWord(0), fail);
-
-  bind(&noNewScript);
-}
-
 void MacroAssembler::guardSpecificAtom(Register str, JSAtom* atom,
                                        Register scratch,
                                        const LiveRegisterSet& volatileRegs,
@@ -2142,35 +1750,6 @@
   loadPtr(Address(dest, BaseScript::offsetOfJitCodeRaw()), dest);
 }
 
-void MacroAssembler::loadJitCodeNoArgCheck(Register func, Register dest) {
-#ifdef DEBUG
-  {
-    Label ok;
-    int32_t flags = FunctionFlags::BASESCRIPT;
-    branchTestFunctionFlags(func, flags, Assembler::NonZero, &ok);
-    assumeUnreachable("Function has no BaseScript!");
-    bind(&ok);
-  }
-#endif
-
-  static_assert(ScriptWarmUpData::JitScriptTag == 0,
-                "Code below depends on tag value");
-  Imm32 tagMask(ScriptWarmUpData::TagMask);
-
-  // Read jitCodeSkipArgCheck.
-  loadPtr(Address(func, JSFunction::offsetOfScript()), dest);
-  loadPtr(Address(dest, BaseScript::offsetOfWarmUpData()), dest);
-#ifdef DEBUG
-  {
-    Label ok;
-    branchTestPtr(Assembler::Zero, dest, tagMask, &ok);
-    assumeUnreachable("Function has no JitScript!");
-    bind(&ok);
-  }
-#endif
-  loadPtr(Address(dest, JitScript::offsetOfJitCodeSkipArgCheck()), dest);
-}
-
 void MacroAssembler::loadBaselineJitCodeRaw(Register func, Register dest,
                                             Label* failure) {
   // Load JitScript
@@ -2818,7 +2397,8 @@
 // ===============================================================
 
 MacroAssembler::MacroAssembler(JSContext* cx)
-    : framePushed_(0),
+    : wasmMaxOffsetGuardLimit_(0),
+      framePushed_(0),
 #ifdef DEBUG
       inCall_(false),
 #endif
@@ -2837,7 +2417,8 @@
 }
 
 MacroAssembler::MacroAssembler()
-    : framePushed_(0),
+    : wasmMaxOffsetGuardLimit_(0),
+      framePushed_(0),
 #ifdef DEBUG
       inCall_(false),
 #endif
@@ -2863,7 +2444,8 @@
 }
 
 MacroAssembler::MacroAssembler(WasmToken, TempAllocator& alloc)
-    : framePushed_(0),
+    : wasmMaxOffsetGuardLimit_(0),
+      framePushed_(0),
 #ifdef DEBUG
       inCall_(false),
 #endif
@@ -2883,6 +2465,24 @@
 #endif
 }
 
+WasmMacroAssembler::WasmMacroAssembler(TempAllocator& alloc, bool limitedSize)
+    : MacroAssembler(WasmToken(), alloc) {
+  if (!limitedSize) {
+    setUnlimitedBuffer();
+  }
+}
+
+WasmMacroAssembler::WasmMacroAssembler(TempAllocator& alloc,
+                                       const wasm::ModuleEnvironment& env,
+                                       bool limitedSize)
+    : MacroAssembler(WasmToken(), alloc) {
+  setWasmMaxOffsetGuardLimit(
+      wasm::GetMaxOffsetGuardLimit(env.hugeMemoryEnabled()));
+  if (!limitedSize) {
+    setUnlimitedBuffer();
+  }
+}
+
 bool MacroAssembler::icBuildOOLFakeExitFrame(void* fakeReturnAddr,
                                              AutoSaveLiveRegisters& save) {
   return buildOOLFakeExitFrame(fakeReturnAddr);
@@ -3633,15 +3233,6 @@
   branchPtr(cond, scratch, ImmPtr(compartment), label);
 }
 
-void MacroAssembler::branchIfObjGroupHasNoAddendum(Register obj,
-                                                   Register scratch,
-                                                   Label* label) {
-  MOZ_ASSERT(obj != scratch);
-  loadPtr(Address(obj, JSObject::offsetOfGroup()), scratch);
-  branchPtr(Assembler::Equal, Address(scratch, ObjectGroup::offsetOfAddendum()),
-            ImmWord(0), label);
-}
-
 void MacroAssembler::branchIfPretenuredGroup(const ObjectGroup* group,
                                              Register scratch, Label* label) {
   movePtr(ImmGCPtr(group), scratch);
@@ -3649,15 +3240,7 @@
 }
 
 void MacroAssembler::branchIfPretenuredGroup(Register group, Label* label) {
-  // To check for the pretenured flag we need OBJECT_FLAG_PRETENURED set, and
-  // OBJECT_FLAG_UNKNOWN_PROPERTIES unset, so check the latter first, and don't
-  // branch if it set.
-  Label unknownProperties;
-  branchTest32(Assembler::NonZero, Address(group, ObjectGroup::offsetOfFlags()),
-               Imm32(OBJECT_FLAG_UNKNOWN_PROPERTIES), &unknownProperties);
-  branchTest32(Assembler::NonZero, Address(group, ObjectGroup::offsetOfFlags()),
-               Imm32(OBJECT_FLAG_PRE_TENURE), label);
-  bind(&unknownProperties);
+  // TODO(no-TI): remove.
 }
 
 void MacroAssembler::branchIfNonNativeObj(Register obj, Register scratch,
@@ -3667,11 +3250,15 @@
                Imm32(JSClass::NON_NATIVE), label);
 }
 
-void MacroAssembler::copyObjGroupNoPreBarrier(Register sourceObj,
-                                              Register destObj,
-                                              Register scratch) {
-  loadPtr(Address(sourceObj, JSObject::offsetOfGroup()), scratch);
-  storePtr(scratch, Address(destObj, JSObject::offsetOfGroup()));
+void MacroAssembler::branchIfObjectNotExtensible(Register obj, Register scratch,
+                                                 Label* label) {
+  loadPtr(Address(obj, JSObject::offsetOfShape()), scratch);
+  loadPtr(Address(scratch, Shape::offsetOfBaseShape()), scratch);
+
+  // Spectre-style checks are not needed here because we do not interpret data
+  // based on this check.
+  branchTest32(Assembler::NonZero, Address(scratch, BaseShape::offsetOfFlags()),
+               Imm32(js::BaseShape::NOT_EXTENSIBLE), label);
 }
 
 void MacroAssembler::maybeBranchTestType(MIRType type, MDefinition* maybeDef,
@@ -3878,15 +3465,15 @@
   MOZ_ASSERT(callee.which() == wasm::CalleeDesc::WasmTable);
 
   // Write the functype-id into the ABI functype-id register.
-  wasm::FuncTypeIdDesc funcTypeId = callee.wasmTableSigId();
+  wasm::TypeIdDesc funcTypeId = callee.wasmTableSigId();
   switch (funcTypeId.kind()) {
-    case wasm::FuncTypeIdDescKind::Global:
+    case wasm::TypeIdDescKind::Global:
       loadWasmGlobalPtr(funcTypeId.globalDataOffset(), WasmTableCallSigReg);
       break;
-    case wasm::FuncTypeIdDescKind::Immediate:
+    case wasm::TypeIdDescKind::Immediate:
       move32(Imm32(funcTypeId.immediate()), WasmTableCallSigReg);
       break;
-    case wasm::FuncTypeIdDescKind::None:
+    case wasm::TypeIdDescKind::None:
       break;
   }
 
@@ -4187,7 +3774,7 @@
 
   // Check flags.
   static constexpr uint32_t UnhandledFlags =
-      ObjectElements::Flags::NON_PACKED | ObjectElements::Flags::COPY_ON_WRITE |
+      ObjectElements::Flags::NON_PACKED |
       ObjectElements::Flags::NONWRITABLE_ARRAY_LENGTH |
       ObjectElements::Flags::NOT_EXTENSIBLE |
       ObjectElements::Flags::MAYBE_IN_ITERATION;
@@ -4234,7 +3821,7 @@
 
   // Check flags.
   static constexpr uint32_t UnhandledFlags =
-      ObjectElements::Flags::NON_PACKED | ObjectElements::Flags::COPY_ON_WRITE |
+      ObjectElements::Flags::NON_PACKED |
       ObjectElements::Flags::NONWRITABLE_ARRAY_LENGTH |
       ObjectElements::Flags::NOT_EXTENSIBLE |
       ObjectElements::Flags::MAYBE_IN_ITERATION;
@@ -4526,59 +4113,6 @@
 #endif
 }
 
-template <typename T, size_t N, typename P>
-static bool AddPendingReadBarrier(Vector<T*, N, P>& list, T* value) {
-  // Check if value is already present in tail of list.
-  // TODO: Consider using a hash table here.
-  const size_t TailWindow = 4;
-
-  size_t len = list.length();
-  for (size_t i = 0; i < std::min(len, TailWindow); i++) {
-    if (list[len - i - 1] == value) {
-      return true;
-    }
-  }
-
-  return list.append(value);
-}
-
-JSObject* MacroAssembler::getSingletonAndDelayBarrier(const TypeSet* types,
-                                                      size_t i) {
-  JSObject* object = types->getSingletonNoBarrier(i);
-  if (!object) {
-    return nullptr;
-  }
-
-  if (!AddPendingReadBarrier(pendingObjectReadBarriers_, object)) {
-    setOOM();
-  }
-
-  return object;
-}
-
-ObjectGroup* MacroAssembler::getGroupAndDelayBarrier(const TypeSet* types,
-                                                     size_t i) {
-  ObjectGroup* group = types->getGroupNoBarrier(i);
-  if (!group) {
-    return nullptr;
-  }
-
-  if (!AddPendingReadBarrier(pendingObjectGroupReadBarriers_, group)) {
-    setOOM();
-  }
-
-  return group;
-}
-
-void MacroAssembler::performPendingReadBarriers() {
-  for (JSObject* object : pendingObjectReadBarriers_) {
-    gc::ReadBarrier(object);
-  }
-  for (ObjectGroup* group : pendingObjectGroupReadBarriers_) {
-    gc::ReadBarrier(group);
-  }
-}
-
 // Can't push large frames blindly on windows, so we must touch frame memory
 // incrementally, with no more than 4096 - 1 bytes between touches.
 //
diff -Nru firefox-84.0.2+build1/js/src/jit/MacroAssembler.h firefox-85.0+build1/js/src/jit/MacroAssembler.h
--- firefox-84.0.2+build1/js/src/jit/MacroAssembler.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MacroAssembler.h	2021-01-18 19:58:13.000000000 +0000
@@ -214,7 +214,6 @@
 namespace js {
 
 class TypedArrayObject;
-class TypeSet;
 
 namespace wasm {
 class CalleeDesc;
@@ -222,6 +221,8 @@
 class BytecodeOffset;
 class MemoryAccessDesc;
 
+struct ModuleEnvironment;
+
 enum class FailureMode : uint8_t;
 enum class SimdOp;
 enum class SymbolicAddress;
@@ -371,6 +372,16 @@
   static bool MustScalarizeShiftSimd128(wasm::SimdOp op, Imm32 imm);
 #endif
 
+ private:
+  // The value returned by GetMaxOffsetGuardLimit() in WasmTypes.h
+  uint32_t wasmMaxOffsetGuardLimit_;
+
+ public:
+  uint32_t wasmMaxOffsetGuardLimit() const { return wasmMaxOffsetGuardLimit_; }
+  void setWasmMaxOffsetGuardLimit(uint32_t limit) {
+    wasmMaxOffsetGuardLimit_ = limit;
+  }
+
   //{{{ check_macroassembler_decl_style
  public:
   // ===============================================================
@@ -1565,14 +1576,15 @@
   void branchTestObjCompartment(Condition cond, Register obj,
                                 const JS::Compartment* compartment,
                                 Register scratch, Label* label);
-  void branchIfObjGroupHasNoAddendum(Register obj, Register scratch,
-                                     Label* label);
   void branchIfPretenuredGroup(Register group, Label* label);
   void branchIfPretenuredGroup(const ObjectGroup* group, Register scratch,
                                Label* label);
 
   void branchIfNonNativeObj(Register obj, Register scratch, Label* label);
 
+  void branchIfObjectNotExtensible(Register obj, Register scratch,
+                                   Label* label);
+
   inline void branchTestClassIsProxy(bool proxy, Register clasp, Label* label);
 
   inline void branchTestObjectIsProxy(bool proxy, Register object,
@@ -1582,9 +1594,6 @@
                                            Register scratch,
                                            const void* handlerp, Label* label);
 
-  void copyObjGroupNoPreBarrier(Register sourceObj, Register destObj,
-                                Register scratch);
-
   // Emit type case branch on tag matching if the type tag in the definition
   // might actually be that type.
   void maybeBranchTestType(MIRType type, MDefinition* maybeDef, Register tag,
@@ -2599,10 +2608,20 @@
                                FloatRegister lhsDest)
       DEFINED_ON(x86_shared, arm64);
 
+  // On x86_shared, limited to ==, !=, <, <=
+  inline void compareFloat32x4(Assembler::Condition cond,
+                               const SimdConstant& rhs, FloatRegister lhsDest)
+      DEFINED_ON(x86_shared);
+
   inline void compareFloat64x2(Assembler::Condition cond, FloatRegister rhs,
                                FloatRegister lhsDest)
       DEFINED_ON(x86_shared, arm64);
 
+  // On x86_shared, limited to ==, !=, <, <=
+  inline void compareFloat64x2(Assembler::Condition cond,
+                               const SimdConstant& rhs, FloatRegister lhsDest)
+      DEFINED_ON(x86_shared);
+
   // Load
 
   inline void loadUnalignedSimd128(const Operand& src, FloatRegister dest)
@@ -2943,24 +2962,38 @@
   void wasmStoreI64(const wasm::MemoryAccessDesc& access, Register64 value,
                     Operand dstAddr) DEFINED_ON(x86);
 
-  // For all the ARM and ARM64 wasmLoad and wasmStore functions, `ptr` MUST
-  // equal `ptrScratch`, and that register will be updated based on conditions
-  // listed below (where it is only mentioned as `ptr`).
+  // For all the ARM/MIPS wasmLoad and wasmStore functions below, `ptr`
+  // MUST equal `ptrScratch`, and that register will be updated based on
+  // conditions listed below (where it is only mentioned as `ptr`).
 
   // `ptr` will be updated if access.offset() != 0 or access.type() ==
   // Scalar::Int64.
   void wasmLoad(const wasm::MemoryAccessDesc& access, Register memoryBase,
                 Register ptr, Register ptrScratch, AnyRegister output)
-      DEFINED_ON(arm, arm64, mips_shared);
+      DEFINED_ON(arm, mips_shared);
   void wasmLoadI64(const wasm::MemoryAccessDesc& access, Register memoryBase,
                    Register ptr, Register ptrScratch, Register64 output)
-      DEFINED_ON(arm, arm64, mips32, mips64);
+      DEFINED_ON(arm, mips32, mips64);
   void wasmStore(const wasm::MemoryAccessDesc& access, AnyRegister value,
                  Register memoryBase, Register ptr, Register ptrScratch)
-      DEFINED_ON(arm, arm64, mips_shared);
+      DEFINED_ON(arm, mips_shared);
   void wasmStoreI64(const wasm::MemoryAccessDesc& access, Register64 value,
                     Register memoryBase, Register ptr, Register ptrScratch)
-      DEFINED_ON(arm, arm64, mips32, mips64);
+      DEFINED_ON(arm, mips32, mips64);
+
+  // These accept general memoryBase + ptr + offset (in `access`); the offset is
+  // always smaller than the guard region.  They will insert an additional add
+  // if the offset is nonzero, and of course that add may require a temporary
+  // register for the offset if the offset is large, and instructions to set it
+  // up.
+  void wasmLoad(const wasm::MemoryAccessDesc& access, Register memoryBase,
+                Register ptr, AnyRegister output) DEFINED_ON(arm64);
+  void wasmLoadI64(const wasm::MemoryAccessDesc& access, Register memoryBase,
+                   Register ptr, Register64 output) DEFINED_ON(arm64);
+  void wasmStore(const wasm::MemoryAccessDesc& access, AnyRegister value,
+                 Register memoryBase, Register ptr) DEFINED_ON(arm64);
+  void wasmStoreI64(const wasm::MemoryAccessDesc& access, Register64 value,
+                    Register memoryBase, Register ptr) DEFINED_ON(arm64);
 
   // `ptr` will always be updated.
   void wasmUnalignedLoad(const wasm::MemoryAccessDesc& access,
@@ -3554,22 +3587,6 @@
 
   //}}} check_macroassembler_decl_style
  public:
-  // Emits a test of a value against all types in a TypeSet. A scratch
-  // register is required.
-  template <typename Source>
-  void guardTypeSet(const Source& address, const TypeSet* types,
-                    BarrierKind kind, Register unboxScratch,
-                    Register objScratch, Register spectreRegToZero,
-                    Label* miss);
-
-  void guardObjectType(Register obj, const TypeSet* types, Register scratch,
-                       Register spectreRegToZero, Label* miss);
-
-#ifdef DEBUG
-  void guardTypeSetMightBeIncomplete(const TypeSet* types, Register obj,
-                                     Register scratch, Label* label);
-#endif
-
   // Unsafe here means the caller is responsible for Spectre mitigations if
   // needed. Prefer branchTestObjGroup or one of the other masm helpers!
   void loadObjGroupUnsafe(Register obj, Register dest) {
@@ -3581,12 +3598,6 @@
   }
 
   template <typename EmitPreBarrier>
-  inline void storeObjGroup(Register group, Register obj,
-                            EmitPreBarrier emitPreBarrier);
-  template <typename EmitPreBarrier>
-  inline void storeObjGroup(ObjectGroup* group, Register obj,
-                            EmitPreBarrier emitPreBarrier);
-  template <typename EmitPreBarrier>
   inline void storeObjShape(Register shape, Register obj,
                             EmitPreBarrier emitPreBarrier);
   template <typename EmitPreBarrier>
@@ -3700,9 +3711,6 @@
 
   void loadJitActivation(Register dest);
 
-  void guardGroupHasUnanalyzedNewScript(Register group, Register scratch,
-                                        Label* fail);
-
   void guardSpecificAtom(Register str, JSAtom* atom, Register scratch,
                          const LiveRegisterSet& volatileRegs, Label* fail);
 
@@ -4159,7 +4167,6 @@
 
  public:
   void loadJitCodeRaw(Register func, Register dest);
-  void loadJitCodeNoArgCheck(Register func, Register dest);
   void loadBaselineJitCodeRaw(Register func, Register dest,
                               Label* failure = nullptr);
   void storeICScriptInJSContext(Register icScript);
@@ -4339,20 +4346,8 @@
 
   inline void assertStackAlignment(uint32_t alignment, int32_t offset = 0);
 
-  void performPendingReadBarriers();
-
   void touchFrameValues(Register numStackValues, Register scratch1,
                         Register scratch2);
-
- private:
-  // Methods to get a singleton object or object group from a type set without
-  // a read barrier, and record the result so that we can perform the barrier
-  // later.
-  JSObject* getSingletonAndDelayBarrier(const TypeSet* types, size_t i);
-  ObjectGroup* getGroupAndDelayBarrier(const TypeSet* types, size_t i);
-
-  Vector<JSObject*, 0, SystemAllocPolicy> pendingObjectReadBarriers_;
-  Vector<ObjectGroup*, 0, SystemAllocPolicy> pendingObjectGroupReadBarriers_;
 };
 
 // StackMacroAssembler checks no GC will happen while it's on the stack.
@@ -4368,12 +4363,10 @@
 // checking StackMacroAssembler has.
 class MOZ_RAII WasmMacroAssembler : public MacroAssembler {
  public:
-  explicit WasmMacroAssembler(TempAllocator& alloc, bool limitedSize = true)
-      : MacroAssembler(WasmToken(), alloc) {
-    if (!limitedSize) {
-      setUnlimitedBuffer();
-    }
-  }
+  explicit WasmMacroAssembler(TempAllocator& alloc, bool limitedSize = true);
+  explicit WasmMacroAssembler(TempAllocator& alloc,
+                              const wasm::ModuleEnvironment& env,
+                              bool limitedSize = true);
   ~WasmMacroAssembler() { assertNoGCThings(); }
 };
 
diff -Nru firefox-84.0.2+build1/js/src/jit/MacroAssembler-inl.h firefox-85.0+build1/js/src/jit/MacroAssembler-inl.h
--- firefox-84.0.2+build1/js/src/jit/MacroAssembler-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MacroAssembler-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -17,6 +17,7 @@
 #include "jit/CompileWrappers.h"
 #include "jit/JitFrames.h"
 #include "jit/JSJitFrameIter.h"
+#include "util/DifferentialTesting.h"
 #include "vm/ProxyObject.h"
 #include "vm/Runtime.h"
 
@@ -810,10 +811,10 @@
 }
 
 void MacroAssembler::canonicalizeFloatIfDeterministic(FloatRegister reg) {
-#ifdef JS_MORE_DETERMINISTIC
   // See the comment in TypedArrayObjectTemplate::getElement.
-  canonicalizeFloat(reg);
-#endif  // JS_MORE_DETERMINISTIC
+  if (js::SupportDifferentialTesting()) {
+    canonicalizeFloat(reg);
+  }
 }
 
 void MacroAssembler::canonicalizeDouble(FloatRegister reg) {
@@ -824,10 +825,10 @@
 }
 
 void MacroAssembler::canonicalizeDoubleIfDeterministic(FloatRegister reg) {
-#ifdef JS_MORE_DETERMINISTIC
   // See the comment in TypedArrayObjectTemplate::getElement.
-  canonicalizeDouble(reg);
-#endif  // JS_MORE_DETERMINISTIC
+  if (js::SupportDifferentialTesting()) {
+    canonicalizeDouble(reg);
+  }
 }
 
 // ========================================================================
@@ -936,23 +937,6 @@
 #endif  // !JS_CODEGEN_ARM64
 
 template <typename EmitPreBarrier>
-void MacroAssembler::storeObjGroup(Register group, Register obj,
-                                   EmitPreBarrier emitPreBarrier) {
-  MOZ_ASSERT(group != obj);
-  Address groupAddr(obj, JSObject::offsetOfGroup());
-  emitPreBarrier(*this, groupAddr);
-  storePtr(group, groupAddr);
-}
-
-template <typename EmitPreBarrier>
-void MacroAssembler::storeObjGroup(ObjectGroup* group, Register obj,
-                                   EmitPreBarrier emitPreBarrier) {
-  Address groupAddr(obj, JSObject::offsetOfGroup());
-  emitPreBarrier(*this, groupAddr);
-  storePtr(ImmGCPtr(group), groupAddr);
-}
-
-template <typename EmitPreBarrier>
 void MacroAssembler::storeObjShape(Register shape, Register obj,
                                    EmitPreBarrier emitPreBarrier) {
   MOZ_ASSERT(shape != obj);
diff -Nru firefox-84.0.2+build1/js/src/jit/MCallOptimize.cpp firefox-85.0+build1/js/src/jit/MCallOptimize.cpp
--- firefox-84.0.2+build1/js/src/jit/MCallOptimize.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MCallOptimize.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,4103 +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 "mozilla/Casting.h"
-
-#include "jsmath.h"
-
-#include "builtin/AtomicsObject.h"
-#include "builtin/DataViewObject.h"
-#include "builtin/MapObject.h"
-#include "builtin/String.h"
-#include "builtin/TestingFunctions.h"
-#include "jit/BaselineInspector.h"
-#include "jit/InlinableNatives.h"
-#include "jit/IonBuilder.h"
-#include "jit/JitRealm.h"
-#include "jit/Lowering.h"
-#include "jit/MIR.h"
-#include "jit/MIRGraph.h"
-#include "js/experimental/JitInfo.h"  // JSJitInfo
-#include "js/RegExpFlags.h"           // JS::RegExpFlag, JS::RegExpFlags
-#include "js/ScalarType.h"            // js::Scalar::Type
-#include "vm/ArgumentsObject.h"
-#include "vm/ArrayBufferObject.h"
-#include "vm/JSObject.h"
-#include "vm/PlainObject.h"  // js::PlainObject
-#include "vm/ProxyObject.h"
-#include "vm/SelfHosting.h"
-#include "vm/SharedArrayObject.h"
-#include "vm/TypedArrayObject.h"
-#include "wasm/WasmInstance.h"
-
-#include "jit/shared/Lowering-shared-inl.h"
-#include "vm/JSScript-inl.h"
-#include "vm/NativeObject-inl.h"
-#include "vm/StringObject-inl.h"
-
-using mozilla::ArrayLength;
-using mozilla::AssertedCast;
-using mozilla::Maybe;
-
-using JS::RegExpFlag;
-using JS::RegExpFlags;
-
-namespace js {
-namespace jit {
-
-IonBuilder::InliningResult IonBuilder::inlineNativeCall(CallInfo& callInfo,
-                                                        JSFunction* target) {
-  MOZ_ASSERT(target->isNative());
-
-  if (!optimizationInfo().inlineNative()) {
-    return InliningStatus_NotInlined;
-  }
-
-  bool isWasmCall = target->isWasmWithJitEntry();
-  if (!isWasmCall &&
-      (!target->hasJitInfo() ||
-       target->jitInfo()->type() != JSJitInfo::InlinableNative)) {
-    // Reaching here means we tried to inline a native for which there is no
-    // Ion specialization.
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't inline if we're constructing and new.target != callee. This can
-  // happen with Reflect.construct or derived class constructors.
-  if (callInfo.constructing() && callInfo.getNewTarget() != callInfo.callee()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (shouldAbortOnPreliminaryGroups(callInfo.thisArg())) {
-    return InliningStatus_NotInlined;
-  }
-  for (size_t i = 0; i < callInfo.argc(); i++) {
-    if (shouldAbortOnPreliminaryGroups(callInfo.getArg(i))) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  if (isWasmCall) {
-    return inlineWasmCall(callInfo, target);
-  }
-
-  InlinableNative inlNative = target->jitInfo()->inlinableNative;
-
-  if (target->realm() != script()->realm() &&
-      !CanInlineNativeCrossRealm(inlNative)) {
-    return InliningStatus_NotInlined;
-  }
-
-  switch (inlNative) {
-    // Array natives.
-    case InlinableNative::Array:
-      return inlineArray(callInfo, target->realm());
-    case InlinableNative::ArrayIsArray:
-      return inlineArrayIsArray(callInfo);
-    case InlinableNative::ArrayJoin:
-      return inlineArrayJoin(callInfo);
-    case InlinableNative::ArrayPop:
-      return inlineArrayPopShift(callInfo, MArrayPopShift::Pop);
-    case InlinableNative::ArrayShift:
-      return inlineArrayPopShift(callInfo, MArrayPopShift::Shift);
-    case InlinableNative::ArrayPush:
-      return inlineArrayPush(callInfo);
-    case InlinableNative::ArraySlice:
-      return inlineArraySlice(callInfo);
-
-    // Array intrinsics.
-    case InlinableNative::IntrinsicNewArrayIterator:
-      return inlineNewIterator(callInfo, MNewIterator::ArrayIterator);
-    case InlinableNative::IntrinsicArrayIteratorPrototypeOptimizable:
-      return inlineArrayIteratorPrototypeOptimizable(callInfo);
-
-    // Atomic natives.
-    case InlinableNative::AtomicsCompareExchange:
-      return inlineAtomicsCompareExchange(callInfo);
-    case InlinableNative::AtomicsExchange:
-      return inlineAtomicsExchange(callInfo);
-    case InlinableNative::AtomicsLoad:
-      return inlineAtomicsLoad(callInfo);
-    case InlinableNative::AtomicsStore:
-      return inlineAtomicsStore(callInfo);
-    case InlinableNative::AtomicsAdd:
-    case InlinableNative::AtomicsSub:
-    case InlinableNative::AtomicsAnd:
-    case InlinableNative::AtomicsOr:
-    case InlinableNative::AtomicsXor:
-      return inlineAtomicsBinop(callInfo, inlNative);
-    case InlinableNative::AtomicsIsLockFree:
-      return inlineAtomicsIsLockFree(callInfo);
-
-    // Boolean natives.
-    case InlinableNative::Boolean:
-      return inlineBoolean(callInfo);
-
-    // DataView natives.
-    case InlinableNative::DataViewGetInt8:
-      return inlineDataViewGet(callInfo, Scalar::Int8);
-    case InlinableNative::DataViewGetUint8:
-      return inlineDataViewGet(callInfo, Scalar::Uint8);
-    case InlinableNative::DataViewGetInt16:
-      return inlineDataViewGet(callInfo, Scalar::Int16);
-    case InlinableNative::DataViewGetUint16:
-      return inlineDataViewGet(callInfo, Scalar::Uint16);
-    case InlinableNative::DataViewGetInt32:
-      return inlineDataViewGet(callInfo, Scalar::Int32);
-    case InlinableNative::DataViewGetUint32:
-      return inlineDataViewGet(callInfo, Scalar::Uint32);
-    case InlinableNative::DataViewGetFloat32:
-      return inlineDataViewGet(callInfo, Scalar::Float32);
-    case InlinableNative::DataViewGetFloat64:
-      return inlineDataViewGet(callInfo, Scalar::Float64);
-    case InlinableNative::DataViewGetBigInt64:
-      return inlineDataViewGet(callInfo, Scalar::BigInt64);
-    case InlinableNative::DataViewGetBigUint64:
-      return inlineDataViewGet(callInfo, Scalar::BigUint64);
-    case InlinableNative::DataViewSetInt8:
-      return inlineDataViewSet(callInfo, Scalar::Int8);
-    case InlinableNative::DataViewSetUint8:
-      return inlineDataViewSet(callInfo, Scalar::Uint8);
-    case InlinableNative::DataViewSetInt16:
-      return inlineDataViewSet(callInfo, Scalar::Int16);
-    case InlinableNative::DataViewSetUint16:
-      return inlineDataViewSet(callInfo, Scalar::Uint16);
-    case InlinableNative::DataViewSetInt32:
-      return inlineDataViewSet(callInfo, Scalar::Int32);
-    case InlinableNative::DataViewSetUint32:
-      return inlineDataViewSet(callInfo, Scalar::Uint32);
-    case InlinableNative::DataViewSetFloat32:
-      return inlineDataViewSet(callInfo, Scalar::Float32);
-    case InlinableNative::DataViewSetFloat64:
-      return inlineDataViewSet(callInfo, Scalar::Float64);
-    case InlinableNative::DataViewSetBigInt64:
-      return inlineDataViewSet(callInfo, Scalar::BigInt64);
-    case InlinableNative::DataViewSetBigUint64:
-      return inlineDataViewSet(callInfo, Scalar::BigUint64);
-
-#ifdef JS_HAS_INTL_API
-    // Intl natives.
-    case InlinableNative::IntlGuardToCollator:
-    case InlinableNative::IntlGuardToDateTimeFormat:
-    case InlinableNative::IntlGuardToDisplayNames:
-    case InlinableNative::IntlGuardToListFormat:
-    case InlinableNative::IntlGuardToNumberFormat:
-    case InlinableNative::IntlGuardToPluralRules:
-    case InlinableNative::IntlGuardToRelativeTimeFormat:
-      return inlineGuardToClass(callInfo, inlNative);
-#else
-    case InlinableNative::IntlGuardToCollator:
-    case InlinableNative::IntlGuardToDateTimeFormat:
-    case InlinableNative::IntlGuardToDisplayNames:
-    case InlinableNative::IntlGuardToListFormat:
-    case InlinableNative::IntlGuardToNumberFormat:
-    case InlinableNative::IntlGuardToPluralRules:
-    case InlinableNative::IntlGuardToRelativeTimeFormat:
-      MOZ_CRASH("Intl API disabled");
-#endif
-
-    // Math natives.
-    case InlinableNative::MathAbs:
-      return inlineMathAbs(callInfo);
-    case InlinableNative::MathFloor:
-      return inlineMathFloor(callInfo);
-    case InlinableNative::MathCeil:
-      return inlineMathCeil(callInfo);
-    case InlinableNative::MathRound:
-      return inlineMathRound(callInfo);
-    case InlinableNative::MathClz32:
-      return inlineMathClz32(callInfo);
-    case InlinableNative::MathSqrt:
-      return inlineMathSqrt(callInfo);
-    case InlinableNative::MathATan2:
-      return inlineMathAtan2(callInfo);
-    case InlinableNative::MathHypot:
-      return inlineMathHypot(callInfo);
-    case InlinableNative::MathMax:
-      return inlineMathMinMax(callInfo, true /* max */);
-    case InlinableNative::MathMin:
-      return inlineMathMinMax(callInfo, false /* max */);
-    case InlinableNative::MathPow:
-      return inlineMathPow(callInfo);
-    case InlinableNative::MathRandom:
-      return inlineMathRandom(callInfo);
-    case InlinableNative::MathImul:
-      return inlineMathImul(callInfo);
-    case InlinableNative::MathFRound:
-      return inlineMathFRound(callInfo);
-    case InlinableNative::MathTrunc:
-      return inlineMathTrunc(callInfo);
-    case InlinableNative::MathSign:
-      return inlineMathSign(callInfo);
-    case InlinableNative::MathSin:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Sin);
-    case InlinableNative::MathTan:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Tan);
-    case InlinableNative::MathCos:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Cos);
-    case InlinableNative::MathExp:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Exp);
-    case InlinableNative::MathLog:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Log);
-    case InlinableNative::MathASin:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ASin);
-    case InlinableNative::MathATan:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ATan);
-    case InlinableNative::MathACos:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ACos);
-    case InlinableNative::MathLog10:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Log10);
-    case InlinableNative::MathLog2:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Log2);
-    case InlinableNative::MathLog1P:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Log1P);
-    case InlinableNative::MathExpM1:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ExpM1);
-    case InlinableNative::MathCosH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::CosH);
-    case InlinableNative::MathSinH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::SinH);
-    case InlinableNative::MathTanH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::TanH);
-    case InlinableNative::MathACosH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ACosH);
-    case InlinableNative::MathASinH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ASinH);
-    case InlinableNative::MathATanH:
-      return inlineMathFunction(callInfo, UnaryMathFunction::ATanH);
-    case InlinableNative::MathCbrt:
-      return inlineMathFunction(callInfo, UnaryMathFunction::Cbrt);
-
-    // Reflect natives.
-    case InlinableNative::ReflectGetPrototypeOf:
-      return inlineReflectGetPrototypeOf(callInfo);
-
-    // RegExp natives.
-    case InlinableNative::RegExpMatcher:
-      return inlineRegExpMatcher(callInfo);
-    case InlinableNative::RegExpSearcher:
-      return inlineRegExpSearcher(callInfo);
-    case InlinableNative::RegExpTester:
-      return inlineRegExpTester(callInfo);
-    case InlinableNative::IsRegExpObject:
-      return inlineIsRegExpObject(callInfo);
-    case InlinableNative::IsPossiblyWrappedRegExpObject:
-      return inlineIsPossiblyWrappedRegExpObject(callInfo);
-    case InlinableNative::RegExpPrototypeOptimizable:
-      return inlineRegExpPrototypeOptimizable(callInfo);
-    case InlinableNative::RegExpInstanceOptimizable:
-      return inlineRegExpInstanceOptimizable(callInfo);
-    case InlinableNative::GetFirstDollarIndex:
-      return inlineGetFirstDollarIndex(callInfo);
-    case InlinableNative::IntrinsicNewRegExpStringIterator:
-      return inlineNewIterator(callInfo, MNewIterator::RegExpStringIterator);
-
-    // String natives.
-    case InlinableNative::String:
-      return inlineStringObject(callInfo);
-    case InlinableNative::StringCharCodeAt:
-      return inlineStrCharCodeAt(callInfo);
-    case InlinableNative::StringFromCharCode:
-      return inlineStrFromCharCode(callInfo);
-    case InlinableNative::StringFromCodePoint:
-      return inlineStrFromCodePoint(callInfo);
-    case InlinableNative::StringCharAt:
-      return inlineStrCharAt(callInfo);
-    case InlinableNative::StringToLowerCase:
-      return inlineStringConvertCase(callInfo, MStringConvertCase::LowerCase);
-    case InlinableNative::StringToUpperCase:
-      return inlineStringConvertCase(callInfo, MStringConvertCase::UpperCase);
-
-    // String intrinsics.
-    case InlinableNative::IntrinsicStringReplaceString:
-      return inlineStringReplaceString(callInfo);
-    case InlinableNative::IntrinsicStringSplitString:
-      return inlineStringSplitString(callInfo);
-    case InlinableNative::IntrinsicNewStringIterator:
-      return inlineNewIterator(callInfo, MNewIterator::StringIterator);
-
-    // Object natives.
-    case InlinableNative::Object:
-      return inlineObject(callInfo);
-    case InlinableNative::ObjectCreate:
-      return inlineObjectCreate(callInfo);
-    case InlinableNative::ObjectIs:
-      return inlineObjectIs(callInfo);
-    case InlinableNative::ObjectIsPrototypeOf:
-      return inlineObjectIsPrototypeOf(callInfo);
-    case InlinableNative::ObjectToString:
-      return inlineObjectToString(callInfo);
-
-    // Testing functions.
-    case InlinableNative::TestBailout:
-      return inlineBailout(callInfo);
-    case InlinableNative::TestAssertFloat32:
-      return inlineAssertFloat32(callInfo);
-    case InlinableNative::TestAssertRecoveredOnBailout:
-      return inlineAssertRecoveredOnBailout(callInfo);
-
-    // Slot intrinsics.
-    case InlinableNative::IntrinsicUnsafeSetReservedSlot:
-      return inlineUnsafeSetReservedSlot(callInfo);
-    case InlinableNative::IntrinsicUnsafeGetReservedSlot:
-      return inlineUnsafeGetReservedSlot(callInfo, MIRType::Value);
-    case InlinableNative::IntrinsicUnsafeGetObjectFromReservedSlot:
-      return inlineUnsafeGetReservedSlot(callInfo, MIRType::Object);
-    case InlinableNative::IntrinsicUnsafeGetInt32FromReservedSlot:
-      return inlineUnsafeGetReservedSlot(callInfo, MIRType::Int32);
-    case InlinableNative::IntrinsicUnsafeGetStringFromReservedSlot:
-      return inlineUnsafeGetReservedSlot(callInfo, MIRType::String);
-    case InlinableNative::IntrinsicUnsafeGetBooleanFromReservedSlot:
-      return inlineUnsafeGetReservedSlot(callInfo, MIRType::Boolean);
-
-    // Utility intrinsics.
-    case InlinableNative::IntrinsicIsCallable:
-      return inlineIsCallable(callInfo);
-    case InlinableNative::IntrinsicIsConstructor:
-      return inlineIsConstructor(callInfo);
-    case InlinableNative::IntrinsicToObject:
-      return inlineToObject(callInfo);
-    case InlinableNative::IntrinsicIsObject:
-      return inlineIsObject(callInfo);
-    case InlinableNative::IntrinsicIsCrossRealmArrayConstructor:
-      return inlineIsCrossRealmArrayConstructor(callInfo);
-    case InlinableNative::IntrinsicToInteger:
-      return inlineToInteger(callInfo);
-    case InlinableNative::IntrinsicToLength:
-      return inlineToLength(callInfo);
-    case InlinableNative::IntrinsicIsConstructing:
-      return inlineIsConstructing(callInfo);
-    case InlinableNative::IntrinsicSubstringKernel:
-      return inlineSubstringKernel(callInfo);
-    case InlinableNative::IntrinsicGuardToArrayIterator:
-    case InlinableNative::IntrinsicGuardToMapIterator:
-    case InlinableNative::IntrinsicGuardToSetIterator:
-    case InlinableNative::IntrinsicGuardToStringIterator:
-    case InlinableNative::IntrinsicGuardToRegExpStringIterator:
-    case InlinableNative::IntrinsicGuardToWrapForValidIterator:
-    case InlinableNative::IntrinsicGuardToIteratorHelper:
-    case InlinableNative::IntrinsicGuardToAsyncIteratorHelper:
-      return inlineGuardToClass(callInfo, inlNative);
-    case InlinableNative::IntrinsicObjectHasPrototype:
-      return inlineObjectHasPrototype(callInfo);
-    case InlinableNative::IntrinsicFinishBoundFunctionInit:
-      return inlineFinishBoundFunctionInit(callInfo);
-    case InlinableNative::IntrinsicIsPackedArray:
-      return inlineIsPackedArray(callInfo);
-
-    // Map intrinsics.
-    case InlinableNative::IntrinsicGuardToMapObject:
-      return inlineGuardToClass(callInfo, inlNative);
-    case InlinableNative::IntrinsicGetNextMapEntryForIterator:
-      return inlineGetNextEntryForIterator(callInfo,
-                                           MGetNextEntryForIterator::Map);
-
-    // Set intrinsics.
-    case InlinableNative::IntrinsicGuardToSetObject:
-      return inlineGuardToClass(callInfo, inlNative);
-    case InlinableNative::IntrinsicGetNextSetEntryForIterator:
-      return inlineGetNextEntryForIterator(callInfo,
-                                           MGetNextEntryForIterator::Set);
-
-    // ArrayBuffer intrinsics.
-    case InlinableNative::IntrinsicGuardToArrayBuffer:
-      return inlineGuardToClass(callInfo, inlNative);
-    case InlinableNative::IntrinsicArrayBufferByteLength:
-      return inlineArrayBufferByteLength(callInfo);
-    case InlinableNative::IntrinsicPossiblyWrappedArrayBufferByteLength:
-      return inlinePossiblyWrappedArrayBufferByteLength(callInfo);
-
-    // SharedArrayBuffer intrinsics.
-    case InlinableNative::IntrinsicGuardToSharedArrayBuffer:
-      return inlineGuardToClass(callInfo, inlNative);
-
-    // TypedArray intrinsics.
-    case InlinableNative::TypedArrayConstructor:
-      return inlineTypedArray(callInfo, target->native());
-    case InlinableNative::IntrinsicIsTypedArrayConstructor:
-      return inlineIsTypedArrayConstructor(callInfo);
-    case InlinableNative::IntrinsicIsTypedArray:
-      return inlineIsTypedArray(callInfo);
-    case InlinableNative::IntrinsicIsPossiblyWrappedTypedArray:
-      return inlineIsPossiblyWrappedTypedArray(callInfo);
-    case InlinableNative::IntrinsicPossiblyWrappedTypedArrayLength:
-      return inlinePossiblyWrappedTypedArrayLength(callInfo);
-    case InlinableNative::IntrinsicTypedArrayLength:
-      return inlineTypedArrayLength(callInfo);
-    case InlinableNative::IntrinsicTypedArrayByteOffset:
-      return inlineTypedArrayByteOffset(callInfo);
-    case InlinableNative::IntrinsicTypedArrayElementShift:
-      return inlineTypedArrayElementShift(callInfo);
-
-    case InlinableNative::NumberToString:
-    case InlinableNative::StringToString:
-    case InlinableNative::StringValueOf:
-    case InlinableNative::IntrinsicIsSuspendedGenerator:
-      // Not supported in Ion.
-      return InliningStatus_NotInlined;
-
-    case InlinableNative::Limit:
-      break;
-  }
-
-  MOZ_CRASH("Shouldn't get here");
-}
-
-IonBuilder::InliningResult IonBuilder::inlineNativeGetter(CallInfo& callInfo,
-                                                          JSFunction* target) {
-  MOZ_ASSERT(target->isNative());
-  JSNative native = target->native();
-
-  if (!optimizationInfo().inlineNative()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* thisArg = callInfo.thisArg();
-  TemporaryTypeSet* thisTypes = thisArg->resultTypeSet();
-  MOZ_ASSERT(callInfo.argc() == 0);
-
-  if (!thisTypes) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Note: target might be a cross-realm native!
-
-  // Try to optimize typed array lengths.
-  if (TypedArrayObject::isOriginalLengthGetter(native)) {
-    if (thisTypes->forAllClasses(constraints(), IsTypedArrayClass) !=
-        TemporaryTypeSet::ForAllResult::ALL_TRUE) {
-      return InliningStatus_NotInlined;
-    }
-
-    MInstruction* length = addTypedArrayLength(thisArg);
-    current->push(length);
-    return InliningStatus_Inlined;
-  }
-
-  // Try to optimize typed array byteOffsets.
-  if (TypedArrayObject::isOriginalByteOffsetGetter(native)) {
-    if (thisTypes->forAllClasses(constraints(), IsTypedArrayClass) !=
-        TemporaryTypeSet::ForAllResult::ALL_TRUE) {
-      return InliningStatus_NotInlined;
-    }
-
-    MInstruction* byteOffset = addTypedArrayByteOffset(thisArg);
-    current->push(byteOffset);
-    return InliningStatus_Inlined;
-  }
-
-  // Try to optimize DataView byteLengths.
-  if (DataViewObject::isOriginalByteLengthGetter(native)) {
-    const JSClass* clasp = thisTypes->getKnownClass(constraints());
-    if (clasp != &DataViewObject::class_) {
-      return InliningStatus_NotInlined;
-    }
-
-    auto* length = MArrayBufferViewLength::New(alloc(), thisArg);
-    current->add(length);
-    current->push(length);
-    return InliningStatus_Inlined;
-  }
-
-  // Try to optimize DataView byteOffsets.
-  if (DataViewObject::isOriginalByteOffsetGetter(native)) {
-    const JSClass* clasp = thisTypes->getKnownClass(constraints());
-    if (clasp != &DataViewObject::class_) {
-      return InliningStatus_NotInlined;
-    }
-
-    auto* byteOffset = MArrayBufferViewByteOffset::New(alloc(), thisArg);
-    current->add(byteOffset);
-    current->push(byteOffset);
-    return InliningStatus_Inlined;
-  }
-
-  // Try to optimize RegExp getters.
-  RegExpFlags mask = RegExpFlag::NoFlags;
-  if (RegExpObject::isOriginalFlagGetter(native, &mask)) {
-    const JSClass* clasp = thisTypes->getKnownClass(constraints());
-    if (clasp != &RegExpObject::class_) {
-      return InliningStatus_NotInlined;
-    }
-
-    MLoadFixedSlot* flags =
-        MLoadFixedSlot::New(alloc(), thisArg, RegExpObject::flagsSlot());
-    current->add(flags);
-    flags->setResultType(MIRType::Int32);
-    MConstant* maskConst = MConstant::New(alloc(), Int32Value(mask.value()));
-    current->add(maskConst);
-    auto* maskedFlag = MBitAnd::New(alloc(), flags, maskConst, MIRType::Int32);
-    current->add(maskedFlag);
-
-    MDefinition* result = convertToBoolean(maskedFlag);
-    current->push(result);
-    return InliningStatus_Inlined;
-  }
-
-  return InliningStatus_NotInlined;
-}
-
-TemporaryTypeSet* IonBuilder::getInlineReturnTypeSet() {
-  return bytecodeTypes(pc);
-}
-
-MIRType IonBuilder::getInlineReturnType() {
-  TemporaryTypeSet* returnTypes = getInlineReturnTypeSet();
-  return returnTypes->getKnownMIRType();
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathFunction(
-    CallInfo& callInfo, UnaryMathFunction function) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (callInfo.argc() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-  if (!IsNumberType(callInfo.getArg(0)->type())) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.callee()->setImplicitlyUsedUnchecked();
-  callInfo.thisArg()->setImplicitlyUsedUnchecked();
-
-  MMathFunction* ins =
-      MMathFunction::New(alloc(), callInfo.getArg(0), function);
-  current->add(ins);
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArray(CallInfo& callInfo,
-                                                   Realm* targetRealm) {
-  uint32_t initLength = 0;
-
-  JSObject* templateObject =
-      inspector->getTemplateObjectForNative(pc, ArrayConstructor);
-  // This is shared by ArrayConstructor and array_construct (std_Array).
-  if (!templateObject) {
-    templateObject = inspector->getTemplateObjectForNative(pc, array_construct);
-  }
-
-  if (!templateObject) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (templateObject->nonCCWRealm() != targetRealm) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Multiple arguments imply array initialization, not just construction.
-  if (callInfo.argc() >= 2) {
-    initLength = callInfo.argc();
-
-    TypeSet::ObjectKey* key = TypeSet::ObjectKey::get(templateObject);
-    if (!key->unknownProperties()) {
-      HeapTypeSetKey elemTypes = key->property(JSID_VOID);
-
-      for (uint32_t i = 0; i < initLength; i++) {
-        MDefinition* value = callInfo.getArg(i);
-        if (!TypeSetIncludes(elemTypes.maybeTypes(), value->type(),
-                             value->resultTypeSet())) {
-          elemTypes.freeze(constraints());
-          return InliningStatus_NotInlined;
-        }
-      }
-    }
-  }
-
-  // A single integer argument denotes initial length.
-  if (callInfo.argc() == 1) {
-    MDefinition* arg = callInfo.getArg(0);
-    if (arg->type() != MIRType::Int32) {
-      return InliningStatus_NotInlined;
-    }
-
-    if (!arg->isConstant()) {
-      callInfo.setImplicitlyUsedUnchecked();
-      MNewArrayDynamicLength* ins = MNewArrayDynamicLength::New(
-          alloc(), constraints(), templateObject,
-          templateObject->group()->initialHeap(constraints()), arg);
-      current->add(ins);
-      current->push(ins);
-
-      // This may throw, so we need a resume point.
-      MOZ_TRY(resumeAfter(ins));
-
-      return InliningStatus_Inlined;
-    }
-
-    // Negative lengths generate a RangeError, unhandled by the inline path.
-    initLength = arg->toConstant()->toInt32();
-    if (initLength > NativeObject::MAX_DENSE_ELEMENTS_COUNT) {
-      return InliningStatus_NotInlined;
-    }
-    MOZ_ASSERT(initLength <= INT32_MAX);
-
-    // Make sure initLength matches the template object's length. This is
-    // not guaranteed to be the case, for instance if we're inlining the
-    // MConstant may come from an outer script.
-    if (initLength != templateObject->as<ArrayObject>().length()) {
-      return InliningStatus_NotInlined;
-    }
-
-    // Don't inline large allocations.
-    if (initLength > ArrayObject::EagerAllocationMaxLength) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MOZ_TRY(jsop_newarray(templateObject, initLength));
-
-  MNewArray* array = current->peek(-1)->toNewArray();
-  if (callInfo.argc() >= 2) {
-    for (uint32_t i = 0; i < initLength; i++) {
-      if (!alloc().ensureBallast()) {
-        return abort(AbortReason::Alloc);
-      }
-      MDefinition* value = callInfo.getArg(i);
-
-      MConstant* id = MConstant::New(alloc(), Int32Value(i));
-      current->add(id);
-
-      MOZ_TRY(initArrayElementFastPath(array, id, value,
-                                       /* addResumePoint = */ false));
-    }
-
-    MInstruction* setLength = setInitializedLength(array, initLength);
-    MOZ_TRY(resumeAfter(setLength));
-  }
-
-  return InliningStatus_Inlined;
-}
-
-static bool IsArrayClass(const JSClass* clasp) {
-  return clasp == &ArrayObject::class_;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayIsArray(CallInfo& callInfo) {
-  if (callInfo.constructing() || callInfo.argc() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-
-  if (!arg->mightBeType(MIRType::Object)) {
-    pushConstant(BooleanValue(false));
-    callInfo.setImplicitlyUsedUnchecked();
-    return InliningStatus_Inlined;
-  }
-
-  using ForAllResult = TemporaryTypeSet::ForAllResult;
-
-  TemporaryTypeSet* types = arg->resultTypeSet();
-
-  // Fast path for non-proxy objects.
-  if (arg->type() == MIRType::Object && types &&
-      types->forAllClasses(constraints(), IsProxyClass) ==
-          ForAllResult::ALL_FALSE) {
-    // Definitely not a proxy. Now check for the array classes.
-    ForAllResult result = types->forAllClasses(constraints(), IsArrayClass);
-
-    if (result == ForAllResult::ALL_FALSE || result == ForAllResult::ALL_TRUE) {
-      // Definitely an array or definitely not an array, so we can
-      // constant fold.
-      pushConstant(BooleanValue(result == ForAllResult::ALL_TRUE));
-      callInfo.setImplicitlyUsedUnchecked();
-      return InliningStatus_Inlined;
-    }
-
-    // We have some array classes and some non-array classes, so we have to
-    // check at runtime.
-    MOZ_ASSERT(result == ForAllResult::MIXED);
-
-    MHasClass* hasClass = MHasClass::New(alloc(), arg, &ArrayObject::class_);
-    current->add(hasClass);
-    current->push(hasClass);
-
-    callInfo.setImplicitlyUsedUnchecked();
-    return InliningStatus_Inlined;
-  }
-
-  // The value might be a primitive or a proxy. MIsArray handles these cases.
-  MIsArray* isArray = MIsArray::New(alloc(), arg);
-  current->add(isArray);
-  current->push(isArray);
-
-  MOZ_TRY(resumeAfter(isArray));
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayPopShift(
-    CallInfo& callInfo, MArrayPopShift::Mode mode) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  if (returnType == MIRType::Undefined || returnType == MIRType::Null) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.thisArg()->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Pop and shift are only handled for dense arrays that have never been
-  // used in an iterator: popping elements does not account for suppressing
-  // deleted properties in active iterators.
-  // Don't optimize shift if the array may be non-extensible (this matters
-  // when there are holes). Don't optimize pop if the array may be
-  // non-extensible, so we don't need to adjust the capacity for
-  // non-extensible arrays (non-extensible objects always have a capacity
-  // equal to their initialized length). We check this here because there's
-  // no non-extensible ObjectElements flag so we would need an extra guard
-  // on the BaseShape flags.
-  ObjectGroupFlags unhandledFlags =
-      OBJECT_FLAG_SPARSE_INDEXES | OBJECT_FLAG_LENGTH_OVERFLOW |
-      OBJECT_FLAG_ITERATED | OBJECT_FLAG_NON_EXTENSIBLE_ELEMENTS;
-
-  MDefinition* obj = callInfo.thisArg();
-  TemporaryTypeSet* thisTypes = obj->resultTypeSet();
-  if (!thisTypes) {
-    return InliningStatus_NotInlined;
-  }
-  const JSClass* clasp = thisTypes->getKnownClass(constraints());
-  if (clasp != &ArrayObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-  if (thisTypes->hasObjectFlags(constraints(), unhandledFlags)) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Watch out for extra indexed properties on the object or its prototype.
-  bool hasIndexedProperty;
-  MOZ_TRY_VAR(hasIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-  if (hasIndexedProperty) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  obj = addMaybeCopyElementsForWrite(obj, /* checkNative = */ false);
-
-  TemporaryTypeSet* returnTypes = getInlineReturnTypeSet();
-  bool needsHoleCheck =
-      thisTypes->hasObjectFlags(constraints(), OBJECT_FLAG_NON_PACKED);
-  bool maybeUndefined = returnTypes->hasType(TypeSet::UndefinedType());
-
-  BarrierKind barrier = PropertyReadNeedsTypeBarrier(
-      analysisContext, alloc(), constraints(), obj, nullptr, returnTypes);
-  if (barrier != BarrierKind::NoBarrier) {
-    returnType = MIRType::Value;
-  }
-
-  MArrayPopShift* ins =
-      MArrayPopShift::New(alloc(), obj, mode, needsHoleCheck, maybeUndefined);
-  current->add(ins);
-  current->push(ins);
-  ins->setResultType(returnType);
-
-  MOZ_TRY(resumeAfter(ins));
-  MOZ_TRY(pushTypeBarrier(ins, returnTypes, barrier));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayJoin(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.thisArg()->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.getArg(0)->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  // If we can confirm that the class is an array, the codegen
-  // for MArrayJoin can be notified to check for common empty and one-item
-  // arrays.
-  bool optimizeForArray = ([&]() {
-    TemporaryTypeSet* thisTypes = callInfo.thisArg()->resultTypeSet();
-    if (!thisTypes) {
-      return false;
-    }
-
-    const JSClass* clasp = thisTypes->getKnownClass(constraints());
-    if (clasp != &ArrayObject::class_) {
-      return false;
-    }
-
-    return true;
-  })();
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MArrayJoin* ins = MArrayJoin::New(alloc(), callInfo.thisArg(),
-                                    callInfo.getArg(0), optimizeForArray);
-
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayPush(CallInfo& callInfo) {
-  const uint32_t inlineArgsLimit = 10;
-  if (callInfo.argc() < 1 || callInfo.argc() > inlineArgsLimit ||
-      callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // XXX bug 1493903.
-  if (callInfo.argc() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.thisArg();
-  for (uint32_t i = 0; i < callInfo.argc(); i++) {
-    MDefinition* value = callInfo.getArg(i);
-    if (PropertyWriteNeedsTypeBarrier(alloc(), constraints(), current, &obj,
-                                      nullptr, &value,
-                                      /* canModify = */ false)) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-  if (obj->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* thisTypes = obj->resultTypeSet();
-  if (!thisTypes) {
-    return InliningStatus_NotInlined;
-  }
-  const JSClass* clasp = thisTypes->getKnownClass(constraints());
-  if (clasp != &ArrayObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  bool hasIndexedProperty;
-  MOZ_TRY_VAR(hasIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-  if (hasIndexedProperty) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet::DoubleConversion conversion =
-      thisTypes->convertDoubleElements(constraints());
-  if (conversion == TemporaryTypeSet::AmbiguousDoubleConversion) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  bool toDouble = conversion == TemporaryTypeSet::AlwaysConvertToDoubles ||
-                  conversion == TemporaryTypeSet::MaybeConvertToDoubles;
-
-  obj = addMaybeCopyElementsForWrite(obj, /* checkNative = */ false);
-
-  // If we have more than one argument, we are splitting the function into
-  // multiple inlined calls to Array.push.
-  //
-  // Still, in case of bailouts, we have to keep the atomicity of the call, as
-  // we cannot resume within Array.push function. To do so, we register a
-  // resume point which would be captured by the upcoming MArrayPush
-  // instructions, and this resume point contains an instruction which
-  // truncates the length of the Array, to its original length in case of
-  // bailouts, and resume before the Array.push call.
-  MResumePoint* lastRp = nullptr;
-  MInstruction* truncate = nullptr;
-  if (callInfo.argc() > 1) {
-    MInstruction* elements = MElements::New(alloc(), obj);
-    MInstruction* length = MArrayLength::New(alloc(), elements);
-    truncate = MSetArrayLength::New(alloc(), obj, length);
-    truncate->setRecoveredOnBailout();
-
-    current->add(elements);
-    current->add(length);
-    current->add(truncate);
-
-    // Restore the stack, such that resume points are created with the stack
-    // as it was before the call.
-    if (!callInfo.pushPriorCallStack(current)) {
-      return abort(AbortReason::Alloc);
-    }
-  }
-
-  MInstruction* ins = nullptr;
-  for (uint32_t i = 0; i < callInfo.argc(); i++) {
-    MDefinition* value = callInfo.getArg(i);
-    if (toDouble) {
-      MInstruction* valueDouble = MToDouble::New(alloc(), value);
-      current->add(valueDouble);
-      value = valueDouble;
-    }
-
-    if (needsPostBarrier(value)) {
-      MInstruction* elements = MElements::New(alloc(), obj);
-      current->add(elements);
-      MInstruction* initLength = MInitializedLength::New(alloc(), elements);
-      current->add(initLength);
-      current->add(
-          MPostWriteElementBarrier::New(alloc(), obj, value, initLength));
-    }
-
-    ins = MArrayPush::New(alloc(), obj, value);
-    current->add(ins);
-
-    if (callInfo.argc() > 1) {
-      // Restore that call stack and the array length.
-      MOZ_TRY(resumeAt(ins, pc));
-      ins->resumePoint()->addStore(alloc(), truncate, lastRp);
-      lastRp = ins->resumePoint();
-    }
-  }
-
-  if (callInfo.argc() > 1) {
-    // Fix the stack to represent the state after the call execution.
-    callInfo.popPriorCallStack(current);
-  }
-  current->push(ins);
-
-  if (callInfo.argc() > 1) {
-    ins = MNop::New(alloc());
-    current->add(ins);
-  }
-
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArraySlice(CallInfo& callInfo) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.thisArg();
-
-  // Ensure |this| and result are objects.
-  if (getInlineReturnType() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (obj->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Arguments for the sliced region must be integers.
-  if (callInfo.argc() > 0) {
-    if (callInfo.getArg(0)->type() != MIRType::Int32) {
-      return InliningStatus_NotInlined;
-    }
-    if (callInfo.argc() > 1) {
-      if (callInfo.getArg(1)->type() != MIRType::Int32) {
-        return InliningStatus_NotInlined;
-      }
-    }
-  }
-
-  // |this| must be a dense array.
-  TemporaryTypeSet* thisTypes = obj->resultTypeSet();
-  if (!thisTypes) {
-    return InliningStatus_NotInlined;
-  }
-
-  const JSClass* clasp = thisTypes->getKnownClass(constraints());
-  if (clasp != &ArrayObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Watch out for extra indexed properties on the object or its prototype.
-  bool hasIndexedProperty;
-  MOZ_TRY_VAR(hasIndexedProperty,
-              ElementAccessHasExtraIndexedProperty(this, obj));
-  if (hasIndexedProperty) {
-    return InliningStatus_NotInlined;
-  }
-
-  // The group of the result will be dynamically fixed up to match the input
-  // object, allowing us to handle 'this' objects that might have more than
-  // one group. Make sure that no singletons can be sliced here.
-  for (unsigned i = 0; i < thisTypes->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = thisTypes->getObject(i);
-    if (key && key->isSingleton()) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  // Inline the call.
-  JSObject* templateObj =
-      inspector->getTemplateObjectForNative(pc, js::array_slice);
-  if (!templateObj) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!templateObj->is<ArrayObject>()) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MDefinition* begin;
-  if (callInfo.argc() > 0) {
-    begin = callInfo.getArg(0);
-  } else {
-    begin = constant(Int32Value(0));
-  }
-
-  MDefinition* end;
-  if (callInfo.argc() > 1) {
-    end = callInfo.getArg(1);
-  } else if (clasp == &ArrayObject::class_) {
-    MElements* elements = MElements::New(alloc(), obj);
-    current->add(elements);
-
-    end = MArrayLength::New(alloc(), elements);
-    current->add(end->toInstruction());
-  }
-
-  MArraySlice* ins =
-      MArraySlice::New(alloc(), obj, begin, end, templateObj,
-                       templateObj->group()->initialHeap(constraints()));
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  MOZ_TRY(pushTypeBarrier(ins, getInlineReturnTypeSet(), BarrierKind::TypeSet));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineBoolean(CallInfo& callInfo) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  if (callInfo.argc() > 0) {
-    MDefinition* result = convertToBoolean(callInfo.getArg(0));
-    current->push(result);
-  } else {
-    pushConstant(BooleanValue(false));
-  }
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineNewIterator(
-    CallInfo& callInfo, MNewIterator::Type type) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 0);
-
-  JSObject* templateObject = nullptr;
-  switch (type) {
-    case MNewIterator::ArrayIterator:
-      templateObject = inspector->getTemplateObjectForNative(
-          pc, js::intrinsic_NewArrayIterator);
-      MOZ_ASSERT_IF(templateObject, templateObject->is<ArrayIteratorObject>());
-      break;
-    case MNewIterator::StringIterator:
-      templateObject = inspector->getTemplateObjectForNative(
-          pc, js::intrinsic_NewStringIterator);
-      MOZ_ASSERT_IF(templateObject, templateObject->is<StringIteratorObject>());
-      break;
-    case MNewIterator::RegExpStringIterator:
-      templateObject = inspector->getTemplateObjectForNative(
-          pc, js::intrinsic_NewRegExpStringIterator);
-      MOZ_ASSERT_IF(templateObject,
-                    templateObject->is<RegExpStringIteratorObject>());
-      break;
-  }
-
-  if (!templateObject) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  current->add(templateConst);
-
-  MNewIterator* ins =
-      MNewIterator::New(alloc(), constraints(), templateConst, type);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayIteratorPrototypeOptimizable(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 0);
-
-  if (!ensureArrayIteratorPrototypeNextNotModified()) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  pushConstant(BooleanValue(true));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathAbs(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  MIRType argType = callInfo.getArg(0)->type();
-  if (!IsNumberType(argType)) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Either argType == returnType, or
-  //        argType == Double or Float32, returnType == Int, or
-  //        argType == Float32, returnType == Double
-  if (argType != returnType &&
-      !(IsFloatingPointType(argType) && returnType == MIRType::Int32) &&
-      !(argType == MIRType::Float32 && returnType == MIRType::Double)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // If the arg is a Float32, we specialize the op as double, it will be
-  // specialized as float32 if necessary later.
-  MIRType absType = (argType == MIRType::Float32) ? MIRType::Double : argType;
-  MInstruction* ins = MAbs::New(alloc(), callInfo.getArg(0), absType);
-  current->add(ins);
-
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathFloor(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType = callInfo.getArg(0)->type();
-  MIRType returnType = getInlineReturnType();
-
-  // Math.floor(int(x)) == int(x)
-  if (argType == MIRType::Int32 && returnType == MIRType::Int32) {
-    callInfo.setImplicitlyUsedUnchecked();
-    // The int operand may be something which bails out if the actual value
-    // is not in the range of the result type of the MIR. We need to tell
-    // the optimizer to preserve this bailout even if the final result is
-    // fully truncated.
-    MLimitedTruncate* ins = MLimitedTruncate::New(
-        alloc(), callInfo.getArg(0), MDefinition::IndirectTruncate);
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  if (IsFloatingPointType(argType)) {
-    if (returnType == MIRType::Int32) {
-      callInfo.setImplicitlyUsedUnchecked();
-      MFloor* ins = MFloor::New(alloc(), callInfo.getArg(0));
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-
-    if (returnType == MIRType::Double) {
-      callInfo.setImplicitlyUsedUnchecked();
-
-      MInstruction* ins = nullptr;
-      if (MNearbyInt::HasAssemblerSupport(RoundingMode::Down)) {
-        ins = MNearbyInt::New(alloc(), callInfo.getArg(0), argType,
-                              RoundingMode::Down);
-      } else {
-        ins = MMathFunction::New(alloc(), callInfo.getArg(0),
-                                 UnaryMathFunction::Floor);
-      }
-
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-  }
-
-  return InliningStatus_NotInlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathCeil(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType = callInfo.getArg(0)->type();
-  MIRType returnType = getInlineReturnType();
-
-  // Math.ceil(int(x)) == int(x)
-  if (argType == MIRType::Int32 && returnType == MIRType::Int32) {
-    callInfo.setImplicitlyUsedUnchecked();
-    // The int operand may be something which bails out if the actual value
-    // is not in the range of the result type of the MIR. We need to tell
-    // the optimizer to preserve this bailout even if the final result is
-    // fully truncated.
-    MLimitedTruncate* ins = MLimitedTruncate::New(
-        alloc(), callInfo.getArg(0), MDefinition::IndirectTruncate);
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  if (IsFloatingPointType(argType)) {
-    if (returnType == MIRType::Int32) {
-      callInfo.setImplicitlyUsedUnchecked();
-      MCeil* ins = MCeil::New(alloc(), callInfo.getArg(0));
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-
-    if (returnType == MIRType::Double) {
-      callInfo.setImplicitlyUsedUnchecked();
-
-      MInstruction* ins = nullptr;
-      if (MNearbyInt::HasAssemblerSupport(RoundingMode::Up)) {
-        ins = MNearbyInt::New(alloc(), callInfo.getArg(0), argType,
-                              RoundingMode::Up);
-      } else {
-        ins = MMathFunction::New(alloc(), callInfo.getArg(0),
-                                 UnaryMathFunction::Ceil);
-      }
-
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-  }
-
-  return InliningStatus_NotInlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathClz32(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  if (returnType != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsNumberType(callInfo.getArg(0)->type())) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MClz* ins = MClz::New(alloc(), callInfo.getArg(0), MIRType::Int32);
-  current->add(ins);
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathRound(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  MIRType argType = callInfo.getArg(0)->type();
-
-  // Math.round(int(x)) == int(x)
-  if (argType == MIRType::Int32 && returnType == MIRType::Int32) {
-    callInfo.setImplicitlyUsedUnchecked();
-    // The int operand may be something which bails out if the actual value
-    // is not in the range of the result type of the MIR. We need to tell
-    // the optimizer to preserve this bailout even if the final result is
-    // fully truncated.
-    MLimitedTruncate* ins = MLimitedTruncate::New(
-        alloc(), callInfo.getArg(0), MDefinition::IndirectTruncate);
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  if (IsFloatingPointType(argType) && returnType == MIRType::Int32) {
-    callInfo.setImplicitlyUsedUnchecked();
-    MRound* ins = MRound::New(alloc(), callInfo.getArg(0));
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  if (IsFloatingPointType(argType) && returnType == MIRType::Double) {
-    callInfo.setImplicitlyUsedUnchecked();
-    MMathFunction* ins = MMathFunction::New(alloc(), callInfo.getArg(0),
-                                            UnaryMathFunction::Round);
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  return InliningStatus_NotInlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathSqrt(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType = callInfo.getArg(0)->type();
-  if (getInlineReturnType() != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-  if (!IsNumberType(argType)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MSqrt* sqrt = MSqrt::New(alloc(), callInfo.getArg(0), MIRType::Double);
-  current->add(sqrt);
-  current->push(sqrt);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathAtan2(CallInfo& callInfo) {
-  if (callInfo.argc() != 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType0 = callInfo.getArg(0)->type();
-  MIRType argType1 = callInfo.getArg(1)->type();
-
-  if (!IsNumberType(argType0) || !IsNumberType(argType1)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MAtan2* atan2 = MAtan2::New(alloc(), callInfo.getArg(0), callInfo.getArg(1));
-  current->add(atan2);
-  current->push(atan2);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathHypot(CallInfo& callInfo) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  uint32_t argc = callInfo.argc();
-  if (argc < 2 || argc > 4) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinitionVector vector(alloc());
-  if (!vector.reserve(argc)) {
-    return InliningStatus_NotInlined;
-  }
-
-  for (uint32_t i = 0; i < argc; ++i) {
-    MDefinition* arg = callInfo.getArg(i);
-    if (!IsNumberType(arg->type())) {
-      return InliningStatus_NotInlined;
-    }
-    vector.infallibleAppend(arg);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  MHypot* hypot = MHypot::New(alloc(), vector);
-
-  if (!hypot) {
-    return InliningStatus_NotInlined;
-  }
-
-  current->add(hypot);
-  current->push(hypot);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathPow(CallInfo& callInfo) {
-  if (callInfo.argc() != 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  bool emitted = false;
-  MOZ_TRY(powTrySpecialized(&emitted, callInfo.getArg(0), callInfo.getArg(1),
-                            getInlineReturnType()));
-
-  if (!emitted) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathRandom(CallInfo& callInfo) {
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  // MRandom JIT code directly accesses the RNG. It's (barely) possible to
-  // inline Math.random without it having been called yet, so ensure RNG
-  // state that isn't guaranteed to be initialized already.
-  script()->realm()->getOrCreateRandomNumberGenerator();
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MRandom* rand = MRandom::New(alloc());
-  current->add(rand);
-  current->push(rand);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathImul(CallInfo& callInfo) {
-  if (callInfo.argc() != 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  if (returnType != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsNumberType(callInfo.getArg(0)->type())) {
-    return InliningStatus_NotInlined;
-  }
-  if (!IsNumberType(callInfo.getArg(1)->type())) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* first = MTruncateToInt32::New(alloc(), callInfo.getArg(0));
-  current->add(first);
-
-  MInstruction* second = MTruncateToInt32::New(alloc(), callInfo.getArg(1));
-  current->add(second);
-
-  MMul* ins = MMul::New(alloc(), first, second, MIRType::Int32, MMul::Integer);
-  current->add(ins);
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathFRound(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // MIRType can't be Float32, as this point, as getInlineReturnType uses JSVal
-  // types to infer the returned MIR type.
-  TemporaryTypeSet* returned = getInlineReturnTypeSet();
-  if (returned->empty()) {
-    // As there's only one possible returned type, just add it to the observed
-    // returned typeset
-    returned->addType(TypeSet::DoubleType(), alloc_->lifoAlloc());
-  } else {
-    MIRType returnType = getInlineReturnType();
-    if (!IsNumberType(returnType)) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  MIRType arg = callInfo.getArg(0)->type();
-  if (!IsNumberType(arg)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MToFloat32* ins = MToFloat32::New(alloc(), callInfo.getArg(0));
-  current->add(ins);
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathTrunc(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType = callInfo.getArg(0)->type();
-  MIRType returnType = getInlineReturnType();
-
-  // Math.trunc(int(x)) == int(x)
-  if (argType == MIRType::Int32 && returnType == MIRType::Int32) {
-    callInfo.setImplicitlyUsedUnchecked();
-    // The int operand may be something which bails out if the actual value
-    // is not in the range of the result type of the MIR. We need to tell
-    // the optimizer to preserve this bailout even if the final result is
-    // fully truncated.
-    MLimitedTruncate* ins = MLimitedTruncate::New(
-        alloc(), callInfo.getArg(0), MDefinition::IndirectTruncate);
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  if (IsFloatingPointType(argType)) {
-    if (returnType == MIRType::Int32) {
-      callInfo.setImplicitlyUsedUnchecked();
-      MTrunc* ins = MTrunc::New(alloc(), callInfo.getArg(0));
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-
-    if (returnType == MIRType::Double) {
-      callInfo.setImplicitlyUsedUnchecked();
-
-      MInstruction* ins = nullptr;
-      if (MNearbyInt::HasAssemblerSupport(RoundingMode::TowardsZero)) {
-        ins = MNearbyInt::New(alloc(), callInfo.getArg(0), argType,
-                              RoundingMode::TowardsZero);
-      } else {
-        ins = MMathFunction::New(alloc(), callInfo.getArg(0),
-                                 UnaryMathFunction::Trunc);
-      }
-
-      current->add(ins);
-      current->push(ins);
-      return InliningStatus_Inlined;
-    }
-  }
-
-  return InliningStatus_NotInlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathSign(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType argType = callInfo.getArg(0)->type();
-  MIRType returnType = getInlineReturnType();
-
-  if (returnType != MIRType::Int32 && returnType != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsFloatingPointType(argType) &&
-      !(argType == MIRType::Int32 && returnType == MIRType::Int32)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* ins = MSign::New(alloc(), callInfo.getArg(0), returnType);
-  current->add(ins);
-  current->push(ins);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineMathMinMax(CallInfo& callInfo,
-                                                        bool max) {
-  if (callInfo.argc() < 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MIRType returnType = getInlineReturnType();
-  if (!IsNumberType(returnType)) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinitionVector int32_cases(alloc());
-  for (unsigned i = 0; i < callInfo.argc(); i++) {
-    MDefinition* arg = callInfo.getArg(i);
-
-    switch (arg->type()) {
-      case MIRType::Int32:
-        if (!int32_cases.append(arg)) {
-          return abort(AbortReason::Alloc);
-        }
-        break;
-      case MIRType::Double:
-      case MIRType::Float32:
-        // Don't force a double MMinMax for arguments that would be a NOP
-        // when doing an integer MMinMax.
-        if (arg->isConstant()) {
-          double cte = arg->toConstant()->numberToDouble();
-          // min(int32, cte >= INT32_MAX) = int32
-          if (cte >= INT32_MAX && !max) {
-            break;
-          }
-          // max(int32, cte <= INT32_MIN) = int32
-          if (cte <= INT32_MIN && max) {
-            break;
-          }
-        }
-
-        // Force double MMinMax if argument is a "effectfull" double.
-        returnType = MIRType::Double;
-        break;
-      default:
-        return InliningStatus_NotInlined;
-    }
-  }
-
-  if (int32_cases.length() == 0) {
-    returnType = MIRType::Double;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MDefinitionVector& cases =
-      (returnType == MIRType::Int32) ? int32_cases : callInfo.argv();
-
-  if (cases.length() == 1) {
-    MLimitedTruncate* limit =
-        MLimitedTruncate::New(alloc(), cases[0], MDefinition::NoTruncate);
-    current->add(limit);
-    current->push(limit);
-    return InliningStatus_Inlined;
-  }
-
-  // Chain N-1 MMinMax instructions to compute the MinMax.
-  MMinMax* last = MMinMax::New(alloc(), cases[0], cases[1], returnType, max);
-  current->add(last);
-
-  for (unsigned i = 2; i < cases.length(); i++) {
-    MMinMax* ins =
-        MMinMax::New(alloc().fallible(), last, cases[i], returnType, max);
-    if (!ins) {
-      return abort(AbortReason::Alloc);
-    }
-    current->add(ins);
-    last = ins;
-  }
-
-  current->push(last);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStringObject(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || !callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // ConvertToString doesn't support objects.
-  if (callInfo.getArg(0)->mightBeType(MIRType::Object)) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* templateObj =
-      inspector->getTemplateObjectForNative(pc, StringConstructor);
-  if (!templateObj) {
-    return InliningStatus_NotInlined;
-  }
-  MOZ_ASSERT(templateObj->is<StringObject>());
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MNewStringObject* ins =
-      MNewStringObject::New(alloc(), callInfo.getArg(0), templateObj);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStringSplitString(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 2);
-
-  MDefinition* strArg = callInfo.getArg(0);
-  MDefinition* sepArg = callInfo.getArg(1);
-
-  if (strArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (sepArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSContext* cx = TlsContext.get();
-  ObjectGroup* group = ObjectGroupRealm::getStringSplitStringGroup(cx);
-  if (!group) {
-    return InliningStatus_NotInlined;
-  }
-
-  TypeSet::ObjectKey* retKey = TypeSet::ObjectKey::get(group);
-  if (retKey->unknownProperties()) {
-    return InliningStatus_NotInlined;
-  }
-
-  HeapTypeSetKey key = retKey->property(JSID_VOID);
-  if (!key.maybeTypes()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!key.maybeTypes()->hasType(TypeSet::StringType())) {
-    key.freeze(constraints());
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  MStringSplit* ins =
-      MStringSplit::New(alloc(), constraints(), strArg, sepArg, group);
-  current->add(ins);
-  current->push(ins);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObjectHasPrototype(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 2);
-
-  MDefinition* objArg = callInfo.getArg(0);
-  MDefinition* protoArg = callInfo.getArg(1);
-
-  if (objArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (protoArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Inline only when both obj and proto are singleton objects and
-  // obj does not have uncacheable proto and obj.__proto__ is proto.
-  TemporaryTypeSet* objTypes = objArg->resultTypeSet();
-  if (!objTypes || objTypes->unknownObject() ||
-      objTypes->getObjectCount() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  TypeSet::ObjectKey* objKey = objTypes->getObject(0);
-  if (!objKey || !objKey->hasStableClassAndProto(constraints())) {
-    return InliningStatus_NotInlined;
-  }
-  if (!objKey->isSingleton() || !objKey->singleton()->is<NativeObject>()) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* obj = &objKey->singleton()->as<NativeObject>();
-  if (obj->hasUncacheableProto()) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* actualProto = checkNurseryObject(objKey->proto().toObjectOrNull());
-  if (actualProto == nullptr) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* protoTypes = protoArg->resultTypeSet();
-  if (!protoTypes || protoTypes->unknownObject() ||
-      protoTypes->getObjectCount() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  TypeSet::ObjectKey* protoKey = protoTypes->getObject(0);
-  if (!protoKey || !protoKey->hasStableClassAndProto(constraints())) {
-    return InliningStatus_NotInlined;
-  }
-  if (!protoKey->isSingleton() || !protoKey->singleton()->is<NativeObject>()) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* proto = &protoKey->singleton()->as<NativeObject>();
-  pushConstant(BooleanValue(proto == actualProto));
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineFinishBoundFunctionInit(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-  MOZ_ASSERT(BytecodeIsPopped(pc));
-
-  MDefinition* boundFunction = callInfo.getArg(0);
-  MDefinition* targetFunction = callInfo.getArg(1);
-  MDefinition* argCount = callInfo.getArg(2);
-
-  if (boundFunction->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (targetFunction->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (argCount->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* ins = MFinishBoundFunctionInit::New(alloc(), boundFunction,
-                                            targetFunction, argCount);
-  current->add(ins);
-
-  pushConstant(UndefinedValue());
-
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsPackedArray(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.getArg(0);
-
-  if (obj->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* ins = MIsPackedArray::New(alloc(), obj);
-  current->add(ins);
-  current->push(ins);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineReflectGetPrototypeOf(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* target = callInfo.getArg(0);
-  if (target->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* ins = MGetPrototypeOf::New(alloc(), target);
-  current->add(ins);
-  current->push(ins);
-
-  MOZ_TRY(resumeAfter(ins));
-  MOZ_TRY(pushTypeBarrier(ins, getInlineReturnTypeSet(), BarrierKind::TypeSet));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStrCharCodeAt(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.thisArg()->type() != MIRType::String &&
-      callInfo.thisArg()->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-  MIRType argType = callInfo.getArg(0)->type();
-  if (argType != MIRType::Int32 && argType != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* index = MToIntegerInt32::New(alloc(), callInfo.getArg(0));
-  current->add(index);
-
-  MStringLength* length = MStringLength::New(alloc(), callInfo.thisArg());
-  current->add(length);
-
-  index = addBoundsCheck(index, length);
-
-  MCharCodeAt* charCode = MCharCodeAt::New(alloc(), callInfo.thisArg(), index);
-  current->add(charCode);
-  current->push(charCode);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStrFromCharCode(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* codeUnit = callInfo.getArg(0);
-  if (codeUnit->type() != MIRType::Int32) {
-    // Don't try inline String.fromCharCode() for types which may lead to a
-    // bailout in MTruncateToInt32.
-    if (MTruncateToInt32::mightHaveSideEffects(codeUnit)) {
-      return InliningStatus_NotInlined;
-    }
-
-    codeUnit = MTruncateToInt32::New(alloc(), codeUnit);
-    current->add(codeUnit->toInstruction());
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MFromCharCode* string = MFromCharCode::New(alloc(), codeUnit);
-  current->add(string);
-  current->push(string);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStrFromCodePoint(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-  MIRType argType = callInfo.getArg(0)->type();
-  if (argType != MIRType::Int32 && argType != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* codePoint = MToNumberInt32::New(alloc(), callInfo.getArg(0));
-  current->add(codePoint);
-
-  MFromCodePoint* string = MFromCodePoint::New(alloc(), codePoint);
-  current->add(string);
-  current->push(string);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStrCharAt(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.thisArg()->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-  MIRType argType = callInfo.getArg(0)->type();
-  if (argType != MIRType::Int32 && argType != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* index = MToIntegerInt32::New(alloc(), callInfo.getArg(0));
-  current->add(index);
-
-  MStringLength* length = MStringLength::New(alloc(), callInfo.thisArg());
-  current->add(length);
-
-  index = addBoundsCheck(index, length);
-
-  // String.charAt(x) = String.fromCharCode(String.charCodeAt(x))
-  MCharCodeAt* charCode = MCharCodeAt::New(alloc(), callInfo.thisArg(), index);
-  current->add(charCode);
-
-  MFromCharCode* string = MFromCharCode::New(alloc(), charCode);
-  current->add(string);
-  current->push(string);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStringConvertCase(
-    CallInfo& callInfo, MStringConvertCase::Mode mode) {
-  if (callInfo.argc() != 0 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.thisArg()->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  auto* ins = MStringConvertCase::New(alloc(), callInfo.thisArg(), mode);
-  current->add(ins);
-  current->push(ins);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineRegExpMatcher(CallInfo& callInfo) {
-  // This is called from Self-hosted JS, after testing each argument,
-  // most of following tests should be passed.
-
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  MDefinition* rxArg = callInfo.getArg(0);
-  MDefinition* strArg = callInfo.getArg(1);
-  MDefinition* lastIndexArg = callInfo.getArg(2);
-
-  if (rxArg->type() != MIRType::Object && rxArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* rxTypes = rxArg->resultTypeSet();
-  const JSClass* clasp =
-      rxTypes ? rxTypes->getKnownClass(constraints()) : nullptr;
-  if (clasp != &RegExpObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (strArg->type() != MIRType::String && strArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (lastIndexArg->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSContext* cx = TlsContext.get();
-  if (!cx->realm()->jitRealm()->ensureRegExpMatcherStubExists(cx)) {
-    cx->clearPendingException();  // OOM or overrecursion.
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* matcher =
-      MRegExpMatcher::New(alloc(), rxArg, strArg, lastIndexArg);
-  current->add(matcher);
-  current->push(matcher);
-
-  MOZ_TRY(resumeAfter(matcher));
-  MOZ_TRY(
-      pushTypeBarrier(matcher, getInlineReturnTypeSet(), BarrierKind::TypeSet));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineRegExpSearcher(
-    CallInfo& callInfo) {
-  // This is called from Self-hosted JS, after testing each argument,
-  // most of following tests should be passed.
-
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  MDefinition* rxArg = callInfo.getArg(0);
-  MDefinition* strArg = callInfo.getArg(1);
-  MDefinition* lastIndexArg = callInfo.getArg(2);
-
-  if (rxArg->type() != MIRType::Object && rxArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* regexpTypes = rxArg->resultTypeSet();
-  const JSClass* clasp =
-      regexpTypes ? regexpTypes->getKnownClass(constraints()) : nullptr;
-  if (clasp != &RegExpObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (strArg->type() != MIRType::String && strArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (lastIndexArg->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSContext* cx = TlsContext.get();
-  if (!cx->realm()->jitRealm()->ensureRegExpSearcherStubExists(cx)) {
-    cx->clearPendingException();  // OOM or overrecursion.
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* searcher =
-      MRegExpSearcher::New(alloc(), rxArg, strArg, lastIndexArg);
-  current->add(searcher);
-  current->push(searcher);
-
-  MOZ_TRY(resumeAfter(searcher));
-  MOZ_TRY(pushTypeBarrier(searcher, getInlineReturnTypeSet(),
-                          BarrierKind::TypeSet));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineRegExpTester(CallInfo& callInfo) {
-  // This is called from Self-hosted JS, after testing each argument,
-  // most of following tests should be passed.
-
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  MDefinition* rxArg = callInfo.getArg(0);
-  MDefinition* strArg = callInfo.getArg(1);
-  MDefinition* lastIndexArg = callInfo.getArg(2);
-
-  if (rxArg->type() != MIRType::Object && rxArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* rxTypes = rxArg->resultTypeSet();
-  const JSClass* clasp =
-      rxTypes ? rxTypes->getKnownClass(constraints()) : nullptr;
-  if (clasp != &RegExpObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (strArg->type() != MIRType::String && strArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (lastIndexArg->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSContext* cx = TlsContext.get();
-  if (!cx->realm()->jitRealm()->ensureRegExpTesterStubExists(cx)) {
-    cx->clearPendingException();  // OOM or overrecursion.
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* tester =
-      MRegExpTester::New(alloc(), rxArg, strArg, lastIndexArg);
-  current->add(tester);
-  current->push(tester);
-
-  MOZ_TRY(resumeAfter(tester));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsRegExpObject(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-
-  bool isRegExpObjectKnown = false;
-  bool isRegExpObjectConstant;
-  if (arg->type() == MIRType::Object) {
-    TemporaryTypeSet* types = arg->resultTypeSet();
-    const JSClass* clasp =
-        types ? types->getKnownClass(constraints()) : nullptr;
-    if (clasp) {
-      isRegExpObjectKnown = true;
-      isRegExpObjectConstant = (clasp == &RegExpObject::class_);
-    }
-  } else if (!arg->mightBeType(MIRType::Object)) {
-    // NB: This case only happens when Phi-nodes flow into IsRegExpObject.
-    // IsRegExpObject itself will never be called with a non-Object value.
-    isRegExpObjectKnown = true;
-    isRegExpObjectConstant = false;
-  } else if (arg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (isRegExpObjectKnown) {
-    pushConstant(BooleanValue(isRegExpObjectConstant));
-  } else {
-    MHasClass* hasClass = MHasClass::New(alloc(), arg, &RegExpObject::class_);
-    current->add(hasClass);
-    current->push(hasClass);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsPossiblyWrappedRegExpObject(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-  if (arg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* types = arg->resultTypeSet();
-  if (!types) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't inline if the argument might be a wrapper.
-  if (types->forAllClasses(constraints(), IsProxyClass) !=
-      TemporaryTypeSet::ForAllResult::ALL_FALSE) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (const JSClass* clasp = types->getKnownClass(constraints())) {
-    pushConstant(BooleanValue(clasp == &RegExpObject::class_));
-  } else {
-    MHasClass* hasClass = MHasClass::New(alloc(), arg, &RegExpObject::class_);
-    current->add(hasClass);
-    current->push(hasClass);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineRegExpPrototypeOptimizable(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* protoArg = callInfo.getArg(0);
-
-  if (protoArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* opt = MRegExpPrototypeOptimizable::New(alloc(), protoArg);
-  current->add(opt);
-  current->push(opt);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineRegExpInstanceOptimizable(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 2);
-
-  MDefinition* rxArg = callInfo.getArg(0);
-  MDefinition* protoArg = callInfo.getArg(1);
-
-  if (rxArg->type() != MIRType::Object && rxArg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (protoArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* opt = MRegExpInstanceOptimizable::New(alloc(), rxArg, protoArg);
-  current->add(opt);
-  current->push(opt);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineGetFirstDollarIndex(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* strArg = callInfo.getArg(0);
-
-  if (strArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* ins = MGetFirstDollarIndex::New(alloc(), strArg);
-  current->add(ins);
-  current->push(ins);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineStringReplaceString(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* strArg = callInfo.getArg(0);
-  MDefinition* patArg = callInfo.getArg(1);
-  MDefinition* replArg = callInfo.getArg(2);
-
-  if (strArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (patArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (replArg->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* cte = MStringReplace::New(alloc(), strArg, patArg, replArg);
-  current->add(cte);
-  current->push(cte);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineSubstringKernel(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  // Return: String.
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Arg 0: String.
-  if (callInfo.getArg(0)->type() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Arg 1: Int.
-  if (callInfo.getArg(1)->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Arg 2: Int.
-  if (callInfo.getArg(2)->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MSubstr* substr = MSubstr::New(alloc(), callInfo.getArg(0),
-                                 callInfo.getArg(1), callInfo.getArg(2));
-  current->add(substr);
-  current->push(substr);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObject(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-  if (arg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  current->push(arg);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObjectCreate(CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* templateObject =
-      inspector->getTemplateObjectForNative(pc, obj_create);
-  if (!templateObject) {
-    return InliningStatus_NotInlined;
-  }
-
-  MOZ_ASSERT(templateObject->is<PlainObject>());
-  MOZ_ASSERT(!templateObject->isSingleton());
-
-  // Ensure the argument matches the template object's prototype.
-  MDefinition* arg = callInfo.getArg(0);
-  if (JSObject* proto = templateObject->staticPrototype()) {
-    if (IsInsideNursery(proto)) {
-      return InliningStatus_NotInlined;
-    }
-
-    TemporaryTypeSet* types = arg->resultTypeSet();
-    if (!types || types->maybeSingleton() != proto) {
-      return InliningStatus_NotInlined;
-    }
-
-    MOZ_ASSERT(types->getKnownMIRType() == MIRType::Object);
-  } else {
-    if (arg->type() != MIRType::Null) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  bool emitted = false;
-  MOZ_TRY(newObjectTryTemplateObject(&emitted, templateObject));
-
-  MOZ_ASSERT(emitted);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObjectIs(CallInfo& callInfo) {
-  if (callInfo.argc() < 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* left = callInfo.getArg(0);
-  MDefinition* right = callInfo.getArg(1);
-  MIRType leftType = left->type();
-  MIRType rightType = right->type();
-
-  auto mightBeFloatingPointType = [](MDefinition* def) {
-    return def->mightBeType(MIRType::Double) ||
-           def->mightBeType(MIRType::Float32);
-  };
-
-  bool strictEq;
-  bool incompatibleTypes = false;
-  if (leftType == rightType) {
-    // We can only compare the arguments with strict-equals semantics if
-    // they aren't floating-point types or values which might be floating-
-    // point types. Otherwise we need to use MSameValue.
-    strictEq = leftType != MIRType::Value ? !IsFloatingPointType(leftType)
-                                          : (!mightBeFloatingPointType(left) &&
-                                             !mightBeFloatingPointType(right));
-  } else if (leftType == MIRType::Value) {
-    // Also use strict-equals when comparing a value with a non-number or
-    // the value cannot be a floating-point type.
-    strictEq = !IsNumberType(rightType) || !mightBeFloatingPointType(left);
-  } else if (rightType == MIRType::Value) {
-    // Dual case to the previous one, only with reversed operands.
-    strictEq = !IsNumberType(leftType) || !mightBeFloatingPointType(right);
-  } else if (IsNumberType(leftType) && IsNumberType(rightType)) {
-    // Both arguments are numbers, but with different representations. We
-    // can't use strict-equals semantics to compare the operands, but
-    // instead need to use MSameValue.
-    strictEq = false;
-  } else {
-    incompatibleTypes = true;
-  }
-
-  if (incompatibleTypes) {
-    // The result is always |false| when comparing incompatible types.
-    pushConstant(BooleanValue(false));
-  } else if (strictEq) {
-    // Specialize |Object.is(lhs, rhs)| as |lhs === rhs|.
-    MOZ_TRY(jsop_compare(JSOp::StrictEq, left, right));
-  } else {
-    MSameValue* ins = MSameValue::New(alloc(), left, right);
-
-    // The more specific operand is expected to be in the rhs.
-    if (IsNumberType(leftType) && rightType == MIRType::Value) {
-      ins->swapOperands();
-    }
-
-    current->add(ins);
-    current->push(ins);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObjectIsPrototypeOf(
-    CallInfo& callInfo) {
-  if (callInfo.constructing() || callInfo.argc() != 1) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* thisArg = callInfo.thisArg();
-  if (thisArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-
-  auto* ins = MInstanceOf::New(alloc(), arg, thisArg);
-  current->add(ins);
-  current->push(ins);
-  MOZ_TRY(resumeAfter(ins));
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineObjectToString(
-    CallInfo& callInfo) {
-  if (callInfo.constructing() || callInfo.argc() != 0) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::String) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.thisArg();
-  if (arg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* types = arg->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't optimize if this might be a proxy.
-  using ForAllResult = TemporaryTypeSet::ForAllResult;
-  if (types->forAllClasses(constraints(), IsProxyClass) !=
-      ForAllResult::ALL_FALSE) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Make sure there's no Symbol.toStringTag property.
-  jsid toStringTag =
-      SYMBOL_TO_JSID(realm->runtime()->wellKnownSymbols().toStringTag);
-  bool res;
-  MOZ_TRY_VAR(res, testNotDefinedProperty(arg, toStringTag));
-  if (!res) {
-    return InliningStatus_NotInlined;
-  }
-
-  // At this point we know we're going to inline this.
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // Try to constant fold some common cases.
-  if (const JSClass* knownClass = types->getKnownClass(constraints())) {
-    if (knownClass == &PlainObject::class_) {
-      pushConstant(StringValue(names().objectObject));
-      return InliningStatus_Inlined;
-    }
-    if (IsArrayClass(knownClass)) {
-      pushConstant(StringValue(names().objectArray));
-      return InliningStatus_Inlined;
-    }
-    if (knownClass == &JSFunction::class_) {
-      pushConstant(StringValue(names().objectFunction));
-      return InliningStatus_Inlined;
-    }
-  }
-
-  MObjectClassToString* toString = MObjectClassToString::New(alloc(), arg);
-  current->add(toString);
-  current->push(toString);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineGuardToClass(
-    CallInfo& callInfo, InlinableNative native) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  const JSClass* clasp = InlinableNativeGuardToClass(native);
-
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* types = callInfo.getArg(0)->resultTypeSet();
-  const JSClass* knownClass =
-      types ? types->getKnownClass(constraints()) : nullptr;
-
-  if (knownClass && knownClass == clasp) {
-    current->push(callInfo.getArg(0));
-  } else {
-    MGuardToClass* guardToClass =
-        MGuardToClass::New(alloc(), callInfo.getArg(0), clasp);
-    current->add(guardToClass);
-    current->push(guardToClass);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineGetNextEntryForIterator(
-    CallInfo& callInfo, MGetNextEntryForIterator::Mode mode) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 2);
-
-  MDefinition* iterArg = callInfo.getArg(0);
-  MDefinition* resultArg = callInfo.getArg(1);
-
-  // Self-hosted code has already validated |iterArg| is a (possibly boxed)
-  // Map- or SetIterator object.
-  if (iterArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (resultArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* resultTypes = resultArg->resultTypeSet();
-  const JSClass* resultClasp =
-      resultTypes ? resultTypes->getKnownClass(constraints()) : nullptr;
-  if (resultClasp != &ArrayObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* next =
-      MGetNextEntryForIterator::New(alloc(), iterArg, resultArg, mode);
-  current->add(next);
-  current->push(next);
-
-  MOZ_TRY(resumeAfter(next));
-  return InliningStatus_Inlined;
-}
-
-static bool IsArrayBufferObject(CompilerConstraintList* constraints,
-                                MDefinition* def) {
-  MOZ_ASSERT(def->type() == MIRType::Object);
-
-  TemporaryTypeSet* types = def->resultTypeSet();
-  if (!types) {
-    return false;
-  }
-
-  return types->getKnownClass(constraints) == &ArrayBufferObject::class_;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineArrayBufferByteLength(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* objArg = callInfo.getArg(0);
-  if (objArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  MInstruction* ins = addArrayBufferByteLength(objArg);
-  current->push(ins);
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult
-IonBuilder::inlinePossiblyWrappedArrayBufferByteLength(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* objArg = callInfo.getArg(0);
-  if (objArg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsArrayBufferObject(constraints(), objArg)) {
-    return InliningStatus_NotInlined;
-  }
-
-  MInstruction* ins = addArrayBufferByteLength(objArg);
-  current->push(ins);
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineTypedArray(CallInfo& callInfo,
-                                                        Native native) {
-  if (!callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (getInlineReturnType() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.argc() == 0 || callInfo.argc() > 3) {
-    return InliningStatus_NotInlined;
-  }
-
-  JSObject* templateObject = inspector->getTemplateObjectForNative(pc, native);
-  if (!templateObject) {
-    return InliningStatus_NotInlined;
-  }
-  MOZ_ASSERT(templateObject->is<TypedArrayObject>());
-  TypedArrayObject* obj = &templateObject->as<TypedArrayObject>();
-
-  // Do not optimize when we see a template object with a singleton type,
-  // since it hits at most once.
-  if (templateObject->isSingleton()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-  MInstruction* ins;
-  if (arg->type() == MIRType::Int32) {
-    if (!arg->isConstant()) {
-      ins = MNewTypedArrayDynamicLength::New(
-          alloc(), constraints(), templateObject,
-          templateObject->group()->initialHeap(constraints()), arg);
-    } else {
-      // Negative lengths must throw a RangeError.  (We don't track that this
-      // might have previously thrown, when determining whether to inline, so we
-      // have to deal with this error case when inlining.)
-      int32_t providedLen = arg->maybeConstantValue()->toInt32();
-      if (providedLen <= 0) {
-        return InliningStatus_NotInlined;
-      }
-
-      uint32_t len = AssertedCast<uint32_t>(providedLen);
-      if (obj->length().get() != len) {
-        return InliningStatus_NotInlined;
-      }
-
-      MConstant* templateConst =
-          MConstant::NewConstraintlessObject(alloc(), obj);
-      current->add(templateConst);
-      ins = MNewTypedArray::New(alloc(), constraints(), templateConst,
-                                obj->group()->initialHeap(constraints()));
-    }
-  } else if (arg->type() == MIRType::Object) {
-    TemporaryTypeSet* types = arg->resultTypeSet();
-    if (!types) {
-      return InliningStatus_NotInlined;
-    }
-
-    // Don't inline if the argument might be a wrapper.
-    if (types->forAllClasses(constraints(), IsProxyClass) !=
-        TemporaryTypeSet::ForAllResult::ALL_FALSE) {
-      return InliningStatus_NotInlined;
-    }
-
-    // Don't inline if we saw mixed use of (Shared)ArrayBuffers and other
-    // objects.
-    auto IsArrayBufferMaybeSharedClass = [](const JSClass* clasp) {
-      return clasp == &ArrayBufferObject::class_ ||
-             clasp == &SharedArrayBufferObject::class_;
-    };
-    switch (
-        types->forAllClasses(constraints(), IsArrayBufferMaybeSharedClass)) {
-      case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-        ins = MNewTypedArrayFromArray::New(
-            alloc(), constraints(), templateObject,
-            templateObject->group()->initialHeap(constraints()), arg);
-        break;
-      case TemporaryTypeSet::ForAllResult::ALL_TRUE:
-        MDefinition* byteOffset;
-        if (callInfo.argc() > 1) {
-          byteOffset = callInfo.getArg(1);
-        } else {
-          byteOffset = constant(UndefinedValue());
-        }
-
-        MDefinition* length;
-        if (callInfo.argc() > 2) {
-          length = callInfo.getArg(2);
-        } else {
-          length = constant(UndefinedValue());
-        }
-
-        ins = MNewTypedArrayFromArrayBuffer::New(
-            alloc(), constraints(), templateObject,
-            templateObject->group()->initialHeap(constraints()), arg,
-            byteOffset, length);
-        break;
-      case TemporaryTypeSet::ForAllResult::EMPTY:
-      case TemporaryTypeSet::ForAllResult::MIXED:
-        return InliningStatus_NotInlined;
-    }
-  } else {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  current->add(ins);
-  current->push(ins);
-  MOZ_TRY(resumeAfter(ins));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsTypedArrayConstructor(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Try inlining with a constant if the argument is definitely a TypedArray
-  // constructor.
-  TemporaryTypeSet* types = callInfo.getArg(0)->resultTypeSet();
-  if (!types || types->unknownObject() || types->getObjectCount() == 0) {
-    return InliningStatus_NotInlined;
-  }
-  for (unsigned i = 0; i < types->getObjectCount(); i++) {
-    JSObject* singleton = types->getSingleton(i);
-    if (!singleton || !IsTypedArrayConstructor(singleton)) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  pushConstant(BooleanValue(true));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsTypedArrayHelper(
-    CallInfo& callInfo, WrappingBehavior wrappingBehavior) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  // The test is elaborate: in-line only if there is exact
-  // information.
-
-  TemporaryTypeSet* types = callInfo.getArg(0)->resultTypeSet();
-  if (!types) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Wrapped typed arrays won't appear to be typed arrays per a
-  // |forAllClasses| query.  If wrapped typed arrays are to be considered
-  // typed arrays, a negative answer is not conclusive.
-  auto isPossiblyWrapped = [this, wrappingBehavior, types]() {
-    if (wrappingBehavior != AllowWrappedTypedArrays) {
-      return false;
-    }
-
-    switch (types->forAllClasses(constraints(), IsProxyClass)) {
-      case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-      case TemporaryTypeSet::ForAllResult::EMPTY:
-        break;
-      case TemporaryTypeSet::ForAllResult::ALL_TRUE:
-      case TemporaryTypeSet::ForAllResult::MIXED:
-        return true;
-    }
-    return false;
-  };
-
-  bool result = false;
-  bool isConstant = true;
-  bool possiblyWrapped = false;
-  switch (types->forAllClasses(constraints(), IsTypedArrayClass)) {
-    case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-      if (isPossiblyWrapped()) {
-        // Don't inline if we never saw typed arrays, but always only proxies.
-        return InliningStatus_NotInlined;
-      }
-
-      [[fallthrough]];
-
-    case TemporaryTypeSet::ForAllResult::EMPTY:
-      result = false;
-      break;
-
-    case TemporaryTypeSet::ForAllResult::ALL_TRUE:
-      result = true;
-      break;
-
-    case TemporaryTypeSet::ForAllResult::MIXED:
-      isConstant = false;
-      possiblyWrapped = isPossiblyWrapped();
-      break;
-  }
-
-  if (isConstant) {
-    pushConstant(BooleanValue(result));
-  } else {
-    auto* ins =
-        MIsTypedArray::New(alloc(), callInfo.getArg(0), possiblyWrapped);
-    current->add(ins);
-    current->push(ins);
-
-    if (possiblyWrapped) {
-      MOZ_TRY(resumeAfter(ins));
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsTypedArray(CallInfo& callInfo) {
-  return inlineIsTypedArrayHelper(callInfo, RejectWrappedTypedArrays);
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsPossiblyWrappedTypedArray(
-    CallInfo& callInfo) {
-  return inlineIsTypedArrayHelper(callInfo, AllowWrappedTypedArrays);
-}
-
-static bool IsTypedArrayObject(CompilerConstraintList* constraints,
-                               MDefinition* def) {
-  MOZ_ASSERT(def->type() == MIRType::Object);
-
-  TemporaryTypeSet* types = def->resultTypeSet();
-  if (!types) {
-    return false;
-  }
-
-  return types->forAllClasses(constraints, IsTypedArrayClass) ==
-         TemporaryTypeSet::ForAllResult::ALL_TRUE;
-}
-
-IonBuilder::InliningResult IonBuilder::inlinePossiblyWrappedTypedArrayLength(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsTypedArrayObject(constraints(), callInfo.getArg(0))) {
-    return InliningStatus_NotInlined;
-  }
-
-  MInstruction* length = addTypedArrayLength(callInfo.getArg(0));
-  current->push(length);
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineTypedArrayLength(
-    CallInfo& callInfo) {
-  return inlinePossiblyWrappedTypedArrayLength(callInfo);
-}
-
-IonBuilder::InliningResult IonBuilder::inlineTypedArrayByteOffset(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsTypedArrayObject(constraints(), callInfo.getArg(0))) {
-    return InliningStatus_NotInlined;
-  }
-
-  MInstruction* byteOffset = addTypedArrayByteOffset(callInfo.getArg(0));
-  current->push(byteOffset);
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineTypedArrayElementShift(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-  if (getInlineReturnType() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (!IsTypedArrayObject(constraints(), callInfo.getArg(0))) {
-    return InliningStatus_NotInlined;
-  }
-
-  auto* ins = MTypedArrayElementShift::New(alloc(), callInfo.getArg(0));
-  current->add(ins);
-  current->push(ins);
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineUnsafeSetReservedSlot(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 3);
-
-  if (getInlineReturnType() != MIRType::Undefined) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.getArg(0);
-  if (obj->type() != MIRType::Object && obj->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(1);
-  if (arg->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't inline if we don't have a constant slot.
-  if (!arg->isConstant()) {
-    return InliningStatus_NotInlined;
-  }
-  uint32_t slot = uint32_t(arg->toConstant()->toInt32());
-
-  // Don't inline if it's not a fixed slot.
-  if (slot >= NativeObject::MAX_FIXED_SLOTS) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MStoreFixedSlot* store =
-      MStoreFixedSlot::NewBarriered(alloc(), obj, slot, callInfo.getArg(2));
-  current->add(store);
-  current->push(store);
-
-  if (needsPostBarrier(callInfo.getArg(2))) {
-    current->add(MPostWriteBarrier::New(alloc(), obj, callInfo.getArg(2)));
-  }
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineUnsafeGetReservedSlot(
-    CallInfo& callInfo, MIRType knownValueType) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 2);
-
-  MDefinition* obj = callInfo.getArg(0);
-  if (obj->type() != MIRType::Object && obj->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(1);
-  if (arg->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't inline if we don't have a constant slot.
-  if (!arg->isConstant()) {
-    return InliningStatus_NotInlined;
-  }
-  uint32_t slot = uint32_t(arg->toConstant()->toInt32());
-
-  // Don't inline if it's not a fixed slot.
-  if (slot >= NativeObject::MAX_FIXED_SLOTS) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MLoadFixedSlot* load = MLoadFixedSlot::New(alloc(), obj, slot);
-  current->add(load);
-  current->push(load);
-  if (knownValueType != MIRType::Value) {
-    // We know what type we have in this slot.  Assert that this is in fact
-    // what we've seen coming from this slot in the past, then tell the
-    // MLoadFixedSlot about its result type.  That will make us do an
-    // infallible unbox as part of the slot load and then we'll barrier on
-    // the unbox result.  That way the type barrier code won't end up doing
-    // MIRType checks and conditional unboxing.
-    MOZ_ASSERT_IF(!getInlineReturnTypeSet()->empty(),
-                  getInlineReturnType() == knownValueType);
-    load->setResultType(knownValueType);
-  }
-
-  // We don't track reserved slot types, so always emit a barrier.
-  MOZ_TRY(
-      pushTypeBarrier(load, getInlineReturnTypeSet(), BarrierKind::TypeSet));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsCallable(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* arg = callInfo.getArg(0);
-
-  // Try inlining with constant true/false: only objects may be callable at
-  // all, and if we know the class check if it is callable.
-  bool isCallableKnown = false;
-  bool isCallableConstant;
-  if (arg->type() == MIRType::Object) {
-    TemporaryTypeSet* types = arg->resultTypeSet();
-    const JSClass* clasp =
-        types ? types->getKnownClass(constraints()) : nullptr;
-    if (clasp && !clasp->isProxy()) {
-      isCallableKnown = true;
-      isCallableConstant = clasp->nonProxyCallable();
-    }
-  } else if (!arg->mightBeType(MIRType::Object)) {
-    // Primitive (including undefined and null).
-    isCallableKnown = true;
-    isCallableConstant = false;
-  } else if (arg->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  if (isCallableKnown) {
-    MConstant* constant =
-        MConstant::New(alloc(), BooleanValue(isCallableConstant));
-    current->add(constant);
-    current->push(constant);
-    return InliningStatus_Inlined;
-  }
-
-  MIsCallable* isCallable = MIsCallable::New(alloc(), arg);
-  current->add(isCallable);
-  current->push(isCallable);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsConstructor(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MIsConstructor* ins = MIsConstructor::New(alloc(), callInfo.getArg(0));
-  current->add(ins);
-  current->push(ins);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsObject(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  if (callInfo.getArg(0)->type() == MIRType::Object) {
-    pushConstant(BooleanValue(true));
-  } else {
-    MIsObject* isObject = MIsObject::New(alloc(), callInfo.getArg(0));
-    current->add(isObject);
-    current->push(isObject);
-  }
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineToObject(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* object = callInfo.getArg(0);
-  if (object->type() != MIRType::Object && object->type() != MIRType::Value) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // If we know the input type is an object, nop ToObject.
-  if (object->type() == MIRType::Object) {
-    current->push(object);
-  } else {
-    auto* ins = MToObject::New(alloc(), object);
-    current->add(ins);
-    current->push(ins);
-
-    MOZ_TRY(resumeAfter(ins));
-    MOZ_TRY(
-        pushTypeBarrier(ins, getInlineReturnTypeSet(), BarrierKind::TypeSet));
-  }
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsCrossRealmArrayConstructor(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-  MDefinition* arg = callInfo.getArg(0);
-  if (arg->type() != MIRType::Object) {
-    return InliningStatus_NotInlined;
-  }
-
-  TemporaryTypeSet* types = arg->resultTypeSet();
-  Realm* realm = types->getKnownRealm(constraints());
-  if (!realm || realm != script()->realm()) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // Inline only if argument is absolutely *not* a wrapper or a cross-realm
-  // object.
-  pushConstant(BooleanValue(false));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineToInteger(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* input = callInfo.getArg(0);
-
-  // Only optimize cases where |input| contains only number, null, undefined, or
-  // boolean.
-  if (!input->definitelyType({MIRType::Int32, MIRType::Double, MIRType::Float32,
-                              MIRType::Null, MIRType::Undefined,
-                              MIRType::Boolean})) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Only optimize cases where the output is int32 or double.
-  MIRType returnType = getInlineReturnType();
-  if (returnType != MIRType::Int32 && returnType != MIRType::Double) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (returnType == MIRType::Int32) {
-    auto* toInt32 = MToIntegerInt32::New(alloc(), input);
-    current->add(toInt32);
-    current->push(toInt32);
-  } else {
-    MInstruction* ins;
-    if (MNearbyInt::HasAssemblerSupport(RoundingMode::TowardsZero)) {
-      ins = MNearbyInt::New(alloc(), input, MIRType::Double,
-                            RoundingMode::TowardsZero);
-    } else {
-      ins = MMathFunction::New(alloc(), input, UnaryMathFunction::Trunc);
-    }
-    current->add(ins);
-
-    auto* nanToZero = MNaNToZero::New(alloc(), ins);
-    current->add(nanToZero);
-    current->push(nanToZero);
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineToLength(CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 1);
-
-  MDefinition* input = callInfo.getArg(0);
-
-  // Optimize int32 => number.
-  if (input->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-  if (!IsNumberType(getInlineReturnType())) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // ToLength(int32) is equivalent to max(int32, 0).
-  bool isMax = true;
-  MDefinition* constZero = constant(Int32Value(0));
-  MMinMax* max = MMinMax::New(alloc(), input, constZero, MIRType::Int32, isMax);
-  current->add(max);
-  current->push(max);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineBailout(CallInfo& callInfo) {
-  callInfo.setImplicitlyUsedUnchecked();
-
-  current->add(MBail::New(alloc()));
-
-  MConstant* undefined = MConstant::New(alloc(), UndefinedValue());
-  current->add(undefined);
-  current->push(undefined);
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAssertFloat32(CallInfo& callInfo) {
-  if (callInfo.argc() != 2) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* secondArg = callInfo.getArg(1);
-
-  MOZ_ASSERT(secondArg->type() == MIRType::Boolean);
-  MOZ_ASSERT(secondArg->isConstant());
-
-  bool mustBeFloat32 = secondArg->toConstant()->toBoolean();
-  current->add(MAssertFloat32::New(alloc(), callInfo.getArg(0), mustBeFloat32));
-
-  MConstant* undefined = MConstant::New(alloc(), UndefinedValue());
-  current->add(undefined);
-  current->push(undefined);
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAssertRecoveredOnBailout(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 2) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Don't assert for recovered instructions when recovering is disabled.
-  if (JitOptions.disableRecoverIns) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (JitOptions.checkRangeAnalysis) {
-    // If we are checking the range of all instructions, then the guards
-    // inserted by Range Analysis prevent the use of recover
-    // instruction. Thus, we just disable these checks.
-    current->push(constant(UndefinedValue()));
-    callInfo.setImplicitlyUsedUnchecked();
-    return InliningStatus_Inlined;
-  }
-
-  MDefinition* secondArg = callInfo.getArg(1);
-
-  MOZ_ASSERT(secondArg->type() == MIRType::Boolean);
-  MOZ_ASSERT(secondArg->isConstant());
-
-  bool mustBeRecovered = secondArg->toConstant()->toBoolean();
-  MAssertRecoveredOnBailout* assert = MAssertRecoveredOnBailout::New(
-      alloc(), callInfo.getArg(0), mustBeRecovered);
-  current->add(assert);
-  current->push(assert);
-
-  // Create an instruction sequence which implies that the argument of the
-  // assertRecoveredOnBailout function would be encoded at least in one
-  // Snapshot.
-  MNop* nop = MNop::New(alloc());
-  current->add(nop);
-  MOZ_TRY(resumeAfter(nop));
-  current->add(MEncodeSnapshot::New(alloc()));
-
-  current->pop();
-  current->push(constant(UndefinedValue()));
-  callInfo.setImplicitlyUsedUnchecked();
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsCompareExchange(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 4 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // These guards are desirable here and in subsequent atomics to
-  // avoid bad bailouts with MTruncateToInt32, see
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1141986#c20.
-  MDefinition* oldval = callInfo.getArg(2);
-  if (MTruncateToInt32::mightHaveSideEffects(oldval)) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* newval = callInfo.getArg(3);
-  if (MTruncateToInt32::mightHaveSideEffects(newval)) {
-    return InliningStatus_NotInlined;
-  }
-
-  Scalar::Type arrayType;
-  TemporaryTypeSet::TypedArraySharedness sharedness;
-  if (!atomicsMeetsPreconditions(callInfo, &arrayType, &sharedness)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* elements;
-  MDefinition* index;
-  atomicsCheckBounds(callInfo, &elements, &index);
-
-  MCompareExchangeTypedArrayElement* cas =
-      MCompareExchangeTypedArrayElement::New(alloc(), elements, index,
-                                             arrayType, oldval, newval);
-  cas->setResultType(getInlineReturnType());
-  current->add(cas);
-  current->push(cas);
-
-  MOZ_TRY(resumeAfter(cas));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsExchange(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 3 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* value = callInfo.getArg(2);
-  if (MTruncateToInt32::mightHaveSideEffects(value)) {
-    return InliningStatus_NotInlined;
-  }
-
-  Scalar::Type arrayType;
-  TemporaryTypeSet::TypedArraySharedness sharedness;
-  if (!atomicsMeetsPreconditions(callInfo, &arrayType, &sharedness)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* elements;
-  MDefinition* index;
-  atomicsCheckBounds(callInfo, &elements, &index);
-
-  MInstruction* exchange = MAtomicExchangeTypedArrayElement::New(
-      alloc(), elements, index, value, arrayType);
-  exchange->setResultType(getInlineReturnType());
-  current->add(exchange);
-  current->push(exchange);
-
-  MOZ_TRY(resumeAfter(exchange));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsLoad(CallInfo& callInfo) {
-  if (callInfo.argc() != 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  Scalar::Type arrayType;
-  TemporaryTypeSet::TypedArraySharedness sharedness;
-  if (!atomicsMeetsPreconditions(callInfo, &arrayType, &sharedness)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* elements;
-  MDefinition* index;
-  atomicsCheckBounds(callInfo, &elements, &index);
-
-  MemoryBarrierRequirement barrier = DoesRequireMemoryBarrier;
-  if (sharedness == TemporaryTypeSet::KnownUnshared) {
-    barrier = DoesNotRequireMemoryBarrier;
-  }
-
-  auto* load =
-      MLoadUnboxedScalar::New(alloc(), elements, index, arrayType, barrier);
-  load->setResultType(getInlineReturnType());
-  current->add(load);
-  current->push(load);
-
-  // Loads are considered effectful (if they execute a memory barrier).
-  if (barrier == DoesRequireMemoryBarrier) {
-    MOZ_TRY(resumeAfter(load));
-  }
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsStore(CallInfo& callInfo) {
-  if (callInfo.argc() != 3 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Atomics.store() is annoying because it returns the result of converting
-  // the value by ToInteger(), not the input value, nor the result of
-  // converting the value by ToInt32().  It is especially annoying because
-  // almost nobody uses the result value.
-  //
-  // As an expedient compromise, therefore, we inline only if the result is
-  // obviously unused or if the argument is already Int32 and thus requires no
-  // conversion.
-
-  MDefinition* value = callInfo.getArg(2);
-  if (!BytecodeIsPopped(pc) && value->type() != MIRType::Int32) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (MTruncateToInt32::mightHaveSideEffects(value)) {
-    return InliningStatus_NotInlined;
-  }
-
-  Scalar::Type arrayType;
-  TemporaryTypeSet::TypedArraySharedness sharedness;
-  if (!atomicsMeetsPreconditions(callInfo, &arrayType, &sharedness,
-                                 DontCheckAtomicResult)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* elements;
-  MDefinition* index;
-  atomicsCheckBounds(callInfo, &elements, &index);
-
-  MemoryBarrierRequirement barrier = DoesRequireMemoryBarrier;
-  if (sharedness == TemporaryTypeSet::KnownUnshared) {
-    barrier = DoesNotRequireMemoryBarrier;
-  }
-
-  MDefinition* toWrite = value;
-  if (toWrite->type() != MIRType::Int32) {
-    toWrite = MTruncateToInt32::New(alloc(), toWrite);
-    current->add(toWrite->toInstruction());
-  }
-  auto* store = MStoreUnboxedScalar::New(alloc(), elements, index, toWrite,
-                                         arrayType, barrier);
-  current->add(store);
-  current->push(value);  // Either Int32 or not used; in either case correct
-
-  MOZ_TRY(resumeAfter(store));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsBinop(
-    CallInfo& callInfo, InlinableNative target) {
-  if (callInfo.argc() != 3 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* value = callInfo.getArg(2);
-  if (MTruncateToInt32::mightHaveSideEffects(value)) {
-    return InliningStatus_NotInlined;
-  }
-
-  Scalar::Type arrayType;
-  TemporaryTypeSet::TypedArraySharedness sharedness;
-  if (!atomicsMeetsPreconditions(callInfo, &arrayType, &sharedness)) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* elements;
-  MDefinition* index;
-  atomicsCheckBounds(callInfo, &elements, &index);
-
-  AtomicOp k = AtomicFetchAddOp;
-  switch (target) {
-    case InlinableNative::AtomicsAdd:
-      k = AtomicFetchAddOp;
-      break;
-    case InlinableNative::AtomicsSub:
-      k = AtomicFetchSubOp;
-      break;
-    case InlinableNative::AtomicsAnd:
-      k = AtomicFetchAndOp;
-      break;
-    case InlinableNative::AtomicsOr:
-      k = AtomicFetchOrOp;
-      break;
-    case InlinableNative::AtomicsXor:
-      k = AtomicFetchXorOp;
-      break;
-    default:
-      MOZ_CRASH("Bad atomic operation");
-  }
-
-  MAtomicTypedArrayElementBinop* binop = MAtomicTypedArrayElementBinop::New(
-      alloc(), k, elements, index, arrayType, value);
-  binop->setResultType(getInlineReturnType());
-  current->add(binop);
-  current->push(binop);
-
-  MOZ_TRY(resumeAfter(binop));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineAtomicsIsLockFree(
-    CallInfo& callInfo) {
-  if (callInfo.argc() != 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MAtomicIsLockFree* ilf = MAtomicIsLockFree::New(alloc(), callInfo.getArg(0));
-  current->add(ilf);
-  current->push(ilf);
-
-  return InliningStatus_Inlined;
-}
-
-bool IonBuilder::atomicsMeetsPreconditions(
-    CallInfo& callInfo, Scalar::Type* arrayType,
-    TemporaryTypeSet::TypedArraySharedness* sharedness,
-    AtomicCheckResult checkResult) {
-  if (!JitSupportsAtomics()) {
-    return false;
-  }
-
-  if (callInfo.getArg(0)->type() != MIRType::Object) {
-    return false;
-  }
-
-  if (callInfo.getArg(1)->type() != MIRType::Int32) {
-    return false;
-  }
-
-  // Ensure that the first argument is a TypedArray.
-  //
-  // Then check both that the element type is something we can
-  // optimize and that the return type is suitable for that element
-  // type.
-
-  TemporaryTypeSet* arg0Types = callInfo.getArg(0)->resultTypeSet();
-  if (!arg0Types) {
-    return false;
-  }
-
-  *arrayType = arg0Types->getTypedArrayType(constraints(), sharedness);
-  switch (*arrayType) {
-    case Scalar::Int8:
-    case Scalar::Uint8:
-    case Scalar::Int16:
-    case Scalar::Uint16:
-    case Scalar::Int32:
-      return checkResult == DontCheckAtomicResult ||
-             getInlineReturnType() == MIRType::Int32;
-    case Scalar::Uint32:
-      return checkResult == DontCheckAtomicResult ||
-             getInlineReturnType() == MIRType::Double;
-    case Scalar::BigInt64:
-    case Scalar::BigUint64:
-      // Bug 1638295: Not yet implemented.
-      [[fallthrough]];
-    default:
-      // Excludes floating types and Uint8Clamped.
-      return false;
-  }
-}
-
-void IonBuilder::atomicsCheckBounds(CallInfo& callInfo, MInstruction** elements,
-                                    MDefinition** index) {
-  // Perform bounds checking and extract the elements vector.
-  MDefinition* obj = callInfo.getArg(0);
-  MInstruction* length = nullptr;
-  *index = callInfo.getArg(1);
-  *elements = nullptr;
-  addTypedArrayLengthAndData(obj, DoBoundsCheck, index, &length, elements);
-}
-
-IonBuilder::InliningResult IonBuilder::inlineIsConstructing(
-    CallInfo& callInfo) {
-  MOZ_ASSERT(!callInfo.constructing());
-  MOZ_ASSERT(callInfo.argc() == 0);
-  MOZ_ASSERT(script()->isFunction(),
-             "isConstructing() should only be called in function scripts");
-
-  if (getInlineReturnType() != MIRType::Boolean) {
-    return InliningStatus_NotInlined;
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  if (inliningDepth_ == 0) {
-    MInstruction* ins = MIsConstructing::New(alloc());
-    current->add(ins);
-    current->push(ins);
-    return InliningStatus_Inlined;
-  }
-
-  bool constructing = inlineCallInfo_->constructing();
-  pushConstant(BooleanValue(constructing));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineDataViewGet(CallInfo& callInfo,
-                                                         Scalar::Type type) {
-  if (callInfo.argc() < 1 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.thisArg();
-  TemporaryTypeSet* thisTypes = obj->resultTypeSet();
-  const JSClass* clasp =
-      thisTypes ? thisTypes->getKnownClass(constraints()) : nullptr;
-  if (clasp != &DataViewObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* index = callInfo.getArg(0);
-  if (!IsNumberType(index->type())) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* littleEndian;
-  if (Scalar::byteSize(type) > 1) {
-    if (callInfo.argc() > 1) {
-      littleEndian = convertToBoolean(callInfo.getArg(1));
-    } else {
-      littleEndian = constant(BooleanValue(false));
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  // Calling |dataView.getUint32()| will result in a double for values that
-  // don't fit in an int32. We have to bailout if this happens and the
-  // instruction is not known to return a double.
-  bool allowDouble = getInlineReturnTypeSet()->hasType(TypeSet::DoubleType());
-  MIRType knownType = MIRTypeForArrayBufferViewRead(type, allowDouble);
-
-  MInstruction* indexInt32 = MToIntegerInt32::New(alloc(), index);
-  current->add(indexInt32);
-  index = indexInt32;
-
-  // Get bounds-check, then get elements, and add all instructions.
-  MInstruction* elements;
-  addDataViewData(obj, type, &index, &elements);
-
-  // Load the element.
-  MInstruction* load;
-  if (Scalar::byteSize(type) == 1) {
-    load = MLoadUnboxedScalar::New(alloc(), elements, index, type);
-  } else {
-    load =
-        MLoadDataViewElement::New(alloc(), elements, index, littleEndian, type);
-  }
-  current->add(load);
-  current->push(load);
-
-  // Note: we can ignore the type barrier here, we know the type must be valid
-  // and unbarriered.
-  load->setResultType(knownType);
-
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineDataViewSet(CallInfo& callInfo,
-                                                         Scalar::Type type) {
-  if (callInfo.argc() < 2 || callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* obj = callInfo.thisArg();
-  TemporaryTypeSet* thisTypes = obj->resultTypeSet();
-  const JSClass* clasp =
-      thisTypes ? thisTypes->getKnownClass(constraints()) : nullptr;
-  if (clasp != &DataViewObject::class_) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* index = callInfo.getArg(0);
-  if (!IsNumberType(index->type())) {
-    return InliningStatus_NotInlined;
-  }
-
-  MDefinition* value = callInfo.getArg(1);
-  if (!Scalar::isBigIntType(type)) {
-    if (!IsNumberType(value->type())) {
-      return InliningStatus_NotInlined;
-    }
-  } else {
-    if (value->type() != MIRType::BigInt) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  MDefinition* littleEndian;
-  if (Scalar::byteSize(type) > 1) {
-    if (callInfo.argc() > 2) {
-      littleEndian = convertToBoolean(callInfo.getArg(2));
-    } else {
-      littleEndian = constant(BooleanValue(false));
-    }
-  }
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  MInstruction* indexInt32 = MToIntegerInt32::New(alloc(), index);
-  current->add(indexInt32);
-  index = indexInt32;
-
-  // Get bounds-check, then get elements, and add all instructions.
-  MInstruction* elements;
-  addDataViewData(obj, type, &index, &elements);
-
-  // Store the element.
-  MInstruction* store;
-  if (Scalar::byteSize(type) == 1) {
-    store = MStoreUnboxedScalar::New(alloc(), elements, index, value, type);
-  } else {
-    store = MStoreDataViewElement::New(alloc(), elements, index, value,
-                                       littleEndian, type);
-  }
-  current->add(store);
-
-  pushConstant(UndefinedValue());
-
-  MOZ_TRY(resumeAfter(store));
-  return InliningStatus_Inlined;
-}
-
-IonBuilder::InliningResult IonBuilder::inlineWasmCall(CallInfo& callInfo,
-                                                      JSFunction* target) {
-  MOZ_ASSERT(target->isWasmWithJitEntry());
-
-  // Don't inline wasm constructors.
-  if (callInfo.constructing()) {
-    return InliningStatus_NotInlined;
-  }
-
-  if (target->realm() != script()->realm()) {
-    return InliningStatus_NotInlined;
-  }
-
-  wasm::Instance& inst = wasm::ExportedFunctionToInstance(target);
-  uint32_t funcIndex = inst.code().getFuncIndex(target);
-
-  auto bestTier = inst.code().bestTier();
-  const wasm::FuncExport& funcExport =
-      inst.metadata(bestTier).lookupFuncExport(funcIndex);
-  const wasm::FuncType& sig = funcExport.funcType();
-
-  // Check that the function doesn't take or return non-compatible JS
-  // argument types before adding nodes to the MIR graph, otherwise they'd be
-  // dead code.
-  if (sig.temporarilyUnsupportedReftypeForInlineEntry() ||
-      !JitOptions.enableWasmIonFastCalls) {
-    return InliningStatus_NotInlined;
-  }
-
-  // If there are too many arguments, don't inline (we won't be able to store
-  // the arguments in the LIR node).
-  static_assert(wasm::MaxArgsForJitInlineCall <= MaxNumLInstructionOperands,
-                "inlined arguments can all be LIR operands");
-  if (sig.args().length() > wasm::MaxArgsForJitInlineCall) {
-    return InliningStatus_NotInlined;
-  }
-
-  // If there are too many results, don't inline as we don't currently
-  // add MWasmStackResults.
-  if (sig.results().length() > wasm::MaxResultsForJitInlineCall) {
-    return InliningStatus_NotInlined;
-  }
-
-  // Bug 1631656 - Don't try to inline with I64 args on 32-bit platforms because
-  // it is more difficult (because it requires multiple LIR arguments per I64).
-  //
-  // Bug 1631650 - On 64-bit platforms, we also give up inlining for I64 args
-  // spilled to the stack because it causes problems with register allocation.
-#ifdef JS_64BIT
-  const bool inlineWithI64 = true;
-#else
-  const bool inlineWithI64 = false;
-#endif
-  ABIArgGenerator abi;
-  for (const auto& valType : sig.args()) {
-    MIRType mirType = ToMIRType(valType);
-    ABIArg abiArg = abi.next(mirType);
-    if (mirType == MIRType::Int64 &&
-        (!inlineWithI64 || (abiArg.kind() == ABIArg::Stack))) {
-      return InliningStatus_NotInlined;
-    }
-  }
-
-  auto* call = MIonToWasmCall::New(alloc(), inst.object(), funcExport);
-  if (!call) {
-    return abort(AbortReason::Alloc);
-  }
-
-  // An invariant in this loop is that any type conversion operation that has
-  // externally visible effects, such as invoking valueOf on an object argument,
-  // must bailout so that we don't have to worry about replaying effects during
-  // argument conversion.
-  Maybe<MDefinition*> undefined;
-  for (size_t i = 0; i < sig.args().length(); i++) {
-    if (!alloc().ensureBallast()) {
-      return abort(AbortReason::Alloc);
-    }
-
-    // Add undefined if an argument is missing.
-    if (i >= callInfo.argc() && !undefined) {
-      undefined.emplace(constant(UndefinedValue()));
-    }
-
-    MDefinition* arg = i >= callInfo.argc() ? *undefined : callInfo.getArg(i);
-
-    MInstruction* conversion = nullptr;
-    switch (sig.args()[i].kind()) {
-      case wasm::ValType::I32:
-        conversion = MTruncateToInt32::New(alloc(), arg);
-        break;
-      case wasm::ValType::I64:
-        conversion = MToInt64::New(alloc(), arg);
-        break;
-      case wasm::ValType::F32:
-        conversion = MToFloat32::New(alloc(), arg);
-        break;
-      case wasm::ValType::F64:
-        conversion = MToDouble::New(alloc(), arg);
-        break;
-      case wasm::ValType::V128:
-        MOZ_CRASH("impossible per above check");
-      case wasm::ValType::Ref:
-        switch (sig.args()[i].refTypeKind()) {
-          case wasm::RefType::Extern:
-            // Transform the JS representation into an AnyRef representation.
-            // The resulting type is MIRType::RefOrNull.  These cases are all
-            // effect-free.
-            switch (arg->type()) {
-              case MIRType::Object:
-              case MIRType::ObjectOrNull:
-                conversion = MWasmAnyRefFromJSObject::New(alloc(), arg);
-                break;
-              case MIRType::Null:
-                conversion = MWasmNullConstant::New(alloc());
-                break;
-              default:
-                conversion = MWasmBoxValue::New(alloc(), arg);
-                break;
-            }
-            break;
-          default:
-            MOZ_CRASH("impossible per above check");
-        }
-        break;
-    }
-
-    current->add(conversion);
-    call->initArg(i, conversion);
-  }
-
-  current->add(call);
-
-  // Add any post-function call conversions that are necessary.
-  MInstruction* postConversion = call;
-  const wasm::ValTypeVector& results = sig.results();
-  MOZ_ASSERT(results.length() <= 1, "Multi-value returns not supported.");
-  if (results.length() == 0) {
-    // No results to convert.
-  } else {
-    switch (results[0].kind()) {
-      case wasm::ValType::I64:
-        // Ion expects a BigInt from I64 types.
-        postConversion = MInt64ToBigInt::New(alloc(), call);
-
-        // Make non-movable so we can attach a resume point.
-        postConversion->setNotMovable();
-
-        current->add(postConversion);
-        break;
-      default:
-        // No spectre.index_masking of i32 results required, as the generated
-        // stub takes care of that.
-        break;
-    }
-  }
-  current->push(postConversion);
-  MOZ_TRY(resumeAfter(postConversion));
-
-  callInfo.setImplicitlyUsedUnchecked();
-
-  return InliningStatus_Inlined;
-}
-
-#define ADD_NATIVE(native)                                              \
-  const JSJitInfo JitInfo_##native{{nullptr},                           \
-                                   {uint16_t(InlinableNative::native)}, \
-                                   {0},                                 \
-                                   JSJitInfo::InlinableNative};
-INLINABLE_NATIVE_LIST(ADD_NATIVE)
-#undef ADD_NATIVE
-
-}  // namespace jit
-}  // namespace js
diff -Nru firefox-84.0.2+build1/js/src/jit/mips32/Assembler-mips32.h firefox-85.0+build1/js/src/jit/mips32/Assembler-mips32.h
--- firefox-84.0.2+build1/js/src/jit/mips32/Assembler-mips32.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips32/Assembler-mips32.h	2021-01-18 19:58:13.000000000 +0000
@@ -254,12 +254,6 @@
   return true;
 }
 
-static inline uint32_t GetArgStackDisp(uint32_t usedArgSlots) {
-  MOZ_ASSERT(usedArgSlots >= NumIntArgRegs);
-  // Even register arguments have place reserved on stack.
-  return usedArgSlots * sizeof(intptr_t);
-}
-
 }  // namespace jit
 }  // namespace js
 
diff -Nru firefox-84.0.2+build1/js/src/jit/mips32/MacroAssembler-mips32.cpp firefox-85.0+build1/js/src/jit/mips32/MacroAssembler-mips32.cpp
--- firefox-84.0.2+build1/js/src/jit/mips32/MacroAssembler-mips32.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips32/MacroAssembler-mips32.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -2473,7 +2473,7 @@
     const wasm::MemoryAccessDesc& access, Register64 value, Register memoryBase,
     Register ptr, Register ptrScratch, Register tmp) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
   MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);
 
   // Maybe add the offset.
diff -Nru firefox-84.0.2+build1/js/src/jit/mips32/Simulator-mips32.h firefox-85.0+build1/js/src/jit/mips32/Simulator-mips32.h
--- firefox-84.0.2+build1/js/src/jit/mips32/Simulator-mips32.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips32/Simulator-mips32.h	2021-01-18 19:58:13.000000000 +0000
@@ -503,17 +503,17 @@
     // Technically we need the lock to access the innards of the
     // icache, not to take its address, but the latter condition
     // serves as a useful complement to the former.
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->icache_;
   }
 
   static Redirection* redirection() {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->redirection_;
   }
 
   static void setRedirection(js::jit::Redirection* redirection) {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     singleton_->redirection_ = redirection;
   }
 };
diff -Nru firefox-84.0.2+build1/js/src/jit/mips64/Assembler-mips64.cpp firefox-85.0+build1/js/src/jit/mips64/Assembler-mips64.cpp
--- firefox-84.0.2+build1/js/src/jit/mips64/Assembler-mips64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips64/Assembler-mips64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -17,9 +17,20 @@
 using namespace js::jit;
 
 ABIArgGenerator::ABIArgGenerator()
-    : usedArgSlots_(0), firstArgFloat(false), current_() {}
+    : regIndex_(0), stackOffset_(0), current_() {}
 
 ABIArg ABIArgGenerator::next(MIRType type) {
+  static_assert(NumIntArgRegs == NumFloatArgRegs);
+  if (regIndex_ == NumIntArgRegs) {
+    if (type != MIRType::Simd128) {
+      current_ = ABIArg(stackOffset_);
+      stackOffset_ += sizeof(uint64_t);
+    } else {
+      // Mips platform does not support simd yet.
+      MOZ_CRASH("Unexpected argument type");
+    }
+    return current_;
+  }
   switch (type) {
     case MIRType::Int32:
     case MIRType::Int64:
@@ -27,29 +38,18 @@
     case MIRType::RefOrNull:
     case MIRType::StackResults: {
       Register destReg;
-      if (GetIntArgReg(usedArgSlots_, &destReg)) {
-        current_ = ABIArg(destReg);
-      } else {
-        current_ = ABIArg(GetArgStackDisp(usedArgSlots_));
-      }
-      usedArgSlots_++;
+      GetIntArgReg(regIndex_++, &destReg);
+      current_ = ABIArg(destReg);
       break;
     }
     case MIRType::Float32:
     case MIRType::Double: {
-      FloatRegister destFReg;
       FloatRegister::ContentType contentType;
-      if (!usedArgSlots_) {
-        firstArgFloat = true;
-      }
       contentType = (type == MIRType::Double) ? FloatRegisters::Double
                                               : FloatRegisters::Single;
-      if (GetFloatArgReg(usedArgSlots_, &destFReg)) {
-        current_ = ABIArg(FloatRegister(destFReg.id(), contentType));
-      } else {
-        current_ = ABIArg(GetArgStackDisp(usedArgSlots_));
-      }
-      usedArgSlots_++;
+      FloatRegister destFReg;
+      GetFloatArgReg(regIndex_++, &destFReg);
+      current_ = ABIArg(FloatRegister(destFReg.id(), contentType));
       break;
     }
     default:
diff -Nru firefox-84.0.2+build1/js/src/jit/mips64/Assembler-mips64.h firefox-85.0+build1/js/src/jit/mips64/Assembler-mips64.h
--- firefox-84.0.2+build1/js/src/jit/mips64/Assembler-mips64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips64/Assembler-mips64.h	2021-01-18 19:58:13.000000000 +0000
@@ -22,8 +22,8 @@
     mozilla::ArrayLength(CallTempNonArgRegs);
 
 class ABIArgGenerator {
-  unsigned usedArgSlots_;
-  bool firstArgFloat;
+  unsigned regIndex_;
+  uint32_t stackOffset_;
   ABIArg current_;
 
  public:
@@ -31,14 +31,8 @@
   ABIArg next(MIRType argType);
   ABIArg& current() { return current_; }
 
-  uint32_t stackBytesConsumedSoFar() const {
-    if (usedArgSlots_ <= 8) {
-      return 0;
-    }
-
-    return (usedArgSlots_ - 8) * sizeof(int64_t);
-  }
-  void increaseStackOffset(uint32_t bytes) { MOZ_CRASH("NYI"); }
+  uint32_t stackBytesConsumedSoFar() const { return stackOffset_; }
+  void increaseStackOffset(uint32_t bytes) { stackOffset_ += bytes; }
 };
 
 // These registers may be volatile or nonvolatile.
@@ -283,11 +277,6 @@
   return true;
 }
 
-static inline uint32_t GetArgStackDisp(uint32_t usedArgSlots) {
-  MOZ_ASSERT(usedArgSlots >= NumIntArgRegs);
-  return (usedArgSlots - NumIntArgRegs) * sizeof(int64_t);
-}
-
 }  // namespace jit
 }  // namespace js
 
diff -Nru firefox-84.0.2+build1/js/src/jit/mips64/MacroAssembler-mips64.cpp firefox-85.0+build1/js/src/jit/mips64/MacroAssembler-mips64.cpp
--- firefox-84.0.2+build1/js/src/jit/mips64/MacroAssembler-mips64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips64/MacroAssembler-mips64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -2279,7 +2279,7 @@
     const wasm::MemoryAccessDesc& access, Register memoryBase, Register ptr,
     Register ptrScratch, Register64 output, Register tmp) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
   MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);
 
   MOZ_ASSERT(!access.isZeroExtendSimd128Load());
@@ -2342,7 +2342,7 @@
     const wasm::MemoryAccessDesc& access, Register64 value, Register memoryBase,
     Register ptr, Register ptrScratch, Register tmp) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
   MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);
 
   // Maybe add the offset.
diff -Nru firefox-84.0.2+build1/js/src/jit/mips64/Simulator-mips64.h firefox-85.0+build1/js/src/jit/mips64/Simulator-mips64.h
--- firefox-84.0.2+build1/js/src/jit/mips64/Simulator-mips64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips64/Simulator-mips64.h	2021-01-18 19:58:13.000000000 +0000
@@ -513,17 +513,17 @@
     // Technically we need the lock to access the innards of the
     // icache, not to take its address, but the latter condition
     // serves as a useful complement to the former.
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->icache_;
   }
 
   static Redirection* redirection() {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     return singleton_->redirection_;
   }
 
   static void setRedirection(js::jit::Redirection* redirection) {
-    MOZ_ASSERT(singleton_->cacheLock_.ownedByCurrentThread());
+    singleton_->cacheLock_.assertOwnedByCurrentThread();
     singleton_->redirection_ = redirection;
   }
 };
diff -Nru firefox-84.0.2+build1/js/src/jit/mips-shared/Architecture-mips-shared.cpp firefox-85.0+build1/js/src/jit/mips-shared/Architecture-mips-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/mips-shared/Architecture-mips-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips-shared/Architecture-mips-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -100,7 +100,7 @@
       "jr.hb  $ra \n"
       "move   $ra, %[tmp] \n"
       ".set   pop\n"
-      : [ tmp ] "=&r"(tmp));
+      : [tmp] "=&r"(tmp));
 
 #elif defined(__GNUC__)
   intptr_t end = reinterpret_cast<intptr_t>(code) + size;
diff -Nru firefox-84.0.2+build1/js/src/jit/mips-shared/Lowering-mips-shared.cpp firefox-85.0+build1/js/src/jit/mips-shared/Lowering-mips-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/mips-shared/Lowering-mips-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips-shared/Lowering-mips-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -227,7 +227,7 @@
       LDivPowTwoI* lir =
           new (alloc()) LDivPowTwoI(useRegister(div->lhs()), shift, temp());
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       define(lir, div);
       return;
@@ -237,7 +237,7 @@
   LDivI* lir = new (alloc())
       LDivI(useRegister(div->lhs()), useRegister(div->rhs()), temp());
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
   define(lir, div);
 }
@@ -246,7 +246,7 @@
                                        MDefinition* rhs) {
   LMulI* lir = new (alloc()) LMulI;
   if (mul->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mul->bailoutKind());
   }
 
   lowerForALU(lir, mul, lhs, rhs);
@@ -265,7 +265,7 @@
       LModPowTwoI* lir =
           new (alloc()) LModPowTwoI(useRegister(mod->lhs()), shift);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
       return;
@@ -274,7 +274,7 @@
           LModMaskI(useRegister(mod->lhs()), temp(LDefinition::GENERAL),
                     temp(LDefinition::GENERAL), shift + 1);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       define(lir, mod);
       return;
@@ -285,7 +285,7 @@
                           temp(LDefinition::GENERAL));
 
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
   define(lir, mod);
 }
@@ -326,7 +326,7 @@
   MDefinition* power = mir->power();
 
   auto* lir = new (alloc()) LPowOfTwoI(base, useRegister(power));
-  assignSnapshot(lir, BailoutKind::PrecisionLoss);
+  assignSnapshot(lir, mir->bailoutKind());
   define(lir, mir);
 }
 
@@ -476,7 +476,7 @@
   lir->setOperand(0, useRegister(lhs));
   lir->setOperand(1, useRegister(rhs));
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
 
   define(lir, div);
@@ -490,7 +490,7 @@
   lir->setOperand(0, useRegister(lhs));
   lir->setOperand(1, useRegister(rhs));
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
 
   define(lir, mod);
diff -Nru firefox-84.0.2+build1/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp firefox-85.0+build1/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -2095,7 +2095,7 @@
     const wasm::MemoryAccessDesc& access, Register memoryBase, Register ptr,
     Register ptrScratch, AnyRegister output, Register tmp) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
   MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);
 
   // Maybe add the offset.
@@ -2177,7 +2177,7 @@
     const wasm::MemoryAccessDesc& access, AnyRegister value,
     Register memoryBase, Register ptr, Register ptrScratch, Register tmp) {
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < asMasm().wasmMaxOffsetGuardLimit());
   MOZ_ASSERT_IF(offset, ptrScratch != InvalidReg);
 
   // Maybe add the offset.
diff -Nru firefox-84.0.2+build1/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h firefox-85.0+build1/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h
--- firefox-84.0.2+build1/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/mips-shared/SharedICHelpers-mips-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -50,21 +50,6 @@
   *callOffset = CodeOffset(masm.currentOffset());
 }
 
-inline void EmitEnterTypeMonitorIC(
-    MacroAssembler& masm,
-    size_t monitorStubOffset = ICMonitoredStub::offsetOfFirstMonitorStub()) {
-  // This is expected to be called from within an IC, when ICStubReg
-  // is properly initialized to point to the stub.
-  masm.loadPtr(Address(ICStubReg, (uint32_t)monitorStubOffset), ICStubReg);
-
-  // Load stubcode pointer from BaselineStubEntry.
-  // R2 won't be active when we call ICs, so we can use it.
-  masm.loadPtr(Address(ICStubReg, ICStub::offsetOfStubCode()), R2.scratchReg());
-
-  // Jump to the stubcode.
-  masm.branch(R2.scratchReg());
-}
-
 inline void EmitReturnFromIC(MacroAssembler& masm) { masm.branch(ra); }
 
 inline void EmitBaselineLeaveStubFrame(MacroAssembler& masm,
diff -Nru firefox-84.0.2+build1/js/src/jit/MIRBuilderShared.h firefox-85.0+build1/js/src/jit/MIRBuilderShared.h
--- firefox-84.0.2+build1/js/src/jit/MIRBuilderShared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIRBuilderShared.h	2021-01-18 19:58:13.000000000 +0000
@@ -7,101 +7,15 @@
 #ifndef jit_MIRBuilderShared_h
 #define jit_MIRBuilderShared_h
 
-#include "mozilla/Maybe.h"
-
-#include "ds/InlineTable.h"
 #include "jit/MIRGraph.h"
 #include "js/Vector.h"
-#include "vm/Opcodes.h"
 
 // Data structures and helper functions used by both IonBuilder and WarpBuilder.
+// TODO(no-TI): remove this file.
 
 namespace js {
 namespace jit {
 
-// PendingEdge is used whenever a block is terminated with a forward branch in
-// the bytecode. When we reach the jump target we use this information to link
-// the block to the jump target's block.
-class PendingEdge {
- public:
-  enum class Kind : uint8_t {
-    // MTest true-successor.
-    TestTrue,
-
-    // MTest false-successor.
-    TestFalse,
-
-    // MGoto successor.
-    Goto,
-  };
-
- private:
-  MBasicBlock* block_;
-  Kind kind_;
-  JSOp testOp_ = JSOp::Undefined;
-
-  PendingEdge(MBasicBlock* block, Kind kind, JSOp testOp = JSOp::Undefined)
-      : block_(block), kind_(kind), testOp_(testOp) {}
-
- public:
-  static PendingEdge NewTestTrue(MBasicBlock* block, JSOp op) {
-    return PendingEdge(block, Kind::TestTrue, op);
-  }
-  static PendingEdge NewTestFalse(MBasicBlock* block, JSOp op) {
-    return PendingEdge(block, Kind::TestFalse, op);
-  }
-  static PendingEdge NewGoto(MBasicBlock* block) {
-    return PendingEdge(block, Kind::Goto);
-  }
-
-  MBasicBlock* block() const { return block_; }
-  Kind kind() const { return kind_; }
-
-  JSOp testOp() const {
-    MOZ_ASSERT(kind_ == Kind::TestTrue || kind_ == Kind::TestFalse);
-    return testOp_;
-  }
-};
-
-// Returns true iff the MTest added for |op| has a true-target corresponding
-// with the join point in the bytecode.
-inline bool TestTrueTargetIsJoinPoint(JSOp op) {
-  switch (op) {
-    case JSOp::IfNe:
-    case JSOp::Or:
-    case JSOp::Case:
-      return true;
-
-    case JSOp::IfEq:
-    case JSOp::And:
-    case JSOp::Coalesce:
-      return false;
-
-    default:
-      MOZ_CRASH("Unexpected op");
-  }
-}
-
-// PendingEdgesMap maps a bytecode instruction to a Vector of PendingEdges
-// targeting it. We use InlineMap<> for this because most of the time there are
-// only a few pending edges but there can be many when switch-statements are
-// involved.
-using PendingEdges = Vector<PendingEdge, 2, SystemAllocPolicy>;
-using PendingEdgesMap =
-    InlineMap<jsbytecode*, PendingEdges, 8, PointerHasher<jsbytecode*>,
-              SystemAllocPolicy>;
-
-// LoopState stores information about a loop that's being compiled to MIR.
-class LoopState {
-  MBasicBlock* header_ = nullptr;
-
- public:
-  explicit LoopState(MBasicBlock* header) : header_(header) {}
-
-  MBasicBlock* header() const { return header_; }
-};
-using LoopStateStack = Vector<LoopState, 4, JitAllocPolicy>;
-
 // Helper class to manage call state.
 class MOZ_STACK_CLASS CallInfo {
   MDefinition* callee_ = nullptr;
diff -Nru firefox-84.0.2+build1/js/src/jit/MIR.cpp firefox-85.0+build1/js/src/jit/MIR.cpp
--- firefox-84.0.2+build1/js/src/jit/MIR.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIR.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -19,9 +19,7 @@
 
 #include "builtin/RegExp.h"
 #include "jit/AtomicOperations.h"
-#include "jit/BaselineInspector.h"
 #include "jit/CompileInfo.h"
-#include "jit/IonBuilder.h"
 #include "jit/JitSpewer.h"
 #include "jit/KnownClass.h"
 #include "jit/MIRGraph.h"
@@ -351,7 +349,7 @@
     return false;
   }
 
-  return !resultTypeSet() || resultTypeSet()->hasType(TypeSet::MagicArgType());
+  return true;
 }
 
 bool MDefinition::definitelyType(std::initializer_list<MIRType> types) const {
@@ -367,8 +365,7 @@
   MOZ_ASSERT(std::all_of(types.begin(), types.end(), isSpecializedNonMagic));
 
   if (type() == MIRType::Value) {
-    TemporaryTypeSet* resultTypes = resultTypeSet();
-    return resultTypes && !resultTypes->empty() && resultTypes->isSubset(types);
+    return false;
   }
 
   auto contains = [&types](MIRType type) {
@@ -456,40 +453,13 @@
   resumePoint_ = nullptr;
 }
 
-bool MDefinition::maybeEmulatesUndefined(CompilerConstraintList* constraints) {
+bool MDefinition::maybeEmulatesUndefined() {
+  // TODO(no-TI): remove.
   if (!mightBeType(MIRType::Object)) {
     return false;
   }
 
-  TemporaryTypeSet* types = resultTypeSet();
-  if (!types) {
-    return true;
-  }
-
-  return types->maybeEmulatesUndefined(constraints);
-}
-
-static bool MaybeCallable(CompilerConstraintList* constraints,
-                          MDefinition* op) {
-  if (!op->mightBeType(MIRType::Object)) {
-    return false;
-  }
-
-  TemporaryTypeSet* types = op->resultTypeSet();
-  if (!types) {
-    return true;
-  }
-
-  return types->maybeCallable(constraints);
-}
-
-void MTest::cacheOperandMightEmulateUndefined(
-    CompilerConstraintList* constraints) {
-  MOZ_ASSERT(operandMightEmulateUndefined());
-
-  if (!getOperand(0)->maybeEmulatesUndefined(constraints)) {
-    markNoOperandEmulatesUndefined();
-  }
+  return true;
 }
 
 MDefinition* MTest::foldsDoubleNegation(TempAllocator& alloc) {
@@ -896,18 +866,12 @@
   }
 }
 
-bool MDefinition::emptyResultTypeSet() const {
-  return resultTypeSet() && resultTypeSet()->empty();
-}
-
-MConstant* MConstant::New(TempAllocator& alloc, const Value& v,
-                          CompilerConstraintList* constraints) {
-  return new (alloc) MConstant(alloc, v, constraints);
+MConstant* MConstant::New(TempAllocator& alloc, const Value& v) {
+  return new (alloc) MConstant(alloc, v);
 }
 
-MConstant* MConstant::New(TempAllocator::Fallible alloc, const Value& v,
-                          CompilerConstraintList* constraints) {
-  return new (alloc) MConstant(alloc.alloc, v, constraints);
+MConstant* MConstant::New(TempAllocator::Fallible alloc, const Value& v) {
+  return new (alloc) MConstant(alloc.alloc, v);
 }
 
 MConstant* MConstant::NewFloat32(TempAllocator& alloc, double d) {
@@ -928,65 +892,11 @@
   return res;
 }
 
-MConstant* MConstant::NewConstraintlessObject(TempAllocator& alloc,
-                                              JSObject* v) {
+MConstant* MConstant::NewObject(TempAllocator& alloc, JSObject* v) {
   return new (alloc) MConstant(v);
 }
 
-static TemporaryTypeSet* MakeSingletonTypeSetFromKey(
-    TempAllocator& tempAlloc, CompilerConstraintList* constraints,
-    TypeSet::ObjectKey* key) {
-  // Invalidate when this object's ObjectGroup gets unknown properties. This
-  // happens for instance when we mutate an object's __proto__, in this case
-  // we want to invalidate and mark this TypeSet as containing AnyObject
-  // (because mutating __proto__ will change an object's ObjectGroup).
-  MOZ_ASSERT(constraints);
-  (void)key->hasStableClassAndProto(constraints);
-
-  LifoAlloc* alloc = tempAlloc.lifoAlloc();
-  return alloc->new_<TemporaryTypeSet>(alloc, TypeSet::ObjectType(key));
-}
-
-TemporaryTypeSet* jit::MakeSingletonTypeSet(TempAllocator& alloc,
-                                            CompilerConstraintList* constraints,
-                                            JSObject* obj) {
-  return MakeSingletonTypeSetFromKey(alloc, constraints,
-                                     TypeSet::ObjectKey::get(obj));
-}
-
-TemporaryTypeSet* jit::MakeSingletonTypeSet(TempAllocator& alloc,
-                                            CompilerConstraintList* constraints,
-                                            ObjectGroup* obj) {
-  return MakeSingletonTypeSetFromKey(alloc, constraints,
-                                     TypeSet::ObjectKey::get(obj));
-}
-
-static TemporaryTypeSet* MakeUnknownTypeSet(TempAllocator& tempAlloc) {
-  LifoAlloc* alloc = tempAlloc.lifoAlloc();
-  return alloc->new_<TemporaryTypeSet>(alloc, TypeSet::UnknownType());
-}
-
-#ifdef DEBUG
-
-bool jit::IonCompilationCanUseNurseryPointers() {
-  // If we are doing backend compilation, which could occur on a helper
-  // thread but might actually be on the main thread, check the flag set on
-  // the JSContext by AutoEnterIonCompilation.
-  if (CurrentThreadIsIonCompiling()) {
-    return !CurrentThreadIsIonCompilingSafeForMinorGC();
-  }
-
-  // Otherwise, we must be on the main thread during MIR construction. The
-  // store buffer must have been notified that minor GCs must cancel pending
-  // or in progress Ion compilations.
-  JSRuntime* rt = TlsContext.get()->zone()->runtimeFromMainThread();
-  return rt->gc.storeBuffer().cancelIonCompilations();
-}
-
-#endif  // DEBUG
-
-MConstant::MConstant(TempAllocator& alloc, const js::Value& vp,
-                     CompilerConstraintList* constraints)
+MConstant::MConstant(TempAllocator& alloc, const js::Value& vp)
     : MNullaryInstruction(classOpcode) {
   setResultType(MIRTypeFromValue(vp));
 
@@ -1013,37 +923,18 @@
       payload_.sym = vp.toSymbol();
       break;
     case MIRType::BigInt:
-      MOZ_ASSERT_IF(IsInsideNursery(vp.toBigInt()),
-                    IonCompilationCanUseNurseryPointers());
+      MOZ_ASSERT(!IsInsideNursery(vp.toBigInt()));
       payload_.bi = vp.toBigInt();
       break;
     case MIRType::Object:
+      MOZ_ASSERT(!IsInsideNursery(&vp.toObject()));
       payload_.obj = &vp.toObject();
-      // Create a singleton type set for the object. This isn't necessary for
-      // other types as the result type encodes all needed information.
-      MOZ_ASSERT_IF(IsInsideNursery(&vp.toObject()),
-                    IonCompilationCanUseNurseryPointers());
-      if (!JitOptions.warpBuilder) {
-        setResultTypeSet(
-            MakeSingletonTypeSet(alloc, constraints, &vp.toObject()));
-      }
       break;
     case MIRType::MagicOptimizedArguments:
     case MIRType::MagicOptimizedOut:
     case MIRType::MagicHole:
     case MIRType::MagicIsConstructing:
-      break;
     case MIRType::MagicUninitializedLexical:
-      // JS_UNINITIALIZED_LEXICAL does not escape to script and is not
-      // observed in type sets. However, it may flow around freely during
-      // Ion compilation. Give it an unknown typeset to poison any type sets
-      // it merges with.
-      //
-      // TODO We could track uninitialized lexicals more precisely by tracking
-      // them in type sets.
-      if (!JitOptions.warpBuilder) {
-        setResultTypeSet(MakeUnknownTypeSet(alloc));
-      }
       break;
     default:
       MOZ_CRASH("Unexpected type");
@@ -1053,7 +944,7 @@
 }
 
 MConstant::MConstant(JSObject* obj) : MNullaryInstruction(classOpcode) {
-  MOZ_ASSERT_IF(IsInsideNursery(obj), IonCompilationCanUseNurseryPointers());
+  MOZ_ASSERT(!IsInsideNursery(obj));
   setResultType(MIRType::Object);
   payload_.obj = obj;
   setMovable();
@@ -1359,12 +1250,12 @@
 
 void MLoadUnboxedScalar::printOpcode(GenericPrinter& out) const {
   MDefinition::printOpcode(out);
-  out.printf(" %s", ScalarTypeDescr::typeName(storageType()));
+  out.printf(" %s", Scalar::name(storageType()));
 }
 
 void MLoadDataViewElement::printOpcode(GenericPrinter& out) const {
   MDefinition::printOpcode(out);
-  out.printf(" %s", ScalarTypeDescr::typeName(storageType()));
+  out.printf(" %s", Scalar::name(storageType()));
 }
 
 void MAssertRange::printOpcode(GenericPrinter& out) const {
@@ -1628,10 +1519,6 @@
     return false;
   }
 
-  if (needsArgCheck() != call->needsArgCheck()) {
-    return false;
-  }
-
   if (!congruentIfOperandsEqual(call)) {
     return false;
   }
@@ -1828,70 +1715,6 @@
   return this;
 }
 
-#ifdef JS_JITSPEW
-void MTypeBarrier::printOpcode(GenericPrinter& out) const {
-  PrintOpcodeName(out, op());
-  out.printf(" ");
-  getOperand(0)->printName(out);
-}
-#endif
-
-bool MTypeBarrier::congruentTo(const MDefinition* def) const {
-  if (!def->isTypeBarrier()) {
-    return false;
-  }
-  const MTypeBarrier* other = def->toTypeBarrier();
-  if (barrierKind() != other->barrierKind() || isGuard() != other->isGuard()) {
-    return false;
-  }
-  if (!resultTypeSet()->equals(other->resultTypeSet())) {
-    return false;
-  }
-  return congruentIfOperandsEqual(other);
-}
-
-MDefinition* MTypeBarrier::foldsTo(TempAllocator& alloc) {
-  MIRType type = resultTypeSet()->getKnownMIRType();
-  if (type == MIRType::Value || type == MIRType::Object) {
-    return this;
-  }
-
-  if (!input()->isConstant()) {
-    return this;
-  }
-
-  if (input()->type() != type) {
-    return this;
-  }
-
-  return input();
-}
-
-bool MTypeBarrier::canRedefineInput() {
-  // LTypeBarrier does not need its own def usually, because we can use the
-  // input's allocation (LIRGenerator::redefineInput). However, if Spectre
-  // mitigations are enabled, guardObjectType may zero the object register on
-  // speculatively executed paths, so LTypeBarrier needs to have its own def
-  // then to guarantee all uses will see this potentially-zeroed value.
-
-  if (!JitOptions.spectreObjectMitigationsBarriers) {
-    return true;
-  }
-
-  if (barrierKind() == BarrierKind::TypeTagOnly) {
-    return true;
-  }
-
-  TemporaryTypeSet* types = resultTypeSet();
-  bool hasSpecificObjects =
-      !types->unknownObject() && types->getObjectCount() > 0;
-  if (!hasSpecificObjects) {
-    return true;
-  }
-
-  return false;
-}
-
 #ifdef DEBUG
 void MPhi::assertLoopPhi() const {
   // getLoopPredecessorOperand and getLoopBackedgeOperand rely on these
@@ -2071,51 +1894,6 @@
   return first;
 }
 
-MDefinition* MPhi::foldsFilterTypeSet() {
-  // Fold phi with as operands a combination of 'subject' and
-  // MFilterTypeSet(subject) to 'subject'.
-
-  if (inputs_.length() == 0) {
-    return nullptr;
-  }
-
-  MDefinition* subject = getOperand(0);
-  if (subject->isFilterTypeSet()) {
-    subject = subject->toFilterTypeSet()->input();
-  }
-
-  // Not same type, don't fold.
-  if (subject->type() != type()) {
-    return nullptr;
-  }
-
-  // Phi is better typed (has typeset). Don't fold.
-  if (resultTypeSet() && !subject->resultTypeSet()) {
-    return nullptr;
-  }
-
-  // Phi is better typed (according to typeset). Don't fold.
-  if (subject->resultTypeSet() && resultTypeSet()) {
-    if (!subject->resultTypeSet()->isSubset(resultTypeSet())) {
-      return nullptr;
-    }
-  }
-
-  for (size_t i = 1, e = numOperands(); i < e; i++) {
-    MDefinition* op = getOperand(i);
-    if (op == subject) {
-      continue;
-    }
-    if (op->isFilterTypeSet() && op->toFilterTypeSet()->input() == subject) {
-      continue;
-    }
-
-    return nullptr;
-  }
-
-  return subject;
-}
-
 MDefinition* MPhi::foldsTo(TempAllocator& alloc) {
   if (MDefinition* def = operandIfRedundant()) {
     return def;
@@ -2125,10 +1903,6 @@
     return def;
   }
 
-  if (MDefinition* def = foldsFilterTypeSet()) {
-    return def;
-  }
-
   return this;
 }
 
@@ -2186,116 +1960,16 @@
   return true;
 }
 
-static inline TemporaryTypeSet* MakeMIRTypeSet(TempAllocator& alloc,
-                                               MIRType type) {
-  MOZ_ASSERT(type != MIRType::Value);
-
-  TypeSet::Type ntype = TypeSet::GetMaybeUntrackedType(type);
-
-  return alloc.lifoAlloc()->new_<TemporaryTypeSet>(alloc.lifoAlloc(), ntype);
-}
-
-bool jit::MergeTypes(TempAllocator& alloc, MIRType* ptype,
-                     TemporaryTypeSet** ptypeSet, MIRType newType,
-                     TemporaryTypeSet* newTypeSet) {
-  if (newTypeSet && newTypeSet->empty()) {
-    return true;
-  }
-  LifoAlloc::AutoFallibleScope fallibleAllocator(alloc.lifoAlloc());
+static void MergeTypes(MIRType* ptype, MIRType newType) {
+  // TODO(no-TI): clean up
   if (newType != *ptype) {
     if (IsTypeRepresentableAsDouble(newType) &&
         IsTypeRepresentableAsDouble(*ptype)) {
       *ptype = MIRType::Double;
     } else if (*ptype != MIRType::Value) {
-      if (!*ptypeSet) {
-        *ptypeSet = MakeMIRTypeSet(alloc, *ptype);
-        if (!*ptypeSet) {
-          return false;
-        }
-      }
       *ptype = MIRType::Value;
-    } else if (*ptypeSet && (*ptypeSet)->empty()) {
-      *ptype = newType;
-    }
-  }
-  if (*ptypeSet) {
-    if (!newTypeSet && newType != MIRType::Value) {
-      newTypeSet = MakeMIRTypeSet(alloc, newType);
-      if (!newTypeSet) {
-        return false;
-      }
     }
-    if (newTypeSet) {
-      if (!newTypeSet->isSubset(*ptypeSet)) {
-        *ptypeSet =
-            TypeSet::unionSets(*ptypeSet, newTypeSet, alloc.lifoAlloc());
-        if (!*ptypeSet) {
-          return false;
-        }
-      }
-    } else {
-      *ptypeSet = nullptr;
-    }
-  }
-  return true;
-}
-
-// Tests whether 'types' includes all possible values represented by
-// input/inputTypes.
-bool jit::TypeSetIncludes(TypeSet* types, MIRType input, TypeSet* inputTypes) {
-  if (!types) {
-    return inputTypes && inputTypes->empty();
-  }
-
-  switch (input) {
-    case MIRType::Undefined:
-    case MIRType::Null:
-    case MIRType::Boolean:
-    case MIRType::Int32:
-    case MIRType::Double:
-    case MIRType::Float32:
-    case MIRType::String:
-    case MIRType::Symbol:
-    case MIRType::BigInt:
-    case MIRType::MagicOptimizedArguments:
-      return types->hasType(TypeSet::PrimitiveType(input));
-
-    case MIRType::Object:
-      return types->unknownObject() ||
-             (inputTypes && inputTypes->isSubset(types));
-
-    case MIRType::Value:
-      return types->unknown() || (inputTypes && inputTypes->isSubset(types));
-
-    default:
-      MOZ_CRASH("Bad input type");
-  }
-}
-
-// Tests if two type combos (type/typeset) are equal.
-bool jit::EqualTypes(MIRType type1, TemporaryTypeSet* typeset1, MIRType type2,
-                     TemporaryTypeSet* typeset2) {
-  // Types should equal.
-  if (type1 != type2) {
-    return false;
-  }
-
-  // Both have equal type and no typeset.
-  if (!typeset1 && !typeset2) {
-    return true;
-  }
-
-  // If only one instructions has a typeset.
-  // Test if the typset contains the same information as the MIRType.
-  if (typeset1 && !typeset2) {
-    return TypeSetIncludes(typeset1, type2, nullptr);
-  }
-  if (!typeset1 && typeset2) {
-    return TypeSetIncludes(typeset2, type1, nullptr);
   }
-
-  // Typesets should equal.
-  return typeset1->equals(typeset2);
 }
 
 bool MPhi::specializeType(TempAllocator& alloc) {
@@ -2306,52 +1980,14 @@
 
   MOZ_ASSERT(!inputs_.empty());
 
-  size_t start;
-  if (hasBackedgeType_) {
-    // The type of this phi has already been populated with potential types
-    // that could come in via loop backedges.
-    start = 0;
-  } else {
-    setResultType(getOperand(0)->type());
-    setResultTypeSet(getOperand(0)->resultTypeSet());
-    start = 1;
-  }
-
-  MIRType resultType = this->type();
-  TemporaryTypeSet* resultTypeSet = this->resultTypeSet();
+  MIRType resultType = getOperand(0)->type();
 
-  for (size_t i = start; i < inputs_.length(); i++) {
+  for (size_t i = 1; i < inputs_.length(); i++) {
     MDefinition* def = getOperand(i);
-    if (!MergeTypes(alloc, &resultType, &resultTypeSet, def->type(),
-                    def->resultTypeSet())) {
-      return false;
-    }
+    MergeTypes(&resultType, def->type());
   }
 
   setResultType(resultType);
-  setResultTypeSet(resultTypeSet);
-  return true;
-}
-
-bool MPhi::addBackedgeType(TempAllocator& alloc, MIRType type,
-                           TemporaryTypeSet* typeSet) {
-  MOZ_ASSERT(!specialized_);
-
-  if (hasBackedgeType_) {
-    MIRType resultType = this->type();
-    TemporaryTypeSet* resultTypeSet = this->resultTypeSet();
-
-    if (!MergeTypes(alloc, &resultType, &resultTypeSet, type, typeSet)) {
-      return false;
-    }
-
-    setResultType(resultType);
-    setResultTypeSet(resultTypeSet);
-  } else {
-    setResultType(type);
-    setResultTypeSet(typeSet);
-    hasBackedgeType_ = true;
-  }
   return true;
 }
 
@@ -2398,61 +2034,18 @@
     return true;
   }
 
-  if (TemporaryTypeSet* types = def->resultTypeSet()) {
-    if (this->resultTypeSet()) {
-      return types->isSubset(this->resultTypeSet());
-    }
-    if (this->type() == MIRType::Value || types->empty()) {
-      return true;
-    }
-    return this->type() == types->getKnownMIRType();
-  }
-
   if (def->type() == MIRType::Value) {
     // This phi must be able to be any value.
-    return this->type() == MIRType::Value &&
-           (!this->resultTypeSet() || this->resultTypeSet()->unknown());
+    return this->type() == MIRType::Value;
   }
 
   return this->mightBeType(def->type());
 }
 
-bool MPhi::checkForTypeChange(TempAllocator& alloc, MDefinition* ins,
-                              bool* ptypeChange) {
-  MIRType resultType = this->type();
-  TemporaryTypeSet* resultTypeSet = this->resultTypeSet();
-
-  if (JitOptions.warpBuilder) {
-    // WarpBuilder does not specialize phis during MIR building and does not
-    // rely on MIR type information.
-    MOZ_ASSERT(resultType == MIRType::Value);
-    MOZ_ASSERT(!resultTypeSet);
-    return true;
-  }
-
-  if (!MergeTypes(alloc, &resultType, &resultTypeSet, ins->type(),
-                  ins->resultTypeSet())) {
-    return false;
-  }
-
-  if (resultType != this->type() || resultTypeSet != this->resultTypeSet()) {
-    *ptypeChange = true;
-    setResultType(resultType);
-    setResultTypeSet(resultTypeSet);
-  }
-  return true;
-}
-
 MBox::MBox(TempAllocator& alloc, MDefinition* ins)
     : MUnaryInstruction(classOpcode, ins) {
+  // TODO(no-TI): move to MIR.h
   setResultType(MIRType::Value);
-  if (ins->resultTypeSet()) {
-    setResultTypeSet(ins->resultTypeSet());
-  } else if (ins->type() != MIRType::Value) {
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(MakeMIRTypeSet(alloc, ins->type()));
-    }
-  }
   setMovable();
 }
 
@@ -2845,35 +2438,6 @@
   return this;
 }
 
-void MFilterTypeSet::trySpecializeFloat32(TempAllocator& alloc) {
-  MDefinition* in = input();
-  if (in->type() != MIRType::Float32) {
-    return;
-  }
-
-  setResultType(MIRType::Float32);
-}
-
-bool MFilterTypeSet::canProduceFloat32() const {
-  // A FilterTypeSet should be a producer if the input is a producer too.
-  // Also, be overly conservative by marking as not float32 producer when the
-  // input is a phi, as phis can be cyclic (phiA -> FilterTypeSet -> phiB ->
-  // phiA) and FilterTypeSet doesn't belong in the Float32 phi analysis.
-  return !input()->isPhi() && input()->canProduceFloat32();
-}
-
-bool MFilterTypeSet::canConsumeFloat32(MUse* operand) const {
-  MOZ_ASSERT(getUseFor(0) == operand);
-  // A FilterTypeSet should be a consumer if all uses are consumer. See also
-  // comment below MFilterTypeSet::canProduceFloat32.
-  bool allConsumerUses = true;
-  for (MUseDefIterator use(this); allConsumerUses && use; use++) {
-    allConsumerUses &=
-        !use.def()->isPhi() && use.def()->canConsumeFloat32(use.use());
-  }
-  return allConsumerUses;
-}
-
 void MBinaryArithInstruction::trySpecializeFloat32(TempAllocator& alloc) {
   MOZ_ASSERT(IsNumberType(type()));
 
@@ -3068,6 +2632,7 @@
 
   auto multiply = [this, &alloc](MDefinition* lhs, MDefinition* rhs) {
     MMul* mul = MMul::New(alloc, lhs, rhs, type());
+    mul->setBailoutKind(bailoutKind());
 
     // Multiplying the same number can't yield negative zero.
     mul->setCanBeNegativeZero(lhs != rhs && canBeNegativeZero());
@@ -3551,20 +3116,6 @@
   return Compare_Unknown;
 }
 
-void MCompare::cacheOperandMightEmulateUndefined(
-    CompilerConstraintList* constraints) {
-  MOZ_ASSERT(operandMightEmulateUndefined());
-
-  if (getOperand(0)->maybeEmulatesUndefined(constraints)) {
-    return;
-  }
-  if (getOperand(1)->maybeEmulatesUndefined(constraints)) {
-    return;
-  }
-
-  markNoOperandEmulatesUndefined();
-}
-
 MDefinition* MBitNot::foldsTo(TempAllocator& alloc) {
   MOZ_ASSERT(type() == MIRType::Int32);
 
@@ -3686,16 +3237,6 @@
       alloc, StringValue(TypeName(type, GetJitContext()->runtime->names())));
 }
 
-void MTypeOf::cacheInputMaybeCallableOrEmulatesUndefined(
-    CompilerConstraintList* constraints) {
-  MOZ_ASSERT(inputMaybeCallableOrEmulatesUndefined());
-
-  if (!input()->maybeEmulatesUndefined(constraints) &&
-      !MaybeCallable(constraints, input())) {
-    markInputNotCallableOrEmulatesUndefined();
-  }
-}
-
 MUrsh* MUrsh::NewWasm(TempAllocator& alloc, MDefinition* left,
                       MDefinition* right, MIRType type) {
   MUrsh* ins = new (alloc) MUrsh(left, right, type);
@@ -3721,23 +3262,6 @@
   return resume;
 }
 
-MResumePoint* MResumePoint::Copy(TempAllocator& alloc, MResumePoint* src) {
-  MResumePoint* resume =
-      new (alloc) MResumePoint(src->block(), src->pc(), src->mode());
-  // Copy the operands from the original resume point, and not from the
-  // current block stack.
-  if (!resume->operands_.init(alloc, src->numAllocatedOperands())) {
-    src->block()->discardPreAllocatedResumePoint(resume);
-    return nullptr;
-  }
-
-  // Copy the operands.
-  for (size_t i = 0; i < resume->numOperands(); i++) {
-    resume->initOperand(i, src->getOperand(i));
-  }
-  return resume;
-}
-
 MResumePoint::MResumePoint(MBasicBlock* block, jsbytecode* pc, Mode mode)
     : MNode(block, Kind::ResumePoint),
       pc_(pc),
@@ -4655,15 +4179,6 @@
   *subject = lhs();
 }
 
-void MNot::cacheOperandMightEmulateUndefined(
-    CompilerConstraintList* constraints) {
-  MOZ_ASSERT(operandMightEmulateUndefined());
-
-  if (!getOperand(0)->maybeEmulatesUndefined(constraints)) {
-    markNoOperandEmulatesUndefined();
-  }
-}
-
 MDefinition* MNot::foldsTo(TempAllocator& alloc) {
   // Fold if the input is constant
   if (MConstant* inputConst = input()->maybeConstantValue()) {
@@ -4724,8 +4239,6 @@
 
 bool MCreateThisWithTemplate::canRecoverOnBailout() const {
   MOZ_ASSERT(templateObject()->is<PlainObject>());
-  MOZ_ASSERT(
-      !templateObject()->as<PlainObject>().denseElementsAreCopyOnWrite());
   return true;
 }
 
@@ -4791,9 +4304,7 @@
     Value val = nativeObject.getSlot(i);
     MDefinition* def = undefinedVal;
     if (!val.isUndefined()) {
-      MConstant* ins = val.isObject() ? MConstant::NewConstraintlessObject(
-                                            alloc, &val.toObject())
-                                      : MConstant::New(alloc, val);
+      MConstant* ins = MConstant::New(alloc, val);
       block()->insertBefore(this, ins);
       def = ins;
     }
@@ -4829,8 +4340,7 @@
   // This instruction is only used as a summary for bailout paths.
   setResultType(MIRType::Object);
   setRecoveredOnBailout();
-  numElements_ = arr->isNewArray() ? arr->toNewArray()->length()
-                                   : arr->toNewArrayCopyOnWrite()->length();
+  numElements_ = arr->toNewArray()->length();
 }
 
 bool MArrayState::init(TempAllocator& alloc, MDefinition* obj,
@@ -4847,32 +4357,9 @@
 
 bool MArrayState::initFromTemplateObject(TempAllocator& alloc,
                                          MDefinition* undefinedVal) {
-  if (!array()->isNewArrayCopyOnWrite()) {
-    for (size_t i = 0; i < numElements(); i++) {
-      initElement(i, undefinedVal);
-    }
-
-    return true;
-  }
-
-  ArrayObject* obj = array()->toNewArrayCopyOnWrite()->templateObject();
-  MOZ_ASSERT(obj->length() == numElements());
-
-  // Initialize all the elements of the object state with the value contained in
-  // the template object.
   for (size_t i = 0; i < numElements(); i++) {
-    Value val = obj->getDenseElement(i);
-    MDefinition* def = undefinedVal;
-    if (!val.isUndefined()) {
-      MConstant* ins = val.isObject() ? MConstant::NewConstraintlessObject(
-                                            alloc, &val.toObject())
-                                      : MConstant::New(alloc, val);
-      block()->insertBefore(this, ins);
-      def = ins;
-    }
-    initElement(i, def);
+    initElement(i, undefinedVal);
   }
-
   return true;
 }
 
@@ -4922,26 +4409,15 @@
   return res;
 }
 
-MNewArray::MNewArray(TempAllocator& alloc, CompilerConstraintList* constraints,
-                     uint32_t length, MConstant* templateConst,
-                     gc::InitialHeap initialHeap, jsbytecode* pc, bool vmCall)
+MNewArray::MNewArray(TempAllocator& alloc, uint32_t length,
+                     MConstant* templateConst, gc::InitialHeap initialHeap,
+                     jsbytecode* pc, bool vmCall)
     : MUnaryInstruction(classOpcode, templateConst),
       length_(length),
       initialHeap_(initialHeap),
-      convertDoubleElements_(false),
       pc_(pc),
       vmCall_(vmCall) {
   setResultType(MIRType::Object);
-  if (templateObject() && !JitOptions.warpBuilder) {
-    if (TemporaryTypeSet* types =
-            MakeSingletonTypeSet(alloc, constraints, templateObject())) {
-      setResultTypeSet(types);
-      if (types->convertDoubleElements(constraints) ==
-          TemporaryTypeSet::AlwaysConvertToDoubles) {
-        convertDoubleElements_ = true;
-      }
-    }
-  }
 }
 
 MDefinition::AliasType MLoadFixedSlot::mightAlias(
@@ -5543,113 +5019,18 @@
   return congruentIfOperandsEqual(ins);
 }
 
-void InlinePropertyTable::trimTo(const InliningTargets& targets,
-                                 const BoolVector& choiceSet) {
-  for (size_t i = 0; i < targets.length(); i++) {
-    // If the target was inlined, don't erase the entry.
-    if (choiceSet[i]) {
-      continue;
-    }
+MDefinition::AliasType MGetPropertyPolymorphic::mightAlias(
+    const MDefinition* store) const {
+  // Allow hoisting this instruction if the store does not write to a
+  // slot read by this instruction.
 
-    // If the target wasn't a function we would have veto'ed it
-    // and it will not be in the entries list.
-    if (!targets[i].target->is<JSFunction>()) {
-      continue;
-    }
-
-    JSFunction* target = &targets[i].target->as<JSFunction>();
-
-    // Eliminate all entries containing the vetoed function from the map.
-    size_t j = 0;
-    while (j < numEntries()) {
-      if (entries_[j]->func == target) {
-        entries_.erase(&entries_[j]);
-      } else {
-        j++;
-      }
-    }
-  }
-}
-
-void InlinePropertyTable::trimToTargets(const InliningTargets& targets) {
-  JitSpew(JitSpew_Inlining, "Got inlineable property cache with %d cases",
-          (int)numEntries());
-
-  size_t i = 0;
-  while (i < numEntries()) {
-    bool foundFunc = false;
-    for (size_t j = 0; j < targets.length(); j++) {
-      if (entries_[i]->func == targets[j].target) {
-        foundFunc = true;
-        break;
-      }
-    }
-    if (!foundFunc) {
-      entries_.erase(&(entries_[i]));
-    } else {
-      i++;
-    }
-  }
-
-  JitSpew(JitSpew_Inlining,
-          "%d inlineable cases left after trimming to %d targets",
-          (int)numEntries(), (int)targets.length());
-}
-
-bool InlinePropertyTable::hasFunction(JSFunction* func) const {
-  for (size_t i = 0; i < numEntries(); i++) {
-    if (entries_[i]->func == func) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool InlinePropertyTable::hasObjectGroup(ObjectGroup* group) const {
-  for (size_t i = 0; i < numEntries(); i++) {
-    if (entries_[i]->group == group) {
-      return true;
-    }
-  }
-  return false;
-}
-
-TemporaryTypeSet* InlinePropertyTable::buildTypeSetForFunction(
-    TempAllocator& tempAlloc, JSFunction* func) const {
-  LifoAlloc* alloc = tempAlloc.lifoAlloc();
-  TemporaryTypeSet* types = alloc->new_<TemporaryTypeSet>();
-  if (!types) {
-    return nullptr;
-  }
-  for (size_t i = 0; i < numEntries(); i++) {
-    if (entries_[i]->func == func) {
-      types->addType(TypeSet::ObjectType(entries_[i]->group), alloc);
-    }
-  }
-  return types;
-}
-
-bool InlinePropertyTable::appendRoots(MRootList& roots) const {
-  for (const Entry* entry : entries_) {
-    if (!entry->appendRoots(roots)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-MDefinition::AliasType MGetPropertyPolymorphic::mightAlias(
-    const MDefinition* store) const {
-  // Allow hoisting this instruction if the store does not write to a
-  // slot read by this instruction.
-
-  if (!store->isStoreFixedSlot() && !store->isStoreDynamicSlot()) {
-    return AliasType::MayAlias;
-  }
-
-  for (size_t i = 0; i < numReceivers(); i++) {
-    const Shape* shape = this->shape(i);
-    if (!shape) {
+  if (!store->isStoreFixedSlot() && !store->isStoreDynamicSlot()) {
+    return AliasType::MayAlias;
+  }
+
+  for (size_t i = 0; i < numReceivers(); i++) {
+    const Shape* shape = this->shape(i);
+    if (!shape) {
       continue;
     }
     if (shape->slot() < shape->numFixedSlots()) {
@@ -5717,26 +5098,6 @@
   return true;
 }
 
-bool MDispatchInstruction::appendRoots(MRootList& roots) const {
-  for (const Entry& entry : map_) {
-    if (!entry.appendRoots(roots)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool MObjectGroupDispatch::appendRoots(MRootList& roots) const {
-  if (inlinePropertyTable_ && !inlinePropertyTable_->appendRoots(roots)) {
-    return false;
-  }
-  return MDispatchInstruction::appendRoots(roots);
-}
-
-bool MFunctionDispatch::appendRoots(MRootList& roots) const {
-  return MDispatchInstruction::appendRoots(roots);
-}
-
 bool MConstant::appendRoots(MRootList& roots) const {
   switch (type()) {
     case MIRType::String:
@@ -6427,654 +5788,14 @@
   return input;
 }
 
-bool jit::ElementAccessIsDenseNative(CompilerConstraintList* constraints,
-                                     MDefinition* obj, MDefinition* id) {
-  if (obj->mightBeType(MIRType::String)) {
-    return false;
-  }
-
-  if (id->type() != MIRType::Int32 && id->type() != MIRType::Double) {
-    return false;
-  }
-
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (!types) {
-    return false;
-  }
-
-  // Typed arrays are native classes but do not have dense elements.
-  const JSClass* clasp = types->getKnownClass(constraints);
-  return clasp && clasp->isNative() && !IsTypedArrayClass(clasp);
-}
-
-bool jit::ElementAccessIsTypedArray(CompilerConstraintList* constraints,
-                                    MDefinition* obj, MDefinition* id,
-                                    Scalar::Type* arrayType) {
-  if (obj->mightBeType(MIRType::String)) {
-    return false;
-  }
-
-  if (id->type() != MIRType::Int32 && id->type() != MIRType::Double) {
-    return false;
-  }
-
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  if (!types) {
-    return false;
-  }
-
-  *arrayType = types->getTypedArrayType(constraints);
-
-  if (*arrayType == Scalar::MaxTypedArrayViewType) {
-    return false;
-  }
-
-  return true;
-}
-
-bool jit::ElementAccessIsPacked(CompilerConstraintList* constraints,
-                                MDefinition* obj) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  return types && !types->hasObjectFlags(constraints, OBJECT_FLAG_NON_PACKED);
-}
-
-bool jit::ElementAccessMightBeCopyOnWrite(CompilerConstraintList* constraints,
-                                          MDefinition* obj) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  return !types ||
-         types->hasObjectFlags(constraints, OBJECT_FLAG_COPY_ON_WRITE);
-}
-
-bool jit::ElementAccessMightBeNonExtensible(CompilerConstraintList* constraints,
-                                            MDefinition* obj) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  return !types || types->hasObjectFlags(constraints,
-                                         OBJECT_FLAG_NON_EXTENSIBLE_ELEMENTS);
-}
-
-AbortReasonOr<bool> jit::ElementAccessHasExtraIndexedProperty(
-    IonBuilder* builder, MDefinition* obj) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-
-  if (!types || types->hasObjectFlags(builder->constraints(),
-                                      OBJECT_FLAG_LENGTH_OVERFLOW)) {
-    return true;
-  }
-
-  return TypeCanHaveExtraIndexedProperties(builder, types);
-}
-
-MIRType jit::DenseNativeElementType(CompilerConstraintList* constraints,
-                                    MDefinition* obj) {
-  TemporaryTypeSet* types = obj->resultTypeSet();
-  MIRType elementType = MIRType::None;
-  unsigned count = types->getObjectCount();
-
-  for (unsigned i = 0; i < count; i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return MIRType::None;
-    }
-
-    HeapTypeSetKey elementTypes = key->property(JSID_VOID);
-
-    MIRType type = elementTypes.knownMIRType(constraints);
-    if (type == MIRType::None) {
-      return MIRType::None;
-    }
-
-    if (elementType == MIRType::None) {
-      elementType = type;
-    } else if (elementType != type) {
-      return MIRType::None;
-    }
-  }
-
-  return elementType;
-}
-
-static BarrierKind PropertyReadNeedsTypeBarrier(
-    CompilerConstraintList* constraints, TypeSet::ObjectKey* key,
-    PropertyName* name, TypeSet* observed) {
-  // If the object being read from has types for the property which haven't
-  // been observed at this access site, the read could produce a new type and
-  // a barrier is needed. Note that this only covers reads from properties
-  // which are accounted for by type information, i.e. native data properties
-  // and elements.
-  //
-  // We also need a barrier if the object is a proxy, because then all bets
-  // are off, just as if it has unknown properties.
-  if (key->unknownProperties() || observed->empty() ||
-      key->clasp()->isProxy()) {
-    return BarrierKind::TypeSet;
-  }
-
-  if (!name && IsTypedArrayClass(key->clasp())) {
-    Scalar::Type arrayType = GetTypedArrayClassType(key->clasp());
-    MIRType type = MIRTypeForArrayBufferViewRead(arrayType, true);
-    if (observed->mightBeMIRType(type)) {
-      return BarrierKind::NoBarrier;
-    }
-    return BarrierKind::TypeSet;
-  }
-
-  jsid id = name ? NameToId(name) : JSID_VOID;
-  HeapTypeSetKey property = key->property(id);
-  if (property.maybeTypes()) {
-    if (!TypeSetIncludes(observed, MIRType::Value, property.maybeTypes())) {
-      // If all possible objects have been observed, we don't have to
-      // guard on the specific object types.
-      if (property.maybeTypes()->objectsAreSubset(observed)) {
-        property.freeze(constraints);
-        return BarrierKind::TypeTagOnly;
-      }
-      return BarrierKind::TypeSet;
-    }
-  }
-
-  // Type information for global objects is not required to reflect the
-  // initial 'undefined' value for properties, in particular global
-  // variables declared with 'var'. Until the property is assigned a value
-  // other than undefined, a barrier is required.
-  if (key->isSingleton()) {
-    JSObject* obj = key->singleton();
-    if (name && CanHaveEmptyPropertyTypesForOwnProperty(obj) &&
-        (!property.maybeTypes() || property.maybeTypes()->empty())) {
-      return BarrierKind::TypeSet;
-    }
-  }
-
-  property.freeze(constraints);
-  return BarrierKind::NoBarrier;
-}
-
-BarrierKind jit::PropertyReadNeedsTypeBarrier(
-    JSContext* propertycx, TempAllocator& alloc,
-    CompilerConstraintList* constraints, TypeSet::ObjectKey* key,
-    PropertyName* name, TemporaryTypeSet* observed, bool updateObserved) {
-  if (!updateObserved) {
-    return PropertyReadNeedsTypeBarrier(constraints, key, name, observed);
-  }
-
-  // If this access has never executed, try to add types to the observed set
-  // according to any property which exists on the object or its prototype.
-  if (observed->empty() && name) {
-    TypeSet::ObjectKey* obj = key;
-    do {
-      if (!obj->clasp()->isNative()) {
-        break;
-      }
-
-      if (propertycx) {
-        obj->ensureTrackedProperty(propertycx, NameToId(name));
-      }
-
-      if (obj->unknownProperties()) {
-        break;
-      }
-
-      HeapTypeSetKey property = obj->property(NameToId(name));
-      if (property.maybeTypes()) {
-        TypeSet::TypeList types;
-        if (!property.maybeTypes()->enumerateTypes(&types)) {
-          break;
-        }
-        if (types.length() == 1) {
-          // Note: the return value here is ignored.
-          observed->addType(types[0], alloc.lifoAlloc());
-        }
-        break;
-      }
-
-      if (!obj->proto().isObject()) {
-        break;
-      }
-      obj = TypeSet::ObjectKey::get(obj->proto().toObject());
-    } while (obj);
-  }
-
-  return PropertyReadNeedsTypeBarrier(constraints, key, name, observed);
-}
-
-BarrierKind jit::PropertyReadNeedsTypeBarrier(
-    JSContext* propertycx, TempAllocator& alloc,
-    CompilerConstraintList* constraints, MDefinition* obj, PropertyName* name,
-    TemporaryTypeSet* observed) {
-  if (observed->unknown()) {
-    return BarrierKind::NoBarrier;
-  }
-
-  TypeSet* types = obj->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return BarrierKind::TypeSet;
-  }
-
-  BarrierKind res = BarrierKind::NoBarrier;
-
-  bool updateObserved = types->getObjectCount() == 1;
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    if (TypeSet::ObjectKey* key = types->getObject(i)) {
-      BarrierKind kind = PropertyReadNeedsTypeBarrier(
-          propertycx, alloc, constraints, key, name, observed, updateObserved);
-      if (kind == BarrierKind::TypeSet) {
-        return BarrierKind::TypeSet;
-      }
-
-      if (kind == BarrierKind::TypeTagOnly) {
-        MOZ_ASSERT(res == BarrierKind::NoBarrier ||
-                   res == BarrierKind::TypeTagOnly);
-        res = BarrierKind::TypeTagOnly;
-      } else {
-        MOZ_ASSERT(kind == BarrierKind::NoBarrier);
-      }
-    }
-  }
-
-  return res;
-}
-
-AbortReasonOr<BarrierKind> jit::PropertyReadOnPrototypeNeedsTypeBarrier(
-    IonBuilder* builder, MDefinition* obj, PropertyName* name,
-    TemporaryTypeSet* observed) {
-  if (observed->unknown()) {
-    return BarrierKind::NoBarrier;
-  }
+MDefinition* MGuardIndexIsNonNegative::foldsTo(TempAllocator& alloc) {
+  MOZ_ASSERT(index()->type() == MIRType::Int32);
 
-  TypeSet* types = obj->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return BarrierKind::TypeSet;
-  }
-
-  BarrierKind res = BarrierKind::NoBarrier;
-
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-    while (true) {
-      if (!builder->alloc().ensureBallast()) {
-        return builder->abort(AbortReason::Alloc);
-      }
-      if (!key->hasStableClassAndProto(builder->constraints())) {
-        return BarrierKind::TypeSet;
-      }
-      if (!key->proto().isObject()) {
-        break;
-      }
-      JSObject* proto = builder->checkNurseryObject(key->proto().toObject());
-      key = TypeSet::ObjectKey::get(proto);
-      BarrierKind kind = PropertyReadNeedsTypeBarrier(builder->constraints(),
-                                                      key, name, observed);
-      if (kind == BarrierKind::TypeSet) {
-        return BarrierKind::TypeSet;
-      }
-
-      if (kind == BarrierKind::TypeTagOnly) {
-        MOZ_ASSERT(res == BarrierKind::NoBarrier ||
-                   res == BarrierKind::TypeTagOnly);
-        res = BarrierKind::TypeTagOnly;
-      } else {
-        MOZ_ASSERT(kind == BarrierKind::NoBarrier);
-      }
-    }
-  }
-
-  return res;
-}
-
-bool jit::PropertyReadIsIdempotent(CompilerConstraintList* constraints,
-                                   MDefinition* obj, PropertyName* name) {
-  // Determine if reading a property from obj is likely to be idempotent.
-
-  TypeSet* types = obj->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return false;
-  }
-
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    if (TypeSet::ObjectKey* key = types->getObject(i)) {
-      if (key->unknownProperties()) {
-        return false;
-      }
-
-      // Check if the property has been reconfigured or is a getter.
-      HeapTypeSetKey property = key->property(NameToId(name));
-      if (property.nonData(constraints)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-AbortReasonOr<bool> PrototypeHasIndexedProperty(IonBuilder* builder,
-                                                JSObject* obj) {
-  do {
-    TypeSet::ObjectKey* key =
-        TypeSet::ObjectKey::get(builder->checkNurseryObject(obj));
-    if (ClassCanHaveExtraProperties(key->clasp())) {
-      return true;
-    }
-    if (key->unknownProperties()) {
-      return true;
-    }
-    HeapTypeSetKey index = key->property(JSID_VOID);
-    if (index.nonData(builder->constraints()) ||
-        index.isOwnProperty(builder->constraints())) {
-      return true;
-    }
-    obj = obj->staticPrototype();
-    if (!builder->alloc().ensureBallast()) {
-      return builder->abort(AbortReason::Alloc);
-    }
-  } while (obj);
-
-  return false;
-}
-
-// Whether obj or any of its prototypes have an indexed property.
-AbortReasonOr<bool> jit::TypeCanHaveExtraIndexedProperties(
-    IonBuilder* builder, TemporaryTypeSet* types) {
-  const JSClass* clasp = types->getKnownClass(builder->constraints());
-
-  // Note: typed arrays have indexed properties not accounted for by type
-  // information, though these are all in bounds and will be accounted for
-  // by JIT paths.
-  if (!clasp ||
-      (ClassCanHaveExtraProperties(clasp) && !IsTypedArrayClass(clasp))) {
-    return true;
-  }
-
-  if (types->hasObjectFlags(builder->constraints(),
-                            OBJECT_FLAG_SPARSE_INDEXES)) {
-    return true;
-  }
-
-  JSObject* proto;
-  if (!types->getCommonPrototype(builder->constraints(), &proto)) {
-    return true;
-  }
-
-  if (!proto) {
-    return false;
-  }
-
-  return PrototypeHasIndexedProperty(builder, proto);
-}
-
-static bool PropertyTypeIncludes(TempAllocator& alloc, HeapTypeSetKey property,
-                                 MDefinition* value, MIRType implicitType) {
-  // If implicitType is not MIRType::None, it is an additional type which the
-  // property implicitly includes. In this case, make a new type set which
-  // explicitly contains the type.
-  TypeSet* types = property.maybeTypes();
-  if (implicitType != MIRType::None) {
-    TypeSet::Type newType = TypeSet::PrimitiveType(implicitType);
-    if (types) {
-      types = types->clone(alloc.lifoAlloc());
-    } else {
-      types = alloc.lifoAlloc()->new_<TemporaryTypeSet>();
-    }
-    if (!types) {
-      return false;
-    }
-    types->addType(newType, alloc.lifoAlloc());
-  }
-
-  return TypeSetIncludes(types, value->type(), value->resultTypeSet());
-}
-
-static bool TryAddTypeBarrierForWrite(TempAllocator& alloc,
-                                      CompilerConstraintList* constraints,
-                                      MBasicBlock* current,
-                                      TemporaryTypeSet* objTypes,
-                                      PropertyName* name, MDefinition** pvalue,
-                                      MIRType implicitType) {
-  // Return whether pvalue was modified to include a type barrier ensuring
-  // that writing the value to objTypes/id will not require changing type
-  // information.
-
-  // All objects in the set must have the same types for name. Otherwise, we
-  // could bail out without subsequently triggering a type change that
-  // invalidates the compiled code.
-  Maybe<HeapTypeSetKey> aggregateProperty;
-
-  for (size_t i = 0; i < objTypes->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = objTypes->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return false;
-    }
-
-    jsid id = name ? NameToId(name) : JSID_VOID;
-    HeapTypeSetKey property = key->property(id);
-    if (!property.maybeTypes() || property.couldBeConstant(constraints)) {
-      return false;
-    }
-
-    if (PropertyTypeIncludes(alloc, property, *pvalue, implicitType)) {
-      return false;
-    }
-
-    // This freeze is not required for correctness, but ensures that we
-    // will recompile if the property types change and the barrier can
-    // potentially be removed.
-    property.freeze(constraints);
-
-    if (!aggregateProperty) {
-      aggregateProperty.emplace(property);
-    } else {
-      if (!aggregateProperty->maybeTypes()->equals(property.maybeTypes())) {
-        return false;
-      }
-    }
-  }
-
-  MOZ_ASSERT(aggregateProperty);
-
-  MIRType propertyType = aggregateProperty->knownMIRType(constraints);
-  switch (propertyType) {
-    case MIRType::Boolean:
-    case MIRType::Int32:
-    case MIRType::Double:
-    case MIRType::String:
-    case MIRType::Symbol:
-    case MIRType::BigInt: {
-      // The property is a particular primitive type, guard by unboxing the
-      // value before the write.
-      if (!(*pvalue)->mightBeType(propertyType)) {
-        // The value's type does not match the property type. Just do a VM
-        // call as it will always trigger invalidation of the compiled code.
-        MOZ_ASSERT_IF((*pvalue)->type() != MIRType::Value,
-                      (*pvalue)->type() != propertyType);
-        return false;
-      }
-      MInstruction* ins =
-          MUnbox::New(alloc, *pvalue, propertyType, MUnbox::Fallible);
-      current->add(ins);
-      *pvalue = ins;
-      return true;
-    }
-    default:;
-  }
-
-  if ((*pvalue)->type() != MIRType::Value) {
-    return false;
-  }
-
-  TemporaryTypeSet* types =
-      aggregateProperty->maybeTypes()->clone(alloc.lifoAlloc());
-  if (!types) {
-    return false;
-  }
-
-  // If all possible objects can be stored without a barrier, we don't have to
-  // guard on the specific object types.
-  BarrierKind kind = BarrierKind::TypeSet;
-  if ((*pvalue)->resultTypeSet() &&
-      (*pvalue)->resultTypeSet()->objectsAreSubset(types)) {
-    kind = BarrierKind::TypeTagOnly;
-  }
-
-  MInstruction* ins = MTypeBarrier::New(alloc, *pvalue, types, kind);
-  current->add(ins);
-  ins->setNotMovable();
-  if (ins->type() == MIRType::Undefined) {
-    ins = MConstant::New(alloc, UndefinedValue());
-    current->add(ins);
-  } else if (ins->type() == MIRType::Null) {
-    ins = MConstant::New(alloc, NullValue());
-    current->add(ins);
-  }
-  *pvalue = ins;
-  return true;
-}
-
-static MInstruction* AddGroupGuard(TempAllocator& alloc, MBasicBlock* current,
-                                   MDefinition* obj, TypeSet::ObjectKey* key,
-                                   bool bailOnEquality) {
-  MInstruction* guard;
-
-  if (key->isGroup()) {
-    guard = MGuardObjectGroup::New(alloc, obj, key->group(), bailOnEquality,
-                                   BailoutKind::ObjectIdentityOrTypeGuard);
-  } else {
-    MConstant* singletonConst =
-        MConstant::NewConstraintlessObject(alloc, key->singleton());
-    current->add(singletonConst);
-    guard =
-        MGuardObjectIdentity::New(alloc, obj, singletonConst, bailOnEquality);
-  }
-
-  current->add(guard);
-
-  // For now, never move object group / identity guards.
-  guard->setNotMovable();
-
-  return guard;
-}
-
-// Whether value can be written to property without changing type information.
-bool jit::CanWriteProperty(TempAllocator& alloc,
-                           CompilerConstraintList* constraints,
-                           HeapTypeSetKey property, MDefinition* value,
-                           MIRType implicitType /* = MIRType::None */) {
-  if (property.couldBeConstant(constraints)) {
-    return false;
-  }
-  return PropertyTypeIncludes(alloc, property, value, implicitType);
-}
-
-bool jit::PropertyWriteNeedsTypeBarrier(TempAllocator& alloc,
-                                        CompilerConstraintList* constraints,
-                                        MBasicBlock* current,
-                                        MDefinition** pobj, PropertyName* name,
-                                        MDefinition** pvalue, bool canModify,
-                                        MIRType implicitType) {
-  // If any value being written is not reflected in the type information for
-  // objects which obj could represent, a type barrier is needed when writing
-  // the value. As for propertyReadNeedsTypeBarrier, this only applies for
-  // properties that are accounted for by type information, i.e. normal data
-  // properties and elements.
-
-  TemporaryTypeSet* types = (*pobj)->resultTypeSet();
-  if (!types || types->unknownObject()) {
-    return true;
-  }
-
-  // If all of the objects being written to have property types which already
-  // reflect the value, no barrier at all is needed. Additionally, if all
-  // objects being written to have the same types for the property, and those
-  // types do *not* reflect the value, add a type barrier for the value.
-
-  bool success = true;
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (!key->hasStableClassAndProto(constraints)) {
-      return true;
-    }
-
-    // TI doesn't track TypedArray indexes and should never insert a type
-    // barrier for them.
-    if (!name && IsTypedArrayClass(key->clasp())) {
-      continue;
-    }
-
-    jsid id = name ? NameToId(name) : JSID_VOID;
-    HeapTypeSetKey property = key->property(id);
-    if (!CanWriteProperty(alloc, constraints, property, *pvalue,
-                          implicitType)) {
-      // Either pobj or pvalue needs to be modified to filter out the
-      // types which the value could have but are not in the property,
-      // or a VM call is required. A VM call is always required if pobj
-      // and pvalue cannot be modified.
-      if (!canModify) {
-        return true;
-      }
-      success = TryAddTypeBarrierForWrite(alloc, constraints, current, types,
-                                          name, pvalue, implicitType);
-      break;
-    }
-  }
-
-  if (success) {
-    return false;
-  }
-
-  // If all of the objects except one have property types which reflect the
-  // value, and the remaining object has no types at all for the property,
-  // add a guard that the object does not have that remaining object's type.
-
-  if (types->getObjectCount() <= 1) {
-    return true;
-  }
-
-  TypeSet::ObjectKey* excluded = nullptr;
-  for (size_t i = 0; i < types->getObjectCount(); i++) {
-    TypeSet::ObjectKey* key = types->getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (!key->hasStableClassAndProto(constraints)) {
-      return true;
-    }
-
-    if (!name && IsTypedArrayClass(key->clasp())) {
-      continue;
-    }
-
-    jsid id = name ? NameToId(name) : JSID_VOID;
-    HeapTypeSetKey property = key->property(id);
-    if (CanWriteProperty(alloc, constraints, property, *pvalue, implicitType)) {
-      continue;
-    }
-
-    if ((property.maybeTypes() && !property.maybeTypes()->empty()) ||
-        excluded) {
-      return true;
-    }
-    excluded = key;
+  MDefinition* input = index();
+  if (!input->isConstant() || input->toConstant()->toInt32() < 0) {
+    return this;
   }
-
-  MOZ_ASSERT(excluded);
-
-  *pobj = AddGroupGuard(alloc, current, *pobj, excluded,
-                        /* bailOnEquality = */ true);
-  return false;
+  return input;
 }
 
 MIonToWasmCall* MIonToWasmCall::New(TempAllocator& alloc,
diff -Nru firefox-84.0.2+build1/js/src/jit/MIRGenerator.h firefox-85.0+build1/js/src/jit/MIRGenerator.h
--- firefox-84.0.2+build1/js/src/jit/MIRGenerator.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIRGenerator.h	2021-01-18 19:58:13.000000000 +0000
@@ -81,7 +81,7 @@
 
   // Collect the evaluation result of phases after IonBuilder, such that
   // off-thread compilation can report what error got encountered.
-  void setOffThreadStatus(AbortReasonOr<Ok> result) {
+  void setOffThreadStatus(AbortReasonOr<Ok>&& result) {
     MOZ_ASSERT(offThreadStatus_.isOk());
     offThreadStatus_ = std::move(result);
   }
@@ -105,9 +105,6 @@
 
   bool bigIntsCanBeInNursery() const { return bigIntsCanBeInNursery_; }
 
-  bool safeForMinorGC() const { return safeForMinorGC_; }
-  void setNotSafeForMinorGC() { safeForMinorGC_ = false; }
-
   // Whether the main thread is trying to cancel this build.
   bool shouldCancel(const char* why) { return cancelBuild_; }
   void cancel() { cancelBuild_ = true; }
@@ -151,7 +148,6 @@
 
   bool instrumentedProfiling_;
   bool instrumentedProfilingIsCached_;
-  bool safeForMinorGC_;
   bool stringsCanBeInNursery_;
   bool bigIntsCanBeInNursery_;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/MIRGraph.cpp firefox-85.0+build1/js/src/jit/MIRGraph.cpp
--- firefox-84.0.2+build1/js/src/jit/MIRGraph.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIRGraph.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -35,7 +35,6 @@
       needsStaticStackAlignment_(false),
       instrumentedProfiling_(false),
       instrumentedProfilingIsCached_(false),
-      safeForMinorGC_(true),
       stringsCanBeInNursery_(realm ? realm->zone()->canNurseryAllocateStrings()
                                    : false),
       bigIntsCanBeInNursery_(realm ? realm->zone()->canNurseryAllocateBigInts()
@@ -606,78 +605,6 @@
   return true;
 }
 
-void MBasicBlock::shimmySlots(int discardDepth) {
-  // Move all slots above the given depth down by one,
-  // overwriting the MDefinition at discardDepth.
-
-  MOZ_ASSERT(discardDepth < 0);
-  MOZ_ASSERT(stackPosition_ + discardDepth >= info_.firstStackSlot());
-
-  for (int i = discardDepth; i < -1; i++) {
-    slots_[stackPosition_ + i] = slots_[stackPosition_ + i + 1];
-  }
-
-  --stackPosition_;
-}
-
-bool MBasicBlock::linkOsrValues(MStart* start) {
-  MResumePoint* res = start->resumePoint();
-
-  for (uint32_t i = 0; i < stackDepth(); i++) {
-    MDefinition* def = slots_[i];
-    MInstruction* cloneRp = nullptr;
-    if (i == info().environmentChainSlot()) {
-      if (def->isOsrEnvironmentChain()) {
-        cloneRp = def->toOsrEnvironmentChain();
-      }
-    } else if (i == info().returnValueSlot()) {
-      if (def->isOsrReturnValue()) {
-        cloneRp = def->toOsrReturnValue();
-      }
-    } else if (info().hasArguments() && i == info().argsObjSlot()) {
-      MOZ_ASSERT(def->isConstant() || def->isOsrArgumentsObject());
-      MOZ_ASSERT_IF(def->isConstant(),
-                    def->toConstant()->type() == MIRType::Undefined);
-      if (def->isOsrArgumentsObject()) {
-        cloneRp = def->toOsrArgumentsObject();
-      }
-    } else {
-      MOZ_ASSERT(def->isOsrValue() || def->isGetArgumentsObjectArg() ||
-                 def->isConstant() || def->isParameter());
-
-      // A constant Undefined can show up here for an argument slot when
-      // the function has an arguments object, but the argument in
-      // question is stored on the scope chain.
-      MOZ_ASSERT_IF(def->isConstant(),
-                    def->toConstant()->type() == MIRType::Undefined);
-
-      if (def->isOsrValue()) {
-        cloneRp = def->toOsrValue();
-      } else if (def->isGetArgumentsObjectArg()) {
-        cloneRp = def->toGetArgumentsObjectArg();
-      } else if (def->isParameter()) {
-        cloneRp = def->toParameter();
-      }
-    }
-
-    if (cloneRp) {
-      MResumePoint* clone = MResumePoint::Copy(graph().alloc(), res);
-      if (!clone) {
-        return false;
-      }
-      cloneRp->setResumePoint(clone);
-    }
-  }
-
-  return true;
-}
-
-void MBasicBlock::rewriteAtDepth(int32_t depth, MDefinition* ins) {
-  MOZ_ASSERT(depth < 0);
-  MOZ_ASSERT(stackPosition_ + depth >= info_.firstStackSlot());
-  rewriteSlot(stackPosition_ + depth, ins);
-}
-
 MDefinition* MBasicBlock::environmentChain() {
   return getSlot(info().environmentChainSlot());
 }
@@ -1109,7 +1036,7 @@
 #endif
 }
 
-AbortReason MBasicBlock::setBackedge(TempAllocator& alloc, MBasicBlock* pred) {
+bool MBasicBlock::setBackedge(MBasicBlock* pred) {
   // Predecessors must be finished, and at the correct stack depth.
   MOZ_ASSERT(hasLastIns());
   MOZ_ASSERT(pred->hasLastIns());
@@ -1118,25 +1045,15 @@
   // We must be a pending loop header
   MOZ_ASSERT(kind_ == PENDING_LOOP_HEADER);
 
-  bool hadTypeChange = false;
-
   // Add exit definitions to each corresponding phi at the entry.
-  if (!inheritPhisFromBackedge(alloc, pred, &hadTypeChange)) {
-    return AbortReason::Alloc;
-  }
-
-  if (hadTypeChange) {
-    return AbortReason::Disable;
+  if (!inheritPhisFromBackedge(pred)) {
+    return false;
   }
 
   // We are now a loop header proper
   kind_ = LOOP_HEADER;
 
-  if (!predecessors_.append(pred)) {
-    return AbortReason::Alloc;
-  }
-
-  return AbortReason::NoAbort;
+  return predecessors_.append(pred);
 }
 
 bool MBasicBlock::setBackedgeWasm(MBasicBlock* pred, size_t paramCount) {
@@ -1352,9 +1269,7 @@
   }
 }
 
-bool MBasicBlock::inheritPhisFromBackedge(TempAllocator& alloc,
-                                          MBasicBlock* backedge,
-                                          bool* hadTypeChange) {
+bool MBasicBlock::inheritPhisFromBackedge(MBasicBlock* backedge) {
   // We must be a pending loop header
   MOZ_ASSERT(kind_ == PENDING_LOOP_HEADER);
 
@@ -1390,15 +1305,9 @@
       exitDef = entryDef->getOperand(0);
     }
 
-    bool typeChange = false;
-
     if (!entryDef->addInputSlow(exitDef)) {
       return false;
     }
-    if (!entryDef->checkForTypeChange(alloc, exitDef, &typeChange)) {
-      return false;
-    }
-    *hadTypeChange |= typeChange;
   }
 
   return true;
diff -Nru firefox-84.0.2+build1/js/src/jit/MIRGraph.h firefox-85.0+build1/js/src/jit/MIRGraph.h
--- firefox-84.0.2+build1/js/src/jit/MIRGraph.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIRGraph.h	2021-01-18 19:58:13.000000000 +0000
@@ -175,13 +175,6 @@
     }
   }
 
-  // Discard the slot at the given depth, lowering all slots above.
-  void shimmySlots(int discardDepth);
-
-  // In an OSR block, set all MOsrValues to use the MResumePoint attached to
-  // the MStart.
-  MOZ_MUST_USE bool linkOsrValues(MStart* start);
-
   // Sets the instruction associated with various slot types. The
   // instruction must lie at the top of the stack.
   void setLocal(uint32_t local) { setVariable(info_.localSlot(local)); }
@@ -192,9 +185,6 @@
   // not be used under most circumstances.
   void rewriteSlot(uint32_t slot, MDefinition* ins) { setSlot(slot, ins); }
 
-  // Rewrites a slot based on its depth (same as argument to peek()).
-  void rewriteAtDepth(int32_t depth, MDefinition* ins);
-
   // Tracks an instruction as being pushed onto the operand stack.
   void push(MDefinition* ins) {
     MOZ_ASSERT(stackPosition_ < nslots());
@@ -283,10 +273,8 @@
   void clearDominatorInfo();
 
   // Sets a back edge. This places phi nodes and rewrites instructions within
-  // the current loop as necessary. If the backedge introduces new types for
-  // phis at the loop header, returns a disabling abort.
-  MOZ_MUST_USE AbortReason setBackedge(TempAllocator& alloc,
-                                       MBasicBlock* block);
+  // the current loop as necessary.
+  MOZ_MUST_USE bool setBackedge(MBasicBlock* block);
   MOZ_MUST_USE bool setBackedgeWasm(MBasicBlock* block, size_t paramCount);
 
   // Resets a LOOP_HEADER block to a NORMAL block.  This is needed when
@@ -302,9 +290,7 @@
   void inheritPhis(MBasicBlock* header);
 
   // Propagates backedge slots into phis operands of the loop header.
-  MOZ_MUST_USE bool inheritPhisFromBackedge(TempAllocator& alloc,
-                                            MBasicBlock* backedge,
-                                            bool* hadTypeChange);
+  MOZ_MUST_USE bool inheritPhisFromBackedge(MBasicBlock* backedge);
 
   // Compute the types for phis in this block according to their inputs.
   MOZ_MUST_USE bool specializePhis(TempAllocator& alloc);
diff -Nru firefox-84.0.2+build1/js/src/jit/MIR.h firefox-85.0+build1/js/src/jit/MIR.h
--- firefox-84.0.2+build1/js/src/jit/MIR.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/MIR.h	2021-01-18 19:58:13.000000000 +0000
@@ -37,6 +37,7 @@
 #include "js/ScalarType.h"  // js::Scalar::Type
 #include "js/Value.h"
 #include "js/Vector.h"
+#include "util/DifferentialTesting.h"
 #include "vm/ArrayObject.h"
 #include "vm/BuiltinObjectKind.h"
 #include "vm/EnvironmentObject.h"
@@ -46,7 +47,6 @@
 #include "vm/RegExpObject.h"
 #include "vm/SharedMem.h"
 #include "vm/TypedArrayObject.h"
-#include "vm/TypeSet.h"
 
 namespace JS {
 struct ExpandoAndGeneration;
@@ -82,7 +82,6 @@
 };
 
 class CompactBufferWriter;
-class IonBuilder;
 class Range;
 
 template <typename T>
@@ -471,8 +470,6 @@
   Opcode op_;              // Opcode.
   uint16_t flags_;         // Bit flags.
   Range* range_;           // Any computed range for this def.
-  MIRType resultType_;     // Representation of result type.
-  TemporaryTypeSet* resultTypeSet_;  // Optional refinement of the result type.
   union {
     MDefinition*
         loadDependency_;  // Implicit dependency (store, call, etc.) of this
@@ -486,6 +483,15 @@
   // for profiling and keeping track of what the last known pc was.
   const BytecodeSite* trackedSite_;
 
+  // If we generate a bailout path for this instruction, this is the
+  // bailout kind that will be encoded in the snapshot. When we bail out,
+  // FinishBailoutToBaseline may take action based on the bailout kind to
+  // prevent bailout loops. (For example, if an instruction bails out after
+  // being hoisted by LICM, we will disable LICM when recompiling the script.)
+  BailoutKind bailoutKind_;
+
+  MIRType resultType_;  // Representation of result type.
+
  private:
   enum Flag {
     None = 0,
@@ -519,10 +525,10 @@
         op_(op),
         flags_(0),
         range_(nullptr),
-        resultType_(MIRType::None),
-        resultTypeSet_(nullptr),
         loadDependency_(nullptr),
-        trackedSite_(nullptr) {}
+        trackedSite_(nullptr),
+        bailoutKind_(BailoutKind::Unknown),
+        resultType_(MIRType::None) {}
 
   // Copying a definition leaves the list of uses and the block empty.
   explicit MDefinition(const MDefinition& other)
@@ -531,10 +537,10 @@
         op_(other.op_),
         flags_(other.flags_),
         range_(other.range_),
-        resultType_(other.resultType_),
-        resultTypeSet_(other.resultTypeSet_),
         loadDependency_(other.loadDependency_),
-        trackedSite_(other.trackedSite_) {}
+        trackedSite_(other.trackedSite_),
+        bailoutKind_(other.bailoutKind_),
+        resultType_(other.resultType_) {}
 
   Opcode op() const { return op_; }
 
@@ -572,6 +578,9 @@
     return trackedSite_ ? trackedSite_->tree() : nullptr;
   }
 
+  BailoutKind bailoutKind() const { return bailoutKind_; }
+  void setBailoutKind(BailoutKind kind) { bailoutKind_ = kind; }
+
   JSScript* profilerLeaveScript() const {
     return trackedTree()->outermostCaller()->script();
   }
@@ -720,9 +729,6 @@
   // is MIRType::Int32.
   MIRType type() const { return resultType_; }
 
-  TemporaryTypeSet* resultTypeSet() const { return resultTypeSet_; }
-  bool emptyResultTypeSet() const;
-
   bool mightBeType(MIRType type) const {
     MOZ_ASSERT(type != MIRType::Value);
     MOZ_ASSERT(type != MIRType::ObjectOrNull);
@@ -736,7 +742,7 @@
     }
 
     if (this->type() == MIRType::Value) {
-      return !resultTypeSet() || resultTypeSet()->mightBeMIRType(type);
+      return true;
     }
 
     return false;
@@ -747,7 +753,7 @@
   // Return true if the result-set types are a subset of the given types.
   bool definitelyType(std::initializer_list<MIRType> types) const;
 
-  bool maybeEmulatesUndefined(CompilerConstraintList* constraints);
+  bool maybeEmulatesUndefined();
 
   // Float32 specialization operations (see big comment in IonAnalysis before
   // the Float32 specialization algorithm).
@@ -896,7 +902,6 @@
   inline MControlInstruction* toControlInstruction();
 
   void setResultType(MIRType type) { resultType_ = type; }
-  void setResultTypeSet(TemporaryTypeSet* types) { resultTypeSet_ = types; }
   virtual AliasSet getAliasSet() const {
     // Instructions are effectful by default.
     return AliasSet::Store(AliasSet::Any);
@@ -930,7 +935,7 @@
   bool isEffectful() const { return getAliasSet().isStore(); }
 
 #ifdef DEBUG
-  virtual bool needsResumePoint() const {
+  bool needsResumePoint() const {
     // Return whether this instruction should have its own resume point.
     return isEffectful();
   }
@@ -994,23 +999,20 @@
   MDefinition* def() const { return current_->consumer()->toDefinition(); }
 };
 
-#ifdef DEBUG
-bool IonCompilationCanUseNurseryPointers();
-#endif
-
-// Helper class to check that GC pointers embedded in MIR instructions are in
-// in the nursery only when the store buffer has been marked as needing to
-// cancel all ion compilations. Otherwise, off-thread Ion compilation and
-// nursery GCs can happen in parallel, so it's invalid to store pointers to
-// nursery things. There's no need to root these pointers, as GC is suppressed
-// during compilation and off-thread compilations are canceled on major GCs.
+// Helper class to check that GC pointers embedded in MIR instructions are not
+// in the nursery. Off-thread compilation and nursery GCs can happen in
+// parallel. Nursery pointers are handled with MNurseryObject and the
+// nurseryObjects lists in WarpSnapshot and IonScript.
+//
+// These GC things are rooted through the WarpSnapshot. Compacting GCs cancel
+// off-thread compilations.
 template <typename T>
 class CompilerGCPointer {
   js::gc::Cell* ptr_;
 
  public:
   explicit CompilerGCPointer(T ptr) : ptr_(ptr) {
-    MOZ_ASSERT_IF(IsInsideNursery(ptr), IonCompilationCanUseNurseryPointers());
+    MOZ_ASSERT(!IsInsideNursery(ptr));
     MOZ_ASSERT_IF(!CurrentThreadIsIonCompiling(), TlsContext.get()->suppressGC);
   }
 
@@ -1374,7 +1376,7 @@
 
 using MVariadicInstruction = MVariadicT<MInstruction>;
 
-// Generates an LSnapshot without further effect.
+// TODO(no-TI): try to remove this instruction.
 class MStart : public MNullaryInstruction {
   MStart() : MNullaryInstruction(classOpcode) {}
 
@@ -1426,7 +1428,6 @@
         truncate_(NoTruncate),
         truncateLimit_(limit) {
     setResultType(MIRType::Int32);
-    setResultTypeSet(input->resultTypeSet());
     setMovable();
   }
 
@@ -1473,22 +1474,19 @@
 #endif
 
  protected:
-  MConstant(TempAllocator& alloc, const Value& v,
-            CompilerConstraintList* constraints);
+  MConstant(TempAllocator& alloc, const Value& v);
   explicit MConstant(JSObject* obj);
   explicit MConstant(float f);
   explicit MConstant(int64_t i);
 
  public:
   INSTRUCTION_HEADER(Constant)
-  static MConstant* New(TempAllocator& alloc, const Value& v,
-                        CompilerConstraintList* constraints = nullptr);
-  static MConstant* New(TempAllocator::Fallible alloc, const Value& v,
-                        CompilerConstraintList* constraints = nullptr);
+  static MConstant* New(TempAllocator& alloc, const Value& v);
+  static MConstant* New(TempAllocator::Fallible alloc, const Value& v);
   static MConstant* New(TempAllocator& alloc, const Value& v, MIRType type);
   static MConstant* NewFloat32(TempAllocator& alloc, double d);
   static MConstant* NewInt64(TempAllocator& alloc, int64_t i);
-  static MConstant* NewConstraintlessObject(TempAllocator& alloc, JSObject* v);
+  static MConstant* NewObject(TempAllocator& alloc, JSObject* v);
   static MConstant* Copy(TempAllocator& alloc, MConstant* src) {
     return new (alloc) MConstant(*src);
   }
@@ -1702,10 +1700,9 @@
 class MParameter : public MNullaryInstruction {
   int32_t index_;
 
-  MParameter(int32_t index, TemporaryTypeSet* types)
+  explicit MParameter(int32_t index)
       : MNullaryInstruction(classOpcode), index_(index) {
     setResultType(MIRType::Value);
-    setResultTypeSet(types);
   }
 
  public:
@@ -1946,6 +1943,7 @@
 // Tests if the input instruction evaluates to true or false, and jumps to the
 // start of a corresponding basic block.
 class MTest : public MAryControlInstruction<1, 2>, public TestPolicy::Data {
+  // TODO(no-TI): remove here and other MIR instructions.
   bool operandMightEmulateUndefined_;
 
   MTest(MDefinition* ins, MBasicBlock* trueBranch, MBasicBlock* falseBranch)
@@ -1975,12 +1973,6 @@
 
   AliasSet getAliasSet() const override { return AliasSet::None(); }
 
-  // We cache whether our operand might emulate undefined, but we don't want
-  // to do that from New() or the constructor, since those can be called on
-  // background threads.  So make callers explicitly call it if they want us
-  // to check whether the operand might do this.  If this method is never
-  // called, we'll assume our operand can emulate undefined.
-  void cacheOperandMightEmulateUndefined(CompilerConstraintList* constraints);
   MDefinition* foldsDoubleNegation(TempAllocator& alloc);
   MDefinition* foldsConstant(TempAllocator& alloc);
   MDefinition* foldsTypes(TempAllocator& alloc);
@@ -1989,12 +1981,10 @@
   void filtersUndefinedOrNull(bool trueBranch, MDefinition** subject,
                               bool* filtersUndefined, bool* filtersNull);
 
-  void markNoOperandEmulatesUndefined() {
-    operandMightEmulateUndefined_ = false;
-  }
   bool operandMightEmulateUndefined() const {
     return operandMightEmulateUndefined_;
   }
+
 #ifdef DEBUG
   bool isConsistentFloat32Use(MUse* use) const override { return true; }
 #endif
@@ -2028,24 +2018,6 @@
   bool possiblyCalls() const override { return true; }
 };
 
-// Fabricate a type set containing only the type of the specified object.
-TemporaryTypeSet* MakeSingletonTypeSet(TempAllocator& alloc,
-                                       CompilerConstraintList* constraints,
-                                       JSObject* obj);
-
-TemporaryTypeSet* MakeSingletonTypeSet(TempAllocator& alloc,
-                                       CompilerConstraintList* constraints,
-                                       ObjectGroup* obj);
-
-MOZ_MUST_USE bool MergeTypes(TempAllocator& alloc, MIRType* ptype,
-                             TemporaryTypeSet** ptypeSet, MIRType newType,
-                             TemporaryTypeSet* newTypeSet);
-
-bool TypeSetIncludes(TypeSet* types, MIRType input, TypeSet* inputTypes);
-
-bool EqualTypes(MIRType type1, TemporaryTypeSet* typeset1, MIRType type2,
-                TemporaryTypeSet* typeset2);
-
 class MNewArray : public MUnaryInstruction, public NoTypePolicy::Data {
  private:
   // Number of elements to allocate for the array.
@@ -2054,27 +2026,22 @@
   // Heap where the array should be allocated.
   gc::InitialHeap initialHeap_;
 
-  // Whether values written to this array should be converted to double first.
-  bool convertDoubleElements_;
-
   jsbytecode* pc_;
 
   bool vmCall_;
 
-  MNewArray(TempAllocator& alloc, CompilerConstraintList* constraints,
-            uint32_t length, MConstant* templateConst,
+  MNewArray(TempAllocator& alloc, uint32_t length, MConstant* templateConst,
             gc::InitialHeap initialHeap, jsbytecode* pc, bool vmCall = false);
 
  public:
   INSTRUCTION_HEADER(NewArray)
   TRIVIAL_NEW_WRAPPERS_WITH_ALLOC
 
-  static MNewArray* NewVM(TempAllocator& alloc,
-                          CompilerConstraintList* constraints, uint32_t length,
+  static MNewArray* NewVM(TempAllocator& alloc, uint32_t length,
                           MConstant* templateConst, gc::InitialHeap initialHeap,
                           jsbytecode* pc) {
-    return new (alloc) MNewArray(alloc, constraints, length, templateConst,
-                                 initialHeap, pc, true);
+    return new (alloc)
+        MNewArray(alloc, length, templateConst, initialHeap, pc, true);
   }
 
   uint32_t length() const { return length_; }
@@ -2089,8 +2056,6 @@
 
   bool isVMCall() const { return vmCall_; }
 
-  bool convertDoubleElements() const { return convertDoubleElements_; }
-
   // NewArray is marked as non-effectful because all our allocations are
   // either lazy when we are using "new Array(length)" or bounded by the
   // script or the stack size when we are using "new Array(...)" or "[...]"
@@ -2108,60 +2073,18 @@
   }
 };
 
-class MNewArrayCopyOnWrite : public MUnaryInstruction,
-                             public NoTypePolicy::Data {
-  gc::InitialHeap initialHeap_;
-
-  MNewArrayCopyOnWrite(TempAllocator& alloc,
-                       CompilerConstraintList* constraints,
-                       MConstant* templateConst, gc::InitialHeap initialHeap)
-      : MUnaryInstruction(classOpcode, templateConst),
-        initialHeap_(initialHeap) {
-    MOZ_ASSERT(!templateObject()->isSingleton());
-    setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject()));
-    }
-  }
-
- public:
-  INSTRUCTION_HEADER(NewArrayCopyOnWrite)
-  TRIVIAL_NEW_WRAPPERS_WITH_ALLOC
-
-  uint32_t length() const { return templateObject()->length(); }
-
-  ArrayObject* templateObject() const {
-    return &getOperand(0)->toConstant()->toObject().as<ArrayObject>();
-  }
-
-  gc::InitialHeap initialHeap() const { return initialHeap_; }
-
-  virtual AliasSet getAliasSet() const override { return AliasSet::None(); }
-
-  MOZ_MUST_USE bool writeRecoverData(
-      CompactBufferWriter& writer) const override;
-  bool canRecoverOnBailout() const override { return true; }
-};
-
 class MNewArrayDynamicLength : public MUnaryInstruction,
                                public UnboxedInt32Policy<0>::Data {
   CompilerObject templateObject_;
   gc::InitialHeap initialHeap_;
 
-  MNewArrayDynamicLength(TempAllocator& alloc,
-                         CompilerConstraintList* constraints,
-                         JSObject* templateObject, gc::InitialHeap initialHeap,
-                         MDefinition* length)
+  MNewArrayDynamicLength(TempAllocator& alloc, JSObject* templateObject,
+                         gc::InitialHeap initialHeap, MDefinition* length)
       : MUnaryInstruction(classOpcode, length),
         templateObject_(templateObject),
         initialHeap_(initialHeap) {
     setGuard();  // Need to throw if length is negative.
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder && !templateObject->isSingleton()) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject));
-    }
   }
 
  public:
@@ -2185,16 +2108,12 @@
 class MNewTypedArray : public MUnaryInstruction, public NoTypePolicy::Data {
   gc::InitialHeap initialHeap_;
 
-  MNewTypedArray(TempAllocator& alloc, CompilerConstraintList* constraints,
-                 MConstant* templateConst, gc::InitialHeap initialHeap)
+  MNewTypedArray(TempAllocator& alloc, MConstant* templateConst,
+                 gc::InitialHeap initialHeap)
       : MUnaryInstruction(classOpcode, templateConst),
         initialHeap_(initialHeap) {
     MOZ_ASSERT(!templateObject()->isSingleton());
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject()));
-    }
   }
 
  public:
@@ -2219,9 +2138,7 @@
   CompilerObject templateObject_;
   gc::InitialHeap initialHeap_;
 
-  MNewTypedArrayDynamicLength(TempAllocator& alloc,
-                              CompilerConstraintList* constraints,
-                              JSObject* templateObject,
+  MNewTypedArrayDynamicLength(TempAllocator& alloc, JSObject* templateObject,
                               gc::InitialHeap initialHeap, MDefinition* length)
       : MUnaryInstruction(classOpcode, length),
         templateObject_(templateObject),
@@ -2229,10 +2146,6 @@
     MOZ_ASSERT(!templateObject->isSingleton());
     setGuard();  // Need to throw if length is negative.
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject));
-    }
   }
 
  public:
@@ -2259,20 +2172,14 @@
   CompilerObject templateObject_;
   gc::InitialHeap initialHeap_;
 
-  MNewTypedArrayFromArray(TempAllocator& alloc,
-                          CompilerConstraintList* constraints,
-                          JSObject* templateObject, gc::InitialHeap initialHeap,
-                          MDefinition* array)
+  MNewTypedArrayFromArray(TempAllocator& alloc, JSObject* templateObject,
+                          gc::InitialHeap initialHeap, MDefinition* array)
       : MUnaryInstruction(classOpcode, array),
         templateObject_(templateObject),
         initialHeap_(initialHeap) {
     MOZ_ASSERT(!templateObject->isSingleton());
     setGuard();  // Can throw during construction.
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject));
-    }
   }
 
  public:
@@ -2297,9 +2204,7 @@
   CompilerObject templateObject_;
   gc::InitialHeap initialHeap_;
 
-  MNewTypedArrayFromArrayBuffer(TempAllocator& alloc,
-                                CompilerConstraintList* constraints,
-                                JSObject* templateObject,
+  MNewTypedArrayFromArrayBuffer(TempAllocator& alloc, JSObject* templateObject,
                                 gc::InitialHeap initialHeap,
                                 MDefinition* arrayBuffer,
                                 MDefinition* byteOffset, MDefinition* length)
@@ -2309,10 +2214,6 @@
     MOZ_ASSERT(!templateObject->isSingleton());
     setGuard();  // Can throw during construction.
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject));
-    }
   }
 
  public:
@@ -2341,9 +2242,8 @@
   Mode mode_;
   bool vmCall_;
 
-  MNewObject(TempAllocator& alloc, CompilerConstraintList* constraints,
-             MConstant* templateConst, gc::InitialHeap initialHeap, Mode mode,
-             bool vmCall = false)
+  MNewObject(TempAllocator& alloc, MConstant* templateConst,
+             gc::InitialHeap initialHeap, Mode mode, bool vmCall = false)
       : MUnaryInstruction(classOpcode, templateConst),
         initialHeap_(initialHeap),
         mode_(mode),
@@ -2351,11 +2251,6 @@
     MOZ_ASSERT_IF(mode != ObjectLiteral, templateObject());
     setResultType(MIRType::Object);
 
-    JSObject* obj = templateObject();
-    if (obj && !JitOptions.warpBuilder) {
-      setResultTypeSet(MakeSingletonTypeSet(alloc, constraints, obj));
-    }
-
     // The constant is kept separated in a MConstant, this way we can safely
     // mark it during GC if we recover the object allocation.  Otherwise, by
     // making it emittedAtUses, we do not produce register allocations for
@@ -2370,12 +2265,10 @@
   INSTRUCTION_HEADER(NewObject)
   TRIVIAL_NEW_WRAPPERS_WITH_ALLOC
 
-  static MNewObject* NewVM(TempAllocator& alloc,
-                           CompilerConstraintList* constraints,
-                           MConstant* templateConst,
+  static MNewObject* NewVM(TempAllocator& alloc, MConstant* templateConst,
                            gc::InitialHeap initialHeap, Mode mode) {
     return new (alloc)
-        MNewObject(alloc, constraints, templateConst, initialHeap, mode, true);
+        MNewObject(alloc, templateConst, initialHeap, mode, true);
   }
 
   Mode mode() const { return mode_; }
@@ -2408,14 +2301,9 @@
  private:
   Type type_;
 
-  MNewIterator(TempAllocator& alloc, CompilerConstraintList* constraints,
-               MConstant* templateConst, Type type)
+  MNewIterator(TempAllocator& alloc, MConstant* templateConst, Type type)
       : MUnaryInstruction(classOpcode, templateConst), type_(type) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject()));
-    }
     templateConst->setEmittedAtUses();
   }
 
@@ -2526,7 +2414,6 @@
                           MDefinition* initLength);
   static MArrayState* Copy(TempAllocator& alloc, MArrayState* state);
 
-  // Initialize values from CopyOnWrite arrays.
   MOZ_MUST_USE bool initFromTemplateObject(TempAllocator& alloc,
                                            MDefinition* undefinedVal);
 
@@ -2612,22 +2499,6 @@
   }
 };
 
-class MInitElem
-    : public MTernaryInstruction,
-      public MixPolicy<ObjectPolicy<0>, BoxPolicy<1>, BoxPolicy<2>>::Data {
-  MInitElem(MDefinition* obj, MDefinition* id, MDefinition* value)
-      : MTernaryInstruction(classOpcode, obj, id, value) {
-    setResultType(MIRType::None);
-  }
-
- public:
-  INSTRUCTION_HEADER(InitElem)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, getObject), (1, getId), (2, getValue))
-
-  bool possiblyCalls() const override { return true; }
-};
-
 class MInitElemGetterSetter
     : public MTernaryInstruction,
       public MixPolicy<ObjectPolicy<0>, BoxPolicy<1>, ObjectPolicy<2>>::Data {
@@ -2689,6 +2560,8 @@
   }
 };
 
+enum class DOMObjectKind : uint8_t { Proxy, Native, Unknown };
+
 class MCall : public MVariadicInstruction, public CallPolicy::Data {
  private:
   // The callee, this, and the actual arguments are all operands of MCall.
@@ -2708,7 +2581,6 @@
   // True if the caller does not use the return value.
   bool ignoresReturnValue_ : 1;
 
-  bool needsArgCheck_ : 1;
   bool needsClassCheck_ : 1;
   bool maybeCrossRealm_ : 1;
   bool needsThisCheck_ : 1;
@@ -2720,7 +2592,6 @@
         numActualArgs_(numActualArgs),
         construct_(construct),
         ignoresReturnValue_(ignoresReturnValue),
-        needsArgCheck_(true),
         needsClassCheck_(true),
         maybeCrossRealm_(true),
         needsThisCheck_(false) {
@@ -2736,9 +2607,6 @@
 
   void initCallee(MDefinition* func) { initOperand(CalleeOperandIndex, func); }
 
-  bool needsArgCheck() const { return needsArgCheck_; }
-  void disableArgCheck() { needsArgCheck_ = false; }
-
   bool needsClassCheck() const { return needsClassCheck_; }
   void disableClassCheck() { needsClassCheck_ = false; }
 
@@ -2865,6 +2733,7 @@
       : MTernaryInstruction(classOpcode, fun, argc, self), target_(target) {
     MOZ_ASSERT(argc->type() == MIRType::Int32);
     setResultType(MIRType::Value);
+    setBailoutKind(BailoutKind::TooManyArguments);
   }
 
  public:
@@ -2907,6 +2776,7 @@
       : MTernaryInstruction(classOpcode, fun, elements, self), target_(target) {
     MOZ_ASSERT(elements->type() == MIRType::Elements);
     setResultType(MIRType::Value);
+    setBailoutKind(BailoutKind::TooManyArguments);
   }
 
  public:
@@ -2951,6 +2821,7 @@
         target_(target) {
     MOZ_ASSERT(elements->type() == MIRType::Elements);
     setResultType(MIRType::Value);
+    setBailoutKind(BailoutKind::TooManyArguments);
   }
 
  public:
@@ -2981,13 +2852,10 @@
 class MBail : public MNullaryInstruction {
  protected:
   explicit MBail(BailoutKind kind) : MNullaryInstruction(classOpcode) {
-    bailoutKind_ = kind;
+    setBailoutKind(kind);
     setGuard();
   }
 
- private:
-  BailoutKind bailoutKind_;
-
  public:
   INSTRUCTION_HEADER(Bail)
 
@@ -2999,8 +2867,6 @@
   }
 
   AliasSet getAliasSet() const override { return AliasSet::None(); }
-
-  BailoutKind bailoutKind() const { return bailoutKind_; }
 };
 
 class MUnreachable : public MAryControlInstruction<0, 0>,
@@ -3290,7 +3156,6 @@
 
   static CompareType determineCompareType(JSOp op, MDefinition* left,
                                           MDefinition* right);
-  void cacheOperandMightEmulateUndefined(CompilerConstraintList* constraints);
 
 #ifdef DEBUG
   bool isConsistentFloat32Use(MUse* use) const override {
@@ -3378,10 +3243,8 @@
 
  private:
   Mode mode_;
-  BailoutKind bailoutKind_;
 
-  MUnbox(MDefinition* ins, MIRType type, Mode mode, BailoutKind kind,
-         TempAllocator& alloc)
+  MUnbox(MDefinition* ins, MIRType type, Mode mode, TempAllocator& alloc)
       : MUnaryInstruction(classOpcode, ins), mode_(mode) {
     // Only allow unboxing a non MIRType::Value when input and output types
     // don't match. This is often used to force a bailout. Boxing happens
@@ -3393,70 +3256,22 @@
                type == MIRType::Symbol || type == MIRType::BigInt ||
                type == MIRType::Object);
 
-    TemporaryTypeSet* resultSet = ins->resultTypeSet();
-    if (resultSet && type == MIRType::Object) {
-      resultSet = resultSet->cloneObjectsOnly(alloc.lifoAlloc());
-    }
-
     setResultType(type);
-    setResultTypeSet(resultSet);
     setMovable();
 
     if (mode_ == TypeBarrier || mode_ == Fallible) {
       setGuard();
     }
-
-    bailoutKind_ = kind;
   }
 
  public:
   INSTRUCTION_HEADER(Unbox)
   static MUnbox* New(TempAllocator& alloc, MDefinition* ins, MIRType type,
                      Mode mode) {
-    // Unless we were given a specific BailoutKind, pick a default based on
-    // the type we expect.
-    BailoutKind kind;
-    switch (type) {
-      case MIRType::Boolean:
-        kind = BailoutKind::NonBooleanInput;
-        break;
-      case MIRType::Int32:
-        kind = BailoutKind::NonInt32Input;
-        break;
-      case MIRType::Double:
-        kind = BailoutKind::NonNumericInput;  // Int32s are fine too
-        break;
-      case MIRType::String:
-        kind = BailoutKind::NonStringInput;
-        break;
-      case MIRType::Symbol:
-        kind = BailoutKind::NonSymbolInput;
-        break;
-      case MIRType::BigInt:
-        kind = BailoutKind::NonBigIntInput;
-        break;
-      case MIRType::Object:
-        kind = BailoutKind::NonObjectInput;
-        break;
-      default:
-        MOZ_CRASH("Given MIRType cannot be unboxed.");
-    }
-
-    return new (alloc) MUnbox(ins, type, mode, kind, alloc);
-  }
-
-  static MUnbox* New(TempAllocator& alloc, MDefinition* ins, MIRType type,
-                     Mode mode, BailoutKind kind) {
-    return new (alloc) MUnbox(ins, type, mode, kind, alloc);
+    return new (alloc) MUnbox(ins, type, mode, alloc);
   }
 
   Mode mode() const { return mode_; }
-  BailoutKind bailoutKind() const {
-    // If infallible, no bailout should be generated.
-    MOZ_ASSERT(fallible());
-    return bailoutKind_;
-  }
-  BailoutKind bailoutKindUnchecked() const { return bailoutKind_; }
   bool fallible() const { return mode() != Infallible; }
   bool congruentTo(const MDefinition* ins) const override {
     if (!ins->isUnbox() || ins->toUnbox()->mode() != mode()) {
@@ -3486,7 +3301,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(ins->resultTypeSet());
   }
 
  public:
@@ -3517,7 +3331,6 @@
       : MUnaryInstruction(classOpcode, ins) {
     setGuard();
     setResultType(MIRType::Object);
-    setResultTypeSet(ins->resultTypeSet());
   }
 
  public:
@@ -3601,16 +3414,11 @@
                                 public NoTypePolicy::Data {
   gc::InitialHeap initialHeap_;
 
-  MCreateThisWithTemplate(TempAllocator& alloc,
-                          CompilerConstraintList* constraints,
-                          MConstant* templateConst, gc::InitialHeap initialHeap)
+  MCreateThisWithTemplate(TempAllocator& alloc, MConstant* templateConst,
+                          gc::InitialHeap initialHeap)
       : MUnaryInstruction(classOpcode, templateConst),
         initialHeap_(initialHeap) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject()));
-    }
   }
 
  public:
@@ -3814,7 +3622,6 @@
   explicit MGuardArgumentsObjectNotOverriddenIterator(MDefinition* argsObj)
       : MUnaryInstruction(classOpcode, argsObj) {
     setResultType(MIRType::Object);
-    setResultTypeSet(argsObj->resultTypeSet());
     setMovable();
     setGuard();
   }
@@ -4773,8 +4580,7 @@
   TRIVIAL_NEW_WRAPPERS
 
   MDefinition* foldsTo(TempAllocator& alloc) override;
-  void cacheInputMaybeCallableOrEmulatesUndefined(
-      CompilerConstraintList* constraints);
+  void cacheInputMaybeCallableOrEmulatesUndefined();
 
   bool inputMaybeCallableOrEmulatesUndefined() const {
     return inputMaybeCallableOrEmulatesUndefined_;
@@ -5570,11 +5376,7 @@
       CompactBufferWriter& writer) const override;
 
   bool canRecoverOnBailout() const override {
-#ifdef JS_MORE_DETERMINISTIC
-    return false;
-#else
-    return true;
-#endif
+    return !js::SupportDifferentialTesting();
   }
 
   ALLOW_CLONE(MRandom)
@@ -6362,14 +6164,10 @@
                      public MixPolicy<StringPolicy<0>, StringPolicy<1>>::Data {
   CompilerObjectGroup group_;
 
-  MStringSplit(TempAllocator& alloc, CompilerConstraintList* constraints,
-               MDefinition* string, MDefinition* sep, ObjectGroup* group)
+  MStringSplit(TempAllocator& alloc, MDefinition* string, MDefinition* sep,
+               ObjectGroup* group)
       : MBinaryInstruction(classOpcode, string, sep), group_(group) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      TemporaryTypeSet* types = MakeSingletonTypeSet(alloc, constraints, group);
-      setResultTypeSet(types);
-    }
   }
 
  public:
@@ -6484,7 +6282,6 @@
   InputVector inputs_;
 
   TruncateKind truncateKind_;
-  bool hasBackedgeType_;
   bool triedToSpecialize_;
   bool isIterator_;
   bool canProduceFloat32_;
@@ -6517,7 +6314,6 @@
       : MDefinition(classOpcode),
         inputs_(alloc),
         truncateKind_(NoTruncate),
-        hasBackedgeType_(false),
         triedToSpecialize_(false),
         isIterator_(false),
         canProduceFloat32_(false),
@@ -6554,7 +6350,6 @@
   void replaceOperand(size_t index, MDefinition* operand) final {
     inputs_[index].replaceProducer(operand);
   }
-  bool hasBackedgeType() const { return hasBackedgeType_; }
   bool triedToSpecialize() const { return triedToSpecialize_; }
   void specialize(MIRType type) {
     triedToSpecialize_ = true;
@@ -6587,11 +6382,6 @@
   // Whether this phi's type already includes information for def.
   bool typeIncludes(MDefinition* def);
 
-  // Add types for this phi which speculate about new inputs that may come in
-  // via a loop backedge.
-  MOZ_MUST_USE bool addBackedgeType(TempAllocator& alloc, MIRType type,
-                                    TemporaryTypeSet* typeSet);
-
   // Mark all phis in |iterators|, and the phis they flow into, as having
   // implicit uses.
   static MOZ_MUST_USE bool markIteratorPhis(const PhiVector& iterators);
@@ -6624,14 +6414,8 @@
     MOZ_ALWAYS_TRUE(addInputSlow(ins));
   }
 
-  // Update the type of this phi after adding |ins| as an input. Set
-  // |*ptypeChange| to true if the type changed.
-  bool checkForTypeChange(TempAllocator& alloc, MDefinition* ins,
-                          bool* ptypeChange);
-
   MDefinition* foldsTo(TempAllocator& alloc) override;
   MDefinition* foldsTernary(TempAllocator& alloc);
-  MDefinition* foldsFilterTypeSet();
 
   bool congruentTo(const MDefinition* ins) const override;
   bool updateForReplacement(MDefinition* def) override;
@@ -6679,7 +6463,6 @@
   MBeta(MDefinition* val, const Range* comp)
       : MUnaryInstruction(classOpcode, val), comparison_(comp) {
     setResultType(val->type());
-    setResultTypeSet(val->resultTypeSet());
   }
 
  public:
@@ -6896,14 +6679,15 @@
 // Checks if a value is JS_UNINITIALIZED_LEXICAL, bailout out if so, leaving
 // it to baseline to throw at the correct pc.
 class MLexicalCheck : public MUnaryInstruction, public BoxPolicy<0>::Data {
-  BailoutKind kind_;
-  explicit MLexicalCheck(MDefinition* input,
-                         BailoutKind kind = BailoutKind::UninitializedLexical)
-      : MUnaryInstruction(classOpcode, input), kind_(kind) {
+  explicit MLexicalCheck(MDefinition* input)
+      : MUnaryInstruction(classOpcode, input) {
     setResultType(MIRType::Value);
-    setResultTypeSet(input->resultTypeSet());
     setMovable();
     setGuard();
+
+    // If this instruction bails out, we will set a flag to prevent
+    // lexical checks in this script from being moved.
+    setBailoutKind(BailoutKind::UninitializedLexical);
   }
 
  public:
@@ -6912,8 +6696,6 @@
 
   AliasSet getAliasSet() const override { return AliasSet::None(); }
 
-  BailoutKind bailoutKind() const { return kind_; }
-
   bool congruentTo(const MDefinition* ins) const override {
     return congruentIfOperandsEqual(ins);
   }
@@ -6940,68 +6722,25 @@
   }
 };
 
-// In the prologues of global and eval scripts, check for redeclarations.
-class MGlobalNameConflictsCheck : public MNullaryInstruction {
-  MGlobalNameConflictsCheck() : MNullaryInstruction(classOpcode) { setGuard(); }
-
- public:
-  INSTRUCTION_HEADER(GlobalNameConflictsCheck)
-  TRIVIAL_NEW_WRAPPERS
-};
-
-// If not defined, set a global variable to |undefined|.
-class MDefVar : public MUnaryInstruction, public NoTypePolicy::Data {
- private:
-  explicit MDefVar(MDefinition* envChain)
-      : MUnaryInstruction(classOpcode, envChain) {}
-
- public:
-  INSTRUCTION_HEADER(DefVar)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, environmentChain))
-
-  bool possiblyCalls() const override { return true; }
-};
-
-class MDefLexical : public MUnaryInstruction, public NoTypePolicy::Data {
- private:
-  explicit MDefLexical(MDefinition* envChain)
-      : MUnaryInstruction(classOpcode, envChain) {}
-
- public:
-  INSTRUCTION_HEADER(DefLexical)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, environmentChain))
-
-  bool possiblyCalls() const override { return true; }
-};
-
-class MDefFun : public MBinaryInstruction, public ObjectPolicy<0>::Data {
- private:
-  MDefFun(MDefinition* fun, MDefinition* envChain)
-      : MBinaryInstruction(classOpcode, fun, envChain) {}
+// In the prologues of global and eval scripts, check for redeclarations and
+// initialize bindings.
+class MGlobalDeclInstantiation : public MNullaryInstruction {
+  MGlobalDeclInstantiation() : MNullaryInstruction(classOpcode) { setGuard(); }
 
  public:
-  INSTRUCTION_HEADER(DefFun)
+  INSTRUCTION_HEADER(GlobalDeclInstantiation)
   TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, fun), (1, environmentChain))
-
-  bool possiblyCalls() const override { return true; }
 };
 
 class MRegExp : public MNullaryInstruction {
   CompilerGCPointer<RegExpObject*> source_;
   bool hasShared_;
 
-  MRegExp(TempAllocator& alloc, CompilerConstraintList* constraints,
-          RegExpObject* source, bool hasShared)
+  MRegExp(TempAllocator& alloc, RegExpObject* source, bool hasShared)
       : MNullaryInstruction(classOpcode),
         source_(source),
         hasShared_(hasShared) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(MakeSingletonTypeSet(alloc, constraints, source));
-    }
   }
 
  public:
@@ -7288,25 +7027,21 @@
   js::FunctionFlags flags;
   uint16_t nargs;
   bool singletonType;
-  bool useSingletonForClone;
 
   LambdaFunctionInfo(JSFunction* fun, BaseScript* baseScript,
-                     FunctionFlags flags, uint16_t nargs, bool singletonType,
-                     bool useSingletonForClone)
+                     FunctionFlags flags, uint16_t nargs, bool singletonType)
       : fun_(fun),
         baseScript(baseScript),
         flags(flags),
         nargs(nargs),
-        singletonType(singletonType),
-        useSingletonForClone(useSingletonForClone) {}
+        singletonType(singletonType) {}
 
   LambdaFunctionInfo(const LambdaFunctionInfo& other)
       : fun_(static_cast<JSFunction*>(other.fun_)),
         baseScript(other.baseScript),
         flags(other.flags),
         nargs(other.nargs),
-        singletonType(other.singletonType),
-        useSingletonForClone(other.useSingletonForClone) {}
+        singletonType(other.singletonType) {}
 
   // Be careful when calling this off-thread. Don't call any JSFunction*
   // methods that depend on script/lazyScript - this can race with
@@ -7327,16 +7062,10 @@
 class MLambda : public MBinaryInstruction, public SingleObjectPolicy::Data {
   const LambdaFunctionInfo info_;
 
-  MLambda(TempAllocator& alloc, CompilerConstraintList* constraints,
-          MDefinition* envChain, MConstant* cst, const LambdaFunctionInfo& info)
+  MLambda(TempAllocator& alloc, MDefinition* envChain, MConstant* cst,
+          const LambdaFunctionInfo& info)
       : MBinaryInstruction(classOpcode, envChain, cst), info_(info) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      JSFunction* fun = info.funUnsafe();
-      if (!info.singletonType && !info.useSingletonForClone) {
-        setResultTypeSet(MakeSingletonTypeSet(alloc, constraints, fun));
-      }
-    }
   }
 
  public:
@@ -7359,19 +7088,12 @@
       public MixPolicy<ObjectPolicy<0>, BoxPolicy<1>, ObjectPolicy<2>>::Data {
   const LambdaFunctionInfo info_;
 
-  MLambdaArrow(TempAllocator& alloc, CompilerConstraintList* constraints,
-               MDefinition* envChain, MDefinition* newTarget, MConstant* cst,
+  MLambdaArrow(TempAllocator& alloc, MDefinition* envChain,
+               MDefinition* newTarget, MConstant* cst,
                const LambdaFunctionInfo& info)
       : MTernaryInstruction(classOpcode, envChain, newTarget, cst),
         info_(info) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      JSFunction* fun = info.funUnsafe();
-      MOZ_ASSERT(!info.useSingletonForClone);
-      if (!info.singletonType) {
-        setResultTypeSet(MakeSingletonTypeSet(alloc, constraints, fun));
-      }
-    }
   }
 
  public:
@@ -7518,95 +7240,6 @@
   ALLOW_CLONE(MConstantElements)
 };
 
-// Passes through an object's elements, after ensuring it is entirely doubles.
-class MConvertElementsToDoubles : public MUnaryInstruction,
-                                  public NoTypePolicy::Data {
-  explicit MConvertElementsToDoubles(MDefinition* elements)
-      : MUnaryInstruction(classOpcode, elements) {
-    setGuard();
-    setMovable();
-    setResultType(MIRType::Elements);
-  }
-
- public:
-  INSTRUCTION_HEADER(ConvertElementsToDoubles)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, elements))
-
-  bool congruentTo(const MDefinition* ins) const override {
-    return congruentIfOperandsEqual(ins);
-  }
-  AliasSet getAliasSet() const override {
-    // This instruction can read and write to the elements' contents.
-    // However, it is alright to hoist this from loops which explicitly
-    // read or write to the elements: such reads and writes will use double
-    // values and can be reordered freely wrt this conversion, except that
-    // definite double loads must follow the conversion. The latter
-    // property is ensured by chaining this instruction with the elements
-    // themselves, in the same manner as MBoundsCheck.
-    return AliasSet::None();
-  }
-};
-
-// If |elements| has the CONVERT_DOUBLE_ELEMENTS flag, convert value to
-// double. Else return the original value.
-class MMaybeToDoubleElement : public MBinaryInstruction,
-                              public UnboxedInt32Policy<1>::Data {
-  MMaybeToDoubleElement(MDefinition* elements, MDefinition* value)
-      : MBinaryInstruction(classOpcode, elements, value) {
-    MOZ_ASSERT(elements->type() == MIRType::Elements);
-    setMovable();
-    setResultType(MIRType::Value);
-  }
-
- public:
-  INSTRUCTION_HEADER(MaybeToDoubleElement)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, elements), (1, value))
-
-  bool congruentTo(const MDefinition* ins) const override {
-    return congruentIfOperandsEqual(ins);
-  }
-  AliasSet getAliasSet() const override {
-    return AliasSet::Load(AliasSet::ObjectFields);
-  }
-};
-
-// Passes through an object, after ensuring its elements are not copy on write.
-class MMaybeCopyElementsForWrite : public MUnaryInstruction,
-                                   public SingleObjectPolicy::Data {
-  bool checkNative_;
-
-  explicit MMaybeCopyElementsForWrite(MDefinition* object, bool checkNative)
-      : MUnaryInstruction(classOpcode, object), checkNative_(checkNative) {
-    setGuard();
-    setMovable();
-    setResultType(MIRType::Object);
-    setResultTypeSet(object->resultTypeSet());
-  }
-
- public:
-  INSTRUCTION_HEADER(MaybeCopyElementsForWrite)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, object))
-
-  bool checkNative() const { return checkNative_; }
-  bool congruentTo(const MDefinition* ins) const override {
-    return congruentIfOperandsEqual(ins) &&
-           checkNative() == ins->toMaybeCopyElementsForWrite()->checkNative();
-  }
-  AliasSet getAliasSet() const override {
-    return AliasSet::Store(AliasSet::ObjectFields);
-  }
-#ifdef DEBUG
-  bool needsResumePoint() const override {
-    // This instruction is idempotent and does not change observable
-    // behavior, so does not need its own resume point.
-    return false;
-  }
-#endif
-};
-
 // Load the initialized length from an elements header.
 class MInitializedLength : public MUnaryInstruction, public NoTypePolicy::Data {
   explicit MInitializedLength(MDefinition* elements)
@@ -7944,20 +7577,14 @@
   bool operandMightEmulateUndefined_;
   bool operandIsNeverNaN_;
 
-  explicit MNot(MDefinition* input,
-                CompilerConstraintList* constraints = nullptr)
+  explicit MNot(MDefinition* input)
       : MUnaryInstruction(classOpcode, input),
         operandMightEmulateUndefined_(true),
         operandIsNeverNaN_(false) {
     setResultType(MIRType::Boolean);
     setMovable();
-    if (constraints) {
-      cacheOperandMightEmulateUndefined(constraints);
-    }
   }
 
-  void cacheOperandMightEmulateUndefined(CompilerConstraintList* constraints);
-
  public:
   static MNot* NewInt32(TempAllocator& alloc, MDefinition* input) {
     MOZ_ASSERT(input->type() == MIRType::Int32 ||
@@ -8169,19 +7796,17 @@
 class MLoadElementAndUnbox : public MBinaryInstruction,
                              public NoTypePolicy::Data {
   MUnbox::Mode mode_;
-  BailoutKind bailoutKind_;
 
  protected:
   MLoadElementAndUnbox(MDefinition* elements, MDefinition* index,
                        MUnbox::Mode mode, MIRType type, BailoutKind kind)
-      : MBinaryInstruction(classOpcode, elements, index),
-        mode_(mode),
-        bailoutKind_(kind) {
+      : MBinaryInstruction(classOpcode, elements, index), mode_(mode) {
     setResultType(type);
     setMovable();
     if (mode_ == MUnbox::TypeBarrier || mode_ == MUnbox::Fallible) {
       setGuard();
     }
+    setBailoutKind(kind);
   }
 
  public:
@@ -8190,13 +7815,11 @@
   NAMED_OPERANDS((0, elements), (1, index))
 
   MUnbox::Mode mode() const { return mode_; }
-  BailoutKind bailoutKind() const { return bailoutKind_; }
   bool fallible() const { return mode_ != MUnbox::Infallible; }
 
   bool congruentTo(const MDefinition* ins) const override {
     if (!ins->isLoadElementAndUnbox() ||
-        mode() != ins->toLoadElementAndUnbox()->mode() ||
-        bailoutKind() != ins->toLoadElementAndUnbox()->bailoutKind()) {
+        mode() != ins->toLoadElementAndUnbox()->mode()) {
       return false;
     }
     return congruentIfOperandsEqual(ins);
@@ -8943,20 +8566,17 @@
                                public SingleObjectPolicy::Data {
   size_t slot_;
   MUnbox::Mode mode_;
-  BailoutKind bailoutKind_;
 
  protected:
   MLoadFixedSlotAndUnbox(MDefinition* obj, size_t slot, MUnbox::Mode mode,
                          MIRType type, BailoutKind kind)
-      : MUnaryInstruction(classOpcode, obj),
-        slot_(slot),
-        mode_(mode),
-        bailoutKind_(kind) {
+      : MUnaryInstruction(classOpcode, obj), slot_(slot), mode_(mode) {
     setResultType(type);
     setMovable();
     if (mode_ == MUnbox::TypeBarrier || mode_ == MUnbox::Fallible) {
       setGuard();
     }
+    setBailoutKind(kind);
   }
 
  public:
@@ -8966,13 +8586,11 @@
 
   size_t slot() const { return slot_; }
   MUnbox::Mode mode() const { return mode_; }
-  BailoutKind bailoutKind() const { return bailoutKind_; }
   bool fallible() const { return mode_ != MUnbox::Infallible; }
   bool congruentTo(const MDefinition* ins) const override {
     if (!ins->isLoadFixedSlotAndUnbox() ||
         slot() != ins->toLoadFixedSlotAndUnbox()->slot() ||
-        mode() != ins->toLoadFixedSlotAndUnbox()->mode() ||
-        bailoutKind() != ins->toLoadFixedSlotAndUnbox()->bailoutKind()) {
+        mode() != ins->toLoadFixedSlotAndUnbox()->mode()) {
       return false;
     }
     return congruentIfOperandsEqual(ins);
@@ -8993,20 +8611,17 @@
                                  public NoTypePolicy::Data {
   size_t slot_;
   MUnbox::Mode mode_;
-  BailoutKind bailoutKind_;
 
  protected:
   MLoadDynamicSlotAndUnbox(MDefinition* slots, size_t slot, MUnbox::Mode mode,
                            MIRType type, BailoutKind kind)
-      : MUnaryInstruction(classOpcode, slots),
-        slot_(slot),
-        mode_(mode),
-        bailoutKind_(kind) {
+      : MUnaryInstruction(classOpcode, slots), slot_(slot), mode_(mode) {
     setResultType(type);
     setMovable();
     if (mode_ == MUnbox::TypeBarrier || mode_ == MUnbox::Fallible) {
       setGuard();
     }
+    setBailoutKind(kind);
   }
 
  public:
@@ -9016,14 +8631,12 @@
 
   size_t slot() const { return slot_; }
   MUnbox::Mode mode() const { return mode_; }
-  BailoutKind bailoutKind() const { return bailoutKind_; }
   bool fallible() const { return mode_ != MUnbox::Infallible; }
 
   bool congruentTo(const MDefinition* ins) const override {
     if (!ins->isLoadDynamicSlotAndUnbox() ||
         slot() != ins->toLoadDynamicSlotAndUnbox()->slot() ||
-        mode() != ins->toLoadDynamicSlotAndUnbox()->mode() ||
-        bailoutKind() != ins->toLoadDynamicSlotAndUnbox()->bailoutKind()) {
+        mode() != ins->toLoadDynamicSlotAndUnbox()->mode()) {
       return false;
     }
     return congruentIfOperandsEqual(ins);
@@ -9074,170 +8687,32 @@
   ALLOW_CLONE(MStoreFixedSlot)
 };
 
-struct InliningTarget {
-  JSObject* target;
-
-  // If target is a singleton, group is nullptr. If target is not a singleton,
-  // this is the group we need to guard on when doing a polymorphic inlining
-  // dispatch. Note that this can be different from target->group() due to
-  // proto mutation.
-  ObjectGroup* group;
-
-  InliningTarget(JSObject* target, ObjectGroup* group)
-      : target(target), group(group) {
-    MOZ_ASSERT(target->isSingleton() == !group);
-  }
-};
-
-using InliningTargets = Vector<InliningTarget, 4, JitAllocPolicy>;
-using BoolVector = Vector<bool, 8, JitAllocPolicy>;
-
-class InlinePropertyTable : public TempObject {
-  struct Entry : public TempObject {
-    CompilerObjectGroup group;
-    CompilerFunction func;
-
-    Entry(ObjectGroup* group, JSFunction* func) : group(group), func(func) {}
-    bool appendRoots(MRootList& roots) const {
-      return roots.append(group) && roots.append(func);
-    }
-  };
-
-  jsbytecode* pc_;
-  MResumePoint* priorResumePoint_;
-  Vector<Entry*, 4, JitAllocPolicy> entries_;
-
- public:
-  InlinePropertyTable(TempAllocator& alloc, jsbytecode* pc)
-      : pc_(pc), priorResumePoint_(nullptr), entries_(alloc) {}
-
-  void setPriorResumePoint(MResumePoint* resumePoint) {
-    MOZ_ASSERT(priorResumePoint_ == nullptr);
-    priorResumePoint_ = resumePoint;
-  }
-  bool hasPriorResumePoint() { return bool(priorResumePoint_); }
-  MResumePoint* takePriorResumePoint() {
-    MResumePoint* rp = priorResumePoint_;
-    priorResumePoint_ = nullptr;
-    return rp;
-  }
-
-  jsbytecode* pc() const { return pc_; }
-
-  MOZ_MUST_USE bool addEntry(TempAllocator& alloc, ObjectGroup* group,
-                             JSFunction* func) {
-    return entries_.append(new (alloc) Entry(group, func));
-  }
-
-  size_t numEntries() const { return entries_.length(); }
-
-  ObjectGroup* getObjectGroup(size_t i) const {
-    MOZ_ASSERT(i < numEntries());
-    return entries_[i]->group;
-  }
-
-  JSFunction* getFunction(size_t i) const {
-    MOZ_ASSERT(i < numEntries());
-    return entries_[i]->func;
-  }
-
-  bool hasFunction(JSFunction* func) const;
-  bool hasObjectGroup(ObjectGroup* group) const;
-
-  TemporaryTypeSet* buildTypeSetForFunction(TempAllocator& tempAlloc,
-                                            JSFunction* func) const;
-
-  // Remove targets that vetoed inlining from the InlinePropertyTable.
-  void trimTo(const InliningTargets& targets, const BoolVector& choiceSet);
-
-  // Ensure that the InlinePropertyTable's domain is a subset of |targets|.
-  void trimToTargets(const InliningTargets& targets);
-
-  bool appendRoots(MRootList& roots) const;
-};
-
 class MGetPropertyCache : public MBinaryInstruction,
                           public MixPolicy<BoxExceptPolicy<0, MIRType::Object>,
                                            CacheIdPolicy<1>>::Data {
-  bool idempotent_ : 1;
-  bool monitoredResult_ : 1;
-
-  InlinePropertyTable* inlinePropertyTable_;
-
-  MGetPropertyCache(MDefinition* obj, MDefinition* id, bool monitoredResult)
-      : MBinaryInstruction(classOpcode, obj, id),
-        idempotent_(false),
-        monitoredResult_(monitoredResult),
-        inlinePropertyTable_(nullptr) {
+  MGetPropertyCache(MDefinition* obj, MDefinition* id)
+      : MBinaryInstruction(classOpcode, obj, id) {
     setResultType(MIRType::Value);
-
-    // The cache will invalidate if there are objects with e.g. lookup or
-    // resolve hooks on the proto chain. setGuard ensures this check is not
-    // eliminated.
-    setGuard();
   }
 
  public:
   INSTRUCTION_HEADER(GetPropertyCache)
   TRIVIAL_NEW_WRAPPERS
   NAMED_OPERANDS((0, value), (1, idval))
+};
 
-  InlinePropertyTable* initInlinePropertyTable(TempAllocator& alloc,
-                                               jsbytecode* pc) {
-    MOZ_ASSERT(inlinePropertyTable_ == nullptr);
-    inlinePropertyTable_ = new (alloc) InlinePropertyTable(alloc, pc);
-    return inlinePropertyTable_;
+class MHomeObjectSuperBase : public MUnaryInstruction,
+                             public SingleObjectPolicy::Data {
+  explicit MHomeObjectSuperBase(MDefinition* homeObject)
+      : MUnaryInstruction(classOpcode, homeObject) {
+    setResultType(MIRType::Object);
+    setGuard();  // May throw if [[Prototype]] is null
   }
 
-  void clearInlinePropertyTable() { inlinePropertyTable_ = nullptr; }
-
-  InlinePropertyTable* propTable() const { return inlinePropertyTable_; }
-
-  bool idempotent() const { return idempotent_; }
-  void setIdempotent() {
-    idempotent_ = true;
-    setMovable();
-  }
-  bool monitoredResult() const { return monitoredResult_; }
-
-  bool congruentTo(const MDefinition* ins) const override {
-    if (!idempotent_) {
-      return false;
-    }
-    if (!ins->isGetPropertyCache()) {
-      return false;
-    }
-    return congruentIfOperandsEqual(ins);
-  }
-
-  AliasSet getAliasSet() const override {
-    if (idempotent_) {
-      return AliasSet::Load(AliasSet::ObjectFields | AliasSet::FixedSlot |
-                            AliasSet::DynamicSlot);
-    }
-    return AliasSet::Store(AliasSet::Any);
-  }
-
-  bool appendRoots(MRootList& roots) const override {
-    if (inlinePropertyTable_) {
-      return inlinePropertyTable_->appendRoots(roots);
-    }
-    return true;
-  }
-};
-
-class MHomeObjectSuperBase : public MUnaryInstruction,
-                             public SingleObjectPolicy::Data {
-  explicit MHomeObjectSuperBase(MDefinition* homeObject)
-      : MUnaryInstruction(classOpcode, homeObject) {
-    setResultType(MIRType::Object);
-    setGuard();  // May throw if [[Prototype]] is null
-  }
-
- public:
-  INSTRUCTION_HEADER(HomeObjectSuperBase)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, homeObject))
+ public:
+  INSTRUCTION_HEADER(HomeObjectSuperBase)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, homeObject))
 
   AliasSet getAliasSet() const override {
     return AliasSet::Load(AliasSet::ObjectFields);
@@ -9390,148 +8865,6 @@
   bool appendRoots(MRootList& roots) const override;
 };
 
-class MDispatchInstruction : public MControlInstruction,
-                             public SingleObjectPolicy::Data {
-  // Map from JSFunction* -> MBasicBlock.
-  struct Entry {
-    JSFunction* func;
-    // If |func| has a singleton group, |funcGroup| is null. Otherwise,
-    // |funcGroup| holds the ObjectGroup for |func|, and dispatch guards
-    // on the group instead of directly on the function.
-    ObjectGroup* funcGroup;
-    MBasicBlock* block;
-
-    Entry(JSFunction* func, ObjectGroup* funcGroup, MBasicBlock* block)
-        : func(func), funcGroup(funcGroup), block(block) {}
-    bool appendRoots(MRootList& roots) const {
-      return roots.append(func) && roots.append(funcGroup);
-    }
-  };
-  Vector<Entry, 4, JitAllocPolicy> map_;
-
-  // An optional fallback path that uses MCall.
-  MBasicBlock* fallback_;
-  MUse operand_;
-
-  void initOperand(size_t index, MDefinition* operand) {
-    MOZ_ASSERT(index == 0);
-    operand_.init(operand, this);
-  }
-
- public:
-  NAMED_OPERANDS((0, input))
-  MDispatchInstruction(TempAllocator& alloc, Opcode op, MDefinition* input)
-      : MControlInstruction(op), map_(alloc), fallback_(nullptr) {
-    initOperand(0, input);
-  }
-
- protected:
-  MUse* getUseFor(size_t index) final {
-    MOZ_ASSERT(index == 0);
-    return &operand_;
-  }
-  const MUse* getUseFor(size_t index) const final {
-    MOZ_ASSERT(index == 0);
-    return &operand_;
-  }
-  MDefinition* getOperand(size_t index) const final {
-    MOZ_ASSERT(index == 0);
-    return operand_.producer();
-  }
-  size_t numOperands() const final { return 1; }
-  size_t indexOf(const MUse* u) const final {
-    MOZ_ASSERT(u == getUseFor(0));
-    return 0;
-  }
-  void replaceOperand(size_t index, MDefinition* operand) final {
-    MOZ_ASSERT(index == 0);
-    operand_.replaceProducer(operand);
-  }
-
- public:
-  void setSuccessor(size_t i, MBasicBlock* successor) {
-    MOZ_ASSERT(i < numSuccessors());
-    if (i == map_.length()) {
-      fallback_ = successor;
-    } else {
-      map_[i].block = successor;
-    }
-  }
-  size_t numSuccessors() const final {
-    return map_.length() + (fallback_ ? 1 : 0);
-  }
-  void replaceSuccessor(size_t i, MBasicBlock* successor) final {
-    setSuccessor(i, successor);
-  }
-  MBasicBlock* getSuccessor(size_t i) const final {
-    MOZ_ASSERT(i < numSuccessors());
-    if (i == map_.length()) {
-      return fallback_;
-    }
-    return map_[i].block;
-  }
-
- public:
-  MOZ_MUST_USE bool addCase(JSFunction* func, ObjectGroup* funcGroup,
-                            MBasicBlock* block) {
-    return map_.append(Entry(func, funcGroup, block));
-  }
-  uint32_t numCases() const { return map_.length(); }
-  JSFunction* getCase(uint32_t i) const { return map_[i].func; }
-  ObjectGroup* getCaseObjectGroup(uint32_t i) const {
-    return map_[i].funcGroup;
-  }
-  MBasicBlock* getCaseBlock(uint32_t i) const { return map_[i].block; }
-
-  bool hasFallback() const { return bool(fallback_); }
-  void addFallback(MBasicBlock* block) {
-    MOZ_ASSERT(!hasFallback());
-    fallback_ = block;
-  }
-  MBasicBlock* getFallback() const {
-    MOZ_ASSERT(hasFallback());
-    return fallback_;
-  }
-  bool appendRoots(MRootList& roots) const override;
-};
-
-// Polymorphic dispatch for inlining, keyed off incoming ObjectGroup.
-class MObjectGroupDispatch : public MDispatchInstruction {
-  // Map ObjectGroup (of CallProp's Target Object) -> JSFunction (yielded by the
-  // CallProp).
-  InlinePropertyTable* inlinePropertyTable_;
-
-  MObjectGroupDispatch(TempAllocator& alloc, MDefinition* input,
-                       InlinePropertyTable* table)
-      : MDispatchInstruction(alloc, classOpcode, input),
-        inlinePropertyTable_(table) {}
-
- public:
-  INSTRUCTION_HEADER(ObjectGroupDispatch)
-
-  static MObjectGroupDispatch* New(TempAllocator& alloc, MDefinition* ins,
-                                   InlinePropertyTable* table) {
-    return new (alloc) MObjectGroupDispatch(alloc, ins, table);
-  }
-
-  InlinePropertyTable* propTable() const { return inlinePropertyTable_; }
-  bool appendRoots(MRootList& roots) const override;
-};
-
-// Polymorphic dispatch for inlining, keyed off incoming JSFunction*.
-class MFunctionDispatch : public MDispatchInstruction {
-  MFunctionDispatch(TempAllocator& alloc, MDefinition* input)
-      : MDispatchInstruction(alloc, classOpcode, input) {}
-
- public:
-  INSTRUCTION_HEADER(FunctionDispatch)
-
-  static MFunctionDispatch* New(TempAllocator& alloc, MDefinition* ins) {
-    return new (alloc) MFunctionDispatch(alloc, ins);
-  }
-  bool appendRoots(MRootList& roots) const override;
-};
-
 class MBindNameCache : public MUnaryInstruction,
                        public SingleObjectPolicy::Data {
   explicit MBindNameCache(MDefinition* envChain)
@@ -9576,7 +8909,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -9611,7 +8943,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -9643,7 +8974,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -9666,6 +8996,27 @@
   }
 };
 
+// Guard the object is a native object.
+class MGuardIsNativeObject : public MUnaryInstruction,
+                             public SingleObjectPolicy::Data {
+  explicit MGuardIsNativeObject(MDefinition* obj)
+      : MUnaryInstruction(classOpcode, obj) {
+    setGuard();
+    setMovable();
+    setResultType(MIRType::Object);
+  }
+
+ public:
+  INSTRUCTION_HEADER(GuardIsNativeObject)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object))
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+  AliasSet getAliasSet() const override { return AliasSet::None(); }
+};
+
 // Guard the object is a proxy.
 class MGuardIsProxy : public MUnaryInstruction,
                       public SingleObjectPolicy::Data {
@@ -9674,7 +9025,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -9696,7 +9046,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -9719,7 +9068,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(proxy->resultTypeSet());
   }
 
  public:
@@ -9988,7 +9336,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -10011,7 +9358,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -10094,6 +9440,10 @@
     setGuard();
     setResultType(MIRType::Value);
     // Note: don't setMovable() to not deoptimize lazy arguments unnecessarily.
+
+    // If this instruction bails out, we will disable the optimization to
+    // prevent bailout loops.
+    setBailoutKind(BailoutKind::NotOptimizedArgumentsGuard);
   }
 
  public:
@@ -10155,7 +9505,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(fun->resultTypeSet());
   }
 
  public:
@@ -10191,7 +9540,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(fun->resultTypeSet());
   }
 
  public:
@@ -10222,7 +9570,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(fun->resultTypeSet());
   }
 
  public:
@@ -10265,7 +9612,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(fun->resultTypeSet());
   }
 
  public:
@@ -10310,7 +9656,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
   }
 
  public:
@@ -10342,14 +9687,11 @@
                           public SingleObjectPolicy::Data {
   CompilerObjectGroup group_;
   bool bailOnEquality_;
-  BailoutKind bailoutKind_;
 
-  MGuardObjectGroup(MDefinition* obj, ObjectGroup* group, bool bailOnEquality,
-                    BailoutKind bailoutKind)
+  MGuardObjectGroup(MDefinition* obj, ObjectGroup* group, bool bailOnEquality)
       : MUnaryInstruction(classOpcode, obj),
         group_(group),
-        bailOnEquality_(bailOnEquality),
-        bailoutKind_(bailoutKind) {
+        bailOnEquality_(bailOnEquality) {
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
@@ -10362,7 +9704,6 @@
 
   const ObjectGroup* group() const { return group_; }
   bool bailOnEquality() const { return bailOnEquality_; }
-  BailoutKind bailoutKind() const { return bailoutKind_; }
   bool congruentTo(const MDefinition* ins) const override {
     if (!ins->isGuardObjectGroup()) {
       return false;
@@ -10373,9 +9714,6 @@
     if (bailOnEquality() != ins->toGuardObjectGroup()->bailOnEquality()) {
       return false;
     }
-    if (bailoutKind() != ins->toGuardObjectGroup()->bailoutKind()) {
-      return false;
-    }
     return congruentIfOperandsEqual(ins);
   }
   AliasSet getAliasSet() const override {
@@ -11004,101 +10342,23 @@
   bool strict() const { return strict_; }
 };
 
-// Note: This uses CallSetElementPolicy to always box its second input,
-// ensuring we don't need two LIR instructions to lower this.
-class MCallSetProperty : public MSetPropertyInstruction,
-                         public CallSetElementPolicy::Data {
-  MCallSetProperty(MDefinition* obj, MDefinition* value, PropertyName* name,
-                   bool strict)
-      : MSetPropertyInstruction(classOpcode, obj, value, name, strict) {}
-
- public:
-  INSTRUCTION_HEADER(CallSetProperty)
-  TRIVIAL_NEW_WRAPPERS
-
-  bool possiblyCalls() const override { return true; }
-};
-
 class MSetPropertyCache : public MTernaryInstruction,
                           public MixPolicy<SingleObjectPolicy, CacheIdPolicy<1>,
                                            NoFloatPolicy<2>>::Data {
   bool strict_ : 1;
-  bool needsPostBarrier_ : 1;
-  bool needsTypeBarrier_ : 1;
-  bool guardHoles_ : 1;
 
   MSetPropertyCache(MDefinition* obj, MDefinition* id, MDefinition* value,
-                    bool strict, bool needsPostBarrier, bool typeBarrier,
-                    bool guardHoles)
-      : MTernaryInstruction(classOpcode, obj, id, value),
-        strict_(strict),
-        needsPostBarrier_(needsPostBarrier),
-        needsTypeBarrier_(typeBarrier),
-        guardHoles_(guardHoles) {}
+                    bool strict)
+      : MTernaryInstruction(classOpcode, obj, id, value), strict_(strict) {}
 
  public:
   INSTRUCTION_HEADER(SetPropertyCache)
   TRIVIAL_NEW_WRAPPERS
   NAMED_OPERANDS((0, object), (1, idval), (2, value))
 
-  bool needsPostBarrier() const { return needsPostBarrier_; }
-  bool needsTypeBarrier() const { return needsTypeBarrier_; }
-
-  bool guardHoles() const { return guardHoles_; }
-
   bool strict() const { return strict_; }
 };
 
-class MCallGetProperty : public MUnaryInstruction,
-                         public BoxInputsPolicy::Data {
-  CompilerPropertyName name_;
-  bool idempotent_;
-
-  MCallGetProperty(MDefinition* value, PropertyName* name)
-      : MUnaryInstruction(classOpcode, value), name_(name), idempotent_(false) {
-    setResultType(MIRType::Value);
-  }
-
- public:
-  INSTRUCTION_HEADER(CallGetProperty)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, value))
-
-  PropertyName* name() const { return name_; }
-
-  // Constructors need to perform a GetProp on the function prototype.
-  // Since getters cannot be set on the prototype, fetching is non-effectful.
-  // The operation may be safely repeated in case of bailout.
-  void setIdempotent() { idempotent_ = true; }
-  AliasSet getAliasSet() const override {
-    if (!idempotent_) {
-      return AliasSet::Store(AliasSet::Any);
-    }
-    return AliasSet::Load(AliasSet::ObjectFields | AliasSet::FixedSlot |
-                          AliasSet::DynamicSlot);
-  }
-  bool possiblyCalls() const override { return true; }
-  bool appendRoots(MRootList& roots) const override {
-    return roots.append(name_);
-  }
-};
-
-// Inline call to handle lhs[rhs]. The first input is a Value so that this
-// instruction can handle both objects and strings.
-class MCallGetElement : public MBinaryInstruction,
-                        public BoxInputsPolicy::Data {
-  MCallGetElement(MDefinition* lhs, MDefinition* rhs)
-      : MBinaryInstruction(classOpcode, lhs, rhs) {
-    setResultType(MIRType::Value);
-  }
-
- public:
-  INSTRUCTION_HEADER(CallGetElement)
-  TRIVIAL_NEW_WRAPPERS
-
-  bool possiblyCalls() const override { return true; }
-};
-
 class MCallSetElement : public MSetElementInstruction,
                         public CallSetElementPolicy::Data {
   MCallSetElement(MDefinition* object, MDefinition* index, MDefinition* value,
@@ -11112,23 +10372,6 @@
   bool possiblyCalls() const override { return true; }
 };
 
-class MCallInitElementArray
-    : public MTernaryInstruction,
-      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>,
-                       BoxPolicy<2>>::Data {
-  MCallInitElementArray(MDefinition* obj, MDefinition* index, MDefinition* val)
-      : MTernaryInstruction(classOpcode, obj, index, val) {
-    MOZ_ASSERT(index->type() == MIRType::Int32);
-  }
-
- public:
-  INSTRUCTION_HEADER(CallInitElementArray)
-  TRIVIAL_NEW_WRAPPERS
-  NAMED_OPERANDS((0, object), (1, index), (2, value))
-
-  bool possiblyCalls() const override { return true; }
-};
-
 class MSetDOMProperty : public MBinaryInstruction,
                         public MixPolicy<ObjectPolicy<0>, BoxPolicy<1>>::Data {
   const JSJitSetterOp func_;
@@ -11739,17 +10982,21 @@
 
 // Test whether the index is in the array bounds or a hole.
 class MInArray : public MQuaternaryInstruction, public ObjectPolicy<3>::Data {
-  bool needsHoleCheck_;
   bool needsNegativeIntCheck_;
 
   MInArray(MDefinition* elements, MDefinition* index, MDefinition* initLength,
-           MDefinition* object, bool needsHoleCheck)
+           MDefinition* object)
       : MQuaternaryInstruction(classOpcode, elements, index, initLength,
                                object),
-        needsHoleCheck_(needsHoleCheck),
         needsNegativeIntCheck_(true) {
     setResultType(MIRType::Boolean);
     setMovable();
+
+    // Set the guard flag to make sure we bail when we see a negative index.
+    // We can clear this flag (and needsNegativeIntCheck_) in
+    // collectRangeInfoPreTrunc.
+    setGuard();
+
     MOZ_ASSERT(elements->type() == MIRType::Elements);
     MOZ_ASSERT(index->type() == MIRType::Int32);
     MOZ_ASSERT(initLength->type() == MIRType::Int32);
@@ -11760,7 +11007,6 @@
   TRIVIAL_NEW_WRAPPERS
   NAMED_OPERANDS((0, elements), (1, index), (2, initLength), (3, object))
 
-  bool needsHoleCheck() const { return needsHoleCheck_; }
   bool needsNegativeIntCheck() const { return needsNegativeIntCheck_; }
   void collectRangeInfoPreTrunc() override;
   AliasSet getAliasSet() const override {
@@ -11771,9 +11017,6 @@
       return false;
     }
     const MInArray* other = ins->toInArray();
-    if (needsHoleCheck() != other->needsHoleCheck()) {
-      return false;
-    }
     if (needsNegativeIntCheck() != other->needsNegativeIntCheck()) {
       return false;
     }
@@ -11931,17 +11174,12 @@
   unsigned numFormals_;
   CompilerGCPointer<ArrayObject*> templateObject_;
 
-  MRest(TempAllocator& alloc, CompilerConstraintList* constraints,
-        MDefinition* numActuals, unsigned numFormals,
+  MRest(TempAllocator& alloc, MDefinition* numActuals, unsigned numFormals,
         ArrayObject* templateObject)
       : MUnaryInstruction(classOpcode, numActuals),
         numFormals_(numFormals),
         templateObject_(templateObject) {
     setResultType(MIRType::Object);
-    if (!JitOptions.warpBuilder) {
-      setResultTypeSet(
-          MakeSingletonTypeSet(alloc, constraints, templateObject));
-    }
   }
 
  public:
@@ -11959,91 +11197,6 @@
   }
 };
 
-class MFilterTypeSet : public MUnaryInstruction,
-                       public FilterTypeSetPolicy::Data {
-  MFilterTypeSet(MDefinition* def, TemporaryTypeSet* types)
-      : MUnaryInstruction(classOpcode, def) {
-    MOZ_ASSERT(!types->unknown());
-    setResultType(types->getKnownMIRType());
-    setResultTypeSet(types);
-  }
-
- public:
-  INSTRUCTION_HEADER(FilterTypeSet)
-  TRIVIAL_NEW_WRAPPERS
-
-  bool congruentTo(const MDefinition* def) const override { return false; }
-  AliasSet getAliasSet() const override { return AliasSet::None(); }
-  virtual bool neverHoist() const override { return resultTypeSet()->empty(); }
-  void computeRange(TempAllocator& alloc) override;
-
-  bool isFloat32Commutative() const override {
-    return IsFloatingPointType(type());
-  }
-
-  bool canProduceFloat32() const override;
-  bool canConsumeFloat32(MUse* operand) const override;
-  void trySpecializeFloat32(TempAllocator& alloc) override;
-};
-
-// Given a value, guard that the value is in a particular TypeSet, then returns
-// that value.
-class MTypeBarrier : public MUnaryInstruction, public TypeBarrierPolicy::Data {
-  BarrierKind barrierKind_;
-
-  MTypeBarrier(MDefinition* def, TemporaryTypeSet* types,
-               BarrierKind kind = BarrierKind::TypeSet)
-      : MUnaryInstruction(classOpcode, def), barrierKind_(kind) {
-    MOZ_ASSERT(kind == BarrierKind::TypeTagOnly ||
-               kind == BarrierKind::TypeSet);
-
-    MOZ_ASSERT(!types->unknown());
-    setResultType(types->getKnownMIRType());
-    setResultTypeSet(types);
-
-    setGuard();
-    setMovable();
-  }
-
- public:
-  INSTRUCTION_HEADER(TypeBarrier)
-  TRIVIAL_NEW_WRAPPERS
-
-#ifdef JS_JITSPEW
-  void printOpcode(GenericPrinter& out) const override;
-#endif
-
-  bool congruentTo(const MDefinition* def) const override;
-
-  AliasSet getAliasSet() const override { return AliasSet::None(); }
-  virtual bool neverHoist() const override { return resultTypeSet()->empty(); }
-  BarrierKind barrierKind() const { return barrierKind_; }
-  MDefinition* foldsTo(TempAllocator& alloc) override;
-
-  bool canRedefineInput();
-
-  bool alwaysBails() const {
-    // If mirtype of input doesn't agree with mirtype of barrier,
-    // we will definitely bail.
-    MIRType type = resultTypeSet()->getKnownMIRType();
-    if (type == MIRType::Value) {
-      return false;
-    }
-    if (input()->type() == MIRType::Value) {
-      return false;
-    }
-    if (input()->type() == MIRType::ObjectOrNull) {
-      // The ObjectOrNull optimization is only performed when the
-      // barrier's type is MIRType::Null.
-      MOZ_ASSERT(type == MIRType::Null);
-      return false;
-    }
-    return input()->type() != type;
-  }
-
-  ALLOW_CLONE(MTypeBarrier)
-};
-
 // Given a value being written to another object, update the generational store
 // buffer if the value is in the nursery and object is in the tenured heap.
 class MPostWriteBarrier : public MBinaryInstruction,
@@ -12192,8 +11345,26 @@
 using MStoresToRecoverList = InlineSpaghettiStack<MStoreToRecover>;
 
 // A resume point contains the information needed to reconstruct the Baseline
-// state from a position in the JIT. See the big comment near resumeAfter() in
-// IonBuilder.cpp.
+// Interpreter state from a position in Warp JIT code. A resume point is a
+// mapping of stack slots to MDefinitions.
+//
+// We capture stack state at critical points:
+//   * (1) At the beginning of every basic block.
+//   * (2) After every effectful operation.
+//
+// As long as these two properties are maintained, instructions can be moved,
+// hoisted, or, eliminated without problems, and ops without side effects do not
+// need to worry about capturing state at precisely the right point in time.
+//
+// Effectful instructions, of course, need to capture state after completion,
+// where the interpreter will not attempt to repeat the operation. For this,
+// ResumeAfter must be used. The state is attached directly to the effectful
+// instruction to ensure that no intermediate instructions could be injected
+// in between by a future analysis pass.
+//
+// During LIR construction, if an instruction can bail back to the interpreter,
+// we create an LSnapshot, which uses the last known resume point to request
+// register/stack assignments for every live value.
 class MResumePoint final : public MNode
 #ifdef DEBUG
     ,
@@ -12252,7 +11423,6 @@
  public:
   static MResumePoint* New(TempAllocator& alloc, MBasicBlock* block,
                            jsbytecode* pc, Mode mode);
-  static MResumePoint* Copy(TempAllocator& alloc, MResumePoint* src);
 
   MBasicBlock* block() const { return resumePointBlock(); }
 
@@ -12591,7 +11761,6 @@
       : MUnaryInstruction(classOpcode, thisVal) {
     setGuard();
     setResultType(MIRType::Value);
-    setResultTypeSet(thisVal->resultTypeSet());
   }
 
  public:
@@ -12609,7 +11778,6 @@
       : MUnaryInstruction(classOpcode, thisVal) {
     setGuard();
     setResultType(MIRType::Value);
-    setResultTypeSet(thisVal->resultTypeSet());
   }
 
  public:
@@ -12816,7 +11984,9 @@
 };
 
 class MDebugger : public MNullaryInstruction {
-  MDebugger() : MNullaryInstruction(classOpcode) {}
+  MDebugger() : MNullaryInstruction(classOpcode) {
+    setBailoutKind(BailoutKind::Debugger);
+  }
 
  public:
   INSTRUCTION_HEADER(Debugger)
@@ -12828,13 +11998,7 @@
 
   MCheckIsObj(TempAllocator& alloc, MDefinition* value, uint8_t checkKind)
       : MUnaryInstruction(classOpcode, value), checkKind_(checkKind) {
-    TemporaryTypeSet* resultSet = value->resultTypeSet();
-    if (resultSet) {
-      resultSet = resultSet->cloneObjectsOnly(alloc.lifoAlloc());
-    }
-
     setResultType(MIRType::Object);
-    setResultTypeSet(resultSet);
     setGuard();
   }
 
@@ -12854,7 +12018,6 @@
       : MUnaryInstruction(classOpcode, toCheck) {
     setGuard();
     setResultType(MIRType::Value);
-    setResultTypeSet(toCheck->resultTypeSet());
   }
 
  public:
@@ -12876,7 +12039,6 @@
       : MUnaryInstruction(classOpcode, heritage) {
     setGuard();
     setResultType(MIRType::Value);
-    setResultTypeSet(heritage->resultTypeSet());
   }
 
  public:
@@ -12891,7 +12053,6 @@
       : MUnaryInstruction(classOpcode, toCheck) {
     setGuard();
     setResultType(MIRType::Value);
-    setResultTypeSet(toCheck->resultTypeSet());
   }
 
  public:
@@ -12939,7 +12100,6 @@
     setGuard();
     setMovable();
     setResultType(MIRType::Object);
-    setResultTypeSet(array->resultTypeSet());
   }
 
  public:
@@ -13055,7 +12215,6 @@
   explicit MInitHomeObject(MDefinition* function, MDefinition* homeObject)
       : MBinaryInstruction(classOpcode, function, homeObject) {
     setResultType(MIRType::Object);
-    setResultTypeSet(function->resultTypeSet());
   }
 
  public:
@@ -13143,7 +12302,6 @@
   MGuardHasGetterSetter(MDefinition* obj, Shape* shape)
       : MUnaryInstruction(classOpcode, obj), shape_(shape) {
     setResultType(MIRType::Object);
-    setResultTypeSet(obj->resultTypeSet());
     setMovable();
     setGuard();
   }
@@ -13176,6 +12334,191 @@
   }
 };
 
+// Guard the object is extensible.
+class MGuardIsExtensible : public MUnaryInstruction,
+                           public SingleObjectPolicy::Data {
+  explicit MGuardIsExtensible(MDefinition* object)
+      : MUnaryInstruction(classOpcode, object) {
+    setResultType(MIRType::Object);
+    setMovable();
+    setGuard();
+  }
+
+ public:
+  INSTRUCTION_HEADER(GuardIsExtensible)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object))
+
+  AliasSet getAliasSet() const override {
+    return AliasSet::Load(AliasSet::ObjectFields);
+  }
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+};
+
+// Guard the input index is non-negative.
+class MGuardIndexIsNonNegative : public MUnaryInstruction,
+                                 public UnboxedInt32Policy<0>::Data {
+  explicit MGuardIndexIsNonNegative(MDefinition* index)
+      : MUnaryInstruction(classOpcode, index) {
+    setResultType(MIRType::Int32);
+    setMovable();
+    setGuard();
+  }
+
+ public:
+  INSTRUCTION_HEADER(GuardIndexIsNonNegative)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, index))
+
+  AliasSet getAliasSet() const override { return AliasSet::None(); }
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+
+  MDefinition* foldsTo(TempAllocator& alloc) override;
+};
+
+// Guard the input index is greater than the dense initialized length of an
+// object.
+class MGuardIndexGreaterThanDenseInitLength
+    : public MBinaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>>::Data {
+  MGuardIndexGreaterThanDenseInitLength(MDefinition* obj, MDefinition* index)
+      : MBinaryInstruction(classOpcode, obj, index) {
+    setResultType(MIRType::Int32);
+    setMovable();
+    setGuard();
+  }
+
+ public:
+  INSTRUCTION_HEADER(GuardIndexGreaterThanDenseInitLength)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index))
+
+  AliasSet getAliasSet() const override {
+    return AliasSet::Load(AliasSet::ObjectFields);
+  }
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+};
+
+// Guard an array object's length can be updated successfully when adding an
+// element at the input index.
+class MGuardIndexIsValidUpdateOrAdd
+    : public MBinaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>>::Data {
+  MGuardIndexIsValidUpdateOrAdd(MDefinition* obj, MDefinition* index)
+      : MBinaryInstruction(classOpcode, obj, index) {
+    setResultType(MIRType::Int32);
+    setMovable();
+    setGuard();
+  }
+
+ public:
+  INSTRUCTION_HEADER(GuardIndexIsValidUpdateOrAdd)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index))
+
+  AliasSet getAliasSet() const override {
+    return AliasSet::Load(AliasSet::ObjectFields);
+  }
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+};
+
+// Add or update a sparse element of an array object. It's allowed for the
+// sparse element to be already present on the array. It may also be an accessor
+// property, so this instruction is always marked as effectful.
+class MCallAddOrUpdateSparseElement
+    : public MTernaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>,
+                       BoxPolicy<2>>::Data {
+  bool strict_;
+
+  MCallAddOrUpdateSparseElement(MDefinition* obj, MDefinition* index,
+                                MDefinition* value, bool strict)
+      : MTernaryInstruction(classOpcode, obj, index, value), strict_(strict) {}
+
+ public:
+  INSTRUCTION_HEADER(CallAddOrUpdateSparseElement)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index), (2, value))
+
+  bool strict() const { return strict_; }
+
+  bool possiblyCalls() const override { return true; }
+};
+
+// Get a sparse element from an array object, possibly by calling an accessor
+// property.
+class MCallGetSparseElement
+    : public MBinaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>>::Data {
+  MCallGetSparseElement(MDefinition* obj, MDefinition* index)
+      : MBinaryInstruction(classOpcode, obj, index) {
+    setResultType(MIRType::Value);
+  }
+
+ public:
+  INSTRUCTION_HEADER(CallGetSparseElement)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index))
+
+  bool possiblyCalls() const override { return true; }
+};
+
+// Get any element from a native object.
+class MCallNativeGetElement
+    : public MBinaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>>::Data {
+  MCallNativeGetElement(MDefinition* obj, MDefinition* index)
+      : MBinaryInstruction(classOpcode, obj, index) {
+    setResultType(MIRType::Value);
+  }
+
+ public:
+  INSTRUCTION_HEADER(CallNativeGetElement)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index))
+
+  bool possiblyCalls() const override { return true; }
+};
+
+// Test if a native object has an own element (sparse or dense) at an index.
+class MCallObjectHasSparseElement
+    : public MBinaryInstruction,
+      public MixPolicy<ObjectPolicy<0>, UnboxedInt32Policy<1>>::Data {
+  MCallObjectHasSparseElement(MDefinition* obj, MDefinition* index)
+      : MBinaryInstruction(classOpcode, obj, index) {
+    setResultType(MIRType::Boolean);
+    setGuard();
+  }
+
+ public:
+  INSTRUCTION_HEADER(CallObjectHasSparseElement)
+  TRIVIAL_NEW_WRAPPERS
+  NAMED_OPERANDS((0, object), (1, index))
+
+  bool congruentTo(const MDefinition* ins) const override {
+    return congruentIfOperandsEqual(ins);
+  }
+
+  AliasSet getAliasSet() const override {
+    return AliasSet::Load(AliasSet::Element | AliasSet::ObjectFields |
+                          AliasSet::DynamicSlot | AliasSet::FixedSlot);
+  }
+
+  bool possiblyCalls() const override { return true; }
+};
+
 // Flips the input's sign bit, independently of the rest of the number's
 // payload. Note this is different from multiplying by minus-one, which has
 // side-effects for e.g. NaNs.
@@ -14685,47 +14028,6 @@
 
 // Helper functions used to decide how to build MIR.
 
-bool ElementAccessIsDenseNative(CompilerConstraintList* constraints,
-                                MDefinition* obj, MDefinition* id);
-bool ElementAccessIsTypedArray(CompilerConstraintList* constraints,
-                               MDefinition* obj, MDefinition* id,
-                               Scalar::Type* arrayType);
-bool ElementAccessIsPacked(CompilerConstraintList* constraints,
-                           MDefinition* obj);
-bool ElementAccessMightBeCopyOnWrite(CompilerConstraintList* constraints,
-                                     MDefinition* obj);
-bool ElementAccessMightBeNonExtensible(CompilerConstraintList* constraints,
-                                       MDefinition* obj);
-AbortReasonOr<bool> ElementAccessHasExtraIndexedProperty(IonBuilder* builder,
-                                                         MDefinition* obj);
-MIRType DenseNativeElementType(CompilerConstraintList* constraints,
-                               MDefinition* obj);
-BarrierKind PropertyReadNeedsTypeBarrier(
-    JSContext* propertycx, TempAllocator& alloc,
-    CompilerConstraintList* constraints, TypeSet::ObjectKey* key,
-    PropertyName* name, TemporaryTypeSet* observed, bool updateObserved);
-BarrierKind PropertyReadNeedsTypeBarrier(JSContext* propertycx,
-                                         TempAllocator& alloc,
-                                         CompilerConstraintList* constraints,
-                                         MDefinition* obj, PropertyName* name,
-                                         TemporaryTypeSet* observed);
-AbortReasonOr<BarrierKind> PropertyReadOnPrototypeNeedsTypeBarrier(
-    IonBuilder* builder, MDefinition* obj, PropertyName* name,
-    TemporaryTypeSet* observed);
-bool PropertyReadIsIdempotent(CompilerConstraintList* constraints,
-                              MDefinition* obj, PropertyName* name);
-bool CanWriteProperty(TempAllocator& alloc, CompilerConstraintList* constraints,
-                      HeapTypeSetKey property, MDefinition* value,
-                      MIRType implicitType = MIRType::None);
-bool PropertyWriteNeedsTypeBarrier(TempAllocator& alloc,
-                                   CompilerConstraintList* constraints,
-                                   MBasicBlock* current, MDefinition** pobj,
-                                   PropertyName* name, MDefinition** pvalue,
-                                   bool canModify,
-                                   MIRType implicitType = MIRType::None);
-AbortReasonOr<bool> TypeCanHaveExtraIndexedProperties(IonBuilder* builder,
-                                                      TemporaryTypeSet* types);
-
 inline MIRType MIRTypeForArrayBufferViewRead(Scalar::Type arrayType,
                                              bool observedDouble) {
   switch (arrayType) {
diff -Nru firefox-84.0.2+build1/js/src/jit/moz.build firefox-85.0+build1/js/src/jit/moz.build
--- firefox-84.0.2+build1/js/src/jit/moz.build	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/moz.build	2021-01-18 19:58:13.000000000 +0000
@@ -19,7 +19,6 @@
 UNIFIED_SOURCES += [
     "AliasAnalysis.cpp",
     "AlignmentMaskAnalysis.cpp",
-    "AutoDetectInvalidation.cpp",
     "BacktrackingAllocator.cpp",
     "Bailouts.cpp",
     "BaselineBailouts.cpp",
@@ -29,7 +28,6 @@
     "BaselineFrame.cpp",
     "BaselineFrameInfo.cpp",
     "BaselineIC.cpp",
-    "BaselineInspector.cpp",
     "BaselineJIT.cpp",
     "BitSet.cpp",
     "BytecodeAnalysis.cpp",
@@ -48,7 +46,6 @@
     "InstructionReordering.cpp",
     "Ion.cpp",
     "IonAnalysis.cpp",
-    "IonBuilder.cpp",
     "IonCacheIRCompiler.cpp",
     "IonCompileTask.cpp",
     "IonIC.cpp",
@@ -69,7 +66,6 @@
     "LIR.cpp",
     "Lowering.cpp",
     "MacroAssembler.cpp",
-    "MCallOptimize.cpp",
     "MIR.cpp",
     "MIRGraph.cpp",
     "MoveResolver.cpp",
@@ -87,7 +83,6 @@
     "shared/Lowering-shared.cpp",
     "Sink.cpp",
     "Snapshots.cpp",
-    "TIOracle.cpp",
     "TrialInlining.cpp",
     "TypePolicy.cpp",
     "ValueNumbering.cpp",
@@ -263,3 +258,6 @@
     entry_point="generate_cacheirops_header",
     inputs=["CacheIROps.yaml"],
 )
+
+if CONFIG["FUZZING_INTERFACES"] and CONFIG["LIBFUZZER"]:
+    include("/tools/fuzzing/libfuzzer-config.mozbuild")
diff -Nru firefox-84.0.2+build1/js/src/jit/none/SharedICHelpers-none.h firefox-85.0+build1/js/src/jit/none/SharedICHelpers-none.h
--- firefox-84.0.2+build1/js/src/jit/none/SharedICHelpers-none.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/none/SharedICHelpers-none.h	2021-01-18 19:58:13.000000000 +0000
@@ -15,9 +15,6 @@
 inline void EmitRestoreTailCallReg(MacroAssembler&) { MOZ_CRASH(); }
 inline void EmitRepushTailCallReg(MacroAssembler&) { MOZ_CRASH(); }
 inline void EmitCallIC(MacroAssembler&, CodeOffset*) { MOZ_CRASH(); }
-inline void EmitEnterTypeMonitorIC(MacroAssembler&, size_t v = 0) {
-  MOZ_CRASH();
-}
 inline void EmitReturnFromIC(MacroAssembler&) { MOZ_CRASH(); }
 inline void EmitBaselineLeaveStubFrame(MacroAssembler&, bool v = false) {
   MOZ_CRASH();
diff -Nru firefox-84.0.2+build1/js/src/jit/RangeAnalysis.cpp firefox-85.0+build1/js/src/jit/RangeAnalysis.cpp
--- firefox-84.0.2+build1/js/src/jit/RangeAnalysis.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/RangeAnalysis.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -1726,10 +1726,6 @@
   setRange(output);
 }
 
-void MFilterTypeSet::computeRange(TempAllocator& alloc) {
-  setRange(new (alloc) Range(getOperand(0)));
-}
-
 static Range* GetArrayBufferViewRange(TempAllocator& alloc, Scalar::Type type) {
   switch (type) {
     case Scalar::Uint8Clamped:
@@ -1953,7 +1949,7 @@
     analyzeLoopPhi(iterationBound, *iter);
   }
 
-  if (!mir->compilingWasm()) {
+  if (!mir->compilingWasm() && !mir->outerInfo().hadBoundsCheckBailout()) {
     // Try to hoist any bounds checks from the loop using symbolic bounds.
 
     Vector<MBoundsCheck*, 0, JitAllocPolicy> hoistedChecks(alloc());
@@ -2281,12 +2277,14 @@
   MBasicBlock* preLoop = header->loopPredecessor();
   MOZ_ASSERT(!preLoop->isMarked());
 
-  MDefinition* lowerTerm = ConvertLinearSum(alloc(), preLoop, lower->sum);
+  MDefinition* lowerTerm = ConvertLinearSum(alloc(), preLoop, lower->sum,
+                                            BailoutKind::HoistBoundsCheck);
   if (!lowerTerm) {
     return false;
   }
 
-  MDefinition* upperTerm = ConvertLinearSum(alloc(), preLoop, upper->sum);
+  MDefinition* upperTerm = ConvertLinearSum(alloc(), preLoop, upper->sum,
+                                            BailoutKind::HoistBoundsCheck);
   if (!upperTerm) {
     return false;
   }
@@ -2320,6 +2318,7 @@
   lowerCheck->setMinimum(lowerConstant);
   lowerCheck->computeRange(alloc());
   lowerCheck->collectRangeInfoPreTrunc();
+  lowerCheck->setBailoutKind(BailoutKind::HoistBoundsCheck);
   preLoop->insertBefore(preLoop->lastIns(), lowerCheck);
 
   // Hoist the loop invariant upper bounds checks.
@@ -2336,6 +2335,7 @@
     upperCheck->setMaximum(upperConstant);
     upperCheck->computeRange(alloc());
     upperCheck->collectRangeInfoPreTrunc();
+    upperCheck->setBailoutKind(BailoutKind::HoistBoundsCheck);
     preLoop->insertBefore(preLoop->lastIns(), upperCheck);
   }
 
@@ -3050,6 +3050,7 @@
       MInstruction* op;
       if (kind == MDefinition::TruncateAfterBailouts) {
         op = MToNumberInt32::New(alloc, truncated->getOperand(i));
+        op->setBailoutKind(BailoutKind::EagerTruncation);
       } else {
         op = MTruncateToInt32::New(alloc, truncated->getOperand(i));
       }
@@ -3140,7 +3141,7 @@
       // code within the current JSScript, we no longer attempt to make
       // this kind of eager optimizations.
       if (kind <= MDefinition::TruncateAfterBailouts &&
-          block->info().hadOverflowBailout()) {
+          block->info().hadEagerTruncationBailout()) {
         continue;
       }
 
@@ -3243,6 +3244,7 @@
   Range indexRange(index());
   if (indexRange.isFiniteNonNegative()) {
     needsNegativeIntCheck_ = false;
+    setNotGuard();
   }
 }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/Recover.cpp firefox-85.0+build1/js/src/jit/Recover.cpp
--- firefox-84.0.2+build1/js/src/jit/Recover.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Recover.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -1232,13 +1232,11 @@
   MOZ_ASSERT(canRecoverOnBailout());
   writer.writeUnsigned(uint32_t(RInstruction::Recover_NewArray));
   writer.writeUnsigned(length());
-  writer.writeByte(uint8_t(convertDoubleElements()));
   return true;
 }
 
 RNewArray::RNewArray(CompactBufferReader& reader) {
   count_ = reader.readUnsigned();
-  convertDoubleElements_ = reader.readByte();
 }
 
 bool RNewArray::recover(JSContext* cx, SnapshotIterator& iter) const {
@@ -1246,32 +1244,7 @@
   RootedValue result(cx);
   RootedObjectGroup group(cx, templateObject->group());
 
-  ArrayObject* resultObject =
-      NewArrayWithGroup(cx, count_, group, convertDoubleElements_);
-  if (!resultObject) {
-    return false;
-  }
-
-  result.setObject(*resultObject);
-  iter.storeInstructionResult(result);
-  return true;
-}
-
-bool MNewArrayCopyOnWrite::writeRecoverData(CompactBufferWriter& writer) const {
-  MOZ_ASSERT(canRecoverOnBailout());
-  writer.writeUnsigned(uint32_t(RInstruction::Recover_NewArrayCopyOnWrite));
-  return true;
-}
-
-RNewArrayCopyOnWrite::RNewArrayCopyOnWrite(CompactBufferReader& reader) {}
-
-bool RNewArrayCopyOnWrite::recover(JSContext* cx,
-                                   SnapshotIterator& iter) const {
-  RootedArrayObject templateObject(cx,
-                                   &iter.read().toObject().as<ArrayObject>());
-  RootedValue result(cx);
-
-  ArrayObject* resultObject = NewDenseCopyOnWriteArray(cx, templateObject);
+  ArrayObject* resultObject = NewArrayWithGroup(cx, count_, group);
   if (!resultObject) {
     return false;
   }
@@ -1482,35 +1455,19 @@
   ArrayObject* object = &iter.read().toObject().as<ArrayObject>();
   uint32_t initLength = iter.read().toInt32();
 
-  if (!object->denseElementsAreCopyOnWrite()) {
-    MOZ_ASSERT(object->getDenseInitializedLength() == 0,
-               "initDenseElement call below relies on this");
-    object->setDenseInitializedLength(initLength);
-
-    for (size_t index = 0; index < numElements(); index++) {
-      Value val = iter.read();
-
-      if (index >= initLength) {
-        MOZ_ASSERT(val.isUndefined());
-        continue;
-      }
-
-      object->initDenseElement(index, val);
-    }
-  } else {
-    MOZ_RELEASE_ASSERT(object->getDenseInitializedLength() == numElements());
-    MOZ_RELEASE_ASSERT(initLength == numElements());
-
-    for (size_t index = 0; index < numElements(); index++) {
-      Value val = iter.read();
-      if (object->getDenseElement(index) == val) {
-        continue;
-      }
-      if (!object->maybeCopyElementsForWrite(cx)) {
-        return false;
-      }
-      object->setDenseElement(index, val);
+  MOZ_ASSERT(object->getDenseInitializedLength() == 0,
+             "initDenseElement call below relies on this");
+  object->setDenseInitializedLength(initLength);
+
+  for (size_t index = 0; index < numElements(); index++) {
+    Value val = iter.read();
+
+    if (index >= initLength) {
+      MOZ_ASSERT(val.isUndefined());
+      continue;
     }
+
+    object->initDenseElement(index, val);
   }
 
   result.setObject(*object);
diff -Nru firefox-84.0.2+build1/js/src/jit/Recover.h firefox-85.0+build1/js/src/jit/Recover.h
--- firefox-84.0.2+build1/js/src/jit/Recover.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Recover.h	2021-01-18 19:58:13.000000000 +0000
@@ -105,7 +105,6 @@
   _(NewObject)                 \
   _(NewTypedArray)             \
   _(NewArray)                  \
-  _(NewArrayCopyOnWrite)       \
   _(NewIterator)               \
   _(NewCallObject)             \
   _(CreateThisWithTemplate)    \
@@ -608,21 +607,12 @@
 class RNewArray final : public RInstruction {
  private:
   uint32_t count_;
-  bool convertDoubleElements_;
 
  public:
   RINSTRUCTION_HEADER_NUM_OP_(NewArray, 1)
 
   MOZ_MUST_USE bool recover(JSContext* cx,
                             SnapshotIterator& iter) const override;
-};
-
-class RNewArrayCopyOnWrite final : public RInstruction {
- public:
-  RINSTRUCTION_HEADER_NUM_OP_(NewArrayCopyOnWrite, 1)
-
-  MOZ_MUST_USE bool recover(JSContext* cx,
-                            SnapshotIterator& iter) const override;
 };
 
 class RNewIterator final : public RInstruction {
diff -Nru firefox-84.0.2+build1/js/src/jit/Safepoints.cpp firefox-85.0+build1/js/src/jit/Safepoints.cpp
--- firefox-84.0.2+build1/js/src/jit/Safepoints.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/Safepoints.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -105,11 +105,10 @@
 #ifdef JS_JITSPEW
   if (JitSpewEnabled(JitSpew_Safepoints)) {
     for (GeneralRegisterForwardIterator iter(spilledGpr); iter.more(); ++iter) {
-      const char* type = gc.has(*iter)
-                             ? "gc"
-                             : slots.has(*iter)
-                                   ? "slots"
-                                   : valueRegs.has(*iter) ? "value" : "any";
+      const char* type = gc.has(*iter)          ? "gc"
+                         : slots.has(*iter)     ? "slots"
+                         : valueRegs.has(*iter) ? "value"
+                                                : "any";
       JitSpew(JitSpew_Safepoints, "    %s reg: %s", type, (*iter).name());
     }
     for (FloatRegisterForwardIterator iter(spilledFloat); iter.more(); ++iter) {
diff -Nru firefox-84.0.2+build1/js/src/jit/ScalarReplacement.cpp firefox-85.0+build1/js/src/jit/ScalarReplacement.cpp
--- firefox-84.0.2+build1/js/src/jit/ScalarReplacement.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/ScalarReplacement.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -713,7 +713,7 @@
 // Returns False if the elements is not escaped and if it is optimizable by
 // ScalarReplacementOfArray.
 static bool IsElementEscaped(MDefinition* def, uint32_t arraySize) {
-  MOZ_ASSERT(def->isElements() || def->isConvertElementsToDoubles());
+  MOZ_ASSERT(def->isElements());
 
   JitSpewDef(JitSpew_Escape, "Check elements\n", def);
   JitSpewIndent spewIndent(JitSpew_Escape);
@@ -803,14 +803,6 @@
         MOZ_ASSERT(access->toArrayLength()->elements() == def);
         break;
 
-      case MDefinition::Opcode::ConvertElementsToDoubles:
-        MOZ_ASSERT(access->toConvertElementsToDoubles()->elements() == def);
-        if (IsElementEscaped(access, arraySize)) {
-          JitSpewDef(JitSpew_Escape, "is indirectly escaped by\n", access);
-          return true;
-        }
-        break;
-
       default:
         JitSpewDef(JitSpew_Escape, "is escaped by\n", access);
         return true;
@@ -821,7 +813,7 @@
 }
 
 static inline bool IsOptimizableArrayInstruction(MInstruction* ins) {
-  return ins->isNewArray() || ins->isNewArrayCopyOnWrite();
+  return ins->isNewArray();
 }
 
 // Returns False if the array is not escaped and if it is optimizable by
@@ -831,25 +823,19 @@
 // changing length, with only access with known constants.
 static bool IsArrayEscaped(MInstruction* ins, MInstruction* newArray) {
   MOZ_ASSERT(ins->type() == MIRType::Object);
-  MOZ_ASSERT(IsOptimizableArrayInstruction(ins) ||
-             ins->isMaybeCopyElementsForWrite());
+  MOZ_ASSERT(IsOptimizableArrayInstruction(ins));
   MOZ_ASSERT(IsOptimizableArrayInstruction(newArray));
 
   JitSpewDef(JitSpew_Escape, "Check array\n", ins);
   JitSpewIndent spewIndent(JitSpew_Escape);
 
-  uint32_t length;
-  if (newArray->isNewArray()) {
-    if (!newArray->toNewArray()->templateObject()) {
-      JitSpew(JitSpew_Escape, "No template object defined.");
-      return true;
-    }
-
-    length = newArray->toNewArray()->length();
-  } else {
-    length = newArray->toNewArrayCopyOnWrite()->templateObject()->length();
+  if (!newArray->toNewArray()->templateObject()) {
+    JitSpew(JitSpew_Escape, "No template object defined.");
+    return true;
   }
 
+  uint32_t length = newArray->toNewArray()->length();
+
   if (length >= 16) {
     JitSpew(JitSpew_Escape, "Array has too many elements");
     return true;
@@ -882,16 +868,6 @@
         break;
       }
 
-      case MDefinition::Opcode::MaybeCopyElementsForWrite: {
-        MMaybeCopyElementsForWrite* copied = def->toMaybeCopyElementsForWrite();
-        MOZ_ASSERT(copied->object() == ins);
-        if (IsArrayEscaped(copied, ins)) {
-          JitSpewDef(JitSpew_Escape, "is indirectly escaped by\n", copied);
-          return true;
-        }
-        break;
-      }
-
       // This instruction is a no-op used to verify that scalar replacement
       // is working as expected in jit-test.
       case MDefinition::Opcode::AssertRecoveredOnBailout:
@@ -961,8 +937,6 @@
   void visitSetInitializedLength(MSetInitializedLength* ins);
   void visitInitializedLength(MInitializedLength* ins);
   void visitArrayLength(MArrayLength* ins);
-  void visitMaybeCopyElementsForWrite(MMaybeCopyElementsForWrite* ins);
-  void visitConvertElementsToDoubles(MConvertElementsToDoubles* ins);
 };
 
 const char* ArrayMemoryView::phaseName = "Scalar Replacement of Array";
@@ -989,10 +963,7 @@
 bool ArrayMemoryView::initStartingState(BlockState** pState) {
   // Uninitialized elements have an "undefined" value.
   undefinedVal_ = MConstant::New(alloc_, UndefinedValue());
-  MConstant* initLength = MConstant::New(
-      alloc_, Int32Value(arr_->isNewArrayCopyOnWrite()
-                             ? arr_->toNewArrayCopyOnWrite()->length()
-                             : 0));
+  MConstant* initLength = MConstant::New(alloc_, Int32Value(0));
   arr_->block()->insertBefore(arr_, undefinedVal_);
   arr_->block()->insertBefore(arr_, initLength);
 
@@ -1237,47 +1208,6 @@
   discardInstruction(ins, elements);
 }
 
-void ArrayMemoryView::visitMaybeCopyElementsForWrite(
-    MMaybeCopyElementsForWrite* ins) {
-  MOZ_ASSERT(ins->numOperands() == 1);
-  MOZ_ASSERT(ins->type() == MIRType::Object);
-
-  // Skip guards on other objects.
-  if (ins->object() != arr_) {
-    return;
-  }
-
-  // Nothing to do here: RArrayState::recover will copy the elements if
-  // needed.
-
-  // Replace the guard with the array.
-  ins->replaceAllUsesWith(arr_);
-
-  // Remove original instruction.
-  ins->block()->discard(ins);
-}
-
-void ArrayMemoryView::visitConvertElementsToDoubles(
-    MConvertElementsToDoubles* ins) {
-  MOZ_ASSERT(ins->numOperands() == 1);
-  MOZ_ASSERT(ins->type() == MIRType::Elements);
-
-  // Skip other array objects.
-  MDefinition* elements = ins->elements();
-  if (!isArrayStateElements(elements)) {
-    return;
-  }
-
-  // We don't have to do anything else here: MConvertElementsToDoubles just
-  // exists to allow MLoadELement to use masm.loadDouble (without checking
-  // for int32 elements), but since we're using scalar replacement for the
-  // elements that doesn't matter.
-  ins->replaceAllUsesWith(elements);
-
-  // Remove original instruction.
-  ins->block()->discard(ins);
-}
-
 bool ScalarReplacement(MIRGenerator* mir, MIRGraph& graph) {
   EmulateStateOf<ObjectMemoryView> replaceObject(mir, graph);
   EmulateStateOf<ArrayMemoryView> replaceArray(mir, graph);
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/Assembler-shared.h firefox-85.0+build1/js/src/jit/shared/Assembler-shared.h
--- firefox-84.0.2+build1/js/src/jit/shared/Assembler-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/Assembler-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -205,8 +205,7 @@
   explicit ImmGCPtr(const gc::Cell* ptr) : value(ptr) {
     // Nursery pointers can't be used if the main thread might be currently
     // performing a minor GC.
-    MOZ_ASSERT_IF(ptr && !ptr->isTenured(),
-                  !CurrentThreadIsIonCompilingSafeForMinorGC());
+    MOZ_ASSERT_IF(ptr && !ptr->isTenured(), !CurrentThreadIsIonCompiling());
 
     // wasm shouldn't be creating GC things
     MOZ_ASSERT(!IsCompilingWasm());
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/CodeGenerator-shared.cpp firefox-85.0+build1/js/src/jit/shared/CodeGenerator-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/shared/CodeGenerator-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/CodeGenerator-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -69,7 +69,6 @@
       nativeToBytecodeNumRegions_(0),
       nativeToBytecodeScriptList_(nullptr),
       nativeToBytecodeScriptListLength_(0),
-      skipArgCheckEntryOffset_(0),
 #ifdef CHECK_OSIPOINT_REGISTERS
       checkOsiPointRegisters(JitOptions.checkOsiPointRegisters),
 #endif
@@ -341,10 +340,9 @@
     mir = mir->toBox()->getOperand(0);
   }
 
-  MIRType type =
-      mir->isRecoveredOnBailout()
-          ? MIRType::None
-          : mir->isUnused() ? MIRType::MagicOptimizedOut : mir->type();
+  MIRType type = mir->isRecoveredOnBailout() ? MIRType::None
+                 : mir->isUnused()           ? MIRType::MagicOptimizedOut
+                                             : mir->type();
 
   RValueAllocation alloc;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/CodeGenerator-shared.h firefox-85.0+build1/js/src/jit/shared/CodeGenerator-shared.h
--- firefox-84.0.2+build1/js/src/jit/shared/CodeGenerator-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/CodeGenerator-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -128,18 +128,6 @@
     return *osrEntryOffset_;
   }
 
-  // The offset of the first instruction of the body.
-  // This skips the arguments type checks.
-  size_t skipArgCheckEntryOffset_;
-
-  inline void setSkipArgCheckEntryOffset(size_t offset) {
-    MOZ_ASSERT(skipArgCheckEntryOffset_ == 0);
-    skipArgCheckEntryOffset_ = offset;
-  }
-  inline size_t getSkipArgCheckEntryOffset() const {
-    return skipArgCheckEntryOffset_;
-  }
-
   typedef js::Vector<CodegenSafepointIndex, 8, SystemAllocPolicy>
       SafepointIndices;
 
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/LIR-shared.h firefox-85.0+build1/js/src/jit/shared/LIR-shared.h
--- firefox-84.0.2+build1/js/src/jit/shared/LIR-shared.h	2021-01-06 11:23:11.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/LIR-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -295,20 +295,6 @@
   MNewArray* mir() const { return mir_->toNewArray(); }
 };
 
-class LNewArrayCopyOnWrite : public LInstructionHelper<1, 0, 1> {
- public:
-  LIR_HEADER(NewArrayCopyOnWrite)
-
-  explicit LNewArrayCopyOnWrite(const LDefinition& temp)
-      : LInstructionHelper(classOpcode) {
-    setTemp(0, temp);
-  }
-
-  const LDefinition* temp() { return getTemp(0); }
-
-  MNewArrayCopyOnWrite* mir() const { return mir_->toNewArrayCopyOnWrite(); }
-};
-
 class LNewArrayDynamicLength : public LInstructionHelper<1, 1, 1> {
  public:
   LIR_HEADER(NewArrayDynamicLength)
@@ -492,25 +478,6 @@
   MNewStringObject* mir() const { return mir_->toNewStringObject(); }
 };
 
-class LInitElem : public LCallInstructionHelper<0, 1 + 2 * BOX_PIECES, 0> {
- public:
-  LIR_HEADER(InitElem)
-
-  LInitElem(const LAllocation& object, const LBoxAllocation& id,
-            const LBoxAllocation& value)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, object);
-    setBoxOperand(IdIndex, id);
-    setBoxOperand(ValueIndex, value);
-  }
-
-  static const size_t IdIndex = 1;
-  static const size_t ValueIndex = 1 + BOX_PIECES;
-
-  const LAllocation* getObject() { return getOperand(0); }
-  MInitElem* mir() const { return mir_->toInitElem(); }
-};
-
 class LInitElemGetterSetter
     : public LCallInstructionHelper<0, 2 + BOX_PIECES, 0> {
  public:
@@ -681,47 +648,6 @@
   const LAllocation* tlsPtr() { return getOperand(0); }
 };
 
-class LDefVar : public LCallInstructionHelper<0, 1, 0> {
- public:
-  LIR_HEADER(DefVar)
-
-  explicit LDefVar(const LAllocation& envChain)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, envChain);
-  }
-
-  const LAllocation* environmentChain() { return getOperand(0); }
-  MDefVar* mir() const { return mir_->toDefVar(); }
-};
-
-class LDefLexical : public LCallInstructionHelper<0, 1, 0> {
- public:
-  LIR_HEADER(DefLexical)
-
-  explicit LDefLexical(const LAllocation& envChain)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, envChain);
-  }
-
-  const LAllocation* environmentChain() { return getOperand(0); }
-  MDefLexical* mir() const { return mir_->toDefLexical(); }
-};
-
-class LDefFun : public LCallInstructionHelper<0, 2, 0> {
- public:
-  LIR_HEADER(DefFun)
-
-  LDefFun(const LAllocation& fun, const LAllocation& envChain)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, fun);
-    setOperand(1, envChain);
-  }
-
-  const LAllocation* fun() { return getOperand(0); }
-  const LAllocation* environmentChain() { return getOperand(1); }
-  MDefFun* mir() const { return mir_->toDefFun(); }
-};
-
 class LTypeOfV : public LInstructionHelper<1, BOX_PIECES, 1> {
  public:
   LIR_HEADER(TypeOfV)
@@ -1596,45 +1522,6 @@
   MTest* mir() const { return mir_->toTest(); }
 };
 
-// Dispatches control flow to a successor based on incoming JSFunction*.
-// Used to implemenent polymorphic inlining.
-class LFunctionDispatch : public LInstructionHelper<0, 1, 0> {
-  // Dispatch is performed based on a function -> block map
-  // stored in the MIR.
-
- public:
-  LIR_HEADER(FunctionDispatch);
-
-  explicit LFunctionDispatch(const LAllocation& in)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, in);
-  }
-
-  MFunctionDispatch* mir() const { return mir_->toFunctionDispatch(); }
-};
-
-class LObjectGroupDispatch : public LInstructionHelper<0, 1, 1> {
-  // Dispatch is performed based on an ObjectGroup -> block
-  // map inferred by the MIR.
-
- public:
-  LIR_HEADER(ObjectGroupDispatch);
-
-  const char* extraName() const {
-    return mir()->hasFallback() ? "HasFallback" : "NoFallback";
-  }
-
-  LObjectGroupDispatch(const LAllocation& in, const LDefinition& temp)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, in);
-    setTemp(0, temp);
-  }
-
-  const LDefinition* temp() { return getTemp(0); }
-
-  MObjectGroupDispatch* mir() const { return mir_->toObjectGroupDispatch(); }
-};
-
 // Compares two integral values of the same JS type, either integer or object.
 // For objects, both operands are in registers.
 class LCompare : public LInstructionHelper<1, 2, 0> {
@@ -3129,9 +3016,9 @@
   }
 
   const char* extraName() const {
-    return mode() == NORMAL
-               ? "Normal"
-               : mode() == TRUNCATE ? "Truncate" : "TruncateNoWrap";
+    return mode() == NORMAL     ? "Normal"
+           : mode() == TRUNCATE ? "Truncate"
+                                : "TruncateNoWrap";
   }
 
   static const size_t Input = 0;
@@ -3451,16 +3338,6 @@
   MPowHalf* mir() const { return mir_->toPowHalf(); }
 };
 
-// No-op instruction that is used to hold the entry snapshot. This simplifies
-// register allocation as it doesn't need to sniff the snapshot out of the
-// LIRGraph.
-class LStart : public LInstructionHelper<0, 0, 0> {
- public:
-  LIR_HEADER(Start)
-
-  LStart() : LInstructionHelper(classOpcode) {}
-};
-
 class LNaNToZero : public LInstructionHelper<1, 1, 1> {
  public:
   LIR_HEADER(NaNToZero)
@@ -3917,59 +3794,6 @@
   const MElements* mir() const { return mir_->toElements(); }
 };
 
-// If necessary, convert any int32 elements in a vector into doubles.
-class LConvertElementsToDoubles : public LInstructionHelper<0, 1, 0> {
- public:
-  LIR_HEADER(ConvertElementsToDoubles)
-
-  explicit LConvertElementsToDoubles(const LAllocation& elements)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, elements);
-  }
-
-  const LAllocation* elements() { return getOperand(0); }
-};
-
-// If |elements| has the CONVERT_DOUBLE_ELEMENTS flag, convert int32 value to
-// double. Else return the original value.
-class LMaybeToDoubleElement : public LInstructionHelper<BOX_PIECES, 2, 1> {
- public:
-  LIR_HEADER(MaybeToDoubleElement)
-
-  LMaybeToDoubleElement(const LAllocation& elements, const LAllocation& value,
-                        const LDefinition& tempFloat)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, elements);
-    setOperand(1, value);
-    setTemp(0, tempFloat);
-  }
-
-  const LAllocation* elements() { return getOperand(0); }
-  const LAllocation* value() { return getOperand(1); }
-  const LDefinition* tempFloat() { return getTemp(0); }
-};
-
-// If necessary, copy the elements in an object so they may be written to.
-class LMaybeCopyElementsForWrite : public LInstructionHelper<0, 1, 1> {
- public:
-  LIR_HEADER(MaybeCopyElementsForWrite)
-
-  explicit LMaybeCopyElementsForWrite(const LAllocation& obj,
-                                      const LDefinition& temp)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, obj);
-    setTemp(0, temp);
-  }
-
-  const LAllocation* object() { return getOperand(0); }
-
-  const LDefinition* temp() { return getTemp(0); }
-
-  const MMaybeCopyElementsForWrite* mir() const {
-    return mir_->toMaybeCopyElementsForWrite();
-  }
-};
-
 // Load the initialized length from an elements header.
 class LInitializedLength : public LInstructionHelper<1, 1, 0> {
  public:
@@ -4241,23 +4065,21 @@
   const LAllocation* index() { return getOperand(1); }
 };
 
-class LInArray : public LInstructionHelper<1, 4, 0> {
+class LInArray : public LInstructionHelper<1, 3, 0> {
  public:
   LIR_HEADER(InArray)
 
   LInArray(const LAllocation& elements, const LAllocation& index,
-           const LAllocation& initLength, const LAllocation& object)
+           const LAllocation& initLength)
       : LInstructionHelper(classOpcode) {
     setOperand(0, elements);
     setOperand(1, index);
     setOperand(2, initLength);
-    setOperand(3, object);
   }
   const MInArray* mir() const { return mir_->toInArray(); }
   const LAllocation* elements() { return getOperand(0); }
   const LAllocation* index() { return getOperand(1); }
   const LAllocation* initLength() { return getOperand(2); }
-  const LAllocation* object() { return getOperand(3); }
 };
 
 class LGuardElementNotHole : public LInstructionHelper<0, 2, 0> {
@@ -4531,34 +4353,12 @@
   const LDefinition* spectreTemp() { return getTemp(0); }
 };
 
-class LArrayPopShiftV : public LInstructionHelper<BOX_PIECES, 1, 2> {
+class LArrayPopShift : public LInstructionHelper<BOX_PIECES, 1, 2> {
  public:
-  LIR_HEADER(ArrayPopShiftV)
+  LIR_HEADER(ArrayPopShift)
 
-  LArrayPopShiftV(const LAllocation& object, const LDefinition& temp0,
-                  const LDefinition& temp1)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, object);
-    setTemp(0, temp0);
-    setTemp(1, temp1);
-  }
-
-  const char* extraName() const {
-    return mir()->mode() == MArrayPopShift::Pop ? "Pop" : "Shift";
-  }
-
-  const MArrayPopShift* mir() const { return mir_->toArrayPopShift(); }
-  const LAllocation* object() { return getOperand(0); }
-  const LDefinition* temp0() { return getTemp(0); }
-  const LDefinition* temp1() { return getTemp(1); }
-};
-
-class LArrayPopShiftT : public LInstructionHelper<1, 1, 2> {
- public:
-  LIR_HEADER(ArrayPopShiftT)
-
-  LArrayPopShiftT(const LAllocation& object, const LDefinition& temp0,
-                  const LDefinition& temp1)
+  LArrayPopShift(const LAllocation& object, const LDefinition& temp0,
+                 const LDefinition& temp1)
       : LInstructionHelper(classOpcode) {
     setOperand(0, object);
     setTemp(0, temp0);
@@ -5323,16 +5123,16 @@
   LCallGetIntrinsicValue() : LCallInstructionHelper(classOpcode) {}
 };
 
-class LGetPropSuperCacheV
+class LGetPropSuperCache
     : public LInstructionHelper<BOX_PIECES, 1 + 2 * BOX_PIECES, 0> {
  public:
-  LIR_HEADER(GetPropSuperCacheV)
+  LIR_HEADER(GetPropSuperCache)
 
   static const size_t Receiver = 1;
   static const size_t Id = Receiver + BOX_PIECES;
 
-  LGetPropSuperCacheV(const LAllocation& obj, const LBoxAllocation& receiver,
-                      const LBoxAllocation& id)
+  LGetPropSuperCache(const LAllocation& obj, const LBoxAllocation& receiver,
+                     const LBoxAllocation& id)
       : LInstructionHelper(classOpcode) {
     setOperand(0, obj);
     setBoxOperand(Receiver, receiver);
@@ -5344,43 +5144,20 @@
 
 // Patchable jump to stubs generated for a GetProperty cache, which loads a
 // boxed value.
-class LGetPropertyCacheV
-    : public LInstructionHelper<BOX_PIECES, 2 * BOX_PIECES, 1> {
+class LGetPropertyCache
+    : public LInstructionHelper<BOX_PIECES, 2 * BOX_PIECES, 0> {
  public:
-  LIR_HEADER(GetPropertyCacheV)
+  LIR_HEADER(GetPropertyCache)
 
   static const size_t Value = 0;
   static const size_t Id = BOX_PIECES;
 
-  LGetPropertyCacheV(const LBoxAllocation& value, const LBoxAllocation& id,
-                     const LDefinition& temp)
-      : LInstructionHelper(classOpcode) {
-    setBoxOperand(Value, value);
-    setBoxOperand(Id, id);
-    setTemp(0, temp);
-  }
-  const MGetPropertyCache* mir() const { return mir_->toGetPropertyCache(); }
-  const LDefinition* temp() { return getTemp(0); }
-};
-
-// Patchable jump to stubs generated for a GetProperty cache, which loads a
-// value of a known type, possibly into an FP register.
-class LGetPropertyCacheT : public LInstructionHelper<1, 2 * BOX_PIECES, 1> {
- public:
-  LIR_HEADER(GetPropertyCacheT)
-
-  static const size_t Value = 0;
-  static const size_t Id = BOX_PIECES;
-
-  LGetPropertyCacheT(const LBoxAllocation& value, const LBoxAllocation& id,
-                     const LDefinition& temp)
+  LGetPropertyCache(const LBoxAllocation& value, const LBoxAllocation& id)
       : LInstructionHelper(classOpcode) {
     setBoxOperand(Value, value);
     setBoxOperand(Id, id);
-    setTemp(0, temp);
   }
   const MGetPropertyCache* mir() const { return mir_->toGetPropertyCache(); }
-  const LDefinition* temp() { return getTemp(0); }
 };
 
 // Emit code to load a boxed value from an object's slots if its shape matches
@@ -5764,40 +5541,6 @@
   }
 };
 
-class LCallGetProperty
-    : public LCallInstructionHelper<BOX_PIECES, BOX_PIECES, 0> {
- public:
-  LIR_HEADER(CallGetProperty)
-
-  static const size_t Value = 0;
-
-  explicit LCallGetProperty(const LBoxAllocation& val)
-      : LCallInstructionHelper(classOpcode) {
-    setBoxOperand(Value, val);
-  }
-
-  MCallGetProperty* mir() const { return mir_->toCallGetProperty(); }
-};
-
-// Call js::GetElement.
-class LCallGetElement
-    : public LCallInstructionHelper<BOX_PIECES, 2 * BOX_PIECES, 0> {
- public:
-  LIR_HEADER(CallGetElement)
-
-  static const size_t LhsInput = 0;
-  static const size_t RhsInput = BOX_PIECES;
-
-  LCallGetElement(const LBoxAllocation& lhs, const LBoxAllocation& rhs)
-      : LCallInstructionHelper(classOpcode) {
-    setBoxOperand(LhsInput, lhs);
-    setBoxOperand(RhsInput, rhs);
-  }
-
-  MCallGetElement* mir() const { return mir_->toCallGetElement(); }
-};
-
-// Call js::SetElement.
 class LCallSetElement
     : public LCallInstructionHelper<0, 1 + 2 * BOX_PIECES, 0> {
  public:
@@ -5817,45 +5560,6 @@
   const MCallSetElement* mir() const { return mir_->toCallSetElement(); }
 };
 
-// Call js::InitElementArray.
-class LCallInitElementArray
-    : public LCallInstructionHelper<0, 2 + BOX_PIECES, 0> {
- public:
-  LIR_HEADER(CallInitElementArray)
-
-  static const size_t Value = 2;
-
-  LCallInitElementArray(const LAllocation& obj, const LAllocation& index,
-                        const LBoxAllocation& value)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, obj);
-    setOperand(1, index);
-    setBoxOperand(Value, value);
-  }
-  const LAllocation* object() { return getOperand(0); }
-  const LAllocation* index() { return getOperand(1); }
-  const MCallInitElementArray* mir() const {
-    return mir_->toCallInitElementArray();
-  }
-};
-
-// Call a VM function to perform a property or name assignment of a generic
-// value.
-class LCallSetProperty : public LCallInstructionHelper<0, 1 + BOX_PIECES, 0> {
- public:
-  LIR_HEADER(CallSetProperty)
-
-  LCallSetProperty(const LAllocation& obj, const LBoxAllocation& value)
-      : LCallInstructionHelper(classOpcode) {
-    setOperand(0, obj);
-    setBoxOperand(Value, value);
-  }
-
-  static const size_t Value = 1;
-
-  const MCallSetProperty* mir() const { return mir_->toCallSetProperty(); }
-};
-
 class LCallDeleteProperty : public LCallInstructionHelper<1, BOX_PIECES, 0> {
  public:
   LIR_HEADER(CallDeleteProperty)
@@ -6133,41 +5837,6 @@
   const LDefinition* temp() { return getTemp(0); }
 };
 
-// Guard that a value is in a TypeSet.
-class LTypeBarrierV : public LInstructionHelper<BOX_PIECES, BOX_PIECES, 2> {
- public:
-  LIR_HEADER(TypeBarrierV)
-
-  LTypeBarrierV(const LBoxAllocation& input, const LDefinition& unboxTemp,
-                const LDefinition& objTemp)
-      : LInstructionHelper(classOpcode) {
-    setBoxOperand(Input, input);
-    setTemp(0, unboxTemp);
-    setTemp(1, objTemp);
-  }
-
-  static const size_t Input = 0;
-
-  const MTypeBarrier* mir() const { return mir_->toTypeBarrier(); }
-  const LDefinition* unboxTemp() { return getTemp(0); }
-  const LDefinition* objTemp() { return getTemp(1); }
-};
-
-// Guard that a object is in a TypeSet.
-class LTypeBarrierO : public LInstructionHelper<1, 1, 1> {
- public:
-  LIR_HEADER(TypeBarrierO)
-
-  LTypeBarrierO(const LAllocation& obj, const LDefinition& temp)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, obj);
-    setTemp(0, temp);
-  }
-  const MTypeBarrier* mir() const { return mir_->toTypeBarrier(); }
-  const LAllocation* object() { return getOperand(0); }
-  const LDefinition* temp() { return getTemp(0); }
-};
-
 // Generational write barrier used when writing an object to another object.
 class LPostWriteBarrierO : public LInstructionHelper<0, 2, 1> {
  public:
@@ -6506,6 +6175,20 @@
   const LDefinition* temp() { return getTemp(0); }
 };
 
+class LGuardIsNativeObject : public LInstructionHelper<0, 1, 1> {
+ public:
+  LIR_HEADER(GuardIsNativeObject)
+
+  LGuardIsNativeObject(const LAllocation& obj, const LDefinition& temp)
+      : LInstructionHelper(classOpcode) {
+    setOperand(0, obj);
+    setTemp(0, temp);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LDefinition* temp() { return getTemp(0); }
+};
+
 class LGuardIsProxy : public LInstructionHelper<0, 1, 1> {
  public:
   LIR_HEADER(GuardIsProxy)
@@ -8161,15 +7844,13 @@
   }
 };
 
-class LGlobalNameConflictsCheck : public LInstructionHelper<0, 0, 0> {
+class LGlobalDeclInstantiation : public LInstructionHelper<0, 0, 0> {
  public:
-  LIR_HEADER(GlobalNameConflictsCheck)
+  LIR_HEADER(GlobalDeclInstantiation)
 
-  LGlobalNameConflictsCheck() : LInstructionHelper(classOpcode) {}
+  LGlobalDeclInstantiation() : LInstructionHelper(classOpcode) {}
 
-  MGlobalNameConflictsCheck* mir() {
-    return mir_->toGlobalNameConflictsCheck();
-  }
+  MGlobalDeclInstantiation* mir() { return mir_->toGlobalDeclInstantiation(); }
 };
 
 class LMemoryBarrier : public LInstructionHelper<0, 0, 0> {
@@ -8525,6 +8206,148 @@
   MGuardHasGetterSetter* mir() const { return mir_->toGuardHasGetterSetter(); }
 };
 
+class LGuardIsExtensible : public LInstructionHelper<0, 1, 1> {
+ public:
+  LIR_HEADER(GuardIsExtensible)
+
+  LGuardIsExtensible(const LAllocation& object, const LDefinition& temp)
+      : LInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setTemp(0, temp);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LDefinition* temp() { return getTemp(0); }
+};
+
+class LGuardIndexIsNonNegative : public LInstructionHelper<0, 1, 0> {
+ public:
+  LIR_HEADER(GuardIndexIsNonNegative)
+
+  explicit LGuardIndexIsNonNegative(const LAllocation& index)
+      : LInstructionHelper(classOpcode) {
+    setOperand(0, index);
+  }
+
+  const LAllocation* index() { return getOperand(0); }
+};
+
+class LGuardIndexGreaterThanDenseInitLength
+    : public LInstructionHelper<0, 2, 2> {
+ public:
+  LIR_HEADER(GuardIndexGreaterThanDenseInitLength)
+
+  LGuardIndexGreaterThanDenseInitLength(const LAllocation& object,
+                                        const LAllocation& index,
+                                        const LDefinition& temp,
+                                        const LDefinition& spectreTemp)
+      : LInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+    setTemp(0, temp);
+    setTemp(1, spectreTemp);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+  const LDefinition* temp() { return getTemp(0); }
+  const LDefinition* spectreTemp() { return getTemp(1); }
+};
+
+class LGuardIndexIsValidUpdateOrAdd : public LInstructionHelper<0, 2, 2> {
+ public:
+  LIR_HEADER(GuardIndexIsValidUpdateOrAdd)
+
+  LGuardIndexIsValidUpdateOrAdd(const LAllocation& object,
+                                const LAllocation& index,
+                                const LDefinition& temp,
+                                const LDefinition& spectreTemp)
+      : LInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+    setTemp(0, temp);
+    setTemp(1, spectreTemp);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+  const LDefinition* temp() { return getTemp(0); }
+  const LDefinition* spectreTemp() { return getTemp(1); }
+};
+
+class LCallAddOrUpdateSparseElement
+    : public LCallInstructionHelper<0, 2 + BOX_PIECES, 0> {
+ public:
+  LIR_HEADER(CallAddOrUpdateSparseElement)
+
+  LCallAddOrUpdateSparseElement(const LAllocation& object,
+                                const LAllocation& index,
+                                const LBoxAllocation& value)
+      : LCallInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+    setBoxOperand(ValueIndex, value);
+  }
+
+  static const size_t ValueIndex = 2;
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+
+  MCallAddOrUpdateSparseElement* mir() const {
+    return mir_->toCallAddOrUpdateSparseElement();
+  }
+};
+
+class LCallGetSparseElement : public LCallInstructionHelper<BOX_PIECES, 2, 0> {
+ public:
+  LIR_HEADER(CallGetSparseElement)
+
+  LCallGetSparseElement(const LAllocation& object, const LAllocation& index)
+      : LCallInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+};
+
+class LCallNativeGetElement : public LCallInstructionHelper<BOX_PIECES, 2, 0> {
+ public:
+  LIR_HEADER(CallNativeGetElement)
+
+  LCallNativeGetElement(const LAllocation& object, const LAllocation& index)
+      : LCallInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+};
+
+class LCallObjectHasSparseElement : public LCallInstructionHelper<1, 2, 2> {
+ public:
+  LIR_HEADER(CallObjectHasSparseElement)
+
+  LCallObjectHasSparseElement(const LAllocation& object,
+                              const LAllocation& index,
+                              const LDefinition& temp1,
+                              const LDefinition& temp2)
+      : LCallInstructionHelper(classOpcode) {
+    setOperand(0, object);
+    setOperand(1, index);
+    setTemp(0, temp1);
+    setTemp(1, temp2);
+  }
+
+  const LAllocation* object() { return getOperand(0); }
+  const LAllocation* index() { return getOperand(1); }
+  const LDefinition* temp1() { return getTemp(0); }
+  const LDefinition* temp2() { return getTemp(1); }
+};
+
 template <size_t NumDefs>
 class LIonToWasmCallBase : public LVariadicInstruction<NumDefs, 2> {
   using Base = LVariadicInstruction<NumDefs, 2>;
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared.cpp firefox-85.0+build1/js/src/jit/shared/Lowering-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/Lowering-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -139,8 +139,7 @@
 #endif
 
 #ifdef JS_NUNBOX32
-LSnapshot* LIRGeneratorShared::buildSnapshot(LInstruction* ins,
-                                             MResumePoint* rp,
+LSnapshot* LIRGeneratorShared::buildSnapshot(MResumePoint* rp,
                                              BailoutKind kind) {
   LRecoverInfo* recoverInfo = getRecoverInfo(rp);
   if (!recoverInfo) {
@@ -201,8 +200,7 @@
 
 #elif JS_PUNBOX64
 
-LSnapshot* LIRGeneratorShared::buildSnapshot(LInstruction* ins,
-                                             MResumePoint* rp,
+LSnapshot* LIRGeneratorShared::buildSnapshot(MResumePoint* rp,
                                              BailoutKind kind) {
   LRecoverInfo* recoverInfo = getRecoverInfo(rp);
   if (!recoverInfo) {
@@ -255,8 +253,9 @@
   // assignSnapshot must be called before define/add, since
   // it may add new instructions for emitted-at-use operands.
   MOZ_ASSERT(ins->id() == 0);
+  MOZ_ASSERT(kind != BailoutKind::Unknown);
 
-  LSnapshot* snapshot = buildSnapshot(ins, lastResumePoint_, kind);
+  LSnapshot* snapshot = buildSnapshot(lastResumePoint_, kind);
   if (!snapshot) {
     abort(AbortReason::Alloc, "buildSnapshot failed");
     return;
@@ -274,7 +273,7 @@
 
   MResumePoint* mrp =
       mir->resumePoint() ? mir->resumePoint() : lastResumePoint_;
-  LSnapshot* postSnapshot = buildSnapshot(ins, mrp, kind);
+  LSnapshot* postSnapshot = buildSnapshot(mrp, kind);
   if (!postSnapshot) {
     abort(AbortReason::Alloc, "buildSnapshot failed");
     return;
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared.h firefox-85.0+build1/js/src/jit/shared/Lowering-shared.h
--- firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/Lowering-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -302,8 +302,7 @@
   }
 
   LRecoverInfo* getRecoverInfo(MResumePoint* rp);
-  LSnapshot* buildSnapshot(LInstruction* ins, MResumePoint* rp,
-                           BailoutKind kind);
+  LSnapshot* buildSnapshot(MResumePoint* rp, BailoutKind kind);
   bool assignPostSnapshot(MInstruction* mir, LInstruction* ins);
 
   // Marks this instruction as fallible, meaning that before it performs
diff -Nru firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared-inl.h firefox-85.0+build1/js/src/jit/shared/Lowering-shared-inl.h
--- firefox-84.0.2+build1/js/src/jit/shared/Lowering-shared-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/shared/Lowering-shared-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -367,32 +367,6 @@
   } else {
     ensureDefined(as);
     def->setVirtualRegister(as->virtualRegister());
-
-#ifdef DEBUG
-    if (JitOptions.runExtraChecks && def->resultTypeSet() &&
-        as->resultTypeSet() &&
-        !def->resultTypeSet()->equals(as->resultTypeSet())) {
-      switch (def->type()) {
-        case MIRType::Object:
-        case MIRType::ObjectOrNull:
-        case MIRType::String:
-        case MIRType::Symbol:
-        case MIRType::BigInt: {
-          LAssertResultT* check =
-              new (alloc()) LAssertResultT(useRegister(def));
-          add(check, def->toInstruction());
-          break;
-        }
-        case MIRType::Value: {
-          LAssertResultV* check = new (alloc()) LAssertResultV(useBox(def));
-          add(check, def->toInstruction());
-          break;
-        }
-        default:
-          break;
-      }
-    }
-#endif
   }
 }
 
@@ -649,9 +623,6 @@
       return inner->virtualRegister();
     }
   }
-  if (mir->isTypeBarrier() && mir->toTypeBarrier()->canRedefineInput()) {
-    return VirtualRegisterOfPayload(mir->toTypeBarrier()->input());
-  }
   return mir->virtualRegister() + VREG_DATA_OFFSET;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/jit/TemplateObject.h firefox-85.0+build1/js/src/jit/TemplateObject.h
--- firefox-84.0.2+build1/js/src/jit/TemplateObject.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TemplateObject.h	2021-01-18 19:58:13.000000000 +0000
@@ -20,16 +20,9 @@
 class TemplateObject {
  protected:
   JSObject* obj_;
-  bool denseElementsAreCopyOnWrite_;
-  bool convertDoubleElements_;
 
  public:
-  explicit TemplateObject(JSObject* obj)
-      : obj_(obj),
-        denseElementsAreCopyOnWrite_(false),
-        convertDoubleElements_(false) {}
-  void setDenseElementsAreCopyOnWrite() { denseElementsAreCopyOnWrite_ = true; }
-  void setConvertDoubleElements() { convertDoubleElements_ = true; }
+  explicit TemplateObject(JSObject* obj) : obj_(obj) {}
 
   inline gc::AllocKind getAllocKind() const;
 
@@ -64,13 +57,8 @@
   inline uint32_t slotSpan() const;
   inline Value getSlot(uint32_t i) const;
 
-  // Reading ObjectElements fields is safe, except for the flags (we can set
-  // the convert-double-elements flag on the main thread for COW elements).
+  // Reading ObjectElements fields is safe, except for the flags.
   // isSharedMemory is an exception: it's debug-only and not called on arrays.
-  bool denseElementsAreCopyOnWrite() const {
-    return denseElementsAreCopyOnWrite_;
-  }
-  bool convertDoubleElements() const { return convertDoubleElements_; }
 #ifdef DEBUG
   inline bool isSharedMemory() const;
 #endif
diff -Nru firefox-84.0.2+build1/js/src/jit/TemplateObject-inl.h firefox-85.0+build1/js/src/jit/TemplateObject-inl.h
--- firefox-84.0.2+build1/js/src/jit/TemplateObject-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TemplateObject-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -45,10 +45,7 @@
   return obj_->is<PlainObject>();
 }
 
-inline gc::Cell* TemplateObject::group() const {
-  MOZ_ASSERT(!obj_->hasLazyGroup());
-  return obj_->group();
-}
+inline gc::Cell* TemplateObject::group() const { return obj_->group(); }
 
 inline gc::Cell* TemplateObject::shape() const {
   Shape* shape = obj_->shape();
@@ -89,7 +86,7 @@
 }
 
 inline const Value* NativeTemplateObject::getDenseElements() const {
-  return asNative().getDenseElementsAllowCopyOnWrite();
+  return asNative().getDenseElements();
 }
 
 #ifdef DEBUG
diff -Nru firefox-84.0.2+build1/js/src/jit/TIOracle.cpp firefox-85.0+build1/js/src/jit/TIOracle.cpp
--- firefox-84.0.2+build1/js/src/jit/TIOracle.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TIOracle.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +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 "jit/TIOracle.h"
-
-#include "jit/IonBuilder.h"
-#include "vm/TypedArrayObject.h"
-
-#include "vm/JSScript-inl.h"
-#include "vm/TypeInference-inl.h"
-
-using namespace js;
-using namespace js::jit;
-
-using ObjectKey = js::TypeSet::ObjectKey;
-
-TIOracle::TIOracle(IonBuilder* builder, CompilerConstraintList* constraints)
-    : builder_(builder), constraints_(constraints) {}
-
-TIOracle::Group::Group(JSObject* raw) : raw_(ObjectKey::get(raw)) {}
-TIOracle::Group::Group(ObjectGroup* raw) : raw_(ObjectKey::get(raw)) {}
-
-AbortReasonOr<Ok> TIOracle::ensureBallast() {
-  if (!builder_->alloc().ensureBallast()) {
-    return builder_->abort(AbortReason::Alloc);
-  }
-  return Ok();
-}
-
-TIOracle::TypeSet TIOracle::resultTypeSet(MDefinition* def) {
-  return TIOracle::TypeSet(def->resultTypeSet());
-}
-
-TIOracle::Object TIOracle::wrapObject(JSObject* object) {
-  return TIOracle::Object(builder_->checkNurseryObject(object));
-}
-
-bool TIOracle::hasStableClass(TIOracle::Object obj) {
-  ObjectKey* key = ObjectKey::get(obj.toRaw());
-  return key->hasStableClassAndProto(constraints_);
-}
-
-bool TIOracle::hasStableProto(TIOracle::Object obj) {
-  ObjectKey* key = ObjectKey::get(obj.toRaw());
-  return key->hasStableClassAndProto(constraints_);
-}
diff -Nru firefox-84.0.2+build1/js/src/jit/TIOracle.h firefox-85.0+build1/js/src/jit/TIOracle.h
--- firefox-84.0.2+build1/js/src/jit/TIOracle.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TIOracle.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +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 jit_TIOracle_h
-#define jit_TIOracle_h
-
-#include "jit/Ion.h"
-#include "vm/TypeInference.h"
-
-namespace js {
-namespace jit {
-
-// [SMDOC] TI Oracle
-//
-// The SpiderMonkey VM collects runtime type inference data as it proceeds that
-// describe the possible set of types that may exist at different locations.
-// During IonMonkey compilation, the compiler may decide to depend on this TI
-// data. To ensure that this is safe, even if the TI data changes in the future,
-// IonMonkey registers invalidation hooks on the data it depends on.
-//
-// The TIOracle interface makes sure that we attach the right constraints by
-// providing a layer of abstraction between IonBuilder and TI. Instead of having
-// direct access to TI and being responsible for attaching the right
-// constraints, IonBuilder queries the TIOracle. The TIOracle is responsible for
-// attaching the correct constraints so that the results of queries continue to
-// be true for the lifetime of the compiled script.
-
-class IonBuilder;
-class MDefinition;
-
-class TIOracle {
- public:
-  class Object {
-    JSObject* raw_;
-    explicit Object(JSObject* raw) : raw_(raw) {}
-
-    friend class TIOracle;
-
-   public:
-    JSObject* toRaw() { return raw_; }
-
-    // You must be certain the object is guaranteed through TI and/or
-    // precise guards.
-    static Object unsafeFromRaw(JSObject* raw) { return Object(raw); }
-
-    explicit operator bool() { return !!raw_; }
-  };
-
-  // Note: this is called TIOracle::Group even though it is currently
-  // wrapping an ObjectKey. This is because, conceptually, ObjectKey
-  // is nothing more than "ObjectGroup plus the ability to retrieve
-  // the lone object in a singleton group".
-  class Group {
-    using ObjectKey = js::TypeSet::ObjectKey;
-
-    ObjectKey* raw_;
-    explicit Group(ObjectKey* raw) : raw_(raw) {}
-    explicit Group(JSObject* raw);
-    explicit Group(ObjectGroup* raw);
-
-    friend class TIOracle;
-
-   public:
-    ObjectKey* toRaw() { return raw_; }
-
-    template <typename T>
-    static Group unsafeFromRaw(T raw) {
-      return Group(raw);
-    }
-
-    explicit operator bool() { return !!raw_; }
-  };
-
-  class TypeSet {
-    TemporaryTypeSet* raw_;
-    explicit TypeSet(TemporaryTypeSet* raw) : raw_(raw) {}
-
-    friend class TIOracle;
-
-   public:
-    TemporaryTypeSet* toRaw() { return raw_; }
-
-    static TypeSet unsafeFromRaw(TemporaryTypeSet* raw) { return TypeSet(raw); }
-
-    explicit operator bool() { return !!raw_; }
-  };
-
-  explicit TIOracle(IonBuilder* builder, CompilerConstraintList* constraints);
-
-  IonBuilder* builder() { return builder_; }
-  CompilerConstraintList* constraints() { return constraints_; }
-
-  AbortReasonOr<Ok> ensureBallast();
-
-  TypeSet resultTypeSet(MDefinition* def);
-
- private:
-  Object wrapObject(JSObject* object);
-
-  bool hasStableClass(Object obj);
-  bool hasStableProto(Object obj);
-
-  IonBuilder* builder_;
-  CompilerConstraintList* constraints_;
-};
-
-}  // namespace jit
-}  // namespace js
-
-#endif /* jit_TIOracle_h */
diff -Nru firefox-84.0.2+build1/js/src/jit/TrialInlining.cpp firefox-85.0+build1/js/src/jit/TrialInlining.cpp
--- firefox-84.0.2+build1/js/src/jit/TrialInlining.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TrialInlining.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -82,9 +82,8 @@
 
   // Note: AttachBaselineCacheIRStub never throws an exception.
   bool attached = false;
-  ICStub* newStub = AttachBaselineCacheIRStub(
-      cx(), writer, kind, BaselineCacheIRStubKind::Regular, script_, icScript_,
-      fallback, &attached);
+  ICStub* newStub = AttachBaselineCacheIRStub(cx(), writer, kind, script_,
+                                              icScript_, fallback, &attached);
   if (!newStub) {
     MOZ_ASSERT(fallback->trialInliningState() == TrialInliningState::Candidate);
     ReportOutOfMemory(cx());
@@ -227,8 +226,7 @@
           return mozilla::Nothing();
         }
         if (data.isSome()) {
-          MOZ_ASSERT(op == CacheOp::ReturnFromIC ||
-                     op == CacheOp::TypeMonitorResult);
+          MOZ_ASSERT(op == CacheOp::ReturnFromIC);
         }
         reader.skip(argLength);
         break;
@@ -298,8 +296,7 @@
           return mozilla::Nothing();
         }
         if (data.isSome()) {
-          MOZ_ASSERT(op == CacheOp::ReturnFromIC ||
-                     op == CacheOp::TypeMonitorResult);
+          MOZ_ASSERT(op == CacheOp::ReturnFromIC);
         }
         reader.skip(argLength);
         break;
@@ -367,8 +364,7 @@
           return mozilla::Nothing();
         }
         if (data.isSome()) {
-          MOZ_ASSERT(op == CacheOp::ReturnFromIC ||
-                     op == CacheOp::TypeMonitorResult);
+          MOZ_ASSERT(op == CacheOp::ReturnFromIC);
         }
         reader.skip(argLength);
         break;
@@ -485,7 +481,7 @@
       new (raw) ICScript(initialWarmUpCount, allocSize, depth, root_));
 
   {
-    // Suppress GC. This matches the AutoEnterAnalysis in
+    // Suppress GC. This matches the AutoSuppressGC in
     // JSScript::createJitScript. It is needed for allocating the
     // template object for JSOp::Rest and the object group for
     // JSOp::NewArray.
@@ -662,8 +658,6 @@
         }
         break;
       case JSOp::GetProp:
-      case JSOp::CallProp:
-      case JSOp::Length:
         if (!maybeInlineGetter(entry, loc)) {
           return false;
         }
diff -Nru firefox-84.0.2+build1/js/src/jit/TypePolicy.cpp firefox-85.0+build1/js/src/jit/TypePolicy.cpp
--- firefox-84.0.2+build1/js/src/jit/TypePolicy.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TypePolicy.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -85,6 +85,7 @@
       replace = MToNumberInt32::New(alloc, in);
     }
 
+    replace->setBailoutKind(BailoutKind::TypePolicy);
     ins->block()->insertBefore(ins, replace);
     ins->replaceOperand(i, replace);
 
@@ -313,65 +314,6 @@
   return BoxInputsPolicy::staticAdjustInputs(alloc, def);
 }
 
-bool TypeBarrierPolicy::adjustInputs(TempAllocator& alloc,
-                                     MInstruction* def) const {
-  MTypeBarrier* ins = def->toTypeBarrier();
-  MIRType inputType = ins->getOperand(0)->type();
-  MIRType outputType = ins->type();
-
-  // Input and output type are already in accordance.
-  if (inputType == outputType) {
-    return true;
-  }
-
-  // Output is a value, currently box the input.
-  if (outputType == MIRType::Value) {
-    // XXX: Possible optimization: decrease resultTypeSet to only include
-    // the inputType. This will remove the need for boxing.
-    MOZ_ASSERT(inputType != MIRType::Value);
-    ins->replaceOperand(0, BoxAt(alloc, ins, ins->getOperand(0)));
-    return true;
-  }
-
-  // Box input if needed.
-  if (inputType != MIRType::Value) {
-    MOZ_ASSERT(ins->alwaysBails());
-    ins->replaceOperand(0, BoxAt(alloc, ins, ins->getOperand(0)));
-  }
-
-  // We can't unbox a value to null/undefined/lazyargs. So keep output
-  // also a value.
-  // Note: Using setResultType shouldn't be done in TypePolicies,
-  //       Here it is fine, since the type barrier has no uses.
-  if (IsNullOrUndefined(outputType) ||
-      outputType == MIRType::MagicOptimizedArguments) {
-    MOZ_ASSERT(!ins->hasDefUses());
-    ins->setResultType(MIRType::Value);
-    return true;
-  }
-
-  // Unbox / propagate the right type.
-  MUnbox::Mode mode = MUnbox::TypeBarrier;
-  MInstruction* replace =
-      MUnbox::New(alloc, ins->getOperand(0), ins->type(), mode);
-  if (!ins->isMovable()) {
-    replace->setNotMovable();
-  }
-
-  ins->block()->insertBefore(ins, replace);
-  ins->replaceOperand(0, replace);
-  if (!replace->typePolicy()->adjustInputs(alloc, replace)) {
-    return false;
-  }
-
-  // The TypeBarrier is equivalent to removing branches with unexpected
-  // types.  The unexpected types would have changed Range Analysis
-  // predictions.  As such, we need to prevent destructive optimizations.
-  ins->block()->flagOperandsOfPrunedBranches(replace);
-
-  return true;
-}
-
 bool TestPolicy::adjustInputs(TempAllocator& alloc, MInstruction* ins) const {
   MDefinition* op = ins->getOperand(0);
   switch (op->type()) {
@@ -470,6 +412,7 @@
   }
 
   MUnbox* replace = MUnbox::New(alloc, in, MIRType::Symbol, MUnbox::Fallible);
+  replace->setBailoutKind(BailoutKind::TypePolicy);
   ins->block()->insertBefore(ins, replace);
   ins->replaceOperand(Op, replace);
 
@@ -488,6 +431,7 @@
   }
 
   MUnbox* replace = MUnbox::New(alloc, in, MIRType::String, MUnbox::Fallible);
+  replace->setBailoutKind(BailoutKind::TypePolicy);
   ins->block()->insertBefore(ins, replace);
   ins->replaceOperand(Op, replace);
 
@@ -537,6 +481,7 @@
   }
 
   MUnbox* replace = MUnbox::New(alloc, in, MIRType::Int32, MUnbox::Fallible);
+  replace->setBailoutKind(BailoutKind::TypePolicy);
   def->block()->insertBefore(def, replace);
   def->replaceOperand(Op, replace);
 
@@ -913,6 +858,7 @@
   }
 
   MUnbox* replace = MUnbox::New(alloc, in, MIRType::Object, MUnbox::Fallible);
+  replace->setBailoutKind(BailoutKind::TypePolicy);
   ins->block()->insertBefore(ins, replace);
   ins->replaceOperand(Op, replace);
 
@@ -935,6 +881,7 @@
   if (func->type() != MIRType::Object) {
     MInstruction* unbox =
         MUnbox::New(alloc, func, MIRType::Object, MUnbox::Fallible);
+    unbox->setBailoutKind(BailoutKind::TypePolicy);
     call->block()->insertBefore(call, unbox);
     call->replaceCallee(unbox);
 
@@ -1114,88 +1061,6 @@
   return true;
 }
 
-bool FilterTypeSetPolicy::adjustInputs(TempAllocator& alloc,
-                                       MInstruction* ins) const {
-  MOZ_ASSERT(ins->numOperands() == 1);
-  MIRType inputType = ins->getOperand(0)->type();
-  MIRType outputType = ins->type();
-
-  // Special case when output is a Float32, but input isn't.
-  if (outputType == MIRType::Float32 && inputType != MIRType::Float32) {
-    // Create a MToFloat32 to add between the MFilterTypeSet and
-    // its uses.
-    MInstruction* replace = MToFloat32::New(alloc, ins);
-    ins->justReplaceAllUsesWithExcept(replace);
-    ins->block()->insertAfter(ins, replace);
-
-    // Reset the type to not MIRType::Float32
-    // Note: setResultType shouldn't happen in TypePolicies,
-    //       Here it is fine, since there is just one use we just
-    //       added ourself. And the resulting type after MToFloat32
-    //       equals the original type.
-    ins->setResultType(ins->resultTypeSet()->getKnownMIRType());
-    outputType = ins->type();
-
-    // Do the type analysis
-    if (!replace->typePolicy()->adjustInputs(alloc, replace)) {
-      return false;
-    }
-
-    // Fall through to let the MFilterTypeSet adjust its input based
-    // on its new type.
-  }
-
-  // Input and output type are already in accordance.
-  if (inputType == outputType) {
-    return true;
-  }
-
-  // Output is a value, box the input.
-  if (outputType == MIRType::Value) {
-    MOZ_ASSERT(inputType != MIRType::Value);
-    ins->replaceOperand(0, BoxAt(alloc, ins, ins->getOperand(0)));
-    return true;
-  }
-
-  // The outputType should be a subset of the inputType else we are in code
-  // that has never executed yet. Bail to see the new type (if that hasn't
-  // happened yet).
-  if (inputType != MIRType::Value) {
-    MBail* bail = MBail::New(alloc);
-    ins->block()->insertBefore(ins, bail);
-    bail->setDependency(ins->dependency());
-    ins->setDependency(bail);
-    ins->replaceOperand(0, BoxAt(alloc, ins, ins->getOperand(0)));
-  }
-
-  // We can't unbox a value to null/undefined/lazyargs. So keep output
-  // also a value.
-  // Note: Using setResultType shouldn't be done in TypePolicies,
-  //       Here it is fine, since the type barrier has no uses.
-  if (IsNullOrUndefined(outputType) ||
-      outputType == MIRType::MagicOptimizedArguments) {
-    MOZ_ASSERT(!ins->hasDefUses());
-    ins->setResultType(MIRType::Value);
-    return true;
-  }
-
-  // Unbox / propagate the right type.
-  MUnbox::Mode mode = MUnbox::Infallible;
-  MInstruction* replace =
-      MUnbox::New(alloc, ins->getOperand(0), ins->type(), mode);
-
-  ins->block()->insertBefore(ins, replace);
-  ins->replaceOperand(0, replace);
-  if (!replace->typePolicy()->adjustInputs(alloc, replace)) {
-    return false;
-  }
-
-  // Carry over the dependency the MFilterTypeSet had.
-  replace->setDependency(ins->dependency());
-
-  return true;
-}
-
 bool TypedArrayIndexPolicy::adjustInputs(TempAllocator& alloc,
                                          MInstruction* ins) const {
   MOZ_ASSERT(ins->isTypedArrayIndexToInt32());
@@ -1221,7 +1086,6 @@
   _(CallSetElementPolicy)       \
   _(ClampPolicy)                \
   _(ComparePolicy)              \
-  _(FilterTypeSetPolicy)        \
   _(PowPolicy)                  \
   _(SameValuePolicy)            \
   _(SignPolicy)                 \
@@ -1234,7 +1098,6 @@
   _(ToBigIntPolicy)             \
   _(ToStringPolicy)             \
   _(ToInt64Policy)              \
-  _(TypeBarrierPolicy)          \
   _(TypedArrayIndexPolicy)
 
 #define TEMPLATE_TYPE_POLICY_LIST(_)                                          \
diff -Nru firefox-84.0.2+build1/js/src/jit/TypePolicy.h firefox-85.0+build1/js/src/jit/TypePolicy.h
--- firefox-84.0.2+build1/js/src/jit/TypePolicy.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/TypePolicy.h	2021-01-18 19:58:13.000000000 +0000
@@ -131,14 +131,6 @@
                                  MInstruction* ins) const override;
 };
 
-class TypeBarrierPolicy final : public TypePolicy {
- public:
-  constexpr TypeBarrierPolicy() = default;
-  EMPTY_DATA_;
-  MOZ_MUST_USE bool adjustInputs(TempAllocator& alloc,
-                                 MInstruction* ins) const override;
-};
-
 class CallPolicy final : public TypePolicy {
  public:
   constexpr CallPolicy() = default;
@@ -506,14 +498,6 @@
   EMPTY_DATA_;
   MOZ_MUST_USE bool adjustInputs(TempAllocator& alloc,
                                  MInstruction* ins) const override;
-};
-
-class FilterTypeSetPolicy final : public TypePolicy {
- public:
-  constexpr FilterTypeSetPolicy() = default;
-  EMPTY_DATA_;
-  MOZ_MUST_USE bool adjustInputs(TempAllocator& alloc,
-                                 MInstruction* ins) const override;
 };
 
 // Policy for MTypedArrayIndexToInt32. Operand is either Double or Int32.
diff -Nru firefox-84.0.2+build1/js/src/jit/ValueNumbering.cpp firefox-85.0+build1/js/src/jit/ValueNumbering.cpp
--- firefox-84.0.2+build1/js/src/jit/ValueNumbering.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/ValueNumbering.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -797,6 +797,10 @@
       sim->setGuardRangeBailoutsUnchecked();
     }
 
+    if (sim->bailoutKind() == BailoutKind::Unknown) {
+      sim->setBailoutKind(def->bailoutKind());
+    }
+
     if (DeadIfUnused(def)) {
       if (!discardDefsRecursively(def)) {
         return false;
@@ -1032,13 +1036,11 @@
           "  Visiting dominator tree (with %" PRIu64
           " blocks) rooted at block%u%s",
           uint64_t(dominatorRoot->numDominated()), dominatorRoot->id(),
-          dominatorRoot == graph_.entryBlock()
-              ? " (normal entry block)"
-              : dominatorRoot == graph_.osrBlock()
-                    ? " (OSR entry block)"
-                    : dominatorRoot->numPredecessors() == 0
-                          ? " (odd unreachable block)"
-                          : " (merge point from normal entry and OSR entry)");
+          dominatorRoot == graph_.entryBlock() ? " (normal entry block)"
+          : dominatorRoot == graph_.osrBlock() ? " (OSR entry block)"
+          : dominatorRoot->numPredecessors() == 0
+              ? " (odd unreachable block)"
+              : " (merge point from normal entry and OSR entry)");
   MOZ_ASSERT(dominatorRoot->immediateDominator() == dominatorRoot,
              "root is not a dominator tree root");
 
diff -Nru firefox-84.0.2+build1/js/src/jit/VMFunctionList-inl.h firefox-85.0+build1/js/src/jit/VMFunctionList-inl.h
--- firefox-84.0.2+build1/js/src/jit/VMFunctionList-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/VMFunctionList-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -38,9 +38,7 @@
   _(ArgumentsObjectCreateForIon, js::ArgumentsObject::createForIon)            \
   _(ArrayConstructorOneArg, js::ArrayConstructorOneArg)                        \
   _(ArrayJoin, js::jit::ArrayJoin)                                             \
-  _(ArrayPopDense, js::jit::ArrayPopDense)                                     \
   _(ArrayPushDense, js::jit::ArrayPushDense)                                   \
-  _(ArrayShiftDense, js::jit::ArrayShiftDense)                                 \
   _(ArraySliceDense, js::ArraySliceDense)                                      \
   _(AsyncFunctionAwait, js::AsyncFunctionAwait)                                \
   _(AsyncFunctionResolve, js::AsyncFunctionResolve)                            \
@@ -81,15 +79,11 @@
   _(CallNativeSetter, js::jit::CallNativeSetter)                               \
   _(CharCodeAt, js::jit::CharCodeAt)                                           \
   _(CheckClassHeritageOperation, js::CheckClassHeritageOperation)              \
-  _(CheckGlobalOrEvalDeclarationConflicts,                                     \
-    js::CheckGlobalOrEvalDeclarationConflicts)                                 \
   _(CheckOverRecursed, js::jit::CheckOverRecursed)                             \
   _(CheckOverRecursedBaseline, js::jit::CheckOverRecursedBaseline)             \
   _(CheckPrivateFieldOperation, js::CheckPrivateFieldOperation)                \
   _(CloneRegExpObject, js::CloneRegExpObject)                                  \
   _(ConcatStrings, js::ConcatStrings<CanGC>)                                   \
-  _(ConvertElementsToDoubles, js::ObjectElements::ConvertElementsToDoubles)    \
-  _(CopyElementsForWrite, js::NativeObject::CopyElementsForWrite)              \
   _(CopyLexicalEnvironmentObject, js::jit::CopyLexicalEnvironmentObject)       \
   _(CreateAsyncFromSyncIterator, js::CreateAsyncFromSyncIterator)              \
   _(CreateBigIntFromInt64, js::jit::CreateBigIntFromInt64)                     \
@@ -107,9 +101,6 @@
   _(DebugLeaveThenRecreateLexicalEnv,                                          \
     js::jit::DebugLeaveThenRecreateLexicalEnv)                                 \
   _(Debug_CheckSelfHosted, js::Debug_CheckSelfHosted)                          \
-  _(DefFunOperation, js::DefFunOperation)                                      \
-  _(DefLexicalOperation, js::DefLexicalOperation)                              \
-  _(DefVarOperation, js::DefVarOperation)                                      \
   _(DelElemOperationNonStrict, js::DelElemOperation<false>)                    \
   _(DelElemOperationStrict, js::DelElemOperation<true>)                        \
   _(DelPropOperationNonStrict, js::DelPropOperation<false>)                    \
@@ -121,7 +112,6 @@
   _(DoSpreadCallFallback, js::jit::DoSpreadCallFallback)                       \
   _(DoStringToInt64, js::jit::DoStringToInt64)                                 \
   _(DoTrialInlining, js::jit::DoTrialInlining)                                 \
-  _(DoTypeUpdateFallback, js::jit::DoTypeUpdateFallback)                       \
   _(EnterWith, js::jit::EnterWith)                                             \
   _(FinalSuspend, js::jit::FinalSuspend)                                       \
   _(FinishBoundFunctionInit, JSFunction::finishBoundFunctionInit)              \
@@ -129,7 +119,6 @@
   _(FunWithProtoOperation, js::FunWithProtoOperation)                          \
   _(GeneratorThrowOrReturn, js::jit::GeneratorThrowOrReturn)                   \
   _(GetAndClearException, js::GetAndClearException)                            \
-  _(GetElementOperation, js::GetElementOperation)                              \
   _(GetFirstDollarIndexRaw, js::GetFirstDollarIndexRaw)                        \
   _(GetImportOperation, js::GetImportOperation)                                \
   _(GetIntrinsicValue, js::jit::GetIntrinsicValue)                             \
@@ -137,16 +126,14 @@
   _(GetOrCreateModuleMetaObject, js::GetOrCreateModuleMetaObject)              \
   _(GetPrototypeOf, js::jit::GetPrototypeOf)                                   \
   _(GetSparseElementHelper, js::GetSparseElementHelper)                        \
-  _(GetValueProperty, js::GetValueProperty)                                    \
-  _(GlobalNameConflictsCheckFromIon, js::jit::GlobalNameConflictsCheckFromIon) \
+  _(GlobalDeclInstantiationFromIon, js::jit::GlobalDeclInstantiationFromIon)   \
+  _(GlobalOrEvalDeclInstantiation, js::GlobalOrEvalDeclInstantiation)          \
   _(GreaterThan, js::GreaterThan)                                              \
   _(GreaterThanOrEqual, js::GreaterThanOrEqual)                                \
   _(HandleDebugTrap, js::jit::HandleDebugTrap)                                 \
   _(ImplicitThisOperation, js::ImplicitThisOperation)                          \
   _(ImportMetaOperation, js::ImportMetaOperation)                              \
   _(InitElemGetterSetterOperation, js::InitElemGetterSetterOperation)          \
-  _(InitElemOperation, js::InitElemOperation)                                  \
-  _(InitElementArray, js::InitElementArray)                                    \
   _(InitFunctionEnvironmentObjects, js::jit::InitFunctionEnvironmentObjects)   \
   _(InitPropGetterSetterOperation, js::InitPropGetterSetterOperation)          \
   _(InitRestParameter, js::jit::InitRestParameter)                             \
@@ -195,12 +182,10 @@
     js::NamedLambdaObject::createTemplateObject)                               \
   _(NativeGetElement, js::NativeGetElement)                                    \
   _(NewArgumentsObject, js::jit::NewArgumentsObject)                           \
-  _(NewArrayCopyOnWriteOperation, js::NewArrayCopyOnWriteOperation)            \
   _(NewArrayIterator, js::NewArrayIterator)                                    \
   _(NewArrayOperation, js::NewArrayOperation)                                  \
   _(NewArrayWithGroup, js::NewArrayWithGroup)                                  \
   _(NewCallObject, js::jit::NewCallObject)                                     \
-  _(NewDenseCopyOnWriteArray, js::NewDenseCopyOnWriteArray)                    \
   _(NewObjectOperation, js::NewObjectOperation)                                \
   _(NewObjectOperationWithTemplate, js::NewObjectOperationWithTemplate)        \
   _(NewRegExpStringIterator, js::NewRegExpStringIterator)                      \
@@ -217,7 +202,6 @@
   _(ObjectCreateWithTemplate, js::ObjectCreateWithTemplate)                    \
   _(ObjectWithProtoOperation, js::ObjectWithProtoOperation)                    \
   _(OnDebuggerStatement, js::jit::OnDebuggerStatement)                         \
-  _(OperatorInI, js::jit::OperatorInI)                                         \
   _(OptimizeSpreadCall, js::OptimizeSpreadCall)                                \
   _(PopLexicalEnv, js::jit::PopLexicalEnv)                                     \
   _(ProcessCallSiteObjOperation, js::ProcessCallSiteObjOperation)              \
@@ -239,7 +223,6 @@
   _(SetFunctionName, js::SetFunctionName)                                      \
   _(SetIntrinsicOperation, js::SetIntrinsicOperation)                          \
   _(SetObjectElementWithReceiver, js::SetObjectElementWithReceiver)            \
-  _(SetProperty, js::jit::SetProperty)                                         \
   _(SetPropertySuper, js::SetPropertySuper)                                    \
   _(StartDynamicModuleImport, js::StartDynamicModuleImport)                    \
   _(StrictlyEqual, js::jit::StrictlyEqual<js::jit::EqualityKind::Equal>)       \
@@ -307,7 +290,6 @@
   _(DoSetPropFallback, js::jit::DoSetPropFallback, 1)                       \
   _(DoToBoolFallback, js::jit::DoToBoolFallback, 0)                         \
   _(DoToPropertyKeyFallback, js::jit::DoToPropertyKeyFallback, 0)           \
-  _(DoTypeMonitorFallback, js::jit::DoTypeMonitorFallback, 0)               \
   _(DoTypeOfFallback, js::jit::DoTypeOfFallback, 0)                         \
   _(DoUnaryArithFallback, js::jit::DoUnaryArithFallback, 1)
 
diff -Nru firefox-84.0.2+build1/js/src/jit/VMFunctions.cpp firefox-85.0+build1/js/src/jit/VMFunctions.cpp
--- firefox-84.0.2+build1/js/src/jit/VMFunctions.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/VMFunctions.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -13,9 +13,9 @@
 #include "frontend/BytecodeCompiler.h"
 #include "jit/arm/Simulator-arm.h"
 #include "jit/AtomicOperations.h"
-#include "jit/AutoDetectInvalidation.h"
 #include "jit/BaselineIC.h"
 #include "jit/CalleeToken.h"
+#include "jit/Invalidation.h"
 #include "jit/JitFrames.h"
 #include "jit/JitRuntime.h"
 #include "jit/mips32/Simulator-mips32.h"
@@ -41,7 +41,6 @@
 #include "vm/NativeObject-inl.h"
 #include "vm/PlainObject-inl.h"  // js::CreateThis
 #include "vm/StringObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 using namespace js::jit;
@@ -905,50 +904,17 @@
 template bool StringsCompare<ComparisonKind::GreaterThanOrEqual>(
     JSContext* cx, HandleString lhs, HandleString rhs, bool* res);
 
-bool ArrayPopDense(JSContext* cx, HandleObject obj, MutableHandleValue rval) {
-  MOZ_ASSERT(obj->is<ArrayObject>());
-
-  AutoDetectInvalidation adi(cx, rval);
-
-  JS::RootedValueArray<2> argv(cx);
-  argv[0].setUndefined();
-  argv[1].setObject(*obj);
-  if (!js::array_pop(cx, 0, argv.begin())) {
-    return false;
-  }
-
-  // If the result is |undefined|, the array was probably empty and we
-  // have to monitor the return value.
-  rval.set(argv[0]);
-  if (rval.isUndefined()) {
-    jsbytecode* pc;
-    JSScript* script = cx->currentScript(&pc);
-    JitScript::MonitorBytecodeType(cx, script, pc, rval);
-  }
-  return true;
-}
-
 bool ArrayPushDense(JSContext* cx, HandleArrayObject arr, HandleValue v,
                     uint32_t* length) {
   *length = arr->length();
-  DenseElementResult result = arr->setOrExtendDenseElements(
-      cx, *length, v.address(), 1, ShouldUpdateTypes::DontUpdate);
+  DenseElementResult result =
+      arr->setOrExtendDenseElements(cx, *length, v.address(), 1);
   if (result != DenseElementResult::Incomplete) {
     (*length)++;
     return result == DenseElementResult::Success;
   }
 
-  // AutoDetectInvalidation uses GetTopJitJSScript(cx)->ionScript(), but it's
-  // possible the setOrExtendDenseElements call already invalidated the
-  // IonScript. JSJitFrameIter::ionScript works when the script is invalidated
-  // so we use that instead.
-  JSJitFrameIter frame(cx->activation()->asJit());
-  MOZ_ASSERT(frame.type() == FrameType::Exit);
-  ++frame;
-  IonScript* ionScript = frame.ionScript();
-
   JS::RootedValueArray<3> argv(cx);
-  AutoDetectInvalidation adi(cx, argv[0], ionScript);
   argv[0].setUndefined();
   argv[1].setObject(*arr);
   argv[2].set(v);
@@ -956,45 +922,9 @@
     return false;
   }
 
-  if (argv[0].isInt32()) {
-    *length = argv[0].toInt32();
-    return true;
-  }
-
-  // Without TI this should not happen, we should have bailed out before
-  // calling the VM function if we are about to overflow.
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  // array_push changed the length to be larger than INT32_MAX. In this case
-  // OBJECT_FLAG_LENGTH_OVERFLOW was set, TI invalidated the script, and the
-  // AutoDetectInvalidation instance on the stack will replace *length with
-  // the actual return value during bailout.
-  MOZ_ASSERT(adi.shouldSetReturnOverride());
-  MOZ_ASSERT(argv[0].toDouble() == double(INT32_MAX) + 1);
-  *length = 0;
-  return true;
-}
-
-bool ArrayShiftDense(JSContext* cx, HandleObject obj, MutableHandleValue rval) {
-  MOZ_ASSERT(obj->is<ArrayObject>());
-
-  AutoDetectInvalidation adi(cx, rval);
-
-  JS::RootedValueArray<2> argv(cx);
-  argv[0].setUndefined();
-  argv[1].setObject(*obj);
-  if (!js::array_shift(cx, 0, argv.begin())) {
-    return false;
-  }
-
-  // If the result is |undefined|, the array was probably empty and we
-  // have to monitor the return value.
-  rval.set(argv[0]);
-  if (rval.isUndefined()) {
-    jsbytecode* pc;
-    JSScript* script = cx->currentScript(&pc);
-    JitScript::MonitorBytecodeType(cx, script, pc, rval);
-  }
+  // Length must fit in an int32 because we guard against overflow before
+  // calling this VM function.
+  *length = argv[0].toInt32();
   return true;
 }
 
@@ -1082,20 +1012,10 @@
                  HandleValue value, bool strict, jsbytecode* pc) {
   RootedId id(cx, NameToId(name));
 
-  JSOp op = JSOp(*pc);
-
-  if (op == JSOp::SetAliasedVar || op == JSOp::InitAliasedLexical) {
-    // Aliased var assigns ignore readonly attributes on the property, as
-    // required for initializing 'const' closure variables.
-    Shape* shape = obj->as<NativeObject>().lookup(cx, name);
-    MOZ_ASSERT(shape && shape->isDataProperty());
-    obj->as<NativeObject>().setSlotWithType(cx, shape, value);
-    return true;
-  }
-
   RootedValue receiver(cx, ObjectValue(*obj));
   ObjectOpResult result;
   if (MOZ_LIKELY(!obj->getOpsSetProperty())) {
+    JSOp op = JSOp(*pc);
     if (op == JSOp::SetName || op == JSOp::StrictSetName ||
         op == JSOp::SetGName || op == JSOp::StrictSetGName) {
       if (!NativeSetProperty<Unqualified>(cx, obj.as<NativeObject>(), id, value,
@@ -1148,29 +1068,9 @@
   return ToPropertyKey(cx, key, &id) && HasProperty(cx, obj, id, out);
 }
 
-bool OperatorInI(JSContext* cx, int32_t index, HandleObject obj, bool* out) {
-  RootedValue key(cx, Int32Value(index));
-  return OperatorIn(cx, key, obj, out);
-}
-
 bool GetIntrinsicValue(JSContext* cx, HandlePropertyName name,
                        MutableHandleValue rval) {
-  if (!GlobalObject::getIntrinsicValue(cx, cx->global(), name, rval)) {
-    return false;
-  }
-
-  // This function is called when we try to compile a cold getintrinsic
-  // op. MCallGetIntrinsicValue has an AliasSet of None for optimization
-  // purposes, as its side effect is not observable from JS. We are
-  // guaranteed to bail out after this function, but because of its AliasSet,
-  // type info will not be reflowed. Manually monitor here.
-  if (!JitOptions.warpBuilder) {
-    jsbytecode* pc;
-    JSScript* script = cx->currentScript(&pc);
-    JitScript::MonitorBytecodeType(cx, script, pc, rval);
-  }
-
-  return true;
+  return GlobalObject::getIntrinsicValue(cx, cx->global(), name, rval);
 }
 
 bool CreateThisFromIC(JSContext* cx, HandleObject callee,
@@ -1500,11 +1400,14 @@
   return false;
 }
 
-bool GlobalNameConflictsCheckFromIon(JSContext* cx, HandleScript script) {
-  Rooted<LexicalEnvironmentObject*> globalLexical(
-      cx, &cx->global()->lexicalEnvironment());
-  return CheckGlobalDeclarationConflicts(cx, script, globalLexical,
-                                         cx->global());
+bool GlobalDeclInstantiationFromIon(JSContext* cx, HandleScript script,
+                                    jsbytecode* pc) {
+  MOZ_ASSERT(!script->hasNonSyntacticScope());
+
+  RootedObject envChain(cx, &cx->global()->lexicalEnvironment());
+  GCThingIndex lastFun = GET_GCTHING_INDEX(pc);
+
+  return GlobalOrEvalDeclInstantiation(cx, envChain, script, lastFun);
 }
 
 bool InitFunctionEnvironmentObjects(JSContext* cx, BaselineFrame* frame) {
@@ -1548,22 +1451,12 @@
         return nullptr;
       }
       arrRes->initDenseElements(rest, length);
-      arrRes->setLengthInt32(length);
+      arrRes->setLength(length);
     }
     return arrRes;
   }
 
-  NewObjectKind newKind;
-  {
-    AutoSweepObjectGroup sweep(templateObj->group());
-    newKind = templateObj->group()->shouldPreTenure(sweep) ? TenuredObject
-                                                           : GenericObject;
-  }
-  ArrayObject* arrRes = NewDenseCopiedArray(cx, length, rest, nullptr, newKind);
-  if (arrRes) {
-    arrRes->setGroup(templateObj->group());
-  }
-  return arrRes;
+  return NewDenseCopiedArray(cx, length, rest);
 }
 
 bool HandleDebugTrap(JSContext* cx, BaselineFrame* frame, uint8_t* retAddr) {
@@ -1759,11 +1652,10 @@
 bool SetDenseElement(JSContext* cx, HandleNativeObject obj, int32_t index,
                      HandleValue value, bool strict) {
   // This function is called from Ion code for StoreElementHole's OOL path.
-  // In this case we know the object is native and that no type changes are
-  // needed.
+  // In this case we know the object is native.
 
-  DenseElementResult result = obj->setOrExtendDenseElements(
-      cx, index, value.address(), 1, ShouldUpdateTypes::DontUpdate);
+  DenseElementResult result =
+      obj->setOrExtendDenseElements(cx, index, value.address(), 1);
   if (result != DenseElementResult::Incomplete) {
     return result == DenseElementResult::Success;
   }
@@ -1795,9 +1687,7 @@
   MOZ_ASSERT(obj->compartment() == cx->compartment());
   MOZ_ASSERT(obj->zoneFromAnyThread() == cx->zone());
   MOZ_ASSERT(obj->runtimeFromMainThread() == cx->runtime());
-
-  MOZ_ASSERT_IF(!obj->hasLazyGroup(),
-                obj->group()->clasp() == obj->shape()->getObjectClass());
+  MOZ_ASSERT(obj->group()->clasp() == obj->shape()->getObjectClass());
 
   if (obj->isTenured()) {
     MOZ_ASSERT(obj->isAligned());
@@ -2166,6 +2056,7 @@
 template bool GetNativeDataPropertyByValuePure<false>(JSContext* cx,
                                                       JSObject* obj, Value* vp);
 
+// TODO(no-TI): remove NeedsTypeBarrier.
 template <bool NeedsTypeBarrier>
 bool SetNativeDataPropertyPure(JSContext* cx, JSObject* obj, PropertyName* name,
                                Value* val) {
@@ -2181,11 +2072,6 @@
     return false;
   }
 
-  if (NeedsTypeBarrier && IsTypeInferenceEnabled() &&
-      !HasTypePropertyId(nobj, NameToId(name), *val)) {
-    return false;
-  }
-
   nobj->setSlot(shape->slot(), *val);
   return true;
 }
@@ -2277,7 +2163,7 @@
         }
       }
     } else if (obj->is<TypedObject>()) {
-      if (obj->as<TypedObject>().typeDescr().hasProperty(cx->names(), id)) {
+      if (obj->as<TypedObject>().typeDescr().hasProperty(cx, id)) {
         vp[1].setBoolean(true);
         return true;
       }
@@ -2446,9 +2332,6 @@
     }
   }
 
-  // Note: we don't have to call JitScript::MonitorBytecodeType because we
-  // monitored the string-type when attaching the IC stub.
-
   res.setString(str);
   return true;
 }
@@ -2478,16 +2361,17 @@
   return true;
 }
 
+// Called from CreateDependentString::generateFallback.
 void* AllocateString(JSContext* cx) {
   AutoUnsafeCallWithABI unsafe;
-  return js::AllocateString<JSString, NoGC>(cx, js::gc::TenuredHeap);
+  return js::AllocateString<JSString, NoGC>(cx, js::gc::DefaultHeap);
 }
-
 void* AllocateFatInlineString(JSContext* cx) {
   AutoUnsafeCallWithABI unsafe;
-  return js::AllocateString<JSFatInlineString, NoGC>(cx, js::gc::TenuredHeap);
+  return js::AllocateString<JSFatInlineString, NoGC>(cx, js::gc::DefaultHeap);
 }
 
+// Called to allocate a BigInt if inline allocation failed.
 void* AllocateBigIntNoGC(JSContext* cx, bool requestMinorGC) {
   AutoUnsafeCallWithABI unsafe;
 
@@ -2933,21 +2817,6 @@
   }
 }
 
-bool GroupHasPropertyTypes(ObjectGroup* group, jsid* id, Value* v) {
-  AutoUnsafeCallWithABI unsafe;
-  if (group->unknownPropertiesDontCheckGeneration()) {
-    return true;
-  }
-  HeapTypeSet* propTypes = group->maybeGetPropertyDontCheckGeneration(*id);
-  if (!propTypes) {
-    return true;
-  }
-  if (!propTypes->nonConstantProperty()) {
-    return false;
-  }
-  return propTypes->hasType(TypeSet::GetValueType(*v));
-}
-
 void AssumeUnreachable(const char* output) {
   MOZ_ReportAssertionFailure(output, __FILE__, __LINE__);
 }
diff -Nru firefox-84.0.2+build1/js/src/jit/VMFunctions.h firefox-85.0+build1/js/src/jit/VMFunctions.h
--- firefox-84.0.2+build1/js/src/jit/VMFunctions.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/VMFunctions.h	2021-01-18 19:58:13.000000000 +0000
@@ -381,12 +381,8 @@
 bool StringsCompare(JSContext* cx, HandleString lhs, HandleString rhs,
                     bool* res);
 
-MOZ_MUST_USE bool ArrayPopDense(JSContext* cx, HandleObject obj,
-                                MutableHandleValue rval);
 MOZ_MUST_USE bool ArrayPushDense(JSContext* cx, HandleArrayObject arr,
                                  HandleValue v, uint32_t* length);
-MOZ_MUST_USE bool ArrayShiftDense(JSContext* cx, HandleObject obj,
-                                  MutableHandleValue rval);
 JSString* ArrayJoin(JSContext* cx, HandleObject array, HandleString sep);
 MOZ_MUST_USE bool SetArrayLength(JSContext* cx, HandleObject obj,
                                  HandleValue value, bool strict);
@@ -408,7 +404,6 @@
 JSObject* NewStringObject(JSContext* cx, HandleString str);
 
 bool OperatorIn(JSContext* cx, HandleValue key, HandleObject obj, bool* out);
-bool OperatorInI(JSContext* cx, int32_t index, HandleObject obj, bool* out);
 
 MOZ_MUST_USE bool GetIntrinsicValue(JSContext* cx, HandlePropertyName name,
                                     MutableHandleValue rval);
@@ -463,8 +458,9 @@
     Handle<AbstractGeneratorObject*> genObj, HandleValue arg,
     int32_t resumeKindArg);
 
-MOZ_MUST_USE bool GlobalNameConflictsCheckFromIon(JSContext* cx,
-                                                  HandleScript script);
+MOZ_MUST_USE bool GlobalDeclInstantiationFromIon(JSContext* cx,
+                                                 HandleScript script,
+                                                 jsbytecode* pc);
 MOZ_MUST_USE bool InitFunctionEnvironmentObjects(JSContext* cx,
                                                  BaselineFrame* frame);
 
@@ -664,8 +660,6 @@
 AtomicsReadWriteModifyFn AtomicsOr(Scalar::Type elementType);
 AtomicsReadWriteModifyFn AtomicsXor(Scalar::Type elementType);
 
-bool GroupHasPropertyTypes(ObjectGroup* group, jsid* id, Value* v);
-
 // Functions used when JS_MASM_VERBOSE is enabled.
 void AssumeUnreachable(const char* output);
 void Printf0(const char* output);
diff -Nru firefox-84.0.2+build1/js/src/jit/WarpBuilder.cpp firefox-85.0+build1/js/src/jit/WarpBuilder.cpp
--- firefox-84.0.2+build1/js/src/jit/WarpBuilder.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/WarpBuilder.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -191,8 +191,7 @@
 
   if (info().funMaybeLazy()) {
     // Initialize |this| parameter.
-    MParameter* thisv =
-        MParameter::New(alloc(), MParameter::THIS_SLOT, nullptr);
+    MParameter* thisv = MParameter::New(alloc(), MParameter::THIS_SLOT);
     osrBlock->add(thisv);
     osrBlock->initSlot(info().thisSlot(), thisv);
 
@@ -209,7 +208,7 @@
       uint32_t slot = info().argSlotUnchecked(i);
       MInstruction* osrv;
       if (!needsArgsObj || !info().argsObjAliasesFormals()) {
-        osrv = MParameter::New(alloc().fallible(), i, nullptr);
+        osrv = MParameter::New(alloc().fallible(), i);
       } else if (script_->formalIsAliased(i)) {
         osrv = MConstant::New(alloc().fallible(), UndefinedValue());
       } else {
@@ -253,7 +252,7 @@
   current->add(start);
 
   // Note: phi specialization can add type guard instructions to the OSR entry
-  // block if needed. See ShouldSpecializeOsrPhis.
+  // block if needed. See TypeAnalyzer::shouldSpecializeOsrPhis.
 
   // Create the preheader block, with the predecessor block and OSR block as
   // predecessors.
@@ -444,14 +443,13 @@
 
   if (info().funMaybeLazy()) {
     // Initialize |this|.
-    MParameter* param =
-        MParameter::New(alloc(), MParameter::THIS_SLOT, nullptr);
+    MParameter* param = MParameter::New(alloc(), MParameter::THIS_SLOT);
     current->add(param);
     current->initSlot(info().thisSlot(), param);
 
     // Initialize arguments.
     for (uint32_t i = 0; i < info().nargs(); i++) {
-      MParameter* param = MParameter::New(alloc().fallible(), i, nullptr);
+      MParameter* param = MParameter::New(alloc().fallible(), i);
       if (!param) {
         return false;
       }
@@ -864,8 +862,7 @@
 
   auto* snapshot = getOpSnapshot<WarpRegExp>(loc);
 
-  MRegExp* regexp = MRegExp::New(alloc(), /* constraints = */ nullptr, reObj,
-                                 snapshot->hasShared());
+  MRegExp* regexp = MRegExp::New(alloc(), reObj, snapshot->hasShared());
   current->add(regexp);
   current->push(regexp);
 
@@ -1072,6 +1069,25 @@
   return buildCompareOp(loc);
 }
 
+// Returns true iff the MTest added for |op| has a true-target corresponding
+// with the join point in the bytecode.
+static bool TestTrueTargetIsJoinPoint(JSOp op) {
+  switch (op) {
+    case JSOp::IfNe:
+    case JSOp::Or:
+    case JSOp::Case:
+      return true;
+
+    case JSOp::IfEq:
+    case JSOp::And:
+    case JSOp::Coalesce:
+      return false;
+
+    default:
+      MOZ_CRASH("Unexpected op");
+  }
+}
+
 bool WarpBuilder::build_JumpTarget(BytecodeLocation loc) {
   PendingEdgesMap::Ptr p = pendingEdges_.lookup(loc.toRawBytecode());
   if (!p) {
@@ -1435,14 +1451,12 @@
   MBasicBlock* header = loopStack_.popCopy().header();
   current->end(MGoto::New(alloc(), header));
 
-  AbortReason r = header->setBackedge(alloc(), current);
-  if (r == AbortReason::NoAbort) {
-    setTerminatedBlock();
-    return true;
+  if (!header->setBackedge(current)) {
+    return false;
   }
 
-  MOZ_ASSERT(r == AbortReason::Alloc);
-  return false;
+  setTerminatedBlock();
+  return true;
 }
 
 bool WarpBuilder::buildForwardGoto(BytecodeLocation target) {
@@ -1487,7 +1501,7 @@
 
 bool WarpBuilder::build_Not(BytecodeLocation loc) {
   MDefinition* value = current->pop();
-  MNot* ins = MNot::New(alloc(), value, /* constraints = */ nullptr);
+  MNot* ins = MNot::New(alloc(), value);
   current->add(ins);
   current->push(ins);
   return true;
@@ -1516,45 +1530,9 @@
   return script_->jitScript()->usesEnvironmentChain();
 }
 
-bool WarpBuilder::build_DefVar(BytecodeLocation loc) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefinition* env = current->environmentChain();
-  MDefVar* defvar = MDefVar::New(alloc(), env);
-  current->add(defvar);
-  return resumeAfter(defvar, loc);
-}
-
-bool WarpBuilder::buildDefLexicalOp(BytecodeLocation loc) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefinition* env = current->environmentChain();
-  MDefLexical* defLexical = MDefLexical::New(alloc(), env);
-  current->add(defLexical);
-  return resumeAfter(defLexical, loc);
-}
-
-bool WarpBuilder::build_DefLet(BytecodeLocation loc) {
-  return buildDefLexicalOp(loc);
-}
-
-bool WarpBuilder::build_DefConst(BytecodeLocation loc) {
-  return buildDefLexicalOp(loc);
-}
-
-bool WarpBuilder::build_DefFun(BytecodeLocation loc) {
-  MOZ_ASSERT(usesEnvironmentChain());
-
-  MDefinition* fun = current->pop();
-  MDefinition* env = current->environmentChain();
-  MDefFun* deffun = MDefFun::New(alloc(), fun, env);
-  current->add(deffun);
-  return resumeAfter(deffun, loc);
-}
-
-bool WarpBuilder::build_CheckGlobalOrEvalDecl(BytecodeLocation loc) {
+bool WarpBuilder::build_GlobalOrEvalDeclInstantiation(BytecodeLocation loc) {
   MOZ_ASSERT(!script_->isForEval(), "Eval scripts not supported");
-  auto* redeclCheck = MGlobalNameConflictsCheck::New(alloc());
+  auto* redeclCheck = MGlobalDeclInstantiation::New(alloc());
   current->add(redeclCheck);
   return resumeAfter(redeclCheck, loc);
 }
@@ -1731,17 +1709,6 @@
   return buildIC(loc, CacheKind::GetIterator, {obj});
 }
 
-bool WarpBuilder::build_IterNext(BytecodeLocation) {
-  // TODO(post-Warp): IterNext was added as hint to prevent IonBuilder/TI loop
-  // restarts. Once IonBuilder is gone this op should probably just be removed.
-  MDefinition* def = current->pop();
-  MInstruction* unbox =
-      MUnbox::New(alloc(), def, MIRType::String, MUnbox::Infallible);
-  current->add(unbox);
-  current->push(unbox);
-  return true;
-}
-
 bool WarpBuilder::build_MoreIter(BytecodeLocation loc) {
   MDefinition* iter = current->peek(-1);
   MInstruction* ins = MIteratorMore::New(alloc(), iter);
@@ -1954,24 +1921,12 @@
   return buildIC(loc, CacheKind::GetProp, {val});
 }
 
-bool WarpBuilder::build_CallProp(BytecodeLocation loc) {
-  return build_GetProp(loc);
-}
-
-bool WarpBuilder::build_Length(BytecodeLocation loc) {
-  return build_GetProp(loc);
-}
-
 bool WarpBuilder::build_GetElem(BytecodeLocation loc) {
   MDefinition* id = current->pop();
   MDefinition* val = current->pop();
   return buildIC(loc, CacheKind::GetElem, {val, id});
 }
 
-bool WarpBuilder::build_CallElem(BytecodeLocation loc) {
-  return build_GetElem(loc);
-}
-
 bool WarpBuilder::build_SetProp(BytecodeLocation loc) {
   MDefinition* val = current->pop();
   MDefinition* obj = current->pop();
@@ -2283,35 +2238,17 @@
 
   MNewArray* ins;
   if (useVMCall) {
-    ins = MNewArray::NewVM(alloc(), /* constraints = */ nullptr, length,
-                           templateConst, heap, loc.toRawBytecode());
+    ins = MNewArray::NewVM(alloc(), length, templateConst, heap,
+                           loc.toRawBytecode());
   } else {
-    ins = MNewArray::New(alloc(), /* constraints = */ nullptr, length,
-                         templateConst, heap, loc.toRawBytecode());
+    ins = MNewArray::New(alloc(), length, templateConst, heap,
+                         loc.toRawBytecode());
   }
   current->add(ins);
   current->push(ins);
   return true;
 }
 
-bool WarpBuilder::build_NewArrayCopyOnWrite(BytecodeLocation loc) {
-  MOZ_CRASH("Bug 1626854: COW arrays disabled without TI for now");
-
-  ArrayObject* templateObject = &loc.getObject(script_)->as<ArrayObject>();
-
-  // TODO: pre-tenuring.
-  gc::InitialHeap heap = gc::DefaultHeap;
-  MConstant* templateConst =
-      MConstant::NewConstraintlessObject(alloc(), templateObject);
-  current->add(templateConst);
-
-  auto* ins = MNewArrayCopyOnWrite::New(alloc(), /* constraints = */ nullptr,
-                                        templateConst, heap);
-  current->add(ins);
-  current->push(ins);
-  return true;
-}
-
 bool WarpBuilder::build_NewObject(BytecodeLocation loc) {
   // TODO: support pre-tenuring.
   gc::InitialHeap heap = gc::DefaultHeap;
@@ -2319,22 +2256,18 @@
   MNewObject* ins;
   if (const auto* snapshot = getOpSnapshot<WarpNewObject>(loc)) {
     auto* templateConst = constant(ObjectValue(*snapshot->templateObject()));
-    ins = MNewObject::New(alloc(), /* constraints = */ nullptr, templateConst,
-                          heap, MNewObject::ObjectLiteral);
+    ins = MNewObject::New(alloc(), templateConst, heap,
+                          MNewObject::ObjectLiteral);
   } else {
     auto* templateConst = constant(NullValue());
-    ins = MNewObject::NewVM(alloc(), /* constraints = */ nullptr, templateConst,
-                            heap, MNewObject::ObjectLiteral);
+    ins = MNewObject::NewVM(alloc(), templateConst, heap,
+                            MNewObject::ObjectLiteral);
   }
   current->add(ins);
   current->push(ins);
   return resumeAfter(ins, loc);
 }
 
-bool WarpBuilder::build_NewObjectWithGroup(BytecodeLocation loc) {
-  return build_NewObject(loc);
-}
-
 bool WarpBuilder::build_NewInit(BytecodeLocation loc) {
   return build_NewObject(loc);
 }
@@ -2598,11 +2531,9 @@
 
 static LambdaFunctionInfo LambdaInfoFromSnapshot(JSFunction* fun,
                                                  const WarpLambda* snapshot) {
-  // Pass false for singletonType and useSingletonForClone as asserted in
-  // WarpOracle.
+  // Pass false for singletonType as asserted in WarpOracle.
   return LambdaFunctionInfo(fun, snapshot->baseScript(), snapshot->flags(),
-                            snapshot->nargs(), /* singletonType = */ false,
-                            /* useSingletonForClone = */ false);
+                            snapshot->nargs(), /* singletonType = */ false);
 }
 
 bool WarpBuilder::build_Lambda(BytecodeLocation loc) {
@@ -2615,7 +2546,7 @@
   JSFunction* fun = loc.getFunction(script_);
   MConstant* funConst = constant(ObjectValue(*fun));
 
-  auto* ins = MLambda::New(alloc(), /* constraints = */ nullptr, env, funConst,
+  auto* ins = MLambda::New(alloc(), env, funConst,
                            LambdaInfoFromSnapshot(fun, snapshot));
   current->add(ins);
   current->push(ins);
@@ -2633,9 +2564,8 @@
   JSFunction* fun = loc.getFunction(script_);
   MConstant* funConst = constant(ObjectValue(*fun));
 
-  auto* ins =
-      MLambdaArrow::New(alloc(), /* constraints = */ nullptr, env, newTarget,
-                        funConst, LambdaInfoFromSnapshot(fun, snapshot));
+  auto* ins = MLambdaArrow::New(alloc(), env, newTarget, funConst,
+                                LambdaInfoFromSnapshot(fun, snapshot));
   current->add(ins);
   current->push(ins);
   return resumeAfter(ins, loc);
@@ -2808,11 +2738,11 @@
     MConstant* templateConst = constant(ObjectValue(*templateObject));
     MNewArray* newArray;
     if (numRest > snapshot->maxInlineElements()) {
-      newArray = MNewArray::NewVM(alloc(), /* constraints = */ nullptr, numRest,
-                                  templateConst, heap, loc.toRawBytecode());
+      newArray = MNewArray::NewVM(alloc(), numRest, templateConst, heap,
+                                  loc.toRawBytecode());
     } else {
-      newArray = MNewArray::New(alloc(), /* constraints = */ nullptr, numRest,
-                                templateConst, heap, loc.toRawBytecode());
+      newArray = MNewArray::New(alloc(), numRest, templateConst, heap,
+                                loc.toRawBytecode());
     }
     current->add(newArray);
     current->push(newArray);
@@ -2865,8 +2795,7 @@
   // Pass in the number of actual arguments, the number of formals (not
   // including the rest parameter slot itself), and the template object.
   unsigned numFormals = info().nargs() - 1;
-  MRest* rest = MRest::New(alloc(), /* constraints = */ nullptr, numActuals,
-                           numFormals, templateObject);
+  MRest* rest = MRest::New(alloc(), numActuals, numFormals, templateObject);
   current->add(rest);
   current->push(rest);
   return true;
@@ -3050,11 +2979,7 @@
           val = maybeGuardNotOptimizedArguments(val);
         }
       }
-      // For now pass monitoredResult = true to get the behavior we want (no
-      // TI-related restrictions apply, similar to the Baseline IC).
-      // See also IonGetPropertyICFlags.
-      bool monitoredResult = true;
-      auto* ins = MGetPropertyCache::New(alloc(), val, id, monitoredResult);
+      auto* ins = MGetPropertyCache::New(alloc(), val, id);
       current->add(ins);
       current->push(ins);
       return resumeAfter(ins, loc);
@@ -3062,9 +2987,7 @@
     case CacheKind::GetElem: {
       MOZ_ASSERT(numInputs == 2);
       MDefinition* val = maybeGuardNotOptimizedArguments(getInput(0));
-      bool monitoredResult = true;  // See GetProp case above.
-      auto* ins =
-          MGetPropertyCache::New(alloc(), val, getInput(1), monitoredResult);
+      auto* ins = MGetPropertyCache::New(alloc(), val, getInput(1));
       current->add(ins);
       current->push(ins);
       return resumeAfter(ins, loc);
@@ -3074,24 +2997,16 @@
       PropertyName* name = loc.getPropertyName(script_);
       MConstant* id = constant(StringValue(name));
       bool strict = loc.isStrictSetOp();
-      bool needsPostBarrier = true;
-      bool needsTypeBarrier = false;
-      bool guardHoles = true;
-      auto* ins = MSetPropertyCache::New(alloc(), getInput(0), id, getInput(1),
-                                         strict, needsPostBarrier,
-                                         needsTypeBarrier, guardHoles);
+      auto* ins =
+          MSetPropertyCache::New(alloc(), getInput(0), id, getInput(1), strict);
       current->add(ins);
       return resumeAfter(ins, loc);
     }
     case CacheKind::SetElem: {
       MOZ_ASSERT(numInputs == 3);
       bool strict = loc.isStrictSetOp();
-      bool needsPostBarrier = true;
-      bool needsTypeBarrier = false;
-      bool guardHoles = true;
       auto* ins = MSetPropertyCache::New(alloc(), getInput(0), getInput(1),
-                                         getInput(2), strict, needsPostBarrier,
-                                         needsTypeBarrier, guardHoles);
+                                         getInput(2), strict);
       current->add(ins);
       return resumeAfter(ins, loc);
     }
diff -Nru firefox-84.0.2+build1/js/src/jit/WarpBuilder.h firefox-85.0+build1/js/src/jit/WarpBuilder.h
--- firefox-84.0.2+build1/js/src/jit/WarpBuilder.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/WarpBuilder.h	2021-01-18 19:58:13.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include <initializer_list>
 
+#include "ds/InlineTable.h"
 #include "jit/JitContext.h"
 #include "jit/MIR.h"
 #include "jit/MIRBuilderShared.h"
@@ -75,6 +76,118 @@
 
 enum class CacheKind : uint8_t;
 
+// [SMDOC] Control Flow handling in WarpBuilder.
+//
+// WarpBuilder traverses the script's bytecode and compiles each instruction to
+// corresponding MIR instructions. Handling control flow bytecode ops requires
+// some special machinery:
+//
+// Forward branches
+// ----------------
+// Most branches in the bytecode are forward branches to a JSOp::JumpTarget
+// instruction that we have not inspected yet. We compile them in two phases:
+//
+// 1) When compiling the source instruction: the MBasicBlock is terminated
+//    with a control instruction that has a nullptr successor block. We also add
+//    a PendingEdge instance to the PendingEdges list for the target bytecode
+//    location.
+//
+// 2) When finally compiling the JSOp::JumpTarget: WarpBuilder::build_JumpTarget
+//    creates the target block and uses the list of PendingEdges to 'link' the
+//    blocks.
+//
+// Loops
+// -----
+// Loops may be nested within other loops, so each WarpBuilder has a LoopState
+// stack. This is used to link the backedge to the loop's header block.
+//
+// Unreachable/dead code
+// ---------------------
+// Some bytecode instructions never fall through to the next instruction, for
+// example JSOp::Return, JSOp::Goto, or JSOp::Throw. Code after such
+// instructions is guaranteed to be dead so WarpBuilder skips it until it gets
+// to a jump target instruction with pending edges.
+//
+// Note: The frontend may generate unnecessary JSOp::JumpTarget instructions we
+// can ignore when they have no incoming pending edges.
+//
+// Try-catch
+// ---------
+// WarpBuilder supports scripts with try-catch by only compiling the try-block
+// and bailing out (to the Baseline Interpreter) from the exception handler
+// whenever we need to execute the catch-block.
+//
+// Because we don't compile the catch-block and the code after the try-catch may
+// only be reachable via the catch-block, Baseline's BytecodeAnalysis ensures
+// Baseline does not attempt OSR into Warp at loops that are only reachable via
+// catch/finally blocks.
+//
+// Finally-blocks are currently not supported by WarpBuilder.
+
+// PendingEdge is used whenever a block is terminated with a forward branch in
+// the bytecode. When we reach the jump target we use this information to link
+// the block to the jump target's block.
+class PendingEdge {
+ public:
+  enum class Kind : uint8_t {
+    // MTest true-successor.
+    TestTrue,
+
+    // MTest false-successor.
+    TestFalse,
+
+    // MGoto successor.
+    Goto,
+  };
+
+ private:
+  MBasicBlock* block_;
+  Kind kind_;
+  JSOp testOp_ = JSOp::Undefined;
+
+  PendingEdge(MBasicBlock* block, Kind kind, JSOp testOp = JSOp::Undefined)
+      : block_(block), kind_(kind), testOp_(testOp) {}
+
+ public:
+  static PendingEdge NewTestTrue(MBasicBlock* block, JSOp op) {
+    return PendingEdge(block, Kind::TestTrue, op);
+  }
+  static PendingEdge NewTestFalse(MBasicBlock* block, JSOp op) {
+    return PendingEdge(block, Kind::TestFalse, op);
+  }
+  static PendingEdge NewGoto(MBasicBlock* block) {
+    return PendingEdge(block, Kind::Goto);
+  }
+
+  MBasicBlock* block() const { return block_; }
+  Kind kind() const { return kind_; }
+
+  JSOp testOp() const {
+    MOZ_ASSERT(kind_ == Kind::TestTrue || kind_ == Kind::TestFalse);
+    return testOp_;
+  }
+};
+
+// PendingEdgesMap maps a bytecode instruction to a Vector of PendingEdges
+// targeting it. We use InlineMap<> for this because most of the time there are
+// only a few pending edges but there can be many when switch-statements are
+// involved.
+using PendingEdges = Vector<PendingEdge, 2, SystemAllocPolicy>;
+using PendingEdgesMap =
+    InlineMap<jsbytecode*, PendingEdges, 8, PointerHasher<jsbytecode*>,
+              SystemAllocPolicy>;
+
+// LoopState stores information about a loop that's being compiled to MIR.
+class LoopState {
+  MBasicBlock* header_ = nullptr;
+
+ public:
+  explicit LoopState(MBasicBlock* header) : header_(header) {}
+
+  MBasicBlock* header() const { return header_; }
+};
+using LoopStateStack = Vector<LoopState, 4, JitAllocPolicy>;
+
 // Data that is shared across all WarpBuilders for a given compilation.
 class MOZ_STACK_CLASS WarpCompilation {
   // The total loop depth, including loops in the caller while
@@ -190,7 +303,6 @@
   MOZ_MUST_USE bool buildBinaryOp(BytecodeLocation loc);
   MOZ_MUST_USE bool buildCompareOp(BytecodeLocation loc);
   MOZ_MUST_USE bool buildTestOp(BytecodeLocation loc);
-  MOZ_MUST_USE bool buildDefLexicalOp(BytecodeLocation loc);
   MOZ_MUST_USE bool buildCallOp(BytecodeLocation loc);
 
   MOZ_MUST_USE bool buildInitPropGetterSetterOp(BytecodeLocation loc);
diff -Nru firefox-84.0.2+build1/js/src/jit/WarpCacheIRTranspiler.cpp firefox-85.0+build1/js/src/jit/WarpCacheIRTranspiler.cpp
--- firefox-84.0.2+build1/js/src/jit/WarpCacheIRTranspiler.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/WarpCacheIRTranspiler.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -67,15 +67,27 @@
   bool pushedResult_ = false;
 #endif
 
+  inline void addUnchecked(MInstruction* ins) {
+    current->add(ins);
+
+    // If we have not set a more specific bailout kind, mark this instruction
+    // as transpiled CacheIR. If one of these instructions bails out, we
+    // expect to hit the baseline fallback stub and invalidate the Warp script
+    // in tryAttach.
+    if (ins->bailoutKind() == BailoutKind::Unknown) {
+      ins->setBailoutKind(BailoutKind::TranspiledCacheIR);
+    }
+  }
+
   inline void add(MInstruction* ins) {
     MOZ_ASSERT(!ins->isEffectful());
-    current->add(ins);
+    addUnchecked(ins);
   }
 
   inline void addEffectful(MInstruction* ins) {
     MOZ_ASSERT(ins->isEffectful());
     MOZ_ASSERT(!effectful_, "Can only have one effectful instruction");
-    current->add(ins);
+    addUnchecked(ins);
 #ifdef DEBUG
     effectful_ = ins;
 #endif
@@ -84,7 +96,7 @@
   // Bypasses all checks in addEffectful. Only used for testing functions.
   inline void addEffectfulUnsafe(MInstruction* ins) {
     MOZ_ASSERT(ins->isEffectful());
-    current->add(ins);
+    addUnchecked(ins);
   }
 
   MOZ_MUST_USE bool resumeAfterUnchecked(MInstruction* ins) {
@@ -220,6 +232,8 @@
   MOZ_MUST_USE bool emitFunApplyArgs(WrappedFunction* wrappedTarget,
                                      CallFlags flags);
 
+  MDefinition* convertWasmArg(MDefinition* arg, wasm::ValType::Kind kind);
+
   WrappedFunction* maybeWrappedFunction(MDefinition* callee, CallKind kind,
                                         uint16_t nargs, FunctionFlags flags);
   WrappedFunction* maybeCallTarget(MDefinition* callee, CallKind kind);
@@ -292,7 +306,7 @@
     return ins;
   }
 
-  auto* ins = MConstant::NewConstraintlessObject(alloc(), field.toObject());
+  auto* ins = MConstant::NewObject(alloc(), field.toObject());
   add(ins);
   return ins;
 }
@@ -369,8 +383,7 @@
   ObjectGroup* group = groupStubField(groupOffset);
 
   auto* ins = MGuardObjectGroup::New(alloc(), def, group,
-                                     /* bailOnEquality = */ false,
-                                     BailoutKind::ObjectIdentityOrTypeGuard);
+                                     /* bailOnEquality = */ false);
   add(ins);
 
   setOperand(objId, ins);
@@ -387,6 +400,16 @@
   return true;
 }
 
+bool WarpCacheIRTranspiler::emitGuardIsNativeObject(ObjOperandId objId) {
+  MDefinition* obj = getOperand(objId);
+
+  auto* ins = MGuardIsNativeObject::New(alloc(), obj);
+  add(ins);
+
+  setOperand(objId, ins);
+  return true;
+}
+
 bool WarpCacheIRTranspiler::emitGuardIsProxy(ObjOperandId objId) {
   MDefinition* obj = getOperand(objId);
 
@@ -1101,6 +1124,59 @@
   return true;
 }
 
+bool WarpCacheIRTranspiler::emitGuardIsExtensible(ObjOperandId objId) {
+  MDefinition* obj = getOperand(objId);
+
+  auto* ins = MGuardIsExtensible::New(alloc(), obj);
+  add(ins);
+  setOperand(objId, ins);
+  return true;
+}
+
+bool WarpCacheIRTranspiler::emitGuardIndexIsNonNegative(
+    Int32OperandId indexId) {
+  MDefinition* index = getOperand(indexId);
+
+  auto* ins = MGuardIndexIsNonNegative::New(alloc(), index);
+  add(ins);
+  setOperand(indexId, ins);
+  return true;
+}
+
+bool WarpCacheIRTranspiler::emitGuardIndexGreaterThanDenseInitLength(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  auto* ins = MGuardIndexGreaterThanDenseInitLength::New(alloc(), obj, index);
+  add(ins);
+  setOperand(indexId, ins);
+  return true;
+}
+
+bool WarpCacheIRTranspiler::emitGuardIndexIsValidUpdateOrAdd(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  auto* ins = MGuardIndexIsValidUpdateOrAdd::New(alloc(), obj, index);
+  add(ins);
+  setOperand(indexId, ins);
+  return true;
+}
+
+bool WarpCacheIRTranspiler::emitCallAddOrUpdateSparseElementHelper(
+    ObjOperandId objId, Int32OperandId idId, ValOperandId rhsId, bool strict) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* id = getOperand(idId);
+  MDefinition* rhs = getOperand(rhsId);
+
+  auto* ins = MCallAddOrUpdateSparseElement::New(alloc(), obj, id, rhs, strict);
+  addEffectful(ins);
+
+  return resumeAfter(ins);
+}
+
 bool WarpCacheIRTranspiler::emitGuardTagNotEqual(ValueTagOperandId lhsId,
                                                  ValueTagOperandId rhsId) {
   MDefinition* lhs = getOperand(lhsId);
@@ -1610,6 +1686,30 @@
   return true;
 }
 
+bool WarpCacheIRTranspiler::emitCallGetSparseElementResult(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  auto* call = MCallGetSparseElement::New(alloc(), obj, index);
+  addEffectful(call);
+
+  pushResult(call);
+  return resumeAfter(call);
+}
+
+bool WarpCacheIRTranspiler::emitCallNativeGetElementResult(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  auto* call = MCallNativeGetElement::New(alloc(), obj, index);
+  addEffectful(call);
+
+  pushResult(call);
+  return resumeAfter(call);
+}
+
 bool WarpCacheIRTranspiler::emitLoadDenseElementExistsResult(
     ObjOperandId objId, Int32OperandId indexId) {
   MDefinition* obj = getOperand(objId);
@@ -1633,6 +1733,38 @@
   return true;
 }
 
+bool WarpCacheIRTranspiler::emitLoadDenseElementHoleExistsResult(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  // Get the elements vector.
+  auto* elements = MElements::New(alloc(), obj);
+  add(elements);
+
+  auto* length = MInitializedLength::New(alloc(), elements);
+  add(length);
+
+  // Check if id < initLength and elem[id] not a hole.
+  auto* ins = MInArray::New(alloc(), elements, index, length, obj);
+  add(ins);
+
+  pushResult(ins);
+  return true;
+}
+
+bool WarpCacheIRTranspiler::emitCallObjectHasSparseElementResult(
+    ObjOperandId objId, Int32OperandId indexId) {
+  MDefinition* obj = getOperand(objId);
+  MDefinition* index = getOperand(indexId);
+
+  auto* ins = MCallObjectHasSparseElement::New(alloc(), obj, index);
+  add(ins);
+
+  pushResult(ins);
+  return true;
+}
+
 bool WarpCacheIRTranspiler::emitLoadTypedArrayElementExistsResult(
     ObjOperandId objId, Int32OperandId indexId) {
   MDefinition* obj = getOperand(objId);
@@ -1851,30 +1983,24 @@
   return resumeAfter(addAndStore);
 }
 
-bool WarpCacheIRTranspiler::emitAddAndStoreFixedSlot(
-    ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
-  MOZ_ASSERT(!changeGroup);
-
+bool WarpCacheIRTranspiler::emitAddAndStoreFixedSlot(ObjOperandId objId,
+                                                     uint32_t offsetOffset,
+                                                     ValOperandId rhsId,
+                                                     uint32_t newShapeOffset) {
   return emitAddAndStoreSlotShared(MAddAndStoreSlot::Kind::FixedSlot, objId,
                                    offsetOffset, rhsId, newShapeOffset);
 }
 
 bool WarpCacheIRTranspiler::emitAddAndStoreDynamicSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset) {
-  MOZ_ASSERT(!changeGroup);
-
+    uint32_t newShapeOffset) {
   return emitAddAndStoreSlotShared(MAddAndStoreSlot::Kind::DynamicSlot, objId,
                                    offsetOffset, rhsId, newShapeOffset);
 }
 
 bool WarpCacheIRTranspiler::emitAllocateAndStoreDynamicSlot(
     ObjOperandId objId, uint32_t offsetOffset, ValOperandId rhsId,
-    bool changeGroup, uint32_t newGroupOffset, uint32_t newShapeOffset,
-    uint32_t numNewSlotsOffset) {
-  MOZ_ASSERT(!changeGroup);
-
+    uint32_t newShapeOffset, uint32_t numNewSlotsOffset) {
   int32_t offset = int32StubField(offsetOffset);
   Shape* shape = shapeStubField(newShapeOffset);
   uint32_t numNewSlots = uint32StubField(numNewSlotsOffset);
@@ -2879,8 +3005,7 @@
   MDefinition* separator = getOperand(separatorId);
   ObjectGroup* group = groupStubField(groupOffset);
 
-  auto* split = MStringSplit::New(alloc(), /* constraints = */ nullptr, str,
-                                  separator, group);
+  auto* split = MStringSplit::New(alloc(), str, separator, group);
   add(split);
 
   pushResult(split);
@@ -3085,8 +3210,7 @@
   JSObject* templateObj = tenuredObjectStubField(templateObjectOffset);
 
   auto* templateConst = constant(ObjectValue(*templateObj));
-  auto* iter = MNewIterator::New(alloc(), /* constraints = */ nullptr,
-                                 templateConst, type);
+  auto* iter = MNewIterator::New(alloc(), templateConst, type);
   add(iter);
 
   pushResult(iter);
@@ -3119,8 +3243,8 @@
 
   // TODO: support pre-tenuring.
   gc::InitialHeap heap = gc::DefaultHeap;
-  auto* obj = MNewObject::New(alloc(), /* constraints = */ nullptr,
-                              templateConst, heap, MNewObject::ObjectCreate);
+  auto* obj =
+      MNewObject::New(alloc(), templateConst, heap, MNewObject::ObjectCreate);
   addEffectful(obj);
 
   pushResult(obj);
@@ -3148,11 +3272,11 @@
 
       MNewArray* obj;
       if (len > inlineLength) {
-        obj = MNewArray::NewVM(alloc(), /* constraints = */ nullptr, len,
-                               templateConst, heap, loc_.toRawBytecode());
+        obj = MNewArray::NewVM(alloc(), len, templateConst, heap,
+                               loc_.toRawBytecode());
       } else {
-        obj = MNewArray::New(alloc(), /* constraints = */ nullptr, len,
-                             templateConst, heap, loc_.toRawBytecode());
+        obj = MNewArray::New(alloc(), len, templateConst, heap,
+                             loc_.toRawBytecode());
       }
       add(obj);
       pushResult(obj);
@@ -3160,8 +3284,7 @@
     }
   }
 
-  auto* obj = MNewArrayDynamicLength::New(alloc(), /* constraints = */ nullptr,
-                                          templateObj, heap, length);
+  auto* obj = MNewArrayDynamicLength::New(alloc(), templateObj, heap, length);
   addEffectful(obj);
   pushResult(obj);
   return resumeAfter(obj);
@@ -3180,16 +3303,15 @@
     if (len > 0 &&
         uint32_t(len) == templateObj->as<TypedArrayObject>().length().get()) {
       auto* templateConst = constant(ObjectValue(*templateObj));
-      auto* obj = MNewTypedArray::New(alloc(), /* constraints = */ nullptr,
-                                      templateConst, heap);
+      auto* obj = MNewTypedArray::New(alloc(), templateConst, heap);
       add(obj);
       pushResult(obj);
       return true;
     }
   }
 
-  auto* obj = MNewTypedArrayDynamicLength::New(
-      alloc(), /* constraints = */ nullptr, templateObj, heap, length);
+  auto* obj =
+      MNewTypedArrayDynamicLength::New(alloc(), templateObj, heap, length);
   addEffectful(obj);
   pushResult(obj);
   return resumeAfter(obj);
@@ -3206,9 +3328,8 @@
   // TODO: support pre-tenuring.
   gc::InitialHeap heap = gc::DefaultHeap;
 
-  auto* obj = MNewTypedArrayFromArrayBuffer::New(
-      alloc(), /* constraints = */ nullptr, templateObj, heap, buffer,
-      byteOffset, length);
+  auto* obj = MNewTypedArrayFromArrayBuffer::New(alloc(), templateObj, heap,
+                                                 buffer, byteOffset, length);
   addEffectful(obj);
 
   pushResult(obj);
@@ -3223,8 +3344,7 @@
   // TODO: support pre-tenuring.
   gc::InitialHeap heap = gc::DefaultHeap;
 
-  auto* obj = MNewTypedArrayFromArray::New(alloc(), /* constraints = */ nullptr,
-                                           templateObj, heap, array);
+  auto* obj = MNewTypedArrayFromArray::New(alloc(), templateObj, heap, array);
   addEffectful(obj);
 
   pushResult(obj);
@@ -3475,6 +3595,18 @@
         case ArgumentKind::Arg3:
           callInfo_->setArg(3, getOperand(id));
           break;
+        case ArgumentKind::Arg4:
+          callInfo_->setArg(4, getOperand(id));
+          break;
+        case ArgumentKind::Arg5:
+          callInfo_->setArg(5, getOperand(id));
+          break;
+        case ArgumentKind::Arg6:
+          callInfo_->setArg(6, getOperand(id));
+          break;
+        case ArgumentKind::Arg7:
+          callInfo_->setArg(7, getOperand(id));
+          break;
         case ArgumentKind::Callee:
         case ArgumentKind::NumKinds:
           MOZ_CRASH("Unexpected argument kind");
@@ -3505,7 +3637,7 @@
   // Args..
   if (slotIndex < callInfo_->argc()) {
     uint32_t arg = callInfo_->argc() - 1 - slotIndex;
-    ArgumentKind kind = ArgumentKind(uint32_t(ArgumentKind::Arg0) + arg);
+    ArgumentKind kind = ArgumentKindForArgIndex(arg);
     MOZ_ASSERT(kind < ArgumentKind::NumKinds);
     setArgumentId(kind, resultId);
     return defineOperand(resultId, callInfo_->getArg(arg));
@@ -3788,7 +3920,7 @@
   MDefinition* argThis = callInfo_->getArg(0);
 
   MArgumentsLength* numArgs = MArgumentsLength::New(alloc());
-  current->add(numArgs);
+  add(numArgs);
 
   MApplyArgs* apply =
       MApplyArgs::New(alloc(), wrappedTarget, argFunc, numArgs, argThis);
@@ -3918,67 +4050,22 @@
     return false;
   }
 
-  // An invariant in this loop is that any type conversion operation that has
-  // externally visible effects, such as invoking valueOf on an object argument,
-  // must bailout so that we don't have to worry about replaying effects during
-  // argument conversion.
   mozilla::Maybe<MDefinition*> undefined;
   for (size_t i = 0; i < sig.args().length(); i++) {
     if (!alloc().ensureBallast()) {
       return false;
     }
 
-    // Add undefined if an argument is missing.
-    if (i >= callInfo_->argc() && !undefined) {
-      undefined.emplace(constant(UndefinedValue()));
-    }
-
-    MDefinition* arg =
-        i >= callInfo_->argc() ? *undefined : callInfo_->getArg(i);
-
-    MInstruction* conversion = nullptr;
-    switch (sig.args()[i].kind()) {
-      case wasm::ValType::I32:
-        conversion = MTruncateToInt32::New(alloc(), arg);
-        break;
-      case wasm::ValType::I64:
-        conversion = MToInt64::New(alloc(), arg);
-        break;
-      case wasm::ValType::F32:
-        conversion = MToFloat32::New(alloc(), arg);
-        break;
-      case wasm::ValType::F64:
-        conversion = MToDouble::New(alloc(), arg);
-        break;
-      case wasm::ValType::V128:
-        MOZ_CRASH("Unexpected type for Wasm JitEntry");
-      case wasm::ValType::Ref:
-        switch (sig.args()[i].refTypeKind()) {
-          case wasm::RefType::Extern:
-            // Transform the JS representation into an AnyRef representation.
-            // The resulting type is MIRType::RefOrNull.  These cases are all
-            // effect-free.
-            switch (arg->type()) {
-              case MIRType::Object:
-              case MIRType::ObjectOrNull:
-                conversion = MWasmAnyRefFromJSObject::New(alloc(), arg);
-                break;
-              case MIRType::Null:
-                conversion = MWasmNullConstant::New(alloc());
-                break;
-              default:
-                conversion = MWasmBoxValue::New(alloc(), arg);
-                break;
-            }
-            break;
-          default:
-            MOZ_CRASH("Unexpected type for Wasm JitEntry");
-        }
-        break;
+    MDefinition* arg;
+    if (i < callInfo_->argc()) {
+      arg = callInfo_->getArg(i);
+    } else {
+      if (!undefined) {
+        undefined.emplace(constant(UndefinedValue()));
+      }
+      arg = convertWasmArg(*undefined, sig.args()[i].kind());
     }
-
-    add(conversion);
-    call->initArg(i, conversion);
+    call->initArg(i, arg);
   }
 
   addEffectful(call);
@@ -4017,6 +4104,61 @@
   return resumeAfterUnchecked(postConversion);
 }
 
+MDefinition* WarpCacheIRTranspiler::convertWasmArg(MDefinition* arg,
+                                                   wasm::ValType::Kind kind) {
+  // An invariant in this code is that any type conversion operation that has
+  // externally visible effects, such as invoking valueOf on an object argument,
+  // must bailout so that we don't have to worry about replaying effects during
+  // argument conversion.
+  MInstruction* conversion = nullptr;
+  switch (kind) {
+    case wasm::ValType::I32:
+      conversion = MTruncateToInt32::New(alloc(), arg);
+      break;
+    case wasm::ValType::I64:
+      conversion = MToInt64::New(alloc(), arg);
+      break;
+    case wasm::ValType::F32:
+      conversion = MToFloat32::New(alloc(), arg);
+      break;
+    case wasm::ValType::F64:
+      conversion = MToDouble::New(alloc(), arg);
+      break;
+    case wasm::ValType::V128:
+      MOZ_CRASH("Unexpected type for Wasm JitEntry");
+    case wasm::ValType::Ref:
+      // Transform the JS representation into an AnyRef representation.
+      // The resulting type is MIRType::RefOrNull.  These cases are all
+      // effect-free.
+      switch (arg->type()) {
+        case MIRType::Object:
+        case MIRType::ObjectOrNull:
+          conversion = MWasmAnyRefFromJSObject::New(alloc(), arg);
+          break;
+        case MIRType::Null:
+          arg->setImplicitlyUsedUnchecked();
+          conversion = MWasmNullConstant::New(alloc());
+          break;
+        default:
+          conversion = MWasmBoxValue::New(alloc(), arg);
+          break;
+      }
+      break;
+  }
+
+  add(conversion);
+  return conversion;
+}
+
+bool WarpCacheIRTranspiler::emitGuardWasmArg(ValOperandId argId,
+                                             wasm::ValType::Kind kind) {
+  MDefinition* arg = getOperand(argId);
+  MDefinition* conversion = convertWasmArg(arg, kind);
+
+  setOperand(argId, conversion);
+  return true;
+}
+
 bool WarpCacheIRTranspiler::emitCallGetterResult(CallKind kind,
                                                  ValOperandId receiverId,
                                                  uint32_t getterOffset,
@@ -4177,8 +4319,7 @@
   // TODO: support pre-tenuring.
   gc::InitialHeap heap = gc::DefaultHeap;
 
-  auto* createThis = MCreateThisWithTemplate::New(
-      alloc(), /* constraints = */ nullptr, templateConst, heap);
+  auto* createThis = MCreateThisWithTemplate::New(alloc(), templateConst, heap);
   add(createThis);
 
   callInfo_->thisArg()->setImplicitlyUsedUnchecked();
@@ -4186,11 +4327,6 @@
   return true;
 }
 
-bool WarpCacheIRTranspiler::emitTypeMonitorResult() {
-  MOZ_ASSERT(pushedResult_, "Didn't push result MDefinition");
-  return true;
-}
-
 bool WarpCacheIRTranspiler::emitReturnFromIC() { return true; }
 
 bool WarpCacheIRTranspiler::emitBailout() {
diff -Nru firefox-84.0.2+build1/js/src/jit/WarpOracle.cpp firefox-85.0+build1/js/src/jit/WarpOracle.cpp
--- firefox-84.0.2+build1/js/src/jit/WarpOracle.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/WarpOracle.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -28,6 +28,7 @@
 #include "vm/Instrumentation.h"
 #include "vm/Opcodes.h"
 
+#include "jit/InlineScriptTree-inl.h"
 #include "vm/BytecodeIterator-inl.h"
 #include "vm/BytecodeLocation-inl.h"
 #include "vm/EnvironmentObject-inl.h"
@@ -385,17 +386,6 @@
         break;
       }
 
-      case JSOp::NewArrayCopyOnWrite: {
-        MOZ_CRASH("Bug 1626854: COW arrays disabled without TI for now");
-
-        // Fix up the copy-on-write ArrayObject if needed.
-        jsbytecode* pc = loc.toRawBytecode();
-        if (!ObjectGroup::getOrFixupCopyOnWriteObject(cx_, script_, pc)) {
-          return abort(AbortReason::Error);
-        }
-        break;
-      }
-
       case JSOp::GetImport: {
         PropertyName* name = loc.getPropertyName(script_);
         if (!AddWarpGetImport(alloc_, opSnapshots, offset, script_, name)) {
@@ -411,9 +401,8 @@
           return abort(AbortReason::Disable, "asm.js module function lambda");
         }
 
-        // WarpBuilder relies on these conditions.
+        // WarpBuilder relies on this.
         MOZ_ASSERT(!fun->isSingleton());
-        MOZ_ASSERT(!ObjectGroup::useSingletonForClone(fun));
 
         if (!AddOpSnapshot<WarpLambda>(alloc_, opSnapshots, offset,
                                        fun->baseScript(), fun->flags(),
@@ -507,7 +496,6 @@
       }
 
       case JSOp::NewObject:
-      case JSOp::NewObjectWithGroup:
       case JSOp::NewInit: {
         const ICEntry& entry = getICEntry(loc);
         auto* stub = entry.fallbackStub()->toNewObject_Fallback();
@@ -537,10 +525,7 @@
       case JSOp::GetName:
       case JSOp::GetGName:
       case JSOp::GetProp:
-      case JSOp::CallProp:
-      case JSOp::Length:
       case JSOp::GetElem:
-      case JSOp::CallElem:
       case JSOp::SetProp:
       case JSOp::StrictSetProp:
       case JSOp::Call:
@@ -604,11 +589,6 @@
         MOZ_TRY(maybeInlineIC(opSnapshots, loc));
         break;
 
-      case JSOp::InitElemArray:
-        // WarpBuilder does not use an IC for this op.
-        // TODO(post-Warp): do the same in Baseline.
-        break;
-
       case JSOp::Nop:
       case JSOp::NopDestructuring:
       case JSOp::TryDestructuring:
@@ -660,11 +640,7 @@
       case JSOp::DynamicImport:
       case JSOp::Not:
       case JSOp::ToString:
-      case JSOp::DefVar:
-      case JSOp::DefLet:
-      case JSOp::DefConst:
-      case JSOp::DefFun:
-      case JSOp::CheckGlobalOrEvalDecl:
+      case JSOp::GlobalOrEvalDeclInstantiation:
       case JSOp::BindVar:
       case JSOp::MutateProto:
       case JSOp::Callee:
@@ -676,7 +652,6 @@
       case JSOp::SetAliasedVar:
       case JSOp::InitAliasedLexical:
       case JSOp::EnvCallee:
-      case JSOp::IterNext:
       case JSOp::MoreIter:
       case JSOp::EndIter:
       case JSOp::IsNoIter:
@@ -700,6 +675,7 @@
       case JSOp::InitHomeObject:
       case JSOp::SuperBase:
       case JSOp::SuperFun:
+      case JSOp::InitElemArray:
       case JSOp::InitPropGetter:
       case JSOp::InitPropSetter:
       case JSOp::InitHiddenPropGetter:
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/Assembler-x64.h firefox-85.0+build1/js/src/jit/x64/Assembler-x64.h
--- firefox-84.0.2+build1/js/src/jit/x64/Assembler-x64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/Assembler-x64.h	2021-01-18 19:58:13.000000000 +0000
@@ -810,6 +810,18 @@
   void shlq_cl(Register dest) { masm.shlq_CLr(dest.encoding()); }
   void shrq_cl(Register dest) { masm.shrq_CLr(dest.encoding()); }
   void sarq_cl(Register dest) { masm.sarq_CLr(dest.encoding()); }
+  void sarxq(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.sarxq_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
+  void shlxq(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.shlxq_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
+  void shrxq(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.shrxq_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
   void rolq(Imm32 imm, Register dest) {
     masm.rolq_ir(imm.value, dest.encoding());
   }
@@ -904,6 +916,12 @@
     masm.bsfq_rr(src.encoding(), dest.encoding());
   }
   void bswapq(const Register& reg) { masm.bswapq_r(reg.encoding()); }
+  void lzcntq(const Register& src, const Register& dest) {
+    masm.lzcntq_rr(src.encoding(), dest.encoding());
+  }
+  void tzcntq(const Register& src, const Register& dest) {
+    masm.tzcntq_rr(src.encoding(), dest.encoding());
+  }
   void popcntq(const Register& src, const Register& dest) {
     masm.popcntq_rr(src.encoding(), dest.encoding());
   }
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/BaseAssembler-x64.h firefox-85.0+build1/js/src/jit/x64/BaseAssembler-x64.h
--- firefox-84.0.2+build1/js/src/jit/x64/BaseAssembler-x64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/BaseAssembler-x64.h	2021-01-18 19:58:13.000000000 +0000
@@ -200,6 +200,18 @@
     m_formatter.twoByteOp64(OP2_BSF_GvEv, src, dst);
   }
 
+  void lzcntq_rr(RegisterID src, RegisterID dst) {
+    spew("lzcntq     %s, %s", GPReg64Name(src), GPReg64Name(dst));
+    m_formatter.legacySSEPrefix(VEX_SS);
+    m_formatter.twoByteOp64(OP2_LZCNT_GvEv, src, dst);
+  }
+
+  void tzcntq_rr(RegisterID src, RegisterID dst) {
+    spew("tzcntq     %s, %s", GPReg64Name(src), GPReg64Name(dst));
+    m_formatter.legacySSEPrefix(VEX_SS);
+    m_formatter.twoByteOp64(OP2_TZCNT_GvEv, src, dst);
+  }
+
   void popcntq_rr(RegisterID src, RegisterID dst) {
     spew("popcntq    %s, %s", GPReg64Name(src), GPReg64Name(dst));
     m_formatter.legacySSEPrefix(VEX_SS);
@@ -1121,6 +1133,73 @@
     return twoByteRipOpSimd("vpcmpgtd", VEX_PD, OP2_PCMPGTD_VdqWdq, invalid_xmm,
                             dst);
   }
+  MOZ_MUST_USE JmpSrc vcmpeqps_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmpps", VEX_PS, OP2_CMPPS_VpsWps,
+                               X86Encoding::ConditionCmp_EQ, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpneqps_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmpps", VEX_PS, OP2_CMPPS_VpsWps,
+                               X86Encoding::ConditionCmp_NEQ, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpltps_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmpps", VEX_PS, OP2_CMPPS_VpsWps,
+                               X86Encoding::ConditionCmp_LT, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpleps_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmpps", VEX_PS, OP2_CMPPS_VpsWps,
+                               X86Encoding::ConditionCmp_LE, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpeqpd_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd,
+                               X86Encoding::ConditionCmp_EQ, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpneqpd_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd,
+                               X86Encoding::ConditionCmp_NEQ, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmpltpd_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd,
+                               X86Encoding::ConditionCmp_LT, invalid_xmm, dst);
+  }
+  MOZ_MUST_USE JmpSrc vcmplepd_ripr(XMMRegisterID dst) {
+    return twoByteRipOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd,
+                               X86Encoding::ConditionCmp_LE, invalid_xmm, dst);
+  }
+
+  // BMI instructions:
+
+  void sarxq_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("sarxq      %s, %s, %s", GPReg64Name(src), GPReg64Name(shift),
+         GPReg64Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex64(VEX_SS /* = F3 */, OP3_SARX_GyEyBy, ESCAPE_38,
+                                 rm, src0, reg);
+  }
+
+  void shlxq_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("shlxq      %s, %s, %s", GPReg64Name(src), GPReg64Name(shift),
+         GPReg64Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex64(VEX_PD /* = 66 */, OP3_SHLX_GyEyBy, ESCAPE_38,
+                                 rm, src0, reg);
+  }
+
+  void shrxq_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("shrxq      %s, %s, %s", GPReg64Name(src), GPReg64Name(shift),
+         GPReg64Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex64(VEX_SD /* = F2 */, OP3_SHRX_GyEyBy, ESCAPE_38,
+                                 rm, src0, reg);
+  }
 
  private:
   MOZ_MUST_USE JmpSrc twoByteRipOpSimd(const char* name, VexOperandType ty,
@@ -1156,6 +1235,25 @@
     }
     return label;
   }
+
+  MOZ_MUST_USE JmpSrc twoByteRipOpImmSimd(const char* name, VexOperandType ty,
+                                          TwoByteOpcodeID opcode, uint32_t imm,
+                                          XMMRegisterID src0,
+                                          XMMRegisterID dst) {
+    MOZ_ASSERT(useLegacySSEEncoding(src0, dst));
+    m_formatter.legacySSEPrefix(ty);
+    m_formatter.twoByteRipOp(opcode, 0, dst);
+    m_formatter.immediate8u(imm);
+    JmpSrc label(m_formatter.size(), /* bytes trailing the patch field = */ 1);
+    if (IsXMMReversedOperands(opcode)) {
+      spew("%-11s$0x%x, %s, " MEM_o32r "", legacySSEOpName(name), imm,
+           XMMRegName(dst), ADDR_o32r(label.offset()));
+    } else {
+      spew("%-11s$0x%x, " MEM_o32r ", %s", legacySSEOpName(name), imm,
+           ADDR_o32r(label.offset()), XMMRegName(dst));
+    }
+    return label;
+  }
 
   void twoByteOpInt64Simd(const char* name, VexOperandType ty,
                           TwoByteOpcodeID opcode, RegisterID rm,
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/CodeGenerator-x64.cpp firefox-85.0+build1/js/src/jit/x64/CodeGenerator-x64.cpp
--- firefox-84.0.2+build1/js/src/jit/x64/CodeGenerator-x64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/CodeGenerator-x64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -422,7 +422,7 @@
   const MWasmLoad* mir = ins->mir();
 
   uint32_t offset = mir->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* ptr = ins->ptr();
   Operand srcAddr = ptr->isBogus()
@@ -446,7 +446,7 @@
   const wasm::MemoryAccessDesc& access = mir->access();
 
   uint32_t offset = access.offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* value = ins->getOperand(ins->ValueIndex);
   const LAllocation* ptr = ins->ptr();
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64.cpp firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64.cpp
--- firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -35,7 +35,7 @@
   // PC-relative addressing. Use "jump" label support code, because we need
   // the same PC-relative address patching that jumps use.
   JmpSrc j = masm.vmovsd_ripr(dest.encoding());
-  propagateOOM(dbl->uses.append(CodeOffset(j.offset())));
+  propagateOOM(dbl->uses.append(j));
 }
 
 void MacroAssemblerX64::loadConstantFloat32(float f, FloatRegister dest) {
@@ -48,7 +48,7 @@
   }
   // See comment in loadConstantDouble
   JmpSrc j = masm.vmovss_ripr(dest.encoding());
-  propagateOOM(flt->uses.append(CodeOffset(j.offset())));
+  propagateOOM(flt->uses.append(j));
 }
 
 void MacroAssemblerX64::vpRiprOpSimd128(
@@ -60,7 +60,7 @@
     return;
   }
   JmpSrc j = (masm.*op)(reg.encoding());
-  propagateOOM(val->uses.append(CodeOffset(j.offset())));
+  propagateOOM(val->uses.append(j));
 }
 
 void MacroAssemblerX64::loadConstantSimd128Int(const SimdConstant& v,
@@ -349,12 +349,51 @@
   vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vpcmpgtd_ripr);
 }
 
+void MacroAssemblerX64::vcmpeqpsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpeqps_ripr);
+}
+
+void MacroAssemblerX64::vcmpneqpsSimd128(const SimdConstant& v,
+                                         FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpneqps_ripr);
+}
+
+void MacroAssemblerX64::vcmpltpsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpltps_ripr);
+}
+
+void MacroAssemblerX64::vcmplepsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpleps_ripr);
+}
+
+void MacroAssemblerX64::vcmpeqpdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpeqpd_ripr);
+}
+
+void MacroAssemblerX64::vcmpneqpdSimd128(const SimdConstant& v,
+                                         FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpneqpd_ripr);
+}
+
+void MacroAssemblerX64::vcmpltpdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmpltpd_ripr);
+}
+
+void MacroAssemblerX64::vcmplepdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpRiprOpSimd128(v, src, &X86Encoding::BaseAssemblerX64::vcmplepd_ripr);
+}
+
 void MacroAssemblerX64::bindOffsets(
     const MacroAssemblerX86Shared::UsesVector& uses) {
-  for (CodeOffset use : uses) {
+  for (JmpSrc src : uses) {
     JmpDst dst(currentOffset());
-    JmpSrc src(use.offset());
-    // Using linkJump here is safe, as explaind in the comment in
+    // Using linkJump here is safe, as explained in the comment in
     // loadConstantDouble.
     masm.linkJump(src, dst);
   }
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64.h firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64.h
--- firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64.h	2021-01-18 19:58:13.000000000 +0000
@@ -987,6 +987,14 @@
   void vpcmpgtwSimd128(const SimdConstant& v, FloatRegister src);
   void vpcmpeqdSimd128(const SimdConstant& v, FloatRegister src);
   void vpcmpgtdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpeqpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpneqpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpltpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmplepsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpeqpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpneqpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpltpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmplepdSimd128(const SimdConstant& v, FloatRegister src);
 
   void loadWasmGlobalPtr(uint32_t globalDataOffset, Register dest) {
     loadPtr(Address(WasmTlsReg,
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64-inl.h firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64-inl.h
--- firefox-84.0.2+build1/js/src/jit/x64/MacroAssembler-x64-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/MacroAssembler-x64-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -289,6 +289,10 @@
 }
 
 void MacroAssembler::lshift64(Register shift, Register64 srcDest) {
+  if (Assembler::HasBMI2()) {
+    shlxq(srcDest.reg, shift, srcDest.reg);
+    return;
+  }
   MOZ_ASSERT(shift == rcx);
   shlq_cl(srcDest.reg);
 }
@@ -303,6 +307,10 @@
 }
 
 void MacroAssembler::rshift64(Register shift, Register64 srcDest) {
+  if (Assembler::HasBMI2()) {
+    shrxq(srcDest.reg, shift, srcDest.reg);
+    return;
+  }
   MOZ_ASSERT(shift == rcx);
   shrq_cl(srcDest.reg);
 }
@@ -318,6 +326,10 @@
 }
 
 void MacroAssembler::rshift64Arithmetic(Register shift, Register64 srcDest) {
+  if (Assembler::HasBMI2()) {
+    sarxq(srcDest.reg, shift, srcDest.reg);
+    return;
+  }
   MOZ_ASSERT(shift == rcx);
   sarq_cl(srcDest.reg);
 }
@@ -390,8 +402,10 @@
 // Bit counting functions
 
 void MacroAssembler::clz64(Register64 src, Register dest) {
-  // On very recent chips (Haswell and newer) there is actually an
-  // LZCNT instruction that does all of this.
+  if (AssemblerX86Shared::HasLZCNT()) {
+    lzcntq(src.reg, dest);
+    return;
+  }
 
   Label nonzero;
   bsrq(src.reg, dest);
@@ -402,6 +416,11 @@
 }
 
 void MacroAssembler::ctz64(Register64 src, Register dest) {
+  if (AssemblerX86Shared::HasBMI1()) {
+    tzcntq(src.reg, dest);
+    return;
+  }
+
   Label nonzero;
   bsfq(src.reg, dest);
   j(Assembler::NonZero, &nonzero);
diff -Nru firefox-84.0.2+build1/js/src/jit/x64/SharedICHelpers-x64.h firefox-85.0+build1/js/src/jit/x64/SharedICHelpers-x64.h
--- firefox-84.0.2+build1/js/src/jit/x64/SharedICHelpers-x64.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x64/SharedICHelpers-x64.h	2021-01-18 19:58:13.000000000 +0000
@@ -34,17 +34,6 @@
   *callOffset = CodeOffset(masm.currentOffset());
 }
 
-inline void EmitEnterTypeMonitorIC(
-    MacroAssembler& masm,
-    size_t monitorStubOffset = ICMonitoredStub::offsetOfFirstMonitorStub()) {
-  // This is expected to be called from within an IC, when ICStubReg
-  // is properly initialized to point to the stub.
-  masm.loadPtr(Address(ICStubReg, (int32_t)monitorStubOffset), ICStubReg);
-
-  // Jump to the stubcode.
-  masm.jmp(Operand(ICStubReg, (int32_t)ICStub::offsetOfStubCode()));
-}
-
 inline void EmitReturnFromIC(MacroAssembler& masm) { masm.ret(); }
 
 inline void EmitBaselineLeaveStubFrame(MacroAssembler& masm,
diff -Nru firefox-84.0.2+build1/js/src/jit/x86/CodeGenerator-x86.cpp firefox-85.0+build1/js/src/jit/x86/CodeGenerator-x86.cpp
--- firefox-84.0.2+build1/js/src/jit/x86/CodeGenerator-x86.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86/CodeGenerator-x86.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -248,7 +248,7 @@
   const MWasmLoad* mir = ins->mir();
 
   uint32_t offset = mir->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* ptr = ins->ptr();
   const LAllocation* memoryBase = ins->memoryBase();
@@ -280,7 +280,7 @@
   const MWasmStore* mir = ins->mir();
 
   uint32_t offset = mir->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* ptr = ins->ptr();
   const LAllocation* memoryBase = ins->memoryBase();
@@ -395,7 +395,7 @@
 
 void CodeGenerator::visitWasmAtomicLoadI64(LWasmAtomicLoadI64* ins) {
   uint32_t offset = ins->mir()->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* memoryBase = ins->memoryBase();
   const LAllocation* ptr = ins->ptr();
@@ -412,7 +412,7 @@
 
 void CodeGenerator::visitWasmCompareExchangeI64(LWasmCompareExchangeI64* ins) {
   uint32_t offset = ins->mir()->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* memoryBase = ins->memoryBase();
   const LAllocation* ptr = ins->ptr();
@@ -432,7 +432,7 @@
 template <typename T>
 void CodeGeneratorX86::emitWasmStoreOrExchangeAtomicI64(
     T* ins, const wasm::MemoryAccessDesc& access) {
-  MOZ_ASSERT(access.offset() < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(access.offset() < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* memoryBase = ins->memoryBase();
   const LAllocation* ptr = ins->ptr();
@@ -472,7 +472,7 @@
 
 void CodeGenerator::visitWasmAtomicBinopI64(LWasmAtomicBinopI64* ins) {
   uint32_t offset = ins->access().offset();
-  MOZ_ASSERT(offset < wasm::MaxOffsetGuardLimit);
+  MOZ_ASSERT(offset < masm.wasmMaxOffsetGuardLimit());
 
   const LAllocation* memoryBase = ins->memoryBase();
   const LAllocation* ptr = ins->ptr();
diff -Nru firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86.cpp firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86.cpp
--- firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -89,6 +89,20 @@
   propagateOOM(val->uses.append(CodeOffset(masm.size())));
 }
 
+void MacroAssemblerX86::vpPatchOpSimd128(
+    const SimdConstant& v, FloatRegister reg,
+    size_t (X86Encoding::BaseAssemblerX86::*op)(
+        const void* address, X86Encoding::XMMRegisterID srcId,
+        X86Encoding::XMMRegisterID destId)) {
+  SimdData* val = getSimdData(v);
+  if (!val) {
+    return;
+  }
+  size_t patchOffsetFromEnd =
+      (masm.*op)(nullptr, reg.encoding(), reg.encoding());
+  propagateOOM(val->uses.append(CodeOffset(masm.size() - patchOffsetFromEnd)));
+}
+
 void MacroAssemblerX86::vpaddbSimd128(const SimdConstant& v,
                                       FloatRegister srcDest) {
   vpPatchOpSimd128(v, srcDest, &X86Encoding::BaseAssemblerX86::vpaddb_mr);
@@ -359,6 +373,46 @@
   vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vpcmpgtd_mr);
 }
 
+void MacroAssemblerX86::vcmpeqpsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpeqps_mr);
+}
+
+void MacroAssemblerX86::vcmpneqpsSimd128(const SimdConstant& v,
+                                         FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpneqps_mr);
+}
+
+void MacroAssemblerX86::vcmpltpsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpltps_mr);
+}
+
+void MacroAssemblerX86::vcmplepsSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpleps_mr);
+}
+
+void MacroAssemblerX86::vcmpeqpdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpeqpd_mr);
+}
+
+void MacroAssemblerX86::vcmpneqpdSimd128(const SimdConstant& v,
+                                         FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpneqpd_mr);
+}
+
+void MacroAssemblerX86::vcmpltpdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmpltpd_mr);
+}
+
+void MacroAssemblerX86::vcmplepdSimd128(const SimdConstant& v,
+                                        FloatRegister src) {
+  vpPatchOpSimd128(v, src, &X86Encoding::BaseAssemblerX86::vcmplepd_mr);
+}
+
 void MacroAssemblerX86::finish() {
   // Last instruction may be an indirect jump so eagerly insert an undefined
   // instruction byte to prevent processors from decoding data values into
diff -Nru firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86.h firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86.h
--- firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86.h	2021-01-18 19:58:13.000000000 +0000
@@ -75,6 +75,12 @@
                             X86Encoding::XMMRegisterID srcId,
                             X86Encoding::XMMRegisterID destId));
 
+  void vpPatchOpSimd128(const SimdConstant& v, FloatRegister reg,
+                        size_t (X86Encoding::BaseAssemblerX86::*op)(
+                            const void* address,
+                            X86Encoding::XMMRegisterID srcId,
+                            X86Encoding::XMMRegisterID destId));
+
  public:
   using MacroAssemblerX86Shared::call;
   using MacroAssemblerX86Shared::load32;
@@ -935,6 +941,14 @@
   void vpcmpgtwSimd128(const SimdConstant& v, FloatRegister src);
   void vpcmpeqdSimd128(const SimdConstant& v, FloatRegister src);
   void vpcmpgtdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpeqpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpneqpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpltpsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmplepsSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpeqpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpneqpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmpltpdSimd128(const SimdConstant& v, FloatRegister src);
+  void vcmplepdSimd128(const SimdConstant& v, FloatRegister src);
 
   Condition testInt32Truthy(bool truthy, const ValueOperand& operand) {
     test32(operand.payloadReg(), operand.payloadReg());
diff -Nru firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86-inl.h firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86-inl.h
--- firefox-84.0.2+build1/js/src/jit/x86/MacroAssembler-x86-inl.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86/MacroAssembler-x86-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -547,6 +547,27 @@
 // Bit counting functions
 
 void MacroAssembler::clz64(Register64 src, Register dest) {
+  if (AssemblerX86Shared::HasLZCNT()) {
+    Label nonzero, zero;
+
+    testl(src.high, src.high);
+    j(Assembler::Zero, &zero);
+
+    lzcntl(src.high, dest);
+    jump(&nonzero);
+
+    bind(&zero);
+    lzcntl(src.low, dest);
+    addl(Imm32(32), dest);
+
+    bind(&nonzero);
+    return;
+  }
+
+  // Because |dest| may be equal to |src.low|, we rely on BSR not modifying its
+  // output when the input is zero. AMD ISA documents BSR not modifying the
+  // output and current Intel CPUs follow AMD.
+
   Label nonzero, zero;
 
   bsrl(src.high, dest);
@@ -564,6 +585,27 @@
 }
 
 void MacroAssembler::ctz64(Register64 src, Register dest) {
+  if (AssemblerX86Shared::HasBMI1()) {
+    Label nonzero, zero;
+
+    testl(src.low, src.low);
+    j(Assembler::Zero, &zero);
+
+    tzcntl(src.low, dest);
+    jump(&nonzero);
+
+    bind(&zero);
+    tzcntl(src.high, dest);
+    addl(Imm32(32), dest);
+
+    bind(&nonzero);
+    return;
+  }
+
+  // Because |dest| may be equal to |src.low|, we rely on BSF not modifying its
+  // output when the input is zero. AMD ISA documents BSF not modifying the
+  // output and current Intel CPUs follow AMD.
+
   Label done, nonzero;
 
   bsfl(src.low, dest);
diff -Nru firefox-84.0.2+build1/js/src/jit/x86/SharedICHelpers-x86.h firefox-85.0+build1/js/src/jit/x86/SharedICHelpers-x86.h
--- firefox-84.0.2+build1/js/src/jit/x86/SharedICHelpers-x86.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86/SharedICHelpers-x86.h	2021-01-18 19:58:13.000000000 +0000
@@ -34,17 +34,6 @@
   *callOffset = CodeOffset(masm.currentOffset());
 }
 
-inline void EmitEnterTypeMonitorIC(
-    MacroAssembler& masm,
-    size_t monitorStubOffset = ICMonitoredStub::offsetOfFirstMonitorStub()) {
-  // This is expected to be called from within an IC, when ICStubReg
-  // is properly initialized to point to the stub.
-  masm.loadPtr(Address(ICStubReg, (int32_t)monitorStubOffset), ICStubReg);
-
-  // Jump to the stubcode.
-  masm.jmp(Operand(ICStubReg, (int32_t)ICStub::offsetOfStubCode()));
-}
-
 inline void EmitReturnFromIC(MacroAssembler& masm) { masm.ret(); }
 
 inline void EmitBaselineLeaveStubFrame(MacroAssembler& masm,
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/Assembler-x86-shared.cpp firefox-85.0+build1/js/src/jit/x86-shared/Assembler-x86-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/x86-shared/Assembler-x86-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/Assembler-x86-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -244,7 +244,6 @@
 bool CPUInfo::bmi1Present = false;
 bool CPUInfo::bmi2Present = false;
 bool CPUInfo::lzcntPresent = false;
-bool CPUInfo::needAmdBugWorkaround = false;
 
 static uintptr_t ReadXGETBV() {
   // We use a variety of low-level mechanisms to get at the xgetbv
@@ -354,13 +353,6 @@
   static constexpr int POPCNTBit = 1 << 23;
   popcntPresent = (flagsEcx & POPCNTBit);
 
-  // Check if we need to work around an AMD CPU bug (see bug 1281759).
-  // We check for family 20 models 0-2. Intel doesn't use family 20 at
-  // this point, so this should only match AMD CPUs.
-  unsigned family = ((flagsEax >> 20) & 0xff) + ((flagsEax >> 8) & 0xf);
-  unsigned model = (((flagsEax >> 16) & 0xf) << 4) + ((flagsEax >> 4) & 0xf);
-  needAmdBugWorkaround = (family == 20 && model <= 2);
-
   flagsEax = 0x80000001;
   ReadCPUInfo(&flagsEax, &flagsEbx, &flagsEcx, &flagsEdx);
 
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/Assembler-x86-shared.h firefox-85.0+build1/js/src/jit/x86-shared/Assembler-x86-shared.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/Assembler-x86-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/Assembler-x86-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -207,7 +207,6 @@
   static bool bmi1Present;
   static bool bmi2Present;
   static bool lzcntPresent;
-  static bool needAmdBugWorkaround;
 
   static void SetSSEVersion();
 
@@ -221,7 +220,6 @@
     avxPresent = false;
     avxEnabled = false;
     popcntPresent = false;
-    needAmdBugWorkaround = false;
   }
 
  public:
@@ -240,7 +238,6 @@
   static bool IsBMI1Present() { return bmi1Present; }
   static bool IsBMI2Present() { return bmi2Present; }
   static bool IsLZCNTPresent() { return lzcntPresent; }
-  static bool NeedAmdBugWorkaround() { return needAmdBugWorkaround; }
 
   static void SetSSE3Disabled() {
     reset();
@@ -1653,6 +1650,12 @@
     masm.bsfl_rr(src.encoding(), dest.encoding());
   }
   void bswapl(Register reg) { masm.bswapl_r(reg.encoding()); }
+  void lzcntl(const Register& src, const Register& dest) {
+    masm.lzcntl_rr(src.encoding(), dest.encoding());
+  }
+  void tzcntl(const Register& src, const Register& dest) {
+    masm.tzcntl_rr(src.encoding(), dest.encoding());
+  }
   void popcntl(const Register& src, const Register& dest) {
     masm.popcntl_rr(src.encoding(), dest.encoding());
   }
@@ -1728,6 +1731,19 @@
     masm.shldl_CLr(src.encoding(), dest.encoding());
   }
 
+  void sarxl(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.sarxl_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
+  void shlxl(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.shlxl_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
+  void shrxl(Register src, Register shift, Register dest) {
+    MOZ_ASSERT(HasBMI2());
+    masm.shrxl_rrr(src.encoding(), shift.encoding(), dest.encoding());
+  }
+
   void roll(const Imm32 imm, Register dest) {
     masm.roll_ir(imm.value, dest.encoding());
   }
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/BaseAssembler-x86-shared.h firefox-85.0+build1/js/src/jit/x86-shared/BaseAssembler-x86-shared.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/BaseAssembler-x86-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/BaseAssembler-x86-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -1581,6 +1581,18 @@
     m_formatter.twoByteOp(OP2_BSF_GvEv, src, dst);
   }
 
+  void lzcntl_rr(RegisterID src, RegisterID dst) {
+    spew("lzcntl     %s, %s", GPReg32Name(src), GPReg32Name(dst));
+    m_formatter.legacySSEPrefix(VEX_SS);
+    m_formatter.twoByteOp(OP2_LZCNT_GvEv, src, dst);
+  }
+
+  void tzcntl_rr(RegisterID src, RegisterID dst) {
+    spew("tzcntl     %s, %s", GPReg32Name(src), GPReg32Name(dst));
+    m_formatter.legacySSEPrefix(VEX_SS);
+    m_formatter.twoByteOp(OP2_TZCNT_GvEv, src, dst);
+  }
+
   void popcntl_rr(RegisterID src, RegisterID dst) {
     spew("popcntl    %s, %s", GPReg32Name(src), GPReg32Name(dst));
     m_formatter.legacySSEPrefix(VEX_SS);
@@ -2666,11 +2678,64 @@
     twoByteOpImmSimd("vcmpps", VEX_PS, OP2_CMPPS_VpsWps, order, address, src0,
                      dst);
   }
+
+  static constexpr size_t CMPPS_MR_PATCH_OFFSET = 1;
+
+  size_t vcmpeqps_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmpps_mr(X86Encoding::ConditionCmp_EQ, address, src0, dst);
+    return CMPPS_MR_PATCH_OFFSET;
+  }
+  size_t vcmpneqps_mr(const void* address, XMMRegisterID src0,
+                      XMMRegisterID dst) {
+    vcmpps_mr(X86Encoding::ConditionCmp_NEQ, address, src0, dst);
+    return CMPPS_MR_PATCH_OFFSET;
+  }
+  size_t vcmpltps_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmpps_mr(X86Encoding::ConditionCmp_LT, address, src0, dst);
+    return CMPPS_MR_PATCH_OFFSET;
+  }
+  size_t vcmpleps_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmpps_mr(X86Encoding::ConditionCmp_LE, address, src0, dst);
+    return CMPPS_MR_PATCH_OFFSET;
+  }
+
   void vcmppd_rr(uint8_t order, XMMRegisterID src1, XMMRegisterID src0,
                  XMMRegisterID dst) {
     twoByteOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd, order, src1, src0,
                      dst);
   }
+  void vcmppd_mr(uint8_t order, const void* address, XMMRegisterID src0,
+                 XMMRegisterID dst) {
+    twoByteOpImmSimd("vcmppd", VEX_PD, OP2_CMPPD_VpdWpd, order, address, src0,
+                     dst);
+  }
+
+  static constexpr size_t CMPPD_MR_PATCH_OFFSET = 1;
+
+  size_t vcmpeqpd_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmppd_mr(X86Encoding::ConditionCmp_EQ, address, src0, dst);
+    return CMPPD_MR_PATCH_OFFSET;
+  }
+  size_t vcmpneqpd_mr(const void* address, XMMRegisterID src0,
+                      XMMRegisterID dst) {
+    vcmppd_mr(X86Encoding::ConditionCmp_NEQ, address, src0, dst);
+    return CMPPD_MR_PATCH_OFFSET;
+  }
+  size_t vcmpltpd_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmppd_mr(X86Encoding::ConditionCmp_LT, address, src0, dst);
+    return CMPPD_MR_PATCH_OFFSET;
+  }
+  size_t vcmplepd_mr(const void* address, XMMRegisterID src0,
+                     XMMRegisterID dst) {
+    vcmppd_mr(X86Encoding::ConditionCmp_LE, address, src0, dst);
+    return CMPPD_MR_PATCH_OFFSET;
+  }
+
   void vrcpps_rr(XMMRegisterID src, XMMRegisterID dst) {
     twoByteOpSimd("vrcpps", VEX_PS, OP2_RCPPS_VpsWps, src, invalid_xmm, dst);
   }
@@ -3933,6 +3998,41 @@
     twoByteOpSimd("vpsubq", VEX_PD, OP2_PSUBQ_VdqWdq, src1, src0, dst);
   }
 
+  // BMI instructions:
+
+  void sarxl_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("sarxl      %s, %s, %s", GPReg32Name(src), GPReg32Name(shift),
+         GPReg32Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex(VEX_SS /* = F3 */, OP3_SARX_GyEyBy, ESCAPE_38,
+                               rm, src0, reg);
+  }
+
+  void shlxl_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("shlxl      %s, %s, %s", GPReg32Name(src), GPReg32Name(shift),
+         GPReg32Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex(VEX_PD /* = 66 */, OP3_SHLX_GyEyBy, ESCAPE_38,
+                               rm, src0, reg);
+  }
+
+  void shrxl_rrr(RegisterID src, RegisterID shift, RegisterID dst) {
+    spew("shrxl      %s, %s, %s", GPReg32Name(src), GPReg32Name(shift),
+         GPReg32Name(dst));
+
+    RegisterID rm = src;
+    XMMRegisterID src0 = static_cast<XMMRegisterID>(shift);
+    int reg = dst;
+    m_formatter.threeByteOpVex(VEX_SD /* = F2 */, OP3_SHRX_GyEyBy, ESCAPE_38,
+                               rm, src0, reg);
+  }
+
   // Misc instructions:
 
   void int3() {
@@ -4045,6 +4145,7 @@
     }
 
     assertValidJmpSrc(from);
+    MOZ_ASSERT(from.trailing() == 0);
 
     const unsigned char* code = m_formatter.data();
     int32_t offset = GetInt32(code + from.offset());
@@ -4091,6 +4192,7 @@
     }
 
     assertValidJmpSrc(from);
+    MOZ_ASSERT(from.trailing() == 0);
     MOZ_RELEASE_ASSERT(to.offset() == -1 || size_t(to.offset()) <= size());
 
     unsigned char* code = m_formatter.data();
@@ -4112,7 +4214,7 @@
 
     spew(".set .Lfrom%d, .Llabel%d", from.offset(), to.offset());
     unsigned char* code = m_formatter.data();
-    SetRel32(code + from.offset(), code + to.offset());
+    SetRel32(code + from.offset(), code + to.offset(), from.trailing());
   }
 
   void executableCopy(void* dst) {
@@ -5282,6 +5384,25 @@
       m_buffer.putByteUnchecked(opcode);
       registerModRM(rm, reg);
     }
+
+    void threeByteOpVex64(VexOperandType ty, ThreeByteOpcodeID opcode,
+                          ThreeByteEscape escape, RegisterID rm,
+                          XMMRegisterID src0, int reg) {
+      int r = (reg >> 3), x = 0, b = (rm >> 3);
+      int m = 0, w = 1, v = src0, l = 0;
+      switch (escape) {
+        case ESCAPE_38:
+          m = 2;
+          break;
+        case ESCAPE_3A:
+          m = 3;
+          break;
+        default:
+          MOZ_CRASH("unexpected escape");
+      }
+      threeOpVex(ty, r, x, b, m, w, v, l, opcode);
+      registerModRM(rm, reg);
+    }
 #endif
 
     // Byte-operands:
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp firefox-85.0+build1/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -16,6 +16,7 @@
 #include "jit/JitRuntime.h"
 #include "jit/RangeAnalysis.h"
 #include "js/ScalarType.h"  // js::Scalar::Type
+#include "util/DifferentialTesting.h"
 #include "vm/TraceLogging.h"
 
 #include "jit/MacroAssembler-inl.h"
@@ -1667,17 +1668,17 @@
     switch (ins->bitop()) {
       case JSOp::Lsh:
         if (shift) {
-          masm.shll(Imm32(shift), lhs);
+          masm.lshift32(Imm32(shift), lhs);
         }
         break;
       case JSOp::Rsh:
         if (shift) {
-          masm.sarl(Imm32(shift), lhs);
+          masm.rshift32Arithmetic(Imm32(shift), lhs);
         }
         break;
       case JSOp::Ursh:
         if (shift) {
-          masm.shrl(Imm32(shift), lhs);
+          masm.rshift32(Imm32(shift), lhs);
         } else if (ins->mir()->toUrsh()->fallible()) {
           // x >>> 0 can overflow.
           masm.test32(lhs, lhs);
@@ -1688,16 +1689,16 @@
         MOZ_CRASH("Unexpected shift op");
     }
   } else {
-    MOZ_ASSERT(ToRegister(rhs) == ecx);
+    Register shift = ToRegister(rhs);
     switch (ins->bitop()) {
       case JSOp::Lsh:
-        masm.shll_cl(lhs);
+        masm.lshift32(shift, lhs);
         break;
       case JSOp::Rsh:
-        masm.sarl_cl(lhs);
+        masm.rshift32Arithmetic(shift, lhs);
         break;
       case JSOp::Ursh:
-        masm.shrl_cl(lhs);
+        masm.rshift32(shift, lhs);
         if (ins->mir()->toUrsh()->fallible()) {
           // x >>> 0 can overflow.
           masm.test32(lhs, lhs);
@@ -1740,16 +1741,19 @@
     return;
   }
 
-  MOZ_ASSERT(ToRegister(rhs) == ecx);
+  Register shift = ToRegister(rhs);
+#ifdef JS_CODEGEN_X86
+  MOZ_ASSERT(shift == ecx);
+#endif
   switch (lir->bitop()) {
     case JSOp::Lsh:
-      masm.lshift64(ecx, ToRegister64(lhs));
+      masm.lshift64(shift, ToRegister64(lhs));
       break;
     case JSOp::Rsh:
-      masm.rshift64Arithmetic(ecx, ToRegister64(lhs));
+      masm.rshift64Arithmetic(shift, ToRegister64(lhs));
       break;
     case JSOp::Ursh:
-      masm.rshift64(ecx, ToRegister64(lhs));
+      masm.rshift64(shift, ToRegister64(lhs));
       break;
     default:
       MOZ_CRASH("Unexpected shift op");
@@ -1769,8 +1773,8 @@
       masm.shrl(Imm32(shift), lhs);
     }
   } else {
-    MOZ_ASSERT(ToRegister(rhs) == ecx);
-    masm.shrl_cl(lhs);
+    Register shift = ToRegister(rhs);
+    masm.rshift32(shift, lhs);
   }
 
   masm.convertUInt32ToDouble(lhs, out);
@@ -2149,7 +2153,11 @@
 
 void CodeGeneratorX86Shared::canonicalizeIfDeterministic(
     Scalar::Type type, const LAllocation* value) {
-#ifdef JS_MORE_DETERMINISTIC
+#ifdef DEBUG
+  if (!js::SupportDifferentialTesting()) {
+    return;
+  }
+
   switch (type) {
     case Scalar::Float32: {
       FloatRegister in = ToFloatRegister(value);
@@ -2166,7 +2174,7 @@
       break;
     }
   }
-#endif  // JS_MORE_DETERMINISTIC
+#endif  // DEBUG
 }
 
 void CodeGenerator::visitCopySignF(LCopySignF* lir) {
@@ -2543,15 +2551,9 @@
     case wasm::SimdOp::F32x4Lt:
       masm.compareFloat32x4(Assembler::LessThan, rhs, lhsDest);
       break;
-    case wasm::SimdOp::F32x4Gt:
-      masm.compareFloat32x4(Assembler::GreaterThan, rhs, lhsDest);
-      break;
     case wasm::SimdOp::F32x4Le:
       masm.compareFloat32x4(Assembler::LessThanOrEqual, rhs, lhsDest);
       break;
-    case wasm::SimdOp::F32x4Ge:
-      masm.compareFloat32x4(Assembler::GreaterThanOrEqual, rhs, lhsDest);
-      break;
     case wasm::SimdOp::F64x2Eq:
       masm.compareFloat64x2(Assembler::Equal, rhs, lhsDest);
       break;
@@ -2561,15 +2563,9 @@
     case wasm::SimdOp::F64x2Lt:
       masm.compareFloat64x2(Assembler::LessThan, rhs, lhsDest);
       break;
-    case wasm::SimdOp::F64x2Gt:
-      masm.compareFloat64x2(Assembler::GreaterThan, rhs, lhsDest);
-      break;
     case wasm::SimdOp::F64x2Le:
       masm.compareFloat64x2(Assembler::LessThanOrEqual, rhs, lhsDest);
       break;
-    case wasm::SimdOp::F64x2Ge:
-      masm.compareFloat64x2(Assembler::GreaterThanOrEqual, rhs, lhsDest);
-      break;
     case wasm::SimdOp::F32x4PMax:
       // `lhsDest` is actually rhsDest, and `rhs` is actually lhs
       masm.pseudoMaxFloat32x4(lhsDest, rhs);
@@ -2741,6 +2737,30 @@
     case wasm::SimdOp::I32x4LeS:
       masm.compareInt32x4(Assembler::LessThanOrEqual, rhs, lhsDest);
       break;
+    case wasm::SimdOp::F32x4Eq:
+      masm.compareFloat32x4(Assembler::Equal, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F32x4Ne:
+      masm.compareFloat32x4(Assembler::NotEqual, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F32x4Lt:
+      masm.compareFloat32x4(Assembler::LessThan, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F32x4Le:
+      masm.compareFloat32x4(Assembler::LessThanOrEqual, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F64x2Eq:
+      masm.compareFloat64x2(Assembler::Equal, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F64x2Ne:
+      masm.compareFloat64x2(Assembler::NotEqual, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F64x2Lt:
+      masm.compareFloat64x2(Assembler::LessThan, rhs, lhsDest);
+      break;
+    case wasm::SimdOp::F64x2Le:
+      masm.compareFloat64x2(Assembler::LessThanOrEqual, rhs, lhsDest);
+      break;
     case wasm::SimdOp::I32x4DotSI16x8:
       masm.widenDotInt16x8(rhs, lhsDest);
       break;
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/Encoding-x86-shared.h firefox-85.0+build1/js/src/jit/x86-shared/Encoding-x86-shared.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/Encoding-x86-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/Encoding-x86-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -22,6 +22,7 @@
 // Operand size/types as listed in the Appendix A.2.  Tables of the instructions
 // and their operands can be found in the Appendix A.3.
 //
+// B = reg (VEX.vvvv of VEX prefix)
 // E = reg/mem
 // G = reg (reg field of ModR/M)
 // U = xmm (R/M field of ModR/M)
@@ -39,6 +40,7 @@
 // ps = packed float 32 (xmm)
 // sd = scalar double (xmm)
 // pd = packed double (xmm)
+// y = 32/64-bit
 // z = 16/32/64-bit
 // vqp = (*)
 //
@@ -269,7 +271,9 @@
   OP2_CMPXCHG_GvEw = 0xB1,
   OP2_POPCNT_GvEv = 0xB8,
   OP2_BSF_GvEv = 0xBC,
+  OP2_TZCNT_GvEv = 0xBC,
   OP2_BSR_GvEv = 0xBD,
+  OP2_LZCNT_GvEv = 0xBD,
   OP2_MOVSX_GvEb = 0xBE,
   OP2_MOVSX_GvEw = 0xBF,
   OP2_MOVZX_GvEb = 0xB6,
@@ -363,7 +367,10 @@
   OP3_PMAXUW_VdqWdq = 0x3E,
   OP3_PMAXUD_VdqWdq = 0x3F,
   OP3_PMULLD_VdqWdq = 0x40,
-  OP3_VBLENDVPS_VdqWdq = 0x4A
+  OP3_VBLENDVPS_VdqWdq = 0x4A,
+  OP3_SHLX_GyEyBy = 0xF7,
+  OP3_SARX_GyEyBy = 0xF7,
+  OP3_SHRX_GyEyBy = 0xF7,
 };
 
 // Test whether the given opcode should be printed with its operands reversed.
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/Lowering-x86-shared.cpp firefox-85.0+build1/js/src/jit/x86-shared/Lowering-x86-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/x86-shared/Lowering-x86-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/Lowering-x86-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -46,10 +46,12 @@
                                           MDefinition* rhs) {
   ins->setOperand(0, useRegisterAtStart(lhs));
 
-  // shift operator should be constant or in register ecx
-  // x86 can't shift a non-ecx register
+  // Shift operand should be constant or, unless BMI2 is available, in register
+  // ecx. x86 can't shift a non-ecx register.
   if (rhs->isConstant()) {
     ins->setOperand(1, useOrConstantAtStart(rhs));
+  } else if (Assembler::HasBMI2() && !mir->isRotate()) {
+    ins->setOperand(1, lhs != rhs ? useRegister(rhs) : useRegisterAtStart(rhs));
   } else {
     ins->setOperand(
         1, lhs != rhs ? useFixed(rhs, ecx) : useFixedAtStart(rhs, ecx));
@@ -74,10 +76,14 @@
   static_assert(LRotateI64::Count == INT64_PIECES,
                 "Assume Count is located at INT64_PIECES.");
 
-  // shift operator should be constant or in register ecx
-  // x86 can't shift a non-ecx register
+  // Shift operand should be constant or, unless BMI2 is available, in register
+  // ecx. x86 can't shift a non-ecx register.
   if (rhs->isConstant()) {
     ins->setOperand(INT64_PIECES, useOrConstantAtStart(rhs));
+#ifdef JS_CODEGEN_X64
+  } else if (Assembler::HasBMI2() && !mir->isRotate()) {
+    ins->setOperand(INT64_PIECES, useRegister(rhs));
+#endif
   } else {
     // The operands are int64, but we only care about the lower 32 bits of
     // the RHS. On 32-bit, the code below will load that part in ecx and
@@ -154,7 +160,7 @@
       useRegisterAtStart(lhs),
       lhs != rhs ? useOrConstant(rhs) : useOrConstantAtStart(rhs), lhsCopy);
   if (mul->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mul->bailoutKind());
   }
   defineReuseInput(lir, mul, 0);
 }
@@ -190,7 +196,7 @@
             LDivPowTwoI(lhs, useRegister(div->lhs()), shift, rhs < 0);
       }
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       defineReuseInput(lir, div, 0);
       return;
@@ -200,7 +206,7 @@
       lir = new (alloc())
           LDivOrModConstantI(useRegister(div->lhs()), rhs, tempFixed(eax));
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       defineFixed(lir, div, LAllocation(AnyRegister(edx)));
       return;
@@ -210,7 +216,7 @@
   LDivI* lir = new (alloc())
       LDivI(useRegister(div->lhs()), useRegister(div->rhs()), tempFixed(edx));
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
   defineFixed(lir, div, LAllocation(AnyRegister(eax)));
 }
@@ -228,7 +234,7 @@
       LModPowTwoI* lir =
           new (alloc()) LModPowTwoI(useRegisterAtStart(mod->lhs()), shift);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       defineReuseInput(lir, mod, 0);
       return;
@@ -238,7 +244,7 @@
       lir = new (alloc())
           LDivOrModConstantI(useRegister(mod->lhs()), rhs, tempFixed(edx));
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       defineFixed(lir, mod, LAllocation(AnyRegister(eax)));
       return;
@@ -248,7 +254,7 @@
   LModI* lir = new (alloc())
       LModI(useRegister(mod->lhs()), useRegister(mod->rhs()), tempFixed(eax));
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
   defineFixed(lir, mod, LAllocation(AnyRegister(edx)));
 }
@@ -366,14 +372,14 @@
     if (rhs != 0 && uint32_t(1) << shift == rhs) {
       LDivPowTwoI* lir = new (alloc()) LDivPowTwoI(lhs, lhs, shift, false);
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       defineReuseInput(lir, div, 0);
     } else {
       LUDivOrModConstant* lir = new (alloc())
           LUDivOrModConstant(useRegister(div->lhs()), rhs, tempFixed(eax));
       if (div->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, div->bailoutKind());
       }
       defineFixed(lir, div, LAllocation(AnyRegister(edx)));
     }
@@ -383,7 +389,7 @@
   LUDivOrMod* lir = new (alloc()) LUDivOrMod(
       useRegister(div->lhs()), useRegister(div->rhs()), tempFixed(edx));
   if (div->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, div->bailoutKind());
   }
   defineFixed(lir, div, LAllocation(AnyRegister(eax)));
 }
@@ -397,14 +403,14 @@
       LModPowTwoI* lir =
           new (alloc()) LModPowTwoI(useRegisterAtStart(mod->lhs()), shift);
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       defineReuseInput(lir, mod, 0);
     } else {
       LUDivOrModConstant* lir = new (alloc())
           LUDivOrModConstant(useRegister(mod->lhs()), rhs, tempFixed(edx));
       if (mod->fallible()) {
-        assignSnapshot(lir, BailoutKind::DoubleOutput);
+        assignSnapshot(lir, mod->bailoutKind());
       }
       defineFixed(lir, mod, LAllocation(AnyRegister(eax)));
     }
@@ -414,7 +420,7 @@
   LUDivOrMod* lir = new (alloc()) LUDivOrMod(
       useRegister(mod->lhs()), useRegister(mod->rhs()), tempFixed(eax));
   if (mod->fallible()) {
-    assignSnapshot(lir, BailoutKind::DoubleOutput);
+    assignSnapshot(lir, mod->bailoutKind());
   }
   defineFixed(lir, mod, LAllocation(AnyRegister(edx)));
 }
@@ -428,12 +434,19 @@
   MOZ_ASSERT(mir->type() == MIRType::Double);
 
 #ifdef JS_CODEGEN_X64
-  MOZ_ASSERT(ecx == rcx);
+  static_assert(ecx == rcx);
 #endif
 
+  // Without BMI2, x86 can only shift by ecx.
   LUse lhsUse = useRegisterAtStart(lhs);
-  LAllocation rhsAlloc =
-      rhs->isConstant() ? useOrConstant(rhs) : useFixed(rhs, ecx);
+  LAllocation rhsAlloc;
+  if (rhs->isConstant()) {
+    rhsAlloc = useOrConstant(rhs);
+  } else if (Assembler::HasBMI2()) {
+    rhsAlloc = useRegister(rhs);
+  } else {
+    rhsAlloc = useFixed(rhs, ecx);
+  }
 
   LUrshD* lir = new (alloc()) LUrshD(lhsUse, rhsAlloc, tempCopy(lhs, 0));
   define(lir, mir);
@@ -443,10 +456,12 @@
   int32_t base = mir->input()->toConstant()->toInt32();
   MDefinition* power = mir->power();
 
-  // shift operator should be in register ecx;
+  // Shift operand should be in register ecx, unless BMI2 is available.
   // x86 can't shift a non-ecx register.
-  auto* lir = new (alloc()) LPowOfTwoI(base, useFixed(power, ecx));
-  assignSnapshot(lir, BailoutKind::PrecisionLoss);
+  LAllocation powerAlloc =
+      Assembler::HasBMI2() ? useRegister(power) : useFixed(power, ecx);
+  auto* lir = new (alloc()) LPowOfTwoI(base, powerAlloc);
+  assignSnapshot(lir, mir->bailoutKind());
   define(lir, mir);
 }
 
@@ -954,6 +969,14 @@
     case wasm::SimdOp::I32x4Ne:
     case wasm::SimdOp::I32x4GtS:
     case wasm::SimdOp::I32x4LeS:
+    case wasm::SimdOp::F32x4Eq:
+    case wasm::SimdOp::F32x4Ne:
+    case wasm::SimdOp::F32x4Lt:
+    case wasm::SimdOp::F32x4Le:
+    case wasm::SimdOp::F64x2Eq:
+    case wasm::SimdOp::F64x2Ne:
+    case wasm::SimdOp::F64x2Lt:
+    case wasm::SimdOp::F64x2Le:
     case wasm::SimdOp::I32x4DotSI16x8:
     case wasm::SimdOp::F32x4Add:
     case wasm::SimdOp::F64x2Add:
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp
--- firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -169,6 +169,18 @@
   }
 }
 
+void MacroAssemblerX86Shared::binarySimd128(
+    const SimdConstant& rhs, FloatRegister lhs,
+    void (MacroAssembler::*regOp)(const Operand&, FloatRegister),
+    void (MacroAssembler::*constOp)(const SimdConstant&, FloatRegister)) {
+  ScratchSimd128Scope scratch(asMasm());
+  if (maybeInlineSimd128Int(rhs, scratch)) {
+    (asMasm().*regOp)(Operand(scratch), lhs);
+  } else {
+    (asMasm().*constOp)(rhs, lhs);
+  }
+}
+
 void MacroAssemblerX86Shared::bitwiseTestSimd128(const SimdConstant& rhs,
                                                  FloatRegister lhs) {
   ScratchSimd128Scope scratch(asMasm());
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.h firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -27,7 +27,14 @@
   const MacroAssembler& asMasm() const;
 
  public:
-  typedef Vector<CodeOffset, 0, SystemAllocPolicy> UsesVector;
+#ifdef JS_CODEGEN_X64
+  typedef X86Encoding::JmpSrc UsesItem;
+#else
+  typedef CodeOffset UsesItem;
+#endif
+
+  typedef Vector<UsesItem, 0, SystemAllocPolicy> UsesVector;
+  static_assert(sizeof(UsesItem) == 4);
 
  protected:
   // For Double, Float and SimdData, make the move ctors explicit so that MSVC
@@ -390,6 +397,12 @@
                                                    FloatRegister),
                      void (MacroAssembler::*constOp)(const SimdConstant&,
                                                      FloatRegister));
+  void binarySimd128(const SimdConstant& rhs, FloatRegister lhsDest,
+                     void (MacroAssembler::*regOp)(const Operand&,
+                                                   FloatRegister),
+                     void (MacroAssembler::*constOp)(const SimdConstant&,
+                                                     FloatRegister));
+
   // SIMD methods, defined in MacroAssembler-x86-shared-SIMD.cpp.
 
   void unsignedConvertInt32x4ToFloat32x4(FloatRegister src, FloatRegister dest);
@@ -450,8 +463,12 @@
                               FloatRegister tmp1, FloatRegister tmp2);
   void compareFloat32x4(FloatRegister lhs, Operand rhs,
                         Assembler::Condition cond, FloatRegister output);
+  void compareFloat32x4(Assembler::Condition cond, const SimdConstant& rhs,
+                        FloatRegister lhsDest);
   void compareFloat64x2(FloatRegister lhs, Operand rhs,
                         Assembler::Condition cond, FloatRegister output);
+  void compareFloat64x2(Assembler::Condition cond, const SimdConstant& rhs,
+                        FloatRegister lhsDest);
 
   void minMaxFloat32x4(bool isMin, FloatRegister lhs, Operand rhs,
                        FloatRegister temp1, FloatRegister temp2,
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h	2021-01-06 11:23:11.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h	2021-01-18 19:58:13.000000000 +0000
@@ -66,8 +66,10 @@
 void MacroAssembler::xor32(Imm32 imm, Register dest) { xorl(imm, dest); }
 
 void MacroAssembler::clz32(Register src, Register dest, bool knownNotZero) {
-  // On very recent chips (Haswell and newer?) there is actually an
-  // LZCNT instruction that does all of this.
+  if (AssemblerX86Shared::HasLZCNT()) {
+    lzcntl(src, dest);
+    return;
+  }
 
   bsrl(src, dest);
   if (!knownNotZero) {
@@ -81,6 +83,11 @@
 }
 
 void MacroAssembler::ctz32(Register src, Register dest, bool knownNotZero) {
+  if (AssemblerX86Shared::HasBMI1()) {
+    tzcntl(src, dest);
+    return;
+  }
+
   bsfl(src, dest);
   if (!knownNotZero) {
     Label nonzero;
@@ -323,11 +330,19 @@
 // Shift instructions
 
 void MacroAssembler::lshift32(Register shift, Register srcDest) {
+  if (HasBMI2()) {
+    shlxl(srcDest, shift, srcDest);
+    return;
+  }
   MOZ_ASSERT(shift == ecx);
   shll_cl(srcDest);
 }
 
 void MacroAssembler::flexibleLshift32(Register shift, Register srcDest) {
+  if (HasBMI2()) {
+    shlxl(srcDest, shift, srcDest);
+    return;
+  }
   if (shift == ecx) {
     shll_cl(srcDest);
   } else {
@@ -339,11 +354,19 @@
 }
 
 void MacroAssembler::rshift32(Register shift, Register srcDest) {
+  if (HasBMI2()) {
+    shrxl(srcDest, shift, srcDest);
+    return;
+  }
   MOZ_ASSERT(shift == ecx);
   shrl_cl(srcDest);
 }
 
 void MacroAssembler::flexibleRshift32(Register shift, Register srcDest) {
+  if (HasBMI2()) {
+    shrxl(srcDest, shift, srcDest);
+    return;
+  }
   if (shift == ecx) {
     shrl_cl(srcDest);
   } else {
@@ -355,12 +378,20 @@
 }
 
 void MacroAssembler::rshift32Arithmetic(Register shift, Register srcDest) {
+  if (HasBMI2()) {
+    sarxl(srcDest, shift, srcDest);
+    return;
+  }
   MOZ_ASSERT(shift == ecx);
   sarl_cl(srcDest);
 }
 
 void MacroAssembler::flexibleRshift32Arithmetic(Register shift,
                                                 Register srcDest) {
+  if (HasBMI2()) {
+    sarxl(srcDest, shift, srcDest);
+    return;
+  }
   if (shift == ecx) {
     sarl_cl(srcDest);
   } else {
@@ -2075,7 +2106,9 @@
 void MacroAssembler::compareFloat32x4(Assembler::Condition cond,
                                       FloatRegister rhs,
                                       FloatRegister lhsDest) {
-  // There's a hack in the assembler to allow operands to be reversed like this.
+  // Code in the SIMD implementation allows operands to be reversed like this,
+  // this benefits the baseline compiler.  Ion takes care of the reversing
+  // itself and never generates GT/GE.
   if (cond == Assembler::GreaterThan) {
     MacroAssemblerX86Shared::compareFloat32x4(rhs, Operand(lhsDest),
                                               Assembler::LessThan, lhsDest);
@@ -2088,10 +2121,20 @@
   }
 }
 
+void MacroAssembler::compareFloat32x4(Assembler::Condition cond,
+                                      const SimdConstant& rhs,
+                                      FloatRegister lhsDest) {
+  MOZ_ASSERT(cond != Assembler::Condition::GreaterThan &&
+             cond != Assembler::Condition::GreaterThanOrEqual);
+  MacroAssemblerX86Shared::compareFloat32x4(cond, rhs, lhsDest);
+}
+
 void MacroAssembler::compareFloat64x2(Assembler::Condition cond,
                                       FloatRegister rhs,
                                       FloatRegister lhsDest) {
-  // There's a hack in the assembler to allow operands to be reversed like this.
+  // Code in the SIMD implementation allows operands to be reversed like this,
+  // this benefits the baseline compiler.  Ion takes care of the reversing
+  // itself and never generates GT/GE.
   if (cond == Assembler::GreaterThan) {
     MacroAssemblerX86Shared::compareFloat64x2(rhs, Operand(lhsDest),
                                               Assembler::LessThan, lhsDest);
@@ -2104,6 +2147,14 @@
   }
 }
 
+void MacroAssembler::compareFloat64x2(Assembler::Condition cond,
+                                      const SimdConstant& rhs,
+                                      FloatRegister lhsDest) {
+  MOZ_ASSERT(cond != Assembler::Condition::GreaterThan &&
+             cond != Assembler::Condition::GreaterThanOrEqual);
+  MacroAssemblerX86Shared::compareFloat64x2(cond, rhs, lhsDest);
+}
+
 // Load.  See comments above regarding integer operation.
 
 void MacroAssembler::loadUnalignedSimd128(const Operand& src,
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-SIMD.cpp firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-SIMD.cpp
--- firefox-84.0.2+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-SIMD.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/MacroAssembler-x86-shared-SIMD.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -717,6 +717,31 @@
   }
 }
 
+void MacroAssemblerX86Shared::compareFloat32x4(Assembler::Condition cond,
+                                               const SimdConstant& rhs,
+                                               FloatRegister lhsDest) {
+  switch (cond) {
+    case Assembler::Condition::Equal:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpeqps,
+                    &MacroAssembler::vcmpeqpsSimd128);
+      break;
+    case Assembler::Condition::LessThan:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpltps,
+                    &MacroAssembler::vcmpltpsSimd128);
+      break;
+    case Assembler::Condition::LessThanOrEqual:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpleps,
+                    &MacroAssembler::vcmplepsSimd128);
+      break;
+    case Assembler::Condition::NotEqual:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpneqps,
+                    &MacroAssembler::vcmpneqpsSimd128);
+      break;
+    default:
+      MOZ_CRASH("unexpected condition op");
+  }
+}
+
 void MacroAssemblerX86Shared::compareFloat64x2(FloatRegister lhs, Operand rhs,
                                                Assembler::Condition cond,
                                                FloatRegister output) {
@@ -757,6 +782,31 @@
     default:
       MOZ_CRASH("unexpected condition op");
   }
+}
+
+void MacroAssemblerX86Shared::compareFloat64x2(Assembler::Condition cond,
+                                               const SimdConstant& rhs,
+                                               FloatRegister lhsDest) {
+  switch (cond) {
+    case Assembler::Condition::Equal:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpeqpd,
+                    &MacroAssembler::vcmpeqpdSimd128);
+      break;
+    case Assembler::Condition::LessThan:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpltpd,
+                    &MacroAssembler::vcmpltpdSimd128);
+      break;
+    case Assembler::Condition::LessThanOrEqual:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmplepd,
+                    &MacroAssembler::vcmplepdSimd128);
+      break;
+    case Assembler::Condition::NotEqual:
+      binarySimd128(rhs, lhsDest, &MacroAssembler::vcmpneqpd,
+                    &MacroAssembler::vcmpneqpdSimd128);
+      break;
+    default:
+      MOZ_CRASH("unexpected condition op");
+  }
 }
 
 // Semantics of wasm max and min.
diff -Nru firefox-84.0.2+build1/js/src/jit/x86-shared/Patching-x86-shared.h firefox-85.0+build1/js/src/jit/x86-shared/Patching-x86-shared.h
--- firefox-84.0.2+build1/js/src/jit/x86-shared/Patching-x86-shared.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit/x86-shared/Patching-x86-shared.h	2021-01-18 19:58:13.000000000 +0000
@@ -28,11 +28,11 @@
   return res;
 }
 
-inline void SetInt32(void* where, int32_t value) {
-  memcpy((char*)where - sizeof(int32_t), &value, sizeof(int32_t));
+inline void SetInt32(void* where, int32_t value, uint32_t trailing = 0) {
+  memcpy((char*)where - trailing - sizeof(int32_t), &value, sizeof(int32_t));
 }
 
-inline void SetRel32(void* from, void* to) {
+inline void SetRel32(void* from, void* to, uint32_t trailing = 0) {
   intptr_t offset =
       reinterpret_cast<intptr_t>(to) - reinterpret_cast<intptr_t>(from);
   MOZ_ASSERT(offset == static_cast<int32_t>(offset),
@@ -41,7 +41,7 @@
     MOZ_CRASH("offset is too great for a 32-bit relocation");
   }
 
-  SetInt32(from, offset);
+  SetInt32(from, offset, trailing);
 }
 
 inline void* GetRel32Target(void* where) {
@@ -49,14 +49,46 @@
   return (char*)where + rel;
 }
 
+// JmpSrc represents a positive offset within a code buffer, or an uninitialized
+// value.  Lots of code depends on uninitialized JmpSrc holding the value -1, on
+// -1 being a legal value of JmpSrc, and on being able to initialize a JmpSrc
+// with the value -1.
+//
+// The value of the `offset` is always positive and <= MaxCodeBytesPerProcess,
+// see ProcessExecutableMemory.h.  The latter quantity in turn must fit in an
+// i32.  But we further require that the value is not precisely INT32_MAX, so as
+// to allow the JmpSrc value -1 to mean "uninitialized" without ambiguity.
+//
+// The quantity `trailing` denotes the number of bytes of data that follow the
+// patch field in the instruction.  The offset points to the end of the
+// instruction as per normal.  The information about trailing bytes is needed
+// separately from the offset to correctly patch instructions that have
+// immediates trailing the patch field (eg CMPSS and CMPSD).  Currently the only
+// allowed values for `trailing` are 0 and 1.
+
+static_assert(MaxCodeBytesPerProcess < size_t(INT32_MAX), "Invariant");
+
 class JmpSrc {
  public:
-  JmpSrc() : offset_(-1) {}
-  explicit JmpSrc(int32_t offset) : offset_(offset) {}
-  int32_t offset() const { return offset_; }
+  JmpSrc() : offset_(INT32_MAX), trailing_(0) {}
+  explicit JmpSrc(int32_t offset) : offset_(offset), trailing_(0) {
+    // offset -1 is stored as INT32_MAX
+    MOZ_ASSERT(offset == -1 || (offset >= 0 && offset < INT32_MAX));
+  }
+  JmpSrc(int32_t offset, uint32_t trailing)
+      : offset_(offset), trailing_(trailing) {
+    // Disallow offset -1 in this situation, it does not apply.
+    MOZ_ASSERT(offset >= 0 && offset < INT32_MAX);
+    MOZ_ASSERT(trailing <= 1);
+  }
+  int32_t offset() const {
+    return offset_ == INT32_MAX ? -1 : int32_t(offset_);
+  }
+  uint32_t trailing() const { return trailing_; }
 
  private:
-  int32_t offset_;
+  uint32_t offset_ : 31;
+  uint32_t trailing_ : 1;
 };
 
 class JmpDst {
diff -Nru firefox-84.0.2+build1/js/src/jit-test/lib/codegen-test-common.js firefox-85.0+build1/js/src/jit-test/lib/codegen-test-common.js
--- firefox-84.0.2+build1/js/src/jit-test/lib/codegen-test-common.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/lib/codegen-test-common.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,49 @@
+// Set to true to emit ' +' instead of the unreadable '\s+'.
+var SPACEDEBUG = false;
+
+// Any hex string
+var HEX = '[0-9a-fA-F]'
+var HEXES = `${HEX}+`;
+
+function wrap(options, funcs) {
+    if ('memory' in options)
+        return `(module (memory ${options.memory}) ${funcs})`;
+    return `(module ${funcs})`;
+}
+
+function fixlines(s) {
+    return s.split(/\n+/)
+        .map(strip)
+        .filter(x => x.length > 0)
+        .map(x => HEXES + ' ' + x)
+        .map(spaces)
+        .join('\n');
+}
+
+function strip(s) {
+    while (s.length > 0 && isspace(s.charAt(0)))
+        s = s.substring(1);
+    while (s.length > 0 && isspace(s.charAt(s.length-1)))
+        s = s.substring(0, s.length-1);
+    return s;
+}
+
+function spaces(s) {
+    let t = '';
+    let i = 0;
+    while (i < s.length) {
+        if (isspace(s.charAt(i))) {
+            t += SPACEDEBUG ? ' +' : '\\s+';
+            i++;
+            while (i < s.length && isspace(s.charAt(i)))
+                i++;
+        } else {
+            t += s.charAt(i++);
+        }
+    }
+    return t;
+}
+
+function isspace(c) {
+    return c == ' ' || c == '\t';
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/lib/codegen-x64-test.js firefox-85.0+build1/js/src/jit-test/lib/codegen-x64-test.js
--- firefox-84.0.2+build1/js/src/jit-test/lib/codegen-x64-test.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/lib/codegen-x64-test.js	2021-01-18 19:58:12.000000000 +0000
@@ -17,12 +17,7 @@
 //  memory: if present, add a memory of length given by this property
 //  log: for debugging -- print the disassembly, then the preprocessed pattern
 
-// Set to true to emit ' +' instead of the unreadable '\s+'.
-var SPACEDEBUG = false;
-
-// Any hex string
-var HEX = '[0-9a-fA-F]'
-var HEXES = `${HEX}+`;
+load(libdir + "codegen-test-common.js");
 
 // RIP-relative address following the instruction mnemonic
 var RIPR = `0x${HEXES}`;
@@ -153,6 +148,7 @@
         expected = expected + '\n' + x64_suffix;
     expected = fixlines(expected);
     if (options.log) {
+        print(module_text);
         print(output);
         print(expected);
     }
@@ -169,46 +165,3 @@
                          expected,
                          options);
 }
-
-function wrap(options, funcs) {
-    if ('memory' in options)
-        return `(module (memory ${options.memory}) ${funcs})`;
-    return `(module ${funcs})`;
-}
-
-function fixlines(s) {
-    return s.split(/\n+/)
-        .map(strip)
-        .filter(x => x.length > 0)
-        .map(x => HEXES + ' ' + x)
-        .map(spaces)
-        .join('\n');
-}
-
-function strip(s) {
-    while (s.length > 0 && isspace(s.charAt(0)))
-        s = s.substring(1);
-    while (s.length > 0 && isspace(s.charAt(s.length-1)))
-        s = s.substring(0, s.length-1);
-    return s;
-}
-
-function spaces(s) {
-    let t = '';
-    let i = 0;
-    while (i < s.length) {
-        if (isspace(s.charAt(i))) {
-            t += SPACEDEBUG ? ' +' : '\\s+';
-            i++;
-            while (i < s.length && isspace(s.charAt(i)))
-                i++;
-        } else {
-            t += s.charAt(i++);
-        }
-    }
-    return t;
-}
-
-function isspace(c) {
-    return c == ' ' || c == '\t';
-}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/lib/codegen-x86-test.js firefox-85.0+build1/js/src/jit-test/lib/codegen-x86-test.js
--- firefox-84.0.2+build1/js/src/jit-test/lib/codegen-x86-test.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/lib/codegen-x86-test.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,65 @@
+// Scaffolding for testing x64 Ion code generation patterns (currently mostly
+// for wasm SIMD).  See codegen-x64-test.js in this directory for more
+// information.
+
+load(libdir + "codegen-test-common.js");
+
+// Note that Zydis disassembles x86 absolute addresses as relative, so
+// the binary encoding and the text encoding may not correspond precisely.
+
+// Absolute address (disp32) following the instruction mnemonic.
+var ABS = `0x${HEXES}`;
+
+// Absolute address (disp32) in the binary encoding.
+var ABSADDR = `${HEX}{2} ${HEX}{2} ${HEX}{2} ${HEX}{2}`;
+
+// End of prologue.  The mov to eax is debug code, inserted by the register
+// allocator to clobber eax before a move group.
+var x86_prefix = `
+8b ec            mov %esp, %ebp
+b8 ef be ad de   mov \\$0xDEADBEEF, %eax
+`
+
+// `.bp` because zydis chooses 'rbp' even on 32-bit systems
+var x86_loadarg0 = `
+f3 0f 6f 45 ${HEX}{2}            movdqux 0x${HEXES}\\(%.bp\\), %xmm0
+`;
+
+// Start of epilogue.  `.bp` for the same reason as above.
+var x86_suffix = `5d      pop %.bp`;
+
+// v128 OP literal -> v128
+// inputs: [[complete-opname, rhs-literal, expected-pattern], ...]
+function codegenTestX86_v128xLITERAL_v128(inputs, options = {}) {
+    for ( let [op, literal, expected] of inputs ) {
+        codegenTestX86_adhoc(wrap(options, `
+    (func (export "f") (param v128) (result v128)
+      (${op} (local.get 0) ${literal}))`),
+                             'f',
+                             x86_loadarg0 + expected,
+                             options)
+    }
+}
+
+// For when nothing else applies: `module_text` is the complete source text of
+// the module, `export_name` is the name of the function to be tested,
+// `expected` is the non-preprocessed pattern, and options is an options bag,
+// described above.
+function codegenTestX86_adhoc(module_text, export_name, expected, options = {}) {
+    assertEq(hasDisassembler(), true);
+
+    let ins = wasmEvalText(module_text);
+    let output = wasmDis(ins.exports[export_name], "ion", true);
+    if (!options.no_prefix)
+        expected = x86_prefix + '\n' + expected;
+    if (!options.no_suffix)
+        expected = expected + '\n' + x86_suffix;
+    expected = fixlines(expected);
+    if (options.log) {
+        print(module_text);
+        print(output);
+        print(expected);
+    }
+    assertEq(output.match(new RegExp(expected)) != null, true);
+}
+
diff -Nru firefox-84.0.2+build1/js/src/jit-test/lib/wasm-binary.js firefox-85.0+build1/js/src/jit-test/lib/wasm-binary.js
--- firefox-84.0.2+build1/js/src/jit-test/lib/wasm-binary.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/lib/wasm-binary.js	2021-01-18 19:58:12.000000000 +0000
@@ -25,14 +25,16 @@
 const codeId           = 10;
 const dataId           = 11;
 const dataCountId      = 12;
+const eventId          = 13;
 
 // User-defined section names
 const nameName         = "name";
 
 // Name section name types
-const nameTypeModule   = 0;
-const nameTypeFunction = 1;
-const nameTypeLocal    = 2;
+const nameTypeModule    = 0;
+const nameTypeFunction  = 1;
+const nameTypeLocal     = 2;
+const nameTypeEvent     = 3;
 
 // Type codes
 const I32Code          = 0x7f;
@@ -50,7 +52,11 @@
 // Opcodes
 const UnreachableCode  = 0x00
 const BlockCode        = 0x02;
+const TryCode          = 0x06;
+const CatchCode        = 0x07;
+const ThrowCode        = 0x08;
 const EndCode          = 0x0b;
+const ReturnCode       = 0x0f;
 const CallCode         = 0x10;
 const CallIndirectCode = 0x11;
 const DropCode         = 0x1a;
@@ -139,6 +145,7 @@
 
 const definedOpcodes =
     [0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
+     ...(wasmExceptionsEnabled() ? [0x06, 0x07, 0x08] : []),
      0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
      0x10, 0x11,
      0x1a, 0x1b, 0x1c,
@@ -201,6 +208,7 @@
 const TableCode        = 0x01;
 const MemoryCode       = 0x02;
 const GlobalCode       = 0x03;
+const EventCode        = 0x04;
 
 // ResizableFlags
 const HasMaximumFlag   = 0x1;
@@ -330,6 +338,9 @@
         } else if (exp.hasOwnProperty("memIndex")) {
             body.push(...varU32(MemoryCode));
             body.push(...varU32(exp.memIndex));
+        } else if (exp.hasOwnProperty("eventIndex")) {
+            body.push(...varU32(EventCode));
+            body.push(...varU32(exp.eventIndex));
         } else {
             throw "Bad export " + exp;
         }
@@ -354,6 +365,16 @@
     return { name: memoryId, body };
 }
 
+function eventSection(events) {
+    var body = [];
+    body.push(...varU32(events.length));
+    for (let event of events) {
+        body.push(...varU32(0)); // exception attribute
+        body.push(...varU32(event.type));
+    }
+    return { name: eventId, body };
+}
+
 function dataSection(segmentArrays) {
     var body = [];
     body.push(...varU32(segmentArrays.length));
diff -Nru firefox-84.0.2+build1/js/src/jit-test/lib/wasm.js firefox-85.0+build1/js/src/jit-test/lib/wasm.js
--- firefox-84.0.2+build1/js/src/jit-test/lib/wasm.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/lib/wasm.js	2021-01-18 19:58:12.000000000 +0000
@@ -59,22 +59,9 @@
     }
 }
 
-function typeToCraneliftName(ty) {
-    switch(ty) {
-        case 'externref':
-            return 'ExternRef';
-        case 'funcref':
-            return 'FuncRef';
-        default:
-            return ty.toUpperCase();
-    }
-}
-
 function mismatchError(actual, expect) {
-    let actualCL = typeToCraneliftName(actual);
-    let expectCL = typeToCraneliftName(expect);
     var str = `(type mismatch: expression has type ${actual} but expected ${expect})|` +
-              `(type mismatch: expected Some\\(${expectCL}\\), found Some\\(${actualCL}\\))`;
+              `(type mismatch: expected ${expect}, found ${actual}\)`;
     return RegExp(str);
 }
 
@@ -195,7 +182,10 @@
 
     let augmentedSrc = _augmentSrc(text, [ { type: 'i64', func: '$run', args, expected } ]);
     let augmentedBinary = wasmTextToBinary(augmentedSrc);
-    new WebAssembly.Instance(new WebAssembly.Module(augmentedBinary), maybeImports).exports.assert_0();
+
+    let module = new WebAssembly.Module(augmentedBinary);
+    let instance = new WebAssembly.Instance(module, maybeImports);
+    assertEq(instance.exports.assert_0(), 1);
 }
 
 function wasmRunWithDebugger(wast, lib, init, done) {
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/arguments/bug1227287.js firefox-85.0+build1/js/src/jit-test/tests/arguments/bug1227287.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/arguments/bug1227287.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/arguments/bug1227287.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,4 @@
-// |jit-test| --no-warp
-// Ion/Warp has known issues with function.arguments. See bug 1626294.
+// Note: Ion/Warp have known issues with function.arguments. See bug 1626294.
 
 function f(y) {
     y = 1;
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/auto-regress/bug1670378.js firefox-85.0+build1/js/src/jit-test/tests/auto-regress/bug1670378.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/auto-regress/bug1670378.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/auto-regress/bug1670378.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,8 @@
+// |jit-test| allow-unhandlable-oom; skip-if: !('oomTest' in this)
+
+const otherGlobalNewCompartment = newGlobal({newCompartment: true});
+
+oomTest(function() {
+  let {transplant} = transplantableObject();
+  transplant(otherGlobalNewCompartment);
+});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1100623.js firefox-85.0+build1/js/src/jit-test/tests/basic/bug1100623.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1100623.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/bug1100623.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,6 +1,4 @@
-// |jit-test| error: baz is null; --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
+// |jit-test| error: baz is null
 
 var document = {getElementById: () => null};
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1568029.js firefox-85.0+build1/js/src/jit-test/tests/basic/bug1568029.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1568029.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/bug1568029.js	2021-01-18 19:58:13.000000000 +0000
@@ -7,9 +7,6 @@
     if (a > 0) {
         new TestObject(a - 1);
     }
-    if (a == 0) {
-        markObjectPropertiesUnknown(this);
-    }
 }
 
 // Force analysis. There may be a better way.
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1678442.js firefox-85.0+build1/js/src/jit-test/tests/basic/bug1678442.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/bug1678442.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/bug1678442.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,6 @@
+var fun = function() {};
+var newTarget = (function(){}).bind();
+Object.defineProperty(newTarget, "prototype", {get() { relazifyFunctions() }});
+for (var i = 0; i < 10; i++) {
+    Reflect.construct(fun, [], newTarget);
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/expression-autopsy.js firefox-85.0+build1/js/src/jit-test/tests/basic/expression-autopsy.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/expression-autopsy.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/expression-autopsy.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,7 +1,3 @@
-// |jit-test| --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
-
 load(libdir + "asserts.js");
 load(libdir + "iteration.js");
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/iterable-error-messages.js firefox-85.0+build1/js/src/jit-test/tests/basic/iterable-error-messages.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/iterable-error-messages.js	2021-01-06 11:23:09.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/iterable-error-messages.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,7 +1,3 @@
-// |jit-test| --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
-
 function assertThrowsMsgEndsWith(f, msg) {
     try {
         f();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/monitor-type-function.js firefox-85.0+build1/js/src/jit-test/tests/basic/monitor-type-function.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/monitor-type-function.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/monitor-type-function.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-// |jit-test| skip-if: !isTypeInferenceEnabled()
-
-function f(x) {
-    return f.toString();
-}
-
-monitorType(f, 0, "unknown");
-monitorType(f, 1, "unknownObject");
-monitorType(f, 2, Symbol());
-monitorType(f, 2, this);
-monitorType(null, 0, 1);
-
-for (var i = 0; i < 12; i++) {
-    monitorType(f, 3, {});
-    monitorType(undefined, 20, this);
-    f(i);
-}
-
-function h() {
-    monitorType(g, 1, {});
-    monitorType(g, 2, "unknown");
-    monitorType(null, 1, {});
-}
-function g() {
-    return new h();
-}
-for (var i = 0; i < 12; i++) {
-    new g();
-}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/property-error-message-fix-disabled.js firefox-85.0+build1/js/src/jit-test/tests/basic/property-error-message-fix-disabled.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/property-error-message-fix-disabled.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/property-error-message-fix-disabled.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,6 +1,4 @@
-// |jit-test| --disable-property-error-message-fix; --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
+// |jit-test| --disable-property-error-message-fix
 
 function check(f, message) {
   let caught = false;
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/basic/property-error-message-fix.js firefox-85.0+build1/js/src/jit-test/tests/basic/property-error-message-fix.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/basic/property-error-message-fix.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/basic/property-error-message-fix.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,3 @@
-// |jit-test| --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
-
 function check(f, message) {
   let caught = false;
   try {
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/bug1681258.js firefox-85.0+build1/js/src/jit-test/tests/bug1681258.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/bug1681258.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/bug1681258.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,8 @@
+// |jit-test| skip-if: !('oomTest' in this);--enable-top-level-await;--fast-warmup;--blinterp-warmup-threshold=10
+ignoreUnhandledRejections();
+
+oomTest(async function() {
+    let m = parseModule(``);
+    m.declarationInstantiation();
+    await m.evaluation();
+});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/debug/bug-1444604-reduced.js firefox-85.0+build1/js/src/jit-test/tests/debug/bug-1444604-reduced.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/debug/bug-1444604-reduced.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/debug/bug-1444604-reduced.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,6 +1,3 @@
-// |jit-test| --no-warp
-// This is hitting bug 1505387 with WarpBuilder and eager compilation.
-
 // LiveSavedFrameCache should not be confused by eval-in-frame-prev links.
 
 const g = newGlobal({newCompartment: true});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/debug/bug1675755-forceLexicalInitializationByName.js firefox-85.0+build1/js/src/jit-test/tests/debug/bug1675755-forceLexicalInitializationByName.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/debug/bug1675755-forceLexicalInitializationByName.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/debug/bug1675755-forceLexicalInitializationByName.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,38 @@
+load(libdir + "asserts.js");
+
+var g = newGlobal({newCompartment: true});
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+let errorOne, errorTwo;
+
+function evalErrorStr(global, evalString) {
+    try {
+        global.evaluate(evalString);
+        return undefined;
+    } catch (e) {
+        return e.toString();
+    }
+}
+
+
+assertEq(evalErrorStr(g, "let y = IDONTEXIST;"), "ReferenceError: IDONTEXIST is not defined");
+assertEq(evalErrorStr(g, "y = 1;"),
+         "ReferenceError: can't access lexical declaration 'y' before initialization");
+
+const LINEAR_SEARCHES_MAX = 3;
+const SHAPE_CACHE_MIN_ENTRIES = 3;
+
+// Give the lexical enough properties so that it isBigEnoughForAShapeTable().
+for (i in [...Array(SHAPE_CACHE_MIN_ENTRIES)])
+    gw.executeInGlobal(`let x${i} = 1`);
+
+// Search for y just enough times to cause the next search to trigger
+// Shape::cachify().
+for (i in [...Array(LINEAR_SEARCHES_MAX - 1)])
+    gw.executeInGlobal("y");
+
+// Here we flip the uninitialized binding to undefined. But in the process, we
+// will do the lookup on y that will trigger Shape::cachify. Verify that it
+// happens in the correct compartment.
+assertEq(gw.forceLexicalInitializationByName("y"), true);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/debug/initarrayelem-hole-value.js firefox-85.0+build1/js/src/jit-test/tests/debug/initarrayelem-hole-value.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/debug/initarrayelem-hole-value.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/debug/initarrayelem-hole-value.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,12 @@
+var g = newGlobal({newCompartment: true});
+g.parent = this;
+g.evaluate(`var dbg = new Debugger(parent); dbg.onEnterFrame = function(){};`);
+
+function f() {
+    for (var i = 0; i < 10; i++) {
+        var arr = [1, 2, , i];
+        assertEq(2 in arr, false);
+        assertEq(3 in arr, true);
+    }
+}
+f();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/gc/bug-1490042.js firefox-85.0+build1/js/src/jit-test/tests/gc/bug-1490042.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/gc/bug-1490042.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/gc/bug-1490042.js	2021-01-18 19:58:12.000000000 +0000
@@ -11,9 +11,9 @@
     a[i] = new c[i];
 }
 
-// Start an incremental GC and run until we're about to sweep type information.
+// Start an incremental GC and run until we're about to sweep objects.
 assertEq(gcstate(), "NotActive");
-gczeal(20);
+gczeal(21);
 startgc(1);
 
 // Run incremental slices with simulated OOM set up to provoke OOM when sweeping
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/gc/bug-1667336.js firefox-85.0+build1/js/src/jit-test/tests/gc/bug-1667336.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/gc/bug-1667336.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/gc/bug-1667336.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,4 +1,4 @@
-// |jit-test| --ion-offthread-compile=off; --warp; skip-if: helperThreadCount() === 0
+// |jit-test| --ion-offthread-compile=off; skip-if: helperThreadCount() === 0
 
 var g = newGlobal();
 gczeal(9, 1);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/gc/pretenuring.js firefox-85.0+build1/js/src/jit-test/tests/gc/pretenuring.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/gc/pretenuring.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/gc/pretenuring.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,38 @@
+// Test nursery string allocation and pretenuring.
+
+gczeal(0);
+
+// String allocation in the nursery is initially enabled.
+assertEq(nurseryStringsEnabled(), true);
+
+// Literal strings are atoms (which are always tenured).
+assertEq(isNurseryAllocated("foo"), false);
+
+// The result of Number.toString is nursery allocated.
+assertEq(isNurseryAllocated((1234).toString()), true);
+
+// Ropes are nursery allocated.
+let s = "bar";
+assertEq(isNurseryAllocated("foo" + s), true);
+
+// Dependent strings are nursery allocated.
+assertEq(isNurseryAllocated("foobar".substr(1)), true);
+
+// The testing function 'newString' allows control over which heap is used.
+assertEq(isNurseryAllocated(newString("foobar", { tenured: true })), false);
+assertEq(isNurseryAllocated(newString("foobar", { tenured: false })), true);
+
+// Allocating lots of strings which survive nursery collection disables
+// allocating strings in the nursery.
+let a = [];
+for (let i = 1; i < 500000; i++) {
+  a.push(i.toString());
+}
+gc();
+assertEq(nurseryStringsEnabled(), false);
+
+// When a large number of strings are collected by major GC nursery allocation
+// is enabled again.
+a = undefined;
+gc();
+assertEq(nurseryStringsEnabled(), true);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/dce-with-rinstructions.js firefox-85.0+build1/js/src/jit-test/tests/ion/dce-with-rinstructions.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/dce-with-rinstructions.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/dce-with-rinstructions.js	2021-01-18 19:58:13.000000000 +0000
@@ -5,7 +5,7 @@
 setJitCompilerOption("ion.full.warmup.trigger", 20);
 var i;
 
-var warp = getJitCompilerOptions()["warp.enable"];
+var warp = true;
 
 // Prevent GC from cancelling/discarding Ion compilations.
 gczeal(0);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-arrays.js firefox-85.0+build1/js/src/jit-test/tests/ion/recover-arrays.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-arrays.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/recover-arrays.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,5 +1,4 @@
-// |jit-test| --no-warp
-
+// |jit-test| --no-ion
 // Warp lacks Scalar Replacement support (bug 1650233). Re-evaluate after that
 // bug has been fixed.
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-cow-arrays.js firefox-85.0+build1/js/src/jit-test/tests/ion/recover-cow-arrays.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-cow-arrays.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/recover-cow-arrays.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,233 +0,0 @@
-// |jit-test| --no-warp
-
-// Warp has COW arrays disabled (bug 1626854). Re-evaluate after that bug has
-// been fixed.
-
-// Ion eager fails the test below because we have not yet created any
-// template object in baseline before running the content of the top-level
-// function.
-if (getJitCompilerOptions()["ion.warmup.trigger"] <= 100)
-    setJitCompilerOption("ion.warmup.trigger", 100);
-
-// This test checks that we are able to remove the getelem & setelem with scalar
-// replacement, so we should not force inline caches, as this would skip the
-// generation of getelem & setelem instructions.
-if (getJitCompilerOptions()["ion.forceinlineCaches"])
-    setJitCompilerOption("ion.forceinlineCaches", 0);
-
-// Prevent the GC from cancelling Ion compilations, when we expect them to succeed
-gczeal(0);
-
-// This function is used to force a bailout when it is inlined, and to recover
-// the frame of the function in which this function is inlined.
-var resumeHere = function (i) { if (i >= 99) bailout(); };
-
-// This function is used to cause an invalidation after having removed a branch
-// after DCE.  This is made to check if we correctly recover an array
-// allocation.
-var uceFault = function (i) {
-    if (i > 98)
-        uceFault = function (i) { return true; };
-    return false;
-};
-
-// This function is used to ensure that we do escape the array, and thus prevent
-// any escape analysis.
-var global_arr;
-function escape(arr) { global_arr = arr; }
-
-function checkCOW() {
-    assertEq(hasCopyOnWriteElements([1, 2, 3, 4]), false);
-    // If this fails, we should probably update the tests below!
-    assertEq(hasCopyOnWriteElements([1, 2, 3, 4, 5, 6, 7]), isTypeInferenceEnabled());
-}
-checkCOW();
-
-function arrayLength(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayLengthBail(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    resumeHere(i);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayContent(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    assertEq(a[0], 1);
-    assertEq(a[1], 2);
-    assertEq(a[6], 7);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayContentBail0(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    resumeHere(i);
-    assertEq(a[0], 1);
-    assertEq(a[1], 2);
-    assertEq(a[6], 7);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayContentBail1(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    assertEq(a[0], 1);
-    resumeHere(i);
-    assertEq(a[1], 2);
-    assertEq(a[6], 7);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayContentBail2(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    assertEq(a[0], 1);
-    assertEq(a[1], 2);
-    assertEq(a[6], 7);
-    resumeHere(i);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayContentBail3(i) {
-    var a = ["a1", "a2", "a3", "a4", "a5", "a6", "a7"];
-    assertEq(a[0], "a1");
-    assertEq(a[1], "a2");
-    assertEq(a[6], "a7");
-    resumeHere(i);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayWrite1(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    a[0] = 42;
-    assertEq(a[0], 42);
-    assertEq(a[1], 2);
-    assertEq(a[5], 6);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-// We don't handle length sets yet.
-function arrayWrite2(i) {
-    var a = [1, 2, 3, 4, 5, 6, 7];
-    a.length = 1;
-    assertEq(a[0], 1);
-    assertEq(a[1], undefined);
-    assertRecoveredOnBailout(a, false);
-    return a.length;
-}
-
-function arrayWrite3(i) {
-    var a = [1, 2, 0, 9, 8, 7, 6];
-    if (i % 2 === 1)
-	a[0] = 2;
-    assertEq(a[0], 1 + (i % 2));
-    assertRecoveredOnBailout(a, true);
-    if (i % 2 === 1)
-	bailout();
-    assertEq(a[0], 1 + (i % 2));
-    return a.length;
-}
-
-function arrayWrite4(i) {
-    var a = [1, 2, 0, 9, 8, 7, 6];
-    for (var x = 0; x < 2; x++) {
-	if (x % 2 === 1)
-	    bailout();
-	else
-	    a[0] = a[0] + 1;
-    }
-    assertEq(a[0], 2);
-    assertEq(a[1], 2);
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-function arrayWriteDoubles(i) {
-    var a = [0, 0, 0, 0, 0, 0, 0];
-    a[0] = 3.14;
-    // MConvertElementsToDoubles is only used for loads inside a loop.
-    for (var x = 0; x < 2; x++) {
-        assertEq(a[0], 3.14);
-        assertEq(a[1], 0);
-    }
-    assertRecoveredOnBailout(a, true);
-    return a.length;
-}
-
-// Check escape analysis in case of holes.
-function arrayHole0(i) {
-    var a = [1,,3,4,5,6,7];
-    assertEq(a[0], 1);
-    assertEq(a[1], undefined);
-    assertEq(a[2], 3);
-    // need to check for holes.
-    assertRecoveredOnBailout(a, false);
-    return a.length;
-}
-
-// Same test as the previous one, but the Array.prototype is changed to return
-// "100" when we request for the element "1".
-function arrayHole1(i) {
-    var a = [1,,3,4,5,6,7];
-    assertEq(a[0], 1);
-    assertEq(a[1], 100);
-    assertEq(a[2], 3);
-    // need to check for holes.
-    assertRecoveredOnBailout(a, false);
-    return a.length;
-}
-
-function build(l) { var arr = []; for (var i = 0; i < l; i++) arr.push(i); return arr }
-var uceFault_arrayAlloc3 = eval(`(${uceFault})`.replace('uceFault', 'uceFault_arrayAlloc3'));
-function arrayAlloc(i) {
-    var a = [0,1,2,3,4,5,6];
-    if (uceFault_arrayAlloc3(i) || uceFault_arrayAlloc3(i)) {
-        assertEq(a[0], 0);
-        assertEq(a[3], 3);
-        return a.length;
-    }
-    assertRecoveredOnBailout(a, true);
-    return 0;
-};
-
-// Prevent compilation of the top-level
-eval(`(${resumeHere})`);
-
-for (var i = 0; i < 100; i++) {
-    arrayLength(i);
-    arrayLengthBail(i);
-    arrayContent(i);
-    arrayContentBail0(i);
-    arrayContentBail1(i);
-    arrayContentBail2(i);
-    arrayContentBail3(i);
-    arrayWrite1(i);
-    arrayWrite2(i);
-    arrayWrite3(i);
-    arrayWrite4(i);
-    arrayWriteDoubles(i);
-    arrayHole0(i);
-    arrayAlloc(i);
-}
-
-// If arr[1] is not defined, then we fallback on the prototype which instead of
-// returning undefined, returns "0".
-Object.defineProperty(Array.prototype, 1, {
-  value: 100,
-  configurable: true,
-  enumerable: true,
-  writable: true
-});
-
-for (var i = 0; i < 100; i++) {
-    arrayHole1(i);
-}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-empty-new-object.js firefox-85.0+build1/js/src/jit-test/tests/ion/recover-empty-new-object.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-empty-new-object.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/recover-empty-new-object.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,5 +1,4 @@
-// |jit-test| --no-warp
-
+// |jit-test| --no-ion
 // Warp lacks Scalar Replacement support (bug 1650233). Re-evaluate after that
 // bug has been fixed.
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-lambdas.js firefox-85.0+build1/js/src/jit-test/tests/ion/recover-lambdas.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-lambdas.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/recover-lambdas.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,5 +1,4 @@
-// |jit-test| --no-warp; --ion-osr=off
-
+// |jit-test| --no-ion; --ion-osr=off
 // Warp lacks Scalar Replacement support (bug 1650233). Re-evaluate after that
 // bug has been fixed.
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-objects.js firefox-85.0+build1/js/src/jit-test/tests/ion/recover-objects.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/ion/recover-objects.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/ion/recover-objects.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,5 +1,4 @@
-// |jit-test| --no-warp; --ion-pgo=on
-
+// |jit-test| --no-ion; --ion-pgo=on
 // Warp lacks Scalar Replacement support (bug 1650233). Re-evaluate after that
 // bug has been fixed.
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1233117.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1233117.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1233117.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1233117.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,2 +1,2 @@
-// |jit-test| module
+// |jit-test| module --enable-top-level-await;
 eval("1");
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1420420-4.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1420420-4.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1420420-4.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1420420-4.js	2021-01-18 19:58:13.000000000 +0000
@@ -8,7 +8,11 @@
 b.declarationInstantiation();
 c.declarationInstantiation();
 
-let count = 0;
-try { b.evaluation() } catch (e) { count++; }
-try { c.evaluation() } catch (e) { count++; }
-assertEq(count, 2);
+(async () => {
+  let count = 0;
+  try { await b.evaluation() } catch (e) { count++; }
+  try { await c.evaluation() } catch (e) { count++; }
+  assertEq(count, 2);
+})();
+
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug1449153.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug1449153.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug1449153.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug1449153.js	2021-01-18 19:58:13.000000000 +0000
@@ -2,11 +2,11 @@
 
 class MyError {}
 
-function assertThrowsMyError(f)
+async function assertThrowsMyError(f)
 {
     let caught = false;
     try {
-        f();
+        await f();
     } catch (e) {
         caught = true;
         assertEq(e.constructor, MyError);
@@ -29,3 +29,5 @@
 `));
 b.declarationInstantiation();
 assertThrowsMyError(() => b.evaluation(b));
+
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1476921.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1476921.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1476921.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1476921.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,3 +1,4 @@
+// |jit-test| --enable-top-level-await;
 "use strict";
 
 load(libdir + "asserts.js");
@@ -13,6 +14,18 @@
 `));
 
 a.declarationInstantiation();
-assertThrowsInstanceOf(() => a.evaluation(), UniqueError);
+a.evaluation()
+  .then(r => {
+    // We should not reach here, as we expect an error to be thrown.
+    assertEq(false, true);
+  })
+  .catch(e => assertEq(e instanceof UniqueError, true));
 b.declarationInstantiation();
-assertThrowsInstanceOf(() => b.evaluation(), UniqueError);
+b.evaluation()
+  .then(r => {
+    // We should not reach here, as we expect an error to be thrown.
+    assertEq(false, true);
+  })
+  .catch(e => assertEq(e instanceof UniqueError, true));
+
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1498980.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1498980.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1498980.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1498980.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,3 +1,4 @@
+// |jit-test| --enable-top-level-await;
 dbgGlobal = newGlobal({newCompartment: true});
 dbg = new dbgGlobal.Debugger;
 dbg.addDebuggee(this);
@@ -9,16 +10,20 @@
 function execModule(source) {
     m = parseModule(source);
     m.declarationInstantiation();
-    m.evaluation();
+    return m.evaluation();
 }
 
-execModule("f();");
-gc();
+execModule("f();").then(() => {
+  gc();
 
-let caught;
-try {
-    execModule("throw 'foo'");
-} catch (e) {
-    caught = e;
-}
-assertEq(caught, 'foo');
+  execModule("throw 'foo'")
+    .then(r => {
+      // We should not reach here.
+      assertEq(false, true);
+    })
+    .catch(e => {
+      assertEq(e, 'foo');
+    });
+})
+
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1519140.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1519140.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1519140.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1519140.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,3 +1,3 @@
-// |jit-test| --more-compartments
+// |jit-test| --more-compartments;
 fullcompartmentchecks(true);
 newGlobal().eval(`import("javascript:")`).catch(() => {});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1680878-a.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1680878-a.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1680878-a.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1680878-a.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,8 @@
+// |jit-test| error: SyntaxError
+// Remove once Top-level await is enabled by default: Bug #1681046
+
+r = parseModule(`
+  for await (var x of this) {}
+`);
+r.declarationInstantiation();
+r.evaluation();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1680878.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1680878.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1680878.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1680878.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,7 @@
+// |jit-test| --enable-top-level-await; error: TypeError
+
+r = parseModule(`
+  for await (var x of this) {}
+`);
+r.declarationInstantiation();
+r.evaluation();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1681256.js firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1681256.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/bug-1681256.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/bug-1681256.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,20 @@
+// |jit-test| --enable-top-level-await;--more-compartments;
+let lfCode = `
+    var g = newGlobal();
+    g.debuggeeGlobal = this;
+    g.eval("(" + function () {
+        dbg = new Debugger(debuggeeGlobal);
+        dbg.onExceptionUnwind = function (frame, exc) {};
+    } + ")();");
+`;
+loadFile(lfCode);
+// use "await" so the module is marked as TLA
+loadFile(lfCode + " await ''");
+async function loadFile(lfVarx) {
+    try {
+        try { evaluate(lfVarx); } catch(exc) {}
+        let lfMod = parseModule(lfVarx);
+        lfMod.declarationInstantiation();
+        await lfMod.evaluation();
+    } catch (lfVare) {}
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/import-namespace.js firefox-85.0+build1/js/src/jit-test/tests/modules/import-namespace.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/import-namespace.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/import-namespace.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,3 +1,4 @@
+// |jit-test| --enable-top-level-await;
 // Test importing module namespaces
 
 "use strict";
@@ -90,7 +91,14 @@
     parseModule("export let d = 2; import * as ns from 'c'; let c = ns.c;"));
 c.declarationInstantiation();
 d.declarationInstantiation();
-assertThrowsInstanceOf(() => c.evaluation(), ReferenceError);
+c.evaluation()
+  .then(r => {
+    // We expect the evaluation to throw, so we should not reach this.
+    assertEq(false, true)
+  })
+  .catch(e => {
+   assertEq(e instanceof ReferenceError, true)
+  });
 
 // Test cyclic namespace import.
 let e = registerModule('e',
@@ -103,3 +111,4 @@
 f.evaluation();
 assertEq(e.namespace.f(), 2);
 assertEq(f.namespace.e(), 1);
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/module-evaluation.js firefox-85.0+build1/js/src/jit-test/tests/modules/module-evaluation.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/module-evaluation.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/module-evaluation.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,34 +1,46 @@
+// |jit-test| --enable-top-level-await;
 // Exercise ModuleEvaluation() concrete method.
 
 load(libdir + "asserts.js");
 
-function parseAndEvaluate(source) {
+async function parseAndEvaluate(source) {
     let m = parseModule(source);
     m.declarationInstantiation();
-    m.evaluation();
+    await m.evaluation();
     return m;
 }
 
 // Check the evaluation of an empty module succeeds.
-parseAndEvaluate("");
-
-// Check evaluation returns evaluation result the first time, then undefined.
-let m = parseModule("1");
-m.declarationInstantiation();
-assertEq(m.evaluation(), undefined);
-assertEq(typeof m.evaluation(), "undefined");
-
-// Check top level variables are initialized by evaluation.
-m = parseModule("export var x = 2 + 2;");
-assertEq(typeof getModuleEnvironmentValue(m, "x"), "undefined");
-m.declarationInstantiation();
-m.evaluation();
-assertEq(getModuleEnvironmentValue(m, "x"), 4);
-
-m = parseModule("export let x = 2 * 3;");
-m.declarationInstantiation();
-m.evaluation();
-assertEq(getModuleEnvironmentValue(m, "x"), 6);
+(async () => {
+  await parseAndEvaluate("");
+})();
+
+(async () => {
+  // Check that evaluation returns evaluation promise,
+  // and promise is always the same.
+  let m = parseModule("1");
+  m.declarationInstantiation();
+  assertEq(typeof m.evaluation(), "object");
+  assertEq(m.evaluation() instanceof Promise, true);
+  assertEq(m.evaluation(), m.evaluation());
+  await m.evaluation();
+})();
+
+(async () => {
+  // Check top level variables are initialized by evaluation.
+  let m = parseModule("export var x = 2 + 2;");
+  assertEq(typeof getModuleEnvironmentValue(m, "x"), "undefined");
+  m.declarationInstantiation();
+  await m.evaluation();
+  assertEq(getModuleEnvironmentValue(m, "x"), 4);
+})();
+
+(async () => {
+  let m = parseModule("export let x = 2 * 3;");
+  m.declarationInstantiation();
+  await m.evaluation();
+  assertEq(getModuleEnvironmentValue(m, "x"), 6);
+})();
 
 // Set up a module to import from.
 let a = registerModule('a',
@@ -37,62 +49,77 @@
                  export default 2;
                  export function f(x) { return x + 1; }`));
 
-// Check we can evaluate top level definitions.
-parseAndEvaluate("var foo = 1;");
-parseAndEvaluate("let foo = 1;");
-parseAndEvaluate("const foo = 1");
-parseAndEvaluate("function foo() {}");
-parseAndEvaluate("class foo { constructor() {} }");
-
-// Check we can evaluate all module-related syntax.
-parseAndEvaluate("export var foo = 1;");
-parseAndEvaluate("export let foo = 1;");
-parseAndEvaluate("export const foo = 1;");
-parseAndEvaluate("var x = 1; export { x };");
-parseAndEvaluate("export default 1");
-parseAndEvaluate("export default function() {};");
-parseAndEvaluate("export default function foo() {};");
-parseAndEvaluate("import a from 'a';");
-parseAndEvaluate("import { x } from 'a';");
-parseAndEvaluate("import * as ns from 'a';");
-parseAndEvaluate("export * from 'a'");
-parseAndEvaluate("export default class { constructor() {} };");
-parseAndEvaluate("export default class foo { constructor() {} };");
-
-// Test default import
-m = parseModule("import a from 'a'; export { a };")
-m.declarationInstantiation();
-m.evaluation()
-assertEq(getModuleEnvironmentValue(m, "a"), 2);
-
-// Test named import
-m = parseModule("import { x as y } from 'a'; export { y };")
-m.declarationInstantiation();
-m.evaluation();
-assertEq(getModuleEnvironmentValue(m, "y"), 1);
-
-// Call exported function
-m = parseModule("import { f } from 'a'; export let x = f(3);")
-m.declarationInstantiation();
-m.evaluation();
-assertEq(getModuleEnvironmentValue(m, "x"), 4);
-
-// Test importing an indirect export
-registerModule('b', parseModule("export { x as z } from 'a';"));
-m = parseAndEvaluate("import { z } from 'b'; export { z }");
-assertEq(getModuleEnvironmentValue(m, "z"), 1);
-
-// Test cyclic dependencies
-registerModule('c1', parseModule("export var x = 1; export {y} from 'c2'"));
-registerModule('c2', parseModule("export var y = 2; export {x} from 'c1'"));
-m = parseAndEvaluate(`import { x as x1, y as y1 } from 'c1';
-                      import { x as x2, y as y2 } from 'c2';
-                      export let z = [x1, y1, x2, y2]`),
-assertDeepEq(getModuleEnvironmentValue(m, "z"), [1, 2, 1, 2]);
-
-// Import access in functions
-m = parseModule("import { x } from 'a'; function f() { return x; }")
-m.declarationInstantiation();
-m.evaluation();
-let f = getModuleEnvironmentValue(m, "f");
-assertEq(f(), 1);
+(async () => {
+  // Check we can evaluate top level definitions.
+  await parseAndEvaluate("var foo = 1;");
+  await parseAndEvaluate("let foo = 1;");
+  await parseAndEvaluate("const foo = 1");
+  await parseAndEvaluate("function foo() {}");
+  await parseAndEvaluate("class foo { constructor() {} }");
+
+  // Check we can evaluate all module-related syntax.
+  await parseAndEvaluate("export var foo = 1;");
+  await parseAndEvaluate("export let foo = 1;");
+  await parseAndEvaluate("export const foo = 1;");
+  await parseAndEvaluate("var x = 1; export { x };");
+  await parseAndEvaluate("export default 1");
+  await parseAndEvaluate("export default function() {};");
+  await parseAndEvaluate("export default function foo() {};");
+  await parseAndEvaluate("import a from 'a';");
+  await parseAndEvaluate("import { x } from 'a';");
+  await parseAndEvaluate("import * as ns from 'a';");
+  await parseAndEvaluate("export * from 'a'");
+  await parseAndEvaluate("export default class { constructor() {} };");
+  await parseAndEvaluate("export default class foo { constructor() {} };");
+})();
+
+(async () => {
+  // Test default import
+  let m = parseModule("import a from 'a'; export { a };")
+  m.declarationInstantiation();
+  await m.evaluation()
+  assertEq(getModuleEnvironmentValue(m, "a"), 2);
+})();
+
+(async () => {
+  // Test named import
+  let m = parseModule("import { x as y } from 'a'; export { y };")
+  m.declarationInstantiation();
+  await m.evaluation();
+  assertEq(getModuleEnvironmentValue(m, "y"), 1);
+})();
+
+(async () => {
+  // Call exported function
+  let m = parseModule("import { f } from 'a'; export let x = f(3);")
+  m.declarationInstantiation();
+  await m.evaluation();
+  assertEq(getModuleEnvironmentValue(m, "x"), 4);
+})();
+
+(async () => {
+  // Test importing an indirect export
+  registerModule('b', parseModule("export { x as z } from 'a';"));
+  let m = await parseAndEvaluate("import { z } from 'b'; export { z }");
+  assertEq(getModuleEnvironmentValue(m, "z"), 1);
+})();
+
+(async () => {
+  // Test cyclic dependencies
+  registerModule('c1', parseModule("export var x = 1; export {y} from 'c2'"));
+  registerModule('c2', parseModule("export var y = 2; export {x} from 'c1'"));
+  let m = await parseAndEvaluate(`import { x as x1, y as y1 } from 'c1';
+                        import { x as x2, y as y2 } from 'c2';
+                        export let z = [x1, y1, x2, y2]`);
+  assertDeepEq(getModuleEnvironmentValue(m, "z"), [1, 2, 1, 2]);
+})();
+
+(async () => {
+  // Import access in functions
+  let m = await parseModule("import { x } from 'a'; function f() { return x; }")
+  m.declarationInstantiation();
+  m.evaluation();
+  let f = getModuleEnvironmentValue(m, "f");
+  assertEq(f(), 1);
+})();
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/modules/module-this.js firefox-85.0+build1/js/src/jit-test/tests/modules/module-this.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/modules/module-this.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/modules/module-this.js	2021-01-18 19:58:12.000000000 +0000
@@ -1,3 +1,4 @@
+// |jit-test| --enable-top-level-await;
 // Test 'this' is undefined in modules.
 
 function parseAndEvaluate(source) {
@@ -6,10 +7,19 @@
     return m.evaluation();
 }
 
-assertEq(typeof(parseAndEvaluate("this")), "undefined");
+parseAndEvaluate("this")
+  .then(value => assertEq(typeof(value), "undefined"))
+  .catch(error => {
+    // We shouldn't throw in this case.
+    assertEq(false, true)
+  });
 
 let m = parseModule("export function getThis() { return this; }");
 m.declarationInstantiation();
-m.evaluation();
-let f = getModuleEnvironmentValue(m, "getThis");
-assertEq(typeof(f()), "undefined");
+m.evaluation()
+  .then(() => {
+    let f = getModuleEnvironmentValue(m, "getThis");
+    assertEq(typeof(f()), "undefined");
+  });
+
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/parser/dumpStencil-01.js firefox-85.0+build1/js/src/jit-test/tests/parser/dumpStencil-01.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/parser/dumpStencil-01.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/parser/dumpStencil-01.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,3 +1,24 @@
-dumpStencil("x");
+dumpStencil("a");
+dumpStencil("ab");
+dumpStencil("abc");
+dumpStencil("/a/");
+dumpStencil("/ab/");
+dumpStencil("/abc/");
+dumpStencil("1");
+dumpStencil("1.2");
+dumpStencil("true");
+dumpStencil("[]");
+dumpStencil("[1]");
+dumpStencil("[1, 2]");
+dumpStencil("({})");
+dumpStencil("({x: 10})");
+dumpStencil("({x: a})");
+dumpStencil("({x:10, y: 20})");
+dumpStencil("({x:10, y: a})");
+dumpStencil("({x:10, [y]: a})");
 dumpStencil("function y() {}");
+dumpStencil("(function y() {})");
+dumpStencil("(function() {})");
+dumpStencil("1n");
+dumpStencil("100n");
 dumpStencil("export var z;", { module : true });
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/parser/optimized-out-functions.js firefox-85.0+build1/js/src/jit-test/tests/parser/optimized-out-functions.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/parser/optimized-out-functions.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/parser/optimized-out-functions.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,7 @@
+// Functions optimized out by constant-folding should have correct
+// stencil data.
+// This shouldn't hit any assertion while iterating stencil while instantiation.
+(function() {
+  (function() {
+  });
+});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/parser/script-source-extent.js firefox-85.0+build1/js/src/jit-test/tests/parser/script-source-extent.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/parser/script-source-extent.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/parser/script-source-extent.js	2021-01-18 19:58:12.000000000 +0000
@@ -13,6 +13,9 @@
 let dbg = new Debugger();
 let debuggeeCompartment = newGlobal({newCompartment: true});
 
+// Some static class field initializer lambdas may be thrown away by GC.
+gczeal(0);
+
 function getScriptSourceExtent(source) {
     // NOTE: We will _evaluate_ the source below which may introduce dynamic
     //       scripts which are also reported. This is intended so that we may test
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/promise/newpromisecapability-error-message.js firefox-85.0+build1/js/src/jit-test/tests/promise/newpromisecapability-error-message.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/promise/newpromisecapability-error-message.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/promise/newpromisecapability-error-message.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,3 @@
-// |jit-test| --no-warp
-// Disable WarpBuilder because the expression decompiler is not used for Ion
-// frames currently. See bug 831120.
-
 load(libdir + "asserts.js");
 
 let foo = {};
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/structured-clone/transferable-across-segments.js firefox-85.0+build1/js/src/jit-test/tests/structured-clone/transferable-across-segments.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/structured-clone/transferable-across-segments.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/structured-clone/transferable-across-segments.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,13 @@
+// Default capacity is 4096 bytes and each entry requires 24 bytes, so when
+// the transferables list contains >170 entries, more than one segment is
+// used, because 171 * 24 = 4104 and 4104 > 4096.
+
+const transferables = [];
+for (let i = 0; i < 170 + 1; ++i) {
+  transferables.push(new ArrayBuffer(1));
+}
+
+// Just don't crash.
+serialize([], transferables, {
+  scope: "DifferentProcess",
+});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1676639.js firefox-85.0+build1/js/src/jit-test/tests/warp/bug1676639.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1676639.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/warp/bug1676639.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,7 @@
+function foo() {
+  return Math.atanh(true === Math.fround(0) | 0) != true;
+}
+var results = [];
+for (var j = 0; j < 50; j++) {
+  results.push(foo(0,0));
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681056.js firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681056.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681056.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681056.js	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1,9 @@
+gczeal(14,10);
+let y = [];
+try {
+    evaluate(`(function() {
+      for (let x10 = 0;
+           new class Object extends Object { v = function () {} };
+           arguments << this) {}
+      })()`);
+} catch(exc) {}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681677.js firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681677.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681677.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681677.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,7 @@
+var a = [1];
+var p = {__proto__: Array.prototype};
+Object.setPrototypeOf(a, p);
+for (var i = 0; i < 100; ++i) {
+  var x = a.slice(0);
+  assertEq(x.__proto__, Array.prototype);
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681806.js firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681806.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/warp/bug1681806.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/warp/bug1681806.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,92 @@
+// |jit-test| skip-if: !getJitCompilerOptions()['ion.enable']
+
+with ({}) {}
+
+let foo, bar, active;
+
+function test(depth) {
+    print(depth);
+
+    // Define two mutually recursive functions with as many locals as possible
+    // to maximize the size of the rematerialized frame when we bail out (~4K).
+    foo = new Function('n', `
+       var a0,b0,c0,d0,e0,f0,g0,h0,i0,j0,k0,l0,m0,n0,o0,p0,q0,r0,s0,t0,u0,v0,w0,x0,y0,z0;
+       var a1,b1,c1,d1,e1,f1,g1,h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,r1,s1,t1,u1,v1,w1,x1,y1,z1;
+       var a2,b2,c2,d2,e2,f2,g2,h2,i2,j2,k2,l2,m2,n2,o2,p2,q2,r2,s2,t2,u2,v2,w2,x2,y2,z2;
+       var a3,b3,c3,d3,e3,f3,g3,h3,i3,j3,k3,l3,m3,n3,o3,p3,q3,r3,s3,t3,u3,v3,w3,x3,y3,z3;
+       var a4,b4,c4,d4,e4,f4,g4,h4,i4,j4,k4,l4,m4,n4,o4,p4,q4,r4,s4,t4,u4,v4,w4,x4,y4,z4;
+       var a5,b5,c5,d5,e5,f5,g5,h5,i5,j5,k5,l5,m5,n5,o5,p5,q5,r5,s5,t5,u5,v5,w5,x5,y5,z5;
+       var a6,b6,c6,d6,e6,f6,g6,h6,i6,j6,k6,l6,m6,n6,o6,p6,q6,r6,s6,t6,u6,v6,w6,x6,y6,z6;
+       var a7,b7,c7,d7,e7,f7,g7,h7,i7,j7,k7,l7,m7,n7,o7,p7,q7,r7,s7,t7,u7,v7,w7,x7,y7,z7;
+       var a8,b8,c8,d8,e8,f8,g8,h8,i8,j8,k8,l8,m8,n8,o8,p8,q8,r8,s8,t8,u8,v8,w8,x8,y8,z8;
+       var a9,b9,c9,d9,e9,f9,g9,h9,i9,j9,k9,l9,m9,n9,o9,p9,q9,r9,s9,t9;
+       if (n == 0) {
+         if (active) invalidate();
+       } else {
+         bar(n);
+       }`);
+    bar = new Function('n', `
+       var a0,b0,c0,d0,e0,f0,g0,h0,i0,j0,k0,l0,m0,n0,o0,p0,q0,r0,s0,t0,u0,v0,w0,x0,y0,z0;
+       var a1,b1,c1,d1,e1,f1,g1,h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,r1,s1,t1,u1,v1,w1,x1,y1,z1;
+       var a2,b2,c2,d2,e2,f2,g2,h2,i2,j2,k2,l2,m2,n2,o2,p2,q2,r2,s2,t2,u2,v2,w2,x2,y2,z2;
+       var a3,b3,c3,d3,e3,f3,g3,h3,i3,j3,k3,l3,m3,n3,o3,p3,q3,r3,s3,t3,u3,v3,w3,x3,y3,z3;
+       var a4,b4,c4,d4,e4,f4,g4,h4,i4,j4,k4,l4,m4,n4,o4,p4,q4,r4,s4,t4,u4,v4,w4,x4,y4,z4;
+       var a5,b5,c5,d5,e5,f5,g5,h5,i5,j5,k5,l5,m5,n5,o5,p5,q5,r5,s5,t5,u5,v5,w5,x5,y5,z5;
+       var a6,b6,c6,d6,e6,f6,g6,h6,i6,j6,k6,l6,m6,n6,o6,p6,q6,r6,s6,t6,u6,v6,w6,x6,y6,z6;
+       var a7,b7,c7,d7,e7,f7,g7,h7,i7,j7,k7,l7,m7,n7,o7,p7,q7,r7,s7,t7,u7,v7,w7,x7,y7,z7;
+       var a8,b8,c8,d8,e8,f8,g8,h8,i8,j8,k8,l8,m8,n8,o8,p8,q8,r8,s8,t8,u8,v8,w8,x8,y8,z8;
+       var a9,b9,c9,d9,e9,f9,g9,h9,i9,j9,k9,l9,m9,n9,o9,p9,q9,r9,s9,t9;
+       foo(n-1);`);
+
+    with ({}) {}
+
+    // Warm up the invalidate() branch of foo to avoid FirstExecution bailouts.
+    active = true;
+    for (var i = 0; i < 10; i++) {
+        foo(2);
+    }
+
+    // Warp-compile foo, inlining bar.
+    active = false;
+    for (var i = 0; i < 30; i++) {
+        foo(2);
+    }
+
+    // Consume stack with frames that don't have to be invalidated.
+    function recurse(n) {
+        with ({}) {}
+        if (n == 0) {
+            foo(2);
+        } else {
+            recurse(n-1);
+        }
+    }
+
+    // Trigger an invalidation.
+    active = true;
+    recurse(depth);
+}
+
+// Binary search to find the right recursion depth such that
+// the invalidation bailout will cause stack overflow.
+let depth = 0;
+function probeStackLimit(increment) {
+    try {
+        while (true) {
+            test(depth + increment);
+            depth += increment;
+        }
+    } catch {}
+}
+
+probeStackLimit(8192);
+probeStackLimit(4096);
+probeStackLimit(2048);
+probeStackLimit(1024);
+probeStackLimit(512);
+probeStackLimit(256);
+probeStackLimit(128);
+probeStackLimit(64);
+probeStackLimit(32);
+probeStackLimit(16);
+probeStackLimit(8);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/warp/phi-specialization.js firefox-85.0+build1/js/src/jit-test/tests/warp/phi-specialization.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/warp/phi-specialization.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/warp/phi-specialization.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,42 @@
+// |jit-test| --fast-warmup
+
+var sum = 0;
+
+function foo(copy, shouldThrow) {
+  switch (copy) {
+   case 0:
+    var x = 0;
+    try {
+      if (shouldThrow) { throw 0;}
+      x = 1;
+    } catch {
+      x = "a";
+    }
+    // We create a specialized phi for x here, which bails out.
+    for (var i = 0; i < 100; i++) {
+      sum += x;
+    }
+    break;
+   case 1:
+    var y = 0;
+    try {
+      if (shouldThrow) { throw 0;}
+      y = 1;
+    } catch {
+      y = "a";
+    }
+    // We do not create a specialized phi the second time.
+    for (var i = 0; i < 100; i++) {
+      sum += y;
+    }
+    break;
+  }
+}
+
+with ({}) {}
+for (var i = 0; i < 2; i++) {
+  for (var j = 0; j < 50; j++) {
+    foo(i, false);
+  }
+  foo(i, true);
+}
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/const.js firefox-85.0+build1/js/src/jit-test/tests/wasm/const.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/const.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/const.js	2021-01-18 19:58:12.000000000 +0000
@@ -37,10 +37,10 @@
 testConst('i64', '0xffffffffffffffff', -1);
 
 testConst('i64', '0xdeadc0de', 0xdeadc0de);
-testConst('i64', '0x1337c0de00000000', 0x1337c0de);
+testConst('i64', '0x1337c0de00000000', '0x1337c0de00000000');
 
 testConst('i64', '0x0102030405060708', '0x0102030405060708');
-testConst('i64', '-0x0102030405060708', '-0x0102030505060708');
+testConst('i64', '-0x0102030405060708', '-0x0102030405060708');
 
 // INT64_MAX
 testConst('i64', '9223372036854775807', '0x7fffffffffffffff');
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/control-flow.js firefox-85.0+build1/js/src/jit-test/tests/wasm/control-flow.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/control-flow.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/control-flow.js	2021-01-18 19:58:13.000000000 +0000
@@ -157,13 +157,13 @@
 assertEq(counter, 0);
 
 // "if" doesn't return an expression value
-wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 42) (i32.const 0))))', /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 42) (i32.const 0))))', /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 42) (drop (i32.const 0)))))', emptyStackError);
-wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 1) (i32.const 0) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 1) (i32.const 0) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 wasmFailValidateText('(module (func (result i32) (if (result i32) (i32.const 1) (drop (i32.const 0)) (if (i32.const 1) (drop (i32.const 1))))))', emptyStackError);
-wasmFailValidateText('(module (func (if (result i32) (i32.const 1) (i32.const 0) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText('(module (func (if (result i32) (i32.const 1) (i32.const 0) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 wasmFailValidateText('(module (func (if (result i32) (i32.const 1) (i32.const 0) (if (i32.const 1) (drop (i32.const 1))))))', emptyStackError);
-wasmFailValidateText('(module (func (if (i32.const 1) (drop (i32.const 0)) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText('(module (func (if (i32.const 1) (drop (i32.const 0)) (if (result i32) (i32.const 1) (i32.const 1)))))', /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 wasmEvalText('(module (func (if (i32.const 1) (drop (i32.const 0)) (if (i32.const 1) (drop (i32.const 1))))))');
 
 // ----------------------------------------------------------------------------
@@ -315,7 +315,7 @@
 wasmFailValidateText('(module (func (result i32) (block (br 0))))', emptyStackError);
 wasmFailValidateText('(module (func (result i32) (block (result f32) (br 0 (f32.const 42)))))', mismatchError("f32", "i32"));
 
-wasmFailValidateText(`(module (func (param i32) (result i32) (block (if (result i32) (local.get 0) (br 0 (i32.const 42))))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText(`(module (func (param i32) (result i32) (block (if (result i32) (local.get 0) (br 0 (i32.const 42))))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 wasmFailValidateText(`(module (func (param i32) (result i32) (block (result i32) (if (local.get 0) (drop (i32.const 42))) (br 0 (f32.const 42)))) (export "" (func 0)))`, mismatchError("f32", "i32"));
 
 wasmFullPass('(module (func (result i32) (br 0 (i32.const 42)) (i32.const 13)) (export "run" (func 0)))', 42);
@@ -328,7 +328,7 @@
 assertEq(f(0), 43);
 assertEq(f(1), 43);
 
-wasmFailValidateText(`(module (func (param i32) (result i32) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 42))) (i32.const 43))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText(`(module (func (param i32) (result i32) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 42))) (i32.const 43))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 
 var f = wasmEvalText(`(module (func (param i32) (result i32) (block (result i32) (if (local.get 0) (br 1 (i32.const 42))) (i32.const 43))) (export "" (func 0)))`).exports[""];
 assertEq(f(0), 43);
@@ -344,7 +344,7 @@
 assertEq(f(0), 43);
 assertEq(f(1), 43);
 
-wasmFailValidateText(`(module (func (param i32) (result i32) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 42))) (br 0 (i32.const 43)))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText(`(module (func (param i32) (result i32) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 42))) (br 0 (i32.const 43)))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 
 var f = wasmEvalText(`(module (func (param i32) (result i32) (if (local.get 0) (br 1 (i32.const 42))) (br 0 (i32.const 43))) (export "" (func 0)))`).exports[""];
 assertEq(f(0), 43);
@@ -366,7 +366,7 @@
 assertEq(f(0), 0);
 assertEq(f(1), 0);
 
-wasmFailValidateText(`(module (func (param i32) (result i32) (i32.add (i32.const 1) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 99))) (i32.const -1)))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected Some\(I32\) but nothing on stack)/);
+wasmFailValidateText(`(module (func (param i32) (result i32) (i32.add (i32.const 1) (block (result i32) (if (result i32) (local.get 0) (br 0 (i32.const 99))) (i32.const -1)))) (export "" (func 0)))`, /(if without else with a result value)|(type mismatch: expected i32 but nothing on stack)/);
 
 var f = wasmEvalText(`(module (func (param i32) (result i32) (i32.add (i32.const 1) (block (result i32) (if (local.get 0) (br 1 (i32.const 99))) (i32.const -1)))) (export "" (func 0)))`).exports[""];
 assertEq(f(0), 0);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/directives.txt firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/directives.txt
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/directives.txt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/directives.txt	2021-01-18 19:58:12.000000000 +0000
@@ -0,0 +1 @@
+|jit-test| --wasm-exceptions; test-also=--wasm-compiler=optimizing; test-also=--wasm-compiler=baseline; test-also=--test-wasm-await-tier2; include:wasm.js; skip-if: !wasmExceptionsEnabled()
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/events.js firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/events.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/events.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/events.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,160 @@
+// Tests for event section support
+
+load(libdir + "wasm-binary.js");
+
+function wasmEval(code, imports) {
+  new WebAssembly.Instance(new WebAssembly.Module(code), imports).exports;
+}
+
+function wasmError(code, errorType, regexp) {
+  assertErrorMessage(() => wasmEval(code, {}), errorType, regexp);
+}
+
+const emptyType = { args: [], ret: VoidCode };
+const badExnType = { args: [], ret: I32Code };
+
+wasmEvalText(`
+  (module
+    (type (func (param i32)))
+    (event $exn (type 0)))
+`);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    { name: eventId, body: [] },
+  ]),
+  WebAssembly.CompileError,
+  /expected number of events/
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    { name: eventId, body: [1, 1] },
+  ]),
+  WebAssembly.CompileError,
+  /illegal event kind/
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    { name: eventId, body: [1, 0] },
+  ]),
+  WebAssembly.CompileError,
+  /expected function index in event/
+);
+
+wasmEval(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    eventSection([{ type: 0 }]),
+  ])
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([badExnType]),
+    memorySection(0),
+    eventSection([{ type: 0 }]),
+  ]),
+  WebAssembly.CompileError,
+  /exception function types must not return anything/
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    eventSection([{ type: 1 }]),
+  ]),
+  WebAssembly.CompileError,
+  /function type index in event out of bounds/
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    eventSection([{ type: 0 }]),
+    memorySection(0),
+  ]),
+  WebAssembly.CompileError,
+  /expected custom section/
+);
+
+(() => {
+  const body = [1];
+  body.push(...string("mod"));
+  body.push(...string("exn"));
+  body.push(...varU32(EventCode));
+
+  wasmError(
+    moduleWithSections([
+      sigSection([emptyType]),
+      { name: importId, body: body },
+    ]),
+    WebAssembly.CompileError,
+    /expected event kind/
+  );
+
+  body.push(...varU32(0));
+  wasmError(
+    moduleWithSections([
+      sigSection([emptyType]),
+      { name: importId, body: body },
+    ]),
+    WebAssembly.CompileError,
+    /expected function index in event/
+  );
+
+  body.push(...varU32(1));
+  wasmError(
+    moduleWithSections([
+      sigSection([emptyType]),
+      { name: importId, body: body },
+    ]),
+    WebAssembly.CompileError,
+    /function type index in event out of bounds/
+  );
+})();
+
+wasmEval(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    eventSection([{ type: 0 }]),
+    exportSection([{ eventIndex: 0, name: "exn" }]),
+  ])
+);
+
+wasmError(
+  moduleWithSections([
+    sigSection([emptyType]),
+    memorySection(0),
+    eventSection([{ type: 0 }]),
+    exportSection([{ eventIndex: 1, name: "exn" }]),
+  ]),
+  WebAssembly.CompileError,
+  /exported event index out of bounds/
+);
+
+(() => {
+  const body = [1];
+  body.push(...string("exn"));
+  body.push(...varU32(EventCode));
+  wasmError(
+    moduleWithSections([
+      sigSection([emptyType]),
+      memorySection(0),
+      eventSection([{ type: 0 }]),
+      { name: exportId, body: body },
+    ]),
+    WebAssembly.CompileError,
+    /expected event index/
+  );
+})();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/import-export.js firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/import-export.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/import-export.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/import-export.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,102 @@
+// Tests for Wasm exception import and export.
+
+// The WebAssembly.Exception constructor cannot be called for now until the
+// JS API specifies the behavior.
+function testException() {
+  assertErrorMessage(
+    () => new WebAssembly.Exception(),
+    WebAssembly.RuntimeError,
+    /cannot call WebAssembly.Exception/
+  );
+}
+
+function testImports() {
+  var mod = `
+    (module
+      (type (func (param i32 i32)))
+      (import "m" "exn" (event (type 0))))
+ `;
+
+  assertErrorMessage(
+    () => wasmEvalText(mod, { m: { exn: "not an exception" } }),
+    WebAssembly.LinkError,
+    /import object field 'exn' is not a Exception/
+  );
+}
+
+function testExports() {
+  var exports = wasmEvalText(`
+    (module (type (func)) (event (export "exn") (type 0)))
+  `).exports;
+
+  assertEq(typeof exports.exn, "object");
+  assertEq(exports.exn instanceof WebAssembly.Exception, true);
+}
+
+function testImportExport() {
+  var exports = wasmEvalText(`
+    (module
+      (type (func (param i32)))
+      (event (export "exn") (type 0)))
+  `).exports;
+
+  wasmEvalText(
+    `
+    (module
+      (type (func (param i32)))
+      (import "m" "exn" (event (type 0))))
+  `,
+    { m: exports }
+  );
+
+  assertErrorMessage(
+    () => {
+      wasmEvalText(
+        `
+      (module
+        (type (func (param)))
+        (import "m" "exn" (event (type 0))))
+    `,
+        { m: exports }
+      );
+    },
+    WebAssembly.LinkError,
+    /imported exception 'm.exn' signature mismatch/
+  );
+}
+
+// Test imports/exports descriptions.
+function testDescriptions() {
+  const imports = WebAssembly.Module.imports(
+    new WebAssembly.Module(
+      wasmTextToBinary(`
+        (module $m
+          (type (func))
+          (import "m" "e" (event (type 0))))
+      `)
+    )
+  );
+
+  const exports = WebAssembly.Module.exports(
+    new WebAssembly.Module(
+      wasmTextToBinary(`
+        (module
+          (type (func))
+          (event (export "e") (type 0)))
+      `)
+    )
+  );
+
+  assertEq(imports[0].module, "m");
+  assertEq(imports[0].name, "e");
+  assertEq(imports[0].kind, "event");
+
+  assertEq(exports[0].name, "e");
+  assertEq(exports[0].kind, "event");
+}
+
+testException();
+testImports();
+testExports();
+testImportExport();
+testDescriptions();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/validation.js firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/validation.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/exceptions/validation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/exceptions/validation.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,341 @@
+// Test wasm type validation for exception handling instructions.
+
+load(libdir + "wasm-binary.js");
+
+function wasmValid(mod) {
+  assertEq(WebAssembly.validate(mod), true);
+}
+
+// Note: the pattern variable is ignored until compilation is implemented
+// for exception instructions, which allows checking error messages.
+function wasmInvalid(mod, pattern) {
+  assertEq(WebAssembly.validate(mod), false);
+}
+
+const emptyType = { args: [], ret: VoidCode };
+const i32Type = { args: [I32Code], ret: VoidCode };
+const toi32Type = { args: [], ret: I32Code };
+const i32Toi32Type = { args: [I32Code], ret: I32Code };
+const i32Toi64Type = { args: [I32Code], ret: I64Code };
+const i32i32Toi32Type = { args: [I32Code, I32Code], ret: I32Code };
+
+function testValidateDecode() {
+  // Try blocks must have a block type code.
+  wasmInvalid(
+    moduleWithSections([
+      sigSection([emptyType]),
+      declSection([0]),
+      eventSection([{ type: 0 }]),
+      bodySection([
+        funcBody({
+          locals: [],
+          body: [
+            TryCode,
+            // Missing type code.
+            I32ConstCode,
+            0x01,
+            CatchCode,
+            0x00,
+            EndCode,
+            DropCode,
+            ReturnCode,
+          ],
+        }),
+      ]),
+    ]),
+    /bad type/
+  );
+
+  // Catch must have an event index.
+  wasmInvalid(
+    moduleWithSections([
+      sigSection([emptyType]),
+      declSection([0]),
+      eventSection([{ type: 0 }]),
+      bodySection([
+        funcBody(
+          {
+            locals: [],
+            body: [
+              TryCode,
+              I32Code,
+              I32ConstCode,
+              0x01,
+              CatchCode,
+              // Index missing.
+            ],
+          },
+          (withEndCode = false)
+        ),
+      ]),
+    ]),
+    /expected event index/
+  );
+
+  // Try blocks must have a second branch after the main body.
+  wasmInvalid(
+    moduleWithSections([
+      sigSection([emptyType]),
+      declSection([0]),
+      eventSection([{ type: 0 }]),
+      bodySection([
+        funcBody({
+          locals: [],
+          body: [
+            TryCode,
+            I32Code,
+            I32ConstCode,
+            0x01,
+            // Missing instruction here.
+            EndCode,
+            DropCode,
+            ReturnCode,
+          ],
+        }),
+      ]),
+    ]),
+    /try without catch or unwind not allowed/
+  );
+}
+
+function testValidateThrow() {
+  valid = `(module
+             (type (func (param i32)))
+             (func $exn-zero
+               i32.const 0
+               throw $exn1)
+             (event $exn1 (type 0)))`;
+
+  invalid0 = `(module
+                (type (func (param i32)))
+                (func $exn-zero
+                  throw $exn1)
+                (event $exn1 (type 0)))`;
+  error0 = /popping value from empty stack/;
+
+  invalid1 = `(module
+                (type (func (param i32)))
+                (func $exn-zero
+                  i64.const 0
+                  throw $exn1)
+                (event $exn1 (type 0)))`;
+  error1 = /expression has type i64 but expected i32/;
+
+  invalid2 = `(module
+                (type (func (param i32)))
+                (func $exn-zero
+                  i32.const 0
+                  throw 1)
+                (event $exn1 (type 0)))`;
+  error2 = /event index out of range/;
+
+  wasmValidateText(valid);
+  wasmFailValidateText(invalid0, error0);
+  wasmFailValidateText(invalid1, error1);
+  wasmFailValidateText(invalid2, error2);
+}
+
+function testValidateTryCatch() {
+  function mod_with(fbody) {
+    return moduleWithSections([
+      sigSection([emptyType, i32Type, i32i32Toi32Type]),
+      declSection([0]),
+      eventSection([{ type: 0 }, { type: 1 }]),
+      bodySection([
+        funcBody({
+          locals: [],
+          body: fbody,
+        }),
+      ]),
+    ]);
+  }
+
+  const body1 = [
+    // try (result i32)
+    TryCode,
+    I32Code,
+    // (i32.const 1)
+    I32ConstCode,
+    varU32(1),
+    // catch 1
+    CatchCode,
+    varU32(1),
+  ];
+
+  const valid1 = mod_with(body1.concat([EndCode, DropCode, ReturnCode]));
+  const invalid1 = mod_with(
+    body1.concat([I32ConstCode, varU32(2), EndCode, DropCode, ReturnCode])
+  );
+
+  const valid2 = mod_with([
+    // (i32.const 0) (i32.const 0)
+    I32ConstCode,
+    varU32(0),
+    I32ConstCode,
+    varU32(0),
+    // try (param i32 i32) (result i32) drop drop (i32.const 1)
+    TryCode,
+    varS32(2),
+    DropCode,
+    DropCode,
+    I32ConstCode,
+    varU32(1),
+    // catch 0 (i32.const 2) end drop return
+    CatchCode,
+    varU32(0),
+    I32ConstCode,
+    varU32(2),
+    EndCode,
+    DropCode,
+    ReturnCode,
+  ]);
+
+  wasmValid(valid1);
+  wasmInvalid(invalid1, /unused values not explicitly dropped/);
+  wasmValid(valid2);
+}
+
+function testValidateCatch() {
+  wasmInvalid(
+    moduleWithSections([
+      sigSection([emptyType]),
+      declSection([0]),
+      bodySection([
+        funcBody({
+          locals: [],
+          body: [TryCode, VoidCode, CatchCode, varU32(0), EndCode],
+        }),
+      ]),
+    ]),
+    /event index out of range/
+  );
+}
+
+function testValidateExnPayload() {
+  valid0 = moduleWithSections([
+    sigSection([i32Type, i32Toi32Type]),
+    declSection([1]),
+    // (event $exn (param i32))
+    eventSection([{ type: 0 }]),
+    bodySection([
+      // (func (param i32) (result i32) ...
+      funcBody({
+        locals: [],
+        body: [
+          // try (result i32) (local.get 0) (throw $exn) (i32.const 1)
+          TryCode,
+          I32Code,
+          LocalGetCode,
+          varU32(0),
+          ThrowCode,
+          varU32(0),
+          I32ConstCode,
+          varU32(1),
+          // catch $exn (i32.const 1) (i32.add) end
+          CatchCode,
+          varU32(0),
+          I32ConstCode,
+          varU32(1),
+          I32AddCode,
+          EndCode,
+        ],
+      }),
+    ]),
+  ]);
+
+  // This is to ensure the following sentence from the spec overview holds:
+  // > "the operand stack is popped back to the size the operand stack had
+  // > when the try block was entered"
+  valid1 = moduleWithSections([
+    sigSection([i32Type, toi32Type]),
+    declSection([1]),
+    // (event $exn (param i32))
+    eventSection([{ type: 0 }]),
+    bodySection([
+      // (func (result i32) ...
+      funcBody({
+        locals: [],
+        body: [
+          // try (result i32) (i32.const 0) (i32.const 1) (throw $exn) drop
+          TryCode,
+          I32Code,
+          I32ConstCode,
+          varU32(0),
+          I32ConstCode,
+          varU32(1),
+          ThrowCode,
+          varU32(0),
+          DropCode,
+          // catch $exn drop (i32.const 2) end
+          CatchCode,
+          varU32(0),
+          DropCode,
+          I32ConstCode,
+          varU32(2),
+          EndCode,
+        ],
+      }),
+    ]),
+  ]);
+
+  invalid0 = moduleWithSections([
+    sigSection([i32Type, i32Toi64Type]),
+    declSection([1]),
+    // (event $exn (param i32))
+    eventSection([{ type: 0 }]),
+    bodySection([
+      // (func (param i32) (result i64) ...
+      funcBody({
+        locals: [],
+        body: [
+          // try (result i64) (local.get 0) (throw $exn) (i64.const 0)
+          TryCode,
+          I64Code,
+          LocalGetCode,
+          varU32(0),
+          ThrowCode,
+          varU32(0),
+          I64ConstCode,
+          varU32(0),
+          // catch $exn end
+          CatchCode,
+          varU32(0),
+          EndCode,
+        ],
+      }),
+    ]),
+  ]);
+
+  invalid1 = moduleWithSections([
+    // (type (func))
+    sigSection([emptyType]),
+    declSection([0]),
+    // (event $exn (type 0))
+    eventSection([{ type: 0 }]),
+    bodySection([
+      // (func ...
+      funcBody({
+        locals: [],
+        body: [
+          // try catch 1 end
+          TryCode,
+          VoidCode,
+          CatchCode,
+          varU32(1),
+          EndCode,
+        ],
+      }),
+    ]),
+  ]);
+
+  wasmValid(valid0);
+  wasmValid(valid1);
+  wasmInvalid(invalid0, /has type i32 but expected i64/);
+  wasmInvalid(invalid1, /event index out of range/);
+}
+
+testValidateDecode();
+testValidateThrow();
+testValidateTryCatch();
+testValidateCatch();
+testValidateExnPayload();
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/float.js firefox-85.0+build1/js/src/jit-test/tests/wasm/float.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/float.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/float.js	2021-01-18 19:58:12.000000000 +0000
@@ -84,7 +84,7 @@
 wasmFailValidateText('(module (func (param i32) (result f64) (f64.sqrt (local.get 0))))', mismatchError("i32", "f64"));
 wasmFailValidateText('(module (func (param f64) (result i32) (f64.sqrt (local.get 0))))', mismatchError("f64", "i32"));
 wasmFailValidateText('(module (func (param i32) (result i32) (f64.sqrt (local.get 0))))', mismatchError("i32", "f64"));
-wasmFailValidateText('(module (func (f32.sqrt (nop))))', /(popping value from empty stack)|(type mismatch: expected Some\(F32\) but nothing on stack)/);
+wasmFailValidateText('(module (func (f32.sqrt (nop))))', /(popping value from empty stack)|(type mismatch: expected f32 but nothing on stack)/);
 
 wasmFailValidateText('(module (func (param i32) (param f32) (result f32) (f32.add (local.get 0) (local.get 1))))', mismatchError("i32", "f32"));
 wasmFailValidateText('(module (func (param f32) (param i32) (result f32) (f32.add (local.get 0) (local.get 1))))', mismatchError("i32", "f32"));
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/externref-boxing-struct.js firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/externref-boxing-struct.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/externref-boxing-struct.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/externref-boxing-struct.js	2021-01-18 19:58:13.000000000 +0000
@@ -35,7 +35,7 @@
            (func (export "make") (param $v externref) (result eqref)
              (struct.new $S (local.get $v))))`);
     let x = ins.exports.make(v);
-    assertEq(x._0, v);
+    assertEq(x[0], v);
 }
 
 // Try to make sure externrefs are properly traced
@@ -51,26 +51,26 @@
     let ins = wasmEvalText(txt);
     let x = ins.exports.make({x:0}, {x:1}, {x:2}, {x:3}, {x:4}, {x:5}, {x:6}, {x:7}, {x:8}, {x:9})
     gc('shrinking');
-    assertEq(typeof x._0, "object");
-    assertEq(x._0.x, 0);
-    assertEq(typeof x._1, "object");
-    assertEq(x._1.x, 1);
-    assertEq(typeof x._2, "object");
-    assertEq(x._2.x, 2);
-    assertEq(typeof x._3, "object");
-    assertEq(x._3.x, 3);
-    assertEq(typeof x._4, "object");
-    assertEq(x._4.x, 4);
-    assertEq(typeof x._5, "object");
-    assertEq(x._5.x, 5);
-    assertEq(typeof x._6, "object");
-    assertEq(x._6.x, 6);
-    assertEq(typeof x._7, "object");
-    assertEq(x._7.x, 7);
-    assertEq(typeof x._8, "object");
-    assertEq(x._8.x, 8);
-    assertEq(typeof x._9, "object");
-    assertEq(x._9.x, 9);
+    assertEq(typeof x[0], "object");
+    assertEq(x[0].x, 0);
+    assertEq(typeof x[1], "object");
+    assertEq(x[1].x, 1);
+    assertEq(typeof x[2], "object");
+    assertEq(x[2].x, 2);
+    assertEq(typeof x[3], "object");
+    assertEq(x[3].x, 3);
+    assertEq(typeof x[4], "object");
+    assertEq(x[4].x, 4);
+    assertEq(typeof x[5], "object");
+    assertEq(x[5].x, 5);
+    assertEq(typeof x[6], "object");
+    assertEq(x[6].x, 6);
+    assertEq(typeof x[7], "object");
+    assertEq(x[7].x, 7);
+    assertEq(typeof x[8], "object");
+    assertEq(x[8].x, 8);
+    assertEq(typeof x[9], "object");
+    assertEq(x[9].x, 9);
 }
 
 function iota(k) {
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/ref-struct.js firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/ref-struct.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/ref-struct.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/ref-struct.js	2021-01-18 19:58:13.000000000 +0000
@@ -244,7 +244,7 @@
        (ref.eq (call $f (local.get $n)) (local.get $n))))`).exports.test(),
          1);
 
-// Types are private to an instance and struct.narrow can't break this
+// Types are global and struct.narrow works across module boundaries
 
 {
     let txt =
@@ -258,8 +258,8 @@
     let ins1 = new WebAssembly.Instance(mod).exports;
     let ins2 = new WebAssembly.Instance(mod).exports;
     let obj = ins1.make(37);
-    assertEq(obj._0, 37);
-    assertEq(ins2.coerce(obj), 1);
+    assertEq(obj[0], 37);
+    assertEq(ins2.coerce(obj), 0);
 }
 
 // Negative tests
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/regress-1633355.js firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/regress-1633355.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/regress-1633355.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/regress-1633355.js	2021-01-18 19:58:13.000000000 +0000
@@ -26,5 +26,5 @@
 let mod = new WebAssembly.Module(bin);
 let ins = new WebAssembly.Instance(mod).exports;
 
-assertErrorMessage(() => ins.init(6), TypeError,
-                    /conversion from WebAssembly typed ref to JavaScript/);
+// Debugger can handle non-exposable fields, like (ref T).
+ins.init(6)
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/structs.js firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/structs.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/structs.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/structs.js	2021-01-18 19:58:13.000000000 +0000
@@ -199,26 +199,26 @@
 assertEq(ins.x2(8), Math.PI)
 
 var point = ins.mk_point();
-assertEq("_0" in point, true);
-assertEq("_1" in point, true);
-assertEq("_2" in point, false);
-assertEq(point._0, 37);
-assertEq(point._1, 42);
+assertEq(0 in point, true);
+assertEq(1 in point, true);
+assertEq(2 in point, false);
+assertEq(point[0], 37);
+assertEq(point[1], 42);
 
 var int_node = ins.mk_int_node(78, point);
-assertEq(int_node._0, 78);
-assertEq(int_node._1, point);
+assertEq(int_node[0], 78);
+assertEq(int_node[1], point);
 
 var bigger = ins.mk_bigger();
 for ( let i=0; i < 52; i++ )
-    assertEq(bigger["_" + i], i);
+    assertEq(bigger[i], i);
 
 var withfloats = ins.mk_withfloats(1/3, Math.PI, bigger, 5/6, 0x1337);
-assertEq(withfloats._0, Math.fround(1/3));
-assertEq(withfloats._1, Math.PI);
-assertEq(withfloats._2, bigger);
-assertEq(withfloats._3, Math.fround(5/6));
-assertEq(withfloats._4, 0x1337);
+assertEq(withfloats[0], Math.fround(1/3));
+assertEq(withfloats[1], Math.PI);
+assertEq(withfloats[2], bigger);
+assertEq(withfloats[3], Math.fround(5/6));
+assertEq(withfloats[4], 0x1337);
 
 // A simple stress test
 
@@ -238,8 +238,8 @@
 var stressLevel = conf.x64 && !conf.tsan && !conf.asan && !conf.valgrind ? 100000 : 1000;
 var the_list = stressIns.iota1(stressLevel);
 for (let i=1; i <= stressLevel; i++) {
-    assertEq(the_list._0, i);
-    the_list = the_list._1;
+    assertEq(the_list[0], i);
+    the_list = the_list[1];
 }
 assertEq(the_list, null);
 
@@ -283,21 +283,19 @@
 
     let v = ins.mk();
     assertEq(typeof v, "object");
-    assertEq(v._0, 0x7aaaaaaa);
-    assertEq(v._1_low, 0x01020337);
-    assertEq(v._1_high, 0x42);
+    assertEq(v[0], 0x7aaaaaaa);
+    assertEq(v[1], 0x4201020337n);
     assertEq(ins.low(v), 0x01020337);
     assertEq(ins.high(v), 0x42);
-    assertEq(v._2, 0x6bbbbbbb);
+    assertEq(v[2], 0x6bbbbbbb);
 
     ins.set(v);
-    assertEq(v._0, 0x7aaaaaaa);
-    assertEq(v._1_low, 0x76544567);
-    assertEq(v._2, 0x6bbbbbbb);
+    assertEq(v[0], 0x7aaaaaaa);
+    assertEq(v[1], 0x3333333376544567n);
+    assertEq(v[2], 0x6bbbbbbb);
 
     ins.set2(v);
-    assertEq(v._1_low, 0x53589793);
-    assertEq(v._1_high, 0x31415926)
+    assertEq(v[1], 0x3141592653589793n);
     assertEq(ins.low(v), 0x53589793);
     assertEq(ins.high(v), 0x31415926)
 }
@@ -347,32 +345,28 @@
     let ins = wasmEvalText(txt).exports;
 
     let v = ins.make();
-    assertEq(v._0, 0x7aaaaaaa);
-    assertEq(v._1_low, 0x01020337);
-    assertEq(v._1_high, 0x42);
-    assertEq(v._2, 0x6bbbbbbb);
+    assertEq(v[0], 0x7aaaaaaa);
+    assertEq(v[1], 0x4201020337n);
+    assertEq(v[2], 0x6bbbbbbb);
 
     ins.update0(0x45367101);
-    assertEq(v._0, 0x45367101);
+    assertEq(v[0], 0x45367101);
     assertEq(ins.get0(), 0x45367101);
-    assertEq(v._1_low, 0x01020337);
-    assertEq(v._1_high, 0x42);
-    assertEq(v._2, 0x6bbbbbbb);
+    assertEq(v[1], 0x4201020337n);
+    assertEq(v[2], 0x6bbbbbbb);
 
     ins.update2(0x62345123);
-    assertEq(v._0, 0x45367101);
-    assertEq(v._1_low, 0x01020337);
-    assertEq(v._1_high, 0x42);
+    assertEq(v[0], 0x45367101);
+    assertEq(v[1], 0x4201020337n);
     assertEq(ins.get2(), 0x62345123);
-    assertEq(v._2, 0x62345123);
+    assertEq(v[2], 0x62345123);
 
     ins.update1(0x77777777, 0x22222222);
-    assertEq(v._0, 0x45367101);
+    assertEq(v[0], 0x45367101);
     assertEq(ins.get1_low(), 0x22222222);
-    assertEq(v._1_low, 0x22222222);
     assertEq(ins.get1_high(), 0x77777777);
-    assertEq(v._1_high, 0x77777777);
-    assertEq(v._2, 0x62345123);
+    assertEq(v[1], 0x7777777722222222n);
+    assertEq(v[2], 0x62345123);
 }
 
 
@@ -600,13 +594,10 @@
           (func (export "make") (result eqref)
            (struct.new $s (i32.const 37) (i64.const 42))))`).exports;
     let v = ins.make();
-    assertErrorMessage(() => v._0 = 12,
+    assertErrorMessage(() => v[0] = 12,
                        Error,
                        /setting immutable field/);
-    assertErrorMessage(() => v._1_low = 12,
-                       Error,
-                       /setting immutable field/);
-    assertErrorMessage(() => v._1_high = 12,
+    assertErrorMessage(() => v[1] = 12,
                        Error,
                        /setting immutable field/);
 }
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/TypedObject.js firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/TypedObject.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/gc/TypedObject.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/gc/TypedObject.js	2021-01-18 19:58:13.000000000 +0000
@@ -10,9 +10,9 @@
                               (struct.new $p (f64.const 1.5) (i32.const 33))))`).exports;
 
     let p = ins.mkp();
-    assertEq(p._0, 1.5);
-    assertEq(p._1, 33);
-    assertEq(p._2, undefined);
+    assertEq(p[0], 1.5);
+    assertEq(p[1], 33);
+    assertEq(p[2], undefined);
 }
 
 // Writing an immutable field from JS throws.
@@ -25,7 +25,7 @@
                               (struct.new $p (f64.const 1.5))))`).exports;
 
     let p = ins.mkp();
-    assertErrorMessage(() => p._0 = 5.7,
+    assertErrorMessage(() => p[0] = 5.7,
                        Error,
                        /setting immutable field/);
 }
@@ -45,13 +45,8 @@
                              (func (export "mkr") (result eqref)
                               (struct.new $r (ref.null eq))))`).exports;
 
-    assertErrorMessage(() => new (ins.mkp().constructor)({_0:null}),
-                       TypeError,
-                       /not constructible/);
-
-    assertErrorMessage(() => new (ins.mkr().constructor)({_0:null}),
-                       TypeError,
-                       /not constructible/);
+    assertEq(ins.mkp().constructor, Object);
+    assertEq(ins.mkr().constructor, Object);
 }
 
 // MVA v1 restriction: all fields are immutable
@@ -68,17 +63,17 @@
                               (struct.new $p (ref.null $q) (ref.null eq))))`).exports;
     let q = ins.mkq();
     assertEq(typeof q, "object");
-    assertEq(q._0, 1.5);
+    assertEq(q[0], 1.5);
 
     let p = ins.mkp();
     assertEq(typeof p, "object");
-    assertEq(p._0, null);
+    assertEq(p[0], null);
 
-    assertErrorMessage(() => { p._0 = q },
+    assertErrorMessage(() => { p[0] = q },
                        Error,
                        /setting immutable field/);
 
-    assertErrorMessage(() => { p._1 = q },
+    assertErrorMessage(() => { p[1] = q },
                        Error,
                        /setting immutable field/);
 }
@@ -94,17 +89,11 @@
 
     let p = ins.mkp();
     assertEq(typeof p, "object");
-    assertEq(p._0_high, 0x12345678)
-    assertEq(p._0_low, 0x87654321|0);
+    assertEq(p[0], 0x1234567887654321n)
 
-    assertErrorMessage(() => new (p.constructor)({_0_high:0, _0_low:0}),
-                       TypeError,
-                       /not constructible/);
+    assertEq(p.constructor, Object);
 
-    assertErrorMessage(() => { p._0_low = 0 },
-                       Error,
-                       /setting immutable field/);
-    assertErrorMessage(() => { p._0_high = 0 },
+    assertErrorMessage(() => { p[0] = 0 },
                        Error,
                        /setting immutable field/);
 }
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/globals.js firefox-85.0+build1/js/src/jit-test/tests/wasm/globals.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/globals.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/globals.js	2021-01-18 19:58:13.000000000 +0000
@@ -303,7 +303,7 @@
         if (getBuildConfiguration().release_or_beta) {
             assertEq(s, "valueOf,value,");
         } else {
-            assertEq(s, "valueOf,type,value,");
+            assertEq(s, "type,valueOf,value,");
         }
     }
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/passive-segs-boundary.js firefox-85.0+build1/js/src/jit-test/tests/wasm/passive-segs-boundary.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/passive-segs-boundary.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/passive-segs-boundary.js	2021-01-18 19:58:13.000000000 +0000
@@ -246,7 +246,7 @@
 // init: too few args
 mem_test("(memory.init 1 (i32.const 1) (i32.const 1))", "",
          WebAssembly.CompileError,
-         /(popping value from empty stack)|(expected Some\(I32\) but nothing on stack)/);
+         /(popping value from empty stack)|(expected i32 but nothing on stack)/);
 
 // invalid argument types
 {
@@ -372,7 +372,7 @@
 // init: too few args
 tab_test("(table.init 1 (i32.const 1) (i32.const 1))", "",
          WebAssembly.CompileError,
-         /(popping value from empty stack)|(expected Some\(I32\) but nothing on stack)/);
+         /(popping value from empty stack)|(expected i32 but nothing on stack)/);
 
 // invalid argument types
 {
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/passive-segs-nonboundary.js firefox-85.0+build1/js/src/jit-test/tests/wasm/passive-segs-nonboundary.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/passive-segs-nonboundary.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/passive-segs-nonboundary.js	2021-01-18 19:58:13.000000000 +0000
@@ -370,7 +370,7 @@
         )`;
         assertErrorMessage(() => wasmEvalText(text1),
                            WebAssembly.CompileError,
-                           /(popping value from empty stack)|(expected Some\(I32\) but nothing on stack)/);
+                           /(popping value from empty stack)|(expected i32 but nothing on stack)/);
         let text2 =
         `(module
           (memory (export "memory") 1 1)
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/ref-types/tables-fill.js firefox-85.0+build1/js/src/jit-test/tests/wasm/ref-types/tables-fill.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/ref-types/tables-fill.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/ref-types/tables-fill.js	2021-01-18 19:58:13.000000000 +0000
@@ -175,7 +175,7 @@
         (table.fill $t (i32.const 0) (ref.null extern) (f64.const 0))
      ))`),
      WebAssembly.CompileError,
-     /(type mismatch: expression has type f64 but expected i32)|(type mismatch: expected Some\(I32\), found Some\(F64\))/);
+     /(type mismatch: expression has type f64 but expected i32)|(type mismatch: expected i32, found f64)/);
 
 assertErrorMessage(() => wasmEvalText(
     `(module
@@ -184,7 +184,7 @@
         (table.fill $t (i32.const 0) (f32.const 0) (i32.const 0))
      ))`),
      WebAssembly.CompileError,
-     /(type mismatch: expression has type f32 but expected externref)|(type mismatch: expected Some\(ExternRef\), found Some\(F32\))/);
+     /(type mismatch: expression has type f32 but expected externref)|(type mismatch: expected externref, found f32)/);
 
 assertErrorMessage(() => wasmEvalText(
     `(module
@@ -193,7 +193,7 @@
         (table.fill $t (i64.const 0) (ref.null extern) (i32.const 0))
      ))`),
      WebAssembly.CompileError,
-     /(type mismatch: expression has type i64 but expected i32)|(type mismatch: expected Some\(I32\), found Some\(I64\))/);
+     /(type mismatch: expression has type i64 but expected i32)|(type mismatch: expected i32, found i64)/);
 
 assertErrorMessage(() => wasmEvalText(
     `(module
@@ -211,4 +211,4 @@
          (table.fill (i32.const 0) (local.get $v) (i32.const 0)))
      )`),
      WebAssembly.CompileError,
-     /(expression has type externref but expected funcref)|(type mismatch: expected Some\(FuncRef\), found Some\(ExternRef\))/);
+     /(expression has type externref but expected funcref)|(type mismatch: expected funcref, found externref)/);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/ref-types/tables-generalized.js firefox-85.0+build1/js/src/jit-test/tests/wasm/ref-types/tables-generalized.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/ref-types/tables-generalized.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/ref-types/tables-generalized.js	2021-01-18 19:58:13.000000000 +0000
@@ -170,7 +170,7 @@
        (func (result i32)
          (call_indirect (type $t) (i32.const 37))))`)),
                    WebAssembly.CompileError,
-                   /(indirect calls must go through a table of 'funcref')|(type mismatch)/);
+                   /(indirect calls must go through a table of 'funcref')|(indirect calls must go through a table of funcref)/);
 
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -276,7 +276,7 @@
            (func (export "set_ref") (param i32) (param externref)
              (table.set (local.get 0) (local.get 1))))`)),
                    WebAssembly.CompileError,
-                   /(type mismatch: expression has type externref but expected funcref)|(type mismatch: expected Some\(FuncRef\), found Some\(ExternRef\))/);
+                   /(type mismatch: expression has type externref but expected funcref)|(type mismatch: expected funcref, found externref)/);
 
 // table.set with non-i32 index - fails validation
 
@@ -360,7 +360,7 @@
         (func (export "grow2") (param i32) (param externref) (result i32)
          (table.grow (local.get 1) (local.get 0))))`)),
                    WebAssembly.CompileError,
-                   /(type mismatch: expression has type externref but expected funcref)|(type mismatch: expected Some\(FuncRef\), found Some\(ExternRef\))/);
+                   /(type mismatch: expression has type externref but expected funcref)|(type mismatch: expected funcref, found externref)/);
 
 // Special case for private tables without a maximum
 
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/regress/bug1678785.js firefox-85.0+build1/js/src/jit-test/tests/wasm/regress/bug1678785.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/regress/bug1678785.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/regress/bug1678785.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,20 @@
+
+// This exposed a bug in CL's aarch64 isel, in which the -4098 was
+// incorrectly sign-extended out to 64 bits.
+
+let { exports } = new WebAssembly.Instance(new WebAssembly.Module(
+    wasmTextToBinary(`
+      (module
+        (type (;0;) (func))
+        (type (;1;) (func (result i32)))
+        (type (;2;) (func (result i64)))
+        (func (;0;) (type 0)
+          i32.const -4098
+          i32.load16_s offset=1
+          drop)
+        (memory (;0;) 1)
+        (export "g" (func 0)))` )));
+try {
+    exports.g();
+} catch (e) {}
+
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/select.js firefox-85.0+build1/js/src/jit-test/tests/wasm/select.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/select.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/select.js	2021-01-18 19:58:12.000000000 +0000
@@ -2,7 +2,7 @@
 
 wasmFailValidateText('(module (func (select (i32.const 0) (i32.const 0) (f32.const 0))))', mismatchError("f32", "i32"));
 
-wasmFailValidateText('(module (func (select (i32.const 0) (f32.const 0) (i32.const 0))) (export "" (func 0)))', /(select operand types must match)|(type mismatch: expected Some\(F32\), found Some\(I32\))/);
+wasmFailValidateText('(module (func (select (i32.const 0) (f32.const 0) (i32.const 0))) (export "" (func 0)))', /(select operand types must match)|(type mismatch: expected f32, found i32)/);
 wasmFailValidateText('(module (func (select (block ) (i32.const 0) (i32.const 0))) (export "" (func 0)))', emptyStackError);
 wasmFailValidateText('(module (func (select (return) (i32.const 0) (i32.const 0))) (export "" (func 0)))', unusedValuesError);
 assertEq(wasmEvalText('(module (func (drop (select (return) (i32.const 0) (i32.const 0)))) (export "" (func 0)))').exports[""](), undefined);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/ad-hack.js firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/ad-hack.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/ad-hack.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/ad-hack.js	2021-01-18 19:58:13.000000000 +0000
@@ -226,6 +226,15 @@
   return ((n + (n >> 4) & 0xF0F0F0F) * 0x1010101) >> 24
 }
 
+function jsValueToWasmName(x) {
+    if (typeof x == "number") {
+        if (x == 0) return 1 / x < 0 ? "-0" : "0";
+        if (isNaN(x)) return "+nan";
+        if (!isFinite(x)) return (x < 0 ? "-" : "+") + "inf";
+    }
+    return x;
+}
+
 // For each input array, a set of arrays of the proper length for v128, with
 // values in range but possibly of the wrong signedness (eg, for Int8Array, 128
 // is in range but is really -128).  Also a unary operator `rectify` that
@@ -479,20 +488,12 @@
 // read the result at offset 0.  Also: test with constant lhs, constant rhs, and
 // both.
 
-function expandConstantInputs(op, memtype, inputs) {
-    function cleanup(x) {
-        if (typeof x == "number") {
-            if (x == 0) return 1 / x < 0 ? "-0" : "0";
-            if (isNaN(x)) return "+nan";
-            if (!isFinite(x)) return (x < 0 ? "-" : "+") + "inf";
-        }
-        return x;
-    }
+function expandConstantBinopInputs(op, memtype, inputs) {
     let s = '';
     let ident = 0;
     for ( let [a, b] of inputs ) {
-        let constlhs = `${memtype.layoutName} ${a.map(cleanup).join(' ')}`;
-        let constrhs = `${memtype.layoutName} ${b.map(cleanup).join(' ')}`;
+        let constlhs = `${memtype.layoutName} ${a.map(jsValueToWasmName).join(' ')}`;
+        let constrhs = `${memtype.layoutName} ${b.map(jsValueToWasmName).join(' ')}`;
         s += `
     ;; lhs is constant, rhs is variable
     (func (export "run_constlhs${ident}")
@@ -531,7 +532,7 @@
     (func $doit (param $a v128) (param $b v128) (result v128)
       (${op} (local.get $a) (local.get $b)))
 
-    ${expandConstantInputs(op, memtype, inputs)})`);
+    ${expandConstantBinopInputs(op, memtype, inputs)})`);
     var mem = new memtype(ins.exports.mem.buffer);
     var resultmem = !resultmemtype || memtype == resultmemtype ? mem : new resultmemtype(ins.exports.mem.buffer);
     return [ins, mem, resultmem];
@@ -755,6 +756,7 @@
     let inputs = cross(memtype.inputs);
     let len = 16/memtype.BYTES_PER_ELEMENT;
     let xs = iota(len);
+    let zero = xs.map(_ => 0);
     let [ins, mem, resultmem] = insAndMemBinop(op, memtype, resultmemtype, inputs);
     let bitsForF32 = memtype == Float32Array ? new Uint32Array(mem.buffer) : null;
     let bitsForF64 = memtype == Float64Array ? new BigInt64Array(mem.buffer) : null;
@@ -781,8 +783,6 @@
     }
 
     function testConstIt(i,r) {
-        let zero = iota(len).map(_ => 0);
-
         set(resultmem, 0, zero);
         ins.exports["run_constlhs" + i]();
         assertSame(get(resultmem, 0, len), r);
@@ -899,15 +899,34 @@
 // Simple unary operators.  Place parameter in memory at offset 16,
 // read the result at offset 0.
 
-function insAndMemUnop(op, memtype, resultmemtype) {
+function expandConstantUnopInputs(op, memtype, inputs) {
+    let s = '';
+    let ident = 0;
+    for ( let a of inputs ) {
+        let constval = `${memtype.layoutName} ${a.map(jsValueToWasmName).join(' ')}`;
+        s += `
+    (func (export "run_const${ident}")
+      (v128.store (i32.const 0)
+        (${op} (v128.const ${constval}))))
+`;
+        ident++;
+    }
+    return s;
+}
+
+function insAndMemUnop(op, memtype, resultmemtype, inputs) {
     var ins = wasmEvalText(`
   (module
     (memory (export "mem") 1 1)
+
     (func (export "run")
       (v128.store (i32.const 0)
         (call $doit (v128.load (i32.const 16)))))
+
     (func $doit (param $a v128) (result v128)
-      (${op} (local.get $a))))`);
+      (${op} (local.get $a)))
+
+    ${expandConstantUnopInputs(op, memtype, inputs)})`);
     var mem = new memtype(ins.exports.mem.buffer);
     var resultmem = !resultmemtype || memtype == resultmemtype ? mem : new resultmemtype(ins.exports.mem.buffer);
     return [ins, mem, resultmem];
@@ -954,14 +973,14 @@
        ['v128.not', Uint8Array, bitnot],
       ])
 {
-    let [ins, mem, resultmem] = insAndMemUnop(op, memtype, resultmemtype);
+    let [ins, mem, resultmem] = insAndMemUnop(op, memtype, resultmemtype, memtype.inputs);
     let len = 16/memtype.BYTES_PER_ELEMENT;
     let xs = iota(len);
+    let zero = xs.map(_ => 0);
     let bitsForF32 = memtype == Float32Array ? new Uint32Array(mem.buffer) : null;
     let bitsForF64 = memtype == Float64Array ? new BigInt64Array(mem.buffer) : null;
 
-    function testIt(a) {
-        let r = xs.map((i) => rop(a[i]));
+    function testIt(a, r) {
         set(mem, len, a);
         ins.exports.run();
         assertSame(get(resultmem, 0, len), r);
@@ -979,8 +998,19 @@
         }
     }
 
-    for (let a of memtype.inputs)
-        testIt(a);
+    function testConstIt(i,r) {
+        set(resultmem, 0, zero);
+        ins.exports["run_const" + i]();
+        assertSame(get(resultmem, 0, len), r);
+    }
+
+    let i = 0;
+    for (let a of memtype.inputs) {
+        let r = xs.map((i) => rop(a[i]));
+        testIt(a, r);
+        testConstIt(i, r);
+        i++;
+    }
 }
 
 // AnyTrue.  Ion constant folds, so test that too.
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/binop-x64-ion-codegen.js firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/binop-x64-ion-codegen.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/binop-x64-ion-codegen.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/binop-x64-ion-codegen.js	2021-01-18 19:58:13.000000000 +0000
@@ -149,6 +149,14 @@
       `0f 59 05 ${RIPRADDR}      mulpsx ${RIPR}, %xmm0`],
      ['f32x4.div', '(v128.const f32x4 1 2 3 4)',
       `0f 5e 05 ${RIPRADDR}      divpsx ${RIPR}, %xmm0`],
+     ['f32x4.eq', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${RIPRADDR} 00   cmppsx \\$0x00, ${RIPR}, %xmm0`],
+     ['f32x4.ne', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${RIPRADDR} 04   cmppsx \\$0x04, ${RIPR}, %xmm0`],
+     ['f32x4.lt', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${RIPRADDR} 01   cmppsx \\$0x01, ${RIPR}, %xmm0`],
+     ['f32x4.le', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${RIPRADDR} 02   cmppsx \\$0x02, ${RIPR}, %xmm0`],
 
      ['f64x2.add', '(v128.const f64x2 1 2)',
       `66 0f 58 05 ${RIPRADDR}      addpdx ${RIPR}, %xmm0`],
@@ -157,7 +165,15 @@
      ['f64x2.mul', '(v128.const f64x2 1 2)',
       `66 0f 59 05 ${RIPRADDR}      mulpdx ${RIPR}, %xmm0`],
      ['f64x2.div', '(v128.const f64x2 1 2)',
-      `66 0f 5e 05 ${RIPRADDR}      divpdx ${RIPR}, %xmm0`]]);
+      `66 0f 5e 05 ${RIPRADDR}      divpdx ${RIPR}, %xmm0`],
+     ['f64x2.eq', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${RIPRADDR} 00   cmppdx \\$0x00, ${RIPR}, %xmm0`],
+     ['f64x2.ne', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${RIPRADDR} 04   cmppdx \\$0x04, ${RIPR}, %xmm0`],
+     ['f64x2.lt', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${RIPRADDR} 01   cmppdx \\$0x01, ${RIPR}, %xmm0`],
+     ['f64x2.le', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${RIPRADDR} 02   cmppdx \\$0x02, ${RIPR}, %xmm0`]]);
 
 // Commutative operations with constants on the lhs should generate the same
 // code as with the constant on the rhs.
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/binop-x86-ion-codegen.js firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/binop-x86-ion-codegen.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/wasm/simd/binop-x86-ion-codegen.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/wasm/simd/binop-x86-ion-codegen.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,20 @@
+// |jit-test| skip-if: !wasmSimdEnabled() || !hasDisassembler() || wasmCompileMode() != "ion" || !getBuildConfiguration().x86; include:codegen-x86-test.js
+
+codegenTestX86_v128xLITERAL_v128(
+    [['f32x4.eq', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${ABSADDR} 00   cmppsx \\$0x00, ${ABS}, %xmm0`],
+     ['f32x4.ne', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${ABSADDR} 04   cmppsx \\$0x04, ${ABS}, %xmm0`],
+     ['f32x4.lt', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${ABSADDR} 01   cmppsx \\$0x01, ${ABS}, %xmm0`],
+     ['f32x4.le', '(v128.const f32x4 1 2 3 4)',
+      `0f c2 05 ${ABSADDR} 02   cmppsx \\$0x02, ${ABS}, %xmm0`],
+
+     ['f64x2.eq', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${ABSADDR} 00   cmppdx \\$0x00, ${ABS}, %xmm0`],
+     ['f64x2.ne', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${ABSADDR} 04   cmppdx \\$0x04, ${ABS}, %xmm0`],
+     ['f64x2.lt', '(v128.const f64x2 1 2)',
+      `66 0f c2 05 ${ABSADDR} 01   cmppdx \\$0x01, ${ABS}, %xmm0`],
+     ['f64x2.le', '(v128.const f64x2 1 2)',
+     `66 0f c2 05 ${ABSADDR} 02   cmppdx \\$0x02, ${ABS}, %xmm0`]]);
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/xdr/delazifications-atoms.js firefox-85.0+build1/js/src/jit-test/tests/xdr/delazifications-atoms.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/xdr/delazifications-atoms.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/xdr/delazifications-atoms.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,14 @@
+let s = `
+function f1() { return "Atom_f1"; }
+function f2() { return "Atom_f2"; }
+function f3() { return "Atom_f3"; }
+
+assertEq(f1(), "Atom_f1");
+assertEq(f2(), "Atom_f2");
+assertEq(f3(), "Atom_f3");
+`;
+
+let c = cacheEntry(s);
+let g = newGlobal();
+evaluate(c, {saveIncrementalBytecode:true});
+evaluate(c, {global:g, loadBytecode:true});
diff -Nru firefox-84.0.2+build1/js/src/jit-test/tests/xdr/module.js firefox-85.0+build1/js/src/jit-test/tests/xdr/module.js
--- firefox-84.0.2+build1/js/src/jit-test/tests/xdr/module.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jit-test/tests/xdr/module.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,81 +1,93 @@
+// |jit-test| --enable-top-level-await;
 
 load(libdir + "asserts.js");
 
-function parseAndEvaluate(source) {
+async function parseAndEvaluate(source) {
     let og = parseModule(source);
     let bc = codeModule(og);
     let m = decodeModule(bc);
     m.declarationInstantiation();
-    m.evaluation();
+    await m.evaluation();
     return m;
 }
 
-// Check the evaluation of an empty module succeeds.
-parseAndEvaluate("");
-
-// Check evaluation returns evaluation result the first time, then undefined.
-let og = parseModule("1");
-let bc = codeModule(og);
-let m = decodeModule(bc);
-m.declarationInstantiation();
-assertEq(m.evaluation(), undefined);
-assertEq(typeof m.evaluation(), "undefined");
-
-// Check top level variables are initialized by evaluation.
-og = parseModule("export var x = 2 + 2;");
-bc = codeModule(og);
-m = decodeModule(bc);
-assertEq(typeof getModuleEnvironmentValue(m, "x"), "undefined");
-m.declarationInstantiation();
-m.evaluation();
-assertEq(getModuleEnvironmentValue(m, "x"), 4);
-
-m = parseAndEvaluate("export let x = 2 * 3;");
-assertEq(getModuleEnvironmentValue(m, "x"), 6);
-
-// Set up a module to import from.
-og = parseModule(`var x = 1;
-                        export { x };
-                        export default 2;
-                        export function f(x) { return x + 1; }`);
-bc = codeModule(og);
-a = registerModule('a', decodeModule(bc));
-
-// Check we can evaluate top level definitions.
-parseAndEvaluate("var foo = 1;");
-parseAndEvaluate("let foo = 1;");
-parseAndEvaluate("const foo = 1");
-parseAndEvaluate("function foo() {}");
-parseAndEvaluate("class foo { constructor() {} }");
-
-// Check we can evaluate all module-related syntax.
-parseAndEvaluate("export var foo = 1;");
-parseAndEvaluate("export let foo = 1;");
-parseAndEvaluate("export const foo = 1;");
-parseAndEvaluate("var x = 1; export { x };");
-parseAndEvaluate("export default 1");
-parseAndEvaluate("export default function() {};");
-parseAndEvaluate("export default function foo() {};");
-parseAndEvaluate("import a from 'a';");
-parseAndEvaluate("import { x } from 'a';");
-parseAndEvaluate("import * as ns from 'a';");
-parseAndEvaluate("export * from 'a'");
-parseAndEvaluate("export default class { constructor() {} };");
-parseAndEvaluate("export default class foo { constructor() {} };");
-
-// Test default import
-m = parseAndEvaluate("import a from 'a'; export { a };")
-assertEq(getModuleEnvironmentValue(m, "a"), 2);
-
-// Test named import
-m = parseAndEvaluate("import { x as y } from 'a'; export { y };")
-assertEq(getModuleEnvironmentValue(m, "y"), 1);
-
-// Call exported function
-m = parseAndEvaluate("import { f } from 'a'; export let x = f(3);")
-assertEq(getModuleEnvironmentValue(m, "x"), 4);
-
-// Import access in functions
-m = parseAndEvaluate("import { x } from 'a'; function f() { return x; }")
-let f = getModuleEnvironmentValue(m, "f");
-assertEq(f(), 1);
+(async () => {
+  // Check the evaluation of an empty module succeeds.
+  await parseAndEvaluate("");
+})();
+
+(async () => {
+  // Check that evaluation returns evaluation promise,
+  // and promise is always the same.
+  let og = parseModule("1");
+  let bc = codeModule(og);
+  let m = decodeModule(bc);
+  m.declarationInstantiation();
+  assertEq(typeof m.evaluation(), "object");
+  assertEq(m.evaluation() instanceof Promise, true);
+  assertEq(m.evaluation(), m.evaluation());
+})();
+
+(async () => {
+  // Check top level variables are initialized by evaluation.
+  let og = parseModule("export var x = 2 + 2;");
+  let bc = codeModule(og);
+  let m = decodeModule(bc);
+  assertEq(typeof getModuleEnvironmentValue(m, "x"), "undefined");
+  m.declarationInstantiation();
+  await m.evaluation();
+  assertEq(getModuleEnvironmentValue(m, "x"), 4);
+})();
+
+(async () => {
+  let m = await parseAndEvaluate("export let x = 2 * 3;");
+  assertEq(getModuleEnvironmentValue(m, "x"), 6);
+
+  // Set up a module to import from.
+  let og = parseModule(`var x = 1;
+                          export { x };
+                          export default 2;
+                          export function f(x) { return x + 1; }`);
+  let bc = codeModule(og);
+  let a = registerModule('a', decodeModule(bc));
+
+  // Check we can evaluate top level definitions.
+  await parseAndEvaluate("var foo = 1;");
+  await parseAndEvaluate("let foo = 1;");
+  await parseAndEvaluate("const foo = 1");
+  await parseAndEvaluate("function foo() {}");
+  await parseAndEvaluate("class foo { constructor() {} }");
+
+  // Check we can evaluate all module-related syntax.
+  await parseAndEvaluate("export var foo = 1;");
+  await parseAndEvaluate("export let foo = 1;");
+  await parseAndEvaluate("export const foo = 1;");
+  await parseAndEvaluate("var x = 1; export { x };");
+  await parseAndEvaluate("export default 1");
+  await parseAndEvaluate("export default function() {};");
+  await parseAndEvaluate("export default function foo() {};");
+  await parseAndEvaluate("import a from 'a';");
+  await parseAndEvaluate("import { x } from 'a';");
+  await parseAndEvaluate("import * as ns from 'a';");
+  await parseAndEvaluate("export * from 'a'");
+  await parseAndEvaluate("export default class { constructor() {} };");
+  await parseAndEvaluate("export default class foo { constructor() {} };");
+
+  // Test default import
+  m = await parseAndEvaluate("import a from 'a'; export { a };")
+  assertEq(getModuleEnvironmentValue(m, "a"), 2);
+
+  // Test named import
+  m = await parseAndEvaluate("import { x as y } from 'a'; export { y };")
+  assertEq(getModuleEnvironmentValue(m, "y"), 1);
+
+  // Call exported function
+  m = await parseAndEvaluate("import { f } from 'a'; export let x = f(3);")
+  assertEq(getModuleEnvironmentValue(m, "x"), 4);
+
+  // Import access in functions
+  m = await parseAndEvaluate("import { x } from 'a'; function f() { return x; }")
+  let f = getModuleEnvironmentValue(m, "f");
+  assertEq(f(), 1);
+})();
+drainJobQueue();
diff -Nru firefox-84.0.2+build1/js/src/jsapi.cpp firefox-85.0+build1/js/src/jsapi.cpp
--- firefox-84.0.2+build1/js/src/jsapi.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -76,6 +76,7 @@
 #include "js/Wrapper.h"
 #include "proxy/DOMProxy.h"
 #include "util/CompleteFile.h"
+#include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
 #include "vm/AsyncFunction.h"
@@ -458,6 +459,13 @@
   return *this;
 }
 
+JS::ContextOptions& JS::ContextOptions::setWasmExceptions(bool flag) {
+#ifdef ENABLE_WASM_EXCEPTIONS
+  wasmExceptions_ = flag;
+#endif
+  return *this;
+}
+
 JS::ContextOptions& JS::ContextOptions::setFuzzing(bool flag) {
 #ifdef FUZZING
   fuzzing_ = flag;
@@ -502,6 +510,11 @@
   return "JavaScript-C" MOZILLA_VERSION;
 }
 
+JS_PUBLIC_API void JS_SetDestroyZoneCallback(JSContext* cx,
+                                             JSDestroyZoneCallback callback) {
+  cx->runtime()->destroyZoneCallback = callback;
+}
+
 JS_PUBLIC_API void JS_SetDestroyCompartmentCallback(
     JSContext* cx, JSDestroyCompartmentCallback callback) {
   cx->runtime()->destroyCompartmentCallback = callback;
@@ -729,6 +742,8 @@
 
   AutoDisableProxyCheck adpc;
 
+  AutoEnterOOMUnsafeRegion oomUnsafe;
+
   JS::Compartment* destination = target->compartment();
 
   if (origobj->compartment() == destination) {
@@ -737,7 +752,7 @@
     // destination's cross compartment map and that the same
     // object will continue to work.
     AutoRealm ar(cx, origobj);
-    JSObject::swap(cx, origobj, target);
+    JSObject::swap(cx, origobj, target, oomUnsafe);
     newIdentity = origobj;
   } else if (ObjectWrapperMap::Ptr p = destination->lookupWrapper(origobj)) {
     // There might already be a wrapper for the original object in
@@ -751,7 +766,7 @@
     NukeCrossCompartmentWrapper(cx, newIdentity);
 
     AutoRealm ar(cx, newIdentity);
-    JSObject::swap(cx, newIdentity, target);
+    JSObject::swap(cx, newIdentity, target, oomUnsafe);
   } else {
     // Otherwise, we use |target| for the new identity object.
     newIdentity = target;
@@ -763,7 +778,7 @@
   // `newIdentity == origobj`, because this process also clears out any
   // cached wrapper state.
   if (!RemapAllWrappersForObject(cx, origobj, newIdentity)) {
-    MOZ_CRASH();
+    oomUnsafe.crash("JS_TransplantObject");
   }
 
   // Lastly, update the original object to point to the new one.
@@ -771,14 +786,16 @@
     RootedObject newIdentityWrapper(cx, newIdentity);
     AutoRealm ar(cx, origobj);
     if (!JS_WrapObject(cx, &newIdentityWrapper)) {
-      MOZ_CRASH();
+      MOZ_RELEASE_ASSERT(cx->isThrowingOutOfMemory() ||
+                         cx->isThrowingOverRecursed());
+      oomUnsafe.crash("JS_TransplantObject");
     }
     MOZ_ASSERT(Wrapper::wrappedObject(newIdentityWrapper) == newIdentity);
-    JSObject::swap(cx, origobj, newIdentityWrapper);
+    JSObject::swap(cx, origobj, newIdentityWrapper, oomUnsafe);
     if (origobj->compartment()->lookupWrapper(newIdentity)) {
       MOZ_ASSERT(origobj->is<CrossCompartmentWrapperObject>());
       if (!origobj->compartment()->putWrapper(cx, newIdentity, origobj)) {
-        MOZ_CRASH();
+        oomUnsafe.crash("JS_TransplantObject");
       }
     }
   }
@@ -844,7 +861,7 @@
   // correctly before we start wrapping it into other compartments.
   if (targetCompartmentProxy) {
     AutoRealm ar(cx, targetCompartmentProxy);
-    JSObject::swap(cx, targetCompartmentProxy, target);
+    JSObject::swap(cx, targetCompartmentProxy, target, oomUnsafe);
     target.set(targetCompartmentProxy);
   }
 
@@ -3461,6 +3478,7 @@
   nonSyntacticScope = rhs.nonSyntacticScope;
   privateClassFields = rhs.privateClassFields;
   privateClassMethods = rhs.privateClassMethods;
+  topLevelAwait = rhs.topLevelAwait;
   useStencilXDR = rhs.useStencilXDR;
   useOffThreadParseGlobal = rhs.useOffThreadParseGlobal;
 };
@@ -3556,6 +3574,7 @@
       cx->options().throwOnAsmJSValidationFailure();
   privateClassFields = cx->options().privateClassFields();
   privateClassMethods = cx->options().privateClassMethods();
+  topLevelAwait = cx->options().topLevelAwait();
 
   useStencilXDR = !UseOffThreadParseGlobal();
   useOffThreadParseGlobal = UseOffThreadParseGlobal();
@@ -5305,9 +5324,6 @@
     case JSJITCOMPILER_SPECTRE_JIT_TO_CXX_CALLS:
       jit::JitOptions.spectreJitToCxxCalls = !!value;
       break;
-    case JSJITCOMPILER_WARP_ENABLE:
-      jit::JitOptions.setWarpEnabled(!!value);
-      break;
     case JSJITCOMPILER_WASM_FOLD_OFFSETS:
       jit::JitOptions.wasmFoldOffsets = !!value;
       break;
@@ -5379,9 +5395,6 @@
     case JSJITCOMPILER_OFFTHREAD_COMPILATION_ENABLE:
       *valueOut = rt->canUseOffthreadIonCompilation();
       break;
-    case JSJITCOMPILER_WARP_ENABLE:
-      *valueOut = jit::JitOptions.warpBuilder;
-      break;
     case JSJITCOMPILER_WASM_FOLD_OFFSETS:
       *valueOut = jit::JitOptions.wasmFoldOffsets ? 1 : 0;
       break;
@@ -5763,8 +5776,9 @@
   }
 
   Rooted<frontend::CompilationGCOutput> gcOutput(cx);
-  if (!frontend::InstantiateStencils(cx, compilationInfos.get(),
-                                     gcOutput.get())) {
+  Rooted<frontend::CompilationGCOutput> gcOutputForDelazification(cx);
+  if (!frontend::InstantiateStencils(cx, compilationInfos.get(), gcOutput.get(),
+                                     gcOutputForDelazification.get())) {
     return JS::TranscodeResult_Throw;
   }
 
@@ -5825,8 +5839,9 @@
   }
 
   Rooted<frontend::CompilationGCOutput> gcOutput(cx);
-  if (!frontend::InstantiateStencils(cx, compilationInfos.get(),
-                                     gcOutput.get())) {
+  Rooted<frontend::CompilationGCOutput> gcOutputForDelazification(cx);
+  if (!frontend::InstantiateStencils(cx, compilationInfos.get(), gcOutput.get(),
+                                     gcOutputForDelazification.get())) {
     return JS::TranscodeResult_Throw;
   }
 
@@ -5961,4 +5976,16 @@
 #endif
 }
 
+#ifdef DEBUG
+bool gSupportDifferentialTesting = false;
+#endif  // DEBUG
+
 }  // namespace js
+
+#ifdef DEBUG
+
+JS_PUBLIC_API void JS::SetSupportDifferentialTesting(bool value) {
+  js::gSupportDifferentialTesting = value;
+}
+
+#endif  // DEBUG
diff -Nru firefox-84.0.2+build1/js/src/jsapi.h firefox-85.0+build1/js/src/jsapi.h
--- firefox-84.0.2+build1/js/src/jsapi.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi.h	2021-01-18 19:58:13.000000000 +0000
@@ -128,6 +128,8 @@
   JSPreWrapCallback preWrap;
 };
 
+using JSDestroyZoneCallback = void (*)(JSFreeOp*, JS::Zone*);
+
 using JSDestroyCompartmentCallback = void (*)(JSFreeOp*, JS::Compartment*);
 
 using JSSizeOfIncludingThisCompartmentCallback =
@@ -328,6 +330,9 @@
 
 extern JS_PUBLIC_API const char* JS_GetImplementationVersion(void);
 
+extern JS_PUBLIC_API void JS_SetDestroyZoneCallback(
+    JSContext* cx, JSDestroyZoneCallback callback);
+
 extern JS_PUBLIC_API void JS_SetDestroyCompartmentCallback(
     JSContext* cx, JSDestroyCompartmentCallback callback);
 
@@ -666,21 +671,6 @@
 
 }  // namespace JS
 
-/*
- * A replacement for MallocAllocPolicy that allocates in the JS heap and adds no
- * extra behaviours.
- *
- * This is currently used for allocating source buffers for parsing. Since these
- * are temporary and will not be freed by GC, the memory is not tracked by the
- * usual accounting.
- */
-class JS_PUBLIC_API JSMallocAllocPolicy : public js::AllocPolicyBase {
- public:
-  void reportAllocOverflow() const {}
-
-  MOZ_MUST_USE bool checkSimulatedOOM() const { return true; }
-};
-
 /**
  * Set the size of the native stack that should not be exceed. To disable
  * stack size checking pass 0.
@@ -2662,7 +2652,6 @@
   Register(SPECTRE_STRING_MITIGATIONS, "spectre.string-mitigations") \
   Register(SPECTRE_VALUE_MASKING, "spectre.value-masking") \
   Register(SPECTRE_JIT_TO_CXX_CALLS, "spectre.jit-to-C++-calls") \
-  Register(WARP_ENABLE, "warp.enable") \
   Register(WASM_FOLD_OFFSETS, "wasm.fold-offsets") \
   Register(WASM_DELAY_TIER2, "wasm.delay-tier2") \
   Register(WASM_JIT_BASELINE, "wasm.baseline") \
@@ -3035,4 +3024,12 @@
 
 } /* namespace js */
 
+#ifdef DEBUG
+namespace JS {
+
+extern JS_PUBLIC_API void SetSupportDifferentialTesting(bool value);
+
+}
+#endif /* DEBUG */
+
 #endif /* jsapi_h */
diff -Nru firefox-84.0.2+build1/js/src/jsapi-tests/testGCFinalizeCallback.cpp firefox-85.0+build1/js/src/jsapi-tests/testGCFinalizeCallback.cpp
--- firefox-84.0.2+build1/js/src/jsapi-tests/testGCFinalizeCallback.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi-tests/testGCFinalizeCallback.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -46,7 +46,7 @@
 
   /* Zone GC, non-incremental, single zone. */
   FinalizeCalls = 0;
-  JS::PrepareZoneForGC(global1->zone());
+  JS::PrepareZoneForGC(cx, global1->zone());
   JS::NonIncrementalGC(cx, GC_NORMAL, JS::GCReason::API);
   CHECK(!cx->runtime()->gc.isFullGc());
   CHECK(checkSingleGroup());
@@ -54,9 +54,9 @@
 
   /* Zone GC, non-incremental, multiple zones. */
   FinalizeCalls = 0;
-  JS::PrepareZoneForGC(global1->zone());
-  JS::PrepareZoneForGC(global2->zone());
-  JS::PrepareZoneForGC(global3->zone());
+  JS::PrepareZoneForGC(cx, global1->zone());
+  JS::PrepareZoneForGC(cx, global2->zone());
+  JS::PrepareZoneForGC(cx, global3->zone());
   JS::NonIncrementalGC(cx, GC_NORMAL, JS::GCReason::API);
   CHECK(!cx->runtime()->gc.isFullGc());
   CHECK(checkSingleGroup());
@@ -64,10 +64,10 @@
 
   /* Zone GC, incremental, single zone. */
   FinalizeCalls = 0;
-  JS::PrepareZoneForGC(global1->zone());
+  JS::PrepareZoneForGC(cx, global1->zone());
   JS::StartIncrementalGC(cx, GC_NORMAL, JS::GCReason::API, 1000000);
   while (cx->runtime()->gc.isIncrementalGCInProgress()) {
-    JS::PrepareZoneForGC(global1->zone());
+    JS::PrepareZoneForGC(cx, global1->zone());
     JS::IncrementalGCSlice(cx, JS::GCReason::API, 1000000);
   }
   CHECK(!cx->runtime()->gc.isIncrementalGCInProgress());
@@ -77,14 +77,14 @@
 
   /* Zone GC, incremental, multiple zones. */
   FinalizeCalls = 0;
-  JS::PrepareZoneForGC(global1->zone());
-  JS::PrepareZoneForGC(global2->zone());
-  JS::PrepareZoneForGC(global3->zone());
+  JS::PrepareZoneForGC(cx, global1->zone());
+  JS::PrepareZoneForGC(cx, global2->zone());
+  JS::PrepareZoneForGC(cx, global3->zone());
   JS::StartIncrementalGC(cx, GC_NORMAL, JS::GCReason::API, 1000000);
   while (cx->runtime()->gc.isIncrementalGCInProgress()) {
-    JS::PrepareZoneForGC(global1->zone());
-    JS::PrepareZoneForGC(global2->zone());
-    JS::PrepareZoneForGC(global3->zone());
+    JS::PrepareZoneForGC(cx, global1->zone());
+    JS::PrepareZoneForGC(cx, global2->zone());
+    JS::PrepareZoneForGC(cx, global3->zone());
     JS::IncrementalGCSlice(cx, JS::GCReason::API, 1000000);
   }
   CHECK(!cx->runtime()->gc.isIncrementalGCInProgress());
diff -Nru firefox-84.0.2+build1/js/src/jsapi-tests/testGCGrayMarking.cpp firefox-85.0+build1/js/src/jsapi-tests/testGCGrayMarking.cpp
--- firefox-84.0.2+build1/js/src/jsapi-tests/testGCGrayMarking.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi-tests/testGCGrayMarking.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -524,7 +524,7 @@
 
   // Incremental zone GC started: the source is now unmarked.
   JS_SetGCParameter(cx, JSGC_MODE, JSGC_MODE_ZONE_INCREMENTAL);
-  JS::PrepareZoneForGC(wrapper->zone());
+  JS::PrepareZoneForGC(cx, wrapper->zone());
   budget = js::SliceBudget(js::WorkBudget(1));
   cx->runtime()->gc.startDebugGC(GC_NORMAL, budget);
   CHECK(JS::IsIncrementalGCInProgress(cx));
@@ -786,7 +786,7 @@
 bool ZoneGC(JS::Zone* zone) {
   uint32_t oldMode = JS_GetGCParameter(cx, JSGC_MODE);
   JS_SetGCParameter(cx, JSGC_MODE, JSGC_MODE_ZONE);
-  JS::PrepareZoneForGC(zone);
+  JS::PrepareZoneForGC(cx, zone);
   cx->runtime()->gc.gc(GC_NORMAL, JS::GCReason::API);
   CHECK(!cx->runtime()->gc.isFullGc());
   JS_SetGCParameter(cx, JSGC_MODE, oldMode);
diff -Nru firefox-84.0.2+build1/js/src/jsapi-tests/testGCWeakCache.cpp firefox-85.0+build1/js/src/jsapi-tests/testGCWeakCache.cpp
--- firefox-84.0.2+build1/js/src/jsapi-tests/testGCWeakCache.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi-tests/testGCWeakCache.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -233,7 +233,7 @@
   CHECK(!IsIncrementalGCInProgress(cx));
 
   JS::Zone* zone = JS::GetObjectZone(global);
-  JS::PrepareZoneForGC(zone);
+  JS::PrepareZoneForGC(cx, zone);
   SliceBudget budget(WorkBudget(1));
   cx->runtime()->gc.startDebugGC(GC_NORMAL, budget);
 
diff -Nru firefox-84.0.2+build1/js/src/jsapi-tests/testJitMinimalFunc.h firefox-85.0+build1/js/src/jsapi-tests/testJitMinimalFunc.h
--- firefox-84.0.2+build1/js/src/jsapi-tests/testJitMinimalFunc.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi-tests/testJitMinimalFunc.h	2021-01-18 19:58:13.000000000 +0000
@@ -67,7 +67,7 @@
   }
 
   MParameter* createParameter() {
-    MParameter* p = MParameter::New(alloc, numParams++, nullptr);
+    MParameter* p = MParameter::New(alloc, numParams++);
     return p;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/jsapi-tests/testParserAtom.cpp firefox-85.0+build1/js/src/jsapi-tests/testParserAtom.cpp
--- firefox-84.0.2+build1/js/src/jsapi-tests/testParserAtom.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsapi-tests/testParserAtom.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -34,10 +34,10 @@
   // Check that the well-known empty atom matches for different entry points.
   const ParserAtom* ref = cx->parserNames().empty;
   CHECK(ref);
-  CHECK(atomTable.internAscii(cx, ascii, 0).unwrap() == ref);
-  CHECK(atomTable.internLatin1(cx, latin1, 0).unwrap() == ref);
-  CHECK(atomTable.internUtf8(cx, utf8, 0).unwrap() == ref);
-  CHECK(atomTable.internChar16(cx, char16, 0).unwrap() == ref);
+  CHECK(atomTable.internAscii(cx, ascii, 0) == ref);
+  CHECK(atomTable.internLatin1(cx, latin1, 0) == ref);
+  CHECK(atomTable.internUtf8(cx, utf8, 0) == ref);
+  CHECK(atomTable.internChar16(cx, char16, 0) == ref);
 
   // Check concatenation works on empty atoms.
   const ParserAtom* concat[] = {
@@ -45,7 +45,7 @@
       cx->parserNames().empty,
   };
   mozilla::Range<const ParserAtom*> concatRange(concat, 2);
-  CHECK(atomTable.concatAtoms(cx, concatRange).unwrap() == ref);
+  CHECK(atomTable.concatAtoms(cx, concatRange) == ref);
 
   return true;
 }
@@ -72,17 +72,17 @@
 
   const ParserAtom* ref = cx->parserNames().lookupTiny(&a, 1);
   CHECK(ref);
-  CHECK(atomTable.internAscii(cx, ascii, 1).unwrap() == ref);
-  CHECK(atomTable.internLatin1(cx, latin1, 1).unwrap() == ref);
-  CHECK(atomTable.internUtf8(cx, utf8, 1).unwrap() == ref);
-  CHECK(atomTable.internChar16(cx, char16, 1).unwrap() == ref);
+  CHECK(atomTable.internAscii(cx, ascii, 1) == ref);
+  CHECK(atomTable.internLatin1(cx, latin1, 1) == ref);
+  CHECK(atomTable.internUtf8(cx, utf8, 1) == ref);
+  CHECK(atomTable.internChar16(cx, char16, 1) == ref);
 
   const ParserAtom* concat[] = {
       ref,
       cx->parserNames().empty,
   };
   mozilla::Range<const ParserAtom*> concatRange(concat, 2);
-  CHECK(atomTable.concatAtoms(cx, concatRange).unwrap() == ref);
+  CHECK(atomTable.concatAtoms(cx, concatRange) == ref);
 
   // Note: If Latin1-Extended characters become supported, then UTF-8 behaviour
   // should be tested.
@@ -114,17 +114,17 @@
 
   const ParserAtom* ref = cx->parserNames().lookupTiny(ascii, 2);
   CHECK(ref);
-  CHECK(atomTable.internAscii(cx, ascii, 2).unwrap() == ref);
-  CHECK(atomTable.internLatin1(cx, latin1, 2).unwrap() == ref);
-  CHECK(atomTable.internUtf8(cx, utf8, 2).unwrap() == ref);
-  CHECK(atomTable.internChar16(cx, char16, 2).unwrap() == ref);
+  CHECK(atomTable.internAscii(cx, ascii, 2) == ref);
+  CHECK(atomTable.internLatin1(cx, latin1, 2) == ref);
+  CHECK(atomTable.internUtf8(cx, utf8, 2) == ref);
+  CHECK(atomTable.internChar16(cx, char16, 2) == ref);
 
   const ParserAtom* concat[] = {
       cx->parserNames().lookupTiny(ascii + 0, 1),
       cx->parserNames().lookupTiny(ascii + 1, 1),
   };
   mozilla::Range<const ParserAtom*> concatRange(concat, 2);
-  CHECK(atomTable.concatAtoms(cx, concatRange).unwrap() == ref);
+  CHECK(atomTable.concatAtoms(cx, concatRange) == ref);
 
   // Note: If Latin1-Extended characters become supported, then UTF-8 behaviour
   // should be tested.
@@ -150,19 +150,19 @@
     std::vector<const ParserAtom*> inputs;
     for (const char16_t* arg : args) {
       size_t len = std::char_traits<char16_t>::length(arg);
-      const ParserAtom* atom = atomTable.internChar16(cx, arg, len).unwrap();
+      const ParserAtom* atom = atomTable.internChar16(cx, arg, len);
       inputs.push_back(atom);
     }
 
     // Concatenate twice to test new vs existing pathways.
     mozilla::Range<const ParserAtom*> range(inputs.data(), inputs.size());
-    const ParserAtom* once = atomTable.concatAtoms(cx, range).unwrap();
-    const ParserAtom* twice = atomTable.concatAtoms(cx, range).unwrap();
+    const ParserAtom* once = atomTable.concatAtoms(cx, range);
+    const ParserAtom* twice = atomTable.concatAtoms(cx, range);
 
     // Intern expected value literal _after_ the concat code to allow
     // allocation pathways a chance to be tested.
     size_t exp_len = std::char_traits<char16_t>::length(exp);
-    const ParserAtom* ref = atomTable.internChar16(cx, exp, exp_len).unwrap();
+    const ParserAtom* ref = atomTable.internChar16(cx, exp, exp_len);
 
     return (once == ref) && (twice == ref);
   };
diff -Nru firefox-84.0.2+build1/js/src/jsdate.cpp firefox-85.0+build1/js/src/jsdate.cpp
--- firefox-84.0.2+build1/js/src/jsdate.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsdate.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -2823,9 +2823,7 @@
   int64_t utcMilliseconds = static_cast<int64_t>(utcTime);
   if (!DateTimeInfo::timeZoneDisplayName(timeZoneStart, remainingSpace,
                                          utcMilliseconds, locale)) {
-    {
-      JS_ReportOutOfMemory(cx);
-    }
+    { JS_ReportOutOfMemory(cx); }
     return nullptr;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/jsfriendapi.cpp firefox-85.0+build1/js/src/jsfriendapi.cpp
--- firefox-84.0.2+build1/js/src/jsfriendapi.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsfriendapi.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -35,15 +35,18 @@
 #include "proxy/DeadObjectProxy.h"
 #include "util/Poison.h"
 #include "vm/ArgumentsObject.h"
+#include "vm/BooleanObject.h"
 #include "vm/DateObject.h"
 #include "vm/ErrorObject.h"
 #include "vm/FrameIter.h"  // js::FrameIter
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
+#include "vm/NumberObject.h"
 #include "vm/PlainObject.h"  // js::PlainObject
 #include "vm/Printer.h"
 #include "vm/PromiseObject.h"  // js::PromiseObject
 #include "vm/Realm.h"
+#include "vm/StringObject.h"
 #include "vm/Time.h"
 #include "vm/WrapperObject.h"
 
@@ -129,25 +132,6 @@
   return JSObject::splicePrototype(cx, obj, tagged);
 }
 
-JS_FRIEND_API JSObject* JS_NewObjectWithUniqueType(JSContext* cx,
-                                                   const JSClass* clasp,
-                                                   HandleObject proto) {
-  /*
-   * Create our object with a null proto and then splice in the correct proto
-   * after we setSingleton, so that we don't pollute the default
-   * ObjectGroup attached to our proto with information about our object, since
-   * we're not going to be using that ObjectGroup anyway.
-   */
-  RootedObject obj(cx, NewSingletonObjectWithGivenProto(cx, clasp, nullptr));
-  if (!obj) {
-    return nullptr;
-  }
-  if (!JS_SplicePrototype(cx, obj, proto)) {
-    return nullptr;
-  }
-  return obj;
-}
-
 JS_FRIEND_API JSObject* JS_NewObjectWithoutMetadata(
     JSContext* cx, const JSClass* clasp, JS::Handle<JSObject*> proto) {
   cx->check(proto);
diff -Nru firefox-84.0.2+build1/js/src/jsfriendapi.h firefox-85.0+build1/js/src/jsfriendapi.h
--- firefox-84.0.2+build1/js/src/jsfriendapi.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsfriendapi.h	2021-01-18 19:58:13.000000000 +0000
@@ -47,9 +47,6 @@
                                              JS::HandleObject obj,
                                              JS::HandleObject proto);
 
-extern JS_FRIEND_API JSObject* JS_NewObjectWithUniqueType(
-    JSContext* cx, const JSClass* clasp, JS::HandleObject proto);
-
 /**
  * Allocate an object in exactly the same way as JS_NewObjectWithGivenProto, but
  * without invoking the metadata callback on it.  This allows creation of
diff -Nru firefox-84.0.2+build1/js/src/jsmath.cpp firefox-85.0+build1/js/src/jsmath.cpp
--- firefox-84.0.2+build1/js/src/jsmath.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsmath.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -799,7 +799,8 @@
   }
 
   double result = isInfinite ? PositiveInfinity<double>()
-                             : isNaN ? GenericNaN() : scale * sqrt(sumsq);
+                  : isNaN    ? GenericNaN()
+                             : scale * sqrt(sumsq);
   res.setDouble(result);
   return true;
 }
@@ -1041,7 +1042,7 @@
   if (!proto) {
     return nullptr;
   }
-  return NewSingletonObjectWithGivenProto(cx, &MathClass, proto);
+  return NewTenuredObjectWithGivenProto(cx, &MathClass, proto);
 }
 
 static const ClassSpec MathClassSpec = {CreateMathObject,
diff -Nru firefox-84.0.2+build1/js/src/jsnum.cpp firefox-85.0+build1/js/src/jsnum.cpp
--- firefox-84.0.2+build1/js/src/jsnum.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/jsnum.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -813,7 +813,7 @@
 
   mozilla::Range<const Latin1Char> chars(start, length);
   JSInlineString* str =
-      NewInlineString<allowGC>(cx, chars, js::gc::TenuredHeap);
+      NewInlineString<allowGC>(cx, chars, js::gc::DefaultHeap);
   if (!str) {
     return nullptr;
   }
@@ -874,7 +874,7 @@
     indexValue.emplace(si);
   }
 
-  return parserAtoms.internAscii(cx, start, length).unwrapOr(nullptr);
+  return parserAtoms.internAscii(cx, start, length);
 }
 
 /* Returns a non-nullptr pointer to inside cbuf.  */
@@ -1575,6 +1575,13 @@
       MOZ_ASSERT(StaticStrings::hasUnit(c));
       return cx->staticStrings().getUnit(c);
     }
+    if (unsigned(i) < unsigned(base * base)) {
+      static constexpr char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+      char chars[] = {digits[i / base], digits[i % base]};
+      JSString* str = cx->staticStrings().lookup(chars, 2);
+      MOZ_ASSERT(str);
+      return str;
+    }
 
     if (JSLinearString* str = realm->dtoaCache.lookup(base, d)) {
       return str;
@@ -1602,7 +1609,7 @@
   }
 
   JSLinearString* s =
-      NewStringCopyN<allowGC>(cx, numStr, numStrLen, js::gc::TenuredHeap);
+      NewStringCopyN<allowGC>(cx, numStr, numStrLen, js::gc::DefaultHeap);
   if (!s) {
     return nullptr;
   }
@@ -1680,7 +1687,7 @@
              numStr < cbuf.sbuf + cbuf.sbufSize);
 
   size_t length = strlen(numStr);
-  return parserAtoms.internAscii(cx, numStr, length).unwrapOr(nullptr);
+  return parserAtoms.internAscii(cx, numStr, length);
 }
 
 JSLinearString* js::IndexToString(JSContext* cx, uint32_t index) {
@@ -1700,7 +1707,7 @@
   RangedPtr<Latin1Char> start = BackfillIndexInCharBuffer(index, end);
 
   mozilla::Range<const Latin1Char> chars(start.get(), end - start);
-  JSInlineString* str = NewInlineString<CanGC>(cx, chars, js::gc::TenuredHeap);
+  JSInlineString* str = NewInlineString<CanGC>(cx, chars, js::gc::DefaultHeap);
   if (!str) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/js/src/moz.build firefox-85.0+build1/js/src/moz.build
--- firefox-84.0.2+build1/js/src/moz.build	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/moz.build	2021-01-18 19:58:13.000000000 +0000
@@ -425,7 +425,6 @@
     "vm/Time.cpp",
     "vm/ToSource.cpp",
     "vm/TypedArrayObject.cpp",
-    "vm/TypeInference.cpp",
     "vm/UbiNode.cpp",
     "vm/UbiNodeCensus.cpp",
     "vm/UbiNodeShortestPaths.cpp",
diff -Nru firefox-84.0.2+build1/js/src/proxy/CrossCompartmentWrapper.cpp firefox-85.0+build1/js/src/proxy/CrossCompartmentWrapper.cpp
--- firefox-84.0.2+build1/js/src/proxy/CrossCompartmentWrapper.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/proxy/CrossCompartmentWrapper.cpp	2021-01-18 19:58:13.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/ScopeExit.h"
-
 #include "gc/PublicIterators.h"
 #include "js/friend/WindowProxy.h"  // js::IsWindow, js::IsWindowProxy
 #include "js/Wrapper.h"
@@ -592,7 +590,7 @@
     // Now, because we need to maintain object identity, we do a brain
     // transplant on the old object so that it contains the contents of the
     // new one.
-    JSObject::swap(cx, wobj, tobj);
+    JSObject::swap(cx, wobj, tobj, oomUnsafe);
   }
 
   if (!wobj->is<WrapperObject>()) {
diff -Nru firefox-84.0.2+build1/js/src/proxy/Proxy.cpp firefox-85.0+build1/js/src/proxy/Proxy.cpp
--- firefox-84.0.2+build1/js/src/proxy/Proxy.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/proxy/Proxy.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -959,30 +959,6 @@
                           options.clasp());
 }
 
-JS_FRIEND_API JSObject* js::NewSingletonProxyObject(
-    JSContext* cx, const BaseProxyHandler* handler, HandleValue priv,
-    JSObject* proto_, const ProxyOptions& options) {
-  AssertHeapIsIdle();
-  CHECK_THREAD(cx);
-
-  // This can be called from the compartment wrap hooks while in a realm with a
-  // gray global. Trigger the read barrier on the global to ensure this is
-  // unmarked.
-  cx->realm()->maybeGlobal();
-
-  if (proto_ != TaggedProto::LazyProto) {
-    cx->check(proto_);  // |priv| might be cross-compartment.
-  }
-
-  if (options.lazyProto()) {
-    MOZ_ASSERT(!proto_);
-    proto_ = TaggedProto::LazyProto;
-  }
-
-  return ProxyObject::NewSingleton(cx, handler, priv, TaggedProto(proto_),
-                                   options.clasp());
-}
-
 void ProxyObject::renew(const BaseProxyHandler* handler, const Value& priv) {
   MOZ_ASSERT(!IsInsideNursery(this));
   MOZ_ASSERT_IF(IsCrossCompartmentWrapper(this), IsDeadProxyObject(this));
diff -Nru firefox-84.0.2+build1/js/src/proxy/Wrapper.cpp firefox-85.0+build1/js/src/proxy/Wrapper.cpp
--- firefox-84.0.2+build1/js/src/proxy/Wrapper.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/proxy/Wrapper.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -295,7 +295,7 @@
     ar.emplace(cx, &cx->compartment()->globalForNewCCW());
   }
   RootedValue priv(cx, ObjectValue(*obj));
-  return NewSingletonProxyObject(cx, handler, priv, options.proto(), options);
+  return NewProxyObject(cx, handler, priv, options.proto(), options);
 }
 
 JSObject* Wrapper::Renew(JSObject* existing, JSObject* obj,
diff -Nru firefox-84.0.2+build1/js/src/shell/fuzz-flags.txt firefox-85.0+build1/js/src/shell/fuzz-flags.txt
--- firefox-84.0.2+build1/js/src/shell/fuzz-flags.txt	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/fuzz-flags.txt	2021-01-18 19:58:13.000000000 +0000
@@ -53,8 +53,6 @@
 --spectre-mitigations=off
 --spectre-mitigations=on
 --more-compartments
---warp
---no-warp
 --fast-warmup
 
 # GC-related
@@ -67,9 +65,9 @@
 
 # wasm flags
 --wasm-gc
---wasm-compiler=ion
 --wasm-compiler=baseline
---wasm-compiler=cranelift
+--wasm-compiler=optimizing
+--wasm-compiler=baseline+optimizing
 --test-wasm-await-tier2
 --wasm-disable-huge-memory
 
diff -Nru firefox-84.0.2+build1/js/src/shell/js.cpp firefox-85.0+build1/js/src/shell/js.cpp
--- firefox-84.0.2+build1/js/src/shell/js.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/js.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -145,6 +145,7 @@
 #include "threading/LockGuard.h"
 #include "threading/Thread.h"
 #include "util/CompleteFile.h"  // js::FileContents, js::ReadCompleteFile
+#include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
 #include "util/Windows.h"
@@ -518,6 +519,9 @@
 bool shell::enableWasmVerbose = false;
 bool shell::enableTestWasmAwaitTier2 = false;
 bool shell::enableSourcePragmas = true;
+#ifdef ENABLE_WASM_EXCEPTIONS
+bool shell::enableWasmExceptions = false;
+#endif
 bool shell::enableAsyncStacks = false;
 bool shell::enableAsyncStackCaptureDebuggeeOnly = false;
 bool shell::enableStreams = false;
@@ -531,6 +535,7 @@
 bool shell::enableIteratorHelpers = false;
 bool shell::enablePrivateClassFields = false;
 bool shell::enablePrivateClassMethods = false;
+bool shell::enableTopLevelAwait = false;
 bool shell::useOffThreadParseGlobal = true;
 #ifdef JS_GC_ZEAL
 uint32_t shell::gZealBits = 0;
@@ -2880,11 +2885,11 @@
 static bool Quit(JSContext* cx, unsigned argc, Value* vp) {
   ShellContext* sc = GetShellContext(cx);
 
-#ifdef JS_MORE_DETERMINISTIC
-  // Print a message to stderr in more-deterministic builds to help jsfunfuzz
+  // Print a message to stderr in differential testing to help jsfunfuzz
   // find uncatchable-exception bugs.
-  fprintf(stderr, "quit called\n");
-#endif
+  if (js::SupportDifferentialTesting()) {
+    fprintf(stderr, "quit called\n");
+  }
 
   CallArgs args = CallArgsFromVp(argc, vp);
   int32_t code;
@@ -2966,12 +2971,11 @@
 static bool AssertEq(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   if (!(args.length() == 2 || (args.length() == 3 && args[2].isString()))) {
-    JS_ReportErrorNumberASCII(
-        cx, my_GetErrorMessage, nullptr,
-        (args.length() < 2)
-            ? JSSMSG_NOT_ENOUGH_ARGS
-            : (args.length() == 3) ? JSSMSG_INVALID_ARGS : JSSMSG_TOO_MANY_ARGS,
-        "assertEq");
+    JS_ReportErrorNumberASCII(cx, my_GetErrorMessage, nullptr,
+                              (args.length() < 2)    ? JSSMSG_NOT_ENOUGH_ARGS
+                              : (args.length() == 3) ? JSSMSG_INVALID_ARGS
+                                                     : JSSMSG_TOO_MANY_ARGS,
+                              "assertEq");
     return false;
   }
 
@@ -4465,10 +4469,7 @@
     return false;
   }
   RootedObject obj(cx, &args[0].toObject());
-  ObjectGroup* group = JSObject::getGroup(cx, obj);
-  if (!group) {
-    return false;
-  }
+  ObjectGroup* group = obj->group();
   args.rval().set(JS_NumberValue(double(uintptr_t(group) >> 3)));
   return true;
 }
@@ -4844,22 +4845,6 @@
     return false;
   }
 
-  // Similarly, don't allow enabling or disabling Warp at runtime. Bytecode and
-  // VM data structures depend on whether TI is enabled/disabled.
-  if (opt == JSJITCOMPILER_WARP_ENABLE) {
-    uint32_t warpEnabled;
-    if (!JS_GetGlobalJitCompilerOption(cx, JSJITCOMPILER_WARP_ENABLE,
-                                       &warpEnabled)) {
-      return false;
-    }
-    if (bool(number) != warpEnabled) {
-      JS_ReportErrorASCII(
-          cx, "Enabling or disabling Warp at runtime is not supported.");
-      return false;
-    }
-    return true;
-  }
-
   // Throw if disabling the JITs and there's JIT code on the stack, to avoid
   // assertion failures.
   if ((opt == JSJITCOMPILER_BASELINE_ENABLE ||
@@ -5579,7 +5564,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(cx, allocScope, options,
-                                              compilationInfo.get().stencil);
+                                              compilationInfo.get());
 
   if (isAscii) {
     const Latin1Char* latin1 = stableChars.latin1Range().begin().get();
@@ -5606,6 +5591,14 @@
 }
 
 static bool Parse(JSContext* cx, unsigned argc, Value* vp) {
+  // Parse returns local scope information with variables ordered
+  // differently, depending on the underlying JIT implementation.
+  if (js::SupportDifferentialTesting()) {
+    JS_ReportErrorASCII(cx,
+                        "Function not available in differential testing mode.");
+    return false;
+  }
+
   return FrontendTest(cx, argc, vp, "parse", DumpType::ParseNode);
 }
 
@@ -5645,7 +5638,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(cx, allocScope, options,
-                                              compilationInfo.get().stencil);
+                                              compilationInfo.get());
 
   Parser<frontend::SyntaxParseHandler, char16_t> parser(
       cx, options, chars, length, false, compilationInfo.get(),
@@ -7030,14 +7023,6 @@
   return true;
 }
 
-static bool HasCopyOnWriteElements(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  args.rval().setBoolean(
-      args.get(0).isObject() && args[0].toObject().isNative() &&
-      args[0].toObject().as<NativeObject>().denseElementsAreCopyOnWrite());
-  return true;
-}
-
 static bool EnableGeckoProfiling(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -7752,6 +7737,12 @@
   CallArgs args = CallArgsFromVp(argc, vp);
   RootedObject callee(cx, &args.callee());
 
+  if (js::SupportDifferentialTesting()) {
+    ReportUsageErrorASCII(
+        cx, callee, "Function not available in differential testing mode.");
+    return false;
+  }
+
   if (args.length() != 1) {
     ReportUsageErrorASCII(cx, callee, "Wrong number of arguments");
     return false;
@@ -7786,11 +7777,7 @@
     }
   }
 
-#ifndef JS_MORE_DETERMINISTIC
-  // Don't dump anything in more-deterministic builds because the output
-  // includes pointer values.
   script->bodyScope()->dump();
-#endif
 
   args.rval().setUndefined();
   return true;
@@ -9125,10 +9112,6 @@
 "isLatin1(s)",
 "  Return true iff the string's characters are stored as Latin1."),
 
-    JS_FN_HELP("hasCopyOnWriteElements", HasCopyOnWriteElements, 1, 0,
-"hasCopyOnWriteElements(o)",
-"  Return true iff the object has copy-on-write dense elements."),
-
     JS_FN_HELP("stackPointerInfo", StackPointerInfo, 0, 0,
 "stackPointerInfo()",
 "  Return an int32 value which corresponds to the offset of the latest stack\n"
@@ -10429,6 +10412,9 @@
 #ifdef ENABLE_WASM_SIMD
   enableWasmSimd = !op.getBoolOption("no-wasm-simd");
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+  enableWasmExceptions = op.getBoolOption("wasm-exceptions");
+#endif
   enableWasmVerbose = op.getBoolOption("wasm-verbose");
   enableTestWasmAwaitTier2 = op.getBoolOption("test-wasm-await-tier2");
   enableSourcePragmas = !op.getBoolOption("no-source-pragmas");
@@ -10448,6 +10434,7 @@
   enablePrivateClassFields = op.getBoolOption("enable-private-fields") ||
                              op.getBoolOption("enable-private-methods");
   enablePrivateClassMethods = op.getBoolOption("enable-private-methods");
+  enableTopLevelAwait = op.getBoolOption("enable-top-level-await");
   useOffThreadParseGlobal = !op.getBoolOption("no-off-thread-parse-global");
 
   JS::ContextOptionsRef(cx)
@@ -10473,21 +10460,22 @@
 #ifdef ENABLE_WASM_SIMD
       .setWasmSimd(enableWasmSimd)
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+      .setWasmExceptions(enableWasmExceptions)
+#endif
       .setWasmVerbose(enableWasmVerbose)
       .setTestWasmAwaitTier2(enableTestWasmAwaitTier2)
       .setSourcePragmas(enableSourcePragmas)
       .setAsyncStack(enableAsyncStacks)
       .setAsyncStackCaptureDebuggeeOnly(enableAsyncStackCaptureDebuggeeOnly)
       .setPrivateClassFields(enablePrivateClassFields)
-      .setPrivateClassMethods(enablePrivateClassMethods);
+      .setPrivateClassMethods(enablePrivateClassMethods)
+      .setTopLevelAwait(enableTopLevelAwait);
 
   JS::SetUseOffThreadParseGlobal(useOffThreadParseGlobal);
 
-  // First check some options that set default warm-up thresholds, so these
-  // thresholds can be overridden below by --ion-eager and other flags.
-  if (op.getBoolOption("no-warp")) {
-    jit::JitOptions.setWarpEnabled(false);
-  }
+  // Check --fast-warmup first because it sets default warm-up thresholds. These
+  // thresholds can then be overridden below by --ion-eager and other flags.
   if (op.getBoolOption("fast-warmup")) {
     jit::JitOptions.setFastWarmUp();
   }
@@ -10864,6 +10852,9 @@
 #ifdef ENABLE_WASM_SIMD
       .setWasmSimd(enableWasmSimd)
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+      .setWasmExceptions(enableWasmExceptions)
+#endif
       .setWasmReftypes(enableWasmReftypes)
       .setWasmVerbose(enableWasmVerbose)
       .setTestWasmAwaitTier2(enableTestWasmAwaitTier2)
@@ -11035,6 +11026,12 @@
         (getenv("MOZ_FUZZING_SAFE") && getenv("MOZ_FUZZING_SAFE")[0] != '0');
   }
 
+#ifdef DEBUG
+  if (op->getBoolOption("differential-testing")) {
+    JS::SetSupportDifferentialTesting(true);
+  }
+#endif
+
   if (op->getBoolOption("disable-oom-functions")) {
     disableOOMFunctions = true;
   }
@@ -11095,14 +11092,6 @@
     }
   }
 
-  /*
-   * Dump remaining type inference results while we still have a context.
-   * This printing depends on atoms still existing.
-   */
-  for (CompartmentsIter c(cx->runtime()); !c.done(); c.next()) {
-    PrintTypes(cx, c, false);
-  }
-
   return result;
 }
 
@@ -11258,8 +11247,6 @@
       !op.addBoolOption('\0', "no-ion", "Disable IonMonkey") ||
       !op.addBoolOption('\0', "no-ion-for-main-context",
                         "Disable IonMonkey for the main context only") ||
-      !op.addBoolOption('\0', "warp", "Enable WarpBuilder (default)") ||
-      !op.addBoolOption('\0', "no-warp", "Disable WarpBuilder") ||
       !op.addIntOption('\0', "inlining-entry-threshold", "COUNT",
                        "The minimum stub entry count before trial-inlining a"
                        " call",
@@ -11271,8 +11258,14 @@
       !op.addBoolOption('\0', "no-asmjs", "Disable asm.js compilation") ||
       !op.addStringOption(
           '\0', "wasm-compiler", "[option]",
-          "Choose to enable a subset of the wasm compilers (valid options are "
-          "none/baseline/ion/cranelift/baseline+ion/baseline+cranelift)") ||
+          "Choose to enable a subset of the wasm compilers, valid options are "
+          "'none', 'baseline', 'ion', 'cranelift', 'optimizing', "
+          "'baseline+ion', "
+          "'baseline+cranelift', 'baseline+optimizing'. Choosing 'ion' when "
+          "Ion is "
+          "not available or 'cranelift' when Cranelift is not available will "
+          "fail; "
+          "use 'optimizing' for cross-compiler compatibility.") ||
       !op.addBoolOption('\0', "wasm-verbose",
                         "Enable WebAssembly verbose logging") ||
       !op.addBoolOption('\0', "disable-wasm-huge-memory",
@@ -11307,6 +11300,13 @@
 #else
       !op.addBoolOption('\0', "no-wasm-simd", "No-op") ||
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+      !op.addBoolOption('\0', "wasm-exceptions",
+                        "Enable wasm exceptions features") ||
+#else
+      !op.addBoolOption('\0', "wasm-exceptions", "No-op") ||
+#endif
+
       !op.addBoolOption('\0', "no-native-regexp",
                         "Disable native regexp compilation") ||
       !op.addIntOption(
@@ -11348,6 +11348,8 @@
                         "Enable private class fields") ||
       !op.addBoolOption('\0', "enable-private-methods",
                         "Enable private class methods") ||
+      !op.addBoolOption('\0', "enable-top-level-await",
+                        "Enable top-level await") ||
       !op.addBoolOption('\0', "no-off-thread-parse-global",
                         "Do not use parseGlobal in off-thread compilation and "
                         "instead instantiate stencil in main-thread") ||
@@ -11491,6 +11493,11 @@
       !op.addBoolOption('\0', "fuzzing-safe",
                         "Don't expose functions that aren't safe for "
                         "fuzzers to call") ||
+#ifdef DEBUG
+      !op.addBoolOption('\0', "differential-testing",
+                        "Avoid random/undefined behavior that disturbs "
+                        "differential testing (correctness fuzzing)") ||
+#endif
       !op.addBoolOption('\0', "disable-oom-functions",
                         "Disable functions that cause "
                         "artificial OOMs") ||
diff -Nru firefox-84.0.2+build1/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp firefox-85.0+build1/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp
--- firefox-84.0.2+build1/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/jsrtfuzzing/jsrtfuzzing.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -54,6 +54,10 @@
   }
 }
 
+#ifdef LIBFUZZER
+static void FuzzJSRuntimeAtExit() { JS_ShutDown(); }
+#endif
+
 int js::shell::FuzzJSRuntimeStart(JSContext* cx, int* argc, char*** argv) {
   gCx = cx;
   gFuzzModuleName = getenv("FUZZER");
@@ -65,6 +69,8 @@
   }
 
 #ifdef LIBFUZZER
+  // This is required because libFuzzer can exit() in various cases
+  std::atexit(FuzzJSRuntimeAtExit);
   fuzzer::FuzzerDriver(&shell::sArgc, &shell::sArgv, FuzzJSRuntimeFuzz);
 #elif __AFL_COMPILER
   MOZ_CRASH("AFL is unsupported for JS runtime fuzzing integration");
diff -Nru firefox-84.0.2+build1/js/src/shell/jsshell.h firefox-85.0+build1/js/src/shell/jsshell.h
--- firefox-84.0.2+build1/js/src/shell/jsshell.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/jsshell.h	2021-01-18 19:58:13.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/Variant.h"
 
 #include "jsapi.h"
 
@@ -124,6 +123,9 @@
 #ifdef ENABLE_WASM_SIMD
 extern bool enableWasmSimd;
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+extern bool enableWasmExceptions;
+#endif
 extern bool enableWasmVerbose;
 extern bool enableTestWasmAwaitTier2;
 extern bool enableSourcePragmas;
@@ -141,6 +143,7 @@
 extern bool enableIteratorHelpers;
 extern bool enablePrivateClassFields;
 extern bool enablePrivateClassMethods;
+extern bool enableTopLevelAwait;
 #ifdef JS_GC_ZEAL
 extern uint32_t gZealBits;
 extern uint32_t gZealFrequency;
diff -Nru firefox-84.0.2+build1/js/src/shell/ModuleLoader.cpp firefox-85.0+build1/js/src/shell/ModuleLoader.cpp
--- firefox-84.0.2+build1/js/src/shell/ModuleLoader.cpp	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/ModuleLoader.cpp	2021-01-18 19:58:13.000000000 +0000
@@ -89,7 +89,20 @@
 }
 
 bool ModuleLoader::loadRootModule(JSContext* cx, HandleString path) {
-  return loadAndExecute(cx, path);
+  RootedValue rval(cx);
+  if (!loadAndExecute(cx, path, &rval)) {
+    return false;
+  }
+
+  if (cx->options().topLevelAwait()) {
+    RootedObject evaluationPromise(cx, &rval.toObject());
+    if (evaluationPromise == nullptr) {
+      return false;
+    }
+
+    return JS::ThrowOnModuleEvaluationFailure(cx, evaluationPromise);
+  }
+  return true;
 }
 
 bool ModuleLoader::registerTestModule(JSContext* cx, HandleString specifier,
@@ -107,13 +120,18 @@
   return addModuleToRegistry(cx, path, module);
 }
 
-bool ModuleLoader::loadAndExecute(JSContext* cx, HandleString path) {
+bool ModuleLoader::loadAndExecute(JSContext* cx, HandleString path,
+                                  MutableHandleValue rval) {
   RootedObject module(cx, loadAndParse(cx, path));
   if (!module) {
     return false;
   }
 
-  return JS::ModuleInstantiate(cx, module) && JS::ModuleEvaluate(cx, module);
+  if (!JS::ModuleInstantiate(cx, module)) {
+    return false;
+  }
+
+  return JS::ModuleEvaluate(cx, module, rval);
 }
 
 JSObject* ModuleLoader::resolveImportedModule(
@@ -226,23 +244,31 @@
                                    JS::HandleObject promise) {
   // Exceptions during dynamic import are handled by calling
   // FinishDynamicModuleImport with a pending exception on the context.
-  bool ok = tryDynamicImport(cx, referencingPrivate, specifier, promise);
+  RootedValue rval(cx);
+  bool ok = tryDynamicImport(cx, referencingPrivate, specifier, promise, &rval);
+  if (cx->options().topLevelAwait()) {
+    JSObject* evaluationObject = ok ? &rval.toObject() : nullptr;
+    RootedObject evaluationPromise(cx, evaluationObject);
+    return JS::FinishDynamicModuleImport(
+        cx, evaluationPromise, referencingPrivate, specifier, promise);
+  }
   JS::DynamicImportStatus status =
       ok ? JS::DynamicImportStatus::Ok : JS::DynamicImportStatus::Failed;
-  return JS::FinishDynamicModuleImport(cx, status, referencingPrivate,
-                                       specifier, promise);
+  return JS::FinishDynamicModuleImport_NoTLA(cx, status, referencingPrivate,
+                                             specifier, promise);
 }
 
 bool ModuleLoader::tryDynamicImport(JSContext* cx,
                                     JS::HandleValue referencingPrivate,
                                     JS::HandleString specifier,
-                                    JS::HandleObject promise) {
+                                    JS::HandleObject promise,
+                                    JS::MutableHandleValue rval) {
   RootedLinearString path(cx, resolve(cx, specifier, referencingPrivate));
   if (!path) {
     return false;
   }
 
-  return loadAndExecute(cx, path);
+  return loadAndExecute(cx, path, rval);
 }
 
 JSLinearString* ModuleLoader::resolve(JSContext* cx, HandleString nameArg,
diff -Nru firefox-84.0.2+build1/js/src/shell/ModuleLoader.h firefox-85.0+build1/js/src/shell/ModuleLoader.h
--- firefox-84.0.2+build1/js/src/shell/ModuleLoader.h	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/shell/ModuleLoader.h	2021-01-18 19:58:13.000000000 +0000
@@ -39,7 +39,7 @@
   static bool DynamicImportDelayRejected(JSContext* cx, unsigned argc,
                                          Value* vp);
 
-  bool loadAndExecute(JSContext* cx, HandleString path);
+  bool loadAndExecute(JSContext* cx, HandleString path, MutableHandleValue);
   JSObject* resolveImportedModule(JSContext* cx, HandleValue referencingPrivate,
                                   HandleString specifier);
   bool populateImportMeta(JSContext* cx, HandleValue privateValue,
@@ -49,7 +49,8 @@
   bool doDynamicImport(JSContext* cx, HandleValue referencingPrivate,
                        HandleString specifier, HandleObject promise);
   bool tryDynamicImport(JSContext* cx, HandleValue referencingPrivate,
-                        HandleString specifier, HandleObject promise);
+                        HandleString specifier, HandleObject promise,
+                        MutableHandleValue rval);
   JSObject* loadAndParse(JSContext* cx, HandleString path);
   bool lookupModuleInRegistry(JSContext* cx, HandleString path,
                               MutableHandleObject moduleOut);
diff -Nru firefox-84.0.2+build1/js/src/tests/jstests.list firefox-85.0+build1/js/src/tests/jstests.list
--- firefox-84.0.2+build1/js/src/tests/jstests.list	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/jstests.list	2021-01-18 19:58:13.000000000 +0000
@@ -282,18 +282,12 @@
 skip script test262/language/expressions/compound-assignment/compound-assignment-operator-calls-putvalue-lref--v-.js
 skip script test262/language/expressions/compound-assignment/compound-assignment-operator-calls-putvalue-lref--v--20.js
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1662977
-skip script test262/intl402/NumberFormat/dft-currency-mnfd-range-check-mxfd.js
-
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1670502
 skip script test262/built-ins/Function/prototype/toString/built-in-function-object.js
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1225839
 ignore-flag(--more-compartments) script test262/built-ins/Function/internals/Call/class-ctor-realm.js
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1670062
-skip script test262/intl402/Collator/constructor-options-throwing-getters.js
-
 # These two tests assume that assignment to function calls is a SyntaxError.  We
 # historically implemented otherwise, as web reality.  Perhaps that can be
 # reevaluated at some point.
@@ -407,16 +401,6 @@
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1462745
 skip script test262/annexB/language/function-code/block-decl-nested-blocks-with-fun-decl.js
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1508683
-# All of these tests pass except with --more-compartments.
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/multiline/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/global/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/sticky/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/ignoreCase/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/unicode/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/dotAll/cross-realm.js
-ignore-flag(--more-compartments) script test262/built-ins/RegExp/prototype/source/cross-realm.js
-
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1545038
 # All of these tests pass except with --more-compartments.
 ignore-flag(--more-compartments) script test262/built-ins/String/prototype/valueOf/non-generic-realm.js
@@ -440,9 +424,6 @@
 ignore-flag(--more-compartments) script test262/built-ins/Proxy/construct/return-not-object-throws-boolean-realm.js
 ignore-flag(--more-compartments) script test262/built-ins/Proxy/construct/return-not-object-throws-boolean-realm.js
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1362154
-skip script test262/built-ins/String/prototype/replaceAll/searchValue-replacer-RegExp-call.js
-
 # Depends upon the SharedArrayBuffer constructor being defined as a global
 # property -- and right now, it's only defined for cross-site-isolated pages
 # that request it using COOP/COEP.
diff -Nru firefox-84.0.2+build1/js/src/tests/lib/tests.py firefox-85.0+build1/js/src/tests/lib/tests.py
--- firefox-84.0.2+build1/js/src/tests/lib/tests.py	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/lib/tests.py	2021-01-18 19:58:13.000000000 +0000
@@ -46,18 +46,6 @@
         ["--baseline-eager"],
         ["--ion-eager", "--ion-offthread-compile=off", "--more-compartments"],
     ],
-    # Used for testing WarpBuilder.
-    "warp": [["--warp"], ["--warp", "--ion-eager", "--ion-offthread-compile=off"]],
-    "nowarp": [
-        ["--no-warp"],
-        [
-            "--no-warp",
-            "--ion-eager",
-            "--ion-offthread-compile=off",
-            "--more-compartments",
-        ],
-        ["--no-warp", "--baseline-eager"],
-    ],
     # Run reduced variants on debug builds, since they take longer time.
     "debug": [
         [],  # no flags, normal baseline and ion
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Array/at.js firefox-85.0+build1/js/src/tests/non262/Array/at.js
--- firefox-84.0.2+build1/js/src/tests/non262/Array/at.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Array/at.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,41 @@
+// |reftest| skip-if(!Array.prototype.at)
+
+function basic() {
+  assertEq([0].at(0), 0);
+  assertEq([0].at(-1), 0);
+
+  assertEq([].at(0), undefined);
+  assertEq([].at(-1), undefined);
+  assertEq([].at(1), undefined);
+
+  assertEq([0, 1].at(0), 0);
+  assertEq([0, 1].at(1), 1);
+  assertEq([0, 1].at(-2), 0);
+  assertEq([0, 1].at(-1), 1);
+
+  assertEq([0, 1].at(2), undefined);
+  assertEq([0, 1].at(-3), undefined);
+  assertEq([0, 1].at(-4), undefined);
+  assertEq([0, 1].at(Infinity), undefined);
+  assertEq([0, 1].at(-Infinity), undefined);
+  assertEq([0, 1].at(NaN), 0); // ToInteger(NaN) = 0
+}
+
+function obj() {
+  var o = {length: 0, [0]: "a", at: Array.prototype.at};
+
+  assertEq(o.at(0), undefined);
+  assertEq(o.at(-1), undefined);
+
+  o.length = 1;
+  assertEq(o.at(0), "a");
+  assertEq(o.at(-1), "a");
+  assertEq(o.at(1), undefined);
+  assertEq(o.at(-2), undefined);
+}
+
+basic();
+obj();
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js
--- firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backward_links.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
+// tzdata version = 2020f
 
 const tzMapper = [
     x => x,
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js
--- firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
+// tzdata version = 2020f
 
 const tzMapper = [
     x => x,
@@ -79,6 +79,7 @@
     "Asia/Vientiane": "Asia/Vientiane",
     "Atlantic/Jan_Mayen": "Atlantic/Jan_Mayen",
     "Atlantic/St_Helena": "Atlantic/St_Helena",
+    "Australia/Currie": "Australia/Currie",
     "Europe/Belfast": "Europe/Belfast",
     "Europe/Guernsey": "Europe/Guernsey",
     "Europe/Isle_of_Man": "Europe/Isle_of_Man",
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js
--- firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_backzone_links.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
+// tzdata version = 2020f
 
 const tzMapper = [
     x => x,
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js
--- firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_notbackward_links.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,7 +1,7 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
+// tzdata version = 2020f
 
 const tzMapper = [
     x => x,
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js
--- firefox-84.0.2+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/Intl/DateTimeFormat/timeZone_version.js	2021-01-18 19:58:13.000000000 +0000
@@ -1,8 +1,8 @@
 // |reftest| skip-if(!this.hasOwnProperty("Intl"))
 
 // Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2020d
-const tzdata = "2020d";
+// tzdata version = 2020f
+const tzdata = "2020f";
 
 if (typeof getICUOptions === "undefined") {
     var getICUOptions = SpecialPowers.Cu.getJSTestingFunctions().getICUOptions;
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/RegExp/cross-compartment-getter.js firefox-85.0+build1/js/src/tests/non262/RegExp/cross-compartment-getter.js
--- firefox-84.0.2+build1/js/src/tests/non262/RegExp/cross-compartment-getter.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/RegExp/cross-compartment-getter.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,43 @@
+const otherGlobal = newGlobal({newCompartment: true});
+
+let regExp = otherGlobal.eval("/a(b|c)/iy");
+
+function get(name) {
+    const descriptor = Object.getOwnPropertyDescriptor(RegExp.prototype, name);
+    return descriptor.get.call(regExp);
+}
+
+assertEq(get("flags"), "iy");
+assertEq(get("global"), false);
+assertEq(get("ignoreCase"), true);
+assertEq(get("multiline"), false);
+assertEq(get("dotAll"), false);
+assertEq(get("source"), "a(b|c)");
+assertEq(get("sticky"), true);
+assertEq(get("unicode"), false);
+
+regExp = otherGlobal.eval("new RegExp('', 'gu')");
+
+assertEq(get("flags"), "gu");
+assertEq(get("global"), true);
+assertEq(get("ignoreCase"), false);
+assertEq(get("multiline"), false);
+assertEq(get("dotAll"), false);
+assertEq(get("source"), "(?:)");
+assertEq(get("sticky"), false);
+assertEq(get("unicode"), true);
+
+// Trigger escaping
+regExp = otherGlobal.eval("new RegExp('a/b', '')");
+
+assertEq(get("flags"), "");
+assertEq(get("global"), false);
+assertEq(get("ignoreCase"), false);
+assertEq(get("multiline"), false);
+assertEq(get("dotAll"), false);
+assertEq(get("source"), "a\\/b");
+assertEq(get("sticky"), false);
+assertEq(get("unicode"), false);
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/String/at.js firefox-85.0+build1/js/src/tests/non262/String/at.js
--- firefox-84.0.2+build1/js/src/tests/non262/String/at.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/String/at.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,40 @@
+// |reftest| skip-if(!String.prototype.at)
+
+function basic() {
+  assertEq("a".at(0), "a");
+  assertEq("a".at(-1), "a");
+
+  assertEq("".at(0), undefined);
+  assertEq("".at(-1), undefined);
+  assertEq("".at(1), undefined);
+
+  assertEq("ab".at(0), "a");
+  assertEq("ab".at(1), "b");
+  assertEq("ab".at(-2), "a");
+  assertEq("ab".at(-1), "b");
+
+  assertEq("ab".at(2), undefined);
+  assertEq("ab".at(-3), undefined);
+  assertEq("ab".at(-4), undefined);
+  assertEq("ab".at(Infinity), undefined);
+  assertEq("ab".at(-Infinity), undefined);
+  assertEq("ab".at(NaN), "a"); // ToInteger(NaN) = 0
+
+  assertEq("\u{1f921}".at(0), "\u{d83e}");
+  assertEq("\u{1f921}".at(1), "\u{dd21}");
+}
+
+function other() {
+  var n = 146;
+  assertEq(String.prototype.at.call(n, 0), "1");
+  var obj = {};
+  assertEq(String.prototype.at.call(obj, -1), "]");
+  var b = true;
+  assertEq(String.prototype.at.call(b, 0), "t");
+}
+
+basic();
+other();
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-84.0.2+build1/js/src/tests/non262/TypedArray/at.js firefox-85.0+build1/js/src/tests/non262/TypedArray/at.js
--- firefox-84.0.2+build1/js/src/tests/non262/TypedArray/at.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/non262/TypedArray/at.js	2021-01-18 19:58:13.000000000 +0000
@@ -0,0 +1,49 @@
+// |reftest| skip-if(!Int32Array.prototype.at)
+
+for (var constructor of anyTypedArrayConstructors) {
+    assertEq(constructor.prototype.at.length, 1);
+
+    assertEq(new constructor([0]).at(0), 0);
+    assertEq(new constructor([0]).at(-1), 0);
+
+    assertEq(new constructor([]).at(0), undefined);
+    assertEq(new constructor([]).at(-1), undefined);
+    assertEq(new constructor([]).at(1), undefined);
+
+    assertEq(new constructor([0, 1]).at(0), 0);
+    assertEq(new constructor([0, 1]).at(1), 1);
+    assertEq(new constructor([0, 1]).at(-2), 0);
+    assertEq(new constructor([0, 1]).at(-1), 1);
+
+    assertEq(new constructor([0, 1]).at(2), undefined);
+    assertEq(new constructor([0, 1]).at(-3), undefined);
+    assertEq(new constructor([0, 1]).at(-4), undefined);
+    assertEq(new constructor([0, 1]).at(Infinity), undefined);
+    assertEq(new constructor([0, 1]).at(-Infinity), undefined);
+    assertEq(new constructor([0, 1]).at(NaN), 0); // ToInteger(NaN) = 0
+
+    // Called from other globals.
+    if (typeof newGlobal === "function") {
+        var at = newGlobal()[constructor.name].prototype.at;
+        assertEq(at.call(new constructor([1, 2, 3]), 2), 3);
+    }
+
+    // Throws if `this` isn't a TypedArray.
+    var invalidReceivers = [undefined, null, 1, false, "", Symbol(), [], {}, /./,
+                            new Proxy(new constructor(), {})];
+    invalidReceivers.forEach(invalidReceiver => {
+        assertThrowsInstanceOf(() => {
+            constructor.prototype.at.call(invalidReceiver);
+        }, TypeError, "Assert that 'at' fails if this value is not a TypedArray");
+    });
+
+    // Test that the length getter is never called.
+    assertEq(Object.defineProperty(new constructor([1, 2, 3]), "length", {
+        get() {
+            throw new Error("length accessor called");
+        }
+    }).at(1), 2);
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenable-not-callable.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenable-not-callable.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenable-not-callable.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenable-not-callable.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables-that-throw.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables-that-throw.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables-that-throw.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-awaits-thenables-that-throw.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-rejection.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-rejection.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-rejection.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-rejection.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:TypeError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:TypeError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-resolution.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-resolution.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-resolution.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-dynamic-import-resolution.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr-reject.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr-reject.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr-reject.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-new-expr-reject.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-reject-throws.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-reject-throws.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-reject-throws.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-reject-throws.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-resolution.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-resolution.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-resolution.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-expr-resolution.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-void-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-void-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/await-void-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/await-void-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-rejection.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-rejection.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-rejection.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-rejection.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-resolution.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-resolution.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-resolution.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/dynamic-import-resolution.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/early-errors-await-not-simple-assignment-target.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/early-errors-await-not-simple-assignment-target.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/early-errors-await-not-simple-assignment-target.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/early-errors-await-not-simple-assignment-target.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/if-await-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/if-await-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/if-await-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/if-await-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-async-import-async-resolution-ticks.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-async-import-async-resolution-ticks.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-async-import-async-resolution-ticks.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-async-import-async-resolution-ticks.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-body.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-body.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-body.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-body.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:TypeError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:TypeError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:TypeError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:TypeError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-tick.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-tick.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-tick.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-rejection-tick.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:RangeError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:RangeError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-resolution.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-resolution.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-resolution.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-resolution.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-unwrapped.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-unwrapped.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-unwrapped.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-import-unwrapped.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-self-import-async-resolution-ticks.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-self-import-async-resolution-ticks.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-self-import-async-resolution-ticks.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-self-import-async-resolution-ticks.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-sync-import-async-resolution-ticks.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-sync-import-async-resolution-ticks.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/module-sync-import-async-resolution-ticks.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/module-sync-import-async-resolution-ticks.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-parens.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-parens.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-parens.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-parens.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-script-code.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-script-code.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-script-code.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/new-await-script-code.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) -- requires shell-options
 // Copyright (C) 2020 Rick Waldron. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/no-operand.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/no-operand.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/no-operand.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/no-operand.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/await-expr-dyn-import.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/await-expr-dyn-import.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/await-expr-dyn-import.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/await-expr-dyn-import.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-func-expression.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-string.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-regexp.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/block-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/catch-parameter.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/catch-parameter.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/catch-parameter.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/catch-parameter.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-body.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-body.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-body.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-body.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-params.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-params.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-params.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-declaration-params.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-body.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-body.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-body.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-body.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-params.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-params.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-params.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-does-not-propagate-to-fn-expr-params.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-no-escaped-await.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-no-escaped-await.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-no-escaped-await.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/early-no-escaped-await.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip error:SyntaxError module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) error:SyntaxError module -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-class-decl-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/export-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dflt-assign-expr-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/export-dflt-assign-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-dft-class-decl-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/export-dflt-class-decl.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-lex-decl-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/export-lex-declaration.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/export-var-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/export-var-init.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/for-await-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/for-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-in-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/for-in-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/for-of-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/for-of-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-block-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/if-block.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-func-expression.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-identifier.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-nested.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-new-expr.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-obj-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-regexp.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/if-expr-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/if-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-func-expression.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-nested.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-obj-literal.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/top-level-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/top-level.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-func-expression.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-nested.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-obj-literal.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/try-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/try.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-func-expression.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-nested.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-obj-literal.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/typeof-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/typeof.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-func-expression.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-nested.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-obj-literal.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/void-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/void.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-array-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-array-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-array-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-array-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-array-literal.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-func-expression.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-func-expression.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-func-expression.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-func-expression.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-func-expression.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-identifier.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-identifier.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-identifier.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-identifier.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-identifier.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-number.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-number.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-number.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-number.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-number.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-string.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-string.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-string.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-literal-string.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-literal-string.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-nested.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-nested.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-nested.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-nested.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-nested.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-new-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-new-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-new-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-new-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-new-expr.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-null.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-null.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-null.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-null.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-null.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-obj-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-obj-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-obj-literal.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-obj-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-obj-literal.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-regexp.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-regexp.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-regexp.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-regexp.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-regexp.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-template-literal.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-template-literal.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-template-literal.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-template-literal.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-template-literal.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-this.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-this.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-this.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/syntax/while-await-expr-this.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module -- requires shell-options
 // This file was procedurally generated from the following sources:
 // - src/top-level-await/await-expr-this.case
 // - src/top-level-await/syntax/while-expr.template
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks-2.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks-2.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks-2.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks-2.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/top-level-ticks.js	2021-01-18 19:58:16.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/void-await-expr.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/void-await-expr.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/void-await-expr.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/void-await-expr.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/while-dynamic-evaluation.js firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/while-dynamic-evaluation.js
--- firefox-84.0.2+build1/js/src/tests/test262/language/module-code/top-level-await/while-dynamic-evaluation.js	2021-01-06 11:23:12.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262/language/module-code/top-level-await/while-dynamic-evaluation.js	2021-01-18 19:58:15.000000000 +0000
@@ -1,4 +1,4 @@
-// |reftest| skip module async -- top-level-await is not supported
+// |reftest| shell-option(--enable-top-level-await) skip-if(!xulRuntime.shell) module async -- requires shell-options
 // Copyright (C) 2019 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
diff -Nru firefox-84.0.2+build1/js/src/tests/test262-update.py firefox-85.0+build1/js/src/tests/test262-update.py
--- firefox-84.0.2+build1/js/src/tests/test262-update.py	2021-01-06 11:23:10.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/test262-update.py	2021-01-18 19:58:13.000000000 +0000
@@ -25,7 +25,6 @@
         "regexp-match-indices",
         "Intl.DateTimeFormat-quarter",
         "Intl.Segmenter",
-        "top-level-await",
         "Atomics.waitAsync",
         "legacy-regexp",
         "TypedArray.prototype.item",
@@ -51,6 +50,7 @@
     "class-static-fields-private": "--enable-private-fields",
     "class-methods-private": "--enable-private-methods",
     "class-static-methods-private": "--enable-private-methods",
+    "top-level-await": "--enable-top-level-await",
 }
 
 
diff -Nru firefox-84.0.2+build1/js/src/tests/user.js firefox-85.0+build1/js/src/tests/user.js
--- firefox-84.0.2+build1/js/src/tests/user.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/tests/user.js	2021-01-18 19:58:16.000000000 +0000
@@ -33,4 +33,5 @@
 user_pref("javascript.options.weakrefs", true);
 user_pref("javascript.options.experimental.weakrefs.expose_cleanupSome", true);
 user_pref("javascript.options.experimental.iterator_helpers", true);
-user_pref("javascript.options.experimental.private_fields", true);
\ No newline at end of file
+user_pref("javascript.options.experimental.private_fields", true);
+user_pref("javascript.options.experimental.top_level_await", true);
diff -Nru firefox-84.0.2+build1/js/src/threading/Mutex.cpp firefox-85.0+build1/js/src/threading/Mutex.cpp
--- firefox-84.0.2+build1/js/src/threading/Mutex.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/threading/Mutex.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -58,19 +58,14 @@
   owningThread_ = ThreadId();
 }
 
-bool js::Mutex::ownedByCurrentThread() const {
-  bool owned = ThreadId::ThisThreadId() == owningThread_;
-
-  // If we own the mutex then check it's on the mutex stack. It's not safe to do
-  // this if we don't own the mutex.
-
-  if (!owned) {
-    return false;
-  }
+void js::Mutex::assertOwnedByCurrentThread() const {
+  // This check is only thread-safe if it succeeds.
+  MOZ_ASSERT(ThreadId::ThisThreadId() == owningThread_);
 
+  // Check the mutex is on the mutex stack.
   for (Mutex* mutex = HeldMutexStack.get(); mutex; mutex = mutex->prev_) {
     if (mutex == this) {
-      return true;
+      return;
     }
   }
 
diff -Nru firefox-84.0.2+build1/js/src/threading/Mutex.h firefox-85.0+build1/js/src/threading/Mutex.h
--- firefox-84.0.2+build1/js/src/threading/Mutex.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/threading/Mutex.h	2021-01-18 19:58:16.000000000 +0000
@@ -50,41 +50,31 @@
  private:
   MutexImpl impl_;
 
- public:
 #ifdef DEBUG
-  static bool Init();
-#else
-  static bool Init() { return true; }
-#endif
+  const MutexId id_;
+  Mutex* prev_ = nullptr;
+  ThreadId owningThread_;
 
-  explicit Mutex(const MutexId& id)
-#ifdef DEBUG
-      : id_(id)
+  static MOZ_THREAD_LOCAL(Mutex*) HeldMutexStack;
 #endif
-  {
-    MOZ_ASSERT(id_.order != 0);
-  }
 
+ public:
 #ifdef DEBUG
+  static bool Init();
+
+  explicit Mutex(const MutexId& id) : id_(id) { MOZ_ASSERT(id_.order != 0); }
+
   void lock();
   void unlock();
+  void assertOwnedByCurrentThread() const;
 #else
-  void lock() { impl_.lock(); }
-  void unlock() { impl_.unlock(); }
-#endif
-
-#ifdef DEBUG
- public:
-  // This is not threadsafe if the check fails, and should only be used to
-  // assert that the current thread holds the mutex.
-  bool ownedByCurrentThread() const;
+  static bool Init() { return true; }
 
- private:
-  const MutexId id_;
-  Mutex* prev_ = nullptr;
-  ThreadId owningThread_;
+  explicit Mutex(const MutexId& id) {}
 
-  static MOZ_THREAD_LOCAL(Mutex*) HeldMutexStack;
+  void lock() { impl_.lock(); }
+  void unlock() { impl_.unlock(); }
+  void assertOwnedByCurrentThread() const {};
 #endif
 
  private:
diff -Nru firefox-84.0.2+build1/js/src/threading/ProtectedData.cpp firefox-85.0+build1/js/src/threading/ProtectedData.cpp
--- firefox-84.0.2+build1/js/src/threading/ProtectedData.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/threading/ProtectedData.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -100,14 +100,13 @@
 
   switch (Lock) {
     case GlobalLock::GCLock:
-      MOZ_ASSERT(TlsContext.get()->runtime()->gc.currentThreadHasLockedGC());
+      TlsContext.get()->runtime()->gc.assertCurrentThreadHasLockedGC();
       break;
     case GlobalLock::ScriptDataLock:
-      MOZ_ASSERT(
-          TlsContext.get()->runtime()->currentThreadHasScriptDataAccess());
+      TlsContext.get()->runtime()->assertCurrentThreadHasScriptDataAccess();
       break;
     case GlobalLock::HelperThreadLock:
-      MOZ_ASSERT(gHelperThreadLock.ownedByCurrentThread());
+      gHelperThreadLock.assertOwnedByCurrentThread();
       break;
   }
 }
@@ -135,8 +134,9 @@
     }
 
     // Otherwise we must hold the GC lock if parallel parsing is running.
-    MOZ_ASSERT_IF(rt->isOffThreadParseRunning(),
-                  rt->gc.currentThreadHasLockedGC());
+    if (rt->isOffThreadParseRunning()) {
+      rt->gc.assertCurrentThreadHasLockedGC();
+    }
     return;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/util/DifferentialTesting.h firefox-85.0+build1/js/src/util/DifferentialTesting.h
--- firefox-84.0.2+build1/js/src/util/DifferentialTesting.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/util/DifferentialTesting.h	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,27 @@
+/* -*- 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/. */
+
+/*
+ * Definitions for differential testing.
+ */
+
+#ifndef util_DifferentialTesting_h
+#define util_DifferentialTesting_h
+
+namespace js {
+
+inline bool SupportDifferentialTesting() {
+#ifdef DEBUG
+  extern bool gSupportDifferentialTesting;
+  return gSupportDifferentialTesting;
+#else
+  return false;
+#endif
+}
+
+}  // namespace js
+
+#endif /* util_DifferentialTesting_h */
diff -Nru firefox-84.0.2+build1/js/src/util/StringBuffer.cpp firefox-85.0+build1/js/src/util/StringBuffer.cpp
--- firefox-84.0.2+build1/js/src/util/StringBuffer.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/util/StringBuffer.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -162,20 +162,22 @@
   }
 
   if (isLatin1()) {
-    auto result = parserAtoms.internLatin1(cx_, latin1Chars().begin(), len);
-    if (result.isErr()) {
+    const frontend::ParserAtom* result =
+        parserAtoms.internLatin1(cx_, latin1Chars().begin(), len);
+    if (!result) {
       return nullptr;
     }
     latin1Chars().clear();
-    return result.unwrap();
+    return result;
   }
 
-  auto result = parserAtoms.internChar16(cx_, twoByteChars().begin(), len);
-  if (result.isErr()) {
+  const frontend::ParserAtom* result =
+      parserAtoms.internChar16(cx_, twoByteChars().begin(), len);
+  if (!result) {
     return nullptr;
   }
   twoByteChars().clear();
-  return result.unwrap();
+  return result;
 }
 
 bool js::ValueToStringBufferSlow(JSContext* cx, const Value& arg,
diff -Nru firefox-84.0.2+build1/js/src/vm/Activation.h firefox-85.0+build1/js/src/vm/Activation.h
--- firefox-84.0.2+build1/js/src/vm/Activation.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Activation.h	2021-01-18 19:58:16.000000000 +0000
@@ -389,7 +389,7 @@
   // youngest. They must all be younger than the frame that the |find| method
   // found a hit for; or you must have cleared the entire cache with the
   // |clear| method.
-  bool insert(JSContext* cx, FramePtr& framePtr, const jsbytecode* pc,
+  bool insert(JSContext* cx, FramePtr&& framePtr, const jsbytecode* pc,
               HandleSavedFrame savedFrame);
 
   // Remove all entries from the cache.
diff -Nru firefox-84.0.2+build1/js/src/vm/ArgumentsObject.cpp firefox-85.0+build1/js/src/vm/ArgumentsObject.cpp
--- firefox-84.0.2+build1/js/src/vm/ArgumentsObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArgumentsObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -506,19 +506,10 @@
   MOZ_ASSERT(!(attrs & JSPROP_READONLY));
   attrs &= (JSPROP_ENUMERATE | JSPROP_PERMANENT); /* only valid attributes */
 
-  RootedFunction callee(cx, &argsobj->callee());
-  RootedScript script(cx, JSFunction::getOrCreateScript(cx, callee));
-  if (!script) {
-    return false;
-  }
-
   if (JSID_IS_INT(id)) {
     unsigned arg = unsigned(JSID_TO_INT(id));
     if (arg < argsobj->initialLength() && !argsobj->isElementDeleted(arg)) {
-      argsobj->setElement(cx, arg, v);
-      if (arg < script->function()->nargs()) {
-        jit::JitScript::MonitorArgType(cx, script, arg, v);
-      }
+      argsobj->setElement(arg, v);
       return result.succeed();
     }
   } else {
@@ -726,15 +717,7 @@
       }
     } else {
       if (desc.hasValue()) {
-        RootedFunction callee(cx, &argsobj->callee());
-        RootedScript script(cx, JSFunction::getOrCreateScript(cx, callee));
-        if (!script) {
-          return false;
-        }
-        argsobj->setElement(cx, arg, desc.value());
-        if (arg < script->function()->nargs()) {
-          jit::JitScript::MonitorArgType(cx, script, arg, desc.value());
-        }
+        argsobj->setElement(arg, desc.value());
       }
       if (desc.hasWritable() && !desc.writable()) {
         if (!argsobj->markElementDeleted(cx, arg)) {
@@ -789,7 +772,7 @@
   if (JSID_IS_INT(id)) {
     unsigned arg = unsigned(JSID_TO_INT(id));
     if (arg < argsobj->initialLength()) {
-      argsobj->setElement(cx, arg, v);
+      argsobj->setElement(arg, v);
       return result.succeed();
     }
   } else {
diff -Nru firefox-84.0.2+build1/js/src/vm/ArgumentsObject.h firefox-85.0+build1/js/src/vm/ArgumentsObject.h
--- firefox-84.0.2+build1/js/src/vm/ArgumentsObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArgumentsObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -342,7 +342,7 @@
    */
   const Value& element(uint32_t i) const;
 
-  inline void setElement(JSContext* cx, uint32_t i, const Value& v);
+  inline void setElement(uint32_t i, const Value& v);
 
   const Value& arg(unsigned i) const {
     MOZ_ASSERT(i < data()->numArgs);
diff -Nru firefox-84.0.2+build1/js/src/vm/ArgumentsObject-inl.h firefox-85.0+build1/js/src/vm/ArgumentsObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/ArgumentsObject-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArgumentsObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -27,8 +27,7 @@
   return v;
 }
 
-inline void ArgumentsObject::setElement(JSContext* cx, uint32_t i,
-                                        const Value& v) {
+inline void ArgumentsObject::setElement(uint32_t i, const Value& v) {
   MOZ_ASSERT(!isElementDeleted(i));
   GCPtrValue& lhs = data()->args[i];
   if (IsMagicScopeSlotValue(lhs)) {
@@ -38,7 +37,7 @@
     for (Shape::Range<NoGC> r(callobj.lastProperty()); !r.empty();
          r.popFront()) {
       if (r.front().slot() == slot) {
-        callobj.setAliasedFormalFromArguments(cx, lhs, r.front().propid(), v);
+        callobj.setAliasedFormalFromArguments(lhs, v);
         return;
       }
     }
diff -Nru firefox-84.0.2+build1/js/src/vm/ArrayBufferObject.cpp firefox-85.0+build1/js/src/vm/ArrayBufferObject.cpp
--- firefox-84.0.2+build1/js/src/vm/ArrayBufferObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArrayBufferObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -484,15 +484,6 @@
   MOZ_ASSERT(!buffer->isPreparedForAsmJS());
   MOZ_ASSERT(!buffer->hasTypedObjectViews());
 
-  auto NoteViewBufferWasDetached = [&cx](ArrayBufferViewObject* view) {
-    MOZ_ASSERT(!view->isSharedMemory());
-
-    view->notifyBufferDetached();
-
-    // Notify compiled jit code that the base pointer has moved.
-    MarkObjectStateChange(cx, view);
-  };
-
   // Update all views of the buffer to account for the buffer having been
   // detached, and clear the buffer's data and list of views.
   //
@@ -503,12 +494,12 @@
           innerViews.maybeViewsUnbarriered(buffer)) {
     for (size_t i = 0; i < views->length(); i++) {
       JSObject* view = (*views)[i];
-      NoteViewBufferWasDetached(&view->as<ArrayBufferViewObject>());
+      view->as<ArrayBufferViewObject>().notifyBufferDetached();
     }
     innerViews.removeViews(buffer);
   }
   if (JSObject* view = buffer->firstView()) {
-    NoteViewBufferWasDetached(&view->as<ArrayBufferViewObject>());
+    view->as<ArrayBufferViewObject>().notifyBufferDetached();
     buffer->setFirstView(nullptr);
   }
 
@@ -830,7 +821,7 @@
                           const wasm::Limits& memory,
                           MutableHandleArrayBufferObjectMaybeShared buffer) {
   MOZ_ASSERT(memory.initial % wasm::PageSize == 0);
-  MOZ_RELEASE_ASSERT(cx->wasmHaveSignalHandlers);
+  MOZ_RELEASE_ASSERT(cx->wasm().haveSignalHandlers);
   MOZ_RELEASE_ASSERT(memory.initial <=
                      ArrayBufferObject::maxBufferByteLength());
 
diff -Nru firefox-84.0.2+build1/js/src/vm/ArrayBufferViewObject.cpp firefox-85.0+build1/js/src/vm/ArrayBufferViewObject.cpp
--- firefox-84.0.2+build1/js/src/vm/ArrayBufferViewObject.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArrayBufferViewObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -175,6 +175,37 @@
       /*safe - caller sees isSharedMemory flag*/);
 }
 
+JS_FRIEND_API uint8_t* JS_GetArrayBufferViewFixedData(JSObject* obj,
+                                                      uint8_t* buffer,
+                                                      size_t bufSize)
+{
+  ArrayBufferViewObject* view = obj->maybeUnwrapAs<ArrayBufferViewObject>();
+  if (!view) {
+    return nullptr;
+  }
+
+  // Disallow shared memory until it is needed.
+  if (view->isSharedMemory()) {
+    return nullptr;
+  }
+
+  // TypedArrays (but not DataViews) can have inline data, in which case we
+  // need to copy into the given buffer.
+  if (view->is<TypedArrayObject>()) {
+    TypedArrayObject* ta = &view->as<TypedArrayObject>();
+    if (ta->hasInlineElements()) {
+      size_t bytes = ta->byteLength().get();
+      if (bytes > bufSize) {
+        return nullptr; // Does not fit.
+      }
+      memcpy(buffer, view->dataPointerUnshared(), bytes);
+      return buffer;
+    }
+  }
+
+  return static_cast<uint8_t*>(view->dataPointerUnshared());
+}
+
 JS_FRIEND_API JSObject* JS_GetArrayBufferViewBuffer(JSContext* cx,
                                                     HandleObject obj,
                                                     bool* isSharedMemory) {
diff -Nru firefox-84.0.2+build1/js/src/vm/ArrayObject.h firefox-85.0+build1/js/src/vm/ArrayObject.h
--- firefox-84.0.2+build1/js/src/vm/ArrayObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArrayObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -34,15 +34,10 @@
     getElementsHeader()->setNonwritableArrayLength();
   }
 
-  inline void setLength(JSContext* cx, uint32_t length);
-
-  // Variant of setLength for use on arrays where the length cannot overflow
-  // int32_t.
-  void setLengthInt32(uint32_t length) {
+  void setLength(uint32_t length) {
     MOZ_ASSERT(lengthIsWritable());
     MOZ_ASSERT_IF(length != getElementsHeader()->length,
                   !denseElementsAreFrozen());
-    MOZ_ASSERT(length <= INT32_MAX);
     getElementsHeader()->length = length;
   }
 
@@ -54,12 +49,6 @@
                                          uint32_t length,
                                          AutoSetNewObjectMetadata& metadata);
 
-  // Make a copy-on-write array object which shares the elements of an
-  // existing object.
-  static inline ArrayObject* createCopyOnWriteArray(
-      JSContext* cx, gc::InitialHeap heap,
-      HandleArrayObject sharedElementsOwner);
-
  private:
   // Helper for the above methods.
   static inline ArrayObject* createArrayInternal(
diff -Nru firefox-84.0.2+build1/js/src/vm/ArrayObject-inl.h firefox-85.0+build1/js/src/vm/ArrayObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/ArrayObject-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ArrayObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -14,25 +14,10 @@
 #include "vm/StringType.h"
 
 #include "vm/JSObject-inl.h"
-#include "vm/ObjectGroup-inl.h"
 #include "vm/ObjectOperations-inl.h"  // js::GetElement
-#include "vm/TypeInference-inl.h"
 
 namespace js {
 
-inline void ArrayObject::setLength(JSContext* cx, uint32_t length) {
-  MOZ_ASSERT(lengthIsWritable());
-  MOZ_ASSERT_IF(length != getElementsHeader()->length,
-                !denseElementsAreFrozen());
-
-  if (length > INT32_MAX) {
-    /* Track objects with overflowing lengths in type information. */
-    MarkObjectGroupFlags(cx, this, OBJECT_FLAG_LENGTH_OVERFLOW);
-  }
-
-  getElementsHeader()->length = length;
-}
-
 /* static */ inline ArrayObject* ArrayObject::createArrayInternal(
     JSContext* cx, gc::AllocKind kind, gc::InitialHeap heap, HandleShape shape,
     HandleObjectGroup group, AutoSetNewObjectMetadata&) {
@@ -41,10 +26,6 @@
   MOZ_ASSERT(clasp == shape->getObjectClass());
   MOZ_ASSERT(clasp == &ArrayObject::class_);
   MOZ_ASSERT_IF(clasp->hasFinalize(), heap == gc::TenuredHeap);
-  MOZ_ASSERT_IF(group->hasUnanalyzedPreliminaryObjects(),
-                heap == js::gc::TenuredHeap);
-  MOZ_ASSERT_IF(group->shouldPreTenureDontCheckGeneration(),
-                heap == gc::TenuredHeap);
 
   // Arrays can use their fixed slots to store elements, so can't have shapes
   // which allow named properties to be stored in the fixed slots.
@@ -100,32 +81,6 @@
 
   return finishCreateArray(obj, shape, metadata);
 }
-
-/* static */ inline ArrayObject* ArrayObject::createCopyOnWriteArray(
-    JSContext* cx, gc::InitialHeap heap,
-    HandleArrayObject sharedElementsOwner) {
-  MOZ_ASSERT(sharedElementsOwner->getElementsHeader()->isCopyOnWrite());
-  MOZ_ASSERT(sharedElementsOwner->getElementsHeader()->ownerObject() ==
-             sharedElementsOwner);
-
-  // Use the smallest allocation kind for the array, as it can't have any
-  // fixed slots (see the assert in createArrayInternal) and will not be using
-  // its fixed elements.
-  gc::AllocKind kind = gc::AllocKind::OBJECT0_BACKGROUND;
-
-  AutoSetNewObjectMetadata metadata(cx);
-  RootedShape shape(cx, sharedElementsOwner->lastProperty());
-  RootedObjectGroup group(cx, sharedElementsOwner->group());
-  ArrayObject* obj =
-      createArrayInternal(cx, kind, heap, shape, group, metadata);
-  if (!obj) {
-    return nullptr;
-  }
-
-  obj->elements_ = sharedElementsOwner->getDenseElementsAllowCopyOnWrite();
-
-  return finishCreateArray(obj, shape, metadata);
-}
 
 }  // namespace js
 
diff -Nru firefox-84.0.2+build1/js/src/vm/AsyncFunction.cpp firefox-85.0+build1/js/src/vm/AsyncFunction.cpp
--- firefox-84.0.2+build1/js/src/vm/AsyncFunction.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/AsyncFunction.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Maybe.h"
 
+#include "builtin/ModuleObject.h"
 #include "builtin/Promise.h"
 #include "vm/FunctionFlags.h"  // js::FunctionFlags
 #include "vm/GeneratorObject.h"
@@ -34,11 +35,11 @@
   HandlePropertyName name = cx->names().AsyncFunction;
   return NewFunctionWithProto(cx, AsyncFunctionConstructor, 1,
                               FunctionFlags::NATIVE_CTOR, nullptr, name, proto,
-                              gc::AllocKind::FUNCTION, SingletonObject);
+                              gc::AllocKind::FUNCTION, TenuredObject);
 }
 
 static JSObject* CreateAsyncFunctionPrototype(JSContext* cx, JSProtoKey key) {
-  return NewSingletonObjectWithFunctionPrototype(cx, cx->global());
+  return NewTenuredObjectWithFunctionPrototype(cx, cx->global());
 }
 
 static bool AsyncFunctionClassFinish(JSContext* cx, HandleObject asyncFunction,
@@ -220,6 +221,67 @@
 
   // Starts in the running state.
   obj->setResumeIndex(AbstractGeneratorObject::RESUME_INDEX_RUNNING);
+
+  return obj;
+}
+
+JSFunction* NewHandler(JSContext* cx, Native handler,
+                       JS::Handle<JSObject*> target) {
+  cx->check(target);
+
+  JS::Handle<PropertyName*> funName = cx->names().empty;
+  JS::Rooted<JSFunction*> handlerFun(
+      cx, NewNativeFunction(cx, handler, 0, funName,
+                            gc::AllocKind::FUNCTION_EXTENDED, GenericObject));
+  if (!handlerFun) {
+    return nullptr;
+  }
+  handlerFun->setExtendedSlot(FunctionExtended::MODULE_SLOT,
+                              JS::ObjectValue(*target));
+  return handlerFun;
+}
+
+AsyncFunctionGeneratorObject* AsyncFunctionGeneratorObject::create(
+    JSContext* cx, HandleModuleObject module) {
+  // TODO: Module is currently hitching a ride with
+  // AsyncFunctionGeneratorObject. The reason for this is we have some work in
+  // the JITs that make use of this object when we hit AsyncAwait bytecode. At
+  // the same time, top level await shares a lot of it's implementation with
+  // AsyncFunction. I am not sure if the best thing to do here is inherit,
+  // override, or do something else. Comments appreciated.
+  MOZ_ASSERT(module->script()->isAsync());
+
+  Rooted<PromiseObject*> resultPromise(cx, CreatePromiseObjectForAsync(cx));
+  if (!resultPromise) {
+    return nullptr;
+  }
+
+  Rooted<AsyncFunctionGeneratorObject*> obj(
+      cx, NewBuiltinClassInstance<AsyncFunctionGeneratorObject>(cx));
+  if (!obj) {
+    return nullptr;
+  }
+  obj->initFixedSlot(PROMISE_SLOT, ObjectValue(*resultPromise));
+
+  RootedObject onFulfilled(
+      cx, NewHandler(cx, AsyncModuleExecutionFulfilledHandler, module));
+  if (!onFulfilled) {
+    return nullptr;
+  }
+
+  RootedObject onRejected(
+      cx, NewHandler(cx, AsyncModuleExecutionRejectedHandler, module));
+  if (!onRejected) {
+    return nullptr;
+  }
+
+  if (!JS::AddPromiseReactionsIgnoringUnhandledRejection(
+          cx, resultPromise, onFulfilled, onRejected)) {
+    return nullptr;
+  }
+
+  // Starts in the running state.
+  obj->setResumeIndex(AbstractGeneratorObject::RESUME_INDEX_RUNNING);
 
   return obj;
 }
diff -Nru firefox-84.0.2+build1/js/src/vm/AsyncFunction.h firefox-85.0+build1/js/src/vm/AsyncFunction.h
--- firefox-84.0.2+build1/js/src/vm/AsyncFunction.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/AsyncFunction.h	2021-01-18 19:58:16.000000000 +0000
@@ -258,8 +258,7 @@
 //   (operand here)                  # VALUE
 //
 //   TrySkipAwait                    # VALUE_OR_RVAL, CAN_SKIP
-//   Not                             # VALUE_OR_RVAL, !CAN_SKIP
-//   IfEq END                        # VALUE
+//   IfNe END                        # VALUE
 //
 //   JumpTarget                      # VALUE
 //   GetAliasedVar ".generator"      # VALUE .generator
@@ -312,6 +311,9 @@
   static AsyncFunctionGeneratorObject* create(JSContext* cx,
                                               HandleFunction asyncGen);
 
+  static AsyncFunctionGeneratorObject* create(JSContext* cx,
+                                              HandleModuleObject module);
+
   PromiseObject* promise() {
     return &getFixedSlot(PROMISE_SLOT).toObject().as<PromiseObject>();
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/AsyncIteration.cpp firefox-85.0+build1/js/src/vm/AsyncIteration.cpp
--- firefox-84.0.2+build1/js/src/vm/AsyncIteration.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/AsyncIteration.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -385,9 +385,9 @@
   // 25.5.3.5, steps 12-14, 16-20.
   HandlePropertyName funName = completionKind == CompletionKind::Normal
                                    ? cx->names().AsyncGeneratorNext
-                                   : completionKind == CompletionKind::Throw
-                                         ? cx->names().AsyncGeneratorThrow
-                                         : cx->names().AsyncGeneratorReturn;
+                               : completionKind == CompletionKind::Throw
+                                   ? cx->names().AsyncGeneratorThrow
+                                   : cx->names().AsyncGeneratorReturn;
   FixedInvokeArgs<1> args(cx);
   args[0].set(argument);
   RootedValue thisOrRval(cx, ObjectValue(*asyncGenObj));
@@ -506,12 +506,12 @@
   // 25.3.1 The AsyncGeneratorFunction Constructor
   return NewFunctionWithProto(cx, AsyncGeneratorConstructor, 1,
                               FunctionFlags::NATIVE_CTOR, nullptr, name, proto,
-                              gc::AllocKind::FUNCTION, SingletonObject);
+                              gc::AllocKind::FUNCTION, TenuredObject);
 }
 
 static JSObject* CreateAsyncGeneratorFunctionPrototype(JSContext* cx,
                                                        JSProtoKey key) {
-  return NewSingletonObjectWithFunctionPrototype(cx, cx->global());
+  return NewTenuredObjectWithFunctionPrototype(cx, cx->global());
 }
 
 static bool AsyncGeneratorFunctionClassFinish(JSContext* cx,
diff -Nru firefox-84.0.2+build1/js/src/vm/BigIntType.cpp firefox-85.0+build1/js/src/vm/BigIntType.cpp
--- firefox-84.0.2+build1/js/src/vm/BigIntType.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BigIntType.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -325,7 +325,7 @@
           : "=a"(quotient), "=d"(rem)
           // Inputs: put `high` into rdx, `low` into rax, and `divisor` into
           // any register or stack slot.
-          : "d"(high), "a"(low), [ divisor ] "rm"(divisor));
+          : "d"(high), "a"(low), [divisor] "rm"(divisor));
   *remainder = rem;
   return quotient;
 #elif defined(__i386__)
@@ -336,7 +336,7 @@
           : "=a"(quotient), "=d"(rem)
           // Inputs: put `high` into edx, `low` into eax, and `divisor` into
           // any register or stack slot.
-          : "d"(high), "a"(low), [ divisor ] "rm"(divisor));
+          : "d"(high), "a"(low), [divisor] "rm"(divisor));
   *remainder = rem;
   return quotient;
 #else
@@ -1007,8 +1007,9 @@
   }
 
   if (kind != BitwiseOpKind::SymmetricTrim) {
-    BigInt* source =
-        kind == BitwiseOpKind::AsymmetricFill ? x : xLength == i ? y : x;
+    BigInt* source = kind == BitwiseOpKind::AsymmetricFill ? x
+                     : xLength == i                        ? y
+                                                           : x;
     for (; i < resultLength; i++) {
       result->setDigit(i, source->digit(i));
     }
diff -Nru firefox-84.0.2+build1/js/src/vm/BindingKind.h firefox-85.0+build1/js/src/vm/BindingKind.h
--- firefox-84.0.2+build1/js/src/vm/BindingKind.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BindingKind.h	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,102 @@
+/* -*- 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 vm_BindingKind_h
+#define vm_BindingKind_h
+
+#include "mozilla/Assertions.h"  // MOZ_ASSERT, MOZ_ASSERT_IF
+#include "mozilla/Casting.h"     // mozilla::AssertedCast
+
+#include <stdint.h>  // uint16_t, uint32_t
+
+#include "vm/BytecodeUtil.h"  // LOCALNO_LIMIT, ENVCOORD_SLOT_LIMIT
+
+namespace js {
+
+enum class BindingKind : uint8_t {
+  Import,
+  FormalParameter,
+  Var,
+  Let,
+  Const,
+
+  // So you think named lambda callee names are consts? Nope! They don't
+  // throw when being assigned to in sloppy mode.
+  NamedLambdaCallee
+};
+
+static inline bool BindingKindIsLexical(BindingKind kind) {
+  return kind == BindingKind::Let || kind == BindingKind::Const;
+}
+
+class BindingLocation {
+ public:
+  enum class Kind {
+    Global,
+    Argument,
+    Frame,
+    Environment,
+    Import,
+    NamedLambdaCallee
+  };
+
+ private:
+  Kind kind_;
+  uint32_t slot_;
+
+  BindingLocation(Kind kind, uint32_t slot) : kind_(kind), slot_(slot) {}
+
+ public:
+  static BindingLocation Global() {
+    return BindingLocation(Kind::Global, UINT32_MAX);
+  }
+
+  static BindingLocation Argument(uint16_t slot) {
+    return BindingLocation(Kind::Argument, slot);
+  }
+
+  static BindingLocation Frame(uint32_t slot) {
+    MOZ_ASSERT(slot < LOCALNO_LIMIT);
+    return BindingLocation(Kind::Frame, slot);
+  }
+
+  static BindingLocation Environment(uint32_t slot) {
+    MOZ_ASSERT(slot < ENVCOORD_SLOT_LIMIT);
+    return BindingLocation(Kind::Environment, slot);
+  }
+
+  static BindingLocation Import() {
+    return BindingLocation(Kind::Import, UINT32_MAX);
+  }
+
+  static BindingLocation NamedLambdaCallee() {
+    return BindingLocation(Kind::NamedLambdaCallee, UINT32_MAX);
+  }
+
+  bool operator==(const BindingLocation& other) const {
+    return kind_ == other.kind_ && slot_ == other.slot_;
+  }
+
+  bool operator!=(const BindingLocation& other) const {
+    return !operator==(other);
+  }
+
+  Kind kind() const { return kind_; }
+
+  uint32_t slot() const {
+    MOZ_ASSERT(kind_ == Kind::Frame || kind_ == Kind::Environment);
+    return slot_;
+  }
+
+  uint16_t argumentSlot() const {
+    MOZ_ASSERT(kind_ == Kind::Argument);
+    return mozilla::AssertedCast<uint16_t>(slot_);
+  }
+};
+
+}  // namespace js
+
+#endif  // vm_BindingKind_h
diff -Nru firefox-84.0.2+build1/js/src/vm/BytecodeFormatFlags.h firefox-85.0+build1/js/src/vm/BytecodeFormatFlags.h
--- firefox-84.0.2+build1/js/src/vm/BytecodeFormatFlags.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BytecodeFormatFlags.h	2021-01-18 19:58:16.000000000 +0000
@@ -25,34 +25,33 @@
   JOF_QARG = 11,        /* function argument index */
   JOF_LOCAL = 12,       /* var or block-local variable */
   JOF_RESUMEINDEX = 13, /* yield, await, or gosub resume index */
-  JOF_ATOM = 14,        /* uint32_t constant index */
-  JOF_OBJECT = 15,      /* uint32_t object index */
-  JOF_REGEXP = 16,      /* uint32_t regexp index */
-  JOF_DOUBLE = 17,      /* inline DoubleValue */
-  JOF_SCOPE = 18,       /* uint32_t scope index */
-  JOF_ICINDEX = 19,     /* uint32_t IC index */
-  JOF_LOOPHEAD = 20,    /* JSOp::LoopHead, combines JOF_ICINDEX and JOF_UINT8 */
-  JOF_BIGINT = 21,      /* uint32_t index for BigInt value */
-  JOF_CLASS_CTOR = 22,  /* uint32_t atom index, sourceStart, sourceEnd */
-  JOF_TWO_UINT8 = 23,   /* A pair of unspecified uint8_t arguments */
-  JOF_TYPEMASK = 0x001f, /* mask for above immediate types */
+  JOF_DOUBLE = 14,      /* inline DoubleValue */
+  JOF_GCTHING = 15,     /* uint32_t generic gc-thing index */
+  JOF_ATOM = 16,        /* uint32_t constant index */
+  JOF_OBJECT = 17,      /* uint32_t object index */
+  JOF_REGEXP = 18,      /* uint32_t regexp index */
+  JOF_SCOPE = 19,       /* uint32_t scope index */
+  JOF_BIGINT = 20,      /* uint32_t index for BigInt value */
+  JOF_ICINDEX = 21,     /* uint32_t IC index */
+  JOF_LOOPHEAD = 22,    /* JSOp::LoopHead, combines JOF_ICINDEX and JOF_UINT8 */
+  JOF_CLASS_CTOR = 23,  /* uint32_t atom index, sourceStart, sourceEnd */
+  JOF_TWO_UINT8 = 24,   /* A pair of unspecified uint8_t arguments */
+  JOF_TYPEMASK = 0xFF,  /* mask for above immediate types */
 
-  JOF_NAME = 1 << 5,     /* name operation */
-  JOF_PROP = 2 << 5,     /* obj.prop operation */
-  JOF_ELEM = 3 << 5,     /* obj[index] operation */
-  JOF_MODEMASK = 3 << 5, /* mask for above addressing modes */
+  JOF_NAME = 1 << 8,        /* name operation */
+  JOF_PROP = 2 << 8,        /* obj.prop operation */
+  JOF_ELEM = 3 << 8,        /* obj[index] operation */
+  JOF_MODEMASK = 0xFF << 8, /* mask for above addressing modes */
 
-  JOF_PROPSET = 1 << 7,  /* property/element/name set operation */
-  JOF_PROPINIT = 1 << 8, /* property/element/name init operation */
-  // (1 << 9) is unused.
-  JOF_CHECKSLOPPY = 1 << 10, /* op can only be generated in sloppy mode */
-  JOF_CHECKSTRICT = 1 << 11, /* op can only be generated in strict mode */
-  JOF_INVOKE = 1 << 12,      /* any call, construct, or eval instruction */
-  JOF_CONSTRUCT = 1 << 13,   /* invoke instruction using [[Construct]] entry */
-  JOF_SPREAD = 1 << 14,      /* invoke instruction using spread argument */
-  JOF_GNAME = 1 << 15,       /* predicted global name */
-  JOF_TYPESET = 1 << 16,     /* has an entry in a script's type sets */
-  JOF_IC = 1 << 17,          /* baseline may use an IC for this op */
+  JOF_PROPSET = 1 << 16,     /* property/element/name set operation */
+  JOF_PROPINIT = 1 << 17,    /* property/element/name init operation */
+  JOF_CHECKSLOPPY = 1 << 18, /* op can only be generated in sloppy mode */
+  JOF_CHECKSTRICT = 1 << 19, /* op can only be generated in strict mode */
+  JOF_INVOKE = 1 << 20,      /* any call, construct, or eval instruction */
+  JOF_CONSTRUCT = 1 << 21,   /* invoke instruction using [[Construct]] entry */
+  JOF_SPREAD = 1 << 22,      /* invoke instruction using spread argument */
+  JOF_GNAME = 1 << 23,       /* predicted global name */
+  JOF_IC = 1 << 24,          /* baseline may use an IC for this op */
 };
 
 #endif /* vm_BytecodeFormatFlags_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/BytecodeLocation.h firefox-85.0+build1/js/src/vm/BytecodeLocation.h
--- firefox-84.0.2+build1/js/src/vm/BytecodeLocation.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BytecodeLocation.h	2021-01-18 19:58:16.000000000 +0000
@@ -181,7 +181,6 @@
   }
 
   bool opHasIC() const { return BytecodeOpHasIC(getOp()); }
-  bool opHasTypeSet() const { return BytecodeOpHasTypeSet(getOp()); }
 
   bool fallsThrough() const { return BytecodeFallsThrough(getOp()); }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/BytecodeLocation-inl.h firefox-85.0+build1/js/src/vm/BytecodeLocation-inl.h
--- firefox-84.0.2+build1/js/src/vm/BytecodeLocation-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BytecodeLocation-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -41,8 +41,7 @@
 
 inline JSObject* BytecodeLocation::getObject(const JSScript* script) const {
   MOZ_ASSERT(this->isValid());
-  MOZ_ASSERT(is(JSOp::CallSiteObj) || is(JSOp::Object) ||
-             is(JSOp::NewArrayCopyOnWrite));
+  MOZ_ASSERT(is(JSOp::CallSiteObj) || is(JSOp::Object));
   return script->getObject(this->rawBytecode_);
 }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/BytecodeUtil.cpp firefox-85.0+build1/js/src/vm/BytecodeUtil.cpp
--- firefox-84.0.2+build1/js/src/vm/BytecodeUtil.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BytecodeUtil.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -38,6 +38,7 @@
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/Printf.h"
 #include "js/Symbol.h"
+#include "util/DifferentialTesting.h"
 #include "util/Memory.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
@@ -690,7 +691,6 @@
     case JSOp::SetIntrinsic:
     case JSOp::SetLocal:
     case JSOp::InitAliasedLexical:
-    case JSOp::IterNext:
     case JSOp::CheckLexical:
     case JSOp::CheckAliasedLexical:
       // Keep the top value.
@@ -1174,7 +1174,8 @@
     }
 
     if (obj.is<RegExpObject>()) {
-      JSString* source = obj.as<RegExpObject>().toString(cx);
+      Rooted<RegExpObject*> reobj(cx, &obj.as<RegExpObject>());
+      JSString* source = RegExpObject::toString(cx, reobj);
       if (!source) {
         return nullptr;
       }
@@ -1488,14 +1489,6 @@
     }
 
     case JOF_OBJECT: {
-      /* Don't call obj.toSource if analysis/inference is active. */
-      if (script->zone()->types.activeAnalysis) {
-        if (!sp->jsprintf(" object")) {
-          return 0;
-        }
-        break;
-      }
-
       JSObject* obj = script->getObject(pc);
       {
         RootedValue v(cx, ObjectValue(*obj));
@@ -1564,6 +1557,12 @@
       }
       break;
 
+    case JOF_GCTHING:
+      if (!sp->jsprintf(" %u", unsigned(GET_GCTHING_INDEX(pc)))) {
+        return 0;
+      }
+      break;
+
     case JOF_UINT32:
       if (!sp->jsprintf(" %u", GET_UINT32(pc))) {
         return 0;
@@ -1826,13 +1825,10 @@
 
     case JSOp::DelProp:
     case JSOp::StrictDelProp:
-    case JSOp::Length:
     case JSOp::GetProp:
-    case JSOp::GetBoundName:
-    case JSOp::CallProp: {
+    case JSOp::GetBoundName: {
       bool hasDelete = op == JSOp::DelProp || op == JSOp::StrictDelProp;
-      RootedAtom prop(cx,
-                      (op == JSOp::Length) ? cx->names().length : loadAtom(pc));
+      RootedAtom prop(cx, loadAtom(pc));
       MOZ_ASSERT(prop);
       return (hasDelete ? write("(delete ") : true) &&
              decompilePCForStackOperand(pc, -1) &&
@@ -1856,8 +1852,7 @@
 
     case JSOp::DelElem:
     case JSOp::StrictDelElem:
-    case JSOp::GetElem:
-    case JSOp::CallElem: {
+    case JSOp::GetElem: {
       bool hasDelete = (op == JSOp::DelElem || op == JSOp::StrictDelElem);
       return (hasDelete ? write("(delete ") : true) &&
              decompilePCForStackOperand(pc, -2) && write("[") &&
@@ -1913,34 +1908,13 @@
     case JSOp::NewArray:
       return write("[]");
     case JSOp::RegExp: {
-      RootedObject obj(cx, script->getObject(pc));
-      JSString* str = obj->as<RegExpObject>().toString(cx);
+      Rooted<RegExpObject*> obj(cx, &script->getObject(pc)->as<RegExpObject>());
+      JSString* str = RegExpObject::toString(cx, obj);
       if (!str) {
         return false;
       }
       return write(str);
     }
-    case JSOp::NewArrayCopyOnWrite: {
-      RootedObject obj(cx, script->getObject(pc));
-      Handle<ArrayObject*> aobj = obj.as<ArrayObject>();
-      if (!write("[")) {
-        return false;
-      }
-      for (size_t i = 0; i < aobj->getDenseInitializedLength(); i++) {
-        if (i > 0 && !write(", ")) {
-          return false;
-        }
-
-        RootedValue v(cx, aobj->getDenseElement(i));
-        MOZ_RELEASE_ASSERT(v.isPrimitive() && !v.isMagic());
-
-        JSString* str = ValueToSource(cx, v);
-        if (!str || !write(str)) {
-          return false;
-        }
-      }
-      return write("]");
-    }
     case JSOp::Object: {
       JSObject* obj = script->getObject(pc);
       RootedValue objv(cx, ObjectValue(*obj));
@@ -2123,7 +2097,6 @@
 
       case JSOp::NewInit:
       case JSOp::NewObject:
-      case JSOp::NewObjectWithGroup:
       case JSOp::ObjWithProto:
         return write("OBJ");
 
@@ -2365,14 +2338,14 @@
 
   *res = nullptr;
 
-#ifdef JS_MORE_DETERMINISTIC
   /*
    * Give up if we need deterministic behavior for differential testing.
    * IonMonkey doesn't use InterpreterFrames and this ensures we get the same
    * error messages.
    */
-  return true;
-#endif
+  if (js::SupportDifferentialTesting()) {
+    return true;
+  }
 
   if (spindex == JSDVG_IGNORE_STACK) {
     return true;
@@ -2463,10 +2436,10 @@
 
   *res = nullptr;
 
-#ifdef JS_MORE_DETERMINISTIC
   /* See note in DecompileExpressionFromStack. */
-  return true;
-#endif
+  if (js::SupportDifferentialTesting()) {
+    return true;
+  }
 
   /*
    * Settle on the nearest script frame, which should be the builtin that
diff -Nru firefox-84.0.2+build1/js/src/vm/BytecodeUtil.h firefox-85.0+build1/js/src/vm/BytecodeUtil.h
--- firefox-84.0.2+build1/js/src/vm/BytecodeUtil.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/BytecodeUtil.h	2021-01-18 19:58:16.000000000 +0000
@@ -536,9 +536,7 @@
 
 inline bool IsAtomOp(JSOp op) { return JOF_OPTYPE(op) == JOF_ATOM; }
 
-inline bool IsGetPropOp(JSOp op) {
-  return op == JSOp::Length || op == JSOp::GetProp || op == JSOp::CallProp;
-}
+inline bool IsGetPropOp(JSOp op) { return op == JSOp::GetProp; }
 
 inline bool IsGetPropPC(const jsbytecode* pc) { return IsGetPropOp(JSOp(*pc)); }
 
@@ -563,9 +561,7 @@
 
 inline bool IsSetPropPC(const jsbytecode* pc) { return IsSetPropOp(JSOp(*pc)); }
 
-inline bool IsGetElemOp(JSOp op) {
-  return op == JSOp::GetElem || op == JSOp::CallElem;
-}
+inline bool IsGetElemOp(JSOp op) { return op == JSOp::GetElem; }
 
 inline bool IsGetElemPC(const jsbytecode* pc) { return IsGetElemOp(JSOp(*pc)); }
 
@@ -620,10 +616,6 @@
 
 inline bool BytecodeOpHasIC(JSOp op) { return CodeSpec(op).format & JOF_IC; }
 
-inline bool BytecodeOpHasTypeSet(JSOp op) {
-  return CodeSpec(op).format & JOF_TYPESET;
-}
-
 inline void GetCheckPrivateFieldOperands(jsbytecode* pc,
                                          ThrowCondition* throwCondition,
                                          ThrowMsgKind* throwKind) {
diff -Nru firefox-84.0.2+build1/js/src/vm/Caches-inl.h firefox-85.0+build1/js/src/vm/Caches-inl.h
--- firefox-84.0.2+build1/js/src/vm/Caches-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Caches-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -48,10 +48,7 @@
   NativeObject* templateObj =
       reinterpret_cast<NativeObject*>(&entry->templateObject);
 
-  // Do an end run around JSObject::group() to avoid doing AutoUnprotectCell
-  // on the templateObj, which is not a GC thing and can't use
-  // runtimeFromAnyThread.
-  ObjectGroup* group = templateObj->groupRaw();
+  ObjectGroup* group = templateObj->group();
 
   // If we did the lookup based on the proto we might have a group/object from a
   // different (same-compartment) realm, so we have to do a realm check.
@@ -59,15 +56,6 @@
     return nullptr;
   }
 
-  MOZ_ASSERT(!group->hasUnanalyzedPreliminaryObjects());
-
-  {
-    AutoSweepObjectGroup sweepGroup(group);
-    if (group->shouldPreTenure(sweepGroup)) {
-      heap = gc::TenuredHeap;
-    }
-  }
-
   if (cx->runtime()->gc.upcomingZealousGC()) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/Compartment.h firefox-85.0+build1/js/src/vm/Compartment.h
--- firefox-84.0.2+build1/js/src/vm/Compartment.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Compartment.h	2021-01-18 19:58:16.000000000 +0000
@@ -10,8 +10,6 @@
 #include "mozilla/LinkedList.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Tuple.h"
-#include "mozilla/Variant.h"
 
 #include <stddef.h>
 #include <utility>
diff -Nru firefox-84.0.2+build1/js/src/vm/CompilationAndEvaluation.cpp firefox-85.0+build1/js/src/vm/CompilationAndEvaluation.cpp
--- firefox-84.0.2+build1/js/src/vm/CompilationAndEvaluation.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/CompilationAndEvaluation.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -207,7 +207,7 @@
 
   LifoAllocScope allocScope(&cx->tempLifoAlloc());
   frontend::CompilationState compilationState(cx, allocScope, options,
-                                              compilationInfo.get().stencil);
+                                              compilationInfo.get());
 
   JS::AutoSuppressWarningReporter suppressWarnings(cx);
   Parser<FullParseHandler, char16_t> parser(cx, options, chars.get(), length,
diff -Nru firefox-84.0.2+build1/js/src/vm/DateTime.cpp firefox-85.0+build1/js/src/vm/DateTime.cpp
--- firefox-84.0.2+build1/js/src/vm/DateTime.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/DateTime.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -22,6 +22,7 @@
 #endif /* !defined(XP_WIN) */
 
 #include "js/Date.h"
+#include "js/GCAPI.h"
 #include "threading/ExclusiveData.h"
 
 #if JS_HAS_INTL_API && !MOZ_SYSTEM_ICU
diff -Nru firefox-84.0.2+build1/js/src/vm/EnvironmentObject.cpp firefox-85.0+build1/js/src/vm/EnvironmentObject.cpp
--- firefox-84.0.2+build1/js/src/vm/EnvironmentObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/EnvironmentObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -13,6 +13,8 @@
 #include "js/friend/WindowProxy.h"    // js::IsWindow, js::IsWindowProxy
 #include "vm/ArgumentsObject.h"
 #include "vm/AsyncFunction.h"
+#include "vm/BytecodeIterator.h"
+#include "vm/BytecodeLocation.h"
 #include "vm/GlobalObject.h"
 #include "vm/Iteration.h"
 #include "vm/JSObject.h"
@@ -22,23 +24,11 @@
 #include "vm/Xdr.h"
 #include "wasm/WasmInstance.h"
 
-#ifdef DEBUG
-#  include "vm/BytecodeIterator.h"
-#  include "vm/BytecodeLocation.h"
-#endif
-
 #include "gc/Marking-inl.h"
-#include "vm/JSAtom-inl.h"
-#include "vm/JSScript-inl.h"
+#include "vm/BytecodeIterator-inl.h"
+#include "vm/BytecodeLocation-inl.h"
 #include "vm/NativeObject-inl.h"
-#include "vm/ObjectGroup-inl.h"  // JSObject::setSingleton
 #include "vm/Stack-inl.h"
-#include "vm/TypeInference-inl.h"
-
-#ifdef DEBUG
-#  include "vm/BytecodeIterator-inl.h"
-#  include "vm/BytecodeLocation-inl.h"
-#endif
 
 using namespace js;
 
@@ -87,8 +77,8 @@
 
 template <typename T>
 static T* CreateEnvironmentObject(JSContext* cx, HandleShape shape,
-                                  HandleObjectGroup group, gc::InitialHeap heap,
-                                  IsSingletonEnv isSingleton) {
+                                  HandleObjectGroup group,
+                                  gc::InitialHeap heap) {
   static_assert(std::is_base_of_v<EnvironmentObject, T>,
                 "T must be an EnvironmentObject");
 
@@ -101,33 +91,20 @@
   JS_TRY_VAR_OR_RETURN_NULL(
       cx, obj, NativeObject::create(cx, allocKind, heap, shape, group));
 
-  if (isSingleton == IsSingletonEnv::Yes) {
-    RootedObject objRoot(cx, obj);
-    if (!JSObject::setSingleton(cx, objRoot)) {
-      return nullptr;
-    }
-    obj = objRoot;
-  } else {
-    // Don't track property types for non-singleton environment objects. The
-    // JITs don't use them anyway.
-    MarkObjectGroupUnknownProperties(cx, group);
-  }
-
   return &obj->as<T>();
 }
 
 // As above, but the caller does not have to pass the group.
 template <typename T>
 static T* CreateEnvironmentObject(JSContext* cx, HandleShape shape,
-                                  gc::InitialHeap heap,
-                                  IsSingletonEnv isSingleton) {
+                                  gc::InitialHeap heap) {
   RootedObjectGroup group(
       cx, ObjectGroup::defaultNewGroup(cx, &T::class_, TaggedProto(nullptr)));
   if (!group) {
     return nullptr;
   }
 
-  return CreateEnvironmentObject<T>(cx, shape, group, heap, isSingleton);
+  return CreateEnvironmentObject<T>(cx, shape, group, heap);
 }
 
 // Helper function for simple environment objects that don't need the overloads
@@ -142,7 +119,7 @@
   }
 
   gc::InitialHeap heap = GetInitialHeap(newKind, group);
-  return CreateEnvironmentObject<T>(cx, shape, group, heap, IsSingletonEnv::No);
+  return CreateEnvironmentObject<T>(cx, shape, group, heap);
 }
 
 CallObject* CallObject::create(JSContext* cx, HandleShape shape,
@@ -150,8 +127,7 @@
   MOZ_ASSERT(!group->singleton());
 
   gc::InitialHeap heap = GetInitialHeap(GenericObject, group);
-  return CreateEnvironmentObject<CallObject>(cx, shape, group, heap,
-                                             IsSingletonEnv::No);
+  return CreateEnvironmentObject<CallObject>(cx, shape, group, heap);
 }
 
 /*
@@ -169,8 +145,7 @@
   // The JITs assume the result is nursery allocated unless we collected the
   // nursery, so don't change |heap| here.
 
-  auto* callObj =
-      CreateEnvironmentObject<CallObject>(cx, shape, heap, IsSingletonEnv::No);
+  auto* callObj = CreateEnvironmentObject<CallObject>(cx, shape, heap);
   if (!callObj) {
     return nullptr;
   }
@@ -927,14 +902,14 @@
 /* static */
 LexicalEnvironmentObject* LexicalEnvironmentObject::createTemplateObject(
     JSContext* cx, HandleShape shape, HandleObject enclosing,
-    gc::InitialHeap heap, IsSingletonEnv isSingleton) {
+    gc::InitialHeap heap) {
   MOZ_ASSERT(shape->getObjectClass() == &LexicalEnvironmentObject::class_);
 
   // The JITs assume the result is nursery allocated unless we collected the
   // nursery, so don't change |heap| here.
 
-  auto* env = CreateEnvironmentObject<LexicalEnvironmentObject>(cx, shape, heap,
-                                                                isSingleton);
+  auto* env =
+      CreateEnvironmentObject<LexicalEnvironmentObject>(cx, shape, heap);
   if (!env) {
     return nullptr;
   }
@@ -957,7 +932,7 @@
 
   RootedShape shape(cx, scope->environmentShape());
   LexicalEnvironmentObject* env =
-      createTemplateObject(cx, shape, enclosing, heap, IsSingletonEnv::No);
+      createTemplateObject(cx, shape, enclosing, heap);
   if (!env) {
     return nullptr;
   }
@@ -991,8 +966,8 @@
   }
 
   LexicalEnvironmentObject* env =
-      LexicalEnvironmentObject::createTemplateObject(
-          cx, shape, global, gc::TenuredHeap, IsSingletonEnv::Yes);
+      LexicalEnvironmentObject::createTemplateObject(cx, shape, global,
+                                                     gc::TenuredHeap);
   if (!env) {
     return nullptr;
   }
@@ -1013,8 +988,8 @@
   }
 
   LexicalEnvironmentObject* env =
-      LexicalEnvironmentObject::createTemplateObject(
-          cx, shape, enclosing, gc::TenuredHeap, IsSingletonEnv::No);
+      LexicalEnvironmentObject::createTemplateObject(cx, shape, enclosing,
+                                                     gc::TenuredHeap);
   if (!env) {
     return nullptr;
   }
@@ -1040,8 +1015,7 @@
   // Debugger.Environment objects.
   RootedObject enclosingEnv(cx, &cx->global()->lexicalEnvironment());
   Rooted<LexicalEnvironmentObject*> env(
-      cx, createTemplateObject(cx, shape, enclosingEnv, gc::TenuredHeap,
-                               IsSingletonEnv::No));
+      cx, createTemplateObject(cx, shape, enclosingEnv, gc::TenuredHeap));
   if (!env) {
     return nullptr;
   }
@@ -1587,10 +1561,6 @@
             return true;
           }
         }
-
-        if (action == SET) {
-          jit::JitScript::MonitorArgType(cx, script, i, vp);
-        }
       }
 
       // It is possible that an optimized out value flows to this
@@ -3368,11 +3338,10 @@
       // Figure out if we executed JSOp::FunctionThis and set it.
       bool executedInitThisOp = false;
       if (script->functionHasThisBinding()) {
-        for (jsbytecode* it = script->code(); it < script->codeEnd();
-             it = GetNextPc(it)) {
-          if (JSOp(*it) == JSOp::FunctionThis) {
+        for (const BytecodeLocation& loc : js::AllBytecodesIterable(script)) {
+          if (loc.getOp() == JSOp::FunctionThis) {
             // The next op after JSOp::FunctionThis always sets it.
-            executedInitThisOp = pc > GetNextPc(it);
+            executedInitThisOp = pc > GetNextPc(loc.toRawBytecode());
             break;
           }
         }
@@ -3570,6 +3539,168 @@
   return true;
 }
 
+// Add the var/let/const bindings to the variables environment of a global or
+// sloppy-eval script. The redeclaration checks should already have been
+// performed.
+static bool InitGlobalOrEvalDeclarations(
+    JSContext* cx, HandleScript script,
+    Handle<LexicalEnvironmentObject*> lexicalEnv, HandleObject varObj) {
+  Rooted<BindingIter> bi(cx, BindingIter(script));
+  for (; bi; bi++) {
+    if (bi.isTopLevelFunction()) {
+      continue;
+    }
+
+    RootedPropertyName name(cx, bi.name()->asPropertyName());
+    unsigned attrs = script->isForEval() ? JSPROP_ENUMERATE
+                                         : JSPROP_ENUMERATE | JSPROP_PERMANENT;
+
+    switch (bi.kind()) {
+      case BindingKind::Var: {
+        Rooted<PropertyResult> prop(cx);
+        RootedObject obj2(cx);
+        if (!LookupProperty(cx, varObj, name, &obj2, &prop)) {
+          return false;
+        }
+
+        if (!prop || (obj2 != varObj && varObj->is<GlobalObject>())) {
+          if (!DefineDataProperty(cx, varObj, name, UndefinedHandleValue,
+                                  attrs)) {
+            return false;
+          }
+        }
+
+        if (varObj->is<GlobalObject>()) {
+          if (!varObj->as<GlobalObject>().realm()->addToVarNames(cx, name)) {
+            return false;
+          }
+        }
+
+        break;
+      }
+
+      case BindingKind::Const:
+        attrs |= JSPROP_READONLY;
+        [[fallthrough]];
+
+      case BindingKind::Let: {
+        RootedId id(cx, NameToId(name));
+        RootedValue uninitialized(cx, MagicValue(JS_UNINITIALIZED_LEXICAL));
+        if (!NativeDefineDataProperty(cx, lexicalEnv, id, uninitialized,
+                                      attrs)) {
+          return false;
+        }
+
+        break;
+      }
+
+      default:
+        MOZ_CRASH("Expected binding kind");
+        return false;
+    }
+  }
+
+  return true;
+}
+
+// Define the hoisted top-level functions on the variables environment of a
+// global or sloppy-eval script. Redeclaration checks must already have been
+// performed.
+static bool InitHoistedFunctionDeclarations(JSContext* cx, HandleScript script,
+                                            HandleObject envChain,
+                                            HandleObject varObj,
+                                            GCThingIndex lastFun) {
+  // The inner-functions up to `lastFun` are the hoisted function declarations
+  // of the script. We must clone and bind them now.
+  for (size_t i = 0; i <= lastFun; ++i) {
+    const JS::GCCellPtr& thing = script->gcthings()[i];
+
+    // Skip the initial scopes. In practice, there is at most one variables and
+    // one lexical scope.
+    if (thing.is<js::Scope>()) {
+      MOZ_ASSERT(i < 2);
+      continue;
+    }
+
+    RootedFunction fun(cx, &thing.as<JSObject>().as<JSFunction>());
+    RootedPropertyName name(cx, fun->explicitName()->asPropertyName());
+
+    // Clone the function before exposing to script as a binding.
+    JSObject* clone = Lambda(cx, fun, envChain);
+    if (!clone) {
+      return false;
+    }
+    RootedValue rval(cx, ObjectValue(*clone));
+
+    Rooted<PropertyResult> prop(cx);
+    RootedObject pobj(cx);
+    if (!LookupProperty(cx, varObj, name, &pobj, &prop)) {
+      return false;
+    }
+
+    // ECMA requires functions defined when entering Eval code to be
+    // impermanent.
+    unsigned attrs = script->isForEval() ? JSPROP_ENUMERATE
+                                         : JSPROP_ENUMERATE | JSPROP_PERMANENT;
+
+    if (!prop || pobj != varObj) {
+      if (!DefineDataProperty(cx, varObj, name, rval, attrs)) {
+        return false;
+      }
+
+      if (varObj->is<GlobalObject>()) {
+        if (!varObj->as<GlobalObject>().realm()->addToVarNames(cx, name)) {
+          return false;
+        }
+      }
+
+      // Done processing this function.
+      continue;
+    }
+
+    /*
+     * A DebugEnvironmentProxy is okay here, and sometimes necessary. If
+     * Debugger.Frame.prototype.eval defines a function with the same name as an
+     * extant variable in the frame, the DebugEnvironmentProxy takes care of
+     * storing the function in the stack frame (for non-aliased variables) or on
+     * the scope object (for aliased).
+     */
+    MOZ_ASSERT(varObj->isNative() || varObj->is<DebugEnvironmentProxy>());
+    if (varObj->is<GlobalObject>()) {
+      Shape* shape = prop.shape();
+      if (shape->configurable()) {
+        if (!DefineDataProperty(cx, varObj, name, rval, attrs)) {
+          return false;
+        }
+      } else {
+        MOZ_ASSERT(shape->isDataDescriptor());
+        MOZ_ASSERT(shape->writable());
+        MOZ_ASSERT(shape->enumerable());
+      }
+
+      // Careful: the presence of a shape, even one appearing to derive from
+      // a variable declaration, doesn't mean it's in [[VarNames]].
+      if (!varObj->as<GlobalObject>().realm()->addToVarNames(cx, name)) {
+        return false;
+      }
+    }
+
+    /*
+     * Non-global properties, and global properties which we aren't simply
+     * redefining, must be set.  First, this preserves their attributes.
+     * Second, this will produce warnings and/or errors as necessary if the
+     * specified Call object property is not writable (const).
+     */
+
+    RootedId id(cx, NameToId(name));
+    if (!PutProperty(cx, varObj, id, rval, script->strict())) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 bool js::CheckGlobalDeclarationConflicts(
     JSContext* cx, HandleScript script,
     Handle<LexicalEnvironmentObject*> lexicalEnv, HandleObject varObj) {
@@ -3738,26 +3869,30 @@
   return true;
 }
 
-bool js::CheckGlobalOrEvalDeclarationConflicts(JSContext* cx,
-                                               HandleObject envChain,
-                                               HandleScript script) {
+bool js::GlobalOrEvalDeclInstantiation(JSContext* cx, HandleObject envChain,
+                                       HandleScript script,
+                                       GCThingIndex lastFun) {
   MOZ_ASSERT(script->isGlobalCode() || script->isForEval());
 
   RootedObject varObj(cx, &GetVariablesObject(envChain));
+  Rooted<LexicalEnvironmentObject*> lexicalEnv(cx);
 
   if (script->isForEval()) {
     if (!CheckEvalDeclarationConflicts(cx, script, envChain, varObj)) {
       return false;
     }
   } else {
-    Rooted<LexicalEnvironmentObject*> lexicalEnv(
-        cx, &NearestEnclosingExtensibleLexicalEnvironment(envChain));
+    lexicalEnv = &NearestEnclosingExtensibleLexicalEnvironment(envChain);
     if (!CheckGlobalDeclarationConflicts(cx, script, lexicalEnv, varObj)) {
       return false;
     }
   }
 
-  return true;
+  if (!InitGlobalOrEvalDeclarations(cx, script, lexicalEnv, varObj)) {
+    return false;
+  }
+
+  return InitHoistedFunctionDeclarations(cx, script, envChain, varObj, lastFun);
 }
 
 bool js::InitFunctionEnvironmentObjects(JSContext* cx, AbstractFramePtr frame) {
diff -Nru firefox-84.0.2+build1/js/src/vm/EnvironmentObject.h firefox-85.0+build1/js/src/vm/EnvironmentObject.h
--- firefox-84.0.2+build1/js/src/vm/EnvironmentObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/EnvironmentObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -256,8 +256,6 @@
  */
 // clang-format on
 
-enum class IsSingletonEnv { Yes, No };
-
 class EnvironmentObject : public NativeObject {
  protected:
   // The enclosing environment. Either another EnvironmentObject, a
@@ -358,8 +356,7 @@
   const Value& aliasedFormalFromArguments(const Value& argsValue) {
     return getSlot(ArgumentsObject::SlotFromMagicScopeSlotValue(argsValue));
   }
-  inline void setAliasedFormalFromArguments(JSContext* cx,
-                                            const Value& argsValue, jsid id,
+  inline void setAliasedFormalFromArguments(const Value& argsValue,
                                             const Value& v);
 
   JSFunction& callee() const {
@@ -520,9 +517,10 @@
   static constexpr uint32_t BASESHAPE_FLAGS = BaseShape::NOT_EXTENSIBLE;
 
  private:
-  static LexicalEnvironmentObject* createTemplateObject(
-      JSContext* cx, HandleShape shape, HandleObject enclosing,
-      gc::InitialHeap heap, IsSingletonEnv isSingleton);
+  static LexicalEnvironmentObject* createTemplateObject(JSContext* cx,
+                                                        HandleShape shape,
+                                                        HandleObject enclosing,
+                                                        gc::InitialHeap heap);
 
   void initThisObject(JSObject* obj) {
     MOZ_ASSERT(isGlobal() || !isSyntactic());
@@ -1212,9 +1210,10 @@
     JSContext* cx, HandleScript script,
     Handle<LexicalEnvironmentObject*> lexicalEnv, HandleObject varObj);
 
-MOZ_MUST_USE bool CheckGlobalOrEvalDeclarationConflicts(JSContext* cx,
-                                                        HandleObject envChain,
-                                                        HandleScript script);
+MOZ_MUST_USE bool GlobalOrEvalDeclInstantiation(JSContext* cx,
+                                                HandleObject envChain,
+                                                HandleScript script,
+                                                GCThingIndex lastFun);
 
 MOZ_MUST_USE bool InitFunctionEnvironmentObjects(JSContext* cx,
                                                  AbstractFramePtr frame);
diff -Nru firefox-84.0.2+build1/js/src/vm/EnvironmentObject-inl.h firefox-85.0+build1/js/src/vm/EnvironmentObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/EnvironmentObject-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/EnvironmentObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -10,7 +10,6 @@
 #include "vm/EnvironmentObject.h"
 
 #include "vm/JSObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 namespace js {
 
@@ -64,13 +63,9 @@
   setAliasedBinding(cx, bi.location().slot(), v);
 }
 
-inline void CallObject::setAliasedFormalFromArguments(JSContext* cx,
-                                                      const Value& argsValue,
-                                                      jsid id, const Value& v) {
+inline void CallObject::setAliasedFormalFromArguments(const Value& argsValue,
+                                                      const Value& v) {
   setSlot(ArgumentsObject::SlotFromMagicScopeSlotValue(argsValue), v);
-  if (isSingleton()) {
-    AddTypePropertyId(cx, this, id, v);
-  }
 }
 
 } /* namespace js */
diff -Nru firefox-84.0.2+build1/js/src/vm/ErrorObject.cpp firefox-85.0+build1/js/src/vm/ErrorObject.cpp
--- firefox-84.0.2+build1/js/src/vm/ErrorObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ErrorObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -403,7 +403,7 @@
     ctor =
         NewFunctionWithProto(cx, native, nargs, FunctionFlags::NATIVE_CTOR,
                              nullptr, ClassName(key, cx), proto,
-                             gc::AllocKind::FUNCTION_EXTENDED, SingletonObject);
+                             gc::AllocKind::FUNCTION_EXTENDED, TenuredObject);
   }
 
   if (!ctor) {
@@ -451,10 +451,9 @@
   // present in some error objects -- |Error.prototype|, |new Error("f")|,
   // |new Error("")| -- but not in others -- |new Error(undefined)|,
   // |new Error()|.
-  RootedShape messageShape(cx);
   if (message) {
-    messageShape = NativeObject::addDataProperty(cx, obj, cx->names().message,
-                                                 MESSAGE_SLOT, 0);
+    Shape* messageShape = NativeObject::addDataProperty(
+        cx, obj, cx->names().message, MESSAGE_SLOT, 0);
     if (!messageShape) {
       return false;
     }
@@ -481,7 +480,7 @@
   obj->initReservedSlot(LINENUMBER_SLOT, Int32Value(lineNumber));
   obj->initReservedSlot(COLUMNNUMBER_SLOT, Int32Value(columnNumber));
   if (message) {
-    obj->setSlotWithType(cx, messageShape, StringValue(message));
+    obj->initSlot(MESSAGE_SLOT, StringValue(message));
   }
   obj->initReservedSlot(SOURCEID_SLOT, Int32Value(sourceId));
 
diff -Nru firefox-84.0.2+build1/js/src/vm/FrameIter.cpp firefox-85.0+build1/js/src/vm/FrameIter.cpp
--- firefox-84.0.2+build1/js/src/vm/FrameIter.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/FrameIter.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -532,6 +532,15 @@
   MOZ_CRASH("Unexpected state");
 }
 
+bool FrameIter::isModuleFrame() const {
+  MOZ_ASSERT(!done());
+
+  if (hasScript()) {
+    return script()->isModule();
+  }
+  MOZ_CRASH("Unexpected state");
+}
+
 bool FrameIter::isFunctionFrame() const {
   MOZ_ASSERT(!done());
   switch (data_.state_) {
diff -Nru firefox-84.0.2+build1/js/src/vm/FrameIter.h firefox-85.0+build1/js/src/vm/FrameIter.h
--- firefox-84.0.2+build1/js/src/vm/FrameIter.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/FrameIter.h	2021-01-18 19:58:16.000000000 +0000
@@ -283,6 +283,7 @@
   inline bool isPhysicalJitFrame() const;
 
   bool isEvalFrame() const;
+  bool isModuleFrame() const;
   bool isFunctionFrame() const;
   bool hasArgs() const { return isFunctionFrame(); }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/FunctionFlags.h firefox-85.0+build1/js/src/vm/FunctionFlags.h
--- firefox-84.0.2+build1/js/src/vm/FunctionFlags.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/FunctionFlags.h	2021-01-18 19:58:16.000000000 +0000
@@ -85,9 +85,7 @@
     RESOLVED_NAME = 1 << 13,
     RESOLVED_LENGTH = 1 << 14,
 
-    // For a function used as an interpreted constructor, whether a 'new' type
-    // had constructor information cleared.
-    NEW_SCRIPT_CLEARED = 1 << 15,
+    // (1 << 15 is unused)
 
     // Shifted form of FunctionKinds.
     NORMAL_KIND = NormalFunction << FUNCTION_KIND_SHIFT,
@@ -116,7 +114,7 @@
     INTERPRETED_METHOD = BASESCRIPT | METHOD_KIND,
 
     // Flags that XDR ignores. See also: js::BaseScript::MutableFlags.
-    MUTABLE_FLAGS = RESOLVED_NAME | RESOLVED_LENGTH | NEW_SCRIPT_CLEARED,
+    MUTABLE_FLAGS = RESOLVED_NAME | RESOLVED_LENGTH,
 
     // Flags preserved when cloning a function. (Exception:
     // js::MakeDefaultConstructor produces default constructors for ECMAScript
@@ -298,12 +296,7 @@
   void setResolvedLength() { setFlags(RESOLVED_LENGTH); }
   void setResolvedName() { setFlags(RESOLVED_NAME); }
 
-  // Mark a function as having its 'new' script information cleared.
-  bool wasNewScriptCleared() const { return hasFlags(NEW_SCRIPT_CLEARED); }
-  void setNewScriptCleared() { setFlags(NEW_SCRIPT_CLEARED); }
-
   void setInferredName() { setFlags(HAS_INFERRED_NAME); }
-  void clearInferredName() { clearFlags(HAS_INFERRED_NAME); }
 
   void setGuessedAtom() { setFlags(HAS_GUESSED_ATOM); }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/GeneratorObject.cpp firefox-85.0+build1/js/src/vm/GeneratorObject.cpp
--- firefox-84.0.2+build1/js/src/vm/GeneratorObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/GeneratorObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -33,6 +33,10 @@
   MOZ_ASSERT(frame.isGeneratorFrame());
   MOZ_ASSERT(!frame.isConstructing());
 
+  if (frame.isModuleFrame()) {
+    return createModuleGenerator(cx, frame);
+  }
+
   RootedFunction fun(cx, frame.callee());
 
   Rooted<AbstractGeneratorObject*> genObj(cx);
@@ -61,6 +65,39 @@
   return genObj;
 }
 
+JSObject* AbstractGeneratorObject::createModuleGenerator(
+    JSContext* cx, AbstractFramePtr frame) {
+  Rooted<ModuleObject*> module(cx, frame.script()->module());
+  Rooted<AbstractGeneratorObject*> genObj(cx);
+  genObj = AsyncFunctionGeneratorObject::create(cx, module);
+  if (!genObj) {
+    return nullptr;
+  }
+
+  // Create a handler function to wrap the module's script. This way
+  // we can access it later and restore the state.
+  HandlePropertyName funName = cx->names().empty;
+  RootedFunction handlerFun(
+      cx, NewFunctionWithProto(cx, nullptr, 0,
+                               FunctionFlags::INTERPRETED_GENERATOR_OR_ASYNC,
+                               nullptr, funName, nullptr,
+                               gc::AllocKind::FUNCTION, GenericObject));
+  if (!handlerFun) {
+    return nullptr;
+  }
+  handlerFun->initScript(module->script());
+
+  genObj->setCallee(*handlerFun);
+  genObj->setEnvironmentChain(*frame.environmentChain());
+  genObj->clearStackStorage();
+
+  if (!DebugAPI::onNewGenerator(cx, frame, genObj)) {
+    return nullptr;
+  }
+
+  return genObj;
+}
+
 void AbstractGeneratorObject::trace(JSTracer* trc) {
   DebugAPI::traceGeneratorFrame(trc, this);
 }
@@ -148,6 +185,15 @@
   cx->check(frame);
   MOZ_ASSERT(frame.isGeneratorFrame());
 
+  if (frame.isModuleFrame()) {
+    ModuleEnvironmentObject* moduleEnv =
+        frame.script()->module()->environment();
+    Shape* shape = moduleEnv->lookup(cx, cx->names().dotGenerator);
+    Value genValue = moduleEnv->getSlot(shape->slot());
+    return genValue.isObject()
+               ? &genValue.toObject().as<AbstractGeneratorObject>()
+               : nullptr;
+  }
   if (!frame.hasInitialEnvironment()) {
     return nullptr;
   }
@@ -268,15 +314,14 @@
     JS_SELF_HOSTED_FN("throw", "GeneratorThrow", 1, 0),
     JS_SELF_HOSTED_FN("return", "GeneratorReturn", 1, 0), JS_FS_END};
 
-JSObject* js::NewSingletonObjectWithFunctionPrototype(
+JSObject* js::NewTenuredObjectWithFunctionPrototype(
     JSContext* cx, Handle<GlobalObject*> global) {
   RootedObject proto(cx,
                      GlobalObject::getOrCreateFunctionPrototype(cx, global));
   if (!proto) {
     return nullptr;
   }
-  RootedObject obj(cx,
-                   NewSingletonObjectWithGivenProto<PlainObject>(cx, proto));
+  RootedObject obj(cx, NewTenuredObjectWithGivenProto<PlainObject>(cx, proto));
   if (!obj) {
     return nullptr;
   }
@@ -296,12 +341,12 @@
   HandlePropertyName name = cx->names().GeneratorFunction;
   return NewFunctionWithProto(cx, Generator, 1, FunctionFlags::NATIVE_CTOR,
                               nullptr, name, proto, gc::AllocKind::FUNCTION,
-                              SingletonObject);
+                              TenuredObject);
 }
 
 static JSObject* CreateGeneratorFunctionPrototype(JSContext* cx,
                                                   JSProtoKey key) {
-  return NewSingletonObjectWithFunctionPrototype(cx, cx->global());
+  return NewTenuredObjectWithFunctionPrototype(cx, cx->global());
 }
 
 static bool GeneratorFunctionClassFinish(JSContext* cx,
diff -Nru firefox-84.0.2+build1/js/src/vm/GeneratorObject.h firefox-85.0+build1/js/src/vm/GeneratorObject.h
--- firefox-84.0.2+build1/js/src/vm/GeneratorObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/GeneratorObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -49,6 +49,9 @@
   // plenty for typical human-authored code.
   static constexpr uint32_t FixedSlotLimit = 256;
 
+ private:
+  static JSObject* createModuleGenerator(JSContext* cx, AbstractFramePtr frame);
+
  public:
   static JSObject* create(JSContext* cx, AbstractFramePtr frame);
 
diff -Nru firefox-84.0.2+build1/js/src/vm/GlobalObject.cpp firefox-85.0+build1/js/src/vm/GlobalObject.cpp
--- firefox-84.0.2+build1/js/src/vm/GlobalObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/GlobalObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -49,15 +49,18 @@
 #include "js/ProtoKey.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
+#include "vm/BooleanObject.h"
 #include "vm/DateObject.h"
 #include "vm/EnvironmentObject.h"
 #include "vm/ErrorObject.h"
 #include "vm/GeneratorObject.h"
 #include "vm/HelperThreads.h"
 #include "vm/JSContext.h"
+#include "vm/NumberObject.h"
 #include "vm/PIC.h"
 #include "vm/RegExpStatics.h"
 #include "vm/RegExpStaticsObject.h"
+#include "vm/StringObject.h"
 
 #include "gc/FreeOp-inl.h"
 #include "vm/JSObject-inl.h"
@@ -89,16 +92,6 @@
   return protoTable[key];
 }
 
-// This method is not in the header file to avoid having to include
-// WasmJS.h from GlobalObject.h. It is not generally perf
-// sensitive.
-WasmNamespaceObject& js::GlobalObject::getWebAssemblyNamespace() const {
-  Value v = getConstructor(JSProto_WebAssembly);
-  // only gets called from contexts where WebAssembly must be initialized
-  MOZ_ASSERT(v.isObject());
-  return v.toObject().as<WasmNamespaceObject>();
-}
-
 /* static */
 bool GlobalObject::skipDeselectedConstructor(JSContext* cx, JSProtoKey key) {
   switch (key) {
@@ -163,6 +156,7 @@
     case JSProto_WasmMemory:
     case JSProto_WasmTable:
     case JSProto_WasmGlobal:
+    case JSProto_WasmException:
       return false;
 
 #ifdef JS_HAS_INTL_API
@@ -522,15 +516,6 @@
     return false;
   }
 
-  if (key == JSProto_Object || key == JSProto_Function ||
-      key == JSProto_Array) {
-    ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-    if (!JSObject::setNewGroupUnknown(cx, realm, placeholder->getClass(),
-                                      placeholder)) {
-      return false;
-    }
-  }
-
   global->setPrototype(key, ObjectValue(*placeholder));
   global->setConstructor(key, MagicValue(JS_OFF_THREAD_CONSTRUCTOR));
   return true;
@@ -902,8 +887,7 @@
                                       HandleObject proto) {
   MOZ_ASSERT(clasp != &JSFunction::class_);
 
-  RootedObject blankProto(cx,
-                          NewSingletonObjectWithGivenProto(cx, clasp, proto));
+  RootedObject blankProto(cx, NewTenuredObjectWithGivenProto(cx, clasp, proto));
   if (!blankProto || !JSObject::setDelegate(cx, blankProto)) {
     return nullptr;
   }
@@ -1074,7 +1058,7 @@
 
   RootedFunction fun(cx);
   if (!cx->runtime()->createLazySelfHostedFunctionClone(
-          cx, selfHostedName, name, nargs, SingletonObject, &fun)) {
+          cx, selfHostedName, name, nargs, TenuredObject, &fun)) {
     return false;
   }
   funVal.setObject(*fun);
diff -Nru firefox-84.0.2+build1/js/src/vm/GlobalObject.h firefox-85.0+build1/js/src/vm/GlobalObject.h
--- firefox-84.0.2+build1/js/src/vm/GlobalObject.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/GlobalObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -54,10 +54,6 @@
 class LexicalEnvironmentObject;
 class PlainObject;
 class RegExpStatics;
-class TypeDescr;
-class WasmNamespaceObject;
-
-enum class ReferenceType;
 
 /*
  * Global object slots are reserved as follows:
@@ -500,21 +496,6 @@
     return &global->getPrototype(JSProto_WeakSet).toObject().as<NativeObject>();
   }
 
-  static JSObject* getOrCreateWebAssemblyNamespace(
-      JSContext* cx, Handle<GlobalObject*> global) {
-    return getOrCreateConstructor(cx, JSProto_WebAssembly);
-  }
-
-  static TypeDescr* getOrCreateScalarTypeDescr(JSContext* cx,
-                                               Handle<GlobalObject*> global,
-                                               Scalar::Type scalarType);
-
-  static TypeDescr* getOrCreateReferenceTypeDescr(JSContext* cx,
-                                                  Handle<GlobalObject*> global,
-                                                  ReferenceType type);
-
-  WasmNamespaceObject& getWebAssemblyNamespace() const;
-
   static bool ensureModulePrototypesCreated(JSContext* cx,
                                             Handle<GlobalObject*> global);
 
@@ -1000,8 +981,8 @@
   return JSCLASS_CACHED_PROTO_KEY(obj->getClass());
 }
 
-JSObject* NewSingletonObjectWithFunctionPrototype(JSContext* cx,
-                                                  Handle<GlobalObject*> global);
+JSObject* NewTenuredObjectWithFunctionPrototype(JSContext* cx,
+                                                Handle<GlobalObject*> global);
 
 }  // namespace js
 
diff -Nru firefox-84.0.2+build1/js/src/vm/HelperThreads.cpp firefox-85.0+build1/js/src/vm/HelperThreads.cpp
--- firefox-84.0.2+build1/js/src/vm/HelperThreads.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/HelperThreads.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -303,7 +303,6 @@
     JSRuntime* operator()(Zone* zone) { return zone->runtimeFromMainThread(); }
     JSRuntime* operator()(ZonesInState zbs) { return zbs.runtime; }
     JSRuntime* operator()(JSRuntime* runtime) { return runtime; }
-    JSRuntime* operator()(CompilationsUsingNursery cun) { return cun.runtime; }
   };
 
   return selector.match(Matcher());
@@ -316,9 +315,6 @@
     bool operator()(Zone* zone) { return !!zone->jitZone(); }
     bool operator()(ZonesInState zbs) { return zbs.runtime->hasJitRuntime(); }
     bool operator()(JSRuntime* runtime) { return runtime->hasJitRuntime(); }
-    bool operator()(CompilationsUsingNursery cun) {
-      return cun.runtime->hasJitRuntime();
-    }
   };
 
   return selector.match(Matcher());
@@ -341,10 +337,6 @@
       return zbs.runtime == task_->script()->runtimeFromAnyThread() &&
              zbs.state == task_->script()->zoneFromAnyThread()->gcState();
     }
-    bool operator()(CompilationsUsingNursery cun) {
-      return cun.runtime == task_->script()->runtimeFromAnyThread() &&
-             !task_->mirGen().safeForMinorGC();
-    }
   };
 
   return selector.match(TaskMatches{task});
@@ -596,6 +588,7 @@
     compilationInfos_->trace(trc);
   }
   gcOutput_.trace(trc);
+  gcOutputForDelazification_.trace(trc);
 }
 
 size_t ParseTask::sizeOfExcludingThis(
@@ -709,7 +702,8 @@
   if (compilationInfo_) {
     result = frontend::InstantiateStencils(cx, *compilationInfo_, gcOutput_);
   } else {
-    result = frontend::InstantiateStencils(cx, *compilationInfos_, gcOutput_);
+    result = frontend::InstantiateStencils(cx, *compilationInfos_, gcOutput_,
+                                           gcOutputForDelazification_);
   }
 
   // Whatever happens to the top-level script compilation (even if it fails),
@@ -802,7 +796,8 @@
     compilationInfos_ = std::move(compilationInfos.get());
 
     if (compilationInfos_) {
-      if (!frontend::PrepareForInstantiate(cx, *compilationInfos_, gcOutput_)) {
+      if (!frontend::PrepareForInstantiate(cx, *compilationInfos_, gcOutput_,
+                                           gcOutputForDelazification_)) {
         compilationInfos_ = nullptr;
       }
     }
@@ -1415,8 +1410,8 @@
 }
 
 #ifdef DEBUG
-bool GlobalHelperThreadState::isLockedByCurrentThread() const {
-  return gHelperThreadLock.ownedByCurrentThread();
+void GlobalHelperThreadState::assertIsLockedByCurrentThread() const {
+  gHelperThreadLock.assertOwnedByCurrentThread();
 }
 #endif  // DEBUG
 
@@ -1544,7 +1539,9 @@
 
 void GlobalHelperThreadState::addSizeOfIncludingThis(
     JS::GlobalStats* stats, AutoLockHelperThreadState& lock) const {
-  MOZ_ASSERT(isLockedByCurrentThread());
+#ifdef DEBUG
+  assertIsLockedByCurrentThread();
+#endif
 
   mozilla::MallocSizeOf mallocSizeOf = stats->mallocSizeOf_;
   JS::HelperThreadStats& htStats = stats->helperThread;
@@ -2551,6 +2548,23 @@
 
 void GlobalHelperThreadState::trace(JSTracer* trc) {
   AutoLockHelperThreadState lock;
+
+#ifdef DEBUG
+  // Since we hold the helper thread lock here we must disable GCMarker's
+  // checking of the atom marking bitmap since that also relies on taking the
+  // lock.
+  GCMarker* marker = nullptr;
+  if (trc->isMarkingTracer()) {
+    marker = GCMarker::fromTracer(trc);
+    marker->setCheckAtomMarking(false);
+  }
+  auto reenableAtomMarkingCheck = mozilla::MakeScopeExit([marker] {
+    if (marker) {
+      marker->setCheckAtomMarking(true);
+    }
+  });
+#endif
+
   for (auto task : ionWorklist(lock)) {
     task->alloc().lifoAlloc()->setReadWrite();
     task->trace(trc);
diff -Nru firefox-84.0.2+build1/js/src/vm/HelperThreads.h firefox-85.0+build1/js/src/vm/HelperThreads.h
--- firefox-84.0.2+build1/js/src/vm/HelperThreads.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/HelperThreads.h	2021-01-18 19:58:16.000000000 +0000
@@ -11,6 +11,7 @@
 #ifndef vm_HelperThreads_h
 #define vm_HelperThreads_h
 
+#include "mozilla/Variant.h"
 #include "NamespaceImports.h"
 
 #include "js/OffThreadScriptCompilation.h"
@@ -134,13 +135,9 @@
   JSRuntime* runtime;
   JS::shadow::Zone::GCState state;
 };
-struct CompilationsUsingNursery {
-  JSRuntime* runtime;
-};
 
-using CompilationSelector =
-    mozilla::Variant<JSScript*, JS::Realm*, JS::Zone*, ZonesInState, JSRuntime*,
-                     CompilationsUsingNursery>;
+using CompilationSelector = mozilla::Variant<JSScript*, JS::Realm*, JS::Zone*,
+                                             ZonesInState, JSRuntime*>;
 
 /*
  * Cancel scheduled or in progress Ion compilations.
@@ -168,11 +165,6 @@
   CancelOffThreadIonCompile(CompilationSelector(runtime));
 }
 
-inline void CancelOffThreadIonCompilesUsingNurseryPointers(JSRuntime* runtime) {
-  CancelOffThreadIonCompile(
-      CompilationSelector(CompilationsUsingNursery{runtime}));
-}
-
 #ifdef DEBUG
 bool HasOffThreadIonCompile(JS::Realm* realm);
 #endif
diff -Nru firefox-84.0.2+build1/js/src/vm/HelperThreadState.h firefox-85.0+build1/js/src/vm/HelperThreadState.h
--- firefox-84.0.2+build1/js/src/vm/HelperThreadState.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/HelperThreadState.h	2021-01-18 19:58:16.000000000 +0000
@@ -193,7 +193,7 @@
   void destroyHelperContexts(AutoLockHelperThreadState& lock);
 
 #ifdef DEBUG
-  bool isLockedByCurrentThread() const;
+  void assertIsLockedByCurrentThread() const;
 #endif
 
   enum CondVar {
@@ -526,6 +526,8 @@
 
   frontend::CompilationGCOutput gcOutput_;
 
+  frontend::CompilationGCOutput gcOutputForDelazification_;
+
   // Any errors or warnings produced during compilation. These are reported
   // when finishing the script.
   Vector<UniquePtr<CompileError>, 0, SystemAllocPolicy> errors;
diff -Nru firefox-84.0.2+build1/js/src/vm/Instrumentation.cpp firefox-85.0+build1/js/src/vm/Instrumentation.cpp
--- firefox-84.0.2+build1/js/src/vm/Instrumentation.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Instrumentation.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -99,10 +99,8 @@
     InstrumentationKind kind) {
   for (size_t i = 0; i < mozilla::ArrayLength(instrumentationNames); i++) {
     if (kind == (InstrumentationKind)(1 << i)) {
-      return parserAtoms
-          .internAscii(cx, instrumentationNames[i],
-                       strlen(instrumentationNames[i]))
-          .unwrapOr(nullptr);
+      return parserAtoms.internAscii(cx, instrumentationNames[i],
+                                     strlen(instrumentationNames[i]));
     }
   }
   MOZ_CRASH("Unexpected instrumentation kind");
diff -Nru firefox-84.0.2+build1/js/src/vm/Interpreter.cpp firefox-85.0+build1/js/src/vm/Interpreter.cpp
--- firefox-84.0.2+build1/js/src/vm/Interpreter.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Interpreter.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -198,9 +198,9 @@
                                         HandleScript script, jsbytecode* pc,
                                         MutableHandleValue lval,
                                         MutableHandleValue vp) {
-  JSOp op = JSOp(*pc);
+  RootedPropertyName name(cx, script->getName(pc));
 
-  if (op == JSOp::Length) {
+  if (name == cx->names().length) {
     if (IsOptimizedArguments(fp, lval)) {
       vp.setInt32(fp->numActualArgs());
       return true;
@@ -209,11 +209,7 @@
     if (GetLengthProperty(lval, vp)) {
       return true;
     }
-  }
-
-  RootedPropertyName name(cx, script->getName(pc));
-
-  if (name == cx->names().callee && IsOptimizedArguments(fp, lval)) {
+  } else if (name == cx->names().callee && IsOptimizedArguments(fp, lval)) {
     vp.setObject(fp->callee());
     return true;
   }
@@ -314,30 +310,28 @@
     return nullptr;
   }
 
+  // Override the source span needs for toString. Calling toString on a class
+  // constructor should return the class declaration, not the source for the
+  // (self-hosted) constructor function.
+  unsigned column;
+  unsigned line = PCToLineNumber(script, pc, &column);
+  SourceExtent classExtent = SourceExtent::makeClassExtent(
+      classStartOffset, classEndOffset, line, column);
+
   // Clone bytecode from template function.
-  // NOTE: This will inherit the SelfHosted flag and SourceExtent from the
-  //       source script, but these will be fixed below.
   MOZ_ASSERT(sourceFun->enclosingScope()->is<GlobalScope>());
   RootedScope enclosingScope(cx, &cx->global()->emptyGlobalScope());
   Rooted<ScriptSourceObject*> sourceObject(cx, script->sourceObject());
   if (!CloneScriptIntoFunction(cx, enclosingScope, ctor, sourceScript,
-                               sourceObject)) {
+                               sourceObject, &classExtent)) {
     return nullptr;
   }
   RootedScript ctorScript(cx, ctor->nonLazyScript());
 
-  // Override the source span needs for toString. Calling toString on a class
-  // constructor should return the class declaration, not the source for the
-  // (self-hosted) constructor function.
-  unsigned column;
-  unsigned line = PCToLineNumber(script, pc, &column);
-  ctorScript->setDefaultClassConstructorSpan(classStartOffset, classEndOffset,
-                                             line, column);
-
-  // Update TI info for the new function.
-  if (!JSFunction::setTypeForScriptedFunction(cx, ctor)) {
-    return nullptr;
-  }
+  // Even though the script was cloned from the self-hosted template, we cannot
+  // delazify back to a SelfHostedLazyScript. The script is no longer marked as
+  // SelfHosted either.
+  ctorScript->clearAllowRelazify();
 
   DebugAPI::onNewScript(cx, ctorScript);
 
@@ -382,17 +376,24 @@
   return nullptr;
 }
 
-static bool MaybeCreateThisForConstructor(JSContext* cx, const CallArgs& args,
-                                          bool createSingleton) {
+static bool MaybeCreateThisForConstructor(JSContext* cx, const CallArgs& args) {
   if (args.thisv().isObject()) {
     return true;
   }
 
   RootedFunction callee(cx, &args.callee().as<JSFunction>());
   RootedObject newTarget(cx, &args.newTarget().toObject());
-  NewObjectKind newKind = createSingleton ? SingletonObject : GenericObject;
 
-  return CreateThis(cx, callee, newTarget, newKind, args.mutableThisv());
+  MOZ_ASSERT(callee->hasBytecode());
+
+  if (!CreateThis(cx, callee, newTarget, GenericObject, args.mutableThisv())) {
+    return false;
+  }
+
+  // Ensure the callee still has a non-lazy script. We normally don't relazify
+  // in active compartments, but the .prototype lookup might have called the
+  // relazifyFunctions testing function that doesn't have this restriction.
+  return JSFunction::getOrCreateScript(cx, callee);
 }
 
 static MOZ_NEVER_INLINE JS_HAZ_JSNATIVE_CALLER bool Interpret(JSContext* cx,
@@ -469,11 +470,6 @@
       break;
   }
 
-  if (state.isInvoke()) {
-    InvokeState& invoke = *state.asInvoke();
-    TypeMonitorCall(cx, invoke.args(), invoke.constructing());
-  }
-
   bool ok = Interpret(cx, state);
 
   return ok;
@@ -553,7 +549,6 @@
 bool js::InternalCallOrConstruct(JSContext* cx, const CallArgs& args,
                                  MaybeConstruct construct, CallReason reason) {
   MOZ_ASSERT(args.length() <= ARGS_LENGTH_MAX);
-  MOZ_ASSERT(!cx->zone()->types.activeAnalysis);
 
   unsigned skipForCallee = args.length() + 1 + (construct == CONSTRUCT);
   if (args.calleev().isPrimitive()) {
@@ -617,20 +612,8 @@
   // Create |this| if we're constructing. Switch to the callee's realm to
   // ensure this object has the correct realm.
   AutoRealm ar(cx, state.script());
-  if (construct) {
-    bool createSingleton = false;
-    if (IsTypeInferenceEnabled()) {
-      jsbytecode* pc;
-      if (JSScript* script = cx->currentScript(&pc)) {
-        if (ObjectGroup::useSingletonForNewObject(cx, script, pc)) {
-          createSingleton = true;
-        }
-      }
-    }
-
-    if (!MaybeCreateThisForConstructor(cx, args, createSingleton)) {
-      return false;
-    }
+  if (construct && !MaybeCreateThisForConstructor(cx, args)) {
+    return false;
   }
 
   bool ok = RunScript(cx, state);
@@ -1004,7 +987,7 @@
 
 JSObject* js::FunWithProtoOperation(JSContext* cx, HandleFunction fun,
                                     HandleObject parent, HandleObject proto) {
-  return CloneFunctionObjectIfNotSingleton(cx, fun, parent, proto);
+  return CloneFunctionObject(cx, fun, parent, proto);
 }
 
 /*
@@ -1865,23 +1848,10 @@
 
 static MOZ_ALWAYS_INLINE bool SetObjectElementOperation(
     JSContext* cx, HandleObject obj, HandleId id, HandleValue value,
-    HandleValue receiver, bool strict, JSScript* script = nullptr,
-    jsbytecode* pc = nullptr) {
+    HandleValue receiver, bool strict) {
   // receiver != obj happens only at super[expr], where we expect to find the
   // property. People probably aren't building hashtables with |super|
   // anyway.
-  JitScript::MonitorAssign(cx, obj, id);
-
-  if (obj->isNative() && JSID_IS_INT(id)) {
-    uint32_t length = obj->as<NativeObject>().getDenseInitializedLength();
-    int32_t i = JSID_TO_INT(id);
-    if ((uint32_t)i >= length) {
-      // Annotate script if provided with information (e.g. baseline)
-      if (script && script->hasJitScript() && IsSetElemPC(pc)) {
-        script->jitScript()->noteHasDenseAdd(script->pcToOffset(pc));
-      }
-    }
-  }
 
   // Set the HadElementsAccess flag on the object if needed. This flag is
   // used to do more eager dictionary-mode conversion for objects that are
@@ -1902,6 +1872,29 @@
          result.checkStrictModeError(cx, obj, id, strict);
 }
 
+static MOZ_ALWAYS_INLINE void InitElemArrayOperation(JSContext* cx,
+                                                     jsbytecode* pc,
+                                                     HandleArrayObject arr,
+                                                     HandleValue val) {
+  MOZ_ASSERT(JSOp(*pc) == JSOp::InitElemArray);
+
+  // The dense elements must have been initialized up to this index. The JIT
+  // implementation also depends on this.
+  uint32_t index = GET_UINT32(pc);
+  MOZ_ASSERT(index < arr->getDenseCapacity());
+  MOZ_ASSERT(index == arr->getDenseInitializedLength());
+
+  // Bump the initialized length even for hole values to ensure the
+  // index == initLength invariant holds for later InitElemArray ops.
+  arr->setDenseInitializedLength(index + 1);
+
+  if (val.isMagic(JS_ELEMENTS_HOLE)) {
+    arr->initDenseElementHole(index);
+  } else {
+    arr->initDenseElement(index, val);
+  }
+}
+
 /*
  * As an optimization, the interpreter creates a handful of reserved Rooted<T>
  * variables at the beginning, thus inserting them into the Rooted list once
@@ -2106,7 +2099,6 @@
   JS_END_MACRO
 
   gc::MaybeVerifyBarriers(cx, true);
-  MOZ_ASSERT(!cx->zone()->types.activeAnalysis);
 
   InterpreterFrame* entryFrame = state.pushInterpreterFrame(cx);
   if (!entryFrame) {
@@ -2370,7 +2362,6 @@
             ADVANCE_AND_DISPATCH(JSOpLength_Resume);
           }
 
-          JitScript::MonitorBytecodeType(cx, script, REGS.pc, REGS.sp[-1]);
           MOZ_ASSERT(GetBytecodeLength(REGS.pc) == JSOpLength_Call);
           ADVANCE_AND_DISPATCH(JSOpLength_Call);
         }
@@ -2542,12 +2533,6 @@
     }
     END_CASE(IsGenClosing)
 
-    CASE(IterNext) {
-      // Ion relies on this.
-      MOZ_ASSERT(REGS.sp[-1].isString());
-    }
-    END_CASE(IterNext)
-
     CASE(Dup) {
       MOZ_ASSERT(REGS.stackDepth() >= 1);
       const Value& rref = REGS.sp[-1];
@@ -3010,15 +2995,11 @@
     }
     END_CASE(CheckReturn)
 
-    CASE(GetProp)
-    CASE(Length)
-    CASE(CallProp) {
+    CASE(GetProp) {
       MutableHandleValue lval = REGS.stackHandleAt(-1);
       if (!GetPropertyOperation(cx, REGS.fp(), script, REGS.pc, lval, lval)) {
         goto error;
       }
-
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, lval);
       cx->debugOnlyCheck(lval);
     }
     END_CASE(GetProp)
@@ -3032,7 +3013,6 @@
         goto error;
       }
 
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, rref);
       cx->debugOnlyCheck(rref);
 
       REGS.sp--;
@@ -3046,8 +3026,6 @@
       if (!GetNameBoundInEnvironment(cx, env, id, rval)) {
         goto error;
       }
-
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, rval);
       cx->debugOnlyCheck(rval);
     }
     END_CASE(GetBoundName)
@@ -3125,26 +3103,22 @@
     }
     END_CASE(SetPropSuper)
 
-    CASE(GetElem)
-    CASE(CallElem) {
+    CASE(GetElem) {
       int lvalIndex = -2;
       MutableHandleValue lval = REGS.stackHandleAt(lvalIndex);
       HandleValue rval = REGS.stackHandleAt(-1);
       MutableHandleValue res = REGS.stackHandleAt(-2);
 
-      bool done = false;
-      if (!GetElemOptimizedArguments(cx, REGS.fp(), lval, rval, res, &done)) {
-        goto error;
-      }
+      bool done =
+          MaybeGetElemOptimizedArguments(cx, REGS.fp(), lval, rval, res);
 
       if (!done) {
-        if (!GetElementOperationWithStackIndex(cx, JSOp(*REGS.pc), lval,
-                                               lvalIndex, rval, res)) {
+        if (!GetElementOperationWithStackIndex(cx, lval, lvalIndex, rval,
+                                               res)) {
           goto error;
         }
       }
 
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, res);
       REGS.sp--;
     }
     END_CASE(GetElem)
@@ -3164,7 +3138,6 @@
         goto error;
       }
 
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, res);
       REGS.sp -= 2;
     }
     END_CASE(GetElemSuper)
@@ -3231,7 +3204,6 @@
       }
 
       REGS.sp = args.spAfterCall();
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, REGS.sp[-1]);
     }
     END_CASE(Eval)
 
@@ -3339,7 +3311,6 @@
           }
         }
         Value* newsp = args.spAfterCall();
-        JitScript::MonitorBytecodeType(cx, script, REGS.pc, newsp[-1]);
         REGS.sp = newsp;
         ADVANCE_AND_DISPATCH(JSOpLength_Call);
       }
@@ -3367,16 +3338,10 @@
               }
             });
 
-        if (construct) {
-          bool createSingleton =
-              ObjectGroup::useSingletonForNewObject(cx, script, REGS.pc);
-          if (!MaybeCreateThisForConstructor(cx, args, createSingleton)) {
-            goto error;
-          }
+        if (construct && !MaybeCreateThisForConstructor(cx, args)) {
+          goto error;
         }
 
-        TypeMonitorCall(cx, args, construct);
-
         {
           InvokeState state(cx, args, construct);
 
@@ -3477,7 +3442,6 @@
       }
 
       PUSH_COPY(rval);
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, rval);
       static_assert(JSOpLength_GetName == JSOpLength_GetGName,
                     "We're sharing the END_CASE so the lengths better match");
     }
@@ -3490,8 +3454,6 @@
       if (!GetImportOperation(cx, envChain, script, REGS.pc, rval)) {
         goto error;
       }
-
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, rval);
     }
     END_CASE(GetImport)
 
@@ -3502,7 +3464,6 @@
       }
 
       PUSH_COPY(rval);
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, rval);
     }
     END_CASE(GetIntrinsic)
 
@@ -3659,7 +3620,6 @@
       }
 #endif
       PUSH_COPY(val);
-      JitScript::MonitorBytecodeType(cx, script, REGS.pc, REGS.sp[-1]);
     }
     END_CASE(GetAliasedVar)
 
@@ -3777,46 +3737,14 @@
     }
     END_CASE(SetLocal)
 
-    CASE(DefVar) {
+    CASE(GlobalOrEvalDeclInstantiation) {
+      GCThingIndex lastFun = GET_GCTHING_INDEX(REGS.pc);
       HandleObject env = REGS.fp()->environmentChain();
-      if (!DefVarOperation(cx, env, script, REGS.pc)) {
+      if (!GlobalOrEvalDeclInstantiation(cx, env, script, lastFun)) {
         goto error;
       }
     }
-    END_CASE(DefVar)
-
-    CASE(DefConst)
-    CASE(DefLet) {
-      HandleObject env = REGS.fp()->environmentChain();
-      if (!DefLexicalOperation(cx, env, script, REGS.pc)) {
-        goto error;
-      }
-    }
-    END_CASE(DefLet)
-
-    CASE(DefFun) {
-      /*
-       * A top-level function defined in Global or Eval code (see ECMA-262
-       * Ed. 3), or else a SpiderMonkey extension: a named function statement
-       * in a compound statement (not at the top statement level of global
-       * code, or at the top level of a function body).
-       */
-      ReservedRooted<JSFunction*> fun(&rootFunction0,
-                                      &REGS.sp[-1].toObject().as<JSFunction>());
-      if (!DefFunOperation(cx, script, REGS.fp()->environmentChain(), fun)) {
-        goto error;
-      }
-      REGS.sp--;
-    }
-    END_CASE(DefFun)
-
-    CASE(CheckGlobalOrEvalDecl) {
-      HandleObject env = REGS.fp()->environmentChain();
-      if (!CheckGlobalOrEvalDeclarationConflicts(cx, env, script)) {
-        goto error;
-      }
-    }
-    END_CASE(CheckGlobalOrEvalDecl)
+    END_CASE(GlobalOrEvalDeclInstantiation)
 
     CASE(Lambda) {
       /* Load the specified function object literal. */
@@ -3990,18 +3918,7 @@
     }
     END_CASE(NewArray)
 
-    CASE(NewArrayCopyOnWrite) {
-      JSObject* obj = NewArrayCopyOnWriteOperation(cx, script, REGS.pc);
-      if (!obj) {
-        goto error;
-      }
-
-      PUSH_OBJECT(*obj);
-    }
-    END_CASE(NewArrayCopyOnWrite)
-
-    CASE(NewObject)
-    CASE(NewObjectWithGroup) {
+    CASE(NewObject) {
       JSObject* obj = NewObjectOperation(cx, script, REGS.pc);
       if (!obj) {
         goto error;
@@ -4072,15 +3989,9 @@
     CASE(InitElemArray) {
       MOZ_ASSERT(REGS.stackDepth() >= 2);
       HandleValue val = REGS.stackHandleAt(-1);
-
       ReservedRooted<JSObject*> obj(&rootObject0, &REGS.sp[-2].toObject());
 
-      uint32_t index = GET_UINT32(REGS.pc);
-      if (!InitArrayElemOperation(cx, REGS.pc, obj.as<ArrayObject>(), index,
-                                  val)) {
-        goto error;
-      }
-
+      InitElemArrayOperation(cx, REGS.pc, obj.as<ArrayObject>(), val);
       REGS.sp--;
     }
     END_CASE(InitElemArray)
@@ -4092,8 +4003,7 @@
       ReservedRooted<JSObject*> obj(&rootObject0, &REGS.sp[-3].toObject());
 
       uint32_t index = REGS.sp[-2].toInt32();
-      if (!InitArrayElemOperation(cx, REGS.pc, obj.as<ArrayObject>(), index,
-                                  val)) {
+      if (!InitElemIncOperation(cx, obj.as<ArrayObject>(), index, val)) {
         goto error;
       }
 
@@ -4263,7 +4173,10 @@
 
     CASE(InitialYield) {
       MOZ_ASSERT(!cx->isExceptionPending());
-      MOZ_ASSERT(REGS.fp()->isFunctionFrame());
+      MOZ_ASSERT_IF(script->isModule() && script->isAsync(),
+                    REGS.fp()->isModuleFrame());
+      MOZ_ASSERT_IF(!script->isModule() && script->isAsync(),
+                    REGS.fp()->isFunctionFrame());
       ReservedRooted<JSObject*> obj(&rootObject0, &REGS.sp[-1].toObject());
       POP_RETURN_VALUE();
       MOZ_ASSERT(REGS.stackDepth() == 0);
@@ -4277,7 +4190,10 @@
     CASE(Yield)
     CASE(Await) {
       MOZ_ASSERT(!cx->isExceptionPending());
-      MOZ_ASSERT(REGS.fp()->isFunctionFrame());
+      MOZ_ASSERT_IF(script->isModule() && script->isAsync(),
+                    REGS.fp()->isModuleFrame());
+      MOZ_ASSERT_IF(!script->isModule() && script->isAsync(),
+                    REGS.fp()->isFunctionFrame());
       ReservedRooted<JSObject*> obj(&rootObject0, &REGS.sp[-1].toObject());
       if (!AbstractGeneratorObject::suspend(
               cx, obj, REGS.fp(), REGS.pc,
@@ -4727,11 +4643,6 @@
   return GetProperty(cx, obj, receiver, name, vp);
 }
 
-bool js::GetValueProperty(JSContext* cx, HandleValue value,
-                          HandlePropertyName name, MutableHandleValue vp) {
-  return GetProperty(cx, value, name, vp);
-}
-
 JSObject* js::Lambda(JSContext* cx, HandleFunction fun, HandleObject parent) {
   MOZ_ASSERT(!fun->isArrow());
 
@@ -4740,7 +4651,7 @@
     MOZ_ASSERT(IsAsmJSModule(fun));
     clone = CloneAsmJSModuleFunction(cx, fun);
   } else {
-    clone = CloneFunctionObjectIfNotSingleton(cx, fun, parent);
+    clone = CloneFunctionObject(cx, fun, parent);
   }
   if (!clone) {
     return nullptr;
@@ -4754,7 +4665,7 @@
                           HandleObject parent, HandleValue newTargetv) {
   MOZ_ASSERT(fun->isArrow());
 
-  JSFunction* clone = CloneFunctionObjectIfNotSingleton(cx, fun, parent);
+  JSFunction* clone = CloneFunctionObject(cx, fun, parent);
   if (!clone) {
     return nullptr;
   }
@@ -4772,175 +4683,6 @@
   return &GetVariablesObject(envChain);
 }
 
-bool js::DefVarOperation(JSContext* cx, HandleObject envChain,
-                         HandleScript script, jsbytecode* pc) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::DefVar);
-
-  RootedObject varobj(cx, &GetVariablesObject(envChain));
-  MOZ_ASSERT(varobj->isQualifiedVarObj());
-
-  RootedPropertyName name(cx, script->getName(pc));
-
-  unsigned attrs = JSPROP_ENUMERATE;
-  if (!script->isForEval()) {
-    attrs |= JSPROP_PERMANENT;
-  }
-
-#ifdef DEBUG
-  // Per spec, it is an error to redeclare a lexical binding. This should
-  // have already been checked.
-  if (JS_HasExtensibleLexicalEnvironment(varobj)) {
-    Rooted<LexicalEnvironmentObject*> lexicalEnv(cx);
-    lexicalEnv = &JS_ExtensibleLexicalEnvironment(varobj)
-                      ->as<LexicalEnvironmentObject>();
-    MOZ_ASSERT(CheckVarNameConflict(cx, lexicalEnv, name));
-  }
-#endif
-
-  Rooted<PropertyResult> prop(cx);
-  RootedObject obj2(cx);
-  if (!LookupProperty(cx, varobj, name, &obj2, &prop)) {
-    return false;
-  }
-
-  /* Steps 8c, 8d. */
-  if (!prop || (obj2 != varobj && varobj->is<GlobalObject>())) {
-    if (!DefineDataProperty(cx, varobj, name, UndefinedHandleValue, attrs)) {
-      return false;
-    }
-  }
-
-  if (varobj->is<GlobalObject>()) {
-    if (!varobj->as<GlobalObject>().realm()->addToVarNames(cx, name)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool js::DefLexicalOperation(JSContext* cx, HandleObject envChain,
-                             HandleScript script, jsbytecode* pc) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::DefLet || JSOp(*pc) == JSOp::DefConst);
-
-  unsigned attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
-  if (JSOp(*pc) == JSOp::DefConst) {
-    attrs |= JSPROP_READONLY;
-  }
-
-  Rooted<LexicalEnvironmentObject*> lexicalEnv(cx);
-  if (script->hasNonSyntacticScope()) {
-    lexicalEnv = &NearestEnclosingExtensibleLexicalEnvironment(envChain);
-  } else {
-    lexicalEnv = &cx->global()->lexicalEnvironment();
-  }
-
-#ifdef DEBUG
-  RootedObject varObj(cx);
-  if (script->hasNonSyntacticScope()) {
-    varObj = &GetVariablesObject(envChain);
-  } else {
-    varObj = cx->global();
-  }
-
-  MOZ_ASSERT_IF(!script->hasNonSyntacticScope(),
-                lexicalEnv == &cx->global()->lexicalEnvironment() &&
-                    varObj == cx->global());
-
-  // Redeclaration checks should have already been done.
-  RootedPropertyName name(cx, script->getName(pc));
-  MOZ_ASSERT(CheckLexicalNameConflict(cx, lexicalEnv, varObj, name));
-#endif
-
-  RootedId id(cx, NameToId(script->getName(pc)));
-  RootedValue uninitialized(cx, MagicValue(JS_UNINITIALIZED_LEXICAL));
-  return NativeDefineDataProperty(cx, lexicalEnv, id, uninitialized, attrs);
-}
-
-bool js::DefFunOperation(JSContext* cx, HandleScript script,
-                         HandleObject envChain, HandleFunction fun) {
-  /*
-   * We define the function as a property of the variable object and not the
-   * current scope chain even for the case of function expression statements
-   * and functions defined by eval inside let or with blocks.
-   */
-  RootedObject parent(cx, envChain);
-  while (!parent->isQualifiedVarObj()) {
-    parent = parent->enclosingEnvironment();
-  }
-
-  /* ES5 10.5 (NB: with subsequent errata). */
-  RootedPropertyName name(cx, fun->explicitName()->asPropertyName());
-
-  Rooted<PropertyResult> prop(cx);
-  RootedObject pobj(cx);
-  if (!LookupProperty(cx, parent, name, &pobj, &prop)) {
-    return false;
-  }
-
-  RootedValue rval(cx, ObjectValue(*fun));
-
-  /*
-   * ECMA requires functions defined when entering Eval code to be
-   * impermanent.
-   */
-  unsigned attrs = script->isForEval() ? JSPROP_ENUMERATE
-                                       : JSPROP_ENUMERATE | JSPROP_PERMANENT;
-
-  /* Steps 5d, 5f. */
-  if (!prop || pobj != parent) {
-    if (!DefineDataProperty(cx, parent, name, rval, attrs)) {
-      return false;
-    }
-
-    if (parent->is<GlobalObject>()) {
-      return parent->as<GlobalObject>().realm()->addToVarNames(cx, name);
-    }
-
-    return true;
-  }
-
-  /*
-   * Step 5e.
-   *
-   * A DebugEnvironmentProxy is okay here, and sometimes necessary. If
-   * Debugger.Frame.prototype.eval defines a function with the same name as an
-   * extant variable in the frame, the DebugEnvironmentProxy takes care of
-   * storing the function in the stack frame (for non-aliased variables) or on
-   * the scope object (for aliased).
-   */
-  MOZ_ASSERT(parent->isNative() || parent->is<DebugEnvironmentProxy>());
-  if (parent->is<GlobalObject>()) {
-    Shape* shape = prop.shape();
-    if (shape->configurable()) {
-      if (!DefineDataProperty(cx, parent, name, rval, attrs)) {
-        return false;
-      }
-    } else {
-      MOZ_ASSERT(shape->isDataDescriptor());
-      MOZ_ASSERT(shape->writable());
-      MOZ_ASSERT(shape->enumerable());
-    }
-
-    // Careful: the presence of a shape, even one appearing to derive from
-    // a variable declaration, doesn't mean it's in [[VarNames]].
-    if (!parent->as<GlobalObject>().realm()->addToVarNames(cx, name)) {
-      return false;
-    }
-  }
-
-  /*
-   * Non-global properties, and global properties which we aren't simply
-   * redefining, must be set.  First, this preserves their attributes.
-   * Second, this will produce warnings and/or errors as necessary if the
-   * specified Call object property is not writable (const).
-   */
-
-  /* Step 5f. */
-  RootedId id(cx, NameToId(name));
-  return PutProperty(cx, parent, id, rval, script->strict());
-}
-
 JSObject* js::ImportMetaOperation(JSContext* cx, HandleScript script) {
   RootedObject module(cx, GetModuleObjectForScript(script));
   MOZ_ASSERT(module);
@@ -5061,23 +4803,6 @@
   return SetObjectElementOperation(cx, obj, id, value, receiver, strict);
 }
 
-bool js::SetObjectElement(JSContext* cx, HandleObject obj, HandleValue index,
-                          HandleValue value, HandleValue receiver, bool strict,
-                          HandleScript script, jsbytecode* pc) {
-  MOZ_ASSERT(pc);
-  RootedId id(cx);
-  if (!ToPropertyKey(cx, index, &id)) {
-    return false;
-  }
-  return SetObjectElementOperation(cx, obj, id, value, receiver, strict, script,
-                                   pc);
-}
-
-bool js::InitElementArray(JSContext* cx, jsbytecode* pc, HandleArrayObject arr,
-                          uint32_t index, HandleValue value) {
-  return InitArrayElemOperation(cx, pc, arr, index, value);
-}
-
 bool js::AddValues(JSContext* cx, MutableHandleValue lhs,
                    MutableHandleValue rhs, MutableHandleValue res) {
   return AddOperation(cx, lhs, rhs, res);
@@ -5364,7 +5089,6 @@
     }
   }
 
-  JitScript::MonitorBytecodeType(cx, script, pc, res);
   return true;
 }
 
@@ -5400,80 +5124,19 @@
                                  jsbytecode* pc,
                                  NewObjectKind newKind /* = GenericObject */) {
   MOZ_ASSERT(newKind != SingletonObject);
-  bool withTemplate =
-      (JSOp(*pc) == JSOp::NewObject || JSOp(*pc) == JSOp::NewObjectWithGroup);
-  bool withTemplateGroup = (JSOp(*pc) == JSOp::NewObjectWithGroup);
-
-  RootedObjectGroup group(cx);
-  RootedPlainObject baseObject(cx);
-
-  // Extract the template object, if one exists.
-  if (withTemplate) {
-    baseObject = &script->getObject(pc)->as<PlainObject>();
-  }
-
-  // Choose the group. Three cases:
-  // - JSOp::NewObjectWithGroup explicitly indicates that we should use the
-  //   same group as the template object's group.
-  // - otherwise, if some heuristics indicate that we should use a singleton,
-  //   we set the allocation-kind to ensure this.
-  // - otherwise, we look up a group based on the allocation site, i.e., the
-  //   (script, pc) tuple.
-  if (withTemplateGroup) {
-    group = baseObject->getGroup(cx, baseObject);
-  } else if (ObjectGroup::useSingletonForAllocationSite(script, pc,
-                                                        JSProto_Object)) {
-    newKind = SingletonObject;
-  } else {
-    group = ObjectGroup::allocationSiteGroup(cx, script, pc, JSProto_Object);
-    if (!group) {
-      return nullptr;
-    }
-
-    {
-      AutoSweepObjectGroup sweep(group);
-      if (group->maybePreliminaryObjects(sweep)) {
-        group->maybePreliminaryObjects(sweep)->maybeAnalyze(cx, group);
-      }
-
-      if (group->shouldPreTenure(sweep) ||
-          group->maybePreliminaryObjects(sweep)) {
-        newKind = TenuredObject;
-      }
-    }
-  }
 
-  RootedPlainObject obj(cx);
-
-  // Actually allocate the object.
-  if (withTemplate) {
-    obj = CopyInitializerObject(cx, baseObject, newKind);
-  } else {
-    MOZ_ASSERT(JSOp(*pc) == JSOp::NewInit);
-    obj = NewBuiltinClassInstanceWithKind<PlainObject>(cx, newKind);
-  }
-
-  if (!obj) {
-    return nullptr;
-  }
-
-  if (newKind == SingletonObject) {
-    MOZ_ASSERT(obj->isSingleton());
-  } else {
-    obj->setGroup(group);
-
-    if (!withTemplateGroup) {
-      AutoSweepObjectGroup sweep(group);
-      if (PreliminaryObjectArray* preliminaryObjects =
-              group->maybePreliminaryObjects(sweep)) {
-        preliminaryObjects->registerNewObject(obj);
-      }
-    }
+  // Extract the template object, if one exists, and copy it.
+  if (JSOp(*pc) == JSOp::NewObject) {
+    RootedPlainObject baseObject(cx, &script->getObject(pc)->as<PlainObject>());
+    return CopyInitializerObject(cx, baseObject, newKind);
   }
 
-  return obj;
+  MOZ_ASSERT(JSOp(*pc) == JSOp::NewInit);
+  return NewBuiltinClassInstanceWithKind<PlainObject>(cx, newKind);
 }
 
+// TODO(no-TI): try to merge with NewObjectOperation. We can't remove the
+// setGroup call yet because CreateThisWithTemplate also calls this.
 JSObject* js::NewObjectOperationWithTemplate(JSContext* cx,
                                              HandleObject templateObject) {
   // This is an optimized version of NewObjectOperation for use when the
@@ -5482,13 +5145,7 @@
   MOZ_ASSERT(!templateObject->isSingleton());
   MOZ_ASSERT(cx->realm() == templateObject->nonCCWRealm());
 
-  NewObjectKind newKind;
-  {
-    ObjectGroup* group = templateObject->group();
-    AutoSweepObjectGroup sweep(group);
-    newKind = group->shouldPreTenure(sweep) ? TenuredObject : GenericObject;
-  }
-
+  NewObjectKind newKind = GenericObject;
   JSObject* obj =
       CopyInitializerObject(cx, templateObject.as<PlainObject>(), newKind);
   if (!obj) {
@@ -5516,70 +5173,17 @@
   MOZ_ASSERT(JSOp(*pc) == JSOp::NewArray);
   MOZ_ASSERT(newKind != SingletonObject);
 
-  RootedObjectGroup group(cx);
-  if (ObjectGroup::useSingletonForAllocationSite(script, pc, JSProto_Array)) {
-    newKind = SingletonObject;
-  } else {
-    group = ObjectGroup::allocationSiteGroup(cx, script, pc, JSProto_Array);
-    if (!group) {
-      return nullptr;
-    }
-
-    AutoSweepObjectGroup sweep(group);
-    if (group->shouldPreTenure(sweep)) {
-      newKind = TenuredObject;
-    }
-  }
-
-  ArrayObject* obj = NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
-  if (!obj) {
-    return nullptr;
-  }
-
-  if (newKind == SingletonObject) {
-    MOZ_ASSERT(obj->isSingleton());
-  } else {
-    obj->setGroup(group);
-  }
-
-  return obj;
+  return NewDenseFullyAllocatedArray(cx, length, nullptr, newKind);
 }
 
+// TODO(no-TI): try to merge with NewArrayOperation.
 ArrayObject* js::NewArrayOperationWithTemplate(JSContext* cx,
                                                HandleObject templateObject) {
   MOZ_ASSERT(!templateObject->isSingleton());
 
-  NewObjectKind newKind;
-  {
-    AutoSweepObjectGroup sweep(templateObject->group());
-    newKind = templateObject->group()->shouldPreTenure(sweep) ? TenuredObject
-                                                              : GenericObject;
-  }
-
-  ArrayObject* obj = NewDenseFullyAllocatedArray(
+  NewObjectKind newKind = GenericObject;
+  return NewDenseFullyAllocatedArray(
       cx, templateObject->as<ArrayObject>().length(), nullptr, newKind);
-  if (!obj) {
-    return nullptr;
-  }
-
-  MOZ_ASSERT(obj->lastProperty() ==
-             templateObject->as<ArrayObject>().lastProperty());
-  obj->setGroup(templateObject->group());
-  return obj;
-}
-
-ArrayObject* js::NewArrayCopyOnWriteOperation(JSContext* cx,
-                                              HandleScript script,
-                                              jsbytecode* pc) {
-  MOZ_ASSERT(JSOp(*pc) == JSOp::NewArrayCopyOnWrite);
-
-  RootedArrayObject baseobj(
-      cx, ObjectGroup::getOrFixupCopyOnWriteObject(cx, script, pc));
-  if (!baseobj) {
-    return nullptr;
-  }
-
-  return NewDenseCopyOnWriteArray(cx, baseobj);
 }
 
 void js::ReportRuntimeLexicalError(JSContext* cx, unsigned errorNumber,
diff -Nru firefox-84.0.2+build1/js/src/vm/Interpreter.h firefox-85.0+build1/js/src/vm/Interpreter.h
--- firefox-84.0.2+build1/js/src/vm/Interpreter.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Interpreter.h	2021-01-18 19:58:16.000000000 +0000
@@ -20,6 +20,7 @@
 
 namespace js {
 
+class WithScope;
 class EnvironmentIter;
 class PlainObject;
 
@@ -504,9 +505,6 @@
 bool GetProperty(JSContext* cx, HandleValue value, HandlePropertyName name,
                  MutableHandleValue vp);
 
-bool GetValueProperty(JSContext* cx, HandleValue value, HandlePropertyName name,
-                      MutableHandleValue vp);
-
 JSObject* Lambda(JSContext* cx, HandleFunction fun, HandleObject parent);
 
 JSObject* LambdaArrow(JSContext* cx, HandleFunction fun, HandleObject parent,
@@ -518,12 +516,6 @@
 bool SetObjectElementWithReceiver(JSContext* cx, HandleObject obj,
                                   HandleValue index, HandleValue value,
                                   HandleValue receiver, bool strict);
-bool SetObjectElement(JSContext* cx, HandleObject obj, HandleValue index,
-                      HandleValue value, HandleValue receiver, bool strict,
-                      HandleScript script, jsbytecode* pc);
-
-bool InitElementArray(JSContext* cx, jsbytecode* pc, HandleArrayObject arr,
-                      uint32_t index, HandleValue value);
 
 bool AddValues(JSContext* cx, MutableHandleValue lhs, MutableHandleValue rhs,
                MutableHandleValue res);
@@ -587,15 +579,6 @@
 
 JSObject* BindVarOperation(JSContext* cx, JSObject* envChain);
 
-bool DefVarOperation(JSContext* cx, HandleObject envChain, HandleScript script,
-                     jsbytecode* pc);
-
-bool DefLexicalOperation(JSContext* cx, HandleObject envChain,
-                         HandleScript script, jsbytecode* pc);
-
-bool DefFunOperation(JSContext* cx, HandleScript script, HandleObject envChain,
-                     HandleFunction funArg);
-
 JSObject* SingletonObjectLiteralOperation(JSContext* cx, HandleScript script,
                                           jsbytecode* pc);
 
@@ -649,9 +632,6 @@
 ArrayObject* NewArrayOperationWithTemplate(JSContext* cx,
                                            HandleObject templateObject);
 
-ArrayObject* NewArrayCopyOnWriteOperation(JSContext* cx, HandleScript script,
-                                          jsbytecode* pc);
-
 MOZ_MUST_USE bool GetImportOperation(JSContext* cx, HandleObject envChain,
                                      HandleScript script, jsbytecode* pc,
                                      MutableHandleValue vp);
@@ -670,7 +650,7 @@
 
 // The parser only reports redeclarations that occurs within a single
 // script. Due to the extensibility of the global lexical scope, we also check
-// for redeclarations during runtime in JSOp::Def{Var,Let,Const}.
+// for redeclarations during runtime in JSOp::GlobalOrEvalDeclInstantation.
 void ReportRuntimeRedeclaration(JSContext* cx, HandlePropertyName name,
                                 const char* redeclKind);
 
diff -Nru firefox-84.0.2+build1/js/src/vm/Interpreter-inl.h firefox-85.0+build1/js/src/vm/Interpreter-inl.h
--- firefox-84.0.2+build1/js/src/vm/Interpreter-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Interpreter-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -311,19 +311,18 @@
 }
 
 inline void InitGlobalLexicalOperation(JSContext* cx,
-                                       LexicalEnvironmentObject* lexicalEnvArg,
+                                       LexicalEnvironmentObject* lexicalEnv,
                                        JSScript* script, jsbytecode* pc,
                                        HandleValue value) {
   MOZ_ASSERT_IF(!script->hasNonSyntacticScope(),
-                lexicalEnvArg == &cx->global()->lexicalEnvironment());
+                lexicalEnv == &cx->global()->lexicalEnvironment());
   MOZ_ASSERT(JSOp(*pc) == JSOp::InitGLexical);
-  Rooted<LexicalEnvironmentObject*> lexicalEnv(cx, lexicalEnvArg);
-  RootedShape shape(cx, lexicalEnv->lookup(cx, script->getName(pc)));
+
+  Shape* shape = lexicalEnv->lookup(cx, script->getName(pc));
   MOZ_ASSERT(shape);
   MOZ_ASSERT(IsUninitializedLexical(lexicalEnv->getSlot(shape->slot())));
 
-  // Don't treat the initial assignment to global lexicals as overwrites.
-  lexicalEnv->setSlotWithType(cx, shape, value, /* overwriting = */ false);
+  lexicalEnv->setSlot(shape->slot(), value);
 }
 
 inline bool InitPropertyOperation(JSContext* cx, JSOp op, HandleObject obj,
@@ -412,10 +411,8 @@
 static MOZ_ALWAYS_INLINE bool GetObjectElementOperation(
     JSContext* cx, JSOp op, JS::HandleObject obj, JS::HandleValue receiver,
     HandleValue key, MutableHandleValue res) {
-  MOZ_ASSERT(op == JSOp::GetElem || op == JSOp::CallElem ||
-             op == JSOp::GetElemSuper);
-  MOZ_ASSERT_IF(op == JSOp::GetElem || op == JSOp::CallElem,
-                obj == &receiver.toObject());
+  MOZ_ASSERT(op == JSOp::GetElem || op == JSOp::GetElemSuper);
+  MOZ_ASSERT_IF(op == JSOp::GetElem, obj == &receiver.toObject());
 
   do {
     uint32_t index;
@@ -462,10 +459,8 @@
 }
 
 static MOZ_ALWAYS_INLINE bool GetPrimitiveElementOperation(
-    JSContext* cx, JSOp op, JS::HandleValue receiver, int receiverIndex,
-    HandleValue key, MutableHandleValue res) {
-  MOZ_ASSERT(op == JSOp::GetElem || op == JSOp::CallElem);
-
+    JSContext* cx, JS::HandleValue receiver, int receiverIndex, HandleValue key,
+    MutableHandleValue res) {
   // FIXME: Bug 1234324 We shouldn't be boxing here.
   RootedObject boxed(
       cx, ToObjectFromStackForPropertyAccess(cx, receiver, receiverIndex, key));
@@ -517,17 +512,14 @@
   return true;
 }
 
-static MOZ_ALWAYS_INLINE bool GetElemOptimizedArguments(
+static MOZ_ALWAYS_INLINE bool MaybeGetElemOptimizedArguments(
     JSContext* cx, AbstractFramePtr frame, MutableHandleValue lref,
-    HandleValue rref, MutableHandleValue res, bool* done) {
-  MOZ_ASSERT(!*done);
-
+    HandleValue rref, MutableHandleValue res) {
   if (IsOptimizedArguments(frame, lref)) {
     if (rref.isInt32()) {
       int32_t i = rref.toInt32();
       if (i >= 0 && uint32_t(i) < frame.numActualArgs()) {
         res.set(frame.unaliasedActual(i));
-        *done = true;
         return true;
       }
     }
@@ -538,14 +530,12 @@
     lref.set(ObjectValue(frame.argsObj()));
   }
 
-  return true;
+  return false;
 }
 
 static MOZ_ALWAYS_INLINE bool GetElementOperationWithStackIndex(
-    JSContext* cx, JSOp op, HandleValue lref, int lrefIndex, HandleValue rref,
+    JSContext* cx, HandleValue lref, int lrefIndex, HandleValue rref,
     MutableHandleValue res) {
-  MOZ_ASSERT(op == JSOp::GetElem || op == JSOp::CallElem);
-
   uint32_t index;
   if (lref.isString() && IsDefinitelyIndex(rref, &index)) {
     JSString* str = lref.toString();
@@ -561,21 +551,21 @@
 
   if (lref.isPrimitive()) {
     RootedValue thisv(cx, lref);
-    return GetPrimitiveElementOperation(cx, op, thisv, lrefIndex, rref, res);
+    return GetPrimitiveElementOperation(cx, thisv, lrefIndex, rref, res);
   }
 
   RootedObject obj(cx, &lref.toObject());
   RootedValue thisv(cx, lref);
-  return GetObjectElementOperation(cx, op, obj, thisv, rref, res);
+  return GetObjectElementOperation(cx, JSOp::GetElem, obj, thisv, rref, res);
 }
 
 // Wrapper for callVM from JIT.
-static MOZ_ALWAYS_INLINE bool GetElementOperation(JSContext* cx, JSOp op,
+static MOZ_ALWAYS_INLINE bool GetElementOperation(JSContext* cx,
                                                   HandleValue lref,
                                                   HandleValue rref,
                                                   MutableHandleValue res) {
-  return GetElementOperationWithStackIndex(cx, op, lref, JSDVG_SEARCH_STACK,
-                                           rref, res);
+  return GetElementOperationWithStackIndex(cx, lref, JSDVG_SEARCH_STACK, rref,
+                                           res);
 }
 
 static MOZ_ALWAYS_INLINE JSString* TypeOfOperation(const Value& v,
@@ -632,22 +622,9 @@
   return false;
 }
 
-static MOZ_ALWAYS_INLINE bool InitArrayElemOperation(JSContext* cx,
-                                                     jsbytecode* pc,
-                                                     HandleArrayObject arr,
-                                                     uint32_t index,
-                                                     HandleValue val) {
-  JSOp op = JSOp(*pc);
-  MOZ_ASSERT(op == JSOp::InitElemArray || op == JSOp::InitElemInc);
-
-  // The JITs depend on InitElemArray's index not exceeding the dense element
-  // capacity. Furthermore, the dense elements must have been initialized up to
-  // that index.
-  MOZ_ASSERT_IF(op == JSOp::InitElemArray, index < arr->getDenseCapacity());
-  MOZ_ASSERT_IF(op == JSOp::InitElemArray,
-                index == arr->getDenseInitializedLength());
-
-  if (op == JSOp::InitElemInc && index == INT32_MAX) {
+inline bool InitElemIncOperation(JSContext* cx, HandleArrayObject arr,
+                                 uint32_t index, HandleValue val) {
+  if (index == INT32_MAX) {
     JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
                               JSMSG_SPREAD_TOO_LARGE);
     return false;
@@ -655,22 +632,10 @@
 
   // If val is a hole, do not call DefineDataElement.
   if (val.isMagic(JS_ELEMENTS_HOLE)) {
-    if (op == JSOp::InitElemInc) {
-      // Always call SetLengthProperty even if this is not the last element
-      // initialiser, because this may be followed by a SpreadElement loop,
-      // which will not set the array length if nothing is spread.
-      return SetLengthProperty(cx, arr, index + 1);
-    }
-
-    MOZ_ASSERT(op == JSOp::InitElemArray);
-
-    // The length will have already been set by the earlier JSOp::NewArray;
-    // JSOp::InitElemArray cannot follow SpreadElements. Bump the initialized
-    // length and store the hole value to ensure the index == initLength
-    // invariant holds for later InitArrayElem ops.
-    arr->ensureDenseInitializedLength(cx, index, 1);
-    arr->setDenseElementHole(cx, index);
-    return true;
+    // Always call SetLengthProperty even if this is not the last element
+    // initialiser, because this may be followed by a SpreadElement loop,
+    // which will not set the array length if nothing is spread.
+    return SetLengthProperty(cx, arr, index + 1);
   }
 
   return DefineDataElement(cx, arr, index, val, JSPROP_ENUMERATE);
diff -Nru firefox-84.0.2+build1/js/src/vm/Iteration.cpp firefox-85.0+build1/js/src/vm/Iteration.cpp
--- firefox-84.0.2+build1/js/src/vm/Iteration.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Iteration.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -29,6 +29,7 @@
 #include "js/friend/ErrorMessages.h"  // js::GetErrorMessage, JSMSG_*
 #include "js/PropertySpec.h"
 #include "js/Proxy.h"
+#include "util/DifferentialTesting.h"
 #include "util/Poison.h"
 #include "vm/BytecodeUtil.h"
 #include "vm/GlobalObject.h"
@@ -375,14 +376,17 @@
   return true;
 }
 
-#ifdef JS_MORE_DETERMINISTIC
+#ifdef DEBUG
 
 struct SortComparatorIds {
   JSContext* const cx;
 
-  SortComparatorIds(JSContext* cx) : cx(cx) {}
+  explicit SortComparatorIds(JSContext* cx) : cx(cx) {}
+
+  bool operator()(jsid aArg, jsid bArg, bool* lessOrEqualp) {
+    RootedId a(cx, aArg);
+    RootedId b(cx, bArg);
 
-  bool operator()(jsid a, jsid b, bool* lessOrEqualp) {
     // Pick an arbitrary order on jsids that is as stable as possible
     // across executions.
     if (a == b) {
@@ -390,8 +394,8 @@
       return true;
     }
 
-    size_t ta = JSID_BITS(a) & JSID_TYPE_MASK;
-    size_t tb = JSID_BITS(b) & JSID_TYPE_MASK;
+    size_t ta = JSID_BITS(a.get()) & JSID_TYPE_MASK;
+    size_t tb = JSID_BITS(b.get()) & JSID_TYPE_MASK;
     if (ta != tb) {
       *lessOrEqualp = (ta <= tb);
       return true;
@@ -444,7 +448,7 @@
   }
 };
 
-#endif /* JS_MORE_DETERMINISTIC */
+#endif /* DEBUG */
 
 static bool Snapshot(JSContext* cx, HandleObject pobj_, unsigned flags,
                      MutableHandleIdVector props) {
@@ -514,37 +518,37 @@
     }
   } while (pobj != nullptr);
 
-#ifdef JS_MORE_DETERMINISTIC
-
-  /*
-   * In some cases the enumeration order for an object depends on the
-   * execution mode (interpreter vs. JIT), especially for native objects
-   * with a class enumerate hook (where resolving a property changes the
-   * resulting enumeration order). These aren't really bugs, but the
-   * differences can change the generated output and confuse correctness
-   * fuzzers, so we sort the ids if such a fuzzer is running.
-   *
-   * We don't do this in the general case because (a) doing so is slow,
-   * and (b) it also breaks the web, which expects enumeration order to
-   * follow the order in which properties are added, in certain cases.
-   * Since ECMA does not specify an enumeration order for objects, both
-   * behaviors are technically correct to do.
-   */
+#ifdef DEBUG
+  if (js::SupportDifferentialTesting()) {
+    /*
+     * In some cases the enumeration order for an object depends on the
+     * execution mode (interpreter vs. JIT), especially for native objects
+     * with a class enumerate hook (where resolving a property changes the
+     * resulting enumeration order). These aren't really bugs, but the
+     * differences can change the generated output and confuse correctness
+     * fuzzers, so we sort the ids if such a fuzzer is running.
+     *
+     * We don't do this in the general case because (a) doing so is slow,
+     * and (b) it also breaks the web, which expects enumeration order to
+     * follow the order in which properties are added, in certain cases.
+     * Since ECMA does not specify an enumeration order for objects, both
+     * behaviors are technically correct to do.
+     */
 
-  jsid* ids = props.begin();
-  size_t n = props.length();
+    jsid* ids = props.begin();
+    size_t n = props.length();
 
-  RootedIdVector tmp(cx);
-  if (!tmp.resize(n)) {
-    return false;
-  }
-  PodCopy(tmp.begin(), ids, n);
+    RootedIdVector tmp(cx);
+    if (!tmp.resize(n)) {
+      return false;
+    }
+    PodCopy(tmp.begin(), ids, n);
 
-  if (!MergeSort(ids, n, tmp.begin(), SortComparatorIds(cx))) {
-    return false;
+    if (!MergeSort(ids, n, tmp.begin(), SortComparatorIds(cx))) {
+      return false;
+    }
   }
-
-#endif /* JS_MORE_DETERMINISTIC */
+#endif
 
   return true;
 }
@@ -935,13 +939,6 @@
     return nullptr;
   }
 
-  if (IsTypeInferenceEnabled()) {
-    if (obj->isSingleton() && !JSObject::setIteratedSingleton(cx, obj)) {
-      return nullptr;
-    }
-    MarkObjectGroupFlags(cx, obj, OBJECT_FLAG_ITERATED);
-  }
-
   // If the object has dense elements, mark the dense elements as
   // maybe-in-iteration.
   //
@@ -954,9 +951,7 @@
   // is set correctly.
   if (obj->is<NativeObject>() &&
       obj->as<NativeObject>().getDenseInitializedLength() > 0) {
-    if (!obj->as<NativeObject>().markDenseElementsMaybeInIteration(cx)) {
-      return nullptr;
-    }
+    obj->as<NativeObject>().markDenseElementsMaybeInIteration();
   }
 
   PropertyIteratorObject* iterobj =
@@ -1056,16 +1051,6 @@
     return nullptr;
   }
 
-  // Create a new group for the template.
-  Rooted<TaggedProto> proto(cx, templateObject->taggedProto());
-  RootedObjectGroup group(
-      cx, ObjectGroupRealm::makeGroup(cx, templateObject->realm(),
-                                      templateObject->getClass(), proto));
-  if (!group) {
-    return nullptr;
-  }
-  templateObject->setGroup(group);
-
   // Set dummy `value` property
   if (!NativeDefineDataProperty(cx, templateObject, cx->names().value,
                                 UndefinedHandleValue, JSPROP_ENUMERATE)) {
@@ -1078,18 +1063,6 @@
     return nullptr;
   }
 
-  AutoSweepObjectGroup sweep(group);
-  if (!group->unknownProperties(sweep)) {
-    // Update `value` property typeset, since it can be any value.
-    HeapTypeSet* types =
-        group->maybeGetProperty(sweep, NameToId(cx->names().value));
-    MOZ_ASSERT(types);
-    {
-      AutoEnterAnalysis enter(cx);
-      types->makeUnknown(sweep, cx);
-    }
-  }
-
   // Make sure that the properties are in the right slots.
   DebugOnly<Shape*> shape = templateObject->lastProperty();
   MOZ_ASSERT(shape->previous()->slot() == Realm::IterResultObjectValueSlot &&
diff -Nru firefox-84.0.2+build1/js/src/vm/JSContext.cpp firefox-85.0+build1/js/src/vm/JSContext.cpp
--- firefox-84.0.2+build1/js/src/vm/JSContext.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSContext.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -47,6 +47,7 @@
 #include "js/friend/StackLimits.h"    // js::ReportOverRecursed
 #include "js/Printf.h"
 #include "util/DiagnosticAssertions.h"
+#include "util/DifferentialTesting.h"
 #include "util/DoubleToString.h"
 #include "util/NativeStack.h"
 #include "util/Windows.h"
@@ -246,14 +247,14 @@
  * not occur, so GC must be avoided or suppressed.
  */
 JS_FRIEND_API void js::ReportOutOfMemory(JSContext* cx) {
-#ifdef JS_MORE_DETERMINISTIC
   /*
    * OOMs are non-deterministic, especially across different execution modes
-   * (e.g. interpreter vs JIT). In more-deterministic builds, print to stderr
+   * (e.g. interpreter vs JIT). When doing differential testing, print to stderr
    * so that the fuzzers can detect this.
    */
-  fprintf(stderr, "ReportOutOfMemory called\n");
-#endif
+  if (js::SupportDifferentialTesting()) {
+    fprintf(stderr, "ReportOutOfMemory called\n");
+  }
 
   if (cx->isHelperThreadContext()) {
     return cx->addPendingOutOfMemory();
@@ -283,7 +284,6 @@
 }
 
 void js::ReportOverRecursed(JSContext* maybecx, unsigned errorNumber) {
-#ifdef JS_MORE_DETERMINISTIC
   /*
    * We cannot make stack depth deterministic across different
    * implementations (e.g. JIT vs. interpreter will differ in
@@ -292,8 +292,10 @@
    * stack depth which is useful for external testing programs
    * like fuzzers.
    */
-  fprintf(stderr, "ReportOverRecursed called\n");
-#endif
+  if (js::SupportDifferentialTesting()) {
+    fprintf(stderr, "ReportOverRecursed called\n");
+  }
+
   if (maybecx) {
     if (!maybecx->isHelperThreadContext()) {
       JS_ReportErrorNumberASCII(maybecx, GetErrorMessage, nullptr, errorNumber);
@@ -913,8 +915,6 @@
       compactingDisabledCount(this, 0),
       frontendCollectionPool_(this),
       suppressProfilerSampling(false),
-      wasmTriedToInstallSignalHandlers(false),
-      wasmHaveSignalHandlers(false),
       tempLifoAlloc_(this, (size_t)TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
       debuggerMutations(this, 0),
       ionPcScriptCache(this, nullptr),
@@ -938,7 +938,6 @@
       interruptCallbackDisabled(this, false),
       interruptBits_(0),
       inlinedICScript_(this, nullptr),
-      ionReturnOverride_(this, MagicValue(JS_ARG_POISON)),
       jitStackLimit(UINTPTR_MAX),
       jitStackLimitNoInterrupt(this, UINTPTR_MAX),
       jobQueue(this, nullptr),
@@ -1121,6 +1120,7 @@
    * added later.
    */
   return cycleDetectorVector().sizeOfExcludingThis(mallocSizeOf) +
+         wasm_.sizeOfExcludingThis(mallocSizeOf) +
          irregexp::IsolateSizeOfIncludingThis(isolate, mallocSizeOf);
 }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/JSContext.h firefox-85.0+build1/js/src/vm/JSContext.h
--- firefox-84.0.2+build1/js/src/vm/JSContext.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSContext.h	2021-01-18 19:58:16.000000000 +0000
@@ -30,6 +30,7 @@
 #include "vm/MallocProvider.h"
 #include "vm/Runtime.h"
 #include "vm/SharedStencil.h"  // js::SharedImmutableScriptDataTable
+#include "wasm/WasmContext.h"
 
 struct JS_PUBLIC_API JSContext;
 
@@ -367,9 +368,6 @@
   // For JIT use.
   static size_t offsetOfZone() { return offsetof(JSContext, zone_); }
 
-  // Zone local methods that can be used freely.
-  inline js::LifoAlloc& typeLifoAlloc();
-
   // Current global. This is only safe to use within the scope of the
   // AutoRealm from which it's called.
   inline js::Handle<js::GlobalObject*> global() const;
@@ -638,10 +636,11 @@
   void disableProfilerSampling() { suppressProfilerSampling = true; }
   void enableProfilerSampling() { suppressProfilerSampling = false; }
 
-  // Used by wasm::EnsureThreadSignalHandlers(cx) to install thread signal
-  // handlers once per JSContext/thread.
-  bool wasmTriedToInstallSignalHandlers;
-  bool wasmHaveSignalHandlers;
+ private:
+  js::wasm::Context wasm_;
+
+ public:
+  js::wasm::Context& wasm() { return wasm_; }
 
   /* Temporary arena pool used while compiling and decompiling. */
   static const size_t TEMP_LIFO_ALLOC_PRIMARY_CHUNK_SIZE = 4 * 1024;
@@ -891,34 +890,6 @@
   // object.
   js::FutexThread fx;
 
-  // In certain cases, we want to optimize certain opcodes to typed
-  // instructions, to avoid carrying an extra register to feed into an unbox.
-  // Unfortunately, that's not always possible. For example, a GetPropertyCacheT
-  // could return a typed double, but if it takes its out-of-line path, it could
-  // return an object, and trigger invalidation. The invalidation bailout will
-  // consider the return value to be a double, and create a garbage Value.
-  //
-  // To allow the GetPropertyCacheT optimization, we allow the ability for
-  // GetPropertyCache to override the return value at the top of the stack - the
-  // value that will be temporarily corrupt. This special override value is set
-  // only in callVM() targets that are about to return *and* have invalidated
-  // their callee.
-  js::ContextData<js::Value> ionReturnOverride_;
-
-  bool hasIonReturnOverride() const {
-    return !ionReturnOverride_.ref().isMagic(JS_ARG_POISON);
-  }
-  js::Value takeIonReturnOverride() {
-    js::Value v = ionReturnOverride_;
-    ionReturnOverride_ = js::MagicValue(JS_ARG_POISON);
-    return v;
-  }
-  void setIonReturnOverride(const js::Value& v) {
-    MOZ_ASSERT(!hasIonReturnOverride());
-    MOZ_ASSERT(!v.isMagic());
-    ionReturnOverride_ = v;
-  }
-
   mozilla::Atomic<uintptr_t, mozilla::Relaxed> jitStackLimit;
 
   // Like jitStackLimit, but not reset to trigger interrupts.
diff -Nru firefox-84.0.2+build1/js/src/vm/JSContext-inl.h firefox-85.0+build1/js/src/vm/JSContext-inl.h
--- firefox-84.0.2+build1/js/src/vm/JSContext-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSContext-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -191,10 +191,6 @@
     check(desc.value(), argIndex);
   }
 
-  void check(TypeSet::Type type, int argIndex) {
-    check(type.maybeCompartment(), argIndex);
-  }
-
   void check(JS::Handle<mozilla::Maybe<JS::Value>> maybe, int argIndex) {
     if (maybe.get().isSome()) {
       check(maybe.get().ref(), argIndex);
@@ -317,10 +313,6 @@
 
 } /* namespace js */
 
-inline js::LifoAlloc& JSContext::typeLifoAlloc() {
-  return zone()->types.typeLifoAlloc();
-}
-
 inline js::Nursery& JSContext::nursery() { return runtime()->gc.nursery(); }
 
 inline void JSContext::minorGC(JS::GCReason reason) {
diff -Nru firefox-84.0.2+build1/js/src/vm/JSFunction.cpp firefox-85.0+build1/js/src/vm/JSFunction.cpp
--- firefox-84.0.2+build1/js/src/vm/JSFunction.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSFunction.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -27,6 +27,7 @@
 #include "builtin/Eval.h"
 #include "builtin/Object.h"
 #include "builtin/SelfHostingDefines.h"
+#include "builtin/Symbol.h"
 #include "frontend/BytecodeCompilation.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/TokenStream.h"
@@ -46,6 +47,7 @@
 #include "util/StringBuffer.h"
 #include "vm/AsyncFunction.h"
 #include "vm/AsyncIteration.h"
+#include "vm/BooleanObject.h"
 #include "vm/FunctionFlags.h"          // js::FunctionFlags
 #include "vm/GeneratorAndAsyncKind.h"  // js::GeneratorKind, js::FunctionAsyncKind
 #include "vm/GlobalObject.h"
@@ -54,10 +56,12 @@
 #include "vm/JSContext.h"
 #include "vm/JSObject.h"
 #include "vm/JSScript.h"
+#include "vm/NumberObject.h"
 #include "vm/PlainObject.h"  // js::PlainObject
 #include "vm/SelfHosting.h"
 #include "vm/Shape.h"
 #include "vm/SharedImmutableStringsCache.h"
+#include "vm/StringObject.h"
 #include "vm/WrapperObject.h"
 #include "vm/Xdr.h"
 #include "wasm/AsmJS.h"
@@ -375,7 +379,7 @@
   }
 
   RootedPlainObject proto(
-      cx, NewSingletonObjectWithGivenProto<PlainObject>(cx, objProto));
+      cx, NewTenuredObjectWithGivenProto<PlainObject>(cx, objProto));
   if (!proto) {
     return false;
   }
@@ -550,7 +554,6 @@
     IsGenerator = 1 << 1,
     IsAsync = 1 << 2,
     IsLazy = 1 << 3,
-    HasSingletonType = 1 << 4,
   };
 
   /* NB: Keep this in sync with CloneInnerInterpretedFunction. */
@@ -573,10 +576,6 @@
       return xdr->fail(JS::TranscodeResult_Failure_NotInterpretedFun);
     }
 
-    if (fun->isSingleton()) {
-      xdrFlags |= HasSingletonType;
-    }
-
     if (fun->isGenerator()) {
       xdrFlags |= IsGenerator;
     }
@@ -601,12 +600,6 @@
     flags = FunctionFlags::clearMutableflags(fun->flags()).toRaw();
 
     atom = fun->displayAtom();
-
-    // The environment of any function which is not reused will always be
-    // null, it is later defined when a function is cloned or reused to
-    // mirror the scope chain.
-    MOZ_ASSERT_IF(fun->isSingleton() && !fun->baseScript()->hasBeenCloned(),
-                  fun->environment() == nullptr);
   }
 
   // Everything added below can substituted by the non-lazy-script version of
@@ -655,18 +648,6 @@
       return xdr->fail(JS::TranscodeResult_Throw);
     }
     objp.set(fun);
-
-    // If this function has an enclosing-scope, it is accesible by script and
-    // should use an updated ObjectGroup. Note that the singleton flag is not
-    // computed correctly until the enclosing-script has been compiled. The
-    // delazification of a script will apply types to inner functions at that
-    // time.
-    if (enclosingScope) {
-      bool singleton = (xdrFlags & HasSingletonType);
-      if (!JSFunction::setTypeForScriptedFunction(cx, fun, singleton)) {
-        return xdr->fail(JS::TranscodeResult_Throw);
-      }
-    }
   }
 
   if (xdrFlags & IsLazy) {
@@ -825,7 +806,7 @@
       cx, NewFunctionWithProto(
               cx, Function, 1, FunctionFlags::NATIVE_CTOR, nullptr,
               HandlePropertyName(cx->names().Function), functionProto,
-              gc::AllocKind::FUNCTION, SingletonObject));
+              gc::AllocKind::FUNCTION, TenuredObject));
   if (!functionCtor) {
     return nullptr;
   }
@@ -847,7 +828,7 @@
   return NewFunctionWithProto(
       cx, FunctionPrototype, 0, FunctionFlags::NATIVE_FUN, nullptr,
       HandlePropertyName(cx->names().empty), objectProto,
-      gc::AllocKind::FUNCTION, SingletonObject);
+      gc::AllocKind::FUNCTION, TenuredObject);
 }
 
 JSString* js::FunctionToStringCache::lookup(BaseScript* script) const {
@@ -2009,6 +1990,22 @@
   return scope->hasEnvironment();
 }
 
+bool JSFunction::needsCallObject() const {
+  if (isNative()) {
+    return false;
+  }
+
+  MOZ_ASSERT(hasBytecode());
+
+  // Note: this should be kept in sync with
+  // FunctionBox::needsCallObjectRegardlessOfBindings().
+  MOZ_ASSERT_IF(
+      baseScript()->funHasExtensibleScope() || isGenerator() || isAsync(),
+      nonLazyScript()->bodyScope()->hasEnvironment());
+
+  return nonLazyScript()->bodyScope()->hasEnvironment();
+}
+
 JSFunction* js::NewScriptedFunction(
     JSContext* cx, unsigned nargs, FunctionFlags flags, HandleAtom atom,
     HandleObject proto /* = nullptr */,
@@ -2123,8 +2120,7 @@
                                 HandleObject newEnclosingEnv) {
   MOZ_ASSERT(fun->isInterpreted());
 
-  if (realm != fun->realm() || fun->isSingleton() ||
-      ObjectGroup::useSingletonForClone(fun)) {
+  if (realm != fun->realm()) {
     return false;
   }
 
@@ -2168,12 +2164,6 @@
     return nullptr;
   }
 
-  // FunctionFlags::HAS_INFERRED_NAME can be set at compile-time and at
-  // runtime. In the latter case we should actually clear the flag before
-  // cloning the function, but since we can't differentiate between both
-  // cases here, we'll end up with a momentarily incorrect function name.
-  // This will be fixed up in SetFunctionName(), which should happen through
-  // JSOp::SetFunName directly after JSOp::Lambda.
   constexpr uint16_t NonCloneableFlags = FunctionFlags::EXTENDED |
                                          FunctionFlags::RESOLVED_LENGTH |
                                          FunctionFlags::RESOLVED_NAME;
@@ -2217,16 +2207,7 @@
   MOZ_ASSERT(!fun->isBoundFunction());
   MOZ_ASSERT(CanReuseScriptForClone(cx->realm(), fun, enclosingEnv));
 
-  // If an explicit prototype is present and this prototype doesn't match the
-  // original function's prototype and furthermore the original function's group
-  // has a type, then also create a type for the cloned function. This ensures
-  // derived class constructors will have a type assigned.
-  bool setTypeForFunction = proto && fun->staticPrototype() != proto &&
-                            fun->group()->maybeInterpretedFunction();
-
-  // The function needs to be tenured when used as an object group addendum.
-  NewObjectKind newKind = setTypeForFunction ? TenuredObject : GenericObject;
-
+  NewObjectKind newKind = GenericObject;
   RootedFunction clone(cx,
                        NewFunctionClone(cx, fun, newKind, allocKind, proto));
   if (!clone) {
@@ -2244,17 +2225,6 @@
     clone->initEnvironment(enclosingEnv);
   }
 
-  /*
-   * Clone the function, reusing its script. We can use the same group as
-   * the original function provided that its prototype is correct.
-   */
-  if (fun->staticPrototype() == clone->staticPrototype()) {
-    clone->setGroup(fun->group());
-  } else if (setTypeForFunction) {
-    if (!JSFunction::setTypeForScriptedFunction(cx, clone)) {
-      return nullptr;
-    }
-  }
   return clone;
 }
 
@@ -2274,7 +2244,7 @@
   }
 
   RootedFunction clone(
-      cx, NewFunctionClone(cx, fun, SingletonObject, allocKind, proto));
+      cx, NewFunctionClone(cx, fun, TenuredObject, allocKind, proto));
   if (!clone) {
     return nullptr;
   }
@@ -2330,7 +2300,6 @@
   MOZ_ASSERT(!fun->hasJitInfo());
   clone->initNative(InstantiateAsmJS, nullptr);
 
-  clone->setGroup(fun->group());
   return clone;
 }
 
@@ -2341,7 +2310,7 @@
   MOZ_ASSERT(cx->compartment() != fun->compartment());
 
   JSFunction* clone =
-      NewFunctionClone(cx, fun, SingletonObject, gc::AllocKind::FUNCTION,
+      NewFunctionClone(cx, fun, TenuredObject, gc::AllocKind::FUNCTION,
                        /* proto = */ nullptr);
   if (!clone) {
     return nullptr;
@@ -2459,14 +2428,9 @@
                          FunctionPrefixKind prefixKind) {
   MOZ_ASSERT(name.isString() || name.isSymbol() || name.isNumeric());
 
-  // `fun` is a newly created function, so normally it can't already have an
-  // inferred name. The rare exception is when `fun` was created by cloning
-  // a singleton function; see the comment in NewFunctionClone. In that case,
-  // the inferred name is bogus, so clear it out.
-  if (fun->hasInferredName()) {
-    MOZ_ASSERT(fun->isSingleton());
-    fun->clearInferredName();
-  }
+  // `fun` is a newly created function, so it can't already have an inferred
+  // name.
+  MOZ_ASSERT(!fun->hasInferredName());
 
   // Anonymous functions should neither have an own 'name' property nor a
   // resolved name at this point.
diff -Nru firefox-84.0.2+build1/js/src/vm/JSFunction.h firefox-85.0+build1/js/src/vm/JSFunction.h
--- firefox-84.0.2+build1/js/src/vm/JSFunction.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSFunction.h	2021-01-18 19:58:16.000000000 +0000
@@ -107,9 +107,6 @@
   //   d. HAS_GUESSED_ATOM and HAS_INFERRED_NAME cannot both be set.
   //   e. `atom_` can be null if neither an explicit, nor inferred, nor a
   //      guessed name was set.
-  //   f. HAS_INFERRED_NAME can be set for cloned singleton function, even
-  //      though the clone shouldn't receive an inferred name. See the
-  //      comments in NewFunctionClone() and SetFunctionName() for details.
   //
   // 2. If the function is a bound function:
   //   a. To store the initial value of the "name" property.
@@ -137,21 +134,7 @@
       js::HandleShape shape, js::HandleObjectGroup group);
 
   /* Call objects must be created for each invocation of this function. */
-  bool needsCallObject() const {
-    if (isNative()) {
-      return false;
-    }
-
-    MOZ_ASSERT(hasBytecode());
-
-    // Note: this should be kept in sync with
-    // FunctionBox::needsCallObjectRegardlessOfBindings().
-    MOZ_ASSERT_IF(
-        baseScript()->funHasExtensibleScope() || isGenerator() || isAsync(),
-        nonLazyScript()->bodyScope()->hasEnvironment());
-
-    return nonLazyScript()->bodyScope()->hasEnvironment();
-  }
+  bool needsCallObject() const;
 
   bool needsExtraBodyVarEnvironment() const;
   bool needsNamedLambdaEnvironment() const;
@@ -294,10 +277,6 @@
   void setResolvedLength() { flags_.setResolvedLength(); }
   void setResolvedName() { flags_.setResolvedName(); }
 
-  // Mark a function as having its 'new' script information cleared.
-  bool wasNewScriptCleared() const { return flags_.wasNewScriptCleared(); }
-  void setNewScriptCleared() { flags_.setNewScriptCleared(); }
-
   static bool getUnresolvedLength(JSContext* cx, js::HandleFunction fun,
                                   js::MutableHandleValue v);
 
@@ -336,12 +315,6 @@
     setAtom(atom);
     flags_.setInferredName();
   }
-  void clearInferredName() {
-    MOZ_ASSERT(hasInferredName());
-    MOZ_ASSERT(atom_);
-    setAtom(nullptr);
-    flags_.clearInferredName();
-  }
   JSAtom* inferredName() const {
     MOZ_ASSERT(hasInferredName());
     MOZ_ASSERT(atom_);
@@ -460,7 +433,7 @@
   bool isIncomplete() const { return isInterpreted() && !u.scripted.s.script_; }
 
   JSScript* nonLazyScript() const {
-    MOZ_ASSERT(hasBaseScript());
+    MOZ_ASSERT(hasBytecode());
     MOZ_ASSERT(u.scripted.s.script_);
     return static_cast<JSScript*>(u.scripted.s.script_);
   }
@@ -688,10 +661,6 @@
   inline const js::FunctionExtended* toExtendedOffMainThread() const;
   inline const js::Value& getExtendedSlotOffMainThread(size_t which) const;
 
-  /* Constructs a new type for the function if necessary. */
-  static bool setTypeForScriptedFunction(JSContext* cx, js::HandleFunction fun,
-                                         bool singleton = false);
-
   /* GC support. */
   js::gc::AllocKind getAllocKind() const {
     static_assert(
@@ -735,11 +704,11 @@
     NewObjectKind newKind = GenericObject);
 
 // Allocate a new function backed by a JSNative.  Note that by default this
-// creates a singleton object.
+// creates a tenured object.
 inline JSFunction* NewNativeFunction(
     JSContext* cx, JSNative native, unsigned nargs, HandleAtom atom,
     gc::AllocKind allocKind = gc::AllocKind::FUNCTION,
-    NewObjectKind newKind = SingletonObject,
+    NewObjectKind newKind = TenuredObject,
     FunctionFlags flags = FunctionFlags::NATIVE_FUN) {
   MOZ_ASSERT(native);
   return NewFunctionWithProto(cx, native, nargs, flags, nullptr, atom, nullptr,
@@ -747,11 +716,11 @@
 }
 
 // Allocate a new constructor backed by a JSNative.  Note that by default this
-// creates a singleton object.
+// creates a tenured object.
 inline JSFunction* NewNativeConstructor(
     JSContext* cx, JSNative native, unsigned nargs, HandleAtom atom,
     gc::AllocKind allocKind = gc::AllocKind::FUNCTION,
-    NewObjectKind newKind = SingletonObject,
+    NewObjectKind newKind = TenuredObject,
     FunctionFlags flags = FunctionFlags::NATIVE_CTOR) {
   MOZ_ASSERT(native);
   MOZ_ASSERT(flags.isNativeConstructor());
@@ -834,6 +803,9 @@
   // asm.js module functions store their WasmModuleObject in the first slot.
   static const unsigned ASMJS_MODULE_SLOT = 0;
 
+  // Async module callback handlers store their ModuleObject in the first slot.
+  static const unsigned MODULE_SLOT = 0;
+
   static inline size_t offsetOfExtendedSlot(unsigned which) {
     MOZ_ASSERT(which < NUM_EXTENDED_SLOTS);
     return offsetof(FunctionExtended, extendedSlots) +
@@ -864,7 +836,6 @@
                                             gc::AllocKind kind,
                                             HandleObject proto);
 
-// Functions whose scripts are cloned are always given singleton types.
 extern JSFunction* CloneFunctionAndScript(
     JSContext* cx, HandleFunction fun, HandleObject enclosingEnv,
     HandleScope newScope, Handle<ScriptSourceObject*> sourceObject,
@@ -874,9 +845,6 @@
 
 extern JSFunction* CloneSelfHostingIntrinsic(JSContext* cx, HandleFunction fun);
 
-extern bool SetPrototypeForClonedFunction(JSContext* cx, HandleFunction fun,
-                                          HandleObject proto);
-
 }  // namespace js
 
 inline js::FunctionExtended* JSFunction::toExtended() {
diff -Nru firefox-84.0.2+build1/js/src/vm/JSFunction-inl.h firefox-85.0+build1/js/src/vm/JSFunction-inl.h
--- firefox-84.0.2+build1/js/src/vm/JSFunction-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSFunction-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -28,60 +28,17 @@
   return js_anonymous_str;
 }
 
-inline bool CanReuseFunctionForClone(JSContext* cx, HandleFunction fun) {
-  if (!fun->isSingleton()) {
-    return false;
-  }
-
-  if (fun->baseScript()->hasBeenCloned()) {
-    return false;
-  }
-  fun->baseScript()->setHasBeenCloned();
-
-  return true;
-}
-
-inline JSFunction* CloneFunctionObjectIfNotSingleton(
-    JSContext* cx, HandleFunction fun, HandleObject enclosingEnv,
-    HandleObject proto = nullptr) {
-  /*
-   * For attempts to clone functions at a function definition opcode,
-   * try to avoid the the clone if the function has singleton type. This
-   * was called pessimistically, and we need to preserve the type's
-   * property that if it is singleton there is only a single object
-   * with its type in existence.
-   *
-   * For functions inner to run once lambda, it may be possible that
-   * the lambda runs multiple times and we repeatedly clone it. In these
-   * cases, fall through to CloneFunctionObject, which will deep clone
-   * the function's script.
-   */
-  if (CanReuseFunctionForClone(cx, fun)) {
-    if (proto && !SetPrototypeForClonedFunction(cx, fun, proto)) {
-      return nullptr;
-    }
-    fun->setEnvironment(enclosingEnv);
-    return fun;
-  }
-
+inline JSFunction* CloneFunctionObject(JSContext* cx, HandleFunction fun,
+                                       HandleObject enclosingEnv,
+                                       HandleObject proto = nullptr) {
   // These intermediate variables are needed to avoid link errors on some
   // platforms.  Sigh.
   gc::AllocKind finalizeKind = gc::AllocKind::FUNCTION;
   gc::AllocKind extendedFinalizeKind = gc::AllocKind::FUNCTION_EXTENDED;
   gc::AllocKind kind = fun->isExtended() ? extendedFinalizeKind : finalizeKind;
 
-  if (CanReuseScriptForClone(cx->realm(), fun, enclosingEnv)) {
-    return CloneFunctionReuseScript(cx, fun, enclosingEnv, kind, proto);
-  }
-
-  RootedScript script(cx, JSFunction::getOrCreateScript(cx, fun));
-  if (!script) {
-    return nullptr;
-  }
-  RootedScope enclosingScope(cx, script->enclosingScope());
-  Rooted<ScriptSourceObject*> sourceObject(cx, script->sourceObject());
-  return CloneFunctionAndScript(cx, fun, enclosingEnv, enclosingScope,
-                                sourceObject, kind, proto);
+  MOZ_ASSERT(CanReuseScriptForClone(cx->realm(), fun, enclosingEnv));
+  return CloneFunctionReuseScript(cx, fun, enclosingEnv, kind, proto);
 }
 
 } /* namespace js */
diff -Nru firefox-84.0.2+build1/js/src/vm/JSObject.cpp firefox-85.0+build1/js/src/vm/JSObject.cpp
--- firefox-84.0.2+build1/js/src/vm/JSObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -76,13 +76,11 @@
 #include "vm/JSFunction-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/NumberObject-inl.h"
-#include "vm/ObjectGroup-inl.h"
 #include "vm/PlainObject-inl.h"  // js::CopyInitializerObject
 #include "vm/Realm-inl.h"
 #include "vm/Shape-inl.h"
 #include "vm/StringObject-inl.h"
 #include "vm/TypedArrayObject-inl.h"
-#include "vm/TypeInference-inl.h"
 #include "wasm/TypedObject-inl.h"
 
 using namespace js;
@@ -550,11 +548,6 @@
       if (!isPrivate) {
         child.setAttrs(child.attrs() |
                        GetSealedOrFrozenAttributes(child.attrs(), level));
-
-        if (!JSID_IS_EMPTY(child.get().propid) &&
-            level == IntegrityLevel::Frozen) {
-          MarkTypePropertyNonWritable(cx, nobj, child.get().propid);
-        }
       }
 
       last = cx->zone()->propertyTree().getChild(cx, last, child);
@@ -569,7 +562,6 @@
     // Ordinarily ArraySetLength handles this, but we're going behind its back
     // right now, so we must do this manually.
     if (level == IntegrityLevel::Frozen && obj->is<ArrayObject>()) {
-      MOZ_ASSERT(!nobj->denseElementsAreCopyOnWrite());
       obj->as<ArrayObject>().setNonWritableLength(cx);
     }
   } else {
@@ -950,8 +942,7 @@
     return false;
   }
 
-  AutoSweepObjectGroup sweep(group);
-  return !group->newScript(sweep) || group->newScript(sweep)->analyzed();
+  return true;
 }
 
 /*
@@ -998,30 +989,11 @@
   gc::AllocKind allocKind = NewObjectGCKind(&PlainObject::class_);
   NewObjectKind newKind = GenericObject;
 
-  jsbytecode* pc = nullptr;
-  RootedScript script(cx);
-  if (IsTypeInferenceEnabled()) {
-    script = cx->currentScript(&pc);
-  }
-
-  if (script &&
-      ObjectGroup::useSingletonForAllocationSite(script, pc, JSProto_Object)) {
-    newKind = SingletonObject;
-  }
-  RootedObject obj(
-      cx, NewBuiltinClassInstance<PlainObject>(cx, allocKind, newKind));
+  JSObject* obj = NewBuiltinClassInstance<PlainObject>(cx, allocKind, newKind);
   if (!obj) {
     return false;
   }
 
-  if (script) {
-    /* Try to specialize the group of the object to the scripted call site. */
-    if (!ObjectGroup::setAllocationSiteObjectGroup(
-            cx, script, pc, obj, newKind == SingletonObject)) {
-      return false;
-    }
-  }
-
   pobj.set(obj);
   return true;
 }
@@ -1240,14 +1212,8 @@
       }
     }
 
-    ObjectGroup::NewArrayKind arrayKind = ObjectGroup::NewArrayKind::Normal;
-    if (obj->is<ArrayObject>() &&
-        obj->as<ArrayObject>().denseElementsAreCopyOnWrite()) {
-      arrayKind = ObjectGroup::NewArrayKind::CopyOnWrite;
-    }
-
-    return ObjectGroup::newArrayObject(cx, values.begin(), values.length(),
-                                       TenuredObject, arrayKind);
+    return NewDenseCopiedArray(cx, values.length(), values.begin(),
+                               /* proto = */ nullptr, TenuredObject);
   }
 
   Rooted<IdValueVector> properties(cx, IdValueVector(cx));
@@ -1262,9 +1228,10 @@
     }
   }
 
-  NewObjectKind newKind = obj->isSingleton() ? SingletonObject : TenuredObject;
-  return ObjectGroup::newPlainObject(cx, properties.begin(),
-                                     properties.length(), newKind);
+  MOZ_ASSERT(!obj->isSingleton());
+
+  return NewPlainObjectWithProperties(cx, properties.begin(),
+                                      properties.length(), TenuredObject);
 }
 
 static bool InitializePropertiesFromCompatibleNativeObject(
@@ -1378,19 +1345,9 @@
       MOZ_TRY(XDRScriptConst(xdr, values[i]));
     }
 
-    uint32_t copyOnWrite;
-    if (mode == XDR_ENCODE) {
-      copyOnWrite = obj->is<ArrayObject>() &&
-                    obj->as<ArrayObject>().denseElementsAreCopyOnWrite();
-    }
-    MOZ_TRY(xdr->codeUint32(&copyOnWrite));
-
     if (mode == XDR_DECODE) {
-      ObjectGroup::NewArrayKind arrayKind =
-          copyOnWrite ? ObjectGroup::NewArrayKind::CopyOnWrite
-                      : ObjectGroup::NewArrayKind::Normal;
-      obj.set(ObjectGroup::newArrayObject(cx, values.begin(), values.length(),
-                                          TenuredObject, arrayKind));
+      obj.set(NewDenseCopiedArray(cx, values.length(), values.begin(),
+                                  /* proto = */ nullptr, TenuredObject));
       if (!obj) {
         return xdr->fail(JS::TranscodeResult_Throw);
       }
@@ -1430,17 +1387,13 @@
     }
   }
 
-  // Code whether the object is a singleton.
-  uint32_t isSingleton;
   if (mode == XDR_ENCODE) {
-    isSingleton = obj->isSingleton() ? 1 : 0;
+    MOZ_ASSERT(!obj->isSingleton());
   }
-  MOZ_TRY(xdr->codeUint32(&isSingleton));
 
   if (mode == XDR_DECODE) {
-    NewObjectKind newKind = isSingleton ? SingletonObject : TenuredObject;
-    obj.set(ObjectGroup::newPlainObject(cx, properties.begin(),
-                                        properties.length(), newKind));
+    obj.set(NewPlainObjectWithProperties(cx, properties.begin(),
+                                         properties.length(), TenuredObject));
     if (!obj) {
       return xdr->fail(JS::TranscodeResult_Throw);
     }
@@ -1596,7 +1549,8 @@
 }
 
 /* Use this method with extreme caution. It trades the guts of two objects. */
-void JSObject::swap(JSContext* cx, HandleObject a, HandleObject b) {
+void JSObject::swap(JSContext* cx, HandleObject a, HandleObject b,
+                    AutoEnterOOMUnsafeRegion& oomUnsafe) {
   // Ensure swap doesn't cause a finalizer to not be run.
   MOZ_ASSERT(IsBackgroundFinalized(a->asTenured().getAllocKind()) ==
              IsBackgroundFinalized(b->asTenured().getAllocKind()));
@@ -1605,15 +1559,6 @@
   // You must have entered the objects' compartment before calling this.
   MOZ_ASSERT(cx->compartment() == a->compartment());
 
-  AutoEnterOOMUnsafeRegion oomUnsafe;
-
-  if (!JSObject::getGroup(cx, a)) {
-    oomUnsafe.crash("JSObject::swap");
-  }
-  if (!JSObject::getGroup(cx, b)) {
-    oomUnsafe.crash("JSObject::swap");
-  }
-
   // Only certain types of objects are allowed to be swapped. This allows the
   // JITs to better optimize objects that can never swap.
   MOZ_RELEASE_ASSERT(js::ObjectMayBeSwapped(a));
@@ -1777,11 +1722,6 @@
     }
   }
 
-  // Swapping the contents of two objects invalidates type sets which contain
-  // either of the objects, so mark all such sets as unknown.
-  MarkObjectGroupUnknownProperties(cx, a->group());
-  MarkObjectGroupUnknownProperties(cx, b->group());
-
   /*
    * We need a write barrier here. If |a| was marked and |b| was not, then
    * after the swap, |b|'s guts would never be marked. The write barrier
@@ -1876,26 +1816,8 @@
 }
 
 void JSObject::fixupAfterMovingGC() {
-  if (IsForwarded(groupRaw())) {
-    setGroupRaw(Forwarded(groupRaw()));
-  }
-
-  // For copy-on-write objects that don't own their elements, fix up the
-  // elements pointer if it points to inline elements in the owning object.
-  if (is<NativeObject>()) {
-    NativeObject& obj = as<NativeObject>();
-    if (obj.denseElementsAreCopyOnWrite()) {
-      NativeObject* owner = obj.getElementsHeader()->ownerObject();
-      // Get the new owner pointer but don't call MaybeForwarded as we
-      // don't need to access the object's shape.
-      if (IsForwarded(owner)) {
-        owner = Forwarded(owner);
-      }
-      if (owner != &obj && owner->hasFixedElements()) {
-        obj.elements_ = owner->getElementsHeader()->elements();
-      }
-      MOZ_ASSERT(!IsForwarded(obj.getElementsHeader()->ownerObject().get()));
-    }
+  if (IsForwarded(group())) {
+    setGroupRaw(Forwarded(group()));
   }
 }
 
@@ -1966,32 +1888,14 @@
   }
 
   if (obj->isSingleton()) {
-    /*
-     * Just splice the prototype, but mark the properties as unknown for
-     * consistent behavior.
-     */
-    if (!JSObject::splicePrototype(cx, obj, proto)) {
-      return false;
-    }
-    MarkObjectGroupUnknownProperties(cx, obj->group());
-    return true;
+    // Just splice the prototype.
+    return JSObject::splicePrototype(cx, obj, proto);
   }
 
   RootedObjectGroup oldGroup(cx, obj->group());
 
   ObjectGroup* newGroup;
-  if (oldGroup->maybeInterpretedFunction()) {
-    // We're changing the group/proto of a scripted function. Create a new
-    // group so we can keep track of the interpreted function for Ion
-    // inlining.
-    MOZ_ASSERT(obj->is<JSFunction>());
-    newGroup = ObjectGroupRealm::makeGroup(cx, oldGroup->realm(),
-                                           &JSFunction::class_, proto);
-    if (!newGroup) {
-      return false;
-    }
-    newGroup->setInterpretedFunction(oldGroup->maybeInterpretedFunction());
-  } else {
+  {
     AutoRealm ar(cx, oldGroup);
     newGroup = ObjectGroup::defaultNewGroup(cx, obj->getClass(), proto);
     if (!newGroup) {
@@ -2000,77 +1904,6 @@
   }
 
   obj->setGroup(newGroup);
-
-  // Add the object's property types to the new group.
-  AutoSweepObjectGroup sweep(newGroup);
-  if (!newGroup->unknownProperties(sweep)) {
-    if (obj->isNative()) {
-      AddPropertyTypesAfterProtoChange(cx, &obj->as<NativeObject>(), oldGroup);
-    } else {
-      MarkObjectGroupUnknownProperties(cx, newGroup);
-    }
-  }
-
-  // Type sets containing this object will contain the old group but not the
-  // new group of the object, so we need to treat all such type sets as
-  // unknown.
-  MarkObjectGroupUnknownProperties(cx, oldGroup);
-
-  return true;
-}
-
-bool js::SetPrototypeForClonedFunction(JSContext* cx, HandleFunction fun,
-                                       HandleObject proto) {
-  // This function must only be called from |CloneFunctionObjectIfNotSingleton|!
-
-  // |CanReuseFunctionForClone| ensures |fun| is a singleton function. |fun|
-  // must also be extensible and have a mutable prototype for its prototype
-  // to be modifiable, so assert both conditions, too.
-  MOZ_ASSERT(fun->isSingleton());
-  MOZ_ASSERT(!fun->staticPrototypeIsImmutable());
-  MOZ_ASSERT(fun->isExtensible());
-  MOZ_ASSERT(proto);
-
-  if (proto == fun->staticPrototype()) {
-    return true;
-  }
-
-  // Regenerate object shape (and possibly prototype shape) to invalidate JIT
-  // code that is affected by a prototype mutation.
-  if (!ReshapeForProtoMutation(cx, fun)) {
-    return false;
-  }
-
-  if (!JSObject::setDelegate(cx, proto)) {
-    return false;
-  }
-
-  // Directly splice the prototype instead of calling |js::SetPrototype| to
-  // ensure we don't mark the function as having "unknown properties". This
-  // is safe to do, because the singleton function hasn't yet been exposed
-  // to scripts.
-  Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
-  if (!JSObject::splicePrototype(cx, fun, tagged)) {
-    return false;
-  }
-
-  return true;
-}
-
-/* static */
-bool JSObject::changeToSingleton(JSContext* cx, HandleObject obj) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(!obj->isSingleton());
-
-  MarkObjectGroupUnknownProperties(cx, obj->group());
-
-  ObjectGroup* group = ObjectGroup::lazySingletonGroup(
-      cx, obj->group(), obj->getClass(), obj->taggedProto());
-  if (!group) {
-    return false;
-  }
-
-  obj->setGroupRaw(group);
   return true;
 }
 
@@ -2385,7 +2218,8 @@
       }
 
       if (index.inspect()) {
-        if (index.inspect().value() < obj->as<TypedArrayObject>().length().get()) {
+        if (index.inspect().value() <
+            obj->as<TypedArrayObject>().length().get()) {
           propp->setTypedArrayElement(index.inspect().value());
         } else {
           propp->setNotFound();
@@ -2408,7 +2242,7 @@
       return false;
     }
   } else if (obj->is<TypedObject>()) {
-    if (obj->as<TypedObject>().typeDescr().hasProperty(cx->names(), id)) {
+    if (obj->as<TypedObject>().typeDescr().hasProperty(cx, id)) {
       propp->setNonNativeProperty();
       return true;
     }
@@ -2690,9 +2524,7 @@
 
     // Prepare the elements. We have to do this before we mark the object
     // non-extensible; that's fine because these changes are not observable.
-    if (!ObjectElements::PrepareForPreventExtensions(cx, nobj)) {
-      return false;
-    }
+    ObjectElements::PrepareForPreventExtensions(cx, nobj);
   }
 
   // Finally, set the NOT_EXTENSIBLE flag on the BaseShape and ObjectElements.
@@ -2961,9 +2793,9 @@
 
   RootedValue val(cx, ObjectValue(*obj));
   ReportValueError(cx, errorNumber, JSDVG_SEARCH_STACK, val, str,
-                   hint == JSTYPE_UNDEFINED
-                       ? "primitive type"
-                       : hint == JSTYPE_STRING ? "string" : "number");
+                   hint == JSTYPE_UNDEFINED ? "primitive type"
+                   : hint == JSTYPE_STRING  ? "string"
+                                            : "number");
   return false;
 }
 
@@ -3066,11 +2898,11 @@
     }
 
     // Steps 1-3, 6.a-b.
-    RootedValue arg0(cx, StringValue(preferredType == JSTYPE_STRING
-                                         ? cx->names().string
-                                         : preferredType == JSTYPE_NUMBER
-                                               ? cx->names().number
-                                               : cx->names().default_));
+    RootedValue arg0(
+        cx,
+        StringValue(preferredType == JSTYPE_STRING   ? cx->names().string
+                    : preferredType == JSTYPE_NUMBER ? cx->names().number
+                                                     : cx->names().default_));
 
     if (!js::Call(cx, method, vp, arg0, vp)) {
       return false;
@@ -3545,12 +3377,8 @@
   const JSClass* clasp = obj->getClass();
   out.printf("  class %p %s\n", clasp, clasp->name);
 
-  if (obj->hasLazyGroup()) {
-    out.put("  lazy group\n");
-  } else {
-    const ObjectGroup* group = obj->group();
-    out.printf("  group %p\n", group);
-  }
+  const ObjectGroup* group = obj->group();
+  out.printf("  group %p\n", group);
 
   out.put("  flags:");
   if (obj->isDelegate()) out.put(" delegate");
@@ -3561,8 +3389,6 @@
   if (obj->isBoundFunction()) out.put(" bound_function");
   if (obj->isQualifiedVarObj()) out.put(" varobj");
   if (obj->isUnqualifiedVarObj()) out.put(" unqualified_varobj");
-  if (obj->isIteratedSingleton()) out.put(" iterated_singleton");
-  if (obj->isNewGroupUnknown()) out.put(" new_type_unknown");
   if (obj->hasUncacheableProto()) out.put(" has_uncacheable_proto");
   if (obj->hasStaticPrototype() && obj->staticPrototypeIsImmutable()) {
     out.put(" immutable_prototype");
@@ -3586,9 +3412,6 @@
     if (nobj->isIndexed()) {
       out.put(" indexed");
     }
-    if (nobj->denseElementsAreCopyOnWrite()) {
-      out.put(" copy_on_write_elements");
-    }
     if (!nobj->denseElementsArePacked()) {
       out.put(" non_packed_elements");
     }
@@ -3787,10 +3610,11 @@
       filename = i.filename();
       line = i.computeLine();
     }
-    char frameType =
-        i.isInterp()
-            ? 'i'
-            : i.isBaseline() ? 'b' : i.isIon() ? 'I' : i.isWasm() ? 'W' : '?';
+    char frameType = i.isInterp()     ? 'i'
+                     : i.isBaseline() ? 'b'
+                     : i.isIon()      ? 'I'
+                     : i.isWasm()     ? 'W'
+                                      : '?';
 
     out.printf("#%zu %14p %c   %s:%u", depth, i.rawFramePtr(), frameType,
                filename, line);
@@ -3880,11 +3704,8 @@
   }
 
   if (is<NativeObject>() && as<NativeObject>().hasDynamicElements()) {
-    js::ObjectElements* elements = as<NativeObject>().getElementsHeader();
-    if (!elements->isCopyOnWrite() || elements->ownerObject() == this) {
-      void* allocatedElements = as<NativeObject>().getUnshiftedElementsHeader();
-      info->objectsMallocHeapElementsNormal += mallocSizeOf(allocatedElements);
-    }
+    void* allocatedElements = as<NativeObject>().getUnshiftedElementsHeader();
+    info->objectsMallocHeapElementsNormal += mallocSizeOf(allocatedElements);
   }
 
   // Other things may be measured in the future if DMD indicates it is
@@ -3948,10 +3769,8 @@
 
     if (native.hasDynamicElements()) {
       js::ObjectElements& elements = *native.getElementsHeader();
-      if (!elements.isCopyOnWrite() || elements.ownerObject() == this) {
-        size += (elements.capacity + elements.numShiftedElements()) *
-                sizeof(HeapSlot);
-      }
+      size += (elements.capacity + elements.numShiftedElements()) *
+              sizeof(HeapSlot);
     }
 
     if (is<ArgumentsObject>()) {
@@ -3982,7 +3801,7 @@
 
   traceShape(trc);
 
-  const JSClass* clasp = groupRaw()->clasp();
+  const JSClass* clasp = group()->clasp();
   if (clasp->isNative()) {
     NativeObject* nobj = &as<NativeObject>();
 
@@ -4000,20 +3819,9 @@
       MOZ_ASSERT(nslots == nobj->slotSpan());
     }
 
-    do {
-      if (nobj->denseElementsAreCopyOnWrite()) {
-        GCPtrNativeObject& owner = nobj->getElementsHeader()->ownerObject();
-        if (owner != nobj) {
-          TraceEdge(trc, &owner, "objectElementsOwner");
-          break;
-        }
-      }
-
-      TraceRange(
-          trc, nobj->getDenseInitializedLength(),
-          static_cast<HeapSlot*>(nobj->getDenseElementsAllowCopyOnWrite()),
-          "objectElements");
-    } while (false);
+    TraceRange(trc, nobj->getDenseInitializedLength(),
+               static_cast<HeapSlot*>(nobj->getDenseElements()),
+               "objectElements");
   }
 
   // Call the trace hook at the end so that during a moving GC the trace hook
@@ -4165,15 +3973,6 @@
                 heap == gc::TenuredHeap ||
                     CanNurseryAllocateFinalizedClass(clasp) ||
                     clasp->isProxy());
-  MOZ_ASSERT_IF(group->hasUnanalyzedPreliminaryObjects(),
-                heap == gc::TenuredHeap);
-
-  // Check that the group's shouldPreTenure flag is respected but ignore
-  // environment objects that the JIT expects to be nursery allocated.
-  MOZ_ASSERT_IF(group->shouldPreTenureDontCheckGeneration() &&
-                    clasp != &CallObject::class_ &&
-                    clasp != &LexicalEnvironmentObject::class_,
-                heap == gc::TenuredHeap);
 
   MOZ_ASSERT(!group->realm()->hasObjectPendingMetadata());
 
diff -Nru firefox-84.0.2+build1/js/src/vm/JSObject.h firefox-85.0+build1/js/src/vm/JSObject.h
--- firefox-84.0.2+build1/js/src/vm/JSObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -31,15 +31,12 @@
 using PropertyDescriptorVector = JS::GCVector<JS::PropertyDescriptor>;
 class GCMarker;
 class Nursery;
+struct AutoEnterOOMUnsafeRegion;
 
 namespace gc {
 class RelocationOverlay;
 }  // namespace gc
 
-namespace jit {
-class CacheIRCompiler;
-}
-
 /****************************************************************************/
 
 class GlobalObject;
@@ -88,7 +85,7 @@
     : public js::gc::CellWithTenuredGCPointer<js::gc::Cell, js::ObjectGroup> {
  public:
   // The ObjectGroup is stored in the cell header.
-  js::ObjectGroup* groupRaw() const { return headerPtr(); }
+  js::ObjectGroup* group() const { return headerPtr(); }
 
  protected:
   js::GCPtrShape shape_;
@@ -104,15 +101,12 @@
   friend bool js::SetImmutablePrototype(JSContext* cx, JS::HandleObject obj,
                                         bool* succeeded);
 
-  // Make a new group to use for a singleton object.
-  static js::ObjectGroup* makeLazyGroup(JSContext* cx, js::HandleObject obj);
-
   void setGroupRaw(js::ObjectGroup* group) { setHeaderPtr(group); }
 
  public:
   bool isNative() const { return getClass()->isNative(); }
 
-  const JSClass* getClass() const { return groupRaw()->clasp(); }
+  const JSClass* getClass() const { return group()->clasp(); }
   bool hasClass(const JSClass* c) const { return getClass() == c; }
 
   js::LookupPropertyOp getOpsLookupProperty() const {
@@ -143,26 +137,14 @@
     return getClass()->getOpsFunToString();
   }
 
-  js::ObjectGroup* group() const {
-    MOZ_ASSERT(!hasLazyGroup());
-    return groupRaw();
-  }
-
   void initGroup(js::ObjectGroup* group) { initHeaderPtr(group); }
 
   /*
-   * Whether this is the only object which has its specified group. This
-   * object will have its group constructed lazily as needed by analysis.
+   * Whether this is the only object which has its specified group.
    */
-  bool isSingleton() const { return groupRaw()->singleton(); }
+  bool isSingleton() const { return group()->singleton(); }
 
-  /*
-   * Whether the object's group has not been constructed yet. If an object
-   * might have a lazy group, use getGroup() below, otherwise group().
-   */
-  bool hasLazyGroup() const { return groupRaw()->lazy(); }
-
-  JS::Compartment* compartment() const { return groupRaw()->compartment(); }
+  JS::Compartment* compartment() const { return group()->compartment(); }
   JS::Compartment* maybeCompartment() const { return compartment(); }
 
   void initShape(js::Shape* shape) {
@@ -259,16 +241,16 @@
   static const JS::TraceKind TraceKind = JS::TraceKind::Object;
 
   MOZ_ALWAYS_INLINE JS::Zone* zone() const {
-    MOZ_ASSERT_IF(!isTenured(), nurseryZone() == groupRaw()->zone());
-    return groupRaw()->zone();
+    MOZ_ASSERT_IF(!isTenured(), nurseryZone() == group()->zone());
+    return group()->zone();
   }
   MOZ_ALWAYS_INLINE JS::shadow::Zone* shadowZone() const {
     return JS::shadow::Zone::from(zone());
   }
   MOZ_ALWAYS_INLINE JS::Zone* zoneFromAnyThread() const {
-    MOZ_ASSERT_IF(!isTenured(), nurseryZoneFromAnyThread() ==
-                                    groupRaw()->zoneFromAnyThread());
-    return groupRaw()->zoneFromAnyThread();
+    MOZ_ASSERT_IF(!isTenured(),
+                  nurseryZoneFromAnyThread() == group()->zoneFromAnyThread());
+    return group()->zoneFromAnyThread();
   }
   MOZ_ALWAYS_INLINE JS::shadow::Zone* shadowZoneFromAnyThread() const {
     return JS::shadow::Zone::from(zoneFromAnyThread());
@@ -295,15 +277,9 @@
   // along with them, and are not each their own malloc blocks.
   size_t sizeOfIncludingThisInNursery() const;
 
-  // Marks this object as having a singleton group, and leave the group lazy.
-  // Constructs a new, unique shape for the object. This should only be
-  // called for an object that was just created.
-  static inline bool setSingleton(JSContext* cx, js::HandleObject obj);
-
-  // Change an existing object to have a singleton group.
-  static bool changeToSingleton(JSContext* cx, js::HandleObject obj);
-
-  static inline js::ObjectGroup* getGroup(JSContext* cx, js::HandleObject obj);
+  // Marks this object as having a singleton group. This should only be called
+  // for an object that was just created.
+  static bool setSingleton(JSContext* cx, js::HandleObject obj);
 
 #ifdef DEBUG
   static void debugCheckNewObject(js::ObjectGroup* group, js::Shape* shape,
@@ -335,7 +311,7 @@
    *    the proto.
    */
 
-  js::TaggedProto taggedProto() const { return groupRaw()->proto(); }
+  js::TaggedProto taggedProto() const { return group()->proto(); }
 
   bool uninlinedIsProxy() const;
 
@@ -348,7 +324,7 @@
   // (albeit perhaps mutable) [[Prototype]].  For such objects the
   // [[Prototype]] is just a value returned when needed for accesses, or
   // modified in response to requests.  These objects store the
-  // [[Prototype]] directly within |obj->groupRaw()|.
+  // [[Prototype]] directly within |obj->group()|.
   bool hasStaticPrototype() const { return !hasDynamicPrototype(); }
 
   // The remaining proxies have a [[Prototype]] requiring dynamic computation
@@ -368,24 +344,6 @@
 
   inline void setGroup(js::ObjectGroup* group);
 
-  /*
-   * Mark an object that has been iterated over and is a singleton. We need
-   * to recover this information in the object's type information after it
-   * is purged on GC.
-   */
-  inline bool isIteratedSingleton() const;
-  static bool setIteratedSingleton(JSContext* cx, JS::HandleObject obj) {
-    return setFlags(cx, obj, js::BaseShape::ITERATED_SINGLETON);
-  }
-
-  /*
-   * Mark an object as requiring its default 'new' type to have unknown
-   * properties.
-   */
-  inline bool isNewGroupUnknown() const;
-  static bool setNewGroupUnknown(JSContext* cx, js::ObjectGroupRealm& realm,
-                                 const JSClass* clasp, JS::HandleObject obj);
-
   /* Set a new prototype for an object with a singleton type. */
   static bool splicePrototype(JSContext* cx, js::HandleObject obj,
                               js::Handle<js::TaggedProto> proto);
@@ -422,14 +380,14 @@
 
   JS::Realm* nonCCWRealm() const {
     MOZ_ASSERT(!js::UninlinedIsCrossCompartmentWrapper(this));
-    return groupRaw()->realm();
+    return group()->realm();
   }
   bool hasSameRealmAs(JSContext* cx) const;
 
   // Returns the object's realm even if the object is a CCW (be careful, in
   // this case the realm is not very meaningful because wrappers are shared by
   // all realms in the compartment).
-  JS::Realm* maybeCCWRealm() const { return groupRaw()->realm(); }
+  JS::Realm* maybeCCWRealm() const { return group()->realm(); }
 
   /*
    * ES5 meta-object properties and operations.
@@ -464,7 +422,8 @@
                                   js::HandleValue receiver,
                                   JS::ObjectOpResult& result);
 
-  static void swap(JSContext* cx, JS::HandleObject a, JS::HandleObject b);
+  static void swap(JSContext* cx, JS::HandleObject a, JS::HandleObject b,
+                   js::AutoEnterOOMUnsafeRegion& oomUnsafe);
 
  private:
   void fixDictionaryShapeAfterSwap();
@@ -573,7 +532,6 @@
   // To help avoid writing Spectre-unsafe code, we only allow MacroAssembler
   // to call the method below.
   friend class js::jit::MacroAssembler;
-  friend class js::jit::CacheIRCompiler;
 
   static constexpr size_t offsetOfGroup() { return offsetOfHeaderPtr(); }
   static constexpr size_t offsetOfShape() { return offsetof(JSObject, shape_); }
diff -Nru firefox-84.0.2+build1/js/src/vm/JSObject-inl.h firefox-85.0+build1/js/src/vm/JSObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/JSObject-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -14,6 +14,7 @@
 #include "vm/EnvironmentObject.h"
 #include "vm/JSFunction.h"
 #include "vm/Probes.h"
+#include "vm/TypedArrayObject.h"
 
 #include "gc/FreeOp-inl.h"
 #include "gc/Marking-inl.h"
@@ -113,18 +114,8 @@
   if (nobj->hasDynamicElements()) {
     js::ObjectElements* elements = nobj->getElementsHeader();
     size_t size = elements->numAllocatedElements() * sizeof(js::HeapSlot);
-    if (elements->isCopyOnWrite()) {
-      if (elements->ownerObject() == this) {
-        // Don't free the elements until object finalization finishes,
-        // so that other objects can access these elements while they
-        // are themselves finalized.
-        MOZ_ASSERT(elements->numShiftedElements() == 0);
-        fop->freeLater(this, elements, size, js::MemoryUse::ObjectElements);
-      }
-    } else {
-      fop->free_(this, nobj->getUnshiftedElementsHeader(), size,
-                 js::MemoryUse::ObjectElements);
-    }
+    fop->free_(this, nobj->getUnshiftedElementsHeader(), size,
+               js::MemoryUse::ObjectElements);
   }
 }
 
@@ -149,18 +140,6 @@
   }
 }
 
-/* static */ inline js::ObjectGroup* JSObject::getGroup(JSContext* cx,
-                                                        js::HandleObject obj) {
-  MOZ_ASSERT(cx->compartment() == obj->compartment());
-  if (obj->hasLazyGroup()) {
-    if (cx->compartment() != obj->compartment()) {
-      MOZ_CRASH();
-    }
-    return makeLazyGroup(cx, obj);
-  }
-  return obj->groupRaw();
-}
-
 inline void JSObject::setGroup(js::ObjectGroup* group) {
   MOZ_RELEASE_ASSERT(group);
   MOZ_ASSERT(!isSingleton());
@@ -203,6 +182,21 @@
          js::IsTypedArrayClass(clasp);
 }
 
+class MOZ_RAII AutoSuppressAllocationMetadataBuilder {
+  JS::Zone* zone;
+  bool saved;
+
+ public:
+  explicit AutoSuppressAllocationMetadataBuilder(JSContext* cx)
+      : zone(cx->zone()), saved(zone->suppressAllocationMetadataBuilder) {
+    zone->suppressAllocationMetadataBuilder = true;
+  }
+
+  ~AutoSuppressAllocationMetadataBuilder() {
+    zone->suppressAllocationMetadataBuilder = saved;
+  }
+};
+
 // This function is meant to be called from allocation fast paths.
 //
 // If we do have an allocation metadata builder, it can cause a GC, so the
@@ -283,14 +277,6 @@
   return hasAllFlags(js::BaseShape::IMMUTABLE_PROTOTYPE);
 }
 
-inline bool JSObject::isIteratedSingleton() const {
-  return hasAllFlags(js::BaseShape::ITERATED_SINGLETON);
-}
-
-inline bool JSObject::isNewGroupUnknown() const {
-  return hasAllFlags(js::BaseShape::NEW_GROUP_UNKNOWN);
-}
-
 namespace js {
 
 static MOZ_ALWAYS_INLINE bool IsFunctionObject(const js::Value& v) {
@@ -404,11 +390,6 @@
 
 inline gc::InitialHeap GetInitialHeap(NewObjectKind newKind,
                                       ObjectGroup* group) {
-  AutoSweepObjectGroup sweep(group);
-  if (group->shouldPreTenure(sweep)) {
-    return gc::TenuredHeap;
-  }
-
   return GetInitialHeap(newKind, group->clasp());
 }
 
@@ -448,14 +429,6 @@
                                                                         proto);
 }
 
-template <typename T>
-inline T* NewSingletonObjectWithGivenTaggedProtoAndKind(
-    JSContext* cx, Handle<TaggedProto> proto, gc::AllocKind allocKind) {
-  JSObject* obj = NewObjectWithGivenTaggedProto(cx, &T::class_, proto,
-                                                allocKind, SingletonObject, 0);
-  return obj ? &obj->as<T>() : nullptr;
-}
-
 inline JSObject* NewObjectWithGivenProto(
     JSContext* cx, const JSClass* clasp, HandleObject proto,
     gc::AllocKind allocKind, NewObjectKind newKind = GenericObject) {
@@ -489,12 +462,6 @@
       cx, AsTaggedProto(proto));
 }
 
-template <typename T>
-inline T* NewSingletonObjectWithGivenProto(JSContext* cx, HandleObject proto) {
-  return detail::NewObjectWithGivenTaggedProtoForKind<T, SingletonObject>(
-      cx, AsTaggedProto(proto));
-}
-
 template <typename T>
 inline T* NewTenuredObjectWithGivenProto(JSContext* cx, HandleObject proto) {
   return detail::NewObjectWithGivenTaggedProtoForKind<T, TenuredObject>(
diff -Nru firefox-84.0.2+build1/js/src/vm/JSONParser.cpp firefox-85.0+build1/js/src/vm/JSONParser.cpp
--- firefox-84.0.2+build1/js/src/vm/JSONParser.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSONParser.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -580,7 +580,7 @@
                                          PropertyVector& properties) {
   MOZ_ASSERT(&properties == &stack.back().properties());
 
-  JSObject* obj = ObjectGroup::newPlainObject(
+  JSObject* obj = NewPlainObjectWithProperties(
       cx, properties.begin(), properties.length(), GenericObject);
   if (!obj) {
     return false;
@@ -591,15 +591,6 @@
     return false;
   }
   stack.popBack();
-
-  if (!stack.empty() && stack.back().state == FinishArrayElement) {
-    const ElementVector& elements = stack.back().elements();
-    if (!CombinePlainObjectPropertyTypes(cx, obj, elements.begin(),
-                                         elements.length())) {
-      return false;
-    }
-  }
-
   return true;
 }
 
@@ -607,8 +598,8 @@
                                         ElementVector& elements) {
   MOZ_ASSERT(&elements == &stack.back().elements());
 
-  ArrayObject* obj = ObjectGroup::newArrayObject(
-      cx, elements.begin(), elements.length(), GenericObject);
+  ArrayObject* obj =
+      NewDenseCopiedArray(cx, elements.length(), elements.begin());
   if (!obj) {
     return false;
   }
@@ -618,15 +609,6 @@
     return false;
   }
   stack.popBack();
-
-  if (!stack.empty() && stack.back().state == FinishArrayElement) {
-    const ElementVector& elements = stack.back().elements();
-    if (!CombineArrayElementTypes(cx, obj, elements.begin(),
-                                  elements.length())) {
-      return false;
-    }
-  }
-
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/JSScript.cpp firefox-85.0+build1/js/src/vm/JSScript.cpp
--- firefox-84.0.2+build1/js/src/vm/JSScript.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSScript.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -39,6 +39,7 @@
 #include "frontend/StencilXdr.h"   // frontend::StencilXdr::SharedData
 #include "gc/FreeOp.h"
 #include "jit/BaselineJIT.h"
+#include "jit/Invalidation.h"
 #include "jit/Ion.h"
 #include "jit/IonScript.h"
 #include "jit/JitCode.h"
@@ -689,6 +690,92 @@
   other.reset(tmp);
 }
 
+js::Scope* js::BaseScript::enclosingScope() const {
+  MOZ_ASSERT(!warmUpData_.isEnclosingScript(),
+             "Enclosing scope is not computed yet");
+
+  if (warmUpData_.isEnclosingScope()) {
+    return warmUpData_.toEnclosingScope();
+  }
+
+  MOZ_ASSERT(data_, "Script doesn't seem to be compiled");
+
+  return gcthings()[js::GCThingIndex::outermostScopeIndex()]
+      .as<Scope>()
+      .enclosing();
+}
+
+size_t JSScript::numAlwaysLiveFixedSlots() const {
+  if (bodyScope()->is<js::FunctionScope>()) {
+    return bodyScope()->as<js::FunctionScope>().nextFrameSlot();
+  }
+  if (bodyScope()->is<js::ModuleScope>()) {
+    return bodyScope()->as<js::ModuleScope>().nextFrameSlot();
+  }
+  return 0;
+}
+
+unsigned JSScript::numArgs() const {
+  if (bodyScope()->is<js::FunctionScope>()) {
+    return bodyScope()->as<js::FunctionScope>().numPositionalFormalParameters();
+  }
+  return 0;
+}
+
+bool JSScript::functionHasParameterExprs() const {
+  // Only functions have parameters.
+  js::Scope* scope = bodyScope();
+  if (!scope->is<js::FunctionScope>()) {
+    return false;
+  }
+  return scope->as<js::FunctionScope>().hasParameterExprs();
+}
+
+js::ModuleObject* JSScript::module() const {
+  if (bodyScope()->is<js::ModuleScope>()) {
+    return bodyScope()->as<js::ModuleScope>().module();
+  }
+  return nullptr;
+}
+
+bool JSScript::isGlobalCode() const {
+  return bodyScope()->is<js::GlobalScope>();
+}
+
+js::VarScope* JSScript::functionExtraBodyVarScope() const {
+  MOZ_ASSERT(functionHasExtraBodyVarScope());
+  for (JS::GCCellPtr gcThing : gcthings()) {
+    if (!gcThing.is<js::Scope>()) {
+      continue;
+    }
+    js::Scope* scope = &gcThing.as<js::Scope>();
+    if (scope->kind() == js::ScopeKind::FunctionBodyVar) {
+      return &scope->as<js::VarScope>();
+    }
+  }
+  MOZ_CRASH("Function extra body var scope not found");
+}
+
+bool JSScript::needsBodyEnvironment() const {
+  for (JS::GCCellPtr gcThing : gcthings()) {
+    if (!gcThing.is<js::Scope>()) {
+      continue;
+    }
+    js::Scope* scope = &gcThing.as<js::Scope>();
+    if (ScopeKindIsInBody(scope->kind()) && scope->hasEnvironment()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool JSScript::isDirectEvalInFunction() const {
+  if (!isForEval()) {
+    return false;
+  }
+  return bodyScope()->hasOnChain(js::ScopeKind::Function);
+}
+
 template <XDRMode mode>
 /* static */
 XDRResult js::PrivateScriptData::XDR(XDRState<mode>* xdr, HandleScript script,
@@ -888,7 +975,6 @@
   MOZ_TRY(xdr->codeUint32(&isd->bodyScopeIndex.index));
   MOZ_TRY(xdr->codeUint32(&isd->numICEntries));
   MOZ_TRY(xdr->codeUint16(&isd->funLength));
-  MOZ_TRY(xdr->codeUint16(&isd->numBytecodeTypeSets));
 
   static_assert(sizeof(jsbytecode) == 1);
   static_assert(sizeof(SrcNote) == 1);
@@ -1250,25 +1336,6 @@
                                      HandleScriptSourceObject, HandleFunction,
                                      MutableHandle<BaseScript*>);
 
-void JSScript::setDefaultClassConstructorSpan(uint32_t start, uint32_t end,
-                                              unsigned line, unsigned column) {
-  extent_.toStringStart = start;
-  extent_.toStringEnd = end;
-  extent_.sourceStart = start;
-  extent_.sourceEnd = end;
-  extent_.lineno = line;
-  extent_.column = column;
-
-  // Since this script has been changed to point into the user's source, we
-  // can clear its self-hosted flag, allowing Debugger to see it.
-  clearFlag(ImmutableFlags::SelfHosted);
-
-  // Even though the script was cloned from the self-hosted template, we cannot
-  // delazify back to a SelfHostedLazyScript. The script is no longer marked as
-  // SelfHosted either.
-  clearAllowRelazify();
-}
-
 bool JSScript::initScriptCounts(JSContext* cx) {
   MOZ_ASSERT(!hasScriptCounts());
 
@@ -2745,7 +2812,7 @@
   }
 
   for (auto& delazification : compilationInfos.delazifications) {
-    if (!xdrEncodeFunctionStencilWith(cx, delazification.stencil, xdrEncoder)) {
+    if (!xdrEncodeFunctionStencilWith(cx, delazification, xdrEncoder)) {
       return false;
     }
   }
@@ -3650,7 +3717,8 @@
 /* static */
 bool PrivateScriptData::InitFromStencil(
     JSContext* cx, js::HandleScript script,
-    js::frontend::CompilationInfo& compilationInfo,
+    js::frontend::CompilationInput& input,
+    js::frontend::CompilationStencil& stencil,
     js::frontend::CompilationGCOutput& gcOutput,
     const frontend::ScriptStencil& scriptStencil) {
   uint32_t ngcthings = scriptStencil.gcThings.size();
@@ -3664,7 +3732,7 @@
 
   js::PrivateScriptData* data = script->data_;
   if (ngcthings) {
-    if (!EmitScriptThingsVector(cx, compilationInfo, gcOutput,
+    if (!EmitScriptThingsVector(cx, input, stencil, gcOutput,
                                 scriptStencil.gcThings, data->gcthings())) {
       return false;
     }
@@ -3694,7 +3762,7 @@
 /*static*/
 JSScript* JSScript::Create(JSContext* cx, js::HandleObject functionOrGlobal,
                            js::HandleScriptSourceObject sourceObject,
-                           SourceExtent extent,
+                           const SourceExtent& extent,
                            js::ImmutableScriptFlags flags) {
   return static_cast<JSScript*>(
       BaseScript::New(cx, functionOrGlobal, sourceObject, extent, flags));
@@ -3745,10 +3813,10 @@
 
 /* static */
 bool JSScript::fullyInitFromStencil(
-    JSContext* cx, frontend::CompilationInfo& compilationInfo,
+    JSContext* cx, js::frontend::CompilationInput& input,
+    js::frontend::CompilationStencil& stencil,
     frontend::CompilationGCOutput& gcOutput, HandleScript script,
     const frontend::ScriptStencil& scriptStencil, HandleFunction fun) {
-  ImmutableScriptFlags lazyFlags;
   MutableScriptFlags lazyMutableFlags;
   RootedScope lazyEnclosingScope(cx);
 
@@ -3773,7 +3841,6 @@
   // If we are using an existing lazy script, record enough info to be able to
   // rollback on failure.
   if (script->isReadyForDelazification()) {
-    lazyFlags = script->immutableFlags_;
     lazyMutableFlags = script->mutableFlags_;
     lazyEnclosingScope = script->releaseEnclosingScope();
     script->swapData(lazyData.get());
@@ -3784,7 +3851,6 @@
   // just need to clear bytecode to mark script as incomplete.
   auto rollbackGuard = mozilla::MakeScopeExit([&] {
     if (lazyEnclosingScope) {
-      script->immutableFlags_ = lazyFlags;
       script->mutableFlags_ = lazyMutableFlags;
       script->warmUpData_.initEnclosingScope(lazyEnclosingScope);
       script->swapData(lazyData.get());
@@ -3807,7 +3873,7 @@
   script->resetArgsUsageAnalysis();
 
   // Create and initialize PrivateScriptData
-  if (!PrivateScriptData::InitFromStencil(cx, script, compilationInfo, gcOutput,
+  if (!PrivateScriptData::InitFromStencil(cx, script, input, stencil, gcOutput,
                                           scriptStencil)) {
     return false;
   }
@@ -3850,7 +3916,8 @@
 }
 
 JSScript* JSScript::fromStencil(JSContext* cx,
-                                frontend::CompilationInfo& compilationInfo,
+                                js::frontend::CompilationInput& input,
+                                js::frontend::CompilationStencil& stencil,
                                 frontend::CompilationGCOutput& gcOutput,
                                 const frontend::ScriptStencil& scriptStencil,
                                 HandleFunction fun) {
@@ -3870,8 +3937,8 @@
     return nullptr;
   }
 
-  if (!fullyInitFromStencil(cx, compilationInfo, gcOutput, script,
-                            scriptStencil, fun)) {
+  if (!fullyInitFromStencil(cx, input, stencil, gcOutput, script, scriptStencil,
+                            fun)) {
     return nullptr;
   }
 
@@ -4239,9 +4306,6 @@
   }
 
   MOZ_ASSERT(cloneScript->hasBytecode());
-  if (!JSFunction::setTypeForScriptedFunction(cx, clone)) {
-    return nullptr;
-  }
 
   return clone;
 }
@@ -4369,8 +4433,10 @@
 static JSScript* CopyScriptImpl(JSContext* cx, HandleScript src,
                                 HandleObject functionOrGlobal,
                                 HandleScriptSourceObject sourceObject,
-                                MutableHandle<GCVector<Scope*>> scopes) {
-  if (src->treatAsRunOnce() && !src->isFunction()) {
+                                MutableHandle<GCVector<Scope*>> scopes,
+                                SourceExtent* maybeClassExtent = nullptr) {
+  if (src->treatAsRunOnce()) {
+    MOZ_ASSERT(!src->isFunction());
     JS_ReportErrorASCII(cx, "No cloning toplevel run-once scripts");
     return nullptr;
   }
@@ -4380,13 +4446,29 @@
   // Some embeddings are not careful to use ExposeObjectToActiveJS as needed.
   JS::AssertObjectIsNotGray(sourceObject);
 
+  // When cloning is for `MakeDefaultConstructor`, the SourceExtent will be
+  // provided by caller instead of copying from `src`.
+  SourceExtent extent = maybeClassExtent ? *maybeClassExtent : src->extent();
+
   ImmutableScriptFlags flags = src->immutableFlags();
   flags.setFlag(JSScript::ImmutableFlags::HasNonSyntacticScope,
                 scopes[0]->hasOnChain(ScopeKind::NonSyntactic));
 
+  // When this clone is for `MakeDefaultConstructor` we also want to clear the
+  // SelfHosted flag. This is a hack to do it here, but ensures that the flags
+  // are not modified after the JSScript is created.
+  if (maybeClassExtent) {
+    flags.clearFlag(JSScript::ImmutableFlags::SelfHosted);
+  }
+
+  // FunctionFlags and ImmutableScriptFlags should agree on self-hosting status.
+  MOZ_ASSERT_IF(functionOrGlobal->is<JSFunction>(),
+                functionOrGlobal->as<JSFunction>().isSelfHostedBuiltin() ==
+                    flags.hasFlag(JSScript::ImmutableFlags::SelfHosted));
+
   // Create a new JSScript to fill in.
-  RootedScript dst(cx, JSScript::Create(cx, functionOrGlobal, sourceObject,
-                                        src->extent(), flags));
+  RootedScript dst(
+      cx, JSScript::Create(cx, functionOrGlobal, sourceObject, extent, flags));
   if (!dst) {
     return nullptr;
   }
@@ -4443,9 +4525,10 @@
   return dst;
 }
 
-JSScript* js::CloneScriptIntoFunction(
-    JSContext* cx, HandleScope enclosingScope, HandleFunction fun,
-    HandleScript src, Handle<ScriptSourceObject*> sourceObject) {
+JSScript* js::CloneScriptIntoFunction(JSContext* cx, HandleScope enclosingScope,
+                                      HandleFunction fun, HandleScript src,
+                                      Handle<ScriptSourceObject*> sourceObject,
+                                      SourceExtent* maybeClassExtent) {
   // We are either delazifying a self-hosted lazy function or the function
   // should be in an inactive state.
   MOZ_ASSERT(fun->isIncomplete() || fun->hasSelfHostedLazyScript());
@@ -4479,7 +4562,8 @@
 
   // Save flags in case we need to undo the early mutations.
   const FunctionFlags preservedFlags = fun->flags();
-  RootedScript dst(cx, CopyScriptImpl(cx, src, fun, sourceObject, &scopes));
+  RootedScript dst(cx, CopyScriptImpl(cx, src, fun, sourceObject, &scopes,
+                                      maybeClassExtent));
   if (!dst) {
     fun->setFlags(preservedFlags);
     return nullptr;
@@ -4512,9 +4596,9 @@
 /* static */
 js::UniquePtr<ImmutableScriptData> ImmutableScriptData::new_(
     JSContext* cx, uint32_t mainOffset, uint32_t nfixed, uint32_t nslots,
-    GCThingIndex bodyScopeIndex, uint32_t numICEntries,
-    uint32_t numBytecodeTypeSets, bool isFunction, uint16_t funLength,
-    mozilla::Span<const jsbytecode> code, mozilla::Span<const SrcNote> notes,
+    GCThingIndex bodyScopeIndex, uint32_t numICEntries, bool isFunction,
+    uint16_t funLength, mozilla::Span<const jsbytecode> code,
+    mozilla::Span<const SrcNote> notes,
     mozilla::Span<const uint32_t> resumeOffsets,
     mozilla::Span<const ScopeNote> scopeNotes,
     mozilla::Span<const TryNote> tryNotes) {
@@ -4543,8 +4627,6 @@
   data->nslots = nslots;
   data->bodyScopeIndex = bodyScopeIndex;
   data->numICEntries = numICEntries;
-  data->numBytecodeTypeSets = std::min<uint32_t>(
-      uint32_t(JSScript::MaxBytecodeTypeSets), numBytecodeTypeSets);
 
   if (isFunction) {
     data->funLength = funLength;
@@ -4761,8 +4843,9 @@
   // Warp code depends on the NeedsArgsObj flag so invalidate the script
   // (including compilations inlining the script).
   if (jit::JitOptions.warpBuilder) {
-    AutoEnterAnalysis enter(cx->runtime()->defaultFreeOp(), script->zone());
-    script->zone()->types.addPendingRecompile(cx, script);
+    jit::RecompileInfoVector invalid;
+    AddPendingInvalidation(invalid, script);
+    Invalidate(cx, invalid);
   }
 
   /*
@@ -4868,31 +4951,20 @@
 
 void JSScript::updateJitCodeRaw(JSRuntime* rt) {
   MOZ_ASSERT(rt);
-  uint8_t* jitCodeSkipArgCheck;
   if (hasBaselineScript() && baselineScript()->hasPendingIonCompileTask()) {
     MOZ_ASSERT(!isIonCompilingOffThread());
     setJitCodeRaw(rt->jitRuntime()->lazyLinkStub().value);
-    jitCodeSkipArgCheck = jitCodeRaw();
   } else if (hasIonScript()) {
     jit::IonScript* ion = ionScript();
     setJitCodeRaw(ion->method()->raw());
-    jitCodeSkipArgCheck = jitCodeRaw() + ion->getSkipArgCheckEntryOffset();
   } else if (hasBaselineScript()) {
     setJitCodeRaw(baselineScript()->method()->raw());
-    jitCodeSkipArgCheck = jitCodeRaw();
   } else if (hasJitScript() && js::jit::IsBaselineInterpreterEnabled()) {
     setJitCodeRaw(rt->jitRuntime()->baselineInterpreter().codeRaw());
-    jitCodeSkipArgCheck = jitCodeRaw();
   } else {
     setJitCodeRaw(rt->jitRuntime()->interpreterStub().value);
-    jitCodeSkipArgCheck = jitCodeRaw();
   }
   MOZ_ASSERT(jitCodeRaw());
-  MOZ_ASSERT(jitCodeSkipArgCheck);
-
-  if (hasJitScript()) {
-    jitScript()->jitCodeSkipArgCheck_ = jitCodeSkipArgCheck;
-  }
 }
 
 bool JSScript::hasLoops() {
diff -Nru firefox-84.0.2+build1/js/src/vm/JSScript.h firefox-85.0+build1/js/src/vm/JSScript.h
--- firefox-84.0.2+build1/js/src/vm/JSScript.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/JSScript.h	2021-01-18 19:58:16.000000000 +0000
@@ -42,10 +42,10 @@
 #include "vm/GeneratorAndAsyncKind.h"  // GeneratorKind, FunctionAsyncKind
 #include "vm/JSAtom.h"
 #include "vm/NativeObject.h"
-#include "vm/Scope.h"
+#include "vm/ScopeKind.h"  // ScopeKind
 #include "vm/Shape.h"
 #include "vm/SharedImmutableStringsCache.h"
-#include "vm/SharedStencil.h"  // js::GCThingIndex, js::SourceExtent, js::SharedImmutableScriptData
+#include "vm/SharedStencil.h"  // js::GCThingIndex, js::SourceExtent, js::SharedImmutableScriptData, MemberInitializers
 #include "vm/Time.h"
 
 namespace JS {
@@ -56,6 +56,9 @@
 
 namespace js {
 
+class VarScope;
+class LexicalScope;
+
 namespace coverage {
 class LCovSource;
 }  // namespace coverage
@@ -1327,31 +1330,6 @@
 static_assert(sizeof(ScriptWarmUpData) == sizeof(uintptr_t),
               "JIT code depends on ScriptWarmUpData being pointer-sized");
 
-struct MemberInitializers {
-  static constexpr uint32_t MaxInitializers = INT32_MAX;
-
-#ifdef DEBUG
-  bool valid = false;
-#endif
-
-  // This struct will eventually have a vector of constant values for optimizing
-  // field initializers.
-  uint32_t numMemberInitializers = 0;
-
-  explicit MemberInitializers(uint32_t numMemberInitializers)
-      :
-#ifdef DEBUG
-        valid(true),
-#endif
-        numMemberInitializers(numMemberInitializers) {
-  }
-
-  static MemberInitializers Invalid() { return MemberInitializers(); }
-
- private:
-  MemberInitializers() = default;
-};
-
 // [SMDOC] - JSScript data layout (unshared)
 //
 // PrivateScriptData stores variable-length data associated with a script.
@@ -1422,7 +1400,8 @@
                     js::MutableHandle<JS::GCVector<js::Scope*>> scopes);
 
   static bool InitFromStencil(JSContext* cx, js::HandleScript script,
-                              js::frontend::CompilationInfo& compilationInfo,
+                              js::frontend::CompilationInput& input,
+                              js::frontend::CompilationStencil& stencil,
                               js::frontend::CompilationGCOutput& gcOutput,
                               const js::frontend::ScriptStencil& scriptStencil);
 
@@ -1541,13 +1520,12 @@
 
   // Position of the function in the source buffer. Both in terms of line/column
   // and code-unit offset.
-  SourceExtent extent_ = {};
+  const SourceExtent extent_ = {};
 
   // Immutable flags are a combination of parser options and bytecode
   // characteristics. These flags are preserved when serializing or copying this
-  // script. These flags are static after script initialization with the key
-  // exception that delazification / relazification may modify a subset of them.
-  ImmutableScriptFlags immutableFlags_ = {};
+  // script.
+  const ImmutableScriptFlags immutableFlags_ = {};
 
   // Mutable flags store transient information used by subsystems such as the
   // debugger and the JITs. These flags are *not* preserved when serializing or
@@ -1569,7 +1547,7 @@
   // End of fields.
 
   BaseScript(uint8_t* stubEntry, JSObject* functionOrGlobal,
-             ScriptSourceObject* sourceObject, SourceExtent extent,
+             ScriptSourceObject* sourceObject, const SourceExtent& extent,
              uint32_t immutableFlags)
       : TenuredCellWithNonGCPointer(stubEntry),
         functionOrGlobal_(functionOrGlobal),
@@ -1648,10 +1626,6 @@
   MOZ_MUST_USE bool hasFlag(ImmutableFlags flag) const {
     return immutableFlags_.hasFlag(flag);
   }
-  void setFlag(ImmutableFlags flag, bool b = true) {
-    immutableFlags_.setFlag(flag, b);
-  }
-  void clearFlag(ImmutableFlags flag) { immutableFlags_.clearFlag(flag); }
 
   // MutableFlags accessors.
   MOZ_MUST_USE bool hasFlag(MutableFlags flag) const {
@@ -1686,7 +1660,7 @@
   IMMUTABLE_FLAG_GETTER(forceStrict, ForceStrict)
   IMMUTABLE_FLAG_GETTER(hasNonSyntacticScope, HasNonSyntacticScope)
   IMMUTABLE_FLAG_GETTER(noScriptRval, NoScriptRval)
-  // TreatAsRunOnce: custom logic below.
+  IMMUTABLE_FLAG_GETTER(treatAsRunOnce, TreatAsRunOnce)
   IMMUTABLE_FLAG_GETTER(strict, Strict)
   IMMUTABLE_FLAG_GETTER(hasModuleGoal, HasModuleGoal)
   IMMUTABLE_FLAG_GETTER(hasInnerFunctions, HasInnerFunctions)
@@ -1709,10 +1683,8 @@
   IMMUTABLE_FLAG_GETTER(argumentsHasVarBinding, ArgumentsHasVarBinding)
   IMMUTABLE_FLAG_GETTER(alwaysNeedsArgsObj, AlwaysNeedsArgsObj)
   IMMUTABLE_FLAG_GETTER(hasMappedArgsObj, HasMappedArgsObj)
-  IMMUTABLE_FLAG_GETTER(isLikelyConstructorWrapper, IsLikelyConstructorWrapper)
 
   MUTABLE_FLAG_GETTER_SETTER(hasRunOnce, HasRunOnce)
-  MUTABLE_FLAG_GETTER_SETTER(hasBeenCloned, HasBeenCloned)
   MUTABLE_FLAG_GETTER_SETTER(hasScriptCounts, HasScriptCounts)
   MUTABLE_FLAG_GETTER_SETTER(hasDebugScript, HasDebugScript)
   MUTABLE_FLAG_GETTER_SETTER(needsArgsAnalysis, NeedsArgsAnalysis)
@@ -1721,30 +1693,18 @@
   MUTABLE_FLAG_GETTER_SETTER(spewEnabled, SpewEnabled)
   MUTABLE_FLAG_GETTER_SETTER(failedBoundsCheck, FailedBoundsCheck)
   MUTABLE_FLAG_GETTER_SETTER(failedShapeGuard, FailedShapeGuard)
-  MUTABLE_FLAG_GETTER_SETTER(hadFrequentBailouts, HadFrequentBailouts)
-  MUTABLE_FLAG_GETTER_SETTER(hadOverflowBailout, HadOverflowBailout)
+  MUTABLE_FLAG_GETTER_SETTER(hadLICMInvalidation, HadLICMInvalidation)
+  MUTABLE_FLAG_GETTER_SETTER(hadEagerTruncationBailout,
+                             HadEagerTruncationBailout)
   MUTABLE_FLAG_GETTER_SETTER(uninlineable, Uninlineable)
-  MUTABLE_FLAG_GETTER_SETTER(invalidatedIdempotentCache,
-                             InvalidatedIdempotentCache)
   MUTABLE_FLAG_GETTER_SETTER(failedLexicalCheck, FailedLexicalCheck)
+  MUTABLE_FLAG_GETTER_SETTER(hadSpeculativePhiBailout, HadSpeculativePhiBailout)
 
 #undef IMMUTABLE_FLAG_GETTER
 #undef MUTABLE_FLAG_GETTER_SETTER
 #undef FLAG_GETTER
 #undef FLAG_GETTER_SETTER
 
-  // See ImmutableScriptFlagsEnum::TreatAsRunOnce.
-  bool treatAsRunOnce() const {
-    MOZ_ASSERT(!hasEnclosingScript(),
-               "TreatAsRunOnce is undefined if enclosing script is lazy");
-    return hasFlag(ImmutableFlags::TreatAsRunOnce);
-  }
-  void initTreatAsRunOnce(bool flag) {
-    MOZ_ASSERT(!hasBytecode(),
-               "TreatAsRunOnce can only be updated on lazy scripts");
-    setFlag(ImmutableFlags::TreatAsRunOnce, flag);
-  }
-
   GeneratorKind generatorKind() const {
     return isGenerator() ? GeneratorKind::Generator
                          : GeneratorKind::NotGenerator;
@@ -1770,20 +1730,7 @@
     return warmUpData_.isEnclosingScope();
   }
 
-  Scope* enclosingScope() const {
-    MOZ_ASSERT(!warmUpData_.isEnclosingScript(),
-               "Enclosing scope is not computed yet");
-
-    if (warmUpData_.isEnclosingScope()) {
-      return warmUpData_.toEnclosingScope();
-    }
-
-    MOZ_ASSERT(data_, "Script doesn't seem to be compiled");
-
-    return gcthings()[js::GCThingIndex::outermostScopeIndex()]
-        .as<Scope>()
-        .enclosing();
-  }
+  Scope* enclosingScope() const;
   void setEnclosingScope(Scope* enclosingScope);
   Scope* releaseEnclosingScope();
 
@@ -1948,7 +1895,8 @@
 
   friend bool js::PrivateScriptData::InitFromStencil(
       JSContext* cx, js::HandleScript script,
-      js::frontend::CompilationInfo& compilationInfo,
+      js::frontend::CompilationInput& input,
+      js::frontend::CompilationStencil& stencil,
       js::frontend::CompilationGCOutput& gcOutput,
       const js::frontend::ScriptStencil& scriptStencil);
 
@@ -1958,7 +1906,7 @@
  public:
   static JSScript* Create(JSContext* cx, js::HandleObject functionOrGlobal,
                           js::HandleScriptSourceObject sourceObject,
-                          js::SourceExtent extent,
+                          const js::SourceExtent& extent,
                           js::ImmutableScriptFlags flags);
 
   // NOTE: This should only be used while delazifying.
@@ -1975,7 +1923,8 @@
 
  public:
   static bool fullyInitFromStencil(
-      JSContext* cx, js::frontend::CompilationInfo& compilationInfo,
+      JSContext* cx, js::frontend::CompilationInput& input,
+      js::frontend::CompilationStencil& stencil,
       js::frontend::CompilationGCOutput& gcOutput, js::HandleScript script,
       const js::frontend::ScriptStencil& scriptStencil,
       js::HandleFunction function);
@@ -1983,7 +1932,8 @@
   // Allocate a JSScript and initialize it with bytecode. This consumes
   // allocations within the stencil.
   static JSScript* fromStencil(JSContext* cx,
-                               js::frontend::CompilationInfo& compilationInfo,
+                               js::frontend::CompilationInput& input,
+                               js::frontend::CompilationStencil& stencil,
                                js::frontend::CompilationGCOutput& gcOutput,
                                const js::frontend::ScriptStencil& scriptStencil,
                                js::HandleFunction function);
@@ -2068,40 +2018,18 @@
 
   // Number of fixed slots reserved for slots that are always live. Only
   // nonzero for function or module code.
-  size_t numAlwaysLiveFixedSlots() const {
-    if (bodyScope()->is<js::FunctionScope>()) {
-      return bodyScope()->as<js::FunctionScope>().nextFrameSlot();
-    }
-    if (bodyScope()->is<js::ModuleScope>()) {
-      return bodyScope()->as<js::ModuleScope>().nextFrameSlot();
-    }
-    return 0;
-  }
+  size_t numAlwaysLiveFixedSlots() const;
 
   // Calculate the number of fixed slots that are live at a particular bytecode.
   size_t calculateLiveFixed(jsbytecode* pc);
 
   size_t nslots() const { return immutableScriptData()->nslots; }
 
-  unsigned numArgs() const {
-    if (bodyScope()->is<js::FunctionScope>()) {
-      return bodyScope()
-          ->as<js::FunctionScope>()
-          .numPositionalFormalParameters();
-    }
-    return 0;
-  }
+  unsigned numArgs() const;
 
   inline js::Shape* initialEnvironmentShape() const;
 
-  bool functionHasParameterExprs() const {
-    // Only functions have parameters.
-    js::Scope* scope = bodyScope();
-    if (!scope->is<js::FunctionScope>()) {
-      return false;
-    }
-    return scope->as<js::FunctionScope>().hasParameterExprs();
-  }
+  bool functionHasParameterExprs() const;
 
   bool functionAllowsParameterRedeclaration() const {
     // Parameter redeclaration is only allowed for non-strict functions with
@@ -2113,17 +2041,6 @@
     return hasMappedArgsObj();
   }
 
-  // If there are more than MaxBytecodeTypeSets JOF_TYPESET ops in the script,
-  // the first MaxBytecodeTypeSets - 1 JOF_TYPESET ops have their own TypeSet
-  // and all other JOF_TYPESET ops share the last TypeSet.
-  static constexpr size_t MaxBytecodeTypeSets = UINT16_MAX;
-  static_assert(sizeof(js::ImmutableScriptData::numBytecodeTypeSets) == 2,
-                "MaxBytecodeTypeSets must match sizeof(numBytecodeTypeSets)");
-
-  size_t numBytecodeTypeSets() const {
-    return immutableScriptData()->numBytecodeTypeSets;
-  }
-
   size_t numICEntries() const { return immutableScriptData()->numICEntries; }
 
   size_t funLength() const { return immutableScriptData()->funLength; }
@@ -2179,14 +2096,9 @@
 
   bool isRelazifiable() const { return isRelazifiableImpl(); }
 
-  js::ModuleObject* module() const {
-    if (bodyScope()->is<js::ModuleScope>()) {
-      return bodyScope()->as<js::ModuleScope>().module();
-    }
-    return nullptr;
-  }
+  js::ModuleObject* module() const;
 
-  bool isGlobalCode() const { return bodyScope()->is<js::GlobalScope>(); }
+  bool isGlobalCode() const;
 
   // Returns true if the script may read formal arguments on the stack
   // directly, via lazy arguments or a rest parameter.
@@ -2194,9 +2106,6 @@
 
   static JSLinearString* sourceData(JSContext* cx, JS::HandleScript script);
 
-  void setDefaultClassConstructorSpan(uint32_t start, uint32_t end,
-                                      unsigned line, unsigned column);
-
 #ifdef MOZ_VTUNE
   // Unique Method ID passed to the VTune profiler. Allows attribution of
   // different jitcode to the same source script.
@@ -2205,12 +2114,7 @@
 
  public:
   /* Return whether this is a 'direct eval' script in a function scope. */
-  bool isDirectEvalInFunction() const {
-    if (!isForEval()) {
-      return false;
-    }
-    return bodyScope()->hasOnChain(js::ScopeKind::Function);
-  }
+  bool isDirectEvalInFunction() const;
 
   /*
    * Return whether this script is a top-level script.
@@ -2263,32 +2167,9 @@
     return res;
   }
 
-  js::VarScope* functionExtraBodyVarScope() const {
-    MOZ_ASSERT(functionHasExtraBodyVarScope());
-    for (JS::GCCellPtr gcThing : gcthings()) {
-      if (!gcThing.is<js::Scope>()) {
-        continue;
-      }
-      js::Scope* scope = &gcThing.as<js::Scope>();
-      if (scope->kind() == js::ScopeKind::FunctionBodyVar) {
-        return &scope->as<js::VarScope>();
-      }
-    }
-    MOZ_CRASH("Function extra body var scope not found");
-  }
+  js::VarScope* functionExtraBodyVarScope() const;
 
-  bool needsBodyEnvironment() const {
-    for (JS::GCCellPtr gcThing : gcthings()) {
-      if (!gcThing.is<js::Scope>()) {
-        continue;
-      }
-      js::Scope* scope = &gcThing.as<js::Scope>();
-      if (ScopeKindIsInBody(scope->kind()) && scope->hasEnvironment()) {
-        return true;
-      }
-    }
-    return false;
-  }
+  bool needsBodyEnvironment() const;
 
   inline js::LexicalScope* maybeNamedLambdaScope() const;
 
@@ -2584,7 +2465,8 @@
 
 JSScript* CloneScriptIntoFunction(JSContext* cx, HandleScope enclosingScope,
                                   HandleFunction fun, HandleScript src,
-                                  Handle<ScriptSourceObject*> sourceObject);
+                                  Handle<ScriptSourceObject*> sourceObject,
+                                  SourceExtent* maybeClassExtent = nullptr);
 
 JSScript* CloneGlobalScript(JSContext* cx, ScopeKind scopeKind,
                             HandleScript src);
diff -Nru firefox-84.0.2+build1/js/src/vm/List-inl.h firefox-85.0+build1/js/src/vm/List-inl.h
--- firefox-84.0.2+build1/js/src/vm/List-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/List-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -19,22 +19,13 @@
 #include "vm/JSContext.h"     // JSContext
 #include "vm/NativeObject.h"  // js::NativeObject
 
-#include "vm/Compartment-inl.h"    // JS::Compartment::wrap
-#include "vm/JSObject-inl.h"       // js::NewObjectWithGivenProto
-#include "vm/NativeObject-inl.h"   // js::NativeObject::*
-#include "vm/Realm-inl.h"          // js::AutoRealm
-#include "vm/TypeInference-inl.h"  // js::MarkObjectGroupUnknownProperties
+#include "vm/Compartment-inl.h"   // JS::Compartment::wrap
+#include "vm/JSObject-inl.h"      // js::NewObjectWithGivenProto
+#include "vm/NativeObject-inl.h"  // js::NativeObject::*
+#include "vm/Realm-inl.h"         // js::AutoRealm
 
 inline /* static */ js::ListObject* js::ListObject::create(JSContext* cx) {
-  js::ListObject* obj = NewObjectWithGivenProto<ListObject>(cx, nullptr);
-  if (!obj) {
-    return nullptr;
-  }
-
-  // Internal object and may contain exotic MagicValues so don't track property
-  // types.
-  MarkObjectGroupUnknownProperties(cx, obj->group());
-  return obj;
+  return NewObjectWithGivenProto<ListObject>(cx, nullptr);
 }
 
 inline bool js::ListObject::append(JSContext* cx, JS::Handle<JS::Value> value) {
@@ -44,9 +35,7 @@
     return false;
   }
 
-  // Note: we can use setDenseElement instead of setDenseElementWithType because
-  // ListObject::create gave the object unknown properties.
-  ensureDenseInitializedLength(cx, len, 1);
+  ensureDenseInitializedLength(len, 1);
   setDenseElement(len, value);
   return true;
 }
@@ -60,9 +49,7 @@
     return false;
   }
 
-  // Note: we can use setDenseElement instead of setDenseElementWithType because
-  // ListObject::create gave the object unknown properties.
-  ensureDenseInitializedLength(cx, len, 2);
+  ensureDenseInitializedLength(len, 2);
   setDenseElement(len, value);
   setDenseElement(len + 1, JS::DoubleValue(size));
   return true;
diff -Nru firefox-84.0.2+build1/js/src/vm/MallocProvider.h firefox-85.0+build1/js/src/vm/MallocProvider.h
--- firefox-84.0.2+build1/js/src/vm/MallocProvider.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/MallocProvider.h	2021-01-18 19:58:16.000000000 +0000
@@ -38,11 +38,15 @@
 #ifndef vm_MallocProvider_h
 #define vm_MallocProvider_h
 
-#include "mozilla/Attributes.h"
-#include "mozilla/Likely.h"
+#include "mozilla/Attributes.h"  // MOZ_ALWAYS_INLINE
+#include "mozilla/Likely.h"      // MOZ_LIKELY, MOZ_UNLIKELY
 
-#include "js/UniquePtr.h"
-#include "js/Utility.h"
+#include <stddef.h>  // size_t
+#include <stdint.h>  // uint8_t
+
+#include "js/AllocPolicy.h"  // AllocFunction
+#include "js/UniquePtr.h"    // UniquePtr
+#include "js/Utility.h"  // js_malloc, MallocArena, CalculateAllocSize, CalculateAllocSizeWithExtra, JS::FreePolicy
 
 namespace js {
 
diff -Nru firefox-84.0.2+build1/js/src/vm/MemoryMetrics.cpp firefox-85.0+build1/js/src/vm/MemoryMetrics.cpp
--- firefox-84.0.2+build1/js/src/vm/MemoryMetrics.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/MemoryMetrics.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -214,9 +214,8 @@
   rtStats->currZoneStats = &zStats;
 
   zone->addSizeOfIncludingThis(
-      rtStats->mallocSizeOf_, &zStats.code, &zStats.typePool,
-      &zStats.regexpZone, &zStats.jitZone, &zStats.baselineStubsOptimized,
-      &zStats.uniqueIdMap, &zStats.shapeTables,
+      rtStats->mallocSizeOf_, &zStats.code, &zStats.regexpZone, &zStats.jitZone,
+      &zStats.baselineStubsOptimized, &zStats.uniqueIdMap, &zStats.shapeTables,
       &rtStats->runtime.atomsMarkBitmaps, &zStats.compartmentObjects,
       &zStats.crossCompartmentWrappersTables, &zStats.compartmentsPrivateData,
       &zStats.scriptCountsMap);
@@ -237,13 +236,10 @@
 
   // Measure the realm object itself, and things hanging off it.
   realm->addSizeOfIncludingThis(
-      rtStats->mallocSizeOf_, &realmStats.typeInferenceAllocationSiteTables,
-      &realmStats.typeInferenceArrayTypeTables,
-      &realmStats.typeInferenceObjectTypeTables, &realmStats.realmObject,
-      &realmStats.realmTables, &realmStats.innerViewsTable,
-      &realmStats.objectMetadataTable, &realmStats.savedStacksSet,
-      &realmStats.varNamesSet, &realmStats.nonSyntacticLexicalScopesTable,
-      &realmStats.jitRealm);
+      rtStats->mallocSizeOf_, &realmStats.realmObject, &realmStats.realmTables,
+      &realmStats.innerViewsTable, &realmStats.objectMetadataTable,
+      &realmStats.savedStacksSet, &realmStats.varNamesSet,
+      &realmStats.nonSyntacticLexicalScopesTable, &realmStats.jitRealm);
 }
 
 static void StatsArenaCallback(JSRuntime* rt, void* data, gc::Arena* arena,
@@ -488,10 +484,7 @@
     }
 
     case JS::TraceKind::ObjectGroup: {
-      ObjectGroup* group = &cellptr.as<ObjectGroup>();
       zStats->objectGroupsGCHeap += thingSize;
-      zStats->objectGroupsMallocHeap +=
-          group->sizeOfExcludingThis(rtStats->mallocSizeOf_);
       break;
     }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/ModuleBuilder.h firefox-85.0+build1/js/src/vm/ModuleBuilder.h
--- firefox-84.0.2+build1/js/src/vm/ModuleBuilder.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ModuleBuilder.h	2021-01-18 19:58:16.000000000 +0000
@@ -71,6 +71,8 @@
   bool noteFunctionDeclaration(JSContext* cx, uint32_t funIndex);
   void finishFunctionDecls(frontend::StencilModuleMetadata& metadata);
 
+  void noteAsync(frontend::StencilModuleMetadata& metadata);
+
  private:
   using RequestedModuleVector =
       Vector<frontend::StencilModuleEntry, 0, js::SystemAllocPolicy>;
diff -Nru firefox-84.0.2+build1/js/src/vm/Modules.cpp firefox-85.0+build1/js/src/vm/Modules.cpp
--- firefox-84.0.2+build1/js/src/vm/Modules.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Modules.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -73,6 +73,18 @@
 }
 
 JS_PUBLIC_API bool JS::FinishDynamicModuleImport(
+    JSContext* cx, Handle<JSObject*> evaluationPromise,
+    Handle<Value> referencingPrivate, Handle<JSString*> specifier,
+    Handle<JSObject*> promise) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->check(referencingPrivate, promise);
+
+  return js::FinishDynamicModuleImport(cx, evaluationPromise,
+                                       referencingPrivate, specifier, promise);
+}
+
+JS_PUBLIC_API bool JS::FinishDynamicModuleImport_NoTLA(
     JSContext* cx, JS::DynamicImportStatus status,
     Handle<Value> referencingPrivate, Handle<JSString*> specifier,
     Handle<JSObject*> promise) {
@@ -80,8 +92,8 @@
   CHECK_THREAD(cx);
   cx->check(referencingPrivate, promise);
 
-  return js::FinishDynamicModuleImport(cx, status, referencingPrivate,
-                                       specifier, promise);
+  return js::FinishDynamicModuleImport_NoTLA(cx, status, referencingPrivate,
+                                             specifier, promise);
 }
 
 template <typename Unit>
@@ -126,12 +138,22 @@
 }
 
 JS_PUBLIC_API bool JS::ModuleEvaluate(JSContext* cx,
-                                      Handle<JSObject*> moduleArg) {
+                                      Handle<JSObject*> moduleRecord,
+                                      MutableHandle<JS::Value> rval) {
   AssertHeapIsIdle();
   CHECK_THREAD(cx);
-  cx->releaseCheck(moduleArg);
+  cx->releaseCheck(moduleRecord);
+
+  return ModuleObject::Evaluate(cx, moduleRecord.as<ModuleObject>(), rval);
+}
+
+JS_PUBLIC_API bool JS::ThrowOnModuleEvaluationFailure(
+    JSContext* cx, Handle<JSObject*> evaluationPromise) {
+  AssertHeapIsIdle();
+  CHECK_THREAD(cx);
+  cx->releaseCheck(evaluationPromise);
 
-  return ModuleObject::Evaluate(cx, moduleArg.as<ModuleObject>());
+  return js::OnModuleEvaluationFailure(cx, evaluationPromise);
 }
 
 JS_PUBLIC_API JSObject* JS::GetRequestedModules(JSContext* cx,
diff -Nru firefox-84.0.2+build1/js/src/vm/NativeObject.cpp firefox-85.0+build1/js/src/vm/NativeObject.cpp
--- firefox-84.0.2+build1/js/src/vm/NativeObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/NativeObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -35,7 +35,6 @@
 #include "vm/JSObject-inl.h"
 #include "vm/JSScript-inl.h"
 #include "vm/Shape-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 
@@ -114,74 +113,18 @@
 #endif  // DEBUG
 
 /* static */
-void ObjectElements::ConvertElementsToDoubles(JSContext* cx,
-                                              uintptr_t elementsPtr) {
-  /*
-   * This function has an otherwise unused JSContext argument so that it can
-   * be called directly from Ion code. Only arrays can have their dense
-   * elements converted to doubles, and arrays never have empty elements.
-   */
-  HeapSlot* elementsHeapPtr = (HeapSlot*)elementsPtr;
-  MOZ_ASSERT(elementsHeapPtr != emptyObjectElements &&
-             elementsHeapPtr != emptyObjectElementsShared);
-
-  ObjectElements* header = ObjectElements::fromElements(elementsHeapPtr);
-  MOZ_ASSERT(!header->shouldConvertDoubleElements());
-
-  // Note: the elements can be mutated in place even for copy on write
-  // arrays. See comment on ObjectElements.
-  Value* vp = (Value*)elementsPtr;
-  for (size_t i = 0; i < header->initializedLength; i++) {
-    if (vp[i].isInt32()) {
-      vp[i].setDouble(vp[i].toInt32());
-    }
-  }
-
-  header->setShouldConvertDoubleElements();
-}
-
-/* static */
-bool ObjectElements::MakeElementsCopyOnWrite(JSContext* cx, NativeObject* obj) {
-  static_assert(sizeof(HeapSlot) >= sizeof(GCPtrObject),
-                "there must be enough room for the owner object pointer at "
-                "the end of the elements");
-  if (!obj->ensureElements(cx, obj->getDenseInitializedLength() + 1)) {
-    return false;
-  }
-
-  ObjectElements* header = obj->getElementsHeader();
-
-  // Note: this method doesn't update type information to indicate that the
-  // elements might be copy on write. Handling this is left to the caller.
-  MOZ_ASSERT(!header->isCopyOnWrite());
-  MOZ_ASSERT(obj->isExtensible());
-  header->flags |= COPY_ON_WRITE;
-
-  header->ownerObject().init(obj);
-  return true;
-}
-
-/* static */
-bool ObjectElements::PrepareForPreventExtensions(JSContext* cx,
+void ObjectElements::PrepareForPreventExtensions(JSContext* cx,
                                                  NativeObject* obj) {
-  if (!obj->maybeCopyElementsForWrite(cx)) {
-    return false;
-  }
-
   if (!obj->hasEmptyElements()) {
     obj->shrinkCapacityToInitializedLength(cx);
-    MarkObjectGroupFlags(cx, obj, OBJECT_FLAG_NON_EXTENSIBLE_ELEMENTS);
   }
 
   // shrinkCapacityToInitializedLength ensures there are no shifted elements.
   MOZ_ASSERT(obj->getElementsHeader()->numShiftedElements() == 0);
-
-  return true;
 }
 
 /* static */
 void ObjectElements::PreventExtensions(NativeObject* obj) {
-  MOZ_ASSERT(!obj->denseElementsAreCopyOnWrite());
   MOZ_ASSERT(!obj->isExtensible());
   MOZ_ASSERT(obj->getElementsHeader()->numShiftedElements() == 0);
   MOZ_ASSERT(obj->getDenseInitializedLength() == obj->getDenseCapacity());
@@ -196,7 +139,6 @@
                                   IntegrityLevel level) {
   MOZ_ASSERT_IF(level == IntegrityLevel::Frozen && obj->is<ArrayObject>(),
                 !obj->as<ArrayObject>().lengthIsWritable());
-  MOZ_ASSERT(!obj->denseElementsAreCopyOnWrite());
   MOZ_ASSERT(!obj->isExtensible());
   MOZ_ASSERT(obj->getElementsHeader()->numShiftedElements() == 0);
 
@@ -367,27 +309,6 @@
   return Shape::searchNoHashify(lastProperty(), id);
 }
 
-void NativeObject::setLastPropertyShrinkFixedSlots(Shape* shape) {
-  MOZ_ASSERT(!inDictionaryMode());
-  MOZ_ASSERT(!shape->inDictionary());
-  MOZ_ASSERT(shape->zone() == zone());
-  MOZ_ASSERT(lastProperty()->slotSpan() == shape->slotSpan());
-  MOZ_ASSERT(shape->getObjectClass() == getClass());
-
-  DebugOnly<size_t> oldFixed = numFixedSlots();
-  DebugOnly<size_t> newFixed = shape->numFixedSlots();
-  MOZ_ASSERT(newFixed < oldFixed);
-  MOZ_ASSERT(shape->slotSpan() <= oldFixed);
-  MOZ_ASSERT(shape->slotSpan() <= newFixed);
-  MOZ_ASSERT(numDynamicSlots() == 0);
-  MOZ_ASSERT(calculateDynamicSlots(oldFixed, shape->slotSpan(), getClass()) ==
-             0);
-  MOZ_ASSERT(calculateDynamicSlots(newFixed, shape->slotSpan(), getClass()) ==
-             0);
-
-  setShape(shape);
-}
-
 bool NativeObject::ensureSlotsForDictionaryObject(JSContext* cx,
                                                   uint32_t span) {
   MOZ_ASSERT(inDictionaryMode());
@@ -499,7 +420,6 @@
   AutoUnsafeCallWithABI unsafe;
 
   MOZ_ASSERT(obj->getDenseInitializedLength() == obj->getDenseCapacity());
-  MOZ_ASSERT(!obj->denseElementsAreCopyOnWrite());
   MOZ_ASSERT(obj->isExtensible());
   MOZ_ASSERT(!obj->isIndexed());
   MOZ_ASSERT(!obj->is<TypedArrayObject>());
@@ -674,24 +594,18 @@
    * properties into dense elements.
    */
 
-  if (!obj->maybeCopyElementsForWrite(cx)) {
-    return DenseElementResult::Failure;
-  }
-
   if (newInitializedLength > obj->getDenseCapacity()) {
     if (!obj->growElements(cx, newInitializedLength)) {
       return DenseElementResult::Failure;
     }
   }
 
-  obj->ensureDenseInitializedLength(cx, newInitializedLength, 0);
+  obj->ensureDenseInitializedLength(newInitializedLength, 0);
 
   if (ObjectRealm::get(obj).objectMaybeInIteration(obj)) {
     // Mark the densified elements as maybe-in-iteration. See also the comment
     // in GetIterator.
-    if (!obj->markDenseElementsMaybeInIteration(cx)) {
-      return DenseElementResult::Failure;
-    }
+    obj->markDenseElementsMaybeInIteration();
   }
 
   RootedValue value(cx);
@@ -801,7 +715,7 @@
     // Don't bother reserving elements if the number of elements is small.
     // Note that there's no technical reason for using this particular
     // limit.
-    if (header->initializedLength <= 10 || header->isCopyOnWrite() ||
+    if (header->initializedLength <= 10 ||
         header->hasNonwritableArrayLength() ||
         MOZ_UNLIKELY(count > ObjectElements::MaxShiftedElements)) {
       return false;
@@ -963,9 +877,6 @@
 bool NativeObject::growElements(JSContext* cx, uint32_t reqCapacity) {
   MOZ_ASSERT(isExtensible());
   MOZ_ASSERT(canHaveNonEmptyElements());
-  if (denseElementsAreCopyOnWrite()) {
-    MOZ_CRASH();
-  }
 
   // If there are shifted elements, consider moving them first. If we don't
   // move them here, the code below will include the shifted elements in the
@@ -1070,10 +981,6 @@
   MOZ_ASSERT(canHaveNonEmptyElements());
   MOZ_ASSERT(reqCapacity >= getDenseInitializedLength());
 
-  if (denseElementsAreCopyOnWrite()) {
-    MOZ_CRASH();
-  }
-
   if (!hasDynamicElements()) {
     return;
   }
@@ -1162,49 +1069,6 @@
 }
 
 /* static */
-bool NativeObject::CopyElementsForWrite(JSContext* cx, NativeObject* obj) {
-  MOZ_ASSERT(obj->denseElementsAreCopyOnWrite());
-  MOZ_ASSERT(obj->isExtensible());
-
-  // The original owner of a COW elements array should never be modified.
-  MOZ_ASSERT(obj->getElementsHeader()->ownerObject() != obj);
-
-  uint32_t initlen = obj->getDenseInitializedLength();
-  uint32_t newAllocated = 0;
-  if (!goodElementsAllocationAmount(cx, initlen, 0, &newAllocated)) {
-    return false;
-  }
-
-  uint32_t newCapacity = newAllocated - ObjectElements::VALUES_PER_HEADER;
-
-  // COPY_ON_WRITE flags is set only if obj is a dense array.
-  MOZ_ASSERT(newCapacity <= MAX_DENSE_ELEMENTS_COUNT);
-
-  gc::PreWriteBarrier(obj->getElementsHeader()->ownerObject().get());
-
-  HeapSlot* newHeaderSlots =
-      AllocateObjectBuffer<HeapSlot>(cx, obj, newAllocated);
-  if (!newHeaderSlots) {
-    return false;
-  }
-  ObjectElements* newheader = reinterpret_cast<ObjectElements*>(newHeaderSlots);
-  js_memcpy(newheader, obj->getElementsHeader(),
-            (ObjectElements::VALUES_PER_HEADER + initlen) * sizeof(Value));
-
-  newheader->capacity = newCapacity;
-  newheader->clearCopyOnWrite();
-  obj->elements_ = newheader->elements();
-
-  Debug_SetSlotRangeToCrashOnTouch(obj->elements_ + initlen,
-                                   newCapacity - initlen);
-
-  AddCellMemory(obj, newAllocated * sizeof(HeapSlot),
-                MemoryUse::ObjectElements);
-
-  return true;
-}
-
-/* static */
 bool NativeObject::allocDictionarySlot(JSContext* cx, HandleNativeObject obj,
                                        uint32_t* slotp) {
   MOZ_ASSERT(obj->inDictionaryMode());
@@ -1332,7 +1196,7 @@
     ArrayObject* arr = &obj->as<ArrayObject>();
     uint32_t length = arr->length();
     if (index >= length) {
-      arr->setLength(cx, index + 1);
+      arr->setLength(index + 1);
     }
     return true;
   }
@@ -1341,13 +1205,9 @@
   if (MOZ_UNLIKELY(addProperty)) {
     MOZ_ASSERT(!cx->isHelperThreadContext());
 
-    if (!obj->maybeCopyElementsForWrite(cx)) {
-      return false;
-    }
-
     RootedId id(cx, INT_TO_JSID(index));
     if (!CallJSAddPropertyOp(cx, addProperty, obj, id, value)) {
-      obj->setDenseElementHole(cx, index);
+      obj->setDenseElementHole(index);
       return false;
     }
   }
@@ -1363,108 +1223,6 @@
   return !arr->lengthIsWritable() && index >= arr->length();
 }
 
-static MOZ_ALWAYS_INLINE void UpdateShapeTypeAndValue(JSContext* cx,
-                                                      NativeObject* obj,
-                                                      Shape* shape, jsid id,
-                                                      const Value& value) {
-  MOZ_ASSERT(id == shape->propid());
-
-  if (shape->isDataProperty()) {
-    obj->setSlotWithType(cx, shape, value, /* overwriting = */ false);
-
-    // Per the acquired properties analysis, when the shape of a partially
-    // initialized object is changed to its fully initialized shape, its
-    // group can be updated as well.
-    AutoSweepObjectGroup sweep(obj->groupRaw());
-    if (TypeNewScript* newScript = obj->groupRaw()->newScript(sweep)) {
-      if (newScript->initializedShape() == shape) {
-        obj->setGroup(newScript->initializedGroup());
-      }
-    }
-  } else {
-    MarkTypePropertyNonData(cx, obj, id);
-  }
-  if (!shape->writable()) {
-    MarkTypePropertyNonWritable(cx, obj, id);
-  }
-}
-
-// Version of UpdateShapeTypeAndValue optimized for plain data properties.
-static MOZ_ALWAYS_INLINE void UpdateShapeTypeAndValueForWritableDataProp(
-    JSContext* cx, NativeObject* obj, Shape* shape, jsid id,
-    const Value& value) {
-  MOZ_ASSERT(id == shape->propid());
-
-  MOZ_ASSERT(shape->isDataProperty());
-  MOZ_ASSERT(shape->hasDefaultGetter());
-  MOZ_ASSERT(shape->hasDefaultSetter());
-  MOZ_ASSERT(shape->writable());
-
-  obj->setSlotWithType(cx, shape, value, /* overwriting = */ false);
-
-  // Per the acquired properties analysis, when the shape of a partially
-  // initialized object is changed to its fully initialized shape, its
-  // group can be updated as well.
-  AutoSweepObjectGroup sweep(obj->groupRaw());
-  if (TypeNewScript* newScript = obj->groupRaw()->newScript(sweep)) {
-    if (newScript->initializedShape() == shape) {
-      obj->setGroup(newScript->initializedGroup());
-    }
-  }
-}
-
-void js::AddPropertyTypesAfterProtoChange(JSContext* cx, NativeObject* obj,
-                                          ObjectGroup* oldGroup) {
-  MOZ_ASSERT(obj->group() != oldGroup);
-  MOZ_ASSERT(!obj->group()->unknownPropertiesDontCheckGeneration());
-
-  AutoSweepObjectGroup sweepOldGroup(oldGroup);
-  if (oldGroup->unknownProperties(sweepOldGroup)) {
-    MarkObjectGroupUnknownProperties(cx, obj->group());
-    return;
-  }
-
-  // First copy the dynamic flags.
-  MarkObjectGroupFlags(
-      cx, obj, oldGroup->flags(sweepOldGroup) & OBJECT_FLAG_DYNAMIC_MASK);
-
-  // Now update all property types. If the object has many properties, this
-  // function may be slow so we mark all properties as unknown.
-  static const size_t MaxPropertyCount = 40;
-
-  size_t nprops = obj->getDenseInitializedLength();
-  if (nprops > MaxPropertyCount) {
-    MarkObjectGroupUnknownProperties(cx, obj->group());
-    return;
-  }
-
-  // Add dense element types.
-  for (size_t i = 0; i < obj->getDenseInitializedLength(); i++) {
-    Value val = obj->getDenseElement(i);
-    if (!val.isMagic(JS_ELEMENTS_HOLE)) {
-      AddTypePropertyId(cx, obj, JSID_VOID, val);
-    }
-  }
-
-  // Add property types.
-  for (Shape::Range<NoGC> r(obj->lastProperty()); !r.empty(); r.popFront()) {
-    Shape* shape = &r.front();
-    jsid id = shape->propid();
-    if (JSID_IS_EMPTY(id)) {
-      continue;
-    }
-
-    if (nprops++ > MaxPropertyCount) {
-      MarkObjectGroupUnknownProperties(cx, obj->group());
-      return;
-    }
-
-    Value val = shape->isDataProperty() ? obj->getSlot(shape->slot())
-                                        : UndefinedValue();
-    UpdateShapeTypeAndValue(cx, obj, shape, id, val);
-  }
-}
-
 static bool ReshapeForShadowedPropSlow(JSContext* cx, HandleNativeObject obj,
                                        HandleId id) {
   MOZ_ASSERT(obj->isDelegate());
@@ -1543,7 +1301,7 @@
       return false;
     }
     if (edResult == DenseElementResult::Success) {
-      obj->setDenseElementWithType(cx, index, desc.value());
+      obj->setDenseElement(index, desc.value());
       if (!CallAddPropertyHookDense(cx, obj, index, desc.value())) {
         return false;
       }
@@ -1553,40 +1311,43 @@
 
   // If we know this is a new property we can call addProperty instead of
   // the slower putProperty.
-  Shape* shape;
-  if (AddOrChange == IsAddOrChange::Add) {
+  if constexpr (AddOrChange == IsAddOrChange::Add) {
     if (Shape::isDataProperty(desc.attributes(), desc.getter(),
                               desc.setter())) {
-      shape = NativeObject::addDataProperty(cx, obj, id, SHAPE_INVALID_SLOT,
-                                            desc.attributes());
+      Shape* shape = NativeObject::addDataProperty(
+          cx, obj, id, SHAPE_INVALID_SLOT, desc.attributes());
+      if (!shape) {
+        return false;
+      }
+      obj->initSlot(shape->slot(), desc.value());
     } else {
-      shape = NativeObject::addAccessorProperty(
-          cx, obj, id, desc.getter(), desc.setter(), desc.attributes());
+      if (!NativeObject::addAccessorProperty(
+              cx, obj, id, desc.getter(), desc.setter(), desc.attributes())) {
+        return false;
+      }
     }
   } else {
     if (Shape::isDataProperty(desc.attributes(), desc.getter(),
                               desc.setter())) {
-      shape = NativeObject::putDataProperty(cx, obj, id, desc.attributes());
+      Shape* shape =
+          NativeObject::putDataProperty(cx, obj, id, desc.attributes());
+      if (!shape) {
+        return false;
+      }
+      obj->setSlot(shape->slot(), desc.value());
     } else {
-      shape = NativeObject::putAccessorProperty(
-          cx, obj, id, desc.getter(), desc.setter(), desc.attributes());
+      if (!NativeObject::putAccessorProperty(
+              cx, obj, id, desc.getter(), desc.setter(), desc.attributes())) {
+        return false;
+      }
     }
   }
-  if (!shape) {
-    return false;
-  }
-
-  UpdateShapeTypeAndValue(cx, obj, shape, id, desc.value());
 
   // Clear any existing dense index after adding a sparse indexed property,
   // and investigate converting the object to dense indexes.
   if (JSID_IS_INT(id)) {
-    if (!obj->maybeCopyElementsForWrite(cx)) {
-      return false;
-    }
-
     uint32_t index = JSID_TO_INT(id);
-    obj->removeDenseElementForSparseIndex(cx, index);
+    obj->removeDenseElementForSparseIndex(index);
     DenseElementResult edResult =
         NativeObject::maybeDensifySparseElements(cx, obj);
     if (edResult == DenseElementResult::Failure) {
@@ -1618,7 +1379,7 @@
     return false;
   }
 
-  UpdateShapeTypeAndValueForWritableDataProp(cx, obj, shape, id, v);
+  obj->setSlot(shape->slot(), v);
 
   return CallAddPropertyHook(cx, obj, id, v);
 }
@@ -1637,7 +1398,7 @@
     return false;
   }
 
-  UpdateShapeTypeAndValueForWritableDataProp(cx, obj, shape, id, v);
+  obj->setSlot(shape->slot(), v);
 
   MOZ_ASSERT(!obj->getClass()->getAddProperty());
   return true;
@@ -1888,13 +1649,6 @@
     return false;
   }
   if (redundant) {
-    // In cases involving JSOp::NewObject and JSOp::InitProp, obj can have a
-    // type for this property that doesn't match the value in the slot.
-    // Update the type here, even though this DefineProperty call is
-    // otherwise a no-op. (See bug 1125624 comment 13.)
-    if (prop.isNativeProperty() && desc.hasValue()) {
-      UpdateShapeTypeAndValue(cx, obj, prop.shape(), id, desc.value());
-    }
     return result.succeed();
   }
 
@@ -2235,10 +1989,7 @@
 
   // At this point we're updating a property: See SetExistingProperty
   if (shape->writable() && shape->isDataProperty()) {
-    // While all JSID_INT properties use a single TI entry,
-    // nothing yet has inspected the updated value so we *must* use
-    // setSlotWithType().
-    obj->setSlotWithType(cx, shape, v, /* overwriting = */ true);
+    obj->setSlot(shape->slot(), v);
     return true;
   }
 
@@ -2397,11 +2148,6 @@
     MOZ_ASSERT(shape->hasDefaultGetter());
 
     vp.set(obj->getSlot(shape->slot()));
-
-    MOZ_ASSERT_IF(
-        !vp.isMagic(JS_UNINITIALIZED_LEXICAL) && !obj->isSingleton() &&
-            !obj->template is<EnvironmentObject>() && shape->hasDefaultGetter(),
-        ObjectGroupHasProperty(cx, obj->group(), shape->propid(), vp));
     return true;
   }
 
@@ -2411,23 +2157,6 @@
     return true;
   }
 
-  if (!jit::JitOptions.warpBuilder) {
-    // Set the accessed-getter flag for IonBuilder.
-    jsbytecode* pc;
-    JSScript* script = cx->currentScript(&pc);
-    if (script && script->hasJitScript()) {
-      switch (JSOp(*pc)) {
-        case JSOp::GetProp:
-        case JSOp::CallProp:
-        case JSOp::Length:
-          script->jitScript()->noteAccessedGetter(script->pcToOffset(pc));
-          break;
-        default:
-          break;
-      }
-    }
-  }
-
   if constexpr (!allowGC) {
     return false;
   } else {
@@ -2703,13 +2432,7 @@
   if (shape->hasDefaultSetter()) {
     if (shape->isDataProperty()) {
       // The common path. Standard data property.
-
-      // Global properties declared with 'var' will be initially
-      // defined with an undefined value, so don't treat the initial
-      // assignments to such properties as overwrites.
-      bool overwriting = !obj->is<GlobalObject>() ||
-                         !obj->getSlot(shape->slot()).isUndefined();
-      obj->setSlotWithType(cx, shape, v, overwriting);
+      obj->setSlot(shape->slot(), v);
       return result.succeed();
     }
 
@@ -2858,11 +2581,7 @@
   MOZ_ASSERT(!obj->is<TypedArrayObject>());
   MOZ_ASSERT(obj->containsDenseElement(index));
 
-  if (!obj->maybeCopyElementsForWrite(cx)) {
-    return false;
-  }
-
-  obj->setDenseElementWithType(cx, index, v);
+  obj->setDenseElement(index, v);
   return result.succeed();
 }
 
@@ -3064,11 +2783,7 @@
 
   // Step 5.
   if (prop.isDenseElement()) {
-    if (!obj->maybeCopyElementsForWrite(cx)) {
-      return false;
-    }
-
-    obj->setDenseElementHole(cx, prop.denseElementIndex());
+    obj->setDenseElementHole(prop.denseElementIndex());
   } else {
     if (!NativeObject::removeProperty(cx, obj, id)) {
       return false;
diff -Nru firefox-84.0.2+build1/js/src/vm/NativeObject.h firefox-85.0+build1/js/src/vm/NativeObject.h
--- firefox-84.0.2+build1/js/src/vm/NativeObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/NativeObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -181,21 +181,13 @@
 class ObjectElements {
  public:
   enum Flags : uint16_t {
-    // Integers written to these elements must be converted to doubles.
-    CONVERT_DOUBLE_ELEMENTS = 0x1,
+    // (0x1 is unused)
 
     // Present only if these elements correspond to an array with
     // non-writable length; never present for non-arrays.
     NONWRITABLE_ARRAY_LENGTH = 0x2,
 
-    // These elements are shared with another object and must be copied
-    // before they can be changed. A pointer to the original owner of the
-    // elements, which is immutable, is stored immediately after the
-    // elements data. There is one case where elements can be written to
-    // before being copied: when setting the CONVERT_DOUBLE_ELEMENTS flag
-    // the shared elements may change (from ints to doubles) without
-    // making a copy first.
-    COPY_ON_WRITE = 0x4,
+    // (0x4 is unused)
 
     // For TypedArrays only: this TypedArray's storage is mapping shared
     // memory.  This is a static property of the TypedArray, set when it
@@ -272,17 +264,6 @@
   /* 'length' property of array objects, unused for other objects. */
   uint32_t length;
 
-  bool shouldConvertDoubleElements() const {
-    return flags & CONVERT_DOUBLE_ELEMENTS;
-  }
-  void setShouldConvertDoubleElements() {
-    // Note: allow isCopyOnWrite() here, see comment above.
-    flags |= CONVERT_DOUBLE_ELEMENTS;
-  }
-  void clearShouldConvertDoubleElements() {
-    MOZ_ASSERT(!isCopyOnWrite());
-    flags &= ~CONVERT_DOUBLE_ELEMENTS;
-  }
   bool hasNonwritableArrayLength() const {
     return flags & NONWRITABLE_ARRAY_LENGTH;
   }
@@ -290,20 +271,14 @@
     // See ArrayObject::setNonWritableLength.
     MOZ_ASSERT(capacity == initializedLength);
     MOZ_ASSERT(numShiftedElements() == 0);
-    MOZ_ASSERT(!isCopyOnWrite());
     flags |= NONWRITABLE_ARRAY_LENGTH;
   }
-  bool isCopyOnWrite() const { return flags & COPY_ON_WRITE; }
-  void clearCopyOnWrite() {
-    MOZ_ASSERT(isCopyOnWrite());
-    flags &= ~COPY_ON_WRITE;
-  }
 
   void addShiftedElements(uint32_t count) {
     MOZ_ASSERT(count < capacity);
     MOZ_ASSERT(count < initializedLength);
-    MOZ_ASSERT(!(flags & (NONWRITABLE_ARRAY_LENGTH | NOT_EXTENSIBLE | SEALED |
-                          FROZEN | COPY_ON_WRITE)));
+    MOZ_ASSERT(!(
+        flags & (NONWRITABLE_ARRAY_LENGTH | NOT_EXTENSIBLE | SEALED | FROZEN)));
     uint32_t numShifted = numShiftedElements() + count;
     MOZ_ASSERT(numShifted <= MaxShiftedElements);
     flags = (numShifted << NumShiftedElementsShift) | (flags & FlagsMask);
@@ -312,8 +287,8 @@
   }
   void unshiftShiftedElements(uint32_t count) {
     MOZ_ASSERT(count > 0);
-    MOZ_ASSERT(!(flags & (NONWRITABLE_ARRAY_LENGTH | NOT_EXTENSIBLE | SEALED |
-                          FROZEN | COPY_ON_WRITE)));
+    MOZ_ASSERT(!(
+        flags & (NONWRITABLE_ARRAY_LENGTH | NOT_EXTENSIBLE | SEALED | FROZEN)));
     uint32_t numShifted = numShiftedElements();
     MOZ_ASSERT(count <= numShifted);
     numShifted -= count;
@@ -341,14 +316,12 @@
     MOZ_ASSERT(isNotExtensible());
     MOZ_ASSERT(!isSealed());
     MOZ_ASSERT(!isFrozen());
-    MOZ_ASSERT(!isCopyOnWrite());
     flags |= SEALED;
   }
   void freeze() {
     MOZ_ASSERT(isNotExtensible());
     MOZ_ASSERT(isSealed());
     MOZ_ASSERT(!isFrozen());
-    MOZ_ASSERT(!isCopyOnWrite());
     flags |= FROZEN;
   }
 
@@ -382,11 +355,6 @@
 
   bool isSharedMemory() const { return flags & SHARED_MEMORY; }
 
-  GCPtrNativeObject& ownerObject() const {
-    MOZ_ASSERT(isCopyOnWrite());
-    return *(GCPtrNativeObject*)(&elements()[initializedLength]);
-  }
-
   static int offsetOfFlags() {
     return int(offsetof(ObjectElements, flags)) - int(sizeof(ObjectElements));
   }
@@ -402,11 +370,7 @@
     return int(offsetof(ObjectElements, length)) - int(sizeof(ObjectElements));
   }
 
-  static void ConvertElementsToDoubles(JSContext* cx, uintptr_t elements);
-  static bool MakeElementsCopyOnWrite(JSContext* cx, NativeObject* obj);
-
-  static MOZ_MUST_USE bool PrepareForPreventExtensions(JSContext* cx,
-                                                       NativeObject* obj);
+  static void PrepareForPreventExtensions(JSContext* cx, NativeObject* obj);
   static void PreventExtensions(NativeObject* obj);
   static MOZ_MUST_USE bool FreezeOrSeal(JSContext* cx, HandleNativeObject obj,
                                         IntegrityLevel level);
@@ -429,7 +393,7 @@
     uint32_t numShifted = flags >> NumShiftedElementsShift;
     MOZ_ASSERT_IF(numShifted > 0,
                   !(flags & (NONWRITABLE_ARRAY_LENGTH | NOT_EXTENSIBLE |
-                             SEALED | FROZEN | COPY_ON_WRITE)));
+                             SEALED | FROZEN)));
     return numShifted;
   }
 
@@ -522,8 +486,6 @@
 // become sparse instead. The enum below is used for such operations.
 enum class DenseElementResult { Failure, Success, Incomplete };
 
-enum class ShouldUpdateTypes { Update, DontUpdate };
-
 /*
  * [SMDOC] NativeObject layout
  *
@@ -604,13 +566,8 @@
 
   bool hasShapeIC() const { return lastProperty()->hasIC(); }
 
-  HeapSlotArray getDenseElements() {
-    return HeapSlotArray(elements_, !getElementsHeader()->isCopyOnWrite());
-  }
-  HeapSlotArray getDenseElementsAllowCopyOnWrite() {
-    // Backdoor allowing direct access to copy on write elements.
-    return HeapSlotArray(elements_, true);
-  }
+  HeapSlotArray getDenseElements() { return HeapSlotArray(elements_); }
+
   const Value& getDenseElement(uint32_t idx) const {
     MOZ_ASSERT(idx < getDenseInitializedLength());
     return elements_[idx];
@@ -630,12 +587,6 @@
   // with the object's new slot span.
   MOZ_ALWAYS_INLINE bool setLastProperty(JSContext* cx, Shape* shape);
 
-  // As for setLastProperty(), but allows the number of fixed slots to
-  // change. This can only be used when fixed slots are being erased from the
-  // object, and only when the object will not require dynamic slots to cover
-  // the new properties.
-  void setLastPropertyShrinkFixedSlots(Shape* shape);
-
   // Newly-created TypedArrays that map a SharedArrayBuffer are
   // marked as shared by giving them an ObjectElements that has the
   // ObjectElements::SHARED_MEMORY flag set.
@@ -1153,7 +1104,6 @@
  private:
   void prepareElementRangeForOverwrite(size_t start, size_t end) {
     MOZ_ASSERT(end <= getDenseInitializedLength());
-    MOZ_ASSERT(!denseElementsAreCopyOnWrite());
     for (size_t i = start; i < end; i++) {
       elements_[i].destroy();
     }
@@ -1172,13 +1122,6 @@
   inline void shiftDenseElementsUnchecked(uint32_t count);
 
  public:
-  static bool rollbackProperties(JSContext* cx, HandleNativeObject obj,
-                                 uint32_t slotSpan);
-
-  MOZ_ALWAYS_INLINE void setSlotWithType(JSContext* cx, Shape* shape,
-                                         const Value& value,
-                                         bool overwriting = true);
-
   MOZ_ALWAYS_INLINE const Value& getReservedSlot(uint32_t index) const {
     MOZ_ASSERT(index < JSSLOT_FREE(getClass()));
     return getSlot(index);
@@ -1283,7 +1226,6 @@
 
   /* Accessors for elements. */
   bool ensureElements(JSContext* cx, uint32_t capacity) {
-    MOZ_ASSERT(!denseElementsAreCopyOnWrite());
     MOZ_ASSERT(isExtensible());
     if (capacity > getDenseCapacity()) {
       return growElements(cx, capacity);
@@ -1315,15 +1257,6 @@
     MOZ_ASSERT(hasDynamicElements());
   }
 
-  static bool CopyElementsForWrite(JSContext* cx, NativeObject* obj);
-
-  bool maybeCopyElementsForWrite(JSContext* cx) {
-    if (denseElementsAreCopyOnWrite()) {
-      return CopyElementsForWrite(cx, this);
-    }
-    return true;
-  }
-
  private:
   // Run a post write barrier that encompasses multiple contiguous elements in a
   // single step.
@@ -1335,7 +1268,6 @@
  private:
   void setDenseInitializedLengthInternal(uint32_t length) {
     MOZ_ASSERT(length <= getDenseCapacity());
-    MOZ_ASSERT(!denseElementsAreCopyOnWrite());
     MOZ_ASSERT(!denseElementsAreFrozen());
     prepareElementRangeForOverwrite(length,
                                     getElementsHeader()->initializedLength);
@@ -1356,8 +1288,7 @@
     }
   }
 
-  inline void ensureDenseInitializedLength(JSContext* cx, uint32_t index,
-                                           uint32_t extra);
+  inline void ensureDenseInitializedLength(uint32_t index, uint32_t extra);
 
   void setDenseElement(uint32_t index, const Value& val) {
     // Note: Streams code can call this for the internal ListObject type with
@@ -1368,44 +1299,39 @@
 
   void initDenseElement(uint32_t index, const Value& val) {
     MOZ_ASSERT(!val.isMagic(JS_ELEMENTS_HOLE));
-    MOZ_ASSERT(index < getDenseInitializedLength());
-    MOZ_ASSERT(!denseElementsAreCopyOnWrite());
-    MOZ_ASSERT(isExtensible());
-    checkStoredValue(val);
-    elements_[index].init(this, HeapSlot::Element, unshiftedIndex(index), val);
+    initDenseElementUnchecked(index, val);
   }
 
  private:
   // Note: 'Unchecked' here means we don't assert |val| isn't the hole
   // MagicValue.
+  void initDenseElementUnchecked(uint32_t index, const Value& val) {
+    MOZ_ASSERT(index < getDenseInitializedLength());
+    MOZ_ASSERT(isExtensible());
+    checkStoredValue(val);
+    elements_[index].init(this, HeapSlot::Element, unshiftedIndex(index), val);
+  }
   void setDenseElementUnchecked(uint32_t index, const Value& val) {
     MOZ_ASSERT(index < getDenseInitializedLength());
-    MOZ_ASSERT(!denseElementsAreCopyOnWrite());
     MOZ_ASSERT(!denseElementsAreFrozen());
     checkStoredValue(val);
     elements_[index].set(this, HeapSlot::Element, unshiftedIndex(index), val);
   }
 
-  inline void addDenseElementType(JSContext* cx, uint32_t index,
-                                  const Value& val);
-
   // Mark the dense elements as possibly containing holes.
-  inline void markDenseElementsNotPacked(JSContext* cx);
+  inline void markDenseElementsNotPacked();
 
  public:
-  inline void setDenseElementWithType(JSContext* cx, uint32_t index,
-                                      const Value& val);
-  inline void initDenseElementWithType(JSContext* cx, uint32_t index,
-                                       const Value& val);
-  inline void setDenseElementHole(JSContext* cx, uint32_t index);
-  inline void removeDenseElementForSparseIndex(JSContext* cx, uint32_t index);
+  inline void initDenseElementHole(uint32_t index);
+  inline void setDenseElementHole(uint32_t index);
+  inline void removeDenseElementForSparseIndex(uint32_t index);
 
   inline void copyDenseElements(uint32_t dstStart, const Value* src,
                                 uint32_t count);
 
   inline void initDenseElements(const Value* src, uint32_t count);
-  inline void initDenseElements(JSContext* cx, NativeObject* src,
-                                uint32_t srcStart, uint32_t count);
+  inline void initDenseElements(NativeObject* src, uint32_t srcStart,
+                                uint32_t count);
 
   // Store the Values in the range [begin, end) as elements of this array.
   //
@@ -1424,20 +1350,10 @@
                                 uint32_t count);
   inline void reverseDenseElementsNoPreBarrier(uint32_t length);
 
-  inline DenseElementResult setOrExtendDenseElements(
-      JSContext* cx, uint32_t start, const Value* vp, uint32_t count,
-      ShouldUpdateTypes updateTypes = ShouldUpdateTypes::Update);
-
-  bool shouldConvertDoubleElements() {
-    return getElementsHeader()->shouldConvertDoubleElements();
-  }
-
-  inline void setShouldConvertDoubleElements();
-  inline void clearShouldConvertDoubleElements();
-
-  bool denseElementsAreCopyOnWrite() const {
-    return getElementsHeader()->isCopyOnWrite();
-  }
+  inline DenseElementResult setOrExtendDenseElements(JSContext* cx,
+                                                     uint32_t start,
+                                                     const Value* vp,
+                                                     uint32_t count);
 
   bool denseElementsAreSealed() const {
     return getElementsHeader()->isSealed();
@@ -1450,12 +1366,8 @@
     return getElementsHeader()->isPacked();
   }
 
-  MOZ_MUST_USE bool markDenseElementsMaybeInIteration(JSContext* cx) {
-    if (!maybeCopyElementsForWrite(cx)) {
-      return false;
-    }
+  void markDenseElementsMaybeInIteration() {
     getElementsHeader()->markMaybeInIteration();
-    return true;
   }
 
   // Return whether the object's dense elements might be in the midst of for-in
@@ -1788,9 +1700,6 @@
 // Defined in NativeObject-inl.h.
 bool IsPackedArray(JSObject* obj);
 
-extern void AddPropertyTypesAfterProtoChange(JSContext* cx, NativeObject* obj,
-                                             ObjectGroup* oldGroup);
-
 // Initialize an object's reserved slot with a private value pointing to
 // malloc-allocated memory and associate the memory with the object.
 //
diff -Nru firefox-84.0.2+build1/js/src/vm/NativeObject-inl.h firefox-85.0+build1/js/src/vm/NativeObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/NativeObject-inl.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/NativeObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -68,79 +68,26 @@
   return previous->getObjectFlags() == lastProperty()->getObjectFlags();
 }
 
-inline void NativeObject::setShouldConvertDoubleElements() {
-  MOZ_ASSERT(is<ArrayObject>() && !hasEmptyElements());
-  getElementsHeader()->setShouldConvertDoubleElements();
+inline void NativeObject::initDenseElementHole(uint32_t index) {
+  markDenseElementsNotPacked();
+  initDenseElementUnchecked(index, MagicValue(JS_ELEMENTS_HOLE));
 }
 
-inline void NativeObject::clearShouldConvertDoubleElements() {
-  MOZ_ASSERT(is<ArrayObject>() && !hasEmptyElements());
-  getElementsHeader()->clearShouldConvertDoubleElements();
-}
-
-inline void NativeObject::addDenseElementType(JSContext* cx, uint32_t index,
-                                              const Value& val) {
-  MOZ_ASSERT(!val.isMagic(JS_ELEMENTS_HOLE));
-
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-
-  // Avoid a slow AddTypePropertyId call if the type is the same as the type
-  // of the previous element.
-  TypeSet::Type thisType = TypeSet::GetValueType(val);
-  if (index == 0 || elements_[index - 1].isMagic() ||
-      TypeSet::GetValueType(elements_[index - 1]) != thisType) {
-    AddTypePropertyId(cx, this, JSID_VOID, thisType);
-  }
-}
-
-inline void NativeObject::setDenseElementWithType(JSContext* cx, uint32_t index,
-                                                  const Value& val) {
-  MOZ_ASSERT(!val.isMagic(JS_ELEMENTS_HOLE));
-
-  addDenseElementType(cx, index, val);
-  if (val.isInt32() && shouldConvertDoubleElements()) {
-    setDenseElement(index, DoubleValue(val.toInt32()));
-  } else {
-    setDenseElement(index, val);
-  }
-}
-
-inline void NativeObject::initDenseElementWithType(JSContext* cx,
-                                                   uint32_t index,
-                                                   const Value& val) {
-  MOZ_ASSERT(!shouldConvertDoubleElements());
-  MOZ_ASSERT(!val.isMagic(JS_ELEMENTS_HOLE));
-
-  addDenseElementType(cx, index, val);
-  initDenseElement(index, val);
-}
-
-inline void NativeObject::setDenseElementHole(JSContext* cx, uint32_t index) {
-  markDenseElementsNotPacked(cx);
+inline void NativeObject::setDenseElementHole(uint32_t index) {
+  markDenseElementsNotPacked();
   setDenseElementUnchecked(index, MagicValue(JS_ELEMENTS_HOLE));
 }
 
-inline void NativeObject::removeDenseElementForSparseIndex(JSContext* cx,
-                                                           uint32_t index) {
+inline void NativeObject::removeDenseElementForSparseIndex(uint32_t index) {
   MOZ_ASSERT(containsPure(INT_TO_JSID(index)));
-  if (IsTypeInferenceEnabled()) {
-    MarkObjectGroupFlags(cx, this, OBJECT_FLAG_SPARSE_INDEXES);
-  }
   if (containsDenseElement(index)) {
-    setDenseElementHole(cx, index);
+    setDenseElementHole(index);
   }
 }
 
-inline void NativeObject::markDenseElementsNotPacked(JSContext* cx) {
+inline void NativeObject::markDenseElementsNotPacked() {
   MOZ_ASSERT(isNative());
-
   getElementsHeader()->markNonPacked();
-
-  if (IsTypeInferenceEnabled()) {
-    MarkObjectGroupFlags(cx, this, OBJECT_FLAG_NON_PACKED);
-  }
 }
 
 inline void NativeObject::elementsRangePostWriteBarrier(uint32_t start,
@@ -163,7 +110,6 @@
 inline void NativeObject::copyDenseElements(uint32_t dstStart, const Value* src,
                                             uint32_t count) {
   MOZ_ASSERT(dstStart + count <= getDenseCapacity());
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(isExtensible());
   MOZ_ASSERT_IF(count > 0, src != nullptr);
 #ifdef DEBUG
@@ -187,7 +133,7 @@
   }
 }
 
-inline void NativeObject::initDenseElements(JSContext* cx, NativeObject* src,
+inline void NativeObject::initDenseElements(NativeObject* src,
                                             uint32_t srcStart, uint32_t count) {
   MOZ_ASSERT(src->getDenseInitializedLength() >= srcStart + count);
 
@@ -198,11 +144,11 @@
     // to check this efficiently.
     static constexpr uint32_t MaxCountForPackedCheck = 30;
     if (count > MaxCountForPackedCheck) {
-      markDenseElementsNotPacked(cx);
+      markDenseElementsNotPacked();
     } else {
       for (uint32_t i = 0; i < count; i++) {
         if (vp[i].isMagic(JS_ELEMENTS_HOLE)) {
-          markDenseElementsNotPacked(cx);
+          markDenseElementsNotPacked();
           break;
         }
       }
@@ -215,7 +161,6 @@
 inline void NativeObject::initDenseElements(const Value* src, uint32_t count) {
   MOZ_ASSERT(getDenseInitializedLength() == 0);
   MOZ_ASSERT(count <= getDenseCapacity());
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(isExtensible());
 
   setDenseInitializedLength(count);
@@ -240,7 +185,6 @@
   MOZ_ASSERT(!isIndexed());
   MOZ_ASSERT(is<ArrayObject>());
   MOZ_ASSERT(as<ArrayObject>().lengthIsWritable());
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(!denseElementsAreFrozen());
   MOZ_ASSERT(getElementsHeader()->numShiftedElements() == 0);
 
@@ -267,7 +211,7 @@
   MOZ_ASSERT(slot == count);
 
   getElementsHeader()->initializedLength = count;
-  as<ArrayObject>().setLengthInt32(count);
+  as<ArrayObject>().setLength(count);
   return true;
 }
 
@@ -276,7 +220,7 @@
 
   ObjectElements* header = getElementsHeader();
   if (header->initializedLength == count ||
-      count > ObjectElements::MaxShiftedElements || header->isCopyOnWrite() ||
+      count > ObjectElements::MaxShiftedElements ||
       header->hasNonwritableArrayLength()) {
     return false;
   }
@@ -310,7 +254,6 @@
                                             uint32_t srcStart, uint32_t count) {
   MOZ_ASSERT(dstStart + count <= getDenseCapacity());
   MOZ_ASSERT(srcStart + count <= getDenseInitializedLength());
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(isExtensible());
 
   /*
@@ -350,7 +293,6 @@
 inline void NativeObject::reverseDenseElementsNoPreBarrier(uint32_t length) {
   MOZ_ASSERT(!zone()->needsIncrementalBarrier());
 
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(isExtensible());
 
   MOZ_ASSERT(length > 1);
@@ -371,14 +313,12 @@
   elementsRangePostWriteBarrier(0, length);
 }
 
-inline void NativeObject::ensureDenseInitializedLength(JSContext* cx,
-                                                       uint32_t index,
+inline void NativeObject::ensureDenseInitializedLength(uint32_t index,
                                                        uint32_t extra) {
   // Ensure that the array's contents have been initialized up to index, and
   // mark the elements through 'index + extra' as initialized in preparation
   // for a write.
 
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(!denseElementsAreFrozen());
   MOZ_ASSERT(isExtensible() || (containsDenseElement(index) && extra == 1));
   MOZ_ASSERT(index + extra <= getDenseCapacity());
@@ -391,7 +331,7 @@
   MOZ_ASSERT(isExtensible());
 
   if (index > initlen) {
-    markDenseElementsNotPacked(cx);
+    markDenseElementsNotPacked();
   }
 
   uint32_t numShifted = getElementsHeader()->numShiftedElements();
@@ -408,7 +348,6 @@
 DenseElementResult NativeObject::extendDenseElements(JSContext* cx,
                                                      uint32_t requiredCapacity,
                                                      uint32_t extra) {
-  MOZ_ASSERT(!denseElementsAreCopyOnWrite());
   MOZ_ASSERT(isExtensible());
 
   /*
@@ -442,15 +381,11 @@
   MOZ_ASSERT(isNative());
   MOZ_ASSERT(isExtensible() || (containsDenseElement(index) && extra == 1));
 
-  if (!maybeCopyElementsForWrite(cx)) {
-    return DenseElementResult::Failure;
-  }
-
   uint32_t requiredCapacity;
   if (extra == 1) {
     /* Optimize for the common case. */
     if (index < getDenseCapacity()) {
-      ensureDenseInitializedLength(cx, index, 1);
+      ensureDenseInitializedLength(index, 1);
       return DenseElementResult::Success;
     }
     requiredCapacity = index + 1;
@@ -465,7 +400,7 @@
       return DenseElementResult::Incomplete;
     }
     if (requiredCapacity <= getDenseCapacity()) {
-      ensureDenseInitializedLength(cx, index, extra);
+      ensureDenseInitializedLength(index, extra);
       return DenseElementResult::Success;
     }
   }
@@ -475,13 +410,12 @@
     return result;
   }
 
-  ensureDenseInitializedLength(cx, index, extra);
+  ensureDenseInitializedLength(index, extra);
   return DenseElementResult::Success;
 }
 
 inline DenseElementResult NativeObject::setOrExtendDenseElements(
-    JSContext* cx, uint32_t start, const Value* vp, uint32_t count,
-    ShouldUpdateTypes updateTypes) {
+    JSContext* cx, uint32_t start, const Value* vp, uint32_t count) {
   if (!isExtensible()) {
     return DenseElementResult::Incomplete;
   }
@@ -497,34 +431,13 @@
   }
 
   if (is<ArrayObject>() && start + count >= as<ArrayObject>().length()) {
-    as<ArrayObject>().setLengthInt32(start + count);
-  }
-
-  if (updateTypes == ShouldUpdateTypes::DontUpdate &&
-      !shouldConvertDoubleElements()) {
-    copyDenseElements(start, vp, count);
-  } else {
-    for (size_t i = 0; i < count; i++) {
-      setDenseElementWithType(cx, start + i, vp[i]);
-    }
+    as<ArrayObject>().setLength(start + count);
   }
 
+  copyDenseElements(start, vp, count);
   return DenseElementResult::Success;
 }
 
-MOZ_ALWAYS_INLINE void NativeObject::setSlotWithType(JSContext* cx,
-                                                     Shape* shape,
-                                                     const Value& value,
-                                                     bool overwriting) {
-  setSlot(shape->slot(), value);
-
-  if (overwriting) {
-    shape->setOverwritten();
-  }
-
-  AddTypePropertyId(cx, this, shape->propid(), value);
-}
-
 inline bool NativeObject::isInWholeCellBuffer() const {
   const gc::TenuredCell* cell = &asTenured();
   gc::ArenaCellSet* cells = cell->arena()->bufferedCells();
@@ -790,6 +703,8 @@
     }
   }
 
+  MOZ_ASSERT(cx->compartment() == obj->compartment());
+
   // Check for a native property. Call Shape::search directly (instead of
   // NativeObject::lookup) because it's inlined.
   if (Shape* shape = obj->lastProperty()->search(cx, id)) {
@@ -934,10 +849,6 @@
   }
 
   if (!arr->denseElementsArePacked()) {
-    // Assert TI agrees the elements are not packed.
-    MOZ_ASSERT_IF(
-        !arr->hasLazyGroup(),
-        arr->group()->hasAllFlagsDontCheckGeneration(OBJECT_FLAG_NON_PACKED));
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/ObjectGroup.cpp firefox-85.0+build1/js/src/vm/ObjectGroup.cpp
--- firefox-84.0.2+build1/js/src/vm/ObjectGroup.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ObjectGroup.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -32,7 +32,6 @@
 #include "gc/ObjectKind-inl.h"
 #include "vm/JSObject-inl.h"
 #include "vm/NativeObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 
@@ -40,6 +39,21 @@
 // ObjectGroup
 /////////////////////////////////////////////////////////////////////
 
+static ObjectGroup* MakeGroup(JSContext* cx, const JSClass* clasp,
+                              Handle<TaggedProto> proto,
+                              ObjectGroupFlags initialFlags = 0) {
+  MOZ_ASSERT_IF(proto.isObject(),
+                cx->isInsideCurrentCompartment(proto.toObject()));
+
+  ObjectGroup* group = Allocate<ObjectGroup>(cx);
+  if (!group) {
+    return nullptr;
+  }
+  new (group) ObjectGroup(clasp, proto, cx->realm(), initialFlags);
+
+  return group;
+}
+
 ObjectGroup::ObjectGroup(const JSClass* clasp, TaggedProto proto,
                          JS::Realm* realm, ObjectGroupFlags initialFlags)
     : TenuredCellWithNonGCPointer(clasp),
@@ -56,18 +70,6 @@
     AssertTargetIsNotGray(global);
   }
 #endif
-
-  setGeneration(zone()->types.generation);
-}
-
-void ObjectGroup::finalize(JSFreeOp* fop) {
-  if (auto newScript = newScriptDontCheckGeneration()) {
-    newScript->clear();
-    fop->delete_(this, newScript, newScript->gcMallocBytes(),
-                 MemoryUse::ObjectGroupAddendum);
-  }
-  fop->delete_(this, maybePreliminaryObjectsDontCheckGeneration(),
-               MemoryUse::ObjectGroupAddendum);
 }
 
 void ObjectGroup::setProtoUnchecked(TaggedProto proto) {
@@ -81,190 +83,6 @@
   setProtoUnchecked(proto);
 }
 
-size_t ObjectGroup::sizeOfExcludingThis(
-    mozilla::MallocSizeOf mallocSizeOf) const {
-  size_t n = 0;
-  if (TypeNewScript* newScript = newScriptDontCheckGeneration()) {
-    n += newScript->sizeOfIncludingThis(mallocSizeOf);
-  }
-  return n;
-}
-
-static inline size_t AddendumAllocSize(ObjectGroup::AddendumKind kind,
-                                       void* addendum) {
-  if (kind == ObjectGroup::Addendum_NewScript) {
-    auto newScript = static_cast<TypeNewScript*>(addendum);
-    return newScript->gcMallocBytes();
-  }
-  if (kind == ObjectGroup::Addendum_PreliminaryObjects) {
-    return sizeof(PreliminaryObjectArrayWithTemplate);
-  }
-  // Other addendum kinds point to GC memory tracked elsewhere.
-  return 0;
-}
-
-void ObjectGroup::setAddendum(AddendumKind kind, void* addendum,
-                              bool isSweeping /* = flase */) {
-  MOZ_ASSERT(!needsSweep());
-  MOZ_ASSERT(kind <= (OBJECT_FLAG_ADDENDUM_MASK >> OBJECT_FLAG_ADDENDUM_SHIFT));
-
-  RemoveCellMemory(this, AddendumAllocSize(addendumKind(), addendum_),
-                   MemoryUse::ObjectGroupAddendum, isSweeping);
-
-  if (!isSweeping) {
-    // Trigger a write barrier if we are clearing new script or preliminary
-    // object information outside of sweeping. Other addendums are immutable.
-    AutoSweepObjectGroup sweep(this);
-    switch (addendumKind()) {
-      case Addendum_PreliminaryObjects:
-        PreliminaryObjectArrayWithTemplate::preWriteBarrier(
-            maybePreliminaryObjects(sweep));
-        break;
-      case Addendum_NewScript:
-        TypeNewScript::preWriteBarrier(newScript(sweep));
-        break;
-      case Addendum_None:
-        break;
-      default:
-        MOZ_ASSERT(addendumKind() == kind);
-    }
-  }
-
-  flags_ &= ~OBJECT_FLAG_ADDENDUM_MASK;
-  flags_ |= kind << OBJECT_FLAG_ADDENDUM_SHIFT;
-  addendum_ = addendum;
-
-  AddCellMemory(this, AddendumAllocSize(kind, addendum),
-                MemoryUse::ObjectGroupAddendum);
-}
-
-/* static */
-bool ObjectGroup::useSingletonForClone(JSFunction* fun) {
-  if (!IsTypeInferenceEnabled()) {
-    return false;
-  }
-
-  if (!fun->isInterpreted()) {
-    return false;
-  }
-
-  if (fun->isArrow()) {
-    return false;
-  }
-
-  if (fun->isSingleton()) {
-    return false;
-  }
-
-  /*
-   * When a function is being used as a wrapper for another function, it
-   * improves precision greatly to distinguish between different instances of
-   * the wrapper; otherwise we will conflate much of the information about
-   * the wrapped functions.
-   *
-   * An important example is the Class.create function at the core of the
-   * Prototype.js library, which looks like:
-   *
-   * var Class = {
-   *   create: function() {
-   *     return function() {
-   *       this.initialize.apply(this, arguments);
-   *     }
-   *   }
-   * };
-   *
-   * Each instance of the innermost function will have a different wrapped
-   * initialize method. We capture this, along with similar cases, by looking
-   * for short scripts which use both .apply and arguments. For such scripts,
-   * whenever creating a new instance of the function we both give that
-   * instance a singleton type and clone the underlying script.
-   */
-
-  if (!fun->baseScript()->isLikelyConstructorWrapper()) {
-    return false;
-  }
-  uint32_t begin = fun->baseScript()->sourceStart();
-  uint32_t end = fun->baseScript()->sourceEnd();
-
-  return end - begin <= 100;
-}
-
-/* static */
-bool ObjectGroup::useSingletonForNewObject(JSContext* cx, JSScript* script,
-                                           jsbytecode* pc) {
-  /*
-   * Make a heuristic guess at a use of JSOp::New that the constructed object
-   * should have a fresh group. We do this when the New is immediately
-   * followed by a simple assignment to an object's .prototype field.
-   * This is designed to catch common patterns for subclassing in JS:
-   *
-   * function Super() { ... }
-   * function Sub1() { ... }
-   * function Sub2() { ... }
-   *
-   * Sub1.prototype = new Super();
-   * Sub2.prototype = new Super();
-   *
-   * Using distinct groups for the particular prototypes of Sub1 and
-   * Sub2 lets us continue to distinguish the two subclasses and any extra
-   * properties added to those prototype objects.
-   */
-  if (!IsTypeInferenceEnabled()) {
-    return false;
-  }
-  if (script->isGenerator() || script->isAsync()) {
-    return false;
-  }
-  if (JSOp(*pc) != JSOp::New) {
-    return false;
-  }
-  pc += JSOpLength_New;
-  if (JSOp(*pc) != JSOp::SetProp) {
-    return false;
-  }
-  return script->getName(pc) == cx->names().prototype;
-}
-
-/* static */
-bool ObjectGroup::useSingletonForAllocationSite(JSScript* script,
-                                                jsbytecode* pc,
-                                                JSProtoKey key) {
-  /*
-   * Objects created outside loops in global and eval scripts should have
-   * singleton types. For now this is only done for plain objects, but not
-   * typed arrays or normal arrays.
-   */
-
-  if (!IsTypeInferenceEnabled()) {
-    return false;
-  }
-
-  if (script->function() && !script->treatAsRunOnce()) {
-    return false;
-  }
-
-  if (key != JSProto_Object) {
-    return false;
-  }
-
-  // All loops in the script will have a try note indicating their boundary.
-
-  uint32_t offset = script->pcToOffset(pc);
-
-  for (const TryNote& tn : script->trynotes()) {
-    if (tn.kind() != TryNoteKind::ForIn && tn.kind() != TryNoteKind::ForOf &&
-        tn.kind() != TryNoteKind::Loop) {
-      continue;
-    }
-
-    if (tn.start <= offset && offset < tn.start + tn.length) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 /////////////////////////////////////////////////////////////////////
 // JSObject
 /////////////////////////////////////////////////////////////////////
@@ -302,75 +120,12 @@
     }
   }
 
-  // Force type instantiation when splicing lazy group.
-  RootedObjectGroup group(cx, JSObject::getGroup(cx, obj));
-  if (!group) {
-    return false;
-  }
-  RootedObjectGroup protoGroup(cx, nullptr);
-  if (proto.isObject()) {
-    RootedObject protoObj(cx, proto.toObject());
-    protoGroup = JSObject::getGroup(cx, protoObj);
-    if (!protoGroup) {
-      return false;
-    }
-  }
-
-  MOZ_ASSERT(group->clasp() == oldClass,
+  MOZ_ASSERT(obj->group()->clasp() == oldClass,
              "splicing a prototype doesn't change a group's class");
-  group->setProto(proto);
+  obj->group()->setProto(proto);
   return true;
 }
 
-/* static */
-ObjectGroup* JSObject::makeLazyGroup(JSContext* cx, HandleObject obj) {
-  MOZ_ASSERT(obj->hasLazyGroup());
-  MOZ_ASSERT(cx->compartment() == obj->compartment());
-
-  // Find flags which need to be specified immediately on the object.
-  // Don't track whether singletons are packed.
-  ObjectGroupFlags initialFlags =
-      OBJECT_FLAG_SINGLETON | OBJECT_FLAG_NON_PACKED;
-
-  if (obj->isIteratedSingleton()) {
-    initialFlags |= OBJECT_FLAG_ITERATED;
-  }
-
-  if (obj->isNative() && obj->as<NativeObject>().isIndexed()) {
-    initialFlags |= OBJECT_FLAG_SPARSE_INDEXES;
-  }
-
-  if (obj->is<ArrayObject>() && obj->as<ArrayObject>().length() > INT32_MAX) {
-    initialFlags |= OBJECT_FLAG_LENGTH_OVERFLOW;
-  }
-
-  Rooted<TaggedProto> proto(cx, obj->taggedProto());
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, obj->nonCCWRealm(), obj->getClass(), proto, initialFlags);
-  if (!group) {
-    return nullptr;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  /* Fill in the type according to the state of this object. */
-
-  if (obj->is<JSFunction>() && obj->as<JSFunction>().isInterpreted()) {
-    group->setInterpretedFunction(&obj->as<JSFunction>());
-  }
-
-  obj->setGroupRaw(group);
-
-  return group;
-}
-
-/* static */
-bool JSObject::setNewGroupUnknown(JSContext* cx, ObjectGroupRealm& realm,
-                                  const JSClass* clasp, JS::HandleObject obj) {
-  ObjectGroup::setDefaultNewGroupUnknown(cx, realm, clasp, obj);
-  return JSObject::setFlags(cx, obj, BaseShape::NEW_GROUP_UNKNOWN);
-}
-
 /////////////////////////////////////////////////////////////////////
 // ObjectGroupRealm NewTable
 /////////////////////////////////////////////////////////////////////
@@ -502,31 +257,16 @@
   MOZ_ASSERT_IF(proto.isObject(),
                 cx->isInsideCurrentCompartment(proto.toObject()));
 
-  if (associated && !associated->is<TypeDescr>() && !IsTypeInferenceEnabled()) {
+  if (associated && !associated->is<TypeDescr>()) {
     associated = nullptr;
   }
 
   if (associated) {
-    if (associated->is<JSFunction>()) {
-      // Canonicalize new functions to use the original one associated with its
-      // script.
-      associated = associated->as<JSFunction>().maybeCanonicalFunction();
-
-      // If we have previously cleared the 'new' script information for this
-      // function, don't try to construct another one. Also, for simplicity,
-      // don't bother optimizing cross-realm constructors.
-      if (associated && (associated->as<JSFunction>().wasNewScriptCleared() ||
-                         associated->as<JSFunction>().realm() != cx->realm())) {
-        associated = nullptr;
-      }
-    } else if (associated->is<TypeDescr>()) {
-      if (!IsTypedObjectClass(clasp)) {
-        // This can happen when we call Reflect.construct with a TypeDescr as
-        // newTarget argument. We're not creating a TypedObject in this case, so
-        // don't set the TypeDescr on the group.
-        associated = nullptr;
-      }
-    } else {
+    MOZ_ASSERT(associated->is<TypeDescr>());
+    if (!IsTypedObjectClass(clasp)) {
+      // This can happen when we call Reflect.construct with a TypeDescr as
+      // newTarget argument. We're not creating a TypedObject in this case, so
+      // don't set the TypeDescr on the group.
       associated = nullptr;
     }
   }
@@ -538,7 +278,7 @@
     return group;
   }
 
-  AutoEnterAnalysis enter(cx);
+  gc::AutoSuppressGC suppressGC(cx);
 
   ObjectGroupRealm::NewTable*& table = groups.defaultNewTable;
 
@@ -554,26 +294,6 @@
     if (!JSObject::setDelegate(cx, protoObj)) {
       return nullptr;
     }
-
-    // Objects which are prototypes of one another should be singletons, so
-    // that their type information can be tracked more precisely. Limit
-    // this group change to plain objects, to avoid issues with other types
-    // of singletons like typed arrays.
-    if (protoObj->is<PlainObject>() && !protoObj->isSingleton() &&
-        IsTypeInferenceEnabled()) {
-      if (!JSObject::changeToSingleton(cx, protoObj)) {
-        return nullptr;
-      }
-
-      // |ReshapeForProtoMutation| ensures singletons will reshape when
-      // prototype is mutated so clear the UNCACHEABLE_PROTO flag.
-      if (protoObj->hasUncacheableProto()) {
-        HandleNativeObject nobj = protoObj.as<NativeObject>();
-        if (!NativeObject::clearFlag(cx, nobj, BaseShape::UNCACHEABLE_PROTO)) {
-          return nullptr;
-        }
-      }
-    }
   }
 
   ObjectGroupRealm::NewTable::AddPtr p = table->lookupForAdd(
@@ -586,15 +306,8 @@
     return group;
   }
 
-  ObjectGroupFlags initialFlags = 0;
-  if (proto.isDynamic() ||
-      (proto.isObject() && proto.toObject()->isNewGroupUnknown())) {
-    initialFlags = OBJECT_FLAG_DYNAMIC_MASK;
-  }
-
   Rooted<TaggedProto> protoRoot(cx, proto);
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(cx, cx->realm(), clasp,
-                                                   protoRoot, initialFlags);
+  ObjectGroup* group = MakeGroup(cx, clasp, protoRoot);
   if (!group) {
     return nullptr;
   }
@@ -605,1224 +318,149 @@
   }
 
   if (associated) {
-    if (associated->is<JSFunction>()) {
-      if (!TypeNewScript::make(cx, group, &associated->as<JSFunction>())) {
-        return nullptr;
-      }
-    } else {
-      group->setTypeDescr(&associated->as<TypeDescr>());
-    }
+    group->setTypeDescr(&associated->as<TypeDescr>());
   }
 
-  /*
-   * Some builtin objects have slotful native properties baked in at
-   * creation via the Shape::{insert,get}initialShape mechanism. Since
-   * these properties are never explicitly defined on new objects, update
-   * the type information for them here.
-   */
+  groups.defaultNewGroupCache.put(group, associated);
+  return group;
+}
 
-  const JSAtomState& names = cx->names();
+static bool AddPlainObjectProperties(JSContext* cx, HandlePlainObject obj,
+                                     IdValuePair* properties,
+                                     size_t nproperties) {
+  RootedId propid(cx);
+  RootedValue value(cx);
 
-  if (clasp == &RegExpObject::class_) {
-    AddTypePropertyId(cx, group, nullptr, NameToId(names.lastIndex),
-                      TypeSet::Int32Type());
-  } else if (clasp == &StringObject::class_) {
-    AddTypePropertyId(cx, group, nullptr, NameToId(names.length),
-                      TypeSet::Int32Type());
-  } else if (ErrorObject::isErrorClass(clasp)) {
-    AddTypePropertyId(cx, group, nullptr, NameToId(names.fileName),
-                      TypeSet::StringType());
-    AddTypePropertyId(cx, group, nullptr, NameToId(names.lineNumber),
-                      TypeSet::Int32Type());
-    AddTypePropertyId(cx, group, nullptr, NameToId(names.columnNumber),
-                      TypeSet::Int32Type());
+  for (size_t i = 0; i < nproperties; i++) {
+    propid = properties[i].id;
+    value = properties[i].value;
+    if (!NativeDefineDataProperty(cx, obj, propid, value, JSPROP_ENUMERATE)) {
+      return false;
+    }
   }
 
-  groups.defaultNewGroupCache.put(group, associated);
-  return group;
+  return true;
 }
 
-/* static */
-ObjectGroup* ObjectGroup::lazySingletonGroup(JSContext* cx,
-                                             ObjectGroupRealm& realm,
-                                             JS::Realm* objectRealm,
-                                             const JSClass* clasp,
-                                             TaggedProto proto) {
-  MOZ_ASSERT_IF(proto.isObject(),
-                cx->compartment() == proto.toObject()->compartment());
+PlainObject* js::NewPlainObjectWithProperties(JSContext* cx,
+                                              IdValuePair* properties,
+                                              size_t nproperties,
+                                              NewObjectKind newKind) {
+  gc::AllocKind allocKind = gc::GetGCObjectKind(nproperties);
+  RootedPlainObject obj(
+      cx, NewBuiltinClassInstance<PlainObject>(cx, allocKind, newKind));
+  if (!obj || !AddPlainObjectProperties(cx, obj, properties, nproperties)) {
+    return nullptr;
+  }
+  return obj;
+}
 
-  ObjectGroupRealm::NewTable*& table = realm.lazyTable;
+/////////////////////////////////////////////////////////////////////
+// ObjectGroupRealm
+/////////////////////////////////////////////////////////////////////
 
-  if (!table) {
-    table = cx->new_<ObjectGroupRealm::NewTable>(cx->zone());
-    if (!table) {
-      return nullptr;
-    }
-  }
+ObjectGroupRealm::~ObjectGroupRealm() {
+  js_delete(defaultNewTable);
+  stringSplitStringGroup = nullptr;
+}
 
-  ObjectGroupRealm::NewTable::AddPtr p = table->lookupForAdd(
-      ObjectGroupRealm::NewEntry::Lookup(clasp, proto, nullptr));
-  if (p) {
-    ObjectGroup* group = p->group;
-    MOZ_ASSERT(group->lazy());
+/* static */
+ObjectGroup* ObjectGroupRealm::getStringSplitStringGroup(JSContext* cx) {
+  ObjectGroupRealm& groups = ObjectGroupRealm::getForNewObject(cx);
 
+  ObjectGroup* group = groups.stringSplitStringGroup.get();
+  if (group) {
     return group;
   }
 
-  AutoEnterAnalysis enter(cx);
+  // The following code is a specialized version of the code
+  // for ObjectGroup::allocationSiteGroup().
 
-  Rooted<TaggedProto> protoRoot(cx, proto);
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, objectRealm, clasp, protoRoot,
-      OBJECT_FLAG_SINGLETON | OBJECT_FLAG_LAZY_SINGLETON);
-  if (!group) {
+  JSObject* proto = GlobalObject::getOrCreateArrayPrototype(cx, cx->global());
+  if (!proto) {
     return nullptr;
   }
+  Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
 
-  if (!table->add(p, ObjectGroupRealm::NewEntry(group, nullptr))) {
-    ReportOutOfMemory(cx);
+  group = MakeGroup(cx, &ArrayObject::class_, tagged);
+  if (!group) {
     return nullptr;
   }
 
+  groups.stringSplitStringGroup.set(group);
   return group;
 }
 
-/* static */
-void ObjectGroup::setDefaultNewGroupUnknown(JSContext* cx,
-                                            ObjectGroupRealm& realm,
-                                            const JSClass* clasp,
-                                            HandleObject obj) {
-  // If the object already has a new group, mark that group as unknown.
-  ObjectGroupRealm::NewTable* table = realm.defaultNewTable;
-  if (table) {
-    Rooted<TaggedProto> taggedProto(cx, TaggedProto(obj));
-    auto lookup =
-        ObjectGroupRealm::NewEntry::Lookup(clasp, taggedProto, nullptr);
-    auto p = table->lookup(lookup);
-    if (p) {
-      MarkObjectGroupUnknownProperties(cx, p->group);
-    }
+void ObjectGroupRealm::addSizeOfExcludingThis(
+    mozilla::MallocSizeOf mallocSizeOf, size_t* realmTables) {
+  if (defaultNewTable) {
+    *realmTables += defaultNewTable->sizeOfIncludingThis(mallocSizeOf);
   }
 }
 
-inline const JSClass* GetClassForProtoKey(JSProtoKey key) {
-  switch (key) {
-    case JSProto_Null:
-    case JSProto_Object:
-      return &PlainObject::class_;
-    case JSProto_Array:
-      return &ArrayObject::class_;
-
-    case JSProto_Int8Array:
-    case JSProto_Uint8Array:
-    case JSProto_Int16Array:
-    case JSProto_Uint16Array:
-    case JSProto_Int32Array:
-    case JSProto_Uint32Array:
-    case JSProto_Float32Array:
-    case JSProto_Float64Array:
-    case JSProto_Uint8ClampedArray:
-    case JSProto_BigInt64Array:
-    case JSProto_BigUint64Array:
-      return &TypedArrayObject::classes[key - JSProto_Int8Array];
-
-    default:
-      // We only expect to see plain objects, arrays, and typed arrays here.
-      MOZ_CRASH("Bad proto key");
+void ObjectGroupRealm::clearTables() {
+  if (defaultNewTable) {
+    defaultNewTable->clear();
   }
+  defaultNewGroupCache.purge();
 }
 
-/* static */
-ObjectGroup* ObjectGroup::defaultNewGroup(JSContext* cx, JSProtoKey key) {
-  JSObject* proto = nullptr;
-  if (key != JSProto_Null) {
-    proto = GlobalObject::getOrCreatePrototype(cx, key);
-    if (!proto) {
-      return nullptr;
-    }
+void ObjectGroupRealm::traceWeak(JSTracer* trc) {
+  if (stringSplitStringGroup) {
+    JS::GCPolicy<WeakHeapPtrObjectGroup>::traceWeak(trc,
+                                                    &stringSplitStringGroup);
   }
-  return defaultNewGroup(cx, GetClassForProtoKey(key), TaggedProto(proto));
 }
 
-/////////////////////////////////////////////////////////////////////
-// ObjectGroupRealm ArrayObjectTable
-/////////////////////////////////////////////////////////////////////
-
-struct ObjectGroupRealm::ArrayObjectKey : public DefaultHasher<ArrayObjectKey> {
-  TypeSet::Type type;
-
-  ArrayObjectKey() : type(TypeSet::UndefinedType()) {}
-
-  explicit ArrayObjectKey(TypeSet::Type type) : type(type) {}
-
-  static inline uint32_t hash(const ArrayObjectKey& v) { return v.type.raw(); }
-
-  static inline bool match(const ArrayObjectKey& v1, const ArrayObjectKey& v2) {
-    return v1.type == v2.type;
-  }
-
-  bool operator==(const ArrayObjectKey& other) { return type == other.type; }
-
-  bool operator!=(const ArrayObjectKey& other) { return !(*this == other); }
+void ObjectGroupRealm::fixupNewTableAfterMovingGC(NewTable* table) {
+  /*
+   * Each entry's hash depends on the object's prototype and we can't tell
+   * whether that has been moved or not in sweepNewObjectGroupTable().
+   */
+  if (table) {
+    for (NewTable::Enum e(*table); !e.empty(); e.popFront()) {
+      NewEntry& entry = e.mutableFront();
 
-  bool traceWeak(JSTracer* trc) {
-    MOZ_ASSERT(type.isUnknown() || !type.isSingleton());
-    if (!type.isUnknown() && type.isGroup()) {
-      ObjectGroup* group = type.groupNoBarrier();
-      if (!TraceManuallyBarrieredWeakEdge(trc, &group, "ObjectGroup")) {
-        return false;
+      ObjectGroup* group = entry.group.unbarrieredGet();
+      if (IsForwarded(group)) {
+        group = Forwarded(group);
+        entry.group.set(group);
+      }
+      TaggedProto proto = group->proto();
+      if (proto.isObject() && IsForwarded(proto.toObject())) {
+        proto = TaggedProto(Forwarded(proto.toObject()));
+        // Update the group's proto here so that we are able to lookup
+        // entries in this table before all object pointers are updated.
+        group->proto() = proto;
       }
-      if (group != type.groupNoBarrier()) {
-        type = TypeSet::ObjectType(group);
+      if (entry.associated && IsForwarded(entry.associated)) {
+        entry.associated = Forwarded(entry.associated);
       }
     }
-    return true;
   }
-};
-
-static inline bool NumberTypes(TypeSet::Type a, TypeSet::Type b) {
-  return (a.isPrimitive(ValueType::Int32) ||
-          a.isPrimitive(ValueType::Double)) &&
-         (b.isPrimitive(ValueType::Int32) || b.isPrimitive(ValueType::Double));
-}
-
-/*
- * As for GetValueType, but requires object types to be non-singletons with
- * their default prototype. These are the only values that should appear in
- * arrays and objects whose type can be fixed.
- */
-static inline TypeSet::Type GetValueTypeForTable(const Value& v) {
-  TypeSet::Type type = TypeSet::GetValueType(v);
-  MOZ_ASSERT(!type.isSingleton());
-  return type;
 }
 
 /* static */
-ArrayObject* ObjectGroup::newArrayObject(JSContext* cx, const Value* vp,
-                                         size_t length, NewObjectKind newKind,
-                                         NewArrayKind arrayKind) {
-  MOZ_ASSERT(newKind != SingletonObject);
-
-  // If we are making a copy on write array, don't try to adjust the group as
-  // getOrFixupCopyOnWriteObject will do this before any objects are copied
-  // from this one.
-  if (arrayKind == NewArrayKind::CopyOnWrite) {
-    ArrayObject* obj = NewDenseCopiedArray(cx, length, vp, nullptr, newKind);
-    if (!obj || !ObjectElements::MakeElementsCopyOnWrite(cx, obj)) {
-      return nullptr;
-    }
-    return obj;
-  }
+bool JSObject::setSingleton(JSContext* cx, js::HandleObject obj) {
+  MOZ_ASSERT(!IsInsideNursery(obj));
+  MOZ_ASSERT(!obj->isSingleton());
+  MOZ_ASSERT(cx->realm() == obj->nonCCWRealm());
+
+  // At this point singleton groups are only used for the global object. We can
+  // remove this after replacing JS_SplicePrototype.
+  MOZ_ASSERT(obj->is<GlobalObject>());
 
-  if (!IsTypeInferenceEnabled()) {
-    return NewDenseCopiedArray(cx, length, vp, nullptr, newKind);
-  }
-
-  // Get a type which captures all the elements in the array to be created.
-  Rooted<TypeSet::Type> elementType(cx, TypeSet::UnknownType());
-  if (arrayKind != NewArrayKind::UnknownIndex && length != 0) {
-    elementType = GetValueTypeForTable(vp[0]);
-    for (unsigned i = 1; i < length; i++) {
-      TypeSet::Type ntype = GetValueTypeForTable(vp[i]);
-      if (ntype != elementType) {
-        if (NumberTypes(elementType, ntype)) {
-          elementType = TypeSet::DoubleType();
-        } else {
-          elementType = TypeSet::UnknownType();
-          break;
-        }
-      }
-    }
-  }
-
-  ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-  ObjectGroupRealm::ArrayObjectTable*& table = realm.arrayObjectTable;
-
-  if (!table) {
-    table = cx->new_<ObjectGroupRealm::ArrayObjectTable>();
-    if (!table) {
-      return nullptr;
-    }
-  }
-
-  ObjectGroupRealm::ArrayObjectKey key(elementType);
-  DependentAddPtr<ObjectGroupRealm::ArrayObjectTable> p(cx, *table, key);
-
-  RootedObjectGroup group(cx);
-  if (p) {
-    group = p->value();
-  } else {
-    JSObject* proto = GlobalObject::getOrCreateArrayPrototype(cx, cx->global());
-    if (!proto) {
-      return nullptr;
-    }
-    Rooted<TaggedProto> taggedProto(cx, TaggedProto(proto));
-    group = ObjectGroupRealm::makeGroup(cx, cx->realm(), &ArrayObject::class_,
-                                        taggedProto);
-    if (!group) {
-      return nullptr;
-    }
-
-    AddTypePropertyId(cx, group, nullptr, JSID_VOID, elementType);
-
-    if (!p.add(cx, *table, ObjectGroupRealm::ArrayObjectKey(elementType),
-               group)) {
-      return nullptr;
-    }
-  }
-
-  // The type of the elements being added will already be reflected in type
-  // information.
-  ShouldUpdateTypes updateTypes = ShouldUpdateTypes::DontUpdate;
-  return NewCopiedArrayTryUseGroup(cx, group, vp, length, newKind, updateTypes);
-}
-
-// Try to change the group of |source| to match that of |target|.
-static bool GiveObjectGroup(JSContext* cx, JSObject* source, JSObject* target) {
-  MOZ_ASSERT(source->group() != target->group());
-
-  if (!target->is<ArrayObject>() || !source->is<ArrayObject>()) {
-    return true;
-  }
-
-  source->setGroup(target->group());
-
-  for (size_t i = 0; i < source->as<ArrayObject>().getDenseInitializedLength();
-       i++) {
-    Value v = source->as<ArrayObject>().getDenseElement(i);
-    AddTypePropertyId(cx, source->group(), source, JSID_VOID, v);
-  }
-
-  return true;
-}
-
-static bool SameGroup(JSObject* first, JSObject* second) {
-  return first->group() == second->group();
-}
-
-// When generating a multidimensional array of literals, such as
-// [[1,2],[3,4],[5.5,6.5]], try to ensure that each element of the array has
-// the same group. This is mainly important when the elements might have
-// different native vs. unboxed layouts, or different unboxed layouts, and
-// accessing the heterogenous layouts from JIT code will be much slower than
-// if they were homogenous.
-//
-// To do this, with each new array element we compare it with one of the
-// previous ones, and try to mutate the group of the new element to fit that
-// of the old element. If this isn't possible, the groups for all old elements
-// are mutated to fit that of the new element.
-bool js::CombineArrayElementTypes(JSContext* cx, JSObject* newObj,
-                                  const Value* compare, size_t ncompare) {
-  if (!ncompare || !compare[0].isObject()) {
-    return true;
-  }
-
-  JSObject* oldObj = &compare[0].toObject();
-  if (SameGroup(oldObj, newObj)) {
-    return true;
-  }
-
-  if (!GiveObjectGroup(cx, newObj, oldObj)) {
-    return false;
-  }
-
-  if (SameGroup(oldObj, newObj)) {
-    return true;
-  }
-
-  if (!GiveObjectGroup(cx, oldObj, newObj)) {
-    return false;
-  }
-
-  if (SameGroup(oldObj, newObj)) {
-    for (size_t i = 1; i < ncompare; i++) {
-      if (compare[i].isObject() && !SameGroup(&compare[i].toObject(), newObj)) {
-        if (!GiveObjectGroup(cx, &compare[i].toObject(), newObj)) {
-          return false;
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-// Similarly to CombineArrayElementTypes, if we are generating an array of
-// plain objects with a consistent property layout, such as
-// [{p:[1,2]},{p:[3,4]},{p:[5.5,6.5]}], where those plain objects in
-// turn have arrays as their own properties, try to ensure that a consistent
-// group is given to each array held by the same property of the plain objects.
-bool js::CombinePlainObjectPropertyTypes(JSContext* cx, JSObject* newObj,
-                                         const Value* compare,
-                                         size_t ncompare) {
-  if (!ncompare || !compare[0].isObject()) {
-    return true;
-  }
-
-  JSObject* oldObj = &compare[0].toObject();
-  if (!SameGroup(oldObj, newObj)) {
-    return true;
-  }
-
-  if (newObj->is<PlainObject>()) {
-    if (newObj->as<PlainObject>().lastProperty() !=
-        oldObj->as<PlainObject>().lastProperty()) {
-      return true;
-    }
-
-    for (size_t slot = 0; slot < newObj->as<PlainObject>().slotSpan(); slot++) {
-      Value newValue = newObj->as<PlainObject>().getSlot(slot);
-      Value oldValue = oldObj->as<PlainObject>().getSlot(slot);
-
-      if (!newValue.isObject() || !oldValue.isObject()) {
-        continue;
-      }
-
-      JSObject* newInnerObj = &newValue.toObject();
-      JSObject* oldInnerObj = &oldValue.toObject();
-
-      if (SameGroup(oldInnerObj, newInnerObj)) {
-        continue;
-      }
-
-      if (!GiveObjectGroup(cx, newInnerObj, oldInnerObj)) {
-        return false;
-      }
-
-      if (SameGroup(oldInnerObj, newInnerObj)) {
-        continue;
-      }
-
-      if (!GiveObjectGroup(cx, oldInnerObj, newInnerObj)) {
-        return false;
-      }
-
-      if (SameGroup(oldInnerObj, newInnerObj)) {
-        for (size_t i = 1; i < ncompare; i++) {
-          if (compare[i].isObject() &&
-              SameGroup(&compare[i].toObject(), newObj)) {
-            Value otherValue =
-                compare[i].toObject().as<PlainObject>().getSlot(slot);
-            if (otherValue.isObject() &&
-                !SameGroup(&otherValue.toObject(), newInnerObj)) {
-              if (!GiveObjectGroup(cx, &otherValue.toObject(), newInnerObj)) {
-                return false;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  return true;
-}
-
-/////////////////////////////////////////////////////////////////////
-// ObjectGroupRealm PlainObjectTable
-/////////////////////////////////////////////////////////////////////
-
-struct ObjectGroupRealm::PlainObjectKey {
-  jsid* properties;
-  uint32_t nproperties;
-
-  struct Lookup {
-    IdValuePair* properties;
-    uint32_t nproperties;
-
-    Lookup(IdValuePair* properties, uint32_t nproperties)
-        : properties(properties), nproperties(nproperties) {}
-  };
-
-  static inline HashNumber hash(const Lookup& lookup) {
-    HashNumber hash = HashId(lookup.properties[lookup.nproperties - 1].id);
-    return mozilla::AddToHash(hash, lookup.nproperties);
-  }
-
-  static inline bool match(const PlainObjectKey& v, const Lookup& lookup) {
-    if (lookup.nproperties != v.nproperties) {
-      return false;
-    }
-    for (size_t i = 0; i < lookup.nproperties; i++) {
-      if (lookup.properties[i].id != v.properties[i]) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  bool traceWeak(JSTracer* trc) {
-    for (unsigned i = 0; i < nproperties; i++) {
-      if (!TraceManuallyBarrieredWeakEdge(trc, &properties[i],
-                                          "PlainObjectKey::properties")) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-struct ObjectGroupRealm::PlainObjectEntry {
-  WeakHeapPtrObjectGroup group;
-  WeakHeapPtrShape shape;
-  TypeSet::Type* types;
-
-  bool traceWeak(JSTracer* trc, unsigned nproperties) {
-    if (!TraceWeakEdge(trc, &group, "PlainObjectEntry::group")) {
-      return false;
-    }
-    if (!TraceWeakEdge(trc, &shape, "PlainObjectEntry::shape")) {
-      return false;
-    }
-    for (unsigned i = 0; i < nproperties; i++) {
-      MOZ_ASSERT(!types[i].isSingleton());
-      if (types[i].isGroup()) {
-        ObjectGroup* group = types[i].groupNoBarrier();
-        if (!TraceManuallyBarrieredWeakEdge(trc, &group,
-                                            "PlainObjectEntry::types::group")) {
-          return false;
-        }
-        if (group != types[i].groupNoBarrier()) {
-          types[i] = TypeSet::ObjectType(group);
-        }
-      }
-    }
-    return true;
-  }
-};
-
-static bool CanShareObjectGroup(IdValuePair* properties, size_t nproperties) {
-  // Don't reuse groups for objects containing indexed properties, which
-  // might end up as dense elements.
-  for (size_t i = 0; i < nproperties; i++) {
-    uint32_t index;
-    if (IdIsIndex(properties[i].id, &index)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-static bool AddPlainObjectProperties(JSContext* cx, HandlePlainObject obj,
-                                     IdValuePair* properties,
-                                     size_t nproperties) {
-  RootedId propid(cx);
-  RootedValue value(cx);
-
-  for (size_t i = 0; i < nproperties; i++) {
-    propid = properties[i].id;
-    value = properties[i].value;
-    if (!NativeDefineDataProperty(cx, obj, propid, value, JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-PlainObject* js::NewPlainObjectWithProperties(JSContext* cx,
-                                              IdValuePair* properties,
-                                              size_t nproperties,
-                                              NewObjectKind newKind) {
-  gc::AllocKind allocKind = gc::GetGCObjectKind(nproperties);
-  RootedPlainObject obj(
-      cx, NewBuiltinClassInstance<PlainObject>(cx, allocKind, newKind));
-  if (!obj || !AddPlainObjectProperties(cx, obj, properties, nproperties)) {
-    return nullptr;
-  }
-  return obj;
-}
-
-/* static */
-JSObject* ObjectGroup::newPlainObject(JSContext* cx, IdValuePair* properties,
-                                      size_t nproperties,
-                                      NewObjectKind newKind) {
-  // Watch for simple cases where we don't try to reuse plain object groups.
-  if (!IsTypeInferenceEnabled() || newKind == SingletonObject ||
-      nproperties == 0 || nproperties >= PropertyTree::MAX_HEIGHT) {
-    return NewPlainObjectWithProperties(cx, properties, nproperties, newKind);
-  }
-
-  ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-  ObjectGroupRealm::PlainObjectTable*& table = realm.plainObjectTable;
-
-  if (!table) {
-    table = cx->new_<ObjectGroupRealm::PlainObjectTable>();
-    if (!table) {
-      return nullptr;
-    }
-  }
-
-  ObjectGroupRealm::PlainObjectKey::Lookup lookup(properties, nproperties);
-  ObjectGroupRealm::PlainObjectTable::Ptr p = table->lookup(lookup);
-
-  if (!p) {
-    if (!CanShareObjectGroup(properties, nproperties)) {
-      return NewPlainObjectWithProperties(cx, properties, nproperties, newKind);
-    }
-
-    JSObject* proto = GlobalObject::getOrCreatePrototype(cx, JSProto_Object);
-    if (!proto) {
-      return nullptr;
-    }
-
-    Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
-    RootedObjectGroup group(
-        cx, ObjectGroupRealm::makeGroup(cx, cx->realm(), &PlainObject::class_,
-                                        tagged));
-    if (!group) {
-      return nullptr;
-    }
-
-    gc::AllocKind allocKind = gc::GetGCObjectKind(nproperties);
-    RootedPlainObject obj(cx, NewObjectWithGroup<PlainObject>(
-                                  cx, group, allocKind, TenuredObject));
-    if (!obj || !AddPlainObjectProperties(cx, obj, properties, nproperties)) {
-      return nullptr;
-    }
-
-    // Don't make entries with duplicate property names, which will show up
-    // here as objects with fewer properties than we thought we were
-    // adding to the object. In this case, reset the object's group to the
-    // default (which will have unknown properties) so that the group we
-    // just created will be collected by the GC.
-    if (obj->slotSpan() != nproperties) {
-      ObjectGroup* group =
-          defaultNewGroup(cx, obj->getClass(), obj->taggedProto());
-      if (!group) {
-        return nullptr;
-      }
-      obj->setGroup(group);
-      return obj;
-    }
-
-    // Keep track of the initial objects we create with this type.
-    // If the initial ones have a consistent shape and property types, we
-    // will try to use an unboxed layout for the group.
-    PreliminaryObjectArrayWithTemplate* preliminaryObjects =
-        cx->new_<PreliminaryObjectArrayWithTemplate>(obj->lastProperty());
-    if (!preliminaryObjects) {
-      return nullptr;
-    }
-    group->setPreliminaryObjects(preliminaryObjects);
-    preliminaryObjects->registerNewObject(obj);
-
-    auto ids = cx->make_zeroed_pod_array<jsid>(nproperties);
-    if (!ids) {
-      return nullptr;
-    }
-
-    auto types = cx->make_zeroed_pod_array<TypeSet::Type>(nproperties);
-    if (!types) {
-      return nullptr;
-    }
-
-    for (size_t i = 0; i < nproperties; i++) {
-      ids[i] = properties[i].id;
-      types[i] = GetValueTypeForTable(obj->getSlot(i));
-      AddTypePropertyId(cx, group, nullptr, IdToTypeId(ids[i]), types[i]);
-    }
-
-    ObjectGroupRealm::PlainObjectKey key;
-    key.properties = ids.get();
-    key.nproperties = nproperties;
-    MOZ_ASSERT(ObjectGroupRealm::PlainObjectKey::match(key, lookup));
-
-    ObjectGroupRealm::PlainObjectEntry entry;
-    entry.group.set(group);
-    entry.shape.set(obj->lastProperty());
-    entry.types = types.get();
-
-    ObjectGroupRealm::PlainObjectTable::AddPtr np = table->lookupForAdd(lookup);
-    if (!table->add(np, key, entry)) {
-      ReportOutOfMemory(cx);
-      return nullptr;
-    }
-
-    mozilla::Unused << ids.release();
-    mozilla::Unused << types.release();
-
-    return obj;
-  }
-
-  RootedObjectGroup group(cx, p->value().group);
-
-  // AutoSweepObjectGroup checks no GC happens in its scope, so we use Maybe
-  // and reset() it before GC calls.
-  mozilla::Maybe<AutoSweepObjectGroup> sweep;
-  sweep.emplace(group);
-
-  // Update property types according to the properties we are about to add.
-  // Do this before we do anything which can GC, which might move or remove
-  // this table entry.
-  if (!group->unknownProperties(*sweep)) {
-    for (size_t i = 0; i < nproperties; i++) {
-      TypeSet::Type type = p->value().types[i];
-      TypeSet::Type ntype = GetValueTypeForTable(properties[i].value);
-      if (ntype == type) {
-        continue;
-      }
-      if (ntype.isPrimitive(ValueType::Int32) &&
-          type.isPrimitive(ValueType::Double)) {
-        // The property types already reflect 'int32'.
-      } else {
-        if (ntype.isPrimitive(ValueType::Double) &&
-            type.isPrimitive(ValueType::Int32)) {
-          // Include 'double' in the property types to avoid the update below
-          // later.
-          p->value().types[i] = TypeSet::DoubleType();
-        }
-        AddTypePropertyId(cx, group, nullptr, IdToTypeId(properties[i].id),
-                          ntype);
-      }
-    }
-  }
-
-  RootedShape shape(cx, p->value().shape);
-
-  if (group->maybePreliminaryObjects(*sweep)) {
-    newKind = TenuredObject;
-  }
-
-  sweep.reset();
-
-  gc::AllocKind allocKind = gc::GetGCObjectKind(nproperties);
-  RootedPlainObject obj(
-      cx, NewObjectWithGroup<PlainObject>(cx, group, allocKind, newKind));
-
-  if (!obj || !obj->setLastProperty(cx, shape)) {
-    return nullptr;
-  }
-
-  for (size_t i = 0; i < nproperties; i++) {
-    obj->setSlot(i, properties[i].value);
-  }
-
-  sweep.emplace(group);
-
-  if (group->maybePreliminaryObjects(*sweep)) {
-    group->maybePreliminaryObjects(*sweep)->registerNewObject(obj);
-    group->maybePreliminaryObjects(*sweep)->maybeAnalyze(cx, group);
-  }
-
-  return obj;
-}
-
-/////////////////////////////////////////////////////////////////////
-// ObjectGroupRealm AllocationSiteTable
-/////////////////////////////////////////////////////////////////////
-
-struct ObjectGroupRealm::AllocationSiteKey {
-  WeakHeapPtrScript script;
-
-  uint32_t offset : 24;
-  JSProtoKey kind : 8;
-
-  WeakHeapPtrObject proto;
-
-  static const uint32_t OFFSET_LIMIT = (1 << 23);
-
-  AllocationSiteKey(JSScript* script_, uint32_t offset_, JSProtoKey kind_,
-                    JSObject* proto_)
-      : script(script_), offset(offset_), kind(kind_), proto(proto_) {
-    MOZ_ASSERT(offset_ < OFFSET_LIMIT);
-  }
-
-  AllocationSiteKey(const AllocationSiteKey& key) = default;
-
-  AllocationSiteKey(AllocationSiteKey&& key)
-      : script(std::move(key.script)),
-        offset(key.offset),
-        kind(key.kind),
-        proto(std::move(key.proto)) {}
-
-  void operator=(AllocationSiteKey&& key) {
-    script = std::move(key.script);
-    offset = key.offset;
-    kind = key.kind;
-    proto = std::move(key.proto);
-  }
-
-  void trace(JSTracer* trc) {
-    TraceRoot(trc, &script, "AllocationSiteKey script");
-    TraceNullableRoot(trc, &proto, "AllocationSiteKey proto");
-  }
-
-  bool needsSweep() {
-    return IsAboutToBeFinalizedUnbarriered(script.unbarrieredAddress()) ||
-           (proto &&
-            IsAboutToBeFinalizedUnbarriered(proto.unbarrieredAddress()));
-  }
-
-  bool operator==(const AllocationSiteKey& other) const {
-    return script == other.script && offset == other.offset &&
-           kind == other.kind && proto == other.proto;
-  }
-};
-
-namespace js {
-template <>
-struct MovableCellHasher<ObjectGroupRealm::AllocationSiteKey> {
-  using Key = ObjectGroupRealm::AllocationSiteKey;
-  using Lookup = ObjectGroupRealm::AllocationSiteKey;
-
-  static bool hasHash(const Lookup& l) {
-    return MovableCellHasher<JSScript*>::hasHash(l.script.unbarrieredGet()) &&
-           MovableCellHasher<JSObject*>::hasHash(l.proto.unbarrieredGet());
-  }
-  static bool ensureHash(const Lookup& l) {
-    return MovableCellHasher<JSScript*>::ensureHash(
-               l.script.unbarrieredGet()) &&
-           MovableCellHasher<JSObject*>::ensureHash(l.proto.unbarrieredGet());
-  }
-  static inline HashNumber hash(const Key& key) {
-    HashNumber hash = mozilla::HashGeneric(key.offset, key.kind);
-    hash = mozilla::AddToHash(
-        hash, MovableCellHasher<JSScript*>::hash(key.script.unbarrieredGet()));
-    hash = mozilla::AddToHash(
-        hash, MovableCellHasher<JSObject*>::hash(key.proto.unbarrieredGet()));
-    return hash;
-  }
-
-  static inline bool match(const Key& a, const Lookup& b) {
-    return a.offset == b.offset && a.kind == b.kind &&
-           MovableCellHasher<JSScript*>::match(a.script.unbarrieredGet(),
-                                               b.script.unbarrieredGet()) &&
-           MovableCellHasher<JSObject*>::match(a.proto.unbarrieredGet(),
-                                               b.proto.unbarrieredGet());
-  }
-};
-}  // namespace js
-
-class ObjectGroupRealm::AllocationSiteTable
-    : public JS::WeakCache<js::GCHashMap<
-          AllocationSiteKey, WeakHeapPtrObjectGroup,
-          MovableCellHasher<AllocationSiteKey>, SystemAllocPolicy>> {
-  using Table =
-      js::GCHashMap<AllocationSiteKey, WeakHeapPtrObjectGroup,
-                    MovableCellHasher<AllocationSiteKey>, SystemAllocPolicy>;
-  using Base = JS::WeakCache<Table>;
-
- public:
-  explicit AllocationSiteTable(Zone* zone) : Base(zone) {}
-};
-
-/* static */
-ObjectGroup* ObjectGroup::allocationSiteGroup(
-    JSContext* cx, JSScript* scriptArg, jsbytecode* pc, JSProtoKey kind,
-    HandleObject protoArg /* = nullptr */) {
-  MOZ_ASSERT(!useSingletonForAllocationSite(scriptArg, pc, kind));
-  MOZ_ASSERT_IF(protoArg, kind == JSProto_Array);
-  MOZ_ASSERT(cx->realm() == scriptArg->realm());
-
-  uint32_t offset = scriptArg->pcToOffset(pc);
-
-  if (!IsTypeInferenceEnabled() ||
-      offset >= ObjectGroupRealm::AllocationSiteKey::OFFSET_LIMIT) {
-    if (protoArg) {
-      return defaultNewGroup(cx, GetClassForProtoKey(kind),
-                             TaggedProto(protoArg));
-    }
-    return defaultNewGroup(cx, kind);
-  }
-
-  ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-  ObjectGroupRealm::AllocationSiteTable*& table = realm.allocationSiteTable;
-
-  if (!table) {
-    table = cx->new_<ObjectGroupRealm::AllocationSiteTable>(cx->zone());
-    if (!table) {
-      return nullptr;
-    }
-  }
-
-  RootedScript script(cx, scriptArg);
-  JSObject* proto = protoArg;
-  if (!proto && kind != JSProto_Null) {
-    proto = GlobalObject::getOrCreatePrototype(cx, kind);
-    if (!proto) {
-      return nullptr;
-    }
-  }
-
-  Rooted<ObjectGroupRealm::AllocationSiteKey> key(
-      cx, ObjectGroupRealm::AllocationSiteKey(script, offset, kind, proto));
-
-  ObjectGroupRealm::AllocationSiteTable::AddPtr p = table->lookupForAdd(key);
-  if (p) {
-    return p->value();
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
-  ObjectGroup* res = ObjectGroupRealm::makeGroup(
-      cx, script->realm(), GetClassForProtoKey(kind), tagged,
-      OBJECT_FLAG_FROM_ALLOCATION_SITE);
-  if (!res) {
-    return nullptr;
-  }
-
-  if (JSOp(*pc) == JSOp::NewObject) {
-    // Keep track of the preliminary objects with this group, so we can try
-    // to use an unboxed layout for the object once some are allocated.
-    Shape* shape = script->getObject(pc)->as<PlainObject>().lastProperty();
-    if (!shape->isEmptyShape()) {
-      PreliminaryObjectArrayWithTemplate* preliminaryObjects =
-          cx->new_<PreliminaryObjectArrayWithTemplate>(shape);
-      if (preliminaryObjects) {
-        res->setPreliminaryObjects(preliminaryObjects);
-      } else {
-        cx->recoverFromOutOfMemory();
-      }
-    }
-  }
-
-  if (!table->add(p, key, res)) {
-    ReportOutOfMemory(cx);
-    return nullptr;
-  }
-
-  return res;
-}
-
-/* static */
-ObjectGroup* ObjectGroup::callingAllocationSiteGroup(JSContext* cx,
-                                                     JSProtoKey key,
-                                                     HandleObject proto) {
-  MOZ_ASSERT_IF(proto, key == JSProto_Array);
-
-  if (IsTypeInferenceEnabled()) {
-    jsbytecode* pc;
-    RootedScript script(cx, cx->currentScript(&pc));
-    if (script) {
-      return allocationSiteGroup(cx, script, pc, key, proto);
-    }
-  }
-
-  if (proto) {
-    return defaultNewGroup(cx, GetClassForProtoKey(key), TaggedProto(proto));
-  }
-  return defaultNewGroup(cx, key);
-}
-
-/* static */
-bool ObjectGroup::setAllocationSiteObjectGroup(JSContext* cx,
-                                               HandleScript script,
-                                               jsbytecode* pc, HandleObject obj,
-                                               bool singleton) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(obj->getClass());
-  MOZ_ASSERT(key != JSProto_Null);
-  MOZ_ASSERT(singleton == useSingletonForAllocationSite(script, pc, key));
-
-  if (singleton) {
-    MOZ_ASSERT(obj->isSingleton());
-  } else {
-    ObjectGroup* group = allocationSiteGroup(cx, script, pc, key);
-    if (!group) {
-      return false;
-    }
-    obj->setGroup(group);
+  ObjectGroupFlags initialFlags = OBJECT_FLAG_SINGLETON;
+  Rooted<TaggedProto> proto(cx, obj->taggedProto());
+  ObjectGroup* group = MakeGroup(cx, obj->getClass(), proto, initialFlags);
+  if (!group) {
+    return false;
   }
 
+  obj->setGroupRaw(group);
   return true;
 }
 
-/* static */
-ArrayObject* ObjectGroup::getOrFixupCopyOnWriteObject(JSContext* cx,
-                                                      HandleScript script,
-                                                      jsbytecode* pc) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  // Make sure that the template object for script/pc has a type indicating
-  // that the object and its copies have copy on write elements.
-  RootedArrayObject obj(cx, &script->getObject(pc)->as<ArrayObject>());
-  MOZ_ASSERT(obj->denseElementsAreCopyOnWrite());
-
-  {
-    AutoSweepObjectGroup sweepObjGroup(obj->group());
-    if (obj->group()->fromAllocationSite(sweepObjGroup)) {
-      MOZ_ASSERT(
-          obj->group()->hasAnyFlags(sweepObjGroup, OBJECT_FLAG_COPY_ON_WRITE));
-      return obj;
-    }
-  }
-
-  RootedObjectGroup group(cx,
-                          allocationSiteGroup(cx, script, pc, JSProto_Array));
-  if (!group) {
-    return nullptr;
-  }
-
-  AutoSweepObjectGroup sweepGroup(group);
-  group->addFlags(sweepGroup, OBJECT_FLAG_COPY_ON_WRITE);
-
-  // Update type information in the initializer object group.
-  MOZ_ASSERT(obj->slotSpan() == 0);
-  if (IsTypeInferenceEnabled()) {
-    for (size_t i = 0; i < obj->getDenseInitializedLength(); i++) {
-      const Value& v = obj->getDenseElement(i);
-      AddTypePropertyId(cx, group, nullptr, JSID_VOID, v);
-    }
-  }
-
-  obj->setGroup(group);
-  return obj;
-}
-
-/* static */
-ArrayObject* ObjectGroup::getCopyOnWriteObject(JSScript* script,
-                                               jsbytecode* pc) {
-  // getOrFixupCopyOnWriteObject should already have been called for
-  // script/pc, ensuring that the template object has a group with the
-  // COPY_ON_WRITE flag. We don't assert this here, due to a corner case
-  // where this property doesn't hold. See jsop_newarray_copyonwrite in
-  // IonBuilder.
-  ArrayObject* obj = &script->getObject(pc)->as<ArrayObject>();
-  MOZ_ASSERT(obj->denseElementsAreCopyOnWrite());
-
-  return obj;
-}
-
-/* static */
-bool ObjectGroup::findAllocationSite(JSContext* cx, const ObjectGroup* group,
-                                     JSScript** script, uint32_t* offset) {
-  *script = nullptr;
-  *offset = 0;
-
-  ObjectGroupRealm& realm = ObjectGroupRealm::get(group);
-  const ObjectGroupRealm::AllocationSiteTable* table =
-      realm.allocationSiteTable;
-
-  if (!table) {
-    return false;
-  }
-
-  for (ObjectGroupRealm::AllocationSiteTable::Range r = table->all();
-       !r.empty(); r.popFront()) {
-    if (group == r.front().value()) {
-      *script = r.front().key().script;
-      *offset = r.front().key().offset;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-/////////////////////////////////////////////////////////////////////
-// ObjectGroupRealm
-/////////////////////////////////////////////////////////////////////
-
-ObjectGroupRealm::~ObjectGroupRealm() {
-  js_delete(defaultNewTable);
-  js_delete(lazyTable);
-  js_delete(arrayObjectTable);
-  js_delete(plainObjectTable);
-  js_delete(allocationSiteTable);
-  stringSplitStringGroup = nullptr;
-}
-
-void ObjectGroupRealm::removeDefaultNewGroup(const JSClass* clasp,
-                                             TaggedProto proto,
-                                             JSObject* associated) {
-  auto p = defaultNewTable->lookup(NewEntry::Lookup(clasp, proto, associated));
-  MOZ_RELEASE_ASSERT(p);
-
-  defaultNewTable->remove(p);
-  defaultNewGroupCache.purge();
-}
-
-void ObjectGroupRealm::replaceDefaultNewGroup(const JSClass* clasp,
-                                              TaggedProto proto,
-                                              JSObject* associated,
-                                              ObjectGroup* group) {
-  NewEntry::Lookup lookup(clasp, proto, associated);
-
-  auto p = defaultNewTable->lookup(lookup);
-  MOZ_RELEASE_ASSERT(p);
-  defaultNewTable->remove(p);
-  defaultNewGroupCache.purge();
-  {
-    AutoEnterOOMUnsafeRegion oomUnsafe;
-    if (!defaultNewTable->putNew(lookup, NewEntry(group, associated))) {
-      oomUnsafe.crash("Inconsistent object table");
-    }
-  }
-}
-
-/* static */
-ObjectGroup* ObjectGroupRealm::makeGroup(
-    JSContext* cx, Realm* realm, const JSClass* clasp,
-    Handle<TaggedProto> proto, ObjectGroupFlags initialFlags /* = 0 */) {
-  MOZ_ASSERT_IF(proto.isObject(),
-                cx->isInsideCurrentCompartment(proto.toObject()));
-
-  if (!IsTypeInferenceEnabled()) {
-    // Don't track type information.
-    initialFlags |= OBJECT_FLAG_DYNAMIC_MASK;
-  }
-
-  ObjectGroup* group = Allocate<ObjectGroup>(cx);
-  if (!group) {
-    return nullptr;
-  }
-  new (group) ObjectGroup(clasp, proto, realm, initialFlags);
-
-  return group;
-}
-
-/* static */
-ObjectGroup* ObjectGroupRealm::getStringSplitStringGroup(JSContext* cx) {
-  ObjectGroupRealm& groups = ObjectGroupRealm::getForNewObject(cx);
-
-  ObjectGroup* group = groups.stringSplitStringGroup.get();
-  if (group) {
-    return group;
-  }
-
-  // The following code is a specialized version of the code
-  // for ObjectGroup::allocationSiteGroup().
-
-  JSObject* proto = GlobalObject::getOrCreateArrayPrototype(cx, cx->global());
-  if (!proto) {
-    return nullptr;
-  }
-  Rooted<TaggedProto> tagged(cx, TaggedProto(proto));
-
-  group = makeGroup(cx, cx->realm(), &ArrayObject::class_, tagged);
-  if (!group) {
-    return nullptr;
-  }
-
-  groups.stringSplitStringGroup.set(group);
-  return group;
-}
-
-void ObjectGroupRealm::addSizeOfExcludingThis(
-    mozilla::MallocSizeOf mallocSizeOf, size_t* allocationSiteTables,
-    size_t* arrayObjectGroupTables, size_t* plainObjectGroupTables,
-    size_t* realmTables) {
-  if (allocationSiteTable) {
-    *allocationSiteTables +=
-        allocationSiteTable->sizeOfIncludingThis(mallocSizeOf);
-  }
-
-  if (arrayObjectTable) {
-    *arrayObjectGroupTables +=
-        arrayObjectTable->shallowSizeOfIncludingThis(mallocSizeOf);
-  }
-
-  if (plainObjectTable) {
-    *plainObjectGroupTables +=
-        plainObjectTable->shallowSizeOfIncludingThis(mallocSizeOf);
-
-    for (PlainObjectTable::Enum e(*plainObjectTable); !e.empty();
-         e.popFront()) {
-      const PlainObjectKey& key = e.front().key();
-      const PlainObjectEntry& value = e.front().value();
-
-      /* key.ids and values.types have the same length. */
-      *plainObjectGroupTables +=
-          mallocSizeOf(key.properties) + mallocSizeOf(value.types);
-    }
-  }
-
-  if (defaultNewTable) {
-    *realmTables += defaultNewTable->sizeOfIncludingThis(mallocSizeOf);
-  }
-
-  if (lazyTable) {
-    *realmTables += lazyTable->sizeOfIncludingThis(mallocSizeOf);
-  }
-}
-
-void ObjectGroupRealm::clearTables() {
-  if (allocationSiteTable) {
-    allocationSiteTable->clear();
-  }
-  if (arrayObjectTable) {
-    arrayObjectTable->clear();
-  }
-  if (plainObjectTable) {
-    for (PlainObjectTable::Enum e(*plainObjectTable); !e.empty();
-         e.popFront()) {
-      const PlainObjectKey& key = e.front().key();
-      PlainObjectEntry& entry = e.front().value();
-      js_free(key.properties);
-      js_free(entry.types);
-    }
-    plainObjectTable->clear();
-  }
-  if (defaultNewTable) {
-    defaultNewTable->clear();
-  }
-  if (lazyTable) {
-    lazyTable->clear();
-  }
-  defaultNewGroupCache.purge();
-}
-
-/* static */
-bool ObjectGroupRealm::PlainObjectTableSweepPolicy::traceWeak(
-    JSTracer* trc, PlainObjectKey* key, PlainObjectEntry* entry) {
-  if (JS::GCPolicy<PlainObjectKey>::traceWeak(trc, key) &&
-      entry->traceWeak(trc, key->nproperties)) {
-    return true;
-  }
-
-  js_free(key->properties);
-  js_free(entry->types);
-  return false;
-}
-
-void ObjectGroupRealm::traceWeak(JSTracer* trc) {
-  /*
-   * Iterate through the array/object group tables and remove all entries
-   * referencing collected data. These tables only hold weak references.
-   */
-
-  if (arrayObjectTable) {
-    arrayObjectTable->traceWeak(trc);
-  }
-  if (plainObjectTable) {
-    plainObjectTable->traceWeak(trc);
-  }
-  if (stringSplitStringGroup) {
-    JS::GCPolicy<WeakHeapPtrObjectGroup>::traceWeak(trc,
-                                                    &stringSplitStringGroup);
-  }
-}
-
-void ObjectGroupRealm::fixupNewTableAfterMovingGC(NewTable* table) {
-  /*
-   * Each entry's hash depends on the object's prototype and we can't tell
-   * whether that has been moved or not in sweepNewObjectGroupTable().
-   */
-  if (table) {
-    for (NewTable::Enum e(*table); !e.empty(); e.popFront()) {
-      NewEntry& entry = e.mutableFront();
-
-      ObjectGroup* group = entry.group.unbarrieredGet();
-      if (IsForwarded(group)) {
-        group = Forwarded(group);
-        entry.group.set(group);
-      }
-      TaggedProto proto = group->proto();
-      if (proto.isObject() && IsForwarded(proto.toObject())) {
-        proto = TaggedProto(Forwarded(proto.toObject()));
-        // Update the group's proto here so that we are able to lookup
-        // entries in this table before all object pointers are updated.
-        group->proto() = proto;
-      }
-      if (entry.associated && IsForwarded(entry.associated)) {
-        entry.associated = Forwarded(entry.associated);
-      }
-    }
-  }
-}
-
 #ifdef JSGC_HASH_TABLE_CHECKS
 
 void ObjectGroupRealm::checkNewTableAfterMovingGC(NewTable* table) {
@@ -1849,3 +487,9 @@
 }
 
 #endif  // JSGC_HASH_TABLE_CHECKS
+
+JS::ubi::Node::Size JS::ubi::Concrete<js::ObjectGroup>::size(
+    mozilla::MallocSizeOf mallocSizeOf) const {
+  Size size = js::gc::Arena::thingSize(get().asTenured().getAllocKind());
+  return size;
+}
diff -Nru firefox-84.0.2+build1/js/src/vm/ObjectGroup.h firefox-85.0+build1/js/src/vm/ObjectGroup.h
--- firefox-84.0.2+build1/js/src/vm/ObjectGroup.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ObjectGroup.h	2021-01-18 19:58:16.000000000 +0000
@@ -18,18 +18,13 @@
 #include "js/CharacterEncoding.h"
 #include "js/GCHashTable.h"
 #include "js/TypeDecls.h"
+#include "js/UbiNode.h"
 #include "vm/TaggedProto.h"
-#include "vm/TypeSet.h"
 
 namespace js {
 
 class TypeDescr;
 
-class PreliminaryObjectArrayWithTemplate;
-class TypeNewScript;
-class AutoClearTypeInferenceStateOnOOM;
-class AutoSweepObjectGroup;
-class CompilerConstraintList;
 class ObjectGroupRealm;
 class PlainObject;
 
@@ -60,32 +55,15 @@
   TenuredObject
 };
 
-/*
- * [SMDOC] Type-Inference lazy ObjectGroup
- *
- * Object groups which represent at most one JS object are constructed lazily.
- * These include groups for native functions, standard classes, scripted
- * functions defined at the top level of global/eval scripts, objects which
- * dynamically become the prototype of some other object, and in some other
- * cases. Typical web workloads often create many windows (and many copies of
- * standard natives) and many scripts, with comparatively few non-singleton
- * groups.
- *
- * We can recover the type information for the object from examining it,
- * so don't normally track the possible types of its properties as it is
- * updated. Property type sets for the object are only constructed when an
- * analyzed script attaches constraints to it: the script is querying that
- * property off the object or another which delegates to it, and the analysis
- * information is sensitive to changes in the property's type. Future changes
- * to the property (whether those uncovered by analysis or those occurring
- * in the VM) will treat these properties like those of any other object group.
- */
+// Flags stored in ObjectGroup::Flags.
+enum : uint32_t {
+  /* Whether this group is associated with a single object. */
+  OBJECT_FLAG_SINGLETON = 0x2,
+};
+using ObjectGroupFlags = uint32_t;
 
-/* Type information about an object accessed by a script. */
 class ObjectGroup : public gc::TenuredCellWithNonGCPointer<const JSClass> {
  public:
-  class Property;
-
   /* Class shared by objects in this group, stored in the cell header. */
   const JSClass* clasp() const { return headerPtr(); }
 
@@ -99,52 +77,8 @@
   /* Flags for this group. */
   ObjectGroupFlags flags_;  // set by constructor
 
-  // If non-null, holds additional information about this object, whose
-  // format is indicated by the object's addendum kind.
-  void* addendum_ = nullptr;
-
-  /*
-   * [SMDOC] Type-Inference object properties
-   *
-   * Properties of this object.
-   *
-   * The type sets in the properties of a group describe the possible values
-   * that can be read out of that property in actual JS objects. In native
-   * objects, property types account for plain data properties (those with a
-   * slot and no getter or setter hook) and dense elements. In typed objects,
-   * property types account for object and value properties and elements in the
-   * object.
-   *
-   * For accesses on these properties, the correspondence is as follows:
-   *
-   * 1. If the group has unknownProperties(), the possible properties and
-   *    value types for associated JSObjects are unknown.
-   *
-   * 2. Otherwise, for any |obj| in |group|, and any |id| which is a property
-   *    in |obj|, before obj->getProperty(id) the property in |group| for
-   *    |id| must reflect the result of the getProperty.
-   *
-   * There are several exceptions to this:
-   *
-   * 1. For properties of global JS objects which are undefined at the point
-   *    where the property was (lazily) generated, the property type set will
-   *    remain empty, and the 'undefined' type will only be added after a
-   *    subsequent assignment or deletion. After these properties have been
-   *    assigned a defined value, the only way they can become undefined
-   *    again is after such an assign or deletion.
-   *
-   * 2. Array lengths are special cased by the compiler and VM and are not
-   *    reflected in property types.
-   *
-   * 3. In typed objects, the initial values of properties (null pointers and
-   *    undefined values) are not reflected in the property types. These values
-   *    are always possible when reading the property.
-   *
-   * We establish these by using write barriers on calls to setProperty and
-   * defineProperty which are on native properties, and on any jitcode which
-   * might update the property with a new type.
-   */
-  Property** propertySet = nullptr;
+  // Non-null only for typed objects.
+  TypeDescr* typeDescr_ = nullptr;
 
   // END OF PROPERTIES
 
@@ -163,10 +97,6 @@
     return offsetof(ObjectGroup, flags_);
   }
 
-  static inline uint32_t offsetOfAddendum() {
-    return offsetof(ObjectGroup, addendum_);
-  }
-
   friend class gc::GCRuntime;
 
   // See JSObject::offsetOfGroup() comment.
@@ -190,15 +120,7 @@
     return singleton();
   }
 
-  bool singleton() const {
-    return flagsDontCheckGeneration() & OBJECT_FLAG_SINGLETON;
-  }
-
-  bool lazy() const {
-    bool res = flagsDontCheckGeneration() & OBJECT_FLAG_LAZY_SINGLETON;
-    MOZ_ASSERT_IF(res, singleton());
-    return res;
-  }
+  bool singleton() const { return flags() & OBJECT_FLAG_SINGLETON; }
 
   JS::Compartment* compartment() const {
     return JS::GetCompartmentForRealm(realm_);
@@ -206,329 +128,47 @@
   JS::Compartment* maybeCompartment() const { return compartment(); }
   JS::Realm* realm() const { return realm_; }
 
- public:
-  // Kinds of addendums which can be attached to ObjectGroups.
-  enum AddendumKind {
-    Addendum_None,
-
-    // When used by interpreted function, the addendum stores the
-    // canonical JSFunction object.
-    Addendum_InterpretedFunction,
-
-    // When used by the 'new' group when constructing an interpreted
-    // function, the addendum stores a TypeNewScript.
-    Addendum_NewScript,
-
-    // For some plain objects, the addendum stores a
-    // PreliminaryObjectArrayWithTemplate.
-    Addendum_PreliminaryObjects,
-
-    // When used by typed objects, the addendum stores a TypeDescr.
-    Addendum_TypeDescr
-  };
-
  private:
-  void setAddendum(AddendumKind kind, void* addendum, bool isSweeping = false);
-
-  AddendumKind addendumKind() const {
-    return (AddendumKind)((flags_ & OBJECT_FLAG_ADDENDUM_MASK) >>
-                          OBJECT_FLAG_ADDENDUM_SHIFT);
-  }
-
-  TypeNewScript* newScriptDontCheckGeneration() const {
-    if (addendumKind() == Addendum_NewScript) {
-      return reinterpret_cast<TypeNewScript*>(addendum_);
-    }
-    return nullptr;
-  }
-
-  void detachNewScript(bool isSweeping, ObjectGroup* replacement);
-
-  ObjectGroupFlags flagsDontCheckGeneration() const { return flags_; }
+  ObjectGroupFlags flags() const { return flags_; }
 
  public:
-  inline ObjectGroupFlags flags(const AutoSweepObjectGroup&);
-  inline void addFlags(const AutoSweepObjectGroup&, ObjectGroupFlags flags);
-  inline void clearFlags(const AutoSweepObjectGroup&, ObjectGroupFlags flags);
-  inline TypeNewScript* newScript(const AutoSweepObjectGroup& sweep);
-
-  void setNewScript(TypeNewScript* newScript) {
-    MOZ_ASSERT(newScript);
-    setAddendum(Addendum_NewScript, newScript);
-  }
-  void detachNewScript() { setAddendum(Addendum_None, nullptr); }
-
-  inline PreliminaryObjectArrayWithTemplate* maybePreliminaryObjects(
-      const AutoSweepObjectGroup& sweep);
-
-  PreliminaryObjectArrayWithTemplate*
-  maybePreliminaryObjectsDontCheckGeneration() {
-    if (addendumKind() == Addendum_PreliminaryObjects) {
-      return reinterpret_cast<PreliminaryObjectArrayWithTemplate*>(addendum_);
-    }
-    return nullptr;
-  }
-
-  void setPreliminaryObjects(
-      PreliminaryObjectArrayWithTemplate* preliminaryObjects) {
-    setAddendum(Addendum_PreliminaryObjects, preliminaryObjects);
-  }
-
-  void detachPreliminaryObjects() {
-    MOZ_ASSERT(maybePreliminaryObjectsDontCheckGeneration());
-    setAddendum(Addendum_None, nullptr);
-  }
-
-  inline bool hasUnanalyzedPreliminaryObjects();
-
   TypeDescr* maybeTypeDescr() {
     // Note: there is no need to sweep when accessing the type descriptor
     // of an object, as it is strongly held and immutable.
-    if (addendumKind() == Addendum_TypeDescr) {
-      return &typeDescr();
-    }
-    return nullptr;
+    return typeDescr_;
   }
 
   TypeDescr& typeDescr() {
-    MOZ_ASSERT(addendumKind() == Addendum_TypeDescr);
-    return *reinterpret_cast<TypeDescr*>(addendum_);
+    MOZ_ASSERT(typeDescr_);
+    return *typeDescr_;
   }
 
-  void setTypeDescr(TypeDescr* descr) {
-    setAddendum(Addendum_TypeDescr, descr);
-  }
-
-  JSFunction* maybeInterpretedFunction() {
-    // Note: as with type descriptors, there is no need to sweep when
-    // accessing the interpreted function associated with an object.
-    if (addendumKind() == Addendum_InterpretedFunction) {
-      return reinterpret_cast<JSFunction*>(addendum_);
-    }
-    return nullptr;
-  }
-
-  void setInterpretedFunction(JSFunction* fun) {
-    MOZ_ASSERT(!gc::IsInsideNursery(reinterpret_cast<gc::Cell*>(fun)));
-    setAddendum(Addendum_InterpretedFunction, fun);
-  }
-
-  class Property {
-   public:
-    // Identifier for this property, JSID_VOID for the aggregate integer
-    // index property, or JSID_EMPTY for properties holding constraints
-    // listening to changes in the group's state.
-    const GCPtrId id;
-
-    // Possible own types for this property.
-    HeapTypeSet types;
-
-    explicit Property(jsid id) : id(id) {}
-
-    Property(const Property& o) : id(o.id.get()), types(o.types) {}
-
-    static uint32_t keyBits(jsid id) { return uint32_t(JSID_BITS(id)); }
-    static jsid getKey(Property* p) { return p->id; }
-  };
+  void setTypeDescr(TypeDescr* descr) { typeDescr_ = descr; }
 
  public:
   inline ObjectGroup(const JSClass* clasp, TaggedProto proto, JS::Realm* realm,
                      ObjectGroupFlags initialFlags);
 
-  inline bool hasAnyFlags(const AutoSweepObjectGroup& sweep,
-                          ObjectGroupFlags flags);
-  inline bool hasAllFlags(const AutoSweepObjectGroup& sweep,
-                          ObjectGroupFlags flags);
-
-  bool hasAnyFlagsDontCheckGeneration(ObjectGroupFlags flags) {
-    MOZ_ASSERT((flags & OBJECT_FLAG_DYNAMIC_MASK) == flags);
-    return !!(this->flagsDontCheckGeneration() & flags);
-  }
-  bool hasAllFlagsDontCheckGeneration(ObjectGroupFlags flags) {
-    MOZ_ASSERT((flags & OBJECT_FLAG_DYNAMIC_MASK) == flags);
-    return (this->flagsDontCheckGeneration() & flags) == flags;
-  }
-
-  inline bool unknownProperties(const AutoSweepObjectGroup& sweep);
-
-  bool unknownPropertiesDontCheckGeneration() {
-    MOZ_ASSERT_IF(flagsDontCheckGeneration() & OBJECT_FLAG_UNKNOWN_PROPERTIES,
-                  hasAllFlagsDontCheckGeneration(OBJECT_FLAG_DYNAMIC_MASK));
-    return !!(flagsDontCheckGeneration() & OBJECT_FLAG_UNKNOWN_PROPERTIES);
-  }
-
-  inline bool shouldPreTenure(const AutoSweepObjectGroup& sweep);
-  inline bool shouldPreTenureDontCheckGeneration();
-
-  gc::InitialHeap initialHeap(CompilerConstraintList* constraints);
-
-  inline bool canPreTenure(const AutoSweepObjectGroup& sweep);
-  inline bool fromAllocationSite(const AutoSweepObjectGroup& sweep);
-  inline void setShouldPreTenure(const AutoSweepObjectGroup& sweep,
-                                 JSContext* cx);
-
-  /*
-   * Get or create a property of this object. Only call this for properties
-   * which a script accesses explicitly.
-   */
-  inline HeapTypeSet* getProperty(const AutoSweepObjectGroup& sweep,
-                                  JSContext* cx, JSObject* obj, jsid id);
-
-  /* Get a property only if it already exists. */
-  MOZ_ALWAYS_INLINE HeapTypeSet* maybeGetProperty(
-      const AutoSweepObjectGroup& sweep, jsid id);
-  MOZ_ALWAYS_INLINE HeapTypeSet* maybeGetPropertyDontCheckGeneration(jsid id);
-
-  /*
-   * Iterate through the group's properties. getPropertyCount overapproximates
-   * in the hash case (see SET_ARRAY_SIZE in TypeInference-inl.h), and
-   * getProperty may return nullptr.
-   */
-  inline unsigned getPropertyCount(const AutoSweepObjectGroup& sweep);
-  inline Property* getProperty(const AutoSweepObjectGroup& sweep, unsigned i);
-
   /* Helpers */
 
-  void updateNewPropertyTypes(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                              JSObject* obj, jsid id, HeapTypeSet* types);
-  void addDefiniteProperties(JSContext* cx, Shape* shape);
-  void markPropertyNonData(JSContext* cx, JSObject* obj, jsid id);
-  void markPropertyNonWritable(JSContext* cx, JSObject* obj, jsid id);
-  void markStateChange(const AutoSweepObjectGroup& sweep, JSContext* cx);
-  void setFlags(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                ObjectGroupFlags flags);
-  void markUnknown(const AutoSweepObjectGroup& sweep, JSContext* cx);
-  void maybeClearNewScriptOnOOM();
-  void clearNewScript(JSContext* cx, ObjectGroup* replacement = nullptr);
-
-  void print(const AutoSweepObjectGroup& sweep);
-
-  inline void clearProperties(const AutoSweepObjectGroup& sweep);
   void traceChildren(JSTracer* trc);
 
-  inline bool needsSweep();
-  void sweep(const AutoSweepObjectGroup& sweep);
-
- private:
-  uint32_t generation() {
-    return (flags_ & OBJECT_FLAG_GENERATION_MASK) >>
-           OBJECT_FLAG_GENERATION_SHIFT;
-  }
-
- public:
-  void setGeneration(uint32_t generation) {
-    MOZ_ASSERT(generation <=
-               (OBJECT_FLAG_GENERATION_MASK >> OBJECT_FLAG_GENERATION_SHIFT));
-    flags_ &= ~OBJECT_FLAG_GENERATION_MASK;
-    flags_ |= generation << OBJECT_FLAG_GENERATION_SHIFT;
+  void finalize(JSFreeOp* fop) {
+    // Nothing to do.
   }
 
-  size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
-
-  void finalize(JSFreeOp* fop);
-
   static const JS::TraceKind TraceKind = JS::TraceKind::ObjectGroup;
 
- public:
-  const ObjectGroupFlags* addressOfFlags() const { return &flags_; }
-
-  inline uint32_t basePropertyCount(const AutoSweepObjectGroup& sweep);
-  inline uint32_t basePropertyCountDontCheckGeneration();
-
- private:
-  inline void setBasePropertyCount(const AutoSweepObjectGroup& sweep,
-                                   uint32_t count);
-
   static void staticAsserts() {
     static_assert(offsetof(ObjectGroup, proto_) ==
                   offsetof(JS::shadow::ObjectGroup, proto));
   }
 
- public:
-  // Whether to make a deep cloned singleton when cloning fun.
-  static bool useSingletonForClone(JSFunction* fun);
-
-  // Whether to make a singleton when calling 'new' at script/pc.
-  static bool useSingletonForNewObject(JSContext* cx, JSScript* script,
-                                       jsbytecode* pc);
-
-  // Whether to make a singleton object at an allocation site.
-  static bool useSingletonForAllocationSite(JSScript* script, jsbytecode* pc,
-                                            JSProtoKey key);
-
- public:
   // Static accessors for ObjectGroupRealm NewTable.
 
   static ObjectGroup* defaultNewGroup(JSContext* cx, const JSClass* clasp,
                                       TaggedProto proto,
                                       JSObject* associated = nullptr);
-
-  // For use in creating a singleton group without needing to replace an
-  // existing group.
-  static ObjectGroup* lazySingletonGroup(JSContext* cx, ObjectGroupRealm& realm,
-                                         JS::Realm* objectRealm,
-                                         const JSClass* clasp,
-                                         TaggedProto proto);
-
-  // For use in replacing an already-existing group with a singleton group.
-  static inline ObjectGroup* lazySingletonGroup(JSContext* cx,
-                                                ObjectGroup* oldGroup,
-                                                const JSClass* clasp,
-                                                TaggedProto proto);
-
-  static void setDefaultNewGroupUnknown(JSContext* cx, ObjectGroupRealm& realm,
-                                        const JSClass* clasp,
-                                        JS::HandleObject obj);
-
-  // Static accessors for ObjectGroupRealm ArrayObjectTable and
-  // PlainObjectTable.
-
-  enum class NewArrayKind {
-    Normal,       // Specialize array group based on its element type.
-    CopyOnWrite,  // Make an array with copy-on-write elements.
-    UnknownIndex  // Make an array with an unknown element type.
-  };
-
-  // Create an ArrayObject with the specified elements and a group specialized
-  // for the elements.
-  static ArrayObject* newArrayObject(
-      JSContext* cx, const Value* vp, size_t length, NewObjectKind newKind,
-      NewArrayKind arrayKind = NewArrayKind::Normal);
-
-  // Create a PlainObject with the specified properties and a group specialized
-  // for those properties.
-  static JSObject* newPlainObject(JSContext* cx, IdValuePair* properties,
-                                  size_t nproperties, NewObjectKind newKind);
-
-  // Static accessors for ObjectGroupRealm AllocationSiteTable.
-
-  // Get a non-singleton group to use for objects created at the specified
-  // allocation site.
-  static ObjectGroup* allocationSiteGroup(JSContext* cx, JSScript* script,
-                                          jsbytecode* pc, JSProtoKey key,
-                                          HandleObject proto = nullptr);
-
-  // Get a non-singleton group to use for objects created in a JSNative call.
-  static ObjectGroup* callingAllocationSiteGroup(JSContext* cx, JSProtoKey key,
-                                                 HandleObject proto = nullptr);
-
-  // Set the group or singleton-ness of an object created for an allocation
-  // site.
-  static bool setAllocationSiteObjectGroup(JSContext* cx, HandleScript script,
-                                           jsbytecode* pc, HandleObject obj,
-                                           bool singleton);
-
-  static ArrayObject* getOrFixupCopyOnWriteObject(JSContext* cx,
-                                                  HandleScript script,
-                                                  jsbytecode* pc);
-  static ArrayObject* getCopyOnWriteObject(JSScript* script, jsbytecode* pc);
-
-  // Returns false if not found.
-  static bool findAllocationSite(JSContext* cx, const ObjectGroup* group,
-                                 JSScript** script, uint32_t* offset);
-
- private:
-  static ObjectGroup* defaultNewGroup(JSContext* cx, JSProtoKey key);
 };
 
 // Structure used to manage the groups in a realm.
@@ -536,27 +176,9 @@
  private:
   class NewTable;
 
-  struct ArrayObjectKey;
-  using ArrayObjectTable =
-      js::GCRekeyableHashMap<ArrayObjectKey, WeakHeapPtrObjectGroup,
-                             ArrayObjectKey, SystemAllocPolicy>;
-
-  struct PlainObjectKey;
-  struct PlainObjectEntry;
-  struct PlainObjectTableSweepPolicy {
-    static bool traceWeak(JSTracer* trc, PlainObjectKey* key,
-                          PlainObjectEntry* entry);
-  };
-  using PlainObjectTable =
-      JS::GCHashMap<PlainObjectKey, PlainObjectEntry, PlainObjectKey,
-                    SystemAllocPolicy, PlainObjectTableSweepPolicy>;
-
-  class AllocationSiteTable;
-
  private:
-  // Set of default 'new' or lazy groups in the realm.
+  // Set of default 'new' groups in the realm.
   NewTable* defaultNewTable = nullptr;
-  NewTable* lazyTable = nullptr;
 
   // This cache is purged on GC.
   class DefaultNewGroupCache {
@@ -577,21 +199,6 @@
                                           JSObject* associated);
   } defaultNewGroupCache = {};
 
-  // Tables for managing groups common to the contents of large script
-  // singleton objects and JSON objects. These are vanilla ArrayObjects and
-  // PlainObjects, so we distinguish the groups of different ones by looking
-  // at the types of their properties.
-  //
-  // All singleton/JSON arrays which have the same prototype, are homogenous
-  // and of the same element type will share a group. All singleton/JSON
-  // objects which have the same shape and property types will also share a
-  // group. We don't try to collate arrays or objects with type mismatches.
-  ArrayObjectTable* arrayObjectTable = nullptr;
-  PlainObjectTable* plainObjectTable = nullptr;
-
-  // Table for referencing types of objects keyed to an allocation site.
-  AllocationSiteTable* allocationSiteTable = nullptr;
-
   // A single per-realm ObjectGroup for all calls to StringSplitString.
   // StringSplitString is always called from self-hosted code, and conceptually
   // the return object for a string.split(string) operation should have a
@@ -605,9 +212,6 @@
  private:
   friend class ObjectGroup;
 
-  struct AllocationSiteKey;
-  friend struct MovableCellHasher<AllocationSiteKey>;
-
  public:
   struct NewEntry;
 
@@ -620,21 +224,9 @@
   static ObjectGroupRealm& get(const ObjectGroup* group);
   static ObjectGroupRealm& getForNewObject(JSContext* cx);
 
-  void removeDefaultNewGroup(const JSClass* clasp, TaggedProto proto,
-                             JSObject* associated);
-  void replaceDefaultNewGroup(const JSClass* clasp, TaggedProto proto,
-                              JSObject* associated, ObjectGroup* group);
-
-  static ObjectGroup* makeGroup(JSContext* cx, JS::Realm* realm,
-                                const JSClass* clasp, Handle<TaggedProto> proto,
-                                ObjectGroupFlags initialFlags = 0);
-
   static ObjectGroup* getStringSplitStringGroup(JSContext* cx);
 
   void addSizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf,
-                              size_t* allocationSiteTables,
-                              size_t* arrayGroupTables,
-                              size_t* plainObjectGroupTables,
                               size_t* realmTables);
 
   void clearTables();
@@ -646,13 +238,11 @@
 #ifdef JSGC_HASH_TABLE_CHECKS
   void checkTablesAfterMovingGC() {
     checkNewTableAfterMovingGC(defaultNewTable);
-    checkNewTableAfterMovingGC(lazyTable);
   }
 #endif
 
   void fixupTablesAfterMovingGC() {
     fixupNewTableAfterMovingGC(defaultNewTable);
-    fixupNewTableAfterMovingGC(lazyTable);
   }
 
  private:
@@ -668,12 +258,31 @@
                                           size_t nproperties,
                                           NewObjectKind newKind);
 
-bool CombineArrayElementTypes(JSContext* cx, JSObject* newObj,
-                              const Value* compare, size_t ncompare);
+}  // namespace js
 
-bool CombinePlainObjectPropertyTypes(JSContext* cx, JSObject* newObj,
-                                     const Value* compare, size_t ncompare);
+// JS::ubi::Nodes can point to object groups; they're js::gc::Cell instances
+// with no associated compartment.
+namespace JS {
+namespace ubi {
+
+template <>
+class Concrete<js::ObjectGroup> : TracerConcrete<js::ObjectGroup> {
+ protected:
+  explicit Concrete(js::ObjectGroup* ptr)
+      : TracerConcrete<js::ObjectGroup>(ptr) {}
 
-}  // namespace js
+ public:
+  static void construct(void* storage, js::ObjectGroup* ptr) {
+    new (storage) Concrete(ptr);
+  }
+
+  Size size(mozilla::MallocSizeOf mallocSizeOf) const override;
+
+  const char16_t* typeName() const override { return concreteTypeName; }
+  static const char16_t concreteTypeName[];
+};
+
+}  // namespace ubi
+}  // namespace JS
 
 #endif /* vm_ObjectGroup_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/ObjectGroup-inl.h firefox-85.0+build1/js/src/vm/ObjectGroup-inl.h
--- firefox-84.0.2+build1/js/src/vm/ObjectGroup-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ObjectGroup-inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +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 vm_ObjectGroup_inl_h
-#define vm_ObjectGroup_inl_h
-
-#include "vm/ObjectGroup.h"
-
-#include "gc/Zone.h"
-
-namespace js {
-
-inline bool ObjectGroup::needsSweep() {
-  // Note: this can be called off thread during compacting GCs, in which case
-  // nothing will be running on the main thread.
-  MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI);
-  return generation() != zoneFromAnyThread()->types.generation;
-}
-
-inline ObjectGroupFlags ObjectGroup::flags(const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(sweep.group() == this);
-  return flagsDontCheckGeneration();
-}
-
-inline void ObjectGroup::addFlags(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroupFlags flags) {
-  MOZ_ASSERT(sweep.group() == this);
-  flags_ |= flags;
-}
-
-inline void ObjectGroup::clearFlags(const AutoSweepObjectGroup& sweep,
-                                    ObjectGroupFlags flags) {
-  MOZ_ASSERT(sweep.group() == this);
-  flags_ &= ~flags;
-}
-
-inline bool ObjectGroup::hasAnyFlags(const AutoSweepObjectGroup& sweep,
-                                     ObjectGroupFlags flags) {
-  MOZ_ASSERT((flags & OBJECT_FLAG_DYNAMIC_MASK) == flags);
-  return !!(this->flags(sweep) & flags);
-}
-
-inline bool ObjectGroup::hasAllFlags(const AutoSweepObjectGroup& sweep,
-                                     ObjectGroupFlags flags) {
-  MOZ_ASSERT((flags & OBJECT_FLAG_DYNAMIC_MASK) == flags);
-  return (this->flags(sweep) & flags) == flags;
-}
-
-inline bool ObjectGroup::unknownProperties(const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT_IF(flags(sweep) & OBJECT_FLAG_UNKNOWN_PROPERTIES,
-                hasAllFlags(sweep, OBJECT_FLAG_DYNAMIC_MASK));
-  return !!(flags(sweep) & OBJECT_FLAG_UNKNOWN_PROPERTIES);
-}
-
-inline bool ObjectGroup::shouldPreTenure(const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(sweep.group() == this);
-  return shouldPreTenureDontCheckGeneration();
-}
-
-inline bool ObjectGroup::shouldPreTenureDontCheckGeneration() {
-  return hasAnyFlagsDontCheckGeneration(OBJECT_FLAG_PRE_TENURE) &&
-         !unknownPropertiesDontCheckGeneration();
-}
-
-inline bool ObjectGroup::canPreTenure(const AutoSweepObjectGroup& sweep) {
-  return !unknownProperties(sweep);
-}
-
-inline bool ObjectGroup::fromAllocationSite(const AutoSweepObjectGroup& sweep) {
-  return flags(sweep) & OBJECT_FLAG_FROM_ALLOCATION_SITE;
-}
-
-inline void ObjectGroup::setShouldPreTenure(const AutoSweepObjectGroup& sweep,
-                                            JSContext* cx) {
-  MOZ_ASSERT(canPreTenure(sweep));
-  setFlags(sweep, cx, OBJECT_FLAG_PRE_TENURE);
-}
-
-inline TypeNewScript* ObjectGroup::newScript(
-    const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(sweep.group() == this);
-  return newScriptDontCheckGeneration();
-}
-
-inline PreliminaryObjectArrayWithTemplate* ObjectGroup::maybePreliminaryObjects(
-    const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(sweep.group() == this);
-  return maybePreliminaryObjectsDontCheckGeneration();
-}
-
-/* static */ inline ObjectGroup* ObjectGroup::lazySingletonGroup(
-    JSContext* cx, ObjectGroup* oldGroup, const JSClass* clasp,
-    TaggedProto proto) {
-  ObjectGroupRealm& realm = oldGroup ? ObjectGroupRealm::get(oldGroup)
-                                     : ObjectGroupRealm::getForNewObject(cx);
-  JS::Realm* objectRealm = oldGroup ? oldGroup->realm() : cx->realm();
-  return lazySingletonGroup(cx, realm, objectRealm, clasp, proto);
-}
-
-}  // namespace js
-
-/* static */ inline bool JSObject::setSingleton(JSContext* cx,
-                                                js::HandleObject obj) {
-  MOZ_ASSERT(!IsInsideNursery(obj));
-  MOZ_ASSERT(!obj->isSingleton());
-
-  js::ObjectGroup* group = js::ObjectGroup::lazySingletonGroup(
-      cx, obj->groupRaw(), obj->getClass(), obj->taggedProto());
-  if (!group) {
-    return false;
-  }
-
-  obj->setGroupRaw(group);
-  return true;
-}
-
-#endif /* vm_ObjectGroup_inl_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/ObjectOperations-inl.h firefox-85.0+build1/js/src/vm/ObjectOperations-inl.h
--- firefox-84.0.2+build1/js/src/vm/ObjectOperations-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ObjectOperations-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -32,8 +32,7 @@
 #include "vm/StringType.h"    // js::NameToId
 #include "vm/SymbolType.h"    // JS::Symbol
 
-#include "vm/JSAtom-inl.h"         // js::IndexToId
-#include "vm/TypeInference-inl.h"  // js::MarkTypePropertyNonData
+#include "vm/JSAtom-inl.h"  // js::IndexToId
 
 namespace js {
 
@@ -339,7 +338,6 @@
  */
 inline bool DeleteProperty(JSContext* cx, JS::Handle<JSObject*> obj,
                            JS::Handle<jsid> id, JS::ObjectOpResult& result) {
-  MarkTypePropertyNonData(cx, obj, id);
   if (DeletePropertyOp op = obj->getOpsDeleteProperty()) {
     return op(cx, obj, id, result);
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/OffThreadPromiseRuntimeState.cpp firefox-85.0+build1/js/src/vm/OffThreadPromiseRuntimeState.cpp
--- firefox-84.0.2+build1/js/src/vm/OffThreadPromiseRuntimeState.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/OffThreadPromiseRuntimeState.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -162,7 +162,7 @@
   OffThreadPromiseRuntimeState& state =
       *reinterpret_cast<OffThreadPromiseRuntimeState*>(closure);
   MOZ_ASSERT(state.usingInternalDispatchQueue());
-  MOZ_ASSERT(gHelperThreadLock.ownedByCurrentThread());
+  gHelperThreadLock.assertOwnedByCurrentThread();
 
   if (state.internalDispatchQueueClosed_) {
     return false;
diff -Nru firefox-84.0.2+build1/js/src/vm/Opcodes.h firefox-85.0+build1/js/src/vm/Opcodes.h
--- firefox-84.0.2+build1/js/src/vm/Opcodes.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Opcodes.h	2021-01-18 19:58:16.000000000 +0000
@@ -819,18 +819,12 @@
      * must fill in all slots of the new object before it is used in any other
      * way.
      *
-     * For `JSOp::NewObject`, the new object has a group based on the allocation
-     * site (or a new group if the template's group is a singleton). For
-     * `JSOp::NewObjectWithGroup`, the new object has the same group as the
-     * template object.
-     *
      *   Category: Objects
      *   Type: Creating objects
      *   Operands: uint32_t baseobjIndex
      *   Stack: => obj
      */ \
     MACRO(NewObject, new_object, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC) \
-    MACRO(NewObjectWithGroup, new_object_with_group, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC) \
     /*
      * Push a preconstructed object.
      *
@@ -1010,9 +1004,6 @@
      * Get the value of the property `obj.name`. This can call getters and
      * proxy traps.
      *
-     * `JSOp::CallProp` is exactly like `JSOp::GetProp` but hints to the VM that we're
-     * getting a method in order to call it.
-     *
      * Implements: [GetV][1], [GetValue][2] step 5.
      *
      * [1]: https://tc39.es/ecma262/#sec-getv
@@ -1023,14 +1014,10 @@
      *   Operands: uint32_t nameIndex
      *   Stack: obj => obj[name]
      */ \
-    MACRO(GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
-    MACRO(CallProp, call_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_IC) \
     /*
      * Get the value of the property `obj[key]`.
      *
-     * `JSOp::CallElem` is exactly like `JSOp::GetElem` but hints to the VM that
-     * we're getting a method in order to call it.
-     *
      * Implements: [GetV][1], [GetValue][2] step 5.
      *
      * [1]: https://tc39.es/ecma262/#sec-getv
@@ -1041,20 +1028,7 @@
      *   Operands:
      *   Stack: obj, key => obj[key]
      */ \
-    MACRO(GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
-    MACRO(CallElem, call_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
-    /*
-     * Push the value of `obj.length`.
-     *
-     * `nameIndex` must be the index of the atom `"length"`. This then behaves
-     * exactly like `JSOp::GetProp`.
-     *
-     *   Category: Objects
-     *   Type: Accessing properties
-     *   Operands: uint32_t nameIndex
-     *   Stack: obj => obj.length
-     */ \
-    MACRO(Length, length, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_IC) \
     /*
      * Non-strict assignment to a property, `obj.name = val`.
      *
@@ -1229,7 +1203,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: receiver, obj => super.name
      */ \
-    MACRO(GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_IC) \
     /*
      * Get the value of `receiver[key]`, starting the property search at `obj`.
      * In spec terms, `obj.[[Get]](key, receiver)`.
@@ -1247,7 +1221,7 @@
      *   Operands:
      *   Stack: receiver, key, obj => super[key]
      */ \
-    MACRO(GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
+    MACRO(GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_IC) \
     /*
      * Assign `val` to `receiver.name`, starting the search for an existing
      * property at `obj`. In spec terms, `obj.[[Set]](name, val, receiver)`.
@@ -1366,16 +1340,6 @@
      */ \
     MACRO(IsNoIter, is_no_iter, NULL, 1, 1, 2, JOF_BYTE) \
     /*
-     * No-op instruction to hint to IonBuilder that the value on top of the
-     * stack is the string key in a for-in loop.
-     *
-     *   Category: Objects
-     *   Type: Enumeration
-     *   Operands:
-     *   Stack: val => val
-     */ \
-    MACRO(IterNext, iter_next, NULL, 1, 1, 1, JOF_BYTE) \
-    /*
      * Exit a for-in loop, closing the iterator.
      *
      * `iter` must be a `PropertyIteratorObject` pushed by `JSOp::Iter`.
@@ -1468,7 +1432,7 @@
     /*
      * Initialize an array element `array[index]` with value `val`.
      *
-     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)`. If it is, this does nothing.
+     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)` pushed by `JSOp::Hole`.
      *
      * This never calls setters or proxy traps.
      *
@@ -1485,13 +1449,13 @@
      *   Operands: uint32_t index
      *   Stack: array, val => array
      */ \
-    MACRO(InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT|JOF_IC) \
+    MACRO(InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT) \
     /*
      * Initialize an array element `array[index++]` with value `val`.
      *
-     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)`. If it is, no element is
-     * defined, but the array length and the stack value `index` are still
-     * incremented.
+     * `val` may be `MagicValue(JS_ELEMENTS_HOLE)` pushed by `JSOp::Hole`. If it
+     * is, no element is defined, but the array length and the stack value
+     * `index` are still incremented.
      *
      * This never calls setters or proxy traps.
      *
@@ -1531,23 +1495,6 @@
      */ \
     MACRO(Hole, hole, NULL, 1, 0, 1, JOF_BYTE) \
     /*
-     * Create and push a new array that shares the elements of a template
-     * object.
-     *
-     * `script->getObject(objectIndex)` must be a copy-on-write array whose
-     * elements are all primitive values.
-     *
-     * This is an optimization. This single instruction implements an entire
-     * array literal, saving run time, code, and memory compared to
-     * `JSOp::NewArray` and a series of `JSOp::InitElem` instructions.
-     *
-     *   Category: Objects
-     *   Type: Array literals
-     *   Operands: uint32_t objectIndex
-     *   Stack: => array
-     */ \
-    MACRO(NewArrayCopyOnWrite, new_array_copy_on_write, NULL, 5, 0, 1, JOF_OBJECT) \
-    /*
      * Clone and push a new RegExp object.
      *
      * Implements: [Evaluation for *RegularExpressionLiteral*][1].
@@ -1561,11 +1508,9 @@
      */ \
     MACRO(RegExp, reg_exp, NULL, 5, 0, 1, JOF_REGEXP) \
     /*
-     * Push a function object.
+     * Push a new function object.
      *
-     * This clones the function unless it's a singleton; see
-     * `CanReuseFunctionForClone`. The new function inherits the current
-     * environment chain.
+     * The new function inherits the current environment chain.
      *
      * Used to create most JS functions. Notable exceptions are arrow functions
      * and derived or default class constructors.
@@ -1744,11 +1689,11 @@
      *   Operands: uint16_t argc
      *   Stack: callee, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
+    MACRO(Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
     /*
      * Like `JSOp::Call`, but the arguments are provided in an array rather than
      * a span of stack slots. Used to implement spread-call syntax:
@@ -1764,7 +1709,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
+    MACRO(SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_IC) \
     /*
      * Push true if `arr` is an array object that can be passed directly as the
      * `args` argument to `JSOp::SpreadCall`.
@@ -1810,7 +1755,7 @@
      *   Operands: uint16_t argc
      *   Stack: callee, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC) \
+    MACRO(Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSLOPPY|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::Eval`.
      *
@@ -1821,7 +1766,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC) \
+    MACRO(SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSLOPPY|JOF_IC) \
     /*
      * Like `JSOp::Eval`, but for strict mode code.
      *
@@ -1830,7 +1775,7 @@
      *   Operands: uint16_t argc
      *   Stack: evalFn, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC) \
+    MACRO(StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSTRICT|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::StrictEval`.
      *
@@ -1841,7 +1786,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC) \
+    MACRO(StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSTRICT|JOF_IC) \
     /*
      * Push the implicit `this` value for an unqualified function call, like
      * `foo()`. `nameIndex` gives the name of the function we're calling.
@@ -1938,8 +1883,8 @@
      *   Operands: uint16_t argc
      *   Stack: callee, isConstructing, args[0], ..., args[argc-1], newTarget => rval
      */ \
-    MACRO(New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC) \
-    MACRO(SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC) \
+    MACRO(New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC) \
+    MACRO(SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::New`.
      *
@@ -1957,8 +1902,8 @@
      *   Operands:
      *   Stack: callee, isConstructing, args, newTarget => rval
      */ \
-    MACRO(SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
-    MACRO(SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
+    MACRO(SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC) \
+    MACRO(SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC) \
     /*
      * Push the prototype of `callee` in preparation for calling `super()`.
      *
@@ -2748,8 +2693,8 @@
     /*
      * Initialize a global lexical binding.
      *
-     * The binding must already have been created by `DefLet` or `DefConst` and
-     * must be uninitialized.
+     * The binding must already have been created by
+     * `GlobalOrEvalDeclInstantiation` and must be uninitialized.
      *
      * Like `JSOp::InitLexical` but for global lexicals. Unlike `InitLexical`
      * this can't be used to mark a binding as uninitialized.
@@ -2870,7 +2815,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Find a global binding and push its value.
      *
@@ -2894,7 +2839,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_GNAME|JOF_IC) \
+    MACRO(GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_GNAME|JOF_IC) \
     /*
      * Push the value of an argument that is stored in the stack frame
      * or in an `ArgumentsObject`.
@@ -2941,7 +2886,7 @@
      *   Operands: uint8_t hops, uint24_t slot
      *   Stack: => aliasedVar
      */ \
-    MACRO(GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME) \
     /*
      * Get the value of a module import by name and pushes it onto the stack.
      *
@@ -2950,7 +2895,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME) \
     /*
      * Get the value of a binding from the environment `env`. If the name is
      * not bound in `env`, throw a ReferenceError.
@@ -2975,7 +2920,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: env => v
      */ \
-    MACRO(GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Push the value of an intrinsic onto the stack.
      *
@@ -2988,7 +2933,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => intrinsic[name]
      */ \
-    MACRO(GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Pushes the currently executing function onto the stack.
      *
@@ -3327,87 +3272,27 @@
      */ \
     MACRO(BindVar, bind_var, NULL, 1, 0, 1, JOF_BYTE) \
     /*
-     * Create a new binding on the current VariableEnvironment (the environment
-     * on the environment chain designated to receive new variables).
-     *
-     * `JSOp::Def{Var,Let,Const,Fun}` instructions must appear in the script
-     * before anything else that might add bindings to the environment, and
-     * only once per binding. There must be a correct entry for the new binding
-     * in `script->bodyScope()`. (All this ensures that at run time, there is
-     * no existing conflicting binding. This is checked by the
-     * `JSOp::CheckGlobalOrEvalDecl` bytecode instruction that must appear
-     * before `JSOp::Def{Var,Let,Const,Fun}`.)
-     *
-     * Throw a SyntaxError if the current VariableEnvironment is the global
-     * environment and a binding with the same name exists on the global
-     * lexical environment.
-     *
-     * This is used for global scripts and also in some cases for function
-     * scripts where use of dynamic scoping inhibits optimization.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefVar, def_var, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Create a new binding for the given function on the current scope.
-     *
-     * `fun` must be a function object with an explicit name. The new
-     * variable's name is `fun->explicitName()`, and its value is `fun`. In
-     * global scope, this creates a new property on the global object.
-     *
-     * Implements: The body of the loop in [GlobalDeclarationInstantiation][1]
-     * step 17 ("For each Parse Node *f* in *functionsToInitialize*...") and
-     * the corresponding loop in [EvalDeclarationInstantiation][2].
+     * Check for conflicting bindings and then initialize them in global or
+     * sloppy eval scripts. This is required for global scripts with any
+     * top-level bindings, or any sloppy-eval scripts with any non-lexical
+     * top-level bindings.
+     *
+     * Implements: [GlobalDeclarationInstantiation][1] and
+     *             [EvalDeclarationInstantiation][2] (except step 12).
+     *
+     * The `lastFun` argument is a GCThingIndex of the last hoisted top-level
+     * function that is part of top-level script initialization. The gcthings
+     * from index `0` thru `lastFun` contain only scopes and hoisted functions.
      *
      * [1]: https://tc39.es/ecma262/#sec-globaldeclarationinstantiation
      * [2]: https://tc39.es/ecma262/#sec-evaldeclarationinstantiation
      *
      *   Category: Variables and scopes
      *   Type: Creating and deleting bindings
-     *   Operands:
-     *   Stack: fun =>
-     */ \
-    MACRO(DefFun, def_fun, NULL, 1, 1, 0, JOF_BYTE) \
-    /*
-     * Create a new uninitialized mutable binding in the global lexical
-     * environment. Throw a SyntaxError if a binding with the same name already
-     * exists on that environment, or if a var binding with the same name
-     * exists on the global.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefLet, def_let, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Like `DefLet`, but create an uninitialized constant binding.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefConst, def_const, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Check for conflicting bindings before `JSOp::Def{Var,Let,Const,Fun}` in
-     * global or sloppy eval scripts.
-     *
-     * Implements: [GlobalDeclarationInstantiation][1] steps 5, 6, 10 and 12,
-     * and [EvalDeclarationInstantiation][2] steps 5 and 8.
-     *
-     * [1]: https://tc39.es/ecma262/#sec-globaldeclarationinstantiation
-     * [2]: https://tc39.es/ecma262/#sec-evaldeclarationinstantiation
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands:
+     *   Operands: uint32_t lastFun
      *   Stack: =>
      */ \
-    MACRO(CheckGlobalOrEvalDecl, check_global_or_eval_decl, NULL, 1, 0, 0, JOF_BYTE) \
+    MACRO(GlobalOrEvalDeclInstantiation, global_or_eval_decl_instantiation, NULL, 5, 0, 0, JOF_GCTHING) \
     /*
      * Look up a variable on the environment chain and delete it. Push `true`
      * on success (if a binding was deleted, or if no such binding existed in
@@ -3454,7 +3339,7 @@
      *
      * Example 1: `arguments[0]` is supported; therefore the interpreter's
      * implementation of `JSOp::GetElem` checks for optimized arguments (see
-     * `GetElemOptimizedArguments`).
+     * `MaybeGetElemOptimizedArguments`).
      *
      * Example 2: `f.apply(this, arguments)` is supported; therefore our
      * implementation of `Function.prototype.apply` checks for optimized
@@ -3482,7 +3367,7 @@
      *   Operands:
      *   Stack: => rest
      */ \
-    MACRO(Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_TYPESET|JOF_IC) \
+    MACRO(Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_IC) \
     /*
      * Determines the `this` value for current function frame and pushes it
      * onto the stack.
@@ -3679,6 +3564,16 @@
  * a power of two.  Use this macro to do so.
  */
 #define FOR_EACH_TRAILING_UNUSED_OPCODE(MACRO) \
+  MACRO(229)                                   \
+  MACRO(230)                                   \
+  MACRO(231)                                   \
+  MACRO(232)                                   \
+  MACRO(233)                                   \
+  MACRO(234)                                   \
+  MACRO(235)                                   \
+  MACRO(236)                                   \
+  MACRO(237)                                   \
+  MACRO(238)                                   \
   MACRO(239)                                   \
   MACRO(240)                                   \
   MACRO(241)                                   \
diff -Nru firefox-84.0.2+build1/js/src/vm/PlainObject.cpp firefox-85.0+build1/js/src/vm/PlainObject.cpp
--- firefox-84.0.2+build1/js/src/vm/PlainObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/PlainObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -20,98 +20,32 @@
 #include "vm/JSFunction.h"  // JSFunction
 #include "vm/JSObject.h"    // JSObject, js::GetPrototypeFromConstructor
 #include "vm/ObjectGroup.h"  // js::ObjectGroup, js::{Generic,Singleton,Tenured}Object
-#include "vm/TaggedProto.h"    // js::TaggedProto
-#include "vm/TypeInference.h"  // js::AutoSweepObjectGroup
+#include "vm/TaggedProto.h"  // js::TaggedProto
 
-#include "vm/JSObject-inl.h"  // js::GuessObjectGCKind, js::NewObjectWithGroup, js::NewObjectGCKind, js::NewSingletonObjectWithGivenTaggedProtoAndKind
-#include "vm/TypeInference-inl.h"  // js::AutoSweepObjectGroup::AutoSweepObjectGroup, js::TypeNewScript, js::jit::JitScript::MonitorThisType, js::TypeSet::ObjectType
+#include "vm/JSObject-inl.h"  // js::GuessObjectGCKind, js::NewObjectWithGroup, js::NewObjectGCKind
 
 using JS::Handle;
 using JS::Rooted;
 
-using js::AutoSweepObjectGroup;
 using js::CopyInitializerObject;
 using js::GenericObject;
 using js::GuessObjectGCKind;
 using js::NewObjectGCKind;
 using js::NewObjectKind;
 using js::NewObjectWithGroup;
-using js::NewSingletonObjectWithGivenTaggedProtoAndKind;
 using js::ObjectGroup;
 using js::PlainObject;
 using js::SingletonObject;
 using js::TaggedProto;
 using js::TenuredObject;
-using js::TypeNewScript;
 
 static PlainObject* CreateThisForFunctionWithGroup(JSContext* cx,
                                                    Handle<ObjectGroup*> group,
                                                    NewObjectKind newKind) {
-  TypeNewScript* maybeNewScript;
-  {
-    AutoSweepObjectGroup sweep(group);
-    maybeNewScript = group->newScript(sweep);
-  }
-
-  if (maybeNewScript) {
-    if (maybeNewScript->analyzed()) {
-      // The definite properties analysis has been performed for this
-      // group, so get the shape and alloc kind to use from the
-      // TypeNewScript's template.
-      Rooted<PlainObject*> templateObject(cx, maybeNewScript->templateObject());
-      MOZ_ASSERT(templateObject->group() == group);
-
-      Rooted<PlainObject*> res(
-          cx, CopyInitializerObject(cx, templateObject, newKind));
-      if (!res) {
-        return nullptr;
-      }
-
-      if (newKind == SingletonObject) {
-        Rooted<TaggedProto> proto(
-            cx, TaggedProto(templateObject->staticPrototype()));
-        if (!JSObject::splicePrototype(cx, res, proto)) {
-          return nullptr;
-        }
-      } else {
-        res->setGroup(group);
-      }
-      return res;
-    }
-
-    // The initial objects registered with a TypeNewScript can't be in the
-    // nursery.
-    if (newKind == GenericObject) {
-      newKind = TenuredObject;
-    }
-
-    // Not enough objects with this group have been created yet, so make a
-    // plain object and register it with the group. Use the maximum number
-    // of fixed slots, as is also required by the TypeNewScript.
-    js::gc::AllocKind allocKind =
-        GuessObjectGCKind(PlainObject::MAX_FIXED_SLOTS);
-    PlainObject* res =
-        NewObjectWithGroup<PlainObject>(cx, group, allocKind, newKind);
-    if (!res) {
-      return nullptr;
-    }
-
-    // Make sure group->newScript is still there.
-    AutoSweepObjectGroup sweep(group);
-    if (newKind != SingletonObject && group->newScript(sweep)) {
-      group->newScript(sweep)->registerNewObject(res);
-    }
-
-    return res;
-  }
-
   js::gc::AllocKind allocKind = NewObjectGCKind(&PlainObject::class_);
 
-  if (newKind == SingletonObject) {
-    Rooted<TaggedProto> protoRoot(cx, group->proto());
-    return NewSingletonObjectWithGivenTaggedProtoAndKind<PlainObject>(
-        cx, protoRoot, allocKind);
-  }
+  MOZ_ASSERT(newKind != SingletonObject);
+
   return NewObjectWithGroup<PlainObject>(cx, group, allocKind, newKind);
 }
 
@@ -136,39 +70,12 @@
     if (!group) {
       return nullptr;
     }
-
-    {
-      AutoSweepObjectGroup sweep(group);
-      if (group->newScript(sweep) && !group->newScript(sweep)->analyzed()) {
-        bool regenerate;
-        if (!group->newScript(sweep)->maybeAnalyze(cx, group, &regenerate)) {
-          return nullptr;
-        }
-        if (regenerate) {
-          // The script was analyzed successfully and may have changed
-          // the new type table, so refetch the group.
-          group = ObjectGroup::defaultNewGroup(cx, &PlainObject::class_,
-                                               TaggedProto(proto), newTarget);
-          AutoSweepObjectGroup sweepNewGroup(group);
-          MOZ_ASSERT(group);
-          MOZ_ASSERT(group->newScript(sweepNewGroup));
-        }
-      }
-    }
-
     res = CreateThisForFunctionWithGroup(cx, group, newKind);
   } else {
     res = NewBuiltinClassInstanceWithKind<PlainObject>(cx, newKind);
   }
 
-  if (res) {
-    MOZ_ASSERT(res->nonCCWRealm() == callee->realm());
-    JSScript* script = JSFunction::getOrCreateScript(cx, callee);
-    if (!script) {
-      return nullptr;
-    }
-    jit::JitScript::MonitorThisType(cx, script, TypeSet::ObjectType(res));
-  }
+  MOZ_ASSERT_IF(res, res->nonCCWRealm() == callee->realm());
 
   return res;
 }
@@ -193,10 +100,6 @@
     /* Reshape the singleton before passing it as the 'this' value. */
     NativeObject::clear(cx, nobj);
 
-    JSScript* calleeScript = callee->nonLazyScript();
-    jit::JitScript::MonitorThisType(cx, calleeScript,
-                                    TypeSet::ObjectType(nobj));
-
     return nobj;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/ProxyObject.cpp firefox-85.0+build1/js/src/vm/ProxyObject.cpp
--- firefox-84.0.2+build1/js/src/vm/ProxyObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ProxyObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -14,7 +14,6 @@
 #include "gc/ObjectKind-inl.h"
 #include "gc/WeakMap-inl.h"
 #include "vm/JSObject-inl.h"
-#include "vm/TypeInference-inl.h"
 
 using namespace js;
 
@@ -86,21 +85,6 @@
   }
 #endif
 
-  /*
-   * Eagerly mark properties unknown for proxies, so we don't try to track
-   * their properties and so that we don't need to walk the compartment if
-   * their prototype changes later.  But don't do this for DOM proxies,
-   * because we want to be able to keep track of them in typesets in useful
-   * ways.
-   */
-  if (proto.isObject() && !clasp->isDOMClass()) {
-    ObjectGroupRealm& realm = ObjectGroupRealm::getForNewObject(cx);
-    RootedObject protoObj(cx, proto.toObject());
-    if (!JSObject::setNewGroupUnknown(cx, realm, clasp, protoObj)) {
-      return nullptr;
-    }
-  }
-
   gc::AllocKind allocKind = GetProxyGCObjectKind(clasp, handler, priv);
 
   Realm* realm = cx->realm();
@@ -132,15 +116,11 @@
   // Ensure that the wrapper has the same lifetime assumptions as the
   // wrappee. Prefer to allocate in the nursery, when possible.
   gc::InitialHeap heap;
-  {
-    AutoSweepObjectGroup sweep(group);
-    if (group->shouldPreTenure(sweep) ||
-        (priv.isGCThing() && priv.toGCThing()->isTenured()) ||
-        !handler->canNurseryAllocate()) {
-      heap = gc::TenuredHeap;
-    } else {
-      heap = gc::DefaultHeap;
-    }
+  if ((priv.isGCThing() && priv.toGCThing()->isTenured()) ||
+      !handler->canNurseryAllocate()) {
+    heap = gc::TenuredHeap;
+  } else {
+    heap = gc::DefaultHeap;
   }
 
   debugCheckNewObject(group, shape, allocKind, heap);
@@ -162,91 +142,6 @@
 
   proxy->init(handler, priv, cx);
 
-  // Don't track types of properties of non-DOM and non-singleton proxies.
-  if (!clasp->isDOMClass()) {
-    MarkObjectGroupUnknownProperties(cx, proxy->group());
-  }
-
-  return proxy;
-}
-
-/* static */
-ProxyObject* ProxyObject::NewSingleton(JSContext* cx,
-                                       const BaseProxyHandler* handler,
-                                       HandleValue priv, TaggedProto proto_,
-                                       const JSClass* clasp) {
-  Rooted<TaggedProto> proto(cx, proto_);
-
-  MOZ_ASSERT(clasp->isProxy());
-  MOZ_ASSERT(isValidProxyClass(clasp));
-  MOZ_ASSERT(clasp->shouldDelayMetadataBuilder());
-  MOZ_ASSERT_IF(proto.isObject(),
-                cx->compartment() == proto.toObject()->compartment());
-  MOZ_ASSERT(clasp->hasFinalize());
-
-#ifdef DEBUG
-  if (priv.isGCThing()) {
-    JS::AssertCellIsNotGray(priv.toGCThing());
-  }
-#endif
-
-  gc::AllocKind allocKind = GetProxyGCObjectKind(clasp, handler, priv);
-
-  AutoSetNewObjectMetadata metadata(cx);
-  Rooted<ProxyObject*> proxy(cx);
-  {
-    Realm* realm = cx->realm();
-
-    // We're creating a singleton, so go straight to getting a singleton group,
-    // from the singleton group cache (or creating it freshly if needed).
-    RootedObjectGroup group(cx, ObjectGroup::lazySingletonGroup(
-                                    cx, ObjectGroupRealm::getForNewObject(cx),
-                                    realm, clasp, proto));
-    if (!group) {
-      return nullptr;
-    }
-
-    MOZ_ASSERT(group->realm() == realm);
-    MOZ_ASSERT(group->singleton());
-    MOZ_ASSERT(!IsAboutToBeFinalizedUnbarriered(group.address()));
-
-    // Also retrieve an empty shape.  Unlike for non-singleton proxies, this
-    // shape lookup is not cached in |realm->newProxyCache|.  We could cache it
-    // there, but distinguishing group/shape for singleton and non-singleton
-    // proxies would increase contention on the cache (and might end up evicting
-    // non-singleton cases where performance really matters).  Assume that
-    // singleton proxies are rare, and don't bother caching their shapes/groups.
-    RootedShape shape(
-        cx, EmptyShape::getInitialShape(cx, clasp, proto, /* nfixed = */ 0));
-    if (!shape) {
-      return nullptr;
-    }
-
-    MOZ_ASSERT(shape->zone() == cx->zone());
-    MOZ_ASSERT(!IsAboutToBeFinalizedUnbarriered(shape.address()));
-
-    gc::InitialHeap heap = gc::TenuredHeap;
-    debugCheckNewObject(group, shape, allocKind, heap);
-
-    JSObject* obj =
-        AllocateObject(cx, allocKind, /* nDynamicSlots = */ 0, heap, clasp);
-    if (!obj) {
-      return nullptr;
-    }
-
-    proxy = static_cast<ProxyObject*>(obj);
-    proxy->initGroup(group);
-    proxy->initShape(shape);
-
-    MOZ_ASSERT(clasp->shouldDelayMetadataBuilder());
-    realm->setObjectPendingMetadata(cx, proxy);
-
-    js::gc::gcprobes::CreateObject(proxy);
-  }
-
-  proxy->init(handler, priv, cx);
-
-  MOZ_ASSERT(proxy->isSingleton());
   return proxy;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/vm/ProxyObject.h firefox-85.0+build1/js/src/vm/ProxyObject.h
--- firefox-84.0.2+build1/js/src/vm/ProxyObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/ProxyObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -43,11 +43,6 @@
                           HandleValue priv, TaggedProto proto_,
                           const JSClass* clasp);
 
-  static ProxyObject* NewSingleton(JSContext* cx,
-                                   const BaseProxyHandler* handler,
-                                   HandleValue priv, TaggedProto proto_,
-                                   const JSClass* clasp);
-
   void init(const BaseProxyHandler* handler, HandleValue priv, JSContext* cx);
 
   // Proxies usually store their ProxyValueArray inline in the object.
diff -Nru firefox-84.0.2+build1/js/src/vm/Realm.cpp firefox-85.0+build1/js/src/vm/Realm.cpp
--- firefox-84.0.2+build1/js/src/vm/Realm.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Realm.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -653,16 +653,15 @@
   }
 }
 
-void Realm::addSizeOfIncludingThis(
-    mozilla::MallocSizeOf mallocSizeOf, size_t* tiAllocationSiteTables,
-    size_t* tiArrayTypeTables, size_t* tiObjectTypeTables, size_t* realmObject,
-    size_t* realmTables, size_t* innerViewsArg, size_t* objectMetadataTablesArg,
-    size_t* savedStacksSet, size_t* varNamesSet,
-    size_t* nonSyntacticLexicalEnvironmentsArg, size_t* jitRealm) {
+void Realm::addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
+                                   size_t* realmObject, size_t* realmTables,
+                                   size_t* innerViewsArg,
+                                   size_t* objectMetadataTablesArg,
+                                   size_t* savedStacksSet, size_t* varNamesSet,
+                                   size_t* nonSyntacticLexicalEnvironmentsArg,
+                                   size_t* jitRealm) {
   *realmObject += mallocSizeOf(this);
-  objectGroups_.addSizeOfExcludingThis(mallocSizeOf, tiAllocationSiteTables,
-                                       tiArrayTypeTables, tiObjectTypeTables,
-                                       realmTables);
+  objectGroups_.addSizeOfExcludingThis(mallocSizeOf, realmTables);
   wasm.addSizeOfExcludingThis(mallocSizeOf, realmTables);
 
   objects_.addSizeOfExcludingThis(mallocSizeOf, innerViewsArg,
diff -Nru firefox-84.0.2+build1/js/src/vm/Realm.h firefox-85.0+build1/js/src/vm/Realm.h
--- firefox-84.0.2+build1/js/src/vm/Realm.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Realm.h	2021-01-18 19:58:16.000000000 +0000
@@ -475,10 +475,8 @@
   void clearTables();
 
   void addSizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf,
-                              size_t* tiAllocationSiteTables,
-                              size_t* tiArrayTypeTables,
-                              size_t* tiObjectTypeTables, size_t* realmObject,
-                              size_t* realmTables, size_t* innerViewsArg,
+                              size_t* realmObject, size_t* realmTables,
+                              size_t* innerViewsArg,
                               size_t* objectMetadataTablesArg,
                               size_t* savedStacksSet, size_t* varNamesSet,
                               size_t* nonSyntacticLexicalEnvironmentsArg,
diff -Nru firefox-84.0.2+build1/js/src/vm/RegExpObject.cpp firefox-85.0+build1/js/src/vm/RegExpObject.cpp
--- firefox-84.0.2+build1/js/src/vm/RegExpObject.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/RegExpObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -448,14 +448,14 @@
 }
 
 // ES6 draft rev32 21.2.3.2.4.
-JSAtom* js::EscapeRegExpPattern(JSContext* cx, HandleAtom src) {
+JSLinearString* js::EscapeRegExpPattern(JSContext* cx, HandleAtom src) {
   // Step 2.
   if (src->length() == 0) {
     return cx->names().emptyRegExp;
   }
 
   // We may never need to use |sb|. Start using it lazily.
-  StringBuffer sb(cx);
+  JSStringBuilder sb(cx);
 
   if (src->hasLatin1Chars()) {
     JS::AutoCheckCannotGC nogc;
@@ -470,17 +470,18 @@
   }
 
   // Step 3.
-  return sb.empty() ? src : sb.finishAtom();
+  return sb.empty() ? src : sb.finishString();
 }
 
 // ES6 draft rev32 21.2.5.14. Optimized for RegExpObject.
-JSLinearString* RegExpObject::toString(JSContext* cx) const {
+JSLinearString* RegExpObject::toString(JSContext* cx,
+                                       Handle<RegExpObject*> obj) {
   // Steps 3-4.
-  RootedAtom src(cx, getSource());
+  RootedAtom src(cx, obj->getSource());
   if (!src) {
     return nullptr;
   }
-  RootedAtom escapedSrc(cx, EscapeRegExpPattern(cx, src));
+  RootedLinearString escapedSrc(cx, EscapeRegExpPattern(cx, src));
 
   // Step 7.
   JSStringBuilder sb(cx);
@@ -495,22 +496,22 @@
   sb.infallibleAppend('/');
 
   // Steps 5-7.
-  if (global() && !sb.append('g')) {
+  if (obj->global() && !sb.append('g')) {
     return nullptr;
   }
-  if (ignoreCase() && !sb.append('i')) {
+  if (obj->ignoreCase() && !sb.append('i')) {
     return nullptr;
   }
-  if (multiline() && !sb.append('m')) {
+  if (obj->multiline() && !sb.append('m')) {
     return nullptr;
   }
-  if (dotAll() && !sb.append('s')) {
+  if (obj->dotAll() && !sb.append('s')) {
     return nullptr;
   }
-  if (unicode() && !sb.append('u')) {
+  if (obj->unicode() && !sb.append('u')) {
     return nullptr;
   }
-  if (sticky() && !sb.append('y')) {
+  if (obj->sticky() && !sb.append('y')) {
     return nullptr;
   }
 
@@ -613,22 +614,6 @@
 }
 
 /* static */
-bool RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re,
-                           HandleLinearString input,
-                           RegExpShared::CodeKind codeKind) {
-  TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
-  AutoTraceLog logCompile(logger, TraceLogger_IrregexpCompile);
-
-  RootedAtom pattern(cx, re->getSource());
-  return compile(cx, re, pattern, input, codeKind);
-}
-
-bool RegExpShared::compile(JSContext* cx, MutableHandleRegExpShared re,
-                           HandleAtom pattern, HandleLinearString input,
-                           RegExpShared::CodeKind code) {
-  MOZ_CRASH("TODO");
-}
-/* static */
 bool RegExpShared::compileIfNecessary(JSContext* cx,
                                       MutableHandleRegExpShared re,
                                       HandleLinearString input,
@@ -767,15 +752,6 @@
     return false;
   }
 
-  // Create a new group for the template.
-  Rooted<TaggedProto> proto(cx, templateObject->taggedProto());
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, templateObject->realm(), templateObject->getClass(), proto);
-  if (!group) {
-    return false;
-  }
-  templateObject->setGroup(group);
-
   // Initialize the properties of the template.
   RootedId id(cx);
   RootedValue dummyString(cx, StringValue(cx->runtime()->emptyString));
@@ -786,7 +762,6 @@
                                   JSPROP_ENUMERATE)) {
       return false;
     }
-    AddTypePropertyId(cx, templateObject, id, UndefinedValue());
   }
 
   // Allocate the capture index array.
@@ -909,15 +884,6 @@
     return nullptr;
   }
 
-  // Create a new group for the template.
-  Rooted<TaggedProto> proto(cx, templateObject->taggedProto());
-  ObjectGroup* group = ObjectGroupRealm::makeGroup(
-      cx, templateObject->realm(), templateObject->getClass(), proto);
-  if (!group) {
-    return nullptr;
-  }
-  templateObject->setGroup(group);
-
   /* Set dummy index property */
   RootedValue index(cx, Int32Value(0));
   if (!NativeDefineDataProperty(cx, templateObject, cx->names().index, index,
@@ -938,8 +904,6 @@
                                 groupsVal, JSPROP_ENUMERATE)) {
     return nullptr;
   }
-  AddTypePropertyId(cx, templateObject, NameToId(cx->names().groups),
-                    TypeSet::AnyObjectType());
 
   // Make sure that the properties are in the right slots.
 #ifdef DEBUG
@@ -954,11 +918,6 @@
              indexShape->propidRef() == NameToId(cx->names().index));
 #endif
 
-  // Make sure type information reflects the indexed properties which might
-  // be added.
-  AddTypePropertyId(cx, templateObject, JSID_VOID, TypeSet::StringType());
-  AddTypePropertyId(cx, templateObject, JSID_VOID, TypeSet::UndefinedType());
-
   matchResultTemplateObject_.set(templateObject);
 
   return matchResultTemplateObject_;
diff -Nru firefox-84.0.2+build1/js/src/vm/RegExpObject.h firefox-85.0+build1/js/src/vm/RegExpObject.h
--- firefox-84.0.2+build1/js/src/vm/RegExpObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/RegExpObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -129,7 +129,7 @@
     setSlot(LAST_INDEX_SLOT, Int32Value(0));
   }
 
-  JSLinearString* toString(JSContext* cx) const;
+  static JSLinearString* toString(JSContext* cx, Handle<RegExpObject*> obj);
 
   JSAtom* getSource() const {
     return &getSlot(SOURCE_SLOT).toString()->asAtom();
@@ -224,7 +224,7 @@
 extern JSObject* CloneScriptRegExpObject(JSContext* cx, RegExpObject& re);
 
 /* Escape all slashes and newlines in the given string. */
-extern JSAtom* EscapeRegExpPattern(JSContext* cx, HandleAtom src);
+extern JSLinearString* EscapeRegExpPattern(JSContext* cx, HandleAtom src);
 
 template <typename CharT>
 extern bool HasRegExpMetaChars(const CharT* chars, size_t length);
diff -Nru firefox-84.0.2+build1/js/src/vm/RegExpShared.h firefox-85.0+build1/js/src/vm/RegExpShared.h
--- firefox-84.0.2+build1/js/src/vm/RegExpShared.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/RegExpShared.h	2021-01-18 19:58:16.000000000 +0000
@@ -135,12 +135,6 @@
   /* Internal functions. */
   RegExpShared(JSAtom* source, JS::RegExpFlags flags);
 
-  static bool compile(JSContext* cx, MutableHandleRegExpShared res,
-                      HandleLinearString input, CodeKind code);
-  static bool compile(JSContext* cx, MutableHandleRegExpShared res,
-                      HandleAtom pattern, HandleLinearString input,
-                      CodeKind code);
-
   const RegExpCompilation& compilation(bool latin1) const {
     return compilationArray[CompilationIndex(latin1)];
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/Runtime.cpp firefox-85.0+build1/js/src/vm/Runtime.cpp
--- firefox-84.0.2+build1/js/src/vm/Runtime.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Runtime.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -565,10 +565,6 @@
 }
 
 JSFreeOp::~JSFreeOp() {
-  for (size_t i = 0; i < freeLaterList.length(); i++) {
-    freeUntracked(freeLaterList[i]);
-  }
-
   if (!jitPoisonRanges.empty()) {
     jit::ExecutableAllocator::poisonCode(runtime(), jitPoisonRanges);
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/Runtime.h firefox-85.0+build1/js/src/vm/Runtime.h
--- firefox-84.0.2+build1/js/src/vm/Runtime.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Runtime.h	2021-01-18 19:58:16.000000000 +0000
@@ -350,6 +350,9 @@
    */
   js::MainThreadData<bool> allowRelazificationForTesting;
 
+  /* Zone destroy callback. */
+  js::MainThreadData<JSDestroyZoneCallback> destroyZoneCallback;
+
   /* Compartment destroy callback. */
   js::MainThreadData<JSDestroyCompartmentCallback> destroyCompartmentCallback;
 
@@ -394,7 +397,7 @@
   // Heap GC roots for PersistentRooted pointers.
   js::MainThreadData<mozilla::EnumeratedArray<
       JS::RootKind, JS::RootKind::Limit,
-      mozilla::LinkedList<JS::PersistentRooted<void*>>>>
+      mozilla::LinkedList<JS::PersistentRooted<JS::detail::RootListEntry*>>>>
       heapRoots;
 
   void tracePersistentRoots(JSTracer* trc);
@@ -549,13 +552,14 @@
   void decParseTaskRef() { numParseTasks--; }
 
 #ifdef DEBUG
-  bool currentThreadHasScriptDataAccess() const {
+  void assertCurrentThreadHasScriptDataAccess() const {
     if (!hasParseTasks()) {
-      return js::CurrentThreadCanAccessRuntime(this) &&
-             activeThreadHasScriptDataAccess;
+      MOZ_ASSERT(js::CurrentThreadCanAccessRuntime(this) &&
+                 activeThreadHasScriptDataAccess);
+      return;
     }
 
-    return scriptDataLock.ownedByCurrentThread();
+    scriptDataLock.assertOwnedByCurrentThread();
   }
 
   bool currentThreadHasAtomsTableAccess() const {
diff -Nru firefox-84.0.2+build1/js/src/vm/SavedStacks.cpp firefox-85.0+build1/js/src/vm/SavedStacks.cpp
--- firefox-84.0.2+build1/js/src/vm/SavedStacks.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/SavedStacks.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -29,6 +29,7 @@
 #include "js/PropertySpec.h"
 #include "js/SavedFrameAPI.h"
 #include "js/Vector.h"
+#include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "vm/GeckoProfiler.h"
 #include "vm/JSScript.h"
@@ -67,7 +68,7 @@
   }
 }
 
-bool LiveSavedFrameCache::insert(JSContext* cx, FramePtr& framePtr,
+bool LiveSavedFrameCache::insert(JSContext* cx, FramePtr&& framePtr,
                                  const jsbytecode* pc,
                                  HandleSavedFrame savedFrame) {
   MOZ_ASSERT(savedFrame);
@@ -193,9 +194,9 @@
         activation(activation) {
     MOZ_ASSERT(source);
     MOZ_ASSERT_IF(framePtr.isSome(), activation);
-#ifdef JS_MORE_DETERMINISTIC
-    column = 0;
-#endif
+    if (js::SupportDifferentialTesting()) {
+      column = 0;
+    }
   }
 
   explicit Lookup(SavedFrame& savedFrame)
@@ -482,9 +483,9 @@
 }
 
 void SavedFrame::initColumn(uint32_t column) {
-#ifdef JS_MORE_DETERMINISTIC
-  column = 0;
-#endif
+  if (js::SupportDifferentialTesting()) {
+    column = 0;
+  }
   initReservedSlot(JSSLOT_COLUMN, PrivateUint32Value(column));
 }
 
@@ -1534,11 +1535,10 @@
       // Translate our capture into a frame count limit for
       // adoptAsyncStack, which will impose further limits.
       Maybe<size_t> maxFrames =
-          !capture.is<JS::MaxFrames>()
+          !capture.is<JS::MaxFrames>() ? Nothing()
+          : capture.as<JS::MaxFrames>().maxFrames == 0
               ? Nothing()
-              : capture.as<JS::MaxFrames>().maxFrames == 0
-                    ? Nothing()
-                    : Some(capture.as<JS::MaxFrames>().maxFrames);
+              : Some(capture.as<JS::MaxFrames>().maxFrames);
 
       // Clip the stack if needed, attach the async cause string to the
       // top frame, and copy it into our compartment if necessary.
diff -Nru firefox-84.0.2+build1/js/src/vm/Scope.cpp firefox-85.0+build1/js/src/vm/Scope.cpp
--- firefox-84.0.2+build1/js/src/vm/Scope.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Scope.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1911,14 +1911,15 @@
 
 /* static */
 bool ScopeStencil::createForFunctionScope(
-    JSContext* cx, frontend::CompilationStencil& stencil,
+    JSContext* cx, frontend::CompilationInfo& compilationInfo,
     ParserFunctionScopeData* data, bool hasParameterExprs,
     bool needsEnvironment, FunctionIndex functionIndex, bool isArrow,
     mozilla::Maybe<ScopeIndex> enclosing, ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<FunctionScope>(data);
   } else {
-    data = NewEmptyParserScopeData<FunctionScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<FunctionScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -1951,13 +1952,14 @@
 
 /* static */
 bool ScopeStencil::createForLexicalScope(
-    JSContext* cx, frontend::CompilationStencil& stencil, ScopeKind kind,
+    JSContext* cx, frontend::CompilationInfo& compilationInfo, ScopeKind kind,
     ParserLexicalScopeData* data, uint32_t firstFrameSlot,
     mozilla::Maybe<ScopeIndex> enclosing, ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<LexicalScope>(data);
   } else {
-    data = NewEmptyParserScopeData<LexicalScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<LexicalScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -1983,13 +1985,14 @@
 }
 
 bool ScopeStencil::createForVarScope(
-    JSContext* cx, frontend::CompilationStencil& stencil, ScopeKind kind,
+    JSContext* cx, frontend::CompilationInfo& compilationInfo, ScopeKind kind,
     ParserVarScopeData* data, uint32_t firstFrameSlot, bool needsEnvironment,
     mozilla::Maybe<ScopeIndex> enclosing, ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<VarScope>(data);
   } else {
-    data = NewEmptyParserScopeData<VarScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<VarScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -2015,15 +2018,14 @@
 }
 
 /* static */
-bool ScopeStencil::createForGlobalScope(JSContext* cx,
-                                        frontend::CompilationStencil& stencil,
-                                        ScopeKind kind,
-                                        ParserGlobalScopeData* data,
-                                        ScopeIndex* index) {
+bool ScopeStencil::createForGlobalScope(
+    JSContext* cx, frontend::CompilationInfo& compilationInfo, ScopeKind kind,
+    ParserGlobalScopeData* data, ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<GlobalScope>(data);
   } else {
-    data = NewEmptyParserScopeData<GlobalScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<GlobalScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -2052,15 +2054,15 @@
 }
 
 /* static */
-bool ScopeStencil::createForEvalScope(JSContext* cx,
-                                      frontend::CompilationStencil& stencil,
-                                      ScopeKind kind, ParserEvalScopeData* data,
-                                      mozilla::Maybe<ScopeIndex> enclosing,
-                                      ScopeIndex* index) {
+bool ScopeStencil::createForEvalScope(
+    JSContext* cx, frontend::CompilationInfo& compilationInfo, ScopeKind kind,
+    ParserEvalScopeData* data, mozilla::Maybe<ScopeIndex> enclosing,
+    ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<EvalScope>(data);
   } else {
-    data = NewEmptyParserScopeData<EvalScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<EvalScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -2087,15 +2089,15 @@
 }
 
 /* static */
-bool ScopeStencil::createForModuleScope(JSContext* cx,
-                                        frontend::CompilationStencil& stencil,
-                                        ParserModuleScopeData* data,
-                                        mozilla::Maybe<ScopeIndex> enclosing,
-                                        ScopeIndex* index) {
+bool ScopeStencil::createForModuleScope(
+    JSContext* cx, frontend::CompilationInfo& compilationInfo,
+    ParserModuleScopeData* data, mozilla::Maybe<ScopeIndex> enclosing,
+    ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
   if (data) {
     MarkParserScopeData<ModuleScope>(data);
   } else {
-    data = NewEmptyParserScopeData<ModuleScope>(cx, stencil.alloc);
+    data = NewEmptyParserScopeData<ModuleScope>(cx, compilationInfo.alloc);
     if (!data) {
       return false;
     }
@@ -2153,9 +2155,11 @@
 
 /* static */
 bool ScopeStencil::createForWithScope(JSContext* cx,
-                                      CompilationStencil& stencil,
+                                      CompilationInfo& compilationInfo,
                                       mozilla::Maybe<ScopeIndex> enclosing,
                                       ScopeIndex* index) {
+  frontend::CompilationStencil& stencil = compilationInfo.stencil;
+
   uint32_t firstFrameSlot = 0;
   mozilla::Maybe<uint32_t> envShape;
 
diff -Nru firefox-84.0.2+build1/js/src/vm/Scope.h firefox-85.0+build1/js/src/vm/Scope.h
--- firefox-84.0.2+build1/js/src/vm/Scope.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Scope.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,29 +7,57 @@
 #ifndef vm_Scope_h
 #define vm_Scope_h
 
-#include "mozilla/Maybe.h"
-#include "mozilla/Variant.h"
-
-#include <stddef.h>
-
-#include "gc/Policy.h"
-#include "js/UbiNode.h"
-#include "js/UniquePtr.h"
-#include "util/Poison.h"
-#include "vm/BytecodeUtil.h"
-#include "vm/JSObject.h"
-#include "vm/Printer.h"  // GenericPrinter
-#include "vm/ScopeKind.h"
-#include "vm/Xdr.h"
+#include "mozilla/Assertions.h"  // MOZ_ASSERT, MOZ_ASSERT_IF
+#include "mozilla/Attributes.h"  // MOZ_IMPLICIT, MOZ_INIT_OUTSIDE_CTOR, MOZ_STACK_CLASS
+#include "mozilla/Casting.h"          // mozilla::AssertedCast
+#include "mozilla/Maybe.h"            // mozilla::Maybe
+#include "mozilla/MemoryReporting.h"  // mozilla::MallocSizeOf
+
+#include <stddef.h>     // size_t
+#include <stdint.h>     // uint8_t, uint16_t, uint32_t, uintptr_t
+#include <type_traits>  // std::is_same_v
+
+#include "builtin/ModuleObject.h"  // ModuleObject, HandleModuleObject
+#include "gc/Allocator.h"          // AllowGC
+#include "gc/Barrier.h"            // HeapPtr
+#include "gc/Cell.h"               // TenuredCellWithNonGCPointer
+#include "gc/MaybeRooted.h"        // MaybeRooted
+#include "gc/Rooting.h"      // HandleScope, HandleShape, MutableHandleShape
+#include "js/GCPolicyAPI.h"  // GCPolicy, IgnoreGCPolicy
+#include "js/HeapAPI.h"      // CellFlagBitsReservedForGC
+#include "js/RootingAPI.h"   // Handle, MutableHandle
+#include "js/TraceKind.h"    // JS::TraceKind
+#include "js/TypeDecls.h"    // HandleFunction
+#include "js/UbiNode.h"      // ubi::*
+#include "js/UniquePtr.h"    // UniquePtr
+#include "util/Poison.h"  // AlwaysPoison, JS_SCOPE_DATA_TRAILING_NAMES_PATTERN, MemCheckKind
+#include "vm/BytecodeUtil.h"  // LOCALNO_LIMIT, ENVCOORD_SLOT_LIMIT
+#include "vm/JSFunction.h"    // JSFunction
+#include "vm/ScopeKind.h"     // ScopeKind
+#include "vm/Shape.h"         // Shape
+#include "vm/Xdr.h"           // XDRResult, XDRState
+#include "wasm/WasmJS.h"      // WasmInstanceObject
+
+class JSAtom;
+class JSFreeOp;
+class JSFunction;
+class JSScript;
+class JSTracer;
+struct JSContext;
+
+namespace JS {
+class Zone;
+}  // namespace JS
 
 namespace js {
 
+class GenericPrinter;
+
 namespace frontend {
 struct CompilationAtomCache;
-class ScriptStencil;
 class ScopeStencil;
 class ParserAtom;
-};  // namespace frontend
+}  // namespace frontend
 
 template <typename NameT>
 class AbstractBaseScopeData;
@@ -42,25 +70,8 @@
 
 using BindingIter = AbstractBindingIter<JSAtom>;
 
-class ModuleObject;
 class AbstractScopePtr;
 
-enum class BindingKind : uint8_t {
-  Import,
-  FormalParameter,
-  Var,
-  Let,
-  Const,
-
-  // So you think named lambda callee names are consts? Nope! They don't
-  // throw when being assigned to in sloppy mode.
-  NamedLambdaCallee
-};
-
-static inline bool BindingKindIsLexical(BindingKind kind) {
-  return kind == BindingKind::Let || kind == BindingKind::Const;
-}
-
 static inline bool ScopeKindIsCatch(ScopeKind kind) {
   return kind == ScopeKind::SimpleCatch || kind == ScopeKind::Catch;
 }
@@ -209,73 +220,6 @@
   BindingNameT& operator[](size_t i) { return get(i); }
 };
 
-// typedef AbstractTrailingNamesArray<JSAtom> TrailingNamesArray;
-
-class BindingLocation {
- public:
-  enum class Kind {
-    Global,
-    Argument,
-    Frame,
-    Environment,
-    Import,
-    NamedLambdaCallee
-  };
-
- private:
-  Kind kind_;
-  uint32_t slot_;
-
-  BindingLocation(Kind kind, uint32_t slot) : kind_(kind), slot_(slot) {}
-
- public:
-  static BindingLocation Global() {
-    return BindingLocation(Kind::Global, UINT32_MAX);
-  }
-
-  static BindingLocation Argument(uint16_t slot) {
-    return BindingLocation(Kind::Argument, slot);
-  }
-
-  static BindingLocation Frame(uint32_t slot) {
-    MOZ_ASSERT(slot < LOCALNO_LIMIT);
-    return BindingLocation(Kind::Frame, slot);
-  }
-
-  static BindingLocation Environment(uint32_t slot) {
-    MOZ_ASSERT(slot < ENVCOORD_SLOT_LIMIT);
-    return BindingLocation(Kind::Environment, slot);
-  }
-
-  static BindingLocation Import() {
-    return BindingLocation(Kind::Import, UINT32_MAX);
-  }
-
-  static BindingLocation NamedLambdaCallee() {
-    return BindingLocation(Kind::NamedLambdaCallee, UINT32_MAX);
-  }
-
-  bool operator==(const BindingLocation& other) const {
-    return kind_ == other.kind_ && slot_ == other.slot_;
-  }
-
-  bool operator!=(const BindingLocation& other) const {
-    return !operator==(other);
-  }
-
-  Kind kind() const { return kind_; }
-
-  uint32_t slot() const {
-    MOZ_ASSERT(kind_ == Kind::Frame || kind_ == Kind::Environment);
-    return slot_;
-  }
-
-  uint16_t argumentSlot() const {
-    MOZ_ASSERT(kind_ == Kind::Argument);
-    return mozilla::AssertedCast<uint16_t>(slot_);
-  }
-};
-
 //
 // Allow using is<T> and as<T> on Rooted<Scope*> and Handle<Scope*>.
 //
diff -Nru firefox-84.0.2+build1/js/src/vm/SelfHosting.cpp firefox-85.0+build1/js/src/vm/SelfHosting.cpp
--- firefox-84.0.2+build1/js/src/vm/SelfHosting.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/SelfHosting.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1998,6 +1998,72 @@
   return ModuleObject::execute(cx, module, args.rval());
 }
 
+static bool intrinsic_IsTopLevelAwaitEnabled(JSContext* cx, unsigned argc,
+                                             Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 0);
+  bool topLevelAwait = cx->options().topLevelAwait();
+  args.rval().setBoolean(topLevelAwait);
+  return true;
+}
+
+static bool intrinsic_GetAsyncCycleRoot(JSContext* cx, unsigned argc,
+                                        Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 1);
+  RootedModuleObject module(cx, &args[0].toObject().as<ModuleObject>());
+  JSObject* result = js::GetAsyncCycleRoot(module);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+static bool intrinsic_AppendAsyncParentModule(JSContext* cx, unsigned argc,
+                                              Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 2);
+  RootedModuleObject self(cx, &args[0].toObject().as<ModuleObject>());
+  RootedModuleObject parent(cx, &args[1].toObject().as<ModuleObject>());
+  return ModuleObject::appendAsyncParentModule(cx, self, parent);
+}
+
+static bool intrinsic_CreateTopLevelCapability(JSContext* cx, unsigned argc,
+                                               Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 1);
+  RootedModuleObject self(cx, &args[0].toObject().as<ModuleObject>());
+  PromiseObject* result = ModuleObject::createTopLevelCapability(cx, self);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+static bool intrinsic_ModuleTopLevelCapabilityResolve(JSContext* cx,
+                                                      unsigned argc,
+                                                      Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 1);
+  RootedModuleObject module(cx, &args[0].toObject().as<ModuleObject>());
+  ModuleObject::topLevelCapabilityResolve(cx, module);
+  args.rval().setUndefined();
+  return true;
+}
+
+static bool intrinsic_ModuleTopLevelCapabilityReject(JSContext* cx,
+                                                     unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 2);
+  RootedModuleObject module(cx, &args[0].toObject().as<ModuleObject>());
+  HandleValue error = args[1];
+  ModuleObject::topLevelCapabilityReject(cx, module, error);
+  args.rval().setUndefined();
+  return true;
+}
+
 static bool intrinsic_NewModuleNamespace(JSContext* cx, unsigned argc,
                                          Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
@@ -2582,6 +2648,14 @@
     JS_FN("InstantiateModuleFunctionDeclarations",
           intrinsic_InstantiateModuleFunctionDeclarations, 1, 0),
     JS_FN("ExecuteModule", intrinsic_ExecuteModule, 1, 0),
+    JS_FN("IsTopLevelAwaitEnabled", intrinsic_IsTopLevelAwaitEnabled, 0, 0),
+    JS_FN("GetAsyncCycleRoot", intrinsic_GetAsyncCycleRoot, 1, 0),
+    JS_FN("AppendAsyncParentModule", intrinsic_AppendAsyncParentModule, 2, 0),
+    JS_FN("CreateTopLevelCapability", intrinsic_CreateTopLevelCapability, 1, 0),
+    JS_FN("ModuleTopLevelCapabilityResolve",
+          intrinsic_ModuleTopLevelCapabilityResolve, 1, 0),
+    JS_FN("ModuleTopLevelCapabilityReject",
+          intrinsic_ModuleTopLevelCapabilityReject, 2, 0),
     JS_FN("NewModuleNamespace", intrinsic_NewModuleNamespace, 2, 0),
     JS_FN("AddModuleNamespaceBinding", intrinsic_AddModuleNamespaceBinding, 4,
           0),
@@ -3087,7 +3161,7 @@
     MOZ_ASSERT(selfHostedObject->isNative());
     clone = NewObjectWithGivenProto(
         cx, selfHostedObject->getClass(), nullptr,
-        selfHostedObject->asTenured().getAllocKind(), SingletonObject);
+        selfHostedObject->asTenured().getAllocKind(), TenuredObject);
   }
   if (!clone) {
     return nullptr;
diff -Nru firefox-84.0.2+build1/js/src/vm/Shape.cpp firefox-85.0+build1/js/src/vm/Shape.cpp
--- firefox-84.0.2+build1/js/src/vm/Shape.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Shape.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1247,8 +1247,6 @@
   MOZ_ASSERT_IF(shape->isDataProperty() != needSlot, needSlot);
 #endif
 
-  MarkTypePropertyNonData(cx, obj, shape->propid());
-
   AssertCanChangeAttrs(shape, attrs);
 
   if (shape->attrs == attrs && shape->getter() == getter &&
@@ -1412,32 +1410,6 @@
 }
 
 /* static */
-bool NativeObject::rollbackProperties(JSContext* cx, HandleNativeObject obj,
-                                      uint32_t slotSpan) {
-  /*
-   * Remove properties from this object until it has a matching slot span.
-   * The object cannot have escaped in a way which would prevent safe
-   * removal of the last properties.
-   */
-  MOZ_ASSERT(!obj->inDictionaryMode() && slotSpan <= obj->slotSpan());
-  while (true) {
-    if (obj->lastProperty()->isEmptyShape()) {
-      MOZ_ASSERT(slotSpan == 0);
-      break;
-    }
-    uint32_t slot = obj->lastProperty()->slot();
-    if (slot < slotSpan) {
-      break;
-    }
-    if (!NativeObject::removeProperty(cx, obj, obj->lastProperty()->propid())) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/* static */
 Shape* NativeObject::replaceWithNewEquivalentShape(JSContext* cx,
                                                    HandleNativeObject obj,
                                                    Shape* oldShape,
diff -Nru firefox-84.0.2+build1/js/src/vm/Shape.h firefox-85.0+build1/js/src/vm/Shape.h
--- firefox-84.0.2+build1/js/src/vm/Shape.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Shape.h	2021-01-18 19:58:16.000000000 +0000
@@ -695,8 +695,8 @@
     HAS_INTERESTING_SYMBOL = 0x40,
     HAD_ELEMENTS_ACCESS = 0x80,
     FROZEN_ELEMENTS = 0x100,  // See ObjectElements::FROZEN comment.
-    ITERATED_SINGLETON = 0x200,
-    NEW_GROUP_UNKNOWN = 0x400,
+    // 0x200 is unused.
+    // 0x400 is unused.
     UNCACHEABLE_PROTO = 0x800,
     IMMUTABLE_PROTOTYPE = 0x1000,
 
@@ -979,13 +979,9 @@
     LINEAR_SEARCHES_MAX = 0x5,
     LINEAR_SEARCHES_MASK = 0x7,
 
-    // Slotful property was stored to more than once. This is used as a
-    // hint for type inference.
-    OVERWRITTEN = 0x08,
-
     // Flags used to speed up isBigEnoughForAShapeTable().
-    HAS_CACHED_BIG_ENOUGH_FOR_SHAPE_TABLE = 0x10,
-    CACHED_BIG_ENOUGH_FOR_SHAPE_TABLE = 0x20,
+    HAS_CACHED_BIG_ENOUGH_FOR_SHAPE_TABLE = 0x08,
+    CACHED_BIG_ENOUGH_FOR_SHAPE_TABLE = 0x10,
   };
 
   uint32_t immutableFlags; /* immutable flags, see above */
@@ -1250,9 +1246,6 @@
     return hasSetterValue() ? setterValue() : UndefinedValue();
   }
 
-  void setOverwritten() { mutableFlags |= OVERWRITTEN; }
-  bool hadOverwrite() const { return mutableFlags & OVERWRITTEN; }
-
   bool matches(const Shape* other) const {
     return propid_.get() == other->propid_.get() &&
            matchesParamsAfterId(other->base(), other->maybeSlot(), other->attrs,
diff -Nru firefox-84.0.2+build1/js/src/vm/SharedStencil.h firefox-85.0+build1/js/src/vm/SharedStencil.h
--- firefox-84.0.2+build1/js/src/vm/SharedStencil.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/SharedStencil.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,14 +7,17 @@
 #ifndef vm_SharedStencil_h
 #define vm_SharedStencil_h
 
-#include "mozilla/HashFunctions.h"    // mozilla::HahNumber, mozilla::HashBytes
-#include "mozilla/HashTable.h"        // mozilla::HashSet
+#include "mozilla/Assertions.h"     // MOZ_ASSERT, MOZ_CRASH
+#include "mozilla/Atomics.h"        // mozilla::{Atomic, SequentiallyConsistent}
+#include "mozilla/Attributes.h"     // MOZ_MUST_USE
+#include "mozilla/HashFunctions.h"  // mozilla::HahNumber, mozilla::HashBytes
+#include "mozilla/HashTable.h"      // mozilla::HashSet
 #include "mozilla/MemoryReporting.h"  // mozilla::MallocSizeOf
 #include "mozilla/RefPtr.h"           // RefPtr
 #include "mozilla/Span.h"             // mozilla::Span
 
 #include <stddef.h>  // size_t
-#include <stdint.h>  // uint32_t
+#include <stdint.h>  // uint8_t, uint16_t, uint32_t
 
 #include "frontend/SourceNotes.h"  // js::SrcNote
 #include "frontend/TypedIndex.h"   // js::frontend::TypedIndex
@@ -200,6 +203,11 @@
     return SourceExtent(0, len, 0, len, lineno, column);
   }
 
+  static SourceExtent makeClassExtent(uint32_t start, uint32_t end,
+                                      uint32_t lineno, uint32_t column) {
+    return SourceExtent(start, end, start, end, lineno, column);
+  }
+
   uint32_t sourceStart = 0;
   uint32_t sourceEnd = 0;
   uint32_t toStringStart = 0;
@@ -342,11 +350,9 @@
   // ES6 function length.
   uint16_t funLength = 0;
 
-  // Number of type sets used in this script for dynamic type monitoring.
-  uint16_t numBytecodeTypeSets = 0;
-
   // NOTE: The raw bytes of this structure are used for hashing so use explicit
   // padding values as needed for predicatable results across compilers.
+  uint16_t padding = 0;
 
  private:
   struct Flags {
@@ -417,9 +423,9 @@
  public:
   static js::UniquePtr<ImmutableScriptData> new_(
       JSContext* cx, uint32_t mainOffset, uint32_t nfixed, uint32_t nslots,
-      GCThingIndex bodyScopeIndex, uint32_t numICEntries,
-      uint32_t numBytecodeTypeSets, bool isFunction, uint16_t funLength,
-      mozilla::Span<const jsbytecode> code, mozilla::Span<const SrcNote> notes,
+      GCThingIndex bodyScopeIndex, uint32_t numICEntries, bool isFunction,
+      uint16_t funLength, mozilla::Span<const jsbytecode> code,
+      mozilla::Span<const SrcNote> notes,
       mozilla::Span<const uint32_t> resumeOffsets,
       mozilla::Span<const ScopeNote> scopeNotes,
       mozilla::Span<const TryNote> tryNotes);
@@ -593,6 +599,31 @@
     mozilla::HashSet<SharedImmutableScriptData*,
                      SharedImmutableScriptData::Hasher, SystemAllocPolicy>;
 
+struct MemberInitializers {
+  static constexpr uint32_t MaxInitializers = INT32_MAX;
+
+#ifdef DEBUG
+  bool valid = false;
+#endif
+
+  // This struct will eventually have a vector of constant values for optimizing
+  // field initializers.
+  uint32_t numMemberInitializers = 0;
+
+  explicit MemberInitializers(uint32_t numMemberInitializers)
+      :
+#ifdef DEBUG
+        valid(true),
+#endif
+        numMemberInitializers(numMemberInitializers) {
+  }
+
+  static MemberInitializers Invalid() { return MemberInitializers(); }
+
+ private:
+  MemberInitializers() = default;
+};
+
 }  // namespace js
 
 #endif /* vm_SharedStencil_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/Stack.cpp firefox-85.0+build1/js/src/vm/Stack.cpp
--- firefox-84.0.2+build1/js/src/vm/Stack.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Stack.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -73,8 +73,7 @@
   unsigned nformal = callee().nargs() - 1, nactual = numActualArgs();
   unsigned nrest = (nactual > nformal) ? nactual - nformal : 0;
   Value* restvp = argv() + nformal;
-  return ObjectGroup::newArrayObject(cx, restvp, nrest, GenericObject,
-                                     ObjectGroup::NewArrayKind::UnknownIndex);
+  return NewDenseCopiedArray(cx, nrest, restvp);
 }
 
 static inline void AssertScopeMatchesEnvironment(Scope* scope,
diff -Nru firefox-84.0.2+build1/js/src/vm/Stack.h firefox-85.0+build1/js/src/vm/Stack.h
--- firefox-84.0.2+build1/js/src/vm/Stack.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Stack.h	2021-01-18 19:58:16.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Span.h"  // for Span
-#include "mozilla/Variant.h"
 
 #include <algorithm>
 #include <type_traits>
@@ -579,12 +578,15 @@
   /*
    * Callee
    *
-   * Only function frames have a callee. An eval frame in a function has the
-   * same callee as its containing function frame.
+   * Only function frames have a true callee. An eval frame in a function has
+   * the same callee as its containing function frame. An async module has to
+   * create a wrapper callee to allow passing the script to generators for
+   * pausing and resuming.
    */
 
   JSFunction& callee() const {
-    MOZ_ASSERT(isFunctionFrame());
+    MOZ_ASSERT(isFunctionFrame() || isModuleFrame());
+    MOZ_ASSERT_IF(isModuleFrame(), script()->isAsync());
     return calleev().toObject().as<JSFunction>();
   }
 
@@ -656,7 +658,7 @@
 
   void resumeGeneratorFrame(JSObject* envChain) {
     MOZ_ASSERT(script()->isGenerator() || script()->isAsync());
-    MOZ_ASSERT(isFunctionFrame());
+    MOZ_ASSERT_IF(!script()->isModule(), isFunctionFrame());
     flags_ |= HAS_INITIAL_ENV;
     envChain_ = envChain;
   }
@@ -760,7 +762,11 @@
     pc = fp_->prevpc();
     unsigned spForNewTarget =
         fp_->isResumedGenerator() ? 0 : fp_->isConstructing();
-    sp = fp_->prevsp() - fp_->numActualArgs() - 1 - spForNewTarget;
+    // This code is called when resuming from async and generator code.
+    // In the case of modules, we don't have arguments, so we can't use
+    // numActualArgs, which asserts 'hasArgs'.
+    unsigned nActualArgs = fp_->isModuleFrame() ? 0 : fp_->numActualArgs();
+    sp = fp_->prevsp() - nActualArgs - 1 - spForNewTarget;
     fp_ = fp_->prev();
     MOZ_ASSERT(fp_);
   }
diff -Nru firefox-84.0.2+build1/js/src/vm/Stack-inl.h firefox-85.0+build1/js/src/vm/Stack-inl.h
--- firefox-84.0.2+build1/js/src/vm/Stack-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Stack-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/PodOperations.h"
 
 #include "builtin/Array.h"  // js::NewDenseEmptyArray
+#include "builtin/ModuleObject.h"
 #include "jit/BaselineFrame.h"
 #include "jit/RematerializedFrame.h"
 #include "js/Debug.h"
@@ -668,7 +669,7 @@
 }
 
 inline bool AbstractFramePtr::isGeneratorFrame() const {
-  if (!isFunctionFrame()) {
+  if (!isFunctionFrame() && !isModuleFrame()) {
     return false;
   }
   JSScript* s = script();
diff -Nru firefox-84.0.2+build1/js/src/vm/StencilEnums.h firefox-85.0+build1/js/src/vm/StencilEnums.h
--- firefox-84.0.2+build1/js/src/vm/StencilEnums.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/StencilEnums.h	2021-01-18 19:58:16.000000000 +0000
@@ -105,17 +105,6 @@
   // On top-level global/eval/module scripts, this is set when the embedding
   // ensures this script will not be re-used. In this case, parser literals may
   // be exposed directly instead of being cloned.
-  //
-  // For non-lazy functions, this is set when the function is almost-certain to
-  // be run once (and its parents transitively the same). In this case, the
-  // function may be marked as a singleton to improve typeset precision. Note
-  // that under edge cases with fun.caller the function may still run multiple
-  // times.
-  //
-  // For lazy functions, the situation is more complex. If enclosing script is
-  // not yet compiled, this flag is undefined and should not be used. As the
-  // enclosing script is compiled, this flag is updated to the same definition
-  // the eventual non-lazy function will use.
   TreatAsRunOnce = 1 << 7,
   // ----
 
@@ -254,10 +243,6 @@
   // is set independently of whether we actually use an `arguments` binding. The
   // conditions are specified in the ECMAScript spec.
   HasMappedArgsObj = 1 << 27,
-
-  // All of 'this', 'arguments' and f.apply() are used. This is likely to be a
-  // wrapper. This is a heuristic that affects Type Inference.
-  IsLikelyConstructorWrapper = 1 << 28,
 };
 
 enum class MutableScriptFlagsEnum : uint32_t {
@@ -307,12 +292,12 @@
   // Script has had hoisted shape guard fail.
   FailedShapeGuard = 1 << 19,
 
-  // Script experienced frequent bailouts.
-  HadFrequentBailouts = 1 << 20,
+  // Script has had instruction hoisted by LICM fail.
+  HadLICMInvalidation = 1 << 20,
 
   // An overflow happened where Range Analysis hoped it would not. The next
   // compile should be more conservative.
-  HadOverflowBailout = 1 << 21,
+  HadEagerTruncationBailout = 1 << 21,
 
   // This script should not be inlined into others. This happens after inlining
   // has failed.
@@ -323,6 +308,9 @@
 
   // Lexical check did fail and bail out.
   FailedLexicalCheck = 1 << 24,
+
+  // A guard inserted by phi specialization failed.
+  HadSpeculativePhiBailout = 1 << 25,
 };
 
 }  // namespace js
diff -Nru firefox-84.0.2+build1/js/src/vm/StringType.cpp firefox-85.0+build1/js/src/vm/StringType.cpp
--- firefox-84.0.2+build1/js/src/vm/StringType.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/StringType.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -15,7 +15,6 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/RangedPtr.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/TextUtils.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Utf8.h"
@@ -26,6 +25,7 @@
 
 #include "jsfriendapi.h"
 
+#include "builtin/Boolean.h"
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/ParserAtom.h"
 #include "gc/Marking.h"
diff -Nru firefox-84.0.2+build1/js/src/vm/StructuredClone.cpp firefox-85.0+build1/js/src/vm/StructuredClone.cpp
--- firefox-84.0.2+build1/js/src/vm/StructuredClone.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/StructuredClone.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -33,6 +33,7 @@
 #include "mozilla/EndianUtils.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/RangedPtr.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 
 #include <algorithm>
diff -Nru firefox-84.0.2+build1/js/src/vm/TraceLogging.cpp firefox-85.0+build1/js/src/vm/TraceLogging.cpp
--- firefox-84.0.2+build1/js/src/vm/TraceLogging.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TraceLogging.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include "mozilla/EndianUtils.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/ScopeExit.h"
 
 #include <algorithm>
 #include <string.h>
@@ -79,8 +78,10 @@
 }
 
 #ifdef DEBUG
-bool js::CurrentThreadOwnsTraceLoggerThreadStateLock() {
-  return traceLoggerState && traceLoggerState->lock.ownedByCurrentThread();
+void js::AssertCurrentThreadOwnsTraceLoggerThreadStateLock() {
+  if (traceLoggerState) {
+    traceLoggerState->lock.assertOwnedByCurrentThread();
+  }
 }
 #endif
 
diff -Nru firefox-84.0.2+build1/js/src/vm/TraceLogging.h firefox-85.0+build1/js/src/vm/TraceLogging.h
--- firefox-84.0.2+build1/js/src/vm/TraceLogging.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TraceLogging.h	2021-01-18 19:58:16.000000000 +0000
@@ -166,7 +166,7 @@
 };
 
 #ifdef DEBUG
-bool CurrentThreadOwnsTraceLoggerThreadStateLock();
+void AssertCurrentThreadOwnsTraceLoggerThreadStateLock();
 #endif
 
 /**
@@ -210,7 +210,11 @@
   // This should only happen under getOrCreateEventPayload below, and avoids
   // races with purgeUnusedPayloads.
   void use() {
-    MOZ_ASSERT_IF(!uses_, CurrentThreadOwnsTraceLoggerThreadStateLock());
+#ifdef DEBUG
+    if (!uses_) {
+      AssertCurrentThreadOwnsTraceLoggerThreadStateLock();
+    }
+#endif
     uses_++;
   }
   void release() { uses_--; }
diff -Nru firefox-84.0.2+build1/js/src/vm/TypedArrayObject.cpp firefox-85.0+build1/js/src/vm/TypedArrayObject.cpp
--- firefox-84.0.2+build1/js/src/vm/TypedArrayObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypedArrayObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -37,6 +37,7 @@
 #include "js/ScalarType.h"  // js::Scalar::Type
 #include "js/UniquePtr.h"
 #include "js/Wrapper.h"
+#include "util/DifferentialTesting.h"
 #include "util/Text.h"
 #include "util/Windows.h"
 #include "vm/ArrayBufferObject.h"
@@ -143,9 +144,6 @@
 
   tarray->setFixedSlot(TypedArrayObject::BUFFER_SLOT, ObjectValue(*buffer));
 
-  // Notify compiled jit code that the base pointer has moved.
-  MarkObjectStateChange(cx, tarray);
-
   return true;
 }
 
@@ -364,8 +362,7 @@
 
     JSFunction* fun = NewFunctionWithProto(
         cx, class_constructor, 3, FunctionFlags::NATIVE_CTOR, nullptr,
-        ClassName(key, cx), ctorProto, gc::AllocKind::FUNCTION,
-        SingletonObject);
+        ClassName(key, cx), ctorProto, gc::AllocKind::FUNCTION, TenuredObject);
 
     if (fun) {
       fun->setJitInfo(&jit::JitInfo_TypedArrayConstructor);
@@ -402,51 +399,22 @@
   }
 
   static TypedArrayObject* makeTypedInstance(JSContext* cx,
-                                             CreateSingleton createSingleton,
                                              HandleObjectGroup group,
                                              gc::AllocKind allocKind) {
-    if (createSingleton == CreateSingleton::Yes) {
-      MOZ_ASSERT(!group);
-      return newBuiltinClassInstance(cx, allocKind, SingletonObject);
-    }
-
     if (group) {
       MOZ_ASSERT(group->clasp() == instanceClass());
       NewObjectKind newKind = GenericObject;
-      {
-        AutoSweepObjectGroup sweep(group);
-        if (group->shouldPreTenure(sweep)) {
-          newKind = TenuredObject;
-        }
-      }
       return NewObjectWithGroup<TypedArrayObject>(cx, group, allocKind,
                                                   newKind);
     }
 
-    jsbytecode* pc = nullptr;
-    RootedScript script(cx);
-    if (IsTypeInferenceEnabled()) {
-      script = cx->currentScript(&pc);
-    }
-
-    Rooted<TypedArrayObject*> obj(
-        cx, newBuiltinClassInstance(cx, allocKind, GenericObject));
-    if (!obj) {
-      return nullptr;
-    }
-
-    if (script && !ObjectGroup::setAllocationSiteObjectGroup(
-                      cx, script, pc, obj, /* singleton = */ false)) {
-      return nullptr;
-    }
-
-    return obj;
+    return newBuiltinClassInstance(cx, allocKind, GenericObject);
   }
 
   static TypedArrayObject* makeInstance(
       JSContext* cx, Handle<ArrayBufferObjectMaybeShared*> buffer,
-      CreateSingleton createSingleton, BufferSize byteOffset, BufferSize len,
-      HandleObject proto, HandleObjectGroup group = nullptr) {
+      BufferSize byteOffset, BufferSize len, HandleObject proto,
+      HandleObjectGroup group = nullptr) {
     MOZ_ASSERT(len.get() < maxByteLength() / BYTES_PER_ELEMENT);
 
     gc::AllocKind allocKind =
@@ -470,7 +438,7 @@
       MOZ_ASSERT(!group);
       obj = makeProtoInstance(cx, proto, allocKind);
     } else {
-      obj = makeTypedInstance(cx, createSingleton, group, allocKind);
+      obj = makeTypedInstance(cx, group, allocKind);
     }
     if (!obj || !obj->init(cx, buffer, byteOffset, len, BYTES_PER_ELEMENT)) {
       return nullptr;
@@ -483,7 +451,6 @@
     MOZ_ASSERT(len >= 0);
     size_t nbytes;
     MOZ_ALWAYS_TRUE(CalculateAllocSize<NativeType>(len, &nbytes));
-    MOZ_ASSERT(nbytes < TypedArrayObject::SINGLETON_BYTE_LENGTH);
     bool fitsInline = nbytes <= INLINE_BUFFER_LIMIT;
     gc::AllocKind allocKind = !fitsInline ? gc::GetGCObjectKind(instanceClass())
                                           : AllocKindForLazyBuffer(nbytes);
@@ -491,12 +458,6 @@
 
     AutoSetNewObjectMetadata metadata(cx);
 
-    jsbytecode* pc = nullptr;
-    RootedScript script(cx);
-    if (IsTypeInferenceEnabled()) {
-      script = cx->currentScript(&pc);
-    }
-
     Rooted<TypedArrayObject*> tarray(
         cx, newBuiltinClassInstance(cx, allocKind, TenuredObject));
     if (!tarray) {
@@ -510,11 +471,6 @@
     // nullptr and avoid allocating memory that will never be used.
     tarray->initPrivate(nullptr);
 
-    if (script && !ObjectGroup::setAllocationSiteObjectGroup(
-                      cx, script, pc, tarray, /* singleton = */ false)) {
-      return nullptr;
-    }
-
     return tarray;
   }
 
@@ -816,15 +772,9 @@
       return nullptr;
     }
 
-    CreateSingleton createSingleton = CreateSingleton::No;
-    if (!group && length.get() * BYTES_PER_ELEMENT >=
-                      TypedArrayObject::SINGLETON_BYTE_LENGTH) {
-      createSingleton = CreateSingleton::Yes;
-    }
-
     // Steps 13-17.
-    return makeInstance(cx, buffer, createSingleton, BufferSize(byteOffset),
-                        length, proto, group);
+    return makeInstance(cx, buffer, BufferSize(byteOffset), length, proto,
+                        group);
   }
 
   // Create a TypedArray object in another compartment.
@@ -884,8 +834,8 @@
         return nullptr;
       }
 
-      typedArray = makeInstance(cx, unwrappedBuffer, CreateSingleton::No,
-                                BufferSize(byteOffset), length, wrappedProto);
+      typedArray = makeInstance(cx, unwrappedBuffer, BufferSize(byteOffset),
+                                length, wrappedProto);
       if (!typedArray) {
         return nullptr;
       }
@@ -959,8 +909,8 @@
       return nullptr;
     }
 
-    return makeInstance(cx, buffer, CreateSingleton::No, BufferSize(0),
-                        BufferSize(nelements), proto);
+    return makeInstance(cx, buffer, BufferSize(0), BufferSize(nelements),
+                        proto);
   }
 
   static bool AllocateArrayBuffer(JSContext* cx, HandleObject ctor,
@@ -1010,10 +960,10 @@
     return false;
   }
 
-#ifdef JS_MORE_DETERMINISTIC
-  // See the comment in ElementSpecific::doubleToNative.
-  d = JS::CanonicalizeNaN(d);
-#endif
+  if (js::SupportDifferentialTesting()) {
+    // See the comment in ElementSpecific::doubleToNative.
+    d = JS::CanonicalizeNaN(d);
+  }
 
   // Assign based on characteristics of the destination type
   if constexpr (ArrayTypeIsFloatingPoint()) {
@@ -1376,8 +1326,7 @@
 
   // Steps 3-4 (remaining part), 20-23.
   Rooted<TypedArrayObject*> obj(
-      cx, makeInstance(cx, buffer, CreateSingleton::No, BufferSize(0),
-                       elementLength, proto, group));
+      cx, makeInstance(cx, buffer, BufferSize(0), elementLength, proto, group));
   if (!obj) {
     return nullptr;
   }
@@ -1445,8 +1394,8 @@
     }
 
     Rooted<TypedArrayObject*> obj(
-        cx, makeInstance(cx, buffer, CreateSingleton::No, BufferSize(0),
-                         BufferSize(len), proto, group));
+        cx,
+        makeInstance(cx, buffer, BufferSize(0), BufferSize(len), proto, group));
     if (!obj) {
       return nullptr;
     }
@@ -1521,8 +1470,8 @@
   }
 
   Rooted<TypedArrayObject*> obj(
-      cx, makeInstance(cx, buffer, CreateSingleton::No, BufferSize(0),
-                       BufferSize(len), proto, group));
+      cx,
+      makeInstance(cx, buffer, BufferSize(0), BufferSize(len), proto, group));
   if (!obj) {
     return nullptr;
   }
@@ -1566,10 +1515,6 @@
       return true;
     }
 
-    if (nbytes >= TypedArrayObject::SINGLETON_BYTE_LENGTH) {
-      return true;
-    }
-
     res.set(TypedArrayObjectTemplate<T>::makeTemplateObject(cx, len));
     return !!res;
   }
@@ -1942,6 +1887,9 @@
     JS_SELF_HOSTED_FN("includes", "TypedArrayIncludes", 2, 0),
     JS_SELF_HOSTED_FN("toString", "ArrayToString", 0, 0),
     JS_SELF_HOSTED_FN("toLocaleString", "TypedArrayToLocaleString", 2, 0),
+#ifdef NIGHTLY_BUILD
+    JS_SELF_HOSTED_FN("at", "TypedArrayAt", 1, 0),
+#endif
     JS_FS_END};
 
 /* static */ const JSFunctionSpec TypedArrayObject::staticFunctions[] = {
@@ -2718,3 +2666,7 @@
   }
   MOZ_CRASH("invalid ArrayBufferView type");
 }
+
+JS_FRIEND_API size_t JS_MaxMovableTypedArraySize() {
+  return TypedArrayObject::INLINE_BUFFER_LIMIT;
+}
diff -Nru firefox-84.0.2+build1/js/src/vm/TypedArrayObject.h firefox-85.0+build1/js/src/vm/TypedArrayObject.h
--- firefox-84.0.2+build1/js/src/vm/TypedArrayObject.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypedArrayObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -150,13 +150,6 @@
     return ArrayBufferObject::maxBufferByteLength();
   }
 
-  /*
-   * Byte length above which created typed arrays will have singleton types.
-   * This only applies to typed arrays created with an existing ArrayBuffer and
-   * when not inlined from Ion.
-   */
-  static constexpr uint32_t SINGLETON_BYTE_LENGTH = 1024 * 1024 * 10;
-
   static bool isOriginalLengthGetter(Native native);
 
   static bool isOriginalByteOffsetGetter(Native native);
diff -Nru firefox-84.0.2+build1/js/src/vm/TypedArrayObject-inl.h firefox-85.0+build1/js/src/vm/TypedArrayObject-inl.h
--- firefox-84.0.2+build1/js/src/vm/TypedArrayObject-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypedArrayObject-inl.h	2021-01-18 19:58:16.000000000 +0000
@@ -21,10 +21,12 @@
 #include "jsnum.h"
 
 #include "builtin/Array.h"
+#include "gc/Zone.h"
 #include "jit/AtomicOperations.h"
 #include "js/Conversions.h"
 #include "js/ScalarType.h"  // js::Scalar::Type
 #include "js/Value.h"
+#include "util/DifferentialTesting.h"
 #include "util/Memory.h"
 #include "vm/BigIntType.h"
 #include "vm/JSContext.h"
@@ -718,14 +720,14 @@
 
   static T doubleToNative(double d) {
     if (TypeIsFloatingPoint<T>()) {
-#ifdef JS_MORE_DETERMINISTIC
       // The JS spec doesn't distinguish among different NaN values, and
       // it deliberately doesn't specify the bit pattern written to a
       // typed array when NaN is written into it.  This bit-pattern
-      // inconsistency could confuse deterministic testing, so always
-      // canonicalize NaN values in more-deterministic builds.
-      d = JS::CanonicalizeNaN(d);
-#endif
+      // inconsistency could confuse differential testing, so always
+      // canonicalize NaN values in differential testing.
+      if (js::SupportDifferentialTesting()) {
+        d = JS::CanonicalizeNaN(d);
+      }
       return T(d);
     }
     if (MOZ_UNLIKELY(mozilla::IsNaN(d))) {
diff -Nru firefox-84.0.2+build1/js/src/vm/TypeInference.cpp firefox-85.0+build1/js/src/vm/TypeInference.cpp
--- firefox-84.0.2+build1/js/src/vm/TypeInference.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypeInference.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,4619 +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 "vm/TypeInference-inl.h"
-
-#include "mozilla/DebugOnly.h"
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/MemoryReporting.h"
-#include "mozilla/PodOperations.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/Sprintf.h"
-
-#include <algorithm>
-#include <new>
-#include <utility>
-
-#include "jsapi.h"
-
-#include "gc/HashUtil.h"
-#include "jit/BaselineIC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/Ion.h"
-#include "jit/IonAnalysis.h"
-#include "js/MemoryMetrics.h"
-#include "js/ScalarType.h"  // js::Scalar::Type
-#include "js/UniquePtr.h"
-#include "util/DiagnosticAssertions.h"
-#include "util/Poison.h"
-#include "vm/FrameIter.h"  // js::AllScriptFramesIter
-#include "vm/HelperThreads.h"
-#include "vm/JSContext.h"
-#include "vm/JSObject.h"
-#include "vm/JSScript.h"
-#include "vm/Opcodes.h"
-#include "vm/PlainObject.h"  // js::PlainObject
-#include "vm/Printer.h"
-#include "vm/Shape.h"
-#include "vm/Time.h"
-
-#include "gc/GC-inl.h"
-#include "gc/Marking-inl.h"
-#include "vm/JSAtom-inl.h"
-#include "vm/JSScript-inl.h"
-#include "vm/NativeObject-inl.h"
-#include "vm/ObjectGroup-inl.h"  // JSObject::setSingleton
-
-using namespace js;
-
-using mozilla::DebugOnly;
-using mozilla::Maybe;
-using mozilla::PodArrayZero;
-using mozilla::PodCopy;
-
-using js::jit::JitScript;
-
-#ifdef DEBUG
-
-static inline jsid id___proto__(JSContext* cx) {
-  return NameToId(cx->names().proto);
-}
-
-static inline jsid id_constructor(JSContext* cx) {
-  return NameToId(cx->names().constructor);
-}
-
-static inline jsid id_caller(JSContext* cx) {
-  return NameToId(cx->names().caller);
-}
-
-const char* js::TypeIdStringImpl(jsid id) {
-  if (JSID_IS_VOID(id)) {
-    return "(index)";
-  }
-  if (JSID_IS_EMPTY(id)) {
-    return "(new)";
-  }
-  if (JSID_IS_SYMBOL(id)) {
-    return "(symbol)";
-  }
-  static char bufs[4][100];
-  static unsigned which = 0;
-  which = (which + 1) & 3;
-  PutEscapedString(bufs[which], 100, JSID_TO_LINEAR_STRING(id), 0);
-  return bufs[which];
-}
-
-#endif
-
-/////////////////////////////////////////////////////////////////////
-// Logging
-/////////////////////////////////////////////////////////////////////
-
-/* static */ const char* TypeSet::NonObjectTypeString(TypeSet::Type type) {
-  if (type.isPrimitive()) {
-    switch (type.primitive()) {
-      case ValueType::Undefined:
-        return "void";
-      case ValueType::Null:
-        return "null";
-      case ValueType::Boolean:
-        return "bool";
-      case ValueType::Int32:
-        return "int";
-      case ValueType::Double:
-        return "float";
-      case ValueType::String:
-        return "string";
-      case ValueType::Symbol:
-        return "symbol";
-      case ValueType::BigInt:
-        return "BigInt";
-      case ValueType::Magic:
-        return "lazyargs";
-      case ValueType::PrivateGCThing:
-      case ValueType::Object:
-        MOZ_CRASH("Bad type");
-    }
-  }
-  if (type.isUnknown()) {
-    return "unknown";
-  }
-
-  MOZ_ASSERT(type.isAnyObject());
-  return "object";
-}
-
-static UniqueChars MakeStringCopy(const char* s) {
-  AutoEnterOOMUnsafeRegion oomUnsafe;
-  char* copy = strdup(s);
-  if (!copy) {
-    oomUnsafe.crash("Could not copy string");
-  }
-  return UniqueChars(copy);
-}
-
-/* static */
-UniqueChars TypeSet::TypeString(const TypeSet::Type type) {
-  if (type.isPrimitive() || type.isUnknown() || type.isAnyObject()) {
-    return MakeStringCopy(NonObjectTypeString(type));
-  }
-
-  char buf[100];
-  if (type.isSingleton()) {
-    JSObject* singleton = type.singletonNoBarrier();
-    SprintfLiteral(buf, "<%s %#" PRIxPTR ">", singleton->getClass()->name,
-                   uintptr_t(singleton));
-  } else {
-    SprintfLiteral(buf, "[%s * %#" PRIxPTR "]",
-                   type.groupNoBarrier()->clasp()->name,
-                   uintptr_t(type.groupNoBarrier()));
-  }
-
-  return MakeStringCopy(buf);
-}
-
-/* static */
-UniqueChars TypeSet::ObjectGroupString(const ObjectGroup* group) {
-  return TypeString(TypeSet::ObjectType(group));
-}
-
-#ifdef DEBUG
-
-bool js::InferSpewActive(TypeSpewChannel channel) {
-  static bool active[SPEW_COUNT];
-  static bool checked = false;
-  if (!checked) {
-    checked = true;
-    PodArrayZero(active);
-    const char* env = getenv("INFERFLAGS");
-    if (!env) {
-      return false;
-    }
-    if (strstr(env, "ops")) {
-      active[ISpewOps] = true;
-    }
-    if (strstr(env, "result")) {
-      active[ISpewResult] = true;
-    }
-    if (strstr(env, "full")) {
-      for (unsigned i = 0; i < SPEW_COUNT; i++) {
-        active[i] = true;
-      }
-    }
-  }
-  return active[channel];
-}
-
-static bool InferSpewColorable() {
-  /* Only spew colors on xterm-color to not screw up emacs. */
-  static bool colorable = false;
-  static bool checked = false;
-  if (!checked) {
-    checked = true;
-    const char* env = getenv("TERM");
-    if (!env) {
-      return false;
-    }
-    if (strcmp(env, "xterm-color") == 0 || strcmp(env, "xterm-256color") == 0) {
-      colorable = true;
-    }
-  }
-  return colorable;
-}
-
-const char* js::InferSpewColorReset() {
-  if (!InferSpewColorable()) {
-    return "";
-  }
-  return "\x1b[0m";
-}
-
-const char* js::InferSpewColor(TypeConstraint* constraint) {
-  /* Type constraints are printed out using foreground colors. */
-  static const char* const colors[] = {"\x1b[31m", "\x1b[32m", "\x1b[33m",
-                                       "\x1b[34m", "\x1b[35m", "\x1b[36m",
-                                       "\x1b[37m"};
-  if (!InferSpewColorable()) {
-    return "";
-  }
-  return colors[DefaultHasher<TypeConstraint*>::hash(constraint) % 7];
-}
-
-const char* js::InferSpewColor(TypeSet* types) {
-  /* Type sets are printed out using bold colors. */
-  static const char* const colors[] = {"\x1b[1;31m", "\x1b[1;32m", "\x1b[1;33m",
-                                       "\x1b[1;34m", "\x1b[1;35m", "\x1b[1;36m",
-                                       "\x1b[1;37m"};
-  if (!InferSpewColorable()) {
-    return "";
-  }
-  return colors[DefaultHasher<TypeSet*>::hash(types) % 7];
-}
-
-void js::InferSpewImpl(const char* fmt, ...) {
-  va_list ap;
-  va_start(ap, fmt);
-  fprintf(stderr, "[infer] ");
-  vfprintf(stderr, fmt, ap);
-  fprintf(stderr, "\n");
-  va_end(ap);
-}
-
-MOZ_NORETURN MOZ_COLD static void MOZ_FORMAT_PRINTF(2, 3)
-    TypeFailure(JSContext* cx, const char* fmt, ...) {
-  char msgbuf[1024]; /* Larger error messages will be truncated */
-  char errbuf[1024];
-
-  va_list ap;
-  va_start(ap, fmt);
-  VsprintfLiteral(errbuf, fmt, ap);
-  va_end(ap);
-
-  SprintfLiteral(msgbuf, "[infer failure] %s", errbuf);
-
-  /* Dump type state, even if INFERFLAGS is unset. */
-  PrintTypes(cx, cx->compartment(), true);
-
-  MOZ_ReportAssertionFailure(msgbuf, __FILE__, __LINE__);
-  MOZ_CRASH();
-}
-
-bool js::ObjectGroupHasProperty(JSContext* cx, ObjectGroup* group, jsid id,
-                                const Value& value) {
-  /*
-   * Check the correctness of the type information in the object's property
-   * against an actual value.
-   */
-  AutoSweepObjectGroup sweep(group);
-  if (!group->unknownProperties(sweep) && !value.isUndefined()) {
-    id = IdToTypeId(id);
-
-    /* Watch for properties which inference does not monitor. */
-    if (id == id___proto__(cx) || id == id_constructor(cx) ||
-        id == id_caller(cx)) {
-      return true;
-    }
-
-    TypeSet::Type type = TypeSet::GetValueType(value);
-
-    AutoEnterAnalysis enter(cx);
-
-    /*
-     * We don't track types for properties inherited from prototypes which
-     * haven't yet been accessed during analysis of the inheriting object.
-     * Don't do the property instantiation now.
-     */
-    TypeSet* types = group->maybeGetProperty(sweep, id);
-    if (!types) {
-      return true;
-    }
-
-    // Type set guards might miss when an object's group changes and its
-    // properties become unknown.
-    if (value.isObject()) {
-      if (types->unknownObject()) {
-        return true;
-      }
-      for (size_t i = 0; i < types->getObjectCount(); i++) {
-        if (TypeSet::ObjectKey* key = types->getObject(i)) {
-          if (key->unknownProperties()) {
-            return true;
-          }
-        }
-      }
-    }
-
-    if (!types->hasType(type)) {
-      TypeFailure(cx, "Missing type in object %s %s: %s",
-                  TypeSet::ObjectGroupString(group).get(), TypeIdString(id),
-                  TypeSet::TypeString(type).get());
-    }
-  }
-  return true;
-}
-
-#endif
-
-/////////////////////////////////////////////////////////////////////
-// TypeSet
-/////////////////////////////////////////////////////////////////////
-
-TemporaryTypeSet::TemporaryTypeSet(LifoAlloc* alloc, Type type) {
-  MOZ_ASSERT(!jit::JitOptions.warpBuilder);
-
-  if (type.isUnknown()) {
-    flags |= TYPE_FLAG_BASE_MASK;
-    return;
-  }
-  if (type.isPrimitive()) {
-    flags = PrimitiveTypeFlag(type);
-    if (flags == TYPE_FLAG_DOUBLE) {
-      flags |= TYPE_FLAG_INT32;
-    }
-    return;
-  }
-  if (type.isAnyObject()) {
-    flags |= TYPE_FLAG_ANYOBJECT;
-    return;
-  }
-  if (type.isGroup()) {
-    AutoSweepObjectGroup sweep(type.group());
-    if (type.group()->unknownProperties(sweep)) {
-      flags |= TYPE_FLAG_ANYOBJECT;
-      return;
-    }
-  }
-  setBaseObjectCount(1);
-  objectSet = reinterpret_cast<ObjectKey**>(type.objectKey());
-
-  if (type.isGroup()) {
-    ObjectGroup* ngroup = type.group();
-    AutoSweepObjectGroup sweep(ngroup);
-    if (ngroup->newScript(sweep) &&
-        ngroup->newScript(sweep)->initializedGroup()) {
-      addType(ObjectType(ngroup->newScript(sweep)->initializedGroup()), alloc);
-    }
-  }
-}
-
-static TypeFlags MIRTypeToTypeFlags(jit::MIRType type) {
-  switch (type) {
-    case jit::MIRType::Undefined:
-      return TYPE_FLAG_UNDEFINED;
-    case jit::MIRType::Null:
-      return TYPE_FLAG_NULL;
-    case jit::MIRType::Boolean:
-      return TYPE_FLAG_BOOLEAN;
-    case jit::MIRType::Int32:
-      return TYPE_FLAG_INT32;
-    case jit::MIRType::Float32:  // Fall through, there's no JSVAL for Float32.
-    case jit::MIRType::Double:
-      return TYPE_FLAG_DOUBLE;
-    case jit::MIRType::String:
-      return TYPE_FLAG_STRING;
-    case jit::MIRType::Symbol:
-      return TYPE_FLAG_SYMBOL;
-    case jit::MIRType::BigInt:
-      return TYPE_FLAG_BIGINT;
-    case jit::MIRType::Object:
-      return TYPE_FLAG_ANYOBJECT;
-    case jit::MIRType::MagicOptimizedArguments:
-      return TYPE_FLAG_LAZYARGS;
-    default:
-      MOZ_CRASH("Bad MIR type");
-  }
-}
-
-bool TypeSet::mightBeMIRType(jit::MIRType type) const {
-  if (unknown()) {
-    return true;
-  }
-
-  TypeFlags baseFlags = this->baseFlags();
-  if (baseObjectCount() != 0) {
-    baseFlags |= TYPE_FLAG_ANYOBJECT;
-  }
-  return baseFlags & MIRTypeToTypeFlags(type);
-}
-
-bool TypeSet::isSubset(std::initializer_list<jit::MIRType> types) const {
-  TypeFlags flags = 0;
-  for (auto type : types) {
-    flags |= MIRTypeToTypeFlags(type);
-  }
-
-  TypeFlags baseFlags = this->baseFlags();
-  if (baseObjectCount() != 0) {
-    baseFlags |= TYPE_FLAG_ANYOBJECT;
-  }
-  return (baseFlags & flags) == baseFlags;
-}
-
-bool TypeSet::objectsAreSubset(TypeSet* other) {
-  if (other->unknownObject()) {
-    return true;
-  }
-
-  if (unknownObject()) {
-    return false;
-  }
-
-  for (unsigned i = 0; i < getObjectCount(); i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-    if (!other->hasType(ObjectType(key))) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool TypeSet::isSubset(const TypeSet* other) const {
-  if ((baseFlags() & other->baseFlags()) != baseFlags()) {
-    return false;
-  }
-
-  if (unknownObject()) {
-    MOZ_ASSERT(other->unknownObject());
-  } else {
-    for (unsigned i = 0; i < getObjectCount(); i++) {
-      ObjectKey* key = getObject(i);
-      if (!key) {
-        continue;
-      }
-      if (!other->hasType(ObjectType(key))) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-bool TypeSet::objectsIntersect(const TypeSet* other) const {
-  if (unknownObject() || other->unknownObject()) {
-    return true;
-  }
-
-  for (unsigned i = 0; i < getObjectCount(); i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-    if (other->hasType(ObjectType(key))) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool TypeSet::enumerateTypes(TypeList* list) const {
-  /* If any type is possible, there's no need to worry about specifics. */
-  if (flags & TYPE_FLAG_UNKNOWN) {
-    return list->append(UnknownType());
-  }
-
-  /* Enqueue type set members stored as bits. */
-  for (TypeFlags flag = 1; flag < TYPE_FLAG_ANYOBJECT; flag <<= 1) {
-    if (flags & flag) {
-      Type type = PrimitiveTypeFromTypeFlag(flag);
-      if (!list->append(type)) {
-        return false;
-      }
-    }
-  }
-
-  /* If any object is possible, skip specifics. */
-  if (flags & TYPE_FLAG_ANYOBJECT) {
-    return list->append(AnyObjectType());
-  }
-
-  /* Enqueue specific object types. */
-  unsigned count = getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    ObjectKey* key = getObject(i);
-    if (key) {
-      if (!list->append(ObjectType(key))) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-inline bool TypeSet::addTypesToConstraint(JSContext* cx,
-                                          TypeConstraint* constraint) {
-  /*
-   * Build all types in the set into a vector before triggering the
-   * constraint, as doing so may modify this type set.
-   */
-  TypeList types;
-  if (!enumerateTypes(&types)) {
-    return false;
-  }
-
-  for (unsigned i = 0; i < types.length(); i++) {
-    constraint->newType(cx, this, types[i]);
-  }
-
-  return true;
-}
-
-#ifdef DEBUG
-static inline bool CompartmentsMatch(Compartment* a, Compartment* b) {
-  return !a || !b || a == b;
-}
-#endif
-
-bool ConstraintTypeSet::addConstraint(JSContext* cx, TypeConstraint* constraint,
-                                      bool callExisting) {
-  checkMagic();
-
-  if (!constraint) {
-    /* OOM failure while constructing the constraint. */
-    return false;
-  }
-
-  MOZ_RELEASE_ASSERT(cx->zone()->types.activeAnalysis);
-  MOZ_ASSERT(
-      CompartmentsMatch(maybeCompartment(), constraint->maybeCompartment()));
-
-  InferSpew(ISpewOps, "addConstraint: %sT%p%s %sC%p%s %s", InferSpewColor(this),
-            this, InferSpewColorReset(), InferSpewColor(constraint), constraint,
-            InferSpewColorReset(), constraint->kind());
-
-  MOZ_ASSERT(constraint->next() == nullptr);
-  constraint->setNext(constraintList_);
-  constraintList_ = constraint;
-
-  if (callExisting) {
-    return addTypesToConstraint(cx, constraint);
-  }
-  return true;
-}
-
-void TypeSet::clearObjects() {
-  setBaseObjectCount(0);
-  objectSet = nullptr;
-}
-
-Compartment* TypeSet::maybeCompartment() {
-  if (unknownObject()) {
-    return nullptr;
-  }
-
-  unsigned objectCount = getObjectCount();
-  for (unsigned i = 0; i < objectCount; i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    Compartment* comp = key->maybeCompartment();
-    if (comp) {
-      return comp;
-    }
-  }
-
-  return nullptr;
-}
-
-void TypeSet::addType(Type type, LifoAlloc* alloc) {
-  MOZ_ASSERT(CompartmentsMatch(maybeCompartment(), type.maybeCompartment()));
-
-  if (unknown()) {
-    return;
-  }
-
-  if (type.isUnknown()) {
-    flags |= TYPE_FLAG_BASE_MASK;
-    clearObjects();
-    MOZ_ASSERT(unknown());
-    return;
-  }
-
-  if (type.isPrimitive()) {
-    TypeFlags flag = PrimitiveTypeFlag(type);
-    if (flags & flag) {
-      return;
-    }
-
-    /* If we add float to a type set it is also considered to contain int. */
-    if (flag == TYPE_FLAG_DOUBLE) {
-      flag |= TYPE_FLAG_INT32;
-    }
-
-    flags |= flag;
-    return;
-  }
-
-  if (flags & TYPE_FLAG_ANYOBJECT) {
-    return;
-  }
-  if (type.isAnyObject()) {
-    goto unknownObject;
-  }
-
-  {
-    uint32_t objectCount = baseObjectCount();
-    ObjectKey* key = type.objectKey();
-    ObjectKey** pentry = TypeHashSet::Insert<ObjectKey*, ObjectKey, ObjectKey>(
-        *alloc, objectSet, objectCount, key);
-    if (!pentry) {
-      goto unknownObject;
-    }
-    if (*pentry) {
-      return;
-    }
-    *pentry = key;
-
-    setBaseObjectCount(objectCount);
-
-    // Limit the number of objects we track. There is a different limit
-    // depending on whether the set only contains DOM objects, which can
-    // have many different classes and prototypes but are still optimizable
-    // by IonMonkey.
-    if (objectCount >= TYPE_FLAG_OBJECT_COUNT_LIMIT) {
-      static_assert(TYPE_FLAG_DOMOBJECT_COUNT_LIMIT >=
-                    TYPE_FLAG_OBJECT_COUNT_LIMIT);
-      // Examining the entire type set is only required when we first hit
-      // the normal object limit.
-      if (objectCount == TYPE_FLAG_OBJECT_COUNT_LIMIT) {
-        for (unsigned i = 0; i < objectCount; i++) {
-          const JSClass* clasp = getObjectClass(i);
-          if (clasp && !clasp->isDOMClass()) {
-            goto unknownObject;
-          }
-        }
-      }
-
-      // Make sure the newly added object is also a DOM object.
-      if (!key->clasp()->isDOMClass()) {
-        goto unknownObject;
-      }
-
-      // Limit the number of DOM objects.
-      if (objectCount == TYPE_FLAG_DOMOBJECT_COUNT_LIMIT) {
-        goto unknownObject;
-      }
-    }
-  }
-
-  if (type.isGroup()) {
-    ObjectGroup* ngroup = type.group();
-    MOZ_ASSERT(!ngroup->singleton());
-    AutoSweepObjectGroup sweep(ngroup);
-    if (ngroup->unknownProperties(sweep)) {
-      goto unknownObject;
-    }
-
-    // If we add a partially initialized group to a type set, add the
-    // corresponding fully initialized group, as an object's group may change
-    // from the former to the latter via the acquired properties analysis.
-    if (ngroup->newScript(sweep) &&
-        ngroup->newScript(sweep)->initializedGroup()) {
-      addType(ObjectType(ngroup->newScript(sweep)->initializedGroup()), alloc);
-    }
-  }
-
-  if (false) {
-  unknownObject:
-    flags |= TYPE_FLAG_ANYOBJECT;
-    clearObjects();
-  }
-}
-
-// This class is used for post barriers on type set contents. The only times
-// when type sets contain nursery references is when a nursery object has its
-// group dynamically changed to a singleton. In such cases the type set will
-// need to be traced at the next minor GC.
-//
-// There is no barrier used for TemporaryTypeSets. These type sets are only
-// used during Ion compilation, and if some ConstraintTypeSet contains nursery
-// pointers then any number of TemporaryTypeSets might as well. Thus, if there
-// are any such ConstraintTypeSets in existence, all off thread Ion
-// compilations are canceled by the next minor GC.
-class TypeSetRef : public gc::BufferableRef {
-  Zone* zone;
-  ConstraintTypeSet* types;
-#ifdef DEBUG
-  uint64_t minorGCNumberAtCreation;
-#endif
-
- public:
-  TypeSetRef(Zone* zone, ConstraintTypeSet* types)
-      : zone(zone),
-        types(types)
-#ifdef DEBUG
-        ,
-        minorGCNumberAtCreation(
-            zone->runtimeFromMainThread()->gc.minorGCCount())
-#endif
-  {
-  }
-
-  void trace(JSTracer* trc) override {
-    MOZ_ASSERT(trc->runtime()->gc.minorGCCount() == minorGCNumberAtCreation);
-    types->trace(zone, trc);
-  }
-};
-
-void ConstraintTypeSet::postWriteBarrier(JSContext* cx, Type type) {
-  if (type.isSingletonUnchecked()) {
-    if (gc::StoreBuffer* sb = type.singletonNoBarrier()->storeBuffer()) {
-      sb->putGeneric(TypeSetRef(cx->zone(), this));
-      sb->setShouldCancelIonCompilations();
-      sb->setHasTypeSetPointers();
-    }
-  }
-}
-
-void ConstraintTypeSet::addType(const AutoSweepBase& sweep, JSContext* cx,
-                                Type type) {
-  checkMagic();
-
-  MOZ_RELEASE_ASSERT(cx->zone()->types.activeAnalysis);
-
-  if (hasType(type)) {
-    return;
-  }
-
-  TypeSet::addType(type, &cx->typeLifoAlloc());
-
-  if (type.isObjectUnchecked() && unknownObject()) {
-    type = AnyObjectType();
-  }
-
-  postWriteBarrier(cx, type);
-
-  InferSpew(ISpewOps, "addType: %sT%p%s %s", InferSpewColor(this), this,
-            InferSpewColorReset(), TypeString(type).get());
-
-  /* Propagate the type to all constraints. */
-  if (!cx->isHelperThreadContext()) {
-    TypeConstraint* constraint = constraintList(sweep);
-    while (constraint) {
-      constraint->newType(cx, this, type);
-      constraint = constraint->next();
-    }
-  } else {
-    MOZ_ASSERT(!constraintList_);
-  }
-}
-
-void TypeSet::print(FILE* fp) {
-  bool fromDebugger = !fp;
-  if (!fp) {
-    fp = stderr;
-  }
-
-  if (flags & TYPE_FLAG_NON_DATA_PROPERTY) {
-    fprintf(fp, " [non-data]");
-  }
-
-  if (flags & TYPE_FLAG_NON_WRITABLE_PROPERTY) {
-    fprintf(fp, " [non-writable]");
-  }
-
-  if (definiteProperty()) {
-    fprintf(fp, " [definite:%u]", definiteSlot());
-  }
-
-  if (baseFlags() == 0 && !baseObjectCount()) {
-    fprintf(fp, " missing");
-    return;
-  }
-
-  if (flags & TYPE_FLAG_UNKNOWN) {
-    fprintf(fp, " unknown");
-  }
-  if (flags & TYPE_FLAG_ANYOBJECT) {
-    fprintf(fp, " object");
-  }
-
-  if (flags & TYPE_FLAG_UNDEFINED) {
-    fprintf(fp, " void");
-  }
-  if (flags & TYPE_FLAG_NULL) {
-    fprintf(fp, " null");
-  }
-  if (flags & TYPE_FLAG_BOOLEAN) {
-    fprintf(fp, " bool");
-  }
-  if (flags & TYPE_FLAG_INT32) {
-    fprintf(fp, " int");
-  }
-  if (flags & TYPE_FLAG_DOUBLE) {
-    fprintf(fp, " float");
-  }
-  if (flags & TYPE_FLAG_STRING) {
-    fprintf(fp, " string");
-  }
-  if (flags & TYPE_FLAG_SYMBOL) {
-    fprintf(fp, " symbol");
-  }
-  if (flags & TYPE_FLAG_BIGINT) {
-    fprintf(fp, " BigInt");
-  }
-  if (flags & TYPE_FLAG_LAZYARGS) {
-    fprintf(fp, " lazyargs");
-  }
-
-  uint32_t objectCount = baseObjectCount();
-  if (objectCount) {
-    fprintf(fp, " object[%u]", objectCount);
-
-    unsigned count = getObjectCount();
-    for (unsigned i = 0; i < count; i++) {
-      ObjectKey* key = getObject(i);
-      if (key) {
-        fprintf(fp, " %s", TypeString(ObjectType(key)).get());
-      }
-    }
-  }
-
-  if (fromDebugger) {
-    fprintf(fp, "\n");
-  }
-}
-
-/* static */
-void TypeSet::readBarrier(const TypeSet* types) {
-  if (types->unknownObject()) {
-    return;
-  }
-
-  for (unsigned i = 0; i < types->getObjectCount(); i++) {
-    if (ObjectKey* key = types->getObject(i)) {
-      if (key->isSingleton()) {
-        (void)key->singleton();
-      } else {
-        (void)key->group();
-      }
-    }
-  }
-}
-
-/* static */
-bool TypeSet::IsTypeMarked(JSRuntime* rt, TypeSet::Type* v) {
-  bool rv;
-  if (v->isSingletonUnchecked()) {
-    JSObject* obj = v->singletonNoBarrier();
-    rv = IsMarkedUnbarriered(rt, &obj);
-    *v = TypeSet::ObjectType(obj);
-  } else if (v->isGroupUnchecked()) {
-    ObjectGroup* group = v->groupNoBarrier();
-    rv = IsMarkedUnbarriered(rt, &group);
-    *v = TypeSet::ObjectType(group);
-  } else {
-    rv = true;
-  }
-  return rv;
-}
-
-static inline bool IsObjectKeyAboutToBeFinalized(TypeSet::ObjectKey** keyp) {
-  TypeSet::ObjectKey* key = *keyp;
-  bool isAboutToBeFinalized;
-  if (key->isGroup()) {
-    ObjectGroup* group = key->groupNoBarrier();
-    isAboutToBeFinalized = IsAboutToBeFinalizedUnbarriered(&group);
-    if (!isAboutToBeFinalized) {
-      *keyp = TypeSet::ObjectKey::get(group);
-    }
-  } else {
-    MOZ_ASSERT(key->isSingleton());
-    JSObject* singleton = key->singletonNoBarrier();
-    isAboutToBeFinalized = IsAboutToBeFinalizedUnbarriered(&singleton);
-    if (!isAboutToBeFinalized) {
-      *keyp = TypeSet::ObjectKey::get(singleton);
-    }
-  }
-  return isAboutToBeFinalized;
-}
-
-bool TypeSet::IsTypeAboutToBeFinalized(TypeSet::Type* v) {
-  bool isAboutToBeFinalized;
-  if (v->isObjectUnchecked()) {
-    TypeSet::ObjectKey* key = v->objectKey();
-    isAboutToBeFinalized = IsObjectKeyAboutToBeFinalized(&key);
-    if (!isAboutToBeFinalized) {
-      *v = TypeSet::ObjectType(key);
-    }
-  } else {
-    isAboutToBeFinalized = false;
-  }
-  return isAboutToBeFinalized;
-}
-
-bool TypeSet::cloneIntoUninitialized(LifoAlloc* alloc,
-                                     TemporaryTypeSet* result) const {
-  unsigned objectCount = baseObjectCount();
-  unsigned capacity =
-      (objectCount >= 2) ? TypeHashSet::Capacity(objectCount) : 0;
-
-  ObjectKey** newSet;
-  if (capacity) {
-    // We allocate an extra word right before the array that stores the
-    // capacity, so make sure we clone that as well.
-    newSet = alloc->newArray<ObjectKey*>(capacity + 1);
-    if (!newSet) {
-      return false;
-    }
-    newSet++;
-    PodCopy(newSet - 1, objectSet - 1, capacity + 1);
-  }
-
-  new (result) TemporaryTypeSet(flags, capacity ? newSet : objectSet);
-  return true;
-}
-
-TemporaryTypeSet* TypeSet::clone(LifoAlloc* alloc) const {
-  TemporaryTypeSet* res = alloc->pod_malloc<TemporaryTypeSet>();
-  if (!res || !cloneIntoUninitialized(alloc, res)) {
-    return nullptr;
-  }
-  return res;
-}
-
-TemporaryTypeSet* TypeSet::cloneObjectsOnly(LifoAlloc* alloc) {
-  TemporaryTypeSet* res = clone(alloc);
-  if (!res) {
-    return nullptr;
-  }
-
-  res->flags &= ~TYPE_FLAG_BASE_MASK | TYPE_FLAG_ANYOBJECT;
-
-  return res;
-}
-
-TemporaryTypeSet* TypeSet::cloneWithoutObjects(LifoAlloc* alloc) {
-  TemporaryTypeSet* res = alloc->new_<TemporaryTypeSet>();
-  if (!res) {
-    return nullptr;
-  }
-
-  res->flags = flags & ~TYPE_FLAG_ANYOBJECT;
-  res->setBaseObjectCount(0);
-  return res;
-}
-
-/* static */
-TemporaryTypeSet* TypeSet::unionSets(TypeSet* a, TypeSet* b, LifoAlloc* alloc) {
-  TemporaryTypeSet* res = alloc->new_<TemporaryTypeSet>(
-      a->baseFlags() | b->baseFlags(), static_cast<ObjectKey**>(nullptr));
-  if (!res) {
-    return nullptr;
-  }
-
-  if (!res->unknownObject()) {
-    for (size_t i = 0; i < a->getObjectCount() && !res->unknownObject(); i++) {
-      if (ObjectKey* key = a->getObject(i)) {
-        res->addType(ObjectType(key), alloc);
-      }
-    }
-    for (size_t i = 0; i < b->getObjectCount() && !res->unknownObject(); i++) {
-      if (ObjectKey* key = b->getObject(i)) {
-        res->addType(ObjectType(key), alloc);
-      }
-    }
-  }
-
-  return res;
-}
-
-/* static */
-TemporaryTypeSet* TypeSet::removeSet(TemporaryTypeSet* input,
-                                     TemporaryTypeSet* removal,
-                                     LifoAlloc* alloc) {
-  // Only allow removal of primitives and the "AnyObject" flag.
-  MOZ_ASSERT(!removal->unknown());
-  MOZ_ASSERT_IF(!removal->unknownObject(), removal->getObjectCount() == 0);
-
-  uint32_t flags = input->baseFlags() & ~removal->baseFlags();
-  TemporaryTypeSet* res =
-      alloc->new_<TemporaryTypeSet>(flags, static_cast<ObjectKey**>(nullptr));
-  if (!res) {
-    return nullptr;
-  }
-
-  res->setBaseObjectCount(0);
-  if (removal->unknownObject() || input->unknownObject()) {
-    return res;
-  }
-
-  for (size_t i = 0; i < input->getObjectCount(); i++) {
-    if (!input->getObject(i)) {
-      continue;
-    }
-
-    res->addType(TypeSet::ObjectType(input->getObject(i)), alloc);
-  }
-
-  return res;
-}
-
-/* static */
-TemporaryTypeSet* TypeSet::intersectSets(TemporaryTypeSet* a,
-                                         TemporaryTypeSet* b,
-                                         LifoAlloc* alloc) {
-  TemporaryTypeSet* res;
-  res = alloc->new_<TemporaryTypeSet>(a->baseFlags() & b->baseFlags(),
-                                      static_cast<ObjectKey**>(nullptr));
-  if (!res) {
-    return nullptr;
-  }
-
-  res->setBaseObjectCount(0);
-  if (res->unknownObject()) {
-    return res;
-  }
-
-  MOZ_ASSERT(!a->unknownObject() || !b->unknownObject());
-
-  if (a->unknownObject()) {
-    for (size_t i = 0; i < b->getObjectCount(); i++) {
-      if (b->getObject(i)) {
-        res->addType(ObjectType(b->getObject(i)), alloc);
-      }
-    }
-    return res;
-  }
-
-  if (b->unknownObject()) {
-    for (size_t i = 0; i < a->getObjectCount(); i++) {
-      if (a->getObject(i)) {
-        res->addType(ObjectType(a->getObject(i)), alloc);
-      }
-    }
-    return res;
-  }
-
-  MOZ_ASSERT(!a->unknownObject() && !b->unknownObject());
-
-  for (size_t i = 0; i < a->getObjectCount(); i++) {
-    for (size_t j = 0; j < b->getObjectCount(); j++) {
-      if (b->getObject(j) != a->getObject(i)) {
-        continue;
-      }
-      if (!b->getObject(j)) {
-        continue;
-      }
-      res->addType(ObjectType(b->getObject(j)), alloc);
-      break;
-    }
-  }
-
-  return res;
-}
-
-/////////////////////////////////////////////////////////////////////
-// Compiler constraints
-/////////////////////////////////////////////////////////////////////
-
-// Compiler constraints overview
-//
-// Constraints generated during Ion compilation capture assumptions made about
-// heap properties that will trigger invalidation of the resulting Ion code if
-// the constraint is violated. Constraints can only be attached to type sets on
-// the main thread, so to allow compilation to occur almost entirely off thread
-// the generation is split into two phases.
-//
-// During compilation, CompilerConstraint values are constructed in a list,
-// recording the heap property type set which was read from and its expected
-// contents, along with the assumption made about those contents.
-//
-// At the end of compilation, when linking the result on the main thread, the
-// list of compiler constraints are read and converted to type constraints and
-// attached to the type sets. If the property type sets have changed so that the
-// assumptions no longer hold then the compilation is aborted and its result
-// discarded.
-
-// Superclass of all constraints generated during Ion compilation. These may
-// be allocated off thread, using the current JIT context's allocator.
-class CompilerConstraint {
- public:
-  // Property being queried by the compiler.
-  HeapTypeSetKey property;
-
-  // Contents of the property at the point when the query was performed. This
-  // may differ from the actual property types later in compilation as the
-  // main thread performs side effects.
-  TemporaryTypeSet* expected;
-
-  CompilerConstraint(LifoAlloc* alloc, const HeapTypeSetKey& property)
-      : property(property),
-        expected(property.maybeTypes() ? property.maybeTypes()->clone(alloc)
-                                       : nullptr) {}
-
-  // Generate the type constraint recording the assumption made by this
-  // compilation. Returns true if the assumption originally made still holds.
-  virtual bool generateTypeConstraint(JSContext* cx,
-                                      RecompileInfo recompileInfo) = 0;
-};
-
-class js::CompilerConstraintList {
- public:
-  struct FrozenScript {
-    JSScript* script;
-    TemporaryTypeSet* thisTypes;
-    TemporaryTypeSet* argTypes;
-    TemporaryTypeSet* bytecodeTypes;
-  };
-
- private:
-  // OOM during generation of some constraint.
-  bool failed_;
-
-  // Allocator used for constraints.
-  LifoAlloc* alloc_;
-
-  // Constraints generated on heap properties.
-  Vector<CompilerConstraint*, 0, jit::JitAllocPolicy> constraints;
-
-  // Scripts whose stack type sets were frozen for the compilation.
-  Vector<FrozenScript, 1, jit::JitAllocPolicy> frozenScripts;
-
- public:
-  explicit CompilerConstraintList(jit::TempAllocator& alloc)
-      : failed_(false),
-        alloc_(alloc.lifoAlloc()),
-        constraints(alloc),
-        frozenScripts(alloc) {}
-
-  void add(CompilerConstraint* constraint) {
-    if (!constraint || !constraints.append(constraint)) {
-      setFailed();
-    }
-  }
-
-  void freezeScript(JSScript* script, TemporaryTypeSet* thisTypes,
-                    TemporaryTypeSet* argTypes,
-                    TemporaryTypeSet* bytecodeTypes) {
-    FrozenScript entry;
-    entry.script = script;
-    entry.thisTypes = thisTypes;
-    entry.argTypes = argTypes;
-    entry.bytecodeTypes = bytecodeTypes;
-    if (!frozenScripts.append(entry)) {
-      setFailed();
-    }
-  }
-
-  size_t length() { return constraints.length(); }
-
-  CompilerConstraint* get(size_t i) { return constraints[i]; }
-
-  size_t numFrozenScripts() { return frozenScripts.length(); }
-
-  const FrozenScript& frozenScript(size_t i) { return frozenScripts[i]; }
-
-  bool failed() { return failed_; }
-  void setFailed() { failed_ = true; }
-  LifoAlloc* alloc() const { return alloc_; }
-};
-
-CompilerConstraintList* js::NewCompilerConstraintList(
-    jit::TempAllocator& alloc) {
-  return alloc.lifoAlloc()->new_<CompilerConstraintList>(alloc);
-}
-
-/* static */
-bool JitScript::FreezeTypeSets(CompilerConstraintList* constraints,
-                               JSScript* script, TemporaryTypeSet** pThisTypes,
-                               TemporaryTypeSet** pArgTypes,
-                               TemporaryTypeSet** pBytecodeTypes) {
-  LifoAlloc* alloc = constraints->alloc();
-  AutoSweepJitScript sweep(script);
-  JitScript* jitScript = script->jitScript();
-  StackTypeSet* existing = jitScript->typeArray(sweep);
-
-  size_t count = jitScript->numTypeSets();
-  TemporaryTypeSet* types =
-      alloc->newArrayUninitialized<TemporaryTypeSet>(count);
-  if (!types) {
-    return false;
-  }
-
-  for (size_t i = 0; i < count; i++) {
-    if (!existing[i].cloneIntoUninitialized(alloc, &types[i])) {
-      return false;
-    }
-  }
-
-  size_t thisTypesIndex = jitScript->thisTypes(sweep, script) - existing;
-  *pThisTypes = types + thisTypesIndex;
-
-  if (script->function() && script->function()->nargs() > 0) {
-    size_t firstArgIndex = jitScript->argTypes(sweep, script, 0) - existing;
-    *pArgTypes = types + firstArgIndex;
-  } else {
-    *pArgTypes = nullptr;
-  }
-
-  *pBytecodeTypes = types;
-
-  constraints->freezeScript(script, *pThisTypes, *pArgTypes, *pBytecodeTypes);
-  return true;
-}
-
-namespace {
-
-template <typename T>
-class CompilerConstraintInstance : public CompilerConstraint {
-  T data;
-
- public:
-  CompilerConstraintInstance<T>(LifoAlloc* alloc,
-                                const HeapTypeSetKey& property, const T& data)
-      : CompilerConstraint(alloc, property), data(data) {}
-
-  bool generateTypeConstraint(JSContext* cx,
-                              RecompileInfo recompileInfo) override;
-};
-
-// Constraint generated from a CompilerConstraint when linking the compilation.
-template <typename T>
-class TypeCompilerConstraint : public TypeConstraint {
-  // Compilation which this constraint may invalidate.
-  RecompileInfo compilation;
-
-  T data;
-
- public:
-  TypeCompilerConstraint<T>(RecompileInfo compilation, const T& data)
-      : compilation(compilation), data(data) {}
-
-  const char* kind() override { return data.kind(); }
-
-  void newType(JSContext* cx, TypeSet* source, TypeSet::Type type) override {
-    if (data.invalidateOnNewType(type)) {
-      cx->zone()->types.addPendingRecompile(cx, compilation);
-    }
-  }
-
-  void newPropertyState(JSContext* cx, TypeSet* source) override {
-    if (data.invalidateOnNewPropertyState(source)) {
-      cx->zone()->types.addPendingRecompile(cx, compilation);
-    }
-  }
-
-  void newObjectState(JSContext* cx, ObjectGroup* group) override {
-    // Note: Once the object has unknown properties, no more notifications
-    // will be sent on changes to its state, so always invalidate any
-    // associated compilations.
-    AutoSweepObjectGroup sweep(group);
-    if (group->unknownProperties(sweep) ||
-        data.invalidateOnNewObjectState(sweep, group)) {
-      cx->zone()->types.addPendingRecompile(cx, compilation);
-    }
-  }
-
-  bool sweep(TypeZone& zone, TypeConstraint** res) override {
-    if (data.shouldSweep() || compilation.shouldSweep(zone)) {
-      return false;
-    }
-    *res = zone.typeLifoAlloc().new_<TypeCompilerConstraint<T> >(compilation,
-                                                                 data);
-    return true;
-  }
-
-  Compartment* maybeCompartment() override { return data.maybeCompartment(); }
-};
-
-template <typename T>
-bool CompilerConstraintInstance<T>::generateTypeConstraint(
-    JSContext* cx, RecompileInfo recompileInfo) {
-  // This should only be called in suppress-GC contexts, but the static
-  // analysis doesn't know this.
-  MOZ_ASSERT(cx->suppressGC);
-  JS::AutoSuppressGCAnalysis suppress;
-
-  if (property.object()->unknownProperties()) {
-    return false;
-  }
-
-  if (!property.instantiate(cx)) {
-    return false;
-  }
-
-  AutoSweepObjectGroup sweep(property.object()->maybeGroup());
-  if (property.object()->maybeGroup()->unknownProperties(sweep)) {
-    return false;
-  }
-  if (!data.constraintHolds(sweep, cx, property, expected)) {
-    return false;
-  }
-
-  return property.maybeTypes()->addConstraint(
-      cx,
-      cx->typeLifoAlloc().new_<TypeCompilerConstraint<T> >(recompileInfo, data),
-      /* callExisting = */ false);
-}
-
-} /* anonymous namespace */
-
-const JSClass* TypeSet::ObjectKey::clasp() {
-  return isGroup() ? group()->clasp() : singleton()->getClass();
-}
-
-TaggedProto TypeSet::ObjectKey::proto() {
-  return isGroup() ? group()->proto() : singleton()->taggedProto();
-}
-
-ObjectGroup* TypeSet::ObjectKey::maybeGroup() {
-  if (isGroup()) {
-    return group();
-  }
-  if (!singleton()->hasLazyGroup()) {
-    return singleton()->group();
-  }
-  return nullptr;
-}
-
-bool TypeSet::ObjectKey::unknownProperties() {
-  if (ObjectGroup* group = maybeGroup()) {
-    AutoSweepObjectGroup sweep(group);
-    return group->unknownProperties(sweep);
-  }
-  return false;
-}
-
-HeapTypeSetKey TypeSet::ObjectKey::property(jsid id) {
-  MOZ_ASSERT(!unknownProperties());
-
-  HeapTypeSetKey property;
-  property.object_ = this;
-  property.id_ = id;
-  if (ObjectGroup* group = maybeGroup()) {
-    AutoSweepObjectGroup sweep(group);
-    if (!group->unknownProperties(sweep)) {
-      property.maybeTypes_ = group->maybeGetProperty(sweep, id);
-    }
-  }
-
-  return property;
-}
-
-void TypeSet::ObjectKey::ensureTrackedProperty(JSContext* cx, jsid id) {
-  // If we are accessing a lazily defined property which actually exists in
-  // the VM and has not been instantiated yet, instantiate it now if we are
-  // on the main thread and able to do so.
-  if (!JSID_IS_VOID(id) && !JSID_IS_EMPTY(id)) {
-    MOZ_ASSERT(CurrentThreadCanAccessRuntime(cx->runtime()));
-    if (isSingleton()) {
-      JSObject* obj = singleton();
-      if (obj->isNative() && obj->as<NativeObject>().containsPure(id)) {
-        EnsureTrackPropertyTypes(cx, obj, id);
-      }
-    }
-  }
-}
-
-void js::EnsureTrackPropertyTypes(JSContext* cx, JSObject* obj, jsid id) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  id = IdToTypeId(id);
-
-  if (obj->isSingleton()) {
-    AutoEnterAnalysis enter(cx);
-    if (obj->hasLazyGroup()) {
-      AutoEnterOOMUnsafeRegion oomUnsafe;
-      RootedObject objRoot(cx, obj);
-      if (!JSObject::getGroup(cx, objRoot)) {
-        oomUnsafe.crash(
-            "Could not allocate ObjectGroup in EnsureTrackPropertyTypes");
-      }
-    }
-    ObjectGroup* group = obj->group();
-    AutoSweepObjectGroup sweep(group);
-    if (!group->unknownProperties(sweep) &&
-        !group->getProperty(sweep, cx, obj, id)) {
-      MOZ_ASSERT(group->unknownProperties(sweep));
-      return;
-    }
-  }
-
-  MOZ_ASSERT(obj->group()->unknownPropertiesDontCheckGeneration() ||
-             TrackPropertyTypes(obj, id));
-}
-
-bool HeapTypeSetKey::instantiate(JSContext* cx) {
-  if (maybeTypes()) {
-    return true;
-  }
-  if (object()->isSingleton()) {
-    RootedObject obj(cx, object()->singleton());
-    if (!JSObject::getGroup(cx, obj)) {
-      cx->clearPendingException();
-      return false;
-    }
-  }
-  JSObject* obj = object()->isSingleton() ? object()->singleton() : nullptr;
-  AutoSweepObjectGroup sweep(object()->maybeGroup());
-  maybeTypes_ = object()->maybeGroup()->getProperty(sweep, cx, obj, id());
-  return maybeTypes_ != nullptr;
-}
-
-static bool CheckFrozenTypeSet(const AutoSweepJitScript& sweep, JSContext* cx,
-                               TemporaryTypeSet* frozen, StackTypeSet* actual) {
-  // Return whether the types frozen for a script during compilation are
-  // still valid. Also check for any new types added to the frozen set during
-  // compilation, and add them to the actual stack type sets. These new types
-  // indicate places where the compiler relaxed its possible inputs to be
-  // more tolerant of potential new types.
-
-  if (!actual->isSubset(frozen)) {
-    return false;
-  }
-
-  if (!frozen->isSubset(actual)) {
-    TypeSet::TypeList list;
-    frozen->enumerateTypes(&list);
-
-    for (size_t i = 0; i < list.length(); i++) {
-      actual->addType(sweep, cx, list[i]);
-    }
-  }
-
-  return true;
-}
-
-namespace {
-
-/*
- * As for TypeConstraintFreeze, but describes an implicit freeze constraint
- * added for stack types within a script. Applies to all compilations of the
- * script, not just a single one.
- */
-class TypeConstraintFreezeStack : public TypeConstraint {
-  JSScript* script_;
-
- public:
-  explicit TypeConstraintFreezeStack(JSScript* script) : script_(script) {}
-
-  const char* kind() override { return "freezeStack"; }
-
-  void newType(JSContext* cx, TypeSet* source, TypeSet::Type type) override {
-    /*
-     * Unlike TypeConstraintFreeze, triggering this constraint once does
-     * not disable it on future changes to the type set.
-     */
-    cx->zone()->types.addPendingRecompile(cx, script_);
-  }
-
-  bool sweep(TypeZone& zone, TypeConstraint** res) override {
-    if (IsAboutToBeFinalizedUnbarriered(&script_)) {
-      return false;
-    }
-    *res = zone.typeLifoAlloc().new_<TypeConstraintFreezeStack>(script_);
-    return true;
-  }
-
-  Compartment* maybeCompartment() override { return script_->compartment(); }
-};
-
-} /* anonymous namespace */
-
-bool js::FinishCompilation(JSContext* cx, HandleScript script,
-                           CompilerConstraintList* constraints,
-                           IonCompilationId compilationId, bool* isValidOut) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(*cx->zone()->types.currentCompilationId() == compilationId);
-
-  if (constraints->failed()) {
-    return false;
-  }
-
-  RecompileInfo recompileInfo(script, compilationId);
-
-  bool succeeded = true;
-
-  for (size_t i = 0; i < constraints->length(); i++) {
-    CompilerConstraint* constraint = constraints->get(i);
-    if (!constraint->generateTypeConstraint(cx, recompileInfo)) {
-      succeeded = false;
-    }
-  }
-
-  for (size_t i = 0; i < constraints->numFrozenScripts(); i++) {
-    const CompilerConstraintList::FrozenScript& entry =
-        constraints->frozenScript(i);
-    // It could happen that one of the compiled scripts was made a
-    // debuggee mid-compilation (e.g., via setting a breakpoint). If so,
-    // throw away the compilation.
-    if (entry.script->isDebuggee()) {
-      succeeded = false;
-      break;
-    }
-
-    JitScript* jitScript = entry.script->jitScript();
-    AutoSweepJitScript sweep(entry.script);
-    if (!CheckFrozenTypeSet(sweep, cx, entry.thisTypes,
-                            jitScript->thisTypes(sweep, entry.script))) {
-      succeeded = false;
-    }
-    unsigned nargs =
-        entry.script->function() ? entry.script->function()->nargs() : 0;
-    for (size_t i = 0; i < nargs; i++) {
-      if (!CheckFrozenTypeSet(sweep, cx, &entry.argTypes[i],
-                              jitScript->argTypes(sweep, entry.script, i))) {
-        succeeded = false;
-      }
-    }
-    for (size_t i = 0; i < entry.script->numBytecodeTypeSets(); i++) {
-      if (!CheckFrozenTypeSet(sweep, cx, &entry.bytecodeTypes[i],
-                              &jitScript->typeArray(sweep)[i])) {
-        succeeded = false;
-      }
-    }
-
-    // Add this compilation to the inlinedCompilations list of each inlined
-    // script, so we can invalidate it on changes to stack type sets.
-    if (entry.script != script) {
-      if (!jitScript->addInlinedCompilation(sweep, recompileInfo)) {
-        succeeded = false;
-      }
-    }
-
-    // If necessary, add constraints to trigger invalidation on the script
-    // after any future changes to the stack type sets.
-    if (jitScript->hasFreezeConstraints(sweep)) {
-      continue;
-    }
-
-    size_t count = jitScript->numTypeSets();
-    StackTypeSet* array = jitScript->typeArray(sweep);
-    for (size_t i = 0; i < count; i++) {
-      if (!array[i].addConstraint(
-              cx,
-              cx->typeLifoAlloc().new_<TypeConstraintFreezeStack>(entry.script),
-              false)) {
-        succeeded = false;
-      }
-    }
-
-    if (succeeded) {
-      jitScript->setHasFreezeConstraints(sweep);
-    }
-  }
-
-  if (!succeeded) {
-    script->resetWarmUpCounterToDelayIonCompilation();
-    *isValidOut = false;
-    return true;
-  }
-
-  *isValidOut = true;
-  return true;
-}
-
-static void CheckDefinitePropertiesTypeSet(const AutoSweepJitScript& sweep,
-                                           JSContext* cx,
-                                           TemporaryTypeSet* frozen,
-                                           StackTypeSet* actual) {
-  // The definite properties analysis happens on the main thread, so no new
-  // types can have been added to actual. The analysis may have updated the
-  // contents of |frozen| though with new speculative types, and these need
-  // to be reflected in |actual| for AddClearDefiniteFunctionUsesInScript
-  // to work.
-  if (!frozen->isSubset(actual)) {
-    TypeSet::TypeList list;
-    frozen->enumerateTypes(&list);
-
-    for (size_t i = 0; i < list.length(); i++) {
-      actual->addType(sweep, cx, list[i]);
-    }
-  }
-}
-
-void js::FinishDefinitePropertiesAnalysis(JSContext* cx,
-                                          CompilerConstraintList* constraints) {
-#ifdef DEBUG
-  // Assert no new types have been added to the StackTypeSets. Do this before
-  // calling CheckDefinitePropertiesTypeSet, as it may add new types to the
-  // StackTypeSets and break these invariants if a script is inlined more
-  // than once. See also CheckDefinitePropertiesTypeSet.
-  for (size_t i = 0; i < constraints->numFrozenScripts(); i++) {
-    const CompilerConstraintList::FrozenScript& entry =
-        constraints->frozenScript(i);
-    JSScript* script = entry.script;
-    JitScript* jitScript = script->jitScript();
-
-    AutoSweepJitScript sweep(script);
-    MOZ_ASSERT(jitScript->thisTypes(sweep, script)->isSubset(entry.thisTypes));
-
-    unsigned nargs =
-        entry.script->function() ? entry.script->function()->nargs() : 0;
-    for (size_t j = 0; j < nargs; j++) {
-      StackTypeSet* argTypes = jitScript->argTypes(sweep, script, j);
-      MOZ_ASSERT(argTypes->isSubset(&entry.argTypes[j]));
-    }
-
-    for (size_t j = 0; j < script->numBytecodeTypeSets(); j++) {
-      MOZ_ASSERT(
-          jitScript->typeArray(sweep)[j].isSubset(&entry.bytecodeTypes[j]));
-    }
-  }
-#endif
-
-  for (size_t i = 0; i < constraints->numFrozenScripts(); i++) {
-    const CompilerConstraintList::FrozenScript& entry =
-        constraints->frozenScript(i);
-    JSScript* script = entry.script;
-    JitScript* jitScript = script->jitScript();
-
-    AutoSweepJitScript sweep(script);
-    CheckDefinitePropertiesTypeSet(sweep, cx, entry.thisTypes,
-                                   jitScript->thisTypes(sweep, script));
-
-    unsigned nargs = script->function() ? script->function()->nargs() : 0;
-    for (size_t j = 0; j < nargs; j++) {
-      StackTypeSet* argTypes = jitScript->argTypes(sweep, script, j);
-      CheckDefinitePropertiesTypeSet(sweep, cx, &entry.argTypes[j], argTypes);
-    }
-
-    for (size_t j = 0; j < script->numBytecodeTypeSets(); j++) {
-      CheckDefinitePropertiesTypeSet(sweep, cx, &entry.bytecodeTypes[j],
-                                     &jitScript->typeArray(sweep)[j]);
-    }
-  }
-}
-
-namespace {
-
-// Constraint which triggers recompilation of a script if any type is added to a
-// type set. */
-class ConstraintDataFreeze {
- public:
-  ConstraintDataFreeze() = default;
-
-  const char* kind() { return "freeze"; }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return true; }
-  bool invalidateOnNewPropertyState(TypeSet* property) { return true; }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    return false;
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return expected ? property.maybeTypes()->isSubset(expected)
-                    : property.maybeTypes()->empty();
-  }
-
-  bool shouldSweep() { return false; }
-
-  Compartment* maybeCompartment() { return nullptr; }
-};
-
-} /* anonymous namespace */
-
-void HeapTypeSetKey::freeze(CompilerConstraintList* constraints) {
-  LifoAlloc* alloc = constraints->alloc();
-  LifoAlloc::AutoFallibleScope fallibleAllocator(alloc);
-
-  using T = CompilerConstraintInstance<ConstraintDataFreeze>;
-  constraints->add(alloc->new_<T>(alloc, *this, ConstraintDataFreeze()));
-}
-
-static inline jit::MIRType GetMIRTypeFromTypeFlags(TypeFlags flags) {
-  switch (flags) {
-    case TYPE_FLAG_UNDEFINED:
-      return jit::MIRType::Undefined;
-    case TYPE_FLAG_NULL:
-      return jit::MIRType::Null;
-    case TYPE_FLAG_BOOLEAN:
-      return jit::MIRType::Boolean;
-    case TYPE_FLAG_INT32:
-      return jit::MIRType::Int32;
-    case (TYPE_FLAG_INT32 | TYPE_FLAG_DOUBLE):
-      return jit::MIRType::Double;
-    case TYPE_FLAG_STRING:
-      return jit::MIRType::String;
-    case TYPE_FLAG_SYMBOL:
-      return jit::MIRType::Symbol;
-    case TYPE_FLAG_BIGINT:
-      return jit::MIRType::BigInt;
-    case TYPE_FLAG_LAZYARGS:
-      return jit::MIRType::MagicOptimizedArguments;
-    case TYPE_FLAG_ANYOBJECT:
-      return jit::MIRType::Object;
-    default:
-      return jit::MIRType::Value;
-  }
-}
-
-jit::MIRType TemporaryTypeSet::getKnownMIRType() {
-  TypeFlags flags = baseFlags();
-  jit::MIRType type;
-
-  if (baseObjectCount()) {
-    type = flags ? jit::MIRType::Value : jit::MIRType::Object;
-  } else {
-    type = GetMIRTypeFromTypeFlags(flags);
-  }
-
-  /*
-   * If the type set is totally empty then it will be treated as unknown,
-   * but we still need to record the dependency as adding a new type can give
-   * it a definite type tag. This is not needed if there are enough types
-   * that the exact tag is unknown, as it will stay unknown as more types are
-   * added to the set.
-   */
-  DebugOnly<bool> empty = flags == 0 && baseObjectCount() == 0;
-  MOZ_ASSERT_IF(empty, type == jit::MIRType::Value);
-
-  return type;
-}
-
-jit::MIRType HeapTypeSetKey::knownMIRType(CompilerConstraintList* constraints) {
-  TypeSet* types = maybeTypes();
-
-  if (!types || types->unknown()) {
-    return jit::MIRType::Value;
-  }
-
-  TypeFlags flags = types->baseFlags() & ~TYPE_FLAG_ANYOBJECT;
-  jit::MIRType type;
-
-  if (types->unknownObject() || types->getObjectCount()) {
-    type = flags ? jit::MIRType::Value : jit::MIRType::Object;
-  } else {
-    type = GetMIRTypeFromTypeFlags(flags);
-  }
-
-  if (type != jit::MIRType::Value) {
-    freeze(constraints);
-  }
-
-  /*
-   * If the type set is totally empty then it will be treated as unknown,
-   * but we still need to record the dependency as adding a new type can give
-   * it a definite type tag. This is not needed if there are enough types
-   * that the exact tag is unknown, as it will stay unknown as more types are
-   * added to the set.
-   */
-  MOZ_ASSERT_IF(types->empty(), type == jit::MIRType::Value);
-
-  return type;
-}
-
-bool HeapTypeSetKey::isOwnProperty(CompilerConstraintList* constraints,
-                                   bool allowEmptyTypesForGlobal /* = false*/) {
-  if (maybeTypes() &&
-      (!maybeTypes()->empty() || maybeTypes()->nonDataProperty())) {
-    return true;
-  }
-  if (object()->isSingleton()) {
-    JSObject* obj = object()->singleton();
-    MOZ_ASSERT(CanHaveEmptyPropertyTypesForOwnProperty(obj) ==
-               obj->is<GlobalObject>());
-    if (!allowEmptyTypesForGlobal) {
-      if (CanHaveEmptyPropertyTypesForOwnProperty(obj)) {
-        return true;
-      }
-    }
-  }
-  freeze(constraints);
-  return false;
-}
-
-JSObject* TemporaryTypeSet::maybeSingleton() {
-  if (baseFlags() != 0 || baseObjectCount() != 1) {
-    return nullptr;
-  }
-
-  return getSingleton(0);
-}
-
-TemporaryTypeSet::ObjectKey* TemporaryTypeSet::maybeSingleObject() {
-  if (baseFlags() != 0 || baseObjectCount() != 1) {
-    return nullptr;
-  }
-
-  return getObject(0);
-}
-
-JSObject* HeapTypeSetKey::singleton(CompilerConstraintList* constraints) {
-  HeapTypeSet* types = maybeTypes();
-
-  if (!types || types->nonDataProperty() || types->baseFlags() != 0 ||
-      types->getObjectCount() != 1) {
-    return nullptr;
-  }
-
-  JSObject* obj = types->getSingleton(0);
-
-  if (obj) {
-    freeze(constraints);
-  }
-
-  return obj;
-}
-
-bool HeapTypeSetKey::needsBarrier(CompilerConstraintList* constraints) {
-  TypeSet* types = maybeTypes();
-  if (!types) {
-    return false;
-  }
-  bool result = types->unknownObject() || types->getObjectCount() > 0 ||
-                types->hasAnyFlag(TYPE_FLAG_PRIMITIVE_GCTHING);
-  if (!result) {
-    freeze(constraints);
-  }
-  return result;
-}
-
-namespace {
-
-// Constraint which triggers recompilation if an object acquires particular
-// flags.
-class ConstraintDataFreezeObjectFlags {
- public:
-  // Flags we are watching for on this object.
-  ObjectGroupFlags flags;
-
-  explicit ConstraintDataFreezeObjectFlags(ObjectGroupFlags flags)
-      : flags(flags) {
-    MOZ_ASSERT(flags);
-  }
-
-  const char* kind() { return "freezeObjectFlags"; }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return false; }
-  bool invalidateOnNewPropertyState(TypeSet* property) { return false; }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    return group->hasAnyFlags(sweep, flags);
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return !invalidateOnNewObjectState(sweep, property.object()->maybeGroup());
-  }
-
-  bool shouldSweep() { return false; }
-
-  Compartment* maybeCompartment() { return nullptr; }
-};
-
-} /* anonymous namespace */
-
-bool TypeSet::ObjectKey::hasFlags(CompilerConstraintList* constraints,
-                                  ObjectGroupFlags flags) {
-  MOZ_ASSERT(flags);
-
-  if (ObjectGroup* group = maybeGroup()) {
-    AutoSweepObjectGroup sweep(group);
-    if (group->hasAnyFlags(sweep, flags)) {
-      return true;
-    }
-  }
-
-  HeapTypeSetKey objectProperty = property(JSID_EMPTY);
-  LifoAlloc* alloc = constraints->alloc();
-
-  using T = CompilerConstraintInstance<ConstraintDataFreezeObjectFlags>;
-  constraints->add(alloc->new_<T>(alloc, objectProperty,
-                                  ConstraintDataFreezeObjectFlags(flags)));
-  return false;
-}
-
-bool TypeSet::ObjectKey::hasStableClassAndProto(
-    CompilerConstraintList* constraints) {
-  return !hasFlags(constraints, OBJECT_FLAG_UNKNOWN_PROPERTIES);
-}
-
-bool TemporaryTypeSet::hasObjectFlags(CompilerConstraintList* constraints,
-                                      ObjectGroupFlags flags) {
-  if (unknownObject()) {
-    return true;
-  }
-
-  /*
-   * Treat type sets containing no objects as having all object flags,
-   * to spare callers from having to check this.
-   */
-  if (baseObjectCount() == 0) {
-    return true;
-  }
-
-  unsigned count = getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    ObjectKey* key = getObject(i);
-    if (key && key->hasFlags(constraints, flags)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-gc::InitialHeap ObjectGroup::initialHeap(CompilerConstraintList* constraints) {
-  // If this object is not required to be pretenured but could be in the
-  // future, add a constraint to trigger recompilation if the requirement
-  // changes.
-
-  AutoSweepObjectGroup sweep(this);
-  if (shouldPreTenure(sweep)) {
-    return gc::TenuredHeap;
-  }
-
-  if (!canPreTenure(sweep)) {
-    return gc::DefaultHeap;
-  }
-
-  HeapTypeSetKey objectProperty =
-      TypeSet::ObjectKey::get(this)->property(JSID_EMPTY);
-  LifoAlloc* alloc = constraints->alloc();
-
-  using T = CompilerConstraintInstance<ConstraintDataFreezeObjectFlags>;
-  constraints->add(
-      alloc->new_<T>(alloc, objectProperty,
-                     ConstraintDataFreezeObjectFlags(OBJECT_FLAG_PRE_TENURE)));
-
-  return gc::DefaultHeap;
-}
-
-namespace {
-
-// Constraint which triggers recompilation when a typed array's data becomes
-// invalid.
-class ConstraintDataFreezeObjectForTypedArrayData {
-  NativeObject* obj;
-
-  void* viewData;
-  uint32_t length;
-
- public:
-  explicit ConstraintDataFreezeObjectForTypedArrayData(TypedArrayObject& tarray)
-      : obj(&tarray),
-        viewData(tarray.dataPointerUnshared()),
-        length(tarray.length().deprecatedGetUint32()) {
-    MOZ_ASSERT(tarray.isSingleton());
-    MOZ_ASSERT(!tarray.isSharedMemory());
-  }
-
-  const char* kind() { return "freezeObjectForTypedArrayData"; }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return false; }
-  bool invalidateOnNewPropertyState(TypeSet* property) { return false; }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    MOZ_ASSERT(obj->group() == group);
-    TypedArrayObject& tarr = obj->as<TypedArrayObject>();
-    return tarr.dataPointerUnshared() != viewData ||
-           tarr.length().deprecatedGetUint32() != length;
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return !invalidateOnNewObjectState(sweep, property.object()->maybeGroup());
-  }
-
-  bool shouldSweep() {
-    // Note: |viewData| is only used for equality testing.
-    return IsAboutToBeFinalizedUnbarriered(&obj);
-  }
-
-  Compartment* maybeCompartment() { return obj->compartment(); }
-};
-
-} /* anonymous namespace */
-
-void TypeSet::ObjectKey::watchStateChangeForTypedArrayData(
-    CompilerConstraintList* constraints) {
-  TypedArrayObject& tarray = singleton()->as<TypedArrayObject>();
-  HeapTypeSetKey objectProperty = property(JSID_EMPTY);
-  LifoAlloc* alloc = constraints->alloc();
-
-  using T =
-      CompilerConstraintInstance<ConstraintDataFreezeObjectForTypedArrayData>;
-  constraints->add(
-      alloc->new_<T>(alloc, objectProperty,
-                     ConstraintDataFreezeObjectForTypedArrayData(tarray)));
-}
-
-static void ObjectStateChange(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                              ObjectGroup* group, bool markingUnknown) {
-  if (group->unknownProperties(sweep)) {
-    return;
-  }
-
-  /* All constraints listening to state changes are on the empty id. */
-  HeapTypeSet* types = group->maybeGetProperty(sweep, JSID_EMPTY);
-
-  /* Mark as unknown after getting the types, to avoid assertion. */
-  if (markingUnknown) {
-    group->addFlags(sweep,
-                    OBJECT_FLAG_DYNAMIC_MASK | OBJECT_FLAG_UNKNOWN_PROPERTIES);
-  }
-
-  if (types) {
-    if (!cx->isHelperThreadContext()) {
-      TypeConstraint* constraint = types->constraintList(sweep);
-      while (constraint) {
-        constraint->newObjectState(cx, group);
-        constraint = constraint->next();
-      }
-    } else {
-      MOZ_ASSERT(!types->constraintList(sweep));
-    }
-  }
-}
-
-namespace {
-
-class ConstraintDataFreezePropertyState {
- public:
-  enum Which { NON_DATA, NON_WRITABLE } which;
-
-  explicit ConstraintDataFreezePropertyState(Which which) : which(which) {}
-
-  const char* kind() {
-    return (which == NON_DATA) ? "freezeNonDataProperty"
-                               : "freezeNonWritableProperty";
-  }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return false; }
-  bool invalidateOnNewPropertyState(TypeSet* property) {
-    return (which == NON_DATA) ? property->nonDataProperty()
-                               : property->nonWritableProperty();
-  }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    return false;
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return !invalidateOnNewPropertyState(property.maybeTypes());
-  }
-
-  bool shouldSweep() { return false; }
-
-  Compartment* maybeCompartment() { return nullptr; }
-};
-
-} /* anonymous namespace */
-
-bool HeapTypeSetKey::nonData(CompilerConstraintList* constraints) {
-  if (maybeTypes() && maybeTypes()->nonDataProperty()) {
-    return true;
-  }
-
-  LifoAlloc* alloc = constraints->alloc();
-
-  using T = CompilerConstraintInstance<ConstraintDataFreezePropertyState>;
-  constraints->add(
-      alloc->new_<T>(alloc, *this,
-                     ConstraintDataFreezePropertyState(
-                         ConstraintDataFreezePropertyState::NON_DATA)));
-  return false;
-}
-
-bool HeapTypeSetKey::nonWritable(CompilerConstraintList* constraints) {
-  if (maybeTypes() && maybeTypes()->nonWritableProperty()) {
-    return true;
-  }
-
-  LifoAlloc* alloc = constraints->alloc();
-
-  using T = CompilerConstraintInstance<ConstraintDataFreezePropertyState>;
-  constraints->add(
-      alloc->new_<T>(alloc, *this,
-                     ConstraintDataFreezePropertyState(
-                         ConstraintDataFreezePropertyState::NON_WRITABLE)));
-  return false;
-}
-
-namespace {
-
-class ConstraintDataConstantProperty {
- public:
-  explicit ConstraintDataConstantProperty() = default;
-
-  const char* kind() { return "constantProperty"; }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return false; }
-  bool invalidateOnNewPropertyState(TypeSet* property) {
-    return property->nonConstantProperty();
-  }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    return false;
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return !invalidateOnNewPropertyState(property.maybeTypes());
-  }
-
-  bool shouldSweep() { return false; }
-
-  Compartment* maybeCompartment() { return nullptr; }
-};
-
-} /* anonymous namespace */
-
-bool HeapTypeSetKey::constant(CompilerConstraintList* constraints,
-                              Value* valOut) {
-  if (nonData(constraints)) {
-    return false;
-  }
-
-  // Only singleton object properties can be marked as constants.
-  JSObject* obj = object()->singleton();
-  if (!obj || !obj->isNative()) {
-    return false;
-  }
-
-  if (maybeTypes() && maybeTypes()->nonConstantProperty()) {
-    return false;
-  }
-
-  // Get the current value of the property.
-  Shape* shape = obj->as<NativeObject>().lookupPure(id());
-  if (!shape || !shape->isDataProperty() || shape->hadOverwrite()) {
-    return false;
-  }
-
-  Value val = obj->as<NativeObject>().getSlot(shape->slot());
-
-  // If the value is a pointer to an object in the nursery, don't optimize.
-  if (val.isGCThing() && IsInsideNursery(val.toGCThing())) {
-    return false;
-  }
-
-  // If the value is a string that's not atomic, don't optimize.
-  if (val.isString() && !val.toString()->isAtom()) {
-    return false;
-  }
-
-  *valOut = val;
-
-  LifoAlloc* alloc = constraints->alloc();
-  using T = CompilerConstraintInstance<ConstraintDataConstantProperty>;
-  constraints->add(
-      alloc->new_<T>(alloc, *this, ConstraintDataConstantProperty()));
-  return true;
-}
-
-// A constraint that never triggers recompilation.
-class ConstraintDataInert {
- public:
-  explicit ConstraintDataInert() = default;
-
-  const char* kind() { return "inert"; }
-
-  bool invalidateOnNewType(TypeSet::Type type) { return false; }
-  bool invalidateOnNewPropertyState(TypeSet* property) { return false; }
-  bool invalidateOnNewObjectState(const AutoSweepObjectGroup& sweep,
-                                  ObjectGroup* group) {
-    return false;
-  }
-
-  bool constraintHolds(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                       const HeapTypeSetKey& property,
-                       TemporaryTypeSet* expected) {
-    return true;
-  }
-
-  bool shouldSweep() { return false; }
-
-  Compartment* maybeCompartment() { return nullptr; }
-};
-
-bool HeapTypeSetKey::couldBeConstant(CompilerConstraintList* constraints) {
-  // Only singleton object properties can be marked as constants.
-  if (!object()->isSingleton()) {
-    return false;
-  }
-
-  if (!maybeTypes() || !maybeTypes()->nonConstantProperty()) {
-    return true;
-  }
-
-  // It is possible for a property that was not marked as constant to
-  // 'become' one, if we throw away the type property during a GC and
-  // regenerate it with the constant flag set. ObjectGroup::sweep only removes
-  // type properties if they have no constraints attached to them, so add
-  // inert constraints to pin these properties in place.
-
-  LifoAlloc* alloc = constraints->alloc();
-  using T = CompilerConstraintInstance<ConstraintDataInert>;
-  constraints->add(alloc->new_<T>(alloc, *this, ConstraintDataInert()));
-
-  return false;
-}
-
-bool TemporaryTypeSet::filtersType(const TemporaryTypeSet* other,
-                                   Type filteredType) const {
-  if (other->unknown()) {
-    return unknown();
-  }
-
-  for (TypeFlags flag = 1; flag < TYPE_FLAG_ANYOBJECT; flag <<= 1) {
-    Type type = PrimitiveTypeFromTypeFlag(flag);
-    if (type != filteredType && other->hasType(type) && !hasType(type)) {
-      return false;
-    }
-  }
-
-  if (other->unknownObject()) {
-    return unknownObject();
-  }
-
-  for (size_t i = 0; i < other->getObjectCount(); i++) {
-    ObjectKey* key = other->getObject(i);
-    if (key) {
-      Type type = ObjectType(key);
-      if (type != filteredType && !hasType(type)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-TemporaryTypeSet::DoubleConversion TemporaryTypeSet::convertDoubleElements(
-    CompilerConstraintList* constraints) {
-  if (unknownObject() || !getObjectCount()) {
-    return AmbiguousDoubleConversion;
-  }
-
-  bool alwaysConvert = true;
-  bool maybeConvert = false;
-  bool dontConvert = false;
-
-  for (unsigned i = 0; i < getObjectCount(); i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      alwaysConvert = false;
-      continue;
-    }
-
-    HeapTypeSetKey property = key->property(JSID_VOID);
-    property.freeze(constraints);
-
-    // We can't convert to double elements for objects which do not have
-    // double in their element types (as the conversion may render the type
-    // information incorrect), nor for non-array objects (as their elements
-    // may point to emptyObjectElements or emptyObjectElementsShared, which
-    // cannot be converted).
-    if (!property.maybeTypes() ||
-        !property.maybeTypes()->hasType(DoubleType()) ||
-        key->clasp() != &ArrayObject::class_) {
-      dontConvert = true;
-      alwaysConvert = false;
-      continue;
-    }
-
-    // Only bother with converting known packed arrays whose possible
-    // element types are int or double. Other arrays require type tests
-    // when elements are accessed regardless of the conversion.
-    if (property.knownMIRType(constraints) == jit::MIRType::Double &&
-        !key->hasFlags(constraints, OBJECT_FLAG_NON_PACKED)) {
-      maybeConvert = true;
-    } else {
-      alwaysConvert = false;
-    }
-  }
-
-  MOZ_ASSERT_IF(alwaysConvert, maybeConvert);
-
-  if (maybeConvert && dontConvert) {
-    return AmbiguousDoubleConversion;
-  }
-  if (alwaysConvert) {
-    return AlwaysConvertToDoubles;
-  }
-  if (maybeConvert) {
-    return MaybeConvertToDoubles;
-  }
-  return DontConvertToDoubles;
-}
-
-const JSClass* TemporaryTypeSet::getKnownClass(
-    CompilerConstraintList* constraints) {
-  if (unknownObject()) {
-    return nullptr;
-  }
-
-  const JSClass* clasp = nullptr;
-  unsigned count = getObjectCount();
-
-  for (unsigned i = 0; i < count; i++) {
-    const JSClass* nclasp = getObjectClass(i);
-    if (!nclasp) {
-      continue;
-    }
-
-    if (getObject(i)->unknownProperties()) {
-      return nullptr;
-    }
-
-    if (clasp && clasp != nclasp) {
-      return nullptr;
-    }
-    clasp = nclasp;
-  }
-
-  if (clasp) {
-    for (unsigned i = 0; i < count; i++) {
-      ObjectKey* key = getObject(i);
-      if (key && !key->hasStableClassAndProto(constraints)) {
-        return nullptr;
-      }
-    }
-  }
-
-  return clasp;
-}
-
-Realm* TemporaryTypeSet::getKnownRealm(CompilerConstraintList* constraints) {
-  if (unknownObject()) {
-    return nullptr;
-  }
-
-  Realm* realm = nullptr;
-  unsigned count = getObjectCount();
-
-  for (unsigned i = 0; i < count; i++) {
-    const JSClass* clasp = getObjectClass(i);
-    if (!clasp) {
-      continue;
-    }
-
-    // If clasp->isProxy(), this might be a cross-compartment wrapper and
-    // CCWs don't have a (single) realm, so we give up. If the object has
-    // unknownProperties(), hasStableClassAndProto (called below) will
-    // return |false| so fail now before attaching any constraints.
-    if (clasp->isProxy() || getObject(i)->unknownProperties()) {
-      return nullptr;
-    }
-
-    MOZ_ASSERT(hasSingleton(i) || hasGroup(i));
-
-    Realm* nrealm =
-        hasSingleton(i) ? getSingleton(i)->nonCCWRealm() : getGroup(i)->realm();
-    MOZ_ASSERT(nrealm);
-    if (!realm) {
-      realm = nrealm;
-      continue;
-    }
-    if (realm != nrealm) {
-      return nullptr;
-    }
-  }
-
-  if (realm) {
-    for (unsigned i = 0; i < count; i++) {
-      ObjectKey* key = getObject(i);
-      if (key && !key->hasStableClassAndProto(constraints)) {
-        return nullptr;
-      }
-    }
-  }
-
-  return realm;
-}
-
-void TemporaryTypeSet::getTypedArraySharedness(
-    CompilerConstraintList* constraints, TypedArraySharedness* sharedness) {
-  // In the future this will inspect the object set.
-  *sharedness = UnknownSharedness;
-}
-
-TemporaryTypeSet::ForAllResult TemporaryTypeSet::forAllClasses(
-    CompilerConstraintList* constraints, bool (*func)(const JSClass* clasp)) {
-  if (unknownObject()) {
-    return ForAllResult::MIXED;
-  }
-
-  unsigned count = getObjectCount();
-  if (count == 0) {
-    return ForAllResult::EMPTY;
-  }
-
-  bool true_results = false;
-  bool false_results = false;
-  for (unsigned i = 0; i < count; i++) {
-    const JSClass* clasp = getObjectClass(i);
-    if (!clasp) {
-      continue;
-    }
-    if (!getObject(i)->hasStableClassAndProto(constraints)) {
-      return ForAllResult::MIXED;
-    }
-    if (func(clasp)) {
-      true_results = true;
-      if (false_results) {
-        return ForAllResult::MIXED;
-      }
-    } else {
-      false_results = true;
-      if (true_results) {
-        return ForAllResult::MIXED;
-      }
-    }
-  }
-
-  MOZ_ASSERT(true_results != false_results);
-
-  return true_results ? ForAllResult::ALL_TRUE : ForAllResult::ALL_FALSE;
-}
-
-Scalar::Type TemporaryTypeSet::getTypedArrayType(
-    CompilerConstraintList* constraints, TypedArraySharedness* sharedness) {
-  const JSClass* clasp = getKnownClass(constraints);
-
-  if (clasp && IsTypedArrayClass(clasp)) {
-    if (sharedness) {
-      getTypedArraySharedness(constraints, sharedness);
-    }
-    return GetTypedArrayClassType(clasp);
-  }
-  return Scalar::MaxTypedArrayViewType;
-}
-
-bool TemporaryTypeSet::isDOMClass(CompilerConstraintList* constraints,
-                                  DOMObjectKind* kind) {
-  if (unknownObject()) {
-    return false;
-  }
-
-  *kind = DOMObjectKind::Unknown;
-  bool isFirst = true;
-
-  unsigned count = getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    const JSClass* clasp = getObjectClass(i);
-    if (!clasp) {
-      continue;
-    }
-    if (!clasp->isDOMClass() ||
-        !getObject(i)->hasStableClassAndProto(constraints)) {
-      return false;
-    }
-
-    DOMObjectKind thisKind =
-        clasp->isProxy() ? DOMObjectKind::Proxy : DOMObjectKind::Native;
-    if (isFirst) {
-      *kind = thisKind;
-      isFirst = false;
-      continue;
-    }
-    if (*kind != thisKind) {
-      *kind = DOMObjectKind::Unknown;
-    }
-  }
-
-  return count > 0;
-}
-
-bool TemporaryTypeSet::maybeCallable(CompilerConstraintList* constraints) {
-  if (!maybeObject()) {
-    return false;
-  }
-
-  if (unknownObject()) {
-    return true;
-  }
-
-  unsigned count = getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    const JSClass* clasp = getObjectClass(i);
-    if (!clasp) {
-      continue;
-    }
-    if (clasp->isProxy() || clasp->nonProxyCallable()) {
-      return true;
-    }
-    if (!getObject(i)->hasStableClassAndProto(constraints)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool TemporaryTypeSet::maybeEmulatesUndefined(
-    CompilerConstraintList* constraints) {
-  if (!maybeObject()) {
-    return false;
-  }
-
-  if (unknownObject()) {
-    return true;
-  }
-
-  unsigned count = getObjectCount();
-  for (unsigned i = 0; i < count; i++) {
-    // The object emulates undefined if clasp->emulatesUndefined() or if
-    // it's a WrapperObject, see EmulatesUndefined. Since all wrappers are
-    // proxies, we can just check for that.
-    const JSClass* clasp = getObjectClass(i);
-    if (!clasp) {
-      continue;
-    }
-    if (clasp->emulatesUndefined() || clasp->isProxy()) {
-      return true;
-    }
-    if (!getObject(i)->hasStableClassAndProto(constraints)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool TemporaryTypeSet::getCommonPrototype(CompilerConstraintList* constraints,
-                                          JSObject** proto) {
-  if (unknownObject()) {
-    return false;
-  }
-
-  *proto = nullptr;
-  bool isFirst = true;
-  unsigned count = getObjectCount();
-
-  for (unsigned i = 0; i < count; i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return false;
-    }
-
-    TaggedProto nproto = key->proto();
-    if (isFirst) {
-      if (nproto.isDynamic()) {
-        return false;
-      }
-      *proto = nproto.toObjectOrNull();
-      isFirst = false;
-    } else {
-      if (nproto != TaggedProto(*proto)) {
-        return false;
-      }
-    }
-  }
-
-  // Guard against mutating __proto__.
-  for (unsigned i = 0; i < count; i++) {
-    if (ObjectKey* key = getObject(i)) {
-      MOZ_ALWAYS_TRUE(key->hasStableClassAndProto(constraints));
-    }
-  }
-
-  return true;
-}
-
-bool TemporaryTypeSet::propertyNeedsBarrier(CompilerConstraintList* constraints,
-                                            jsid id) {
-  if (unknownObject()) {
-    return true;
-  }
-
-  for (unsigned i = 0; i < getObjectCount(); i++) {
-    ObjectKey* key = getObject(i);
-    if (!key) {
-      continue;
-    }
-
-    if (key->unknownProperties()) {
-      return true;
-    }
-
-    HeapTypeSetKey property = key->property(id);
-    if (property.needsBarrier(constraints)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool js::ClassCanHaveExtraProperties(const JSClass* clasp) {
-  return clasp->getResolve() || clasp->getOpsLookupProperty() ||
-         clasp->getOpsGetProperty() || IsTypedArrayClass(clasp);
-}
-
-void TypeZone::processPendingRecompiles(JSFreeOp* fop,
-                                        RecompileInfoVector& recompiles) {
-  MOZ_ASSERT(!recompiles.empty());
-
-  // Steal the list of scripts to recompile, to make sure we don't try to
-  // recursively recompile them. Note: the move constructor will not reset the
-  // length if the Vector is using inline storage, so we also use clear().
-  RecompileInfoVector pending(std::move(recompiles));
-  recompiles.clear();
-
-  jit::Invalidate(*this, fop, pending);
-
-  MOZ_ASSERT(recompiles.empty());
-}
-
-void TypeZone::addPendingRecompile(JSContext* cx, const RecompileInfo& info) {
-  InferSpew(ISpewOps, "addPendingRecompile: %p:%s:%u", info.script(),
-            info.script()->filename(), info.script()->lineno());
-
-  AutoEnterOOMUnsafeRegion oomUnsafe;
-  RecompileInfoVector& vector =
-      cx->zone()->types.activeAnalysis->pendingRecompiles;
-  if (!vector.append(info)) {
-    // BUG 1536159: For diagnostics, compute the size of the failed allocation.
-    // This presumes the vector growth strategy is to double. This is only used
-    // for crash reporting so not a problem if we get it wrong.
-    size_t allocSize = 2 * sizeof(RecompileInfo) * vector.capacity();
-    oomUnsafe.crash(allocSize, "Could not update pendingRecompiles");
-  }
-}
-
-void TypeZone::addPendingRecompile(JSContext* cx, JSScript* script) {
-  MOZ_ASSERT(script);
-
-  CancelOffThreadIonCompile(script);
-
-  // Let the script warm up again before attempting another compile.
-  script->resetWarmUpCounterToDelayIonCompilation();
-
-  if (JitScript* jitScript = script->maybeJitScript()) {
-    // Trigger recompilation of the IonScript.
-    if (jitScript->hasIonScript()) {
-      addPendingRecompile(
-          cx, RecompileInfo(script, jitScript->ionScript()->compilationId()));
-    }
-
-    // Trigger recompilation of any callers inlining this script.
-    AutoSweepJitScript sweep(script);
-    RecompileInfoVector* inlinedCompilations =
-        jitScript->maybeInlinedCompilations(sweep);
-    if (inlinedCompilations) {
-      for (const RecompileInfo& info : *inlinedCompilations) {
-        addPendingRecompile(cx, info);
-      }
-      inlinedCompilations->clearAndFree();
-    }
-  }
-}
-
-#ifdef JS_CRASH_DIAGNOSTICS
-void js::ReportMagicWordFailure(uintptr_t actual, uintptr_t expected) {
-  MOZ_CRASH_UNSAFE_PRINTF("Got 0x%" PRIxPTR " expected magic word 0x%" PRIxPTR,
-                          actual, expected);
-}
-
-void js::ReportMagicWordFailure(uintptr_t actual, uintptr_t expected,
-                                uintptr_t flags, uintptr_t objectSet) {
-  MOZ_CRASH_UNSAFE_PRINTF("Got 0x%" PRIxPTR " expected magic word 0x%" PRIxPTR
-                          " flags 0x%" PRIxPTR " objectSet 0x%" PRIxPTR,
-                          actual, expected, flags, objectSet);
-}
-#endif
-
-void js::PrintTypes(JSContext* cx, Compartment* comp, bool force) {
-#ifdef DEBUG
-  gc::AutoSuppressGC suppressGC(cx);
-
-  Zone* zone = comp->zone();
-  AutoEnterAnalysis enter(nullptr, zone);
-
-  if (!force && !InferSpewActive(ISpewResult)) {
-    return;
-  }
-
-  RootedScript script(cx);
-  for (auto base = zone->cellIter<BaseScript>(); !base.done(); base.next()) {
-    if (JitScript* jitScript = base->maybeJitScript()) {
-      script = base->asJSScript();
-      jitScript->printTypes(cx, script);
-    }
-  }
-
-  for (auto group = zone->cellIter<ObjectGroup>(); !group.done();
-       group.next()) {
-    AutoSweepObjectGroup sweep(group);
-    group->print(sweep);
-  }
-#endif
-}
-
-/////////////////////////////////////////////////////////////////////
-// ObjectGroup
-/////////////////////////////////////////////////////////////////////
-
-static inline void UpdatePropertyType(const AutoSweepObjectGroup& sweep,
-                                      JSContext* cx, HeapTypeSet* types,
-                                      NativeObject* obj, Shape* shape,
-                                      bool indexed) {
-  MOZ_ASSERT(obj->isSingleton() && !obj->hasLazyGroup());
-
-  if (!shape->writable()) {
-    types->setNonWritableProperty(sweep, cx);
-  }
-
-  if (shape->hasGetterValue() || shape->hasSetterValue()) {
-    types->setNonDataProperty(sweep, cx);
-    types->TypeSet::addType(TypeSet::UnknownType(), &cx->typeLifoAlloc());
-  } else if (shape->isDataProperty()) {
-    if (!indexed && types->canSetDefinite(shape->slot())) {
-      types->setDefinite(shape->slot());
-    }
-
-    const Value& value = obj->getSlot(shape->slot());
-
-    /*
-     * Don't add initial undefined types for properties of global objects
-     * that are not collated into the JSID_VOID property (see propertySet
-     * comment).
-     *
-     * Also don't add untracked values (initial uninitialized lexical magic
-     * values and optimized out values) as appearing in CallObjects, module
-     * environments or the global lexical scope.
-     */
-    MOZ_ASSERT_IF(TypeSet::IsUntrackedValue(value),
-                  obj->is<CallObject>() || obj->is<ModuleEnvironmentObject>() ||
-                      IsExtensibleLexicalEnvironment(obj));
-    if ((indexed || !value.isUndefined() ||
-         !CanHaveEmptyPropertyTypesForOwnProperty(obj)) &&
-        !TypeSet::IsUntrackedValue(value)) {
-      TypeSet::Type type = TypeSet::GetValueType(value);
-      types->TypeSet::addType(type, &cx->typeLifoAlloc());
-      types->postWriteBarrier(cx, type);
-    }
-
-    if (indexed || shape->hadOverwrite()) {
-      types->setNonConstantProperty(sweep, cx);
-    } else {
-      InferSpew(ISpewOps, "typeSet: %sT%p%s property %s %s - setConstant",
-                InferSpewColor(types), types, InferSpewColorReset(),
-                TypeSet::ObjectGroupString(obj->group()).get(),
-                TypeIdString(shape->propid()));
-    }
-  }
-}
-
-void ObjectGroup::updateNewPropertyTypes(const AutoSweepObjectGroup& sweep,
-                                         JSContext* cx, JSObject* objArg,
-                                         jsid id, HeapTypeSet* types) {
-  InferSpew(ISpewOps, "typeSet: %sT%p%s property %s %s", InferSpewColor(types),
-            types, InferSpewColorReset(),
-            TypeSet::ObjectGroupString(this).get(), TypeIdString(id));
-
-  MOZ_ASSERT_IF(objArg, objArg->group() == this);
-  MOZ_ASSERT_IF(singleton(), objArg);
-
-  if (!singleton() || !objArg->isNative()) {
-    types->setNonConstantProperty(sweep, cx);
-    return;
-  }
-
-  NativeObject* obj = &objArg->as<NativeObject>();
-
-  /*
-   * Fill the property in with any type the object already has in an own
-   * property. We are only interested in plain native properties and
-   * dense elements which don't go through a barrier when read by the VM
-   * or jitcode.
-   */
-
-  if (JSID_IS_VOID(id)) {
-    /* Go through all shapes on the object to get integer-valued properties. */
-    RootedShape shape(cx, obj->lastProperty());
-    while (!shape->isEmptyShape()) {
-      if (JSID_IS_VOID(IdToTypeId(shape->propid()))) {
-        UpdatePropertyType(sweep, cx, types, obj, shape, true);
-      }
-      shape = shape->previous();
-    }
-
-    /* Also get values of any dense elements in the object. */
-    for (size_t i = 0; i < obj->getDenseInitializedLength(); i++) {
-      const Value& value = obj->getDenseElement(i);
-      if (!value.isMagic(JS_ELEMENTS_HOLE)) {
-        TypeSet::Type type = TypeSet::GetValueType(value);
-        types->TypeSet::addType(type, &cx->typeLifoAlloc());
-        types->postWriteBarrier(cx, type);
-      }
-    }
-  } else if (!JSID_IS_EMPTY(id)) {
-    RootedId rootedId(cx, id);
-    Shape* shape = obj->lookup(cx, rootedId);
-    if (shape) {
-      UpdatePropertyType(sweep, cx, types, obj, shape, false);
-    }
-  }
-}
-
-void ObjectGroup::addDefiniteProperties(JSContext* cx, Shape* shape) {
-  AutoSweepObjectGroup sweep(this);
-  if (unknownProperties(sweep)) {
-    return;
-  }
-
-  // Mark all properties of shape as definite properties of this group.
-  AutoEnterAnalysis enter(cx);
-
-  while (!shape->isEmptyShape()) {
-    jsid id = IdToTypeId(shape->propid());
-    if (!JSID_IS_VOID(id)) {
-      MOZ_ASSERT_IF(shape->slot() >= shape->numFixedSlots(),
-                    shape->numFixedSlots() == NativeObject::MAX_FIXED_SLOTS);
-      TypeSet* types = getProperty(sweep, cx, nullptr, id);
-      if (!types) {
-        MOZ_ASSERT(unknownProperties(sweep));
-        return;
-      }
-      if (types->canSetDefinite(shape->slot())) {
-        types->setDefinite(shape->slot());
-      }
-    }
-
-    shape = shape->previous();
-  }
-}
-
-void js::AddTypePropertyId(JSContext* cx, ObjectGroup* group, JSObject* obj,
-                           jsid id, TypeSet::Type type) {
-  MOZ_ASSERT(id == IdToTypeId(id));
-
-  AutoSweepObjectGroup sweep(group);
-  if (group->unknownProperties(sweep)) {
-    return;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  HeapTypeSet* types = group->getProperty(sweep, cx, obj, id);
-  if (!types) {
-    return;
-  }
-
-  // Clear any constant flag if it exists.
-  if (!types->empty() && !types->nonConstantProperty()) {
-    InferSpew(ISpewOps, "constantMutated: %sT%p%s %s", InferSpewColor(types),
-              types, InferSpewColorReset(), TypeSet::TypeString(type).get());
-    types->setNonConstantProperty(sweep, cx);
-  }
-
-  if (types->hasType(type)) {
-    return;
-  }
-
-  InferSpew(ISpewOps, "externalType: property %s %s: %s",
-            TypeSet::ObjectGroupString(group).get(), TypeIdString(id),
-            TypeSet::TypeString(type).get());
-  types->addType(sweep, cx, type);
-
-  // If this addType caused the type set to be marked as containing any
-  // object, make sure that is reflected in other type sets the addType is
-  // propagated to below.
-  if (type.isObjectUnchecked() && types->unknownObject()) {
-    type = TypeSet::AnyObjectType();
-  }
-
-  // Propagate new types from partially initialized groups to fully
-  // initialized groups for the acquired properties analysis. Note that we
-  // don't need to do this for other property changes, as these will also be
-  // reflected via shape changes on the object that will prevent the object
-  // from acquiring the fully initialized group.
-  if (group->newScript(sweep) && group->newScript(sweep)->initializedGroup()) {
-    AddTypePropertyId(cx, group->newScript(sweep)->initializedGroup(), nullptr,
-                      id, type);
-  }
-}
-
-void js::AddTypePropertyId(JSContext* cx, ObjectGroup* group, JSObject* obj,
-                           jsid id, const Value& value) {
-  AddTypePropertyId(cx, group, obj, id, TypeSet::GetValueType(value));
-}
-
-void js::AddMagicTypePropertyId(JSContext* cx, JSObject* obj, jsid id,
-                                JSWhyMagic type) {
-  // Some MagicValues can be stored in environment object slots but are not
-  // exposed to script. We don't want to add MagicValue types to HeapTypeSets
-  // but there's one case we need to handle: Ion can add a freeze constraint to
-  // the global lexical environment (in IonBuilder::testGlobalLexicalBinding) to
-  // guard a lexical binding does not exist, so we need to trigger this
-  // constraint when defining an uninitialized lexical as part of JSOP_DEFLET or
-  // JSOP_DEFCONST.
-  //
-  // Also note that the global lexical is the only environment object for which
-  // we track property types. See CreateEnvironmentObject.
-
-  MOZ_ASSERT(type == JS_UNINITIALIZED_LEXICAL || type == JS_OPTIMIZED_OUT);
-  MOZ_ASSERT(obj->is<EnvironmentObject>());
-
-  if (type != JS_UNINITIALIZED_LEXICAL) {
-    return;
-  }
-
-  id = IdToTypeId(id);
-  if (!TrackPropertyTypes(obj, id)) {
-    return;
-  }
-
-  MOZ_ASSERT(obj->isSingleton());
-  MOZ_ASSERT(obj->is<LexicalEnvironmentObject>());
-  MOZ_ASSERT(obj->as<LexicalEnvironmentObject>().isGlobal());
-
-  AutoEnterAnalysis enter(cx);
-  AutoSweepObjectGroup sweep(obj->group());
-
-  if (HeapTypeSet* types = obj->group()->maybeGetProperty(sweep, id)) {
-    types->markLexicalBindingExists(sweep, cx);
-  }
-}
-
-void ObjectGroup::markPropertyNonData(JSContext* cx, JSObject* obj, jsid id) {
-  AutoEnterAnalysis enter(cx);
-
-  id = IdToTypeId(id);
-
-  AutoSweepObjectGroup sweep(this);
-  HeapTypeSet* types = getProperty(sweep, cx, obj, id);
-  if (types) {
-    types->setNonDataProperty(sweep, cx);
-  }
-}
-
-void ObjectGroup::markPropertyNonWritable(JSContext* cx, JSObject* obj,
-                                          jsid id) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  AutoEnterAnalysis enter(cx);
-
-  id = IdToTypeId(id);
-
-  AutoSweepObjectGroup sweep(this);
-  HeapTypeSet* types = getProperty(sweep, cx, obj, id);
-  if (types) {
-    types->setNonWritableProperty(sweep, cx);
-  }
-}
-
-void ObjectGroup::markStateChange(const AutoSweepObjectGroup& sweep,
-                                  JSContext* cx) {
-  MOZ_ASSERT(cx->compartment() == compartment());
-
-  if (unknownProperties(sweep)) {
-    return;
-  }
-
-  AutoEnterAnalysis enter(cx);
-  HeapTypeSet* types = maybeGetProperty(sweep, JSID_EMPTY);
-  if (types) {
-    if (!cx->isHelperThreadContext()) {
-      TypeConstraint* constraint = types->constraintList(sweep);
-      while (constraint) {
-        constraint->newObjectState(cx, this);
-        constraint = constraint->next();
-      }
-    } else {
-      MOZ_ASSERT(!types->constraintList(sweep));
-    }
-  }
-}
-
-void ObjectGroup::setFlags(const AutoSweepObjectGroup& sweep, JSContext* cx,
-                           ObjectGroupFlags flags) {
-  MOZ_ASSERT(!(flags & OBJECT_FLAG_UNKNOWN_PROPERTIES),
-             "Should use markUnknown to set unknownProperties");
-
-  if (hasAllFlags(sweep, flags)) {
-    return;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  addFlags(sweep, flags);
-
-  InferSpew(ISpewOps, "%s: setFlags 0x%x",
-            TypeSet::ObjectGroupString(this).get(), flags);
-
-  ObjectStateChange(sweep, cx, this, false);
-
-  // Propagate flag changes from partially to fully initialized groups for the
-  // acquired properties analysis.
-  if (newScript(sweep) && newScript(sweep)->initializedGroup()) {
-    AutoSweepObjectGroup sweepInit(newScript(sweep)->initializedGroup());
-    newScript(sweep)->initializedGroup()->setFlags(sweepInit, cx, flags);
-  }
-}
-
-void ObjectGroup::markUnknown(const AutoSweepObjectGroup& sweep,
-                              JSContext* cx) {
-  AutoEnterAnalysis enter(cx);
-
-  MOZ_ASSERT(cx->zone()->types.activeAnalysis);
-  MOZ_ASSERT(!unknownProperties(sweep));
-
-  InferSpew(ISpewOps, "UnknownProperties: %s",
-            TypeSet::ObjectGroupString(this).get());
-
-  clearNewScript(cx);
-  ObjectStateChange(sweep, cx, this, true);
-
-  /*
-   * Existing constraints may have already been added to this object, which we
-   * need to do the right thing for. We can't ensure that we will mark all
-   * unknown objects before they have been accessed, as the __proto__ of a known
-   * object could be dynamically set to an unknown object, and we can decide to
-   * ignore properties of an object during analysis (i.e. hashmaps). Adding
-   * unknown for any properties accessed already accounts for possible values
-   * read from them.
-   */
-
-  unsigned count = getPropertyCount(sweep);
-  for (unsigned i = 0; i < count; i++) {
-    Property* prop = getProperty(sweep, i);
-    if (prop) {
-      prop->types.addType(sweep, cx, TypeSet::UnknownType());
-      prop->types.setNonDataProperty(sweep, cx);
-    }
-  }
-
-  clearProperties(sweep);
-}
-
-void ObjectGroup::detachNewScript(bool isSweeping, ObjectGroup* replacement) {
-  // Clear the TypeNewScript from this ObjectGroup and, if it has been
-  // analyzed, remove it from the newObjectGroups table so that it will not be
-  // produced by calling 'new' on the associated function anymore.
-  // The TypeNewScript is not actually destroyed.
-  AutoSweepObjectGroup sweep(this);
-  TypeNewScript* newScript = this->newScript(sweep);
-  MOZ_ASSERT(newScript);
-
-  if (newScript->analyzed()) {
-    ObjectGroupRealm& objectGroups = ObjectGroupRealm::get(this);
-    const JSClass* clasp = this->clasp();
-    MOZ_ASSERT(clasp == &PlainObject::class_);
-    TaggedProto proto = this->proto();
-    if (proto.isObject() && IsForwarded(proto.toObject())) {
-      proto = TaggedProto(Forwarded(proto.toObject()));
-    }
-    JSObject* associated = MaybeForwarded(newScript->function());
-    if (replacement) {
-      AutoSweepObjectGroup sweepReplacement(replacement);
-      MOZ_ASSERT(replacement->newScript(sweepReplacement)->function() ==
-                 newScript->function());
-      objectGroups.replaceDefaultNewGroup(clasp, proto, associated,
-                                          replacement);
-    } else {
-      objectGroups.removeDefaultNewGroup(clasp, proto, associated);
-    }
-  } else {
-    MOZ_ASSERT(!replacement);
-  }
-
-  setAddendum(Addendum_None, nullptr, isSweeping);
-}
-
-void ObjectGroup::maybeClearNewScriptOnOOM() {
-  MOZ_ASSERT(zone()->isGCSweepingOrCompacting());
-
-  if (!isMarkedAny()) {
-    return;
-  }
-
-  AutoSweepObjectGroup sweep(this);
-  TypeNewScript* newScript = this->newScript(sweep);
-  if (!newScript) {
-    return;
-  }
-
-  addFlags(sweep, OBJECT_FLAG_NEW_SCRIPT_CLEARED);
-
-  // This method is called during GC sweeping, so don't trigger pre barriers.
-  detachNewScript(/* isSweeping = */ true, nullptr);
-
-  js_delete(newScript);
-}
-
-void ObjectGroup::clearNewScript(JSContext* cx,
-                                 ObjectGroup* replacement /* = nullptr*/) {
-  AutoSweepObjectGroup sweep(this);
-  TypeNewScript* newScript = this->newScript(sweep);
-  if (!newScript) {
-    return;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  if (!replacement) {
-    // Invalidate any Ion code constructing objects of this type.
-    setFlags(sweep, cx, OBJECT_FLAG_NEW_SCRIPT_CLEARED);
-
-    // Mark the constructing function as having its 'new' script cleared, so we
-    // will not try to construct another one later.
-    newScript->function()->setNewScriptCleared();
-  }
-
-  detachNewScript(/* isSweeping = */ false, replacement);
-
-  if (!cx->isHelperThreadContext()) {
-    bool found = newScript->rollbackPartiallyInitializedObjects(cx, this);
-
-    // If we managed to rollback any partially initialized objects, then
-    // any definite properties we added due to analysis of the new script
-    // are now invalid, so remove them. If there weren't any partially
-    // initialized objects then we don't need to change type information,
-    // as no more objects of this type will be created and the 'new' script
-    // analysis was still valid when older objects were created.
-    if (found) {
-      for (unsigned i = 0; i < getPropertyCount(sweep); i++) {
-        Property* prop = getProperty(sweep, i);
-        if (!prop) {
-          continue;
-        }
-        if (prop->types.definiteProperty()) {
-          prop->types.setNonDataProperty(sweep, cx);
-        }
-      }
-    }
-  } else {
-    // Helper threads are not allowed to run scripts.
-    MOZ_ASSERT(!cx->activation());
-  }
-
-  js_delete(newScript);
-  markStateChange(sweep, cx);
-}
-
-void ObjectGroup::print(const AutoSweepObjectGroup& sweep) {
-  TaggedProto tagged(proto());
-  fprintf(
-      stderr, "%s : %s", TypeSet::ObjectGroupString(this).get(),
-      tagged.isObject()
-          ? TypeSet::TypeString(TypeSet::ObjectType(tagged.toObject())).get()
-          : tagged.isDynamic() ? "(dynamic)" : "(null)");
-
-  if (unknownProperties(sweep)) {
-    fprintf(stderr, " unknown");
-  } else {
-    if (!hasAnyFlags(sweep, OBJECT_FLAG_SPARSE_INDEXES)) {
-      fprintf(stderr, " dense");
-    }
-    if (!hasAnyFlags(sweep, OBJECT_FLAG_NON_PACKED)) {
-      fprintf(stderr, " packed");
-    }
-    if (!hasAnyFlags(sweep, OBJECT_FLAG_LENGTH_OVERFLOW)) {
-      fprintf(stderr, " noLengthOverflow");
-    }
-    if (hasAnyFlags(sweep, OBJECT_FLAG_ITERATED)) {
-      fprintf(stderr, " iterated");
-    }
-    if (maybeInterpretedFunction()) {
-      fprintf(stderr, " ifun");
-    }
-  }
-
-  unsigned count = getPropertyCount(sweep);
-
-  if (count == 0) {
-    fprintf(stderr, " {}\n");
-    return;
-  }
-
-  fprintf(stderr, " {");
-
-  if (newScript(sweep)) {
-    if (newScript(sweep)->analyzed()) {
-      fprintf(stderr, "\n    newScript %d properties",
-              (int)newScript(sweep)->templateObject()->slotSpan());
-      if (newScript(sweep)->initializedGroup()) {
-        fprintf(stderr, " initializedGroup %#" PRIxPTR " with %d properties",
-                uintptr_t(newScript(sweep)->initializedGroup()),
-                int(newScript(sweep)->initializedShape()->slotSpan()));
-      }
-    } else {
-      fprintf(stderr, "\n    newScript unanalyzed");
-    }
-  }
-
-  for (unsigned i = 0; i < count; i++) {
-    Property* prop = getProperty(sweep, i);
-    if (prop) {
-      fprintf(stderr, "\n    %s:", TypeIdString(prop->id));
-      prop->types.print();
-    }
-  }
-
-  fprintf(stderr, "\n}\n");
-}
-
-/////////////////////////////////////////////////////////////////////
-// Type Analysis
-/////////////////////////////////////////////////////////////////////
-
-/*
- * Persistent constraint clearing out newScript and definite properties from
- * an object should a property on another object get a getter or setter.
- */
-class TypeConstraintClearDefiniteGetterSetter : public TypeConstraint {
- public:
-  ObjectGroup* group;
-
-  explicit TypeConstraintClearDefiniteGetterSetter(ObjectGroup* group)
-      : group(group) {}
-
-  const char* kind() override { return "clearDefiniteGetterSetter"; }
-
-  void newPropertyState(JSContext* cx, TypeSet* source) override {
-    /*
-     * Clear out the newScript shape and definite property information from
-     * an object if the source type set could be a setter or could be
-     * non-writable.
-     */
-    if (source->nonDataProperty() || source->nonWritableProperty()) {
-      group->clearNewScript(cx);
-    }
-  }
-
-  void newType(JSContext* cx, TypeSet* source, TypeSet::Type type) override {}
-
-  bool sweep(TypeZone& zone, TypeConstraint** res) override {
-    if (IsAboutToBeFinalizedUnbarriered(&group)) {
-      return false;
-    }
-    *res = zone.typeLifoAlloc().new_<TypeConstraintClearDefiniteGetterSetter>(
-        group);
-    return true;
-  }
-
-  Compartment* maybeCompartment() override { return group->compartment(); }
-};
-
-bool js::AddClearDefiniteGetterSetterForPrototypeChain(
-    JSContext* cx, DPAConstraintInfo& constraintInfo, ObjectGroup* group,
-    HandleId id, bool* added) {
-  /*
-   * Ensure that if the properties named here could have a getter, setter or
-   * a permanent property in any transitive prototype, the definite
-   * properties get cleared from the group.
-   */
-
-  *added = false;
-
-  RootedObject proto(cx, group->proto().toObjectOrNull());
-  while (proto) {
-    if (!proto->hasStaticPrototype()) {
-      return true;
-    }
-    ObjectGroup* protoGroup = JSObject::getGroup(cx, proto);
-    if (!protoGroup) {
-      return false;
-    }
-    AutoSweepObjectGroup sweep(protoGroup);
-    if (protoGroup->unknownProperties(sweep)) {
-      return true;
-    }
-    HeapTypeSet* protoTypes = protoGroup->getProperty(sweep, cx, proto, id);
-    if (!protoTypes) {
-      return false;
-    }
-    if (protoTypes->nonDataProperty() || protoTypes->nonWritableProperty()) {
-      return true;
-    }
-    if (!constraintInfo.addProtoConstraint(proto, id)) {
-      return false;
-    }
-    proto = proto->staticPrototype();
-  }
-
-  *added = true;
-  return true;
-}
-
-/*
- * Constraint which clears definite properties on a group should a type set
- * contain any types other than a single object.
- */
-class TypeConstraintClearDefiniteSingle : public TypeConstraint {
- public:
-  ObjectGroup* group;
-
-  explicit TypeConstraintClearDefiniteSingle(ObjectGroup* group)
-      : group(group) {}
-
-  const char* kind() override { return "clearDefiniteSingle"; }
-
-  void newType(JSContext* cx, TypeSet* source, TypeSet::Type type) override {
-    if (source->baseFlags() || source->getObjectCount() > 1) {
-      group->clearNewScript(cx);
-    }
-  }
-
-  bool sweep(TypeZone& zone, TypeConstraint** res) override {
-    if (IsAboutToBeFinalizedUnbarriered(&group)) {
-      return false;
-    }
-    *res = zone.typeLifoAlloc().new_<TypeConstraintClearDefiniteSingle>(group);
-    return true;
-  }
-
-  Compartment* maybeCompartment() override { return group->compartment(); }
-};
-
-bool js::AddClearDefiniteFunctionUsesInScript(JSContext* cx, ObjectGroup* group,
-                                              JSScript* script,
-                                              JSScript* calleeScript) {
-  // Look for any uses of the specified calleeScript in type sets for
-  // |script|, and add constraints to ensure that if the type sets' contents
-  // change then the definite properties are cleared from the type.
-  // This ensures that the inlining performed when the definite properties
-  // analysis was done is stable. We only need to look at type sets which
-  // contain a single object, as IonBuilder does not inline polymorphic sites
-  // during the definite properties analysis.
-
-  TypeSet::ObjectKey* calleeKey =
-      TypeSet::ObjectType(calleeScript->function()).objectKey();
-
-  AutoSweepJitScript sweep(script);
-  JitScript* jitScript = script->jitScript();
-  unsigned count = jitScript->numTypeSets();
-  StackTypeSet* typeArray = jitScript->typeArray(sweep);
-
-  for (unsigned i = 0; i < count; i++) {
-    StackTypeSet* types = &typeArray[i];
-    if (!types->unknownObject() && types->getObjectCount() == 1) {
-      if (calleeKey != types->getObject(0)) {
-        // Also check if the object is the Function.call or
-        // Function.apply native. IonBuilder uses the presence of these
-        // functions during inlining.
-        JSObject* singleton = types->getSingleton(0);
-        if (!singleton || !singleton->is<JSFunction>()) {
-          continue;
-        }
-        JSFunction* fun = &singleton->as<JSFunction>();
-        if (!fun->isNative()) {
-          continue;
-        }
-        if (fun->native() != fun_call && fun->native() != fun_apply) {
-          continue;
-        }
-      }
-      // This is a type set that might have been used when inlining
-      // |calleeScript| into |script|.
-      if (!types->addConstraint(
-              cx, cx->typeLifoAlloc().new_<TypeConstraintClearDefiniteSingle>(
-                      group))) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-/////////////////////////////////////////////////////////////////////
-// Interface functions
-/////////////////////////////////////////////////////////////////////
-
-void js::TypeMonitorCallSlow(JSContext* cx, JSObject* callee,
-                             const CallArgs& args, bool constructing) {
-  unsigned nargs = callee->as<JSFunction>().nargs();
-  JSScript* script = callee->as<JSFunction>().nonLazyScript();
-
-  if (!constructing) {
-    JitScript::MonitorThisType(cx, script, args.thisv());
-  }
-
-  /*
-   * Add constraints going up to the minimum of the actual and formal count.
-   * If there are more actuals than formals the later values can only be
-   * accessed through the arguments object, which is monitored.
-   */
-  unsigned arg = 0;
-  for (; arg < args.length() && arg < nargs; arg++) {
-    JitScript::MonitorArgType(cx, script, arg, args[arg]);
-  }
-
-  /* Watch for fewer actuals than formals to the call. */
-  for (; arg < nargs; arg++) {
-    JitScript::MonitorArgType(cx, script, arg, UndefinedValue());
-  }
-}
-
-/* static */
-void JitScript::MonitorBytecodeType(JSContext* cx, JSScript* script,
-                                    jsbytecode* pc, TypeSet::Type type) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  cx->check(script, type);
-
-  AutoEnterAnalysis enter(cx);
-
-  AutoSweepJitScript sweep(script);
-  StackTypeSet* types = script->jitScript()->bytecodeTypes(sweep, script, pc);
-  if (types->hasType(type)) {
-    return;
-  }
-
-  InferSpew(ISpewOps, "bytecodeType: %p %05zu: %s", script,
-            script->pcToOffset(pc), TypeSet::TypeString(type).get());
-  types->addType(sweep, cx, type);
-}
-
-/* static */
-void JitScript::MonitorBytecodeTypeSlow(JSContext* cx, JSScript* script,
-                                        jsbytecode* pc, StackTypeSet* types,
-                                        TypeSet::Type type) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  cx->check(script, type);
-
-  AutoEnterAnalysis enter(cx);
-
-  AutoSweepJitScript sweep(script);
-
-  MOZ_ASSERT(types == script->jitScript()->bytecodeTypes(sweep, script, pc));
-  MOZ_ASSERT(!types->hasType(type));
-
-  InferSpew(ISpewOps, "bytecodeType: %p %05zu: %s", script,
-            script->pcToOffset(pc), TypeSet::TypeString(type).get());
-  types->addType(sweep, cx, type);
-}
-
-/* static */
-void JitScript::MonitorMagicValueBytecodeType(JSContext* cx, JSScript* script,
-                                              jsbytecode* pc,
-                                              const js::Value& rval) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(rval.isMagic());
-
-  // It's possible that we arrived here from bailing out of Ion, and that
-  // Ion proved that the value is dead and optimized out. In such cases,
-  // do nothing.
-  if (rval.whyMagic() == JS_OPTIMIZED_OUT) {
-    return;
-  }
-
-  // Ops like GetAliasedVar can return the magic TDZ value.
-  MOZ_ASSERT(rval.whyMagic() == JS_UNINITIALIZED_LEXICAL);
-  MOZ_ASSERT(JSOp(*GetNextPc(pc)) == JSOp::CheckThis ||
-             JSOp(*GetNextPc(pc)) == JSOp::CheckThisReinit ||
-             JSOp(*GetNextPc(pc)) == JSOp::CheckReturn ||
-             JSOp(*GetNextPc(pc)) == JSOp::CheckAliasedLexical);
-
-  MonitorBytecodeType(cx, script, pc, TypeSet::UnknownType());
-}
-
-/* static */
-void JitScript::MonitorBytecodeType(JSContext* cx, JSScript* script,
-                                    jsbytecode* pc, const js::Value& rval) {
-  MOZ_ASSERT(BytecodeOpHasTypeSet(JSOp(*pc)));
-
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-
-  if (!script->hasJitScript()) {
-    return;
-  }
-
-  if (MOZ_UNLIKELY(rval.isMagic())) {
-    MonitorMagicValueBytecodeType(cx, script, pc, rval);
-    return;
-  }
-
-  MonitorBytecodeType(cx, script, pc, TypeSet::GetValueType(rval));
-}
-
-/* static */
-bool JSFunction::setTypeForScriptedFunction(JSContext* cx, HandleFunction fun,
-                                            bool singleton /* = false */) {
-  if (!IsTypeInferenceEnabled()) {
-    return true;
-  }
-
-  // Note: Delazifying our parent may fail with a recoverable OOM. This can
-  //       result in the current function being initialized twice. Check if
-  //       group was already initialized.
-  if (fun->isSingleton() || fun->group()->maybeInterpretedFunction()) {
-    return true;
-  }
-
-  if (singleton) {
-    if (!setSingleton(cx, fun)) {
-      return false;
-    }
-  } else {
-    RootedObject funProto(cx, fun->staticPrototype());
-    Rooted<TaggedProto> taggedProto(cx, TaggedProto(funProto));
-    ObjectGroup* group = ObjectGroupRealm::makeGroup(
-        cx, fun->realm(), &JSFunction::class_, taggedProto);
-    if (!group) {
-      return false;
-    }
-
-    fun->setGroup(group);
-    group->setInterpretedFunction(fun);
-  }
-
-  return true;
-}
-
-/////////////////////////////////////////////////////////////////////
-// PreliminaryObjectArray
-/////////////////////////////////////////////////////////////////////
-
-void PreliminaryObjectArray::registerNewObject(PlainObject* res) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  // The preliminary object pointers are weak, and won't be swept properly
-  // during nursery collections, so the preliminary objects need to be
-  // initially tenured.
-  MOZ_ASSERT(!IsInsideNursery(res));
-
-  for (size_t i = 0; i < COUNT; i++) {
-    if (!objects[i]) {
-      objects[i] = res;
-      return;
-    }
-  }
-
-  MOZ_CRASH("There should be room for registering the new object");
-}
-
-bool PreliminaryObjectArray::full() const {
-  for (size_t i = 0; i < COUNT; i++) {
-    if (!objects[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-void PreliminaryObjectArray::sweep() {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  // All objects in the array are weak, so clear any that are about to be
-  // destroyed.
-  for (size_t i = 0; i < COUNT; i++) {
-    JSObject** ptr = &objects[i];
-    if (*ptr && IsAboutToBeFinalizedUnbarriered(ptr)) {
-      *ptr = nullptr;
-    }
-  }
-}
-
-void PreliminaryObjectArrayWithTemplate::trace(JSTracer* trc) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  TraceNullableEdge(trc, &shape_, "PreliminaryObjectArrayWithTemplate_shape");
-}
-
-/* static */
-void PreliminaryObjectArrayWithTemplate::preWriteBarrier(
-    PreliminaryObjectArrayWithTemplate* objects) {
-  Shape* shape = objects->shape();
-
-  if (!shape) {
-    return;
-  }
-
-  JS::Zone* zone = shape->zoneFromAnyThread();
-  if (zone->needsIncrementalBarrier()) {
-    objects->trace(zone->barrierTracer());
-  }
-}
-
-// Return whether shape consists entirely of plain data properties.
-static bool OnlyHasDataProperties(Shape* shape) {
-  MOZ_ASSERT(!shape->inDictionary());
-
-  while (!shape->isEmptyShape()) {
-    if (!shape->isDataProperty() || !shape->configurable() ||
-        !shape->enumerable() || !shape->writable()) {
-      return false;
-    }
-    shape = shape->previous();
-  }
-
-  return true;
-}
-
-// Find the most recent common ancestor of two shapes, or an empty shape if
-// the two shapes have no common ancestor.
-static Shape* CommonPrefix(Shape* first, Shape* second) {
-  MOZ_ASSERT(OnlyHasDataProperties(first));
-  MOZ_ASSERT(OnlyHasDataProperties(second));
-
-  while (first->slotSpan() > second->slotSpan()) {
-    first = first->previous();
-  }
-  while (second->slotSpan() > first->slotSpan()) {
-    second = second->previous();
-  }
-
-  while (first != second && !first->isEmptyShape()) {
-    first = first->previous();
-    second = second->previous();
-  }
-
-  return first;
-}
-
-void PreliminaryObjectArrayWithTemplate::maybeAnalyze(JSContext* cx,
-                                                      ObjectGroup* group,
-                                                      bool force) {
-  // Don't perform the analyses until sufficient preliminary objects have
-  // been allocated.
-  if (!force && !full()) {
-    return;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  UniquePtr<PreliminaryObjectArrayWithTemplate> preliminaryObjects(this);
-  group->detachPreliminaryObjects();
-
-  MOZ_ASSERT(shape());
-  MOZ_ASSERT(shape()->slotSpan() != 0);
-  MOZ_ASSERT(OnlyHasDataProperties(shape()));
-
-  // Make sure all the preliminary objects reflect the properties originally
-  // in the template object.
-  for (size_t i = 0; i < PreliminaryObjectArray::COUNT; i++) {
-    JSObject* objBase = preliminaryObjects->get(i);
-    if (!objBase) {
-      continue;
-    }
-    PlainObject* obj = &objBase->as<PlainObject>();
-
-    if (obj->inDictionaryMode() ||
-        !OnlyHasDataProperties(obj->lastProperty())) {
-      return;
-    }
-
-    if (CommonPrefix(obj->lastProperty(), shape()) != shape()) {
-      return;
-    }
-  }
-
-  // Since the preliminary objects still reflect the template object's
-  // properties, and all objects in the future will be created with those
-  // properties, the properties can be marked as definite for objects in the
-  // group.
-  group->addDefiniteProperties(cx, shape());
-}
-
-/////////////////////////////////////////////////////////////////////
-// TypeNewScript
-/////////////////////////////////////////////////////////////////////
-
-// Make a TypeNewScript for |group|, and set it up to hold the preliminary
-// objects created with the group.
-/* static */
-bool TypeNewScript::make(JSContext* cx, ObjectGroup* group, JSFunction* fun) {
-  AutoSweepObjectGroup sweep(group);
-  MOZ_ASSERT(cx->zone()->types.activeAnalysis);
-  MOZ_ASSERT(!group->newScript(sweep));
-  MOZ_ASSERT(cx->realm() == group->realm());
-  MOZ_ASSERT(cx->realm() == fun->realm());
-
-  // rollbackPartiallyInitializedObjects expects function_ to be
-  // canonicalized.
-  MOZ_ASSERT(fun->maybeCanonicalFunction() == fun);
-
-  if (group->unknownProperties(sweep)) {
-    return true;
-  }
-
-  auto newScript = cx->make_unique<TypeNewScript>();
-  if (!newScript) {
-    return false;
-  }
-
-  newScript->function_ = fun;
-
-  newScript->preliminaryObjects = group->zone()->new_<PreliminaryObjectArray>();
-  if (!newScript->preliminaryObjects) {
-    return true;
-  }
-
-  group->setNewScript(newScript.release());
-
-  gc::gcprobes::TypeNewScript(group);
-  return true;
-}
-
-size_t TypeNewScript::sizeOfIncludingThis(
-    mozilla::MallocSizeOf mallocSizeOf) const {
-  size_t n = mallocSizeOf(this);
-  n += mallocSizeOf(preliminaryObjects);
-  n += mallocSizeOf(initializerList);
-  return n;
-}
-
-/* static */ size_t TypeNewScript::sizeOfInitializerList(size_t length) {
-  // TypeNewScriptInitializer struct contains [1] element in its size.
-  size_t size = sizeof(TypeNewScript::InitializerList);
-  if (length > 0) {
-    size += (length - 1) * sizeof(TypeNewScriptInitializer);
-  }
-  return size;
-}
-
-size_t TypeNewScript::gcMallocBytes() const {
-  size_t size = sizeof(TypeNewScript);
-  if (preliminaryObjects) {
-    size += sizeof(PreliminaryObjectArray);
-  }
-  if (initializerList) {
-    size += sizeOfInitializerList(initializerList->length);
-  }
-  return size;
-}
-
-void TypeNewScript::registerNewObject(PlainObject* res) {
-  MOZ_ASSERT(!analyzed());
-
-  // New script objects must have the maximum number of fixed slots, so that
-  // we can adjust their shape later to match the number of fixed slots used
-  // by the template object we eventually create.
-  MOZ_ASSERT(res->numFixedSlots() == NativeObject::MAX_FIXED_SLOTS);
-
-  preliminaryObjects->registerNewObject(res);
-}
-
-static bool ChangeObjectFixedSlotCount(JSContext* cx, PlainObject* obj,
-                                       gc::AllocKind allocKind) {
-  MOZ_ASSERT(OnlyHasDataProperties(obj->lastProperty()));
-
-  Shape* newShape = ReshapeForAllocKind(cx, obj->lastProperty(),
-                                        obj->taggedProto(), allocKind);
-  if (!newShape) {
-    return false;
-  }
-
-  obj->setLastPropertyShrinkFixedSlots(newShape);
-  return true;
-}
-
-bool DPAConstraintInfo::finishConstraints(JSContext* cx, ObjectGroup* group) {
-  for (const ProtoConstraint& constraint : protoConstraints_) {
-    ObjectGroup* protoGroup = constraint.proto->group();
-
-    // Note: we rely on the group's type information being unchanged since
-    // AddClearDefiniteGetterSetterForPrototypeChain.
-
-    AutoSweepObjectGroup sweep(protoGroup);
-    bool unknownProperties = protoGroup->unknownProperties(sweep);
-    MOZ_RELEASE_ASSERT(!unknownProperties);
-
-    HeapTypeSet* protoTypes =
-        protoGroup->getProperty(sweep, cx, constraint.proto, constraint.id);
-    MOZ_RELEASE_ASSERT(protoTypes);
-
-    MOZ_ASSERT(!protoTypes->nonDataProperty());
-    MOZ_ASSERT(!protoTypes->nonWritableProperty());
-
-    if (!protoTypes->addConstraint(
-            cx,
-            cx->typeLifoAlloc().new_<TypeConstraintClearDefiniteGetterSetter>(
-                group))) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-  }
-
-  for (const InliningConstraint& constraint : inliningConstraints_) {
-    if (!AddClearDefiniteFunctionUsesInScript(cx, group, constraint.caller,
-                                              constraint.callee)) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool TypeNewScript::maybeAnalyze(JSContext* cx, ObjectGroup* group,
-                                 bool* regenerate, bool force) {
-  // Perform the new script properties analysis if necessary, returning
-  // whether the new group table was updated and group needs to be refreshed.
-
-  // Make sure there aren't dead references in preliminaryObjects. This can
-  // clear out the new script information on OOM.
-  AutoSweepObjectGroup sweep(group);
-  if (!group->newScript(sweep)) {
-    return true;
-  }
-
-  MOZ_ASSERT(this == group->newScript(sweep));
-  MOZ_ASSERT(cx->realm() == group->realm());
-
-  if (regenerate) {
-    *regenerate = false;
-  }
-
-  if (analyzed()) {
-    // The analyses have already been performed.
-    return true;
-  }
-
-  // Don't perform the analyses until sufficient preliminary objects have
-  // been allocated.
-  if (!force && !preliminaryObjects->full()) {
-    return true;
-  }
-
-  AutoEnterAnalysis enter(cx);
-
-  // Any failures after this point will clear out this TypeNewScript.
-  auto destroyNewScript = mozilla::MakeScopeExit([&] {
-    if (group) {
-      group->clearNewScript(cx);
-    }
-  });
-
-  // Compute the greatest common shape prefix and the largest slot span of
-  // the preliminary objects.
-  Shape* prefixShape = nullptr;
-  size_t maxSlotSpan = 0;
-  for (size_t i = 0; i < PreliminaryObjectArray::COUNT; i++) {
-    JSObject* objBase = preliminaryObjects->get(i);
-    if (!objBase) {
-      continue;
-    }
-    PlainObject* obj = &objBase->as<PlainObject>();
-
-    // For now, we require all preliminary objects to have only simple
-    // lineages of plain data properties.
-    Shape* shape = obj->lastProperty();
-    if (shape->inDictionary() || !OnlyHasDataProperties(shape) ||
-        shape->getObjectFlags() != 0) {
-      return true;
-    }
-
-    maxSlotSpan = std::max<size_t>(maxSlotSpan, obj->slotSpan());
-
-    if (prefixShape) {
-      MOZ_ASSERT(shape->numFixedSlots() == prefixShape->numFixedSlots());
-      prefixShape = CommonPrefix(prefixShape, shape);
-    } else {
-      prefixShape = shape;
-    }
-    if (prefixShape->isEmptyShape()) {
-      // The preliminary objects don't have any common properties.
-      return true;
-    }
-  }
-  if (!prefixShape) {
-    return true;
-  }
-
-  gc::AllocKind kind = gc::GetGCObjectKind(maxSlotSpan);
-
-  if (kind != gc::GetGCObjectKind(NativeObject::MAX_FIXED_SLOTS)) {
-    // The template object will have a different allocation kind from the
-    // preliminary objects that have already been constructed. Optimizing
-    // definite property accesses requires both that the property is
-    // definitely in a particular slot and that the object has a specific
-    // number of fixed slots. So, adjust the shape and slot layout of all
-    // the preliminary objects so that their structure matches that of the
-    // template object. Also recompute the prefix shape, as it reflects the
-    // old number of fixed slots.
-    Shape* newPrefixShape = nullptr;
-    for (size_t i = 0; i < PreliminaryObjectArray::COUNT; i++) {
-      JSObject* objBase = preliminaryObjects->get(i);
-      if (!objBase) {
-        continue;
-      }
-      PlainObject* obj = &objBase->as<PlainObject>();
-      if (!ChangeObjectFixedSlotCount(cx, obj, kind)) {
-        return false;
-      }
-      if (newPrefixShape) {
-        MOZ_ASSERT(CommonPrefix(obj->lastProperty(), newPrefixShape) ==
-                   newPrefixShape);
-      } else {
-        newPrefixShape = obj->lastProperty();
-        while (newPrefixShape->slotSpan() > prefixShape->slotSpan()) {
-          newPrefixShape = newPrefixShape->previous();
-        }
-      }
-    }
-    prefixShape = newPrefixShape;
-  }
-
-  RootedObjectGroup groupRoot(cx, group);
-  templateObject_ =
-      NewObjectWithGroup<PlainObject>(cx, groupRoot, kind, TenuredObject);
-  if (!templateObject_) {
-    return false;
-  }
-
-  Vector<TypeNewScriptInitializer> initializerVector(cx);
-
-  DPAConstraintInfo constraintInfo(cx);
-
-  RootedPlainObject templateRoot(cx, templateObject());
-  RootedFunction fun(cx, function());
-  if (!jit::AnalyzeNewScriptDefiniteProperties(
-          cx, constraintInfo, fun, group, templateRoot, &initializerVector)) {
-    return false;
-  }
-
-  if (!group->newScript(sweep)) {
-    return true;
-  }
-
-  MOZ_ASSERT(OnlyHasDataProperties(templateObject()->lastProperty()));
-
-  MOZ_ASSERT(!initializerList);
-  InitializerList* newInitializerList = nullptr;
-  if (templateObject()->slotSpan() != 0) {
-    // Make sure that all definite properties found are reflected in the
-    // prefix shape. Otherwise, the constructor behaved differently before
-    // we baseline compiled it and started observing types. Compare
-    // property names rather than looking at the shapes directly, as the
-    // allocation kind and other non-property parts of the template and
-    // existing objects may differ.
-    if (templateObject()->slotSpan() > prefixShape->slotSpan()) {
-      return true;
-    }
-    {
-      Shape* shape = prefixShape;
-      while (shape->slotSpan() != templateObject()->slotSpan()) {
-        shape = shape->previous();
-      }
-      Shape* templateShape = templateObject()->lastProperty();
-      while (!shape->isEmptyShape()) {
-        if (shape->slot() != templateShape->slot()) {
-          return true;
-        }
-        if (shape->propid() != templateShape->propid()) {
-          return true;
-        }
-        shape = shape->previous();
-        templateShape = templateShape->previous();
-      }
-      if (!templateShape->isEmptyShape()) {
-        return true;
-      }
-    }
-
-    size_t nbytes = sizeOfInitializerList(initializerVector.length());
-    newInitializerList = reinterpret_cast<InitializerList*>(
-        group->zone()->pod_calloc<uint8_t>(nbytes));
-    if (!newInitializerList) {
-      ReportOutOfMemory(cx);
-      return false;
-    }
-    newInitializerList->length = initializerVector.length();
-    PodCopy(newInitializerList->entries, initializerVector.begin(),
-            initializerVector.length());
-  }
-
-  RemoveCellMemory(group, gcMallocBytes(), MemoryUse::ObjectGroupAddendum);
-
-  initializerList = newInitializerList;
-
-  js_delete(preliminaryObjects);
-  preliminaryObjects = nullptr;
-
-  AddCellMemory(group, gcMallocBytes(), MemoryUse::ObjectGroupAddendum);
-
-  if (prefixShape->slotSpan() == templateObject()->slotSpan()) {
-    // The definite properties analysis found exactly the properties that
-    // are held in common by the preliminary objects. No further analysis
-    // is needed.
-
-    if (!constraintInfo.finishConstraints(cx, group)) {
-      return false;
-    }
-    if (!group->newScript(sweep)) {
-      return true;
-    }
-
-    group->addDefiniteProperties(cx, templateObject()->lastProperty());
-
-    destroyNewScript.release();
-    return true;
-  }
-
-  // There are more properties consistently added to objects of this group
-  // than were discovered by the definite properties analysis. Use the
-  // existing group to represent fully initialized objects with all
-  // definite properties in the prefix shape, and make a new group to
-  // represent partially initialized objects.
-  MOZ_ASSERT(prefixShape->slotSpan() > templateObject()->slotSpan());
-
-  ObjectGroupFlags initialFlags =
-      group->flags(sweep) & OBJECT_FLAG_DYNAMIC_MASK;
-
-  Rooted<TaggedProto> protoRoot(cx, group->proto());
-  ObjectGroup* initialGroup = ObjectGroupRealm::makeGroup(
-      cx, group->realm(), group->clasp(), protoRoot, initialFlags);
-  if (!initialGroup) {
-    return false;
-  }
-
-  // Add the constraints. Use the initialGroup as group referenced by the
-  // constraints because that's the group that will have the TypeNewScript
-  // associated with it. See the detachNewScript and setNewScript calls below.
-  if (!constraintInfo.finishConstraints(cx, initialGroup)) {
-    return false;
-  }
-  if (!group->newScript(sweep)) {
-    return true;
-  }
-
-  initialGroup->addDefiniteProperties(cx, templateObject()->lastProperty());
-  group->addDefiniteProperties(cx, prefixShape);
-
-  ObjectGroupRealm& realm = ObjectGroupRealm::get(group);
-  realm.replaceDefaultNewGroup(group->clasp(), group->proto(), function(),
-                               initialGroup);
-
-  templateObject()->setGroup(initialGroup);
-
-  // Transfer this TypeNewScript from the fully initialized group to the
-  // partially initialized group.
-  group->detachNewScript();
-  initialGroup->setNewScript(this);
-
-  // prefixShape was read via a weak pointer, so we need a read barrier before
-  // we store it into the heap.
-  gc::ReadBarrier(prefixShape);
-
-  initializedShape_ = prefixShape;
-  initializedGroup_ = group;
-
-  destroyNewScript.release();
-
-  if (regenerate) {
-    *regenerate = true;
-  }
-  return true;
-}
-
-bool TypeNewScript::rollbackPartiallyInitializedObjects(JSContext* cx,
-                                                        ObjectGroup* group) {
-  // If we cleared this new script while in the middle of initializing an
-  // object, it will still have the new script's shape and reflect the no
-  // longer correct state of the object once its initialization is completed.
-  // We can't detect the possibility of this statically while remaining
-  // robust, but the new script keeps track of where each property is
-  // initialized so we can walk the stack and fix up any such objects.
-  // Return whether any objects were modified.
-
-  if (!initializerList) {
-    return false;
-  }
-
-  bool found = false;
-
-  RootedFunction function(cx, this->function());
-  Vector<uint32_t, 32> pcOffsets(cx);
-  for (AllScriptFramesIter iter(cx); !iter.done(); ++iter) {
-    {
-      AutoEnterOOMUnsafeRegion oomUnsafe;
-      if (!pcOffsets.append(iter.script()->pcToOffset(iter.pc()))) {
-        oomUnsafe.crash("rollbackPartiallyInitializedObjects");
-      }
-    }
-
-    if (!iter.isConstructing()) {
-      continue;
-    }
-
-    MOZ_ASSERT(iter.calleeTemplate()->maybeCanonicalFunction());
-
-    if (iter.calleeTemplate()->maybeCanonicalFunction() != function) {
-      continue;
-    }
-
-    // Derived class constructors initialize their this-binding later and
-    // we shouldn't run the definite properties analysis on them.
-    MOZ_ASSERT(!iter.script()->isDerivedClassConstructor());
-
-    Value thisv = iter.thisArgument(cx);
-    if (!thisv.isObject() || thisv.toObject().hasLazyGroup() ||
-        thisv.toObject().group() != group) {
-      continue;
-    }
-
-    // Found a matching frame.
-    RootedPlainObject obj(cx, &thisv.toObject().as<PlainObject>());
-
-    // If not finished, number of properties that have been added.
-    uint32_t numProperties = 0;
-
-    // Whether the current SetProp is within an inner frame which has
-    // finished entirely.
-    bool pastProperty = false;
-
-    // Index in pcOffsets of the outermost frame.
-    int callDepth = pcOffsets.length() - 1;
-
-    // Index in pcOffsets of the frame currently being checked for a SetProp.
-    int setpropDepth = callDepth;
-
-    size_t i;
-    for (i = 0; i < initializerList->length; i++) {
-      const TypeNewScriptInitializer init = initializerList->entries[i];
-      if (init.kind == TypeNewScriptInitializer::SETPROP) {
-        if (!pastProperty && pcOffsets[setpropDepth] < init.offset) {
-          // Have not yet reached this setprop.
-          break;
-        }
-        // This setprop has executed, reset state for the next one.
-        numProperties++;
-        pastProperty = false;
-        setpropDepth = callDepth;
-      } else {
-        MOZ_ASSERT(init.kind == TypeNewScriptInitializer::SETPROP_FRAME);
-        if (!pastProperty) {
-          if (pcOffsets[setpropDepth] < init.offset) {
-            // Have not yet reached this inner call.
-            break;
-          } else if (pcOffsets[setpropDepth] > init.offset) {
-            // Have advanced past this inner call.
-            pastProperty = true;
-          } else if (setpropDepth == 0) {
-            // Have reached this call but not yet in it.
-            break;
-          } else {
-            // Somewhere inside this inner call.
-            setpropDepth--;
-          }
-        }
-      }
-    }
-
-    // Whether all identified 'new' properties have been initialized.
-    bool finished = i == initializerList->length;
-
-    if (!finished) {
-      (void)NativeObject::rollbackProperties(cx, obj, numProperties);
-      found = true;
-    }
-  }
-
-  return found;
-}
-
-void TypeNewScript::trace(JSTracer* trc) {
-  TraceEdge(trc, &function_, "TypeNewScript_function");
-  TraceNullableEdge(trc, &templateObject_, "TypeNewScript_templateObject");
-  TraceNullableEdge(trc, &initializedShape_, "TypeNewScript_initializedShape");
-  TraceNullableEdge(trc, &initializedGroup_, "TypeNewScript_initializedGroup");
-}
-
-/* static */
-void TypeNewScript::preWriteBarrier(TypeNewScript* newScript) {
-  if (JS::RuntimeHeapIsCollecting()) {
-    return;
-  }
-
-  JS::Zone* zone = newScript->function()->zoneFromAnyThread();
-  if (zone->needsIncrementalBarrier()) {
-    newScript->trace(zone->barrierTracer());
-  }
-}
-
-void TypeNewScript::sweep() {
-  if (preliminaryObjects) {
-    preliminaryObjects->sweep();
-  }
-}
-
-/////////////////////////////////////////////////////////////////////
-// Tracing
-/////////////////////////////////////////////////////////////////////
-
-static inline void TraceObjectKey(JSTracer* trc, TypeSet::ObjectKey** keyp) {
-  TypeSet::ObjectKey* key = *keyp;
-  if (key->isGroup()) {
-    ObjectGroup* group = key->groupNoBarrier();
-    TraceManuallyBarrieredEdge(trc, &group, "objectKey_group");
-    *keyp = TypeSet::ObjectKey::get(group);
-  } else {
-    JSObject* singleton = key->singletonNoBarrier();
-    TraceManuallyBarrieredEdge(trc, &singleton, "objectKey_singleton");
-    *keyp = TypeSet::ObjectKey::get(singleton);
-  }
-}
-
-void ConstraintTypeSet::trace(Zone* zone, JSTracer* trc) {
-  checkMagic();
-
-  // ConstraintTypeSets only hold strong references during minor collections.
-  MOZ_ASSERT(JS::RuntimeHeapIsMinorCollecting());
-
-  unsigned objectCount = baseObjectCount();
-  TypeHashSet::MapEntries<ObjectKey*, ObjectKey, ObjectKey>(
-      objectSet, objectCount, [&](ObjectKey* key) -> ObjectKey* {
-        TraceObjectKey(trc, &key);
-        return key;
-      });
-
-#ifdef DEBUG
-  MOZ_ASSERT(objectCount == baseObjectCount());
-  if (objectCount >= 2) {
-    unsigned capacity = TypeHashSet::Capacity(objectCount);
-    MOZ_ASSERT(uintptr_t(objectSet[-1]) == capacity);
-    for (unsigned i = 0; i < capacity; i++) {
-      ObjectKey* key = objectSet[i];
-      if (!key) {
-        continue;
-      }
-      if (key->isGroup()) {
-        CheckGCThingAfterMovingGC(key->groupNoBarrier());
-      } else {
-        CheckGCThingAfterMovingGC(key->singletonNoBarrier());
-      }
-      Compartment* compartment = key->maybeCompartment();
-      MOZ_ASSERT_IF(compartment, compartment->zone() == zone);
-    }
-  } else if (objectCount == 1) {
-    ObjectKey* key = (ObjectKey*)objectSet;
-    if (key->isGroup()) {
-      CheckGCThingAfterMovingGC(key->groupNoBarrier());
-    } else {
-      CheckGCThingAfterMovingGC(key->singletonNoBarrier());
-    }
-    Compartment* compartment = key->maybeCompartment();
-    MOZ_ASSERT_IF(compartment, compartment->zone() == zone);
-  }
-#endif
-}
-
-static inline void AssertGCStateForSweep(Zone* zone) {
-  MOZ_ASSERT(zone->isGCSweepingOrCompacting());
-
-  // IsAboutToBeFinalized doesn't work right on tenured objects when called
-  // during a minor collection.
-  MOZ_ASSERT(!JS::RuntimeHeapIsMinorCollecting());
-}
-
-void ConstraintTypeSet::sweep(const AutoSweepBase& sweep, Zone* zone) {
-  AssertGCStateForSweep(zone);
-
-  checkMagic();
-
-  /*
-   * Purge references to objects that are no longer live. Type sets hold
-   * only weak references. For type sets containing more than one object,
-   * live entries in the object hash need to be copied to the zone's
-   * new arena.
-   */
-  unsigned objectCount = baseObjectCount();
-  if (objectCount >= 2) {
-    unsigned oldCapacity = TypeHashSet::Capacity(objectCount);
-    ObjectKey** oldArray = objectSet;
-
-    MOZ_RELEASE_ASSERT(uintptr_t(oldArray[-1]) == oldCapacity);
-
-    clearObjects();
-    objectCount = 0;
-    for (unsigned i = 0; i < oldCapacity; i++) {
-      ObjectKey* key = oldArray[i];
-      if (!key) {
-        continue;
-      }
-      if (!IsObjectKeyAboutToBeFinalized(&key)) {
-        ObjectKey** pentry =
-            TypeHashSet::Insert<ObjectKey*, ObjectKey, ObjectKey>(
-                zone->types.typeLifoAlloc(), objectSet, objectCount, key);
-        if (pentry) {
-          *pentry = key;
-        } else {
-          zone->types.setOOMSweepingTypes();
-          flags |= TYPE_FLAG_ANYOBJECT;
-          clearObjects();
-          objectCount = 0;
-          break;
-        }
-      } else if (key->isGroup() &&
-                 key->groupNoBarrier()
-                     ->unknownPropertiesDontCheckGeneration()) {
-        // Object sets containing objects with unknown properties might
-        // not be complete. Mark the type set as unknown, which it will
-        // be treated as during Ion compilation.
-        flags |= TYPE_FLAG_ANYOBJECT;
-        clearObjects();
-        objectCount = 0;
-        break;
-      }
-    }
-    setBaseObjectCount(objectCount);
-    // Note: -1/+1 to also poison the capacity field.
-    AlwaysPoison(oldArray - 1, JS_SWEPT_TI_PATTERN,
-                 (oldCapacity + 1) * sizeof(oldArray[0]),
-                 MemCheckKind::MakeUndefined);
-  } else if (objectCount == 1) {
-    ObjectKey* key = (ObjectKey*)objectSet;
-    if (!IsObjectKeyAboutToBeFinalized(&key)) {
-      objectSet = reinterpret_cast<ObjectKey**>(key);
-    } else {
-      // As above, mark type sets containing objects with unknown
-      // properties as unknown.
-      if (key->isGroup() &&
-          key->groupNoBarrier()->unknownPropertiesDontCheckGeneration()) {
-        flags |= TYPE_FLAG_ANYOBJECT;
-      }
-      objectSet = nullptr;
-      setBaseObjectCount(0);
-    }
-  }
-
-  /*
-   * Type constraints only hold weak references. Copy constraints referring
-   * to data that is still live into the zone's new arena.
-   */
-  TypeConstraint* constraint = constraintList(sweep);
-  constraintList_ = nullptr;
-  while (constraint) {
-    MOZ_ASSERT(zone->types.sweepTypeLifoAlloc.ref().contains(constraint));
-    TypeConstraint* copy;
-    if (constraint->sweep(zone->types, &copy)) {
-      if (copy) {
-        MOZ_ASSERT(zone->types.typeLifoAlloc().contains(copy));
-        copy->setNext(constraintList_);
-        constraintList_ = copy;
-      } else {
-        zone->types.setOOMSweepingTypes();
-      }
-    }
-    TypeConstraint* next = constraint->next();
-    AlwaysPoison(constraint, JS_SWEPT_TI_PATTERN, sizeof(TypeConstraint),
-                 MemCheckKind::MakeUndefined);
-    constraint = next;
-  }
-}
-
-inline void ObjectGroup::clearProperties(const AutoSweepObjectGroup& sweep) {
-  // We're about to remove edges from the group to property ids. Incremental
-  // GC should know about these edges.
-  if (zone()->needsIncrementalBarrier()) {
-    traceChildren(zone()->barrierTracer());
-  }
-
-  setBasePropertyCount(sweep, 0);
-  propertySet = nullptr;
-}
-
-/*
- * Before sweeping the arenas themselves, scan all groups in a compartment to
- * fixup weak references: property type sets referencing dead JS and type
- * objects, and singleton JS objects whose type is not referenced elsewhere.
- * This is done either incrementally as part of the sweep, or on demand as type
- * objects are accessed before their contents have been swept.
- */
-void ObjectGroup::sweep(const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(generation() != zoneFromAnyThread()->types.generation);
-  setGeneration(zone()->types.generation);
-
-  AssertGCStateForSweep(zone());
-
-  Maybe<AutoClearTypeInferenceStateOnOOM> clearStateOnOOM;
-  if (!zone()->types.isSweepingTypes()) {
-    clearStateOnOOM.emplace(zone());
-  }
-
-  AutoTouchingGrayThings tgt;
-
-  if (maybePreliminaryObjects(sweep)) {
-    maybePreliminaryObjects(sweep)->sweep();
-  }
-
-  if (newScript(sweep)) {
-    newScript(sweep)->sweep();
-  }
-
-  LifoAlloc& typeLifoAlloc = zone()->types.typeLifoAlloc();
-
-  /*
-   * Properties were allocated from the old arena, and need to be copied over
-   * to the new one.
-   */
-  unsigned propertyCount = basePropertyCount(sweep);
-  if (propertyCount >= 2) {
-    unsigned oldCapacity = TypeHashSet::Capacity(propertyCount);
-    Property** oldArray = propertySet;
-
-    MOZ_RELEASE_ASSERT(uintptr_t(oldArray[-1]) == oldCapacity);
-
-    auto poisonArray = mozilla::MakeScopeExit([oldArray, oldCapacity] {
-      size_t size = sizeof(Property*) * (oldCapacity + 1);
-      AlwaysPoison(oldArray - 1, JS_SWEPT_TI_PATTERN, size,
-                   MemCheckKind::MakeUndefined);
-    });
-
-    unsigned oldPropertyCount = propertyCount;
-    unsigned oldPropertiesFound = 0;
-
-    clearProperties(sweep);
-    propertyCount = 0;
-    for (unsigned i = 0; i < oldCapacity; i++) {
-      Property* prop = oldArray[i];
-      if (prop) {
-        oldPropertiesFound++;
-        prop->types.checkMagic();
-        if (singleton() && !prop->types.constraintList(sweep) &&
-            !zone()->isPreservingCode()) {
-          /*
-           * Don't copy over properties of singleton objects when their
-           * presence will not be required by jitcode or type constraints
-           * (i.e. for the definite properties analysis). The contents of
-           * these type sets will be regenerated as necessary.
-           */
-          AlwaysPoison(prop, JS_SWEPT_TI_PATTERN, sizeof(Property),
-                       MemCheckKind::MakeUndefined);
-          continue;
-        }
-
-        Property* newProp = typeLifoAlloc.new_<Property>(*prop);
-        AlwaysPoison(prop, JS_SWEPT_TI_PATTERN, sizeof(Property),
-                     MemCheckKind::MakeUndefined);
-        if (newProp) {
-          Property** pentry = TypeHashSet::Insert<jsid, Property, Property>(
-              typeLifoAlloc, propertySet, propertyCount, newProp->id);
-          if (pentry) {
-            *pentry = newProp;
-            newProp->types.sweep(sweep, zone());
-            continue;
-          }
-        }
-
-        zone()->types.setOOMSweepingTypes();
-        addFlags(sweep,
-                 OBJECT_FLAG_DYNAMIC_MASK | OBJECT_FLAG_UNKNOWN_PROPERTIES);
-        clearProperties(sweep);
-        return;
-      }
-    }
-    MOZ_RELEASE_ASSERT(oldPropertyCount == oldPropertiesFound);
-    setBasePropertyCount(sweep, propertyCount);
-  } else if (propertyCount == 1) {
-    Property* prop = (Property*)propertySet;
-    prop->types.checkMagic();
-    if (singleton() && !prop->types.constraintList(sweep) &&
-        !zone()->isPreservingCode()) {
-      // Skip, as above.
-      AlwaysPoison(prop, JS_SWEPT_TI_PATTERN, sizeof(Property),
-                   MemCheckKind::MakeUndefined);
-      clearProperties(sweep);
-    } else {
-      Property* newProp = typeLifoAlloc.new_<Property>(*prop);
-      AlwaysPoison(prop, JS_SWEPT_TI_PATTERN, sizeof(Property),
-                   MemCheckKind::MakeUndefined);
-      if (newProp) {
-        propertySet = (Property**)newProp;
-        newProp->types.sweep(sweep, zone());
-      } else {
-        zone()->types.setOOMSweepingTypes();
-        addFlags(sweep,
-                 OBJECT_FLAG_DYNAMIC_MASK | OBJECT_FLAG_UNKNOWN_PROPERTIES);
-        clearProperties(sweep);
-        return;
-      }
-    }
-  } else {
-    MOZ_RELEASE_ASSERT(!propertySet);
-  }
-}
-
-/* static */
-void JitScript::sweepTypes(const js::AutoSweepJitScript& sweep, Zone* zone) {
-  MOZ_ASSERT(typesGeneration() != zone->types.generation);
-  setTypesGeneration(zone->types.generation);
-
-  AssertGCStateForSweep(zone);
-
-  Maybe<AutoClearTypeInferenceStateOnOOM> clearStateOnOOM;
-  if (!zone->types.isSweepingTypes()) {
-    clearStateOnOOM.emplace(zone);
-  }
-
-  TypeZone& types = zone->types;
-
-  // Sweep the inlinedCompilations Vector.
-  if (maybeInlinedCompilations(sweep)) {
-    RecompileInfoVector& inlinedCompilations = *maybeInlinedCompilations(sweep);
-    size_t dest = 0;
-    for (size_t i = 0; i < inlinedCompilations.length(); i++) {
-      if (inlinedCompilations[i].shouldSweep(types)) {
-        continue;
-      }
-      inlinedCompilations[dest] = inlinedCompilations[i];
-      dest++;
-    }
-    inlinedCompilations.shrinkTo(dest);
-  }
-
-  if (IsTypeInferenceEnabled()) {
-    // Remove constraints and references to dead objects from stack type sets.
-    unsigned num = numTypeSets();
-    StackTypeSet* arr = typeArray(sweep);
-    for (unsigned i = 0; i < num; i++) {
-      arr[i].sweep(sweep, zone);
-    }
-  }
-
-  if (types.hadOOMSweepingTypes()) {
-    // It's possible we OOM'd while copying freeze constraints, so they
-    // need to be regenerated.
-    flags_.hasFreezeConstraints = false;
-  }
-}
-
-TypeZone::TypeZone(Zone* zone)
-    : zone_(zone),
-      typeLifoAlloc_(zone, (size_t)TYPE_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
-      currentCompilationId_(zone),
-      generation(zone, 0),
-      sweepTypeLifoAlloc(zone, (size_t)TYPE_LIFO_ALLOC_PRIMARY_CHUNK_SIZE),
-      sweepingTypes(zone, false),
-      oomSweepingTypes(zone, false),
-      keepJitScripts(zone, false),
-      activeAnalysis(zone, nullptr) {}
-
-TypeZone::~TypeZone() {
-  MOZ_RELEASE_ASSERT(!sweepingTypes);
-  MOZ_ASSERT(!keepJitScripts);
-}
-
-void TypeZone::beginSweep() {
-  MOZ_ASSERT(zone()->isGCSweepingOrCompacting());
-  MOZ_ASSERT(
-      !zone()->runtimeFromMainThread()->gc.storeBuffer().hasTypeSetPointers());
-
-  // Clear the analysis pool, but don't release its data yet. While sweeping
-  // types any live data will be allocated into the pool.
-  sweepTypeLifoAlloc.ref().steal(&typeLifoAlloc());
-
-  generation = !generation;
-}
-
-void TypeZone::endSweep(JSRuntime* rt) {
-  rt->gc.queueAllLifoBlocksForFree(&sweepTypeLifoAlloc.ref());
-}
-
-void TypeZone::clearAllNewScriptsOnOOM() {
-  for (auto group = zone()->cellIter<ObjectGroup>(); !group.done();
-       group.next()) {
-    group->maybeClearNewScriptOnOOM();
-  }
-}
-
-AutoClearTypeInferenceStateOnOOM::AutoClearTypeInferenceStateOnOOM(Zone* zone)
-    : zone(zone) {
-  MOZ_RELEASE_ASSERT(CurrentThreadCanAccessZone(zone));
-  MOZ_ASSERT(!TlsContext.get()->inUnsafeCallWithABI);
-  zone->types.setSweepingTypes(true);
-}
-
-AutoClearTypeInferenceStateOnOOM::~AutoClearTypeInferenceStateOnOOM() {
-  if (zone->types.hadOOMSweepingTypes()) {
-    gc::AutoSetThreadIsSweeping threadIsSweeping(zone);
-    JSRuntime* rt = zone->runtimeFromMainThread();
-    JSFreeOp fop(rt);
-    js::CancelOffThreadIonCompile(rt);
-    zone->setPreservingCode(false);
-    zone->discardJitCode(&fop, Zone::KeepBaselineCode);
-    zone->types.clearAllNewScriptsOnOOM();
-  }
-
-  zone->types.setSweepingTypes(false);
-}
-
-JS::ubi::Node::Size JS::ubi::Concrete<js::ObjectGroup>::size(
-    mozilla::MallocSizeOf mallocSizeOf) const {
-  Size size = js::gc::Arena::thingSize(get().asTenured().getAllocKind());
-  size += get().sizeOfExcludingThis(mallocSizeOf);
-  return size;
-}
diff -Nru firefox-84.0.2+build1/js/src/vm/TypeInference.h firefox-85.0+build1/js/src/vm/TypeInference.h
--- firefox-84.0.2+build1/js/src/vm/TypeInference.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypeInference.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,406 +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/. */
-
-/* Definitions related to javascript type inference. */
-
-#ifndef vm_TypeInference_h
-#define vm_TypeInference_h
-
-#include "mozilla/Attributes.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/MemoryReporting.h"
-
-#include "jsfriendapi.h"
-#include "jstypes.h"
-
-#include "ds/LifoAlloc.h"
-#include "gc/Barrier.h"
-#include "jit/IonTypes.h"
-#include "js/AllocPolicy.h"
-#include "js/HeapAPI.h"  // js::CurrentThreadCanAccessZone
-#include "js/UbiNode.h"
-#include "js/Utility.h"
-#include "js/Vector.h"
-#include "threading/ProtectedData.h"  // js::ZoneData
-#include "util/DiagnosticAssertions.h"
-#include "vm/Shape.h"
-#include "vm/TypeSet.h"
-
-namespace js {
-
-class TypeConstraint;
-class TypeZone;
-class CompilerConstraintList;
-class HeapTypeSetKey;
-class PlainObject;
-
-namespace jit {
-
-class IonScript;
-class JitScript;
-class TempAllocator;
-
-}  // namespace jit
-
-// If there is an OOM while sweeping types, the type information is deoptimized
-// so that it stays correct (i.e. overapproximates the possible types in the
-// zone), but constraints might not have been triggered on the deoptimization
-// or even copied over completely. In this case, destroy all JIT code and new
-// script information in the zone, the only things whose correctness depends on
-// the type constraints.
-class AutoClearTypeInferenceStateOnOOM {
-  Zone* zone;
-
-  AutoClearTypeInferenceStateOnOOM(const AutoClearTypeInferenceStateOnOOM&) =
-      delete;
-  void operator=(const AutoClearTypeInferenceStateOnOOM&) = delete;
-
- public:
-  explicit AutoClearTypeInferenceStateOnOOM(Zone* zone);
-  ~AutoClearTypeInferenceStateOnOOM();
-};
-
-class MOZ_RAII AutoSweepBase {
-  // Make sure we don't GC while this class is live since GC might trigger
-  // (incremental) sweeping.
-  JS::AutoCheckCannotGC nogc;
-};
-
-// Sweep an ObjectGroup. Functions that expect a swept group should take a
-// reference to this class.
-class MOZ_RAII AutoSweepObjectGroup : public AutoSweepBase {
-#ifdef DEBUG
-  ObjectGroup* group_;
-#endif
-
- public:
-  inline explicit AutoSweepObjectGroup(ObjectGroup* group);
-#ifdef DEBUG
-  inline ~AutoSweepObjectGroup();
-
-  ObjectGroup* group() const { return group_; }
-#endif
-};
-
-// Sweep the type inference data in a JitScript. Functions that expect a swept
-// script should take a reference to this class.
-class MOZ_RAII AutoSweepJitScript : public AutoSweepBase {
-#ifdef DEBUG
-  Zone* zone_;
-  jit::JitScript* jitScript_;
-#endif
-
- public:
-  inline explicit AutoSweepJitScript(BaseScript* script);
-#ifdef DEBUG
-  inline ~AutoSweepJitScript();
-
-  jit::JitScript* jitScript() const { return jitScript_; }
-  Zone* zone() const { return zone_; }
-#endif
-};
-
-CompilerConstraintList* NewCompilerConstraintList(jit::TempAllocator& alloc);
-
-// Stack class to record information about constraints that need to be added
-// after finishing the Definite Properties Analysis. When the analysis succeeds
-// the |finishConstraints| method must be called to add the constraints to the
-// TypeSets.
-//
-// There are two constraint types managed here:
-//
-//   1. Proto constraints for HeapTypeSets, to guard against things like getters
-//      and setters on the proto chain.
-//
-//   2. Inlining constraints for StackTypeSets, to invalidate when additional
-//      functions could be called at call sites where we inlined a function.
-//
-// This class uses bare GC-thing pointers because GC is suppressed when the
-// analysis runs.
-class MOZ_RAII DPAConstraintInfo {
-  struct ProtoConstraint {
-    JSObject* proto;
-    jsid id;
-    ProtoConstraint(JSObject* proto, jsid id) : proto(proto), id(id) {}
-  };
-  struct InliningConstraint {
-    JSScript* caller;
-    JSScript* callee;
-    InliningConstraint(JSScript* caller, JSScript* callee)
-        : caller(caller), callee(callee) {}
-  };
-
-  JS::AutoCheckCannotGC nogc_;
-  Vector<ProtoConstraint, 8> protoConstraints_;
-  Vector<InliningConstraint, 4> inliningConstraints_;
-
- public:
-  explicit DPAConstraintInfo(JSContext* cx)
-      : nogc_(cx), protoConstraints_(cx), inliningConstraints_(cx) {}
-
-  DPAConstraintInfo(const DPAConstraintInfo&) = delete;
-  void operator=(const DPAConstraintInfo&) = delete;
-
-  MOZ_MUST_USE bool addProtoConstraint(JSObject* proto, jsid id) {
-    return protoConstraints_.emplaceBack(proto, id);
-  }
-  MOZ_MUST_USE bool addInliningConstraint(JSScript* caller, JSScript* callee) {
-    return inliningConstraints_.emplaceBack(caller, callee);
-  }
-
-  MOZ_MUST_USE bool finishConstraints(JSContext* cx, ObjectGroup* group);
-};
-
-bool AddClearDefiniteGetterSetterForPrototypeChain(
-    JSContext* cx, DPAConstraintInfo& constraintInfo, ObjectGroup* group,
-    HandleId id, bool* added);
-
-bool AddClearDefiniteFunctionUsesInScript(JSContext* cx, ObjectGroup* group,
-                                          JSScript* script,
-                                          JSScript* calleeScript);
-
-// For groups where only a small number of objects have been allocated, this
-// structure keeps track of all objects in the group. Once COUNT objects have
-// been allocated, this structure is cleared and the objects are analyzed, to
-// perform the new script properties analyses or determine if an unboxed
-// representation can be used.
-class PreliminaryObjectArray {
- public:
-  static const uint32_t COUNT = 20;
-
- private:
-  // All objects with the type which have been allocated. The pointers in
-  // this array are weak.
-  JSObject* objects[COUNT] = {};  // zeroes
-
- public:
-  PreliminaryObjectArray() = default;
-
-  void registerNewObject(PlainObject* res);
-
-  JSObject* get(size_t i) const {
-    MOZ_ASSERT(i < COUNT);
-    return objects[i];
-  }
-
-  bool full() const;
-  void sweep();
-};
-
-class PreliminaryObjectArrayWithTemplate : public PreliminaryObjectArray {
-  HeapPtr<Shape*> shape_;
-
- public:
-  explicit PreliminaryObjectArrayWithTemplate(Shape* shape) : shape_(shape) {}
-
-  Shape* shape() { return shape_; }
-
-  void maybeAnalyze(JSContext* cx, ObjectGroup* group, bool force = false);
-
-  void trace(JSTracer* trc);
-
-  static void preWriteBarrier(
-      PreliminaryObjectArrayWithTemplate* preliminaryObjects);
-};
-
-/**
- * A type representing the initializer of a property within a script being
- * 'new'd.
- */
-class TypeNewScriptInitializer {
- public:
-  enum Kind { SETPROP, SETPROP_FRAME } kind;
-  uint32_t offset;
-
-  TypeNewScriptInitializer(Kind kind, uint32_t offset)
-      : kind(kind), offset(offset) {}
-};
-
-/* Is this a reasonable PC to be doing inlining on? */
-inline bool isInlinableCall(jsbytecode* pc);
-
-bool ClassCanHaveExtraProperties(const JSClass* clasp);
-
-class RecompileInfo {
-  JSScript* script_;
-  IonCompilationId id_;
-
- public:
-  RecompileInfo(JSScript* script, IonCompilationId id)
-      : script_(script), id_(id) {}
-
-  JSScript* script() const { return script_; }
-
-  inline jit::IonScript* maybeIonScriptToInvalidate(const TypeZone& zone) const;
-
-  inline bool shouldSweep(const TypeZone& zone);
-
-  bool operator==(const RecompileInfo& other) const {
-    return script_ == other.script_ && id_ == other.id_;
-  }
-};
-
-// The RecompileInfoVector has a MinInlineCapacity of one so that invalidating a
-// single IonScript doesn't require an allocation.
-typedef Vector<RecompileInfo, 1, SystemAllocPolicy> RecompileInfoVector;
-
-// Generate the type constraints for the compilation. Sets |isValidOut| based on
-// whether the type constraints still hold.
-bool FinishCompilation(JSContext* cx, HandleScript script,
-                       CompilerConstraintList* constraints,
-                       IonCompilationId compilationId, bool* isValidOut);
-
-// Update the actual types in any scripts queried by constraints with any
-// speculative types added during the definite properties analysis.
-void FinishDefinitePropertiesAnalysis(JSContext* cx,
-                                      CompilerConstraintList* constraints);
-
-struct AutoEnterAnalysis;
-
-class TypeZone {
-  JS::Zone* const zone_;
-
-  /* Pool for type information in this zone. */
-  static const size_t TYPE_LIFO_ALLOC_PRIMARY_CHUNK_SIZE = 8 * 1024;
-  ZoneData<LifoAlloc> typeLifoAlloc_;
-
-  // Under CodeGenerator::link, the id of the current compilation.
-  ZoneData<mozilla::Maybe<IonCompilationId>> currentCompilationId_;
-
-  TypeZone(const TypeZone&) = delete;
-  void operator=(const TypeZone&) = delete;
-
- public:
-  // Current generation for sweeping.
-  ZoneOrGCTaskOrIonCompileData<uint32_t> generation;
-
-  // During incremental sweeping, allocator holding the old type information
-  // for the zone.
-  ZoneData<LifoAlloc> sweepTypeLifoAlloc;
-
-  ZoneData<bool> sweepingTypes;
-  ZoneData<bool> oomSweepingTypes;
-
-  ZoneData<bool> keepJitScripts;
-
-  // The topmost AutoEnterAnalysis on the stack, if there is one.
-  ZoneData<AutoEnterAnalysis*> activeAnalysis;
-
-  explicit TypeZone(JS::Zone* zone);
-  ~TypeZone();
-
-  JS::Zone* zone() const { return zone_; }
-
-  LifoAlloc& typeLifoAlloc() {
-#ifdef JS_CRASH_DIAGNOSTICS
-    MOZ_RELEASE_ASSERT(CurrentThreadCanAccessZone(zone_));
-#endif
-    return typeLifoAlloc_.ref();
-  }
-
-  void beginSweep();
-  void endSweep(JSRuntime* rt);
-  void clearAllNewScriptsOnOOM();
-
-  /* Mark a script as needing recompilation once inference has finished. */
-  void addPendingRecompile(JSContext* cx, const RecompileInfo& info);
-  void addPendingRecompile(JSContext* cx, JSScript* script);
-
-  void processPendingRecompiles(JSFreeOp* fop, RecompileInfoVector& recompiles);
-
-  bool isSweepingTypes() const { return sweepingTypes; }
-  void setSweepingTypes(bool sweeping) {
-    MOZ_RELEASE_ASSERT(sweepingTypes != sweeping);
-    MOZ_ASSERT_IF(sweeping, !oomSweepingTypes);
-    sweepingTypes = sweeping;
-    oomSweepingTypes = false;
-  }
-  void setOOMSweepingTypes() {
-    MOZ_ASSERT(sweepingTypes);
-    oomSweepingTypes = true;
-  }
-  bool hadOOMSweepingTypes() {
-    MOZ_ASSERT(sweepingTypes);
-    return oomSweepingTypes;
-  }
-
-  mozilla::Maybe<IonCompilationId> currentCompilationId() const {
-    return currentCompilationId_.ref();
-  }
-  mozilla::Maybe<IonCompilationId>& currentCompilationIdRef() {
-    return currentCompilationId_.ref();
-  }
-};
-
-enum TypeSpewChannel {
-  ISpewOps,    /* ops: New constraints and types. */
-  ISpewResult, /* result: Final type sets. */
-  SPEW_COUNT
-};
-
-#ifdef DEBUG
-
-bool InferSpewActive(TypeSpewChannel channel);
-const char* InferSpewColorReset();
-const char* InferSpewColor(TypeConstraint* constraint);
-const char* InferSpewColor(TypeSet* types);
-
-#  define InferSpew(channel, ...)   \
-    if (InferSpewActive(channel)) { \
-      InferSpewImpl(__VA_ARGS__);   \
-    } else {                        \
-    }
-void InferSpewImpl(const char* fmt, ...) MOZ_FORMAT_PRINTF(1, 2);
-
-/* Check that the type property for id in group contains value. */
-bool ObjectGroupHasProperty(JSContext* cx, ObjectGroup* group, jsid id,
-                            const Value& value);
-
-#else
-
-inline const char* InferSpewColorReset() { return nullptr; }
-inline const char* InferSpewColor(TypeConstraint* constraint) {
-  return nullptr;
-}
-inline const char* InferSpewColor(TypeSet* types) { return nullptr; }
-
-#  define InferSpew(channel, ...) \
-    do {                          \
-    } while (0)
-
-#endif
-
-// Prints type information for a context if spew is enabled or force is set.
-void PrintTypes(JSContext* cx, JS::Compartment* comp, bool force);
-
-} /* namespace js */
-
-// JS::ubi::Nodes can point to object groups; they're js::gc::Cell instances
-// with no associated compartment.
-namespace JS {
-namespace ubi {
-
-template <>
-class Concrete<js::ObjectGroup> : TracerConcrete<js::ObjectGroup> {
- protected:
-  explicit Concrete(js::ObjectGroup* ptr)
-      : TracerConcrete<js::ObjectGroup>(ptr) {}
-
- public:
-  static void construct(void* storage, js::ObjectGroup* ptr) {
-    new (storage) Concrete(ptr);
-  }
-
-  Size size(mozilla::MallocSizeOf mallocSizeOf) const override;
-
-  const char16_t* typeName() const override { return concreteTypeName; }
-  static const char16_t concreteTypeName[];
-};
-
-}  // namespace ubi
-}  // namespace JS
-
-#endif /* vm_TypeInference_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/TypeInference-inl.h firefox-85.0+build1/js/src/vm/TypeInference-inl.h
--- firefox-84.0.2+build1/js/src/vm/TypeInference-inl.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypeInference-inl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1501 +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/. */
-
-/* Inline members for javascript type inference. */
-
-#ifndef vm_TypeInference_inl_h
-#define vm_TypeInference_inl_h
-
-#include "vm/TypeInference.h"
-
-#include "mozilla/BinarySearch.h"
-#include "mozilla/Casting.h"
-#include "mozilla/PodOperations.h"
-
-#include <utility>  // for ::std::swap
-
-#include "builtin/Symbol.h"
-#include "gc/GC.h"
-#include "jit/BaselineJIT.h"
-#include "jit/IonScript.h"
-#include "jit/JitScript.h"
-#include "js/HeapAPI.h"
-#include "util/DiagnosticAssertions.h"
-#include "vm/ArrayObject.h"
-#include "vm/BooleanObject.h"
-#include "vm/JSFunction.h"
-#include "vm/NativeObject.h"
-#include "vm/NumberObject.h"
-#include "vm/ObjectGroup.h"
-#include "vm/PlainObject.h"  // js::PlainObject
-#include "vm/Shape.h"
-#include "vm/SharedArrayObject.h"
-#include "vm/StringObject.h"
-#include "vm/TypedArrayObject.h"
-
-#include "jit/JitScript-inl.h"
-#include "vm/JSContext-inl.h"
-#include "vm/JSScript-inl.h"
-#include "vm/ObjectGroup-inl.h"
-
-namespace js {
-
-/////////////////////////////////////////////////////////////////////
-// RecompileInfo
-/////////////////////////////////////////////////////////////////////
-
-jit::IonScript* RecompileInfo::maybeIonScriptToInvalidate(
-    const TypeZone& zone) const {
-  MOZ_ASSERT(script_->zone() == zone.zone());
-
-  // Make sure this is not called under CodeGenerator::link (before the
-  // IonScript is created).
-  MOZ_ASSERT_IF(zone.currentCompilationId(),
-                zone.currentCompilationId().ref() != id_);
-
-  if (!script_->hasIonScript() ||
-      script_->ionScript()->compilationId() != id_) {
-    return nullptr;
-  }
-
-  return script_->ionScript();
-}
-
-inline bool RecompileInfo::shouldSweep(const TypeZone& zone) {
-  if (IsAboutToBeFinalizedUnbarriered(&script_)) {
-    return true;
-  }
-
-  MOZ_ASSERT(script_->zone() == zone.zone());
-
-  // Don't sweep if we're called under CodeGenerator::link, before the
-  // IonScript is created.
-  if (zone.currentCompilationId() && zone.currentCompilationId().ref() == id_) {
-    return false;
-  }
-
-  return maybeIonScriptToInvalidate(zone) == nullptr;
-}
-
-/////////////////////////////////////////////////////////////////////
-// Types
-/////////////////////////////////////////////////////////////////////
-
-/* static */ inline TypeSet::ObjectKey* TypeSet::ObjectKey::get(JSObject* obj) {
-  MOZ_ASSERT(obj);
-  if (obj->isSingleton()) {
-    return (ObjectKey*)(uintptr_t(obj) | 1);
-  }
-  return (ObjectKey*)obj->group();
-}
-
-/* static */ inline TypeSet::ObjectKey* TypeSet::ObjectKey::get(
-    ObjectGroup* group) {
-  MOZ_ASSERT(group);
-  if (group->singleton()) {
-    return (ObjectKey*)(uintptr_t(group->singleton()) | 1);
-  }
-  return (ObjectKey*)group;
-}
-
-inline ObjectGroup* TypeSet::ObjectKey::groupNoBarrier() {
-  MOZ_ASSERT(isGroup());
-  return (ObjectGroup*)this;
-}
-
-inline JSObject* TypeSet::ObjectKey::singletonNoBarrier() {
-  MOZ_ASSERT(isSingleton());
-  return (JSObject*)(uintptr_t(this) & ~1);
-}
-
-inline ObjectGroup* TypeSet::ObjectKey::group() {
-  ObjectGroup* res = groupNoBarrier();
-  gc::ReadBarrier(res);
-  return res;
-}
-
-inline JSObject* TypeSet::ObjectKey::singleton() {
-  JSObject* res = singletonNoBarrier();
-  gc::ReadBarrier(res);
-  return res;
-}
-
-inline JS::Compartment* TypeSet::ObjectKey::maybeCompartment() {
-  if (isSingleton()) {
-    return singletonNoBarrier()->compartment();
-  }
-
-  return groupNoBarrier()->compartment();
-}
-
-/* static */ inline TypeSet::Type TypeSet::ObjectType(const JSObject* obj) {
-  if (obj->isSingleton()) {
-    return Type(uintptr_t(obj) | 1);
-  }
-  return Type(uintptr_t(obj->group()));
-}
-
-/* static */ inline TypeSet::Type TypeSet::ObjectType(
-    const ObjectGroup* group) {
-  if (group->singleton()) {
-    return Type(uintptr_t(group->singleton()) | 1);
-  }
-  return Type(uintptr_t(group));
-}
-
-/* static */ inline TypeSet::Type TypeSet::ObjectType(const ObjectKey* obj) {
-  return Type(uintptr_t(obj));
-}
-
-// static
-inline TypeSet::Type TypeSet::PrimitiveType(const JS::Value& val) {
-  MOZ_ASSERT(!val.isObject());
-  MOZ_ASSERT(!IsUntrackedValue(val));
-
-  if (val.isDouble()) {
-    return DoubleType();
-  }
-  return Type(val.extractNonDoubleType());
-}
-
-// static
-inline TypeSet::Type TypeSet::PrimitiveType(jit::MIRType type) {
-  switch (type) {
-    case jit::MIRType::Undefined:
-      return UndefinedType();
-    case jit::MIRType::Null:
-      return NullType();
-    case jit::MIRType::Boolean:
-      return BooleanType();
-    case jit::MIRType::Int32:
-      return Int32Type();
-    case jit::MIRType::Float32:
-    case jit::MIRType::Double:
-      return DoubleType();
-    case jit::MIRType::String:
-      return StringType();
-    case jit::MIRType::Symbol:
-      return SymbolType();
-    case jit::MIRType::BigInt:
-      return BigIntType();
-    case jit::MIRType::MagicOptimizedArguments:
-      return MagicArgType();
-    default:
-      MOZ_CRASH("Unexpected MIR type");
-  }
-}
-
-// static
-inline TypeSet::Type TypeSet::PrimitiveOrAnyObjectType(jit::MIRType type) {
-  if (type == jit::MIRType::Object) {
-    return AnyObjectType();
-  }
-  return PrimitiveType(type);
-}
-
-// static
-inline TypeSet::Type TypeSet::GetMaybeUntrackedType(jit::MIRType type) {
-  if (IsUntrackedMIRType(type)) {
-    // This type cannot be represented in a TypeSet.
-    return UnknownType();
-  }
-  return PrimitiveOrAnyObjectType(type);
-}
-
-// static
-inline TypeSet::Type TypeSet::PrimitiveTypeFromTypeFlag(TypeFlags flag) {
-  switch (flag) {
-    case TYPE_FLAG_UNDEFINED:
-      return UndefinedType();
-    case TYPE_FLAG_NULL:
-      return NullType();
-    case TYPE_FLAG_BOOLEAN:
-      return BooleanType();
-    case TYPE_FLAG_INT32:
-      return Int32Type();
-    case TYPE_FLAG_DOUBLE:
-      return DoubleType();
-    case TYPE_FLAG_STRING:
-      return StringType();
-    case TYPE_FLAG_SYMBOL:
-      return SymbolType();
-    case TYPE_FLAG_BIGINT:
-      return BigIntType();
-    case TYPE_FLAG_LAZYARGS:
-      return MagicArgType();
-    default:
-      MOZ_CRASH("Unexpected TypeFlag");
-  }
-}
-
-inline TypeSet::Type TypeSet::GetValueType(const Value& val) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  if (val.isObject()) {
-    return TypeSet::ObjectType(&val.toObject());
-  }
-  return TypeSet::PrimitiveType(val);
-}
-
-inline bool TypeSet::IsUntrackedValue(const Value& val) {
-  // JS_OPTIMIZED_ARGUMENTS is the only MagicValue that can be stored in a
-  // TypeSet.
-  return val.isMagic() && val.whyMagic() != JS_OPTIMIZED_ARGUMENTS;
-}
-
-inline bool TypeSet::IsUntrackedMIRType(jit::MIRType type) {
-  return jit::IsMagicType(type) &&
-         type != jit::MIRType::MagicOptimizedArguments;
-}
-
-inline TypeSet::Type TypeSet::GetMaybeUntrackedValueType(const Value& val) {
-  return IsUntrackedValue(val) ? UnknownType() : GetValueType(val);
-}
-
-inline TypeFlags PrimitiveTypeFlag(TypeSet::Type type) {
-  MOZ_ASSERT(type.isPrimitive());
-
-  switch (type.primitive()) {
-    case ValueType::Undefined:
-      return TYPE_FLAG_UNDEFINED;
-    case ValueType::Null:
-      return TYPE_FLAG_NULL;
-    case ValueType::Boolean:
-      return TYPE_FLAG_BOOLEAN;
-    case ValueType::Int32:
-      return TYPE_FLAG_INT32;
-    case ValueType::Double:
-      return TYPE_FLAG_DOUBLE;
-    case ValueType::String:
-      return TYPE_FLAG_STRING;
-    case ValueType::Symbol:
-      return TYPE_FLAG_SYMBOL;
-    case ValueType::BigInt:
-      return TYPE_FLAG_BIGINT;
-    case ValueType::Magic:
-      return TYPE_FLAG_LAZYARGS;
-    case ValueType::PrivateGCThing:
-    case ValueType::Object:
-      break;
-  }
-
-  MOZ_CRASH("Bad primitive type");
-}
-
-inline JSValueType TypeFlagPrimitive(TypeFlags flags) {
-  switch (flags) {
-    case TYPE_FLAG_UNDEFINED:
-      return JSVAL_TYPE_UNDEFINED;
-    case TYPE_FLAG_NULL:
-      return JSVAL_TYPE_NULL;
-    case TYPE_FLAG_BOOLEAN:
-      return JSVAL_TYPE_BOOLEAN;
-    case TYPE_FLAG_INT32:
-      return JSVAL_TYPE_INT32;
-    case TYPE_FLAG_DOUBLE:
-      return JSVAL_TYPE_DOUBLE;
-    case TYPE_FLAG_STRING:
-      return JSVAL_TYPE_STRING;
-    case TYPE_FLAG_SYMBOL:
-      return JSVAL_TYPE_SYMBOL;
-    case TYPE_FLAG_BIGINT:
-      return JSVAL_TYPE_BIGINT;
-    case TYPE_FLAG_LAZYARGS:
-      return JSVAL_TYPE_MAGIC;
-    default:
-      MOZ_CRASH("Bad TypeFlags");
-  }
-}
-
-/*
- * Get the canonical representation of an id to use when doing inference.  This
- * maintains the constraint that if two different jsids map to the same property
- * in JS (e.g. 3 and "3"), they have the same type representation.
- */
-inline jsid IdToTypeId(jsid id) {
-  MOZ_ASSERT(!JSID_IS_EMPTY(id));
-
-  // All properties which can be stored in an object's dense elements must
-  // map to the aggregate property for index types.
-  return JSID_IS_INT(id) ? JSID_VOID : id;
-}
-
-const char* TypeIdStringImpl(jsid id);
-
-/* Convert an id for printing during debug. */
-static inline const char* TypeIdString(jsid id) {
-#ifdef DEBUG
-  return TypeIdStringImpl(id);
-#else
-  return "(missing)";
-#endif
-}
-
-TemporaryTypeSet::TemporaryTypeSet(LifoAlloc* alloc, jit::MIRType type)
-    : TemporaryTypeSet(alloc, PrimitiveOrAnyObjectType(type)) {
-  MOZ_ASSERT(type != jit::MIRType::Value);
-}
-
-// New script properties analyses overview.
-//
-// When constructing objects using 'new' on a script, we attempt to determine
-// the properties which that object will eventually have. This is done via two
-// analyses. One of these, the definite properties analysis, is static, and the
-// other, the acquired properties analysis, is dynamic. As objects are
-// constructed using 'new' on some script to create objects of group G, our
-// analysis strategy is as follows:
-//
-// - When the first objects are created, no analysis is immediately performed.
-//   Instead, all objects of group G are accumulated in an array.
-//
-// - After a certain number of such objects have been created, the definite
-//   properties analysis is performed. This analyzes the body of the
-//   constructor script and any other functions it calls to look for properties
-//   which will definitely be added by the constructor in a particular order,
-//   creating an object with shape S.
-//
-// - The properties in S are compared with the greatest common prefix P of the
-//   shapes of the objects that have been created. If P has more properties
-//   than S, the acquired properties analysis is performed.
-//
-// - The acquired properties analysis marks all properties in P as definite
-//   in G, and creates a new group IG for objects which are partially
-//   initialized. Objects of group IG are initially created with shape S, and if
-//   they are later given shape P, their group can be changed to G.
-//
-// For objects which are rarely created, the definite properties analysis can
-// be triggered after only one or a few objects have been allocated, when code
-// being Ion compiled might access them. In this case type information in the
-// constructor might not be good enough for the definite properties analysis to
-// compute useful information, but the acquired properties analysis will still
-// be able to identify definite properties in this case.
-//
-// This layered approach is designed to maximize performance on easily
-// analyzable code, while still allowing us to determine definite properties
-// robustly when code consistently adds the same properties to objects, but in
-// complex ways which can't be understood statically.
-class TypeNewScript {
- private:
-  // Variable-length list of TypeNewScriptInitializer pointers.
-  struct InitializerList {
-    size_t length;
-    TypeNewScriptInitializer entries[1];
-  };
-
-  // Scripted function which this information was computed for.
-  HeapPtr<JSFunction*> function_ = {};
-
-  // Any preliminary objects with the type. The analyses are not performed
-  // until this array is cleared.
-  PreliminaryObjectArray* preliminaryObjects = nullptr;
-
-  // After the new script properties analyses have been performed, a template
-  // object to use for newly constructed objects. The shape of this object
-  // reflects all definite properties the object will have, and the
-  // allocation kind to use.
-  HeapPtr<PlainObject*> templateObject_ = {};
-
-  // Order in which definite properties become initialized. We need this in
-  // case the definite properties are invalidated (such as by adding a setter
-  // to an object on the prototype chain) while an object is in the middle of
-  // being initialized, so we can walk the stack and fixup any objects which
-  // look for in-progress objects which were prematurely set with an incorrect
-  // shape. Property assignments in inner frames are preceded by a series of
-  // SETPROP_FRAME entries specifying the stack down to the frame containing
-  // the write.
-  InitializerList* initializerList = nullptr;
-
-  // If there are additional properties found by the acquired properties
-  // analysis which were not found by the definite properties analysis, this
-  // shape contains all such additional properties (plus the definite
-  // properties). When an object of this group acquires this shape, it is
-  // fully initialized and its group can be changed to initializedGroup.
-  HeapPtr<Shape*> initializedShape_ = {};
-
-  // Group with definite properties set for all properties found by
-  // both the definite and acquired properties analyses.
-  HeapPtr<ObjectGroup*> initializedGroup_ = {};
-
- public:
-  TypeNewScript() = default;
-
-  ~TypeNewScript() {
-    js_delete(preliminaryObjects);
-    js_free(initializerList);
-  }
-
-  void clear() {
-    function_ = nullptr;
-    templateObject_ = nullptr;
-    initializedShape_ = nullptr;
-    initializedGroup_ = nullptr;
-  }
-
-  static void preWriteBarrier(TypeNewScript* newScript);
-
-  bool analyzed() const { return preliminaryObjects == nullptr; }
-
-  PlainObject* templateObject() const { return templateObject_; }
-
-  Shape* initializedShape() const { return initializedShape_; }
-
-  ObjectGroup* initializedGroup() const { return initializedGroup_; }
-
-  JSFunction* function() const { return function_; }
-
-  void trace(JSTracer* trc);
-  void sweep();
-
-  void registerNewObject(PlainObject* res);
-  bool maybeAnalyze(JSContext* cx, ObjectGroup* group, bool* regenerate,
-                    bool force = false);
-
-  bool rollbackPartiallyInitializedObjects(JSContext* cx, ObjectGroup* group);
-
-  static bool make(JSContext* cx, ObjectGroup* group, JSFunction* fun);
-
-  size_t sizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
-
-  size_t gcMallocBytes() const;
-
-  static size_t offsetOfPreliminaryObjects() {
-    return offsetof(TypeNewScript, preliminaryObjects);
-  }
-
-  static size_t sizeOfInitializerList(size_t length);
-};
-
-inline bool ObjectGroup::hasUnanalyzedPreliminaryObjects() {
-  return (newScriptDontCheckGeneration() &&
-          !newScriptDontCheckGeneration()->analyzed()) ||
-         maybePreliminaryObjectsDontCheckGeneration();
-}
-
-class MOZ_RAII AutoSuppressAllocationMetadataBuilder {
-  JS::Zone* zone;
-  bool saved;
-
- public:
-  explicit AutoSuppressAllocationMetadataBuilder(JSContext* cx)
-      : AutoSuppressAllocationMetadataBuilder(cx->realm()->zone()) {}
-
-  explicit AutoSuppressAllocationMetadataBuilder(JS::Zone* zone)
-      : zone(zone), saved(zone->suppressAllocationMetadataBuilder) {
-    zone->suppressAllocationMetadataBuilder = true;
-  }
-
-  ~AutoSuppressAllocationMetadataBuilder() {
-    zone->suppressAllocationMetadataBuilder = saved;
-  }
-};
-
-/*
- * Structure for type inference entry point functions. All functions which can
- * change type information must use this, and functions which depend on
- * intermediate types (i.e. JITs) can use this to ensure that intermediate
- * information is not collected and does not change.
- *
- * Ensures that GC cannot occur. Does additional sanity checking that inference
- * is not reentrant and that recompilations occur properly.
- */
-struct MOZ_RAII AutoEnterAnalysis {
-  // Prevent GC activity in the middle of analysis.
-  gc::AutoSuppressGC suppressGC;
-
-  // Allow clearing inference info on OOM during incremental sweeping. This is
-  // constructed for the outermost AutoEnterAnalysis on the stack.
-  mozilla::Maybe<AutoClearTypeInferenceStateOnOOM> oom;
-
-  // Pending recompilations to perform before execution of JIT code can resume.
-  RecompileInfoVector pendingRecompiles;
-
-  // Prevent us from calling the objectMetadataCallback.
-  js::AutoSuppressAllocationMetadataBuilder suppressMetadata;
-
-  JSFreeOp* freeOp;
-  Zone* zone;
-
-  explicit AutoEnterAnalysis(JSContext* cx)
-      : suppressGC(cx), suppressMetadata(cx) {
-    init(cx->defaultFreeOp(), cx->zone());
-  }
-
-  AutoEnterAnalysis(JSFreeOp* fop, Zone* zone)
-      : suppressGC(TlsContext.get()), suppressMetadata(zone) {
-    init(fop, zone);
-  }
-
-  ~AutoEnterAnalysis() {
-    if (this != zone->types.activeAnalysis) {
-      return;
-    }
-
-    zone->types.activeAnalysis = nullptr;
-
-    if (!pendingRecompiles.empty()) {
-      zone->types.processPendingRecompiles(freeOp, pendingRecompiles);
-    }
-  }
-
- private:
-  void init(JSFreeOp* fop, Zone* zone) {
-#ifdef JS_CRASH_DIAGNOSTICS
-    MOZ_RELEASE_ASSERT(CurrentThreadCanAccessZone(zone));
-#endif
-    this->freeOp = fop;
-    this->zone = zone;
-
-    if (!zone->types.activeAnalysis) {
-      oom.emplace(zone);
-      zone->types.activeAnalysis = this;
-    }
-  }
-};
-
-/////////////////////////////////////////////////////////////////////
-// Interface functions
-/////////////////////////////////////////////////////////////////////
-
-void TypeMonitorCallSlow(JSContext* cx, JSObject* callee, const CallArgs& args,
-                         bool constructing);
-
-/*
- * Monitor a javascript call, either on entry to the interpreter or made
- * from within the interpreter.
- */
-inline void TypeMonitorCall(JSContext* cx, const js::CallArgs& args,
-                            bool constructing) {
-  if (args.callee().is<JSFunction>()) {
-    JSFunction* fun = &args.callee().as<JSFunction>();
-    if (fun->isInterpreted() && fun->nonLazyScript()->hasJitScript() &&
-        IsTypeInferenceEnabled()) {
-      TypeMonitorCallSlow(cx, &args.callee(), args, constructing);
-    }
-  }
-}
-
-MOZ_ALWAYS_INLINE bool TrackPropertyTypes(JSObject* obj, jsid id) {
-  if (obj->hasLazyGroup() ||
-      obj->group()->unknownPropertiesDontCheckGeneration()) {
-    return false;
-  }
-
-  if (obj->isSingleton() &&
-      !obj->group()->maybeGetPropertyDontCheckGeneration(id)) {
-    return false;
-  }
-
-  return true;
-}
-
-void EnsureTrackPropertyTypes(JSContext* cx, JSObject* obj, jsid id);
-
-inline bool CanHaveEmptyPropertyTypesForOwnProperty(JSObject* obj) {
-  // Per the comment on TypeSet::propertySet, property type sets for global
-  // objects may be empty for 'own' properties if the global property still
-  // has its initial undefined value.
-  return obj->is<GlobalObject>();
-}
-
-inline bool PropertyHasBeenMarkedNonConstant(JSObject* obj, jsid id) {
-  // Non-constant properties are only relevant for singleton objects.
-  if (!obj->isSingleton()) {
-    return true;
-  }
-
-  // EnsureTrackPropertyTypes must have been called on this object.
-  AutoSweepObjectGroup sweep(obj->group());
-  if (obj->group()->unknownProperties(sweep)) {
-    return true;
-  }
-  HeapTypeSet* types = obj->group()->maybeGetProperty(sweep, IdToTypeId(id));
-  return types->nonConstantProperty();
-}
-
-MOZ_ALWAYS_INLINE bool HasTrackedPropertyType(JSObject* obj, jsid id,
-                                              TypeSet::Type type) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(id == IdToTypeId(id));
-  MOZ_ASSERT(TrackPropertyTypes(obj, id));
-
-  if (HeapTypeSet* types =
-          obj->group()->maybeGetPropertyDontCheckGeneration(id)) {
-    if (!types->hasType(type)) {
-      return false;
-    }
-    // Non-constant properties are only relevant for singleton objects.
-    if (obj->isSingleton() && !types->nonConstantProperty()) {
-      return false;
-    }
-    return true;
-  }
-
-  return false;
-}
-
-MOZ_ALWAYS_INLINE bool HasTypePropertyId(JSObject* obj, jsid id,
-                                         TypeSet::Type type) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-
-  id = IdToTypeId(id);
-  if (!TrackPropertyTypes(obj, id)) {
-    return true;
-  }
-
-  return HasTrackedPropertyType(obj, id, type);
-}
-
-MOZ_ALWAYS_INLINE bool HasTypePropertyId(JSObject* obj, jsid id,
-                                         const Value& value) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  return HasTypePropertyId(obj, id, TypeSet::GetValueType(value));
-}
-
-void AddTypePropertyId(JSContext* cx, ObjectGroup* group, JSObject* obj,
-                       jsid id, TypeSet::Type type);
-void AddTypePropertyId(JSContext* cx, ObjectGroup* group, JSObject* obj,
-                       jsid id, const Value& value);
-
-/* Add a possible type for a property of obj. */
-MOZ_ALWAYS_INLINE void AddTypePropertyId(JSContext* cx, JSObject* obj, jsid id,
-                                         TypeSet::Type type) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  id = IdToTypeId(id);
-  if (TrackPropertyTypes(obj, id) && !HasTrackedPropertyType(obj, id, type)) {
-    AddTypePropertyId(cx, obj->group(), obj, id, type);
-  }
-}
-
-void AddMagicTypePropertyId(JSContext* cx, JSObject* obj, jsid id,
-                            JSWhyMagic type);
-
-MOZ_ALWAYS_INLINE void AddTypePropertyId(JSContext* cx, JSObject* obj, jsid id,
-                                         const Value& value) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  if (MOZ_UNLIKELY(value.isMagic())) {
-    AddMagicTypePropertyId(cx, obj, id, value.whyMagic());
-  } else {
-    AddTypePropertyId(cx, obj, id, TypeSet::GetValueType(value));
-  }
-}
-
-inline void MarkObjectGroupFlags(JSContext* cx, JSObject* obj,
-                                 ObjectGroupFlags flags) {
-  if (obj->hasLazyGroup()) {
-    return;
-  }
-
-  AutoSweepObjectGroup sweep(obj->group());
-  if (!obj->group()->hasAllFlags(sweep, flags)) {
-    obj->group()->setFlags(sweep, cx, flags);
-  }
-}
-
-inline void MarkObjectGroupUnknownProperties(JSContext* cx, ObjectGroup* obj) {
-  AutoSweepObjectGroup sweep(obj);
-  if (!obj->unknownProperties(sweep)) {
-    obj->markUnknown(sweep, cx);
-  }
-}
-
-inline void MarkTypePropertyNonData(JSContext* cx, JSObject* obj, jsid id) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  id = IdToTypeId(id);
-  if (TrackPropertyTypes(obj, id)) {
-    obj->group()->markPropertyNonData(cx, obj, id);
-  }
-}
-
-inline void MarkTypePropertyNonWritable(JSContext* cx, JSObject* obj, jsid id) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  id = IdToTypeId(id);
-  if (TrackPropertyTypes(obj, id)) {
-    obj->group()->markPropertyNonWritable(cx, obj, id);
-  }
-}
-
-/* Mark a state change on a particular object. */
-inline void MarkObjectStateChange(JSContext* cx, JSObject* obj) {
-  if (obj->hasLazyGroup()) {
-    return;
-  }
-
-  AutoSweepObjectGroup sweep(obj->group());
-  if (!obj->group()->unknownProperties(sweep)) {
-    obj->group()->markStateChange(sweep, cx);
-  }
-}
-
-/* static */ inline void jit::JitScript::MonitorBytecodeType(
-    JSContext* cx, JSScript* script, jsbytecode* pc, StackTypeSet* types,
-    const js::Value& rval) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  if (MOZ_UNLIKELY(rval.isMagic())) {
-    MonitorMagicValueBytecodeType(cx, script, pc, rval);
-    return;
-  }
-
-  TypeSet::Type type = TypeSet::GetValueType(rval);
-  if (!types->hasType(type)) {
-    MonitorBytecodeTypeSlow(cx, script, pc, types, type);
-  }
-}
-
-/* static */ inline void jit::JitScript::MonitorAssign(JSContext* cx,
-                                                       HandleObject obj,
-                                                       jsid id) {
-  if (!obj->isSingleton()) {
-    /*
-     * Mark as unknown any object which has had dynamic assignments to
-     * non-integer properties at SETELEM opcodes. This avoids making large
-     * numbers of type properties for hashmap-style objects. We don't need
-     * to do this for objects with singleton type, because type properties
-     * are only constructed for them when analyzed scripts depend on those
-     * specific properties.
-     */
-    uint32_t i;
-    if (IdIsIndex(id, &i)) {
-      return;
-    }
-
-    // But if we don't have too many properties yet, don't do anything.  The
-    // idea here is that normal object initialization should not trigger
-    // deoptimization in most cases, while actual usage as a hashmap should.
-    ObjectGroup* group = obj->group();
-    if (group->basePropertyCountDontCheckGeneration() < 128) {
-      return;
-    }
-    MarkObjectGroupUnknownProperties(cx, group);
-  }
-}
-
-/* static */ inline void jit::JitScript::MonitorThisType(JSContext* cx,
-                                                         JSScript* script,
-                                                         TypeSet::Type type) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  cx->check(script, type);
-
-  JitScript* jitScript = script->maybeJitScript();
-  if (!jitScript) {
-    return;
-  }
-
-  AutoSweepJitScript sweep(script);
-  StackTypeSet* types = jitScript->thisTypes(sweep, script);
-
-  if (!types->hasType(type)) {
-    AutoEnterAnalysis enter(cx);
-
-    InferSpew(ISpewOps, "externalType: setThis %p: %s", script,
-              TypeSet::TypeString(type).get());
-    types->addType(sweep, cx, type);
-  }
-}
-
-/* static */ inline void jit::JitScript::MonitorThisType(
-    JSContext* cx, JSScript* script, const js::Value& value) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  // Bound functions or class constructors can use the magic TDZ value as
-  // |this| argument. See CreateThis.
-  if (MOZ_UNLIKELY(value.isMagic())) {
-    MOZ_ASSERT(value.whyMagic() == JS_UNINITIALIZED_LEXICAL);
-    MOZ_ASSERT(script->function());
-    MonitorThisType(cx, script, TypeSet::UnknownType());
-    return;
-  }
-
-  MonitorThisType(cx, script, TypeSet::GetValueType(value));
-}
-
-/* static */ inline void jit::JitScript::MonitorArgType(JSContext* cx,
-                                                        JSScript* script,
-                                                        unsigned arg,
-                                                        TypeSet::Type type) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  cx->check(script->compartment(), type);
-
-  JitScript* jitScript = script->maybeJitScript();
-  if (!jitScript) {
-    return;
-  }
-
-  AutoSweepJitScript sweep(script);
-  StackTypeSet* types = jitScript->argTypes(sweep, script, arg);
-
-  if (!types->hasType(type)) {
-    AutoEnterAnalysis enter(cx);
-
-    InferSpew(ISpewOps, "externalType: setArg %p %u: %s", script, arg,
-              TypeSet::TypeString(type).get());
-    types->addType(sweep, cx, type);
-  }
-}
-
-/* static */ inline void jit::JitScript::MonitorArgType(
-    JSContext* cx, JSScript* script, unsigned arg, const js::Value& value) {
-  if (!IsTypeInferenceEnabled()) {
-    return;
-  }
-  MonitorArgType(cx, script, arg, TypeSet::GetValueType(value));
-}
-
-/////////////////////////////////////////////////////////////////////
-// TypeHashSet
-/////////////////////////////////////////////////////////////////////
-
-// Hashing code shared by objects in TypeSets and properties in ObjectGroups.
-struct TypeHashSet {
-  // The sets of objects in a type set grow monotonically, are usually empty,
-  // almost always small, and sometimes big. For empty or singleton sets, the
-  // the pointer refers directly to the value.  For sets fitting into
-  // SET_ARRAY_SIZE, an array of this length is used to store the elements.
-  // For larger sets, a hash table filled to 25%-50% of capacity is used,
-  // with collisions resolved by linear probing.
-  static const unsigned SET_ARRAY_SIZE = 8;
-  static const unsigned SET_CAPACITY_OVERFLOW = 1u << 30;
-
-  // Get the capacity of a set with the given element count.
-  static inline unsigned Capacity(unsigned count) {
-    MOZ_ASSERT(count >= 2);
-    MOZ_ASSERT(count < SET_CAPACITY_OVERFLOW);
-
-    if (count <= SET_ARRAY_SIZE) {
-      return SET_ARRAY_SIZE;
-    }
-
-    return 1u << (mozilla::FloorLog2(count) + 2);
-  }
-
-  // Compute the FNV hash for the low 32 bits of v.
-  template <class T, class KEY>
-  static inline uint32_t HashKey(T v) {
-    uint32_t nv = KEY::keyBits(v);
-
-    uint32_t hash = 84696351 ^ (nv & 0xff);
-    hash = (hash * 16777619) ^ ((nv >> 8) & 0xff);
-    hash = (hash * 16777619) ^ ((nv >> 16) & 0xff);
-    return (hash * 16777619) ^ ((nv >> 24) & 0xff);
-  }
-
-  // Insert space for an element into the specified set and grow its capacity
-  // if needed. returned value is an existing or new entry (nullptr if new).
-  template <class T, class U, class KEY>
-  static U** InsertTry(LifoAlloc& alloc, U**& values, unsigned& count, T key) {
-    unsigned capacity = Capacity(count);
-    unsigned insertpos = HashKey<T, KEY>(key) & (capacity - 1);
-
-    MOZ_RELEASE_ASSERT(uintptr_t(values[-1]) == capacity);
-
-    // Whether we are converting from a fixed array to hashtable.
-    bool converting = (count == SET_ARRAY_SIZE);
-
-    if (!converting) {
-      while (values[insertpos] != nullptr) {
-        if (KEY::getKey(values[insertpos]) == key) {
-          return &values[insertpos];
-        }
-        insertpos = (insertpos + 1) & (capacity - 1);
-      }
-    }
-
-    if (count >= SET_CAPACITY_OVERFLOW) {
-      return nullptr;
-    }
-
-    count++;
-    unsigned newCapacity = Capacity(count);
-
-    if (newCapacity == capacity) {
-      MOZ_ASSERT(!converting);
-      return &values[insertpos];
-    }
-
-    // Allocate an extra word right before the array storing the capacity,
-    // for sanity checks.
-    U** newValues = alloc.newArray<U*>(newCapacity + 1);
-    if (!newValues) {
-      return nullptr;
-    }
-    mozilla::PodZero(newValues, newCapacity + 1);
-
-    newValues[0] = (U*)uintptr_t(newCapacity);
-    newValues++;
-
-    for (unsigned i = 0; i < capacity; i++) {
-      if (values[i]) {
-        unsigned pos =
-            HashKey<T, KEY>(KEY::getKey(values[i])) & (newCapacity - 1);
-        while (newValues[pos] != nullptr) {
-          pos = (pos + 1) & (newCapacity - 1);
-        }
-        newValues[pos] = values[i];
-      }
-    }
-
-    values = newValues;
-
-    insertpos = HashKey<T, KEY>(key) & (newCapacity - 1);
-    while (values[insertpos] != nullptr) {
-      insertpos = (insertpos + 1) & (newCapacity - 1);
-    }
-    return &values[insertpos];
-  }
-
-  // Insert an element into the specified set if it is not already there,
-  // returning an entry which is nullptr if the element was not there.
-  template <class T, class U, class KEY>
-  static inline U** Insert(LifoAlloc& alloc, U**& values, unsigned& count,
-                           T key) {
-    if (count == 0) {
-      MOZ_ASSERT(values == nullptr);
-      count++;
-      return (U**)&values;
-    }
-
-    if (count == 1) {
-      U* oldData = (U*)values;
-      if (KEY::getKey(oldData) == key) {
-        return (U**)&values;
-      }
-
-      // Allocate an extra word right before the array storing the
-      // capacity, for sanity checks.
-      values = alloc.newArray<U*>(SET_ARRAY_SIZE + 1);
-      if (!values) {
-        values = (U**)oldData;
-        return nullptr;
-      }
-      mozilla::PodZero(values, SET_ARRAY_SIZE + 1);
-
-      values[0] = (U*)uintptr_t(SET_ARRAY_SIZE);
-      values++;
-
-      count++;
-
-      values[0] = oldData;
-      return &values[1];
-    }
-
-    if (count <= SET_ARRAY_SIZE) {
-      MOZ_RELEASE_ASSERT(uintptr_t(values[-1]) == SET_ARRAY_SIZE);
-
-      for (unsigned i = 0; i < count; i++) {
-        if (KEY::getKey(values[i]) == key) {
-          return &values[i];
-        }
-      }
-
-      if (count < SET_ARRAY_SIZE) {
-        count++;
-        return &values[count - 1];
-      }
-    }
-
-    return InsertTry<T, U, KEY>(alloc, values, count, key);
-  }
-
-  // Lookup an entry in a hash set, return nullptr if it does not exist.
-  template <class T, class U, class KEY>
-  static MOZ_ALWAYS_INLINE U* Lookup(U** values, unsigned count, T key) {
-    if (count == 0) {
-      return nullptr;
-    }
-
-    if (count == 1) {
-      return (KEY::getKey((U*)values) == key) ? (U*)values : nullptr;
-    }
-
-    if (count <= SET_ARRAY_SIZE) {
-      MOZ_RELEASE_ASSERT(uintptr_t(values[-1]) == SET_ARRAY_SIZE);
-      for (unsigned i = 0; i < count; i++) {
-        if (KEY::getKey(values[i]) == key) {
-          return values[i];
-        }
-      }
-      return nullptr;
-    }
-
-    unsigned capacity = Capacity(count);
-    unsigned pos = HashKey<T, KEY>(key) & (capacity - 1);
-
-    MOZ_RELEASE_ASSERT(uintptr_t(values[-1]) == capacity);
-
-    while (values[pos] != nullptr) {
-      if (KEY::getKey(values[pos]) == key) {
-        return values[pos];
-      }
-      pos = (pos + 1) & (capacity - 1);
-    }
-
-    return nullptr;
-  }
-
-  template <class T, class U, class Key, typename Fun>
-  static void MapEntries(U**& values, unsigned count, Fun f) {
-    // No element.
-    if (count == 0) {
-      MOZ_RELEASE_ASSERT(!values);
-      return;
-    }
-
-    // Simple functions to read and mutate the mark bit of pointers.
-    auto markBit = [](U* elem) -> bool {
-      return bool(reinterpret_cast<uintptr_t>(elem) & U::TypeHashSetMarkBit);
-    };
-    auto toggleMarkBit = [](U* elem) -> U* {
-      return reinterpret_cast<U*>(reinterpret_cast<uintptr_t>(elem) ^
-                                  U::TypeHashSetMarkBit);
-    };
-
-    // When we have a single element it is stored in-place of the function
-    // array pointer.
-    if (count == 1) {
-      U* elem = f(reinterpret_cast<U*>(values));
-      MOZ_ASSERT(!markBit(elem));
-      values = reinterpret_cast<U**>(elem);
-      return;
-    }
-
-    // When we have SET_ARRAY_SIZE or fewer elements, the values is an
-    // unorderred array.
-    if (count <= SET_ARRAY_SIZE) {
-      for (unsigned i = 0; i < count; i++) {
-        U* elem = f(values[i]);
-        MOZ_ASSERT(!markBit(elem));
-        values[i] = elem;
-      }
-      return;
-    }
-
-    // This code applies the function f and relocates the values based on
-    // the new pointers.
-    //
-    // To avoid allocations, we reuse the same structure but distinguish the
-    // elements to be rellocated from the rellocated elements with the
-    // mark bit.
-    unsigned capacity = Capacity(count);
-    MOZ_RELEASE_ASSERT(uintptr_t(values[-1]) == capacity);
-    unsigned found = 0;
-    for (unsigned i = 0; i < capacity; i++) {
-      if (!values[i]) {
-        continue;
-      }
-      MOZ_ASSERT(found <= count);
-      U* elem = f(values[i]);
-      values[i] = nullptr;
-      MOZ_ASSERT(!markBit(elem));
-      values[found++] = toggleMarkBit(elem);
-    }
-    MOZ_ASSERT(found == count);
-
-    // Follow the same rule as InsertTry, except that for each cell we identify
-    // empty cell content with either a nullptr or the value of the mark bit:
-    //
-    //   nullptr    empty cell.
-    //   0b...0.    inserted element.
-    //   0b...1.    empty cell - element to be inserted.
-    unsigned mask = capacity - 1;
-    for (unsigned i = 0; i < count; i++) {
-      U* elem = values[i];
-      if (!markBit(elem)) {
-        // If this is a newly inserted element, this implies that one of
-        // the previous objects was moved to this position.
-        continue;
-      }
-      values[i] = nullptr;
-      while (elem) {
-        MOZ_ASSERT(markBit(elem));
-        elem = toggleMarkBit(elem);
-        unsigned pos = HashKey<T, Key>(Key::getKey(elem)) & mask;
-        while (values[pos] != nullptr && !markBit(values[pos])) {
-          pos = (pos + 1) & mask;
-        }
-        // The replaced element is either a nullptr, which stops this
-        // loop, or an element to be inserted, which would be inserted
-        // by this loop.
-        std::swap(values[pos], elem);
-      }
-    }
-#ifdef DEBUG
-    unsigned inserted = 0;
-    for (unsigned i = 0; i < capacity; i++) {
-      if (!values[i]) {
-        continue;
-      }
-      inserted++;
-    }
-    MOZ_ASSERT(inserted == count);
-#endif
-  }
-};
-
-/////////////////////////////////////////////////////////////////////
-// TypeSet
-/////////////////////////////////////////////////////////////////////
-
-inline TypeSet::ObjectKey* TypeSet::Type::objectKey() const {
-  MOZ_ASSERT(isObject());
-  return (ObjectKey*)data;
-}
-
-inline JSObject* TypeSet::Type::singleton() const {
-  return objectKey()->singleton();
-}
-
-inline ObjectGroup* TypeSet::Type::group() const {
-  return objectKey()->group();
-}
-
-inline JSObject* TypeSet::Type::singletonNoBarrier() const {
-  return objectKey()->singletonNoBarrier();
-}
-
-inline ObjectGroup* TypeSet::Type::groupNoBarrier() const {
-  return objectKey()->groupNoBarrier();
-}
-
-inline void TypeSet::Type::trace(JSTracer* trc) {
-  if (isSingletonUnchecked()) {
-    JSObject* obj = singletonNoBarrier();
-    TraceManuallyBarrieredEdge(trc, &obj, "TypeSet::Object");
-    *this = TypeSet::ObjectType(obj);
-  } else if (isGroupUnchecked()) {
-    ObjectGroup* group = groupNoBarrier();
-    TraceManuallyBarrieredEdge(trc, &group, "TypeSet::Group");
-    *this = TypeSet::ObjectType(group);
-  }
-}
-
-inline JS::Compartment* TypeSet::Type::maybeCompartment() {
-  if (isSingletonUnchecked()) {
-    return singletonNoBarrier()->compartment();
-  }
-
-  if (isGroupUnchecked()) {
-    return groupNoBarrier()->compartment();
-  }
-
-  return nullptr;
-}
-
-MOZ_ALWAYS_INLINE bool TypeSet::hasType(Type type) const {
-  if (unknown()) {
-    return true;
-  }
-
-  if (type.isUnknown()) {
-    return false;
-  } else if (type.isPrimitive()) {
-    return !!(flags & PrimitiveTypeFlag(type));
-  } else if (type.isAnyObject()) {
-    return !!(flags & TYPE_FLAG_ANYOBJECT);
-  } else {
-    return !!(flags & TYPE_FLAG_ANYOBJECT) ||
-           TypeHashSet::Lookup<ObjectKey*, ObjectKey, ObjectKey>(
-               objectSet, baseObjectCount(), type.objectKey()) != nullptr;
-  }
-}
-
-inline void TypeSet::setBaseObjectCount(uint32_t count) {
-  MOZ_ASSERT(count <= TYPE_FLAG_DOMOBJECT_COUNT_LIMIT);
-  flags = (flags & ~TYPE_FLAG_OBJECT_COUNT_MASK) |
-          (count << TYPE_FLAG_OBJECT_COUNT_SHIFT);
-}
-
-inline void HeapTypeSet::newPropertyState(const AutoSweepObjectGroup& sweep,
-                                          JSContext* cx) {
-  checkMagic();
-
-  /* Propagate the change to all constraints. */
-  if (!cx->isHelperThreadContext()) {
-    TypeConstraint* constraint = constraintList(sweep);
-    while (constraint) {
-      constraint->newPropertyState(cx, this);
-      constraint = constraint->next();
-    }
-  } else {
-    MOZ_ASSERT(!constraintList(sweep));
-  }
-}
-
-inline void HeapTypeSet::setNonDataProperty(const AutoSweepObjectGroup& sweep,
-                                            JSContext* cx) {
-  checkMagic();
-
-  if (flags & TYPE_FLAG_NON_DATA_PROPERTY) {
-    return;
-  }
-
-  flags |= TYPE_FLAG_NON_DATA_PROPERTY;
-  newPropertyState(sweep, cx);
-}
-
-inline void HeapTypeSet::setNonWritableProperty(
-    const AutoSweepObjectGroup& sweep, JSContext* cx) {
-  checkMagic();
-
-  if (flags & TYPE_FLAG_NON_WRITABLE_PROPERTY) {
-    return;
-  }
-
-  flags |= TYPE_FLAG_NON_WRITABLE_PROPERTY;
-  newPropertyState(sweep, cx);
-}
-
-inline void HeapTypeSet::setNonConstantProperty(
-    const AutoSweepObjectGroup& sweep, JSContext* cx) {
-  checkMagic();
-
-  if (flags & TYPE_FLAG_NON_CONSTANT_PROPERTY) {
-    return;
-  }
-
-  flags |= TYPE_FLAG_NON_CONSTANT_PROPERTY;
-  newPropertyState(sweep, cx);
-}
-
-inline void HeapTypeSet::markLexicalBindingExists(
-    const AutoSweepObjectGroup& sweep, JSContext* cx) {
-  checkMagic();
-  newPropertyState(sweep, cx);
-}
-
-inline unsigned TypeSet::getObjectCount() const {
-  MOZ_ASSERT(!unknownObject());
-  uint32_t count = baseObjectCount();
-  if (count > TypeHashSet::SET_ARRAY_SIZE) {
-    return TypeHashSet::Capacity(count);
-  }
-  return count;
-}
-
-inline TypeSet::ObjectKey* TypeSet::getObject(unsigned i) const {
-  MOZ_ASSERT(i < getObjectCount());
-  if (baseObjectCount() == 1) {
-    MOZ_ASSERT(i == 0);
-    return (ObjectKey*)objectSet;
-  }
-  return objectSet[i];
-}
-
-inline JSObject* TypeSet::getSingleton(unsigned i) const {
-  ObjectKey* key = getObject(i);
-  return (key && key->isSingleton()) ? key->singleton() : nullptr;
-}
-
-inline ObjectGroup* TypeSet::getGroup(unsigned i) const {
-  ObjectKey* key = getObject(i);
-  return (key && key->isGroup()) ? key->group() : nullptr;
-}
-
-inline JSObject* TypeSet::getSingletonNoBarrier(unsigned i) const {
-  ObjectKey* key = getObject(i);
-  return (key && key->isSingleton()) ? key->singletonNoBarrier() : nullptr;
-}
-
-inline ObjectGroup* TypeSet::getGroupNoBarrier(unsigned i) const {
-  ObjectKey* key = getObject(i);
-  return (key && key->isGroup()) ? key->groupNoBarrier() : nullptr;
-}
-
-inline bool TypeSet::hasGroup(unsigned i) const { return getGroupNoBarrier(i); }
-
-inline bool TypeSet::hasSingleton(unsigned i) const {
-  return getSingletonNoBarrier(i);
-}
-
-inline const JSClass* TypeSet::getObjectClass(unsigned i) const {
-  if (JSObject* object = getSingleton(i)) {
-    return object->getClass();
-  }
-  if (ObjectGroup* group = getGroup(i)) {
-    return group->clasp();
-  }
-  return nullptr;
-}
-
-/////////////////////////////////////////////////////////////////////
-// ObjectGroup
-/////////////////////////////////////////////////////////////////////
-
-inline uint32_t ObjectGroup::basePropertyCountDontCheckGeneration() {
-  uint32_t flags = flagsDontCheckGeneration();
-  return (flags & OBJECT_FLAG_PROPERTY_COUNT_MASK) >>
-         OBJECT_FLAG_PROPERTY_COUNT_SHIFT;
-}
-
-inline uint32_t ObjectGroup::basePropertyCount(
-    const AutoSweepObjectGroup& sweep) {
-  MOZ_ASSERT(sweep.group() == this);
-  return basePropertyCountDontCheckGeneration();
-}
-
-inline void ObjectGroup::setBasePropertyCount(const AutoSweepObjectGroup& sweep,
-                                              uint32_t count) {
-  // Note: Callers must ensure they are performing threadsafe operations.
-  MOZ_ASSERT(count <= OBJECT_FLAG_PROPERTY_COUNT_LIMIT);
-  flags_ = (flags(sweep) & ~OBJECT_FLAG_PROPERTY_COUNT_MASK) |
-           (count << OBJECT_FLAG_PROPERTY_COUNT_SHIFT);
-}
-
-inline HeapTypeSet* ObjectGroup::getProperty(const AutoSweepObjectGroup& sweep,
-                                             JSContext* cx, JSObject* obj,
-                                             jsid id) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id) ||
-             JSID_IS_SYMBOL(id));
-  MOZ_ASSERT_IF(!JSID_IS_EMPTY(id), id == IdToTypeId(id));
-  MOZ_ASSERT_IF(obj, obj->group() == this);
-  MOZ_ASSERT_IF(singleton(), obj);
-  MOZ_ASSERT(cx->compartment() == compartment());
-
-  if (unknownProperties(sweep)) {
-    return nullptr;
-  }
-
-  if (HeapTypeSet* types = maybeGetProperty(sweep, id)) {
-    return types;
-  }
-
-  Property* base = cx->typeLifoAlloc().new_<Property>(id);
-  if (!base) {
-    markUnknown(sweep, cx);
-    return nullptr;
-  }
-
-  uint32_t propertyCount = basePropertyCount(sweep);
-  Property** pprop = TypeHashSet::Insert<jsid, Property, Property>(
-      cx->typeLifoAlloc(), propertySet, propertyCount, id);
-  if (!pprop) {
-    markUnknown(sweep, cx);
-    return nullptr;
-  }
-
-  MOZ_ASSERT(!*pprop);
-
-  setBasePropertyCount(sweep, propertyCount);
-  *pprop = base;
-
-  updateNewPropertyTypes(sweep, cx, obj, id, &base->types);
-
-  if (propertyCount == OBJECT_FLAG_PROPERTY_COUNT_LIMIT) {
-    // We hit the maximum number of properties the object can have, mark
-    // the object unknown so that new properties will not be added in the
-    // future.
-    markUnknown(sweep, cx);
-  }
-
-  base->types.checkMagic();
-  return &base->types;
-}
-
-MOZ_ALWAYS_INLINE HeapTypeSet* ObjectGroup::maybeGetPropertyDontCheckGeneration(
-    jsid id) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(JSID_IS_VOID(id) || JSID_IS_EMPTY(id) || JSID_IS_STRING(id) ||
-             JSID_IS_SYMBOL(id));
-  MOZ_ASSERT_IF(!JSID_IS_EMPTY(id), id == IdToTypeId(id));
-  MOZ_ASSERT(!unknownPropertiesDontCheckGeneration());
-
-  Property* prop = TypeHashSet::Lookup<jsid, Property, Property>(
-      propertySet, basePropertyCountDontCheckGeneration(), id);
-
-  if (!prop) {
-    return nullptr;
-  }
-
-  prop->types.checkMagic();
-  return &prop->types;
-}
-
-MOZ_ALWAYS_INLINE HeapTypeSet* ObjectGroup::maybeGetProperty(
-    const AutoSweepObjectGroup& sweep, jsid id) {
-  MOZ_ASSERT(sweep.group() == this);
-  return maybeGetPropertyDontCheckGeneration(id);
-}
-
-inline unsigned ObjectGroup::getPropertyCount(
-    const AutoSweepObjectGroup& sweep) {
-  uint32_t count = basePropertyCount(sweep);
-  if (count > TypeHashSet::SET_ARRAY_SIZE) {
-    return TypeHashSet::Capacity(count);
-  }
-  return count;
-}
-
-inline ObjectGroup::Property* ObjectGroup::getProperty(
-    const AutoSweepObjectGroup& sweep, unsigned i) {
-  MOZ_ASSERT(IsTypeInferenceEnabled());
-  MOZ_ASSERT(i < getPropertyCount(sweep));
-  Property* result;
-  if (basePropertyCount(sweep) == 1) {
-    MOZ_ASSERT(i == 0);
-    result = (Property*)propertySet;
-  } else {
-    result = propertySet[i];
-  }
-  if (result) {
-    result->types.checkMagic();
-  }
-  return result;
-}
-
-inline AutoSweepObjectGroup::AutoSweepObjectGroup(ObjectGroup* group)
-#ifdef DEBUG
-    : group_(group)
-#endif
-{
-  if (group->needsSweep()) {
-    group->sweep(*this);
-  }
-}
-
-#ifdef DEBUG
-inline AutoSweepObjectGroup::~AutoSweepObjectGroup() {
-  // This should still hold.
-  MOZ_ASSERT(!group_->needsSweep());
-}
-#endif
-
-inline AutoSweepJitScript::AutoSweepJitScript(BaseScript* script)
-#ifdef DEBUG
-    : zone_(script->zone()),
-      jitScript_(script->maybeJitScript())
-#endif
-{
-  if (jit::JitScript* jitScript = script->maybeJitScript()) {
-    Zone* zone = script->zone();
-    if (jitScript->typesNeedsSweep(zone)) {
-      jitScript->sweepTypes(*this, zone);
-    }
-  }
-}
-
-#ifdef DEBUG
-inline AutoSweepJitScript::~AutoSweepJitScript() {
-  // This should still hold.
-  MOZ_ASSERT_IF(jitScript_, !jitScript_->typesNeedsSweep(zone_));
-}
-#endif
-
-}  // namespace js
-
-#endif /* vm_TypeInference_inl_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/TypeSet.h firefox-85.0+build1/js/src/vm/TypeSet.h
--- firefox-84.0.2+build1/js/src/vm/TypeSet.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/TypeSet.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,933 +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/. */
-
-/* TypeSet classes and functions. */
-
-#ifndef vm_TypeSet_h
-#define vm_TypeSet_h
-
-#include "mozilla/Assertions.h"  // MOZ_ASSERT
-#include "mozilla/Attributes.h"  // MOZ_ALWAYS_INLINE
-#include "mozilla/Likely.h"      // MOZ_UNLIKELY
-
-#include <initializer_list>
-#include <stdint.h>  // intptr_t, uintptr_t, uint8_t, uint32_t
-#include <stdio.h>   // FILE
-
-#include "jstypes.h"  // JS_BITS_PER_WORD, JS_PUBLIC_API
-
-#include "jit/IonTypes.h"  // jit::MIRType
-#include "jit/JitOptions.h"
-#include "js/GCAnnotations.h"  // JS_HAZ_GC_POINTER
-#include "js/Id.h"
-#include "js/ScalarType.h"  // js::Scalar::Type
-#include "js/TracingAPI.h"  // JSTracer
-#include "js/TypeDecls.h"   // IF_BIGINT
-#include "js/Utility.h"     // UniqueChars
-#include "js/Value.h"       // JSVAL_TYPE_*
-#include "js/Vector.h"      // js::Vector
-#include "util/DiagnosticAssertions.h"
-#include "vm/TaggedProto.h"  // js::TaggedProto
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSObject;
-
-namespace JS {
-
-class JS_PUBLIC_API Compartment;
-class JS_PUBLIC_API Realm;
-class JS_PUBLIC_API Zone;
-
-}  // namespace JS
-
-namespace js {
-
-namespace jit {
-
-class IonScript;
-class TempAllocator;
-
-}  // namespace jit
-
-class AutoClearTypeInferenceStateOnOOM;
-class AutoSweepBase;
-class AutoSweepObjectGroup;
-class CompilerConstraintList;
-class HeapTypeSetKey;
-class LifoAlloc;
-class ObjectGroup;
-class SystemAllocPolicy;
-class TypeConstraint;
-class TypeNewScript;
-class TypeZone;
-
-/*
- * Type inference memory management overview.
- *
- * Type information about the values observed within scripts and about the
- * contents of the heap is accumulated as the program executes. Compilation
- * accumulates constraints relating type information on the heap with the
- * compilations that should be invalidated when those types change. Type
- * information and constraints are allocated in the zone's typeLifoAlloc,
- * and on GC all data referring to live things is copied into a new allocator.
- * Thus, type set and constraints only hold weak references.
- */
-
-/* Flags and other state stored in TypeSet::flags */
-enum : uint32_t {
-  TYPE_FLAG_UNDEFINED = 0x1,
-  TYPE_FLAG_NULL = 0x2,
-  TYPE_FLAG_BOOLEAN = 0x4,
-  TYPE_FLAG_INT32 = 0x8,
-  TYPE_FLAG_DOUBLE = 0x10,
-  TYPE_FLAG_STRING = 0x20,
-  TYPE_FLAG_SYMBOL = 0x40,
-  TYPE_FLAG_BIGINT = 0x80,
-  TYPE_FLAG_LAZYARGS = 0x100,
-  TYPE_FLAG_ANYOBJECT = 0x200,
-
-  /* Mask containing all "immediate" primitives (not heap-allocated) */
-  TYPE_FLAG_PRIMITIVE_IMMEDIATE = TYPE_FLAG_UNDEFINED | TYPE_FLAG_NULL |
-                                  TYPE_FLAG_BOOLEAN | TYPE_FLAG_INT32 |
-                                  TYPE_FLAG_DOUBLE,
-  /* Mask containing all GCThing primitives (heap-allocated) */
-  TYPE_FLAG_PRIMITIVE_GCTHING =
-      TYPE_FLAG_STRING | TYPE_FLAG_SYMBOL | TYPE_FLAG_BIGINT,
-
-  /* Mask containing all primitives */
-  TYPE_FLAG_PRIMITIVE =
-      TYPE_FLAG_PRIMITIVE_IMMEDIATE | TYPE_FLAG_PRIMITIVE_GCTHING,
-
-  /* Mask/shift for the number of objects in objectSet */
-  TYPE_FLAG_OBJECT_COUNT_MASK = 0x3c00,
-  TYPE_FLAG_OBJECT_COUNT_SHIFT = 10,
-  TYPE_FLAG_OBJECT_COUNT_LIMIT = 7,
-  TYPE_FLAG_DOMOBJECT_COUNT_LIMIT =
-      TYPE_FLAG_OBJECT_COUNT_MASK >> TYPE_FLAG_OBJECT_COUNT_SHIFT,
-
-  /* Whether the contents of this type set are totally unknown. */
-  TYPE_FLAG_UNKNOWN = 0x00004000,
-
-  /* Mask of normal type flags on a type set. */
-  TYPE_FLAG_BASE_MASK = TYPE_FLAG_PRIMITIVE | TYPE_FLAG_LAZYARGS |
-                        TYPE_FLAG_ANYOBJECT | TYPE_FLAG_UNKNOWN,
-
-  /* Additional flags for HeapTypeSet sets. */
-
-  /*
-   * Whether the property has ever been deleted or reconfigured to behave
-   * differently from a plain data property, other than making the property
-   * non-writable.
-   */
-  TYPE_FLAG_NON_DATA_PROPERTY = 0x00008000,
-
-  /* Whether the property has ever been made non-writable. */
-  TYPE_FLAG_NON_WRITABLE_PROPERTY = 0x00010000,
-
-  /* Whether the property might not be constant. */
-  TYPE_FLAG_NON_CONSTANT_PROPERTY = 0x00020000,
-
-  /*
-   * Whether the property is definitely in a particular slot on all objects
-   * from which it has not been deleted or reconfigured. For singletons
-   * this may be a fixed or dynamic slot, and for other objects this will be
-   * a fixed slot.
-   *
-   * If the property is definite, mask and shift storing the slot + 1.
-   * Otherwise these bits are clear.
-   */
-  TYPE_FLAG_DEFINITE_MASK = 0xfffc0000,
-  TYPE_FLAG_DEFINITE_SHIFT = 18
-};
-using TypeFlags = uint32_t;
-
-static_assert(
-    TYPE_FLAG_PRIMITIVE < TYPE_FLAG_ANYOBJECT &&
-        TYPE_FLAG_LAZYARGS < TYPE_FLAG_ANYOBJECT,
-    "TYPE_FLAG_ANYOBJECT should be greater than primitive type flags");
-
-/* Flags and other state stored in ObjectGroup::Flags */
-enum : uint32_t {
-  /* Whether this group is associated with some allocation site. */
-  OBJECT_FLAG_FROM_ALLOCATION_SITE = 0x1,
-
-  /* Whether this group is associated with a single object. */
-  OBJECT_FLAG_SINGLETON = 0x2,
-
-  /*
-   * Whether this group is used by objects whose singleton groups have not
-   * been created yet.
-   */
-  OBJECT_FLAG_LAZY_SINGLETON = 0x4,
-
-  /* Mask/shift for the number of properties in propertySet */
-  OBJECT_FLAG_PROPERTY_COUNT_MASK = 0xfff8,
-  OBJECT_FLAG_PROPERTY_COUNT_SHIFT = 3,
-  OBJECT_FLAG_PROPERTY_COUNT_LIMIT =
-      OBJECT_FLAG_PROPERTY_COUNT_MASK >> OBJECT_FLAG_PROPERTY_COUNT_SHIFT,
-
-  /* Whether any objects this represents may have sparse indexes. */
-  OBJECT_FLAG_SPARSE_INDEXES = 0x00010000,
-
-  /* Whether any objects this represents may not have packed dense elements. */
-  OBJECT_FLAG_NON_PACKED = 0x00020000,
-
-  /*
-   * Whether any objects this represents may be arrays whose length does not
-   * fit in an int32.
-   */
-  OBJECT_FLAG_LENGTH_OVERFLOW = 0x00040000,
-
-  /* Whether any objects have been iterated over. */
-  OBJECT_FLAG_ITERATED = 0x00080000,
-
-  /* Whether any object this represents may have non-extensible elements. */
-  OBJECT_FLAG_NON_EXTENSIBLE_ELEMENTS = 0x00100000,
-
-  // (0x00200000 is unused)
-
-  // (0x00400000 is unused)
-
-  /*
-   * Whether objects with this type should be allocated directly in the
-   * tenured heap.
-   */
-  OBJECT_FLAG_PRE_TENURE = 0x00800000,
-
-  /* Whether objects with this type might have copy on write elements. */
-  OBJECT_FLAG_COPY_ON_WRITE = 0x01000000,
-
-  /* Whether this type has had its 'new' script cleared in the past. */
-  OBJECT_FLAG_NEW_SCRIPT_CLEARED = 0x02000000,
-
-  /*
-   * Whether all properties of this object are considered unknown.
-   * If set, all other flags in DYNAMIC_MASK will also be set.
-   */
-  OBJECT_FLAG_UNKNOWN_PROPERTIES = 0x04000000,
-
-  /* Flags which indicate dynamic properties of represented objects. */
-  OBJECT_FLAG_DYNAMIC_MASK = 0x07ff0000,
-
-  // Mask/shift for the kind of addendum attached to this group.
-  OBJECT_FLAG_ADDENDUM_MASK = 0x38000000,
-  OBJECT_FLAG_ADDENDUM_SHIFT = 27,
-
-  // Mask/shift for this group's generation. If out of sync with the
-  // TypeZone's generation, this group hasn't been swept yet.
-  OBJECT_FLAG_GENERATION_MASK = 0x40000000,
-  OBJECT_FLAG_GENERATION_SHIFT = 30,
-};
-using ObjectGroupFlags = uint32_t;
-
-class StackTypeSet;
-class HeapTypeSet;
-class TemporaryTypeSet;
-
-/*
- * [SMDOC] Type-Inference TypeSet
- *
- * Information about the set of types associated with an lvalue. There are
- * three kinds of type sets:
- *
- * - StackTypeSet are associated with JitScripts, for arguments and values
- *   observed at property reads. These are implicitly frozen on compilation
- *   and only have constraints added to them which can trigger invalidation of
- *   TypeNewScript information.
- *
- * - HeapTypeSet are associated with the properties of ObjectGroups. These
- *   may have constraints added to them to trigger invalidation of either
- *   compiled code or TypeNewScript information.
- *
- * - TemporaryTypeSet are created during compilation and do not outlive
- *   that compilation.
- *
- * The contents of a type set completely describe the values that a particular
- * lvalue might have, except for the following cases:
- *
- * - If an object's prototype or class is dynamically mutated, its group will
- *   change. Type sets containing the old group will not necessarily contain
- *   the new group. When this occurs, the properties of the old and new group
- *   will both be marked as unknown, which will prevent Ion from optimizing
- *   based on the object's type information.
- */
-class TypeSet {
- protected:
-  /* Flags for this type set. */
-  TypeFlags flags = 0;
-
- public:
-  class ObjectKey;
-
- protected:
-  /* Possible objects this type set can represent. */
-  ObjectKey** objectSet = nullptr;
-
- public:
-  TypeSet() = default;
-
-  // Type set entry for either a JSObject with singleton type or a
-  // non-singleton ObjectGroup.
-  class ObjectKey {
-   public:
-    static intptr_t keyBits(ObjectKey* obj) { return (intptr_t)obj; }
-    static ObjectKey* getKey(ObjectKey* obj) { return obj; }
-
-    static inline ObjectKey* get(JSObject* obj);
-    static inline ObjectKey* get(ObjectGroup* group);
-
-    bool isGroup() { return (uintptr_t(this) & 1) == 0; }
-    bool isSingleton() { return (uintptr_t(this) & 1) != 0; }
-    static constexpr uintptr_t TypeHashSetMarkBit = 1 << 1;
-
-    inline ObjectGroup* group();
-    inline JSObject* singleton();
-
-    inline ObjectGroup* groupNoBarrier();
-    inline JSObject* singletonNoBarrier();
-
-    const JSClass* clasp();
-    TaggedProto proto();
-
-    bool unknownProperties();
-    bool hasFlags(CompilerConstraintList* constraints, ObjectGroupFlags flags);
-    bool hasStableClassAndProto(CompilerConstraintList* constraints);
-    void watchStateChangeForTypedArrayData(CompilerConstraintList* constraints);
-    HeapTypeSetKey property(jsid id);
-    void ensureTrackedProperty(JSContext* cx, jsid id);
-
-    ObjectGroup* maybeGroup();
-
-    JS::Compartment* maybeCompartment();
-  } JS_HAZ_GC_POINTER;
-
-  // Information about a single concrete type. We pack this into one word,
-  // where small values are particular primitive or other singleton types and
-  // larger values are either specific JS objects or object groups.
-  class Type {
-    friend class TypeSet;
-
-    uintptr_t data;
-    explicit Type(uintptr_t data) : data(data) {}
-
-   public:
-    uintptr_t raw() const { return data; }
-
-    bool isPrimitive() const { return data < JSVAL_TYPE_OBJECT; }
-
-    bool isPrimitive(ValueType type) const {
-      MOZ_ASSERT(type != ValueType::Object);
-      return uintptr_t(type) == data;
-    }
-
-    ValueType primitive() const {
-      MOZ_ASSERT(isPrimitive());
-      return ValueType(data);
-    }
-
-    bool isSomeObject() const {
-      return data == JSVAL_TYPE_OBJECT || data > JSVAL_TYPE_UNKNOWN;
-    }
-
-    bool isAnyObject() const { return data == JSVAL_TYPE_OBJECT; }
-
-    bool isUnknown() const { return data == JSVAL_TYPE_UNKNOWN; }
-
-    /* Accessors for types that are either JSObject or ObjectGroup. */
-
-    bool isObject() const {
-      MOZ_ASSERT(!isAnyObject() && !isUnknown());
-      return data > JSVAL_TYPE_UNKNOWN;
-    }
-
-    bool isObjectUnchecked() const { return data > JSVAL_TYPE_UNKNOWN; }
-
-    inline ObjectKey* objectKey() const;
-
-    /* Accessors for JSObject types */
-
-    bool isSingleton() const { return isObject() && !!(data & 1); }
-    bool isSingletonUnchecked() const {
-      return isObjectUnchecked() && !!(data & 1);
-    }
-
-    inline JSObject* singleton() const;
-    inline JSObject* singletonNoBarrier() const;
-
-    /* Accessors for ObjectGroup types */
-
-    bool isGroup() const { return isObject() && !(data & 1); }
-    bool isGroupUnchecked() const { return isObjectUnchecked() && !(data & 1); }
-
-    inline ObjectGroup* group() const;
-    inline ObjectGroup* groupNoBarrier() const;
-
-    inline void trace(JSTracer* trc);
-
-    JS::Compartment* maybeCompartment();
-
-    bool operator==(Type o) const { return data == o.data; }
-    bool operator!=(Type o) const { return data != o.data; }
-  } JS_HAZ_GC_POINTER;
-
-  static inline Type UndefinedType() { return Type(JSVAL_TYPE_UNDEFINED); }
-  static inline Type NullType() { return Type(JSVAL_TYPE_NULL); }
-  static inline Type BooleanType() { return Type(JSVAL_TYPE_BOOLEAN); }
-  static inline Type Int32Type() { return Type(JSVAL_TYPE_INT32); }
-  static inline Type DoubleType() { return Type(JSVAL_TYPE_DOUBLE); }
-  static inline Type StringType() { return Type(JSVAL_TYPE_STRING); }
-  static inline Type SymbolType() { return Type(JSVAL_TYPE_SYMBOL); }
-  static inline Type BigIntType() { return Type(JSVAL_TYPE_BIGINT); }
-  static inline Type MagicArgType() { return Type(JSVAL_TYPE_MAGIC); }
-  static inline Type AnyObjectType() { return Type(JSVAL_TYPE_OBJECT); }
-  static inline Type UnknownType() { return Type(JSVAL_TYPE_UNKNOWN); }
-
- protected:
-  static inline Type PrimitiveTypeFromTypeFlag(TypeFlags flag);
-
- public:
-  // Returns the Type corresponding to a primitive JS::Value or MIRType. The
-  // argument must not be a magic value we can't represent directly (see
-  // IsUntrackedValueType and IsUntrackedMIRType).
-  static inline Type PrimitiveType(const JS::Value& val);
-  static inline Type PrimitiveType(jit::MIRType type);
-
-  // Like PrimitiveType above but also accepts MIRType::Object.
-  static inline Type PrimitiveOrAnyObjectType(jit::MIRType type);
-
-  static inline Type ObjectType(const JSObject* obj);
-  static inline Type ObjectType(const ObjectGroup* group);
-  static inline Type ObjectType(const ObjectKey* key);
-
-  static const char* NonObjectTypeString(Type type);
-
-  static JS::UniqueChars TypeString(const Type type);
-  static JS::UniqueChars ObjectGroupString(const ObjectGroup* group);
-
-  void print(FILE* fp = stderr);
-
-  /* Whether this set contains a specific type. */
-  MOZ_ALWAYS_INLINE bool hasType(Type type) const;
-
-  TypeFlags baseFlags() const { return flags & TYPE_FLAG_BASE_MASK; }
-  bool unknown() const { return !!(flags & TYPE_FLAG_UNKNOWN); }
-  bool unknownObject() const {
-    return !!(flags & (TYPE_FLAG_UNKNOWN | TYPE_FLAG_ANYOBJECT));
-  }
-  bool empty() const { return !baseFlags() && !baseObjectCount(); }
-
-  bool hasAnyFlag(TypeFlags flags) const {
-    MOZ_ASSERT((flags & TYPE_FLAG_BASE_MASK) == flags);
-    return !!(baseFlags() & flags);
-  }
-
-  bool nonDataProperty() const { return flags & TYPE_FLAG_NON_DATA_PROPERTY; }
-  bool nonWritableProperty() const {
-    return flags & TYPE_FLAG_NON_WRITABLE_PROPERTY;
-  }
-  bool nonConstantProperty() const {
-    return flags & TYPE_FLAG_NON_CONSTANT_PROPERTY;
-  }
-  bool definiteProperty() const { return flags & TYPE_FLAG_DEFINITE_MASK; }
-  unsigned definiteSlot() const {
-    MOZ_ASSERT(definiteProperty());
-    return (flags >> TYPE_FLAG_DEFINITE_SHIFT) - 1;
-  }
-
-  // Join two type sets into a new set. The result should not be modified
-  // further.
-  static TemporaryTypeSet* unionSets(TypeSet* a, TypeSet* b, LifoAlloc* alloc);
-
-  // Return the intersection of the 2 TypeSets. The result should not be
-  // modified further.
-  static TemporaryTypeSet* intersectSets(TemporaryTypeSet* a,
-                                         TemporaryTypeSet* b, LifoAlloc* alloc);
-
-  /*
-   * Returns a copy of TypeSet a excluding/removing the types in TypeSet b.
-   * TypeSet b can only contain primitives or be any object. No support for
-   * specific objects. The result should not be modified further.
-   */
-  static TemporaryTypeSet* removeSet(TemporaryTypeSet* a, TemporaryTypeSet* b,
-                                     LifoAlloc* alloc);
-
-  /* Add a type to this set using the specified allocator. */
-  void addType(Type type, LifoAlloc* alloc);
-
-  /* Get a list of all types in this set. */
-  using TypeList = Vector<Type, 1, SystemAllocPolicy>;
-  bool enumerateTypes(TypeList* list) const;
-
-  /*
-   * Iterate through the objects in this set. getObjectCount overapproximates
-   * in the hash case (see SET_ARRAY_SIZE in TypeInference-inl.h), and
-   * getObject may return nullptr.
-   */
-  inline unsigned getObjectCount() const;
-  inline bool hasGroup(unsigned i) const;
-  inline bool hasSingleton(unsigned i) const;
-  inline ObjectKey* getObject(unsigned i) const;
-  inline JSObject* getSingleton(unsigned i) const;
-  inline ObjectGroup* getGroup(unsigned i) const;
-
-  /*
-   * Get the objects in the set without triggering barriers. This is
-   * potentially unsafe and you should only call these methods if you know
-   * what you're doing. For JIT compilation, use the following methods
-   * instead:
-   *  - MacroAssembler::getSingletonAndDelayBarrier()
-   *  - MacroAssembler::getGroupAndDelayBarrier()
-   */
-  inline JSObject* getSingletonNoBarrier(unsigned i) const;
-  inline ObjectGroup* getGroupNoBarrier(unsigned i) const;
-
-  /* The Class of an object in this set. */
-  inline const JSClass* getObjectClass(unsigned i) const;
-
-  bool canSetDefinite(unsigned slot) {
-    // Note: the cast is required to work around an MSVC issue.
-    return (slot + 1) <=
-           (unsigned(TYPE_FLAG_DEFINITE_MASK) >> TYPE_FLAG_DEFINITE_SHIFT);
-  }
-  void setDefinite(unsigned slot) {
-    MOZ_ASSERT(canSetDefinite(slot));
-    flags |= ((slot + 1) << TYPE_FLAG_DEFINITE_SHIFT);
-    MOZ_ASSERT(definiteSlot() == slot);
-  }
-
-  /* Whether any values in this set might have the specified type. */
-  bool mightBeMIRType(jit::MIRType type) const;
-
-  /* Get whether this type set is known to be a subset of the given types. */
-  bool isSubset(std::initializer_list<jit::MIRType> types) const;
-
-  /*
-   * Get whether this type set is known to be a subset of other.
-   * This variant doesn't freeze constraints. That variant is called knownSubset
-   */
-  bool isSubset(const TypeSet* other) const;
-
-  /*
-   * Get whether the objects in this TypeSet are a subset of the objects
-   * in other.
-   */
-  bool objectsAreSubset(TypeSet* other);
-
-  /* Whether this TypeSet contains exactly the same types as other. */
-  bool equals(const TypeSet* other) const {
-    return this->isSubset(other) && other->isSubset(this);
-  }
-
-  bool objectsIntersect(const TypeSet* other) const;
-
-  /* Forward all types in this set to the specified constraint. */
-  bool addTypesToConstraint(JSContext* cx, TypeConstraint* constraint);
-
-  // Clone a type set into an arbitrary allocator.
-  TemporaryTypeSet* clone(LifoAlloc* alloc) const;
-
-  // |*result| is not even partly initialized when this function is called:
-  // this function placement-new's its contents into existence.
-  bool cloneIntoUninitialized(LifoAlloc* alloc, TemporaryTypeSet* result) const;
-
-  // Create a new TemporaryTypeSet where undefined and/or null has been filtered
-  // out.
-  TemporaryTypeSet* filter(LifoAlloc* alloc, bool filterUndefined,
-                           bool filterNull) const;
-  // Create a new TemporaryTypeSet where the type has been set to object.
-  TemporaryTypeSet* cloneObjectsOnly(LifoAlloc* alloc);
-  TemporaryTypeSet* cloneWithoutObjects(LifoAlloc* alloc);
-
-  JS::Compartment* maybeCompartment();
-
-  // Trigger a read barrier on all the contents of a type set.
-  static void readBarrier(const TypeSet* types);
-
- protected:
-  uint32_t baseObjectCount() const {
-    return (flags & TYPE_FLAG_OBJECT_COUNT_MASK) >>
-           TYPE_FLAG_OBJECT_COUNT_SHIFT;
-  }
-  inline void setBaseObjectCount(uint32_t count);
-
-  void clearObjects();
-
- public:
-  static inline Type GetValueType(const JS::Value& val);
-
-  // An 'untracked' type is a value type we can't represent in a TypeSet
-  // (all magic types except JS_OPTIMIZED_ARGUMENTS).
-  static inline bool IsUntrackedValue(const JS::Value& val);
-  static inline bool IsUntrackedMIRType(jit::MIRType type);
-
-  // Get the type of a possibly untracked value. Returns UnknownType() for
-  // such untracked values.
-  static inline Type GetMaybeUntrackedValueType(const JS::Value& val);
-  static inline Type GetMaybeUntrackedType(jit::MIRType type);
-
-  static bool IsTypeMarked(JSRuntime* rt, Type* v);
-  static bool IsTypeAboutToBeFinalized(Type* v);
-} JS_HAZ_GC_POINTER;
-
-#if JS_BITS_PER_WORD == 32
-static const uintptr_t BaseTypeInferenceMagic = 0xa1a2b3b4;
-#else
-static const uintptr_t BaseTypeInferenceMagic = 0xa1a2b3b4c5c6d7d8;
-#endif
-static const uintptr_t TypeConstraintMagic = BaseTypeInferenceMagic + 1;
-static const uintptr_t ConstraintTypeSetMagic = BaseTypeInferenceMagic + 2;
-
-#ifdef JS_CRASH_DIAGNOSTICS
-extern void ReportMagicWordFailure(uintptr_t actual, uintptr_t expected);
-extern void ReportMagicWordFailure(uintptr_t actual, uintptr_t expected,
-                                   uintptr_t flags, uintptr_t objectSet);
-#endif
-
-/*
- * A constraint which listens to additions to a type set and propagates those
- * changes to other type sets.
- */
-class TypeConstraint {
- private:
-#ifdef JS_CRASH_DIAGNOSTICS
-  uintptr_t magic_ = TypeConstraintMagic;
-#endif
-
-  /* Next constraint listening to the same type set. */
-  TypeConstraint* next_ = nullptr;
-
- public:
-  TypeConstraint() = default;
-
-  void checkMagic() const {
-#ifdef JS_CRASH_DIAGNOSTICS
-    if (MOZ_UNLIKELY(magic_ != TypeConstraintMagic)) {
-      ReportMagicWordFailure(magic_, TypeConstraintMagic);
-    }
-#endif
-  }
-
-  TypeConstraint* next() const {
-    checkMagic();
-    if (next_) {
-      next_->checkMagic();
-    }
-    return next_;
-  }
-  void setNext(TypeConstraint* next) {
-    MOZ_ASSERT(!next_);
-    checkMagic();
-    if (next) {
-      next->checkMagic();
-    }
-    next_ = next;
-  }
-
-  /* Debugging name for this kind of constraint. */
-  virtual const char* kind() = 0;
-
-  /* Register a new type for the set this constraint is listening to. */
-  virtual void newType(JSContext* cx, TypeSet* source, TypeSet::Type type) = 0;
-
-  /*
-   * For constraints attached to an object property's type set, mark the
-   * property as having changed somehow.
-   */
-  virtual void newPropertyState(JSContext* cx, TypeSet* source) {}
-
-  /*
-   * For constraints attached to the JSID_EMPTY type set on an object,
-   * indicate a change in one of the object's dynamic property flags or other
-   * state.
-   */
-  virtual void newObjectState(JSContext* cx, ObjectGroup* group) {}
-
-  /*
-   * If the data this constraint refers to is still live, copy it into the
-   * zone's new allocator. Type constraints only hold weak references.
-   */
-  virtual bool sweep(TypeZone& zone, TypeConstraint** res) = 0;
-
-  /* The associated compartment, if any. */
-  virtual JS::Compartment* maybeCompartment() = 0;
-};
-
-/* Superclass common to stack and heap type sets. */
-class ConstraintTypeSet : public TypeSet {
- private:
-#ifdef JS_CRASH_DIAGNOSTICS
-  uintptr_t magic_ = ConstraintTypeSetMagic;
-#endif
-
- protected:
-  /* Chain of constraints which propagate changes out from this type set. */
-  TypeConstraint* constraintList_ = nullptr;
-
- public:
-  ConstraintTypeSet() = default;
-
-  void checkMagic() const {
-#ifdef JS_CRASH_DIAGNOSTICS
-    if (MOZ_UNLIKELY(magic_ != ConstraintTypeSetMagic)) {
-      ReportMagicWordFailure(magic_, ConstraintTypeSetMagic, uintptr_t(flags),
-                             uintptr_t(objectSet));
-    }
-#endif
-  }
-
-  // This takes a reference to AutoSweepBase to ensure we swept the owning
-  // ObjectGroup or JitScript.
-  TypeConstraint* constraintList(const AutoSweepBase& sweep) const {
-    checkMagic();
-    if (constraintList_) {
-      constraintList_->checkMagic();
-    }
-    return constraintList_;
-  }
-
-  /*
-   * Add a type to this set, calling any constraint handlers if this is a new
-   * possible type.
-   */
-  void addType(const AutoSweepBase& sweep, JSContext* cx, Type type);
-
-  /* Generalize to any type. */
-  void makeUnknown(const AutoSweepBase& sweep, JSContext* cx) {
-    addType(sweep, cx, UnknownType());
-  }
-
-  // Trigger a post barrier when writing to this set, if necessary.
-  // addType(cx, type) takes care of this automatically.
-  void postWriteBarrier(JSContext* cx, Type type);
-
-  /* Add a new constraint to this set. */
-  bool addConstraint(JSContext* cx, TypeConstraint* constraint,
-                     bool callExisting = true);
-
-  inline void sweep(const AutoSweepBase& sweep, JS::Zone* zone);
-  inline void trace(JS::Zone* zone, JSTracer* trc);
-};
-
-class StackTypeSet : public ConstraintTypeSet {
- public:
-};
-
-class HeapTypeSet : public ConstraintTypeSet {
-  inline void newPropertyState(const AutoSweepObjectGroup& sweep,
-                               JSContext* cx);
-
- public:
-  /* Mark this type set as representing a non-data property. */
-  inline void setNonDataProperty(const AutoSweepObjectGroup& sweep,
-                                 JSContext* cx);
-
-  /* Mark this type set as representing a non-writable property. */
-  inline void setNonWritableProperty(const AutoSweepObjectGroup& sweep,
-                                     JSContext* cx);
-
-  // Mark this type set as being non-constant.
-  inline void setNonConstantProperty(const AutoSweepObjectGroup& sweep,
-                                     JSContext* cx);
-
-  // Trigger freeze constraints for this property because a lexical binding was
-  // added to the global lexical environment.
-  inline void markLexicalBindingExists(const AutoSweepObjectGroup& sweep,
-                                       JSContext* cx);
-};
-
-enum class DOMObjectKind : uint8_t { Proxy, Native, Unknown };
-
-class TemporaryTypeSet : public TypeSet {
- public:
-  TemporaryTypeSet() { MOZ_ASSERT(!jit::JitOptions.warpBuilder); }
-  TemporaryTypeSet(LifoAlloc* alloc, Type type);
-
-  TemporaryTypeSet(uint32_t flags, ObjectKey** objectSet) {
-    MOZ_ASSERT(!jit::JitOptions.warpBuilder);
-    this->flags = flags;
-    this->objectSet = objectSet;
-  }
-
-  inline TemporaryTypeSet(LifoAlloc* alloc, jit::MIRType type);
-
-  /*
-   * Constraints for JIT compilation.
-   *
-   * Methods for JIT compilation. These must be used when a script is
-   * currently being compiled (see AutoEnterCompilation) and will add
-   * constraints ensuring that if the return value change in the future due
-   * to new type information, the script's jitcode will be discarded.
-   */
-
-  /* Get any type tag which all values in this set must have. */
-  jit::MIRType getKnownMIRType();
-
-  /* Whether this value may be an object. */
-  bool maybeObject() { return unknownObject() || baseObjectCount() > 0; }
-
-  /*
-   * Whether this typeset represents a potentially sentineled object value:
-   * the value may be an object or null or undefined.
-   * Returns false if the value cannot ever be an object.
-   */
-  bool objectOrSentinel() {
-    TypeFlags flags =
-        TYPE_FLAG_UNDEFINED | TYPE_FLAG_NULL | TYPE_FLAG_ANYOBJECT;
-    if (baseFlags() & (~flags & TYPE_FLAG_BASE_MASK)) {
-      return false;
-    }
-
-    return hasAnyFlag(TYPE_FLAG_ANYOBJECT) || baseObjectCount() > 0;
-  }
-
-  /* Whether the type set contains objects with any of a set of flags. */
-  bool hasObjectFlags(CompilerConstraintList* constraints,
-                      ObjectGroupFlags flags);
-
-  /* Get the class shared by all objects in this set, or nullptr. */
-  const JSClass* getKnownClass(CompilerConstraintList* constraints);
-
-  /*
-   * Get the realm shared by all objects in this set, or nullptr. Returns
-   * nullptr if the set contains proxies (because cross-compartment wrappers
-   * don't have a single realm associated with them).
-   */
-  JS::Realm* getKnownRealm(CompilerConstraintList* constraints);
-
-  /* Result returned from forAllClasses */
-  enum ForAllResult {
-    EMPTY = 1,  // Set empty
-    ALL_TRUE,   // Set not empty and predicate returned true for all classes
-    ALL_FALSE,  // Set not empty and predicate returned false for all classes
-    MIXED,      // Set not empty and predicate returned false for some classes
-                // and true for others, or set contains an unknown or non-object
-                // type
-  };
-
-  /* Apply func to the members of the set and return an appropriate result.
-   * The iteration may end early if the result becomes known early.
-   */
-  ForAllResult forAllClasses(CompilerConstraintList* constraints,
-                             bool (*func)(const JSClass* clasp));
-
-  /*
-   * Returns true if all objects in this set have the same prototype, and
-   * assigns this object to *proto. The proto can be nullptr.
-   */
-  bool getCommonPrototype(CompilerConstraintList* constraints,
-                          JSObject** proto);
-
-  /* Whether the buffer mapped by a TypedArray is shared memory or not */
-  enum TypedArraySharedness {
-    UnknownSharedness = 1,  // We can't determine sharedness
-    KnownShared,            // We know for sure the buffer is shared
-    KnownUnshared           // We know for sure the buffer is unshared
-  };
-
-  /*
-   * Get the typed array type of all objects in this set, or
-   * Scalar::MaxTypedArrayViewType. If there is such a common type and
-   * sharedness is not nullptr then *sharedness is set to what we know about the
-   * sharedness of the memory.
-   */
-  Scalar::Type getTypedArrayType(CompilerConstraintList* constraints,
-                                 TypedArraySharedness* sharedness = nullptr);
-
-  // Whether all objects have JSCLASS_IS_DOMJSCLASS set.
-  bool isDOMClass(CompilerConstraintList* constraints, DOMObjectKind* kind);
-
-  // Whether clasp->isCallable() is true for one or more objects in this set.
-  bool maybeCallable(CompilerConstraintList* constraints);
-
-  // Whether clasp->emulatesUndefined() is true for one or more objects in
-  // this set.
-  bool maybeEmulatesUndefined(CompilerConstraintList* constraints);
-
-  // Get the single value which can appear in this type set, otherwise
-  // nullptr.
-  JSObject* maybeSingleton();
-  ObjectKey* maybeSingleObject();
-
-  // Whether any objects in the type set needs a barrier on id.
-  bool propertyNeedsBarrier(CompilerConstraintList* constraints, jsid id);
-
-  // Whether this set contains all types in other, except (possibly) the
-  // specified type.
-  bool filtersType(const TemporaryTypeSet* other, Type type) const;
-
-  enum DoubleConversion {
-    /* All types in the set should use eager double conversion. */
-    AlwaysConvertToDoubles,
-
-    /* Some types in the set should use eager double conversion. */
-    MaybeConvertToDoubles,
-
-    /* No types should use eager double conversion. */
-    DontConvertToDoubles,
-
-    /* Some types should use eager double conversion, others cannot. */
-    AmbiguousDoubleConversion
-  };
-
-  /*
-   * Whether known double optimizations are possible for element accesses on
-   * objects in this type set.
-   */
-  DoubleConversion convertDoubleElements(CompilerConstraintList* constraints);
-
- private:
-  void getTypedArraySharedness(CompilerConstraintList* constraints,
-                               TypedArraySharedness* sharedness);
-};
-
-// Representation of a heap type property which may or may not be instantiated.
-// Heap properties for singleton types are instantiated lazily as they are used
-// by the compiler, but this is only done on the main thread. If we are
-// compiling off thread and use a property which has not yet been instantiated,
-// it will be treated as empty and non-configured and will be instantiated when
-// rejoining to the main thread. If it is in fact not empty, the compilation
-// will fail; to avoid this, we try to instantiate singleton property types
-// during generation of baseline caches.
-class HeapTypeSetKey {
-  friend class TypeSet::ObjectKey;
-
-  // Object and property being accessed.
-  TypeSet::ObjectKey* object_;
-  jsid id_;
-
-  // If instantiated, the underlying heap type set.
-  HeapTypeSet* maybeTypes_;
-
- public:
-  HeapTypeSetKey() : object_(nullptr), id_(JSID_EMPTY), maybeTypes_(nullptr) {}
-
-  TypeSet::ObjectKey* object() const { return object_; }
-  jsid id() const { return id_; }
-
-  HeapTypeSet* maybeTypes() const {
-    if (maybeTypes_) {
-      maybeTypes_->checkMagic();
-    }
-    return maybeTypes_;
-  }
-
-  bool instantiate(JSContext* cx);
-
-  void freeze(CompilerConstraintList* constraints);
-  jit::MIRType knownMIRType(CompilerConstraintList* constraints);
-  bool nonData(CompilerConstraintList* constraints);
-  bool nonWritable(CompilerConstraintList* constraints);
-  bool isOwnProperty(CompilerConstraintList* constraints,
-                     bool allowEmptyTypesForGlobal = false);
-  JSObject* singleton(CompilerConstraintList* constraints);
-  bool needsBarrier(CompilerConstraintList* constraints);
-  bool constant(CompilerConstraintList* constraints, Value* valOut);
-  bool couldBeConstant(CompilerConstraintList* constraints);
-};
-
-} /* namespace js */
-
-#endif /* vm_TypeSet_h */
diff -Nru firefox-84.0.2+build1/js/src/vm/UbiNodeCensus.cpp firefox-85.0+build1/js/src/vm/UbiNodeCensus.cpp
--- firefox-84.0.2+build1/js/src/vm/UbiNodeCensus.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/UbiNodeCensus.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -160,7 +160,7 @@
   if (!arr) {
     return false;
   }
-  arr->ensureDenseInitializedLength(cx, 0, length);
+  arr->ensureDenseInitializedLength(0, length);
 
   for (size_t i = 0; i < length; i++) {
     arr->setDenseElement(i, NumberValue(count.ids_[i]));
diff -Nru firefox-84.0.2+build1/js/src/vm/Xdr.cpp firefox-85.0+build1/js/src/vm/Xdr.cpp
--- firefox-84.0.2+build1/js/src/vm/Xdr.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/vm/Xdr.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -193,10 +193,6 @@
   buildId->infallibleAppend(sizeof(uintptr_t) == 4 ? '4' : '8');
   buildId->infallibleAppend(MOZ_LITTLE_ENDIAN() ? 'l' : 'b');
 
-  // TI affects the generated bytecode (number of ICEntries, presence of
-  // copy-on-write arrays).
-  buildId->infallibleAppend(IsTypeInferenceEnabled() ? '1' : '0');
-
   // If off-thread parse global isn't used for single script decoding,
   // we use stencil XDR instead of JSScript XDR.
   buildId->infallibleAppend(js::UseOffThreadParseGlobal() ? '1' : '0');
@@ -743,10 +739,10 @@
   MOZ_ASSERT(compilationInfos.delazifications.length() == 0);
 
   frontend::ParserAtomVectorBuilder parserAtomBuilder(
-      cx()->runtime(), compilationInfos.initial.stencil.alloc,
+      cx()->runtime(), compilationInfos.initial.alloc,
       compilationInfos.initial.stencil.parserAtomData);
   parserAtomBuilder_ = &parserAtomBuilder;
-  stencilAlloc_ = &compilationInfos.initial.stencil.alloc;
+  stencilAlloc_ = &compilationInfos.initial.alloc;
 
   MOZ_TRY(codeStencil(compilationInfos.initial));
 
@@ -755,19 +751,21 @@
     return fail(JS::TranscodeResult_Throw);
   }
 
+  // All delazification share CompilationInfoVector.allocForDelazifications.
+  stencilAlloc_ = &compilationInfos.allocForDelazifications;
+
   for (size_t i = 1; i < nchunks_; i++) {
-    compilationInfos.delazifications.infallibleEmplaceBack(
-        cx(), compilationInfos.initial.input.options);
-    auto& funInfo = compilationInfos.delazifications[i - 1];
+    compilationInfos.delazifications.infallibleEmplaceBack();
+    auto& delazification = compilationInfos.delazifications[i - 1];
 
     hasFinishedAtomTable_ = false;
 
     frontend::ParserAtomVectorBuilder parserAtomBuilder(
-        cx()->runtime(), funInfo.stencil.alloc, funInfo.stencil.parserAtomData);
+        cx()->runtime(), compilationInfos.allocForDelazifications,
+        delazification.parserAtomData);
     parserAtomBuilder_ = &parserAtomBuilder;
-    stencilAlloc_ = &funInfo.stencil.alloc;
 
-    MOZ_TRY(codeFunctionStencil(funInfo.stencil));
+    MOZ_TRY(codeFunctionStencil(delazification));
   }
 
   return Ok();
@@ -780,7 +778,7 @@
   MOZ_TRY(codeStencil(compilationInfos.initial));
 
   for (auto& delazification : compilationInfos.delazifications) {
-    MOZ_TRY(codeFunctionStencil(delazification.stencil));
+    MOZ_TRY(codeFunctionStencil(delazification));
   }
 
   return Ok();
diff -Nru firefox-84.0.2+build1/js/src/wasm/AsmJS.cpp firefox-85.0+build1/js/src/wasm/AsmJS.cpp
--- firefox-84.0.2+build1/js/src/wasm/AsmJS.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/AsmJS.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -47,6 +47,7 @@
 #include "js/SourceText.h"
 #include "js/StableStringChars.h"
 #include "js/Wrapper.h"
+#include "util/DifferentialTesting.h"
 #include "util/StringBuffer.h"
 #include "util/Text.h"
 #include "vm/ErrorReporting.h"
@@ -1269,10 +1270,10 @@
  protected:
   class HashableSig {
     uint32_t sigIndex_;
-    const TypeDefVector& types_;
+    const TypeContext& types_;
 
    public:
-    HashableSig(uint32_t sigIndex, const TypeDefVector& types)
+    HashableSig(uint32_t sigIndex, const TypeContext& types)
         : sigIndex_(sigIndex), types_(types) {}
     uint32_t sigIndex() const { return sigIndex_; }
     const FuncType& funcType() const { return types_[sigIndex_].funcType(); }
@@ -1290,7 +1291,7 @@
 
    public:
     NamedSig(const ParserName* name, uint32_t sigIndex,
-             const TypeDefVector& types)
+             const TypeContext& types)
         : HashableSig(sigIndex, types), name_(name) {}
     const ParserName* name() const { return name_; }
 
@@ -1386,13 +1387,13 @@
 
     auto AddMathFunction = [this](const char* name,
                                   AsmJSMathBuiltinFunction func) {
-      auto mbAtom = parserAtoms_.internAscii(cx_, name, strlen(name));
-      if (mbAtom.isErr()) {
+      const ParserAtom* atom =
+          parserAtoms_.internAscii(cx_, name, strlen(name));
+      if (!atom) {
         return false;
       }
       MathBuiltin builtin(func);
-      return this->standardLibraryMathNames_.putNew(mbAtom.unwrap()->asName(),
-                                                    builtin);
+      return this->standardLibraryMathNames_.putNew(atom->asName(), builtin);
     };
 
     for (const auto& info : functions) {
@@ -1416,13 +1417,13 @@
     };
 
     auto AddMathConstant = [this](const char* name, double cst) {
-      auto mbAtom = parserAtoms_.internAscii(cx_, name, strlen(name));
-      if (mbAtom.isErr()) {
+      const ParserAtom* atom =
+          parserAtoms_.internAscii(cx_, name, strlen(name));
+      if (!atom) {
         return false;
       }
       MathBuiltin builtin(cst);
-      return this->standardLibraryMathNames_.putNew(mbAtom.unwrap()->asName(),
-                                                    builtin);
+      return this->standardLibraryMathNames_.putNew(atom->asName(), builtin);
     };
 
     for (const auto& info : constants) {
@@ -1877,13 +1878,14 @@
     }
 
     *sigIndex = moduleEnv_.types.length();
-    return moduleEnv_.types.append(std::move(sig));
+    return moduleEnv_.types.append(std::move(sig)) &&
+           moduleEnv_.typeIds.append(TypeIdDesc());
   }
   bool declareSig(FuncType&& sig, uint32_t* sigIndex) {
     SigSet::AddPtr p = sigSet_.lookupForAdd(sig);
     if (p) {
       *sigIndex = p->sigIndex();
-      MOZ_ASSERT(moduleEnv_.types[*sigIndex].funcType() == sig);
+      MOZ_ASSERT(moduleEnv_.types.funcType(*sigIndex) == sig);
       return true;
     }
 
@@ -2046,23 +2048,26 @@
   }
 
   SharedModule finish() {
-    MOZ_ASSERT(moduleEnv_.funcTypes.empty());
-    if (!moduleEnv_.funcTypes.resize(funcImportMap_.count() +
-                                     funcDefs_.length())) {
+    MOZ_ASSERT(moduleEnv_.funcs.empty());
+    if (!moduleEnv_.funcs.resize(funcImportMap_.count() + funcDefs_.length())) {
       return nullptr;
     }
     for (FuncImportMap::Range r = funcImportMap_.all(); !r.empty();
          r.popFront()) {
       uint32_t funcIndex = r.front().value();
-      MOZ_ASSERT(!moduleEnv_.funcTypes[funcIndex]);
-      moduleEnv_.funcTypes[funcIndex] =
-          &moduleEnv_.types[r.front().key().sigIndex()].funcType();
+      uint32_t funcTypeIndex = r.front().key().sigIndex();
+      MOZ_ASSERT(!moduleEnv_.funcs[funcIndex].type);
+      moduleEnv_.funcs[funcIndex] =
+          FuncDesc(&moduleEnv_.types.funcType(funcTypeIndex),
+                   &moduleEnv_.typeIds[funcTypeIndex], funcTypeIndex);
     }
     for (const Func& func : funcDefs_) {
       uint32_t funcIndex = funcImportMap_.count() + func.funcDefIndex();
-      MOZ_ASSERT(!moduleEnv_.funcTypes[funcIndex]);
-      moduleEnv_.funcTypes[funcIndex] =
-          &moduleEnv_.types[func.sigIndex()].funcType();
+      uint32_t funcTypeIndex = func.sigIndex();
+      MOZ_ASSERT(!moduleEnv_.funcs[funcIndex].type);
+      moduleEnv_.funcs[funcIndex] =
+          FuncDesc(&moduleEnv_.types.funcType(funcTypeIndex),
+                   &moduleEnv_.typeIds[funcTypeIndex], funcTypeIndex);
     }
 
     if (!moduleEnv_.funcImportGlobalDataOffsets.resize(
@@ -3948,8 +3953,7 @@
     return m.addFuncDef(name, usepn->pn_pos.begin, std::move(sig), func);
   }
 
-  const FuncTypeWithId& existingSig =
-      m.env().types[existing->sigIndex()].funcType();
+  const FuncType& existingSig = m.env().types.funcType(existing->sigIndex());
 
   if (!CheckSignatureAgainstExisting(m, usepn, sig, existingSig)) {
     return false;
@@ -4023,7 +4027,7 @@
     }
 
     if (!CheckSignatureAgainstExisting(
-            m, usepn, sig, m.env().types[table.sigIndex()].funcType())) {
+            m, usepn, sig, m.env().types.funcType(table.sigIndex()))) {
       return false;
     }
 
@@ -6193,7 +6197,7 @@
           elem, "function-pointer table's elements must be names of functions");
     }
 
-    const FuncType& funcSig = m.env().types[func->sigIndex()].funcType();
+    const FuncType& funcSig = m.env().types.funcType(func->sigIndex());
     if (sig) {
       if (*sig != funcSig) {
         return m.fail(elem, "all functions in table must have same signature");
@@ -6983,13 +6987,9 @@
 
 static bool SuccessfulValidation(frontend::ParserBase& parser,
                                  unsigned compilationTime) {
-  constexpr unsigned errNum =
-#ifdef JS_MORE_DETERMINISTIC
-      JSMSG_USE_ASM_TYPE_OK_NO_TIME
-#else
-      JSMSG_USE_ASM_TYPE_OK
-#endif
-      ;
+  unsigned errNum = js::SupportDifferentialTesting()
+                        ? JSMSG_USE_ASM_TYPE_OK_NO_TIME
+                        : JSMSG_USE_ASM_TYPE_OK;
 
   char timeChars[20];
   SprintfLiteral(timeChars, "%u", compilationTime);
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/baldrapi.h firefox-85.0+build1/js/src/wasm/cranelift/baldrapi.h
--- firefox-84.0.2+build1/js/src/wasm/cranelift/baldrapi.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/baldrapi.h	2021-01-18 19:58:16.000000000 +0000
@@ -44,7 +44,8 @@
 struct FuncCompileInput;
 // wasm/WasmTypes.h
 class GlobalDesc;
-struct FuncTypeWithId;
+class FuncType;
+class TypeIdDesc;
 struct TableDesc;
 // wasm/WasmValidate.h
 struct ModuleEnvironment;
@@ -69,6 +70,7 @@
   bool platform_is_windows;
   bool ref_types_enabled;
   bool threads_enabled;
+  bool v128_enabled;
   size_t static_memory_bound;
   size_t memory_guard_size;
   size_t memory_base_tls_offset;
@@ -168,6 +170,7 @@
     float f32;
     double f64;
     void* r;
+    uint8_t v128[16];  // Little-endian
   } u;
 };
 
@@ -230,9 +233,11 @@
 
 bool env_uses_shared_memory(const CraneliftModuleEnvironment* env);
 bool env_has_memory(const CraneliftModuleEnvironment* env);
-const js::wasm::FuncTypeWithId* env_type(const CraneliftModuleEnvironment* env,
-                                         size_t typeIndex);
-const js::wasm::FuncTypeWithId* env_func_sig(
+const js::wasm::FuncType* env_type(const CraneliftModuleEnvironment* env,
+                                   size_t typeIndex);
+const js::wasm::FuncType* env_func_sig(const CraneliftModuleEnvironment* env,
+                                       size_t funcIndex);
+const js::wasm::TypeIdDesc* env_func_sig_id(
     const CraneliftModuleEnvironment* env, size_t funcIndex);
 size_t env_func_sig_index(const CraneliftModuleEnvironment* env,
                           size_t funcIndex);
@@ -240,7 +245,9 @@
                                   size_t funcIndex);
 bool env_func_is_import(const CraneliftModuleEnvironment* env,
                         size_t funcIndex);
-const js::wasm::FuncTypeWithId* env_signature(
+const js::wasm::FuncType* env_signature(const CraneliftModuleEnvironment* env,
+                                        size_t sigIndex);
+const js::wasm::TypeIdDesc* env_signature_id(
     const CraneliftModuleEnvironment* env, size_t sigIndex);
 const js::wasm::TableDesc* env_table(const CraneliftModuleEnvironment* env,
                                      size_t tableIndex);
@@ -259,13 +266,14 @@
 uint32_t table_maximumLimit(const js::wasm::TableDesc*);
 js::wasm::TypeCode table_elementTypeCode(const js::wasm::TableDesc*);
 
-size_t funcType_numArgs(const js::wasm::FuncTypeWithId*);
-const BD_ValType* funcType_args(const js::wasm::FuncTypeWithId*);
-size_t funcType_numResults(const js::wasm::FuncTypeWithId*);
-const BD_ValType* funcType_results(const js::wasm::FuncTypeWithId*);
-js::wasm::FuncTypeIdDescKind funcType_idKind(const js::wasm::FuncTypeWithId*);
-size_t funcType_idImmediate(const js::wasm::FuncTypeWithId*);
-size_t funcType_idTlsOffset(const js::wasm::FuncTypeWithId*);
+size_t funcType_numArgs(const js::wasm::FuncType*);
+const BD_ValType* funcType_args(const js::wasm::FuncType*);
+size_t funcType_numResults(const js::wasm::FuncType*);
+const BD_ValType* funcType_results(const js::wasm::FuncType*);
+
+js::wasm::TypeIdDescKind funcType_idKind(const js::wasm::TypeIdDesc*);
+size_t funcType_idImmediate(const js::wasm::TypeIdDesc*);
+size_t funcType_idTlsOffset(const js::wasm::TypeIdDesc*);
 
 void stackmaps_add(BD_Stackmaps* sink, const uint32_t* bitMap,
                    size_t mappedWords, size_t argsSize, size_t codeOffset);
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/build.rs firefox-85.0+build1/js/src/wasm/cranelift/build.rs
--- firefox-84.0.2+build1/js/src/wasm/cranelift/build.rs	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/build.rs	2021-01-18 19:58:16.000000000 +0000
@@ -42,8 +42,8 @@
         .whitelist_function("stackmaps_.*")
         .whitelist_type("Cranelift.*")
         // The enum classes defined in baldrapi.h and WasmBinaryConstants are all Rust-safe.
-        .rustified_enum("BD_.*|Trap|TypeCode|FuncTypeIdDescKind")
-        .whitelist_type("BD_.*|Trap|TypeCode|FuncTypeIdDescKind")
+        .rustified_enum("BD_.*|Trap|TypeCode|TypeIdDescKind")
+        .whitelist_type("BD_.*|Trap|TypeCode|TypeIdDescKind")
         .header("baldrapi.h")
         .clang_args(&[
             "-x",
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/Cargo.toml firefox-85.0+build1/js/src/wasm/cranelift/Cargo.toml
--- firefox-84.0.2+build1/js/src/wasm/cranelift/Cargo.toml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/Cargo.toml	2021-01-18 19:58:16.000000000 +0000
@@ -13,10 +13,10 @@
 # cranelift-wasm to pinned commits. If you want to update Cranelift in Gecko,
 # you should update the following $TOP_LEVEL/Cargo.toml file: look for the
 # revision (rev) hashes of both cranelift dependencies (codegen and wasm).
-cranelift-codegen = { version = "0.67.0", default-features = false }
-cranelift-wasm = { version = "0.67.0" }
+cranelift-codegen = { version = "0.68.0", default-features = false }
+cranelift-wasm = { version = "0.68.0" }
 log = { version = "0.4.6", default-features = false, features = ["release_max_level_info"] }
-env_logger = "0.6"
+env_logger = "0.8"
 smallvec = "1.0"
 
 [build-dependencies]
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/src/bindings/mod.rs firefox-85.0+build1/js/src/wasm/cranelift/src/bindings/mod.rs
--- firefox-84.0.2+build1/js/src/wasm/cranelift/src/bindings/mod.rs	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/src/bindings/mod.rs	2021-01-18 19:58:16.000000000 +0000
@@ -25,7 +25,9 @@
 use cranelift_codegen::ir::{self, InstBuilder, SourceLoc};
 use cranelift_codegen::isa;
 
-use cranelift_wasm::{wasmparser, FuncIndex, GlobalIndex, SignatureIndex, TableIndex, WasmResult};
+use cranelift_wasm::{
+    wasmparser, FuncIndex, GlobalIndex, SignatureIndex, TableIndex, TypeIndex, WasmResult,
+};
 
 use crate::compile;
 use crate::utils::BasicError;
@@ -39,7 +41,7 @@
 pub use self::low_level::CraneliftMetadataEntry as MetadataEntry;
 pub use self::low_level::CraneliftModuleEnvironment as LowLevelModuleEnvironment;
 pub use self::low_level::CraneliftStaticEnvironment as StaticEnvironment;
-pub use self::low_level::FuncTypeIdDescKind;
+pub use self::low_level::TypeIdDescKind;
 pub use self::low_level::Trap;
 
 mod low_level;
@@ -53,6 +55,7 @@
         TypeCode::I64 => Ok(Some(ir::types::I64)),
         TypeCode::F32 => Ok(Some(ir::types::F32)),
         TypeCode::F64 => Ok(Some(ir::types::F64)),
+        TypeCode::V128 => Ok(Some(ir::types::I8X16)),
         TypeCode::FuncRef => Ok(Some(REF_TYPE)),
         TypeCode::ExternRef => Ok(Some(REF_TYPE)),
         TypeCode::BlockVoid => Ok(None),
@@ -91,7 +94,7 @@
         unsafe { low_level::global_isIndirect(self.0) }
     }
 
-    /// Insert an instruction at `pos` that materialized the constant value.
+    /// Insert an instruction at `pos` that materializes the constant value.
     pub fn emit_constant(self, pos: &mut FuncCursor) -> WasmResult<ir::Value> {
         unsafe {
             let v = low_level::global_constantValue(self.0);
@@ -100,6 +103,14 @@
                 TypeCode::I64 => Ok(pos.ins().iconst(ir::types::I64, v.u.i64)),
                 TypeCode::F32 => Ok(pos.ins().f32const(Ieee32::with_bits(v.u.i32 as u32))),
                 TypeCode::F64 => Ok(pos.ins().f64const(Ieee64::with_bits(v.u.i64 as u64))),
+                TypeCode::V128 => {
+                    let c = pos
+                        .func
+                        .dfg
+                        .constants
+                        .insert(ir::ConstantData::from(&v.u.v128 as &[u8]));
+                    Ok(pos.ins().vconst(ir::types::I8X16, c))
+                }
                 TypeCode::NullableRef | TypeCode::ExternRef | TypeCode::FuncRef => {
                     assert!(v.u.r as usize == 0);
                     Ok(pos.ins().null(REF_TYPE))
@@ -145,15 +156,15 @@
 }
 
 #[derive(Clone)]
-pub struct FuncTypeWithId {
-    ptr: *const low_level::FuncTypeWithId,
+pub struct FuncType {
+    ptr: *const low_level::FuncType,
     args: Vec<TypeCode>,
     results: Vec<TypeCode>,
 }
 
-impl FuncTypeWithId {
-    /// Creates a new FuncTypeWithId, caching all the values it requires.
-    pub(crate) fn new(ptr: *const low_level::FuncTypeWithId) -> Self {
+impl FuncType {
+    /// Creates a new FuncType, caching all the values it requires.
+    pub(crate) fn new(ptr: *const low_level::FuncType) -> Self {
         let num_args = unsafe { low_level::funcType_numArgs(ptr) };
         let args = unsafe { slice::from_raw_parts(low_level::funcType_args(ptr), num_args) };
         let args = args
@@ -172,7 +183,25 @@
         Self { ptr, args, results }
     }
 
-    pub(crate) fn id_kind(&self) -> FuncTypeIdDescKind {
+    pub(crate) fn args(&self) -> &[TypeCode] {
+        &self.args
+    }
+    pub(crate) fn results(&self) -> &[TypeCode] {
+        &self.results
+    }
+}
+
+#[derive(Clone)]
+pub struct TypeIdDesc {
+    ptr: *const low_level::TypeIdDesc,
+}
+
+impl TypeIdDesc {
+    pub(crate) fn new(ptr: *const low_level::TypeIdDesc) -> Self {
+        Self { ptr }
+    }
+
+    pub(crate) fn id_kind(&self) -> TypeIdDescKind {
         unsafe { low_level::funcType_idKind(self.ptr) }
     }
     pub(crate) fn id_immediate(&self) -> usize {
@@ -181,12 +210,6 @@
     pub(crate) fn id_tls_offset(&self) -> usize {
         unsafe { low_level::funcType_idTlsOffset(self.ptr) }
     }
-    pub(crate) fn args(&self) -> &[TypeCode] {
-        &self.args
-    }
-    pub(crate) fn results(&self) -> &[TypeCode] {
-        &self.results
-    }
 }
 
 fn typecode_to_parser_type(ty: TypeCode) -> wasmparser::Type {
@@ -195,6 +218,7 @@
         TypeCode::I64 => wasmparser::Type::I64,
         TypeCode::F32 => wasmparser::Type::F32,
         TypeCode::F64 => wasmparser::Type::F64,
+        TypeCode::V128 => wasmparser::Type::V128,
         TypeCode::FuncRef => wasmparser::Type::FuncRef,
         TypeCode::ExternRef => wasmparser::Type::ExternRef,
         TypeCode::BlockVoid => wasmparser::Type::EmptyBlockType,
@@ -202,7 +226,7 @@
     }
 }
 
-impl wasmparser::WasmFuncType for FuncTypeWithId {
+impl wasmparser::WasmFuncType for FuncType {
     fn len_inputs(&self) -> usize {
         self.args.len()
     }
@@ -225,13 +249,13 @@
 
 pub struct ModuleEnvironment<'a> {
     env: &'a CraneliftModuleEnvironment,
-    /// The `WasmModuleResources` trait requires us to return a borrow to a `FuncTypeWithId`, so we
+    /// The `WasmModuleResources` trait requires us to return a borrow to a `FuncType`, so we
     /// eagerly construct these.
-    types: Vec<FuncTypeWithId>,
-    /// Similar to `types`, we need to have a persistently-stored `FuncTypeWithId` to return. The
+    types: Vec<FuncType>,
+    /// Similar to `types`, we need to have a persistently-stored `FuncType` to return. The
     /// types in `func_sigs` are a subset of those in `types`, but we don't want to have to
     /// maintain an index from function to signature ID, so we store these directly.
-    func_sigs: Vec<FuncTypeWithId>,
+    func_sigs: Vec<FuncType>,
 }
 
 impl<'a> ModuleEnvironment<'a> {
@@ -239,13 +263,13 @@
         let num_types = unsafe { low_level::env_num_types(env) };
         let mut types = Vec::with_capacity(num_types);
         for i in 0..num_types {
-            let t = FuncTypeWithId::new(unsafe { low_level::env_signature(env, i) });
+            let t = FuncType::new(unsafe { low_level::env_signature(env, i) });
             types.push(t);
         }
         let num_func_sigs = unsafe { low_level::env_num_funcs(env) };
         let mut func_sigs = Vec::with_capacity(num_func_sigs);
         for i in 0..num_func_sigs {
-            let t = FuncTypeWithId::new(unsafe { low_level::env_func_sig(env, i) });
+            let t = FuncType::new(unsafe { low_level::env_func_sig(env, i) });
             func_sigs.push(t);
         }
         Self {
@@ -266,13 +290,13 @@
     pub fn num_types(&self) -> usize {
         self.types.len()
     }
-    pub fn type_(&self, index: usize) -> FuncTypeWithId {
+    pub fn type_(&self, index: usize) -> FuncType {
         self.types[index].clone()
     }
     pub fn num_func_sigs(&self) -> usize {
         self.func_sigs.len()
     }
-    pub fn func_sig(&self, func_index: FuncIndex) -> FuncTypeWithId {
+    pub fn func_sig(&self, func_index: FuncIndex) -> FuncType {
         self.func_sigs[func_index.index()].clone()
     }
     pub fn func_sig_index(&self, func_index: FuncIndex) -> SignatureIndex {
@@ -284,8 +308,21 @@
     pub fn func_is_import(&self, func_index: FuncIndex) -> bool {
         unsafe { low_level::env_func_is_import(self.env, func_index.index()) }
     }
-    pub fn signature(&self, sig_index: SignatureIndex) -> FuncTypeWithId {
-        FuncTypeWithId::new(unsafe { low_level::env_signature(self.env, sig_index.index()) })
+    pub fn signature(&self, type_index: TypeIndex) -> FuncType {
+        // This function takes `TypeIndex` rather than the `SignatureIndex` that one
+        // might expect.  Why?  https://github.com/bytecodealliance/wasmtime/pull/2115
+        // introduces two new types to the type section as viewed by Cranelift.  This is
+        // in support of the module linking proposal.  So now a type index (for
+        // Cranelift) can refer to a func, module, or instance type.  When the type index
+        // refers to a func type, it can also be used to get the signature index which
+        // can be used to get the ir::Signature for that func type.  For us, Cranelift is
+        // only used with function types so we can just assume type index and signature
+        // index are 1:1.  If and when we come to support the module linking proposal,
+        // this will need to be revisited.
+        FuncType::new(unsafe { low_level::env_signature(self.env, type_index.index()) })
+    }
+    pub fn signature_id(&self, type_index: TypeIndex) -> TypeIdDesc {
+        TypeIdDesc::new(unsafe { low_level::env_signature_id(self.env, type_index.index()) })
     }
     pub fn table(&self, table_index: TableIndex) -> TableDesc {
         TableDesc(unsafe { low_level::env_table(self.env, table_index.index()) })
@@ -307,7 +344,7 @@
 }
 
 impl<'module> wasmparser::WasmModuleResources for ModuleEnvironment<'module> {
-    type FuncType = FuncTypeWithId;
+    type FuncType = FuncType;
     fn table_at(&self, at: u32) -> Option<wasmparser::TableType> {
         if (at as usize) < self.num_tables() {
             let desc = TableDesc(unsafe { low_level::env_table(self.env, at as usize) });
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/src/compile.rs firefox-85.0+build1/js/src/wasm/cranelift/src/compile.rs
--- firefox-84.0.2+build1/js/src/wasm/cranelift/src/compile.rs	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/src/compile.rs	2021-01-18 19:58:16.000000000 +0000
@@ -145,9 +145,12 @@
     }
 
     pub fn compile(&mut self, stackmaps: bindings::Stackmaps) -> CodegenResult<()> {
+        debug!("=== BatchCompiler::compile: BEGIN ==============================");
         let info = self.context.compile(&*self.isa)?;
-        debug!("Optimized wasm function IR: {}", self);
-        self.binemit(info, stackmaps)
+        let res = self.binemit(info, stackmaps);
+        debug!("=== BatchCompiler::compile: END ================================");
+        debug!("");
+        res
     }
 
     /// Translate the WebAssembly code to Cranelift IR.
@@ -163,7 +166,7 @@
         let features = WasmFeatures {
             reference_types: self.static_env.ref_types_enabled,
             module_linking: false,
-            simd: false, // TODO
+            simd: self.static_env.v128_enabled,
             multi_value: true,
             threads: self.static_env.threads_enabled,
             tail_call: false,
@@ -338,11 +341,6 @@
 }
 
 impl<'a> RelocSink for Relocations<'a> {
-    /// Add a relocation referencing a block at the current offset.
-    fn reloc_block(&mut self, _at: CodeOffset, _reloc: Reloc, _block_offset: CodeOffset) {
-        unimplemented!("block relocations NYI");
-    }
-
     /// Add a relocation referencing an external symbol at the current offset.
     fn reloc_external(
         &mut self,
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/src/isa.rs firefox-85.0+build1/js/src/wasm/cranelift/src/isa.rs
--- firefox-84.0.2+build1/js/src/wasm/cranelift/src/isa.rs	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/src/isa.rs	2021-01-18 19:58:16.000000000 +0000
@@ -85,8 +85,12 @@
     pub const IS_SUPPORTED: bool = true;
     pub const USES_HEAP_REG: bool = true;
 
-    pub(crate) fn make_isa_builder(_env: &StaticEnvironment) -> DashResult<isa::Builder> {
-        let ib = isa::lookup_by_name("aarch64-unknown-unknown").map_err(BasicError::from)?;
+    pub(crate) fn make_isa_builder(env: &StaticEnvironment) -> DashResult<isa::Builder> {
+        let mut ib = isa::lookup_by_name("aarch64-unknown-unknown").map_err(BasicError::from)?;
+        if env.v128_enabled {
+            ib.enable("enable_simd").map_err(BasicError::from)?;
+        }
+
         Ok(ib)
     }
 }
@@ -137,8 +141,8 @@
             jump_tables: None,
         };
 
-        for entry in input.split(",") {
-            if let Some(equals_index) = entry.find("=") {
+        for entry in input.split(',') {
+            if let Some(equals_index) = entry.find('=') {
                 let (key, value) = entry.split_at(equals_index);
 
                 // value starts with the =, remove it.
diff -Nru firefox-84.0.2+build1/js/src/wasm/cranelift/src/wasm2clif.rs firefox-85.0+build1/js/src/wasm/cranelift/src/wasm2clif.rs
--- firefox-84.0.2+build1/js/src/wasm/cranelift/src/wasm2clif.rs	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/cranelift/src/wasm2clif.rs	2021-01-18 19:58:16.000000000 +0000
@@ -31,7 +31,7 @@
 use cranelift_codegen::packed_option::PackedOption;
 use cranelift_wasm::{
     FuncEnvironment, FuncIndex, FunctionBuilder, GlobalIndex, GlobalVariable, MemoryIndex,
-    ReturnMode, SignatureIndex, TableIndex, TargetEnvironment, WasmError, WasmResult,
+    ReturnMode, TableIndex, TargetEnvironment, TypeIndex, WasmError, WasmResult,
 };
 
 use crate::bindings::{self, GlobalDesc, SymbolicAddress};
@@ -73,7 +73,7 @@
 /// a callee.
 fn init_sig_from_wsig(
     call_conv: CallConv,
-    wsig: &bindings::FuncTypeWithId,
+    wsig: &bindings::FuncType,
 ) -> WasmResult<ir::Signature> {
     let mut sig = ir::Signature::new(call_conv);
 
@@ -760,9 +760,7 @@
         }
 
         match global.value_type()? {
-            ir::types::R32 | ir::types::R64 => {
-                return Ok(GlobalVariable::Custom);
-            }
+            ir::types::R32 | ir::types::R64 => Ok(GlobalVariable::Custom),
             _ => {
                 let (base_gv, offset) = self.global_address(func, &global);
                 let mem_ty = global.value_type()?;
@@ -827,12 +825,13 @@
     fn make_indirect_sig(
         &mut self,
         func: &mut ir::Function,
-        index: SignatureIndex,
+        index: TypeIndex,
     ) -> WasmResult<ir::SigRef> {
         let wsig = self.module_env.signature(index);
+        let wsig_id = self.module_env.signature_id(index);
         let mut sigdata = init_sig_from_wsig(self.static_env.call_conv(), &wsig)?;
 
-        if wsig.id_kind() != bindings::FuncTypeIdDescKind::None {
+        if wsig_id.id_kind() != bindings::TypeIdDescKind::None {
             // A signature to be used for an indirect call also takes a signature id.
             sigdata.params.push(ir::AbiParam::special(
                 POINTER_TYPE,
@@ -892,27 +891,27 @@
         mut pos: FuncCursor,
         table_index: TableIndex,
         table: ir::Table,
-        sig_index: SignatureIndex,
+        sig_index: TypeIndex,
         sig_ref: ir::SigRef,
         callee: ir::Value,
         call_args: &[ir::Value],
     ) -> WasmResult<ir::Inst> {
-        let wsig = self.module_env.signature(sig_index);
+        let wsig_id = self.module_env.signature_id(sig_index);
 
         let wtable = self.get_table(pos.func, table_index);
 
         // Follows `MacroAssembler::wasmCallIndirect`:
 
         // 1. Materialize the signature ID.
-        let sigid_value = match wsig.id_kind() {
-            bindings::FuncTypeIdDescKind::None => None,
-            bindings::FuncTypeIdDescKind::Immediate => {
+        let sigid_value = match wsig_id.id_kind() {
+            bindings::TypeIdDescKind::None => None,
+            bindings::TypeIdDescKind::Immediate => {
                 // The signature is represented as an immediate pointer-sized value.
-                let imm = wsig.id_immediate() as i64;
+                let imm = wsig_id.id_immediate() as i64;
                 Some(pos.ins().iconst(POINTER_TYPE, imm))
             }
-            bindings::FuncTypeIdDescKind::Global => {
-                let gv = self.sig_global(pos.func, wsig.id_tls_offset());
+            bindings::TypeIdDescKind::Global => {
+                let gv = self.sig_global(pos.func, wsig_id.id_tls_offset());
                 let addr = pos.ins().global_value(POINTER_TYPE, gv);
                 Some(
                     pos.ins()
@@ -1097,12 +1096,20 @@
     fn translate_memory_copy(
         &mut self,
         mut pos: FuncCursor,
-        _index: MemoryIndex,
-        heap: ir::Heap,
+        _src_index: MemoryIndex,
+        src_heap: ir::Heap,
+        _dst_index: MemoryIndex,
+        dst_heap: ir::Heap,
         dst: ir::Value,
         src: ir::Value,
         len: ir::Value,
     ) -> WasmResult<()> {
+        if src_heap != dst_heap {
+            return Err(WasmError::Unsupported(
+                "memory_copy between different heaps is not supported".to_string(),
+            ));
+        }
+        let heap = src_heap;
         let heap_gv = pos.func.heaps[heap].base;
         let mem_base = pos.ins().global_value(POINTER_TYPE, heap_gv);
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/moz.build firefox-85.0+build1/js/src/wasm/moz.build
--- firefox-84.0.2+build1/js/src/wasm/moz.build	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/moz.build	2021-01-18 19:58:16.000000000 +0000
@@ -24,6 +24,7 @@
     "WasmBuiltins.cpp",
     "WasmCode.cpp",
     "WasmCompile.cpp",
+    "WasmContext.cpp",
     "WasmDebug.cpp",
     "WasmFrameIter.cpp",
     "WasmGC.cpp",
diff -Nru firefox-84.0.2+build1/js/src/wasm/TypedObject.cpp firefox-85.0+build1/js/src/wasm/TypedObject.cpp
--- firefox-84.0.2+build1/js/src/wasm/TypedObject.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/TypedObject.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -28,7 +28,6 @@
 #include "vm/TypedArrayObject.h"
 #include "vm/Uint8Clamped.h"
 
-#include "wasm/WasmJS.h"     // WasmNamespaceObject
 #include "wasm/WasmTypes.h"  // WasmValueBox
 #include "gc/Marking-inl.h"
 #include "gc/Nursery-inl.h"
@@ -45,34 +44,7 @@
 using mozilla::PointerRangeSize;
 
 using namespace js;
-
-template <class T>
-static inline T* ToObjectIf(HandleValue value) {
-  if (!value.isObject()) {
-    return nullptr;
-  }
-
-  if (!value.toObject().is<T>()) {
-    return nullptr;
-  }
-
-  return &value.toObject().as<T>();
-}
-
-static inline CheckedInt32 RoundUpToAlignment(CheckedInt32 address,
-                                              uint32_t align) {
-  MOZ_ASSERT(IsPowerOfTwo(align));
-
-  // Note: Be careful to order operators such that we first make the
-  // value smaller and then larger, so that we don't get false
-  // overflow errors due to (e.g.) adding `align` and then
-  // subtracting `1` afterwards when merely adding `align-1` would
-  // not have overflowed. Note that due to the nature of two's
-  // complement representation, if `address` is already aligned,
-  // then adding `align-1` cannot itself cause an overflow.
-
-  return ((address + (align - 1)) / align) * align;
-}
+using namespace wasm;
 
 /***************************************************************************
  * Typed Prototypes
@@ -84,637 +56,59 @@
 
 const JSClass js::TypedProto::class_ = {"TypedProto"};
 
-/***************************************************************************
- * Scalar type objects
- *
- * Scalar type objects like `uint8`, `uint16`, are all instances of
- * the ScalarTypeDescr class. Like all type objects, they have a reserved
- * slot pointing to a TypeRepresentation object, which is used to
- * distinguish which scalar type object this actually is.
- */
-
-static const JSClassOps ScalarTypeDescrClassOps = {
-    nullptr,                // addProperty
-    nullptr,                // delProperty
-    nullptr,                // enumerate
-    nullptr,                // newEnumerate
-    nullptr,                // resolve
-    nullptr,                // mayResolve
-    TypeDescr::finalize,    // finalize
-    ScalarTypeDescr::call,  // call
-    nullptr,                // hasInstance
-    nullptr,                // construct
-    nullptr,                // trace
-};
-
-const JSClass js::ScalarTypeDescr::class_ = {
-    "Scalar",
-    JSCLASS_HAS_RESERVED_SLOTS(TypeDescr::SlotCount) |
-        JSCLASS_BACKGROUND_FINALIZE,
-    &ScalarTypeDescrClassOps};
-
-uint32_t ScalarTypeDescr::size(Type t) {
-  return AssertedCast<uint32_t>(Scalar::byteSize(t));
-}
-
-uint32_t ScalarTypeDescr::alignment(Type t) {
-  return AssertedCast<uint32_t>(Scalar::byteSize(t));
-}
-
-/*static*/ const char* ScalarTypeDescr::typeName(Type type) {
-  switch (type) {
-#define NUMERIC_TYPE_TO_STRING(constant_, type_, name_, slot_) \
-  case constant_:                                              \
-    return #name_;
-    JS_FOR_EACH_SCALAR_TYPE_REPR(NUMERIC_TYPE_TO_STRING)
-#undef NUMERIC_TYPE_TO_STRING
-    default:
-      break;
-  }
-  MOZ_CRASH("Invalid type");
-}
-
-template <typename T>
-BigInt* CreateBigInt(JSContext* cx, T i);
-template <>
-BigInt* CreateBigInt<int64_t>(JSContext* cx, int64_t i) {
-  return BigInt::createFromInt64(cx, i);
-}
-template <>
-BigInt* CreateBigInt<uint64_t>(JSContext* cx, uint64_t u) {
-  return BigInt::createFromUint64(cx, u);
-}
-
-template <typename T>
-T ConvertBigInt(BigInt* bi);
-template <>
-int64_t ConvertBigInt<int64_t>(BigInt* bi) {
-  return BigInt::toInt64(bi);
-}
-template <>
-uint64_t ConvertBigInt<uint64_t>(BigInt* bi) {
-  return BigInt::toUint64(bi);
-}
-
-/*
- * Helper method for converting a double into other scalar
- * types in the same way that JavaScript would. In particular,
- * simple C casting from double to int32_t gets things wrong
- * for values like 0xF0000000.
- */
-template <typename T>
-static T ConvertScalar(double d) {
-  if (TypeIsFloatingPoint<T>()) {
-    return T(d);
-  }
-  if (TypeIsUnsigned<T>()) {
-    uint32_t n = JS::ToUint32(d);
-    return T(n);
-  }
-  int32_t n = JS::ToInt32(d);
-  return T(n);
-}
-
-bool ScalarTypeDescr::call(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  if (!args.requireAtLeast(cx, args.callee().getClass()->name, 1)) {
-    return false;
-  }
-
-  Rooted<ScalarTypeDescr*> descr(cx, &args.callee().as<ScalarTypeDescr>());
-  ScalarTypeDescr::Type type = descr->type();
-
-  switch (type) {
-#define NUMBER_CALL(constant_, type_, name_, slot_) \
-  case constant_: {                                 \
-    double number;                                  \
-    if (!ToNumber(cx, args[0], &number)) {          \
-      return false;                                 \
-    }                                               \
-    if (type == Scalar::Uint8Clamped) {             \
-      number = ClampDoubleToUint8(number);          \
-    }                                               \
-    type_ converted = ConvertScalar<type_>(number); \
-    args.rval().setNumber((double)converted);       \
-    return true;                                    \
-  }
-    JS_FOR_EACH_SCALAR_NUMBER_TYPE_REPR(NUMBER_CALL)
-#undef NUMBER_CALL
-#define BIGINT_CALL(constant_, type_, name_, slot_)   \
-  case constant_: {                                   \
-    BigInt* bi = ToBigInt(cx, args[0]);               \
-    if (!bi) {                                        \
-      return false;                                   \
-    }                                                 \
-    type_ converted = ConvertBigInt<type_>(bi);       \
-    BigInt* ret = CreateBigInt<type_>(cx, converted); \
-    if (!ret) {                                       \
-      return false;                                   \
-    }                                                 \
-    args.rval().setBigInt(ret);                       \
-    return true;                                      \
-  }
-    JS_FOR_EACH_SCALAR_BIGINT_TYPE_REPR(BIGINT_CALL)
-#undef BIGINT_CALL
-    default:
-      MOZ_CRASH();
-  }
-  return true;
-}
-
-/* static */
-TypeDescr* GlobalObject::getOrCreateScalarTypeDescr(
-    JSContext* cx, Handle<GlobalObject*> global, Scalar::Type scalarType) {
-  int32_t slot = 0;
-  switch (scalarType) {
-    case Scalar::Int32:
-      slot = WasmNamespaceObject::Int32Desc;
-      break;
-    case Scalar::Int64:
-      slot = WasmNamespaceObject::Int64Desc;
-      break;
-    case Scalar::Float32:
-      slot = WasmNamespaceObject::Float32Desc;
-      break;
-    case Scalar::Float64:
-      slot = WasmNamespaceObject::Float64Desc;
-      break;
-    default:
-      MOZ_CRASH("NYI");
-  }
-
-  Rooted<WasmNamespaceObject*> namespaceObject(
-      cx, &GlobalObject::getOrCreateWebAssemblyNamespace(cx, global)
-               ->as<WasmNamespaceObject>());
-  if (!namespaceObject) {
+TypedProto* TypedProto::create(JSContext* cx) {
+  Handle<GlobalObject*> global = cx->global();
+  RootedObject objProto(cx,
+                        GlobalObject::getOrCreateObjectPrototype(cx, global));
+  if (!objProto) {
     return nullptr;
   }
-  return &namespaceObject->getReservedSlot(slot).toObject().as<TypeDescr>();
-}
 
-/* static */
-TypeDescr* GlobalObject::getOrCreateReferenceTypeDescr(
-    JSContext* cx, Handle<GlobalObject*> global, ReferenceType type) {
-  int32_t slot = 0;
-  switch (type) {
-    case ReferenceType::TYPE_OBJECT:
-      slot = WasmNamespaceObject::ObjectDesc;
-      break;
-    case ReferenceType::TYPE_WASM_ANYREF:
-      slot = WasmNamespaceObject::WasmAnyRefDesc;
-      break;
-    default:
-      MOZ_CRASH("NYI");
-  }
-
-  Rooted<WasmNamespaceObject*> namespaceObject(
-      cx, &GlobalObject::getOrCreateWebAssemblyNamespace(cx, global)
-               ->as<WasmNamespaceObject>());
-  if (!namespaceObject) {
-    return nullptr;
-  }
-  return &namespaceObject->getReservedSlot(slot).toObject().as<TypeDescr>();
+  return NewTenuredObjectWithGivenProto<TypedProto>(cx, objProto);
 }
 
-/***************************************************************************
- * Reference type objects
- *
- * Reference type objects like `Any` or `Object` basically work the
- * same way that the scalar type objects do. There is one class with
- * many instances, and each instance has a reserved slot with a
- * TypeRepresentation object, which is used to distinguish which
- * reference type object this actually is.
- */
-
-static const JSClassOps ReferenceTypeDescrClassOps = {
-    nullptr,                   // addProperty
-    nullptr,                   // delProperty
-    nullptr,                   // enumerate
-    nullptr,                   // newEnumerate
-    nullptr,                   // resolve
-    nullptr,                   // mayResolve
-    TypeDescr::finalize,       // finalize
-    ReferenceTypeDescr::call,  // call
-    nullptr,                   // hasInstance
-    nullptr,                   // construct
-    nullptr,                   // trace
+static const JSClassOps TypeDescrClassOps = {
+    nullptr,              // addProperty
+    nullptr,              // delProperty
+    nullptr,              // enumerate
+    nullptr,              // newEnumerate
+    nullptr,              // resolve
+    nullptr,              // mayResolve
+    TypeDescr::finalize,  // finalize
+    nullptr,              // call
+    nullptr,              // hasInstance
+    nullptr,              // construct
+    nullptr,              // trace
 };
 
-const JSClass js::ReferenceTypeDescr::class_ = {
-    "Reference",
+const JSClass js::TypeDescr::class_ = {
+    "TypeDescr",
     JSCLASS_HAS_RESERVED_SLOTS(TypeDescr::SlotCount) |
         JSCLASS_BACKGROUND_FINALIZE,
-    &ReferenceTypeDescrClassOps};
-
-static const uint32_t ReferenceSizes[] = {
-#define REFERENCE_SIZE(_kind, _type, _name, slot_) sizeof(_type),
-    JS_FOR_EACH_REFERENCE_TYPE_REPR(REFERENCE_SIZE) 0
-#undef REFERENCE_SIZE
-};
-
-uint32_t ReferenceTypeDescr::size(Type t) {
-  return ReferenceSizes[uint32_t(t)];
-}
-
-uint32_t ReferenceTypeDescr::alignment(Type t) {
-  return ReferenceSizes[uint32_t(t)];
-}
-
-/*static*/ const char* ReferenceTypeDescr::typeName(Type type) {
-  switch (type) {
-#define NUMERIC_TYPE_TO_STRING(constant_, type_, name_, slot_) \
-  case constant_:                                              \
-    return #name_;
-    JS_FOR_EACH_REFERENCE_TYPE_REPR(NUMERIC_TYPE_TO_STRING)
-#undef NUMERIC_TYPE_TO_STRING
-  }
-  MOZ_CRASH("Invalid type");
-}
-
-bool js::ReferenceTypeDescr::call(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-
-  MOZ_ASSERT(args.callee().is<ReferenceTypeDescr>());
-  Rooted<ReferenceTypeDescr*> descr(cx,
-                                    &args.callee().as<ReferenceTypeDescr>());
-
-  if (!args.requireAtLeast(cx, descr->typeName(), 1)) {
-    return false;
-  }
-
-  switch (descr->type()) {
-    case ReferenceType::TYPE_WASM_ANYREF:
-      // As a cast in JS, anyref is an identity operation.
-      args.rval().set(args[0]);
-      return true;
-
-    case ReferenceType::TYPE_OBJECT: {
-      RootedObject obj(cx, ToObject(cx, args[0]));
-      if (!obj) {
-        return false;
-      }
-      args.rval().setObject(*obj);
-      return true;
-    }
-  }
-
-  MOZ_CRASH("Unhandled Reference type");
-}
-
-/***************************************************************************
- * ArrayMetaTypeDescr class
- */
-
-static const JSClassOps ArrayTypeDescrClassOps = {
-    nullptr,                 // addProperty
-    nullptr,                 // delProperty
-    nullptr,                 // enumerate
-    nullptr,                 // newEnumerate
-    nullptr,                 // resolve
-    nullptr,                 // mayResolve
-    TypeDescr::finalize,     // finalize
-    nullptr,                 // call
-    nullptr,                 // hasInstance
-    TypedObject::construct,  // construct
-    nullptr,                 // trace
-};
-
-const JSClass ArrayTypeDescr::class_ = {
-    "ArrayType",
-    JSCLASS_HAS_RESERVED_SLOTS(TypeDescr::SlotCount) |
-        JSCLASS_BACKGROUND_FINALIZE,
-    &ArrayTypeDescrClassOps};
+    &TypeDescrClassOps};
 
 static bool CreateTraceList(JSContext* cx, HandleTypeDescr descr);
 
-ArrayTypeDescr* ArrayMetaTypeDescr::create(JSContext* cx,
-                                           HandleObject arrayTypePrototype,
-                                           HandleTypeDescr elementType,
-                                           HandleAtom stringRepr, int32_t size,
-                                           int32_t length) {
-  MOZ_ASSERT(arrayTypePrototype);
-  Rooted<ArrayTypeDescr*> obj(cx);
-  obj =
-      NewSingletonObjectWithGivenProto<ArrayTypeDescr>(cx, arrayTypePrototype);
-  if (!obj) {
-    return nullptr;
-  }
-
-  obj->initReservedSlot(TypeDescr::Kind,
-                        Int32Value(int32_t(ArrayTypeDescr::Kind)));
-  obj->initReservedSlot(TypeDescr::StringRepr, StringValue(stringRepr));
-  obj->initReservedSlot(TypeDescr::Alignment,
-                        Int32Value(elementType->alignment()));
-  obj->initReservedSlot(TypeDescr::Size, Int32Value(size));
-  obj->initReservedSlot(TypeDescr::ArrayElemType, ObjectValue(*elementType));
-  obj->initReservedSlot(TypeDescr::ArrayLength, Int32Value(length));
-
-  RootedValue elementTypeVal(cx, ObjectValue(*elementType));
-  if (!DefineDataProperty(cx, obj, cx->names().elementType, elementTypeVal,
-                          JSPROP_READONLY | JSPROP_PERMANENT)) {
-    return nullptr;
-  }
-
-  RootedValue lengthValue(cx, NumberValue(length));
-  if (!DefineDataProperty(cx, obj, cx->names().length, lengthValue,
-                          JSPROP_READONLY | JSPROP_PERMANENT)) {
-    return nullptr;
-  }
-
-  Rooted<TypedProto*> prototypeObj(cx, TypedProto::create(cx));
-  if (!prototypeObj) {
-    return nullptr;
-  }
-
-  obj->initReservedSlot(TypeDescr::Proto, ObjectValue(*prototypeObj));
-
-  if (!LinkConstructorAndPrototype(cx, obj, prototypeObj)) {
-    return nullptr;
-  }
-
-  if (!CreateTraceList(cx, obj)) {
-    return nullptr;
-  }
-
-  if (!cx->zone()->addTypeDescrObject(cx, obj)) {
-    ReportOutOfMemory(cx);
-    return nullptr;
-  }
-
-  return obj;
-}
-
-bool ArrayMetaTypeDescr::construct(JSContext* cx, unsigned argc, Value* vp) {
-  JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                            JSMSG_TYPEDOBJECT_NOT_CONSTRUCTIBLE);
-  return false;
-}
-
-/*********************************
- * StructType class
- */
-
-static const JSClassOps StructTypeDescrClassOps = {
-    nullptr,                 // addProperty
-    nullptr,                 // delProperty
-    nullptr,                 // enumerate
-    nullptr,                 // newEnumerate
-    nullptr,                 // resolve
-    nullptr,                 // mayResolve
-    TypeDescr::finalize,     // finalize
-    nullptr,                 // call
-    nullptr,                 // hasInstance
-    TypedObject::construct,  // construct
-    nullptr,                 // trace
-};
-
-const JSClass StructTypeDescr::class_ = {
-    "StructType",
-    JSCLASS_HAS_RESERVED_SLOTS(TypeDescr::SlotCount) |
-        JSCLASS_BACKGROUND_FINALIZE,
-    &StructTypeDescrClassOps};
-
-CheckedInt32 StructMetaTypeDescr::Layout::addField(int32_t fieldAlignment,
-                                                   int32_t fieldSize) {
-  // Alignment of the struct is the max of the alignment of its fields.
-  structAlignment = std::max(structAlignment, fieldAlignment);
-
-  // Align the pointer.
-  CheckedInt32 offset = RoundUpToAlignment(sizeSoFar, fieldAlignment);
-  if (!offset.isValid()) {
-    return offset;
-  }
-
-  // Allocate space.
-  sizeSoFar = offset + fieldSize;
-  if (!sizeSoFar.isValid()) {
-    return sizeSoFar;
-  }
-
-  return offset;
-}
-
-CheckedInt32 StructMetaTypeDescr::Layout::addScalar(Scalar::Type type) {
-  return addField(ScalarTypeDescr::alignment(type),
-                  ScalarTypeDescr::size(type));
-}
-
-CheckedInt32 StructMetaTypeDescr::Layout::addReference(ReferenceType type) {
-  return addField(ReferenceTypeDescr::alignment(type),
-                  ReferenceTypeDescr::size(type));
-}
-
-CheckedInt32 StructMetaTypeDescr::Layout::close(int32_t* alignment) {
-  if (alignment) {
-    *alignment = structAlignment;
-  }
-  return RoundUpToAlignment(sizeSoFar, structAlignment);
-}
-
-/* static */
-StructTypeDescr* StructMetaTypeDescr::createFromArrays(
-    JSContext* cx, HandleObject structTypePrototype, HandleIdVector ids,
-    JS::HandleValueVector fieldTypeObjs, Vector<StructFieldProps>& fieldProps) {
-  StringBuffer stringBuffer(cx);       // Canonical string repr
-  RootedValueVector fieldNames(cx);    // Name of each field.
-  RootedValueVector fieldOffsets(cx);  // Offset of each field field.
-  RootedValueVector fieldMuts(cx);     // Mutability of each field.
-  RootedObject userFieldOffsets(cx);   // User-exposed {f:offset} object
-  RootedObject userFieldTypes(cx);     // User-exposed {f:descr} object.
-  Layout layout;                       // Field offsetter
-
-  userFieldOffsets = NewTenuredBuiltinClassInstance<PlainObject>(cx);
-  if (!userFieldOffsets) {
-    return nullptr;
-  }
-
-  userFieldTypes = NewTenuredBuiltinClassInstance<PlainObject>(cx);
-  if (!userFieldTypes) {
-    return nullptr;
-  }
-
-  if (!stringBuffer.append("new StructType({")) {
-    return nullptr;
-  }
-
-  RootedId id(cx);
-  Rooted<TypeDescr*> fieldType(cx);
-
-  for (unsigned int i = 0; i < ids.length(); i++) {
-    id = ids[i];
-
-    // Collect field name
-    RootedValue fieldName(cx, IdToValue(id));
-    if (!fieldNames.append(fieldName)) {
-      return nullptr;
-    }
-
-    fieldType = ToObjectIf<TypeDescr>(fieldTypeObjs[i]);
-
-    // userFieldTypes[id] = typeObj
-    if (!DefineDataProperty(cx, userFieldTypes, id, fieldTypeObjs[i],
-                            JSPROP_READONLY | JSPROP_PERMANENT)) {
-      return nullptr;
-    }
-
-    // Append "f:Type" to the string repr
-    if (i > 0 && !stringBuffer.append(", ")) {
-      return nullptr;
-    }
-    if (!stringBuffer.append(JSID_TO_ATOM(id))) {
-      return nullptr;
-    }
-    if (!stringBuffer.append(": ")) {
-      return nullptr;
-    }
-    if (!stringBuffer.append(&fieldType->stringRepr())) {
-      return nullptr;
-    }
-
-    CheckedInt32 offset;
-    if (fieldProps[i].alignAsInt64) {
-      offset = layout.addField(ScalarTypeDescr::alignment(Scalar::Int64),
-                               fieldType->size());
-    } else if (fieldProps[i].alignAsV128) {
-      offset = layout.addField(ScalarTypeDescr::alignment(Scalar::Simd128),
-                               fieldType->size());
-    } else {
-      offset = layout.addField(fieldType->alignment(), fieldType->size());
-    }
-    if (!offset.isValid()) {
-      JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                JSMSG_TYPEDOBJECT_TOO_BIG);
-      return nullptr;
-    }
-    MOZ_ASSERT(offset.value() >= 0);
-    if (!fieldOffsets.append(Int32Value(offset.value()))) {
-      return nullptr;
-    }
-    if (!fieldMuts.append(BooleanValue(fieldProps[i].isMutable))) {
-      return nullptr;
-    }
-
-    // userFieldOffsets[id] = offset
-    RootedValue offsetValue(cx, Int32Value(offset.value()));
-    if (!DefineDataProperty(cx, userFieldOffsets, id, offsetValue,
-                            JSPROP_READONLY | JSPROP_PERMANENT)) {
-      return nullptr;
-    }
-  }
+TypeDescr* TypeDescr::createFromHandle(JSContext* cx, TypeHandle handle) {
+  const TypeDef& type = handle.get(cx->wasm().typeContext.get());
+  MOZ_ASSERT(type.isStructType());
+  const StructType& structType = type.structType();
 
-  // Complete string representation.
-  if (!stringBuffer.append("})")) {
-    return nullptr;
-  }
-
-  RootedAtom stringRepr(cx, stringBuffer.finishAtom());
-  if (!stringRepr) {
-    return nullptr;
-  }
-
-  int32_t alignment;
-  CheckedInt32 totalSize = layout.close(&alignment);
-  if (!totalSize.isValid()) {
-    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                              JSMSG_TYPEDOBJECT_TOO_BIG);
-    return nullptr;
-  }
-
-  // Now create the resulting type descriptor.
-
-  Rooted<StructTypeDescr*> descr(cx);
-  descr = NewSingletonObjectWithGivenProto<StructTypeDescr>(
-      cx, structTypePrototype);
+  Rooted<TypeDescr*> descr(
+      cx, NewTenuredObjectWithGivenProto<TypeDescr>(cx, nullptr));
   if (!descr) {
     return nullptr;
   }
 
-  descr->initReservedSlot(TypeDescr::Kind,
-                          Int32Value(int32_t(TypeKind::Struct)));
-  descr->initReservedSlot(TypeDescr::StringRepr, StringValue(stringRepr));
-  descr->initReservedSlot(TypeDescr::Alignment,
-                          Int32Value(AssertedCast<int32_t>(alignment)));
-  descr->initReservedSlot(TypeDescr::Size, Int32Value(totalSize.value()));
-
-  // Construct for internal use an array with the name for each field.
-  {
-    RootedObject fieldNamesVec(cx);
-    fieldNamesVec = NewDenseCopiedArray(
-        cx, fieldNames.length(), fieldNames.begin(), nullptr, TenuredObject);
-    if (!fieldNamesVec) {
-      return nullptr;
-    }
-    descr->initReservedSlot(TypeDescr::StructFieldNames,
-                            ObjectValue(*fieldNamesVec));
-  }
-
-  // Construct for internal use an array with the type object for each field.
-  RootedObject fieldTypeVec(cx);
-  fieldTypeVec =
-      NewDenseCopiedArray(cx, fieldTypeObjs.length(), fieldTypeObjs.begin(),
-                          nullptr, TenuredObject);
-  if (!fieldTypeVec) {
-    return nullptr;
-  }
-  descr->initReservedSlot(TypeDescr::StructFieldTypes,
-                          ObjectValue(*fieldTypeVec));
-
-  // Construct for internal use an array with the offset for each field.
-  {
-    RootedObject fieldOffsetsVec(cx);
-    fieldOffsetsVec =
-        NewDenseCopiedArray(cx, fieldOffsets.length(), fieldOffsets.begin(),
-                            nullptr, TenuredObject);
-    if (!fieldOffsetsVec) {
-      return nullptr;
-    }
-    descr->initReservedSlot(TypeDescr::StructFieldOffsets,
-                            ObjectValue(*fieldOffsetsVec));
-  }
-
-  // Construct for internal use an array with the mutability for each field.
-  {
-    RootedObject fieldMutsVec(cx);
-    fieldMutsVec = NewDenseCopiedArray(
-        cx, fieldMuts.length(), fieldMuts.begin(), nullptr, TenuredObject);
-    if (!fieldMutsVec) {
-      return nullptr;
-    }
-    descr->initReservedSlot(TypeDescr::StructFieldMuts,
-                            ObjectValue(*fieldMutsVec));
-  }
-
-  // Create data properties fieldOffsets and fieldTypes
-  // TODO: Probably also want to track mutability here, but not important yet.
-  if (!FreezeObject(cx, userFieldOffsets)) {
-    return nullptr;
-  }
-  if (!FreezeObject(cx, userFieldTypes)) {
-    return nullptr;
-  }
-  RootedValue userFieldOffsetsValue(cx, ObjectValue(*userFieldOffsets));
-  if (!DefineDataProperty(cx, descr, cx->names().fieldOffsets,
-                          userFieldOffsetsValue,
-                          JSPROP_READONLY | JSPROP_PERMANENT)) {
-    return nullptr;
-  }
-  RootedValue userFieldTypesValue(cx, ObjectValue(*userFieldTypes));
-  if (!DefineDataProperty(cx, descr, cx->names().fieldTypes,
-                          userFieldTypesValue,
-                          JSPROP_READONLY | JSPROP_PERMANENT)) {
-    return nullptr;
-  }
-
-  Rooted<TypedProto*> prototypeObj(cx, TypedProto::create(cx));
-  if (!prototypeObj) {
+  Rooted<TypedProto*> proto(cx, TypedProto::create(cx));
+  if (!proto) {
     return nullptr;
   }
 
-  descr->initReservedSlot(TypeDescr::Proto, ObjectValue(*prototypeObj));
-
-  if (!LinkConstructorAndPrototype(cx, descr, prototypeObj)) {
-    return nullptr;
-  }
+  descr->initReservedSlot(TypeDescr::Handle, Int32Value(handle.index()));
+  descr->initReservedSlot(TypeDescr::Size, Int32Value(structType.size_));
+  descr->initReservedSlot(TypeDescr::Proto, ObjectValue(*proto));
+  descr->initReservedSlot(TypeDescr::TraceList, UndefinedValue());
 
   if (!CreateTraceList(cx, descr)) {
     return nullptr;
@@ -728,237 +122,6 @@
   return descr;
 }
 
-bool StructMetaTypeDescr::construct(JSContext* cx, unsigned int argc,
-                                    Value* vp) {
-  JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                            JSMSG_TYPEDOBJECT_NOT_CONSTRUCTIBLE);
-  return false;
-}
-
-size_t StructTypeDescr::fieldCount() const {
-  return fieldInfoObject(TypeDescr::StructFieldNames)
-      .getDenseInitializedLength();
-}
-
-bool StructTypeDescr::fieldIndex(jsid id, size_t* out) const {
-  ArrayObject& fieldNames = fieldInfoObject(TypeDescr::StructFieldNames);
-  size_t l = fieldNames.getDenseInitializedLength();
-  for (size_t i = 0; i < l; i++) {
-    JSAtom& a = fieldNames.getDenseElement(i).toString()->asAtom();
-    if (JSID_IS_ATOM(id, &a)) {
-      *out = i;
-      return true;
-    }
-  }
-  return false;
-}
-
-JSAtom& StructTypeDescr::fieldName(size_t index) const {
-  return fieldInfoObject(TypeDescr::StructFieldNames)
-      .getDenseElement(index)
-      .toString()
-      ->asAtom();
-}
-
-size_t StructTypeDescr::fieldOffset(size_t index) const {
-  ArrayObject& fieldOffsets = fieldInfoObject(TypeDescr::StructFieldOffsets);
-  MOZ_ASSERT(index < fieldOffsets.getDenseInitializedLength());
-  return AssertedCast<size_t>(fieldOffsets.getDenseElement(index).toInt32());
-}
-
-bool StructTypeDescr::fieldIsMutable(size_t index) const {
-  ArrayObject& fieldMuts = fieldInfoObject(TypeDescr::StructFieldMuts);
-  MOZ_ASSERT(index < fieldMuts.getDenseInitializedLength());
-  return fieldMuts.getDenseElement(index).toBoolean();
-}
-
-TypeDescr& StructTypeDescr::fieldDescr(size_t index) const {
-  ArrayObject& fieldDescrs = fieldInfoObject(TypeDescr::StructFieldTypes);
-  MOZ_ASSERT(index < fieldDescrs.getDenseInitializedLength());
-  return fieldDescrs.getDenseElement(index).toObject().as<TypeDescr>();
-}
-
-/******************************************************************************
- * Creating the TypedObject "module"
- *
- * We create one global, `TypedObject`, which contains the following
- * members:
- *
- * 1. uint8, uint16, etc
- * 2. ArrayType
- * 3. StructType
- *
- * Each of these is a function and hence their prototype is
- * `Function.__proto__` (in terms of the JS Engine, they are not
- * JSFunctions but rather instances of their own respective JSClasses
- * which override the call and construct operations).
- *
- * Each type object also has its own `prototype` field. Therefore,
- * using `StructType` as an example, the basic setup is:
- *
- *   StructType --__proto__--> Function.__proto__
- *        |
- *    prototype -- prototype --> { }
- *        |
- *        v
- *       { } -----__proto__--> Function.__proto__
- *
- * When a new type object (e.g., an instance of StructType) is created,
- * it will look as follows:
- *
- *   MyStruct -__proto__-> StructType.prototype -__proto__-> Function.__proto__
- *        |                          |
- *        |                     prototype
- *        |                          |
- *        |                          v
- *    prototype -----__proto__----> { }
- *        |
- *        v
- *       { } --__proto__-> Object.prototype
- *
- * Finally, when an instance of `MyStruct` is created, its
- * structure is as follows:
- *
- *    object -__proto__->
- *      MyStruct.prototype -__proto__->
- *        StructType.prototype.prototype -__proto__->
- *          Object.prototype
- */
-
-// Here `T` is either `ScalarTypeDescr` or `ReferenceTypeDescr`
-template <typename T>
-static bool DefineSimpleTypeDescr(JSContext* cx, Handle<GlobalObject*> global,
-                                  Handle<WasmNamespaceObject*> namespaceObject,
-                                  typename T::Type type,
-                                  HandlePropertyName className,
-                                  WasmNamespaceObject::Slot descSlot) {
-  RootedObject objProto(cx,
-                        GlobalObject::getOrCreateObjectPrototype(cx, global));
-  if (!objProto) {
-    return false;
-  }
-
-  RootedObject funcProto(
-      cx, GlobalObject::getOrCreateFunctionPrototype(cx, global));
-  if (!funcProto) {
-    return false;
-  }
-
-  Rooted<T*> descr(cx, NewSingletonObjectWithGivenProto<T>(cx, funcProto));
-  if (!descr) {
-    return false;
-  }
-
-  descr->initReservedSlot(TypeDescr::Kind, Int32Value(int32_t(T::Kind)));
-  descr->initReservedSlot(TypeDescr::StringRepr, StringValue(className));
-  descr->initReservedSlot(TypeDescr::Alignment, Int32Value(T::alignment(type)));
-  descr->initReservedSlot(TypeDescr::Size,
-                          Int32Value(AssertedCast<int32_t>(T::size(type))));
-  descr->initReservedSlot(TypeDescr::Type, Int32Value(int32_t(type)));
-
-  // Create the typed prototype for the scalar type. This winds up
-  // not being user accessible, but we still create one for consistency.
-  Rooted<TypedProto*> proto(cx);
-  proto = NewTenuredObjectWithGivenProto<TypedProto>(cx, objProto);
-  if (!proto) {
-    return false;
-  }
-  descr->initReservedSlot(TypeDescr::Proto, ObjectValue(*proto));
-
-  if (!CreateTraceList(cx, descr)) {
-    return false;
-  }
-
-  if (!cx->zone()->addTypeDescrObject(cx, descr)) {
-    return false;
-  }
-
-  namespaceObject->initReservedSlot(descSlot, ObjectValue(*descr));
-
-  return true;
-}
-
-///////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-static bool DefineMetaTypeDescr(JSContext* cx, const char* name,
-                                Handle<GlobalObject*> global,
-                                Handle<WasmNamespaceObject*> namespaceObject,
-                                WasmNamespaceObject::Slot protoSlot) {
-  RootedAtom className(cx, Atomize(cx, name, strlen(name)));
-  if (!className) {
-    return false;
-  }
-
-  RootedObject proto(cx,
-                     GlobalObject::getOrCreateFunctionPrototype(cx, global));
-  if (!proto) {
-    return false;
-  }
-
-  const int constructorLength = 2;
-  RootedFunction ctor(cx);
-  ctor = GlobalObject::createConstructor(cx, T::construct, className,
-                                         constructorLength);
-  if (!ctor || !LinkConstructorAndPrototype(cx, ctor, proto)) {
-    return false;
-  }
-
-  namespaceObject->initReservedSlot(protoSlot, ObjectValue(*proto));
-
-  return true;
-}
-
-bool js::InitTypedObjectSlots(JSContext* cx,
-                              Handle<WasmNamespaceObject*> namespaceObject) {
-  Handle<GlobalObject*> global = cx->global();
-
-  // int32, int64, etc
-
-#define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_, slot_)             \
-  if (!DefineSimpleTypeDescr<ScalarTypeDescr>(                               \
-          cx, global, namespaceObject, constant_, cx->names().name_, slot_)) \
-    return false;
-  JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
-#undef BINARYDATA_SCALAR_DEFINE
-
-#define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_, slot_)          \
-  if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(                            \
-          cx, global, namespaceObject, constant_, cx->names().name_, slot_)) \
-    return false;
-  JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
-#undef BINARYDATA_REFERENCE_DEFINE
-
-  // ArrayType.
-
-  if (!DefineMetaTypeDescr<ArrayMetaTypeDescr>(
-          cx, "ArrayType", global, namespaceObject,
-          WasmNamespaceObject::ArrayTypePrototype)) {
-    return false;
-  }
-
-  // StructType.
-
-  if (!DefineMetaTypeDescr<StructMetaTypeDescr>(
-          cx, "StructType", global, namespaceObject,
-          WasmNamespaceObject::StructTypePrototype)) {
-    return false;
-  }
-
-  return true;
-}
-
-TypedProto* TypedProto::create(JSContext* cx) {
-  Handle<GlobalObject*> global = cx->global();
-  RootedObject objProto(cx,
-                        GlobalObject::getOrCreateObjectPrototype(cx, global));
-  if (!objProto) {
-    return nullptr;
-  }
-
-  return NewSingletonObjectWithGivenProto<TypedProto>(cx, objProto);
-}
-
 /******************************************************************************
  * Typed objects
  */
@@ -970,10 +133,6 @@
   return PointerRangeSize(typedMemBase(), typedMem());
 }
 
-uint32_t TypedObject::length() const {
-  return typeDescr().as<ArrayTypeDescr>().length();
-}
-
 uint8_t* TypedObject::typedMem() const {
   if (is<InlineTypedObject>()) {
     return as<InlineTypedObject>().inlineTypedMem();
@@ -1072,7 +231,7 @@
   if (!buffer) {
     return nullptr;
   }
-  descr->initInstance(buffer->dataPointer());
+  descr->initInstance(cx, buffer->dataPointer());
   obj->attach(*buffer);
   return obj;
 }
@@ -1089,7 +248,7 @@
       return nullptr;
     }
     JS::AutoCheckCannotGC nogc(cx);
-    descr->initInstance(obj->inlineTypedMem(nogc));
+    descr->initInstance(cx, obj->inlineTypedMem(nogc));
     return obj;
   }
 
@@ -1142,31 +301,41 @@
   descr.traceInstance(trc, newData);
 }
 
-bool TypeDescr::hasProperty(const JSAtomState& names, jsid id) {
-  switch (kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      return false;
-
-    case TypeKind::Array: {
-      uint32_t index;
-      return IdIsIndex(id, &index) || JSID_IS_ATOM(id, names.length);
-    }
+const TypeDef& TypeDescr::getType(JSContext* cx) const {
+  TypeHandle handle(uint32_t(getReservedSlot(Slot::Handle).toInt32()));
+  return handle.get(cx->wasm().typeContext.get());
+}
 
-    case TypeKind::Struct: {
-      size_t index;
-      return as<StructTypeDescr>().fieldIndex(id, &index);
-    }
+bool TypeDescr::lookupProperty(JSContext* cx, jsid id, uint32_t* offset,
+                               ValType* type) {
+  const auto& typeDef = getType(cx);
+  MOZ_RELEASE_ASSERT(typeDef.isStructType());
+  const auto& structType = typeDef.structType();
+  uint32_t index;
+  if (!IdIsIndex(id, &index)) {
+    return false;
   }
+  if (index >= structType.fields_.length()) {
+    return false;
+  }
+  const StructField& field = structType.fields_[index];
+  *offset = field.offset;
+  *type = field.type;
+  return true;
+  ;
+}
 
-  MOZ_CRASH("Unexpected kind");
+uint32_t TypeDescr::propertyCount(JSContext* cx) {
+  const auto& typeDef = getType(cx);
+  MOZ_RELEASE_ASSERT(typeDef.isStructType());
+  return typeDef.structType().fields_.length();
 }
 
 /* static */
 bool TypedObject::obj_lookupProperty(JSContext* cx, HandleObject obj,
                                      HandleId id, MutableHandleObject objp,
                                      MutableHandle<PropertyResult> propp) {
-  if (obj->as<TypedObject>().typeDescr().hasProperty(cx->names(), id)) {
+  if (obj->as<TypedObject>().typeDescr().hasProperty(cx, id)) {
     propp.setNonNativeProperty();
     objp.set(obj);
     return true;
@@ -1186,46 +355,17 @@
                                      HandleId id,
                                      Handle<PropertyDescriptor> desc,
                                      ObjectOpResult& result) {
-  // Serialize the type string of |obj|.
-  RootedAtom typeReprAtom(cx, &obj->as<TypedObject>().typeDescr().stringRepr());
-  UniqueChars typeReprStr = StringToNewUTF8CharsZ(cx, *typeReprAtom);
-  if (!typeReprStr) {
-    return false;
-  }
-
   JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                           JSMSG_OBJECT_NOT_EXTENSIBLE, typeReprStr.get());
+                           JSMSG_OBJECT_NOT_EXTENSIBLE, "TypedObject");
   return false;
 }
 
 bool TypedObject::obj_hasProperty(JSContext* cx, HandleObject obj, HandleId id,
                                   bool* foundp) {
   Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
-  switch (typedObj->typeDescr().kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      break;
-
-    case TypeKind::Array: {
-      if (JSID_IS_ATOM(id, cx->names().length)) {
-        *foundp = true;
-        return true;
-      }
-      uint32_t index;
-      // Elements are not inherited from the prototype.
-      if (IdIsIndex(id, &index)) {
-        *foundp = (index < uint32_t(typedObj->length()));
-        return true;
-      }
-      break;
-    }
-
-    case TypeKind::Struct:
-      size_t index;
-      if (typedObj->typeDescr().as<StructTypeDescr>().fieldIndex(id, &index)) {
-        *foundp = true;
-        return true;
-      }
+  if (typedObj->typeDescr().hasProperty(cx, id)) {
+    *foundp = true;
+    return true;
   }
 
   RootedObject proto(cx, obj->staticPrototype());
@@ -1242,40 +382,10 @@
                                   MutableHandleValue vp) {
   Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
 
-  // Dispatch elements to obj_getElement:
-  uint32_t index;
-  if (IdIsIndex(id, &index)) {
-    return obj_getElement(cx, obj, receiver, index, vp);
-  }
-
-  // Handle everything else here:
-
-  switch (typedObj->typeDescr().kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      break;
-
-    case TypeKind::Array:
-      if (JSID_IS_ATOM(id, cx->names().length)) {
-        vp.setInt32(typedObj->length());
-        return true;
-      }
-      break;
-
-    case TypeKind::Struct: {
-      Rooted<StructTypeDescr*> descr(
-          cx, &typedObj->typeDescr().as<StructTypeDescr>());
-
-      size_t fieldIndex;
-      if (!descr->fieldIndex(id, &fieldIndex)) {
-        break;
-      }
-
-      size_t offset = descr->fieldOffset(fieldIndex);
-      Rooted<TypeDescr*> fieldType(cx, &descr->fieldDescr(fieldIndex));
-
-      return typedObj->loadValue(cx, offset, fieldType, vp);
-    }
+  uint32_t offset;
+  ValType type;
+  if (typedObj->typeDescr().lookupProperty(cx, id, &offset, &type)) {
+    return typedObj->loadValue(cx, offset, type, vp);
   }
 
   RootedObject proto(cx, obj->staticPrototype());
@@ -1287,111 +397,19 @@
   return GetProperty(cx, proto, receiver, id, vp);
 }
 
-bool TypedObject::obj_getElement(JSContext* cx, HandleObject obj,
-                                 HandleValue receiver, uint32_t index,
-                                 MutableHandleValue vp) {
-  MOZ_ASSERT(obj->is<TypedObject>());
-  Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
-  Rooted<TypeDescr*> descr(cx, &typedObj->typeDescr());
-
-  switch (descr->kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-    case TypeKind::Struct:
-      break;
-
-    case TypeKind::Array:
-      return obj_getArrayElement(cx, typedObj, descr, index, vp);
-  }
-
-  RootedObject proto(cx, obj->staticPrototype());
-  if (!proto) {
-    vp.setUndefined();
-    return true;
-  }
-
-  return GetElement(cx, proto, receiver, index, vp);
-}
-
-/*static*/
-bool TypedObject::obj_getArrayElement(JSContext* cx,
-                                      Handle<TypedObject*> typedObj,
-                                      Handle<TypeDescr*> typeDescr,
-                                      uint32_t index, MutableHandleValue vp) {
-  // Elements are not inherited from the prototype.
-  if (index >= (size_t)typedObj->length()) {
-    vp.setUndefined();
-    return true;
-  }
-
-  Rooted<TypeDescr*> elementType(
-      cx, &typeDescr->as<ArrayTypeDescr>().elementType());
-  size_t offset = elementType->size() * index;
-  return typedObj->loadValue(cx, offset, elementType, vp);
-}
-
 bool TypedObject::obj_setProperty(JSContext* cx, HandleObject obj, HandleId id,
                                   HandleValue v, HandleValue receiver,
                                   ObjectOpResult& result) {
   Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
 
-  switch (typedObj->typeDescr().kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      break;
-
-    case TypeKind::Array: {
-      if (JSID_IS_ATOM(id, cx->names().length)) {
-        if (receiver.isObject() && obj == &receiver.toObject()) {
-          JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                    JSMSG_CANT_REDEFINE_ARRAY_LENGTH);
-          return false;
-        }
-        return result.failReadOnly();
-      }
-
-      uint32_t index;
-      if (IdIsIndex(id, &index)) {
-        if (!receiver.isObject() || obj != &receiver.toObject()) {
-          return SetPropertyByDefining(cx, id, v, receiver, result);
-        }
-
-        if (index >= uint32_t(typedObj->length())) {
-          JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                    JSMSG_TYPEDOBJECT_BINARYARRAY_BAD_INDEX);
-          return false;
-        }
-
-        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                  JSMSG_TYPEDOBJECT_SETTING_IMMUTABLE);
-        return false;
-      }
-      break;
+  if (typedObj->typeDescr().hasProperty(cx, id)) {
+    if (!receiver.isObject() || obj != &receiver.toObject()) {
+      return SetPropertyByDefining(cx, id, v, receiver, result);
     }
 
-    case TypeKind::Struct: {
-      Rooted<StructTypeDescr*> descr(
-          cx, &typedObj->typeDescr().as<StructTypeDescr>());
-
-      size_t fieldIndex;
-      if (!descr->fieldIndex(id, &fieldIndex)) {
-        break;
-      }
-
-      if (!descr->fieldIsMutable(fieldIndex)) {
-        JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                  JSMSG_TYPEDOBJECT_SETTING_IMMUTABLE);
-        return false;
-      }
-
-      if (!receiver.isObject() || obj != &receiver.toObject()) {
-        return SetPropertyByDefining(cx, id, v, receiver, result);
-      }
-
-      JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                                JSMSG_TYPEDOBJECT_SETTING_IMMUTABLE);
-      return false;
-    }
+    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+                              JSMSG_TYPEDOBJECT_SETTING_IMMUTABLE);
+    return false;
   }
 
   return SetPropertyOnProto(cx, obj, id, v, receiver, result);
@@ -1401,81 +419,26 @@
     JSContext* cx, HandleObject obj, HandleId id,
     MutableHandle<PropertyDescriptor> desc) {
   Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
-  Rooted<TypeDescr*> descr(cx, &typedObj->typeDescr());
-  switch (descr->kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      break;
-
-    case TypeKind::Array: {
-      uint32_t index;
-      if (IdIsIndex(id, &index)) {
-        if (!obj_getArrayElement(cx, typedObj, descr, index, desc.value())) {
-          return false;
-        }
-        desc.setAttributes(JSPROP_ENUMERATE | JSPROP_PERMANENT);
-        desc.object().set(obj);
-        return true;
-      }
 
-      if (JSID_IS_ATOM(id, cx->names().length)) {
-        desc.value().setInt32(typedObj->length());
-        desc.setAttributes(JSPROP_READONLY | JSPROP_PERMANENT);
-        desc.object().set(obj);
-        return true;
-      }
-      break;
-    }
-
-    case TypeKind::Struct: {
-      Rooted<StructTypeDescr*> descr(
-          cx, &typedObj->typeDescr().as<StructTypeDescr>());
-
-      size_t fieldIndex;
-      if (!descr->fieldIndex(id, &fieldIndex)) {
-        break;
-      }
-
-      size_t offset = descr->fieldOffset(fieldIndex);
-      Rooted<TypeDescr*> fieldType(cx, &descr->fieldDescr(fieldIndex));
-      if (!typedObj->loadValue(cx, offset, fieldType, desc.value())) {
-        return false;
-      }
-
-      desc.setAttributes(JSPROP_ENUMERATE | JSPROP_PERMANENT);
-      desc.object().set(obj);
-      return true;
+  uint32_t offset;
+  ValType type;
+  if (typedObj->typeDescr().lookupProperty(cx, id, &offset, &type)) {
+    if (!typedObj->loadValue(cx, offset, type, desc.value())) {
+      return false;
     }
+    desc.setAttributes(JSPROP_ENUMERATE | JSPROP_PERMANENT);
+    desc.object().set(obj);
+    return true;
   }
 
   desc.object().set(nullptr);
   return true;
 }
 
-static bool IsOwnId(JSContext* cx, HandleObject obj, HandleId id) {
-  uint32_t index;
-  Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
-  switch (typedObj->typeDescr().kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference:
-      return false;
-
-    case TypeKind::Array:
-      return IdIsIndex(id, &index) || JSID_IS_ATOM(id, cx->names().length);
-
-    case TypeKind::Struct:
-      size_t index;
-      if (typedObj->typeDescr().as<StructTypeDescr>().fieldIndex(id, &index)) {
-        return true;
-      }
-  }
-
-  return false;
-}
-
 bool TypedObject::obj_deleteProperty(JSContext* cx, HandleObject obj,
                                      HandleId id, ObjectOpResult& result) {
-  if (IsOwnId(cx, obj, id)) {
+  Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
+  if (typedObj->typeDescr().hasProperty(cx, id)) {
     return Throw(cx, id, JSMSG_CANT_DELETE);
   }
 
@@ -1492,136 +455,36 @@
                                    bool enumerableOnly) {
   MOZ_ASSERT(obj->is<TypedObject>());
   Rooted<TypedObject*> typedObj(cx, &obj->as<TypedObject>());
-  Rooted<TypeDescr*> descr(cx, &typedObj->typeDescr());
 
-  RootedId id(cx);
-  switch (descr->kind()) {
-    case TypeKind::Scalar:
-    case TypeKind::Reference: {
-      // Nothing to enumerate.
-      break;
-    }
-
-    case TypeKind::Array: {
-      if (!properties.reserve(typedObj->length())) {
-        return false;
-      }
-
-      for (uint32_t index = 0; index < typedObj->length(); index++) {
-        id = INT_TO_JSID(index);
-        properties.infallibleAppend(id);
-      }
-      break;
-    }
-
-    case TypeKind::Struct: {
-      size_t fieldCount = descr->as<StructTypeDescr>().fieldCount();
-      if (!properties.reserve(fieldCount)) {
-        return false;
-      }
-
-      for (size_t index = 0; index < fieldCount; index++) {
-        id = AtomToId(&descr->as<StructTypeDescr>().fieldName(index));
-        properties.infallibleAppend(id);
-      }
-      break;
-    }
+  size_t propertyCount = typedObj->typeDescr().propertyCount(cx);
+  if (!properties.reserve(propertyCount)) {
+    return false;
   }
 
-  return true;
-}
-
-static void LoadReference_Object(GCPtrObject* heap, MutableHandleValue v) {
-  if (*heap) {
-    v.setObject(**heap);
-  } else {
-    v.setNull();
+  RootedId id(cx);
+  for (size_t index = 0; index < propertyCount; index++) {
+    id = INT_TO_JSID(index);
+    properties.infallibleAppend(id);
   }
-}
 
-static void LoadReference_WasmAnyRef(GCPtrObject* heap, MutableHandleValue v) {
-  // TODO/AnyRef-boxing: With boxed immediates and strings this will change.
-  if (*heap) {
-    JSObject* object = heap->get();
-    if (object->is<wasm::WasmValueBox>()) {
-      v.set(object->as<wasm::WasmValueBox>().value());
-    } else {
-      v.setObject(*object);
-    }
-  } else {
-    v.setNull();
-  }
+  return true;
 }
 
-#define JS_LOAD_NUMBER_IMPL(constant, T, _name, _slot)        \
-  case constant: {                                            \
-    /* Should be guaranteed by the typed objects API: */      \
-    MOZ_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                 \
-                                                              \
-    JS::AutoCheckCannotGC nogc(cx);                           \
-    T* target = reinterpret_cast<T*>(typedMem(offset, nogc)); \
-    vp.setNumber(JS::CanonicalizeNaN((double)*target));       \
-    return true;                                              \
-  }
-
-#define JS_LOAD_BIGINT_IMPL(constant, T, _name, _slot)       \
-  case constant: {                                           \
-    /* Should be guaranteed by the typed objects API: */     \
-    MOZ_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                \
-                                                             \
-    T value;                                                 \
-    {                                                        \
-      JS::AutoCheckCannotGC nogc(cx);                        \
-      value = *reinterpret_cast<T*>(typedMem(offset, nogc)); \
-    }                                                        \
-    BigInt* bi = CreateBigInt<T>(cx, value);                 \
-    if (!bi) {                                               \
-      return false;                                          \
-    }                                                        \
-    vp.setBigInt(bi);                                        \
-    return true;                                             \
-  }
-
-#define JS_LOAD_REFERENCE_IMPL(constant, T, name, _slot)      \
-  case constant: {                                            \
-    /* Should be guaranteed by the typed objects API: */      \
-    MOZ_ASSERT(offset % MOZ_ALIGNOF(T) == 0);                 \
-                                                              \
-    JS::AutoCheckCannotGC nogc(cx);                           \
-    T* target = reinterpret_cast<T*>(typedMem(offset, nogc)); \
-    LoadReference_##name(target, vp);                         \
-    return true;                                              \
-  }
-
-bool TypedObject::loadValue(JSContext* cx, size_t offset, HandleTypeDescr type,
+bool TypedObject::loadValue(JSContext* cx, size_t offset, ValType type,
                             MutableHandleValue vp) {
-  MOZ_ASSERT(type->is<SimpleTypeDescr>());
-
-  switch (type->kind()) {
-    case TypeKind::Scalar: {
-      ScalarTypeDescr::Type scalarType = type->as<ScalarTypeDescr>().type();
-      switch (scalarType) {
-        JS_FOR_EACH_SCALAR_NUMBER_TYPE_REPR(JS_LOAD_NUMBER_IMPL)
-        JS_FOR_EACH_SCALAR_BIGINT_TYPE_REPR(JS_LOAD_BIGINT_IMPL)
-        default:
-          MOZ_CRASH("unsupported");
-      }
-      break;
-    }
-    case TypeKind::Reference: {
-      ReferenceTypeDescr::Type referenceType =
-          type->as<ReferenceTypeDescr>().type();
-      switch (referenceType) {
-        JS_FOR_EACH_REFERENCE_TYPE_REPR(JS_LOAD_REFERENCE_IMPL)
-        default:
-          MOZ_CRASH("unsupported");
-      }
-    }
-    default:
-      MOZ_CRASH("unsupported");
+  // Temporary hack, (ref T) is not exposable to JS yet but some tests would
+  // like to access it so we erase (ref T) with eqref when loading. This is
+  // safe as (ref T) <: eqref and we're not in the writing case where we
+  // would need to perform a type check.
+  if (type.isTypeIndex()) {
+    type = RefType::fromTypeCode(TypeCode::EqRef, true);
+  }
+  if (!type.isExposable()) {
+    JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                             JSMSG_WASM_BAD_VAL_TYPE);
+    return false;
   }
-
-  return false;
+  return ToJSValue(cx, typedMem() + offset, type, vp);
 }
 
 /******************************************************************************
@@ -1663,29 +526,7 @@
 }
 
 /* static */
-size_t InlineTypedObject::obj_moved(JSObject* dst, JSObject* src) {
-  if (!IsInsideNursery(src)) {
-    return 0;
-  }
-
-  // Inline typed object element arrays can be preserved on the stack by Ion
-  // and need forwarding pointers created during a minor GC. We can't do this
-  // in the trace hook because we don't have any stale data to determine
-  // whether this object moved and where it was moved from.
-  TypeDescr& descr = dst->as<InlineTypedObject>().typeDescr();
-  if (descr.kind() == TypeKind::Array) {
-    // The forwarding pointer can be direct as long as there is enough
-    // space for it. Other objects might point into the object's buffer,
-    // but they will not set any direct forwarding pointers.
-    uint8_t* oldData = reinterpret_cast<uint8_t*>(src) + offsetOfDataStart();
-    uint8_t* newData = dst->as<InlineTypedObject>().inlineTypedMem();
-    auto& nursery = dst->runtimeFromMainThread()->gc.nursery();
-    bool direct = descr.size() >= sizeof(uintptr_t);
-    nursery.setForwardingPointerWhileTenuring(oldData, newData, direct);
-  }
-
-  return 0;
-}
+size_t InlineTypedObject::obj_moved(JSObject* dst, JSObject* src) { return 0; }
 
 /******************************************************************************
  * Typed object classes
@@ -1730,19 +571,6 @@
 DEFINE_TYPEDOBJ_CLASS(InlineTypedObject, InlineTypedObject::obj_trace,
                       InlineTypedObject::obj_moved);
 
-/*static*/
-bool TypedObject::construct(JSContext* cx, unsigned int argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-
-  MOZ_ASSERT(args.callee().is<TypeDescr>());
-  Rooted<TypeDescr*> callee(cx, &args.callee().as<TypeDescr>());
-
-  MOZ_ASSERT(cx->realm() == callee->realm());
-  JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                            JSMSG_TYPEDOBJECT_NOT_CONSTRUCTIBLE);
-  return false;
-}
-
 /* static */ JS::Result<TypedObject*, JS::OOM> TypedObject::create(
     JSContext* cx, js::gc::AllocKind kind, js::gc::InitialHeap heap,
     js::HandleShape shape, js::HandleObjectGroup group) {
@@ -1773,38 +601,22 @@
 // Walking memory
 
 template <typename V>
-static void VisitReferences(TypeDescr& descr, uint8_t* base, V& visitor,
-                            size_t offset) {
-  switch (descr.kind()) {
-    case TypeKind::Scalar:
-      return;
-
-    case TypeKind::Reference:
-      visitor.visitReference(descr.as<ReferenceTypeDescr>(), base, offset);
-      return;
-
-    case TypeKind::Array: {
-      ArrayTypeDescr& arrayDescr = descr.as<ArrayTypeDescr>();
-      TypeDescr& elementDescr = arrayDescr.elementType();
-      for (uint32_t i = 0; i < arrayDescr.length(); i++) {
-        VisitReferences(elementDescr, base, visitor, offset);
-        offset += elementDescr.size();
+static void VisitReferences(JSContext* cx, TypeDescr& descr, uint8_t* base,
+                            V& visitor, size_t offset) {
+  const auto& typeDef = descr.getType(cx);
+
+  if (typeDef.isStructType()) {
+    const auto& structType = typeDef.structType();
+    for (const StructField& field : structType.fields_) {
+      if (field.type.isReference()) {
+        uint32_t fieldOffset = offset + field.offset;
+        visitor.visitReference(base, fieldOffset);
       }
-      return;
-    }
-
-    case TypeKind::Struct: {
-      StructTypeDescr& structDescr = descr.as<StructTypeDescr>();
-      for (size_t i = 0; i < structDescr.fieldCount(); i++) {
-        TypeDescr& descr = structDescr.fieldDescr(i);
-        VisitReferences(descr, base, visitor,
-                        offset + structDescr.fieldOffset(i));
-      }
-      return;
     }
+    return;
   }
 
-  MOZ_CRASH("Invalid type repr kind");
+  MOZ_ASSERT_UNREACHABLE();
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1814,32 +626,23 @@
 
 class MemoryInitVisitor {
  public:
-  void visitReference(ReferenceTypeDescr& descr, uint8_t* base, size_t offset);
+  void visitReference(uint8_t* base, size_t offset);
 };
 
 }  // namespace
 
-void MemoryInitVisitor::visitReference(ReferenceTypeDescr& descr, uint8_t* base,
-                                       size_t offset) {
-  switch (descr.type()) {
-    case ReferenceType::TYPE_WASM_ANYREF:
-    case ReferenceType::TYPE_OBJECT: {
-      js::GCPtrObject* objectPtr =
-          reinterpret_cast<js::GCPtrObject*>(base + offset);
-      objectPtr->init(nullptr);
-      return;
-    }
-  }
-
-  MOZ_CRASH("Invalid kind");
+void MemoryInitVisitor::visitReference(uint8_t* base, size_t offset) {
+  js::GCPtrObject* objectPtr =
+      reinterpret_cast<js::GCPtrObject*>(base + offset);
+  objectPtr->init(nullptr);
 }
 
-void TypeDescr::initInstance(uint8_t* mem) {
+void TypeDescr::initInstance(JSContext* cx, uint8_t* mem) {
   MemoryInitVisitor visitor;
 
   // Initialize the instance
   memset(mem, 0, size());
-  VisitReferences(*this, mem, visitor, 0);
+  VisitReferences(cx, *this, mem, visitor, 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1853,81 +656,54 @@
  public:
   explicit MemoryTracingVisitor(JSTracer* trace) : trace_(trace) {}
 
-  void visitReference(ReferenceTypeDescr& descr, uint8_t* base, size_t offset);
+  void visitReference(uint8_t* base, size_t offset);
 };
 
 }  // namespace
 
-void MemoryTracingVisitor::visitReference(ReferenceTypeDescr& descr,
-                                          uint8_t* base, size_t offset) {
-  switch (descr.type()) {
-    case ReferenceType::TYPE_WASM_ANYREF:
-      // TODO/AnyRef-boxing: With boxed immediates and strings the tracing code
-      // will be more complicated.  For now, tracing as an object is fine.
-    case ReferenceType::TYPE_OBJECT: {
-      GCPtrObject* objectPtr =
-          reinterpret_cast<js::GCPtrObject*>(base + offset);
-      TraceNullableEdge(trace_, objectPtr, "reference-obj");
-      return;
-    }
-  }
-
-  MOZ_CRASH("Invalid kind");
+void MemoryTracingVisitor::visitReference(uint8_t* base, size_t offset) {
+  GCPtrObject* objectPtr = reinterpret_cast<js::GCPtrObject*>(base + offset);
+  TraceNullableEdge(trace_, objectPtr, "reference-obj");
 }
 
 void TypeDescr::traceInstance(JSTracer* trace, uint8_t* mem) {
+  JSContext* cx = trace->runtime()->mainContextFromOwnThread();
   MemoryTracingVisitor visitor(trace);
 
-  VisitReferences(*this, mem, visitor, 0);
+  VisitReferences(cx, *this, mem, visitor, 0);
 }
 
 namespace {
 
 struct TraceListVisitor {
   using OffsetVector = Vector<uint32_t, 0, SystemAllocPolicy>;
-  OffsetVector stringOffsets;
+  // TODO/AnyRef-boxing: Once a WasmAnyRef is no longer just a JSObject*
+  // we must revisit this structure.
   OffsetVector objectOffsets;
-  OffsetVector valueOffsets;
 
-  void visitReference(ReferenceTypeDescr& descr, uint8_t* base, size_t offset);
+  void visitReference(uint8_t* base, size_t offset);
 
   bool fillList(Vector<uint32_t>& entries);
 };
 
 }  // namespace
 
-void TraceListVisitor::visitReference(ReferenceTypeDescr& descr, uint8_t* base,
-                                      size_t offset) {
+void TraceListVisitor::visitReference(uint8_t* base, size_t offset) {
   MOZ_ASSERT(!base);
 
-  OffsetVector* offsets;
-  // TODO/AnyRef-boxing: Once a WasmAnyRef is no longer just a JSObject*
-  // we must revisit this structure.
-  switch (descr.type()) {
-    case ReferenceType::TYPE_OBJECT:
-      offsets = &objectOffsets;
-      break;
-    case ReferenceType::TYPE_WASM_ANYREF:
-      offsets = &objectOffsets;
-      break;
-    default:
-      MOZ_CRASH("Invalid kind");
-  }
-
   AutoEnterOOMUnsafeRegion oomUnsafe;
 
   MOZ_ASSERT(offset <= UINT32_MAX);
-  if (!offsets->append(offset)) {
+  if (!objectOffsets.append(offset)) {
     oomUnsafe.crash("TraceListVisitor::visitReference");
   }
 }
 
 bool TraceListVisitor::fillList(Vector<uint32_t>& entries) {
-  return entries.append(stringOffsets.length()) &&
+  return entries.append(0) /* stringOffsets.length() */ &&
          entries.append(objectOffsets.length()) &&
-         entries.append(valueOffsets.length()) &&
-         entries.appendAll(stringOffsets) && entries.appendAll(objectOffsets) &&
-         entries.appendAll(valueOffsets);
+         entries.append(0) /* valueOffsets.length() */ &&
+         entries.appendAll(objectOffsets);
 }
 
 static bool CreateTraceList(JSContext* cx, HandleTypeDescr descr) {
@@ -1940,7 +716,7 @@
   }
 
   TraceListVisitor visitor;
-  VisitReferences(*descr, nullptr, visitor, 0);
+  VisitReferences(cx, *descr, nullptr, visitor, 0);
 
   Vector<uint32_t> entries(cx);
   if (!visitor.fillList(entries)) {
diff -Nru firefox-84.0.2+build1/js/src/wasm/TypedObject.h firefox-85.0+build1/js/src/wasm/TypedObject.h
--- firefox-84.0.2+build1/js/src/wasm/TypedObject.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/TypedObject.h	2021-01-18 19:58:16.000000000 +0000
@@ -10,93 +10,50 @@
 #include "mozilla/CheckedInt.h"
 
 #include "gc/Allocator.h"
-#include "gc/WeakMap.h"
-#include "js/Conversions.h"
-#include "js/experimental/JitInfo.h"  // JSJitInfo
-#include "js/ScalarType.h"            // js::Scalar::Type
 #include "vm/ArrayBufferObject.h"
 #include "vm/JSObject.h"
-#include "vm/Uint8Clamped.h"
+#include "wasm/WasmTypes.h"
 
 namespace js {
 
-class WasmNamespaceObject;
-
-extern bool InitTypedObjectSlots(JSContext* cx,
-                                 Handle<WasmNamespaceObject*> namespaceObject);
-
 /* The prototype for typed objects. */
 class TypedProto : public NativeObject {
  public:
   static const JSClass class_;
-
- protected:
-  friend class ArrayMetaTypeDescr;
-  friend class StructMetaTypeDescr;
-
   static TypedProto* create(JSContext* cx);
 };
 
-enum class TypeKind : int32_t { Scalar, Reference, Struct, Array };
-
 class TypeDescr : public NativeObject {
  public:
-  // Some slots apply to all type objects and some are specific to
-  // particular kinds of type objects. For simplicity we use the same
-  // number of slots no matter what kind of type descriptor we are
-  // working with, even though this is mildly wasteful.
-  enum Slot {
-    // Slots on all type objects
-    Kind = 0,        // Kind of the type descriptor
-    StringRepr = 1,  // Atomized string representation
-    Alignment = 2,   // Alignment in bytes
-    Size = 3,        // Size in bytes, else 0
-    Proto = 4,       // Prototype for instances, if any
-    TraceList = 5,   // List of references for use in tracing
-
-    // Slots on scalars, references
-    Type = 6,  // Type code
-
-    // Slots on array descriptors
-    ArrayElemType = 6,
-    ArrayLength = 7,
-
-    // Slots on struct type objects
-    StructFieldNames = 6,
-    StructFieldTypes = 7,
-    StructFieldOffsets = 8,
-    StructFieldMuts = 9,
+  static const JSClass class_;
 
-    // Maximum number of slots for any descriptor
-    SlotCount = 10,
+  enum Slot {
+    Handle = 0,     // Type handle index
+    Size = 1,       // Size of type in bytes
+    Proto = 2,      // Prototype for instances, if any
+    TraceList = 3,  // List of references for use in tracing
+    // Maximum number of slots
+    SlotCount = 4,
   };
 
+  static TypeDescr* createFromHandle(JSContext* cx, wasm::TypeHandle handle);
+
   TypedProto& typedProto() const {
     return getReservedSlot(Slot::Proto).toObject().as<TypedProto>();
   }
 
-  JSAtom& stringRepr() const {
-    return getReservedSlot(Slot::StringRepr).toString()->asAtom();
-  }
-
-  TypeKind kind() const {
-    return (TypeKind)getReservedSlot(Slot::Kind).toInt32();
-  }
+  size_t size() const { return getReservedSlot(Slot::Size).toInt32(); }
 
-  uint32_t alignment() const {
-    int32_t i = getReservedSlot(Slot::Alignment).toInt32();
-    MOZ_ASSERT(i >= 0);
-    return uint32_t(i);
-  }
+  const wasm::TypeDef& getType(JSContext* cx) const;
 
-  uint32_t size() const {
-    int32_t i = getReservedSlot(Slot::Size).toInt32();
-    MOZ_ASSERT(i >= 0);
-    return uint32_t(i);
+  MOZ_MUST_USE bool lookupProperty(JSContext* cx, jsid id, uint32_t* offset,
+                                   wasm::ValType* type);
+  MOZ_MUST_USE bool hasProperty(JSContext* cx, jsid id) {
+    uint32_t offset;
+    wasm::ValType type;
+    return lookupProperty(cx, id, &offset, &type);
   }
-
-  // Whether id is an 'own' property of objects with this descriptor.
-  MOZ_MUST_USE bool hasProperty(const JSAtomState& names, jsid id);
+  uint32_t propertyCount(JSContext* cx);
 
   // Type descriptors may contain a list of their references for use during
   // scanning. Typed object trace hooks can use this to call an optimized
@@ -120,7 +77,7 @@
         getFixedSlot(Slot::TraceList).toPrivate());
   }
 
-  void initInstance(uint8_t* mem);
+  void initInstance(JSContext* cx, uint8_t* mem);
   void traceInstance(JSTracer* trace, uint8_t* mem);
 
   static void finalize(JSFreeOp* fop, JSObject* obj);
@@ -128,221 +85,8 @@
 
 using HandleTypeDescr = Handle<TypeDescr*>;
 
-class SimpleTypeDescr : public TypeDescr {};
-// Type descriptors whose instances are objects and hence which have
-// an associated `prototype` property.
-class ComplexTypeDescr : public TypeDescr {};
-
-// Type for scalar type constructors like `uint8`. All such type
-// constructors share a common JSClass and JSFunctionSpec. Scalar
-// types are non-opaque (their storage is visible unless combined with
-// an opaque reference type.)
-class ScalarTypeDescr : public SimpleTypeDescr {
- public:
-  using Type = Scalar::Type;
-
-  static const TypeKind Kind = TypeKind::Scalar;
-  static uint32_t size(Type t);
-  static uint32_t alignment(Type t);
-  static const char* typeName(Type type);
-
-  static const JSClass class_;
-
-  Type type() const { return Type(getReservedSlot(Slot::Type).toInt32()); }
-
-  static MOZ_MUST_USE bool call(JSContext* cx, unsigned argc, Value* vp);
-};
-
-// Enumerates the cases of ScalarTypeDescr::Type which have unique C
-// representation and which are representable as JS Number values.
-#define JS_FOR_EACH_SCALAR_NUMBER_TYPE_REPR(MACRO_)                         \
-  MACRO_(Scalar::Int32, int32_t, int32, WasmNamespaceObject::Int32Desc)     \
-  MACRO_(Scalar::Float32, float, float32, WasmNamespaceObject::Float32Desc) \
-  MACRO_(Scalar::Float64, double, float64, WasmNamespaceObject::Float64Desc)
-
-#define JS_FOR_EACH_SCALAR_BIGINT_TYPE_REPR(MACRO_) \
-  MACRO_(Scalar::BigInt64, int64_t, bigint64, WasmNamespaceObject::Int64Desc)
-
-// Must be in same order as the enum ScalarTypeDescr::Type:
-#define JS_FOR_EACH_SCALAR_TYPE_REPR(MACRO_)  \
-  JS_FOR_EACH_SCALAR_NUMBER_TYPE_REPR(MACRO_) \
-  JS_FOR_EACH_SCALAR_BIGINT_TYPE_REPR(MACRO_)
-
-enum class ReferenceType {
-  TYPE_OBJECT,
-  TYPE_WASM_ANYREF,
-};
-
-// Type for reference type constructors like `Any`, `String`, and
-// `Object`. All such type constructors share a common JSClass and
-// JSFunctionSpec. All these types are opaque.
-class ReferenceTypeDescr : public SimpleTypeDescr {
- public:
-  // Must match order of JS_FOR_EACH_REFERENCE_TYPE_REPR below
-  using Type = ReferenceType;
-  static const char* typeName(Type type);
-
-  static const int32_t TYPE_MAX = int32_t(ReferenceType::TYPE_WASM_ANYREF) + 1;
-  static const TypeKind Kind = TypeKind::Reference;
-  static const JSClass class_;
-  static uint32_t size(Type t);
-  static uint32_t alignment(Type t);
-
-  ReferenceType type() const {
-    return (ReferenceType)getReservedSlot(Slot::Type).toInt32();
-  }
-
-  const char* typeName() const { return typeName(type()); }
-
-  static MOZ_MUST_USE bool call(JSContext* cx, unsigned argc, Value* vp);
-};
-
-// TODO/AnyRef-boxing: With boxed immediates and strings, GCPtrObject may not be
-// appropriate.
-#define JS_FOR_EACH_REFERENCE_TYPE_REPR(MACRO_)                    \
-  MACRO_(ReferenceType::TYPE_OBJECT, GCPtrObject, Object,          \
-         WasmNamespaceObject::ObjectDesc)                          \
-  MACRO_(ReferenceType::TYPE_WASM_ANYREF, GCPtrObject, WasmAnyRef, \
-         WasmNamespaceObject::WasmAnyRefDesc)
-
-class ArrayTypeDescr;
-
-/*
- * Properties and methods of the `ArrayType` meta type object. There
- * is no `class_` field because `ArrayType` is just a native
- * constructor function.
- */
-class ArrayMetaTypeDescr : public NativeObject {
- private:
-  // Helper for creating a new ArrayType object.
-  //
-  // - `arrayTypePrototype` - prototype for the new object to be created
-  // - `elementType` - type object for the elements in the array
-  // - `stringRepr` - canonical string representation for the array
-  // - `size` - length of the array
-  static ArrayTypeDescr* create(JSContext* cx, HandleObject arrayTypePrototype,
-                                HandleTypeDescr elementType,
-                                HandleAtom stringRepr, int32_t size,
-                                int32_t length);
-
- public:
-  // This is the function that gets called when the user
-  // does `new ArrayType(elem)`. It is currently disallowed.
-  static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);
-};
-
-/*
- * Type descriptor created by `new ArrayType(type, n)`
- */
-class ArrayTypeDescr : public ComplexTypeDescr {
- public:
-  static const JSClass class_;
-  static const TypeKind Kind = TypeKind::Array;
-
-  TypeDescr& elementType() const {
-    return getReservedSlot(Slot::ArrayElemType).toObject().as<TypeDescr>();
-  }
-
-  uint32_t length() const {
-    int32_t i = getReservedSlot(Slot::ArrayLength).toInt32();
-    MOZ_ASSERT(i >= 0);
-    return uint32_t(i);
-  }
-
-  static int32_t offsetOfLength() {
-    return getFixedSlotOffset(Slot::ArrayLength);
-  }
-};
-
-struct StructFieldProps {
-  StructFieldProps() : isMutable(0), alignAsInt64(0), alignAsV128(0) {}
-  uint32_t isMutable : 1;
-  uint32_t alignAsInt64 : 1;
-  uint32_t alignAsV128 : 1;
-};
-
-class StructTypeDescr;
-
-/*
- * Properties and methods of the `StructType` meta type object. There
- * is no `class_` field because `StructType` is just a native
- * constructor function.
- */
-class StructMetaTypeDescr : public NativeObject {
- public:
-  // The prototype cannot be null.
-  // The names in `ids` must all be non-numeric.
-  // The type objects in `fieldTypeObjs` must all be TypeDescr objects.
-  static StructTypeDescr* createFromArrays(
-      JSContext* cx, HandleObject structTypePrototype, HandleIdVector ids,
-      HandleValueVector fieldTypeObjs, Vector<StructFieldProps>& fieldProps);
-
-  // This is the function that gets called when the user
-  // does `new StructType(...)`. It is currently disallowed.
-  static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);
-
-  class Layout {
-    // Can call addField() directly.
-    friend class StructMetaTypeDescr;
-
-    mozilla::CheckedInt32 sizeSoFar = 0;
-    int32_t structAlignment = 1;
-
-    mozilla::CheckedInt32 addField(int32_t fieldAlignment, int32_t fieldSize);
-
-   public:
-    // The field adders return the offset of the the field.
-    mozilla::CheckedInt32 addScalar(Scalar::Type type);
-    mozilla::CheckedInt32 addReference(ReferenceType type);
-
-    // The close method rounds up the structure size to the appropriate
-    // alignment and returns that size.  If `alignment` is not NULL then
-    // return the structure alignment through that pointer.
-    mozilla::CheckedInt32 close(int32_t* alignment = nullptr);
-  };
-};
-
-class StructTypeDescr : public ComplexTypeDescr {
- public:
-  static const JSClass class_;
-
-  // Returns the number of fields defined in this struct.
-  size_t fieldCount() const;
-
-  // Set `*out` to the index of the field named `id` and returns true,
-  // or return false if no such field exists.
-  MOZ_MUST_USE bool fieldIndex(jsid id, size_t* out) const;
-
-  // Return the name of the field at index `index`.
-  JSAtom& fieldName(size_t index) const;
-
-  // Return the type descr of the field at index `index`.
-  TypeDescr& fieldDescr(size_t index) const;
-
-  // Return the offset of the field at index `index`.
-  size_t fieldOffset(size_t index) const;
-
-  // Return the mutability of the field at index `index`.
-  bool fieldIsMutable(size_t index) const;
-
-  static bool call(JSContext* cx, unsigned argc, Value* vp);
-
- private:
-  ArrayObject& fieldInfoObject(size_t slot) const {
-    return getReservedSlot(slot).toObject().as<ArrayObject>();
-  }
-};
-
-using HandleStructTypeDescr = Handle<StructTypeDescr*>;
-
 /* Base type for typed objects. */
 class TypedObject : public JSObject {
-  static MOZ_MUST_USE bool obj_getArrayElement(JSContext* cx,
-                                               Handle<TypedObject*> typedObj,
-                                               Handle<TypeDescr*> typeDescr,
-                                               uint32_t index,
-                                               MutableHandleValue vp);
-
  protected:
   static const ObjectOps objectOps_;
 
@@ -362,10 +106,6 @@
                                            HandleValue receiver, HandleId id,
                                            MutableHandleValue vp);
 
-  static MOZ_MUST_USE bool obj_getElement(JSContext* cx, HandleObject obj,
-                                          HandleValue receiver, uint32_t index,
-                                          MutableHandleValue vp);
-
   static MOZ_MUST_USE bool obj_setProperty(JSContext* cx, HandleObject obj,
                                            HandleId id, HandleValue v,
                                            HandleValue receiver,
@@ -379,7 +119,7 @@
                                               HandleId id,
                                               ObjectOpResult& result);
 
-  bool loadValue(JSContext* cx, size_t offset, HandleTypeDescr type,
+  bool loadValue(JSContext* cx, size_t offset, wasm::ValType type,
                  MutableHandleValue vp);
 
   uint8_t* typedMem() const;
@@ -394,7 +134,6 @@
     // Typed objects' prototypes can't be modified.
     return staticPrototype()->as<TypedProto>();
   }
-
   TypeDescr& typeDescr() const { return group()->typeDescr(); }
 
   static JS::Result<TypedObject*, JS::OOM> create(JSContext* cx,
@@ -404,11 +143,8 @@
                                                   js::HandleObjectGroup group);
 
   uint32_t offset() const;
-  uint32_t length() const;
-  uint8_t* typedMem(const JS::AutoRequireNoGC&) const { return typedMem(); }
-
   uint32_t size() const { return typeDescr().size(); }
-
+  uint8_t* typedMem(const JS::AutoRequireNoGC&) const { return typedMem(); }
   uint8_t* typedMem(size_t offset, const JS::AutoRequireNoGC& nogc) const {
     // It seems a bit surprising that one might request an offset
     // == size(), but it can happen when taking the "address of" a
@@ -425,10 +161,6 @@
   static TypedObject* createZeroed(JSContext* cx, HandleTypeDescr typeObj,
                                    gc::InitialHeap heap = gc::DefaultHeap);
 
-  // User-accessible constructor (`new TypeDescriptor(...)`). Note that the
-  // callee here is the type descriptor.
-  static MOZ_MUST_USE bool construct(JSContext* cx, unsigned argc, Value* vp);
-
   Shape** addressOfShapeFromGC() { return shape_.unbarrieredAddress(); }
 };
 
@@ -538,37 +270,9 @@
   return class_ == &InlineTypedObject::class_;
 }
 
-inline bool IsSimpleTypeDescrClass(const JSClass* clasp) {
-  return clasp == &ScalarTypeDescr::class_ ||
-         clasp == &ReferenceTypeDescr::class_;
-}
-
-inline bool IsComplexTypeDescrClass(const JSClass* clasp) {
-  return clasp == &StructTypeDescr::class_ || clasp == &ArrayTypeDescr::class_;
-}
-
-inline bool IsTypeDescrClass(const JSClass* clasp) {
-  return IsSimpleTypeDescrClass(clasp) || IsComplexTypeDescrClass(clasp);
-}
-
 }  // namespace js
 
 template <>
-inline bool JSObject::is<js::SimpleTypeDescr>() const {
-  return js::IsSimpleTypeDescrClass(getClass());
-}
-
-template <>
-inline bool JSObject::is<js::ComplexTypeDescr>() const {
-  return js::IsComplexTypeDescrClass(getClass());
-}
-
-template <>
-inline bool JSObject::is<js::TypeDescr>() const {
-  return js::IsTypeDescrClass(getClass());
-}
-
-template <>
 inline bool JSObject::is<js::TypedObject>() const {
   return js::IsTypedObjectClass(getClass());
 }
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmBaselineCompile.cpp firefox-85.0+build1/js/src/wasm/WasmBaselineCompile.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmBaselineCompile.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmBaselineCompile.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1853,8 +1853,9 @@
   using LocalVector = Vector<Local, 16, SystemAllocPolicy>;
 
   // Initialize `localInfo` based on the types of `locals` and `args`.
-  bool setupLocals(const ValTypeVector& locals, const ArgTypeVector& args,
-                   bool debugEnabled, LocalVector* localInfo) {
+  MOZ_MUST_USE bool setupLocals(const ValTypeVector& locals,
+                                const ArgTypeVector& args, bool debugEnabled,
+                                LocalVector* localInfo) {
     if (!localInfo->reserve(locals.length())) {
       return false;
     }
@@ -3228,7 +3229,7 @@
   BaseOpIter iter_;
   const FuncCompileInput& func_;
   size_t lastReadCallSite_;
-  TempAllocator& alloc_;
+  TempAllocator::Fallible alloc_;
   const ValTypeVector& locals_;  // Types of parameters and locals
   bool deadCode_;  // Flag indicating we should decode & discard the opcode
   BCESet
@@ -3278,8 +3279,12 @@
   MOZ_MUST_USE bool emitFunction();
   void emitInitStackLocals();
 
-  const FuncTypeWithId& funcType() const {
-    return *moduleEnv_.funcTypes[func_.index];
+  const FuncType& funcType() const {
+    return *moduleEnv_.funcs[func_.index].type;
+  }
+
+  const TypeIdDesc& funcTypeId() const {
+    return *moduleEnv_.funcs[func_.index].typeId;
   }
 
   // Used by some of the ScratchRegister implementations.
@@ -3704,6 +3709,8 @@
   // count.
   StkVector stk_;
 
+  static constexpr size_t MaxPushesPerOpcode = 10;
+
   // BaselineCompileFunctions() "lends" us the StkVector to use in this
   // BaseCompiler object, and that is installed in |stk_| in our constructor.
   // This is so as to avoid having to malloc/free the vector's contents at
@@ -4912,9 +4919,15 @@
     return Stk::StackResult(result.type(), offs);
   }
 
-  void pushResults(ResultType type, StackHeight resultsBase) {
+  MOZ_MUST_USE bool pushResults(ResultType type, StackHeight resultsBase) {
     if (type.empty()) {
-      return;
+      return true;
+    }
+
+    if (type.length() > 1) {
+      if (!stk_.reserve(stk_.length() + type.length() + MaxPushesPerOpcode)) {
+        return false;
+      }
     }
 
     // We need to push the results in reverse order, so first iterate through
@@ -4964,24 +4977,26 @@
           break;
       }
     }
+
+    return true;
   }
 
-  void pushBlockResults(ResultType type) {
-    pushResults(type, controlItem().stackHeight);
+  MOZ_MUST_USE bool pushBlockResults(ResultType type) {
+    return pushResults(type, controlItem().stackHeight);
   }
 
   // A combination of popBlockResults + pushBlockResults, used when entering a
   // block with a control-flow join (loops) or split (if) to shuffle the
   // fallthrough block parameters into the locations expected by the
   // continuation.
-  void topBlockParams(ResultType type) {
+  MOZ_MUST_USE bool topBlockParams(ResultType type) {
     // This function should only be called when entering a block with a
     // control-flow join at the entry, where there are no live temporaries in
     // the current block.
     StackHeight base = controlItem().stackHeight;
     MOZ_ASSERT(fr.stackResultsBase(stackConsumed(type.length())) == base);
     popBlockResults(type, base, ContinuationKind::Fallthrough);
-    pushBlockResults(type);
+    return pushBlockResults(type);
   }
 
   // A combination of popBlockResults + pushBlockResults, used before branches
@@ -4989,9 +5004,10 @@
   // is taken, the stack results will be shuffled down into place.  For br_if
   // that has fallthrough, the parameters for the untaken branch flow through to
   // the continuation.
-  StackHeight topBranchParams(ResultType type) {
+  MOZ_MUST_USE bool topBranchParams(ResultType type, StackHeight* height) {
     if (type.empty()) {
-      return fr.stackHeight();
+      *height = fr.stackHeight();
+      return true;
     }
     // There may be temporary values that need spilling; delay computation of
     // the stack results base until after the popRegisterResults(), which spills
@@ -5002,8 +5018,11 @@
     if (!iter.done()) {
       popStackResults(iter, base);
     }
-    pushResults(type, base);
-    return base;
+    if (!pushResults(type, base)) {
+      return false;
+    }
+    *height = base;
+    return true;
   }
 
   // Conditional branches with fallthrough are preceded by a topBranchParams, so
@@ -5280,7 +5299,7 @@
       }
     }
 
-    GenerateFunctionPrologue(masm, moduleEnv_.funcTypes[func_.index]->id,
+    GenerateFunctionPrologue(masm, *moduleEnv_.funcs[func_.index].typeId,
                              compilerEnv_.mode() == CompileMode::Tier1
                                  ? Some(func_.index)
                                  : Nothing(),
@@ -5899,15 +5918,15 @@
 
   CodeOffset callIndirect(uint32_t funcTypeIndex, uint32_t tableIndex,
                           const Stk& indexVal, const FunctionCall& call) {
-    const FuncTypeWithId& funcType = moduleEnv_.types[funcTypeIndex].funcType();
-    MOZ_ASSERT(funcType.id.kind() != FuncTypeIdDescKind::None);
+    const TypeIdDesc& funcTypeId = moduleEnv_.typeIds[funcTypeIndex];
+    MOZ_ASSERT(funcTypeId.kind() != TypeIdDescKind::None);
 
     const TableDesc& table = moduleEnv_.tables[tableIndex];
 
     loadI32(indexVal, RegI32(WasmTableCallIndexReg));
 
     CallSiteDesc desc(call.lineOrBytecode, CallSiteDesc::Dynamic);
-    CalleeDesc callee = CalleeDesc::wasmTable(table, funcType.id);
+    CalleeDesc callee = CalleeDesc::wasmTable(table, funcTypeId);
     return masm.wasmCallIndirect(desc, callee, NeedsBoundsCheck(true));
   }
 
@@ -5934,8 +5953,8 @@
         desc, instanceArg, builtin.identity, builtin.failureMode);
   }
 
-  void pushCallResults(const FunctionCall& call, ResultType type,
-                       const StackResultsLoc& loc) {
+  MOZ_MUST_USE bool pushCallResults(const FunctionCall& call, ResultType type,
+                                    const StackResultsLoc& loc) {
 #if defined(JS_CODEGEN_ARM)
     // pushResults currently bypasses special case code in captureReturnedFxx()
     // that converts GPR results to FPR results for systemABI+softFP.  If we
@@ -5944,7 +5963,7 @@
     // registers - but that's OK.
     MOZ_ASSERT(!call.usesSystemAbi || call.hardFP);
 #endif
-    pushResults(type, fr.stackResultsBase(loc.bytes()));
+    return pushResults(type, fr.stackResultsBase(loc.bytes()));
   }
 
   //////////////////////////////////////////////////////////////////////
@@ -6529,7 +6548,7 @@
     }
 
     uint32_t offsetGuardLimit =
-        GetOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
+        GetMaxOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
 
     if ((bceSafe_ & (BCESet(1) << local)) &&
         access->offset() < offsetGuardLimit) {
@@ -6551,7 +6570,7 @@
   void prepareMemoryAccess(MemoryAccessDesc* access, AccessCheck* check,
                            RegI32 tls, RegI32 ptr) {
     uint32_t offsetGuardLimit =
-        GetOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
+        GetMaxOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
 
     // Fold offset if necessary for further computations.
     if (access->offset() >= offsetGuardLimit ||
@@ -6720,9 +6739,9 @@
     }
 #elif defined(JS_CODEGEN_ARM64)
     if (dest.tag == AnyReg::I64) {
-      masm.wasmLoadI64(*access, HeapReg, ptr, ptr, dest.i64());
+      masm.wasmLoadI64(*access, HeapReg, ptr, dest.i64());
     } else {
-      masm.wasmLoad(*access, HeapReg, ptr, ptr, dest.any());
+      masm.wasmLoad(*access, HeapReg, ptr, dest.any());
     }
 #else
     MOZ_CRASH("BaseCompiler platform hook: load");
@@ -6843,9 +6862,9 @@
 #elif defined(JS_CODEGEN_ARM64)
     MOZ_ASSERT(temp.isInvalid());
     if (access->type() == Scalar::Int64) {
-      masm.wasmStoreI64(*access, src.i64(), HeapReg, ptr, ptr);
+      masm.wasmStoreI64(*access, src.i64(), HeapReg, ptr);
     } else {
-      masm.wasmStore(*access, src.any(), HeapReg, ptr, ptr);
+      masm.wasmStore(*access, src.any(), HeapReg, ptr);
     }
 #else
     MOZ_CRASH("BaseCompiler platform hook: store");
@@ -7069,9 +7088,41 @@
 #endif
   }
 
-  void pop2xI32ForShiftOrRotate(RegI32* r0, RegI32* r1) {
+  void pop2xI32ForShift(RegI32* r0, RegI32* r1) {
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+    // r1 must be ecx for a variable shift, unless BMI2 is available.
+    if (!Assembler::HasBMI2()) {
+      *r1 = popI32(specific_.ecx);
+      *r0 = popI32();
+      return;
+    }
+#endif
+    pop2xI32(r0, r1);
+  }
+
+  void pop2xI64ForShift(RegI64* r0, RegI64* r1) {
+#if defined(JS_CODEGEN_X86)
     // r1 must be ecx for a variable shift.
+    needI32(specific_.ecx);
+    *r1 = popI64ToSpecific(widenI32(specific_.ecx));
+    *r0 = popI64();
+#else
+#  if defined(JS_CODEGEN_X64)
+    // r1 must be rcx for a variable shift, unless BMI2 is available.
+    if (!Assembler::HasBMI2()) {
+      needI64(specific_.rcx);
+      *r1 = popI64ToSpecific(specific_.rcx);
+      *r0 = popI64();
+      return;
+    }
+#  endif
+    pop2xI64(r0, r1);
+#endif
+  }
+
+  void pop2xI32ForRotate(RegI32* r0, RegI32* r1) {
+#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+    // r1 must be ecx for a variable rotate.
     *r1 = popI32(specific_.ecx);
     *r0 = popI32();
 #else
@@ -7079,9 +7130,9 @@
 #endif
   }
 
-  void pop2xI64ForShiftOrRotate(RegI64* r0, RegI64* r1) {
+  void pop2xI64ForRotate(RegI64* r0, RegI64* r1) {
 #if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
-    // r1 must be ecx for a variable shift.
+    // r1 must be ecx for a variable rotate.
     needI32(specific_.ecx);
     *r1 = popI64ToSpecific(widenI32(specific_.ecx));
     *r0 = popI64();
@@ -7958,9 +8009,13 @@
   // Lhs "when applicable".
 
   template <typename Cond, typename Lhs, typename Rhs>
-  void jumpConditionalWithResults(BranchState* b, Cond cond, Lhs lhs, Rhs rhs) {
+  MOZ_MUST_USE bool jumpConditionalWithResults(BranchState* b, Cond cond,
+                                               Lhs lhs, Rhs rhs) {
     if (b->hasBlockResults()) {
-      StackHeight resultsBase = topBranchParams(b->resultType);
+      StackHeight resultsBase(0);
+      if (!topBranchParams(b->resultType, &resultsBase)) {
+        return false;
+      }
       if (b->stackHeight != resultsBase) {
         Label notTaken;
         branchTo(b->invertBranch ? cond : Assembler::InvertCondition(cond), lhs,
@@ -7971,12 +8026,13 @@
                                         b->resultType);
         masm.jump(b->label);
         masm.bind(&notTaken);
-        return;
+        return true;
       }
     }
 
     branchTo(b->invertBranch ? Assembler::InvertCondition(cond) : cond, lhs,
              rhs, b->label);
+    return true;
   }
 
   // sniffConditionalControl{Cmp,Eqz} may modify the latentWhatever_ state in
@@ -7986,10 +8042,11 @@
   // then the compiler MUST instead call resetLatentOp() to reset the state.
 
   template <typename Cond>
-  bool sniffConditionalControlCmp(Cond compareOp, ValType operandType);
-  bool sniffConditionalControlEqz(ValType operandType);
+  MOZ_MUST_USE bool sniffConditionalControlCmp(Cond compareOp,
+                                               ValType operandType);
+  MOZ_MUST_USE bool sniffConditionalControlEqz(ValType operandType);
   void emitBranchSetup(BranchState* b);
-  void emitBranchPerform(BranchState* b);
+  MOZ_MUST_USE bool emitBranchPerform(BranchState* b);
 
   //////////////////////////////////////////////////////////////////////
 
@@ -7998,6 +8055,11 @@
   MOZ_MUST_USE bool emitLoop();
   MOZ_MUST_USE bool emitIf();
   MOZ_MUST_USE bool emitElse();
+#ifdef ENABLE_WASM_EXCEPTIONS
+  MOZ_MUST_USE bool emitTry();
+  MOZ_MUST_USE bool emitCatch();
+  MOZ_MUST_USE bool emitThrow();
+#endif
   MOZ_MUST_USE bool emitEnd();
   MOZ_MUST_USE bool emitBr();
   MOZ_MUST_USE bool emitBrIf();
@@ -8044,15 +8106,15 @@
   template <bool isSetLocal>
   MOZ_MUST_USE bool emitSetOrTeeLocal(uint32_t slot);
 
-  void endBlock(ResultType type);
-  void endIfThen(ResultType type);
-  void endIfThenElse(ResultType type);
+  MOZ_MUST_USE bool endBlock(ResultType type);
+  MOZ_MUST_USE bool endIfThen(ResultType type);
+  MOZ_MUST_USE bool endIfThenElse(ResultType type);
 
   void doReturn(ContinuationKind kind);
   void pushReturnValueOfCall(const FunctionCall& call, MIRType type);
 
-  bool pushStackResultsForCall(const ResultType& type, RegPtr temp,
-                               StackResultsLoc* loc);
+  MOZ_MUST_USE bool pushStackResultsForCall(const ResultType& type, RegPtr temp,
+                                            StackResultsLoc* loc);
   void popStackResultsAfterCall(const StackResultsLoc& results,
                                 uint32_t stackArgBytes);
 
@@ -8911,7 +8973,7 @@
     pushI32(r);
   } else {
     RegI32 r, rs;
-    pop2xI32ForShiftOrRotate(&r, &rs);
+    pop2xI32ForShift(&r, &rs);
     maskShiftCount32(rs);
     masm.lshift32(rs, r);
     freeI32(rs);
@@ -8927,7 +8989,7 @@
     pushI64(r);
   } else {
     RegI64 r, rs;
-    pop2xI64ForShiftOrRotate(&r, &rs);
+    pop2xI64ForShift(&r, &rs);
     masm.lshift64(lowPart(rs), r);
     freeI64(rs);
     pushI64(r);
@@ -8942,7 +9004,7 @@
     pushI32(r);
   } else {
     RegI32 r, rs;
-    pop2xI32ForShiftOrRotate(&r, &rs);
+    pop2xI32ForShift(&r, &rs);
     maskShiftCount32(rs);
     masm.rshift32Arithmetic(rs, r);
     freeI32(rs);
@@ -8958,7 +9020,7 @@
     pushI64(r);
   } else {
     RegI64 r, rs;
-    pop2xI64ForShiftOrRotate(&r, &rs);
+    pop2xI64ForShift(&r, &rs);
     masm.rshift64Arithmetic(lowPart(rs), r);
     freeI64(rs);
     pushI64(r);
@@ -8973,7 +9035,7 @@
     pushI32(r);
   } else {
     RegI32 r, rs;
-    pop2xI32ForShiftOrRotate(&r, &rs);
+    pop2xI32ForShift(&r, &rs);
     maskShiftCount32(rs);
     masm.rshift32(rs, r);
     freeI32(rs);
@@ -8989,7 +9051,7 @@
     pushI64(r);
   } else {
     RegI64 r, rs;
-    pop2xI64ForShiftOrRotate(&r, &rs);
+    pop2xI64ForShift(&r, &rs);
     masm.rshift64(lowPart(rs), r);
     freeI64(rs);
     pushI64(r);
@@ -9004,7 +9066,7 @@
     pushI32(r);
   } else {
     RegI32 r, rs;
-    pop2xI32ForShiftOrRotate(&r, &rs);
+    pop2xI32ForRotate(&r, &rs);
     masm.rotateRight(rs, r, r);
     freeI32(rs);
     pushI32(r);
@@ -9021,7 +9083,7 @@
     pushI64(r);
   } else {
     RegI64 r, rs;
-    pop2xI64ForShiftOrRotate(&r, &rs);
+    pop2xI64ForRotate(&r, &rs);
     masm.rotateRight64(lowPart(rs), r, r, maybeHighPart(rs));
     freeI64(rs);
     pushI64(r);
@@ -9036,7 +9098,7 @@
     pushI32(r);
   } else {
     RegI32 r, rs;
-    pop2xI32ForShiftOrRotate(&r, &rs);
+    pop2xI32ForRotate(&r, &rs);
     masm.rotateLeft(rs, r, r);
     freeI32(rs);
     pushI32(r);
@@ -9053,7 +9115,7 @@
     pushI64(r);
   } else {
     RegI64 r, rs;
-    pop2xI64ForShiftOrRotate(&r, &rs);
+    pop2xI64ForRotate(&r, &rs);
     masm.rotateLeft64(lowPart(rs), r, r, maybeHighPart(rs));
     freeI64(rs);
     pushI64(r);
@@ -9526,14 +9588,19 @@
   }
 }
 
-void BaseCompiler::emitBranchPerform(BranchState* b) {
+bool BaseCompiler::emitBranchPerform(BranchState* b) {
   switch (latentType_.kind()) {
     case ValType::I32: {
       if (b->i32.rhsImm) {
-        jumpConditionalWithResults(b, latentIntCmp_, b->i32.lhs,
-                                   Imm32(b->i32.imm));
+        if (!jumpConditionalWithResults(b, latentIntCmp_, b->i32.lhs,
+                                        Imm32(b->i32.imm))) {
+          return false;
+        }
       } else {
-        jumpConditionalWithResults(b, latentIntCmp_, b->i32.lhs, b->i32.rhs);
+        if (!jumpConditionalWithResults(b, latentIntCmp_, b->i32.lhs,
+                                        b->i32.rhs)) {
+          return false;
+        }
         freeI32(b->i32.rhs);
       }
       freeI32(b->i32.lhs);
@@ -9541,23 +9608,34 @@
     }
     case ValType::I64: {
       if (b->i64.rhsImm) {
-        jumpConditionalWithResults(b, latentIntCmp_, b->i64.lhs,
-                                   Imm64(b->i64.imm));
+        if (!jumpConditionalWithResults(b, latentIntCmp_, b->i64.lhs,
+                                        Imm64(b->i64.imm))) {
+          return false;
+        }
       } else {
-        jumpConditionalWithResults(b, latentIntCmp_, b->i64.lhs, b->i64.rhs);
+        if (!jumpConditionalWithResults(b, latentIntCmp_, b->i64.lhs,
+                                        b->i64.rhs)) {
+          return false;
+        }
         freeI64(b->i64.rhs);
       }
       freeI64(b->i64.lhs);
       break;
     }
     case ValType::F32: {
-      jumpConditionalWithResults(b, latentDoubleCmp_, b->f32.lhs, b->f32.rhs);
+      if (!jumpConditionalWithResults(b, latentDoubleCmp_, b->f32.lhs,
+                                      b->f32.rhs)) {
+        return false;
+      }
       freeF32(b->f32.lhs);
       freeF32(b->f32.rhs);
       break;
     }
     case ValType::F64: {
-      jumpConditionalWithResults(b, latentDoubleCmp_, b->f64.lhs, b->f64.rhs);
+      if (!jumpConditionalWithResults(b, latentDoubleCmp_, b->f64.lhs,
+                                      b->f64.rhs)) {
+        return false;
+      }
       freeF64(b->f64.lhs);
       freeF64(b->f64.rhs);
       break;
@@ -9567,6 +9645,7 @@
     }
   }
   resetLatentOp();
+  return true;
 }
 
 // For blocks and loops and ifs:
@@ -9597,7 +9676,7 @@
   return true;
 }
 
-void BaseCompiler::endBlock(ResultType type) {
+bool BaseCompiler::endBlock(ResultType type) {
   Control& block = controlItem();
 
   if (deadCode_) {
@@ -9622,10 +9701,14 @@
       captureResultRegisters(type);
       deadCode_ = false;
     }
-    pushBlockResults(type);
+    if (!pushBlockResults(type)) {
+      return false;
+    }
   }
 
   bceSafe_ = block.bceSafeOnExit;
+
+  return true;
 }
 
 bool BaseCompiler::emitLoop() {
@@ -9644,7 +9727,9 @@
   if (!deadCode_) {
     // Loop entry is a control join, so shuffle the entry parameters into the
     // well-known locations.
-    topBlockParams(params);
+    if (!topBlockParams(params)) {
+      return false;
+    }
     masm.nopAlign(CodeAlignment);
     masm.bind(&controlItem(0).label);
     // The interrupt check barfs if there are live registers.
@@ -9694,14 +9779,18 @@
     // Because params can flow immediately to results in the case of an empty
     // "then" or "else" block, and the result of an if/then is a join in
     // general, we shuffle params eagerly to the result allocations.
-    topBlockParams(params);
-    emitBranchPerform(&b);
+    if (!topBlockParams(params)) {
+      return false;
+    }
+    if (!emitBranchPerform(&b)) {
+      return false;
+    }
   }
 
   return true;
 }
 
-void BaseCompiler::endIfThen(ResultType type) {
+bool BaseCompiler::endIfThen(ResultType type) {
   Control& ifThen = controlItem();
 
   // The parameters to the "if" logically flow to both the "then" and "else"
@@ -9738,10 +9827,14 @@
 
   deadCode_ = ifThen.deadOnArrival;
   if (!deadCode_) {
-    pushBlockResults(type);
+    if (!pushBlockResults(type)) {
+      return false;
+    }
   }
 
   bceSafe_ = ifThen.bceSafeOnExit & ifThen.bceSafeOnEntry;
+
+  return true;
 }
 
 bool BaseCompiler::emitElse() {
@@ -9791,13 +9884,15 @@
 
   if (!deadCode_) {
     captureResultRegisters(params);
-    pushBlockResults(params);
+    if (!pushBlockResults(params)) {
+      return false;
+    }
   }
 
   return true;
 }
 
-void BaseCompiler::endIfThenElse(ResultType type) {
+bool BaseCompiler::endIfThenElse(ResultType type) {
   Control& ifThenElse = controlItem();
 
   // The expression type is not a reliable guide to what we'll find
@@ -9840,8 +9935,12 @@
   bceSafe_ = ifThenElse.bceSafeOnExit;
 
   if (!deadCode_) {
-    pushBlockResults(type);
+    if (!pushBlockResults(type)) {
+      return false;
+    }
   }
+
+  return true;
 }
 
 bool BaseCompiler::emitEnd() {
@@ -9854,24 +9953,40 @@
 
   switch (kind) {
     case LabelKind::Body:
-      endBlock(type);
+      if (!endBlock(type)) {
+        return false;
+      }
       doReturn(ContinuationKind::Fallthrough);
       iter_.popEnd();
       MOZ_ASSERT(iter_.controlStackEmpty());
       return iter_.readFunctionEnd(iter_.end());
     case LabelKind::Block:
-      endBlock(type);
+      if (!endBlock(type)) {
+        return false;
+      }
       break;
     case LabelKind::Loop:
       // The end of a loop isn't a branch target, so we can just leave its
       // results on the expression stack to be consumed by the outer block.
       break;
     case LabelKind::Then:
-      endIfThen(type);
+      if (!endIfThen(type)) {
+        return false;
+      }
       break;
     case LabelKind::Else:
-      endIfThenElse(type);
+      if (!endIfThenElse(type)) {
+        return false;
+      }
+      break;
+#ifdef ENABLE_WASM_EXCEPTIONS
+    case LabelKind::Try:
+      MOZ_CRASH("NYI");
+      break;
+    case LabelKind::Catch:
+      MOZ_CRASH("NYI");
       break;
+#endif
   }
 
   iter_.popEnd();
@@ -9930,9 +10045,7 @@
 
   BranchState b(&target.label, target.stackHeight, InvertBranch(false), type);
   emitBranchSetup(&b);
-  emitBranchPerform(&b);
-
-  return true;
+  return emitBranchPerform(&b);
 }
 
 #ifdef ENABLE_WASM_FUNCTION_REFERENCES
@@ -9963,7 +10076,10 @@
   if (b.hasBlockResults()) {
     freeResultRegisters(b.resultType);
   }
-  jumpConditionalWithResults(&b, Assembler::Equal, rp, ImmWord(NULLREF_VALUE));
+  if (!jumpConditionalWithResults(&b, Assembler::Equal, rp,
+                                  ImmWord(NULLREF_VALUE))) {
+    return false;
+  }
   pushRef(rp);
 
   return true;
@@ -9999,7 +10115,10 @@
 
   freeIntegerResultRegisters(branchParams);
 
-  StackHeight resultsBase = topBranchParams(branchParams);
+  StackHeight resultsBase(0);
+  if (!topBranchParams(branchParams, &resultsBase)) {
+    return false;
+  }
 
   Label dispatchCode;
   masm.branch32(Assembler::Below, rc, Imm32(depths.length()), &dispatchCode);
@@ -10052,6 +10171,54 @@
   return true;
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+bool BaseCompiler::emitTry() {
+  ResultType params;
+  if (!iter_.readTry(&params)) {
+    return false;
+  }
+
+  if (deadCode_) {
+    return true;
+  }
+
+  MOZ_CRASH("NYI");
+}
+
+bool BaseCompiler::emitCatch() {
+  LabelKind kind;
+  uint32_t eventIndex;
+  ResultType paramType, resultType;
+  NothingVector unused_tryValues;
+
+  if (!iter_.readCatch(&kind, &eventIndex, &paramType, &resultType,
+                       &unused_tryValues)) {
+    return false;
+  }
+
+  if (deadCode_) {
+    return true;
+  }
+
+  MOZ_CRASH("NYI");
+}
+
+bool BaseCompiler::emitThrow() {
+  uint32_t exnIndex;
+  NothingVector unused_argValues;
+
+  if (!iter_.readThrow(&exnIndex, &unused_argValues)) {
+    return false;
+  }
+
+  if (deadCode_) {
+    return true;
+  }
+
+  MOZ_CRASH("NYI");
+}
+#endif
+
 bool BaseCompiler::emitDrop() {
   if (!iter_.readDrop()) {
     return false;
@@ -10268,7 +10435,7 @@
 
   sync();
 
-  const FuncType& funcType = *moduleEnv_.funcTypes[funcIndex];
+  const FuncType& funcType = *moduleEnv_.funcs[funcIndex].type;
   bool import = moduleEnv_.funcIsImport(funcIndex);
 
   uint32_t numArgs = funcType.args().length();
@@ -10308,9 +10475,7 @@
   popValueStackBy(numArgs);
 
   captureCallResultRegisters(resultType);
-  pushCallResults(baselineCall, resultType, results);
-
-  return true;
+  return pushCallResults(baselineCall, resultType, results);
 }
 
 bool BaseCompiler::emitCallIndirect() {
@@ -10330,7 +10495,7 @@
 
   sync();
 
-  const FuncTypeWithId& funcType = moduleEnv_.types[funcTypeIndex].funcType();
+  const FuncType& funcType = moduleEnv_.types[funcTypeIndex].funcType();
 
   // Stack: ... arg1 .. argn callee
 
@@ -10365,9 +10530,7 @@
   popValueStackBy(numArgs);
 
   captureCallResultRegisters(resultType);
-  pushCallResults(baselineCall, resultType, results);
-
-  return true;
+  return pushCallResults(baselineCall, resultType, results);
 }
 
 void BaseCompiler::emitRound(RoundingMode roundingMode, ValType operandType) {
@@ -10969,7 +11132,7 @@
     uint32_t addr = addrTemp;
 
     uint32_t offsetGuardLimit =
-        GetOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
+        GetMaxOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
 
     uint64_t ea = uint64_t(addr) + uint64_t(access->offset());
     uint64_t limit = moduleEnv_.minMemoryLength + offsetGuardLimit;
@@ -11255,7 +11418,9 @@
     case ValType::I32: {
       RegI32 r, rs;
       pop2xI32(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveI32(rs, r);
       masm.bind(&done);
       freeI32(rs);
@@ -11275,7 +11440,9 @@
       // use a double branch and a temporary boolean value for now.
       RegI32 temp = needI32();
       moveImm32(0, temp);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveImm32(1, temp);
       masm.bind(&done);
 
@@ -11291,7 +11458,9 @@
 #else
       RegI64 r, rs;
       pop2xI64(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveI64(rs, r);
       masm.bind(&done);
       freeI64(rs);
@@ -11302,7 +11471,9 @@
     case ValType::F32: {
       RegF32 r, rs;
       pop2xF32(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveF32(rs, r);
       masm.bind(&done);
       freeF32(rs);
@@ -11312,7 +11483,9 @@
     case ValType::F64: {
       RegF64 r, rs;
       pop2xF64(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveF64(rs, r);
       masm.bind(&done);
       freeF64(rs);
@@ -11323,7 +11496,9 @@
     case ValType::V128: {
       RegV128 r, rs;
       pop2xV128(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveV128(rs, r);
       masm.bind(&done);
       freeV128(rs);
@@ -11334,7 +11509,9 @@
     case ValType::Ref: {
       RegPtr r, rs;
       pop2xRef(&r, &rs);
-      emitBranchPerform(&b);
+      if (!emitBranchPerform(&b)) {
+        return false;
+      }
       moveRef(rs, r);
       masm.bind(&done);
       freeRef(rs);
@@ -12495,8 +12672,12 @@
   // Returns null on OOM.
 
   const StructType& structType = moduleEnv_.types[typeIndex].structType();
+  const TypeIdDesc& structTypeId = moduleEnv_.typeIds[typeIndex];
+  RegPtr rst = needRef();
+  fr.loadTlsPtr(WasmTlsReg);
+  masm.loadWasmGlobalPtr(structTypeId.globalDataOffset(), rst);
+  pushRef(rst);
 
-  pushI32(structType.moduleIndex_);
   if (!emitInstanceCall(lineOrBytecode, SASigStructNew)) {
     return false;
   }
@@ -12521,7 +12702,7 @@
 
   uint32_t fieldNo = structType.fields_.length();
   while (fieldNo-- > 0) {
-    uint32_t offs = structType.fields_[fieldNo].offset;
+    uint32_t offs = structType.objectBaseFieldOffset(fieldNo);
     switch (structType.fields_[fieldNo].type.kind()) {
       case ValType::I32: {
         RegI32 r = popI32();
@@ -12635,7 +12816,7 @@
     masm.loadPtr(Address(rp, OutlineTypedObject::offsetOfData()), rp);
   }
 
-  uint32_t offs = structType.fields_[fieldIndex].offset;
+  uint32_t offs = structType.objectBaseFieldOffset(fieldIndex);
   switch (structType.fields_[fieldIndex].type.kind()) {
     case ValType::I32: {
       RegI32 r = needI32();
@@ -12736,7 +12917,7 @@
     masm.loadPtr(Address(rp, OutlineTypedObject::offsetOfData()), rp);
   }
 
-  uint32_t offs = structType.fields_[fieldIndex].offset;
+  uint32_t offs = structType.objectBaseFieldOffset(fieldIndex);
   switch (structType.fields_[fieldIndex].type.kind()) {
     case ValType::I32: {
       masm.store32(ri, Address(rp, offs));
@@ -12799,8 +12980,10 @@
 
   // struct.narrow validation ensures that these hold.
 
-  MOZ_ASSERT(inputType.isEqRef() || moduleEnv_.isStructType(inputType));
-  MOZ_ASSERT(outputType.isEqRef() || moduleEnv_.isStructType(outputType));
+  MOZ_ASSERT(inputType.isEqRef() ||
+             moduleEnv_.types.isStructType(inputType.refType()));
+  MOZ_ASSERT(outputType.isEqRef() ||
+             moduleEnv_.types.isStructType(outputType.refType()));
   MOZ_ASSERT_IF(outputType.isEqRef(), inputType.isEqRef());
 
   // EqRef -> EqRef is a no-op, just leave the value on the stack.
@@ -12812,10 +12995,13 @@
   RegPtr rp = popRef();
 
   // Dynamic downcast eqref|(optref T) -> (optref U), leaves rp or null
-  const StructType& outputStruct =
-      moduleEnv_.types[outputType.refType().typeIndex()].structType();
+  const TypeIdDesc& outputStructTypeId =
+      moduleEnv_.typeIds[outputType.refType().typeIndex()];
+  RegPtr rst = needRef();
+  fr.loadTlsPtr(WasmTlsReg);
+  masm.loadWasmGlobalPtr(outputStructTypeId.globalDataOffset(), rst);
+  pushRef(rst);
 
-  pushI32(outputStruct.moduleIndex_);
   pushRef(rp);
   return emitInstanceCall(lineOrBytecode, SASigStructNarrow);
 }
@@ -13856,9 +14042,17 @@
   }
 #  endif
 
-#  if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
+#  if defined(JS_CODEGEN_X86)
   needI32(specific_.ecx);
   RegI32 count = popI32ToSpecific(specific_.ecx);
+#  elif defined(JS_CODEGEN_X64)
+  RegI32 count;
+  if (Assembler::HasBMI2()) {
+    count = popI32();
+  } else {
+    needI32(specific_.ecx);
+    count = popI32ToSpecific(specific_.ecx);
+  }
 #  elif defined(JS_CODEGEN_ARM64)
   RegI32 count = popI32();
 #  endif
@@ -13934,8 +14128,6 @@
 
   initControl(controlItem(), ResultType::Empty());
 
-  uint32_t overhead = 0;
-
   for (;;) {
     Nothing unused_a, unused_b;
 
@@ -14036,25 +14228,7 @@
     continue;             \
   }
 
-    // TODO / EVALUATE (bug 1316845): Not obvious that this attempt at
-    // reducing overhead is really paying off relative to making the check
-    // every iteration.
-
-    if (overhead == 0) {
-      // Check every 50 expressions -- a happy medium between
-      // memory usage and checking overhead.
-      overhead = 50;
-
-      // Checking every 50 expressions should be safe, as the
-      // baseline JIT does very little allocation per expression.
-      CHECK(alloc_.ensureBallast());
-
-      // The pushiest opcode is LOOP, which pushes two values
-      // per instance.
-      CHECK(stk_.reserve(stk_.length() + overhead * 2));
-    }
-
-    overhead--;
+    CHECK(stk_.reserve(stk_.length() + MaxPushesPerOpcode));
 
     OpBytes op;
     CHECK(iter_.readOp(&op));
@@ -14106,6 +14280,23 @@
         CHECK_NEXT(emitIf());
       case uint16_t(Op::Else):
         CHECK_NEXT(emitElse());
+#ifdef ENABLE_WASM_EXCEPTIONS
+      case uint16_t(Op::Try):
+        if (!moduleEnv_.exceptionsEnabled()) {
+          return iter_.unrecognizedOpcode(&op);
+        }
+        CHECK_NEXT(emitTry());
+      case uint16_t(Op::Catch):
+        if (!moduleEnv_.exceptionsEnabled()) {
+          return iter_.unrecognizedOpcode(&op);
+        }
+        CHECK_NEXT(emitCatch());
+      case uint16_t(Op::Throw):
+        if (!moduleEnv_.exceptionsEnabled()) {
+          return iter_.unrecognizedOpcode(&op);
+        }
+        CHECK_NEXT(emitThrow());
+#endif
       case uint16_t(Op::Br):
         CHECK_NEXT(emitBr());
       case uint16_t(Op::BrIf):
@@ -15478,7 +15669,7 @@
       iter_(moduleEnv, decoder),
       func_(func),
       lastReadCallSite_(0),
-      alloc_(*alloc),
+      alloc_(alloc->fallible()),
       locals_(locals),
       deadCode_(false),
       bceSafe_(0),
@@ -15581,7 +15772,7 @@
   TempAllocator alloc(&lifo);
   JitContext jitContext(&alloc);
   MOZ_ASSERT(IsCompilingWasm());
-  WasmMacroAssembler masm(alloc);
+  WasmMacroAssembler masm(alloc, moduleEnv);
 
   // Swap in already-allocated empty vectors to avoid malloc/free.
   MOZ_ASSERT(code->empty());
@@ -15608,7 +15799,7 @@
     // Build the local types vector.
 
     ValTypeVector locals;
-    if (!locals.appendAll(moduleEnv.funcTypes[func.index]->args())) {
+    if (!locals.appendAll(moduleEnv.funcs[func.index].type->args())) {
       return false;
     }
     if (!DecodeLocalEntries(d, moduleEnv.types, moduleEnv.features, &locals)) {
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmBuiltins.cpp firefox-85.0+build1/js/src/wasm/WasmBuiltins.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmBuiltins.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmBuiltins.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -213,13 +213,13 @@
     2,
     {_PTR, _PTR, _END}};
 const SymbolicAddressSignature SASigStructNew = {
-    SymbolicAddress::StructNew, _RoN, _FailOnNullPtr, 2, {_PTR, _I32, _END}};
+    SymbolicAddress::StructNew, _RoN, _FailOnNullPtr, 2, {_PTR, _RoN, _END}};
 const SymbolicAddressSignature SASigStructNarrow = {
     SymbolicAddress::StructNarrow,
     _RoN,
     _Infallible,
     3,
-    {_PTR, _I32, _RoN, _END}};
+    {_PTR, _RoN, _RoN, _END}};
 
 }  // namespace wasm
 }  // namespace js
@@ -1056,12 +1056,12 @@
       return FuncCast(Instance::postBarrierFiltering, *abiType);
     case SymbolicAddress::StructNew:
       *abiType = MakeABIFunctionType(ArgType_General,
-                                     {ArgType_General, ArgType_Int32});
+                                     {ArgType_General, ArgType_General});
       MOZ_ASSERT(*abiType == ToABIType(SASigStructNew));
       return FuncCast(Instance::structNew, *abiType);
     case SymbolicAddress::StructNarrow:
       *abiType = MakeABIFunctionType(
-          ArgType_General, {ArgType_General, ArgType_Int32, ArgType_General});
+          ArgType_General, {ArgType_General, ArgType_General, ArgType_General});
       MOZ_ASSERT(*abiType == ToABIType(SASigStructNarrow));
       return FuncCast(Instance::structNarrow, *abiType);
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmCode.cpp firefox-85.0+build1/js/src/wasm/WasmCode.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmCode.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmCode.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -619,11 +619,9 @@
     codeRanges_.back().offsetBy(offsetInSegment);
     i++;
 
-#ifdef ENABLE_WASM_SIMD
-    if (funcExports[funcExportIndex].funcType().hasV128ArgOrRet()) {
+    if (funcExports[funcExportIndex].funcType().hasUnexposableArgOrRet()) {
       continue;
     }
-#endif
     if (funcExports[funcExportIndex]
             .funcType()
             .temporarilyUnsupportedReftypeForEntry()) {
@@ -686,9 +684,7 @@
     const FuncExport& fe = funcExports[funcExportIndex];
     // Entries with unsupported types get only the interp exit
     bool unsupportedType =
-#ifdef ENABLE_WASM_SIMD
-        fe.funcType().hasV128ArgOrRet() ||
-#endif
+        fe.funcType().hasUnexposableArgOrRet() ||
         fe.funcType().temporarilyUnsupportedReftypeForEntry();
     numExpectedRanges += (unsupportedType ? 1 : 2);
     void* calleePtr =
@@ -781,9 +777,7 @@
     // Functions with unsupported types in their sig have only one entry
     // (interp).  All other functions get an extra jit entry.
     bool unsupportedType =
-#ifdef ENABLE_WASM_SIMD
-        fe.funcType().hasV128ArgOrRet() ||
-#endif
+        fe.funcType().hasUnexposableArgOrRet() ||
         fe.funcType().temporarilyUnsupportedReftypeForEntry();
     interpRangeIndex += (unsupportedType ? 1 : 2);
   }
@@ -816,14 +810,11 @@
   if (codeTier.metadata()
           .funcExports[funcExportIndex]
           .funcType()
-          .temporarilyUnsupportedReftypeForEntry()
-#ifdef ENABLE_WASM_SIMD
-      || codeTier.metadata()
-             .funcExports[funcExportIndex]
-             .funcType()
-             .hasV128ArgOrRet()
-#endif
-  ) {
+          .temporarilyUnsupportedReftypeForEntry() ||
+      codeTier.metadata()
+          .funcExports[funcExportIndex]
+          .funcType()
+          .hasUnexposableArgOrRet()) {
     MOZ_ASSERT(codeRanges.length() >= 1);
     MOZ_ASSERT(codeRanges.back().isInterpEntry());
     return true;
@@ -938,8 +929,11 @@
 }
 
 size_t Metadata::serializedSize() const {
-  return sizeof(pod()) + SerializedVectorSize(funcTypeIds) +
+  return sizeof(pod()) + SerializedVectorSize(types) +
          SerializedPodVectorSize(globals) + SerializedPodVectorSize(tables) +
+#ifdef ENABLE_WASM_EXCEPTIONS
+         SerializedPodVectorSize(events) +
+#endif
          sizeof(moduleName) + SerializedPodVectorSize(funcNames) +
          filename.serializedSize() + sourceMapURL.serializedSize();
 }
@@ -948,9 +942,12 @@
   MOZ_ASSERT(!debugEnabled && debugFuncArgTypes.empty() &&
              debugFuncReturnTypes.empty());
   cursor = WriteBytes(cursor, &pod(), sizeof(pod()));
-  cursor = SerializeVector(cursor, funcTypeIds);
+  cursor = SerializeVector(cursor, types);
   cursor = SerializePodVector(cursor, globals);
   cursor = SerializePodVector(cursor, tables);
+#ifdef ENABLE_WASM_EXCEPTIONS
+  cursor = SerializePodVector(cursor, events);
+#endif
   cursor = WriteBytes(cursor, &moduleName, sizeof(moduleName));
   cursor = SerializePodVector(cursor, funcNames);
   cursor = filename.serialize(cursor);
@@ -960,9 +957,12 @@
 
 /* static */ const uint8_t* Metadata::deserialize(const uint8_t* cursor) {
   (cursor = ReadBytes(cursor, &pod(), sizeof(pod()))) &&
-      (cursor = DeserializeVector(cursor, &funcTypeIds)) &&
+      (cursor = DeserializeVector(cursor, &types)) &&
       (cursor = DeserializePodVector(cursor, &globals)) &&
       (cursor = DeserializePodVector(cursor, &tables)) &&
+#ifdef ENABLE_WASM_EXCEPTIONS
+      (cursor = DeserializePodVector(cursor, &events)) &&
+#endif
       (cursor = ReadBytes(cursor, &moduleName, sizeof(moduleName))) &&
       (cursor = DeserializePodVector(cursor, &funcNames)) &&
       (cursor = filename.deserialize(cursor)) &&
@@ -974,9 +974,12 @@
 }
 
 size_t Metadata::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const {
-  return SizeOfVectorExcludingThis(funcTypeIds, mallocSizeOf) +
+  return SizeOfVectorExcludingThis(types, mallocSizeOf) +
          globals.sizeOfExcludingThis(mallocSizeOf) +
          tables.sizeOfExcludingThis(mallocSizeOf) +
+#ifdef ENABLE_WASM_EXCEPTIONS
+         events.sizeOfExcludingThis(mallocSizeOf) +
+#endif
          funcNames.sizeOfExcludingThis(mallocSizeOf) +
          filename.sizeOfExcludingThis(mallocSizeOf) +
          sourceMapURL.sizeOfExcludingThis(mallocSizeOf);
@@ -1162,13 +1165,12 @@
 }
 
 Code::Code(UniqueCodeTier tier1, const Metadata& metadata,
-           JumpTables&& maybeJumpTables, StructTypeVector&& structTypes)
+           JumpTables&& maybeJumpTables)
     : tier1_(std::move(tier1)),
       metadata_(&metadata),
       profilingLabels_(mutexid::WasmCodeProfilingLabels,
                        CacheableCharsVector()),
-      jumpTables_(std::move(maybeJumpTables)),
-      structTypes_(std::move(structTypes)) {}
+      jumpTables_(std::move(maybeJumpTables)) {}
 
 bool Code::initialize(const LinkData& linkData) {
   MOZ_ASSERT(!initialized());
@@ -1436,13 +1438,11 @@
   for (auto t : tiers()) {
     codeTier(t).addSizeOfMisc(mallocSizeOf, code, data);
   }
-  *data += SizeOfVectorExcludingThis(structTypes_, mallocSizeOf);
 }
 
 size_t Code::serializedSize() const {
   return metadata().serializedSize() +
-         codeTier(Tier::Serialized).serializedSize() +
-         SerializedVectorSize(structTypes_);
+         codeTier(Tier::Serialized).serializedSize();
 }
 
 uint8_t* Code::serialize(uint8_t* cursor, const LinkData& linkData) const {
@@ -1450,7 +1450,6 @@
 
   cursor = metadata().serialize(cursor);
   cursor = codeTier(Tier::Serialized).serialize(cursor, linkData);
-  cursor = SerializeVector(cursor, structTypes_);
   return cursor;
 }
 
@@ -1475,15 +1474,8 @@
     return nullptr;
   }
 
-  StructTypeVector structTypes;
-  cursor = DeserializeVector(cursor, &structTypes);
-  if (!cursor) {
-    return nullptr;
-  }
-
   MutableCode code =
-      js_new<Code>(std::move(codeTier), metadata, std::move(jumpTables),
-                   std::move(structTypes));
+      js_new<Code>(std::move(codeTier), metadata, std::move(jumpTables));
   if (!code || !code->initialize(linkData)) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmCode.h firefox-85.0+build1/js/src/wasm/WasmCode.h
--- firefox-84.0.2+build1/js/src/wasm/WasmCode.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmCode.h	2021-01-18 19:58:16.000000000 +0000
@@ -20,6 +20,7 @@
 #define wasm_code_h
 
 #include "gc/Memory.h"
+#include "jit/JitOptions.h"
 #include "jit/shared/Assembler-shared.h"
 #include "js/HashTable.h"
 #include "threading/ExclusiveData.h"
@@ -242,13 +243,10 @@
   }
 
   bool canHaveJitEntry() const {
-    return
-#ifdef ENABLE_WASM_SIMD
-        !funcType_.hasV128ArgOrRet() &&
-#endif
-        !funcType_.temporarilyUnsupportedReftypeForEntry() &&
-        !funcType_.temporarilyUnsupportedResultCountForJitEntry() &&
-        JitOptions.enableWasmJitEntry;
+    return !funcType_.hasUnexposableArgOrRet() &&
+           !funcType_.temporarilyUnsupportedReftypeForEntry() &&
+           !funcType_.temporarilyUnsupportedResultCountForJitEntry() &&
+           JitOptions.enableWasmJitEntry;
   }
 
   bool clone(const FuncExport& src) {
@@ -348,9 +346,12 @@
 typedef Vector<ValTypeVector, 0, SystemAllocPolicy> FuncReturnTypesVector;
 
 struct Metadata : public ShareableBase<Metadata>, public MetadataCacheablePod {
-  FuncTypeWithIdVector funcTypeIds;
+  TypeDefWithIdVector types;
   GlobalDescVector globals;
   TableDescVector tables;
+#ifdef ENABLE_WASM_EXCEPTIONS
+  EventDescVector events;
+#endif
   CacheableChars filename;
   CacheableChars sourceMapURL;
 
@@ -679,11 +680,10 @@
   SharedMetadata metadata_;
   ExclusiveData<CacheableCharsVector> profilingLabels_;
   JumpTables jumpTables_;
-  StructTypeVector structTypes_;
 
  public:
   Code(UniqueCodeTier tier1, const Metadata& metadata,
-       JumpTables&& maybeJumpTables, StructTypeVector&& structTypes);
+       JumpTables&& maybeJumpTables);
   bool initialized() const { return tier1_->initialized(); }
 
   bool initialize(const LinkData& linkData);
@@ -717,7 +717,6 @@
 
   const CodeTier& codeTier(Tier tier) const;
   const Metadata& metadata() const { return *metadata_; }
-  const StructTypeVector& structTypes() const { return structTypes_; }
 
   const ModuleSegment& segment(Tier iter) const {
     return codeTier(iter).segment();
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmCompile.cpp firefox-85.0+build1/js/src/wasm/WasmCompile.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmCompile.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmCompile.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -88,6 +88,7 @@
   features.multiValue = wasm::MultiValuesAvailable(cx);
   features.v128 = wasm::SimdAvailable(cx);
   features.hugeMemory = wasm::IsHugeMemoryEnabled();
+  features.exceptions = wasm::ExceptionsAvailable(cx);
   return features;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmCompile.h firefox-85.0+build1/js/src/wasm/WasmCompile.h
--- firefox-84.0.2+build1/js/src/wasm/WasmCompile.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmCompile.h	2021-01-18 19:58:16.000000000 +0000
@@ -41,35 +41,6 @@
   ScriptedCaller() : filenameIsURL(false), line(0) {}
 };
 
-// Describes the features that control wasm compilation.
-
-struct FeatureArgs {
-  FeatureArgs()
-      : sharedMemory(Shareable::False),
-        refTypes(false),
-        functionReferences(false),
-        gcTypes(false),
-        multiValue(false),
-        v128(false),
-        hugeMemory(false) {}
-
-  static FeatureArgs build(JSContext* cx);
-
-  FeatureArgs withRefTypes(bool refTypes) const {
-    FeatureArgs features = *this;
-    features.refTypes = refTypes;
-    return features;
-  }
-
-  Shareable sharedMemory;
-  bool refTypes;
-  bool functionReferences;
-  bool gcTypes;
-  bool multiValue;
-  bool v128;
-  bool hugeMemory;
-};
-
 // Describes all the parameters that control wasm compilation.
 
 struct CompileArgs;
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmConstants.h firefox-85.0+build1/js/src/wasm/WasmConstants.h
--- firefox-84.0.2+build1/js/src/wasm/WasmConstants.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmConstants.h	2021-01-18 19:58:16.000000000 +0000
@@ -39,6 +39,9 @@
   Code = 10,
   Data = 11,
   DataCount = 12,
+#ifdef ENABLE_WASM_EXCEPTIONS
+  Event = 13,
+#endif
   GcFeatureOptIn = 42  // Arbitrary, but fits in 7 bits
 };
 
@@ -102,7 +105,7 @@
 
 static constexpr TypeCode AbstractReferenceTypeIndexCode = TypeCode::Ref;
 
-enum class FuncTypeIdDescKind { None, Immediate, Global };
+enum class TypeIdDescKind { None, Immediate, Global };
 
 // A wasm::Trap represents a wasm-defined trap that can occur during execution
 // which triggers a WebAssembly.RuntimeError. Generated code may jump to a Trap
@@ -153,7 +156,10 @@
   Function = 0x00,
   Table = 0x01,
   Memory = 0x02,
-  Global = 0x03
+  Global = 0x03,
+#ifdef ENABLE_WASM_EXCEPTIONS
+  Event = 0x04,
+#endif
 };
 
 enum class GlobalTypeImmediate { IsMutable = 0x1, AllowedMask = 0x1 };
@@ -184,6 +190,12 @@
   ElemExpression = 0x4,
 };
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+enum class EventKind {
+  Exception = 0x0,
+};
+#endif
+
 enum class Op {
   // Control flow operators
   Unreachable = 0x00,
@@ -192,6 +204,11 @@
   Loop = 0x03,
   If = 0x04,
   Else = 0x05,
+#ifdef ENABLE_WASM_EXCEPTIONS
+  Try = 0x06,
+  Catch = 0x07,
+  Throw = 0x08,
+#endif
   End = 0x0b,
   Br = 0x0c,
   BrIf = 0x0d,
@@ -879,6 +896,10 @@
 static const unsigned MaxImports = 100000;
 static const unsigned MaxExports = 100000;
 static const unsigned MaxGlobals = 1000000;
+#ifdef ENABLE_WASM_EXCEPTIONS
+static const unsigned MaxEvents =
+    1000000;  // TODO: get this into the shared limits spec
+#endif
 static const unsigned MaxDataSegments = 100000;
 static const unsigned MaxDataSegmentLengthPages = 16384;
 static const unsigned MaxElemSegments = 10000000;
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmContext.cpp firefox-85.0+build1/js/src/wasm/WasmContext.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmContext.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmContext.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ *
+ * Copyright 2020 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "wasm/WasmContext.h"
+
+#include "wasm/WasmTypes.h"
+
+using namespace js;
+using namespace wasm;
+
+bool wasm::Context::ensureTypeContext(JSContext* cx) {
+  if (typeContext) {
+    return true;
+  }
+  typeContext =
+      js::MakeUnique<TypeContext>(FeatureArgs::build(cx), TypeDefVector());
+  return !!typeContext;
+}
+
+size_t wasm::Context::sizeOfExcludingThis(
+    mozilla::MallocSizeOf mallocSizeOf) const {
+  return typeContext ? typeContext->sizeOfExcludingThis(mallocSizeOf) : 0;
+}
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmContext.h firefox-85.0+build1/js/src/wasm/WasmContext.h
--- firefox-84.0.2+build1/js/src/wasm/WasmContext.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmContext.h	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ *
+ * Copyright 2020 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef wasm_context_h
+#define wasm_context_h
+
+#include "mozilla/Attributes.h"
+#include "mozilla/MemoryReporting.h"
+#include "jstypes.h"
+#include "js/UniquePtr.h"
+
+struct JS_PUBLIC_API JSContext;
+
+namespace js {
+namespace wasm {
+
+class TypeContext;
+
+// wasm::Context lives in JSContext and contains the wasm-related per-context
+// state.
+
+class Context {
+ public:
+  Context()
+      : triedToInstallSignalHandlers(false),
+        haveSignalHandlers(false),
+        typeContext(nullptr) {}
+
+  // Used by wasm::EnsureThreadSignalHandlers(cx) to install thread signal
+  // handlers once per JSContext/thread.
+  bool triedToInstallSignalHandlers;
+  bool haveSignalHandlers;
+
+  MOZ_MUST_USE bool ensureTypeContext(JSContext* cx);
+
+  // The global type context.
+  UniquePtr<TypeContext> typeContext;
+
+  // about:memory reporting
+
+  size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
+};
+
+}  // namespace wasm
+}  // namespace js
+
+#endif  // wasm_context_h
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmCraneliftCompile.cpp firefox-85.0+build1/js/src/wasm/WasmCraneliftCompile.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmCraneliftCompile.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmCraneliftCompile.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -110,15 +110,11 @@
   MOZ_CRASH("unknown baldrdash symbolic address");
 }
 
-static bool GenerateCraneliftCode(WasmMacroAssembler& masm,
-                                  const CraneliftCompiledFunc& func,
-                                  const FuncTypeWithId& funcType,
-                                  uint32_t lineOrBytecode,
-                                  uint32_t funcBytecodeSize,
-                                  StackMaps* stackMaps, size_t stackMapsOffset,
-                                  size_t stackMapsCount, FuncOffsets* offsets) {
-  const FuncTypeIdDesc& funcTypeId = funcType.id;
-
+static bool GenerateCraneliftCode(
+    WasmMacroAssembler& masm, const CraneliftCompiledFunc& func,
+    const FuncType& funcType, const TypeIdDesc& funcTypeId,
+    uint32_t lineOrBytecode, uint32_t funcBytecodeSize, StackMaps* stackMaps,
+    size_t stackMapsOffset, size_t stackMapsCount, FuncOffsets* offsets) {
   wasm::GenerateFunctionPrologue(masm, funcTypeId, mozilla::Nothing(), offsets);
 
   // Omit the check when framePushed is small and we know there's no
@@ -297,6 +293,7 @@
       : moduleEnv_(moduleEnv), compiler_(nullptr) {
     staticEnv_.ref_types_enabled = moduleEnv.refTypesEnabled();
     staticEnv_.threads_enabled = true;
+    staticEnv_.v128_enabled = moduleEnv.v128Enabled();
 #ifdef WASM_SUPPORTS_HUGE_MEMORY
     if (moduleEnv.hugeMemoryEnabled()) {
       // In the huge memory configuration, we always reserve the full 4 GB
@@ -361,6 +358,8 @@
       platform_is_windows(false),
 #endif
       ref_types_enabled(false),
+      threads_enabled(false),
+      v128_enabled(false),
       static_memory_bound(0),
       memory_guard_size(0),
       memory_base_tls_offset(offsetof(TlsData, memoryBase)),
@@ -421,21 +420,25 @@
 size_t env_num_types(const CraneliftModuleEnvironment* env) {
   return env->env->types.length();
 }
-const FuncTypeWithId* env_type(const CraneliftModuleEnvironment* env,
-                               size_t typeIndex) {
+const FuncType* env_type(const CraneliftModuleEnvironment* env,
+                         size_t typeIndex) {
   return &env->env->types[typeIndex].funcType();
 }
 
 size_t env_num_funcs(const CraneliftModuleEnvironment* env) {
-  return env->env->funcTypes.length();
+  return env->env->funcs.length();
+}
+const FuncType* env_func_sig(const CraneliftModuleEnvironment* env,
+                             size_t funcIndex) {
+  return env->env->funcs[funcIndex].type;
 }
-const FuncTypeWithId* env_func_sig(const CraneliftModuleEnvironment* env,
-                                   size_t funcIndex) {
-  return env->env->funcTypes[funcIndex];
+const TypeIdDesc* env_func_sig_id(const CraneliftModuleEnvironment* env,
+                                  size_t funcIndex) {
+  return env->env->funcs[funcIndex].typeId;
 }
 size_t env_func_sig_index(const CraneliftModuleEnvironment* env,
                           size_t funcIndex) {
-  return env->env->funcTypeIndices[funcIndex];
+  return env->env->funcs[funcIndex].typeIndex;
 }
 bool env_is_func_valid_for_ref(const CraneliftModuleEnvironment* env,
                                uint32_t index) {
@@ -452,11 +455,16 @@
   return env->env->funcIsImport(funcIndex);
 }
 
-const FuncTypeWithId* env_signature(const CraneliftModuleEnvironment* env,
-                                    size_t funcTypeIndex) {
+const FuncType* env_signature(const CraneliftModuleEnvironment* env,
+                              size_t funcTypeIndex) {
   return &env->env->types[funcTypeIndex].funcType();
 }
 
+const TypeIdDesc* env_signature_id(const CraneliftModuleEnvironment* env,
+                                   size_t funcTypeIndex) {
+  return &env->env->typeIds[funcTypeIndex];
+}
+
 size_t env_num_tables(const CraneliftModuleEnvironment* env) {
   return env->env->tables.length();
 }
@@ -487,7 +495,7 @@
 
   TempAllocator alloc(&lifo);
   JitContext jitContext(&alloc);
-  WasmMacroAssembler masm(alloc);
+  WasmMacroAssembler masm(alloc, moduleEnv);
   MOZ_ASSERT(IsCompilingWasm());
 
   // Swap in already-allocated empty vectors to avoid malloc/free.
@@ -542,12 +550,13 @@
     }
 
     uint32_t lineOrBytecode = func.lineOrBytecode;
-    const FuncTypeWithId& funcType = *moduleEnv.funcTypes[clifInput.index];
+    const FuncType& funcType = *moduleEnv.funcs[clifInput.index].type;
+    const TypeIdDesc& funcTypeId = *moduleEnv.funcs[clifInput.index].typeId;
 
     FuncOffsets offsets;
     if (!GenerateCraneliftCode(
-            masm, clifFunc, funcType, lineOrBytecode, funcBytecodeSize,
-            &code->stackMaps, previousStackmapCount,
+            masm, clifFunc, funcType, funcTypeId, lineOrBytecode,
+            funcBytecodeSize, &code->stackMaps, previousStackmapCount,
             code->stackMaps.length() - previousStackmapCount, &offsets)) {
       return false;
     }
@@ -651,6 +660,9 @@
     case TypeCode::F64:
       v.u.f64 = value.f64();
       break;
+    case TypeCode::V128:
+      memcpy(&v.u.v128, &value.v128(), sizeof(v.u.v128));
+      break;
     case AbstractReferenceTypeCode:
       v.u.r = value.ref().forCompiledCode();
       break;
@@ -686,34 +698,34 @@
 
 // Sig
 
-size_t funcType_numArgs(const FuncTypeWithId* funcType) {
+size_t funcType_numArgs(const FuncType* funcType) {
   return funcType->args().length();
 }
 
-const BD_ValType* funcType_args(const FuncTypeWithId* funcType) {
+const BD_ValType* funcType_args(const FuncType* funcType) {
   static_assert(sizeof(BD_ValType) == sizeof(ValType), "update BD_ValType");
   return (const BD_ValType*)funcType->args().begin();
 }
 
-size_t funcType_numResults(const FuncTypeWithId* funcType) {
+size_t funcType_numResults(const FuncType* funcType) {
   return funcType->results().length();
 }
 
-const BD_ValType* funcType_results(const FuncTypeWithId* funcType) {
+const BD_ValType* funcType_results(const FuncType* funcType) {
   static_assert(sizeof(BD_ValType) == sizeof(ValType), "update BD_ValType");
   return (const BD_ValType*)funcType->results().begin();
 }
 
-FuncTypeIdDescKind funcType_idKind(const FuncTypeWithId* funcType) {
-  return funcType->id.kind();
+TypeIdDescKind funcType_idKind(const TypeIdDesc* funcTypeId) {
+  return funcTypeId->kind();
 }
 
-size_t funcType_idImmediate(const FuncTypeWithId* funcType) {
-  return funcType->id.immediate();
+size_t funcType_idImmediate(const TypeIdDesc* funcTypeId) {
+  return funcTypeId->immediate();
 }
 
-size_t funcType_idTlsOffset(const FuncTypeWithId* funcType) {
-  return globalToTlsOffset(funcType->id.globalDataOffset());
+size_t funcType_idTlsOffset(const TypeIdDesc* funcTypeId) {
+  return globalToTlsOffset(funcTypeId->globalDataOffset());
 }
 
 void stackmaps_add(BD_Stackmaps* sink, const uint32_t* bitMap,
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmFrameIter.cpp firefox-85.0+build1/js/src/wasm/WasmFrameIter.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmFrameIter.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmFrameIter.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -546,7 +546,7 @@
 }
 
 void wasm::GenerateFunctionPrologue(MacroAssembler& masm,
-                                    const FuncTypeIdDesc& funcTypeId,
+                                    const TypeIdDesc& funcTypeId,
                                     const Maybe<uint32_t>& tier1FuncIndex,
                                     FuncOffsets* offsets) {
   // These constants reflect statically-determined offsets
@@ -588,7 +588,7 @@
 
   EnsureOffset(masm, offsets->begin, WasmCheckedTailEntryOffset);
   switch (funcTypeId.kind()) {
-    case FuncTypeIdDescKind::Global: {
+    case TypeIdDescKind::Global: {
       Register scratch = WasmTableCallScratchReg0;
       masm.loadWasmGlobalPtr(funcTypeId.globalDataOffset(), scratch);
       masm.branchPtr(Assembler::Condition::Equal, WasmTableCallSigReg, scratch,
@@ -596,13 +596,13 @@
       masm.wasmTrap(Trap::IndirectCallBadSig, BytecodeOffset(0));
       break;
     }
-    case FuncTypeIdDescKind::Immediate: {
+    case TypeIdDescKind::Immediate: {
       masm.branch32(Assembler::Condition::Equal, WasmTableCallSigReg,
                     Imm32(funcTypeId.immediate()), &functionBody);
       masm.wasmTrap(Trap::IndirectCallBadSig, BytecodeOffset(0));
       break;
     }
-    case FuncTypeIdDescKind::None:
+    case TypeIdDescKind::None:
       masm.jump(&functionBody);
       break;
   }
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmFrameIter.h firefox-85.0+build1/js/src/wasm/WasmFrameIter.h
--- firefox-84.0.2+build1/js/src/wasm/WasmFrameIter.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmFrameIter.h	2021-01-18 19:58:16.000000000 +0000
@@ -37,7 +37,7 @@
 class Code;
 class CodeRange;
 class DebugFrame;
-class FuncTypeIdDesc;
+class TypeIdDesc;
 class Instance;
 class ModuleSegment;
 
@@ -229,7 +229,7 @@
 void GenerateJitEntryPrologue(jit::MacroAssembler& masm, Offsets* offsets);
 
 void GenerateFunctionPrologue(jit::MacroAssembler& masm,
-                              const FuncTypeIdDesc& funcTypeId,
+                              const TypeIdDesc& funcTypeId,
                               const mozilla::Maybe<uint32_t>& tier1FuncIndex,
                               FuncOffsets* offsets);
 void GenerateFunctionEpilogue(jit::MacroAssembler& masm, unsigned framePushed,
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmGenerator.cpp firefox-85.0+build1/js/src/wasm/WasmGenerator.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmGenerator.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmGenerator.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -92,7 +92,7 @@
       metadataTier_(nullptr),
       lifo_(GENERATOR_LIFO_DEFAULT_CHUNK_SIZE),
       masmAlloc_(&lifo_),
-      masm_(masmAlloc_, /* limitedSize= */ false),
+      masm_(masmAlloc_, *moduleEnv, /* limitedSize= */ false),
       debugTrapCodeOffset_(),
       lastPatchedCallSite_(0),
       startOfUnpatchedCallsites_(0),
@@ -215,7 +215,7 @@
   // elements will be initialized by the time module generation is finished.
 
   if (!metadataTier_->funcToCodeRange.appendN(BAD_CODE_RANGE,
-                                              moduleEnv_->funcTypes.length())) {
+                                              moduleEnv_->funcs.length())) {
     return false;
   }
 
@@ -257,7 +257,7 @@
     moduleEnv_->funcImportGlobalDataOffsets[i] = globalDataOffset;
 
     FuncType copy;
-    if (!copy.clone(*moduleEnv_->funcTypes[i])) {
+    if (!copy.clone(*moduleEnv_->funcs[i].type)) {
       return false;
     }
     if (!metadataTier_->funcImports.emplaceBack(std::move(copy),
@@ -274,31 +274,56 @@
   }
 
   if (!isAsmJS()) {
-    for (TypeDef& td : moduleEnv_->types) {
-      if (!td.isFuncType()) {
-        continue;
-      }
+    // Copy type definitions to metadata that are required at runtime,
+    // allocating global data so that codegen can find the type id's at
+    // runtime.
+    for (uint32_t typeIndex = 0; typeIndex < moduleEnv_->types.length();
+         typeIndex++) {
+      const TypeDef& typeDef = moduleEnv_->types[typeIndex];
+      TypeIdDesc& typeId = moduleEnv_->typeIds[typeIndex];
 
-      FuncTypeWithId& funcType = td.funcType();
-      if (FuncTypeIdDesc::isGlobal(funcType)) {
+      if (TypeIdDesc::isGlobal(typeDef)) {
         uint32_t globalDataOffset;
         if (!allocateGlobalBytes(sizeof(void*), sizeof(void*),
                                  &globalDataOffset)) {
           return false;
         }
 
-        funcType.id = FuncTypeIdDesc::global(funcType, globalDataOffset);
+        typeId = TypeIdDesc::global(typeDef, globalDataOffset);
 
-        FuncType copy;
-        if (!copy.clone(funcType)) {
+        TypeDef copy;
+        if (!copy.clone(typeDef)) {
           return false;
         }
 
-        if (!metadata_->funcTypeIds.emplaceBack(std::move(copy), funcType.id)) {
+        if (!metadata_->types.emplaceBack(std::move(copy), typeId)) {
           return false;
         }
       } else {
-        funcType.id = FuncTypeIdDesc::immediate(funcType);
+        typeId = TypeIdDesc::immediate(typeDef);
+      }
+    }
+
+    // If we allow type indices, then we need to rewrite the index space to
+    // account for types that are omitted from metadata, such as function
+    // types that fit in an immediate.
+    if (moduleEnv_->functionReferencesEnabled()) {
+      // Do a linear pass to create a map from src index to dest index.
+      RenumberMap map;
+      for (uint32_t srcIndex = 0, destIndex = 0;
+           srcIndex < moduleEnv_->types.length(); srcIndex++) {
+        const TypeDef& typeDef = moduleEnv_->types[srcIndex];
+        if (!TypeIdDesc::isGlobal(typeDef)) {
+          continue;
+        }
+        if (!map.put(srcIndex, destIndex++)) {
+          return false;
+        }
+      }
+
+      // Apply the map
+      for (TypeDefWithId& typeDef : metadata_->types) {
+        typeDef.renumber(map);
       }
     }
   }
@@ -414,7 +439,7 @@
 
   for (const ExportedFunc& funcIndex : exportedFuncs) {
     FuncType funcType;
-    if (!funcType.clone(*moduleEnv_->funcTypes[funcIndex.index()])) {
+    if (!funcType.clone(*moduleEnv_->funcs[funcIndex.index()].type)) {
       return false;
     }
     metadataTier_->funcExports.infallibleEmplaceBack(
@@ -1125,6 +1150,9 @@
   metadata_->startFuncIndex = moduleEnv_->startFuncIndex;
   metadata_->tables = std::move(moduleEnv_->tables);
   metadata_->globals = std::move(moduleEnv_->globals);
+#ifdef ENABLE_WASM_EXCEPTIONS
+  metadata_->events = std::move(moduleEnv_->events);
+#endif
   metadata_->nameCustomSectionIndex = moduleEnv_->nameCustomSectionIndex;
   metadata_->moduleName = moduleEnv_->moduleName;
   metadata_->funcNames = std::move(moduleEnv_->funcNames);
@@ -1136,20 +1164,20 @@
   if (compilerEnv_->debugEnabled()) {
     metadata_->debugEnabled = true;
 
-    const size_t numFuncTypes = moduleEnv_->funcTypes.length();
-    if (!metadata_->debugFuncArgTypes.resize(numFuncTypes)) {
+    const size_t numFuncs = moduleEnv_->funcs.length();
+    if (!metadata_->debugFuncArgTypes.resize(numFuncs)) {
       return nullptr;
     }
-    if (!metadata_->debugFuncReturnTypes.resize(numFuncTypes)) {
+    if (!metadata_->debugFuncReturnTypes.resize(numFuncs)) {
       return nullptr;
     }
-    for (size_t i = 0; i < numFuncTypes; i++) {
+    for (size_t i = 0; i < numFuncs; i++) {
       if (!metadata_->debugFuncArgTypes[i].appendAll(
-              moduleEnv_->funcTypes[i]->args())) {
+              moduleEnv_->funcs[i].type->args())) {
         return nullptr;
       }
       if (!metadata_->debugFuncReturnTypes[i].appendAll(
-              moduleEnv_->funcTypes[i]->results())) {
+              moduleEnv_->funcs[i].type->results())) {
         return nullptr;
       }
     }
@@ -1238,16 +1266,8 @@
     return nullptr;
   }
 
-  StructTypeVector structTypes;
-  for (TypeDef& td : moduleEnv_->types) {
-    if (td.isStructType() && !structTypes.append(std::move(td.structType()))) {
-      return nullptr;
-    }
-  }
-
   MutableCode code =
-      js_new<Code>(std::move(codeTier), *metadata, std::move(jumpTables),
-                   std::move(structTypes));
+      js_new<Code>(std::move(codeTier), *metadata, std::move(jumpTables));
   if (!code || !code->initialize(*linkData_)) {
     return nullptr;
   }
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmInstance.cpp firefox-85.0+build1/js/src/wasm/WasmInstance.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmInstance.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmInstance.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -41,6 +41,7 @@
 #include "wasm/WasmJS.h"
 #include "wasm/WasmModule.h"
 #include "wasm/WasmStubs.h"
+#include "wasm/WasmTypes.h"
 
 #include "gc/StoreBuffer-inl.h"
 #include "vm/ArrayBufferObject-inl.h"
@@ -84,7 +85,7 @@
     }
 
     *funcTypeId = clone.release();
-    MOZ_ASSERT(!(uintptr_t(*funcTypeId) & FuncTypeIdDesc::ImmediateBit));
+    MOZ_ASSERT(!(uintptr_t(*funcTypeId) & TypeIdDesc::ImmediateBit));
     return true;
   }
 
@@ -102,9 +103,8 @@
 
 ExclusiveData<FuncTypeIdSet> funcTypeIdSet(mutexid::WasmFuncTypeIdSet);
 
-const void** Instance::addressOfFuncTypeId(
-    const FuncTypeIdDesc& funcTypeId) const {
-  return (const void**)(globalData() + funcTypeId.globalDataOffset());
+const void** Instance::addressOfTypeId(const TypeIdDesc& typeId) const {
+  return (const void**)(globalData() + typeId.globalDataOffset());
 }
 
 FuncImportTls& Instance::funcImportTls(const FuncImport& fi) {
@@ -115,276 +115,6 @@
   return *(TableTls*)(globalData() + td.globalDataOffset);
 }
 
-class NoDebug {
- public:
-  template <typename T>
-  static void print(T v) {}
-};
-
-class DebugCodegenVal {
-  template <typename T>
-  static void print(const char* fmt, T v) {
-    DebugCodegen(DebugChannel::Function, fmt, v);
-  }
-
- public:
-  static void print(int32_t v) { print(" i32(%d)", v); }
-  static void print(int64_t v) { print(" i64(%" PRId64 ")", v); }
-  static void print(float v) { print(" f32(%f)", v); }
-  static void print(double v) { print(" f64(%lf)", v); }
-  static void print(void* v) { print(" ptr(%p)", v); }
-};
-
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_i32(JSContext* cx, HandleValue val, int32_t* loc,
-                                   bool mustWrite64) {
-  bool ok = ToInt32(cx, val, loc);
-  if (ok && mustWrite64) {
-#if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
-    loc[1] = loc[0] >> 31;
-#else
-    loc[1] = 0;
-#endif
-  }
-  Debug::print(*loc);
-  return ok;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_i64(JSContext* cx, HandleValue val, int64_t* loc,
-                                   bool mustWrite64) {
-  MOZ_ASSERT(mustWrite64);
-  JS_TRY_VAR_OR_RETURN_FALSE(cx, *loc, ToBigInt64(cx, val));
-  Debug::print(*loc);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_f32(JSContext* cx, HandleValue val, float* loc,
-                                   bool mustWrite64) {
-  bool ok = RoundFloat32(cx, val, loc);
-  if (ok && mustWrite64) {
-    loc[1] = 0.0;
-  }
-  Debug::print(*loc);
-  return ok;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_f64(JSContext* cx, HandleValue val, double* loc,
-                                   bool mustWrite64) {
-  MOZ_ASSERT(mustWrite64);
-  bool ok = ToNumber(cx, val, loc);
-  Debug::print(*loc);
-  return ok;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_externref(JSContext* cx, HandleValue val,
-                                         void** loc, bool mustWrite64) {
-  RootedAnyRef result(cx, AnyRef::null());
-  if (!BoxAnyRef(cx, val, &result)) {
-    return false;
-  }
-  *loc = result.get().forCompiledCode();
-#ifndef JS_64BIT
-  if (mustWrite64) {
-    loc[1] = nullptr;
-  }
-#endif
-  Debug::print(*loc);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_eqref(JSContext* cx, HandleValue val, void** loc,
-                                     bool mustWrite64) {
-  RootedAnyRef result(cx, AnyRef::null());
-  if (!CheckEqRefValue(cx, val, &result)) {
-    return false;
-  }
-  *loc = result.get().forCompiledCode();
-#ifndef JS_64BIT
-  if (mustWrite64) {
-    loc[1] = nullptr;
-  }
-#endif
-  Debug::print(*loc);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_funcref(JSContext* cx, HandleValue val,
-                                       void** loc, bool mustWrite64) {
-  RootedFunction fun(cx);
-  if (!CheckFuncRefValue(cx, val, &fun)) {
-    return false;
-  }
-  *loc = fun;
-#ifndef JS_64BIT
-  if (mustWrite64) {
-    loc[1] = nullptr;
-  }
-#endif
-  Debug::print(*loc);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue_typeref(JSContext* cx, HandleValue val,
-                                       void** loc, bool mustWrite64) {
-  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                           JSMSG_WASM_TYPEREF_FROM_JS);
-  return false;
-}
-
-template <typename Debug = NoDebug>
-static bool ToWebAssemblyValue(JSContext* cx, HandleValue val, ValType type,
-                               void* loc, bool mustWrite64) {
-  switch (type.kind()) {
-    case ValType::I32:
-      return ToWebAssemblyValue_i32<Debug>(cx, val, (int32_t*)loc, mustWrite64);
-    case ValType::I64:
-      return ToWebAssemblyValue_i64<Debug>(cx, val, (int64_t*)loc, mustWrite64);
-    case ValType::F32:
-      return ToWebAssemblyValue_f32<Debug>(cx, val, (float*)loc, mustWrite64);
-    case ValType::F64:
-      return ToWebAssemblyValue_f64<Debug>(cx, val, (double*)loc, mustWrite64);
-    case ValType::V128:
-      MOZ_CRASH("unexpected v128 in ToWebAssemblyValue");
-    case ValType::Ref:
-#ifdef ENABLE_WASM_FUNCTION_REFERENCES
-      if (!type.isNullable() && val.isNull()) {
-        JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                                 JSMSG_WASM_BAD_REF_NONNULLABLE_VALUE);
-        return false;
-      }
-#else
-      MOZ_ASSERT(type.isNullable());
-#endif
-      switch (type.refTypeKind()) {
-        case RefType::Func:
-          return ToWebAssemblyValue_funcref<Debug>(cx, val, (void**)loc,
-                                                   mustWrite64);
-        case RefType::Extern:
-          return ToWebAssemblyValue_externref<Debug>(cx, val, (void**)loc,
-                                                     mustWrite64);
-        case RefType::Eq:
-          return ToWebAssemblyValue_eqref<Debug>(cx, val, (void**)loc,
-                                                 mustWrite64);
-        case RefType::TypeIndex:
-          return ToWebAssemblyValue_typeref<Debug>(cx, val, (void**)loc,
-                                                   mustWrite64);
-      }
-  }
-  MOZ_CRASH("unreachable");
-}
-
-template <typename Debug = NoDebug>
-static bool ToJSValue_i32(JSContext* cx, int32_t src, MutableHandleValue dst) {
-  dst.set(Int32Value(src));
-  Debug::print(src);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToJSValue_i64(JSContext* cx, int64_t src, MutableHandleValue dst) {
-  // If bi is manipulated other than test & storing, it would need
-  // to be rooted here.
-  BigInt* bi = BigInt::createFromInt64(cx, src);
-  if (!bi) {
-    return false;
-  }
-  dst.set(BigIntValue(bi));
-  Debug::print(src);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToJSValue_f32(JSContext* cx, float src, MutableHandleValue dst) {
-  dst.set(JS::CanonicalizedDoubleValue(src));
-  Debug::print(src);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToJSValue_f64(JSContext* cx, double src, MutableHandleValue dst) {
-  dst.set(JS::CanonicalizedDoubleValue(src));
-  Debug::print(src);
-  return true;
-}
-#ifdef ENABLE_WASM_SIMD
-template <typename Debug = NoDebug>
-static bool ToJSValue_v128(JSContext* cx, const V128& src,
-                           MutableHandleValue dst) {
-  // Conversion to v128 happens only in the context of the debugger, all other
-  // execution paths are blocked from running this conversion.
-  //
-  // v128 does not have a convenient representation in JS, nor a convenient way
-  // of printing it -- after all, what's the intended interpretation?  For the
-  // time being, we transform it to a single i32 that represents lane 0 of an
-  // int32x4, and we print it as an int32x4 -- at least this shows the bit
-  // representation.
-  dst.set(Int32Value(src.extractLane<int32_t>(0)));
-  for (unsigned i = 0; i < 4; i++) {
-    Debug::print(src.extractLane<int32_t>(i));
-  }
-  return true;
-}
-#endif
-template <typename Debug = NoDebug>
-static bool ToJSValue_funcref(JSContext* cx, void* src,
-                              MutableHandleValue dst) {
-  dst.set(UnboxFuncRef(FuncRef::fromCompiledCode(src)));
-  Debug::print(src);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToJSValue_anyref(JSContext* cx, void* src, MutableHandleValue dst) {
-  dst.set(UnboxAnyRef(AnyRef::fromCompiledCode(src)));
-  Debug::print(src);
-  return true;
-}
-template <typename Debug = NoDebug>
-static bool ToJSValue_typeref(JSContext* cx, void* src,
-                              MutableHandleValue dst) {
-  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                           JSMSG_WASM_TYPEREF_TO_JS);
-  return false;
-}
-
-template <typename Debug = NoDebug>
-static bool ToJSValue(JSContext* cx, const void* src, ValType type,
-                      MutableHandleValue dst) {
-  switch (type.kind()) {
-    case ValType::I32:
-      return ToJSValue_i32<Debug>(cx, *reinterpret_cast<const int32_t*>(src),
-                                  dst);
-    case ValType::I64:
-      return ToJSValue_i64<Debug>(cx, *reinterpret_cast<const int64_t*>(src),
-                                  dst);
-    case ValType::F32:
-      return ToJSValue_f32<Debug>(cx, *reinterpret_cast<const float*>(src),
-                                  dst);
-    case ValType::F64:
-      return ToJSValue_f64<Debug>(cx, *reinterpret_cast<const double*>(src),
-                                  dst);
-    case ValType::V128:
-#ifdef ENABLE_WASM_SIMD
-      return ToJSValue_v128<Debug>(cx, *reinterpret_cast<const V128*>(src),
-                                   dst);
-#else
-      break;
-#endif
-    case ValType::Ref:
-      switch (type.refTypeKind()) {
-        case RefType::Func:
-          return ToJSValue_funcref<Debug>(
-              cx, *reinterpret_cast<void* const*>(src), dst);
-        case RefType::Extern:
-          return ToJSValue_anyref<Debug>(
-              cx, *reinterpret_cast<void* const*>(src), dst);
-        case RefType::Eq:
-          return ToJSValue_anyref<Debug>(
-              cx, *reinterpret_cast<void* const*>(src), dst);
-        case RefType::TypeIndex:
-          return ToJSValue_typeref<Debug>(
-              cx, *reinterpret_cast<void* const*>(src), dst);
-      }
-  }
-  MOZ_CRASH("unreachable");
-}
-
 // TODO(1626251): Consolidate definitions into Iterable.h
 static bool IterableToArray(JSContext* cx, HandleValue iterable,
                             MutableHandle<ArrayObject*> array) {
@@ -506,13 +236,11 @@
     return false;
   }
 
-#ifdef ENABLE_WASM_SIMD
-  if (fi.funcType().hasV128ArgOrRet()) {
+  if (fi.funcType().hasUnexposableArgOrRet()) {
     JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                              JSMSG_WASM_BAD_VAL_TYPE);
     return false;
   }
-#endif
 
   MOZ_ASSERT(argTypes.lengthWithStackResults() == argc);
   Maybe<char*> stackResultPointer;
@@ -570,10 +298,8 @@
     return true;
   }
 
-#ifdef ENABLE_WASM_SIMD
   // Should have been guarded earlier
-  MOZ_ASSERT(!fi.funcType().hasV128ArgOrRet());
-#endif
+  MOZ_ASSERT(!fi.funcType().hasUnexposableArgOrRet());
 
   // Functions with unsupported reference types in signature don't have a jit
   // exit at the moment.
@@ -586,91 +312,9 @@
     return true;
   }
 
-  JitScript* jitScript = script->jitScript();
-
-  // Ensure the argument types are included in the argument TypeSets stored in
-  // the JitScript. This is necessary for Ion, because the import will use
-  // the skip-arg-checks entry point. When the JitScript is discarded the import
-  // is patched back.
-  if (IsTypeInferenceEnabled()) {
-    AutoSweepJitScript sweep(script);
-
-    StackTypeSet* thisTypes = jitScript->thisTypes(sweep, script);
-    if (!thisTypes->hasType(TypeSet::UndefinedType())) {
-      return true;
-    }
-
-    const ValTypeVector& importArgs = fi.funcType().args();
-
-    size_t numKnownArgs = std::min(importArgs.length(), importFun->nargs());
-    for (uint32_t i = 0; i < numKnownArgs; i++) {
-      StackTypeSet* argTypes = jitScript->argTypes(sweep, script, i);
-      switch (importArgs[i].kind()) {
-        case ValType::I32:
-          if (!argTypes->hasType(TypeSet::Int32Type())) {
-            return true;
-          }
-          break;
-        case ValType::I64:
-          if (!argTypes->hasType(TypeSet::BigIntType())) {
-            return true;
-          }
-          break;
-        case ValType::V128:
-          MOZ_CRASH("Not needed per spec");
-        case ValType::F32:
-          if (!argTypes->hasType(TypeSet::DoubleType())) {
-            return true;
-          }
-          break;
-        case ValType::F64:
-          if (!argTypes->hasType(TypeSet::DoubleType())) {
-            return true;
-          }
-          break;
-        case ValType::Ref:
-          switch (importArgs[i].refTypeKind()) {
-            case RefType::Extern:
-              // We don't know what type the value will be, so we can't really
-              // check whether the callee will accept it.  It doesn't make much
-              // sense to see if the callee accepts all of the types an AnyRef
-              // might represent because most callees will not have been exposed
-              // to all those types and so we'll never pass the test.  Instead,
-              // we must use the callee's arg-type-checking entry point, and not
-              // check anything here.  See FuncType::jitExitRequiresArgCheck().
-              break;
-            case RefType::Func:
-              // We handle FuncRef as we do AnyRef: by checking the type
-              // dynamically in the callee.  Code in the stubs layer must box up
-              // the FuncRef as a Value.
-              break;
-            case RefType::Eq:
-            case RefType::TypeIndex:
-              // Guarded by temporarilyUnsupportedReftypeForExit()
-              MOZ_CRASH("case guarded above");
-          }
-          break;
-      }
-    }
-
-    // These arguments will be filled with undefined at runtime by the
-    // arguments rectifier: check that the imported function can handle
-    // undefined there.
-    for (uint32_t i = importArgs.length(); i < importFun->nargs(); i++) {
-      StackTypeSet* argTypes = jitScript->argTypes(sweep, script, i);
-      if (!argTypes->hasType(TypeSet::UndefinedType())) {
-        return true;
-      }
-    }
-  }
-
   // Let's optimize it!
-  if (!jitScript->addDependentWasmImport(cx, *this, funcImportIndex)) {
-    return false;
-  }
 
   import.code = jitExitCode;
-  import.jitScript = jitScript;
   return true;
 }
 
@@ -1321,28 +965,35 @@
       reinterpret_cast<JSObject**>(location));
 }
 
-// The typeIndex is an index into the structTypeDescrs_ table in the instance.
+// The typeIndex is an index into the typeDescrs_ table in the instance.
 // That table holds TypeDescr objects.
 //
 // When we fail to allocate we return a nullptr; the wasm side must check this
 // and propagate it as an error.
 
-/* static */ void* Instance::structNew(Instance* instance, uint32_t typeIndex) {
+/* static */ void* Instance::structNew(Instance* instance, void* structDescr) {
   MOZ_ASSERT(SASigStructNew.failureMode == FailureMode::FailOnNullPtr);
   JSContext* cx = TlsContext.get();
-  Rooted<TypeDescr*> typeDescr(cx, instance->structTypeDescrs_[typeIndex]);
+  Rooted<TypeDescr*> typeDescr(cx, (TypeDescr*)structDescr);
+  MOZ_ASSERT(typeDescr);
   return TypedObject::createZeroed(cx, typeDescr);
 }
 
+static const StructType* GetDescrStructType(JSContext* cx,
+                                            HandleTypeDescr typeDescr) {
+  const TypeDef& typeDef = typeDescr->getType(cx);
+  return typeDef.isStructType() ? &typeDef.structType() : nullptr;
+}
+
 /* static */ void* Instance::structNarrow(Instance* instance,
-                                          uint32_t outputTypeIndex,
+                                          void* outputStructDescr,
                                           void* maybeNullPtr) {
   MOZ_ASSERT(SASigStructNarrow.failureMode == FailureMode::Infallible);
 
   JSContext* cx = TlsContext.get();
 
   Rooted<TypedObject*> obj(cx);
-  Rooted<StructTypeDescr*> typeDescr(cx);
+  Rooted<TypeDescr*> typeDescr(cx);
 
   if (maybeNullPtr == nullptr) {
     return maybeNullPtr;
@@ -1350,40 +1001,23 @@
 
   void* nonnullPtr = maybeNullPtr;
   obj = static_cast<TypedObject*>(nonnullPtr);
-  typeDescr = &obj->typeDescr().as<StructTypeDescr>();
-
-  // Optimization opportunity: instead of this loop we could perhaps load an
-  // index from `typeDescr` and use that to index into the structTypes table
-  // of the instance.  If the index is in bounds and the desc at that index is
-  // the desc we have then we know the index is good, and we can use that for
-  // the prefix check.
-
-  uint32_t found = UINT32_MAX;
-  for (uint32_t i = 0; i < instance->structTypeDescrs_.length(); i++) {
-    if (instance->structTypeDescrs_[i] == typeDescr) {
-      found = i;
-      break;
-    }
-  }
+  typeDescr = &obj->typeDescr();
 
-  if (found == UINT32_MAX) {
+  const StructType* inputStructType = GetDescrStructType(cx, typeDescr);
+  if (inputStructType == nullptr) {
     return nullptr;
   }
-
-  // Also asserted in constructor; let's just be double sure.
-
-  MOZ_ASSERT(instance->structTypeDescrs_.length() ==
-             instance->structTypes().length());
+  Rooted<TypeDescr*> outputTypeDescr(cx, (TypeDescr*)outputStructDescr);
+  const StructType* outputStructType = GetDescrStructType(cx, outputTypeDescr);
+  MOZ_ASSERT(outputStructType);
 
   // Now we know that the object was created by the instance, and we know its
   // concrete type.  We need to check that its type is an extension of the
   // type of outputTypeIndex.
 
-  if (!instance->structTypes()[found].hasPrefix(
-          instance->structTypes()[outputTypeIndex])) {
+  if (!inputStructType->hasPrefix(*outputStructType)) {
     return nullptr;
   }
-
   return nonnullPtr;
 }
 
@@ -1447,9 +1081,9 @@
 
 Instance::Instance(JSContext* cx, Handle<WasmInstanceObject*> object,
                    SharedCode code, UniqueTlsData tlsDataIn,
-                   HandleWasmMemoryObject memory, SharedTableVector&& tables,
-                   StructTypeDescrVector&& structTypeDescrs,
-                   UniqueDebugState maybeDebug)
+                   HandleWasmMemoryObject memory,
+                   SharedExceptionTagVector&& exceptionTags,
+                   SharedTableVector&& tables, UniqueDebugState maybeDebug)
     : realm_(cx->realm()),
       object_(object),
       jsJitArgsRectifier_(
@@ -1461,9 +1095,10 @@
       code_(code),
       tlsData_(std::move(tlsDataIn)),
       memory_(memory),
+      exceptionTags_(std::move(exceptionTags)),
       tables_(std::move(tables)),
       maybeDebug_(std::move(maybeDebug)),
-      structTypeDescrs_(std::move(structTypeDescrs)) {}
+      hasGcTypes_(false) {}
 
 bool Instance::init(JSContext* cx, const JSFunctionVector& funcImports,
                     const ValVector& globalImportValues,
@@ -1471,7 +1106,12 @@
                     const DataSegmentVector& dataSegments,
                     const ElemSegmentVector& elemSegments) {
   MOZ_ASSERT(!!maybeDebug_ == metadata().debugEnabled);
-  MOZ_ASSERT(structTypeDescrs_.length() == structTypes().length());
+#ifdef ENABLE_WASM_EXCEPTIONS
+  // Currently the only events are exceptions.
+  MOZ_ASSERT(exceptionTags_.length() == metadata().events.length());
+#else
+  MOZ_ASSERT(exceptionTags_.length() == 0);
+#endif
 
 #ifdef DEBUG
   for (auto t : code_->tiers()) {
@@ -1510,17 +1150,14 @@
       import.realm = f->realm();
       import.code = calleeInstance.codeBase(calleeTier) +
                     codeRange.funcUncheckedCallEntry();
-      import.jitScript = nullptr;
     } else if (void* thunk = MaybeGetBuiltinThunk(f, fi.funcType())) {
       import.tls = tlsData();
       import.realm = f->realm();
       import.code = thunk;
-      import.jitScript = nullptr;
     } else {
       import.tls = tlsData();
       import.realm = f->realm();
       import.code = codeBase(callerTier) + fi.interpExitCodeOffset();
-      import.jitScript = nullptr;
     }
   }
 
@@ -1546,7 +1183,8 @@
       case GlobalKind::Import: {
         size_t imported = global.importIndex();
         if (global.isIndirect()) {
-          *(void**)globalAddr = globalObjs[imported]->cell();
+          *(void**)globalAddr =
+              (void*)&globalObjs[imported]->val().get().cell();
         } else {
           CopyValPostBarriered(globalAddr, globalImportValues[imported]);
         }
@@ -1583,7 +1221,7 @@
         }
 
         if (global.isIndirect()) {
-          void* address = globalObjs[i]->cell();
+          void* address = (void*)&globalObjs[i]->val().get().cell();
           *(void**)globalAddr = address;
           CopyValPostBarriered((uint8_t*)address, val.get());
         } else {
@@ -1610,18 +1248,59 @@
     }
   }
 
-  // Allocate in the global function type set for structural signature checks
-  if (!metadata().funcTypeIds.empty()) {
+  // Allocate in the global type sets for structural type checks
+  if (!metadata().types.empty()) {
+    // Transfer and allocate type objects for the struct types in the module
+    if (GcTypesAvailable(cx)) {
+      uint32_t baseIndex = 0;
+      if (!cx->wasm().typeContext->transferTypes(metadata().types,
+                                                 &baseIndex)) {
+        return false;
+      }
+
+      for (uint32_t typeIndex = 0; typeIndex < metadata().types.length();
+           typeIndex++) {
+        const TypeDefWithId& typeDef = metadata().types[typeIndex];
+        if (!typeDef.isStructType()) {
+          continue;
+        }
+#ifndef ENABLE_WASM_GC
+        MOZ_CRASH("Should not have seen any struct types");
+#else
+        uint32_t globalTypeIndex = baseIndex + typeIndex;
+        Rooted<TypeDescr*> typeDescr(
+            cx, TypeDescr::createFromHandle(cx, TypeHandle(globalTypeIndex)));
+
+        if (!typeDescr) {
+          return false;
+        }
+        *((GCPtrObject*)addressOfTypeId(typeDef.id)) = typeDescr;
+        hasGcTypes_ = true;
+#endif
+      }
+    }
+
+    // Handle functions specially (for now) as they're guaranteed to be
+    // acyclical and can use simpler hash-consing logic.
     ExclusiveData<FuncTypeIdSet>::Guard lockedFuncTypeIdSet =
         funcTypeIdSet.lock();
 
-    for (const FuncTypeWithId& funcType : metadata().funcTypeIds) {
-      const void* funcTypeId;
-      if (!lockedFuncTypeIdSet->allocateFuncTypeId(cx, funcType, &funcTypeId)) {
-        return false;
+    for (uint32_t typeIndex = 0; typeIndex < metadata().types.length();
+         typeIndex++) {
+      const TypeDefWithId& typeDef = metadata().types[typeIndex];
+      if (!typeDef.isFuncType()) {
+        continue;
+      } else if (typeDef.isFuncType()) {
+        const FuncType& funcType = typeDef.funcType();
+        const void* funcTypeId;
+        if (!lockedFuncTypeIdSet->allocateFuncTypeId(cx, funcType,
+                                                     &funcTypeId)) {
+          return false;
+        }
+        *addressOfTypeId(typeDef.id) = funcTypeId;
+      } else {
+        MOZ_CRASH();
       }
-
-      *addressOfFuncTypeId(funcType.id) = funcTypeId;
     }
   }
 
@@ -1651,22 +1330,16 @@
 Instance::~Instance() {
   realm_->wasm.unregisterInstance(*this);
 
-  const FuncImportVector& funcImports =
-      metadata(code().stableTier()).funcImports;
-
-  for (unsigned i = 0; i < funcImports.length(); i++) {
-    FuncImportTls& import = funcImportTls(funcImports[i]);
-    if (import.jitScript) {
-      import.jitScript->removeDependentWasmImport(*this, i);
-    }
-  }
-
-  if (!metadata().funcTypeIds.empty()) {
+  if (!metadata().types.empty()) {
     ExclusiveData<FuncTypeIdSet>::Guard lockedFuncTypeIdSet =
         funcTypeIdSet.lock();
 
-    for (const FuncTypeWithId& funcType : metadata().funcTypeIds) {
-      if (const void* funcTypeId = *addressOfFuncTypeId(funcType.id)) {
+    for (const TypeDefWithId& typeDef : metadata().types) {
+      if (!typeDef.isFuncType()) {
+        continue;
+      }
+      const FuncType& funcType = typeDef.funcType();
+      if (const void* funcTypeId = *addressOfTypeId(typeDef.id)) {
         lockedFuncTypeIdSet->deallocateFuncTypeId(funcType, funcTypeId);
       }
     }
@@ -1752,7 +1425,17 @@
   }
 
   TraceNullableEdge(trc, &memory_, "wasm buffer");
-  structTypeDescrs_.trace(trc);
+#ifdef ENABLE_WASM_GC
+  if (hasGcTypes_) {
+    for (const TypeDefWithId& typeDef : metadata().types) {
+      if (!typeDef.isStructType()) {
+        continue;
+      }
+      TraceNullableEdge(trc, ((GCPtrObject*)addressOfTypeId(typeDef.id)),
+                        "wasm typedescr");
+    }
+  }
+#endif
 
   if (maybeDebug_) {
     maybeDebug_->trace(trc);
@@ -2126,13 +1809,11 @@
     return false;
   }
 
-#ifdef ENABLE_WASM_SIMD
-  if (funcType->hasV128ArgOrRet()) {
+  if (funcType->hasUnexposableArgOrRet()) {
     JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                              JSMSG_WASM_BAD_VAL_TYPE);
     return false;
   }
-#endif
 
   ArgTypeVector argTypes(*funcType);
   ResultType resultType(ResultType::Vector(funcType->results()));
@@ -2308,14 +1989,6 @@
   }
 }
 
-void Instance::deoptimizeImportExit(uint32_t funcImportIndex) {
-  Tier t = code().bestTier();
-  const FuncImport& fi = metadata(t).funcImports[funcImportIndex];
-  FuncImportTls& import = funcImportTls(fi);
-  import.code = codeBase(t) + fi.interpExitCodeOffset();
-  import.jitScript = nullptr;
-}
-
 JSString* Instance::createDisplayURL(JSContext* cx) {
   // In the best case, we simply have a URL, from a streaming compilation of a
   // fetched Response.
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmInstance.h firefox-85.0+build1/js/src/wasm/WasmInstance.h
--- firefox-84.0.2+build1/js/src/wasm/WasmInstance.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmInstance.h	2021-01-18 19:58:16.000000000 +0000
@@ -52,14 +52,15 @@
   const SharedCode code_;
   const UniqueTlsData tlsData_;
   const GCPtrWasmMemoryObject memory_;
+  const SharedExceptionTagVector exceptionTags_;
   const SharedTableVector tables_;
   DataSegmentVector passiveDataSegments_;
   ElemSegmentVector passiveElemSegments_;
   const UniqueDebugState maybeDebug_;
-  StructTypeDescrVector structTypeDescrs_;
+  bool hasGcTypes_;
 
   // Internal helpers:
-  const void** addressOfFuncTypeId(const FuncTypeIdDesc& funcTypeId) const;
+  const void** addressOfTypeId(const TypeIdDesc& typeId) const;
   FuncImportTls& funcImportTls(const FuncImport& fi);
   TableTls& tableTls(const TableDesc& td) const;
 
@@ -73,7 +74,7 @@
  public:
   Instance(JSContext* cx, HandleWasmInstanceObject object, SharedCode code,
            UniqueTlsData tlsData, HandleWasmMemoryObject memory,
-           SharedTableVector&& tables, StructTypeDescrVector&& structTypeDescrs,
+           SharedExceptionTagVector&& exceptionTags, SharedTableVector&& tables,
            UniqueDebugState maybeDebug);
   ~Instance();
   bool init(JSContext* cx, const JSFunctionVector& funcImports,
@@ -113,7 +114,9 @@
   SharedArrayRawBuffer* sharedMemoryBuffer() const;  // never null
   bool memoryAccessInGuardRegion(uint8_t* addr, unsigned numBytes) const;
   bool memoryAccessInBounds(uint8_t* addr, unsigned numBytes) const;
-  const StructTypeVector& structTypes() const { return code_->structTypes(); }
+  const SharedExceptionTagVector& exceptionTags() const {
+    return exceptionTags_;
+  }
 
   static constexpr size_t offsetOfJSJitArgsRectifier() {
     return offsetof(Instance, jsJitArgsRectifier_);
@@ -145,14 +148,6 @@
   JSAtom* getFuncDisplayAtom(JSContext* cx, uint32_t funcIndex) const;
   void ensureProfilingLabels(bool profilingEnabled) const;
 
-  // Initially, calls to imports in wasm code call out through the generic
-  // callImport method. If the imported callee gets JIT compiled and the types
-  // match up, callImport will patch the code to instead call through a thunk
-  // directly into the JIT code. If the JIT code is released, the Instance must
-  // be notified so it can go back to the generic callImport.
-
-  void deoptimizeImportExit(uint32_t funcImportIndex);
-
   // Called by Wasm(Memory|Table)Object when a moving resize occurs:
 
   void onMovingGrowMemory();
@@ -225,8 +220,8 @@
   static void preBarrierFiltering(Instance* instance, gc::Cell** location);
   static void postBarrier(Instance* instance, gc::Cell** location);
   static void postBarrierFiltering(Instance* instance, gc::Cell** location);
-  static void* structNew(Instance* instance, uint32_t typeIndex);
-  static void* structNarrow(Instance* instance, uint32_t outputTypeIndex,
+  static void* structNew(Instance* instance, void* structDescr);
+  static void* structNarrow(Instance* instance, void* outputStructDescr,
                             void* maybeNullPtr);
 };
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmIonCompile.cpp firefox-85.0+build1/js/src/wasm/WasmIonCompile.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmIonCompile.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmIonCompile.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -147,7 +147,7 @@
   // FIXME(1401675): Replace with BlockType.
   uint32_t funcIndex() const { return func_.index; }
   const FuncType& funcType() const {
-    return *moduleEnv_.funcTypes[func_.index];
+    return *moduleEnv_.funcs[func_.index].type;
   }
 
   BytecodeOffset bytecodeOffset() const { return iter_.bytecodeOffset(); }
@@ -962,11 +962,12 @@
     MOZ_ASSERT(!inDeadCode());
 
     uint32_t offsetGuardLimit =
-        GetOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
+        GetMaxOffsetGuardLimit(moduleEnv_.hugeMemoryEnabled());
 
-    // Fold a constant base into the offset (so the base is 0 in which case
-    // the codegen is optimized), if it doesn't wrap or trigger an
-    // MWasmAddOffset.
+    // Fold a constant base into the offset and make the base 0, provided the
+    // offset stays below the guard limit.  The reason for folding the base into
+    // the offset rather than vice versa is that a small offset can be ignored
+    // by both explicit bounds checking and bounds check elimination.
     if ((*base)->isConstant()) {
       uint32_t basePtr = (*base)->toConstant()->toInt32();
       uint32_t offset = access->offset();
@@ -982,11 +983,11 @@
     bool mustAdd = false;
     bool alignmentCheck = needAlignmentCheck(access, *base, &mustAdd);
 
-    // If the offset is bigger than the guard region, a separate instruction
-    // is necessary to add the offset to the base and check for overflow.
+    // If the offset is bigger than the guard region, a separate instruction is
+    // necessary to add the offset to the base and check for overflow.
     //
-    // Also add the offset if we have a Wasm atomic access that needs
-    // alignment checking and the offset affects alignment.
+    // Also add the offset if we have a Wasm atomic access that needs alignment
+    // checking and the offset affects alignment.
     if (access->offset() >= offsetGuardLimit || mustAdd ||
         !JitOptions.wasmFoldOffsets) {
       *base = computeEffectiveAddress(*base, access);
@@ -1446,6 +1447,9 @@
     }
 
     for (iter.switchToPrev(); !iter.done(); iter.prev()) {
+      if (!mirGen().ensureBallast()) {
+        return false;
+      }
       const ABIResult& result = iter.cur();
       MInstruction* def;
       if (result.inRegister()) {
@@ -1525,12 +1529,13 @@
       return true;
     }
 
-    const FuncTypeWithId& funcType = moduleEnv_.types[funcTypeIndex].funcType();
+    const FuncType& funcType = moduleEnv_.types[funcTypeIndex].funcType();
+    const TypeIdDesc& funcTypeId = moduleEnv_.typeIds[funcTypeIndex];
 
     CalleeDesc callee;
     if (moduleEnv_.isAsmJS()) {
       MOZ_ASSERT(tableIndex == 0);
-      MOZ_ASSERT(funcType.id.kind() == FuncTypeIdDescKind::None);
+      MOZ_ASSERT(funcTypeId.kind() == TypeIdDescKind::None);
       const TableDesc& table =
           moduleEnv_.tables[moduleEnv_.asmJSSigToTableIndex[funcTypeIndex]];
       MOZ_ASSERT(IsPowerOfTwo(table.initialLength));
@@ -1544,9 +1549,9 @@
       index = maskedIndex;
       callee = CalleeDesc::asmJSTable(table);
     } else {
-      MOZ_ASSERT(funcType.id.kind() != FuncTypeIdDescKind::None);
+      MOZ_ASSERT(funcTypeId.kind() != TypeIdDescKind::None);
       const TableDesc& table = moduleEnv_.tables[tableIndex];
-      callee = CalleeDesc::wasmTable(table, funcType.id);
+      callee = CalleeDesc::wasmTable(table, funcTypeId);
     }
 
     CallSiteDesc desc(lineOrBytecode, CallSiteDesc::Dynamic);
@@ -2418,6 +2423,14 @@
         return false;
       }
       break;
+#ifdef ENABLE_WASM_EXCEPTIONS
+    case LabelKind::Try:
+      MOZ_CRASH("NYI");
+      break;
+    case LabelKind::Catch:
+      MOZ_CRASH("NYI");
+      break;
+#endif
   }
 
   MOZ_ASSERT_IF(!f.inDeadCode(), postJoinDefs.length() == type.length());
@@ -2496,6 +2509,40 @@
   return true;
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+static bool EmitTry(FunctionCompiler& f) {
+  ResultType params;
+  if (!f.iter().readTry(&params)) {
+    return false;
+  }
+
+  MOZ_CRASH("NYI");
+}
+
+static bool EmitCatch(FunctionCompiler& f) {
+  LabelKind kind;
+  uint32_t eventIndex;
+  ResultType paramType, resultType;
+  DefVector tryValues;
+  if (!f.iter().readCatch(&kind, &eventIndex, &paramType, &resultType,
+                          &tryValues)) {
+    return false;
+  }
+
+  MOZ_CRASH("NYI");
+}
+
+static bool EmitThrow(FunctionCompiler& f) {
+  uint32_t exnIndex;
+  DefVector argValues;
+  if (!f.iter().readThrow(&exnIndex, &argValues)) {
+    return false;
+  }
+
+  MOZ_CRASH("NYI");
+}
+#endif
+
 static bool EmitCallArgs(FunctionCompiler& f, const FuncType& funcType,
                          const DefVector& args, CallCompileState* call) {
   for (size_t i = 0, n = funcType.args().length(); i < n; ++i) {
@@ -2535,7 +2582,7 @@
     return true;
   }
 
-  const FuncType& funcType = *f.moduleEnv().funcTypes[funcIndex];
+  const FuncType& funcType = *f.moduleEnv().funcs[funcIndex].type;
 
   CallCompileState call;
   if (!EmitCallArgs(f, funcType, args, &call)) {
@@ -4362,6 +4409,23 @@
         CHECK(EmitIf(f));
       case uint16_t(Op::Else):
         CHECK(EmitElse(f));
+#ifdef ENABLE_WASM_EXCEPTIONS
+      case uint16_t(Op::Try):
+        if (!f.moduleEnv().exceptionsEnabled()) {
+          return f.iter().unrecognizedOpcode(&op);
+        }
+        CHECK(EmitTry(f));
+      case uint16_t(Op::Catch):
+        if (!f.moduleEnv().exceptionsEnabled()) {
+          return f.iter().unrecognizedOpcode(&op);
+        }
+        CHECK(EmitCatch(f));
+      case uint16_t(Op::Throw):
+        if (!f.moduleEnv().exceptionsEnabled()) {
+          return f.iter().unrecognizedOpcode(&op);
+        }
+        CHECK(EmitThrow(f));
+#endif
       case uint16_t(Op::Br):
         CHECK(EmitBr(f));
       case uint16_t(Op::BrIf):
@@ -5377,7 +5441,7 @@
   TempAllocator alloc(&lifo);
   JitContext jitContext(&alloc);
   MOZ_ASSERT(IsCompilingWasm());
-  WasmMacroAssembler masm(alloc);
+  WasmMacroAssembler masm(alloc, moduleEnv);
 
   // Swap in already-allocated empty vectors to avoid malloc/free.
   MOZ_ASSERT(code->empty());
@@ -5401,7 +5465,8 @@
 
     // Build the local types vector.
 
-    const FuncTypeWithId& funcType = *moduleEnv.funcTypes[func.index];
+    const FuncType& funcType = *moduleEnv.funcs[func.index].type;
+    const TypeIdDesc& funcTypeId = *moduleEnv.funcs[func.index].typeId;
     ValTypeVector locals;
     if (!locals.appendAll(funcType.args())) {
       return false;
@@ -5456,7 +5521,7 @@
       BytecodeOffset prologueTrapOffset(func.lineOrBytecode);
       FuncOffsets offsets;
       ArgTypeVector args(funcType);
-      if (!codegen.generateWasm(funcType.id, prologueTrapOffset, args,
+      if (!codegen.generateWasm(funcTypeId, prologueTrapOffset, args,
                                 trapExitLayout, trapExitLayoutNumWords,
                                 &offsets, &code->stackMaps)) {
         return false;
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmJS.cpp firefox-85.0+build1/js/src/wasm/WasmJS.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmJS.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmJS.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -49,7 +49,6 @@
 #include "vm/PromiseObject.h"  // js::PromiseObject
 #include "vm/StringType.h"
 #include "vm/Warnings.h"  // js::WarnNumberASCII
-#include "wasm/TypedObject.h"
 #include "wasm/WasmBaselineCompile.h"
 #include "wasm/WasmCompile.h"
 #include "wasm/WasmCraneliftCompile.h"
@@ -156,6 +155,14 @@
          cx->realm()->creationOptions().getSharedMemoryAndAtomicsEnabled();
 }
 
+static inline bool WasmExceptionsFlag(JSContext* cx) {
+#ifdef ENABLE_WASM_EXCEPTIONS
+  return cx->options().wasmExceptions();
+#else
+  return false;
+#endif
+}
+
 static inline bool WasmDebuggerActive(JSContext* cx) {
   if (IsFuzzingIon(cx) || IsFuzzingCranelift(cx)) {
     return false;
@@ -291,6 +298,7 @@
   bool debug = WasmDebuggerActive(cx);
   bool functionReferences = WasmFunctionReferencesFlag(cx);
   bool gc = WasmGcFlag(cx);
+  bool exn = WasmExceptionsFlag(cx);
   if (reason) {
     char sep = 0;
     if (debug && !Append(reason, "debug", &sep)) {
@@ -302,8 +310,11 @@
     if (gc && !Append(reason, "gc", &sep)) {
       return false;
     }
+    if (exn && !Append(reason, "exceptions", &sep)) {
+      return false;
+    }
   }
-  *isDisabled = debug || functionReferences || gc;
+  *isDisabled = debug || functionReferences || gc || exn;
   return true;
 }
 
@@ -318,11 +329,18 @@
 
 bool wasm::CraneliftDisabledByFeatures(JSContext* cx, bool* isDisabled,
                                        JSStringBuilder* reason) {
-  // Cranelift has no debugging support, no gc support, no simd.
+  // Cranelift has no debugging support, no gc support, no simd, and
+  // no exceptions support.
   bool debug = WasmDebuggerActive(cx);
   bool functionReferences = WasmFunctionReferencesFlag(cx);
   bool gc = WasmGcFlag(cx);
-  bool simd = WasmSimdFlag(cx);
+#ifdef JS_CODEGEN_ARM64
+  // Cranelift aarch64 has full SIMD support.
+  bool simdOnNonAarch64 = false;
+#else
+  bool simdOnNonAarch64 = WasmSimdFlag(cx);
+#endif
+  bool exn = WasmExceptionsFlag(cx);
   if (reason) {
     char sep = 0;
     if (debug && !Append(reason, "debug", &sep)) {
@@ -334,11 +352,14 @@
     if (gc && !Append(reason, "gc", &sep)) {
       return false;
     }
-    if (simd && !Append(reason, "simd", &sep)) {
+    if (simdOnNonAarch64 && !Append(reason, "simd", &sep)) {
+      return false;
+    }
+    if (exn && !Append(reason, "exceptions", &sep)) {
       return false;
     }
   }
-  *isDisabled = debug || functionReferences || gc || simd;
+  *isDisabled = debug || functionReferences || gc || simdOnNonAarch64 || exn;
   return true;
 }
 
@@ -375,14 +396,21 @@
 }
 
 bool wasm::SimdAvailable(JSContext* cx) {
-  // Cranelift does not support SIMD.
-  return WasmSimdFlag(cx) && (BaselineAvailable(cx) || IonAvailable(cx));
+  return WasmSimdFlag(cx) &&
+         (BaselineAvailable(cx) || IonAvailable(cx) || CraneliftAvailable(cx));
 }
 
 bool wasm::ThreadsAvailable(JSContext* cx) {
   return WasmThreadsFlag(cx) && AnyCompilerAvailable(cx);
 }
 
+bool wasm::ExceptionsAvailable(JSContext* cx) {
+  // Ion & Cranelift do not support Exceptions (for now).
+  // Exceptions require multi-value.
+  return WasmExceptionsFlag(cx) && MultiValuesAvailable(cx) &&
+         BaselineAvailable(cx);
+}
+
 bool wasm::HasPlatformSupport(JSContext* cx) {
 #if !MOZ_LITTLE_ENDIAN() || defined(JS_CODEGEN_NONE)
   return false;
@@ -413,6 +441,11 @@
     return false;
   }
 
+  // Lazily initialize the global type context
+  if (!cx->wasm().ensureTypeContext(cx)) {
+    return false;
+  }
+
   // Test only whether the compilers are supported on the hardware, not whether
   // they are enabled.
   return BaselinePlatformSupport() || IonPlatformSupport() ||
@@ -482,135 +515,6 @@
   return uint32_t(len);
 }
 
-bool wasm::CheckRefType(JSContext* cx, RefType targetType, HandleValue v,
-                        MutableHandleFunction fnval,
-                        MutableHandleAnyRef refval) {
-  if (!targetType.isNullable() && v.isNull()) {
-    JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                             JSMSG_WASM_BAD_REF_NONNULLABLE_VALUE);
-    return false;
-  }
-  switch (targetType.kind()) {
-    case RefType::Func:
-      if (!CheckFuncRefValue(cx, v, fnval)) {
-        return false;
-      }
-      break;
-    case RefType::Extern:
-      if (!BoxAnyRef(cx, v, refval)) {
-        return false;
-      }
-      break;
-    case RefType::Eq:
-      if (!CheckEqRefValue(cx, v, refval)) {
-        return false;
-      }
-      break;
-    case RefType::TypeIndex:
-      MOZ_CRASH("temporarily unsupported Ref type");
-  }
-  return true;
-}
-
-static bool ToWebAssemblyValue(JSContext* cx, ValType targetType, HandleValue v,
-                               MutableHandleVal val) {
-  switch (targetType.kind()) {
-    case ValType::I32: {
-      int32_t i32;
-      if (!ToInt32(cx, v, &i32)) {
-        return false;
-      }
-      val.set(Val(uint32_t(i32)));
-      return true;
-    }
-    case ValType::F32: {
-      double d;
-      if (!ToNumber(cx, v, &d)) {
-        return false;
-      }
-      val.set(Val(float(d)));
-      return true;
-    }
-    case ValType::F64: {
-      double d;
-      if (!ToNumber(cx, v, &d)) {
-        return false;
-      }
-      val.set(Val(d));
-      return true;
-    }
-    case ValType::I64: {
-      BigInt* bigint = ToBigInt(cx, v);
-      if (!bigint) {
-        return false;
-      }
-      val.set(Val(BigInt::toUint64(bigint)));
-      return true;
-    }
-    case ValType::Ref: {
-      RootedFunction fun(cx);
-      RootedAnyRef any(cx, AnyRef::null());
-      if (!CheckRefType(cx, targetType.refType(), v, &fun, &any)) {
-        return false;
-      }
-      switch (targetType.refTypeKind()) {
-        case RefType::Func:
-          val.set(Val(RefType::func(), FuncRef::fromJSFunction(fun)));
-          return true;
-        case RefType::Eq:
-        case RefType::Extern:
-          val.set(Val(targetType.refType(), any));
-          return true;
-        case RefType::TypeIndex:
-          break;
-      }
-      break;
-    }
-    case ValType::V128: {
-      break;
-    }
-  }
-  MOZ_CRASH("unexpected import value type, caller must guard");
-}
-
-static bool ToJSValue(JSContext* cx, const Val& val, MutableHandleValue out) {
-  switch (val.type().kind()) {
-    case ValType::I32:
-      out.setInt32(val.i32());
-      return true;
-    case ValType::F32:
-      out.setDouble(JS::CanonicalizeNaN(double(val.f32())));
-      return true;
-    case ValType::F64:
-      out.setDouble(JS::CanonicalizeNaN(val.f64()));
-      return true;
-    case ValType::I64: {
-      BigInt* bi = BigInt::createFromInt64(cx, val.i64());
-      if (!bi) {
-        return false;
-      }
-      out.setBigInt(bi);
-      return true;
-    }
-    case ValType::Ref:
-      switch (val.type().refTypeKind()) {
-        case RefType::Func:
-          out.set(UnboxFuncRef(FuncRef::fromAnyRefUnchecked(val.ref())));
-          return true;
-        case RefType::Eq:
-        case RefType::Extern:
-          out.set(UnboxAnyRef(val.ref()));
-          return true;
-        case RefType::TypeIndex:
-          break;
-      }
-      break;
-    case ValType::V128:
-      break;
-  }
-  MOZ_CRASH("unexpected type when translating to a JS value");
-}
-
 // ============================================================================
 // Imports
 
@@ -646,6 +550,10 @@
 
   const Metadata& metadata = module.metadata();
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+  uint32_t eventIndex = 0;
+  const EventDescVector& events = metadata.events;
+#endif
   uint32_t globalIndex = 0;
   const GlobalDescVector& globals = metadata.globals;
   uint32_t tableIndex = 0;
@@ -707,6 +615,33 @@
         imports->memory = &v.toObject().as<WasmMemoryObject>();
         break;
       }
+#ifdef ENABLE_WASM_EXCEPTIONS
+      case DefinitionKind::Event: {
+        const uint32_t index = eventIndex++;
+        if (!v.isObject() || !v.toObject().is<WasmExceptionObject>()) {
+          return ThrowBadImportType(cx, import.field.get(), "Exception");
+        }
+
+        RootedWasmExceptionObject obj(cx,
+                                      &v.toObject().as<WasmExceptionObject>());
+
+        // Checks whether the signature of the imported exception object matches
+        // the signature declared in the exception import's EventDesc.
+        ResultType args = ResultType::Vector(obj->valueTypes());
+        if (args != events[index].type) {
+          JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                                   JSMSG_WASM_BAD_EXN_SIG, import.module.get(),
+                                   import.field.get());
+          return false;
+        }
+
+        if (!imports->exceptionObjs.append(obj)) {
+          ReportOutOfMemory(cx);
+          return false;
+        }
+        break;
+      }
+#endif
       case DefinitionKind::Global: {
         const uint32_t index = globalIndex++;
         const GlobalDesc& global = globals[index];
@@ -733,7 +668,7 @@
             return false;
           }
           imports->globalObjs[index] = obj;
-          obj->val(&val);
+          val = obj->val();
         } else {
           if (IsNumberType(global.type())) {
             if (global.type() == ValType::I64 && !v.isBigInt()) {
@@ -757,13 +692,7 @@
             return false;
           }
 
-          if (global.type() == ValType::V128) {
-            JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                                     JSMSG_WASM_BAD_VAL_TYPE);
-            return false;
-          }
-
-          if (!ToWebAssemblyValue(cx, global.type(), v, &val)) {
+          if (!Val::fromJSValue(cx, global.type(), v, &val)) {
             return false;
           }
         }
@@ -1197,10 +1126,11 @@
   RootedPropertyName kind;
   RootedPropertyName table;
   RootedPropertyName memory;
+  RootedPropertyName event;
   RootedPropertyName signature;
 
   explicit KindNames(JSContext* cx)
-      : kind(cx), table(cx), memory(cx), signature(cx) {}
+      : kind(cx), table(cx), memory(cx), event(cx), signature(cx) {}
 };
 
 static bool InitKindNames(JSContext* cx, KindNames* names) {
@@ -1222,6 +1152,14 @@
   }
   names->memory = memory->asPropertyName();
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+  JSAtom* event = Atomize(cx, "event", strlen("event"));
+  if (!event) {
+    return false;
+  }
+  names->event = event->asPropertyName();
+#endif
+
   JSAtom* signature = Atomize(cx, "signature", strlen("signature"));
   if (!signature) {
     return false;
@@ -1242,6 +1180,10 @@
       return names.memory;
     case DefinitionKind::Global:
       return cx->names().global;
+#ifdef ENABLE_WASM_EXCEPTIONS
+    case DefinitionKind::Event:
+      return names.event;
+#endif
   }
 
   MOZ_CRASH("invalid kind");
@@ -1367,8 +1309,8 @@
       }
     }
 
-    JSObject* obj = ObjectGroup::newPlainObject(cx, props.begin(),
-                                                props.length(), GenericObject);
+    JSObject* obj = NewPlainObjectWithProperties(cx, props.begin(),
+                                                 props.length(), GenericObject);
     if (!obj) {
       return false;
     }
@@ -1437,8 +1379,8 @@
       }
     }
 
-    JSObject* obj = ObjectGroup::newPlainObject(cx, props.begin(),
-                                                props.length(), GenericObject);
+    JSObject* obj = NewPlainObjectWithProperties(cx, props.begin(),
+                                                 props.length(), GenericObject);
     if (!obj) {
       return false;
     }
@@ -1742,11 +1684,28 @@
   return getReservedSlot(INSTANCE_SLOT).isUndefined();
 }
 
+// WeakScopeMap maps from function index to js::Scope. This maps is weak
+// to avoid holding scope objects alive. The scopes are normally created
+// during debugging.
+//
+// This is defined here in order to avoid recursive dependency between
+// WasmJS.h and Scope.h.
+using WasmFunctionScopeMap =
+    JS::WeakCache<GCHashMap<uint32_t, WeakHeapPtr<WasmFunctionScope*>,
+                            DefaultHasher<uint32_t>, ZoneAllocPolicy>>;
+class WasmInstanceObject::UnspecifiedScopeMap {
+ public:
+  WasmFunctionScopeMap& asWasmFunctionScopeMap() {
+    return *(WasmFunctionScopeMap*)this;
+  }
+};
+
 /* static */
 void WasmInstanceObject::finalize(JSFreeOp* fop, JSObject* obj) {
   WasmInstanceObject& instance = obj->as<WasmInstanceObject>();
   fop->delete_(obj, &instance.exports(), MemoryUse::WasmInstanceExports);
-  fop->delete_(obj, &instance.scopes(), MemoryUse::WasmInstanceScopes);
+  fop->delete_(obj, &instance.scopes().asWasmFunctionScopeMap(),
+               MemoryUse::WasmInstanceScopes);
   fop->delete_(obj, &instance.indirectGlobals(),
                MemoryUse::WasmInstanceGlobals);
   if (!instance.isNewborn()) {
@@ -1771,10 +1730,9 @@
 WasmInstanceObject* WasmInstanceObject::create(
     JSContext* cx, SharedCode code, const DataSegmentVector& dataSegments,
     const ElemSegmentVector& elemSegments, UniqueTlsData tlsData,
-    HandleWasmMemoryObject memory, SharedTableVector&& tables,
-    StructTypeDescrVector&& structTypeDescrs,
-    const JSFunctionVector& funcImports, const GlobalDescVector& globals,
-    const ValVector& globalImportValues,
+    HandleWasmMemoryObject memory, SharedExceptionTagVector&& exceptionTags,
+    SharedTableVector&& tables, const JSFunctionVector& funcImports,
+    const GlobalDescVector& globals, const ValVector& globalImportValues,
     const WasmGlobalObjectVector& globalObjs, HandleObject proto,
     UniqueDebugState maybeDebug) {
   UniquePtr<ExportMap> exports = js::MakeUnique<ExportMap>(cx->zone());
@@ -1783,7 +1741,8 @@
     return nullptr;
   }
 
-  UniquePtr<ScopeMap> scopes = js::MakeUnique<ScopeMap>(cx->zone(), cx->zone());
+  UniquePtr<WasmFunctionScopeMap> scopes =
+      js::MakeUnique<WasmFunctionScopeMap>(cx->zone(), cx->zone());
   if (!scopes) {
     ReportOutOfMemory(cx);
     return nullptr;
@@ -1845,9 +1804,9 @@
     MOZ_ASSERT(obj->isNewborn());
 
     // Root the Instance via WasmInstanceObject before any possible GC.
-    instance = cx->new_<Instance>(
-        cx, obj, code, std::move(tlsData), memory, std::move(tables),
-        std::move(structTypeDescrs), std::move(maybeDebug));
+    instance = cx->new_<Instance>(cx, obj, code, std::move(tlsData), memory,
+                                  std::move(exceptionTags), std::move(tables),
+                                  std::move(maybeDebug));
     if (!instance) {
       return nullptr;
     }
@@ -1946,8 +1905,8 @@
   return *(ExportMap*)getReservedSlot(EXPORTS_SLOT).toPrivate();
 }
 
-WasmInstanceObject::ScopeMap& WasmInstanceObject::scopes() const {
-  return *(ScopeMap*)getReservedSlot(SCOPES_SLOT).toPrivate();
+WasmInstanceObject::UnspecifiedScopeMap& WasmInstanceObject::scopes() const {
+  return *(UnspecifiedScopeMap*)(getReservedSlot(SCOPES_SLOT).toPrivate());
 }
 
 WasmInstanceObject::GlobalObjectVector& WasmInstanceObject::indirectGlobals()
@@ -1987,7 +1946,7 @@
     }
     fun.set(NewNativeConstructor(cx, WasmCall, numArgs, name,
                                  gc::AllocKind::FUNCTION_EXTENDED,
-                                 SingletonObject, FunctionFlags::ASMJS_CTOR));
+                                 TenuredObject, FunctionFlags::ASMJS_CTOR));
     if (!fun) {
       return false;
     }
@@ -2001,7 +1960,7 @@
     }
 
     fun.set(NewNativeFunction(cx, WasmCall, numArgs, name,
-                              gc::AllocKind::FUNCTION_EXTENDED, SingletonObject,
+                              gc::AllocKind::FUNCTION_EXTENDED, TenuredObject,
                               FunctionFlags::WASM));
     if (!fun) {
       return false;
@@ -2069,7 +2028,8 @@
 /* static */
 WasmFunctionScope* WasmInstanceObject::getFunctionScope(
     JSContext* cx, HandleWasmInstanceObject instanceObj, uint32_t funcIndex) {
-  if (ScopeMap::Ptr p = instanceObj->scopes().lookup(funcIndex)) {
+  if (auto p =
+          instanceObj->scopes().asWasmFunctionScopeMap().lookup(funcIndex)) {
     return p->value();
   }
 
@@ -2085,7 +2045,8 @@
     return nullptr;
   }
 
-  if (!instanceObj->scopes().putNew(funcIndex, funcScope)) {
+  if (!instanceObj->scopes().asWasmFunctionScopeMap().putNew(funcIndex,
+                                                             funcScope)) {
     ReportOutOfMemory(cx);
     return nullptr;
   }
@@ -2097,49 +2058,6 @@
   return fun->kind() == FunctionFlags::Wasm;
 }
 
-bool wasm::CheckFuncRefValue(JSContext* cx, HandleValue v,
-                             MutableHandleFunction fun) {
-  if (v.isNull()) {
-    MOZ_ASSERT(!fun);
-    return true;
-  }
-
-  if (v.isObject()) {
-    JSObject& obj = v.toObject();
-    if (obj.is<JSFunction>()) {
-      JSFunction* f = &obj.as<JSFunction>();
-      if (IsWasmExportedFunction(f)) {
-        fun.set(f);
-        return true;
-      }
-    }
-  }
-
-  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                           JSMSG_WASM_BAD_FUNCREF_VALUE);
-  return false;
-}
-
-bool wasm::CheckEqRefValue(JSContext* cx, HandleValue v,
-                           MutableHandleAnyRef vp) {
-  if (v.isNull()) {
-    vp.set(AnyRef::null());
-    return true;
-  }
-
-  if (v.isObject()) {
-    JSObject& obj = v.toObject();
-    if (obj.is<TypedObject>()) {
-      vp.set(AnyRef::fromJSObject(&obj.as<TypedObject>()));
-      return true;
-    }
-  }
-
-  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                           JSMSG_WASM_BAD_EQREF_VALUE);
-  return false;
-}
-
 Instance& wasm::ExportedFunctionToInstance(JSFunction* fun) {
   return ExportedFunctionToInstanceObject(fun)->instance();
 }
@@ -2319,9 +2237,6 @@
 }
 
 const JSPropertySpec WasmMemoryObject::properties[] = {
-#ifdef ENABLE_WASM_TYPE_REFLECTIONS
-    JS_PSG("type", WasmMemoryObject::typeGetter, JSPROP_ENUMERATE),
-#endif
     JS_PSG("buffer", WasmMemoryObject::bufferGetter, JSPROP_ENUMERATE),
     JS_STRING_SYM_PS(toStringTag, "WebAssembly.Memory", JSPROP_READONLY),
     JS_PS_END};
@@ -2359,6 +2274,9 @@
 }
 
 const JSFunctionSpec WasmMemoryObject::methods[] = {
+#ifdef ENABLE_WASM_TYPE_REFLECTIONS
+    JS_FN("type", WasmMemoryObject::type, 0, JSPROP_ENUMERATE),
+#endif
     JS_FN("grow", WasmMemoryObject::grow, 1, JSPROP_ENUMERATE), JS_FS_END};
 
 const JSFunctionSpec WasmMemoryObject::static_methods[] = {JS_FS_END};
@@ -2375,7 +2293,7 @@
 }
 
 #ifdef ENABLE_WASM_TYPE_REFLECTIONS
-bool WasmMemoryObject::typeGetterImpl(JSContext* cx, const CallArgs& args) {
+bool WasmMemoryObject::typeImpl(JSContext* cx, const CallArgs& args) {
   RootedWasmMemoryObject memoryObj(
       cx, &args.thisv().toObject().as<WasmMemoryObject>());
   Rooted<IdValueVector> props(cx, IdValueVector(cx));
@@ -2401,7 +2319,7 @@
     return false;
   }
 
-  JSObject* memoryType = ObjectGroup::newPlainObject(
+  JSObject* memoryType = NewPlainObjectWithProperties(
       cx, props.begin(), props.length(), GenericObject);
   if (!memoryType) {
     return false;
@@ -2410,9 +2328,9 @@
   return true;
 }
 
-bool WasmMemoryObject::typeGetter(JSContext* cx, unsigned argc, Value* vp) {
+bool WasmMemoryObject::type(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsMemory, typeGetterImpl>(cx, args);
+  return CallNonGenericMethod<IsMemory, typeImpl>(cx, args);
 }
 #endif
 
@@ -2820,9 +2738,6 @@
 }
 
 const JSPropertySpec WasmTableObject::properties[] = {
-#ifdef ENABLE_WASM_TYPE_REFLECTIONS
-    JS_PSG("type", WasmTableObject::typeGetter, JSPROP_ENUMERATE),
-#endif
     JS_PSG("length", WasmTableObject::lengthGetter, JSPROP_ENUMERATE),
     JS_STRING_SYM_PS(toStringTag, "WebAssembly.Table", JSPROP_READONLY),
     JS_PS_END};
@@ -2844,7 +2759,7 @@
 
 #ifdef ENABLE_WASM_TYPE_REFLECTIONS
 /* static */
-bool WasmTableObject::typeGetterImpl(JSContext* cx, const CallArgs& args) {
+bool WasmTableObject::typeImpl(JSContext* cx, const CallArgs& args) {
   Rooted<IdValueVector> props(cx, IdValueVector(cx));
   Table& table = args.thisv().toObject().as<WasmTableObject>().table();
 
@@ -2880,7 +2795,7 @@
     return false;
   }
 
-  JSObject* tableType = ObjectGroup::newPlainObject(
+  JSObject* tableType = NewPlainObjectWithProperties(
       cx, props.begin(), props.length(), GenericObject);
   if (!tableType) {
     return false;
@@ -2890,9 +2805,9 @@
 }
 
 /* static */
-bool WasmTableObject::typeGetter(JSContext* cx, unsigned argc, Value* vp) {
+bool WasmTableObject::type(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsTable, typeGetterImpl>(cx, args);
+  return CallNonGenericMethod<IsTable, typeImpl>(cx, args);
 }
 #endif
 
@@ -3058,6 +2973,9 @@
 }
 
 const JSFunctionSpec WasmTableObject::methods[] = {
+#ifdef ENABLE_WASM_TYPE_REFLECTIONS
+    JS_FN("type", WasmTableObject::type, 0, JSPROP_ENUMERATE),
+#endif
     JS_FN("get", WasmTableObject::get, 1, JSPROP_ENUMERATE),
     JS_FN("set", WasmTableObject::set, 2, JSPROP_ENUMERATE),
     JS_FN("grow", WasmTableObject::grow, 1, JSPROP_ENUMERATE), JS_FS_END};
@@ -3114,39 +3032,14 @@
     // there's nothing to trace yet.
     return;
   }
-  switch (global->type().kind()) {
-    case ValType::I32:
-    case ValType::F32:
-    case ValType::I64:
-    case ValType::F64:
-    case ValType::V128:
-      break;
-    case ValType::Ref:
-      switch (global->type().refTypeKind()) {
-        case RefType::Func:
-        case RefType::Extern:
-        case RefType::Eq:
-          if (!global->cell()->ref.isNull()) {
-            // TODO/AnyRef-boxing: With boxed immediates and strings, the write
-            // barrier is going to have to be more complicated.
-            ASSERT_ANYREF_IS_JSOBJECT;
-            TraceManuallyBarrieredEdge(trc,
-                                       global->cell()->ref.asJSObjectAddress(),
-                                       "wasm reference-typed global");
-          }
-          break;
-        case RefType::TypeIndex:
-          MOZ_CRASH("Ref NYI");
-      }
-      break;
-  }
+  global->val().get().trace(trc);
 }
 
 /* static */
 void WasmGlobalObject::finalize(JSFreeOp* fop, JSObject* obj) {
   WasmGlobalObject* global = reinterpret_cast<WasmGlobalObject*>(obj);
   if (!global->isNewborn()) {
-    fop->delete_(obj, global->cell(), MemoryUse::WasmGlobalCell);
+    fop->delete_(obj, &global->val(), MemoryUse::WasmGlobalCell);
   }
 }
 
@@ -3163,56 +3056,17 @@
   MOZ_ASSERT(obj->isNewborn());
   MOZ_ASSERT(obj->isTenured(), "assumed by global.set post barriers");
 
-  // It's simpler to initialize the cell after the object has been created,
-  // to avoid needing to root the cell before the object creation.
-
-  Cell* cell = js_new<Cell>();
-  if (!cell) {
+  GCPtrVal* val = js_new<GCPtrVal>(Val(hval.get().type()));
+  if (!val) {
     ReportOutOfMemory(cx);
     return nullptr;
   }
-
-  const Val& val = hval.get();
-  switch (val.type().kind()) {
-    case ValType::I32:
-      cell->i32 = val.i32();
-      break;
-    case ValType::I64:
-      cell->i64 = val.i64();
-      break;
-    case ValType::F32:
-      cell->f32 = val.f32();
-      break;
-    case ValType::F64:
-      cell->f64 = val.f64();
-      break;
-    case ValType::Ref:
-      switch (val.type().refTypeKind()) {
-        case RefType::Func:
-        case RefType::Extern:
-        case RefType::Eq:
-          MOZ_ASSERT(cell->ref.isNull(), "no prebarriers needed");
-          cell->ref = val.ref();
-          if (!cell->ref.isNull()) {
-            // TODO/AnyRef-boxing: With boxed immediates and strings, the write
-            // barrier is going to have to be more complicated.
-            ASSERT_ANYREF_IS_JSOBJECT;
-            JSObject::postWriteBarrier(cell->ref.asJSObjectAddress(), nullptr,
-                                       cell->ref.asJSObject());
-          }
-          break;
-        case RefType::TypeIndex:
-          MOZ_CRASH("Ref NYI");
-      }
-      break;
-    case ValType::V128:
-      cell->v128 = val.v128();
-      break;
-  }
-  obj->initReservedSlot(TYPE_SLOT,
-                        Int32Value(int32_t(val.type().bitsUnsafe())));
   obj->initReservedSlot(MUTABLE_SLOT, JS::BooleanValue(isMutable));
-  InitReservedSlot(obj, CELL_SLOT, cell, MemoryUse::WasmGlobalCell);
+  InitReservedSlot(obj, VAL_SLOT, val, MemoryUse::WasmGlobalCell);
+
+  // It's simpler to initialize the cell after the object has been created,
+  // to avoid needing to root the cell before the object creation.
+  obj->val() = hval.get();
 
   MOZ_ASSERT(!obj->isNewborn());
 
@@ -3296,52 +3150,13 @@
   bool isMutable = ToBoolean(mutableVal);
 
   // Extract the initial value, or provide a suitable default.
-  RootedVal globalVal(cx);
-
-  // Initialize with default value.
-  switch (globalType.kind()) {
-    case ValType::I32:
-      globalVal = Val(uint32_t(0));
-      break;
-    case ValType::I64:
-      globalVal = Val(uint64_t(0));
-      break;
-    case ValType::F32:
-      globalVal = Val(float(0.0));
-      break;
-    case ValType::F64:
-      globalVal = Val(double(0.0));
-      break;
-    case ValType::V128:
-      globalVal = Val(V128());
-      break;
-    case ValType::Ref:
-      switch (globalType.refTypeKind()) {
-        case RefType::Func:
-          globalVal = Val(RefType::func(), AnyRef::null());
-          break;
-        case RefType::Extern:
-          globalVal = Val(RefType::extern_(), AnyRef::null());
-          break;
-        case RefType::Eq:
-          globalVal = Val(RefType::eq(), AnyRef::null());
-          break;
-        case RefType::TypeIndex:
-          MOZ_CRASH("Ref NYI");
-      }
-      break;
-  }
+  RootedVal globalVal(cx, globalType);
 
   // Override with non-undefined value, if provided.
   RootedValue valueVal(cx, args.get(1));
   if (!valueVal.isUndefined() ||
       (args.length() >= 2 && globalType.isReference())) {
-    if (globalType == ValType::V128) {
-      JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                               JSMSG_WASM_BAD_VAL_TYPE);
-      return false;
-    }
-    if (!ToWebAssemblyValue(cx, globalType, valueVal, &globalVal)) {
+    if (!Val::fromJSValue(cx, globalType, valueVal, &globalVal)) {
       return false;
     }
   }
@@ -3371,31 +3186,14 @@
 
 /* static */
 bool WasmGlobalObject::valueGetterImpl(JSContext* cx, const CallArgs& args) {
-  switch (args.thisv().toObject().as<WasmGlobalObject>().type().kind()) {
-    case ValType::I32:
-    case ValType::I64:
-    case ValType::F32:
-    case ValType::F64:
-      args.thisv().toObject().as<WasmGlobalObject>().value(cx, args.rval());
-      return true;
-    case ValType::V128:
-      JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                               JSMSG_WASM_BAD_VAL_TYPE);
-      return false;
-    case ValType::Ref:
-      switch (
-          args.thisv().toObject().as<WasmGlobalObject>().type().refTypeKind()) {
-        case RefType::Func:
-        case RefType::Extern:
-        case RefType::Eq:
-          args.thisv().toObject().as<WasmGlobalObject>().value(cx, args.rval());
-          return true;
-        case RefType::TypeIndex:
-          MOZ_CRASH("Ref NYI");
-      }
-      break;
+  const WasmGlobalObject& globalObj =
+      args.thisv().toObject().as<WasmGlobalObject>();
+  if (!globalObj.type().isExposable()) {
+    JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                             JSMSG_WASM_BAD_VAL_TYPE);
+    return false;
   }
-  MOZ_CRASH();
+  return globalObj.val().get().toJSValue(cx, args.rval());
 }
 
 /* static */
@@ -3418,17 +3216,11 @@
     return false;
   }
 
-  if (global->type() == ValType::V128) {
-    JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
-                             JSMSG_WASM_BAD_VAL_TYPE);
-    return false;
-  }
-
   RootedVal val(cx);
-  if (!ToWebAssemblyValue(cx, global->type(), args.get(0), &val)) {
+  if (!Val::fromJSValue(cx, global->type(), args.get(0), &val)) {
     return false;
   }
-  global->setVal(cx, val);
+  global->val() = val.get();
 
   args.rval().setUndefined();
   return true;
@@ -3441,77 +3233,33 @@
 }
 
 const JSPropertySpec WasmGlobalObject::properties[] = {
-#ifdef ENABLE_WASM_TYPE_REFLECTIONS
-    JS_PSG("type", WasmGlobalObject::typeGetter, JSPROP_ENUMERATE),
-#endif
     JS_PSGS("value", WasmGlobalObject::valueGetter,
             WasmGlobalObject::valueSetter, JSPROP_ENUMERATE),
     JS_STRING_SYM_PS(toStringTag, "WebAssembly.Global", JSPROP_READONLY),
     JS_PS_END};
 
 const JSFunctionSpec WasmGlobalObject::methods[] = {
+#ifdef ENABLE_WASM_TYPE_REFLECTIONS
+    JS_FN("type", WasmGlobalObject::type, 0, JSPROP_ENUMERATE),
+#endif
     JS_FN(js_valueOf_str, WasmGlobalObject::valueGetter, 0, JSPROP_ENUMERATE),
     JS_FS_END};
 
 const JSFunctionSpec WasmGlobalObject::static_methods[] = {JS_FS_END};
 
-ValType WasmGlobalObject::type() const {
-  return ValType::fromBitsUnsafe(getReservedSlot(TYPE_SLOT).toInt32());
-}
-
 bool WasmGlobalObject::isMutable() const {
   return getReservedSlot(MUTABLE_SLOT).toBoolean();
 }
 
-void WasmGlobalObject::setVal(JSContext* cx, wasm::HandleVal hval) {
-  const Val& val = hval.get();
-  Cell* cell = this->cell();
-  MOZ_ASSERT(type() == val.type());
-  switch (type().kind()) {
-    case ValType::I32:
-      cell->i32 = val.i32();
-      break;
-    case ValType::F32:
-      cell->f32 = val.f32();
-      break;
-    case ValType::F64:
-      cell->f64 = val.f64();
-      break;
-    case ValType::I64:
-      cell->i64 = val.i64();
-      break;
-    case ValType::V128:
-      cell->v128 = val.v128();
-      break;
-    case ValType::Ref:
-      switch (this->type().refTypeKind()) {
-        case RefType::Func:
-        case RefType::Extern:
-        case RefType::Eq: {
-          AnyRef prevPtr = cell->ref;
-          // TODO/AnyRef-boxing: With boxed immediates and strings, the write
-          // barrier is going to have to be more complicated.
-          ASSERT_ANYREF_IS_JSOBJECT;
-          gc::PreWriteBarrier(prevPtr.asJSObject());
-          cell->ref = val.ref();
-          if (!cell->ref.isNull()) {
-            JSObject::postWriteBarrier(cell->ref.asJSObjectAddress(),
-                                       prevPtr.asJSObject(),
-                                       cell->ref.asJSObject());
-          }
-          break;
-        }
-        case RefType::TypeIndex: {
-          MOZ_CRASH("Ref NYI");
-        }
-      }
-      break;
-  }
+ValType WasmGlobalObject::type() const { return val().get().type(); }
+
+GCPtrVal& WasmGlobalObject::val() const {
+  return *reinterpret_cast<GCPtrVal*>(getReservedSlot(VAL_SLOT).toPrivate());
 }
 
 #ifdef ENABLE_WASM_TYPE_REFLECTIONS
 /* static */
-bool WasmGlobalObject::typeGetterImpl(JSContext* cx, const CallArgs& args) {
+bool WasmGlobalObject::typeImpl(JSContext* cx, const CallArgs& args) {
   RootedWasmGlobalObject global(
       cx, &args.thisv().toObject().as<WasmGlobalObject>());
   Rooted<IdValueVector> props(cx, IdValueVector(cx));
@@ -3530,7 +3278,7 @@
     return false;
   }
 
-  JSObject* globalType = ObjectGroup::newPlainObject(
+  JSObject* globalType = NewPlainObjectWithProperties(
       cx, props.begin(), props.length(), GenericObject);
   if (!globalType) {
     return false;
@@ -3540,57 +3288,127 @@
 }
 
 /* static */
-bool WasmGlobalObject::typeGetter(JSContext* cx, unsigned argc, Value* vp) {
+bool WasmGlobalObject::type(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsGlobal, typeGetterImpl>(cx, args);
+  return CallNonGenericMethod<IsGlobal, typeImpl>(cx, args);
 }
 #endif
 
-void WasmGlobalObject::val(MutableHandleVal outval) const {
-  Cell* cell = this->cell();
-  switch (type().kind()) {
-    case ValType::I32:
-      outval.set(Val(uint32_t(cell->i32)));
-      return;
-    case ValType::I64:
-      outval.set(Val(uint64_t(cell->i64)));
-      return;
-    case ValType::V128:
-      outval.set(Val(cell->v128));
-      return;
-    case ValType::F32:
-      outval.set(Val(cell->f32));
-      return;
-    case ValType::F64:
-      outval.set(Val(cell->f64));
-      return;
-    case ValType::Ref:
-      switch (type().refTypeKind()) {
-        case RefType::Func:
-          outval.set(Val(RefType::func(), cell->ref));
-          return;
-        case RefType::Extern:
-          outval.set(Val(RefType::extern_(), cell->ref));
-          return;
-        case RefType::Eq:
-          outval.set(Val(RefType::eq(), cell->ref));
-          return;
-        case RefType::TypeIndex:
-          MOZ_CRASH("Ref NYI");
-      }
-      break;
+// ============================================================================
+// WebAssembly.Exception class and methods
+
+const JSClassOps WasmExceptionObject::classOps_ = {
+    nullptr,                        // addProperty
+    nullptr,                        // delProperty
+    nullptr,                        // enumerate
+    nullptr,                        // newEnumerate
+    nullptr,                        // resolve
+    nullptr,                        // mayResolve
+    WasmExceptionObject::finalize,  // finalize
+    nullptr,                        // call
+    nullptr,                        // hasInstance
+    nullptr,                        // construct
+    nullptr,                        // trace
+};
+
+const JSClass WasmExceptionObject::class_ = {
+    "WebAssembly.Exception",
+    JSCLASS_HAS_RESERVED_SLOTS(WasmExceptionObject::RESERVED_SLOTS) |
+        JSCLASS_FOREGROUND_FINALIZE,
+    &WasmExceptionObject::classOps_, &WasmExceptionObject::classSpec_};
+
+const JSClass& WasmExceptionObject::protoClass_ = PlainObject::class_;
+
+static constexpr char WasmExceptionName[] = "Exception";
+
+const ClassSpec WasmExceptionObject::classSpec_ = {
+    CreateWasmConstructor<WasmExceptionObject, WasmExceptionName>,
+    GenericCreatePrototype<WasmExceptionObject>,
+    WasmExceptionObject::static_methods,
+    nullptr,
+    WasmExceptionObject::methods,
+    WasmExceptionObject::properties,
+    nullptr,
+    ClassSpec::DontDefineConstructor};
+
+/* static */
+void WasmExceptionObject::finalize(JSFreeOp* fop, JSObject* obj) {
+  WasmExceptionObject& exnObj = obj->as<WasmExceptionObject>();
+  if (!exnObj.isNewborn()) {
+    fop->release(obj, &exnObj.tag(), MemoryUse::WasmExceptionTag);
+    fop->delete_(obj, &exnObj.valueTypes(), MemoryUse::WasmExceptionType);
+  }
+}
+
+bool WasmExceptionObject::construct(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+
+  if (!ThrowIfNotConstructing(cx, args, "Exception")) {
+    return false;
+  }
+
+  // FIXME: The JS API is not finalized and may specify a different behavior
+  // here.
+  //        For now, we implement the same behavior as V8 and error when called.
+  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                           JSMSG_WASM_EXN_CONSTRUCTOR);
+
+  return false;
+}
+
+/* static */
+WasmExceptionObject* WasmExceptionObject::create(JSContext* cx, ResultType type,
+                                                 HandleObject proto) {
+  AutoSetNewObjectMetadata metadata(cx);
+  RootedWasmExceptionObject obj(
+      cx, NewObjectWithGivenProto<WasmExceptionObject>(cx, proto));
+  if (!obj) {
+    return nullptr;
+  }
+
+  MOZ_ASSERT(obj->isNewborn());
+
+  SharedExceptionTag tag = SharedExceptionTag(cx->new_<ExceptionTag>());
+  if (!tag) {
+    ReportOutOfMemory(cx);
+    return nullptr;
   }
-  MOZ_CRASH("unexpected Global type");
+
+  InitReservedSlot(obj, TAG_SLOT, tag.forget().take(),
+                   MemoryUse::WasmExceptionTag);
+
+  wasm::ValTypeVector* newValueTypes = js_new<ValTypeVector>();
+  for (uint32_t i = 0; i < type.length(); i++) {
+    if (!newValueTypes->append(type[i])) {
+      return nullptr;
+    }
+  }
+  InitReservedSlot(obj, TYPE_SLOT, newValueTypes, MemoryUse::WasmExceptionType);
+
+  MOZ_ASSERT(!obj->isNewborn());
+
+  return obj;
 }
 
-bool WasmGlobalObject::value(JSContext* cx, MutableHandleValue out) {
-  RootedVal result(cx);
-  val(&result);
-  return ToJSValue(cx, result.get(), out);
+bool WasmExceptionObject::isNewborn() const {
+  MOZ_ASSERT(is<WasmExceptionObject>());
+  return getReservedSlot(TYPE_SLOT).isUndefined();
 }
 
-WasmGlobalObject::Cell* WasmGlobalObject::cell() const {
-  return reinterpret_cast<Cell*>(getReservedSlot(CELL_SLOT).toPrivate());
+const JSPropertySpec WasmExceptionObject::properties[] = {
+    JS_STRING_SYM_PS(toStringTag, "WebAssembly.Exception", JSPROP_READONLY),
+    JS_PS_END};
+
+const JSFunctionSpec WasmExceptionObject::methods[] = {JS_FS_END};
+
+const JSFunctionSpec WasmExceptionObject::static_methods[] = {JS_FS_END};
+
+wasm::ValTypeVector& WasmExceptionObject::valueTypes() const {
+  return *(ValTypeVector*)getFixedSlot(TYPE_SLOT).toPrivate();
+};
+
+ExceptionTag& WasmExceptionObject::tag() const {
+  return *(ExceptionTag*)getReservedSlot(TAG_SLOT).toPrivate();
 }
 
 // ============================================================================
@@ -4551,8 +4369,8 @@
   if (!proto) {
     return nullptr;
   }
-  return NewSingletonObjectWithGivenProto(cx, &WasmNamespaceObject::class_,
-                                          proto);
+  return NewTenuredObjectWithGivenProto(cx, &WasmNamespaceObject::class_,
+                                        proto);
 }
 
 static bool WebAssemblyClassFinish(JSContext* cx, HandleObject object,
@@ -4570,6 +4388,9 @@
       {"Memory", JSProto_WasmMemory},
       {"Table", JSProto_WasmTable},
       {"Global", JSProto_WasmGlobal},
+#ifdef ENABLE_WASM_EXCEPTIONS
+      {"Exception", JSProto_WasmException},
+#endif
       {"CompileError", GetExceptionProtoKey(JSEXN_WASMCOMPILEERROR)},
       {"LinkError", GetExceptionProtoKey(JSEXN_WASMLINKERROR)},
       {"RuntimeError", GetExceptionProtoKey(JSEXN_WASMRUNTIMEERROR)},
@@ -4598,10 +4419,6 @@
     }
   }
 
-  if (GcTypesAvailable(cx) && !InitTypedObjectSlots(cx, wasm)) {
-    return false;
-  }
-
   return true;
 }
 
@@ -4614,7 +4431,5 @@
                                                WebAssemblyClassFinish};
 
 const JSClass js::WasmNamespaceObject::class_ = {
-    js_WebAssembly_str,
-    JSCLASS_HAS_RESERVED_SLOTS(SlotCount) |
-        JSCLASS_HAS_CACHED_PROTO(JSProto_WebAssembly),
+    js_WebAssembly_str, JSCLASS_HAS_CACHED_PROTO(JSProto_WebAssembly),
     JS_NULL_CLASS_OPS, &WebAssemblyClassSpec};
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmJS.h firefox-85.0+build1/js/src/wasm/WasmJS.h
--- firefox-84.0.2+build1/js/src/wasm/WasmJS.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmJS.h	2021-01-18 19:58:16.000000000 +0000
@@ -19,10 +19,36 @@
 #ifndef wasm_js_h
 #define wasm_js_h
 
-#include "gc/Policy.h"
-#include "gc/ZoneAllocator.h"
-#include "vm/NativeObject.h"
-#include "wasm/WasmTypes.h"
+#include "mozilla/Attributes.h"  // MOZ_MUST_USE
+#include "mozilla/HashTable.h"   // DefaultHasher
+#include "mozilla/Maybe.h"       // mozilla::Maybe
+
+#include <stdint.h>  // int32_t, int64_t, uint32_t
+
+#include "gc/Barrier.h"        // HeapPtr
+#include "gc/ZoneAllocator.h"  // ZoneAllocPolicy
+#include "js/AllocPolicy.h"    // SystemAllocPolicy
+#include "js/Class.h"          // JSClassOps, ClassSpec
+#include "js/GCHashTable.h"    // GCHashMap, GCHashSet
+#include "js/GCVector.h"       // GCVector
+#include "js/PropertySpec.h"   // JSPropertySpec, JSFunctionSpec
+#include "js/RootingAPI.h"     // MovableCellHasher
+#include "js/SweepingAPI.h"    // JS::WeakCache
+#include "js/TypeDecls.h"  // HandleValue, HandleObject, MutableHandleObject, MutableHandleFunction
+#include "js/Vector.h"        // JS::Vector
+#include "vm/JSFunction.h"    // JSFunction
+#include "vm/NativeObject.h"  // NativeObject
+#include "wasm/WasmTypes.h"   // MutableHandleWasmInstanceObject, wasm::*
+
+class JSFreeOp;
+class JSObject;
+class JSTracer;
+struct JSContext;
+
+namespace JS {
+class CallArgs;
+class Value;
+}  // namespace JS
 
 namespace js {
 
@@ -39,6 +65,8 @@
 
 namespace wasm {
 
+struct ImportValues;
+
 // Return whether WebAssembly can in principle be compiled on this platform (ie
 // combination of hardware and OS), assuming at least one of the compilers that
 // supports the platform is not disabled by other settings.
@@ -129,6 +157,10 @@
 void ReportSimdAnalysis(const char* data);
 #endif
 
+// Returns true if WebAssembly as configured by compile-time flags and run-time
+// options can support try/catch, throw, rethrow, and branch_on_exn (evolving).
+bool ExceptionsAvailable(JSContext* cx);
+
 // Compiles the given binary wasm module given the ArrayBufferObject
 // and links the module's imports with the given import object.
 
@@ -164,10 +196,6 @@
 // can be used for both wasm and asm.js, however.
 
 bool IsWasmExportedFunction(JSFunction* fun);
-MOZ_MUST_USE bool CheckFuncRefValue(JSContext* cx, HandleValue v,
-                                    MutableHandleFunction fun);
-MOZ_MUST_USE bool CheckEqRefValue(JSContext* cx, HandleValue v,
-                                  MutableHandleAnyRef vp);
 
 Instance& ExportedFunctionToInstance(JSFunction* fun);
 WasmInstanceObject* ExportedFunctionToInstanceObject(JSFunction* fun);
@@ -175,17 +203,6 @@
 
 bool IsSharedWasmMemoryObject(JSObject* obj);
 
-// Check a value against the given reference type.  If the targetType
-// is RefType::Extern then the test always passes, but the value may be boxed.
-// If the test passes then the value is stored either in fnval (for
-// RefType::Func) or in refval (for other types); this split is not strictly
-// necessary but is convenient for the users of this function.
-//
-// This can return false if the type check fails, or if a boxing into AnyRef
-// throws an OOM.
-MOZ_MUST_USE bool CheckRefType(JSContext* cx, RefType targetType, HandleValue v,
-                               MutableHandleFunction fnval,
-                               MutableHandleAnyRef refval);
 
 // Abstractions that clarify that we are working on a 32-bit memory and check
 // that the buffer length does not exceed that's memory's fixed limits.
@@ -239,17 +256,16 @@
 STATIC_ASSERT_ANYREF_IS_JSOBJECT;
 
 class WasmGlobalObject : public NativeObject {
-  static const unsigned TYPE_SLOT = 0;
-  static const unsigned MUTABLE_SLOT = 1;
-  static const unsigned CELL_SLOT = 2;
+  static const unsigned MUTABLE_SLOT = 0;
+  static const unsigned VAL_SLOT = 1;
 
   static const JSClassOps classOps_;
   static const ClassSpec classSpec_;
   static void finalize(JSFreeOp*, JSObject* obj);
   static void trace(JSTracer* trc, JSObject* obj);
 
-  static bool typeGetterImpl(JSContext* cx, const CallArgs& args);
-  static bool typeGetter(JSContext* cx, unsigned argc, Value* vp);
+  static bool typeImpl(JSContext* cx, const CallArgs& args);
+  static bool type(JSContext* cx, unsigned argc, Value* vp);
 
   static bool valueGetterImpl(JSContext* cx, const CallArgs& args);
   static bool valueGetter(JSContext* cx, unsigned argc, Value* vp);
@@ -257,20 +273,7 @@
   static bool valueSetter(JSContext* cx, unsigned argc, Value* vp);
 
  public:
-  // For exposed globals the Cell holds the value of the global; the
-  // instance's global area holds a pointer to the Cell.
-  union Cell {
-    int32_t i32;
-    int64_t i64;
-    float f32;
-    double f64;
-    wasm::V128 v128;
-    wasm::AnyRef ref;
-    Cell() : v128() {}
-    ~Cell() = default;
-  };
-
-  static const unsigned RESERVED_SLOTS = 3;
+  static const unsigned RESERVED_SLOTS = 2;
   static const JSClass class_;
   static const JSClass& protoClass_;
   static const JSPropertySpec properties[];
@@ -280,14 +283,11 @@
 
   static WasmGlobalObject* create(JSContext* cx, wasm::HandleVal value,
                                   bool isMutable, HandleObject proto);
-  bool isNewborn() { return getReservedSlot(CELL_SLOT).isUndefined(); }
+  bool isNewborn() { return getReservedSlot(VAL_SLOT).isUndefined(); }
 
-  wasm::ValType type() const;
-  void setVal(JSContext* cx, wasm::HandleVal value);
-  void val(wasm::MutableHandleVal outval) const;
   bool isMutable() const;
-  bool value(JSContext* cx, MutableHandleValue out);
-  Cell* cell() const;
+  wasm::ValType type() const;
+  wasm::GCPtrVal& val() const;
 };
 
 // The class of WebAssembly.Instance. Each WasmInstanceObject owns a
@@ -318,13 +318,9 @@
                               DefaultHasher<uint32_t>, ZoneAllocPolicy>;
   ExportMap& exports() const;
 
-  // WeakScopeMap maps from function index to js::Scope. This maps is weak
-  // to avoid holding scope objects alive. The scopes are normally created
-  // during debugging.
-  using ScopeMap =
-      JS::WeakCache<GCHashMap<uint32_t, WeakHeapPtr<WasmFunctionScope*>,
-                              DefaultHasher<uint32_t>, ZoneAllocPolicy>>;
-  ScopeMap& scopes() const;
+  // See the definition inside WasmJS.cpp.
+  class UnspecifiedScopeMap;
+  UnspecifiedScopeMap& scopes() const;
 
  public:
   static const unsigned RESERVED_SLOTS = 6;
@@ -340,9 +336,8 @@
       const wasm::DataSegmentVector& dataSegments,
       const wasm::ElemSegmentVector& elemSegments, wasm::UniqueTlsData tlsData,
       HandleWasmMemoryObject memory,
+      Vector<RefPtr<wasm::ExceptionTag>, 0, SystemAllocPolicy>&& exceptionTags,
       Vector<RefPtr<wasm::Table>, 0, SystemAllocPolicy>&& tables,
-      GCVector<HeapPtr<StructTypeDescr*>, 0, SystemAllocPolicy>&&
-          structTypeDescrs,
       const JSFunctionVector& funcImports,
       const wasm::GlobalDescVector& globals,
       const wasm::ValVector& globalImportValues,
@@ -382,8 +377,8 @@
   static void finalize(JSFreeOp* fop, JSObject* obj);
   static bool bufferGetterImpl(JSContext* cx, const CallArgs& args);
   static bool bufferGetter(JSContext* cx, unsigned argc, Value* vp);
-  static bool typeGetterImpl(JSContext* cx, const CallArgs& args);
-  static bool typeGetter(JSContext* cx, unsigned argc, Value* vp);
+  static bool typeImpl(JSContext* cx, const CallArgs& args);
+  static bool type(JSContext* cx, unsigned argc, Value* vp);
   static bool growImpl(JSContext* cx, const CallArgs& args);
   static bool grow(JSContext* cx, unsigned argc, Value* vp);
   static uint32_t growShared(HandleWasmMemoryObject memory, uint32_t delta);
@@ -447,10 +442,10 @@
   bool isNewborn() const;
   static void finalize(JSFreeOp* fop, JSObject* obj);
   static void trace(JSTracer* trc, JSObject* obj);
-  static bool typeGetterImpl(JSContext* cx, const CallArgs& args);
-  static bool typeGetter(JSContext* cx, unsigned argc, Value* vp);
   static bool lengthGetterImpl(JSContext* cx, const CallArgs& args);
   static bool lengthGetter(JSContext* cx, unsigned argc, Value* vp);
+  static bool typeImpl(JSContext* cx, const CallArgs& args);
+  static bool type(JSContext* cx, unsigned argc, Value* vp);
   static bool getImpl(JSContext* cx, const CallArgs& args);
   static bool get(JSContext* cx, unsigned argc, Value* vp);
   static bool setImpl(JSContext* cx, const CallArgs& args);
@@ -476,22 +471,39 @@
   wasm::Table& table() const;
 };
 
+// The class of WebAssembly.Exception. This class is used to track exception
+// types for exports and imports.
+
+class WasmExceptionObject : public NativeObject {
+  static const unsigned TAG_SLOT = 0;
+  static const unsigned TYPE_SLOT = 1;
+
+  static const JSClassOps classOps_;
+  static const ClassSpec classSpec_;
+  static void finalize(JSFreeOp*, JSObject* obj);
+  static void trace(JSTracer* trc, JSObject* obj);
+
+ public:
+  static const unsigned RESERVED_SLOTS = 2;
+  static const JSClass class_;
+  static const JSClass& protoClass_;
+  static const JSPropertySpec properties[];
+  static const JSFunctionSpec methods[];
+  static const JSFunctionSpec static_methods[];
+  static bool construct(JSContext*, unsigned, Value*);
+
+  static WasmExceptionObject* create(JSContext* cx, wasm::ResultType type,
+                                     HandleObject proto);
+  bool isNewborn() const;
+
+  wasm::ValTypeVector& valueTypes() const;
+  wasm::ExceptionTag& tag() const;
+};
+
 // The class of the WebAssembly global namespace object.
 
 class WasmNamespaceObject : public NativeObject {
  public:
-  enum Slot {
-    ArrayTypePrototype,
-    StructTypePrototype,
-    Int32Desc,
-    Int64Desc,
-    Float32Desc,
-    Float64Desc,
-    ObjectDesc,
-    WasmAnyRefDesc,
-    SlotCount
-  };
-
   static const JSClass class_;
 
  private:
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmModule.cpp firefox-85.0+build1/js/src/wasm/WasmModule.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmModule.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmModule.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -596,8 +596,8 @@
   return true;
 }
 
-static const Import& FindImportForFuncImport(const ImportVector& imports,
-                                             uint32_t funcImportIndex) {
+static const Import& FindImportFunction(const ImportVector& imports,
+                                        uint32_t funcImportIndex) {
   for (const Import& import : imports) {
     if (import.kind != DefinitionKind::Function) {
       continue;
@@ -638,7 +638,7 @@
         instance.metadata(otherTier).lookupFuncExport(funcIndex);
 
     if (funcExport.funcType() != metadata(tier).funcImports[i].funcType()) {
-      const Import& import = FindImportForFuncImport(imports_, i);
+      const Import& import = FindImportFunction(imports_, i);
       JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
                                JSMSG_WASM_BAD_IMPORT_SIG, import.module.get(),
                                import.field.get());
@@ -759,6 +759,88 @@
   return true;
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+bool Module::instantiateImportedException(
+    JSContext* cx, Handle<WasmExceptionObject*> exnObj,
+    WasmExceptionObjectVector& exnObjs, SharedExceptionTagVector* tags) const {
+  MOZ_ASSERT(exnObj);
+  // The check whether the EventDesc signature matches the exnObj value types
+  // is done by js::wasm::GetImports().
+
+  // Collects the exception tag from the imported exception.
+  ExceptionTag& tag = exnObj->tag();
+
+  if (!tags->append(&tag)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+
+  return true;
+}
+
+bool Module::instantiateLocalException(JSContext* cx, const EventDesc& ed,
+                                       WasmExceptionObjectVector& exnObjs,
+                                       SharedExceptionTagVector* tags,
+                                       uint32_t exnIndex) const {
+  SharedExceptionTag tag;
+  // Extend exnObjs in anticipation of an exported exception object.
+  if (exnObjs.length() <= exnIndex && !exnObjs.resize(exnIndex + 1)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+
+  if (ed.isExport) {
+    // If the exception description is exported, create an export exception
+    // object for it.
+    RootedObject proto(
+        cx, &cx->global()->getPrototype(JSProto_WasmException).toObject());
+    RootedWasmExceptionObject exnObj(
+        cx, WasmExceptionObject::create(cx, ed.type, proto));
+    if (!exnObj) {
+      return false;
+    }
+    // Take the exception tag that was created inside the WasmExceptionObject.
+    tag = &exnObj->tag();
+    // Save the new export exception object.
+    exnObjs[exnIndex] = exnObj;
+  } else {
+    // Create a new tag for every non exported exception.
+    tag = SharedExceptionTag(cx->new_<ExceptionTag>());
+    if (!tag) {
+      return false;
+    }
+    // The exnObj is null if the exception is neither exported nor imported.
+  }
+  // Collect a tag for every exception.
+  if (!tags->emplaceBack(tag)) {
+    ReportOutOfMemory(cx);
+    return false;
+  }
+
+  return true;
+}
+
+bool Module::instantiateExceptions(JSContext* cx,
+                                   WasmExceptionObjectVector& exnObjs,
+                                   SharedExceptionTagVector* tags) const {
+  uint32_t exnIndex = 0;
+  for (const EventDesc& ed : metadata().events) {
+    if (exnIndex < exnObjs.length()) {
+      Rooted<WasmExceptionObject*> exnObj(cx, exnObjs[exnIndex]);
+      if (!instantiateImportedException(cx, exnObj, exnObjs, tags)) {
+        return false;
+      }
+    } else {
+      if (!instantiateLocalException(cx, ed, exnObjs, tags, exnIndex)) {
+        return false;
+      }
+    }
+    exnIndex++;
+  }
+  return true;
+}
+#endif
+
 bool Module::instantiateImportedTable(JSContext* cx, const TableDesc& td,
                                       Handle<WasmTableObject*> tableObj,
                                       WasmTableObjectVector* tableObjs,
@@ -973,18 +1055,8 @@
     return nullptr;
   }
 
-  StructTypeVector structTypes;
-  if (!structTypes.resize(code_->structTypes().length())) {
-    return nullptr;
-  }
-  for (uint32_t i = 0; i < code_->structTypes().length(); i++) {
-    if (!structTypes[i].copyFrom(code_->structTypes()[i])) {
-      return nullptr;
-    }
-  }
   MutableCode debugCode =
-      js_new<Code>(std::move(codeTier), metadata(), std::move(jumpTables),
-                   std::move(structTypes));
+      js_new<Code>(std::move(codeTier), metadata(), std::move(jumpTables));
   if (!debugCode || !debugCode->initialize(*debugLinkData_)) {
     return nullptr;
   }
@@ -1063,15 +1135,19 @@
     }
   }
 
-  globalObj->setVal(cx, globalVal);
+  globalObj->val() = globalVal;
   return true;
 }
 
-static bool CreateExportObject(
-    JSContext* cx, HandleWasmInstanceObject instanceObj,
-    const JSFunctionVector& funcImports, const WasmTableObjectVector& tableObjs,
-    HandleWasmMemoryObject memoryObj, const ValVector& globalImportValues,
-    const WasmGlobalObjectVector& globalObjs, const ExportVector& exports) {
+static bool CreateExportObject(JSContext* cx,
+                               HandleWasmInstanceObject instanceObj,
+                               const JSFunctionVector& funcImports,
+                               const WasmTableObjectVector& tableObjs,
+                               HandleWasmMemoryObject memoryObj,
+                               const WasmExceptionObjectVector& exceptionObjs,
+                               const ValVector& globalImportValues,
+                               const WasmGlobalObjectVector& globalObjs,
+                               const ExportVector& exports) {
   const Instance& instance = instanceObj->instance();
   const Metadata& metadata = instance.metadata();
   const GlobalDescVector& globals = metadata.globals;
@@ -1136,6 +1212,12 @@
         }
         break;
       }
+#ifdef ENABLE_WASM_EXCEPTIONS
+      case DefinitionKind::Event: {
+        val = ObjectValue(*exceptionObjs[exp.eventIndex()]);
+        break;
+      }
+#endif
     }
 
     if (!JS_DefinePropertyById(cx, exportObj, id, val, propertyAttr)) {
@@ -1153,198 +1235,10 @@
   return true;
 }
 
-#ifdef ENABLE_WASM_GC
-static bool MakeStructField(JSContext* cx, const ValType& v, bool isMutable,
-                            const char* format, uint32_t fieldNo,
-                            MutableHandleIdVector ids,
-                            MutableHandleValueVector fieldTypeObjs,
-                            Vector<StructFieldProps>* fieldProps) {
-  char buf[20];
-  sprintf(buf, format, fieldNo);
-
-  JSAtom* atom = Atomize(cx, buf, strlen(buf));
-  if (!atom) {
-    return false;
-  }
-  RootedId id(cx, AtomToId(atom));
-
-  StructFieldProps props;
-  props.isMutable = isMutable;
-
-  Rooted<TypeDescr*> t(cx);
-  switch (v.kind()) {
-    case ValType::I32:
-      t = GlobalObject::getOrCreateScalarTypeDescr(cx, cx->global(),
-                                                   Scalar::Int32);
-      break;
-    case ValType::I64:
-      // Align for int64 but allocate only an int32, another int32 allocation
-      // will follow immediately.  JS will see two immutable int32 values but
-      // wasm knows it's a single int64.  See makeStructTypeDescrs(), below.
-      props.alignAsInt64 = true;
-      t = GlobalObject::getOrCreateScalarTypeDescr(cx, cx->global(),
-                                                   Scalar::Int32);
-      break;
-    case ValType::V128:
-      // Align for v128 but allocate only an int32, three more int32 allocations
-      // will follow immediately.  JS will see four immutable int32 values but
-      // wasm knows it's a single v128.  See makeStructTypeDescrs(), below.
-      props.alignAsV128 = true;
-      t = GlobalObject::getOrCreateScalarTypeDescr(cx, cx->global(),
-                                                   Scalar::Int32);
-      break;
-    case ValType::F32:
-      t = GlobalObject::getOrCreateScalarTypeDescr(cx, cx->global(),
-                                                   Scalar::Float32);
-      break;
-    case ValType::F64:
-      t = GlobalObject::getOrCreateScalarTypeDescr(cx, cx->global(),
-                                                   Scalar::Float64);
-      break;
-    case ValType::Ref:
-      switch (v.refTypeKind()) {
-        case RefType::TypeIndex:
-        case RefType::Eq:
-          t = GlobalObject::getOrCreateReferenceTypeDescr(
-              cx, cx->global(), ReferenceType::TYPE_OBJECT);
-          break;
-        case RefType::Func:
-        case RefType::Extern:
-          t = GlobalObject::getOrCreateReferenceTypeDescr(
-              cx, cx->global(), ReferenceType::TYPE_WASM_ANYREF);
-          break;
-      }
-      break;
-  }
-  MOZ_ASSERT(t != nullptr);
-
-  if (!ids.append(id)) {
-    return false;
-  }
-
-  if (!fieldTypeObjs.append(ObjectValue(*t))) {
-    return false;
-  }
-
-  if (!fieldProps->append(props)) {
-    return false;
-  }
-
-  return true;
-}
-#endif
-
-bool Module::makeStructTypeDescrs(
-    JSContext* cx,
-    MutableHandle<StructTypeDescrVector> structTypeDescrs) const {
-  // This method must be a no-op if there are no structs.
-  if (structTypes().length() == 0) {
-    return true;
-  }
-
-#ifndef ENABLE_WASM_GC
-  MOZ_CRASH("Should not have seen any struct types");
-#else
-
-  // Not just any prototype object will do, we must have the actual
-  // StructTypePrototype.
-  RootedObject namespaceObject(
-      cx, GlobalObject::getOrCreateWebAssemblyNamespace(cx, cx->global()));
-  if (!namespaceObject) {
-    return false;
-  }
-
-  RootedNativeObject toModule(cx, &namespaceObject->as<NativeObject>());
-  RootedObject prototype(
-      cx, &toModule->getReservedSlot(WasmNamespaceObject::StructTypePrototype)
-               .toObject());
-
-  for (const StructType& structType : structTypes()) {
-    RootedIdVector ids(cx);
-    RootedValueVector fieldTypeObjs(cx);
-    Vector<StructFieldProps> fieldProps(cx);
-
-    uint32_t k = 0;
-    for (StructField sf : structType.fields_) {
-      const ValType& v = sf.type;
-      if (v.kind() == ValType::I64) {
-        // TypedObjects don't yet have a notion of int64 fields.  Thus
-        // we handle int64 by allocating two adjacent int32 fields, the
-        // first of them aligned as for int64.  We mark these fields as
-        // immutable for JS and render the object non-constructible
-        // from JS.  Wasm however sees one i64 field with appropriate
-        // mutability.
-        sf.isMutable = false;
-
-        if (!MakeStructField(cx, ValType::I64, sf.isMutable, "_%d_low", k, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-        if (!MakeStructField(cx, ValType::I32, sf.isMutable, "_%d_high", k++,
-                             &ids, &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-      } else if (v.kind() == ValType::V128) {
-        // Ditto v128 fields.  These turn into four adjacent i32 fields, using
-        // the standard xyzw convention.
-        sf.isMutable = false;
-
-        if (!MakeStructField(cx, ValType::V128, sf.isMutable, "_%d_x", k, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-        if (!MakeStructField(cx, ValType::I32, sf.isMutable, "_%d_y", k, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-        if (!MakeStructField(cx, ValType::I32, sf.isMutable, "_%d_z", k, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-        if (!MakeStructField(cx, ValType::I32, sf.isMutable, "_%d_w", k++, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-      } else {
-        // TypedObjects don't yet have a sufficient notion of type
-        // constraints on TypedObject properties.  Thus we handle fields
-        // of type (optref T) by marking them as immutable for JS and by
-        // rendering the objects non-constructible from JS.  Wasm
-        // however sees properly-typed (optref T) fields with appropriate
-        // mutability.
-        if (v.isTypeIndex()) {
-          // Validation ensures that v references a struct type here.
-          sf.isMutable = false;
-        }
-
-        if (!MakeStructField(cx, v, sf.isMutable, "_%d", k++, &ids,
-                             &fieldTypeObjs, &fieldProps)) {
-          return false;
-        }
-      }
-    }
-
-    // Types must be opaque, which we ensure here, and sealed, which is true
-    // for every TypedObject.  If they contain fields of type Ref T then we
-    // prevent JS from constructing instances of them.
-
-    Rooted<StructTypeDescr*> structTypeDescr(
-        cx, StructMetaTypeDescr::createFromArrays(cx, prototype, ids,
-                                                  fieldTypeObjs, fieldProps));
-
-    if (!structTypeDescr || !structTypeDescrs.append(structTypeDescr)) {
-      return false;
-    }
-  }
-
-  return true;
-#endif
-}
-
 bool Module::instantiate(JSContext* cx, ImportValues& imports,
                          HandleObject instanceProto,
                          MutableHandleWasmInstanceObject instance) const {
-  MOZ_RELEASE_ASSERT(cx->wasmHaveSignalHandlers);
+  MOZ_RELEASE_ASSERT(cx->wasm().haveSignalHandlers);
 
   if (!instantiateFunctions(cx, imports.funcs)) {
     return false;
@@ -1355,6 +1249,20 @@
     return false;
   }
 
+  // Note that the following will extend imports.exceptionObjs with wrappers for
+  // the local (non-imported) exceptions of the module.
+  // The resulting vector is sparse, i.e., it will be null in slots that contain
+  // exceptions that are neither exported or imported.
+  // On the contrary, all the slots of exceptionTags will be filled with
+  // unique tags.
+
+  SharedExceptionTagVector tags;
+#ifdef ENABLE_WASM_EXCEPTIONS
+  if (!instantiateExceptions(cx, imports.exceptionObjs, &tags)) {
+    return false;
+  }
+#endif
+
   // Note that tableObjs is sparse: it will be null in slots that contain
   // tables that are neither exported nor imported.
 
@@ -1391,24 +1299,18 @@
     code = code_;
   }
 
-  // Create type descriptors for any struct types that the module has.
-
-  Rooted<StructTypeDescrVector> structTypeDescrs(cx);
-  if (!makeStructTypeDescrs(cx, &structTypeDescrs)) {
-    return false;
-  }
-
   instance.set(WasmInstanceObject::create(
       cx, code, dataSegments_, elemSegments_, std::move(tlsData), memory,
-      std::move(tables), std::move(structTypeDescrs.get()), imports.funcs,
-      metadata().globals, imports.globalValues, imports.globalObjs,
-      instanceProto, std::move(maybeDebug)));
+      std::move(tags), std::move(tables), imports.funcs, metadata().globals,
+      imports.globalValues, imports.globalObjs, instanceProto,
+      std::move(maybeDebug)));
   if (!instance) {
     return false;
   }
 
   if (!CreateExportObject(cx, instance, imports.funcs, tableObjs.get(), memory,
-                          imports.globalValues, imports.globalObjs, exports_)) {
+                          imports.exceptionObjs, imports.globalValues,
+                          imports.globalObjs, exports_)) {
     return false;
   }
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmModule.h firefox-85.0+build1/js/src/wasm/WasmModule.h
--- firefox-84.0.2+build1/js/src/wasm/WasmModule.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmModule.h	2021-01-18 19:58:16.000000000 +0000
@@ -47,6 +47,7 @@
   JSFunctionVector funcs;
   WasmTableObjectVector tables;
   WasmMemoryObject* memory;
+  WasmExceptionObjectVector exceptionObjs;
   WasmGlobalObjectVector globalObjs;
   ValVector globalValues;
 
@@ -58,6 +59,7 @@
     if (memory) {
       TraceRoot(trc, &memory, "import values memory");
     }
+    exceptionObjs.trace(trc);
     globalObjs.trace(trc);
     globalValues.trace(trc);
   }
@@ -123,6 +125,18 @@
                             const JSFunctionVector& funcImports) const;
   bool instantiateMemory(JSContext* cx,
                          MutableHandleWasmMemoryObject memory) const;
+#ifdef ENABLE_WASM_EXCEPTIONS
+  bool instantiateImportedException(JSContext* cx,
+                                    Handle<WasmExceptionObject*> exnObj,
+                                    WasmExceptionObjectVector& exnObjs,
+                                    SharedExceptionTagVector* tags) const;
+  bool instantiateLocalException(JSContext* cx, const EventDesc& ed,
+                                 WasmExceptionObjectVector& exnObjs,
+                                 SharedExceptionTagVector* tags,
+                                 uint32_t exnIndex) const;
+  bool instantiateExceptions(JSContext* cx, WasmExceptionObjectVector& exnObjs,
+                             SharedExceptionTagVector* tags) const;
+#endif
   bool instantiateImportedTable(JSContext* cx, const TableDesc& td,
                                 Handle<WasmTableObject*> table,
                                 WasmTableObjectVector* tableObjs,
@@ -140,9 +154,6 @@
                     HandleWasmMemoryObject memory,
                     const ValVector& globalImportValues) const;
   SharedCode getDebugEnabledCode() const;
-  bool makeStructTypeDescrs(
-      JSContext* cx,
-      MutableHandle<StructTypeDescrVector> structTypeDescrs) const;
 
   class Tier2GeneratorTaskImpl;
 
@@ -181,7 +192,6 @@
   const CustomSectionVector& customSections() const { return customSections_; }
   const Bytes& debugBytecode() const { return debugBytecode_->bytes; }
   uint32_t codeLength(Tier t) const { return code_->segment(t).length(); }
-  const StructTypeVector& structTypes() const { return code_->structTypes(); }
 
   // Instantiate this module with the given imports:
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmOpIter.cpp firefox-85.0+build1/js/src/wasm/WasmOpIter.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmOpIter.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmOpIter.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -50,6 +50,11 @@
 #  else
 #    define WASM_SIMD_OP(code) break
 #  endif
+#  ifdef ENABLE_WASM_EXCEPTIONS
+#    define WASM_EXN_OP(code) return code
+#  else
+#    define WASM_EXN_OP(code) break
+#  endif
 
 OpKind wasm::Classify(OpBytes op) {
   switch (Op(op.b0)) {
@@ -265,6 +270,14 @@
       return OpKind::Else;
     case Op::End:
       return OpKind::End;
+#  ifdef ENABLE_WASM_EXCEPTIONS
+    case Op::Catch:
+      WASM_EXN_OP(OpKind::Catch);
+    case Op::Throw:
+      WASM_EXN_OP(OpKind::Throw);
+    case Op::Try:
+      WASM_EXN_OP(OpKind::Try);
+#  endif
     case Op::MemorySize:
       return OpKind::MemorySize;
     case Op::MemoryGrow:
@@ -676,6 +689,7 @@
   MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("unimplemented opcode");
 }
 
+#  undef WASM_EXN_OP
 #  undef WASM_GC_OP
 #  undef WASM_REF_OP
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmOpIter.h firefox-85.0+build1/js/src/wasm/WasmOpIter.h
--- firefox-84.0.2+build1/js/src/wasm/WasmOpIter.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmOpIter.h	2021-01-18 19:58:16.000000000 +0000
@@ -33,7 +33,17 @@
 namespace wasm {
 
 // The kind of a control-flow stack item.
-enum class LabelKind : uint8_t { Body, Block, Loop, Then, Else };
+enum class LabelKind : uint8_t {
+  Body,
+  Block,
+  Loop,
+  Then,
+  Else,
+#ifdef ENABLE_WASM_EXCEPTIONS
+  Try,
+  Catch,
+#endif
+};
 
 // The type of values on the operand stack during validation.  This is either a
 // ValType or the special type "Bottom".
@@ -176,6 +186,11 @@
   VectorSelect,
   VectorShuffle,
 #  endif
+#  ifdef ENABLE_WASM_EXCEPTIONS
+  Catch,
+  Throw,
+  Try,
+#  endif
 };
 
 // Return the OpKind for a given Op. This is used for sanity-checking that
@@ -233,6 +248,14 @@
     kind_ = LabelKind::Else;
     polymorphicBase_ = false;
   }
+
+#ifdef ENABLE_WASM_EXCEPTIONS
+  void switchToCatch() {
+    MOZ_ASSERT(kind() == LabelKind::Try);
+    kind_ = LabelKind::Catch;
+    polymorphicBase_ = false;
+  }
+#endif
 };
 
 template <typename Value>
@@ -416,6 +439,13 @@
   MOZ_MUST_USE bool readBrTable(Uint32Vector* depths, uint32_t* defaultDepth,
                                 ResultType* defaultBranchValueType,
                                 ValueVector* branchValues, Value* index);
+#ifdef ENABLE_WASM_EXCEPTIONS
+  MOZ_MUST_USE bool readTry(ResultType* type);
+  MOZ_MUST_USE bool readCatch(LabelKind* kind, uint32_t* eventIndex,
+                              ResultType* paramType, ResultType* resultType,
+                              ValueVector* tryResults);
+  MOZ_MUST_USE bool readThrow(uint32_t* eventIndex, ValueVector* argValues);
+#endif
   MOZ_MUST_USE bool readUnreachable();
   MOZ_MUST_USE bool readDrop();
   MOZ_MUST_USE bool readUnary(ValType operandType, Value* input);
@@ -575,12 +605,7 @@
 
 template <typename Policy>
 inline bool OpIter<Policy>::checkIsSubtypeOf(ValType actual, ValType expected) {
-  if (actual == expected) {
-    return true;
-  }
-
-  if (actual.isReference() && expected.isReference() &&
-      env_.isRefSubtypeOf(actual.refType(), expected.refType())) {
+  if (env_.types.isSubtypeOf(actual, expected)) {
     return true;
   }
 
@@ -924,11 +949,11 @@
     return fail("invalid block type type index");
   }
 
-  if (!env_.types[x].isFuncType()) {
+  if (!env_.types.isFuncType(x)) {
     return fail("block type type index must be func type");
   }
 
-  *type = BlockType::Func(env_.types[x].funcType());
+  *type = BlockType::Func(env_.types.funcType(x));
 
   return true;
 #else
@@ -970,7 +995,7 @@
   MOZ_ASSERT(valueStack_.empty());
   MOZ_ASSERT(controlStack_.empty());
   MOZ_ASSERT(op_.b0 == uint16_t(Op::Limit));
-  BlockType type = BlockType::FuncResults(*env_.funcTypes[funcIndex]);
+  BlockType type = BlockType::FuncResults(*env_.funcs[funcIndex].type);
   return pushControl(LabelKind::Body, type);
 }
 
@@ -1115,6 +1140,12 @@
     elseParamStack_.shrinkBy(nparams);
   }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+  if (block.kind() == LabelKind::Try) {
+    return fail("try without catch or unwind not allowed");
+  }
+#endif
+
   *kind = block.kind();
   return true;
 }
@@ -1250,6 +1281,74 @@
 
 #undef UNKNOWN_ARITY
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+template <typename Policy>
+inline bool OpIter<Policy>::readTry(ResultType* paramType) {
+  MOZ_ASSERT(Classify(op_) == OpKind::Try);
+
+  BlockType type;
+  if (!readBlockType(&type)) {
+    return false;
+  }
+
+  *paramType = type.params();
+  return pushControl(LabelKind::Try, type);
+}
+
+template <typename Policy>
+inline bool OpIter<Policy>::readCatch(LabelKind* kind, uint32_t* eventIndex,
+                                      ResultType* paramType,
+                                      ResultType* resultType,
+                                      ValueVector* tryResults) {
+  MOZ_ASSERT(Classify(op_) == OpKind::Catch);
+
+  if (!readVarU32(eventIndex)) {
+    return fail("expected event index");
+  }
+  if (*eventIndex >= env_.events.length()) {
+    return fail("event index out of range");
+  }
+
+  Control& block = controlStack_.back();
+  if (block.kind() != LabelKind::Try && block.kind() != LabelKind::Catch) {
+    return fail("catch can only be used within a try");
+  }
+  *kind = block.kind();
+  *paramType = block.type().params();
+
+  if (!checkStackAtEndOfBlock(resultType, tryResults)) {
+    return false;
+  }
+
+  valueStack_.shrinkTo(block.valueStackBase());
+  if (block.kind() == LabelKind::Try) {
+    block.switchToCatch();
+  }
+
+  return push(env_.events[*eventIndex].type);
+}
+
+template <typename Policy>
+inline bool OpIter<Policy>::readThrow(uint32_t* eventIndex,
+                                      ValueVector* argValues) {
+  MOZ_ASSERT(Classify(op_) == OpKind::Throw);
+
+  if (!readVarU32(eventIndex)) {
+    return fail("expected event index");
+  }
+  if (*eventIndex >= env_.events.length()) {
+    return fail("event index out of range");
+  }
+
+  if (!popWithType(env_.events[*eventIndex].type, argValues)) {
+    return false;
+  }
+
+  afterUnconditionalBranch();
+  return true;
+}
+#endif
+
 template <typename Policy>
 inline bool OpIter<Policy>::readUnreachable() {
   MOZ_ASSERT(Classify(op_) == OpKind::Unreachable);
@@ -1730,7 +1829,7 @@
   if (!readVarU32(funcTypeIndex)) {
     return fail("unable to read function index");
   }
-  if (*funcTypeIndex >= env_.funcTypes.length()) {
+  if (*funcTypeIndex >= env_.funcs.length()) {
     return fail("function index out of range");
   }
   if (!env_.validForRefFunc.getBit(*funcTypeIndex)) {
@@ -1854,11 +1953,11 @@
     return fail("unable to read call function index");
   }
 
-  if (*funcTypeIndex >= env_.funcTypes.length()) {
+  if (*funcTypeIndex >= env_.funcs.length()) {
     return fail("callee index out of range");
   }
 
-  const FuncType& funcType = *env_.funcTypes[*funcTypeIndex];
+  const FuncType& funcType = *env_.funcs[*funcTypeIndex].type;
 
   if (!popCallArgs(funcType.args(), argValues)) {
     return false;
@@ -1901,11 +2000,11 @@
     return false;
   }
 
-  if (!env_.types[*funcTypeIndex].isFuncType()) {
+  if (!env_.types.isFuncType(*funcTypeIndex)) {
     return fail("expected signature type");
   }
 
-  const FuncType& funcType = env_.types[*funcTypeIndex].funcType();
+  const FuncType& funcType = env_.types.funcType(*funcTypeIndex);
 
 #ifdef WASM_PRIVATE_REFTYPES
   if (env_.tables[*tableIndex].importedOrExported &&
@@ -1938,11 +2037,11 @@
 
   *funcTypeIndex = numFuncImports + funcDefIndex;
 
-  if (*funcTypeIndex >= env_.funcTypes.length()) {
+  if (*funcTypeIndex >= env_.funcs.length()) {
     return fail("callee index out of range");
   }
 
-  const FuncType& funcType = *env_.funcTypes[*funcTypeIndex];
+  const FuncType& funcType = *env_.funcs[*funcTypeIndex].type;
 
   if (!popCallArgs(funcType.args(), argValues)) {
     return false;
@@ -1965,11 +2064,11 @@
     return fail("signature index out of range");
   }
 
-  if (!env_.types[*funcTypeIndex].isFuncType()) {
+  if (!env_.types.isFuncType(*funcTypeIndex)) {
     return fail("expected signature type");
   }
 
-  const FuncType& funcType = env_.types[*funcTypeIndex].funcType();
+  const FuncType& funcType = env_.types.funcType(*funcTypeIndex);
 
   if (!popCallArgs(funcType.args(), argValues)) {
     return false;
@@ -2393,7 +2492,7 @@
     return fail("type index out of range");
   }
 
-  if (!env_.types[*typeIndex].isStructType()) {
+  if (!env_.types.isStructType(*typeIndex)) {
     return fail("not a struct type");
   }
 
@@ -2426,7 +2525,7 @@
     return false;
   }
 
-  const StructType& str = env_.types[*typeIndex].structType();
+  const StructType& str = env_.types.structType(*typeIndex);
 
   if (!argValues->resize(str.fields_.length())) {
     return false;
@@ -2453,7 +2552,7 @@
     return false;
   }
 
-  const StructType& structType = env_.types[*typeIndex].structType();
+  const StructType& structType = env_.types.structType(*typeIndex);
 
   if (!readFieldIndex(fieldIndex, structType)) {
     return false;
@@ -2477,7 +2576,7 @@
     return false;
   }
 
-  const StructType& structType = env_.types[*typeIndex].structType();
+  const StructType& structType = env_.types.structType(*typeIndex);
 
   if (!readFieldIndex(fieldIndex, structType)) {
     return false;
@@ -2512,15 +2611,14 @@
     return false;
   }
 
-  if (env_.isStructType(*inputType)) {
-    if (!env_.isStructType(*outputType)) {
+  if (env_.types.isStructType(inputType->refType())) {
+    if (!env_.types.isStructType(outputType->refType())) {
       return fail("invalid type combination in struct.narrow");
     }
 
-    const StructType& inputStruct =
-        env_.types[inputType->refType().typeIndex()].structType();
+    const StructType& inputStruct = env_.types.structType(inputType->refType());
     const StructType& outputStruct =
-        env_.types[outputType->refType().typeIndex()].structType();
+        env_.types.structType(outputType->refType());
 
     if (!outputStruct.hasPrefix(inputStruct)) {
       return fail("invalid narrowing operation");
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmSignalHandlers.cpp firefox-85.0+build1/js/src/wasm/WasmSignalHandlers.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmSignalHandlers.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmSignalHandlers.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -19,7 +19,6 @@
 #include "wasm/WasmSignalHandlers.h"
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/ThreadLocal.h"
 
 #include "threading/Thread.h"
@@ -1125,12 +1124,12 @@
 }
 
 bool wasm::EnsureFullSignalHandlers(JSContext* cx) {
-  if (cx->wasmTriedToInstallSignalHandlers) {
-    return cx->wasmHaveSignalHandlers;
+  if (cx->wasm().triedToInstallSignalHandlers) {
+    return cx->wasm().haveSignalHandlers;
   }
 
-  cx->wasmTriedToInstallSignalHandlers = true;
-  MOZ_RELEASE_ASSERT(!cx->wasmHaveSignalHandlers);
+  cx->wasm().triedToInstallSignalHandlers = true;
+  MOZ_RELEASE_ASSERT(!cx->wasm().haveSignalHandlers);
 
   {
     auto eagerInstallState = sEagerInstallState.lock();
@@ -1164,7 +1163,7 @@
   }
 #endif
 
-  cx->wasmHaveSignalHandlers = true;
+  cx->wasm().haveSignalHandlers = true;
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmStubs.cpp firefox-85.0+build1/js/src/wasm/WasmStubs.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmStubs.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmStubs.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1038,14 +1038,12 @@
 
   GenerateJitEntryLoadTls(masm, frameSize);
 
-#ifdef ENABLE_WASM_SIMD
-  if (fe.funcType().hasV128ArgOrRet()) {
+  if (fe.funcType().hasUnexposableArgOrRet()) {
     CallSymbolicAddress(masm, !fe.hasEagerStubs(),
                         SymbolicAddress::ReportV128JSCall);
     GenerateJitEntryThrow(masm, frameSize);
     return FinishOffsets(masm, offsets);
   }
-#endif
 
   FloatRegister scratchF = ABINonArgDoubleReg;
   Register scratchG = ScratchIonEntry;
@@ -1199,7 +1197,7 @@
         break;
       }
       case ValType::V128: {
-        // Guarded against by hasV128ArgOrRet()
+        // Guarded against by hasUnexposableArgOrRet()
         MOZ_CRASH("unexpected argument type when calling from the jit");
       }
       default: {
@@ -1375,7 +1373,7 @@
                                     JSReturnOperand, WasmJitEntryReturnScratch);
             break;
           case RefType::TypeIndex:
-            MOZ_CRASH("returning reference in jitentry NYI");
+            MOZ_CRASH("unexpected return type when calling from ion to wasm");
         }
         break;
       }
@@ -1950,8 +1948,7 @@
 //  - normal entries, so that, if the import is re-exported, an entry stub can
 //    be generated and called without any special cases
 static bool GenerateImportFunction(jit::MacroAssembler& masm,
-                                   const FuncImport& fi,
-                                   FuncTypeIdDesc funcTypeId,
+                                   const FuncImport& fi, TypeIdDesc funcTypeId,
                                    FuncOffsets* offsets) {
   AssertExpectedSP(masm);
 
@@ -2014,13 +2011,13 @@
                                    CompiledCode* code) {
   LifoAlloc lifo(STUBS_LIFO_DEFAULT_CHUNK_SIZE);
   TempAllocator alloc(&lifo);
-  WasmMacroAssembler masm(alloc);
+  WasmMacroAssembler masm(alloc, env);
 
   for (uint32_t funcIndex = 0; funcIndex < imports.length(); funcIndex++) {
     const FuncImport& fi = imports[funcIndex];
 
     FuncOffsets offsets;
-    if (!GenerateImportFunction(masm, fi, env.funcTypes[funcIndex]->id,
+    if (!GenerateImportFunction(masm, fi, *env.funcs[funcIndex].typeId,
                                 &offsets)) {
       return false;
     }
@@ -2317,16 +2314,7 @@
 
   // 7. If we haven't rectified arguments, load callee executable entry point.
 
-  if (fi.funcType().jitExitRequiresArgCheck()) {
-    masm.loadJitCodeRaw(callee, callee);
-  } else {
-    // This is equivalent to masm.loadJitCodeNoArgCheck(callee, callee) but uses
-    // two loads instead of three.
-    masm.loadWasmGlobalPtr(
-        fi.tlsDataOffset() + offsetof(FuncImportTls, jitScript), callee);
-    masm.loadPtr(Address(callee, JitScript::offsetOfJitCodeSkipArgCheck()),
-                 callee);
-  }
+  masm.loadJitCodeRaw(callee, callee);
 
   Label rejoinBeforeCall;
   masm.bind(&rejoinBeforeCall);
@@ -2886,12 +2874,10 @@
     return true;
   }
 
-#ifdef ENABLE_WASM_SIMD
   // SIMD spec requires JS calls to exports with V128 in the signature to throw.
-  if (fe.funcType().hasV128ArgOrRet()) {
+  if (fe.funcType().hasUnexposableArgOrRet()) {
     return true;
   }
-#endif
 
   // Returning multiple values to JS JIT code not yet implemented (see
   // bug 1595031).
@@ -2914,7 +2900,7 @@
                          const FuncExportVector& exports, CompiledCode* code) {
   LifoAlloc lifo(STUBS_LIFO_DEFAULT_CHUNK_SIZE);
   TempAllocator alloc(&lifo);
-  WasmMacroAssembler masm(alloc);
+  WasmMacroAssembler masm(alloc, env);
 
   // Swap in already-allocated empty vectors to avoid malloc/free.
   if (!code->swap(masm)) {
@@ -2938,13 +2924,11 @@
       return false;
     }
 
-#ifdef ENABLE_WASM_SIMD
     // SIMD spec requires calls to JS functions with V128 in the signature to
     // throw.
-    if (fi.funcType().hasV128ArgOrRet()) {
+    if (fi.funcType().hasUnexposableArgOrRet()) {
       continue;
     }
-#endif
 
     if (fi.funcType().temporarilyUnsupportedReftypeForExit()) {
       continue;
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmTypes.cpp firefox-85.0+build1/js/src/wasm/WasmTypes.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmTypes.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmTypes.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -18,6 +18,9 @@
 
 #include "wasm/WasmTypes.h"
 
+#include <algorithm>
+
+#include "jsmath.h"
 #include "js/friend/ErrorMessages.h"  // JSMSG_*
 #include "js/Printf.h"
 #include "util/Memory.h"
@@ -25,6 +28,7 @@
 #include "vm/Warnings.h"  // js:WarnNumberASCII
 #include "wasm/WasmBaselineCompile.h"
 #include "wasm/WasmInstance.h"
+#include "wasm/WasmJS.h"
 #include "wasm/WasmSerialize.h"
 #include "wasm/WasmStubs.h"
 
@@ -35,6 +39,7 @@
 using namespace js::jit;
 using namespace js::wasm;
 
+using mozilla::CheckedInt32;
 using mozilla::IsPowerOfTwo;
 using mozilla::MakeEnumeratedRange;
 
@@ -63,35 +68,367 @@
   type_ = val.type();
   switch (type_.kind()) {
     case ValType::I32:
-      u.i32_ = val.i32();
+      cell_.i32_ = val.i32();
       return;
     case ValType::F32:
-      u.f32_ = val.f32();
+      cell_.f32_ = val.f32();
       return;
     case ValType::I64:
-      u.i64_ = val.i64();
+      cell_.i64_ = val.i64();
       return;
     case ValType::F64:
-      u.f64_ = val.f64();
+      cell_.f64_ = val.f64();
       return;
     case ValType::V128:
-      u.v128_ = val.v128();
+      cell_.v128_ = val.v128();
       return;
     case ValType::Ref:
-      u.ref_ = val.ref();
+      cell_.ref_ = val.ref();
       return;
   }
   MOZ_CRASH();
 }
 
-void Val::trace(JSTracer* trc) {
-  if (type_.isValid() && type_.isReference() && !u.ref_.isNull()) {
+bool Val::fromJSValue(JSContext* cx, ValType targetType, HandleValue val,
+                      MutableHandleVal rval) {
+  rval.get().type_ = targetType;
+  // No pre/post barrier needed as rval is rooted
+  return ToWebAssemblyValue(cx, val, targetType, &rval.get().cell_,
+                            targetType.size() == 8);
+}
+
+bool Val::toJSValue(JSContext* cx, MutableHandleValue rval) const {
+  return ToJSValue(cx, &cell_, type_, rval);
+}
+
+void Val::trace(JSTracer* trc) const {
+  if (isJSObject()) {
     // TODO/AnyRef-boxing: With boxed immediates and strings, the write
     // barrier is going to have to be more complicated.
     ASSERT_ANYREF_IS_JSOBJECT;
-    TraceManuallyBarrieredEdge(trc, u.ref_.asJSObjectAddress(),
-                               "wasm reference-typed global");
+    TraceManuallyBarrieredEdge(trc, asJSObjectAddress(), "wasm val");
+  }
+}
+
+bool wasm::CheckRefType(JSContext* cx, RefType targetType, HandleValue v,
+                        MutableHandleFunction fnval,
+                        MutableHandleAnyRef refval) {
+  if (!targetType.isNullable() && v.isNull()) {
+    JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                             JSMSG_WASM_BAD_REF_NONNULLABLE_VALUE);
+    return false;
+  }
+  switch (targetType.kind()) {
+    case RefType::Func:
+      if (!CheckFuncRefValue(cx, v, fnval)) {
+        return false;
+      }
+      break;
+    case RefType::Extern:
+      if (!BoxAnyRef(cx, v, refval)) {
+        return false;
+      }
+      break;
+    case RefType::Eq:
+      if (!CheckEqRefValue(cx, v, refval)) {
+        return false;
+      }
+      break;
+    case RefType::TypeIndex:
+      MOZ_CRASH("temporarily unsupported Ref type");
+  }
+  return true;
+}
+
+bool wasm::CheckFuncRefValue(JSContext* cx, HandleValue v,
+                             MutableHandleFunction fun) {
+  if (v.isNull()) {
+    MOZ_ASSERT(!fun);
+    return true;
+  }
+
+  if (v.isObject()) {
+    JSObject& obj = v.toObject();
+    if (obj.is<JSFunction>()) {
+      JSFunction* f = &obj.as<JSFunction>();
+      if (IsWasmExportedFunction(f)) {
+        fun.set(f);
+        return true;
+      }
+    }
+  }
+
+  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                           JSMSG_WASM_BAD_FUNCREF_VALUE);
+  return false;
+}
+
+bool wasm::CheckEqRefValue(JSContext* cx, HandleValue v,
+                           MutableHandleAnyRef vp) {
+  if (v.isNull()) {
+    vp.set(AnyRef::null());
+    return true;
+  }
+
+  if (v.isObject()) {
+    JSObject& obj = v.toObject();
+    if (obj.is<TypedObject>()) {
+      vp.set(AnyRef::fromJSObject(&obj.as<TypedObject>()));
+      return true;
+    }
+  }
+
+  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                           JSMSG_WASM_BAD_EQREF_VALUE);
+  return false;
+}
+
+class wasm::NoDebug {
+ public:
+  template <typename T>
+  static void print(T v) {}
+};
+
+class wasm::DebugCodegenVal {
+  template <typename T>
+  static void print(const char* fmt, T v) {
+    DebugCodegen(DebugChannel::Function, fmt, v);
+  }
+
+ public:
+  static void print(int32_t v) { print(" i32(%d)", v); }
+  static void print(int64_t v) { print(" i64(%" PRId64 ")", v); }
+  static void print(float v) { print(" f32(%f)", v); }
+  static void print(double v) { print(" f64(%lf)", v); }
+  static void print(void* v) { print(" ptr(%p)", v); }
+};
+
+template bool wasm::ToWebAssemblyValue<NoDebug>(JSContext* cx, HandleValue val,
+                                                ValType type, void* loc,
+                                                bool mustWrite64);
+template bool wasm::ToWebAssemblyValue<DebugCodegenVal>(JSContext* cx,
+                                                        HandleValue val,
+                                                        ValType type, void* loc,
+                                                        bool mustWrite64);
+template bool wasm::ToJSValue<NoDebug>(JSContext* cx, const void* src,
+                                       ValType type, MutableHandleValue dst);
+template bool wasm::ToJSValue<DebugCodegenVal>(JSContext* cx, const void* src,
+                                               ValType type,
+                                               MutableHandleValue dst);
+
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_i32(JSContext* cx, HandleValue val, int32_t* loc,
+                            bool mustWrite64) {
+  bool ok = ToInt32(cx, val, loc);
+  if (ok && mustWrite64) {
+#if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
+    loc[1] = loc[0] >> 31;
+#else
+    loc[1] = 0;
+#endif
+  }
+  Debug::print(*loc);
+  return ok;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_i64(JSContext* cx, HandleValue val, int64_t* loc,
+                            bool mustWrite64) {
+  MOZ_ASSERT(mustWrite64);
+  JS_TRY_VAR_OR_RETURN_FALSE(cx, *loc, ToBigInt64(cx, val));
+  Debug::print(*loc);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_f32(JSContext* cx, HandleValue val, float* loc,
+                            bool mustWrite64) {
+  bool ok = RoundFloat32(cx, val, loc);
+  if (ok && mustWrite64) {
+    loc[1] = 0.0;
+  }
+  Debug::print(*loc);
+  return ok;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_f64(JSContext* cx, HandleValue val, double* loc,
+                            bool mustWrite64) {
+  MOZ_ASSERT(mustWrite64);
+  bool ok = ToNumber(cx, val, loc);
+  Debug::print(*loc);
+  return ok;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_externref(JSContext* cx, HandleValue val, void** loc,
+                                  bool mustWrite64) {
+  RootedAnyRef result(cx, AnyRef::null());
+  if (!BoxAnyRef(cx, val, &result)) {
+    return false;
+  }
+  *loc = result.get().forCompiledCode();
+#ifndef JS_64BIT
+  if (mustWrite64) {
+    loc[1] = nullptr;
+  }
+#endif
+  Debug::print(*loc);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_eqref(JSContext* cx, HandleValue val, void** loc,
+                              bool mustWrite64) {
+  RootedAnyRef result(cx, AnyRef::null());
+  if (!CheckEqRefValue(cx, val, &result)) {
+    return false;
+  }
+  *loc = result.get().forCompiledCode();
+#ifndef JS_64BIT
+  if (mustWrite64) {
+    loc[1] = nullptr;
+  }
+#endif
+  Debug::print(*loc);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToWebAssemblyValue_funcref(JSContext* cx, HandleValue val, void** loc,
+                                bool mustWrite64) {
+  RootedFunction fun(cx);
+  if (!CheckFuncRefValue(cx, val, &fun)) {
+    return false;
+  }
+  *loc = fun;
+#ifndef JS_64BIT
+  if (mustWrite64) {
+    loc[1] = nullptr;
+  }
+#endif
+  Debug::print(*loc);
+  return true;
+}
+
+template <typename Debug>
+bool wasm::ToWebAssemblyValue(JSContext* cx, HandleValue val, ValType type,
+                              void* loc, bool mustWrite64) {
+  switch (type.kind()) {
+    case ValType::I32:
+      return ToWebAssemblyValue_i32<Debug>(cx, val, (int32_t*)loc, mustWrite64);
+    case ValType::I64:
+      return ToWebAssemblyValue_i64<Debug>(cx, val, (int64_t*)loc, mustWrite64);
+    case ValType::F32:
+      return ToWebAssemblyValue_f32<Debug>(cx, val, (float*)loc, mustWrite64);
+    case ValType::F64:
+      return ToWebAssemblyValue_f64<Debug>(cx, val, (double*)loc, mustWrite64);
+    case ValType::V128:
+      break;
+    case ValType::Ref:
+#ifdef ENABLE_WASM_FUNCTION_REFERENCES
+      if (!type.isNullable() && val.isNull()) {
+        JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                                 JSMSG_WASM_BAD_REF_NONNULLABLE_VALUE);
+        return false;
+      }
+#else
+      MOZ_ASSERT(type.isNullable());
+#endif
+      switch (type.refTypeKind()) {
+        case RefType::Func:
+          return ToWebAssemblyValue_funcref<Debug>(cx, val, (void**)loc,
+                                                   mustWrite64);
+        case RefType::Extern:
+          return ToWebAssemblyValue_externref<Debug>(cx, val, (void**)loc,
+                                                     mustWrite64);
+        case RefType::Eq:
+          return ToWebAssemblyValue_eqref<Debug>(cx, val, (void**)loc,
+                                                 mustWrite64);
+        case RefType::TypeIndex:
+          break;
+      }
+  }
+  MOZ_ASSERT(!type.isExposable());
+  JS_ReportErrorNumberUTF8(cx, GetErrorMessage, nullptr,
+                           JSMSG_WASM_BAD_VAL_TYPE);
+  return false;
+}
+
+template <typename Debug = NoDebug>
+bool ToJSValue_i32(JSContext* cx, int32_t src, MutableHandleValue dst) {
+  dst.set(Int32Value(src));
+  Debug::print(src);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToJSValue_i64(JSContext* cx, int64_t src, MutableHandleValue dst) {
+  // If bi is manipulated other than test & storing, it would need
+  // to be rooted here.
+  BigInt* bi = BigInt::createFromInt64(cx, src);
+  if (!bi) {
+    return false;
+  }
+  dst.set(BigIntValue(bi));
+  Debug::print(src);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToJSValue_f32(JSContext* cx, float src, MutableHandleValue dst) {
+  dst.set(JS::CanonicalizedDoubleValue(src));
+  Debug::print(src);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToJSValue_f64(JSContext* cx, double src, MutableHandleValue dst) {
+  dst.set(JS::CanonicalizedDoubleValue(src));
+  Debug::print(src);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToJSValue_funcref(JSContext* cx, void* src, MutableHandleValue dst) {
+  dst.set(UnboxFuncRef(FuncRef::fromCompiledCode(src)));
+  Debug::print(src);
+  return true;
+}
+template <typename Debug = NoDebug>
+bool ToJSValue_anyref(JSContext* cx, void* src, MutableHandleValue dst) {
+  dst.set(UnboxAnyRef(AnyRef::fromCompiledCode(src)));
+  Debug::print(src);
+  return true;
+}
+
+template <typename Debug>
+bool wasm::ToJSValue(JSContext* cx, const void* src, ValType type,
+                     MutableHandleValue dst) {
+  switch (type.kind()) {
+    case ValType::I32:
+      return ToJSValue_i32<Debug>(cx, *reinterpret_cast<const int32_t*>(src),
+                                  dst);
+    case ValType::I64:
+      return ToJSValue_i64<Debug>(cx, *reinterpret_cast<const int64_t*>(src),
+                                  dst);
+    case ValType::F32:
+      return ToJSValue_f32<Debug>(cx, *reinterpret_cast<const float*>(src),
+                                  dst);
+    case ValType::F64:
+      return ToJSValue_f64<Debug>(cx, *reinterpret_cast<const double*>(src),
+                                  dst);
+    case ValType::V128:
+      break;
+    case ValType::Ref:
+      switch (type.refTypeKind()) {
+        case RefType::Func:
+          return ToJSValue_funcref<Debug>(
+              cx, *reinterpret_cast<void* const*>(src), dst);
+        case RefType::Extern:
+          return ToJSValue_anyref<Debug>(
+              cx, *reinterpret_cast<void* const*>(src), dst);
+        case RefType::Eq:
+          return ToJSValue_anyref<Debug>(
+              cx, *reinterpret_cast<void* const*>(src), dst);
+        case RefType::TypeIndex:
+          break;
+      }
   }
+  MOZ_ASSERT(!type.isExposable());
+  Debug::print(nullptr);
+  dst.setUndefined();
+  return true;
 }
 
 void AnyRef::trace(JSTracer* trc) {
@@ -152,6 +489,22 @@
   return result;
 }
 
+/* static */
+wasm::FuncRef wasm::FuncRef::fromAnyRefUnchecked(AnyRef p) {
+#ifdef DEBUG
+  Value v = UnboxAnyRef(p);
+  if (v.isNull()) {
+    return FuncRef(nullptr);
+  }
+  if (v.toObject().is<JSFunction>()) {
+    return FuncRef(&v.toObject().as<JSFunction>());
+  }
+  MOZ_CRASH("Bad value");
+#else
+  return FuncRef(&p.asJSObject()->as<JSFunction>());
+#endif
+}
+
 Value wasm::UnboxFuncRef(FuncRef val) {
   JSFunction* fn = val.asJSFunction();
   Value result;
@@ -266,7 +619,11 @@
 }
 
 /* static */
-bool FuncTypeIdDesc::isGlobal(const FuncType& funcType) {
+bool TypeIdDesc::isGlobal(const TypeDef& type) {
+  if (!type.isFuncType()) {
+    return true;
+  }
+  const FuncType& funcType = type.funcType();
   const ValTypeVector& results = funcType.results();
   const ValTypeVector& args = funcType.args();
   if (results.length() + args.length() > sMaxTypes) {
@@ -293,10 +650,9 @@
 }
 
 /* static */
-FuncTypeIdDesc FuncTypeIdDesc::global(const FuncType& funcType,
-                                      uint32_t globalDataOffset) {
-  MOZ_ASSERT(isGlobal(funcType));
-  return FuncTypeIdDesc(FuncTypeIdDescKind::Global, globalDataOffset);
+TypeIdDesc TypeIdDesc::global(const TypeDef& type, uint32_t globalDataOffset) {
+  MOZ_ASSERT(isGlobal(type));
+  return TypeIdDesc(TypeIdDescKind::Global, globalDataOffset);
 }
 
 static ImmediateType LengthToBits(uint32_t length) {
@@ -306,7 +662,9 @@
 }
 
 /* static */
-FuncTypeIdDesc FuncTypeIdDesc::immediate(const FuncType& funcType) {
+TypeIdDesc TypeIdDesc::immediate(const TypeDef& type) {
+  const FuncType& funcType = type.funcType();
+
   ImmediateType immediate = ImmediateBit;
   uint32_t shift = sTagBits;
 
@@ -330,27 +688,105 @@
   }
 
   MOZ_ASSERT(shift <= sTotalBits);
-  return FuncTypeIdDesc(FuncTypeIdDescKind::Immediate, immediate);
+  return TypeIdDesc(TypeIdDescKind::Immediate, immediate);
+}
+
+size_t TypeDef::serializedSize() const {
+  size_t size = sizeof(tag_);
+  switch (tag_) {
+    case TypeDef::IsStructType: {
+      size += sizeof(structType_);
+      break;
+    }
+    case TypeDef::IsFuncType: {
+      size += sizeof(funcType_);
+      break;
+    }
+    case TypeDef::IsNone: {
+      break;
+    }
+    default:
+      MOZ_ASSERT_UNREACHABLE();
+  }
+  return size;
+}
+
+uint8_t* TypeDef::serialize(uint8_t* cursor) const {
+  cursor = WriteBytes(cursor, &tag_, sizeof(tag_));
+  switch (tag_) {
+    case TypeDef::IsStructType: {
+      cursor = structType_.serialize(cursor);
+      break;
+    }
+    case TypeDef::IsFuncType: {
+      cursor = funcType_.serialize(cursor);
+      break;
+    }
+    case TypeDef::IsNone: {
+      break;
+    }
+    default:
+      MOZ_ASSERT_UNREACHABLE();
+  }
+  return cursor;
 }
 
-size_t FuncTypeWithId::serializedSize() const {
-  return FuncType::serializedSize() + sizeof(id);
+const uint8_t* TypeDef::deserialize(const uint8_t* cursor) {
+  cursor = ReadBytes(cursor, &tag_, sizeof(tag_));
+  switch (tag_) {
+    case TypeDef::IsStructType: {
+      cursor = structType_.deserialize(cursor);
+      break;
+    }
+    case TypeDef::IsFuncType: {
+      cursor = funcType_.deserialize(cursor);
+      break;
+    }
+    case TypeDef::IsNone: {
+      break;
+    }
+    default:
+      MOZ_ASSERT_UNREACHABLE();
+  }
+  return cursor;
 }
 
-uint8_t* FuncTypeWithId::serialize(uint8_t* cursor) const {
-  cursor = FuncType::serialize(cursor);
+size_t TypeDef::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const {
+  switch (tag_) {
+    case TypeDef::IsStructType: {
+      return structType_.sizeOfExcludingThis(mallocSizeOf);
+    }
+    case TypeDef::IsFuncType: {
+      return funcType_.sizeOfExcludingThis(mallocSizeOf);
+    }
+    case TypeDef::IsNone: {
+      return 0;
+    }
+    default:
+      break;
+  }
+  MOZ_ASSERT_UNREACHABLE();
+  return 0;
+}
+
+size_t TypeDefWithId::serializedSize() const {
+  return TypeDef::serializedSize() + sizeof(TypeIdDesc);
+}
+
+uint8_t* TypeDefWithId::serialize(uint8_t* cursor) const {
+  cursor = TypeDef::serialize(cursor);
   cursor = WriteBytes(cursor, &id, sizeof(id));
   return cursor;
 }
 
-const uint8_t* FuncTypeWithId::deserialize(const uint8_t* cursor) {
-  (cursor = FuncType::deserialize(cursor)) &&
-      (cursor = ReadBytes(cursor, &id, sizeof(id)));
+const uint8_t* TypeDefWithId::deserialize(const uint8_t* cursor) {
+  cursor = TypeDef::deserialize(cursor);
+  cursor = ReadBytes(cursor, &id, sizeof(id));
   return cursor;
 }
 
-size_t FuncTypeWithId::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const {
-  return FuncType::sizeOfExcludingThis(mallocSizeOf);
+size_t TypeDefWithId::sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const {
+  return TypeDef::sizeOfExcludingThis(mallocSizeOf);
 }
 
 ArgTypeVector::ArgTypeVector(const FuncType& funcType)
@@ -358,6 +794,81 @@
       hasStackResults_(ABIResultIter::HasStackResults(
           ResultType::Vector(funcType.results()))) {}
 
+static inline CheckedInt32 RoundUpToAlignment(CheckedInt32 address,
+                                              uint32_t align) {
+  MOZ_ASSERT(IsPowerOfTwo(align));
+
+  // Note: Be careful to order operators such that we first make the
+  // value smaller and then larger, so that we don't get false
+  // overflow errors due to (e.g.) adding `align` and then
+  // subtracting `1` afterwards when merely adding `align-1` would
+  // not have overflowed. Note that due to the nature of two's
+  // complement representation, if `address` is already aligned,
+  // then adding `align-1` cannot itself cause an overflow.
+
+  return ((address + (align - 1)) / align) * align;
+}
+
+class StructLayout {
+  CheckedInt32 sizeSoFar = 0;
+  uint32_t structAlignment = 1;
+
+ public:
+  // The field adders return the offset of the the field.
+  CheckedInt32 addField(ValType type) {
+    uint32_t fieldSize = type.size();
+    uint32_t fieldAlignment = type.alignmentInStruct();
+
+    // Alignment of the struct is the max of the alignment of its fields.
+    structAlignment = std::max(structAlignment, fieldAlignment);
+
+    // Align the pointer.
+    CheckedInt32 offset = RoundUpToAlignment(sizeSoFar, fieldAlignment);
+    if (!offset.isValid()) {
+      return offset;
+    }
+
+    // Allocate space.
+    sizeSoFar = offset + fieldSize;
+    if (!sizeSoFar.isValid()) {
+      return sizeSoFar;
+    }
+
+    return offset;
+  }
+
+  // The close method rounds up the structure size to the appropriate
+  // alignment and returns that size.
+  CheckedInt32 close() {
+    return RoundUpToAlignment(sizeSoFar, structAlignment);
+  }
+};
+
+bool StructType::computeLayout() {
+  StructLayout layout;
+  for (StructField& field : fields_) {
+    CheckedInt32 offset = layout.addField(field.type);
+    if (!offset.isValid()) {
+      return false;
+    }
+    field.offset = offset.value();
+  }
+
+  CheckedInt32 size = layout.close();
+  if (!size.isValid()) {
+    return false;
+  }
+  size_ = size.value();
+  isInline_ = InlineTypedObject::canAccommodateSize(size_);
+
+  return true;
+}
+
+uint32_t StructType::objectBaseFieldOffset(uint32_t fieldIndex) const {
+  return fields_[fieldIndex].offset +
+         (isInline_ ? InlineTypedObject::offsetOfDataStart() : 0);
+}
+
 // A simple notion of prefix: types and mutability must match exactly.
 
 bool StructType::hasPrefix(const StructType& other) const {
@@ -375,16 +886,20 @@
 }
 
 size_t StructType::serializedSize() const {
-  return SerializedPodVectorSize(fields_);
+  return SerializedPodVectorSize(fields_) + sizeof(size_) + sizeof(isInline_);
 }
 
 uint8_t* StructType::serialize(uint8_t* cursor) const {
   cursor = SerializePodVector(cursor, fields_);
+  cursor = WriteBytes(cursor, &size_, sizeof(size_));
+  cursor = WriteBytes(cursor, &isInline_, sizeof(isInline_));
   return cursor;
 }
 
 const uint8_t* StructType::deserialize(const uint8_t* cursor) {
-  (cursor = DeserializePodVector(cursor, &fields_));
+  (cursor = DeserializePodVector(cursor, &fields_)) &&
+      (cursor = ReadBytes(cursor, &size_, sizeof(size_))) &&
+      (cursor = ReadBytes(cursor, &isInline_, sizeof(isInline_)));
   return cursor;
 }
 
@@ -437,6 +952,13 @@
   return pod.index_;
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+uint32_t Export::eventIndex() const {
+  MOZ_ASSERT(pod.kind_ == DefinitionKind::Event);
+  return pod.index_;
+}
+#endif
+
 uint32_t Export::tableIndex() const {
   MOZ_ASSERT(pod.kind_ == DefinitionKind::Table);
   return pod.index_;
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmTypes.h firefox-85.0+build1/js/src/wasm/WasmTypes.h
--- firefox-84.0.2+build1/js/src/wasm/WasmTypes.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmTypes.h	2021-01-18 19:58:16.000000000 +0000
@@ -39,7 +39,6 @@
 #include "js/UniquePtr.h"
 #include "js/Utility.h"
 #include "js/Vector.h"
-#include "vm/JSFunction.h"
 #include "vm/MallocProvider.h"
 #include "vm/NativeObject.h"
 #include "wasm/WasmConstants.h"
@@ -48,7 +47,6 @@
 namespace js {
 
 namespace jit {
-class JitScript;
 enum class RoundingMode;
 template <class VecT, class ABIArgGeneratorT>
 class ABIArgIterBase;
@@ -86,9 +84,10 @@
     WasmGlobalObjectVector;
 using RootedWasmGlobalObject = Rooted<WasmGlobalObject*>;
 
-class StructTypeDescr;
-typedef GCVector<HeapPtr<StructTypeDescr*>, 0, SystemAllocPolicy>
-    StructTypeDescrVector;
+class WasmExceptionObject;
+typedef GCVector<WasmExceptionObject*, 0, SystemAllocPolicy>
+    WasmExceptionObjectVector;
+using RootedWasmExceptionObject = Rooted<WasmExceptionObject*>;
 
 namespace wasm {
 
@@ -123,6 +122,8 @@
 typedef Vector<char, 0, SystemAllocPolicy> UTF8Bytes;
 typedef Vector<Instance*, 0, SystemAllocPolicy> InstanceVector;
 typedef Vector<UniqueChars, 0, SystemAllocPolicy> UniqueCharsVector;
+typedef HashMap<uint32_t, uint32_t, DefaultHasher<uint32_t>, SystemAllocPolicy>
+    RenumberMap;
 
 // Bit set as the lowest bit of a frame pointer, used in two different mutually
 // exclusive situations:
@@ -642,11 +643,22 @@
     return IsReferenceType(tc_);
   }
 
+  // Returns whether the type has a default value.
   bool isDefaultable() const {
     MOZ_ASSERT(isValid());
     return !isReference() || isNullable();
   }
 
+  // Returns whether the type has a representation in JS.
+  bool isExposable() const {
+    MOZ_ASSERT(isValid());
+#if defined(ENABLE_WASM_SIMD) || defined(ENABLE_WASM_GC)
+    return kind() != ValType::V128 && !isTypeIndex();
+#else
+    return true;
+#endif
+  }
+
   Kind kind() const {
     MOZ_ASSERT(isValid());
     return Kind(UnpackTypeCodeTypeAbstracted(tc_));
@@ -677,6 +689,45 @@
     }
   }
 
+  uint32_t size() const {
+    switch (kind()) {
+      case ValType::I32:
+        return 4;
+      case ValType::I64:
+        return 8;
+      case ValType::F32:
+        return 4;
+      case ValType::F64:
+        return 8;
+      case ValType::V128:
+        return 16;
+      case ValType::Ref:
+        return sizeof(void*);
+    }
+    MOZ_ASSERT_UNREACHABLE();
+    return 0;
+  }
+
+  uint32_t alignmentInStruct() { return size(); }
+
+  void renumber(const RenumberMap& map) {
+    if (!isTypeIndex()) {
+      return;
+    }
+
+    if (RenumberMap::Ptr p = map.lookup(refType().typeIndex())) {
+      *this = RefType::fromTypeIndex(p->value(), isNullable());
+    }
+  }
+
+  void offsetTypeIndex(uint32_t offsetBy) {
+    if (!isTypeIndex()) {
+      return;
+    }
+    *this =
+        RefType::fromTypeIndex(refType().typeIndex() + offsetBy, isNullable());
+  }
+
   bool operator==(const ValType& that) const {
     MOZ_ASSERT(isValid() && that.isValid());
     return tc_ == that.tc_;
@@ -714,6 +765,17 @@
     MOZ_ASSERT(lane < 16 / sizeof(T));
     memcpy(bytes + sizeof(T) * lane, &value, sizeof(T));
   }
+
+  bool operator==(const V128& rhs) const {
+    for (size_t i = 0; i < sizeof(bytes); i++) {
+      if (bytes[i] != rhs.bytes[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool operator!=(const V128& rhs) const { return !(*this == rhs); }
 };
 
 static_assert(sizeof(V128) == 16, "Invariant");
@@ -805,7 +867,9 @@
 // WasmAnyRefFromJSObject) and in WasmStubs.cpp (in functions Box* and Unbox*).
 
 class AnyRef {
-  JSObject* value_;
+  // mutable so that tracing may access a JSObject* from a `const Val` or
+  // `const AnyRef`.
+  mutable JSObject* value_;
 
   explicit AnyRef() : value_((JSObject*)-1) {}
   explicit AnyRef(JSObject* p) : value_(p) {
@@ -826,13 +890,19 @@
   // Generate an AnyRef null pointer.
   static AnyRef null() { return AnyRef(nullptr); }
 
-  bool isNull() { return value_ == nullptr; }
+  bool isNull() const { return value_ == nullptr; }
+
+  bool operator==(const AnyRef& rhs) const {
+    return this->value_ == rhs.value_;
+  }
+
+  bool operator!=(const AnyRef& rhs) const { return !(*this == rhs); }
 
   void* forCompiledCode() const { return value_; }
 
-  JSObject* asJSObject() { return value_; }
+  JSObject* asJSObject() const { return value_; }
 
-  JSObject** asJSObjectAddress() { return &value_; }
+  JSObject** asJSObjectAddress() const { return &value_; }
 
   void trace(JSTracer* trc);
 
@@ -930,20 +1000,7 @@
 
   // Given an AnyRef that represents a possibly-null funcref, turn it into a
   // FuncRef.
-  static FuncRef fromAnyRefUnchecked(AnyRef p) {
-#ifdef DEBUG
-    Value v = UnboxAnyRef(p);
-    if (v.isNull()) {
-      return FuncRef(nullptr);
-    }
-    if (v.toObject().is<JSFunction>()) {
-      return FuncRef(&v.toObject().as<JSFunction>());
-    }
-    MOZ_CRASH("Bad value");
-#else
-    return FuncRef(&p.asJSObject()->as<JSFunction>());
-#endif
-  }
+  static FuncRef fromAnyRefUnchecked(AnyRef p);
 
   AnyRef asAnyRef() { return AnyRef::fromJSObject((JSObject*)value_); }
 
@@ -962,6 +1019,21 @@
 
 Value UnboxFuncRef(FuncRef val);
 
+// Exception tags are used to uniquely identify exceptions. They are stored
+// in a vector in Instances and used by both WebAssembly.Exception for import
+// and export, and by the representation of thrown exceptions.
+//
+// Since an exception tag is a (trivial) substructure of AtomicRefCounted, the
+// RefPtr SharedExceptionTag can have many instances/modules referencing a
+// single constant exception tag.
+
+struct ExceptionTag : AtomicRefCounted<ExceptionTag> {
+  ExceptionTag() = default;
+};
+using SharedExceptionTag = RefPtr<ExceptionTag>;
+typedef Vector<SharedExceptionTag, 0, SystemAllocPolicy>
+    SharedExceptionTagVector;
+
 // Code can be compiled either with the Baseline compiler or the Ion compiler,
 // and tier-variant data are tagged with the Tier value.
 //
@@ -1005,6 +1077,40 @@
 
 enum class Shareable { False, True };
 
+// Describes the features that control wasm compilation.
+
+struct FeatureArgs {
+  FeatureArgs()
+      : sharedMemory(Shareable::False),
+        refTypes(false),
+        functionReferences(false),
+        gcTypes(false),
+        multiValue(false),
+        v128(false),
+        hugeMemory(false),
+        exceptions(false) {}
+  FeatureArgs(const FeatureArgs&) = default;
+  FeatureArgs& operator=(const FeatureArgs&) = default;
+  FeatureArgs(FeatureArgs&&) = default;
+
+  static FeatureArgs build(JSContext* cx);
+
+  FeatureArgs withRefTypes(bool refTypes) const {
+    FeatureArgs features = *this;
+    features.refTypes = refTypes;
+    return features;
+  }
+
+  Shareable sharedMemory;
+  bool refTypes;
+  bool functionReferences;
+  bool gcTypes;
+  bool multiValue;
+  bool v128;
+  bool hugeMemory;
+  bool exceptions;
+};
+
 // The LitVal class represents a single WebAssembly value of a given value
 // type, mostly for the purpose of numeric literals and initializers. A LitVal
 // does not directly map to a JS value since there is not (currently) a precise
@@ -1013,98 +1119,104 @@
 // happen at the JS boundary.
 
 class LitVal {
- protected:
-  ValType type_;
-  union U {
-    U() : i32_(0) {}
-    uint32_t i32_;
-    uint64_t i64_;
+ public:
+  union Cell {
+    int32_t i32_;
+    int64_t i64_;
     float f32_;
     double f64_;
-    AnyRef ref_;
-    V128 v128_;
-  } u;
+    wasm::V128 v128_;
+    wasm::AnyRef ref_;
+    Cell() : v128_() {}
+    ~Cell() = default;
+  };
+
+ protected:
+  ValType type_;
+  Cell cell_;
 
  public:
-  LitVal() : type_(), u{} {}
+  LitVal() : type_(ValType()), cell_{} {}
 
   explicit LitVal(ValType type) : type_(type) {
+    MOZ_ASSERT(type.isDefaultable());
     switch (type.kind()) {
       case ValType::Kind::I32: {
-        u.i32_ = 0;
+        cell_.i32_ = 0;
         break;
       }
       case ValType::Kind::I64: {
-        u.i64_ = 0;
+        cell_.i64_ = 0;
         break;
       }
       case ValType::Kind::F32: {
-        u.f32_ = 0;
+        cell_.f32_ = 0;
         break;
       }
       case ValType::Kind::F64: {
-        u.f64_ = 0;
+        cell_.f64_ = 0;
         break;
       }
       case ValType::Kind::V128: {
-        new (&u.v128_) V128();
+        new (&cell_.v128_) V128();
         break;
       }
       case ValType::Kind::Ref: {
-        u.ref_ = AnyRef::null();
+        cell_.ref_ = AnyRef::null();
         break;
       }
     }
   }
 
-  explicit LitVal(uint32_t i32) : type_(ValType::I32) { u.i32_ = i32; }
-  explicit LitVal(uint64_t i64) : type_(ValType::I64) { u.i64_ = i64; }
+  explicit LitVal(uint32_t i32) : type_(ValType::I32) { cell_.i32_ = i32; }
+  explicit LitVal(uint64_t i64) : type_(ValType::I64) { cell_.i64_ = i64; }
 
-  explicit LitVal(float f32) : type_(ValType::F32) { u.f32_ = f32; }
-  explicit LitVal(double f64) : type_(ValType::F64) { u.f64_ = f64; }
+  explicit LitVal(float f32) : type_(ValType::F32) { cell_.f32_ = f32; }
+  explicit LitVal(double f64) : type_(ValType::F64) { cell_.f64_ = f64; }
 
-  explicit LitVal(V128 v128) : type_(ValType::V128) { u.v128_ = v128; }
+  explicit LitVal(V128 v128) : type_(ValType::V128) { cell_.v128_ = v128; }
 
   explicit LitVal(ValType type, AnyRef any) : type_(type) {
     MOZ_ASSERT(type.isReference());
     MOZ_ASSERT(any.isNull(),
                "use Val for non-nullptr ref types to get tracing");
-    u.ref_ = any;
+    cell_.ref_ = any;
   }
 
   ValType type() const { return type_; }
-  static constexpr size_t sizeofLargestValue() { return sizeof(u); }
+  static constexpr size_t sizeofLargestValue() { return sizeof(cell_); }
+
+  Cell& cell() { return cell_; }
+  const Cell& cell() const { return cell_; }
 
   uint32_t i32() const {
     MOZ_ASSERT(type_ == ValType::I32);
-    return u.i32_;
+    return cell_.i32_;
   }
   uint64_t i64() const {
     MOZ_ASSERT(type_ == ValType::I64);
-    return u.i64_;
+    return cell_.i64_;
   }
   const float& f32() const {
     MOZ_ASSERT(type_ == ValType::F32);
-    return u.f32_;
+    return cell_.f32_;
   }
   const double& f64() const {
     MOZ_ASSERT(type_ == ValType::F64);
-    return u.f64_;
+    return cell_.f64_;
   }
   AnyRef ref() const {
     MOZ_ASSERT(type_.isReference());
-    return u.ref_;
+    return cell_.ref_;
   }
   const V128& v128() const {
     MOZ_ASSERT(type_ == ValType::V128);
-    return u.v128_;
+    return cell_.v128_;
   }
 };
 
 // A Val is a LitVal that can contain (non-null) pointers to GC things. All Vals
-// must be stored in Rooteds so that their trace() methods are called during
-// stack marking. Vals do not implement barriers and thus may not be stored on
-// the heap.
+// must be used with the rooting APIs as they may contain JS objects.
 
 class MOZ_NON_PARAM Val : public LitVal {
  public:
@@ -1118,15 +1230,62 @@
   explicit Val(V128 v128) : LitVal(v128) {}
   explicit Val(ValType type, AnyRef val) : LitVal(type, AnyRef::null()) {
     MOZ_ASSERT(type.isReference());
-    u.ref_ = val;
+    cell_.ref_ = val;
   }
   explicit Val(ValType type, FuncRef val) : LitVal(type, AnyRef::null()) {
     MOZ_ASSERT(type.isFuncRef());
-    u.ref_ = val.asAnyRef();
+    cell_.ref_ = val.asAnyRef();
   }
-  void trace(JSTracer* trc);
+
+  Val(const Val&) = default;
+  Val& operator=(const Val&) = default;
+
+  bool operator==(const Val& rhs) const {
+    if (type_ != rhs.type_) {
+      return false;
+    }
+    switch (type_.kind()) {
+      case ValType::I32:
+        return cell_.i32_ == rhs.cell_.i32_;
+      case ValType::I64:
+        return cell_.i64_ == rhs.cell_.i64_;
+      case ValType::F32:
+        return cell_.f32_ == rhs.cell_.f32_;
+      case ValType::F64:
+        return cell_.f64_ == rhs.cell_.f64_;
+      case ValType::V128:
+        return cell_.v128_ == rhs.cell_.v128_;
+      case ValType::Ref:
+        return cell_.ref_ == rhs.cell_.ref_;
+    }
+    MOZ_ASSERT_UNREACHABLE();
+    return false;
+  }
+  bool operator!=(const Val& rhs) const { return !(*this == rhs); }
+
+  bool isJSObject() const {
+    return type_.isValid() && type_.isReference() && !cell_.ref_.isNull();
+  }
+
+  JSObject* asJSObject() const {
+    MOZ_ASSERT(isJSObject());
+    return cell_.ref_.asJSObject();
+  }
+
+  JSObject** asJSObjectAddress() const {
+    return cell_.ref_.asJSObjectAddress();
+  }
+
+  // See the comment for `ToWebAssemblyValue` below.
+  static bool fromJSValue(JSContext* cx, ValType targetType, HandleValue val,
+                          MutableHandle<Val> rval);
+  // See the comment for `ToJSValue` below.
+  bool toJSValue(JSContext* cx, MutableHandleValue rval) const;
+
+  void trace(JSTracer* trc) const;
 };
 
+using GCPtrVal = GCPtr<Val>;
 using RootedVal = Rooted<Val>;
 using HandleVal = Handle<Val>;
 using MutableHandleVal = MutableHandle<Val>;
@@ -1136,6 +1295,54 @@
 using HandleValVector = Handle<ValVector>;
 using MutableHandleValVector = MutableHandle<ValVector>;
 
+// Check a value against the given reference type.  If the targetType
+// is RefType::Extern then the test always passes, but the value may be boxed.
+// If the test passes then the value is stored either in fnval (for
+// RefType::Func) or in refval (for other types); this split is not strictly
+// necessary but is convenient for the users of this function.
+//
+// This can return false if the type check fails, or if a boxing into AnyRef
+// throws an OOM.
+extern MOZ_MUST_USE bool CheckRefType(JSContext* cx, RefType targetType,
+                                      HandleValue v,
+                                      MutableHandleFunction fnval,
+                                      MutableHandleAnyRef refval);
+
+// The same as above for when the target type is 'funcref'.
+extern MOZ_MUST_USE bool CheckFuncRefValue(JSContext* cx, HandleValue v,
+                                           MutableHandleFunction fun);
+
+// The same as above for when the target type is 'eqref'.
+extern MOZ_MUST_USE bool CheckEqRefValue(JSContext* cx, HandleValue v,
+                                         MutableHandleAnyRef vp);
+class NoDebug;
+class DebugCodegenVal;
+
+// Coercion function from a JS value to a WebAssembly value [1].
+//
+// This function may fail for any of the following reasons:
+//  * The input value has an incorrect type for the targetType
+//  * The targetType is not exposable
+//  * An OOM ocurred
+// An error will be set upon failure.
+//
+// [1] https://webassembly.github.io/spec/js-api/index.html#towebassemblyvalue
+template <typename Debug = NoDebug>
+extern bool ToWebAssemblyValue(JSContext* cx, HandleValue val, ValType type,
+                               void* loc, bool mustWrite64);
+
+// Coercion function from a WebAssembly value to a JS value [1].
+//
+// This function will only fail if an OOM ocurred. If the type of WebAssembly
+// value being coerced is not exposable to JS, then it will be coerced to
+// 'undefined'. Callers are responsible for guarding against this if this is
+// not desirable.
+//
+// [1] https://webassembly.github.io/spec/js-api/index.html#tojsvalue
+template <typename Debug = NoDebug>
+extern bool ToJSValue(JSContext* cx, const void* src, ValType type,
+                      MutableHandleValue dst);
+
 // The FuncType class represents a WebAssembly function signature which takes a
 // list of value types and returns an expression type. The engine uses two
 // in-memory representations of the argument Vector's memory (when elements do
@@ -1155,10 +1362,27 @@
   FuncType(ValTypeVector&& args, ValTypeVector&& results)
       : args_(std::move(args)), results_(std::move(results)) {}
 
-  MOZ_MUST_USE bool clone(const FuncType& rhs) {
+  MOZ_MUST_USE bool clone(const FuncType& src) {
     MOZ_ASSERT(args_.empty());
     MOZ_ASSERT(results_.empty());
-    return args_.appendAll(rhs.args_) && results_.appendAll(rhs.results_);
+    return args_.appendAll(src.args_) && results_.appendAll(src.results_);
+  }
+
+  void renumber(const RenumberMap& map) {
+    for (auto& arg : args_) {
+      arg.renumber(map);
+    }
+    for (auto& result : results_) {
+      result.renumber(map);
+    }
+  }
+  void offsetTypeIndex(uint32_t offsetBy) {
+    for (auto& arg : args_) {
+      arg.offsetTypeIndex(offsetBy);
+    }
+    for (auto& result : results_) {
+      result.offsetTypeIndex(offsetBy);
+    }
   }
 
   ValType arg(unsigned i) const { return args_[i]; }
@@ -1192,21 +1416,19 @@
   bool temporarilyUnsupportedResultCountForJitExit() const {
     return results().length() > MaxResultsForJitExit;
   }
-#ifdef ENABLE_WASM_SIMD
-  bool hasV128ArgOrRet() const {
+  bool hasUnexposableArgOrRet() const {
     for (ValType arg : args()) {
-      if (arg == ValType::V128) {
+      if (!arg.isExposable()) {
         return true;
       }
     }
     for (ValType result : results()) {
-      if (result == ValType::V128) {
+      if (!result.isExposable()) {
         return true;
       }
     }
     return false;
   }
-#endif
   // For JS->wasm jit entries, temporarily disallow certain types until the
   // stubs generator is improved.
   //   * ref params may be nullable externrefs
@@ -1245,15 +1467,9 @@
   }
   // For wasm->JS jit exits, temporarily disallow certain types until
   // the stubs generator is improved.
-  //   * ref params may not be type indices
   //   * ref results may be nullable externrefs
-  // V128 types are excluded per spec but are guarded against separately.
+  // Unexposable types must be guarded against separately.
   bool temporarilyUnsupportedReftypeForExit() const {
-    for (ValType arg : args()) {
-      if (arg.isTypeIndex()) {
-        return true;
-      }
-    }
     for (ValType result : results()) {
       if (result.isReference() &&
           (!result.isExternRef() || !result.isNullable())) {
@@ -1262,14 +1478,6 @@
     }
     return false;
   }
-  bool jitExitRequiresArgCheck() const {
-    for (ValType arg : args()) {
-      if (arg.isEncodedAsJSValueOnEscape()) {
-        return true;
-      }
-    }
-    return false;
-  }
 #ifdef WASM_PRIVATE_REFTYPES
   bool exposesTypeIndex() const {
     for (const ValType& arg : args()) {
@@ -1684,33 +1892,55 @@
 class StructType {
  public:
   StructFieldVector fields_;  // Field type, offset, and mutability
-  uint32_t moduleIndex_;      // Index in a dense array of structs in the module
+  uint32_t size_;             // The size of the type in bytes.
   bool isInline_;             // True if this is an InlineTypedObject and we
                    //   interpret the offsets from the object pointer;
                    //   if false this is an OutlineTypedObject and we
                    //   interpret everything relative to the pointer to
                    //   the attached storage.
  public:
-  StructType() : fields_(), moduleIndex_(0), isInline_(true) {}
+  StructType() : fields_(), size_(0), isInline_(true) {}
+
+  explicit StructType(StructFieldVector&& fields)
+      : fields_(std::move(fields)), size_(0), isInline_(true) {}
 
-  StructType(StructFieldVector&& fields, uint32_t index, bool isInline)
-      : fields_(std::move(fields)), moduleIndex_(index), isInline_(isInline) {}
+  StructType(StructType&&) = default;
+  StructType& operator=(StructType&&) = default;
 
-  bool copyFrom(const StructType& src) {
+  MOZ_MUST_USE bool clone(const StructType& src) {
     if (!fields_.appendAll(src.fields_)) {
       return false;
     }
-    moduleIndex_ = src.moduleIndex_;
+    size_ = src.size_;
     isInline_ = src.isInline_;
     return true;
   }
 
+  void renumber(const RenumberMap& map) {
+    for (auto& field : fields_) {
+      field.type.renumber(map);
+    }
+  }
+  void offsetTypeIndex(uint32_t offsetBy) {
+    for (auto& field : fields_) {
+      field.type.offsetTypeIndex(offsetBy);
+    }
+  }
+
+  MOZ_MUST_USE bool computeLayout();
+
+  // Get the offset to a field from the base of the struct object. This
+  // is just the field offset for outline typed objects, but includes
+  // the header for inline typed objects.
+  uint32_t objectBaseFieldOffset(uint32_t fieldIndex) const;
+
   bool hasPrefix(const StructType& other) const;
 
   WASM_DECLARE_SERIALIZABLE(StructType)
 };
 
 typedef Vector<StructType, 0, SystemAllocPolicy> StructTypeVector;
+typedef Vector<const StructType*, 0, SystemAllocPolicy> StructTypePtrVector;
 
 // An InitExpr describes a deferred initializer expression, used to initialize
 // a global or a table element offset. Such expressions are created during
@@ -1848,6 +2078,9 @@
 
   DefinitionKind kind() const { return pod.kind_; }
   uint32_t funcIndex() const;
+#ifdef ENABLE_WASM_EXCEPTIONS
+  uint32_t eventIndex() const;
+#endif
   uint32_t globalIndex() const;
   uint32_t tableIndex() const;
 
@@ -1856,6 +2089,22 @@
 
 typedef Vector<Export, 0, SystemAllocPolicy> ExportVector;
 
+// A FuncDesc describes a single function.
+
+class TypeIdDesc;
+
+struct FuncDesc {
+  FuncType* type;
+  TypeIdDesc* typeId;
+  uint32_t typeIndex;
+
+  FuncDesc() = default;
+  FuncDesc(FuncType* type, TypeIdDesc* typeId, uint32_t typeIndex)
+      : type(type), typeId(typeId), typeIndex(typeIndex) {}
+};
+
+typedef Vector<FuncDesc, 0, SystemAllocPolicy> FuncDescVector;
+
 // A GlobalDesc describes a single global variable.
 //
 // wasm can import and export mutable and immutable globals.
@@ -1987,6 +2236,22 @@
 
 typedef Vector<GlobalDesc, 0, SystemAllocPolicy> GlobalDescVector;
 
+// An EventDesc describes a single event for non-local control flow, such as
+// for exceptions.
+
+#ifdef ENABLE_WASM_EXCEPTIONS
+struct EventDesc {
+  EventKind kind;
+  ResultType type;
+  bool isExport;
+
+  EventDesc(EventKind kind, ResultType type, bool isExport = false)
+      : kind(kind), type(type), isExport(isExport) {}
+};
+
+typedef Vector<EventDesc, 0, SystemAllocPolicy> EventDescVector;
+#endif
+
 // When a ElemSegment is "passive" it is shared between a wasm::Module and its
 // wasm::Instances. To allow each segment to be released as soon as the last
 // Instance elem.drops it and the Module is destroyed, each ElemSegment is
@@ -2098,77 +2363,13 @@
 
 typedef Vector<Name, 0, SystemAllocPolicy> NameVector;
 
-// FuncTypeIdDesc describes a function type that can be used by call_indirect
-// and table-entry prologues to structurally compare whether the caller and
-// callee's signatures *structurally* match. To handle the general case, a
-// FuncType is allocated and stored in a process-wide hash table, so that
-// pointer equality implies structural equality. As an optimization for the 99%
-// case where the FuncType has a small number of parameters, the FuncType is
-// bit-packed into a uint32 immediate value so that integer equality implies
-// structural equality. Both cases can be handled with a single comparison by
-// always setting the LSB for the immediates (the LSB is necessarily 0 for
-// allocated FuncType pointers due to alignment).
-
-class FuncTypeIdDesc {
- public:
-  static const uintptr_t ImmediateBit = 0x1;
-
- private:
-  FuncTypeIdDescKind kind_;
-  size_t bits_;
-
-  FuncTypeIdDesc(FuncTypeIdDescKind kind, size_t bits)
-      : kind_(kind), bits_(bits) {}
-
- public:
-  FuncTypeIdDescKind kind() const { return kind_; }
-  static bool isGlobal(const FuncType& funcType);
-
-  FuncTypeIdDesc() : kind_(FuncTypeIdDescKind::None), bits_(0) {}
-  static FuncTypeIdDesc global(const FuncType& funcType,
-                               uint32_t globalDataOffset);
-  static FuncTypeIdDesc immediate(const FuncType& funcType);
-
-  bool isGlobal() const { return kind_ == FuncTypeIdDescKind::Global; }
-
-  size_t immediate() const {
-    MOZ_ASSERT(kind_ == FuncTypeIdDescKind::Immediate);
-    return bits_;
-  }
-  uint32_t globalDataOffset() const {
-    MOZ_ASSERT(kind_ == FuncTypeIdDescKind::Global);
-    return bits_;
-  }
-};
-
-// FuncTypeWithId pairs a FuncType with FuncTypeIdDesc, describing either how to
-// compile code that compares this signature's id or, at instantiation what
-// signature ids to allocate in the global hash and where to put them.
-
-struct FuncTypeWithId : FuncType {
-  FuncTypeIdDesc id;
-
-  FuncTypeWithId() = default;
-  explicit FuncTypeWithId(FuncType&& funcType)
-      : FuncType(std::move(funcType)), id() {}
-  FuncTypeWithId(FuncType&& funcType, FuncTypeIdDesc id)
-      : FuncType(std::move(funcType)), id(id) {}
-  void operator=(FuncType&& rhs) { FuncType::operator=(std::move(rhs)); }
-
-  WASM_DECLARE_SERIALIZABLE(FuncTypeWithId)
-};
-
-typedef Vector<FuncTypeWithId, 0, SystemAllocPolicy> FuncTypeWithIdVector;
-typedef Vector<const FuncTypeWithId*, 0, SystemAllocPolicy>
-    FuncTypeWithIdPtrVector;
-
 // A tagged container for the various types that can be present in a wasm
 // module's type section.
 
 class TypeDef {
   enum { IsFuncType, IsStructType, IsNone } tag_;
   union {
-    FuncTypeWithId funcType_;
+    FuncType funcType_;
     StructType structType_;
   };
 
@@ -2176,7 +2377,7 @@
   TypeDef() : tag_(IsNone) {}
 
   explicit TypeDef(FuncType&& funcType)
-      : tag_(IsFuncType), funcType_(FuncTypeWithId(std::move(funcType))) {}
+      : tag_(IsFuncType), funcType_(std::move(funcType)) {}
 
   explicit TypeDef(StructType&& structType)
       : tag_(IsStructType), structType_(std::move(structType)) {}
@@ -2184,7 +2385,7 @@
   TypeDef(TypeDef&& td) : tag_(td.tag_) {
     switch (tag_) {
       case IsFuncType:
-        new (&funcType_) FuncTypeWithId(std::move(td.funcType_));
+        new (&funcType_) FuncType(std::move(td.funcType_));
         break;
       case IsStructType:
         new (&structType_) StructType(std::move(td.structType_));
@@ -2197,7 +2398,7 @@
   ~TypeDef() {
     switch (tag_) {
       case IsFuncType:
-        funcType_.~FuncTypeWithId();
+        funcType_.~FuncType();
         break;
       case IsStructType:
         structType_.~StructType();
@@ -2211,7 +2412,7 @@
     MOZ_ASSERT(isNone());
     switch (that.tag_) {
       case IsFuncType:
-        new (&funcType_) FuncTypeWithId(std::move(that.funcType_));
+        new (&funcType_) FuncType(std::move(that.funcType_));
         break;
       case IsStructType:
         new (&structType_) StructType(std::move(that.structType_));
@@ -2223,31 +2424,39 @@
     return *this;
   }
 
+  MOZ_MUST_USE bool clone(const TypeDef& src) {
+    MOZ_ASSERT(isNone());
+    tag_ = src.tag_;
+    switch (src.tag_) {
+      case IsFuncType:
+        new (&funcType_) FuncType();
+        return funcType_.clone(src.funcType());
+      case IsStructType:
+        new (&structType_) StructType();
+        return structType_.clone(src.structType());
+      case IsNone:
+        break;
+    }
+    MOZ_ASSERT_UNREACHABLE();
+    return false;
+  }
+
   bool isFuncType() const { return tag_ == IsFuncType; }
 
   bool isNone() const { return tag_ == IsNone; }
 
   bool isStructType() const { return tag_ == IsStructType; }
 
-  const FuncTypeWithId& funcType() const {
+  const FuncType& funcType() const {
     MOZ_ASSERT(isFuncType());
     return funcType_;
   }
 
-  FuncTypeWithId& funcType() {
+  FuncType& funcType() {
     MOZ_ASSERT(isFuncType());
     return funcType_;
   }
 
-  // p has to point to the funcType_ embedded within a TypeDef for this to be
-  // valid.
-  static const TypeDef* fromFuncTypeWithIdPtr(const FuncTypeWithId* p) {
-    const TypeDef* q =
-        (const TypeDef*)((char*)p - offsetof(TypeDef, funcType_));
-    MOZ_ASSERT(q->tag_ == IsFuncType);
-    return q;
-  }
-
   const StructType& structType() const {
     MOZ_ASSERT(isStructType());
     return structType_;
@@ -2258,18 +2467,254 @@
     return structType_;
   }
 
-  // p has to point to the struct_ embedded within a TypeDef for this to be
-  // valid.
-  static const TypeDef* fromStructPtr(const StructType* p) {
-    const TypeDef* q =
-        (const TypeDef*)((char*)p - offsetof(TypeDef, structType_));
-    MOZ_ASSERT(q->tag_ == IsStructType);
-    return q;
+  void renumber(const RenumberMap& map) {
+    switch (tag_) {
+      case IsFuncType:
+        funcType_.renumber(map);
+        break;
+      case IsStructType:
+        structType_.renumber(map);
+        break;
+      case IsNone:
+        break;
+    }
+  }
+  void offsetTypeIndex(uint32_t offsetBy) {
+    switch (tag_) {
+      case IsFuncType:
+        funcType_.offsetTypeIndex(offsetBy);
+        break;
+      case IsStructType:
+        structType_.offsetTypeIndex(offsetBy);
+        break;
+      case IsNone:
+        break;
+    }
   }
+
+  WASM_DECLARE_SERIALIZABLE(TypeDef)
 };
 
 typedef Vector<TypeDef, 0, SystemAllocPolicy> TypeDefVector;
 
+// TypeIdDesc describes the runtime representation of a TypeDef suitable for
+// type equality checks. The kind of representation depends on whether the type
+// is a function or a struct. This will likely be simplified in the future once
+// mutually recursives types are able to be collected.
+//
+// For functions, a FuncType is allocated and stored in a process-wide hash
+// table, so that pointer equality implies structural equality. As an
+// optimization for the 99% case where the FuncType has a small number of
+// parameters, the FuncType is bit-packed into a uint32 immediate value so that
+// integer equality implies structural equality. Both cases can be handled with
+// a single comparison by always setting the LSB for the immediates
+// (the LSB is necessarily 0 for allocated FuncType pointers due to alignment).
+//
+// TODO: Write description for StructTypes once it is well formed.
+
+class TypeIdDesc {
+ public:
+  static const uintptr_t ImmediateBit = 0x1;
+
+ private:
+  TypeIdDescKind kind_;
+  size_t bits_;
+
+  TypeIdDesc(TypeIdDescKind kind, size_t bits) : kind_(kind), bits_(bits) {}
+
+ public:
+  TypeIdDescKind kind() const { return kind_; }
+  static bool isGlobal(const TypeDef& type);
+
+  TypeIdDesc() : kind_(TypeIdDescKind::None), bits_(0) {}
+  static TypeIdDesc global(const TypeDef& type, uint32_t globalDataOffset);
+  static TypeIdDesc immediate(const TypeDef& type);
+
+  bool isGlobal() const { return kind_ == TypeIdDescKind::Global; }
+
+  size_t immediate() const {
+    MOZ_ASSERT(kind_ == TypeIdDescKind::Immediate);
+    return bits_;
+  }
+  uint32_t globalDataOffset() const {
+    MOZ_ASSERT(kind_ == TypeIdDescKind::Global);
+    return bits_;
+  }
+};
+
+typedef Vector<TypeIdDesc, 0, SystemAllocPolicy> TypeIdDescVector;
+
+// TypeDefWithId pairs a FuncType with TypeIdDesc, describing either how to
+// compile code that compares this signature's id or, at instantiation what
+// signature ids to allocate in the global hash and where to put them.
+
+struct TypeDefWithId : public TypeDef {
+  TypeIdDesc id;
+
+  TypeDefWithId() = default;
+  explicit TypeDefWithId(TypeDef&& typeDef)
+      : TypeDef(std::move(typeDef)), id() {}
+  TypeDefWithId(TypeDef&& typeDef, TypeIdDesc id)
+      : TypeDef(std::move(typeDef)), id(id) {}
+
+  WASM_DECLARE_SERIALIZABLE(TypeDefWithId)
+};
+
+typedef Vector<TypeDefWithId, 0, SystemAllocPolicy> TypeDefWithIdVector;
+typedef Vector<const TypeDefWithId*, 0, SystemAllocPolicy>
+    TypeDefWithIdPtrVector;
+
+// A type context maintains an index space for TypeDef's that can be used to
+// give ValType's meaning. It is used during compilation for modules, and
+// during runtime for all instances.
+
+class TypeContext {
+  FeatureArgs features_;
+  TypeDefVector types_;
+
+ public:
+  TypeContext(const FeatureArgs& features, TypeDefVector&& types)
+      : features_(features), types_(std::move(types)) {}
+
+  // Disallow copy, allow move initialization
+  TypeContext(const TypeContext&) = delete;
+  TypeContext& operator=(const TypeContext&) = delete;
+  TypeContext(TypeContext&&) = default;
+  TypeContext& operator=(TypeContext&&) = default;
+
+  TypeDef& type(uint32_t index) { return types_[index]; }
+  const TypeDef& type(uint32_t index) const { return types_[index]; }
+
+  TypeDef& operator[](uint32_t index) { return types_[index]; }
+  const TypeDef& operator[](uint32_t index) const { return types_[index]; }
+
+  uint32_t length() const { return types_.length(); }
+
+  template <typename U>
+  MOZ_MUST_USE bool append(U&& typeDef) {
+    return types_.append(std::move(typeDef));
+  }
+  MOZ_MUST_USE bool resize(uint32_t length) { return types_.resize(length); }
+
+  MOZ_MUST_USE bool transferTypes(const TypeDefWithIdVector& types,
+                                  uint32_t* baseIndex) {
+    *baseIndex = length();
+    if (!resize(*baseIndex + types.length())) {
+      return false;
+    }
+    for (uint32_t i = 0; i < types.length(); i++) {
+      if (!types_[*baseIndex + i].clone(types[i])) {
+        return false;
+      }
+      types_[*baseIndex + i].offsetTypeIndex(*baseIndex);
+    }
+    return true;
+  }
+
+  // FuncType accessors
+
+  bool isFuncType(uint32_t index) const { return types_[index].isFuncType(); }
+  bool isFuncType(RefType t) const {
+    return t.isTypeIndex() && isFuncType(t.typeIndex());
+  }
+
+  FuncType& funcType(uint32_t index) { return types_[index].funcType(); }
+  const FuncType& funcType(uint32_t index) const {
+    return types_[index].funcType();
+  }
+  FuncType& funcType(RefType t) { return funcType(t.typeIndex()); }
+  const FuncType& funcType(RefType t) const { return funcType(t.typeIndex()); }
+
+  // StructType accessors
+
+  bool isStructType(uint32_t index) const {
+    return types_[index].isStructType();
+  }
+  bool isStructType(RefType t) const {
+    return t.isTypeIndex() && isStructType(t.typeIndex());
+  }
+
+  StructType& structType(uint32_t index) { return types_[index].structType(); }
+  const StructType& structType(uint32_t index) const {
+    return types_[index].structType();
+  }
+  StructType& structType(RefType t) { return structType(t.typeIndex()); }
+  const StructType& structType(RefType t) const {
+    return structType(t.typeIndex());
+  }
+
+  bool isSubtypeOf(ValType one, ValType two) const {
+    // Anything's a subtype of itself.
+    if (one == two) {
+      return true;
+    }
+
+    // A reference may be a subtype of another reference
+    return one.isReference() && two.isReference() &&
+           isRefSubtypeOf(one.refType(), two.refType());
+  }
+
+  bool isRefSubtypeOf(RefType one, RefType two) const {
+    // Anything's a subtype of itself.
+    if (one == two) {
+      return true;
+    }
+#ifdef ENABLE_WASM_FUNCTION_REFERENCES
+    if (features_.functionReferences) {
+      // A subtype must have the same nullability as the supertype or the
+      // supertype must be nullable.
+      if (!(one.isNullable() == two.isNullable() || two.isNullable())) {
+        return false;
+      }
+
+      // Non type-index reftypes are subtypes if they are equal
+      if (!one.isTypeIndex() && !two.isTypeIndex() &&
+          one.kind() == two.kind()) {
+        return true;
+      }
+
+#  ifdef ENABLE_WASM_GC
+      // gc can only be enabled if function-references is enabled
+      if (features_.gcTypes) {
+        // Structs are subtypes of EqRef.
+        if (isStructType(one) && two.isEq()) {
+          return true;
+        }
+        // Struct One is a subtype of struct Two if Two is a prefix of One.
+        if (isStructType(one) && isStructType(two)) {
+          return structType(one).hasPrefix(structType(two));
+        }
+      }
+#  endif
+      return false;
+    }
+#endif
+    return false;
+  }
+
+  size_t sizeOfExcludingThis(MallocSizeOf mallocSizeOf) const {
+    return types_.sizeOfExcludingThis(mallocSizeOf);
+  }
+};
+
+class TypeHandle {
+ private:
+  uint32_t index_;
+
+ public:
+  explicit TypeHandle(uint32_t index) : index_(index) {}
+
+  TypeHandle(const TypeHandle&) = default;
+  TypeHandle& operator=(const TypeHandle&) = default;
+
+  TypeDef& get(TypeContext* tycx) const { return tycx->type(index_); }
+  const TypeDef& get(const TypeContext* tycx) const {
+    return tycx->type(index_);
+  }
+
+  uint32_t index() const { return index_; }
+};
+
 // A wrapper around the bytecode offset of a wasm instruction within a whole
 // module, used for trap offsets or call offsets. These offsets should refer to
 // the first byte of the instruction that triggered the trap / did the call and
@@ -2946,10 +3391,6 @@
   // The callee function's realm.
   JS::Realm* realm;
 
-  // If 'code' points into a JIT code thunk, the JitScript of the callee, for
-  // bidirectional registration purposes.
-  jit::JitScript* jitScript;
-
   // A GC pointer which keeps the callee alive and is used to recover import
   // values for lazy table initialization.
   GCPtrFunction fun;
@@ -3025,7 +3466,7 @@
     struct {
       uint32_t globalDataOffset_;
       uint32_t minLength_;
-      FuncTypeIdDesc funcTypeId_;
+      TypeIdDesc funcTypeId_;
     } table;
     SymbolicAddress builtin_;
   } u;
@@ -3044,8 +3485,7 @@
     c.u.import.globalDataOffset_ = globalDataOffset;
     return c;
   }
-  static CalleeDesc wasmTable(const TableDesc& desc,
-                              FuncTypeIdDesc funcTypeId) {
+  static CalleeDesc wasmTable(const TableDesc& desc, TypeIdDesc funcTypeId) {
     CalleeDesc c;
     c.which_ = WasmTable;
     c.u.table.globalDataOffset_ = desc.globalDataOffset;
@@ -3089,7 +3529,7 @@
     MOZ_ASSERT(isTable());
     return u.table.globalDataOffset_ + offsetof(TableTls, functionBase);
   }
-  FuncTypeIdDesc wasmTableSigId() const {
+  TypeIdDesc wasmTableSigId() const {
     MOZ_ASSERT(which_ == WasmTable);
     return u.table.funcTypeId_;
   }
@@ -3163,7 +3603,7 @@
 static_assert(OffsetGuardLimit < UINT32_MAX,
               "checking for overflow against OffsetGuardLimit is enough.");
 
-static constexpr size_t GetOffsetGuardLimit(bool hugeMemory) {
+static constexpr size_t GetMaxOffsetGuardLimit(bool hugeMemory) {
 #ifdef WASM_SUPPORTS_HUGE_MEMORY
   return hugeMemory ? HugeOffsetGuardLimit : OffsetGuardLimit;
 #else
@@ -3171,13 +3611,7 @@
 #endif
 }
 
-#ifdef WASM_SUPPORTS_HUGE_MEMORY
-static const size_t MaxOffsetGuardLimit = HugeOffsetGuardLimit;
 static const size_t MinOffsetGuardLimit = OffsetGuardLimit;
-#else
-static const size_t MaxOffsetGuardLimit = OffsetGuardLimit;
-static const size_t MinOffsetGuardLimit = OffsetGuardLimit;
-#endif
 
 // Return whether the given immediate satisfies the constraints of the platform
 // (viz. that, on ARM, IsValidARMImmediate).
@@ -3520,6 +3954,45 @@
 using PrintCallback = void (*)(const char*);
 
 }  // namespace wasm
+
+template <>
+struct InternalBarrierMethods<wasm::Val> {
+  STATIC_ASSERT_ANYREF_IS_JSOBJECT;
+
+  static bool isMarkable(const wasm::Val& v) { return v.isJSObject(); }
+
+  static void preBarrier(const wasm::Val& v) {
+    if (v.isJSObject()) {
+      gc::PreWriteBarrier(v.asJSObject());
+    }
+  }
+
+  static MOZ_ALWAYS_INLINE void postBarrier(wasm::Val* vp,
+                                            const wasm::Val& prev,
+                                            const wasm::Val& next) {
+    MOZ_RELEASE_ASSERT(!prev.type().isValid() || prev.type() == next.type());
+    JSObject* prevObj = prev.isJSObject() ? prev.asJSObject() : nullptr;
+    JSObject* nextObj = next.isJSObject() ? next.asJSObject() : nullptr;
+    if (nextObj) {
+      JSObject::postWriteBarrier(vp->asJSObjectAddress(), prevObj, nextObj);
+    }
+  }
+
+  static void readBarrier(const wasm::Val& v) {
+    if (v.isJSObject()) {
+      gc::ReadBarrier(v.asJSObject());
+    }
+  }
+
+#ifdef DEBUG
+  static void assertThingIsNotGray(const wasm::Val& v) {
+    if (v.isJSObject()) {
+      JS::AssertObjectIsNotGray(v.asJSObject());
+    }
+  }
+#endif
+};
+
 }  // namespace js
 
 #endif  // wasm_types_h
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmValidate.cpp firefox-85.0+build1/js/src/wasm/WasmValidate.cpp
--- firefox-84.0.2+build1/js/src/wasm/WasmValidate.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmValidate.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -400,7 +400,7 @@
   return true;
 }
 
-bool wasm::DecodeLocalEntries(Decoder& d, const TypeDefVector& types,
+bool wasm::DecodeLocalEntries(Decoder& d, const TypeContext& types,
                               const FeatureArgs& features,
                               ValTypeVector* locals) {
   uint32_t numLocalEntries;
@@ -1311,6 +1311,29 @@
         CHECK(iter.readRefIsNull(&nothing));
       }
 #endif
+#ifdef ENABLE_WASM_EXCEPTIONS
+      case uint16_t(Op::Try):
+        if (!env.exceptionsEnabled()) {
+          return iter.unrecognizedOpcode(&op);
+        }
+        CHECK(iter.readTry(&unusedType));
+      case uint16_t(Op::Catch): {
+        if (!env.exceptionsEnabled()) {
+          return iter.unrecognizedOpcode(&op);
+        }
+        LabelKind unusedKind;
+        uint32_t unusedIndex;
+        CHECK(iter.readCatch(&unusedKind, &unusedIndex, &unusedType,
+                             &unusedType, &nothings));
+      }
+      case uint16_t(Op::Throw): {
+        if (!env.exceptionsEnabled()) {
+          return iter.unrecognizedOpcode(&op);
+        }
+        uint32_t unusedIndex;
+        CHECK(iter.readThrow(&unusedIndex, &nothings));
+      }
+#endif
       case uint16_t(Op::ThreadPrefix): {
         if (env.sharedMemoryEnabled() == Shareable::False) {
           return iter.unrecognizedOpcode(&op);
@@ -1507,7 +1530,7 @@
                                 uint32_t funcIndex, uint32_t bodySize,
                                 Decoder& d) {
   ValTypeVector locals;
-  if (!locals.appendAll(env.funcTypes[funcIndex]->args())) {
+  if (!locals.appendAll(env.funcs[funcIndex].type->args())) {
     return false;
   }
 
@@ -1640,13 +1663,18 @@
     return d.fail("Structure types not enabled");
   }
 
+  if ((*typeState)[typeIndex] != TypeState::None &&
+      (*typeState)[typeIndex] != TypeState::ForwardStruct) {
+    return d.fail("struct type entry referenced as function");
+  }
+
   uint32_t numFields;
   if (!d.readVarU32(&numFields)) {
     return d.fail("Bad number of fields");
   }
 
   if (numFields > MaxStructFields) {
-    return d.fail("too many fields in structure");
+    return d.fail("too many fields in struct");
   }
 
   StructFieldVector fields;
@@ -1654,7 +1682,6 @@
     return false;
   }
 
-  StructMetaTypeDescr::Layout layout;
   for (uint32_t i = 0; i < numFields; i++) {
     if (!d.readValType(env->types.length(), env->features, &fields[i].type)) {
       return false;
@@ -1672,66 +1699,16 @@
     if (!ValidateTypeState(d, typeState, fields[i].type)) {
       return false;
     }
-
-    CheckedInt32 offset;
-    switch (fields[i].type.kind()) {
-      case ValType::I32:
-        offset = layout.addScalar(Scalar::Int32);
-        break;
-      case ValType::I64:
-        offset = layout.addScalar(Scalar::Int64);
-        break;
-      case ValType::F32:
-        offset = layout.addScalar(Scalar::Float32);
-        break;
-      case ValType::F64:
-        offset = layout.addScalar(Scalar::Float64);
-        break;
-      case ValType::V128:
-        MOZ_ASSERT(env->v128Enabled());
-        offset = layout.addScalar(Scalar::Simd128);
-        break;
-      case ValType::Ref:
-        switch (fields[i].type.refTypeKind()) {
-          case RefType::Eq:
-          case RefType::TypeIndex:
-            offset = layout.addReference(ReferenceType::TYPE_OBJECT);
-            break;
-          case RefType::Func:
-          case RefType::Extern:
-            offset = layout.addReference(ReferenceType::TYPE_WASM_ANYREF);
-            break;
-        }
-        break;
-    }
-    if (!offset.isValid()) {
-      return d.fail("Object too large");
-    }
-
-    fields[i].offset = offset.value();
-  }
-
-  CheckedInt32 totalSize = layout.close();
-  if (!totalSize.isValid()) {
-    return d.fail("Object too large");
   }
 
-  bool isInline = InlineTypedObject::canAccommodateSize(totalSize.value());
-  uint32_t offsetBy = isInline ? InlineTypedObject::offsetOfDataStart() : 0;
+  StructType structType = StructType(std::move(fields));
 
-  for (StructField& f : fields) {
-    f.offset += offsetBy;
-  }
-
-  if ((*typeState)[typeIndex] != TypeState::None &&
-      (*typeState)[typeIndex] != TypeState::ForwardStruct) {
-    return d.fail("struct type entry referenced as function");
+  if (!structType.computeLayout()) {
+    return d.fail("Struct type too large");
   }
 
-  env->types[typeIndex] =
-      TypeDef(StructType(std::move(fields), env->numStructTypes, isInline));
+  env->types[typeIndex] = TypeDef(std::move(structType));
   (*typeState)[typeIndex] = TypeState::Struct;
-  env->numStructTypes++;
 
   return true;
 }
@@ -1754,7 +1731,7 @@
     return d.fail("too many types");
   }
 
-  if (!env->types.resize(numTypes)) {
+  if (!env->types.resize(numTypes) || !env->typeIds.resize(numTypes)) {
     return false;
   }
 
@@ -1818,8 +1795,8 @@
   return name;
 }
 
-static bool DecodeSignatureIndex(Decoder& d, const TypeDefVector& types,
-                                 uint32_t* funcTypeIndex) {
+static bool DecodeFuncTypeIndex(Decoder& d, const TypeContext& types,
+                                uint32_t* funcTypeIndex) {
   if (!d.readVarU32(funcTypeIndex)) {
     return d.fail("expected signature index");
   }
@@ -1892,7 +1869,7 @@
 }
 
 static bool DecodeTableTypeAndLimits(Decoder& d, const FeatureArgs& features,
-                                     const TypeDefVector& types,
+                                     const TypeContext& types,
                                      TableDescVector* tables) {
   RefType tableElemType;
   if (!d.readRefType(types, features.withRefTypes(true), &tableElemType)) {
@@ -1966,7 +1943,7 @@
   return true;
 }
 
-static bool DecodeGlobalType(Decoder& d, const TypeDefVector& types,
+static bool DecodeGlobalType(Decoder& d, const TypeContext& types,
                              const FeatureArgs& features, ValType* type,
                              bool* isMutable) {
   if (!d.readValType(types, features, type)) {
@@ -2031,6 +2008,45 @@
   return true;
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+static bool EventIsJSCompatible(Decoder& d, ResultType type) {
+  for (uint32_t i = 0; i < type.length(); i++) {
+    if (type[i].isTypeIndex()) {
+      return d.fail("cannot expose indexed reference type");
+    }
+  }
+
+  return true;
+}
+
+static bool DecodeEvent(Decoder& d, ModuleEnvironment* env,
+                        EventKind* eventKind, uint32_t* funcTypeIndex) {
+  uint32_t eventCode;
+  if (!d.readVarU32(&eventCode)) {
+    return d.fail("expected event kind");
+  }
+
+  if (EventKind(eventCode) != EventKind::Exception) {
+    return d.fail("illegal event kind");
+  }
+  *eventKind = EventKind(eventCode);
+
+  if (!d.readVarU32(funcTypeIndex)) {
+    return d.fail("expected function index in event");
+  }
+  if (*funcTypeIndex >= env->numTypes()) {
+    return d.fail("function type index in event out of bounds");
+  }
+  if (!env->types[*funcTypeIndex].isFuncType()) {
+    return d.fail("function type index must index a function type");
+  }
+  if (env->types[*funcTypeIndex].funcType().results().length() != 0) {
+    return d.fail("exception function types must not return anything");
+  }
+  return true;
+}
+#endif
+
 static bool DecodeImport(Decoder& d, ModuleEnvironment* env) {
   UniqueChars moduleName = DecodeName(d);
   if (!moduleName) {
@@ -2052,21 +2068,20 @@
   switch (importKind) {
     case DefinitionKind::Function: {
       uint32_t funcTypeIndex;
-      if (!DecodeSignatureIndex(d, env->types, &funcTypeIndex)) {
+      if (!DecodeFuncTypeIndex(d, env->types, &funcTypeIndex)) {
         return false;
       }
 #ifdef WASM_PRIVATE_REFTYPES
-      if (!FuncTypeIsJSCompatible(d, env->types[funcTypeIndex].funcType())) {
+      if (!FuncTypeIsJSCompatible(d, env->types.funcType(funcTypeIndex))) {
         return false;
       }
 #endif
-      if (!env->funcTypes.append(&env->types[funcTypeIndex].funcType())) {
-        return false;
-      }
-      if (!env->funcTypeIndices.append(funcTypeIndex)) {
+      if (!env->funcs.append(FuncDesc(&env->types.funcType(funcTypeIndex),
+                                      &env->typeIds[funcTypeIndex],
+                                      funcTypeIndex))) {
         return false;
       }
-      if (env->funcTypes.length() > MaxFuncs) {
+      if (env->funcs.length() > MaxFuncs) {
         return d.fail("too many functions");
       }
       break;
@@ -2103,6 +2118,29 @@
       }
       break;
     }
+#ifdef ENABLE_WASM_EXCEPTIONS
+    case DefinitionKind::Event: {
+      EventKind eventKind;
+      uint32_t funcTypeIndex;
+      if (!DecodeEvent(d, env, &eventKind, &funcTypeIndex)) {
+        return false;
+      }
+      ResultType args =
+          ResultType::Vector(env->types[funcTypeIndex].funcType().args());
+#  ifdef WASM_PRIVATE_REFTYPES
+      if (!EventIsJSCompatible(d, args)) {
+        return false;
+      }
+#  endif
+      if (!env->events.append(EventDesc(eventKind, args))) {
+        return false;
+      }
+      if (env->events.length() > MaxEvents) {
+        return d.fail("too many events");
+      }
+      break;
+    }
+#endif
     default:
       return d.fail("unsupported import kind");
   }
@@ -2140,7 +2178,7 @@
   }
 
   // The global data offsets will be filled in by ModuleGenerator::init.
-  if (!env->funcImportGlobalDataOffsets.resize(env->funcTypes.length())) {
+  if (!env->funcImportGlobalDataOffsets.resize(env->funcs.length())) {
     return false;
   }
 
@@ -2161,26 +2199,24 @@
     return d.fail("expected number of function definitions");
   }
 
-  CheckedInt<uint32_t> numFuncs = env->funcTypes.length();
+  CheckedInt<uint32_t> numFuncs = env->funcs.length();
   numFuncs += numDefs;
   if (!numFuncs.isValid() || numFuncs.value() > MaxFuncs) {
     return d.fail("too many functions");
   }
 
-  if (!env->funcTypes.reserve(numFuncs.value())) {
-    return false;
-  }
-  if (!env->funcTypeIndices.reserve(numFuncs.value())) {
+  if (!env->funcs.reserve(numFuncs.value())) {
     return false;
   }
 
   for (uint32_t i = 0; i < numDefs; i++) {
     uint32_t funcTypeIndex;
-    if (!DecodeSignatureIndex(d, env->types, &funcTypeIndex)) {
+    if (!DecodeFuncTypeIndex(d, env->types, &funcTypeIndex)) {
       return false;
     }
-    env->funcTypes.infallibleAppend(&env->types[funcTypeIndex].funcType());
-    env->funcTypeIndices.infallibleAppend(funcTypeIndex);
+    env->funcs.infallibleAppend(FuncDesc(&env->types.funcType(funcTypeIndex),
+                                         &env->typeIds[funcTypeIndex],
+                                         funcTypeIndex));
   }
 
   return d.finishSection(*range, "function");
@@ -2294,13 +2330,15 @@
 #endif
 #ifdef ENABLE_WASM_REFTYPES
     case uint16_t(Op::RefNull): {
-      MOZ_ASSERT_IF(env->isStructType(expected), env->gcTypesEnabled());
+      MOZ_ASSERT_IF(
+          expected.isReference() && env->types.isStructType(expected.refType()),
+          env->gcTypesEnabled());
       RefType initType;
       if (!d.readHeapType(env->types, env->features, true, &initType)) {
         return false;
       }
       if (!expected.isReference() ||
-          !env->isRefSubtypeOf(initType, expected.refType())) {
+          !env->types.isRefSubtypeOf(initType, expected.refType())) {
         return d.fail(
             "type mismatch: initializer type and expected type don't match");
       }
@@ -2343,12 +2381,12 @@
         bool fail = false;
         if (!globals[i].type().isReference()) {
           fail = true;
-        } else if ((env->isStructType(expected) ||
-                    env->isStructType(globals[i].type())) &&
+        } else if ((env->types.isStructType(expected.refType()) ||
+                    env->types.isStructType(globals[i].type().refType())) &&
                    !env->gcTypesEnabled()) {
           fail = true;
-        } else if (!env->isRefSubtypeOf(globals[i].type().refType(),
-                                        expected.refType())) {
+        } else if (!env->types.isRefSubtypeOf(globals[i].type().refType(),
+                                              expected.refType())) {
           fail = true;
         }
         if (fail) {
@@ -2421,6 +2459,46 @@
   return d.finishSection(*range, "global");
 }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+static bool DecodeEventSection(Decoder& d, ModuleEnvironment* env) {
+  MaybeSectionRange range;
+  if (!d.startSection(SectionId::Event, env, &range, "event")) {
+    return false;
+  }
+  if (!range) {
+    return true;
+  }
+
+  uint32_t numDefs;
+  if (!d.readVarU32(&numDefs)) {
+    return d.fail("expected number of events");
+  }
+
+  CheckedInt<uint32_t> numEvents = env->events.length();
+  numEvents += numDefs;
+  if (!numEvents.isValid() || numEvents.value() > MaxEvents) {
+    return d.fail("too many events");
+  }
+
+  if (!env->events.reserve(numEvents.value())) {
+    return false;
+  }
+
+  for (uint32_t i = 0; i < numDefs; i++) {
+    EventKind eventKind;
+    uint32_t funcTypeIndex;
+    if (!DecodeEvent(d, env, &eventKind, &funcTypeIndex)) {
+      return false;
+    }
+    ResultType args =
+        ResultType::Vector(env->types[funcTypeIndex].funcType().args());
+    env->events.infallibleAppend(EventDesc(eventKind, args));
+  }
+
+  return d.finishSection(*range, "event");
+}
+#endif
+
 typedef HashSet<const char*, mozilla::CStringHasher, SystemAllocPolicy>
     CStringSet;
 
@@ -2467,7 +2545,7 @@
         return d.fail("exported function index out of bounds");
       }
 #ifdef WASM_PRIVATE_REFTYPES
-      if (!FuncTypeIsJSCompatible(d, *env->funcTypes[funcIndex])) {
+      if (!FuncTypeIsJSCompatible(d, *env->funcs[funcIndex].type)) {
         return false;
       }
 #endif
@@ -2521,6 +2599,27 @@
       return env->exports.emplaceBack(std::move(fieldName), globalIndex,
                                       DefinitionKind::Global);
     }
+#ifdef ENABLE_WASM_EXCEPTIONS
+    case DefinitionKind::Event: {
+      uint32_t eventIndex;
+      if (!d.readVarU32(&eventIndex)) {
+        return d.fail("expected event index");
+      }
+      if (eventIndex >= env->events.length()) {
+        return d.fail("exported event index out of bounds");
+      }
+
+#  ifdef WASM_PRIVATE_REFTYPES
+      if (!EventIsJSCompatible(d, env->events[eventIndex].type)) {
+        return false;
+      }
+#  endif
+
+      env->events[eventIndex].isExport = true;
+      return env->exports.emplaceBack(std::move(fieldName), eventIndex,
+                                      DefinitionKind::Event);
+    }
+#endif
     default:
       return d.fail("unexpected export kind");
   }
@@ -2575,7 +2674,7 @@
     return d.fail("unknown start function");
   }
 
-  const FuncType& funcType = *env->funcTypes[funcIndex];
+  const FuncType& funcType = *env->funcs[funcIndex].type;
   if (funcType.results().length() > 0) {
     return d.fail("start function must not return anything");
   }
@@ -2714,7 +2813,7 @@
       case ElemSegmentKind::Active:
       case ElemSegmentKind::ActiveWithTableIndex: {
         RefType tblElemType = env->tables[seg->tableIndex].elemType;
-        if (!env->isRefSubtypeOf(elemType, tblElemType)) {
+        if (!env->types.isRefSubtypeOf(elemType, tblElemType)) {
           return d.fail(
               "segment's element type must be subtype of table's element type");
         }
@@ -2779,7 +2878,7 @@
           default:
             return d.fail("failed to read initializer operation");
         }
-        if (!env->isRefSubtypeOf(initType, elemType)) {
+        if (!env->types.isRefSubtypeOf(initType, elemType)) {
           return d.fail("initializer type must be subtype of element type");
         }
       }
@@ -2794,7 +2893,7 @@
         }
 #ifdef WASM_PRIVATE_REFTYPES
         if (exportedTable &&
-            !FuncTypeIsJSCompatible(d, *env->funcTypes[funcIndex])) {
+            !FuncTypeIsJSCompatible(d, *env->funcs[funcIndex].type)) {
           return false;
         }
 #endif
@@ -2892,6 +2991,12 @@
     return false;
   }
 
+#ifdef ENABLE_WASM_EXCEPTIONS
+  if (!DecodeEventSection(d, env)) {
+    return false;
+  }
+#endif
+
   if (!DecodeGlobalSection(d, env)) {
     return false;
   }
diff -Nru firefox-84.0.2+build1/js/src/wasm/WasmValidate.h firefox-85.0+build1/js/src/wasm/WasmValidate.h
--- firefox-84.0.2+build1/js/src/wasm/WasmValidate.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/src/wasm/WasmValidate.h	2021-01-18 19:58:16.000000000 +0000
@@ -135,12 +135,15 @@
   MemoryUsage memoryUsage;
   uint64_t minMemoryLength;
   Maybe<uint64_t> maxMemoryLength;
-  uint32_t numStructTypes;
-  TypeDefVector types;
-  FuncTypeWithIdPtrVector funcTypes;
-  Uint32Vector funcTypeIndices;
+  TypeContext types;
+  TypeIdDescVector typeIds;
+  FuncDescVector funcs;
   Uint32Vector funcImportGlobalDataOffsets;
+
   GlobalDescVector globals;
+#ifdef ENABLE_WASM_EXCEPTIONS
+  EventDescVector events;
+#endif
   TableDescVector tables;
   Uint32Vector asmJSSigToTableIndex;
   ImportVector imports;
@@ -163,14 +166,14 @@
         features(features),
         memoryUsage(MemoryUsage::None),
         minMemoryLength(0),
-        numStructTypes(0) {}
+        types(features, TypeDefVector()) {}
 
   size_t numTables() const { return tables.length(); }
   size_t numTypes() const { return types.length(); }
-  size_t numFuncs() const { return funcTypes.length(); }
+  size_t numFuncs() const { return funcs.length(); }
   size_t numFuncImports() const { return funcImportGlobalDataOffsets.length(); }
   size_t numFuncDefs() const {
-    return funcTypes.length() - funcImportGlobalDataOffsets.length();
+    return funcs.length() - funcImportGlobalDataOffsets.length();
   }
   Shareable sharedMemoryEnabled() const { return features.sharedMemory; }
   bool refTypesEnabled() const { return features.refTypes; }
@@ -179,6 +182,7 @@
   bool multiValueEnabled() const { return features.multiValue; }
   bool v128Enabled() const { return features.v128; }
   bool hugeMemoryEnabled() const { return !isAsmJS() && features.hugeMemory; }
+  bool exceptionsEnabled() const { return features.exceptions; }
   bool usesMemory() const { return memoryUsage != MemoryUsage::None; }
   bool usesSharedMemory() const { return memoryUsage == MemoryUsage::Shared; }
   bool isAsmJS() const { return kind == ModuleKind::AsmJS; }
@@ -189,52 +193,6 @@
   bool funcIsImport(uint32_t funcIndex) const {
     return funcIndex < funcImportGlobalDataOffsets.length();
   }
-  bool isRefSubtypeOf(RefType one, RefType two) const {
-    // Anything's a subtype of itself.
-    if (one == two) {
-      return true;
-    }
-#ifdef ENABLE_WASM_FUNCTION_REFERENCES
-    if (functionReferencesEnabled()) {
-      // A subtype must have the same nullability as the supertype or the
-      // supertype must be nullable.
-      if (!(one.isNullable() == two.isNullable() || two.isNullable())) {
-        return false;
-      }
-
-      // Non type-index reftypes are subtypes if they are equal
-      if (!one.isTypeIndex() && !two.isTypeIndex() &&
-          one.kind() == two.kind()) {
-        return true;
-      }
-
-#  ifdef ENABLE_WASM_GC
-      // gc can only be enabled if function-references is enabled
-      if (gcTypesEnabled()) {
-        // Structs are subtypes of EqRef.
-        if (isStructType(one) && two.isEq()) {
-          return true;
-        }
-        // Struct One is a subtype of struct Two if Two is a prefix of One.
-        if (isStructType(one) && isStructType(two)) {
-          return isStructPrefixOf(two, one);
-        }
-      }
-#  endif
-      return false;
-    }
-#endif
-    return false;
-  }
-  bool isStructType(ValType t) const {
-    return t.isTypeIndex() && types[t.refType().typeIndex()].isStructType();
-  }
-
- private:
-  bool isStructPrefixOf(ValType a, ValType b) const {
-    const StructType& other = types[a.refType().typeIndex()].structType();
-    return types[b.refType().typeIndex()].structType().hasPrefix(other);
-  }
 };
 
 // ElemSegmentFlags provides methods for decoding and encoding the flags field
@@ -728,7 +686,7 @@
         return fail("bad type");
     }
   }
-  MOZ_MUST_USE bool readValType(const TypeDefVector& types,
+  MOZ_MUST_USE bool readValType(const TypeContext& types,
                                 const FeatureArgs& features, ValType* type) {
     if (!readValType(types.length(), features, type)) {
       return false;
@@ -782,7 +740,7 @@
 #endif
     return fail("invalid heap type");
   }
-  MOZ_MUST_USE bool readHeapType(const TypeDefVector& types,
+  MOZ_MUST_USE bool readHeapType(const TypeContext& types,
                                  const FeatureArgs& features, bool nullable,
                                  RefType* type) {
     if (!readHeapType(types.length(), features, nullable, type)) {
@@ -806,7 +764,7 @@
     *type = valType.refType();
     return true;
   }
-  MOZ_MUST_USE bool readRefType(const TypeDefVector& types,
+  MOZ_MUST_USE bool readRefType(const TypeContext& types,
                                 const FeatureArgs& features, RefType* type) {
     ValType valType;
     if (!readValType(types, features, &valType)) {
@@ -818,7 +776,7 @@
     *type = valType.refType();
     return true;
   }
-  MOZ_MUST_USE bool validateTypeIndex(const TypeDefVector& types,
+  MOZ_MUST_USE bool validateTypeIndex(const TypeContext& types,
                                       const FeatureArgs& features,
                                       RefType type) {
     MOZ_ASSERT(type.isTypeIndex());
@@ -955,7 +913,7 @@
 
 // This validates the entries.
 
-MOZ_MUST_USE bool DecodeLocalEntries(Decoder& d, const TypeDefVector& types,
+MOZ_MUST_USE bool DecodeLocalEntries(Decoder& d, const TypeContext& types,
                                      const FeatureArgs& features,
                                      ValTypeVector* locals);
 
diff -Nru firefox-84.0.2+build1/js/xpconnect/idl/nsIXPCScriptable.idl firefox-85.0+build1/js/xpconnect/idl/nsIXPCScriptable.idl
--- firefox-84.0.2+build1/js/xpconnect/idl/nsIXPCScriptable.idl	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/idl/nsIXPCScriptable.idl	2021-01-18 19:58:16.000000000 +0000
@@ -14,6 +14,10 @@
 
 #include "js/TypeDecls.h"
 
+namespace JS {
+class CallArgs;
+}
+
 %}
 
 interface nsIXPConnectWrappedNative;
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/ChromeScriptLoader.cpp firefox-85.0+build1/js/xpconnect/loader/ChromeScriptLoader.cpp
--- firefox-84.0.2+build1/js/xpconnect/loader/ChromeScriptLoader.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/ChromeScriptLoader.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "PrecompiledScript.h"
 
+#include "nsIIncrementalStreamLoader.h"
 #include "nsIURI.h"
 #include "nsIChannel.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/mozJSComponentLoader.cpp firefox-85.0+build1/js/xpconnect/loader/mozJSComponentLoader.cpp
--- firefox-84.0.2+build1/js/xpconnect/loader/mozJSComponentLoader.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/mozJSComponentLoader.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -36,6 +36,7 @@
 #include "mozJSLoaderUtils.h"
 #include "nsIFileURL.h"
 #include "nsIJARURI.h"
+#include "nsIChannel.h"
 #include "nsNetUtil.h"
 #include "nsJSPrincipals.h"
 #include "nsJSUtils.h"
@@ -378,9 +379,9 @@
 
   mInitialized = true;
 
-  AUTO_PROFILER_MARKER_TEXT("JS XPCOM", JS, MarkerStack::Capture(), spec);
   AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING("mozJSComponentLoader::LoadModule",
                                         OTHER, spec);
+  AUTO_PROFILER_MARKER_TEXT("JS XPCOM", JS, MarkerStack::Capture(), spec);
 
   ModuleEntry* mod;
   if (mModules.Get(spec, &mod)) {
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/mozJSSubScriptLoader.cpp firefox-85.0+build1/js/xpconnect/loader/mozJSSubScriptLoader.cpp
--- firefox-84.0.2+build1/js/xpconnect/loader/mozJSSubScriptLoader.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/mozJSSubScriptLoader.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -416,9 +416,9 @@
   }
 
   NS_LossyConvertUTF16toASCII asciiUrl(url);
-  AUTO_PROFILER_MARKER_TEXT("SubScript", JS, MarkerStack::Capture(), asciiUrl);
   AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING_NONSENSITIVE(
       "mozJSSubScriptLoader::DoLoadSubScriptWithOptions", OTHER, asciiUrl);
+  AUTO_PROFILER_MARKER_TEXT("SubScript", JS, MarkerStack::Capture(), asciiUrl);
 
   // Make sure to explicitly create the URI, since we'll need the
   // canonicalized spec.
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/PrecompiledScript.h firefox-85.0+build1/js/xpconnect/loader/PrecompiledScript.h
--- firefox-84.0.2+build1/js/xpconnect/loader/PrecompiledScript.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/PrecompiledScript.h	2021-01-18 19:58:16.000000000 +0000
@@ -9,13 +9,18 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/PrecompiledScriptBinding.h"
 
-#include "jsapi.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupports.h"
 #include "nsWrapperCache.h"
 
+namespace JS {
+class ReadOnlyCompileOptions;
+}
+
 namespace mozilla {
 namespace dom {
 class PrecompiledScript : public nsISupports, public nsWrapperCache {
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/PScriptCache.ipdl firefox-85.0+build1/js/xpconnect/loader/PScriptCache.ipdl
--- firefox-84.0.2+build1/js/xpconnect/loader/PScriptCache.ipdl	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/PScriptCache.ipdl	2021-01-18 19:58:16.000000000 +0000
@@ -7,7 +7,7 @@
 include protocol PContent;
 
 using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using mozilla::void_t from "ipc/IPCMessageUtils.h";
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
 
 namespace mozilla {
 namespace loader {
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/ScriptPreloader.cpp firefox-85.0+build1/js/xpconnect/loader/ScriptPreloader.cpp
--- firefox-84.0.2+build1/js/xpconnect/loader/ScriptPreloader.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/ScriptPreloader.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 
 #include "js/CompileOptions.h"  // JS::ReadOnlyCompileOptions
 #include "MainThreadUtils.h"
@@ -208,8 +209,7 @@
 
 void ScriptPreloader::Trace(JSTracer* trc) {
   for (auto& script : IterHash(mScripts)) {
-    JS::TraceEdge(trc, &script->mScript,
-                  "ScriptPreloader::CachedScript.mScript");
+    script->mScript.Trace(trc);
   }
 }
 
@@ -801,7 +801,7 @@
 
   if (!script->MaybeDropScript() && !script->mScript) {
     MOZ_ASSERT(jsscript);
-    script->mScript = jsscript;
+    script->mScript.Set(jsscript);
     script->mReadyToExecute = true;
   }
 
@@ -1018,7 +1018,7 @@
   for (auto script : mParsingScripts) {
     LOG(Debug, "Finished off-thread decode of %s\n", script->mURL.get());
     if (i < jsScripts.length()) {
-      script->mScript = jsScripts[i++];
+      script->mScript.Set(jsScripts[i++]);
     }
     script->mReadyToExecute = true;
   }
@@ -1116,11 +1116,30 @@
   mProcessTypes = {};
 }
 
+// JS::TraceEdge() can change the value of mScript, but not whether it is
+// null, so we don't update mHasScript to avoid a race.
+void ScriptPreloader::CachedScript::ScriptHolder::Trace(JSTracer* trc) {
+  JS::TraceEdge(trc, &mScript, "ScriptPreloader::CachedScript.mScript");
+}
+
+void ScriptPreloader::CachedScript::ScriptHolder::Set(
+    JS::HandleScript jsscript) {
+  MOZ_ASSERT(NS_IsMainThread());
+  mScript = jsscript;
+  mHasScript = mScript;
+}
+
+void ScriptPreloader::CachedScript::ScriptHolder::Clear() {
+  MOZ_ASSERT(NS_IsMainThread());
+  mScript = nullptr;
+  mHasScript = false;
+}
+
 bool ScriptPreloader::CachedScript::XDREncode(JSContext* cx) {
   auto cleanup = MakeScopeExit([&]() { MaybeDropScript(); });
 
-  JSAutoRealm ar(cx, mScript);
-  JS::RootedScript jsscript(cx, mScript);
+  JSAutoRealm ar(cx, mScript.Get());
+  JS::RootedScript jsscript(cx, mScript.Get());
 
   mXDRData.construct<JS::TranscodeBuffer>();
 
@@ -1139,8 +1158,8 @@
     JSContext* cx, const JS::ReadOnlyCompileOptions& options) {
   MOZ_ASSERT(mReadyToExecute);
   if (mScript) {
-    if (JS::CheckCompileOptionsMatch(options, mScript)) {
-      return mScript;
+    if (JS::CheckCompileOptionsMatch(options, mScript.Get())) {
+      return mScript.Get();
     }
     LOG(Error, "Cached script %s has different options\n", mURL.get());
     MOZ_DIAGNOSTIC_ASSERT(false, "Cached script has different options");
@@ -1164,7 +1183,7 @@
 
   JS::RootedScript script(cx);
   if (JS::DecodeScript(cx, options, Range(), &script)) {
-    mScript = script;
+    mScript.Set(script);
 
     if (mCache.mSaveComplete) {
       FreeData();
@@ -1174,7 +1193,7 @@
   LOG(Debug, "Finished decoding in %fms",
       (TimeStamp::Now() - start).ToMilliseconds());
 
-  return mScript;
+  return mScript.Get();
 }
 
 // nsIAsyncShutdownBlocker
diff -Nru firefox-84.0.2+build1/js/xpconnect/loader/ScriptPreloader.h firefox-85.0+build1/js/xpconnect/loader/ScriptPreloader.h
--- firefox-84.0.2+build1/js/xpconnect/loader/ScriptPreloader.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/loader/ScriptPreloader.h	2021-01-18 19:58:16.000000000 +0000
@@ -25,12 +25,18 @@
 #include "nsIThread.h"
 #include "nsITimer.h"
 
-#include "jsapi.h"
-#include "js/CompileOptions.h"  // JS::CompileOptions, JS::ReadOnlyCompileOptions
-#include "js/GCAnnotations.h"
+#include "js/GCAnnotations.h"  // for JS_HAZ_NON_GC_POINTER
+#include "js/RootingAPI.h"     // for Handle, Heap
+#include "js/Transcoding.h"  // for TranscodeBuffer, TranscodeRange, TranscodeSources
+#include "js/TypeDecls.h"  // for HandleObject, HandleScript
 
 #include <prio.h>
 
+namespace JS {
+class CompileOptions;
+class OffThreadToken;
+}  // namespace JS
+
 namespace mozilla {
 namespace dom {
 class ContentParent;
@@ -206,6 +212,50 @@
       const ScriptStatus mStatus;
     };
 
+    // The purpose of this helper class is to avoid a race between
+    // ScriptPreloader::WriteCache() and the GC on a JSScript*.
+    // The former checks if the actual JSScript* is null on the save thread
+    // while holding mMonitor. Aside from GC tracing, all places that mutate
+    // the JSScript* either hold mMonitor or don't run at the same time as the
+    // save thread. The GC can move the script, which will cause the value to
+    // change, but this will not change whether it is null or not.
+    //
+    // We can't hold mMonitor while tracing, because we can end running the
+    // GC while the current thread already holds mMonitor. Instead, this class
+    // avoids the race by storing a separate field to indicate if the script is
+    // null or not. To enforce this, the mutation by the GC that cannot affect
+    // the nullness of the script is split out from other mutation.
+    class MOZ_HEAP_CLASS ScriptHolder {
+     public:
+      explicit ScriptHolder(JSScript* script)
+          : mScript(script), mHasScript(script) {}
+      ScriptHolder() : mHasScript(false) {}
+
+      // This should only be called on the main thread (either while holding
+      // the preloader's mMonitor or while the save thread isn't running), or on
+      // the save thread while holding the preloader's mMonitor.
+      explicit operator bool() const { return mHasScript; }
+
+      // This should only be called on the main thread.
+      JSScript* Get() const {
+        MOZ_ASSERT(NS_IsMainThread());
+        return mScript;
+      }
+
+      // This should only be called on the main thread (or from a GC thread
+      // while the main thread is GCing).
+      void Trace(JSTracer* trc);
+
+      // These should only be called on the main thread, either while holding
+      // the preloader's mMonitor or while the save thread isn't running.
+      void Set(JS::HandleScript jsscript);
+      void Clear();
+
+     private:
+      JS::Heap<JSScript*> mScript;
+      bool mHasScript;  // true iff mScript is non-null.
+    };
+
     void FreeData() {
       // If the script data isn't mmapped, we need to release both it
       // and the Range that points to it at the same time.
@@ -231,7 +281,7 @@
     // not.
     bool MaybeDropScript() {
       if (mIsRunOnce && (HasRange() || !mCache.WillWriteScripts())) {
-        mScript = nullptr;
+        mScript.Clear();
         return true;
       }
       return false;
@@ -315,7 +365,7 @@
 
     TimeStamp mLoadTime{};
 
-    JS::Heap<JSScript*> mScript;
+    ScriptHolder mScript;
 
     // True if this script is ready to be executed. This means that either the
     // off-thread portion of an off-thread decode has finished, or the script
diff -Nru firefox-84.0.2+build1/js/xpconnect/public/xpc_make_class.h firefox-85.0+build1/js/xpconnect/public/xpc_make_class.h
--- firefox-84.0.2+build1/js/xpconnect/public/xpc_make_class.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/public/xpc_make_class.h	2021-01-18 19:58:16.000000000 +0000
@@ -52,18 +52,16 @@
 #define XPC_MAKE_CLASS_OPS(_flags)                                             \
   {                                                                            \
     /* addProperty */                                                          \
-    ((_flags)&XPC_SCRIPTABLE_USE_JSSTUB_FOR_ADDPROPERTY)                       \
-        ? nullptr                                                              \
-        : ((_flags)&XPC_SCRIPTABLE_ALLOW_PROP_MODS_DURING_RESOLVE)             \
-              ? XPC_WN_MaybeResolvingPropertyStub                              \
-              : XPC_WN_CannotModifyPropertyStub,                               \
+    ((_flags)&XPC_SCRIPTABLE_USE_JSSTUB_FOR_ADDPROPERTY) ? nullptr             \
+    : ((_flags)&XPC_SCRIPTABLE_ALLOW_PROP_MODS_DURING_RESOLVE)                 \
+        ? XPC_WN_MaybeResolvingPropertyStub                                    \
+        : XPC_WN_CannotModifyPropertyStub,                                     \
                                                                                \
         /* delProperty */                                                      \
-        ((_flags)&XPC_SCRIPTABLE_USE_JSSTUB_FOR_DELPROPERTY)                   \
-            ? nullptr                                                          \
-            : ((_flags)&XPC_SCRIPTABLE_ALLOW_PROP_MODS_DURING_RESOLVE)         \
-                  ? XPC_WN_MaybeResolvingDeletePropertyStub                    \
-                  : XPC_WN_CannotDeletePropertyStub,                           \
+        ((_flags)&XPC_SCRIPTABLE_USE_JSSTUB_FOR_DELPROPERTY) ? nullptr         \
+        : ((_flags)&XPC_SCRIPTABLE_ALLOW_PROP_MODS_DURING_RESOLVE)             \
+            ? XPC_WN_MaybeResolvingDeletePropertyStub                          \
+            : XPC_WN_CannotDeletePropertyStub,                                 \
                                                                                \
         /* enumerate */                                                        \
         ((_flags)&XPC_SCRIPTABLE_WANT_NEWENUMERATE)                            \
diff -Nru firefox-84.0.2+build1/js/xpconnect/shell/xpcshell.cpp firefox-85.0+build1/js/xpconnect/shell/xpcshell.cpp
--- firefox-84.0.2+build1/js/xpconnect/shell/xpcshell.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/shell/xpcshell.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -9,6 +9,7 @@
 #include <stdio.h>
 
 #include "mozilla/Bootstrap.h"
+#include "XREShellData.h"
 
 #include "nsXULAppAPI.h"
 #ifdef XP_MACOSX
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/ExportHelpers.cpp firefox-85.0+build1/js/xpconnect/src/ExportHelpers.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/ExportHelpers.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/ExportHelpers.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/Unused.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/StructuredCloneHolder.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/JSServices.cpp firefox-85.0+build1/js/xpconnect/src/JSServices.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/JSServices.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/JSServices.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "xpcprivate.h"
+#include "GeckoProfiler.h"
 #include "StaticComponents.h"
 #include "mozilla/ErrorResult.h"
 #include "js/String.h"  // JS::LinearStringHasLatin1Chars
@@ -76,13 +77,13 @@
   return nullptr;
 }
 
-static JSObject* GetService(JSContext* cx, const xpcom::JSServiceEntry& service,
-                            ErrorResult& aRv) {
+static bool GetServiceImpl(JSContext* cx, const xpcom::JSServiceEntry& service,
+                           JS::MutableHandleObject aObj, ErrorResult& aRv) {
   nsresult rv;
   nsCOMPtr<nsISupports> inst = service.Module().GetService(&rv);
   if (!inst) {
     aRv.Throw(rv);
-    return nullptr;
+    return false;
   }
 
   auto ifaces = service.Interfaces();
@@ -93,7 +94,8 @@
     // its own wrapping, and there's nothing to do. In the latter case, we want
     // to unwrap the underlying JS object.
     if (nsCOMPtr<nsIXPConnectWrappedJS> wrappedJS = do_QueryInterface(inst)) {
-      return wrappedJS->GetJSObject();
+      aObj.set(wrappedJS->GetJSObject());
+      return !!aObj;
     }
   }
 
@@ -105,7 +107,7 @@
                                             /* allowNativeWrapper */ true,
                                             &rv)) {
     aRv.Throw(rv);
-    return nullptr;
+    return false;
   }
 
   if (ifaces.Length() > 1) {
@@ -118,7 +120,17 @@
     }
   }
 
-  return &val.toObject();
+  aObj.set(&val.toObject());
+  return true;
+}
+
+static JSObject* GetService(JSContext* cx, const xpcom::JSServiceEntry& service,
+                            ErrorResult& aRv) {
+  JS::RootedObject obj(cx);
+  if (!GetServiceImpl(cx, service, &obj, aRv)) {
+    return nullptr;
+  }
+  return obj;
 }
 
 static bool Services_Resolve(JSContext* cx, HandleObject obj, HandleId id,
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCJSContext.cpp firefox-85.0+build1/js/xpconnect/src/XPCJSContext.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCJSContext.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCJSContext.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -63,9 +63,6 @@
 #include "nsIXULRuntime.h"
 #include "nsJSPrincipals.h"
 #include "ExpandedPrincipal.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 
 #if defined(XP_LINUX) && !defined(ANDROID)
 // For getrlimit and min/max.
@@ -591,9 +588,7 @@
     if (const char* file = scriptFilename.get()) {
       filename.Assign(file, strlen(file));
     }
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("JS::InterruptCallback", JS,
-                                     TextMarkerPayload,
-                                     (filename, TimeStamp::Now()));
+    PROFILER_MARKER_TEXT("JS::InterruptCallback", JS, {}, filename);
   }
 #endif
 
@@ -842,7 +837,6 @@
   bool useBaselineInterp = Preferences::GetBool(JS_OPTIONS_DOT_STR "blinterp");
   bool useBaselineJit = Preferences::GetBool(JS_OPTIONS_DOT_STR "baselinejit");
   bool useIon = Preferences::GetBool(JS_OPTIONS_DOT_STR "ion");
-  bool useWarp = Preferences::GetBool(JS_OPTIONS_DOT_STR "warp");
   bool useJitForTrustedPrincipals =
       Preferences::GetBool(JS_OPTIONS_DOT_STR "jit_trustedprincipals");
   bool useNativeRegExp =
@@ -906,7 +900,6 @@
   JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_BASELINE_ENABLE,
                                 useBaselineJit);
   JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_ION_ENABLE, useIon);
-  JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_WARP_ENABLE, useWarp);
   JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_JIT_TRUSTEDPRINCIPALS_ENABLE,
                                 useJitForTrustedPrincipals);
   JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_NATIVE_REGEXP_ENABLE,
@@ -1027,6 +1020,13 @@
       Preferences::GetBool(JS_OPTIONS_DOT_STR "experimental.private_methods");
 #endif
 
+  // Require top level await disabled outside of nightly.
+  bool topLevelAwaitEnabled = false;
+#ifdef NIGHTLY_BUILD
+  topLevelAwaitEnabled =
+      Preferences::GetBool(JS_OPTIONS_DOT_STR "experimental.top_level_await");
+#endif
+
 #ifdef JS_GC_ZEAL
   int32_t zeal = Preferences::GetInt(JS_OPTIONS_DOT_STR "gczeal", -1);
   int32_t zeal_frequency = Preferences::GetInt(
@@ -1074,7 +1074,8 @@
       .setThrowOnDebuggeeWouldRun(throwOnDebuggeeWouldRun)
       .setDumpStackOnDebuggeeWouldRun(dumpStackOnDebuggeeWouldRun)
       .setPrivateClassFields(privateFieldsEnabled)
-      .setPrivateClassMethods(privateMethodsEnabled);
+      .setPrivateClassMethods(privateMethodsEnabled)
+      .setTopLevelAwait(topLevelAwaitEnabled);
 
   nsCOMPtr<nsIXULRuntime> xr = do_GetService("@mozilla.org/xre/runtime;1");
   if (xr) {
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCJSRuntime.cpp firefox-85.0+build1/js/xpconnect/src/XPCJSRuntime.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCJSRuntime.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCJSRuntime.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -53,6 +53,7 @@
 #include "js/MemoryMetrics.h"
 #include "js/Object.h"  // JS::GetClass
 #include "js/Stream.h"  // JS::AbortSignalIsAborted, JS::InitPipeToHandling
+#include "js/SliceBudget.h"
 #include "js/UbiNode.h"
 #include "js/UbiNodeUtils.h"
 #include "js/friend/UsageStatistics.h"  // JS_TELEMETRY_*, JS_SetAccumulateTelemetryCallback
@@ -1409,9 +1410,6 @@
       pathPrefix + "object-groups/gc-heap"_ns, zStats.objectGroupsGCHeap,
       "Classification and type inference information about objects.");
 
-  ZRREPORT_BYTES(pathPrefix + "object-groups/malloc-heap"_ns,
-                 zStats.objectGroupsMallocHeap, "Object group addenda.");
-
   ZRREPORT_GC_BYTES(pathPrefix + "scopes/gc-heap"_ns, zStats.scopesGCHeap,
                     "Scope information for scripts.");
 
@@ -1425,9 +1423,6 @@
                  zStats.regExpSharedsMallocHeap,
                  "Shared compiled regexp data.");
 
-  ZRREPORT_BYTES(pathPrefix + "type-pool"_ns, zStats.typePool,
-                 "Type sets and related data.");
-
   ZRREPORT_BYTES(pathPrefix + "regexp-zone"_ns, zStats.regexpZone,
                  "The regexp zone and regexp data.");
 
@@ -1787,19 +1782,7 @@
                  "The IonMonkey JIT's compilation data (IonScripts).");
 
   ZRREPORT_BYTES(realmJSPathPrefix + "jit-scripts"_ns, realmStats.jitScripts,
-                 "JIT and Type Inference data associated with scripts.");
-
-  ZRREPORT_BYTES(realmJSPathPrefix + "type-inference/allocation-site-tables"_ns,
-                 realmStats.typeInferenceAllocationSiteTables,
-                 "Tables of type objects associated with allocation sites.");
-
-  ZRREPORT_BYTES(realmJSPathPrefix + "type-inference/array-type-tables"_ns,
-                 realmStats.typeInferenceArrayTypeTables,
-                 "Tables of type objects associated with array literals.");
-
-  ZRREPORT_BYTES(realmJSPathPrefix + "type-inference/object-type-tables"_ns,
-                 realmStats.typeInferenceObjectTypeTables,
-                 "Tables of type objects associated with object literals.");
+                 "JIT data associated with scripts.");
 
   ZRREPORT_BYTES(realmJSPathPrefix + "realm-object"_ns, realmStats.realmObject,
                  "The JS::Realm object itself.");
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCLocale.cpp firefox-85.0+build1/js/xpconnect/src/XPCLocale.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCLocale.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCLocale.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -133,11 +133,12 @@
   }
 
   // No pref has been found, so get the default locale from the
-  // application's locale.
-  nsAutoCString appLocaleStr;
-  LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocaleStr);
+  // regional prefs locales.
+  AutoTArray<nsCString, 10> rpLocales;
+  LocaleService::GetInstance()->GetRegionalPrefsLocales(rpLocales);
 
-  return JS_SetDefaultLocale(rt, appLocaleStr.get());
+  MOZ_ASSERT(rpLocales.Length() > 0);
+  return JS_SetDefaultLocale(rt, rpLocales[0].get());
 }
 
 void xpc_DelocalizeRuntime(JSRuntime* rt) {
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/xpcprivate.h firefox-85.0+build1/js/xpconnect/src/xpcprivate.h
--- firefox-84.0.2+build1/js/xpconnect/src/xpcprivate.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/xpcprivate.h	2021-01-18 19:58:16.000000000 +0000
@@ -73,6 +73,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/DebugOnly.h"
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/xpcpublic.h firefox-85.0+build1/js/xpconnect/src/xpcpublic.h
--- firefox-84.0.2+build1/js/xpconnect/src/xpcpublic.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/xpcpublic.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,36 +7,60 @@
 #ifndef xpcpublic_h
 #define xpcpublic_h
 
-#include "jsapi.h"
-#include "js/BuildId.h"  // JS::BuildIdCharVector
-#include "js/HeapAPI.h"
+#include <cstddef>
+#include <cstdint>
+#include "ErrorList.h"
+#include "js/BuildId.h"
+#include "js/ErrorReport.h"
 #include "js/GCAPI.h"
-#include "js/Object.h"  // JS::GetCompartment
-#include "js/Proxy.h"
-#include "js/String.h"  // JS::IsExternalString
-#include "js/Wrapper.h"
-
+#include "js/Object.h"
+#include "js/RootingAPI.h"
+#include "js/String.h"
+#include "js/TypeDecls.h"
+#include "js/Utility.h"
+#include "js/Value.h"
+#include "jsapi.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/dom/DOMString.h"
+#include "mozilla/fallible.h"
 #include "nsAtom.h"
+#include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsIURI.h"
-#include "nsIPrincipal.h"
-#include "nsIGlobalObject.h"
-#include "nsWrapperCache.h"
-#include "nsString.h"
-#include "nsTArray.h"
-#include "mozilla/dom/JSSlots.h"
-#include "mozilla/fallible.h"
-#include "nsMathUtils.h"
 #include "nsStringBuffer.h"
-#include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/Preferences.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsWrapperCache.h"
+
+// XXX only for NukeAllWrappersForRealm, which is only used in
+// dom/base/WindowDestroyedEvent.cpp outside of js
+#include "jsfriendapi.h"
 
+class JSObject;
+class JSString;
+class JSTracer;
 class nsGlobalWindowInner;
+class nsIAddonInterposition;
 class nsIGlobalObject;
-class nsIPrincipal;
 class nsIHandleReportCallback;
+class nsIPrincipal;
+class nsPIDOMWindowInner;
+struct JSContext;
+struct nsID;
 struct nsXPTInterfaceInfo;
 
+namespace JS {
+class Compartment;
+class Realm;
+class RealmOptions;
+class Value;
+struct RuntimeStats;
+}  // namespace JS
+
 namespace mozilla {
 class BasePrincipal;
 
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCShellImpl.cpp firefox-85.0+build1/js/xpconnect/src/XPCShellImpl.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCShellImpl.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCShellImpl.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -56,6 +56,7 @@
 #  include "mozilla/WinDllServices.h"
 #  include <windows.h>
 #  if defined(MOZ_SANDBOX)
+#    include "XREShellData.h"
 #    include "sandboxBroker.h"
 #  endif
 #endif
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCVariant.cpp firefox-85.0+build1/js/xpconnect/src/XPCVariant.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCVariant.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCVariant.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -57,10 +57,11 @@
   Value val = GetJSValPreserveColor();
 
   MOZ_ASSERT(val.isGCThing() || val.isNull(), "Must be traceable or unlinked");
+  bool unroot = val.isGCThing();
 
   mData.Cleanup();
 
-  if (!val.isNull()) {
+  if (unroot) {
     RemoveFromRootSet();
   }
 }
@@ -84,10 +85,11 @@
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(XPCVariant)
   JS::Value val = tmp->GetJSValPreserveColor();
+  bool unroot = val.isGCThing();
 
   tmp->mData.Cleanup();
 
-  if (val.isGCThing()) {
+  if (unroot) {
     XPCTraceableVariant* v = static_cast<XPCTraceableVariant*>(tmp);
     v->RemoveFromRootSet();
   }
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCWrappedNative.cpp firefox-85.0+build1/js/xpconnect/src/XPCWrappedNative.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCWrappedNative.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCWrappedNative.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1743,8 +1743,9 @@
           JS_sprintf_append(std::move(name), "%s", array[1]->GetNameString());
     } else {
       for (uint16_t i = 1; i < count; i++) {
-        const char* fmt =
-            (i == 1) ? "(%s" : (i == count - 1) ? ", %s)" : ", %s";
+        const char* fmt = (i == 1)           ? "(%s"
+                          : (i == count - 1) ? ", %s)"
+                                             : ", %s";
         name =
             JS_sprintf_append(std::move(name), fmt, array[i]->GetNameString());
       }
diff -Nru firefox-84.0.2+build1/js/xpconnect/src/XPCWrappedNativeProto.cpp firefox-85.0+build1/js/xpconnect/src/XPCWrappedNativeProto.cpp
--- firefox-84.0.2+build1/js/xpconnect/src/XPCWrappedNativeProto.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/src/XPCWrappedNativeProto.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -54,7 +54,7 @@
   mScriptable = scriptable;
 
   JS::RootedObject proto(cx, JS::GetRealmObjectPrototype(cx));
-  mJSProtoObject = JS_NewObjectWithUniqueType(cx, &XPC_WN_Proto_JSClass, proto);
+  mJSProtoObject = JS_NewObjectWithGivenProto(cx, &XPC_WN_Proto_JSClass, proto);
 
   bool success = !!mJSProtoObject;
   if (success) {
diff -Nru firefox-84.0.2+build1/js/xpconnect/tests/chrome/test_xrayToJS.xhtml firefox-85.0+build1/js/xpconnect/tests/chrome/test_xrayToJS.xhtml
--- firefox-84.0.2+build1/js/xpconnect/tests/chrome/test_xrayToJS.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/tests/chrome/test_xrayToJS.xhtml	2021-01-18 19:58:16.000000000 +0000
@@ -235,6 +235,9 @@
       "includes", "forEach", "map", "reduce", "reduceRight", "filter", "some", "every", "find",
       "findIndex", "copyWithin", "fill", Symbol.iterator, Symbol.unscopables, "entries", "keys",
       "values", "constructor", "flat", "flatMap"];
+  if (isNightlyBuild) {
+    gPrototypeProperties['Array'].push("at");
+  }
   gConstructorProperties['Array'] =
     constructorProps(["isArray", "from", "of", Symbol.species]);
   for (var c of typedArrayClasses) {
@@ -246,6 +249,9 @@
      "set", "copyWithin", "find", "findIndex", "forEach","indexOf", "lastIndexOf", "includes",
      "reverse", "join", "every", "some", "reduce", "reduceRight", "entries", "keys", "values",
      "slice", "map", "filter"];
+  if (isNightlyBuild) {
+    gPrototypeProperties['TypedArray'].push("at");
+  }
   // There is no TypedArray constructor, looks like.
   is(window.TypedArray, undefined, "If this ever changes, add to this test!");
   for (var c of errorObjectClasses) {
diff -Nru firefox-84.0.2+build1/js/xpconnect/wrappers/XrayWrapper.h firefox-85.0+build1/js/xpconnect/wrappers/XrayWrapper.h
--- firefox-84.0.2+build1/js/xpconnect/wrappers/XrayWrapper.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/js/xpconnect/wrappers/XrayWrapper.h	2021-01-18 19:58:16.000000000 +0000
@@ -12,6 +12,7 @@
 #include "WrapperFactory.h"
 
 #include "jsapi.h"
+#include "jsfriendapi.h"
 #include "js/friend/XrayJitInfo.h"  // JS::XrayJitInfo
 #include "js/Object.h"              // JS::GetReservedSlot
 #include "js/Proxy.h"
diff -Nru firefox-84.0.2+build1/l10n/ach/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ach/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ach/browser/browser/aboutLogins.ftl	2021-01-06 11:23:50.000000000 +0000
+++ firefox-85.0+build1/l10n/ach/browser/browser/aboutLogins.ftl	2021-01-18 19:59:11.000000000 +0000
@@ -124,6 +124,27 @@
 about-logins-confirm-remove-dialog-title = Kwany donyo iyie man?
 confirm-delete-dialog-message = Pe ki twero gonyo tic man.
 about-logins-confirm-remove-dialog-confirm-button = Kwany
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Kwany
+       *[other] Kwany Weng
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Eyo, kwany donyo iyie man
+       *[other] Eyo, kwany donyo iyie magi
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Kwany donyo iyie { $count }?
+       *[other] Kwany donyo iyie { $count } weng?
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Kwany donyo iyie { $count } ki i nyonyo weng?
+       *[other] Kwany donyo iyie { $count } weng ki i nyonyo weng?
+    }
+about-logins-confirm-export-dialog-message = Kibigwoko mung me donyo mamegi calo coc ma kwane (labolle, BadP@ssw0rd) pi meno ngat ma twero yabo pwail ma kicwalo woko ni twero neno gi.
 about-logins-confirm-export-dialog-confirm-button = Cwal woko...
 confirm-discard-changes-dialog-message = Alokaloka weng ma pe kigwoko bi rweny woko.
 
diff -Nru firefox-84.0.2+build1/l10n/ach/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ach/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ach/browser/browser/appmenu.ftl	2021-01-06 11:23:50.000000000 +0000
+++ firefox-85.0+build1/l10n/ach/browser/browser/appmenu.ftl	2021-01-18 19:59:11.000000000 +0000
@@ -12,15 +12,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Dirica manyen
+appmenuitem-new-private-window =
+    .label = Dirica manyen me mung
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Kwot madit
 appmenuitem-zoom-reduce =
     .label = Jwik matidi
+appmenuitem-fullscreen =
+    .label = Wang komputa ma opong
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Rib Kombedi
+appmenuitem-save-page =
+    .label = Gwok pot buk calo…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/ach/browser/browser/browser.ftl firefox-85.0+build1/l10n/ach/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ach/browser/browser/browser.ftl	2021-01-06 11:23:50.000000000 +0000
+++ firefox-85.0+build1/l10n/ach/browser/browser/browser.ftl	2021-01-18 19:59:11.000000000 +0000
@@ -395,3 +395,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> Tye ki twero i kom lacim ma megi. Dii Esc me dwoko twero cen bot in.
 pointerlock-warning-no-domain = Jami eni Tye ki twero i kom lacim ma megi. Dii Esc me dwoko twero cen bot in.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Nyut alamabuk weng
+bookmarks-recent-bookmarks =
+    .value = Ma kiketo Alamabuk cokki
+bookmarks-toolbar-chevron =
+    .tooltiptext = Nyut alama buk mukene
+bookmarks-sidebar-content =
+    .aria-label = Alama buk
+bookmarks-menu-button =
+    .label = Jami ayera me alamabuk
+bookmarks-other-bookmarks-menu =
+    .label = Alamabuk Mukene
+bookmarks-mobile-bookmarks-menu =
+    .label = Alamabuk me cing
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kan lanyut nget me alamabuk
+           *[other] Nen gintic alama buk ma inget
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kan gitic me alamabuk
+           *[other] Nen gintic alama buk
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kwany jami ayera me alamabuk ki i Gitic
+           *[other] Med jami ayera me alamabuk ii Gitic
+        }
+bookmarks-search =
+    .label = Yeny Alamabuk
+bookmarks-tools =
+    .label = Gtic me keto alamabuk
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Gintic me alama buk
+    .accesskey = G
+    .aria-label = Alamabuk
+bookmarks-toolbar-menu =
+    .label = Gintic me alama buk
+bookmarks-toolbar-placeholder =
+    .title = Jami me gintic me alama buk
+bookmarks-toolbar-placeholder-button =
+    .label = Jami me gintic me alama buk
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Alamabuk
+library-bookmarks-bookmark-this-page =
+    .label = Ket alama buk i pot buk man
+library-bookmarks-bookmark-edit =
+    .label = Yub alama buk man
+
+## More items
+
+more-menu-go-offline =
+    .label = Ti ma pe ikube iyamo
+    .accesskey = T
diff -Nru firefox-84.0.2+build1/l10n/ach/dom/dom/media.ftl firefox-85.0+build1/l10n/ach/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ach/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ach/dom/dom/media.ftl	2021-01-18 19:59:11.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ach/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ach/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ach/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ach/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 19:59:11.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/af/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/af/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/af/browser/browser/appmenu.ftl	2021-01-06 11:23:53.000000000 +0000
+++ firefox-85.0+build1/l10n/af/browser/browser/appmenu.ftl	2021-01-18 19:59:14.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nuwe venster
+appmenuitem-new-private-window =
+    .label = Nuwe private venster
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Volskerm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinkroniseer nou
+appmenuitem-save-page =
+    .label = Stoor bladsy as…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/af/browser/browser/browser.ftl firefox-85.0+build1/l10n/af/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/af/browser/browser/browser.ftl	2021-01-06 11:23:54.000000000 +0000
+++ firefox-85.0+build1/l10n/af/browser/browser/browser.ftl	2021-01-18 19:59:14.000000000 +0000
@@ -212,6 +212,9 @@
 browser-window-close-button =
     .tooltiptext = Sluit
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -273,3 +276,37 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> beheer tans die wyser. Druk Esc om beheer terug te kry.
 pointerlock-warning-no-domain = Dié dokument beheer tans die wyser. Druk Esc om beheer terug te kry.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Wys alle boekmerke
+bookmarks-recent-bookmarks =
+    .value = Onlangs geboekmerk
+bookmarks-toolbar-chevron =
+    .tooltiptext = Wys meer boekmerke
+bookmarks-sidebar-content =
+    .aria-label = Boekmerke
+bookmarks-other-bookmarks-menu =
+    .label = Ander boekmerke
+bookmarks-search =
+    .label = Deursoek boekmerke
+bookmarks-toolbar-menu =
+    .label = Boekmerknutsbalk
+bookmarks-toolbar-placeholder =
+    .title = Boekmerknutsbalk-items
+bookmarks-toolbar-placeholder-button =
+    .label = Boekmerknutsbalk-items
+
+## Library Panel items
+
+library-bookmarks-bookmark-this-page =
+    .label = Boekmerk hierdie bladsy
+library-bookmarks-bookmark-edit =
+    .label = Redigeer hierdie boekmerk
+
+## More items
+
+more-menu-go-offline =
+    .label = Werk vanlyn
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/an/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/an/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/an/browser/browser/appmenu.ftl	2021-01-06 11:23:58.000000000 +0000
+++ firefox-85.0+build1/l10n/an/browser/browser/appmenu.ftl	2021-01-18 19:59:24.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nueva finestra
+appmenuitem-new-private-window =
+    .label = Nueva finestra privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Agrandir
 appmenuitem-zoom-reduce =
     .label = Achiquir
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar agora
+appmenuitem-save-page =
+    .label = Alzar a pachina como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novedatz
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/an/browser/browser/browser.ftl firefox-85.0+build1/l10n/an/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/an/browser/browser/browser.ftl	2021-01-06 11:23:58.000000000 +0000
+++ firefox-85.0+build1/l10n/an/browser/browser/browser.ftl	2021-01-18 19:59:24.000000000 +0000
@@ -330,6 +330,9 @@
 browser-window-close-button =
     .tooltiptext = Zarrar
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -456,3 +459,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tien lo control d'o puntero. Prete Esc pa recuperar-ne lo control
 pointerlock-warning-no-domain = Iste documento tien lo control d'o puntero. Prete Esc pa recuperar-ne lo control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Amostrar totz os marcapachinas
+bookmarks-recent-bookmarks =
+    .value = Pachinas marcadas recientment
+bookmarks-toolbar-chevron =
+    .tooltiptext = Amostrar mas marcapachinas
+bookmarks-sidebar-content =
+    .aria-label = Marcapachinas
+bookmarks-menu-button =
+    .label = Menu de marcapachinas
+bookmarks-other-bookmarks-menu =
+    .label = Atros marcapachinas
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcapachinas d'o mobil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amagar la barra lateral de marcapachinas
+           *[other] Amostrar a barra lateral de marcapachinas
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amagar la barra de ferramientas de marcapachinas
+           *[other] Veyer a barra de marcapachinas
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eliminar lo menú de marcapachinas de la barra de ferramientas
+           *[other] Anyader lo menú de marcapachinas en a barra de ferramientas
+        }
+bookmarks-search =
+    .label = Trobar marcapachinas
+bookmarks-tools =
+    .label = Ferramientas d'os marcapachinas
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de ferramientas de marcapachinas
+    .accesskey = B
+    .aria-label = Marcapachinas
+bookmarks-toolbar-menu =
+    .label = Barra de ferramientas de marcapachinas
+bookmarks-toolbar-placeholder =
+    .title = Elementos d'a barra de ferramientas de marcapachinas
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos d'a barra de ferramientas de marcapachinas
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcapachinas
+library-bookmarks-bookmark-this-page =
+    .label = Marcar ista pachina con marcapachinas
+library-bookmarks-bookmark-edit =
+    .label = Editar iste marcapachinas
+
+## More items
+
+more-menu-go-offline =
+    .label = Treballar difuera de linia
+    .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/an/dom/dom/media.ftl firefox-85.0+build1/l10n/an/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/an/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/an/dom/dom/media.ftl	2021-01-18 19:59:24.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/an/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/an/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/an/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/an/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 19:59:24.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ar/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/aboutLogins.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/aboutLogins.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -173,7 +173,16 @@
 about-logins-confirm-remove-dialog-title = أن�زيل هذا الولوج؟
 confirm-delete-dialog-message = هذا إجراء لا عودة �يه.
 about-logins-confirm-remove-dialog-confirm-button = أز�ل
-about-logins-confirm-remove-all-dialog-confirm-button = أز�ل الكل
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] أز�ل
+        [zero] أز�ل
+        [one] أز�ل
+        [two] أز�ل
+        [few] أز�ل الكل
+        [many] أز�ل الكل
+       *[other] أز�ل الكل
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] نعم، احذ� هذا الولوج
@@ -193,6 +202,25 @@
         [many] أن�زيل { $count } جلسة ولوج؟
        *[other] أن�زيل { $count } جلسة ولوج؟
     }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] بهذا تحذ� جلسة الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+        [zero] بهذا تحذ� جلسة الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+        [one] بهذا تحذ� جلسة الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+        [two] بهذا تحذ� جلستا الولوج المح�وظتان �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+        [few] بهذا تحذ� جلسات الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+        [many] بهذا تحذ� جلسات الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+       *[other] بهذا تحذ� جلسات الولوج المح�وظة �ي { -brand-short-name } وأيّ تحذيرات أخرى تظهر هنا عن تسريبات البيانات. لا يمكنك العودة عن هذا الإجراء.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [zero] أتريد إزالة جلسة الولوج من كل الأجهزة؟
+        [one] أتريد إزالة جلسة الولوج من كل الأجهزة؟
+        [two] أتريد إزالة جلستا الولوج من كل الأجهزة؟
+        [few] أتريد إزالة { $count } جلسات ولوج من كل الأجهزة؟
+        [many] أتريد إزالة { $count } جلسة ولوج من كل الأجهزة؟
+       *[other] أتريد إزالة { $count } جلسة ولوج من كل الأجهزة؟
+    }
 about-logins-confirm-export-dialog-title = صدّر جلسات الولوج وكلمات السر
 about-logins-confirm-export-dialog-message = ست�ح�ظ جلسات الولوج على هيئة نص مقروء (مثلا 12345 أو BadP@ssw0rd) وبهذا يستطيع أيّ شخص معاينتها لو �تح المل� المصدّر.
 about-logins-confirm-export-dialog-confirm-button = صدّر…
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ar/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/appmenu.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/appmenu.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = نا�ذة جديدة
+appmenuitem-new-private-window =
+    .label = نا�ذة خاصة جديدة
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = قرّب
 appmenuitem-zoom-reduce =
     .label = بعّد
+appmenuitem-fullscreen =
+    .label = ملء الشاشة
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = زام�ن الآن
+appmenuitem-save-page =
+    .label = اح�ظ الص�حة باسم…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = ما الجديد
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ar/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/appMenuNotifications.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/appMenuNotifications.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -32,6 +32,12 @@
     .secondarybuttonlabel = ليس الآن
     .secondarybuttonaccesskey = Ù„
 appmenu-update-restart-message = بعد إعادة تشغيل سريعة سيستعيد { -brand-shorter-name } جميع ألسنتك و نوا�ذك الم�توحة التي ليست �ي وضع التص�ح الخاص.
+appmenu-update-other-instance =
+    .label = تعذّر تحديث { -brand-shorter-name } لآخر إصدارة تلقائيًا.
+    .buttonlabel = مع ذلك، حدّث { -brand-shorter-name }
+    .buttonaccesskey = د
+    .secondarybuttonlabel = ليس الآن
+    .secondarybuttonaccesskey = Ù„
 appmenu-addon-private-browsing-installed =
     .buttonlabel = حسنًا، �همت
     .buttonaccesskey = Ø­
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/browser.ftl firefox-85.0+build1/l10n/ar/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/browser.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/browser.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -509,3 +509,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = يتحكم <span data-l10n-name="domain">{ $domain }</span> �ي مؤشرك. اضغط Esc لتستعيد التحكم.
 pointerlock-warning-no-domain = يتحكم هذا المستند �ي مؤشرك. اضغط Esc لتستعيد التحكم.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = أظه�ر كل العلامات
+bookmarks-recent-bookmarks =
+    .value = المعلّم حديثا
+bookmarks-toolbar-chevron =
+    .tooltiptext = أظه�ر المزيد من العلامات
+bookmarks-sidebar-content =
+    .aria-label = العلامات
+bookmarks-menu-button =
+    .label = قائمة العلامات
+bookmarks-other-bookmarks-menu =
+    .label = العلامات الأخرى
+bookmarks-mobile-bookmarks-menu =
+    .label = علامات المحمول
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] أخ�� شريط العلامات الجانبي
+           *[other] أظه�ر شريط العلامات الجانبي
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] أخ�� شريط أدوات العلامات
+           *[other] أظه�ر شريط أدوات العلامات
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] أز�ل قائمة العلامات من شريط الأدوات
+           *[other] أض�� قائمة العلامات إلى شريط الأدوات
+        }
+bookmarks-search =
+    .label = ابحث �ي العلامات
+bookmarks-tools =
+    .label = أدوات العلامات
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = شريط العلامات
+    .accesskey = Ø´
+    .aria-label = العلامات
+bookmarks-toolbar-menu =
+    .label = شريط العلامات
+bookmarks-toolbar-placeholder =
+    .title = عناصر شريط العلامات
+bookmarks-toolbar-placeholder-button =
+    .label = عناصر شريط العلامات
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = العلامات
+library-bookmarks-bookmark-this-page =
+    .label = علّم هذه الص�حة
+library-bookmarks-bookmark-edit =
+    .label = حرّر هذه العلامة
+
+## More items
+
+more-menu-go-offline =
+    .label = اعمل دون اتصال
+    .accesskey = ع
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ar/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/newtab/asrouter.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/newtab/asrouter.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -296,3 +296,8 @@
 cfr-whatsnew-media-keys-header = تحكّمات أخرى بالوسائط
 cfr-whatsnew-media-keys-body = سهّلنا التحكم بالوسائط من الألسنة والبرامج الأخرى، وحتى حين يكون الحاسوب م�ق�لًا بميزة تشغيل الصوت والڤديو أو إلباثه مباشرة من لوحة الم�اتيح أو سماعة الرأس. كما يمكنك التنقّل بين المقطوعات باستعمال م�اتيح التالي والسابق.
 cfr-whatsnew-media-keys-button = اطّلع على المزيد
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = اختصارات البحث �ي شريط العنوان
+cfr-whatsnew-search-shortcuts-body = سيظهر الآن (متى كتبت اسم محرّك بحث أو موقع معيّن �ي شريط العنوان) اختصارًا أزرقًا �ي مربع اقتراحات البحث أس�ل الشريط. اختر الاختصار لت�واصل البحث مباشرةً من شريط العنوان دون مغادرته.
diff -Nru firefox-84.0.2+build1/l10n/ar/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ar/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ar/browser/browser/newtab/newtab.ftl	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/browser/browser/newtab/newtab.ftl	2021-01-18 19:59:28.000000000 +0000
@@ -51,6 +51,9 @@
 # "This action" refers to deleting a page from history.
 newtab-confirm-delete-history-p2 = لا يمكن التراجع عن هذا الإجراء.
 
+## Top Sites - Sponsored label
+
+
 ## Context Menu - Action Tooltips.
 
 # General tooltip for context menus.
@@ -198,3 +201,15 @@
 
 newtab-error-fallback-info = أخ! حدث خطب ما أثناء تحميل المحتوى.
 newtab-error-fallback-refresh-link = أنع�ش الص�حة لإعادة المحاولة.
+
+## Customization Menu
+
+newtab-custom-row-selector =
+    { $num ->
+        [zero] ما من ص�و�
+        [one] ص� واحد
+        [two] ص�ّان اثنان
+        [few] { $num } ص�و�
+        [many] { $num } ص�ًا
+       *[other] { $num } ص�
+    }
diff -Nru firefox-84.0.2+build1/l10n/ar/toolkit/chrome/global/videocontrols.dtd firefox-85.0+build1/l10n/ar/toolkit/chrome/global/videocontrols.dtd
--- firefox-84.0.2+build1/l10n/ar/toolkit/chrome/global/videocontrols.dtd	2021-01-06 11:24:10.000000000 +0000
+++ firefox-85.0+build1/l10n/ar/toolkit/chrome/global/videocontrols.dtd	2021-01-18 19:59:28.000000000 +0000
@@ -13,7 +13,7 @@
 <!ENTITY fullscreenButton.enterfullscreenlabel "ملء الشاشة">
 <!ENTITY fullscreenButton.exitfullscreenlabel "غادر ملء الشاشة">
 <!ENTITY castingButton.castingLabel "اعرض على الشاشة">
-<!ENTITY closedCaption.off "لا">
+<!ENTITY closedCaption.off "بدون">
 <!-- LOCALIZATION NOTE (volumeScrubber.label): This label is exposed to
      accessibility software to clarify what the slider is for. -->
 <!ENTITY volumeScrubber.label "شريط مستوى الصوت">
diff -Nru firefox-84.0.2+build1/l10n/ast/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ast/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ast/browser/browser/appmenu.ftl	2021-01-06 11:24:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ast/browser/browser/appmenu.ftl	2021-01-18 19:59:32.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Ventana nueva
+appmenuitem-new-private-window =
+    .label = Ventana privada nueva
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar agora
+appmenuitem-save-page =
+    .label = Guardar páxina como…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/ast/browser/browser/browser.ftl firefox-85.0+build1/l10n/ast/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ast/browser/browser/browser.ftl	2021-01-06 11:24:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ast/browser/browser/browser.ftl	2021-01-18 19:59:32.000000000 +0000
@@ -224,6 +224,9 @@
 browser-window-close-button =
     .tooltiptext = Zarrar
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -287,3 +290,45 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tien el control del to punteru. Primi Esc pa recuperalu.
 pointerlock-warning-no-domain = Esti documentu tien el control del to punteru. Primi Esc pa recuperalu.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Amosar tolos marcadores
+bookmarks-recent-bookmarks =
+    .value = Amestao apocayá a marcadores
+bookmarks-toolbar-chevron =
+    .tooltiptext = Amosar más marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú de marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Otros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores del móvil
+bookmarks-search =
+    .label = Guetar marcadores
+bookmarks-tools =
+    .label = Ferramientes de marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de ferramientes de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Elementos de la barra de ferramientes de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos de la barra de ferramientes de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Amestar esta páxina a marcadores
+library-bookmarks-bookmark-edit =
+    .label = Editar esti marcador
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabayar ensin conexón
+    .accesskey = y
diff -Nru firefox-84.0.2+build1/l10n/az/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/az/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/az/browser/browser/appmenu.ftl	2021-01-06 11:24:25.000000000 +0000
+++ firefox-85.0+build1/l10n/az/browser/browser/appmenu.ftl	2021-01-18 19:59:36.000000000 +0000
@@ -12,15 +12,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Yeni Pəncərə
+appmenuitem-new-private-window =
+    .label = Yeni Məxfi Pəncərə
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Yaxınlaşdır
 appmenuitem-zoom-reduce =
     .label = Uzaqlaşdır
+appmenuitem-fullscreen =
+    .label = Tam ekran
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Ä°ndi SinxronizÉ™ et
+appmenuitem-save-page =
+    .label = Fərqli saxla…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/az/browser/browser/browser.ftl firefox-85.0+build1/l10n/az/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/az/browser/browser/browser.ftl	2021-01-06 11:24:26.000000000 +0000
+++ firefox-85.0+build1/l10n/az/browser/browser/browser.ftl	2021-01-18 19:59:36.000000000 +0000
@@ -295,6 +295,9 @@
 browser-window-close-button =
     .tooltiptext = Qapat
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -374,3 +377,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> kursorunuzu idarə edir. İdarəni geri almaq üçün Esc düyməsinə basın.
 pointerlock-warning-no-domain = Bu sənəd kursorunuzu idarə edir. İdarəni geri almaq üçün Esc düyməsinə basın.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Bütün əlfəcinləri göstər
+bookmarks-recent-bookmarks =
+    .value = Yeni əlfəcinlənmiş
+bookmarks-toolbar-chevron =
+    .tooltiptext = Daha çox əlfəcin göstər
+bookmarks-sidebar-content =
+    .aria-label = �lfəcinlər
+bookmarks-menu-button =
+    .label = �lfəcinlər menyusu
+bookmarks-other-bookmarks-menu =
+    .label = Digər əlfəcinlər
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil əlfəcinlər
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] �lfəcin yan panelini gizlət
+           *[other] �lfəcin yan panelini göstər
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] �lfəcin alət sətrini gizlət
+           *[other] �lfəcin alət sətrini gör
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] �lfəcinlər menyusunu Alət sətrindən sil
+           *[other] �lfəcinlər menyusunu Alət sətrinə əlavə et
+        }
+bookmarks-search =
+    .label = �lfəcinlərdə axtar
+bookmarks-tools =
+    .label = �lfəcin alətləri
+bookmarks-toolbar-menu =
+    .label = �lfəcin paneli
+bookmarks-toolbar-placeholder =
+    .title = �lfəcin alət sətri obyektləri
+bookmarks-toolbar-placeholder-button =
+    .label = �lfəcin alət sətri obyektləri
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = �lfəcinlər
+library-bookmarks-bookmark-this-page =
+    .label = Səhifəni əlfəcinlə
+library-bookmarks-bookmark-edit =
+    .label = Bu əlfəcini düzəlt
+
+## More items
+
+more-menu-go-offline =
+    .label = Oflayn iÅŸlÉ™
+    .accesskey = l
diff -Nru firefox-84.0.2+build1/l10n/az/dom/dom/media.ftl firefox-85.0+build1/l10n/az/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/az/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/az/dom/dom/media.ftl	2021-01-18 19:59:36.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/az/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/az/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/az/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/az/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 19:59:36.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/be/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/aboutLogins.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/aboutLogins.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Выдаліць г�ты лагін?
 confirm-delete-dialog-message = Г�тае дзе�нне незваротнае.
 about-logins-confirm-remove-dialog-confirm-button = Выдаліць
-about-logins-confirm-remove-all-dialog-confirm-button = Выдаліць у�е
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Выдаліць
+        [one] Выдаліць
+        [few] Выдаліць у�е
+       *[many] Выдаліць у�е
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Так, выдаліць г�ты лагін
@@ -207,6 +213,8 @@
 about-logins-confirm-export-dialog-title = Эк�парт лагінаў і парол�ў
 about-logins-confirm-export-dialog-message = Вашы паролі будуць захаваны �к звычайны т�к�т (напр., BadP@ssw0rd), таму кожны, хто можа адкрыць �к�партаваны файл, можа ўбачыць іх.
 about-logins-confirm-export-dialog-confirm-button = Эк�партаваць…
+about-logins-alert-import-title = Імпарт завершаны
+about-logins-alert-import-message = Пагл�дзець падраб�зную зводку імпарту
 confirm-discard-changes-dialog-title = �дхіліць незахаваны� змены?
 confirm-discard-changes-dialog-message = У�е незапі�аны� змены будуць �трачаны.
 confirm-discard-changes-dialog-confirm-button = �дхіліць
@@ -268,3 +276,34 @@
         [macos] Дакумент CSV
        *[other] Файл CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Імпарт завершаны
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Дададзены новы лагін:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Дададзены новы� лагіны:</span> <span data-l10n-name="count">{ $count }</span>
+       *[many] <span>Дададзена новых лагінаў:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>�бноўлены на�ўны лагін:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>�бноўлены на�ўны� лагіны:</span> <span data-l10n-name="count">{ $count }</span>
+       *[many] <span>�бноўлена на�ўных лагінаў:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Знойдзены дублікатны лагін:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартаваны)</span>
+        [few] <span>Знойдзены дублікатны� лагіны:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартаваны)</span>
+       *[many] <span>Знойдзена дублікатных лагінаў:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартавана)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Памылка:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартаваны)</span>
+        [few] <span>Памылкі:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартаваны)</span>
+       *[many] <span>Памылак:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не імпартаваны)</span>
+    }
+about-logins-import-dialog-done = Гатова
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/be/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/appmenu.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/appmenu.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �овае акно
+appmenuitem-new-private-window =
+    .label = �овае прыватнае акно
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Пав�лічыць
 appmenuitem-zoom-reduce =
     .label = Паменшыць
+appmenuitem-fullscreen =
+    .label = Уве�ь �кран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Сінхранізаваць зараз
+appmenuitem-save-page =
+    .label = Захаваць �таронку �к…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Што новага
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/be/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/appMenuNotifications.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/appMenuNotifications.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -6,14 +6,14 @@
     .label = Да�тупна нова� вер�і� { -brand-shorter-name }.
     .buttonlabel = Сц�гнуць абнаўленне
     .buttonaccesskey = С
-    .secondarybuttonlabel = �е ц�пер
+    .secondarybuttonlabel = �е зараз
     .secondarybuttonaccesskey = �
 appmenu-update-available-message = �бнавіце { -brand-shorter-name } дл� павыш�нн� хуткадзейна�ці і прыватна�ці.
 appmenu-update-manual =
     .label = { -brand-shorter-name } не можа абнавіцца да апошн�й вер�іі.
     .buttonlabel = Сц�гнуць { -brand-shorter-name }
     .buttonaccesskey = С
-    .secondarybuttonlabel = �е ц�пер
+    .secondarybuttonlabel = �е зараз
     .secondarybuttonaccesskey = �
 appmenu-update-manual-message = Сц�гніце новую вер�ію { -brand-shorter-name } і мы дапаможам вам �е ў�тал�ваць.
 appmenu-update-whats-new =
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = �е зараз
     .secondarybuttonaccesskey = �
 appmenu-update-restart-message = Па�л� хуткага перазапу�ку { -brand-shorter-name } адновіць ў�е адкрыты� карткі і вокны, �кі� не былі адчынены ў р�жыме прыватнага агл�данн�.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } не можа аўтаматычна абнавіцца да апошн�й вер�іі.
+    .buttonlabel = У�ё роўна абнавіць { -brand-shorter-name }
+    .buttonaccesskey = У
+    .secondarybuttonlabel = �е зараз
+    .secondarybuttonaccesskey = �
+appmenu-update-other-instance-message = Да�тупна абнаўленне дл� { -brand-shorter-name }, але �го нельга ў�тал�ваць, бо запушчана інша� копі� { -brand-shorter-name }. Закрыйце �е, каб прац�гнуць абнаўленне, або выберыце абнаўленне ў любым выпадку (інша� копі� можа не працаваць належным чынам, пакуль вы не перазапу�ціце �е).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Добра, зразумела
     .buttonaccesskey = з
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/browser.ftl firefox-85.0+build1/l10n/be/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/browser.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/browser.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -505,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> кіруе вашым указальнікам. �аці�ніце Esc, каб уз�ць кіраванне.
 pointerlock-warning-no-domain = Г�ты дакумент кіруе вашым указальнікам. �аці�ніце Esc, каб уз�ць кіраванне.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Паказаць у�е закладкі
+bookmarks-recent-bookmarks =
+    .value = ��даўні� закладкі
+bookmarks-toolbar-chevron =
+    .tooltiptext = Паказаць больш закладак
+bookmarks-sidebar-content =
+    .aria-label = Закладкі
+bookmarks-menu-button =
+    .label = Меню закладак
+bookmarks-other-bookmarks-menu =
+    .label = Іншы� закладкі
+bookmarks-mobile-bookmarks-menu =
+    .label = Мабільны� закладкі
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Схаваць бакавую пан�ль закладак
+           *[other] Паказаць бакавую пан�ль закладак
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Схаваць паліцу закладак
+           *[other] Паказаць паліцу закладак
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Прыбраць меню закладак з паліцы прылад
+           *[other] Дадаць меню закладак на паліцу прылад
+        }
+bookmarks-search =
+    .label = Шукаць у закладках
+bookmarks-tools =
+    .label = Прылады закладак
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Паліца закладак
+    .accesskey = з
+    .aria-label = Закладкі
+bookmarks-toolbar-menu =
+    .label = Паліца закладак
+bookmarks-toolbar-placeholder =
+    .title = Элементы паліцы закладак
+bookmarks-toolbar-placeholder-button =
+    .label = Элементы паліцы закладак
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Закладкі
+library-bookmarks-bookmark-this-page =
+    .label = Дадаць закладку на �таронку
+library-bookmarks-bookmark-edit =
+    .label = Правіць г�тую закладку
+library-recent-activity-label = �пошн�� актыўна�ць
+
+## More items
+
+more-menu-go-offline =
+    .label = Праца па-за �еткаю
+    .accesskey = з
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/be/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/newtab/asrouter.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/newtab/asrouter.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -129,6 +129,9 @@
 
 cfr-whatsnew-searchbar-title = Уводзьце менш, знаходзьце больш з адра�ным радком
 cfr-whatsnew-searchbar-body-topsites = Ц�пер про�та выберыце адра�ны радок, і ён разгорнецца �па�ылкамі на вашы папул�рны� �айты.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Значок павелічальнага шкла
 
 ## Picture-in-Picture
@@ -286,3 +289,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Ярлыкi пошуку ў адра�ным радку
 cfr-whatsnew-search-shortcuts-body = Ц�пер, калі вы ўводзіце пошукавую �і�т�му альбо п�ўны �айт у адра�ны радок, у прапановах пошуку ніж�й з'�віцца �іні �рлык. Выберыце г�ты �рлык, каб зав�ршыць пошук непа�р�дна з адра�нага радка.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = �барона ад зламы�ных �уперкукі
+cfr-whatsnew-supercookies-body = В�б-�айты могуць таемна прымацоўваць да вашага браўзера "�уперкукі", �кі� могуць �ачыць за вамі ў Інт�рн�це, нават па�л� таго, �к вы выдаліце файлы cookie. { -brand-short-name } ц�пер заб��печвае надзейную ахову ад �уперкукі, таму іх не ўда�ца выкары�таць дл� а�очванн� вашай Інт�рн�т-актыўна�ці паміж �айтамі.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Лепша� праца з закладкамі
+cfr-whatsnew-bookmarking-body = Стала пра�цей а�очваць вашы ўлюбёны� �айты. { -brand-short-name } ц�пер запамінае ваша пераважнае ме�ца дл� захаванн� закладак, прадвызначана паказвае пан�ль закладак на новых картках і дае про�ты до�туп да а�татніх вашых закладак праз папку на паліцы прылад.
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/be/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/newtab/newtab.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/newtab/newtab.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ова� картка
 newtab-settings-button =
     .title = �аладзіць вашу �таронку новай карткі
+newtab-personalize-button-label = Пер�аналізаваць
+    .title = Пер�аналізаваць новую картку
+    .aria-label = Пер�аналізаваць новую картку
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Пошук у Інт�рн�це
     .title = Пошук у Інт�рн�це
     .aria-label = Пошук у Інт�рн�це
+newtab-search-box-text = Пошук у інт�рн�це
+newtab-search-box-input =
+    .placeholder = Пошук у інт�рн�це
+    .aria-label = Шукайце ў Інт�рн�це
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Дадаць пашукавік
 newtab-topsites-add-topsites-header = �овы папул�рны �айт
+newtab-topsites-add-shortcut-header = �овы ц�тлік
 newtab-topsites-edit-topsites-header = Р�дагаваць папул�рны �айт
+newtab-topsites-edit-shortcut-header = Р�дагаваць ц�тлік
 newtab-topsites-title-label = Загаловак
 newtab-topsites-title-input =
     .placeholder = Ув�дзіце назву
@@ -207,3 +216,28 @@
 
 newtab-error-fallback-info = Ох, нешта пайшло не так пры загрузцы г�тага зме�ціва.
 newtab-error-fallback-refresh-link = �бнавіць �таронку, каб паўтарыць �пробу.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Ц�тлікі
+newtab-custom-shortcuts-subtitle = Сайты, �кі� вы захоўваеце або наведваеце
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } радок
+        [few] { $num } радкі
+       *[many] { $num } радкоў
+    }
+newtab-custom-sponsored-sites = Спон�ар�кі� ц�тлікі
+newtab-custom-pocket-title = Р�камендавана { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Выключнае зме�ціва, куратарам �кога з'�ўл�ецца { -pocket-brand-name }, ча�тка ��м'і { -brand-product-name }
+newtab-custom-pocket-sponsored = �ртыкулы ад �пон�араў
+newtab-custom-recent-title = �пошн�� актыўна�ць
+newtab-custom-recent-subtitle = Падборка н�даўніх �айтаў і зме�ціва
+newtab-custom-close-button = Закрыць
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Урыўкі
+newtab-custom-snippets-subtitle = Парады і навіны ад { -vendor-short-name } і { -brand-product-name }
+newtab-custom-settings = Кіраваць дадатковымі наладамі
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/places.ftl firefox-85.0+build1/l10n/be/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/places.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/places.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Укладзена� папка
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Іншы� закладкі
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/be/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/preferences/preferences.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/preferences/preferences.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -503,6 +503,11 @@
 home-prefs-topsites-description = Сайты, �кі� вы наведваеце найча�цей
 home-prefs-topsites-by-option-sponsored =
     .label = Папул�рны� �айты ад �пон�араў
+home-prefs-shortcuts-header =
+    .label = Ц�тлікі
+home-prefs-shortcuts-description = Сайты, �кі� вы захоўваеце або наведваеце
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Спон�ар�кі� ц�тлікі
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -510,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Р�камендавана { $provider }
 home-prefs-recommended-by-description-update = Выключнае зме�ціва з у��го інт�рн�ту, падабранае { $provider }
+home-prefs-recommended-by-description-new = Выключнае зме�ціва, куратарам �кога з'�ўл�ецца { $provider }, ча�тка ��м'і { -brand-product-name }
 
 ##
 
@@ -518,8 +524,6 @@
     .label = �ртыкулы ад �пон�араў
 home-prefs-highlights-header =
     .label = Выбранае
-home-prefs-recent-activity-header =
-    .label = �пошн�� актыўна�ць
 home-prefs-highlights-description = Выбраны� �айты, �кі� вы захавалі ці наведалі
 home-prefs-highlights-option-visited-pages =
     .label = �аведаны� �таронкі
@@ -529,6 +533,9 @@
     .label = ��даўні� �ц�гванні
 home-prefs-highlights-option-saved-to-pocket =
     .label = Захаваны� ў { -pocket-brand-name } �таронкі
+home-prefs-recent-activity-header =
+    .label = �пошн�� актыўна�ць
+home-prefs-recent-activity-description = Падборка н�даўніх �айтаў і зме�ціва
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Урыўкі
 home-prefs-snippets-description = �бнаўленні ад { -vendor-short-name } і { -brand-product-name }
+home-prefs-snippets-description-new = Парады і навіны ад { -vendor-short-name } і { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -928,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = �дкрыты� карткі
     .accesskey = �
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Ц�тлікі
+    .accesskey = Ц
 addressbar-locbar-topsites-option =
     .label = Папул�рны� �айты
     .accesskey = П
+addressbar-locbar-engines-option =
+    .label = Пошукавы� �і�т�мы
+    .accesskey = П
 addressbar-suggestions-settings = Зм�ніць налады дл� падказак пашукавіка
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/be/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/be/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/be/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -62,6 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Толькі на новай картцы
     .accesskey = Т
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Заў�ёды паказваць
+    .accesskey = З
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = �іколі не паказваць
+    .accesskey = �
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Толькі на новай картцы
+    .accesskey = Т
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Паказаць іншы� закладкі
     .accesskey = П
diff -Nru firefox-84.0.2+build1/l10n/be/devtools/client/markers.properties firefox-85.0+build1/l10n/be/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/be/devtools/client/markers.properties	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/devtools/client/markers.properties	2021-01-18 20:00:28.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Мала пам�ці
 marker.gcreason.label.CC_WAITING=Выклікана зборкай цыклаў
+marker.gcreason.label.CC_FINISHED=Зборка цыклаў �кончана
 marker.gcreason.label.CC_FORCED=Выклікана зборкай цыклаў
 marker.gcreason.label.LOAD_END=Загрузка �таронкі завершана
 marker.gcreason.label.PAGE_HIDE=Перамешчана ў фон
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Калекцы� гадавальніка
-
diff -Nru firefox-84.0.2+build1/l10n/be/devtools/client/toolbox.properties firefox-85.0+build1/l10n/be/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/be/devtools/client/toolbox.properties	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/devtools/client/toolbox.properties	2021-01-18 20:00:28.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Закрыць прылады ра�працоўшчыка
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Паказаць падзеленую кан�оль
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/be/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/be/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/be/devtools/client/tooltips.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/devtools/client/tooltips.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> не ўплывае на г�ты �лемент, паколькі ён не пазіцы�наваны �лемент.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> не ўплывае на г�ты �лемент, паколькі <strong>overflow:hidden</strong> не ў�тал�ваны.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> не ўплывае на г�ты �лемент, паколькі �го <strong>outline-style</strong> у�тал�ваны ў <strong>auto</strong> або <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> не ўплывае на ўнутраны� �лементы табліцы.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> не ўплывае на ўнутраны� �лементы табліцы, акрам� �ч�ек табліцы.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Па�прабуйце выдаліць <strong>float</strong> або дадаць <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Па�прабуйце ў�тал�ваць �го ўла�ціва�ць <strong>position</strong> на што-небудзь іншае, ніж <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Па�прабуйце дадаць <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Па�прабуйце ў�танавіць дл� ўла�ціва�ці <strong>display</strong> нешта іншае, ніж <strong>table-cell </strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ці <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Па�прабуйце ў�танавіць дл� ўла�ціва�ці <strong>display</strong> нешта іншае, ніж <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ці <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Па�прабуйце ў�тал�ваць �го ўла�ціва�ць <strong>outline-style</strong> у што-небудзь іншае, ніж <strong>auto</strong> цi <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/be/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/be/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/be/dom/chrome/dom/dom.properties	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/dom/chrome/dom/dom.properties	2021-01-18 20:00:28.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Селектар <input> заблакаваны з-за ад�утна�ці актывацыі кары�тальнікам.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe з вонкавым пратаколам заблакаваны з-за ад�утна�ці актывацыі кары�тальнікам або таму, што прайшло неда�таткова ча�у з моманту загрузкі апошн�га такога iframe.
 MultiplePopupsBlockedNoUserActivation=�дкрыццё некалькіх выплыўных вокнаў было заблакавана з-за ад�утна�ці актывацыі кары�тальнікам.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Пап�р�дн�� загрузка %S была праігнаравана з-за н�вызначанага "as" ці "type", або не�упадзенн� атрыбута "media".
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/be/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/be/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:00:28.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=\u0020д; д; д
 
 downloadErrorAlertTitle=Памылка �ц�гванн�
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Сц�гванне нельга захаваць, бо �но блакуецца %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Сц�гванне нельга захаваць, бо �но блакуецца пашыр�ннем.
 downloadErrorGeneric=�емагчыма захаваць загружаны файл, бо здарыла�� нев�дома� памылка.\n\nПа�прабуйце, калі ла�ка, зноў.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=За�тало�� некалькі �екунд
 timeUnknown2=Ча� нев�домы
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=здатак %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/be/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/be/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:00:28.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Прок�і-�ервер адмовіў�� злучацца
 check_error-2153390069=Па�ведчанне �ервера �а�тар�ла (праверце, калі ла�ка, ваш �і�т�мны гадзіннік і папраўце �го, калі ён адлю�троўвае памылковы� дату і ча�)
 check_error-verification_failed=�емагчыма праверыць ц�ла�на�ць абнаўленн�
+check_error-move_failed=�е ўдало�� падрыхтаваць абнаўленне да ў�талёўкі
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/be/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/be/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -28,7 +28,12 @@
 ##    $type (String) The raw type for this process. Used for unknown processes.
 
 about-processes-browser-process-name = { -brand-short-name } (прац�� { $pid })
+about-processes-web-large-allocation = В�б (прац�� { $pid }, буйны) дл� { $origin }
 about-processes-file-process-name = Файлы (прац�� { $pid })
+about-processes-extension-process-name = Пашыр�нні (прац�� { $pid })
+about-processes-plugin-process-name = Плагіны (прац�� { $pid })
+about-processes-privilegedmozilla-process-name = В�б (прац�� { $pid }) дл� �айтаў { -vendor-short-name }
+about-processes-socket-process-name = Сетка (прац�� { $pid })
 # Process
 # Variables:
 #   $name (String) The name assigned to the process.
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/be/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/be/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Модулі іншых вытворцаў
+support-third-party-modules-module = Файл модул�
+support-third-party-modules-version = Вер�і� файла
+support-third-party-modules-vendor = Інфармацы� пра вытворцу
+support-third-party-modules-occurrence = Копіі
+support-third-party-modules-process = Тып і ід�нтыфікатар прац��у
+support-third-party-modules-thread = Паток
+support-third-party-modules-base = �дра� базавай загрузкі вы�вы
+support-third-party-modules-uptime = Ча� працы прац��у (м�)
+support-third-party-modules-duration = Прац�гла�ць загрузкі (м�)
+support-third-party-modules-empty = Модулі іншых вытворцаў не загружаны.
+support-third-party-modules-no-value = (��ма знач�нн�)
+support-third-party-modules-button-open =
+    .title = �дкрыць ме�цазнаходжанне файла…
+support-third-party-modules-expand =
+    .title = Паказаць падраб�зную інфармацыю
+support-third-party-modules-collapse =
+    .title = Згарнуць падраб�зную інфармацыю
+support-third-party-modules-unsigned-icon =
+    .title = Г�ты модуль не падпі�аны
+support-third-party-modules-folder-icon =
+    .title = �дкрыць ме�цазнаходжанне файла…
+support-third-party-modules-down-icon =
+    .title = Паказаць падраб�зную інфармацыю
+support-third-party-modules-up-icon =
+    .title = Згарнуць падраб�зную інфармацыю
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/be/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/be/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Падтрымка некалькiх вокнаў «Вы�ва ў вы�ве»
 experimental-features-multi-pip-description = Эк�перыментальна� падтрымка, што дазвал�е некалькім вокнам «Вы�ва ў вы�ве» быць адкрытымі аднача�ова.
+experimental-features-http3 =
+    .label = Пратакол HTTP/3
+experimental-features-http3-description = Эк�перыментальна� падтрымка пратакола HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/be/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/be/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Старонка:
     .accesskey = С
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } з { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = �пошн�� �таронка
-
+printpreview-homearrow-button =
+    .title = Перша� �таронка
+printpreview-previousarrow-button =
+    .title = Пап�р�дн�� �таронка
+printpreview-nextarrow-button =
+    .title = �а�тупна� �таронка
+printpreview-endarrow-button =
+    .title = �пошн�� �таронка
diff -Nru firefox-84.0.2+build1/l10n/be/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/be/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/be/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:24:30.000000000 +0000
+++ firefox-85.0+build1/l10n/be/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:00:28.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = да
+printui-page-custom-range-input =
+    .aria-label = Ув�дзіце ўла�ны ды�пазон �таронак
+    .placeholder = напрыклад, 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Копіі
 printui-orientation = �рыентацы�
@@ -49,6 +52,7 @@
 printui-options = �алады
 printui-headers-footers-checkbox = Друкаваць загалоўкі і калантытулы
 printui-backgrounds-checkbox = Друкаваць фон
+printui-selection-checkbox = Друкаваць толькі вылуч�нне
 printui-color-mode-label = Кал�ровы р�жым
 printui-color-mode-color = Кал�ровы
 printui-color-mode-bw = Чорна-белы
@@ -57,19 +61,29 @@
 printui-margins-min = Мінімум
 printui-margins-none = ��ма
 printui-margins-custom = �дмы�лова
+printui-margins-custom-inches = Ула�ны� (цалі)
 printui-margins-custom-top = Увер�е
+printui-margins-custom-top-inches = Увер�е (цалі)
 printui-margins-custom-bottom = Унізе
+printui-margins-custom-bottom-inches = Унізе (цалі)
 printui-margins-custom-left = Злева
+printui-margins-custom-left-inches = Злева (цалі)
 printui-margins-custom-right = Справа
+printui-margins-custom-right-inches = Справа (цалі)
 printui-system-dialog-link = Друк з дапамогай �і�т�мнага ды�логу…
 printui-primary-button = Друкаваць
 printui-primary-button-save = Захаваць
 printui-cancel-button = �дмена
+printui-close-button = Закрыць
 printui-loading = Рыхтуецца пап�р�дні прагл�д
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Перадпрагл�д друку
+printui-pages-per-sheet = Старонак на аркушы
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Друк…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/bg/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/bg/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/bg/browser/browser/appmenu.ftl	2021-01-06 11:25:04.000000000 +0000
+++ firefox-85.0+build1/l10n/bg/browser/browser/appmenu.ftl	2021-01-18 20:01:19.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �ов прозорец
+appmenuitem-new-private-window =
+    .label = Поверителен прозорец
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Увеличаване
 appmenuitem-zoom-reduce =
     .label = �амал�ване
+appmenuitem-fullscreen =
+    .label = Ц�л екран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Синхронизиране
+appmenuitem-save-page =
+    .label = Запазване като…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/bg/browser/browser/browser.ftl firefox-85.0+build1/l10n/bg/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/bg/browser/browser/browser.ftl	2021-01-06 11:25:04.000000000 +0000
+++ firefox-85.0+build1/l10n/bg/browser/browser/browser.ftl	2021-01-18 20:01:19.000000000 +0000
@@ -448,3 +448,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> контролира показалеца на мишката ви. �ати�нете Esc, за да �и възвърнете контрола.
 pointerlock-warning-no-domain = Този документ контролира показалеца на мишката ви. �ати�нете Esc, за да �и възвърнете контрола.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Показване на в�ички отметки
+bookmarks-recent-bookmarks =
+    .value = По�ледни отметки
+bookmarks-toolbar-chevron =
+    .tooltiptext = Показване на повече отметки
+bookmarks-sidebar-content =
+    .aria-label = Отметки
+bookmarks-menu-button =
+    .label = Меню � отметки
+bookmarks-other-bookmarks-menu =
+    .label = Други отметки
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобилни отметки
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скриване на лентата � отметки
+           *[other] Странична лента � отметки
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скриване на �траничната лента � отметки
+           *[other] Показване на лентата � отметки
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Премахване на меню Oтметки от лентата � ин�трументи
+           *[other] Добав�не на меню Отметки към лентата � ин�трументи
+        }
+bookmarks-search =
+    .label = Тър�ене в отметките
+bookmarks-tools =
+    .label = Ин�трументи за отметки
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Лента � отметки
+    .accesskey = о
+    .aria-label = Отметки
+bookmarks-toolbar-menu =
+    .label = Лента � отметки
+bookmarks-toolbar-placeholder =
+    .title = Елементи на лентата � отметките
+bookmarks-toolbar-placeholder-button =
+    .label = Елементи на лентата � отметките
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Отметки
+library-bookmarks-bookmark-this-page =
+    .label = Отм�тане на �траницата
+library-bookmarks-bookmark-edit =
+    .label = Пром�на на отметка
+
+## More items
+
+more-menu-go-offline =
+    .label = Работа извън мрежата
+    .accesskey = Р
diff -Nru firefox-84.0.2+build1/l10n/bg/dom/dom/media.ftl firefox-85.0+build1/l10n/bg/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/bg/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bg/dom/dom/media.ftl	2021-01-18 20:01:19.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/bg/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/bg/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/bg/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bg/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:01:19.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/bn/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/bn/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/bn/browser/browser/appmenu.ftl	2021-01-06 11:25:10.000000000 +0000
+++ firefox-85.0+build1/l10n/bn/browser/browser/appmenu.ftl	2021-01-18 20:01:28.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = নত�ন উইন�ডো
+appmenuitem-new-private-window =
+    .label = নত�ন ব�যক�তিগত উইন�ডো
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = বড় কর�ন
 appmenuitem-zoom-reduce =
     .label = ছোট কর�ন
+appmenuitem-fullscreen =
+    .label = পূর�ণ পর�দাজ�ড়ে প�রদর�শন
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = �খনই সিঙ�ক কর�ন
+appmenuitem-save-page =
+    .label = পাতা নত�নভাবে সংরক�ষণ…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = নত�ন কি আছে
-
diff -Nru firefox-84.0.2+build1/l10n/bn/browser/browser/browser.ftl firefox-85.0+build1/l10n/bn/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/bn/browser/browser/browser.ftl	2021-01-06 11:25:10.000000000 +0000
+++ firefox-85.0+build1/l10n/bn/browser/browser/browser.ftl	2021-01-18 20:01:28.000000000 +0000
@@ -310,6 +310,9 @@
 browser-window-close-button =
     .tooltiptext = বন�ধ
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -394,3 +397,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> আপনার পয়েন�টারের নিয়ন�ত�রণ রয়েছে। প�নরায় নিয়ন�ত�রণ নিতে Esc চাপ�ন।
 pointerlock-warning-no-domain = �ই নথিতে পয়েন�টারের নিয়ন�ত�রণ রয়েছে। প�নরায় নিয়ন�ত�রণ নিতে Esc চাপ�ন।
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = সব ব�কমার�ক প�রদর�শন
+bookmarks-recent-bookmarks =
+    .value = সম�প�রতি ব�কমার�ক করা
+bookmarks-toolbar-chevron =
+    .tooltiptext = আরও ব�কমার�ক প�রদর�শন
+bookmarks-sidebar-content =
+    .aria-label = ব�কমার�ক
+bookmarks-menu-button =
+    .label = ব�কমার�ক মেন�
+bookmarks-other-bookmarks-menu =
+    .label = অন�যান�য ব�কমার�ক
+bookmarks-mobile-bookmarks-menu =
+    .label = মোবাইলের ব�কমার�ক
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ব�কমার�ক সাইডবার ল�কাও
+           *[other] ব�কমার�ক সাইডবার প�রদর�শন
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ব�কমার�ক ট�লবার ল�কাও
+           *[other] ব�কমার�ক ট�লবার প�রদর�শন
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ট�লবার থেকে ব�কমার�ক মেন� অপসারণ
+           *[other] ট�লবারে ব�কমার�ক মেন� যোগ কর�ন
+        }
+bookmarks-search =
+    .label = ব�কমার�ক অন�সন�ধান
+bookmarks-tools =
+    .label = ব�কমার�ক ট�লসমূহ
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ব�কমার�ক ট�লবার B
+    .accesskey = B
+    .aria-label = ব�কমার�ক
+bookmarks-toolbar-menu =
+    .label = ব�কমার�ক ট�লবার B
+bookmarks-toolbar-placeholder =
+    .title = ব�কমার�ক ট�লবারের আইটেম
+bookmarks-toolbar-placeholder-button =
+    .label = ব�কমার�ক ট�লবারের আইটেম
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ব�কমার�ক
+library-bookmarks-bookmark-this-page =
+    .label = �ই পাতা ব�কমার�ক কর�ন
+library-bookmarks-bookmark-edit =
+    .label = ব�কমার�ক সম�পাদনা
+
+## More items
+
+more-menu-go-offline =
+    .label = অফলাইন অবস�থায় কাজ k
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/bn/dom/dom/media.ftl firefox-85.0+build1/l10n/bn/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/bn/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bn/dom/dom/media.ftl	2021-01-18 20:01:28.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/bn/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/bn/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/bn/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bn/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:01:28.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/br/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/br/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/br/browser/browser/appmenu.ftl	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/browser/browser/appmenu.ftl	2021-01-18 20:01:59.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Prenestr nevez
+appmenuitem-new-private-window =
+    .label = Prenestr merdeiñ prevez nevez
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoumañ
 appmenuitem-zoom-reduce =
     .label = Dizoumañ
+appmenuitem-fullscreen =
+    .label = Skramm a-bezh
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Goubredañ bremañ
+appmenuitem-save-page =
+    .label = Enrollañ ar bajenn evel…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Petra nevez
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/br/browser/browser/browser.ftl firefox-85.0+build1/l10n/br/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/br/browser/browser/browser.ftl	2021-01-06 11:25:47.000000000 +0000
+++ firefox-85.0+build1/l10n/br/browser/browser/browser.ftl	2021-01-18 20:01:59.000000000 +0000
@@ -460,7 +460,7 @@
 # Variables
 #  $engine (String): the name of a search engine
 urlbar-result-action-search-w-engine = Klask gant { $engine }
-urlbar-result-action-sponsored = Paeronet
+urlbar-result-action-sponsored = Paeroniet
 urlbar-result-action-switch-tab = Mont d'an ivinell
 urlbar-result-action-visit = Gweladenniñ
 
@@ -487,3 +487,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> a c'hall reoliñ ho logodenn. Pouezit war Achap evit bezañ mestr outi en-dro.
 pointerlock-warning-no-domain = Meret eo ho logodenn gant an teul-mañ. Pouezit war Achap evit bezañ mestr outi en-dro.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Diskouez an holl sinedoù
+bookmarks-recent-bookmarks =
+    .value = Lakaet war ur sined nevez zo
+bookmarks-toolbar-chevron =
+    .tooltiptext = Diskouez meur a sined
+bookmarks-sidebar-content =
+    .aria-label = Sinedoù
+bookmarks-menu-button =
+    .label = Lañser ar sinedoù
+bookmarks-other-bookmarks-menu =
+    .label = Sinedoù all
+bookmarks-mobile-bookmarks-menu =
+    .label = Sinedoù hezoug
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kuzhat barrenn gostez ar sinedoù
+           *[other] Gwelout barrenn gostez ar sinedoù
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kuzhat barrenn ostilhoù ar sinedoù
+           *[other] Gwelout barrenn ostilhoù ar sinedoù
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Lemel kuit lañser ar sinedoù diouzh ar varrenn ostilhoù
+           *[other] Ouzhpennañ lañser ar sinedoù er varrenn ostilhoù
+        }
+bookmarks-search =
+    .label = Klask er sinedoù
+bookmarks-tools =
+    .label = Ostilhoù ar sinedoù
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barrenn ostilhoù ar sinedoù
+    .accesskey = s
+    .aria-label = Sinedoù
+bookmarks-toolbar-menu =
+    .label = Barrenn ostilhoù ar sinedoù
+bookmarks-toolbar-placeholder =
+    .title = Ergorennoù barrenn ostilhoù ar sinedoù
+bookmarks-toolbar-placeholder-button =
+    .label = Ergorennoù barrenn ostilhoù ar sinedoù
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Sinedoù
+library-bookmarks-bookmark-this-page =
+    .label = Lakaat ur sined war ar bajenn-mañ
+library-bookmarks-bookmark-edit =
+    .label = Embann ar sined-mañ
+
+## More items
+
+more-menu-go-offline =
+    .label = Labourat ezlinenn
+    .accesskey = z
diff -Nru firefox-84.0.2+build1/l10n/br/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/br/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/br/browser/browser/newtab/newtab.ftl	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/browser/browser/newtab/newtab.ftl	2021-01-18 20:01:59.000000000 +0000
@@ -93,9 +93,9 @@
 ## Message displayed in a modal window to explain privacy and provide context for sponsored content.
 
 newtab-privacy-modal-button-done = Graet
-newtab-privacy-modal-button-manage = Merañ an arventennoù endalc'had kevelet
+newtab-privacy-modal-button-manage = Merañ an arventennoù endalc’had paeroniet
 newtab-privacy-modal-header = Pouezus eo ho puhez prevez
-newtab-privacy-modal-paragraph-2 = Kinnig a reomp deoc'h istorioù dedennus, met ivez danvezioù dibabet gant aked eus hor c'hevelerien. Bezit dinec'het: <strong>morse ne vo kaset ho roadennoù merdeiñ e diavaez ho eilenn hiniennel { -brand-product-name }</strong> — ne welont ket anezho hag hor c'hevelerien kennebeut.
+newtab-privacy-modal-paragraph-2 = Kinnig a reomp deoc'h istorioù dedennus, met ivez danvezioù dibabet gant aked gant hor paeroned. Bezit dinec'het: <strong>morse ne vo kaset ho roadennoù merdeiñ e diavaez ho eilenn hiniennel { -brand-product-name }</strong> — ne welont ket anezho hag hor paeroned kennebeut.
 newtab-privacy-modal-link = Deskit penaos ec'h a en-dro ar prevezded war an ivinell nevez
 
 ##
@@ -136,11 +136,11 @@
 # This string is used in the story cards to indicate sponsored content
 # Variables:
 #  $sponsorOrSource (String): This is the name of a company or their domain
-newtab-label-sponsored = { $sponsorOrSource } · kevellet
+newtab-label-sponsored = { $sponsorOrSource } · paeroniet
 # This string is used at the bottom of story cards to indicate sponsored content
 # Variables:
 #  $sponsor (String): This is the name of a sponsor
-newtab-label-sponsored-by = Kevelet gant { $sponsor }
+newtab-label-sponsored-by = Paeroniet gant { $sponsor }
 
 ## Section Menu: These strings are displayed in the section context menu and are
 ## meant as a call to action for the given section.
@@ -203,3 +203,8 @@
 
 newtab-error-fallback-info = Chaous, un dra bennak a zo a-dreuz en ur gargañ an endalc'had.
 newtab-error-fallback-refresh-link = Adkargit ar bajenn evit klask en-dro.
+
+## Customization Menu
+
+newtab-custom-sponsored-sites = Berradurioù paeroniet
+newtab-custom-pocket-sponsored = Istorioù paeroniet
diff -Nru firefox-84.0.2+build1/l10n/br/browser/browser/nsserrors.ftl firefox-85.0+build1/l10n/br/browser/browser/nsserrors.ftl
--- firefox-84.0.2+build1/l10n/br/browser/browser/nsserrors.ftl	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/browser/browser/nsserrors.ftl	2021-01-18 20:01:59.000000000 +0000
@@ -238,11 +238,11 @@
 sec-error-importing-certificates = Fazi e-pad ma oa o klask enporzhiañ testenioù.
 sec-error-pkcs12-decoding-pfx = N'haller ket enporzhiañ. Fazi divonegañ. N'eo ket talvoudek ar restr.
 sec-error-pkcs12-invalid-mac = N'haller ket enporzhiañ. MAC didalvoudek. Ger-tremen direizh pe restr kontronet.
-sec-error-pkcs12-unsupported-mac-algorithm = N'haller ket enporzhiañ. N'eo ket skoret treol MAC.
+sec-error-pkcs12-unsupported-mac-algorithm = N'haller ket enporzhiañ. Ne vez ket skoret treol MAC.
 sec-error-pkcs12-unsupported-transport-mode = N'haller ket enporzhiañ. Skoret e vez modoù ar vuhez prevez hag anterinder ar gerioù-tremen.
 sec-error-pkcs12-corrupt-pfx-structure = N'haller ket enporzhiañ. Kontronet eo bet frammad ar restr.
-sec-error-pkcs12-unsupported-pbe-algorithm = N'haller ket enporzhiañ. N'eo ket skoret an treol enrinegañ.
-sec-error-pkcs12-unsupported-version = N'haller ket enporzhiañ. N'eo ket skoret handelv ar restr.
+sec-error-pkcs12-unsupported-pbe-algorithm = N'haller ket enporzhiañ. Ne vez ket skoret an treol enrinegañ.
+sec-error-pkcs12-unsupported-version = N'haller ket enporzhiañ. Ne vez ket skoret handelv ar restr.
 sec-error-pkcs12-privacy-password-incorrect = N'haller ket enporzhiañ. Ger-tremen evit ho puhez prevez direizh.
 sec-error-pkcs12-cert-collision = N'haller ket enporzhiañ. An hevelep lesanv zo anezhañ er stlennvon endeo.
 sec-error-user-cancelled = Pouezet en deus an arveriad war Dilezel.
diff -Nru firefox-84.0.2+build1/l10n/br/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/br/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/br/browser/browser/preferences/preferences.ftl	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/browser/browser/preferences/preferences.ftl	2021-01-18 20:01:59.000000000 +0000
@@ -487,6 +487,8 @@
 home-prefs-topsites-description = Al lec'hiennoù a weladennit ar muiañ
 home-prefs-topsites-by-option-sponsored =
     .label = Lec'hiennoù gwellañ paeroniet
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Berradurioù paeroniet
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -498,11 +500,9 @@
 
 home-prefs-recommended-by-learn-more = Penaos ez a en-dro
 home-prefs-recommended-by-option-sponsored-stories =
-    .label = Istorioù kevelet
+    .label = Istorioù paeroniet
 home-prefs-highlights-header =
     .label = Mareoù pouezus
-home-prefs-recent-activity-header =
-    .label = Oberiantiz a-nevez
 home-prefs-highlights-description = Un dibab a lec'hiennoù ho peus enrollet pe gweladennet
 home-prefs-highlights-option-visited-pages =
     .label = Pajennoù gweladennet
@@ -512,6 +512,8 @@
     .label = Pellgargadurioù nevez
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pajennoù enrollet e { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Oberiantiz a-nevez
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
diff -Nru firefox-84.0.2+build1/l10n/br/dom/chrome/security/csp.properties firefox-85.0+build1/l10n/br/dom/chrome/security/csp.properties
--- firefox-84.0.2+build1/l10n/br/dom/chrome/security/csp.properties	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/dom/chrome/security/csp.properties	2021-01-18 20:01:59.000000000 +0000
@@ -34,7 +34,7 @@
 ignoringDuplicateSrc = O leuskel a-gostez mammennoù eilet %1$S
 # LOCALIZATION NOTE (ignoringSrcFromMetaCSP):
 # %1$S defines the ignored src
-ignoringSrcFromMetaCSP = Laosket an tarzh '%1$S' a-gostez (N'eo ket skoret p'eo degaset gant un elfenn meta).
+ignoringSrcFromMetaCSP = An tarzh '%1$S' a zo bet laosket a-gostez (Ne vez ket skoret p'eo degaset gant un elfenn meta).
 # LOCALIZATION NOTE (ignoringSrcWithinScriptStyleSrc):
 # %1$S is the ignored src
 # script-src and style-src are directive names and should not be localized
diff -Nru firefox-84.0.2+build1/l10n/br/security/manager/chrome/pipnss/nsserrors.properties firefox-85.0+build1/l10n/br/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-84.0.2+build1/l10n/br/security/manager/chrome/pipnss/nsserrors.properties	2021-01-06 11:25:46.000000000 +0000
+++ firefox-85.0+build1/l10n/br/security/manager/chrome/pipnss/nsserrors.properties	2021-01-18 20:01:59.000000000 +0000
@@ -218,11 +218,11 @@
 SEC_ERROR_IMPORTING_CERTIFICATES=Fazi e-pad ma oa o klask enporzhiañ testenioù.
 SEC_ERROR_PKCS12_DECODING_PFX=N'haller ket enporzhiañ. Fazi divonegañ. N'eo ket talvoudek ar restr.
 SEC_ERROR_PKCS12_INVALID_MAC=N'haller ket enporzhiañ. MAC didalvoudek. Ger-tremen direizh pe restr kontronet.
-SEC_ERROR_PKCS12_UNSUPPORTED_MAC_ALGORITHM=N'haller ket enporzhiañ. N'eo ket skoret treol MAC.
+SEC_ERROR_PKCS12_UNSUPPORTED_MAC_ALGORITHM=N’haller ket enporzhiañ. Ne vez ket meret an Treol MAC.
 SEC_ERROR_PKCS12_UNSUPPORTED_TRANSPORT_MODE=N'haller ket enporzhiañ. Skoret e vez modoù ar vuhez prevez hag anterinder ar gerioù-tremen.
 SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE=N'haller ket enporzhiañ. Kontronet eo bet frammad ar restr.
-SEC_ERROR_PKCS12_UNSUPPORTED_PBE_ALGORITHM=N'haller ket enporzhiañ. N'eo ket skoret an treol enrinegañ.
-SEC_ERROR_PKCS12_UNSUPPORTED_VERSION=N'haller ket enporzhiañ. N'eo ket skoret handelv ar restr.
+SEC_ERROR_PKCS12_UNSUPPORTED_PBE_ALGORITHM=N’haller ket enporzhiañ. Ne vez ket skoret an treol enrinegañ.
+SEC_ERROR_PKCS12_UNSUPPORTED_VERSION=N'haller ket enporzhiañ. Ne vez ket skoret handelv ar restr.
 SEC_ERROR_PKCS12_PRIVACY_PASSWORD_INCORRECT=N'haller ket enporzhiañ. Ger-tremen evit ho puhez prevez direizh.
 SEC_ERROR_PKCS12_CERT_COLLISION=N'haller ket enporzhiañ. An hevelep lesanv zo anezhañ er stlennvon endeo.
 SEC_ERROR_USER_CANCELLED=Pouezet en deus an arveriad war Dilezel.
diff -Nru firefox-84.0.2+build1/l10n/bs/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/bs/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/bs/browser/browser/appmenu.ftl	2021-01-06 11:25:50.000000000 +0000
+++ firefox-85.0+build1/l10n/bs/browser/browser/appmenu.ftl	2021-01-18 20:02:03.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Novi prozor
+appmenuitem-new-private-window =
+    .label = Novi privatni prozor
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Uvećaj
 appmenuitem-zoom-reduce =
     .label = Umanji
+appmenuitem-fullscreen =
+    .label = Prikaz preko cijelog ekrana
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinhronizuj sada
+appmenuitem-save-page =
+    .label = Spasi stranicu kao…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Å ta je novo
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/bs/browser/browser/browser.ftl firefox-85.0+build1/l10n/bs/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/bs/browser/browser/browser.ftl	2021-01-06 11:25:51.000000000 +0000
+++ firefox-85.0+build1/l10n/bs/browser/browser/browser.ftl	2021-01-18 20:02:03.000000000 +0000
@@ -272,6 +272,9 @@
 browser-window-close-button =
     .tooltiptext = Zatvori
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -339,3 +342,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ima kontrolu nad vašim pointerom. Pritisnite Esc da povratite kontrolu.
 pointerlock-warning-no-domain = Ovaj dokument ima kontrolu nad vašim pointerom. Pritisnite Esc da povratite kontrolu.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Prikaži sve zabilješke
+bookmarks-recent-bookmarks =
+    .value = Nedavno zabilježeno
+bookmarks-toolbar-chevron =
+    .tooltiptext = Prikaži više zabilješki
+bookmarks-sidebar-content =
+    .aria-label = Zabilješke
+bookmarks-menu-button =
+    .label = Meni sa zabilješkama
+bookmarks-other-bookmarks-menu =
+    .label = Druge zabilješke
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilne zabilješke
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sakrij bo�nu traku sa zabilješkama
+           *[other] Prikaži traku sa zabilješkama
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sakrij traku sa zabilješkama
+           *[other] Prikaži traku sa zabilješkama
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ukloni meni Zabilješke iz alatne trake
+           *[other] Dodaj meni Zabilješke u alatnu traku
+        }
+bookmarks-search =
+    .label = Pretraži zabilješke
+bookmarks-tools =
+    .label = Alati za zabilježavanje
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Traka sa zabilješkama
+    .accesskey = b
+    .aria-label = Zabilješke
+bookmarks-toolbar-menu =
+    .label = Traka sa zabilješkama
+bookmarks-toolbar-placeholder =
+    .title = Stavke trake sa zabilješkama
+bookmarks-toolbar-placeholder-button =
+    .label = Stavke trake sa zabilješkama
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Zabilješke
+library-bookmarks-bookmark-this-page =
+    .label = Zabilježi ovu stranicu
+library-bookmarks-bookmark-edit =
+    .label = Uredi ovu Zabilješku
+
+## More items
+
+more-menu-go-offline =
+    .label = Radi offline
+    .accesskey = R
diff -Nru firefox-84.0.2+build1/l10n/bs/dom/dom/media.ftl firefox-85.0+build1/l10n/bs/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/bs/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bs/dom/dom/media.ftl	2021-01-18 20:02:03.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/bs/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/bs/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/bs/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/bs/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:02:03.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ca/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/aboutLogins.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/aboutLogins.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -13,12 +13,9 @@
     .alt = Disponible a Google Play
 login-app-promo-apple =
     .alt = Baixeu-lo de l'App Store
-
 login-filter =
     .placeholder = Cerca els inicis de sessió
-
 create-login-button = Crea un inici de sessió
-
 fxaccounts-sign-in-text = Accediu a les contrasenyes en tots els vostres dispositius
 fxaccounts-sign-in-button = Inicia la sessió al { -sync-brand-short-name }
 fxaccounts-avatar-button =
@@ -32,6 +29,7 @@
 about-logins-menu-menuitem-import-from-another-browser = Importa d'un altre navegador…
 about-logins-menu-menuitem-import-from-a-file = Importa d'un fitxer…
 about-logins-menu-menuitem-export-logins = Exporta els inicis de sessió…
+about-logins-menu-menuitem-remove-all-logins = Elimina tots els inicis de sessió…
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] Opcions
@@ -71,7 +69,6 @@
 ## Introduction screen
 
 login-intro-heading = Esteu cercant els inicis de sessió que heu desat? Configureu el { -sync-brand-short-name }.
-
 about-logins-login-intro-heading-logged-out = Esteu cercant els inicis de sessió que heu desat? Configureu el { -sync-brand-short-name } o importeu-los.
 about-logins-login-intro-heading-logged-in = No s'ha trobat cap inici de sessió sincronitzat.
 login-intro-description = Si heu desat els vostres inicis de sessió en el { -brand-product-name } des d'un altre dispositiu, aquesta és la manera de tenir-los també aquí:
@@ -79,7 +76,6 @@
 login-intro-instruction-fxa-settings = Assegureu-vos que heu seleccionat la casella de selecció Inicis de sessió en els paràmetres del { -sync-brand-short-name }
 about-logins-intro-instruction-help = Visiteu l'<a data-l10n-name="help-link">assistència del { -lockwise-brand-short-name }</a> per obtenir més ajuda
 about-logins-intro-import = Si els vostres inicis de sessió estan desats en un altre navegador, podeu <a data-l10n-name="import-link">importar-los al { -lockwise-brand-short-name }</a>
-
 about-logins-intro-import2 = Si els vostres inicis de sessió estan desats fora del { -brand-product-name }, podeu <a data-l10n-name="import-browser-link">importar-los d'un altre navegador</a> o <a data-l10n-name="import-file-link">d'un fitxer</a>
 
 ## Login
@@ -120,13 +116,11 @@
 # This message can be seen when attempting to edit a login in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-edit-login-os-auth-dialog-message-macosx = editar l'inici de sessió desat
-
 # This message can be seen when attempting to reveal a password in about:logins on Windows.
 about-logins-reveal-password-os-auth-dialog-message-win = Per veure la contrasenya, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to reveal a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-reveal-password-os-auth-dialog-message-macosx = mostrar la contrasenya desada
-
 # This message can be seen when attempting to copy a password in about:logins on Windows.
 about-logins-copy-password-os-auth-dialog-message-win = Per copiar la contrasenya, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to copy a password in about:logins
@@ -136,7 +130,6 @@
 ## Master Password notification
 
 master-password-notification-message = Introduïu la contrasenya mestra per veure els inicis de sessió i les contrasenyes desats
-
 # This message can be seen when attempting to export a password in about:logins on Windows.
 about-logins-export-password-os-auth-dialog-message-win = Per exportar els inicis de sessió, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to export a password in about:logins
@@ -173,15 +166,40 @@
 confirmation-dialog-cancel-button = Cancel·la
 confirmation-dialog-dismiss-button =
     .title = Cancel·la
-
 about-logins-confirm-remove-dialog-title = Voleu eliminar aquest inici de sessió?
 confirm-delete-dialog-message = Aquesta acció no es pot desfer.
 about-logins-confirm-remove-dialog-confirm-button = Elimina
-
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Elimina
+        [one] Elimina
+       *[other] Elimina-ho tot
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Sí, elimina aquest inici de sessió
+        [one] Sí, elimina aquest inici de sessió
+       *[other] Sí, elimina aquests inicis de sessió
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Voleu eliminar { $count } inici de sessió
+       *[other] Voleu eliminar { $count } inicis de sessió
+    }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Això eliminarà l'inici de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+        [one] Això eliminarà l'inici de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+       *[other] Això eliminarà els inicis de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Voleu eliminar { $count } inici de sessió de tots els dispositius?
+       *[other] Voleu eliminar tots els { $count } inicis de sessió de tots els dispositius?
+    }
 about-logins-confirm-export-dialog-title = Exporta els inicis de sessió i contrasenyes
 about-logins-confirm-export-dialog-message = Les contrasenyes es desaran com a text llegible (per exemple, «malaC0ntr@senya»), de manera que qualsevol que pugui obrir el fitxer exportat les podrà veure.
 about-logins-confirm-export-dialog-confirm-button = Exporta…
-
 confirm-discard-changes-dialog-title = Voleu descartar els canvis no desats?
 confirm-discard-changes-dialog-message = Es perdran tots els canvis que no hàgiu desat.
 confirm-discard-changes-dialog-confirm-button = Descarta
@@ -212,11 +230,9 @@
 # Variables:
 #   $loginTitle (String) - The title of the website associated with the login.
 about-logins-error-message-duplicate-login-with-link = Ja existeix una entrada per a { $loginTitle } amb aquest nom d'usuari. <a data-l10n-name="duplicate-link">Voleu anar a l'entrada existent?</a>
-
 # This is a generic error message.
 about-logins-error-message-default = S'ha produït un error en intentar desar aquesta contrasenya.
 
-
 ## Login Export Dialog
 
 # Title of the file picker dialog
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ca/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/appmenu.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/appmenu.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Finestra nova
+appmenuitem-new-private-window =
+    .label = Finestra privada nova
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Amplia
 appmenuitem-zoom-reduce =
     .label = Redueix
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronitza ara
+appmenuitem-save-page =
+    .label = Anomena i desa la pàgina…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novetats
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ca/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/appMenuNotifications.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -39,7 +39,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Permet que aquesta extensió s'executi en finestres privades
     .accesskey = P
-    
 appmenu-new-tab-controlled =
     .label = La pàgina de «Pestanya nova» ha canviat.
     .buttonlabel = Mantén els canvis
@@ -52,6 +51,18 @@
     .buttonaccesskey = M
     .secondarybuttonlabel = Inhabilita l'extensió
     .secondarybuttonaccesskey = I
+appmenu-new-tab-controlled-changes =
+    .label = La pàgina de «Pestanya nova» ha canviat.
+    .buttonlabel = Mantén els canvis
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Gestiona les pestanyes noves
+    .secondarybuttonaccesskey = G
+appmenu-homepage-controlled-changes =
+    .label = La pàgina d'inici ha canviat.
+    .buttonlabel = Mantén els canvis
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Gestiona la pàgina d'inici
+    .secondarybuttonaccesskey = G
 appmenu-tab-hide-controlled =
     .label = Accedeix a les pestanyes ocultes
     .buttonlabel = Mantén les pestanyes amagades
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/browser.ftl firefox-85.0+build1/l10n/ca/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/browser.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/browser.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -503,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> té el control del punter. Premeu Esc per recuperar el control.
 pointerlock-warning-no-domain = Aquest document té el control del punter. Premeu Esc per recuperar el control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostra totes les adreces d'interès
+bookmarks-recent-bookmarks =
+    .value = Afegides recentment
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostra més adreces d'interès
+bookmarks-sidebar-content =
+    .aria-label = Adreces d'interès
+bookmarks-menu-button =
+    .label = Menú de les adreces d'interès
+bookmarks-other-bookmarks-menu =
+    .label = Altres adreces d'interès
+bookmarks-mobile-bookmarks-menu =
+    .label = Adreces del mòbil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amaga la barra lateral d'adreces d'interès
+           *[other] Mostra la barra lateral de les adreces d'interès
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amaga la barra d'eines d'adreces d'interès
+           *[other] Mostra la barra de les adreces d'interès
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Elimina el menú d'adreces d'interès de la barra d'eines
+           *[other] Afegeix el menú d'adreces d'interès a la barra d'eines
+        }
+bookmarks-search =
+    .label = Cerca adreces d'interès
+bookmarks-tools =
+    .label = Eines d'adreces d'interès
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de les adreces d'interès
+    .accesskey = B
+    .aria-label = Adreces d'interès
+bookmarks-toolbar-menu =
+    .label = Barra de les adreces d'interès
+bookmarks-toolbar-placeholder =
+    .title = Elements de la barra de les adreces d'interès
+bookmarks-toolbar-placeholder-button =
+    .label = Elements de la barra de les adreces d'interès
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Adreces d'interès
+library-bookmarks-bookmark-this-page =
+    .label = Afegeix la pàgina a les adreces d'interès
+library-bookmarks-bookmark-edit =
+    .label = Edita aquesta adreça d'interès
+
+## More items
+
+more-menu-go-offline =
+    .label = Treballa fora de línia
+    .accesskey = b
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ca/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/newtab/asrouter.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -120,6 +120,9 @@
 
 cfr-whatsnew-searchbar-title = Escriviu menys i trobeu més amb la barra d'adreces
 cfr-whatsnew-searchbar-body-topsites = Ara, podeu seleccionar la barra d'adreces i es desplegarà un quadre amb enllaços als vostres llocs principals.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icona de lupa
 
 ## Picture-in-Picture
@@ -251,6 +254,8 @@
 
 ## Fission Experiment Message
 
+cfr-doorhanger-fission-body-approved = La vostra privadesa és important. Ara el { -brand-short-name } aïlla els llocs web els uns dels altres, perquè sigui més difícil per als furoners robar contrasenyes, números de targetes de crèdit i altra informació confidencial.
+cfr-doorhanger-fission-header = Aïllament de llocs
 cfr-doorhanger-fission-primary-button = Entesos
     .accesskey = E
 cfr-doorhanger-fission-secondary-button = Més informació
@@ -265,4 +270,10 @@
 ## What's new: Media controls message
 
 cfr-whatsnew-media-keys-header = Més controls multimèdia
+cfr-whatsnew-media-keys-body = Reproduïu i poseu en pausa l'àudio o el vídeo directament des del teclat o auriculars. D'aquesta manera, és més fàcil controlar el contingut multimèdia des d'una altra pestanya, programa o fins i tot quan l'ordinador està blocat. També podeu desplaçar-vos entre les pistes amb les tecles d'avançar i retrocedir.
 cfr-whatsnew-media-keys-button = Vegeu com fer-ho
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Dreceres de cerca a la barra d'adreces
+cfr-whatsnew-search-shortcuts-body = Ara, quan escriviu el nom d'un motor de cerca o un lloc específic a la barra d'adreces, apareixerà una drecera blava als suggeriments de cerca de sota. Seleccioneu aquesta drecera per fer la cerca directament des de la barra d'adreces.
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ca/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/newtab/newtab.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -171,6 +171,7 @@
 
 newtab-section-header-topsites = Llocs principals
 newtab-section-header-highlights = Destacats
+newtab-section-header-recent-activity = Activitat recent
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recomanat per { $provider }
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/ca/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -10,21 +10,51 @@
 ## These are short descriptions for individual policies, to be displayed
 ## in the documentation section in about:policies.
 
+policy-AppUpdateURL = Defineix un URL personalitzat d'actualització de l'aplicació.
 policy-BlockAboutAddons = Bloca l'accés al gestor de complements (about:addons).
-
 policy-BlockAboutConfig = Bloca l'accés a la pàgina about:config.
-
 policy-BlockAboutProfiles = Bloca l'accés a la pàgina about:profiles.
-
 policy-BlockAboutSupport = Bloca l'accés a la pàgina about:support.
-
+policy-Bookmarks = Crea adreces d'interès a la barra d'adreces d'interès, al menú d'adreces d'interès o a la carpeta especificada.
+policy-CaptivePortal = Activa o desactiva la funcionalitat de portal captiu.
+policy-Cookies = Permet o denega que els llocs web defineixin galetes.
+policy-DisabledCiphers = Desactiva els xifratges.
+policy-DefaultDownloadDirectory = Defineix el directori de baixades per defecte.
+policy-DisableAppUpdate = Evita que el navegador s’actualitzi.
+policy-DisableBuiltinPDFViewer = Desactiva el PDF.js, el visor de PDF incorporat en el { -brand-short-name }.
 policy-DisableDeveloperTools = Bloca l'accés a les eines per a desenvolupadors.
+policy-DisableFirefoxAccounts = Desactiva els serveis basats en el { -fxaccount-brand-name }, que inclou el Sync.
+# Firefox Screenshots is the name of the feature, and should not be translated.
+policy-DisableFirefoxScreenshots = Desactiva la funció de captures de pantalla del Firefox Screenshots.
+policy-DisableFirefoxStudies = Impedeix que el { -brand-short-name } executi estudis.
+policy-DisableForgetButton = Evita l'accés al botó Oblida.
+policy-DisableFormHistory = No recorda l'historial de cerca ni de formularis.
+policy-DisableMasterPasswordCreation = Si és cert, no es pot crear una contrasenya mestra.
+policy-DisablePrimaryPasswordCreation = Si és cert, no es pot crear una contrasenya principal.
+policy-DisablePocket = Desactiva la funció de desar llocs web al Pocket.
+policy-DisablePrivateBrowsing = Desactiva la navegació privada.
+policy-DisableTelemetry = Desactiva la telemetria.
+policy-DNSOverHTTPS = Configura DNS sobre HTTPS.
+policy-DownloadDirectory = Defineix i bloca el directori de baixades.
+policy-ExtensionUpdate = Activa o desactiva les actualitzacions automàtiques de les extensions.
+policy-FirefoxHome = Configura el Firefox Home.
+policy-FlashPlugin = Permet o denega l'ús del connector Flash.
+policy-HardwareAcceleration = Si és fals, desactiva l'acceleració de maquinari.
+# “lock� means that the user won’t be able to change this setting
+policy-Homepage = Defineix i, opcionalment, bloca la pàgina d'inici.
+policy-InstallAddonsPermission = Permet que determinats llocs web instal·lin complements.
 
 ## Do not translate "SameSite", it's the name of a cookie attribute.
 
+
 ##
 
+policy-LocalFileLinks = Permetre que llocs web específics enllacin a fitxers locals.
+policy-MasterPassword = Requerir o impedir l'ús d'una contrasenya mestra.
+policy-PrimaryPassword = Requerir o impedir l'ús d'una contrasenya principal.
+policy-Proxy = Configura els paràmetres del servidor intermediari.
+policy-SearchSuggestEnabled = Activa o desactiva els suggeriments de cerca.
+# For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
+policy-SecurityDevices = Instal·la mòduls PKCS #11.
 policy-SSLVersionMax = Defineix la versió màxima de SSL.
-
 policy-SSLVersionMin = Defineix la versió mínima de SSL.
-
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ca/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ca/browser/browser/preferences/preferences.ftl	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -512,6 +512,8 @@
     .label = Articles patrocinats
 home-prefs-highlights-header =
     .label = Destacats
+home-prefs-recent-activity-header =
+    .label = Activitat recent
 home-prefs-highlights-description = Una selecció dels llocs que heu desat o visitat
 home-prefs-highlights-option-visited-pages =
     .label = Pàgines visitades
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/ca/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ca/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:02:09.000000000 +0000
@@ -32,6 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Aquest fitxer conté un virus o programari maliciós.
 blockedPotentiallyUnwanted=Aquest fitxer podria malmetre l'ordinador.
+blockedPotentiallyInsecure=No s'ha baixat el fitxer: risc potencial de seguretat.
 blockedUncommon2=Aquest no és un fitxer que es baixi sovint.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -41,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/ca/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/ca/browser/chrome/browser/sitePermissions.properties	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:02:09.000000000 +0000
@@ -47,4 +47,6 @@
 permission.canvas.label = Extreure dades del llenç
 permission.midi.label = Accés a dispositius MIDI
 permission.midi-sysex.label = Accés a dispositius MIDI compatibles amb SysEx
-permission.https-only-load-insecure.label = Utilitzar HTTP insegur
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = Obrir aplicacions
diff -Nru firefox-84.0.2+build1/l10n/ca/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/ca/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/ca/browser/defaultagent/defaultagent_localized.ini	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:02:09.000000000 +0000
@@ -5,3 +5,6 @@
 # This file is in the UTF-8 encoding
 [Strings]
 DefaultBrowserAgentTaskDescription=La tasca «Agent de navegador per defecte» controla quan el navegador per defecte canvia de %MOZ_APP_DISPLAYNAME% a un altre navegador. Si el canvi es produeix en circumstàncies sospitoses, demanarà als usuaris que tornin a canviar-ho per %MOZ_APP_DISPLAYNAME% dues vegades com a màxim. El %MOZ_APP_DISPLAYNAME% isntal·la aquesta tasca automàticament i es reinstal·la quan s'actualitza el %MOZ_APP_DISPLAYNAME%. Per desactivar aquesta tasca, actualitzeu la preferència «default-browser-agent.enabled» en la pàgina about:config o el paràmetre de política d'empresa «DisableDefaultBrowserAgent» del %MOZ_APP_DISPLAYNAME%.
+
+DefaultBrowserNotificationYesButtonText=Sí
+DefaultBrowserNotificationNoButtonText=No
diff -Nru firefox-84.0.2+build1/l10n/ca/devtools/client/debugger.properties firefox-85.0+build1/l10n/ca/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/ca/devtools/client/debugger.properties	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/devtools/client/debugger.properties	2021-01-18 20:02:09.000000000 +0000
@@ -23,9 +23,12 @@
 
 # LOCALIZATION NOTE (copySource.label): This is the text that appears in the
 # context menu to copy all of the text in the open file.
+copySource.label=Copia el text d’origen
+copySource.accesskey=o
 
 # LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the
 # context menu to copy the source URI of file open.
+copySourceUri2=Copia l’URI d’origen
 
 # LOCALIZATION NOTE (collapseAll.label): This is the text that appears in the
 # context menu to collapse a directory and all of its subdirectories.
@@ -273,9 +276,6 @@
 # the source search input bar
 sourceSearch.search.placeholder2=Cerca en el fitxer…
 
-# LOCALIZATION NOTE (searchPanelFunction2): This is the text that appears in the
-# filter panel popup for the function search operation.
-
 # 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
@@ -441,9 +441,6 @@
 # LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component when a log point is set
 
-# LOCALIZATION NOTE (editor.conditionalPanel.close): Tooltip text for
-# close button inside ConditionalPanel component
-
 # LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item
 # for navigating to a source mapped location
 
@@ -463,6 +460,18 @@
 # LOCALIZATION NOTE (inlinePreview.toggle.tooltip): Context menu item
 # tooltip that will describe toggling inline preview
 
+# LOCALIZATION NOTE (editorWrapping.show.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.hide.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.toggle.label): Context menu item
+# label for toggling the lines wrapping feature
+
+# LOCALIZATION NOTE (editorWrapping.toggle.tooltip): Context menu item
+# tooltip for toggling the lines wrapping feature
+
 # LOCALIZATION NOTE (settings.button.label): Label for Settings button
 
 # LOCALIZATION NOTE (settings.disableJavaScript.label): Context menu item
@@ -581,9 +590,6 @@
 # LOCALIZATION NOTE (sourceFooter.mappedSuffix): Text associated
 # with a mapped source.  Displays next to URLs in tree and tabs.
 
-# LOCALIZATION NOTE (sourceFooter.codeCoverage): Text associated
-# with a code coverage button
-
 # LOCALIZATION NOTE (sourceFooter.currentCursorPosition): Text associated
 # with the current cursor line and column
 
@@ -629,8 +635,6 @@
 
 # LOCALIZATION NOTE (outline.header): Outline left sidebar header
 
-# LOCALIZATION NOTE (scopes.mapScopes): Label for toggling scope mappings
-
 # LOCALIZATION NOTE (outline.placeholder): Placeholder text for the filter input
 # element
 
@@ -672,9 +676,6 @@
 # search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on
 # a mac we use the unicode character.
 
-# LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome
-# panel. %S is replaced by the keyboard shortcut to search for functions.
-
 # LOCALIZATION NOTE (welcome.allShortcuts): The label to open the modal of
 # shortcuts, displayed in the welcome panel.
 
@@ -684,9 +685,6 @@
 # LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search
 # prompt for searching for files.
 
-# LOCALIZATION NOTE (sourceSearch.noResults2): The center pane Source Search
-# message when the query did not match any of the sources.
-
 # LOCALIZATION NOTE (pauseOnExceptions): The pause on exceptions button tooltip
 # when the debugger will pause on all exceptions.
 pauseOnExceptions=Pausa en totes les excepcions. Feu clic per ignorar les excepcions
@@ -784,10 +782,6 @@
 # LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed
 # in an info block when evaluating a conditional breakpoint throws an error
 
-# LOCALIZATION NOTE (whyPaused.xhr): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an
-# xml http request
-
 # LOCALIZATION NOTE (whyPaused.XHR): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an
 # xml http request
@@ -887,7 +881,6 @@
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
 variablesViewOptimizedOut=(optimitzat a fora)
 variablesViewUninitialized=(sense inicialitzar)
 variablesViewMissingArgs=(no disponible)
@@ -957,4 +950,3 @@
 # service worker that is redundant.
 # LOCALIZATION NOTE (serviceWorkerInfo.unknown): State displayed for a
 # service worker that is in an unknown state.
-
diff -Nru firefox-84.0.2+build1/l10n/ca/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/ca/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/ca/devtools/client/netmonitor.properties	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/devtools/client/netmonitor.properties	2021-01-18 20:02:09.000000000 +0000
@@ -58,6 +58,12 @@
 # that collapses the network details pane in the UI.
 collapseDetailsPane=Amaga els detalls de la sol·licitud
 
+# LOCALIZATION NOTE (collapseActionPane): This is the tooltip for the button
+# that collapses the network action pane in the UI.
+
+# LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
+# displayed when hovering over the tabs overflow button.
+
 # LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
 # headers tab of the network details pane when there are no headers available.
 headersEmptyText=No hi ha capçaleres per aquesta sol·licitud
@@ -82,23 +88,23 @@
 # available for shown.
 
 # LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
-# params tab of the network details pane when there are no params available.
+# request tab of the network details pane when there are no params available.
 paramsEmptyText=No hi ha paràmetres per aquesta sol·licitud
 
 # LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
-# params tab of the network details pane for the filtering input.
+# request tab of the network details pane for the filtering input.
 paramsFilterText=Filtra paràmetres de la sol·licitud
 
 # LOCALIZATION NOTE (paramsQueryString): This is the label displayed
-# in the network details params tab identifying the query string.
+# in the network details request tab identifying the query string.
 paramsQueryString=Cadena de consulta
 
 # LOCALIZATION NOTE (paramsFormData): This is the label displayed
-# in the network details params tab identifying the form data.
+# in the network details request tab identifying the form data.
 paramsFormData=Dades del formulari
 
 # LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
-# in the network details params tab identifying the request payload.
+# in the network details request tab identifying the request payload.
 paramsPostPayload=Càrrega útil de la sol·licitud
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
@@ -115,11 +121,11 @@
 responseHeaders=Capçaleres de la resposta
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
-# in the network details params tab identifying the request cookies.
+# in the network details request tab identifying the request cookies.
 requestCookies=Galetes de la sol·licitud
 
 # LOCALIZATION NOTE (responseCookies): This is the label displayed
-# in the network details params tab identifying the response cookies.
+# in the network details request tab identifying the response cookies.
 responseCookies=Galetes de la resposta
 
 # LOCALIZATION NOTE (responsePayload): This is the label displayed
@@ -142,7 +148,7 @@
 # the truncation limit and thus was truncated.
 
 # LOCALIZATION NOTE (requestTruncated): This is the text displayed
-# in the params tab of the network details pane when the request is over
+# in the request tab of the network details pane when the request is over
 # the truncation limit and thus was truncated.
 
 # LOCALIZATION NOTE (responsePreview): This is the text displayed
@@ -208,6 +214,10 @@
 # LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalSize): A tooltip explaining
 # what the framesTotalSize label displays
 
+# LOCALIZATION NOTE (networkMenu.ws.summary.label.framesTranferredSize): A label showing
+# summary size info related to the current list of WS messages
+# %1$S is the total size of the transferred data, %2$S is the size of sent data, %3$S is the size of received data.
+
 # LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalTime): A tooltip explaining
 # what framesTotalTime displays
 
@@ -237,25 +247,22 @@
 # request is unavailable.
 
 # LOCALIZATION NOTE (networkMenu.sizeCached): This is the label displayed
-# in the network menu specifying the transfer or a request is
+# in the network menu and the headers panel specifying the transfer or a request is
 # cached.
 networkMenu.sizeCached=en memòria cau
 
 # LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
-# in the network menu specifying the transferred of a request computed
-# by a service worker.
+# in the network menu and the headers panel specifying the transferred of a request
+# computed by a service worker.
 networkMenu.sizeServiceWorker=procés de treball de servei
 
-# LOCALIZATION NOTE (networkMenu.blockedBy): This is the label displayed
-# in the network menu specifying the request was blocked by something.
-# %S is replaced by the blocked reason, which could be "DevTools", "CORS", etc.
-
-# LOCALIZATION NOTE (networkMenu.blocked): This is a generic message for a
-# URL that has been blocked for an unknown reason
-
 # LOCALIZATION NOTE (networkMenu.blocked2): This is a generic message for a
 # URL that has been blocked for an unknown reason
 
+# LOCALIZATION NOTE (networkMenu.blockedby): This is a generic message for a
+# URL that has been blocked by an extension
+# %S is the extension name.
+
 # LOCALIZATION NOTE (networkMenu.blockedTooltip): This is a the text displayed
 # as a tooltip for the blocked icon in the request list
 
@@ -299,6 +306,19 @@
 # in Timings side panel. This section contains server timings transferred from the server
 # through the "Server-Timing" header.
 
+# LOCALIZATION NOTE (netmonitor.timings.queuedAt): This is relative queued time to the
+# first request. %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.startedAt): Relative to the first request,
+# when the request actually started. %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.downloadedAt): Relative to first request,
+# when the request actually finished downloading.
+# %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.noTimings): Message that displays in the
+# timings pane when thea request has been blocked
+
 # LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
 networkMenu.millisecond=%S ms
@@ -433,7 +453,7 @@
 
 # LOCALIZATION NOTE (certmgr.periodofvalidity.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.periodofvalidity.label=Període de validesa
 
 # LOCALIZATION NOTE (certmgr.begins):
@@ -446,7 +466,7 @@
 
 # LOCALIZATION NOTE (certmgr.fingerprints.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.fingerprints.label=Empremtes digitals
 
 # LOCALIZATION NOTE (certmgr.certdetail.sha256fingerprint):
@@ -516,6 +536,9 @@
 # in the network table toolbar, above the "remoteip" column.
 netmonitor.toolbar.remoteip=IP remota
 
+# LOCALIZATION NOTE (netmonitor.toolbar.initiator): This is the label displayed
+# in the network table toolbar, above the "initiator" column.
+
 # LOCALIZATION NOTE (netmonitor.toolbar.type): This is the label displayed
 # in the network table toolbar, above the "type" column.
 netmonitor.toolbar.type=Tipus
@@ -557,8 +580,8 @@
 netmonitor.toolbar.latency=Latència
 
 # LOCALIZATION NOTE (netmonitor.toolbar.transferred): This is the label displayed
-# in the network table toolbar, above the "transferred" column, which is the
-# compressed / encoded size.
+# in the network table toolbar, above the "transferred" column and in general
+# section of the headers panel, which is the compressed / encoded size.
 netmonitor.toolbar.transferred=Transferits
 
 # LOCALIZATION NOTE (netmonitor.toolbar.contentSize): This is the label displayed
@@ -571,33 +594,42 @@
 netmonitor.toolbar.waterfall=Línia de temps
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.size): This is the label displayed
-# in the websocket frame table header, above the "size" column.
+# in the messages table header, above the "size" column.
 netmonitor.ws.toolbar.size=Mida
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.data): This is the label displayed
-# in the websocket frame table header, above the "data" column.
+# in the messages table header, above the "data" column.
 netmonitor.ws.toolbar.data=Dades
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.opCode): This is the label displayed
-# in the websocket frame table header, above the "opCode" column.
+# in the messages table header, above the "opCode" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.maskBit): This is the label displayed
-# in the websocket frame table header, above the "maskBit" column.
+# in the messages table header, above the "maskBit" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.finBit): This is the label displayed
-# in the websocket frame table header, above the "finBit" column.
+# in the messages table header, above the "finBit" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.time): This is the label displayed
-# in the websocket frame table header, above the "time" column.
+# in the messages table header, above the "time" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.eventName): This is the label displayed
+# in the messages table header, above the "eventName" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.retry): This is the label displayed
+# in the messages table header, above the "retry" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.lastEventId): This is the label displayed
+# in the messages table header, above the "lastEventId" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.clear): This is the label displayed
-# in the websocket toolbar for the "Clear" button.
+# in the messages panel toolbar for the "Clear" button.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.label): This is the label
-# displayed in the websocket toolbar for the frames filtering textbox.
+# displayed in the messages panel toolbar for the frames filtering textbox.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.key): This is the
-# shortcut key to focus on the websocket toolbar frames filtering textbox
+# shortcut key to focus on the messages panel toolbar messages filtering textbox
 netmonitor.ws.toolbar.filterFreetext.key=CmdOrCtrl+E
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.resetColumns): This is the label
@@ -623,22 +655,27 @@
 # 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.
 
+# LOCALIZATION NOTE (netmonitor.ws.context.controlFrames): This is the label displayed
+# on the context menu that shows "Control Frames" WebSocket frames.
+
+# LOCALIZATION NOTE (netmonitor.ws.context.controlFrames.accesskey): This is the access key
+# for the "Control Frames" menu item displayed in the context menu in the websocket toolbar.
+
 # LOCALIZATION NOTE (netmonitor.ws.context.copyFrame): This is the label displayed
 # on the context menu that shows "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.
 
+# LOCALIZATION NOTE (netmonitor.ws.connection.closed): This is the text displayed in the
+# websocket messages panel when the connection is closed
+
 # 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.
 
 # 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.
 
-# 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)
-
 # LOCALIZATION NOTE (netmonitor.ws.rawData.header): This is the label displayed
 # in the messages panel identifying the raw data.
 
@@ -651,12 +688,6 @@
 # LOCALIZATION NOTE (netmonitor.search.toolbar.clear): This is the label
 # displayed in the search toolbar to clear the search panel.
 
-# LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
-# displayed in the search results as the label for the response headers
-
-# LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
-# displayed in the search results as the label for the request headers
-
 # LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
 # displayed in the search toolbar to do a case sensitive search.
 
@@ -699,8 +730,21 @@
 # LOCALIZATION NOTE (netmonitor.actionbar.removeBlockedUrl): This is the
 # tooltip shown over the remove button for blocked URL item
 
-# LOCALIZATION NOTE (netmonitor.actionbar.addBlockedUrl): This is the
-# tooltip shown over the Add Blocked URL button
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingUsageNotice): This is the
+# usage notice displayed when network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingAddNotice): This is the
+# add notice that explains ways to add blocking pattern that is displayed when
+# network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.removeAllBlockedUrls): This is the
+# context menu item for removing all blocked URLs
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.enableAllBlockedUrls): This is the
+# context menu item for enabling all blocked URLs
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.disableAllBlockedUrls): This is the
+# context menu item for disabling all blocked URLs
 
 # LOCALIZATION NOTE (netmonitor.actionbar.search): This is the label displayed
 # in the action bar's search tab
@@ -738,6 +782,9 @@
 # in the network details pane identifying the params tab.
 netmonitor.tab.params=Paràmetres
 
+# LOCALIZATION NOTE (netmonitor.tab.request): This is the label displayed
+# in the network details pane identifying the request tab.
+
 # LOCALIZATION NOTE (netmonitor.tab.response): This is the label displayed
 # in the network details pane identifying the response tab.
 netmonitor.tab.response=Resposta
@@ -808,6 +855,9 @@
 # LOCALIZATION NOTE (netmonitor.toolbar.search.key): This is the
 # shortcut key to toggle the search panel
 
+# LOCALIZATION NOTE (netmonitor.toolbar.copy.key): This is the
+# shortcut key to copy a selected request url from the network table
+
 # LOCALIZATION NOTE (netmonitor.toolbar.filterFreetext.learnMore): This is
 # the title used for MDN icon in filtering textbox
 netmonitor.toolbar.filterFreetext.learnMore=Més informació sobre els filtres
@@ -840,6 +890,12 @@
 # LOCALIZATION NOTE (netmonitor.toolbar.resetSorting): This is the label
 # displayed in the network table header context menu to reset sorting
 
+# LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent): This is the label
+# displayed in the network table header context menu to resize a column to fit its content
+
+# LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent.title): This is the title
+# tooltip displayed when draggable resizer in network table headers is hovered
+
 # LOCALIZATION NOTE (netmonitor.toolbar.timings): This is the label
 # displayed in the network table header context menu for the timing submenu
 netmonitor.toolbar.timings=Temps
@@ -849,17 +905,45 @@
 # response headers submenu.
 netmonitor.toolbar.responseHeaders=Capçaleres de la resposta
 
+# LOCALIZATION NOTE (netmonitor.headers.toolbar.block): This is the
+# label displayed in the network details headers tab identifying the
+# block url toolbar button.
+
+# LOCALIZATION NOTE (netmonitor.headers.address): This is the label displayed
+# in the network details headers tab identifying the remote address.
+
+# LOCALIZATION NOTE (netmonitor.headers.status): This is the label displayed
+# in the network details headers tab identifying the status code.
+
+# LOCALIZATION NOTE (netmonitor.headers.size): This is the label displayed
+# in the network details headers tab identifying the size.
+
+# LOCALIZATION NOTE (networkMenu.headers.sizeDetails): This label is displayed
+# in the network details headers tab providing the size details.
+# %1$S is the transferred size, %2$S is the size.
+
+# LOCALIZATION NOTE (netmonitor.headers.version): This is the label displayed
+# in the network details headers tab identifying the http version.
+
 # LOCALIZATION NOTE (netmonitor.summary.learnMore): This is the label displayed
-# in the network details headers tab, with a link to external documentation.
+# in the network details headers tab, with a link to external documentation for
+# status codes.
 
-# LOCALIZATION NOTE (netmonitor.summary.referrerPolicy): This is the label displayed
+# LOCALIZATION NOTE (netmonitor.headers.referrerPolicy): This is the label displayed
 # in the network details headers tab identifying the referrer policy.
 
+# LOCALIZATION NOTE (netmonitor.headers.contentBlocking): This is the label displayed
+# in the network details headers tab identifying the content blocking mode.
+
 # LOCALIZATION NOTE (netmonitor.summary.editAndResend): This is the label displayed
 # on the button in the headers tab that opens a form to edit and resend the currently
 # displayed request
 netmonitor.summary.editAndResend=Edita i torna a enviar
 
+# LOCALIZATION NOTE (netmonitor.headers.raw): This is the label displayed
+# on the button in the headers tab that toggle view for raw request/response headers
+# from the currently displayed request
+
 # LOCALIZATION NOTE (netmonitor.response.name): This is the label displayed
 # in the network details response tab identifying an image's file name.
 netmonitor.response.name=Nom:
@@ -909,6 +993,10 @@
 # LOCALIZATION NOTE (netmonitor.timings.learnMore): This is the label displayed
 # in the network details timings tab, with a link to external documentation
 
+# LOCALIZATION NOTE (netmonitor.audits.slowIconTooltip): This is the tooltip text displayed
+# in the network request list file column, on the slow icon button.
+# %1$S is the waiting time %2$S is the slow threshold.
+
 # LOCALIZATION NOTE (netmonitor.security.warning.cipher): A tooltip
 # for warning icon that indicates a connection uses insecure cipher suite.
 netmonitor.security.warning.cipher=El xifratge utilitzat és obsolet i insegur.
@@ -973,6 +1061,13 @@
 # LOCALIZATION NOTE (netmonitor.trackingResource.tooltip): This is the label used
 # in the Network monitor panel as a tooltip for tracking resource icon.
 
+# LOCALIZATION NOTE (netmonitor.trackingResource.enhancedTrackingProtection): This is
+# the label used in the Network monitor panel for showing enhanced tracking protection.
+
+# LOCALIZATION NOTE (netmonitor.enhancedTrackingProtection.learnMore): This is the label
+# displayed in the network details headers tab, with a link to external documentation for
+# enhanced tracking protection.
+
 # LOCALIZATION NOTE (netmonitor.context.copy): This is the label displayed
 # for the copy sub-menu in the context menu for a request
 netmonitor.context.copy=Copia
@@ -1172,9 +1267,11 @@
 
 # LOCALIZATION NOTE (netmonitor.custom.newRequestMethodLabel): This is the label displayed
 # above the method text input field of the new custom request form
+netmonitor.custom.newRequestMethodLabel=Mètode
 
 # LOCALIZATION NOTE (netmonitor.custom.newRequestUrlLabel): This is the label displayed
 # above the url text input field of the new custom request form
+netmonitor.custom.newRequestUrlLabel=URL
 
 # LOCALIZATION NOTE (netmonitor.custom.query): This is the label displayed
 # above the query string entry in the custom request form
@@ -1260,3 +1357,20 @@
 # where a cached object was fetched from (e.g. "disk").
 netmonitor.cache.device=Dispositiu
 
+# LOCALIZATION NOTE (netmonitor.settings.menuTooltip): This is the tooltip that gets displayed
+# when the settings menu button is hovered.
+
+# LOCALIZATION NOTE (netmonitor.settings.importHarTooltip): This is the tooltip that gets displayed
+# when the HAR import menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.saveHarTooltip): This is the tooltip that gets displayed
+# when the HAR save menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
+# when the HAR copy menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
diff -Nru firefox-84.0.2+build1/l10n/ca/devtools/client/storage.dtd firefox-85.0+build1/l10n/ca/devtools/client/storage.dtd
--- firefox-84.0.2+build1/l10n/ca/devtools/client/storage.dtd	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/devtools/client/storage.dtd	2021-01-18 20:02:09.000000000 +0000
@@ -13,3 +13,5 @@
 <!-- LOCALIZATION NOTE : Label of popup menu action to delete all session cookies. -->
 <!ENTITY storage.popupMenu.deleteAllSessionCookiesLabel "Suprimeix totes les galetes de sessió">
 
+<!-- LOCALIZATION NOTE : Label of popup menu action to copy a storage item. -->
+<!ENTITY storage.popupMenu.copyLabel "Copia">
diff -Nru firefox-84.0.2+build1/l10n/ca/dom/dom/media.ftl firefox-85.0+build1/l10n/ca/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ca/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/dom/dom/media.ftl	2021-01-18 20:02:09.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/.
+
+mediastatus-fallback-title = El { -brand-short-name } està reproduint multimèdia
diff -Nru firefox-84.0.2+build1/l10n/ca/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/ca/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/ca/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 11:25:55.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:02:09.000000000 +0000
@@ -7,6 +7,9 @@
 
 CertPassPromptDefault=Introduïu la vostra contrasenya mestra.
 
+
+CertPasswordPromptDefault=Introduïu la contrasenya principal.
+
 # The following strings have special requirements: they must fit in a 32 or 64
 # bytes buffer after being encoded to UTF-8.
 #
@@ -262,7 +265,6 @@
 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.
@@ -270,7 +272,6 @@
 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 (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:
@@ -284,8 +285,6 @@
 # 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-84.0.2+build1/l10n/ca/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ca/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ca/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ca/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:02:09.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/cak/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/aboutLogins.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/aboutLogins.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿La niyuj el rutikirib'al re moloj re'?
 confirm-delete-dialog-message = Man tikirel ta nitzolïx re b'anïk.
 about-logins-confirm-remove-dialog-confirm-button = Tiyuj
-about-logins-confirm-remove-all-dialog-confirm-button = Keyuj Ronojel
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Tiyuj
+        [one] Tiyuj
+       *[other] Keyuj Ronojel
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja', tiyuj re molojri'ïl
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Kek'wäx el kitikirisaxik molojri'ïl chuqa' ewan taq tzij
 about-logins-confirm-export-dialog-message = Xkeyak ri ewan taq atzij achi'el tz'etel tz'ib'anïk (achi'el, BadP@ssw0rd) richin chi xab'achike xtijaqon ri yakb'äl k'wa'an, nitikïr nutz'ët.
 about-logins-confirm-export-dialog-confirm-button = Tik'wäx el…
+about-logins-alert-import-title = Xtz'aqät Ruk'amik
+about-logins-alert-import-message = Titz'et rub'anikil ruk'amik
 confirm-discard-changes-dialog-title = ¿La yech'aqïx ri taq jaloj man eyakon ta?
 confirm-discard-changes-dialog-message = Xkesach ronojel ri jaloj man eyakon ta.
 confirm-discard-changes-dialog-confirm-button = Tich'aqïx
@@ -262,3 +269,30 @@
         [macos] CSV Wuj
        *[other] CSV Yakb'äl
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Xtz'aqät Ruk'amik
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Xtz'aqatisäx k'ak'a' rutikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Xetz'aqatisäx k'ak'a' kitikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Xk'ëx rutikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Xek'ex kitikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Xilitäj kamulun rutikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(man xk'am ta pe)</span>
+       *[other] <span>Xe'ilitäj kamulun kitikirib'al molojri'ïl:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(man xek'am ta pe)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Sachoj:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(man xk'am ta pe)</span>
+       *[other] <span>Taq sachoj:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(man xek'am ta pe)</span>
+    }
+about-logins-import-dialog-done = Xk'is
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/cak/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/appmenu.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/appmenu.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = K'ak'a' tzuwäch
+appmenuitem-new-private-window =
+    .label = K'ak'a' ichinan tzuwäch
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Tinaqajäx
 appmenuitem-zoom-reduce =
     .label = Tijech'äx
+appmenuitem-fullscreen =
+    .label = Chijun ruwa kematz'ib'
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Tixim Wakami
+appmenuitem-save-page =
+    .label = Tiyak Ruxaq Achi'el…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Achike natzijoj
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/cak/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/appMenuNotifications.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Wakami Mani
     .secondarybuttonaccesskey = m
 appmenu-update-restart-message = Chi rij jun aninäq tikirisanïk, { -brand-shorter-name } xkerutzolij ri taq ruwi', jaqon taq tzuwäch ri man e k'o pa Ichinan Okem pa K'amaya'l rub'anikil.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } man nitikïr ta nuk'ëx ri' pa ruyonil ri ruk'isib'äl ruwäch.
+    .buttonlabel = Tik'ex { -brand-shorter-name }
+    .buttonaccesskey = T
+    .secondarybuttonlabel = Wakami Mani
+    .secondarybuttonaccesskey = M
+appmenu-update-other-instance-message = K'o jun k'ak'a' ruk'exoj { -brand-shorter-name }, man tikirel ta nik'ëx ruma chi k'o chik jun ruwäch { -brand-shorter-name } nisamäj. Tatz'apij richin ri nik'ex o tacha' ri tik'ex (rik'in jub'a' ri jun chik man ütz ta nisamäj k'a jampe' xatatikirisaj chik).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ãœtz, Xq'ax pa nuwi'
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/browser.ftl firefox-85.0+build1/l10n/cak/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/browser.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/browser.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> chajin ruma ri retal ch'oy. Tapitz'a' Esc richin nachajij chik el.
 pointerlock-warning-no-domain = Re ruxaq wuj re' chajin ruma ri retal ch'oy. Tapitz'a' Esc richin nachajij chik el.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Kek'ut konojel ri taq yaketal
+bookmarks-recent-bookmarks =
+    .value = K'a nimakol tiya' ketal
+bookmarks-toolbar-chevron =
+    .tooltiptext = Kek'ut pe ch'aqa' chik taq yaketal
+bookmarks-sidebar-content =
+    .aria-label = Taq yaketal
+bookmarks-menu-button =
+    .label = Kik'utsamaj taq Yaketal
+bookmarks-other-bookmarks-menu =
+    .label = Ch'aqa' chik taq Yaketal
+bookmarks-mobile-bookmarks-menu =
+    .label = Taq ruyaketal oyonib'äl
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Tewüx ri Ajxikin Kipas taq Yaketal
+           *[other] Titz'et ri ajxikin kipas taq yaketal
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Tewüx ri Kikajtz'ik taq Yaketal
+           *[other] Titz'et rukatz'ik taq yaketal
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Tiyuj el Kik'utsamaj taq Yaketal pa Molsamajib'äl
+           *[other] Titz'aqatisäx Kik'utsamaj taq Yaketal pa Molsamajib'äl
+        }
+bookmarks-search =
+    .label = Kekanöx Yaketal
+bookmarks-tools =
+    .label = Taq kisamajib'al ri yakoj etal
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Kicholob'al taq kisamajib'al taq yaketal
+    .accesskey = K
+    .aria-label = Yaketal
+bookmarks-toolbar-menu =
+    .label = Kicholob'al taq kisamajib'al taq yaketal
+bookmarks-toolbar-placeholder =
+    .title = Ruch'akulal taq kiyaketal cholsamajib'äl
+bookmarks-toolbar-placeholder-button =
+    .label = Ruch'akulal taq kiyaketal cholsamajib'äl
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Taq yaketal
+library-bookmarks-bookmark-this-page =
+    .label = Titz'aqatisäx re ruxaq re' pa taq yaketal
+library-bookmarks-bookmark-edit =
+    .label = Tinuk' re yaketal re'
+library-recent-activity-label = K'ak'a' Samaj
+
+## More items
+
+more-menu-go-offline =
+    .label = Chupül rusamaj
+    .accesskey = m
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/cak/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/newtab/asrouter.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Katz'ib'an jub'a', tawila' k'ïy rik'in ri rukajtz'ik ochochib'äl
 cfr-whatsnew-searchbar-body-topsites = Wakami xa xe tacha' ri rukajtz'ik ochochib'äl richin nirik'itäj jun kajtz'ik rik'in riruximik kik'in nima'q taq ruxaq.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Ruwachib'al tzub'äl
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Kekanöx chojokem pa kikatz'ik ochochib'äl
 cfr-whatsnew-search-shortcuts-body = Wakami toq natz'ib'aj jun kanob'äl o jun ruxaq pa ri kikajtz'ik ochochib'äl, xtiwachin pe jun xar chojokem pa ri rutzilab'exik ikim kanoxïk. Tacha' ri chojokem ri' richin natz'ët ri nakanoj pa ri kikajtz'ik ochochib'äl.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Chajinïk chuwäch itzel taq supercookie
+cfr-whatsnew-supercookies-body = Ri taq ajk'amaya'l ruxaq pan ewäl yetikïr nikitz'aqatisaj jun “supercookie� pa rokik'amaya'l, ri nitikïr yatrojqaj pan ajk'amaya'l, estape' ye'ajosq'ij ri taq cookie. { -brand-short-name } wakami nuya' jun nïm chajinïk chi kiwa ri taq supercookie richin chi man ke'okisäx richin nikojqaj ri taq asamaj pa k'amab'ey pa jun ruxaq o jun chik.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Utziläj taq yaketal
+cfr-whatsnew-bookmarking-body = Man k'ayew ta ye'oqäx ri jeb'ël taq ruxaq. { -brand-short-name } nunataj wakami ri jeb'ël kik'ojlib'al ri yakon taq ayaketal, yeruk'üt ri kikajtz'ik kisamajib'al yaketal pa ri k'ak'a' ruwi' chuqa' anin yatok pa ri ch'aqa' chik taq ayaketal rik'in jun rumolwuj rukajtz'ik samajib'äl.
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/cak/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/newtab/newtab.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = K'ak'a' Ruwi'
 newtab-settings-button =
     .title = Tawichinaj ri ruxaq richin K'ak'a' Ruwi'
+newtab-personalize-button-label = Tichinäx
+    .title = Tichinäx k'ak'a' ruwi'
+    .aria-label = Tichinäx k'ak'a' ruwi'
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Tikanöx pan Ajk'amaya'l
     .title = Tikanöx pan Ajk'amaya'l
     .aria-label = Tikanöx pan Ajk'amaya'l
+newtab-search-box-text = Tikanöx pan ajk'amaya'l
+newtab-search-box-input =
+    .placeholder = Tikanöx pan ajk'amaya'l
+    .aria-label = Tikanöx pan ajk'amaya'l
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Titz'aqatisäx Kanob'äl
 newtab-topsites-add-topsites-header = K'ak'a' Utziläj Ruxaq K'amaya'l
+newtab-topsites-add-shortcut-header = K'ak'a' Chojokem
 newtab-topsites-edit-topsites-header = Tinuk' re Utziläj Ruxaq K'amaya'l re'
+newtab-topsites-edit-shortcut-header = Tinuk' Chojokem
 newtab-topsites-title-label = B'i'aj
 newtab-topsites-title-input =
     .placeholder = Tatz'ib'aj jun b'i'aj
@@ -206,3 +215,27 @@
 
 newtab-error-fallback-info = Uy, k'o jun itzel xel toq nisamajib'ëx re rupam re'.
 newtab-error-fallback-refresh-link = Titzolïx ruxaq richin nitojtob'ëx chik.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Chojmin Okem
+newtab-custom-shortcuts-subtitle = Taq ruxaq xe'ayäk o xe'atz'ët
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } cholaj
+       *[other] { $num } taq cholaj
+    }
+newtab-custom-sponsored-sites = Xto' chojmin okem
+newtab-custom-pocket-title = Chilab'en ruma { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Cha'on rupam cha'on ruma { -pocket-brand-name }, rach'ala'ïl { -brand-product-name }
+newtab-custom-pocket-sponsored = To'on taq b'anob'äl
+newtab-custom-recent-title = K'ak'a' samaj
+newtab-custom-recent-subtitle = Jun cha'on taq ruxaq chuqa' k'ak'a' rupam
+newtab-custom-close-button = Titz'apïx
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Taq pir
+newtab-custom-snippets-subtitle = Taq runa'oj chuqa' taq rutzijol { -vendor-short-name } chuqa' { -brand-product-name }
+newtab-custom-settings = Tinuk'samajïx ch'aqa' runuk'ulem
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/places.ftl firefox-85.0+build1/l10n/cak/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/places.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/places.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Achyakwuj
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Juley taq Yaketal
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/cak/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/preferences/preferences.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Taq ruxaq yalan ye'atz'ët
 home-prefs-topsites-by-option-sponsored =
     .label = Nïm taq Ruxaq Eto'on
+home-prefs-shortcuts-header =
+    .label = Chojmin Okem
+home-prefs-shortcuts-description = Taq ruxaq xe'ayäk o xe'atz'ët
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Xto' chojmin okem
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Chilab'en ruma { $provider }
 home-prefs-recommended-by-description-update = Man relik ta chi rupam chijun ri ajk'amaya'l, to'on ruma { $provider }
+home-prefs-recommended-by-description-new = Cha'on rupam cha'on ruma { $provider }, rach'ala'ïl { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = To'on taq B'anob'äl
 home-prefs-highlights-header =
     .label = Ya'on kiq'ij
-home-prefs-recent-activity-header =
-    .label = K'ak'a' samaj
 home-prefs-highlights-description = Jun rucha'onem ruxaq, ri xayäk o xatz'ët
 home-prefs-highlights-option-visited-pages =
     .label = Taq Ruxaq Etz'eton
@@ -526,6 +530,9 @@
     .label = K'a B'a' Keqasäx
 home-prefs-highlights-option-saved-to-pocket =
     .label = Taq Ruxaq Eyakon pa { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = K'ak'a' samaj
+home-prefs-recent-activity-description = Jun cha'on taq ruxaq chuqa' k'ak'a' rupam
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Taq pir
 home-prefs-snippets-description = Kik'exoj { -vendor-short-name } chuqa' { -brand-product-name }
+home-prefs-snippets-description-new = Taq runa'oj chuqa' taq rutzijol { -vendor-short-name } chuqa' { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Kejaq ruwi'
     .accesskey = K
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Taq chojokem
+    .accesskey = c
 addressbar-locbar-topsites-option =
     .label = Jeb'ël taq ruxaq
     .accesskey = J
+addressbar-locbar-engines-option =
+    .label = Rusamajel taq kanob'äl
+    .accesskey = a
 addressbar-suggestions-settings = Kek'ex ri taq kajowab'al ri taq kichilab'enik kisamajinel taq kanob'äl
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/cak/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/cak/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/cak/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Xa xe pa K'ak'a' Ruwi'
     .accesskey = X
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Junelïk Tik'ut
+    .accesskey = J
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Majub'ey Tik'ut
+    .accesskey = M
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Xa xe Tik'ut pa K'ak'a' Ruwi'
+    .accesskey = X
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Tik'ut Ch'aqa' chik taq Yaketal
     .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/cak/devtools/client/markers.properties firefox-85.0+build1/l10n/cak/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/cak/devtools/client/markers.properties	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/devtools/client/markers.properties	2021-01-18 20:02:17.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Qajnäq k'uxlab'äl
 marker.gcreason.label.CC_WAITING=Xtaq tzij chi rik ruma jun rumolik mejaj
+marker.gcreason.label.CC_FINISHED=Xk'is Rumej Cha'onem
 marker.gcreason.label.CC_FORCED=Xtaq tzij chi rik ruma jun rumolik mejaj
 marker.gcreason.label.LOAD_END=Rusamajixik ruxaq ri xk'is
 marker.gcreason.label.PAGE_HIDE=Silon el pa rachäq
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Rumolik chajinïk
-
diff -Nru firefox-84.0.2+build1/l10n/cak/devtools/client/toolbox.properties firefox-85.0+build1/l10n/cak/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/cak/devtools/client/toolbox.properties	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/devtools/client/toolbox.properties	2021-01-18 20:02:17.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Titz'apïx taq kisamajib'al nuk'unela'
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Tik'ut pe ri Jachon Temeb'äl
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/cak/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/cak/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/cak/devtools/client/tooltips.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/devtools/client/tooltips.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> majun nub'än pa re ch'akulal re' ruma chi majun ta ch'akulal ya'on ruk'ojlem.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> majun nub'än pa re ch'akulal re' ruma chi ri <strong>overflow:hidden</strong> man jikib'an ta.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> majun achike nub'än chi re re ch'akulal re', ruma chi ri <strong>ruchib'al-b'anikil</strong> ja ri <strong>auto</strong> o <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> majun nub'än pa ri taq rupam ri kajtz'ik.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> majun nub'än pa ri taq rupam ri kajtz'ik we man e ruselta' ri kajtz'ik.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/cak/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/cak/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:17.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=q';q'
 
 downloadErrorAlertTitle=Xsach toq tajin nuqasaj
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Man nitikïr ta niyak ri qasanïk, q'aton ruma %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Man nitikïr ta niyak ri qasanïk, q'aton ruma jun k'amal.
 downloadErrorGeneric=Man tikirel ta niyak ri qasanïk ruma xk'ulwachitäj jun sachoj ri ma etaman ta ruwäch.\n\nTatojtob'ej chik.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Nrajo' na jujun taq xilramaj
 timeUnknown2=Man etaman ta jarupe' chik ruq'ijul
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S tob'äl
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/cak/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/cak/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:17.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Xxutüx ri okem pa proxi ruk'u'x samaj
 check_error-2153390069=Xk'is ruq'ijul ri ruwujil rub'i' ri ruk'u'x samaj (we rajowaxik, tachojmirisaj ri ruq'ijul chuqa' ramaj k'o pa Q'inoj)
 check_error-verification_failed=Man xtikïr ta xnik'öx ri rutzil k'exoj ruwäch
+check_error-move_failed=Xsach richin nusamajij ri k'exoj richin ri yakoj
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/cak/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Kiperaj Aj Rox Winäq
+support-third-party-modules-module = Ruyakb'al Peraj
+support-third-party-modules-version = Ruwäch Yakb'äl
+support-third-party-modules-vendor = Retamab'al B'anonel
+support-third-party-modules-occurrence = Taq ch'ob'oj
+support-third-party-modules-process = Ruwa tajinïk & ID
+support-third-party-modules-thread = Tzijonem
+support-third-party-modules-base = Rochochib'al imagebase
+support-third-party-modules-uptime = Q'ijul Rusamaj Tajinïk (ms)
+support-third-party-modules-duration = Ruramaj Samajinïk (ms)
+support-third-party-modules-empty = Man xesamajiïx ta kiperaj aj rox winäq
+support-third-party-modules-no-value = (Majun rajil)
+support-third-party-modules-button-open =
+    .title = Tijaq ri ruk'ojlemal yakb'äl…
+support-third-party-modules-expand =
+    .title = Tik'ut pe ri cholajin retamab'al
+support-third-party-modules-collapse =
+    .title = Tik'ol ri cholajin retamab'al
+support-third-party-modules-unsigned-icon =
+    .title = Man juxun ta re peraj
+support-third-party-modules-folder-icon =
+    .title = Tijaq ri ruk'ojlemal yakb'äl…
+support-third-party-modules-down-icon =
+    .title = Tik'ut pe ri cholajin retamab'al
+support-third-party-modules-up-icon =
+    .title = Tik'ol ri cholajin retamab'al
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/cak/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Rutob'al Picture-in-Picture
 experimental-features-multi-pip-description = Tojtob'enel chi to'ïk richin niya' q'ij chi yejaq k'ïy taq rutzub'al Picture-in-Picture pa jub'ey.
+experimental-features-http3 =
+    .label = HTTP/3 protokolo'
+experimental-features-http3-description = Tojtob'enel Rutob'al ri HTTP/3 protokolo'.
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/cak/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Ruxaq:
     .accesskey = x
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } richin { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Ruk'isib'äl ruxaq
-
+printpreview-homearrow-button =
+    .title = Nab'ey ruxaq
+printpreview-previousarrow-button =
+    .title = Jun kan ruxaq
+printpreview-nextarrow-button =
+    .title = Jun chik ruxaq
+printpreview-endarrow-button =
+    .title = Ruk'isib'äl ruxaq
diff -Nru firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/cak/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/cak/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:26:21.000000000 +0000
+++ firefox-85.0+build1/l10n/cak/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:17.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = chi re
+printui-page-custom-range-input =
+    .aria-label = Titz'ib'äx rupalem ichinan ruxaq
+    .placeholder = e.g. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Taq wachib'äl
 printui-orientation = Rucholajem
@@ -48,6 +51,7 @@
 printui-options = Taq cha'oj
 printui-headers-footers-checkbox = Titz'ajb'äl taq nab'ey chuqa' ruxe' rub'i' ruxaq
 printui-backgrounds-checkbox = Ketz'ajb'äx taq rupam
+printui-selection-checkbox = Titz'ajb'äx xa xe ri cha'oj
 printui-color-mode-label = B'onil b'anikil
 printui-color-mode-color = B'onil
 printui-color-mode-bw = Q'ëq chuqa' säq
@@ -56,19 +60,29 @@
 printui-margins-min = Ko'öl
 printui-margins-none = Majun
 printui-margins-custom = Ichinan
+printui-margins-custom-inches = B'anon runuk'ulem (taq pulwata')
 printui-margins-custom-top = Ajsik
+printui-margins-custom-top-inches = Nima'q (taq pulwata')
 printui-margins-custom-bottom = Ikim
+printui-margins-custom-bottom-inches = Koköj (taq pulwata')
 printui-margins-custom-left = Xokon
+printui-margins-custom-left-inches = Ajxokon (taq pulwata')
 printui-margins-custom-right = Ajkiq'a'
+printui-margins-custom-right-inches = Ajkiq'a' (taq pulwata')
 printui-system-dialog-link = Titz'jb'äl rik'in ri rutzijonem q'inoj…
 printui-primary-button = Titz'ajb'äx
 printui-primary-button-save = Tiyak
 printui-cancel-button = Tiq'at
+printui-close-button = Titz'apïx
 printui-loading = Runuk'ik Nab'ey Tz'etoj
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Nab'ey Tz'etoj
+printui-pages-per-sheet = Taq ruxaq chi ruxaq
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Nitz'ajb'äx…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutLogins.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutLogins.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -13,12 +13,9 @@
     .alt = Disponible a Google Play
 login-app-promo-apple =
     .alt = Baixeu-lo de l'App Store
-
 login-filter =
     .placeholder = Cerca els inicis de sessió
-
 create-login-button = Crea un inici de sessió
-
 fxaccounts-sign-in-text = Accediu a les contrasenyes en tots els vostres dispositius
 fxaccounts-sign-in-button = Inicia la sessió al { -sync-brand-short-name }
 fxaccounts-avatar-button =
@@ -32,6 +29,7 @@
 about-logins-menu-menuitem-import-from-another-browser = Importa d'un altre navegador…
 about-logins-menu-menuitem-import-from-a-file = Importa d'un fitxer…
 about-logins-menu-menuitem-export-logins = Exporta els inicis de sessió…
+about-logins-menu-menuitem-remove-all-logins = Elimina tots els inicis de sessió…
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] Opcions
@@ -71,7 +69,6 @@
 ## Introduction screen
 
 login-intro-heading = Esteu cercant els inicis de sessió que heu guardat? Configureu el { -sync-brand-short-name }.
-
 about-logins-login-intro-heading-logged-out = Esteu cercant els inicis de sessió que heu guardat? Configureu el { -sync-brand-short-name } o importeu-los.
 about-logins-login-intro-heading-logged-in = No s'ha trobat cap inici de sessió sincronitzat.
 login-intro-description = Si heu guardat els vostres inicis de sessió en el { -brand-product-name } des d'un altre dispositiu, esta és la manera de tindre-los també ací:
@@ -79,7 +76,6 @@
 login-intro-instruction-fxa-settings = Assegureu-vos que heu seleccionat la casella de selecció Inicis de sessió en els paràmetres del { -sync-brand-short-name }
 about-logins-intro-instruction-help = Visiteu l'<a data-l10n-name="help-link">assistència del { -lockwise-brand-short-name }</a> per obtindre més ajuda
 about-logins-intro-import = Si els vostres inicis de sessió estan guardats en un altre navegador, podeu <a data-l10n-name="import-link">importar-los al { -lockwise-brand-short-name }</a>
-
 about-logins-intro-import2 = Si els vostres inicis de sessió estan guardats fora del { -brand-product-name }, podeu <a data-l10n-name="import-browser-link">importar-los d'un altre navegador</a> o <a data-l10n-name="import-file-link">d'un fitxer</a>
 
 ## Login
@@ -120,13 +116,11 @@
 # This message can be seen when attempting to edit a login in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-edit-login-os-auth-dialog-message-macosx = editar l'inici de sessió guardat
-
 # This message can be seen when attempting to reveal a password in about:logins on Windows.
 about-logins-reveal-password-os-auth-dialog-message-win = Per veure la contrasenya, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to reveal a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-reveal-password-os-auth-dialog-message-macosx = mostrar la contrasenya guardada
-
 # This message can be seen when attempting to copy a password in about:logins on Windows.
 about-logins-copy-password-os-auth-dialog-message-win = Per copiar la contrasenya, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to copy a password in about:logins
@@ -136,7 +130,6 @@
 ## Master Password notification
 
 master-password-notification-message = Introduïu la contrasenya mestra per veure els inicis de sessió i les contrasenyes guardats
-
 # This message can be seen when attempting to export a password in about:logins on Windows.
 about-logins-export-password-os-auth-dialog-message-win = Per exportar els inicis de sessió, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
 # This message can be seen when attempting to export a password in about:logins
@@ -173,15 +166,40 @@
 confirmation-dialog-cancel-button = Cancel·la
 confirmation-dialog-dismiss-button =
     .title = Cancel·la
-
 about-logins-confirm-remove-dialog-title = Voleu eliminar este inici de sessió?
 confirm-delete-dialog-message = Esta acció no es pot desfer.
 about-logins-confirm-remove-dialog-confirm-button = Elimina
-
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Elimina
+        [one] Elimina
+       *[other] Elimina-ho tot
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Sí, elimina aquest inici de sessió
+        [one] Sí, elimina aquest inici de sessió
+       *[other] Sí, elimina aquests inicis de sessió
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Voleu eliminar { $count } inici de sessió
+       *[other] Voleu eliminar { $count } inicis de sessió
+    }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Això eliminarà l'inici de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+        [one] Això eliminarà l'inici de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+       *[other] Això eliminarà els inicis de sessió que heu desat al { -brand-short-name } i les alertes de filtracions que es mostren aquí. Aquesta acció no es pot desfer.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Voleu eliminar { $count } inici de sessió de tots els dispositius?
+       *[other] Voleu eliminar tots els { $count } inicis de sessió de tots els dispositius?
+    }
 about-logins-confirm-export-dialog-title = Exporta els inicis de sessió i contrasenyes
 about-logins-confirm-export-dialog-message = Les contrasenyes es guardaran com a text llegible (per exemple, «malaC0ntr@senya»), de manera que qualsevol que puga obrir el fitxer exportat les podrà veure.
 about-logins-confirm-export-dialog-confirm-button = Exporta…
-
 confirm-discard-changes-dialog-title = Voleu descartar els canvis no guardats?
 confirm-discard-changes-dialog-message = Es perdran tots els canvis que no hàgeu guardat.
 confirm-discard-changes-dialog-confirm-button = Descarta
@@ -212,11 +230,9 @@
 # Variables:
 #   $loginTitle (String) - The title of the website associated with the login.
 about-logins-error-message-duplicate-login-with-link = Ja existeix una entrada per a { $loginTitle } amb este nom d'usuari. <a data-l10n-name="duplicate-link">Voleu anar a l'entrada existent?</a>
-
 # This is a generic error message.
 about-logins-error-message-default = S'ha produït un error en intentar guardar esta contrasenya.
 
-
 ## Login Export Dialog
 
 # Title of the file picker dialog
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutPrivateBrowsing.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutPrivateBrowsing.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutPrivateBrowsing.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutPrivateBrowsing.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -11,7 +11,8 @@
     .title = Cerca al web
 about-private-browsing-not-private = Actualment no esteu en una finestra privada.
 about-private-browsing-info-description = El { -brand-short-name } esborra el vostre historial de cerques i de navegació quan isqueu de l'aplicació o tanqueu totes les pestanyes i finestres de navegació privada. Malgrat que això no fa que sigueu anònim per als llocs web o per al vostre proveïdor de serveis d'Internet, és més fàcil mantindre en privat allò que feu en línia davant de qualsevol altra persona que utilitze este ordinador.
-
+about-private-browsing-need-more-privacy = Vos cal més privadesa?
+about-private-browsing-turn-on-vpn = Proveu el { -mozilla-vpn-brand-name }
 # This string is the title for the banner for search engine selection
 # in a private window.
 # Variables:
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -14,11 +14,14 @@
 crashed-request-help-message = Els informes de fallada ens ajuden a diagnosticar problemes i a millorar el { -brand-short-name }.
 crashed-request-report-title = Informeu sobre esta pestanya
 crashed-send-report = Envia un informe de fallada automàtic per ajudar a corregir errors com este.
+crashed-send-report-2 = Envia un informe de fallada automàtic per ajudar a corregir errors com este
 crashed-comment =
     .placeholder = Comentaris opcionals (els comentaris són visibles públicament)
 crashed-include-URL = Inclou els URL dels llocs que s'estaven visitant quan el { -brand-short-name } ha fallat.
+crashed-include-URL-2 = Inclou els URL dels llocs que s'estaven visitant quan el { -brand-short-name } ha fallat
 crashed-email-placeholder = Introduïu la vostra adreça electrònica ací
 crashed-email-me = Envia'm un missatge de correu quan hi haja més informació disponible
 crashed-report-sent = Ja s'ha enviat l'informe de fallada. Gràcies per ajudar a millorar el { -brand-short-name }.
 crashed-request-auto-submit-title = Informeu sobre les pestanyes en segon pla
 crashed-auto-submit-checkbox = Actualitza les preferències per tal que s'envien informes automàticament en produir-se una fallada del { -brand-short-name }.
+crashed-auto-submit-checkbox-2 = Actualitza les preferències per tal que s'envien informes automàticament en produir-se una fallada del { -brand-short-name }
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/appmenu.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/appmenu.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Finestra nova
+appmenuitem-new-private-window =
+    .label = Finestra privada nova
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Amplia
 appmenuitem-zoom-reduce =
     .label = Redueix
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronitza ara
+appmenuitem-save-page =
+    .label = Anomena i guarda la pàgina…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novetats
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/appMenuNotifications.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -39,7 +39,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Permet que esta extensió s'execute en finestres privades
     .accesskey = P
-    
 appmenu-new-tab-controlled =
     .label = La pàgina de «Pestanya nova» ha canviat.
     .buttonlabel = Mantén els canvis
@@ -52,6 +51,18 @@
     .buttonaccesskey = M
     .secondarybuttonlabel = Inhabilita l'extensió
     .secondarybuttonaccesskey = I
+appmenu-new-tab-controlled-changes =
+    .label = La pàgina de «Pestanya nova» ha canviat.
+    .buttonlabel = Mantén els canvis
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Gestiona les pestanyes noves
+    .secondarybuttonaccesskey = G
+appmenu-homepage-controlled-changes =
+    .label = La pàgina d'inici ha canviat.
+    .buttonlabel = Mantén els canvis
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Gestiona la pàgina d'inici
+    .secondarybuttonaccesskey = G
 appmenu-tab-hide-controlled =
     .label = Accedeix a les pestanyes ocultes
     .buttonlabel = Mantén les pestanyes amagades
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browserContext.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/browserContext.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browserContext.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/browserContext.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -15,10 +15,8 @@
     .tooltiptext = Vés una pàgina arrere
     .aria-label = Arrere
     .accesskey = r
-
 navbar-tooltip-back =
     .value = { main-context-menu-back.tooltiptext }
-
 toolbar-button-back =
     .label = { main-context-menu-back.aria-label }
 
@@ -31,7 +29,6 @@
 
 navbar-tooltip-forward =
     .value = { main-context-menu-forward.tooltiptext }
-
 toolbar-button-forward =
     .label = { main-context-menu-forward.aria-label }
 
@@ -40,7 +37,6 @@
 main-context-menu-reload =
     .aria-label = Actualitza
     .accesskey = z
-
 toolbar-button-reload =
     .label = { main-context-menu-reload.aria-label }
 
@@ -49,7 +45,6 @@
 main-context-menu-stop =
     .aria-label = Para
     .accesskey = P
-
 toolbar-button-stop =
     .label = { main-context-menu-stop.aria-label }
 
@@ -63,7 +58,6 @@
 main-context-menu-page-save =
     .label = Anomena i guarda la pàgina…
     .accesskey = d
-
 toolbar-button-page-save =
     .label = { main-context-menu-page-save.label }
 
@@ -73,54 +67,43 @@
     .aria-label = Afig la pàgina a les adreces d'interés
     .accesskey = d
     .tooltiptext = Afig la pàgina a les adreces d'interés
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the add bookmark command.
 main-context-menu-bookmark-add-with-shortcut =
     .aria-label = Afig la pàgina a les adreces d'interés
     .accesskey = d
     .tooltiptext = Afig la pàgina a les adreces d'interés ({ $shortcut })
-
 main-context-menu-bookmark-change =
     .aria-label = Edita esta adreça d'interés
     .accesskey = d
     .tooltiptext = Edita l'adreça d'interés
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the edit bookmark command.
 main-context-menu-bookmark-change-with-shortcut =
     .aria-label = Edita esta adreça d'interés
     .accesskey = d
     .tooltiptext = Edita l'adreça d'interés ({ $shortcut })
-
 main-context-menu-open-link =
     .label = Obri l'enllaç
     .accesskey = O
-
 main-context-menu-open-link-new-tab =
     .label = Obri l'enllaç en una pestanya nova
     .accesskey = t
-
 main-context-menu-open-link-container-tab =
     .label = Obri l'enllaç en una pestanya de contenidor nova
     .accesskey = b
-
 main-context-menu-open-link-new-window =
     .label = Obri l'enllaç en una finestra nova
     .accesskey = f
-
 main-context-menu-open-link-new-private-window =
     .label = Obri l'enllaç en una finestra privada nova
     .accesskey = p
-
 main-context-menu-bookmark-this-link =
     .label = Afig l'enllaç a les adreces d'interés
     .accesskey = l
-
 main-context-menu-save-link =
     .label = Anomena i guarda el contingut de l'enllaç…
     .accesskey = g
-
 main-context-menu-save-link-to-pocket =
     .label = Guarda l'enllaç al { -pocket-brand-name }
     .accesskey = o
@@ -132,7 +115,6 @@
 main-context-menu-copy-email =
     .label = Copia l'adreça electrònica
     .accesskey = e
-
 main-context-menu-copy-link =
     .label = Copia l'enllaç
     .accesskey = C
@@ -146,7 +128,6 @@
 main-context-menu-media-play =
     .label = Reprodueix
     .accesskey = R
-
 main-context-menu-media-pause =
     .label = Pausa
     .accesskey = P
@@ -156,37 +137,29 @@
 main-context-menu-media-mute =
     .label = Silencia
     .accesskey = S
-
 main-context-menu-media-unmute =
     .label = No silencies
     .accesskey = N
-
 main-context-menu-media-play-speed =
     .label = Velocitat de reproducció
     .accesskey = l
-
 main-context-menu-media-play-speed-slow =
     .label = Lent (0,5x)
     .accesskey = L
-
 main-context-menu-media-play-speed-normal =
     .label = Normal
     .accesskey = N
-
 main-context-menu-media-play-speed-fast =
     .label = Ràpid (1,25x)
     .accesskey = R
-
 main-context-menu-media-play-speed-faster =
     .label = Més ràpid (1,5x)
     .accesskey = s
-
 # "Ludicrous" is a reference to the movie "Space Balls" and is meant
 # to say that this speed is very fast.
 main-context-menu-media-play-speed-fastest =
     .label = Màxima velocitat (×2)
     .accesskey = M
-
 main-context-menu-media-loop =
     .label = Repetició
     .accesskey = R
@@ -197,7 +170,6 @@
 main-context-menu-media-show-controls =
     .label = Mostra els controls
     .accesskey = c
-
 main-context-menu-media-hide-controls =
     .label = Amaga els controls
     .accesskey = c
@@ -207,184 +179,142 @@
 main-context-menu-media-video-fullscreen =
     .label = Pantalla completa
     .accesskey = P
-
 main-context-menu-media-video-leave-fullscreen =
     .label = Ix de la pantalla completa
     .accesskey = p
-
 # This is used when right-clicking on a video in the
 # content area when the Picture-in-Picture feature is enabled.
 main-context-menu-media-pip =
     .label = Imatge sobre imatge
     .accesskey = I
-
 main-context-menu-image-reload =
     .label = Recarrega la imatge
     .accesskey = R
-
 main-context-menu-image-view =
     .label = Visualitza la imatge
     .accesskey = i
-
 main-context-menu-video-view =
     .label = Visualitza el vídeo
     .accesskey = i
-
 main-context-menu-image-copy =
     .label = Copia la imatge
     .accesskey = m
-
 main-context-menu-image-copy-location =
     .label = Copia la ubicació de la imatge
     .accesskey = o
-
 main-context-menu-video-copy-location =
     .label = Copia la ubicació del vídeo
     .accesskey = o
-
 main-context-menu-audio-copy-location =
     .label = Copia la ubicació de l'àudio
     .accesskey = o
-
 main-context-menu-image-save-as =
     .label = Anomena i guarda la imatge…
     .accesskey = A
-
 main-context-menu-image-email =
     .label = Envia la imatge per correu…
     .accesskey = a
-
 main-context-menu-image-set-as-background =
     .label = Defineix com a fons d'escriptori…
     .accesskey = D
-
 main-context-menu-image-info =
     .label = Visualitza la informació de la imatge
     .accesskey = f
-
 main-context-menu-image-desc =
     .label = Visualitza la descripció
     .accesskey = d
-
 main-context-menu-video-save-as =
     .label = Anomena i guarda el vídeo…
     .accesskey = v
-
 main-context-menu-audio-save-as =
     .label = Anomena i guarda l'àudio…
     .accesskey = u
-
 main-context-menu-video-image-save-as =
     .label = Anomena i guarda una instantània…
     .accesskey = g
-
 main-context-menu-video-email =
     .label = Envia el vídeo per correu…
     .accesskey = a
-
 main-context-menu-audio-email =
     .label = Envia l'àudio per correu…
     .accesskey = a
-
 main-context-menu-plugin-play =
     .label = Activa este connector
     .accesskey = c
-
 main-context-menu-plugin-hide =
     .label = Amaga este connector
     .accesskey = m
-
 main-context-menu-save-to-pocket =
     .label = Guarda la pàgina al { -pocket-brand-name }
     .accesskey = k
-
 main-context-menu-send-to-device =
     .label = Envia la pàgina al dispositiu
     .accesskey = d
-
 main-context-menu-view-background-image =
     .label = Visualitza la imatge de fons
     .accesskey = n
-
 main-context-menu-generate-new-password =
     .label = Utilitza una contrasenya generada…
     .accesskey = g
-
 main-context-menu-keyword =
     .label = Afig una paraula clau per a esta cerca…
     .accesskey = p
-
 main-context-menu-link-send-to-device =
     .label = Envia l'enllaç al dispositiu
     .accesskey = d
-
 main-context-menu-frame =
     .label = Este marc
     .accesskey = t
-
 main-context-menu-frame-show-this =
     .label = Mostra només este marc
     .accesskey = M
-
 main-context-menu-frame-open-tab =
     .label = Obri el marc en una pestanya nova
     .accesskey = t
-
 main-context-menu-frame-open-window =
     .label = Obri el marc en una finestra nova
     .accesskey = O
-
 main-context-menu-frame-reload =
     .label = Actualitza el marc
     .accesskey = z
-
 main-context-menu-frame-bookmark =
     .label = Afig el marc a les adreces d'interés
     .accesskey = m
-
 main-context-menu-frame-save-as =
     .label = Anomena i guarda el marc…
     .accesskey = m
-
 main-context-menu-frame-print =
     .label = Imprimeix el marc…
     .accesskey = p
-
 main-context-menu-frame-view-source =
     .label = Codi font del marc
     .accesskey = f
-
 main-context-menu-frame-view-info =
     .label = Informació del marc
     .accesskey = I
-
+main-context-menu-print-selection =
+    .label = Imprimeix la selecció
+    .accesskey = r
 main-context-menu-view-selection-source =
     .label = Codi font de la selecció
     .accesskey = e
-
 main-context-menu-view-page-source =
     .label = Codi font de la pàgina
     .accesskey = f
-
 main-context-menu-view-page-info =
     .label = Informació de la pàgina
     .accesskey = I
-
 main-context-menu-bidi-switch-text =
     .label = Canvia la direcció del text
     .accesskey = v
-
 main-context-menu-bidi-switch-page =
     .label = Canvia la direcció de la pàgina
     .accesskey = g
-
 main-context-menu-inspect-element =
     .label = Inspecciona l'element
     .accesskey = I
-
 main-context-menu-inspect-a11y-properties =
     .label = Inspecciona les propietats d'accessibilitat
-
 main-context-menu-eme-learn-more =
     .label = Més informació sobre DRM…
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browser.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browser.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/browser.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -23,7 +23,7 @@
 # there is no content title:
 #
 # "default" - "Mozilla Firefox"
-# "private" - "Mozilla Firefox - (Private Browsing)"
+# "private" - "Mozilla Firefox — (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Do not use the brand name in the last two attributes, as we do on non-macOS.
@@ -109,9 +109,15 @@
 
 urlbar-search-tips-onboard = Escriviu menys i trobeu més: Cerqueu amb { $engineName } directament des de la barra d'adreces.
 urlbar-search-tips-redirect-2 = Comenceu la vostra cerca en la barra d'adreces per veure suggeriments de { $engineName } i del vostre historial de navegació.
+# Prompts users to use the Urlbar when they are typing in the domain of a
+# search engine, e.g. google.com or amazon.com.
+urlbar-tabtosearch-onboard = Seleccioneu esta drecera per trobar el que necessiteu més ràpidament.
 
 ## Local search mode indicator labels in the urlbar
 
+urlbar-search-mode-bookmarks = Adreces d'interés
+urlbar-search-mode-tabs = Pestanyes
+urlbar-search-mode-history = Historial
 
 ##
 
@@ -217,7 +223,7 @@
 
 ## Search Engine selection buttons (one-offs)
 
-# This string prompts the user to use the list of one-click search engines in
+# This string prompts the user to use the list of search shortcuts in
 # the Urlbar and searchbar.
 search-one-offs-with-title = Esta vegada, cerca amb:
 # This string won't wrap, so if the translated string is longer,
@@ -235,6 +241,12 @@
 search-one-offs-context-set-as-default-private =
     .label = Defineix com a motor de cerca per defecte per a les finestres privades
     .accesskey = D
+# Search engine one-off buttons with an @alias shortcut/keyword.
+# Variables:
+#  $engineName (String): The name of the engine.
+#  $alias (String): The @alias shortcut/keyword.
+search-one-offs-engine-with-alias =
+    .tooltiptext = { $engineName } ({ $alias })
 
 ## Local search mode one-off buttons
 ## Variables:
@@ -243,6 +255,12 @@
 ##    restrict their searches to certain sources (e.g., "*" to search only
 ##    bookmarks).
 
+search-one-offs-bookmarks =
+    .tooltiptext = Adreces d'interés ({ $restrict })
+search-one-offs-tabs =
+    .tooltiptext = Pestanyes ({ $restrict })
+search-one-offs-history =
+    .tooltiptext = Historial ({ $restrict })
 
 ## Bookmark Panel
 
@@ -270,8 +288,21 @@
 identity-active-loaded = Heu desactivat la protecció en esta pàgina.
 identity-weak-encryption = Esta pàgina utilitza xifratge feble.
 identity-insecure-login-forms = Les dades d'inici de sessió que introduïu en esta pàgina podrien estar en risc.
+identity-https-only-connection-upgraded = (actualitzat a HTTPS)
+identity-https-only-label = Mode només HTTPS
+identity-https-only-dropdown-on =
+    .label = Activat
+identity-https-only-dropdown-off =
+    .label = Desactivat
+identity-https-only-dropdown-off-temporarily =
+    .label = Desactivat temporalment
+identity-https-only-info-turn-on2 = Activeu el mode només HTTPS per a este lloc si voleu que el { -brand-short-name } canvie a una connexió segura quan siga possible.
+identity-https-only-info-turn-off2 = Si pareix que la pàgina no funciona bé, podeu provar de desactivar el mode només HTTPS per a este lloc per tornar-lo a carregar amb HTTP insegur.
+identity-https-only-info-no-upgrade = No s'ha pogut actualitzar la connexió des d'HTTP.
 identity-permissions =
     .value = Permisos
+identity-permissions-storage-access-header = Galetes entre llocs
+identity-permissions-storage-access-hint = Estos subjectes poden utilitzar galetes entre llocs i dades del lloc mentre esteu en este lloc.
 identity-permissions-reload-hint = Potser cal que actualitzeu la pàgina per aplicar els canvis.
 identity-permissions-empty = No heu donat cap permís especial a este lloc.
 identity-clear-site-data =
@@ -315,6 +346,13 @@
 browser-window-close-button =
     .tooltiptext = Tanca
 
+## Bookmarks toolbar items
+
+browser-import-button2 =
+    .label = Importa les adreces d'interés…
+    .tooltiptext = Importa les adreces d'interés d'un altre navegador al { -brand-short-name }.
+bookmarks-toolbar-empty-message = Col·loqueu les adreces d'interés ací, a la barra de les adreces d'interés, per accedir-hi ràpidament. <a data-l10n-name="manage-bookmarks">Gestiona les adreces d'interés…</a>
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -350,8 +388,38 @@
 
 urlbar-default-placeholder =
     .defaultPlaceholder = Escriviu una cerca o adreça
+# This placeholder is used when not in search mode and the user's default search
+# engine is unknown.
 urlbar-placeholder =
     .placeholder = Escriviu una cerca o adreça
+# This placeholder is used in search mode with search engines that search the
+# entire web.
+# Variables
+#  $name (String): the name of a search engine that searches the entire Web
+#  (e.g. Google).
+urlbar-placeholder-search-mode-web-2 =
+    .placeholder = Cerca al web
+    .aria-label = Cerca amb { $name }
+# This placeholder is used in search mode with search engines that search a
+# specific site (e.g., Amazon).
+# Variables
+#  $name (String): the name of a search engine that searches a specific site
+#  (e.g. Amazon).
+urlbar-placeholder-search-mode-other-engine =
+    .placeholder = Escriviu els termes de la cerca
+    .aria-label = Cerca en { $name }
+# This placeholder is used when searching bookmarks.
+urlbar-placeholder-search-mode-other-bookmarks =
+    .placeholder = Escriviu els termes de la cerca
+    .aria-label = Cerca en les adreces d'interés
+# This placeholder is used when searching history.
+urlbar-placeholder-search-mode-other-history =
+    .placeholder = Escriviu els termes de la cerca
+    .aria-label = Cerca en l'historial
+# This placeholder is used when searching open tabs.
+urlbar-placeholder-search-mode-other-tabs =
+    .placeholder = Escriviu els termes de la cerca
+    .aria-label = Cerca en les pestanyes
 # Variables
 #  $name (String): the name of the user's default search engine
 urlbar-placeholder-with-name =
@@ -388,13 +456,37 @@
 # Variables
 #  $engine (String): the name of a search engine
 urlbar-result-action-search-w-engine = Cerca amb { $engine }
+urlbar-result-action-sponsored = Patrocinat
 urlbar-result-action-switch-tab = Canvia a la pestanya
 urlbar-result-action-visit = Visita
+# Directs a user to press the Tab key to perform a search with the specified
+# engine.
+# Variables
+#  $engine (String): the name of a search engine that searches the entire Web
+#  (e.g. Google).
+urlbar-result-action-before-tabtosearch-web = Premeu Tab per cercar amb { $engine }
+# Directs a user to press the Tab key to perform a search with the specified
+# engine.
+# Variables
+#  $engine (String): the name of a search engine that searches a specific site
+#  (e.g. Amazon).
+urlbar-result-action-before-tabtosearch-other = Premeu Tab per cercar en { $engine }
+# Variables
+#  $engine (String): the name of a search engine that searches the entire Web
+#  (e.g. Google).
+urlbar-result-action-tabtosearch-web = Cerca amb { $engine } directament des de la barra d'adreces
+# Variables
+#  $engine (String): the name of a search engine that searches a specific site
+#  (e.g. Amazon).
+urlbar-result-action-tabtosearch-other-engine = Cerca en { $engine } directament des de la barra d'adreces
 
 ## Action text shown in urlbar results, usually appended after the search
 ## string or the url, like "result value - action text".
 ## In these actions "Search" is a verb, followed by where the search is performed.
 
+urlbar-result-action-search-bookmarks = Cerca en les adreces d'interés
+urlbar-result-action-search-history = Cerca en l'historial
+urlbar-result-action-search-tabs = Cerca en les pestanyes
 
 ## Full Screen and Pointer Lock UI
 
@@ -411,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> té el control del punter. Premeu Esc per recuperar el control.
 pointerlock-warning-no-domain = Este document té el control del punter. Premeu Esc per recuperar el control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostra totes les adreces d'interés
+bookmarks-recent-bookmarks =
+    .value = Afegides recentment
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostra més adreces d'interés
+bookmarks-sidebar-content =
+    .aria-label = Adreces d'interés
+bookmarks-menu-button =
+    .label = Menú de les adreces d'interés
+bookmarks-other-bookmarks-menu =
+    .label = Altres adreces d'interés
+bookmarks-mobile-bookmarks-menu =
+    .label = Adreces del mòbil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amaga la barra lateral d'adreces d'interés
+           *[other] Mostra la barra lateral de les adreces d'interés
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amaga la barra d'eines d'adreces d'interés
+           *[other] Mostra la barra de les adreces d'interés
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Elimina el menú d'adreces d'interés de la barra d'eines
+           *[other] Afig el menú d'adreces d'interés a la barra d'eines
+        }
+bookmarks-search =
+    .label = Cerca adreces d'interés
+bookmarks-tools =
+    .label = Eines d'adreces d'interés
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de les adreces d'interés
+    .accesskey = B
+    .aria-label = Adreces d'interés
+bookmarks-toolbar-menu =
+    .label = Barra de les adreces d'interés
+bookmarks-toolbar-placeholder =
+    .title = Elements de la barra de les adreces d'interés
+bookmarks-toolbar-placeholder-button =
+    .label = Elements de la barra de les adreces d'interés
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Adreces d'interés
+library-bookmarks-bookmark-this-page =
+    .label = Afig la pàgina a les adreces d'interés
+library-bookmarks-bookmark-edit =
+    .label = Edita esta adreça d'interés
+
+## More items
+
+more-menu-go-offline =
+    .label = Treballa fora de línia
+    .accesskey = b
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browserSets.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/browserSets.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/browserSets.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/browserSets.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -4,46 +4,33 @@
 
 window-minimize-command =
     .label = Minimitza
-
 window-zoom-command =
     .label = Zoom
-
 window-new-shortcut =
     .key = N
-
 window-minimize-shortcut =
     .key = m
-
 close-shortcut =
     .key = W
-
 tab-new-shortcut =
     .key = t
-
 location-open-shortcut =
     .key = l
-
 location-open-shortcut-alt =
     .key = d
-
 search-focus-shortcut =
     .key = k
-
 # This shortcut is used in two contexts:
 #   - web search
 #   - find in page
 find-shortcut =
     .key = f
-
 search-find-again-shortcut =
     .key = g
-
 search-find-again-shortcut-alt =
     .keycode = VK_F3
-
 search-find-selection-shortcut =
     .key = e
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -53,7 +40,6 @@
             [linux] j
            *[other] e
         }
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -63,19 +49,14 @@
             [linux] y
            *[other] j
         }
-
 addons-shortcut =
     .key = A
-
 file-open-shortcut =
     .key = o
-
 save-page-shortcut =
     .key = s
-
 page-source-shortcut =
     .key = u
-
 # This should match the Option+Command keyboard shortcut letter that Safari
 # and Chrome use for "View Source" on macOS. `page-source-shortcut` above
 # is Firefox's official keyboard shortcut shown in the GUI.
@@ -83,56 +64,49 @@
 # users on macOS. See bug 1398988.
 page-source-shortcut-safari =
     .key = u
-
 page-info-shortcut =
     .key = i
-
 print-shortcut =
     .key = p
-
 mute-toggle-shortcut =
     .key = M
-
 nav-back-shortcut-alt =
     .key = [
-
 nav-fwd-shortcut-alt =
     .key = ]
-
 nav-reload-shortcut =
     .key = r
-
 # Shortcut available only on macOS.
 nav-stop-shortcut =
     .key = .
-
 history-show-all-shortcut =
     .key = H
-
+history-show-all-shortcut-mac =
+    .key = Y
 history-sidebar-shortcut =
     .key = h
-
 full-screen-shortcut =
     .key = f
-
 reader-mode-toggle-shortcut-windows =
     .keycode = VK_F9
-
 reader-mode-toggle-shortcut-other =
     .key = R
-
+picture-in-picture-toggle-shortcut-mac =
+    .key = +
+# Pick the key that is commonly present
+# in your locale keyboards above the
+# `picture-in-picture-toggle-shortcut-mac` key.
+picture-in-picture-toggle-shortcut-mac-alt =
+    .key = *
 picture-in-picture-toggle-shortcut =
     .key = +
-
 # Pick the key that is commonly present
 # in your locale keyboards above the
 # `picture-in-picture-toggle-shortcut` key.
 picture-in-picture-toggle-shortcut-alt =
     .key = *
-
 bookmark-this-page-shortcut =
     .key = d
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -142,12 +116,21 @@
             [linux] o
            *[other] b
         }
-
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-library-shortcut =
+    .key = O
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
 bookmark-show-sidebar-shortcut =
     .key = b
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-toolbar-shortcut =
+    .key = B
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
@@ -155,31 +138,23 @@
 
 full-zoom-reduce-shortcut =
     .key = -
-
 # If in keyboard layouts popular for your locale you need to use the shift key
 # to access the original shortcuts, the following shortcuts can be used.
 # Otherwise their values should remain empty.
 full-zoom-reduce-shortcut-alt =
     .key = { "" }
-
 full-zoom-reduce-shortcut-alt-a =
     .key = _
-
 full-zoom-reduce-shortcut-alt-b =
     .key = { "" }
-
 full-zoom-enlarge-shortcut =
     .key = +
-
 full-zoom-enlarge-shortcut-alt =
     .key = =
-
 full-zoom-enlarge-shortcut-alt2 =
     .key = { "" }
-
 full-zoom-reset-shortcut =
     .key = 0
-
 full-zoom-reset-shortcut-alt =
     .key = { "" }
 
@@ -187,7 +162,6 @@
 
 bidi-switch-direction-shortcut =
     .key = X
-
 private-browsing-shortcut =
     .key = P
 
@@ -196,15 +170,11 @@
 
 quit-app-shortcut =
     .key = Q
-
 help-shortcut =
     .key = ?
-
 preferences-shortcut =
     .key = ,
-
 hide-app-shortcut =
     .key = H
-
 hide-other-apps-shortcut =
     .key = H
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/defaultBrowserNotification.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/defaultBrowserNotification.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/defaultBrowserNotification.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/defaultBrowserNotification.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -1,3 +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/.
+
+# The question portion of the following message should have the <strong> and </strong> tags surrounding it.
+default-browser-notification-message = <strong>Voleu definir el { -brand-short-name } com a navegador per defecte?</strong> Obteniu una navegació ràpida, segura i privada sempre que utilitzeu el web.
+default-browser-notification-button =
+    .label = Defineix per defecte
+    .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/migration.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/migration.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/migration.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = Auxiliar d'importació
-
 import-from =
     { PLATFORM() ->
         [windows] Importa les opcions, adreces d'interés, historial, contrasenyes i altres dades des de:
        *[other] Importa les preferències, adreces d'interés, historial, contrasenyes i altres dades des de:
     }
-
 import-from-bookmarks = Importa les adreces d'interés del:
 import-from-ie =
     .label = Microsoft Internet Explorer
@@ -51,34 +49,23 @@
 import-from-360se =
     .label = 360 Secure Browser
     .accesskey = 3
-
 no-migration-sources = No s'ha trobat cap programa que continga adreces d'interés, o dades d'historial o contrasenyes.
-
 import-source-page-title = Importació dels paràmetres i de les dades
 import-items-page-title = Elements per importar
-
 import-items-description = Seleccioneu quins elements voleu importar:
-
+import-permissions-page-title = Doneu permisos al { -brand-short-name }
 import-migrating-page-title = S'està important…
-
 import-migrating-description = Els elements següents s'estan important en estos moments…
-
 import-select-profile-page-title = Selecció de perfil
-
 import-select-profile-description = Els perfils següents estan disponibles per importar-se des de:
-
 import-done-page-title = Fi de la importació
-
 import-done-description = Els elements següents s'han importat correctament:
-
 import-close-source-browser = Abans de continuar, assegureu-vos que el navegador seleccionat estiga tancat.
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = De { $source }
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
 source-name-edge-beta = Microsoft Edge Beta
@@ -90,7 +77,6 @@
 source-name-chromium = Chromium
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 Secure Browser
-
 imported-safari-reading-list = Llista de lectura (del Safari)
 imported-edge-reading-list = Llista de lectura (de l'Edge)
 
@@ -112,7 +98,6 @@
     .label = Galetes
 browser-data-cookies-label =
     .value = Galetes
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -125,12 +110,10 @@
             [firefox] Historial de navegació i adreces d'interés
            *[other] Historial de navegació
         }
-
 browser-data-formdata-checkbox =
     .label = Historial de formularis guardats
 browser-data-formdata-label =
     .value = Historial de formularis guardats
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -139,7 +122,6 @@
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-label =
     .value = Inicis de sessió i contrasenyes guardats
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -154,12 +136,10 @@
             [edge] Favorits
            *[other] Adreces d'interés
         }
-
 browser-data-otherdata-checkbox =
     .label = Altres dades
 browser-data-otherdata-label =
     .label = Altres dades
-
 browser-data-session-checkbox =
     .label = Finestres i pestanyes
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/asrouter.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -13,35 +13,27 @@
 
 cfr-doorhanger-extension-sumo-link =
     .tooltiptext = Per què veig això?
-
 cfr-doorhanger-extension-cancel-button = Ara no
     .accesskey = n
-
 cfr-doorhanger-extension-ok-button = Afig-la ara
     .accesskey = A
 cfr-doorhanger-pintab-ok-button = Fixa esta pestanya
     .accesskey = F
-
 cfr-doorhanger-extension-manage-settings-button = Gestiona els paràmetres de recomanacions
     .accesskey = G
-
 cfr-doorhanger-extension-never-show-recommendation = No em mostres esta recomanació
     .accesskey = m
-
 cfr-doorhanger-extension-learn-more-link = Més informació
-
 # This string is used on a new line below the add-on name
 # Variables:
 #   $name (String) - Add-on author name
 cfr-doorhanger-extension-author = per { $name }
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-extension-notification = Recomanació
 cfr-doorhanger-extension-notification2 = Recomanació
     .tooltiptext = Recomanació d'extensió
     .a11y-announcement = Recomanació d'extensió disponible
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-feature-notification = Recomanació
@@ -67,7 +59,6 @@
         [one] { $total } usuari
        *[other] { $total } usuaris
     }
-
 cfr-doorhanger-pintab-description = Accediu fàcilment als llocs més utilitzats. Manteniu els llocs oberts en una pestanya (fins i tot quan reinicieu).
 
 ## These messages are steps on how to use the feature and are shown together.
@@ -75,11 +66,9 @@
 cfr-doorhanger-pintab-step1 = <b>Feu clic amb el botó dret</b> a la pestanya que voleu fixar.
 cfr-doorhanger-pintab-step2 = Trieu <b>Fixa la pestanya</b> al menú.
 cfr-doorhanger-pintab-step3 = Si el contingut del lloc s'actualitza, veureu un punt blau a la pestanya fixa.
-
 cfr-doorhanger-pintab-animation-pause = Pausa
 cfr-doorhanger-pintab-animation-resume = Reprén
 
-
 ## Firefox Accounts Message
 
 cfr-doorhanger-bookmark-fxa-header = Sincronitzeu les adreces d'interés a tot arreu.
@@ -100,22 +89,16 @@
 # This string is used by screen readers to offer a text based alternative for
 # the notification icon
 cfr-badge-reader-label-newfeature = Novetat:
-
 cfr-whatsnew-button =
     .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.
@@ -126,11 +109,9 @@
     }
 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 } vos permet accedir de manera segura a les contrasenyes guardades des de qualsevol lloc.
 cfr-whatsnew-lockwise-take-link-text = Baixa l'aplicació
@@ -164,7 +145,6 @@
        *[other] Generadors d'empremtes digitals blocats
     }
 cfr-whatsnew-fingerprinter-counter-body = El { -brand-shorter-name } bloca molts generadors d'empremtes digitals que secretament recullen informació sobre el vostre dispositiu i les vostres accions per crear un perfil publicitari vostre.
-
 # Message variation when fingerprinters count is less than 10
 cfr-whatsnew-fingerprinter-counter-header-alt = Generadors d'empremtes digitals
 cfr-whatsnew-fingerprinter-counter-body-alt = El { -brand-shorter-name } pot blocar els generadors d'empremtes digitals que secretament recullen informació sobre el vostre dispositiu i les vostres accions per crear un perfil publicitari vostre.
@@ -224,7 +204,6 @@
     }
 cfr-doorhanger-milestone-ok-button = Mostra-ho tot
     .accesskey = M
-
 cfr-doorhanger-milestone-close-button = Tanca
     .accesskey = T
 
@@ -270,8 +249,28 @@
 cfr-doorhanger-doh-secondary-button = Inhabilita
     .accesskey = h
 
+## Fission Experiment Message
+
+cfr-doorhanger-fission-body-approved = La vostra privadesa és important. Ara el { -brand-short-name } aïlla els llocs web els uns dels altres, perquè siga més difícil per als furoners robar contrasenyes, números de targetes de crèdit i altra informació confidencial.
+cfr-doorhanger-fission-header = Aïllament de llocs
+cfr-doorhanger-fission-primary-button = Entesos
+    .accesskey = E
+cfr-doorhanger-fission-secondary-button = Més informació
+    .accesskey = M
+
 ## What's new: Cookies message
 
 cfr-whatsnew-clear-cookies-header = Protecció automàtica contra les tàctiques de seguiment més elaborades
 cfr-whatsnew-clear-cookies-body = Alguns elements de seguiment vos redirigeixen a altres llocs web que guarden galetes en secret. Ara el { -brand-short-name } esborra automàticament estes galetes perquè no vos puguen fer el seguiment.
 cfr-whatsnew-clear-cookies-image-alt = Il·lustració d'una galeta blocada
+
+## What's new: Media controls message
+
+cfr-whatsnew-media-keys-header = Més controls multimèdia
+cfr-whatsnew-media-keys-body = Reproduïu i poseu en pausa l'àudio o el vídeo directament des del teclat o auriculars. D'esta manera, és més fàcil controlar el contingut multimèdia des d'una altra pestanya, programa o fins i tot quan l'ordinador està blocat. També podeu desplaçar-vos entre les pistes amb les tecles d'avançar i retrocedir.
+cfr-whatsnew-media-keys-button = Vegeu com fer-ho
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Dreceres de cerca a la barra d'adreces
+cfr-whatsnew-search-shortcuts-body = Ara, quan escriviu el nom d'un motor de cerca o un lloc específic a la barra d'adreces, apareixerà una drecera blava als suggeriments de cerca de sota. Seleccioneu esta drecera per fer la cerca directament des de la barra d'adreces.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/newtab.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -15,7 +15,6 @@
 newtab-search-box-search-button =
     .title = Cerca
     .aria-label = Cerca
-
 newtab-search-box-search-the-web-text = Cerca al web
 newtab-search-box-search-the-web-input =
     .placeholder = Cerca al web
@@ -30,12 +29,10 @@
 newtab-topsites-title-label = Títol
 newtab-topsites-title-input =
     .placeholder = Escriviu el títol
-
 newtab-topsites-url-label = URL
 newtab-topsites-url-input =
     .placeholder = Escriviu o apegueu un URL
 newtab-topsites-url-validation = Es necessita un URL vàlid
-
 newtab-topsites-image-url-label = URL d'imatge personalitzada
 newtab-topsites-use-image-link = Utilitza una imatge personalitzada…
 newtab-topsites-image-validation = S'ha produït un error en carregar la imatge. Proveu un altre URL.
@@ -54,18 +51,20 @@
 # "This action" refers to deleting a page from history.
 newtab-confirm-delete-history-p2 = Esta acció no es pot desfer.
 
+## Top Sites - Sponsored label
+
+newtab-topsite-sponsored = Patrocinat
+
 ## Context Menu - Action Tooltips.
 
 # General tooltip for context menus.
 newtab-menu-section-tooltip =
     .title = Obri el menú
     .aria-label = Obri el menú
-
 # Tooltip for dismiss button
 newtab-dismiss-button-tooltip =
     .title = Elimina
     .aria-label = Elimina
-
 # This tooltip is for the context menu of Pocket cards or Topsites
 # Variables:
 #  $title (String): The label or hostname of the site. This is for screen readers when the context menu button is focused/active.
@@ -138,12 +137,10 @@
 newtab-label-recommended = Tendència
 newtab-label-saved = Guardat al { -pocket-brand-name }
 newtab-label-download = Baixat
-
 # This string is used in the story cards to indicate sponsored content
 # Variables:
 #  $sponsorOrSource (String): This is the name of a company or their domain
 newtab-label-sponsored = { $sponsorOrSource } · Patrocinat
-
 # This string is used at the bottom of story cards to indicate sponsored content
 # Variables:
 #  $sponsor (String): This is the name of a sponsor
@@ -174,6 +171,7 @@
 
 newtab-section-header-topsites = Llocs principals
 newtab-section-header-highlights = Destacats
+newtab-section-header-recent-activity = Activitat recent
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recomanat per { $provider }
@@ -181,13 +179,11 @@
 ## Empty Section States: These show when there are no more items in a section. Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 
 newtab-empty-section-highlights = Comenceu a navegar i ací vos mostrarem els millors articles, vídeos i altres pàgines que hàgeu visitat o afegit a les adreces d'interés recentment.
-
 # Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 # Variables:
 #  $provider (String): Name of the content provider for this section, e.g "Pocket".
 newtab-empty-section-topstories = Ja esteu al dia. Torneu més tard per veure més articles populars de { $provider }. No podeu esperar? Trieu un tema popular per descobrir els articles més interessants de tot el web.
 
-
 ## Empty Section (Content Discovery Experience). These show when there are no more stories or when some stories fail to load.
 
 newtab-discovery-empty-section-topstories-header = Ja esteu al dia.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/newtab/onboarding.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/newtab/onboarding.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -17,6 +17,14 @@
 
 ## Welcome modal dialog strings
 
+
+### UI strings for the simplified onboarding / multistage about:welcome
+### Various strings use a non-breaking space to avoid a single dangling /
+### widowed word, so test on various window sizes if you also want this.
+
+
+## Welcome page strings
+
 onboarding-welcome-header = Vos donem la benvinguda al { -brand-short-name }
 onboarding-welcome-body = Ja teniu el navegador.<br/>Ara descobriu la resta del { -brand-product-name }.
 onboarding-welcome-learn-more = Més informació sobre els beneficis.
@@ -36,10 +44,59 @@
 # Text for link to submit the sign in form
 onboarding-join-form-signin = Inicia la sessió
 onboarding-start-browsing-button-label = Comença a navegar
+onboarding-not-now-button-label = Ara no
 onboarding-cards-dismiss =
     .title = Descarta
     .aria-label = Descarta
 
+## Welcome full page string
+
+onboarding-fullpage-welcome-subheader = Descobriu tot allò que podeu fer.
+onboarding-fullpage-form-email =
+    .placeholder = La vostra adreça electrònica…
+
+## Firefox Sync modal dialog strings.
+
+onboarding-sync-welcome-header = El vostre { -brand-product-name }, a tot arreu
+onboarding-sync-welcome-content = Accediu a les vostres adreces d'interés, historial, contrasenyes i preferències en tots els vostres dispositius.
+onboarding-sync-welcome-learn-more-link = Més informació sobre els Comptes del Firefox
+onboarding-sync-form-input =
+    .placeholder = Adreça electrònica
+onboarding-sync-form-continue-button = Continua
+onboarding-sync-form-skip-login-button = Omet este pas
+
+## This is part of the line "Enter your email to continue to Firefox Sync"
+
+onboarding-sync-form-header = Introduïu la vostra adreça electrònica
+onboarding-sync-form-sub-header = per continuar al { -sync-brand-name }.
+
+## These are individual benefit messages shown with an image, title and
+## description.
+
+onboarding-benefit-products-text = Milloreu la productivitat amb una família d'eines que respecten la vostra privadesa en tots els dispositius.
+# "Personal Data Promise" is a concept that should be translated consistently
+# across the product. It refers to a concept shown elsewhere to the user: "The
+# Firefox Personal Data Promise is the way we honor your data in everything we
+# make and do. We take less data. We keep it safe. And we make sure that we are
+# transparent about how we use it."
+onboarding-benefit-privacy-text = Tot el que fem respecta la nostra «Promesa sobre les dades personals»: recollir menys dades, mantindre-les segures i sense secrets.
+onboarding-benefit-sync-title = { -sync-brand-short-name }
+onboarding-benefit-sync-text = Accediu a les adreces d'interés, les contrasenyes, l'historial i molt més a tot arreu on utilitzeu el { -brand-product-name }.
+onboarding-benefit-monitor-title = { -monitor-brand-short-name }
+onboarding-benefit-monitor-text = Rebeu notificacions si la vostra informació personal apareix en alguna filtració de dades coneguda.
+onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
+onboarding-benefit-lockwise-text = Gestioneu les contrasenyes de forma segura i portàtil.
+
+## Custom Return To AMO onboarding strings
+
+return-to-amo-subtitle = Molt bé, teniu el { -brand-short-name }
+# <img data-l10n-name="icon"/> will be replaced with the icon belonging to the extension
+#
+# Variables:
+#   $addon-name (String) - Name of the add-on
+return-to-amo-addon-title = Ara, instal·leu l'extensió complement <img data-l10n-name="icon"/><b>{ $addon-name }</b>.
+return-to-amo-add-extension-label = Afig l'extensió
+
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
 
 # The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
@@ -72,8 +129,6 @@
 onboarding-multistage-theme-secondary-button-label = Ara no
 # Automatic theme uses operating system color settings
 onboarding-multistage-theme-label-automatic = Automàtic
-# System refers to the operating system
-onboarding-multistage-theme-description-automatic = Utilitza el tema del sistema
 onboarding-multistage-theme-label-light = Clar
 onboarding-multistage-theme-label-dark = Fosc
 # "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
@@ -85,30 +140,6 @@
 ## tooltip.
 
 # Tooltip displayed on hover of automatic theme
-onboarding-multistage-theme-tooltip-automatic =
-    .title =
-        Hereta l'aparença del sistema operatiu
-        per als botons, menús i finestres.
-    .aria-label = { onboarding-multistage-theme-tooltip-automatic.title }
-# Tooltip displayed on hover of light theme
-onboarding-multistage-theme-tooltip-light =
-    .title =
-        Utilitza una aparença clara per als
-        botons, menús i finestres.
-    .aria-label = { onboarding-multistage-theme-tooltip-light.title }
-# Tooltip displayed on hover of dark theme
-onboarding-multistage-theme-tooltip-dark =
-    .title =
-        Utilitza una aparença fosca per als
-        botons, menús i finestres.
-    .aria-label = { onboarding-multistage-theme-tooltip-dark.title }
-# Tooltip displayed on hover of Alpenglow theme
-onboarding-multistage-theme-tooltip-alpenglow =
-    .title =
-        Utilitza una aparença acolorida per als
-        botons, menús i finestres.
-    .aria-label = { onboarding-multistage-theme-tooltip-alpenglow.title }
-# Tooltip displayed on hover of automatic theme
 onboarding-multistage-theme-tooltip-automatic-2 =
     .title =
         Hereta l'aparença del sistema operatiu
@@ -149,44 +180,6 @@
         Utilitza una aparença acolorida per als
         botons, menús i finestres.
 
-## Welcome full page string
-
-onboarding-fullpage-welcome-subheader = Descobriu tot allò que podeu fer.
-onboarding-fullpage-form-email =
-    .placeholder = La vostra adreça electrònica…
-
-## Firefox Sync modal dialog strings.
-
-onboarding-sync-welcome-header = El vostre { -brand-product-name }, a tot arreu
-onboarding-sync-welcome-content = Accediu a les vostres adreces d'interés, historial, contrasenyes i preferències en tots els vostres dispositius.
-onboarding-sync-welcome-learn-more-link = Més informació sobre els Comptes del Firefox
-onboarding-sync-form-input =
-    .placeholder = Adreça electrònica
-onboarding-sync-form-continue-button = Continua
-onboarding-sync-form-skip-login-button = Omet este pas
-
-## This is part of the line "Enter your email to continue to Firefox Sync"
-
-onboarding-sync-form-header = Introduïu la vostra adreça electrònica
-onboarding-sync-form-sub-header = per continuar al { -sync-brand-name }.
-
-## These are individual benefit messages shown with an image, title and
-## description.
-
-onboarding-benefit-products-text = Milloreu la productivitat amb una família d'eines que respecten la vostra privadesa en tots els dispositius.
-# "Personal Data Promise" is a concept that should be translated consistently
-# across the product. It refers to a concept shown elsewhere to the user: "The
-# Firefox Personal Data Promise is the way we honor your data in everything we
-# make and do. We take less data. We keep it safe. And we make sure that we are
-# transparent about how we use it."
-onboarding-benefit-privacy-text = Tot el que fem respecta la nostra «Promesa sobre les dades personals»: recollir menys dades, mantindre-les segures i sense secrets.
-onboarding-benefit-sync-title = { -sync-brand-short-name }
-onboarding-benefit-sync-text = Accediu a les adreces d'interés, les contrasenyes, l'historial i molt més a tot arreu on utilitzeu el { -brand-product-name }.
-onboarding-benefit-monitor-title = { -monitor-brand-short-name }
-onboarding-benefit-monitor-text = Rebeu notificacions si la vostra informació personal apareix en alguna filtració de dades coneguda.
-onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
-onboarding-benefit-lockwise-text = Gestioneu les contrasenyes de forma segura i portàtil.
-
 ## These strings belong to the individual onboarding messages.
 
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/places.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/places.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/places.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -17,7 +17,6 @@
 places-open-private-window =
     .label = Obri en una finestra privada nova
     .accesskey = p
-
 places-new-bookmark =
     .label = Afig una adreça d'interés…
     .accesskey = d
@@ -30,7 +29,6 @@
 places-new-separator =
     .label = Afig un separador
     .accesskey = s
-
 places-view =
     .label = Visualitza
     .accesskey = V
@@ -49,12 +47,10 @@
 places-by-day-and-site =
     .label = Per data i lloc
     .accesskey = t
-
 places-history-search =
     .placeholder = Cerca en l'historial
 places-bookmarks-search =
     .placeholder = Cerca en les adreces d'interés
-
 places-delete-domain-data =
     .label = Oblida este lloc
     .accesskey = O
@@ -64,3 +60,9 @@
 places-properties =
     .label = Propietats
     .accesskey = i
+# Managed bookmarks are created by an administrator and cannot be changed by the user.
+managed-bookmarks =
+    .label = Adreces d'interés gestionades
+# This label is used when a managed bookmarks folder doesn't have a name.
+managed-bookmarks-subfolder =
+    .label = Subcarpeta
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -10,21 +10,51 @@
 ## These are short descriptions for individual policies, to be displayed
 ## in the documentation section in about:policies.
 
+policy-AppUpdateURL = Defineix un URL personalitzat d'actualització de l'aplicació.
 policy-BlockAboutAddons = Bloca l'accés al gestor de complements (about:addons).
-
 policy-BlockAboutConfig = Bloca l'accés a la pàgina about:config.
-
 policy-BlockAboutProfiles = Bloca l'accés a la pàgina about:profiles.
-
 policy-BlockAboutSupport = Bloca l'accés a la pàgina about:support.
-
+policy-Bookmarks = Crea adreces d'interés a la barra d'adreces d'interés, al menú d'adreces d'interés o a la carpeta especificada.
+policy-CaptivePortal = Activa o desactiva la funcionalitat de portal captiu.
+policy-Cookies = Permet o denega que els llocs web definisquen galetes.
+policy-DisabledCiphers = Desactiva els xifratges.
+policy-DefaultDownloadDirectory = Defineix el directori de baixades per defecte.
+policy-DisableAppUpdate = Evita que el navegador s’actualitze.
+policy-DisableBuiltinPDFViewer = Desactiva el PDF.js, el visor de PDF incorporat en el { -brand-short-name }.
 policy-DisableDeveloperTools = Bloca l'accés a les eines per a desenvolupadors.
+policy-DisableFirefoxAccounts = Desactiva els serveis basats en el { -fxaccount-brand-name }, que inclou el Sync.
+# Firefox Screenshots is the name of the feature, and should not be translated.
+policy-DisableFirefoxScreenshots = Desactiva la funció de captures de pantalla del Firefox Screenshots.
+policy-DisableFirefoxStudies = Impedeix que el { -brand-short-name } execute estudis.
+policy-DisableForgetButton = Evita l'accés al botó Oblida.
+policy-DisableFormHistory = No recorda l'historial de cerca ni de formularis.
+policy-DisableMasterPasswordCreation = Si és cert, no es pot crear una contrasenya mestra.
+policy-DisablePrimaryPasswordCreation = Si és cert, no es pot crear una contrasenya principal.
+policy-DisablePocket = Desactiva la funció de guardar llocs web al Pocket.
+policy-DisablePrivateBrowsing = Desactiva la navegació privada.
+policy-DisableTelemetry = Desactiva la telemetria.
+policy-DNSOverHTTPS = Configura DNS sobre HTTPS.
+policy-DownloadDirectory = Defineix i bloca el directori de baixades.
+policy-ExtensionUpdate = Activa o desactiva les actualitzacions automàtiques de les extensions.
+policy-FirefoxHome = Configura el Firefox Home.
+policy-FlashPlugin = Permet o denega l'ús del connector Flash.
+policy-HardwareAcceleration = Si és fals, desactiva l'acceleració de maquinari.
+# “lock� means that the user won’t be able to change this setting
+policy-Homepage = Defineix i, opcionalment, bloca la pàgina d'inici.
+policy-InstallAddonsPermission = Permet que determinats llocs web instal·len complements.
 
 ## Do not translate "SameSite", it's the name of a cookie attribute.
 
+
 ##
 
+policy-LocalFileLinks = Permetre que llocs web específics enllacin a fitxers locals.
+policy-MasterPassword = Requerir o impedir l'ús d'una contrasenya mestra.
+policy-PrimaryPassword = Requerir o impedir l'ús d'una contrasenya principal.
+policy-Proxy = Configura els paràmetres del servidor intermediari.
+policy-SearchSuggestEnabled = Activa o desactiva els suggeriments de cerca.
+# For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
+policy-SecurityDevices = Instal·la mòduls PKCS #11.
 policy-SSLVersionMax = Defineix la versió màxima de SSL.
-
 policy-SSLVersionMin = Defineix la versió mínima de SSL.
-
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/addEngine.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/addEngine.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/addEngine.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/addEngine.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -1,3 +1,16 @@
 # 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/.
+
+add-engine-window =
+    .title = Afig un motor de cerca
+    .style = width: 32em;
+add-engine-button = Afig un motor personalitzat
+add-engine-name = Nom del motor de cerca
+add-engine-alias = Àlies
+add-engine-url = URL del motor. Utilitzeu %s en lloc del terme de cerca
+add-engine-dialog =
+    .buttonlabelaccept = Afig el motor
+    .buttonaccesskeyaccept = A
+engine-name-exists = Ja existeix un motor amb este nom.
+engine-alias-exists = Ja existeix un motor amb este àlies.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/fxaPairDevice.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/fxaPairDevice.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/fxaPairDevice.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/fxaPairDevice.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -5,11 +5,11 @@
 fxa-pair-device-dialog =
     .title = Connecta un altre dispositiu
     .style = width: 26em; min-height: 35em;
-
 fxa-qrcode-heading-phase1 = 1. Si encara no ho heu fet, instal·leu el <a data-l10n-name="connect-another-device">Firefox en el vostre dispositiu mòbil</a>.
-
 fxa-qrcode-heading-phase2 = 2. A continuació, inicieu la sessió al { -sync-brand-short-name } o, en l'Android, escanegeu el codi d'aparellament des dels paràmetres del { -sync-brand-short-name }.
-
+fxa-qrcode-heading-step1 = 1. Si encara no ho heu fet, instal·leu el <a data-l10n-name="connect-another-device">Firefox en el vostre dispositiu mòbil</a>.
+fxa-qrcode-heading-step2 = 2. Obriu el Firefox en el dispositiu mòbil.
+fxa-qrcode-heading-step3 = 3. Obriu el <b>menú</b> (<img data-l10n-name="ios-menu-icon"/> o <img data-l10n-name="android-menu-icon"/>), toqueu <img data-l10n-name="settings-icon"/><b>Paràmetres</b> i trieu <b>Activa la sincronització</b>
+fxa-qrcode-heading-step4 = 4. Escanegeu este codi:
 fxa-qrcode-error-title = Aparellament incorrecte.
-
 fxa-qrcode-error-body = Torneu-ho a provar.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/preferences/preferences.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -8,13 +8,11 @@
     .label = Només si el { -brand-short-name } està configurat per blocar els elements de seguiment coneguts
 do-not-track-option-always =
     .label = Sempre
-
 pref-page-title =
     { PLATFORM() ->
         [windows] Opcions
        *[other] Preferències
     }
-
 # This is used to determine the width of the search field in about:preferences,
 # in order to make the entire placeholder string visible
 #
@@ -30,42 +28,37 @@
             [windows] Cerca en les opcions
            *[other] Cerca en les preferències
         }
-
 managed-notice = El navegador està gestionat per la vostra organització.
-
+category-list =
+    .aria-label = Categories
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
-
 pane-home-title = Inici
 category-home =
     .tooltiptext = { pane-home-title }
-
 pane-search-title = Cerca
 category-search =
     .tooltiptext = { pane-search-title }
-
 pane-privacy-title = Privadesa i seguretat
 category-privacy =
     .tooltiptext = { pane-privacy-title }
-
 pane-sync-title2 = { -sync-brand-short-name }
 category-sync2 =
     .tooltiptext = { pane-sync-title2 }
-
 pane-experimental-title = Experiments del { -brand-short-name }
 category-experimental =
     .tooltiptext = Experiments del { -brand-short-name }
 pane-experimental-subtitle = Aneu amb compte
 pane-experimental-search-results-header = Experiments del { -brand-short-name }: Aneu amb compte
 pane-experimental-description = La modificació de les preferències avançades de configuració pot afectar el rendiment o la seguretat del { -brand-short-name }.
-
+pane-experimental-reset =
+    .label = Restaura els valors per defecte
+    .accesskey = R
 help-button-label = Assistència del { -brand-short-name }
 addons-button-label = Extensions i temes
-
 focus-search =
     .key = f
-
 close-button =
     .aria-label = Tanca
 
@@ -91,31 +84,27 @@
 # This string is shown to notify the user that their home page
 # is being controlled by an extension.
 extension-controlled-homepage-override = L'extensió «<img data-l10n-name="icon"/> { $name }» controla la vostra pàgina d'inici.
-
 # This string is shown to notify the user that their new tab page
 # is being controlled by an extension.
 extension-controlled-new-tab-url = L'extensió «<img data-l10n-name="icon"/> { $name }» controla la vostra pàgina de pestanya nova.
-
+# This string is shown to notify the user that the password manager setting
+# is being controlled by an extension
+extension-controlled-password-saving = Una extensió, <img data-l10n-name="icon"/> { $name }, controla este paràmetre.
 # This string is shown to notify the user that their notifications permission
 # is being controlled by an extension.
 extension-controlled-web-notifications = Una extensió, <img data-l10n-name="icon"/> { $name }, controla este paràmetre.
-
 # This string is shown to notify the user that the default search engine
 # is being controlled by an extension.
 extension-controlled-default-search = L'extensió «<img data-l10n-name="icon"/> { $name }» ha definit el vostre motor de cerca per defecte.
-
 # This string is shown to notify the user that Container Tabs
 # are being enabled by an extension.
 extension-controlled-privacy-containers = L'extensió «<img data-l10n-name="icon"/> { $name }» requereix pestanyes de contenidor.
-
 # This string is shown to notify the user that their content blocking "All Detected Trackers"
 # preferences are being controlled by an extension.
 extension-controlled-websites-content-blocking-all-trackers = Una extensió,  <img data-l10n-name="icon"/> { $name }, està controlant este paràmetre.
-
 # This string is shown to notify the user that their proxy configuration preferences
 # are being controlled by an extension.
 extension-controlled-proxy-config = L'extensió «<img data-l10n-name="icon"/> { $name }» controla la forma com el { -brand-short-name } es connecta a Internet.
-
 # This string is shown after the user disables an extension to notify the user
 # how to enable an extension that they disabled.
 #
@@ -126,20 +115,17 @@
 ## Preferences UI Search Results
 
 search-results-header = Resultats de la cerca
-
 # `<span data-l10n-name="query"></span>` will be replaced by the search term.
 search-results-empty-message =
     { PLATFORM() ->
         [windows] No s'ha trobat «<span data-l10n-name="query"></span>» a les opcions.
        *[other] No s'ha trobat «<span data-l10n-name="query"></span>» a les preferències.
     }
-
 search-results-help-link = Necessiteu ajuda? Visiteu l'<a data-l10n-name="url">assistència del { -brand-short-name }</a>
 
 ## General Section
 
 startup-header = Inici
-
 # { -brand-short-name } will be 'Firefox Developer Edition',
 # since this setting is only exposed in Firefox Developer Edition
 separate-profile-mode =
@@ -147,80 +133,60 @@
 use-firefox-sync = Consell: Esta funcionalitat utilitza perfils separats. Utilitzeu el { -sync-brand-short-name } per sincronitzar dades entre ells.
 get-started-not-logged-in = Inicia la sessió al { -sync-brand-short-name }…
 get-started-configured = Obri les preferències del { -sync-brand-short-name }
-
 always-check-default =
     .label = Comprova sempre si el { -brand-short-name } és el navegador per defecte
     .accesskey = o
-
 is-default = Actualment el { -brand-short-name } és el navegador per defecte
 is-not-default = El { -brand-short-name } no és el navegador per defecte
-
 set-as-my-default-browser =
     .label = Fes que siga el navegador per defecte…
     .accesskey = d
-
 startup-restore-previous-session =
     .label = Restaura la sessió anterior
     .accesskey = s
-
 startup-restore-warn-on-quit =
     .label = Avisa en eixir del navegador
-
 disable-extension =
     .label = Inhabilita l'extensió
-
 tabs-group-header = Pestanyes
-
 ctrl-tab-recently-used-order =
     .label = Ctrl+Tab canvia de pestanya en orde d'ús recent
     .accesskey = T
-
 open-new-link-as-tabs =
     .label = Obri els enllaços en pestanyes en lloc de finestres noves
     .accesskey = t
-
 warn-on-close-multiple-tabs =
     .label = Avisa en tancar diverses pestanyes
     .accesskey = d
-
 warn-on-open-many-tabs =
     .label = Avisa quan el fet d'obrir moltes pestanyes puga alentir el { -brand-short-name }
     .accesskey = o
-
 switch-links-to-new-tabs =
     .label = En obrir un enllaç en una pestanya nova, vés-hi immediatament
     .accesskey = b
-
 show-tabs-in-taskbar =
     .label = Mostra les previsualitzacions de les pestanyes a la barra de tasques del Windows
     .accesskey = q
-
 browser-containers-enabled =
     .label = Habilita les pestanyes de contenidor
     .accesskey = H
-
 browser-containers-learn-more = Més informació
-
 browser-containers-settings =
     .label = Paràmetres…
     .accesskey = t
-
 containers-disable-alert-title = Voleu tancar totes les pestanyes de contenidor?
 containers-disable-alert-desc =
     { $tabCount ->
         [one] Si desactiveu les pestanyes de contenidor ara, es tancarà { $tabCount } pestanya de contenidor. Segur que voleu desactivar les pestanyes de contenidor?
        *[other] Si desactiveu les pestanyes de contenidor ara, es tancaran { $tabCount } pestanyes de contenidor. Segur que voleu desactivar les pestanyes de contenidor?
     }
-
 containers-disable-alert-ok-button =
     { $tabCount ->
         [one] Tanca { $tabCount } pestanya de contenidor
        *[other] Tanca { $tabCount } pestanyes de contenidor
     }
 containers-disable-alert-cancel-button = Mantén activades
-
 containers-remove-alert-title = Voleu eliminar este contenidor?
-
 # Variables:
 #   $count (Number) - Number of tabs that will be closed.
 containers-remove-alert-msg =
@@ -228,75 +194,56 @@
         [one] Si elimineu aquest contenidor ara, es tancarà { $count } pestanya de contenidor. Segur que voleu eliminar aquest contenidor?
        *[other] Si elimineu aquest contenidor ara, es tancaran { $count } pestanyes de contenidor. Segur que voleu eliminar aquest contenidor?
     }
-
 containers-remove-ok-button = Elimina este contenidor
 containers-remove-cancel-button = No eliminis este contenidor
 
-
 ## General Section - Language & Appearance
 
 language-and-appearance-header = Llengua i aparença
-
 fonts-and-colors-header = Tipus de lletra i colors
-
 default-font = Tipus de lletra per defecte
     .accesskey = d
 default-font-size = Mida:
     .accesskey = M
-
 advanced-fonts =
     .label = Avançat…
     .accesskey = v
-
 colors-settings =
     .label = Colors…
     .accesskey = C
-
 # Zoom is a noun, and the message is used as header for a group of options
 preferences-zoom-header = Zoom
-
 preferences-default-zoom = Zoom per defecte
     .accesskey = Z
-
 preferences-default-zoom-value =
     .label = { $percentage }%
-
 preferences-zoom-text-only =
     .label = Amplia només el text
     .accesskey = t
-
 language-header = Llengua
-
 choose-language-description = Trieu la llengua en què es mostraran preferentment les pàgines
-
 choose-button =
     .label = Trieu…
     .accesskey = T
-
 choose-browser-language-description = Trieu la llengua en què es mostraran els menús, els missatges i les notificacions del { -brand-short-name }.
 manage-browser-languages-button =
     .label = Defineix alternatives…
     .accesskey = l
 confirm-browser-language-change-description = Reinicieu el { -brand-short-name } per aplicar estos canvis
 confirm-browser-language-change-button = Aplica i reinicia
-
 translate-web-pages =
     .label = Tradueix el contingut web
     .accesskey = T
-
 # The <img> element is replaced by the logo of the provider
 # used to provide machine translations for web pages.
 translate-attribution = Traducció feta per <img data-l10n-name="logo"/>
-
 translate-exceptions =
     .label = Excepcions…
     .accesskey = x
-
 # Variables:
 #    $localeName (string) - Localized name of the locale to be used.
 use-system-locale =
     .label = Utilitza els paràmetres del sistema operatiu de «{ $localeName }» per formatar dates, hores, nombres i mesures.
-
 check-user-spelling =
     .label = Verifica l'ortografia a mesura que s'escriu
     .accesskey = o
@@ -304,13 +251,10 @@
 ## General Section - Files and Applications
 
 files-and-applications-title = Fitxers i aplicacions
-
 download-header = Baixades
-
 download-save-to =
     .label = Guarda els fitxers a
     .accesskey = s
-
 download-choose-folder =
     .label =
         { PLATFORM() ->
@@ -322,42 +266,32 @@
             [macos] e
            *[other] v
         }
-
 download-always-ask-where =
     .label = Demana sempre on guardar els fitxers
     .accesskey = a
-
 applications-header = Aplicacions
-
 applications-description = Trieu com voleu que el { -brand-short-name } tracti els fitxers que baixeu del web o les aplicacions que utilitzeu mentre navegueu.
-
 applications-filter =
     .placeholder = Cerca tipus de fitxers o aplicacions
-
 applications-type-column =
     .label = Tipus de contingut
     .accesskey = T
-
 applications-action-column =
     .label = Acció
     .accesskey = A
-
 # Variables:
 #   $extension (String) - file extension (e.g .TXT)
 applications-file-ending = fitxer { $extension }
 applications-action-save =
     .label = Guarda el fitxer
-
 # Variables:
 #   $app-name (String) - Name of an application (e.g Adobe Acrobat)
 applications-use-app =
     .label = Utilitza { $app-name }
-
 # Variables:
 #   $app-name (String) - Name of an application (e.g Adobe Acrobat)
 applications-use-app-default =
     .label = Utilitza { $app-name } (per defecte)
-
 applications-use-os-default =
     .label =
         { PLATFORM() ->
@@ -365,31 +299,25 @@
             [windows] Utilitza l'aplicació per defecte del Windows
            *[other] Utilitza l'aplicació per defecte del sistema
         }
-
 applications-use-other =
     .label = Utilitza una altra aplicació…
 applications-select-helper = Seleccioneu l'aplicació auxiliar
-
 applications-manage-app =
     .label = Detalls de l'aplicació…
 applications-always-ask =
     .label = Demana-m'ho sempre
 applications-type-pdf = PDF (Format de Document Portàtil)
-
 # Variables:
 #   $type (String) - the MIME type (e.g application/binary)
 applications-type-pdf-with-type = { applications-type-pdf } ({ $type })
-
 # Variables:
 #   $type-description (String) - Description of the type (e.g "Portable Document Format")
 #   $type (String) - the MIME type (e.g application/binary)
 applications-type-description-with-type = { $type-description } ({ $type })
-
 # Variables:
 #   $extension (String) - file extension (e.g .TXT)
 #   $type (String) - the MIME type (e.g application/binary)
 applications-file-ending-with-type = { applications-file-ending } ({ $type })
-
 # Variables:
 #   $plugin-name (String) - Name of a plugin (e.g Adobe Flash)
 applications-use-plugin-in =
@@ -403,70 +331,49 @@
 
 applications-use-plugin-in-label =
     .value = { applications-use-plugin-in.label }
-
 applications-action-save-label =
     .value = { applications-action-save.label }
-
 applications-use-app-label =
     .value = { applications-use-app.label }
-
 applications-open-inapp-label =
     .value = { applications-open-inapp.label }
-
 applications-always-ask-label =
     .value = { applications-always-ask.label }
-
 applications-use-app-default-label =
     .value = { applications-use-app-default.label }
-
 applications-use-other-label =
     .value = { applications-use-other.label }
-
 applications-use-os-default-label =
     .value = { applications-use-os-default.label }
 
 ##
 
 drm-content-header = Contingut DRM (Digital Rights Management, Gestió de drets digitals)
-
 play-drm-content =
     .label = Reprodueix contingut controlat per DRM
     .accesskey = p
-
 play-drm-content-learn-more = Més informació
-
 update-application-title = Actualitzacions del { -brand-short-name }
-
 update-application-description = Manteniu el { -brand-short-name } actualitzat per obtindre el millor rendiment, estabilitat i seguretat.
-
 update-application-version = Versió { $version } <a data-l10n-name="learn-more">Novetats</a>
-
 update-history =
     .label = Mostra l'historial d'actualitzacions…
     .accesskey = h
-
 update-application-allow-description = Actualitzacions del { -brand-short-name }
-
 update-application-auto =
     .label = Instal·la les actualitzacions automàticament (recomanat)
     .accesskey = a
-
 update-application-check-choose =
     .label = Cerca actualitzacions, però demana'm si vull instal·lar-les
     .accesskey = C
-
 update-application-manual =
     .label = No cerques mai actualitzacions (no recomanat)
     .accesskey = N
-
 update-application-warning-cross-user-setting = Este paràmetre s'aplicarà a tots els comptes del Windows i perfils del { -brand-short-name } que utilitzen esta instal·lació del { -brand-short-name }.
-
 update-application-use-service =
     .label = Instal·la les actualitzacions en segon pla
     .accesskey = s
-
 update-setting-write-failure-title = Error en guardar les preferències d'actualització
-
 # Variables:
 #   $path (String) - Path to the configuration file
 # The newlines between the main text and the line containing the path is
@@ -475,11 +382,8 @@
     El { -brand-short-name } ha trobat un error i no ha desat aquest canvi. Tingueu en compte que, per definir aquesta preferència d'actualització, necessiteu permís per escriure al fitxer següent. Podeu resoldre l’error, o un administrador del sistema, concedint al grup «Usuaris» el control total d'aquest fitxer.
     
     No s'ha pogut escriure al fitxer: { $path }
-
 update-in-progress-title = Actualització en curs
-
 update-in-progress-message = Voleu que el { -brand-short-name } continue amb esta actualització?
-
 update-in-progress-ok-button = &Descarta
 # Continue is the cancel button so pressing escape or using a platform standard
 # method of closing the UI will not discard the update.
@@ -488,25 +392,18 @@
 ## General Section - Performance
 
 performance-title = Rendiment
-
 performance-use-recommended-settings-checkbox =
     .label = Utilitza els paràmetres de rendiment recomanats
     .accesskey = U
-
 performance-use-recommended-settings-desc = Estos paràmetres estan personalitzats per al maquinari i sistema operatiu del vostre ordinador.
-
 performance-settings-learn-more = Més informació
-
 performance-allow-hw-accel =
     .label = Utilitza l'acceleració de maquinari quan siga disponible
     .accesskey = r
-
 performance-limit-content-process-option = Límit de processos de contingut
     .accesskey = L
-
 performance-limit-content-process-enabled-desc = Més processos de contingut poden millorar el rendiment quan utilitzeu diverses pestanyes, però també utilitzaran més memòria.
 performance-limit-content-process-blocked-desc = El nombre de processos de contingut només es pot modificar amb el { -brand-short-name } multiprocés. <a data-l10n-name="learn-more">Més informació sobre com comprovar si el multiprocés està activat.</a>
-
 # Variables:
 #   $num - default value of the `dom.ipc.processCount` pref.
 performance-default-content-process-count =
@@ -515,50 +412,39 @@
 ## General Section - Browsing
 
 browsing-title = Navegació
-
 browsing-use-autoscroll =
     .label = Utilitza el desplaçament automàtic
     .accesskey = a
-
 browsing-use-smooth-scrolling =
     .label = Utilitza el desplaçament suau
     .accesskey = s
-
 browsing-use-onscreen-keyboard =
     .label = Mostra un teclat tàctil quan calga
     .accesskey = M
-
 browsing-use-cursor-navigation =
     .label = Utilitza sempre les tecles de cursor per navegar en les pàgines
     .accesskey = c
-
 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-media-control-learn-more = Més informació
 browsing-cfr-recommendations =
     .label = Recomana extensions durant la navegació
     .accesskey = R
 browsing-cfr-features =
     .label = Recomana funcions durant la navegació
     .accesskey = f
-
 browsing-cfr-recommendations-learn-more = Més informació
 
 ## General Section - Proxy
 
 network-settings-title = Paràmetres de xarxa
-
 network-proxy-connection-description = Configureu com el { -brand-short-name } es connecta a Internet.
-
 network-proxy-connection-learn-more = Més informació
-
 network-proxy-connection-settings =
     .label = Paràmetres…
     .accesskey = P
@@ -566,33 +452,25 @@
 ## Home Section
 
 home-new-windows-tabs-header = Finestres i pestanyes noves
-
 home-new-windows-tabs-description2 = Trieu què voleu veure en obrir la pàgina d'inici, finestres noves i pestanyes noves.
 
 ## Home Section - Home Page Customization
 
 home-homepage-mode-label = Pàgina d'inici i finestres noves
-
 home-newtabs-mode-label = Pestanyes noves
-
 home-restore-defaults =
     .label = Restaura els valors per defecte
     .accesskey = R
-
 # "Firefox" should be treated as a brand and kept in English,
 # while "Home" and "(Default)" can be localized.
 home-mode-choice-default =
     .label = Inici del Firefox (per defecte)
-
 home-mode-choice-custom =
     .label = URL personalitzats…
-
 home-mode-choice-blank =
     .label = Pàgina en blanc
-
 home-homepage-custom-url =
     .placeholder = Apegueu un URL…
-
 # This string has a special case for '1' and [other] (default). If necessary for
 # your language, you can add {$tabCount} to your translations and use the
 # standard CLDR forms, or only use the form for [other] if both strings should
@@ -604,7 +482,6 @@
            *[other] Utilitza les pàgines actuals
         }
     .accesskey = c
-
 choose-bookmark =
     .label = Utilitza una adreça d'interés…
     .accesskey = z
@@ -613,12 +490,13 @@
 
 home-prefs-content-header = Contingut d'inici del Firefox
 home-prefs-content-description = Trieu el contingut que voleu a la pantalla d'inici del Firefox.
-
 home-prefs-search-header =
     .label = Cerca web
 home-prefs-topsites-header =
     .label = Llocs principals
 home-prefs-topsites-description = Els llocs que visiteu més sovint
+home-prefs-topsites-by-option-sponsored =
+    .label = Llocs principals patrocinats
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -632,9 +510,10 @@
 home-prefs-recommended-by-learn-more = Com funciona
 home-prefs-recommended-by-option-sponsored-stories =
     .label = Articles patrocinats
-
 home-prefs-highlights-header =
     .label = Destacats
+home-prefs-recent-activity-header =
+    .label = Activitat recent
 home-prefs-highlights-description = Una selecció dels llocs que heu guardat o visitat
 home-prefs-highlights-option-visited-pages =
     .label = Pàgines visitades
@@ -644,7 +523,6 @@
     .label = Baixada més recent
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pàgines guardades al { -pocket-brand-name }
-
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -666,25 +544,20 @@
     .label = Utilitza la barra d'adreces per cercar i navegar
 search-bar-shown =
     .label = Afig la barra de cerca a la barra d'eines
-
 search-engine-default-header = Motor de cerca per defecte
 search-engine-default-desc-2 = Este és el motor de cerca per defecte en la barra d’adreces i en la barra de cerca. Podeu canviar-lo en qualsevol moment.
 search-engine-default-private-desc-2 = Trieu un altre motor de cerca per defecte només per a les finestres privades
 search-separate-default-engine =
     .label = Utilitza este motor de cerca en les finestres privades
     .accesskey = U
-
 search-suggestions-header = Suggeriments de cerca
 search-suggestions-desc = Trieu com voleu que es mostren els suggeriments dels motors de cerca.
-
 search-suggestions-option =
     .label = Mostra suggeriments de cerca
     .accesskey = s
-
 search-show-suggestions-url-bar-option =
     .label = Mostra suggeriments de cerca als resultats de la barra d'adreces
     .accesskey = l
-
 # This string describes what the user will observe when the system
 # prioritizes search suggestions over browsing history in the results
 # that extend down from the address bar. In the original English string,
@@ -692,33 +565,27 @@
 # (appearing before).
 search-show-suggestions-above-history-option =
     .label = En els resultats de la barra d'adreces, mostra els suggeriments de cerca abans de l'historial de navegació
-
 search-show-suggestions-private-windows =
     .label = Mostra suggeriments de cerca en les finestres privades
-
 suggestions-addressbar-settings-generic = Canvia les preferències d'altres suggeriments de la barra d'adreces
-
 search-suggestions-cant-show = No es mostraran suggeriments de cerca als resultats de la barra d'ubicació perquè heu configurat el { -brand-short-name } per tal que no recorde mai l'historial.
-
 search-one-click-header = Motors de cerca amb un sol clic
-
+search-one-click-header2 = Dreceres de cerca
 search-one-click-desc = Trieu els motors de cerca alternatius que es mostraran sota la barra d'adreces i de cerca en començar a escriure una paraula.
-
 search-choose-engine-column =
     .label = Motor de cerca
 search-choose-keyword-column =
     .label = Paraula clau
-
 search-restore-default =
     .label = Restaura els motors de cerca per defecte
     .accesskey = R
-
 search-remove-engine =
     .label = Elimina
     .accesskey = E
-
+search-add-engine =
+    .label = Afig
+    .accesskey = A
 search-find-more-link = Afegiu més motors de cerca
-
 # This warning is displayed when the chosen keyword is already in use
 # ('Duplicate' is an adjective)
 search-keyword-warning-title = Duplica la paraula clau
@@ -739,29 +606,22 @@
 containers-add-button =
     .label = Afig un contenidor nou
     .accesskey = A
-
 containers-new-tab-check =
     .label = Selecciona un contenidor per a cada pestanya nova
     .accesskey = S
-
 containers-preferences-button =
     .label = Preferències
 containers-remove-button =
     .label = Elimina
 
-## Sync Section - Signed out
-
-
 ## Firefox Account - Signed out. Note that "Sync" and "Firefox Account" are now
 ## more discrete ("signed in" no longer means "and sync is connected").
 
 sync-signedout-caption = El vostre web a tot arreu
 sync-signedout-description = Sincronitzeu les vostres adreces d'interés, historial, pestanyes, contrasenyes, complements i preferències en tots els vostres dispositius.
-
 sync-signedout-account-signin2 =
     .label = Inicia la sessió al { -sync-brand-short-name }…
     .accesskey = I
-
 # This message contains two links and two icon images.
 #   `<img data-l10n-name="android-icon"/>` - Android logo icon
 #   `<a data-l10n-name="android-link">` - Link to Android Download
@@ -772,32 +632,23 @@
 # to your language, but should not be changed or translated.
 sync-mobile-promo = Baixeu el Firefox per a l'<img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> o per a l'<img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> per sincronitzar amb el vostre dispositiu mòbil.
 
-## Sync Section - Signed in
-
-
 ## Firefox Account - Signed in
 
 sync-profile-picture =
     .tooltiptext = Canvia la imatge de perfil
-
 sync-sign-out =
     .label = Tanca la sessió…
     .accesskey = T
-
 sync-manage-account = Gestiona el compte
     .accesskey = a
-
 sync-signedin-unverified = { $email } no està verificat.
 sync-signedin-login-failure = Inicieu la sessió per tornar-vos a connectar { $email }
-
 sync-resend-verification =
     .label = Torna a enviar la verificació
     .accesskey = v
-
 sync-remove-account =
     .label = Elimina el compte
     .accesskey = E
-
 sync-sign-in =
     .label = Inicia la sessió
     .accesskey = I
@@ -805,15 +656,11 @@
 ## Sync section - enabling or disabling sync.
 
 prefs-syncing-on = Sincronització: ACTIVADA
-
 prefs-syncing-off = Sincronització: DESACTIVADA
-
 prefs-sync-setup =
     .label = Configura el { -sync-brand-short-name }…
     .accesskey = C
-
 prefs-sync-offer-setup-label = Sincronitzeu les vostres adreces d'interés, historial, pestanyes, contrasenyes, complements i preferències en tots els vostres dispositius.
-
 prefs-sync-now =
     .labelnotsyncing = Sincronitza ara
     .accesskeynotsyncing = S
@@ -822,7 +669,6 @@
 ## The list of things currently syncing.
 
 sync-currently-syncing-heading = Actualment se sincronitzen estos elements:
-
 sync-currently-syncing-bookmarks = Adreces d'interés
 sync-currently-syncing-history = Historial
 sync-currently-syncing-tabs = Pestanyes obertes
@@ -835,7 +681,6 @@
         [windows] Opcions
        *[other] Preferències
     }
-
 sync-change-options =
     .label = Canvia…
     .accesskey = C
@@ -849,40 +694,32 @@
     .buttonaccesskeyaccept = c
     .buttonlabelextra2 = Desconnecta…
     .buttonaccesskeyextra2 = D
-
 sync-engine-bookmarks =
     .label = Adreces d'interés
     .accesskey = d
-
 sync-engine-history =
     .label = Historial
     .accesskey = r
-
 sync-engine-tabs =
     .label = Pestanyes obertes
     .tooltiptext = Una llista d'allò que està obert en tots els dispositius sincronitzats
     .accesskey = T
-
 sync-engine-logins-passwords =
     .label = Inicis de sessió i contrasenyes
     .tooltiptext = Noms d'usuari i contrasenyes que heu guardat
     .accesskey = I
-
 sync-engine-addresses =
     .label = Adreces
     .tooltiptext = Adreces postals que heu guardat (només a l'ordinador)
     .accesskey = e
-
 sync-engine-creditcards =
     .label = Targetes de crèdit
     .tooltiptext = Noms, números i dates de venciment (només a l'ordinador)
     .accesskey = c
-
 sync-engine-addons =
     .label = Complements
     .tooltiptext = Extensions i temes per al Firefox d'escriptori
     .accesskey = C
-
 sync-engine-prefs =
     .label =
         { PLATFORM() ->
@@ -895,33 +732,26 @@
 ## The device name controls.
 
 sync-device-name-header = Nom del dispositiu
-
 sync-device-name-change =
     .label = Canvia el nom del dispositiu…
     .accesskey = v
-
 sync-device-name-cancel =
     .label = Cancel·la
     .accesskey = n
-
 sync-device-name-save =
     .label = Guarda
     .accesskey = D
-
 sync-connect-another-device = Connecta un altre dispositiu
 
 ## Privacy Section
 
 privacy-header = Privadesa del navegador
 
-## Privacy Section - Forms
-
 ## Privacy Section - Logins and Passwords
 
 # The search keyword isn't shown to users but is used to find relevant settings in about:preferences.
 pane-privacy-logins-and-passwords-header = Inicis de sessió i contrasenyes
     .searchkeywords = { -lockwise-brand-short-name }
-
 # Checkbox to control whether UI is shown to users to save or fill logins/passwords.
 forms-ask-to-save-logins =
     .label = Demana si vull guardar les dades d'inici de sessió i contrasenyes dels llocs web
@@ -936,7 +766,6 @@
     .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ó
-
 # Checkbox which controls filling saved logins into fields automatically when they appear, in some cases without user interaction.
 forms-fill-logins-and-passwords =
     .label = Emplena automàticament inicis de sessió i contrasenyes
@@ -957,7 +786,6 @@
 forms-master-pw-change =
     .label = Canvia la contrasenya mestra…
     .accesskey = m
-
 forms-master-pw-fips-title = Vos trobeu en mode FIPS. El FIPS requereix una contrasenya mestra que no siga buida.
 forms-primary-pw-change =
     .label = Canvia la contrasenya principal…
@@ -966,7 +794,6 @@
 # "Master Password" in your language. If you're editing the FTL file directly,
 # use { "" } as the value.
 forms-primary-pw-former-name = Anteriorment anomenada «Contrasenya mestra»
-
 forms-primary-pw-fips-title = Vos trobeu en mode FIPS. El FIPS requereix una contrasenya principal que no siga buida.
 forms-master-pw-fips-desc = El canvi de contrasenya ha fallat
 
@@ -974,16 +801,13 @@
 
 # This message can be seen by trying to add a Master Password.
 master-password-os-auth-dialog-message-win = Per crear una contrasenya mestra, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
-
 # This message can be seen by trying to add a Master Password.
 # The macOS strings are preceded by the operating system with "Firefox is trying to "
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
 # notes are only valid for English. Please test in your locale.
 master-password-os-auth-dialog-message-macosx = crear una contrasenya mestra
-
 # This message can be seen by trying to add a Primary Password.
 primary-password-os-auth-dialog-message-win = Per crear una contrasenya principal, introduïu les vostres credencials d'inici de sessió al Windows. Això ajuda a protegir la seguretat dels vostres comptes.
-
 # This message can be seen by trying to add a Primary Password.
 # The macOS strings are preceded by the operating system with "Firefox is trying to "
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
@@ -994,7 +818,6 @@
 ## Privacy Section - History
 
 history-header = Historial
-
 # This label is followed, on the same line, by a dropdown list of options
 # (Remember history, etc.).
 # In English it visually creates a full sentence, e.g.
@@ -1006,37 +829,29 @@
 #   - As a stand-alone message, for example "Firefox history settings:".
 history-remember-label = El { -brand-short-name }
     .accesskey = l
-
 history-remember-option-all =
     .label = Recordarà l'historial
 history-remember-option-never =
     .label = No recordarà mai l'historial
 history-remember-option-custom =
     .label = Utilitza els paràmetres personalitzats de l'historial
-
 history-remember-description = El { -brand-short-name } recordarà el vostre historial de navegació, de baixades, de formularis i de cerques.
 history-dontremember-description = El { -brand-short-name } utilitzarà els mateixos paràmetres de la navegació privada, i no conservarà cap historial mentre navegueu.
-
 history-private-browsing-permanent =
     .label = Utilitza sempre el mode de navegació privada
     .accesskey = p
-
 history-remember-browser-option =
     .label = Recorda l'historial de navegació i de baixades
     .accesskey = b
-
 history-remember-search-option =
     .label = Recorda l'historial de cerques i de formularis
     .accesskey = f
-
 history-clear-on-close-option =
     .label = Neteja l'historial quan es tanque el { -brand-short-name }
     .accesskey = q
-
 history-clear-on-close-settings =
     .label = Paràmetres…
     .accesskey = t
-
 history-clear-button =
     .label = Neteja l'historial…
     .accesskey = s
@@ -1044,39 +859,34 @@
 ## Privacy Section - Site Data
 
 sitedata-header = Galetes i dades dels llocs
-
 sitedata-total-size-calculating = S'està calculant la mida de les dades dels llocs i de la memòria cau…
-
 # Variables:
 #   $value (Number) - Value of the unit (for example: 4.6, 500)
 #   $unit (String) - Name of the unit (for example: "bytes", "KB")
 sitedata-total-size = Les galetes, les dades dels llocs i la memòria cau actualment ocupen { $value } { $unit } d'espai de disc.
-
 sitedata-learn-more = Més informació
-
 sitedata-delete-on-close =
     .label = Suprimeix les galetes i les dades dels llocs web en tancar el { -brand-short-name }
     .accesskey = c
-
 sitedata-delete-on-close-private-browsing = En el mode de navegació privada permanent, les galetes i les dades dels llocs s'esborraran sempre en tancar el { -brand-short-name }.
-
 sitedata-allow-cookies-option =
     .label = Accepta les galetes i dades dels llocs web
     .accesskey = A
-
 sitedata-disallow-cookies-option =
     .label = Bloca les galetes i dades dels llocs
     .accesskey = B
-
 # This label means 'type of content that is blocked', and is followed by a drop-down list with content types below.
 # The list items are the strings named sitedata-block-*-option*.
 sitedata-block-desc = Tipus de contingut blocat
     .accesskey = T
-
 sitedata-option-block-cross-site-trackers =
     .label = Elements de seguiment entre llocs
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Elements de seguiment de xarxes socials i entre llocs
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Galetes de seguiment entre llocs (inclou les galetes de xarxes socials)
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Galetes entre llocs (inclou les galetes de xarxes socials)
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Elements de seguiment de xarxes socials i entre llocs, i aïlla les galetes restants
 sitedata-option-block-unvisited =
@@ -1085,19 +895,15 @@
     .label = Totes les galetes de tercers (pot fer que alguns llocs web no funcionen)
 sitedata-option-block-all =
     .label = Totes les galetes (farà que alguns llocs web no funcionen)
-
 sitedata-clear =
     .label = Neteja les dades…
     .accesskey = l
-
 sitedata-settings =
     .label = Gestiona les dades…
     .accesskey = G
-
 sitedata-cookies-permissions =
     .label = Gestiona els permisos…
     .accesskey = p
-
 sitedata-cookies-exceptions =
     .label = Gestiona les excepcions…
     .accesskey = x
@@ -1105,9 +911,7 @@
 ## Privacy Section - Address Bar
 
 addressbar-header = Barra d'adreces
-
 addressbar-suggest = Quan s'utilitze la barra d'adreces, suggereix
-
 addressbar-locbar-history-option =
     .label = Historial de navegació
     .accesskey = H
@@ -1120,15 +924,12 @@
 addressbar-locbar-topsites-option =
     .label = Llocs principals
     .accesskey = L
-
 addressbar-suggestions-settings = Canvia les preferències dels suggeriments de motors de cerca
 
 ## Privacy Section - Content Blocking
 
 content-blocking-enhanced-tracking-protection = Protecció contra el seguiment millorada
-
 content-blocking-section-top-level-description = Hi ha elements que vos fan el seguiment mentre navegueu per recopilar informació sobre els vostres hàbits de navegació i interessos. El { -brand-short-name } bloca molts d'estos elements de seguiment i altres scripts maliciosos.
-
 content-blocking-learn-more = Més informació
 
 ## These strings are used to define the different levels of
@@ -1150,8 +951,8 @@
 content-blocking-etp-standard-desc = Equilibri entre protecció i rendiment. Les pàgines es carregaran amb normalitat.
 content-blocking-etp-strict-desc = Més protecció, però pot fer que alguns llocs o algun contingut no funcionen correctament.
 content-blocking-etp-custom-desc = Trieu quins elements de seguiment i scripts cal blocar.
-
 content-blocking-private-windows = Contingut que fa seguiment en finestres privades
+content-blocking-cross-site-cookies = Galetes entre llocs
 content-blocking-cross-site-tracking-cookies = Galetes de seguiment entre llocs
 content-blocking-cross-site-tracking-cookies-plus-isolate = Galetes de seguiment entre llocs, i aïlla les galetes restants
 content-blocking-social-media-trackers = Elements de seguiment de xarxes socials
@@ -1161,16 +962,14 @@
 content-blocking-all-third-party-cookies = Totes les galetes de tercers
 content-blocking-cryptominers = Miners de criptomonedes
 content-blocking-fingerprinters = Generadors d'empremtes digitals
-
 content-blocking-warning-title = Atenció!
 content-blocking-and-isolating-etp-warning-description = El bloqueig d'elements de seguiment i l'aïllament de galetes pot afectar la funcionalitat d'alguns llocs. Torneu a carregar la pàgina amb els elements de seguiment per carregar-ne tot el contingut.
+content-blocking-and-isolating-etp-warning-description-2 = Este paràmetre pot fer que alguns llocs web no mostren part del contingut o que no funcionen correctament. Si pareix que un lloc no funciona bé, podeu provar de desactivar la protecció contra el seguiment perquè este lloc carregue tot el contingut.
 content-blocking-warning-learn-how = Vegeu com fer-ho
-
 content-blocking-reload-description = Cal tornar a carregar les pestanyes per aplicar estos canvis.
 content-blocking-reload-tabs-button =
     .label = Torna a carregar totes les pestanyes
     .accesskey = r
-
 content-blocking-tracking-content-label =
     .label = Contingut que fa seguiment
     .accesskey = o
@@ -1181,19 +980,15 @@
     .label = Només en finestres privades
     .accesskey = N
 content-blocking-tracking-protection-change-block-list = Canvia la llista de bloquejos
-
 content-blocking-cookies-label =
     .label = Galetes
     .accesskey = G
-
 content-blocking-expand-section =
     .tooltiptext = Més informació
-
 # Cryptomining refers to using scripts on websites that can use a computer’s resources to mine cryptocurrency without a user’s knowledge.
 content-blocking-cryptominers-label =
     .label = Miners de criptomonedes
     .accesskey = M
-
 # Browser fingerprinting is a method of tracking users by the configuration and settings information (their "digital fingerprint")
 # that is visible to websites they browse, rather than traditional tracking methods such as IP addresses and unique cookies.
 content-blocking-fingerprinters-label =
@@ -1209,92 +1004,71 @@
 ## Privacy Section - Permissions
 
 permissions-header = Permisos
-
 permissions-location = Ubicació
 permissions-location-settings =
     .label = Paràmetres…
     .accesskey = t
-
 permissions-xr = Realitat virtual
 permissions-xr-settings =
     .label = Paràmetres…
     .accesskey = t
-
 permissions-camera = Càmera
 permissions-camera-settings =
     .label = Paràmetres…
     .accesskey = t
-
 permissions-microphone = Micròfon
 permissions-microphone-settings =
     .label = Paràmetres…
     .accesskey = t
-
 permissions-notification = Notificacions
 permissions-notification-settings =
     .label = Paràmetres…
     .accesskey = t
 permissions-notification-link = Més informació
-
 permissions-notification-pause =
     .label = Posa en pausa les notificacions fins que es reinicie el { -brand-short-name }
     .accesskey = n
-
 permissions-autoplay = Reproducció automàtica
-
 permissions-autoplay-settings =
     .label = Paràmetres…
     .accesskey = t
-
 permissions-block-popups =
     .label = Bloca les finestres emergents
     .accesskey = B
-
 permissions-block-popups-exceptions =
     .label = Excepcions…
     .accesskey = E
-
 permissions-addon-install-warning =
     .label = Avisa quan els llocs web intenten instal·lar complements
     .accesskey = i
-
 permissions-addon-exceptions =
     .label = Excepcions…
     .accesskey = E
-
 permissions-a11y-privacy-checkbox =
     .label = Impedeix que els serveis d'accessibilitat tinguen accés al navegador
     .accesskey = a
-
 permissions-a11y-privacy-link = Més informació
 
 ## Privacy Section - Data Collection
 
 collection-header = Ús i recollida de dades i del { -brand-short-name }
-
 collection-description = Ens esforcem per oferir-vos opcions i recollir només allò que necessitem per proporcionar i millorar el { -brand-short-name } per a tothom. Sempre demanem permís abans de rebre informació personal.
 collection-privacy-notice = Avís de privadesa
-
 collection-health-report-telemetry-disabled = Ja no permeteu a { -vendor-short-name } capturar dades tècniques i d'interacció. Totes les dades antigues se suprimiran d'ací a 30 dies.
 collection-health-report-telemetry-disabled-link = Més informació
-
 collection-health-report =
     .label = Permet que el { -brand-short-name } envie dades tècniques i d'interacció a { -vendor-short-name }
     .accesskey = r
 collection-health-report-link = Més informació
-
 collection-studies =
     .label = Permet al { -brand-short-name } instal·lar i executar estudis
 collection-studies-link = Mostra els estudis del { -brand-short-name }
-
 addon-recommendations =
     .label = Permet que el { -brand-short-name } faça recomanacions personalitzades d'extensions
 addon-recommendations-link = Més informació
-
 # This message is displayed above disabled data sharing options in developer builds
 # or builds with no Telemetry support available.
 collection-health-report-disabled = L'informe de dades està desactivat en la configuració d'esta versió
-
 collection-backlogged-crash-reports =
     .label = Permet que el { -brand-short-name } envie els informes de fallada pendents automàticament
     .accesskey = f
@@ -1306,18 +1080,14 @@
 ## https://developers.google.com/safe-browsing/developers_guide_v2#AcceptableUsage
 
 security-header = Seguretat
-
 security-browsing-protection = Protecció contra contingut enganyós i programari perillós
-
 security-enable-safe-browsing =
     .label = Bloca el contingut enganyós i perillós
     .accesskey = B
 security-enable-safe-browsing-link = Més informació
-
 security-block-downloads =
     .label = Bloca les baixades perilloses
     .accesskey = l
-
 security-block-uncommon-software =
     .label = Avisa en baixar programari indesitjable i poc habitual
     .accesskey = c
@@ -1325,33 +1095,25 @@
 ## Privacy Section - Certificates
 
 certs-header = Certificats
-
 certs-personal-label = Quan un servidor demane el meu certificat personal
-
 certs-select-auto-option =
     .label = Selecciona'n un automàticament
     .accesskey = S
-
 certs-select-ask-option =
     .label = Demana-ho cada vegada
     .accesskey = D
-
 certs-enable-ocsp =
     .label = Consulta els servidors de resposta OCSP per confirmar la validesa actual dels certificats
     .accesskey = C
-
 certs-view =
     .label = Mostra els certificats…
     .accesskey = c
-
 certs-devices =
     .label = Dispositius de seguretat…
     .accesskey = D
-
 space-alert-learn-more-button =
     .label = Més informació
     .accesskey = M
-
 space-alert-over-5gb-pref-button =
     .label =
         { PLATFORM() ->
@@ -1363,33 +1125,25 @@
             [windows] O
            *[other] O
         }
-
 space-alert-over-5gb-message =
     { PLATFORM() ->
         [windows] El { -brand-short-name } s'està quedant sense espai de disc. És possible que el contingut dels llocs web no es mostri correctament. Podeu esborrar les dades emmagatzemades dels llocs a «Opcions > Privadesa i seguretat > Galetes i dades dels llocs».
        *[other] El { -brand-short-name } s'està quedant sense espai de disc. És possible que el contingut dels llocs web no es mostri correctament. Podeu esborrar les dades emmagatzemades dels llocs a «Preferències > Privadesa i seguretat > Galetes i dades dels llocs».
     }
-
 space-alert-under-5gb-ok-button =
     .label = Entesos
     .accesskey = n
-
 space-alert-under-5gb-message = El { -brand-short-name } s'està quedant sense espai de disc. És possible que el contingut dels llocs web no es mostre correctament. Vegeu «Més informació» per optimitzar l'ús de disc i millorar l'experiència de navegació.
 
 ## Privacy Section - HTTPS-Only
 
 httpsonly-header = Mode només HTTPS
-
 httpsonly-description = HTTPS garanteix una connexió xifrada i segura entre el { -brand-short-name } i els llocs web que visiteu. La majoria dels llocs web admeten HTTPS; per tant, si el Mode només HTTPS està activat, el { -brand-short-name } utilitzarà HTTPS en totes les connexions.
-
 httpsonly-learn-more = Més informació
-
 httpsonly-radio-enabled =
-    .label = Activa el node només HTTPS en totes les finestres
-
+    .label = Activa el mode només HTTPS en totes les finestres
 httpsonly-radio-enabled-pbm =
     .label = Activa el mode només HTTPS únicament en les finestres privades
-
 httpsonly-radio-disabled =
     .label = No activis el mode només HTTPS
 
@@ -1398,7 +1152,6 @@
 desktop-folder-name = Escriptori
 downloads-folder-name = Baixades
 choose-download-folder-title = Tria la carpeta de baixades:
-
 # Variables:
 #   $service-name (String) - Name of a cloud storage provider like Dropbox, Google Drive, etc...
 save-files-to-cloud-storage =
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/protections.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/protections.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/protections.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -27,11 +27,16 @@
 
 protection-report-webpage-title = Tauler de proteccions
 protection-report-page-content-title = Tauler de proteccions
+# This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
+protection-report-page-summary = El { -brand-short-name } pot protegir la vostra privadesa de forma transparent mentre navegueu. Este és un resum personalitzat de les proteccions, amb eines per tindre el control de la vostra seguretat a Internet.
+# This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
+protection-report-page-summary-default = El { -brand-short-name } protegeix la vostra privadesa de forma transparent mentre navegueu. Este és un resum personalitzat de les proteccions, amb eines per tindre el control de la vostra seguretat a Internet.
 
 protection-report-settings-link = Gestiona els paràmetres de privadesa i seguretat
 
 etp-card-title-always = Protecció contra el seguiment millorada: Sempre activada
 etp-card-title-custom-not-blocking = Protecció contra el seguiment millorada: DESACTIVADA
+etp-card-content-description = El { -brand-short-name } bloca automàticament les empreses que, en secret, vos fan el seguiment mentre navegueu.
 protection-report-etp-card-content-custom-not-blocking = Actualment totes les proteccions estan desactivades. Trieu quins elements de seguiment voleu blocar en els paràmetres de protecció del { -brand-short-name }.
 protection-report-manage-protections = Gestiona els paràmetres
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -19,6 +19,9 @@
 safeb-blocked-malware-page-error-desc-override = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari maliciós</a>. Podeu <a data-l10n-name='report_detection'>informar d'un error en la detecció</a> o <a data-l10n-name='ignore_warning_link'>ignorar el risc</a> i visitar este lloc insegur.
 safeb-blocked-malware-page-error-desc-no-override = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari maliciós</a>. Podeu <a data-l10n-name='report_detection'>informar d'un error en la detecció</a>.
 safeb-blocked-malware-page-learn-more = Per obtindre més informació sobre el contingut web perillós, inclosos els virus i altre programari maliciós, i sobre com protegir el vostre ordinador, visiteu <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Per obtindre més informació sobre la protecció contra la pesca electrònica i el programari maliciós del { -brand-short-name }, visiteu <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari maliciós</a>. Podeu <a data-l10n-name='ignore_warning_link'>ignorar el risc</a> i visitar este lloc insegur.
+safeb-blocked-malware-page-error-desc-no-override-sumo = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari maliciós</a>.
+safeb-blocked-malware-page-learn-more-sumo = Per obtindre més informació sobre la protecció contra la pesca electrònica i el programari maliciós del { -brand-short-name }, visiteu <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari perillós</a>. Podeu <a data-l10n-name='ignore_warning_link'>ignorar el risc</a> i visitar este lloc insegur.
 safeb-blocked-unwanted-page-error-desc-no-override = S'ha informat que <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>conté programari perillós</a>.
 safeb-blocked-unwanted-page-learn-more = Per obtindre més informació sobre el programari perillós i indesitjable, vegeu la <a data-l10n-name='learn_more_link'>política de programari indesitjable</a>. Per obtindre més informació sobre la protecció contra la pesca electrònica i el programari maliciós del { -brand-short-name }, visiteu <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/sync.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/sync.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/sync.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/sync.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -6,9 +6,16 @@
     .label = S'està sincronitzant…
 fxa-toolbar-sync-syncing-tabs =
     .label = S'estan sincronitzant les pestanyes…
-
 sync-disconnect-dialog-title = Voleu desconnectar el { -sync-brand-short-name }?
 sync-disconnect-dialog-body = El { -brand-product-name } deixarà de sincronitzar-se amb el vostre compte, però les vostres dades de navegació d'este dispositiu no se suprimiran.
 fxa-disconnect-dialog-title = Voleu desconnectar el { -brand-product-name }?
 fxa-disconnect-dialog-body = El { -brand-product-name } es desconnectarà del vostre compte, però les vostres dades de navegació d'este dispositiu no se suprimiran.
 sync-disconnect-dialog-button = Desconnecta
+fxa-signout-dialog-heading = Voleu tancar la sessió del { -fxaccount-brand-name }?
+fxa-signout-dialog-body = Les dades sincronitzades romandran en el vostre compte.
+fxa-signout-checkbox =
+    .label = Suprimeix les dades d'este dispositiu (inicis de sessió, contrasenyes, historial, adreces d'interés, etc.).
+fxa-signout-dialog =
+    .title = Voleu tancar la sessió del { -fxaccount-brand-name }?
+    .style = min-width: 375px;
+    .buttonlabelaccept = Tanca la sessió
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -24,21 +24,18 @@
            *[other] Desfés el tancament de les pestanyes
         }
     .accesskey = f
-
 toolbar-context-menu-manage-extension =
     .label = Gestiona l'extensió
     .accesskey = e
 toolbar-context-menu-remove-extension =
     .label = Elimina l'extensió
     .accesskey = l
-
 # This label is used in the extensions toolbar buttons context menus,
 # a user can use this command to submit to Mozilla an abuse report
 # related to that extension. "Report" is a verb.
 toolbar-context-menu-report-extension =
     .label = Informa sobre l'extensió
     .accesskey = o
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -54,3 +51,12 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = Personalitza…
     .accesskey = P
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = Sempre
+    .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-never-show =
+    .label = Mai
+    .accesskey = M
+toolbar-context-menu-bookmarks-toolbar-on-new-tab =
+    .label = Només en una pestanya nova
+    .accesskey = N
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/ca-valencia/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/browser/webrtcIndicator.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/browser/webrtcIndicator.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -11,7 +11,6 @@
 # This string is used so that the window has a title in tools that enumerate/look for window
 # titles. It is not normally visible anywhere.
 webrtc-indicator-title = { -brand-short-name } - Indicador de compartició
-
 webrtc-sharing-window = Esteu compartint una altra finestra d'aplicació.
 webrtc-sharing-browser-window = Esteu compartint el { -brand-short-name }.
 webrtc-sharing-screen = Esteu compartint la pantalla sencera.
@@ -20,5 +19,22 @@
     .title = Esteu compartint el micròfon. Feu clic ací per controlar què voleu compartir.
 webrtc-camera-button =
     .title = Esteu compartint la càmera. Feu clic ací per controlar què voleu compartir.
+webrtc-microphone-unmuted =
+    .title = Desactiva el micròfon
+webrtc-microphone-muted =
+    .title = Activa el micròfon
+webrtc-camera-unmuted =
+    .title = Desactiva la càmera
+webrtc-camera-muted =
+    .title = Activa la càmera
 webrtc-minimize =
     .title = Minimitza l'indicador
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = Esteu compartint la càmera. Feu clic ací per controlar què voleu compartir.
+webrtc-microphone-system-menu =
+    .label = Esteu compartint el micròfon. Feu clic ací per controlar què voleu compartir.
+webrtc-screen-system-menu =
+    .label = Esteu compartint una finestra o una pantalla. Feu clic ací per controlar què voleu compartir.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/accounts.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/accounts.properties	2021-01-18 20:02:12.000000000 +0000
@@ -41,6 +41,10 @@
 # Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
 sendToAllDevices.menuitem = Envia a tots els dispositius
 
+# LOCALIZATION NOTE (manageDevices.menuitem)
+# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
+manageDevices.menuitem = Gestiona els dispositius…
+
 # LOCALIZATION NOTE (sendTabToDevice.unconfigured, sendTabToDevice.unconfigured.label2)
 # Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
 # and the Sync account is unconfigured. Redirects to a marketing page.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/app-extension-fields.properties firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/app-extension-fields.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/app-extension-fields.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/app-extension-fields.properties	2021-01-18 20:02:12.000000000 +0000
@@ -10,3 +10,6 @@
 extension.firefox-compact-dark@mozilla.org.name=Fosc
 extension.firefox-compact-dark@mozilla.org.description=Un tema amb colors foscos.
 
+# LOCALIZATION NOTE (extension.firefox-alpenglow@mozilla.org.name): This is displayed in about:addons -> Appearance
+extension.firefox-alpenglow@mozilla.org.name=Firefox Alpenglow
+extension.firefox-alpenglow@mozilla.org.description=Utilitza una aparença acolorida per als botons, menús i finestres.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/brandings.dtd firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/brandings.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/brandings.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/brandings.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,7 +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/. -->
-
 <!-- LOCALIZATION NOTE:
 	The following feature names must be treated as a brand, and kept in English.
 	They cannot be:
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/browser.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/browser.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,15 +1,12 @@
 <!-- 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/. -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
 
 
 <!ENTITY appmenu.tooltip                     "Obri el menú">
 <!ENTITY navbarOverflow.label                "Més eines…">
-
 <!-- Tab context menu -->
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
@@ -46,16 +43,6 @@
 <!ENTITY fullScreenCmd.label "Pantalla completa">
 
 
-<!-- LOCALIZATION NOTE (fxa.signin) Used to define the different labels
-     for the Firefox Account toolbar signin menu screen. -->
-
-<!-- LOCALIZATION NOTE (fxa.unverified) Used to define the different labels
-     for the Firefox Account toolbar unverified menu screen. -->
-
-<!-- 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 pictureInPictureHideToggle.label "Amaga el botó d'Imatge sobre imatge">
 <!ENTITY pictureInPictureHideToggle.accesskey "m">
 <!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
@@ -94,10 +81,6 @@
 
 <!ENTITY exitDOMFullscreen.button "Ix de la pantalla completa (Esc)">
 <!ENTITY exitDOMFullscreenMac.button "Ix de la pantalla completa (esc)">
-<!-- LOCALIZATION NOTE (pictureInPicture.label, pictureInPicture.accesskey):
-     these two strings are used when right-clicking on a video in the
-     content area when the Picture-in-Picture feature is enabled. -->
-
 <!-- LOCALIZATION NOTE (pointerlockWarning.beforeDomain.label,
      pointerlockWarning.afterDomain.label): these two strings are used
      respectively before and after the domain requiring pointerlock.
@@ -136,9 +119,6 @@
 <!ENTITY bookmarkingTools.label             "Eines d'adreces d'interés">
 <!ENTITY addBookmarksMenu.label             "Afig el menú d'adreces d'interés a la barra d'eines">
 <!ENTITY removeBookmarksMenu.label          "Elimina el menú d'adreces d'interés de la barra d'eines">
-<!-- LOCALIZATION NOTE (bookmarksGtkCmd.commandkey): This command
-  -  key should not contain the letters A-F, since these are reserved
-  -  shortcut keys on Linux. -->
 
 <!ENTITY historyButton.label            "Historial">
 
@@ -225,54 +205,12 @@
 
 <!ENTITY moreMenu.label "Més">
 
-<!-- LOCALIZATION NOTE (urlbar.searchSuggestionsNotification.hintPrefix): Shown just before the suggestions opt-out hint. -->
-
-<!--
-  Comment duplicated from browser-sets.inc:
-
-  Search Command Key Logic works like this:
-
-  Unix: Ctrl+J (0.8, 0.9 support)
-        Ctrl+K (cross platform binding)
-  Mac:  Cmd+K (cross platform binding)
-        Cmd+Opt+F (platform convention)
-  Win:  Ctrl+K (cross platform binding)
-        Ctrl+E (IE compat)
-
-  We support Ctrl+K on all platforms now and advertise it in the menu since it is
-  our standard - it is a "safe" choice since it is near no harmful keys like "W" as
-  "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
-  system setting to use emacs emulation, and we should respect it. Focus-Search-Box
-  is a fundamental keybinding and we are maintaining a XP binding so that it is easy
-  for people to switch to Linux.
-
- -->
-
-<!-- LOCALIZATION NOTE (contentSearchInput.label):
-     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 contentSearchSubmit.tooltip  "Envia la cerca">
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
      This string is displayed in the search box when the input field is empty. -->
 
 <!ENTITY searchInput.placeholder      "Cerca">
 <!ENTITY searchIcon.tooltip           "Cerca">
-<!-- LOCALIZATION NOTE (searchFor.label, searchWith.label):
-     These two strings are used to build the header above the list of one-click
-     search providers:  "Search for <used typed keywords> with:" -->
-
-<!-- LOCALIZATION NOTE (search.label, searchAfter.label):
-     This string is used to build the header above the list of one-click search
-     providers when a one off engine has been selected.  The searchAfter text is
-     intentionally left empty for en-US and can be used by other localizations to
-     display a string after the search engine name.  This string will be displayed
-     as:  "Search <selected engine name><searchAfter.label text>" -->
-
-<!-- LOCALIZATION NOTE (searchWithHeader.label):
-     The wording of this string should be as close as possible to
-     searchFor.label and searchWith.label. This string will be used instead of
-     them when the user has not typed any keyword. -->
 
 <!ENTITY openLinkCmdInTab.accesskey   "t">
 
@@ -280,18 +218,11 @@
 <!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
   "Pocket" is a brand name. -->
 
-<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
-  "Pocket" is a brand name. -->
-
 <!ENTITY saveToPocketCmd.label        "Guarda la pàgina al Pocket">
 <!ENTITY pocketMenuitem.label         "Mostra la llista del Pocket">
 
 <!ENTITY emailPageCmd.label           "Envia l'enllaç per correu…">
 <!-- Media (video/audio) controls -->
-<!-- LOCALIZATION NOTE: The access keys for "Play" and
-"Pause" are the same because the two context-menu
-items are mutually exclusive. -->
-
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
@@ -299,6 +230,7 @@
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 
+
 <!ENTITY fullZoom.label                 "Mida de la pàgina">
 
 <!ENTITY sidebarCloseButton.tooltip     "Tanca la barra lateral">
@@ -323,38 +255,16 @@
 
 <!ENTITY spellAddDictionaries.label "Afig diccionaris…">
 <!ENTITY spellAddDictionaries.accesskey "A">
-<!-- LOCALIZATION NOTE (editBookmark.panel.width): width of the bookmark panel.
-     Should be large enough to fully display the Done and Cancel/
-     Remove Bookmark buttons. -->
-
-<!-- LOCALIZATION NOTE (identity.securityView.label)
-     This is the header of the security subview in the Site Identity panel. -->
-
-<!-- Strings for connection state warnings. -->
-
-<!-- Strings for connection state warnings in the subview. -->
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 
 
 <!ENTITY tabsToolbar.label "Pestanyes del navegador">
-<!-- LOCALIZATION NOTE (syncTabsMenu3.label): This appears in the history menu -->
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY customizeMode.autoHideDownloadsButton.label "Amaga automàticament">
 
-<!-- LOCALIZATION NOTE (trackingProtection.unblock5.label, trackingProtection.unblock5.accesskey):
-     The associated button with this label and accesskey is only shown when opening the control
-     center while looking at a site with trackers in NON-private browsing mode. -->
-
-<!-- LOCALIZATION NOTE: (pluginNotification.width): This is used to determine the
-     width of the plugin popup notification that can appear if a plugin has been
-     blocked on a page. Should be wide enough to fit the pluginActivateNow.label
-     and pluginActivateAlways.label strings above on a single line. This must be
-     a CSS length value. -->
-
 
 <!ENTITY uiTour.infoPanel.close "Tanca">
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/browser.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/browser.properties	2021-01-18 20:02:12.000000000 +0000
@@ -15,7 +15,6 @@
 # %2$S is the selection string.
 contextMenuSearch=Cerca «%2$S» a %1$S
 contextMenuSearch.accesskey=C
-
 contextMenuPrivateSearch=Cerca en una finestra privada
 contextMenuPrivateSearch.accesskey=f
 # LOCALIZATION NOTE (contextMenuPrivateSearchOtherEngine): %S is the search
@@ -57,7 +56,6 @@
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # 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)
@@ -289,6 +287,9 @@
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 geolocationLastAccessIndicatorText=Últim accés %S
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+openProtocolHandlerPermissionEntryLabel=Enllaços %S://
+
 crashedpluginsMessage.title=El connector %S ha fallat.
 crashedpluginsMessage.reloadButton.label=Torna a carregar la pàgina
 crashedpluginsMessage.reloadButton.accesskey=r
@@ -409,7 +410,6 @@
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=Obri una pestanya nova (%S)
-
 newTabContainer.tooltip=Obri una pestanya nova (%S)\nManteniu premut per obrir una pestanya de contenidor nova
 newTabAlwaysContainer.tooltip=Selecciona un contenidor per obrir una pestanya nova
 
@@ -461,14 +461,12 @@
 identity.identified.verifier=Verificat per: %S
 identity.identified.verified_by_you=Heu afegit una excepció de seguretat per a este lloc web.
 identity.identified.state_and_country=%S, %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
 # use a synonym for "safe" or "private" if "secure" is too long.
 identity.notSecure.label=Insegur
-
 identity.notSecure.tooltip=La connexió no és segura
 
 identity.extension.label=Extensió (%S)
@@ -1032,7 +1030,6 @@
 storageAccess.Allow.accesskey = a
 storageAccess.DontAllow.label = Bloca l'accés
 storageAccess.DontAllow.accesskey = B
-
 # LOCALIZATION NOTE (storageAccess2.message):
 # %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
@@ -1052,7 +1049,6 @@
 confirmationHint.addSearchEngine.label = S'ha afegit el motor de cerca
 confirmationHint.pinTab.label = S'ha fixat
 confirmationHint.pinTab.description = Feu clic amb el botó dret del ratolí per deixar de fixar.
-
 confirmationHint.passwordSaved.label = S'ha guardat la contrasenya
 confirmationHint.loginRemoved.label = S'ha eliminat l'inici de sessió
 confirmationHint.breakageReport.label = S'ha enviat l'informe. Gràcies!
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:02:12.000000000 +0000
@@ -10,7 +10,7 @@
 stateFailed=Ha fallat
 # LOCALIZATION NOTE (statePaused):
 # Indicates that the download was paused by the user.
-statePaused=Pausat
+statePaused=En pausa
 # LOCALIZATION NOTE (stateCanceled):
 # Indicates that the download was canceled by the user.
 stateCanceled=S'ha cancel·lat
@@ -32,6 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Este fitxer conté un virus o programari maliciós.
 blockedPotentiallyUnwanted=Este fitxer podria malmetre l'ordinador.
+blockedPotentiallyInsecure=No s'ha baixat el fitxer: risc potencial de seguretat.
 blockedUncommon2=Este no és un fitxer que es baixe sovint.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -41,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/newInstall.dtd firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/newInstall.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/newInstall.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/newInstall.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,7 +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/. -->
-
 <!-- LOCALIZATION NOTE: For this feature, "installation" is used to mean "this
  discrete download of Firefox" and "version" is used to mean "the specific
  revision number of a given Firefox channel". These terms are not synonymous.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/sitePermissions.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:02:12.000000000 +0000
@@ -47,4 +47,6 @@
 permission.canvas.label = Extraure dades del llenç
 permission.midi.label = Accés a dispositius MIDI
 permission.midi-sysex.label = Accés a dispositius MIDI compatibles amb SysEx
-permission.https-only-load-insecure.label = Utilitzar HTTP insegur
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = Obrir aplicacions
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/translation.dtd firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/translation.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/browser/translation.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/browser/translation.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -61,7 +61,6 @@
   -  These 2 strings are displayed before and after a 'Microsoft Translator'
   -  logo.
   -->
-
 <!-- LOCALIZATION NOTE (translation.options.attribution.poweredByYandex,
                         translation.options.attribution.beforeLogo,
   -                     translation.options.attribution.afterLogo):
@@ -69,4 +68,3 @@
   -  the other two strings when yandex translation engine is preferred by the
   -  user.
   -->
-
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/overrides/netError.dtd firefox-85.0+build1/l10n/ca-valencia/browser/chrome/overrides/netError.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/chrome/overrides/netError.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/chrome/overrides/netError.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -11,7 +11,6 @@
 <!ENTITY returnToPreviousPage1.label "Vés arrere (recomanat)">
 <!ENTITY advanced2.label "Avançat…">
 <!ENTITY viewCertificate.label "Mostra el certificat">
-
 <!-- Specific error messages -->
 
 
@@ -60,7 +59,6 @@
 <!ENTITY unknownSocketType.longDesc "<ul> <li>Assegureu-vos que el vostre sistema té un gestor de seguretat personal instal·lat.</li> <li>Això podria ser a causa d'una configuració no estàndard del servidor.</li> </ul>">
 
 <!ENTITY nssFailure2.longDesc2 "<ul> <li>La pàgina que esteu intentant veure no es pot mostrar perquè no s'ha pogut verificar l'autenticitat de les dades rebudes.</li> <li>Poseu-vos en contacte amb els propietaris del lloc web per informar-los del problema.</li> </ul>">
-
 <!-- Localization note (certerror.introPara2) - The text content of the span tag
 will be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
@@ -94,7 +92,6 @@
 <!ENTITY errorReporting.learnMore "Més informació…">
 
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Poseu-vos en contacte amb els propietaris del lloc web per informar-los del problema.</li></ul></p>">
-
 <!-- LOCALIZATION NOTE (sslv3Used.longDesc2) - Do not translate
      "SSL_ERROR_UNSUPPORTED_VERSION". -->
 
@@ -104,7 +101,6 @@
 <!ENTITY certerror.sts.pagetitle  "No s'ha connectat: Problema potencial de seguretat">
 <!ENTITY certerror.whatShouldIDo.badStsCertExplanation1 "<span class='hostname'></span> té una política de seguretat anomenada «HTTP Strict Transport Security» (Seguretat estricta de transport HTTP, o HSTS), que vol dir que el &brandShortName; només pot connectar-s'hi de forma segura. No podeu afegir cap excepció per visitar este lloc.">
 <!ENTITY certerror.copyToClipboard.label "Copia el text al porta-retalls">
-
 <!-- LOCALIZATION NOTE (inadequateSecurityError.longDesc) - Do not translate
      "NS_ERROR_NET_INADEQUATE_SECURITY". -->
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/ca-valencia/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/defaultagent/defaultagent_localized.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:02:12.000000000 +0000
@@ -0,0 +1,10 @@
+# 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 file is in the UTF-8 encoding
+[Strings]
+DefaultBrowserAgentTaskDescription=La tasca «Agent de navegador per defecte» controla quan el navegador per defecte canvia de %MOZ_APP_DISPLAYNAME% a un altre navegador. Si el canvi es produeix en circumstàncies sospitoses, demanarà als usuaris que tornin a canviar-ho per %MOZ_APP_DISPLAYNAME% dues vegades com a màxim. El %MOZ_APP_DISPLAYNAME% isntal·la aquesta tasca automàticament i es reinstal·la quan s'actualitza el %MOZ_APP_DISPLAYNAME%. Per desactivar aquesta tasca, actualitzeu la preferència «default-browser-agent.enabled» en la pàgina about:config o el paràmetre de política d'empresa «DisableDefaultBrowserAgent» del %MOZ_APP_DISPLAYNAME%.
+
+DefaultBrowserNotificationYesButtonText=Sí
+DefaultBrowserNotificationNoButtonText=No
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/ca-valencia/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/extensions/formautofill/formautofill.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:02:12.000000000 +0000
@@ -109,11 +109,16 @@
 # of saved credit cards.
 savedCreditCardsBtnLabel = Targetes de crèdit guardades…
 
+autofillReauthCheckboxMac = Sol·licita l'autenticació del macOS per emplenar automàticament, veure o editar les targetes de crèdit emmagatzemades.
+autofillReauthCheckboxWin = Sol·licita l'autenticació del Windows per emplenar automàticament, veure o editar les targetes de crèdit emmagatzemades.
+autofillReauthCheckboxLin = Sol·licita l'autenticació del Linux per emplenar automàticament, veure o editar les targetes de crèdit emmagatzemades.
 
 # LOCALIZATION NOTE (autofillReauthOSDialogMac): This string is
 # preceded by the operating system (macOS) with "Firefox is trying to ", and
 # has a period added to its end. Make sure to test in your locale.
 autofillReauthOSDialogMac = canviar els paràmetres d'autenticació
+autofillReauthOSDialogWin = Per canviar els paràmetres d'autenticació, introduïu les vostres credencials d'inici de sessió al Windows.
+autofillReauthOSDialogLin = Per canviar els paràmetres d'autenticació, introduïu les vostres credencials d'inici de sessió al Linux.
 
 # LOCALIZATION NOTE (manageAddressesTitle, manageCreditCardsTitle): The dialog title for the list of addresses or
 # credit cards in browser preferences.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/ca-valencia/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/browser/pdfviewer/viewer.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/browser/pdfviewer/viewer.properties	2021-01-18 20:02:12.000000000 +0000
@@ -213,7 +213,7 @@
 rendering_error=S'ha produït un error mentre es renderitzava la pàgina.
 
 # Predefined zoom values
-page_scale_width=Amplària de la pàgina
+page_scale_width=Amplada de la pàgina
 page_scale_fit=Ajusta la pàgina
 page_scale_auto=Zoom automàtic
 page_scale_actual=Mida real
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/debugger.properties firefox-85.0+build1/l10n/ca-valencia/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/debugger.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/debugger.properties	2021-01-18 20:02:12.000000000 +0000
@@ -17,15 +17,18 @@
 # that collapses the Breakpoints panes in the debugger UI.
 
 # LOCALIZATION NOTE (copyToClipboard.label): This is the text that appears in the
-# context menu to copy the complete source of the open file.
+# context menu to copy the text that the user selected.
 copyToClipboard.label=Copia al porta-retalls
 copyToClipboard.accesskey=C
 
 # LOCALIZATION NOTE (copySource.label): This is the text that appears in the
-# context menu to copy the selected source of file open.
+# context menu to copy all of the text in the open file.
+copySource.label=Copia el text d’origen
+copySource.accesskey=o
 
 # LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the
 # context menu to copy the source URI of file open.
+copySourceUri2=Copia l’URI d’origen
 
 # LOCALIZATION NOTE (collapseAll.label): This is the text that appears in the
 # context menu to collapse a directory and all of its subdirectories.
@@ -68,12 +71,41 @@
 # LOCALIZATION NOTE (unblackBoxAllOutsideDir.label: This is the text that appears in the
 # context submenu to unblackbox all files outside of the selected directory
 
+# LOCALIZATION NOTE (ignoreAll.label): Text associated with the ignore context menu item
+
+# LOCALIZATION NOTE (ignoreAllInGroup.label): This is the text that appears in the
+# context submenu to ignore all files inside of the selected group
+
+# LOCALIZATION NOTE (unignoreAllInGroup.label): This is the text that appears in the
+# context submenu to unignore all files inside of the selected group
+
+# LOCALIZATION NOTE (ignoreAllOutsideGroup.label): This is the text that appears in the
+# context submenu to ignore all files outside of the selected group
+
+# LOCALIZATION NOTE (unignoreAllOutsideGroup.label): This is the text that appears in the
+# context submenu to unignore all files outside of the selected group
+
+# LOCALIZATION NOTE (ignoreAllInDir.label): This is the text that appears in the
+# context submenu to ignore all files inside of the selected directory
+
+# LOCALIZATION NOTE (unignoreAllInDir.label): This is the text that appears in the
+# context submenu to unignore all files inside of the selected directory
+
+# LOCALIZATION NOTE (ignoreAllOutsideDir.label): This is the text that appears in the
+# context submenu to ignore all files outside of the selected directory
+
+# LOCALIZATION NOTE (unignoreAllOutsideDir.label: This is the text that appears in the
+# context submenu to unignore all files outside of the selected directory
+
 # LOCALIZATION NOTE (copyFunction.label): This is the text that appears in the
 # context menu to copy the function the user selected
 
 # LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the
 # context menu to copy the stack trace methods, file names and row number.
 
+# LOCALIZATION NOTE (restartFrame): This is the text that appears in the
+# context menu to restart a frame.
+
 # LOCALIZATION NOTE (expandSources): This is the tooltip for the button
 # that expands the Sources and Outlines panes in the debugger UI.
 
@@ -244,9 +276,6 @@
 # the source search input bar
 sourceSearch.search.placeholder2=Cerca en el fitxer…
 
-# LOCALIZATION NOTE (searchPanelFunction2): This is the text that appears in the
-# filter panel popup for the function search operation.
-
 # 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
@@ -412,9 +441,6 @@
 # LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component when a log point is set
 
-# LOCALIZATION NOTE (editor.conditionalPanel.close): Tooltip text for
-# close button inside ConditionalPanel component
-
 # LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item
 # for navigating to a source mapped location
 
@@ -434,6 +460,18 @@
 # LOCALIZATION NOTE (inlinePreview.toggle.tooltip): Context menu item
 # tooltip that will describe toggling inline preview
 
+# LOCALIZATION NOTE (editorWrapping.show.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.hide.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.toggle.label): Context menu item
+# label for toggling the lines wrapping feature
+
+# LOCALIZATION NOTE (editorWrapping.toggle.tooltip): Context menu item
+# tooltip for toggling the lines wrapping feature
+
 # LOCALIZATION NOTE (settings.button.label): Label for Settings button
 
 # LOCALIZATION NOTE (settings.disableJavaScript.label): Context menu item
@@ -531,6 +569,18 @@
 # LOCALIZATION NOTE (blackboxContextItem.unblackbox): Text associated
 # with the unblackbox context menu item
 
+# LOCALIZATION NOTE (sourceFooter.ignores): Tooltip text associated
+# with the ignores button
+
+# LOCALIZATION NOTE (sourceFooter.unignore): Tooltip text associated
+# with the ignore button
+
+# LOCALIZATION NOTE (ignoreContextItem.ignore): Text associated
+# with the ignore context menu item
+
+# LOCALIZATION NOTE (ignoreContextItem.unignore): Text associated
+# with the unignore context menu item
+
 # LOCALIZATION NOTE (sourceFooter.mappedSource): Text associated
 # with a mapped source. %S is replaced by the source map origin.
 
@@ -540,9 +590,6 @@
 # LOCALIZATION NOTE (sourceFooter.mappedSuffix): Text associated
 # with a mapped source.  Displays next to URLs in tree and tabs.
 
-# LOCALIZATION NOTE (sourceFooter.codeCoverage): Text associated
-# with a code coverage button
-
 # LOCALIZATION NOTE (sourceFooter.currentCursorPosition): Text associated
 # with the current cursor line and column
 
@@ -588,8 +635,6 @@
 
 # LOCALIZATION NOTE (outline.header): Outline left sidebar header
 
-# LOCALIZATION NOTE (scopes.mapScopes): Label for toggling scope mappings
-
 # LOCALIZATION NOTE (outline.placeholder): Placeholder text for the filter input
 # element
 
@@ -631,9 +676,6 @@
 # search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on
 # a mac we use the unicode character.
 
-# LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome
-# panel. %S is replaced by the keyboard shortcut to search for functions.
-
 # LOCALIZATION NOTE (welcome.allShortcuts): The label to open the modal of
 # shortcuts, displayed in the welcome panel.
 
@@ -643,9 +685,6 @@
 # LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search
 # prompt for searching for files.
 
-# LOCALIZATION NOTE (sourceSearch.noResults2): The center pane Source Search
-# message when the query did not match any of the sources.
-
 # LOCALIZATION NOTE (pauseOnExceptions): The pause on exceptions button tooltip
 # when the debugger will pause on all exceptions.
 pauseOnExceptions=Pausa en totes les excepcions. Feu clic per ignorar les excepcions
@@ -660,9 +699,11 @@
 
 # LOCALIZATION NOTE (errorLoadingText3): The text that is displayed in the debugger
 # viewer when there is an error loading a file
+errorLoadingText3=S’ha produït un error en carregar este URI: %S
 
 # LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder
 # text displayed when the user searches for specific lines in a file
+gotoLineModal.placeholder=Vés a la línia…
 
 # LOCALIZATION NOTE(gotoLineModal.title): The message shown to users
 # to open the go to line modal
@@ -741,10 +782,6 @@
 # LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed
 # in an info block when evaluating a conditional breakpoint throws an error
 
-# LOCALIZATION NOTE (whyPaused.xhr): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an
-# xml http request
-
 # LOCALIZATION NOTE (whyPaused.XHR): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an
 # xml http request
@@ -844,7 +881,6 @@
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
 variablesViewOptimizedOut=(optimitzat a fora)
 variablesViewUninitialized=(sense inicialitzar)
 variablesViewMissingArgs=(no disponible)
@@ -914,4 +950,3 @@
 # service worker that is redundant.
 # LOCALIZATION NOTE (serviceWorkerInfo.unknown): State displayed for a
 # service worker that is in an unknown state.
-
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/font-inspector.properties firefox-85.0+build1/l10n/ca-valencia/devtools/client/font-inspector.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/font-inspector.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/font-inspector.properties	2021-01-18 20:02:12.000000000 +0000
@@ -53,6 +53,7 @@
 fontinspector.letterSpacingLabel=Espaiat
 
 # LOCALIZATION NOTE (fontinspector.lineHeightLabelCapitalized): Label for the UI to change the line height in the font editor.
+fontinspector.lineHeightLabelCapitalized=Alçada de la línia
 
 # LOCALIZATION NOTE (fontinspector.allFontsOnPageHeader): Header for the section listing
 # all the fonts on the current page.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/ca-valencia/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/netmonitor.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/netmonitor.properties	2021-01-18 20:02:12.000000000 +0000
@@ -58,6 +58,12 @@
 # that collapses the network details pane in the UI.
 collapseDetailsPane=Amaga els detalls de la sol·licitud
 
+# LOCALIZATION NOTE (collapseActionPane): This is the tooltip for the button
+# that collapses the network action pane in the UI.
+
+# LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
+# displayed when hovering over the tabs overflow button.
+
 # LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
 # headers tab of the network details pane when there are no headers available.
 headersEmptyText=No hi ha capçaleres per esta sol·licitud
@@ -82,23 +88,23 @@
 # available for shown.
 
 # LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
-# params tab of the network details pane when there are no params available.
+# request tab of the network details pane when there are no params available.
 paramsEmptyText=No hi ha paràmetres per esta sol·licitud
 
 # LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
-# params tab of the network details pane for the filtering input.
+# request tab of the network details pane for the filtering input.
 paramsFilterText=Filtra paràmetres de la sol·licitud
 
 # LOCALIZATION NOTE (paramsQueryString): This is the label displayed
-# in the network details params tab identifying the query string.
+# in the network details request tab identifying the query string.
 paramsQueryString=Cadena de consulta
 
 # LOCALIZATION NOTE (paramsFormData): This is the label displayed
-# in the network details params tab identifying the form data.
+# in the network details request tab identifying the form data.
 paramsFormData=Dades del formulari
 
 # LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
-# in the network details params tab identifying the request payload.
+# in the network details request tab identifying the request payload.
 paramsPostPayload=Càrrega útil de la sol·licitud
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
@@ -115,11 +121,11 @@
 responseHeaders=Capçaleres de la resposta
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
-# in the network details params tab identifying the request cookies.
+# in the network details request tab identifying the request cookies.
 requestCookies=Galetes de la sol·licitud
 
 # LOCALIZATION NOTE (responseCookies): This is the label displayed
-# in the network details params tab identifying the response cookies.
+# in the network details request tab identifying the response cookies.
 responseCookies=Galetes de la resposta
 
 # LOCALIZATION NOTE (responsePayload): This is the label displayed
@@ -142,7 +148,7 @@
 # the truncation limit and thus was truncated.
 
 # LOCALIZATION NOTE (requestTruncated): This is the text displayed
-# in the params tab of the network details pane when the request is over
+# in the request tab of the network details pane when the request is over
 # the truncation limit and thus was truncated.
 
 # LOCALIZATION NOTE (responsePreview): This is the text displayed
@@ -208,6 +214,10 @@
 # LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalSize): A tooltip explaining
 # what the framesTotalSize label displays
 
+# LOCALIZATION NOTE (networkMenu.ws.summary.label.framesTranferredSize): A label showing
+# summary size info related to the current list of WS messages
+# %1$S is the total size of the transferred data, %2$S is the size of sent data, %3$S is the size of received data.
+
 # LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalTime): A tooltip explaining
 # what framesTotalTime displays
 
@@ -237,25 +247,22 @@
 # request is unavailable.
 
 # LOCALIZATION NOTE (networkMenu.sizeCached): This is the label displayed
-# in the network menu specifying the transfer or a request is
+# in the network menu and the headers panel specifying the transfer or a request is
 # cached.
 networkMenu.sizeCached=en memòria cau
 
 # LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
-# in the network menu specifying the transferred of a request computed
-# by a service worker.
+# in the network menu and the headers panel specifying the transferred of a request
+# computed by a service worker.
 networkMenu.sizeServiceWorker=procés de treball de servei
 
-# LOCALIZATION NOTE (networkMenu.blockedBy): This is the label displayed
-# in the network menu specifying the request was blocked by something.
-# %S is replaced by the blocked reason, which could be "DevTools", "CORS", etc.
-
-# LOCALIZATION NOTE (networkMenu.blocked): This is a generic message for a
-# URL that has been blocked for an unknown reason
-
 # LOCALIZATION NOTE (networkMenu.blocked2): This is a generic message for a
 # URL that has been blocked for an unknown reason
 
+# LOCALIZATION NOTE (networkMenu.blockedby): This is a generic message for a
+# URL that has been blocked by an extension
+# %S is the extension name.
+
 # LOCALIZATION NOTE (networkMenu.blockedTooltip): This is a the text displayed
 # as a tooltip for the blocked icon in the request list
 
@@ -299,6 +306,19 @@
 # in Timings side panel. This section contains server timings transferred from the server
 # through the "Server-Timing" header.
 
+# LOCALIZATION NOTE (netmonitor.timings.queuedAt): This is relative queued time to the
+# first request. %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.startedAt): Relative to the first request,
+# when the request actually started. %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.downloadedAt): Relative to first request,
+# when the request actually finished downloading.
+# %S is time expressed in milliseconds or minutes.
+
+# LOCALIZATION NOTE (netmonitor.timings.noTimings): Message that displays in the
+# timings pane when thea request has been blocked
+
 # LOCALIZATION NOTE (networkMenu.millisecond): This is the label displayed
 # in the network menu specifying timing interval divisions (in milliseconds).
 networkMenu.millisecond=%S ms
@@ -433,7 +453,7 @@
 
 # LOCALIZATION NOTE (certmgr.periodofvalidity.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.periodofvalidity.label=Període de validesa
 
 # LOCALIZATION NOTE (certmgr.begins):
@@ -446,7 +466,7 @@
 
 # LOCALIZATION NOTE (certmgr.fingerprints.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.fingerprints.label=Empremtes digitals
 
 # LOCALIZATION NOTE (certmgr.certdetail.sha256fingerprint):
@@ -516,6 +536,9 @@
 # in the network table toolbar, above the "remoteip" column.
 netmonitor.toolbar.remoteip=IP remota
 
+# LOCALIZATION NOTE (netmonitor.toolbar.initiator): This is the label displayed
+# in the network table toolbar, above the "initiator" column.
+
 # LOCALIZATION NOTE (netmonitor.toolbar.type): This is the label displayed
 # in the network table toolbar, above the "type" column.
 netmonitor.toolbar.type=Tipus
@@ -557,8 +580,8 @@
 netmonitor.toolbar.latency=Latència
 
 # LOCALIZATION NOTE (netmonitor.toolbar.transferred): This is the label displayed
-# in the network table toolbar, above the "transferred" column, which is the
-# compressed / encoded size.
+# in the network table toolbar, above the "transferred" column and in general
+# section of the headers panel, which is the compressed / encoded size.
 netmonitor.toolbar.transferred=Transferits
 
 # LOCALIZATION NOTE (netmonitor.toolbar.contentSize): This is the label displayed
@@ -571,33 +594,42 @@
 netmonitor.toolbar.waterfall=Línia de temps
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.size): This is the label displayed
-# in the websocket frame table header, above the "size" column.
+# in the messages table header, above the "size" column.
 netmonitor.ws.toolbar.size=Mida
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.data): This is the label displayed
-# in the websocket frame table header, above the "data" column.
+# in the messages table header, above the "data" column.
 netmonitor.ws.toolbar.data=Dades
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.opCode): This is the label displayed
-# in the websocket frame table header, above the "opCode" column.
+# in the messages table header, above the "opCode" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.maskBit): This is the label displayed
-# in the websocket frame table header, above the "maskBit" column.
+# in the messages table header, above the "maskBit" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.finBit): This is the label displayed
-# in the websocket frame table header, above the "finBit" column.
+# in the messages table header, above the "finBit" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.time): This is the label displayed
-# in the websocket frame table header, above the "time" column.
+# in the messages table header, above the "time" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.eventName): This is the label displayed
+# in the messages table header, above the "eventName" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.retry): This is the label displayed
+# in the messages table header, above the "retry" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.lastEventId): This is the label displayed
+# in the messages table header, above the "lastEventId" column.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.clear): This is the label displayed
-# in the websocket toolbar for the "Clear" button.
+# in the messages panel toolbar for the "Clear" button.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.label): This is the label
-# displayed in the websocket toolbar for the frames filtering textbox.
+# displayed in the messages panel toolbar for the frames filtering textbox.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.key): This is the
-# shortcut key to focus on the websocket toolbar frames filtering textbox
+# shortcut key to focus on the messages panel toolbar messages filtering textbox
 netmonitor.ws.toolbar.filterFreetext.key=CmdOrCtrl+E
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.resetColumns): This is the label
@@ -623,22 +655,27 @@
 # 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.
 
+# LOCALIZATION NOTE (netmonitor.ws.context.controlFrames): This is the label displayed
+# on the context menu that shows "Control Frames" WebSocket frames.
+
+# LOCALIZATION NOTE (netmonitor.ws.context.controlFrames.accesskey): This is the access key
+# for the "Control Frames" menu item displayed in the context menu in the websocket toolbar.
+
 # LOCALIZATION NOTE (netmonitor.ws.context.copyFrame): This is the label displayed
 # on the context menu that shows "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.
 
+# LOCALIZATION NOTE (netmonitor.ws.connection.closed): This is the text displayed in the
+# websocket messages panel when the connection is closed
+
 # 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.
 
 # 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.
 
-# 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)
-
 # LOCALIZATION NOTE (netmonitor.ws.rawData.header): This is the label displayed
 # in the messages panel identifying the raw data.
 
@@ -651,12 +688,6 @@
 # LOCALIZATION NOTE (netmonitor.search.toolbar.clear): This is the label
 # displayed in the search toolbar to clear the search panel.
 
-# LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
-# displayed in the search results as the label for the response headers
-
-# LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
-# displayed in the search results as the label for the request headers
-
 # LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
 # displayed in the search toolbar to do a case sensitive search.
 
@@ -699,8 +730,21 @@
 # LOCALIZATION NOTE (netmonitor.actionbar.removeBlockedUrl): This is the
 # tooltip shown over the remove button for blocked URL item
 
-# LOCALIZATION NOTE (netmonitor.actionbar.addBlockedUrl): This is the
-# tooltip shown over the Add Blocked URL button
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingUsageNotice): This is the
+# usage notice displayed when network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingAddNotice): This is the
+# add notice that explains ways to add blocking pattern that is displayed when
+# network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.removeAllBlockedUrls): This is the
+# context menu item for removing all blocked URLs
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.enableAllBlockedUrls): This is the
+# context menu item for enabling all blocked URLs
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.disableAllBlockedUrls): This is the
+# context menu item for disabling all blocked URLs
 
 # LOCALIZATION NOTE (netmonitor.actionbar.search): This is the label displayed
 # in the action bar's search tab
@@ -738,6 +782,9 @@
 # in the network details pane identifying the params tab.
 netmonitor.tab.params=Paràmetres
 
+# LOCALIZATION NOTE (netmonitor.tab.request): This is the label displayed
+# in the network details pane identifying the request tab.
+
 # LOCALIZATION NOTE (netmonitor.tab.response): This is the label displayed
 # in the network details pane identifying the response tab.
 netmonitor.tab.response=Resposta
@@ -808,6 +855,9 @@
 # LOCALIZATION NOTE (netmonitor.toolbar.search.key): This is the
 # shortcut key to toggle the search panel
 
+# LOCALIZATION NOTE (netmonitor.toolbar.copy.key): This is the
+# shortcut key to copy a selected request url from the network table
+
 # LOCALIZATION NOTE (netmonitor.toolbar.filterFreetext.learnMore): This is
 # the title used for MDN icon in filtering textbox
 netmonitor.toolbar.filterFreetext.learnMore=Més informació sobre els filtres
@@ -840,6 +890,12 @@
 # LOCALIZATION NOTE (netmonitor.toolbar.resetSorting): This is the label
 # displayed in the network table header context menu to reset sorting
 
+# LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent): This is the label
+# displayed in the network table header context menu to resize a column to fit its content
+
+# LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent.title): This is the title
+# tooltip displayed when draggable resizer in network table headers is hovered
+
 # LOCALIZATION NOTE (netmonitor.toolbar.timings): This is the label
 # displayed in the network table header context menu for the timing submenu
 netmonitor.toolbar.timings=Temps
@@ -849,17 +905,45 @@
 # response headers submenu.
 netmonitor.toolbar.responseHeaders=Capçaleres de la resposta
 
+# LOCALIZATION NOTE (netmonitor.headers.toolbar.block): This is the
+# label displayed in the network details headers tab identifying the
+# block url toolbar button.
+
+# LOCALIZATION NOTE (netmonitor.headers.address): This is the label displayed
+# in the network details headers tab identifying the remote address.
+
+# LOCALIZATION NOTE (netmonitor.headers.status): This is the label displayed
+# in the network details headers tab identifying the status code.
+
+# LOCALIZATION NOTE (netmonitor.headers.size): This is the label displayed
+# in the network details headers tab identifying the size.
+
+# LOCALIZATION NOTE (networkMenu.headers.sizeDetails): This label is displayed
+# in the network details headers tab providing the size details.
+# %1$S is the transferred size, %2$S is the size.
+
+# LOCALIZATION NOTE (netmonitor.headers.version): This is the label displayed
+# in the network details headers tab identifying the http version.
+
 # LOCALIZATION NOTE (netmonitor.summary.learnMore): This is the label displayed
-# in the network details headers tab, with a link to external documentation.
+# in the network details headers tab, with a link to external documentation for
+# status codes.
 
-# LOCALIZATION NOTE (netmonitor.summary.referrerPolicy): This is the label displayed
+# LOCALIZATION NOTE (netmonitor.headers.referrerPolicy): This is the label displayed
 # in the network details headers tab identifying the referrer policy.
 
+# LOCALIZATION NOTE (netmonitor.headers.contentBlocking): This is the label displayed
+# in the network details headers tab identifying the content blocking mode.
+
 # LOCALIZATION NOTE (netmonitor.summary.editAndResend): This is the label displayed
 # on the button in the headers tab that opens a form to edit and resend the currently
 # displayed request
 netmonitor.summary.editAndResend=Edita i torna a enviar
 
+# LOCALIZATION NOTE (netmonitor.headers.raw): This is the label displayed
+# on the button in the headers tab that toggle view for raw request/response headers
+# from the currently displayed request
+
 # LOCALIZATION NOTE (netmonitor.response.name): This is the label displayed
 # in the network details response tab identifying an image's file name.
 netmonitor.response.name=Nom:
@@ -909,6 +993,10 @@
 # LOCALIZATION NOTE (netmonitor.timings.learnMore): This is the label displayed
 # in the network details timings tab, with a link to external documentation
 
+# LOCALIZATION NOTE (netmonitor.audits.slowIconTooltip): This is the tooltip text displayed
+# in the network request list file column, on the slow icon button.
+# %1$S is the waiting time %2$S is the slow threshold.
+
 # LOCALIZATION NOTE (netmonitor.security.warning.cipher): A tooltip
 # for warning icon that indicates a connection uses insecure cipher suite.
 netmonitor.security.warning.cipher=El xifratge utilitzat és obsolet i insegur.
@@ -973,6 +1061,13 @@
 # LOCALIZATION NOTE (netmonitor.trackingResource.tooltip): This is the label used
 # in the Network monitor panel as a tooltip for tracking resource icon.
 
+# LOCALIZATION NOTE (netmonitor.trackingResource.enhancedTrackingProtection): This is
+# the label used in the Network monitor panel for showing enhanced tracking protection.
+
+# LOCALIZATION NOTE (netmonitor.enhancedTrackingProtection.learnMore): This is the label
+# displayed in the network details headers tab, with a link to external documentation for
+# enhanced tracking protection.
+
 # LOCALIZATION NOTE (netmonitor.context.copy): This is the label displayed
 # for the copy sub-menu in the context menu for a request
 netmonitor.context.copy=Copia
@@ -1172,9 +1267,11 @@
 
 # LOCALIZATION NOTE (netmonitor.custom.newRequestMethodLabel): This is the label displayed
 # above the method text input field of the new custom request form
+netmonitor.custom.newRequestMethodLabel=Mètode
 
 # LOCALIZATION NOTE (netmonitor.custom.newRequestUrlLabel): This is the label displayed
 # above the url text input field of the new custom request form
+netmonitor.custom.newRequestUrlLabel=URL
 
 # LOCALIZATION NOTE (netmonitor.custom.query): This is the label displayed
 # above the query string entry in the custom request form
@@ -1260,3 +1357,20 @@
 # where a cached object was fetched from (e.g. "disk").
 netmonitor.cache.device=Dispositiu
 
+# LOCALIZATION NOTE (netmonitor.settings.menuTooltip): This is the tooltip that gets displayed
+# when the settings menu button is hovered.
+
+# LOCALIZATION NOTE (netmonitor.settings.importHarTooltip): This is the tooltip that gets displayed
+# when the HAR import menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.saveHarTooltip): This is the tooltip that gets displayed
+# when the HAR save menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
+# when the HAR copy menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/performance.dtd firefox-85.0+build1/l10n/ca-valencia/devtools/client/performance.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/performance.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/performance.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,10 +1,8 @@
 <!-- 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/. -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the Performance strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/sourceeditor.dtd firefox-85.0+build1/l10n/ca-valencia/devtools/client/sourceeditor.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/sourceeditor.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/sourceeditor.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -4,12 +4,9 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
   - strings. The source editor component is used within the Scratchpad and
   - Style Editor tools. -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
   - strings. The source editor component is used within the Style Editor. -->
-
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/storage.dtd firefox-85.0+build1/l10n/ca-valencia/devtools/client/storage.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/devtools/client/storage.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/devtools/client/storage.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,7 +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/. -->
-
 <!-- LOCALIZATION NOTE : This file contains the Storage Inspector strings. -->
 <!-- LOCALIZATION NOTE : Placeholder for the searchbox that allows you to filter the table items. -->
 
@@ -13,4 +12,6 @@
 <!-- LOCALIZATION NOTE : Label of popup menu action to delete all session cookies. -->
 
 <!ENTITY storage.popupMenu.deleteAllSessionCookiesLabel "Suprimeix totes les galetes de sessió">
+<!-- LOCALIZATION NOTE : Label of popup menu action to copy a storage item. -->
 
+<!ENTITY storage.popupMenu.copyLabel "Copia">
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/accessibility/AccessFu.properties firefox-85.0+build1/l10n/ca-valencia/dom/chrome/accessibility/AccessFu.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/accessibility/AccessFu.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/dom/chrome/accessibility/AccessFu.properties	2021-01-18 20:02:12.000000000 +0000
@@ -130,6 +130,8 @@
 navigation     =       navegació
 search         =       cerca
 
+region         =       regió
+
 # LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
 # Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/accessibility/mac/accessible.properties firefox-85.0+build1/l10n/ca-valencia/dom/chrome/accessibility/mac/accessible.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/accessibility/mac/accessible.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/dom/chrome/accessibility/mac/accessible.properties	2021-01-18 20:02:12.000000000 +0000
@@ -38,6 +38,7 @@
 # The (spoken) role description for various WAI-ARIA roles
 alert       =      alerta
 alertDialog =      diàleg d'alerta
+dialog      =      diàleg
 article     =      article
 document    =      document
 # The (spoken) role description for the WAI-ARIA figure role
@@ -56,3 +57,9 @@
 tooltip     =      indicador de funció
 separator    =      separador
 tabPanel     =      subfinestra de pestanyes
+# The roleDescription for the html:mark element
+highlight = ressalta
+# The roleDescription for the details element
+details = detalls
+# The roleDescription for the summary element
+summary = resum
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/netError.dtd firefox-85.0+build1/l10n/ca-valencia/dom/chrome/netError.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/dom/chrome/netError.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/dom/chrome/netError.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -4,7 +4,6 @@
 
 <!ENTITY loadError.label "Error de càrrega de la pàgina">
 <!ENTITY retry.label "Torneu-ho a provar">
-
 <!-- Specific error messages -->
 
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/dom/dom/media.ftl firefox-85.0+build1/l10n/ca-valencia/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/dom/dom/media.ftl	2021-01-18 20:02:12.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/.
+
+mediastatus-fallback-title = El { -brand-short-name } està reproduint multimèdia
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/ca-valencia/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:02:12.000000000 +0000
@@ -7,6 +7,9 @@
 
 CertPassPromptDefault=Introduïu la vostra contrasenya mestra.
 
+
+CertPasswordPromptDefault=Introduïu la contrasenya principal.
+
 # The following strings have special requirements: they must fit in a 32 or 64
 # bytes buffer after being encoded to UTF-8.
 #
@@ -262,7 +265,6 @@
 certErrorTrust_UnknownIssuer=No es confia en el certificat perquè se'n desconeix l'emissor.
 certErrorTrust_UnknownIssuer2=És possible que el servidor no estiga enviant els certificats intermedis.
 certErrorTrust_UnknownIssuer3=És possible que calga 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.
@@ -270,7 +272,6 @@
 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 (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:
@@ -284,8 +285,6 @@
 # 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-84.0.2+build1/l10n/ca-valencia/security/manager/chrome/pippki/pippki.properties firefox-85.0+build1/l10n/ca-valencia/security/manager/chrome/pippki/pippki.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/security/manager/chrome/pippki/pippki.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/security/manager/chrome/pippki/pippki.properties	2021-01-18 20:02:12.000000000 +0000
@@ -76,7 +76,7 @@
 incorrect_pw=No heu introduït la contrasenya mestra actual correcta. Torneu-ho a provar.
 pw_change_ok=La contrasenya mestra s'ha canviat correctament.
 pw_erased_ok=Avís! Heu suprimit la vostra contrasenya mestra. 
-pw_not_wanted=Avís! Heu decidit no utilitzar una contrasenya mestra.
+pw_not_wanted=Avís! Heu decidit no utilitzar cap contrasenya mestra.
 pw_empty_warning=Les vostres contrasenyes de web i de correu electrònic, les dades dels formularis i les claus privades emmagatzemades no es protegiran.
 pw_change2empty_in_fips_mode=Vos trobeu en mode FIPS. El FIPS requereix una contrasenya mestra que no siga buida.
 enable_fips=Habilita els FIPS
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/ca-valencia/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/security/manager/security/certificates/certManager.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/security/manager/security/certificates/certManager.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -8,6 +8,9 @@
 certmgr-tab-mine =
     .label = Els vostres certificats
 
+certmgr-tab-remembered =
+    .label = Decisions d'autenticació
+
 certmgr-tab-people =
     .label = D'altri
 
@@ -18,6 +21,7 @@
     .label = Entitats
 
 certmgr-mine = Teniu certificats d'estes organitzacions que vos identifiquen
+certmgr-remembered = Estos certificats s'utilitzen per identificar-vos en els llocs web
 certmgr-people = Teniu certificats al fitxer que identifiquen esta gent
 certmgr-servers = Teniu certificats al fitxer que identifiquen estos servidors
 certmgr-ca = Teniu certificats al fitxer que identifiquen estes entitats certificadores
@@ -74,6 +78,9 @@
     .title = Suprimeix el certificat
     .style = width: 48em; height: 24em;
 
+certmgr-cert-host =
+    .label = Amfitrió
+
 certmgr-cert-name =
     .label = Nom del certificat
 
@@ -272,6 +279,9 @@
 cert-not-verified_algorithm-disabled = No s'ha pogut verificar el certificat perquè ha estat signat amb un algorisme de signatura que va ser inhabilitat per no ser segur.
 cert-not-verified-unknown = No s'ha pogut comprovar el certificat per raons desconegudes.
 
+# Used to indicate that the user chose not to send a client authentication certificate to a server that requested one in a TLS handshake.
+send-no-client-certificate = No envies cap certificat de client
+
 ## Add Security Exception dialog
 
 add-exception-branded-warning = Esteu a punt de sobreescriure com el { -brand-short-name } identifica este lloc.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/security/manager/security/pippki/pippki.ftl firefox-85.0+build1/l10n/ca-valencia/security/manager/security/pippki/pippki.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/security/manager/security/pippki/pippki.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/security/manager/security/pippki/pippki.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -9,6 +9,9 @@
 change-password-window =
     .title = Canvia la contrasenya mestra
 
+change-device-password-window =
+    .title = Canvia la contrasenya
+
 # Variables:
 # $tokenName (String) - Security device of the change password dialog
 change-password-token = Dispositiu de seguretat: { $tokenName }
@@ -22,6 +25,16 @@
     .title = Reinicia la contrasenya mestra
     .style = width: 40em
 
+pippki-failed-pw-change = No s'ha pogut canviar la contrasenya.
+pippki-incorrect-pw = No heu introduït la contrasenya actual correcta. Torneu-ho a provar.
+pippki-pw-change-ok = La contrasenya s'ha canviat correctament.
+
+pippki-pw-empty-warning = Les contrasenyes i claus privades que guardeu no estaran protegides.
+pippki-pw-erased-ok = Heu suprimit la vostra contrasenya. { pippki-pw-empty-warning }
+pippki-pw-not-wanted = Avís! Heu decidit no utilitzar cap contrasenya. { pippki-pw-empty-warning }
+
+pippki-pw-change2empty-in-fips-mode = Vos trobeu en mode FIPS. El FIPS requereix una contrasenya que no siga buida.
+
 ## Reset Primary Password dialog
 
 reset-primary-password-window =
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/aboutReader.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/aboutReader.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/aboutReader.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/aboutReader.properties	2021-01-18 20:02:12.000000000 +0000
@@ -35,11 +35,18 @@
 aboutReader.fontType.sans-serif=Sans-serif
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
+# For followup see: https://bugzilla.mozilla.org/show_bug.cgi?id=1637089
 aboutReader.fontTypeSample=Aa
 
 aboutReader.toolbar.close=Tanca la vista de lectura
 aboutReader.toolbar.typeControls=Controls de la lletra
 
+# This is used as a label for the Reader View toolbar button.
+# This is a label used for the Save to Pocket option in the toolbar.
+# %S is replaced by Pocket.
+readerView.savetopocket.label=Guarda al %S
+# This is a label used for done option in the toolbar
+readerView.done.label=Fet
 # These are used for the Reader View toolbar button and the menuitem within the
 # View menu.
 readerView.enter=Entra a la vista de lectura
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/aboutStudies.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/aboutStudies.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/aboutStudies.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/aboutStudies.properties	2021-01-18 20:02:12.000000000 +0000
@@ -30,4 +30,3 @@
 # name of a preference (such as "stream.improvesearch.topSiteSearchShortcuts")
 # and $2%S will be replaced with the value of that preference. Both values will
 # be formatted differently than the surrounding text.
-
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/datetimebox.dtd firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/datetimebox.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/datetimebox.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/datetimebox.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,7 +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/. -->
-
 <!-- Placeholders for input type=time -->
 
 
@@ -10,7 +9,6 @@
 <!ENTITY time.second.placeholder "--">
 <!ENTITY time.millisecond.placeholder "--">
 <!ENTITY time.dayperiod.placeholder "--">
-
 <!-- Field labels for input type=time -->
 
 
@@ -19,21 +17,18 @@
 <!ENTITY time.second.label "Segons">
 <!ENTITY time.millisecond.label "Mil·lisegons">
 <!ENTITY time.dayperiod.label "AM/PM">
-
 <!-- Placeholders for input type=date -->
 
 
 <!ENTITY date.year.placeholder "aaaa">
 <!ENTITY date.month.placeholder "mm">
 <!ENTITY date.day.placeholder "dd">
-
 <!-- Field labels for input type=date -->
 
 
 <!ENTITY date.year.label "Any">
 <!ENTITY date.month.label "Mes">
 <!ENTITY date.day.label "Dia">
-
 <!-- Date/time clear button -->
 
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/dialogOverlay.dtd firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/dialogOverlay.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/dialogOverlay.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/dialogOverlay.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,7 +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/. -->
-
 <!-- WARNING!!! This file is obsoleted by the dialog.xml widget -->
 <!-- OK Cancel Buttons -->
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/narrate.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/narrate.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/narrate.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/narrate.properties	2021-01-18 20:02:12.000000000 +0000
@@ -2,6 +2,10 @@
 # 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/.
 
+# "Listen, which allows users to listen to Firefox reading the text,
+# instead of having to read it themselves." This is the name
+# of the feature and it is the label for the popup button.
+listen = Escolta
 back = Arrere
 start = Inici
 stop = Para
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/videocontrols.dtd firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/videocontrols.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/global/videocontrols.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/global/videocontrols.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -2,6 +2,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
 <!ENTITY playButton.playLabel "Reprodueix">
 <!ENTITY playButton.pauseLabel "Pausa">
 <!ENTITY muteButton.muteLabel "Silencia">
@@ -17,6 +20,15 @@
 the Picture-in-Picture video toggle button when the mouse is hovering it. -->
 
 <!ENTITY pictureInPicture.label "Imatge sobre imatge">
+<!-- LOCALIZATION NOTE (pictureInPictureToggle.label): This string is used as the
+label for a variation of the Picture-in-Picture video toggle button when the mouse is
+hovering over the video. -->
+
+<!ENTITY pictureInPictureToggle.label "Mostra en mode d'Imatge sobre Imatge">
+<!-- LOCALIZATION NOTE (pictureInPictureExplainer): This string is used as part of
+a variation of the Picture-in-Picture video toggle button. When using this variation,
+this string appears below the toggle when the mouse hovers the toggle. -->
+<!ENTITY pictureInPictureExplainer "Reproduïu vídeos en primer pla mentre feu altres coses en el &brandShortName;">
 
 <!ENTITY error.aborted "S'ha parat la càrrega del vídeo.">
 <!ENTITY error.network "S'ha interromput la reproducció del vídeo a causa d'un problema de la xarxa.">
@@ -26,12 +38,6 @@
 <!ENTITY error.generic "S'ha interromput la reproducció del vídeo a causa d'un problema desconegut.">
 
 <!ENTITY status.pictureInPicture "Este vídeo s'està reproduint en mode d'Imatge sobre imatge.">
-<!-- LOCALIZATION NOTE (scrubberScale.nameFormat): the #1 string is the current
-media position, and the #2 string is the total duration. For example, when at
-the 5 minute mark in a 6 hour long video, #1 would be "5:00" and #2 would be
-"6:00:00", result string would be "5:00 of 6:00:00 elapsed".
--->
-
 <!-- LOCALIZATION NOTE (positionAndDuration.nameFormat): the #1 string is the current
 media position, and the #2 string is the total duration. For example, when at
 the 5 minute mark in a 6 hour long video, #1 would be "5:00" and #2 would be
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/downloads/unknownContentType.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/downloads/unknownContentType.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/downloads/unknownContentType.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/downloads/unknownContentType.properties	2021-01-18 20:02:12.000000000 +0000
@@ -14,5 +14,11 @@
 unknownAccept.label=Guarda el fitxer
 unknownCancel.label=Cancel·la
 fileType=Fitxer %S
-# LOCALIZATION NOTE (orderedFileSizeWithType): first %S is type, second %S is size, and third %S is unit  
+# LOCALIZATION NOTE (orderedFileSizeWithType): first %S is type, second %S is size, and third %S is unit
 orderedFileSizeWithType=%1$S (%2$S %3$S)
+pdfHandlerDescription=PDF (Format de Document Portàtil)
+avifExtHandlerDescription=Fitxer d'imatge AV1 (AVIF)
+pdfExtHandlerDescription=PDF (Format de Document Portàtil)
+svgExtHandlerDescription=SVG (Gràfics vectorials escalables)
+webpExtHandlerDescription=Imatge WebP
+xmlExtHandlerDescription=XML (Llenguatge de marques extensible)
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/extensions/extensions.dtd firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/extensions/extensions.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/extensions/extensions.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/extensions/extensions.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -1,8 +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/. -->
-<!-- addon actions -->
-
-<!-- download/install progress -->
 
 <!ENTITY setting.learnmore "Més informació…">
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/profile/profileSelection.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/profile/profileSelection.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-18 20:02:12.000000000 +0000
@@ -5,8 +5,9 @@
 # LOCALIZATION NOTE: These strings are used for startup/profile problems and the profile manager.
 
 # Application not responding
-# LOCALIZATION NOTE (restartTitle, restartMessageNoUnlocker, restartMessageUnlocker, restartMessageNoUnlockerMac, restartMessageUnlockerMac): Messages displayed when the application is running but is not responding to commands. %S is the application name.
+# LOCALIZATION NOTE (restartTitle, restartMessageNoUnlocker2, restartMessageUnlocker, restartMessageNoUnlockerMac, restartMessageUnlockerMac): Messages displayed when the application is running but is not responding to commands. %S is the application name.
 restartTitle=Tanca el %S
+restartMessageNoUnlocker2=El %S ja s'està executant, però no respon. Per usar el %S, primer heu de tancar el procés del %S existent, reiniciar el vostre dispositiu o usar un altre perfil.
 restartMessageUnlocker=El %S ja s'està executant, però no està responent. El procés antic %S ha de tancar-se per obrir una finestra nova.
 restartMessageNoUnlockerMac=Ja s'està executant una còpia del %S. Només pot executar-se una còpia del %S cada vegada.
 restartMessageUnlockerMac=Ja s'està executant una còpia del %S. Se eixirà de la còpia del %S en execució per poder obrir esta.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/passwordmgr/passwordmgr.properties firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/passwordmgr/passwordmgr.properties
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-18 20:02:12.000000000 +0000
@@ -21,6 +21,8 @@
 updateLoginButtonAccessKey = A
 updateLoginButtonDeny.label = No actualitzes
 updateLoginButtonDeny.accesskey = N
+updateLoginButtonDelete.label = Elimina l'inici de sessió guardat
+updateLoginButtonDelete.accesskey = E
 # LOCALIZATION NOTE (rememberPasswordMsg):
 # 1st string is the username for the login, 2nd is the login's hostname.
 # Note that long usernames may be truncated.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/pluginproblem/pluginproblem.dtd firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/pluginproblem/pluginproblem.dtd
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-18 20:02:12.000000000 +0000
@@ -9,7 +9,6 @@
 <!ENTITY blockedPlugin.label                                 "S'ha blocat este connector per a la vostra protecció.">
 <!ENTITY hidePluginBtn.label                                 "Amaga el connector">
 <!ENTITY managePlugins                                       "Gestiona els connectors…">
-
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAbout.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAbout.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAbout.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAbout.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -3,4 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 about-about-title = Quant al «Quant a»
-about-about-note = Esta és una llista de pàgines «Quant a» per a la vostra comoditat.<br/> Algunes d'elles poden ser un poc confuses. Altres només serveixen per realitzar diagnòstics.<br/> I se n'han omés altres perquè requereixen cadenes de consulta.
+about-about-note =
+    Esta és una llista de pàgines «Quant a» per a la vostra comoditat.<br/>
+    Algunes poden ser un poc confuses. Altres només serveixen per realitzar diagnòstics.<br/>
+    I se n'han omés altres perquè requereixen cadenes de consulta.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -4,63 +4,46 @@
 
 addons-window =
     .title = Gestor de complements
-
 addons-page-title = Gestor de complements
-
 search-header =
     .placeholder = Cerca a addons.mozilla.org
     .searchbuttonlabel = Cerca
-
 search-header-shortcut =
     .key = f
-
 list-empty-installed =
     .value = No teniu instal·lat cap complement d'este tipus
-
 list-empty-available-updates =
     .value = No s'ha trobat cap actualització
-
 list-empty-recent-updates =
     .value = No heu actualitzat recentment cap complement
-
 list-empty-find-updates =
     .label = Cerca actualitzacions
-
 list-empty-button =
     .label = Més informació dels complements
-
 help-button = Assistència per als complements
-
 sidebar-help-button-title =
     .title = Assistència per als complements
-
 preferences =
     { PLATFORM() ->
         [windows] Opcions del { -brand-short-name }
        *[other] Preferències del { -brand-short-name }
     }
-
 sidebar-preferences-button-title =
     .title =
         { PLATFORM() ->
             [windows] Opcions del { -brand-short-name }
            *[other] Preferències del { -brand-short-name }
         }
-
 show-unsigned-extensions-button =
     .label = No s'han pogut verificar algunes extensions
-
 show-all-extensions-button =
     .label = Mostra totes les extensions
-
 cmd-show-details =
     .label = Mostra més informació
     .accesskey = s
-
 cmd-find-updates =
     .label = Cerca actualitzacions
     .accesskey = C
-
 cmd-preferences =
     .label =
         { PLATFORM() ->
@@ -72,90 +55,65 @@
             [windows] O
            *[other] P
         }
-
 cmd-enable-theme =
     .label = Emprova't el tema
     .accesskey = v
-
 cmd-disable-theme =
     .label = Deixa el tema
     .accesskey = x
-
 cmd-install-addon =
     .label = Instal·la
     .accesskey = I
-
 cmd-contribute =
     .label = Col·labora-hi
     .accesskey = C
     .tooltiptext = Col·labora en el desenvolupament del complement
-
 detail-version =
     .label = Versió
-
 detail-last-updated =
     .label = Darrera actualització
-
 detail-contributions-description = El desenvolupador del complement vos demana que l'ajudeu a continuar amb el seu desenvolupament fent una donació.
-
 detail-contributions-button = Col·labora-hi
     .title = Col·labora en el desenvolupament del complement
     .accesskey = C
-
 detail-update-type =
     .value = Actualitzacions automàtiques
-
 detail-update-default =
     .label = Per defecte
     .tooltiptext = Instal·la automàticament les actualitzacions només si és el comportament per defecte
-
 detail-update-automatic =
     .label = Activades
     .tooltiptext = Instal·la actualitzacions automàticament
-
 detail-update-manual =
     .label = Desactivades
     .tooltiptext = No instal·les actualitzacions automàticament
-
 # Used as a description for the option to allow or block an add-on in private windows.
 detail-private-browsing-label = Executa en finestres privades
-
 # Some add-ons may elect to not run in private windows by setting incognito: not_allowed in the manifest.  This
 # cannot be overridden by the user.
 detail-private-disallowed-label = No es permet en finestres privades
-
 detail-private-disallowed-description2 = Esta 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-description2 = Esta 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
-
 detail-private-browsing-off =
     .label = No ho permetes
     .tooltiptext = Desactiva en la navegació privada
-
 detail-home =
     .label = Pàgina d'inici
-
 detail-home-value =
     .value = { detail-home.label }
-
 detail-repository =
     .label = Perfil del complement
-
 detail-repository-value =
     .value = { detail-repository.label }
-
 detail-check-for-updates =
     .label = Cerca actualitzacions
     .accesskey = t
     .tooltiptext = Cerca actualitzacions d'este complement
-
 detail-show-preferences =
     .label =
         { PLATFORM() ->
@@ -172,35 +130,23 @@
             [windows] Canvia les opcions del complement
            *[other] Canvia les preferències del complement
         }
-
 detail-rating =
     .value = Puntuació
-
 addon-restart-now =
     .label = Reinicia ara
-
 disabled-unsigned-heading =
     .value = S'han inhabilitat alguns complements
-
 disabled-unsigned-description = Els complements següents no s'han verificat per al seu ús al { -brand-short-name }. Podeu <label data-l10n-name="find-addons">cercar un altre complement similar</label> o demanar al desenvolupador que els verifiqui.
-
 disabled-unsigned-learn-more = Més informació sobre els nostres esforços per garantir la vostra seguretat a Internet.
-
 disabled-unsigned-devinfo = Els desenvolupadors interessats en la verificació dels seus complements poden llegir el nostre <label data-l10n-name="learn-more">manual</label>.
-
 plugin-deprecation-description = Vos falta res? Alguns complements ja no són compatibles amb el { -brand-short-name }. <label data-l10n-name="learn-more">Més informació.</label>
-
 legacy-warning-show-legacy = Mostra les extensions antigues
-
 legacy-extensions =
     .value = Extensions antigues
-
 legacy-extensions-description = Estes extensions no compleixen els estàndards actuals del { -brand-short-name } i s'han desactivat. <label data-l10n-name="legacy-learn-more">Més informació sobre els canvis en els complements</label>
-
 private-browsing-description2 =
     El { -brand-short-name } ha canviat el funcionament de les extensions en la navegació privada. Per defecte, les extensions noves que s'afegeixin al { -brand-short-name } no s'executaran en les finestres privades. Llevat que ho permeteu als paràmetres, l'extensió no funcionarà durant la navegació privada i no tindrà accés a les vostres activitats en línia. Hem fet aquest canvi per garantir la privadesa de la vostra navegació quan s'utilitzen les finestres privades.
     <label data-l10n-name="private-browsing-learn-more">Més informació sobre com gestionar els paràmetres de les extensions</label>
-
 addon-category-discover = Recomanacions
 addon-category-discover-title =
     .title = Recomanacions
@@ -236,7 +182,6 @@
 extensions-warning-update-security-button = Habilita
     .title = Habilita la comprovació de seguretat dels complements
 
-
 ## Strings connected to add-on updates
 
 addon-updates-check-for-updates = Cerca actualitzacions
@@ -282,42 +227,34 @@
 # This is displayed in the page options menu
 addon-manage-extensions-shortcuts = Gestiona les dreceres de les extensions
     .accesskey = G
-
 shortcuts-no-addons = No teniu cap extensió activada.
 shortcuts-no-commands = Les extensions següents no tenen dreceres:
 shortcuts-input =
     .placeholder = Escriviu una drecera
-
+shortcuts-browserAction2 = Activa el botó de la barra d'eines
 shortcuts-pageAction = Activeu l'acció de la pàgina
 shortcuts-sidebarAction = Mostra/amaga la barra lateral
-
 shortcuts-modifier-mac = Cal incloure Ctrl, Alt o ⌘
 shortcuts-modifier-other = Cal incloure Ctrl o Alt
 shortcuts-invalid = La combinació no és vàlida
 shortcuts-letter = Escriviu una lletra
 shortcuts-system = Les dreceres del { -brand-short-name } no es poden substituir
-
 # String displayed in warning label when there is a duplicate shortcut
 shortcuts-duplicate = Drecera duplicada
-
 # 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 } ja s'utilitza com a drecera en més d’un cas. Les dreceres duplicades poden causar un comportament inesperat.
-
 # String displayed when a keyboard shortcut is already used by another add-on
 # Variables:
 #   $addon (string) - Name of the add-on
 shortcuts-exists = Ja s'utilitza en { $addon }
-
 shortcuts-card-expand-button =
     { $numberToShow ->
         [one] Mostra'n { $numberToShow } més
        *[other] Mostra'n { $numberToShow } més
     }
-
 shortcuts-card-collapse-button = Mostra'n menys
-
 header-back-button =
     .title = Vés arrere
 
@@ -326,15 +263,12 @@
 # Explanatory introduction to the list of recommended add-ons. The action word
 # ("recommends") in the final sentence is a link to external documentation.
 discopane-intro = Les extensions i els temes són com les aplicacions per al navegador i vos permeten protegir les contrasenyes, baixar vídeos, trobar ofertes, blocar anuncis molestos, canviar com es veu el vostre navegador i molt més. Estos petits programes sovint són desenvolupats per tercers. Ací teniu una selecció <a data-l10n-name="learn-more-trigger">recomanada</a> pel { -brand-product-name } per aconseguir un nivell excepcional de seguretat, rendiment i funcionalitat.
-
 # Notice to make user aware that the recommendations are personalized.
 discopane-notice-recommendations =
     Algunes d’aquestes recomanacions són personalitzades. Es basen en altres
     extensions que heu instal·lat, preferències del perfil i estadístiques d’ús.
 discopane-notice-learn-more = Més informació
-
 privacy-policy = Política de privadesa
-
 # Refers to the author of an add-on, shown below the name of the add-on.
 # Variables:
 #   $author (string) - The name of the add-on developer.
@@ -348,8 +282,7 @@
 # The label of the button that appears after installing an add-on. Upon click,
 # 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
-
+find-more-addons = Cerca 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 =
@@ -375,43 +308,36 @@
 details-addon-button = Detalls
 release-notes-addon-button = Notes de la versió
 permissions-addon-button = Permisos
-
 extension-enabled-heading = Activades
 extension-disabled-heading = Desactivades
-
 theme-enabled-heading = Activat
 theme-disabled-heading = Desactivats
-
 plugin-enabled-heading = Activats
 plugin-disabled-heading = Desactivats
-
 dictionary-enabled-heading = Activats
 dictionary-disabled-heading = Desactivats
-
 locale-enabled-heading = Activat
 locale-disabled-heading = Desactivats
-
 ask-to-activate-button = Demana si vull activar-lo
 always-activate-button = Activa'l sempre
 never-activate-button = No l'activis mai
-
 addon-detail-author-label = Autor
 addon-detail-version-label = Versió
 addon-detail-last-updated-label = Darrera actualització
 addon-detail-homepage-label = Pàgina d'inici
 addon-detail-rating-label = Valoració
-
+# Message for add-ons with a staged pending update.
+install-postponed-message = Esta extensió s'actualitzarà en reiniciar el { -brand-short-name }.
+install-postponed-button = Actualitza ara
 # The average rating that the add-on has received.
 # Variables:
 #   $rating (number) - A number between 0 and 5. The translation should show at most one digit after the comma.
 five-star-rating =
     .title = Valorat amb { NUMBER($rating, maximumFractionDigits: 1) } de 5 estrelles
-
 # This string is used to show that an add-on is disabled.
 # Variables:
 #   $name (string) - The name of the add-on
 addon-name-disabled = { $name } (desactivat)
-
 # The number of reviews that an add-on has received on AMO.
 # Variables:
 #   $numberOfReviews (number) - The number of reviews received
@@ -427,14 +353,12 @@
 #   $addon (string) - Name of the add-on
 pending-uninstall-description = <span data-l10n-name="addon-name">{ $addon }</span> s'ha eliminat.
 pending-uninstall-undo-button = Desfés
-
 addon-detail-updates-label = Permet actualitzacions automàtiques
 addon-detail-updates-radio-default = Per defecte
 addon-detail-updates-radio-on = Sí
 addon-detail-updates-radio-off = No
 addon-detail-update-check-label = Cerca actualitzacions
 install-update-button = Actualitza
-
 # 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 =
@@ -443,24 +367,18 @@
 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. <a data-l10n-name="learn-more">Més informació</a>
 addon-detail-private-browsing-allow = Permet
 addon-detail-private-browsing-disallow = No ho permetes
-
 # 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…
 release-notes-error = S'ha produït un error en carregar les notes de la versió.
-
 addon-permissions-empty = Esta extensió no necessita cap permís
-
 recommended-extensions-heading = Extensions recomanades
 recommended-themes-heading = Temes recomanats
-
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
 # list view. The "Firefox Color" name itself should not be translated.
 recommended-theme-1 = Vos sentiu creatiu? <a data-l10n-name="link">Creeu el vostre propi tema amb el Firefox Color.</a>
@@ -475,10 +393,8 @@
 updates-heading = Gestioneu les actualitzacions
 discover-heading = Personalitzeu el { -brand-short-name }
 shortcuts-heading = Gestioneu les dreceres de les extensions
-
-default-heading-search-label = Cerqueu més complements
+default-heading-search-label = Cerca més complements
 addons-heading-search-input =
     .placeholder = Cerca a addons.mozilla.org
-
 addon-page-options-button =
     .title = Eines per a tots els complements
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -2,3 +2,20 @@
 # 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/.
 
+about-httpsonly-insecure-title = Connexió segura no disponible
+# Variables:
+#   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
+about-httpsonly-insecure-explanation-unavailable = Navegueu en mode només HTTPS i no hi ha disponible la versió HTTPS segura de <em>{ $websiteUrl }</em>.
+about-httpsonly-insecure-explanation-reasons = El més probable és que el lloc web no admeti HTTPS, però també podria ser que un atacant estiguera blocant la versió HTTPS.
+about-httpsonly-insecure-explanation-exception = Per bé que el risc de seguretat és baix, si decidiu visitar la versió HTTP del lloc web, no hi hauríeu d’introduir informació confidencial com ara contrasenyes, adreces electròniques o targetes de crèdit.
+about-httpsonly-button-make-exception = Accepte el risc i vull continuar al lloc
+about-httpsonly-title = El { -brand-short-name } ha detectat un problema potencial de seguretat
+# Variables:
+#   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
+about-httpsonly-explanation-unavailable = Navegueu en mode només HTTPS i no hi ha disponible la versió HTTPS segura de <em>{ $websiteUrl }</em>.
+about-httpsonly-explanation-question = Quin motiu podria haver-hi?
+about-httpsonly-explanation-nosupport = El més probable és que el lloc web no admeti HTTPS.
+about-httpsonly-explanation-risk = També podria ser un intent d'atac. Si decidiu visitar el lloc web, no hi hauríeu d’introduir informació confidencial com ara contrasenyes, adreces electròniques o targetes de crèdit.
+about-httpsonly-button-accept-and-continue = Accepte el risc i vull continuar
+about-httpsonly-button-go-back = Vés arrere
+about-httpsonly-link-learn-more = Més informació…
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutMozilla.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutMozilla.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -2,3 +2,4 @@
 # 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/.
 
+about-mozilla-title-6-27 = El Llibre de Mozilla, 6:27
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -4,7 +4,6 @@
 
 page-title = Informació de resolució de problemes
 page-subtitle = Esta pàgina conté informació tècnica que pot ser útil quan proveu de resoldre un problema. Si cerqueu respostes per a preguntes freqüents del { -brand-short-name }, visiteu el nostre <a data-l10n-name="support-link">lloc web d'assistència</a>.
-
 crashes-title = Informes de fallada
 crashes-id = Identificador de l'informe
 crashes-send-date = Data d'enviament
@@ -15,7 +14,10 @@
 extensions-enabled = Habilitada
 extensions-version = Versió
 extensions-id = ID
+support-addons-title = Complements
 support-addons-name = Nom
+support-addons-type = Tipus
+support-addons-enabled = Activat
 support-addons-version = Versió
 support-addons-id = ID
 security-software-title = Programari de seguretat
@@ -35,6 +37,7 @@
 app-basics-name = Nom
 app-basics-version = Versió
 app-basics-build-id = Identificador del muntatge
+app-basics-distribution-id = ID de distribució
 app-basics-update-channel = Canal d'actualitzacions
 # This message refers to the folder used to store updates on the device,
 # as in "Folder for updates". "Update" is a noun, not a verb.
@@ -74,6 +77,12 @@
         [windows] Obre la carpeta
        *[other] Obre el directori
     }
+environment-variables-title = Variables d'entorn
+environment-variables-name = Nom
+environment-variables-value = Valor
+experimental-features-title = Funcions experimentals
+experimental-features-name = Nom
+experimental-features-value = Valor
 modified-key-prefs-title = Preferències modificades importants
 modified-prefs-name = Nom
 modified-prefs-value = Valor
@@ -93,6 +102,8 @@
 graphics-workarounds-title = Solucions temporals
 # Windowing system in use on Linux (e.g. X11, Wayland).
 graphics-window-protocol = Protocol de finestres
+# Desktop environment in use on Linux (e.g. GNOME, KDE, XFCE, etc).
+graphics-desktop-environment = Entorn d'escriptori
 place-database-title = Base de dades de llocs
 place-database-integrity = Integritat
 place-database-verify-integrity = Verifica la integritat
@@ -115,12 +126,18 @@
 sandbox-sys-call-args = Arguments
 safe-mode-title = Proveu el mode segur
 restart-in-safe-mode-label = Reinicia amb els complements inhabilitats…
+clear-startup-cache-title = Proveu d'esborrar la memòria cau d'inici
+clear-startup-cache-label = Esborra la memòria cau d'inici…
+startup-cache-dialog-title = Esborra la memòria cau d’inici
+startup-cache-dialog-body = Reinicieu el { -brand-short-name } per esborrar la memòria cau d'inici. Això no canviarà els vostres paràmetres ni eliminarà cap extensió que hàgeu afegit al { -brand-short-name }.
+restart-button-label = Reinicia
 
 ## Media titles
 
 audio-backend = Sistema de fons d'àudio
 max-audio-channels = Nombre màxim de canals
 sample-rate = Freqüència de mostratge preferida
+roundtrip-latency = Latència d'anada i tornada (desviació estàndard)
 media-title = Multimèdia
 media-output-devices-title = Dispositius d'eixida
 media-input-devices-title = Dispositius d'entrada
@@ -167,7 +184,6 @@
         [one] Informes de fallada de l'últim dia
        *[other] Informes de fallada dels últims { $days } dies
     }
-
 # Variables
 # $minutes (integer) - Number of minutes since crash
 crashes-time-minutes =
@@ -175,7 +191,6 @@
         [one] Fa un minut
        *[other] Fa { $minutes } minuts
     }
-
 # Variables
 # $hours (integer) - Number of hours since crash
 crashes-time-hours =
@@ -183,7 +198,6 @@
         [one] Fa una hora
        *[other] Fa { $hours } hores
     }
-
 # Variables
 # $days (integer) - Number of days since crash
 crashes-time-days =
@@ -191,7 +205,6 @@
         [one] Fa un dia
        *[other] Fa { $days } dies
     }
-
 # Variables
 # $reports (integer) - Number of pending reports
 pending-reports =
@@ -199,7 +212,6 @@
         [one] Tots els informes de fallada (inclosa { $reports } fallada pendent dins el període de temps indicat)
        *[other] Tots els informes de fallada (incloses { $reports } fallades pendents dins el període de temps indicat)
     }
-
 raw-data-copied = Les dades sense processar s'han copiat al porta-retalls
 text-copied = S'ha copiat el text al porta-retalls
 
@@ -212,11 +224,9 @@
 # Variables
 # $driverVersion - The graphics driver version string
 try-newer-driver = Blocat pel controlador gràfic. Proveu d'actualitzar-lo a la versió { $driverVersion } o posterior.
-
 # "ClearType" is a proper noun and should not be translated. Feel free to leave English strings if
 # there are no good translations, these are only used in about:support
 clear-type-parameters = Paràmetres ClearType
-
 compositing = Composició
 hardware-h264 = Descodificació H264 per maquinari
 main-thread-no-omtc = fil principal, sense OMTC
@@ -231,7 +241,6 @@
 
 found = S'ha trobat
 missing = Falta
-
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = Descripció
@@ -247,26 +256,20 @@
 webgl1-extensions = Extensions WebGL 1
 webgl2-extensions = Extensions WebGL 2
 blocklisted-bug = És a la llista de bloquejos per problemes coneguts
-
 # Variables
 # $bugNumber (string) - String of bug number from Bugzilla
 bug-link = error { $bugNumber }
-
 # Variables
 # $failureCode (string) - String that can be searched in the source tree.
 unknown-failure = És a la llista de bloquejos; codi d'error { $failureCode }
-
 d3d11layers-crash-guard = Compositor D3D11
 d3d11video-crash-guard = Descodificador de vídeo D3D11
 d3d9video-crash-guard = Descodificador de vídeo D3D9
 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
-
 min-lib-versions = Versió mínima esperada
 loaded-lib-versions = Versió en ús
-
 has-seccomp-bpf = Seccomp-BPF (filtratge de crides del sistema)
 has-seccomp-tsync = Sincronització de fils Seccomp
 has-user-namespaces = Espais de noms de l'usuari
@@ -277,10 +280,9 @@
 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
-
+launcher-process-status-unknown = Estat desconegut
 # Variables
 # $remoteWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
@@ -293,7 +295,6 @@
 multi-process-status-7 = Inhabilitat per part dels complements
 multi-process-status-8 = Inhabilitat de forma forçada
 multi-process-status-unknown = Estat desconegut
-
 async-pan-zoom = Pan/Zoom asíncrons
 apz-none = cap
 wheel-enabled = entrada amb roda activada
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/about/certviewer.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -16,17 +16,24 @@
 certificate-viewer-cipher-suite = Entorn de xifratge
 certificate-viewer-common-name = Nom comú
 certificate-viewer-email-address = Adreça electrònica
+# Variables:
+#   $firstCertName (String) - Common Name for the displayed certificate
+certificate-viewer-tab-title = Certificat per a { $firstCertName }
 # Inc. means Incorporated, e.g GitHub is incorporated in Delaware
 certificate-viewer-inc-country = País (empresa)
 certificate-viewer-country = País
 certificate-viewer-curve = Corba
 certificate-viewer-distribution-point = Punt de distribució
 certificate-viewer-dns-name = Nom DNS
+certificate-viewer-ip-address = Adreça IP
+certificate-viewer-other-name = Nom alternatiu
 certificate-viewer-exponent = Exponent
 certificate-viewer-id = ID
 certificate-viewer-key-exchange-group = Grup d'intercanvi de claus
 certificate-viewer-key-id = ID de la clau
 certificate-viewer-key-size = Mida de la clau
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-locality = Localitat (empresa)
 certificate-viewer-locality = Localitat
 certificate-viewer-location = Ubicació
 certificate-viewer-logid = ID de registre
@@ -44,6 +51,7 @@
 certificate-viewer-qualifier = Qualificador
 certificate-viewer-qualifiers = Qualificadors
 certificate-viewer-required = Obligatori
+certificate-viewer-unsupported = &lt;incompatible&gt;
 # Inc. means Incorporated, e.g GitHub is incorporated in Delaware
 certificate-viewer-inc-state-province = Estat/província (empresa)
 certificate-viewer-state-province = Estat/província
@@ -73,8 +81,7 @@
 certificate-viewer-certificate-policies = Polítiques de certificats
 certificate-viewer-embedded-scts = SCT incrustats
 certificate-viewer-crl-endpoints = Punts finals CRL
-
-# This message is used as a row header in the Miscellaneous section. 
+# This message is used as a row header in the Miscellaneous section.
 # The associated data cell contains links to download the certificate.
 certificate-viewer-download = Baixa
 # This message is used to replace boolean values (true/false) in several certificate fields, e.g. Certificate Authority
@@ -93,6 +100,16 @@
     .download = { $fileName }.pem
 certificate-viewer-download-pem-chain = PEM (cadena)
     .download = { $fileName }-chain.pem
+# The title attribute for Critical Extension icon
+certificate-viewer-critical-extension =
+    .title = Esta extensió s'ha marcat com a crítica, que significa que els clients han de rebutjar el certificat si no l'entenen.
+certificate-viewer-export = Exporta
+    .download = { $fileName }.pem
 
 ## Labels for tabs displayed in stand-alone about:certificate page
 
+certificate-viewer-tab-mine = Els vostres certificats
+certificate-viewer-tab-people = Persones
+certificate-viewer-tab-servers = Servidors
+certificate-viewer-tab-ca = Entitats
+certificate-viewer-tab-unkonwn = Desconegut
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -2,6 +2,14 @@
 # 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/.
 
+# Please keep the emphasis around the hostname and scheme (ie the
+# `<strong>` HTML tags). Please also keep the hostname as close to the start
+# of the sentence as your language's grammar allows.
+#
+# Variables:
+#  $host - the hostname that is initiating the request
+#  $scheme - the type of link that's being opened.
+handler-dialog-host = <strong>{ $host }</strong> vol obrir un enllaç de tipus <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/processTypes.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/processTypes.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/processTypes.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/processTypes.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -29,3 +29,8 @@
 # graphics acceleration
 process-type-gpu = GPU
 
+# process used to perform network operations
+process-type-socket = Sòcol
+
+# process preallocated; may change to other types
+process-type-prealloc = Preassignat
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/unknownContentType.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/unknownContentType.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/unknownContentType.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/unknownContentType.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -2,6 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+unknowncontenttype-handleinternally =
+    .label = Obri amb el { -brand-short-name }
+    .accesskey = e
 unknowncontenttype-settingschange =
     .value =
         { PLATFORM() ->
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -1,3 +1,12 @@
 # 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/.
+
+videocontrols-scrubber =
+    .aria-label = Posició
+# This label is used by screenreaders and other assistive technology to indicate
+# to users how much of the video has been loaded from the network. It will be
+# followed by the percentage of the video that has loaded (e.g. "Loading: 13%").
+videocontrols-buffer-bar-label = S'està carregant:
+videocontrols-volume-control =
+    .aria-label = Volum
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/payments/payments.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/payments/payments.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/payments/payments.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/payments/payments.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -3,8 +3,41 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+# This value isn't used directly, but is defined to avoid duplication
+# in the "credit-card-label-*" strings.
+#
+# Variables:
+#   $month (String): Numeric month the credit card expires
+#   $year (String): Four-digit year the credit card expires
+credit-card-expiration = Data de venciment: { $month }/{ $year }
+
 ## These labels serve as a description of a credit card.
 ## The description must include a credit card number, and may optionally
 ## include a cardholder name, an expiration date, or both, so we have
 ## four variations.
 
+# Label for a credit card with a number only
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+credit-card-label-number = { $number }
+
+# Label for a credit card with a number and name
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+credit-card-label-number-name = { $number }, { $name }
+
+# Label for a credit card with a number and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+credit-card-label-number-expiration = { $number }, { credit-card-expiration }
+
+# Label for a credit card with a number, name, and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+credit-card-label-number-name-expiration = { $number }, { $name }, { credit-card-expiration }
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/preferences/preferences.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/preferences/preferences.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/preferences/preferences.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -11,7 +11,7 @@
 
 pw-empty-warning = Les vostres contrasenyes de web i de correu electrònic, les dades dels formularis i les claus privades emmagatzemades no es protegiran.
 pw-erased-ok = Heu suprimit la vostra contrasenya mestra. { pw-empty-warning }
-pw-not-wanted = Avís! Heu decidit no utilitzar una contrasenya mestra. { pw-empty-warning }
+pw-not-wanted = Avís! Heu decidit no utilitzar cap contrasenya mestra. { pw-empty-warning }
 
 pw-change2empty-in-fips-mode = Vos trobeu en mode FIPS. El FIPS requereix una contrasenya mestra que no siga buida.
 
@@ -19,8 +19,9 @@
 incorrect-pp = No heu introduït la contrasenya principal actual correcta. Torneu-ho a provar.
 pp-change-ok = La contrasenya principal s'ha canviat correctament.
 
+pp-empty-warning = Les contrasenyes i claus privades que guardeu no estaran protegides.
 pp-erased-ok = Heu suprimit la vostra contrasenya principal. { pp-empty-warning }
-pp-not-wanted = Avís! Heu decidit no utilitzar una contrasenya principal. { pp-empty-warning }
+pp-not-wanted = Avís! Heu decidit no utilitzar cap contrasenya principal. { pp-empty-warning }
 
 pp-change2empty-in-fips-mode = Vos trobeu en mode FIPS. El FIPS requereix una contrasenya principal que no siga buida.
 pw-change-success-title = El canvi de contrasenya s'ha realitzat correctament
@@ -38,11 +39,13 @@
 set-password-reenter-password = Torneu a introduir la contrasenya:
 set-password-meter = Mesura de la qualitat de la contrasenya
 set-password-meter-loading = S'està carregant
+master-password-admin = El vostre administrador sol·licita que definiu una contrasenya mestra per guardar les contrasenyes.
 master-password-description = Una contrasenya mestra s'utilitza per protegir informació confidencial, com ara les contrasenyes dels llocs. Si creeu una contrasenya mestra, se vos demanarà que la introduïu una vegada a cada sessió quan el { -brand-short-name } reculli informació guardada protegida per contrasenya.
 master-password-warning = Assegureu-vos que recordeu la contrasenya mestra que heu definit. Si l'oblideu, no podreu accedir a cap informació que protegisca.
 
 remove-password =
     .title = Elimina la contrasenya mestra
+primary-password-admin = El vostre administrador sol·licita que definiu una contrasenya principal per guardar els inicis de sessió i les contrasenyes.
 primary-password-description = Una contrasenya principal s'utilitza per protegir informació confidencial, com ara els inicis de sessió i les contrasenyes, en este dispositiu. Si creeu una contrasenya principal, se vos demanarà que la introduïu una vegada en cada sessió quan el { -brand-short-name } recuperi informació guardada protegida per contrasenya.
 primary-password-warning = Assegureu-vos que recordeu la contrasenya principal que heu definit. Si l'oblideu, no podreu accedir a cap informació protegida en este dispositiu.
 
diff -Nru firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ca-valencia/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:25:58.000000000 +0000
+++ firefox-85.0+build1/l10n/ca-valencia/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:12.000000000 +0000
@@ -2,3 +2,65 @@
 # 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/.
 
+printui-title = Imprimeix
+# Dialog title to prompt the user for a filename to save print to PDF.
+printui-save-to-pdf-title = Anomena i guarda
+# Variables
+# $sheetCount (integer) - Number of paper sheets
+printui-sheets-count =
+    { $sheetCount ->
+        [one] { $sheetCount } full de paper
+       *[other] { $sheetCount } fulls de paper
+    }
+printui-page-range-all = Tot
+printui-page-range-custom = Personalitzat
+printui-page-range-label = Pàgines
+printui-page-range-picker =
+    .aria-label = Trieu l'interval de pàgines
+printui-page-custom-range =
+    .aria-label = Introduïu un interval de pàgines personalitzat
+# This label is displayed before the first input field indicating
+# the start of the range to print.
+printui-range-start = De
+# This label is displayed between the input fields indicating
+# the start and end page of the range to print.
+printui-range-end = a
+# Section title for the number of copies to print
+printui-copies-label = Còpies
+printui-orientation = Orientació
+printui-landscape = Apaïsat
+printui-portrait = Vertical
+# Section title for the printer or destination device to target
+printui-destination-label = Destinació
+printui-destination-pdf-label = Guarda com a PDF
+printui-more-settings = Més paràmetres
+printui-less-settings = Menys paràmetres
+# Section title (noun) for the print scaling options
+printui-scale = Escala
+printui-scale-fit-to-page = Ajusta a la pàgina
+printui-scale-fit-to-page-width = Ajusta a l'amplada de la pàgina
+# Label for input control where user can set the scale percentage
+printui-scale-pcent = Escala
+# Section title for miscellaneous print options
+printui-options = Opcions
+printui-headers-footers-checkbox = Imprimeix capçaleres i peus de pàgina
+printui-backgrounds-checkbox = Imprimeix els fons
+printui-color-mode-label = Mode de color
+printui-color-mode-color = Color
+printui-color-mode-bw = Blanc i negre
+printui-margins = Marges
+printui-margins-default = Per defecte
+printui-margins-min = Mínims
+printui-margins-none = Cap
+printui-system-dialog-link = Imprimeix mitjançant el diàleg del sistema…
+printui-primary-button = Imprimeix
+printui-primary-button-save = Guarda
+printui-cancel-button = Cancel·la
+printui-loading = S'està preparant la previsualització
+
+## Error messages shown when a user has an invalid input
+
+printui-error-invalid-scale = L'escala ha de ser un nombre entre 10 i 200.
+# Variables
+# $numPages (integer) - Number of pages
+printui-error-invalid-range = L'interval ha de ser un nombre entre 1 i { $numPages }.
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/cs/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/aboutCertError.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/aboutCertError.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -5,9 +5,7 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } používá neplatný bezpe�nostní certifikát.
-
 cert-error-mitm-intro = Webové stránky prokazují svou totožnost prostřednictvím certifikátů, které vydávají certifika�ní autority.
-
 cert-error-mitm-mozilla =
     Za { -brand-short-name.gender ->
         [masculine] { -brand-short-name(case: "ins") }
@@ -15,82 +13,64 @@
         [neuter] { -brand-short-name(case: "ins") }
        *[other] aplikací { -brand-short-name }
     } stojí nezisková organizace Mozilla, která spravuje otevřené úložiště certifika�ních autorit (CA). Toto úložiště zajišťuje, aby certifika�ní autority dodržovaly osvěd�ené bezpe�nostní postupy.
-
 cert-error-mitm-connection = { -brand-short-name } používá úložiště certifika�ních autorit od Mozilly, nikoliv úložiště z opera�ního systému. Pokud antivirový program nebo někdo na síti zachytává spojení s použitím certifikátu od autority, která v úložišti Mozilly není, je toto spojení považováno ze nezabezpe�ené.
-
 cert-error-trust-unknown-issuer-intro = Někdo se může snažit vydávat za zmiňovaný server a proto byste neměli v připojení pokra�ovat.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-trust-unknown-issuer = Webové stránky prokazují svou totožnost pomocí certifikátů. { -brand-short-name } nemůže server { $hostname } ověřit, protože vydavatel zaslaného certifikátu je neznámý, certifikát je podepsaný sám sebou nebo server neposílá správné mezilehlé certifikáty.
-
 cert-error-trust-cert-invalid = Certifikát není důvěryhodný, protože je podepsán neplatným certifikátem CA.
-
 cert-error-trust-untrusted-issuer = Certifikát není důvěryhodný, protože certifikát vydavatele není důvěryhodný.
-
 cert-error-trust-signature-algorithm-disabled = Certifikát je nedůvěryhodný, protože byl podepsán algoritmem, který je z bezpe�nostních důvodů zakázán.
-
 cert-error-trust-expired-issuer = Certifikát není důvěryhodný, protože doba platnosti certifikátu vydavatele už vypršela.
-
 cert-error-trust-self-signed = Certifikát není důvěryhodný, protože je podepsán sám sebou.
-
 cert-error-trust-symantec = S ohledem na provinění spole�ností GeoTrust, RapidSSL, Symantec, Thawte a VeriSign proti bezpe�nostním postupům nejsou certifikáty vydané těmito spole�nostmi nadále považovány za bezpe�né.
-
 cert-error-untrusted-default = Certifikát nepochází z důvěryhodného zdroje.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-domain-mismatch = Webové stránky prokazují svou totožnost pomocí certifikátů. { -brand-short-name } nemůže server { $hostname } ověřit, protože použitý certifikát pro něj není platný.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single = Webové stránky prokazují svou totožnost pomocí certifikátů. { -brand-short-name } nemůže server { $hostname } ověřit, protože použitý certifikát pro něj není platný. Certifikát je platný pouze pro <a data-l10n-name="domain-mismatch-link">{ $alt-name }</a>.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single-nolink = Webové stránky prokazují svou totožnost pomocí certifikátů. { -brand-short-name } nemůže server { $hostname } ověřit, protože použitý certifikát pro něj není platný. Certifikát je platný pouze pro { $alt-name }.
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = Webové stránky prokazují svou totožnost pomocí certifikátů. { -brand-short-name } nemůže server { $hostname } ověřit, protože je použitý certifikát platný pouze pro následující doménová jména: { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = Webové stránky prokazují svou totožnost pomocí certifikátů, které mají přesně stanovenou dobu platnosti. Platnost certifikátu pro server { $hostname } vypršela { $not-after-local-time }.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = Webové stránky prokazují svou totožnost pomocí certifikátů, které mají přesně stanovenou dobu platnosti. Certifikát pro server { $hostname } bude platný až od { $not-before-local-time }.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Kód chyby: <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = Webové stránky prokazují svou totožnost pomocí certifikátů vydávaných certifika�ními autoritami. Většina prohlíže�ů už certifikátům od spole�ností GeoTrust, RapidSSL, Symantec, Thawte a VeriSign nedůvěřuje. Server { $hostname } používá certifikát od jedné z těchto autorit a proto jeho totožnost nelze ověřit.
-
 cert-error-symantec-distrust-admin = Informujte o tomto problému správce webové stránky.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP Strict Transport Security: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = HTTP Public Key Pinning: { $hasHPKP }
-
 cert-error-details-cert-chain-label = Řetězec certifikátů:
-
 open-in-new-window-for-csp-or-xfo-error = Otevřít stránku v novém okně
-
 # Variables:
 # $hostname (String) - Hostname of the website blocked by csp or xfo error.
-csp-xfo-blocked-long-desc = Pro vaši ochranu web { $hostname } nepovolí { -brand-short-name(case: "dat") } stránku zobrazit jako vloženou sou�ást jiné stránky. Chcete-li ji zobrazit, otevřete ji v novém okně.
+csp-xfo-blocked-long-desc =
+    Pro vaši ochranu web { $hostname } nepovolí { -brand-short-name.gender ->
+        [masculine] { -brand-short-name(case: "dat") }
+        [feminine] { -brand-short-name(case: "dat") }
+        [neuter] { -brand-short-name(case: "dat") }
+       *[other] aplikaci { -brand-short-name }
+    } stránku zobrazit jako vloženou sou�ást jiné stránky. Chcete-li ji zobrazit, otevřete ji v novém okně.
 
 ## Messages used for certificate error titles
 
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/cs/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/aboutLogins.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/aboutLogins.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -12,13 +12,10 @@
 login-app-promo-android =
     .alt = Stáhnout z Google Play
 login-app-promo-apple =
-    .alt = Stáhnout na App Store
-
+    .alt = Stáhnout z App Store
 login-filter =
     .placeholder = Hledat přihlašovací údaje
-
 create-login-button = Nové přihlašovací údaje
-
 fxaccounts-sign-in-text = Synchronizujte svá hesla i do ostatních zařízení
 fxaccounts-sign-in-button = Použít { -sync-brand-short-name(case: "acc") }
 fxaccounts-avatar-button =
@@ -32,6 +29,7 @@
 about-logins-menu-menuitem-import-from-another-browser = Importovat z jiného prohlíže�e…
 about-logins-menu-menuitem-import-from-a-file = Importovat ze souboru…
 about-logins-menu-menuitem-export-logins = Exportovat přihlašovací údaje…
+about-logins-menu-menuitem-remove-all-logins = Smazat všechny přihlašovací údaje…
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] Možnosti
@@ -82,7 +80,6 @@
 ## Introduction screen
 
 login-intro-heading = Hledáte své uložené přihlašovací údaje? Přihlaste se k { -sync-brand-short-name(case: "dat") }.
-
 about-logins-login-intro-heading-logged-out = Hledáte své uložené přihlašovací údaje? Přihlaste se k { -sync-brand-short-name(case: "dat") } nebo je naimportujte.
 about-logins-login-intro-heading-logged-in = Nenalezeny žádné synchronizované přihlašovací údaje.
 login-intro-description =
@@ -96,7 +93,6 @@
 login-intro-instruction-fxa-settings = V nastavení { -sync-brand-short-name(case: "gen") } na daném zařízení se ujistěte, že máte zapnutou synchronizaci přihlašovacích údajů
 about-logins-intro-instruction-help = Pro další pomoc navštivte <a data-l10n-name="help-link">nápovědu { -lockwise-brand-short-name(case: "gen") }</a>
 about-logins-intro-import = Pokud máte přihlašovací údaje uložené v jiném prohlíže�i, můžete je <a data-l10n-name="import-link">naimportovat do { -lockwise-brand-short-name(case: "gen") }</a>
-
 about-logins-intro-import2 = Pokud máte přihlašovací údaje uložené mimo { -brand-product-name(case: "acc") }, můžete je <a data-l10n-name="import-browser-link">naimportovat z jiného prohlíže�e</a> nebo <a data-l10n-name="import-file-link">ze souboru</a>
 
 ## Login
@@ -137,13 +133,11 @@
 # This message can be seen when attempting to edit a login in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-edit-login-os-auth-dialog-message-macosx = upravit uložené přihlašovací údaje
-
 # This message can be seen when attempting to reveal a password in about:logins on Windows.
 about-logins-reveal-password-os-auth-dialog-message-win = Pro zobrazení hesla prosím zadejte své přihlašovací údaje k systému Windows. Toto opatření pomáhá v zabezpe�ení vašich ú�tů.
 # This message can be seen when attempting to reveal a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-reveal-password-os-auth-dialog-message-macosx = zobrazit uložené heslo
-
 # This message can be seen when attempting to copy a password in about:logins on Windows.
 about-logins-copy-password-os-auth-dialog-message-win = Pro zkopírování hesla prosím zadejte své přihlašovací údaje k systému Windows. Toto opatření pomáhá v zabezpe�ení vašich ú�tů.
 # This message can be seen when attempting to copy a password in about:logins
@@ -153,7 +147,6 @@
 ## Master Password notification
 
 master-password-notification-message = Pro zobrazení uložených přihlašovacích údajů prosím zadejte své hlavní heslo
-
 # This message can be seen when attempting to export a password in about:logins on Windows.
 about-logins-export-password-os-auth-dialog-message-win = Pro export přihlašovacích údajů prosím zadejte své přihlašovací údaje k systému Windows. Toto opatření pomáhá v zabezpe�ení vašich ú�tů.
 # This message can be seen when attempting to export a password in about:logins
@@ -195,15 +188,48 @@
 confirmation-dialog-cancel-button = Zrušit
 confirmation-dialog-dismiss-button =
     .title = Zrušit
-
 about-logins-confirm-remove-dialog-title = Odstranit tyto přihlašovací údaje?
 confirm-delete-dialog-message = Tuto akci nelze vzít zpět.
 about-logins-confirm-remove-dialog-confirm-button = Odstranit
-
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Odstranit
+        [one] Odstranit
+        [few] Odstranit vše
+       *[other] Odstranit vše
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label = Ano, odstranit tyto přihlašovací údaje
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Odstranit jedny přihlašovací údaje
+        [few] Odstranit { $count } přihlašovací údaje
+       *[other] Odstranit { $count } přihlašovacích údajů
+    }
+about-logins-confirm-remove-all-dialog-message =
+    Tímto odstraníte všechny přihlašovací údaje uložené { -brand-short-name.gender ->
+        [masculine] ve { -brand-short-name(case: "loc") }
+        [feminine] v { -brand-short-name(case: "loc") }
+        [neuter] v { -brand-short-name(case: "loc") }
+       *[other] v aplikaci { -brand-short-name }
+    } a také všechna zde zobrazovaná hlášení o únicích. Tuto akci nelze vzít zpět.
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Odstranit jedny přihlašovací údaje ze všech zařízení
+        [few] Odstranit { $count } přihlašovací údaje ze všech zařízení
+       *[other] Odstranit { $count } přihlašovacích údajů ze všech zařízení
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    Tímto odstraníte všechny přihlašovací údaje uložené { -brand-short-name.gender ->
+        [masculine] ve { -brand-short-name(case: "loc") }
+        [feminine] v { -brand-short-name(case: "loc") }
+        [neuter] v { -brand-short-name(case: "loc") }
+       *[other] v aplikaci { -brand-short-name }
+    } na všech zařízeních synchronizovaných pomocí vašeho { -fxaccount-brand-name(case: "gen") } a také všechna zde zobrazovaná hlášení o únicích. Tuto akci nelze vzít zpět.
 about-logins-confirm-export-dialog-title = Export přihlašovacích údajů
 about-logins-confirm-export-dialog-message = Vaše hesla budou uložena v �itelné podobě (např. Šp4tnéH3sl0) a kdokoliv otevře exportovaný soubor, bude si je moci pře�íst.
 about-logins-confirm-export-dialog-confirm-button = Exportovat…
-
+about-logins-alert-import-title = Import byl dokon�en
+about-logins-alert-import-message = Zobrazit podrobné shrnutí importu
 confirm-discard-changes-dialog-title = Zahodit neuložené změny?
 confirm-discard-changes-dialog-message = Všechny neuložené změny budou ztraceny.
 confirm-discard-changes-dialog-confirm-button = Zahodit
@@ -234,11 +260,9 @@
 # Variables:
 #   $loginTitle (String) - The title of the website associated with the login.
 about-logins-error-message-duplicate-login-with-link = Přihlašovací údaje pro { $loginTitle } se stejným uživatelským jménem už existují. <a data-l10n-name="duplicate-link">Chcete zobrazit stávající údaje?</a>
-
 # This is a generic error message.
 about-logins-error-message-default = Při ukládání hesla nastala chyba.
 
-
 ## Login Export Dialog
 
 # Title of the file picker dialog
@@ -267,3 +291,10 @@
         [macos] Dokument CSV
        *[other] Soubor CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Import byl dokon�en
+about-logins-import-dialog-done = Hotovo
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/cs/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/appmenu.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/appmenu.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -19,20 +19,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nové okno
+appmenuitem-new-private-window =
+    .label = Nové anonymní okno
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zvětšit
 appmenuitem-zoom-reduce =
     .label = Zmenšit
+appmenuitem-fullscreen =
+    .label = Celá obrazovka
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchronizovat
+appmenuitem-save-page =
+    .label = Uložit stránku jako…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Co je nového
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/cs/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/appMenuNotifications.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -68,6 +68,30 @@
     .secondarybuttonlabel = Te� ne
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Po rychlém restartu obnoví { -brand-shorter-name } všechny otevřené panely a okna, která nejsou v režimu anonymního prohlížení.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } se nedokáže automaticky aktualizovat na nejnovější verzi.
+    .buttonlabel =
+        Přesto aktualizaci { -brand-shorter-name.gender ->
+            [masculine] { -brand-shorter-name(case: "gen") }
+            [feminine] { -brand-shorter-name(case: "gen") }
+            [neuter] { -brand-shorter-name(case: "gen") }
+           *[other] aplikace { -brand-shorter-name }
+        } spustit
+    .buttonaccesskey = s
+    .secondarybuttonlabel = Te� ne
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message =
+    Je k dispozici nová aktualizace { -brand-shorter-name.gender ->
+        [masculine] { -brand-shorter-name(case: "gen") }
+        [feminine] { -brand-shorter-name(case: "gen") }
+        [neuter] { -brand-shorter-name(case: "gen") }
+       *[other] aplikace { -brand-shorter-name }
+    }, ale její instalaci nelze spustit, protože je spuštěna další kopie { -brand-shorter-name.gender ->
+        [masculine] { -brand-shorter-name(case: "gen") }
+        [feminine] { -brand-shorter-name(case: "gen") }
+        [neuter] { -brand-shorter-name(case: "gen") }
+       *[other] aplikace { -brand-shorter-name }
+    }. Pro spuštění aktualizace tuto kopii ukon�ete, nebo spuštění vynuťte (běžící aplikace pak může přestat správně fungovat, dokud ji nerestartujete).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, rozumím
     .buttonaccesskey = O
@@ -75,7 +99,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Povolit toto rozšíření v anonymních oknech
     .accesskey = P
-    
 appmenu-new-tab-controlled =
     .label = Obsah nového panelu byl změněn.
     .buttonlabel = Zachovat změny
@@ -88,6 +111,18 @@
     .buttonaccesskey = Z
     .secondarybuttonlabel = Zakázat rozšíření
     .secondarybuttonaccesskey = k
+appmenu-new-tab-controlled-changes =
+    .label = Vaše stránka nového panelu byla změněna.
+    .buttonlabel = Ponechat změny
+    .buttonaccesskey = P
+    .secondarybuttonlabel = Spravovat stránku nového panelu
+    .secondarybuttonaccesskey = S
+appmenu-homepage-controlled-changes =
+    .label = Vaše domovská stránka byla změněna.
+    .buttonlabel = Ponechat změny
+    .buttonaccesskey = P
+    .secondarybuttonlabel = Spravovat domovskou stránku
+    .secondarybuttonaccesskey = S
 appmenu-tab-hide-controlled =
     .label = Přistupovat k vašim skrytým panelům
     .buttonlabel = Ponechat panely skryté
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/browserContext.ftl firefox-85.0+build1/l10n/cs/browser/browser/browserContext.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/browserContext.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/browserContext.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -15,10 +15,8 @@
     .tooltiptext = Přejde na předchozí stránku
     .aria-label = Zpět
     .accesskey = Z
-
 navbar-tooltip-back =
     .value = { main-context-menu-back.tooltiptext }
-
 toolbar-button-back =
     .label = { main-context-menu-back.aria-label }
 
@@ -28,10 +26,8 @@
     .tooltiptext = Přejde na následující stránku
     .aria-label = Vpřed
     .accesskey = V
-
 navbar-tooltip-forward =
     .value = { main-context-menu-forward.tooltiptext }
-
 toolbar-button-forward =
     .label = { main-context-menu-forward.aria-label }
 
@@ -40,7 +36,6 @@
 main-context-menu-reload =
     .aria-label = Znovu na�íst
     .accesskey = o
-
 toolbar-button-reload =
     .label = { main-context-menu-reload.aria-label }
 
@@ -49,7 +44,6 @@
 main-context-menu-stop =
     .aria-label = Zastavit
     .accesskey = s
-
 toolbar-button-stop =
     .label = { main-context-menu-stop.aria-label }
 
@@ -63,7 +57,6 @@
 main-context-menu-page-save =
     .label = Uložit stránku jako…
     .accesskey = j
-
 toolbar-button-page-save =
     .label = { main-context-menu-page-save.label }
 
@@ -73,54 +66,43 @@
     .aria-label = Přidat stránku do záložek
     .accesskey = P
     .tooltiptext = Přidá tuto stránku do záložek
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the add bookmark command.
 main-context-menu-bookmark-add-with-shortcut =
     .aria-label = Přidat stránku do záložek
     .accesskey = P
     .tooltiptext = Přidá tuto stránku do záložek ({ $shortcut })
-
 main-context-menu-bookmark-change =
     .aria-label = Upravit záložku
     .accesskey = P
     .tooltiptext = Upraví tuto záložku
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the edit bookmark command.
 main-context-menu-bookmark-change-with-shortcut =
     .aria-label = Upravit záložku
     .accesskey = P
     .tooltiptext = Upraví tuto záložku ({ $shortcut })
-
 main-context-menu-open-link =
     .label = Otevřít odkaz
     .accesskey = O
-
 main-context-menu-open-link-new-tab =
     .label = Otevřít odkaz v novém panelu
     .accesskey = n
-
 main-context-menu-open-link-container-tab =
     .label = Otevřít odkaz v novém kontejnerovém panelu
     .accesskey = K
-
 main-context-menu-open-link-new-window =
     .label = Otevřít odkaz v novém okně
     .accesskey = O
-
 main-context-menu-open-link-new-private-window =
     .label = Otevřít odkaz v novém anonymním okně
     .accesskey = t
-
 main-context-menu-bookmark-this-link =
     .label = Přidat odkaz do záložek
     .accesskey = d
-
 main-context-menu-save-link =
     .label = Uložit odkaz jako…
     .accesskey = U
-
 main-context-menu-save-link-to-pocket =
     .label = Uložit odkaz do { -pocket-brand-name(case: "gen") }
     .accesskey = o
@@ -132,7 +114,6 @@
 main-context-menu-copy-email =
     .label = Kopírovat e-mailovou adresu
     .accesskey = a
-
 main-context-menu-copy-link =
     .label = Kopírovat adresu odkazu
     .accesskey = s
@@ -146,7 +127,6 @@
 main-context-menu-media-play =
     .label = Přehrát
     .accesskey = P
-
 main-context-menu-media-pause =
     .label = Pozastavit
     .accesskey = P
@@ -156,37 +136,29 @@
 main-context-menu-media-mute =
     .label = Vypnout zvuk
     .accesskey = z
-
 main-context-menu-media-unmute =
     .label = Zapnout zvuk
     .accesskey = z
-
 main-context-menu-media-play-speed =
     .label = Rychlost přehrávání
     .accesskey = r
-
 main-context-menu-media-play-speed-slow =
     .label = Pomalá (0.5×)
     .accesskey = P
-
 main-context-menu-media-play-speed-normal =
     .label = Normální
     .accesskey = N
-
 main-context-menu-media-play-speed-fast =
     .label = Rychlá (1.25×)
     .accesskey = R
-
 main-context-menu-media-play-speed-faster =
     .label = Rychlejší (1.5×)
     .accesskey = e
-
 # "Ludicrous" is a reference to the movie "Space Balls" and is meant
 # to say that this speed is very fast.
 main-context-menu-media-play-speed-fastest =
     .label = Absurdní (2 ×)
     .accesskey = A
-
 main-context-menu-media-loop =
     .label = Smy�ka
     .accesskey = S
@@ -197,7 +169,6 @@
 main-context-menu-media-show-controls =
     .label = Zobrazit ovládání
     .accesskey = o
-
 main-context-menu-media-hide-controls =
     .label = Skrýt ovládání
     .accesskey = o
@@ -207,184 +178,142 @@
 main-context-menu-media-video-fullscreen =
     .label = Celá obrazovka
     .accesskey = C
-
 main-context-menu-media-video-leave-fullscreen =
     .label = Ukon�it režim celé obrazovky
     .accesskey = k
-
 # This is used when right-clicking on a video in the
 # content area when the Picture-in-Picture feature is enabled.
 main-context-menu-media-pip =
     .label = Obraz v obraze
     .accesskey = v
-
 main-context-menu-image-reload =
     .label = Znovu na�íst obrázek
     .accesskey = b
-
 main-context-menu-image-view =
     .label = Zobrazit obrázek
     .accesskey = Z
-
 main-context-menu-video-view =
     .label = Zobrazit video
     .accesskey = Z
-
 main-context-menu-image-copy =
     .label = Kopírovat obrázek
     .accesskey = r
-
 main-context-menu-image-copy-location =
     .label = Kopírovat adresu obrázku
     .accesskey = a
-
 main-context-menu-video-copy-location =
     .label = Kopírovat adresu videa
     .accesskey = a
-
 main-context-menu-audio-copy-location =
     .label = Kopírovat adresu audia
     .accesskey = a
-
 main-context-menu-image-save-as =
     .label = Uložit obrázek jako…
     .accesskey = l
-
 main-context-menu-image-email =
     .label = Poslat obrázek e-mailem…
     .accesskey = e
-
 main-context-menu-image-set-as-background =
     .label = Nastavit jako pozadí plochy…
     .accesskey = t
-
 main-context-menu-image-info =
     .label = Zobrazit vlastnosti obrázku
     .accesskey = v
-
 main-context-menu-image-desc =
     .label = Zobrazit popis
     .accesskey = p
-
 main-context-menu-video-save-as =
     .label = Uložit video jako…
     .accesskey = l
-
 main-context-menu-audio-save-as =
     .label = Uložit audio jako……
     .accesskey = l
-
 main-context-menu-video-image-save-as =
     .label = Uložit snímek jako…
     .accesskey = U
-
 main-context-menu-video-email =
     .label = Poslat video e-mailem…
     .accesskey = a
-
 main-context-menu-audio-email =
     .label = Poslat audio e-mailem…
     .accesskey = a
-
 main-context-menu-plugin-play =
     .label = Spustit zásuvný modul
     .accesskey = p
-
 main-context-menu-plugin-hide =
     .label = Skrýt zásuvný modul
     .accesskey = S
-
 main-context-menu-save-to-pocket =
     .label = Uložit stránku do { -pocket-brand-name(case: "gen") }
     .accesskey = k
-
 main-context-menu-send-to-device =
     .label = Poslat stránku do zařízení
     .accesskey = e
-
 main-context-menu-view-background-image =
     .label = Zobrazit obrázek na pozadí
     .accesskey = b
-
 main-context-menu-generate-new-password =
     .label = Vygenerovat bezpe�né heslo…
     .accesskey = G
-
 main-context-menu-keyword =
     .label = Přiřadit k tomuto vyhledávání klí�ové slovo…
     .accesskey = h
-
 main-context-menu-link-send-to-device =
     .label = Poslat odkaz do zařízení
     .accesskey = e
-
 main-context-menu-frame =
     .label = Tento rám
     .accesskey = T
-
 main-context-menu-frame-show-this =
     .label = Zobrazit pouze tento rám
     .accesskey = p
-
 main-context-menu-frame-open-tab =
     .label = Otevřít rám v novém panelu
     .accesskey = n
-
 main-context-menu-frame-open-window =
     .label = Otevřít rám v novém okně
     .accesskey = O
-
 main-context-menu-frame-reload =
     .label = Znovu na�íst rám
     .accesskey = m
-
 main-context-menu-frame-bookmark =
     .label = Přidat rám do záložek
     .accesskey = d
-
 main-context-menu-frame-save-as =
     .label = Uložit rám jako…
     .accesskey = r
-
 main-context-menu-frame-print =
     .label = Tisknout rám…
     .accesskey = T
-
 main-context-menu-frame-view-source =
     .label = Zobrazit zdrojový kód rámu
     .accesskey = j
-
 main-context-menu-frame-view-info =
     .label = Zobrazit informace o rámu
     .accesskey = i
-
+main-context-menu-print-selection =
+    .label = Vytisknout výběr
+    .accesskey = r
 main-context-menu-view-selection-source =
     .label = Zobrazit zdrojový kód výběru
     .accesskey = j
-
 main-context-menu-view-page-source =
     .label = Zobrazit zdrojový kód stránky
     .accesskey = r
-
 main-context-menu-view-page-info =
     .label = Zobrazit informace o stránce
     .accesskey = i
-
 main-context-menu-bidi-switch-text =
     .label = Změnit směr textu
     .accesskey = r
-
 main-context-menu-bidi-switch-page =
     .label = Změnit orientaci stránky
     .accesskey = o
-
 main-context-menu-inspect-element =
     .label = Prozkoumat prvek
     .accesskey = P
-
 main-context-menu-inspect-a11y-properties =
     .label = Procházet vlastnosti přístupnosti
-
 main-context-menu-eme-learn-more =
     .label = Zjistit více o DRM…
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/browser.ftl firefox-85.0+build1/l10n/cs/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/browser.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/browser.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -23,7 +23,7 @@
 # there is no content title:
 #
 # "default" - "Mozilla Firefox"
-# "private" - "Mozilla Firefox - (Private Browsing)"
+# "private" - "Mozilla Firefox — (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Do not use the brand name in the last two attributes, as we do on non-macOS.
@@ -109,6 +109,9 @@
 
 urlbar-search-tips-onboard = Méně psaní, více výsledků: používejte { $engineName } přímo z adresního řádku.
 urlbar-search-tips-redirect-2 = Zadejte do adresního řádku vyhledávaný text a uvidíte návrhy z vyhledáva�e { $engineName } a vaší historie prohlížení.
+# Prompts users to use the Urlbar when they are typing in the domain of a
+# search engine, e.g. google.com or amazon.com.
+urlbar-tabtosearch-onboard = Klepněte na tuto zkratku, abyste rychleji našli, co potřebujete.
 
 ## Local search mode indicator labels in the urlbar
 
@@ -299,8 +302,18 @@
 identity-active-loaded = Na této stránce jste ochranu zakázali.
 identity-weak-encryption = Tento server používá slabé šifrování.
 identity-insecure-login-forms = Přihlašovací údaje zadané na této stránce mohou být vyzrazeny.
+identity-https-only-label = Režim „pouze HTTPS“
+identity-https-only-dropdown-on =
+    .label = Zapnuto
+identity-https-only-dropdown-off =
+    .label = Vypnuto
+identity-https-only-dropdown-off-temporarily =
+    .label = Do�asně vypnuto
+identity-https-only-info-turn-off2 = Pokud se zdá, že je stránka rozbitá, zkuste vypnout režim „pouze HTTPS“, aby se znovu na�etla pomocí nezabezpe�eného spojení HTTP.
 identity-permissions =
     .value = Oprávnění
+identity-permissions-storage-access-header = Cross-site cookies
+identity-permissions-storage-access-hint = Tyto strany mohou používat cross-site cookies a tak přistupovat k datům této stránky během vaší návštěvy.
 identity-permissions-reload-hint = Pro provedení změn může být potřeba stránku znovu na�íst.
 identity-permissions-empty = Tento server nemá žádná zvláštní oprávnění.
 identity-clear-site-data =
@@ -356,6 +369,13 @@
 browser-window-close-button =
     .tooltiptext = Zavřít
 
+## Bookmarks toolbar items
+
+browser-import-button2 =
+    .label = Importovat záložky…
+    .tooltiptext = Importovat záložky z jiného prohlíže�e do { -brand-short-name(case: "gen") }.
+bookmarks-toolbar-empty-message = Chcete-li mít ke svým záložkám rychlý přístup, umístěte je sem na lištu záložek. <a data-l10n-name="manage-bookmarks">Spravovat záložky…</a>
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -459,8 +479,29 @@
 # Variables
 #  $engine (String): the name of a search engine
 urlbar-result-action-search-w-engine = Vyhledat pomocí { $engine }
+urlbar-result-action-sponsored = Sponzorováno
 urlbar-result-action-switch-tab = Přepnout na panel
 urlbar-result-action-visit = Navštívit
+# Directs a user to press the Tab key to perform a search with the specified
+# engine.
+# Variables
+#  $engine (String): the name of a search engine that searches the entire Web
+#  (e.g. Google).
+urlbar-result-action-before-tabtosearch-web = Stisknutím klávesy Tab provedete vyhledávání pomocí vyhledáva�e { $engine }
+# Directs a user to press the Tab key to perform a search with the specified
+# engine.
+# Variables
+#  $engine (String): the name of a search engine that searches a specific site
+#  (e.g. Amazon).
+urlbar-result-action-before-tabtosearch-other = Stisknutím klávesy Tab provedete vyhledávání na webu { $engine }
+# Variables
+#  $engine (String): the name of a search engine that searches the entire Web
+#  (e.g. Google).
+urlbar-result-action-tabtosearch-web = Vyhledat pomocí { $engine } přímo z adresního řádku
+# Variables
+#  $engine (String): the name of a search engine that searches a specific site
+#  (e.g. Amazon).
+urlbar-result-action-tabtosearch-other-engine = Vyhledat na webu { $engine } přímo z adresního řádku
 
 ## Action text shown in urlbar results, usually appended after the search
 ## string or the url, like "result value - action text".
@@ -485,3 +526,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> má kontrolu nad vaším kurzorem. Pro odebrání kontroly stiskněte klávesu Esc.
 pointerlock-warning-no-domain = Tento dokument má kontrolu nad vaším kurzorem. Pro odebrání kontroly stiskněte klávesu Esc.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Zobrazit všechny záložky
+bookmarks-recent-bookmarks =
+    .value = Naposledy přidané
+bookmarks-toolbar-chevron =
+    .tooltiptext = Zobrazí více záložek
+bookmarks-sidebar-content =
+    .aria-label = Záložky
+bookmarks-menu-button =
+    .label = Nabídka záložek
+bookmarks-other-bookmarks-menu =
+    .label = Ostatní záložky
+bookmarks-mobile-bookmarks-menu =
+    .label = Záložky z mobilu
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skrýt postranní lištu záložek
+           *[other] Zobrazit v postranní liště
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skrýt lištu záložek
+           *[other] Zobrazit lištu záložek
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Odebrat nabídku záložek z lišty
+           *[other] Přidat nabídku záložek na lištu
+        }
+bookmarks-search =
+    .label = Hledat v záložkách
+bookmarks-tools =
+    .label = Nástroje pro práci se záložkami
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Lišta záložek
+    .accesskey = z
+    .aria-label = Záložky
+bookmarks-toolbar-menu =
+    .label = Lišta záložek
+bookmarks-toolbar-placeholder =
+    .title = Záložky nástrojové lišty
+bookmarks-toolbar-placeholder-button =
+    .label = Záložky nástrojové lišty
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Záložky
+library-bookmarks-bookmark-this-page =
+    .label = Přidat stránku do záložek
+library-bookmarks-bookmark-edit =
+    .label = Upravit záložku
+library-recent-activity-label = Nedávná aktivita
+
+## More items
+
+more-menu-go-offline =
+    .label = Pracovat offline
+    .accesskey = l
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/browserSets.ftl firefox-85.0+build1/l10n/cs/browser/browser/browserSets.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/browserSets.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/browserSets.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -9,36 +9,36 @@
 window-new-shortcut =
     .key = N
 window-minimize-shortcut =
-    .key = m
+    .key = M
 close-shortcut =
     .key = W
 tab-new-shortcut =
-    .key = t
+    .key = T
 location-open-shortcut =
-    .key = l
+    .key = L
 location-open-shortcut-alt =
-    .key = d
+    .key = D
 search-focus-shortcut =
-    .key = k
+    .key = K
 # This shortcut is used in two contexts:
 #   - web search
 #   - find in page
 find-shortcut =
-    .key = f
+    .key = F
 search-find-again-shortcut =
-    .key = g
+    .key = G
 search-find-again-shortcut-alt =
     .keycode = VK_F3
 search-find-selection-shortcut =
-    .key = e
+    .key = E
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
 search-focus-shortcut-alt =
     .key =
         { PLATFORM() ->
-            [linux] j
-           *[other] e
+            [linux] J
+           *[other] E
         }
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
@@ -46,28 +46,28 @@
 downloads-shortcut =
     .key =
         { PLATFORM() ->
-            [linux] y
-           *[other] j
+            [linux] Y
+           *[other] J
         }
 addons-shortcut =
     .key = A
 file-open-shortcut =
-    .key = o
+    .key = O
 save-page-shortcut =
-    .key = s
+    .key = S
 page-source-shortcut =
-    .key = u
+    .key = U
 # This should match the Option+Command keyboard shortcut letter that Safari
 # and Chrome use for "View Source" on macOS. `page-source-shortcut` above
 # is Firefox's official keyboard shortcut shown in the GUI.
 # Safari variant is an alias provided for the convenience of Safari and Chrome
 # users on macOS. See bug 1398988.
 page-source-shortcut-safari =
-    .key = u
+    .key = U
 page-info-shortcut =
-    .key = i
+    .key = I
 print-shortcut =
-    .key = p
+    .key = P
 mute-toggle-shortcut =
     .key = M
 nav-back-shortcut-alt =
@@ -75,7 +75,7 @@
 nav-fwd-shortcut-alt =
     .key = ]
 nav-reload-shortcut =
-    .key = r
+    .key = R
 # Shortcut available only on macOS.
 nav-stop-shortcut =
     .key = .
@@ -84,9 +84,9 @@
 history-show-all-shortcut-mac =
     .key = Y
 history-sidebar-shortcut =
-    .key = h
+    .key = H
 full-screen-shortcut =
-    .key = f
+    .key = F
 reader-mode-toggle-shortcut-windows =
     .keycode = VK_F9
 reader-mode-toggle-shortcut-other =
@@ -106,21 +106,31 @@
 picture-in-picture-toggle-shortcut-alt =
     .key = (
 bookmark-this-page-shortcut =
-    .key = d
+    .key = D
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
 bookmark-show-all-shortcut =
     .key =
         { PLATFORM() ->
-            [linux] o
-           *[other] b
+            [linux] O
+           *[other] B
         }
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
+bookmark-show-library-shortcut =
+    .key = O
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
 bookmark-show-sidebar-shortcut =
-    .key = b
+    .key = B
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-toolbar-shortcut =
+    .key = B
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/migration.ftl firefox-85.0+build1/l10n/cs/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/migration.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/migration.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = Průvodce importem dat z jiného prohlíže�e
-
 import-from =
     { PLATFORM() ->
         [windows] Importovat nastavení, záložky, historii, hesla a ostatní údaje z aplikace:
        *[other] Importovat předvolby, záložky, historii, hesla a ostatní údaje z aplikace:
     }
-
 import-from-bookmarks = Importovat záložky z aplikace:
 import-from-ie =
     .label = Microsoft Internet Explorer
@@ -51,34 +49,37 @@
 import-from-360se =
     .label = 360 Secure Browser
     .accesskey = 3
-
 no-migration-sources = Nebyl nalezen žádný program, který by obsahoval záložky, historii nebo uložená hesla.
-
 import-source-page-title = Import nastavení a údajů
 import-items-page-title = Importované položky
-
 import-items-description = Zvolte položky, které chcete importovat:
-
+import-permissions-page-title =
+    Udělte prosím { -brand-short-name.gender ->
+        [masculine] { -brand-short-name(case: "dat") }
+        [feminine] { -brand-short-name(case: "dat") }
+        [neuter] { -brand-short-name(case: "dat") }
+       *[other] aplikaci { -brand-short-name }
+    } oprávnění
+# Do not translate "Bookmarks.plist"; the file name is the same everywhere.
+import-permissions-description =
+    macOS vyžaduje, abyste { -brand-short-name.gender ->
+        [masculine] { -brand-short-name(case: "dat") }
+        [feminine] { -brand-short-name(case: "dat") }
+        [neuter] { -brand-short-name(case: "dat") }
+       *[other] aplikaci { -brand-short-name }
+    } výslovně povolili přístup k záložkám ze Safari. Klikněte na „Pokra�ovat“ a v zobrazeném panelu Otevřít soubor vyberte soubor „Bookmarks.plist“.
 import-migrating-page-title = Probíhá import…
-
 import-migrating-description = Te� jsou importovány následující položky…
-
 import-select-profile-page-title = Volba profilu
-
 import-select-profile-description = Importovat je možné z následujících profilů:
-
 import-done-page-title = Import byl dokon�en
-
 import-done-description = Následující položky byly úspěšně importovány:
-
 import-close-source-browser = Před pokra�ováním se prosím ujistěte, že je vybraný prohlíže� zavřený.
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = Z prohlíže�e { $source }
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
 source-name-edge-beta = Microsoft Edge Beta
@@ -90,7 +91,6 @@
 source-name-chromium = Chromium
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 Secure Browser
-
 imported-safari-reading-list = Seznam ke �tení (ze Safari)
 imported-edge-reading-list = Seznam ke �tení (z Edge)
 
@@ -103,19 +103,6 @@
 ## chrome
 ## edge
 ## firefox
-## safari
-## The various beta and development versions of edge and chrome all get
-## normalized to just "edge" and "chrome" for these strings.
-
-## Browser data types
-## All of these strings get a $browser variable passed in.
-## You can use the browser variable to differentiate the name of items,
-## which may have different labels in different browsers.
-## The supported values for the $browser variable are:
-## 360se
-## chrome
-## edge
-## firefox
 ## ie
 ## safari
 ## The various beta and development versions of edge and chrome all get
@@ -139,7 +126,6 @@
             [safari] Cookies
            *[other] Cookies
         }
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -158,7 +144,6 @@
             [safari] Historie
            *[other] Historie
         }
-
 browser-data-formdata-checkbox =
     .label =
         { $browser ->
@@ -177,7 +162,6 @@
             [safari] Vyplňování formulářů
            *[other] Uložené formuláře
         }
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -200,7 +184,6 @@
             [safari] Hesla
            *[other] Uložené přihlašovací údaje a hesla
         }
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -221,12 +204,10 @@
             [safari] Záložky a oblíbené
            *[other] Záložky
         }
-
 browser-data-otherdata-checkbox =
     .label = Ostatní data
 browser-data-otherdata-label =
     .label = Ostatní data
-
 browser-data-session-checkbox =
     .label = Okna a panely
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/newInstallPage.ftl firefox-85.0+build1/l10n/cs/browser/browser/newInstallPage.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/newInstallPage.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/newInstallPage.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -15,7 +15,6 @@
         [neuter] { -brand-short-name(case: "gen") }
        *[other] aplikace { -brand-short-name }
     }
-
 changed-title = Co se změnilo?
 changed-desc-profiles =
     Tato instalace { -brand-short-name.gender ->
@@ -24,10 +23,8 @@
         [neuter] { -brand-short-name(case: "gen") }
        *[other] aplikace { -brand-short-name }
     } má nový profil. Profil je místo, kam Firefox ukládá data jako jsou vaše záložky, hesla a vaše nastavení.
-changed-desc-dedicated = Aby bylo možné bezpe�ně používat více instalací prohlíže�e Firefox najednou (finální verzi, ESR, betaverzi, Firefox Developer Edition a Nightly), používá nyní tato instalace vlastní profil. Automaticky už tedy nesdílí vaše uložená data s ostatními instalacemi.
-
+changed-desc-dedicated = Aby bylo možné snadno a bezpe�ně používat více instalací prohlíže�e Firefox najednou (finální verzi i verze ESR, Beta, Developer Edition a Nightly), používá nyní tato instalace vlastní profil. Automaticky už tedy nesdílí vaše uložená data s ostatními instalacemi.
 lost = <b>O žádná svá data a nastavení nepřijdete.</b> Vše je bezpe�ně uloženo v profilu a dostupné pro první spuštěnou instalaci Firefoxu.
-
 options-title = Co mohu dělat dál?
 options-do-nothing =
     Pokud nebudete dělat nic, { -brand-short-name.gender ->
@@ -37,10 +34,8 @@
        *[other] vaše aplikace { -brand-short-name }
     } bude používat samostatný profil a nebude sdílet žádná data s ostatními instalacemi prohlíže�e Firefox.
 options-use-sync = Pokud chcete mít stejná data ve více instalacích Firefoxu, použijte bezpe�nou synchronizaci pomocí { -fxaccount-brand-name(case: "gen", capitalization: "lower") }.
-
 resources = Zdroje:
 support-link = Správa profilů - �lánek nápovědy
-
 sync-header = Přihlaste se nebo si založte { -fxaccount-brand-name(case: "acc", capitalization: "lower") }
 sync-label = Zadejte svoji e-mailovou adresu
 sync-input =
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/cs/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/asrouter.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -13,35 +13,27 @@
 
 cfr-doorhanger-extension-sumo-link =
     .tooltiptext = Co to je
-
 cfr-doorhanger-extension-cancel-button = Te� ne
     .accesskey = n
-
 cfr-doorhanger-extension-ok-button = Přidat
     .accesskey = a
 cfr-doorhanger-pintab-ok-button = Připnout tento panel
     .accesskey = P
-
 cfr-doorhanger-extension-manage-settings-button = Nastavení doporu�ování
     .accesskey = d
-
 cfr-doorhanger-extension-never-show-recommendation = Toto doporu�ení už nezobrazovat
     .accesskey = N
-
 cfr-doorhanger-extension-learn-more-link = Zjistit více
-
 # This string is used on a new line below the add-on name
 # Variables:
 #   $name (String) - Add-on author name
 cfr-doorhanger-extension-author = autor: { $name }
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-extension-notification = Doporu�ení
 cfr-doorhanger-extension-notification2 = Doporu�ení
     .tooltiptext = Doporu�ené rozšíření
     .a11y-announcement = Je dostupné doporu�ené rozšíření
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-feature-notification = Doporu�ení
@@ -69,7 +61,6 @@
         [few] { $total } uživatelé
        *[other] { $total } uživatelů
     }
-
 cfr-doorhanger-pintab-description = Nechte si nejpoužívanější stránky po ruce v panelu, který neztratíe ani při restartu po�íta�e.
 
 ## These messages are steps on how to use the feature and are shown together.
@@ -77,11 +68,9 @@
 cfr-doorhanger-pintab-step1 = Pokud chcete panel připnout, klikněte na něj <b>pravým tla�ítkem</b>.
 cfr-doorhanger-pintab-step2 = V nabídce vyberte <b>Připnout panel</b>.
 cfr-doorhanger-pintab-step3 = Pokud je na stránce něco nového, uvidíte u ní na liště panelů modrý puntík.
-
 cfr-doorhanger-pintab-animation-pause = Pozastavit
 cfr-doorhanger-pintab-animation-resume = Pokra�ovat
 
-
 ## Firefox Accounts Message
 
 cfr-doorhanger-bookmark-fxa-header = Mějte své záložky všude s sebou.
@@ -102,33 +91,25 @@
 # This string is used by screen readers to offer a text based alternative for
 # the notification icon
 cfr-badge-reader-label-newfeature = Nové funkce
-
 cfr-whatsnew-button =
     .label = Co je nového
     .tooltiptext = Co je nového
-
 cfr-whatsnew-panel-header = Co je nového
-
 cfr-whatsnew-release-notes-link-text = Pře�těte si poznámky k vydání
-
 cfr-whatsnew-fx70-title = { -brand-short-name } tvrdě bojuje za vaše soukromí
 cfr-whatsnew-fx70-body = Nejnovější aktualizace vylepšuje funkci ochrany proti sledování a usnadňuje vytváření bezpe�ných hesel pro každý server.
-
 cfr-whatsnew-tracking-protect-title = Chraňte se před sledovacími prvky
 cfr-whatsnew-tracking-protect-body = { -brand-short-name } blokuje mnoho prvků sociálních sítí a třetích stran, které jsou známé sledováním vašeho chování na internetu.
 cfr-whatsnew-tracking-protect-link-text = Zobrazit podrobnosti
-
 # 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 = Blokování sledovacích prvků
 cfr-whatsnew-tracking-blocked-subtitle = Od { DATETIME($earliestDate, month: "long", year: "numeric") }
 cfr-whatsnew-tracking-blocked-link-text = Zobrazit podrobnosti
-
 cfr-whatsnew-lockwise-backup-title = Zálohujte svá hesla
 cfr-whatsnew-lockwise-backup-body = Používejte generovaná a bezpe�ná hesla, ke kterým máte přístup všude, kde se přihlásíte.
 cfr-whatsnew-lockwise-backup-link-text = Zapnout zálohování
-
 cfr-whatsnew-lockwise-take-title = Vezměte si svá hesla všude s sebou
 cfr-whatsnew-lockwise-take-body = S mobilní aplikací { -lockwise-brand-short-name } získáte bezpe�ný přístup k vašim zálohovaným přihlašovacím údajům kdekoliv budete potřebovat.
 cfr-whatsnew-lockwise-take-link-text = Stáhnout aplikaci
@@ -137,6 +118,9 @@
 
 cfr-whatsnew-searchbar-title = Použijte adresní řádek - pište méně, najdete více
 cfr-whatsnew-searchbar-body-topsites = Po klepnutí do adresního řádku uvidíte odkazy na své top stránky.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Ikona lupy
 
 ## Picture-in-Picture
@@ -158,7 +142,6 @@
 # localization, because it would result in the number showing twice.
 cfr-whatsnew-fingerprinter-counter-header = Zablokováno vytvoření otisku prohlíže�e
 cfr-whatsnew-fingerprinter-counter-body = { -brand-shorter-name } blokuje mnoho způsobů vytváření otisku prohlíže�e, které tajně sbírají informace o vašem zařízení, aby si vytvořily profil pro sledování vašich dalších aktivit.
-
 # Message variation when fingerprinters count is less than 10
 cfr-whatsnew-fingerprinter-counter-header-alt = Blokování otisku prohlíže�e
 cfr-whatsnew-fingerprinter-counter-body-alt = { -brand-shorter-name } blokuje vytváření otisku prohlíže�e, které tajně sbírá informace o vašem zařízení pro vytvoření vašeho reklamního profilu
@@ -255,7 +238,6 @@
     }.
 cfr-doorhanger-milestone-ok-button = Zobrazit vše
     .accesskey = v
-
 cfr-doorhanger-milestone-close-button = Zavřít
     .accesskey = Z
 
@@ -307,8 +289,36 @@
 cfr-doorhanger-doh-secondary-button = Zakázat
     .accesskey = Z
 
+## Fission Experiment Message
+
+cfr-doorhanger-fission-body-approved = Vaše soukromí je důležité. { -brand-short-name } nyní navzájem izoluje jednotlivé weby, což hackerům ztěžuje krádež hesel, �ísel platebních karet nebo jiných citlivých informací.
+cfr-doorhanger-fission-header = Izolace webů
+cfr-doorhanger-fission-primary-button = OK, rozumím
+    .accesskey = O
+cfr-doorhanger-fission-secondary-button = Zjistit více
+    .accesskey = Z
+
 ## What's new: Cookies message
 
 cfr-whatsnew-clear-cookies-header = Automatická ochrana před záludnými sledovacími taktikami
 cfr-whatsnew-clear-cookies-body = Některé sledovací prvky vás přesměrovávají na jiné stránky, které tajně ukládají cookies. { -brand-short-name } nyní tyto cookies automaticky vymaže, abyste nemohli být sledováni.
 cfr-whatsnew-clear-cookies-image-alt = Ukázka zablokovaných cookies
+
+## What's new: Media controls message
+
+cfr-whatsnew-media-keys-header = Více možností ovládání médií
+cfr-whatsnew-media-keys-body = Přehrávejte a pozastavujte zvuk nebo video přímo z klávesnice nebo náhlavní soupravy, což usnadňuje ovládání médií z jiného panelu, programu nebo dokonce i když je po�íta� uzam�en. Také můžete přecházet mezi skladbami pomocí kláves vpřed a vzad.
+cfr-whatsnew-media-keys-button = Jak na to
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Zkratky vyhledávání v adresním řádku
+cfr-whatsnew-search-shortcuts-body = Nyní když do adresního řádku zadáte vyhledáva� nebo konkrétní web, se níže v našeptáva�i zobrazí modrá zkratka. Klepněte na tuto zkratku a dokon�ete vyhledávání přímo z adresního řádku.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Ochrana před škodlivými supercookies
+cfr-whatsnew-supercookies-body = Některé servery tajně posílají vašemu prohlíže�i tzv. „supercookies“, pomocí kterých vás mohou na internetu sledovat i po smazání cookies. { -brand-short-name } poskytuje silnou ochranu proti supercookies, aby nemohly sloužit ke sledování vašeho brouzdání napří� různými webovými stránkami.
+
+## What's new: Better bookmarking
+
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/cs/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/newtab.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nový panel
 newtab-settings-button =
     .title = Přizpůsobení stránky nového panelu
+newtab-personalize-button-label = Přizpůsobení
+    .title = Přizpůsobení nového panelu
+    .aria-label = Přizpůsobení nového panelu
 
 ## Search box component.
 
@@ -15,27 +18,30 @@
 newtab-search-box-search-button =
     .title = Vyhledat
     .aria-label = Vyhledat
-
 newtab-search-box-search-the-web-text = Vyhledat na webu
 newtab-search-box-search-the-web-input =
     .placeholder = Vyhledat na webu
     .title = Vyhledat na webu
     .aria-label = Vyhledat na webu
+newtab-search-box-text = Vyhledat na webu
+newtab-search-box-input =
+    .placeholder = Vyhledat na webu
+    .aria-label = Vyhledat na webu
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Přidat vyhledáva�
 newtab-topsites-add-topsites-header = Nová top stránka
+newtab-topsites-add-shortcut-header = Nová zkratka
 newtab-topsites-edit-topsites-header = Upravit top stránku
+newtab-topsites-edit-shortcut-header = Upravit zkratku
 newtab-topsites-title-label = Název stránky
 newtab-topsites-title-input =
     .placeholder = Zadejte název
-
 newtab-topsites-url-label = URL
 newtab-topsites-url-input =
     .placeholder = Zadejte nebo vložte URL adresu
 newtab-topsites-url-validation = Je vyžadována platná URL
-
 newtab-topsites-image-url-label = URL adresa vlastního obrázku
 newtab-topsites-use-image-link = Použít vlastní obrázek…
 newtab-topsites-image-validation = Obrázek se nepodařilo na�íst. Zkuste jinou URL adresu.
@@ -54,18 +60,20 @@
 # "This action" refers to deleting a page from history.
 newtab-confirm-delete-history-p2 = Tuto akci nelze vzít zpět.
 
+## Top Sites - Sponsored label
+
+newtab-topsite-sponsored = Sponzorováno
+
 ## Context Menu - Action Tooltips.
 
 # General tooltip for context menus.
 newtab-menu-section-tooltip =
     .title = Otevře nabídku
     .aria-label = Otevře nabídku
-
 # Tooltip for dismiss button
 newtab-dismiss-button-tooltip =
     .title = Odstranit
     .aria-label = Odstranit
-
 # This tooltip is for the context menu of Pocket cards or Topsites
 # Variables:
 #  $title (String): The label or hostname of the site. This is for screen readers when the context menu button is focused/active.
@@ -140,12 +148,10 @@
 newtab-label-recommended = Populární
 newtab-label-saved = Uloženo do { -pocket-brand-name(case: "gen") }
 newtab-label-download = Staženo
-
 # This string is used in the story cards to indicate sponsored content
 # Variables:
 #  $sponsorOrSource (String): This is the name of a company or their domain
 newtab-label-sponsored = { $sponsorOrSource } · sponzrováno
-
 # This string is used at the bottom of story cards to indicate sponsored content
 # Variables:
 #  $sponsor (String): This is the name of a sponsor
@@ -176,6 +182,7 @@
 
 newtab-section-header-topsites = Top stránky
 newtab-section-header-highlights = Vybrané
+newtab-section-header-recent-activity = Nedávná aktivita
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Doporu�ení ze služby { $provider }
@@ -183,13 +190,11 @@
 ## Empty Section States: These show when there are no more items in a section. Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 
 newtab-empty-section-highlights = Za�něte prohlížet a my vám zde ukážeme některé skvělé �lánky, videa a další stránky, které jste nedávno viděli nebo uložili do záložek.
-
 # Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 # Variables:
 #  $provider (String): Name of the content provider for this section, e.g "Pocket".
 newtab-empty-section-topstories = Už jste všechno pře�etli. Další �lánky ze služby { $provider } tu najdete zase později. Ale pokud se nemůžete do�kat, vyberte své oblíbené téma a podívejte se na další velké �lánky z celého webu.
 
-
 ## Empty Section (Content Discovery Experience). These show when there are no more stories or when some stories fail to load.
 
 newtab-discovery-empty-section-topstories-header = Už jste všechno pře�etli.
@@ -213,3 +218,28 @@
 
 newtab-error-fallback-info = Jejda, při na�ítání tohoto obsahu se něco pokazilo.
 newtab-error-fallback-refresh-link = Opětovným na�tením stránky to zkuste znovu.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Zkratky vyhledávání
+newtab-custom-shortcuts-subtitle = Stránky, které si uložíte nebo navštívíte
+newtab-custom-row-selector =
+    { $num ->
+        [one] Jeden řádek
+        [few] { $num } řádky
+       *[other] { $num } řádků
+    }
+newtab-custom-sponsored-sites = Sponzorované zkratky
+newtab-custom-pocket-title = Doporu�eno službou { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Výjime�ný obsah vybraný službou { -pocket-brand-name }, která je sou�ástí { -brand-product-name(case: "gen") }
+newtab-custom-pocket-sponsored = Sponzorované �lánky
+newtab-custom-recent-title = Nedávná aktivita
+newtab-custom-recent-subtitle = Výběr z aktuálních stránek a obsahu
+newtab-custom-close-button = Zavřít
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Útržky
+newtab-custom-snippets-subtitle = Tipy a novinky od spole�nosti { -vendor-short-name } a aplikace { -brand-product-name }
+newtab-custom-settings = Další nastavení
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/cs/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/newtab/onboarding.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/newtab/onboarding.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -17,6 +17,14 @@
 
 ## Welcome modal dialog strings
 
+
+### UI strings for the simplified onboarding / multistage about:welcome
+### Various strings use a non-breaking space to avoid a single dangling /
+### widowed word, so test on various window sizes if you also want this.
+
+
+## Welcome page strings
+
 onboarding-welcome-header = Vítá vás { -brand-short-name }
 onboarding-welcome-body =
     Prohlíže� te� už máte.<br/>Poznejte ještě zbytek { -brand-product-name.gender ->
@@ -48,10 +56,71 @@
 # Text for link to submit the sign in form
 onboarding-join-form-signin = Přihlásit se
 onboarding-start-browsing-button-label = Za�ít prohlížet
+onboarding-not-now-button-label = Te� ne
 onboarding-cards-dismiss =
     .title = Skrýt
     .aria-label = Skrýt
 
+## Welcome full page string
+
+onboarding-fullpage-welcome-subheader = Te� vám ukážeme, jaké máte možnosti.
+onboarding-fullpage-form-email =
+    .placeholder = Vaše e-mailová adresa…
+
+## Firefox Sync modal dialog strings.
+
+onboarding-sync-welcome-header =
+    Vezměte si { -brand-product-name.gender ->
+        [masculine] { -brand-product-name(case: "acc") }
+        [feminine] { -brand-product-name(case: "acc") }
+        [neuter] { -brand-product-name(case: "acc") }
+       *[other] aplikaci { -brand-product-name }
+    } s sebou
+onboarding-sync-welcome-content = Mějte své záložky, historii i uložená hesla s sebou na všech svých zařízeních.
+onboarding-sync-welcome-learn-more-link = Zjistit více o ú�tech Firefoxu
+onboarding-sync-form-input =
+    .placeholder = E-mail
+onboarding-sync-form-continue-button = Pokra�ovat
+onboarding-sync-form-skip-login-button = Přesko�it tento krok
+
+## This is part of the line "Enter your email to continue to Firefox Sync"
+
+onboarding-sync-form-header = Zadejte svoji e-mailovou adresu
+onboarding-sync-form-sub-header = a používejte { -sync-brand-name(case: "acc") }.
+
+## These are individual benefit messages shown with an image, title and
+## description.
+
+onboarding-benefit-products-text = Používejte nástroje, které respektují vaše soukromí a fungují na všech zařízeních.
+# "Personal Data Promise" is a concept that should be translated consistently
+# across the product. It refers to a concept shown elsewhere to the user: "The
+# Firefox Personal Data Promise is the way we honor your data in everything we
+# make and do. We take less data. We keep it safe. And we make sure that we are
+# transparent about how we use it."
+onboarding-benefit-privacy-text = Slibujeme, že nezneužijeme vaše data. Méně dat je vždy více, udržíme je v bezpe�í a nemáme před vámi žádná tajemství.
+onboarding-benefit-sync-title = { -sync-brand-short-name }
+onboarding-benefit-sync-text =
+    Vezměte si své záložky, hesla, historii a další data všude tam, kde používáte { -brand-product-name.gender ->
+        [masculine] { -brand-product-name(case: "acc") }
+        [feminine] { -brand-product-name(case: "acc") }
+        [neuter] { -brand-product-name(case: "acc") }
+       *[other] aplikaci { -brand-product-name }
+    }.
+onboarding-benefit-monitor-title = { -monitor-brand-short-name }
+onboarding-benefit-monitor-text = Nechte se upozornit, pokud se vaše údaje objeví ve známém úniku dat.
+onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
+onboarding-benefit-lockwise-text = Spravujte hesla bezpe�ně i na cestách.
+
+## Custom Return To AMO onboarding strings
+
+return-to-amo-subtitle = Skvěle, nyní máte aplikaci { -brand-short-name }
+# <img data-l10n-name="icon"/> will be replaced with the icon belonging to the extension
+#
+# Variables:
+#   $addon-name (String) - Name of the add-on
+return-to-amo-addon-title = Te� zpět k doplňku <img data-l10n-name="icon"/> </icon><b>{ $addon-name }</b>.
+return-to-amo-add-extension-label = Přidat rozšíření
+
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
 
 # The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
@@ -101,8 +170,6 @@
 onboarding-multistage-theme-secondary-button-label = Te� ne
 # Automatic theme uses operating system color settings
 onboarding-multistage-theme-label-automatic = Automatický
-# System refers to the operating system
-onboarding-multistage-theme-description-automatic = Použít vzhled podle systému
 onboarding-multistage-theme-label-light = Světlý
 onboarding-multistage-theme-label-dark = Tmavý
 # "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
@@ -114,22 +181,6 @@
 ## tooltip.
 
 # Tooltip displayed on hover of automatic theme
-onboarding-multistage-theme-tooltip-automatic =
-    .title = Použije vzhled tla�ítek, nabídek a oken podle nastavení vašeho opera�ního systému.
-    .aria-label = { onboarding-multistage-theme-tooltip-automatic.title }
-# Tooltip displayed on hover of light theme
-onboarding-multistage-theme-tooltip-light =
-    .title = Použije světlý vzhled tla�ítek, nabídek a oken.
-    .aria-label = { onboarding-multistage-theme-tooltip-light.title }
-# Tooltip displayed on hover of dark theme
-onboarding-multistage-theme-tooltip-dark =
-    .title = Použije tmavý vzhled tla�ítek, nabídek a oken.
-    .aria-label = { onboarding-multistage-theme-tooltip-dark.title }
-# Tooltip displayed on hover of Alpenglow theme
-onboarding-multistage-theme-tooltip-alpenglow =
-    .title = Použije barevný vzhled tla�ítek, nabídek a oken.
-    .aria-label = { onboarding-multistage-theme-tooltip-alpenglow.title }
-# Tooltip displayed on hover of automatic theme
 onboarding-multistage-theme-tooltip-automatic-2 =
     .title = Použije vzhled tla�ítek, nabídek a oken podle nastavení vašeho opera�ního systému.
 # Input description for automatic theme
@@ -154,56 +205,6 @@
 onboarding-multistage-theme-description-alpenglow =
     .aria-description = Použije barevný vzhled tla�ítek, nabídek a oken.
 
-## Welcome full page string
-
-onboarding-fullpage-welcome-subheader = Te� vám ukážeme, jaké máte možnosti.
-onboarding-fullpage-form-email =
-    .placeholder = Vaše e-mailová adresa…
-
-## Firefox Sync modal dialog strings.
-
-onboarding-sync-welcome-header =
-    Vezměte si { -brand-product-name.gender ->
-        [masculine] { -brand-product-name(case: "acc") }
-        [feminine] { -brand-product-name(case: "acc") }
-        [neuter] { -brand-product-name(case: "acc") }
-       *[other] aplikaci { -brand-product-name }
-    } s sebou
-onboarding-sync-welcome-content = Mějte své záložky, historii i uložená hesla s sebou na všech svých zařízeních.
-onboarding-sync-welcome-learn-more-link = Zjistit více o ú�tech Firefoxu
-onboarding-sync-form-input =
-    .placeholder = E-mail
-onboarding-sync-form-continue-button = Pokra�ovat
-onboarding-sync-form-skip-login-button = Přesko�it tento krok
-
-## This is part of the line "Enter your email to continue to Firefox Sync"
-
-onboarding-sync-form-header = Zadejte svoji e-mailovou adresu
-onboarding-sync-form-sub-header = a používejte { -sync-brand-name(case: "acc") }.
-
-## These are individual benefit messages shown with an image, title and
-## description.
-
-onboarding-benefit-products-text = Používejte nástroje, které respektují vaše soukromí a fungují na všech zařízeních.
-# "Personal Data Promise" is a concept that should be translated consistently
-# across the product. It refers to a concept shown elsewhere to the user: "The
-# Firefox Personal Data Promise is the way we honor your data in everything we
-# make and do. We take less data. We keep it safe. And we make sure that we are
-# transparent about how we use it."
-onboarding-benefit-privacy-text = Slibujeme, že nezneužijeme vaše data. Méně dat je vždy více, udržíme je v bezpe�í a nemáme před vámi žádná tajemství.
-onboarding-benefit-sync-title = { -sync-brand-short-name }
-onboarding-benefit-sync-text =
-    Vezměte si své záložky, hesla, historii a další data všude tam, kde používáte { -brand-product-name.gender ->
-        [masculine] { -brand-product-name(case: "acc") }
-        [feminine] { -brand-product-name(case: "acc") }
-        [neuter] { -brand-product-name(case: "acc") }
-       *[other] aplikaci { -brand-product-name }
-    }.
-onboarding-benefit-monitor-title = { -monitor-brand-short-name }
-onboarding-benefit-monitor-text = Nechte se upozornit, pokud se vaše údaje objeví ve známém úniku dat.
-onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
-onboarding-benefit-lockwise-text = Spravujte hesla bezpe�ně i na cestách.
-
 ## These strings belong to the individual onboarding messages.
 
 
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/places.ftl firefox-85.0+build1/l10n/cs/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/places.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/places.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podsložka
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Ostatní záložky
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/cs/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -32,7 +32,7 @@
         [neuter] v { -brand-short-name(case: "loc") }
        *[other] v aplikaci { -brand-short-name }
     }.
-policy-DisableDefaultBrowserAgent = Zabraňte „výchozímu agentovi prohlíže�e“ provádět jakékoliv akce. Dostupné pouze pro Windows, ostatní platformy agenty nemají.
+policy-DisableDefaultBrowserAgent = Zabraňuje „výchozímu agentovi prohlíže�e“ provádět jakékoliv akce. Dostupné pouze pro Windows, ostatní platformy agenty nemají.
 policy-DisableDeveloperTools = Blokování přístupu k nástrojům pro vývojáře.
 policy-DisableFeedbackCommands = Blokování odeslání zpětné vazby z nabídky Nápověda (volby Odeslat zpětnou vazbu a Nahlásit klamavou stránku).
 policy-DisableFirefoxAccounts = Vypnutí služeb používajících { -fxaccount-brand-name(case: "acc", capitalization: "lower") }, v�etně Syncu.
@@ -49,7 +49,7 @@
 policy-DisableFormHistory = Vypnutí ukládání historie vyhledávání a formulářů.
 policy-DisableMasterPasswordCreation = Hodnota true znemožní nastavení hlavního hesla.
 policy-DisablePrimaryPasswordCreation = Hodnota true znemožní nastavení hlavního hesla.
-policy-DisablePasswordReveal = Zablokovat zobrazování hesel ve správci přihlašovacích údajů.
+policy-DisablePasswordReveal = Zakázání možnosti zobrazit hesla ve správci přihlašovacích údajů.
 policy-DisablePocket = Vypnutí funkce pro ukládání stránek do služby Pocket.
 policy-DisablePrivateBrowsing = Zablokování anonymního prohlížení.
 policy-DisableProfileImport = Blokování importu dat z jiných prohlíže�ů.
@@ -87,18 +87,18 @@
 # “lock� means that the user won’t be able to change this setting
 policy-Homepage = Nastavení a případné uzam�ení domovské stránky.
 policy-InstallAddonsPermission = Povolení instalace doplňků z vybraných webových stránek.
-policy-LegacyProfiles = Vypnout funkci vynucující samostatný profil pro každou instalaci aplikace
+policy-LegacyProfiles = Vypnutí funkce vynucující samostatný profil pro každou instalaci aplikace.
 
 ## Do not translate "SameSite", it's the name of a cookie attribute.
 
-policy-LegacySameSiteCookieBehaviorEnabled = Nastavit staré výchozí chování SameSite cookies.
+policy-LegacySameSiteCookieBehaviorEnabled = Povoluje staré výchozí nastavení chování SameSite cookies.
 policy-LegacySameSiteCookieBehaviorEnabledForDomainList = Nastaví staré výchozí chování SameSite cookies z uvedených serverů.
 
 ##
 
 policy-LocalFileLinks = Povolí vybraným stránkám odkazovat na soubory uložené na místním disku.
-policy-MasterPassword = Vyžadovat nebo zabránit používání hlavního hesla.
 policy-ManagedBookmarks = Nastavení seznamu záložek spravovaných správcem. Takové záložky uživatel nemůže měnit.
+policy-MasterPassword = Vyžadovat nebo zabránit používání hlavního hesla.
 policy-PrimaryPassword = Vyžadovat nebo zabránit používání hlavního hesla.
 policy-NetworkPrediction = Povolení nebo zakázání předna�ítání DNS.
 policy-NewTabPage = Povolení nebo zákaz stránky nového panelu.
@@ -116,13 +116,13 @@
         [neuter] v { -brand-short-name(case: "loc") }
        *[other] v aplikaci { -brand-short-name }
     }. Lze použít hodnoty true i false.
-policy-OfferToSaveLoginsDefault = Nastavení výchozí hodnoty, zda má { -brand-short-name } nabízet ukládání přihlašovacích údajů. Platné hodnoty jsou true a false.
+policy-OfferToSaveLoginsDefault = Nastavení výchozí hodnoty pro to, zda má { -brand-short-name } nabízet ukládání přihlašovacích údajů. Platné hodnoty jsou true a false.
 policy-OverrideFirstRunPage = Nastavení vlastní stránky při prvním spuštění. Pokud nechcete při prvním spuštění zobrazovat žádnou stránku, nastavte toto pravidlo jako prázdné.
 policy-OverridePostUpdatePage = Nastavení vlastní stránky po aktualizaci. Pokud nechcete po aktualizaci zobrazovat žádnou stránku, nastavte toto pravidlo jako prázdné.
 policy-PasswordManagerEnabled = Povolení ukládat přihlašovací údaje do správce hesel.
 # PDF.js and PDF should not be translated
 policy-PDFjs = Zablokování nebo nastavení PDF prohlíže�e PDF.js vestavěného v aplikaci { -brand-short-name }.
-policy-Permissions2 = Nastavení oprávnění pro kameru, mikrofon, polohu, oznámení a automatické přehrávání.
+policy-Permissions2 = Nastavení oprávnění pro kameru, mikrofon, zjišťování polohy, oznámení a automatické přehrávání.
 policy-PictureInPicture = Povolení nebo zakázání režimu obraz v obraze.
 policy-PopupBlocking = Povolení zobrazování vyskakovacích oken ve výchozím stavu.
 policy-Preferences = Nastavení a uzam�ení hodnoty pro podmnožinu předvoleb.
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/cs/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/preferences/preferences.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -29,6 +29,8 @@
            *[other] Najít v předvolbách
         }
 managed-notice = Tento prohlíže� je spravován vaší organizací.
+category-list =
+    .aria-label = Kategorie
 pane-general-title = Obecné
 category-general =
     .tooltiptext = { pane-general-title }
@@ -50,6 +52,9 @@
 pane-experimental-subtitle = Tady pozor!
 pane-experimental-search-results-header = Experimenty { -brand-short-name(case: "gen") }: Postupujte obezřetně!
 pane-experimental-description = Změny v pokro�ilé konfiguraci mohou negativně ovlivnit výkon a bezpe�nost aplikace { -brand-short-name }.
+pane-experimental-reset =
+    .label = Obnovit výchozí nastavení
+    .accesskey = O
 help-button-label =
     { -brand-short-name.gender ->
         [masculine] Nápověda { -brand-short-name(case: "gen") }
@@ -537,6 +542,10 @@
     .label = Zobrazovat přepína� do režimu obrazu v obraze
     .accesskey = E
 browsing-picture-in-picture-learn-more = Zjistit více
+browsing-media-control =
+    .label = Ovládat média pomocí klávesnice, sluchátek nebo virtuálního rozhraní
+    .accesskey = v
+browsing-media-control-learn-more = Zjistit více
 browsing-cfr-recommendations =
     .label = Doporu�ovat vhodná rozšíření pro navštívené stránky
     .accesskey = r
@@ -606,6 +615,13 @@
 home-prefs-topsites-header =
     .label = Top stránky
 home-prefs-topsites-description = Nejnavštěvovanější stránky
+home-prefs-topsites-by-option-sponsored =
+    .label = Sponzorované top stránky
+home-prefs-shortcuts-header =
+    .label = Zkratky vyhledávání
+home-prefs-shortcuts-description = Stránky, které si uložíte nebo navštívíte
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponzorované zkratky
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -613,6 +629,7 @@
 home-prefs-recommended-by-header =
     .label = Doporu�ení ze služby { $provider }
 home-prefs-recommended-by-description-update = Výjime�ný obsah z celého internetu, vybraný službou { $provider }
+home-prefs-recommended-by-description-new = Výjime�ný obsah vybraný spole�ností { $provider }, která je sou�ástí { -brand-product-name(case: "gen") }
 
 ##
 
@@ -630,6 +647,9 @@
     .label = Nedávná stahování
 home-prefs-highlights-option-saved-to-pocket =
     .label = Stránky uložené do { -pocket-brand-name(case: "gen") }
+home-prefs-recent-activity-header =
+    .label = Nedávná aktivita
+home-prefs-recent-activity-description = Výběr z aktuálních stránek a obsahu
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -648,6 +668,7 @@
         [neuter] { -brand-product-name(case: "gen") }
        *[other] aplikace { -brand-product-name }
     }
+home-prefs-snippets-description-new = Tipy a novinky od spole�nosti { -vendor-short-name } a aplikace { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -1029,6 +1050,10 @@
     .label = Sledovací prvky
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Sledovací cookies, např. sociálních sítí
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Sledovací cookies třetích stran v�etně sociálních sítí
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Cookies třetích stran v�etně sociálních sítí
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Sledovací cookies třetích stran a sociálních sítí, ostatní izolovat
 sitedata-option-block-unvisited =
@@ -1063,9 +1088,16 @@
 addressbar-locbar-openpage-option =
     .label = Otevřené panely
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Zkratky
+    .accesskey = Z
 addressbar-locbar-topsites-option =
     .label = Top stránky
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Vyhledáva�e
+    .accesskey = a
 addressbar-suggestions-settings = Nastavit našeptávání vyhledáva�e
 
 ## Privacy Section - Content Blocking
@@ -1073,6 +1105,7 @@
 content-blocking-enhanced-tracking-protection = Rozšířená ochrana proti sledování
 content-blocking-section-top-level-description = Sledovací prvky sbírají informace, co a kde na internetu děláte, jaké máte návyky a co vás zajímá. { -brand-short-name } blokuje mnoho takových prvků i dalších škodlivých skriptů.
 content-blocking-learn-more = Zjistit více
+content-blocking-fpi-incompatibility-warning = Používáte izolaci prvních stran (FPI), která potla�í některá nastavení cookies ve { -brand-short-name(case: "loc") }.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
@@ -1094,6 +1127,7 @@
 content-blocking-etp-strict-desc = Silnější ochrana. Může omezit fungování některých stránek.
 content-blocking-etp-custom-desc = Vyberte sledovací prvky a skripty, které chcete zablokovat.
 content-blocking-private-windows = Sledující obsah v anonymních oknech
+content-blocking-cross-site-cookies = Cross-site cookies
 content-blocking-cross-site-tracking-cookies = Sledovací cookies
 content-blocking-cross-site-tracking-cookies-plus-isolate = Sledovací cookies třetích stran, ostatní izolovat
 content-blocking-social-media-trackers = Sledující prvky sociálních sítí
@@ -1105,6 +1139,7 @@
 content-blocking-fingerprinters = Vytváření otisku prohlíže�e
 content-blocking-warning-title = Pozor!
 content-blocking-and-isolating-etp-warning-description = Blokování sledujícího obsahu a izolace cookies může ovlivnit fungování některých stránek. Pro zobrazení veškerého obsahu znovu na�těte stránku s povolenými sledovacími prvky.
+content-blocking-and-isolating-etp-warning-description-2 = Toto nastavení může způsobit, že některé stránky nebudou fungovat správně. Pro řešení případných problémů můžete ochranu proti sledování na takových stránkách vypnout.
 content-blocking-warning-learn-how = Jak na to
 content-blocking-reload-description = Aby se změny projevily, na�těte znovu své panely.
 content-blocking-reload-tabs-button =
@@ -1349,7 +1384,7 @@
         [feminine] { -brand-short-name(case: "ins") }
         [neuter] { -brand-short-name(case: "ins") }
        *[other] aplikací { -brand-short-name }
-    } a navštěvovanými webovými stránkami. Většina webů protokol HTTPS podporuje, a pokud je zapnut režim „pouze HTTPS“, bude { -brand-short-name } navazovat spojení pouze skrze protokol HTTPS.
+    } a navštěvovanými webovými stránkami. Většina webů protokol HTTPS podporuje, a pokud je zapnut režim „pouze HTTPS“, bude { -brand-short-name } navazovat spojení jen skrze protokol HTTPS.
 httpsonly-learn-more = Zjistit více
 httpsonly-radio-enabled =
     .label = Zapnout režim „pouze HTTPS“ ve všech oknech
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/cs/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -55,8 +55,10 @@
         [neuter] v { -brand-short-name(case: "loc") }
        *[other] v aplikaci { -brand-short-name }
     } na <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = Stránka <span data-l10n-name='sitename'>{ $sitename }</span> byla <a data-l10n-name='error_desc_link'>nahlášena jako stránka se škodlivým softwarem</a>. Můžete se rozhodnout <a data-l10n-name='ignore_warning_link'>ignorovat riziko</a> a pokra�ovat na tuto nebezpe�nou stránku.
+safeb-blocked-malware-page-error-desc-no-override-sumo = Stránka <span data-l10n-name='sitename'>{ $sitename }</span> byla <a data-l10n-name='error_desc_link'>nahlášena jako stránka se škodlivým softwarem</a>.
 safeb-blocked-malware-page-learn-more-sumo =
-    Zjistěte více ochraně proti phishingu a malwaru { -brand-short-name.gender ->
+    Zjistěte více o ochraně proti phishingu a malwaru { -brand-short-name.gender ->
         [masculine] ve { -brand-short-name(case: "loc") }
         [feminine] v { -brand-short-name(case: "loc") }
         [neuter] v { -brand-short-name(case: "loc") }
@@ -74,7 +76,7 @@
 safeb-blocked-harmful-page-error-desc-override = Stránka <span data-l10n-name='sitename'>{ $sitename }</span> byla <a data-l10n-name='error_desc_link'>nahlášena jako stránka s potenciálně škodlivou aplikací</a>. Můžete se rozhodnout <a data-l10n-name='ignore_warning_link'>ignorovat riziko</a> a pokra�ovat na tuto nebezpe�nou stránku.
 safeb-blocked-harmful-page-error-desc-no-override = Stránka <span data-l10n-name='sitename'>{ $sitename }</span> byla <a data-l10n-name='error_desc_link'>nahlášena jako stránka s potenciálně škodlivou aplikací</a>.
 safeb-blocked-harmful-page-learn-more =
-    Zjistěte více ochraně proti phishingu a malwaru { -brand-short-name.gender ->
+    Zjistěte více o ochraně proti phishingu a malwaru { -brand-short-name.gender ->
         [masculine] ve { -brand-short-name(case: "loc") }
         [feminine] v { -brand-short-name(case: "loc") }
         [neuter] v { -brand-short-name(case: "loc") }
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/cs/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -26,21 +26,18 @@
            *[other] Obnovit zavřené panely
         }
     .accesskey = t
-
 toolbar-context-menu-manage-extension =
     .label = Nastavení tohoto rozšíření
     .accesskey = e
 toolbar-context-menu-remove-extension =
     .label = Odebrat rozšíření
     .accesskey = r
-
 # This label is used in the extensions toolbar buttons context menus,
 # a user can use this command to submit to Mozilla an abuse report
 # related to that extension. "Report" is a verb.
 toolbar-context-menu-report-extension =
     .label = Nahlásit rozšíření
     .accesskey = N
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -56,3 +53,24 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = Nastavení tla�ítek a lišt…
     .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = Vždy
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show =
+    .label = Nikdy
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab =
+    .label = Pouze v novém panelu
+    .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vždy zobrazit
+    .accesskey = a
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nikdy nezobrazovat
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Zobrazit pouze v novém panelu
+    .accesskey = o
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Zobrazit ostatní záložky
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/cs/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/cs/browser/browser/webrtcIndicator.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/browser/webrtcIndicator.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -41,3 +41,12 @@
     .title = Zapnout kameru
 webrtc-minimize =
     .title = Minimalizovat ukazatel
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = Sdílíte svou kameru. Pro úpravu sdílení klepněte zde.
+webrtc-microphone-system-menu =
+    .label = Sdílíte svůj mikrofon. Pro úpravu sdílení klepněte zde.
+webrtc-screen-system-menu =
+    .label = Sdílíte okno nebo obrazovku. Pro úpravu sdílení klepněte zde.
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/cs/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/browser.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/chrome/browser/browser.properties	2021-01-18 20:02:23.000000000 +0000
@@ -15,7 +15,6 @@
 # %2$S is the selection string.
 contextMenuSearch=Vyhledat „%2$S“ pomocí %1$S
 contextMenuSearch.accesskey=H
-
 contextMenuPrivateSearch=Vyhledat v anonymním okně
 contextMenuPrivateSearch.accesskey=n
 # LOCALIZATION NOTE (contextMenuPrivateSearchOtherEngine): %S is the search
@@ -57,7 +56,6 @@
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # the administration can add to the message.
 addonInstallBlockedByPolicy=Doplněk %1$S (%2$S) byl zablokován správcem vašeho po�íta�e. %3$S
-
 addonInstallFullScreenBlocked=V režimu celé obrazovky nebo těsně před jeho zapnutím není instalace doplňků povolena.
 
 # LOCALIZATION NOTE (webextPerms.header)
@@ -289,6 +287,9 @@
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 geolocationLastAccessIndicatorText=Poslední přístup %S
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+openProtocolHandlerPermissionEntryLabel=odkazy typu %S://
+
 crashedpluginsMessage.title=Zásuvný modul %S spadl.
 crashedpluginsMessage.reloadButton.label=Znovu na�íst stránku
 crashedpluginsMessage.reloadButton.accesskey=o
@@ -409,7 +410,6 @@
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=Otevře nový panel (%S)
-
 newTabContainer.tooltip=Otevře nový panel (%S)\nPodržením stisknutého tla�ítka otevře nový kontejnerový panel
 newTabAlwaysContainer.tooltip=Pro otevření nového panelu vyberte kontejner
 
@@ -461,14 +461,12 @@
 identity.identified.verifier=Ověřil: %S
 identity.identified.verified_by_you=Tomuto serveru jste udělili bezpe�nostní výjimku
 identity.identified.state_and_country=%S, %S
-
 identity.ev.contentOwner2=Certifikát vydán pro: %S
 
 # LOCALIZATION NOTE (identity.notSecure.label):
 # Keep this string as short as possible, this is displayed in the URL bar
 # use a synonym for "safe" or "private" if "secure" is too long.
 identity.notSecure.label=Nezabezpe�eno
-
 identity.notSecure.tooltip=Připojení není zabezpe�eno
 
 identity.extension.label=Rozšíření (%S)
@@ -635,7 +633,7 @@
 xr.allow=Povolit
 xr.allow.accesskey=P
 xr.dontAllow=Blokovat
-xr.dontAllow.accesskey=N
+xr.dontAllow.accesskey=B
 xr.shareWithSite3=Chcete serveru %S povolit přístup k vašim zařízením pro virtuální realitu? Může tím dojít k odhalení citlivých informací.
 xr.shareWithFile3=Chcete povolit tomuto místnímu souboru přistupovat k vašim zařízením pro virtuální realitu? Může tím dojít k odhalení citlivých informací.
 xr.remember=Zapamatovat si toto rozhodnutí
@@ -772,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=k
 getUserMedia.pickWindowOrScreen.label = Vyberte okno nebo obrazovku
 getUserMedia.shareEntireScreen.label = Celou obrazovku
+getUserMedia.sharePipeWirePortal.label = Použít nastavení opera�ního systému
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
@@ -1032,7 +1031,6 @@
 storageAccess.Allow.accesskey = P
 storageAccess.DontAllow.label = Nepovolit
 storageAccess.DontAllow.accesskey = N
-
 # LOCALIZATION NOTE (storageAccess2.message):
 # %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
@@ -1052,7 +1050,6 @@
 confirmationHint.addSearchEngine.label = Vyhledáva� přidán
 confirmationHint.pinTab.label = Připnuto!
 confirmationHint.pinTab.description = Pro odepnutí panelu na něj klepněte pravým tla�ítkem.
-
 confirmationHint.passwordSaved.label = Heslo uloženo
 confirmationHint.loginRemoved.label = Přihlašovací údaje odstraněny.
 confirmationHint.breakageReport.label = Hlášení byla odesláno. Děkujeme.
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/cs/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:02:23.000000000 +0000
@@ -32,7 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Tento soubor obsahuje virus �i malware.
 blockedPotentiallyUnwanted=Tento soubor může poškodit váš po�íta�.
-blockedInsecure = Tento soubor se nepodařilo bezpe�ně stáhnout.
+blockedPotentiallyInsecure=Soubor nebyl stažen: Možné bezpe�nostní riziko.
 blockedUncommon2=Tento soubor není běžně stahován.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -42,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
@@ -52,6 +52,7 @@
 unblockTypeMalware=Tento soubor obsahuje virus nebo jiný malware, který poškodí váš po�íta�.
 unblockTypePotentiallyUnwanted2=Tento soubor se tváří jako užite�ný nástroj, ale může provést neo�ekávané změny ve vašich programech a nastavení.
 unblockTypeUncommon2=Tento soubor není běžně stahován a nemusí být bezpe�né ho otevřít. Může obsahovat virus anebo provést neo�ekávané změny ve vašich programech a nastaveních.
+unblockInsecure=Adresa pro stažení souboru obsahuje nezabezpe�ený protokol spojení. Během procesu stahování může dojít k jeho poškození nebo neoprávněné manipulaci.
 unblockTip2=Můžete vyhledat alternativní zdroj nebo stažení zkusit znovu později.
 unblockButtonOpen=Otevřít
 unblockButtonUnblock=Povolit stažení
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/newInstall.dtd firefox-85.0+build1/l10n/cs/browser/chrome/browser/newInstall.dtd
--- firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/newInstall.dtd	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/chrome/browser/newInstall.dtd	2021-01-18 20:02:23.000000000 +0000
@@ -12,4 +12,4 @@
 <!ENTITY sync "Pro synchronizaci dat uložených v této instalaci aplikace &brandShortName; se prosím přihlaste ke svému ú�tu Firefoxu.">
 <!ENTITY continue-button "Pokra�ovat">
 
-<!ENTITY mainText "Tato instalace aplikace &brandShortName; má nový profil. To znamená, že už automaticky nesdílí vaše záložky, hesla a vaše nastavení s ostatními instalacemi prohlíže�e Firefox (finální verzí, ESR, betaverzí, Firefox Developer Edition a Nightly) na tomto po�íta�i.">
+<!ENTITY mainText "Tato instalace aplikace &brandShortName; má nový profil. To znamená, že už automaticky nesdílí vaše záložky, hesla a osobní nastavení s ostatními instalacemi prohlíže�e Firefox (finální verzí i verzemi ESR, Beta, Developer Edition a Nightly) na tomto po�íta�i.">
diff -Nru firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/cs/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/cs/browser/chrome/browser/sitePermissions.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:02:23.000000000 +0000
@@ -47,4 +47,6 @@
 permission.canvas.label = Přistupovat k informacím canvasu
 permission.midi.label = Přistupovat k MIDI zařízením
 permission.midi-sysex.label = Přistupovat k MIDI zařízením s podporou SysEx
-permission.https-only-load-insecure.label = Používat nezabezpe�ený protokol HTTP
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = Otevírat aplikace
diff -Nru firefox-84.0.2+build1/l10n/cs/chat/twitter.properties firefox-85.0+build1/l10n/cs/chat/twitter.properties
--- firefox-84.0.2+build1/l10n/cs/chat/twitter.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/chat/twitter.properties	2021-01-18 20:02:23.000000000 +0000
@@ -118,3 +118,5 @@
 
 command.follow=%S &lt;ú�et&gt;[ &lt;ú�et&gt;]*: Za�ít sledovat uživatele.
 command.unfollow=%S &lt;ú�et&gt;[ &lt;ú�et&gt;]*: Ukon�it sledování uživatele.
+
+twitter.disabled=Twitter už není podporován, protože ukon�il podporu svého streamovacího protokolu.
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/aboutdebugging.ftl firefox-85.0+build1/l10n/cs/devtools/client/aboutdebugging.ftl
--- firefox-84.0.2+build1/l10n/cs/devtools/client/aboutdebugging.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/aboutdebugging.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -189,6 +189,16 @@
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
 # { $minVersion } is the minimum version that is compatible with the current Firefox instance (same format)
 about-debugging-browser-version-too-old = Připojený prohlíže� má starou verzi ({ $runtimeVersion }). Minimální podporovaná verze je ({ $minVersion }). Toto je nepodporovaná konfigurace a může způsobit nefunk�nost nástrojů pro vývojáře. Prosím aktualizujte připojený prohlíže�. <a> Poradce při potížích</a>
+# Dedicated message for a backward compatibility issue that occurs when connecting:
+# from Fx 70+ to the old Firefox for Android (aka Fennec) which uses Fx 68.
+about-debugging-browser-version-too-old-fennec = Tato verze Firefoxu nemůže ladit Firefox pro Android (68). Pro testování doporu�ujeme do telefonu nainstalovat Firefox Nightly pro Android. <a>Více informací</a>
+# This string is displayed in the runtime page if the remote browser version is too recent.
+# "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
+# { $runtimeID } is the build ID of the remote browser (for instance "20181231", format is yyyyMMdd)
+# { $localID } is the build ID of the current Firefox instance (same format)
+# { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
+# { $localVersion } is the version of your current browser (same format)
+about-debugging-browser-version-too-recent = Připojený prohlíže� je novější ({ $runtimeVersion }, buildID { $runtimeID }) než váš { -brand-shorter-name } ({ $localVersion }, buildID { $localID }). Taková situace není podporována a může způsobit selhání nástrojů pro vývojáře. Aktualizujte prosím svůj Firefox. <a>Řešení potíží</a>
 # Displayed for runtime info in runtime pages.
 # { $name } is brand name such as "Firefox Nightly"
 # { $version } is version such as "64.0a1"
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/debugger.properties firefox-85.0+build1/l10n/cs/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/cs/devtools/client/debugger.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/debugger.properties	2021-01-18 20:02:23.000000000 +0000
@@ -464,7 +464,7 @@
 # LOCALIZATION NOTE (editor.addLogPoint): Editor gutter context
 # menu item for adding a log point on a line.
 editor.addLogPoint=Přidat protokol
-editor.addLogPoint.accesskey=U
+editor.addLogPoint.accesskey=l
 
 # LOCALIZATION NOTE (editor.editLogPoint): Editor gutter context menu item
 # for editing a log point already set on a line.
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/menus.properties firefox-85.0+build1/l10n/cs/devtools/client/menus.properties
--- firefox-84.0.2+build1/l10n/cs/devtools/client/menus.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/menus.properties	2021-01-18 20:02:23.000000000 +0000
@@ -6,6 +6,7 @@
 # in Tools > Web Developer. Clicking on this menu item will open about:debugging which
 # acts as a hub for debugging remote devices.
 devtoolsRemoteDebugging.label = Vzdálené ladění
+devtoolsRemoteDebugging.accesskey = L
 
 browserConsoleCmd.label = Konzole prohlíže�e
 browserConsoleCmd.accesskey = K
@@ -27,9 +28,6 @@
 browserContentToolboxMenu.label = Nástroje pro ladění prohlíže�e
 browserContentToolboxMenu.accesskey = d
 
-# LOCALIZATION NOTE (toggleProfilerButtonMenu.label): This is the label for the
-# application menu item that toggles the profiler button to record performance profiles.
-
 devToolboxMenuItem.label = Nástroje pro vývojáře
 devToolboxMenuItem.accesskey = t
 
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/performance.properties firefox-85.0+build1/l10n/cs/devtools/client/performance.properties
--- firefox-84.0.2+build1/l10n/cs/devtools/client/performance.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/performance.properties	2021-01-18 20:02:23.000000000 +0000
@@ -12,13 +12,13 @@
 
 # LOCALIZATION NOTE (noRecordingsText): The text to display in the
 # recordings menu when there are no recorded profiles yet.
-noRecordingsText=Dosud nejsou žádné profily.
+noRecordingsText=Zatím nejsou žádné profily.
 
 # LOCALIZATION NOTE (recordingsList.itemLabel):
 # This string is displayed in the recordings list of the Performance Tools,
 # identifying a set of function calls. %S represents the number of recording,
 # iterating for every new recording, resulting in "Recording #1", "Recording #2", etc.
-recordingsList.itemLabel=Na�ítání #%S
+recordingsList.itemLabel=Záznam #%S
 
 # LOCALIZATION NOTE (recordingsList.recordingLabel):
 # This string is displayed in the recordings list of the Performance Tools,
@@ -94,7 +94,7 @@
 
 # LOCALIZATION NOTE (table.idle):
 # This string is displayed in the call tree for the idle blocks.
-table.idle=(idle)
+table.idle=(ne�inný)
 
 # LOCALIZATION NOTE (table.url.tooltiptext):
 # This string is displayed in the call tree as the tooltip text for the url
@@ -104,7 +104,7 @@
 # LOCALIZATION NOTE (table.view-optimizations.tooltiptext2):
 # This string is displayed in the icon displayed next to frames that
 # have optimization data
-table.view-optimizations.tooltiptext2=Rám obsahuje JIT optimalizaci dat
+table.view-optimizations.tooltiptext2=Rám obsahuje data JIT optimalizace
 
 # LOCALIZATION NOTE (recordingsList.importDialogTitle):
 # This string is displayed as a title for importing a recoring from disk.
@@ -141,7 +141,7 @@
 
 # LOCALIZATION NOTE (recordings.start):
 # The label shown on the main recording buttons to start recording.
-recordings.start=Zapnout nahrávání výkonu
+recordings.start=Zahájit nahrávání výkonu
 
 # LOCALIZATION NOTE (recordings.stop):
 # The label shown on the main recording buttons to stop recording.
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/responsive.properties firefox-85.0+build1/l10n/cs/devtools/client/responsive.properties
--- firefox-84.0.2+build1/l10n/cs/devtools/client/responsive.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/responsive.properties	2021-01-18 20:02:23.000000000 +0000
@@ -121,6 +121,7 @@
 # LOCALIZATION NOTE (responsive.deviceDetails.DPR): Used to display the DPR in a tooltip
 # that appears when hovering on a device in the device modal.
 # %1$S: device pixel ratio
+responsive.deviceDetails.DPR=Poměr pixelů zařízení: %1$S
 
 # LOCALIZATION NOTE (responsive.deviceDetails.UA): Used to display the UA in a tooltip
 # that appears when hovering on a device in the device modal.
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/storage.ftl firefox-85.0+build1/l10n/cs/devtools/client/storage.ftl
--- firefox-84.0.2+build1/l10n/cs/devtools/client/storage.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/storage.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -7,3 +7,21 @@
 
 # Hint shown when the selected storage host does not contain any data
 storage-table-empty-text = Pro vybraného hostitele nejsou k dispozici žádné údaje
+# Hint shown when the cookies storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/Cookies
+storage-table-type-cookies-hint = Pro zobrazení a úpravu cookies vyberte hostitele. <a data-l10n-name="learn-more-link">Zjistit více</a>
+# Hint shown when the local storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/Local_Storage_Session_Storage
+storage-table-type-localstorage-hint = Pro zobrazení a úpravu místního úložiště vyberte hostitele. <a data-l10n-name="learn-more-link">Zjistit více</a>
+# Hint shown when the session storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/Local_Storage_Session_Storage
+storage-table-type-sessionstorage-hint = Pro zobrazení a úpravu úložiště relace vyberte hostitele. <a data-l10n-name="learn-more-link">Zjistit více</a>
+# Hint shown when the IndexedDB storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/IndexedDB
+storage-table-type-indexeddb-hint = Pro zobrazení a úpravu položek v IndexedDB vyberte databázi. <a data-l10n-name="learn-more-link">Zjistit více</a>
+# Hint shown when the cache storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/Cache_Storage
+storage-table-type-cache-hint = Pro zobrazení a úpravu položek úložiště mezipaměti vyberte úložiště. <a data-l10n-name="learn-more-link">Zjistit více</a>
+# Hint shown when the extension storage type is selected. Clicking the link will open
+# https://developer.mozilla.org/docs/Tools/Storage_Inspector/Extension_Storage
+storage-table-type-extensionstorage-hint = Pro zobrazení a úpravu úložiště rozšíření vyberte hostitele. <a data-l10n-name="learn-more-link">Zjistit více</a>
diff -Nru firefox-84.0.2+build1/l10n/cs/devtools/client/toolbox-options.ftl firefox-85.0+build1/l10n/cs/devtools/client/toolbox-options.ftl
--- firefox-84.0.2+build1/l10n/cs/devtools/client/toolbox-options.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/devtools/client/toolbox-options.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -10,19 +10,15 @@
 
 # The heading
 options-select-default-tools-label = Výchozí nástroje pro vývojáře
-
 # The label for the explanation of the * marker on a tool which is currently not supported
 # for the target of the toolbox.
 options-tool-not-supported-label = * Není podporován pro aktuální kontext
-
 # The label for the heading of group of checkboxes corresponding to the developer tools
 # added by add-ons. This heading is hidden when there is no developer tool installed by add-ons.
 options-select-additional-tools-label = Nástroje pro vývojáře instalované doplňkem
-
 # The label for the heading of group of checkboxes corresponding to the default developer
 # tool buttons.
 options-select-enabled-toolbox-buttons-label = Dostupná tla�ítka nástrojů
-
 # The label for the heading of the radiobox corresponding to the theme
 options-select-dev-tools-theme-label = Motivy vzhledu
 
@@ -30,12 +26,10 @@
 
 # The heading
 options-context-inspector = Průzkumník
-
 # The label for the checkbox option to show user agent styles
 options-show-user-agent-styles-label = Zobrazit styly prohlíže�e
 options-show-user-agent-styles-tooltip =
     .title = Zapnutím zobrazíte výchozí styly, které jsou na�ítány prohlíže�em.
-
 # The label for the checkbox option to enable collapse attributes
 options-collapse-attrs-label = Zkrátit DOM atributy
 options-collapse-attrs-tooltip =
@@ -54,7 +48,6 @@
 
 # The heading
 options-styleeditor-label = Editor stylů
-
 # The label for the checkbox that toggles autocompletion of css in the Style Editor
 options-stylesheet-autocompletion-label = Automatické doplňování CSS
 options-stylesheet-autocompletion-tooltip =
@@ -64,12 +57,10 @@
 
 # The heading
 options-screenshot-label = Chování snímku obrazovky
-
 # Label for the checkbox that toggles screenshot to clipboard feature
 options-screenshot-clipboard-label = Snímek obrazovky do schránky
 options-screenshot-clipboard-tooltip =
     .title = Uloží snímek obrazovky přímo do schránky
-
 # Label for the checkbox that toggles the camera shutter audio for screenshot tool
 options-screenshot-audio-label = Přehrát zvuk spouště fotoaparátu
 options-screenshot-audio-tooltip =
@@ -79,7 +70,6 @@
 
 # The heading
 options-sourceeditor-label = Předvolby editoru
-
 options-sourceeditor-detectindentation-tooltip =
     .title = Rozpozná odsazení na základě obsahu zdrojového kódu
 options-sourceeditor-detectindentation-label = Automatické odsazování
@@ -97,40 +87,32 @@
 
 # The heading
 options-context-advanced-settings = Rozšířené nastavení
-
 # The label for the checkbox that toggles the HTTP cache on or off
 options-disable-http-cache-label = Zakázat mezipaměť (když jsou nástroje otevřeny)
 options-disable-http-cache-tooltip =
     .title = Zapnutím této volby bude mezipaměť HTTP vypnuta pro všechny panely, které mají otevřené nástroje. Service Workers nejsou touto volbou ovlivněny.
-
 # The label for checkbox that toggles JavaScript on or off
 options-disable-javascript-label = Zakázat JavaScript *
 options-disable-javascript-tooltip =
     .title = Přepnutí této volby zakáže pro aktuální panel JavaScript. Jakmile bude panel nebo nástroje uzavřeny, bude nastavení zapomenuto.
-
 # The label for checkbox that toggles chrome debugging, i.e. the devtools.chrome.enabled preference
 options-enable-chrome-label = Povolit ladící nástroj pro chrome a doplňky
 options-enable-chrome-tooltip =
     .title = Zapnutí umožní použít nástroje pro vývojáře v kontextu prohlíže�e (přes Nástroje > Nástroje pro vývojáře > Nástroje prohlíže�e) nebo pro ladění doplňků ze Správce doplňků
-
 # The label for checkbox that toggles remote debugging, i.e. the devtools.debugger.remote-enabled preference
 options-enable-remote-label = Povolit vzdálené ladění
-
+options-enable-remote-tooltip2 =
+    .title = Zapnutí umožní vzdálené ladění této instance prohlíže�e
 # The label for checkbox that toggles the service workers testing over HTTP on or off.
 options-enable-service-workers-http-label = Povolit Service Workers přes HTTP (když jsou nástroje otevřeny)
 options-enable-service-workers-http-tooltip =
     .title = Zapnutí této volby umožní Service Workers přes HTTP pro všechny panely, které mají panel nástrojů otevřen.
-
 # The label for the checkbox that toggles source maps in all tools.
 options-source-maps-label = Povolit zdrojové mapy
 options-source-maps-tooltip =
     .title = Pokud tuto volbu zapnete, zdroje voleb budou mapované v nástrojích.
-
 # The message shown for settings that trigger page reload
 options-context-triggers-page-refresh = * Pouze aktuální relace, znovu na�te stránku
-
-##
-
 # The label for the checkbox that toggles the display of the platform data in the
 # Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference in about:config
 options-show-platform-data-label = Zobrazit data platformy Gecko
diff -Nru firefox-84.0.2+build1/l10n/cs/dom/dom/media.ftl firefox-85.0+build1/l10n/cs/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/cs/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/dom/dom/media.ftl	2021-01-18 20:02:23.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/.
+
+mediastatus-fallback-title = { -brand-short-name } právě přehrává média
diff -Nru firefox-84.0.2+build1/l10n/cs/netwerk/necko.properties firefox-85.0+build1/l10n/cs/netwerk/necko.properties
--- firefox-84.0.2+build1/l10n/cs/netwerk/necko.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/netwerk/necko.properties	2021-01-18 20:02:23.000000000 +0000
@@ -47,6 +47,7 @@
 # As part of dynamic first-party isolation, third-party resources might be limited to "partitioned" storage access that is separate from the first-party context.
 # This allows e.g. cookies to still be set, and prevents tracking without totally blocking storage access. This message is shown in the web console when this happens
 # to inform developers that their storage is isolated.
+CookiePartitionedForeign=Zdroji „%1$S“ byla poskytnuta oddělená cookie nebo přístup k úložišti, protože je na�ten v kontextu třetí strany a je zapnuto oddělení úložiště.
 
 # LOCALIZATION NOTE (CookieAllowedForOriginByStorageAccessAPI): %2$S and %1$S are URLs.
 CookieAllowedForOriginByStorageAccessAPI=Přístup k úložišti „%1$S“ byl původnímu zdroji „%2$S“ povolen.
@@ -95,10 +96,14 @@
 # LOCALIZATION NOTE (CookieRejectedInvalidCharValue): %1$S is the cookie name.
 CookieRejectedInvalidCharValue=Cookie „%1$S“ byla odmítnuta kvůli neplatným znakům v její hodnotě.
 # LOCALIZATION NOTE (CookieRejectedHttpOnlyButFromScript): %1$S is the cookie name.
+CookieRejectedHttpOnlyButFromScript=Cookie „%1$S“ byla odmítnuta, protože už existuje stejná cookie s příznakem HTTP-Only, ale skript se pokusil uložit novou.
 # LOCALIZATION NOTE (CookieRejectedSecureButHttp): %1$S is the cookie name.
+CookieRejectedSecureButNonHttps=Cookie „%1$S“ byla odmítnuta, protože pouze cookies poslané přes zabezpe�ené HTTPS spojení může mít příznak „secure“.
 # LOCALIZATION NOTE (CookieRejectedThirdParty): %1$S is the cookie response header.
 CookieRejectedThirdParty=Cookie „%1$S“ byla odmítnuta jako cookie třetí strany.
 # LOCALIZATION NOTE (CookieRejectedNonsecureOverSecure): %1$S is the cookie name.
+CookieRejectedNonsecureOverSecure=Cookie „%1$S“ byla odmítnuta, protože už existuje stejná cookie s příznakem „secure“.
 # LOCALIZATION NOTE (CookieRejectedExpired): %1$S is the cookie name.
 CookieRejectedExpired=Cookie „%1$S“ byla odmítnuta, protože vypršela její doba platnosti.
 # LOCALIZATION NOTE (CookieRejectedForNonSameSiteness): %1$S is the cookie name.
+CookieRejectedForNonSameSiteness=Cookie „%1$S“ byla odmítnuta, protože je poslána v kontextu cross-site, ale obsahuje příznak „SameSite“ s hodnotou „Lax“ nebo „Strict“.
diff -Nru firefox-84.0.2+build1/l10n/cs/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/cs/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/cs/security/manager/security/certificates/certManager.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/security/manager/security/certificates/certManager.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -14,11 +14,12 @@
     .label = Servery
 certmgr-tab-ca =
     .label = Autority
-certmgr-mine = Pro vaši osobní identifikaci jsou dostupné tyto certifikáty
+certmgr-mine = Tyto certifikáty od následujících organizací slouží k vaší osobní identifikaci
 certmgr-remembered = Tyto certifikáty slouží k vaší identifikaci na webových stránkách
-certmgr-people = Pro identifikaci ostatních lidí jsou dostupné tyto certifikáty
-certmgr-servers = Pro identifikaci serverů jsou dostupné tyto certifikáty
-certmgr-ca = Pro identifikaci certifika�ních autorit jsou dostupné tyto certifikáty
+certmgr-people = Tyto certifikáty jsou dostupné pro identifikaci následujících lidí
+certmgr-servers = Tyto certifikáty jsou dostupné pro identifikaci následujících serverů
+certmgr-server = Tento seznam obsahuje výjimky pro chyby serverových certifikátů
+certmgr-ca = Tyto certifikáty jsou dostupné pro identifikaci certifika�ních autorit
 certmgr-detail-general-tab-title =
     .label = Obecné
     .accesskey = O
@@ -59,7 +60,7 @@
 certmgr-cert-server =
     .label = Server
 certmgr-override-lifetime =
-    .label = Životnost
+    .label = Platnost
 certmgr-token-name =
     .label = Bezpe�nostní zařízení
 certmgr-begins-on = Vydáno dne
@@ -155,12 +156,16 @@
 
 delete-user-cert-title =
     .title = Smazání osobních certifikátů
-delete-user-cert-confirm = Opravdu chcete smazat tyto certifikáty?
+delete-user-cert-confirm = Opravdu chcete tyto certifikáty smazat?
 delete-user-cert-impact = Pokud smažete jeden ze svých vlastních certifikátů, nebudete moci dále prokazovat svoji identitu.
 delete-ssl-cert-title =
     .title = Smazání výjimek pro certifikáty serverů
 delete-ssl-cert-confirm = Opravdu chcete smazat výjimky pro tyto servery?
 delete-ssl-cert-impact = Pokud odstraníte výjimku, obnovíte pro daný server obvyklé bezpe�nostní kontroly a vyžadování platného certifikátu.
+delete-ssl-override-title =
+    .title = Smazání výjimky pro certifikát serveru
+delete-ssl-override-confirm = Opravdu chcete smazat výjimku pro tento server?
+delete-ssl-override-impact = Pokud smažete výjimku pro server, obnovíte pro daný server obvyklé bezpe�nostní kontroly a server pak bude požadovat platný certifikát.
 delete-ca-cert-title =
     .title = Smazání nebo nedůvěra certifikátů CA
 delete-ca-cert-confirm = Požádali jste o smazání certifikátů CA. V případě vestavěných certifikátů jim bude odebrána důvěra, což má stejný efekt jako jejich smazání. Opravdu je chcete smazat nebo jim přestat důvěřovat?
@@ -210,6 +215,13 @@
 cert-not-verified-unknown = Certifikát nemohl být z neznámého důvodu ověřen.
 # Used to indicate that the user chose not to send a client authentication certificate to a server that requested one in a TLS handshake.
 send-no-client-certificate = Neposílat klientský certifikát
+# Used when no cert is stored for an override
+no-cert-stored-for-override = (neuloženo)
+
+## Used to show whether an override is temporary or permanent
+
+permanent-override = Trvale
+temporary-override = Do�asně
 
 ## Add Security Exception dialog
 
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/cs/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/cs/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:23.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d
 
 downloadErrorAlertTitle=Chyba stahování
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Stahovaný soubor nelze uložit, protože byl zablokován rozšířením %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Stahovaný soubor nelze uložit, protože byl zablokován rozšířením.
 downloadErrorGeneric=Nastala neznámá chyba a stahovaný soubor se nepodařilo uložit.\n\nZkuste to prosím znovu.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Zbývá několik vteřin
 timeUnknown2=Zbývá neznámý �as
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=zdroj %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/cs/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/cs/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:23.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Proxy server odmítl spojení
 check_error-2153390069=Platnost certifikátu serveru vypršela (opravte prosím nastavení data ve vašem systému, pokud není správné)
 check_error-verification_failed=Nepodařilo se ověřit neporušenost aktualizace
+check_error-move_failed=Nepodařilo se připravit instalaci aktualizace
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -426,18 +426,12 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } doporu�uje jen rozšíření, která splňují naše standardy pro bezpe�nost a výkon
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title =
-        Toto rozšíření bylo vytvořeno autory { -brand-product-name.gender ->
-            [masculine] { -brand-product-name(case: "gen") }
-            [feminine] { -brand-product-name(case: "gen") }
-            [neuter] { -brand-product-name(case: "gen") }
-           *[other] aplikace { -brand-product-name }
-        }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Toto rozšíření prošlo bezpe�nostní kontrolou
-    .aria-label = { addon-badge-verified.title }
+addon-badge-line2 =
+    .title = Toto je oficiální rozšíření od tvůrců { -brand-product-name(case: "gen") }
+    .aria-label = { addon-badge-line2.title }
+addon-badge-verified2 =
+    .title = U tohoto rozšíření bylo zkontrolováno, že splňuje naše standardy ohledně zabezpe�ení a výkonu
+    .aria-label = { addon-badge-verified2.title }
 
 ##
 
@@ -446,6 +440,9 @@
 release-notes-loading = Na�ítání…
 release-notes-error = Omlouváme se, ale při na�ítání poznámek k vydání nastala chyba.
 addon-permissions-empty = Toto rozšíření nevyžaduje žádná oprávnění.
+addon-permissions-required = Vyžadovaná oprávnění pro základní funkce:
+addon-permissions-optional = Volitelná oprávnění pro dodate�né funkce:
+addon-permissions-learnmore = Zjistit více o oprávněních
 recommended-extensions-heading = Doporu�ená rozšíření
 recommended-themes-heading = Doporu�ené vzhledy
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -9,19 +9,15 @@
 about-httpsonly-insecure-explanation-reasons = Pravděpodobně tento server HTTPS vůbec nepodporuje, ale je také možné, že se někdo HTTPS snaží blokovat.
 about-httpsonly-insecure-explanation-exception = A� je bezpe�nostní riziko relativně nízké, pokud se rozhodnete navštívit nezabezpe�enou verzi této stránky přes HTTP, doporu�ujeme na ní nezadávat žádné citlivé informace jako jsou hesla, e-mailové adresy nebo platební údaje.
 about-httpsonly-button-make-exception = Beru na vědomí a chci pokra�ovat
-about-httpsonly-title =
-    { -brand-short-name.gender ->
-        [masculine] { -brand-short-name } zjistil
-        [feminine] { -brand-short-name } zjistila
-        [neuter] { -brand-short-name } zjistilo
-       *[other] Aplikace { -brand-short-name } zjistila
-    } potenciální bezpe�nostní problém
+about-httpsonly-title-alert = Upozornění režimu „pouze HTTPS“
+about-httpsonly-title-connection-not-available = Zabezpe�ené spojení není dostupné
 # Variables:
 #   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
-about-httpsonly-explanation-unavailable = Webové stránky prohlížíte v režimu „pouze HTTPS“, ale zabezpe�ená verze webu <em>{ $websiteUrl }</em> není dostupná.
+about-httpsonly-explanation-unavailable2 = Máte zapnutý režim „pouze HTTPS“ zajišťující vyšší míru zabezpe�ení, ale zabezpe�ená verze webu <em>{ $websiteUrl }</em> není dostupná.
 about-httpsonly-explanation-question = Co by mohlo být pří�inou?
-about-httpsonly-explanation-nosupport = Nejspíš tento web jednoduše HTTPS nepodporuje.
+about-httpsonly-explanation-nosupport = Tento web nejspíš HTTPS prostě nepodporuje.
 about-httpsonly-explanation-risk = Je také možné, že v tom má prsty úto�ník. Pokud se rozhodnete tuto stránku navštívit, doporu�ujeme na ní nezadávat žádné citlivé informace jako jsou hesla, e-mailové adresy nebo platební údaje.
-about-httpsonly-button-accept-and-continue = Beru na vědomí a chci pokra�ovat
+about-httpsonly-explanation-continue = Pokud se rozhodnete pokra�ovat, bude pro tento server režim „pouze HTTPS“ do�asně vypnut.
+about-httpsonly-button-continue-to-site = Pokra�ovat přes nezabezpe�ené spojení
 about-httpsonly-button-go-back = Zpátky
 about-httpsonly-link-learn-more = Zjistit více…
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutNetworking.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -6,6 +6,8 @@
 about-networking-http = HTTP
 about-networking-sockets = Sockety
 about-networking-dns = DNS
+about-networking-dns-clear-cache-button = Vymazat mezipaměť DNS
+about-networking-dns-trr-url = URL serveru DoH
 about-networking-dns-suffix = Přípona DNS
 about-networking-websockets = WebSockets
 about-networking-refresh = Obnovit
@@ -24,6 +26,7 @@
 about-networking-trr = TRR
 about-networking-addresses = Adresy
 about-networking-expires = Vyprší (sekundy)
+about-networking-originAttributesSuffix = Izola�ní klí�
 about-networking-messages-sent = Odesláno zpráv
 about-networking-messages-received = Přijato zpráv
 about-networking-bytes-sent = Odesláno bajtů
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -65,12 +65,16 @@
 app-basics-build-config = Nastavení sestavení
 app-basics-user-agent = User agent
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Přeloženo pro Apple pomocí Rosetta
 app-basics-memory-use = Spotřeba paměti
 app-basics-performance = Výkon
 app-basics-service-workers = Registrovaní Service Workers
 app-basics-profiles = Profily
 app-basics-launcher-process-status = Spouštěcí proces
 app-basics-multi-process-support = Multiprocesová okna
+app-basics-fission-support = Okna používající Fission
 app-basics-remote-processes-count = Vzdálené procesy
 app-basics-enterprise-policies = Podniková pravidla
 app-basics-location-service-key-google = Klí� služby Google Location Service
@@ -192,6 +196,32 @@
 
 ##
 
+support-third-party-modules-title = Moduly třetích stran
+support-third-party-modules-module = Soubor modulu
+support-third-party-modules-version = Verze souboru
+support-third-party-modules-vendor = Informace poskytovatele
+support-third-party-modules-occurrence = Výskyt
+support-third-party-modules-process = Typ a ID procesu
+support-third-party-modules-thread = Vlákno
+support-third-party-modules-base = Adresa Imagebase
+support-third-party-modules-uptime = Doba běhu procesu (ms)
+support-third-party-modules-duration = Doba na�ítání (ms)
+support-third-party-modules-empty = Nebyly na�teny žádné moduly třetích stran.
+support-third-party-modules-no-value = (žádná hodnota)
+support-third-party-modules-button-open =
+    .title = Otevřít umístění souboru…
+support-third-party-modules-expand =
+    .title = Zobrazit podrobnosti
+support-third-party-modules-collapse =
+    .title = Skrýt podrobnosti
+support-third-party-modules-unsigned-icon =
+    .title = Tento modul není podepsán
+support-third-party-modules-folder-icon =
+    .title = Otevřít umístění souboru…
+support-third-party-modules-down-icon =
+    .title = Zobrazit podrobnosti
+support-third-party-modules-up-icon =
+    .title = Skrýt podrobnosti
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -342,6 +372,20 @@
 multi-process-status-7 = Zakázáno doplňky
 multi-process-status-8 = Násilně zakázáno
 multi-process-status-unknown = Neznámý stav
+# Variables
+# $fissionWindows (integer) - Number of remote windows
+# $totalWindows (integer) - Number of total windows
+fission-windows = { $fissionWindows }/{ $totalWindows }
+fission-status-experiment-control = Zakázáno experimentem
+fission-status-experiment-treatment = Povoleno experimentem
+fission-status-disabled-by-e10s-env = Zakázáno prostředím
+fission-status-enabled-by-env = Povoleno prostředím
+fission-status-disabled-by-safe-mode = Zakázáno v nouzovém režimu
+fission-status-enabled-by-default = Povoleno ve výchozím nastavení
+fission-status-disabled-by-default = Zakázáno ve výchozím nastavení
+fission-status-enabled-by-user-pref = Povoleno uživatelem
+fission-status-disabled-by-user-pref = Zakázáno uživatelem
+fission-status-disabled-by-e10s-other = Zakázáno kvůli E10S
 async-pan-zoom = Asynchronní lupa/panning
 apz-none = nic
 wheel-enabled = vstup kole�ka povolen
@@ -362,3 +406,12 @@
 policies-inactive = Neaktivní
 policies-active = Aktivní
 policies-error = Chyba
+
+## Printing section
+
+support-printing-title = Tisk
+support-printing-troubleshoot = Řešení problémů
+support-printing-clear-settings-button = Vymazat uložené nastavení tisku
+support-printing-modified-settings = Upravená nastavení tisku
+support-printing-prefs-name = Název
+support-printing-prefs-value = Hodnota
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> chce otevřít odkaz přes <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
@@ -17,11 +9,54 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
+permission-dialog-description = Chcete tomuto serveru povolit otevírat odkazy typu { $scheme }?
+permission-dialog-description-file = Chcete tomuto souboru povolit otevírat odkazy typu { $scheme }?
+permission-dialog-description-host = Chcete serveru { $host } povolit otevírat odkazy typu { $scheme }?
+permission-dialog-description-app = Chcete tomuto serveru povolit otevírat odkazy typu { $scheme } pomocí aplikace { $appName }?
+permission-dialog-description-host-app = Chcete serveru { $host } povolit otevírat odkazy typu { $scheme } pomocí aplikace { $appName }?
+permission-dialog-description-file-app = Chcete tomuto souboru povolit otevírat odkazy typu { $scheme } pomocí aplikace { $appName }?
+
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+permission-dialog-remember = Vždy povolit serveru <strong>{ $host }</strong> otevírat odkazy typu <strong>{ $scheme }</strong>
+permission-dialog-remember-file = Vždy povolit tomuto souboru otevírat odkazy typu <strong>{ $scheme }</strong>
+
+##
+
+permission-dialog-btn-open-link =
+    .label = Otevřít odkaz
+    .accessKey = O
+permission-dialog-btn-choose-app =
+    .label = Vybrat aplikaci
+    .accessKey = V
+permission-dialog-unset-description = Budete muset vybrat aplikaci.
+permission-dialog-set-change-app-link = Vyberte jinou aplikaci.
 
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-window =
+    .title = Výběr aplikace
+    .style = min-width: 26em; min-height: 26em;
+chooser-dialog =
+    .buttonlabelaccept = Otevřít odkaz
+    .buttonaccesskeyaccept = O
+chooser-dialog-description = Vyberte aplikaci pr otevírání odkazů typu { $scheme }.
+# Please keep the emphasis around the scheme (ie the `<strong>` HTML tags).
+chooser-dialog-remember = Pro otevírání odkazů typu <strong>{ $scheme }</strong> vždy používat tuto aplikaci
+chooser-dialog-remember-extra =
+    Toto nastavení můžete změnit v { PLATFORM() ->
+        [windows] Možnostech
+       *[other] Předvolbách
+    } { -brand-short-name.gender ->
+        [masculine] { -brand-short-name(case: "gen") }
+        [feminine] { -brand-short-name(case: "gen") }
+        [neuter] { -brand-short-name(case: "gen") }
+       *[other] aplikace { -brand-short-name }
+    }.
 choose-other-app-description = Vybrat jinou aplikaci
 choose-app-btn =
     .label = Vybrat…
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/profileDowngrade.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/profileDowngrade.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/profileDowngrade.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/profileDowngrade.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -11,12 +11,31 @@
            *[other] aplikace { -brand-product-name }
         }
     .style = width: 490px;
-
 profiledowngrade-window-create =
     .label = Vytvořit nový profil
-
-profiledowngrade-sync = Spuštěním starší verze { -brand-product-name }u může dojít k poškození záložek a historie prohlížení uložených v jeho stávajícím profilu. Pro ochranu vašich dat si prosím pro tuto instalaci aplikace { -brand-short-name } vytvořte profil nový. Pro synchronizaci dat mezi oběma profily můžete použít { -fxaccount-brand-name }.
-profiledowngrade-nosync = Spuštěním starší verze { -brand-product-name }u může dojít k poškození záložek a historie prohlížení uložených v jeho stávajícím profilu. Pro ochranu vašich dat si prosím pro tuto instalaci aplikace { -brand-short-name } vytvořte profil nový.
-
+profiledowngrade-sync =
+    Spuštěním starší verze { -brand-product-name.gender ->
+        [masculine] { -brand-product-name(case: "gen") }
+        [feminine] { -brand-product-name(case: "gen") }
+        [neuter] { -brand-product-name(case: "gen") }
+       *[other] aplikace { -brand-product-name }
+    } může dojít k poškození záložek a historie prohlížení uložených v jeho stávajícím profilu. Pro ochranu vašich dat si prosím pro tuto instalaci { -brand-product-name.gender ->
+        [masculine] { -brand-short-name(case: "gen") }
+        [feminine] { -brand-short-name(case: "gen") }
+        [neuter] { -brand-short-name(case: "gen") }
+       *[other] aplikace { -brand-short-name }
+    } vytvořte profil nový. Pro synchronizaci dat mezi oběma profily můžete použít { -fxaccount-brand-name(case: "acc", capitalization: "lower") }.
+profiledowngrade-nosync =
+    Spuštěním starší verze { -brand-product-name.gender ->
+        [masculine] { -brand-product-name(case: "gen") }
+        [feminine] { -brand-product-name(case: "gen") }
+        [neuter] { -brand-product-name(case: "gen") }
+       *[other] aplikace { -brand-product-name }
+    } může dojít k poškození záložek a historie prohlížení uložených v jeho stávajícím profilu. Pro ochranu vašich dat si prosím pro tuto instalaci { -brand-product-name.gender ->
+        [masculine] { -brand-short-name(case: "gen") }
+        [feminine] { -brand-short-name(case: "gen") }
+        [neuter] { -brand-short-name(case: "gen") }
+       *[other] aplikace { -brand-short-name }
+    } vytvořte profil nový.
 profiledowngrade-quit =
     .label = Ukon�it
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -10,3 +10,5 @@
 videocontrols-buffer-bar-label = Na�ítání:
 videocontrols-volume-control =
     .aria-label = Hlasitost
+videocontrols-closed-caption-button =
+    .aria-label = Skryté titulky
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Stránka:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } z { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Poslední stránka
-
+printpreview-homearrow-button =
+    .title = První stránka
+printpreview-previousarrow-button =
+    .title = Předchozí stránka
+printpreview-nextarrow-button =
+    .title = Další stránka
+printpreview-endarrow-button =
+    .title = Poslední stránka
diff -Nru firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/cs/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/cs/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:27:30.000000000 +0000
+++ firefox-85.0+build1/l10n/cs/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:23.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Zadejte vlastní rozsah stránek
+    .placeholder = napÅ™. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Po�et kopií
 printui-orientation = Orientace
@@ -39,14 +42,17 @@
 printui-paper-size-label = Velikost papíru
 # Section title (noun) for the print scaling options
 printui-scale = Měřítko
-printui-scale-fit-to-page = Přizpůsobit na stránku
 printui-scale-fit-to-page-width = Přizpůsobit šířce stránky
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = Měřítko
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Oboustranný tisk
+printui-duplex-checkbox = Vytisknout na obÄ› strany
 # Section title for miscellaneous print options
 printui-options = Možnosti
 printui-headers-footers-checkbox = Vytisknout záhlaví a zápatí
 printui-backgrounds-checkbox = Vytisknout pozadí
+printui-selection-checkbox = Vytisknout pouze výběr
 printui-color-mode-label = Barevný režim
 printui-color-mode-color = BarevnÄ›
 printui-color-mode-bw = Černobíle
@@ -54,15 +60,30 @@
 printui-margins-default = Výchozí
 printui-margins-min = Minimální
 printui-margins-none = Žádné
+printui-margins-custom = Vlastní
+printui-margins-custom-inches = Vlastní (palce)
+printui-margins-custom-top = Nahoře
+printui-margins-custom-top-inches = Nahoře (palce)
+printui-margins-custom-bottom = Dole
+printui-margins-custom-bottom-inches = Dole (palce)
+printui-margins-custom-left = Vlevo
+printui-margins-custom-left-inches = Vlevo (palce)
+printui-margins-custom-right = Vpravo
+printui-margins-custom-right-inches = Vpravo (palce)
 printui-system-dialog-link = Vytisknout pomocí systémového dialogu…
 printui-primary-button = Tisk
 printui-primary-button-save = Uložit
 printui-cancel-button = Zrušit
+printui-close-button = Zavřít
 printui-loading = Příprava náhledu
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Náhled tisku
+printui-pages-per-sheet = Stránek na list papíru
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Probíhá tisk…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
@@ -83,6 +104,7 @@
 ## Error messages shown when a user has an invalid input
 
 printui-error-invalid-scale = Měřítko musí být �íslo mezi 10 a 200.
+printui-error-invalid-margin = Zadejte platný okraj pro vybranou velikost papíru.
 # Variables
 # $numPages (integer) - Number of pages
 printui-error-invalid-range = Rozsah stránek musí být �íslo mezi 1 a { $numPages }.
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/cy/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/aboutLogins.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/aboutLogins.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -32,7 +32,7 @@
 about-logins-menu-menuitem-remove-all-logins = Tynnu Pob Mewngofnod…
 menu-menuitem-preferences =
     { PLATFORM() ->
-        [windows] Dewisiadau
+        [windows] Opsiynau
        *[other] Dewisiadau
     }
 about-logins-menu-menuitem-help = Cymorth
@@ -54,7 +54,7 @@
     }
 login-list-sort-label-text = Trefnu yn ôl
 login-list-name-option = Enw (A-Z)
-login-list-name-reverse-option = Enw (A-Z)
+login-list-name-reverse-option = Enw (Z-A)
 about-logins-login-list-alerts-option = Rhybuddion
 login-list-last-changed-option = Newidiwyd Diwethaf
 login-list-last-used-option = Defnyddiwyd Diwethaf
@@ -151,7 +151,7 @@
 
 enable-password-sync-notification-message =
     { PLATFORM() ->
-        [windows] Eisiau eich mewngofnodion ym mhobman rydych chi'n defnyddio { -brand-product-name }? Ewch i Ddewisiadau { -sync-brand-short-name } a dewiswch y blwch gwirio Mewngofnodi.
+        [windows] Eisiau eich mewngofnodion ym mhobman rydych chi'n defnyddio { -brand-product-name }? Ewch i Opsiynau { -sync-brand-short-name } a dewiswch y blwch gwirio Mewngofnodi.
        *[other] Eisiau eich mewngofnodion ym mhobman rydych chi'n defnyddio { -brand-product-name }? Ewch i Ddewisiadau { -sync-brand-short-name } a dewiswch y blwch gwirio Mewngofnodi.
     }
 enable-password-sync-preferences-button =
@@ -173,7 +173,16 @@
 about-logins-confirm-remove-dialog-title = Tynnu'r mewngofnod?
 confirm-delete-dialog-message = Nid oes modd dadwneud y weithred hon.
 about-logins-confirm-remove-dialog-confirm-button = Tynnu
-about-logins-confirm-remove-all-dialog-confirm-button = Tynnu Popeth
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Tynnu
+        [zero] Tynnu
+        [one] Tynnu
+        [two] Tynnu
+        [few] Tynnu
+        [many] Tynnu
+       *[other] Tynnu'r Cyfan
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ie, tynnu'r mewngofnod
@@ -225,6 +234,8 @@
 about-logins-confirm-export-dialog-title = Allforio mewngofnodion a chyfrineiriau
 about-logins-confirm-export-dialog-message = Bydd eich cyfrineiriau'n cael eu cadw fel testun darllenadwy (e.e. BadP@ssw0rd) fel y gall unrhyw un sy'n gallu agor y ffeil a allforiwyd eu gweld.
 about-logins-confirm-export-dialog-confirm-button = Allforio…
+about-logins-alert-import-title = Wedi Cwblhau Mewnforio
+about-logins-alert-import-message = Gweld crynodeb mewnforio manwl
 confirm-discard-changes-dialog-title = Hepgor newidiadau heb eu cadw?
 confirm-discard-changes-dialog-message = Bydd yr holl newidiadau sydd heb eu cadw'n cael eu colli.
 confirm-discard-changes-dialog-confirm-button = Dileu
@@ -286,3 +297,46 @@
         [macos] Dogfen CSV
        *[other] Ffeil CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Wedi Cwblhau Mewnforio
+about-logins-import-dialog-items-added =
+    { $count ->
+        [zero] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+        [one] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+        [many] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Ychwanegwyd mewngofnodion newydd:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [zero] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+        [one] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+        [many] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Diweddarwyd mewngofnodi presennol:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [zero] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [one] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [two] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [few] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [many] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+       *[other] <span>Mewngofnodion dyblyg wedi'u darganfod: </span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [zero] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [one] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [two] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [few] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+        [many] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+       *[other] <span>Gwallau:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(heb ei fewnforio)</span>
+    }
+about-logins-import-dialog-done = Gorffen
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/aboutPrivateBrowsing.ftl firefox-85.0+build1/l10n/cy/browser/browser/aboutPrivateBrowsing.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/aboutPrivateBrowsing.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/aboutPrivateBrowsing.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -20,7 +20,7 @@
 about-private-browsing-search-banner-title = { $engineName } yw eich peiriant chwilio rhagosodedig mewn Ffenestri Preifat
 about-private-browsing-search-banner-description =
     { PLATFORM() ->
-        [windows] I ddewis peiriant chwilio gwahanol ewch i <a data-l10n-name="link-options">Dewisiadau</a>
+        [windows] I ddewis peiriant chwilio gwahanol ewch i <a data-l10n-name="link-options">Opsiynau</a>
        *[other] I ddewis peiriant chwilio gwahanol ewch i <a data-l10n-name="link-options">Dewisiadau</a>
     }
 about-private-browsing-search-banner-close-button =
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/cy/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/appmenu.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/appmenu.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Ffenestr Newydd
+appmenuitem-new-private-window =
+    .label = Ffenestr Breifat Newydd
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Chwyddo mewn
 appmenuitem-zoom-reduce =
     .label = Chwyddo allan
+appmenuitem-fullscreen =
+    .label = Sgrin Lawn
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Cydweddu Nawr
+appmenuitem-save-page =
+    .label = Cadw Tudalen Fel…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Beth sy'n Newydd
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/cy/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/appMenuNotifications.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Nid Nawr
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Ar ôl ailgychwyn cyflym, bydd { -brand-shorter-name } yn adfer eich tabiau a ffenestri agored sydd ddim yn y modd Pori Preifat.
+appmenu-update-other-instance =
+    .label = Nid yw { -brand-shorter-name } yn gallu diweddaru i'r fersiwn diweddaraf.
+    .buttonlabel = Diweddaru { -brand-shorter-name } beth bynnag
+    .buttonaccesskey = D
+    .secondarybuttonlabel = Nid Nawr
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Mae diweddariad newydd { -brand-shorter-name } ar gael, ond nid oes modd ei osod oherwydd bod copi arall o { -brand-shorter-name } yn rhedeg. Caewch ef i barhau â'r diweddariad, neu dewiswch ei ddiweddaru beth bynnag (efallai na fydd y copi arall yn gweithio'n iawn nes i chi ei ailgychwyn).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Iawn, rwy'n deall
     .buttonaccesskey = I
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/browser.ftl firefox-85.0+build1/l10n/cy/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/browser.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/browser.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -226,7 +226,7 @@
     .label = Cuddio Barrau Offer
     .accesskey = u
 full-screen-exit =
-    .label = Gadael Modd Sgrin Lawn
+    .label = Gadael y Modd Sgrin Lawn
     .accesskey = L
 
 ## Search Engine selection buttons (one-offs)
@@ -511,3 +511,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> reolaeth o'ch pwyntydd. Pwyswch Esc i adennill rheolaeth.
 pointerlock-warning-no-domain = Mae gan y ddogfen hon reolaeth o'ch pwyntydd. Pwyswch Esc i adennill rheolaeth.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Dangos Pob Nod Tudalen
+bookmarks-recent-bookmarks =
+    .value = Wedi gosod Nod Tudalen yn Ddiweddar
+bookmarks-toolbar-chevron =
+    .tooltiptext = Dangos pob ffolder nod tudalen
+bookmarks-sidebar-content =
+    .aria-label = Nodau Tudalen
+bookmarks-menu-button =
+    .label = Dewislen Nodau Tudalen
+bookmarks-other-bookmarks-menu =
+    .label = Nodau Tudalen Eraill
+bookmarks-mobile-bookmarks-menu =
+    .label = Nodau Tudalen Symudol
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Cuddio'r Bar Ochr Nodau Tudalen
+           *[other] Gweld Bar Offer Nodau Tudalen
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Cuddio'r Bar Offer Nodau Tudalen
+           *[other] Gweld Bar Offer Nodau Tudalen
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Tynnu Dewislen Nodau Tudalen o'r Bar Offer
+           *[other] Ychwanegu Dewislen Nodau Tudalen i'r Bar Offer
+        }
+bookmarks-search =
+    .label = Chwilio'r Nodau Tudalen
+bookmarks-tools =
+    .label = Offer Nodau Tudalen
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bar Offer Nodau Tudalen
+    .accesskey = N
+    .aria-label = Nodau Tudalen
+bookmarks-toolbar-menu =
+    .label = Bar Offer Nodau Tudalen
+bookmarks-toolbar-placeholder =
+    .title = Eitemau Bar Offer Nodau Tudalen
+bookmarks-toolbar-placeholder-button =
+    .label = Eitemau Bar Offer Nodau Tudalen
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Nodau Tudalen
+library-bookmarks-bookmark-this-page =
+    .label = Gosod Nod Tudalen i'r Dudalen
+library-bookmarks-bookmark-edit =
+    .label = Golygu'r Nod Tudalen
+library-recent-activity-label = Gweithgareddau Diweddar
+
+## More items
+
+more-menu-go-offline =
+    .label = Gweithio All-lein
+    .accesskey = w
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/menubar.ftl firefox-85.0+build1/l10n/cy/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/menubar.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/menubar.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -3,6 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+# NOTE: For English locales, strings in this file should be in APA-style Title Case.
+# See https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case
+#
+# NOTE: For Engineers, please don't re-use these strings outside of the menubar.
+
+
 ## File Menu
 
 menu-file =
@@ -216,12 +222,12 @@
 menu-preferences =
     .label =
         { PLATFORM() ->
-            [windows] Dewisiadau
+            [windows] Opsiynau
            *[other] Dewisiadau
         }
     .accesskey =
         { PLATFORM() ->
-            [windows] e
+            [windows] O
            *[other] w
         }
 menu-tools-layout-debugger =
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/migration.ftl firefox-85.0+build1/l10n/cy/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/migration.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/migration.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -6,7 +6,7 @@
     .title = Dewin Mewnforio
 import-from =
     { PLATFORM() ->
-        [windows] Mewnforio Dewisiadau, Nodau Tudalen, Hanes, Cyfrineiriau, a data arall o:
+        [windows] Mewnforio Opsiynau, Nodau Tudalen, Hanes, Cyfrineiriau, a data arall o:
        *[other] Mewnforio Dewisiadau, Nodau Tudalen, Hanes, Cyfrineiriau a data arall o:
     }
 import-from-bookmarks = Mewnforio Nodau Tudalen o:
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/cy/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/newtab/asrouter.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -138,6 +138,9 @@
 
 cfr-whatsnew-searchbar-title = Teipio llai, darganfod mwy gyda'r bar cyfeiriad
 cfr-whatsnew-searchbar-body-topsites = Nawr, dewiswch y bar cyfeiriadau, a bydd blwch yn ehangu gyda dolenni i'ch prif wefannau.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Eicon chwyddwydr
 
 ## Picture-in-Picture
@@ -301,3 +304,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Llwybrau byr chwilio yn y bar cyfeiriadau
 cfr-whatsnew-search-shortcuts-body = Nawr, pan fyddwch yn teipio manylion gwefan neu beiriant chwilio penodol yn y bar cyfeiriad, bydd llwybr byr glas yn ymddangos yn yr awgrymiadau chwilio isod. Dewiswch y llwybr byr hwnnw i gwblhau eich chwilio'n uniongyrchol o'r bar cyfeiriad.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Diogelwch rhag archcwcis maleisus
+cfr-whatsnew-supercookies-body = Gall gwefannau atodi “archcwci� yn gyfrinachol i'ch porwr a all eich dilyn o amgylch y we, hyd yn oed ar ôl i chi glirio'ch cwcis. Mae { -brand-short-name } bellach yn darparu amddiffyniad cryf yn erbyn archcwcis fel nad oes modd eu defnyddio i dracio'ch gweithgareddau ar-lein o un gwefan i'r llall.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Nodi tudalen gwell
+cfr-whatsnew-bookmarking-body = Mae'n haws cadw golwg ar eich hoff wefannau. Mae { -brand-short-name } bellach yn cofio'ch hoff leoliad ar gyfer nodau tudalen wedi'u cadw, yn dangos y bar offer nodau tudalen yn ragosodedig ar dabiau newydd, ac yn rhoi mynediad hawdd i weddill eich nodau tudalen trwy ffolder bar offer.
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/cy/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/newtab/newtab.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Tab Newydd
 newtab-settings-button =
     .title = Cyfaddasu eich tudalen Tab Newydd
+newtab-personalize-button-label = Personoli
+    .title = Personoli tab newydd
+    .aria-label = Personoli tab newydd
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Chwilio'r We
     .title = Chwilio'r We
     .aria-label = Chwilio'r We
+newtab-search-box-text = Chwilio'r we
+newtab-search-box-input =
+    .placeholder = Chwilio'r we
+    .aria-label = Chwilio'r we
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Ychwanegu Peiriant Chwilio
 newtab-topsites-add-topsites-header = Hoff Wefan Newydd
+newtab-topsites-add-shortcut-header = Llwybr Byr Newydd
 newtab-topsites-edit-topsites-header = Golygu'r Hoff Wefan
+newtab-topsites-edit-shortcut-header = Golygu Llwybr Byr
 newtab-topsites-title-label = Teitl
 newtab-topsites-title-input =
     .placeholder = Rhoi teitl
@@ -208,3 +217,31 @@
 
 newtab-error-fallback-info = Wps, aeth rhywbeth o'i le wrth llwytho'r cynnwys hwn.
 newtab-error-fallback-refresh-link = Adnewyddu'r dudalen i geisio eto.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Llwybrau Byr
+newtab-custom-shortcuts-subtitle = Gwefannau rydych yn eu cadw neu'n ymweld â nhw
+newtab-custom-row-selector =
+    { $num ->
+        [zero] { $num } rhesi
+        [one] { $num } rhes
+        [two] { $num } res
+        [few] { $num } rhes
+        [many] { $num } rhes
+       *[other] { $num } rhes
+    }
+newtab-custom-sponsored-sites = Llwybrau byr wedi'u noddi
+newtab-custom-pocket-title = Argymhellir gan  { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Cynnwys eithriadol wedi'i guradu gan { -pocket-brand-name }, rhan o deulu { -brand-product-name }
+newtab-custom-pocket-sponsored = Straeon wedi'u noddi
+newtab-custom-recent-title = Gweithgaredd diweddar
+newtab-custom-recent-subtitle = Detholiad o wefannau a chynnwys diweddar
+newtab-custom-close-button = Cau
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Pytiau
+newtab-custom-snippets-subtitle = Awgrymiadau a newyddion gan { -vendor-short-name } a { -brand-product-name }
+newtab-custom-settings = Rheoli rhagor o osodiadau
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/places.ftl firefox-85.0+build1/l10n/cy/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/places.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/places.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Is-ffolder
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Nodau Tudalen Eraill
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/cy/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/preferences/connection.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/preferences/connection.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -9,15 +9,11 @@
             [macos] width: 44em
            *[other] width: 49em
         }
-
 connection-close-key =
     .key = w
-
 connection-disable-extension =
     .label = Analluogi Estyniad
-
 connection-proxy-configure = Ffurfweddu Mynediad Dirprwy i'r Rhyngrwyd
-
 connection-proxy-option-no =
     .label = Dim dirprwy
     .accesskey = D
@@ -30,31 +26,25 @@
 connection-proxy-option-manual =
     .label = Ffurfweddiad dirprwyo â llaw
     .accesskey = l
-
 connection-proxy-http = Dirprwy yr HTTP
     .accesskey = H
 connection-proxy-http-port = Porth
     .accesskey = P
-
 connection-proxy-http-sharing =
     .label = Defnyddiwch y dirprwy yma hefyd ar gyfer FTP a HTTPS
     .accesskey = d
-
 connection-proxy-https = Dirprwy HTTPS:
     .accesskey = D
 connection-proxy-ssl-port = Porth
     .accesskey = o
-
 connection-proxy-ftp = Dirprwy FTP
     .accesskey = F
 connection-proxy-ftp-port = Porth
     .accesskey = r
-
 connection-proxy-socks = Gwesteiwr SOCKS v5
     .accesskey = G
 connection-proxy-socks-port = Porth
     .accesskey = t
-
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
@@ -63,45 +53,34 @@
     .accesskey = v
 connection-proxy-noproxy = Dim Dirprwy ar gyfer
     .accesskey = m
-
 connection-proxy-noproxy-desc = Esiampl: .mozilla.org, .net.nz, 192.168.1.0/24
-
 # Do not translate localhost, 127.0.0.1 and ::1.
 connection-proxy-noproxy-localhost-desc = Nid yw cysylltiadau i localhost, 127.0.0.1, a ::1 byth yn cael eu cirprwyo.
-
 connection-proxy-autotype =
     .label = URL ffurfweddu dirprwy yn awtomatig
     .accesskey = U
-
 connection-proxy-reload =
     .label = Ail-lwytho
     .accesskey = i
-
 connection-proxy-autologin =
     .label = Peidio gofyn am ddilysiad os yw'r cyfrinair wedi ei gadw
     .accesskey = d
     .tooltip = Mae'r dewis hwn yn eich dilysu'n dawel i ddirprwyon rydych wedi eu cadw eu manylion ar eu cyfer. Byddwn yn gofyn os bydd y dilysiad yn methu.
-
 connection-proxy-socks-remote-dns =
     .label = DNS dirprwyol wrth ddefnyddio SOCKS v5
     .accesskey = d
-
 connection-dns-over-https =
     .label = Galluogi DNS dros HTTPS
     .accesskey = D
-
 connection-dns-over-https-url-resolver = Defnyddio'r Darparwr
     .accesskey = D
-
 # Variables:
 #   $name (String) - Display name or URL for the DNS over HTTPS provider
 connection-dns-over-https-url-item-default =
     .label = { $name } Rhagosodedig
     .tooltiptext = Defnyddiwch yr URL rhagosodedig i ddatrys DNS dros HTTPS
-
 connection-dns-over-https-url-custom =
     .label = Cyfaddasu
     .accesskey = C
     .tooltiptext = Rhowch eich hoff URL ar gyfer datrys DNS dros HTTPS
-
-connection-dns-over-https-custom-label = Cyfaddas
+connection-dns-over-https-custom-label = Cyfaddasu
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/cy/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/preferences/preferences.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -10,7 +10,7 @@
     .label = Bob tro
 pref-page-title =
     { PLATFORM() ->
-        [windows] Dewisiadau
+        [windows] Opsiynau
        *[other] Dewisiadau
     }
 # This is used to determine the width of the search field in about:preferences,
@@ -25,7 +25,7 @@
     .style = width: 15.4em
     .placeholder =
         { PLATFORM() ->
-            [windows] Canfod yn Dewisiadau
+            [windows] Canfod yn Opsiynau
            *[other] Canfod yn Dewisiadau
         }
 managed-notice = Mae eich porwr yn cael ei reoli gan eich sefydliad.
@@ -118,7 +118,7 @@
 # `<span data-l10n-name="query"></span>` will be replaced by the search term.
 search-results-empty-message =
     { PLATFORM() ->
-        [windows] Ymddiheuriadau! Nid oes canlyniadau yn y Dewisiadau ar gyfer “<span data-l10n-name="query"></span>�.
+        [windows] Ymddiheuriadau! Nid oes canlyniadau yn yr Opsiynau ar gyfer “<span data-l10n-name="query"></span>�.
        *[other] Ymddiheuriadau! Nid os canlyniadau yn y Dewisiada.u ar gyfer “<span data-l10n-name="query"></span>�.
     }
 search-results-help-link = Angen help? Ewch i <a data-l10n-name="url">Cefnogaeth { -brand-short-name }</a>
@@ -512,6 +512,11 @@
 home-prefs-topsites-description = Y gwefannau rydych yn ymweld â nhw amlaf
 home-prefs-topsites-by-option-sponsored =
     .label = Hoff Wefannau Wedi eu Noddi
+home-prefs-shortcuts-header =
+    .label = Llwybrau Byr
+home-prefs-shortcuts-description = Gwefannau rydych yn eu cadw neu'n ymweld â nhw
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Llwybrau byr wedi'u noddi
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -519,6 +524,7 @@
 home-prefs-recommended-by-header =
     .label = Argymhellwyd gan { $provider }
 home-prefs-recommended-by-description-update = Cynnwys eithriadol o bob rhan o'r we, wedi'i guradu gan { $provider }
+home-prefs-recommended-by-description-new = Cynnwys eithriadol wedi'u curadu gan { $provider }, rhan o deulu { -brand-product-name }
 
 ##
 
@@ -527,8 +533,6 @@
     .label = Straeon wedi eu Noddi
 home-prefs-highlights-header =
     .label = Goreuon
-home-prefs-recent-activity-header =
-    .label = Gweithgaredd diweddar
 home-prefs-highlights-description = Detholiad o wefannau rydych wedi eu cadw neu ymweld â nhw
 home-prefs-highlights-option-visited-pages =
     .label = Tudalennau Ymwelwyd â Nhw
@@ -538,13 +542,17 @@
     .label = Llwytho i Lawr Mwyaf Diweddar
 home-prefs-highlights-option-saved-to-pocket =
     .label = Tudalennau wedi eu Cadw i { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Gweithgaredd diweddar
+home-prefs-recent-activity-description = Detholiad o wefannau a chynnwys diweddar
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
 # and non-essential but also not entirely trivial and useless.
 home-prefs-snippets-header =
-    .label = Tameidiau
+    .label = Pytiau
 home-prefs-snippets-description = Diweddariadau gan { -vendor-short-name } a { -brand-product-name }
+home-prefs-snippets-description-new = Awgrymiadau a newyddion gan { -vendor-short-name } a { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -618,7 +626,7 @@
 containers-back-button =
     .aria-label =
         { PLATFORM() ->
-            [windows] Nôl i Dewisiadau
+            [windows] Nôl i Opsiynau
            *[other] Nol i Dewisiadau
         }
 containers-header = Tabiau Cynwysyddion
@@ -697,7 +705,7 @@
 sync-currently-syncing-addons = Ychwanegion
 sync-currently-syncing-prefs =
     { PLATFORM() ->
-        [windows] Dewisiadau
+        [windows] Opsiynau
        *[other] Dewisiadau
     }
 sync-change-options =
@@ -742,11 +750,11 @@
 sync-engine-prefs =
     .label =
         { PLATFORM() ->
-            [windows] Dewisiadau
+            [windows] Opsiynau
            *[other] Dewisiadau
         }
     .tooltiptext = Gosodiadau Cyffredinol, Preifatrwydd a Diogelwch rydych wedi eu newid
-    .accesskey = D
+    .accesskey = O
 
 ## The device name controls.
 
@@ -940,9 +948,16 @@
 addressbar-locbar-openpage-option =
     .label = Tabiau agored
     .accesskey = T
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Llwybrau Byr
+    .accesskey = L
 addressbar-locbar-topsites-option =
     .label = Hoff wefannau
     .accesskey = H
+addressbar-locbar-engines-option =
+    .label = Peiriannau chwilio
+    .accesskey = P
 addressbar-suggestions-settings = Newid dewisiadau am awgrymiadau peiriannau chwilio
 
 ## Privacy Section - Content Blocking
@@ -963,7 +978,7 @@
     .label = Llym
     .accesskey = L
 enhanced-tracking-protection-setting-custom =
-    .label = Cyfaddas
+    .label = Cyfaddasu
     .accesskey = C
 
 ##
@@ -1137,17 +1152,17 @@
 space-alert-over-5gb-pref-button =
     .label =
         { PLATFORM() ->
-            [windows] Dewisiadau Agor
-           *[other] Dewisiadau Agored
+            [windows] Agor Opsiynau
+           *[other] Agor Dewisiadau
         }
     .accesskey =
         { PLATFORM() ->
-            [windows] g
-           *[other] A
+            [windows] O
+           *[other] D
         }
 space-alert-over-5gb-message =
     { PLATFORM() ->
-        [windows] Mae { -brand-short-name } yn brin o le ar ddisg. Efallai na fydd cynnwys gwefan yn cael ei ddangos yn iawn. Mae modd i chi glirio data wedi ei storio yn Dewisiadau > Preifatrwydd a Diogelwch > Cwcis a Data Gwefan.
+        [windows] Mae { -brand-short-name } yn brin o le ar ddisg. Efallai na fydd cynnwys gwefan yn cael ei ddangos yn iawn. Mae modd i chi glirio data wedi ei storio yn Opsiynau> Preifatrwydd a Diogelwch > Cwcis a Data Gwefan.
        *[other] Mae { -brand-short-name } yn brin o le ar ddisg. Efallai na fydd cynnwys gwefan yn cael ei ddangos yn iawn. Mae modd i chi glirio data wedi ei storio yn Dewisiadau > Preifatrwydd a Diogelwch > Cwcis a Data Gwefan.
     }
 space-alert-under-5gb-ok-button =
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/protections.ftl firefox-85.0+build1/l10n/cy/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/protections.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/protections.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -6,14 +6,13 @@
 #   $count (Number) - Number of tracking events blocked.
 graph-week-summary =
     { $count ->
-        [zero] Mae { -brand-short-name } wedi rhwystro { $count } tracwyr dros yr wythnos ddiwethaf
-        [one] Mae { -brand-short-name } wedi rhwystro { $count } traciwr dros yr wythnos ddiwethaf
-        [two] Mae { -brand-short-name } wedi rhwystro { $count } draciwr dros yr wythnos ddiwethaf
-        [few] Mae { -brand-short-name } wedi rhwystro { $count } traciwr dros yr wythnos ddiwethaf
-        [many] Mae { -brand-short-name } wedi rhwystro { $count } traciwr dros yr wythnos ddiwethaf
-       *[other] Mae { -brand-short-name } wedi rhwystro { $count } traciwr dros yr wythnos ddiwethaf
+        [zero] Mae { -brand-short-name } wedi rhwystro { $count } tracwyr yn ystod yr wythnos ddiwethaf
+        [one] Mae { -brand-short-name } wedi rhwystro { $count } traciwr yn ystod yr wythnos ddiwethaf
+        [two] Mae { -brand-short-name } wedi rhwystro { $count } draciwr yn ystod yr wythnos ddiwethaf
+        [few] Mae { -brand-short-name } wedi rhwystro { $count } traciwr yn ystod yr wythnos ddiwethaf
+        [many] Mae { -brand-short-name } wedi rhwystro { $count } traciwr yn ystod yr wythnos ddiwethaf
+       *[other] Mae { -brand-short-name } wedi rhwystro { $count } traciwr yn ystod yr wythnos ddiwethaf
     }
-
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
@@ -27,57 +26,43 @@
         [many] <b>{ $count }</b> thraciwr wedi eu rwystro ers{ DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
        *[other] <b>{ $count }</b> traciwr wedi eu rwystro ers{ DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
-
 # Text displayed instead of the graph when in Private Mode
 graph-private-window = Mae { -brand-short-name } yn parhau i rwystro tracwyr mewn Ffenestri Preifat, ond nid yw'n cadw cofnod o'r hyn gafodd ei rwystro.
 # Weekly summary of the graph when the graph is empty in Private Mode
 graph-week-summary-private-window = Tracwyr rhwystrodd { -brand-short-name } yr wythnos hon
-
 protection-report-webpage-title = Bwrdd Gwaith Diogelwch
 protection-report-page-content-title = Bwrdd Gwaith Diogelwch
 # This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
 protection-report-page-summary = Gall { -brand-short-name } ddiogelu eich preifatrwydd y tu ôl i'r llenni wrth i chi bori. Mae hwn yn grynodeb wedi'i bersonoli o'r diogelwch hynny, gan gynnwys offer i reoli eich diogelwch ar-lein.
 # This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
 protection-report-page-summary-default = Mae { -brand-short-name } yn diogelu eich preifatrwydd y tu ôl i'r llenni wrth i chi bori. Mae hwn yn grynodeb wedi'i bersonoli o'r diogelwch hynny, gan gynnwys offer i reoli'ch diogelwch ar-lein.
-
 protection-report-settings-link = Rheoli eich gosodiadau preifatrwydd a diogelwch
-
 etp-card-title-always = Diogelwch Uwch Rhag Tracio: Ymlaen Drwy'r Amser
 etp-card-title-custom-not-blocking = Diogelwch Uwch Rhag Tracio: I FFWRDD
 etp-card-content-description = Mae { -brand-short-name } yn atal cwmnïau rhag eich dilyn yn gyfrinachol o amgylch y we, yn awtomatig.
 protection-report-etp-card-content-custom-not-blocking = Mae'r holl ddiogelu wedi'u diffodd ar hyn o bryd. Dewiswch pa dracwyr i'w rhwystro trwy reoli eich gosodiadau diogelu { -brand-short-name }.
 protection-report-manage-protections = Rheoli Gosodiadau
-
 # 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 = Heddiw
-
 # This string is used to describe the graph for screenreader users.
 graph-legend-description = Graff sy'n cynnwys cyfanswm nifer pob math o draciwr gafodd ei rwystro yr wythnos hon.
-
 social-tab-title = Tracwyr Cyfryngau Cymdeithasol
 social-tab-contant = Mae rhwydweithiau cymdeithasol yn gosod tracwyr ar wefannau eraill i ddilyn yr hyn rydych chi'n ei wneud, ei weld, a'i wylio ar-lein. Mae hyn yn caniatáu i gwmnïau cyfryngau cymdeithasol ddysgu rhagor amdanoch chi y tu hwnt i'r hyn rydych chi'n ei rannu ar eich proffiliau cyfryngau cymdeithasol. <a data-l10n-name="learn-more-link">Dysgu rhagor</a>
-
 cookie-tab-title = Cwcis Tracio Traws-Gwefan
 cookie-tab-content = Mae'r cwcis hyn yn eich dilyn o wefan i wefan i gasglu data am yr hyn rydych chi'n ei wneud ar-lein. Mae nhw'n cael eu gosod gan drydydd partïon fel hysbysebwyr a chwmnïau dadansoddeg. Mae rhwystro cwcis tracio traws-safle yn lleihau'r nifer o hysbysebion sy'n eich dilyn. <a data-l10n-name="learn-more-link">Dysgu rhagor</a>
-
 tracker-tab-title = Tracio Cynnwys
 tracker-tab-description = Gall gwefannau lwytho hysbysebion allanol, fideos a chynnwys eraill sy'n cynnwys cod tracio. Gall rhwystro cynnwys tracio helpu gwefannau i lwytho'n gynt, ond efallai na fydd rhai botymau, ffurflenni a meysydd mewngofnodi'n gweithio. <a data-l10n-name="learn-more-link">Dysgu rhagor</a>
-
 fingerprinter-tab-title = Bysbrintwyr
 fingerprinter-tab-content = Mae bysbrintwyr yn casglu gosodiadau o'ch porwr a'ch cyfrifiadur i greu proffil ohonoch. Gan ddefnyddio'r olion bys digidol hwn, mae nhw'n gallu'ch tracio ar draws gwahanol wefannau. <a data-l10n-name="learn-more-link">Dysgu rhagor</a>
-
 cryptominer-tab-title = Cryptogloddwyr
 cryptominer-tab-content = Mae cryptogloddwyr yn defnyddio pŵer cyfrifiadurol eich system i gloddio arian digidol. Mae sgriptiau cryptogloddio yn gwagio eich batri, arafu eich cyfrifiadur, a gall gynyddu eich bil trydan. <a data-l10n-name="learn-more-link">Dysgu rhagor</a>
-
 protections-close-button2 =
     .aria-label = Cau
     .title = Cau
-  
 mobile-app-title = Rhwystrwch dracwyr hysbysebion ar draws rhagor o ddyfeisiau
 mobile-app-card-content = Defnyddiwch y porwr symudol gydag diogelwch mewnol rhag tracio gan hysbysebion.
 mobile-app-links = Porwr { -brand-product-name } ar gyfer <a data-l10n-name="android-mobile-inline-link">Android</a> a <a data-l10n-name="ios-mobile-inline-link">iOS</a>
-
 lockwise-title = Peidiwch byth ag anghofio cyfrinair eto
 lockwise-title-logged-in2 = Rheoli Cyfrineiriau
 lockwise-header-content = Mae { -lockwise-brand-name } yn cadw'ch cyfrineiriau yn ddiogel yn eich porwr.
@@ -89,7 +74,6 @@
 lockwise-mobile-app-title = Ewch â'ch cyfrineiriau i bob man
 lockwise-no-logins-card-content = Defnyddiwch gyfrineiriau wedi'u cadw yn { -brand-short-name } ar unrhyw ddyfais.
 lockwise-app-links = { -lockwise-brand-name } ar gyfer <a data-l10n-name="lockwise-android-inline-link">Android</a> a <a data-l10n-name = "lockwise-ios-inline-link" >iOS</a>
-
 # Variables:
 # $count (Number) - Number of passwords exposed in data breaches.
 lockwise-scanned-text-breached-logins =
@@ -101,7 +85,6 @@
         [many] Efallai bod { $count } chyfrinair wedi cael eu hamlygu mewn tor-data.
        *[other] Efallai bod { $count } cyfrinair wedi cael eu hamlygu mewn tor-data.
     }
-
 # While English doesn't use the number in the plural form, you can add $count to your language
 # if needed for grammatical reasons.
 # Variables:
@@ -116,25 +99,21 @@
        *[other] Mae'ch cyfrineiriau'n cael eu cadw'n ddiogel.
     }
 lockwise-how-it-works-link = Sut mae'n gweithio
-
 turn-on-sync = Cychwyn { -sync-brand-short-name }…
     .title = Mynd i ddewisiadau cydweddu
-
-monitor-title = Cadw llygad allan am dor-data.
+monitor-title = Bod yn effro i dor-data.
 monitor-link = Sut mae'n gweithio
 monitor-header-content-no-account = Edrychwch ar { -monitor-brand-name } i weld a ydych chi wedi bod yn rhan o dor-data a chael rhybuddion am dor-data newydd.
 monitor-header-content-signed-in = Mae { -monitor-brand-name } yn eich rhybuddio os yw'ch manylion wedi ymddangos mewn tor-data hysbys
-monitor-sign-up-link = Cofrestrwch ar gyfer Rhybuddion Tor-data
+monitor-sign-up-link = Cofrestrwch am Rybuddion Tor-data
     .title = Cofrestrwch am rybuddion tor-data ar { -monitor-brand-name }
 auto-scan = Wedi'u sganio'n awtomatig heddiw
-
 monitor-emails-tooltip =
     .title = Gweld cyfeiriadau e-bost wedi'u monitro ar { -monitor-brand-short-name }
 monitor-breaches-tooltip =
     .title = Gweld tor-data hysbys ar { -monitor-brand-short-name }
 monitor-passwords-tooltip =
     .title = Gweld cyfrineiriau wedi'u datgelu ar { -monitor-brand-short-name }
-
 # 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.
@@ -147,7 +126,6 @@
         [many] Chyfeiriad e-bost yn cael eu monitro
        *[other] Cyfeiriad e-bost yn cael eu monitro
     }
-
 # 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.
@@ -160,7 +138,6 @@
         [many] Thor-data hysbys wedi amlygu eich manylion
        *[other] Tor-data hysbys wedi amlygu eich manylion
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -173,7 +150,6 @@
         [many] Thor-data hysbys wedi'u nodi fel wedi'u datrys
        *[other] Tor-data hysbys wedi'u nodi fel wedi'u datrys
     }
-
 # 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.
@@ -186,7 +162,6 @@
         [many] Chyfrinair wedi'u hamlygu ym mhob tor-data
        *[other] Cyfrinair wedi'u hamlygu ym mhob tor-data
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -199,7 +174,6 @@
         [many] Chyfrinair wedi'u hamlygu mewn tor-data heb eu datrys
        *[other] Cyfrinair wedi'u hamlygu mewn tor-data heb eu datrys
     }
-
 monitor-no-breaches-title = Newyddion da!
 monitor-no-breaches-description = Nid oes gennych unrhyw dor-data hysbys. Os bydd hynny'n newid, byddwn yn rhoi gwybod i chi.
 monitor-view-report-link = Gweld yr Adroddiad
@@ -210,7 +184,6 @@
     .title = Rheoli tor-data ar { -monitor-brand-short-name }
 monitor-breaches-resolved-title = Da! Rydych wedi datrys pob achos o dor-data hysbys.
 monitor-breaches-resolved-description = Os bydd eich e-bost yn ymddangos mewn unrhyw dor-data newydd, byddwn yn rhoi gwybod i chi.
-
 # Variables:
 # $numBreachesResolved (Number) - Number of breaches marked as resolved by the user on Monitor.
 # $numBreaches (Number) - Number of breaches in which a user's data was involved, detected by Monitor.
@@ -223,11 +196,9 @@
         [many] { $numBreachesResolved } allan o { $numBreaches } tor-data wedi'u marcio fel wedi'u datrys
        *[other] { $numBreachesResolved } allan o { $numBreaches } tor-data wedi'u marcio fel wedi'u datrys
     }
-
 # Variables:
 # $percentageResolved (Number) - Percentage of breaches marked as resolved by a user on Monitor.
 monitor-partial-breaches-percentage = { $percentageResolved }% wedi'u cwblhau
-
 monitor-partial-breaches-motivation-title-start = Dechrau da!
 monitor-partial-breaches-motivation-title-middle = Daliwch ati!
 monitor-partial-breaches-motivation-title-end = Bron wedi ei wneud! Daliwch ati.
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/protectionsPanel.ftl firefox-85.0+build1/l10n/cy/browser/browser/protectionsPanel.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/protectionsPanel.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/protectionsPanel.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 protections-panel-sendreportview-error = Bu gwall wrth anfon yr adroddiad. Rhowch gynnig arall arni'n hwyrach.
-
 # A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked.
 protections-panel-sitefixedsendreport-label = Gwefan wedi'i thrwsio? Anfon adroddiad
 
@@ -12,8 +11,8 @@
 
 protections-popup-footer-protection-label-strict = Llym
     .label = Llym
-protections-popup-footer-protection-label-custom = Cyfaddas
-    .label = Cyfaddas
+protections-popup-footer-protection-label-custom = Cyfaddasu
+    .label = Cyfaddasu
 protections-popup-footer-protection-label-standard = Safonol
     .label = Safonol
 
@@ -22,13 +21,10 @@
 # The text a screen reader speaks when focused on the info button.
 protections-panel-etp-more-info =
     .aria-label = Rhagor o wybodaeth am Ddiogelwch Rhag Tracio Uwch
-
 protections-panel-etp-on-header = Mae Diogelwch Uwch Rhag Tracio YMLAEN ar y wefan hon
 protections-panel-etp-off-header = Mae Diogelwch Uwch Rhag Tracio I FFWRDD ar y wefan hon
-
 # The link to be clicked to open the sub-panel view
 protections-panel-site-not-working = Gwefan ddim yn gweithio?
-
 # The heading/title of the sub-panel view
 protections-panel-site-not-working-view =
     .title = Gwefan Ddim yn Gweithio?
@@ -43,9 +39,7 @@
 ##
 
 protections-panel-no-trackers-found = Dim tracwyr hysbys i { -brand-short-name } wedi eu canfod ar y dudalen hon.
-
 protections-panel-content-blocking-tracking-protection = Cynnwys Tracio
-
 protections-panel-content-blocking-socialblock = Tracwyr Cyfryngau Cymdeithasol
 protections-panel-content-blocking-cryptominers-label = Cryptogloddwyr
 protections-panel-content-blocking-fingerprinters-label = Bysbrintwyr
@@ -63,7 +57,6 @@
 ##
 
 protections-panel-settings-label = Gosodiadau Diogelu
-
 # This should match the "appmenuitem-protection-dashboard-title" string in browser/appmenu.ftl.
 protections-panel-protectionsdashboard-label = Bwrdd Gwaith Diogelwch
 
@@ -72,14 +65,12 @@
 
 # The header of the list
 protections-panel-site-not-working-view-header = Diffoddwch ddiogelu os rydych yn cael problemau gyda:
-
 # The list items, shown in a <ul>
 protections-panel-site-not-working-view-issue-list-login-fields = Meysydd mewngofnodi
 protections-panel-site-not-working-view-issue-list-forms = Ffurflenni
 protections-panel-site-not-working-view-issue-list-payments = Taliadau
 protections-panel-site-not-working-view-issue-list-comments = Sylwadau
 protections-panel-site-not-working-view-issue-list-videos = Fideos
-
 protections-panel-site-not-working-view-send-report = Anfon adroddiad
 
 ##
@@ -89,11 +80,9 @@
 protections-panel-fingerprinters = Mae bysbrintwyr yn casglu gosodiadau o'ch porwr a'ch cyfrifiadur i greu proffil ohonoch. Gan ddefnyddio'r olion bys digidol hwn, mae nhw'n gallu'ch tracio ar draws gwahanol wefannau.
 protections-panel-tracking-content = Gall gwefannau lwytho hysbysebion allanol, fideos a chynnwys eraill sy'n cynnwys cod tracio. Gall rhwystro cynnwys tracio helpu gwefannau i lwytho'n gynt, ond efallai na fydd rhai botymau, ffurflenni a meysydd mewngofnodi'n gweithio.
 protections-panel-social-media-trackers = Mae rhwydweithiau cymdeithasol yn gosod tracwyr ar wefannau eraill i ddilyn yr hyn rydych chi'n ei wneud, ei weld, a'i wylio ar-lein. Mae hyn yn caniatáu i gwmnïau cyfryngau cymdeithasol ddysgu mwy amdanoch chi y tu hwnt i'r hyn rydych chi'n ei rannu ar eich proffiliau cyfryngau cymdeithasol.
-
 protections-panel-content-blocking-manage-settings =
     .label = Rheoli Gosodiadau Diogelu
-    .accesskey = M
-
+    .accesskey = R
 protections-panel-content-blocking-breakage-report-view =
     .title = Adrodd ar Wefan wedi Torri
 protections-panel-content-blocking-breakage-report-view-description = Gall rhwystro cynnwys achosi problemau gyda rai gwefannau. Pan fyddwch yn cyflwyno adroddiad ar broblemau, byddwch yn helpu gwneud { -brand-short-name } yn well i bawb. (Bydd hyn yn anfon yr URL yn ogystal â gwybodaeth am osodiadau eich porwr i Mozilla. <label data-l10n-name="learn-more">Dysgu rhagor</label>
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/cy/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/cy/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -65,6 +65,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Dim ond ar Dab Newydd
     .accesskey = D
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Dangos Bob Tro
+    .accesskey = D
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Peidio Dangos Byth
+    .accesskey = P
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Dangos ar Dab Newydd yn Unig
+    .accesskey = U
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Dangos Nodau Tudalen Eraill
     .accesskey = N
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/cy/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/browser.dtd	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/chrome/browser/browser.dtd	2021-01-18 20:02:28.000000000 +0000
@@ -42,10 +42,6 @@
 
 <!ENTITY fullScreenCmd.label "Sgrin Lawn">
 
-
-<!-- } is above this key on many keyboards -->
-
-
 <!ENTITY pictureInPictureHideToggle.label "Cuddio'r Togl Llun mewn Llun">
 <!ENTITY pictureInPictureHideToggle.accesskey "L">
 
@@ -55,7 +51,6 @@
 <!ENTITY fxa.menu.syncSettings2.label "Gosodiadau &syncBrand.shortName.label;">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Cysylltu Dyfais Arall…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
-
 <!ENTITY fxa.menu.signin.label "Mewngofnodi i &brandProductName;">
 <!ENTITY fxa.menu.turnOnSync.label "Troi &syncBrand.shortName.label; ymlaen">
 <!ENTITY fxa.menu.firefoxServices.label "Gwasanaethau &brandProductName;">
@@ -101,7 +96,6 @@
 <!ENTITY printButton.label            "Argraffu">
 <!ENTITY printButton.tooltip          "Argraffu'r dudalen">
 
-
 <!ENTITY searchItem.title             "Chwilio">
 
 <!-- Toolbar items -->
@@ -137,7 +131,7 @@
 <!ENTITY newPrivateWindow.label     "Ffenestr Breifat Newydd">
 
 <!ENTITY editMenu.label         "Golygu">
-<!ENTITY preferencesCmd2.label       "Dewisiadau">
+<!ENTITY preferencesCmd2.label       "Opsiynau">
 <!ENTITY preferencesCmdUnix.label       "Dewisiadau">
 <!ENTITY logins.label                           "Mewngofnodion a Chyfrineiriau">
 
@@ -191,7 +185,7 @@
 <!ENTITY customizeMenu.addToToolbar.label "Ychwanegu i'r Bar Offer">
 <!ENTITY customizeMenu.addToToolbar.accesskey "Y">
 <!-- LOCALIZATION NOTE (customizeMenu.addToOverflowMenu.label,
-     customizeMenu.pinToOverflowMenu.label, customizeMenu.unpinFromOverflowMenu.label)
+     customizeMenu.unpinFromOverflowMenu.label)
      The overflow menu is the menu that appears if you click the chevron (>> button)
      in the location bar. -->
 <!ENTITY customizeMenu.addToOverflowMenu.label "Ychwanegu at y Ddewislen Ychwanegol">
@@ -219,19 +213,16 @@
 
 <!ENTITY pageAction.copyLink.label    "Copïo'r Ddolen">
 
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY saveToPocketCmd.label        "Cadw Tudalen i Pocket">
+
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY pocketMenuitem.label         "Edrych ar Rhestr Pocket">
 
 <!ENTITY emailPageCmd.label           "E-bostio'r Ddolen…">
 
-<!-- Media (video/audio) controls -->
-
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
 <!ENTITY fullZoom.label                 "Chwyddo">
 
 <!ENTITY sidebarCloseButton.tooltip     "Cau'r bar ochr">
@@ -248,7 +239,7 @@
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "Golygu Dewisiadau Rhwystro Llamlenni…">
-<!ENTITY editPopupSettings.label "Golygu Dewisiadau Rhwystro Llamlenni…">
+<!ENTITY editPopupSettings.label "Golygu Opsiynau Rhwystro Llamlenni…">
 <!ENTITY editPopupSettings.accesskey "e">
 <!ENTITY dontShowMessage.accesskey "P">
 
@@ -257,7 +248,6 @@
 <!ENTITY spellAddDictionaries.label "Ychwanegu Geiriaduron…">
 <!ENTITY spellAddDictionaries.accesskey "G">
 
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Tabiau porwyr">
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/cy/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/browser.properties	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/chrome/browser/browser.properties	2021-01-18 20:02:28.000000000 +0000
@@ -270,7 +270,7 @@
 # The singular form is left empty for English, since the number of blocked pop-ups is always greater than 1.
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.exceeded.message=;Rhwystrodd #1 y wefan hon rhag agor mwy na #2 llamlen.;Rhwystrodd #1 y wefan hon rhag agor mwy na #2 llamlen.;Rhwystrodd #1 y wefan hon rhag agor mwy na #2 llamlen.;Rhwystrodd #1 y wefan hon rhag agor mwy na #2 llamlen.;Rhwystrodd #1 y wefan hon rhag agor mwy na #2 llamlen.
-popupWarningButton=Dewisiadau
+popupWarningButton=Opsiynau
 popupWarningButton.accesskey=D
 popupWarningButtonUnix=Dewisiadau
 popupWarningButtonUnix.accesskey=D
@@ -533,7 +533,7 @@
 
 # LOCALIZATION NOTE (protections.header):
 # Header of the Protections Panel. %S is replaced with the site's hostname.
-protections.header=Diogelu %S
+protections.header=Diogelwch ar %S
 
 # LOCALIZATION NOTE (protections.disableAriaLabel):
 # Text that gets spoken by a screen reader if the button will disable protections.
diff -Nru firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-85.0+build1/l10n/cy/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-84.0.2+build1/l10n/cy/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-18 20:02:28.000000000 +0000
@@ -43,9 +43,9 @@
 preferences-button.tooltiptext2 = Agor dewisiadau
 preferences-button.tooltiptext.withshortcut = Agor dewisiadau (%S)
 # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
-preferences-button.labelWin = Dewisiadau
+preferences-button.labelWin = Opsiynau
 # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
-preferences-button.tooltipWin2 = Agor dewisiadau
+preferences-button.tooltipWin2 = Agor opsiynau
 
 zoom-controls.label = Offer Chwyddo
 zoom-controls.tooltiptext2 = Offer chwyddo
@@ -80,7 +80,7 @@
 # of the string is used to disable auto hyphenation on the button text when it is displayed
 # in the menu panel.
 characterencoding-button2.label = Amgodiad Testun
-characterencoding-button2.tooltiptext = Dangos dewisiadau amgodiad testun
+characterencoding-button2.tooltiptext = Dangos opsiynau amgodiad testun
 
 email-link-button.label = E-bostio'r Ddolen
 email-link-button.tooltiptext3 = E-bostio dolen i'r dudalen hon
diff -Nru firefox-84.0.2+build1/l10n/cy/devtools/client/inspector.properties firefox-85.0+build1/l10n/cy/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/cy/devtools/client/inspector.properties	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/devtools/client/inspector.properties	2021-01-18 20:02:28.000000000 +0000
@@ -387,7 +387,7 @@
 # shown in the inspector contextual-menu for custom elements to which a shadow root has
 # been attached. Clicking on the menu item will open the Debugger on the custom element
 # definition location.
-inspectorCustomElementDefinition.label=Dangos Elfen Cyfaddas
+inspectorCustomElementDefinition.label=Dangos Elfen Gyfaddas
 
 # LOCALIZATION NOTE (inspector.searchHTML.key):
 # Key shortcut used to focus the DOM element search box on top-right corner of
diff -Nru firefox-84.0.2+build1/l10n/cy/devtools/client/markers.properties firefox-85.0+build1/l10n/cy/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/cy/devtools/client/markers.properties	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/devtools/client/markers.properties	2021-01-18 20:02:28.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Cof yn Isel
 marker.gcreason.label.CC_WAITING=Gorfodwyd gan Gasglu Cylchol
+marker.gcreason.label.CC_FINISHED=Gorffennwyd y Casgliad Cylchol
 marker.gcreason.label.CC_FORCED=Gorfodwyd gan Gasglu Cylchol
 marker.gcreason.label.LOAD_END=Gorffennwyd Llwytho'r Dudalen
 marker.gcreason.label.PAGE_HIDE=Symudwyd i'r Cefndir
diff -Nru firefox-84.0.2+build1/l10n/cy/devtools/client/toolbox.properties firefox-85.0+build1/l10n/cy/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/cy/devtools/client/toolbox.properties	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/devtools/client/toolbox.properties	2021-01-18 20:02:28.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Cau'r Bar Offer Datblygwyr
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Dangos Consol Hollt
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/cy/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/cy/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/cy/devtools/client/tooltips.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/devtools/client/tooltips.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = Nid yw <strong>{ $property }</strong> yn effeithio ar yr elfen hon gan nad yw'n eitem wedi'i lleoli.
 inactive-text-overflow-when-no-overflow = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar yr elfen hon gan nad yw <strong>overflow:hidden</strong> wedi'i osod.
 inactive-outline-radius-when-outline-style-auto-or-none = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar yr elfen hon oherwydd bod ei <strong>arddull amlinellol</strong> yn <strong>awto</strong> neu'n <strong>ddim</strong>.
+inactive-css-not-for-internal-table-elements = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar elfennau tablau mewnol.
+inactive-css-not-for-internal-table-elements-except-table-cells = Nid yw <strong>{ $property }</strong> yn cael unrhyw effaith ar elfennau bwrdd mewnol ac eithrio celloedd bwrdd.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Ceisiwch dynnu <strong>float</strong> neu <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Ceisiwch osod priodwedd ei <strong>leoliad</strong> i rywbeth arall heblaw <strong>statig</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Ceisiwch ychwanegu <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Ceisiwch osod ei briodwedd <strong>arddangos</strong> i rywbeth arall heblaw <strong>cell-tabl</strong>, <strong>colofn-tabl</strong>, <strong>rhes-tabl</strong>, <strong>tabl-colofn-grŵp</strong>, <strong>tabl-rhes-grŵp</strong>, neu <strong>tabl-troedyn-grŵp</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Ceisiwch osod ei briodwedd <strong>arddangos</strong> i rywbeth arall heblaw <strong>cell-tabl</strong>, <strong>colofn-tabl</strong>, <strong>rhes-tabl</strong>, <strong>tabl-colofn-grŵp</strong>, <strong>tabl-rhes-grŵp</strong>, neu <strong>tabl-troedyn-grŵp</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Ceisiwch osod ei briodwedd <strong>amlinellol</strong> i rywbeth heblaw'n <strong>awto</strong> neu'n <strong>ddim</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/cy/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/cy/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/cy/dom/chrome/dom/dom.properties	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/dom/chrome/dom/dom.properties	2021-01-18 20:02:28.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Cafodd y dewisydd <input> ei rwystro oherwydd diffyg gweithredu gan y defnyddiwr.
 ExternalProtocolFrameBlockedNoUserActivation=Cafodd Iframe â phrotocol allanol ei rwystro oherwydd diffyg gweithredu gan y defnyddiwr, neu oherwydd nad oes digon o amser wedi mynd heibio ers i'r iframe olaf gael ei lwytho.
 MultiplePopupsBlockedNoUserActivation=Cafodd agor llamlenni lluosog eu rhwystro oherwydd diffyg gweithredu gan y defnyddiwr.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Anwybyddwyd rhaglwytho %S oherwydd gwerthoedd anhysbys “as� neu “type�, neu briodoledd “media� nad oedd yn cyfateb.
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:28.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d;d;d;d
 
 downloadErrorAlertTitle=Gwall llwytho i lawr
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Nid oes modd cadw'r llwyth am ei fod wedi'i rwystro gan %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Nid oes modd cadw'r llwyth am ei fod wedi'i rwystro gan estyniad.
 downloadErrorGeneric=Nid oes modd cadw'r llwyth yma gan fod gwall anhysbys wedi digwydd.\n\nCeisiwch eto.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Ychydig eiliadau ar ôl
 timeUnknown2=Amser anhysbys ar ôl
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=Adnodd %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/downloads/settingsChange.dtd firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/downloads/settingsChange.dtd
--- firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/downloads/settingsChange.dtd	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/downloads/settingsChange.dtd	2021-01-18 20:02:28.000000000 +0000
@@ -3,4 +3,4 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  settingsChangePreferences.label  "Mae modd newid gosodiadau yn Dewisiadau &brandShortName;.">
-<!ENTITY  settingsChangeOptions.label      "Mae modd newid gosodiadau yn Optiynnau &brandShortName;.">
+<!ENTITY  settingsChangeOptions.label      "Mae modd newid gosodiadau yn Newisiadau &brandShortName;.">
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/cy/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:28.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Gwrthodwyd cysylltiad â'r gweinydd dirprwy
 check_error-2153390069=Mae tystysgrif y gweinydd wedi dod i ben (newidiwch gloc eich system i'r dyddiad a'r amser cywir os yw'n anghywir)
 check_error-verification_failed=Nid oedd modd dilysu cywirdeb y diweddariad
+check_error-move_failed=Wedi methu paratoi'r diweddariad i'w osod
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -90,7 +90,7 @@
 ##                   of `duration-unit-*`.
 
 # Common case.
-about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, arddull: "canran") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
 # Special case: data is not available yet.
 about-processes-cpu-user-and-kernel-not-ready = (yn mesur)
 # Special case: process or thread is currently idle.
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Modiwlau Trydydd Parti
+support-third-party-modules-module = Ffeil Modiwlau
+support-third-party-modules-version = Fersiwn Ffeil
+support-third-party-modules-vendor = Manylion y Gwerthwr
+support-third-party-modules-occurrence = Amlder
+support-third-party-modules-process = Math o Broses ac ID
+support-third-party-modules-thread = Trywydd
+support-third-party-modules-base = Cyfeiriad Imagebase
+support-third-party-modules-uptime = Cyfnod Proses (me)
+support-third-party-modules-duration = Cyfnod Llwytho (me)
+support-third-party-modules-empty = Heb lwytho unrhyw fodiwlau trydydd parti.
+support-third-party-modules-no-value = (Dim gwerth)
+support-third-party-modules-button-open =
+    .title = Lleoliad ffeil agored...
+support-third-party-modules-expand =
+    .title = Dangos gwybodaeth fanwl
+support-third-party-modules-collapse =
+    .title = Cau gwybodaeth fanwl
+support-third-party-modules-unsigned-icon =
+    .title = Nid yw'r modiwl hwn wedi'i lofnodi
+support-third-party-modules-folder-icon =
+    .title = Lleoliad ffeil agored...
+support-third-party-modules-down-icon =
+    .title = Dangos gwybodaeth fanwl
+support-third-party-modules-up-icon =
+    .title = Cau gwybodaeth fanwl
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Cefnogaeth Llun-mewn-Llun Lluosog
 experimental-features-multi-pip-description = Cefnogaeth arbrofol i ganiatáu i nifer o ffenestri Llun-mewn-Llun fod ar agor ar yr un pryd.
+experimental-features-http3 =
+    .label = Protocol HTTP/3
+experimental-features-http3-description = Cefnogaeth arbrofol i brotocol HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/global/unknownContentType.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/global/unknownContentType.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/global/unknownContentType.ftl	2021-01-06 11:27:46.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/global/unknownContentType.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -8,6 +8,6 @@
 unknowncontenttype-settingschange =
     .value =
         { PLATFORM() ->
-            [windows] Mae modd newid gosodiadau yn Optiynnau { -brand-short-name }.
+            [windows] Mae modd newid gosodiadau yn Opsiynau { -brand-short-name }.
            *[other] Mae modd newid gosodiadau yn Dewisiadau { -brand-short-name }.
         }
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Tudalen:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } o { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Tudalen olaf
-
+printpreview-homearrow-button =
+    .title = Tudalen gyntaf
+printpreview-previousarrow-button =
+    .title = Tudalen flaenorol
+printpreview-nextarrow-button =
+    .title = Tudalen nesaf
+printpreview-endarrow-button =
+    .title = Tudalen olaf
diff -Nru firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/cy/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/cy/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:27:47.000000000 +0000
+++ firefox-85.0+build1/l10n/cy/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:28.000000000 +0000
@@ -17,7 +17,7 @@
        *[other] { $sheetCount } dalen o bapur
     }
 printui-page-range-all = Y Cyfan
-printui-page-range-custom = Cyfaddas
+printui-page-range-custom = Cyfaddasu
 printui-page-range-label = Tudalen
 printui-page-range-picker =
     .aria-label = Dewis yr ystod tudalen
@@ -29,6 +29,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = at
+printui-page-custom-range-input =
+    .aria-label = Rhowch ystod tudalen cyfaddas
+    .placeholder = e.e. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copïau
 printui-orientation = Cyfeiriad
@@ -52,6 +55,7 @@
 printui-options = Dewisiadau
 printui-headers-footers-checkbox = Argraffu penynnau a throedynnau
 printui-backgrounds-checkbox = Argraffu cefndiroedd
+printui-selection-checkbox = Argraffu'r dewis yn unig
 printui-color-mode-label = Modd lliw
 printui-color-mode-color = Lliw
 printui-color-mode-bw = Du a gwyn
@@ -59,20 +63,30 @@
 printui-margins-default = Rhagosodiad
 printui-margins-min = Lleiafswm
 printui-margins-none = Dim
-printui-margins-custom = Cyfaddas
+printui-margins-custom = Cyfaddasu
+printui-margins-custom-inches = Cyfaddas (modfeddi)
 printui-margins-custom-top = Brig
+printui-margins-custom-top-inches = Brig (modfeddi)
 printui-margins-custom-bottom = Gwaelod
+printui-margins-custom-bottom-inches = Gwaelod (modfeddi)
 printui-margins-custom-left = Chwith
+printui-margins-custom-left-inches = Chwith (modfeddi)
 printui-margins-custom-right = De
+printui-margins-custom-right-inches = De (modfeddi)
 printui-system-dialog-link = Argraffu gan ddefnyddio deialog y system ...
 printui-primary-button = Argraffu
 printui-primary-button-save = Cadw
 printui-cancel-button = Diddymu
+printui-close-button = Cau
 printui-loading = Paratoi Rhagolwg
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Rhagolwg Argraffu
+printui-pages-per-sheet = Tudalennau fesul dalen
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Argraffu…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/da/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/aboutLogins.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/aboutLogins.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Fjern dette login?
 confirm-delete-dialog-message = Denne handling kan ikke fortrydes.
 about-logins-confirm-remove-dialog-confirm-button = Fjern
-about-logins-confirm-remove-all-dialog-confirm-button = Fjern alle
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Fjern
+        [one] Fjern
+       *[other] Fjern alle
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, fjern dette login
@@ -180,9 +185,28 @@
         [one] Fjern { $count } login?
        *[other] Fjern { $count } logins?
     }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Dette fjerner login'et, du har gemt til { -brand-short-name } samt alle advarsler om datalæk, der vises her. Du kan ikke fortryde denne handling.
+        [one] Dette fjerner login'et, du har gemt til { -brand-short-name } samt alle advarsler om datalæk, der vises her. Du kan ikke fortryde denne handling.
+       *[other] Dette fjerner logins, du har gemt til { -brand-short-name } samt alle advarsler om datalæk, der vises her. Du kan ikke fortryde denne handling.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Fjern { $count } login fra alle enheder?
+       *[other] Fjern { $count } logins fra alle enheder?
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Denne handling fjerner det login, du har gemt til { -brand-short-name } på alle enheder, der er synkroniseret med din { -fxaccount-brand-name }. Advarsler om datalæk, der optræder her, vil også blive fjernet. Du kan ikke fortryde denne handling.
+        [one] Denne handling fjerner det login, du har gemt til { -brand-short-name } på alle enheder, der er synkroniseret med din { -fxaccount-brand-name }. Advarsler om datalæk, der optræder her, vil også blive fjernet. Du kan ikke fortryde denne handling.
+       *[other] Denne handling fjerner de logins, du har gemt til { -brand-short-name } på alle enheder, der er synkroniseret med din { -fxaccount-brand-name }. Advarsler om datalæk, der optræder her, vil også blive fjernet. Du kan ikke fortryde denne handling.
+    }
 about-logins-confirm-export-dialog-title = Eksporter logins og adgangskoder
 about-logins-confirm-export-dialog-message = Dine adgangskoder bliver gemt som læsbar tekst (fx dåRligAdg@ngsk0de), så alle der kan åbne den eksportede fil kan se dine adgangskoder.
 about-logins-confirm-export-dialog-confirm-button = Eksporter…
+about-logins-alert-import-title = Import fuldført
+about-logins-alert-import-message = Se detaljeret oversigt over import
 confirm-discard-changes-dialog-title = Annuller ikke-gemte ændringer?
 confirm-discard-changes-dialog-message = Alle ikke-gemte ændringer vil gå tabt.
 confirm-discard-changes-dialog-confirm-button = Annuller
@@ -244,3 +268,26 @@
         [macos] CSV-fil
        *[other] CSV-fil
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Import fuldført
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Nye logins tilføjet:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Eksisterende logins opdateret:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Dublet-logins fundet:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ikke importeret)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Fejl:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ikke importeret)</span>
+    }
+about-logins-import-dialog-done = Færdig
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/da/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/appmenu.ftl	2021-01-06 11:29:39.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/appmenu.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nyt vindue
+appmenuitem-new-private-window =
+    .label = Nyt privat vindue
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom ind
 appmenuitem-zoom-reduce =
     .label = Zoom ud
+appmenuitem-fullscreen =
+    .label = Fuld skærm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synkroniser nu
+appmenuitem-save-page =
+    .label = Gem side som…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Nyheder
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/da/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/appMenuNotifications.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ikke nu
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Efter en hurtig genstart vil { -brand-shorter-name } gendanne alle dine åbne faneblade og vinduer, der ikke er åbnet i privat browsing-tilstand.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kan ikke opdatere automatisk til den seneste version.
+    .buttonlabel = Opdater { -brand-shorter-name } alligevel
+    .buttonaccesskey = O
+    .secondarybuttonlabel = Ikke nu
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message = Der er en ny opdatering af { -brand-shorter-name } tilgængelig. Den kan dog ikke blive installeret, fordi en anden version af { -brand-shorter-name } er åben. Luk programmet for at fortsætte opdateringen, eller vælg at opdatere alligevel (den anden version vil muligvis ikke fungere korrekt, før du genstarter den).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, forstået
     .buttonaccesskey = O
@@ -39,7 +46,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Tillad denne udvidelse at virke i private vinduer.
     .accesskey = T
-    
 appmenu-new-tab-controlled =
     .label = Nyt faneblad er ændret
     .buttonlabel = Behold ændringen
@@ -52,6 +58,18 @@
     .buttonaccesskey = B
     .secondarybuttonlabel = Deaktiver udvidelse
     .secondarybuttonaccesskey = D
+appmenu-new-tab-controlled-changes =
+    .label = Nyt faneblad er ændret.
+    .buttonlabel = Behold ændringen
+    .buttonaccesskey = B
+    .secondarybuttonlabel = HÃ¥ndter nye faneblade
+    .secondarybuttonaccesskey = H
+appmenu-homepage-controlled-changes =
+    .label = Din startside er ændret.
+    .buttonlabel = Behold ændringen
+    .buttonaccesskey = B
+    .secondarybuttonlabel = HÃ¥ndter startside
+    .secondarybuttonaccesskey = H
 appmenu-tab-hide-controlled =
     .label = Tilgå dine skjulte faneblade
     .buttonlabel = Behold faneblade skjulte
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/browser.ftl firefox-85.0+build1/l10n/da/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/browser.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/browser.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> kontrollerer din markør. Tryk Esc for at overtage kontrollen igen.
 pointerlock-warning-no-domain = Dette dokument kontrollerer din markør. Tryk Esc for at overtage kontrollen igen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Vis alle bogmærker
+bookmarks-recent-bookmarks =
+    .value = Seneste bogmærker
+bookmarks-toolbar-chevron =
+    .tooltiptext = Vis flere bogmærker
+bookmarks-sidebar-content =
+    .aria-label = Bogmærker
+bookmarks-menu-button =
+    .label = Bogmærke-menuen
+bookmarks-other-bookmarks-menu =
+    .label = Andre bogmærker
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil-bogmærker
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skjul bogmærker i sidepanel
+           *[other] Vis bogmærker i sidepanel
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skjul bogmærkelinjen
+           *[other] Vis bogmærkelinjen
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fjern bogmærke-menuen fra værktøjslinjen
+           *[other] Føj bogmærke-menuen til værktøjslinjen
+        }
+bookmarks-search =
+    .label = Søg i bogmærker
+bookmarks-tools =
+    .label = Bogmærke-værktøjer
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bogmærkelinje
+    .accesskey = B
+    .aria-label = Bogmærker
+bookmarks-toolbar-menu =
+    .label = Bogmærkelinje
+bookmarks-toolbar-placeholder =
+    .title = Bogmærkelinje-elementer
+bookmarks-toolbar-placeholder-button =
+    .label = Bogmærkelinje-elementer
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bogmærker
+library-bookmarks-bookmark-this-page =
+    .label = Bogmærk denne side
+library-bookmarks-bookmark-edit =
+    .label = Rediger bogmærke
+library-recent-activity-label = Seneste aktivitet
+
+## More items
+
+more-menu-go-offline =
+    .label = Arbejd offline
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/da/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/newtab/asrouter.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Skriv mindre, find mere med adressefeltet
 cfr-whatsnew-searchbar-body-topsites = Vælg adressefeltet, og en boks med links til dine mest besøgte websteder vil blive vist.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Forstørrelsesglas-ikon
 
 ## Picture-in-Picture
@@ -275,3 +278,18 @@
 cfr-whatsnew-media-keys-header = Flere mediekontroller
 cfr-whatsnew-media-keys-body = Kontroller afspilning af lyd eller video direkte fra dit tastatur eller dit headset. På den måde er det nemt at have kontrol over medie-indhold fra et andet faneblad, et andet program - eller endda hvis du computer er låst. Du kan også skifte mellem numre ved at bruge piletasterne.
 cfr-whatsnew-media-keys-button = Mere information
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Søge-genveje i adressefeltet
+cfr-whatsnew-search-shortcuts-body = Når du indtaster navnet eller adressen på en søgetjeneste, så vil der nu blive vist en blå genvej i søgeforslagene nedenunder. Vælg denne genvej for at fuldføre din søgning direkte fra adressefeltet.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Beskyttelse mod skadelige super-cookies
+cfr-whatsnew-supercookies-body = Websteder kan i hemmelighed føje en "super-cookie" til din browser, der kan følge dig rundt på nettet - selv efter at du har slettet dine cookies. { -brand-short-name } beskytter dig nu mod super-cookies, så de ikke kan bruges til at spore din online aktivitet på tværs af websteder.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Bedre bogmærker
+cfr-whatsnew-bookmarking-body = Det er blevet nemmere at holde styr på dine yndings-websteder. { -brand-short-name } husker nu din foretrukne placering for gemte bogmærker, viser som standard bogmærkelinjen på nye faneblade og giver dig nem adgang til resten af dine bogmærker med en bogmærkemappe.
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/da/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/newtab/newtab.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nyt faneblad
 newtab-settings-button =
     .title = Tilpas siden Nyt faneblad
+newtab-personalize-button-label = Tilpas
+    .title = Tilpas nyt faneblad
+    .aria-label = Tilpas nyt faneblad
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Søg på internettet
     .title = Søg på internettet
     .aria-label = Søg på internettet
+newtab-search-box-text = Søg på nettet
+newtab-search-box-input =
+    .placeholder = Søg på nettet
+    .aria-label = Søg på nettet
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Tilføj søgetjeneste
 newtab-topsites-add-topsites-header = Ny webside
+newtab-topsites-add-shortcut-header = Ny genvej
 newtab-topsites-edit-topsites-header = Rediger mest besøgte webside
+newtab-topsites-edit-shortcut-header = Rediger genvej
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Indtast en titel
@@ -172,6 +181,7 @@
 
 newtab-section-header-topsites = Mest besøgte websider
 newtab-section-header-highlights = Fremhævede
+newtab-section-header-recent-activity = Seneste aktivitet
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Anbefalet af { $provider }
@@ -207,3 +217,27 @@
 
 newtab-error-fallback-info = Hovsa. Noget gik galt ved indlæsning af indholdet.
 newtab-error-fallback-refresh-link = Prøv igen ved at genindlæse siden.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Genveje
+newtab-custom-shortcuts-subtitle = Gemte eller besøgte websteder
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } række
+       *[other] { $num } rækker
+    }
+newtab-custom-sponsored-sites = Sponsorerede genveje
+newtab-custom-pocket-title = Anbefalet af { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Interessant indhold udvalgt af { -pocket-brand-name }, en del af { -brand-product-name }-familien
+newtab-custom-pocket-sponsored = Sponsorerede historier
+newtab-custom-recent-title = Seneste aktivitet
+newtab-custom-recent-subtitle = Et udvalg af seneste websteder og indhold
+newtab-custom-close-button = Luk
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Notitser
+newtab-custom-snippets-subtitle = Tips og nyheder fra { -vendor-short-name } og { -brand-product-name }
+newtab-custom-settings = HÃ¥ndter flere indstillinger
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/places.ftl firefox-85.0+build1/l10n/da/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/places.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/places.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Undermappe
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Andre bogmærker
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/da/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/preferences/preferences.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Mest besøgte websider
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsorerede websteder
+home-prefs-shortcuts-header =
+    .label = Genveje
+home-prefs-shortcuts-description = Gemte eller besøgte websteder
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsorerede genveje
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Anbefalet af { $provider }
 home-prefs-recommended-by-description-update = Spændende indhold fra nettet, udvalgt af { $provider }
+home-prefs-recommended-by-description-new = Interessant indhold udvalgt af { $provider }, en del af { -brand-product-name }-familien
 
 ##
 
@@ -524,6 +530,9 @@
     .label = Seneste filhentninger
 home-prefs-highlights-option-saved-to-pocket =
     .label = Sider gemt til { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Seneste aktivitet
+home-prefs-recent-activity-description = Et udvalg af seneste websteder og indhold
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -531,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Notitser
 home-prefs-snippets-description = Nyheder fra { -vendor-short-name } og { -brand-product-name }
+home-prefs-snippets-description-new = Tips og nyheder fra { -vendor-short-name } og { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -791,6 +801,10 @@
 forms-primary-pw-change =
     .label = Skift hovedadgangskode…
     .accesskey = h
+# Leave this message empty if the translation for "Primary Password" matches
+# "Master Password" in your language. If you're editing the FTL file directly,
+# use { "" } as the value.
+forms-primary-pw-former-name = { "" }
 forms-primary-pw-fips-title = Du er i øjeblikket i FIPS-tilstand. FIPS kræver, at du bruger en hovedadgangskode.
 forms-master-pw-fips-desc = Ændring af adgangskode mislykkedes
 
@@ -918,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Ã…bne faneblade
     .accesskey = f
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Genveje
+    .accesskey = G
 addressbar-locbar-topsites-option =
     .label = Mest besøgte websider
     .accesskey = M
+addressbar-locbar-engines-option =
+    .label = Søgetjenester
+    .accesskey = S
 addressbar-suggestions-settings = Skift indstillinger for søgeforslag
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/da/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/da/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/da/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -60,3 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Kun i et nyt faneblad
     .accesskey = K
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vis altid
+    .accesskey = a
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Vis aldrig
+    .accesskey = d
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Vis kun på nyt faneblad
+    .accesskey = k
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Vis Andre bogmærker
+    .accesskey = V
diff -Nru firefox-84.0.2+build1/l10n/da/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/da/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/da/browser/chrome/browser/browser.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/browser/chrome/browser/browser.properties	2021-01-18 20:02:34.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=V
 getUserMedia.pickWindowOrScreen.label = Vælg vindue eller skærm
 getUserMedia.shareEntireScreen.label = Hele skærmen
+getUserMedia.sharePipeWirePortal.label = Brug operativsystemets indstillinger
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/da/chat/twitter.properties firefox-85.0+build1/l10n/da/chat/twitter.properties
--- firefox-84.0.2+build1/l10n/da/chat/twitter.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/chat/twitter.properties	2021-01-18 20:02:34.000000000 +0000
@@ -9,7 +9,6 @@
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
 error.tooLong=Status er flere end 140 tegn.
-
 # 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
@@ -20,7 +19,6 @@
 error.delete=Fejlen %1$S opstod ved sletning af: %2$S
 error.like=Fejlen %1$S opstod ved valg af like: %2$S
 error.unlike=Fejlen %1$S opstod ved sletning af like: %2$S
-
 # LOCALIZATION NOTE (error.descriptionTooLong)
 #   %S is the truncated string that was sent to the server.
 error.descriptionTooLong=Beskrivelsen er længere end den tilladte længde (160 tegn), den blev automatisk forkortet til: %S.
@@ -36,7 +34,6 @@
 action.retweet=Gen-tweet
 action.reply=Svar
 action.delete=Slet
-
 # LOCALIZATION NOTE (action.follow, action.stopFollowing):
 #  %S will be replaced by the screen name of a twitter user.
 action.follow=Følg %S
@@ -50,7 +47,6 @@
 event.follow=Du følger nu %S.
 event.unfollow=Du følger ikke længere %S.
 event.followed=%S følger dig nu.
-
 # LOCALIZATION NOTE (event.deleted):
 #  %S will be replaced by the text of the deleted tweet.
 event.deleted=Du har slettet dette tweet: "%S".
@@ -71,7 +67,6 @@
 connection.requestAuth=Venter på at blive godkendt
 connection.requestAccess=Afslutter godkendelse
 connection.requestTimelines=Henter bruger-timelines
-
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if an error occurs during the
 #   connection attempt.
@@ -101,17 +96,14 @@
 tooltip.lang=Sprog
 tooltip.time_zone=Tidszone
 tooltip.url=Webside
-
 # LOCALIZATION NOTE (tooltip.protected):
 #  whether the user's tweets are publicly visible.
 tooltip.protected=Beskyt tweets
-
 # LOCALIZATION NOTE (tooltip.following):
 #  whether you are subscribed to the user's tweets.
 tooltip.following=Følger
 tooltip.name=Navn
 tooltip.description=Beskrivelse
-
 # LOCALIZATION NOTE (tooltip.*_count):
 #  Please see the right side of the official Twitter website UI.
 tooltip.friends_count=Følger
@@ -126,3 +118,5 @@
 
 command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: Følg en bruger/brugere.
 command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: Stop med at følge en bruger/brugere.
+
+twitter.disabled=Twitter understøttes ikke længere, da Twitter har deaktiveret deres streamingprotokol.
diff -Nru firefox-84.0.2+build1/l10n/da/devtools/client/markers.properties firefox-85.0+build1/l10n/da/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/da/devtools/client/markers.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/devtools/client/markers.properties	2021-01-18 20:02:34.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Lav hukommelse
 marker.gcreason.label.CC_WAITING=Tvunget af cyklus-indsamling
+marker.gcreason.label.CC_FINISHED=Cyklus-indsamling afsluttet
 marker.gcreason.label.CC_FORCED=Tvunget af cyklus-indsamling
 marker.gcreason.label.LOAD_END=Sideindlæsning afsluttet 
 marker.gcreason.label.PAGE_HIDE=Flyttet til baggrund
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/da/devtools/client/toolbox.properties firefox-85.0+build1/l10n/da/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/da/devtools/client/toolbox.properties	2021-01-06 11:29:39.000000000 +0000
+++ firefox-85.0+build1/l10n/da/devtools/client/toolbox.properties	2021-01-18 20:02:34.000000000 +0000
@@ -27,7 +27,7 @@
 # toolbox as a whole
 toolbox.label=Udviklerværktøj
 
-# LOCALIZATION NOTE (options.toolNotSupported): This is the template
+# LOCALIZATION NOTE (options.toolNotSupportedMarker): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Ã…bn fil i CSS-editor
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Luk Udviklerværktøj
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Vis delt konsol
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
@@ -267,7 +271,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Kan ikke oprette forbindelse til dét, du vil debugge. Se detaljer nedenfor:
 
-# 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=Forældet. Læs mere…
diff -Nru firefox-84.0.2+build1/l10n/da/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/da/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/da/devtools/client/tooltips.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/devtools/client/tooltips.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -27,6 +27,9 @@
 inactive-css-property-is-impossible-to-override-in-visited = Det er umuligt at tilsidesætte <strong>{ $property }</strong> på grund af begrænsning for <strong>:visited</strong>.
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> har ingen effekt på dette element, fordi det ikke er et placeret element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> har ingen effekt på dette element, fordi <strong>overflow:hidden</strong> ikke er sat.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> har ingen effekt på dette element, fordi elementets <strong>outline-style</strong> er <strong>auto</strong> eller <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong>  har ingen effekt på interne tabel-elementer.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> har ingen effekt på interne tabel-elementer, bortset fra tabel-celler.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -45,6 +48,9 @@
 inactive-css-not-display-block-on-floated-fix = Prøv at fjerne <strong>float</strong> eller tilføje <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Prøv at sætte elements <strong>position</strong>-egenskab til noget andet end <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Prøv at tilføje <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Prøv at sætte <strong>display</strong>-egenskaben til noget andet end<strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> eller <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Prøv at sætte <strong>display</strong>-egenskaben til noget andet end <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> eller <strong>table-footer-group</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Prøv at sætte elementets <strong>outline-style</strong> til noget andet end <strong>auto</strong> eller <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/da/devtools/client/webconsole.properties firefox-85.0+build1/l10n/da/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/da/devtools/client/webconsole.properties	2021-01-06 11:29:39.000000000 +0000
+++ firefox-85.0+build1/l10n/da/devtools/client/webconsole.properties	2021-01-18 20:02:34.000000000 +0000
@@ -7,27 +7,6 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
-# LOCALIZATION NOTE (browserConsole.title): shown as the
-# title when opening the browser console popup
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
 
 # LOCALIZATION NOTE (browserConsole.title): shown as the
 # title when opening the browser console popup
@@ -500,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Kør udtrykket (%S). Dette rydder ikke inputtet.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Pretty Print udtryk
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/da/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/da/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/da/dom/chrome/dom/dom.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/dom/chrome/dom/dom.properties	2021-01-18 20:02:34.000000000 +0000
@@ -419,3 +419,12 @@
 RequestStorageAccessUserGesture=document.requestStorageAccess() kan kun anmodes om fra en hurtig, brugergenereret event handler.
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented=For mange kald til Location- eller History-API'er indenfor en kort tidsperiode.
+FolderUploadPrompt.title = Bekræft upload
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = Er du sikker på, at du vil uploade alle filer fra "%S"? Gør det kun, hvis du stoler på dette websted.
+FolderUploadPrompt.acceptButtonLabel = Upload
+InputPickerBlockedNoUserActivation=<input>-vælgeren blev blokeret på grund af manglende bruger-aktivering.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe med ekstern protokol blev blokeret på grund af manglende bruger-aktivering, eller fordi der ikke er gået tilstrækkelig lang tid, siden en sådan iframe senest blev indlæst.
+MultiplePopupsBlockedNoUserActivation=Åbning af flere pop op-vinduer blev blokeret på grund af manglende bruger-aktivering.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Forhåndsindlæsning af %S blev ignoreret på grund af en ukendt "as"- eller "type"-egenskab, eller på grund af, at en "media"-egenskab ikke stemte overens.
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/da/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/da/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:34.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Hentningsfejl
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Filhentningen kan ikke gemmes, fordi den er blokeret af %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Filhentningen kan ikke gemmes, fordi den er blokeret af en udvidelse.
 downloadErrorGeneric=Denne filhentning kan ikke gemmes på grund af en ukendt fejl.\n\nPrøv venligst igen.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=FÃ¥ sekunder tilbage
 timeUnknown2=Kan ikke beregne resterende tid
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S ressource
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/da/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/da/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:34.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Forbindelse til proxyserver nægtet
 check_error-2153390069=Serverens certifikat er udløbet (Opdater venligst din systemtid til det korrekte klokkeslet, hvis dette er forkert)
 check_error-verification_failed=Integriteten af opdateringen kunne ikke bekræftes
+check_error-move_failed=Kunne ikke forberede installering af opdateringen
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/da/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/da/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -62,6 +62,9 @@
 app-basics-build-config = Byggekonfiguration
 app-basics-user-agent = User Agent
 app-basics-os = Styresystem
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta Translated
 app-basics-memory-use = Hukommelsesforbrug
 app-basics-performance = Ydelse
 app-basics-service-workers = Registrerede Service Workers
@@ -185,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Tredjeparts-moduler
+support-third-party-modules-module = Modulfil
+support-third-party-modules-version = Filversion
+support-third-party-modules-vendor = Information om leverandør
+support-third-party-modules-occurrence = Forekomster
+support-third-party-modules-process = Proces-type og -ID
+support-third-party-modules-thread = Tråd
+support-third-party-modules-base = Imagebase-adresse
+support-third-party-modules-uptime = Oppetid for proces (ms)
+support-third-party-modules-duration = Indlæsningstid (ms)
+support-third-party-modules-empty = Ingen tredjeparts-moduler blev indlæst.
+support-third-party-modules-no-value = (Ingen værdi)
+support-third-party-modules-button-open =
+    .title = Åbn filplacering…
+support-third-party-modules-expand =
+    .title = Vis detaljeret information
+support-third-party-modules-collapse =
+    .title = Skjul detaljeret information
+support-third-party-modules-unsigned-icon =
+    .title = Dette modul er ikke signeret
+support-third-party-modules-folder-icon =
+    .title = Åbn filplacering…
+support-third-party-modules-down-icon =
+    .title = Vis detaljeret information
+support-third-party-modules-up-icon =
+    .title = Skjul detaljeret information
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/da/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/da/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Understøttelse af flere billede-i-billede
 experimental-features-multi-pip-description = Eksperimentel understøttelse for, at flere videoer kan vises som billede-i-billede på samme tid.
+experimental-features-http3 =
+    .label = HTTP/3-protokol
+experimental-features-http3-description = Eksperimentel understøttelse for HTTP/3-protokollen.
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/da/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/da/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Side:
     .accesskey = S
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } af { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Sidste side
-
+printpreview-homearrow-button =
+    .title = Første side
+printpreview-previousarrow-button =
+    .title = Forrige side
+printpreview-nextarrow-button =
+    .title = Næste side
+printpreview-endarrow-button =
+    .title = Sidste side
diff -Nru firefox-84.0.2+build1/l10n/da/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/da/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/da/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:29:40.000000000 +0000
+++ firefox-85.0+build1/l10n/da/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:34.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = til
+printui-page-custom-range-input =
+    .aria-label = Indtast tilpasset sideinterval
+    .placeholder = Fx 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopier
 printui-orientation = Orientering
@@ -48,6 +51,7 @@
 printui-options = Indstillinger
 printui-headers-footers-checkbox = Print sidehoveder og sidefødder
 printui-backgrounds-checkbox = Udskriv baggrunde
+printui-selection-checkbox = Udskriv kun det markerede
 printui-color-mode-label = Farvetilstand
 printui-color-mode-color = Farve
 printui-color-mode-bw = Sort-hvid
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Ingen
 printui-margins-custom = Tilpasset
+printui-margins-custom-inches = Tilpasset (tommer)
 printui-margins-custom-top = Top
+printui-margins-custom-top-inches = Top (tommer)
 printui-margins-custom-bottom = Bund
+printui-margins-custom-bottom-inches = Bund (tommer)
 printui-margins-custom-left = Venstre
+printui-margins-custom-left-inches = Venstre (tommer)
 printui-margins-custom-right = Højre
+printui-margins-custom-right-inches = Højre (tommer)
 printui-system-dialog-link = Udskriv ved brug af system-dialogen…
 printui-primary-button = Udskriv
 printui-primary-button-save = Gem
 printui-cancel-button = Annuller
+printui-close-button = Luk
 printui-loading = Forbereder forhåndsvisning
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vis udskrift
+printui-pages-per-sheet = Sider pr. ark
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Udskriver…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/de/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/aboutCertError.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/aboutCertError.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -5,83 +5,57 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } verwendet ein ungültiges Sicherheitszertifikat.
-
 cert-error-mitm-intro = Websites bestätigen ihre Identität mittels Zertifikaten, welche von Zertifizierungsstellen ausgegeben werden.
-
 cert-error-mitm-mozilla = { -brand-short-name } wird von der gemeinnützigen Mozilla-Organisation unterstützt, welche eine vollständig offene Datenbank für Zertifizierungsstellen (CA Store) betreibt. Diese Datenbank hilft bei der Sicherstellung, dass Zertifizierungsstellen sich an Sicherheitsrichtlinien für die Anwendersicherheit halten.
-
 cert-error-mitm-connection = { -brand-short-name } verwendet Mozillas Datenbank für Zertifizierungsstellen (CA Store) anstatt durch das Betriebssystem bereitgestellte Zertifikate, um zu überprüfen, ob eine Verbindung sicher ist. Wenn ein Antivirusprogramm oder das Netzwerk sich in eine Verbindung einklinkt und dafür ein Sicherheitszertifikat einer Zertifizierungsstelle verwendet, welche sich nicht in Mozillas Datenbank für Zertifizierungsstellen befindet, so wird die Verbindung daher als nicht sicher betrachtet.
-
 cert-error-trust-unknown-issuer-intro = Eventuell täuscht jemand die Website vor und es sollte nicht fortgefahren werden.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
-cert-error-trust-unknown-issuer = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut { $hostname } nicht, weil der Aussteller des Zertifikats unbekannt ist, das Zertifikat vom Austeller selbst signiert wurde oder der Server nicht die korrekten Zwischen-Zertifikate sendet.
-
+cert-error-trust-unknown-issuer = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut { $hostname } nicht, weil der Aussteller des Zertifikats unbekannt ist, das Zertifikat vom Aussteller selbst signiert wurde oder der Server nicht die korrekten Zwischen-Zertifikate sendet.
 cert-error-trust-cert-invalid = Dem Zertifikat wird nicht vertraut, weil es von einem ungültigen Zertifizierungsstellen-Zertifikat ausgestellt wurde.
-
 cert-error-trust-untrusted-issuer = Dem Zertifikat wird nicht vertraut, weil dem Aussteller-Zertifikat nicht vertraut wird.
-
 cert-error-trust-signature-algorithm-disabled = Dem Zertifikat wird nicht vertraut, weil es mit einem Signatur-Algorithmus signiert wurde, der deaktiviert wurde, weil er nicht sicher ist.
-
 cert-error-trust-expired-issuer = Dem Zertifikat wird nicht vertraut, weil das Aussteller-Zertifikat abgelaufen ist.
-
 cert-error-trust-self-signed = Dem Zertifikat wird nicht vertraut, weil es vom Aussteller selbst signiert wurde.
-
 cert-error-trust-symantec = Von GeoTrust, RapidSSL, Symantec, Thawte oder VeriSign ausgestellte Zertifikate werden nicht mehr als vertrauenswürdig eingestuft, da sich die ausstellende Organisationen in der Vergangenheit nicht an Sicherheitsregeln gehalten haben.
-
 cert-error-untrusted-default = Das Zertifikat kommt nicht von einer vertrauenswürdigen Quelle.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-domain-mismatch = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut dieser Website nicht, weil das von der Website verwendete Zertifikat nicht für { $hostname } gilt.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut dieser Website nicht, weil das von der Website verwendete Zertifikat nicht für { $hostname } gilt. Das Zertifikat ist nur gültig für <a data-l10n-name="domain-mismatch-link">{ $alt-name }</a>.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single-nolink = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut dieser Website nicht, weil das von der Website verwendete Zertifikat nicht für { $hostname } gilt. Das Zertifikat ist nur gültig für { $alt-name }.
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = Websites bestätigen ihre Identität mittels Zertifikaten. { -brand-short-name } vertraut dieser Website nicht, weil das von der Website verwendete Zertifikat nicht für { $hostname } gilt. Das Zertifikat gilt nur für folgende Namen: { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = Websites bestätigen ihre Identität mittels Zertifikaten, welche für einen bestimmten Zeitraum gültig sind. Das Zertifikat für { $hostname } ist am { $not-after-local-time } abgelaufen.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = Websites bestätigen ihre Identität mittels Zertifikaten, welche für einen bestimmten Zeitraum gültig sind. Das Zertifikat für { $hostname } wird erst am { $not-before-local-time } gültig.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Fehlercode: <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = Websites bestätigen ihre Identität mittels Zertifikaten, welche von Zertifizierungsstellen ausgegeben werden. Die meisten Browser vertrauen Zertifikaten nicht mehr, welche von GeoTrust, RapidSSL, Symantec, Thawte oder VeriSign ausgestellt wurden. { $hostname } verwendet ein Zertifikat von einer dieser Zertifizierungsstellen, weshalb die Identität der Website nicht bestätigt werden kann.
-
 cert-error-symantec-distrust-admin = Sie können den Website-Administrator über das Problem benachrichtigen.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP Strict Transport Security: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = HTTP Public Key Pinning: { $hasHPKP }
-
 cert-error-details-cert-chain-label = Zertifikatskette:
-
 open-in-new-window-for-csp-or-xfo-error = Seite in neuem Tab öffnen
-
 # Variables:
 # $hostname (String) - Hostname of the website blocked by csp or xfo error.
 csp-xfo-blocked-long-desc = Zu Ihrem Schutz erlaubt { $hostname } es { -brand-short-name } nicht, diese Seite anzuzeigen, wenn sie in eine andere Seite eingebettet ist. Zur Anzeige der Seite muss diese in einem neuen Tab geöffnet werden.
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/de/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/aboutLogins.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/aboutLogins.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Diese Zugangsdaten entfernen?
 confirm-delete-dialog-message = Diese Aktion kann nicht rückgängig gemacht werden.
 about-logins-confirm-remove-dialog-confirm-button = Entfernen
-about-logins-confirm-remove-all-dialog-confirm-button = Alle entfernen
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Entfernen
+        [one] Entfernen
+       *[other] Alle entfernen
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, diese Zugangsdaten entfernen
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Zugangsdaten und Passwörter exportieren
 about-logins-confirm-export-dialog-message = Ihre Passwörter werden als lesbarer Text gespeichert (z.B. P@ssw0rt). Dadurch hat jede Person, welche die exportierte Datei öffnen kann, Zugriff auf das unverschlüsselte Passwort.
 about-logins-confirm-export-dialog-confirm-button = Exportieren…
+about-logins-alert-import-title = Importieren abgeschlossen
+about-logins-alert-import-message = Detaillierte Import-Zusammenfassung anzeigen
 confirm-discard-changes-dialog-title = Nicht gespeicherte Änderungen verwerfen?
 confirm-discard-changes-dialog-message = Alle nicht gespeicherten Änderungen gehen verloren.
 confirm-discard-changes-dialog-confirm-button = Verwerfen
@@ -262,3 +269,30 @@
         [macos] CSV-Dokument
        *[other] CSV-Datei
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importieren abgeschlossen
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Neue Zugangsdaten hinzugefügt:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Neue Zugangsdaten hinzugefügt:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Bestehende Zugangsdaten aktualisiert:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Bestehende Zugangsdaten aktualisiert:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Doppelte Zugangsdaten gefunden:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+       *[other] <span>Doppelte Zugangsdaten gefunden:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Fehler:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+       *[other] <span>Fehler:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+    }
+about-logins-import-dialog-done = Fertig
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/de/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/appmenu.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/appmenu.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = ­Neues Fenster
+appmenuitem-new-private-window =
+    .label = Neues privates Fenster
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Vergrößern
 appmenuitem-zoom-reduce =
     .label = Verkleinern
+appmenuitem-fullscreen =
+    .label = Vollbild
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Jetzt synchronisieren
+appmenuitem-save-page =
+    .label = Seite speichern unter…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Neue Funktionen und Änderungen
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/de/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/appMenuNotifications.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Nicht jetzt
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Nach einem schnellen Neustart des Browsers wird { -brand-shorter-name } alle offenen Tabs und Fenster wiederherstellen, die sich nicht im Privaten Modus befinden.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kann nicht automatisch auf die neueste Version aktualisiert werden.
+    .buttonlabel = { -brand-shorter-name } trotzdem aktualisieren
+    .buttonaccesskey = a
+    .secondarybuttonlabel = Nicht jetzt
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Ein neues { -brand-shorter-name }-Update ist verfügbar. Es kann aber nicht installiert werden, weil eine andere Kopie von { -brand-shorter-name } ausgeführt wird. Schließen Sie diese, um das Update fortzusetzen, oder führen Sie das Update trotzdem durch (die andere Kopie funktioniert möglicherweise nicht korrekt, bis Sie jene neu starten).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/browser.ftl firefox-85.0+build1/l10n/de/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/browser.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/browser.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> kontrolliert den Mauszeiger. Drücken Sie die Esc-Taste, wenn Sie wieder die Kontrolle übernehmen wollen.
 pointerlock-warning-no-domain = Dieses Dokument kontrolliert den Mauszeiger. Drücken Sie die Esc-Taste, wenn Sie wieder die Kontrolle übernehmen wollen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Lesezeichen verwalten
+bookmarks-recent-bookmarks =
+    .value = Kürzlich als Lesezeichen gesetzt
+bookmarks-toolbar-chevron =
+    .tooltiptext = Weitere Lesezeichen anzeigen
+bookmarks-sidebar-content =
+    .aria-label = Lesezeichen
+bookmarks-menu-button =
+    .label = Lesezeichen-Menü
+bookmarks-other-bookmarks-menu =
+    .label = Weitere Lesezeichen
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobile Lesezeichen
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Lesezeichen-Sidebar schließen
+           *[other] Lesezeichen-Sidebar anzeigen
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Lesezeichen-Symbolleiste ausblenden
+           *[other] Lesezeichen-Symbolleiste anzeigen
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Lesezeichen-Menü aus Symbolleiste entfernen
+           *[other] Lesezeichen-Menü zur Symbolleiste hinzufügen
+        }
+bookmarks-search =
+    .label = Lesezeichen durchsuchen
+bookmarks-tools =
+    .label = Lesezeichen-Werkzeuge
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Lesezeichen-Symbolleiste
+    .accesskey = L
+    .aria-label = Lesezeichen
+bookmarks-toolbar-menu =
+    .label = Lesezeichen-Symbolleiste
+bookmarks-toolbar-placeholder =
+    .title = Lesezeichen-Symbole
+bookmarks-toolbar-placeholder-button =
+    .label = Lesezeichen-Symbole
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Lesezeichen
+library-bookmarks-bookmark-this-page =
+    .label = Lesezeichen hinzufügen
+library-bookmarks-bookmark-edit =
+    .label = Lesezeichen bearbeiten
+library-recent-activity-label = Jüngste Aktivität
+
+## More items
+
+more-menu-go-offline =
+    .label = Offline arbeiten
+    .accesskey = O
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/de/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/newtab/asrouter.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Weniger Tippen und mehr Finden mit der Adressleiste
 cfr-whatsnew-searchbar-body-topsites = Klicken Sie einfach in die Adressleiste, um ein Auswahlmenü mit Ihren „Wichtigen Seiten“ anzuzeigen.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Lupensymbol
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Suchmaschinen-Schlüsselwörter in der Adressleiste
 cfr-whatsnew-search-shortcuts-body = Wenn Sie nun eine Suchmaschine oder eine bestimmte Website in die Adressleiste eingeben, wird in den Suchvorschlägen unten ein blaues Schlüsselwort angezeigt. Wählen Sie dieses Schlüsselwort aus, um Ihre Suche direkt in der Adressleiste abzuschließen.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Schutz vor böswilligen Supercookies
+cfr-whatsnew-supercookies-body = Websites können Ihrem Browser heimlich einen "Supercookie" hinzufügen, der Sie im Internet verfolgen kann, selbst nachdem Sie Ihre Cookies gelöscht haben. { -brand-short-name } bietet jetzt einen starken Schutz vor Supercookies, damit diese nicht verwendet werden können, um Ihre Online-Aktivitäten von einer Website zur nächsten zu verfolgen.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Bessere Lesezeichen-Verwaltung
+cfr-whatsnew-bookmarking-body = Es ist einfacher, Ihre Lieblingsseiten im Auge zu behalten. { -brand-short-name } merkt sich jetzt Ihren bevorzugten Ort für gespeicherte Lesezeichen, zeigt die Lesezeichen-Symbolleiste standardmäßig in neuen Tabs an und verschafft Ihnen über einen Symbolleisten-Ordner einfachen Zugang zu Ihren übrigen Lesezeichen.
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/de/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/newtab/newtab.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Neuer Tab
 newtab-settings-button =
     .title = Einstellungen für neue Tabs anpassen
+newtab-personalize-button-label = Anpassen
+    .title = Neuen Tab anpassen
+    .aria-label = Neuen Tab anpassen
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Das Web durchsuchen
     .title = Das Web durchsuchen
     .aria-label = Das Web durchsuchen
+newtab-search-box-text = Das Web durchsuchen
+newtab-search-box-input =
+    .placeholder = Das Web durchsuchen
+    .aria-label = Das Web durchsuchen
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Suchmaschine hinzufügen
 newtab-topsites-add-topsites-header = Neue wichtige Seite
+newtab-topsites-add-shortcut-header = Neue Verknüpfung
 newtab-topsites-edit-topsites-header = Wichtige Seite bearbeiten
+newtab-topsites-edit-shortcut-header = Verknüpfung bearbeiten
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Name eingeben
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Beim Laden dieses Inhalts ist ein Fehler aufgetreten.
 newtab-error-fallback-refresh-link = Aktualisieren Sie die Seite, um es erneut zu versuchen.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Verknüpfungen
+newtab-custom-shortcuts-subtitle = Websites, die Sie speichern oder besuchen
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } Zeile
+       *[other] { $num } Zeilen
+    }
+newtab-custom-sponsored-sites = Gesponserte Verknüpfungen
+newtab-custom-pocket-title = Empfohlen von { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Besondere Inhalte ausgewählt von { -pocket-brand-name }, Teil der { -brand-product-name }-Familie
+newtab-custom-pocket-sponsored = Gesponserte Inhalte
+newtab-custom-recent-title = Neueste Aktivität
+newtab-custom-recent-subtitle = Eine Auswahl kürzlich besuchter Websites und Inhalte
+newtab-custom-close-button = Schließen
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Kurzinformationen
+newtab-custom-snippets-subtitle = Tipps und Neuigkeiten von { -vendor-short-name } und { -brand-product-name }
+newtab-custom-settings = Weitere Einstellungen verwalten
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/pageInfo.ftl firefox-85.0+build1/l10n/de/browser/browser/pageInfo.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/pageInfo.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/pageInfo.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -143,7 +143,7 @@
     .value = Diese Website stellt keine Informationen über den Besitzer zur Verfügung.
 media-select-folder = Wählen Sie einen Ordner, um die Grafiken zu speichern
 media-unknown-not-cached =
-    .value = Unbekannt (nicht gecacht)
+    .value = Unbekannt (nicht im Cache)
 permissions-use-default =
     .label = Standard verwenden
 security-no-visits = Nein
@@ -224,7 +224,7 @@
 # This string is used to display the URL of the website on top of the
 # pageInfo dialog box
 # Variables:
-#   $website (string) - The url of the website pageInfo is getting info for
+#   $website (string) — The url of the website pageInfo is getting info for
 page-info-page =
     .title = Seiteninformationen - { $website }
 page-info-frame =
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/places.ftl firefox-85.0+build1/l10n/de/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/places.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/places.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Unterordner
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Weitere Lesezeichen
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/de/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/preferences/preferences.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Die von Ihnen am meisten besuchten Websites
 home-prefs-topsites-by-option-sponsored =
     .label = Gesponserte wichtige Seiten
+home-prefs-shortcuts-header =
+    .label = Verknüpfungen
+home-prefs-shortcuts-description = Websites, die Sie speichern oder besuchen
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Gesponserte Verknüpfungen
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Empfohlen von { $provider }
 home-prefs-recommended-by-description-update = Besondere Inhalte aus dem ganzen Internet, ausgewählt von { $provider }
+home-prefs-recommended-by-description-new = Besondere Inhalte ausgewählt von { $provider }, Teil der { -brand-product-name }-Familie
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Gesponserte Inhalte
 home-prefs-highlights-header =
     .label = Ãœberblick
-home-prefs-recent-activity-header =
-    .label = Neueste Aktivität
 home-prefs-highlights-description = Eine Auswahl von Websites, die Sie gespeichert oder besucht haben
 home-prefs-highlights-option-visited-pages =
     .label = Besuchte Seiten
@@ -526,6 +530,9 @@
     .label = Neueste Downloads
 home-prefs-highlights-option-saved-to-pocket =
     .label = Bei { -pocket-brand-name } gespeicherte Seiten
+home-prefs-recent-activity-header =
+    .label = Neueste Aktivität
+home-prefs-recent-activity-description = Eine Auswahl kürzlich besuchter Websites und Inhalte
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Kurzinformationen
 home-prefs-snippets-description = Neuigkeiten von { -vendor-short-name } und { -brand-product-name }
+home-prefs-snippets-description-new = Tipps und Neuigkeiten von { -vendor-short-name } und { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Offene Tabs
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Verknüpfungen
+    .accesskey = V
 addressbar-locbar-topsites-option =
     .label = Wichtige Seiten
     .accesskey = W
+addressbar-locbar-engines-option =
+    .label = Suchmaschinen
+    .accesskey = a
 addressbar-suggestions-settings = Einstellungen für Suchvorschläge ändern
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/de/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/de/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/de/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Nur bei neuem Tab
     .accesskey = u
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Immer anzeigen
+    .accesskey = I
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nie anzeigen
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Nur bei neuem Tab anzeigen
+    .accesskey = u
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Weitere Lesezeichen anzeigen
     .accesskey = W
diff -Nru firefox-84.0.2+build1/l10n/de/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/de/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/de/browser/chrome/browser/accounts.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/chrome/browser/accounts.properties	2021-01-18 20:02:44.000000000 +0000
@@ -71,7 +71,7 @@
 # Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
 # and the Sync account is unverified. Redirects to the Sync preferences page.
 sendTabToDevice.verify.status = Konto nicht verifiziert
-sendTabToDevice.verify = Konto verifzieren…
+sendTabToDevice.verify = Konto verifizieren…
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
 # multipleTabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
diff -Nru firefox-84.0.2+build1/l10n/de/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/de/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/de/browser/chrome/browser/browser.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/chrome/browser/browser.properties	2021-01-18 20:02:44.000000000 +0000
@@ -553,14 +553,14 @@
 protections.blocking.cookies.all.title=Alle Cookies blockiert
 protections.blocking.cookies.unvisited.title=Cookies von nicht besuchten Websites blockiert
 protections.blocking.trackingContent.title=Inhalte zur Aktivitätenverfolgung blockiert
-protections.blocking.socialMediaTrackers.title=Skripte zur Aktivitätenverfolgung duch soziale Netzwerke blockiert
+protections.blocking.socialMediaTrackers.title=Skripte zur Aktivitätenverfolgung durch soziale Netzwerke blockiert
 protections.notBlocking.fingerprinters.title=Identifizierer (Fingerprinter) nicht blockiert
 protections.notBlocking.cryptominers.title=Heimliche Digitalwährungsberechner (Krypto-Miner) nicht blockiert
 protections.notBlocking.cookies.3rdParty.title=Cookies von Drittanbietern werden nicht blockiert
 protections.notBlocking.cookies.all.title=Cookies werden nicht blockiert
 protections.notBlocking.crossSiteTrackingCookies.title=Cookies zur seitenübergreifenden Aktivitätenverfolgung nicht blockiert
 protections.notBlocking.trackingContent.title=Inhalte zur Aktivitätenverfolgung nicht blockiert
-protections.notBlocking.socialMediaTrackers.title=Skripte zur Aktivitätenverfolgung duch soziale Netzwerke nicht blockiert
+protections.notBlocking.socialMediaTrackers.title=Skripte zur Aktivitätenverfolgung durch soziale Netzwerke nicht blockiert
 
 # Footer section in the Protections Panel
 # LOCALIZATION NOTE (protections.footer.blockedTrackerCounter.description,
diff -Nru firefox-84.0.2+build1/l10n/de/browser/chrome/browser/fxmonitor.properties firefox-85.0+build1/l10n/de/browser/chrome/browser/fxmonitor.properties
--- firefox-84.0.2+build1/l10n/de/browser/chrome/browser/fxmonitor.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/chrome/browser/fxmonitor.properties	2021-01-18 20:02:44.000000000 +0000
@@ -1,9 +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 https://mozilla.org/MPL/2.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/.
 
 # Header of the popup
@@ -25,7 +21,7 @@
 # #2: The name of the breached site.
 # #3: The year of the breach.
 # #4: The brand name ("Firefox Monitor").
-fxmonitor.popupText=#1 Konto von #2 wurde in #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.;#1 Konten von #2 wurden in #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.
+fxmonitor.popupText=#1 Konto von #2 wurde #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.;#1 Konten von #2 wurden #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.
 # 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.
@@ -38,7 +34,7 @@
 # #2: The name of the breached site.
 # #3: The year of the breach.
 # #4: The brand name ("Firefox Monitor").
-fxmonitor.popupTextRounded=Mehr als #1 Konto von #2 wurde in #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.;Mehr als #1 Konten von #2 wurden in #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.
+fxmonitor.popupTextRounded=Mehr als #1 Konto von #2 wurde #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.;Mehr als #1 Konten von #2 wurden #3 geknackt. Überprüfen Sie mit #4, ob Ihr Konto in Gefahr ist.
 # %S is replaced with fxmonitor.brandName.
 fxmonitor.checkButton.label=%S überprüfen
 fxmonitor.checkButton.accessKey=p
diff -Nru firefox-84.0.2+build1/l10n/de/browser/installer/custom.properties firefox-85.0+build1/l10n/de/browser/installer/custom.properties
--- firefox-84.0.2+build1/l10n/de/browser/installer/custom.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/browser/installer/custom.properties	2021-01-18 20:02:44.000000000 +0000
@@ -56,8 +56,8 @@
 ERROR_CREATE_DIRECTORY_PREFIX=Fehler beim Erstellen des Ordners:
 ERROR_CREATE_DIRECTORY_SUFFIX=Klicken Sie auf Abbrechen, um die Installation zu stoppen oder\nwiederholen, um es erneut zu versuchen.
 
-UN_CONFIRM_PAGE_TITLE=$BrandShortName deinstallieren
-UN_CONFIRM_PAGE_SUBTITLE=$BrandShortName vom Computer entfernen.
+UN_CONFIRM_PAGE_TITLE=$BrandFullName deinstallieren
+UN_CONFIRM_PAGE_SUBTITLE=$BrandFullName vom Computer entfernen.
 UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName wird von folgendem Ort deinstalliert:
 UN_CONFIRM_CLICK=Klicken Sie auf Deinstallieren, um fortzufahren.
 
diff -Nru firefox-84.0.2+build1/l10n/de/chat/twitter.properties firefox-85.0+build1/l10n/de/chat/twitter.properties
--- firefox-84.0.2+build1/l10n/de/chat/twitter.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/chat/twitter.properties	2021-01-18 20:02:44.000000000 +0000
@@ -118,3 +118,5 @@
 
 command.follow=%S &lt;Benutzername&gt;[ &lt;Benutzername&gt;]*: Einem oder mehreren Benutzer folgen.
 command.unfollow=%S &lt;Benutzername&gt;[ &lt;Benutzername&gt;]*: Einem oder mehreren Benutzer nicht mehr folgen.
+
+twitter.disabled=Twitter wird nicht mehr unterstützt, weil Twitter das Streaming-Protokoll abgeschaltet hat.
diff -Nru firefox-84.0.2+build1/l10n/de/devtools/client/markers.properties firefox-85.0+build1/l10n/de/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/de/devtools/client/markers.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/devtools/client/markers.properties	2021-01-18 20:02:44.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Wenig Speicher verfügbar
 marker.gcreason.label.CC_WAITING=Durch Cycle-Collection erzwungen
+marker.gcreason.label.CC_FINISHED=Cycle-Collection abgeschlossen
 marker.gcreason.label.CC_FORCED=Durch Cycle-Collection erzwungen
 marker.gcreason.label.LOAD_END=Seite fertig geladen
 marker.gcreason.label.PAGE_HIDE=In Hintergrund verschoben
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery-Collection
-
diff -Nru firefox-84.0.2+build1/l10n/de/devtools/client/toolbox.properties firefox-85.0+build1/l10n/de/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/de/devtools/client/toolbox.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/devtools/client/toolbox.properties	2021-01-18 20:02:44.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Datei in Stilbearbeitung öffnen
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Entwicklerwerkzeuge schließen
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Zusätzliche Konsole anzeigen
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/de/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/de/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/de/devtools/client/tooltips.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/devtools/client/tooltips.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> hat bei diesem Element keine Wirkung, weil es kein positioniertes Element ist.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> hat bei diesem Element keine Wirkung, weil <strong>overflow:hidden</strong> nicht gesetzt ist.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> hat bei diesem Element keine Wirkung, weil sein <strong>outline-style</strong> den Wert <strong>auto</strong> oder <strong>none</strong> hat.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> hat keine Wirkung auf interne Tabellenelemente.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> hat keine Wirkung auf interne Tabellenelemente außer Tabellenzellen.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Versuchen Sie, <strong>float</strong> zu entfernen oder <strong>display:block</strong> hinzuzufügen. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Versuchen Sie, die <strong>position</strong>-Eigenschaft auf etwas anderes als <strong>static</strong> zu setzen. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Versuchen Sie, <strong>overflow:hidden</strong> hinzuzufügen. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Versuchen Sie, die <strong>display</strong>-Eigenschaft auf etwas anderes als <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> oder <strong>table-footer-group</strong> zu setzen. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Versuchen Sie, die <strong>display</strong>-Eigenschaft auf etwas anderes als <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> oder <strong>table-footer-group</strong> zu setzen. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Versuchen Sie, die <strong>outline-style</strong>-Eigenschaft auf etwas anderes als <strong>auto</strong> oder<strong>none</strong> zu setzen. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/de/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/de/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/de/dom/chrome/dom/dom.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/dom/chrome/dom/dom.properties	2021-01-18 20:02:44.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input>-Auswahl wurde aufgrund fehlender Benutzeraktivierung blockiert.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe mit externem Protokoll wurde blockiert, weil keine Benutzeraktivierung stattfand oder weil seit dem letzten Laden eines solchen iframe nicht genügend Zeit vergangen ist.
 MultiplePopupsBlockedNoUserActivation=Das Öffnen mehrerer Popups wurde aufgrund fehlender Benutzeraktivierung blockiert.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Das Vorladen von %S wurde aufgrund unbekannter "as"- oder "type"-Werte oder nicht übereinstimmender "media"-Attribute ignoriert.
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/de/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/de/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:44.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Download-Fehler
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Der Download kann nicht gespeichert werden, da er von %S blockiert wird.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Der Download kann nicht gespeichert werden, weil er von einer Erweiterung blockiert wird.
 downloadErrorGeneric=Der Download kann nicht gespeichert werden, weil ein unbekannter Fehler aufgetreten ist.\n\nBitte versuchen Sie es nochmals.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Wenige Sekunden verbleibend
 timeUnknown2=Unbekannte Zeit verbleibend
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S-Ressource
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/de/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/de/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:44.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Proxy-Server-Verbindung verweigert
 check_error-2153390069=Server-Zertifikat ist abgelaufen (Überprüfen Sie bitte Datum und Uhrzeit der Systemuhr)
 check_error-verification_failed=Die Integrität des Updates konnte nicht sichergestellt werden
+check_error-move_failed=Fehler beim Vorbereiten des Updates für die Installation
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/de/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/de/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Module von Drittanbietern
+support-third-party-modules-module = Modul-Datei
+support-third-party-modules-version = Dateiversion
+support-third-party-modules-vendor = Herstellerinformationen
+support-third-party-modules-occurrence = Vorkommen
+support-third-party-modules-process = Prozesstyp & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Imagebase-Adresse
+support-third-party-modules-uptime = Prozesslaufzeit (ms)
+support-third-party-modules-duration = Ladedauer (ms)
+support-third-party-modules-empty = Es wurden keine Module von Drittanbietern geladen.
+support-third-party-modules-no-value = (Kein Wert)
+support-third-party-modules-button-open =
+    .title = Dateipfad öffnen…
+support-third-party-modules-expand =
+    .title = Detaillierte Informationen anzeigen
+support-third-party-modules-collapse =
+    .title = Detaillierte Informationen einklappen
+support-third-party-modules-unsigned-icon =
+    .title = Dieses Modul wurde nicht signiert
+support-third-party-modules-folder-icon =
+    .title = Dateipfad öffnen…
+support-third-party-modules-down-icon =
+    .title = Detaillierte Informationen anzeigen
+support-third-party-modules-up-icon =
+    .title = Detaillierte Informationen einklappen
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/de/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/de/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Unterstützung für mehrfaches Bild-im-Bild (PiP)
 experimental-features-multi-pip-description = Experimentelle Unterstützung für das gleichzeitige Öffnen mehrerer Bild-im-Bild-Fenster (PiP).
+experimental-features-http3 =
+    .label = HTTP/3-Protokoll
+experimental-features-http3-description = Experimentelle Unterstützung für das HTTP/3-Protokoll
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/de/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/de/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Seite:
     .accesskey = S
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } von { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Letzte Seite
-
+printpreview-homearrow-button =
+    .title = Erste Seite
+printpreview-previousarrow-button =
+    .title = Vorherige Seite
+printpreview-nextarrow-button =
+    .title = Nächste Seite
+printpreview-endarrow-button =
+    .title = Letzte Seite
diff -Nru firefox-84.0.2+build1/l10n/de/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/de/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/de/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:29:49.000000000 +0000
+++ firefox-85.0+build1/l10n/de/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:44.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = bis
+printui-page-custom-range-input =
+    .aria-label = Benutzerdefinierten Seitenbereich eingeben
+    .placeholder = z.B. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopien
 printui-orientation = Ausrichtung
@@ -48,6 +51,7 @@
 printui-options = Einstellungen
 printui-headers-footers-checkbox = Kopf- und Fußzeilen drucken
 printui-backgrounds-checkbox = Hintergrund drucken
+printui-selection-checkbox = Nur Auswahl drucken
 printui-color-mode-label = Farbmodus
 printui-color-mode-color = Farbe
 printui-color-mode-bw = Schwarz-weiß
@@ -56,19 +60,29 @@
 printui-margins-min = Minimal
 printui-margins-none = Keine
 printui-margins-custom = Benutzerdefiniert
+printui-margins-custom-inches = Benutzerdefiniert (Zoll)
 printui-margins-custom-top = Oben
+printui-margins-custom-top-inches = Oberseite (Zoll)
 printui-margins-custom-bottom = Unten
+printui-margins-custom-bottom-inches = Unterseite (Zoll)
 printui-margins-custom-left = Links
+printui-margins-custom-left-inches = Links (Zoll)
 printui-margins-custom-right = Rechts
+printui-margins-custom-right-inches = Rechts (Zoll)
 printui-system-dialog-link = Mit Systemdialog drucken…
 printui-primary-button = Drucken
 printui-primary-button-save = Speichern
 printui-cancel-button = Abbrechen
+printui-close-button = Schließen
 printui-loading = Vorschau wird vorbereitet
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Druckvorschau
+printui-pages-per-sheet = Seiten pro Blatt
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Drucken…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/dsb/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/aboutLogins.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/aboutLogins.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -171,7 +171,14 @@
 about-logins-confirm-remove-dialog-title = Toś to pśizjawjenje wótwónoźeś?
 confirm-delete-dialog-message = Toś ta akcija njedajo se anulěrowaś.
 about-logins-confirm-remove-dialog-confirm-button = Wótwónoźeś
-about-logins-confirm-remove-all-dialog-confirm-button = Wše wótwónoźeś
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Wótwónoźeś
+        [one] Wótwónoźeś
+        [two] Wše wótwónoźeś
+        [few] Wše wótwónoźeś
+       *[other] Wše wótwónoźeś
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Jo, toś to pśizjawjenje wótwónoźeś
@@ -213,6 +220,8 @@
 about-logins-confirm-export-dialog-title = Pśizjawjenja a gronidła eksportěrowaś
 about-logins-confirm-export-dialog-message = Wašo gronidła budu se ako cytajobny tekst składowaś (na pś. BadP@ass0rd), togodla móžo kuždy, kótaryž móžo eksportěrowanu dataju wócyniś, je wiźeś.
 about-logins-confirm-export-dialog-confirm-button = Eksportěrowaś…
+about-logins-alert-import-title = Importěrowanje dokóńćone
+about-logins-alert-import-message = Nadrobne importowe zespominanje pokazaÅ›
 confirm-discard-changes-dialog-title = Njeskłaźone změny zachyśiś?
 confirm-discard-changes-dialog-message = Wšykne njeskłaźone změny se zgubiju.
 confirm-discard-changes-dialog-confirm-button = Zachyśiś
@@ -274,3 +283,38 @@
         [macos] CSV-dokument
        *[other] CSV-dataja
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importěrowanje dokóńćone
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nowe pśizjawjenje pśidane:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Nowej pśizjawjeni pśidanej:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Nowe pśizjawjenja pśidane:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nowe pśizjawjenja pśidane:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Eksistěrujuce pśizjawjenje zaktualizěrowane:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Eksistěrujucej pśizjawjeni zaktualizěrowanej:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Eksistěrujuce pśizjawjenja zaktualizěrowane:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Eksistěrujuce pśizjawjenja zaktualizěrowane:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Dwójne pśizjawjenje namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowane)</span>
+        [two] <span>Dwójnej pśizjawjeni namakanej:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowanej)</span>
+        [few] <span>Dwójne pśizjawjenja namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowane)</span>
+       *[other] <span>Dwójne pśizjawjenja namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowane)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Zmólka:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowana)</span>
+        [two] <span>Zmólce:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowanej)</span>
+        [few] <span>Zmólki:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowane)</span>
+       *[other] <span>Zmólki:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportěrowane)</span>
+    }
+about-logins-import-dialog-done = Dokóńcone
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/dsb/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/appmenu.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/appmenu.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nowe wokno
+appmenuitem-new-private-window =
+    .label = Nowe priwatne wokno
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Pówětšyś
 appmenuitem-zoom-reduce =
     .label = Pómjeńšyś
+appmenuitem-fullscreen =
+    .label = Połna wobrazowka
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Něnto synchronizěrowaś
+appmenuitem-save-page =
+    .label = Bok składowaś ako…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Nowe funkcije a změny
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/dsb/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/appMenuNotifications.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Nic něnto
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = { -brand-shorter-name } pó malsnem znowegostartowanju swóje wócynjone rejtariki a wokna wótnowijo, kótarež njejsu w priwatnem modusu.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } njamóžo na nejnowšu wersiju awtomatiski aktualizěrowaś.
+    .buttonlabel = { -brand-shorter-name } weto aktualizěrowaś
+    .buttonaccesskey = a
+    .secondarybuttonlabel = Nic něnto
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Nowa aktualizacija { -brand-shorter-name } jo k dispoziciji, ale njedajo se instalěrowaś, dokulaž druga kopija { -brand-shorter-name } běžy. Zacyńśo ju, aby z aktualizaciju pókšacował, abo aktualizěrujśo weto (druga kopija pón snaź korektnje njefunkcioněrujo, daniž ju njestartujośo).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = W pórěźe, som zrozměł
     .buttonaccesskey = z
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/browser.ftl firefox-85.0+build1/l10n/dsb/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/browser.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/browser.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -507,3 +507,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ma kontrolu nad wašeju špěrku. Tłocćo Esc, aby kontrolu slědk dostał.
 pointerlock-warning-no-domain = Toś ten dokument ma kontrolu nad wašeju špěrku. Tłocćo Esc, aby kontrolu slědk dostał.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Wše cytańske znamjenja pokazaś
+bookmarks-recent-bookmarks =
+    .value = Tuchylu ako cytańske znamje składowane
+bookmarks-toolbar-chevron =
+    .tooltiptext = Dalšne cytańske znamjenja pokazaś
+bookmarks-sidebar-content =
+    .aria-label = Cytańske znamjenja
+bookmarks-menu-button =
+    .label = Meni cytańskich znamjenjow
+bookmarks-other-bookmarks-menu =
+    .label = Druge cytańske znamjenja
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilne cytańske znamjenja
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Bocnicu cytańskich znamjenjow schowaś
+           *[other] Bocnicu cytańskich znamjenjow pokazaś
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Rědku cytańskich znamjenjow schowaś
+           *[other] Rědku cytańskich znamjenjow pokazaś
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Meni cytańskich znamjenjow ze symboloweje rědki wótwónoźeś
+           *[other] Symbolowej rědce meni cytańskich znamjenjow pśidaś
+        }
+bookmarks-search =
+    .label = Cytańske znamjenja pytaś
+bookmarks-tools =
+    .label = Rědy za cytańske znamjenja
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Rědka cytańskich znamjenjow
+    .accesskey = c
+    .aria-label = Cytańske znamjenja
+bookmarks-toolbar-menu =
+    .label = Rědka cytańskich znamjenjow
+bookmarks-toolbar-placeholder =
+    .title = Zapiski rědki cytańskich znamjenjow
+bookmarks-toolbar-placeholder-button =
+    .label = Zapiski rědki cytańskich znamjenjow
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Cytańske znamjenja
+library-bookmarks-bookmark-this-page =
+    .label = Toś ten bok ako cytańske znamje składowaś
+library-bookmarks-bookmark-edit =
+    .label = Toś to cytańske znamje wobźěłaś
+library-recent-activity-label = Nejnowša aktiwita
+
+## More items
+
+more-menu-go-offline =
+    .label = Offline źěłaś
+    .accesskey = O
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/dsb/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/newtab/asrouter.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -63,7 +63,7 @@
         [few] { $total } wužywarje
        *[other] { $total } wužywarjow
     }
-cfr-doorhanger-pintab-description = Mějśo lažki pśistup k swójim nejwěcej wužywane sedła. Źaržćo sedła w rejtariku wócynjone (samo gaž znowego startujośo)
+cfr-doorhanger-pintab-description = Mějśo lažki pśistup k swójim nejcesćej wužywane sedła. Źaržćo sedła w rejtariku wócynjone (samo gaž znowego startujośo)
 
 ## These messages are steps on how to use the feature and are shown together.
 
@@ -128,6 +128,9 @@
 
 cfr-whatsnew-searchbar-title = Pišćo mjenjej a namakajśo wěcej z adresowym pólom
 cfr-whatsnew-searchbar-body-topsites = Wubjeŕśo něnto jadnorje adresowe pólo a  kašćik z wótkazami na waše nejlubše sedła se wócynijo.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Lupowy symbol
 
 ## Picture-in-Picture
@@ -286,3 +289,12 @@
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Pytańske skrotconki w adresowem pólu
+cfr-whatsnew-search-shortcuts-body = Něnto, gaž pytnicu abo wěste sedło do adresowego póla zapodawaśo, se módre zwězanje dołojce w pytańskich naraźenjach zjewijo. Wubjeŕśo toś to zwězanje, aby swójo pytanje direktnje z adresowego póla dokóńcył.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Šćit pśed złosnymi supercookiejami
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Lěpše zastojanje cytańskich zmanjenjow
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/dsb/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/newtab/newtab.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nowy rejtarik
 newtab-settings-button =
     .title = Bok wašogo nowego rejtarika pśiměriś
+newtab-personalize-button-label = Personalizěrowaś
+    .title = Nowy rejtarik personalizěrowaś
+    .aria-label = Nowy rejtarik personalizěrowaś
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Web pśepytaś
     .title = Web pśepytaś
     .aria-label = Web pśepytaś
+newtab-search-box-text = Web pśepytaś
+newtab-search-box-input =
+    .placeholder = Web pśepytaś
+    .aria-label = Web pśepytaś
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Pytnicu pśidaś
 newtab-topsites-add-topsites-header = Nowe nejcesćej woglědane sedło
+newtab-topsites-add-shortcut-header = Nowe zwězanje
 newtab-topsites-edit-topsites-header = Nejcesćej woglědane sedło wobźěłaś
+newtab-topsites-edit-shortcut-header = Zwězanje wobźěłaś
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Titel zapódaś
@@ -207,3 +216,29 @@
 
 newtab-error-fallback-info = Hopla, pśi cytanju toś togo wopśimjeśa njejo se něco raźiło.
 newtab-error-fallback-refresh-link = Aktualizěrujśo bok, aby hyšći raz wopytał.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Zwězanja
+newtab-custom-shortcuts-subtitle = Sedła, kótarež składujośo abo ku kótarymž se woglědujośo
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } smužka
+        [two] { $num } smužce
+        [few] { $num } smužki
+       *[other] { $num } smužkow
+    }
+newtab-custom-sponsored-sites = Sponsorowane zwězanja
+newtab-custom-pocket-title = Wót { -pocket-brand-name } dopórucone
+newtab-custom-pocket-subtitle = Wósebne wopśimjeśe, wubrane pśez { -pocket-brand-name }, źěla swójźby { -brand-product-name }
+newtab-custom-pocket-sponsored = Sponsorowane tšojeńka
+newtab-custom-recent-title = Nejnowša aktiwita
+newtab-custom-recent-subtitle = Wuběrk nejnowšych sedłow a nejnowšego wopśimjeśa
+newtab-custom-close-button = ZacyniÅ›
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Kuski
+newtab-custom-snippets-subtitle = Pokazki a nowosći wót { -vendor-short-name } a { -brand-product-name }
+newtab-custom-settings = Dalšne nastajenja zastojaś
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/places.ftl firefox-85.0+build1/l10n/dsb/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/places.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/places.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Pódzarědnik
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Druge cytańske znamjenja
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/dsb/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/preferences/preferences.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -356,7 +356,7 @@
 
 drm-content-header = Wopśimjeśe Digital Right Management (DRM)
 play-drm-content =
-    .label = Wopśimjeśe wóźony pśez DRM wótgraś
+    .label = Wopśimjeśe wóźone pśez DRM wótgraś
     .accesskey = m
 play-drm-content-learn-more = Dalšne informacije
 update-application-title = Aktualizacije { -brand-short-name }
@@ -506,6 +506,11 @@
 home-prefs-topsites-description = Sedła, ku kótarymž se nejcesćej woglědujośo
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsorowane nejlubše sedła
+home-prefs-shortcuts-header =
+    .label = Zwězanja
+home-prefs-shortcuts-description = Sedła, kótarež składujośo abo ku kótarymž se woglědujośo
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsorowane zwězanja
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -513,6 +518,7 @@
 home-prefs-recommended-by-header =
     .label = Wót { $provider } dopórucony
 home-prefs-recommended-by-description-update = Wurědne wopśimjeśe z cełego weba, wubrane wót { $provider }
+home-prefs-recommended-by-description-new = Wósebne wopśimjeśe, wubrane pśez { $provider }, źěla swójźby { -brand-product-name }
 
 ##
 
@@ -521,8 +527,6 @@
     .label = Sponsorowane tšojenja pokazaś
 home-prefs-highlights-header =
     .label = Wjerški
-home-prefs-recent-activity-header =
-    .label = Najnowša aktiwita
 home-prefs-highlights-description = Wuběrk websedłow, kótarež sćo składował abo se woglědał
 home-prefs-highlights-option-visited-pages =
     .label = Woglědane boki
@@ -532,6 +536,9 @@
     .label = Nejnowše ześěgnjenje
 home-prefs-highlights-option-saved-to-pocket =
     .label = Boki skłaźone do { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Najnowša aktiwita
+home-prefs-recent-activity-description = Wuběrk nejnowšych sedłow a nejnowšego wopśimjeśa
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -539,6 +546,7 @@
 home-prefs-snippets-header =
     .label = Kuski
 home-prefs-snippets-description = Aktualizacije wót { -vendor-short-name } a { -brand-product-name }
+home-prefs-snippets-description-new = Pokazki a nowosći wót { -vendor-short-name } a { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -932,9 +940,16 @@
 addressbar-locbar-openpage-option =
     .label = Wócynjone rejtariki
     .accesskey = r
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Zwězanja
+    .accesskey = Z
 addressbar-locbar-topsites-option =
     .label = Nejcesćej woglědane sedła
     .accesskey = N
+addressbar-locbar-engines-option =
+    .label = Pytnice
+    .accesskey = P
 addressbar-suggestions-settings = Nastajenja za naraźenja pytnice změniś
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/dsb/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/dsb/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/dsb/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -63,6 +63,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Jano w nowem rejtariku
     .accesskey = J
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Pśecej pokazaś
+    .accesskey = P
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nigda njepokazaÅ›
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Jano w nowem rejtariku pokazaÅ›
+    .accesskey = J
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Druge cytańske znamjenja pokazaś
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/dsb/devtools/client/markers.properties firefox-85.0+build1/l10n/dsb/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/dsb/devtools/client/markers.properties	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/devtools/client/markers.properties	2021-01-18 20:02:49.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Mało składa
 marker.gcreason.label.CC_WAITING=Pśez Cycle Collection wunuźony
+marker.gcreason.label.CC_FINISHED=Cyklusowa zběrka dokóńcona
 marker.gcreason.label.CC_FORCED=Pśez Cycle Collection wunuźony
 marker.gcreason.label.LOAD_END=Bok jo dozacytany
 marker.gcreason.label.PAGE_HIDE=Do slězyny pśesunjony
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Zběrka Nursery
-
diff -Nru firefox-84.0.2+build1/l10n/dsb/devtools/client/toolbox.properties firefox-85.0+build1/l10n/dsb/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/dsb/devtools/client/toolbox.properties	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/devtools/client/toolbox.properties	2021-01-18 20:02:49.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Dataju w stilowem editorje wócyniś
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Wuwijaŕske rědy zacyniś
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Rozdźělonu konsolu pokazaś
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/dsb/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/dsb/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/dsb/devtools/client/tooltips.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/devtools/client/tooltips.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> njama efekt na toś ten element, dokulaž njejo pozicioněrowany element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> njama efekt na toś ten element, dokulaž gódnota <strong>overflow:hidden</strong> njejo nastajona.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> se na toś ten element njewustatkujo, dokulaž jogo <strong>outline-style</strong> jo <strong>auto</strong> abo <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> njama žeden efekt na interne tabelowe elementy.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> njama žeden efekt na interne tabelowe elementy mimo tabelowych celow.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Wopytajśo <strong>float</strong> wotstronić abo <strong>display:block</strong> pśidaś. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Wopytajśo jogo kakosć <strong>position</strong> na něco druge ako <strong>static</strong> nastajiś. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Wopytajśo <strong>overflow:hidden</strong> pśidaś. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Wopytajśo kakosć <strong>display</strong> na něco druge ako <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row.group</strong> abo <strong>table-footer-group</strong> stajiś. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Wopytajśo kakosć <strong>display</strong> na něco druge ako <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row.group</strong> abo <strong>table-footer-group</strong> stajiś. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Wopytajśo kakosć <strong>outline-style</strong> na něco druge ako <strong>auto</strong> abo <strong>none</strong> stajiś. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/dsb/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/dsb/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/dsb/dom/chrome/dom/dom.properties	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/dom/chrome/dom/dom.properties	2021-01-18 20:02:49.000000000 +0000
@@ -424,3 +424,7 @@
 FolderUploadPrompt.message = Cośo napšawdu wšykne dataje z “%S� nagraś? Cyńśo to jano, jolic sedłoju dowěriśo.
 FolderUploadPrompt.acceptButtonLabel = NagraÅ›
 InputPickerBlockedNoUserActivation=Selektor <input> jo se zablokěrował, dokulaž wužywaŕska aktiwacija felujo.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe z eksternym protokolom jo se zablokěrował, dokulaž njejo se wužywaŕske aktiwěrowanje njewótměło abo dokulaž njejo dosć casa zajšeł, wót togo casa, ako slědny iframe jo se zacytał.
+MultiplePopupsBlockedNoUserActivation=Wócynjanje někotarych wuskokujucych woknow jo se zablokěrowało, dokulaž wužywaŕske aktiwěrowanje felujo.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Pśedcytanje URL %S jo se ignorěrowało njeznatych gódnotow „as“ abo „type“ abo njepśigódnego atributa „media“ dla.
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:49.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d;d
 
 downloadErrorAlertTitle=Ześěgnjeńska zmólka
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Ześěgnjenje njedajo se składowaś, dokulaž se pśez %S blokěrujo.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Ześěgnjenje njedajo se składowaś, dokulaž se pśez rozšyrjenje blokěrujo.
 downloadErrorGeneric=Ześěgnjenje njedajo se składowaś, dokulaž njeznata zmólka jo nastała.\n\nPšosym wopytajśo hyšći raz.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Něco sekundow wušej
 timeUnknown2=Njeznaty cas wušej
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=Resursa %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/dsb/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/dsb/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:49.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Zwisk z proksyjowym serwerom wótpokazany
 check_error-2153390069=Serwerowy certifikat jo pśepadnjony (pšosym stajśo swój systemowy zeger na pšawy datum a pšawy cas, jolic stej wopak)
 check_error-verification_failed=Integrita aktualizacije njedajo se pśespytaś
+check_error-move_failed=Aktualizacija njedajo se za instalaciju pśigótowaś
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/dsb/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Module tśeśich póbitowarjow
+support-third-party-modules-module = Modulowa dataja
+support-third-party-modules-version = Datajowa wersija
+support-third-party-modules-vendor = Informacije zgótowjarja
+support-third-party-modules-occurrence = Wustupowanja
+support-third-party-modules-process = Procesowy typ a ID
+support-third-party-modules-thread = Nitka
+support-third-party-modules-base = Adresa Imagebase
+support-third-party-modules-uptime = Procesowy źěłowy cas (ms)
+support-third-party-modules-duration = Zacytański cas (ms)
+support-third-party-modules-empty = Module tśeśich póbitowarjow njejsu se zacytali.
+support-third-party-modules-no-value = (Žedna gódnota)
+support-third-party-modules-button-open =
+    .title = Datajowe městno wócyniś…
+support-third-party-modules-expand =
+    .title = Nadrobne informacije pokazaÅ›
+support-third-party-modules-collapse =
+    .title = Nadrobne informacije schowaÅ›
+support-third-party-modules-unsigned-icon =
+    .title = Toś ten modul njejo signěrowany
+support-third-party-modules-folder-icon =
+    .title = Datajowe městno wócyniś…
+support-third-party-modules-down-icon =
+    .title = Nadrobne informacije pokazaÅ›
+support-third-party-modules-up-icon =
+    .title = Nadrobne informacije schowaÅ›
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/dsb/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Wěcejrazowa pódpěra wobraz-we-wobrazu
 experimental-features-multi-pip-description = Eksperimentelna pódpěra za rownocasne wócynjanje někotarych woknow wobraz-we-wobrazu.
+experimental-features-http3 =
+    .label = Protokol HTTP/3
+experimental-features-http3-description = Eksperimentelna pódpěra za protokol HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/dsb/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Bok:
     .accesskey = B
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } z { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Slědny bok
-
+printpreview-homearrow-button =
+    .title = Prědny bok
+printpreview-previousarrow-button =
+    .title = Pjerwjejšny bok
+printpreview-nextarrow-button =
+    .title = Pśiducy bok
+printpreview-endarrow-button =
+    .title = Slědny bok
diff -Nru firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/dsb/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/dsb/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:29:53.000000000 +0000
+++ firefox-85.0+build1/l10n/dsb/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:49.000000000 +0000
@@ -27,6 +27,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Swójski wobceŕk bokow zapódaś
+    .placeholder = na pÅ›. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopije
 printui-orientation = Wusměrjenje
@@ -50,6 +53,7 @@
 printui-options = Nastajenja
 printui-headers-footers-checkbox = Głowy a nogi śišćaś
 printui-backgrounds-checkbox = Slězyny śišćaś
+printui-selection-checkbox = Jano wuběrk śišćas
 printui-color-mode-label = Barwowy modus
 printui-color-mode-color = Barwa
 printui-color-mode-bw = Carny a běły
@@ -58,19 +62,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Žedna
 printui-margins-custom = Swójske
+printui-margins-custom-inches = Swójske (cole)
 printui-margins-custom-top = Górjejce
+printui-margins-custom-top-inches = Górjejce (cole)
 printui-margins-custom-bottom = Dołojce
+printui-margins-custom-bottom-inches = Dołojce (cole)
 printui-margins-custom-left = Nalěwo
+printui-margins-custom-left-inches = Nalěwo (cole)
 printui-margins-custom-right = Napšawo
+printui-margins-custom-right-inches = Napšawo (cole)
 printui-system-dialog-link = Z pomocu systemowego dialoga śišćaś…
 printui-primary-button = Śišćaś
 printui-primary-button-save = Składowaś
 printui-cancel-button = Pśetergnuś
+printui-close-button = ZacyniÅ›
 printui-loading = Śišćarski pśeglěd pśigótowaś
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Śišćarski pśeglěd
+printui-pages-per-sheet = Boki na Å‚opjeno
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Śišći se…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/el/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/aboutLogins.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/aboutLogins.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Αφαί�εση αυτής της σ�νδεσης;
 confirm-delete-dialog-message = Δεν είναι δυνατή η αναί�εση αυτής της ενέ�γειας.
 about-logins-confirm-remove-dialog-confirm-button = Αφαί�εση
-about-logins-confirm-remove-all-dialog-confirm-button = Αφαί�εση όλων
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Αφαί�εση
+       *[other] Αφαί�εση όλων
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] �αι, αφαί�εση σ�νδεσης
@@ -198,6 +202,8 @@
 about-logins-confirm-export-dialog-title = Εξαγωγή συνδέσεων και κωδικών π�όσβασης
 about-logins-confirm-export-dialog-message = Οι κωδικοί π�όσβασής σας θα αποθηκευτο�ν ως αναγνώσιμο κείμενο (π.χ. BadP@ssw0rd), επομένως όποιος ανοίξει το α�χείο θα μπο�έσει να τους δει.
 about-logins-confirm-export-dialog-confirm-button = Εξαγωγή…
+about-logins-alert-import-title = Η εισαγωγή ολοκλη�ώθηκε
+about-logins-alert-import-message = Π�οβολή λεπτομε�ο�ς πε�ίληψης εισαγωγής
 confirm-discard-changes-dialog-title = Από��ιψη μη αποθηκευμένων αλλαγών;
 confirm-discard-changes-dialog-message = Όλες οι μη αποθηκευμένες αλλαγές θα χαθο�ν.
 confirm-discard-changes-dialog-confirm-button = Από��ιψη
@@ -259,3 +265,26 @@
         [macos] Έγγ�αφο CSV
        *[other] Α�χείο CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Η εισαγωγή ολοκλη�ώθηκε
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Π�οστέθηκαν νέες συνδέσεις:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Ενημε�ώθηκαν υπά�χουσες συνδέσεις:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Β�έθηκαν διπλές συνδέσεις:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(δεν έγινε εισαγωγή)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Σφάλματα:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(δεν έγινε εισαγωγή)</span>
+    }
+about-logins-import-dialog-done = Τέλος
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/el/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/appmenu.ftl	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/appmenu.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �έο πα�άθυ�ο
+appmenuitem-new-private-window =
+    .label = �έο ιδιωτικό πα�άθυ�ο
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Μεγέθυνση
 appmenuitem-zoom-reduce =
     .label = Σμίκ�υνση
+appmenuitem-fullscreen =
+    .label = Πλή�ης οθόνη
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Συγχ�ονισμός τώ�α
+appmenuitem-save-page =
+    .label = Αποθήκευση σελίδας ως…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Τι νέο υπά�χει
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/el/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/appMenuNotifications.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/appMenuNotifications.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Όχι τώ�α
     .secondarybuttonaccesskey = Ό
 appmenu-update-restart-message = Μετά από μια γ�ήγο�η επανεκκίνηση, το { -brand-shorter-name } θα ανακτήσει όλες τις ανοικτές κα�τέλες και τα πα�άθυ�α, που δεν είναι στη λειτου�γία ιδιωτικής πε�ιήγησης.
+appmenu-update-other-instance =
+    .label = Το { -brand-shorter-name } δεν μπο�εί να ενημε�ωθεί αυτόματα στην πιο π�όσφατη έκδοση.
+    .buttonlabel = Ενημέ�ωση του { -brand-shorter-name } ο�τως ή άλλως
+    .buttonaccesskey = Ε
+    .secondarybuttonlabel = Όχι τώ�α
+    .secondarybuttonaccesskey = Ό
+appmenu-update-other-instance-message = Μια νέα ενημέ�ωση του { -brand-shorter-name } είναι διαθέσιμη, αλλά δεν μπο�εί να εγκατασταθεί επειδή εκτελείται ένα άλλο αντίγ�αφο του { -brand-shorter-name }. Κλείστε το για να συνεχίσετε την ενημέ�ωση, ή επιλέξετε να γίνει ο�τως ή άλλως η ενημέ�ωση (το άλλο αντίγ�αφο δεν θα λειτου�γεί σωστά μέχ�ι να το επανεκκινήσετε).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Εντάξει, το 'πιασα
     .buttonaccesskey = Ε
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/browser.ftl firefox-85.0+build1/l10n/el/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/browser.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/browser.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Το <span data-l10n-name="domain">{ $domain }</span> ελέγχει τον κέ�σο�α. Πατήστε Esc για ανάκτηση ελέγχου.
 pointerlock-warning-no-domain = Αυτό το έγγ�αφο ελέγχει τον κέ�σο�α. Πατήστε Esc για ανάκτηση ελέγχου.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Π�οβολή όλων των σελιδοδεικτών
+bookmarks-recent-bookmarks =
+    .value = Π�όσφατοι σελιδοδείκτες
+bookmarks-toolbar-chevron =
+    .tooltiptext = Π�οβολή πε�ισσότε�ων σελιδοδεικτών
+bookmarks-sidebar-content =
+    .aria-label = Σελιδοδείκτες
+bookmarks-menu-button =
+    .label = Μενο� σελιδοδεικτών
+bookmarks-other-bookmarks-menu =
+    .label = Άλλοι σελιδοδείκτες
+bookmarks-mobile-bookmarks-menu =
+    .label = Σελιδοδείκτες κινητο�
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Απόκ�υψη στήλης σελιδοδεικτών
+           *[other] Π�οβολή στήλης σελιδοδεικτών
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Απόκ�υψη γ�αμμής σελιδοδεικτών
+           *[other] Π�οβολή γ�αμμής σελιδοδεικτών
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Αφαί�εση μενο� σελιδοδεικτών από τη γ�αμμή ε�γαλείων
+           *[other] Π�οσθήκη μενο� σελιδοδεικτών στη γ�αμμή ε�γαλείων
+        }
+bookmarks-search =
+    .label = Αναζήτηση σελιδοδεικτών
+bookmarks-tools =
+    .label = Ε�γαλεία σελιδοδεικτών
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Γ�αμμή σελιδοδεικτών
+    .accesskey = γ
+    .aria-label = Σελιδοδείκτες
+bookmarks-toolbar-menu =
+    .label = Γ�αμμή σελιδοδεικτών
+bookmarks-toolbar-placeholder =
+    .title = Στοιχεία γ�αμμής σελιδοδεικτών
+bookmarks-toolbar-placeholder-button =
+    .label = Στοιχεία γ�αμμής σελιδοδεικτών
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Σελιδοδείκτες
+library-bookmarks-bookmark-this-page =
+    .label = Δημιου�γία σελιδοδείκτη
+library-bookmarks-bookmark-edit =
+    .label = Επεξε�γασία σελιδοδείκτη
+library-recent-activity-label = Π�όσφατη δ�αστη�ιότητα
+
+## More items
+
+more-menu-go-offline =
+    .label = Ε�γασία χω�ίς σ�νδεση
+    .accesskey = χ
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/el/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/newtab/asrouter.ftl	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/newtab/asrouter.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Πληκτ�ολογήστε λιγότε�ο, β�είτε πε�ισσότε�α με τη γ�αμμή διευθ�νσεων
 cfr-whatsnew-searchbar-body-topsites = Τώ�α, απλώς επιλέξτε τη γ�αμμή διευθ�νσεων και θα εμφανιστεί ένα πλαίσιο με συνδέσμους για τις κο�υφαίες ιστοσελίδες σας.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Εικονίδιο μεγεθυντικο� φακο�
 
 ## Picture-in-Picture
@@ -280,3 +283,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Αναζήτηση συντομε�σεων στη γ�αμμή διευθ�νσεων
 cfr-whatsnew-search-shortcuts-body = Πλέον, όταν πληκτ�ολογείτε μια μηχανή αναζήτησης ή μια συγκεκ�ιμένη ιστοσελίδα στη γ�αμμή διευθ�νσεων, θα εμφανίζεται μια μπλε συντόμευση στις π�οτάσεις αναζήτησης. Επιλέξτε τη συντόμευση για να ολοκλη�ώσετε την αναζήτησή σας απευθείας από τη γ�αμμή διευθ�νσεων.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Π�οστασία από κακόβουλα supercookies
+cfr-whatsnew-supercookies-body = Οι ιστοσελίδες μπο�ο�ν να επισυνάψουν κ�υφά ένα “supercookie� στο π�όγ�αμμα πε�ιήγησής σας, π�οκειμένου να σάς πα�ακολουθο�ν στο διαδίκτυο, ακόμη και μετά την εκκαθά�ιση των cookies. Το { -brand-short-name } πα�έχει ισχυ�ή π�οστασία έναντι των supercookies, ώστε να μην μπο�ο�ν να χ�ησιμοποιηθο�ν για την πα�ακολο�θηση των διαδικτυακών σας δ�αστη�ιοτήτων από τη μια ιστοσελίδα στην άλλη.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Καλ�τε�οι σελιδοδείκτες
+cfr-whatsnew-bookmarking-body = Είναι πιο ε�κολο να πα�ακολουθείτε τις αγαπημένες σας ιστοσελίδες. Το { -brand-short-name } απομνημονε�ει πλέον την π�οτιμώμενη τοποθεσία σας για αποθηκευμένους σελιδοδείκτες, εμφανίζει τη γ�αμμή σελιδοδεικτών από π�οεπιλογή σε νέες κα�τέλες και πα�έχει ε�κολη π�όσβαση στους υπόλοιπους σελιδοδείκτες σας μέσω ενός φακέλου στη γ�αμμή ε�γαλείων.
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/el/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/newtab/newtab.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/newtab/newtab.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �έα κα�τέλα
 newtab-settings-button =
     .title = Π�οσα�μογή της σελίδας �έας Κα�τέλας
+newtab-personalize-button-label = Εξατομίκευση
+    .title = Εξατομίκευση νέας κα�τέλας
+    .aria-label = Εξατομίκευση νέας κα�τέλας
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Αναζήτηση στο διαδίκτυο
     .title = Αναζήτηση στο διαδίκτυο
     .aria-label = Αναζήτηση στο διαδίκτυο
+newtab-search-box-text = Αναζήτηση στο διαδίκτυο
+newtab-search-box-input =
+    .placeholder = Αναζήτηση στο διαδίκτυο
+    .aria-label = Αναζήτηση στο διαδίκτυο
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Π�οσθήκη μηχανής αναζήτησης
 newtab-topsites-add-topsites-header = �έα κο�υφαία ιστοσελίδα
+newtab-topsites-add-shortcut-header = �έα συντόμευση
 newtab-topsites-edit-topsites-header = Επεξε�γασία κο�υφαίας ιστοσελίδας
+newtab-topsites-edit-shortcut-header = Επεξε�γασία συντόμευσης
 newtab-topsites-title-label = Τίτλος
 newtab-topsites-title-input =
     .placeholder = Εισάγετε έναν τίτλο
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Ωχ, κάτι πήγε στ�αβά κατά τη φό�τωση του πε�ιεχομένου.
 newtab-error-fallback-refresh-link = Ανανεώστε τη σελίδα για να δοκιμάσετε ξανά.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Συντομε�σεις
+newtab-custom-shortcuts-subtitle = Ιστοσελίδες που αποθηκε�ετε ή επισκέπτεστε
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } σει�ά
+       *[other] { $num } σει�ές
+    }
+newtab-custom-sponsored-sites = Χο�ηγο�μενες συντομε�σεις
+newtab-custom-pocket-title = Π�οτείνεται από το { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Εξαι�ετικό πε�ιεχόμενο από το { -pocket-brand-name }, μέ�ος της οικογένειας του { -brand-product-name }
+newtab-custom-pocket-sponsored = Χο�ηγο�μενα ά�θ�α
+newtab-custom-recent-title = Π�όσφατη δ�αστη�ιότητα
+newtab-custom-recent-subtitle = Μια συλλογή π�όσφατων ιστοσελίδων και πε�ιεχομένου
+newtab-custom-close-button = Κλείσιμο
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Αποσπάσματα
+newtab-custom-snippets-subtitle = Συμβουλές και ειδήσεις από τη { -vendor-short-name } και το { -brand-product-name }
+newtab-custom-settings = Διαχεί�ιση πε�ισσότε�ων �υθμίσεων
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/places.ftl firefox-85.0+build1/l10n/el/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/places.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/places.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Yποφάκελος
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Άλλοι σελιδοδείκτες
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/el/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -49,7 +49,7 @@
 policy-DisableTelemetry = Απενε�γοποίηση τηλεμετ�ίας.
 policy-DisplayBookmarksToolbar = Π�οβολή της γ�αμμής σελιδοδεικτών από π�οεπιλογή.
 policy-DisplayMenuBar = Π�οβολή γ�αμμής μενο� από π�οεπιλογή.
-policy-DNSOverHTTPS = Ρ�θμιση DNS αντί HTTPS.
+policy-DNSOverHTTPS = Ρ�θμιση πα�αμέτ�ων DNS over HTTPS.
 policy-DontCheckDefaultBrowser = Απενε�γοποίηση ελέγχου για το π�οεπιλεγμένο π�όγ�αμμα πε�ιήγησης κατά την εκκίνηση.
 policy-DownloadDirectory = Ο�ισμός και κλείδωμα καταλόγου λήψης.
 # “lock� means that the user won’t be able to change this setting
@@ -79,8 +79,8 @@
 ##
 
 policy-LocalFileLinks = �α επιτ�έπεται σε συγκεκ�ιμένες ιστοσελίδες η σ�νδεση με τοπικά α�χεία.
-policy-MasterPassword = Απαίτηση ή αποτ�οπή χ�ήσης κ��ιου κωδικο� π�όσβασης.
 policy-ManagedBookmarks = Ρυθμίζει μια λίστα σελιδοδεικτών που διαχει�ίζεται ένας διαχει�ιστής και δεν μπο�εί να τ�οποποιηθεί από το χ�ήστη.
+policy-MasterPassword = Απαίτηση ή αποτ�οπή χ�ήσης κ��ιου κωδικο� π�όσβασης.
 policy-PrimaryPassword = Απαίτηση ή αποτ�οπή χ�ήσης κ��ιου κωδικο� π�όσβασης.
 policy-NetworkPrediction = Ενε�γοποίηση ή απενε�γοποίηση π�όβλεψης δικτ�ου (π�οφό�τωση DNS).
 policy-NewTabPage = Ενε�γοποίηση ή απενε�γοποίηση της σελίδας νέας κα�τέλας.
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/el/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/preferences/connection.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/preferences/connection.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -9,15 +9,11 @@
             [macos] width: 44em
            *[other] width: 49em
         }
-
 connection-close-key =
     .key = w
-
 connection-disable-extension =
     .label = Απενε�γοποίηση επέκτασης
-
 connection-proxy-configure = Ρ�θμιση διακομιστή μεσολάβησης για π�όσβαση στο διαδίκτυο
-
 connection-proxy-option-no =
     .label = Χω�ίς διαμεσολαβητή
     .accesskey = Χ
@@ -30,31 +26,25 @@
 connection-proxy-option-manual =
     .label = Χει�οκίνητη ��θμιση διαμεσολαβητή
     .accesskey = χ
-
 connection-proxy-http = Διαμεσολαβητής HTTP
     .accesskey = λ
 connection-proxy-http-port = Θ��α
     .accesskey = Θ
-
 connection-proxy-http-sharing =
     .label = Χ�ήση αυτο� του διαμεσολαβητή και για FTP και HTTPS
     .accesskey = σ
-
 connection-proxy-https = Διαμεσολαβητής HTTPS
     .accesskey = H
 connection-proxy-ssl-port = Θ��α
     .accesskey = �
-
 connection-proxy-ftp = Διαμεσολαβητής FTP
     .accesskey = F
 connection-proxy-ftp-port = Θ��α
     .accesskey = �
-
 connection-proxy-socks = Σ�στημα SOCKS
     .accesskey = C
 connection-proxy-socks-port = Θ��α
     .accesskey = α
-
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = k
@@ -63,45 +53,34 @@
     .accesskey = v
 connection-proxy-noproxy = Χω�ίς διαμεσολαβητή για
     .accesskey = χ
-
 connection-proxy-noproxy-desc = Για πα�άδειγμα: .mozilla.org, .net.nz, 192.168.1.0/24
-
 # Do not translate localhost, 127.0.0.1 and ::1.
 connection-proxy-noproxy-localhost-desc = Οι συνδέσεις στο localhost, το 127.0.0.1 και το ::1 δεν π�οωθο�νται ποτέ μέσω διακομιστή μεσολάβησης.
-
 connection-proxy-autotype =
     .label = URL αυτόματης ��θμισης διαμεσολαβητή
     .accesskey = α
-
 connection-proxy-reload =
     .label = Ανανέωση
     .accesskey = ν
-
 connection-proxy-autologin =
     .label = �α μην ζητείται έλεγχος ταυτοποίησης αν είναι αποθηκευμένος ο κωδικός
     .accesskey = μ
     .tooltip = Αυτή η επιλογή σας ταυτοποιεί σιωπηλά στους διαμεσολαβητές όταν έχετε αποθηκευμένα τα στοιχεία π�όσβασης για αυτο�ς. Θα ειδοποιηθείτε αν η ταυτοποίηση αποτ�χει.
-
 connection-proxy-socks-remote-dns =
     .label = Διαμεσολαβητής DNS κατά τη χ�ήση του SOCKS v5
     .accesskey = d
-
 connection-dns-over-https =
-    .label = Ενε�γοποίηση DNS αντί HTTPS
-    .accesskey = H
-
+    .label = Ενε�γοποίηση DNS over HTTPS
+    .accesskey = γ
 connection-dns-over-https-url-resolver = Χ�ήση πα�όχου
     .accesskey = Χ
-
 # Variables:
 #   $name (String) - Display name or URL for the DNS over HTTPS provider
 connection-dns-over-https-url-item-default =
     .label = { $name } (Π�οεπιλογή)
     .tooltiptext = Χ�ήση του π�οεπιλεγμένου URL για επίλυση DNS αντί HTTPS
-
 connection-dns-over-https-url-custom =
     .label = Π�οσα�μοσμένο
     .accesskey = Π
     .tooltiptext = Εισάγετε το π�οτιμώμενο URL σας για επίλυση DNS αντί HTTPS
-
 connection-dns-over-https-custom-label = Π�οσα�μοσμένο
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/preferences/containers.ftl firefox-85.0+build1/l10n/el/browser/browser/preferences/containers.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/preferences/containers.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/preferences/containers.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -60,7 +60,7 @@
 containers-icon-fence =
     .label = Πε�ίφ�αξη
 containers-icon-fingerprint =
-    .label = Δακτυλικό αποτ�πωμα
+    .label = Αποτ�πωμα
 containers-icon-briefcase =
     .label = Χα�τοφ�λακας
 # String represents a money sign but currently uses a dollar sign
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/preferences/languages.ftl firefox-85.0+build1/l10n/el/browser/browser/preferences/languages.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/preferences/languages.ftl	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/preferences/languages.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -20,7 +20,7 @@
     .label = Αφαί�εση
     .accesskey = Α
 languages-customize-select-language =
-    .placeholder = Επιλέξτε γλώσσα π�ος π�οσθήκη…
+    .placeholder = Επιλέξτε μια γλώσσα για π�οσθήκη…
 languages-customize-add =
     .label = Π�οσθήκη
     .accesskey = θ
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/preferences/permissions.ftl firefox-85.0+build1/l10n/el/browser/browser/preferences/permissions.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/preferences/permissions.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/preferences/permissions.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -13,7 +13,7 @@
     .label = Φ�αγή
     .accesskey = Φ
 permissions-session =
-    .label = Αποδοχή για αυτή τη συνεδ�ία
+    .label = Αποδοχή για τη συνεδ�ία
     .accesskey = σ
 permissions-allow =
     .label = Αποδοχή
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/el/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/preferences/preferences.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/preferences/preferences.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -221,7 +221,7 @@
     .label = Ζουμ μόνο στο κείμενο
     .accesskey = κ
 language-header = Γλώσσα
-choose-language-description = Επιλέξτε την π�οτιμώμενη γλώσσα για την εμφάνιση των ιστοσελίδων
+choose-language-description = Επιλέξτε την π�οτιμώμενη γλώσσα για την εμφάνιση σελίδων
 choose-button =
     .label = Επιλογή…
     .accesskey = λ
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Οι ιστοσελίδες που επισκέπτεστε πε�ισσότε�ο
 home-prefs-topsites-by-option-sponsored =
     .label = Χο�ηγο�μενες κο�υφαίες ιστοσελίδες
+home-prefs-shortcuts-header =
+    .label = Συντομε�σεις
+home-prefs-shortcuts-description = Ιστοσελίδες που αποθηκε�ετε ή επισκέπτεστε
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Χο�ηγο�μενες συντομε�σεις
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Π�οτάσεις του { $provider }
 home-prefs-recommended-by-description-update = Εξαι�ετικό πε�ιεχόμενο από όλο το διαδίκτυο, με την επιμέλεια του { $provider }
+home-prefs-recommended-by-description-new = Εξαι�ετικό πε�ιεχόμενο από το { $provider }, μέ�ος της οικογένειας του { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Χο�ηγο�μενες ιστο�ίες
 home-prefs-highlights-header =
     .label = Κο�υφαίες στιγμές
-home-prefs-recent-activity-header =
-    .label = Π�όσφατη δ�αστη�ιότητα
 home-prefs-highlights-description = Μια συλλογή ιστοσελίδων που έχετε αποθηκε�σει ή επισκεφθεί
 home-prefs-highlights-option-visited-pages =
     .label = Σελίδες που έχετε επισκεφθεί
@@ -526,6 +530,9 @@
     .label = Πιο π�όσφατες λήψεις
 home-prefs-highlights-option-saved-to-pocket =
     .label = Αποθηκευμένες σελίδες του { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Π�όσφατη δ�αστη�ιότητα
+home-prefs-recent-activity-description = Μια συλλογή π�όσφατων ιστοσελίδων και πε�ιεχομένου
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Αποσπάσματα
 home-prefs-snippets-description = Ενημε�ώσεις από τη { -vendor-short-name } και το { -brand-product-name }
+home-prefs-snippets-description-new = Συμβουλές και ειδήσεις από τη { -vendor-short-name } και το { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Ανοικτών κα�τελών
     .accesskey = Ο
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Συντομε�σεις
+    .accesskey = Σ
 addressbar-locbar-topsites-option =
     .label = Κο�υφαίων ιστοσελίδων
     .accesskey = Κ
+addressbar-locbar-engines-option =
+    .label = Μηχανές αναζήτησης
+    .accesskey = α
 addressbar-suggestions-settings = Αλλαγή π�οτιμήσεων για τις π�οτάσεις μηχανών αναζήτησης
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/sync.ftl firefox-85.0+build1/l10n/el/browser/browser/sync.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/sync.ftl	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/sync.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -11,11 +11,11 @@
 fxa-disconnect-dialog-title = Αποσ�νδεση { -brand-product-name };
 fxa-disconnect-dialog-body = Το { -brand-product-name } θα αποσυνδεθεί από το λογα�ιασμό σας, αλλά δεν θα διαγ�άψει κανένα δεδομένο πε�ιήγησης σε αυτή τη συσκευή.
 sync-disconnect-dialog-button = Αποσ�νδεση
-fxa-signout-dialog-heading = Αποσ�νδεση από το { -fxaccount-brand-name };
-fxa-signout-dialog-body = Τα συγχ�ονισμένα δεδομένα θα πα�αμείνουν στο λογα�ιασμό σας.
+fxa-signout-dialog-heading = Αποσ�νδεση από τον { -fxaccount-brand-name };
+fxa-signout-dialog-body = Τα συγχ�ονισμένα δεδομένα θα πα�αμείνουν στον λογα�ιασμό σας.
 fxa-signout-checkbox =
     .label = Διαγ�αφή δεδομένων συσκευής (συνδέσεις, κωδικοί π�όσβασης, ιστο�ικό, σελιδοδείκτες κ.λπ.).
 fxa-signout-dialog =
-    .title = Αποσ�νδεση από το { -fxaccount-brand-name }
+    .title = Αποσ�νδεση από τον { -fxaccount-brand-name }
     .style = min-width: 375px;
     .buttonlabelaccept = Αποσ�νδεση
diff -Nru firefox-84.0.2+build1/l10n/el/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/el/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/el/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Μόνο σε νέα κα�τέλα
     .accesskey = Μ
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Πάντα εμφάνιση
+    .accesskey = ν
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Ποτέ εμφάνιση
+    .accesskey = Π
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Εμφάνιση μόνο στη νέα κα�τέλα
+    .accesskey = μ
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Εμφάνιση άλλων σελιδοδεικτών
     .accesskey = φ
diff -Nru firefox-84.0.2+build1/l10n/el/browser/chrome/overrides/netError.dtd firefox-85.0+build1/l10n/el/browser/chrome/overrides/netError.dtd
--- firefox-84.0.2+build1/l10n/el/browser/chrome/overrides/netError.dtd	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/chrome/overrides/netError.dtd	2021-01-18 20:02:58.000000000 +0000
@@ -52,7 +52,7 @@
 
 <!ENTITY openPortalLoginPage.label2 "Άνοιγμα σελίδας σ�νδεσης δικτ�ου">
 
-<!ENTITY malformedURI.pageTitle "Άκυ�ο URL">
+<!ENTITY malformedURI.pageTitle "Μη έγκυ�ο URL">
 
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
diff -Nru firefox-84.0.2+build1/l10n/el/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/el/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/el/browser/extensions/formautofill/formautofill.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:02:58.000000000 +0000
@@ -77,7 +77,7 @@
 # Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
 category.address = διε�θυνση
 category.name = όνομα
-category.organization2 = ο�γανισμός
+category.organization2 = εται�εία
 category.tel = τηλέφωνο
 category.email = email
 # LOCALIZATION NOTE (fieldNameSeparator): This is used as a separator between categories.
@@ -142,7 +142,7 @@
 givenName = Όνομα
 additionalName = Μεσαίο όνομα
 familyName = Επώνυμο
-organization2 = Ο�γανισμός
+organization2 = Εται�εία
 streetAddress = Διε�θυνση οδο�
 
 ## address-level-3 (Sublocality) names
diff -Nru firefox-84.0.2+build1/l10n/el/chat/irc.properties firefox-85.0+build1/l10n/el/chat/irc.properties
--- firefox-84.0.2+build1/l10n/el/chat/irc.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/chat/irc.properties	2021-01-18 20:02:58.000000000 +0000
@@ -191,7 +191,7 @@
 tooltip.registeredAs=Εγγ�άφηκε ως
 tooltip.secure=Χ�ήση ασφαλο�ς σ�νδεσης
 # The away message of the user
-tooltip.away=Μακ�ιά
+tooltip.away=Εκτός υπολογιστή
 tooltip.ircOp=Λειτου�γός IRC
 tooltip.bot=Bot
 tooltip.lastActivity=Τελευταία δ�αστη�ιότητα
diff -Nru firefox-84.0.2+build1/l10n/el/chat/skype.properties firefox-85.0+build1/l10n/el/chat/skype.properties
--- firefox-84.0.2+build1/l10n/el/chat/skype.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/chat/skype.properties	2021-01-18 20:02:58.000000000 +0000
@@ -4,7 +4,7 @@
 
 # LOCALIZATION NOTE (connection.*):
 #   These will show in the account manager to show progress during a connection.
-connecting.authenticating=Γίνεται ταυτοποίηση
+connecting.authenticating=Ταυτοποίηση
 connecting.registrationToken=Γίνεται λήψη διακ�ιτικο� εγγ�αφής
 
 # LOCALIZATION NOTE (error.*):
diff -Nru firefox-84.0.2+build1/l10n/el/chat/xmpp.properties firefox-85.0+build1/l10n/el/chat/xmpp.properties
--- firefox-84.0.2+build1/l10n/el/chat/xmpp.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/chat/xmpp.properties	2021-01-18 20:02:58.000000000 +0000
@@ -12,7 +12,7 @@
 connection.initializingEncryption=Α�χικοποίηση κ�υπτογ�άφησης
 connection.authenticating=Ταυτοποίηση
 connection.gettingResource=Λήψη πό�ων
-connection.downloadingRoster=Μεταφό�τωση λίστας επαφών
+connection.downloadingRoster=Λήψη λίστας επαφών
 connection.srvLookup=Αναζήτηση για την εγγ�αφή SRV
 
 # LOCALIZATION NOTE (connection.error.*)
@@ -105,9 +105,9 @@
 tooltip.nickname=Ψευδώνυμο
 tooltip.email=Email
 tooltip.birthday=Γενέθλια
-tooltip.userName=Ο�νομα χ�η�στη
-tooltip.title=Τι�τλος
-tooltip.organization=Ο�γανισμός
+tooltip.userName=Όνομα χ�ήστη
+tooltip.title=Τίτλος
+tooltip.organization=Εται�εία
 tooltip.locality=Πε�ιοχή
 tooltip.country=Χώ�α
 tooltip.telephone=Α�ιθμός τηλεφώνου
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/inspector.properties firefox-85.0+build1/l10n/el/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/el/devtools/client/inspector.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/inspector.properties	2021-01-18 20:02:58.000000000 +0000
@@ -482,7 +482,7 @@
 
 # LOCALIZATION NOTE (inspector.classPanel.noClasses): This is the text displayed in the
 # class panel when the current element has no classes applied.
-inspector.classPanel.noClasses=Καμία τάξη σε αυτό το στοιχείο
+inspector.classPanel.noClasses=Καμία κλάση σε αυτό το στοιχείο
 
 # LOCALIZATION NOTE (inspector.noProperties): In the case where there are no CSS
 # properties to display e.g. due to search criteria this message is
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/markers.properties firefox-85.0+build1/l10n/el/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/el/devtools/client/markers.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/markers.properties	2021-01-18 20:02:58.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Χαμηλή μνήμη
 marker.gcreason.label.CC_WAITING=Αναγκαστική συλλογή λόγω κ�κλου
+marker.gcreason.label.CC_FINISHED=Η συλλογή κ�κλων ολοκλη�ώθηκε
 marker.gcreason.label.CC_FORCED=Αναγκαστική συλλογή λόγω κ�κλου
 marker.gcreason.label.LOAD_END=Η φό�τωση της σελίδας ολοκλη�ώθηκε
 marker.gcreason.label.PAGE_HIDE=Μεταφέ�θηκε στο πα�ασκήνιο
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Συλλογή φυτω�ίου
-
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/el/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/el/devtools/client/netmonitor.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/netmonitor.properties	2021-01-18 20:02:58.000000000 +0000
@@ -500,7 +500,7 @@
 # LOCALIZATION NOTE (certmgr.periodofvalidity.label):
 # A label used for a certificate section in security tab
 # This section displays the valid period of this fingerprints
-certmgr.periodofvalidity.label=Πε�ίοδος εγκυ�ότητας
+certmgr.periodofvalidity.label=Πε�ίοδος ισχ�ος
 
 # LOCALIZATION NOTE (certmgr.begins):
 # A label used for Period of Validity sub-section in security tab
@@ -1426,7 +1426,7 @@
 
 # LOCALIZATION NOTE (netmonitor.custom.query): This is the label displayed
 # above the query string entry in the custom request form
-netmonitor.custom.query=�ήμα ε�ώτησης:
+netmonitor.custom.query=�ήμα ε�ώτησης
 
 # LOCALIZATION NOTE (netmonitor.custom.headers): This is the label displayed
 # above the request headers entry in the custom request form
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/toolbox.properties firefox-85.0+build1/l10n/el/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/el/devtools/client/toolbox.properties	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/toolbox.properties	2021-01-18 20:02:58.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Κλείσιμο ε�γαλείων π�ογ�αμματιστών
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Εμφάνιση διαι�ο�μενης κονσόλας
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/el/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/el/devtools/client/tooltips.ftl	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/tooltips.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = Το <strong>{ $property }</strong> δεν έχει επίδ�αση σε αυτό το στοιχείο, αφο� δεν είναι τοποθετημένο στοιχείο.
 inactive-text-overflow-when-no-overflow = Το <strong>{ $property }</strong> δεν έχει επίδ�αση σε αυτό το στοιχείο αφο� το  <strong>overflow:hidden</strong> δεν έχει ο�ιστεί.
 inactive-outline-radius-when-outline-style-auto-or-none = Το <strong>{ $property }</strong> δεν έχει επίδ�αση σε αυτό το στοιχείο επειδή το <strong>outline-style</strong> του είναι <strong>auto</strong> ή <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = Το <strong>{ $property }</strong> δεν επη�εάζει τα εσωτε�ικά στοιχεία πίνακα.
+inactive-css-not-for-internal-table-elements-except-table-cells = Το <strong>{ $property }</strong> δεν επη�εάζει τα εσωτε�ικά στοιχεία πίνακα, εκτός από τα κελιά πίνακα.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Δοκιμάστε να αφαι�έσετε το <strong>float</strong> ή να π�οσθέσετε το <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Δοκιμάστε να ο�ίσετε τη ιδιότητα <strong>position</strong> του σε κάτι άλλο εκτός από <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Δοκιμάστε να π�οσθέσετε το <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Δοκιμάστε να ο�ίσετε την ιδιότητα <strong>display</strong> του σε κάτι άλλο εκτός από <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, ή <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Δοκιμάστε να ο�ίσετε την ιδιότητα <strong>display</strong> του σε κάτι άλλο εκτός από <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, ή <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Δοκιμάστε να ο�ίσετε την ιδιότητα <strong>outline-style</strong> σε κάτι άλλο εκτός από <strong>auto</strong> ή <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/el/devtools/client/webconsole.properties firefox-85.0+build1/l10n/el/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/el/devtools/client/webconsole.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/devtools/client/webconsole.properties	2021-01-18 20:02:58.000000000 +0000
@@ -132,7 +132,7 @@
 level.warn=Π�οειδοποίηση
 level.info=Πλη�οφο�ίες
 level.log=Α�χείο καταγ�αφής
-level.debug=Αποσφαλμάτωση
+level.debug=Εντοπισμός σφαλμάτων
 
 # LOCALIZATION NOTE (logpoint.title)
 # Tooltip shown for logpoints sent from the debugger
@@ -271,7 +271,7 @@
 # LOCALIZATION NOTE (webconsole.debugFilterButton.label)
 # Label used as the text of the "Debug" button in the additional filter toolbar.
 # It shows or hides debug messages, inserted in the page using console.debug().
-webconsole.debugFilterButton.label=Αποσφαλμάτωση
+webconsole.debugFilterButton.label=Εντοπισμός σφαλμάτων
 
 # LOCALIZATION NOTE (webconsole.cssFilterButton.label)
 # Label used as the text of the "CSS" button in the additional filter toolbar.
diff -Nru firefox-84.0.2+build1/l10n/el/dom/chrome/accessibility/win/accessible.properties firefox-85.0+build1/l10n/el/dom/chrome/accessibility/win/accessible.properties
--- firefox-84.0.2+build1/l10n/el/dom/chrome/accessibility/win/accessible.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/dom/chrome/accessibility/win/accessible.properties	2021-01-18 20:02:58.000000000 +0000
@@ -5,7 +5,7 @@
 jump    =       Μετάβαση
 press   =       Πα�ατεταμένο πάτημα
 check   =       Επιλογή
-uncheck =       Aποεπιλογή
+uncheck =       Αποεπιλογή
 select  =       Επιλογή
 open    =       Άνοιγμα
 close   =       Κλείσιμο
diff -Nru firefox-84.0.2+build1/l10n/el/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/el/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/el/dom/chrome/dom/dom.properties	2021-01-06 11:31:55.000000000 +0000
+++ firefox-85.0+build1/l10n/el/dom/chrome/dom/dom.properties	2021-01-18 20:02:58.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Το ε�γαλείο επιλογής <input> αποκλείστηκε λόγω έλλειψης ενε�γοποίησης χ�ήστη.
 ExternalProtocolFrameBlockedNoUserActivation=Το iframe με εξωτε�ικό π�ωτόκολλο αποκλείστηκε λόγω έλλειψης ενε�γοποίησης χ�ήστη, ή επειδή δεν έχει πε�άσει α�κετός χ�όνος από τότε που φο�τώθηκε τέτοιο iframe.
 MultiplePopupsBlockedNoUserActivation=Το άνοιγμα πολλαπλών αναδυόμενων αποκλείστηκε λόγω έλλειψης ενε�γοποίησης χ�ήστη.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Η π�οφό�τωση του %S αγνοήθηκε λόγω άγνωστων τιμών “as� ή “type�, ή λόγω μη αντιστοιχίας της ιδιότητας “media�.
diff -Nru firefox-84.0.2+build1/l10n/el/dom/chrome/layout/xmlparser.properties firefox-85.0+build1/l10n/el/dom/chrome/layout/xmlparser.properties
--- firefox-84.0.2+build1/l10n/el/dom/chrome/layout/xmlparser.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/dom/chrome/layout/xmlparser.properties	2021-01-18 20:02:58.000000000 +0000
@@ -41,7 +41,7 @@
 # %2$S is replaced by URL
 # %3$u is replaced by line number
 # %4$u is replaced by column number
-XMLParsingError = XML Parsing Error: %1$S\nΤοποθεσία: %2$S\nΑ�ιθμός γ�αμμής %3$u, Στήλη %4$u:
+XMLParsingError = Σφάλμα ανάλυσης XML: %1$S\nΤοποθεσία: %2$S\nΑ�ιθμός γ�αμμής %3$u, Στήλη %4$u:
 
 # %S is replaced by a tag name.
 # This gets appended to the error string if the error is mismatched tag.
diff -Nru firefox-84.0.2+build1/l10n/el/dom/chrome/netError.dtd firefox-85.0+build1/l10n/el/dom/chrome/netError.dtd
--- firefox-84.0.2+build1/l10n/el/dom/chrome/netError.dtd	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/dom/chrome/netError.dtd	2021-01-18 20:02:58.000000000 +0000
@@ -16,7 +16,7 @@
 <!ENTITY dnsNotFound.title "Σφάλμα ε��εσης διε�θυνσης">
 <!ENTITY dnsNotFound.longDesc " Η διε�θυνση (URL) δεν αντιστοιχεί σε κάποια γνωστή σελίδα και δεν μπο�εί να φο�τωθεί.">
 
-<!ENTITY fileNotFound.title "Σφάλμα ε��εσης α�χείου">
+<!ENTITY fileNotFound.title "Το α�χείο δεν β�έθηκε">
 <!ENTITY fileNotFound.longDesc "Το α�χείο που καθο�ίζεται από τη διε�θυνση (URL) δεν β�έθηκε. Ελέγξτε ότι το α�χείο υπά�χει και ότι έχετε τα απα�αίτητα δικαιώματα να το εμφανίσετε.">
 
 <!ENTITY fileAccessDenied.title "Ά�νηση π�όσβασης στο α�χείο">
diff -Nru firefox-84.0.2+build1/l10n/el/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/el/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/el/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:02:58.000000000 +0000
@@ -68,7 +68,7 @@
 CertDumpVersion=Έκδοση
 # LOCALIZATION NOTE (CertDumpVersionValue): %S is a version number (e.g. "3" in "Version 3")
 CertDumpVersionValue=Έκδοση %S
-CertDumpSerialNo=Σει�ιακός Α�ιθμός
+CertDumpSerialNo=Σει�ιακός α�ιθμός
 CertDumpMD2WithRSA=PKCS #1 MD2 με κ�υπτογ�άφηση RSA 
 CertDumpMD5WithRSA=PKCS #1 MD5 με κ�υπτογ�άφηση RSA
 CertDumpSHA1WithRSA=PKCS #1 SHA-1 με κ�υπτογ�άφηση RSA
diff -Nru firefox-84.0.2+build1/l10n/el/security/manager/chrome/pippki/pippki.properties firefox-85.0+build1/l10n/el/security/manager/chrome/pippki/pippki.properties
--- firefox-84.0.2+build1/l10n/el/security/manager/chrome/pippki/pippki.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/security/manager/chrome/pippki/pippki.properties	2021-01-18 20:02:58.000000000 +0000
@@ -74,7 +74,7 @@
 password_not_set=(δεν έχει καθο�ισθεί)
 failed_pw_change=Αποτυχία αλλαγής κωδικο�.
 incorrect_pw=Καταχω�ήθηκε εσφαλμένος κωδικός.
-pw_change_ok=Ο κ��ιος κωδικός αλλάχθηκε επιτυχώς.
+pw_change_ok=Επιτυχής αλλαγή του κ��ιου κωδικο� π�όσβασης.
 pw_erased_ok=Π�οειδοποίηση! Διαγ�άψατε τον Κ��ιο κωδικό σας 
 pw_not_wanted=Π�οειδοποίηση: Αποφασίσατε να μη χ�ησιμοποιήσετε ένα Κ��ιο κωδικό.
 pw_empty_warning=Τα αποθηκευμένα δεδομένα, κωδικοί και ιδιωτικά κλειδιά δεν θα π�οστατε�ονται.
diff -Nru firefox-84.0.2+build1/l10n/el/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/el/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/el/security/manager/security/certificates/certManager.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/security/manager/security/certificates/certManager.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -30,7 +30,7 @@
     .value = Γίνεται π�οβολή πιστοποιητικο�…
 certmgr-subject-label = Έκδοση για
 certmgr-issuer-label = Έκδοση από
-certmgr-period-of-validity = Πε�ίοδος Εγκυ�ότητας
+certmgr-period-of-validity = Πε�ίοδος ισχ�ος
 certmgr-fingerprints = Αποτυπώματα
 certmgr-cert-detail =
     .title = Λεπτομέ�εια πιστοποιητικο�
@@ -58,7 +58,7 @@
 certmgr-cert-name =
     .label = Όνομα πιστοποιητικο�
 certmgr-cert-server =
-    .label = Εξυπη�ετητής
+    .label = Διακομιστής
 certmgr-override-lifetime =
     .label = Εφ' ό�ου ζωής
 certmgr-token-name =
@@ -72,7 +72,7 @@
 certmgr-email =
     .label = Διε�θυνση email
 certmgr-serial =
-    .label = Σει�ιακός Α�ιθμός
+    .label = Σει�ιακός α�ιθμός
 certmgr-view =
     .label = Π�οβολή…
     .accesskey = β
diff -Nru firefox-84.0.2+build1/l10n/el/security/manager/security/certificates/deviceManager.ftl firefox-85.0+build1/l10n/el/security/manager/security/certificates/deviceManager.ftl
--- firefox-84.0.2+build1/l10n/el/security/manager/security/certificates/deviceManager.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/security/manager/security/certificates/deviceManager.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -21,8 +21,8 @@
     .label = Αποσ�νδεση
     .accesskey = π
 devmgr-button-changepw =
-    .label = Αλλαγή κωδικο�
-    .accesskey = Α
+    .label = Αλλαγή κωδικο� π�όσβασης
+    .accesskey = κ
 devmgr-button-load =
     .label = Φό�τωση
     .accesskey = Φ
diff -Nru firefox-84.0.2+build1/l10n/el/security/manager/security/pippki/pippki.ftl firefox-85.0+build1/l10n/el/security/manager/security/pippki/pippki.ftl
--- firefox-84.0.2+build1/l10n/el/security/manager/security/pippki/pippki.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/security/manager/security/pippki/pippki.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -7,7 +7,7 @@
 ## Change Password dialog
 
 change-password-window =
-    .title = Αλλαγή κ��ιου κωδικο�
+    .title = Αλλαγή κ��ιου κωδικο� π�όσβασης
 change-device-password-window =
     .title = Αλλαγή κωδικο� π�όσβασης
 # Variables:
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/chrome/global/viewSource.properties firefox-85.0+build1/l10n/el/toolkit/chrome/global/viewSource.properties
--- firefox-84.0.2+build1/l10n/el/toolkit/chrome/global/viewSource.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/chrome/global/viewSource.properties	2021-01-18 20:02:58.000000000 +0000
@@ -8,9 +8,9 @@
 invalidInputText  = Ο α�ιθμός γ�αμμής που εισάγατε δεν είναι έγκυ�ος.
 outOfRangeTitle   = Η γ�αμμή δεν β�έθηκε
 outOfRangeText    = Η καθο�ισμένη γ�αμμή δεν β�έθηκε.
-viewSelectionSourceTitle = Πηγαίος κώδικας DOM της επιλογής
+viewSelectionSourceTitle = Πηγαίος κώδικας DOM επιλογής
 
 context_goToLine_label        = Μετάβαση στη γ�αμμή…
 context_goToLine_accesskey    = γ
 context_wrapLongLines_label   = Αναδίπλωση μακ�οσκελών γ�αμμών
-context_highlightSyntax_label = Χ�ωματική επισήμανση σ�νταξης
+context_highlightSyntax_label = Επισήμανση σ�νταξης
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:02:58.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=η;η
 
 downloadErrorAlertTitle=Σφάλμα λήψης
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Δεν είναι δυνατή η αποθήκευση της λήψης, επειδή αποκλείστηκε από το %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Δεν είναι δυνατή η αποθήκευση της λήψης, επειδή αποκλείστηκε από μια επέκταση.
 downloadErrorGeneric=Δεν είναι δυνατή η αποθήκευση του ληφθέντος α�χείου λόγω ενός άγνωστου σφάλματος.\n\nΠα�ακαλώ π�οσπαθήστε ξανά.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Απομένουν λίγα δευτε�όλεπτα
 timeUnknown2=Άγνωστος υπολειπόμενος χ�όνος
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S πηγή
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/extensions/extensions.properties firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/extensions/extensions.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/extensions/extensions.properties	2021-01-18 20:02:58.000000000 +0000
@@ -12,7 +12,7 @@
 notification.blocked=Το %1$S έχει απενε�γοποιηθεί για λόγους ασφαλείας ή σταθε�ότητας.
 notification.blocked.link=Πε�ισσότε�ες πλη�οφο�ίες
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
-notification.softblocked=Το %1$S είναι γνωστό για τα π�όβλήματα ασφάλειας ή σταθε�ότητας.
+notification.softblocked=Το %1$S είναι γνωστό ότι π�οκαλεί π�οβλήματα ασφαλείας ή σταθε�ότητας.
 notification.softblocked.link=Πε�ισσότε�ες πλη�οφο�ίες
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
 notification.outdated=Υπά�χει διαθέσιμη μια σημαντική ενημέ�ωση για το %1$S.
@@ -47,12 +47,12 @@
 details.notification.blocked.link=Πε�ισσότε�ες πλη�οφο�ίες
 #LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
 details.notification.softblocked=Το %1$S είναι γνωστό ότι π�οκαλεί π�οβλήματα ασφαλείας ή σταθε�ότητας.
-details.notification.softblocked.link=Πε�ισσότε�α πλη�οφο�ίες
+details.notification.softblocked.link=Πε�ισσότε�ες πλη�οφο�ίες
 #LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
 details.notification.outdated=Υπά�χει διαθέσιμη μια σημαντική ενημέ�ωση για το %1$S.
 details.notification.outdated.link=Ενημέ�ωση τώ�α
 #LOCALIZATION NOTE (details.notification.vulnerableUpdatable) %1$S is the add-on name
-details.notification.vulnerableUpdatable=Το π�όσθετο %1$S είναι ευάλωτο σε θέματα ασφαλείας και π�έπει να ενημε�ωθεί.
+details.notification.vulnerableUpdatable=Το %1$S είναι ευάλωτο σε θέματα ασφαλείας και π�έπει να ενημε�ωθεί.
 details.notification.vulnerableUpdatable.link=Ενημέ�ωση τώ�α
 #LOCALIZATION NOTE (details.notification.vulnerableNoUpdate) %1$S is the add-on name
 details.notification.vulnerableNoUpdate=Το %1$S είναι ευάλωτο σε θέματα ασφαλείας. Χ�ησιμοποιήστε το με π�οσοχή.
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/handling/handling.properties firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/handling/handling.properties
--- firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/handling/handling.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/handling/handling.properties	2021-01-18 20:02:58.000000000 +0000
@@ -12,4 +12,4 @@
 # Displayed under the name of a protocol handler in the Launch Application dialog.
 privatebrowsing.disabled.label=Ανενε�γό σε ιδιωτικά πα�άθυ�α
 
-choose.application.title=Άλλη εφα�μογή...
+choose.application.title=Άλλη εφα�μογή…
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/el/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:02:58.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Ά�νηση σ�νδεσης στον διαμεσολαβητή proxy
 check_error-2153390069=Το πιστοποιητικό του εξυπη�ετητή έχει λήξει (πα�ακαλώ �υθμίστε το �ολόι του υπολογιστή σας αν δεν είναι σωστά �υθμισμένο)
 check_error-verification_failed=Αδυναμία επικ��ωσης της ακε�αιότητας της ενημέ�ωσης
+check_error-move_failed=Αποτυχία π�οετοιμασίας ενημέ�ωσης για εγκατάσταση
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/crashreporter/aboutcrashes.ftl firefox-85.0+build1/l10n/el/toolkit/crashreporter/aboutcrashes.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/crashreporter/aboutcrashes.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/crashreporter/aboutcrashes.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -1,19 +1,13 @@
 # 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 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/.
 
 crash-reports-title = Αναφο�ές κατά��ευσης
 submit-all-button-label = Υποβολή όλων
 delete-button-label = Εκκαθά�ιση όλων
-delete-confirm-title = Είστε σίγου�ος;
+delete-confirm-title = Σίγου�α;
 delete-unsubmitted-description = Αυτή η ενέ�γεια θα διαγ�άψει όλες τις μη υποβληθείσες αναφο�ές κατα��ε�σεων και δεν είναι αναστ�έψιμη.
 delete-submitted-description = Αυτή η ενέ�γεια θα διαγ�άψει τη λίστα των υποβληθέντων αναφο�ών κατά��ευσης, αλλά όχι τα υποβληθέντα δεδομένα. Δεν είναι δυνατή η αναί�εση.
-
 crashes-unsubmitted-label = Μη υποβληθείσες αναφο�ές κατά��ευσης
 id-heading = ID Αναφο�άς
 date-crashed-heading = Ημε�ομηνία κατά��ευσης
@@ -21,10 +15,8 @@
 # This text is used to replace the label of the crash submit button
 # if the crash submission fails.
 submit-crash-button-failure-label = Αποτυχία
-
 crashes-submitted-label = Υποβληθείσες αναφο�ές κατά��ευσης
 date-submitted-heading = Ημε�ομηνία υποβολής
 view-crash-button-label = Π�οβολή
-
 no-reports-label = Δεν έχουν υποβληθεί αναφο�ές π�οβλημάτων.
 no-config-label = Αυτή η εφα�μογή δεν έχει �υθμιστεί για να εμφανίζει αναφο�ές π�οβλημάτων. Θα π�έπει να �υθμιστο�ν οι π�οτιμήσεις στο <code>breakpad.reportURL</code>.
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -221,8 +221,8 @@
     .accesskey = γ
 addon-install-from-file-dialog-title = Επιλέξτε π�όσθετο για εγκατάσταση
 addon-install-from-file-filter-name = Π�όσθετα
-addon-open-about-debugging = Αποσφαλμάτωση π�όσθετων
-    .accesskey = θ
+addon-open-about-debugging = Εντοπισμός σφαλμάτων π�οσθέτων
+    .accesskey = π
 
 ## Extension shortcut management
 
@@ -382,12 +382,6 @@
 addon-badge-recommended2 =
     .title = Το { -brand-product-name } π�οτείνει μόνο επεκτάσεις που πλη�ο�ν τα π�ότυπα ασφαλείας και επιδόσεών μας
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Αυτή η επέκταση αναπτ�χθηκε από τους δημιου�γο�ς του { -brand-product-name }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Ο κώδικας αυτής της επέκτασης έχει ελεγχθεί για ασφάλεια
-    .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
     .title = Αυτή είναι μια επίσημη επέκταση που αναπτ�χθηκε από τους δημιου�γο�ς του { -brand-product-name }
     .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutConfig.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutConfig.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutConfig.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutConfig.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -26,7 +26,7 @@
 ## These strings are used for column headers
 
 config-pref-column =
-    .label = Π�οτιμήσεις
+    .label = Όνομα π�οτίμησης
 config-lock-column =
     .label = Κατάσταση
 config-type-column =
@@ -37,7 +37,7 @@
 ## These strings are used for tooltips
 
 config-pref-column-header =
-    .tooltip = Πατήστε για ταξινόμηση
+    .tooltip = Κάντε κλικ για ταξινόμηση
 config-column-chooser =
     .tooltip = Πατήστε να επιλέξετε τις π�ος εμφάνιση στήλες
 
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutRights.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutRights.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutRights.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutRights.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -19,7 +19,7 @@
 rights-safebrowsing-term-2 = Επιλέξτε την κα�τέλα Ασφάλεια
 rights-safebrowsing-term-3 = Αποεπιλέξτε την επιλογή για "{ enableSafeBrowsing-label }"
 enableSafeBrowsing-label = Φ�αγή επικίνδυνου και πα�απλανητικο� πε�ιεχομένου
-rights-safebrowsing-term-4 = Η ασφαλής πε�ιήγηση θα απενε�γοποιηθεί
+rights-safebrowsing-term-4 = Η ασφαλής πε�ιήγηση είναι πλέον ανενε�γή
 rights-locationawarebrowsing = <strong>Η Πε�ιήγηση με δήλωση τοποθεσίας: </strong>γίνεται πάντα με ε�ώτηση για τη σ�μφωνη γνώμη σας. Δεν πα�έχονται πλη�οφο�ίες τοποθεσίας χω�ίς την άδεια σας.  Αν επιθυμείτε να απενε�γοποιήσετε πλή�ως αυτή τη λειτου�γία, ακολουθήστε τα πα�ακάτω βήματα:
 rights-locationawarebrowsing-term-1 = Στη γ�αμμή διευθ�νσεων, πληκτ�ολογήστε <code>about:config</code>
 rights-locationawarebrowsing-term-2 = Πληκτ�ολογήστε geo.enabled
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutServiceWorkers.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutServiceWorkers.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -6,10 +6,9 @@
 ### The term "Service Workers" and "Workers" should not be translated
 
 about-service-workers-title = Σχετικά με τα Service Workers
-about-service-workers-main-title = Εγγεγ�αμμένα Service Workers
+about-service-workers-main-title = Εγγεγ�αμμένα service worker
 about-service-workers-warning-not-enabled = Τα Service Workers δεν είναι ενε�γοποιημένα.
 about-service-workers-warning-no-service-workers = Κανένα εγγεγ�αμμένο Service Worker.
-
 # The original title of service workers' information
 #
 # Variables:
@@ -29,12 +28,8 @@
 waiting-cache-name = <strong>Όνομα π�οσω�ινής μνήμης σε αναμονή:</strong> { $name }
 push-end-point-waiting = <strong>Σημείο τε�ματισμο�:</strong> { waiting }
 push-end-point-result = <strong>Σημείο τε�ματισμο�:</strong> { $name }
-
 # This term is used as a button label (verb, not noun).
 update-button = Ενημέ�ωση
-
 unregister-button = Διαγ�αφή
-
 unregister-error = Απέτυχε η κατά�γηση αυτο� του Service Worker.
-
 waiting = Σε αναμονή…
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -153,7 +153,7 @@
 media-device-vendor = Κατασκευαστής
 media-device-state = Κατάσταση
 media-device-preferred = Π�οτίμηση
-media-device-format = Τ�πος
+media-device-format = Μο�φή
 media-device-channels = Κανάλια
 media-device-rate = Ρυθμός
 media-device-latency = Καθυστέ�ηση
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Π�όσθετα module τ�ίτων
+support-third-party-modules-module = Α�χείο module
+support-third-party-modules-version = Έκδοση α�χείου
+support-third-party-modules-vendor = Πλη�οφο�ίες κατασκευαστή
+support-third-party-modules-occurrence = Εμφάνιση
+support-third-party-modules-process = Τ�πος & ID διε�γασίας
+support-third-party-modules-thread = �ήμα
+support-third-party-modules-base = Διε�θυνση Imagebase
+support-third-party-modules-uptime = Χ�όνος διε�γασίας (ms)
+support-third-party-modules-duration = Διά�κεια φό�τωσης (ms)
+support-third-party-modules-empty = Δεν φο�τώθηκαν π�όσθετα module τ�ίτων.
+support-third-party-modules-no-value = (Καμία τιμή)
+support-third-party-modules-button-open =
+    .title = Άνοιγμα τοποθεσίας α�χείου…
+support-third-party-modules-expand =
+    .title = Εμφάνιση λεπτομε�ών πλη�οφο�ιών
+support-third-party-modules-collapse =
+    .title = Σ�μπτυξη λεπτομε�ών πλη�οφο�ιών
+support-third-party-modules-unsigned-icon =
+    .title = Αυτό το module δεν έχει υπογ�αφεί
+support-third-party-modules-folder-icon =
+    .title = Άνοιγμα τοποθεσίας α�χείου…
+support-third-party-modules-down-icon =
+    .title = Εμφάνιση λεπτομε�ών πλη�οφο�ιών
+support-third-party-modules-up-icon =
+    .title = Σ�μπτυξη λεπτομε�ών πλη�οφο�ιών
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -342,7 +368,7 @@
 fission-status-disabled-by-e10s-env = Απενε�γοποιήθηκε από το πε�ιβάλλον
 fission-status-enabled-by-env = Ενε�γοποιήθηκε από το πε�ιβάλλον
 fission-status-disabled-by-safe-mode = Απενε�γοποιήθηκε από την ασφαλή λειτου�γία
-fission-status-enabled-by-default = Ενε�γοποιήθηκε από π�οεπιλογή
+fission-status-enabled-by-default = Ενε�γό από π�οεπιλογή
 fission-status-disabled-by-default = Απενε�γοποιήθηκε από π�οεπιλογή
 fission-status-enabled-by-user-pref = Ενε�γοποιήθηκε από το χ�ήστη
 fission-status-disabled-by-user-pref = Απενε�γοποιήθηκε από το χ�ήστη
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/certviewer.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -42,7 +42,7 @@
 certificate-viewer-name = Όνομα
 certificate-viewer-not-after = Όχι μετά
 certificate-viewer-not-before = Όχι π�ιν
-certificate-viewer-organization = Ο�γανισμός
+certificate-viewer-organization = Εται�εία
 certificate-viewer-organizational-unit = Μονάδα ο�γανισμο�
 certificate-viewer-policy = Πολιτική
 certificate-viewer-protocol = Π�ωτόκολλο
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/url-classifier.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/about/url-classifier.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/about/url-classifier.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/about/url-classifier.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -8,7 +8,7 @@
 url-classifier-search-result-uri = URI: { $uri }
 url-classifier-search-result-list = Λίστα πινάκων: { $list }
 url-classifier-search-input = URL
-url-classifier-search-error-invalid-url = Άκυ�ο URL
+url-classifier-search-error-invalid-url = Μη έγκυ�ο URL
 url-classifier-search-error-no-features = Δεν επιλέχθηκαν λειτου�γίες
 url-classifier-search-btn = Ένα�ξη αναζήτησης
 url-classifier-search-features = Λειτου�γίες
@@ -32,7 +32,7 @@
 url-classifier-cache-ncache-expiry = Λήξη α�νητικής cache
 url-classifier-cache-fullhash = Πλή�ες hash
 url-classifier-cache-pcache-expiry = Λήξη θετικής cache
-url-classifier-debug-title = Αποσφαλμάτωση
+url-classifier-debug-title = Εντοπισμός σφαλμάτων
 url-classifier-debug-module-btn = Ο�ισμός μονάδων καταγ�αφής
 url-classifier-debug-file-btn = Ο�ισμός α�χείου καταγ�αφής
 url-classifier-debug-js-log-chk = Ο�ισμός καταγ�αφής JS
@@ -40,7 +40,6 @@
 url-classifier-debug-modules = Τ�έχουσες μονάδες καταγ�αφής
 url-classifier-debug-sbjs-modules = Α�χείο καταγ�αφής JS ασφαλο�ς πε�ιήγησης
 url-classifier-debug-file = Τ�έχον α�χείο καταγ�αφής
-
 url-classifier-trigger-update = Π�όκληση ενημέ�ωσης
 url-classifier-not-available = Μ/Δ
 url-classifier-disable-sbjs-log = Απενε�γοποίηση α�χείου καταγ�αφής JS ασφαλο�ς πε�ιήγησης
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Υποστή�ιξη πολλαπλών πα�αθ��ων εικόνας-εντός-εικόνας
 experimental-features-multi-pip-description = Πει�αματική υποστή�ιξη για άνοιγμα πολλαπλών πα�αθ��ων εικόνας-εντός-εικόνας ταυτόχ�ονα.
+experimental-features-http3 =
+    .label = Π�ωτόκολλο HTTP/3
+experimental-features-http3-description = Πει�αματική υποστή�ιξη για το π�ωτόκολλο HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/global/textActions.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/global/textActions.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/global/textActions.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/global/textActions.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -5,45 +5,33 @@
 text-action-undo =
     .label = Αναί�εση
     .accesskey = Α
-
 text-action-undo-shortcut =
     .key = Z
-
 text-action-redo =
-    .label = Ακ��ωση αναί�εσης
-    .accesskey = κ
-
+    .label = Επανάληψη
+    .accesskey = Ε
 text-action-redo-shortcut =
     .key = Y
-
 text-action-cut =
     .label = Αποκοπή
     .accesskey = π
-
 text-action-cut-shortcut =
     .key = X
-
 text-action-copy =
     .label = Αντιγ�αφή
     .accesskey = Α
-
 text-action-copy-shortcut =
     .key = C
-
 text-action-paste =
     .label = Επικόλληση
     .accesskey = π
-
 text-action-paste-shortcut =
     .key = V
-
 text-action-delete =
     .label = Διαγ�αφή
     .accesskey = Δ
-
 text-action-select-all =
     .label = Επιλογή όλων
     .accesskey = λ
-
 text-action-select-all-shortcut =
     .key = A
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/preferences/preferences.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/preferences/preferences.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/preferences/preferences.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -6,7 +6,7 @@
     .value = (δεν ο�ίσθηκε)
 failed-pw-change = Αδυναμία αλλαγής Κ��ιου Κωδικο�.
 incorrect-pw = Δεν εισάγατε το σωστό Κ��ιο κωδικό. Π�οσπαθήστε ξανά.
-pw-change-ok = Επιτυχής αλλαγή του Κ��ιου κωδικο�.
+pw-change-ok = Επιτυχής αλλαγή του κ��ιου κωδικο� π�όσβασης.
 pw-empty-warning = Οι αποθηκευμένοι κωδικοί email και web από δεδομένα και ιδιωτικά κλειδιά δεν θα π�οστατευτο�ν.
 pw-erased-ok = Διαγ�άψατε τον Κ��ιο κωδικό σας. { pw-empty-warning }
 pw-not-wanted = Π�οειδοποίηση! Αποφασίσατε να μη χ�ησιμοποιήσετε ένα Κ��ιο κωδικό. { pw-empty-warning }
@@ -23,7 +23,7 @@
 pw-remove-button =
     .label = Αφαί�εση
 set-password =
-    .title = Αλλαγή κ��ιου κωδικο�
+    .title = Αλλαγή κ��ιου κωδικο� π�όσβασης
 primary-password-dialog =
     .title = Κ��ιος κωδικός π�όσβασης
 set-password-old-password = Τ�έχων κωδικός π�όσβασης:
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Σελίδα:
     .accesskey = ε
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } από { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,3 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Τελευταία σελίδα
+printpreview-homearrow-button =
+    .title = Π�ώτη σελίδα
+printpreview-previousarrow-button =
+    .title = Π�οηγο�μενη σελίδα
+printpreview-nextarrow-button =
+    .title = Επόμενη σελίδα
+printpreview-endarrow-button =
+    .title = Τελευταία σελίδα
diff -Nru firefox-84.0.2+build1/l10n/el/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/el/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/el/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:31:56.000000000 +0000
+++ firefox-85.0+build1/l10n/el/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:02:58.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = έως
+printui-page-custom-range-input =
+    .aria-label = Εισάγετε π�οσα�μοσμένο ε��ος σελίδων
+    .placeholder = π.χ. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Αντίγ�αφα
 printui-orientation = Π�οσανατολισμός
@@ -48,6 +51,7 @@
 printui-options = Επιλογές
 printui-headers-footers-checkbox = Εκτ�πωση κεφαλίδων και υποσέλιδων
 printui-backgrounds-checkbox = Εκτ�πωση πα�ασκηνίου
+printui-selection-checkbox = Εκτ�πωση επιλογής μόνο
 printui-color-mode-label = Λειτου�γία χ�ώματος
 printui-color-mode-color = Έγχ�ωμο
 printui-color-mode-bw = Ασπ�όμαυ�ο
@@ -56,19 +60,29 @@
 printui-margins-min = Ελάχιστα
 printui-margins-none = Χω�ίς
 printui-margins-custom = Π�οσα�μοσμένο
+printui-margins-custom-inches = Π�οσα�μογή (ίντσες)
 printui-margins-custom-top = Πάνω
+printui-margins-custom-top-inches = Πάνω (ίντσες)
 printui-margins-custom-bottom = Κάτω
+printui-margins-custom-bottom-inches = Κάτω (ίντσες)
 printui-margins-custom-left = Α�ιστε�ά
+printui-margins-custom-left-inches = Α�ιστε�ά (ίντσες)
 printui-margins-custom-right = Δεξιά
+printui-margins-custom-right-inches = Δεξιά (ίντσες)
 printui-system-dialog-link = Εκτ�πωση μέσω διαλόγου συστήματος…
 printui-primary-button = Εκτ�πωση
 printui-primary-button-save = Αποθήκευση
 printui-cancel-button = Ακ��ωση
+printui-close-button = Κλείσιμο
 printui-loading = Π�οετοιμασία π�οεπισκόπησης
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Π�οεπισκόπηση εκτ�πωσης
+printui-pages-per-sheet = Σελίδες ανά φ�λλο
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Εκτ�πωση…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/aboutCertError.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/aboutCertError.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -119,7 +119,7 @@
 sslv3Used-title = Unable to Connect Securely
 inadequateSecurityError-title = Your connection is not secure
 blockedByPolicy-title = Blocked Page
-clockSkewError-title = Your computer clock is wrong
+clockSkewError-title = Your Computer Clock is Wrong
 networkProtocolError-title = Network Protocol Error
 nssBadCert-title = Warning: Potential Security Risk Ahead
 nssBadCert-sts-title = Did Not Connect: Potential Security Issue
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/appmenu.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/appmenu.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = New Window
+appmenuitem-new-private-window =
+    .label = New Private Window
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom in
 appmenuitem-zoom-reduce =
     .label = Zoom out
+appmenuitem-fullscreen =
+    .label = Full Screen
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sync Now
+appmenuitem-save-page =
+    .label = Save Page As…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = What’s New
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/browser.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/browser.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/browser.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -236,7 +236,7 @@
     .label = Search in New Tab
     .accesskey = T
 search-one-offs-context-set-as-default =
-    .label = Set As Default Search Engine
+    .label = Set as Default Search Engine
     .accesskey = D
 search-one-offs-context-set-as-default-private =
     .label = Set as Default Search Engine for Private Windows
@@ -346,9 +346,6 @@
 
 ## Bookmarks toolbar items
 
-browser-import-button =
-    .label = Import bookmarks…
-    .tooltiptext = Copy bookmarks from another browser to { -brand-short-name }.
 
 ## WebRTC Pop-up notifications
 
@@ -500,3 +497,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> has control of your pointer. Press Esc to take back control.
 pointerlock-warning-no-domain = This document has control of your pointer. Press Esc to take back control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Show All Bookmarks
+bookmarks-recent-bookmarks =
+    .value = Recently Bookmarked
+bookmarks-toolbar-chevron =
+    .tooltiptext = Show more bookmarks
+bookmarks-sidebar-content =
+    .aria-label = Bookmarks
+bookmarks-menu-button =
+    .label = Bookmarks Menu
+bookmarks-other-bookmarks-menu =
+    .label = Other Bookmarks
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobile Bookmarks
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hide Bookmarks Sidebar
+           *[other] View Bookmarks Sidebar
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hide Bookmarks Toolbar
+           *[other] View Bookmarks Toolbar
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Remove Bookmarks Menu from Toolbar
+           *[other] Add Bookmarks Menu to Toolbar
+        }
+bookmarks-search =
+    .label = Search Bookmarks
+bookmarks-tools =
+    .label = Bookmarking Tools
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bookmarks Toolbar
+    .accesskey = B
+    .aria-label = Bookmarks
+bookmarks-toolbar-menu =
+    .label = Bookmarks Toolbar
+bookmarks-toolbar-placeholder =
+    .title = Bookmarks Toolbar Items
+bookmarks-toolbar-placeholder-button =
+    .label = Bookmarks Toolbar Items
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bookmarks
+library-bookmarks-bookmark-this-page =
+    .label = Bookmark This Page
+library-bookmarks-bookmark-edit =
+    .label = Edit This Bookmark
+
+## More items
+
+more-menu-go-offline =
+    .label = Work Offline
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/menubar.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/menubar.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/menubar.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -50,7 +50,7 @@
     .label = Print…
     .accesskey = P
 menu-file-import-from-another-browser =
-    .label = Import from Another Browser…
+    .label = Import From Another Browser…
     .accesskey = I
 menu-file-go-offline =
     .label = Work Offline
@@ -247,7 +247,7 @@
     .label = { -brand-shorter-name } Tour
     .accesskey = o
 menu-help-import-from-another-browser =
-    .label = Import from Another Browser…
+    .label = Import From Another Browser…
     .accesskey = I
 menu-help-keyboard-shortcuts =
     .label = Keyboard Shortcuts
@@ -259,16 +259,16 @@
     .label = Submit Feedback…
     .accesskey = S
 menu-help-safe-mode-without-addons =
-    .label = Restart with Add-ons Disabled…
+    .label = Restart With Add-ons Disabled…
     .accesskey = R
 menu-help-safe-mode-with-addons =
-    .label = Restart with Add-ons Enabled
+    .label = Restart With Add-ons Enabled
     .accesskey = R
 # Label of the Help menu item. Either this or
 # menu-help-notdeceptive is shown.
 menu-help-report-deceptive-site =
-    .label = Report deceptive site…
+    .label = Report Deceptive Site…
     .accesskey = d
 menu-help-not-deceptive =
-    .label = This isn’t a deceptive site…
-    .accesskey = d
+    .label = This Isn’t a Deceptive Site…
+    .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/newtab/onboarding.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/newtab/onboarding.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -196,7 +196,7 @@
 onboarding-data-sync-button2 = Sign in to { -sync-brand-short-name }
 onboarding-firefox-monitor-title = Stay Alert to Data Breaches
 onboarding-firefox-monitor-text2 = { -monitor-brand-name } monitors if your email has appeared in a known data breach and alerts you if it appears in a new breach.
-onboarding-firefox-monitor-button = Sign up for Alerts
+onboarding-firefox-monitor-button = Sign Up for Alerts
 onboarding-browse-privately-title = Browse Privately
 onboarding-browse-privately-text = Private Browsing clears your search and browsing history to keep it secret from anyone who uses your computer.
 onboarding-browse-privately-button = Open a Private Window
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/preferences/connection.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/preferences/connection.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -61,7 +61,7 @@
 connection-proxy-socks5 =
     .label = SOCKS v5
     .accesskey = v
-connection-proxy-noproxy = No Proxy for
+connection-proxy-noproxy = No proxy for
     .accesskey = N
 
 connection-proxy-noproxy-desc = Example: .mozilla.org, .net.nz, 192.168.1.0/24
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/en-CA/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/en-CA/browser/browser/preferences/preferences.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -267,7 +267,7 @@
     .label = Always ask you where to save files
     .accesskey = A
 applications-header = Applications
-applications-description = Choose how { -brand-short-name } handles the files you download from the Web or the applications you use while browsing.
+applications-description = Choose how { -brand-short-name } handles the files you download from the web or the applications you use while browsing.
 applications-filter =
     .placeholder = Search file types or applications
 applications-type-column =
@@ -615,7 +615,7 @@
 ## Firefox Account - Signed out. Note that "Sync" and "Firefox Account" are now
 ## more discrete ("signed in" no longer means "and sync is connected").
 
-sync-signedout-caption = Take your Web with you
+sync-signedout-caption = Take Your Web With You
 sync-signedout-description = Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.
 sync-signedout-account-signin2 =
     .label = Sign in to { -sync-brand-short-name }…
@@ -637,7 +637,7 @@
 sync-sign-out =
     .label = Sign Out…
     .accesskey = g
-sync-manage-account = Manage Account
+sync-manage-account = Manage account
     .accesskey = o
 sync-signedin-unverified = { $email } is not verified.
 sync-signedin-login-failure = Please sign in to reconnect { $email }
@@ -699,7 +699,7 @@
     .label = History
     .accesskey = r
 sync-engine-tabs =
-    .label = Open Tabs
+    .label = Open tabs
     .tooltiptext = A list of what’s open on all synchronized devices
     .accesskey = T
 sync-engine-logins-passwords =
@@ -1051,7 +1051,7 @@
 collection-health-report =
     .label = Allow { -brand-short-name } to send technical and interaction data to { -vendor-short-name }
     .accesskey = r
-collection-health-report-link = Learn More
+collection-health-report-link = Learn more
 collection-studies =
     .label = Allow { -brand-short-name } to install and run studies
 collection-studies-link = View { -brand-short-name } studies
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/accounts.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/accounts.properties	2021-01-18 20:03:03.000000000 +0000
@@ -81,7 +81,7 @@
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title)
 # The body for these is the URL of the tab received
-tabArrivingNotification.title = Tab received
+tabArrivingNotification.title = Tab Received
 # LOCALIZATION NOTE (tabArrivingNotificationWithDevice.title) %S is the device name
 tabArrivingNotificationWithDevice.title = Tab from %S
 
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/browser.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/browser.properties	2021-01-18 20:03:03.000000000 +0000
@@ -928,7 +928,7 @@
 userContextShopping.accesskey = S
 userContextNone.accesskey = N
 
-userContext.aboutPage.label = Manage containers
+userContext.aboutPage.label = Manage Containers
 userContext.aboutPage.accesskey = o
 
 userContextOpenLink.label = Open Link in New %S Tab
diff -Nru firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-84.0.2+build1/l10n/en-CA/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-18 20:03:03.000000000 +0000
@@ -40,12 +40,12 @@
 add-ons-button.tooltiptext3 = Manage your add-ons (%S)
 
 preferences-button.label = Preferences
-preferences-button.tooltiptext2 = Open Preferences
-preferences-button.tooltiptext.withshortcut = Open Preferences (%S)
+preferences-button.tooltiptext2 = Open preferences
+preferences-button.tooltiptext.withshortcut = Open preferences (%S)
 # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
 preferences-button.labelWin = Options
 # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
-preferences-button.tooltipWin2 = Open Options
+preferences-button.tooltipWin2 = Open options
 
 zoom-controls.label = Zoom Controls
 zoom-controls.tooltiptext2 = Zoom controls
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/application.ftl firefox-85.0+build1/l10n/en-CA/devtools/client/application.ftl
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/application.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/application.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -106,7 +106,7 @@
 
 # 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>
+manifest-empty-intro = You need to add a web app manifest to inspect it here. <a>Learn more</a>
 
 # Header for the Manifest page when there's no manifest to inspect
 manifest-empty-intro2 = No web app manifest detected
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/debugger.properties firefox-85.0+build1/l10n/en-CA/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/debugger.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/debugger.properties	2021-01-18 20:03:03.000000000 +0000
@@ -122,12 +122,12 @@
 
 # LOCALIZATION NOTE (copyFunction.label): This is the text that appears in the
 # context menu to copy the function the user selected
-copyFunction.label=Copy Function
+copyFunction.label=Copy function
 copyFunction.accesskey=F
 
 # LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the
 # context menu to copy the stack trace methods, file names and row number.
-copyStackTrace=Copy Stack Trace
+copyStackTrace=Copy stack trace
 copyStackTrace.accesskey=C
 
 # LOCALIZATION NOTE (restartFrame): This is the text that appears in the
@@ -161,15 +161,15 @@
 
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
-stepOverTooltip=Step Over %S
+stepOverTooltip=Step over %S
 
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
-stepInTooltip=Step In %S
+stepInTooltip=Step in %S
 
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
-stepOutTooltip=Step Out %S
+stepOutTooltip=Step out %S
 
 # LOCALIZATION NOTE (skipPausingTooltip.label): The tooltip text for disabling all
 # breakpoints and pausing triggers
@@ -391,30 +391,30 @@
 
 # LOCALIZATION NOTE (breakpoints.enable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.enable=Enable Breakpoints
+breakpoints.enable=Enable breakpoints
 
 # LOCALIZATION NOTE (breakpoints.disable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.disable=Disable Breakpoints
+breakpoints.disable=Disable breakpoints
 
 # LOCALIZATION NOTE (breakpoints.removeBreakpointTooltip): The tooltip that is displayed
 # for remove breakpoint button in right sidebar
-breakpoints.removeBreakpointTooltip=Remove Breakpoint
+breakpoints.removeBreakpointTooltip=Remove breakpoint
 
 # LOCALIZATION NOTE (callStack.header): Call Stack right sidebar pane header.
-callStack.header=Call Stack
+callStack.header=Call stack
 
 # LOCALIZATION NOTE (callStack.notPaused): Call Stack right sidebar pane
 # message when not paused.
-callStack.notPaused=Not Paused
+callStack.notPaused=Not paused
 
 # LOCALIZATION NOTE (callStack.collapse): Call Stack right sidebar pane
 # message to hide some of the frames that are shown.
-callStack.collapse=Collapse Rows
+callStack.collapse=Collapse rows
 
 # LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane
 # message to show more of the frames.
-callStack.expand=Expand Rows
+callStack.expand=Expand rows
 
 # LOCALIZATION NOTE (callStack.group.expandTooltip): The text that will appear
 # when hovering a collapsed Group of frames in the callStack panel. `frames` is
@@ -441,33 +441,33 @@
 
 # LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar
 # tooltip for traversing to the Next Result
-editor.searchResults.nextResult=Next Result
+editor.searchResults.nextResult=Next result
 
 # LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar
 # tooltip for traversing to the Previous Result
-editor.searchResults.prevResult=Previous Result
+editor.searchResults.prevResult=Previous result
 
 # LOCALIZATION NOTE (editor.continueToHere.label): Editor gutter context
 # menu item for jumping to a new paused location
-editor.continueToHere.label=Continue To Here
+editor.continueToHere.label=Continue to here
 editor.continueToHere.accesskey=H
 
 # LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item
 # for adding a breakpoint on a line.
-editor.addBreakpoint=Add Breakpoint
+editor.addBreakpoint=Add breakpoint
 
 # LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item
 # for disabling a breakpoint on a line.
-editor.disableBreakpoint=Disable Breakpoint
+editor.disableBreakpoint=Disable breakpoint
 editor.disableBreakpoint.accesskey=D
 
 # LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item
 # for enabling a breakpoint on a line.
-editor.enableBreakpoint=Enable Breakpoint
+editor.enableBreakpoint=Enable breakpoint
 
 # LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item
 # for removing a breakpoint on a line.
-editor.removeBreakpoint=Remove Breakpoint
+editor.removeBreakpoint=Remove breakpoint
 
 # LOCALIZATION NOTE (editor.addConditionBreakpoint): Editor gutter context
 # menu item for adding a breakpoint condition on a line.
@@ -568,23 +568,23 @@
 
 # LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
 # context menu to disable framework grouping.
-framework.disableGrouping=Disable Framework Grouping
+framework.disableGrouping=Disable framework grouping
 framework.disableGrouping.accesskey=u
 
 # LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the
 # context menu to enable framework grouping.
-framework.enableGrouping=Enable Framework Grouping
+framework.enableGrouping=Enable framework grouping
 framework.enableGrouping.accesskey=u
 
 # LOCALIZATION NOTE (generated): Source Map term for a server source location
-generated=Generated
+generated=generated
 
 # LOCALIZATION NOTE (original): Source Map term for a debugger UI source location
-original=Original
+original=original
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
-expressions.placeholder=Add Watch Expression
+expressions.placeholder=Add watch expression
 
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
@@ -630,42 +630,42 @@
 
 # LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item
 # for closing the selected tab below the mouse.
-sourceTabs.closeTab=Close Tab
+sourceTabs.closeTab=Close tab
 sourceTabs.closeTab.accesskey=C
 sourceTabs.closeTab.key=CmdOrCtrl+W
 
 # LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item
 # for closing the other tabs.
-sourceTabs.closeOtherTabs=Close Other Tabs
+sourceTabs.closeOtherTabs=Close other tabs
 sourceTabs.closeOtherTabs.accesskey=o
 
 # LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item
 # for closing the tabs to the end (the right for LTR languages) of the selected tab.
-sourceTabs.closeTabsToEnd=Close Tabs to the Right
+sourceTabs.closeTabsToEnd=Close tabs to the right
 sourceTabs.closeTabsToEnd.accesskey=e
 
 # LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item
 # for closing all tabs.
-sourceTabs.closeAllTabs=Close All Tabs
+sourceTabs.closeAllTabs=Close all tabs
 sourceTabs.closeAllTabs.accesskey=A
 
 # LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item
 # for revealing source in tree.
-sourceTabs.revealInTree=Reveal in Tree
+sourceTabs.revealInTree=Reveal in tree
 sourceTabs.revealInTree.accesskey=R
 
 # LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item
 # for pretty printing the source.
-sourceTabs.prettyPrint=Pretty Print Source
+sourceTabs.prettyPrint=Pretty print source
 sourceTabs.prettyPrint.accesskey=P
 
 # LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated
 # with the blackbox button
-sourceFooter.blackbox=Blackbox Source
+sourceFooter.blackbox=Blackbox source
 
 # LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated
 # with the blackbox button
-sourceFooter.unblackbox=Unblackbox Source
+sourceFooter.unblackbox=Unblackbox source
 
 # LOCALIZATION NOTE (blackboxContextItem.blackbox): Text associated
 # with the blackbox context menu item
@@ -724,11 +724,11 @@
 
 # LOCALIZATION NOTE (scopes.notAvailable): Scopes right sidebar pane message
 # for when the debugger is paused, but there isn't pause data.
-scopes.notAvailable=Scopes Unavailable
+scopes.notAvailable=Scopes unavailable
 
 # LOCALIZATION NOTE (scopes.notPaused): Scopes right sidebar pane message
 # for when the debugger is not paused.
-scopes.notPaused=Not Paused
+scopes.notPaused=Not paused
 
 # LOCALIZATION NOTE (scopes.mapping.label): Scopes right sidebar pane
 # tooltip for checkbox and label
@@ -778,7 +778,7 @@
 
 # LOCALIZATION NOTE (watchExpressions.header): Watch Expressions right sidebar
 # pane header.
-watchExpressions.header=Watch Expressions
+watchExpressions.header=Watch expressions
 
 # LOCALIZATION NOTE (watchExpressions.refreshButton): Watch Expressions header
 # button for refreshing the expressions.
@@ -810,7 +810,7 @@
 
 # LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search
 # prompt for searching for files.
-sourceSearch.search=Search Sources…
+sourceSearch.search=Search sources…
 
 # LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search
 # prompt for searching for files.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/font-inspector.properties firefox-85.0+build1/l10n/en-CA/devtools/client/font-inspector.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/font-inspector.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/font-inspector.properties	2021-01-18 20:03:03.000000000 +0000
@@ -58,7 +58,7 @@
 
 # LOCALIZATION NOTE (fontinspector.allFontsOnPageHeader): Header for the section listing
 # all the fonts on the current page.
-fontinspector.allFontsOnPageHeader=All fonts on page
+fontinspector.allFontsOnPageHeader=All Fonts on Page
 
 # LOCALIZATION NOTE (fontinspector.fontsUsedLabel): Label for the Font Editor section
 # which shows the fonts used on the selected element.
@@ -66,4 +66,4 @@
 
 # LOCALIZATION NOTE (fontinspector.previewTextPlaceholder): Placeholder for the input
 # where the user can type text to get a preview of it using a font.
-fontinspector.previewTextPlaceholder=Font preview text
+fontinspector.previewTextPlaceholder=Font Preview Text
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/inspector.properties firefox-85.0+build1/l10n/en-CA/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/inspector.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/inspector.properties	2021-01-18 20:03:03.000000000 +0000
@@ -455,7 +455,7 @@
 # LOCALIZATION NOTE (inspector.browserStyles.label): This is the label for the checkbox
 # that specifies whether the styles that are not from the user's stylesheet should be
 # displayed or not.
-inspector.browserStyles.label=Browser styles
+inspector.browserStyles.label=Browser Styles
 
 # LOCALIZATION NOTE (inspector.filterStyles.placeholder): This is the placeholder that
 # goes in the search box when no search term has been entered.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/en-CA/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/netmonitor.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/netmonitor.properties	2021-01-18 20:03:03.000000000 +0000
@@ -72,7 +72,7 @@
 
 # LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
 # headers tab of the network details pane for the filtering input.
-headersFilterText=Filter headers
+headersFilterText=Filter Headers
 
 # LOCALIZATION NOTE (messagesEmptyText): This is the text displayed in the
 # WebSockets tab of the network details pane when there are no frames available.
@@ -84,7 +84,7 @@
 
 # LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
 # cookies tab of the network details pane for the filtering input.
-cookiesFilterText=Filter cookies
+cookiesFilterText=Filter Cookies
 
 # LOCALIZATION NOTE (responseEmptyText): This is the text displayed in the
 # response tab of the network details pane when the response is empty or not
@@ -97,11 +97,11 @@
 
 # LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
 # request tab of the network details pane for the filtering input.
-paramsFilterText=Filter request parameters
+paramsFilterText=Filter Request Parameters
 
 # LOCALIZATION NOTE (paramsQueryString): This is the label displayed
 # in the network details request tab identifying the query string.
-paramsQueryString=Query string
+paramsQueryString=Query String
 
 # LOCALIZATION NOTE (paramsFormData): This is the label displayed
 # in the network details request tab identifying the form data.
@@ -113,7 +113,7 @@
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
 # in the network details headers tab identifying the request headers.
-requestHeaders=Request headers
+requestHeaders=Request Headers
 
 # LOCALIZATION NOTE (requestHeadersFromUpload): This is the label displayed
 # in the network details headers tab identifying the request headers from
@@ -122,19 +122,19 @@
 
 # LOCALIZATION NOTE (responseHeaders): This is the label displayed
 # in the network details headers tab identifying the response headers.
-responseHeaders=Response headers
+responseHeaders=Response Headers
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
 # in the network details request tab identifying the request cookies.
-requestCookies=Request cookies
+requestCookies=Request Cookies
 
 # LOCALIZATION NOTE (responseCookies): This is the label displayed
 # in the network details request tab identifying the response cookies.
-responseCookies=Response cookies
+responseCookies=Response Cookies
 
 # LOCALIZATION NOTE (responsePayload): This is the label displayed
 # in the network details response tab identifying the response payload.
-responsePayload=Response payload
+responsePayload=Response Payload
 
 # LOCALIZATION NOTE (jsonFilterText): This is the text displayed
 # in the response tab of the network details pane for the JSON filtering input.
@@ -977,7 +977,7 @@
 
 # LOCALIZATION NOTE (netmonitor.toolbar.disableCache.label): This is the label
 # displayed for the checkbox for disabling browser cache.
-netmonitor.toolbar.disableCache.label=Disable cache
+netmonitor.toolbar.disableCache.label=Disable Cache
 
 # LOCALIZATION NOTE (netmonitor.toolbar.disableCache.tooltip): This is the tooltip
 # displayed for the checkbox for disabling browser cache.
@@ -1089,12 +1089,12 @@
 # LOCALIZATION NOTE (netmonitor.timings.dns): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
 # in a "dns" state.
-netmonitor.timings.dns=DNS resolution:
+netmonitor.timings.dns=DNS Resolution:
 
 # LOCALIZATION NOTE (netmonitor.timings.ssl): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
 # in a "tls" handshake state.
-netmonitor.timings.ssl=TLS setup:
+netmonitor.timings.ssl=TLS Setup:
 
 # LOCALIZATION NOTE (netmonitor.timings.connect): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/network-throttling.properties firefox-85.0+build1/l10n/en-CA/devtools/client/network-throttling.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/network-throttling.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/network-throttling.properties	2021-01-18 20:03:03.000000000 +0000
@@ -24,4 +24,4 @@
 # network throttling.  This option is the default and disables throttling so you
 # just have normal network conditions.  There is not very much room in the UI
 # so a short string would be best if possible.
-responsive.noThrottling=No throttling
+responsive.noThrottling=No Throttling
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/sourceeditor.dtd firefox-85.0+build1/l10n/en-CA/devtools/client/sourceeditor.dtd
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/sourceeditor.dtd	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/sourceeditor.dtd	2021-01-18 20:03:03.000000000 +0000
@@ -20,6 +20,6 @@
 
 
 
-<!ENTITY gotoLineCmd.label         "Jump to line…">
+<!ENTITY gotoLineCmd.label         "Jump to Line…">
 <!ENTITY gotoLineCmd.key           "J">
 <!ENTITY gotoLineCmd.accesskey     "J">
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/storage.dtd firefox-85.0+build1/l10n/en-CA/devtools/client/storage.dtd
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/storage.dtd	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/storage.dtd	2021-01-18 20:03:03.000000000 +0000
@@ -5,7 +5,7 @@
 <!-- LOCALIZATION NOTE : This file contains the Storage Inspector strings. -->
 
 <!-- LOCALIZATION NOTE : Placeholder for the searchbox that allows you to filter the table items. -->
-<!ENTITY searchBox.placeholder         "Filter items">
+<!ENTITY searchBox.placeholder         "Filter Items">
 
 <!-- LOCALIZATION NOTE : Label of popup menu action to delete all storage items. -->
 <!ENTITY storage.popupMenu.deleteAllLabel "Delete All">
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/styleeditor.properties firefox-85.0+build1/l10n/en-CA/devtools/client/styleeditor.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/styleeditor.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/styleeditor.properties	2021-01-18 20:03:03.000000000 +0000
@@ -52,7 +52,7 @@
 
 # LOCALIZATION NOTE  (showOriginalSources.label): This is the label on the context
 # menu item to toggle showing original sources in the editor.
-showOriginalSources.label=Show original sources
+showOriginalSources.label=Show Original Sources
 
 # LOCALIZATION NOTE  (showOriginalSources.accesskey): This is the access key for
 # the menu item to toggle showing original sources in the editor.
@@ -60,7 +60,7 @@
 
 # LOCALIZATION NOTE  (showMediaSidebar.label): This is the label on the context
 # menu item to toggle showing @media rule shortcuts in a sidebar.
-showMediaSidebar.label=Show @media sidebar
+showMediaSidebar.label=Show @media Sidebar
 
 # LOCALIZATION NOTE  (showMediaSidebar.accesskey): This is the access key for
 # the menu item to toggle showing the @media sidebar.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/toolbox.properties firefox-85.0+build1/l10n/en-CA/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/toolbox.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/toolbox.properties	2021-01-18 20:03:03.000000000 +0000
@@ -137,29 +137,29 @@
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.button.tooltip): This is the tooltip
 # for the "..." button on the developer tools toolbox.
-toolbox.meatballMenu.button.tooltip=Customize Developer Tools and get help
+toolbox.meatballMenu.button.tooltip=Customize Developer Tools and Get Help
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.dock.*.label): These labels are shown
 # in the "..." menu in the toolbox and represent the different arrangements for
 # docking (or undocking) the developer tools toolbox.
-toolbox.meatballMenu.dock.bottom.label=Dock to bottom
-toolbox.meatballMenu.dock.left.label=Dock to left
-toolbox.meatballMenu.dock.right.label=Dock to right
-toolbox.meatballMenu.dock.separateWindow.label=Separate window
+toolbox.meatballMenu.dock.bottom.label=Dock to Bottom
+toolbox.meatballMenu.dock.left.label=Dock to Left
+toolbox.meatballMenu.dock.right.label=Dock to Right
+toolbox.meatballMenu.dock.separateWindow.label=Separate Window
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.{splitconsole,hideconsole}.label):
 # These are the labels in the "..." menu in the toolbox for toggling the split
 # console window.
 # The keyboard shortcut will be shown to the side of the label.
-toolbox.meatballMenu.splitconsole.label=Show split console
-toolbox.meatballMenu.hideconsole.label=Hide split console
+toolbox.meatballMenu.splitconsole.label=Show Split Console
+toolbox.meatballMenu.hideconsole.label=Hide Split Console
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.noautohide.label): This is the label
 # in the "..." menu in the toolbox to force the popups/panels to stay visible on
 # blur.
 # This is only visible in the browser toolbox as it is meant for
 # addon developers and Firefox contributors.
-toolbox.meatballMenu.noautohide.label=Disable popup auto-hide
+toolbox.meatballMenu.noautohide.label=Disable Popup Auto-Hide
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.settings.label): This is the label for
 # the item in the "..." menu in the toolbox that brings up the Settings
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/client/webconsole.properties firefox-85.0+build1/l10n/en-CA/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/client/webconsole.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/client/webconsole.properties	2021-01-18 20:03:03.000000000 +0000
@@ -210,25 +210,25 @@
 # LOCALIZATION NOTE (webconsole.menu.storeAsGlobalVar.label)
 # Label used for a context-menu item displayed for object/variable logs. Clicking on it
 # creates a new global variable pointing to the logged variable.
-webconsole.menu.storeAsGlobalVar.label=Store as global variable
+webconsole.menu.storeAsGlobalVar.label=Store as Global Variable
 webconsole.menu.storeAsGlobalVar.accesskey=S
 
 # LOCALIZATION NOTE (webconsole.menu.copyMessage.label)
 # Label used for a context-menu item displayed for any log. Clicking on it will copy the
 # content of the log (or the user selection, if any).
-webconsole.menu.copyMessage.label=Copy message
+webconsole.menu.copyMessage.label=Copy Message
 webconsole.menu.copyMessage.accesskey=C
 
 # LOCALIZATION NOTE (webconsole.menu.copyObject.label)
 # Label used for a context-menu item displayed for object/variable log. Clicking on it
 # will copy the object/variable.
-webconsole.menu.copyObject.label=Copy object
+webconsole.menu.copyObject.label=Copy Object
 webconsole.menu.copyObject.accesskey=o
 
 # LOCALIZATION NOTE (webconsole.menu.selectAll.label)
 # Label used for a context-menu item that will select all the content of the webconsole
 # output.
-webconsole.menu.selectAll.label=Select all
+webconsole.menu.selectAll.label=Select All
 webconsole.menu.selectAll.accesskey=a
 
 # LOCALIZATION NOTE (webconsole.menu.openInSidebar.label)
@@ -240,7 +240,7 @@
 # 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
+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
@@ -266,7 +266,7 @@
 
 # LOCALIZATION NOTE (webconsole.filterInput.placeholder)
 # Label used for for the placeholder on the filter input, in the console top toolbar.
-webconsole.filterInput.placeholder=Filter output
+webconsole.filterInput.placeholder=Filter Output
 
 # LOCALIZATION NOTE (webconsole.errorsFilterButton.label)
 # Label used as the text of the "Errors" button in the additional filter toolbar.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/devtools/shared/styleinspector.properties firefox-85.0+build1/l10n/en-CA/devtools/shared/styleinspector.properties
--- firefox-84.0.2+build1/l10n/en-CA/devtools/shared/styleinspector.properties	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/devtools/shared/styleinspector.properties	2021-01-18 20:03:03.000000000 +0000
@@ -159,7 +159,7 @@
 
 # LOCALIZATION NOTE (styleinspector.contextmenu.copyColor.accessKey): Access key for
 # the rule and computed view context menu "Copy Color" entry.
-styleinspector.contextmenu.copyColor.accessKey=l
+styleinspector.contextmenu.copyColor.accessKey=L
 
 # LOCALIZATION NOTE (styleinspector.contextmenu.copyUrl): In rule and computed view :
 # text displayed in the context menu for an image URL.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/en-CA/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/en-CA/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/en-CA/toolkit/toolkit/main-window/findbar.ftl firefox-85.0+build1/l10n/en-CA/toolkit/toolkit/main-window/findbar.ftl
--- firefox-84.0.2+build1/l10n/en-CA/toolkit/toolkit/main-window/findbar.ftl	2021-01-06 11:32:58.000000000 +0000
+++ firefox-85.0+build1/l10n/en-CA/toolkit/toolkit/main-window/findbar.ftl	2021-01-18 20:03:03.000000000 +0000
@@ -11,7 +11,7 @@
     .tooltiptext = Find the previous occurrence of the phrase
 
 findbar-find-button-close =
-    .tooltiptext = Close Find bar
+    .tooltiptext = Close find bar
 
 findbar-highlight-all2 =
     .label = Highlight All
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/aboutLogins.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/aboutLogins.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Remove this login?
 confirm-delete-dialog-message = This action cannot be undone.
 about-logins-confirm-remove-dialog-confirm-button = Remove
-about-logins-confirm-remove-all-dialog-confirm-button = Remove All
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Remove
+       *[other] Remove All
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Yes, remove this login
@@ -198,6 +202,8 @@
 about-logins-confirm-export-dialog-title = Export logins and passwords
 about-logins-confirm-export-dialog-message = Your passwords will be saved as readable text (e.g., BadP@ssw0rd) so anyone who can open the exported file can view them.
 about-logins-confirm-export-dialog-confirm-button = Export…
+about-logins-alert-import-title = Import Complete
+about-logins-alert-import-message = View detailed import summary
 confirm-discard-changes-dialog-title = Discard unsaved changes?
 confirm-discard-changes-dialog-message = All unsaved changes will be lost.
 confirm-discard-changes-dialog-confirm-button = Discard
@@ -259,3 +265,26 @@
         [macos] CSV Document
        *[other] CSV File
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Import Complete
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>New logins added:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Existing logins updated:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Duplicate logins found:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Errors:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+    }
+about-logins-import-dialog-done = Done
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/appmenu.ftl	2021-01-06 11:33:02.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/appmenu.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = New Window
+appmenuitem-new-private-window =
+    .label = New Private Window
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom in
 appmenuitem-zoom-reduce =
     .label = Zoom out
+appmenuitem-fullscreen =
+    .label = Full Screen
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchronise Now
+appmenuitem-save-page =
+    .label = Save Page As…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = What’s New
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/appMenuNotifications.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Not Now
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = After a quick restart, { -brand-shorter-name } will restore all your open tabs and windows that are not in Private Browsing mode.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } is unable to automatically update to the latest version.
+    .buttonlabel = Update { -brand-shorter-name } anyway
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Not Now
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = A new { -brand-shorter-name } update is available, but it can’t be installed because another copy of { -brand-shorter-name } is running. Close it to continue the update, or choose to update anyway (the other copy may not work correctly until you restart it).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Okay, Got It
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/browser.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/browser.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/browser.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -236,7 +236,7 @@
     .label = Search in New Tab
     .accesskey = T
 search-one-offs-context-set-as-default =
-    .label = Set As Default Search Engine
+    .label = Set as Default Search Engine
     .accesskey = D
 search-one-offs-context-set-as-default-private =
     .label = Set as Default Search Engine for Private Windows
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> has control of your pointer. Press Esc to take back control.
 pointerlock-warning-no-domain = This document has control of your pointer. Press Esc to take back control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Show All Bookmarks
+bookmarks-recent-bookmarks =
+    .value = Recently Bookmarked
+bookmarks-toolbar-chevron =
+    .tooltiptext = Show more bookmarks
+bookmarks-sidebar-content =
+    .aria-label = Bookmarks
+bookmarks-menu-button =
+    .label = Bookmarks Menu
+bookmarks-other-bookmarks-menu =
+    .label = Other Bookmarks
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobile Bookmarks
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hide Bookmarks Sidebar
+           *[other] View Bookmarks Sidebar
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hide Bookmarks Toolbar
+           *[other] View Bookmarks Toolbar
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Remove Bookmarks Menu from Toolbar
+           *[other] Add Bookmarks Menu to Toolbar
+        }
+bookmarks-search =
+    .label = Search Bookmarks
+bookmarks-tools =
+    .label = Bookmarking Tools
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bookmarks Toolbar
+    .accesskey = B
+    .aria-label = Bookmarks
+bookmarks-toolbar-menu =
+    .label = Bookmarks Toolbar
+bookmarks-toolbar-placeholder =
+    .title = Bookmarks Toolbar Items
+bookmarks-toolbar-placeholder-button =
+    .label = Bookmarks Toolbar Items
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bookmarks
+library-bookmarks-bookmark-this-page =
+    .label = Bookmark This Page
+library-bookmarks-bookmark-edit =
+    .label = Edit This Bookmark
+library-recent-activity-label = Recent Activity
+
+## More items
+
+more-menu-go-offline =
+    .label = Work Offline
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/menubar.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/menubar.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/menubar.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -50,7 +50,7 @@
     .label = Print…
     .accesskey = P
 menu-file-import-from-another-browser =
-    .label = Import from Another Browser…
+    .label = Import From Another Browser…
     .accesskey = I
 menu-file-go-offline =
     .label = Work Offline
@@ -247,7 +247,7 @@
     .label = { -brand-shorter-name } Tour
     .accesskey = o
 menu-help-import-from-another-browser =
-    .label = Import from Another Browser…
+    .label = Import From Another Browser…
     .accesskey = I
 menu-help-keyboard-shortcuts =
     .label = Keyboard Shortcuts
@@ -259,16 +259,16 @@
     .label = Submit Feedback…
     .accesskey = S
 menu-help-safe-mode-without-addons =
-    .label = Restart with Add-ons Disabled…
+    .label = Restart With Add-ons Disabled…
     .accesskey = R
 menu-help-safe-mode-with-addons =
-    .label = Restart with Add-ons Enabled
+    .label = Restart With Add-ons Enabled
     .accesskey = R
 # Label of the Help menu item. Either this or
 # menu-help-notdeceptive is shown.
 menu-help-report-deceptive-site =
-    .label = Report deceptive site…
+    .label = Report Deceptive Site…
     .accesskey = d
 menu-help-not-deceptive =
-    .label = This isn't a deceptive site…
-    .accesskey = d
+    .label = This Isn’t a Deceptive Site…
+    .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/asrouter.ftl	2021-01-06 11:33:02.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Type less, find more with the address bar
 cfr-whatsnew-searchbar-body-topsites = Now, just select the address bar, and a box will expand with links to your top sites.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Magnifying glass icon
 
 ## Picture-in-Picture
@@ -280,3 +283,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Search shortcuts in the address bar
 cfr-whatsnew-search-shortcuts-body = Now, when you type a search engine or specific site into the address bar, a blue shortcut will appear in the search suggestions beneath. Select that shortcut to complete your search directly from the address bar.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protection from malicious supercookies
+cfr-whatsnew-supercookies-body = Web sites can secretly attach a “supercookie� to your browser that can follow you around the web, even after you clear your cookies. { -brand-short-name } now provides strong protection against supercookies so they can’t be used to track your online activities from one site to the next.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Better bookmarking
+cfr-whatsnew-bookmarking-body = It’s easier to keep track of your favourite sites. { -brand-short-name } now remembers your preferred location for saved bookmarks, shows the bookmarks toolbar by default on new tabs, and gives you easy access to the rest of your bookmarks via a toolbar folder.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/newtab.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = New Tab
 newtab-settings-button =
     .title = Customise your New Tab page
+newtab-personalize-button-label = Personalise
+    .title = Personalise new tab
+    .aria-label = Personalise new tab
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Search the Web
     .title = Search the Web
     .aria-label = Search the Web
+newtab-search-box-text = Search the web
+newtab-search-box-input =
+    .placeholder = Search the web
+    .aria-label = Search the web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Add Search Engine
 newtab-topsites-add-topsites-header = Top Sites
+newtab-topsites-add-shortcut-header = New Shortcut
 newtab-topsites-edit-topsites-header = Edit Top Site
+newtab-topsites-edit-shortcut-header = Edit Shortcut
 newtab-topsites-title-label = Title
 newtab-topsites-title-input =
     .placeholder = Enter a title
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oops, something went wrong loading this content.
 newtab-error-fallback-refresh-link = Refresh page to try again.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Shortcuts
+newtab-custom-shortcuts-subtitle = Sites you save or visit
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } row
+       *[other] { $num } rows
+    }
+newtab-custom-sponsored-sites = Sponsored shortcuts
+newtab-custom-pocket-title = Recommended by { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Exceptional content curated by { -pocket-brand-name }, part of the { -brand-product-name } family
+newtab-custom-pocket-sponsored = Sponsored stories
+newtab-custom-recent-title = Recent activity
+newtab-custom-recent-subtitle = A selection of recent sites and content
+newtab-custom-close-button = Close
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippets
+newtab-custom-snippets-subtitle = Tips and news from { -vendor-short-name } and { -brand-product-name }
+newtab-custom-settings = Manage more settings
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/newtab/onboarding.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/newtab/onboarding.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -196,7 +196,7 @@
 onboarding-data-sync-button2 = Sign in to { -sync-brand-short-name }
 onboarding-firefox-monitor-title = Stay Alert to Data Breaches
 onboarding-firefox-monitor-text2 = { -monitor-brand-name } monitors if your email has appeared in a known data breach and alerts you if it appears in a new breach.
-onboarding-firefox-monitor-button = Sign up for Alerts
+onboarding-firefox-monitor-button = Sign Up for Alerts
 onboarding-browse-privately-title = Browse Privately
 onboarding-browse-privately-text = Private Browsing clears your search and browsing history to keep it secret from anyone who uses your computer.
 onboarding-browse-privately-button = Open a Private Window
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/places.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/places.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/places.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subfolder
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Other Bookmarks
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/preferences/connection.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/preferences/connection.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -61,7 +61,7 @@
 connection-proxy-socks5 =
     .label = SOCKS v5
     .accesskey = v
-connection-proxy-noproxy = No Proxy for
+connection-proxy-noproxy = No proxy for
     .accesskey = N
 
 connection-proxy-noproxy-desc = Example: .mozilla.org, .net.nz, 192.168.1.0/24
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/preferences/preferences.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -270,7 +270,7 @@
     .label = Always ask you where to save files
     .accesskey = A
 applications-header = Applications
-applications-description = Choose how { -brand-short-name } handles the files you download from the Web or the applications you use while browsing.
+applications-description = Choose how { -brand-short-name } handles the files you download from the web or the applications you use while browsing.
 applications-filter =
     .placeholder = Search file types or applications
 applications-type-column =
@@ -447,7 +447,7 @@
 
 network-settings-title = Network Settings
 network-proxy-connection-description = Configure how { -brand-short-name } connects to the internet.
-network-proxy-connection-learn-more = Learn More
+network-proxy-connection-learn-more = Learn more
 network-proxy-connection-settings =
     .label = Settings…
     .accesskey = S
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = The sites you visit most
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsored Top Sites
+home-prefs-shortcuts-header =
+    .label = Shortcuts
+home-prefs-shortcuts-description = Sites you save or visit
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsored shortcuts
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recommended by { $provider }
 home-prefs-recommended-by-description-update = Exceptional content from across the web, curated by { $provider }
+home-prefs-recommended-by-description-new = Exceptional content curated by { $provider }, part of the { -brand-product-name } family
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsored Stories
 home-prefs-highlights-header =
     .label = Highlights
-home-prefs-recent-activity-header =
-    .label = Recent activity
 home-prefs-highlights-description = A selection of sites that you’ve saved or visited
 home-prefs-highlights-option-visited-pages =
     .label = Visited Pages
@@ -526,6 +530,9 @@
     .label = Most Recent Download
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pages Saved to { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Recent activity
+home-prefs-recent-activity-description = A selection of recent sites and content
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Snippets
 home-prefs-snippets-description = Updates from { -vendor-short-name } and { -brand-product-name }
+home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -620,7 +628,7 @@
 ## Firefox Account - Signed out. Note that "Sync" and "Firefox Account" are now
 ## more discrete ("signed in" no longer means "and sync is connected").
 
-sync-signedout-caption = Take your Web with you
+sync-signedout-caption = Take Your Web With You
 sync-signedout-description = Synchronise your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.
 sync-signedout-account-signin2 =
     .label = Sign in to { -sync-brand-short-name }…
@@ -642,7 +650,7 @@
 sync-sign-out =
     .label = Sign Out ...
     .accesskey = g
-sync-manage-account = Manage Account
+sync-manage-account = Manage account
     .accesskey = o
 sync-signedin-unverified = { $email } is not verified.
 sync-signedin-login-failure = Please sign in to reconnect { $email }
@@ -704,7 +712,7 @@
     .label = History
     .accesskey = r
 sync-engine-tabs =
-    .label = Open Tabs
+    .label = Open tabs
     .tooltiptext = A list of what’s open on all synchronised devices
     .accesskey = T
 sync-engine-logins-passwords =
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Open tabs
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Shortcuts
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Top sites
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Search engines
+    .accesskey = a
 addressbar-suggestions-settings = Change preferences for search engine suggestions
 
 ## Privacy Section - Content Blocking
@@ -1063,7 +1078,7 @@
 collection-health-report =
     .label = Allow { -brand-short-name } to send technical and interaction data to { -vendor-short-name }
     .accesskey = r
-collection-health-report-link = Learn More
+collection-health-report-link = Learn more
 collection-studies =
     .label = Allow { -brand-short-name } to install and run studies
 collection-studies-link = View { -brand-short-name } studies
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/en-GB/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/en-GB/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Only on New Tab
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Always Show
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Never Show
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Only Show on New Tab
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Show Other Bookmarks
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/accounts.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/accounts.properties	2021-01-18 20:03:08.000000000 +0000
@@ -81,7 +81,7 @@
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title)
 # The body for these is the URL of the tab received
-tabArrivingNotification.title = Tab received
+tabArrivingNotification.title = Tab Received
 # LOCALIZATION NOTE (tabArrivingNotificationWithDevice.title) %S is the device name
 tabArrivingNotificationWithDevice.title = Tab from %S
 
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/browser.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/browser.properties	2021-01-18 20:03:08.000000000 +0000
@@ -927,7 +927,7 @@
 userContextShopping.accesskey = S
 userContextNone.accesskey = N
 
-userContext.aboutPage.label = Manage containers
+userContext.aboutPage.label = Manage Containers
 userContext.aboutPage.accesskey = o
 
 userContextOpenLink.label = Open Link in New %S Tab
diff -Nru firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-84.0.2+build1/l10n/en-GB/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-18 20:03:08.000000000 +0000
@@ -40,12 +40,12 @@
 add-ons-button.tooltiptext3 = Manage your add-ons (%S)
 
 preferences-button.label = Preferences
-preferences-button.tooltiptext2 = Open Preferences
-preferences-button.tooltiptext.withshortcut = Open Preferences (%S)
+preferences-button.tooltiptext2 = Open preferences
+preferences-button.tooltiptext.withshortcut = Open preferences (%S)
 # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options
 preferences-button.labelWin = Options
 # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options
-preferences-button.tooltipWin2 = Open Options
+preferences-button.tooltipWin2 = Open options
 
 zoom-controls.label = Zoom Controls
 zoom-controls.tooltiptext2 = Zoom controls
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/application.ftl firefox-85.0+build1/l10n/en-GB/devtools/client/application.ftl
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/application.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/application.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -106,7 +106,7 @@
 
 # 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>
+manifest-empty-intro = You need to add a web app manifest to inspect it here. <a>Learn more</a>
 
 # Header for the Manifest page when there's no manifest to inspect
 manifest-empty-intro2 = No web app manifest detected
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/debugger.properties firefox-85.0+build1/l10n/en-GB/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/debugger.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/debugger.properties	2021-01-18 20:03:08.000000000 +0000
@@ -122,12 +122,12 @@
 
 # LOCALIZATION NOTE (copyFunction.label): This is the text that appears in the
 # context menu to copy the function the user selected
-copyFunction.label=Copy Function
+copyFunction.label=Copy function
 copyFunction.accesskey=F
 
 # LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the
 # context menu to copy the stack trace methods, file names and row number.
-copyStackTrace=Copy Stack Trace
+copyStackTrace=Copy stack trace
 copyStackTrace.accesskey=C
 
 # LOCALIZATION NOTE (restartFrame): This is the text that appears in the
@@ -161,15 +161,15 @@
 
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
-stepOverTooltip=Step Over %S
+stepOverTooltip=Step over %S
 
 # LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
 # button that steps into a function call.
-stepInTooltip=Step In %S
+stepInTooltip=Step in %S
 
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
-stepOutTooltip=Step Out %S
+stepOutTooltip=Step out %S
 
 # LOCALIZATION NOTE (skipPausingTooltip.label): The tooltip text for disabling all
 # breakpoints and pausing triggers
@@ -391,30 +391,30 @@
 
 # LOCALIZATION NOTE (breakpoints.enable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.enable=Enable Breakpoints
+breakpoints.enable=Enable breakpoints
 
 # LOCALIZATION NOTE (breakpoints.disable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.disable=Disable Breakpoints
+breakpoints.disable=Disable breakpoints
 
 # LOCALIZATION NOTE (breakpoints.removeBreakpointTooltip): The tooltip that is displayed
 # for remove breakpoint button in right sidebar
-breakpoints.removeBreakpointTooltip=Remove Breakpoint
+breakpoints.removeBreakpointTooltip=Remove breakpoint
 
 # LOCALIZATION NOTE (callStack.header): Call Stack right sidebar pane header.
-callStack.header=Call Stack
+callStack.header=Call stack
 
 # LOCALIZATION NOTE (callStack.notPaused): Call Stack right sidebar pane
 # message when not paused.
-callStack.notPaused=Not Paused
+callStack.notPaused=Not paused
 
 # LOCALIZATION NOTE (callStack.collapse): Call Stack right sidebar pane
 # message to hide some of the frames that are shown.
-callStack.collapse=Collapse Rows
+callStack.collapse=Collapse rows
 
 # LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane
 # message to show more of the frames.
-callStack.expand=Expand Rows
+callStack.expand=Expand rows
 
 # LOCALIZATION NOTE (callStack.group.expandTooltip): The text that will appear
 # when hovering a collapsed Group of frames in the callStack panel. `frames` is
@@ -441,33 +441,33 @@
 
 # LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar
 # tooltip for traversing to the Next Result
-editor.searchResults.nextResult=Next Result
+editor.searchResults.nextResult=Next result
 
 # LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar
 # tooltip for traversing to the Previous Result
-editor.searchResults.prevResult=Previous Result
+editor.searchResults.prevResult=Previous result
 
 # LOCALIZATION NOTE (editor.continueToHere.label): Editor gutter context
 # menu item for jumping to a new paused location
-editor.continueToHere.label=Continue To Here
+editor.continueToHere.label=Continue to here
 editor.continueToHere.accesskey=H
 
 # LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item
 # for adding a breakpoint on a line.
-editor.addBreakpoint=Add Breakpoint
+editor.addBreakpoint=Add breakpoint
 
 # LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item
 # for disabling a breakpoint on a line.
-editor.disableBreakpoint=Disable Breakpoint
+editor.disableBreakpoint=Disable breakpoint
 editor.disableBreakpoint.accesskey=D
 
 # LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item
 # for enabling a breakpoint on a line.
-editor.enableBreakpoint=Enable Breakpoint
+editor.enableBreakpoint=Enable breakpoint
 
 # LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item
 # for removing a breakpoint on a line.
-editor.removeBreakpoint=Remove Breakpoint
+editor.removeBreakpoint=Remove breakpoint
 
 # LOCALIZATION NOTE (editor.addConditionBreakpoint): Editor gutter context
 # menu item for adding a breakpoint condition on a line.
@@ -568,23 +568,23 @@
 
 # LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
 # context menu to disable framework grouping.
-framework.disableGrouping=Disable Framework Grouping
+framework.disableGrouping=Disable framework grouping
 framework.disableGrouping.accesskey=u
 
 # LOCALIZATION NOTE (framework.enableGrouping): This is the text that appears in the
 # context menu to enable framework grouping.
-framework.enableGrouping=Enable Framework Grouping
+framework.enableGrouping=Enable framework grouping
 framework.enableGrouping.accesskey=u
 
 # LOCALIZATION NOTE (generated): Source Map term for a server source location
-generated=Generated
+generated=generated
 
 # LOCALIZATION NOTE (original): Source Map term for a debugger UI source location
-original=Original
+original=original
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
-expressions.placeholder=Add Watch Expression
+expressions.placeholder=Add watch expression
 
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
@@ -630,42 +630,42 @@
 
 # LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item
 # for closing the selected tab below the mouse.
-sourceTabs.closeTab=Close Tab
+sourceTabs.closeTab=Close tab
 sourceTabs.closeTab.accesskey=C
 sourceTabs.closeTab.key=CmdOrCtrl+W
 
 # LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item
 # for closing the other tabs.
-sourceTabs.closeOtherTabs=Close Other Tabs
+sourceTabs.closeOtherTabs=Close other tabs
 sourceTabs.closeOtherTabs.accesskey=o
 
 # LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item
 # for closing the tabs to the end (the right for LTR languages) of the selected tab.
-sourceTabs.closeTabsToEnd=Close Tabs to the Right
+sourceTabs.closeTabsToEnd=Close tabs to the right
 sourceTabs.closeTabsToEnd.accesskey=e
 
 # LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item
 # for closing all tabs.
-sourceTabs.closeAllTabs=Close All Tabs
+sourceTabs.closeAllTabs=Close all tabs
 sourceTabs.closeAllTabs.accesskey=A
 
 # LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item
 # for revealing source in tree.
-sourceTabs.revealInTree=Reveal in Tree
+sourceTabs.revealInTree=Reveal in tree
 sourceTabs.revealInTree.accesskey=R
 
 # LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item
 # for pretty printing the source.
-sourceTabs.prettyPrint=Pretty Print Source
+sourceTabs.prettyPrint=Pretty print source
 sourceTabs.prettyPrint.accesskey=P
 
 # LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated
 # with the blackbox button
-sourceFooter.blackbox=Blackbox Source
+sourceFooter.blackbox=Blackbox source
 
 # LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated
 # with the blackbox button
-sourceFooter.unblackbox=Unblackbox Source
+sourceFooter.unblackbox=Unblackbox source
 
 # LOCALIZATION NOTE (blackboxContextItem.blackbox): Text associated
 # with the blackbox context menu item
@@ -724,11 +724,11 @@
 
 # LOCALIZATION NOTE (scopes.notAvailable): Scopes right sidebar pane message
 # for when the debugger is paused, but there isn't pause data.
-scopes.notAvailable=Scopes Unavailable
+scopes.notAvailable=Scopes unavailable
 
 # LOCALIZATION NOTE (scopes.notPaused): Scopes right sidebar pane message
 # for when the debugger is not paused.
-scopes.notPaused=Not Paused
+scopes.notPaused=Not paused
 
 # LOCALIZATION NOTE (scopes.mapping.label): Scopes right sidebar pane
 # tooltip for checkbox and label
@@ -778,7 +778,7 @@
 
 # LOCALIZATION NOTE (watchExpressions.header): Watch Expressions right sidebar
 # pane header.
-watchExpressions.header=Watch Expressions
+watchExpressions.header=Watch expressions
 
 # LOCALIZATION NOTE (watchExpressions.refreshButton): Watch Expressions header
 # button for refreshing the expressions.
@@ -810,7 +810,7 @@
 
 # LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search
 # prompt for searching for files.
-sourceSearch.search=Search Sources…
+sourceSearch.search=Search sources…
 
 # LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search
 # prompt for searching for files.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/font-inspector.properties firefox-85.0+build1/l10n/en-GB/devtools/client/font-inspector.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/font-inspector.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/font-inspector.properties	2021-01-18 20:03:08.000000000 +0000
@@ -58,7 +58,7 @@
 
 # LOCALIZATION NOTE (fontinspector.allFontsOnPageHeader): Header for the section listing
 # all the fonts on the current page.
-fontinspector.allFontsOnPageHeader=All fonts on page
+fontinspector.allFontsOnPageHeader=All Fonts on Page
 
 # LOCALIZATION NOTE (fontinspector.fontsUsedLabel): Label for the Font Editor section
 # which shows the fonts used on the selected element.
@@ -66,4 +66,4 @@
 
 # LOCALIZATION NOTE (fontinspector.previewTextPlaceholder): Placeholder for the input
 # where the user can type text to get a preview of it using a font.
-fontinspector.previewTextPlaceholder=Font preview text
+fontinspector.previewTextPlaceholder=Font Preview Text
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/inspector.properties firefox-85.0+build1/l10n/en-GB/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/inspector.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/inspector.properties	2021-01-18 20:03:08.000000000 +0000
@@ -455,7 +455,7 @@
 # LOCALIZATION NOTE (inspector.browserStyles.label): This is the label for the checkbox
 # that specifies whether the styles that are not from the user's stylesheet should be
 # displayed or not.
-inspector.browserStyles.label=Browser styles
+inspector.browserStyles.label=Browser Styles
 
 # LOCALIZATION NOTE (inspector.filterStyles.placeholder): This is the placeholder that
 # goes in the search box when no search term has been entered.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/markers.properties firefox-85.0+build1/l10n/en-GB/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/markers.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/markers.properties	2021-01-18 20:03:08.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/en-GB/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/netmonitor.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/netmonitor.properties	2021-01-18 20:03:08.000000000 +0000
@@ -72,7 +72,7 @@
 
 # LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
 # headers tab of the network details pane for the filtering input.
-headersFilterText=Filter headers
+headersFilterText=Filter Headers
 
 # LOCALIZATION NOTE (messagesEmptyText): This is the text displayed in the
 # WebSockets tab of the network details pane when there are no frames available.
@@ -84,7 +84,7 @@
 
 # LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
 # cookies tab of the network details pane for the filtering input.
-cookiesFilterText=Filter cookies
+cookiesFilterText=Filter Cookies
 
 # LOCALIZATION NOTE (responseEmptyText): This is the text displayed in the
 # response tab of the network details pane when the response is empty or not
@@ -97,11 +97,11 @@
 
 # LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
 # request tab of the network details pane for the filtering input.
-paramsFilterText=Filter request parameters
+paramsFilterText=Filter Request Parameters
 
 # LOCALIZATION NOTE (paramsQueryString): This is the label displayed
 # in the network details request tab identifying the query string.
-paramsQueryString=Query string
+paramsQueryString=Query String
 
 # LOCALIZATION NOTE (paramsFormData): This is the label displayed
 # in the network details request tab identifying the form data.
@@ -113,7 +113,7 @@
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
 # in the network details headers tab identifying the request headers.
-requestHeaders=Request headers
+requestHeaders=Request Headers
 
 # LOCALIZATION NOTE (requestHeadersFromUpload): This is the label displayed
 # in the network details headers tab identifying the request headers from
@@ -122,19 +122,19 @@
 
 # LOCALIZATION NOTE (responseHeaders): This is the label displayed
 # in the network details headers tab identifying the response headers.
-responseHeaders=Response headers
+responseHeaders=Response Headers
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
 # in the network details request tab identifying the request cookies.
-requestCookies=Request cookies
+requestCookies=Request Cookies
 
 # LOCALIZATION NOTE (responseCookies): This is the label displayed
 # in the network details request tab identifying the response cookies.
-responseCookies=Response cookies
+responseCookies=Response Cookies
 
 # LOCALIZATION NOTE (responsePayload): This is the label displayed
 # in the network details response tab identifying the response payload.
-responsePayload=Response payload
+responsePayload=Response Payload
 
 # LOCALIZATION NOTE (jsonFilterText): This is the text displayed
 # in the response tab of the network details pane for the JSON filtering input.
@@ -977,7 +977,7 @@
 
 # LOCALIZATION NOTE (netmonitor.toolbar.disableCache.label): This is the label
 # displayed for the checkbox for disabling browser cache.
-netmonitor.toolbar.disableCache.label=Disable cache
+netmonitor.toolbar.disableCache.label=Disable Cache
 
 # LOCALIZATION NOTE (netmonitor.toolbar.disableCache.tooltip): This is the tooltip
 # displayed for the checkbox for disabling browser cache.
@@ -1089,12 +1089,12 @@
 # LOCALIZATION NOTE (netmonitor.timings.dns): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
 # in a "dns" state.
-netmonitor.timings.dns=DNS resolution:
+netmonitor.timings.dns=DNS Resolution:
 
 # LOCALIZATION NOTE (netmonitor.timings.ssl): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
 # in a "tls" handshake state.
-netmonitor.timings.ssl=TLS setup:
+netmonitor.timings.ssl=TLS Setup:
 
 # LOCALIZATION NOTE (netmonitor.timings.connect): This is the label displayed
 # in the network details timings tab identifying the amount of time spent
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/network-throttling.properties firefox-85.0+build1/l10n/en-GB/devtools/client/network-throttling.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/network-throttling.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/network-throttling.properties	2021-01-18 20:03:08.000000000 +0000
@@ -15,4 +15,4 @@
 # network throttling.  This option is the default and disables throttling so you
 # just have normal network conditions.  There is not very much room in the UI
 # so a short string would be best if possible.
-responsive.noThrottling=No throttling
+responsive.noThrottling=No Throttling
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/sourceeditor.dtd firefox-85.0+build1/l10n/en-GB/devtools/client/sourceeditor.dtd
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/sourceeditor.dtd	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/sourceeditor.dtd	2021-01-18 20:03:08.000000000 +0000
@@ -20,6 +20,6 @@
 
 
 
-<!ENTITY gotoLineCmd.label         "Jump to line…">
+<!ENTITY gotoLineCmd.label         "Jump to Line…">
 <!ENTITY gotoLineCmd.key           "J">
 <!ENTITY gotoLineCmd.accesskey     "J">
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/storage.dtd firefox-85.0+build1/l10n/en-GB/devtools/client/storage.dtd
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/storage.dtd	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/storage.dtd	2021-01-18 20:03:08.000000000 +0000
@@ -5,7 +5,7 @@
 <!-- LOCALIZATION NOTE : This file contains the Storage Inspector strings. -->
 
 <!-- LOCALIZATION NOTE : Placeholder for the searchbox that allows you to filter the table items. -->
-<!ENTITY searchBox.placeholder         "Filter items">
+<!ENTITY searchBox.placeholder         "Filter Items">
 
 <!-- LOCALIZATION NOTE : Label of popup menu action to delete all storage items. -->
 <!ENTITY storage.popupMenu.deleteAllLabel "Delete All">
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/styleeditor.properties firefox-85.0+build1/l10n/en-GB/devtools/client/styleeditor.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/styleeditor.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/styleeditor.properties	2021-01-18 20:03:08.000000000 +0000
@@ -52,7 +52,7 @@
 
 # LOCALIZATION NOTE  (showOriginalSources.label): This is the label on the context
 # menu item to toggle showing original sources in the editor.
-showOriginalSources.label=Show original sources
+showOriginalSources.label=Show Original Sources
 
 # LOCALIZATION NOTE  (showOriginalSources.accesskey): This is the access key for
 # the menu item to toggle showing original sources in the editor.
@@ -60,7 +60,7 @@
 
 # LOCALIZATION NOTE  (showMediaSidebar.label): This is the label on the context
 # menu item to toggle showing @media rule shortcuts in a sidebar.
-showMediaSidebar.label=Show @media sidebar
+showMediaSidebar.label=Show @media Sidebar
 
 # LOCALIZATION NOTE  (showMediaSidebar.accesskey): This is the access key for
 # the menu item to toggle showing the @media sidebar.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/toolbox.properties firefox-85.0+build1/l10n/en-GB/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/toolbox.properties	2021-01-06 11:33:02.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/toolbox.properties	2021-01-18 20:03:08.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Show Split Console
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/en-GB/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/tooltips.ftl	2021-01-06 11:33:02.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/tooltips.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> has no effect on internal table elements.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> has no effect on internal table elements except table cells.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Try removing <strong>float</strong> or adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Try setting its <strong>position</strong> property to something else than <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Try setting its <strong>display</strong> property to something else than <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Try setting its <strong>display</strong> property to something else than <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/en-GB/devtools/client/webconsole.properties firefox-85.0+build1/l10n/en-GB/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/en-GB/devtools/client/webconsole.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/devtools/client/webconsole.properties	2021-01-18 20:03:08.000000000 +0000
@@ -189,25 +189,25 @@
 # LOCALIZATION NOTE (webconsole.menu.storeAsGlobalVar.label)
 # Label used for a context-menu item displayed for object/variable logs. Clicking on it
 # creates a new global variable pointing to the logged variable.
-webconsole.menu.storeAsGlobalVar.label=Store as global variable
+webconsole.menu.storeAsGlobalVar.label=Store as Global Variable
 webconsole.menu.storeAsGlobalVar.accesskey=S
 
 # LOCALIZATION NOTE (webconsole.menu.copyMessage.label)
 # Label used for a context-menu item displayed for any log. Clicking on it will copy the
 # content of the log (or the user selection, if any).
-webconsole.menu.copyMessage.label=Copy message
+webconsole.menu.copyMessage.label=Copy Message
 webconsole.menu.copyMessage.accesskey=C
 
 # LOCALIZATION NOTE (webconsole.menu.copyObject.label)
 # Label used for a context-menu item displayed for object/variable log. Clicking on it
 # will copy the object/variable.
-webconsole.menu.copyObject.label=Copy object
+webconsole.menu.copyObject.label=Copy Object
 webconsole.menu.copyObject.accesskey=o
 
 # LOCALIZATION NOTE (webconsole.menu.selectAll.label)
 # Label used for a context-menu item that will select all the content of the webconsole
 # output.
-webconsole.menu.selectAll.label=Select all
+webconsole.menu.selectAll.label=Select All
 webconsole.menu.selectAll.accesskey=a
 
 # LOCALIZATION NOTE (webconsole.menu.openInSidebar.label)
@@ -219,7 +219,7 @@
 # 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
+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
@@ -245,7 +245,7 @@
 
 # LOCALIZATION NOTE (webconsole.filterInput.placeholder)
 # Label used for for the placeholder on the filter input, in the console top toolbar.
-webconsole.filterInput.placeholder=Filter output
+webconsole.filterInput.placeholder=Filter Output
 
 # LOCALIZATION NOTE (webconsole.errorsFilterButton.label)
 # Label used as the text of the "Errors" button in the additional filter toolbar.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/en-GB/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/en-GB/dom/chrome/dom/dom.properties	2021-01-06 11:33:02.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/dom/chrome/dom/dom.properties	2021-01-18 20:03:08.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input> picker was blocked due to lack of user activation.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe with external protocol was blocked due to lack of user activation, or because not enough time has passed since the last such iframe was loaded.
 MultiplePopupsBlockedNoUserActivation=Opening multiple popups was blocked due to lack of user activation.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Preload of %S was ignored due to unknown “as� or “type� values, or non-matching “media� attribute.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/en-GB/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:08.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Download Error
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=The download cannot be saved because it is blocked by %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=The download cannot be saved because it is blocked by an extension.
 downloadErrorGeneric=The download cannot be saved because an unknown error occurred.\n\nPlease try again.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=A few seconds left
 timeUnknown2=Unknown time left
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S resource
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/en-GB/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:08.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Proxy server connection refused
 check_error-2153390069=Server certificate has expired (please adjust your system clock to the correct date and time if it is incorrect)
 check_error-verification_failed=The integrity of the update could not be verified
+check_error-move_failed=Failed to prepare the update for installation
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Third-Party Modules
+support-third-party-modules-module = Module File
+support-third-party-modules-version = File Version
+support-third-party-modules-vendor = Vendor Info
+support-third-party-modules-occurrence = Occurrence
+support-third-party-modules-process = Process Type & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Imagebase Address
+support-third-party-modules-uptime = Process Uptime (ms)
+support-third-party-modules-duration = Loading Duration (ms)
+support-third-party-modules-empty = No third-party modules were loaded.
+support-third-party-modules-no-value = (No value)
+support-third-party-modules-button-open =
+    .title = Open file location…
+support-third-party-modules-expand =
+    .title = Show detailed information
+support-third-party-modules-collapse =
+    .title = Collapse detailed information
+support-third-party-modules-unsigned-icon =
+    .title = This module is not signed
+support-third-party-modules-folder-icon =
+    .title = Open file location…
+support-third-party-modules-down-icon =
+    .title = Show detailed information
+support-third-party-modules-up-icon =
+    .title = Collapse detailed information
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Multiple Picture-in-Picture Support
 experimental-features-multi-pip-description = Experimental support for allowing multiple Picture-in-Picture windows to be open at the same time.
+experimental-features-http3 =
+    .label = HTTP/3 protocol
+experimental-features-http3-description = Experimental support for the HTTP/3 protocol.
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/main-window/findbar.ftl firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/main-window/findbar.ftl
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/main-window/findbar.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/main-window/findbar.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -11,7 +11,7 @@
     .tooltiptext = Find the previous occurrence of the phrase
 
 findbar-find-button-close =
-    .tooltiptext = Close Find bar
+    .tooltiptext = Close find bar
 
 findbar-highlight-all2 =
     .label = Highlight All
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Page:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } of { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Last page
-
+printpreview-homearrow-button =
+    .title = First page
+printpreview-previousarrow-button =
+    .title = Previous page
+printpreview-nextarrow-button =
+    .title = Next page
+printpreview-endarrow-button =
+    .title = Last page
diff -Nru firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/en-GB/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:33:03.000000000 +0000
+++ firefox-85.0+build1/l10n/en-GB/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:08.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = to
+printui-page-custom-range-input =
+    .aria-label = Enter custom page range
+    .placeholder = e.g. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copies
 printui-orientation = Orientation
@@ -48,6 +51,7 @@
 printui-options = Options
 printui-headers-footers-checkbox = Print headers and footers
 printui-backgrounds-checkbox = Print backgrounds
+printui-selection-checkbox = Print selection only
 printui-color-mode-label = Colour mode
 printui-color-mode-color = Colour
 printui-color-mode-bw = Black and white
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = None
 printui-margins-custom = Custom
+printui-margins-custom-inches = Custom (inches)
 printui-margins-custom-top = Top
+printui-margins-custom-top-inches = Top (inches)
 printui-margins-custom-bottom = Bottom
+printui-margins-custom-bottom-inches = Bottom (inches)
 printui-margins-custom-left = Left
+printui-margins-custom-left-inches = Left (inches)
 printui-margins-custom-right = Right
+printui-margins-custom-right-inches = Right (inches)
 printui-system-dialog-link = Print using the system dialog…
 printui-primary-button = Print
 printui-primary-button-save = Save
 printui-cancel-button = Cancel
+printui-close-button = Close
 printui-loading = Preparing Preview
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Print Preview
+printui-pages-per-sheet = Pages per sheet
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Printing…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/eo/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/aboutLogins.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/aboutLogins.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Ĉu forigi tiun ĉi legitimilon?
 confirm-delete-dialog-message = Tiu ĉi ago ne estas malfarebla.
 about-logins-confirm-remove-dialog-confirm-button = Forigi
-about-logins-confirm-remove-all-dialog-confirm-button = Forigi ĉiujn
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Forigi
+        [one] Forigi
+       *[other] Forigi ĉiujn
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Jes, forigi tiun ĉi legitimilon
@@ -181,11 +186,21 @@
         [one] Ĉu forigi tiun ĉi legitimilon?
        *[other] Ĉu forigi ĉiujn { $count } legitimilojn?
     }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Tio ĉi forigos la legitimilon konservitan de vi en { -brand-short-name } kaj ĉiujn datumfu�ajn atentigojn, kiuj aperas ĉi tie. Tiu ĉi ago ne estas malfarebla.
+       *[other] Tio ĉi forigos la legitimilojn konservitajn de vi en { -brand-short-name } kaj ĉiujn datumfu�ajn atentigojn, kiuj aperas ĉi tie. Tiu ĉi ago ne estas malfarebla.
+    }
 about-logins-confirm-remove-all-sync-dialog-title =
     { $count ->
         [one] Ĉu forigi { $count } legitimilon el ĉiuj aparatoj?
        *[other] Ĉu forigi { $count } legitimilojn el ĉiuj aparatoj?
     }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Tio ĉi forigos la legitimilon konservitan de vi en { -brand-short-name } en ĉiuj aparatoj spegulitaj per via { -fxaccount-brand-name }. Tio ankaŭ forigos la datumfu�ajn atentigojn, kiuj aperas tie. Tiu ĉi ago ne estas malfarebla.
+       *[other] Tio ĉi forigos la legitimilojn konservitajn de vi en { -brand-short-name } en ĉiuj aparatoj spegulitaj per via { -fxaccount-brand-name }. Tio ankaŭ forigos la datumfu�ajn atentigojn, kiuj aperas tie. Tiu ĉi ago ne estas malfarebla.
+    }
 about-logins-confirm-export-dialog-title = Elporti legitimilojn kaj pasvortojn
 about-logins-confirm-export-dialog-message = Viaj pasvortoj estos konservitaj kiel legebla teksto (ekzemple: Aĉ@pasvorto) tiel ke iu ajn kun aliro al la dosiero povos vidi ilin.
 about-logins-confirm-export-dialog-confirm-button = Elporti…
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/eo/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/appmenu.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/appmenu.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nova fenestro
+appmenuitem-new-private-window =
+    .label = Nova privata fenestro
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Alproksimi�i
 appmenuitem-zoom-reduce =
     .label = Malproksimi�i
+appmenuitem-fullscreen =
+    .label = Plenekrane
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Speguli nun
+appmenuitem-save-page =
+    .label = Konservi pa�on kiel…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novaĵoj
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/browser.ftl firefox-85.0+build1/l10n/eo/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/browser.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/browser.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -302,6 +302,7 @@
 identity-permissions =
     .value = Permesoj
 identity-permissions-storage-access-header = Interretejaj kuketoj
+identity-permissions-storage-access-hint = Tiuj ĉi aliaj partoprenantoj povas uzi interretejajn kuketojn kaj retejajn datumojn dum vi estas en tiu ĉi retejo,
 identity-permissions-reload-hint = Vi eble bezonos re�argi la pa�on por ke la �an�oj estu aplikitaj.
 identity-permissions-empty = Vi ne donis iun ajn specialan permeson al tiu ĉi retejo.
 identity-clear-site-data =
@@ -350,6 +351,7 @@
 browser-import-button2 =
     .label = Enporti legosignojn…
     .tooltiptext = Enporti legosignojn de alia retumilo en { -brand-short-name }.
+bookmarks-toolbar-empty-message = Por rapida aliro, metu viajn legosignojn ĉi tien, en la strion de legosignoj. <a data-l10n-name="manage-bookmarks">Administri legosignojn…</a>
 
 ## WebRTC Pop-up notifications
 
@@ -501,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> regas vian musmontrilon. Premu Esk por repreni la regadon.
 pointerlock-warning-no-domain = Tiu ĉi dokumento regas vian musmontrilon. Premu Esk por repreni la regadon.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Montri ĉiujn legosignojn
+bookmarks-recent-bookmarks =
+    .value = Ä´usaj legosignoj
+bookmarks-toolbar-chevron =
+    .tooltiptext = Montri pliajn legosignojn
+bookmarks-sidebar-content =
+    .aria-label = Legosignoj
+bookmarks-menu-button =
+    .label = Menuo de legosignoj
+bookmarks-other-bookmarks-menu =
+    .label = Aliaj legosignoj
+bookmarks-mobile-bookmarks-menu =
+    .label = Po�aparataj legosignoj
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ka�i flankan strion de legosignoj
+           *[other] Montri flankan strion de legosignoj
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ka�i ilaron de legosignoj
+           *[other] Montri ilaron de legosignoj
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Forigi la menuon de legosignojn el la ilaro
+           *[other] Aldoni la menuon de legosignoj al la ilaro
+        }
+bookmarks-search =
+    .label = Serĉi legosignojn
+bookmarks-tools =
+    .label = Iloj por legosignoj
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Ilaro de legosignoj
+    .accesskey = e
+    .aria-label = Legosignoj
+bookmarks-toolbar-menu =
+    .label = Ilaro de legosignoj
+bookmarks-toolbar-placeholder =
+    .title = Elementoj de ilaro de legosignoj
+bookmarks-toolbar-placeholder-button =
+    .label = Elementoj de ilaro de legosignoj
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Legosignoj
+library-bookmarks-bookmark-this-page =
+    .label = Aldoni legosignon por tiu ĉi pa�o
+library-bookmarks-bookmark-edit =
+    .label = Redakti tiun ĉi legosignon
+
+## More items
+
+more-menu-go-offline =
+    .label = Labori malkonektite
+    .accesskey = L
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/eo/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/newtab/asrouter.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -275,3 +275,8 @@
 cfr-whatsnew-media-keys-header = Pli da regiloj aÅ­dvidaj
 cfr-whatsnew-media-keys-body = Ludi kaj paŭzigi sonon aŭ videon senpere el via klavaro aŭ kapaŭskultiloj. Tio simpligas la taskon regi aŭdvidaĵojn el alia langeto, programo aŭ eĉ dum via komputilo estas blokita. Vi ankaŭ povas movi�i inter kantoj aŭ filmetoj per la sagoklavoj, antaŭen kaj malantaŭen.
 cfr-whatsnew-media-keys-button = Lernu kiel fari
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Serĉi �parvojojn en la adresa strio
+cfr-whatsnew-search-shortcuts-body = Ekde nun, kiam vi tajpas serĉilon aŭ specifan retejon en la adresa strio, blua �parvojo aperos en la subaj serĉaj sugestoj. Elektu tiun �parvojon por serĉi rekte el la adresa strio.
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/eo/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/newtab/newtab.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nova langeto
 newtab-settings-button =
     .title = Personecigi la pa�on por novaj langetoj
+newtab-personalize-button-label = Personcecigi
+    .title = Personecigi novan langeton
+    .aria-label = Personecigi novan langeton
 
 ## Search box component.
 
@@ -203,3 +206,27 @@
 
 newtab-error-fallback-info = Fu�', io malbona okazis dum �argo de tiu ĉi enhavo.
 newtab-error-fallback-refresh-link = Refre�igi pa�on por klopodi denove.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Åœparvojoj
+newtab-custom-shortcuts-subtitle = Retejoj konservitaj aÅ­ vizititaj de vi
+newtab-custom-row-selector =
+    { $num ->
+        [one] unu vico
+       *[other] { $num } vicoj
+    }
+newtab-custom-sponsored-sites = Patronitaj �parvojoj
+newtab-custom-pocket-title = Rekomendita de { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Eksterordinara  enhavo reviziita de  { -pocket-brand-name }, parto de la familio { -brand-product-name }
+newtab-custom-pocket-sponsored = Patronitaj artikoloj
+newtab-custom-recent-title = Ä´usa agado
+newtab-custom-recent-subtitle = Elekto de ĵusaj retejoj kaj enhavoj
+newtab-custom-close-button = Fermi
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Fragmentoj
+newtab-custom-snippets-subtitle = Konsiletoj kaj novaĵoj de { -vendor-short-name } kaj { -brand-product-name }
+newtab-custom-settings = Administri aliajn agordojn
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/nsserrors.ftl firefox-85.0+build1/l10n/eo/browser/browser/nsserrors.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/nsserrors.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/nsserrors.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -2,6 +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/.
 
+
 # DO NOT ADD THINGS OTHER THAN ERROR MESSAGES HERE.
 # This file gets parsed into a JS dictionary of all known error message ids in
 # gen_aboutneterror_codes.py . If we end up needing fluent attributes or
@@ -11,20 +12,16 @@
 # $hostname (String) - Hostname of the website with SSL error.
 # $errorMessage (String) - Error message corresponding to the type of error we are experiencing.
 ssl-connection-error = Okazis eraro dum la konekto al { $hostname }. { $errorMessage }
-
 # Variables:
 # $error (string) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix = Erarkodo: { $error }
-
 psmerr-ssl-disabled = Ne eblas konekti�i sekure ĉar la protokolo SSL estis malaktivigita.
 psmerr-ssl2-disabled = Ne eblas konekti�i sekure ĉar la retejo uzas malnovan, nesekuran version de la protokolo SSL.
-
 # This is a multi-line message.
 psmerr-hostreusedissuerandserial =
     Vi ricevis nevalidan atestilon.  Bonvolu kontakti la administranton de la servilo aŭ la sendinton de la retpo�to kaj doni al ili la jenan informon:
     
     Via atestilo enhavas la saman serian numeron de alia atestilo eldonita de la atestila aÅ­toritato.  Bonvolu akiri novan atestilon kiu enhavas unikan serian numeron.
-
 ssl-error-export-only-server = Ne eblas komuniki�i sekure.  La paro ne kapablas uzi altgradan ĉifradon.
 ssl-error-us-only-server = Ne eblas komuniki�i sekure.  La paro postulas altgradan ĉifradon kiu ne estas subtenata.
 ssl-error-no-cypher-overlap = Ne eblas komuniki�i sekure kun la paro: neniu komuna ĉifra algoritmo.
@@ -267,10 +264,10 @@
 sec-error-bad-nickname = Certificate nickname already in use.
 sec-error-not-fortezza-issuer = Peer FORTEZZA chain has a non-FORTEZZA Certificate.
 sec-error-cannot-move-sensitive-key = A sensitive key cannot be moved to the slot where it is needed.
-sec-error-js-invalid-module-name = Nevalida nomo de programono.
+sec-error-js-invalid-module-name = Nevalida nomo de modulo.
 sec-error-js-invalid-dll = Invalid module path/filename
-sec-error-js-add-mod-failure = Ne eblas aldoni la programonon
-sec-error-js-del-mod-failure = Ne eblas forigi programonon
+sec-error-js-add-mod-failure = Ne eblas aldoni la modulom
+sec-error-js-del-mod-failure = Ne eblas forigi modulon
 sec-error-old-krl = New KRL is not later than the current one.
 sec-error-ckl-conflict = New CKL has different issuer than current CKL.  Delete current CKL.
 sec-error-cert-not-in-name-space = The Certifying Authority for this certificate is not permitted to issue a certificate with this name.
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/eo/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/preferences/preferences.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Viaj plej vizititaj retejoj
 home-prefs-topsites-by-option-sponsored =
     .label = Patronitaj ĉefaj retejoj
+home-prefs-shortcuts-header =
+    .label = Åœparvojoj
+home-prefs-shortcuts-description = Retejoj konservitaj aÅ­ vizititaj de vi
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Patronitaj �parvojoj
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Rekomendita de { $provider }
 home-prefs-recommended-by-description-update = Eksterordinara enhavo el la reto, reviziita de { $provider }
+home-prefs-recommended-by-description-new = Eksterordinara  enhavo reviziita de { $provider }, parto de la familio { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Patronitaj artikoloj
 home-prefs-highlights-header =
     .label = Elstaraĵoj
-home-prefs-recent-activity-header =
-    .label = Ä´usa agado
 home-prefs-highlights-description = Retejoj elektitaj inter tiuj, kiun vi vizitis aÅ­ konservis
 home-prefs-highlights-option-visited-pages =
     .label = Vizititaj pa�oj
@@ -526,6 +530,9 @@
     .label = Lasta el�uto
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pa�oj konservitaj en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Ä´usa agado
+home-prefs-recent-activity-description = Elekto de ĵusaj retejoj kaj enhavoj
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Fragmentoj
 home-prefs-snippets-description = Äœisdatigoj de { -vendor-short-name } kaj { -brand-product-name }
+home-prefs-snippets-description-new = Konsiletoj kaj novaĵoj de { -vendor-short-name } kaj { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -927,6 +935,9 @@
 addressbar-locbar-topsites-option =
     .label = Plej vizititaj
     .accesskey = v
+addressbar-locbar-engines-option =
+    .label = Serĉiloj
+    .accesskey = S
 addressbar-suggestions-settings = Ŝan�i preferojn pri serĉilaj sugestoj
 
 ## Privacy Section - Content Blocking
@@ -934,6 +945,7 @@
 content-blocking-enhanced-tracking-protection = Plibonigita protekto kontraÅ­ spurado
 content-blocking-section-top-level-description = Spuriloj sekvas vin en la reto por kolekti informon pri via kutima retumo kaj pri viaj interesoj. { -brand-short-name } blokas plurajn el tiuj spuriloj kaj aliajn malicajn skriptojn.
 content-blocking-learn-more = Pli da informo
+content-blocking-fpi-incompatibility-warning = Vi uzas nomregnan izoladon (First Party Isolation - FPI), kiu superregas kelkajn el la agordoj de { -brand-short-name } por kuketoj.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/eo/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/eo/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Nur en nova langeto
     .accesskey = e
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Ĉiam montri
+    .accesskey = m
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Neniam montri
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Montri nur en nova langeto
+    .accesskey = n
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Montri aliajn legosignojn
     .accesskey = l
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/eo/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/eo/browser/chrome/browser/browser.properties	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/chrome/browser/browser.properties	2021-01-18 20:03:13.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=K
 getUserMedia.pickWindowOrScreen.label = Elektu fenestron aÅ­ ekranon
 getUserMedia.shareEntireScreen.label = Tuta ekrano
+getUserMedia.sharePipeWirePortal.label = Uzi la agordojn de la mastruma sistemo
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/eo/browser/chrome/browser/fxmonitor.properties firefox-85.0+build1/l10n/eo/browser/chrome/browser/fxmonitor.properties
--- firefox-84.0.2+build1/l10n/eo/browser/chrome/browser/fxmonitor.properties	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/browser/chrome/browser/fxmonitor.properties	2021-01-18 20:03:13.000000000 +0000
@@ -34,9 +34,9 @@
 # #2: The name of the breached site.
 # #3: The year of the breach.
 # #4: The brand name ("Firefox Monitor").
-fxmonitor.popupTextRounded=Pli ol #1 konto de #2 estis elmetita en #3. Kontrolu #4 por scii ĉu la via estas minacata.;Pli ol #1 kontroj de #2 estis elmetitaj en #3. Kontrolu #4 por scii ĉu la via estas minacata.
+fxmonitor.popupTextRounded=Pli ol #1 konto de #2 estis elmetita en #3. Kontrolu #4 por scii ĉu la via estas minacata.;Pli ol #1 kontoj de #2 estis elmetitaj en #3. Kontrolu #4 por scii ĉu la via estas minacata.
 # %S is replaced with fxmonitor.brandName.
-fxmonitor.checkButton.label=Kontroli %S
+fxmonitor.checkButton.label=Kontroli per %S
 fxmonitor.checkButton.accessKey=K
 fxmonitor.dismissButton.label=Ignori
 fxmonitor.dismissButton.accessKey=I
diff -Nru firefox-84.0.2+build1/l10n/eo/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/eo/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/eo/devtools/client/tooltips.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/devtools/client/tooltips.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -12,70 +12,41 @@
 ## the property is not applied.
 ## Variables:
 ##   $property (string) - A CSS property name e.g. "color".
-
-
-## In the Rule View when a CSS property cannot be successfully applied we display
-## an icon. When this icon is hovered this message is displayed to explain why
-## the property is not applied.
-## Variables:
-##   $property (string) - A CSS property name e.g. "color".
 ##   $display (string) - A CSS display value e.g. "inline-block".
 
 inactive-css-not-grid-or-flex-container = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento, ĉar �i estas nek ingo flex nek ingo krada.
-
 inactive-css-not-grid-or-flex-container-or-multicol-container = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas ingo flex, ingo krada aŭ ingo plurkolumna.
-
 inactive-css-not-grid-or-flex-item = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas ingo flex aŭ ingo krada.
-
 inactive-css-not-grid-item = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas krada elemento.
-
 inactive-css-not-grid-container = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas ingo krada.
-
 inactive-css-not-flex-item = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas elemento flex.
-
 inactive-css-not-flex-container = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas ingo flex.
-
 inactive-css-not-inline-or-tablecell = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas entekstan aŭ tabelĉela elemento.
-
 inactive-css-property-because-of-display = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �ia atributo "display" estas <strong>{ $display }</strong>.
-
 inactive-css-not-display-block-on-floated = La valoro de <strong>display</strong> estis �an�ita de la motoro al <strong>block</strong> ĉar la elemento estas <strong>floated<strong>.
-
 inactive-css-property-is-impossible-to-override-in-visited = Ne eblas superregi <strong>{ $property }</strong> pro limigo de <strong>:visited</strong>.
-
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar �i ne estas lokita elemento.
-
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> ne efikas sur tiu ĉi elemento ĉar <strong>overflow:hidden</strong> ne havas valoron.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> havas neniun efikon sur tiu ĉi elemento ĉar �ia <strong>outline-style</strong> estas <strong>auto</strong> aŭ <strong>none</strong>.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
 
 inactive-css-not-grid-or-flex-container-fix = Provu aldoni <strong>display:grid</strong> aÅ­ <strong>display:flex</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Provu aldoni ĉu <strong>display:grid</strong>, <strong>display:flex</strong>, ĉu <strong>columns:2</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-item-fix-2 = Provu aldoni <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, aÅ­ <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-grid-item-fix-2 = Provu aldoni <strong>display:grid</strong> aÅ­ <strong>display:inline-grid</strong> al la gepatro de la elemento. { learn-more }
-
 inactive-css-not-grid-container-fix = Provu aldoni <strong>display:grid</strong> aÅ­ <strong>display:inline-grid</strong>. { learn-more }
-
 inactive-css-not-flex-item-fix-2 = Provu aldoni <strong>display:flex</strong> aÅ­ <strong>display:inline-flex</strong> al la gepatro de la elemento. { learn-more }
-
 inactive-css-not-flex-container-fix = Provu aldoni <strong>display:flex</strong> aÅ­ <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-inline-or-tablecell-fix = Provu aldoni <strong>display:inline</strong> aÅ­ <strong>display:table-cell</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-row-or-row-group-fix = Provu aldoni <strong>display:inline-block</strong> aÅ­ <strong>display:block</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-column-or-column-group-fix = Provu aldoni <strong>display:inline-block</strong>. { learn-more }
-
 inactive-css-not-display-block-on-floated-fix = Provu forigi <strong>float</strong> aÅ­ aldoni <strong>display:block</strong>. { learn-more }
-
 inactive-css-position-property-on-unpositioned-box-fix = Klopodu difini �ian atributon <strong>position</strong> per valoro diferenca de <strong>static</strong>. { learn-more }
-
 inactive-text-overflow-when-no-overflow-fix = Provu aldoni <strong>overflow:hidden</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Provu difini la atributon <strong>outline-style</strong> kiel ion malsaman de <strong>auto</strong> aÅ­ <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
@@ -85,17 +56,10 @@
 ##   $rootProperty (string) - A raw CSS property name e.g. "user-select" that is not a platform specific alias.
 
 css-compatibility-default-message = <strong>{ $property }</strong> ne estas subtenata en la jenaj retumiloj:
-
 css-compatibility-deprecated-experimental-message = <strong>{ $property }</strong> estis eksperimenta atributo, nun kadukigita de la normoj W3C. Äœi ne estas subtenata en la jenaj retumiloj:
-
 css-compatibility-deprecated-experimental-supported-message = <strong>{ $property }</strong> estis eksperimenta atributo, nun kadukigita de la normoj W3C.
-
 css-compatibility-deprecated-message = <strong>{ $property }</strong> estas eksperimenta atributo, nun kadukigita de la normoj W3C. Äœi ne estas subtenata en la jenaj retumiloj:
-
 css-compatibility-deprecated-supported-message = <strong>{ $property }</strong> estas kadukigita de la normoj W3C.
-
 css-compatibility-experimental-message = <strong>{ $property }</strong> estas eksperimenta atributo. Äœi ne estas subtenata en la jenaj retumiloj:
-
 css-compatibility-experimental-supported-message = <strong>{ $property }</strong> estas eksperimenta atributo.
-
 css-compatibility-learn-more-message = <span data-l10n-name="link">Pli da informo</span> pri <strong>{ $rootProperty }</strong>
diff -Nru firefox-84.0.2+build1/l10n/eo/devtools/client/webconsole.properties firefox-85.0+build1/l10n/eo/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/eo/devtools/client/webconsole.properties	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/devtools/client/webconsole.properties	2021-01-18 20:03:13.000000000 +0000
@@ -7,27 +7,6 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
-# LOCALIZATION NOTE (browserConsole.title): shown as the
-# title when opening the browser console popup
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
 
 # LOCALIZATION NOTE (browserConsole.title): shown as the
 # title when opening the browser console popup
@@ -500,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Ruli esprimon (%S). Tio ne vi�os la enigon.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Regula aran�o de kodo
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/eo/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/eo/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/eo/dom/chrome/dom/dom.properties	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/dom/chrome/dom/dom.properties	2021-01-18 20:03:13.000000000 +0000
@@ -421,4 +421,8 @@
 LocChangeFloodingPrevented=Tro multe da vokoj al la API de historio aÅ­ pozicio dum mallonga periodo.
 FolderUploadPrompt.title = Konfirmi al�uton
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = Ĉu vi certe volas al�uti ĉiujn dosierojn el “%S�? Faru tion nur se vi fidas la retejon.
 FolderUploadPrompt.acceptButtonLabel = Al�uti
+InputPickerBlockedNoUserActivation=La elektilo <input> estis blokita pro manko de aktivigo de uzanto.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe kun ekstera protokolo estis blokita pro manko de aktivigo de uzanto aŭ ĉar ne pasis sufiĉe da tempo ekde la �argado de la lasta tia iframe.
+MultiplePopupsBlockedNoUserActivation=Malfermo de pluraj �prucaĵoj estis blokita pro manko de aktivigo de uzanto.
diff -Nru firefox-84.0.2+build1/l10n/eo/security/manager/chrome/pipnss/nsserrors.properties firefox-85.0+build1/l10n/eo/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-84.0.2+build1/l10n/eo/security/manager/chrome/pipnss/nsserrors.properties	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/security/manager/chrome/pipnss/nsserrors.properties	2021-01-18 20:03:13.000000000 +0000
@@ -244,10 +244,10 @@
 SEC_ERROR_BAD_NICKNAME=Certificate nickname already in use.
 SEC_ERROR_NOT_FORTEZZA_ISSUER=Peer FORTEZZA chain has a non-FORTEZZA Certificate.
 SEC_ERROR_CANNOT_MOVE_SENSITIVE_KEY=A sensitive key cannot be moved to the slot where it is needed.
-SEC_ERROR_JS_INVALID_MODULE_NAME=Nevalida nomo de programono.
+SEC_ERROR_JS_INVALID_MODULE_NAME=Nevalida nomo de modulo.
 SEC_ERROR_JS_INVALID_DLL=Invalid module path/filename
-SEC_ERROR_JS_ADD_MOD_FAILURE=Ne eblas aldoni la programonon
-SEC_ERROR_JS_DEL_MOD_FAILURE=Ne eblas forigi programonon
+SEC_ERROR_JS_ADD_MOD_FAILURE=Ne eblas aldoni la modulon
+SEC_ERROR_JS_DEL_MOD_FAILURE=Ne eblas forigi modulon
 SEC_ERROR_OLD_KRL=New KRL is not later than the current one.
 SEC_ERROR_CKL_CONFLICT=New CKL has different issuer than current CKL.  Delete current CKL.
 SEC_ERROR_CERT_NOT_IN_NAME_SPACE=The Certifying Authority for this certificate is not permitted to issue a certificate with this name.
diff -Nru firefox-84.0.2+build1/l10n/eo/security/manager/security/certificates/deviceManager.ftl firefox-85.0+build1/l10n/eo/security/manager/security/certificates/deviceManager.ftl
--- firefox-84.0.2+build1/l10n/eo/security/manager/security/certificates/deviceManager.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/security/manager/security/certificates/deviceManager.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -8,40 +8,30 @@
 devmgr =
     .title = Administrilo de aparatoj
     .style = width: 67em; height: 32em;
-
 devmgr-devlist =
     .label = Sekurecaj programonoj kaj aparatoj
-
 devmgr-header-details =
     .label = Detaloj
-
 devmgr-header-value =
     .label = Valoro
-
 devmgr-button-login =
     .label = Akreditado
     .accesskey = a
-
 devmgr-button-logout =
     .label = Fini seancon
     .accesskey = S
-
 devmgr-button-changepw =
     .label = Ŝan�i pasvorton
     .accesskey = P
-
 devmgr-button-load =
     .label = Åœargi
     .accesskey = Ŝ
-
 devmgr-button-unload =
     .label = Mal�argi
     .accesskey = M
-
 devmgr-button-enable-fips =
     .label = Ebligi FIPS
     .accesskey = M
-
 devmgr-button-disable-fips =
     .label = Malaktivigi FIPS-on
     .accesskey = M
@@ -50,20 +40,15 @@
 
 load-device =
     .title = Åœargi aparatan pelilon de PKCS#11
-
 load-device-info = Tajpu la informon pri la modulo kiun vi volas aldoni.
-
 load-device-modname =
     .value = Nomo de modulo
     .accesskey = M
-
 load-device-modname-default =
-    .value = Nova PKCS#11 programono
-
+    .value = Nova PKCS#11 modulo
 load-device-filename =
     .value = Dosiero de modulo
     .accesskey = d
-
 load-device-browse =
     .label = Esplori…
     .accesskey = E
@@ -72,64 +57,45 @@
 
 devinfo-status =
     .label = Stato
-
 devinfo-status-disabled =
     .label = Malaktiva
-
 devinfo-status-not-present =
     .label = Mankanta
-
 devinfo-status-uninitialized =
     .label = Sen valoro
-
 devinfo-status-not-logged-in =
     .label = Ne akrediti�inta
-
 devinfo-status-logged-in =
     .label = Akrediti�inta
-
 devinfo-status-ready =
     .label = Preta
-
 devinfo-desc =
     .label = Priskribo
-
 devinfo-man-id =
     .label = Fabrikanto
-
 devinfo-hwversion =
     .label = Aparata versio
 devinfo-fwversion =
     .label = Firmprograma versio
-
 devinfo-modname =
     .label = Modulo
-
 devinfo-modpath =
     .label = Vojo
-
 login-failed = Malsukcesa akreditado.
-
 devinfo-label =
     .label = Etikedo
-
 devinfo-serialnum =
     .label = Seria numero
-
 fips-nonempty-password-required = La re�imo FIPS postulas ke vi havu Ĉefan pasvorton por ĉiu sekureca aparato. Bonvolu difini la pasvorton antaŭ ol klopodi aktivigi la re�imon FIPS.
-
 fips-nonempty-primary-password-required = La re�imo FIPS postulas ke vi havu ĉefan pasvorton por ĉiu sekureca aparato. Bonvolu difini la pasvorton antaŭ ol klopodi aktivigi la re�imon FIPS.
 unable-to-toggle-fips = Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
 load-pk11-module-file-picker-title = Elekti �argotan PKCS#11 aparatan pelilon
-
 # Load Module Dialog
 load-module-help-empty-module-name =
     .value = La nomo de modulo ne povas esti malplena.
-
 # Do not translate 'Root Certs'
 load-module-help-root-certs-module-name =
     .value = La nomo ‘Root Certs‘ estas rezervita kaj ne povas esti uzita kiel nomo de modulo.
-
-add-module-failure = Ne eblas aldoni la programonon
-del-module-warning = Ĉu vi certe volas forvi�i tiun ĉi sekurecan programonon?
+add-module-failure = Ne eblas aldoni la modulon
+del-module-warning = Ĉu vi certe volas forigi tiun ĉi sekurecan modulon?
 del-module-error = Ne eblas forigi modulon
diff -Nru firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/eo/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -185,6 +185,25 @@
 
 ##
 
+support-third-party-modules-title = Moduloj de aliaj
+support-third-party-modules-module = Dosiero de modulo
+support-third-party-modules-version = Versio de dosiero
+support-third-party-modules-vendor = Informo de provizanto
+support-third-party-modules-process = Tipo kaj identigilo de procezo
+support-third-party-modules-thread = Fadeno
+support-third-party-modules-uptime = DaÅ­ro de procezo (ms)
+support-third-party-modules-duration = Daŭro de �argado (ms)
+support-third-party-modules-no-value = (sen valoro)
+support-third-party-modules-expand =
+    .title = Montri detalan informon
+support-third-party-modules-collapse =
+    .title = Ka�i detalan informon
+support-third-party-modules-unsigned-icon =
+    .title = Tiu ĉi modulo ne estas subskribita
+support-third-party-modules-down-icon =
+    .title = Montri detalan informon
+support-third-party-modules-up-icon =
+    .title = Ka�i detalan informon
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/eo/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -82,10 +82,6 @@
     .label = Iloj por programistoj: senerarigo de Service worker
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support-description = Tio ĉi aktivigas eksperimentan subtenon de Service workers en la erarserĉila panelo. Tiu ĉi trajto povas malrapidigi la ilojn por programistoj kaj uzi pli da memoro.
-# Desktop zooming experiment
-experimental-features-graphics-desktop-zooming =
-    .label = Grafiko: flua skalo per pinĉo
-experimental-features-graphics-desktop-zooming-description = Tio ĉi aktivigas fluan skalon per pinĉo en tu�ekranoj kaj precizaj tu�matoj.
 # WebRTC global mute toggle controls
 experimental-features-webrtc-global-mute-toggles =
     .label = Ŝalti/mal�alti sonon WebRTC ĉie
@@ -98,3 +94,7 @@
 experimental-features-fission =
     .label = Fission (reteja izolado)
 experimental-features-fission-description = Fission (reteja izolado) estas eksperimenta trajto en { -brand-short-name } kiu provizas aldonan defendan tavolon kontraŭ sekurecaj problemoj. Fission izolas ĉiun retejon, kaj do malicaj pa�oj ne povas aliri informojn de aliaj vizitataj pa�oj. Tiu ĉi estas tre grava kerna arĥitektura �an�o en { -brand-short-name } kaj ni dankas vian testadon kaj la raporton de iu ajn problemo, kiun vi renkontos. Por havi pli da informo, vizitu <a data-l10n-name="wiki">la vikion</a>.
+# Support for having multiple Picture-in-Picture windows open simultaneously
+experimental-features-multi-pip =
+    .label = Subteno por pluraj inkrustitaj filmetoj
+experimental-features-multi-pip-description = Eksperimenta subteno por permesi la samtempan malfermon de pluraj inkrustitaj filmetoj.
diff -Nru firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/eo/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pa�o:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } el { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Lasta pa�o
-
+printpreview-homearrow-button =
+    .title = Unua pa�o
+printpreview-previousarrow-button =
+    .title = Antaŭa pa�o
+printpreview-nextarrow-button =
+    .title = Venonta pa�o
+printpreview-endarrow-button =
+    .title = Lasta pa�o
diff -Nru firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/eo/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/eo/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:33:07.000000000 +0000
+++ firefox-85.0+build1/l10n/eo/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:13.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = �is
+printui-page-custom-range-input =
+    .aria-label = Difinu intervalon de pa�oj
+    .placeholder = ekzemple 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopioj
 printui-orientation = Orienti�o
@@ -56,19 +59,29 @@
 printui-margins-min = Minimuma
 printui-margins-none = Neniu
 printui-margins-custom = Personecigita
+printui-margins-custom-inches = Personecitiga (coloj)
 printui-margins-custom-top = Supre
+printui-margins-custom-top-inches = Supre (coloj)
 printui-margins-custom-bottom = Malsupre
+printui-margins-custom-bottom-inches = Malsupre (coloj)
 printui-margins-custom-left = Maldekstre
+printui-margins-custom-left-inches = Maldekstre (coloj)
 printui-margins-custom-right = Dekstre
+printui-margins-custom-right-inches = Dekstre (coloj)
 printui-system-dialog-link = Presi per la sistema dialogo…
 printui-primary-button = Presi
 printui-primary-button-save = Konservi
 printui-cancel-button = Nuligi
+printui-close-button = Fermi
 printui-loading = AntaÅ­vido preparata
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = AntaÅ­vidi presadon
+printui-pages-per-sheet = Pa�oj en ĉiu folio
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Preso…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/aboutLogins.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/aboutLogins.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿Eliminar este inicio de sesión?
 confirm-delete-dialog-message = Esta acción no puede deshacerse.
 about-logins-confirm-remove-dialog-confirm-button = Eliminar
-about-logins-confirm-remove-all-dialog-confirm-button = Eliminar todo
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eliminar
+        [one] Eliminar todos
+       *[other] Eliminar todos
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sí, eliminar este inicio de sesión
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportar inicios de sesión y contraseñas
 about-logins-confirm-export-dialog-message = Sus contraseñas se guardarán como texto legible (por ejemplo, BadP @ ssw0rd) para que cualquiera que pueda abrir el archivo exportado pueda verlas.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importación completa
+about-logins-alert-import-message = Ver resumen detallado de la importación
 confirm-discard-changes-dialog-title = ¿Descartar cambios no guardados?
 confirm-discard-changes-dialog-message = Se van a perder todos los cambios no guardados.
 confirm-discard-changes-dialog-confirm-button = Descartar
@@ -262,3 +269,30 @@
         [macos] Documento CSV
        *[other] Archivo CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importación completa
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span> Se agregaron nuevos inicios de sesión:</span> <span-data-l10n-name="count">{ $count }</span>
+       *[other] <span> Se agregaron nuevos inicios de sesión:</span> <span-data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Se actualizaron los inicios de sesión :</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Se actualizaron los inicios de sesión :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Se encontraron inicios de sesión duplicados:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importado)</span>
+       *[other] <span>Se encontraron inicios de sesión duplicados:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importados)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importado)</span>
+       *[other] <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importados)</span>
+    }
+about-logins-import-dialog-done = Hecho
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/appmenu.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/appmenu.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nueva ventana
+appmenuitem-new-private-window =
+    .label = Nueva ventana privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Acercar
 appmenuitem-zoom-reduce =
     .label = Alejar
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar ahora
+appmenuitem-save-page =
+    .label = Guardar página como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novedades
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/appMenuNotifications.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ahora no
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Después de un reinicio rápido, { -brand-shorter-name } restaurará todas las pestañas y ventanas abiertas que no estén en el modo de navegación privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } no puede actualizarse automáticamente a la última versión.
+    .buttonlabel = Actualizar { -brand-shorter-name } de cualquier manera
+    .buttonaccesskey = U
+    .secondarybuttonlabel = No ahora
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Una nueva actualización de { -brand-shorter-name } está disponible, pero no puede instalarse porque otra copia de { -brand-shorter-name } se está ejecutando. Ciérrela para continuar la actualización o elija actualizar de cualquier manera (la otra copia puede no funcionar correctamente hasta que la reinicie).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Listo, lo entendí
     .buttonaccesskey = o
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/browser.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/browser.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/browser.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tiene el control de su puntero. Presione Esc para recuperar el control.
 pointerlock-warning-no-domain = Este documento tiene el control de su puntero. Presione Esc para recuperar el control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos los marcadores
+bookmarks-recent-bookmarks =
+    .value = Recientemente marcados
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar más marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú de marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Otros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores de celular
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra lateral de marcadores
+           *[other] Ver barra lateral de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra de marcadores
+           *[other] Ver barra de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eliminar menú de marcadores de la barra de herramientas
+           *[other] Agregar menú de marcadores a la barra de herramientas
+        }
+bookmarks-search =
+    .label = Buscar en marcadores
+bookmarks-tools =
+    .label = Herramientas de marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de marcadores
+    .accesskey = B
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Items de la barra de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Items de la barra de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Marcar esta página
+library-bookmarks-bookmark-edit =
+    .label = Editar este marcador
+library-recent-activity-label = Actividad reciente
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabajar sin conexión
+    .accesskey = x
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/newtab/asrouter.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Escriba menos, encuentre más con la barra de direcciones
 cfr-whatsnew-searchbar-body-topsites = Ahora, simplemente seleccione la barra de direcciones y se va a expandir un cuadro con enlaces a sus sitios principales.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �cono de lupa
 
 ## Picture-in-Picture
@@ -280,3 +283,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Buscar atajos en la barra de direcciones
 cfr-whatsnew-search-shortcuts-body = Ahora, cuando ingrese un motor de búsqueda o un sitio específico en la barra de direcciones, aparecerá un acceso  directo azul en las sugerencias de búsqueda debajo. Seleccione ese acceso directo para completar su búsqueda directamente desde la barra de direcciones.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protección contra supercookies maliciosas
+cfr-whatsnew-supercookies-body = Los sitios web pueden adjuntar en secreto una "supercookie" a su navegador que puede seguirlo por la web, incluso después de limpiar sus cookies. { -brand-short-name } ahora proporciona una fuerte protección contra las supercookies para que no puedan usarse para rastrear sus actividades en línea de un sitio a otro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Mejores marcadores
+cfr-whatsnew-bookmarking-body = Es más fácil realizar un seguimiento de sus sitios favoritos. { -brand-short-name } ahora recuerda su ubicación preferida para los marcadores guardados, muestra la barra de herramientas de marcadores de forma predeterminada en las pestañas nuevas y le brinda fácil acceso al resto de sus marcadores a través de una carpeta de la barra de herramientas.
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/newtab/newtab.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nueva pestaña
 newtab-settings-button =
     .title = Personalizar la página nueva pestaña
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar la nueva pestaña
+    .aria-label = Personalizar la nueva pestaña
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Buscar en la web
     .title = Buscar en la web
     .aria-label = Buscar en la web
+newtab-search-box-text = Buscar en la web
+newtab-search-box-input =
+    .placeholder = Buscar en la web
+    .aria-label = Buscar en la web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Agregar buscador
 newtab-topsites-add-topsites-header = Nuevo sitio más visitado
+newtab-topsites-add-shortcut-header = Nuevo atajo
 newtab-topsites-edit-topsites-header = Editar sitio más visitado
+newtab-topsites-edit-shortcut-header = Editar atajo
 newtab-topsites-title-label = Título
 newtab-topsites-title-input =
     .placeholder = Ingresar un título
@@ -206,3 +215,27 @@
 
 newtab-error-fallback-info = Epa, algo salió mal al cargar este contenido.
 newtab-error-fallback-refresh-link = Refrescar la página para reintentar.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Accesos directos
+newtab-custom-shortcuts-subtitle = Sitios guardados o visitados
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } fila
+       *[other] { $num } filas
+    }
+newtab-custom-sponsored-sites = Accesos directos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenido excepcional seleccionado por { -pocket-brand-name }, parte de la familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Historias patrocinadas
+newtab-custom-recent-title = Actividad reciente
+newtab-custom-recent-subtitle = Una selección de sitios y contenido recientes
+newtab-custom-close-button = Cerrar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Recortes
+newtab-custom-snippets-subtitle = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
+newtab-custom-settings = Administrar más configuraciones
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/places.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/places.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/places.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subcarpeta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Otros marcadores
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/preferences/addEngine.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/preferences/addEngine.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/preferences/addEngine.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/preferences/addEngine.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -9,12 +9,6 @@
 add-engine-name = Nombre del buscador
 add-engine-alias = Alias
 add-engine-url = URL del buscador, use %s en el lugar del término a buscar
-add-engine-cancel =
-    .label = Cancelar
-    .accesskey = C
-add-engine-ok =
-    .label = Agregar buscador
-    .accesskey = A
 add-engine-dialog =
     .buttonlabelaccept = Agregar buscador
     .buttonaccesskeyaccept = A
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/preferences/preferences.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Los sitios que más visita
 home-prefs-topsites-by-option-sponsored =
     .label = Sitios principales patrocinados
+home-prefs-shortcuts-header =
+    .label = Accesos directos
+home-prefs-shortcuts-description = Sitios guardados o visitados
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Accesos directos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Contenido excepcional de toda la web  por patrocinado por { $provider }
+home-prefs-recommended-by-description-new = Contenido excepcional seleccionado por { $provider }, parte de la familia { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Historias patrocinadas
 home-prefs-highlights-header =
     .label = Destacados
-home-prefs-recent-activity-header =
-    .label = Actividad reciente
 home-prefs-highlights-description = Una selección de sitios que guardó o visitó
 home-prefs-highlights-option-visited-pages =
     .label = Sitios visitados
@@ -526,6 +530,9 @@
     .label = Descargado recientemente
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas guardadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Actividad reciente
+home-prefs-recent-activity-description = Una selección de sitios y contenido recientes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Recortes
 home-prefs-snippets-description = Actualizaciones de { -vendor-short-name } y { -brand-product-name }
+home-prefs-snippets-description-new = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Abrir pestañas
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Atajos
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Sitios importantes
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Buscadores
+    .accesskey = a
 addressbar-suggestions-settings = Cambiar preferencias para sugerencias de buscadores
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/es-AR/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/es-AR/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/es-AR/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Solo en una pestaña nueva
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Mostrar siempre
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar solo en nueva pestaña
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mostrar otros marcadores
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/es-AR/devtools/client/markers.properties firefox-85.0+build1/l10n/es-AR/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/es-AR/devtools/client/markers.properties	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/devtools/client/markers.properties	2021-01-18 20:03:19.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Poca memoria
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Recolección de ciclo finalizada
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Final de carga de página
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Colección de guardería
-
diff -Nru firefox-84.0.2+build1/l10n/es-AR/devtools/client/toolbox.properties firefox-85.0+build1/l10n/es-AR/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/es-AR/devtools/client/toolbox.properties	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/devtools/client/toolbox.properties	2021-01-18 20:03:18.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Abrir archivo en editor de estilos
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Cerrar herramientas para desarrolladores
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Mostrar la consola dividida
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/es-AR/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/es-AR/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/es-AR/devtools/client/tooltips.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/devtools/client/tooltips.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong> { $property }</strong> no tiene efecto en este elemento ya que no es un elemento posicionado.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> no tiene efecto en este elemento porque <strong>overflow:hidden</strong> no está establecido.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> no tiene efecto en este elemento porque su <strong>esquema-style</strong> es <strong>auto</strong> o <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> no tiene efecto en elementos internos de la tabla.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> no tiene efecto en elementos internos de la tabla excepto en celdas de la tabla.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Intente eliminar <strong>flotante</strong> o agregue<strong> display:block </strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Intente establecer la propiedad de<strong> posición </strong> en algo más que <strong>la estática </strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Intente agregar <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Pruebe configurar su propiedad <strong>mostrar</strong> a algo distinto de <strong>table-cell</strong>, <strong>tabla-celda</strong>, <strong>tabla-columna</strong>, <strong>tabla-fila>, <strong>table-grupo-tabla-pie de página</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Pruebe establecer su propiedad <strong>mostrar</strong> a algo diferente de<strong>tabla-columna</strong>, <strong>table-fila</strong>, <strong>table-de gupo de-columnas</strong>, <strong>tabla-de grupo de-filas</strong> o <strong>tabla de grupo de pies de página</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Intenté cambiar la propiedad <strong>outline-style</strong> a algo diferente a <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/es-AR/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/es-AR/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/es-AR/dom/chrome/dom/dom.properties	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/dom/chrome/dom/dom.properties	2021-01-18 20:03:18.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Se bloqueó selector de <input> debido a la falta de activación del usuario.
 ExternalProtocolFrameBlockedNoUserActivation=Se bloqueó el iframe con protocolo externo debido a la falta de activación del usuario o porque no pasó suficiente tiempo desde que se cargó el último iframe de este tipo.
 MultiplePopupsBlockedNoUserActivation=Se bloqueó la apertura de múltiples ventanas emergentes debido a la falta de activación del usuario.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Se ignoró la precarga de %S debido a valores desconocidos de "como" o "tipo", o al atributo "media" que no coincide.
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/es-AR/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:18.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Error de descarga
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=La descarga no puede guardarse porque está bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=La descarga no puede guardarse porque está bloqueada por una extensión.
 downloadErrorGeneric=La descarga no pudo guardarse porque ocurrió un error desconocido.\n\nIntente nuevamente.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Unos pocos segundos restantes
 timeUnknown2=Tiempo restante desconocido
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=recurso %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/es-AR/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:18.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Conexión al servidor proxy rechazada
 check_error-2153390069=El certificado del servidor ha expirado (ajuste el reloj de su sistema a la fecha y hora correctas si ese es el error)
 check_error-verification_failed=La integridad de la actualización no pudo ser verificada
+check_error-move_failed=Error al preparar la actualización para la instalación
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceros
+support-third-party-modules-module = Archivo de módulo
+support-third-party-modules-version = Versión de archivo
+support-third-party-modules-vendor = Información del fabricante
+support-third-party-modules-occurrence = Veces
+support-third-party-modules-process = Tipo de proceso e ID
+support-third-party-modules-thread = Hilo
+support-third-party-modules-base = Dirección de Imagebase
+support-third-party-modules-uptime = Tiempo de actividad del proceso (ms)
+support-third-party-modules-duration = Duración de carga (ms)
+support-third-party-modules-empty = No se cargaron módulos de terceros.
+support-third-party-modules-no-value = (Sin valor)
+support-third-party-modules-button-open =
+    .title = Abrir ubicación del archivo…
+support-third-party-modules-expand =
+    .title = Mostrar información detallada
+support-third-party-modules-collapse =
+    .title = Contraer información detallada
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo no está firmado
+support-third-party-modules-folder-icon =
+    .title = Abrir ubicación del archivo…
+support-third-party-modules-down-icon =
+    .title = Mostrar información detallada
+support-third-party-modules-up-icon =
+    .title = Contraer información detallada
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -96,5 +96,8 @@
 experimental-features-fission-description = La fisión (aislamiento del sitio) es una función experimental en { -brand-short-name } para proporcionar una capa adicional de defensa contra errores de seguridad. Al aislar cada sitio en un proceso separado, Fission dificulta que los sitios web maliciosos accedan a la información de otras páginas que está visitando. Este es un cambio arquitectónico muy importante en { -brand-short-name } y le agradecemos que pruebe e informe cualquier problema que pueda encontrar. Para obtener más detalles, consulte <a data-l10n-name="wiki"> la wiki </a>.
 # Support for having multiple Picture-in-Picture windows open simultaneously
 experimental-features-multi-pip =
-    .label = Ayuda para Picture-in-Picture
+    .label = Compatibilidad para Picture-in-Picture
 experimental-features-multi-pip-description = Ayuda experimental para permitir que se abran varias ventanas Picture-in-Picture al mismo tiempo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Soporte experimental para el protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> quiere abrir un enlace <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primera página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Página siguiente
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/es-AR/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:34:25.000000000 +0000
+++ firefox-85.0+build1/l10n/es-AR/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:18.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = para
+printui-page-custom-range-input =
+    .aria-label = Ingresar rango de página personalizado
+    .placeholder = ej. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientación
@@ -48,6 +51,7 @@
 printui-options = Opciones
 printui-headers-footers-checkbox = Imprimir encabezados y pies de página
 printui-backgrounds-checkbox = Imprimir fondos
+printui-selection-checkbox = Imprimir selección
 printui-color-mode-label = Modo color
 printui-color-mode-color = Color
 printui-color-mode-bw = Blanco y negro
@@ -56,19 +60,29 @@
 printui-margins-min = Mínimo
 printui-margins-none = Ninguno
 printui-margins-custom = Personalizado
+printui-margins-custom-inches = Personalizado (pulgadas)
 printui-margins-custom-top = Arriba
+printui-margins-custom-top-inches = Superior (pulgadas)
 printui-margins-custom-bottom = Abajo
+printui-margins-custom-bottom-inches = Inferior (pulgadas)
 printui-margins-custom-left = Izquierda
+printui-margins-custom-left-inches = Izquierdo (pulgadas)
 printui-margins-custom-right = Derecha
+printui-margins-custom-right-inches = Derecho (pulgadas)
 printui-system-dialog-link = Imprimir usando la ventana del sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Guardar
 printui-cancel-button = Cancelar
+printui-close-button = Cerrar
 printui-loading = Preparando vista previa
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vista previa
+printui-pages-per-sheet = Páginas por hoja
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimiendo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/aboutLogins.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/aboutLogins.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿Eliminar esta credencial?
 confirm-delete-dialog-message = Esta acción no puede revertirse.
 about-logins-confirm-remove-dialog-confirm-button = Eliminar
-about-logins-confirm-remove-all-dialog-confirm-button = Eliminar todas
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eliminar
+        [one] Eliminar
+       *[other] Eliminar todas
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sí, eliminar esta credencial
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportar credenciales y contraseñas
 about-logins-confirm-export-dialog-message = Tus contraseñas serán guardadas como texto legible (por ejemplo, BadP@ssw0rd) por lo que cualquiera que pueda abrir el archivo exportado podrá verlas.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importación terminada
+about-logins-alert-import-message = Ver resumen de importación detallado
 confirm-discard-changes-dialog-title = ¿Descartar cambios sin guardar?
 confirm-discard-changes-dialog-message = Todos los cambios sin guardar se perderán.
 confirm-discard-changes-dialog-confirm-button = Descartar
@@ -262,3 +269,30 @@
         [macos] Documento CSV
        *[other] Archivo CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importación terminada
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nueva credencial añadida:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nuevas credenciales añadidas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Credencial existente actualizada:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Credenciales existentes actualizadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Credencial duplicada encontrada:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importada)</span>
+       *[other] <span>Credenciales duplicadas encontradas:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importadas)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Error:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importada)</span>
+       *[other] <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importadas)</span>
+    }
+about-logins-import-dialog-done = Hecho
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:03:24.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/.
 
-crashed-title = Agente de informe de fallos de pestañas
+crashed-title = Reportador de fallos de pestañas
 crashed-close-tab-button = Cerrar pestaña
 crashed-restore-tab-button = Restaurar esta pestaña
 crashed-restore-all-button = Restaurar todas las pestañas caídas
@@ -21,7 +21,7 @@
 crashed-include-URL-2 = Incluye las URLs de los sitios en los que te encontrabas cuando { -brand-short-name } falló
 crashed-email-placeholder = Ingresa tu email aquí
 crashed-email-me = Enviarme un email cuando haya más información disponible
-crashed-report-sent = Informe de fallos enviado. ¡Gracias por ayudarnos a mejorar { -brand-short-name }!
+crashed-report-sent = Reporte de fallos enviado. ¡Gracias por ayudarnos a mejorar { -brand-short-name }!
 crashed-request-auto-submit-title = Reportar pestañas en segundo plano
 crashed-auto-submit-checkbox = Actualiza las preferencias para enviar automáticamente reportes cuando { -brand-short-name } falle.
 crashed-auto-submit-checkbox-2 = Actualiza las preferencias para enviar automáticamente reportes cuando { -brand-short-name } falle
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/appmenu.ftl	2021-01-06 11:34:29.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/appmenu.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nueva ventana
+appmenuitem-new-private-window =
+    .label = Nueva ventana privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Acercar
 appmenuitem-zoom-reduce =
     .label = Alejar
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar ahora
+appmenuitem-save-page =
+    .label = Guardar página como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Qué hay de nuevo
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/appMenuNotifications.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ahora no
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Después de un reinicio rápido, { -brand-shorter-name } restaurará todas tus pestañas y ventanas abiertas que no estén en el modo de navegación privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } no se puede actualizar automáticamente a la última versión.
+    .buttonlabel = Actualizar { -brand-shorter-name } de todas formas
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Ahora no
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Hay una nueva actualización de { -brand-shorter-name } disponible, pero no se puede instalar porque se está ejecutando otra copia de { -brand-shorter-name }. Ciérrala para continuar con la actualización o elige actualizar de todos modos (es posible que la otra copia no funcione correctamente hasta que la reinicies).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, ¡ya caché!
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/browser.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/browser.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/browser.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tiene el control de tu puntero. Presiona Esc para recuperarlo.
 pointerlock-warning-no-domain = Este documento tiene el control de tu puntero. Presiona  Esc para recuperarlo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos los marcadores
+bookmarks-recent-bookmarks =
+    .value = Añadidos recientemente
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar más marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú de marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Otros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores en dispositivo móvil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra lateral de marcadores
+           *[other] Ver barra lateral de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra de herramientas de marcadores
+           *[other] Ver barra de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eliminar menú de marcadores de la barra de herramientas
+           *[other] Añadir menú de marcadores a la barra de herramientas
+        }
+bookmarks-search =
+    .label = Buscar marcadores
+bookmarks-tools =
+    .label = Herramientas de marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de marcadores
+    .accesskey = B
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Elementos de la barra de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos de la barra de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Guardar esta página en marcadores
+library-bookmarks-bookmark-edit =
+    .label = Editar este marcador
+library-recent-activity-label = Actividad reciente
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabajar desconectado
+    .accesskey = j
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/newInstallPage.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/newInstallPage.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/newInstallPage.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/newInstallPage.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -9,25 +9,20 @@
 
 title = Noticias importantes
 heading = Cambios a tu perfil de { -brand-short-name }
-
-changed-title = ¿Qué cambio?
+changed-title = ¿Qué cambió?
 changed-desc-profiles = La instalación de { -brand-short-name } tiene un nuevo perfil. Un perfil es un conjunto de archivos en los que Firefox guarda información como por ejemplo marcadores, contraseñas y preferencias de usuario.
 changed-desc-dedicated = Con la finalidad de hacer más fácil y seguro el cambio entre instalaciones de Firefox (Incluyendo Firefox, Firefox ESR, Firefox Beta, Firefox Developer Edition y Firefox Nightly), esta instalación ahora tiene un perfil dedicado. No comparte de forma automáticamente tu información guardada con otras instalaciones de Firefox.
-
 lost = <b>No has perdido ningún dato personal o personalización.</b> Si ya habías guardado información en Firefox en este computador, esta se encuentra todavía disponible en otra instalación de Firefox.
-
-options-title = ¿Cuales son mis opciones?
+options-title = ¿Cuáles son mis opciones?
 options-do-nothing = Si no haces nada, tus datos de perfil en { -brand-short-name } serán diferentes a los datos de perfil en otras instalaciones de Firefox.
 options-use-sync = Si quieres que todos tus datos de perfiles sean los mismos en todas las instalaciones de Firefox, puedes usar una { -fxaccount-brand-name } para mantenerlos sincronizados.
-
 resources = Recursos:
 support-link = Usando el administrador de perfiles - Artículo de soporte
-
 sync-header = Conéctate o crea una { -fxaccount-brand-name }
 sync-label = Ingresa tu correo
 sync-input =
     .placeholder = Correo
 sync-button = Continuar
-sync-terms = Al proceder, aceptas los <a data-l10n-name="terms">Términos de servicio</a> y el <a data-l10n-name="privacy">aviso de privacidad</a>.
+sync-terms = Al proceder, aceptas los <a data-l10n-name="terms">Términos de servicio</a> y el <a data-l10n-name="privacy">Aviso de privacidad</a>.
 sync-first = ¿Primera vez usando { -sync-brand-name }? Deberás conectarte en cada instalación de Firefox para sincronizar tu información.
 sync-learn = Aprender más
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/asrouter.ftl	2021-01-06 11:34:29.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -122,6 +122,9 @@
 
 cfr-whatsnew-searchbar-title = Escribe menos, encuentra más con la barra de direcciones
 cfr-whatsnew-searchbar-body-topsites = Ahora, solo selecciona la barra de direcciones y una caja se expandirá con los enlaces a tus sitios frecuentes.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �cono de lupa
 
 ## Picture-in-Picture
@@ -276,3 +279,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Atajos de búsqueda en la barra de direcciones
 cfr-whatsnew-search-shortcuts-body = Ahora, cuando escribas un motor de búsqueda o un sitio específico en la barra de direcciones, aparecerá un atajo azul en las sugerencias de búsqueda. Selecciona ese acceso directo para completar tu búsqueda directamente desde la barra de direcciones.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protección contra supercookies maliciosas
+cfr-whatsnew-supercookies-body = Los sitios web pueden adjuntar en secreto una "supercookie" a tu navegador que puede seguirte por la web, incluso después de limpiar tus cookies. { -brand-short-name } ahora proporciona una fuerte protección contra las supercookies para que no puedan ser usadas para rastrear tus actividades en línea de un sitio a otro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Mejores marcadores
+cfr-whatsnew-bookmarking-body = Es más fácil realizar un seguimiento de tus sitios favoritos. { -brand-short-name } ahora recuerda tu ubicación preferida para los marcadores guardados, muestra la barra de herramientas de marcadores de forma predeterminada en las pestañas nuevas y te brinda fácil acceso al resto de tus marcadores a través de una carpeta en la barra de herramientas.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/newtab.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nueva pestaña
 newtab-settings-button =
     .title = Personaliza tu página de Nueva pestaña
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar nueva pestaña
+    .aria-label = Personalizar nueva pestaña
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Buscar en la Web
     .title = Buscar en la Web
     .aria-label = Buscar en la Web
+newtab-search-box-text = Buscar en la web
+newtab-search-box-input =
+    .placeholder = Buscar en la web
+    .aria-label = Buscar en la web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Añadir motor de búsqueda
 newtab-topsites-add-topsites-header = Nuevo sitio frecuente
+newtab-topsites-add-shortcut-header = Nuevo atajo
 newtab-topsites-edit-topsites-header = Editar sitio frecuente
+newtab-topsites-edit-shortcut-header = Editar atajo
 newtab-topsites-title-label = Título
 newtab-topsites-title-input =
     .placeholder = Ingresar un título
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Chuta, algo se fue a las pailas al cargar este contenido.
 newtab-error-fallback-refresh-link = Recarga la página para volver a intentarlo.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Atajos
+newtab-custom-shortcuts-subtitle = Sitios que guardas o visitas
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } fila
+       *[other] { $num } filas
+    }
+newtab-custom-sponsored-sites = Atajos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenido excepcional seleccionado por { -pocket-brand-name }, parte de la familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Historias patrocinadas
+newtab-custom-recent-title = Actividad reciente
+newtab-custom-recent-subtitle = Una selección de sitios y contenidos recientes
+newtab-custom-close-button = Cerrar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Fragmentos
+newtab-custom-snippets-subtitle = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
+newtab-custom-settings = Administrar más ajustes
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/newtab/onboarding.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/newtab/onboarding.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -104,7 +104,7 @@
 onboarding-multistage-welcome-header = Te damos la bienvenida a <span data-l10n-name = "zap">{ -brand-short-name }</span>
 onboarding-multistage-welcome-subtitle = El navegador rápido, seguro y privado que es respaldado por una organización sin fines de lucro.
 onboarding-multistage-welcome-primary-button-label = Iniciar configuración
-onboarding-multistage-welcome-secondary-button-label = Conectarse
+onboarding-multistage-welcome-secondary-button-label = Conéctate
 onboarding-multistage-welcome-secondary-button-text = ¿Tienes una cuenta?
 # The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
 # automatically added to the text inside it. "more" should stay inside the span.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/places.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/places.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/places.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subcarpeta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Otros marcadores
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/preferences/preferences.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -5,7 +5,7 @@
 do-not-track-description = Enviar a los sitios web una señal "No rastrear" para que sepan que no quieres ser rastreado
 do-not-track-learn-more = Aprender más
 do-not-track-option-default-content-blocking-known =
-    .label = Solo cuando { -brand-short-name } está configurado para bloquear a los rastreadores conocidos
+    .label = Solo cuando { -brand-short-name } esté configurado para bloquear los rastreadores conocidos
 do-not-track-option-always =
     .label = Siempre
 pref-page-title =
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Los sitios que más visitas
 home-prefs-topsites-by-option-sponsored =
     .label = Sitios principales patrocinados
+home-prefs-shortcuts-header =
+    .label = Atajos
+home-prefs-shortcuts-description = Sitios que guardas o visitas
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Atajos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Contenido excepcional de toda la web, revisado por { $provider }
+home-prefs-recommended-by-description-new = Contenido excepcional seleccionado por { $provider }, parte de la familia { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Historias patrocinadas
 home-prefs-highlights-header =
     .label = Destacados
-home-prefs-recent-activity-header =
-    .label = Actividad reciente
 home-prefs-highlights-description = Una selección de sitios que guardaste o visitaste
 home-prefs-highlights-option-visited-pages =
     .label = Páginas visitadas
@@ -526,6 +530,9 @@
     .label = Descarga más reciente
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas guardadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Actividad reciente
+home-prefs-recent-activity-description = Una selección de sitios y contenidos recientes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Fragmentos
 home-prefs-snippets-description = Actualizaciones de { -vendor-short-name } y { -brand-product-name }
+home-prefs-snippets-description-new = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -546,7 +554,7 @@
 search-bar-hidden =
     .label = Usar la barra de direcciones para buscar y navegar
 search-bar-shown =
-    .label = Añadir barra de búsqueda a la barra de herramientas
+    .label = Añadir una barra de búsqueda a la barra de herramientas
 search-engine-default-header = Motor de búsqueda predeterminado
 search-engine-default-desc-2 = Este es tu motor de búsqueda predeterminado en la barra de direcciones y en la barra de búsqueda. Puedes cambiarlo en cualquier momento.
 search-engine-default-private-desc-2 = Elije un motor de búsqueda predeterminado diferente para usar solo en ventanas privadas.
@@ -757,7 +765,7 @@
     .searchkeywords = { -lockwise-brand-short-name }
 # Checkbox to control whether UI is shown to users to save or fill logins/passwords.
 forms-ask-to-save-logins =
-    .label = Preguntar para guardar credenciales y contraseñas para sitios web
+    .label = Preguntar si guardar credenciales y contraseñas webs
     .accesskey = r
 forms-exceptions =
     .label = Excepciones…
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Pestañas abiertas
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Atajos
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Sitios frecuentes
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Motores de búsqueda
+    .accesskey = a
 addressbar-suggestions-settings = Cambia las preferencias para las sugerencias de los motores de búsqueda
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/tabContextMenu.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/tabContextMenu.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/tabContextMenu.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/tabContextMenu.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -63,7 +63,7 @@
 tab-context-undo-close-tabs =
     .label =
         { $tabCount ->
-            [1] Deshacer cierre de pestañas
+            [1] Deshacer cierre de pestaña
             [one] Deshacer cierre de pestaña
            *[other] Deshacer cierre de pestañas
         }
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/es-CL/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/es-CL/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -20,7 +20,7 @@
 toolbar-context-menu-undo-close-tabs =
     .label =
         { $tabCount ->
-            [1] Deshacer cierre de pestañas
+            [1] Deshacer cierre de pestaña
             [one] Deshacer cierre de pestaña
            *[other] Deshacer cierre de pestañas
         }
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Solo en nueva pestaña
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Siempre mostrar
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Solo mostrar en nueva pestaña
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mostrar otros marcadores
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/es-CL/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/es-CL/browser/chrome/browser/browser.properties	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/chrome/browser/browser.properties	2021-01-18 20:03:24.000000000 +0000
@@ -293,7 +293,7 @@
 crashedpluginsMessage.title=El complemento %S ha fallado.
 crashedpluginsMessage.reloadButton.label=Recargar la página
 crashedpluginsMessage.reloadButton.accesskey=R
-crashedpluginsMessage.submitButton.label=Enviar un informe de errores
+crashedpluginsMessage.submitButton.label=Enviar un reporte de fallos
 crashedpluginsMessage.submitButton.accesskey=E
 crashedpluginsMessage.learnMore=Aprender más…
 
@@ -966,7 +966,7 @@
 # LOCALIZATION NOTE (pendingCrashReports2.label): Semi-colon list of plural forms
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of pending crash reports
-pendingCrashReports2.label = Tienes un informe de fallos sin enviar; Tienes #1 informes de fallos sin enviar
+pendingCrashReports2.label = Tienes un reporte de fallos sin enviar;Tienes #1 reportes de fallos sin enviar
 pendingCrashReports.viewAll = Ver
 pendingCrashReports.send = Enviar
 pendingCrashReports.alwaysSend = Siempre enviar
diff -Nru firefox-84.0.2+build1/l10n/es-CL/browser/crashreporter/crashreporter-override.ini firefox-85.0+build1/l10n/es-CL/browser/crashreporter/crashreporter-override.ini
--- firefox-84.0.2+build1/l10n/es-CL/browser/crashreporter/crashreporter-override.ini	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/browser/crashreporter/crashreporter-override.ini	2021-01-18 20:03:24.000000000 +0000
@@ -5,5 +5,5 @@
 # This file is in the UTF-8 encoding
 [Strings]
 # LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
-CrashReporterProductErrorText2=Firefox tuvo un problema y se ha caído. Intentaremos restaurar tus pestañas y ventanas una vez que se reinicie.\n\nLamentablemente el informador de fallos no puede enviar el informe de error.\n\nDetalles: %s
-CrashReporterDescriptionText2=Firefox tuvo un problema y se ha caído. Intentaremos restaurar tus pestañas y ventanas una vez que se reinicie.\n\nPara ayudarnos a diagnosticar y reparar el problema, puedes enviarnos un informe de fallos.
+CrashReporterProductErrorText2=Firefox tuvo un problema y se cayó. Intentaremos restaurar tus pestañas y ventanas una vez que se reinicie.\n\nLamentablemente el reportador de fallos no puede enviar el informe de error.\n\nDetalles: %s
+CrashReporterDescriptionText2=Firefox tuvo un problema y se cayó. Intentaremos restaurar tus pestañas y ventanas una vez que se reinicie.\n\nPara ayudarnos a diagnosticar y reparar el problema, puedes enviarnos un reporte de fallos.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/devtools/client/markers.properties firefox-85.0+build1/l10n/es-CL/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/es-CL/devtools/client/markers.properties	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/devtools/client/markers.properties	2021-01-18 20:03:24.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Poca memoria
 marker.gcreason.label.CC_WAITING=Forzado por el recolector de ciclo (GC)
+marker.gcreason.label.CC_FINISHED=Ciclo de colección finalizado
 marker.gcreason.label.CC_FORCED=Forzado por el recolector de ciclo (GC)
 marker.gcreason.label.LOAD_END=Carga de la página finalizada
 marker.gcreason.label.PAGE_HIDE=Movido a segundo plano.
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Colección nodriza
-
diff -Nru firefox-84.0.2+build1/l10n/es-CL/devtools/client/toolbox.properties firefox-85.0+build1/l10n/es-CL/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/es-CL/devtools/client/toolbox.properties	2021-01-06 11:34:29.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/devtools/client/toolbox.properties	2021-01-18 20:03:24.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Abrir archivo en el Editor de estilo
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Cerrar herramientas de desarrollo
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Mostrar la consola dividida
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/es-CL/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/es-CL/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/es-CL/devtools/client/tooltips.ftl	2021-01-06 11:34:29.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/devtools/client/tooltips.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> no tiene efecto en este elemento ya que no es un elemento posicionado.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> no tiene efecto en este elemento ya que <strong>overflow:hidden</strong> no está establecido.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> no tiene efecto en este elemento debido a que su <strong>outline-style</strong> es <strong>auto</strong> o <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> no tiene efectos en elementos internos de una tabla.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> no tiene efectos en elementos internos de una tabla excepto celdas de una tabla.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Prueba a eliminar <strong>float</strong> o añadir<strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Intenta establecer la propiedad <strong>position</strong> a algo diferente a <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Prueba a añadir <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Prueba ajustar su propiedad <strong>display</strong> a algo diferente a <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Prueba ajustar su propiedad <strong>display</strong> a algo diferente a <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Intenta establecer la propiedad <strong>outline-style</strong> a algo diferente a <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/es-CL/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/es-CL/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/es-CL/dom/chrome/dom/dom.properties	2021-01-06 11:34:29.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/dom/chrome/dom/dom.properties	2021-01-18 20:03:24.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Se bloqueó selector de <input> debido a la falta de activación del usuario.
 ExternalProtocolFrameBlockedNoUserActivation=Se bloqueó el iframe con protocolo externo debido a la falta de activación del usuario o debido a que no pasó suficiente tiempo desde que se cargó el último iframe de este tipo.
 MultiplePopupsBlockedNoUserActivation=Se bloqueó la apertura de múltiples ventajas emergentes debido a la falta de activación del usuario.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=La precarga de %S fue ignorada debido a valores desconocidos de "as" o "type", o a un atributo "media" no coincidente.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/es-CL/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:24.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Error en la descarga
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=La descarga no se puede guardar porque está bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=La descarga no se puede guardar porque está bloqueada por una extensión.
 downloadErrorGeneric=La descarga no puede ser guardada porque ocurrió un error desconocido.\n\nPor favor, intenta nuevamente.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Faltan pocos segundos
 timeUnknown2=Tiempo restante desconocido
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=recurso %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/es-CL/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:24.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Conexión al servidor proxy fue rechazada
 check_error-2153390069=El certificado del servidor ha vencido (ajusta el reloj de tu sistema a la hora y fecha correcta si esta mal)
 check_error-verification_failed=La integridad de esta actualización no pudo ser verificada
+check_error-move_failed=Error al preparar la actualización para la instalación
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/pluginproblem/pluginproblem.dtd firefox-85.0+build1/l10n/es-CL/toolkit/chrome/pluginproblem/pluginproblem.dtd
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-18 20:03:24.000000000 +0000
@@ -2,6 +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/. -->
 
+<!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Aprieta aquí para activar el complemento.">
 <!ENTITY clickToActivatePlugin                               "Activar complemento.">
 <!ENTITY checkForUpdates                                     "Buscar actualizaciones…">
@@ -16,7 +17,7 @@
 <!ENTITY reloadPlugin.middle                                 "Recarga la página">
 <!ENTITY reloadPlugin.post                                   " para volver a intentarlo.">
 <!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
-<!ENTITY report.please                                       "Enviar informe de fallos">
+<!ENTITY report.please                                       "Enviar reporte de fallos">
 <!ENTITY report.submitting                                   "Enviando reporte…">
 <!ENTITY report.submitted                                    "Reporte de fallos enviado.">
 <!ENTITY report.disabled                                     "Reporte de fallos desactivado.">
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/crashreporter/aboutcrashes.ftl firefox-85.0+build1/l10n/es-CL/toolkit/crashreporter/aboutcrashes.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/crashreporter/aboutcrashes.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/crashreporter/aboutcrashes.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -1,31 +1,22 @@
 # 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 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/.
 
 crash-reports-title = Reportes de fallos
-
 submit-all-button-label = Enviar todo
 delete-button-label = Limpiar todo
 delete-confirm-title = ¿Estás seguro?
 delete-unsubmitted-description = Esto eliminará todos los reportes de fallos no enviados y no se puede deshacer.
 delete-submitted-description = Esto eliminará la lista de reportes de fallos enviados pero no eliminará los datos enviados. Esto no se puede deshacer.
-
-crashes-unsubmitted-label = Informes de fallos no enviados
+crashes-unsubmitted-label = Reportes de fallos no enviados
 id-heading = ID del informe
 date-crashed-heading = Fecha del fallo
 submit-crash-button-label = Enviar
 # This text is used to replace the label of the crash submit button
 # if the crash submission fails.
 submit-crash-button-failure-label = Falló
-
-crashes-submitted-label = Informes de fallos enviados
+crashes-submitted-label = Reportes de fallos enviados
 date-submitted-heading = Fecha de envío
 view-crash-button-label = Ver
-
-no-reports-label = No se ha enviado ningún informe de fallos.
-no-config-label = Esta aplicación no ha sido configurada para mostrar informes de fallos. Debe configurarse la preferencia <code>breakpad.reportURL</code>.
+no-reports-label = No se ha enviado ningún reporte de fallos.
+no-config-label = Esta aplicación no ha sido configurada para mostrar reportes de fallos. Debe configurarse la preferencia <code>breakpad.reportURL</code>.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/crashreporter/crashreporter.ini firefox-85.0+build1/l10n/es-CL/toolkit/crashreporter/crashreporter.ini
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/crashreporter/crashreporter.ini	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/crashreporter/crashreporter.ini	2021-01-18 20:03:24.000000000 +0000
@@ -9,27 +9,27 @@
 # for example like Arabic, Hebrew, Persian. If your language needs RTL, please
 # use the untranslated English word "yes" as value
 isRTL=
-CrashReporterTitle=Agente de informe de fallos
+CrashReporterTitle=Reportador de fallos
 # LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name.  (i.e. "Mozilla")
-CrashReporterVendorTitle=Agente %s de informe de fallos
+CrashReporterVendorTitle=Reportador de fallos de %s
 # LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
-CrashReporterErrorText=La aplicación ha tenido un problema y se cerrará.\n\nDesafortunadamente, el agente de informe de fallos no es capaz de enviar un informe sobre este problema.\n\nDetalles: %s
+CrashReporterErrorText=La aplicación ha tenido un problema y se cerrará.\n\nDesafortunadamente, el reportador de fallos no es capaz de enviar un informe sobre este problema.\n\nDetalles: %s
 # LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information.  These two substitutions can not be reordered!
-CrashReporterProductErrorText2=%s ha tenido un problema y se cerrará.\n\nDesafortunadamente, el agente de informe de fallos no es capaz de enviar un informe sobre este problema.\n\nDetalles: %s
+CrashReporterProductErrorText2=%s ha tenido un problema y se cerrará.\n\nDesafortunadamente, el reportador de fallos no es capaz de enviar un informe sobre este problema.\n\nDetalles: %s
 CrashReporterSorry=Lo sentimos
 # LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
-CrashReporterDescriptionText2=%s encontró un problema y se cerrará.\n\nPara ayudarnos a diagnosticar y reparar este problema, puedes enviarnos un informe de fallos.
+CrashReporterDescriptionText2=%s encontró un problema y se cerrará.\n\nPara ayudarnos a diagnosticar y reparar este problema, puedes enviarnos un reporte de fallos.
 CrashReporterDefault=Esta aplicación se ejecuta después de un error para informar del problema al fabricante de la aplicación. No debería ejecutarse directamente.
 Details=Detalles…
 ViewReportTitle=Contenido del informe
 CommentGrayText=Añadir un comentario (los comentarios son públicos)
-ExtraReportInfo=Este informe también contiene información acerca del estado de la aplicación cuando falló.
+ExtraReportInfo=Este reporte también contiene información acerca del estado de cuando se cayó la aplicación.
 # LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
-CheckSendReport=Avisarle a %s de esta falla para que pueda corregirla
+CheckSendReport=Avisarle a %s de este fallo para que pueda corregirlo
 CheckIncludeURL=Incluir la dirección de la página en la que me encontraba
 CheckAllowEmail=Permitir a %s que me contacte sobre este informe
 EmailGrayText=Ingresa tu email aquí
-ReportPreSubmit2=Tu informe de fallos será enviado antes de salir o reiniciar.
+ReportPreSubmit2=Tu reporte de fallos será enviado antes de salir o reiniciar.
 ReportDuringSubmit2=Enviando tu informe…
 ReportSubmitSuccess=¡Informe enviado exitosamente!
 ReportSubmitFailed=Hubo un problema al enviar tu informe.
@@ -52,9 +52,9 @@
 ErrorDumpFileExists=La aplicación no dejó un archivo de volcado del problema.
 ErrorDumpFileMove=No se puede mover el volcado del problema.
 ErrorNoProductName=La aplicación no se identificó.
-ErrorNoServerURL=La aplicación no tiene especificado un servidor de informe de fallos.
-ErrorNoSettingsPath=No se ha podido encontrar la configuración del informe de fallos.
+ErrorNoServerURL=La aplicación no tiene especificado un servidor de reporte de fallos.
+ErrorNoSettingsPath=No se ha podido encontrar la configuración del reportador de fallos.
 ErrorCreateDumpDir=No se puede crear el directorio de volcados pendientes.
 # LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
-ErrorEndOfLife=La versión de %s que estás usando ya no cuenta con soporte. Los informes de esta versión ya no están siendo aceptados. Por favor, considera actualizarte a una versión con soporte.
+ErrorEndOfLife=La versión de %s que estás usando ya no cuenta con soporte. Los reportes de esta versión ya no están siendo aceptados. Por favor, considera actualizar a una versión con soporte.
 
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/about/aboutRights.ftl firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/about/aboutRights.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/about/aboutRights.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/about/aboutRights.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -6,7 +6,7 @@
 rights-intro = { -brand-full-name } es software libre y de código abierto, creado por una comunidad de miles de personas a lo largo del mundo. Hay algunas cosas que debe saber:
 rights-intro-point-1 = { -brand-short-name } está disponible bajo los términos de la <a data-l10n-name="mozilla-public-license-link">Licencia Pública de Mozilla (MPL)</a>. Esto significa que puede usar, copiar y compartir { -brand-short-name } con otras personas. También tiene la posibilidad de modificar el código fuente de { -brand-short-name } como desee a fin de que éste se ajuste a sus necesidades. La Licencia Pública de Mozilla también le otorga el derecho a distribuir esas versiones modificadas.
 rights-intro-point-2 = No se le ha concedido ningún derecho de marca o licencia sobre las marcas registradas de la fundación Mozilla o cualquier parte, incluyendo sin limitaciones el nombre y logo de Firefox. Puede encontrar información adicional sobre las marcas registradas <a data-l10n-name="mozilla-trademarks-link">aquí</a>.
-rights-intro-point-3 = Algunas características de { -brand-short-name }, como el informe de errores, dan la oportunidad de dar sus comentarios a { -vendor-short-name }. Al elegir enviar sus comentarios, le da permiso a { -vendor-short-name } para usar esa opinión para mejorar sus productos, publicarla en sus sitios web y distribuirla.
+rights-intro-point-3 = Algunas funcionalidades de { -brand-short-name }, como el Reportador de fallos, te dan la oportunidad de enviar comentarios a { -vendor-short-name }. Al elegir enviar tus comentarios, le das permiso a { -vendor-short-name } para usar esa opinión para mejorar sus productos, publicarla en sus sitios web y distribuirla.
 rights-intro-point-4 = Como usaremos su información personal y los comentarios enviados a  { -vendor-short-name } a través de { -brand-short-name } se describen en la <a data-l10n-name="mozilla-privacy-policy-link">política de privacidad de { -brand-short-name }</a>.
 rights-intro-point-4-unbranded = Cualquier política de privacidad aplicable a este producto debe aparecer aquí.
 rights-intro-point-5 = Algunas características de { -brand-short-name } hacen uso de servicios de información basados en la web, sin embargo, no podemos garantizar que sean 100 % exactas o libres de errores. Más detalles, incluyendo información sobre como deshabilitar las características que usan estos servicios, pueden encontrarse en los <a data-l10n-name="mozilla-service-terms-link">términos del servicio</a>.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -7,11 +7,11 @@
     Esta página contiene información técnica que puede serle útil cuando
     intente resolver un problema. Si está buscando respuestas a preguntas comunes
     acerca de { -brand-short-name }, mire en nuestro <a data-l10n-name="support-link">sitio web de soporte</a>.
-crashes-title = Informes de fallos
-crashes-id = ID del informe
+crashes-title = Reportes de fallos
+crashes-id = ID del reporte
 crashes-send-date = Enviado
-crashes-all-reports = Todos los informes de fallos
-crashes-no-config = Esta aplicación no ha sido configurada para mostrar informes de fallos.
+crashes-all-reports = Todos los reportes de fallos
+crashes-no-config = Esta aplicación no ha sido configurada para mostrar reportes de fallos.
 extensions-title = Extensiones
 extensions-name = Nombre
 extensions-enabled = Habilitada
@@ -188,12 +188,38 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceros
+support-third-party-modules-module = Archivo de módulo
+support-third-party-modules-version = Versión del archivo
+support-third-party-modules-vendor = Info del fabricante
+support-third-party-modules-occurrence = Ocurrencias
+support-third-party-modules-process = ID y tipo de proceso
+support-third-party-modules-thread = Hilo
+support-third-party-modules-base = Dirección de imagebase
+support-third-party-modules-uptime = Tiempo de actividad del proceso (ms)
+support-third-party-modules-duration = Duración de carga (ms)
+support-third-party-modules-empty = No se cargaron módulos de terceros.
+support-third-party-modules-no-value = (Sin valor)
+support-third-party-modules-button-open =
+    .title = Abrir ubicación del archivo…
+support-third-party-modules-expand =
+    .title = Mostrar información detallada
+support-third-party-modules-collapse =
+    .title = Contraer información detallada
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo no está firmado
+support-third-party-modules-folder-icon =
+    .title = Abrir ubicación del archivo…
+support-third-party-modules-down-icon =
+    .title = Mostrar información detallada
+support-third-party-modules-up-icon =
+    .title = Contraer información detallada
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
     { $days ->
-        [one] Informes de fallos para el último { $days } día
-       *[other] Informes de fallos para los últimos { $days } días
+        [one] Reportes de fallos para el último día
+       *[other] Reportes de fallos para los últimos { $days } días
     }
 # Variables
 # $minutes (integer) - Number of minutes since crash
@@ -220,8 +246,8 @@
 # $reports (integer) - Number of pending reports
 pending-reports =
     { $reports ->
-        [one] Todos los informes de fallos (incluyendo { $reports } fallo pendiente dentro del rango de tiempo dado)
-       *[other] Todos los informes de fallos (incluyendo { $reports } fallos pendientes dentro del rango de tiempo dado)
+        [one] Todos los reportes de fallos (incluyendo { $reports } pendiente dentro del rango de tiempo dado)
+       *[other] Todos los reportes de fallos (incluyendo { $reports } pendientes dentro del rango de tiempo dado)
     }
 raw-data-copied = Datos en bruto copiados al portapapeles
 text-copied = Texto copiado al portapapeles
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Soporte para múltiples Picture-in-Picture
 experimental-features-multi-pip-description = Soporte experimental para permitir múltiples ventanas Picture-in-Picture abiertas al mismo tiempo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Soporte experimental para el protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primera página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Página siguiente
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/es-CL/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:34:30.000000000 +0000
+++ firefox-85.0+build1/l10n/es-CL/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:24.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = para
+printui-page-custom-range-input =
+    .aria-label = Ingresa un rango de páginas personalizado
+    .placeholder = Por ej. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientación
@@ -48,6 +51,7 @@
 printui-options = Opciones
 printui-headers-footers-checkbox = Imprimir cabeceras y pies de página
 printui-backgrounds-checkbox = Imprimir fondos
+printui-selection-checkbox = Imprimir solo la selección
 printui-color-mode-label = Modo color
 printui-color-mode-color = Color
 printui-color-mode-bw = Blanco y negro
@@ -56,19 +60,29 @@
 printui-margins-min = Mínimos
 printui-margins-none = Ninguno
 printui-margins-custom = Personalizado
+printui-margins-custom-inches = Personalizado (pulgadas)
 printui-margins-custom-top = Superior
+printui-margins-custom-top-inches = Superior (pulgadas)
 printui-margins-custom-bottom = Inferior
+printui-margins-custom-bottom-inches = Inferior (pulgadas)
 printui-margins-custom-left = Izquierda
+printui-margins-custom-left-inches = Izquierda (pulgadas)
 printui-margins-custom-right = Derecha
+printui-margins-custom-right-inches = Derecha (pulgadas)
 printui-system-dialog-link = Imprimir usando el diálogo del sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Guardar
 printui-cancel-button = Cancelar
+printui-close-button = Cerrar
 printui-loading = Preparando vista previa
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vista Previa
+printui-pages-per-sheet = Páginas por hoja
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimiendo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/aboutLogins.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/aboutLogins.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿Eliminar este inicio de sesión?
 confirm-delete-dialog-message = Esta acción no se puede deshacer.
 about-logins-confirm-remove-dialog-confirm-button = Eliminar
-about-logins-confirm-remove-all-dialog-confirm-button = Eliminar todo
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eliminar
+        [one] Eliminar
+       *[other] Eliminar todos
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sí, eliminar este inicio de sesión
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/appmenu.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/appmenu.ftl	2021-01-18 20:03:29.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nueva ventana
+appmenuitem-new-private-window =
+    .label = Nueva ventana privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Aumentar
 appmenuitem-zoom-reduce =
     .label = Reducir
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar ahora
+appmenuitem-save-page =
+    .label = Guardar como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novedades
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/appMenuNotifications.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:29.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ahora no
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Tras un reinicio rápido, { -brand-shorter-name } restaurará todas sus ventanas y pestañas abiertas que no estén en el modo de navegación privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } no puede actualizarse automáticamente a la última versión.
+    .buttonlabel = Actualizar { -brand-shorter-name } de todas formas
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Ahora no
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Hay una nueva actualización de { -brand-shorter-name } disponible, pero no se puede instalar porque se está ejecutando otra copia de { -brand-shorter-name }. Ciérrela para continuar con la actualización o elija actualizar de todas formas (es posible que la otra copia no funcione correctamente hasta que la reinicie).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Vale, entendido
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/browser.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/browser.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/browser.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -503,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tiene el control de su puntero. Pulse Esc para recuperar el control.
 pointerlock-warning-no-domain = Este documento tiene el control del puntero. Pulse Esc para recuperar el control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos los marcadores
+bookmarks-recent-bookmarks =
+    .value = Añadidos recientemente
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar más marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú de marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Otros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores del móvil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar panel lateral de marcadores
+           *[other] Ver el panel lateral de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra de herramientas de marcadores
+           *[other] Ver la barra de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eliminar menú de marcadores de la barra de herramientas
+           *[other] Añadir el menú Marcadores a la barra de herramientas
+        }
+bookmarks-search =
+    .label = Buscar marcadores
+bookmarks-tools =
+    .label = Herramientas de marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de herramientas de marcadores
+    .accesskey = B
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de herramientas de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Elementos de la barra de herramientas de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos de la barra de herramientas de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Añadir esta página a marcadores
+library-bookmarks-bookmark-edit =
+    .label = Editar este marcador
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabajar sin conexión
+    .accesskey = x
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/menubar.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/menubar.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/menubar.ftl	2021-01-18 20:03:29.000000000 +0000
@@ -116,7 +116,7 @@
     .label = Estilo de página básico
     .accesskey = b
 menu-view-charset =
-    .label = Codif. de caracteres
+    .label = Codificación de texto
     .accesskey = C
 
 ## These should match what Safari and other Apple applications
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/newtab/newtab.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nueva pestaña
 newtab-settings-button =
     .title = Personalizar la página Nueva pestaña
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar la nueva pestaña
+    .aria-label = Personalizar la nueva pestaña
 
 ## Search box component.
 
@@ -203,3 +206,27 @@
 
 newtab-error-fallback-info = Lo sentimos, algo salió mal al cargar el contenido.
 newtab-error-fallback-refresh-link = Recargue la página e inténtelo de nuevo.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Accesos directos
+newtab-custom-shortcuts-subtitle = Sitios que guarda o visita
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } fila
+       *[other] { $num } filas
+    }
+newtab-custom-sponsored-sites = Accesos directos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenido excepcional seleccionado por { -pocket-brand-name }, parte de la familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Historias patrocinadas
+newtab-custom-recent-title = Actividad reciente
+newtab-custom-recent-subtitle = Una selección de sitios y contenidos recientes
+newtab-custom-close-button = Cerrar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Mensajes interactivos
+newtab-custom-snippets-subtitle = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
+newtab-custom-settings = Administrar más ajustes
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/places.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/places.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/places.ftl	2021-01-18 20:03:29.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subcarpeta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Otros marcadores
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/preferences/preferences.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Los sitios que más visita
 home-prefs-topsites-by-option-sponsored =
     .label = Sitios principales patrocinados
+home-prefs-shortcuts-header =
+    .label = Accesos directos
+home-prefs-shortcuts-description = Sitios que guarda o visita
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Accesos directos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Contenido excepcional de toda la web, patrocinado por { $provider }
+home-prefs-recommended-by-description-new = Contenido excepcional seleccionado por { $provider }, parte de la familia { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Historias patrocinadas
 home-prefs-highlights-header =
     .label = Destacados
-home-prefs-recent-activity-header =
-    .label = Actividad reciente
 home-prefs-highlights-description = Una selección de sitios que ha guardado o visitado
 home-prefs-highlights-option-visited-pages =
     .label = Páginas visitadas
@@ -526,6 +530,9 @@
     .label = Descargas más recientes
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas guardadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Actividad reciente
+home-prefs-recent-activity-description = Una selección de sitios y contenidos recientes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Mensajes interactivos
 home-prefs-snippets-description = Actualizaciones de { -vendor-short-name } y { -brand-product-name }
+home-prefs-snippets-description-new = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -927,6 +935,9 @@
 addressbar-locbar-topsites-option =
     .label = Sitios populares
     .accesskey = t
+addressbar-locbar-engines-option =
+    .label = Buscadores
+    .accesskey = a
 addressbar-suggestions-settings = Cambiar preferencias de sugerencias de buscadores
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/es-ES/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/es-ES/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:29.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Solo en nueva pestaña
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Mostrar siempre
+    .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar solo en nuevas pestañas
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mostrar otros marcadores
     .accesskey = m
diff -Nru firefox-84.0.2+build1/l10n/es-ES/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-85.0+build1/l10n/es-ES/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-84.0.2+build1/l10n/es-ES/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-18 20:03:29.000000000 +0000
@@ -79,7 +79,7 @@
 # LOCALIZATION NOTE (characterencoding-button2.label): The \u00ad text at the beginning
 # of the string is used to disable auto hyphenation on the button text when it is displayed
 # in the menu panel.
-characterencoding-button2.label = ­Codif. de texto
+characterencoding-button2.label = \u00adCodificación de texto
 characterencoding-button2.tooltiptext = Mostrar opciones de codificación de texto
 
 email-link-button.label = Enviar enlace
diff -Nru firefox-84.0.2+build1/l10n/es-ES/devtools/client/markers.properties firefox-85.0+build1/l10n/es-ES/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/es-ES/devtools/client/markers.properties	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/devtools/client/markers.properties	2021-01-18 20:03:29.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Memoria baja
 marker.gcreason.label.CC_WAITING=Forzado por una recolección de ciclo
+marker.gcreason.label.CC_FINISHED=Ciclo de recolección finalizado
 marker.gcreason.label.CC_FORCED=Forzado por una recolección de ciclo
 marker.gcreason.label.LOAD_END=Carga de la página finalizada
 marker.gcreason.label.PAGE_HIDE=Movido al fondo
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Colección de la guardería
-
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/global/charsetMenu.dtd firefox-85.0+build1/l10n/es-ES/toolkit/chrome/global/charsetMenu.dtd
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/global/charsetMenu.dtd	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/chrome/global/charsetMenu.dtd	2021-01-18 20:03:30.000000000 +0000
@@ -2,4 +2,4 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY charsetMenu2.label "Codif. de caracteres">
+<!ENTITY charsetMenu2.label            "Codificación de texto">
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/es-ES/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:30.000000000 +0000
@@ -2,64 +2,114 @@
 # 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/.
 
-shortSeconds = s;s
+# LOCALIZATION NOTE (shortSeconds): Semi-colon list of plural
+# forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# s is the short form for seconds
+shortSeconds=s;s
+
+# LOCALIZATION NOTE (shortMinutes): Semi-colon list of plural
+# forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# m is the short form for minutes
+shortMinutes=m;m
+
+# LOCALIZATION NOTE (shortHours): Semi-colon list of plural
+# forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# h is the short form for hours
+shortHours=h;h
+
+# LOCALIZATION NOTE (shortDays): Semi-colon list of plural
+# forms. See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# d is the short form for days
+shortDays=d;d
+
+downloadErrorAlertTitle=Error de descarga
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=La descarga no se puede guardar porque ha sido bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=La descarga no se puede guardar porque está bloqueada por una extensión.
+downloadErrorGeneric=La descarga no puede guardarse porque ha sucedido un error desconocido.\n\nVuelva a intentarlo.
+
+# LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
+quitCancelDownloadsAlertTitle=¿Cancelar todas las descargas?
+quitCancelDownloadsAlertMsg=Si sale ahora, se cancelará una descarga. ¿Seguro que quiere salir?
+quitCancelDownloadsAlertMsgMultiple=Si sale ahora, se cancelarán %S descargas. ¿Seguro que quiere salir?
+quitCancelDownloadsAlertMsgMac=Si cierra ahora, se cancelará una descarga. ¿Seguro que quiere salir?
+quitCancelDownloadsAlertMsgMacMultiple=Si cierra ahora, se cancelarán %S descargas. ¿Seguro que quiere salir?
+offlineCancelDownloadsAlertTitle=¿Cancelar todas las descargas?
+offlineCancelDownloadsAlertMsg=Si pasa al modo sin conexión ahora, se cancelará una descarga. ¿Seguro que quiere pasar al modo sin conexión?
+offlineCancelDownloadsAlertMsgMultiple=Si pasa al modo sin conexión ahora, se cancelarán %S descargas. ¿Seguro que quiere pasar al modo sin conexión?
+leavePrivateBrowsingCancelDownloadsAlertTitle=¿Cancelar todas las descargas?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=Si cierra todas las ventanas de navegación privada ahora, se cancelará una descarga. ¿Está seguro de que quiere abandonar la navegación privada?
+leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=Si cierra todas las ventanas de navegación privada ahora, se cancelarán %S descargas. ¿Está seguro de que quiere abandonar la navegación privada?
+cancelDownloadsOKText=Cancelar una descarga
+cancelDownloadsOKTextMultiple=Cancelar %S descargas
+dontQuitButtonWin=No salir
+dontQuitButtonMac=No cerrar
+dontGoOfflineButton=Permanecer conectado
+dontLeavePrivateBrowsingButton2=Seguir en navegación privada
+
+# LOCALIZATION NOTE (infiniteRate):
+# If download speed is a JavaScript Infinity value, this phrase is used
+infiniteRate=Muy, muy rápido
+
+# LOCALIZATION NOTE (statusFormat3): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S rate number; %3$S rate unit; %4$S time left
+# example: 4 minutes left — 1.1 of 11.1 GB (2.2 MB/sec)
+statusFormat3=%4$S — %1$S (%2$S %3$S/seg.)
+
+# LOCALIZATION NOTE (statusFormatInfiniteRate): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S substitute phrase for Infinity speed; %3$S time left
+# example: 4 minutes left — 1.1 of 11.1 GB (Really fast)
+statusFormatInfiniteRate=%3$S — %1$S (%2$S)
+
+# LOCALIZATION NOTE (statusFormatNoRate): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S time left
+# example: 4 minutes left — 1.1 of 11.1 GB
+statusFormatNoRate=%2$S — %1$S
+
+bytes=bytes
+kilobyte=KB
+megabyte=MB
+gigabyte=GB
+
+# LOCALIZATION NOTE (transferSameUnits2):
+# %1$S progress number; %2$S total number; %3$S total unit
+# example: 1.1 of 333 MB
+transferSameUnits2=%1$S de %2$S %3$S
+# LOCALIZATION NOTE (transferDiffUnits2):
+# %1$S progress number; %2$S progress unit; %3$S total number; %4$S total unit
+# example: 11.1 MB of 3.3 GB
+transferDiffUnits2=%1$S %2$S de %3$S %4$S
+# LOCALIZATION NOTE (transferNoTotal2):
+# %1$S progress number; %2$S unit
+# example: 111 KB
+transferNoTotal2=%1$S %2$S
+
+# LOCALIZATION NOTE (timePair3): %1$S time number; %2$S time unit
+# example: 1m; 11h
+timePair3=%1$S%2$S
+# LOCALIZATION NOTE (timeLeftSingle3): %1$S time left
+# example: 1m left; 11h left
+timeLeftSingle3=%1$S restantes
+# LOCALIZATION NOTE (timeLeftDouble3): %1$S time left; %2$S time left sub units
+# example: 11h 2m left; 1d 22h left
+timeLeftDouble3=%1$S %2$S restantes
+timeFewSeconds2=Quedan pocos segundos
+timeUnknown2=Tiempo restante desconocido
+
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
+doneScheme2=recurso %1$S
+# LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
+# This is used as an eTLD replacement for local files, so make it lower case
+doneFileScheme=archivo local
 
-shortMinutes = m;m
+# LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
+yesterday=Ayer
 
-shortHours = h;h
+fileExecutableSecurityWarning="%S" es un archivo ejecutable. Los archivos ejecutables pueden contener virus u otros códigos maliciosos que podrían dañar su equipo. Sea cauteloso al abrir este archivo. ¿Seguro que quiere ejecutar "%S"?
+fileExecutableSecurityWarningTitle=¿Abrir archivos ejecutables?
 
-shortDays = d;d
-
-downloadErrorAlertTitle = Error de descarga
-downloadErrorGeneric = La descarga no puede guardarse porque ha sucedido un error desconocido.\n\nVuelva a intentarlo.
-
-quitCancelDownloadsAlertTitle = ¿Cancelar todas las descargas?
-quitCancelDownloadsAlertMsg = Si sale ahora, se cancelará una descarga. ¿Seguro que quiere salir?
-quitCancelDownloadsAlertMsgMultiple = Si sale ahora, se cancelarán %S descargas. ¿Seguro que quiere salir?
-quitCancelDownloadsAlertMsgMac = Si cierra ahora, se cancelará una descarga. ¿Seguro que quiere salir?
-quitCancelDownloadsAlertMsgMacMultiple = Si cierra ahora, se cancelarán %S descargas. ¿Seguro que quiere salir?
-offlineCancelDownloadsAlertTitle = ¿Cancelar todas las descargas?
-offlineCancelDownloadsAlertMsg = Si pasa al modo sin conexión ahora, se cancelará una descarga. ¿Seguro que quiere pasar al modo sin conexión?
-offlineCancelDownloadsAlertMsgMultiple = Si pasa al modo sin conexión ahora, se cancelarán %S descargas. ¿Seguro que quiere pasar al modo sin conexión?
-leavePrivateBrowsingCancelDownloadsAlertTitle = ¿Cancelar todas las descargas?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2 = Si cierra todas las ventanas de navegación privada ahora, se cancelará una descarga. ¿Está seguro de que quiere abandonar la navegación privada?
-leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2 = Si cierra todas las ventanas de navegación privada ahora, se cancelarán %S descargas. ¿Está seguro de que quiere abandonar la navegación privada?
-cancelDownloadsOKText = Cancelar una descarga
-cancelDownloadsOKTextMultiple = Cancelar %S descargas
-dontQuitButtonWin = No salir
-dontQuitButtonMac = No cerrar
-dontGoOfflineButton = Permanecer conectado
-dontLeavePrivateBrowsingButton2 = Seguir en navegación privada
-
-infiniteRate = Muy, muy rápido
-
-statusFormat3 = %4$S — %1$S (%2$S %3$S/seg.)
-
-statusFormatInfiniteRate = %3$S — %1$S (%2$S)
-
-statusFormatNoRate = %2$S — %1$S
-
-bytes = bytes
-kilobyte = KB
-megabyte = MB
-gigabyte = GB
-
-transferSameUnits2 = %1$S de %2$S %3$S
-transferDiffUnits2 = %1$S %2$S de %3$S %4$S
-transferNoTotal2 = %1$S %2$S
-
-timePair3 = %1$S%2$S
-timeLeftSingle3 = %1$S restantes
-timeLeftDouble3 = %1$S %2$S restantes
-timeFewSeconds2 = Quedan pocos segundos
-timeUnknown2 = Tiempo restante desconocido
-
-doneScheme2 = recurso %1$S
-doneFileScheme = archivo local
-
-yesterday = Ayer
-
-fileExecutableSecurityWarning = "%S" es un archivo ejecutable. Los archivos ejecutables pueden contener virus u otros códigos maliciosos que podrían dañar su equipo. Sea cauteloso al abrir este archivo. ¿Seguro que quiere ejecutar "%S"?
-fileExecutableSecurityWarningTitle = ¿Abrir archivos ejecutables?
-
-downloadsFolder = Descargas
+# Desktop folder name for downloaded files
+downloadsFolder=Descargas
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/es-ES/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:30.000000000 +0000
@@ -2,36 +2,44 @@
 # 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/.
 
-updateName = %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
+updateName=%S %S
 
-noThanksButton = No, gracias
-noThanksButton.accesskey = N
-restartLaterButton = Reiniciar más tarde
-restartLaterButton.accesskey = m
-restartNowButton = Reiniciar %S
-restartNowButton.accesskey = R
+noThanksButton=No, gracias
+noThanksButton.accesskey=N
+# NOTE: The restartLaterButton string is also used in
+# mozapps/extensions/content/blocklist.js
+restartLaterButton=Reiniciar más tarde
+restartLaterButton.accesskey=m
+restartNowButton=Reiniciar %S
+restartNowButton.accesskey=R
 
-statusFailed = Instalación incorrecta
+statusFailed=Instalación incorrecta
 
-installSuccess = La actualización se instaló correctamente
-installPending = Instalación pendiente
-patchApplyFailure = No se pudo instalar la actualización (fallo al aplicar el parche)
-elevationFailure = No tiene los permisos necesarios para instalar esta actualización. Contacte con su administrador de sistema.
+installSuccess=La actualización se instaló correctamente
+installPending=Instalación pendiente
+patchApplyFailure=No se pudo instalar la actualización (fallo al aplicar el parche)
+elevationFailure=No tiene los permisos necesarios para instalar esta actualización. Contacte con su administrador de sistema.
 
-check_error-200 = Archivo XML de actualización mal formado (200)
-check_error-403 = Acceso denegado (403)
-check_error-404 = Archivo XML de actualización no encontrado (404)
-check_error-500 = Error interno del servidor (500)
-check_error-2152398849 = Fallido (razón desconocida)
-check_error-2152398861 = Conexión rechazada
-check_error-2152398862 = Conexión caducada
-check_error-2152398864 = La red está desconectada (conectarse)
-check_error-2152398867 = Puerto no permitido
-check_error-2152398868 = No se han recibido datos (vuelva a intentarlo)
-check_error-2152398878 = Servidor de actualizaciones no encontrado (compruebe su conexión a internet)
-check_error-2152398890 = Servidor proxy no encontrado (compruebe su conexión a internet)
-check_error-2152398918 = La red está desconectada (conectarse)
-check_error-2152398919 = Se ha interrumpido la transferencia de datos (vuelva a intentarlo)
-check_error-2152398920 = Conexión al servidor proxy rechazada
-check_error-2153390069 = El certificado del servidor ha caducado (ajuste el reloj de su sistema a la fecha y hora correctas si es necesario)
-check_error-verification_failed = No se ha podido verificar la integridad de la actualización
+check_error-200=Archivo XML de actualización mal formado (200)
+check_error-403=Acceso denegado (403)
+check_error-404=Archivo XML de actualización no encontrado (404)
+check_error-500=Error interno del servidor (500)
+check_error-2152398849=Fallido (razón desconocida)
+check_error-2152398861=Conexión rechazada
+check_error-2152398862=Conexión caducada
+# NS_ERROR_OFFLINE
+check_error-2152398864=La red está desconectada (conectarse)
+check_error-2152398867=Puerto no permitido
+check_error-2152398868=No se han recibido datos (vuelva a intentarlo)
+check_error-2152398878=Servidor de actualizaciones no encontrado (compruebe su conexión a internet)
+check_error-2152398890=Servidor proxy no encontrado (compruebe su conexión a internet)
+# NS_ERROR_DOCUMENT_NOT_CACHED
+check_error-2152398918=La red está desconectada (conectarse)
+check_error-2152398919=Se ha interrumpido la transferencia de datos (vuelva a intentarlo)
+check_error-2152398920=Conexión al servidor proxy rechazada
+check_error-2153390069=El certificado del servidor ha caducado (ajuste el reloj de su sistema a la fecha y hora correctas si es necesario)
+check_error-verification_failed=No se ha podido verificar la integridad de la actualización
+check_error-move_failed=No ha sido posible preparar la actualización para la instalación
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceros
+support-third-party-modules-module = Archivo de módulo
+support-third-party-modules-version = Versión del archivo
+support-third-party-modules-vendor = Información del fabricante
+support-third-party-modules-occurrence = Ocurrencias
+support-third-party-modules-process = Tipo de proceso e ID
+support-third-party-modules-thread = Hilo
+support-third-party-modules-base = Dirección de imagebase
+support-third-party-modules-uptime = Tiempo de actividad del proceso (ms)
+support-third-party-modules-duration = Duración de la carga (ms)
+support-third-party-modules-empty = No se han cargado módulos de terceros.
+support-third-party-modules-no-value = (Sin valor)
+support-third-party-modules-button-open =
+    .title = Abrir ubicación del archivo...
+support-third-party-modules-expand =
+    .title = Mostrar información detallada
+support-third-party-modules-collapse =
+    .title = Ocultar información detallada
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo no está firmado
+support-third-party-modules-folder-icon =
+    .title = Abrir ubicación del archivo...
+support-third-party-modules-down-icon =
+    .title = Mostrar información detallada
+support-third-party-modules-up-icon =
+    .title = Ocultar información detallada
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Compatibilidad con múltiples Picture-in-Picture
 experimental-features-multi-pip-description = Función experimental para permitir que se abran varias ventanas Picture-in-Picture al mismo tiempo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Soporte experimental para el protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primera página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Página siguiente
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/es-ES/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:34:41.000000000 +0000
+++ firefox-85.0+build1/l10n/es-ES/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:30.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = para
+printui-page-custom-range-input =
+    .aria-label = Introduzca un rango de páginas personalizado
+    .placeholder = p.ej. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientación
@@ -48,6 +51,7 @@
 printui-options = Opciones
 printui-headers-footers-checkbox = Imprimir encabezados y pies de página
 printui-backgrounds-checkbox = Imprimir fondo de pantalla
+printui-selection-checkbox = Imprimir solo la selección
 printui-color-mode-label = Modo de color
 printui-color-mode-color = Color
 printui-color-mode-bw = Blanco y negro
@@ -56,19 +60,29 @@
 printui-margins-min = Mínimo
 printui-margins-none = Ninguno
 printui-margins-custom = Personalizado
+printui-margins-custom-inches = Personalizado (pulgadas)
 printui-margins-custom-top = Superior
+printui-margins-custom-top-inches = Superior (pulgadas)
 printui-margins-custom-bottom = Inferior
+printui-margins-custom-bottom-inches = Inferior (pulgadas)
 printui-margins-custom-left = Izquierdo
+printui-margins-custom-left-inches = Izquierda (pulgadas)
 printui-margins-custom-right = Derecho
+printui-margins-custom-right-inches = Derecha (pulgadas)
 printui-system-dialog-link = Imprimir usando el diálogo del sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Guardar
 printui-cancel-button = Cancelar
+printui-close-button = Cerrar
 printui-loading = Preparando vista previa
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vista previa de impresión
+printui-pages-per-sheet = Páginas por hoja
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimiendo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/aboutLogins.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/aboutLogins.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿Eliminar este inicio de sesión?
 confirm-delete-dialog-message = Esta acción no se puede deshacer
 about-logins-confirm-remove-dialog-confirm-button = Eliminar
-about-logins-confirm-remove-all-dialog-confirm-button = Eliminar todo
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eliminar
+        [one] Eliminar
+       *[other] Eliminar todas
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sí, eliminar este inicio de sesión
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportar inicios de sesión y contraseñas
 about-logins-confirm-export-dialog-message = Tus contraseñas se guardarán como texto legible (por ejemplo, BadP@ssw0rd) de modo que cualquiera que abra el archivo exportado podrá verlas.
 about-logins-confirm-export-dialog-confirm-button = Exportar...
+about-logins-alert-import-title = Importación completa
+about-logins-alert-import-message = Ver resumen detallado de la importación
 confirm-discard-changes-dialog-title = ¿Descartar cambios no guardados?
 confirm-discard-changes-dialog-message = Todos los cambios no guardados se perderán.
 confirm-discard-changes-dialog-confirm-button = Descartar
@@ -262,3 +269,30 @@
         [macos] Documento CSV
        *[other] Archivo CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importación completa
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span> Se agregaron nuevos inicios de sesión:</span> <span-data-l10n-name="count">{ $count }</span>
+       *[other] <span> Se agregaron nuevos inicios de sesión:</span> <span-data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Se actualizaron los inicios de sesión :</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Se actualizaron los inicios de sesión :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Se encontraron inicios de sesión duplicados:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importado)</span>
+       *[other] <span>Se encontraron inicios de sesión duplicados:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importados)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importado)</span>
+       *[other] <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(no importados)</span>
+    }
+about-logins-import-dialog-done = Hecho
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/appmenu.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/appmenu.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nueva ventana
+appmenuitem-new-private-window =
+    .label = Nueva ventana privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Acercarse
 appmenuitem-zoom-reduce =
     .label = Alejarse
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar ahora
+appmenuitem-save-page =
+    .label = Guardar como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novedades
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/appMenuNotifications.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ahora no
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Después de un reinicio rápido, { -brand-shorter-name } restaurará todas las pestañas y ventanas abiertas que no estén en modo de Navegación Privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } no puede actualizarse automáticamente a la última versión.
+    .buttonlabel = Actualizar { -brand-shorter-name } de todas formas
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Ahora no
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Hay una nueva actualización de { -brand-shorter-name } disponible, pero no se puede instalar porque se está ejecutando otra copia de { -brand-shorter-name }. Ciérrala para continuar con la actualización o elige actualizar de todas formas (es posible que la otra copia no funcione correctamente hasta que la reinicies).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Listo, entendido
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/browser.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/browser.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/browser.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tiene el control de tu puntero. Presiona Esc para recuperarlo.
 pointerlock-warning-no-domain = Este documento tiene el control de tu puntero. Presiona Esc para recuperarlo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos los marcadores
+bookmarks-recent-bookmarks =
+    .value = Agregados recientemente a Marcadores
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar más marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú Marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Otros Marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores móviles
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra lateral de marcadores
+           *[other] Ver el panel lateral de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra de marcadores
+           *[other] Ver la barra de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eliminar menú de marcadores de la barra de herramientas
+           *[other] Agregar menú de marcadores a la barra de herramientas
+        }
+bookmarks-search =
+    .label = Buscar Marcadores
+bookmarks-tools =
+    .label = Herramientas de marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Marcadores
+    .accesskey = M
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Marcadores
+bookmarks-toolbar-placeholder =
+    .title = Elementos de la barra de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos de la barra de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Agregar esta página a marcadores
+library-bookmarks-bookmark-edit =
+    .label = Modificar este marcador
+library-recent-activity-label = Actividad reciente
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabajar sin conexión
+    .accesskey = x
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/migration.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/migration.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/migration.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -54,6 +54,8 @@
 import-items-page-title = Elementos a importar
 import-items-description = Selecciona los elementos que se importarán:
 import-permissions-page-title = Por favor, dale permisos a { -brand-short-name }
+# Do not translate "Bookmarks.plist"; the file name is the same everywhere.
+import-permissions-description = macOS requiere que permitas explícitamente a { -brand-short-name } acceder a los marcadores de Safari. Haz clic en “Continuar� y selecciona el archivo “Bookmarks.plist� en el panel de abrir archivo que se mostrará.
 import-migrating-page-title = Importando…
 import-migrating-description = Ya se importaron los siguientes elementos…
 import-select-profile-page-title = Seleccionar perfil
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/asrouter.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Escribe menos, encuentra más con la barra de direcciones
 cfr-whatsnew-searchbar-body-topsites = Ahora, simplemente seleccione la barra de direcciones y se va a expandir un cuadro con enlaces a sus sitios principales.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �cono de lupa
 
 ## Picture-in-Picture
@@ -257,6 +260,12 @@
 
 ## Fission Experiment Message
 
+cfr-doorhanger-fission-body-approved = Tu privacidad importa. { -brand-short-name } ahora aísla, sitios web unos de otros, lo que hace que sea más difícil que los piratas informáticos roben contraseñas, números de tarjetas de crédito y otra información sensible.
+cfr-doorhanger-fission-header = Aislamiento del sitio
+cfr-doorhanger-fission-primary-button = OK, entendido
+    .accesskey = O
+cfr-doorhanger-fission-secondary-button = Saber más
+    .accesskey = L
 
 ## What's new: Cookies message
 
@@ -266,6 +275,21 @@
 
 ## What's new: Media controls message
 
+cfr-whatsnew-media-keys-header = Más controles multimedia
+cfr-whatsnew-media-keys-body = Reproducir y pausar audio o video directamente desde tu teclado o audífonos facilita el control de medios desde otra pestaña, programa o incluso cuando tu computadora está bloqueada. También puedes moverte entre pistas usando las teclas de avance y retroceso.
+cfr-whatsnew-media-keys-button = Saber cómo
 
 ## What's new: Search shortcuts
 
+cfr-whatsnew-search-shortcuts-header = Atajos de búsqueda en la barra de direcciones
+cfr-whatsnew-search-shortcuts-body = Ahora, cuando escribas un motor de búsqueda o un sitio específico en la barra de direcciones, aparecerá un atajo azul en las sugerencias de búsqueda. Selecciona ese acceso directo para completar tu búsqueda directamente desde la barra de direcciones.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protección contra supercookies maliciosas
+cfr-whatsnew-supercookies-body = Los sitios web pueden adjuntar en secreto una "supercookie" a tu navegador que puede seguirte por la web, incluso después de limpiar tus cookies. { -brand-short-name } ahora proporciona una fuerte protección contra las supercookies para que no puedan usarse para rastrear tus actividades en línea de un sitio a otro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Mejores marcadores
+cfr-whatsnew-bookmarking-body = Es más fácil realizar un seguimiento de tus sitios favoritos. { -brand-short-name } ahora recuerda tu ubicación preferida para los marcadores guardados, muestra la barra de herramientas de marcadores de forma predeterminada en las pestañas nuevas y te brinda fácil acceso al resto de tus marcadores a través de una carpeta de la barra de herramientas.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/newtab.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nueva pestaña
 newtab-settings-button =
     .title = Personalizar tu página de nueva pestaña
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar la nueva pestaña
+    .aria-label = Personalizar la nueva pestaña
 
 ## Search box component.
 
@@ -15,27 +18,30 @@
 newtab-search-box-search-button =
     .title = Buscar
     .aria-label = Buscar
-
 newtab-search-box-search-the-web-text = Buscar en la Web
 newtab-search-box-search-the-web-input =
     .placeholder = Buscar en la Web
     .title = Buscar en la Web
     .aria-label = Buscar en la Web
+newtab-search-box-text = Buscar en la web
+newtab-search-box-input =
+    .placeholder = Buscar en la web
+    .aria-label = Buscar en la web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Agregar motor de búsqueda
 newtab-topsites-add-topsites-header = Nuevo sitio popular
+newtab-topsites-add-shortcut-header = Nuevo acceso directo
 newtab-topsites-edit-topsites-header = Editar sitio popular
+newtab-topsites-edit-shortcut-header = Editar acceso directo
 newtab-topsites-title-label = Título
 newtab-topsites-title-input =
     .placeholder = Introducir un título
-
 newtab-topsites-url-label = URL
 newtab-topsites-url-input =
     .placeholder = Escribir o pegar una URL
 newtab-topsites-url-validation = Se requiere una URL válida
-
 newtab-topsites-image-url-label = URL de imagen personalizada
 newtab-topsites-use-image-link = Utilizar una imagen personalizada…
 newtab-topsites-image-validation = La imagen no se pudo cargar. Intente una URL diferente.
@@ -54,18 +60,20 @@
 # "This action" refers to deleting a page from history.
 newtab-confirm-delete-history-p2 = Esta acción no se puede deshacer.
 
+## Top Sites - Sponsored label
+
+newtab-topsite-sponsored = Patrocinado
+
 ## Context Menu - Action Tooltips.
 
 # General tooltip for context menus.
 newtab-menu-section-tooltip =
     .title = Abrir menú
     .aria-label = Abrir menú
-
 # Tooltip for dismiss button
 newtab-dismiss-button-tooltip =
     .title = Eliminar
     .aria-label = Eliminar
-
 # This tooltip is for the context menu of Pocket cards or Topsites
 # Variables:
 #  $title (String): The label or hostname of the site. This is for screen readers when the context menu button is focused/active.
@@ -134,12 +142,10 @@
 newtab-label-recommended = Tendencias
 newtab-label-saved = Guardado en { -pocket-brand-name }
 newtab-label-download = Descargado
-
 # This string is used in the story cards to indicate sponsored content
 # Variables:
 #  $sponsorOrSource (String): This is the name of a company or their domain
 newtab-label-sponsored = { $sponsorOrSource } · Patrocinado
-
 # This string is used at the bottom of story cards to indicate sponsored content
 # Variables:
 #  $sponsor (String): This is the name of a sponsor
@@ -170,6 +176,7 @@
 
 newtab-section-header-topsites = Sitios favoritos
 newtab-section-header-highlights = Destacados
+newtab-section-header-recent-activity = Actividad reciente
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recomendado por { $provider }
@@ -177,13 +184,11 @@
 ## Empty Section States: These show when there are no more items in a section. Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 
 newtab-empty-section-highlights = Empieza a navegar, y nosotros te mostraremos aquí algunos de los mejores artículos, videos y otras páginas que hayas visitado recientemente o marcado.
-
 # Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 # Variables:
 #  $provider (String): Name of the content provider for this section, e.g "Pocket".
 newtab-empty-section-topstories = Ya estás al día. Vuelve luego y busca más historias de { $provider }. ¿No puedes esperar? Selecciona un tema popular y encontrarás más historias interesantes por toda la web.
 
-
 ## Empty Section (Content Discovery Experience). These show when there are no more stories or when some stories fail to load.
 
 newtab-discovery-empty-section-topstories-header = ¡Estás al día!
@@ -207,3 +212,27 @@
 
 newtab-error-fallback-info = Ups, algo salió mal mientras se cargaba el contenido.
 newtab-error-fallback-refresh-link = Actualiza la página e intenta de nuevo.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Accesos directos
+newtab-custom-shortcuts-subtitle = Sitios que guardas o visitas
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } fila
+       *[other] { $num } filas
+    }
+newtab-custom-sponsored-sites = Accesos directos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenido excepcional seleccionado por { -pocket-brand-name }, parte de la familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Historias patrocinadas
+newtab-custom-recent-title = Actividad reciente
+newtab-custom-recent-subtitle = Una selección de sitios y contenidos recientes
+newtab-custom-close-button = Cerrar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Mensajes interactivos
+newtab-custom-snippets-subtitle = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
+newtab-custom-settings = Administrar más ajustes
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/newtab/onboarding.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/newtab/onboarding.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -17,6 +17,14 @@
 
 ## Welcome modal dialog strings
 
+
+### UI strings for the simplified onboarding / multistage about:welcome
+### Various strings use a non-breaking space to avoid a single dangling /
+### widowed word, so test on various window sizes if you also want this.
+
+
+## Welcome page strings
+
 onboarding-welcome-header = Bienvenido a { -brand-short-name }
 onboarding-welcome-body = Conseguiste el navegador.<br/>Conoce el resto de la familia { -brand-product-name }.
 onboarding-welcome-learn-more = Conoce más sobre los beneficios.
@@ -36,10 +44,59 @@
 # Text for link to submit the sign in form
 onboarding-join-form-signin = Iniciar sesión
 onboarding-start-browsing-button-label = Empieza a navegar
+onboarding-not-now-button-label = Ahora no
 onboarding-cards-dismiss =
     .title = Descartar
     .aria-label = Descartar
 
+## Welcome full page string
+
+onboarding-fullpage-welcome-subheader = Comencemos a explorar todo lo que puedes hacer.
+onboarding-fullpage-form-email =
+    .placeholder = Tu dirección de correo electrónico…
+
+## Firefox Sync modal dialog strings.
+
+onboarding-sync-welcome-header = Lleva a { -brand-product-name } contigo
+onboarding-sync-welcome-content = Accede a tus marcadores, historial, contraseñas y más ajustes en todos tus dispositivos.
+onboarding-sync-welcome-learn-more-link = Conoce más acerca de Firefox Accounts
+onboarding-sync-form-input =
+    .placeholder = Correo electrónico
+onboarding-sync-form-continue-button = Continuar
+onboarding-sync-form-skip-login-button = Saltar este paso
+
+## This is part of the line "Enter your email to continue to Firefox Sync"
+
+onboarding-sync-form-header = Ingresa tu correo electrónico
+onboarding-sync-form-sub-header = para continuar a { -sync-brand-name }.
+
+## These are individual benefit messages shown with an image, title and
+## description.
+
+onboarding-benefit-products-text = Termina tus pendientes con una familia de herramientas que respeta tu privacidad a través de tus dispositivos.
+# "Personal Data Promise" is a concept that should be translated consistently
+# across the product. It refers to a concept shown elsewhere to the user: "The
+# Firefox Personal Data Promise is the way we honor your data in everything we
+# make and do. We take less data. We keep it safe. And we make sure that we are
+# transparent about how we use it."
+onboarding-benefit-privacy-text = Todo lo que hacemos respeta nuestra promesa de datos personales: Tomar menos. Mantenerlo seguro. Sin secretos.
+onboarding-benefit-sync-title = { -sync-brand-short-name }
+onboarding-benefit-sync-text = Lleva tus marcadores, contraseñas, historial y más a todas partes donde uses { -brand-product-name }.
+onboarding-benefit-monitor-title = { -monitor-brand-short-name }
+onboarding-benefit-monitor-text = Recibe notificaciones cuando tu información personal sea encontrada en una filtración de datos conocida.
+onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
+onboarding-benefit-lockwise-text = Administra tus contraseñas manteniéndolas protegidas y contigo.
+
+## Custom Return To AMO onboarding strings
+
+return-to-amo-subtitle = Genial, has instalado { -brand-short-name }
+# <img data-l10n-name="icon"/> will be replaced with the icon belonging to the extension
+#
+# Variables:
+#   $addon-name (String) - Name of the add-on
+return-to-amo-addon-title = Ahora obtengamos <img data-l10n-name="icon"/> <b>{ $addon-name }</b> para ti.
+return-to-amo-add-extension-label = Agregar la extensión
+
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
 
 # The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
@@ -72,8 +129,6 @@
 onboarding-multistage-theme-secondary-button-label = Ahora no
 # Automatic theme uses operating system color settings
 onboarding-multistage-theme-label-automatic = Automático
-# System refers to the operating system
-onboarding-multistage-theme-description-automatic = Usar tema del sistema
 onboarding-multistage-theme-label-light = Claro
 onboarding-multistage-theme-label-dark = Oscuro
 # "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
@@ -85,30 +140,6 @@
 ## tooltip.
 
 # Tooltip displayed on hover of automatic theme
-onboarding-multistage-theme-tooltip-automatic =
-    .title =
-        Heredar la apariencia de tu sistema
-        operativo para botones, menús y ventanas.
-    .aria-label = { onboarding-multistage-theme-tooltip-automatic.title }
-# Tooltip displayed on hover of light theme
-onboarding-multistage-theme-tooltip-light =
-    .title =
-        Usar una apariencia clara para botones, 
-        menús y ventanas.
-    .aria-label = { onboarding-multistage-theme-tooltip-light.title }
-# Tooltip displayed on hover of dark theme
-onboarding-multistage-theme-tooltip-dark =
-    .title =
-        Usar una apariencia oscura para botones, 
-        menús y ventanas.
-    .aria-label = { onboarding-multistage-theme-tooltip-dark.title }
-# Tooltip displayed on hover of Alpenglow theme
-onboarding-multistage-theme-tooltip-alpenglow =
-    .title =
-        Usar una apariencia colorida para botones,
-        menús y ventanas.
-    .aria-label = { onboarding-multistage-theme-tooltip-alpenglow.title }
-# Tooltip displayed on hover of automatic theme
 onboarding-multistage-theme-tooltip-automatic-2 =
     .title =
         Heredar la apariencia de tu sistema
@@ -149,44 +180,6 @@
         Usar una apariencia colorida para botones,
         menús y ventanas.
 
-## Welcome full page string
-
-onboarding-fullpage-welcome-subheader = Comencemos a explorar todo lo que puedes hacer.
-onboarding-fullpage-form-email =
-    .placeholder = Tu dirección de correo electrónico…
-
-## Firefox Sync modal dialog strings.
-
-onboarding-sync-welcome-header = Lleva a { -brand-product-name } contigo
-onboarding-sync-welcome-content = Accede a tus marcadores, historial, contraseñas y más ajustes en todos tus dispositivos.
-onboarding-sync-welcome-learn-more-link = Conoce más acerca de Firefox Accounts
-onboarding-sync-form-input =
-    .placeholder = Correo electrónico
-onboarding-sync-form-continue-button = Continuar
-onboarding-sync-form-skip-login-button = Saltar este paso
-
-## This is part of the line "Enter your email to continue to Firefox Sync"
-
-onboarding-sync-form-header = Ingresa tu correo electrónico
-onboarding-sync-form-sub-header = para continuar a { -sync-brand-name }.
-
-## These are individual benefit messages shown with an image, title and
-## description.
-
-onboarding-benefit-products-text = Termina tus pendientes con una familia de herramientas que respeta tu privacidad a través de tus dispositivos.
-# "Personal Data Promise" is a concept that should be translated consistently
-# across the product. It refers to a concept shown elsewhere to the user: "The
-# Firefox Personal Data Promise is the way we honor your data in everything we
-# make and do. We take less data. We keep it safe. And we make sure that we are
-# transparent about how we use it."
-onboarding-benefit-privacy-text = Todo lo que hacemos respeta nuestra promesa de datos personales: Tomar menos. Mantenerlo seguro. Sin secretos.
-onboarding-benefit-sync-title = { -sync-brand-short-name }
-onboarding-benefit-sync-text = Lleva tus marcadores, contraseñas, historial y más a todas partes donde uses { -brand-product-name }.
-onboarding-benefit-monitor-title = { -monitor-brand-short-name }
-onboarding-benefit-monitor-text = Recibe notificaciones cuando tu información personal sea encontrada en una filtración de datos conocida.
-onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
-onboarding-benefit-lockwise-text = Administra tus contraseñas manteniéndolas protegidas y contigo.
-
 ## These strings belong to the individual onboarding messages.
 
 
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/places.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/places.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/places.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -17,7 +17,6 @@
 places-open-private-window =
     .label = Abrir en una nueva ventana privada
     .accesskey = p
-
 places-new-bookmark =
     .label = Nuevo marcador…
     .accesskey = N
@@ -30,7 +29,6 @@
 places-new-separator =
     .label = Nuevo separador
     .accesskey = v
-
 places-view =
     .label = Ver
     .accesskey = V
@@ -49,12 +47,10 @@
 places-by-day-and-site =
     .label = Por Fecha y Sitio
     .accesskey = t
-
 places-history-search =
     .placeholder = Buscar historial
 places-bookmarks-search =
     .placeholder = Buscar marcadores
-
 places-delete-domain-data =
     .label = Olvida a este Sitio
     .accesskey = O
@@ -64,3 +60,12 @@
 places-properties =
     .label = Propiedades
     .accesskey = a
+# Managed bookmarks are created by an administrator and cannot be changed by the user.
+managed-bookmarks =
+    .label = Marcadores administrados
+# This label is used when a managed bookmarks folder doesn't have a name.
+managed-bookmarks-subfolder =
+    .label = Subcarpeta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Otros marcadores
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -79,6 +79,7 @@
 ##
 
 policy-LocalFileLinks = Permitir a sitios web específicos para enlazar a archivos locales.
+policy-ManagedBookmarks = Configura una lista de marcadores administrada por un administrador que el usuario no puede cambiar.
 policy-MasterPassword = Requerir o  bloquear el uso de una contraseña maestra.
 policy-PrimaryPassword = Requerir o evitar el uso de una contraseña maestra.
 policy-NetworkPrediction = Habilitar o deshabilitar predicción de red (búsqueda previa de DNS).
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/preferences/fxaPairDevice.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/preferences/fxaPairDevice.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/preferences/fxaPairDevice.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/preferences/fxaPairDevice.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -5,11 +5,11 @@
 fxa-pair-device-dialog =
     .title = Conectar otro dispositivo
     .style = width: 26em; min-height: 35em;
-
 fxa-qrcode-heading-phase1 = 1. Si aún no lo has hecho, instala <a data-l10n-name="connect-another-device">Firefox en tu dispositivo móvil</a>.
-
 fxa-qrcode-heading-phase2 = 2. Luego inicia sesión en { -sync-brand-short-name }, o escanea el código de conexión desde los ajustes de { -sync-brand-short-name }.
-
+fxa-qrcode-heading-step1 = 1. Si aún no lo has hecho, instala <a data-l10n-name="connect-another-device">Firefox en tu dispositivo móvil</a>.
+fxa-qrcode-heading-step2 = 2. Abre Firefox en tu dispositivo móvil.
+fxa-qrcode-heading-step3 = 3. Abre el <b>menú</b> (<img data-l10n-name="ios-menu-icon"/> o <img data-l10n-name="android-menu-icon"/>), toca <img data-l10n-name="settings-icon"/> <b>Ajustes</b> y selecciona <b>Activar sincronización</b>
+fxa-qrcode-heading-step4 = 4. Escanea este código:
 fxa-qrcode-error-title = No se pudo emparejar.
-
 fxa-qrcode-error-body = Intentar de nuevo.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/preferences/preferences.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -29,6 +29,8 @@
            *[other] Encontrar en configuraciones
         }
 managed-notice = Tu organización gestiona el navegador.
+category-list =
+    .aria-label = Categorías
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
@@ -50,6 +52,9 @@
 pane-experimental-subtitle = Continuar con precaución
 pane-experimental-search-results-header = Experimentos de { -brand-short-name }: proceder con precaución
 pane-experimental-description = Cambiar las preferencias de configuración avanzada puede afectar el rendimiento o la seguridad de { -brand-short-name }.
+pane-experimental-reset =
+    .label = Restaurar predeterminados
+    .accesskey = R
 help-button-label = Soporte de { -brand-short-name }
 addons-button-label = Complementos y temas
 focus-search =
@@ -426,6 +431,10 @@
     .label = Habilitar controles de video picture-in-picture
     .accesskey = A
 browsing-picture-in-picture-learn-more = Saber más
+browsing-media-control =
+    .label = Controla los medios con el teclado, los auriculares o la interfaz virtual
+    .accesskey = v
+browsing-media-control-learn-more = Saber más
 browsing-cfr-recommendations =
     .label = Recomendar extensiones mientras se navega
     .accesskey = R
@@ -489,6 +498,13 @@
 home-prefs-topsites-header =
     .label = Sitios populares
 home-prefs-topsites-description = Los sitios que más visitas
+home-prefs-topsites-by-option-sponsored =
+    .label = Sitios principales patrocinados
+home-prefs-shortcuts-header =
+    .label = Atajos
+home-prefs-shortcuts-description = Sitios que guardas o visitas
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Atajos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -496,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Contenido excepcional de toda la web, seleccionado por { $provider }
+home-prefs-recommended-by-description-new = Contenido excepcional seleccionado por { $provider }, parte de la familia { -brand-product-name }
 
 ##
 
@@ -513,6 +530,9 @@
     .label = Descargado recientemente
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas guardadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Actividad reciente
+home-prefs-recent-activity-description = Una selección de sitios y contenidos recientes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -520,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Fragmentos
 home-prefs-snippets-description = Actualizaciones de { -vendor-short-name } y { -brand-product-name }
+home-prefs-snippets-description-new = Consejos y noticias de { -vendor-short-name } y { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -560,6 +581,7 @@
 suggestions-addressbar-settings-generic = Cambia las preferencias para otras sugerencias de la barra de direcciones
 search-suggestions-cant-show = Las sugerencias de búsqueda no se mostrarán en los resultados de la barra de direcciones porque has configurado { -brand-short-name } para que nunca recuerde el historial.
 search-one-click-header = Buscadores con un clic
+search-one-click-header2 = Atajos de búsqueda
 search-one-click-desc = Elegir los motores de búsqueda alternativos que aparecen debajo de la barra de direcciones y en la barra de búsqueda cuando comienzas a escribir una palabra.
 search-choose-engine-column =
     .label = Motor de búsqueda
@@ -872,6 +894,10 @@
     .label = Rastreadores multisitio
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Rastreadores multisitio y de red social
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Cookies de rastreo entre sitios — incluye las cookies de redes sociales
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Cookies entre sitios — incluye las cookies de redes sociales
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Rastreadores de sitios cruzados y redes sociales, y aislación del resto de las cookies
 sitedata-option-block-unvisited =
@@ -906,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Abrir pestañas
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Accesos directos
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Sitios frecuentes
     .accesskey = t
+addressbar-locbar-engines-option =
+    .label = Motores de búsqueda
+    .accesskey = a
 addressbar-suggestions-settings = Cambiar las preferencias para las sugerencias del motor de navegación
 
 ## Privacy Section - Content Blocking
@@ -916,6 +949,7 @@
 content-blocking-enhanced-tracking-protection = Protección antirrastreo mejorada
 content-blocking-section-top-level-description = Los rastreadores le siguen en línea para recopilar información sobre sus hábitos e intereses de navegación. { -brand-short-name } bloquea muchos de estos rastreadores y otros scripts maliciosos.
 content-blocking-learn-more = Saber más
+content-blocking-fpi-incompatibility-warning = Está usando First Party Isolation (FPI), que anula algunas de las configuraciones de cookies de { -brand-short-name }.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
@@ -937,6 +971,7 @@
 content-blocking-etp-strict-desc = Protección más elevada, pero puede causar que algunos sitios o contenidos fallen.
 content-blocking-etp-custom-desc = Elige cuáles rastreadores y scripts quieres bloquear.
 content-blocking-private-windows = Contenido de rastreo en ventanas privadas
+content-blocking-cross-site-cookies = Cookies entre sitios
 content-blocking-cross-site-tracking-cookies = Cookies de rastreo multisitio
 content-blocking-cross-site-tracking-cookies-plus-isolate = Cookies de rastreo de sitios cruzados, y aislación del resto de las cookies
 content-blocking-social-media-trackers = Rastreadores de red social
@@ -948,6 +983,7 @@
 content-blocking-fingerprinters = Huellas dactilares
 content-blocking-warning-title = ¡Atención!
 content-blocking-and-isolating-etp-warning-description = Bloquear los rastreadores y aislar las cookies puede impactar en la funcionalidad de algunos sitios. Recarga una página con rastreadores para cargar todo el contenido.
+content-blocking-and-isolating-etp-warning-description-2 = Este ajuste puede hacer que algunos sitios web no muestren contenido o que no funcionen correctamente. Si un sitio parece roto, puede que desees desactivar la protección contra seguimiento para que ese sitio cargue todo el contenido.
 content-blocking-warning-learn-how = Aprende cómo
 content-blocking-reload-description = Tendrás que volver a cargar tus pestañas para aplicar estos cambios.
 content-blocking-reload-tabs-button =
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -19,6 +19,8 @@
 safeb-blocked-malware-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado como contenedor de software malicioso</a>. Puedes <a data-l10n-name='report_detection'>reportar esta dirección web</a> o <a data-l10n-name='ignore_warning_link'>ignorar el riesgo</a> e ir al sitio inseguro.
 safeb-blocked-malware-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado como contenedor de software malicioso</a>. Puedes <a data-l10n-name='report_detection'>reportar este sitio web</a>.
 safeb-blocked-malware-page-learn-more = Conoce más sobre contenido web peligroso, incluyendo diversos virus y malware y cómo puedes proteger tu computadora en <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Conoce más acerca de la protección contra phishing y malware que ofrece { -brand-short-name } en <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado como contenedor de software malicioso</a>. Puedes <a data-l10n-name='ignore_warning_link'>ignorar el riesgo</a> e ir a este sitio inseguro.
+safeb-blocked-malware-page-error-desc-no-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado por contener software malicioso</a>.
 safeb-blocked-malware-page-learn-more-sumo = Aprende más sobre la protección de phishing y malware de { -brand-short-name } en <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado como contenedor de software peligroso</a>. Puedes <a data-l10n-name='ignore_warning_link'>ignorar el riesgo</a> e ir al sitio inseguro.
 safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> ha sido <a data-l10n-name='error_desc_link'>reportado como contenedor de software peligroso</a>.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -24,21 +24,18 @@
            *[other] Deshacer cerrar pestañas
         }
     .accesskey = U
-
 toolbar-context-menu-manage-extension =
     .label = Gestionar extensión
     .accesskey = E
 toolbar-context-menu-remove-extension =
     .label = Eliminar extensión
     .accesskey = v
-
 # This label is used in the extensions toolbar buttons context menus,
 # a user can use this command to submit to Mozilla an abuse report
 # related to that extension. "Report" is a verb.
 toolbar-context-menu-report-extension =
     .label = Denunciar extensión
     .accesskey = o
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -54,3 +51,24 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = Personalizar…
     .accesskey = P
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = Siempre
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show =
+    .label = Nunca
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab =
+    .label = Solo en una pestaña nueva
+    .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Mostrar siempre
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar solo en nueva pestaña
+    .accesskey = O
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Mostrar otros marcadores
+    .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/es-MX/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/es-MX/browser/browser/webrtcIndicator.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/browser/webrtcIndicator.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -29,3 +29,12 @@
     .title = Encender la cámara
 webrtc-minimize =
     .title = Minimizar indicador
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = Estás compartiendo tu cámara. Haz clic para controlar lo compartido.
+webrtc-microphone-system-menu =
+    .label = Estás compartiendo tu micrófono. Haz clic para controlar lo compartido.
+webrtc-screen-system-menu =
+    .label = Estás compartiendo tu ventana o pantalla. Haz clic para controlar lo compartido.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/browser.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/browser.properties	2021-01-18 20:03:35.000000000 +0000
@@ -287,6 +287,9 @@
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 geolocationLastAccessIndicatorText=Último acceso %S
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+openProtocolHandlerPermissionEntryLabel=enlaces %S://
+
 crashedpluginsMessage.title=El plugin %S dejó de funcionar.
 crashedpluginsMessage.reloadButton.label=Recargar la página
 crashedpluginsMessage.reloadButton.accesskey=R
@@ -767,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=W
 getUserMedia.pickWindowOrScreen.label = Seleccionar ventana o pantalla
 getUserMedia.shareEntireScreen.label = Pantalla completa
+getUserMedia.sharePipeWirePortal.label = Usar los ajustes del sistema operativo
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:03:35.000000000 +0000
@@ -32,7 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Este archivo contiene un virus o un malware.
 blockedPotentiallyUnwanted=Este archivo puede dañar tu computadora.
-blockedInsecure = Este archivo no se pudo descargar de forma segura.
+blockedPotentiallyInsecure=Archivo no descargado: Riesgo potencial de seguridad.
 blockedUncommon2=Este archivo no se suele descargar.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -42,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
@@ -52,6 +52,7 @@
 unblockTypeMalware=Este archivo contiene un virus u otro malware que podría dañar tu computadora.
 unblockTypePotentiallyUnwanted2=Este archivo está disfrazado como una descarga útil pero puede provocar cambios inesperados a tus programas y configuraciones.
 unblockTypeUncommon2=Este archivo no es usualmente descargado y puede que no sea seguro abrirlo. Puede contener un virus o hacer cambios inesperados a tus programas y configuraciones.
+unblockInsecure=El archivo utiliza una conexión insegura. Puede dañarse o ser manipulado durante el proceso de descarga.
 unblockTip2=Puedes buscar una fuente alternativa de descarga o volver a intentarlo más tarde.
 unblockButtonOpen=Abrir
 unblockButtonUnblock=Permitir descarga
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/es-MX/browser/chrome/browser/sitePermissions.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:03:35.000000000 +0000
@@ -47,4 +47,6 @@
 permission.canvas.label = Extraer información de lienzo
 permission.midi.label = Acceder a dispositivos MIDI
 permission.midi-sysex.label = Acceder a dispositivos MIDI con compatibilidad para SysEx
-permission.https-only-load-insecure.label = Usar HTTP inseguro
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = Abrir aplicaciones
diff -Nru firefox-84.0.2+build1/l10n/es-MX/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/es-MX/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/es-MX/browser/defaultagent/defaultagent_localized.ini	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:03:35.000000000 +0000
@@ -5,3 +5,8 @@
 # This file is in the UTF-8 encoding
 [Strings]
 DefaultBrowserAgentTaskDescription=La tarea del agente del navegador predeterminado verifica cuando el valor predeterminado cambia de %MOZ_APP_DISPLAYNAME% a otro navegador. Si el cambio ocurre en circunstancias sospechosas, pedirá al usuario que vuelva a cambiar a %MOZ_APP_DISPLAYNAME% no más de dos veces. %MOZ_APP_DISPLAYNAME% instala esta tarea automáticamente y se reinstala cuando se actualiza %MOZ_APP_DISPLAYNAME%. Para deshabilitar esta tarea, actualiza la preferencia “default-browser-agent.enabled� en la página about:config o el ajuste %MOZ_APP_DISPLAYNAME% de la política empresarial "DisableDefaultBrowserAgent".
+
+DefaultBrowserNotificationTitle=Haz de %MOZ_APP_DISPLAYNAME% tu navegador predeterminado
+DefaultBrowserNotificationText=%MOZ_APP_DISPLAYNAME% ya no es tu navegador predeterminado. ¿Quieres establecerlo como predeterminado?
+DefaultBrowserNotificationYesButtonText=Sí
+DefaultBrowserNotificationNoButtonText=No
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/accessibility.properties firefox-85.0+build1/l10n/es-MX/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/accessibility.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/accessibility.properties	2021-01-18 20:03:35.000000000 +0000
@@ -298,3 +298,13 @@
 # LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
 # in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
 accessibility.simulation.achromatopsia=Acromatopsia (sin color)
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.label): A title text for a checkbox label
+# in the accessibility panel toolbar that turns on/off the overlay of focusable elements in their
+# tabbing order.
+accessibility.toolbar.displayTabbingOrder.label=Mostrar orden de tabulación
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
+# tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
+# their tabbing order.
+accessibility.toolbar.displayTabbingOrder.tooltip=Mostrar el orden de tabulación de los elementos y su índice de tabulación.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/markers.properties firefox-85.0+build1/l10n/es-MX/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/markers.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/markers.properties	2021-01-18 20:03:35.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Memoria baja
 marker.gcreason.label.CC_WAITING=Forzado por una colección de ciclo
+marker.gcreason.label.CC_FINISHED=Ciclo de recolección finalizado
 marker.gcreason.label.CC_FORCED=Forzado por una colección de ciclo
 marker.gcreason.label.LOAD_END=Carga de la página finalizada
 marker.gcreason.label.PAGE_HIDE=Movido al fondo
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Colección de guardería
-
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/es-MX/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/netmonitor.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/netmonitor.properties	2021-01-18 20:03:35.000000000 +0000
@@ -1528,3 +1528,12 @@
 # LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
 # when the HAR copy menu item is hovered
 netmonitor.settings.copyHarTooltip=Copiar datos de red al portapapeles
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+netmonitor.errorpanel.description=El panel de red ha fallado.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+netmonitor.errorpanel.fileBugButton=Informar de un error
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
+netmonitor.errorpanel.reloadPanelInfo=Cierra y vuelve a abrir la caja de herramientas para eliminar este error.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/toolbox.properties firefox-85.0+build1/l10n/es-MX/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/toolbox.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/toolbox.properties	2021-01-18 20:03:35.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Cerrar las herramientas del desarrollador
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Mostrar la consola dividida
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/es-MX/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/tooltips.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/tooltips.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -27,6 +27,9 @@
 inactive-css-property-is-impossible-to-override-in-visited = No es posible anular <strong>{ $property }</strong> debido a la restricción <strong>:visited</strong>.
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> no tiene efecto en este elemento ya que no es un elemento posicionado.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> no tiene ningún efecto en este elemento ya que <strong>overflow:hidden</strong> no está establecido.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> no tiene ningún efecto en este elemento porque su <strong>outline-style</strong> es <strong>auto</strong> o <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> no tiene efecto en elementos internos de la tabla.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> no tiene efecto en elementos internos de la tabla excepto en celdas de la tabla.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -45,6 +48,9 @@
 inactive-css-not-display-block-on-floated-fix = Intenta eliminar <strong>float</strong> o agrega <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Intenta establecer la propiedad <strong>position</strong> en algo diferente a <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Intenta agregar <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Prueba configurar su propiedad <strong>mostrar</strong> a algo distinto de <strong>table-cell</strong>, <strong>tabla-celda</strong>, <strong>tabla-columna</strong>, <strong>tabla-fila>, <strong>table-grupo-tabla-pie de página</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Prueba establecer su propiedad <strong>mostrar</strong> a algo diferente de<strong>tabla-columna</strong>, <strong>table-fila</strong>, <strong>table-de gupo de-columnas</strong>, <strong>tabla-de grupo de-filas</strong> o <strong>tabla de grupo de pies de página</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Prueba a cambiar la propiedad <strong>outline-style</strong> a algo diferente a <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/es-MX/devtools/client/webconsole.properties firefox-85.0+build1/l10n/es-MX/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/es-MX/devtools/client/webconsole.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/devtools/client/webconsole.properties	2021-01-18 20:03:35.000000000 +0000
@@ -7,27 +7,6 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
-# LOCALIZATION NOTE (browserConsole.title): shown as the
-# title when opening the browser console popup
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
 
 # LOCALIZATION NOTE (browserConsole.title): shown as the
 # title when opening the browser console popup
@@ -500,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Ejecutar la expresión (%S). Esto no borrará la entrada.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Expresión de impresión bonita
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/es-MX/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/es-MX/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/es-MX/dom/chrome/dom/dom.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/dom/chrome/dom/dom.properties	2021-01-18 20:03:35.000000000 +0000
@@ -397,6 +397,10 @@
 MathML_DeprecatedXLinkAttributeWarning=Los atributos XLink “href�, “type�, “show� y “actuate� están en desuso en los elementos MathML y se van a eliminar en alguna futura versión.
 # LOCALIZATION NOTE: Do not translate MathML and STIXGeneral. %S is a documentation URL.
 MathML_DeprecatedStixgeneralOperatorStretchingWarning=El soporte para renderizar operadores MathML estirados con fuentes STIXGeneral está en desuso y puede eliminarse en una fecha futura. Para obtener detalles sobre las fuentes más nuevas que seguirán siendo compatibles, mira %S
+# LOCALIZATION NOTE: Do not translate MathML and scriptminsize.
+MathML_DeprecatedScriptminsizeAttributeWarning=El atributo MathML “scriptminsize� está obsoleto y será eliminado en el futuro.
+# LOCALIZATION NOTE: Do not translate MathML and scriptsizemultiplier.
+MathML_DeprecatedScriptsizemultiplierAttributeWarning=El atributo MathML “scriptsizemultiplier� está obsoleto y será eliminado en el futuro.
 WebShareAPI_Failed=La operación de compartir ha fallado.
 WebShareAPI_Aborted=La operación de compartir fue abortada.
 # LOCALIZATION NOTE (UnknownProtocolNavigationPrevented): %1$S is the destination URL.
@@ -413,3 +417,14 @@
 RequestStorageAccessNested=document.requestStorageAccess() no se puede invocar en un iframe anidado.
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess(). In some locales it may be preferable to not translate "event handler", either.
 RequestStorageAccessUserGesture=document.requestStorageAccess() solo se puede solicitar desde un controlador de eventos generado por el usuario de ejecución breve.
+# LOCALIZATION NOTE: Do not translate "Location" and "History".
+LocChangeFloodingPrevented=Demasiadas llamadas a las API de ubicación o historial en un período breve.
+FolderUploadPrompt.title = Confirmar envío
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = ¿Estás seguro de que deseas enviar todos los archivos de “%S�? Haz esto solo si confía en la página web.
+FolderUploadPrompt.acceptButtonLabel = Subir
+InputPickerBlockedNoUserActivation=Se bloqueó selector de <input> debido a la falta de activación del usuario.
+ExternalProtocolFrameBlockedNoUserActivation=Se ha bloqueado el iframe con protocolo externo por no haber sido activado por el usuario o porque no ha pasado suficiente tiempo desde que se cargó el último iframe de este tipo.
+MultiplePopupsBlockedNoUserActivation=Se ha bloqueado la apertura de múltiples ventanas emergentes por no haber sido activado por el usuario.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Se ignoró la precarga de %S debido a valores desconocidos de “como� o “tipo�, o al atributo “media� que no coincide.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/dom/chrome/security/security.properties firefox-85.0+build1/l10n/es-MX/dom/chrome/security/security.properties
--- firefox-84.0.2+build1/l10n/es-MX/dom/chrome/security/security.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/dom/chrome/security/security.properties	2021-01-18 20:03:35.000000000 +0000
@@ -101,6 +101,10 @@
 # LOCALIZATION NOTE (BrowserUpgradeInsecureDisplayRequest):
 # %1$S is the browser name "brandShortName"; %2$S is the URL of the upgraded request; %1$S is the upgraded scheme.
 BrowserUpgradeInsecureDisplayRequest = %1$S‘ está actualizando una solicitud insegura de visualización ‘%2$S’ usando ‘%3$S’
+
+# LOCALIZATION NOTE (MixedContentAutoUpgrade):
+# %1$S is the URL of the upgraded request; %2$S is the upgraded scheme.
+MixedContentAutoUpgrade=Actualizando solicitud de visualización insegura ‘%1$S’ para usar ‘%2$S’
 # LOCALIZATION NOTE (RunningClearSiteDataValue):
 # %S is the URI of the resource whose data was cleaned up
 RunningClearSiteDataValue=El encabezado Clear-Site-Data forzó la limpieza de datos “%S�.
@@ -142,3 +146,9 @@
 
 # LOCALIZATION NOTE: %S is the URL of the blocked request;
 IframeSandboxBlockedDownload = La descarga de “%S� fue bloqueada porque el iframe desencadenante tiene la bandera de caja de arena establecida.
+
+# Sanitizer API
+# LOCALIZATION NOTE: Please do not localize "DocumentFragment". It's the name of an API.
+SanitizerRcvdNoInput = No se ha recibido entrada o estaba vacía. Devolviendo un DocumentFragment vacío.
+# LOCALIZATION NOTE: "Sanitizer" is the name of the API. Please do not localize.
+SanitizerOptionsDiscarded = Las opciones para el constructor Sanitizer aún no son compatibles. Ten en cuenta que este es un comportamiento experimental.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/es-MX/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/es-MX/security/manager/security/certificates/certManager.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/security/manager/security/certificates/certManager.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -18,6 +18,7 @@
 certmgr-remembered = Estos certificados se utilizan para identificarlo en los sitios web
 certmgr-people = Tienes certificados en el archivo que identifican a estas personas
 certmgr-servers = Tienes certificados en el archivo que identifican estos servidores
+certmgr-server = Estas entradas identifican las excepciones de error del certificado del servidor
 certmgr-ca = Tienes certificados en el archivo que identifican a las siguientes autoridades de certificación
 certmgr-detail-general-tab-title =
     .label = General
@@ -161,6 +162,10 @@
     .title = Eliminar excepciones de certificados de servidor
 delete-ssl-cert-confirm = ¿Realmente quieres eliminar estas excepciones de servidor?
 delete-ssl-cert-impact = Si elimina una excepción de servidor, restaurará los controles de seguridad habituales para ese servidor y se requerirá que use un certificado válido.
+delete-ssl-override-title =
+    .title = Eliminar la excepción del certificado del servidor
+delete-ssl-override-confirm = ¿Seguro que quieres eliminar esta excepción de servidor?
+delete-ssl-override-impact = Si eliminas una excepción de servidor, restaurará los controles de seguridad habituales para ese servidor y se requerirá que use un certificado válido.
 delete-ca-cert-title =
     .title = Eliminar o desconfiar de los certificados de CA
 delete-ca-cert-confirm = Has solicitado eliminar estos certificados de CA. En el caso de los incluidos de serie, en lugar de borrarlos se les retira la confianza, lo que tiene el mismo efecto. ¿Estás seguro de que quieres hacer esto?
@@ -210,6 +215,13 @@
 cert-not-verified-unknown = No se pudo verificar este certificado por razones desconocidas.
 # Used to indicate that the user chose not to send a client authentication certificate to a server that requested one in a TLS handshake.
 send-no-client-certificate = No se envió certificado de cliente
+# Used when no cert is stored for an override
+no-cert-stored-for-override = (No guardado)
+
+## Used to show whether an override is temporary or permanent
+
+permanent-override = Permanente
+temporary-override = Temporal
 
 ## Add Security Exception dialog
 
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/es-MX/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:03:35.000000000 +0000
@@ -172,4 +172,19 @@
 configuration_element_not_provided = No provisto
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = Preferencias de WebRTC establecidas por el usuario
+# Section header for estimated bandwidths of WebRTC media flows
+bandwidth_stats_heading = Ancho de banda estimado
+# The ID of the MediaStreamTrack
+track_identifier = Identificador de rastreo
+# The estimated bandwidth available for sending WebRTC media in bytes per second
+send_bandwidth_bytes_sec = Ancho de banda de envío (bytes/seg)
+# The estimated bandwidth available for receiving WebRTC media in bytes per second
+receive_bandwidth_bytes_sec = Ancho de banda de recepción (bytes/seg)
+# Maximum number of bytes per second that will be padding zeros at the ends of packets
+max_padding_bytes_sec = Padding máximo (bytes/seg)
+# The amount of time inserted between packets to keep them spaced out
+pacer_delay_ms = Intervalo entre paquetes (ms)
+# The amount of time it takes for a packet to travel from the local machine to the remote machine,
+# and then have a packet return
+round_trip_time_ms = Tiempo de ida y vuelta (RTT) (ms)
 
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/es-MX/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:35.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Error en la descarga
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=La descarga no se puede guardar porque está bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=La descarga no se puede guardar porque está bloqueada por una extensión.
 downloadErrorGeneric=La descarga no puede guardarse porque ha sucedido un error desconocido.\n\nVuelva a intentarlo.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Quedan pocos segundos
 timeUnknown2=Tiempo restante desconocido
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S recurso
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/es-MX/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:35.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=La conexión al Servidor Proxy fue rechazada
 check_error-2153390069=Expiró el Certificado del Servidor (de ser necesario, ajuste correctamente la fecha y hora del Sistema)
 check_error-verification_failed=No se pudo verificar la integridad de la actualización
+check_error-move_failed=Error al preparar la actualización para la instalación
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -374,16 +374,30 @@
 addon-detail-private-browsing-help = Cuando está activada, la extensión tendrá acceso a todo lo que haces mientras navegas de forma privada. <a data-l10n-name="learn-more">Saber más</a>
 addon-detail-private-browsing-allow = Permitir
 addon-detail-private-browsing-disallow = No permitir
-# 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.
+
+## This is the tooltip text for the recommended badges 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 } solo recomienda extensiones que cumplan con nuestros estándares de seguridad y rendimiento
     .aria-label = { addon-badge-recommended2.title }
+addon-badge-line2 =
+    .title = Esta es extensión oficial desarrollada por los creadores de { -brand-product-name }
+    .aria-label = { addon-badge-line2.title }
+addon-badge-verified2 =
+    .title = Esta extensión ha sido revisada para cumplir con nuestros estándares de seguridad y rendimiento.
+    .aria-label = { addon-badge-verified2.title }
+
+##
+
 available-updates-heading = Actualizaciones disponibles
 recent-updates-heading = Actualizaciones recientes
 release-notes-loading = Cargando…
 release-notes-error = Lo sentimos, pero ha sucedido un error al cargar las notas de versión.
 addon-permissions-empty = Esta extensión no requiere ningún permiso
+addon-permissions-required = Permisos necesarios para la funcionalidad principal:
+addon-permissions-optional = Permisos opcionales para funciones adicionales:
+addon-permissions-learnmore = Conocer más sobre permisos
 recommended-extensions-heading = Complementos recomendados
 recommended-themes-heading = Temas recomendados
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -9,13 +9,15 @@
 about-httpsonly-insecure-explanation-reasons = Lo más probable es que el sitio web no sea compatible con HTTPS, pero también es posible que un atacante esté bloqueando la versión HTTPS.
 about-httpsonly-insecure-explanation-exception = Si bien el riesgo de seguridad es bajo, si decides visitar la versión HTTP del sitio web, no debes ingresar ninguna información confidencial como contraseñas, correos electrónicos o detalles de tarjetas de crédito.
 about-httpsonly-button-make-exception = Aceptar el riesgo y continuar al sitio
-about-httpsonly-title = { -brand-short-name } detectó un potencial problema de seguridad
+about-httpsonly-title-alert = Alerta de modo solo HTTPS
+about-httpsonly-title-connection-not-available = Conexión segura no disponible
 # Variables:
 #   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
-about-httpsonly-explanation-unavailable = Estás navegando en el modo solo HTTPS, y una versión HTTPS segura de <em>{ $websiteUrl }</em> no está disponible.
+about-httpsonly-explanation-unavailable2 = Has habilitado el modo solo HTTPS para mejorar la seguridad pero no está disponible una versión HTTPS de <em>{ $websiteUrl }</em>.
 about-httpsonly-explanation-question = ¿Qué podría estar causando esto?
 about-httpsonly-explanation-nosupport = Lo más probable es que el sitio web simplemente no sea compatible con HTTPS.
 about-httpsonly-explanation-risk = También es posible que un atacante esté involucrado. Si decides visitar el sitio web, no debes ingresar información confidencial como contraseñas, correos o detalles de tarjetas de crédito.
-about-httpsonly-button-accept-and-continue = Aceptar el riesgo y continuar
+about-httpsonly-explanation-continue = Si continúas, el modo solo HTTPS se desactivará temporalmente para este sitio.
+about-httpsonly-button-continue-to-site = Continuar al sitio HTTP
 about-httpsonly-button-go-back = Regresar
 about-httpsonly-link-learn-more = Más información…
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutNetworking.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -7,6 +7,7 @@
 about-networking-sockets = Sockets
 about-networking-dns = DNS
 about-networking-dns-clear-cache-button = Limpiar caché de DNS
+about-networking-dns-trr-url = URL de DoH
 about-networking-dns-suffix = Sufijo DNS
 about-networking-websockets = WebSockets
 about-networking-refresh = Refrescar
@@ -42,6 +43,7 @@
 about-networking-dns-lookup-button = Resolver
 about-networking-dns-domain = Dominio:
 about-networking-dns-lookup-table-column = IPs
+about-networking-dns-https-rr-lookup-table-column = HTTP RRs
 about-networking-rcwn = Estadísticas RCWN
 about-networking-rcwn-status = Estatus RCWN
 about-networking-rcwn-cache-won-count = Cuenta de caché ganado
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -0,0 +1,133 @@
+# 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/.
+
+# Page title
+about-processes-title = Administrador de procesos
+# The Actions column
+about-processes-column-action =
+    .title = Acciones
+
+## Tooltips
+
+about-processes-shutdown-process =
+    .title = Descargar pestañas y matar el proceso
+about-processes-shutdown-tab =
+    .title = Cerrar pestaña
+
+## Column headers
+
+about-processes-column-name = Nombre
+about-processes-column-memory-resident = Memoria
+about-processes-column-cpu-total = CPU
+
+## Process names
+## Variables:
+##    $pid (String) The process id of this process, assigned by the OS.
+##    $origin (String) The domain name for this process.
+##    $type (String) The raw type for this process. Used for unknown processes.
+
+about-processes-browser-process-name = { -brand-short-name } (proceso { $pid })
+about-processes-web-process-name = Web (proceso { $pid }, compartido)
+about-processes-web-isolated-process-name = Web (proceso { $pid }) para { $origin }
+about-processes-web-large-allocation = Web (proceso { $pid }, grande) para { $origin }
+about-processes-with-coop-coep-process-name = Web (proceso { $pid }, origen cruzado aislado) para { $origin }
+about-processes-file-process-name = Archivos (proceso { $pid })
+about-processes-extension-process-name = Extensiones (proceso { $pid })
+about-processes-privilegedabout-process-name = Acerca de (proceso { $pid } )
+about-processes-plugin-process-name = Plugins (proceso { $pid })
+about-processes-privilegedmozilla-process-name = Web (proceso { $pid }) para sitios { -vendor-short-name }
+about-processes-gmp-plugin-process-name = Plugins de medios de Gecko (proceso { $pid })
+about-processes-gpu-process-name = GPU (proceso { $pid })
+about-processes-vr-process-name = Realidad Virtual (proceso { $pid })
+about-processes-rdd-process-name = Decodificador de datos (proceso { $pid })
+about-processes-socket-process-name = Red (proceso { $pid })
+about-processes-remote-sandbox-broker-process-name = Remote Sandbox Broker (proceso { $pid })
+about-processes-fork-server-process-name = Fork Server (proceso { $pid })
+about-processes-preallocated-process-name = Preasignado (proceso { $pid })
+about-processes-unknown-process-name = Otro ({ $type }, proceso { $pid })
+# Process
+# Variables:
+#   $name (String) The name assigned to the process.
+#   $pid (String) The process id of this process, assigned by the OS.
+about-processes-process-name = Proceso{ $pid }: { $name }
+
+## Details within processes
+
+# Single-line summary of threads
+# Variables:
+#    $number (Number) The number of threads in the process. Typically larger
+#                     than 30. We don't expect to ever have processes with less
+#                     than 5 threads.
+about-processes-thread-summary = Hilos ({ $number })
+# Thread details
+# Variables:
+#   $name (String) The name assigned to the thread.
+#   $tid (String) The thread id of this thread, assigned by the OS.
+about-processes-thread-name = Hilo { $tid }: { $name }
+# Tab
+# Variables:
+#   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
+about-processes-tab-name = Pestaña: { $name }
+about-processes-preloaded-tab = Pestaña nueva precargada
+# Single subframe
+# Variables:
+#   $url (String) The full url of this subframe.
+about-processes-frame-name-one = Submarco: { $url }
+# Group of subframes
+# Variables:
+#   $number (Number) The number of subframes in this group. Always ≥ 1.
+#   $shortUrl (String) The shared prefix for the subframes in the group.
+about-processes-frame-name-many = Submarcos ({ $number }): { $shortUrl }
+
+## Displaying CPU (percentage and total)
+## Variables:
+##    $percent (Number) The percentage of CPU used by the process or thread.
+##                      Always > 0, generally <= 200.
+##    $total (Number) The amount of time used by the process or thread since
+##                    its start.
+##    $unit (String) The unit in which to display $total. See the definitions
+##                   of `duration-unit-*`.
+
+# Common case.
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
+# Special case: data is not available yet.
+about-processes-cpu-user-and-kernel-not-ready = (medición)
+# Special case: process or thread is currently idle.
+about-processes-cpu-user-and-kernel-idle = inactivo ({ NUMBER($total, maximumFractionDigits: 2) }{ $unit })
+
+## Displaying Memory (total and delta)
+## Variables:
+##    $total (Number) The amount of memory currently used by the process.
+##    $totalUnit (String) The unit in which to display $total. See the definitions
+##                        of `memory-unit-*`.
+##    $delta (Number) The absolute value of the amount of memory added recently.
+##    $deltaSign (String) Either "+" if the amount of memory has increased
+##                        or "-" if it has decreased.
+##    $deltaUnit (String) The unit in which to display $delta. See the definitions
+##                        of `memory-unit-*`.
+
+# Common case.
+about-processes-total-memory-size = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit } ({ $deltaSign }{ NUMBER($delta, maximumFractionDigits: 0) }{ $deltaUnit })
+# Special case: no change.
+about-processes-total-memory-size-no-change = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit }
+
+## Duration units
+
+duration-unit-ns = ns
+duration-unit-us = µs
+duration-unit-ms = ms
+duration-unit-s = S
+duration-unit-m = m
+duration-unit-h = h
+duration-unit-d = d
+
+## Memory units
+
+memory-unit-B = B
+memory-unit-KB = KB
+memory-unit-MB = MB
+memory-unit-GB = GB
+memory-unit-TB = TB
+memory-unit-PB = PB
+memory-unit-EB = EB
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -59,12 +59,16 @@
 app-basics-build-config = Configuración de compilación
 app-basics-user-agent = Agente de usuario
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Traducido por Rosetta
 app-basics-memory-use = Uso de memoria
 app-basics-performance = Rendimiento
 app-basics-service-workers = Service Workers registrados
 app-basics-profiles = Perfiles
 app-basics-launcher-process-status = Proceso de lanzamiento
 app-basics-multi-process-support = Ventanas multiproceso
+app-basics-fission-support = Ventanas de Fission
 app-basics-remote-processes-count = Procesos remotos
 app-basics-enterprise-policies = Políticas empresariales
 app-basics-location-service-key-google = Clave de servicio de ubicación de Google
@@ -181,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceros
+support-third-party-modules-module = Archivo de módulo
+support-third-party-modules-version = Versión del archivo
+support-third-party-modules-vendor = Información del fabricante
+support-third-party-modules-occurrence = Ocurrencias
+support-third-party-modules-process = Tipo de proceso e ID
+support-third-party-modules-thread = Hilo
+support-third-party-modules-base = Dirección de imagebase
+support-third-party-modules-uptime = Tiempo de actividad del proceso (ms)
+support-third-party-modules-duration = Duración de la carga (ms)
+support-third-party-modules-empty = No se han cargado módulos de terceros.
+support-third-party-modules-no-value = (Sin valor)
+support-third-party-modules-button-open =
+    .title = Abrir ubicación del archivo...
+support-third-party-modules-expand =
+    .title = Mostrar información detallada
+support-third-party-modules-collapse =
+    .title = Contraer información detallada
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo no está firmado
+support-third-party-modules-folder-icon =
+    .title = Abrir ubicación del archivo…
+support-third-party-modules-down-icon =
+    .title = Mostrar información detallada
+support-third-party-modules-up-icon =
+    .title = Contraer información detallada
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -326,6 +356,20 @@
 multi-process-status-7 = Deshabilitado por los complementos
 multi-process-status-8 = Desactivado forzosamente
 multi-process-status-unknown = Estado desconocido
+# Variables
+# $fissionWindows (integer) - Number of remote windows
+# $totalWindows (integer) - Number of total windows
+fission-windows = { $fissionWindows }/{ $totalWindows }
+fission-status-experiment-control = Deshabilitado por el experimento
+fission-status-experiment-treatment = Habilitado por el experimento
+fission-status-disabled-by-e10s-env = Deshabilitado por el entorno
+fission-status-enabled-by-env = Habilitado por el entorno
+fission-status-disabled-by-safe-mode = Deshabilitado por el modo seguro
+fission-status-enabled-by-default = Habilitado de forma predeterminada
+fission-status-disabled-by-default = Deshabilitado de forma predeterminada
+fission-status-enabled-by-user-pref = Habilitado por el usuario
+fission-status-disabled-by-user-pref = Deshabilitado por el usuario
+fission-status-disabled-by-e10s-other = E10s deshabilitado
 async-pan-zoom = Encuadro/zoom asíncrono
 apz-none = ninguno
 wheel-enabled = entrada de rueda de ratón activada
@@ -346,3 +390,12 @@
 policies-inactive = Inactivo
 policies-active = Activo
 policies-error = Error
+
+## Printing section
+
+support-printing-title = Imprimir
+support-printing-troubleshoot = Solución de problemas
+support-printing-clear-settings-button = Eliminar los ajustes de impresión guardados
+support-printing-modified-settings = Ajustes de impresión modificados
+support-printing-prefs-name = Nombre
+support-printing-prefs-value = Valor
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/about/certviewer.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -81,8 +81,7 @@
 certificate-viewer-certificate-policies = Políticas de certificado
 certificate-viewer-embedded-scts = SCT integrados
 certificate-viewer-crl-endpoints = Extremos CRL
-
-# This message is used as a row header in the Miscellaneous section. 
+# This message is used as a row header in the Miscellaneous section.
 # The associated data cell contains links to download the certificate.
 certificate-viewer-download = Descargar
 # This message is used to replace boolean values (true/false) in several certificate fields, e.g. Certificate Authority
@@ -101,13 +100,17 @@
     .download = { $fileName }.pem
 certificate-viewer-download-pem-chain = PEM (cadena)
     .download = { $fileName }-chain.pem
-
 # The title attribute for Critical Extension icon
 certificate-viewer-critical-extension =
     .title = Esta extensión ha sido marcado como crítica, lo que significa que los clientes deben rechazar el certificado si no lo entienden.
 certificate-viewer-export = Exportar
     .download = { $fileName }.pem
 
+##
+
+# Label for a tab where we haven't found a better label:
+certificate-viewer-unknown-group-label = (desconocido)
+
 ## Labels for tabs displayed in stand-alone about:certificate page
 
 certificate-viewer-tab-mine = Tus certificados
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -47,11 +47,6 @@
 experimental-features-css-constructable-stylesheets =
     .label = CSS: Constructable Stylesheets
 experimental-features-css-constructable-stylesheets-description = La adición de un constructor a la interface <a data-l10n-name="mdn-cssstylesheet">CSSStyleSheet</a> así como una variedad de cambios relacionados hace posible crear directamente nuevas hojas de estilo sin tener que agregar la hoja al HTML. Esto hace más fácil crear hojas de estilo reutilizables para usar con <a data-l10n-name="mdn-shadowdom">Shadow DOM</a>. Ver <a data-l10n-name="bugzilla">bug 1520690</a> para más detalles.
-# The title of the experiment should be kept in English as it may be referenced
-# by various online articles and is technical in nature.
-experimental-features-media-session-api =
-    .label = Web API: Media Session API
-experimental-features-media-session-api-description = La implementación completa de { -brand-short-name } de Media Session API es actualmente experimental. Esta API se usa para personalizar el manejo de notificaciones relacionadas con los medios, para manejar eventos y datos útiles para presentar una interface de usuario para manejar reproducción de medios y para obtener metadatos de los archivos. Ver <a data-l10n-name="bugzilla">bug 1112032</a> para más detalles.
 experimental-features-devtools-color-scheme-simulation =
     .label = Herramientas para desarrolladores: simulación de esquemas de color
 experimental-features-devtools-color-scheme-simulation-description = Agrega una opción para simular diferentes esquemas de color que te permiten probar las consultas de medios <a data-l10n-name="mdn-preferscolorscheme">@prefers-color-scheme</a>. El uso de esta función permite que tu hoja de estilo responda si el usuario prefiere una interfaz de usuario clara u oscura. Esto te permite probar el código sin tener que cambiar la configuración del navegador (o sistema operativo, si el navegador sigue una configuración de esquema de color establecida para todo el sistema). Consulta el <a data-l10n-name="bugzilla1">bug 1550804</a> y el <a data-l10n-name="bugzilla2">bug 1137699</a> para obtener más detalles.
@@ -87,7 +82,22 @@
     .label = Herramientas de desarrollado: Depuración de Service Worker
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support-description = Habilita el soporte experimental para Service Workers en el panel del Depurador. Esta función puede ralentizar las Herramientas de desarrolladores y aumentar el consumo de memoria.
-# Desktop zooming experiment
-experimental-features-graphics-desktop-zooming =
-    .label = Graphics: Smooth Pinch Zoom
-experimental-features-graphics-desktop-zooming-description = Habilita el soporte para un hacer zoom con suavidad al pellizcar en las pantallas táctiles y los touch pads de precisión con suavidad.
+# WebRTC global mute toggle controls
+experimental-features-webrtc-global-mute-toggles =
+    .label = Alternar sonido WebRTC globalmente
+experimental-features-webrtc-global-mute-toggles-description = Agregar controles al indicador de intercambio global WebRTC que permita a los usuarios interrumpir globalmente la compartición de tu micrófono y cámara.
+# JS JIT Warp project
+experimental-features-js-warp =
+    .label = JavaScript JIT: Warp
+experimental-features-js-warp-description = Activar Warp, un proyecto para mejorar el rendimiento y el uso de la memoria de JavaScript.
+# Fission is the name of the feature and should not be translated.
+experimental-features-fission =
+    .label = Fission (aislamiento de sitios)
+experimental-features-fission-description = Fission (aislamiento de sitios) es una característica experimental en { -brand-short-name } para proporcionar una capa adicional de defensa contra los problemas de seguridad. Al aislar cada sitio en un proceso separado, Fission hace que sea más difícil para los sitios web maliciosos tener acceso a información de otras páginas que estás visitando. Éste es un cambio arquitectónico importante en { -brand-short-name } y te agradecemos probar e informar de cualquier problema que encuentres. Para obtener más detalles, consulta <a data-l10n-name="wiki">el wiki</a>.
+# Support for having multiple Picture-in-Picture windows open simultaneously
+experimental-features-multi-pip =
+    .label = Compatibilidad con múltiples Picture-in-Picture
+experimental-features-multi-pip-description = Función experimental para permitir que se abran varias ventanas Picture-in-Picture al mismo tiempo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Soporte experimental para el protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> quiere abrir un enlace <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
@@ -17,11 +9,49 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
+permission-dialog-description = ¿Permitir que este sitio abra el enlace { $scheme }?
+permission-dialog-description-file = ¿Permitir que este archivo abra el enlace { $scheme }?
+permission-dialog-description-host = ¿Permitir que { $host } abra el enlace { $scheme }?
+permission-dialog-description-app = ¿Permitir que este sitio abra el enlace { $scheme } con { $appName }?
+permission-dialog-description-host-app = ¿Permitir que { $host } abra el enlace { $scheme } con { $appName }?
+permission-dialog-description-file-app = ¿Permitir que este archivo abra el enlace { $scheme } con { $appName }?
+
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+permission-dialog-remember = Siempre permitir a <strong>{ $host }</strong> abrir enlaces <strong>{ $scheme }</strong>
+permission-dialog-remember-file = Siempre permitir que este archivo abra enlaces <strong>{ $scheme }</strong>
+
+##
+
+permission-dialog-btn-open-link =
+    .label = Abrir enlace
+    .accessKey = O
+permission-dialog-btn-choose-app =
+    .label = Elegir aplicación
+    .accessKey = A
+permission-dialog-unset-description = Tendrás que elegir una aplicación.
+permission-dialog-set-change-app-link = Elija una aplicación diferente.
 
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-window =
+    .title = Elegir aplicación
+    .style = min-width: 26em; min-height: 26em;
+chooser-dialog =
+    .buttonlabelaccept = Abrir enlace
+    .buttonaccesskeyaccept = O
+chooser-dialog-description = Elige una aplicación para abrir el enlace { $scheme }.
+# Please keep the emphasis around the scheme (ie the `<strong>` HTML tags).
+chooser-dialog-remember = Utilizar siempre esta aplicación para abrir enlaces <strong>{ $scheme }</strong>
+chooser-dialog-remember-extra =
+    { PLATFORM() ->
+        [windows] Esto se puede cambiar en las opciones de { -brand-short-name }.
+       *[other] Esto se puede cambiar en las preferencias de { -brand-short-name }.
+    }
 choose-other-app-description = Elegir otra aplicación
 choose-app-btn =
     .label = Elegir…
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -10,3 +10,5 @@
 videocontrols-buffer-bar-label = Cargando:
 videocontrols-volume-control =
     .aria-label = Volumen
+videocontrols-closed-caption-button =
+    .aria-label = Subtítulos
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/payments/payments.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/payments/payments.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/payments/payments.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/payments/payments.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -19,21 +19,29 @@
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
-credit-card-label-number = { $number }
+#   $type (String): Credit card type
+credit-card-label-number-2 = { $number }
+    .aria-label = { $type } { credit-card-label-number-2 }
 # Label for a credit card with a number and name
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name = { $number }, { $name }
+#   $type (String): Credit card type
+credit-card-label-number-name-2 = { $number }, { $name }
+    .aria-label = { $type } { credit-card-label-number-name-2 }
 # Label for a credit card with a number and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
-credit-card-label-number-expiration = { $number }, { credit-card-expiration }
+#   $type (String): Credit card type
+credit-card-label-number-expiration-2 = { $number }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-expiration-2 }
 # Label for a credit card with a number, name, and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name-expiration = { $number }, { $name }, { credit-card-expiration }
+#   $type (String): Credit card type
+credit-card-label-number-name-expiration-2 = { $number }, { $name }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-name-expiration-2 }
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primera página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Página siguiente
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/es-MX/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:34:45.000000000 +0000
+++ firefox-85.0+build1/l10n/es-MX/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:35.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = para
+printui-page-custom-range-input =
+    .aria-label = Ingresa un rango de páginas personalizado
+    .placeholder = Por ej. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientación
@@ -38,14 +41,17 @@
 printui-paper-size-label = Tamaño de papel
 # Section title (noun) for the print scaling options
 printui-scale = Escala
-printui-scale-fit-to-page = Ajustar a la página
 printui-scale-fit-to-page-width = Ajustar al ancho de página
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = Escala
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Impresión a doble cara
+printui-duplex-checkbox = Imprimir en ambos lados
 # Section title for miscellaneous print options
 printui-options = Opciones
 printui-headers-footers-checkbox = Imprimir encabezados y pies de página
 printui-backgrounds-checkbox = Imprimir fondos
+printui-selection-checkbox = Imprimir solo la selección
 printui-color-mode-label = Modo color
 printui-color-mode-color = Color
 printui-color-mode-bw = Blanco y negro
@@ -53,15 +59,30 @@
 printui-margins-default = Predeterminado
 printui-margins-min = Mínimo
 printui-margins-none = Ninguno
+printui-margins-custom = Personalizado
+printui-margins-custom-inches = Personalizado (pulgadas)
+printui-margins-custom-top = Superior
+printui-margins-custom-top-inches = Superior (pulgadas)
+printui-margins-custom-bottom = Inferior
+printui-margins-custom-bottom-inches = Inferior (pulgadas)
+printui-margins-custom-left = Izquierda
+printui-margins-custom-left-inches = Izquierda (pulgadas)
+printui-margins-custom-right = Derecha
+printui-margins-custom-right-inches = Derecha (pulgadas)
 printui-system-dialog-link = Imprimir usando el diálogo del sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Guardar
 printui-cancel-button = Cancelar
+printui-close-button = Cerrar
 printui-loading = Preparando vista previa
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Imprimir vista previa
+printui-pages-per-sheet = Páginas por hoja
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimiendo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
@@ -82,6 +103,7 @@
 ## Error messages shown when a user has an invalid input
 
 printui-error-invalid-scale = La escala debe ser un número entre 10 y 200.
+printui-error-invalid-margin = Por favor, introduce un margen válido para el tamaño de papel seleccionado.
 # Variables
 # $numPages (integer) - Number of pages
 printui-error-invalid-range = El rango debe ser un número entre 1 y { $numPages }.
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/et/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/aboutCertError.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/aboutCertError.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -5,80 +5,60 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } kasutab vigast turvasertifikaati.
-
 cert-error-mitm-intro = Saidid tõestavad oma identiteeti sertifitseerimiskeskuste poolt välja antud sertide abil.
-
 cert-error-mitm-mozilla = { -brand-short-name }i taga seisab mittetulundusühing Mozilla, mis administreerib täielikult avalikku sertifitseerimiskeskuste serdiladu. Sertifitseerimiskeskuste serdiladu aitab tagada seda, et sertifitseerimiskeskused järgivad kasutajate turvalisuse tagamisel parimaid praktikaid.
-
 cert-error-mitm-connection = { -brand-short-name } kasutab ühenduse turvalisuse kontrollimisel operatsioonisüsteemi serdilao asemel Mozilla sertifitseerimiskeskuste serdiladu. Seega, kui viirustõrjeprogramm või muud internetiühendust vahendavad seadmed sekkuvad ühendusse serdiga, mis pole välja antud Mozilla serdilaos oleva SK poolt, siis loetakse selline ühendus ebaturvaliseks.
-
 cert-error-trust-unknown-issuer-intro = Keegi võib üritada selle saidina välja paista ja sa ei peaks jätkama.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-trust-unknown-issuer = Saidid tõestavad oma identiteeti sertide abil. { -brand-short-name } ei usalda saiti { $hostname }, kuna selle serdi väljaandja on tundmatu, sert on allkirjastatud selle omaniku poolt või server ei edasta korrektseid vaheserte.
-
 cert-error-trust-cert-invalid = Sertifikaati ei usaldata, kuna selle välja andnud sertifitseerimiskeskuse sertifikaat on vigane.
-
 cert-error-trust-untrusted-issuer = Sertifikaati ei usaldata, kuna selle väljaandja sertifikaati ei usaldata.
-
 cert-error-trust-signature-algorithm-disabled = Sertifikaati ei usaldata, kuna see signeeriti signeerimisalgoritmiga, mis oli keelatud algoritmi ebaturvalisuse tõttu.
-
 cert-error-trust-expired-issuer = Sertifikaati ei usaldata, kuna selle väljaandja sertifikaat on aegunud.
-
 cert-error-trust-self-signed = Sertifikaati ei usaldata, kuna selle on signeerinud sertifikaadi omanik.
-
 cert-error-trust-symantec = Serte, mille väljaandjaks on GeoTrust, RapidSSL, Symantec, Thawte või VeriSign, ei peeta enam ohutuks, kuna need sertifitseerimiskeskused ei suutnud minevikus järgida vajalikke turvapraktikaid.
-
 cert-error-untrusted-default = Sertifikaat ei tule usaldatud allikast.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-domain-mismatch = Saidid tõestavad oma identiteeti sertide abil. { -brand-short-name } ei usalda seda saiti, kuna selle sert ei ole saidi { $hostname } jaoks korrektne.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single = Saidid tõestavad oma identiteeti sertide abil. { -brand-short-name } ei usalda seda saiti, kuna selle sert ei ole saidi { $hostname } jaoks korrektne. Sert on välja antud ainult domeenile <a data-l10n-name="domain-mismatch-link">{ $alt-name }</a>.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single-nolink = Saidid tõestavad oma identiteeti sertide abil. { -brand-short-name } ei usalda seda saiti, kuna selle sert ei ole saidi { $hostname } jaoks korrektne. Sert on välja antud ainult domeenile { $alt-name }.
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = Saidid tõestavad oma identiteeti sertide abil. { -brand-short-name } ei usalda seda saiti, kuna see kasutab serti, mis ei ole saidi { $hostname } jaoks korrektne. Sert on korrektne ainult järgmistele domeenidele: { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = Saidid tõestavad oma identiteeti kindlaks määratud aja jooksul kehtivate sertide abil. Saidi { $hostname } sert aegus { $not-after-local-time }.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = Saidid tõestavad oma identiteeti kindlaks määratud aja jooksul kehtivate sertide abil. Saidi { $hostname } serdi kehtivusaeg algab { $not-before-local-time }.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Veakood: <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = Saidid tõestavad oma identiteeti turvasertide abil, mille on välja andnud sertifitseerimiskeskused. Enamik brausereid ei usalda enam serte, mille on välja andnud GeoTrust, RapidSSL, Symantec, Thawte või VeriSign. Sait { $hostname } kasutab serti, mille on väljastanud üks eelnimetatud sertifitseerimiskeskustest ja seetõttu pole selle saidi identiteeti võimalik tõestada.
-
 cert-error-symantec-distrust-admin = Sa võid teavitada saidi administraatorit sellest probleemist.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP Strict Transport Security tehnoloogia: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = HTTP Public Key Pinning tehnoloogia: { $hasHPKP }
-
 cert-error-details-cert-chain-label = Sertifikaadiahel:
+open-in-new-window-for-csp-or-xfo-error = Ava sait uues aknas
+# Variables:
+# $hostname (String) - Hostname of the website blocked by csp or xfo error.
+csp-xfo-blocked-long-desc = Sinu turvalisuse tagamiseks ei luba sait { $hostname } { -brand-short-name }il seda lehte teise saidi sees kuvada. Selle lehe nägemiseks pead selle avama uues aknas.
 
 ## Messages used for certificate error titles
 
@@ -107,6 +87,7 @@
 redirectLoop-title = Veebileht pole korralikult ümber suunatud
 unknownSocketType-title = Ootamatu vastus serverilt
 nssFailure2-title = Turvalise ühenduse viga
+csp-xfo-error-title = { -brand-short-name }il pole võimalik seda lehte avada
 corruptedContentError-title = Vigane sisu
 remoteXUL-title = Remote XUL
 sslv3Used-title = Turvaline ühendumine pole võimalik
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/et/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/aboutLogins.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/aboutLogins.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -1,10 +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/.
-
-# 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/.
 # NOTE: New strings should use the about-logins- prefix.
 
 about-logins-page-title = Kasutajatunnused ja paroolid
@@ -17,12 +13,9 @@
     .alt = Hangi see Google Play poest
 login-app-promo-apple =
     .alt = Laadi alla App Store'ist
-
 login-filter =
     .placeholder = Otsi kasutajakontosid
-
 create-login-button = Loo uus kasutajakonto
-
 fxaccounts-sign-in-text = Tee paroolid kättesaadavaks ka oma teistes seadmetes
 fxaccounts-sign-in-button = Logi { -sync-brand-short-name }i sisse
 fxaccounts-avatar-button =
@@ -32,6 +25,11 @@
 
 menu =
     .title = Ava menüü
+# This menuitem is only visible on Windows and macOS
+about-logins-menu-menuitem-import-from-another-browser = Impordi teisest brauserist…
+about-logins-menu-menuitem-import-from-a-file = Impordi failist…
+about-logins-menu-menuitem-export-logins = Ekspordi kasutajatunnused...
+about-logins-menu-menuitem-remove-all-logins = Eemalda kõik kasutajatunnused…
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] Sätted
@@ -52,6 +50,8 @@
     }
 login-list-sort-label-text = Sortimine:
 login-list-name-option = nimi  (A-Y)
+login-list-name-reverse-option = nimi (Y-A)
+about-logins-login-list-alerts-option = Hoiatused
 login-list-last-changed-option = viimati muudetud
 login-list-last-used-option = viimati kasutatud
 login-list-intro-title = Kasutajakontosid ei leitud
@@ -63,20 +63,26 @@
 login-list-item-subtitle-missing-username = (kasutajanime pole)
 about-logins-list-item-breach-icon =
     .title = Kasutajatunnused lekitanud sait
+about-logins-list-item-vulnerable-password-icon =
+    .title = Nõrk parool
 
 ## Introduction screen
 
 login-intro-heading = Otsid oma salvestatud kasutajakontosid? Seadista { -sync-brand-short-name }.
-
+about-logins-login-intro-heading-logged-out = Otsid oma salvestatud kasutajakontosid? Seadista { -sync-brand-short-name } või impordi need.
+about-logins-login-intro-heading-logged-in = Sünkrooniseeritud kasutajakontosid ei leitud.
 login-intro-description = Kui salvestasid oma kasutajakontod teises seadmes olevasse { -brand-product-name }i, siis nii saad need ka siia:
 login-intro-instruction-fxa = Loo { -fxaccount-brand-name } või logi sisse seadmes, kus salvestatud kasutajakontod on
 login-intro-instruction-fxa-settings = Veendu, et { -sync-brand-short-name }i sätetes oleks Kasutajakontod ees linnuke
 about-logins-intro-instruction-help = Rohkema teabe saamiseks külasta <a data-l10n-name="help-link">{ -lockwise-brand-short-name }'i tugikeskkonda</a>
+about-logins-intro-import = Kui sinu kasutajakontod on salvestatud teise brauserisse, siis saad need <a data-l10n-name="import-link">importida { -lockwise-brand-short-name }'i</a>
+about-logins-intro-import2 = Kui sinu kasutajakontod on salvestatud mujale kui { -brand-product-name }i, siis saad need <a data-l10n-name="import-browser-link">importida teisest brauserist</a> või <a data-l10n-name="import-file-link">failist</a>
 
 ## Login
 
 login-item-new-login-title = Uue kasutajakonto loomine
 login-item-edit-button = Muuda
+about-logins-login-item-remove-button = Eemalda
 login-item-origin-label = Saidi aadress
 login-item-origin =
     .placeholder = https://www.example.com
@@ -86,6 +92,8 @@
 login-item-copy-username-button-text = Kopeeri
 login-item-copied-username-button-text = Kopeeritud!
 login-item-password-label = Parool
+login-item-password-reveal-checkbox =
+    .aria-label = Kuva parooli
 login-item-copy-password-button-text = Kopeeri
 login-item-copied-password-button-text = Kopeeritud!
 login-item-save-changes-button = Salvesta muudatused
@@ -97,16 +105,40 @@
 
 ## OS Authentication dialog
 
+about-logins-os-auth-dialog-caption = { -brand-full-name }
+
 ## The macOS strings are preceded by the operating system with "Firefox is trying to "
 ## and includes subtitle of "Enter password for the user "xxx" to allow this." These
 ## notes are only valid for English. Please test in your respected locale.
 
+# This message can be seen when attempting to edit a login in about:logins on Windows.
+about-logins-edit-login-os-auth-dialog-message-win = Kasutajakonto muutmiseks sisesta Windowsi sisselogimisandmed. See aitab kaitsta sinu kontode turvalisust.
+# This message can be seen when attempting to edit a login in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-edit-login-os-auth-dialog-message-macosx = edit the saved login
+# This message can be seen when attempting to reveal a password in about:logins on Windows.
+about-logins-reveal-password-os-auth-dialog-message-win = Parooli vaatamiseks sisesta Windowsi sisselogimisandmed. See aitab kaitsta sinu kontode turvalisust.
+# This message can be seen when attempting to reveal a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-reveal-password-os-auth-dialog-message-macosx = reveal the saved password
+# This message can be seen when attempting to copy a password in about:logins on Windows.
+about-logins-copy-password-os-auth-dialog-message-win = Parooli kopeerimiseks sisesta Windowsi sisselogimisandmed. See aitab kaitsta sinu kontode turvalisust.
+# This message can be seen when attempting to copy a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-copy-password-os-auth-dialog-message-macosx = copy the saved password
+
 ## Master Password notification
 
 master-password-notification-message = Salvestatud kasutajatunnuste ja paroolide nägemiseks sisesta ülemparool
+# This message can be seen when attempting to export a password in about:logins on Windows.
+about-logins-export-password-os-auth-dialog-message-win = Kasutajakontode eksportimiseks sisesta Windowsi sisselogimisandmed. See aitab kaitsta sinu kontode turvalisust.
+# This message can be seen when attempting to export a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-export-password-os-auth-dialog-message-macosx = export saved logins and passwords
 
 ## Primary Password notification
 
+about-logins-primary-password-notification-message = Salvestatud kasutajatunnuste ja paroolide nägemiseks sisesta ülemparool
 master-password-reload-button =
     .label = Logi sisse
     .accesskey = L
@@ -125,25 +157,78 @@
            *[other] Vaata { -sync-brand-short-name }i eelistusi
         }
     .accesskey = V
+about-logins-enable-password-sync-dont-ask-again-button =
+    .label = Rohkem ei küsita
+    .accesskey = R
 
 ## Dialogs
 
 confirmation-dialog-cancel-button = Loobu
 confirmation-dialog-dismiss-button =
     .title = Loobu
-
+about-logins-confirm-remove-dialog-title = Kas eemaldada see kasutajakonto?
 confirm-delete-dialog-message = Seda tegevust pole võimalik tagasi võtta.
-
+about-logins-confirm-remove-dialog-confirm-button = Eemalda
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eemalda
+        [one] Eemalda
+       *[other] Eemalda kõik
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Jah, eemalda see konto
+        [one] Jah, eemalda see konto
+       *[other] Jah, eemalda need kontod
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Kas eemaldada see konto?
+       *[other] Kas eemaldada kõik { $count } kontot?
+    }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] See tegevus eemaldab selle kasutajakonto { -brand-short-name }ist ja kõik siin kuvatavad murdmishoiatused. Seda toimingu pole võimalik tagasi võtta.
+        [one] See tegevus eemaldab selle kasutajakonto { -brand-short-name }ist ja kõik siin kuvatavad murdmishoiatused. Seda toimingut pole võimalik tagasi võtta.
+       *[other] See tegevus eemaldab kasutajakontod { -brand-short-name }ist ja kõik siin kuvatavad murdmishoiatused. Seda toimingut pole võimalik tagasi võtta.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Kas soovid eemaldada selle kasutajakonto kõigist seadmetest?
+       *[other] Kas soovid eemaldada kõik { $count } kasutajakontot kõigist seadmetest?
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] See tegevus eemaldab selle { -brand-short-name }i salvestadud kasutajakonto kõigist seadmetest, mis on ühendatud sinu { -fxaccount-brand-name }ga. Seda toimingut pole võimalik tagasi võtta.
+        [one] See tegevus eemaldab selle { -brand-short-name }i salvestadud kasutajakonto kõigist seadmetest, mis on ühendatud sinu { -fxaccount-brand-name }ga. Seda toimingut pole võimalik tagasi võtta.
+       *[other] See tegevus eemaldab kõik { -brand-short-name }i salvestadud kasutajakontod kõigist seadmetest, mis on ühendatud sinu { -fxaccount-brand-name }ga. Seda toimingut pole võimalik tagasi võtta.
+    }
+about-logins-confirm-export-dialog-title = Kasutajanimede ja paroolide eksportimine
+about-logins-confirm-export-dialog-message = Sinu paroolid salvestatakse loetava tekstina (nt HalbP@r00l), nii et kõik, kes saavad eksporditud faili avada, saavad neid vaadata.
+about-logins-confirm-export-dialog-confirm-button = Ekspordi...
 confirm-discard-changes-dialog-title = Kas soovid loobuda salvestamata muudatustest?
 confirm-discard-changes-dialog-message = Kõik salvestamata muudatused lähevad kaduma.
 confirm-discard-changes-dialog-confirm-button = Unusta
 
 ## Breach Alert notification
 
+about-logins-breach-alert-title = Veebisaidi rünne
 breach-alert-text = Sellelt saidilt lekitati või varastati kasutajatunnused pärast seda, kui sa viimati enda omi uuendasid. Oma konto kaitsmiseks muuda selle parool.
+about-logins-breach-alert-date = See rünne toimus { DATETIME($date, day: "numeric", month: "long", year: "numeric") }
+# Variables:
+#   $hostname (String) - The hostname of the website associated with the login, e.g. "example.com"
+about-logins-breach-alert-link = Mine saidile { $hostname }
+about-logins-breach-alert-learn-more-link = Rohkem teavet
 
 ## Vulnerable Password notification
 
+about-logins-vulnerable-alert-title = Nõrk parool
+about-logins-vulnerable-alert-text2 = Seda parooli on kasutatud mõnel teisel kontol, mille andmed tõenäoliselt lekkisid. Parooli uuesti kasutamine seab kõik sinu kontod ohtu. Muuda see parool.
+# Variables:
+#   $hostname (String) - The hostname of the website associated with the login, e.g. "example.com"
+about-logins-vulnerable-alert-link = Ava { $hostname }
+about-logins-vulnerable-alert-learn-more-link = Rohkem teavet
+
 ## Error Messages
 
 # This is an error message that appears when a user attempts to save
@@ -151,12 +236,34 @@
 # Variables:
 #   $loginTitle (String) - The title of the website associated with the login.
 about-logins-error-message-duplicate-login-with-link = Selle kasutajanimega kanne { $loginTitle } on juba olemas. <a data-l10n-name="duplicate-link">Kas soovid minna olemasoleva kande juurde?</a>
-
 # This is a generic error message.
 about-logins-error-message-default = Parooli salvestamisel esines viga.
 
-
 ## Login Export Dialog
 
+# Title of the file picker dialog
+about-logins-export-file-picker-title = Kasutajanimede ja paroolide faili eksportimine
+# The default file name shown in the file picker when exporting saved logins.
+# This must end in .csv
+about-logins-export-file-picker-default-filename = kasutajatunnused.csv
+about-logins-export-file-picker-export-button = Ekspordi
+# A description for the .csv file format that may be shown as the file type
+# filter by the operating system.
+about-logins-export-file-picker-csv-filter-title =
+    { PLATFORM() ->
+        [macos] CSV-fail
+       *[other] CSV-fail
+    }
+
 ## Login Import Dialog
 
+# Title of the file picker dialog
+about-logins-import-file-picker-title = Kasutajatunnuste failist importimine
+about-logins-import-file-picker-import-button = Impordi
+# A description for the .csv file format that may be shown as the file type
+# filter by the operating system.
+about-logins-import-file-picker-csv-filter-title =
+    { PLATFORM() ->
+        [macos] CSV-fail
+       *[other] CSV-fail
+    }
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/aboutPrivateBrowsing.ftl firefox-85.0+build1/l10n/et/browser/browser/aboutPrivateBrowsing.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/aboutPrivateBrowsing.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/aboutPrivateBrowsing.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -11,4 +11,17 @@
     .title = Otsi veebist
 about-private-browsing-not-private = Sa pole praegu privaatses aknas.
 about-private-browsing-info-description = { -brand-short-name } kustutab otsimise ja lehitsemise ajaloo, kui väljud rakendusest või sulged privaatsed kaardid ja aknad. Kuigi see ei muuda sind külastatavate veebilehtede või internetiteenuse pakkuja ees anonüümseks, siis kaitseb see siiski sinu privaatsust teiste selle arvuti kasutajate eest.
-
+about-private-browsing-need-more-privacy = Vajad rohkem privaatsust?
+about-private-browsing-turn-on-vpn = Proovi { -mozilla-vpn-brand-name }i
+# This string is the title for the banner for search engine selection
+# in a private window.
+# Variables:
+#   $engineName (String) - The engine name that will currently be used for the private window.
+about-private-browsing-search-banner-title = { $engineName } on privaatsete akende vaikeotsingumootor
+about-private-browsing-search-banner-description =
+    { PLATFORM() ->
+        [windows] Teise otsingumootori valimiseks ava <a data-l10n-name="link-options">Sätted</a>
+       *[other] Teise otsingumootori valimiseks ava <a data-l10n-name="link-options">Eelistused</a>
+    }
+about-private-browsing-search-banner-close-button =
+    .aria-label = Sulge
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/et/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -14,11 +14,14 @@
 crashed-request-help-message = Vearaportid aitavad meil probleeme uurida ja { -brand-short-name }i paremaks muuta.
 crashed-request-report-title = Anna sellest kaardist teada
 crashed-send-report = Selleks, et taolisi vigu oleks võimalik parandada, saadetakse vearaportid automaatselt.
+crashed-send-report-2 = Selleks, et taolisi vigu oleks võimalik parandada, saadetakse vearaportid automaatselt
 crashed-comment =
     .placeholder = Valikulised kommentaarid (need on avalikult nähtavad)
 crashed-include-URL = Kaasatakse saitide URLid, mida külastasid ajal, mil { -brand-short-name } kokku jooksis.
+crashed-include-URL-2 = Kaasatakse saitide URLid, mida külastasid ajal, mil { -brand-short-name } kokku jooksis
 crashed-email-placeholder = Sisesta siia oma e-posti aadress
 crashed-email-me = Saadetakse e-kiri, kui tekib rohkem teavet
 crashed-report-sent = Vearaport on juba saadetud. Täname, et aitad { -brand-short-name }i paremaks teha!
 crashed-request-auto-submit-title = Taustal töötavate kaartide kohta raporteerimine
 crashed-auto-submit-checkbox = Sätteid uuendatakse nii, et { -brand-short-name } saadaks kokkujooksmisel vearaporteid automaatselt.
+crashed-auto-submit-checkbox-2 = Sätteid uuendatakse nii, et { -brand-short-name } saadaks kokkujooksmisel vearaporteid automaatselt
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/et/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/appmenu.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/appmenu.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -5,18 +5,40 @@
 
 ## App Menu
 
+appmenuitem-update-banner =
+    .label-update-downloading = { -brand-shorter-name }i uuenduse allalaadimine
+appmenuitem-protection-dashboard-title = Kaitsete koondpaneel
 appmenuitem-customize-mode =
     .label = Kohanda...
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Uus aken
+appmenuitem-new-private-window =
+    .label = Uus privaatne aken
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-zoom-enlarge =
+    .label = Suurenda
+appmenuitem-zoom-reduce =
+    .label = Vähenda
+appmenuitem-fullscreen =
+    .label = Täisekraani režiim
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sünkroniseeri kohe
+appmenuitem-save-page =
+    .label = Salvesta veebileht kui…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Mis on uut?
-
+# Checkbox displayed at the bottom of the What's New panel, allowing users to
+# enable/disable What's New notifications.
+whatsnew-panel-footer-checkbox =
+    .label = Uutest funktsioonidest antakse teada
+    .accesskey = U
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/et/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/appMenuNotifications.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Mitte praegu
     .secondarybuttonaccesskey = M
 appmenu-update-restart-message = Pärast kiiret taaskäivitamist taastab { -brand-shorter-name } kõik avatud kaardid ja aknad, mis pole privaatse veebilehitsemise režiimis.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name }il pole võimalik automaatselt uuendada uusima versiooni peale.
+    .buttonlabel = Uuenda { -brand-shorter-name } sellegipoolest
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Mitte praegu
+    .secondarybuttonaccesskey = M
+appmenu-update-other-instance-message = { -brand-shorter-name }ile on saadaval uuendus, aga seda ei saa paigaldada, sest töötab veel üks versioon { -brand-shorter-name }ist. Uuendamiseks sulge see või vali uuendamine sellegipoolest (teine versioon võib vajada korrektselt töötamiseks taaskäivitamist).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Olgu, sain aru
     .buttonaccesskey = O
@@ -39,7 +46,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Sellel laiendusel lubatakse käivituda privaatsetes akendes
     .accesskey = S
-    
 appmenu-new-tab-controlled =
     .label = Uue kaardi sisu on muutunud.
     .buttonlabel = Säilita muudatused
@@ -52,6 +58,18 @@
     .buttonaccesskey = S
     .secondarybuttonlabel = Keela see laiendus
     .secondarybuttonaccesskey = K
+appmenu-new-tab-controlled-changes =
+    .label = Uue kaardi sisu on muutunud.
+    .buttonlabel = Säilita muudatused
+    .buttonaccesskey = S
+    .secondarybuttonlabel = Halda uue kaardi vaadet
+    .secondarybuttonaccesskey = H
+appmenu-homepage-controlled-changes =
+    .label = Avalehe sisu on muutunud.
+    .buttonlabel = Säilita muudatused
+    .buttonaccesskey = S
+    .secondarybuttonlabel = Halda avalehe vaadet
+    .secondarybuttonaccesskey = H
 appmenu-tab-hide-controlled =
     .label = Vaata peidetud kaarte
     .buttonlabel = Jäta kaardid peidetuks
diff -Nru firefox-84.0.2+build1/l10n/et/browser/browser/browser.ftl firefox-85.0+build1/l10n/et/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/et/browser/browser/browser.ftl	2021-01-06 11:35:39.000000000 +0000
+++ firefox-85.0+build1/l10n/et/browser/browser/browser.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -23,7 +23,7 @@
 # there is no content title:
 #
 # "default" - "Mozilla Firefox"
-# "private" - "Mozilla Firefox - (Private Browsing)"
+# "private" - "Mozilla Firefox — (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Do not use the brand name in the last two attributes, as we do on non-macOS.
@@ -69,6 +69,8 @@
     .tooltiptext = Ava teavituse paneel
 urlbar-geolocation-notification-anchor =
     .tooltiptext = Ava asukohataotluse paneel
+urlbar-xr-notification-anchor =
+    .tooltiptext = Ava virtuaalreaalsuse õiguste paneel
 urlbar-storage-access-anchor =
     .tooltiptext = Ava veebilehitsemise jälitamise õiguste paneel
 urlbar-translate-notification-anchor =
@@ -91,6 +93,14 @@
     .tooltiptext = Salvesta andmeid püsivalt
 urlbar-addons-notification-anchor =
     .tooltiptext = Ava lisa paigaldamise teavituspaneel
+urlbar-tip-help-icon =
+    .title = Hangi abi
+urlbar-search-tips-confirm = Olgu, sain aru
+# Read out before Urlbar Tip text content so screenreader users know the
+# subsequent text is a tip offered by the browser. It should end in a colon or
+# localized equivalent.
+urlbar-tip-icon-description =
+    .alt = Nipp:
 
 ## Prompts users to use the Urlbar when they open a new tab or visit the
 ## homepage of their default search engine.
@@ -98,14 +108,23 @@
 ##  $engineName (String): The name of the user's default search engine. e.g. "Google" or "DuckDuckGo".
 
 urlbar-search-tips-onboard = Sisesta vähem, leia rohkem: otsi otsingumootoriga { $engineName } otse oma aadressiribalt.
+urlbar-search-tips-redirect-2 = Alusta oma otsingut aadressiribalt, et näha soovitusi otsingumootorilt { $engineName } ning oma lehitsemise ajaloost.
+# Prompts users to use the Urlbar when they are typing in the domain of a
+# search engine, e.g. google.com or amazon.com.
+urlbar-tabtosearch-onboard = Kiiremaks otsimiseks vali see otsetee.
 
 ## Local search mode indicator labels in the urlbar
 
+urlbar-search-mode-bookmarks = Järjehoidjad
+urlbar-search-mode-tabs = Kaardid
+urlbar-search-mode-history = Ajalugu
 
 ##
 
 urlbar-geolocation-blocked =
     .tooltiptext = Oled sellel lehel keelanud asukohateabe kasutamise.
+urlbar-xr-blocked =
+    .tooltiptext = Oled blokkinud sellel saidil ligipääsu virtuaalreaalsuse seadmetele.
 urlbar-web-notifications-blocked =
     .tooltiptext = Oled sellel lehel teavitused keelanud.
 urlbar-camera-blocked =
@@ -143,6 +162,8 @@
     .label = Halda laiendust…
 page-action-remove-from-urlbar =
     .label = Eemalda aadressiribalt
+page-action-remove-extension =
+    .label = Eemalda laiendus
 
 ## Page Action menu
 
@@ -202,7 +223,7 @@
 
 ## Search Engine selection buttons (one-offs)
 
-# This string prompts the user to use the list of one-click search engines in
+# This string prompts the user to use the list of search shortcuts in
 # the Urlbar and searchbar.
 search-one-offs-with-title = Seekord soorita otsing järgneva otsingumootoriga:
 # This string won't wrap, so if the translated string is longer,
@@ -217,6 +238,15 @@
 search-one-offs-context-set-as-default =
     .label = Määra vaikeotsingumootoriks
     .accesskey = M
+search-one-offs-context-set-as-default-private =
+    .label = Määra privaatsete akende vaikeotsingumootoriks
+    .accesskey = M
+# Search engine one-off buttons with an @alias shortcut/keyword.
+# Variables:
+#  $engineName (String): The name of the engine.
+#  $alias (String): The @alias shortcut/keyword.
+search-one-offs-engine-with-alias =
+    .tooltiptext = { $engineName } ({ $alias })
 
 ## Local search mode one-off buttons
 ## Variables:
@@ -225,6 +255,12 @@
 ##    restrict their searches to certain sources (e.g., "*" to search only
 ##    bookmarks).
 
+search-one-offs-bookmarks =
+    .tooltiptext = Järjehoidjad ({ $restrict })
+search-one-offs-tabs =
+    .tooltiptext = Kaardid ({ $restrict })
+search-one-offs-history =
+    .tooltiptext = Ajalugu ({ $restrict })
 
 ## Bookmark Panel
 
@@ -252,6 +288,14 @@
 identity-active-loaded = Kaitse sellel lehel on keelatud.
 identity-weak-encryption = See leht kasutab nõrka krüpteeringut.
 identity-insecure-login-forms = Sellele lehele sisestatavad kasutajakonto andmed võivad ohus olla.
+identity-https-only-connection-upgraded = (uuendati HTTPSile)
+identity-https-only-label = Ainult HTTPS-režiim
+identity-https-only-dropdown-on =
+    .label = sees
+identity-https-only-dropdown-off =
+    .label = väljas
+identity-https-only-dropdown-off-temporarily =
+    .label = ajutiselt väljas
 identity-permissions =
     .value = Õigused
 identity-permissions-reload-hint = Muudatuste rakendumiseks pead võib-olla lehe uuesti laadima.
@@ -293,6 +337,9 @@
 browser-window-close-button =
     .tooltiptext = Sulge
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -313,6 +360,8 @@
 
 urlbar-default-placeholder =
     .defaultPlaceholder = Otsi või sisesta aadress
+# This placeholder is used when not in search mode and the user's default search
+# engine is unknown.
 urlbar-placeholder =
     .placeholder = Otsi või sisesta aadress
 # Variables
@@ -366,3 +415,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Sait <span data-l10n-name="domain">{ $domain }</span> kontrollib sinu kursori tegevust. Kontrolli tagasivõtmiseks vajuta klahvile Esc.
 pointerlock-warning-no-domain = See dokument kontrollib sinu kursori tegevust. Kontrolli tagasivõtmiseks vajuta klahvile Esc.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Kuva kõiki järjehoidjaid
+bookmarks-recent-bookmarks =
+    .value = Viimati järjehoidjatesse lisatud
+bookmarks-toolbar-chevron =
+    .tooltiptext = Veel järjehoidjaid
+bookmarks-sidebar-content =
+    .aria-label = Järjehoidjad
+bookmarks-menu-button =
+    .label = Järjehoidjate menüü
+bookmarks-other-bookmarks-menu =
+    .label = Muud järjehoidjad
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobiilsed järjehoidjad
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Peida järjehoidjate külgriba
+           *[other] Kuva järjehoidjate külgriba
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Peida järjehoidjariba
+           *[other] Kuva järjehoidjariba
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eemalda järjehoidjate menüü tööriistaribalt
+           *[other] Lisa järjehoidjate menüü tööriistaribale
+        }
+bookmarks-search =
+    .label = Otsi järjehoidjatest
+bookmarks-tools =
+    .label = Järjehoidjate tööriistad
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Järjehoidjariba
+    .accesskey = J
+    .aria-label = Järjehoidjad
+bookmarks-toolbar-menu =
+    .label = Järjehoidjariba
+bookmarks-toolbar-placeholder =
+    .title = Järjehoidjariba elemendid
+bookmarks-toolbar-placeholder-button =
+    .label = Järjehoidjariba elemendid
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Järjehoidjad
+library-bookmarks-bookmark-this-page =
+    .label = Lisa see veebileht järjehoidjatesse
+library-bookmarks-bookmark-edit =
+    .label = Muuda seda järjehoidjat
+
+## More items
+
+more-menu-go-offline =
+    .label = Tööta võrguta
+    .accesskey = T
diff -Nru firefox-84.0.2+build1/l10n/et/dom/dom/media.ftl firefox-85.0+build1/l10n/et/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/et/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/et/dom/dom/media.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/et/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/et/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/et/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/et/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:40.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/eu/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/aboutLogins.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/aboutLogins.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -169,7 +169,6 @@
 about-logins-confirm-remove-dialog-title = Kendu saio-hasiera hau?
 confirm-delete-dialog-message = Ekintza hau ezin da desegin.
 about-logins-confirm-remove-dialog-confirm-button = Kendu
-about-logins-confirm-remove-all-dialog-confirm-button = Kendu denak
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Bai, kendu saio-hasiera hau
@@ -186,9 +185,16 @@
         [one] Kendu saio-hasiera gailu guztietatik?
        *[other] Kendu { $count } saio-hasiera gailu guztietatik?
     }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Honekin, { -brand-short-name }(e)n gordetako saio-hasiera { -fxaccount-brand-name } bidez sinkronizatutako gailu guztietatik kenduko da. Hemen agertzen diren urratzeen inguruko abisuak ere kenduko ditu honek. Ekintza hau ezingo duzu desegin.
+       *[other] Honekin, { -brand-short-name }(e)n gordetako saio-hasiera guztiak { -fxaccount-brand-name } bidez sinkronizatutako gailu guztietatik kenduko da. Hemen agertzen diren urratzeen inguruko abisuak ere kenduko ditu honek. Ekintza hau ezingo duzu desegin.
+    }
 about-logins-confirm-export-dialog-title = Esportatu saio-hasierak eta pasahitzak
 about-logins-confirm-export-dialog-message = Zure pasahitzak testu irakurgarri modura gordeko dira (adib. P@sahitz3skas4) beraz esportatutako fitxategia ireki dezakeen orok ikusi ahal izango ditu.
 about-logins-confirm-export-dialog-confirm-button = Esportatu…
+about-logins-alert-import-title = Inportazioa burutu da
+about-logins-alert-import-message = Ikusi inportazioaren laburpen xehetua
 confirm-discard-changes-dialog-title = Baztertu gorde gabeko aldaketak?
 confirm-discard-changes-dialog-message = Gorde gabeko aldaketa guztiak galdu egingo dira.
 confirm-discard-changes-dialog-confirm-button = Baztertu
@@ -250,3 +256,10 @@
         [macos] CSV dokumentua
        *[other] CSV fitxategia
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Inportazioa burutu da
+about-logins-import-dialog-done = Eginda
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/eu/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/appmenu.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/appmenu.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Leiho berria
+appmenuitem-new-private-window =
+    .label = Leiho pribatu berria
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Gerturatu zooma
 appmenuitem-zoom-reduce =
     .label = Urrundu zooma
+appmenuitem-fullscreen =
+    .label = Pantaila osoa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinkronizatu orain
+appmenuitem-save-page =
+    .label = Gorde orria honela…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/browser.ftl firefox-85.0+build1/l10n/eu/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/browser.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/browser.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> (e)k zure erakuslearen kontrola dauka. Kontrola berreskuratzeko, sakatu eskape tekla.
 pointerlock-warning-no-domain = Dokumentu honek zure erakuslearen kontrola dauka. Kontrola berreskuratzeko, sakatu eskape tekla.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Erakutsi laster-marka guztiak
+bookmarks-recent-bookmarks =
+    .value = Azken laster-markak
+bookmarks-toolbar-chevron =
+    .tooltiptext = Erakutsi laster-marka gehiago
+bookmarks-sidebar-content =
+    .aria-label = Laster-markak
+bookmarks-menu-button =
+    .label = Laster-marken menua
+bookmarks-other-bookmarks-menu =
+    .label = Beste laster-markak
+bookmarks-mobile-bookmarks-menu =
+    .label = Mugikorreko laster-markak
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ezkutatu laster-marken alboko barra
+           *[other] Ikusi laster-marken tresna-barra
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ezkutatu laster-marken tresna-barra
+           *[other] Ikusi laster-marken tresna-barra
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kendu laster-marken menua tresna-barratik
+           *[other] Gehitu laster-marken menua tresna-barran
+        }
+bookmarks-search =
+    .label = Bilatu laster-markak
+bookmarks-tools =
+    .label = Laster-marken tresnak
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Laster-marken tresna-barra
+    .accesskey = b
+    .aria-label = Laster-markak
+bookmarks-toolbar-menu =
+    .label = Laster-marken tresna-barra
+bookmarks-toolbar-placeholder =
+    .title = Laster-marken tresna-barraren osagaiak
+bookmarks-toolbar-placeholder-button =
+    .label = Laster-marken tresna-barraren osagaiak
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Laster-markak
+library-bookmarks-bookmark-this-page =
+    .label = Egin orriaren laster-marka
+library-bookmarks-bookmark-edit =
+    .label = Editatu laster-marka
+library-recent-activity-label = Azken jarduera
+
+## More items
+
+more-menu-go-offline =
+    .label = Lan egin lineaz kanpo
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/eu/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/newtab/newtab.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Fitxa berria
 newtab-settings-button =
     .title = Pertsonalizatu fitxa berriaren orria
+newtab-personalize-button-label = Pertsonalizatu
+    .title = Pertsonalizatu fitxa berria
+    .aria-label = Pertsonalizatu fitxa berria
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Bilatu webean
     .title = Bilatu webean
     .aria-label = Bilatu webean
+newtab-search-box-text = Bilatu webean
+newtab-search-box-input =
+    .placeholder = Bilatu webean
+    .aria-label = Bilatu webean
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Gehitu bilaketa-motorra
 newtab-topsites-add-topsites-header = Maiz erabilitako gune berria
+newtab-topsites-add-shortcut-header = Lasterbide berria
 newtab-topsites-edit-topsites-header = Editatu maiz erabilitako gunea
+newtab-topsites-edit-shortcut-header = Editatu lasterbidea
 newtab-topsites-title-label = Izenburua
 newtab-topsites-title-input =
     .placeholder = Idatzi izenburua
@@ -206,3 +215,24 @@
 
 newtab-error-fallback-info = Kontxo, zerbait gaizki joan da edukia kargatzerakoan.
 newtab-error-fallback-refresh-link = Berritu orria berriro saiatzeko.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Lasterbideak
+newtab-custom-shortcuts-subtitle = Gordetzen edo bisitatzen dituzun guneak
+newtab-custom-row-selector =
+    { $num ->
+        [one] Errenkada bat
+       *[other] { $num } errenkada
+    }
+newtab-custom-sponsored-sites = Babesleen lasterbideak
+newtab-custom-pocket-title = { -pocket-brand-name }-ek gomendatua
+newtab-custom-pocket-sponsored = Babesleen istorioak
+newtab-custom-recent-title = Azken jarduera
+newtab-custom-close-button = Itxi
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Mezu-zatiak
+newtab-custom-settings = Kudeatu ezarpen gehiago
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/places.ftl firefox-85.0+build1/l10n/eu/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/places.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/places.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Azpikarpeta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Beste laster-markak
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/eu/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/preferences/preferences.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -496,6 +496,11 @@
 home-prefs-topsites-description = Gehien bisitatzen dituzun guneak
 home-prefs-topsites-by-option-sponsored =
     .label = Babesleek hornitutako guneak
+home-prefs-shortcuts-header =
+    .label = Lasterbideak
+home-prefs-shortcuts-description = Gordetzen edo bisitatzen dituzun guneak
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Babesleen lasterbideak
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -511,8 +516,6 @@
     .label = Babesleen istorioak
 home-prefs-highlights-header =
     .label = Nabarmendutakoak
-home-prefs-recent-activity-header =
-    .label = Azken jarduera
 home-prefs-highlights-description = Gorde edo bisitatu dituzun guneen hautapena
 home-prefs-highlights-option-visited-pages =
     .label = Bisitatutako orriak
@@ -522,6 +525,8 @@
     .label = Azken deskarga
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }-en gordetako orriak
+home-prefs-recent-activity-header =
+    .label = Azken jarduera
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -789,6 +794,10 @@
 forms-primary-pw-change =
     .label = Aldatu pasahitz nagusia…
     .accesskey = d
+# Leave this message empty if the translation for "Primary Password" matches
+# "Master Password" in your language. If you're editing the FTL file directly,
+# use { "" } as the value.
+forms-primary-pw-former-name = { "" }
 forms-primary-pw-fips-title = Une honetan FIPS moduan zaude. FIPS moduak pasahitz nagusia ezartzea eskatzen du.
 forms-master-pw-fips-desc = Pasahitz aldaketak huts egin du
 
@@ -916,9 +925,16 @@
 addressbar-locbar-openpage-option =
     .label = Irekitako fitxak
     .accesskey = I
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Lasterbideak
+    .accesskey = s
 addressbar-locbar-topsites-option =
     .label = Gune erabilienak
     .accesskey = r
+addressbar-locbar-engines-option =
+    .label = Bilaketa-motorrak
+    .accesskey = k
 addressbar-suggestions-settings = Aldatu bilaketa-motorren iradokizunetarako hobespenak
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/protections.ftl firefox-85.0+build1/l10n/eu/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/protections.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/protections.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -126,6 +126,7 @@
 monitor-no-breaches-description = Ez zaude datu-urratze ezagunetan. Hau aldatuko balitz, jakinarazi egingo dizugu.
 monitor-view-report-link = Ikusi txostena
     .title = Argitu urratzeak { -monitor-brand-short-name }(e)n
+monitor-breaches-unresolved-title = Ebatzi zure datu-urratzeak
 monitor-manage-breaches-link = Kudeatu datu-urratzeak
     .title = Kudeatu datu-urratzeak { -monitor-brand-short-name }(e)n
 monitor-breaches-resolved-description = Zure helbide elektronikoa datu-urratze berriren batean agertuko balitz, jakinarazi egingo dizugu.
@@ -135,6 +136,8 @@
 monitor-partial-breaches-motivation-title-start = Hasiera ona!
 monitor-partial-breaches-motivation-title-middle = Eutsi horri!
 monitor-partial-breaches-motivation-title-end = Ia eginda! Eutsi horri.
+monitor-resolve-breaches-link = Ebatzi datu-urratzeak
+    .title = Ebatzi { -monitor-brand-short-name }-eko datu-urratzeak
 
 ## 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.
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/eu/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/eu/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -61,3 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Fitxa berrian soilik
     .accesskey = b
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Erakutsi beti
+    .accesskey = b
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Inoiz ez erakutsi
+    .accesskey = n
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Erakutsi fitxa berrian soilik
+    .accesskey = E
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Erakutsi beste laster-markak
+    .accesskey = b
diff -Nru firefox-84.0.2+build1/l10n/eu/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/eu/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/eu/browser/extensions/formautofill/formautofill.properties	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:03:44.000000000 +0000
@@ -113,6 +113,8 @@
 # LOCALIZATION NOTE (autofillReauthOSDialogMac): This string is
 # preceded by the operating system (macOS) with "Firefox is trying to ", and
 # has a period added to its end. Make sure to test in your locale.
+autofillReauthOSDialogMac = aldatu autentifikazio-ezarpenak
+autofillReauthOSDialogLin = Autentifikazio-ezarpenak aldatzeko, sartu zure Linux saio-hasierako kredentzialak.
 
 # LOCALIZATION NOTE (manageAddressesTitle, manageCreditCardsTitle): The dialog title for the list of addresses or
 # credit cards in browser preferences.
diff -Nru firefox-84.0.2+build1/l10n/eu/devtools/client/accessibility.properties firefox-85.0+build1/l10n/eu/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/eu/devtools/client/accessibility.properties	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/devtools/client/accessibility.properties	2021-01-18 20:03:44.000000000 +0000
@@ -295,3 +295,14 @@
 # contrast loss simulation option currently selected.
 accessibility.simulation.contrastLoss=Kontraste galera
 
+# LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
+accessibility.simulation.achromatopsia=Akromatopsia (kolorerik ez)
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.label): A title text for a checkbox label
+# in the accessibility panel toolbar that turns on/off the overlay of focusable elements in their
+# tabbing order.
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
+# tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
+# their tabbing order.
diff -Nru firefox-84.0.2+build1/l10n/eu/devtools/client/inspector.properties firefox-85.0+build1/l10n/eu/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/eu/devtools/client/inspector.properties	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/devtools/client/inspector.properties	2021-01-18 20:03:44.000000000 +0000
@@ -111,6 +111,10 @@
 #LOCALIZATION NOTE: Used in the tooltip for Capturing
 eventsTooltip.Capturing=Kapturatzea
 
+# LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
+# displayed when hovering over the tabs overflow button.
+allTabsMenuButton.tooltip=Erakutsi fitxa guztiak
+
 # LOCALIZATION NOTE (inspector.showThreePaneMode): This is the tooltip for the button
 # that toggles on the 3 pane inspector mode.
 inspector.showThreePaneMode=Aktibatu 3 paneleko ikuskatzailea
@@ -503,6 +507,17 @@
 # when hovering over badges next to scrollable elements in the inspector.
 markupView.scrollableBadge.tooltip=Elementu honek korritu daitekeen gainezkatzea du.
 
+# LOCALIZATION NOTE (markupView.scrollableBadge.interactive.tooltip): This is the tooltip that is displayed
+# when hovering over interactive badges next to scrollable elements in the inspector.
+
+# LOCALIZATION NOTE (markupView.overflowBadge.label): This is the text displayed inside a
+# badge, in the inspector, next to nodes that are causing overflow in other elements.
+markupView.overflowBadge.label=gainezkatzea
+
+# LOCALIZATION NOTE (markupView.overflowBadge.tooltip): This is the tooltip that is displayed
+# when hovering over badges next to overflow causing elements in the inspector.
+markupView.overflowBadge.tooltip=Elementu honek beste elementu batek gainezka egitea eragiten du.
+
 # 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=Erlazionatutako erregelarik ez
diff -Nru firefox-84.0.2+build1/l10n/eu/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/eu/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/eu/devtools/client/netmonitor.properties	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/devtools/client/netmonitor.properties	2021-01-18 20:03:44.000000000 +0000
@@ -64,6 +64,7 @@
 
 # LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
 # displayed when hovering over the tabs overflow button.
+allTabsMenuButton.tooltip=Erakutsi fitxa guztiak
 
 # LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
 # headers tab of the network details pane when there are no headers available.
@@ -554,7 +555,7 @@
 # in the network table when empty to start logging network requests.
 netmonitor.reloadNotice1=• Burutu eskaera edo
 netmonitor.reloadNotice2=Berritu
-netmonitor.reloadNotice3=orria sareko jarduerari buruzko informazio xehea ikusteko.
+netmonitor.reloadNotice3=orria sareko jarduerari buruzko informazio xehatua ikusteko.
 
 # LOCALIZATION NOTE (netmonitor.toolbar.status3): This is the label displayed
 # in the network table toolbar, above the "status" column.
@@ -671,12 +672,15 @@
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.eventName): This is the label displayed
 # in the messages table header, above the "eventName" column.
+netmonitor.ws.toolbar.eventName=Gertaera-izena
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.retry): This is the label displayed
 # in the messages table header, above the "retry" column.
+netmonitor.ws.toolbar.retry=Saiatu berriro
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.lastEventId): This is the label displayed
 # in the messages table header, above the "lastEventId" column.
+netmonitor.ws.toolbar.lastEventId=Azken gertaeraren IDa
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.clear): This is the label displayed
 # in the messages panel toolbar for the "Clear" button.
@@ -1047,6 +1051,7 @@
 
 # LOCALIZATION NOTE (netmonitor.headers.referrerPolicy): This is the label displayed
 # in the network details headers tab identifying the referrer policy.
+netmonitor.headers.referrerPolicy=Erreferentzia-egileen politika
 
 # LOCALIZATION NOTE (netmonitor.headers.contentBlocking): This is the label displayed
 # in the network details headers tab identifying the content blocking mode.
@@ -1522,6 +1527,7 @@
 netmonitor.settings.copyHarTooltip=Kopiatu sareko datuak arbelean
 
 # LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+netmonitor.errorpanel.description=Sareko panelak huts egin du.
 
 # LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
 
diff -Nru firefox-84.0.2+build1/l10n/eu/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/eu/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/eu/dom/chrome/dom/dom.properties	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/dom/chrome/dom/dom.properties	2021-01-18 20:03:44.000000000 +0000
@@ -105,6 +105,7 @@
 MediaStreamTrackAudioSourceNodeCrossOrigin='createMediaStreamTrackSource'ri pasatako 'MediaStream'a jatorri gurutzatuko baliabidea da; nodoak isilunea emango du irteeran.
 # LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaElementAudioCaptureOfMediaStreamError=Kapturatutako HTMLMediaElement-a MediaStream bat erreproduzitzen ari da. Une honetan ez da onartzen bolumena edo mutututako egoera aplikatzea.
+# LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaLoadExhaustedCandidates=Baliabide hautagai guztien kargak huts egin du. Media kargatzea pausatuta.
 MediaLoadSourceMissingSrc=<source> elementuak ez dauka "src" atributurik. Huts egin du media-baliabidea kargatzeak.
 MediaStreamAudioSourceNodeDifferentRate=Lagin-emari desberdinak dituzten AudioContexts-etako AudioNodes-ak konektatzea ez da onartzen une honetan.
@@ -346,10 +347,10 @@
 IDBOpenDBOptions_StorageTypeWarning=Zaharkituta dago indexedDB.open metodoari pasatako aukeretako 'storage' atributua eta kendu egingo da laster. Biltegiratze iraunkorra lortzeko, horren ordez erabili navigator.storage.persist().
 UnsupportedEntryTypesIgnored=Onartzen ez diren entryTypes-ak ezikusten: %S.
 AllEntryTypesIgnored=Baliozko 'entryTypes'rik ez; erregistroa bertan behera uzten.
-
 # LOCALIZATION NOTE: do not localize key=“%S� modifiers=“%S� id=“%S�
 GTK2Conflict2=Tekla-gertaera ez dago erabilgarri GTK2n: tekla="%S" aldatzaileak="%S" id="%S"
 WinConflict2=Tekla-gertaera ez dago erabilgarri zenbait teklatu-diseinutan: tekla="%S" aldatzaileak="%S" id="%S"
+# LOCALIZATION NOTE: do not trnaslated "document.domain"
 
 #LOCALIZATION NOTE(DeprecatedTestingInterfaceWarning): Do not translate this message. It's just testing only.
 DeprecatedTestingInterfaceWarning='TestingDeprecatedInterface' interfazea probetarako da soilik eta hau bere probetarako zaharkitze-mezua da.
@@ -390,8 +391,19 @@
 MathML_DeprecatedStyleAttributeWarning=Zaharkituta daude "background", "color", "fontfamily", "fontsize", "fontstyle" eta "fontweight" MathML atributuak eta kendu egingo dira etorkizunean.
 # LOCALIZATION NOTE: Do not translate MathML and XLink.
 MathML_DeprecatedXLinkAttributeWarning=Zaharkituta daude "href", "type" "show" eta "actuate" XLink atributuak MathML elementuetan eta kendu egingo dira etorkizunean.
+# LOCALIZATION NOTE: Do not translate MathML and STIXGeneral. %S is a documentation URL.
+# LOCALIZATION NOTE: Do not translate MathML and scriptminsize.
+# LOCALIZATION NOTE: Do not translate MathML and scriptsizemultiplier.
 WebShareAPI_Failed=Partekatze-eragiketak huts egin du.
 WebShareAPI_Aborted=Partekatze-eragiketa abortatu egin da.
 # LOCALIZATION NOTE (UnknownProtocolNavigationPrevented): %1$S is the destination URL.
 UnknownProtocolNavigationPrevented=“%1$S�-(e)ra nabigatzea eragotzi da protokoloa ezezaguna delako.
+# LOCALIZATION NOTE: %S is the URL of the resource in question
 
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-same-origin and sandbox (though you may translate "sandboxed").
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-storage-access-by-user-activation and sandbox (though you may translate "sandboxed").
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess() and iframe.
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(). In some locales it may be preferable to not translate "event handler", either.
+# LOCALIZATION NOTE: Do not translate "Location" and "History".
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.acceptButtonLabel = Igo
diff -Nru firefox-84.0.2+build1/l10n/eu/dom/dom/media.ftl firefox-85.0+build1/l10n/eu/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/eu/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/dom/dom/media.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/eu/security/manager/security/pippki/pippki.ftl firefox-85.0+build1/l10n/eu/security/manager/security/pippki/pippki.ftl
--- firefox-84.0.2+build1/l10n/eu/security/manager/security/pippki/pippki.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/security/manager/security/pippki/pippki.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -8,7 +8,8 @@
 
 change-password-window =
     .title = Aldatu pasahitz nagusia
-
+change-device-password-window =
+    .title = Aldatu pasahitza
 # Variables:
 # $tokenName (String) - Security device of the change password dialog
 change-password-token = Segurtasun-gailua: { $tokenName }
@@ -21,6 +22,8 @@
 reset-password-window =
     .title = Berrezarri pasahitz nagusia
     .style = width: 40em
+pippki-failed-pw-change = Ezin da pasahitza aldatu.
+pippki-pw-change-ok = Pasahitza ondo aldatu da.
 
 ## Reset Primary Password dialog
 
diff -Nru firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -163,9 +163,9 @@
 addon-category-locale = Hizkuntzak
 addon-category-locale-title =
     .title = Hizkuntzak
-addon-category-available-updates = Eguneraketak eskura
+addon-category-available-updates = Eguneraketa erabilgarriak
 addon-category-available-updates-title =
-    .title = Eguneraketak eskura
+    .title = Eguneraketa erabilgarriak
 addon-category-recent-updates = Azken eguneraketak
 addon-category-recent-updates-title =
     .title = Azken eguneraketak
@@ -209,7 +209,7 @@
 addon-updates-updating = Gehigarriak eguneratzen
 addon-updates-installed = Gehigarriak eguneratu egin dira.
 addon-updates-none-found = Ez da eguneraketarik aurkitu
-addon-updates-manual-updates-found = Ikusi eskura dauden eguneraketak
+addon-updates-manual-updates-found = Ikusi eguneraketa erabilgarriak
 
 ## Add-on install/debug strings for page options menu
 
@@ -370,9 +370,6 @@
 addon-badge-recommended2 =
     .title = Segurtasun eta errendimendurako gure estandarrak betetzen dituzten hedapenak gomendatzen ditu { -brand-product-name }(e)k
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Hedapen hau { -brand-product-name } egiten dutenek sortu dute
-    .aria-label = { addon-badge-line.title }
 
 ##
 
diff -Nru firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutNetworking.ftl firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -6,6 +6,8 @@
 about-networking-http = HTTP
 about-networking-sockets = Socketak
 about-networking-dns = DNS
+about-networking-dns-clear-cache-button = Garbitu DNS cachea
+about-networking-dns-trr-url = DoH URLa
 about-networking-dns-suffix = DNS aurrizkia
 about-networking-websockets = WebSocketak
 about-networking-refresh = Berritu
diff -Nru firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -2,6 +2,11 @@
 # 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/.
 
+# Page title
+about-processes-title = Prozesuen kudeatzailea
+# The Actions column
+about-processes-column-action =
+    .title = Ekintzak
 
 ## Tooltips
 
@@ -10,6 +15,9 @@
 
 ## Column headers
 
+about-processes-column-name = Izena
+about-processes-column-memory-resident = Memoria
+about-processes-column-cpu-total = PUZa
 
 ## Process names
 ## Variables:
@@ -17,6 +25,7 @@
 ##    $origin (String) The domain name for this process.
 ##    $type (String) The raw type for this process. Used for unknown processes.
 
+about-processes-browser-process-name = { -brand-short-name } ({ $pid } prozesua)
 
 ## Details within processes
 
diff -Nru firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -130,6 +130,9 @@
 sandbox-sys-call-args = Argumentuak
 safe-mode-title = Probatu modu segurua
 restart-in-safe-mode-label = Berrabiarazi gehigarriak desgaituta…
+clear-startup-cache-title = Saiatu abioko cachea garbitzen
+clear-startup-cache-label = Garbitu abioko cachea…
+startup-cache-dialog-title = Garbitu abioko cachea
 restart-button-label = Berrabiarazi
 
 ## Media titles
@@ -180,6 +183,14 @@
 
 ##
 
+support-third-party-modules-button-open =
+    .title = Ireki fitxategi-kokalekua…
+support-third-party-modules-expand =
+    .title = Erakutsi informazio xehatua
+support-third-party-modules-folder-icon =
+    .title = Ireki fitxategi-kokalekua…
+support-third-party-modules-down-icon =
+    .title = Erakutsi informazio xehatua
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/eu/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/eu/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:35:43.000000000 +0000
+++ firefox-85.0+build1/l10n/eu/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:03:44.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> ostalariak <strong>{ $scheme }</strong> lotura bat ireki nahi du.
 
 ## Permission Dialog
 ## Variables:
@@ -17,6 +9,10 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
+permission-dialog-description = Baimendu gune honi { $scheme } lotura irekitzen?
+permission-dialog-description-file = Baimendu fitxategi honi { $scheme } lotura irekitzen?
+permission-dialog-description-host = Baimendu { $host } ostalariari { $scheme } lotura irekitzen?
+permission-dialog-description-app = Baimendu gune honi { $scheme } lotura { $appName } erabiliz irekitzen?
 
 ## Please keep the emphasis around the hostname and scheme (ie the
 ## `<strong>` HTML tags). Please also keep the hostname as close to the start
diff -Nru firefox-84.0.2+build1/l10n/fa/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/fa/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/fa/browser/browser/appmenu.ftl	2021-01-06 11:35:56.000000000 +0000
+++ firefox-85.0+build1/l10n/fa/browser/browser/appmenu.ftl	2021-01-18 20:03:49.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = پنجره جدید‌
+appmenuitem-new-private-window =
+    .label = پنجره ناشناس جدید
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = بزرگ‌نمایی
 appmenuitem-zoom-reduce =
     .label = کوچک‌نمایی
+appmenuitem-fullscreen =
+    .label = تمام‌ص�حه
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = انجام هم‌گام‌سازی
+appmenuitem-save-page =
+    .label = ذخیرهٔ ص�حه به نام…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = تازه‌ها
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/fa/browser/browser/browser.ftl firefox-85.0+build1/l10n/fa/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/fa/browser/browser/browser.ftl	2021-01-06 11:35:56.000000000 +0000
+++ firefox-85.0+build1/l10n/fa/browser/browser/browser.ftl	2021-01-18 20:03:49.000000000 +0000
@@ -313,6 +313,9 @@
 browser-window-close-button =
     .tooltiptext = بستن
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -409,3 +412,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> کنترل مکان‌نما شما را در دست دارد. برای پس گر�تن کنترل، Esc را �شار دهید.
 pointerlock-warning-no-domain = این سند کنترل مکان‌نما شما را در دست گر�ته است. برای پس گر�تن کنترل، Esc را �شار دهید.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = نمایش همهٔ نشانک‌ها
+bookmarks-recent-bookmarks =
+    .value = به تازگی نشانک‌گذاری شده
+bookmarks-toolbar-chevron =
+    .tooltiptext = نشانک‌های بیشتری نمایش داده شود
+bookmarks-sidebar-content =
+    .aria-label = نشانک‌ها
+bookmarks-menu-button =
+    .label = نشانک‌ها �هرست
+bookmarks-other-bookmarks-menu =
+    .label = نشانک‌‌های دیگر
+bookmarks-mobile-bookmarks-menu =
+    .label = نشانک‌های همراه
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] مخ�ی کردن نوار کناری نشانک‌ها
+           *[other] نمایش نوار ابزار نشانک‌ها
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] مخ�ی کردن نوار ابزار نشانک‌ها
+           *[other] نمایش نوار ابزار نشانک‌ها
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] حذ� منوی نشانک‌ها از نوار ابزار
+           *[other] ا�زودن منوی نشانک‌ها را به نوار ابزار
+        }
+bookmarks-search =
+    .label = جست‌وجوی نشانک‌ها
+bookmarks-tools =
+    .label = ابزار نشانک‌گذاری
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = نوار ابزار نشانک‌ها
+    .accesskey = Ù†
+    .aria-label = نشانک‌ها
+bookmarks-toolbar-menu =
+    .label = نوار ابزار نشانک‌ها
+bookmarks-toolbar-placeholder =
+    .title = موارد نوار ابزار نشانک‌ها
+bookmarks-toolbar-placeholder-button =
+    .label = موارد نوار ابزار نشانک‌ها
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = نشانک ها
+library-bookmarks-bookmark-this-page =
+    .label = نشانک‌گذاری این ص�حه
+library-bookmarks-bookmark-edit =
+    .label = ویرایش این نشانک
+
+## More items
+
+more-menu-go-offline =
+    .label = آ�لاین کار کن
+    .accesskey = Ú©
diff -Nru firefox-84.0.2+build1/l10n/fa/dom/dom/media.ftl firefox-85.0+build1/l10n/fa/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/fa/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/fa/dom/dom/media.ftl	2021-01-18 20:03:49.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/fa/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/fa/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/fa/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/fa/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:49.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ff/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ff/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ff/browser/browser/appmenu.ftl	2021-01-06 11:36:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ff/browser/browser/appmenu.ftl	2021-01-18 20:03:53.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Henorde Hesere
+appmenuitem-new-private-window =
+    .label = Henorde Suturo Hesere
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Lonngo ara
 appmenuitem-zoom-reduce =
     .label = Lonngo woÉ—É—a
+appmenuitem-fullscreen =
+    .label = Njaajeendi Yaynirde
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = SanngoÉ—in Jooni
+appmenuitem-save-page =
+    .label = Danndu Hello e Innde…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Ko HesÉ—i
-
diff -Nru firefox-84.0.2+build1/l10n/ff/browser/browser/browser.ftl firefox-85.0+build1/l10n/ff/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ff/browser/browser/browser.ftl	2021-01-06 11:36:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ff/browser/browser/browser.ftl	2021-01-18 20:03:53.000000000 +0000
@@ -307,6 +307,9 @@
 browser-window-close-button =
     .tooltiptext = Uddu
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -381,3 +384,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Tamde <span data-l10n-name="domain">{ $domain }</span> nana ɗowa doborde maa. Ñoƴƴu Ech ngam ɓamtude ɗowgol.
 pointerlock-warning-no-domain = Ndee fiilannde nana ɗowa doborde maa. Ñoƴƴu Ech ngam ɓamtude ɗowgol.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Hollu Maantore Fof
+bookmarks-recent-bookmarks =
+    .value = Maantoraaɗe ko �ooyaani
+bookmarks-toolbar-chevron =
+    .tooltiptext = Hollu maantore goÉ—É—e
+bookmarks-sidebar-content =
+    .aria-label = Maantore
+bookmarks-menu-button =
+    .label = Dosol Maantore
+bookmarks-other-bookmarks-menu =
+    .label = Maantore GoÉ—É—e
+bookmarks-mobile-bookmarks-menu =
+    .label = Maantore Cinndel
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] SuuÉ— Palal Sawndo Maantore
+           *[other] Hollu Palal Maantore
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] SuuÉ— Palal Maantore
+           *[other] Hollu Palal Maantore
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ittu Dosol Maantore e Palal KuutorÉ—e
+           *[other] �eydu Dosol Maantore to Palal Kuutorɗe
+        }
+bookmarks-search =
+    .label = Yiylo Maantore
+bookmarks-tools =
+    .label = KuutorÉ—e Maantorgol
+bookmarks-toolbar-menu =
+    .label = Palal Maantore
+bookmarks-toolbar-placeholder =
+    .title = Maantorto Teme Palal KuutorÉ—e
+bookmarks-toolbar-placeholder-button =
+    .label = Maantorto Teme Palal KuutorÉ—e
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Maantore
+library-bookmarks-bookmark-this-page =
+    .label = Maantoro Ngoo Hello
+library-bookmarks-bookmark-edit =
+    .label = TaÆ´to Ngol Maantorol
+
+## More items
+
+more-menu-go-offline =
+    .label = Golle e Ceŋtol
+    .accesskey = l
diff -Nru firefox-84.0.2+build1/l10n/ff/dom/dom/media.ftl firefox-85.0+build1/l10n/ff/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ff/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ff/dom/dom/media.ftl	2021-01-18 20:03:53.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ff/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ff/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ff/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ff/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:03:53.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/fi/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/aboutLogins.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/aboutLogins.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -161,7 +161,11 @@
 about-logins-confirm-remove-dialog-title = Poistetaanko tämä kirjautumistieto?
 confirm-delete-dialog-message = Tätä toimintoa ei voi perua.
 about-logins-confirm-remove-dialog-confirm-button = Poista
-about-logins-confirm-remove-all-dialog-confirm-button = Poista kaikki
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Poista
+       *[other] Poista kaikki
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Kyllä, poista tämä kirjautumistieto
@@ -190,6 +194,8 @@
 about-logins-confirm-export-dialog-title = Vie kirjautumistiedot ja salasanat
 about-logins-confirm-export-dialog-message = Salasanasi tallennetaan luettavaan muotoon (esim. hu0n0s4l4s4n4), joten kuka tahansa viedyn tiedoston avaamiseen kykenevä voi nähdä salasanat.
 about-logins-confirm-export-dialog-confirm-button = Vie…
+about-logins-alert-import-title = Tuonti valmis
+about-logins-alert-import-message = Näytä tuonnin yksityiskohtainen erittely
 confirm-discard-changes-dialog-title = Hylätäänkö tallentamattomat muutokset?
 confirm-discard-changes-dialog-message = Kaikki tallentamattomat muutokset menetetään.
 confirm-discard-changes-dialog-confirm-button = Hylkää
@@ -251,3 +257,26 @@
         [macos] CSV-tiedosto
        *[other] CSV-tiedosto
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Tuonti valmis
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Lisättiin uusia kirjautumistietoja:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Päivitettiin nykyisiä kirjautumistietoja:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Löydettiin päällekkäisiä kirjautumistietoja:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ei tuotu)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Virheitä:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ei tuotu)</span>
+    }
+about-logins-import-dialog-done = Valmis
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/fi/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/appmenu.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/appmenu.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Uusi ikkuna
+appmenuitem-new-private-window =
+    .label = Uusi yksityinen ikkuna
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Lähennä
 appmenuitem-zoom-reduce =
     .label = Loitonna
+appmenuitem-fullscreen =
+    .label = Kokoruututila
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synkronoi
+appmenuitem-save-page =
+    .label = Tallenna sivu nimellä…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Mitä uutta
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/fi/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/appMenuNotifications.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/appMenuNotifications.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ei nyt
     .secondarybuttonaccesskey = E
 appmenu-update-restart-message = Nopean uudelleenkäynnistyksen jälkeen { -brand-shorter-name } palauttaa kaikki välilehdet ja ikkunat, jotka eivät olleet yksityisen selauksen tilassa.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ei pysty automaattisesti päivittymään uusimpaan versioon.
+    .buttonlabel = Päivitä { -brand-shorter-name } silti
+    .buttonaccesskey = P
+    .secondarybuttonlabel = Ei nyt
+    .secondarybuttonaccesskey = E
+appmenu-update-other-instance-message = Uusi { -brand-shorter-name }-päivitys on saatavilla, mutta sitä ei voida asentaa, koska toinen { -brand-shorter-name }-kopio on käynnissä. Sulje se ennen päivittämistä tai valitse, että päivitetään silti (jolloin toinen kopio ei välttämättä toimi oikein ennen uudelleenkäynnistystä).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Selvä
     .buttonaccesskey = S
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/browser.ftl firefox-85.0+build1/l10n/fi/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/browser.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/browser.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Sivusto <span data-l10n-name="domain">{ $domain }</span> hallitsee hiiren osoitinta. Voit ottaa osoittimen hallintaasi painamalla Esc.
 pointerlock-warning-no-domain = Tämä sivu hallitsee hiiren osoitinta. Voit ottaa osoittimen hallintaasi painamalla Esc.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Näytä kaikki kirjanmerkit
+bookmarks-recent-bookmarks =
+    .value = Viimeksi lisätyt
+bookmarks-toolbar-chevron =
+    .tooltiptext = Näytä lisää kirjanmerkkejä
+bookmarks-sidebar-content =
+    .aria-label = Kirjanmerkit
+bookmarks-menu-button =
+    .label = Kirjanmerkit-valikko
+bookmarks-other-bookmarks-menu =
+    .label = Muut kirjanmerkit
+bookmarks-mobile-bookmarks-menu =
+    .label = Kannettavan laitteen kirjanmerkit
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Piilota kirjanmerkkien sivupaneeli
+           *[other] Näytä kirjanmerkkien sivupaneeli
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Piilota kirjanmerkkipalkki
+           *[other] Näytä kirjanmerkkipalkki
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Poista Kirjanmerkit-valikko työkalupalkista
+           *[other] Lisää Kirjanmerkit-valikko työkalupalkkiin
+        }
+bookmarks-search =
+    .label = Etsi kirjanmerkeistä
+bookmarks-tools =
+    .label = Kirjanmerkkityökalut
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Kirjanmerkkipalkki
+    .accesskey = K
+    .aria-label = Kirjanmerkit
+bookmarks-toolbar-menu =
+    .label = Kirjanmerkkipalkki
+bookmarks-toolbar-placeholder =
+    .title = Kirjanmerkkipalkin linkit
+bookmarks-toolbar-placeholder-button =
+    .label = Kirjanmerkkipalkin linkit
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Kirjanmerkit
+library-bookmarks-bookmark-this-page =
+    .label = Lisää sivu kirjanmerkkeihin
+library-bookmarks-bookmark-edit =
+    .label = Muokkaa kirjanmerkkiä
+library-recent-activity-label = Viimeisin toiminta
+
+## More items
+
+more-menu-go-offline =
+    .label = Työskentele yhteydettömässä tilassa
+    .accesskey = y
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/fi/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/newtab/asrouter.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/newtab/asrouter.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Kirjoita vähemmän, löydä enemmän osoitepalkilla
 cfr-whatsnew-searchbar-body-topsites = Nyt vain valitse osoitepalkki, niin se näyttää linkkejä ykkössivustoihin.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Suurennuslasin kuvake
 
 ## Picture-in-Picture
@@ -280,3 +283,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Hakuoikotiet osoitepalkissa
 cfr-whatsnew-search-shortcuts-body = Nyt kun kirjoitat hakukoneen ta tietyn sivuston osoitepalkkiin, sininen oikotie ilmestyy alapuolelle hakuehdotuksiin. Valitsemalla sen voit kirjoittaa haun suoraan osoitepalkkiin.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Suojaus haitallisilta superevästeiltä
+cfr-whatsnew-supercookies-body = Sivustot voivat salaa kiinnittää selaimeesi �superevästeen�, joka voi seurata sinua ympäri verkkoa, vaikka olisit poistanut evästeet. { -brand-short-name } sisältää nyt vahvan suojauksen superevästeitä vastaan, jotta niitä ei voida hyödyntää verkkotoimintasi seuraamiseen sivustolta toiselle.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Paremmat kirjanmerkit
+cfr-whatsnew-bookmarking-body = Suosikkisivustojesi seuranta on helpompaa. { -brand-short-name } muistaa nyt haluamasi sijainnin tallennetuille kirjanmerkeille, näyttää kirjanmerkkipalkin oletusarvoisesti uusilla välilehdillä ja antaa sinulle helpon pääsyn muihin kirjanmerkkeihisi työkalupalkin kansion kautta.
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/fi/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/newtab/newtab.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/newtab/newtab.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Uusi välilehti
 newtab-settings-button =
     .title = Muokkaa Uusi välilehti -sivua
+newtab-personalize-button-label = Muokkaa
+    .title = Muokkaa uutta välilehteä
+    .aria-label = Muokkaa uutta välilehteä
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Verkkohaku
     .title = Verkkohaku
     .aria-label = Verkkohaku
+newtab-search-box-text = Verkkohaku
+newtab-search-box-input =
+    .placeholder = Verkkohaku
+    .aria-label = Verkkohaku
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Lisää hakukone
 newtab-topsites-add-topsites-header = Uusi ykkössivusto
+newtab-topsites-add-shortcut-header = Uusi oikotie
 newtab-topsites-edit-topsites-header = Muokkaa ykkössivustoa
+newtab-topsites-edit-shortcut-header = Muokkaa oikotietä
 newtab-topsites-title-label = Otsikko
 newtab-topsites-title-input =
     .placeholder = Kirjoita otsikko
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Hups, jotain meni vikaan tätä sisältöä ladattaessa.
 newtab-error-fallback-refresh-link = Yritä uudestaan päivittämällä sivu.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Oikotiet
+newtab-custom-shortcuts-subtitle = Tallentamasi tai vierailemasi sivustot
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rivi
+       *[other] { $num } riviä
+    }
+newtab-custom-sponsored-sites = Sponsoroidut oikotiet
+newtab-custom-pocket-title = { -pocket-brand-name } suosittelee
+newtab-custom-pocket-subtitle = Poikkeuksellista, valikoitua sisältöä { -pocket-brand-name }-palvelulta, osana { -brand-product-name }-perhettä
+newtab-custom-pocket-sponsored = Sponsoroidut tarinat
+newtab-custom-recent-title = Viimeisin toiminta
+newtab-custom-recent-subtitle = Valikoima viimeisimpiä sivustoja ja sisältöä
+newtab-custom-close-button = Sulje
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Tiedonmuruset
+newtab-custom-snippets-subtitle = Vinkit ja uutiset { -vendor-short-name }lta ja { -brand-product-name }ilta
+newtab-custom-settings = Muokkaa lisää asetuksia
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/places.ftl firefox-85.0+build1/l10n/fi/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/places.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/places.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Alikansio
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Muut kirjanmerkit
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/fi/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/preferences/preferences.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/preferences/preferences.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Useimmin vierailemasi sivustot
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsoroidut ykkössivustot
+home-prefs-shortcuts-header =
+    .label = Oikotiet
+home-prefs-shortcuts-description = Tallentamasi tai vierailemasi sivustot
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsoroidut oikotiet
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Suositukset lähteestä { $provider }
 home-prefs-recommended-by-description-update = Poikkeuksellista sisältöä ympäri internetiä, valikoijana { $provider }
+home-prefs-recommended-by-description-new = Poikkeuksellista, valikoitua sisältöä { $provider }-palvelulta, osana { -brand-product-name }-perhettä
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsoroidut tarinat
 home-prefs-highlights-header =
     .label = Nostot
-home-prefs-recent-activity-header =
-    .label = Viimeisin toiminta
 home-prefs-highlights-description = Valikoima sivustoja, joilla olet käynyt tai jotka olet tallentanut
 home-prefs-highlights-option-visited-pages =
     .label = Vieraillut sivustot
@@ -526,6 +530,9 @@
     .label = Viimeisimmät lataukset
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }iin tallennetut sivut
+home-prefs-recent-activity-header =
+    .label = Viimeisin toiminta
+home-prefs-recent-activity-description = Valikoima viimeisimpiä sivustoja ja sisältöä
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Tiedonmuruset
 home-prefs-snippets-description = Päivitykset { -vendor-short-name }lta ja { -brand-product-name }ilta
+home-prefs-snippets-description-new = Vinkit ja uutiset { -vendor-short-name }lta ja { -brand-product-name }ilta
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = avoimista välilehdistä
     .accesskey = a
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Oikotiet
+    .accesskey = O
 addressbar-locbar-topsites-option =
     .label = ykkössivustoista
     .accesskey = y
+addressbar-locbar-engines-option =
+    .label = Hakukoneet
+    .accesskey = H
 addressbar-suggestions-settings = Muuta hakukoneiden ehdotusten asetuksia
 
 ## Privacy Section - Content Blocking
@@ -1142,14 +1157,14 @@
 ## Privacy Section - HTTPS-Only
 
 httpsonly-header = Vain HTTPS -tila
-httpsonly-description = HTTPS:n avulla { -brand-short-name } muodostaa suojatun ja salatun yhteyden vierailemiisi sivustoihin. Useimmat sivustot tukevat HTTPS:ää, ja jos �Vain HTTPS� -tila on käytössä, { -brand-short-name } muuntaa kaikki yhteydet käyttämään HTTPS:ää.
+httpsonly-description = HTTPS:n avulla { -brand-short-name } muodostaa suojatun ja salatun yhteyden vierailemiisi sivustoihin. Useimmat sivustot tukevat HTTPS:ää, ja jos �Vain HTTPS�-tila on käytössä, { -brand-short-name } muuntaa kaikki yhteydet käyttämään HTTPS:ää.
 httpsonly-learn-more = Lue lisää
 httpsonly-radio-enabled =
-    .label = Käytä �Vain HTTPS� -tilaa kaikissa ikkunoissa
+    .label = Käytä �Vain HTTPS�-tilaa kaikissa ikkunoissa
 httpsonly-radio-enabled-pbm =
-    .label = Käytä �Vain HTTPS� -tilaa vain yksityisissä ikkunoissa
+    .label = Käytä �Vain HTTPS�-tilaa vain yksityisissä ikkunoissa
 httpsonly-radio-disabled =
-    .label = Älä käytä �Vain HTTPS� -tilaa
+    .label = Älä käytä �Vain HTTPS�-tilaa
 
 ## The following strings are used in the Download section of settings
 
diff -Nru firefox-84.0.2+build1/l10n/fi/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/fi/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/fi/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Vain uudessa välilehdessä
     .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Näytä aina
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Älä näytä koskaan
+    .accesskey = Ä
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Näytä vain uudessa välilehdessä
+    .accesskey = h
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Näytä muut kirjanmerkit
     .accesskey = N
diff -Nru firefox-84.0.2+build1/l10n/fi/devtools/client/markers.properties firefox-85.0+build1/l10n/fi/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/fi/devtools/client/markers.properties	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/devtools/client/markers.properties	2021-01-18 20:03:58.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/fi/devtools/client/toolbox.properties firefox-85.0+build1/l10n/fi/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/fi/devtools/client/toolbox.properties	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/devtools/client/toolbox.properties	2021-01-18 20:03:58.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Show Split Console
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/fi/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/fi/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/fi/devtools/client/tooltips.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/devtools/client/tooltips.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> has no effect on internal table elements.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> has no effect on internal table elements except table cells.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Try removing <strong>float</strong> or adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Try setting its <strong>position</strong> property to something other than <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Try setting its <strong>display</strong> property to something else than <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Try setting its <strong>display</strong> property to something else than <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/fi/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/fi/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/fi/dom/chrome/dom/dom.properties	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/dom/chrome/dom/dom.properties	2021-01-18 20:03:58.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input> picker was blocked due to lack of user activation.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe with external protocol was blocked due to lack of user activation, or because not enough time has passed since the last such iframe was loaded.
 MultiplePopupsBlockedNoUserActivation=Opening multiple popups was blocked due to lack of user activation.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Preload of %S was ignored due to unknown “as� or “type� values, or non-matching “media� attribute.
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:03:58.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=vrk;vrk
 
 downloadErrorAlertTitle=Latausvirhe
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Tätä latausta ei voi tallentaa, koska laajennus %S estää sen.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Tätä latausta ei voi tallentaa, koska laajennus estää sen.
 downloadErrorGeneric=Latauksen tallennus ei onnistunut tuntemattomasta syystä.\n\nYritä uudestaan.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/fi/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/fi/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:03:58.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Yhteyden muodostaminen välityspalvelimeen ei onnistunut (Ota yhteys ylläpitoon)
 check_error-2153390069=Palvelimen varmenne on vanhentunut (Tarkista järjestelmän kello ja päivämäärä ja korjaa ne, jos ne ovat väärin, tai ota yhteys järjestelmän ylläpitoon)
 check_error-verification_failed=Päivityspaketti ei läpäissyt virheettömyystestiä (ota yhteys ylläpitoon)
+check_error-move_failed=Päivityksen valmistelu asennusta varten epäonnistui
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/fi/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -184,6 +184,32 @@
 
 ##
 
+support-third-party-modules-title = Kolmannen osapuolen moduulit
+support-third-party-modules-module = Moduulitiedosto
+support-third-party-modules-version = Tiedoston versio
+support-third-party-modules-vendor = Valmistajan tiedot
+support-third-party-modules-occurrence = Esiintymä
+support-third-party-modules-process = Prosessin tyyppi ja tunnus
+support-third-party-modules-thread = Säie
+support-third-party-modules-base = Imagebase-osoite
+support-third-party-modules-uptime = Prosessin käynnissäoloaika (ms)
+support-third-party-modules-duration = Latausaika (ms)
+support-third-party-modules-empty = Kolmansien osapuolten moduuleja ei ladattu.
+support-third-party-modules-no-value = (Ei arvoa)
+support-third-party-modules-button-open =
+    .title = Avaa tiedoston sijainti…
+support-third-party-modules-expand =
+    .title = Näytä yksityiskohtaiset tiedot
+support-third-party-modules-collapse =
+    .title = Supista yksityiskohtaiset tiedot
+support-third-party-modules-unsigned-icon =
+    .title = Tätä moduulia ei ole allekirjoitettu
+support-third-party-modules-folder-icon =
+    .title = Avaa tiedoston sijainti…
+support-third-party-modules-down-icon =
+    .title = Näytä yksityiskohtaiset tiedot
+support-third-party-modules-up-icon =
+    .title = Supista yksityiskohtaiset tiedot
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/fi/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -83,3 +83,10 @@
 # Fission is the name of the feature and should not be translated.
 experimental-features-fission =
     .label = Fission (sivustojen eristäminen)
+# Support for having multiple Picture-in-Picture windows open simultaneously
+experimental-features-multi-pip =
+    .label = Useita kuvia kuvassa -tuki
+experimental-features-multi-pip-description = Kokeellinen tuki, jonka ansiosta useita Kuva kuvassa -ikkunoita voi olla auki samaan aikaan.
+experimental-features-http3 =
+    .label = HTTP/3-yhteyskäytäntö
+experimental-features-http3-description = Kokeellinen tuki HTTP/3-yhteyskäytännölle.
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/fi/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Sivu:
     .accesskey = v
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum }/{ $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Viimeinen sivu
-
+printpreview-homearrow-button =
+    .title = Ensimmäinen sivu
+printpreview-previousarrow-button =
+    .title = Edellinen sivu
+printpreview-nextarrow-button =
+    .title = Seuraava sivu
+printpreview-endarrow-button =
+    .title = Viimeinen sivu
diff -Nru firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/fi/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/fi/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:36:04.000000000 +0000
+++ firefox-85.0+build1/l10n/fi/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:03:58.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = sivulle
+printui-page-custom-range-input =
+    .aria-label = Anna mukautettu sivualue
+    .placeholder = esim. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopioita
 printui-orientation = Suunta
@@ -48,6 +51,7 @@
 printui-options = Valinnat
 printui-headers-footers-checkbox = Tulosta ylä- ja alatunnisteet
 printui-backgrounds-checkbox = Tulosta taustat
+printui-selection-checkbox = Tulosta vain valinta
 printui-color-mode-label = Väritila
 printui-color-mode-color = Väri
 printui-color-mode-bw = Mustavalkoinen
@@ -56,19 +60,29 @@
 printui-margins-min = Pienimmät
 printui-margins-none = Ei reunuksia
 printui-margins-custom = Mukautettu
+printui-margins-custom-inches = Mukautettuna (tuumina)
 printui-margins-custom-top = Ylä
+printui-margins-custom-top-inches = Ylä (tuumina)
 printui-margins-custom-bottom = Ala
+printui-margins-custom-bottom-inches = Ala (tuumina)
 printui-margins-custom-left = Vasen
+printui-margins-custom-left-inches = Vasen (tuumina)
 printui-margins-custom-right = Oikea
+printui-margins-custom-right-inches = Oikea (tuumina)
 printui-system-dialog-link = Tulosta käyttäen järjestelmän tulostusikkunaa…
 printui-primary-button = Tulosta
 printui-primary-button-save = Tallenna
 printui-cancel-button = Peruuta
+printui-close-button = Sulje
 printui-loading = Valmistellaan esikatselua
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Tulostuksen esikatselu
+printui-pages-per-sheet = Sivuja per arkki
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Tulostetaan…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/fr/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/aboutLogins.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/aboutLogins.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Supprimer cet identifiant ?
 confirm-delete-dialog-message = Cette action est irréversible.
 about-logins-confirm-remove-dialog-confirm-button = Supprimer
-about-logins-confirm-remove-all-dialog-confirm-button = Tout supprimer
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Supprimer
+       *[other] Tout supprimer
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Oui, supprimer cet identifiant
@@ -198,6 +202,8 @@
 about-logins-confirm-export-dialog-title = Exporter les identifiants et les mots de passe
 about-logins-confirm-export-dialog-message = Vos mots de passe seront enregistrés sous forme de texte lisible (par exemple, « m0t2passeFaible ») ; ainsi toute personne pouvant ouvrir le fichier exporté pourra les consulter.
 about-logins-confirm-export-dialog-confirm-button = Exporter…
+about-logins-alert-import-title = Importation terminée
+about-logins-alert-import-message = Voir la liste détaillée des importations
 confirm-discard-changes-dialog-title = Ignorer les modifications non enregistrées ?
 confirm-discard-changes-dialog-message = Toutes les modifications non enregistrées seront perdues.
 confirm-discard-changes-dialog-confirm-button = Ignorer
@@ -259,3 +265,30 @@
         [macos] Document CSV
        *[other] Fichier CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importation terminée
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Un nouvel identifiant ajouté</span>
+       *[other] <span>Nouveaux identifiants ajoutés :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Un identifiant existant mis à jour</span>
+       *[other] <span>Identifiants existants mis à jour :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Un identifiant en double trouvé</span> <span data-l10n-name="meta">(non importé)</span>
+       *[other] <span>Identifiants en double trouvés :</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(non importés)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Une erreur</span> <span data-l10n-name="meta">(non importé)</span>
+       *[other] <span>Erreurs :</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">(non importés)</span>
+    }
+about-logins-import-dialog-done = Terminé
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/fr/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/appmenu.ftl	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/appmenu.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nouvelle fenêtre
+appmenuitem-new-private-window =
+    .label = Nouvelle fenêtre privée
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom avant
 appmenuitem-zoom-reduce =
     .label = Zoom arrière
+appmenuitem-fullscreen =
+    .label = Plein écran
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchroniser maintenant
+appmenuitem-save-page =
+    .label = Enregistrer sous…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Nouveautés
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/fr/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/appMenuNotifications.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Plus tard
     .secondarybuttonaccesskey = P
 appmenu-update-restart-message = Après un rapide redémarrage, { -brand-shorter-name } restaurera l’ensemble de vos onglets et fenêtres qui n’étaient pas en mode de navigation privée.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ne peut se mettre automatiquement à jour vers la dernière version.
+    .buttonlabel = Mettre { -brand-shorter-name } à jour quand même
+    .buttonaccesskey = J
+    .secondarybuttonlabel = Plus tard
+    .secondarybuttonaccesskey = P
+appmenu-update-other-instance-message = Une nouvelle mise à jour de { -brand-shorter-name } est disponible, mais elle ne peut pas être installée car une autre copie de { -brand-shorter-name } est en cours d’exécution. Fermez-la pour continuer la mise à jour ou choisissez de mettre à jour quand même (il se peut que l’autre copie ne fonctionne plus correctement tant que vous ne l’aurez pas relancée).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = J’ai compris
     .buttonaccesskey = a
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/browser.ftl firefox-85.0+build1/l10n/fr/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/browser.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/browser.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> contrôle votre pointeur. Appuyez sur Échap pour reprendre le contrôle.
 pointerlock-warning-no-domain = Ce document contrôle votre pointeur. Appuyez sur Échap pour reprendre le contrôle.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Afficher tous les marque-pages
+bookmarks-recent-bookmarks =
+    .value = Marqués récemment
+bookmarks-toolbar-chevron =
+    .tooltiptext = Afficher plus de marque-pages
+bookmarks-sidebar-content =
+    .aria-label = Marque-pages
+bookmarks-menu-button =
+    .label = Menu des marque-pages
+bookmarks-other-bookmarks-menu =
+    .label = Autres marque-pages
+bookmarks-mobile-bookmarks-menu =
+    .label = Marque-pages des appareils mobiles
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Masquer le panneau des marque-pages
+           *[other] Afficher le panneau des marque-pages
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Masquer la barre personnelle
+           *[other] Afficher la barre personnelle
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Retirer le menu de la barre personnelle
+           *[other] Ajouter le menu à la barre d’outils
+        }
+bookmarks-search =
+    .label = Rechercher dans les marque-pages
+bookmarks-tools =
+    .label = Outils de marque-pages
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barre personnelle
+    .accesskey = B
+    .aria-label = Marque-pages
+bookmarks-toolbar-menu =
+    .label = Barre personnelle
+bookmarks-toolbar-placeholder =
+    .title = Éléments de la barre personnelle
+bookmarks-toolbar-placeholder-button =
+    .label = Éléments de la barre personnelle
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marque-pages
+library-bookmarks-bookmark-this-page =
+    .label = Marquer cette page
+library-bookmarks-bookmark-edit =
+    .label = Modifier ce marque-page
+library-recent-activity-label = Activité récente
+
+## More items
+
+more-menu-go-offline =
+    .label = Travailler hors connexion
+    .accesskey = x
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/fr/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/newtab/asrouter.ftl	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -122,6 +122,9 @@
 
 cfr-whatsnew-searchbar-title = Tapez moins, trouvez plus avec la barre d’adresse
 cfr-whatsnew-searchbar-body-topsites = Désormais, sélectionnez simplement la barre d’adresse et un cadre s’agrandira pour vous présenter des liens vers vos sites les plus visités.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icône de loupe
 
 ## Picture-in-Picture
@@ -273,3 +276,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Raccourcis de recherche dans la barre d’adresse
 cfr-whatsnew-search-shortcuts-body = Désormais, lorsque vous saisissez l’adresse d’un moteur de recherche ou d’un site spécifique dans la barre d’adresse, un raccourci bleu apparaît parmi les suggestions de recherche au-dessous. Sélectionnez ce raccourci pour terminer votre recherche directement depuis la barre d’adresse.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protection contre les supercookies malveillants
+cfr-whatsnew-supercookies-body = Des sites web peuvent attacher secrètement un « supercookie » à votre navigateur qui peut vous suivre sur le Web, même après que vous avez effacé les cookies. { -brand-short-name } fournit désormais une protection robuste contre les supercookies pour qu’ils ne soient pas utilisés pour pister vos activités en ligne d’un site à un autre.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = De meilleurs marque-pages
+cfr-whatsnew-bookmarking-body = Il est plus facile de garder trace de vos sites préférés. { -brand-short-name } se souvient désormais de votre emplacement préféré pour les marque-pages enregistrés, affiche la barre personnelle sur les nouveaux onglets par défaut et vous offre un accès facile à vos autres marque-pages grâce à un dossier dans la barre personnelle.
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/fr/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/newtab/newtab.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nouvel onglet
 newtab-settings-button =
     .title = Personnaliser la page Nouvel onglet
+newtab-personalize-button-label = Personnaliser
+    .title = Personnaliser la page de nouvel onglet
+    .aria-label = Personnaliser la page de nouvel onglet
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Rechercher sur le Web
     .title = Rechercher sur le Web
     .aria-label = Rechercher sur le Web
+newtab-search-box-text = Rechercher sur le Web
+newtab-search-box-input =
+    .placeholder = Rechercher sur le Web
+    .aria-label = Rechercher sur le Web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Ajouter un moteur de recherche
 newtab-topsites-add-topsites-header = Nouveau site populaire
+newtab-topsites-add-shortcut-header = Nouveau raccourci
 newtab-topsites-edit-topsites-header = Modifier le site populaire
+newtab-topsites-edit-shortcut-header = Modifier le raccourci
 newtab-topsites-title-label = Titre
 newtab-topsites-title-input =
     .placeholder = Saisir un titre
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Oups, une erreur s’est produite lors du chargement du contenu.
 newtab-error-fallback-refresh-link = Actualisez la page pour réessayer.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Raccourcis
+newtab-custom-shortcuts-subtitle = Sites que vous enregistrez ou visitez
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } ligne
+       *[other] { $num } lignes
+    }
+newtab-custom-sponsored-sites = Raccourcis sponsorisés
+newtab-custom-pocket-title = Recommandé par { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenu exceptionnel sélectionné par { -pocket-brand-name }, membre de la famille { -brand-product-name }
+newtab-custom-pocket-sponsored = Articles sponsorisés
+newtab-custom-recent-title = Activité récente
+newtab-custom-recent-subtitle = Une sélection de sites et de contenus récents
+newtab-custom-close-button = Fermer
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Brèves
+newtab-custom-snippets-subtitle = Astuces et actualité de { -vendor-short-name } et { -brand-product-name }
+newtab-custom-settings = Gérer plus de paramètres
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/places.ftl firefox-85.0+build1/l10n/fr/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/places.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/places.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Sous-dossier
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Autres marque-pages
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/fr/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/preferences/preferences.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Les sites que vous visitez le plus
 home-prefs-topsites-by-option-sponsored =
     .label = Sites populaires sponsorisés
+home-prefs-shortcuts-header =
+    .label = Raccourcis
+home-prefs-shortcuts-description = Sites que vous enregistrez ou visitez
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Raccourcis sponsorisés
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recommandations par { $provider }
 home-prefs-recommended-by-description-update = Contenu exceptionnel déniché sur le Web par { $provider }
+home-prefs-recommended-by-description-new = Contenu exceptionnel sélectionné par { $provider }, membre de la famille { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Articles sponsorisés
 home-prefs-highlights-header =
     .label = Éléments-clés
-home-prefs-recent-activity-header =
-    .label = Activité récente
 home-prefs-highlights-description = Une sélection de sites que vous avez sauvegardés ou visités
 home-prefs-highlights-option-visited-pages =
     .label = Pages visitées
@@ -526,6 +530,9 @@
     .label = Dernier téléchargement
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pages enregistrées dans { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Activité récente
+home-prefs-recent-activity-description = Une sélection de sites et de contenus récents
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Brèves
 home-prefs-snippets-description = Actualité de { -vendor-short-name } et { -brand-product-name }
+home-prefs-snippets-description-new = Astuces et actualité de { -vendor-short-name } et { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Les onglets ouverts
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Raccourcis
+    .accesskey = R
 addressbar-locbar-topsites-option =
     .label = Les sites les plus visités
     .accesskey = v
+addressbar-locbar-engines-option =
+    .label = Les moteurs de recherche
+    .accesskey = r
 addressbar-suggestions-settings = Modifier les préférences pour les suggestions de recherche
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/fr/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/fr/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/fr/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Seulement pour les nouveaux onglets
     .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Toujours afficher
+    .accesskey = T
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Ne jamais afficher
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Afficher seulement sur la page de nouvel onglet
+    .accesskey = A
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Afficher les autres marque-pages
     .accesskey = m
diff -Nru firefox-84.0.2+build1/l10n/fr/devtools/client/filterwidget.properties firefox-85.0+build1/l10n/fr/devtools/client/filterwidget.properties
--- firefox-84.0.2+build1/l10n/fr/devtools/client/filterwidget.properties	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/devtools/client/filterwidget.properties	2021-01-18 20:04:09.000000000 +0000
@@ -15,7 +15,7 @@
 # This string is displayed when preset's list is empty
 emptyPresetList=Vous n’avez enregistré aucun préréglage. \
 Vous pouvez ajouter des préréglages de filtres en choisissant un nom puis en les enregistrant. \
-Les préréglages sont facilement accessibles et réuitilisables.
+Les préréglages sont facilement accessibles et réutilisables.
 
 # LOCALIZATION NOTE (addUsingList):
 # This string is displayed under [emptyFilterList] when filter's
diff -Nru firefox-84.0.2+build1/l10n/fr/devtools/client/toolbox.properties firefox-85.0+build1/l10n/fr/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/fr/devtools/client/toolbox.properties	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/devtools/client/toolbox.properties	2021-01-18 20:04:09.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Ouvrir le fichier dans l’éditeur de style
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Fermer les outils de développement
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Afficher la console scindée
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/fr/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/fr/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/fr/devtools/client/tooltips.ftl	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/devtools/client/tooltips.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -46,6 +46,8 @@
 inactive-css-not-display-block-on-floated-fix = Essayez de retirer <strong>float</strong> ou d’ajouter <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Essayez de définir sa propriété <strong>position</strong> avec une valeur différente de <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Essayez d’ajouter <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Essayez d’affecter à la propriété <strong>display</strong> une valeur autre que <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Essayez d’affecter à la propriété <strong>display</strong> une valeur autre que <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Essayez de définir sa propriété <strong>outline-style</strong> à une valeur autre qu’<strong>auto</strong> ou <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/fr/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/fr/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/fr/dom/chrome/dom/dom.properties	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/dom/chrome/dom/dom.properties	2021-01-18 20:04:09.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Le sélecteur <input> a été bloqué faute d’activation par l’utilisateur.
 ExternalProtocolFrameBlockedNoUserActivation=Un iframe avec un protocole externe a été bloqué faute d’activation par l’utilisateur, ou parce que pas assez de temps ne s’est écoulé depuis que le dernier iframe semblable a été chargé.
 MultiplePopupsBlockedNoUserActivation=L’ouverture de plusieurs popups a été bloquée faute d’activation par l’utilisateur.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Le préchargement de %S a été ignoré en raison des valeurs inconnues d’« as » ou « type », ou d’un attribut « media » qui ne correspond pas.
diff -Nru firefox-84.0.2+build1/l10n/fr/dom/chrome/security/security.properties firefox-85.0+build1/l10n/fr/dom/chrome/security/security.properties
--- firefox-84.0.2+build1/l10n/fr/dom/chrome/security/security.properties	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/dom/chrome/security/security.properties	2021-01-18 20:04:09.000000000 +0000
@@ -151,4 +151,4 @@
 # LOCALIZATION NOTE: Please do not localize "DocumentFragment". It's the name of an API.
 SanitizerRcvdNoInput = Reçu vide ou aucune entrée. Retour d’un documentFragment vide.
 # LOCALIZATION NOTE: "Sanitizer" is the name of the API. Please do not localize.
-SanitizerOptionsDiscarded = Les options du constructeur Sanitizer ne sont pas encore prises en charge. Veuillez noter qu’il s’agit d'un comportement expérimental.
+SanitizerOptionsDiscarded = Les options du constructeur Sanitizer ne sont pas encore prises en charge. Veuillez noter qu’il s’agit d’un comportement expérimental.
diff -Nru firefox-84.0.2+build1/l10n/fr/netwerk/necko.properties firefox-85.0+build1/l10n/fr/netwerk/necko.properties
--- firefox-84.0.2+build1/l10n/fr/netwerk/necko.properties	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/netwerk/necko.properties	2021-01-18 20:04:09.000000000 +0000
@@ -63,7 +63,7 @@
 # LOCALIZATION NOTE(CookieLaxForced): %1$S is the cookie name. Do not localize "sameSite", "lax" and "sameSite=lax".
 CookieLaxForced=Le cookie « %1$S » a la stratégie « sameSite » définie sur « lax » car il n’a pas d’attribut « sameSite », et « sameSite=lax » est la valeur par défaut de cet attribut.
 # LOCALIZATION NOTE(CookieLaxForcedForBeta): %1$S is the cookie name. %2$S is a URL. Do not localize "sameSite", "lax" and "sameSite=lax", "sameSite=none".
-CookieLaxForcedForBeta=Le cookie « %1$S » n’a pas de valeur d’attribut « sameSite » appropriée. Bientôt, les cookies sans attribut « sameSite » ou avec une valeur invalide seront traités comme « lax ». Cela signifie que le cookie ne sera plus envoyé dans des contextes tiers. Si votre application dépend de la disponibilité de ce cookie dans de tels contextes, veuillez lui ajouter l’attribut « sameSite=none ». Pour en savoir plus sur l'attribut « sameSite », consultez %2$S
+CookieLaxForcedForBeta=Le cookie « %1$S » n’a pas de valeur d’attribut « sameSite » appropriée. Bientôt, les cookies sans attribut « sameSite » ou avec une valeur invalide seront traités comme « lax ». Cela signifie que le cookie ne sera plus envoyé dans des contextes tiers. Si votre application dépend de la disponibilité de ce cookie dans de tels contextes, veuillez lui ajouter l’attribut « sameSite=none ». Pour en savoir plus sur l’attribut « sameSite », consultez %2$S
 # LOCALIZATION NOTE: %1$S is cookie name. Do not localize "sameSite", "lax", "strict" and "none"
 CookieSameSiteValueInvalid=Valeur « sameSite » non valide pour le cookie « %1$S ». Les valeurs prises en charge sont : « lax », « strict », « none ».
 
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/fr/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/fr/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:04:09.000000000 +0000
@@ -172,7 +172,6 @@
 configuration_element_not_provided = Non fourni
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = Préférences WebRTC définies par l’utilisateur ou l’utilisatrice
-
 # Section header for estimated bandwidths of WebRTC media flows
 bandwidth_stats_heading = Bande passante estimée
 # The ID of the MediaStreamTrack
@@ -184,6 +183,7 @@
 # Maximum number of bytes per second that will be padding zeros at the ends of packets
 max_padding_bytes_sec = Bourrage maximal (octets/s)
 # The amount of time inserted between packets to keep them spaced out
+pacer_delay_ms = Délai d’espacement (ms)
 # The amount of time it takes for a packet to travel from the local machine to the remote machine,
 # and then have a packet return
 round_trip_time_ms = RTT ms
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/fr/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/fr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:09.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=j;j
 
 downloadErrorAlertTitle=Erreur de téléchargement
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Ce téléchargement ne peut pas être enregistré car il est bloqué par %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Ce téléchargement ne peut pas être enregistré car il est bloqué par une extension.
 downloadErrorGeneric=Le téléchargement ne peut pas être enregistré car une erreur inconnue est survenue.\n\nVeuillez essayer à nouveau.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Quelques secondes restantes
 timeUnknown2=Temps restant indéterminé
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=Ressource %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/fr/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/fr/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:04:09.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Connexion au serveur proxy refusée
 check_error-2153390069=Le certificat serveur a expiré (veuillez ajuster aux date et heure correctes votre horloge système le cas échéant)
 check_error-verification_failed=L’intégrité de la mise à jour n’a pas pu être vérifiée
+check_error-move_failed=Échec de la préparation de la mise à jour pour installation
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/fr/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:37:13.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -51,6 +51,17 @@
 
 ## Details within processes
 
+# Single-line summary of threads
+# Variables:
+#    $number (Number) The number of threads in the process. Typically larger
+#                     than 30. We don't expect to ever have processes with less
+#                     than 5 threads.
+about-processes-thread-summary = Threads ({ $number })
+# Thread details
+# Variables:
+#   $name (String) The name assigned to the thread.
+#   $tid (String) The thread id of this thread, assigned by the OS.
+about-processes-thread-name = Thread { $tid } : { $name }
 # Tab
 # Variables:
 #   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/fr/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -188,6 +188,30 @@
 
 ##
 
+support-third-party-modules-title = Modules tiers
+support-third-party-modules-module = Fichier de module
+support-third-party-modules-version = Version du fichier
+support-third-party-modules-vendor = Informations sur l’éditeur
+support-third-party-modules-occurrence = Occurrences
+support-third-party-modules-process = Type et identifiant du processus
+support-third-party-modules-thread = Fil d’exécution
+support-third-party-modules-duration = Durée de chargement (ms)
+support-third-party-modules-empty = Aucun module tiers n’a été chargé.
+support-third-party-modules-no-value = (Aucune valeur)
+support-third-party-modules-button-open =
+    .title = Ouvrir l’emplacement du fichier…
+support-third-party-modules-expand =
+    .title = Afficher des informations détaillées
+support-third-party-modules-collapse =
+    .title = Masquer les informations détaillées
+support-third-party-modules-unsigned-icon =
+    .title = Ce module n’est pas signé
+support-third-party-modules-folder-icon =
+    .title = Ouvrir l’emplacement du fichier…
+support-third-party-modules-down-icon =
+    .title = Afficher les informations détaillées
+support-third-party-modules-up-icon =
+    .title = Masquer les informations détaillées
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/fr/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -95,3 +95,6 @@
 experimental-features-multi-pip =
     .label = Prise en charge de plusieurs incrustations vidéo
 experimental-features-multi-pip-description = Prise en charge expérimentale de l’ouverture simultanée de plusieurs incrustations vidéo.
+experimental-features-http3 =
+    .label = Protocole HTTP/3
+experimental-features-http3-description = Prise en charge expérimentale du protocole HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/fr/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Page :
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } sur { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Dernière page
-
+printpreview-homearrow-button =
+    .title = Première page
+printpreview-previousarrow-button =
+    .title = Page précédente
+printpreview-nextarrow-button =
+    .title = Page suivante
+printpreview-endarrow-button =
+    .title = Dernière page
diff -Nru firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/fr/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/fr/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:37:14.000000000 +0000
+++ firefox-85.0+build1/l10n/fr/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:09.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = à
+printui-page-custom-range-input =
+    .aria-label = Saisir un intervalle de pages personnalisé
+    .placeholder = par ex. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copies
 printui-orientation = Orientation
@@ -48,6 +51,7 @@
 printui-options = Options
 printui-headers-footers-checkbox = Imprimer les en-têtes et pieds de page
 printui-backgrounds-checkbox = Imprimer les arrière-plans
+printui-selection-checkbox = Imprimer seulement la sélection
 printui-color-mode-label = Mode de couleur
 printui-color-mode-color = Couleur
 printui-color-mode-bw = Noir et blanc
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Aucune
 printui-margins-custom = Personnalisées
+printui-margins-custom-inches = Personnalisées (pouces)
 printui-margins-custom-top = Haut de page
+printui-margins-custom-top-inches = Haut (pouces)
 printui-margins-custom-bottom = Bas de page
+printui-margins-custom-bottom-inches = Bas (pouces)
 printui-margins-custom-left = Gauche
+printui-margins-custom-left-inches = Gauche (pouces)
 printui-margins-custom-right = Droite
+printui-margins-custom-right-inches = Droite (pouces)
 printui-system-dialog-link = Imprimer en utilisant la boîte de dialogue système…
 printui-primary-button = Imprimer
 printui-primary-button-save = Enregistrer
 printui-cancel-button = Annuler
+printui-close-button = Fermer
 printui-loading = Préparation de l’aperçu
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Aperçu avant impression
+printui-pages-per-sheet = Pages par feuille
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Impression…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/aboutLogins.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/aboutLogins.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Dizze oanmelding fuortsmite?
 confirm-delete-dialog-message = Dizze aksje kin net ûngedien makke wurde.
 about-logins-confirm-remove-dialog-confirm-button = Fuortsmite
-about-logins-confirm-remove-all-dialog-confirm-button = Alle fuortsmite
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Fuortsmite
+        [one] Fuortsmite
+       *[other] Alle fuortsmite
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, dizze oanmelding fuortsmite
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Oanmeldingen en wachtwurden eksportearje
 about-logins-confirm-export-dialog-message = Jo wachtwurden wurde bewarre as lêsbere tekst (bygelyks BadP@ssw0rd), dus elkenien dy't it eksportearre bestân iepenje kin, kin se besjen.
 about-logins-confirm-export-dialog-confirm-button = Eksportearje…
+about-logins-alert-import-title = Ymportearjen foltôge
+about-logins-alert-import-message = Detaillearre ymportgearfetting besjen
 confirm-discard-changes-dialog-title = Dizze wizigingen ferwerpe?
 confirm-discard-changes-dialog-message = Alle net-bewarre wizigingen gean ferlern.
 confirm-discard-changes-dialog-confirm-button = Ferwerpe
@@ -262,3 +269,30 @@
         [macos] CSV-dokumint
        *[other] CSV-bestân
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Ymportearjen foltôge
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nije oanmelding tafoege:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nije oanmeldingen tafoege:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Besteande oanmelding bywurke:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Besteande oanmeldingen bywurke:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Dûbele oanmelding fûn:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(net ymportearre)</span>
+       *[other] <span>Dûbele oanmeldingen fûn:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(net ymportearre)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Flater:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(net ymportearre)</span>
+       *[other] <span>Flaters:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(net ymportearre)</span>
+    }
+about-logins-import-dialog-done = Dien
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/appmenu.ftl	2021-01-06 11:38:32.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/appmenu.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nij finster
+appmenuitem-new-private-window =
+    .label = Nij priveefinster
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Ynzoome
 appmenuitem-zoom-reduce =
     .label = Utzoome
+appmenuitem-fullscreen =
+    .label = Folslein skerm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = No syngronisearje
+appmenuitem-save-page =
+    .label = Side bewarje as…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Wat is der nij
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/appMenuNotifications.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = No net
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Nij in flugge werstart, sil { -brand-shorter-name } al jo iepen ljepblêden en finsters dy't net yn priveemodus binne werstelle.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kin net automatysk nei de nijste ferzje bywurkje.
+    .buttonlabel = { -brand-shorter-name } dochs bywurkje
+    .buttonaccesskey = b
+    .secondarybuttonlabel = j
+    .secondarybuttonaccesskey = w
+appmenu-update-other-instance-message = Der is in nije fernijing foar { -brand-shorter-name } beskikber, mar dizze kin net ynstallearre wurde omdat der in oar eksimplaar fan { -brand-shorter-name } útfierd wurdt. Slút dizze om de fernijing troch te fieren, of kies derfoar om dochs by te wurkjen (it oare eksimplaar wurket mooglik net goed oant jo dit opnij starte).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Oké, begrepen
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/browser.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/browser.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/browser.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> hat de kontrôle oer jo oanwizer. Druk op Esc om de kontrôle wer oer te nimmen.
 pointerlock-warning-no-domain = Dit dokumint hat de kontrôle oer jo oanwizer. Druk op Esc om de kontrôle wer oer te nimmen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Alle blêdwizers toane
+bookmarks-recent-bookmarks =
+    .value = Resint oanmakke blêdwizers
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mear blêdwizers toane
+bookmarks-sidebar-content =
+    .aria-label = Blêdwizers
+bookmarks-menu-button =
+    .label = Blêdwizermenu
+bookmarks-other-bookmarks-menu =
+    .label = Oare blêdwizers
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobyl-blêdwizers
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Blêdwizersydbalke ferstopje
+           *[other] Blêdwizersydbalke werjaan
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Blêdwizerarkbalke ferstopje
+           *[other] Blêdwizerarkbalke werjaan
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Blêdwizers fan arkbalke fuortsmite
+           *[other] Blêdwizers oan arkbalke tafoegje
+        }
+bookmarks-search =
+    .label = Blêdwizers trochsykje
+bookmarks-tools =
+    .label = Blêdwizerark
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Blêdwizerarkbalke
+    .accesskey = B
+    .aria-label = Blêdwizers
+bookmarks-toolbar-menu =
+    .label = Blêdwizerarkbalke
+bookmarks-toolbar-placeholder =
+    .title = Blêdwizerarkbalke-ûnderdiel
+bookmarks-toolbar-placeholder-button =
+    .label = Blêdwizerarkbalke-ûnderdiel
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Blêdwizers
+library-bookmarks-bookmark-this-page =
+    .label = Blêdwizer foar dizze side meitsje
+library-bookmarks-bookmark-edit =
+    .label = Dizze blêdwizer bewurkje
+library-recent-activity-label = Resinte aktiviteit
+
+## More items
+
+more-menu-go-offline =
+    .label = Offline wurkje
+    .accesskey = w
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/newtab/asrouter.ftl	2021-01-06 11:38:32.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Typ minder, fyn mear mei de adresbalke
 cfr-whatsnew-searchbar-body-topsites = Selektearje no ienfâldichwei de adresbalke en in fek sil útwreidzje mei fluchkeppelingen nei jo topwebsites.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Fergrutglêspiktogram
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Sykfluchkeppelingen yn de adresbalke
 cfr-whatsnew-search-shortcuts-body = Wannear't jo yn it ferfolch in sykmasine of spesifike website yn de adresbalke type, ferskynt in blauwe fluchkeppeling yn de syksuggestjes dêrûnder. Selektearje dy fluchkeppeling om jo sykopdracht streekrjocht fan de sykbalke út te foltôgjen.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Beskerming tsjin kwea-aardige supercookies
+cfr-whatsnew-supercookies-body = Websites kinne stikem in ‘supercookie’ oan jo browser keppelje, dat jo op it ynternet folgje kin, sels neidat jo jo cookies wiske hawwe. { -brand-short-name } biedt no krêftige beskerming tsjin supercookies, sadat se net brûkt wurde kinne om jo online aktiviteiten op ferskate websites te folgjen.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Better blêdwizers meitsje
+cfr-whatsnew-bookmarking-body = It is makliker om jo favorite websites by te hâlden. { -brand-short-name } ûnthâldt no jo foarkarslokaasje foar bewarre blêdwizers, toant de blêdwizerarkbalke standert op nije ljepblêden en jout jo ienfâldige tagong ta de rest fan jo blêdwizers fia in arkbalkemap.
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/newtab/newtab.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nij ljepblêd
 newtab-settings-button =
     .title = Jo side foar nije ljepblêden oanpasse
+newtab-personalize-button-label = Personalisearje
+    .title = Nij ljepblêd personalisearje
+    .aria-label = Nij ljepblêd personalisearje
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Sykje op it web
     .title = Sykje op it web
     .aria-label = Sykje op it web
+newtab-search-box-text = Sykje op it web
+newtab-search-box-input =
+    .placeholder = Sykje op it web
+    .aria-label = Sykje op it web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Sykmasine tafoegje
 newtab-topsites-add-topsites-header = Nije topwebsite
+newtab-topsites-add-shortcut-header = Nije fluchkeppeling
 newtab-topsites-edit-topsites-header = Topwebsite tafoegje
+newtab-topsites-edit-shortcut-header = Fluchkeppeling bewurkje
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Titel ynfiere
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oeps, der is wat misgien by it laden fan dizze ynhâld.
 newtab-error-fallback-refresh-link = Fernij de side om it opnij te probearjen.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Fluchkeppelingen
+newtab-custom-shortcuts-subtitle = Bewarre of besochte websites
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rige
+       *[other] { $num } rigen
+    }
+newtab-custom-sponsored-sites = Sponsore fluchkeppelingen
+newtab-custom-pocket-title = Oanrekommandearre troch { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Utsûnderlike ynhâld, gearstald troch { -pocket-brand-name }, ûnderdiel fan de { -brand-product-name }-famylje
+newtab-custom-pocket-sponsored = Sponsore ferhalen
+newtab-custom-recent-title = Resinte aktiviteit
+newtab-custom-recent-subtitle = In seleksje fan resinte websites en ynhâld
+newtab-custom-close-button = Slute
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippets
+newtab-custom-snippets-subtitle = Tips en nijs fan { -vendor-short-name } en { -brand-product-name }
+newtab-custom-settings = Mear ynstellingen beheare
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/places.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/places.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/places.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Submap
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Oare blêdwizers
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/preferences/preferences.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = De troch jo meast besochte websites
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsore topwebsites
+home-prefs-shortcuts-header =
+    .label = Fluchkeppelingen
+home-prefs-shortcuts-description = Bewarre of besochte websites
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsore fluchkeppelingen
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Oanrekommandearre troch { $provider }
 home-prefs-recommended-by-description-update = Utsûnderlike ynhâld fan it hiele ynternet, gearstald troch { $provider }
+home-prefs-recommended-by-description-new = Utsûnderlike ynhâld, gearstald troch { $provider }, ûnderdiel fan de { -brand-product-name }-famylje
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsore ferhalen
 home-prefs-highlights-header =
     .label = Hichtepunten
-home-prefs-recent-activity-header =
-    .label = Resinte aktiviteit
 home-prefs-highlights-description = In seleksje fan websites dy't jo bewarre of besocht hawwe
 home-prefs-highlights-option-visited-pages =
     .label = Besochte siden
@@ -526,6 +530,9 @@
     .label = Meast resinte download
 home-prefs-highlights-option-saved-to-pocket =
     .label = Siden bewarre nei { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Resinte aktiviteit
+home-prefs-recent-activity-description = In seleksje fan resinte websites en ynhâld
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Koarte ynformaasje
 home-prefs-snippets-description = Fernijingen fan { -vendor-short-name } en { -brand-product-name }
+home-prefs-snippets-description-new = Tips en nijs fan { -vendor-short-name } en { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Iepen ljepblêden
     .accesskey = I
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Fluchkeppelingen
+    .accesskey = F
 addressbar-locbar-topsites-option =
     .label = Topwebsites
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Sykmasinen
+    .accesskey = y
 addressbar-suggestions-settings = Foarkarren foar sykmasinesuggestjes wizigje
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/fy-NL/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Allinnich op nij ljepblêd
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Altyd toane
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nea toane
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Allinnich op nij ljepblêd toane
+    .accesskey = t
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Oare blêdwizers toane
     .accesskey = t
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/devtools/client/markers.properties firefox-85.0+build1/l10n/fy-NL/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/fy-NL/devtools/client/markers.properties	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/devtools/client/markers.properties	2021-01-18 20:04:15.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Net folle ûnthâld
 marker.gcreason.label.CC_WAITING=Oftwongen troch sykluskolleksje
+marker.gcreason.label.CC_FINISHED=Syklussamling foltôge
 marker.gcreason.label.CC_FORCED=Oftwongen troch sykluskolleksje
 marker.gcreason.label.LOAD_END=Side laden foltôge
 marker.gcreason.label.PAGE_HIDE=Ferpleatst nei eftergrûn
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/devtools/client/toolbox.properties firefox-85.0+build1/l10n/fy-NL/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/fy-NL/devtools/client/toolbox.properties	2021-01-06 11:38:32.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/devtools/client/toolbox.properties	2021-01-18 20:04:15.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Untwikkelark slute
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Splitste console toane
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/fy-NL/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/devtools/client/tooltips.ftl	2021-01-06 11:38:32.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/devtools/client/tooltips.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> hat gjin effekt op dit elemint omdat it gjin posisjonearre elemint is.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> hat gjin effekt op dit elemint, omdat <strong>overflow:hidden</strong> net ynsteld is.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> hat gjin effekt op dit elemint, omdat <strong>outline-style</strong> <strong>auto</strong> of <strong>none</strong> is.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> hat gjin effekt op ynterne tabeleleminten.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> hat gjin effekt op ynterne tabeleleminten, útsein op tabelsellen.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Probearje <strong>float</strong> fuort te smiten of <strong>display:block</strong> ta te foegjen. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Probearje de eigenskip <strong>position</strong> op wat oars as <strong>static</strong> yn te stellen. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Probearje <strong>overflow:hidden</ strong> ta te foegjen. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Probearje de property <strong>display</strong> op wat oars as <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> of <strong>table-footer-group</strong> yn te stellen. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Probearje de property <strong>display</strong> op wat oars as <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> of <strong>table-footer-group</strong> yn te stellen. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Probearje de eigenskip <strong>outline-style</strong> op wat oars as <strong>auto</strong> of <strong>none</strong> yn te stellen. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/fy-NL/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/fy-NL/dom/chrome/dom/dom.properties	2021-01-06 11:38:32.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/dom/chrome/dom/dom.properties	2021-01-18 20:04:15.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input>-kiezer blokkearre fanwegen gebrek oan aktivearring troch de brûker.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe mei ekstern protokol is blokkearre fanwegen gebrek oan aktivearring troch de brûker, of omdat der sûnt de lêste kear dat soksoarte iframe laden is net genôch tiid foarbygean is .
 MultiplePopupsBlockedNoUserActivation=It iepenjen fan meardere pop-ups is blokkearre fanwegen gebrek oan aktivearring troch de brûker.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Yn it foar laden fan %S is negearre fanwegen ûnbekende wearden ‘as’ of ‘type’, of in net-oerienkommend attribút ‘media’.
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/fy-NL/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:15.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Downloadflater
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=De download kin net bewarre wurde, omdat dizze troch %S blokkearre wurdt.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=De download kin net bewarre wurde, omdat dizze troch in útwreiding blokkearre wurdt.
 downloadErrorGeneric=It downloaden bestân kin net bewarre wurde, omdat der in ûnbekende flater bard is.\n\nProbearje it asjebleaft opnij.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/fy-NL/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:04:15.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Ferbining mei proxyserver wegere (Nim kontakt op mei jo systeembehearder)
 check_error-2153390069=Serversertifikaat is ferrûn (Pas asjebleaft jo systeemklok oan mei de korrekte datum en tiid as it ferkeard is of nim kontakt op mei jo systeembehearder)
 check_error-verification_failed=De yntegriteit fan de fernijing koe net fêststeld wurde (Nim kontakt op mei jo systeembehearder)
+check_error-move_failed=It tarieden fan de fernijing foar ynstallaasje is mislearre
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -90,7 +90,7 @@
 ##                   of `duration-unit-*`.
 
 # Common case.
-about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "prosint") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
 # Special case: data is not available yet.
 about-processes-cpu-user-and-kernel-not-ready = (wurdt mjitten)
 # Special case: process or thread is currently idle.
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Modulen fan tredden
+support-third-party-modules-module = Modulebestân
+support-third-party-modules-version = Bestânsferzje
+support-third-party-modules-vendor = Leveransiersynfo
+support-third-party-modules-occurrence = Oantal
+support-third-party-modules-process = Prosestype & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Imagebase-adres
+support-third-party-modules-uptime = Proses-uptime (ms)
+support-third-party-modules-duration = Laadtiid (ms)
+support-third-party-modules-empty = Der binne gjin modulen fan tredden laden.
+support-third-party-modules-no-value = (Gjin wearde)
+support-third-party-modules-button-open =
+    .title = Bestânslokaasje iepenje…
+support-third-party-modules-expand =
+    .title = Detailynformaasje toane
+support-third-party-modules-collapse =
+    .title = Detailynformaasje ynklappe
+support-third-party-modules-unsigned-icon =
+    .title = Dizze module is net ûndertekene
+support-third-party-modules-folder-icon =
+    .title = Bestânslokaasje iepenje…
+support-third-party-modules-down-icon =
+    .title = Detailynformaasje toane
+support-third-party-modules-up-icon =
+    .title = Detailynformaasje ynklappe
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Stipe foar mear Picture-in-picture
 experimental-features-multi-pip-description = Eksperimintele stipe foar lyktidich iepenjen fan mear Picture-in-Picturefinsters.
+experimental-features-http3 =
+    .label = HTTP/3-protokol
+experimental-features-http3-description = Eksperimintele stipe foar it HTTP/3-protokol.
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Side:
     .accesskey = d
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } fan { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Lêste side
-
+printpreview-homearrow-button =
+    .title = Earste side
+printpreview-previousarrow-button =
+    .title = Foarige side
+printpreview-nextarrow-button =
+    .title = Folgjende side
+printpreview-endarrow-button =
+    .title = Lêste side
diff -Nru firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/fy-NL/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:38:33.000000000 +0000
+++ firefox-85.0+build1/l10n/fy-NL/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:15.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = oant
+printui-page-custom-range-input =
+    .aria-label = Oanpast sideberik ynfiere
+    .placeholder = byg. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopyen
 printui-orientation = Oriïntaasje
@@ -48,6 +51,7 @@
 printui-options = Opsjes
 printui-headers-footers-checkbox = Kop- en foetteksten ôfdrukke
 printui-backgrounds-checkbox = Eftergrûnen ôfdrukke
+printui-selection-checkbox = Allinnich seleksje ôfdrukke
 printui-color-mode-label = Kleurmodus
 printui-color-mode-color = Kleur
 printui-color-mode-bw = Swart-wyt
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Gjin
 printui-margins-custom = Oanpast
+printui-margins-custom-inches = Oanpast (inches)
 printui-margins-custom-top = Boppe
+printui-margins-custom-top-inches = Boppeside (inches)
 printui-margins-custom-bottom = Under
+printui-margins-custom-bottom-inches = Underside (inches)
 printui-margins-custom-left = Links
+printui-margins-custom-left-inches = Links (inches)
 printui-margins-custom-right = Rjochts
+printui-margins-custom-right-inches = Rjochts (inches)
 printui-system-dialog-link = Ofdrukke fia it systeemdialoochfienster…
 printui-primary-button = Ofdrukke
 printui-primary-button-save = Bewarje
 printui-cancel-button = Annulearje
+printui-close-button = Slute
 printui-loading = Foarbyld tariede
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Ofdrukfoarbyld
+printui-pages-per-sheet = Siden per blêd
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Ofdrukke…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ga-IE/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ga-IE/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ga-IE/browser/browser/appmenu.ftl	2021-01-06 11:38:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ga-IE/browser/browser/appmenu.ftl	2021-01-18 20:04:20.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Fuinneog Nua
+appmenuitem-new-private-window =
+    .label = Fuinneog Nua Phríobháideach
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zúmáil isteach
 appmenuitem-zoom-reduce =
     .label = Zúmáil amach
+appmenuitem-fullscreen =
+    .label = Lánscáileán
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sioncronaigh Anois
+appmenuitem-save-page =
+    .label = Sábháil an Leathanach Mar…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Gnéithe Nua
-
diff -Nru firefox-84.0.2+build1/l10n/ga-IE/browser/browser/browser.ftl firefox-85.0+build1/l10n/ga-IE/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ga-IE/browser/browser/browser.ftl	2021-01-06 11:38:37.000000000 +0000
+++ firefox-85.0+build1/l10n/ga-IE/browser/browser/browser.ftl	2021-01-18 20:04:20.000000000 +0000
@@ -244,6 +244,9 @@
 browser-window-close-button =
     .tooltiptext = Dún
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -315,3 +318,52 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Tá <span data-l10n-name="domain">{ $domain }</span> i gceannas ar do chúrsóir faoi láthair. Brúigh Esc chun dul i gceannas air arís.
 pointerlock-warning-no-domain = Tá an cháipéis seo i gceannas ar do chúrsóir faoi láthair. Brúigh Esc chun dul i gceannas air arís.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Taispeáin Gach Leabharmharc
+bookmarks-recent-bookmarks =
+    .value = Leabharmharc leo le déanaí
+bookmarks-toolbar-chevron =
+    .tooltiptext = Tuilleadh leabharmharcanna
+bookmarks-sidebar-content =
+    .aria-label = Leabharmharcanna
+bookmarks-menu-button =
+    .label = Roghchlár na Leabharmharcanna
+bookmarks-other-bookmarks-menu =
+    .label = Leabharmharcanna Eile
+bookmarks-mobile-bookmarks-menu =
+    .label = Leabharmharcanna Soghluaiste
+bookmarks-search =
+    .label = Cuardaigh Leabharmharcanna
+bookmarks-tools =
+    .label = Uirlisí Leabharmharcála
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra Leabharmharc
+    .accesskey = B
+    .aria-label = Leabharmharcanna
+bookmarks-toolbar-menu =
+    .label = Barra Leabharmharc
+bookmarks-toolbar-placeholder =
+    .title = Rudaí ar an Bharra Leabharmharc
+bookmarks-toolbar-placeholder-button =
+    .label = Rudaí ar an Bharra Leabharmharc
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Leabharmharcanna
+library-bookmarks-bookmark-this-page =
+    .label = Cruthaigh Leabharmharc don Leathanach Seo
+library-bookmarks-bookmark-edit =
+    .label = Cuir an Leabharmharc Seo in Eagar
+
+## More items
+
+more-menu-go-offline =
+    .label = Oibrigh As Líne
+    .accesskey = b
diff -Nru firefox-84.0.2+build1/l10n/gd/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/gd/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/gd/browser/browser/appmenu.ftl	2021-01-06 11:38:41.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/browser/browser/appmenu.ftl	2021-01-18 20:04:24.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Uinneag ùr
+appmenuitem-new-private-window =
+    .label = Uinneag phrìobhaideach ùr
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Sùm a-steach
 appmenuitem-zoom-reduce =
     .label = Sùm a-mach
+appmenuitem-fullscreen =
+    .label = Làn-sgrìn
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sioncronaich an-dràsta
+appmenuitem-save-page =
+    .label = Sàbhail an duilleag mar…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Na tha ùr
-
diff -Nru firefox-84.0.2+build1/l10n/gd/browser/browser/browser.ftl firefox-85.0+build1/l10n/gd/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/gd/browser/browser/browser.ftl	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/browser/browser/browser.ftl	2021-01-18 20:04:24.000000000 +0000
@@ -313,6 +313,9 @@
 browser-window-close-button =
     .tooltiptext = Dùin
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -384,3 +387,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = Tha smachd aig <span data-l10n-name="domain">{ $domain }</span> air an tomhaire agad. Brùth Esc airson an smachd a thilleadh dhut fhèin.
 pointerlock-warning-no-domain = Tha smachd aig an sgrìobhainn seo air an tomhaire agad. Brùth Esc airson an smachd a thilleadh dhut fhèin.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Seall a h-uile comharra-lìn
+bookmarks-recent-bookmarks =
+    .value = Comharran-lìn a rinn thu o chionn goirid
+bookmarks-toolbar-chevron =
+    .tooltiptext = Tuilleadh chomharran-lìn
+bookmarks-sidebar-content =
+    .aria-label = Comharran-lìn
+bookmarks-menu-button =
+    .label = Clàr-taice nan comharra-lìn
+bookmarks-other-bookmarks-menu =
+    .label = Comharran-lìn eile
+bookmarks-mobile-bookmarks-menu =
+    .label = Comharran-lìn mobile
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Falaich bàr-taoibh nan comharra-lìn
+           *[other] Seall bàr-taoibh nan comharra-lìn
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Falaich bàr-inneal nan comharra-lìn
+           *[other] Seall bàr nan comharra-lìn
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Thoir air falbh clàr-taice nan comharra-lìn on bhàr-inneal
+           *[other] Cuir clàr-taice nan comharra-lìn ris a’ bhàr-inneal
+        }
+bookmarks-search =
+    .label = Lorg sna comharran-lìn
+bookmarks-tools =
+    .label = Innealan nan comharra-lìn
+bookmarks-toolbar-menu =
+    .label = Bàr nan comharra-lìn
+bookmarks-toolbar-placeholder =
+    .title = Rudan air bàr nan comharra-lìn
+bookmarks-toolbar-placeholder-button =
+    .label = Rudan air bàr nan comharra-lìn
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Comharran-lìn
+library-bookmarks-bookmark-this-page =
+    .label = Cruthaich comharra-lìn dhan duilleag seo
+library-bookmarks-bookmark-edit =
+    .label = Deasaich an comharra-lìn seo
+
+## More items
+
+more-menu-go-offline =
+    .label = Obraich far loidhne
+    .accesskey = O
diff -Nru firefox-84.0.2+build1/l10n/gd/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/gd/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/gd/browser/pdfviewer/viewer.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/browser/pdfviewer/viewer.properties	2021-01-18 20:04:24.000000000 +0000
@@ -148,6 +148,7 @@
 findbar.title=Lorg san sgrìobhainn
 findbar_label=Lorg
 
+# LOCALIZATION NOTE (page_canvas): "{{page}}" will be replaced by the page number.
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
@@ -226,6 +227,9 @@
 missing_file_error=Faidhle PDF a tha a dhìth.
 unexpected_response_error=Freagairt on fhrithealaiche ris nach robh dùil.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+
 # 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).
@@ -233,7 +237,7 @@
 text_annotation_type.alt=[Nòtachadh {{type}}]
 password_label=Cuir a-steach am facal-faire gus am faidhle PDF seo fhosgladh.
 password_invalid=Tha am facal-faire cearr. Nach fheuch thu ris a-rithist?
-password_ok=Ceart ma-tha
+password_ok=Ceart ma-thà
 password_cancel=Sguir dheth
 
 printing_not_supported=Rabhadh: Chan eil am brabhsair seo a' cur làn-taic ri clò-bhualadh.
diff -Nru firefox-84.0.2+build1/l10n/gd/chat/imtooltip.properties firefox-85.0+build1/l10n/gd/chat/imtooltip.properties
--- firefox-84.0.2+build1/l10n/gd/chat/imtooltip.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/chat/imtooltip.properties	2021-01-18 20:04:24.000000000 +0000
@@ -5,3 +5,6 @@
 buddy.username=Ainm-cleachdaiche
 buddy.account=Cunntas
 contact.tags=Tagaichean
+
+otr.tag=Staid OTR
+message.status=Teachdaireachd air a chrioptachadh
diff -Nru firefox-84.0.2+build1/l10n/gd/chat/matrix.properties firefox-85.0+build1/l10n/gd/chat/matrix.properties
--- firefox-84.0.2+build1/l10n/gd/chat/matrix.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/chat/matrix.properties	2021-01-18 20:04:24.000000000 +0000
@@ -15,3 +15,12 @@
 #   character of the string should be used as the access key for this
 #   field.
 chatRoomField.room=Seòma_r
+
+# LOCALIZATION NOTE (tooltip.*):
+#    These are the descriptions given in a tooltip with information received
+#    from the "User" object.
+# The human readable name of the user.
+tooltip.displayName=Ainm-taisbeanaidh
+# %S is the timespan elapsed since the last activity.
+tooltip.timespan=%S air ais
+tooltip.lastActive=A’ ghnìomhachd mu dheireadh
diff -Nru firefox-84.0.2+build1/l10n/gd/chat/twitter.properties firefox-85.0+build1/l10n/gd/chat/twitter.properties
--- firefox-84.0.2+build1/l10n/gd/chat/twitter.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/chat/twitter.properties	2021-01-18 20:04:24.000000000 +0000
@@ -118,3 +118,5 @@
 
 command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: Lean ri cleachdaiche(an).
 command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: Na lean ri cleachdaiche(an) tuilleadh.
+
+twitter.disabled=Chan eil taic ri Twitter tuilleadh a chionn ’s gun do chuir Twitter am pròtacal sruthaidh aca à comas.
diff -Nru firefox-84.0.2+build1/l10n/gd/dom/dom/media.ftl firefox-85.0+build1/l10n/gd/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/gd/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/dom/dom/media.ftl	2021-01-18 20:04:24.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/commonDialogs.properties firefox-85.0+build1/l10n/gd/toolkit/chrome/global/commonDialogs.properties
--- firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/commonDialogs.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/toolkit/chrome/global/commonDialogs.properties	2021-01-18 20:04:24.000000000 +0000
@@ -6,8 +6,10 @@
 Confirm=Dearbhaich
 ConfirmCheck=Dearbhaich
 Prompt=Smèid orm
+# LOCALIZATION NOTE - %S is brandFullName
+# LOCALIZATION NOTE - %S is brandFullName
 Select=Tagh
-OK=Ceart ma-tha
+OK=Ceart ma-thà
 Cancel=Sguir dheth
 Yes=&Tha
 No=&Chan eil
diff -Nru firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/dialogOverlay.dtd firefox-85.0+build1/l10n/gd/toolkit/chrome/global/dialogOverlay.dtd
--- firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/dialogOverlay.dtd	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/toolkit/chrome/global/dialogOverlay.dtd	2021-01-18 20:04:24.000000000 +0000
@@ -3,8 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- WARNING!!! This file is obsoleted by the dialog.xml widget -->
-<!-- OK Cancel Buttons -->
-
 
-<!ENTITY okButton.label      "Ceart ma-tha">
+<!-- OK Cancel Buttons -->
+<!ENTITY okButton.label      "Ceart ma-thà">
 <!ENTITY cancelButton.label  "Sguir dheth">
diff -Nru firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/dialog.properties firefox-85.0+build1/l10n/gd/toolkit/chrome/global/dialog.properties
--- firefox-84.0.2+build1/l10n/gd/toolkit/chrome/global/dialog.properties	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/toolkit/chrome/global/dialog.properties	2021-01-18 20:04:24.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/.
 
-button-accept=Ceart ma-tha
+button-accept=Ceart ma-thà
 button-cancel=Sguir dheth
 button-help=Cobhair
 button-disclosure=Barrachd fiosrachaidh
diff -Nru firefox-84.0.2+build1/l10n/gd/toolkit/crashreporter/crashreporter.ini firefox-85.0+build1/l10n/gd/toolkit/crashreporter/crashreporter.ini
--- firefox-84.0.2+build1/l10n/gd/toolkit/crashreporter/crashreporter.ini	2021-01-06 11:38:42.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/toolkit/crashreporter/crashreporter.ini	2021-01-18 20:04:24.000000000 +0000
@@ -1,29 +1,30 @@
-; 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 file is in the UTF-8 encoding
+# 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 file is in the UTF-8 encoding
 [Strings]
-; LOCALIZATION NOTE (isRTL):
-; Leave this entry empty unless your language requires right-to-left layout,
-; for example like Arabic, Hebrew, Persian. If your language needs RTL, please
-; use the untranslated English word "yes" as value
+# LOCALIZATION NOTE (isRTL):
+# Leave this entry empty unless your language requires right-to-left layout,
+# for example like Arabic, Hebrew, Persian. If your language needs RTL, please
+# use the untranslated English word "yes" as value
 isRTL=
 CrashReporterTitle=Aithrisiche nan tuislidhean
-; LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name.  (i.e. "Mozilla")
+# LOCALIZATION NOTE (CrashReporterVendorTitle): %s is replaced with the vendor name.  (i.e. "Mozilla")
 CrashReporterVendorTitle=Aithrisiche nan tuislidhean %s
-; LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
+# LOCALIZATION NOTE (CrashReporterErrorText): %s is replaced with another string containing detailed information.
 CrashReporterErrorText=Bha duilgheadas aig an aplacaid is thuislich e.\n\nGu mì-fhortanach chan urrainn do dh'aithrisiche nan tuislidhean aithisg a chur mun tuisleadh seo.\n\nMion-fhiosrachadh: %s
-; LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information.  These two substitutions can not be reordered!
+# LOCALIZATION NOTE (CrashReporterProductErrorText2): The first %s is replaced with the product name (i.e. "Firefox"), the second is replaced with another string containing detailed information.  These two substitutions can not be reordered!
 CrashReporterProductErrorText2=Bha duilgheadas aig %s is thuislich e.\n\nGu mì-fhortanach chan urrainn do dh'aithrisiche nan tuislidhean aithisg a chur mun tuisleadh seo.\n\nMion-fhiosrachadh: %s
 CrashReporterSorry=Tha sinn duilich
-; LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
+# LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
 CrashReporterDescriptionText2=Bha duilgheadas aig %s is thuislich e.\n\n'S urrainn dhut aithisg tuislidh a chur thugainn gus ar cuideachadh le rannsachadh is càradh an duilgheadais.
 CrashReporterDefault=Nochdaidh an aplacaid seo an cois tuislidh gus aithisg mun duilgheadas a chur gu reiceadair na h-aplacaid.  Cha bu chòir dhut a thòiseachadh leis fhèin.
 Details=Mion-fhiosrachadh…
 ViewReportTitle=Susbaint na h-aithisge
 CommentGrayText=Cuir beachd ris (chithear na beachdan gu poblach)
 ExtraReportInfo=Tha fiosrachadh teicnigeach san aithisg seo cuideachd a thaobh cor na h-aplacaid nuair a thuislich e.
-; LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
+# LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
 CheckSendReport=Leig fios mun tuisleadh seo do %s gus an urrainn dhaibh a chàradh
 CheckIncludeURL=Cuir ann seòladh na duilleige far an robh mi
 CheckAllowEmail=Leig le %s fios a chur dhomh mun aithisg seo
@@ -33,15 +34,16 @@
 ReportSubmitSuccess=Chaidh an aithisg a chur gu soirbheachail!
 ReportSubmitFailed=Bha duilgheadas ann le cur a-null na h-aithisge agad.
 ReportResubmit=A' cur a-null nan aithisgean a dh'fhàillig roimhe…
-; LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
+# LOCALIZATION NOTE (Quit2): The %s is replaced with the product name.
 Quit2=Dùin %s
-; LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
+# LOCALIZATION NOTE (Restart): The %s is replaced with the product name.
 Restart=Ath-thòisich %s
-Ok=Ceart ma-tha
+Ok=Ceart ma-thà
 Close=Dùin
-; LOCALIZATION NOTE (CrashID): The %s is replaced with the Crash ID from the server, which is a string like abc12345-6789-0abc-def1-23456abcdef1
+
+# LOCALIZATION NOTE (CrashID): The %s is replaced with the Crash ID from the server, which is a string like abc12345-6789-0abc-def1-23456abcdef1
 CrashID=ID an tuislidh: %s
-; LOCALIZATION NOTE (CrashDetailsURL): The %s is replaced with a URL that the user can visit to view the crash details.
+# LOCALIZATION NOTE (CrashDetailsURL): The %s is replaced with a URL that the user can visit to view the crash details.
 CrashDetailsURL=Chì thu mion-fhiosrachadh an tuislidh seo aig %s
 ErrorBadArguments=Thug an aplacaid seachad argamaid mhì-dhligheach.
 ErrorExtraFileExists=Cha do dh'fhàg an aplacaid faidhle dàta aplacaid.
@@ -53,5 +55,6 @@
 ErrorNoServerURL=Cha do shònraich an aplacaid frithealaiche airson aithisgean tuislidh.
 ErrorNoSettingsPath=Cha do ghabh roghainnean aithrisiche nan tuislidhean a lorg.
 ErrorCreateDumpDir=Cha b' urrainn dhuinn pasgan nan dumpadh ri dhèanamh a chruthachadh.
-; LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
+# LOCALIZATION NOTE (ErrorEndOfLife): The %s is replaced with the product name.
 ErrorEndOfLife=Chan eil taic ann tuilleadh dhan tionndadh seo de %s. Chan eilear a' gabhail ri aithisgean nan tuislidhean air sgàth sin. Saoil an ùraich thu e gu tionndadh a tha taic ann riutha?
+
diff -Nru firefox-84.0.2+build1/l10n/gd/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/gd/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/gd/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/gd/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:24.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/gl/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/aboutLogins.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/aboutLogins.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -29,6 +29,7 @@
 about-logins-menu-menuitem-import-from-another-browser = Importar desde outro navegador…
 about-logins-menu-menuitem-import-from-a-file = Importar dun ficheiro ...
 about-logins-menu-menuitem-export-logins = Exportar sesións ...
+about-logins-menu-menuitem-remove-all-logins = Eliminar todos os inicios de sesión ...
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] Opcións
@@ -168,6 +169,40 @@
 about-logins-confirm-remove-dialog-title = Eliminar esta identificación?
 confirm-delete-dialog-message = Non é posíbel desfacer esta acción.
 about-logins-confirm-remove-dialog-confirm-button = Eliminar
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Retirar
+        [one] Retirar
+       *[other] Retirar todo
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Si, retirar este inicio de sesión
+        [one] Si, retirar este inicio de sesión
+       *[other] Si, retirar estes inicios de sesión
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Retirar { $count } inicio de sesión?
+       *[other] Retirar { $count } inicios de sesión?
+    }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Isto eliminará o inicio de sesión que gardou en { -brand-short-name } e as alertas de ataques que aparezan aquí. Non poderá desfacer esta acción.
+        [one] Isto eliminará o inicio de sesión que gardou en { -brand-short-name } e as alertas de ataques que aparezan aquí. Non poderá desfacer esta acción.
+       *[other] Isto eliminará os inicios de sesión que gardou en { -brand-short-name } e as alertas de ataques que aparezan aquí. Non poderá desfacer esta acción.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Retirar { $count } inicio de sesión de todos os dispositivos?
+       *[other] Retirar { $count } inicios de sesión de todos os dispositivos?
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Isto elimina o inicio de sesión que gardou en { -brand-short-name } en todos os dispositivos sincronizados co seu { -fxaccount-brand-name }. Isto tamén elimina as alertas de ataques que aparecen aquí. Non poderá desfacer esta acción.
+        [one] Isto elimina todos os inicios  de sesión que gardou en { -brand-short-name } en todos os dispositivos sincronizados co seu { -fxaccount-brand-name }. Isto tamén elimina as alertas de ataques que aparecen aquí. Non poderá desfacer esta acción.
+       *[other] Isto elimina todos os inicios de sesión que gardou en { -brand-short-name } en todos os dispositivos sincronizados co seu { -fxaccount-brand-name }. Isto tamén elimina as alertas de ataques que aparecen aquí. Non poderá desfacer esta acción.
+    }
 about-logins-confirm-export-dialog-title = Exportar inicios de sesión e contrasinais
 about-logins-confirm-export-dialog-message = Os seus contrasinais gardaranse como texto lexible (por exemplo, ConTR@sinaLmaL0) para que calquera que poida abrir o ficheiro exportado poida velos.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/gl/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/appmenu.ftl	2021-01-06 11:38:48.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/appmenu.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nova xanela
+appmenuitem-new-private-window =
+    .label = Nova xanela privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Ampliar
 appmenuitem-zoom-reduce =
     .label = Reducir
+appmenuitem-fullscreen =
+    .label = Pantalla completa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar agora
+appmenuitem-save-page =
+    .label = Gardar páxina como…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/gl/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/appMenuNotifications.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Agora non
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Despois dun reinicio rápido, { -brand-shorter-name } restaurará todas as súas xanelas e lapelas abertas que non están no modo de navegación privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } non pode actualizarse automaticamente para a versión máis recente.
+    .buttonlabel = Actualizar { -brand-shorter-name } igualmente
+    .buttonaccesskey = A
+    .secondarybuttonlabel = Agora non
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Está dispoñíbel unha nova actualización de { -brand-shorter-name }, pero non se pode instalar porque se está a executar outra copia de { -brand-shorter-name }. Pécheo para continuar coa actualización ou escolla actualizalo de calquera xeito (é posíbel que a outra copia non funcione correctamente até que o reinicie).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Entendín
     .buttonaccesskey = O
@@ -51,6 +58,18 @@
     .buttonaccesskey = m
     .secondarybuttonlabel = Desactivar a extensión
     .secondarybuttonaccesskey = D
+appmenu-new-tab-controlled-changes =
+    .label = Cambiouse a súa nova lapela.
+    .buttonlabel = Manter cambios
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Xestionar lapelas novas
+    .secondarybuttonaccesskey = X
+appmenu-homepage-controlled-changes =
+    .label = Cambiouse a súa páxina de inicio.
+    .buttonlabel = Manter cambios
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Xestionar cambios
+    .secondarybuttonaccesskey = X
 appmenu-tab-hide-controlled =
     .label = Acceder as súas lapelas agochadas
     .buttonlabel = Manter as lapelas agochadas
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/browser.ftl firefox-85.0+build1/l10n/gl/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/browser.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/browser.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -301,6 +301,8 @@
 identity-https-only-info-no-upgrade = Non foi posíbel anovar a conexión desde HTTP.
 identity-permissions =
     .value = Permisos
+identity-permissions-storage-access-header = Rastrexadores entre sitios
+identity-permissions-storage-access-hint = Estas partes poden usar cookies e datos de sitios entre sitios mentres estea neste sitio.
 identity-permissions-reload-hint = Pode ser preciso recargar a páxina para que os cambios teñan efecto.
 identity-permissions-empty = Non lle concedeu ningún permiso especial a este sitio.
 identity-clear-site-data =
@@ -346,9 +348,10 @@
 
 ## Bookmarks toolbar items
 
-browser-import-button =
+browser-import-button2 =
     .label = Importar marcadores…
-    .tooltiptext = Copiar marcadores desde outro navegador ao { -brand-short-name }.
+    .tooltiptext = Importar marcadores desde outro navegador para { -brand-short-name }.
+bookmarks-toolbar-empty-message = Para un acceso rápido, coloque os seus marcadores aquí na barra de ferramentas de marcadores. <a data-l10n-name="manage-bookmarks">Xestionar marcadores.. </a>
 
 ## WebRTC Pop-up notifications
 
@@ -500,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ten o control do punteiro. Prema Esc para recuperar o control.
 pointerlock-warning-no-domain = Este documento ten o control do punteiro. Prema Esc para recuperar o control.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Amosar todos os marcadores
+bookmarks-recent-bookmarks =
+    .value = Marcadores máis recentes
+bookmarks-toolbar-chevron =
+    .tooltiptext = Amosar máis marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menú dos marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Outros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores do móbil
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Agochar o panel dos marcadores
+           *[other] Ver o panel de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Agochar a barra dos marcadores
+           *[other] Ver a barra de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Retirar o menú dos marcadores da barra de ferramentas
+           *[other] Engadir o menú dos marcadores á barra de ferramentas
+        }
+bookmarks-search =
+    .label = Buscar nos marcadores
+bookmarks-tools =
+    .label = Ferramentas dos marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de marcadores
+    .accesskey = m
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Elementos da barra de marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos da barra de marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Marcar esta páxina
+library-bookmarks-bookmark-edit =
+    .label = Editar este marcador
+
+## More items
+
+more-menu-go-offline =
+    .label = Traballar sen conexión
+    .accesskey = T
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/browserSets.ftl firefox-85.0+build1/l10n/gl/browser/browser/browserSets.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/browserSets.ftl	2021-01-06 11:38:48.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/browserSets.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -93,6 +93,11 @@
     .key = R
 picture-in-picture-toggle-shortcut-mac =
     .key = ]
+# Pick the key that is commonly present
+# in your locale keyboards above the
+# `picture-in-picture-toggle-shortcut-mac` key.
+picture-in-picture-toggle-shortcut-mac-alt =
+    .key = { "}" }
 picture-in-picture-toggle-shortcut =
     .key = ]
 # Pick the key that is commonly present
@@ -114,8 +119,18 @@
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
+bookmark-show-library-shortcut =
+    .key = O
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
 bookmark-show-sidebar-shortcut =
     .key = b
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-toolbar-shortcut =
+    .key = B
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/gl/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/newtab/asrouter.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Escriba menos, atope máis coa barra de enderezos
 cfr-whatsnew-searchbar-body-topsites = Agora, só ten que seleccionar a barra de enderezos e unha caixa expandirase con ligazóns aos seus sitios máis importantes.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icona da lupa
 
 ## Picture-in-Picture
@@ -258,6 +261,8 @@
 
 ## Fission Experiment Message
 
+cfr-doorhanger-fission-body-approved = A súa privacidade importa. { -brand-short-name } agora illa ou probas de sitios web entre si, o que dificulta que os piratas informáticos rouben contrasinais, números de tarxetas de crédito e outra información confidencial.
+cfr-doorhanger-fission-header = Illamento do sitio
 cfr-doorhanger-fission-primary-button = Entendín
     .accesskey = E
 cfr-doorhanger-fission-secondary-button = Máis información
@@ -272,4 +277,10 @@
 ## What's new: Media controls message
 
 cfr-whatsnew-media-keys-header = Máis controis multimedia
+cfr-whatsnew-media-keys-body = Reproduza e poña en pausa o son ou o vídeo desde o teclado ou os auriculares, o que facilita o control de medios desde outra lapela, programa ou mesmo cando o ordenador está bloqueado. Tamén pode moverse entre pistas usando as teclas de avance e atrás.
 cfr-whatsnew-media-keys-button = Saiba como
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Buscar accesos directos na barra de enderezos
+cfr-whatsnew-search-shortcuts-body = Agora, cando escribir un motor de busca ou un sitio específico na barra de enderezos, aparecerá un atallo azul nas suxestións de busca debaixo. Seleccione ese atallo para completar a busca directamente na barra de enderezos.
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/gl/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/newtab/newtab.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nova lapela
 newtab-settings-button =
     .title = Personalice a páxina de nova lapela
+newtab-personalize-button-label = Personalizar
+    .title = personalizar lapela nova
+    .aria-label = personalizar lapela nova
 
 ## Search box component.
 
@@ -171,6 +174,7 @@
 
 newtab-section-header-topsites = Sitios favoritos
 newtab-section-header-highlights = Destacados
+newtab-section-header-recent-activity = Actividade recente
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recomendado por { $provider }
@@ -206,3 +210,27 @@
 
 newtab-error-fallback-info = Vaites, produciuse un erro ao cargar este contido.
 newtab-error-fallback-refresh-link = Actualice a páxina para tentalo de novo.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Atallos
+newtab-custom-shortcuts-subtitle = Sitios gardados ou visitados
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } fila
+       *[other] { $num } filas
+    }
+newtab-custom-sponsored-sites = Atallos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contido excepcional patrocinado por { -pocket-brand-name }, parte da familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Historias patrocinadas
+newtab-custom-recent-title = Actividade recente
+newtab-custom-recent-subtitle = Unha selección de sitios e contido recentes
+newtab-custom-close-button = Pechar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Fragmentos
+newtab-custom-snippets-subtitle = Consellos e novas de { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Xestionar máis axustes
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/places.ftl firefox-85.0+build1/l10n/gl/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/places.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/places.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subcartafol
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Outros marcadores
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/gl/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/preferences/preferences.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -52,6 +52,9 @@
 pane-experimental-subtitle = Proceda con precaución
 pane-experimental-search-results-header = { -brand-short-name } Experimentos: siga con precaución
 pane-experimental-description = O cambio de preferencias avanzadas de configuración pode afectar ao rendemento ou á seguridade de { -brand-short-name }.
+pane-experimental-reset =
+    .label = Restaurar predeterminados
+    .accesskey = R
 help-button-label = Asistencia do { -brand-short-name }
 addons-button-label = Extensións e temas
 focus-search =
@@ -497,6 +500,11 @@
 home-prefs-topsites-description = Os sitios que máis visita
 home-prefs-topsites-by-option-sponsored =
     .label = Principais sitios patrocinados
+home-prefs-shortcuts-header =
+    .label = Atallos
+home-prefs-shortcuts-description = Sitios gardados ou visitados
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Atallos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -504,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Contido excepcional de toda a web, inspeccionado por { $provider }
+home-prefs-recommended-by-description-new = Contido excepcional patrocinado por { $provider }, parte da familia { -brand-product-name }
 
 ##
 
@@ -521,6 +530,9 @@
     .label = A descarga máis recente
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páxinas gardadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Actividade recente
+home-prefs-recent-activity-description = Unha selección de sitios e contido recentes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -528,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Fragmentos
 home-prefs-snippets-description = Actualizacións de { -vendor-short-name } e { -brand-product-name }
+home-prefs-snippets-description-new = Consellos e novas de { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -881,6 +894,10 @@
     .label = Rastrexadores entre sitios
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Rastreadores entre sitios e de redes sociais
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Cookies de rastrexo entre sitios — inclúe cookies de medios sociais
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Cookies entre sitios — inclúe cookies de medios sociais
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Rastrexadores entre sitios e redes sociais e illar as cookies restantes
 sitedata-option-block-unvisited =
@@ -918,6 +935,9 @@
 addressbar-locbar-topsites-option =
     .label = Sitios favoritos
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Motores de busca
+    .accesskey = M
 addressbar-suggestions-settings = Cambiar as preferencias relacionadas coas suxestións do buscador
 
 ## Privacy Section - Content Blocking
@@ -925,6 +945,7 @@
 content-blocking-enhanced-tracking-protection = Protección avanzada de rastreo
 content-blocking-section-top-level-description = Os rastrexadores seguen a súa presenza para recoller información sobre os seus hábitos e intereses de navegación. { -brand-short-name } bloquea moitos destes rastrexadores e outros scripts maliciosos.
 content-blocking-learn-more = Máis información
+content-blocking-fpi-incompatibility-warning = Está a usar Illamento de Primeiras Partes (First Party Isolation, FPI), que anula algúns dos axustes de cookies de { -brand-short-name }.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
@@ -946,6 +967,7 @@
 content-blocking-etp-strict-desc = Unha protección máis forte, pero pode atrapallar algúns sitios ou contido.
 content-blocking-etp-custom-desc = Escolla os rastreadores e scripts que bloquear.
 content-blocking-private-windows = Tracexamento de contido en xanelas privadas
+content-blocking-cross-site-cookies = Rastrexadores entre sitios
 content-blocking-cross-site-tracking-cookies = Cookies de seguimento entre sitios
 content-blocking-cross-site-tracking-cookies-plus-isolate = Cookies de rastrexo entre sitios e illar as cookies restantes
 content-blocking-social-media-trackers = Rastrexadores de redes sociais
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/gl/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -19,6 +19,8 @@
 safeb-blocked-malware-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software malicioso</a>. Pode <a data-l10n-name='report_detection'>informar dun problema na detección</a> ou <a data-l10n-name='ignore_warning_link'>ignorar o risco</a> e visitar este sitio inseguro.
 safeb-blocked-malware-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software malicioso</a>. Pode <a data-l10n-name='report_detection'>informar dun problema na detección</a>.
 safeb-blocked-malware-page-learn-more = Obteña máis información sobre contido web prexudicial, incluídos virus e outro malware, e como protexer o seu computador en <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Obteña máis información sobre protección contra suplantación de identidade e malware do { -brand-short-name } en <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software malicioso</a>. Pode <a data-l10n-name='ignore_warning_link'>ignorar o risco</a> e visitar este sitio inseguro.
+safeb-blocked-malware-page-error-desc-no-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software malicioso</a>.
 safeb-blocked-malware-page-learn-more-sumo = Saiba máis sobre a protección do { -brand-short-name } fronte ao phishing e o malware en <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software prexudicial</a>. Pode <a data-l10n-name='ignore_warning_link'>ignorar o risco</a> e visitar este sitio inseguro.
 safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> foi <a data-l10n-name='error_desc_link'>denunciado por conter software prexudicial</a>.
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/gl/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/gl/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -61,3 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Só nas lapelas novas
     .accesskey = l
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Mostrar sempre
+    .accesskey = s
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Non mostrar nunca
+    .accesskey = n
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar só en lapelas novas
+    .accesskey = l
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Mostrar outros marcadores
+    .accesskey = M
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/gl/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/gl/browser/chrome/browser/browser.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/chrome/browser/browser.properties	2021-01-18 20:04:28.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=W
 getUserMedia.pickWindowOrScreen.label = Seleccionar xanela ou pantalla
 getUserMedia.shareEntireScreen.label = Pantalla completa
+getUserMedia.sharePipeWirePortal.label = Usar a configuración do sistema operativo
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/gl/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/gl/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/gl/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:04:28.000000000 +0000
@@ -32,7 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Este ficheiro contén un virus ou malware.
 blockedPotentiallyUnwanted=Este ficheiro pode danar o seu computador.
-blockedInsecure = Non foi posíbel descargar este arquivo con seguridade.
+blockedPotentiallyInsecure=Ficheiro non descargado: risco potencial de seguranza.
 blockedUncommon2=Este ficheiro non se soe descargar.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -42,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
@@ -52,6 +52,7 @@
 unblockTypeMalware=Este ficheiro contén un virus ou outro malware que danará o seu equipo.
 unblockTypePotentiallyUnwanted2=Este ficheiro pretende ser unha descarga útil, pero pode provocar cambios inesperados nos seus programas e configuracións.
 unblockTypeUncommon2=Este ficheiro non se descarga normalmente e pode que non sexa seguro abrilo. Pode conter un virus ou facer cambios inesperados aos seus programas e configuracións.
+unblockInsecure=O ficheiro usa unha conexión insegura. Pode que fose corrompido ou alterado durante o proceso de descarga.
 unblockTip2=Pode buscar unha fonte alternativa de descarga ou tentalo de novo máis tarde.
 unblockButtonOpen=Abrir
 unblockButtonUnblock=Permitir a descarga
diff -Nru firefox-84.0.2+build1/l10n/gl/devtools/client/accessibility.properties firefox-85.0+build1/l10n/gl/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/gl/devtools/client/accessibility.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/devtools/client/accessibility.properties	2021-01-18 20:04:28.000000000 +0000
@@ -298,3 +298,13 @@
 # LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
 # in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
 accessibility.simulation.achromatopsia=Acromatopsia (sen cores)
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.label): A title text for a checkbox label
+# in the accessibility panel toolbar that turns on/off the overlay of focusable elements in their
+# tabbing order.
+accessibility.toolbar.displayTabbingOrder.label=Mostrar a orde de tabulacións
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
+# tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
+# their tabbing order.
+accessibility.toolbar.displayTabbingOrder.tooltip=Mostrar a orde de tabulación dos elementos e o seu índice de tabulación.
diff -Nru firefox-84.0.2+build1/l10n/gl/devtools/client/markers.properties firefox-85.0+build1/l10n/gl/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/gl/devtools/client/markers.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/devtools/client/markers.properties	2021-01-18 20:04:28.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Memoria baixa
 marker.gcreason.label.CC_WAITING=Forzado por Cycle Collection
+marker.gcreason.label.CC_FINISHED=Colección de ciclos rematada
 marker.gcreason.label.CC_FORCED=Forzado por Cycle Collection
 marker.gcreason.label.LOAD_END=Rematou a carga da páxina
 marker.gcreason.label.PAGE_HIDE=Pasouse a un segundo plano
diff -Nru firefox-84.0.2+build1/l10n/gl/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/gl/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/gl/devtools/client/tooltips.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/devtools/client/tooltips.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -27,6 +27,7 @@
 inactive-css-property-is-impossible-to-override-in-visited = É imposible anular <strong>{ $property }</strong> debido á restricción <strong>:visited</strong>.
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> non ten ningún efecto sobre este elemento xa que non é un elemento posicionado.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> non ten ningún efecto sobre este elemento xa que <strongoverflow:hidden</strong> non está definido.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> non ten ningún efecto sobre este elemento xa que <strong>outline-style</strong> está definido como <strong>auto</strong> ou <strong>none</strong>.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -45,6 +46,7 @@
 inactive-css-not-display-block-on-floated-fix = Probe a eliminar <strong>float</strong> ou engadir <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Probe a establecer a súa propiedade <strong>position</strong> nalgo diferente a <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Probe a engadir <strong>overflow:hidden</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Probe a establecer a súa propiedade <strong>outline-style</strong> nalgo diferente a <strong>auto</strong> ou <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/gl/devtools/client/webconsole.properties firefox-85.0+build1/l10n/gl/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/gl/devtools/client/webconsole.properties	2021-01-06 11:38:48.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/devtools/client/webconsole.properties	2021-01-18 20:04:28.000000000 +0000
@@ -471,7 +471,7 @@
 # The Reverse Search is a feature that mimics the bash-like reverse search of
 # command history in WebConsole, searching commands from the last item backwards.
 # Parameters: %S is the keyboard shortcut.
-webconsole.editor.toolbar.reverseSearchButton.closeReverseSearch.tooltip=Pechar historial de busca inversa (%S)
+webconsole.editor.toolbar.reverseSearchButton.closeReverseSearch.tooltip=Pechar a busca inversa do historial (%S)
 
 # LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.tooltip)
 # Label used for the tooltip on the execute button, in the editor toolbar, which is
@@ -479,6 +479,10 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Expresión de execución (%S). Isto non limpará a entrada.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/gl/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/gl/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/gl/dom/chrome/dom/dom.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/dom/chrome/dom/dom.properties	2021-01-18 20:04:28.000000000 +0000
@@ -419,3 +419,10 @@
 RequestStorageAccessUserGesture=document.requestStorageAccess() só se pode solicitar desde un controlador de eventos xerado polo usuario de corta execución.
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented=Recibíronse demasiadas chamadas ás API de localización ou historial nun curto período de tempo.
+FolderUploadPrompt.title = Confirmar envío
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = Confirma que desexa enviar todos os ficheiros que hai en «%S»? Faga isto só se confía neste sitio.
+FolderUploadPrompt.acceptButtonLabel = Enviar
+InputPickerBlockedNoUserActivation=O selector <input> bloqueouse debido á falta de activación do usuario.
+ExternalProtocolFrameBlockedNoUserActivation=Bloqueouse o iframe con protocolo externo por falta de activación do usuario ou porque non pasou o tempo suficiente desde que se cargou o último iframe.
+MultiplePopupsBlockedNoUserActivation=Bloqueouse a apertura de varias xanelas emerxentes debido á falta de activación do usuario.
diff -Nru firefox-84.0.2+build1/l10n/gl/dom/chrome/security/security.properties firefox-85.0+build1/l10n/gl/dom/chrome/security/security.properties
--- firefox-84.0.2+build1/l10n/gl/dom/chrome/security/security.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/dom/chrome/security/security.properties	2021-01-18 20:04:28.000000000 +0000
@@ -101,6 +101,10 @@
 # LOCALIZATION NOTE (BrowserUpgradeInsecureDisplayRequest):
 # %1$S is the browser name "brandShortName"; %2$S is the URL of the upgraded request; %1$S is the upgraded scheme.
 BrowserUpgradeInsecureDisplayRequest = %1$S actualiza a solicitude de visualización non segura «%2$S» para usar "%3$S".
+
+# LOCALIZATION NOTE (MixedContentAutoUpgrade):
+# %1$S is the URL of the upgraded request; %2$S is the upgraded scheme.
+MixedContentAutoUpgrade=Actualizando a solicitude de visualización insegura «%1$S» para usar «%2$S»
 # LOCALIZATION NOTE (RunningClearSiteDataValue):
 # %S is the URI of the resource whose data was cleaned up
 RunningClearSiteDataValue=A cabeceira Clear-Site-Data provocou o borrado dos datos de «%S».
@@ -147,3 +151,4 @@
 # LOCALIZATION NOTE: Please do not localize "DocumentFragment". It's the name of an API.
 SanitizerRcvdNoInput = Recibiuse entrada baleira ou sen entrada. Devólvese un DocumentFragment baleiro.
 # LOCALIZATION NOTE: "Sanitizer" is the name of the API. Please do not localize.
+SanitizerOptionsDiscarded = As opcións para o constructor de Sanitizer aínda non son compatíbeis. Teña en conta que se trata dun comportamento experimental.
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/gl/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/gl/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:04:28.000000000 +0000
@@ -172,7 +172,6 @@
 configuration_element_not_provided = Non fornecido
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = Preferencias de WebRTC configuradas polo usuario
-
 # Section header for estimated bandwidths of WebRTC media flows
 bandwidth_stats_heading = Largo de banda estimado
 # The ID of the MediaStreamTrack
@@ -182,7 +181,10 @@
 # The estimated bandwidth available for receiving WebRTC media in bytes per second
 receive_bandwidth_bytes_sec = Largo de banda de recepción (bytes/sec)
 # Maximum number of bytes per second that will be padding zeros at the ends of packets
+max_padding_bytes_sec = Recheo máximo (bytes/seg)
 # The amount of time inserted between packets to keep them spaced out
+pacer_delay_ms = Período para espazador en ms
 # The amount of time it takes for a packet to travel from the local machine to the remote machine,
 # and then have a packet return
+round_trip_time_ms = Tempo de ida de volta (RTT, en ms)
 
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/gl/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/gl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:28.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Erro na descarga
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Non é posíbel gardar a descarga porque está bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Non é posíbel gardar a descarga porque está bloqueada por unha extensión.
 downloadErrorGeneric=Non é posíbel gardar a descarga por causa dun erro descoñecido.\n\nTente de novo.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/gl/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/gl/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:04:28.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Conexión do servidor proxy rexeitada
 check_error-2153390069=O certificado do servidor caducou (axuste o reloxo do sistema para corrixir a data e hora se é que son incorrectas)
 check_error-verification_failed=Non foi posíbel verificar a integridade da actualización
+check_error-move_failed=Non foi posíbel preparar a actualización para a instalación
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutNetworking.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-06 11:38:48.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -7,6 +7,7 @@
 about-networking-sockets = Sóckets
 about-networking-dns = DNS
 about-networking-dns-clear-cache-button = Limpar a caché de DNS
+about-networking-dns-trr-url = URL do DoH
 about-networking-dns-suffix = Sufixo de DNS
 about-networking-websockets = WebSockets
 about-networking-refresh = Actualizar
@@ -42,6 +43,7 @@
 about-networking-dns-lookup-button = Resolución
 about-networking-dns-domain = Dominio:
 about-networking-dns-lookup-table-column = Enderezos IP
+about-networking-dns-https-rr-lookup-table-column = RR HTTP
 about-networking-rcwn = Estatísticas RCWN
 about-networking-rcwn-status = Estado RCWN
 about-networking-rcwn-cache-won-count = Número de vitorias da caché
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -0,0 +1,133 @@
+# 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/.
+
+# Page title
+about-processes-title = Xestor de procesos
+# The Actions column
+about-processes-column-action =
+    .title = Accións
+
+## Tooltips
+
+about-processes-shutdown-process =
+    .title = Descargar lapelas e matar procesos
+about-processes-shutdown-tab =
+    .title = Pechar lapela
+
+## Column headers
+
+about-processes-column-name = Nome
+about-processes-column-memory-resident = Memoria
+about-processes-column-cpu-total = CPU
+
+## Process names
+## Variables:
+##    $pid (String) The process id of this process, assigned by the OS.
+##    $origin (String) The domain name for this process.
+##    $type (String) The raw type for this process. Used for unknown processes.
+
+about-processes-browser-process-name = { -brand-short-name } (proceso { $pid })
+about-processes-web-process-name = Web (proceso { $pid }, compartido)
+about-processes-web-isolated-process-name = Web (proceso { $pid }) para { $origin }
+about-processes-web-large-allocation = Web (proceso { $pid }, grande) para { $origin }
+about-processes-with-coop-coep-process-name = Web (proceso { $pid }, illado de orixe cruzada) para { $origin }
+about-processes-file-process-name = Ficheiros (proceso { $pid })
+about-processes-extension-process-name = Extensións (proceso { $pid })
+about-processes-privilegedabout-process-name = Acerca de (proceso { $pid })
+about-processes-plugin-process-name = Engadidos (proceso { $pid })
+about-processes-privilegedmozilla-process-name = Web (proceso { $pid }) para sitios { -vendor-short-name }
+about-processes-gmp-plugin-process-name = Engadidos multimedia de Gecko (proceso { $pid })
+about-processes-gpu-process-name = GPU (proceso { $pid })
+about-processes-vr-process-name = VR (proceso { $pid })
+about-processes-rdd-process-name = Decodificador de datos (proceso { $pid })
+about-processes-socket-process-name = Rede (proceso { $pid })
+about-processes-remote-sandbox-broker-process-name = Broker de sandbox remoto (proceso { $pid })
+about-processes-fork-server-process-name = Servidor de galla (proceso { $pid })
+about-processes-preallocated-process-name = Pre-asignado (proceso { $pid })
+about-processes-unknown-process-name = Outro ({ $type }, proceso { $pid })
+# Process
+# Variables:
+#   $name (String) The name assigned to the process.
+#   $pid (String) The process id of this process, assigned by the OS.
+about-processes-process-name = Proceso { $pid }: { $name }
+
+## Details within processes
+
+# Single-line summary of threads
+# Variables:
+#    $number (Number) The number of threads in the process. Typically larger
+#                     than 30. We don't expect to ever have processes with less
+#                     than 5 threads.
+about-processes-thread-summary = Fíos ({ $number })
+# Thread details
+# Variables:
+#   $name (String) The name assigned to the thread.
+#   $tid (String) The thread id of this thread, assigned by the OS.
+about-processes-thread-name = Fío { $tid }: { $name }
+# Tab
+# Variables:
+#   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
+about-processes-tab-name = Lapela: { $name }
+about-processes-preloaded-tab = Lapela nova precargada
+# Single subframe
+# Variables:
+#   $url (String) The full url of this subframe.
+about-processes-frame-name-one = Submarco: { $url }
+# Group of subframes
+# Variables:
+#   $number (Number) The number of subframes in this group. Always ≥ 1.
+#   $shortUrl (String) The shared prefix for the subframes in the group.
+about-processes-frame-name-many = Submarcos ({ $number }): { $shortUrl }
+
+## Displaying CPU (percentage and total)
+## Variables:
+##    $percent (Number) The percentage of CPU used by the process or thread.
+##                      Always > 0, generally <= 200.
+##    $total (Number) The amount of time used by the process or thread since
+##                    its start.
+##    $unit (String) The unit in which to display $total. See the definitions
+##                   of `duration-unit-*`.
+
+# Common case.
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) } { $unit })
+# Special case: data is not available yet.
+about-processes-cpu-user-and-kernel-not-ready = (medición)
+# Special case: process or thread is currently idle.
+about-processes-cpu-user-and-kernel-idle = Sen actividade ({ NUMBER($total, maximumFractionDigits: 2) }{ $unit })
+
+## Displaying Memory (total and delta)
+## Variables:
+##    $total (Number) The amount of memory currently used by the process.
+##    $totalUnit (String) The unit in which to display $total. See the definitions
+##                        of `memory-unit-*`.
+##    $delta (Number) The absolute value of the amount of memory added recently.
+##    $deltaSign (String) Either "+" if the amount of memory has increased
+##                        or "-" if it has decreased.
+##    $deltaUnit (String) The unit in which to display $delta. See the definitions
+##                        of `memory-unit-*`.
+
+# Common case.
+about-processes-total-memory-size = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit } ({ $deltaSign }{ NUMBER($delta, maximumFractionDigits: 0) }{ $deltaUnit })
+# Special case: no change.
+about-processes-total-memory-size-no-change = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit }
+
+## Duration units
+
+duration-unit-ns = ns
+duration-unit-us = µs
+duration-unit-ms = ms
+duration-unit-s = s
+duration-unit-m = m
+duration-unit-h = h
+duration-unit-d = d
+
+## Memory units
+
+memory-unit-B = B
+memory-unit-KB = KB
+memory-unit-MB = MB
+memory-unit-GB = GB
+memory-unit-TB = TB
+memory-unit-PB = PB
+memory-unit-EB = EB
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -59,12 +59,16 @@
 app-basics-build-config = Configuración da compilación
 app-basics-user-agent = User Agent
 app-basics-os = SO
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Traducido con Rosetta
 app-basics-memory-use = Uso de memoria
 app-basics-performance = Rendemento
 app-basics-service-workers = Service Workers rexistrados
 app-basics-profiles = Perfís
 app-basics-launcher-process-status = Proceso de lanzamento
 app-basics-multi-process-support = Xanelas multiproceso
+app-basics-fission-support = Xanelas Fission
 app-basics-remote-processes-count = Procesos remotos
 app-basics-enterprise-policies = Políticas empresariais
 app-basics-location-service-key-google = Clave de servizo de localización de Google
@@ -181,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceiros
+support-third-party-modules-module = Ficheiro de módulo
+support-third-party-modules-version = Versión do ficheiro
+support-third-party-modules-vendor = Info do vendedor
+support-third-party-modules-occurrence = Aparicións
+support-third-party-modules-process = Tipo de proceso e identificador
+support-third-party-modules-thread = Fío
+support-third-party-modules-base = Enderezo da imagebase
+support-third-party-modules-uptime = Tempo de actividade do proceso (ms)
+support-third-party-modules-duration = Duración de carga (ms)
+support-third-party-modules-empty = Non se cargaron módulos de terceiros.
+support-third-party-modules-no-value = (Sen valor)
+support-third-party-modules-button-open =
+    .title = Abrir a localización do ficheiro ...
+support-third-party-modules-expand =
+    .title = Mostrar información detallada
+support-third-party-modules-collapse =
+    .title = Contraer información detallada
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo non está asinado
+support-third-party-modules-folder-icon =
+    .title = Abrir a localización do ficheiro ...
+support-third-party-modules-down-icon =
+    .title = Mostrar información detallada
+support-third-party-modules-up-icon =
+    .title = Contraer información detallada
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -326,6 +356,10 @@
 multi-process-status-7 = Desactivado polos complementos
 multi-process-status-8 = Desactivado forzosamente
 multi-process-status-unknown = Estado descoñecido
+# Variables
+# $fissionWindows (integer) - Number of remote windows
+# $totalWindows (integer) - Number of total windows
+fission-windows = { $fissionWindows }/{ $totalWindows }
 fission-status-experiment-control = Desactivada polo experimento
 fission-status-experiment-treatment = Activada polo experimento
 fission-status-disabled-by-e10s-env = Desactivada polo entorno
@@ -335,6 +369,7 @@
 fission-status-disabled-by-default = Desactivada por omisión
 fission-status-enabled-by-user-pref = Activada polo usuario
 fission-status-disabled-by-user-pref = Desactivada polo usuario
+fission-status-disabled-by-e10s-other = Desactivadas por E10s
 async-pan-zoom = Pan/Zoom asíncrono
 apz-none = ningún
 wheel-enabled = entrada da roda do rato activada
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -47,11 +47,6 @@
 experimental-features-css-constructable-stylesheets =
     .label = CSS: Constructable Stylesheets
 experimental-features-css-constructable-stylesheets-description = A adición dun construtor á interface <a data-l10n-name="mdn-cssstylesheet">CSSStyleSheet</a>, así como a unha variedade de cambios relacionados, fai posible crear directamente novas follas de estilo sen ter que engadir a folla ao HTML. Isto fai moito máis sinxelo crear follas de estilo reutilizables para o seu uso con <a data-l10n-name="mdn-shadowdom">Shadow DOM</a>. Consulte <a data-l10n-name="bugzilla">erro 1520690</a> para máis detalles.
-# The title of the experiment should be kept in English as it may be referenced
-# by various online articles and is technical in nature.
-experimental-features-media-session-api =
-    .label = API Web: Media Session API
-experimental-features-media-session-api-description = Toda a implementación { -brand-short-name } da Media Session API é actualmente experimental. Esta API úsase para personalizar o manexo de notificacións relacionadas con soportes, para xestionar eventos e datos útiles para presentar unha interface de usuario para xestionar a reprodución de medios e para obter metadatos de ficheiros multimedia. Consulte <a data-l10n-name="bugzilla">erro 1112032</a> para máis detalles.
 experimental-features-devtools-color-scheme-simulation =
     .label = Ferramentas para desenvolvedores: Simulación de esquemas de cores
 experimental-features-devtools-color-scheme-simulation-description = Engade unha opción para simular diferentes esquemas de cores que permiten probar <a data-l10n-name="mdn-preferscolorscheme">@ prefers-color-scheme</a> consultas de medios. Usar esta consulta multimedia permite que a súa folla de estilo responda a se o usuario prefire unha interface de usuario clara ou escura. Esta característica permítelle probar o seu código sen ter que cambiar a configuración no seu navegador (ou no sistema operativo, se o explorador segue unha configuración de esquemas de cores para todo o sistema). Vexa <a data-l10n-name="bugzilla1">erro 1550804</a> e <a data-l10n-name="bugzilla2">erro 1137699</a> para máis detalles.
@@ -87,7 +82,22 @@
     .label = Ferramentas para desenvolvedores: depuración de traballadores
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support-description = Habilita soporte experimental para os traballadores de servizo no panel Depurador. Esta característica pode retardar as ferramentas para desenvolvedores e aumentar o consumo de memoria.
-# Desktop zooming experiment
-experimental-features-graphics-desktop-zooming =
-    .label = Imaxes: Ampliación con belisco suave
-experimental-features-graphics-desktop-zooming-description = Activar que se poida ampliar beliscando suavemente as pantallas táctiles e as áreas táctiles.
+# WebRTC global mute toggle controls
+experimental-features-webrtc-global-mute-toggles =
+    .label = Interruptores globais do son WebRTC
+experimental-features-webrtc-global-mute-toggles-description = Engadir controis ao indicador de compartición global WebRTC que lles permite aos usuarios silenciar globalmente os fluxos do micrófono e da cámara.
+# JS JIT Warp project
+experimental-features-js-warp =
+    .label = JavaScript JIT: Warp
+experimental-features-js-warp-description = Activar Warp, un proxecto para mellorar o rendemento JavaScript e o uso de memoria.
+# Fission is the name of the feature and should not be translated.
+experimental-features-fission =
+    .label = Fission (Illamento de sitios)
+experimental-features-fission-description = Fission (illamento de sitos) é unha funcionalidade experimental en { -brand-short-name } que fornece unha capa adicional de defensa contra fallos de seguranza. Isolando cada sitio nun proceso separado, Fission failles máis difícil aos sitios web maliciosos acceder a informacións das outras páxinas que visite. Isto é un gran cambio de arquitectura en { -brand-short-name } e apreciamos a súa axuda para probalo e informar de calquera problema que atope. Para saber máis, véxase <a data-l10n-name="wiki">o wiki</a>.
+# Support for having multiple Picture-in-Picture windows open simultaneously
+experimental-features-multi-pip =
+    .label = Capacidade de múltiplas Picture-in-Picture
+experimental-features-multi-pip-description = Capacidade experimental que permite abrir múltiplas xanelas Picture-in-Picture á vez.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Compatibilidade experimental para o protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> quere abrir unha ligazón <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
@@ -18,13 +10,21 @@
 ##  $appName - Name of the application that will be opened.
 
 permission-dialog-description = Permitir que este sitio abra a ligazón { $scheme }?
+permission-dialog-description-file = Permitir que este sitio abra a ligazón { $scheme }?
 permission-dialog-description-host = Permitir que { $host } abra a ligazón { $scheme }?
 permission-dialog-description-app = Permitir que este sitio abra a ligazón { $scheme } con { $appName }?
 permission-dialog-description-host-app = Permitir que { $host } abra a ligazón { $scheme } con { $appName }?
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
+permission-dialog-description-file-app = Permitir que este sitio abra a ligazón { $scheme } con { $appName }?
+
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
 permission-dialog-remember = Permitir sempre que <strong>{ $host }</strong> abra ligazóns <strong>{ $scheme }</strong>
+permission-dialog-remember-file = Permitir sempre que esta aplicación abra ligazóns <strong>{ $scheme }</strong>
+
+##
+
 permission-dialog-btn-open-link =
     .label = Abrir ligazón
     .accessKey = O
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -10,3 +10,5 @@
 videocontrols-buffer-bar-label = Cargando:
 videocontrols-volume-control =
     .aria-label = Volume
+videocontrols-closed-caption-button =
+    .aria-label = Lenda oculta
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Páxina:
     .accesskey = x
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,3 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última páxina
+printpreview-homearrow-button =
+    .title = Primeira páxina
+printpreview-previousarrow-button =
+    .title = Páxina anterior
+printpreview-nextarrow-button =
+    .title = Páxina seguinte
+printpreview-endarrow-button =
+    .title = Última páxina
diff -Nru firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/gl/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/gl/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:38:49.000000000 +0000
+++ firefox-85.0+build1/l10n/gl/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:28.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = até
+printui-page-custom-range-input =
+    .aria-label = Introduza o intervalo de páxinas personalizado
+    .placeholder = p.ex. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientación
@@ -41,10 +44,14 @@
 printui-scale-fit-to-page-width = Axustar á largura da páxina
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = Escala
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Impresión a dúas caras
+printui-duplex-checkbox = Imprimir polos dous lados
 # Section title for miscellaneous print options
 printui-options = Opcións
 printui-headers-footers-checkbox = Imprimir cabeceiras e rodapés
 printui-backgrounds-checkbox = Imprimir fondos
+printui-selection-checkbox = Imprimir só selección
 printui-color-mode-label = Modo de cores
 printui-color-mode-color = Cor
 printui-color-mode-bw = Branco e negro
@@ -53,19 +60,29 @@
 printui-margins-min = Mínimo
 printui-margins-none = Ningunha
 printui-margins-custom = Personalizadas
+printui-margins-custom-inches = Personalizado (polgadas)
 printui-margins-custom-top = Superior
+printui-margins-custom-top-inches = Parte superior (polgadas)
 printui-margins-custom-bottom = Inferior
+printui-margins-custom-bottom-inches = Parte inferior (polgadas)
 printui-margins-custom-left = Esquerda
+printui-margins-custom-left-inches = Esquerda (polgadas)
 printui-margins-custom-right = Dereita
+printui-margins-custom-right-inches = Dereita (polgadas)
 printui-system-dialog-link = Imprimir empregando o diálogo do sistema ...
 printui-primary-button = Imprimir
 printui-primary-button-save = Gardar
 printui-cancel-button = Cancelar
+printui-close-button = Pechar
 printui-loading = A preparar a previsualización
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vista previa da impresión
+printui-pages-per-sheet = Páxinas por folla
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimindo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/gn/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/aboutLogins.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/aboutLogins.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ¿Emboguete ko tembiapo ñepyrũ?
 confirm-delete-dialog-message = Ko tembiapoite ndaikatúi emboguevi.
 about-logins-confirm-remove-dialog-confirm-button = Mboguete
-about-logins-confirm-remove-all-dialog-confirm-button = Emboguepaite
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Mboguete
+        [one] Mboguepaite
+       *[other] Mboguepaite
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Héẽ, emboguete ko tembiapo ñepyrũ
@@ -181,6 +186,23 @@
         [one] ¿Emboguete { $count } terachaukaha?
        *[other] ¿Emboguete opaite { $count } terachaukaha?
     }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] Kóva omboguetéta tembiapo ñepyrũ oñongatúva { -brand-short-name } ha oimeraẽva mboguaha kyhyjerã osẽva ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+        [one] Kóva omboguetéta tembiapo ñepyrũ oñongatúva { -brand-short-name } ha oimeraẽva mboguaha kyhyjerã osẽva ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+       *[other] Kóva omboguetéta umi tembiapo ñepyrũ oñongatúva { -brand-short-name } ha oimeraẽva mboguaha kyhyjerã osẽva ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] ¿Emboguete { $count } rembiapo ñepyrũ opaite mba’e’okágui?
+       *[other] ¿Emboguete umi { $count } rembiapo ñepyrũ opaite mba’e’okágui?
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Kóva omboguéta tembiapo ñepyrũ eñongatúva { -brand-short-name }-pe opaite mba’e’oka oñondivéva { -fxaccount-brand-name } rehe. Kóva avei omboguéta umi ñembogua kyhyjerã asẽva ko’ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+        [one] Kóva omboguéta tembiapo ñepyrũ eñongatúva { -brand-short-name }-pe opaite mba’e’oka oñondivéva { -fxaccount-brand-name } rehe. Kóva avei omboguéta umi ñembogua kyhyjerã asẽva ko’ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+       *[other] Kóva omboguéta tembiapo ñepyrũ eñongatúva { -brand-short-name }-pe opaite mba’e’oka oñondivéva { -fxaccount-brand-name } rehe. Kóva avei omboguéta umi ñembogua kyhyjerã asẽva ko’ápe. Ndaikatumo’ãi emboguevi ko tembiapo.
+    }
 about-logins-confirm-export-dialog-title = Emba’egueraha tembiapo ñepyrũ ha ñe’ẽñemi
 about-logins-confirm-export-dialog-message = Ñe’ẽñemi oñeñongatúta moñe’ẽrãrõ (techapyrã, BadP@ssw0rd) oimeraẽva ombojurujakuaáva marandurenda guerahaukapyre ikatu ohecha.
 about-logins-confirm-export-dialog-confirm-button = Emba’egueraha…
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/gn/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/appmenu.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/appmenu.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Ovetã pyahu
+appmenuitem-new-private-window =
+    .label = Ovetã ñemi pyahu
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Moag̃ui
 appmenuitem-zoom-reduce =
     .label = Momombyry
+appmenuitem-fullscreen =
+    .label = Mba’erechaha tuichavéva
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Embojuehe ko’ág̃a
+appmenuitem-save-page =
+    .label = Ñongatu pyahu…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Oĩpa mba’e pyahu
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/gn/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/appMenuNotifications.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -39,7 +39,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Emoneĩ ko jepysokue oñembohekóvo Windows ñemiguápe
     .accesskey = A
-    
 appmenu-new-tab-controlled =
     .label = Ne Tendayke Pyahu iñambuékuri.
     .buttonlabel = Topyta Ñemoambue
@@ -52,6 +51,18 @@
     .buttonaccesskey = K
     .secondarybuttonlabel = Eipe’aite jepysokue
     .secondarybuttonaccesskey = D
+appmenu-new-tab-controlled-changes =
+    .label = Nde kuatiarogue tendayke pyahugua iñambuéma.
+    .buttonlabel = Erekotapia umi moambue
+    .buttonaccesskey = K
+    .secondarybuttonlabel = Eñangareko tendayke pyahúre
+    .secondarybuttonaccesskey = M
+appmenu-homepage-controlled-changes =
+    .label = Nde kuatiarogue ñepyrũgua iñambuéma.
+    .buttonlabel = Erekotapia umi moambue
+    .buttonaccesskey = K
+    .secondarybuttonlabel = Eñagareko kuatiarogue ñepyrũguáre
+    .secondarybuttonaccesskey = M
 appmenu-tab-hide-controlled =
     .label = Eike ne rendayke kañýme
     .buttonlabel = Eguereko ne rendayke kañyhápe
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/browser.ftl firefox-85.0+build1/l10n/gn/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/browser.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/browser.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -351,6 +351,7 @@
 browser-import-button2 =
     .label = Techaukaha jegueru…
     .tooltiptext = Egueru techaukaha ambue kundaháragui { -brand-short-name }-pe.
+bookmarks-toolbar-empty-message = Eike pya’e hag̃ua, emoĩ nde rechaukaha techaukaha rembipuru rendápe. <a data-l10n-name="manage-bookmarks">Eñangareko techaukaháre…</a>
 
 ## WebRTC Pop-up notifications
 
@@ -502,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> eñangarekópa nde hekaha rehe. Eikutu Esc eguerujey hag̃ua hekaha.
 pointerlock-warning-no-domain = Ko kuatia oñangareko nde hekaha rehe. Eikutu Esc eguerujey hag̃ua hekaha.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Opaite techaukaha jehechauka
+bookmarks-recent-bookmarks =
+    .value = Oñembokurusu ramóva
+bookmarks-toolbar-chevron =
+    .tooltiptext = Techaukaha jehechaukave
+bookmarks-sidebar-content =
+    .aria-label = Techaukaha
+bookmarks-menu-button =
+    .label = Techaukaha Rysýi
+bookmarks-other-bookmarks-menu =
+    .label = Ambue Techaukahakuéra
+bookmarks-mobile-bookmarks-menu =
+    .label = Pumbyry Rechaukaha
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eñomi Techaukaha Renda Yke
+           *[other] Techaukaha ra’ãngarupa yke recha
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eñomi Techaukaha Rembipuru Renda
+           *[other] Techaukaha renda jehecha
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Eipe’a Techaukaharysýi Tembipuru rendágui
+           *[other] Embojoapy Techaukaharysýi Tembipuru rendápe
+        }
+bookmarks-search =
+    .label = Techaukaha jeheka
+bookmarks-tools =
+    .label = Techaukaha Rembipuru
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Techaukaha rembipuru renda
+    .accesskey = B
+    .aria-label = Techaukaha
+bookmarks-toolbar-menu =
+    .label = Techaukaha rembipuru renda
+bookmarks-toolbar-placeholder =
+    .title = Techaukaha rembipuru renda remimoĩ
+bookmarks-toolbar-placeholder-button =
+    .label = Techaukaha rembipuru renda remimoĩ
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Techaukaha
+library-bookmarks-bookmark-this-page =
+    .label = Kuatiarogue mbojoapy
+library-bookmarks-bookmark-edit =
+    .label = Ko techaukaha mbosako’i
+
+## More items
+
+more-menu-go-offline =
+    .label = Mba’apo ñanduti’ỹre
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/gn/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/newtab/asrouter.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -122,6 +122,9 @@
 
 cfr-whatsnew-searchbar-title = Ehai sa’ive, ejuhuve kundaharape renda ndive
 cfr-whatsnew-searchbar-body-topsites = Ko’ág̃a, eiporavo kundaharape renda ha okakuaáta kora juajuha ndive ne renda eipuruvévape.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Mbotuichaha ra’ãnga’i
 
 ## Picture-in-Picture
@@ -275,3 +278,4 @@
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Eheka mbopya’eha kundaharape rendápe
+cfr-whatsnew-search-shortcuts-body = Ko’ág̃a, ehaívo peteĩ jeheka mongu’eha térã tenda ha’etéva kundaharape rendápe, osẽta peteĩ mbopya’eha hovýva pe jehekaha je’epyrépe. Eiporavo pe mbopya’eha emohu’ã hag̃ua nde jeheka pe kundaharape renda guive.
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/gn/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/newtab/newtab.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Tendayke Pyahu
 newtab-settings-button =
     .title = Eñemomba’e ne Tendayke Pyahu roguére
+newtab-personalize-button-label = Ñemomba’e
+    .title = Eñemomba’e tendayke pyahúre
+    .aria-label = Eñemomba’e tendayke pyahúre
 
 ## Search box component.
 
@@ -206,3 +209,27 @@
 
 newtab-error-fallback-info = Ema’ẽ, mba’épa osẽvai henyhẽnguévo ko tetepy.
 newtab-error-fallback-refresh-link = Kuatiarogue mbopiro’y eñepyrũjey hag̃ua
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Jeike pya’eha
+newtab-custom-shortcuts-subtitle = Tenda eñongatúva térã eikeha
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } Mba’erysýi
+       *[other] { $num } Mba’erysyikuéra
+    }
+newtab-custom-sponsored-sites = Jeike pya’eha jehepyme’ẽpyre
+newtab-custom-pocket-title = { -pocket-brand-name } oñe’ẽporãha
+newtab-custom-pocket-subtitle = Tetepy iporãva { -pocket-brand-name } oiporavopyre, { -brand-product-name } mba’éva pegua
+newtab-custom-pocket-sponsored = Tembiasakue jehepyme’ẽguáva
+newtab-custom-recent-title = Tembiapo ramovegua
+newtab-custom-recent-subtitle = Tenda jeporavo ha tetepy ramovegua
+newtab-custom-close-button = Mboty
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Mba’epehẽ
+newtab-custom-snippets-subtitle = Ñemoñe’ẽ ha marandu { -vendor-short-name } ha { -brand-product-name } rehegua
+newtab-custom-settings = Eñangareko hetave ñembohekóre
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/gn/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/preferences/preferences.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Umi tenda ojeikeveha
 home-prefs-topsites-by-option-sponsored =
     .label = Tenda tuicha ojehepyme’ẽva
+home-prefs-shortcuts-header =
+    .label = Jeike pya’eha
+home-prefs-shortcuts-description = Tenda eñongatúva térã eikeha
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Jeike pya’eha jehepyme’ẽpyre
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } he’i ndéve reike hag̃ua
 home-prefs-recommended-by-description-update = Tetepy oikoitéva ñanduti tuichakuépe, ohepyme’ẽva { $provider }
+home-prefs-recommended-by-description-new = Tetepy iporãva { $provider } oiporavopyre, { -brand-product-name } mba’éva pegua
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Tembiasakue jehepyme’ẽguáva
 home-prefs-highlights-header =
     .label = Mba’erechapyrã
-home-prefs-recent-activity-header =
-    .label = Tembiapo ramovegua
 home-prefs-highlights-description = Tenda jeporavopy eñongatu térã eike hague
 home-prefs-highlights-option-visited-pages =
     .label = Tenda jeikepyre
@@ -526,6 +530,9 @@
     .label = Oñemboguejy ramovéva
 home-prefs-highlights-option-saved-to-pocket =
     .label = Kuatiarogue ñongatupyre { -pocket-brand-name }-pe
+home-prefs-recent-activity-header =
+    .label = Tembiapo ramovegua
+home-prefs-recent-activity-description = Tenda jeporavo ha tetepy ramovegua
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Mba’epehẽ
 home-prefs-snippets-description = { -vendor-short-name } ha { -brand-product-name } ñembohekopyahu
+home-prefs-snippets-description-new = Ñemoñe’ẽ ha marandu { -vendor-short-name } ha { -brand-product-name } rehegua
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -927,6 +935,9 @@
 addressbar-locbar-topsites-option =
     .label = Tenda jehayhuvéva
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Hekaha mongu’eha
+    .accesskey = a
 addressbar-suggestions-settings = Jerohoryvéva jehekaha mongu’eha je’epyre moambue
 
 ## Privacy Section - Content Blocking
@@ -934,6 +945,7 @@
 content-blocking-enhanced-tracking-protection = Tapykueho mo’ãha iporãvéva
 content-blocking-section-top-level-description = Umi tapykuehoha oike ñandutípe ombyaty hag̃ua marandu umi nerembiapo rapykuere. { -brand-short-name } ojoko heta tapykuehoha ha ambue scripts imarãva.
 content-blocking-learn-more = Eikuaave
+content-blocking-fpi-incompatibility-warning = Eipuruhína First Party Isolation (FPI), oipe’áva ndahetái kookie ñemboheko { -brand-short-name } mba’éva.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/gn/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/gn/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -61,3 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Tendayke pyahúpe año
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Ehechauka tapiaite
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Aníke ehechauka
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Ehechauka tendayke pyahúpe añoite
+    .accesskey = O
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Ehechauka ambue techaukaha
+    .accesskey = m
diff -Nru firefox-84.0.2+build1/l10n/gn/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/gn/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/gn/browser/chrome/browser/browser.properties	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/browser/chrome/browser/browser.properties	2021-01-18 20:04:37.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=W
 getUserMedia.pickWindowOrScreen.label = Eiporavo ovetã térã mba’erechaha
 getUserMedia.shareEntireScreen.label = Mba’erechaha tuichakue
+getUserMedia.sharePipeWirePortal.label = Eipuru apopyvusu oku’éva ñemboheko
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/gn/devtools/client/markers.properties firefox-85.0+build1/l10n/gn/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/gn/devtools/client/markers.properties	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/devtools/client/markers.properties	2021-01-18 20:04:37.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Sa’i imandu’a renda
 marker.gcreason.label.CC_WAITING=Ojopy chupe arajere ñembyaty’aty
+marker.gcreason.label.CC_FINISHED=Oguahẽma ñembyaty paha
 marker.gcreason.label.CC_FORCED=Ojopy chupe arajere ñembyaty’aty
 marker.gcreason.label.LOAD_END=Kuatiarogue ñemyenyhẽ hu’ãma
 marker.gcreason.label.PAGE_HIDE=Egueraha mba’eruguápe
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Ka’avoreñoiha ñembyaty
-
diff -Nru firefox-84.0.2+build1/l10n/gn/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/gn/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/gn/devtools/client/tooltips.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/devtools/client/tooltips.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -12,70 +12,41 @@
 ## the property is not applied.
 ## Variables:
 ##   $property (string) - A CSS property name e.g. "color".
-
-
-## In the Rule View when a CSS property cannot be successfully applied we display
-## an icon. When this icon is hovered this message is displayed to explain why
-## the property is not applied.
-## Variables:
-##   $property (string) - A CSS property name e.g. "color".
 ##   $display (string) - A CSS display value e.g. "inline-block".
 
 inactive-css-not-grid-or-flex-container = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi mbyatyha hu’ũva ha avei mbyatyha osẽtava renda.
-
 inactive-css-not-grid-or-flex-container-or-multicol-container = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi mbyatyha hu’ũva, peteĩ mbyatyha ikora’ietáva, avei ndaha’éi mbyatyha hi’ytaetáva.
-
 inactive-css-not-grid-or-flex-item = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi osẽtava renda ha avei mba’epuru hu’ũva.
-
 inactive-css-not-grid-item = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe ndaha’éi rupi mba’epuru osẽtava renda.
-
 inactive-css-not-grid-container = <strong>{ $property }</strong> ndoguerekói  mba’evai ko mba’epurúpe ndaha’éi rupi mbyatyha osẽtava renda.
-
 inactive-css-not-flex-item = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi mba’epuru hu’ũva.
-
 inactive-css-not-flex-container = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi mbyatyha hu’ũva.
-
 inactive-css-not-inline-or-tablecell = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe, ndaha’éi rupi mba’epuru eikundahakuévo térã tenda’iete.
-
 inactive-css-property-because-of-display = <strong>{ $property }</strong> ndoguerekói mba’evai ko mba’epurúpe, oguereko rupi jehechaha <strong>{ $display }</strong>.
-
 inactive-css-not-display-block-on-floated = Pe mongu’eha omoambue <strong>jehecha</strong> repykue <strong>jokoha</strong> pe mab’epuru oĩgui <strong>vevuihápe<strong>.
-
 inactive-css-property-is-impossible-to-override-in-visited = Ndakatúi eipe’aite <strong>{ $property }</strong> jejoko <strong>:jehopyre</strong> rupive.
-
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> ndoguerekói mba’evéichagua mba’evai ko mba’epurúpe ndaha’éi rupi mba’epuru osẽtava renda.
-
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> ndoguerekói mba’eve ko mba’epurúpe <strong>overflow:hidden</strong> ndahekói rupi.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> ndorekói mba’eve ivaíva ko mba’epurúpe pe <strong>outline-style</strong> ha’e <strong>auto</strong> térã <strong>none</strong>.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
 
 inactive-css-not-grid-or-flex-container-fix = Eñeha’ã embojuaju <strong>display:grid</strong> térã <strong>display:flex</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Embojuaju <strong>display:grid</strong>, <strong>display:flex</strong> térã <strong>yta:2</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-item-fix-2 = Embojuaju <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> térã <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-grid-item-fix-2 = Embojuaju <strong>display:grid</strong> térã <strong>display:inline-grid</strong> ítem rúpe. { learn-more }
-
 inactive-css-not-grid-container-fix = Eñeha’ã embojuaju <strong>display:grid</strong> térã <strong>display:inline-grid</strong>. { learn-more }
-
 inactive-css-not-flex-item-fix-2 = Embojuaju <strong>display:flex</strong> térã <strong>display:inline-flex</strong> mba’epuru rúpe. { learn-more }
-
 inactive-css-not-flex-container-fix = Eñeha’ã embojuaju <strong>display:flex</strong> térã <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-inline-or-tablecell-fix = Eñeha’ã embojuaju <strong>display:inline</strong> térã <strong>display:table-cell</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-row-or-row-group-fix = Eñaha’ã embojuaju <strong>display:inline-block</strong> térã <strong>display:block</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-column-or-column-group-fix = Eñeha’ã embojuaju <strong>display:inline-block</strong>. { learn-more }
-
 inactive-css-not-display-block-on-floated-fix = Embogue <strong>vevúiva</strong> térã embojuaju <strong>display:block</strong>. { learn-more }
-
 inactive-css-position-property-on-unpositioned-box-fix = Eñeha’ã emboheko <strong>rendatee</strong> mba’éva tuichavéva <strong>opytáva</strong>. { learn-more }
-
 inactive-text-overflow-when-no-overflow-fix = Eñeha’ã embojuaju <strong>overflow:hidden</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Eñeha’ã emoambue <strong>outline-style</strong> mba’etee <strong>auto</strong> iñambuéva térã <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
@@ -85,17 +56,10 @@
 ##   $rootProperty (string) - A raw CSS property name e.g. "user-select" that is not a platform specific alias.
 
 css-compatibility-default-message = <strong>{ $property }</strong> ndorekói pytyvõ ko’ã kundahárape:
-
 css-compatibility-deprecated-experimental-message = <strong>{ $property }</strong> ha’e peteĩ mba’etee ipyahúva ha ko’ág̃a ndoikovéima pe W3C he’iháicha. Ndojokupytýi ko’ã kundahára ndive:
-
 css-compatibility-deprecated-experimental-supported-message = <strong>{ $property }</strong> ha’e peteĩ mba’etee ipyahúva ha ko’ág̃a ndoikovéima pe W3C he’iháicha.
-
 css-compatibility-deprecated-message = <strong>{ $property }</strong> ha’e peteĩ mba’etee ipyahúva ha ko’ág̃a ndoikovéima pe W3C he’iháicha. Ndojokupytýi ko’ã kundahára ndive:
-
 css-compatibility-deprecated-supported-message = <strong>{ $property }</strong> ndoikovéima pe W3C he’iháicha.
-
 css-compatibility-experimental-message = <strong>{ $property }</strong> ha’e peteĩ mba’etee ipyahúva. Ndorekói ñepytyvõ ko’ã kundahárape:
-
 css-compatibility-experimental-supported-message = <strong>{ $property }</strong> ha’e peteĩ mba’etee ipyahúva.
-
 css-compatibility-learn-more-message = <span data-l10n-name="link">Eikuaave</span> rehegua <strong>{ $rootProperty }</strong>
diff -Nru firefox-84.0.2+build1/l10n/gn/devtools/client/webconsole.properties firefox-85.0+build1/l10n/gn/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/gn/devtools/client/webconsole.properties	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/devtools/client/webconsole.properties	2021-01-18 20:04:37.000000000 +0000
@@ -7,27 +7,6 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
-# LOCALIZATION NOTE (browserConsole.title): shown as the
-# title when opening the browser console popup
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
 
 # LOCALIZATION NOTE (browserConsole.title): shown as the
 # title when opening the browser console popup
@@ -500,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Embohyapu je’epy (%S). Kóva nomboguemo’ãi pe jeikeha.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Je’epy iporã añetéva
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/gn/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/gn/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/gn/dom/chrome/dom/dom.properties	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/dom/chrome/dom/dom.properties	2021-01-18 20:04:37.000000000 +0000
@@ -421,4 +421,8 @@
 LocChangeFloodingPrevented=Hetaiterei oñehenói APIs rendaite térã tembiasakuépe sapy’aitépe.
 FolderUploadPrompt.title = Emoneĩ Ñemondo
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = ¿Emyanyhẽse añetépa opaite marandurenda “%S� pegua? Ejapo ejeroviárõ ko tenda rehe.
 FolderUploadPrompt.acceptButtonLabel = Hupi
+InputPickerBlockedNoUserActivation=Ojejokóma <input> poravoha puruhára nomyandýi rupi.
+ExternalProtocolFrameBlockedNoUserActivation=Ojejokóma pe iframe raperekoite okayguáva puruhára nomyandýi rupi térã ndohasái rupi heta aravo oñemyanyhẽ rire pe iframe koichagua.
+MultiplePopupsBlockedNoUserActivation=Ojejokóma heta ovetã apysẽ ijurujáva puruhára nomyandýi rupi.
diff -Nru firefox-84.0.2+build1/l10n/gn/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/gn/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/gn/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:37.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Ñemboguejy jejavy
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Pe ñemboguejy ndaikatúi eñongatu %S ojokóma rupi.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Pe ñemboguejy ndaikatúi eñongatu ojoko rupi chupe peteĩ jepysokue.
 downloadErrorGeneric=Ñemboguejy ndaikatúi eñongatu oiko rupi peteĩ jejavy jekuaa’ỹva.\n\nEha’ã jey.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/gn/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Mbohapyháva ra’ãha
+support-third-party-modules-module = Ha’ãha Marandurenda
+support-third-party-modules-version = Peteĩchagua marandurenda
+support-third-party-modules-vendor = Mba’eapoha marandu
+support-third-party-modules-occurrence = Mba’eaporei
+support-third-party-modules-process = Peteĩva tapereko ha ID
+support-third-party-modules-thread = Inimbo
+support-third-party-modules-base = Imagebase Kundaharape
+support-third-party-modules-uptime = Tapereko rembiapo arekue (ms)
+support-third-party-modules-duration = Ñemyanyhẽ arekue (ms)
+support-third-party-modules-empty = Noñemyanyhẽi mbohapyháva ayvu.
+support-third-party-modules-no-value = (Hepy’ỹva)
+support-third-party-modules-button-open =
+    .title = Eike marandurenda rendaitépe…
+support-third-party-modules-expand =
+    .title = Eike marandurenda hesa’ỹijopyrévape
+support-third-party-modules-collapse =
+    .title = Eike marandurenda hesa’ỹijopyrévape
+support-third-party-modules-unsigned-icon =
+    .title = Ko ha’ãha noñemboheraguapýi
+support-third-party-modules-folder-icon =
+    .title = Embojuruja marandurenda rendaite…
+support-third-party-modules-down-icon =
+    .title = Eike marandurenda hesa’ỹijopyrévape
+support-third-party-modules-up-icon =
+    .title = Emokañy marandurenda hesa’ỹijopyrévape
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/gn/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -94,3 +94,7 @@
 experimental-features-fission =
     .label = Fission (Tenda moha’eño)
 experimental-features-fission-description = Fission (tenda momombyry) ha’e tembiapo pyahu { -brand-short-name } pegua ome’ẽkuaáva ape anambusu ñemo’ãrã apañuãi tekorosãgua. Emomombyrývo peteĩteĩva tenda tapereko ipa’ũvape, Fission ombohasy umi ñanduti renda imarãva oikévo marandu ambue kuatiarogue eikeha pegua. Kóva ha’e tekoambue tuicháva { -brand-short-name }-pe ha roaguyjeme’ẽta emombe’úramo oimeraẽva apañuãi ejuhúva rehegua. Eikuaave hag̃ua, eporandu <a data-l10n-name="wiki">el wiki</a>-pe.
+# Support for having multiple Picture-in-Picture windows open simultaneously
+experimental-features-multi-pip =
+    .label = Ojokupytýva heta Picture-in-Picture ndive
+experimental-features-multi-pip-description = Tembiapoite oñeha’ãva omoneĩ hag̃ua heta ovetã ijurujáva Picture-in-Picture oñondivepa.
diff -Nru firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/gn/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Kuatiarogue:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } { $sheetCount } rehegua
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Kuatiarogue paha
-
+printpreview-homearrow-button =
+    .title = Kuatiarogue peteĩha
+printpreview-previousarrow-button =
+    .title = Kuatiarogue mboyvegua
+printpreview-nextarrow-button =
+    .title = Kuatiarogue upeigua
+printpreview-endarrow-button =
+    .title = Kuatiarogue paha
diff -Nru firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/gn/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/gn/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:38:52.000000000 +0000
+++ firefox-85.0+build1/l10n/gn/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:37.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = g̃uarã
+printui-page-custom-range-input =
+    .aria-label = Emoinge kuatiarogue peteĩva momba’epyre
+    .placeholder = p.ej. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Monguatiapyre
 printui-orientation = Moma’ẽ
@@ -56,19 +59,29 @@
 printui-margins-min = Michĩvéva
 printui-margins-none = Avave
 printui-margins-custom = Ñemomba’epyre
+printui-margins-custom-inches = Momba’epyre (pulgada)
 printui-margins-custom-top = Yvatevéva
+printui-margins-custom-top-inches = Tuichavéva (pulgada)
 printui-margins-custom-bottom = Michĩvéva
+printui-margins-custom-bottom-inches = Michĩvéva (pulgada)
 printui-margins-custom-left = Asugua
+printui-margins-custom-left-inches = Asu (pulgada)
 printui-margins-custom-right = Akatuagua
+printui-margins-custom-right-inches = Akatúa (pulgada)
 printui-system-dialog-link = Emonguatia eipurúvo apopyvusu rovetã…
 printui-primary-button = Ñemonguatia
 printui-primary-button-save = Ñongatu
 printui-cancel-button = Heja
+printui-close-button = Mboty
 printui-loading = Ehecháta jehechaha ñepyrũ
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Jehecha ypy ñemonguatia
+printui-pages-per-sheet = Kuatiarogue kuatiápe
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Ñemonguatia…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/gu-IN/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/gu-IN/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/gu-IN/browser/browser/appmenu.ftl	2021-01-06 11:38:57.000000000 +0000
+++ firefox-85.0+build1/l10n/gu-IN/browser/browser/appmenu.ftl	2021-01-18 20:04:42.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = નવી વિન�ડો
+appmenuitem-new-private-window =
+    .label = નવી ખાનગી વિન�ડો
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = મોટ�ં કરો
 appmenuitem-zoom-reduce =
     .label = નાન� કરો
+appmenuitem-fullscreen =
+    .label = પૂર�ણ સ�ક�રીન
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = હમણાં સમન�વયિત કરો
+appmenuitem-save-page =
+    .label = આ રીતે પૃષ�ઠ સાચવો ...
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = નવ�ં શ�ં છે
-
diff -Nru firefox-84.0.2+build1/l10n/gu-IN/browser/browser/browser.ftl firefox-85.0+build1/l10n/gu-IN/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/gu-IN/browser/browser/browser.ftl	2021-01-06 11:38:57.000000000 +0000
+++ firefox-85.0+build1/l10n/gu-IN/browser/browser/browser.ftl	2021-01-18 20:04:42.000000000 +0000
@@ -290,6 +290,9 @@
 browser-window-close-button =
     .tooltiptext = બંધ કરો
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -361,3 +364,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> તમારા નિર�દેશક અંક�શ ધરાવે છે. Esc દબાવો પાછા નિયંત�રણ લઈ જવા માટે.
 pointerlock-warning-no-domain = આ દસ�તાવેજ આપના પોઇન�ટર નિયંત�રણ ધરાવે છે. Esc દબાવો પાછા નિયંત�રણલઈ જવા માટે.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = બધા બ�કમાર�ક�સને બતાવો
+bookmarks-recent-bookmarks =
+    .value = તાજેતરમાં કરેલ બ�કમાર�ક
+bookmarks-toolbar-chevron =
+    .tooltiptext = વધ� બ�કમાર�ક�સ બતાવો
+bookmarks-sidebar-content =
+    .aria-label = બ�કમાર�ક�સ
+bookmarks-menu-button =
+    .label = બ�કમાર�ક�સ મેનૂ
+bookmarks-other-bookmarks-menu =
+    .label = અન�ય બ�કમાર�ક�સ
+bookmarks-mobile-bookmarks-menu =
+    .label = મોબાઇલ બ�કમાર�ક�સ
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] બ�કમાર�ક�સ સાઇડબાર છ�પાવો
+           *[other] બ�કમાર�ક બાજ�પટ�ટીને જ�ઓ
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] બ�કમાર�ક�સ ટૂલબાર છ�પાવો
+           *[other] બ�કમાર�ક સાધનપટ�ટીને દર�શાવો
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ટૂલબારમાંથી બ�કમાર�ક મેન�ને દૂર કરો
+           *[other] ટૂલબારમાં બ�કમાર�ક�સ મેનૂ ઉમેરો
+        }
+bookmarks-search =
+    .label = બ�કમાર�ક�સ શોધો
+bookmarks-tools =
+    .label = બ�કમાર�કિંગ સાધનો
+bookmarks-toolbar-menu =
+    .label = બ�કમાર�ક�સ ટૂલબાર
+bookmarks-toolbar-placeholder =
+    .title = બ�કમાર�ક�સ સાધનપટ�ટી વસ�ત�ઓ
+bookmarks-toolbar-placeholder-button =
+    .label = બ�કમાર�ક�સ સાધનપટ�ટી વસ�ત�ઓ
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = બ�કમાર�ક�સ
+library-bookmarks-bookmark-this-page =
+    .label = આ પાનાંને બ�કમાર�ક કરો
+library-bookmarks-bookmark-edit =
+    .label = આ બ�કમાર�કમાં ફેરફાર કરો
+
+## More items
+
+more-menu-go-offline =
+    .label = ઓફલાઈન કામ કરો
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/gu-IN/dom/dom/media.ftl firefox-85.0+build1/l10n/gu-IN/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/gu-IN/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/gu-IN/dom/dom/media.ftl	2021-01-18 20:04:42.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/gu-IN/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/gu-IN/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/gu-IN/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/gu-IN/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:42.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/he/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/aboutLogins.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/aboutLogins.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -166,7 +166,12 @@
 about-logins-confirm-remove-dialog-title = להסיר כניסה זו?
 confirm-delete-dialog-message = ל� ניתן לבטל פעולה זו.
 about-logins-confirm-remove-dialog-confirm-button = הסרה
-about-logins-confirm-remove-all-dialog-confirm-button = הסרת הכל
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] הסרה
+        [one] הסרה
+       *[other] הסרת הכל
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] כן, להסיר כניסה זו
@@ -198,6 +203,8 @@
 about-logins-confirm-export-dialog-title = ייצו� כניסות וססמ�ות
 about-logins-confirm-export-dialog-message = הססמ�ות שלך יישמרו כטקסט קרי� (למשל BadP@ssw0rd) כך שכל מי שיכול לפתוח �ת הקובץ המיוצ�, יוכל ג� לצפות בו.
 about-logins-confirm-export-dialog-confirm-button = ייצו�…
+about-logins-alert-import-title = הייבו� הושל�
+about-logins-alert-import-message = הצגת סיכו� מפורט על הייבו�
 confirm-discard-changes-dialog-title = ה�� להתעל� מהשינויי� של� נשמרו?
 confirm-discard-changes-dialog-message = כל השינויי� של� נשמרו י�בדו.
 confirm-discard-changes-dialog-confirm-button = התעלמות
@@ -259,3 +266,30 @@
         [macos] מסמך CSV
        *[other] קובץ CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = הייבו� הושל�
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>כניסות חדשות שנוספו:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>כניסות חדשות שנוספו:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>כניסות קיימות שעודכנו:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>כניסות קיימות שעודכנו:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>כניסות כפולות שנמצ�ו:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ל� יוב�ו)</span>
+       *[other] <span>כניסות כפולות שנמצ�ו:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ל� יוב�ו)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>שגי�ות:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ל� יוב�ו)</span>
+       *[other] <span>שגי�ות:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ל� יוב�ו)</span>
+    }
+about-logins-import-dialog-done = סיו�
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/he/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/appmenu.ftl	2021-01-06 11:39:01.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/appmenu.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = חלון חדש
+appmenuitem-new-private-window =
+    .label = חלון פרטי חדש
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = התקרבות
 appmenuitem-zoom-reduce =
     .label = התרחקות
+appmenuitem-fullscreen =
+    .label = מסך מל�
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = סנכרון כעת
+appmenuitem-save-page =
+    .label = שמירת דף בש�…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = מה חדש
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/he/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/appMenuNotifications.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = ל� כעת
     .secondarybuttonaccesskey = ל
 appmenu-update-restart-message = ל�חר הפעלה מחדש, { -brand-shorter-name } ישחזר �ת כל הלשוניות והחלונות הפתוחי� ש�ינ� במצב גלישה פרטית.
+appmenu-update-other-instance =
+    .label = ל� ניתן לעדכן ב�ופן �וטומטי �ת { -brand-shorter-name } לגרסה העדכנית ביותר.
+    .buttonlabel = לעדכן �ת { -brand-shorter-name } בכל מקרה
+    .buttonaccesskey = ×¢
+    .secondarybuttonlabel = ל� כעת
+    .secondarybuttonaccesskey = ל
+appmenu-update-other-instance-message = זמין עדכון חדש ל־{ -brand-shorter-name }, �בל ל� ניתן היה להתקין �ותו מכיוון שפועל עותק �חר של { -brand-shorter-name }. יש לסגור �ותו כדי להמשיך בעדכון, �ו לבחור לעדכן �ותו בכל מקרה (ייתכן שהעותק ה�חר ל� יפעל כר�וי עד שיופעל מחדש).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = בסדר, הבנתי
     .buttonaccesskey = ב
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/browser.ftl firefox-85.0+build1/l10n/he/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/browser.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/browser.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -501,3 +501,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = ל�תר בכתובת <span data-l10n-name="domain">{ $domain }</span> יש שליטה על הסמן שלך. לחיצה על ESC תחזיר �ת השליטה �ליך.
 pointerlock-warning-no-domain = למסמך זה יש שליטה על הסמן שלך. לחיצה על ESC תחזיר �ת השליטה �ליך.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = הצגת כל הסימניות
+bookmarks-recent-bookmarks =
+    .value = סימניות שנוספו ל�חרונה
+bookmarks-toolbar-chevron =
+    .tooltiptext = הצגת סימניות נוספות
+bookmarks-sidebar-content =
+    .aria-label = סימניות
+bookmarks-menu-button =
+    .label = תפריט סימניות
+bookmarks-other-bookmarks-menu =
+    .label = סימניות �חרות
+bookmarks-mobile-bookmarks-menu =
+    .label = סימניות מהנייד
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] הסתרת סרגל הצד סימניות
+           *[other] הצגת סרגל הצד
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] הסתרת סרגל הכלי� סימניות
+           *[other] הצגת סרגל הכלי� סימניות
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] הסרת תפריט הסימניות מסרגל הכלי�
+           *[other] הוספת תפריט הסימניות לסרגל הכלי�
+        }
+bookmarks-search =
+    .label = חיפוש בסימניות
+bookmarks-tools =
+    .label = כלי סימניות
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = סרגל כלי� סימניות
+    .accesskey = ס
+    .aria-label = סימניות
+bookmarks-toolbar-menu =
+    .label = סרגל כלי� סימניות
+bookmarks-toolbar-placeholder =
+    .title = פריטי סרגל כלי� סימניות
+bookmarks-toolbar-placeholder-button =
+    .label = פריטי סרגל כלי� סימניות
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = סימניות
+library-bookmarks-bookmark-this-page =
+    .label = יצירת סימנייה לדף זה
+library-bookmarks-bookmark-edit =
+    .label = עריכת סימנייה זו
+library-recent-activity-label = פעילות �חרונה
+
+## More items
+
+more-menu-go-offline =
+    .label = עבודה ל�־מקוונת
+    .accesskey = ל
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/he/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/newtab/asrouter.ftl	2021-01-06 11:39:01.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -118,6 +118,9 @@
 
 cfr-whatsnew-searchbar-title = להקליד פחות ולמצו� יותר ע� שורת הכתובת
 cfr-whatsnew-searchbar-body-topsites = מעכשיו, �פשר ללחוץ על שורת הכתובת והי� תתרחב ע� קישורי� ל�תרי� המובילי� שלך.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = סמל זכוכית מגדלת
 
 ## Picture-in-Picture
@@ -250,3 +253,13 @@
 
 cfr-whatsnew-search-shortcuts-header = קיצורי דרך לחיפוש בשורת הכתובת
 cfr-whatsnew-search-shortcuts-body = כעת, בעת הקלדת מנוע חיפוש �ו �תר מסוי� בשורת הכתובת, קיצור דרך כחול יופיע בהצעות החיפוש שמתחת. יש לבחור קיצור דרך זה כדי להשלי� �ת החיפוש שלך ישירות משורת הכתובת.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = הגנה מפני עוגיות־על זדוניות
+cfr-whatsnew-supercookies-body = �תרי� יכולי� לצרף בסתר ״עוגיית־על״ לדפדפן שלך, שיכול לעקוב �חריך ברשת, ג� ל�חר ניקוי עוגיות. { -brand-short-name } כעת מספק הגנה חזקה מפני עוגיות־על כדי של� יהיה ניתן להשתמש בהן כדי לעקוב �חר הפעילויות המקוונות שלך מ�תר �חד למשנהו.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = שמירת סימניות טובה יותר
+cfr-whatsnew-bookmarking-body = קל יותר לעקוב �חר ה�תרי� המועדפי� עליך. { -brand-short-name } כעת זוכר �ת המיקו� המועדף שלך לסימניות שמורות, מציג כברירת מחדל �ת סרגל הסימניות בלשוניות חדשות ומעניק לך גישה נוחה לש�ר הסימניות שלך ב�מצעות תיקייה בסרגל הכלי�.
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/he/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/newtab/newtab.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = לשונית חדשה
 newtab-settings-button =
     .title = הת�מה �ישית של דף הלשונית החדשה שלך
+newtab-personalize-button-label = הת�מה �ישית
+    .title = הת�מה �ישית של דף הלשונית החדשה
+    .aria-label = הת�מה �ישית של דף הלשונית החדשה
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = חיפוש ברשת
     .title = חיפוש ברשת
     .aria-label = חיפוש ברשת
+newtab-search-box-text = חיפוש ברשת
+newtab-search-box-input =
+    .placeholder = חיפוש ברשת
+    .aria-label = חיפוש ברשת
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = הוספת מנוע חיפוש
 newtab-topsites-add-topsites-header = �תר מוביל חדש
+newtab-topsites-add-shortcut-header = קיצור דרך חדש
 newtab-topsites-edit-topsites-header = עריכת �תר מוביל
+newtab-topsites-edit-shortcut-header = עריכת קיצור דרך
 newtab-topsites-title-label = כותרת
 newtab-topsites-title-input =
     .placeholder = נ� להזין כותרת
@@ -197,3 +206,27 @@
 
 newtab-error-fallback-info = �ופס, משהו השתבש בעת טעינת התוכן הזה.
 newtab-error-fallback-refresh-link = נ� לרענן �ת הדף כדי לנסות שוב.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = קיצורי דרך
+newtab-custom-shortcuts-subtitle = �תרי� ששמרת �ו ביקרת בה�
+newtab-custom-row-selector =
+    { $num ->
+        [one] שורה �חת
+       *[other] { $num } שורות
+    }
+newtab-custom-sponsored-sites = קיצורי דרך ממומני�
+newtab-custom-pocket-title = מומלץ על־ידי { -pocket-brand-name }
+newtab-custom-pocket-subtitle = תוכן יוצ� דופן שנבחר בקפידה על־ידי { -pocket-brand-name }, חלק ממשפחת { -brand-product-name }
+newtab-custom-pocket-sponsored = סיפורי� ממומני�
+newtab-custom-recent-title = פעילות �חרונה
+newtab-custom-recent-subtitle = מבחר של �תרי� ותכני� �חרוני�
+newtab-custom-close-button = סגירה
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = פתקיות
+newtab-custom-snippets-subtitle = עצות וחדשות מ־{ -vendor-short-name } ו־{ -brand-product-name }
+newtab-custom-settings = ניהול הגדרות נוספות
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/places.ftl firefox-85.0+build1/l10n/he/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/places.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/places.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = תיקיית משנה
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = סימניות �חרות
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/he/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/preferences/preferences.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -500,12 +500,19 @@
 home-prefs-topsites-description = ה�תרי� בה� ביקרת הכי הרבה
 home-prefs-topsites-by-option-sponsored =
     .label = �תרי� מובילי� ממומני�
+home-prefs-shortcuts-header =
+    .label = קיצורי דרך
+home-prefs-shortcuts-description = �תרי� ששמרת �ו ביקרת בה�
+home-prefs-shortcuts-by-option-sponsored =
+    .label = קיצורי דרך ממומני�
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = מומלץ על־ידי { $provider }
+home-prefs-recommended-by-description-update = תוכן יוצ� דופן מרחבי רשת, שנבחר בקפידה על־ידי { $provider }
+home-prefs-recommended-by-description-new = תוכן יוצ� דופן שנבחר בקפידה על־ידי { $provider }, חלק ממשפחת { -brand-product-name }
 
 ##
 
@@ -514,8 +521,6 @@
     .label = סיפורי� ממומני�
 home-prefs-highlights-header =
     .label = מומלצי�
-home-prefs-recent-activity-header =
-    .label = פעילות �חרונה
 home-prefs-highlights-description = מבחר של �תרי� ששמרת �ו ביקרת בה�
 home-prefs-highlights-option-visited-pages =
     .label = עמודי� בה� ביקרת
@@ -525,6 +530,9 @@
     .label = ההורדות ה�חרונות
 home-prefs-highlights-option-saved-to-pocket =
     .label = עמודי� שנשמרו ל־{ -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = פעילות �חרונה
+home-prefs-recent-activity-description = מבחר של �תרי� ותכני� �חרוני�
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -532,6 +540,7 @@
 home-prefs-snippets-header =
     .label = פתקיות
 home-prefs-snippets-description = עדכוני� מ־{ -vendor-short-name } ו־{ -brand-product-name }
+home-prefs-snippets-description-new = עצות וחדשות מ־{ -vendor-short-name } ו־{ -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -919,9 +928,16 @@
 addressbar-locbar-openpage-option =
     .label = לשוניות פתוחות
     .accesskey = ל
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = קיצורי דרך
+    .accesskey = ק
 addressbar-locbar-topsites-option =
     .label = �תרי� מובילי�
     .accesskey = מ
+addressbar-locbar-engines-option =
+    .label = מנועי חיפוש
+    .accesskey = מ
 addressbar-suggestions-settings = שינוי העדפות של הצעות מנועי חיפוש
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/he/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/he/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/he/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = רק בלשונית החדשה
     .accesskey = ר
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = תמיד להציג
+    .accesskey = ת
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = לעול� ל� להציג
+    .accesskey = ל
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = להציג רק בלשונית חדשה
+    .accesskey = ר
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = הצגת סימניות �חרות
     .accesskey = ×”
diff -Nru firefox-84.0.2+build1/l10n/he/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/he/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/he/browser/chrome/browser/browser.properties	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/chrome/browser/browser.properties	2021-01-18 20:04:47.000000000 +0000
@@ -576,7 +576,7 @@
 #   #2 is replaced with the (locale-formatted) number of trackers blocked
 #   #3 is replaced by a locale-formatted date with short month and numeric year.
 #   In English this looks like "Firefox blocked over 10,000 trackers since Oct 2019"
-protections.milestone.description=�#1 חס� יותר מרכיב מעקב �חד מ�ז #3;�#1 חס� למעלה מ#2 רכיבי מעקב מ�ז #3
+protections.milestone.description=�#1 חס� יותר מרכיב מעקב �חד מ�ז #3;�#1 חס� למעלה מ־#2 רכיבי מעקב מ�ז #3
 
 # Edit Bookmark UI
 editBookmarkPanel.newBookmarkTitle=סימנייה חדשה
diff -Nru firefox-84.0.2+build1/l10n/he/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/he/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/he/browser/extensions/formautofill/formautofill.properties	2021-01-06 11:39:01.000000000 +0000
+++ firefox-85.0+build1/l10n/he/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:04:47.000000000 +0000
@@ -217,14 +217,14 @@
 cardNetwork.visa = ויזה
 
 # LOCALIZATION NOTE (editCreditCardPasswordPrompt.*, useCreditCardPasswordPrompt.*): %S is brandShortName.
-editCreditCardPasswordPrompt.win = מתבצע ניסיון מצד %S להציג נתוני כרטיס �שר�י. ניתן ל�שר �ת הגישה לחשבון ה־Windows הזה להלן.
+editCreditCardPasswordPrompt.win = מתבצע ניסיון מצד %S להציג נתוני כרטיס �שר�י. יש ל�שר �ת הגישה לחשבון ה־Windows הזה להלן.
 editCreditCardPasswordPrompt.macosx = מתבצע ניסיון מצד %S להציג נתוני כרטיס �שר�י.
 # LOCALIZATION NOTE (editCreditCardPasswordPrompt.macos): This string is
 # preceded by the operating system (macOS) with "Firefox is trying to ", and
 # has a period added to its end. Make sure to test in your locale.
 editCreditCardPasswordPrompt.macos = להציג פרטי כרטיס �שר�י
 editCreditCardPasswordPrompt.linux = מתבצע ניסיון מצד %S להציג נתוני כרטיס �שר�י.
-useCreditCardPasswordPrompt.win = מתבצע ניסיון מצד %S להשתמש בנתוני כרטיס �שר�י שמורי�. ניתן ל�שר �ת הגישה לחשבון ה־Windows הזה להלן.
+useCreditCardPasswordPrompt.win = מתבצע ניסיון מצד %S להשתמש בנתוני כרטיס �שר�י שמורי�. יש ל�שר �ת הגישה לחשבון ה־Windows הזה להלן.
 useCreditCardPasswordPrompt.macosx = מתבצע ניסיון מצד %S להשתמש בנתוני כרטיס �שר�י שמורי�.
 # LOCALIZATION NOTE (useCreditCardPasswordPrompt.macos): This string is
 # preceded by the operating system (macOS) with "Firefox is trying to ", and
diff -Nru firefox-84.0.2+build1/l10n/he/devtools/client/toolbox.properties firefox-85.0+build1/l10n/he/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/he/devtools/client/toolbox.properties	2021-01-06 11:39:01.000000000 +0000
+++ firefox-85.0+build1/l10n/he/devtools/client/toolbox.properties	2021-01-18 20:04:47.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=סגירת כלי הפיתוח
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=הצגת מסוף מפוצל
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/he/dom/chrome/nsWebBrowserPersist.properties firefox-85.0+build1/l10n/he/dom/chrome/nsWebBrowserPersist.properties
--- firefox-84.0.2+build1/l10n/he/dom/chrome/nsWebBrowserPersist.properties	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/dom/chrome/nsWebBrowserPersist.properties	2021-01-18 20:04:47.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 readError=ל� ניתן לשמור �ת %S, משו� של� ניתן לקרו� �ת קובץ המקור.\n\nנ� לנסות שוב מ�וחר יותר, �ו ליצור קשר ע� מנהל השרת.
-writeError=ל� ניתן לשמור �ת %S, משו� ש�ירעה שגי�ה ל� ידועה.\n\nנ� לנסות לשמור במיקו� �חר.
+writeError=ל� ניתן לשמור �ת %S, מכיוון ש�ירעה שגי�ה ל� ידועה.\n\nנ� לנסות לשמור במיקו� �חר.
 launchError=ל� ניתן לפתוח �ת %S, משו� ש�ירעה שגי�ה ל� ידועה.\n\nנ� לנסות לשמור �ת הקובץ לדיסק תחילה ו�ז לפותחו.
 diskFull=�ין מספיק מקו� על הכונן כדי לשמור �ת %S.\n\nיש להסיר קבצי� בלתי נחוצי� מהכונן ולנסות שוב, �ו לנסות לשמור במיקו� �חר.
 readOnly=ל� ניתן לשמור �ת %S, משו� שהדיסק, התיקייה �ו הקובץ מוגני� מפני כתיבה.\n\nנ� ל�פשר כתיבה לדיסק ולנסות שוב, �ו לנסות לשמור במיקו� �חר.
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/he/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/he/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:47.000000000 +0000
@@ -23,7 +23,13 @@
 shortDays=​ יו�; ימי�
 
 downloadErrorAlertTitle=שגי�ת הורדה
-downloadErrorGeneric=ל� ניתן לשמור �ת ההורדה משו� ש�ירעה שגי�ה ל� ידועה.\n\nנ� לנסות שוב.
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=ל� ניתן לשמור �ת ההורדה מכיוון שנחסמה על־ידי %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=ל� ניתן לשמור �ת ההורדה מכיוון שנחסמה על־ידי הרחבה.
+downloadErrorGeneric=ל� ניתן לשמור �ת ההורדה מכיוון ש�ירעה שגי�ה ל� ידועה.\n\nנ� לנסות שוב.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
 quitCancelDownloadsAlertTitle=לבטל �ת כל ההורדות?
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/he/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/he/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:04:47.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=חיבור לשרת מתווך נדחה
 check_error-2153390069=פג תוקפו של �ישור השרת (נ� לכוון �ת שעון המערכת שלך לת�ריך והזמן הנכוני� �� ה� שגויי�, �ו ליצור קשר ע� מנהל המערכת שלך)
 check_error-verification_failed=�ין �פשרות ל�מת �ת שלמות העדכון
+check_error-move_failed=נכשל בהכנת העדכון להתקנה
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/he/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/he/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -174,6 +174,30 @@
 
 ##
 
+support-third-party-modules-title = מודולי� מצד־שלישי
+support-third-party-modules-module = קובץ המודול
+support-third-party-modules-version = גרסת קובץ
+support-third-party-modules-vendor = מידע על הספק
+support-third-party-modules-process = סוג ומזהה התהליך
+support-third-party-modules-base = כתובת תמונת בסיס
+support-third-party-modules-uptime = זמן פעילות של התהליך (מ״ש)
+support-third-party-modules-duration = משך טעינה (מ״ש)
+support-third-party-modules-empty = ל� נטענו מודולי� מצד־שלישי.
+support-third-party-modules-no-value = (�ין ערך)
+support-third-party-modules-button-open =
+    .title = פתיחת מיקו� הקובץ…
+support-third-party-modules-expand =
+    .title = הצגת מידע מפורט
+support-third-party-modules-collapse =
+    .title = צמצו� מידע מפורט
+support-third-party-modules-unsigned-icon =
+    .title = מודול זה �ינו חתו�
+support-third-party-modules-folder-icon =
+    .title = פתיחת מיקו� הקובץ…
+support-third-party-modules-down-icon =
+    .title = הצגת מידע מפורט
+support-third-party-modules-up-icon =
+    .title = צמצו� מידע מפורט
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/he/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/he/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -71,3 +71,6 @@
 experimental-features-multi-pip =
     .label = תמיכה בהצגת חלונות מרובי� של תמונה בתוך תמונה
 experimental-features-multi-pip-description = תמיכה ניסיונית המ�פשרת לחלונות מרובי� של מצב תמונה בתוך תמונה להיות פתוחי� בו זמנית.
+experimental-features-http3 =
+    .label = פרוטוקול HTTP/3
+experimental-features-http3-description = תמיכה ניסיונית עבור הפרוטוקול HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/he/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/he/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = עמוד:
     .accesskey = ×¢
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } מתוך { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = דף �חרון
-
+printpreview-homearrow-button =
+    .title = העמוד הר�שון
+printpreview-previousarrow-button =
+    .title = העמוד הקוד�
+printpreview-nextarrow-button =
+    .title = העמוד הב�
+printpreview-endarrow-button =
+    .title = העמוד ה�חרון
diff -Nru firefox-84.0.2+build1/l10n/he/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/he/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/he/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:39:02.000000000 +0000
+++ firefox-85.0+build1/l10n/he/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:47.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = עד עמוד
+printui-page-custom-range-input =
+    .aria-label = נ� להזין טווח עמודי� מות�� �ישית
+    .placeholder = לדוגמה, 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = עותקי�
 printui-orientation = כיוון
@@ -48,6 +51,7 @@
 printui-options = �פשרויות
 printui-headers-footers-checkbox = הדפסת כותרות עיליות ותחתיות
 printui-backgrounds-checkbox = הדפסת רקעי�
+printui-selection-checkbox = הדפסת הקטע הנבחר בלבד
 printui-color-mode-label = מצב צבע
 printui-color-mode-color = צבע
 printui-color-mode-bw = שחור ולבן
@@ -56,19 +60,29 @@
 printui-margins-min = מינימו�
 printui-margins-none = לל�
 printui-margins-custom = הת�מה �ישית
+printui-margins-custom-inches = הת�מה �ישית (�ינצ'י�)
 printui-margins-custom-top = מלמעלה
+printui-margins-custom-top-inches = מלמעלה (�ינצ'י�)
 printui-margins-custom-bottom = מלמטה
+printui-margins-custom-bottom-inches = מלמטה (�ינצ'י�)
 printui-margins-custom-left = משמ�ל
+printui-margins-custom-left-inches = משמ�ל (�ינצ'י�)
 printui-margins-custom-right = מימין
+printui-margins-custom-right-inches = מימין (�ינצ'י�)
 printui-system-dialog-link = הדפסה ב�מצעות תיבת הדו־שיח של המערכת…
 printui-primary-button = הדפסה
 printui-primary-button-save = שמירה
 printui-cancel-button = ביטול
+printui-close-button = סגירה
 printui-loading = בתהליך הכנת תצוגה מקדימה
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = תצוגה לפני הדפסה
+printui-pages-per-sheet = עמודי� בכל גיליון
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = בהדפסה…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/hi-IN/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/hi-IN/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/hi-IN/browser/browser/appmenu.ftl	2021-01-06 11:39:06.000000000 +0000
+++ firefox-85.0+build1/l10n/hi-IN/browser/browser/appmenu.ftl	2021-01-18 20:04:51.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = नया विंडो
+appmenuitem-new-private-window =
+    .label = नयी निजी विंडो
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = बड़ा करें
 appmenuitem-zoom-reduce =
     .label = छोटा करें
+appmenuitem-fullscreen =
+    .label = पूर�ण स�क�रीन
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = अब त�ल�यकालित करें
+appmenuitem-save-page =
+    .label = पृष�ठ �से सहेजें…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/hi-IN/browser/browser/browser.ftl firefox-85.0+build1/l10n/hi-IN/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/hi-IN/browser/browser/browser.ftl	2021-01-06 11:39:06.000000000 +0000
+++ firefox-85.0+build1/l10n/hi-IN/browser/browser/browser.ftl	2021-01-18 20:04:51.000000000 +0000
@@ -316,6 +316,9 @@
 browser-window-close-button =
     .tooltiptext = बंद करें
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -409,3 +412,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> अपने सूचक पर नियंत�रण हैं. नियंत�रण फिर से वापस लेने के लि� Esc बटन दबा��.
 pointerlock-warning-no-domain = इस दस�तेवाज को आपके सूचक पर नियंत�रण हैं. नियंत�रण फिर से वापस लेने के लि� Esc बटन दबा��.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = सभी ब�कमार�कों को दिखा��
+bookmarks-recent-bookmarks =
+    .value = हाल में ब�कमार�कित
+bookmarks-toolbar-chevron =
+    .tooltiptext = अधिक ब�कमार�क दिखा��
+bookmarks-sidebar-content =
+    .aria-label = ब�कमार�क
+bookmarks-menu-button =
+    .label = ब�कमार�क मेन�यू
+bookmarks-other-bookmarks-menu =
+    .label = अन�य ब�कमार�क
+bookmarks-mobile-bookmarks-menu =
+    .label = मोबाइल ब�कमार�क
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ब�कमार�क साइडबार छिपा�ं
+           *[other] ब�कमार�क बाज़ू पट�टी देखें
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ब�कमार�क टूलबार छिपा�ं
+           *[other] ब�कमार�क औज़ारपट�टी देखें
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] टूलबार से ब�कमार�क मेनू हटायें
+           *[other] टूलबार पर ब�कमार�क मेनू डालें
+        }
+bookmarks-search =
+    .label = ब�कमार�क खोजें
+bookmarks-tools =
+    .label = ब�कमार�क के उपकरण
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ब�कमार�क औज़ारपट�टी
+    .accesskey = B
+    .aria-label = ब�कमार�क
+bookmarks-toolbar-menu =
+    .label = ब�कमार�क औज़ारपट�टी
+bookmarks-toolbar-placeholder =
+    .title = औज़ारपट�टी मद ब�कमार�कित करता है
+bookmarks-toolbar-placeholder-button =
+    .label = औज़ारपट�टी मद ब�कमार�कित करता है
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ब�कमार�क
+library-bookmarks-bookmark-this-page =
+    .label = यह पृष�ठ ब�कमार�कित करें
+library-bookmarks-bookmark-edit =
+    .label = यह ब�कमार�क संपादित करें
+
+## More items
+
+more-menu-go-offline =
+    .label = ऑफ़लाइन काम करें
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/hi-IN/dom/dom/media.ftl firefox-85.0+build1/l10n/hi-IN/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/hi-IN/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/hi-IN/dom/dom/media.ftl	2021-01-18 20:04:51.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/hr/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/aboutLogins.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/aboutLogins.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -154,8 +154,8 @@
 enable-password-sync-preferences-button =
     .label =
         { PLATFORM() ->
-            [windows] Posjeti { -sync-brand-short-name } mogućnosti
-           *[other] Posjeti { -sync-brand-short-name } postavke
+            [windows] Posjeti mogućnosti za { -sync-brand-short-name }
+           *[other] Posjeti postavke za { -sync-brand-short-name }
         }
     .accesskey = P
 about-logins-enable-password-sync-dont-ask-again-button =
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Ukloniti ovu prijavu?
 confirm-delete-dialog-message = Ova radnja je nepovratna.
 about-logins-confirm-remove-dialog-confirm-button = Ukloni
-about-logins-confirm-remove-all-dialog-confirm-button = Ukloni sve
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Ukloni
+        [one] Ukloni
+        [few] Ukloni sve
+       *[other] Ukloni sve
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Da, ukloni ovu prijavu
@@ -197,9 +203,18 @@
         [few] Ukloniti { $count } prijave sa svih uređaja?
        *[other] Ukloniti { $count } prijava sa svih uređaja?
     }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] Ovo će ukloniti prijavu spremljenu u { -brand-short-name }u na svim uređajima sinkroniziranim s tvojim { -fxaccount-brand-name }. Ovo će ukloniti i upozorenja o curenju podataka koja se nalaze ovdje. Ovu radnju nije moguće poništiti.
+        [one] Ovo će ukloniti prijavu spremljenu u { -brand-short-name }u na svim uređajima sinkroniziranim s tvojim { -fxaccount-brand-name }. Ovo će ukloniti i upozorenja o curenju podataka koja se nalaze ovdje. Ovu radnju nije moguće poništiti.
+        [few] Ovo će ukloniti prijave spremljene u { -brand-short-name }u na svim uređajima sinkroniziranim s tvojim { -fxaccount-brand-name }. Ovo će ukloniti i upozorenja o curenju podataka koja se nalaze ovdje. Ovu radnju nije moguće poništiti.
+       *[other] Ovo će ukloniti prijave spremljene u { -brand-short-name }u na svim uređajima sinkroniziranim s tvojim { -fxaccount-brand-name }. Ovo će ukloniti i upozorenja o curenju podataka koja se nalaze ovdje. Ovu radnju nije moguće poništiti.
+    }
 about-logins-confirm-export-dialog-title = Izvezi prijave i lozinke
 about-logins-confirm-export-dialog-message = Vaše lozinke bit će spremljene kao �itljivi tekst (npr. Loš@L0zinka) pa će ih moći vidjeti svi koji mogu otvoriti izvezenu datoteku.
 about-logins-confirm-export-dialog-confirm-button = Izvoz…
+about-logins-alert-import-title = Uvoz je dovršen
+about-logins-alert-import-message = Pogledaj detaljni sažetak uvoza
 confirm-discard-changes-dialog-title = Odbaciti nespremljene promjene?
 confirm-discard-changes-dialog-message = Sve nespremljene promjene će se izgubiti.
 confirm-discard-changes-dialog-confirm-button = Odbaci
@@ -261,3 +276,34 @@
         [macos] CSV dokument
        *[other] CSV datoteka
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Uvoz je dovršen
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Dodano novih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Dodano novih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Dodano novih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Ažurirano postojećih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Ažurirano postojećih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Ažurirano postojećih prijava:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] Pronađeno dvostrukih prijava:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+        [few] Pronađeno dvostrukih prijava:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+       *[other] Pronađeno dvostrukih prijava:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Greške:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+        [few] <span>Greške:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+       *[other] <span>Greške:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nije uvezeno)</span>
+    }
+about-logins-import-dialog-done = Gotovo
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/hr/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/appmenu.ftl	2021-01-06 11:39:10.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/appmenu.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Novi prozor
+appmenuitem-new-private-window =
+    .label = Novi privatni prozor
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Uvećaj
 appmenuitem-zoom-reduce =
     .label = Umanji
+appmenuitem-fullscreen =
+    .label = Cjeloekranski prikaz
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinkroniziraj sada
+appmenuitem-save-page =
+    .label = Spremi stranicu kao …
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Å to je novo
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/hr/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/appMenuNotifications.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/appMenuNotifications.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ne sada
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Nakon brzog ponovnog pokretanja, { -brand-shorter-name } će vratiti sve tvoje otvorene kartice i prozore koji se ne nalaze u modusu privatnog pregledavanja.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ne može se automatski aktualizirati na najnoviju verziju.
+    .buttonlabel = Aktualiziraj ipak { -brand-shorter-name }
+    .buttonaccesskey = A
+    .secondarybuttonlabel = Ne sada
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Novo aktualiziranje za { -brand-shorter-name } je dostupno, ali ne može se instalirati jer je pokrenuta druga instanca { -brand-shorter-name }a. Potrebno ju je zatvoriti za nastavak aktualizacije ili ipak nastaviti aktualizaciju bez zatvaranja (druga instanca možda neće raditi ispravno dok nije ponovno pokrenuta).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = U redu, razumijem
     .buttonaccesskey = U
@@ -39,7 +46,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Dozvoli ovom dodatku da radi u privatnom prozoru
     .accesskey = a
-    
 appmenu-new-tab-controlled =
     .label = Tvoja nova kartica je promijenjena.
     .buttonlabel = Zadrži promjene
@@ -52,6 +58,18 @@
     .buttonaccesskey = Z
     .secondarybuttonlabel = Onemogući dodatak
     .secondarybuttonaccesskey = d
+appmenu-new-tab-controlled-changes =
+    .label = Tvoja nova kartica je promijenjena.
+    .buttonlabel = Zadrži promjene
+    .buttonaccesskey = Z
+    .secondarybuttonlabel = Upravljaj novim karticama
+    .secondarybuttonaccesskey = U
+appmenu-homepage-controlled-changes =
+    .label = Tvoja po�etna stranica je promijenjena.
+    .buttonlabel = Zadrži promjene
+    .buttonaccesskey = Z
+    .secondarybuttonlabel = Upravljaj po�etnom stranicom
+    .secondarybuttonaccesskey = U
 appmenu-tab-hide-controlled =
     .label = Pristupite svojim skrivenim karticama
     .buttonlabel = Drži kartice skrivenim
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/browser.ftl firefox-85.0+build1/l10n/hr/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/browser.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/browser.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -303,6 +303,8 @@
 identity-https-only-info-no-upgrade = Nije moguće nadograditi vezu s HTTP-a.
 identity-permissions =
     .value = Dozvole
+identity-permissions-storage-access-header = Međustrani�ni kola�ići
+identity-permissions-storage-access-hint = Ove stranke mogu koristiti kola�iće i podatke dijeljene među više stranica dok ste na toj stranici.
 identity-permissions-reload-hint = Stranica se možda mora ponovo u�itati, kako bi se primijenile promjene.
 identity-permissions-empty = Ovoj stranici niste dali nikakva posebna dopuštenja.
 identity-clear-site-data =
@@ -503,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ima kontrolu nad pokaziva�em. Pritisnite tipku Esc da biste preuzeli kontrolu.
 pointerlock-warning-no-domain = Ovaj dokument ima kontrolu nad pokaziva�em. Pritisnite tipku Esc kako biste preuzeli kontrolu.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Prikaži sve zabilješke
+bookmarks-recent-bookmarks =
+    .value = Nedavno zabilježeno
+bookmarks-toolbar-chevron =
+    .tooltiptext = Prikaži više zabilješki
+bookmarks-sidebar-content =
+    .aria-label = Zabilješke
+bookmarks-menu-button =
+    .label = Izbornik zabilješki
+bookmarks-other-bookmarks-menu =
+    .label = Druge zabilješke
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilne zabilješke
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sakrij bo�nu traku zabilješki
+           *[other] Prikaži okno zabilješki
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sakrij alatnu traku zabilješki
+           *[other] Prikaži traku zabilješki
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ukloni izbornik zabilješki iz alatne trake
+           *[other] Dodaj izbornik zabilješki u alatnu traku
+        }
+bookmarks-search =
+    .label = Pretraži zabilješke
+bookmarks-tools =
+    .label = Alatna traka zabilješki
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Alatna traka zabilješki
+    .accesskey = z
+    .aria-label = Zabilješke
+bookmarks-toolbar-menu =
+    .label = Alatna traka zabilješki
+bookmarks-toolbar-placeholder =
+    .title = Stavke alatne trake zabilješki
+bookmarks-toolbar-placeholder-button =
+    .label = Stavke alatne trake zabilješki
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Zabilješke
+library-bookmarks-bookmark-this-page =
+    .label = Zabilježi ovu stranicu
+library-bookmarks-bookmark-edit =
+    .label = Uredi ovu zabilješku
+library-recent-activity-label = Nedavna aktivnost
+
+## More items
+
+more-menu-go-offline =
+    .label = Izvanmrežni rad
+    .accesskey = v
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/browserSets.ftl firefox-85.0+build1/l10n/hr/browser/browser/browserSets.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/browserSets.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/browserSets.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -119,8 +119,18 @@
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
+bookmark-show-library-shortcut =
+    .key = O
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
 bookmark-show-sidebar-shortcut =
     .key = b
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-toolbar-shortcut =
+    .key = B
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/migration.ftl firefox-85.0+build1/l10n/hr/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/migration.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/migration.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = ÄŒarobnjak uvoza
-
 import-from =
     { PLATFORM() ->
         [windows] Uvezi opcije, zabilješke, povijest pretraživanja, lozinke i ostale podatke iz:
        *[other] Uvezi postavke, zabilješke, povijest, lozinke i ostale podatke iz:
     }
-
 import-from-bookmarks = Uvezi zabilješke iz:
 import-from-ie =
     .label = Microsoft Internet Explorer
@@ -51,34 +49,25 @@
 import-from-360se =
     .label = 360 siguran preglednik
     .accesskey = 3
-
 no-migration-sources = Niti jedan program koji sadrži zabilješke, povijest pretraživanja ili lozinke nije pronađen.
-
 import-source-page-title = Uvezi postavke i podatke
 import-items-page-title = Stavke za uvoz
-
 import-items-description = Odaberi stavke za uvoz:
-
+import-permissions-page-title = Odobri { -brand-short-name }u dozvole
+# Do not translate "Bookmarks.plist"; the file name is the same everywhere.
+import-permissions-description = macOS zahtijeva da izri�ito dopustiš { -brand-short-name }u pristup zabilješkama u Safariju. Klikni na “Nastavi� i odaberi datoteku “Bookmarks.plist� u prozoru File Open koji će se pojaviti.
 import-migrating-page-title = Uvozi se …
-
 import-migrating-description = Sljedeće stavke se trenuta�no uvoze …
-
 import-select-profile-page-title = Odaberi profil
-
 import-select-profile-description = Uvoz je moguć iz sljedećih profila:
-
 import-done-page-title = Uvoz završen
-
 import-done-description = Sljedeće stavke su uspješno uvezene:
-
 import-close-source-browser = Prije nastavka, provjeri je li odabrani preglednik zatvoren.
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = From { $source }
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
 source-name-edge-beta = Microsoft Edge beta
@@ -90,7 +79,6 @@
 source-name-chromium = Chromium
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 siguran preglednik
-
 imported-safari-reading-list = Popis �itanja (iz Safarija)
 imported-edge-reading-list = Popis �itanja (sa Edgea)
 
@@ -112,7 +100,6 @@
     .label = Kola�ići
 browser-data-cookies-label =
     .value = Kola�ići
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -125,12 +112,10 @@
             [firefox] Povijest pregledavanja i zabilješke
            *[other] Povijest pregledavanja
         }
-
 browser-data-formdata-checkbox =
     .label = Spremljeno iz povijesti
 browser-data-formdata-label =
     .value = Spremljeno iz povijesti
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -139,7 +124,6 @@
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-label =
     .value = Spremljene prijave i lozinke
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -154,12 +138,10 @@
             [edge] Favoriti
            *[other] Zabilješke
         }
-
 browser-data-otherdata-checkbox =
     .label = Ostali podaci
 browser-data-otherdata-label =
     .label = Ostali podaci
-
 browser-data-session-checkbox =
     .label = Prozori i kartice
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/hr/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/asrouter.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/newtab/asrouter.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -127,6 +127,9 @@
 
 cfr-whatsnew-searchbar-title = Tipkaj manje, pronađi više s adresnom trakom
 cfr-whatsnew-searchbar-body-topsites = Sada, jednostavno odaberi adresnu traku i rasklopit će se jedan okvir s poveznicama tvojih najkorištenijih stranica.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Ikona za povećalo
 
 ## Picture-in-Picture
@@ -279,3 +282,18 @@
 cfr-whatsnew-media-keys-header = Više medijskih kontrola
 cfr-whatsnew-media-keys-body = Reproduciraj i zaustavi audio ili videosnimku pomoću tipkovnice ili slušalica, što olakšava upravljanje medijima iz jedne druge kartice, programa ili �ak kad je ra�unalo zaklju�ano. Između snimaka se možeš kretati i pomoću tipki za naprijed i natrag.
 cfr-whatsnew-media-keys-button = Saznaj kako
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Pre�aci za pretraživanje u adresnoj traci
+cfr-whatsnew-search-shortcuts-body = Sada, kada u adresnu traku upišeš tražilicu ili određenu stranica, plavi pre�ac će se pojaviti u prijedlozima za pretraživanje ispod. Odaberi taj pre�ac za dovršavanje pretraživanja direktno u adresnoj traci.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Zaštita od zlonamjernih superkola�ića
+cfr-whatsnew-supercookies-body = Web stranice mogu potajno postaviti “superkola�ić� u tvoj preglednik koji te može pratiti na webu, �ak i nakon brisanja kola�ića. { -brand-short-name } sada pruža snažnu zaštitu protiv superkola�ića kako ne bi mogli pratiti tvoju aktivnost među stranicama na mreži.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Bolje zabilješke
+cfr-whatsnew-bookmarking-body = Lakše je pratiti tvoje omiljene stranice. { -brand-short-name } sada pamti tvoje preferirano mjesto za spremljene zabilješke, prikazuje alatnu traku zabilješki na novim karticama prema zadanim postavkama i omogućuje ti jednostavan pristup ostatku tvojih zabilješki pomoću mape na alatnoj traci.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/hr/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/newtab.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/newtab/newtab.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nova kartica
 newtab-settings-button =
     .title = Prilagodi stranicu za nove kartice
+newtab-personalize-button-label = Personaliziraj
+    .title = Personaliziraj novu karticu
+    .aria-label = Personaliziraj novu karticu
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Pretraži web
     .title = Pretraži web
     .aria-label = Pretraži web
+newtab-search-box-text = Pretraži web
+newtab-search-box-input =
+    .placeholder = Pretraži web
+    .aria-label = Pretraži web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Dodaj tražilicu
 newtab-topsites-add-topsites-header = Nova najbolja stranica
+newtab-topsites-add-shortcut-header = Novi pre�ac
 newtab-topsites-edit-topsites-header = Uredi najbolju stranicu
+newtab-topsites-edit-shortcut-header = Uredi pre�ac
 newtab-topsites-title-label = Naslov
 newtab-topsites-title-input =
     .placeholder = Upiši naslov
@@ -171,6 +180,7 @@
 
 newtab-section-header-topsites = Najbolje stranice
 newtab-section-header-highlights = Istaknuto
+newtab-section-header-recent-activity = Nedavna aktivnost
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Preporu�eno od { $provider }
@@ -206,3 +216,28 @@
 
 newtab-error-fallback-info = Došlo je do greške prilikom u�itavanja ovog sadržaja.
 newtab-error-fallback-refresh-link = Osvježi stranicu za ponovni pokušaj.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Pre�aci
+newtab-custom-shortcuts-subtitle = Stranice koje spremiš ili posjetiš
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } red
+        [few] { $num } reda
+       *[other] { $num } redova
+    }
+newtab-custom-sponsored-sites = Sponzorirani pre�aci
+newtab-custom-pocket-title = Preporuke iz { -pocket-brand-name }a
+newtab-custom-pocket-subtitle = Izuzetan sadržaj kojeg odabire { -pocket-brand-name }, dio obitelji { -brand-product-name }
+newtab-custom-pocket-sponsored = Sponzorirane pri�e
+newtab-custom-recent-title = Nedavna aktivnost
+newtab-custom-recent-subtitle = Izbor nedavnih stranica i sadržaja
+newtab-custom-close-button = Zatvori
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Isje�ci
+newtab-custom-snippets-subtitle = Savjeti i vijesti od { -vendor-short-name } i { -brand-product-name }
+newtab-custom-settings = Upravljaj dodatnim postavkama
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/hr/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/newtab/onboarding.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/newtab/onboarding.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -90,6 +90,11 @@
 ## Custom Return To AMO onboarding strings
 
 return-to-amo-subtitle = Super, koristite { -brand-short-name }
+# <img data-l10n-name="icon"/> will be replaced with the icon belonging to the extension
+#
+# Variables:
+#   $addon-name (String) - Name of the add-on
+return-to-amo-addon-title = Dohvatimo ti sada <img data-l10n-name="icon"/> <b>{ $addon-name }</b>.
 return-to-amo-add-extension-label = Dodaj proširenje
 
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/places.ftl firefox-85.0+build1/l10n/hr/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/places.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/places.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podmapa
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Druge zabilješke
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/preferences/languages.ftl firefox-85.0+build1/l10n/hr/browser/browser/preferences/languages.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/preferences/languages.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/preferences/languages.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -5,34 +5,25 @@
 webpage-languages-window =
     .title = Postavke jezika web stranice
     .style = width: 40em
-
 languages-close-key =
     .key = w
-
 languages-description = Web stranice su ponekad dostupne na više jezika. Odaberi jezike za prikaz tih web stranica prema preferiranom redoslijedu
-
 languages-customize-spoof-english =
     .label = Zatraži engleske verzije web stranica radi poboljšane privatnosti
-
 languages-customize-moveup =
     .label = Pomakni gore
     .accesskey = g
-
 languages-customize-movedown =
     .label = Pomakni dolje
     .accesskey = d
-
 languages-customize-remove =
     .label = Ukloni
     .accesskey = U
-
 languages-customize-select-language =
     .placeholder = Odaberi jezik koji želiš dodati …
-
 languages-customize-add =
     .label = Dodaj
     .accesskey = a
-
 # The pattern used to generate strings presented to the user in the
 # locale selection list.
 #
@@ -45,29 +36,20 @@
 #   $code (String) - Locale code of the locale (for example: "is", "es-CL")
 languages-code-format =
     .label = { $locale }  [{ $code }]
-
 languages-active-code-format =
     .value = { languages-code-format.label }
-
 browser-languages-window =
-    .title = { -brand-short-name } postavke jezika
+    .title = Postavke jezika za { -brand-short-name }
     .style = width: 40em
-
 browser-languages-description = { -brand-short-name } će prikazati prvi jezik kao standardni, dok će alternativne jezike prikazati ukoliko je potrebno prema redoslijedu pojavljivanja.
-
 browser-languages-search = Traži više jezika…
-
 browser-languages-searching =
     .label = Traženje jezika …
-
 browser-languages-downloading =
     .label = Preuzimanje …
-
 browser-languages-select-language =
     .label = Odaberi jezik koji želiš dodati …
     .placeholder = Odaberi jezik koji želiš dodati …
-
 browser-languages-installed-label = Instalirani jezici
 browser-languages-available-label = Dostupni jezici
-
 browser-languages-error = { -brand-short-name } trenuta�no ne može aktualizirati tvoje jezike. Provjeri vezu s internetom ili pokušaj ponovo.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/hr/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/preferences/preferences.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/preferences/preferences.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -52,6 +52,9 @@
 pane-experimental-subtitle = Nastavi s oprezom
 pane-experimental-search-results-header = { -brand-short-name } eksperimenti: Nastavi s oprezom
 pane-experimental-description = Mijenjanje naprednih postavki konfiguracije može utjecati na perfomancu ili sigurnost programa { -brand-short-name }.
+pane-experimental-reset =
+    .label = Vrati zadano
+    .accesskey = r
 help-button-label = Podrška za { -brand-short-name }
 addons-button-label = Proširenja i teme
 focus-search =
@@ -129,7 +132,7 @@
     .label = Dozvoli da se { -brand-short-name } i Firefox pokrenu istovremeno
 use-firefox-sync = Savjet: Ovo koristi odvojene profile. Koristi { -sync-brand-short-name } za dijeljenje podataka između njih.
 get-started-not-logged-in = Prijavi se u { -sync-brand-short-name }…
-get-started-configured = Otvori { -sync-brand-short-name } postavke
+get-started-configured = Otvori postavke za { -sync-brand-short-name }
 always-check-default =
     .label = Uvijek provjeri je li { -brand-short-name } standardni preglednik
     .accesskey = z
@@ -348,7 +351,7 @@
 
 ##
 
-drm-content-header = Digital Rights Management (DRM) sadržaj
+drm-content-header = Sadržaj kontroliran DRM-om (Digital Rights Management)
 play-drm-content =
     .label = Reproduciraj DRM-kontrolirani sadržaj
     .accesskey = p
@@ -500,6 +503,11 @@
 home-prefs-topsites-description = Stranice koje najviše posjećujete
 home-prefs-topsites-by-option-sponsored =
     .label = Sponzorirane najpopularnije stranice
+home-prefs-shortcuts-header =
+    .label = Pre�aci
+home-prefs-shortcuts-description = Stranice koje spremiš ili posjetiš
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponzorirani pre�aci
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Preporu�eno od { $provider }
 home-prefs-recommended-by-description-update = Izniman sadržaj sa svih strana weba, kojeg izabire { $provider }
+home-prefs-recommended-by-description-new = Izuzetan sadržaj kojeg odabire { $provider }, dio obitelji { -brand-product-name }
 
 ##
 
@@ -524,6 +533,9 @@
     .label = Najnovije preuzimanje
 home-prefs-highlights-option-saved-to-pocket =
     .label = Stranice spremljene u { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Nedavna aktivnost
+home-prefs-recent-activity-description = Izbor nedavnih stranica i sadržaja
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -531,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Isje�ci
 home-prefs-snippets-description = Aktualiziranje od { -vendor-short-name } i { -brand-product-name }a
+home-prefs-snippets-description-new = Savjeti i vijesti od { -vendor-short-name } i { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -885,6 +898,10 @@
     .label = Programi za praćenje među razli�itim web lokacijama
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Programi za praćenje među razli�itim web lokacijama i društvenim mrežama
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Međustrani�ni kola�ići za praćenje — uklju�uje kola�iće društvenih mreža
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Međustrani�ni kola�ići (cross-site cookies) — uklju�uje kola�iće društvenih mreža
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Pratitelji između više stranica, medijski pratitelji, te izoliranje preostalih kola�ića
 sitedata-option-block-unvisited =
@@ -919,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = Otvorene kartice
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Pre�aci (S)
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Najbolje stranice
     .accesskey = N
+addressbar-locbar-engines-option =
+    .label = Tražilice
+    .accesskey = a
 addressbar-suggestions-settings = Promijeni postavke za prijedloge tražilica
 
 ## Privacy Section - Content Blocking
@@ -950,6 +974,7 @@
 content-blocking-etp-strict-desc = Ja�a zaštita, ali može prouzro�iti probleme nekim web-stanicama ili sadržajima.
 content-blocking-etp-custom-desc = Odaberi programe za praćenje i skripte koje želiš blokirati.
 content-blocking-private-windows = Praćenje sadržaja u privatnim prozorima
+content-blocking-cross-site-cookies = Međustrani�ni kola�ići
 content-blocking-cross-site-tracking-cookies = Višestrani�ni kola�ići za praćenje
 content-blocking-cross-site-tracking-cookies-plus-isolate = Pratitelji između više stranica, te izoliranje preostalih kola�ića
 content-blocking-social-media-trackers = Programi za praćenje s društvenih mreža
@@ -961,6 +986,7 @@
 content-blocking-fingerprinters = Jedinstvene otiske
 content-blocking-warning-title = Upozorenje!
 content-blocking-and-isolating-etp-warning-description = Blokiranje pratitelja i izoliranje kola�ića može utjecati na funkcionalnost nekih stranica. Ponovno u�itajte stranicu sa pratiteljem kako bi se u�itao sav sadržaj.
+content-blocking-and-isolating-etp-warning-description-2 = Ova postavka može uzrokovati da neke web stranice ne prikazuju sadržaj ili ne rade ispravno. Ako se neka stranica �ini slomljenom, možda ćeš htjeti isklju�iti zaštitu od praćenja da bi ta stranica u�itala sav sadržaj.
 content-blocking-warning-learn-how = Saznaj kako
 content-blocking-reload-description = Morat ćeš ponovo u�itati svoje kartice, kako bi se ove promjene primijenile.
 content-blocking-reload-tabs-button =
@@ -1048,7 +1074,7 @@
 ## Privacy Section - Data Collection
 
 collection-header = { -brand-short-name } – prikupljanje i upotreba podataka
-collection-description = Želimo ti omogu�iti izbor i prikupljati samo onoliko koliko nam treba da omogu�imo i unaprijedimo { -brand-short-name } za sve. Uvijek pitamo za dozvolu prije nego što po�nemo primati osobne informacije.
+collection-description = Želimo ti omogućiti izbor i prikupljati samo ono što nam treba da bismo pružali i unaprijedili { -brand-short-name } za sve. Uvijek pitamo za dozvolu prije nego što po�nemo primati osobne informacije.
 collection-privacy-notice = Politika privatnosti
 collection-health-report-telemetry-disabled = Više ne dopuštaš { -vendor-short-name } snimanje tehni�kih podataka i podataka o interakciji. Svi stari podaci biti će izbrisani u roku od 30 dana.
 collection-health-report-telemetry-disabled-link = Saznaj više
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/protections.ftl firefox-85.0+build1/l10n/hr/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/protections.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/protections.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -26,9 +26,14 @@
 graph-week-summary-private-window = Programi za praćenje, koje je { -brand-short-name } blokirao ovaj tjedan
 protection-report-webpage-title = Nadzorna plo�a zaštite
 protection-report-page-content-title = Nadzorna plo�a zaštite
+# This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
+protection-report-page-summary = { -brand-short-name } može zaštititi tvoju privatnost iza scene dok surfaš. Ovo je personalizirani sažetak te zaštite, uklju�ujući alate za preuzimanje kontrole nad vlastitom sigurnošću na webu.
+# This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
+protection-report-page-summary-default = { -brand-short-name } štiti tvoju privatnost iza scene dok surfaš. Ovo je personalizirani sažetak te zaštite, uklju�ujući alate za preuzimanje kontrole nad vlastitom sigurnošću na webu.
 protection-report-settings-link = Upravljaj svojim postavkama za privatnost i sigurnost
 etp-card-title-always = Poboljšana zaštita od praćenja: uvijek uklju�eno
 etp-card-title-custom-not-blocking = Poboljšana zaštita od praćenja: ISKLJUČENO
+etp-card-content-description = { -brand-short-name } automatski sprje�ava tvrtke da te potajno prate širom weba.
 protection-report-etp-card-content-custom-not-blocking = Sve zaštite su trenuta�no isklju�ene. Upravljaj programima za praćenje koje želiš blokirati u { -brand-short-name } postavkama zaštite.
 protection-report-manage-protections = Upravljaj postavkama
 # This string is used to label the X axis of a graph. Other days of the week are generated via Intl.DateTimeFormat,
@@ -67,9 +72,9 @@
 # $count (Number) - Number of passwords exposed in data breaches.
 lockwise-scanned-text-breached-logins =
     { $count ->
-        [one] { $count } lozinka je možda izložena curenju podataka.
-        [few] { $count } lozinke su možda izložene curenju podataka.
-       *[other] { $count } lozinki je možda izloženo curenju podataka.
+        [one] 1 lozinka možda je izložena u curenju podataka.
+        [few] { $count } lozinke možda su izložene u curenju podataka.
+       *[other] { $count } lozinki možda je izloženo u curenju podataka.
     }
 # While English doesn't use the number in the plural form, you can add $count to your language
 # if needed for grammatical reasons.
@@ -102,9 +107,9 @@
 # your localization, because it would result in the number showing twice.
 info-monitored-emails =
     { $count ->
-        [one] Adresa e-pošte se nadgleda
-        [few] Adrese e-pošte se nadgledaju
-       *[other] Adresa e-pošte se nadgleda
+        [one] adresa e-pošte se nadgleda
+        [few] adrese e-pošte se nadgledaju
+       *[other] adresa e-pošte se nadgleda
     }
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches. Don’t add $count to
@@ -120,9 +125,9 @@
 # to your localization, because it would result in the number showing twice.
 info-known-breaches-resolved =
     { $count ->
-        [one] Poznato curenje podataka ozna�eno kao riješeno
-        [few] Poznata curenja podataka ozna�ena kao riješena
-       *[other] Poznatih curenja podataka ozna�ena kao riješena
+        [one] poznato curenje podataka ozna�eno kao riješeno
+        [few] poznata curenja podataka ozna�ena kao riješena
+       *[other] poznatih curenja podataka ozna�enih kao riješena
     }
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords. Don’t add $count to
@@ -138,9 +143,9 @@
 # to your localization, because it would result in the number showing twice.
 info-exposed-passwords-resolved =
     { $count ->
-        [one] Lozinka izložena u neriješenim curenjima podataka
-        [few] Lozinke izložene u neriješenim curenjima podataka
-       *[other] Lozinki izloženo u neriješenim curenjima podataka
+        [one] lozinka izložena u neriješenim curenjima podataka
+        [few] lozinke izložene u neriješenim curenjima podataka
+       *[other] lozinki izloženo u neriješenim curenjima podataka
     }
 monitor-no-breaches-title = Dobre vijesti!
 monitor-no-breaches-description = Ne pojavljuješ se u poznatim curenjima podataka. Ako se to promijeni, obavijestit ćemo te.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/hr/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -19,6 +19,8 @@
 safeb-blocked-malware-page-error-desc-override = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> je <a data-l10n-name='error_desc_link'>prijavljena da sadrži zlonamjeran softver</a>. Možete <a data-l10n-name='report_detection'>prijaviti problem</a> ili <a data-l10n-name='ignore_warning_link'>ignorirati rizik</a> i posjetiti ovu nesigurnu stranicu.
 safeb-blocked-malware-page-error-desc-no-override = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> je prijavljena da <a data-l10n-name='error_desc_link'>sadrži zlonamjeran softver</a>. Možete <a data-l10n-name='report_detection'>prijaviti problem</a>.
 safeb-blocked-malware-page-learn-more = Saznaj više o štetnom web sadržaju uklju�ujući viruse i druge štetne softvere te kako zaštititi tvoje ra�unalo na <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Saznaj više o { -brand-short-name } zaštiti od phishinga i štetnog softvera na <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> prijavljena je da <a data-l10n-name='error_desc_link'>sadrži zloćudni softver</a>. Možeš <a data-l10n-name='ignore_warning_link'>ignorirati rizik</a> i posjetiti ovu nesigurnu stranicu.
+safeb-blocked-malware-page-error-desc-no-override-sumo = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> prijavljena je da <a data-l10n-name='error_desc_link'>sadrži zloćudni softver</a>.
 safeb-blocked-malware-page-learn-more-sumo = Saznaj više o { -brand-short-name }ovoj zaštiti od phishinga i zlonamjernog softvera na <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> je <a data-l10n-name='error_desc_link'>prijavljena da sadrži štetan softver</a>. Možete <a data-l10n-name='ignore_warning_link'>ignorirati rizik</a> i posjetiti ovu nesigurnu stranicu.
 safeb-blocked-unwanted-page-error-desc-no-override = Stranica <span data-l10n-name='sitename'>{ $sitename }</span> je <a data-l10n-name='error_desc_link'>prijavljena da sadrži štetan softver</a>.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/safeMode.ftl firefox-85.0+build1/l10n/hr/browser/browser/safeMode.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/safeMode.ftl	2021-01-06 11:39:10.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/safeMode.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -10,7 +10,7 @@
 refresh-profile =
     .label = Resetiraj { -brand-short-name }
 safe-mode-description = Siguran na�in rada je poseban na�in rada u kojem se mogu otklanjati greške nastale u { -brand-short-name }u.
-safe-mode-description-details = Tvoji dodaci i prilagođene postavke će privremeno biti onemogućene i neke { -brand-short-name } mogućnosti možda neće raditi kako trenuta�no rade.
+safe-mode-description-details = Tvoji dodaci i prilagođene postavke privremeno će biti onemogućene i neke mogućnosti za { -brand-short-name } možda neće raditi kako trenuta�no rade.
 refresh-profile-instead = Otklanjanje grešaka možeš presko�iti i pokušati ponovo u�itati { -brand-short-name }.
-# Shown on the safe mode dialog after multiple startup crashes. 
+# Shown on the safe mode dialog after multiple startup crashes.
 auto-safe-mode-description = { -brand-short-name } se prilikom pokretanja neo�ekivano zatvorio. Uzrok može biti jedan od dodataka ili neki drugi problem. Problem možete pokušati otkloniti pomoću sigurnog na�ina rada.
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/syncedTabs.ftl firefox-85.0+build1/l10n/hr/browser/browser/syncedTabs.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/syncedTabs.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/syncedTabs.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -7,7 +7,7 @@
 synced-tabs-sidebar-intro = Pogledaj popis kartica s tvojih ostalih uređaja.
 synced-tabs-sidebar-unverified = Tvoj ra�un mora biti potvrđen.
 synced-tabs-sidebar-notabs = Nema otvorenih kartica
-synced-tabs-sidebar-openprefs = Otvori { -sync-brand-short-name } postavke
+synced-tabs-sidebar-openprefs = Otvori postavke za { -sync-brand-short-name }
 synced-tabs-sidebar-tabsnotsyncing = Uklju�i sinkronizaciju kartica za prikaz kartica s tvojih ostalih uređaja.
 synced-tabs-sidebar-connect-another-device = Poveži dodatni uređaj
 synced-tabs-sidebar-search =
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/hr/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/hr/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -62,3 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Samo za nove kartice
     .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Uvijek prikaži
+    .accesskey = U
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nikad ne prikaži
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Prikaži samo na novoj kartici
+    .accesskey = o
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Prikaži druge zabilješke
+    .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/app-extension-fields.properties firefox-85.0+build1/l10n/hr/browser/chrome/browser/app-extension-fields.properties
--- firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/app-extension-fields.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/chrome/browser/app-extension-fields.properties	2021-01-18 20:04:56.000000000 +0000
@@ -4,7 +4,7 @@
 
 # LOCALIZATION NOTE (extension.firefox-compact-light@mozilla.org.name): This is displayed in about:addons -> Appearance
 extension.firefox-compact-light@mozilla.org.name=Svijetla
-extension.firefox-compact-light@mozilla.org.description=Motiv sa svjetlom shemom boja.
+extension.firefox-compact-light@mozilla.org.description=Motiv sa svijetlom shemom boja.
 
 # LOCALIZATION NOTE (extension.firefox-compact-dark@mozilla.org.name): This is displayed in about:addons -> Appearance
 extension.firefox-compact-dark@mozilla.org.name=Tamna
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/hr/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/browser.dtd	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/chrome/browser/browser.dtd	2021-01-18 20:04:56.000000000 +0000
@@ -48,7 +48,7 @@
 <!-- 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.syncSettings2.label "&syncBrand.shortName.label; Postavke">
+<!ENTITY fxa.menu.syncSettings2.label "Postavke za &syncBrand.shortName.label;">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Poveži novi uređaj…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
 <!ENTITY fxa.menu.signin.label "Prijavi se u &brandProductName;">
@@ -216,6 +216,9 @@
 <!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
   "Pocket" is a brand name. -->
 <!ENTITY saveToPocketCmd.label        "Spremi stranicu u Pocket">
+
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY pocketMenuitem.label         "Prikaži Pocket popis">
 
 <!ENTITY emailPageCmd.label           "Pošalji poveznicu e-poštom…">
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/hr/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/hr/browser/chrome/browser/browser.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/chrome/browser/browser.properties	2021-01-18 20:04:56.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=P
 getUserMedia.pickWindowOrScreen.label = Odaberi prozor ili ekran
 getUserMedia.shareEntireScreen.label = Cijeli ekran
+getUserMedia.sharePipeWirePortal.label = Koristi postavke operacijskog sustava
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/hr/browser/installer/custom.properties firefox-85.0+build1/l10n/hr/browser/installer/custom.properties
--- firefox-84.0.2+build1/l10n/hr/browser/installer/custom.properties	2021-01-06 11:39:10.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/browser/installer/custom.properties	2021-01-18 20:04:56.000000000 +0000
@@ -19,7 +19,7 @@
 # from en-US contains a \n.
 
 REG_APP_DESC=$BrandShortName pruža sigurno i jednostavno Internet pretraživanje. Poznato korisni�ko su�elje, poboljšana sigurnost, što uklju�uje zaštitu od krađe identiteta, te integrirani pretraživa� omogućavaju vam da od Weba dobijete sve što možete.
-CONTEXT_OPTIONS=$BrandShortName &Mogućnosti
+CONTEXT_OPTIONS=&Mogućnosti za $BrandShortName
 CONTEXT_SAFE_MODE=$BrandShortName &Siguran na�in
 OPTIONS_PAGE_TITLE=Tip instalacije
 OPTIONS_PAGE_SUBTITLE=Odaberi opcije instalacije
diff -Nru firefox-84.0.2+build1/l10n/hr/devtools/client/compatibility.ftl firefox-85.0+build1/l10n/hr/devtools/client/compatibility.ftl
--- firefox-84.0.2+build1/l10n/hr/devtools/client/compatibility.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/devtools/client/compatibility.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -12,6 +12,7 @@
 
 compatibility-issue-deprecated = (obustavljeno)
 compatibility-issue-experimental = (eksperimentalno)
+compatibility-issue-prefixneeded = (potreban je prefiks)
 compatibility-issue-deprecated-experimental = (obustavljeno, eksperimentalno)
 
 ## Messages used as labels and titles for buttons in the footer
@@ -39,7 +40,6 @@
         [few] { $number } pojavljivanja
        *[other] { $number } pojavljivanja
     }
-
 compatibility-no-issues-found = Nema problema s kompatibilnošću.
 compatibility-close-settings-button =
     .title = Zatvori postavke
diff -Nru firefox-84.0.2+build1/l10n/hr/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/hr/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/hr/devtools/client/tooltips.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/devtools/client/tooltips.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -12,39 +12,20 @@
 ## the property is not applied.
 ## Variables:
 ##   $property (string) - A CSS property name e.g. "color".
-
-
-## In the Rule View when a CSS property cannot be successfully applied we display
-## an icon. When this icon is hovered this message is displayed to explain why
-## the property is not applied.
-## Variables:
-##   $property (string) - A CSS property name e.g. "color".
 ##   $display (string) - A CSS display value e.g. "inline-block".
 
 inactive-css-not-grid-or-flex-container = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije niti fleks-kontejner niti grid-kontejner.
-
 inactive-css-not-grid-or-flex-container-or-multicol-container = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije fleks-kontejner, grid-kontejner ili višestup�ani kontejner.
-
 inactive-css-not-grid-or-flex-item = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije mrežni ili fleks element.
-
 inactive-css-not-grid-item = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije mrežni element.
-
 inactive-css-not-grid-container = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije grid-kontejner.
-
 inactive-css-not-flex-item = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije fleks element.
-
 inactive-css-not-flex-container = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije fleks-kontejner.
-
 inactive-css-not-inline-or-tablecell = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije linijski element ili ćelija tablice.
-
 inactive-css-property-because-of-display = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da sadrži prikaz <strong>{ $display }</strong>.
-
 inactive-css-not-display-block-on-floated = Vrijednost za <strong>display</strong> promijenjena je u <strong>block</strong> jer je element postavljen na <strong>float<strong>.
-
 inactive-css-property-is-impossible-to-override-in-visited = Zbog ograni�enja <strong>:visited</strong> nije moguće nadja�ati <strong>{ $property }</strong>.
-
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da nije pozicionirani element.
-
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> ne utje�e na ovaj element, budući da <strong>overflow:hidden</strong> nije postavljeno.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
@@ -52,29 +33,17 @@
 ## the problem can be solved.
 
 inactive-css-not-grid-or-flex-container-fix = Pokušaj dodati <strong>display:grid</strong> ili <strong>display:flex</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Pokušaj dodati <strong>display:grid</strong>, <strong>display:flex</strong> ili <strong>columns:2</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-item-fix-2 = Pokušaj dodati <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong> ili <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-grid-item-fix-2 = Pokušaj dodati <strong>display:grid</strong> ili <strong>display:inline-grid</strong> nadređenom elementu stavke. { learn-more }
-
 inactive-css-not-grid-container-fix = Pokušaj dodati <strong>display:grid</strong> ili <strong>display:inline-grid</strong>. { learn-more }
-
 inactive-css-not-flex-item-fix-2 = Pokušaj dodati <strong>display:flex</strong> ili <strong>display:inline-flex</strong> nadređenom elementu stavke. { learn-more }
-
 inactive-css-not-flex-container-fix = Pokušaj dodati <strong>display:flex</strong> ili <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-inline-or-tablecell-fix = Pokušaj dodati <strong>display:inline</strong> ili <strong>display:table-cell</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-row-or-row-group-fix = Pokušaj dodati <strong>display:inline-block</strong> ili <strong>display:block</strong>. { learn-more }
-
 inactive-css-non-replaced-inline-or-table-column-or-column-group-fix = Pokušaj dodati <strong>display:inline-block</strong>. { learn-more }
-
 inactive-css-not-display-block-on-floated-fix = Pokušaj ukloniti <strong>float</strong> ili dodati <strong>display:block</strong>. { learn-more }
-
 inactive-css-position-property-on-unpositioned-box-fix = Pokušaj postaviti svojstvo <strong>position</strong> na nešto što nije <strong>static</strong>. { learn-more }
-
 inactive-text-overflow-when-no-overflow-fix = Pokušaj dodati <strong>overflow:hidden</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
@@ -84,3 +53,6 @@
 ##   $property (string) - A CSS declaration name e.g. "-moz-user-select" that can be a platform specific alias.
 ##   $rootProperty (string) - A raw CSS property name e.g. "user-select" that is not a platform specific alias.
 
+css-compatibility-experimental-message = <strong>{ $property }</strong> je eksperimentalno svojstvo. Nije podržano u sljedećim preglednicima:
+css-compatibility-experimental-supported-message = <strong>{ $property }</strong> je eksperimentalno svojstvo.
+css-compatibility-learn-more-message = <span data-l10n-name="link">Saznaj više</span> o <strong>{ $rootProperty }</strong>
diff -Nru firefox-84.0.2+build1/l10n/hr/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/hr/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/hr/dom/chrome/dom/dom.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/dom/chrome/dom/dom.properties	2021-01-18 20:04:56.000000000 +0000
@@ -290,7 +290,7 @@
 MotionEventWarning=Upotreba senzora za pokret je zastarjela.
 OrientationEventWarning=Upotreba senzora za usmjeravanje je zastarjela.
 ProximityEventWarning=Upotreba senzora za blizinu je zastarjela.
-AmbientLightEventWarning=Upotreba senzora za okružno svjetlo je zastarjela.
+AmbientLightEventWarning=Upotreba senzora za svjetlinu okoline je zastarjela.
 # LOCALIZATION NOTE: Do not translate "storage", "indexedDB.open" and "navigator.storage.persist()".
 # LOCALIZATION NOTE: do not localize key=“%S� modifiers=“%S� id=“%S�
 GTK2Conflict2=Tipkovni�ki događaj nije dostupan GTK2: tipka=“%S� modifikatori=“%S� id=“%S�
@@ -346,4 +346,7 @@
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess() and iframe.
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess(). In some locales it may be preferable to not translate "event handler", either.
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
+FolderUploadPrompt.title = Potvrdi prijenos
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message = Sigurno želite prenijeti sve datoteke iz “%S�? U�inite to samo ako vjerujete ovoj stranici.
+FolderUploadPrompt.acceptButtonLabel = Prijenos
diff -Nru firefox-84.0.2+build1/l10n/hr/dom/chrome/layout/MediaDocument.properties firefox-85.0+build1/l10n/hr/dom/chrome/layout/MediaDocument.properties
--- firefox-84.0.2+build1/l10n/hr/dom/chrome/layout/MediaDocument.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/dom/chrome/layout/MediaDocument.properties	2021-01-18 20:04:56.000000000 +0000
@@ -15,7 +15,7 @@
 MediaTitleWithFile=%S (%S Objekt)
 MediaTitleWithNoInfo=(%S Objekt)
 
-InvalidImage=Slika "%S" ne može biti prikazana, jer sadrži greške.
+InvalidImage=Slika \u201c%S\u201d ne može biti prikazana jer sadrži greške.
 ScaledImage=Skalirano (%S%%)
 
 TitleWithStatus=%S - %S
diff -Nru firefox-84.0.2+build1/l10n/hr/dom/dom/media.ftl firefox-85.0+build1/l10n/hr/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/hr/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/dom/dom/media.ftl	2021-01-18 20:04:56.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/.
+
+mediastatus-fallback-title = { -brand-short-name } reproducira medijski sadržaj
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:04:56.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d
 
 downloadErrorAlertTitle=Greška pri preuzimanju
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Preuzimanje se ne može spremiti jer ga blokira %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Preuzimanje se ne može spremiti jer ga blokira proširenje.
 downloadErrorGeneric=Ovo preuzimanje se ne može spremiti zbog nepoznate greške.\n\nPokušaj ponovo.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/downloads/unknownContentType.dtd firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
--- firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/downloads/unknownContentType.dtd	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/downloads/unknownContentType.dtd	2021-01-18 20:04:56.000000000 +0000
@@ -13,7 +13,7 @@
 <!ENTITY  saveFile.label              "Spremi datoteku">
 <!ENTITY  saveFile.accesskey          "S">
 
-<!ENTITY  rememberChoice.label        "Od sada u�ini to automatski za datoteke poput ove.">
+<!ENTITY  rememberChoice.label        "Ubuduće primijeni ovu radnju za ovu vrstu datoteka.">
 <!ENTITY  rememberChoice.accesskey    "a">
 
 <!ENTITY  whichIs.label              "koja je:">
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/profile/profileSelection.properties firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/profile/profileSelection.properties
--- firefox-84.0.2+build1/l10n/hr/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-18 20:04:56.000000000 +0000
@@ -7,6 +7,7 @@
 # Application not responding
 # LOCALIZATION NOTE (restartTitle, restartMessageNoUnlocker2, restartMessageUnlocker, restartMessageNoUnlockerMac, restartMessageUnlockerMac): Messages displayed when the application is running but is not responding to commands. %S is the application name.
 restartTitle=Zatvori %S
+restartMessageNoUnlocker2=%S je već pokrenut, ali ne reagira. Da biste koristili %S, prvo morate zatvoriti postojeći proces za %S, ponovno pokrenuti uređaj ili koristiti drugi profil.
 restartMessageUnlocker=%S je već pokrenut, ali ne odgovara. Stari %S proces mora biti zatvoren da bi se otvorio novi prozor.
 restartMessageNoUnlockerMac=Drugi primjerak %S je već otvoren. Istovremeno može biti otvoren samo jedan primjerak %S.
 restartMessageUnlockerMac=Drugi primjerak %S je već otvoren. Da bi se ovaj primjerak mogao otvoriti, pokrenuti primjerak %S će se zatvoriti.
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/crashreporter/crashreporter.ini firefox-85.0+build1/l10n/hr/toolkit/crashreporter/crashreporter.ini
--- firefox-84.0.2+build1/l10n/hr/toolkit/crashreporter/crashreporter.ini	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/crashreporter/crashreporter.ini	2021-01-18 20:04:56.000000000 +0000
@@ -18,7 +18,7 @@
 CrashReporterProductErrorText2=%s je naišao na problem i srušio se.\n\nNažalost, nije moguće poslati izvještaj o ovom rušenju.\n\nDetaljji: %s
 CrashReporterSorry=Žao nam je
 # LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
-CrashReporterDescriptionText2=%s je naišao na problem i srušio se.\n\nKako bi nam pomogli u ispravljanju problema, možete nam poslati izvještaj rušenja.
+CrashReporterDescriptionText2=%s je naišao na problem i srušio se.\n\nDa biste nam pomogli u ispravljanju problema, možete nam poslati izvještaj rušenja.
 CrashReporterDefault=Ovaj program pokreće se nakon rušenja kako bi prijavio problem programerima programa. Ne bi se smio izravno pokretati.
 Details=Detalji…
 ViewReportTitle=Sadržaj izvještaja
@@ -27,7 +27,7 @@
 # LOCALIZATION NOTE (CheckSendReport): The %s is replaced with the vendor name.
 CheckSendReport=Obavijestite %s o rušenju kako bi mogli ispraviti problem
 CheckIncludeURL=Uklju�i adresu stranice na kojoj sam se nalazio
-CheckAllowEmail=Dozvoli, da me %s kontaktira u vezi s ovim izvještajem
+CheckAllowEmail=Dozvoli da me %s kontaktira u vezi ovog izvještaja
 EmailGrayText=Ovdje upiši svoju e-adresu
 ReportPreSubmit2=Tvoj izvještaj o prekidu programa bit će poslan prije izlaska ili ponovnog pokretanja programa.
 ReportDuringSubmit2=Slanje tvog izvještaja …
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -229,6 +229,7 @@
 shortcuts-no-commands = Sljedeći dodaci nemaju pre�ace:
 shortcuts-input =
     .placeholder = Upišite pre�ac
+shortcuts-browserAction2 = Aktiviraj tipku na alatnoj traci
 shortcuts-pageAction = Aktiviraj radnju stranice
 shortcuts-sidebarAction = Prikaži/sakrij bo�nu traku
 shortcuts-modifier-mac = Uklju�i Ctrl, Alt ili ⌘
@@ -377,14 +378,14 @@
 ## badge is a small icon displayed next to an extension when it is recommended on AMO.
 
 addon-badge-recommended2 =
-    .title = { -brand-product-name } preporu�a samo proširenja, koja udovoljavaju našim standardima za sigurnost i performanse
+    .title = { -brand-product-name } preporu�uje samo proširenja koja udovoljavaju našim standardima za sigurnost i performanse
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Ovo proširenje stvorili su tvorci { -brand-product-name }a
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Izvršen je sigurnosni pregled kôda ovog proširenja
-    .aria-label = { addon-badge-verified.title }
+addon-badge-line2 =
+    .title = Ovo je službena ekstenzija kojeg su stvorili tvorci { -brand-product-name }a
+    .aria-label = { addon-badge-line2.title }
+addon-badge-verified2 =
+    .title = Na ovoj ekstenziji izvršen je pregled udovoljava li našim standardima za sigurnost i performansu
+    .aria-label = { addon-badge-verified2.title }
 
 ##
 
@@ -393,6 +394,9 @@
 release-notes-loading = U�itavanje…
 release-notes-error = Došlo je do greške pri u�itavanju napomena o izdanju.
 addon-permissions-empty = Ovaj dodatak ne zahtjeva nikakve dozvole.
+addon-permissions-required = Dozvole potrebne za osnovnu funkcionalnost:
+addon-permissions-optional = Opcionalne dozvole za dodatnu funkcionalnost:
+addon-permissions-learnmore = Saznaj više o dozvolama
 recommended-extensions-heading = Preporu�eni dodatci
 recommended-themes-heading = Preporu�eni motivi
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutCompat.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutCompat.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutCompat.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutCompat.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -8,4 +8,6 @@
 label-more-information = Daljnje informacije: Greška { $bug }
 label-overrides = Poništavanja korisni�kog agenta
 text-disabled-in-about-config = Ova funkcija je deaktivirana u about:config
+text-no-interventions = Ne koriste se nikakve intervencije
+text-no-overrides = Ne koriste se nikakva nadja�avanja UA-a
 text-title = about:compat
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutGlean.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutGlean.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutGlean.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutGlean.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,5 +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/.
 
+
 ### "Glean" and "Glean SDK" should remain in English.
 
+about-glean-page-title = O Gleanu
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,5 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-about-httpsonly-button-accept-and-continue = Prihvati rizik i nastavi
+about-httpsonly-insecure-title = Sigurna veza nije dostupna
+about-httpsonly-explanation-question = Å to bi moglo uzrokovati ovo?
+about-httpsonly-explanation-nosupport = Web-stranica najvjerojatnije ne podržava HTTPS.
+about-httpsonly-button-continue-to-site = Nastavi na stranicu preko HTTP-a
 about-httpsonly-button-go-back = Idi natrag
+about-httpsonly-link-learn-more = Saznaj više…
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutMozilla.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutMozilla.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,3 +2,4 @@
 # 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/.
 
+about-mozilla-title-6-27 = Knjiga Mozille, 6:27
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -0,0 +1,50 @@
+# 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/.
+
+# Page title
+about-processes-title = Upravitelj procesima
+
+## Tooltips
+
+
+## Column headers
+
+
+## Process names
+## Variables:
+##    $pid (String) The process id of this process, assigned by the OS.
+##    $origin (String) The domain name for this process.
+##    $type (String) The raw type for this process. Used for unknown processes.
+
+
+## Details within processes
+
+
+## Displaying CPU (percentage and total)
+## Variables:
+##    $percent (Number) The percentage of CPU used by the process or thread.
+##                      Always > 0, generally <= 200.
+##    $total (Number) The amount of time used by the process or thread since
+##                    its start.
+##    $unit (String) The unit in which to display $total. See the definitions
+##                   of `duration-unit-*`.
+
+
+## Displaying Memory (total and delta)
+## Variables:
+##    $total (Number) The amount of memory currently used by the process.
+##    $totalUnit (String) The unit in which to display $total. See the definitions
+##                        of `memory-unit-*`.
+##    $delta (Number) The absolute value of the amount of memory added recently.
+##    $deltaSign (String) Either "+" if the amount of memory has increased
+##                        or "-" if it has decreased.
+##    $deltaUnit (String) The unit in which to display $delta. See the definitions
+##                        of `memory-unit-*`.
+
+
+## Duration units
+
+
+## Memory units
+
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -59,6 +59,9 @@
 app-basics-build-config = Konfiguracija gradnje
 app-basics-user-agent = Korisni�ki agent
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Prevedeno Rosettom
 app-basics-memory-use = Upotreba memorije
 app-basics-performance = Performansa
 app-basics-service-workers = Registrirani radni procesi usluge
@@ -77,8 +80,11 @@
         [windows] Otvori mapu
        *[other] Otvori direktorij
     }
+environment-variables-title = Varijable okruženja
+environment-variables-name = Naziv
+environment-variables-value = Vrijednost
 experimental-features-title = Eksperimentalne funkcije
-experimental-features-name = Ime
+experimental-features-name = Naziv
 experimental-features-value = Vrijednost
 modified-key-prefs-title = Važne izmijenjene postavke
 modified-prefs-name = Naziv
@@ -177,6 +183,25 @@
 
 ##
 
+support-third-party-modules-module = Datoteka modula
+support-third-party-modules-version = Verzija datoteke
+support-third-party-modules-process = Vrsta procesa i ID
+support-third-party-modules-uptime = Vrijeme rada procesa (ms)
+support-third-party-modules-no-value = (bez vrijednosti)
+support-third-party-modules-button-open =
+    .title = Otvori lokaciju datoteke…
+support-third-party-modules-expand =
+    .title = Prikaži detaljne informacije
+support-third-party-modules-collapse =
+    .title = Sakrij detaljne informacije
+support-third-party-modules-unsigned-icon =
+    .title = Ovaj modul nije potpisan
+support-third-party-modules-folder-icon =
+    .title = Otvori lokaciju datoteke…
+support-third-party-modules-down-icon =
+    .title = Prikaži detaljne informacije
+support-third-party-modules-up-icon =
+    .title = Sakrij detaljne informacije
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -324,6 +349,14 @@
 multi-process-status-7 = Onemogućili dodaci
 multi-process-status-8 = Prisilno onemogućeno
 multi-process-status-unknown = Nepoznato stanje
+fission-status-experiment-control = Onemogućio eksperiment
+fission-status-experiment-treatment = Omogućio eksperiment
+fission-status-disabled-by-e10s-env = Onemogućilo okruženje
+fission-status-enabled-by-env = Omogućilo okruženje
+fission-status-enabled-by-default = Omogućeno prema zadanim postavkama
+fission-status-disabled-by-default = Onemogućeno prema zadanim postavkama
+fission-status-enabled-by-user-pref = Omogućio korisnik
+fission-status-disabled-by-user-pref = Onemogućio korisnik
 async-pan-zoom = Asinkrono pomicanje/zumiranje
 apz-none = ništa
 wheel-enabled = unos kota�ićem aktiviran
@@ -344,3 +377,12 @@
 policies-inactive = Neaktivno
 policies-active = Aktivno
 policies-error = Greška
+
+## Printing section
+
+support-printing-title = Ispisivanje
+support-printing-troubleshoot = Otklanjanje grešaka
+support-printing-clear-settings-button = O�isti spremljene postavke ispisa
+support-printing-modified-settings = Izmijenjene postavke ispisa
+support-printing-prefs-name = Naziv
+support-printing-prefs-value = Vrijednost
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,3 +2,4 @@
 # 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/.
 
+experimental-features-cookie-samesite-schemeful-description = Tretira kola�iće s iste domene, ali razli�itih shema (npr. http://example.com i https://example.com) kao s razli�itih umjesto istih stranica. Poboljšava sigurnost, ali potencijalno dovodi do loma funkcionalnosti.
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> želi otvoriti <strong>{ $scheme }</strong> poveznicu.
 
 ## Permission Dialog
 ## Variables:
@@ -17,11 +9,49 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
+permission-dialog-description = Dopustiti ovoj stranici otvaranje poveznice { $scheme }?
+permission-dialog-description-file = Dopustiti ovoj datoteci otvaranje poveznice { $scheme }?
+permission-dialog-description-host = Dopustiti { $host } otvaranje poveznice { $scheme }?
+permission-dialog-description-app = Dopustiti ovoj stranici otvaranje poveznice { $scheme } aplikacijom { $appName }?
+permission-dialog-description-host-app = Dopustiti { $host } otvaranje poveznice { $scheme } aplikacijom { $appName }?
+permission-dialog-description-file-app = Dopustiti ovoj datoteci otvaranje poveznice { $scheme } aplikacijom { $appName }?
+
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+permission-dialog-remember = Uvijek dopusti <strong>{ $host }</strong> otvaranje poveznica <strong>{ $scheme }</strong>
+permission-dialog-remember-file = Uvijek dopusti ovoj datoteci otvaranje poveznica <strong>{ $scheme }</strong>
+
+##
+
+permission-dialog-btn-open-link =
+    .label = Otvori poveznicu
+    .accessKey = O
+permission-dialog-btn-choose-app =
+    .label = Odaberi aplikaciju
+    .accessKey = a
+permission-dialog-unset-description = Moraš odabrati aplikaciju.
+permission-dialog-set-change-app-link = Odaberi drugu aplikaciju.
 
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-window =
+    .title = Odaberi aplikaciju
+    .style = min-width: 26em; min-height: 26em;
+chooser-dialog =
+    .buttonlabelaccept = Otvori poveznicu
+    .buttonaccesskeyaccept = O
+chooser-dialog-description = Odaberi aplikaciju za otvaranje poveznice { $scheme }.
+# Please keep the emphasis around the scheme (ie the `<strong>` HTML tags).
+chooser-dialog-remember = Uvijek koristi ovu aplikaciju za otvaranje poveznica <strong>{ $scheme }</strong>
+chooser-dialog-remember-extra =
+    { PLATFORM() ->
+        [windows] Ovo se može promijeniti u mogućnostima { -brand-short-name }a.
+       *[other] Ovo se može promijeniti u postavkama { -brand-short-name }a.
+    }
 choose-other-app-description = Odaberi jedan drugi program
 choose-app-btn =
     .label = Odabir…
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -1,3 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+videocontrols-scrubber =
+    .aria-label = Položaj
+# This label is used by screenreaders and other assistive technology to indicate
+# to users how much of the video has been loaded from the network. It will be
+# followed by the percentage of the video that has loaded (e.g. "Loading: 13%").
+videocontrols-buffer-bar-label = U�itavanje:
+videocontrols-volume-control =
+    .aria-label = Glasnoća
+videocontrols-closed-caption-button =
+    .aria-label = Podnaslovi
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/main-window/autocomplete.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/main-window/autocomplete.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/main-window/autocomplete.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/main-window/autocomplete.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -11,11 +11,22 @@
 autocomplete-import-logins =
     <div data-l10n-name="line1">Uvezi svoju prijavu iz { $browser }</div>
     <div data-l10n-name="line2">za { $host } i ostale stranice</div>
+autocomplete-import-logins-info =
+    .tooltiptext = Saznaj više
 
 ## Variables:
 ##   $host (String) - Host name of the current site.
 
+autocomplete-import-logins-chrome =
+    <div data-l10n-name="line1">Uvezi prijavu iz Google Chromea</div>
+    <div data-l10n-name="line2">za { $host } i druge stranice</div>
+autocomplete-import-logins-chromium =
+    <div data-l10n-name="line1">Uvezi prijavu iz Chromiuma</div>
+    <div data-l10n-name="line2">za { $host } i druge stranice</div>
+autocomplete-import-logins-chromium-edge =
+    <div data-l10n-name="line1">Uvezi prijavu iz Microsoft Edgea</div>
+    <div data-l10n-name="line2">za { $host } i druge stranice</div>
+
 ##
 
-autocomplete-import-logins-info =
-    .tooltiptext = Saznaj više
+autocomplete-import-learn-more = Saznaj više
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/payments/payments.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/payments/payments.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/payments/payments.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/payments/payments.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,7 +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/.
 
-
 # This value isn't used directly, but is defined to avoid duplication
 # in the "credit-card-label-*" strings.
 #
@@ -20,24 +19,29 @@
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
-credit-card-label-number = { $number }
-
+#   $type (String): Credit card type
+credit-card-label-number-2 = { $number }
+    .aria-label = { $type } { credit-card-label-number-2 }
 # Label for a credit card with a number and name
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name = { $number }, { $name }
-
+#   $type (String): Credit card type
+credit-card-label-number-name-2 = { $number }, { $name }
+    .aria-label = { $type } { credit-card-label-number-name-2 }
 # Label for a credit card with a number and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
-credit-card-label-number-expiration = { $number }, { credit-card-expiration }
-
+#   $type (String): Credit card type
+credit-card-label-number-expiration-2 = { $number }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-expiration-2 }
 # Label for a credit card with a number, name, and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name-expiration = { $number }, { $name }, { credit-card-expiration }
+#   $type (String): Credit card type
+credit-card-label-number-name-expiration-2 = { $number }, { $name }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-name-expiration-2 }
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/preferences/preferences.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/preferences/preferences.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/preferences/preferences.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -14,6 +14,7 @@
 failed-pp-change = Nije moguće promijeniti primarnu lozinku.
 incorrect-pp = Nije unešena to�na trenutna primarna lozinka. Pokušaj ponovno.
 pp-change-ok = Primarna lozinka uspješno je promijenjena.
+pp-empty-warning = Tvoje spremljene lozinke i privatni klju�evi neće biti zaštićeni.
 pp-erased-ok = Izbrisana je primarna lozinka. { pp-empty-warning }
 pp-not-wanted = Upozorenje! Odabrano je da se ne koristi primarna lozinka. { pp-empty-warning }
 pp-change2empty-in-fips-mode = Trenutno si u na�inu rada FIPS. FIPS ne dopušta praznu primarnu lozinku.
@@ -36,6 +37,8 @@
 remove-password =
     .title = Ukloni glavnu lozinku
 primary-password-admin = Za spremanje prijava i lozinki, administrator zahtijeva da se postavi primarna lozinka.
+remove-primary-password =
+    .title = Ukloni primarnu lozinku
 remove-info =
     .value = Da biste nastavili morate upisati svoju trenutnu lozinku:
 remove-warning1 = Tvoja se glavna lozinka koristi za zaštitu osjetljivih informacija poput lozinki web stranica.
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Stranica:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } od { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Posljednja stranica
-
+printpreview-homearrow-button =
+    .title = Prva stranica
+printpreview-previousarrow-button =
+    .title = Prethodna stranica
+printpreview-nextarrow-button =
+    .title = Sljedeća stranica
+printpreview-endarrow-button =
+    .title = Posljednja stranica
diff -Nru firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/hr/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/hr/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:39:11.000000000 +0000
+++ firefox-85.0+build1/l10n/hr/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:04:56.000000000 +0000
@@ -2,3 +2,110 @@
 # 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/.
 
+printui-title = Ispis
+# Dialog title to prompt the user for a filename to save print to PDF.
+printui-save-to-pdf-title = Spremi kao
+# Variables
+# $sheetCount (integer) - Number of paper sheets
+printui-sheets-count =
+    { $sheetCount ->
+        [one] { $sheetCount } list papira
+        [few] { $sheetCount } lista papira
+       *[other] { $sheetCount } listova papira
+    }
+printui-page-range-all = Sve
+printui-page-range-custom = Prilagođeno
+printui-page-range-label = Stranice
+printui-page-range-picker =
+    .aria-label = Odaberi raspon stranica
+printui-page-custom-range =
+    .aria-label = Unesi prilagođeni raspon stranica
+# This label is displayed before the first input field indicating
+# the start of the range to print.
+printui-range-start = Od
+# This label is displayed between the input fields indicating
+# the start and end page of the range to print.
+printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Unesi prilagođeni raspon stranica
+    .placeholder = npr. 2-6, 9, 12-16
+# Section title for the number of copies to print
+printui-copies-label = Kopije
+printui-orientation = Usmjerenje
+printui-landscape = Horizontalno
+printui-portrait = Vertikalno
+# Section title for the printer or destination device to target
+printui-destination-label = Odredište
+printui-destination-pdf-label = Spremi u PDF
+printui-more-settings = Više postavki
+printui-less-settings = Manje postavki
+printui-paper-size-label = Veli�ina papira
+# Section title (noun) for the print scaling options
+printui-scale = Mjerilo
+printui-scale-fit-to-page-width = Prilagodi Å¡irini stranice
+# Label for input control where user can set the scale percentage
+printui-scale-pcent = Mjerilo
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Obostrani ispis
+printui-duplex-checkbox = Ispis s obje strane
+# Section title for miscellaneous print options
+printui-options = Opcije
+printui-headers-footers-checkbox = Ispis zaglavlja i podnožja
+printui-backgrounds-checkbox = Ispis pozadine
+printui-selection-checkbox = Ispis samo odabira
+printui-color-mode-label = Tip boje
+printui-color-mode-color = Boja
+printui-color-mode-bw = Crno-bijelo
+printui-margins = Margine
+printui-margins-default = Zadano
+printui-margins-min = Minimalno
+printui-margins-none = Bez
+printui-margins-custom = Prilagođeno
+printui-margins-custom-inches = Prilagođeno (in�i)
+printui-margins-custom-top = Vrh
+printui-margins-custom-top-inches = Vrh (in�i)
+printui-margins-custom-bottom = Dno
+printui-margins-custom-bottom-inches = Dno (in�i)
+printui-margins-custom-left = Lijevo
+printui-margins-custom-left-inches = Lijevo (in�i)
+printui-margins-custom-right = Desno
+printui-margins-custom-right-inches = Desno (in�i)
+printui-system-dialog-link = Ispiši pomoću sistemskog dijaloškog prozora…
+printui-primary-button = Ispiši
+printui-primary-button-save = Spremi
+printui-cancel-button = Odustani
+printui-close-button = Zatvori
+printui-loading = Priprema pregleda
+# Reported by screen readers and other accessibility tools to indicate that
+# the print preview has focus.
+printui-preview-label =
+    .aria-label = Pregled ispisa
+printui-pages-per-sheet = Stranica po listu
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Ispisivanje…
+
+## Paper sizes that may be supported by the Save to PDF destination:
+
+printui-paper-a5 = A5
+printui-paper-a4 = A4
+printui-paper-a3 = A3
+printui-paper-a2 = A2
+printui-paper-a1 = A1
+printui-paper-a0 = A0
+printui-paper-b5 = B5
+printui-paper-b4 = B4
+printui-paper-jis-b5 = JIS-B5
+printui-paper-jis-b4 = JIS-B4
+printui-paper-letter = Ameri�ko pismo
+printui-paper-legal = Ameri�ki pravni
+printui-paper-tabloid = Tabloid
+
+## Error messages shown when a user has an invalid input
+
+printui-error-invalid-scale = Mjerilo mora biti broj između 10 i 200.
+printui-error-invalid-margin = Unesi valjanu marginu za odabranu veli�inu papira.
+# Variables
+# $numPages (integer) - Number of pages
+printui-error-invalid-range = Raspon mora biti broj između 1 i { $numPages }.
+printui-error-invalid-start-overflow = Broj stranice “od� mora biti manji od broja stranice “do�.
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/hsb/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/aboutLogins.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/aboutLogins.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -171,7 +171,14 @@
 about-logins-confirm-remove-dialog-title = Tute přizjewjenje wotstronić?
 confirm-delete-dialog-message = Tuta akcija njeda so cofnyć.
 about-logins-confirm-remove-dialog-confirm-button = Wotstronić
-about-logins-confirm-remove-all-dialog-confirm-button = Wšě wotstronić
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Wotstronić
+        [one] Wotstronić
+        [two] Wšě wotstronić
+        [few] Wšě wotstronić
+       *[other] Wšě wotstronić
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Haj, tute přizjewjenje wotstronić
@@ -213,6 +220,8 @@
 about-logins-confirm-export-dialog-title = Přizjewjenja a hesła eksportować
 about-logins-confirm-export-dialog-message = Waše hesła budu so jako �itajomny tekst składować (na př. BadP@ass0rd), tohodla móže kóždy, kotryž móže eksportowanu dataju wo�inić, je widźeć.
 about-logins-confirm-export-dialog-confirm-button = Eksportować…
+about-logins-alert-import-title = Importowanje dokón�ene
+about-logins-alert-import-message = Nadrobne importowe zjeće pokazać
 confirm-discard-changes-dialog-title = Njeskładowane změny zaćisnyć?
 confirm-discard-changes-dialog-message = Wšě njeskładowane změny so zhubja.
 confirm-discard-changes-dialog-confirm-button = Zaćisnyć
@@ -274,3 +283,38 @@
         [macos] CSV-dokument
        *[other] CSV-dataja
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importowanje dokón�ene
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nowe přizjewjenje přidate:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Nowej přizjewjeni přidatej:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Nowe přizjewjenja přidate:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nowe přizjewjenja přidate:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Eksistowace přizjewjenje zaktualizowane:</span> <span data-l10n-name="count">{ $count }</span>
+        [two] <span>Eksistowacej přizjewjeni zaktualizowanej:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Eksistowace přizjewjenja zaktualizowane:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Eksistowace přizjewjenja zaktualizowane:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Dwójne přizjewjenje namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowane)</span>
+        [two] <span>Dwójnej přizjewjeni namakanej:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowanej)</span>
+        [few] <span>Dwójne přizjewjenja namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowane)</span>
+       *[other] <span>Dwójne přizjewjenja namakane:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowane)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Zmylk:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowany)</span>
+        [two] <span>Zmylkaj:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowanej)</span>
+        [few] <span>Zmylki:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowane)</span>
+       *[other] <span>Zmylki:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(njeimportowane)</span>
+    }
+about-logins-import-dialog-done = Dokón�ene
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/hsb/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/appmenu.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/appmenu.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nowe wokno
+appmenuitem-new-private-window =
+    .label = Nowe priwatne wokno
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Powjetšić
 appmenuitem-zoom-reduce =
     .label = Pomjeńšić
+appmenuitem-fullscreen =
+    .label = Połna wobrazowka
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Nětko synchronizować
+appmenuitem-save-page =
+    .label = Stronu składować jako…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Nowe funkcije a změny
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/hsb/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/appMenuNotifications.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Nic nětko
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = { -brand-shorter-name } po spěšnym znowastartowanju swoje wo�injene rajtarki a wokna wobnowi, kotrež w priwatnym modusu njejsu.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } njemóže na najnowšu wersiju awtomatisce aktualizować.
+    .buttonlabel = { -brand-shorter-name } najebać toho aktualizować
+    .buttonaccesskey = k
+    .secondarybuttonlabel = Nic nětko
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Nowa aktualizacija { -brand-shorter-name } je k dispoziciji, ale njeda so instalować, dokelž druha kopija { -brand-shorter-name } běži. Za�ińće ju, zo byšće z aktualizaciju pokro�ował, abo aktualizujće najebać to (druha kopija potom snano korektnje njefunguje, doniž ju njestartujeće).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = W porjadku, sym zrozumił
     .buttonaccesskey = z
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/browser.ftl firefox-85.0+build1/l10n/hsb/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/browser.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/browser.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -507,3 +507,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ma kontrolu nad wašim pokazowakom. Tłó�će Esc, zo byšće kontrolu wróćo dóstał.
 pointerlock-warning-no-domain = Tutón dokument ma kontrolu nad wašim pokazowakom. Tłó�će Esc, zo byšće kontrolu wróćo dóstał.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Wšě zapołožki pokazać
+bookmarks-recent-bookmarks =
+    .value = Njedawno jako zapołožka wotpołoženy
+bookmarks-toolbar-chevron =
+    .tooltiptext = Dalše zapołožki pokazać
+bookmarks-sidebar-content =
+    .aria-label = Zapołožki
+bookmarks-menu-button =
+    .label = Meni zapołožkow
+bookmarks-other-bookmarks-menu =
+    .label = Druhe zapołožki
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilne zapołožki
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Bó�nicu zapołožkow schować
+           *[other] Bó�nicu zapołožkow pokazać
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Lajstu zapołožkow schować
+           *[other] Lajstu zapołožkow pokazać
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Meni zapołožkow ze symboloweje lajsty wotstronić
+           *[other] Symbolowej lajsće meni zapołožkow přidać
+        }
+bookmarks-search =
+    .label = Zapołožki pytać
+bookmarks-tools =
+    .label = Nastroje za zapołožki
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Lajsta zapołožkow
+    .accesskey = L
+    .aria-label = Zapołožki
+bookmarks-toolbar-menu =
+    .label = Lajsta zapołožkow
+bookmarks-toolbar-placeholder =
+    .title = Zapiski lajsty zapołožkow
+bookmarks-toolbar-placeholder-button =
+    .label = Zapiski lajsty zapołožkow
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Zapołožki
+library-bookmarks-bookmark-this-page =
+    .label = Tutu stronu jako zapołožku składować
+library-bookmarks-bookmark-edit =
+    .label = Tutu zapołožku wobdźěłać
+library-recent-activity-label = Najnowša aktiwita
+
+## More items
+
+more-menu-go-offline =
+    .label = Offline dźěłać
+    .accesskey = O
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/hsb/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/newtab/asrouter.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -63,7 +63,7 @@
         [few] { $total } wužiwarjo
        *[other] { $total } wužiwarjow
     }
-cfr-doorhanger-pintab-description = Mějće lochki přistup na swoje najwjace wužiwane sydła. Dźeržće sydła w rajtarku wo�injene (samo hdyž znowa startujeće)
+cfr-doorhanger-pintab-description = Mějće lochki přistup na swoje najhusćišo wužiwane sydła. Dźeržće sydła w rajtarku wo�injene (samo hdyž znowa startujeće)
 
 ## These messages are steps on how to use the feature and are shown together.
 
@@ -128,6 +128,9 @@
 
 cfr-whatsnew-searchbar-title = Pisajće mjenje a namakajće wjace z adresowym polom
 cfr-whatsnew-searchbar-body-topsites = Wubjerće nětko prosće adresowe polo a  kašćik z wotkazami na waše najlubše sydła so wo�ini.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Lupowy symbol
 
 ## Picture-in-Picture
@@ -286,3 +289,14 @@
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Pytanske skrótšenki w adresowym polu
+cfr-whatsnew-search-shortcuts-body = Nětko, hdyž pytawu abo wěste sydło do adresoweho pola zapodawaće, so módre zwjazanje deleka w pytanskich namjetach zjewi. Wubjerće tute zwjazanje, zo byšće swoje pytanje direktnje z adresoweho pola dokón�ił.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Škit před złóstnymi superplackami
+cfr-whatsnew-supercookies-body = Websydła móža skradźu wašemu wobhladowakej „superplack“ přidać, kotryž móžeće wam po webje slědować, samo po tym zo sće swoje placki zhašał. { -brand-short-name } nětko sylny škit přećiwo superplackam skići, zo njebychu dali so wužiwać, wašim aktiwitam online wot jednoho sydła k přichodnemu sydłu slědować.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Lěpše rjadowanje zapołožkow
+cfr-whatsnew-bookmarking-body = Je lóšo, přehlad nad wašimi najlubšimi sydłami wobchować. { -brand-short-name } sej nětko waše preferowane městno za składowane zapołožki spomjatkuje, pokazuje symbolowu lajstu zapołožkow po standardźe na nowych rajtarkach a da wam lochki přistup k zbytkej wašich zapołožkow přez rjadowak symboloweje lajsty.
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/hsb/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/newtab/newtab.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nowy rajtark
 newtab-settings-button =
     .title = Stronu wašeho noweho rajtarka přiměrić
+newtab-personalize-button-label = Personalizować
+    .title = Nowy rajtark personalizować
+    .aria-label = Nowy rajtark personalizować
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Web přepytać
     .title = Web přepytać
     .aria-label = Web přepytać
+newtab-search-box-text = Web přepytać
+newtab-search-box-input =
+    .placeholder = Web přepytać
+    .aria-label = Web přepytać
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Pytawu přidać
 newtab-topsites-add-topsites-header = Nowe najhusćišo wopytane sydło
+newtab-topsites-add-shortcut-header = Nowe zwjazanje
 newtab-topsites-edit-topsites-header = Najhusćišo wopytane sydło wobdźěłać
+newtab-topsites-edit-shortcut-header = Zwjazanje wobdźěłać
 newtab-topsites-title-label = Titul
 newtab-topsites-title-input =
     .placeholder = Titul zapodać
@@ -207,3 +216,29 @@
 
 newtab-error-fallback-info = Hopla, při �itanju tutoho wobsaha je so něšto nimokuliło.
 newtab-error-fallback-refresh-link = Aktualizujće stronu, zo byšće hišće raz spytał.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Zwjazanja
+newtab-custom-shortcuts-subtitle = Sydła, kotrež składujeće abo wopytujeće
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } linka
+        [two] { $num } lince
+        [few] { $num } linki
+       *[other] { $num } linkow
+    }
+newtab-custom-sponsored-sites = Sponsorowane zwjazanja
+newtab-custom-pocket-title = Wot { -pocket-brand-name } doporu�ene
+newtab-custom-pocket-subtitle = Wosebite wobsah, wubrany přez { -pocket-brand-name }, dźěla swójby { -brand-product-name }
+newtab-custom-pocket-sponsored = Sponsorowane stawizny
+newtab-custom-recent-title = Najnowša aktiwita
+newtab-custom-recent-subtitle = Wuběr najnowšich sydłow a najnowšeho wobsaha
+newtab-custom-close-button = Za�inić
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Å lipki
+newtab-custom-snippets-subtitle = Pokiwy a nowinki wot { -vendor-short-name } a { -brand-product-name }
+newtab-custom-settings = Dlaše nastajenja rjadować
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/places.ftl firefox-85.0+build1/l10n/hsb/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/places.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/places.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podrjadowak
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Druhe zapołožki
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/hsb/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/preferences/preferences.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -506,6 +506,11 @@
 home-prefs-topsites-description = Sydła, kotrež najhusćišo wopytujeće
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsorowane najlubše sydła
+home-prefs-shortcuts-header =
+    .label = Zwjazanja
+home-prefs-shortcuts-description = Sydła, kotrež składujeće abo wopytujeće
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsorowane zwjazanja
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -513,6 +518,7 @@
 home-prefs-recommended-by-header =
     .label = Wot { $provider } doporu�eny
 home-prefs-recommended-by-description-update = Wurjadny wobsah z cyłeho weba, wubrany wot { $provider }
+home-prefs-recommended-by-description-new = Wosebite wobsah, wubrany přez { $provider }, dźěla swójby { -brand-product-name }
 
 ##
 
@@ -521,8 +527,6 @@
     .label = Sponsorowane stawizny
 home-prefs-highlights-header =
     .label = Wjerški
-home-prefs-recent-activity-header =
-    .label = Najnowša aktiwita
 home-prefs-highlights-description = Wuběr websydłow, kotrež sće składował abo wopytał
 home-prefs-highlights-option-visited-pages =
     .label = Wopytane strony
@@ -532,6 +536,9 @@
     .label = Najnowše sćehnjenje
 home-prefs-highlights-option-saved-to-pocket =
     .label = Strony składowane do { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Najnowša aktiwita
+home-prefs-recent-activity-description = Wuběr najnowšich sydłow a najnowšeho wobsaha
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -539,6 +546,7 @@
 home-prefs-snippets-header =
     .label = Å lipki
 home-prefs-snippets-description = Aktualizacije wot { -vendor-short-name } a { -brand-product-name }
+home-prefs-snippets-description-new = Pokiwy a nowinki wot { -vendor-short-name } a { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -932,9 +940,16 @@
 addressbar-locbar-openpage-option =
     .label = Wo�injene rajtarki
     .accesskey = o
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Zwjazanja
+    .accesskey = Z
 addressbar-locbar-topsites-option =
     .label = Najhusćišo wopytane sydła
     .accesskey = N
+addressbar-locbar-engines-option =
+    .label = Pytawy
+    .accesskey = P
 addressbar-suggestions-settings = Nastajenja za namjety pytawy změnić
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/hsb/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/hsb/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/hsb/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -63,6 +63,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Jenož w nowym rajtarku
     .accesskey = J
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Přeco pokazać
+    .accesskey = P
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Ženje njepokazać
+    .accesskey = n
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Jenož w nowym rajtarku pokazać
+    .accesskey = J
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Druhe zapołožki pokazać
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/hsb/devtools/client/markers.properties firefox-85.0+build1/l10n/hsb/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/hsb/devtools/client/markers.properties	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/devtools/client/markers.properties	2021-01-18 20:05:01.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Mało składa
 marker.gcreason.label.CC_WAITING=Přez Cycle Collection wunuzowany
+marker.gcreason.label.CC_FINISHED=Cyklusowa zběrka dokón�ena
 marker.gcreason.label.CC_FORCED=Přez Cycle Collection wunuzowany
 marker.gcreason.label.LOAD_END=Strona je doza�itana
 marker.gcreason.label.PAGE_HIDE=Do pozadka přesunjeny
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Zběrka Nursery
-
diff -Nru firefox-84.0.2+build1/l10n/hsb/devtools/client/toolbox.properties firefox-85.0+build1/l10n/hsb/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/hsb/devtools/client/toolbox.properties	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/devtools/client/toolbox.properties	2021-01-18 20:05:01.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Dataju w stilowym editorje wo�inić
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Wuwiwarske nastroje za�inić
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Rozdźělenu konsolu pokazać
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/hsb/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/hsb/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/hsb/devtools/client/tooltips.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/devtools/client/tooltips.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> na tutón element efekt nima, dokelž pozicionowany element njeje.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> na tutón element efekt nima, dokelž hódnota <strong>overflow:hidden</strong> nastajena njeje.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> so na tutón element njewuskutkuje, dokelž jeho <strong>outline-style</strong> je <strong>auto</strong> abo <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> žadyn efekt na interne tabelowe elementy nima.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> žadyn efekt na interne tabelowe elementy mimo tabelowych celow nima.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Spytajće <strong>float</strong> wotstronić abo <strong>display:block</strong> přidać. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Spytajće jeho kajkosć <strong>position</strong> na něšto druhe ha� <strong>static</strong> nastajić. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Spytajće <strong>overflow:hidden</strong> přidać. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Spytajće kajkosć <strong>display</strong> na něsto druhe ha� <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row.group</strong> abo <strong>table-footer-group</strong> stajić. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Spytajće kajkosć <strong>display</strong> na něsto druhe ha� <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row.group</strong> abo <strong>table-footer-group</strong> stajić. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Spytajće kajkosć <strong>outline-style</strong> na něšto druhe ha� <strong>auto</strong> abo <strong>none</strong> stajić. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/hsb/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/hsb/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/hsb/dom/chrome/dom/dom.properties	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/dom/chrome/dom/dom.properties	2021-01-18 20:05:01.000000000 +0000
@@ -424,3 +424,7 @@
 FolderUploadPrompt.message = Chceće woprawdźe wšě dataje z “%S� nahrać? Čińće to jenož, jeli sydłu dowěrjeće.
 FolderUploadPrompt.acceptButtonLabel = Nahrać
 InputPickerBlockedNoUserActivation=Selektor <input> je so zablokował, dokelž wužiwarska aktiwacija faluje.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe z eksternym protokolom je so zablokował, dokelž njeje so wužiwarske aktiwizowanje njewotměło abo dokelž njeje dosć �asa zašoł, wot toho, zo posledni iframe je so za�itał.
+MultiplePopupsBlockedNoUserActivation=Wo�injenje wjacorych wuskakowacych woknow je so zablokowało, dokelž wužiwarske aktiwizowanje faluje.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Před�itanje URL %S je so njeznatych hódnotow „as“ abo „type“ abo njepřihódneho atributa „media“ dla ignorowało.
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:01.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d;d
 
 downloadErrorAlertTitle=Sćehnjenski zmylk
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Sćehnjenje njeda so składować, dokelž so přez %S blokuje.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Sćehnjenje njeda so składować, dokelž so přez rozšěrjenje blokuje.
 downloadErrorGeneric=Sćehnjenje njeda so składować, dokelž njeznaty zmylk je wustupił.\n\nProšu spytajće hišće raz.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Něšto sekundow wyše
 timeUnknown2=Njeznaty �as wyše
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=Resursa %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/hsb/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/hsb/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:01.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Zwisk z proksyserwerom wotpokazany
 check_error-2153390069=Serwerowy certifikat je spadnjeny (prošu stajće swój systemowy �asnik na prawy datum a prawy �as, jeli stej wopak)
 check_error-verification_failed=Integrita aktualizacije njeda so přepruwować
+check_error-move_failed=Aktualizacija njeda so za instalaciju přihotować
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/hsb/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Module třećich poskićowarjow
+support-third-party-modules-module = Modulowa dataja
+support-third-party-modules-version = Datajowa wersija
+support-third-party-modules-vendor = Informacije zhotowjerja
+support-third-party-modules-occurrence = Wustupowanja
+support-third-party-modules-process = Procesowy typ a ID
+support-third-party-modules-thread = Nitka
+support-third-party-modules-base = Adresa Imagebase
+support-third-party-modules-uptime = Procesowy dźěłowy �as (ms)
+support-third-party-modules-duration = Za�itanske traće (ms)
+support-third-party-modules-empty = Module třećich poskićowarjow njejsu so za�itali.
+support-third-party-modules-no-value = (Žana hódnota)
+support-third-party-modules-button-open =
+    .title = Datajowe městno wo�inić…
+support-third-party-modules-expand =
+    .title = Nadrobne informacije pokazać
+support-third-party-modules-collapse =
+    .title = Nadrobne informacije schować
+support-third-party-modules-unsigned-icon =
+    .title = Tutón modul njeje signowany
+support-third-party-modules-folder-icon =
+    .title = Datajowe městno wo�inić…
+support-third-party-modules-down-icon =
+    .title = Nadrobne informacije pokazać
+support-third-party-modules-up-icon =
+    .title = Nadrobne informacije schować
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/hsb/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Wjacora podpěra za wobraz-we-wobrazu
 experimental-features-multi-pip-description = Eksperimentelna podpěra za runo�asne wo�injenje wjacorych woknow wobraz-we-wobrazu.
+experimental-features-http3 =
+    .label = Protokol HTTP/3
+experimental-features-http3-description = Eksperimentelna podpěra za protokol HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/hsb/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Strona:
     .accesskey = S
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } z { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Poslednja strona
-
+printpreview-homearrow-button =
+    .title = Prěnja strona
+printpreview-previousarrow-button =
+    .title = Předchadna strona
+printpreview-nextarrow-button =
+    .title = Přichodna strona
+printpreview-endarrow-button =
+    .title = Poslednja strona
diff -Nru firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/hsb/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/hsb/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:39:15.000000000 +0000
+++ firefox-85.0+build1/l10n/hsb/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:01.000000000 +0000
@@ -27,6 +27,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Swójski wobwod stronow zapodać
+    .placeholder = na pÅ™. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopije
 printui-orientation = Wusměrjenje
@@ -50,6 +53,7 @@
 printui-options = Nastajenja
 printui-headers-footers-checkbox = Hłowy a nohi ćišćeć
 printui-backgrounds-checkbox = Pozadki ćišćeć
+printui-selection-checkbox = Jenož wuběr ćišćeć
 printui-color-mode-label = Barbny modus
 printui-color-mode-color = Barba
 printui-color-mode-bw = Čorny a běły
@@ -58,19 +62,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Žana
 printui-margins-custom = Swójske
+printui-margins-custom-inches = Swójske (cóle)
 printui-margins-custom-top = Horjeka
+printui-margins-custom-top-inches = Horjeka (cóle)
 printui-margins-custom-bottom = Deleka
+printui-margins-custom-bottom-inches = Deleka (cóle)
 printui-margins-custom-left = Nalěwo
+printui-margins-custom-left-inches = Nalěwo (cóle)
 printui-margins-custom-right = Naprawo
+printui-margins-custom-right-inches = Naprawo (cóle)
 printui-system-dialog-link = Z pomocu systemoweho dialoga ćišćeć…
 printui-primary-button = Ćišćeć
 printui-primary-button-save = Składować
 printui-cancel-button = Přetorhnyć
+printui-close-button = Za�inić
 printui-loading = Ćišćerski přehlad přihotować
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Ćišćerski přehlad
+printui-pages-per-sheet = Strony na Å‚opjeno
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Ćišći so…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/hu/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/aboutLogins.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/aboutLogins.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Eltávolítja ezt a bejelentkezést?
 confirm-delete-dialog-message = Ez a művelet nem vonható vissza.
 about-logins-confirm-remove-dialog-confirm-button = Eltávolítás
-about-logins-confirm-remove-all-dialog-confirm-button = Összes eltávolítása
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Eltávolítás
+        [one] Eltávolítás
+       *[other] Összes eltávolítása
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Igen, a bejelentkezés eltávolítása
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Bejelentkezések és jelszavak exportálása
 about-logins-confirm-export-dialog-message = A jelszavai olvasható szövegként lesznek mentve (például R0sszJel$zó), így bárki megtekintheti, aki meg tudja nyitni az exportált fájlt.
 about-logins-confirm-export-dialog-confirm-button = Exportálás…
+about-logins-alert-import-title = Importálás kész
+about-logins-alert-import-message = Részletes importálási összefoglaló megtekintése
 confirm-discard-changes-dialog-title = Elveti a mentetlen módosításokat?
 confirm-discard-changes-dialog-message = Minden nem mentett változás elvész.
 confirm-discard-changes-dialog-confirm-button = Elvetés
@@ -262,3 +269,30 @@
         [macos] CSV-dokumentum
        *[other] CSV-fájl
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importálás kész
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Új bejelentkezés hozzáadva:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Új bejelentkezések hozzáadva:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Meglévő bejelentkezés frissítve:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Meglévő bejelentkezések frissítve:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Ismétlődő bejelentkezés található:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nem lett importálva)</span>
+       *[other] <span>Ismétlődő bejelentkezések találhatók:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nem lett importálva)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Hiba:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nem lett importálva)</span>
+       *[other] <span>Hibák:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nem lett importálva)</span>
+    }
+about-logins-import-dialog-done = Kész
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/hu/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/appmenu.ftl	2021-01-06 11:40:52.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/appmenu.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Új ablak
+appmenuitem-new-private-window =
+    .label = Új privát ablak
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Nagyítás
 appmenuitem-zoom-reduce =
     .label = Kicsinyítés
+appmenuitem-fullscreen =
+    .label = Teljes képernyő
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Szinkronizálás
+appmenuitem-save-page =
+    .label = Oldal mentése…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Újdonságok
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/hu/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/appMenuNotifications.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Most nem
     .secondarybuttonaccesskey = M
 appmenu-update-restart-message = Gyors újraindítás után, a { -brand-shorter-name } helyreállítja a nyitott lapokat és ablakokat, amelyek nem Privát böngészés módban vannak.
+appmenu-update-other-instance =
+    .label = A { -brand-shorter-name } nem tud automatikusan a legújabb verzióra frissíteni.
+    .buttonlabel = A { -brand-shorter-name } frissítése mindenképp
+    .buttonaccesskey = f
+    .secondarybuttonlabel = Most nem
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message = Egy új { -brand-shorter-name } frissítés érhető el, de nem telepíthető, mert a { -brand-shorter-name } egy másik példánya fut. Zárja be a frissítés folytatásához, vagy válassza azt, hogy mindenképp frissíti (a másik példány lehet hogy az újraindításáig nem fog megfelelően működni).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Rendben, értem
     .buttonaccesskey = R
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/browser.ftl firefox-85.0+build1/l10n/hu/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/browser.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/browser.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = A következő irányítja az egérmutatót: <span data-l10n-name="domain">{ $domain }</span> . Nyomja meg az Esc gombot az irányítás visszavételéhez.
 pointerlock-warning-no-domain = Ez a dokumentum vezérli az egérmutatóját. Nyomja meg az Esc gombot az irányítás visszavételéhez.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Minden könyvjelző megjelenítése
+bookmarks-recent-bookmarks =
+    .value = Nemrég könyvjelzőzött
+bookmarks-toolbar-chevron =
+    .tooltiptext = További könyvjelzők megjelenítése
+bookmarks-sidebar-content =
+    .aria-label = Könyvjelzők
+bookmarks-menu-button =
+    .label = Könyvjelzők menü
+bookmarks-other-bookmarks-menu =
+    .label = Más könyvjelzők
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil könyvjelzők
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Könyvjelzők oldalsáv elrejtése
+           *[other] Könyvjelzők oldalsáv megjelenítése
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Könyvjelző eszköztár elrejtése
+           *[other] Könyvjelző eszköztár megjelenítése
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Könyvjelzők menü eltávolítása az eszköztárról
+           *[other] Könyvjelzők menü hozzáadása az eszköztárhoz
+        }
+bookmarks-search =
+    .label = Könyvjelzők keresése
+bookmarks-tools =
+    .label = Könyvjelzőzési eszközök
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Könyvjelző eszköztár
+    .accesskey = K
+    .aria-label = Könyvjelzők
+bookmarks-toolbar-menu =
+    .label = Könyvjelző eszköztár
+bookmarks-toolbar-placeholder =
+    .title = Könyvjelző eszköztár elemei
+bookmarks-toolbar-placeholder-button =
+    .label = Könyvjelző eszköztár elemei
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Könyvjelzők
+library-bookmarks-bookmark-this-page =
+    .label = Oldal hozzáadása a könyvjelzőkhöz
+library-bookmarks-bookmark-edit =
+    .label = Könyvjelző szerkesztése
+library-recent-activity-label = Friss tevékenység
+
+## More items
+
+more-menu-go-offline =
+    .label = Kapcsolat nélküli munka
+    .accesskey = p
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/hu/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/newtab/asrouter.ftl	2021-01-06 11:40:52.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:09.000000000 +0000
@@ -124,6 +124,9 @@
 
 cfr-whatsnew-searchbar-title = Gépeljen kevesebbet, találjon meg több mindent a címsorban
 cfr-whatsnew-searchbar-body-topsites = Most válassza ki a címsort, és a doboz kibővül a legnépszerűbb webhelyeire mutató hivatkozásokkal.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Nagyító ikon
 
 ## Picture-in-Picture
@@ -278,3 +281,12 @@
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Gyors keresések a címsávban
+cfr-whatsnew-search-shortcuts-body = Ha most beír egy keresőszolgáltatás vagy egy konkrét oldal nevét a címsávba, akkor egy kék ikon fog alatta megjelenni a keresési javaslatoknál. Válassza ki a gyorskeresőt, hogy befejezze a keresést közvetlenül a címsávból.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Védelem a rosszindulatú szupersütik ellen
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Jobb könyvjelzőkezelés
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/hu/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/newtab/newtab.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Új lap
 newtab-settings-button =
     .title = Az Új lap oldal személyre szabása
+newtab-personalize-button-label = Testreszabás
+    .title = Új lap testreszabása
+    .aria-label = Új lap testreszabása
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Keresés a weben
     .title = Keresés a weben
     .aria-label = Keresés a weben
+newtab-search-box-text = Keresés a weben
+newtab-search-box-input =
+    .placeholder = Keresés a weben
+    .aria-label = Keresés a weben
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Keresőszolgáltatás hozzáadása
 newtab-topsites-add-topsites-header = Új népszerű oldal
+newtab-topsites-add-shortcut-header = Új gyorskereső
 newtab-topsites-edit-topsites-header = Népszerű oldal szerkesztése
+newtab-topsites-edit-shortcut-header = Gyorskereső szerkesztése
 newtab-topsites-title-label = Cím
 newtab-topsites-title-input =
     .placeholder = Cím megadása
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Hoppá, valami hiba történt a tartalom betöltésekor.
 newtab-error-fallback-refresh-link = Az újrapróbálkozáshoz frissítse az oldalt.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Gyorskeresők
+newtab-custom-shortcuts-subtitle = Mentett vagy felkeresett webhelyek
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } sor
+       *[other] { $num } sor
+    }
+newtab-custom-sponsored-sites = Szponzorált gyorskeresők
+newtab-custom-pocket-title = A { -pocket-brand-name } által ajánlott
+newtab-custom-pocket-subtitle = Kivételes tartalmak a { -pocket-brand-name } válogatásában, amely a { -brand-product-name } család része
+newtab-custom-pocket-sponsored = Szponzorált történetek
+newtab-custom-recent-title = Legutóbbi tevékenység
+newtab-custom-recent-subtitle = Válogatás a legutóbbi webhelyekből és tartalmakból
+newtab-custom-close-button = Bezárás
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Töredékek
+newtab-custom-snippets-subtitle = Tippek és hírek a { -vendor-short-name } és a { -brand-product-name } felől
+newtab-custom-settings = További beállítások kezelése
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/places.ftl firefox-85.0+build1/l10n/hu/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/places.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/places.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Almappa
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Más könyvjelzők
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/hu/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/preferences/preferences.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = A leggyakrabban látogatott oldalak
 home-prefs-topsites-by-option-sponsored =
     .label = Szponzorált legjobb oldalak
+home-prefs-shortcuts-header =
+    .label = Gyorskeresők
+home-prefs-shortcuts-description = Mentett vagy felkeresett webhelyek
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Szponzorált gyorskeresők
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = A(z) { $provider } ajánlásával
 home-prefs-recommended-by-description-update = Kivételes tartalom szerte az internetről, a { $provider } válogatásában
+home-prefs-recommended-by-description-new = Kivételes tartalmak a { $provider } válogatásában, amely a { -brand-product-name } család része
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Szponzorált történetek
 home-prefs-highlights-header =
     .label = Kiemelések
-home-prefs-recent-activity-header =
-    .label = Legutóbbi tevékenység
 home-prefs-highlights-description = Válogatás azon oldalakból, amelyeket elmentett vagy felkeresett
 home-prefs-highlights-option-visited-pages =
     .label = Látogatott oldalak
@@ -526,6 +530,9 @@
     .label = Legutóbbi letöltés
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }be mentett lapok
+home-prefs-recent-activity-header =
+    .label = Legutóbbi tevékenység
+home-prefs-recent-activity-description = Válogatás a legutóbbi webhelyekből és tartalmakból
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Töredékek
 home-prefs-snippets-description = Hírek a { -vendor-short-name } és a { -brand-product-name } felől
+home-prefs-snippets-description-new = Tippek és hírek a { -vendor-short-name } és a { -brand-product-name } felől
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Nyitott lapok
     .accesskey = N
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Gyorskeresők
+    .accesskey = G
 addressbar-locbar-topsites-option =
     .label = Kedvenc oldalak
     .accesskey = K
+addressbar-locbar-engines-option =
+    .label = Keresőszolgáltatások
+    .accesskey = K
 addressbar-suggestions-settings = Keresőszolgáltatás-javaslatok beállításainak módosítása
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/hu/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/hu/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/hu/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Csak az új lapon
     .accesskey = j
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Megjelenítés mindig
+    .accesskey = M
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Sose jelenítse meg
+    .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Csak az új lapon jelenítse meg
+    .accesskey = C
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Egyéb könyvjelzők megjelenítése
     .accesskey = E
diff -Nru firefox-84.0.2+build1/l10n/hu/devtools/client/markers.properties firefox-85.0+build1/l10n/hu/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/hu/devtools/client/markers.properties	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/devtools/client/markers.properties	2021-01-18 20:05:08.000000000 +0000
@@ -29,7 +29,7 @@
 marker.label.garbageCollection.incremental=Inkrementális GC
 marker.label.garbageCollection.nonIncremental=Nem inkrementális GC
 marker.label.minorGC=Apró GC
-marker.label.cycleCollection=Cycle Collection
+marker.label.cycleCollection=Ciklikus begyűjtés
 marker.label.cycleCollection.forgetSkippable=CC gráfcsökkentés
 marker.label.timestamp=Időbélyeg
 marker.label.worker=Worker
@@ -118,8 +118,9 @@
 marker.gcreason.label.INCREMENTAL_TOO_SLOW=A lefoglalási sebességek túl gyorsak
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Kevés memória
-marker.gcreason.label.CC_WAITING=Ciklikus gyűjtés által kényszerítve
-marker.gcreason.label.CC_FORCED=Ciklikus gyűjtés által kényszerítve
+marker.gcreason.label.CC_WAITING=Ciklikus begyűjtés által kényszerítve
+marker.gcreason.label.CC_FINISHED=Ciklikus begyűjtés kész
+marker.gcreason.label.CC_FORCED=Ciklikus begyűjtés által kényszerítve
 marker.gcreason.label.LOAD_END=Oldalbetöltés befejezve
 marker.gcreason.label.PAGE_HIDE=�thelyezve a háttérbe
 marker.gcreason.label.NSJSCONTEXT_DESTROY=JS-környezet megszüntetése
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Friss terület gyűjtemény
-
diff -Nru firefox-84.0.2+build1/l10n/hu/devtools/client/toolbox.properties firefox-85.0+build1/l10n/hu/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/hu/devtools/client/toolbox.properties	2021-01-06 11:40:52.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/devtools/client/toolbox.properties	2021-01-18 20:05:08.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Fájl megnyitása a stílusszerkesztőben
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Fejlesztői eszköztár bezárása
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Osztott konzol megjelenítése
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/hu/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/hu/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/hu/devtools/client/tooltips.ftl	2021-01-06 11:40:52.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/devtools/client/tooltips.ftl	2021-01-18 20:05:09.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = A(z) <strong>{ $property }</strong> nincs hatással erre az elemre, mivel nem pozicionált elem.
 inactive-text-overflow-when-no-overflow = A(z) <strong>{ $property }</strong> nem befolyásolja ezt az elemet, mivel nem megadva az <strong>overflow:hidden</strong>.
 inactive-outline-radius-when-outline-style-auto-or-none = A(z) <strong>{ $property }</strong> nem befolyásolja ezt az elemet, mert az <strong>outline-style</strong> értéke <strong>auto</strong> vagy <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = A(z) <strong>{ $property }</strong> nincs hatással a belső táblázatelemekre.
+inactive-css-not-for-internal-table-elements-except-table-cells = A(z) <strong>{ $property }</strong> nincs hatással a belső táblázatelemekre, kivéve a táblázatcellákat.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/hu/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/hu/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:08.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=n;n
 
 downloadErrorAlertTitle=Letöltési hiba
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=A letöltést nem lehet menteni, mert a(z) %S blokkolja.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=A letöltést nem lehet menteni, mert egy kiegészítő blokkolja.
 downloadErrorGeneric=A letöltés nem menthető, mert ismeretlen hiba történt.\n\nPróbálja újra.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Pár másodperc van hátra
 timeUnknown2=Ismeretlen idő van hátra
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S erőforrás
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/hu/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/hu/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:08.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=A proxykiszolgáló elutasította a kapcsolatot.
 check_error-2153390069=A kiszolgáló tanúsítványa lejárt. (�llítsa be a rendszerórát a helyes dátumra és időre, ha nem volna helyes.)
 check_error-verification_failed=A frissítés sértetlensége nem ellenőrizhető.
+check_error-move_failed=Nem sikerült előkészíteni a frissítést a telepítéshez
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/hu/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Harmadik féltől származó modulok
+support-third-party-modules-module = Modulfájl
+support-third-party-modules-version = Fájlverzió
+support-third-party-modules-vendor = Szállítói információk
+support-third-party-modules-occurrence = Előfordulás
+support-third-party-modules-process = Folyamattípus és azonosító
+support-third-party-modules-thread = Szál
+support-third-party-modules-base = Imagebase cím
+support-third-party-modules-uptime = Folyamat üzemideje (ms)
+support-third-party-modules-duration = Betöltés időtartama (ms)
+support-third-party-modules-empty = Nincs harmadik féltől származó modul betöltve.
+support-third-party-modules-no-value = (Nincs érték)
+support-third-party-modules-button-open =
+    .title = A fájl helyének megnyitása…
+support-third-party-modules-expand =
+    .title = Részletes információk megjelenítése
+support-third-party-modules-collapse =
+    .title = Részletes információk összecsukása
+support-third-party-modules-unsigned-icon =
+    .title = Ez a modul nincs aláírva
+support-third-party-modules-folder-icon =
+    .title = A fájl helyének megnyitása…
+support-third-party-modules-down-icon =
+    .title = Részletes információk megjelenítése
+support-third-party-modules-up-icon =
+    .title = Részletes információk összecsukása
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/hu/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Több kép a képben megjelenítés támogatása
 experimental-features-multi-pip-description = Kísérleti támogatás több „kép a képben� ablak egyidejű használatához.
+experimental-features-http3 =
+    .label = HTTP/3 protokoll
+experimental-features-http3-description = A HTTP/3 protokoll kísérleti támogatása.
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/hu/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Oldal:
     .accesskey = l
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } / { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Utolsó oldal
-
+printpreview-homearrow-button =
+    .title = Első oldal
+printpreview-previousarrow-button =
+    .title = Előző oldal
+printpreview-nextarrow-button =
+    .title = Következő oldal
+printpreview-endarrow-button =
+    .title = Utolsó oldal
diff -Nru firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/hu/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/hu/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:40:53.000000000 +0000
+++ firefox-85.0+build1/l10n/hu/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:08.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = eddig:
+printui-page-custom-range-input =
+    .aria-label = Egyéni oldaltartomány megadása
+    .placeholder = például 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Példányszám
 printui-orientation = Tájolás
@@ -48,6 +51,7 @@
 printui-options = Beállítások
 printui-headers-footers-checkbox = Fejlécek és láblécek nyomtatása
 printui-backgrounds-checkbox = Hátterek nyomtatása
+printui-selection-checkbox = Csak a kijelölés nyomtatása
 printui-color-mode-label = Színmód
 printui-color-mode-color = Színes
 printui-color-mode-bw = Fekete-fehér
@@ -56,19 +60,29 @@
 printui-margins-min = Minimális
 printui-margins-none = Egyik sem
 printui-margins-custom = Egyéni
+printui-margins-custom-inches = Egyéni (hüvelyk)
 printui-margins-custom-top = Felső
+printui-margins-custom-top-inches = Felső (hüvelyk)
 printui-margins-custom-bottom = Alsó
+printui-margins-custom-bottom-inches = Alsó (hüvelyk)
 printui-margins-custom-left = Bal
+printui-margins-custom-left-inches = Bal (hüvelyk)
 printui-margins-custom-right = Jobb
+printui-margins-custom-right-inches = Jobb (hüvelyk)
 printui-system-dialog-link = Nyomtatás a rendszer párbeszédablakával…
 printui-primary-button = Nyomtatás
 printui-primary-button-save = Mentés
 printui-cancel-button = Mégse
+printui-close-button = Bezárás
 printui-loading = Előnézet előkészítése
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Nyomtatási kép
+printui-pages-per-sheet = Oldalak száma laponként
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Nyomtatás…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/hy-AM/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/hy-AM/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/hy-AM/browser/browser/aboutCertError.ftl	2021-01-06 11:40:57.000000000 +0000
+++ firefox-85.0+build1/l10n/hy-AM/browser/browser/aboutCertError.ftl	2021-01-18 20:05:13.000000000 +0000
@@ -5,83 +5,57 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname }-Õ¨ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ½Õ­Õ¡Õ¬ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€:
-
 cert-error-mitm-intro = Ô¿Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾, Õ¸Ö€Õ¸Õ¶Ö„ Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ´Õ¡Ö€Õ´Õ«Õ¶Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�:
-
 cert-error-mitm-mozilla = { -brand-short-name } -Õ¶ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¾Õ¡Õ® Õ§ Õ·Õ¡Õ°Õ¸Ö‚ÕµÕ© Õ¹Õ°Õ¥Õ¿Õ¡ÕºÕ¶Õ¤Õ¸Õ² Mozilla- Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�, Õ¸Ö€Õ¨ Õ¯Õ¡Õ¼Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´ Õ§ Õ¬Õ«Õ¸Õ¾Õ«Õ¶ Õ¢Õ¡Ö� Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ«Ö€Õ¡Õ¾Õ¡Õ½Õ¸Ö‚Õ©ÕµÕ¡Õ¶ (CA) Õ­Õ¡Õ¶Õ¸Ö‚Õ©: CA Õ­Õ¡Õ¶Õ¸Ö‚Õ©Õ¶ Ö…Õ£Õ¶Õ¸Ö‚Õ´ Õ§ Õ¡ÕºÕ¡Õ°Õ¸Õ¾Õ¥Õ¬, Õ¸Ö€ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ´Õ¡Ö€Õ´Õ«Õ¶Õ¶Õ¥Ö€Õ¨ Õ°Õ¥Õ¿Ö‡Õ¸Ö‚Õ´ Õ¥Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¶Õ¥Ö€Õ« Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¬Õ¡Õ¾Õ¡Õ£Õ¸Ö‚ÕµÕ¶ ÖƒÕ¸Ö€Õ±Õ«Õ¶:
-
 cert-error-mitm-connection = { -brand-short-name } - Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Mozilla CA Õ­Õ¡Õ¶Õ¸Ö‚Õ©Õ¨ `Õ°Õ¡Õ½Õ¿Õ¡Õ¿Õ¥Õ¬Õ¸Ö‚, Õ¸Ö€ Õ¯Õ¡ÕºÕ¶ Õ¡ÕºÕ¡Õ°Õ¸Õ¾ Õ§, Õ¡ÕµÕ¬ Õ¸Õ¹ Õ©Õ¥ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ« Õ£Õ¸Ö€Õ®Õ¡Õ¼Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ« Õ¯Õ¸Õ²Õ´Õ«Ö� Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¾Õ¡Õ® Õ¾Õ¯Õ¡ÕµÕ¡Õ£Ö€Õ¥Ö€Õ«: Ô±ÕµÕ½ÕºÕ«Õ½Õ¸Õ¾, Õ¥Õ©Õ¥ Õ°Õ¡Õ¯Õ¡Õ¾Õ«Ö€Õ¸Ö‚Õ½Õ¡ÕµÕ«Õ¶ Õ®Ö€Õ¡Õ£Õ«Ö€Õ¨ Õ¯Õ¡Õ´ Ö�Õ¡Õ¶Ö�Õ¨ Õ¨Õ¶Õ¤Õ°Õ¡Õ¿Õ¸Ö‚Õ´ Õ¥Õ¶ Õ¯Õ¡ÕºÕ¨ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Mozilla- Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�, Õ¸Ö€Õ¨ Mozilla CA Õ­Õ¡Õ¶Õ¸Ö‚Õ©Õ¸Ö‚Õ´ Õ¹Õ§, Õ¯Õ¡ÕºÕ¨ Õ°Õ¡Õ´Õ¡Ö€Õ¾Õ¸Ö‚Õ´ Õ§ Õ¡Õ¶Õ¡ÕºÕ¡Õ°Õ¸Õ¾:
-
 cert-error-trust-unknown-issuer-intro = Ô»Õ¶Õ¹-Õ¸Ö€ Õ´Õ¥Õ¯Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§Ö€ ÖƒÕ¸Ö€Õ±Õ¥Õ¬ Õ¯Õ¡ÕµÖ„Õ¨ Õ½Õ¡Õ¶Õ±Õ¡Õ¦Õ¥Ö€Õ®Õ¥Õ¬, Ö‡ Õ¤Õ¸Ö‚Ö„ Õ¹ÕºÕ¥Õ¿Ö„ Õ§ Õ·Õ¡Ö€Õ¸Ö‚Õ¶Õ¡Õ¯Õ¥Ö„:
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-trust-unknown-issuer = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾: { -brand-short-name }-Õ¨ Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ { $hostname } -Õ«Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¤Ö€Õ¡ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Ö€Õ« Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¸Õ²Õ¨ Õ¡Õ¶Õ°Õ¡ÕµÕ¿ Õ§, Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ«Õ¶Ö„Õ¶Õ¡Õ£Õ«Ö€ Õ§, Õ¯Õ¡Õ´ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¨ Õ¹Õ« Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¸Ö‚Õ´ Õ³Õ«Õ·Õ¿ Õ´Õ«Õ»Õ¡Õ¶Õ¯ÕµÕ¡Õ¬ Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¶Õ¥Ö€:
-
 cert-error-trust-cert-invalid = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¾Õ¥Õ¬ Õ¡Õ¶Õ¾Õ¡Õ¾Õ¥Ö€ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Ö€Õ¸Õ² Õ¯Õ¥Õ¶Õ¿Ö€Õ¸Õ¶Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�:
-
 cert-error-trust-untrusted-issuer = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§, Õ¸Ö€Õ¸Õ¾Õ°Õ¥Õ¿Ö‡ Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¸Õ²Õ« Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§Ö‰
-
 cert-error-trust-signature-algorithm-disabled = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§, Õ¸Ö€Õ¸Õ¾Õ°Õ¥Õ¿Ö‡ Õ¡ÕµÕ¶ Õ½Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ¾Õ¥Õ¬ Õ§ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬Õ¸Õ¾ Õ½Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ·Õ¾Õ¥Õ¯Õ¡Ö€Õ£, Õ¸Ö€Õ¨ Õ¡Õ¶Õ»Õ¡Õ¿Õ¾Õ¥Õ¬ Õ§, Õ¸Ö€Õ¸Õ¾Õ°Õ¥Õ¿Ö‡ Õ¡ÕµÕ¤ Õ°Õ¡Õ·Õ¾Õ¥Õ¯Õ¡Ö€Õ£Õ¨ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£ Õ¹Õ§Ö‰
-
 cert-error-trust-expired-issuer = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Õ£Õ«Ö€ Õ¿Ö€Õ¡Õ´Õ¡Õ¤Ö€Õ¸Õ²Õ« ÕªÕ¡Õ´Õ¯Õ¥Õ¿Õ¨ Õ½ÕºÕ¡Õ¼Õ¾Õ¥Õ¬ Õ§:
-
 cert-error-trust-self-signed = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§ Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Õ½Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ¾Õ¥Õ¬ Õ§ Õ«Ö€ Õ«Õ½Õ¯ Õ¯Õ¸Õ²Õ´Õ«Ö�:
-
 cert-error-trust-symantec = GeoTrust- Õ«, RapidSSL- Õ«, Symantec- Õ«, Thawte- Õ« Ö‡ VeriSign- Õ« Õ¯Õ¸Õ²Õ´Õ«Ö� Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¡Õ® Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¶Õ¥Ö€Õ¶ Õ¡ÕµÕ¬Ö‡Õ½ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£ Õ¹Õ¥Õ¶ Õ°Õ¡Õ´Õ¡Ö€Õ¾Õ¸Ö‚Õ´, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡Õ¶Ö�ÕµÕ¡Õ¬Õ¸Ö‚Õ´ Õ¡Ö€Õ¿Õ¸Õ¶Õ¡Ö�Õ´Õ¡Õ¶ Õ¡ÕµÕ½ Õ´Õ¡Ö€Õ´Õ«Õ¶Õ¶Õ¥Ö€Õ«Õ¶ Õ¹Õ« Õ°Õ¡Õ»Õ¸Õ²Õ¾Õ¥Õ¬ Õ°Õ¥Õ¿Ö‡Õ¥Õ¬ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ«Õ¶:
-
 cert-error-untrusted-default = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ½Õ¿Õ¡Õ´Õ¡Õ¤Ö€Õ¸Õ² Õ¡Õ²Õ¢ÕµÕ¸Ö‚Ö€Õ¨ Õ¾Õ½Õ¿Õ¡Õ°Õ¥Õ¬Õ« Õ¹Õ§:
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-domain-mismatch = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾: { -brand-short-name } Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ«Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€, Õ¸Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¹Õ§ { $hostname }-Õ« Õ°Õ¡Õ´Õ¡Ö€:
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾: { -brand-short-name } Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ«Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€, Õ¸Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¹Õ§ { $hostname } -Õ« Õ°Õ¡Õ´Õ¡Ö€: ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ§ Õ´Õ«Õ¡ÕµÕ¶ <a data-l10n-name="domain-mismatch-link">{ $alt-name }</a> Õ°Õ¡Õ´Õ¡Ö€:
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single-nolink = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾: { -brand-short-name } Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ«Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€, Õ¸Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¹Õ§ { $hostname } -Õ« Õ°Õ¡Õ´Õ¡Ö€: ÕŽÕ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ§ Õ´Õ«Õ¡ÕµÕ¶ { $alt-name } -Õ« Õ°Õ¡Õ´Õ¡Ö€:
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾: { -brand-short-name } Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ«Õ¶, Ö„Õ¡Õ¶Õ« Õ¸Ö€ Õ¡ÕµÕ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€, Õ¸Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¹Õ§ { $hostname } -Õ« Õ°Õ¡Õ´Õ¡Ö€: Õ€Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Õ«Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ§ Õ´Õ«Õ¡ÕµÕ¶ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ Õ¡Õ¶Õ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€Õ� { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¶Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾, Õ¸Ö€Õ¸Õ¶Ö„ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¥Õ¶ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ« Õ°Õ¡Õ´Õ¡Ö€: { $hostname } Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¬Ö€Õ¡Ö�Õ¥Õ¬ Õ§ { $not-after-local-time } Õ°Õ¥Õ¿Õ¸:
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¶Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾, Õ¸Ö€Õ¸Õ¶Ö„ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¥Õ¶ Õ½Õ¡Õ°Õ´Õ¡Õ¶Õ¾Õ¡Õ® ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ« Õ°Õ¡Õ´Õ¡Ö€: { $hostname } Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€Õ¨ Õ¾Õ¡Õ¾Õ¥Ö€ Õ¹Õ« Õ¬Õ«Õ¶Õ« Õ´Õ«Õ¶Õ¹Ö‡ { $not-before-local-time }Ö‰
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Õ�Õ­Õ¡Õ¬Õ« Õ¯Õ¸Õ¤Õ� <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = ÕŽÕ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ¥Ö€Õ¨ Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¸Ö‚Õ´ Õ¥Õ¶ Õ«Ö€Õ¥Õ¶Ö� Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¶Õ¥Ö€Õ« Õ´Õ«Õ»Õ¸Ö�Õ¸Õ¾, Õ¸Ö€Õ¸Õ¶Ö„ Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¸Ö‚Õ´ Õ¥Õ¶ Õ°Õ¡Õ¾Õ¡Õ½Õ¿Õ¡Õ£Ö€Õ´Õ¡Õ¶ Õ´Õ¡Ö€Õ´Õ«Õ¶Õ¶Õ¥Ö€Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�: Ô¶Õ¶Õ¶Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ« Õ´Õ¥Õ® Õ´Õ¡Õ½Õ¨ Õ¡ÕµÕ¬Ö‡Õ½ Õ¹Õ« Õ¾Õ½Õ¿Õ¡Õ°Õ¸Ö‚Õ´ GeoTrust- Õ«, RapidSSL- Õ«, Symantec- Õ«, Thawte- Õ« Ö‡ VeriSign- Õ« Õ¯Õ¸Õ²Õ´Õ«Ö� Õ©Õ¸Õ²Õ¡Ö€Õ¯Õ¾Õ¡Õ® Õ¾Õ¯Õ¡ÕµÕ¡Õ£Ö€Õ¥Ö€Õ«Õ¶: { $hostname } Õ¶ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ´ Õ§ Õ¾Õ¯Õ¡ÕµÕ¡Õ£Õ«Ö€ Õ¡ÕµÕ½ Õ«Õ·Õ­Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ«Ö� Õ¸Ö€Ö‡Õ§ Õ´Õ¥Õ¯Õ« Õ¯Õ¸Õ²Õ´Õ«Ö�, Õ¸Ö‚Õ½Õ¿Õ« Õ¯Õ¡ÕµÖ„Õ« Õ«Õ¶Ö„Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¡ÕºÕ¡Ö�Õ¸Ö‚Ö�Õ¾Õ¥Õ¬:
-
 cert-error-symantec-distrust-admin = Ô±ÕµÕ½ Õ­Õ¶Õ¤Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ¿Õ¥Õ²Õ¥Õ¯Õ¡Ö�Õ¶Õ¥Õ¬ Õ¾Õ¥Õ¢ Õ¯Õ¡ÕµÖ„Õ« Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¡Ö€Õ«Õ¶:
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP Õ­Õ«Õ½Õ¿ ÖƒÕ¸Õ­Õ¡Õ¶Ö�Õ´Õ¡Õ¶ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶. { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = HTTP Public Key Pinning: { $hasHPKP }
-
 cert-error-details-cert-chain-label = ÕŽÕ¯Õ¡ÕµÕ¡Õ£Ö€Õ« Õ¶ÕºÕ¡Õ¿Õ¡Õ¯.
-
 open-in-new-window-for-csp-or-xfo-error = Ô²Õ¡Ö�Õ¥Õ¬ Õ¯Õ¡ÕµÖ„Õ¨ Õ¶Õ¸Ö€ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¸Ö‚Õ´
-
 # Variables:
 # $hostname (String) - Hostname of the website blocked by csp or xfo error.
 csp-xfo-blocked-long-desc = Õ�Õ¥Ö€ Õ¡Õ¶Õ¾Õ¿Õ¡Õ¶Õ£Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ ÕºÕ¡Õ·Õ¿ÕºÕ¡Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ { $hostname }-Õ¨ Õ©Õ¸Ö‚ÕµÕ¬ Õ¹Õ« Õ¿Õ¡, Õ¸Ö€ { -brand-short-name }-Õ¨ Ö�Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ« Õ§Õ»Õ¨, Õ¥Õ©Õ¥ Õ´Õ¥Õ¯ Õ¡ÕµÕ¬ Õ¯Õ¡ÕµÖ„ Õ¶Õ¥Ö€Õ¯Õ¡Õ¼Õ¸Ö‚Ö�Õ¥Õ¬ Õ§ Õ¡ÕµÕ¶: Ô±ÕµÕ½ Õ§Õ»Õ¨ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ¡Ö€Õ¯Õ¡Õ¾Õ¸Ö€ Õ§ Õ¡ÕµÕ¶ Õ¢Õ¡Ö�Õ¥Õ¬ Õ¶Õ¸Ö€ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¸Ö‚Õ´:
@@ -92,7 +66,7 @@
 deniedPortAccess-title = Ô±ÕµÕ½ Õ°Õ¡Õ½Ö�Õ¥Õ¶ Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Õ§
 # "Hmm" is a sound made when considering or puzzling over something.
 # You don't have to include it in your translation if your language does not have a written word like this.
-dnsNotFound-title = Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Õ¿Õ¶Õ¥Õ¬ Õ¡ÕµÕ¤ Õ¯Õ¡ÕµÖ„Õ¨:
+dnsNotFound-title = Õ€Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¹Õ§ Õ£Õ¿Õ¶Õ¥Õ¬ Õ¡ÕµÕ½ Õ¯Õ¡ÕµÖ„Õ¨:
 fileNotFound-title = Õ†Õ«Õ·Ö„Õ¨ Õ¹Õ« Õ£Õ¿Õ¶Õ¾Õ¥Õ¬
 fileAccessDenied-title = Õ†Õ«Õ·Ö„Õ« Õ´Õ¸Ö‚Õ¿Ö„Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¡Õ® Õ§
 generic-title = ÕŽÕ¡ÕµÖ‰
diff -Nru firefox-84.0.2+build1/l10n/hy-AM/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/hy-AM/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/hy-AM/browser/browser/appmenu.ftl	2021-01-06 11:40:57.000000000 +0000
+++ firefox-85.0+build1/l10n/hy-AM/browser/browser/appmenu.ftl	2021-01-18 20:05:13.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Õ†Õ¸Ö€ ÕŠÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶
+appmenuitem-new-private-window =
+    .label = Õ�Õ¯Õ½Õ¥Õ¬ Ô³Õ¡Õ²Õ¿Õ¶Õ« Õ¤Õ«Õ¿Õ¡Ö€Õ¯Õ¸Ö‚Õ´
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Ô½Õ¸Õ·Õ¸Ö€Õ¡Ö�Õ¶Õ¥Õ¬
 appmenuitem-zoom-reduce =
     .label = Õ“Õ¸Ö„Ö€Õ¡Ö�Õ¶Õ¥Õ¬
+appmenuitem-fullscreen =
+    .label = Ô¼Õ«Õ¡Õ§Õ¯Ö€Õ¡Õ¶
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Õ�Õ«Õ¶Ö„
+appmenuitem-save-page =
+    .label = Պահպանել Էջը որպես…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Ô»Õ¶Õ¹Õ¶ Õ§ Õ¶Õ¸Ö€
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/hy-AM/browser/browser/browser.ftl firefox-85.0+build1/l10n/hy-AM/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/hy-AM/browser/browser/browser.ftl	2021-01-06 11:40:57.000000000 +0000
+++ firefox-85.0+build1/l10n/hy-AM/browser/browser/browser.ftl	2021-01-18 20:05:13.000000000 +0000
@@ -315,6 +315,9 @@
 browser-window-close-button =
     .tooltiptext = Õ“Õ¡Õ¯Õ¥Õ¬
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -411,3 +414,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´ Õ§ Õ±Õ¥Ö€ Ö�Õ¸Ö‚Ö�Õ«Õ¹Õ¨: Õ�Õ¥Õ²Õ´Õ¥Ö„ EscÕ� Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´Õ¨ Õ°Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€:
 pointerlock-warning-no-domain = Ô±ÕµÕ½ ÖƒÕ¡Õ½Õ¿Õ¡Õ©Õ¸Ö‚Õ²Õ©Õ¨ Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´ Õ§ Õ±Õ¥Ö€ Ö�Õ¸Ö‚Ö�Õ«Õ¹Õ¨: Õ�Õ¥Õ²Õ´Õ¥Ö„ EscÕ� Õ²Õ¥Õ¯Õ¡Õ¾Õ¡Ö€Õ¸Ö‚Õ´Õ¨ Õ°Õ¥Õ¿ Õ¾Õ¥Ö€Õ¡Õ¤Õ¡Ö€Õ±Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€:
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö€ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ¨
+bookmarks-recent-bookmarks =
+    .value = ÕŽÕ¥Ö€Õ»Õ¥Ö€Õ½ Õ§Õ»Õ¡Õ¶Õ·Õ¾Õ¡Õ®
+bookmarks-toolbar-chevron =
+    .tooltiptext = Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ Õ¡Õ¾Õ¥Õ¬Õ« Õ·Õ¡Õ¿ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+bookmarks-sidebar-content =
+    .aria-label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+bookmarks-menu-button =
+    .label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯
+bookmarks-other-bookmarks-menu =
+    .label = Ô±ÕµÕ¬ Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+bookmarks-mobile-bookmarks-menu =
+    .label = Ô²Õ»Õ»Õ¡ÕµÕ«Õ¶ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Ô¿Õ¸Õ²Õ¡Õ£Õ¸Õ¿Õ«Õ¶
+           *[other] Ô´Õ«Õ¿Õ¥Õ¬ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Õ¾Õ¡Õ°Õ¡Õ¶Õ¡Õ¯Õ¨
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ô¹Õ¡Ö„Ö�Õ¶Õ¥Õ¬ Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Ô³Õ¸Ö€Õ®Õ«Ö„Õ¡Õ£Õ¸Õ¿Õ«Õ¶
+           *[other] Ô´Õ«Õ¿Õ¥Õ¬ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Õ¾Õ¡Õ°Õ¡Õ¶Õ¡Õ¯Õ¨
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Õ€ÔµÕ¼Õ¡Ö�Õ¶Õ¥Õ¬ Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯Õ¨ Ô³Õ¸Ö€Õ®Õ«Ö„Õ¡Õ£Õ¸Õ¿Õ¸Ö‚Ö�
+           *[other] Ô±Õ¾Õ¥Õ¬Õ¡Ö�Õ¶Õ¥Õ¬ Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Ö�Õ¡Õ¶Õ¯ Ô³Õ¸Ö€Õ®Õ«Ö„Õ¡Õ£Õ¸Õ¿Õ«Õ¸Ö‚Õ´
+        }
+bookmarks-search =
+    .label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´
+bookmarks-tools =
+    .label = Ô·Õ»Õ¡Õ¶Õ·Õ¥Õ¬Õ¸Ö‚ Õ£Õ¸Ö€Õ®Õ«Ö„Õ¶Õ¥Ö€
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« ÕŽÕ¡Õ°Õ¡Õ¶Õ¡Õ¯
+    .accesskey = Ô·
+    .aria-label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+bookmarks-toolbar-menu =
+    .label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« ÕŽÕ¡Õ°Õ¡Õ¶Õ¡Õ¯
+bookmarks-toolbar-placeholder =
+    .title = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« ÕŽÕ¡Õ°Õ¡Õ¶Õ¡Õ¯Õ« Õ¿Õ¡Ö€Ö€Õ¥Ö€Õ¨
+bookmarks-toolbar-placeholder-button =
+    .label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€Õ« ÕŽÕ¡Õ°Õ¡Õ¶Õ¡Õ¯Õ« Õ¿Õ¡Ö€Ö€Õ¥Ö€Õ¨
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Ô·Õ»Õ¡Õ¶Õ«Õ·Õ¥Ö€
+library-bookmarks-bookmark-this-page =
+    .label = Ô·Õ»Õ¡Õ¶Õ·Õ¥Õ¬ Ô±ÕµÕ½ Ô·Õ»Õ¨
+library-bookmarks-bookmark-edit =
+    .label = Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¡ÕµÕ½ Õ§Õ»Õ¡Õ¶Õ«Õ·Õ¨
+
+## More items
+
+more-menu-go-offline =
+    .label = Ô±Õ·Õ­Õ¡Õ¿Õ¥Õ¬ Õ¡Õ¶Ö�Õ¡Õ¶Ö�
+    .accesskey = Õ¿
diff -Nru firefox-84.0.2+build1/l10n/hy-AM/dom/dom/media.ftl firefox-85.0+build1/l10n/hy-AM/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/hy-AM/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/hy-AM/dom/dom/media.ftl	2021-01-18 20:05:13.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/hy-AM/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/hy-AM/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/hy-AM/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/hy-AM/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:05:13.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/ia/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/aboutCertError.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/aboutCertError.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -5,86 +5,60 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } usa un certificato de securitate non valide.
-
 cert-error-mitm-intro = Sitos web prova lor identitate via certificatos, que es emittite per autoritates de certification.
-
 cert-error-mitm-mozilla = { -brand-short-name } es sustenite per le organisation sin scopo lucrative Mozilla, que administra un magazin de autoritates de certification (CA) completemente aperte. Le magazin CA adjuta a garantir que le autoritates de certification seque le melior practicas pro le securitate del usator.
-
 cert-error-mitm-connection = { -brand-short-name } usa le magazin CA de Mozilla pro verificar que un connexion es secur, in vice de usar le certificatos fornite per le systema de operation del usator. Dunque, si un programma antivirus o un rete intercepta le connexion con un certificato de securitate emittite per un CA que non es in le magazin CA de Mozilla, le connexion es considerate insecur.
-
 cert-error-trust-unknown-issuer-intro = Alcuno possibilemente tenta usurpar le identitate del sito. Tu non deberea continuar.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-trust-unknown-issuer = Le sitos web garanti lor identitate per certificatos. { -brand-short-name } non confide in { $hostname } perque su emissor de certificato es incognite, le certificato es auto-signate o le servitor non invia le certificatos intermedie correcte.
-
 cert-error-trust-cert-invalid = Le certificato non es digne de fide perque illo ha essite emittite per un CA non valide.
-
 cert-error-trust-untrusted-issuer = Le certificato non es digne de fide perque le certificato del emissor non es digne de fide.
-
 cert-error-trust-signature-algorithm-disabled = Le certificato non es digne de fide perque illo ha essite signate con un algorithmo de signatura que ha essite disactivate perque ille algorithmo non es secur.
-
 cert-error-trust-expired-issuer = Le certificato non es digne de fide perque le certificato del emissor ha expirate.
-
 cert-error-trust-self-signed = Le certificato non es digne de fide perque illo es auto-signate.
-
 cert-error-trust-symantec = Le certificatos emittite per GeoTrust, RapidSSL, Symantec, Thawte e VeriSign non es plus considerate secur perque iste autoritates de certification ha fallite de sequer le practicas de securitate in le passato.
-
 cert-error-untrusted-default = Le certificato non proveni de un fonte digne de fide.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-domain-mismatch = Le sitos web garanti lor identitate per certificatos. { -brand-short-name } non confide in iste sito perque illo usa un certificato que non es valide pro { $hostname }.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single = Le sitos web garanti lor identitate per certificatos. { -brand-short-name } non confide in iste sito perque illo usa un certificato que non es valide pro { $hostname }. Le certificato es solmente valide pro <a data-l10n-name="domain-mismatch-link">{ $alt-name }</a>.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $alt-name (String) - Alternate domain name for which the cert is valid.
 cert-error-domain-mismatch-single-nolink = Le sitos web garanti lor identitate per certificatos. { -brand-short-name } non confide in iste sito perque illo usa un certificato que non es valide pro { $hostname }. Le certificato es solmente valide pro { $alt-name }.
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = Le sitos web garanti lor identitate per certificatos. { -brand-short-name } non confide in iste sito perque illo usa un certificato que non es valide pro { $hostname }. Le certificato es solmente valide pro le nomines sequente: { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = Le sitos web garanti lor identitate per certificatos, le quales es valide pro un determinate periodo de tempore. Le certificato pro { $hostname } ha expirate le { $not-after-local-time }.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = Le sitos web garanti lor identitate per certificatos, le quales es valide pro un determinate periodo de tempore. Le certificato pro { $hostname } non essera valide usque { $not-before-local-time }.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Codice de error: <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = Le sitos web garanti lor identitate per certificatos, le quales es emittite per autoritates de certification. Le major parte del navigatores non confide plus in le certificatos emittite per GeoTrust, RapidSSL, Symantec, Thawte e VeriSign. { $hostname } usa un certificato de un de iste autoritates. Consequentemente, le identitate del sito web non pote esser garantite.
-
 cert-error-symantec-distrust-admin = Tu pote informar le administrator del sito web de iste problema.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = Securitate stricte de transporto HTTP: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = Fixation de clave public HTTP: { $hasHPKP }
-
 cert-error-details-cert-chain-label = Catena de certificatos:
-
 open-in-new-window-for-csp-or-xfo-error = Aperir sito in nove fenestra
-
 # Variables:
 # $hostname (String) - Hostname of the website blocked by csp or xfo error.
-csp-xfo-blocked-long-desc = Pro proteger tu securitate, { $hostname } non permittera { -brand-short-name } monstrar le pagina si un altere sito ha integrate illo. Pro vider iste pagina, tu debe aperir lo in un nove fenestra.
+csp-xfo-blocked-long-desc = Pro proteger tu securitate, { $hostname } non permitte a { -brand-short-name } monstrar le pagina si un altere sito lo ha integrate. Pro vider iste pagina, tu debe aperir lo in un nove fenestra.
 
 ## Messages used for certificate error titles
 
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ia/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/aboutLogins.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/aboutLogins.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Remover iste credentiales?
 confirm-delete-dialog-message = Iste action es irreversibile.
 about-logins-confirm-remove-dialog-confirm-button = Remover
-about-logins-confirm-remove-all-dialog-confirm-button = Remover toto
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Remover
+       *[other] Remover toto
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Si, remover iste credential
@@ -198,6 +202,8 @@
 about-logins-confirm-export-dialog-title = Exportar credentiales e contrasignos
 about-logins-confirm-export-dialog-message = Tu contrasignos sera salvate como texto legibile (e.g., "P@ssw0rd123"), assi quicunque pote aperir le file exportate, pote vider los.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importation complete
+about-logins-alert-import-message = Vider un summario detaliate del importation
 confirm-discard-changes-dialog-title = Abandonar le modificationes non salvate?
 confirm-discard-changes-dialog-message = Tote le modificationes non salvate essera perdite.
 confirm-discard-changes-dialog-confirm-button = Abandonar
@@ -259,3 +265,26 @@
         [macos] Documento CSV
        *[other] File CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importation complete
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nove credential addite:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nove credentiales addite:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Credential existente actualisate:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Credentiales existente actualisate:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Credential duplicate:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(non importate)</span>
+       *[other] <span>Credentiales duplicate:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(non importate)</span>
+    }
+about-logins-import-dialog-items-error = <span>Errores:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(non importate)</span>
+about-logins-import-dialog-done = Facite
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/ia/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -14,7 +14,7 @@
 crashed-request-help-message = Le reportos de collapso pote adjutar nos a diagnosticar problemas e a meliorar { -brand-short-name }.
 crashed-request-report-title = Reportar iste scheda
 crashed-send-report = Invia un reporto automatic de collapso a fin que nos pote corriger problemas como iste.
-crashed-send-report-2 = Inviar un reporto de crash automatic a fin que nos pote corriger problemas como iste
+crashed-send-report-2 = Inviar un reporto automatic de collapso a fin que nos pote corriger problemas como iste
 crashed-comment =
     .placeholder = Commentos optional (le commentos es publicamente visibile)
 crashed-include-URL = Include le URLs del sitos que tu visitava quando { -brand-short-name } collabeva.
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ia/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/appmenu.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/appmenu.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nove fenestra
+appmenuitem-new-private-window =
+    .label = Nove fenestra private
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom avante
 appmenuitem-zoom-reduce =
     .label = Zoom retro
+appmenuitem-fullscreen =
+    .label = Plen schermo
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchronisar ora
+appmenuitem-save-page =
+    .label = Salvar le pagina como…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ia/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/appMenuNotifications.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Non ora
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Post un rapide reinitio, { -brand-shorter-name } va restaurar tote tu schedas e fenestras aperte que non es in modo de navigation private.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } non pote automaticamente actualisar se al ultime version.
+    .buttonlabel = Actualisar { -brand-shorter-name } totevia
+    .buttonaccesskey = A
+    .secondarybuttonlabel = Non ora
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Un nove edition de { -brand-shorter-name } es disponibile, ma non pote esser installate perque un altere exemplar de { -brand-shorter-name } es in execution. Claude lo pro continuar le actualisation, o opta pro actualisar totevia (le altere exemplar pote non functionar correctemente usque tu lo reinitia).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK, io lo comprende
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/browser.ftl firefox-85.0+build1/l10n/ia/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/browser.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/browser.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> controla tu punctator. Preme Esc pro reprender le controlo.
 pointerlock-warning-no-domain = Iste documento controla tu punctator. Preme Esc pro reprender le controlo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Monstrar tote le marcapaginas
+bookmarks-recent-bookmarks =
+    .value = Marcapaginas recente
+bookmarks-toolbar-chevron =
+    .tooltiptext = Monstrar plus marcapaginas
+bookmarks-sidebar-content =
+    .aria-label = Marcapaginas
+bookmarks-menu-button =
+    .label = Menu de marcapaginas
+bookmarks-other-bookmarks-menu =
+    .label = Altere marcapaginas
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcapaginas mobile
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Celar le barra lateral de marcapaginas
+           *[other] Vider le barra lateral de marcapaginas
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Celar le barra de marcapaginas
+           *[other] Vider le barra de marcapaginas
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Remover le menu de marcapaginas del barra
+           *[other] Adder le menu de marcapaginas al barra
+        }
+bookmarks-search =
+    .label = Cercar in le marcapaginas
+bookmarks-tools =
+    .label = Instrumentos de marcapaginas
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de marcapaginas
+    .accesskey = m
+    .aria-label = Marcapaginas
+bookmarks-toolbar-menu =
+    .label = Barra de marcapaginas
+bookmarks-toolbar-placeholder =
+    .title = Elementos del barra de marcapaginas
+bookmarks-toolbar-placeholder-button =
+    .label = Elementos del barra de marcapaginas
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcapaginas
+library-bookmarks-bookmark-this-page =
+    .label = Adder un marcapaginas
+library-bookmarks-bookmark-edit =
+    .label = Modificar iste marcapaginas
+library-recent-activity-label = Recente activitate
+
+## More items
+
+more-menu-go-offline =
+    .label = Travaliar disconnectite
+    .accesskey = T
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/menubar.ftl firefox-85.0+build1/l10n/ia/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/menubar.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/menubar.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -3,6 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+# NOTE: For English locales, strings in this file should be in APA-style Title Case.
+# See https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case
+#
+# NOTE: For Engineers, please don't re-use these strings outside of the menubar.
+
+
 ## File Menu
 
 menu-file =
@@ -179,7 +185,7 @@
 menu-bookmarks-other =
     .label = Altere marcapaginas
 menu-bookmarks-mobile =
-    .label = Marcapaginas del apparatos mobile
+    .label = Marcapaginas mobile
 
 ## Tools Menu
 
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ia/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/newtab/asrouter.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -120,6 +120,9 @@
 
 cfr-whatsnew-searchbar-title = Scribe minus, trova plus con le barra de adresse
 cfr-whatsnew-searchbar-body-topsites = Ora, selige le barra de adresse, e un quadro apparera con un lista de ligamines a tu sitos principal.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icone de lupa
 
 ## Picture-in-Picture
@@ -272,5 +275,15 @@
 
 ## What's new: Search shortcuts
 
-cfr-whatsnew-search-shortcuts-header = Vias breve de recerca in le barra del adresses
-cfr-whatsnew-search-shortcuts-body = Quando tu insere un motor de recerca o un sito specific in le barra del adresses, un via breve blau apparera in le suggestiones infra. Selige ille via breve pro completar tu recerca directemente del barra del adresses.
+cfr-whatsnew-search-shortcuts-header = Accessos directe de recerca in le barra de adresses
+cfr-whatsnew-search-shortcuts-body = Quando tu insere un motor de recerca o un sito specific in le barra de adresses, un accesso directe blau apparera in le suggestiones de recerca sub le barra. Selige iste accesso directe pro completar tu recerca directemente ab le barra del adresses.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protection contra le supercookies malevolente
+cfr-whatsnew-supercookies-body = Sitos web pote secretemente attachar a tu navigator un "supercookie" que pote sequer te per le web, mesmo post que tu ha radite le cookies. { -brand-short-name } ora forni un protection forte contra le supercookies de maniera que illos non pote esser usate pro traciar tu activitates de sito a sito.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Melior marcapagina
+cfr-whatsnew-bookmarking-body = Es plus facile sequer tu sitos favorite. { -brand-short-name } ora recorda tu loco preferite pro salvar marcapaginas, monstra per predefinition le barra de marcapaginas sur nove schedas, e te da accesso facile al resto de tu marcapaginas per medio de un dossier sur le barra de instrumentos.
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ia/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/newtab/newtab.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nove scheda
 newtab-settings-button =
     .title = Personalisar tu pagina de nove scheda
+newtab-personalize-button-label = Personalisar
+    .title = Personalisar nove scheda
+    .aria-label = Personalisar nove scheda
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Cercar in le Web
     .title = Cercar in le Web
     .aria-label = Cercar in le Web
+newtab-search-box-text = Cercar in le Web
+newtab-search-box-input =
+    .placeholder = Cercar in le Web
+    .aria-label = Cercar in le Web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Adder un motor de recerca
 newtab-topsites-add-topsites-header = Nove sito preferite
+newtab-topsites-add-shortcut-header = Nove accesso directe
 newtab-topsites-edit-topsites-header = Modificar le sito preferite
+newtab-topsites-edit-shortcut-header = Modificar accesso directe
 newtab-topsites-title-label = Titulo
 newtab-topsites-title-input =
     .placeholder = Scriber un titulo
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Un error ha occurrite durante le cargamento de iste contento.
 newtab-error-fallback-refresh-link = Refresca le pagina pro tentar de novo.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Accessos directe
+newtab-custom-shortcuts-subtitle = Sitos que tu salva o visita
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } linea
+       *[other] { $num } lineas
+    }
+newtab-custom-sponsored-sites = Accessos directe sponsorisate
+newtab-custom-pocket-title = Recommendate per { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contento exceptional a cura de { -pocket-brand-name }, parte del familia { -brand-product-name }
+newtab-custom-pocket-sponsored = Articulos sponsorisate
+newtab-custom-recent-title = Activitate recente
+newtab-custom-recent-subtitle = Un selection de sitos e contento recente
+newtab-custom-close-button = Clauder
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Breve novas
+newtab-custom-snippets-subtitle = Consilios e notitias de { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Gerer altere parametros
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/nsserrors.ftl firefox-85.0+build1/l10n/ia/browser/browser/nsserrors.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/nsserrors.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/nsserrors.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -195,7 +195,7 @@
 sec-error-extension-value-invalid = Le valor de extension del certificato non es valide.
 sec-error-extension-not-found = Extension del certificato non trovate.
 sec-error-ca-cert-invalid = Le certificato del emittitor non es valide.
-sec-error-path-len-constraint-invalid = Le longor del percurso del certificato es invalide.
+sec-error-path-len-constraint-invalid = Le longor del route del certificato es invalide.
 sec-error-cert-usages-invalid = Le campo usos del certificato es invalide.
 sec-internal-only = **modulo SOLMENTE interne**
 sec-error-invalid-key = Le clave non gere le operation requirite.
@@ -265,7 +265,7 @@
 sec-error-not-fortezza-issuer = Le catena FORTEZZA del par ha un certificato non FORTEZZA.
 sec-error-cannot-move-sensitive-key = Un clave sensibile non pote esser movite al fissura ubi illo es necessari.
 sec-error-js-invalid-module-name = Nomine de modulo invalide.
-sec-error-js-invalid-dll = Percurso/nomine del file invalide
+sec-error-js-invalid-dll = route/nomine file del modulo non valide
 sec-error-js-add-mod-failure = Incapace a adder modulo
 sec-error-js-del-mod-failure = Incapace a deler modulo
 sec-error-old-krl = Le nove KRL non es plus recente de illo actual.
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/places.ftl firefox-85.0+build1/l10n/ia/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/places.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/places.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subdossier
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Altere marcapaginas
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ia/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/preferences/preferences.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Le sitos que tu visita le plus
 home-prefs-topsites-by-option-sponsored =
     .label = Sitos principal sponsorisate
+home-prefs-shortcuts-header =
+    .label = Accessos directe
+home-prefs-shortcuts-description = Sitos que tu salva o visita
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Accessos directe sponsorisate
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recommendate per { $provider }
 home-prefs-recommended-by-description-update = Contentos exceptional de tote le Web, curate per { $provider }
+home-prefs-recommended-by-description-new = Contento exceptional a cura de { $provider }, parte del familia { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Articulos sponsorisate
 home-prefs-highlights-header =
     .label = In evidentia
-home-prefs-recent-activity-header =
-    .label = Recente activitate
 home-prefs-highlights-description = Un selection de sitos que tu ha salvate o visitate
 home-prefs-highlights-option-visited-pages =
     .label = Paginas visitate
@@ -526,6 +530,9 @@
     .label = Ultime discargamento
 home-prefs-highlights-option-saved-to-pocket =
     .label = Paginas salvate in { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Recente activitate
+home-prefs-recent-activity-description = Un selection de sitos e contento recente
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Breve novas
 home-prefs-snippets-description = Actualitates de { -vendor-short-name } e { -brand-product-name }
+home-prefs-snippets-description-new = Consilios e notitias de { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -573,7 +581,7 @@
 suggestions-addressbar-settings-generic = Cambiar preferentias pro altere suggestiones in le barra de adresse
 search-suggestions-cant-show = Le suggestiones de recerca non essera monstrate inter le resultatos del barra de adresse perque tu ha configurate { -brand-short-name } pro non memorisar jammais le chronologia.
 search-one-click-header = Motores de recerca a un sol clic
-search-one-click-header2 = Vias breve pro le recerca
+search-one-click-header2 = Accessos directe pro le recerca
 search-one-click-desc = Elige le motores de recerca alternative que appare infra le barra de adresse o le de recerca quando tu comencia a scriber un parola clave.
 search-choose-engine-column =
     .label = Motor de recerca
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Schedas aperite
     .accesskey = S
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Accessos directe
+    .accesskey = A
 addressbar-locbar-topsites-option =
     .label = Sitos popular
     .accesskey = p
+addressbar-locbar-engines-option =
+    .label = Motores de recerca
+    .accesskey = o
 addressbar-suggestions-settings = Cambiar le preferentias pro le suggestiones del motor de recerca
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/protectionsPanel.ftl firefox-85.0+build1/l10n/ia/browser/browser/protectionsPanel.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/protectionsPanel.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/protectionsPanel.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 protections-panel-sendreportview-error = Un error ha occurrite durante le invio del reporto. Per favor prova de novo plus tarde.
-
 # A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked.
 protections-panel-sitefixedsendreport-label = Sito corrigite? Invia un reporto
 
@@ -22,13 +21,10 @@
 # The text a screen reader speaks when focused on the info button.
 protections-panel-etp-more-info =
     .aria-label = Saper plus sur le protection antitraciamento reinfortiate
-
 protections-panel-etp-on-header = Le protection antitraciamento reinfortiate es ACTIVE pro iste sito
 protections-panel-etp-off-header = Le protection antitraciamento reinfortiate es INACTIVE pro iste sito
-
 # The link to be clicked to open the sub-panel view
 protections-panel-site-not-working = Sito non functiona?
-
 # The heading/title of the sub-panel view
 protections-panel-site-not-working-view =
     .title = Sito non functiona?
@@ -43,9 +39,7 @@
 ##
 
 protections-panel-no-trackers-found = Nulle traciator cognoscite per { -brand-short-name } ha essite detegite sur iste pagina.
-
 protections-panel-content-blocking-tracking-protection = Contento de traciamento
-
 protections-panel-content-blocking-socialblock = Traciatores de retes social
 protections-panel-content-blocking-cryptominers-label = Cryptominatores
 protections-panel-content-blocking-fingerprinters-label = Dactylogrammatores
@@ -63,23 +57,20 @@
 ##
 
 protections-panel-settings-label = Parametros de protection
-
 # This should match the "appmenuitem-protection-dashboard-title" string in browser/appmenu.ftl.
-protections-panel-protectionsdashboard-label = Pannello de controlo del protectiones
+protections-panel-protectionsdashboard-label = Pannello de protectiones
 
 ## In the Site Not Working? view, we suggest turning off protections if
 ## the user is experiencing issues with any of a variety of functionality.
 
 # The header of the list
 protections-panel-site-not-working-view-header = Disactiva protectiones si tu ha problemas con:
-
 # The list items, shown in a <ul>
 protections-panel-site-not-working-view-issue-list-login-fields = Campos de credentiales
 protections-panel-site-not-working-view-issue-list-forms = Formularios
 protections-panel-site-not-working-view-issue-list-payments = Pagamentos
 protections-panel-site-not-working-view-issue-list-comments = Commentos
 protections-panel-site-not-working-view-issue-list-videos = Videos
-
 protections-panel-site-not-working-view-send-report = Inviar un reporto
 
 ##
@@ -89,11 +80,9 @@
 protections-panel-fingerprinters = Le dactylogrammatores collige parametros de tu navigator e computator pro crear un profilo de te. Usante iste identitate digital, illos pote traciar te inter differente sitos web.
 protections-panel-tracking-content = Sitos web pote cargar annuncios externe, videos e altere contento con codice de traciamento. Blocar contento de traciamento pote adjutar sitos a cargar se plus rapidemente, ma alcun buttones, formularios e campos de aperir session pote non functionar.
 protections-panel-social-media-trackers = Le retes social placia traciatores sur altere sitos web pro sequer lo que tu face, vide e reguarda in linea. Isto permitte al companias de rete social de saper plus sur te, ultra lo que tu comparti sur tu profilos de rete social.
-
 protections-panel-content-blocking-manage-settings =
     .label = Gerer parametros de protection
     .accesskey = t
-
 protections-panel-content-blocking-breakage-report-view =
     .title = Reportar sito rupte
 protections-panel-content-blocking-breakage-report-view-description = Blocar certe traciatores pote causar problemas con alcun sitos web. Reportar iste problemas adjuta a meliorar { -brand-short-name } pro totes. Le invio de iste reporto transmittera a Mozilla un URL e informationes sur le configuration de tu navigator. <label data-l10n-name="learn-more">Saper plus</label>
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ia/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ia/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Solo sur un nove scheda
     .accesskey = s
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Sempre monstrar
+    .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunquam monstrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Monstrar solo sur nive scheda
+    .accesskey = s
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Monstrar altere marcapaginas
     .accesskey = n
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/ia/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/browser.dtd	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/chrome/browser/browser.dtd	2021-01-18 20:05:18.000000000 +0000
@@ -42,7 +42,6 @@
 
 <!ENTITY fullScreenCmd.label "Plen schermo">
 
-
 <!ENTITY pictureInPictureHideToggle.label "Celar le commutator imagine-in-imagine">
 <!ENTITY pictureInPictureHideToggle.accesskey "C">
 
@@ -52,7 +51,6 @@
 <!ENTITY fxa.menu.syncSettings2.label "Parametros de &syncBrand.shortName.label;">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Connecter un altere apparato…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
-
 <!ENTITY fxa.menu.signin.label "Aperir session in &brandProductName;">
 <!ENTITY fxa.menu.turnOnSync.label "Activar &syncBrand.shortName.label;">
 <!ENTITY fxa.menu.firefoxServices.label "Servicios de &brandProductName;">
@@ -109,7 +107,7 @@
 <!ENTITY bookmarksSubview.label             "Marcapaginas">
 <!ENTITY bookmarksMenuButton2.label         "Menu de marcapaginas">
 <!ENTITY bookmarksMenuButton.other.label    "Altere marcapaginas">
-<!ENTITY bookmarksMenuButton.mobile.label   "Marcapaginas del apparatos mobile">
+<!ENTITY bookmarksMenuButton.mobile.label   "Marcapaginas mobile">
 <!ENTITY viewBookmarksSidebar2.label        "Vider le barra lateral de marcapaginas">
 <!ENTITY hideBookmarksSidebar.label         "Celar le barra lateral de marcapaginas">
 <!ENTITY viewBookmarksToolbar.label         "Vider le barra de marcapaginas">
@@ -218,18 +216,13 @@
 <!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
   "Pocket" is a brand name. -->
 <!ENTITY saveToPocketCmd.label        "Salvar le pagina in Pocket">
+
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY pocketMenuitem.label         "Vider le lista de Pocket">
 
 <!ENTITY emailPageCmd.label           "Inviar le ligamine per email…">
 
-<!-- Media (video/audio) controls -->
-
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
 <!ENTITY fullZoom.label                 "Zoom">
 
 <!ENTITY sidebarCloseButton.tooltip     "Clauder barra lateral">
@@ -255,7 +248,6 @@
 <!ENTITY spellAddDictionaries.label "Adder dictionarios…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Schedas del navigator">
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/ia/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/browser.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/chrome/browser/browser.properties	2021-01-18 20:05:18.000000000 +0000
@@ -461,7 +461,7 @@
 identity.identified.verifier=Verificate per: %S
 identity.identified.verified_by_you=Tu ha addite un exception de securitate pro iste sito.
 identity.identified.state_and_country=%S, %S
-identity.ev.contentOwner2=Certificato expedite a: %S
+identity.ev.contentOwner2=Certificato emittite a: %S
 
 # LOCALIZATION NOTE (identity.notSecure.label):
 # Keep this string as short as possible, this is displayed in the URL bar
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/tabbrowser.properties firefox-85.0+build1/l10n/ia/browser/chrome/browser/tabbrowser.properties
--- firefox-84.0.2+build1/l10n/ia/browser/chrome/browser/tabbrowser.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/chrome/browser/tabbrowser.properties	2021-01-18 20:05:18.000000000 +0000
@@ -14,7 +14,7 @@
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The singular form is not considered since this string is used only for
 # multiple tabs.
-tabs.closeWarningMultiple=;Tu es a puncto de clauder #1 schedas. Desira tu vermente continuar?
+tabs.closeWarningMultiple=;Tu es sur le puncto de clauder #1 schedas. Vole tu vermente continuar?
 # LOCALIZATION NOTE (tabs.closeWarningMultipleSessionRestore2):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -37,7 +37,7 @@
 # of tabs.closeWarningMultipleWindowsTabSnippet, which will contain the number
 # of tabs in these windows.
 # Note that every one of these plural forms must contain one instance of '%S'.
-tabs.closeWarningMultipleWindows=;Tu es a puncto de clauder #1 schedas %S. Desira tu vermente continuar?
+tabs.closeWarningMultipleWindows=;Tu es sur le puncto de clauder #1 schedas %S. Vole tu vermente continuar?
 # LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsSessionRestore2):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -119,7 +119,7 @@
 # These items are moved from chrome/browser/places/places.properties
 # Now they are not specific to bookmark.
 tabs.openWarningTitle=Confirmar aperir
-tabs.openWarningMultipleBranded=Tu es a puncto de aperir %S schedas.  Isto pote relentar %S durante que le paginas es in carga.  Desira tu vermente continuar?
+tabs.openWarningMultipleBranded=Tu es sur le puncto de aperir %S schedas. Isto pote relentar %S durante le cargamento del paginas. Vole tu vermente continuar?
 tabs.openButtonMultiple=Aperir le schedas
 tabs.openWarningPromptMeBranded=Advertir me quando le apertura de plure schedas pote relentar %S
 
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/installer/custom.properties firefox-85.0+build1/l10n/ia/browser/installer/custom.properties
--- firefox-84.0.2+build1/l10n/ia/browser/installer/custom.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/installer/custom.properties	2021-01-18 20:05:18.000000000 +0000
@@ -46,8 +46,8 @@
 WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName debe ser claudite pro proceder con le installation.\n\nPer favor claude $BrandShortName pro continuar.
 WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName debe ser claudite pro proceder con le disinstallation.\n\nPer favor claude $BrandShortName pro continuar.
 WARN_MANUALLY_CLOSE_APP_REFRESH=$BrandShortName debe esser claudite pro continuar con le refrescamento.\n\nClaude $BrandShortName pro continuar.
-WARN_WRITE_ACCESS=Tu non ha accesso in scriptura al directorio de installation.\n\nClicca sur OK pro seliger un loco differente.
-WARN_DISK_SPACE=Tu non ha spatio de disco sufficiente pro installar in iste position.\n\nClicca sur OK pro seliger un loco differente.
+WARN_WRITE_ACCESS=Tu non ha accesso de scriptura al directorio de installation.\n\nClicca sur OK pro seliger un altere directorio.
+WARN_DISK_SPACE=Tu non ha spatio de disco sufficiente pro installar in iste loco.\n\nClicca sur OK pro seliger un altere loco.
 WARN_MIN_SUPPORTED_OSVER_MSG=Nos lo regretta, $BrandShortName non pote ser installate. Iste version de $BrandShortName require ${MinSupportedVer} o plus nove. Per favor clicca sur le button OK informationes additional.
 WARN_MIN_SUPPORTED_CPU_MSG=Nos lo regretta, $BrandShortName non pote ser installate. Iste version de $BrandShortName necessita un processor que admitte ${MinSupportedCPU}. Per favor clicca sur le button OK informationes additional.
 WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Nos lo regretta, $BrandShortName non pote ser installate. Iste version de $BrandShortName require ${MinSupportedVer} o plus nove e un processor que admitte ${MinSupportedCPU}. Per favor clicca sur le button OK informationes additional.
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/installer/override.properties firefox-85.0+build1/l10n/ia/browser/installer/override.properties
--- firefox-84.0.2+build1/l10n/ia/browser/installer/override.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/installer/override.properties	2021-01-18 20:05:18.000000000 +0000
@@ -63,7 +63,7 @@
 CreatedUninstaller="Disinstallator create "
 Delete="Deler le file: "
 DeleteOnReboot="Cancellar al reinitio: "
-ErrorCreatingShortcut="Erro al crear le accesso directe: "
+ErrorCreatingShortcut="Error al crear le accesso directe: "
 ErrorCreating="Error a crear: "
 ErrorDecompressing=Error al decompression del datos! Installator corrumpite?
 ErrorRegistering=Error a registrar DLL
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/pdfviewer/chrome.properties firefox-85.0+build1/l10n/ia/browser/pdfviewer/chrome.properties
--- firefox-84.0.2+build1/l10n/ia/browser/pdfviewer/chrome.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/pdfviewer/chrome.properties	2021-01-18 20:05:18.000000000 +0000
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Chrome notification bar messages and buttons
-unsupported_feature=Iste documento PDF non potera ser monstrate correctemente.
+unsupported_feature=Es possibile que iste documento PDF non se monstra correctemente.
 unsupported_feature_forms=Iste documento PDF contine formularios. Completar campos de formulario non es supportate.
 open_with_different_viewer=Aperir con un altere lector
 open_with_different_viewer.accessKey=o
diff -Nru firefox-84.0.2+build1/l10n/ia/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/ia/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/ia/browser/pdfviewer/viewer.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/browser/pdfviewer/viewer.properties	2021-01-18 20:05:18.000000000 +0000
@@ -217,7 +217,7 @@
 rendering_error=Un error occurreva durante que on processava le pagina.
 
 # Predefined zoom values
-page_scale_width=Largessa pagina plen
+page_scale_width=Plen largor del pagina
 page_scale_fit=Pagina integre
 page_scale_auto=Zoom automatic
 page_scale_actual=Dimension actual
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/inspector.properties firefox-85.0+build1/l10n/ia/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/inspector.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/inspector.properties	2021-01-18 20:05:18.000000000 +0000
@@ -212,7 +212,7 @@
 # LOCALIZATION NOTE (inspectorCopyCSSPath.label): This is the label
 # shown in the inspector contextual-menu for the item that lets users copy
 # the full CSS path of the current node
-inspectorCopyCSSPath.label=Percurso CSS
+inspectorCopyCSSPath.label=Route CSS
 inspectorCopyCSSPath.accesskey=P
 
 # LOCALIZATION NOTE (inspectorCopyXPath.label): This is the label
@@ -450,7 +450,7 @@
 
 # LOCALIZATION NOTE (inspector.breadcrumbs.label): A string visible only to a screen reader and
 # is used to label (using aria-label attribute) a container for inspector breadcrumbs
-inspector.breadcrumbs.label=Percurso de navigation
+inspector.breadcrumbs.label=Route de navigation
 
 # LOCALIZATION NOTE (inspector.browserStyles.label): This is the label for the checkbox
 # that specifies whether the styles that are not from the user's stylesheet should be
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/markers.properties firefox-85.0+build1/l10n/ia/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/markers.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/markers.properties	2021-01-18 20:05:18.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Memoria insufficiente
 marker.gcreason.label.CC_WAITING=Fortiate per le collection de cyclos
+marker.gcreason.label.CC_FINISHED=Cyclo de collecta finite
 marker.gcreason.label.CC_FORCED=Fortiate per le collection de cyclos
 marker.gcreason.label.LOAD_END=Carga de pagina finite
 marker.gcreason.label.PAGE_HIDE=Movite a secunde plano
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Collection de seminario
-
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/ia/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/netmonitor.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/netmonitor.properties	2021-01-18 20:05:18.000000000 +0000
@@ -1005,7 +1005,7 @@
 
 # LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent): This is the label
 # displayed in the network table header context menu to resize a column to fit its content
-netmonitor.toolbar.resizeColumnToFitContent=Adaptar le largessa del columna a su contento
+netmonitor.toolbar.resizeColumnToFitContent=Adaptar le largor del columna a su contento
 
 # LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent.title): This is the title
 # tooltip displayed when draggable resizer in network table headers is hovered
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/shared.properties firefox-85.0+build1/l10n/ia/devtools/client/shared.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/shared.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/shared.properties	2021-01-18 20:05:18.000000000 +0000
@@ -10,13 +10,13 @@
 # dimensions of a node by a screen reader. This helps communicate
 # the visual information in a more explicit form. Example:
 # Size: Width 100, height 200.
-boxModelSize.accessibleLabel=Dimensiones: largessa %1$S, altitude %2$S
+boxModelSize.accessibleLabel=Dimensiones: latitude %1$S, altitude %2$S
 
 # LOCALIZATION NOTE (boxModelInfo.accessibleLabel): This is used to read the
 # dimensions and position of a node by a screen reader. This helps communicate
 # the visual information in a more explicit form. Example:
 # Dimensions: Width 100, height 200, position static.
-boxModelInfo.accessibleLabel=Dimensiones: largessa %1$S, altitude %2$S, position %3$S
+boxModelInfo.accessibleLabel=Dimensiones: latitude %1$S, altitude %2$S, position %3$S
 
 # LOCALIZATION NOTE (boxModelEditable.accessibleLabel): The string spoken by
 # screen readers for each button in the box model view that opens that property
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/storage.properties firefox-85.0+build1/l10n/ia/devtools/client/storage.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/storage.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/storage.properties	2021-01-18 20:05:18.000000000 +0000
@@ -21,7 +21,6 @@
 tree.labels.sessionStorage=Immagazinage de session
 tree.labels.indexedDB=Base de datos indexate
 tree.labels.Cache=Immagazinage in cache
-
 tree.labels.extensionStorage=Archivation extensiones
 
 # LOCALIZATION NOTE (table.headers.*.*):
@@ -29,7 +28,6 @@
 # each type of storage available through the Storage Tree to the side.
 table.headers.cookies.name=Nomine
 table.headers.cookies.value=Valor
-
 table.headers.cookies.expires2=Expiration / Etate maxime
 table.headers.cookies.size=Dimension
 table.headers.cookies.lastAccessed2=Ultime accesso
@@ -46,7 +44,7 @@
 table.headers.indexedDB.origin=Origine
 table.headers.indexedDB.version=Version
 table.headers.indexedDB.objectStores=Stocks de objectos
-table.headers.indexedDB.keyPath2=Percurso clave
+table.headers.indexedDB.keyPath2=Route clave
 table.headers.indexedDB.autoIncrement=Incremento automatic
 table.headers.indexedDB.indexes=Indices
 
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ia/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ia/devtools/client/toolbox.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/toolbox.properties	2021-01-18 20:05:18.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Aperir le file in le editor de stilos
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Clauder le instrumentos de disveloppamento
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Monstrar le consola dividite
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ia/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ia/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ia/devtools/client/tooltips.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/devtools/client/tooltips.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> non ha effecto sur iste elemento perque non es un elemento positionate.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> non ha effecto sur iste elemento perque <strong>overflow:hidden</strong> non es definite.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> non ha effecto sur iste elemento perque <strong>outline-style</strong> es <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> non ha effecto sur le elementos interne de tabellas.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> non ha effecto sur le elementos interne de tabellas, excepte le cellulas.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Prova remover <strong>flottar</strong> o <strong>monstrar:bloco</strong>.{ learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Tenta mitter su proprietate <strong>position</strong> a un valor differente de <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Tenta adder <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Proba mitter su proprietate <strong>display</strong> a un valor altere que <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Proba mitter su proprietate <strong>display</strong> a un valor altere que <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Tenta mitter su proprietate <strong>outline-style</strong> a un valor differente de <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/ia/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ia/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ia/dom/chrome/dom/dom.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/dom/chrome/dom/dom.properties	2021-01-18 20:05:18.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Le selector del campo <input> ha essite blocate per carentia de activation de usator.
 ExternalProtocolFrameBlockedNoUserActivation=Le iframe con protocollo externe ha essite blocate per carentia de activation de usator o perque ha passate tempore insufficiente depost que le ultime iframe simile ha essite cargate.
 MultiplePopupsBlockedNoUserActivation=Le apertura de plure messages emergente ha essite blocate per carentia activation de usator.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Le precargamento de %S ha essite ignorate a causa de valores incognite de “as� o “type�, o un attributo “media� que non corresponde.
diff -Nru firefox-84.0.2+build1/l10n/ia/netwerk/necko.properties firefox-85.0+build1/l10n/ia/netwerk/necko.properties
--- firefox-84.0.2+build1/l10n/ia/netwerk/necko.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/netwerk/necko.properties	2021-01-18 20:05:18.000000000 +0000
@@ -34,8 +34,8 @@
 DirColMTime=Ultime modification
 DirFileLabel=File: 
 
-SuperfluousAuth=Tu es a puncto de authenticar te al sito “%1$S� con le nomine de usator “%2$S�, ma le sito web non require authentication. Isto pote esser un tentativa de te deciper.\n\nEs “%1$S� le sito que tu vole visitar?
-AutomaticAuth=Tu es a puncto de authenticar te al sito “%1$S� con le nomine de usator “%2$S�.
+SuperfluousAuth=Tu es sur le puncto de aperir session in le sito “%1$S� con le nomine de usator “%2$S�, ma le sito web non require authentication. Isto pote esser un tentativa de dupar te.\n\nEs “%1$S� le sito que tu vole visitar?
+AutomaticAuth=Tu es sur le puncto de aperir session in le sito “%1$S� con le nomine de usator “%2$S�.
 
 TrackerUriBlocked=Le ressource a “%1$S� esseva blocate perque le bloco del contenrto es activate.
 UnsafeUriBlocked=Le ressource a “%1$S� esseva blocate per le Navigation secur.
diff -Nru firefox-84.0.2+build1/l10n/ia/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/ia/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/ia/security/manager/security/certificates/certManager.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/security/manager/security/certificates/certManager.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -225,7 +225,7 @@
 
 ## Add Security Exception dialog
 
-add-exception-branded-warning = Tu es a puncto de supplantar como { -brand-short-name } identifica iste sito.
+add-exception-branded-warning = Tu es sur le puncto de redefinir le maniera in que { -brand-short-name } identifica iste sito.
 add-exception-invalid-header = Iste sito tenta se identificar con informationes invalide.
 add-exception-domain-mismatch-short = Mal sito
 add-exception-domain-mismatch-long = Le certificato pertine a un sito differente, isto pote significar que alicuno tenta de facer se passar pro iste sito.
diff -Nru firefox-84.0.2+build1/l10n/ia/security/manager/security/certificates/deviceManager.ftl firefox-85.0+build1/l10n/ia/security/manager/security/certificates/deviceManager.ftl
--- firefox-84.0.2+build1/l10n/ia/security/manager/security/certificates/deviceManager.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/security/manager/security/certificates/deviceManager.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -8,40 +8,30 @@
 devmgr =
     .title = Gestor de dispositivos
     .style = width: 67em; height: 34em;
-
 devmgr-devlist =
     .label = Modulos e dispositivos de securitate
-
 devmgr-header-details =
     .label = Detalios
-
 devmgr-header-value =
     .label = Valor
-
 devmgr-button-login =
     .label = Authenticar se
     .accesskey = n
-
 devmgr-button-logout =
     .label = Clauder session
     .accesskey = C
-
 devmgr-button-changepw =
     .label = Cambiar le contrasigno
     .accesskey = C
-
 devmgr-button-load =
     .label = Cargar
     .accesskey = C
-
 devmgr-button-unload =
     .label = Discargar
     .accesskey = D
-
 devmgr-button-enable-fips =
     .label = Activar FIPS
     .accesskey = F
-
 devmgr-button-disable-fips =
     .label = Disactivar FIPS
     .accesskey = F
@@ -50,20 +40,15 @@
 
 load-device =
     .title = Cargar le conductor de apparato PKCS#11
-
 load-device-info = Insere le informationes pro le modulo que tu vole adder.
-
 load-device-modname =
     .value = Nomine del modulo
     .accesskey = M
-
 load-device-modname-default =
     .value = Nove modulo PKCS#11
-
 load-device-filename =
     .value = Nomine de file del modulo
     .accesskey = f
-
 load-device-browse =
     .label = Perquirer…
     .accesskey = P
@@ -72,64 +57,45 @@
 
 devinfo-status =
     .label = Stato
-
 devinfo-status-disabled =
     .label = Disactivate
-
 devinfo-status-not-present =
     .label = Non presente
-
 devinfo-status-uninitialized =
     .label = Non initialisate
-
 devinfo-status-not-logged-in =
     .label = Sin session aperte
-
 devinfo-status-logged-in =
     .label = Session aperte
-
 devinfo-status-ready =
     .label = Preste
-
 devinfo-desc =
     .label = Description
-
 devinfo-man-id =
     .label = Fabricante
-
 devinfo-hwversion =
     .label = Version HW
 devinfo-fwversion =
     .label = Version FW
-
 devinfo-modname =
     .label = Modulo
-
 devinfo-modpath =
-    .label = Percurso
-
+    .label = Route
 login-failed = Le authentication ha fallite
-
 devinfo-label =
     .label = Etiquetta
-
 devinfo-serialnum =
     .label = Numero de serie
-
 fips-nonempty-password-required = Le modo FIPS exige que tu defini un contrasigno maestro pro cata dispositivo de securitate. Per favor defini le contrasigno ante de tentar activar le modo FIPS.
-
 fips-nonempty-primary-password-required = Le modo FIPS necessita que tu ha definite un contrasigno primari pro cata dispositivo de securitate. Per favor defini le contrasigno ante tentar activar le modo FIPS.
 unable-to-toggle-fips = Impossibile cambiar le modo FIPS pro le dispositivo de securitate. Es recommendate quitar e reinitiar iste application.
 load-pk11-module-file-picker-title = Selige un driver PKCS#11 a cargar
-
 # Load Module Dialog
 load-module-help-empty-module-name =
     .value = Le nomine del modulo non pote esser vacue.
-
 # Do not translate 'Root Certs'
 load-module-help-root-certs-module-name =
     .value = ‘Root Certs‘ es reservate e non pote esser usate como nomine de modulo.
-
 add-module-failure = Impossibile adder modulo
 del-module-warning = Desira tu vermente deler iste modulo de securitate?
 del-module-error = Impossibile deler modulo
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/chrome/global/aboutReader.properties firefox-85.0+build1/l10n/ia/toolkit/chrome/global/aboutReader.properties
--- firefox-84.0.2+build1/l10n/ia/toolkit/chrome/global/aboutReader.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/chrome/global/aboutReader.properties	2021-01-18 20:05:18.000000000 +0000
@@ -35,7 +35,7 @@
 aboutReader.fontType.sans-serif=Sans-serif
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
-# For followup see: https://bugzilla.mozilla.org/show_bug.cgi?id=1637089 
+# For followup see: https://bugzilla.mozilla.org/show_bug.cgi?id=1637089
 aboutReader.fontTypeSample=Aa
 
 aboutReader.toolbar.close=Clauder le vista de lectura
@@ -57,8 +57,8 @@
 # These are used as tooltips in Type Control
 aboutReader.toolbar.minus = Reducer le dimension del litteras
 aboutReader.toolbar.plus = Augmentar le dimension del litteras
-aboutReader.toolbar.contentwidthminus = Reducer le largessa del contento
-aboutReader.toolbar.contentwidthplus = Accrescer le largessa del contento
+aboutReader.toolbar.contentwidthminus = Reducer le latitude del contento
+aboutReader.toolbar.contentwidthplus = Augmentar le latitude del contento
 aboutReader.toolbar.lineheightminus = Reducer le altor del linea
 aboutReader.toolbar.lineheightplus = Accrescer le altor del linea
 aboutReader.toolbar.colorschemelight = Schema de colores clar
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/ia/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/ia/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:05:18.000000000 +0000
@@ -151,7 +151,7 @@
 
 frame_stats_heading = Quadros consecutive
 n_a = N/D
-width_px = Largessa (px)
+width_px = Latitude (px)
 height_px = Altessa (px)
 consecutive_frames = Quadros consecutive
 time_elapsed = Tempore passate (s)
@@ -172,15 +172,14 @@
 configuration_element_not_provided = Non fornite
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = Preferentias WebRTC definite per le usator
-
 # Section header for estimated bandwidths of WebRTC media flows
-bandwidth_stats_heading = Largessa de banda estimate
+bandwidth_stats_heading = Largor de banda estimate
 # The ID of the MediaStreamTrack
 track_identifier = Identificator de tracia
 # The estimated bandwidth available for sending WebRTC media in bytes per second
-send_bandwidth_bytes_sec = Largessa de banda in invio (byte/s)
+send_bandwidth_bytes_sec = Largor de banda in invio (bytes/sec)
 # The estimated bandwidth available for receiving WebRTC media in bytes per second
-receive_bandwidth_bytes_sec = Largessa de banda in reception (byte/s)
+receive_bandwidth_bytes_sec = Largor de banda in reception (bytes/sec)
 # Maximum number of bytes per second that will be padding zeros at the ends of packets
 max_padding_bytes_sec = Maxime margines (bytes/sec)
 # The amount of time inserted between packets to keep them spaced out
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ia/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ia/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:18.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Error a discargar
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Le discargamento non pote esser salvate perque illo es blocate per %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Le discargamento non pote esser salvate perque illo es blocate per un extension.
 downloadErrorGeneric=Le discarga non pote esser salvate perque un error incognite ha occurrite.\n\nPer favor retenta.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ia/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ia/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:18.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Connexion al servitor proxy refusate
 check_error-2153390069=Le certificato del servitor era expirate (per favor adjusta tu horologio de systema pro corriger data e tempore si illos es incorrecte)
 check_error-verification_failed=Le integritate del actualisation non pote esser verificate
+check_error-move_failed=Error al preparar le actualisation pro installation
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/chrome/places/places.properties firefox-85.0+build1/l10n/ia/toolkit/chrome/places/places.properties
--- firefox-84.0.2+build1/l10n/ia/toolkit/chrome/places/places.properties	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/chrome/places/places.properties	2021-01-18 20:05:18.000000000 +0000
@@ -6,13 +6,12 @@
 BookmarksToolbarFolderTitle=Barra de marcapaginas
 OtherBookmarksFolderTitle=Altere marcapaginas
 TagsFolderTitle=Etiquettas
-MobileBookmarksFolderTitle=Marcapaginas del apparatos mobile
-
+MobileBookmarksFolderTitle=Marcapaginas mobile
 OrganizerQueryHistory=Chronologia
 OrganizerQueryDownloads=Discargas
 OrganizerQueryAllBookmarks=Tote le marcapaginas
 
-# LOCALIZATION NOTE (dateName):
+# LOCALIZATION NOTE :
 # These are used to generate history containers when history is grouped by date
 finduri-AgeInDays-is-0=Hodie
 finduri-AgeInDays-is-1=Heri
@@ -22,11 +21,11 @@
 finduri-AgeInMonths-is-0=Iste mense
 finduri-AgeInMonths-isgreater=Anterior a %S menses
 
-# LOCALIZATION NOTE (localFiles):
+# LOCALIZATION NOTE (localhost):
 # This is used to generate local files container when history is grouped by site
 localhost=(files local)
 
-# LOCALIZATION NOTE
+# LOCALIZATION NOTE (backupFileSizeText):
 # The string is used for showing file size of each backup in the "fileRestorePopup" popup
 # %1$S is the file size
 # %2$S is the file size unit
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -226,7 +226,7 @@
 addon-manage-extensions-shortcuts = Gerer le accessos directe al extensiones
     .accesskey = a
 shortcuts-no-addons = Tu non ha extensiones activate.
-shortcuts-no-commands = Le sequente extensiones non ha claves accelerator:
+shortcuts-no-commands = Le sequente extensiones non ha accessos directe:
 shortcuts-input =
     .placeholder = Insere un accesso directe
 shortcuts-browserAction2 = Activar le button del barra de utensiles
@@ -370,12 +370,6 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } recommenda solmente le extensiones que satisface nostre normas de securitate e efficientia.
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Iste extension ha essite create per le autores de { -brand-product-name }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Le codice de iste extension ha essite revidite pro securitate
-    .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
     .title = Isto es un extension official producite per le autores de { -brand-product-name }
     .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Modulos de tertios
+support-third-party-modules-module = File del modulo
+support-third-party-modules-version = Version de file
+support-third-party-modules-vendor = Info del venditor
+support-third-party-modules-occurrence = Occurrentia
+support-third-party-modules-process = Typo e ID del processo
+support-third-party-modules-thread = Argumento
+support-third-party-modules-base = Adresse imagebase
+support-third-party-modules-uptime = Tempore de activitate del processo (ms)
+support-third-party-modules-duration = Duration del cargamento (ms)
+support-third-party-modules-empty = Nulle modulo de tertios ha essite cargate.
+support-third-party-modules-no-value = (Sin valor)
+support-third-party-modules-button-open =
+    .title = Aperir position del file…
+support-third-party-modules-expand =
+    .title = Monstrar informationes detaliate
+support-third-party-modules-collapse =
+    .title = Collaber informationes detaliate
+support-third-party-modules-unsigned-icon =
+    .title = Iste modulo non es signate
+support-third-party-modules-folder-icon =
+    .title = Aperir position del file…
+support-third-party-modules-down-icon =
+    .title = Monstrar informationes detaliate
+support-third-party-modules-up-icon =
+    .title = Collaber informationes detaliate
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Plure fenestras imagine-in-imagine
 experimental-features-multi-pip-description = Function experimental que permitte aperir plure fenestras imagine-in-imagine al mesme tempore.
+experimental-features-http3 =
+    .label = Protocollo HTTP/3
+experimental-features-http3-description = Supporto experimental pro le protocollo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> vole aperir un ligamine <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
@@ -17,19 +9,19 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
-permission-dialog-description = Consentir a iste sito aperir le ligamine { $scheme }?
-permission-dialog-description-file = Consentir a iste file aperir le ligamine { $scheme }?
-permission-dialog-description-host = Consentir  a { $host } aperir le ligamine { $scheme }?
-permission-dialog-description-app = Consentir a iste sito aperir le ligamine { $scheme } con { $appName }?
-permission-dialog-description-host-app = Consentir a { $host } aperir le ligamine { $scheme } con { $appName }?
-permission-dialog-description-file-app = Consentir a iste file aperir le ligamine { $scheme } con { $appName }?
+permission-dialog-description = Permitter que iste sito aperi le ligamine { $scheme }?
+permission-dialog-description-file = Permitter que iste file aperi le ligamine { $scheme }?
+permission-dialog-description-host = Permitter que { $host } aperi le ligamine { $scheme }?
+permission-dialog-description-app = Permitter que iste sito aperi le ligamine { $scheme } con { $appName }?
+permission-dialog-description-host-app = Permitter que { $host } aperi le ligamine { $scheme } con { $appName }?
+permission-dialog-description-file-app = Permitter que iste file aperi le ligamine { $scheme } con { $appName }?
 
 ## Please keep the emphasis around the hostname and scheme (ie the
 ## `<strong>` HTML tags). Please also keep the hostname as close to the start
 ## of the sentence as your language's grammar allows.
 
-permission-dialog-remember = Sempre consentir a <strong>{ $host }</strong> aperir <strong>{ $scheme }</strong> ligamines
-permission-dialog-remember-file = Sempre consentir a iste file aperir ligamines <strong>{ $scheme }</strong>
+permission-dialog-remember = Sempre permitter que <strong>{ $host }</strong> aperi ligamines <strong>{ $scheme }</strong>
+permission-dialog-remember-file = Sempre permitter que iste file aperi ligamines <strong>{ $scheme }</strong>
 
 ##
 
@@ -40,7 +32,7 @@
     .label = Eliger un application
     .accessKey = a
 permission-dialog-unset-description = Tu debera eliger un application.
-permission-dialog-set-change-app-link = Eliger un differente application.
+permission-dialog-set-change-app-link = Elige un altere application.
 
 ## Chooser dialog
 ## Variables:
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pagina:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Ultime pagina
-
+printpreview-homearrow-button =
+    .title = Prime pagina
+printpreview-previousarrow-button =
+    .title = Pagina previe
+printpreview-nextarrow-button =
+    .title = Pagina sequente
+printpreview-endarrow-button =
+    .title = Ultime pagina
diff -Nru firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ia/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ia/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:41:01.000000000 +0000
+++ firefox-85.0+build1/l10n/ia/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:18.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = a
+printui-page-custom-range-input =
+    .aria-label = Insere un intervallo de paginas personalisate
+    .placeholder = p.ex. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientation:
@@ -48,6 +51,7 @@
 printui-options = Optiones
 printui-headers-footers-checkbox = Imprimer capites e pedes de pagina
 printui-backgrounds-checkbox = Imprimer le fundos
+printui-selection-checkbox = Imprimer solmente le selection
 printui-color-mode-label = Modo color
 printui-color-mode-color = Color
 printui-color-mode-bw = Nigre e blanc
@@ -56,19 +60,29 @@
 printui-margins-min = Minimo
 printui-margins-none = Necun
 printui-margins-custom = Personalisate
+printui-margins-custom-inches = Personalisate (pollices)
 printui-margins-custom-top = Alto
+printui-margins-custom-top-inches = Superior (pollices)
 printui-margins-custom-bottom = Basso
+printui-margins-custom-bottom-inches = Inferior (pollices)
 printui-margins-custom-left = Sinistra
+printui-margins-custom-left-inches = Sinistre (pollices)
 printui-margins-custom-right = Dextera
+printui-margins-custom-right-inches = Dextere (pollices)
 printui-system-dialog-link = Stampa per le fenestra de dialogo del systema…
 printui-primary-button = Imprimer
 printui-primary-button-save = Salvar
 printui-cancel-button = Cancellar
+printui-close-button = Clauder
 printui-loading = Preparation del vista preliminar
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Vista preliminar del impression
+printui-pages-per-sheet = Paginas per folio
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Impression…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/id/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/id/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/id/browser/browser/appmenu.ftl	2021-01-06 11:41:21.000000000 +0000
+++ firefox-85.0+build1/l10n/id/browser/browser/appmenu.ftl	2021-01-18 20:05:23.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Jendela Baru
+appmenuitem-new-private-window =
+    .label = Jendela Mode Pribadi Baru
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Perbesar
 appmenuitem-zoom-reduce =
     .label = Perkecil
+appmenuitem-fullscreen =
+    .label = Layar Penuh
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinkronkan Sekarang
+appmenuitem-save-page =
+    .label = Simpan Laman dengan Nama…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Yang Baru
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/id/browser/browser/browser.ftl firefox-85.0+build1/l10n/id/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/id/browser/browser/browser.ftl	2021-01-06 11:41:21.000000000 +0000
+++ firefox-85.0+build1/l10n/id/browser/browser/browser.ftl	2021-01-18 20:05:23.000000000 +0000
@@ -285,8 +285,6 @@
     .label = Nonaktif
 identity-https-only-dropdown-off-temporarily =
     .label = Nonaktif sementara
-identity-https-only-info-turn-on = Aktifkan jika Anda ingin { -brand-short-name } untuk meningkatkan ke koneksi aman jika memungkinkan.
-identity-https-only-info-turn-off = Jika situs terlihat bermasalah, Anda mungkin ingin menonaktifkan Mode Hanya HTTPS lalu memuat ulang dengan HTTP yang tidak aman.
 identity-https-only-info-no-upgrade = Tidak dapat meningkatkan koneksi dari HTTP.
 identity-permissions =
     .value = Izin
@@ -333,6 +331,9 @@
 browser-window-close-button =
     .tooltiptext = Tutup
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -438,14 +439,6 @@
 urlbar-result-action-search-w-engine = Cari lewat { $engine }
 urlbar-result-action-switch-tab = Pindah ke Tab
 urlbar-result-action-visit = Kunjungi
-
-## Action text shown in urlbar results, usually appended after the search
-## string or the url, like "result value - action text".
-## In these actions "Search" is a verb, followed by where the search is performed.
-
-urlbar-result-action-search-bookmarks = Cari Markah
-urlbar-result-action-search-history = Cari di Riwayat
-urlbar-result-action-search-tabs = Cari Tab
 # Variables
 #  $engine (String): the name of a search engine that searches the entire Web
 #  (e.g. Google).
@@ -455,6 +448,14 @@
 #  (e.g. Amazon).
 urlbar-result-action-tabtosearch-other-engine = Cari dengan { $engine } langsung dari bilah alamat
 
+## Action text shown in urlbar results, usually appended after the search
+## string or the url, like "result value - action text".
+## In these actions "Search" is a verb, followed by where the search is performed.
+
+urlbar-result-action-search-bookmarks = Cari Markah
+urlbar-result-action-search-history = Cari di Riwayat
+urlbar-result-action-search-tabs = Cari Tab
+
 ## Full Screen and Pointer Lock UI
 
 # Please ensure that the domain stays in the `<span data-l10n-name="domain">` markup.
@@ -470,3 +471,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> memiliki kendali atas penunjuk Anda. Tekan Esc untuk mengembalikan kendali.
 pointerlock-warning-no-domain = Dokumen ini memiliki kendali atas pointer Anda. Tekan Esc untuk mengambil kembali kendali.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Tampilkan Semua Markah…
+bookmarks-recent-bookmarks =
+    .value = Baru Saja Dibuat Markah
+bookmarks-toolbar-chevron =
+    .tooltiptext = Tampilkan markah lainnya
+bookmarks-sidebar-content =
+    .aria-label = Markah
+bookmarks-menu-button =
+    .label = Menu Markah
+bookmarks-other-bookmarks-menu =
+    .label = Markah Lain
+bookmarks-mobile-bookmarks-menu =
+    .label = Markah Seluler
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sembunyikan Bilah Samping Markah
+           *[other] Tampilkan Bilah Samping Markah
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sembunyikan Bilah Alat Markah
+           *[other] Tampilkan Bilah Alat Markah
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hapus Menu Markah dari Bilah Alat
+           *[other] Tambahkan Menu Markah ke Bilah Alat
+        }
+bookmarks-search =
+    .label = Cari Markah
+bookmarks-tools =
+    .label = Alat Pemarkahan
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bilah Alat Markah
+    .accesskey = B
+    .aria-label = Markah
+bookmarks-toolbar-menu =
+    .label = Bilah Alat Markah
+bookmarks-toolbar-placeholder =
+    .title = Nama Markah
+bookmarks-toolbar-placeholder-button =
+    .label = Nama Markah
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Markah
+library-bookmarks-bookmark-this-page =
+    .label = Markahi Laman ini
+library-bookmarks-bookmark-edit =
+    .label = Edit Markah Ini
+
+## More items
+
+more-menu-go-offline =
+    .label = Bekerja Luring
+    .accesskey = L
diff -Nru firefox-84.0.2+build1/l10n/id/dom/dom/media.ftl firefox-85.0+build1/l10n/id/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/id/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/id/dom/dom/media.ftl	2021-01-18 20:05:23.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/id/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/id/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/id/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/id/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:05:23.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/is/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/is/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/is/browser/browser/appmenu.ftl	2021-01-06 11:41:25.000000000 +0000
+++ firefox-85.0+build1/l10n/is/browser/browser/appmenu.ftl	2021-01-18 20:05:27.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nýr gluggi
+appmenuitem-new-private-window =
+    .label = Nýr huliðsgluggi
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Fylla skjá
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Samstilla núna
+appmenuitem-save-page =
+    .label = Vista síðu sem…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/is/browser/browser/browser.ftl firefox-85.0+build1/l10n/is/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/is/browser/browser/browser.ftl	2021-01-06 11:41:26.000000000 +0000
+++ firefox-85.0+build1/l10n/is/browser/browser/browser.ftl	2021-01-18 20:05:27.000000000 +0000
@@ -282,6 +282,9 @@
 browser-window-close-button =
     .tooltiptext = Loka
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -353,3 +356,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> hefur stjórn á bendi. �ttu á Esc til að taka aftur yfir stjórn.
 pointerlock-warning-no-domain = Þetta skjal hefur nú stjórnina á bendi. �ttu á Esc til að taka aftur yfir stjórn.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Sýna öll bókamerki
+bookmarks-recent-bookmarks =
+    .value = Nýlega sett í bókamerki
+bookmarks-toolbar-chevron =
+    .tooltiptext = Sýna fleiri bókamerki
+bookmarks-sidebar-content =
+    .aria-label = Bókamerki
+bookmarks-menu-button =
+    .label = Bókarmerkja valmynd
+bookmarks-other-bookmarks-menu =
+    .label = Önnur bókamerki
+bookmarks-mobile-bookmarks-menu =
+    .label = Bókamerki farsíma
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fela bókamerki í hliðslá
+           *[other] Birta bókamerki í hliðslá
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fela bókamerkjaslá
+           *[other] Skoða bókamerkjaslá
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fjarlægja bókamerkjavalmynd úr verkfæraslá
+           *[other] Bæta bókamerkjavalmynd við verkfæraslá
+        }
+bookmarks-search =
+    .label = Leita í bókamerkjum
+bookmarks-tools =
+    .label = Verkfæri fyrir bókamerki
+bookmarks-toolbar-menu =
+    .label = Bókamerkjaslá
+bookmarks-toolbar-placeholder =
+    .title = Hlutir í bókamerkjaslá
+bookmarks-toolbar-placeholder-button =
+    .label = Hlutir í bókamerkjaslá
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bókamerki
+library-bookmarks-bookmark-this-page =
+    .label = Setja síðu í bókamerki
+library-bookmarks-bookmark-edit =
+    .label = Breyta bókamerki
+
+## More items
+
+more-menu-go-offline =
+    .label = Vinna án nettengingar
+    .accesskey = g
diff -Nru firefox-84.0.2+build1/l10n/is/dom/dom/media.ftl firefox-85.0+build1/l10n/is/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/is/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/is/dom/dom/media.ftl	2021-01-18 20:05:27.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/is/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/is/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/is/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/is/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:05:27.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/aboutDialog.ftl firefox-85.0+build1/l10n/it/browser/browser/aboutDialog.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/aboutDialog.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/aboutDialog.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -15,8 +15,9 @@
     .label = Riavvia per aggiornare { -brand-shorter-name }
     .accesskey = R
 
-update-checkingForUpdates = Ricerca aggiornamenti…
+update-checkingForUpdates = Controlla aggiornamenti…
 update-downloading = <img data-l10n-name="icon"/>Download aggiornamento — <label data-l10n-name="download-status"/>
+update-downloading-message = Download aggiornamento — <label data-l10n-name="download-status"/>
 update-applying = Installazione aggiornamento…
 
 update-failed = Aggiornamento non riuscito. <label data-l10n-name="failed-link">Scarica l’ultima versione</label>
@@ -36,6 +37,9 @@
 
 warningDesc-version = { -brand-short-name } è una versione sperimentale e potrebbe risultare instabile.
 
+aboutdialog-help-user = Supporto per { -brand-product-name }
+aboutdialog-submit-feedback = Invia feedback
+
 community-exp = <label data-l10n-name="community-exp-mozillaLink">{ -vendor-short-name }</label> è una <label data-l10n-name="community-exp-creditsLink">comunità mondiale</label> che lavora per mantenere il Web aperto, pubblico e accessibile a tutti.
 
 community-2 = { -brand-short-name } è progettato da <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, una <label data-l10n-name="community-creditsLink">comunità mondiale</label> che lavora per mantenere il Web aperto, pubblico e accessibile a tutti.
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/it/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/aboutLogins.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/aboutLogins.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -89,6 +89,7 @@
 login-item-edit-button = Modifica
 about-logins-login-item-remove-button = Rimuovi
 login-item-origin-label = Indirizzo web
+login-item-tooltip-message = Assicurarsi che corrisponda esattamente all’indirizzo del sito web a cui si accede.
 login-item-origin =
     .placeholder = https://www.example.com
 login-item-username-label = Nome utente
@@ -179,7 +180,11 @@
 confirm-delete-dialog-message = Questa operazione non può essere annullata.
 about-logins-confirm-remove-dialog-confirm-button = Rimuovi
 
-about-logins-confirm-remove-all-dialog-confirm-button = Rimuovi tutte
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+  { $count ->
+     [1] Rimuovi
+    *[other] Rimuovi tutte
+  }
 about-logins-confirm-remove-all-dialog-checkbox-label = Sì, rimuovi queste credenziali
 about-logins-confirm-remove-all-dialog-title =
   { $count ->
@@ -201,6 +206,9 @@
 about-logins-confirm-export-dialog-message = Le password verranno salvate come testo leggibile (ad esempio “Password123�). Chiunque abbia accesso al file esportato potrà vederle.
 about-logins-confirm-export-dialog-confirm-button = Esporta…
 
+about-logins-alert-import-title = Importazione completata
+about-logins-alert-import-message = Visualizza il rapporto dettagliato dell’importazione
+
 confirm-discard-changes-dialog-title = Ignorare le modifiche non salvate?
 confirm-discard-changes-dialog-message = Tutte le modifiche non salvate andranno perse.
 confirm-discard-changes-dialog-confirm-button = Ignora
@@ -265,3 +273,14 @@
       [macos] Documento CSV
      *[other] File CSV
   }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importazione completata
+about-logins-import-dialog-items-added = <span>Nuove credenziali aggiunte:</span> <span data-l10n-name="count">{ $count }</span>
+about-logins-import-dialog-items-modified = <span>Credenziali esistenti aggiornate:</span> <span data-l10n-name="count">{ $count }</span>
+about-logins-import-dialog-items-no-change = <span>Credenziali duplicate:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(non importate)</span>
+about-logins-import-dialog-items-error = <span>Errori:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(non importate)</span>
+about-logins-import-dialog-done = Fatto
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/it/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/appmenu.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/appmenu.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nuova finestra
+appmenuitem-new-private-window =
+    .label = Nuova finestra anonima
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Aumenta zoom
 appmenuitem-zoom-reduce =
     .label = Riduci zoom
+appmenuitem-fullscreen =
+    .label = Schermo intero
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizza adesso
+appmenuitem-save-page =
+    .label = Salva pagina con nome…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novità
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/browser.ftl firefox-85.0+build1/l10n/it/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/browser.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/browser.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -106,7 +106,6 @@
 
 urlbar-search-tips-onboard = Scrivi di meno e trova più risultati: cerca con { $engineName } direttamente dalla barra degli indirizzi.
 urlbar-search-tips-redirect-2 = Inizia le tue ricerche dalla barra degli indirizzi per visualizzare suggerimenti da { $engineName } e dalla cronologia di navigazione.
-
 # Prompts users to use the Urlbar when they are typing in the domain of a
 # search engine, e.g. google.com or amazon.com.
 urlbar-tabtosearch-onboard = Seleziona questa scorciatoia per trovare ciò che ti serve più rapidamente.
@@ -286,7 +285,6 @@
 identity-active-loaded = La protezione è disattivata per questa pagina.
 identity-weak-encryption = Questa pagina utilizza una crittografia debole.
 identity-insecure-login-forms = Gli accessi effettuati in questa pagina potrebbero essere vulnerabili.
-
 identity-https-only-connection-upgraded = (aggiornato a HTTPS)
 identity-https-only-label = Modalità solo HTTPS
 identity-https-only-dropdown-on =
@@ -298,7 +296,6 @@
 identity-https-only-info-turn-on2 = Attivare la modalità solo HTTPS per fare in modo che { -brand-short-name } aggiorni la connessione quando possibile.
 identity-https-only-info-turn-off2 = Se la pagina non funziona correttamente, provare a disattivare per questo sito la modalità solo HTTPS per ricaricare utilizzando una connessione non sicura HTTP.
 identity-https-only-info-no-upgrade = Impossibile aggiornare la connessione da HTTP.
-
 identity-permissions =
     .value = Permessi
 identity-permissions-storage-access-header = Cookie intersito
@@ -351,7 +348,6 @@
 browser-import-button2 =
     .label = Importa segnalibri…
     .tooltiptext = Importa i segnalibri di un altro browser in { -brand-short-name }.
-
 bookmarks-toolbar-empty-message = Salva i tuoi segnalibri qui, nella Barra dei segnalibri, per accedervi più rapidamente. <a data-l10n-name="manage-bookmarks">Gestisci i segnalibri…</a>
 
 ## WebRTC Pop-up notifications
@@ -470,15 +466,6 @@
 #  $engine (String): the name of a search engine that searches a specific site
 #  (e.g. Amazon).
 urlbar-result-action-before-tabtosearch-other = Premi il tasto di tabulazione (TAB) per cercare in { $engine }
-
-## Action text shown in urlbar results, usually appended after the search
-## string or the url, like "result value - action text".
-## In these actions "Search" is a verb, followed by where the search is performed.
-
-urlbar-result-action-search-bookmarks = Cerca nei segnalibri
-urlbar-result-action-search-history = Cerca nella cronologia
-urlbar-result-action-search-tabs = Cerca nelle schede
-
 # Variables
 #  $engine (String): the name of a search engine that searches the entire Web
 #  (e.g. Google).
@@ -488,6 +475,14 @@
 #  (e.g. Amazon).
 urlbar-result-action-tabtosearch-other-engine = Cerca in { $engine } direttamente dalla barra degli indirizzi
 
+## Action text shown in urlbar results, usually appended after the search
+## string or the url, like "result value - action text".
+## In these actions "Search" is a verb, followed by where the search is performed.
+
+urlbar-result-action-search-bookmarks = Cerca nei segnalibri
+urlbar-result-action-search-history = Cerca nella cronologia
+urlbar-result-action-search-tabs = Cerca nelle schede
+
 ## Full Screen and Pointer Lock UI
 
 # Please ensure that the domain stays in the `<span data-l10n-name="domain">` markup.
@@ -503,3 +498,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> sta controllando il puntatore del mouse. Premere Esc per riprenderne il controllo.
 pointerlock-warning-no-domain = Questo documento sta controllando il puntatore del mouse. Premere Esc per riprenderne il controllo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Visualizza tutti i segnalibri
+bookmarks-recent-bookmarks =
+    .value = Aggiunti di recente
+bookmarks-toolbar-chevron =
+    .tooltiptext = Visualizza altri segnalibri
+bookmarks-sidebar-content =
+    .aria-label = Segnalibri
+bookmarks-menu-button =
+    .label = Menu segnalibri
+bookmarks-other-bookmarks-menu =
+    .label = Altri segnalibri
+bookmarks-mobile-bookmarks-menu =
+    .label = Segnalibri da dispositivi mobile
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Nascondi la barra laterale dei segnalibri
+           *[other] Visualizza la barra laterale dei segnalibri
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Nascondi la barra dei segnalibri
+           *[other] Visualizza la barra dei segnalibri
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Rimuovi Segnalibri dalla barra degli strumenti
+           *[other] Aggiungi Segnalibri alla barra degli strumenti
+        }
+bookmarks-search =
+    .label = Cerca nei segnalibri
+bookmarks-tools =
+    .label = Strumenti per i segnalibri
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra dei segnalibri
+    .accesskey = s
+    .aria-label = Segnalibri
+bookmarks-toolbar-menu =
+    .label = Barra dei segnalibri
+bookmarks-toolbar-placeholder =
+    .title = Elementi della barra dei segnalibri
+bookmarks-toolbar-placeholder-button =
+    .label = Elementi della barra dei segnalibri
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Segnalibri
+library-bookmarks-bookmark-this-page =
+    .label = Aggiungi pagina ai segnalibri
+library-bookmarks-bookmark-edit =
+    .label = Modifica segnalibro
+library-recent-activity-label = Attività recente
+
+## More items
+
+more-menu-go-offline =
+    .label = Lavora non in linea
+    .accesskey = L
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/menubar.ftl firefox-85.0+build1/l10n/it/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/menubar.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/menubar.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -15,7 +15,7 @@
     .label = Nuova scheda contenitore
     .accesskey = c
 menu-file-new-window =
-    .label = Nuova finestra­
+    .label = Nuova finestra
     .accesskey = f
 menu-file-new-private-window =
     .label = Nuova finestra anonima
@@ -129,7 +129,7 @@
     .label = Esci da schermo intero
     .accesskey = h
 menu-view-full-screen =
-    .label = Schermo intero­
+    .label = Schermo intero
     .accesskey = S
 
 ##
@@ -273,3 +273,5 @@
 menu-help-not-deceptive =
     .label = Non è un sito ingannevole…
     .accesskey = e
+menu-help-check-for-update =
+    .label = Controlla aggiornamenti…
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/it/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/newtab/asrouter.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -218,7 +218,7 @@
 # Variables:
 #   $blockedCount (Number) - The total count of blocked trackers. This number will always be greater than 1.
 #   $date (String) - The date we began recording the count of blocked trackers
-cfr-doorhanger-milestone-heading = { -brand-short-name } ha bloccato oltre <b>{ $blockedCount }</b> elementi traccianti dal { $date }.
+cfr-doorhanger-milestone-heading = { -brand-short-name } ha bloccato oltre <b>{ $blockedCount }</b> elementi traccianti da { $date }.
 cfr-doorhanger-milestone-ok-button = Visualizza tutto
   .accesskey = V
 
@@ -291,3 +291,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Scorciatoie di ricerca nella barra degli indirizzi
 cfr-whatsnew-search-shortcuts-body = Quando digiti il nome di un motore di ricerca o di un sito specifico nella barra degli indirizzi, verrà visualizzata una scorciatoia di colore blu tra i suggerimenti di ricerca. Seleziona questa scorciatoia per completare la ricerca direttamente dalla barra degli indirizzi.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protezione contro i supercookie
+cfr-whatsnew-supercookies-body = I siti web possono associare al tuo browser un “supercookie� in grado di seguirti in lungo e in largo per il Web, anche dopo che hai cancellato i normali cookie. Adesso { -brand-short-name } offre un’efficace protezione contro i supercookie, impedendogli di seguire le tue attività online da un sito all’altro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Migliore gestione dei segnalibri
+cfr-whatsnew-bookmarking-body = Tenere traccia dei tuoi siti preferiti è ancora più semplice. { -brand-short-name } ora ricorda la tua posizione preferita per salvare i segnalibri, visualizza automaticamente la barra dei segnalibri quando apri una nuova scheda e fornisce rapido accesso agli altri segnalibri attraverso una cartella nella barra degli strumenti.
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/it/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/newtab/newtab.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -25,11 +25,18 @@
     .title = Cerca sul Web
     .aria-label = Cerca sul Web
 
+newtab-search-box-text = Cerca sul Web
+newtab-search-box-input =
+    .placeholder = Cerca sul Web
+    .aria-label = Cerca sul Web
+
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Aggiungi motore di ricerca
 newtab-topsites-add-topsites-header = Nuovi sito principale
+newtab-topsites-add-shortcut-header = Nuova scorciatoia
 newtab-topsites-edit-topsites-header = Modifica sito principale
+newtab-topsites-edit-shortcut-header = Modifica scorciatoia
 newtab-topsites-title-label = Titolo
 newtab-topsites-title-input =
     .placeholder = Inserire un titolo
@@ -220,3 +227,28 @@
 
 newtab-error-fallback-info = Oops, qualcosa è andato storto durante il tentativo di caricare questo contenuto.
 newtab-error-fallback-refresh-link = Aggiornare la pagina per riprovare.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Scorciatoie
+newtab-custom-shortcuts-subtitle = Siti che hai salvato oppure visitato
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } riga
+       *[other] { $num } righe
+    }
+newtab-custom-sponsored-sites = Scorciatoie sponsorizzate
+newtab-custom-pocket-title = Consigliati da { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contenuti eccezionali a cura di { -pocket-brand-name }, un membro della famiglia { -brand-product-name }
+newtab-custom-pocket-sponsored = Storie sponsorizzate
+newtab-custom-recent-title = Attività recente
+newtab-custom-recent-subtitle = Una selezione di siti e contenuti visualizzati di recente
+newtab-custom-close-button = Chiudi
+
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippet
+newtab-custom-snippets-subtitle = Consigli e notizie da { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Gestisci altre impostazioni
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/places.ftl firefox-85.0+build1/l10n/it/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/places.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/places.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -71,3 +71,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
   .label = Sottocartella
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+  .label = Altri segnalibri
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/it/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/preferences/connection.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/preferences/connection.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -66,6 +66,7 @@
 connection-proxy-noproxy-desc = Esempio: .mozilla.org, .net.nz, 192.168.1.0/24
 
 connection-proxy-noproxy-localhost-desc = Le connessioni verso localhost, 127.0.0.1 e ::1 non usano mai proxy.
+connection-proxy-noproxy-localhost-desc-2 = Le connessioni verso localhost, 127.0.0.1/8 e ::1 non usano mai proxy.
 
 connection-proxy-autotype =
     .label = Configurazione automatica dei proxy (URL)
diff -Nru firefox-84.0.2+build1/l10n/it/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/it/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/it/browser/browser/preferences/preferences.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -631,7 +631,11 @@
 home-prefs-topsites-description = I siti più visitati
 home-prefs-topsites-by-option-sponsored =
     .label = Siti principali sponsorizzati
-
+home-prefs-shortcuts-header =
+    .label = Scorciatoie
+home-prefs-shortcuts-description = Siti che hai salvato oppure visitato
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Scorciatoie sponsorizzate
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -639,6 +643,7 @@
 home-prefs-recommended-by-header =
     .label = Consigliati da { $provider }
 home-prefs-recommended-by-description-update = Contenuti eccezionali da tutto il Web, a cura di { $provider }
+home-prefs-recommended-by-description-new = Contenuti eccezionali a cura di { $provider }, un membro della famiglia { -brand-product-name }
 ##
 
 home-prefs-recommended-by-learn-more = Come funziona
@@ -647,8 +652,6 @@
 
 home-prefs-highlights-header =
     .label = In evidenza
-home-prefs-recent-activity-header =
-    .label = Attività recente
 home-prefs-highlights-description = Una selezione di siti che hai salvato o visitato in precedenza
 home-prefs-highlights-option-visited-pages =
     .label = Pagine visitate
@@ -659,6 +662,10 @@
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pagine salvate in { -pocket-brand-name }
 
+home-prefs-recent-activity-header =
+    .label = Attività recente
+home-prefs-recent-activity-description = Una selezione di siti e contenuti visualizzati di recente
+
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -666,6 +673,7 @@
 home-prefs-snippets-header =
     .label = Snippet
 home-prefs-snippets-description = Aggiornamenti da { -vendor-short-name } e { -brand-product-name }
+home-prefs-snippets-description-new = Consigli e notizie da { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -1130,9 +1138,16 @@
 addressbar-locbar-openpage-option =
     .label = Schede aperte
     .accesskey = d
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Scorciatoie
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Siti principali
     .accesskey = a
+addressbar-locbar-engines-option =
+    .label = Motori di ricerca
+    .accesskey = M
 
 addressbar-suggestions-settings = Modifica le impostazioni relative ai suggerimenti dei motori di ricerca
 
diff -Nru firefox-84.0.2+build1/l10n/it/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/it/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/it/browser/chrome/browser/browser.dtd	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/chrome/browser/browser.dtd	2021-01-18 20:05:34.000000000 +0000
@@ -29,7 +29,7 @@
 <!ENTITY personalbar.accessibleLabel "Segnalibri">
 <!ENTITY bookmarksToolbarItem.label "Elementi della barra dei segnalibri">
 
-<!ENTITY fullScreenCmd.label "Schermo intero&#173;">
+<!ENTITY fullScreenCmd.label "Schermo intero">
 
 <!ENTITY pictureInPictureHideToggle.label "Nascondi selettore Picture-in-Picture">
 <!ENTITY pictureInPictureHideToggle.accesskey "N">
@@ -69,7 +69,7 @@
 
 <!ENTITY searchItem.title "Cerca">
 
-<!ENTITY homeButton.label "Pagina iniziale&#173;">
+<!ENTITY homeButton.label "Pagina iniziale">
 <!ENTITY homeButton.defaultPage.tooltip "Pagina iniziale di &brandShortName;">
 
 <!ENTITY bookmarksButton.label "Segnalibri">
@@ -95,7 +95,7 @@
 
 <!ENTITY webDeveloperMenu.label "Sviluppo web">
 
-<!ENTITY newNavigatorCmd.label "Nuova finestra&#173;">
+<!ENTITY newNavigatorCmd.label "Nuova finestra">
 <!ENTITY newPrivateWindow.label "Nuova finestra anonima">
 
 <!ENTITY editMenu.label "Modifica">
diff -Nru firefox-84.0.2+build1/l10n/it/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/it/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/it/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:05:34.000000000 +0000
@@ -10,7 +10,6 @@
 stateBlockedParentalControls = Bloccato dal Controllo genitori
 blockedMalware = Questo file contiene virus o malware.
 blockedPotentiallyUnwanted = Questo file potrebbe danneggiare il computer.
-blockedInsecure = Questo file non può essere scaricato in modo sicuro.
 blockedPotentiallyInsecure = File non scaricato. Potenziale rischio per la sicurezza.
 blockedUncommon2 = Questo file non viene comunemente scaricato.
 
diff -Nru firefox-84.0.2+build1/l10n/it/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/it/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/it/browser/pdfviewer/viewer.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/browser/pdfviewer/viewer.properties	2021-01-18 20:05:34.000000000 +0000
@@ -124,6 +124,8 @@
 layers_label = Livelli
 thumbs.title = Mostra le miniature
 thumbs_label = Miniature
+current_outline_item.title = Trova elemento struttura corrente
+current_outline_item_label = Elemento struttura corrente
 findbar.title = Trova nel documento
 findbar_label = Trova
 
diff -Nru firefox-84.0.2+build1/l10n/it/devtools/client/markers.properties firefox-85.0+build1/l10n/it/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/it/devtools/client/markers.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/devtools/client/markers.properties	2021-01-18 20:05:34.000000000 +0000
@@ -97,6 +97,7 @@
 marker.gcreason.label.COMPONENT_UTILS = Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE = Memoria in esaurimento
 marker.gcreason.label.CC_WAITING = Forzato da ciclo di raccolta
+marker.gcreason.label.CC_FINISHED = Ciclo di raccolta completato
 marker.gcreason.label.CC_FORCED = Forzato da ciclo di raccolta
 marker.gcreason.label.LOAD_END = Caricamento pagina terminato
 marker.gcreason.label.PAGE_HIDE = Spostato in background
diff -Nru firefox-84.0.2+build1/l10n/it/devtools/client/toolbox.properties firefox-85.0+build1/l10n/it/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/it/devtools/client/toolbox.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/devtools/client/toolbox.properties	2021-01-18 20:05:34.000000000 +0000
@@ -87,6 +87,10 @@
 
 toolbox.closebutton.tooltip = Chiudi strumenti di sviluppo
 
+toolbox.errorCountButton.tooltip = Visualizza console divisa
+
+toolbox.errorCountButton.description = Visualizza il numero di errori nella pagina
+
 toolbox.sourceMapFailure = Errore mapping di origine: %1$S\nURL risorsa: %2$S\nURL mapping di origine: %3$S
 
 toolbox.sourceMapSourceFailure = Errore durante il recupero dei sorgenti originali: %1$S\nURL sorgente: %2$S
diff -Nru firefox-84.0.2+build1/l10n/it/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/it/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/it/devtools/client/tooltips.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/devtools/client/tooltips.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -47,6 +47,10 @@
 
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> non ha effetto su questo elemento in quanto il valore di <strong>outline-style</strong> è <strong>auto</strong> o <strong>none</strong>.
 
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> non ha effetto sugli elementi interni di una tabella.
+
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> non ha effetto sugli elementi interni di una tabella ad eccezione delle celle.
+
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
@@ -77,6 +81,10 @@
 
 inactive-text-overflow-when-no-overflow-fix = Provare ad aggiungere <strong>overflow:hidden</strong>. { learn-more }
 
+inactive-css-not-for-internal-table-elements-fix = Provare a impostare per la proprietà <strong>display</strong> un valore diverso da <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
+
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Provare a impostare per la proprietà <strong>display</strong> un valore diverso da <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> o <strong>table-footer-group</strong>. { learn-more }
+
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Provare a impostare per la proprietà <strong>outline-style</strong> un valore diverso da <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/it/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/it/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/it/dom/chrome/dom/dom.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/dom/chrome/dom/dom.properties	2021-01-18 20:05:34.000000000 +0000
@@ -259,3 +259,4 @@
 InputPickerBlockedNoUserActivation = Il selettore nel campo <input> è stato bloccato in quanto non attivato dall’utente.
 ExternalProtocolFrameBlockedNoUserActivation = L’iframe con protocollo esterno è stato bloccato in quanto non attivato dall’utente, oppure perché non è trascorso tempo sufficiente dal caricamento dell’iframe stesso.
 MultiplePopupsBlockedNoUserActivation = L’apertura di più pop-up è stata bloccata in quanto non attivata dall’utente.
+PreloadIgnoredInvalidAttr = Il precaricamento di %S è stato ignorato in quanto il valore di “as� o “type� è sconosciuto, oppure per la mancata corrispondenza dell’attributo “media�.
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/chrome/global/charsetMenu.properties firefox-85.0+build1/l10n/it/toolkit/chrome/global/charsetMenu.properties
--- firefox-84.0.2+build1/l10n/it/toolkit/chrome/global/charsetMenu.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/chrome/global/charsetMenu.properties	2021-01-18 20:05:34.000000000 +0000
@@ -34,6 +34,8 @@
 charsetMenuAutodet.uk = Ucraino
 charsetMenuAutodet.uk.key = U
 
+_autodetect_all.key = m
+_autodetect_all = Automatica
 UTF-8.key = U
 UTF-8 = Unicode
 windows-1252.key = O
@@ -94,4 +96,3 @@
 
 windows-1258.key = V
 windows-1258 = Vietnamita
-
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/chrome/global/notification.dtd firefox-85.0+build1/l10n/it/toolkit/chrome/global/notification.dtd
--- firefox-84.0.2+build1/l10n/it/toolkit/chrome/global/notification.dtd	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/chrome/global/notification.dtd	2021-01-18 20:05:34.000000000 +0000
@@ -4,7 +4,7 @@
 
 <!ENTITY closeNotification.tooltip "Chiudi questo avviso">
 
-<!ENTITY checkForUpdates "Ricerca aggiornamenti…">
+<!ENTITY checkForUpdates "Controlla aggiornamenti…">
 
 <!ENTITY learnMoreNoEllipsis "Ulteriori informazioni">
 
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/it/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/it/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:34.000000000 +0000
@@ -10,6 +10,13 @@
 
 shortDays = g;g
 
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy = Impossibile salvare il download in quanto è bloccato da %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension = Impossibile salvare il download in quanto è bloccato da un’estensione.
+
 downloadErrorAlertTitle = Errore download
 downloadErrorGeneric = Si è verificato un errore sconosciuto e il download non è stato salvato.\n\nSi consiglia di ritentare.
 
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/it/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/it/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:34.000000000 +0000
@@ -35,3 +35,4 @@
 check_error-2152398920 = Connessione al server proxy rifiutata
 check_error-2153390069 = Il certificato del server è scaduto (verificare ed eventualmente correggere le impostazioni dell’orologio di sistema)
 check_error-verification_failed = Impossibile verificare l’integrità dell’aggiornamento
+check_error-move_failed = Non è stato possibile preparare l’aggiornamento per l’installazione
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/chrome/pluginproblem/pluginproblem.dtd firefox-85.0+build1/l10n/it/toolkit/chrome/pluginproblem/pluginproblem.dtd
--- firefox-84.0.2+build1/l10n/it/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/chrome/pluginproblem/pluginproblem.dtd	2021-01-18 20:05:34.000000000 +0000
@@ -4,7 +4,7 @@
 
 <!ENTITY tapToPlayPlugin "Toccare qui per attivare il plugin.">
 <!ENTITY clickToActivatePlugin "Attiva plugin.">
-<!ENTITY checkForUpdates "Ricerca aggiornamenti…">
+<!ENTITY checkForUpdates "Controlla aggiornamenti…">
 <!ENTITY blockedPlugin.label "Questo plugin è stato bloccato per motivi di sicurezza.">
 <!ENTITY hidePluginBtn.label "Nascondi plugin">
 <!ENTITY managePlugins "Gestione plugin…">
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -434,12 +434,6 @@
     .title = Vengono consigliate solo estensioni che soddisfano i requisiti di sicurezza e prestazioni di { -brand-product-name }
     .aria-label = { addon-badge-recommended2.title }
 
-addon-badge-line =
-  .title = Questa estensione è stata realizzata dagli autori di { -brand-product-name }
-  .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-  .title = Il codice di questa estensione è stato verificato per garantirne la sicurezza
-  .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
   .title = Questa è un’estensione ufficiale sviluppata dagli autori di { -brand-product-name }
   .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -171,6 +171,33 @@
 remote-debugging-accepting-connections = Connessioni accettate
 remote-debugging-url = URL
 
+support-third-party-modules-title = Moduli di terze parti
+support-third-party-modules-module = File del modulo
+support-third-party-modules-version = Versione del file
+support-third-party-modules-vendor = Informazioni produttore
+support-third-party-modules-occurrence = Occorrenze
+support-third-party-modules-process = Tipo processo e ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Indirizzo imagebase
+support-third-party-modules-uptime = Tempo di attività del processo (ms)
+support-third-party-modules-duration = Durata caricamento (ms)
+support-third-party-modules-empty = Nessun modulo di terze parti caricato
+support-third-party-modules-no-value = (nessun valore)
+support-third-party-modules-button-open =
+    .title = Apri posizione file…
+support-third-party-modules-expand =
+    .title = Mostra informazioni dettagliate
+support-third-party-modules-collapse =
+    .title = Nascondi informazioni dettagliate
+support-third-party-modules-unsigned-icon =
+    .title = Questo modulo non è firmato
+support-third-party-modules-folder-icon =
+    .title = Apri posizione file…
+support-third-party-modules-down-icon =
+    .title = Mostra informazioni dettagliate
+support-third-party-modules-up-icon =
+    .title = Nascondi informazioni dettagliate
+
 ##
 
 # Variables
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -118,3 +118,7 @@
 experimental-features-multi-pip =
     .label = Supporto per finestre multiple in Picture-in-Picture
 experimental-features-multi-pip-description = Attiva il supporto sperimentale per l’utilizzo di più finestre Picture-in-Picture aperte contemporaneamente.
+
+experimental-features-http3 =
+    .label = Protocollo HTTP/3
+experimental-features-http3-description = Supporto sperimentale per il protocollo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -26,15 +26,6 @@
 permission-dialog-description-host-app =
   Consentire a { $host } di aprire un link di tipo { $scheme } con { $appName }?
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> sta cercando di aprire un link di tipo <strong>{ $scheme }</strong>.
-
 permission-dialog-remember =
   Consenti sempre a <strong>{ $host }</strong> di aprire link di tipo <strong>{ $scheme }</strong>
 
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pagina:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } di { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -58,3 +62,11 @@
     .label = { $arrow }
     .tooltiptext = Ultima pagina
 
+printpreview-homearrow-button =
+    .title = Prima pagina
+printpreview-previousarrow-button =
+    .title = Pagina precedente
+printpreview-nextarrow-button =
+    .title = Pagina successiva
+printpreview-endarrow-button =
+    .title = Ultima pagina
diff -Nru firefox-84.0.2+build1/l10n/it/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/it/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/it/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:41:37.000000000 +0000
+++ firefox-85.0+build1/l10n/it/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:34.000000000 +0000
@@ -22,6 +22,9 @@
   .aria-label = Selezionare un intervallo di pagine
 printui-page-custom-range =
   .aria-label = Inserire un intervallo di pagine personalizzato
+printui-page-custom-range-input =
+  .aria-label = Inserire un intervallo di pagine personalizzato
+  .placeholder = ad es. 2-6, 9, 12-16
 # This label is displayed before the first input field indicating
 # the start of the range to print.
 printui-range-start = Da
@@ -60,6 +63,7 @@
 printui-options = Opzioni
 printui-headers-footers-checkbox = Stampa intestazioni e piè di pagina
 printui-backgrounds-checkbox = Stampa sfondi
+printui-selection-checkbox = Stampa solo la selezione
 
 printui-color-mode-label = Modalità colore
 printui-color-mode-color = Colori
@@ -70,10 +74,15 @@
 printui-margins-min = Minimi
 printui-margins-none = Nessuno
 printui-margins-custom = Personalizzati
+printui-margins-custom-inches = Personalizzati (pollici)
 printui-margins-custom-top = Superiore
 printui-margins-custom-bottom = Inferiore
 printui-margins-custom-left = Sinistra
 printui-margins-custom-right = Destra
+printui-margins-custom-top-inches = Superiore (pollici)
+printui-margins-custom-bottom-inches = Inferiore (pollici)
+printui-margins-custom-left-inches = Sinistra (pollici)
+printui-margins-custom-right-inches = Destra (pollici)
 
 printui-system-dialog-link = Stampa utilizzando la finestra di dialogo del sistema…
 
@@ -90,6 +99,9 @@
     .aria-label = Anteprima di stampa
 
 printui-pages-per-sheet = Pagine per foglio
+
+printui-print-progress-indicator = Stampa in corso…
+
 ## Paper sizes that may be supported by the Save to PDF destination:
 
 printui-paper-a5 = A5
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ja/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/aboutLogins.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/aboutLogins.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -175,7 +175,12 @@
 confirm-delete-dialog-message = ���作�元�戻���ん。
 about-logins-confirm-remove-dialog-confirm-button = 消去
 
-about-logins-confirm-remove-all-dialog-confirm-button = ���消去
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+  { $count ->
+     [1] 消去
+    *[other] ���消去
+  }
+
 about-logins-confirm-remove-all-dialog-checkbox-label =
   { $count ->
      [1] �����ログイン情報を消去���
@@ -204,6 +209,9 @@
 about-logins-confirm-export-dialog-message = ����パスワード��読テキスト����存�れ��。(例: BadP@ssw0rd) エクス�ート�れ�ファイルを開�る人�ら誰�も内容を読��る����能��り��。
 about-logins-confirm-export-dialog-confirm-button = エクス�ート...
 
+about-logins-alert-import-title = イン�ート完了
+about-logins-alert-import-message = イン�ート�果を表示
+
 confirm-discard-changes-dialog-title = 未�存�変更を破棄����？
 confirm-discard-changes-dialog-message = 変更内容����失�れ��。
 confirm-discard-changes-dialog-confirm-button = 破棄
@@ -259,3 +267,28 @@
 # A description for the .csv file format that may be shown as the file type
 # filter by the operating system.
 about-logins-import-file-picker-csv-filter-title = CSV ファイル
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = イン�ート完了
+about-logins-import-dialog-items-added =
+  { $count ->
+     *[other] <span>新��ログイン情報�追加:</span> <span data-l10n-name="count">{ $count }</span>
+  }
+
+about-logins-import-dialog-items-modified =
+  { $count ->
+     *[other] <span>既存�ログイン情報�更新:</span> <span data-l10n-name="count">{ $count }</span>
+  }
+
+about-logins-import-dialog-items-no-change =
+  { $count ->
+     *[other] <span>ログイン情報��複:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(イン�ート�れ��ん���)</span>
+  }
+about-logins-import-dialog-items-error =
+  { $count ->
+      *[other] <span>エラー:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(イン�ート�れ��ん���)</span>
+  }
+about-logins-import-dialog-done = 完了
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ja/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/appmenu.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/appmenu.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -2,6 +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/.
 
+
 ## App Menu
 
 appmenuitem-update-banner =
@@ -12,22 +13,32 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = 新��ウィンドウ
+appmenuitem-new-private-window =
+    .label = 新��プライベートウィンドウ
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = 拡大
 appmenuitem-zoom-reduce =
     .label = 縮�
+appmenuitem-fullscreen =
+    .label = 全画�表示
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = 今���期
+appmenuitem-save-page =
+    .label = ��を付��ページを�存...
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = 新�情報
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
-  .label = 新機能を通知�る
-  .accesskey = f
+    .label = 新機能を通知�る
+    .accesskey = f
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ja/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/appMenuNotifications.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -32,6 +32,14 @@
     .secondarybuttonlabel = 後�
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = { -brand-shorter-name } ��起動後�開����タブ�プライベートブラウジングモード���ウィンドウ����復元�れ��。
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } �自動�最新�ージョン�更新����ん。
+    .buttonlabel = ����更新
+    .buttonaccesskey = U
+    .secondarybuttonlabel = 後�
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = { -brand-shorter-name } �更新��り����他�プロファイル� { -brand-shorter-name } �実行中����インストール����ん。��らを閉��更新�る������更新�る��択������。(他�プロファイル�も����起動�る��正常�動作���ん)
+
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/browser.ftl firefox-85.0+build1/l10n/ja/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/browser.ftl	2021-01-06 11:42:07.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/browser.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -2,6 +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/.
 
+
 ## The main browser window's title
 
 # These are the default window titles everywhere except macOS. The first two
@@ -18,7 +19,6 @@
     .data-title-private = { -brand-full-name } (プライベートブラウジング)
     .data-content-title-default = { $content-title } — { -brand-full-name }
     .data-content-title-private = { $content-title } — { -brand-full-name } (プライベートブラウジング)
-
 # These are the default window titles on macOS. The first two are for use when
 # there is no content title:
 #
@@ -38,7 +38,6 @@
     .data-title-private = { -brand-full-name } — (プライベートブラウジング)
     .data-content-title-default = { $content-title }
     .data-content-title-private = { $content-title } — (プライベートブラウジング)
-
 # This gets set as the initial title, and is overridden as soon as we start
 # updating the titlebar based on loaded tabs or private browsing state.
 # This should match the `data-title-default` attribute in both
@@ -107,9 +106,9 @@
 ## homepage of their default search engine.
 ## Variables:
 ##  $engineName (String): The name of the user's default search engine. e.g. "Google" or "DuckDuckGo".
+
 urlbar-search-tips-onboard = 少��入力����ん見��る: アドレス�ー�ら { $engineName } ���検索���。
 urlbar-search-tips-redirect-2 = アドレス�ー�検索を始�る��{ $engineName } �ら�検索候補�閲覧履歴�表示�れ��。
-
 # Prompts users to use the Urlbar when they are typing in the domain of a
 # search engine, e.g. google.com or amazon.com.
 urlbar-tabtosearch-onboard = ��ショートカットを�択�る��より素早�検索����。
@@ -281,7 +280,6 @@
 identity-active-loaded = ��ページ���護�無効�設定�れ����。
 identity-weak-encryption = ��ページ�脆弱�暗�を使用�����。
 identity-insecure-login-forms = ��ページ�ログインフォーム�安全���り��ん。
-
 identity-https-only-connection-upgraded = (HTTPS �接続中)
 identity-https-only-label = HTTPS-Only モード
 identity-https-only-dropdown-on =
@@ -293,12 +291,10 @@
 identity-https-only-info-turn-on2 = ��サイト� { -brand-short-name } ��能��り接続をアップグレード����場���HTTPS-Only モードをオン�������。
 identity-https-only-info-turn-off2 = ページ�動作���場�� HTTPS-Only モードをオフ����安全��� HTTP 接続���サイトを�読�込��る�よ���ょ�。
 identity-https-only-info-no-upgrade = 接続を HTTP �らアップグレード����ん。
-
 identity-permissions =
     .value = ��サイト�設定
 identity-permissions-storage-access-header = クロスサイト Cookie
 identity-permissions-storage-access-hint = 以下�サイト��������サイト��る間�クロスサイト Cookie �サイトデータ�アクセス����。
-
 identity-permissions-reload-hint = 変更内容を�用�る���ページ��読�込��必���。
 identity-permissions-empty = ��サイト�特別�権��設定�れ����ん。
 identity-clear-site-data =
@@ -347,7 +343,6 @@
 browser-import-button2 =
     .label = ブックマークをイン�ート�る...
     .tooltiptext = ブックマークを他�ブラウザー�ら { -brand-short-name } �イン�ート���。
-
 bookmarks-toolbar-empty-message = ブックマークを��ブックマークツール�ー��置�る��素早�アクセス����。<a data-l10n-name="manage-bookmarks">ブックマークを管�...</a>
 
 ## WebRTC Pop-up notifications
@@ -427,11 +422,9 @@
     .tooltiptext = ��ウェブサイト�追加�権�を許�����。
 urlbar-switch-to-tab =
     .value = タブを表示:
-
 # Used to indicate that a selected autocomplete entry is provided by an extension.
 urlbar-extension =
     .value = 拡張機能:
-
 urlbar-go-button =
     .tooltiptext = アドレス�ー�入力�れ� URL �移動���
 urlbar-page-action-button =
@@ -502,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = マウス�インター��在� <span data-l10n-name="domain">{ $domain }</span> �制御�����。制御を�り戻����ESC キーを押������。
 pointerlock-warning-no-domain = マウス�インター��在���ページ�制御�����。制御を�り戻����ESC キーを押������。
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ����ブックマークを表示
+bookmarks-recent-bookmarks =
+    .value = 最近�ブックマーク
+bookmarks-toolbar-chevron =
+    .tooltiptext = 残り�ブックマークを表示���
+bookmarks-sidebar-content =
+    .aria-label = ブックマーク
+bookmarks-menu-button =
+    .label = ブックマークメニュー
+bookmarks-other-bookmarks-menu =
+    .label = 他�ブックマーク
+bookmarks-mobile-bookmarks-menu =
+    .label = モ�イル�ブックマーク
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークサイド�ーを隠�
+           *[other] ブックマークサイド�ーを表示
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークツール�ーを隠�
+           *[other] ブックマークツール�ーを表示
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークメニューをツール�ー�ら削除
+           *[other] ブックマークメニューをツール�ー�追加
+        }
+bookmarks-search =
+    .label = ブックマークを検索
+bookmarks-tools =
+    .label = ブックマークツール
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ブックマークツール�ー
+    .accesskey = B
+    .aria-label = ブックマーク
+bookmarks-toolbar-menu =
+    .label = ブックマークツール�ー
+bookmarks-toolbar-placeholder =
+    .title = ブックマークツール�ー�項目
+bookmarks-toolbar-placeholder-button =
+    .label = ブックマークツール�ー�項目
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ブックマーク
+library-bookmarks-bookmark-this-page =
+    .label = ��ページをブックマーク
+library-bookmarks-bookmark-edit =
+    .label = ��ブックマークを編集
+library-recent-activity-label = 最近�アクティビティ
+
+## More items
+
+more-menu-go-offline =
+    .label = オフライン作業
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ja/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/newtab/asrouter.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -280,3 +280,18 @@
 cfr-whatsnew-media-keys-header = メディア��作�充実
 cfr-whatsnew-media-keys-body = キーボードやヘッドセット�ら音声���映���生��止���るよ���り�他�タブ�ら������コンピューター�ロック�れ�状態�も簡��メディアを�作����。���進むキー�戻るキー�もトラックを移動��るよ���り���。
 cfr-whatsnew-media-keys-button = 詳細
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = アドレス�ー�検索ショートカット
+cfr-whatsnew-search-shortcuts-body = アドレス�ー�検索エンジン���特定�サイトを入力�る��検索候補�下���ショートカット�表示�れるよ���り���。ショートカットを�択�る��アドレス�ー�ら���検索����。
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = 悪���る supercookie を�断
+cfr-whatsnew-supercookies-body = ウェブサイト�密�� “supercookie� を発行�������手動� Cookie を消去����りウェブ����を追跡����。{ -brand-short-name } � supercookie �対�る強固��護を�供��サイトを���������オンライン�行動を追跡����よ�����。
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = よりよ�ブックマーク登録
+cfr-whatsnew-bookmarking-body = �気�入り�サイト�管��簡���り���。{ -brand-short-name } ��存��ブックマークを����好��場所�記憶��既定�設定��新��タブ�ブックマークツール�ーを表示��ツール�ー�フォルダー�ら他�ブックマーク�もアクセス��るよ���り���。
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ja/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/newtab/newtab.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -8,6 +8,10 @@
 newtab-settings-button =
     .title = 新��タブページをカスタマイズ
 
+newtab-personalize-button-label = パーソナライズ
+    .title = 新��タブをパーソナライズ
+    .aria-label = 新��タブをパーソナライズ
+
 ## Search box component.
 
 # "Search" is a verb/action
@@ -21,11 +25,18 @@
     .title = ウェブを検索
     .aria-label = ウェブを検索
 
+newtab-search-box-text = ウェブを検索
+newtab-search-box-input =
+    .placeholder = ウェブを検索
+    .aria-label = ウェブを検索
+
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = 検索エンジンを追加
 newtab-topsites-add-topsites-header = 新�トップサイト
+newtab-topsites-add-shortcut-header = 新��ショートカット
 newtab-topsites-edit-topsites-header = トップサイトを編集
+newtab-topsites-edit-shortcut-header = ショートカットを編集
 newtab-topsites-title-label = タイトル
 newtab-topsites-title-input =
     .placeholder = タイトルを入力
@@ -175,6 +186,7 @@
 
 newtab-section-header-topsites = トップサイト
 newtab-section-header-highlights = �イライト
+newtab-section-header-recent-activity = 最近�アクティビティ
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = { $provider } �����
@@ -212,3 +224,24 @@
 
 newtab-error-fallback-info = ��コンテンツ�読�込�中�何��題�発生����。
 newtab-error-fallback-refresh-link = ページを�読�込���も�一度試������。
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = ショートカット
+newtab-custom-shortcuts-subtitle = �存���訪���サイト
+newtab-custom-row-selector = { $num } 行
+newtab-custom-sponsored-sites = 広告ショートカット
+newtab-custom-pocket-title = { -pocket-brand-name } �����
+newtab-custom-pocket-subtitle = { -brand-product-name } ファミリーを構��る { -pocket-brand-name } �厳���注目�コンテンツ
+newtab-custom-pocket-sponsored = 広告ストーリー
+newtab-custom-recent-title = 最近�アクティビティ
+newtab-custom-recent-subtitle = 最近�サイト�コンテンツ�抜粋
+newtab-custom-close-button = 閉�る
+
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = スニペット
+newtab-custom-snippets-subtitle = { -vendor-short-name } � { -brand-product-name } �関�るヒント�最新情報
+newtab-custom-settings = 他�設定を管�
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/places.ftl firefox-85.0+build1/l10n/ja/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/places.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/places.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -71,3 +71,7 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = サブフォルダー
+
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+  .label = 他�ブックマーク
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ja/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/preferences/preferences.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -627,12 +627,19 @@
 home-prefs-topsites-by-option-sponsored =
     .label = 広告トップサイト
 
+home-prefs-shortcuts-header =
+    .label = ショートカット
+home-prefs-shortcuts-description = �存���訪���サイト
+home-prefs-shortcuts-by-option-sponsored =
+    .label = 広告ショートカット
+
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = { $provider } �����
 home-prefs-recommended-by-description-update = { $provider } �ウェブ全体�ら厳���注目�コンテンツ
+home-prefs-recommended-by-description-new = { -brand-product-name } ファミリーを構��る { $provider } �厳���注目�コンテンツ
 ##
 
 home-prefs-recommended-by-learn-more = 使�方
@@ -651,6 +658,10 @@
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name } ��存�れ�ページ
 
+home-prefs-recent-activity-header =
+    .label = 最近�アクティビティ
+home-prefs-recent-activity-description = 最近�サイト�コンテンツ�抜粋
+
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -658,6 +669,9 @@
 home-prefs-snippets-header =
     .label = スニペット
 home-prefs-snippets-description = { -vendor-short-name } � { -brand-product-name } �関�る最新情報
+
+home-prefs-snippets-description-new = { -vendor-short-name } � { -brand-product-name } �関�るヒント�最新情報
+
 home-prefs-sections-rows-option =
     .label = { $num } 行
 
@@ -1121,10 +1135,18 @@
 addressbar-locbar-openpage-option =
     .label = 開���るタブ
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = ショートカット
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = トップサイト
     .accesskey = T
 
+addressbar-locbar-engines-option =
+    .label = 検索エンジン
+    .accesskey = a
+
 addressbar-suggestions-settings = 検索エンジン�検索候補�設定を変更
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ja/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ja/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -61,6 +61,16 @@
     .label = 新��タブ��
     .accesskey = O
 
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = 常�表示�る
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = 表示���
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = 新��タブ��表示�る
+    .accesskey = O
+
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = 他�ブックマークを表示
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/ja/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/ja/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ja/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:05:40.000000000 +0000
@@ -32,7 +32,6 @@
 # be longer than the other existing status strings.
 blockedMalware				=��ファイル�ウイルスやマルウェア���れ����。
 blockedPotentiallyUnwanted		=��ファイル�����コンピューター�害を�����。
-blockedInsecure				=��ファイル�安全�ダウンロード����ん���。
 blockedPotentiallyInsecure		=潜在的�セキュリティ�題�より���ファイル�ダウンロード�れ��ん���。
 blockedUncommon2			=��ファイルを開����険��。
 
diff -Nru firefox-84.0.2+build1/l10n/ja/devtools/client/markers.properties firefox-85.0+build1/l10n/ja/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ja/devtools/client/markers.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/devtools/client/markers.properties	2021-01-18 20:05:40.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS		=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE		=空�メモリー���
 marker.gcreason.label.CC_WAITING		=サイクルコレクション�よる実行
+marker.gcreason.label.CC_FINISHED		=サイクルコレクション完了
 marker.gcreason.label.CC_FORCED			=サイクルコレクション�よる実行
 marker.gcreason.label.LOAD_END			=ページ�読�込�完了
 marker.gcreason.label.PAGE_HIDE			=�ックグラウンド�移動
diff -Nru firefox-84.0.2+build1/l10n/ja/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ja/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ja/devtools/client/toolbox.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/devtools/client/toolbox.properties	2021-01-18 20:05:40.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip	=開発ツールを閉���
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip		=コンソールペインを表示
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ja/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ja/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ja/devtools/client/tooltips.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/devtools/client/tooltips.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -41,6 +41,10 @@
 
 inactive-outline-radius-when-outline-style-auto-or-none = ���素� <strong>outline-style</strong> � <strong>auto</strong> ��� <strong>none</strong> �����る���<strong>{ $property }</strong> ����素�影響を�����ん。
 
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> �テーブルを構��る�素�影響を�����ん。
+
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> �セル以外�テーブルを構��る�素�影響を�����ん。
+
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
@@ -71,6 +75,10 @@
 
 inactive-text-overflow-when-no-overflow-fix = <strong>overflow:hidden</strong> を追加��������。 { learn-more }
 
+inactive-css-not-for-internal-table-elements-fix = <strong>セル</strong>�<strong>列</strong>�<strong>行</strong>�<strong>列グループ</strong>�<strong>行グループ</strong> ��� <strong>フッターグループ</strong> 以外��素� <strong>display</strong> プロパティを設定��������。{ learn-more }
+
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = <strong>列</strong>�<strong>行</strong>�<strong>列グループ</strong>�<strong>行グループ</strong> ��� <strong>フッターグループ</strong> 以外��素� <strong>display</strong> プロパティを設定��������。{ learn-more }
+
 inactive-outline-radius-when-outline-style-auto-or-none-fix = <strong>outline-style</strong> プロパティ� <strong>auto</strong> ��� <strong>none</strong> 以外�値を設定��������。{ learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/ja/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ja/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ja/dom/chrome/dom/dom.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/dom/chrome/dom/dom.properties	2021-01-18 20:05:40.000000000 +0000
@@ -422,3 +422,10 @@
 RequestStorageAccessUserGesture		=document.requestStorageAccess() ��ユーザー生��短期的�イベント�ンドラー�内部�ら���求�れ��。
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented		=Location API � History API �短時間�多数呼�出�れ����。
+FolderUploadPrompt.title		=アップロード�確�
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message		=“%S� �ら�ファイルを���アップロード��もよ������？ ��サイトを信頼�る場���実行������。
+FolderUploadPrompt.acceptButtonLabel	=アップロード
+InputPickerBlockedNoUserActivation	=ユーザー�許��無����<input> ピッカー�ブロック�れ���。
+ExternalProtocolFrameBlockedNoUserActivation	=ユーザー�許��無����� iframe �最後�読�込�れ��ら�分�時間�経���������外部プロトコルを�� iframe �ブロック�れ���。
+MultiplePopupsBlockedNoUserActivation	=ユーザー�許��無����開�れよ����複数��ップアップ�ブロック�れ���。
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ja/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ja/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:40.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays	=æ—¥
 
 downloadErrorAlertTitle			=ダウンロードエラー
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy			=%S �よりブロック�れ���ダウンロードファイルを�存����ん���。
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension			=拡張機能�よりブロック�れ���ダウンロードファイルを�存����ん���。
 downloadErrorGeneric			=原因�明�エラー�発生����ダウンロードファイルを�存����ん���。\n\n�度試������。
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ja/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ja/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:40.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920		=プロキシーサー�ー��接続を拒��れ���
 check_error-2153390069		=サー�ー�証明書�有効期�を������ (コンピューター�日時�狂����ら正��設定������)
 check_error-verification_failed	=更新�完全性を確�����ん���
+check_error-move_failed		=更新�インストール�準備����ん���。
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -376,13 +376,6 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } � Mozilla �定��安全性�パフォーマンス�基準����る拡張機能��を�������
     .aria-label = { addon-badge-recommended2.title }
-
-addon-badge-line =
-  .title = ��拡張機能� { -brand-product-name } �製作者�より作��れ���
-  .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-  .title = ��拡張機能�安全を確��る��コードレビュー�行�れ���
-  .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
   .title = �れ� { -brand-product-name } �製作者�より作��れ�公��拡張機能��
   .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -57,6 +57,9 @@
 app-basics-build-config = ビルド設定
 app-basics-user-agent = ユーザーエージェント
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta Translated
 app-basics-memory-use = メモリー使用�
 app-basics-performance = パフォーマンス
 app-basics-service-workers = 登録�れ� Service Workers
@@ -180,6 +183,33 @@
 
 ##
 
+support-third-party-modules-title = サードパーティモジュール
+support-third-party-modules-module = モジュールファイル
+support-third-party-modules-version = ファイル��ージョン
+support-third-party-modules-vendor = ベンダー情報
+support-third-party-modules-occurrence = プロセス数
+support-third-party-modules-process = プロセスタイプ� ID
+support-third-party-modules-thread = スレッド
+support-third-party-modules-base = Imagebase アドレス
+support-third-party-modules-uptime = プロセス実行時間 (ms)
+support-third-party-modules-duration = 読�込��延 (ms)
+support-third-party-modules-empty = �サードパーティモジュール�読�込�れ��ん���。
+support-third-party-modules-no-value = (値��)
+support-third-party-modules-button-open =
+    .title = ファイル�場所を開�...
+support-third-party-modules-expand =
+    .title = 詳細情報を表示
+support-third-party-modules-collapse =
+    .title = 詳細情報を折り��む
+support-third-party-modules-unsigned-icon =
+    .title = ��モジュール�署���り��ん
+support-third-party-modules-folder-icon =
+    .title = ファイル�場所を開�...
+support-third-party-modules-down-icon =
+    .title = 詳細情報を表示
+support-third-party-modules-up-icon =
+    .title = 詳細情報を折り��む
+
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = �去 { $days } 日分�クラッシュレ�ート
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -118,3 +118,7 @@
 experimental-features-multi-pip =
     .label = ピク�ャーインピク�ャー�複数サ�ート
 experimental-features-multi-pip-description = 複数�ピク�ャーインピク�ャーウィンドウを�時�開�るよ���る実験的�サ�ート��。
+
+experimental-features-http3 =
+    .label = HTTP/3 プロトコル
+experimental-features-http3-description = HTTP/3 プロトコル�実験的�サ�ート��。
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -2,15 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> � <strong>{ $scheme }</strong> �リンクを開��������。
-
 ## Permission Dialog
 ## Variables:
 ##  $host - the hostname that is initiating the request
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -39,6 +39,11 @@
     .value = ページ:
     .accesskey = a
 
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } / { $sheetCount }
+
 ## Variables
 ## $percent (integer) - menuitem percent label
 ## $arrow (String) - UTF-8 arrow character for navigation buttons
@@ -57,3 +62,12 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = 最後�ページを表示���
+
+printpreview-homearrow-button =
+    .title = 最��ページ
+printpreview-previousarrow-button =
+    .title = ��ページ
+printpreview-nextarrow-button =
+    .title = 次�ページ
+printpreview-endarrow-button =
+    .title = 最後�ページ
diff -Nru firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ja/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ja/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:42:06.000000000 +0000
+++ firefox-85.0+build1/l10n/ja/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:40.000000000 +0000
@@ -28,6 +28,10 @@
 # the start and end page of the range to print.
 printui-range-end = –
 
+printui-page-custom-range-input =
+  .aria-label = ページ範囲を入力������
+  .placeholder = 例: 2-6, 9, 12-16
+
 # Section title for the number of copies to print
 printui-copies-label = 部数
 
@@ -59,6 +63,8 @@
 printui-headers-footers-checkbox = ヘッダー�フッターを�刷�る
 printui-backgrounds-checkbox = 背景画�を�刷�る
 
+printui-selection-checkbox = �択範囲��を�刷�る
+
 printui-color-mode-label = カラーモード
 printui-color-mode-color = カラー
 printui-color-mode-bw = モノクロ
@@ -68,10 +74,15 @@
 printui-margins-min = 最少
 printui-margins-none = ��
 printui-margins-custom = カスタム
+printui-margins-custom-inches = カスタム (イン�)
 printui-margins-custom-top = 上
+printui-margins-custom-top-inches = 上 (イン�)
 printui-margins-custom-bottom = 下
+printui-margins-custom-bottom-inches = 下 (イン�)
 printui-margins-custom-left = å·¦
+printui-margins-custom-left-inches = 左 (イン�)
 printui-margins-custom-right = �
+printui-margins-custom-right-inches = � (イン�)
 
 printui-system-dialog-link = システムダイアログを使用���刷...
 
@@ -79,6 +90,8 @@
 printui-primary-button-save = �存
 printui-cancel-button = キャンセル
 
+printui-close-button = 閉�る
+
 printui-loading = プレビュー�準備中��
 
 # Reported by screen readers and other accessibility tools to indicate that
@@ -86,6 +99,12 @@
 printui-preview-label =
     .aria-label = �刷プレビュー
 
+printui-pages-per-sheet = 1 枚��り�ページ数
+
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = �刷中...
+
 ## Paper sizes that may be supported by the Save to PDF destination:
 ## (^m^) /widget/nsPrinterListBase.cpp (Bug 1659781)
 
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/aboutLogins.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/aboutLogins.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -175,7 +175,12 @@
 confirm-delete-dialog-message = ���作�元�戻���ん。
 about-logins-confirm-remove-dialog-confirm-button = 消去
 
-about-logins-confirm-remove-all-dialog-confirm-button = ���消去
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+  { $count ->
+     [1] 消去
+    *[other] ���消去
+  }
+
 about-logins-confirm-remove-all-dialog-checkbox-label =
   { $count ->
      [1] �����ログイン情報を消去���
@@ -204,6 +209,9 @@
 about-logins-confirm-export-dialog-message = ����パスワード��読テキスト����存�れ��。(例: BadP@ssw0rd) 書�出�れ�ファイルを開�る人�ら誰�も内容を読��る����能��り��。
 about-logins-confirm-export-dialog-confirm-button = 書�出�...
 
+about-logins-alert-import-title = 読�込�完了
+about-logins-alert-import-message = 読�込��果を表示
+
 confirm-discard-changes-dialog-title = 未�存�変更を破棄����？
 confirm-discard-changes-dialog-message = 変更内容����失�れ��。
 confirm-discard-changes-dialog-confirm-button = 破棄
@@ -259,3 +267,28 @@
 # A description for the .csv file format that may be shown as the file type
 # filter by the operating system.
 about-logins-import-file-picker-csv-filter-title = CSV ファイル
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = 読�込�完了
+about-logins-import-dialog-items-added =
+  { $count ->
+     *[other] <span>新�ログイン情報�追加:</span> <span data-l10n-name="count">{ $count }</span>
+  }
+
+about-logins-import-dialog-items-modified =
+  { $count ->
+     *[other] <span>既存�ログイン情報�更新:</span> <span data-l10n-name="count">{ $count }</span>
+  }
+
+about-logins-import-dialog-items-no-change =
+  { $count ->
+     *[other] <span>ログイン情報��複:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(読�込�れ��ん���)</span>
+  }
+about-logins-import-dialog-items-error =
+  { $count ->
+      *[other] <span>エラー:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(読�込�れ��ん���)</span>
+  }
+about-logins-import-dialog-done = 完了
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/appmenu.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/appmenu.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -2,6 +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/.
 
+
 ## App Menu
 
 appmenuitem-update-banner =
@@ -12,22 +13,32 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = 新�ウインドウ
+appmenuitem-new-private-window =
+    .label = 新�プライベートウインドウ
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = 拡大
 appmenuitem-zoom-reduce =
     .label = 縮�
+appmenuitem-fullscreen =
+    .label = フルスクリーン
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = 今���期
+appmenuitem-save-page =
+    .label = 別��ページを�存...
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = 新�情報
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
-  .label = 新機能を通知�る
-  .accesskey = f
+    .label = 新機能を通知�る
+    .accesskey = f
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/appMenuNotifications.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -32,6 +32,14 @@
     .secondarybuttonlabel = 後�
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = { -brand-shorter-name } ��起動後�開����タブ�プライベートブラウジングモード���ウインドウ����復元�れ��。
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } �自動�最新�ージョン�更新����ん。
+    .buttonlabel = ����更新
+    .buttonaccesskey = U
+    .secondarybuttonlabel = 後�
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = { -brand-shorter-name } �更新��り����他�プロファイル� { -brand-shorter-name } �実行中����インストール����ん。��らを閉��更新�る������更新�る��択������。(他�プロファイル�も����起動�る��正常�動作���ん)
+
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/browser.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/browser.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/browser.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -2,6 +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/.
 
+
 ## The main browser window's title
 
 # These are the default window titles everywhere except macOS. The first two
@@ -18,7 +19,6 @@
     .data-title-private = { -brand-full-name } (プライベートブラウジング)
     .data-content-title-default = { $content-title } — { -brand-full-name }
     .data-content-title-private = { $content-title } — { -brand-full-name } (プライベートブラウジング)
-
 # These are the default window titles on macOS. The first two are for use when
 # there is no content title:
 #
@@ -38,7 +38,6 @@
     .data-title-private = { -brand-full-name } — (プライベートブラウジング)
     .data-content-title-default = { $content-title }
     .data-content-title-private = { $content-title } — (プライベートブラウジング)
-
 # This gets set as the initial title, and is overridden as soon as we start
 # updating the titlebar based on loaded tabs or private browsing state.
 # This should match the `data-title-default` attribute in both
@@ -107,9 +106,9 @@
 ## homepage of their default search engine.
 ## Variables:
 ##  $engineName (String): The name of the user's default search engine. e.g. "Google" or "DuckDuckGo".
+
 urlbar-search-tips-onboard = 少��入力����ん見��る: アドレス�ー�ら { $engineName } ���検索���。
 urlbar-search-tips-redirect-2 = アドレス�ー�検索を始�る��{ $engineName } �ら�検索候補�閲覧履歴�表示�れ��。
-
 # Prompts users to use the Urlbar when they are typing in the domain of a
 # search engine, e.g. google.com or amazon.com.
 urlbar-tabtosearch-onboard = ��ショートカットを�択�る��より素早�検索����。
@@ -281,7 +280,6 @@
 identity-active-loaded = ��ページ���護�無効�設定�れ����。
 identity-weak-encryption = ��ページ�脆弱�暗�を使用�����。
 identity-insecure-login-forms = ��ページ�ログインフォーム�安全���り��ん。
-
 identity-https-only-connection-upgraded = (HTTPS �接続中)
 identity-https-only-label = HTTPS-Only モード
 identity-https-only-dropdown-on =
@@ -293,12 +291,10 @@
 identity-https-only-info-turn-on2 = ��サイト� { -brand-short-name } ��能��り接続をアップグレード����場���HTTPS-Only モードをオン�������。
 identity-https-only-info-turn-off2 = ページ�動作���場�� HTTPS-Only モードをオフ����安全��� HTTP 接続���サイトを�読�込��る�よ���ょ�。
 identity-https-only-info-no-upgrade = 接続を HTTP �らアップグレード����ん。
-
 identity-permissions =
     .value = ��サイト�設定
 identity-permissions-storage-access-header = クロスサイト Cookie
 identity-permissions-storage-access-hint = 以下�サイト��������サイト��る間�クロスサイト Cookie �サイトデータ�アクセス����。
-
 identity-permissions-reload-hint = 変更内容を�用�る���ページ��読�込��必���。
 identity-permissions-empty = ��サイト�特別�権��設定�れ����ん。
 identity-clear-site-data =
@@ -347,7 +343,6 @@
 browser-import-button2 =
     .label = ブックマークを読�込む...
     .tooltiptext = ブックマークを他�ブラウザー�ら { -brand-short-name } �読�込���。
-
 bookmarks-toolbar-empty-message = ブックマークを��ブックマークツール�ー��置�る��素早�アクセス����。<a data-l10n-name="manage-bookmarks">ブックマークを管�...</a>
 
 ## WebRTC Pop-up notifications
@@ -427,11 +422,9 @@
     .tooltiptext = ��ウェブサイト�追加�権�を許�����。
 urlbar-switch-to-tab =
     .value = タブを表示:
-
 # Used to indicate that a selected autocomplete entry is provided by an extension.
 urlbar-extension =
     .value = 拡張機能:
-
 urlbar-go-button =
     .tooltiptext = アドレス�ー�入力�れ� URL �移動���
 urlbar-page-action-button =
@@ -502,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = マウス�インター��在� <span data-l10n-name="domain">{ $domain }</span> �制御�����。制御を�り戻����ESC キーを押������。
 pointerlock-warning-no-domain = マウス�インター��在���ページ�制御�����。制御を�り戻����ESC キーを押������。
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ����ブックマークを表示
+bookmarks-recent-bookmarks =
+    .value = 最近�ブックマーク
+bookmarks-toolbar-chevron =
+    .tooltiptext = 残り�ブックマークを表示���
+bookmarks-sidebar-content =
+    .aria-label = ブックマーク
+bookmarks-menu-button =
+    .label = ブックマークメニュー
+bookmarks-other-bookmarks-menu =
+    .label = 他�ブックマーク
+bookmarks-mobile-bookmarks-menu =
+    .label = モ�イル�ブックマーク
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークサイド�ーを隠�
+           *[other] ブックマークサイド�ーを表示
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークツール�ーを隠�
+           *[other] ブックマークツール�ーを表示
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ブックマークメニューをツール�ー�ら削除
+           *[other] ブックマークメニューをツール�ー�追加
+        }
+bookmarks-search =
+    .label = ブックマークを検索
+bookmarks-tools =
+    .label = ブックマークツール
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ブックマークツール�ー
+    .accesskey = B
+    .aria-label = ブックマーク
+bookmarks-toolbar-menu =
+    .label = ブックマークツール�ー
+bookmarks-toolbar-placeholder =
+    .title = ブックマークツール�ー�項目
+bookmarks-toolbar-placeholder-button =
+    .label = ブックマークツール�ー�項目
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ブックマーク
+library-bookmarks-bookmark-this-page =
+    .label = ��ページをブックマーク
+library-bookmarks-bookmark-edit =
+    .label = ��ブックマークを編集
+library-recent-activity-label = 最近�アクティビティ
+
+## More items
+
+more-menu-go-offline =
+    .label = オフライン作業
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/newtab/asrouter.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -280,3 +280,18 @@
 cfr-whatsnew-media-keys-header = メディア��作�充実
 cfr-whatsnew-media-keys-body = キーボードやヘッドセット�ら音声���映���生��止���るよ���り�他�タブ�ら������コンピューター�ロック�れ�状態�も簡��メディアを�作����。���進むキー�戻るキー�もトラックを移動��るよ���り���。
 cfr-whatsnew-media-keys-button = 詳細
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = アドレス�ー�検索ショートカット
+cfr-whatsnew-search-shortcuts-body = アドレス�ー�検索エンジン���特定�サイトを入力�る��検索候補�下���ショートカット�表示�れるよ���り���。ショートカットを�択�る��アドレス�ー�ら���検索����。
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = 悪���る supercookie を�断
+cfr-whatsnew-supercookies-body = ウェブサイト�密�� “supercookie� を発行�������手動� Cookie を消去����りウェブ����を追跡����。{ -brand-short-name } � supercookie �対�る強固��護を�供��サイトを���������オンライン�行動を追跡����よ�����。
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = よりよ�ブックマーク登録
+cfr-whatsnew-bookmarking-body = �気�入り�サイト�管��簡���り���。{ -brand-short-name } ��存��ブックマークを����好��場所�記憶��デフォルト設定��新�タブ�ブックマークツール�ーを表示��ツール�ー�フォルダー�ら他�ブックマーク�もアクセス��るよ���り���。
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/newtab/newtab.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -8,6 +8,10 @@
 newtab-settings-button =
     .title = 新�タブページをカスタマイズ
 
+newtab-personalize-button-label = パーソナライズ
+    .title = 新�タブをパーソナライズ
+    .aria-label = 新�タブをパーソナライズ
+
 ## Search box component.
 
 # "Search" is a verb/action
@@ -21,11 +25,18 @@
     .title = ウェブを検索
     .aria-label = ウェブを検索
 
+newtab-search-box-text = ウェブを検索
+newtab-search-box-input =
+    .placeholder = ウェブを検索
+    .aria-label = ウェブを検索
+
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = 検索エンジンを追加
 newtab-topsites-add-topsites-header = 新�トップサイト
+newtab-topsites-add-shortcut-header = 新�ショートカット
 newtab-topsites-edit-topsites-header = トップサイトを編集
+newtab-topsites-edit-shortcut-header = ショートカットを編集
 newtab-topsites-title-label = タイトル
 newtab-topsites-title-input =
     .placeholder = タイトルを入力
@@ -175,6 +186,7 @@
 
 newtab-section-header-topsites = トップサイト
 newtab-section-header-highlights = �イライト
+newtab-section-header-recent-activity = 最近�アクティビティ
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = { $provider } �����
@@ -212,3 +224,24 @@
 
 newtab-error-fallback-info = ��コンテンツ�読�込�中�何��題�発生����。
 newtab-error-fallback-refresh-link = ページを�読�込���も�一度試������。
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = ショートカット
+newtab-custom-shortcuts-subtitle = �存���訪���サイト
+newtab-custom-row-selector = { $num } 行
+newtab-custom-sponsored-sites = 広告ショートカット
+newtab-custom-pocket-title = { -pocket-brand-name } �����
+newtab-custom-pocket-subtitle = { -brand-product-name } ファミリーを構��る { -pocket-brand-name } �厳���注目�コンテンツ
+newtab-custom-pocket-sponsored = 広告ストーリー
+newtab-custom-recent-title = 最近�アクティビティ
+newtab-custom-recent-subtitle = 最近�サイト�コンテンツ�抜粋
+newtab-custom-close-button = 閉�る
+
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = スニペット
+newtab-custom-snippets-subtitle = { -vendor-short-name } � { -brand-product-name } �関�るヒント�最新情報
+newtab-custom-settings = 他�設定を管�
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/places.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/places.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/places.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -71,3 +71,7 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = サブフォルダー
+
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+  .label = 他�ブックマーク
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/preferences/preferences.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -627,12 +627,19 @@
 home-prefs-topsites-by-option-sponsored =
     .label = 広告トップサイト
 
+home-prefs-shortcuts-header =
+    .label = ショートカット
+home-prefs-shortcuts-description = �存���訪���サイト
+home-prefs-shortcuts-by-option-sponsored =
+    .label = 広告ショートカット
+
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = { $provider } �����
 home-prefs-recommended-by-description-update = { $provider } �ウェブ全体�ら厳���注目�コンテンツ
+home-prefs-recommended-by-description-new = { -brand-product-name } ファミリーを構��る { $provider } �厳���注目�コンテンツ
 ##
 
 home-prefs-recommended-by-learn-more = 使�方
@@ -651,6 +658,10 @@
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name } ��存�れ�ページ
 
+home-prefs-recent-activity-header =
+    .label = 最近�アクティビティ
+home-prefs-recent-activity-description = 最近�サイト�コンテンツ�抜粋
+
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -658,6 +669,9 @@
 home-prefs-snippets-header =
     .label = スニペット
 home-prefs-snippets-description = { -vendor-short-name } � { -brand-product-name } �関�る最新情報
+
+home-prefs-snippets-description-new = { -vendor-short-name } � { -brand-product-name } �関�るヒント�最新情報
+
 home-prefs-sections-rows-option =
     .label = { $num } 行
 
@@ -1121,10 +1135,18 @@
 addressbar-locbar-openpage-option =
     .label = 開���るタブ
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = ショートカット
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = トップサイト
     .accesskey = T
 
+addressbar-locbar-engines-option =
+    .label = 検索エンジン
+    .accesskey = a
+
 addressbar-suggestions-settings = 検索エンジン�検索候補�設定を変更
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -61,6 +61,16 @@
     .label = 新�タブ��
     .accesskey = O
 
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = 常�表示�る
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = 表示���
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = 新�タブ��表示�る
+    .accesskey = O
+
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = 他�ブックマークを表示
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/ja-JP-mac/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:05:45.000000000 +0000
@@ -32,7 +32,6 @@
 # be longer than the other existing status strings.
 blockedMalware				=��ファイル�ウイルスやマルウェア���れ����。
 blockedPotentiallyUnwanted		=��ファイル�����コンピューター�害を�����。
-blockedInsecure				=��ファイル�安全�ダウンロード����ん���。
 blockedPotentiallyInsecure		=潜在的�セキュリティ�題�より���ファイル�ダウンロード�れ��ん���。
 blockedUncommon2			=��ファイルを開����険��。
 
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/markers.properties firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/markers.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/markers.properties	2021-01-18 20:05:45.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS		=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE		=空�メモリー���
 marker.gcreason.label.CC_WAITING		=サイクルコレクション�よる実行
+marker.gcreason.label.CC_FINISHED		=サイクルコレクション完了
 marker.gcreason.label.CC_FORCED			=サイクルコレクション�よる実行
 marker.gcreason.label.LOAD_END			=ページ�読�込�完了
 marker.gcreason.label.PAGE_HIDE			=�ックグラウンド�移動
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/toolbox.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/toolbox.properties	2021-01-18 20:05:45.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip	=開発ツールを閉���
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip		=コンソールペインを表示
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/devtools/client/tooltips.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/devtools/client/tooltips.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -41,6 +41,10 @@
 
 inactive-outline-radius-when-outline-style-auto-or-none = ���素� <strong>outline-style</strong> � <strong>auto</strong> ��� <strong>none</strong> �����る���<strong>{ $property }</strong> ����素�影響を�����ん。
 
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> �テーブルを構��る�素�影響を�����ん。
+
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> �セル以外�テーブルを構��る�素�影響を�����ん。
+
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
@@ -71,6 +75,10 @@
 
 inactive-text-overflow-when-no-overflow-fix = <strong>overflow:hidden</strong> を追加��������。 { learn-more }
 
+inactive-css-not-for-internal-table-elements-fix = <strong>セル</strong>�<strong>列</strong>�<strong>行</strong>�<strong>列グループ</strong>�<strong>行グループ</strong> ��� <strong>フッターグループ</strong> 以外��素� <strong>display</strong> プロパティを設定��������。{ learn-more }
+
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = <strong>列</strong>�<strong>行</strong>�<strong>列グループ</strong>�<strong>行グループ</strong> ��� <strong>フッターグループ</strong> 以外��素� <strong>display</strong> プロパティを設定��������。{ learn-more }
+
 inactive-outline-radius-when-outline-style-auto-or-none-fix = <strong>outline-style</strong> プロパティ� <strong>auto</strong> ��� <strong>none</strong> 以外�値を設定��������。{ learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ja-JP-mac/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/dom/chrome/dom/dom.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/dom/chrome/dom/dom.properties	2021-01-18 20:05:45.000000000 +0000
@@ -422,3 +422,10 @@
 RequestStorageAccessUserGesture		=document.requestStorageAccess() ��ユーザー生��短期的�イベント�ンドラー�内部�ら���求�れ��。
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented		=Location API � History API �短時間�多数呼�出�れ����。
+FolderUploadPrompt.title		=アップロード�確�
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.message		=“%S� �ら�ファイルを���アップロード��もよ������？ ��サイトを信頼�る場���実行������。
+FolderUploadPrompt.acceptButtonLabel	=アップロード
+InputPickerBlockedNoUserActivation	=ユーザー�許��無����<input> ピッカー�ブロック�れ���。
+ExternalProtocolFrameBlockedNoUserActivation	=ユーザー�許��無����� iframe �最後�読�込�れ��ら�分�時間�経���������外部プロトコルを�� iframe �ブロック�れ���。
+MultiplePopupsBlockedNoUserActivation	=ユーザー�許��無����開�れよ����複数��ップアップ�ブロック�れ���。
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:45.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays	=æ—¥
 
 downloadErrorAlertTitle			=ダウンロードエラー
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy			=%S �よりブロック�れ���ダウンロードファイルを�存����ん���。
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension			=拡張機能�よりブロック�れ���ダウンロードファイルを�存����ん���。
 downloadErrorGeneric			=原因�明�エラー�発生����ダウンロードファイルを�存����ん���。\n\n�度試������。
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:45.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920		=プロキシーサー�ー��接続を拒��れ���
 check_error-2153390069		=サー�ー�証明書�有効期�を������ (コンピューター�日時�狂����ら正��設定������)
 check_error-verification_failed	=更新�完全性を確�����ん���
+check_error-move_failed		=更新�インストール�準備����ん���。
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -376,13 +376,6 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } � Mozilla �定��安全性�パフォーマンス�基準����る拡張機能��を�������
     .aria-label = { addon-badge-recommended2.title }
-
-addon-badge-line =
-  .title = ��拡張機能� { -brand-product-name } �製作者�より作��れ���
-  .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-  .title = ��拡張機能�安全を確��る��コードレビュー�行�れ���
-  .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
   .title = �れ� { -brand-product-name } �製作者�より作��れ�公��拡張機能��
   .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -57,6 +57,9 @@
 app-basics-build-config = ビルド設定
 app-basics-user-agent = ユーザーエージェント
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta Translated
 app-basics-memory-use = メモリー使用�
 app-basics-performance = パフォーマンス
 app-basics-service-workers = 登録�れ� Service Workers
@@ -180,6 +183,33 @@
 
 ##
 
+support-third-party-modules-title = サードパーティモジュール
+support-third-party-modules-module = モジュールファイル
+support-third-party-modules-version = ファイル��ージョン
+support-third-party-modules-vendor = ベンダー情報
+support-third-party-modules-occurrence = プロセス数
+support-third-party-modules-process = プロセスタイプ� ID
+support-third-party-modules-thread = スレッド
+support-third-party-modules-base = Imagebase アドレス
+support-third-party-modules-uptime = プロセス実行時間 (ms)
+support-third-party-modules-duration = 読�込��延 (ms)
+support-third-party-modules-empty = �サードパーティモジュール�読�込�れ��ん���。
+support-third-party-modules-no-value = (値��)
+support-third-party-modules-button-open =
+    .title = ファイル�場所を開�...
+support-third-party-modules-expand =
+    .title = 詳細情報を表示
+support-third-party-modules-collapse =
+    .title = 詳細情報を折り��む
+support-third-party-modules-unsigned-icon =
+    .title = ��モジュール�署���り��ん
+support-third-party-modules-folder-icon =
+    .title = ファイル�場所を開�...
+support-third-party-modules-down-icon =
+    .title = 詳細情報を表示
+support-third-party-modules-up-icon =
+    .title = 詳細情報を折り��む
+
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = �去 { $days } 日分�クラッシュレ�ート
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -118,3 +118,7 @@
 experimental-features-multi-pip =
     .label = ピク�ャーインピク�ャー�複数サ�ート
 experimental-features-multi-pip-description = 複数�ピク�ャーインピク�ャーウインドウを�時�開�るよ���る実験的�サ�ート��。
+
+experimental-features-http3 =
+    .label = HTTP/3 プロトコル
+experimental-features-http3-description = HTTP/3 プロトコル�実験的�サ�ート��。
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -2,15 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> � <strong>{ $scheme }</strong> �リンクを開��������。
-
 ## Permission Dialog
 ## Variables:
 ##  $host - the hostname that is initiating the request
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -39,6 +39,11 @@
     .value = ページ:
     .accesskey = a
 
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } / { $sheetCount }
+
 ## Variables
 ## $percent (integer) - menuitem percent label
 ## $arrow (String) - UTF-8 arrow character for navigation buttons
@@ -57,3 +62,12 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = 最後�ページを表示���
+
+printpreview-homearrow-button =
+    .title = 最��ページ
+printpreview-previousarrow-button =
+    .title = ��ページ
+printpreview-nextarrow-button =
+    .title = 次�ページ
+printpreview-endarrow-button =
+    .title = 最後�ページ
diff -Nru firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:42:11.000000000 +0000
+++ firefox-85.0+build1/l10n/ja-JP-mac/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:45.000000000 +0000
@@ -28,6 +28,10 @@
 # the start and end page of the range to print.
 printui-range-end = –
 
+printui-page-custom-range-input =
+  .aria-label = ページ範囲を入力������
+  .placeholder = 例: 2-6, 9, 12-16
+
 # Section title for the number of copies to print
 printui-copies-label = 部数
 
@@ -59,6 +63,8 @@
 printui-headers-footers-checkbox = ヘッダー�フッターをプリント�る
 printui-backgrounds-checkbox = 背景画�をプリント�る
 
+printui-selection-checkbox = �択範囲��をプリント�る
+
 printui-color-mode-label = カラーモード
 printui-color-mode-color = カラー
 printui-color-mode-bw = モノクロ
@@ -68,10 +74,15 @@
 printui-margins-min = 最少
 printui-margins-none = ��
 printui-margins-custom = カスタム
+printui-margins-custom-inches = カスタム (イン�)
 printui-margins-custom-top = 上
+printui-margins-custom-top-inches = 上 (イン�)
 printui-margins-custom-bottom = 下
+printui-margins-custom-bottom-inches = 下 (イン�)
 printui-margins-custom-left = å·¦
+printui-margins-custom-left-inches = 左 (イン�)
 printui-margins-custom-right = �
+printui-margins-custom-right-inches = � (イン�)
 
 printui-system-dialog-link = システムダイアログを使用��プリント...
 
@@ -79,6 +90,8 @@
 printui-primary-button-save = �存
 printui-cancel-button = キャンセル
 
+printui-close-button = 閉�る
+
 printui-loading = プレビュー�準備中��
 
 # Reported by screen readers and other accessibility tools to indicate that
@@ -86,6 +99,12 @@
 printui-preview-label =
     .aria-label = プリントプレビュー
 
+printui-pages-per-sheet = 1 枚��り�ページ数
+
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = プリント中...
+
 ## Paper sizes that may be supported by the Save to PDF destination:
 ## (^m^) /widget/nsPrinterListBase.cpp (Bug 1659781)
 
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ka/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/aboutLogins.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/aboutLogins.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = მ�ცილდეს ეს მ�ნ�ცემები?
 confirm-delete-dialog-message = ეს ქმედებ� შეუქცევ�დი�.
 about-logins-confirm-remove-dialog-confirm-button = მ�ცილებ�
-about-logins-confirm-remove-all-dialog-confirm-button = ყველ�ს მ�ცილებ�
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] მ�ცილებ�
+       *[other] ყველ�ს მ�ცილებ�
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] დი�ხ, წ�იშ�ლ�ს ეს �ნგ�რიში
@@ -201,6 +205,8 @@
 about-logins-confirm-export-dialog-title = მ�ნ�ცემების� დ� პ�რ�ლების გ�ტ�ნ�
 about-logins-confirm-export-dialog-message = თქვენი პ�რ�ლები შეინ�ხებ� წ�ს�კითხ ტექსტ�დ (მ�გ. BadP@ssw0rd) �სე რ�მ, ნებისმიერს შეეძლებ� მ�თი ნ�ხვ�, თუ გ�ტ�ნილ ფ�ილს გ�ხსნის.
 about-logins-confirm-export-dialog-confirm-button = გ�ტ�ნ�…
+about-logins-alert-import-title = გ�დმ�ტ�ნ� დ�სრულდ�
+about-logins-alert-import-message = იხილეთ სრულ�დ გ�დმ�ტ�ნის შეს�ხებ
 confirm-discard-changes-dialog-title = გ�უქმდეს შეუნ�ხ�ვი ცვლილებები?
 confirm-discard-changes-dialog-message = ყველ� შეუნ�ხ�ვი ცვლილებ� დ�იკ�რგებ�.
 confirm-discard-changes-dialog-confirm-button = გ�უქმებ�
@@ -262,3 +268,30 @@
         [macos] CSV-დ�კუმენტი
        *[other] CSV-ფ�ილი
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = გ�დმ�ტ�ნ� დ�სრულდ�
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>�ხ�ლი �ნგ�რიშები დ�ემ�ტ�:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>�ხ�ლი �ნგ�რიშები დ�ემ�ტ�:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>�რსებული �ნგ�რიშები გ�ნ�ხლდ�:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>�რსებული �ნგ�რიშები გ�ნ�ხლდ�:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>�ღმ�ჩენილი� იგივე �ნგ�რიშები:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+       *[other] <span>�ღმ�ჩენილი� იგივე �ნგ�რიშები:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nicht importiert)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>შეცდ�მები:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ვერ გ�დმ�ვიდ�)</span>
+       *[other] <span>შეცდ�მები:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ვერ გ�დმ�ვიდ�)</span>
+    }
+about-logins-import-dialog-done = მზ�დ��
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ka/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/appmenu.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/appmenu.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �ხ�ლი ფ�ნჯ�რ�
+appmenuitem-new-private-window =
+    .label = �ხ�ლი პირ�დი ფ�ნჯ�რ�
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = მი�ხლ�ებ�
 appmenuitem-zoom-reduce =
     .label = დ�შ�რებ�
+appmenuitem-fullscreen =
+    .label = სრული ეკრ�ნი
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = დ�სინქრ�ნებ� �ხლ�ვე
+appmenuitem-save-page =
+    .label = გვერდის შენ�ხვ� რ�გ�რც…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = რ� სი�ხლეები�
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ka/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/appMenuNotifications.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = �ხლ� �რ�
     .secondarybuttonaccesskey = �
 appmenu-update-restart-message = ხელ�ხლ� გ�შვების შემდეგ, { -brand-shorter-name } �ღ�დგენს თქვენს ყველ� გ�ხსნილ ჩ�ნ�რთს� დ� ფ�ნჯ�რ�ს, პირ�დი ჩ�ნ�რთების� დ� ფ�ნჯრების გ�რდ�.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ვერ �ხერხებს ბ�ლ� ვერსი�მდე გ�ნ�ხლებ�ს.
+    .buttonlabel = მ�ინც შეეც�დ�ს გ�ნ�ხლდეს { -brand-shorter-name }
+    .buttonaccesskey = გ
+    .secondarybuttonlabel = �ხლ� �რ�
+    .secondarybuttonaccesskey = �
+appmenu-update-other-instance-message = �ხ�ლი { -brand-shorter-name } ხელმის�წვდ�მი�, მ�გრ�მ ვერ ყენდებ�, რ�დგ�ნ გ�შვებული� სხვ� { -brand-shorter-name }. დ�ხურეთ გ�ნ�ხლების დ�ს�ყენებლ�დ �ნ �ირჩიეთ, მ�ინც გ�ნ�ხლებ� (უკვე გ�შვებულმ� შეს�ძლ�� ვერ იმუშ�ვ�ს, ხელ�ხლ� ჩ�რთვის გ�რეშე).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = კ�რგი, გ�ს�გები�
     .buttonaccesskey = გ
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/browser.ftl firefox-85.0+build1/l10n/ka/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/browser.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/browser.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> მ�რთ�ვს თქვენს მ�ჩვენებელს. მ�რთვის დ�ს�ბრუნებლ�დ დ��ჭირეთ Esc ღილ�კს.
 pointerlock-warning-no-domain = ეს დ�კუმენტი მ�რთ�ვს თქვენს მ�ჩვენებელს. მ�რთვის დ�ს�ბრუნებლ�დ დ��ჭირეთ Esc ღილ�კს.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ყველ� ს�ნიშნის ჩვენებ�
+bookmarks-recent-bookmarks =
+    .value = ბ�ლ�ს ჩ�ნიშნული
+bookmarks-toolbar-chevron =
+    .tooltiptext = სხვ� ს�ნიშნების გ�მ�ჩენ�ც
+bookmarks-sidebar-content =
+    .aria-label = ს�ნიშნები
+bookmarks-menu-button =
+    .label = ს�ნიშნების მენიუ
+bookmarks-other-bookmarks-menu =
+    .label = სხვ� ს�ნიშნები
+bookmarks-mobile-bookmarks-menu =
+    .label = მ�ბილურის ს�ნიშნები
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ს�ნიშნების გვერდითი ზ�ლის დ�მ�ლვ�
+           *[other] ს�ნიშნების გვერდითი ზ�ლის ჩვენებ�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ს�ნიშნების ხელს�წყ�თ� ზ�ლის დ�მ�ლვ�
+           *[other] ს�ნიშნების ხელს�წყ�თ� ზ�ლის ჩვენებ�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ს�ნიშნების მენიუს მ�ცილებ� ხელს�წყ�თ� ზ�ლიდ�ნ
+           *[other] ს�ნიშნების მენიუს დ�მ�ტებ� ხელს�წყ�თ� ზ�ლზე
+        }
+bookmarks-search =
+    .label = ს�ნიშნების ძიებ�
+bookmarks-tools =
+    .label = ს�ნიშნების ხელს�წყ�ები
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ს�ნიშნების ხელს�წყ�თ� ზ�ლი
+    .accesskey = ს
+    .aria-label = ს�ნიშნები
+bookmarks-toolbar-menu =
+    .label = ს�ნიშნების ხელს�წყ�თ� ზ�ლი
+bookmarks-toolbar-placeholder =
+    .title = ს�ნიშნების ზ�ლის ხელს�წყ�ები
+bookmarks-toolbar-placeholder-button =
+    .label = ს�ნიშნების ზ�ლის ხელს�წყ�ები
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ს�ნიშნები
+library-bookmarks-bookmark-this-page =
+    .label = გვერდის ჩ�ნიშვნ�
+library-bookmarks-bookmark-edit =
+    .label = ს�ნიშნის ჩ�სწ�რებ�
+library-recent-activity-label = ბ�ლ� მ�ქმედებები
+
+## More items
+
+more-menu-go-offline =
+    .label = კ�ვშირგ�რეშე რეჟიმი
+    .accesskey = კ
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ka/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/newtab/asrouter.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = �კრიფეთ ნ�კლები, მ�იძიეთ მეტი მის�მ�რთების ველიდ�ნ
 cfr-whatsnew-searchbar-body-topsites = �ხლ�, უბრ�ლ�დ გ�დ�დით მის�მ�რთების ველში დ� გ�მ�ჩნდებ� თქვენი რჩეული ს�იტების ბმულები.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = გ�მ�დიდებელი შუშის ხ�ტულ�
 
 ## Picture-in-Picture
@@ -192,7 +195,7 @@
     .accesskey = ხ
 cfr-doorhanger-socialtracking-dont-show-again = მ�მ�ვ�ლში, �ღ�რ გ�მ�ჩნდეს �სეთი შეტყ�ბინებ�
     .accesskey = ღ
-cfr-doorhanger-socialtracking-heading = { -brand-short-name } უზღუდ�ვს ს�ცი�ლური ქსელს თქვენს თვ�ლთვ�ლს
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } უზღუდ�ვს ს�ცი�ლურ ქსელს თქვენს თვ�ლთვ�ლს
 cfr-doorhanger-socialtracking-description = თქვენი პირ�დულ�ბ� მნიშვნელ�ვ�ნი�. { -brand-short-name } �ხლ� უკვე ზღუდ�ვს ცნ�ბილი ს�ცი�ლური ქსელების მეთვ�ლყურე ს�შუ�ლებებს, უს�ზღვრ�ვს მ�თ ინტერნეტში თქვენ შეს�ხებ შეს�გრ�ვებელი მ�ნ�ცემების �დენ�ბ�ს.
 cfr-doorhanger-fingerprinters-heading = { -brand-short-name } ზღუდ�ვს მ�მხმ�რებლის �მ�მცნ�ბს �მ ს�იტზე
 cfr-doorhanger-fingerprinters-description = თქვენი პირ�დულ�ბ� მნიშვნელ�ვ�ნი�. { -brand-short-name } �ხლ� უკვე ზღუდ�ვს მ�მხმ�რებლის �მ�მცნ�ბ ს�შუ�ლებებს, რ�მელთ�ც შეუძლი� თქვენი სხვებისგ�ნ გ�მ�რჩევ� თვ�ლის ს�დევნებლ�დ, თქვენზე შეგრ�ვებული მ�ნ�ცემებით.
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = ს�ძიებ�ს მ�ლს�ხმ�ბები მის�მ�რთების ველში
 cfr-whatsnew-search-shortcuts-body = �მიერიდ�ნ, რ�ც� �კრეფთ ს�ძიებ� სისტემის �ნ შეს�ბ�მისი ს�იტის ს�ხელს მის�მ�რთების ველში, გ�მ�ჩნდებ� ლურჯი მ�ლს�ხმ�ბი ქვემ�თ, ძიების შემ�თ�ვ�ზებებში. �ირჩიეთ მ�ლს�ხმ�ბი  ს�ძიებ�ს პირდ�პირ მის�მ�რთების ველიდ�ნ გ�მ�ს�ყენებლ�დ.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = დ�ცვ� მ�ვნე ფუნთუშებისგ�ნ
+cfr-whatsnew-supercookies-body = ს�იტებს შეუძლი� შეუმჩნევლ�დ მი�მ�გრ�ს ბრ�უზერს მძლ�ვრი „მ�ვნე ფუნთუშები“ რ�მლებიც დ�გედევნებ�თ მთელ ვებსივრცეში, ბრ�უზერის გ�სუფთ�ვების მიუხედ�ვ�დ�ც კი. { -brand-short-name } �ხლ� უკვე გთ�ვ�ზ�ბთ დ�ცვ�ს �მგვ�რი ფუნთუშებისგ�ნ, რის შედეგ�დ�ც შეუძლებელი გ�ხდებ� ინტერნეტს�იტებზე თქვენი მ�ქმედებების �ღრიცხვ�.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = გ�უმჯ�ბესებული ს�ნიშნები
+cfr-whatsnew-bookmarking-body = ს�ყვ�რელ ს�იტებზე თვ�ლის მიდევნებ� გ��დვილდ�. { -brand-short-name } �ხლ� უკვე დ�იხს�მებს თქვენ მიერ შერჩეულ �დგილს ს�ნიშნების შეს�ნ�ხ�დ, ნ�გულისხმევ�დ გ�მ��ჩენს ს�ნიშნების ზ�ლს �ხ�ლ ჩ�ნ�რთებზე დ� მ�გცემთ მ�რტივი წვდ�მის ს�შუ�ლებ�ს დ�ნ�რჩენ ს�ნიშნებთ�ნ, ხელს�წყ�თ� ზ�ლის ს�ქ�ღ�ლდიდ�ნ.
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ka/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/newtab/newtab.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ხ�ლი ჩ�ნ�რთი
 newtab-settings-button =
     .title = მ�ირგეთ �ხ�ლი ჩ�ნ�რთის გვერდი
+newtab-personalize-button-label = მ�რგებ�
+    .title = �ხ�ლი ჩ�ნ�რთის მ�რგებ�
+    .aria-label = �ხ�ლი ჩ�ნ�რთის მ�რგებ�
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = ინტერნეტში ძიებ�
     .title = ინტერნეტში ძიებ�
     .aria-label = ინტერნეტში ძიებ�
+newtab-search-box-text = ინტერნეტში ძიებ�
+newtab-search-box-input =
+    .placeholder = ინტერნეტში ძიებ�
+    .aria-label = ინტერნეტში ძიებ�
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = ს�ძიებ� სისტემის დ�მ�ტებ�
 newtab-topsites-add-topsites-header = �ხ�ლი ს�იტი რჩეულებში
+newtab-topsites-add-shortcut-header = �ხ�ლი მ�ლს�ხმ�ბი
 newtab-topsites-edit-topsites-header = რჩეული ს�იტის ჩ�სწ�რებ�
+newtab-topsites-edit-shortcut-header = მ�ლს�ხმ�ბის ჩ�სწ�რებ�
 newtab-topsites-title-label = დ�ს�ხელებ�
 newtab-topsites-title-input =
     .placeholder = ს�თ�ურის შეყვ�ნ�
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = ს�მწუხ�რ�დ, შიგთ�ვსის ჩ�ტვირთვის�ს რ�ღ�ც ხ�რვეზი წ�რმ�იქმნ�.
 newtab-error-fallback-refresh-link = გ�ნ��ხლეთ გვერდი დ� სც�დეთ ხელ�ხლ�.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = მ�ლს�ხმ�ბები
+newtab-custom-shortcuts-subtitle = ს�იტები, რ�მლებს�ც ინ�ხ�ვთ �ნ სტუმრ�ბთ
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } რიგი
+       *[other] { $num } რიგი
+    }
+newtab-custom-sponsored-sites = დ�ფინ�ნსებული მ�ლს�ხმ�ბები
+newtab-custom-pocket-title = გთ�ვ�ზ�ბთ { -pocket-brand-name }
+newtab-custom-pocket-subtitle = გ�მ�რჩეული მ�ს�ლები, რ�მელს�ც { -pocket-brand-name } გთ�ვ�ზ�ბთ, { -brand-product-name }-�ჯ�ხის ნ�წილი.
+newtab-custom-pocket-sponsored = დ�ფინ�ნსებული �მბები
+newtab-custom-recent-title = ბ�ლ� მ�ქმედებები
+newtab-custom-recent-subtitle = შერჩეული ბ�ლ�ს ნ�ნ�ხი ს�იტების� დ� მ�ს�ლებიდ�ნ
+newtab-custom-close-button = დ�ხურვ�
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = ცნ�ბები
+newtab-custom-snippets-subtitle = რჩევები დ� სი�ხლეები, რ�მელთ�ც გთ�ვ�ზ�ბთ { -vendor-short-name } დ� { -brand-product-name }
+newtab-custom-settings = დ�მ�ტებითი პ�რ�მეტრების მ�რთვ�
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/places.ftl firefox-85.0+build1/l10n/ka/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/places.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/places.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = ქვეს�ქ�ღ�ლდე
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = სხვ� ს�ნიშნები
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ka/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/preferences/preferences.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = ხშირ�დ მ�ნ�ხულებული ს�იტები
 home-prefs-topsites-by-option-sponsored =
     .label = დ�ფინ�ნსებული რჩეული ს�იტები
+home-prefs-shortcuts-header =
+    .label = მ�ლს�ხმ�ბები
+home-prefs-shortcuts-description = ს�იტები, რ�მლებს�ც ინ�ხ�ვთ �ნ სტუმრ�ბთ
+home-prefs-shortcuts-by-option-sponsored =
+    .label = დ�ფინ�ნსებული მ�ლს�ხმ�ბები
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } გირჩევთ
 home-prefs-recommended-by-description-update = გ�მ�რჩეული მ�ს�ლები ინტერნეტში, უზრუნველყ�ფს { $provider }
+home-prefs-recommended-by-description-new = გ�მ�რჩეული მ�ს�ლები, რ�მელს�ც { $provider } გთ�ვ�ზ�ბთ, { -brand-product-name }-�ჯ�ხის ნ�წილი.
 
 ##
 
@@ -515,8 +521,6 @@
     .label = დ�ფინ�ნსებული სტ�ტიები
 home-prefs-highlights-header =
     .label = მნიშვნელ�ვ�ნი ს�იტები
-home-prefs-recent-activity-header =
-    .label = ბ�ლ� მ�ქმედებები
 home-prefs-highlights-description = თქვენ მიერ შენ�ხული �ნ ბ�ლ�ს მ�ნ�ხულებული ს�იტები
 home-prefs-highlights-option-visited-pages =
     .label = მ�ნ�ხულებული გვერდები
@@ -526,6 +530,9 @@
     .label = ბ�ლ� ჩ�მ�ტვირთვები
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }-ში შენ�ხული გვერდები
+home-prefs-recent-activity-header =
+    .label = ბ�ლ� მ�ქმედებები
+home-prefs-recent-activity-description = შერჩეული ბ�ლ�ს ნ�ნ�ხი ს�იტების� დ� მ�ს�ლებიდ�ნ
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = ცნ�ბები
 home-prefs-snippets-description = სი�ხლეები, რ�მელთ�ც გთ�ვ�ზ�ბთ { -vendor-short-name } დ� { -brand-product-name }
+home-prefs-snippets-description-new = რჩევები დ� სი�ხლეები, რ�მელთ�ც გთ�ვ�ზ�ბთ { -vendor-short-name } დ� { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = გ�ხსნილი ჩ�ნ�რთები
     .accesskey = გ
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = მ�ლს�ხმ�ბები
+    .accesskey = მ
 addressbar-locbar-topsites-option =
     .label = რჩეული ს�იტები
     .accesskey = ჩ
+addressbar-locbar-engines-option =
+    .label = ს�ძიებ� სისტემები
+    .accesskey = ე
 addressbar-suggestions-settings = ს�ძიებ� სისტემის შემ�თ�ვ�ზებების პ�რ�მეტრები
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/protections.ftl firefox-85.0+build1/l10n/ka/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/protections.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/protections.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -9,7 +9,6 @@
         [one] �მ დღეებში { $count } მეთვ�ლყურე� �ღმ�ჩენილი, რ�მელს�ც ზღუდ�ვს { -brand-short-name }
        *[other] �მ დღეებში { $count } მეთვ�ლყურე� �ღმ�ჩენილი, რ�მელთ�ც ზღუდ�ვს { -brand-short-name }
     }
-
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
@@ -19,57 +18,43 @@
         [one] <b>{ $count }</b> მეთვ�ლყურე� შეზღუდული თ�რიღიდ�ნ { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
        *[other] <b>{ $count }</b> მეთვ�ლყურე� შეზღუდული თ�რიღიდ�ნ { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
-
 # Text displayed instead of the graph when in Private Mode
 graph-private-window = { -brand-short-name } გ�ნ�გრძ�ბს მეთვ�ლყურეების შეზღუდვ�ს პირ�დ ჩ�ნ�რთებში, თუმც� �რ �ღრიცხ�ვს, რ� შეიზღუდ�.
 # Weekly summary of the graph when the graph is empty in Private Mode
 graph-week-summary-private-window = მეთვ�ლყურეები, რ�მელთ�ც ზღუდ�ვდ� { -brand-short-name } �მ კვირ�ში
-
 protection-report-webpage-title = დ�ცვის მ�ჩვენებლები
 protection-report-page-content-title = დ�ცვის მ�ჩვენებლები
 # This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
 protection-report-page-summary = { -brand-short-name } იც�ვს თქვენს უს�ფრთხ�ებ�ს შეუმჩნევლ�დ, გვერდების თვ�ლიერების�ს. �ქ იხილ�ვთ თქვენთვის გ�ნკუთვნილ დ�ცვის მ�ჩვენებლებს� დ� ს�შუ�ლებებს, რ�მლებით�ც შეძლებთ ს�კუთ�რი ინტერნეტცხ�ვრების მ�რთვის ს�დ�ვეების ხელში �ღებ�ს.
 # This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
 protection-report-page-summary-default = { -brand-short-name } იც�ვს თქვენს უს�ფრთხ�ებ�ს შეუმჩნევლ�დ, გვერდების თვ�ლიერების�ს. �ქ იხილ�ვთ თქვენთვის გ�ნკუთვნილ დ�ცვის მ�ჩვენებლებს� დ� ს�შუ�ლებებს, რ�მლებით�ც შეძლებთ ს�კუთ�რი ინტერნეტცხ�ვრების მ�რთვის ს�დ�ვეების ხელში �ღებ�ს.
-
 protection-report-settings-link = პირ�დულ�ბის� დ� უს�რთხ�ების პ�რ�მეტრები
-
 etp-card-title-always = თვ�ლთვ�ლისგ�ნ გ�ძლიერებული დ�ცვ�: მუდმივ�დ ჩ�რთული�
 etp-card-title-custom-not-blocking = თვ�ლთვ�ლისგ�ნ გ�ძლიერებული დ�ცვ�: გ�მ�რთული�
 etp-card-content-description = { -brand-short-name } �ვტ�მ�ტურ�დ უზღუდ�ვს კ�მპ�ნიებს, თქვენს მ�ქმედებებზე ფ�რულ�დ თვ�ლის მიდევნების ს�შუ�ლებ�ს ვებსივრცეში.
 protection-report-etp-card-content-custom-not-blocking = დ�ცვ� სრულ�დ გ�მ�რთული� �მჟ�მ�დ. უს�ფრთხ�ების პ�რ�მეტრებიდ�ნ შე�რჩიეთ მეთვ�ლყურეები, რ�მელთ�ც შეზღუდ�ვს { -brand-short-name }.
 protection-report-manage-protections = პ�რ�მეტრების მ�რთვ�
-
 # 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 = დღეს
-
 # This string is used to describe the graph for screenreader users.
 graph-legend-description = გ�მ�ს�ხულებ�ზე მ�ცემული� თით�ეული ს�ხის მეთვ�ლყურის რ��დენ�ბ� ჯ�მურ�დ, რ�მლებიც �მ კვირ�ში შეიზღუდ�.
-
 social-tab-title = ს�ცი�ლური ქსელის მეთვ�ლყურეები
 social-tab-contant = ს�ცი�ლური ქსელები �თ�ვსებს მეთვ�ლყურეებს სხვ� ს�იტებზე, რ�მ თვ�ლი გ�დევნ�ნ ინტერნეტში. ეს ს�შუ�ლებ�ს �ძლევს მ�თ მფლ�ბელ დ�წესებულებებს, იმ�ზე მეტი რ�მ შეიტყ�ნ თქვენ შეს�ხებ, ვიდრე �მ ს�ცი�ლურ ქსელში გ�ქვთ გ�ზი�რებული. <a data-l10n-name="learn-more-link">ვრცლ�დ</a>
-
 cookie-tab-title = ს�იტთ�შ�რისი მეთვ�ლყურე ფუნთუშები
-cookie-tab-content = ეს ფუნთუშები თ�ნ დ�გყვებ�თ ს�იტებზე დ� �გრ�ვებს მ�ნ�ცემებს, თუ რ�ს �კეთებთ ინტერნეტში. მ�თ იყენებს გ�რეშე მხ�რეები, ს�რეკლ�მ� დ� კვლევითი დ�წესებულებები. ს�იტთ�შ�რისი მეთვ�ლყურე ფუნთუშების შეზღუდვ�, �მცირებს თვ�ლის მდევნელ რეკლ�მებს თქვენ გ�რშემ�. <a data-l10n-name="learn-more-link">ვრცლ�დ</a>
-
+cookie-tab-content = ეს ფუნთუშები თ�ნ დ�გყვებ�თ ს�იტებზე დ� �გრ�ვებს მ�ნ�ცემებს, თუ რ�ს �კეთებთ ინტერნეტში. მ�თ იყენებს გ�რეშე მხ�რეები, ს�რეკლ�მ� დ� კვლევითი დ�წესებულებები. ს�იტთ�შ�რისი მეთვ�ლყურე ფუნთუშების შეზღუდვ�, �მცირებს თვ�ლის მდევნელ რეკლ�მებს თქვენ ირგვლივ. <a data-l10n-name="learn-more-link">ვრცლ�დ</a>
 tracker-tab-title = თვ�ლის მდევნელი შიგთ�ვსი
 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>
-
 cryptominer-tab-title = კრიპტ�ვ�ლუტის გ�მ�მმუშ�ვებლები
 cryptominer-tab-content = კრიპტ�ვ�ლუტის გ�მ�მმუშ�ვებლები ს�რგებლ�ბს თქვენი სისტემის გ�მ�თვლის სიმძლ�ვრით ციფრული ფულის მ�ს�პ�ვებლ�დ. �მგვ�რი კ�დები �სუსტებს ბ�ტ�რე�ს, �ნელებს კ�მპიუტერს დ� ზრდის დენის დ�ნ�ხ�რჯს. <a data-l10n-name="learn-more-link">ვრცლ�დ</a>
-
 protections-close-button2 =
     .aria-label = დ�ხურვ�
     .title = დ�ხურვ�
-  
 mobile-app-title = შეზღუდეთ ს�რეკლ�მ� მეთვ�ლყურეები მეტ მ�წყ�ბილ�ბ�ზე
 mobile-app-card-content = გ�მ�იყენეთ მ�ბილური ბრ�უზერი ჩ�შენებული დ�ცვით, ს�რეკლ�მ� მეთვ�ლყურეებისგ�ნ.
 mobile-app-links = { -brand-product-name } ბრ�უზერი <a data-l10n-name="android-mobile-inline-link">Android-ს�</a> დ� <a data-l10n-name="ios-mobile-inline-link">iOS-ზე</a>
-
 lockwise-title = �ღ�რ�სდრ�ს დ�კ�რგ�ვთ პ�რ�ლებს
 lockwise-title-logged-in2 = პ�რ�ლების მ�რთვ�
 lockwise-header-content = { -lockwise-brand-name } უს�ფრთხ�დ შეინ�ხ�ვს თქვენს პ�რ�ლებს ბრ�უზერში.
@@ -81,7 +66,6 @@
 lockwise-mobile-app-title = თ�ნ წ�იყ�ლეთ პ�რ�ლები ყველგ�ნ
 lockwise-no-logins-card-content = თქვენს პ�რ�ლებს შეინ�ხ�ვს { -brand-short-name } ნებისმიერ მ�წყ�ბილ�ბ�ზე.
 lockwise-app-links = { -lockwise-brand-name }<a data-l10n-name="lockwise-android-inline-link">Android-ს�</a> დ� <a data-l10n-name="lockwise-ios-inline-link">iOS-ზე</a>
-
 # Variables:
 # $count (Number) - Number of passwords exposed in data breaches.
 lockwise-scanned-text-breached-logins =
@@ -89,7 +73,6 @@
         [one] 1 პ�რ�ლი, შეს�ძლ�� გ�მჟღ�ვნებულიყ� მიტ�ცების�ს.
        *[other] { $count } პ�რ�ლი, შეს�ძლ�� გ�მჟღ�ვნებულიყ� მიტ�ცების�ს.
     }
-
 # While English doesn't use the number in the plural form, you can add $count to your language
 # if needed for grammatical reasons.
 # Variables:
@@ -100,10 +83,8 @@
        *[other] თქვენი პ�რ�ლები ინ�ხებ� უს�ფრთხ�დ
     }
 lockwise-how-it-works-link = რ�გ�რ მუშ��ბს
-
 turn-on-sync = ჩ�რთეთ { -sync-brand-short-name }…
     .title = იხილეთ სინქრ�ნიზ�ციის პ�რ�მეტრები
-
 monitor-title = თვ�ლი �დევნეთ მ�ნ�ცემების მიტ�ცების შემთხვევებს
 monitor-link = რ�გ�რ მუშ��ბს
 monitor-header-content-no-account = გ�მ�ც�დეთ { -monitor-brand-name } დ� ნ�ხეთ, თქვენი ინფ�რმ�ცი� �ღმ�ჩენილი� თუ �რ� ცნ�ბილ მიტ�ცებულ მ�ნ�ცემებს შ�რის დ� მიიღეთ შეტყ�ბინებები, �ხ�ლი შემთხვევების შეს�ხებ.
@@ -111,14 +92,12 @@
 monitor-sign-up-link = გ�მ�იწერეთ ცნ�ბები, მ�ნ�ცემების მიტ�ცებებზე
     .title = გ�მ�იწერეთ { -monitor-brand-name } ცნ�ბები, მ�ნ�ცემების მიტ�ცებებზე
 auto-scan = �ვტ�მ�ტურ�დ გ�დ�მ�წმებული დღეს
-
 monitor-emails-tooltip =
     .title = ელფ�სტებზე, რ�მლებიც მ�წმდებ� იხილეთ { -monitor-brand-short-name }
 monitor-breaches-tooltip =
     .title = ცნ�ბილი მიტ�ცებების შეს�ხებ, იხილეთ { -monitor-brand-short-name }
 monitor-passwords-tooltip =
     .title = გ�მჟღ�ვნებული პ�რ�ლების შეს�ხებ, იხილეთ { -monitor-brand-short-name }
-
 # 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.
@@ -127,7 +106,6 @@
         [one] ელფ�სტის მის�მ�რთი ზედ�მხედველ�ბის ქვეშ��
        *[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.
@@ -136,7 +114,6 @@
         [one] ცნ�ბილ მიტ�ცებულ მ�ნ�ცემებში� �ღმ�ჩენილი თქვენი ინფ�რმ�ცი�
        *[other] ცნ�ბილ მიტ�ცებულ მ�ნ�ცემებში� �ღმ�ჩენილი თქვენი ინფ�რმ�ცი�
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -145,7 +122,6 @@
         [one] მ�ნ�ცემთ� ცნ�ბილი მიტ�ცებ�, �ღნიშნული� გ�მ�სწ�რებულ�დ
        *[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.
@@ -154,7 +130,6 @@
         [one] პ�რ�ლი� გ�მჟღ�ვნებული, მ�ნ�ცემების მიტ�ცების შემთხვევების შედეგ�დ
        *[other] პ�რ�ლი� გ�მჟღ�ვნებული, მ�ნ�ცემების მიტ�ცების შემთხვევების შედეგ�დ
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -163,7 +138,6 @@
         [one] პ�რ�ლი� მიტ�ცებული, რ�მელიც გ�მ�ს�სწ�რებელი�
        *[other] პ�რ�ლი� მიტ�ცებული, რ�მელიც გ�მ�ს�სწ�რებელი�
     }
-
 monitor-no-breaches-title = მშვენიერი �მბ�ვი!
 monitor-no-breaches-description = თქვენი მ�ნ�ცემები �რ�� მიტ�ცებული. თუ რ�მე შეიცვლებ�, გ�ცნ�ბებთ.
 monitor-view-report-link = �ნგ�რიშის ნ�ხვ�
@@ -174,7 +148,6 @@
     .title = მიტ�ცებული მ�ნ�ცემების მ�რთვ� – { -monitor-brand-short-name }
 monitor-breaches-resolved-title = მშვენიერი�! ყველ� მიტ�ცებული მ�ნ�ცემი გ�მ�სწ�რებული�.
 monitor-breaches-resolved-description = თუ თქვენი ელფ�სტ� �ღმ�ჩნდებ� �ხ�ლ მიტ�ცებებში, გ�ცნ�ბებთ.
-
 # Variables:
 # $numBreachesResolved (Number) - Number of breaches marked as resolved by the user on Monitor.
 # $numBreaches (Number) - Number of breaches in which a user's data was involved, detected by Monitor.
@@ -183,11 +156,9 @@
         [one] { $numBreachesResolved } მიტ�ცებ� { $numBreaches }-იდ�ნ �ღნიშნული� გ�მ�სწ�რებულ�დ
        *[other] { $numBreachesResolved } მიტ�ცებ� { $numBreaches }-იდ�ნ �ღნიშნული� გ�მ�სწ�რებულ�დ
     }
-
 # Variables:
 # $percentageResolved (Number) - Percentage of breaches marked as resolved by a user on Monitor.
 monitor-partial-breaches-percentage = { $percentageResolved }% შესრულებული�
-
 monitor-partial-breaches-motivation-title-start = დ�ს�წყისისთვის მშვენიერი�!
 monitor-partial-breaches-motivation-title-middle = �სე გ�ნ�გრძეთ!
 monitor-partial-breaches-motivation-title-end = თითქმის მზ�დ��! გ�ნ�გრძეთ.
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ka/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ka/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = მხ�ლ�დ �ხ�ლ ჩ�ნ�რთში
     .accesskey = მ
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = ყ�ველთვის გ�მ�ჩნდეს
+    .accesskey = ყ
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = �რ�სდრ�ს გ�მ�ჩნდეს
+    .accesskey = �
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = მხ�ლ�დ �ხ�ლ ჩ�ნ�რთში გ�მ�ჩნდეს
+    .accesskey = ხ
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = სხვ� ს�ნიშნების ჩვენებ�
     .accesskey = ჩ
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/extensions/report-site-issue/webcompat.properties firefox-85.0+build1/l10n/ka/browser/extensions/report-site-issue/webcompat.properties
--- firefox-84.0.2+build1/l10n/ka/browser/extensions/report-site-issue/webcompat.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/extensions/report-site-issue/webcompat.properties	2021-01-18 20:05:51.000000000 +0000
@@ -4,7 +4,7 @@
 
 # LOCALIZATION NOTE(wc-reporter.label2): This string will be used in the
 # Firefox page actions menu. Localized length should be considered.
-wc-reporter.label2=მ�ხსენებ� ს�იტი ხ�რვეზის შეს�ხებ…
+wc-reporter.label2=ს�იტის ხ�რვეზის მ�ხსენებ�…
 # LOCALIZATION NOTE(wc-reporter.tooltip): A site compatibility issue is
 # a website bug that exists in one browser (Firefox), but not another.
 wc-reporter.tooltip=მ�ხსენებ�, ს�იტთ�ნ �რ�თ�ვსებ�დ�ბის შეს�ხებ
diff -Nru firefox-84.0.2+build1/l10n/ka/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/ka/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/ka/browser/pdfviewer/viewer.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/browser/pdfviewer/viewer.properties	2021-01-18 20:05:51.000000000 +0000
@@ -91,18 +91,18 @@
 # will be replaced by the PDF file size in megabytes, respectively in bytes.
 document_properties_mb={{size_mb}} მბ ({{size_b}} ბ�იტი)
 document_properties_title=ს�თ�ური:
-document_properties_author=შემდგენი:
+document_properties_author=შემქმნელი:
 document_properties_subject=თემ�:
 document_properties_keywords=ს�კვ�ნძ� სიტყვები:
-document_properties_creation_date=შექმნის თ�რიღი:
-document_properties_modification_date=ჩ�სწ�რების თ�რიღი:
+document_properties_creation_date=შექმნის დრ�:
+document_properties_modification_date=ჩ�სწ�რების დრ�:
 # LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
 # will be replaced by the creation/modification date, and time, of the PDF file.
 document_properties_date_string={{date}}, {{time}}
 document_properties_creator=გ�მ�მშვები:
 document_properties_producer=PDF-გ�მ�მშვები:
 document_properties_version=PDF-ვერსი�:
-document_properties_page_count=გვერდების რ��დენ�ბ�:
+document_properties_page_count=გვერდები:
 document_properties_page_size=გვერდის ზ�მ�:
 document_properties_page_size_unit_inches=დუიმი
 document_properties_page_size_unit_millimeters=მმ
@@ -140,7 +140,7 @@
 toggle_sidebar_notification.title=გვერდით� ზ�ლის ჩ�რთვ�/გ�მ�რთვ� (დ�კუმენტი შეიც�ვს ს�რჩევს/დ�ნ�რთს)
 toggle_sidebar_notification2.title=გვერდითი ზ�ლის გ�დ�რთვ� (�ხლ�ვს მ�ხ�ზულ�ბ�/დ�ნ�რთი/ფენები)
 toggle_sidebar_label=გვერდით� ზ�ლის გ�მ�ჩენ�/დ�მ�ლვ�
-document_outline.title=დ�კუმენტის ს�რჩევის ჩვენებ� (�რჯერ დ�წკ�პებით ყველ� ელემენტის ჩ�მ�შლ�/�კეცვ�)
+document_outline.title=დ�კუმენტის ს�რჩევის ჩვენებ� (�რმ�გი წკ�პით თით�ეულის ჩ�მ�შლ�/�კეცვ�)
 document_outline_label=დ�კუმენტის ს�რჩევი
 attachments.title=დ�ნ�რთების ჩვენებ�
 attachments_label=დ�ნ�რთები
diff -Nru firefox-84.0.2+build1/l10n/ka/devtools/client/markers.properties firefox-85.0+build1/l10n/ka/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ka/devtools/client/markers.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/devtools/client/markers.properties	2021-01-18 20:05:51.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/ka/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ka/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ka/devtools/client/toolbox.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/devtools/client/toolbox.properties	2021-01-18 20:05:51.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Show Split Console
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ka/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ka/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ka/devtools/client/tooltips.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/devtools/client/tooltips.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> has no effect on internal table elements.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> has no effect on internal table elements except table cells.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Try removing <strong>float</strong> or adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Try setting its <strong>position</strong> property to something other than <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Try setting its <strong>display</strong> property to something else than <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Try setting its <strong>display</strong> property to something else than <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/ka/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ka/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ka/dom/chrome/dom/dom.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/dom/chrome/dom/dom.properties	2021-01-18 20:05:51.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input> შემრჩევი შეიზღუდ� მ�მხმ�რებლის ჩ�ურევლ�ბის გ�მ�.
 ExternalProtocolFrameBlockedNoUserActivation=გ�რეშე �ქმის მქ�ნე Iframe შეიზღუდ� მ�მხმ�რებლის ჩ�ურევლ�ბის �ნ იმის გ�მ�, რ�მ �რ �რ�ს�კმ�რისი დრ� გ�ვიდ�, �მგვ�რი iframe-ის ჩ�ტვირთვიდ�ნ.
 MultiplePopupsBlockedNoUserActivation=რ�მდენიმე �მ�მხტ�მი შეიზღუდ� მ�მხმ�რებლის ჩ�ურევლ�ბის გ�მ�.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=წინ�სწ�რ ჩ�ტვირთვ� %S მ�ს�ლის უგულებელყ�ფილი�, ვინ�იდ�ნ მნიშვნელ�ბები „as“ დ� „type“ უცნ�ბი�, �ნ �რ ემთხვევ� თვისებ� „media“.
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ka/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ka/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:51.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=დღე;დღე
 
 downloadErrorAlertTitle=ჩ�მ�ტვირთვის შეცდ�მ�
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=ჩ�მ�ტვირთვ� ვერ შეინ�ხ�, ვინ�იდ�ნ ზღუდ�ვს %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=ჩ�მ�ტვირთვ� ვერ შეინ�ხ�, ვინ�იდ�ნ ზღუდ�ვს გ�ფ�რთ�ებ�.
 downloadErrorGeneric=ჩ�მ�ტვირთვ� ვერ შეინ�ხებ� უცნ�ბი შეცდ�მის გ�მ�.\n\nგთხ�ვთ კვლ�ვ სც�დ�თ.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ka/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ka/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:51.000000000 +0000
@@ -16,7 +16,7 @@
 restartNowButton=გ�უშვით ხელ�ხლ� %S
 restartNowButton.accesskey=ხ
 
-statusFailed=ჩ�დგმ� �რ შედგ�
+statusFailed=ვერ ჩ�იდგ�
 
 installSuccess=გ�ნ�ხლებ� წ�რმ�ტებით ჩ�იდგ�
 installPending=ჩ�დგმ� ყ�ვნდებ�
@@ -42,3 +42,4 @@
 check_error-2152398920=კ�ვშირი პრ�ქსი სერვერთ�ნ უ�რყ�ფილი�
 check_error-2153390069=სერვერის სერტიფიკ�ტის ვ�დ� გ�სული� (გთხ�ვთ გ�მ�რთ�თ თქვენი სისტემური ს��თი მიმდინ�რე თ�რიღის� დ� დრ�ის მიხედვით)
 check_error-verification_failed=�მ გ�ნ�ხლების მთლი�ნ�ბის შემ�წმებ� ვერ ხერხდებ�
+check_error-move_failed=გ�ნ�ხლებ� ვერ მ�მზ�დდ� ჩ�დგმისთვის
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ka/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = გ�რეშე მ�დულები
+support-third-party-modules-module = მ�დულის ფ�ილი
+support-third-party-modules-version = ფ�ილის ვერსი�
+support-third-party-modules-vendor = მწ�რმ�ებლის შეს�ხებ
+support-third-party-modules-occurrence = სიხშირე
+support-third-party-modules-process = პრ�ცესის ს�ხე�ბ� დ� ID
+support-third-party-modules-thread = ნ�კ�დი
+support-third-party-modules-base = გ�მ�ს�ხულების კრებულთ� მის�მ�რთი
+support-third-party-modules-uptime = პრ�ცესის მუშ��ბის დრ� (მწმ)
+support-third-party-modules-duration = ჩ�ტვირთვის ხ�ნგრძლივ�ბ� (მწმ)
+support-third-party-modules-empty = გ�რეშე მ�დულები �რ ჩ�ტვირთულ�.
+support-third-party-modules-no-value = (მნიშვნელ�ბის გ�რეშე)
+support-third-party-modules-button-open =
+    .title = მდებ�რე�ბის გ�ხსნ�...
+support-third-party-modules-expand =
+    .title = ვრცელი მ�ნ�ცემების ჩვენებ�
+support-third-party-modules-collapse =
+    .title = ვრცელი მ�ნ�ცემები დ�მ�ლვ�
+support-third-party-modules-unsigned-icon =
+    .title = ეს მ�დული ხელმ�უწერელი�
+support-third-party-modules-folder-icon =
+    .title = მდებ�რე�ბის გ�ხსნ�...
+support-third-party-modules-down-icon =
+    .title = ვრცელი მ�ნ�ცემების ჩვენებ�
+support-third-party-modules-up-icon =
+    .title = ვრცელი მ�ნ�ცემები დ�მ�ლვ�
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ka/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = რ�მდენიმე ეკრ�ნი-ეკრ�ნში მხ�რდ�ჭერ�
 experimental-features-multi-pip-description = ს�ცდელი შეს�ძლებლ�ბ�, რ�მელიც ეკრ�ნი-ეკრ�ნში რეჟიმით, ერთდრ�ულ�დ რ�მდენიმე ფ�ნჯრის გ�მ�ტ�ნის ს�შუ�ლებ�ს იძლევ�.
+experimental-features-http3 =
+    .label = HTTP/3-�ქმი
+experimental-features-http3-description = ს�ცდელი მხ�რდ�ჭერ� HTTP/3-�ქმის.
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ka/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = გვერდი:
     .accesskey = გ
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } გვერდი { $sheetCount }-იდ�ნ
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = ბ�ლ� გვერდი
-
+printpreview-homearrow-button =
+    .title = პირველი გვერდი
+printpreview-previousarrow-button =
+    .title = წინ� გვერდი
+printpreview-nextarrow-button =
+    .title = მ�მდევნ� გვერდი
+printpreview-endarrow-button =
+    .title = ბ�ლ� გვერდი
diff -Nru firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ka/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ka/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:42:43.000000000 +0000
+++ firefox-85.0+build1/l10n/ka/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:51.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = ს�ბ�ლ��
+printui-page-custom-range-input =
+    .aria-label = მიუთითეთ გვერდების შუ�ლედი
+    .placeholder = მ�გ 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = �სლები
 printui-orientation = გ�ნლ�გებ�
@@ -48,6 +51,7 @@
 printui-options = პ�რ�მეტრები
 printui-headers-footers-checkbox = თ�ვს�რთის� დ� ბ�ლ�ს�რთის �მ�ბეჭდვ�
 printui-backgrounds-checkbox = ფ�ნის �მ�ბეჭდვ�
+printui-selection-checkbox = მხ�ლ�დ შერჩეულის �მ�ბეჭდვ�
 printui-color-mode-label = ფერის რეჟიმი
 printui-color-mode-color = ფერ�დი
 printui-color-mode-bw = შ�ვ-თეთრი
@@ -56,19 +60,29 @@
 printui-margins-min = უმცირესი
 printui-margins-none = �რცერთი
 printui-margins-custom = მ�რგებული
+printui-margins-custom-inches = მ�რგებული (დუიმი)
 printui-margins-custom-top = ზედ�
+printui-margins-custom-top-inches = ზედ� (დუიმი)
 printui-margins-custom-bottom = ქვედ�
+printui-margins-custom-bottom-inches = ქვედ� (დუიმი)
 printui-margins-custom-left = მ�რცხენ�
+printui-margins-custom-left-inches = მ�რცხენ� (დუიმი)
 printui-margins-custom-right = მ�რჯვენ�
+printui-margins-custom-right-inches = მ�რჯვენ� (დუიმი)
 printui-system-dialog-link = �მ�ბეჭდვ� სისტემის ფ�ნჯრიდ�ნ…
 printui-primary-button = �მ�ბეჭდვ�
 printui-primary-button-save = შენ�ხვ�
 printui-cancel-button = გ�უქმებ�
+printui-close-button = დ�ხურვ�
 printui-loading = შეთვ�ლიერების მ�მზ�დებ�
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = �მ�ს�ბეჭდის შეთვ�ლიერებ�
+printui-pages-per-sheet = გვერდი თით� ფურცელზე
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = იბეჭდებ�…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/kab/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/aboutLogins.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/aboutLogins.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Kkes anekcam-agi?
 confirm-delete-dialog-message = Ulac tuɣalin ɣer deffir.
 about-logins-confirm-remove-dialog-confirm-button = Kkes
-about-logins-confirm-remove-all-dialog-confirm-button = Kkes kullec
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Kkes
+        [one] Kkes
+       *[other] Kkes kullec
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ih, kkes inekcam-a
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Sife� inekcam d wawalen uffiren
 about-logins-confirm-export-dialog-message = Awalen-inek uffiren ad ttwaskelsen am u�ris ara d-ibanen i tɣuri (d amedya, BadP@ssw0rd) akken yal amdan ara yeldin afaylu i yettusif�en ad yizmir ad t-iwali.
 about-logins-confirm-export-dialog-confirm-button = Kter…
+about-logins-alert-import-title = Aktar yemmed
+about-logins-alert-import-message = Sken agzul leqqayen n uktar
 confirm-discard-changes-dialog-title = Sefsex isenfal-agi?
 confirm-discard-changes-dialog-message = Akk isnifal ur nettwakles ara ad ttwaksen.
 confirm-discard-changes-dialog-confirm-button = Kkes
@@ -262,3 +269,26 @@
         [macos] Asemli CSV
        *[other] Afaylu CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Akter yemmed
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Ttwarnan inekcumen imaynuten:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Ttuleqqmen inekcumen yellan:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Ttwafen inekcumen yellan sin iberdan:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Tucc�iwin </span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ur d-yettukter ara)</span>
+    }
+about-logins-import-dialog-done = Immed
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/kab/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/appmenu.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/appmenu.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Asfaylu amaynut
+appmenuitem-new-private-window =
+    .label = Asfaylu amaynut n tunigin tusligt
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Semɣeṛ
 appmenuitem-zoom-reduce =
     .label = Semẓi
+appmenuitem-fullscreen =
+    .label = Agdil A�aran
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Mtawi tura
+appmenuitem-save-page =
+    .label = Sekles asebter di...
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/kab/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/appMenuNotifications.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/appMenuNotifications.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ma��i tura
     .secondarybuttonaccesskey = T
 appmenu-update-restart-message = Seld askar arurad, { -brand-shorter-name } ad d-yerr akk accaren yeldin akked yisfayluyen ur nelli ara deg uskar n tunigin tusligt.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ur izmir ara ad ileqqem s wudem awurman ɣer lqem aneggaru.
+    .buttonlabel = Akken yebɣu yili leqqem { -brand-shorter-name }
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Ma��i tura
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Yella lqem amaynut n { -brand-shorter-name }, maca ur yezmir ara ad yettusebded acku yella nɣel-nni�en n { -brand-shorter-name } la iteddu. Mdel-it i wakken ad tkemmle� lqem, neɣ fren ɣas akken leqqem (nɣel-nni-nni�en yezmer ur iteddu ara akken iwata alamma tulse�-as asenker).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ih, awi-t-id
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/browser.ftl firefox-85.0+build1/l10n/kab/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/browser.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/browser.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> Ɣur-s asenqed n usewwaṛ-inek. Sit ɣef tqeffalt n usenser akken ad teṭṭfe� asewwaṛ.
 pointerlock-warning-no-domain = Isemli-a yeṭṭef asewwaṛ-ik. Sit ɣef Esc akken ad teṭṭfe� asewwaṛ.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Sken akk ticra� n yisebtar
+bookmarks-recent-bookmarks =
+    .value = Wid ittwacer�en melmi kan
+bookmarks-toolbar-chevron =
+    .tooltiptext = Sken ugar n tecra� n yisebtar
+bookmarks-sidebar-content =
+    .aria-label = Ticra� n yisebtar
+bookmarks-menu-button =
+    .label = Umuɣ n tecra� n yisebtar
+bookmarks-other-bookmarks-menu =
+    .label = Ticrad-nni�en n yisebtar
+bookmarks-mobile-bookmarks-menu =
+    .label = Ticra� n yisebtar n uziraz
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ffer agalis n tecra� n yisebtar
+           *[other] Sken agalis n tecra� n yisebtar
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ffer afeggag n tecra� n yisebtar
+           *[other] Sken afeggag n tecra� n yisebtar
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Kkes umuγ n tecra� n yisebtar seg ufeggag
+           *[other] Rnu umuγ n tecra� n yisebtar ɣer ufeggag
+        }
+bookmarks-search =
+    .label = Nadi ticra� n yisebtar
+bookmarks-tools =
+    .label = Ifecka n tecra� n yisebtar
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Afeggag n tecra� n yisebtar
+    .accesskey = B
+    .aria-label = Ticra� n yisebtar
+bookmarks-toolbar-menu =
+    .label = Afeggag n tecra� n yisebtar
+bookmarks-toolbar-placeholder =
+    .title = Iferdisen n ufeggag n tecra� n yisebtar
+bookmarks-toolbar-placeholder-button =
+    .label = Iferdisen n ufeggag n tecra� n yisebtar
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Ticra� n yisebtar
+library-bookmarks-bookmark-this-page =
+    .label = Cre� asebter-a
+library-bookmarks-bookmark-edit =
+    .label = Ẓreg tacre�ṭ n usebter-a
+library-recent-activity-label = Armud n melmi kan
+
+## More items
+
+more-menu-go-offline =
+    .label = Mahel war tuqqna
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/kab/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/newtab/asrouter.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/newtab/asrouter.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -120,6 +120,9 @@
 
 cfr-whatsnew-searchbar-title = Aru cwiá¹­, aff aá¹­as s ufeggag n tansiwin
 cfr-whatsnew-searchbar-body-topsites = Tura, fren afeggag n tunigin, ad d-timɣur texxamt s iseɣwan ɣer ismal-ik ifazen.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Tignit n lemri isimɣuren
 
 ## Picture-in-Picture
@@ -275,3 +278,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Nadi inegzumen deg ufeggag n tansiwin
 cfr-whatsnew-search-shortcuts-body = Akka ura, mi ara taru� amsedday n unadi neɣ n kra n usmel deg ufeggag n tansiwin, anegzum amidadi ad d-iban deg yisumar n unadi ddaw. Fren anegzum-nni i wakken ad tfakke� anadi-inek·inem srid seg ufeggag n tansiwin.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Ammesten mgal yir inagan n tuqqna iǧehden
+cfr-whatsnew-supercookies-body = Ismal web zemren s tuffra ad seddun “supercookie� deg yiminig-ik·im ara yizmiren ad ak·akem-ye�fer deg web, ula mi ara tsef�e� inagan n tuqqna. { -brand-short-name } tura yettmuddu ammesten iǧehden aṭas mgal n yinagan n tuqqna uḥricen i wakken ur ttuseqdacen ara deg u�far n tigawin-ik·im srid seg usmel ɣer waye�.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Acra� n yisebter ifazen
+cfr-whatsnew-bookmarking-body = Yeshel ma�i ad teǧǧe� lateṛ n yismal-ik·im ufrinen. { -brand-short-name } tura yecfa ɣef adig-inek·inem yettwafernen i ticra� n yisebtar yettuskelsen, yeskan afeggag n yifecka n tecra� n yisebtar s wudem amezwer deg waccaren imaynuten, yerna ad ak·am-imudd anekcum fessusen ɣer ticra� n yisebtar-ik·im srid seg ukaram n ufeggag n yifecka.
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/kab/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/newtab/newtab.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/newtab/newtab.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Iccer amaynut
 newtab-settings-button =
     .title = Sagen asebter n yiccer-ik amaynut
+newtab-personalize-button-label = Sagen
+    .title = Sagen iccer amaynut
+    .aria-label = Sagen iccer amaynut
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Nadi di Web
     .title = Nadi di Web
     .aria-label = Nadi di Web
+newtab-search-box-text = Nadi di web
+newtab-search-box-input =
+    .placeholder = Nadi di web
+    .aria-label = Nadi di web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Rnu amsedday n unadi
 newtab-topsites-add-topsites-header = Asmel ifazen amaynut
+newtab-topsites-add-shortcut-header = Anegzum amaynut
 newtab-topsites-edit-topsites-header = Ẓreg asmel ifazen
+newtab-topsites-edit-shortcut-header = Ẓreg anegzum
 newtab-topsites-title-label = Azwel
 newtab-topsites-title-input =
     .placeholder = Sekcem azwel
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Ihuh, yella wayen ye�ran deg usali n ugbur-a.
 newtab-error-fallback-refresh-link = Sali-d aseter akken ad talse� aɛra�.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Inegzumen
+newtab-custom-shortcuts-subtitle = Ismal i teskelse� neɣ wuɣur terzi�
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } yizirig
+       *[other] { $num } yizirigen
+    }
+newtab-custom-sponsored-sites = Inegzumen yettwarefden
+newtab-custom-pocket-title = yettuwelleh-d sɣur { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Agbur ufrin i s-yettusuddsen sɣur { -pocket-brand-name }, d aḥric seg twacult { -brand-product-name }
+newtab-custom-pocket-sponsored = Tiqá¹£idin yettwarefden
+newtab-custom-recent-title = Armud n melmi kan
+newtab-custom-recent-subtitle = Tafrant n yismal d ugbur n melmi kan
+newtab-custom-close-button = Mdel
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Tiwzillin
+newtab-custom-snippets-subtitle = Iwellihen d yisallen sɣur { -vendor-short-name } akked { -brand-product-name }
+newtab-custom-settings = Sefrek ugar n yiɣewwaṛen
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/places.ftl firefox-85.0+build1/l10n/kab/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/places.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/places.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Adakaram
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Ticra�-nni�en n yisebtar
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/kab/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/preferences/preferences.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/preferences/preferences.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Ismal i tettwali� aṭas
 home-prefs-topsites-by-option-sponsored =
     .label = Ismal ifellay yettwarefden
+home-prefs-shortcuts-header =
+    .label = Inegzumen
+home-prefs-shortcuts-description = Ismal i teskelse� neɣ wuɣur terzi�
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Inegzumen yettwarefden
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Iwelleh-it-id { $provider }
 home-prefs-recommended-by-description-update = Agbur yelhan i yettwafen deg Web sɣur { $provider }
+home-prefs-recommended-by-description-new = Agbur ufrin i s-yettusuddsen sɣur { $provider }, d aḥric seg twacult { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Tiqá¹£idin yettwarefden
 home-prefs-highlights-header =
     .label = Asebrureq
-home-prefs-recent-activity-header =
-    .label = Armud n melmi kan
 home-prefs-highlights-description = Tafrant n yismal i teskelse� neɣ i twala�
 home-prefs-highlights-option-visited-pages =
     .label = isebtar yettwarzan
@@ -526,6 +530,9 @@
     .label = Isadaren imaynuten
 home-prefs-highlights-option-saved-to-pocket =
     .label = Isebtar yettwaḥerzen ar { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Armud n melmi kan
+home-prefs-recent-activity-description = Tafrant n yismal d ugbur n melmi kan
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Tiwzillin
 home-prefs-snippets-description = Ileqman seg { -vendor-short-name } d { -brand-product-name }
+home-prefs-snippets-description-new = Iwellihen d yisallen sɣur { -vendor-short-name } akked { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Iccaren yeldin
     .accesskey = I
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Inegzumen
+    .accesskey = Z
 addressbar-locbar-topsites-option =
     .label = Ismal ufrinen
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Nadi imseddayen n unadi
+    .accesskey = a
 addressbar-suggestions-settings = Snifel ismenyifen i yisumar n umsedday n unadi
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/kab/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/kab/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/kab/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Iccer kan amaynut
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Sken yal tikelt
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Ur skan ara akk
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Sken kan deg yiccer amaynut
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Sken ticra� n yisebtar tiya�
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/kab/devtools/client/debugger.properties firefox-85.0+build1/l10n/kab/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/kab/devtools/client/debugger.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/devtools/client/debugger.properties	2021-01-18 20:05:55.000000000 +0000
@@ -589,7 +589,7 @@
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
 expressions.errorMsg=A�ris d arameɣtu…
-expressions.label=Rnu talfalit amucaá¹›
+expressions.label=Rnu tanfalit n temrint
 expressions.accesskey=e
 expressions.remove.tooltip=Kkes talfalit amucaá¹›
 
diff -Nru firefox-84.0.2+build1/l10n/kab/devtools/client/markers.properties firefox-85.0+build1/l10n/kab/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/kab/devtools/client/markers.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/devtools/client/markers.properties	2021-01-18 20:05:55.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Drus n tkatut
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Alqa� n tẓayert ifukk
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Asali n usebter immed
 marker.gcreason.label.PAGE_HIDE=Inkez ɣeṛ ugilal
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/kab/devtools/client/toolbox.properties firefox-85.0+build1/l10n/kab/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/kab/devtools/client/toolbox.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/devtools/client/toolbox.properties	2021-01-18 20:05:55.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Ldi afaylu deg umaẓrag n uɣanib
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Mdel afeggag n tneflit
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Sken tadiwent yeb�an
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/kab/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/kab/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/kab/devtools/client/tooltips.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/devtools/client/tooltips.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> ur d-igellu s kra ɣef uferdis-a imi ma��i d aferdis adigan.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> ur d-igellu s kra ɣef uferdis-agi, imi <strong>overflow:hidden</strong> ur yettusbadu ara.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> ur d-igellu s kra ɣef uferdis-a, imi <strong>outline-style</strong> d <strong>auto</strong> neɣ <strong>none<strong></strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> ur d-igellu s kra ɣef yiferdisen n tfelwit tagensant.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> ur d-igellu s kra ɣef yiferdisen n tfelwit tagensant slid tibliqin n tfelwit.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = �re� tukksa n <strong>float</strong> neɣ timerna n <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = �re� ad tesbadu� timeẓli-ines<strong>position</strong> s wazal-nni�en ur nelli d <strong>statitc</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = �re� ad ternu� <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = �re� asbadu n tmeẓli-ines <strong>display</strong> ɣef waye�-nni�en yemgaraden ɣef <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> neɣ <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = �re� asbadu n tmeẓli-ines <strong>display</strong> ɣef waye�-nni�en yemgaraden ɣef <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> neɣ <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = �re� ad tesbadu� timeẓli-ines <strong>outline-style</strong> s wazal-nni�en ur nelli d <strong>auto</strong> neɣ <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/kab/devtools/client/webconsole.properties firefox-85.0+build1/l10n/kab/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/kab/devtools/client/webconsole.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/devtools/client/webconsole.properties	2021-01-18 20:05:55.000000000 +0000
@@ -7,27 +7,6 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
-# LOCALIZATION NOTE (browserConsole.title): shown as the
-# title when opening the browser console popup
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
-
-# 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/.
-# LOCALIZATION NOTE
-# The correct localization of this file might be to keep it in
-# English, or another language commonly spoken among web developers.
-# You want to make that choice consistent across the developer tools.
-# A good criteria is the language in which you'd find the best
-# documentation on web development on the web.
 
 # LOCALIZATION NOTE (browserConsole.title): shown as the
 # title when opening the browser console popup
@@ -500,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Selkem ta,falit (%S). Aya ur yesfa� ara tamna�t.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Tanfalit n usiggez tecbaḥ
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/kab/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/kab/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/kab/dom/chrome/dom/dom.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/dom/chrome/dom/dom.properties	2021-01-18 20:05:55.000000000 +0000
@@ -423,3 +423,8 @@
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
 FolderUploadPrompt.message = D tidet tebɣi� ad d-tsali� meṛṛa ifuyla seg “%S�? Eg aya ala ma yella tettekle� ɣef usmel.
 FolderUploadPrompt.acceptButtonLabel = Sali
+InputPickerBlockedNoUserActivation=Agalis n <input> yettusewḥel seg ssebba n lexṣaṣ n urmad n useqdac.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe s uneggaf azɣaray yettusewḥel ssebba n usekkeṛ n urmad n useqdac, neɣ ahat ulac ddeqs n wakud i iɛeddan ɣef usali n iframe aneggaru.
+MultiplePopupsBlockedNoUserActivation=Tawaledyawt n waṭas n yisfuyla udhimen tettusewḥel seg ssebba n lexṣaṣ n urmad n useqdac.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Allus n usali n %S yettwazgel ssebba n wazalen arussinen n “as� neɣ n “type�, neɣ n umyerr “mediaa� ur nemṣada ara.
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/kab/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/kab/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:05:55.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Tucc�a n usader
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Asader ulamek yettusekles acku yettusewḥel s %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Asader ulamek yettusekles acku yettusewḥel s usiɣzef.
 downloadErrorGeneric=Asider-agi ur yezmir ara d yettwasekles acku te�ra-d tucc�a tarussint.\n\nMa ulac aɣilif, ɛre� tikkelt-nni�en.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/kab/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/kab/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:05:55.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Tuqqna ɣer uqeddac apṛuksi tegdel
 check_error-2153390069=Aselkin n uqeddac yemmut (ma ulac aɣilif, seggem tamrilt n unagraw-inek akken ad teseɣti� azemz d wakud ma yella ma��i d imeɣta)
 check_error-verification_failed=Timmad n lqem ur tezmir ara ad tettwasenqed
+check_error-move_failed=Aheyyi n uleqqe ur yeddi ara i usbeddi
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/kab/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -31,6 +31,7 @@
 about-processes-web-process-name = Web (akala { $pid }, yettwab�a)
 about-processes-web-isolated-process-name = Web (akala { $pid }) i { $origin }
 about-processes-web-large-allocation = Web (akala { $pid }, meqqer) i { $origin }
+about-processes-with-coop-coep-process-name = Web (akala { $pid }, cross-origin yettuɛzel) i { $origin }
 about-processes-file-process-name = Ifuyla (akala { $pid })
 about-processes-extension-process-name = Isiɣzaf (akala { $pid })
 about-processes-privilegedabout-process-name = Ɣef (ukala { $pid })
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/kab/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Izegrar n wis kra�
+support-third-party-modules-module = Isem n uzegrir
+support-third-party-modules-version = Lqem n ufaylu
+support-third-party-modules-vendor = Talɣut n umsenzi
+support-third-party-modules-occurrence = Time�riwt
+support-third-party-modules-process = Anaw & usulay n ukala
+support-third-party-modules-thread = Asqerdec
+support-third-party-modules-base = Tansa n taffa n tugniwin
+support-third-party-modules-uptime = Akud n useddu n ukala (ms)
+support-third-party-modules-duration = Tanzagt n usali (ms)
+support-third-party-modules-empty = Ulac izegrar n wis kra� i d-yettwasulin.
+support-third-party-modules-no-value = (Ulac azal)
+support-third-party-modules-button-open =
+    .title = Ldi adeg n ufaylu…
+support-third-party-modules-expand =
+    .title = Sken Talɣut n usmel
+support-third-party-modules-collapse =
+    .title = Fneẓ  talɣut leqqayen
+support-third-party-modules-unsigned-icon =
+    .title = Azegrir-a ur yettusezmel ara
+support-third-party-modules-folder-icon =
+    .title = Ldi adeg n ufaylu…
+support-third-party-modules-down-icon =
+    .title = Sken Talɣut leqqayen
+support-third-party-modules-up-icon =
+    .title = Fneẓ talɣut leqqayen
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/kab/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -97,3 +97,7 @@
 # Support for having multiple Picture-in-Picture windows open simultaneously
 experimental-features-multi-pip =
     .label = Tallalt n tugna deg tugna yeggten
+experimental-features-multi-pip-description = Tallalt tarmitant i usireg n waṭas n yisfuyla n tugna deg tugna ara yeldin ɣef tikkelt.
+experimental-features-http3 =
+    .label = Aneggaf n HTTP/3
+experimental-features-http3-description = Tallalt tarmitant i uneggaf HTTP/3
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/kab/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Asebter:
     .accesskey = s
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } n { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Asebter aneggaru
-
+printpreview-homearrow-button =
+    .title = Asebter amezwaru
+printpreview-previousarrow-button =
+    .title = Asebter izrin
+printpreview-nextarrow-button =
+    .title = Asebter d-iteddun
+printpreview-endarrow-button =
+    .title = Asebter aneggaru
diff -Nru firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/kab/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/kab/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:42:47.000000000 +0000
+++ firefox-85.0+build1/l10n/kab/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:05:55.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = Ɣer
+printui-page-custom-range-input =
+    .aria-label = Skcem ailal udmawan n yisebtar
+    .placeholder = m.d. 2-6, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Anɣalen
 printui-orientation = Taɣda
@@ -41,10 +44,14 @@
 printui-scale-fit-to-page-width = á¹¢eggem almend n tehri n tferkit
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = Sellum
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Asiggez ɣef sin wudmawen
+printui-duplex-checkbox = Siggez ɣef sin wudmawen
 # Section title for miscellaneous print options
 printui-options = IÉ£ewwaren
 printui-headers-footers-checkbox = Siggez iqerra d yi�arren n usebter
 printui-backgrounds-checkbox = Siggez agilal
+printui-selection-checkbox = Siggez kan tafrant
 printui-color-mode-label = Askar n yiniten
 printui-color-mode-color = Initen
 printui-color-mode-bw = Aberkan d ucebḥan
@@ -53,19 +60,29 @@
 printui-margins-min = Adday
 printui-margins-none = Ulac
 printui-margins-custom = Sagen
+printui-margins-custom-inches = Sagen (idebbuzen)
 printui-margins-custom-top = Afellay
+printui-margins-custom-top-inches = Afellay (idebbuzen)
 printui-margins-custom-bottom = Adday
+printui-margins-custom-bottom-inches = Adday (idebbuzen)
 printui-margins-custom-left = Azelma�
+printui-margins-custom-left-inches = Azelma� (idebbuzen)
 printui-margins-custom-right = Ayeffus
+printui-margins-custom-right-inches = Ayeffus (idebbuzen)
 printui-system-dialog-link = Siggez s useqdec n udiwenni anagraw…
 printui-primary-button = Siggez
 printui-primary-button-save = Sekles
 printui-cancel-button = Sefsex
+printui-close-button = Mdel
 printui-loading = Aheyyi n teskant
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Taskant send asiggez
+printui-pages-per-sheet = Asebter i yal tawerqet
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Asiggez…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/kk/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/aboutLogins.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/aboutLogins.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -168,7 +168,20 @@
 about-logins-confirm-remove-dialog-title = Бұл логинді өшіру керек пе?
 confirm-delete-dialog-message = Бұл әрекетті болдырмау мүмкін еме� болады.
 about-logins-confirm-remove-dialog-confirm-button = Өшіру
-about-logins-confirm-remove-all-dialog-confirm-button = Барлығын өшіру
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Өшіру
+       *[other] Барлығын өшіру
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] Иә, бұл логинді өшіру
+       *[other] Иә, бұл логиндерді өшіру
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+       *[other] Барлық { $count } логинді өшіру керек пе?
+    }
 about-logins-confirm-export-dialog-title = Логиндер және парольдерді �к�порттау
 about-logins-confirm-export-dialog-message = Парольдеріңіз ашық, оқуға келетін мәтін ретінде �ақталатын болады (мы�., BadP@ssw0rd) �ондықтан �к�портталған файлды аша алатын адам оларды көре алады.
 about-logins-confirm-export-dialog-confirm-button = Эк�порттау…
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/kk/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/appmenu.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/appmenu.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Жаңа терезе
+appmenuitem-new-private-window =
+    .label = Жаңа жекелік терезе
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Кішірейту
 appmenuitem-zoom-reduce =
     .label = Кішірейту
+appmenuitem-fullscreen =
+    .label = Толық �кран режимі
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Қазір �инхрондау
+appmenuitem-save-page =
+    .label = Парақты қалайша �ақтау…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = �е жаңалық
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/browser.ftl firefox-85.0+build1/l10n/kk/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/browser.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/browser.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -474,3 +474,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> кур�орыңызды ба�қаруда. Ба�қаруды қайта алу үшін Esc ба�ыңыз.
 pointerlock-warning-no-domain = Бұл құжат кур�орыңызды ба�қаруда. Ба�қаруды қайта алу үшін Esc ба�ыңыз.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Барлық бетбелгілерді көр�ету
+bookmarks-recent-bookmarks =
+    .value = Соңынан қо�ылғандар
+bookmarks-toolbar-chevron =
+    .tooltiptext = Көбірек бетбелгілерді көр�ету
+bookmarks-sidebar-content =
+    .aria-label = Бетбелгілер
+bookmarks-menu-button =
+    .label = Бетбелгілер мәзірі
+bookmarks-other-bookmarks-menu =
+    .label = Ба�қа бетбелгілер
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобильді бетбелгілер
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Бетбелгілер бүйір панелін жа�ыру
+           *[other] Бүйір панелін қарау
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Бетбелгілер құралдар панелін жа�ыру
+           *[other] Бетбелгілер панелін қарау
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Бетбелгілер мәзірін құралдар панелінен алып та�тау
+           *[other] Бетбелгілер мәзірін құралдар панеліне қо�у
+        }
+bookmarks-search =
+    .label = Бетбелгілер ішінен іздеу
+bookmarks-tools =
+    .label = Бетбелгілер құралдары
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Бетбелгілер панелі
+    .accesskey = Б
+    .aria-label = Бетбелгілер
+bookmarks-toolbar-menu =
+    .label = Бетбелгілер панелі
+bookmarks-toolbar-placeholder =
+    .title = Бетбелгілер панелінің �лементтері
+bookmarks-toolbar-placeholder-button =
+    .label = Бетбелгілер панелінің �лементтері
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Бетбелгілер
+library-bookmarks-bookmark-this-page =
+    .label = Бұл бетті бетбелгілерге қо�у
+library-bookmarks-bookmark-edit =
+    .label = Бетбелгіні түзету
+
+## More items
+
+more-menu-go-offline =
+    .label = Дербе� жұмы� і�теу
+    .accesskey = Д
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/kk/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/newtab/newtab.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/newtab/newtab.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Жаңа бет
 newtab-settings-button =
     .title = Жаңа бетті баптаңыз
+newtab-personalize-button-label = Жекелендіру
+    .title = Жаңа бетті жекелендіру
+    .aria-label = Жаңа бетті жекелендіру
 
 ## Search box component.
 
@@ -171,6 +174,7 @@
 
 newtab-section-header-topsites = Үздік �айттар
 newtab-section-header-highlights = Ерекше жаңалықтар
+newtab-section-header-recent-activity = Соңғы бел�енділігі
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Ұ�ынушы { $provider }
@@ -206,3 +210,18 @@
 
 newtab-error-fallback-info = Қап, бұл құраманы жүктеу кезінде бірнәр�е қате кетті.
 newtab-error-fallback-refresh-link = Қайталап көру үшін, бетті жаңартыңыз.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Жарлықтар
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } жол
+    }
+newtab-custom-sponsored-sites = Демеушілік жарлықтары
+newtab-custom-close-button = Жабу
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Үзінділер
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/places.ftl firefox-85.0+build1/l10n/kk/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/places.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/places.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Ішкі бума
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Ба�қа бетбелгілер
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/kk/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/preferences/preferences.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/preferences/preferences.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -52,6 +52,9 @@
 pane-experimental-subtitle = �байлап жалға�тырыңыз
 pane-experimental-search-results-header = { -brand-short-name } тәжірибелері: �байлап жалға�тырыңыз
 pane-experimental-description = Кеңейтілген баптауларды өзгерту { -brand-short-name } өнімділік неме�е қауіп�іздігіне ә�ерін тигізуі мүмкін.
+pane-experimental-reset =
+    .label = Ба�тапқы мәндерін қайтару
+    .accesskey = р
 help-button-label = { -brand-short-name } қолдауы
 addons-button-label = Кеңейтулер және темалар
 focus-search =
@@ -494,6 +497,11 @@
 home-prefs-topsites-description = Сіз жиі шолатын �айттар
 home-prefs-topsites-by-option-sponsored =
     .label = Демеуленген үздік �айттар
+home-prefs-shortcuts-header =
+    .label = Жарлықтар
+home-prefs-shortcuts-description = Сіз �ақтайтын неме�е шолатын �айттар
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Демеушілік жарлықтары
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -518,6 +526,8 @@
     .label = Ең �оңғы жүктеме
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }-ке �ақталған беттер
+home-prefs-recent-activity-header =
+    .label = Соңғы бел�енділігі
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -915,6 +925,9 @@
 addressbar-locbar-topsites-option =
     .label = Үздік �айттар
     .accesskey = з
+addressbar-locbar-engines-option =
+    .label = Іздеу жүйелері
+    .accesskey = д
 addressbar-suggestions-settings = Іздеу жүйе�інің ұ�ыны�тары үшін қалауларды өзгерту
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/kk/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/kk/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/kk/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:42:52.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -60,3 +60,9 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Тек жаңа бетте
     .accesskey = к
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Әрқашан көр�ету
+    .accesskey = а
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Ешқашан көр�етпеу
+    .accesskey = н
diff -Nru firefox-84.0.2+build1/l10n/kk/dom/dom/media.ftl firefox-85.0+build1/l10n/kk/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/kk/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/dom/dom/media.ftl	2021-01-18 20:06:00.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/.
+
+mediastatus-fallback-title = { -brand-short-name } медиа ойнатуда
diff -Nru firefox-84.0.2+build1/l10n/kk/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/kk/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/kk/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/kk/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:06:00.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/km/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/km/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/km/browser/browser/aboutLogins.ftl	2021-01-06 11:42:56.000000000 +0000
+++ firefox-85.0+build1/l10n/km/browser/browser/aboutLogins.ftl	2021-01-18 20:06:05.000000000 +0000
@@ -108,13 +108,28 @@
 ## and includes subtitle of "Enter password for the user "xxx" to allow this." These
 ## notes are only valid for English. Please test in your respected locale.
 
+# This message can be seen when attempting to edit a login in about:logins on Windows.
+about-logins-edit-login-os-auth-dialog-message-win = ដើម្បីកែសម្រួលការចូលរបស់អ្នកសូមបញ្ចូលលិ�ិ�សម្គាល់ផ្ទាំងចូលរបស់អ្នក។ វាជួយការពារសុវ�្�ិភាពគណនីរបស់អ្នក។
+# This message can be seen when attempting to edit a login in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-edit-login-os-auth-dialog-message-macosx = កែសម្រួលការចូលដែលបានរក្សាទុក
+# This message can be seen when attempting to reveal a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-reveal-password-os-auth-dialog-message-macosx = បង្ហាញពាក្យសម្ងា�់ដែលបានរក្សាទុក
+# This message can be seen when attempting to copy a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-copy-password-os-auth-dialog-message-macosx = ចម្លងពាក្យសម្ងា�់ដែលបានរក្សាទុក
 
 ## Master Password notification
 
 master-password-notification-message = សូម​បញ្ចូល​ពាក្យសម្ងា�់​ម�​របស់​អ្នក ដើម្បី​មើល​ការចូល និង​ពាក្យ​សម្ងា�់​ដែល​បាន​រក្សាទុក
+# This message can be seen when attempting to export a password in about:logins
+# On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
+about-logins-export-password-os-auth-dialog-message-macosx = នាំច�ញការចូលនិងពាក្យសម្ងា�់ដែលបានរក្សាទុក
 
 ## Primary Password notification
 
+about-logins-primary-password-notification-message = សូមបញ្ចូលពាក្យសម្ងា�់ចម្បង​របស់អ្នក ដើម្បីមើលការចូល ព្រមទាំង​ពាក្យសម្ងា�់ដែលបានរក្សាទុក
 master-password-reload-button =
     .label = ចូល
     .accesskey = áž…
@@ -142,23 +157,62 @@
 confirmation-dialog-cancel-button = បោះបង់
 confirmation-dialog-dismiss-button =
     .title = បោះបង់
+about-logins-confirm-remove-dialog-title = លុបការចូលន�ះច�ញ?
 confirm-delete-dialog-message = សកម្មភាព​ន�ះ​មិន​អាច​�្រឡប់​វិញ​បាន​ទ�។
+about-logins-confirm-remove-dialog-confirm-button = លុប​ច�ញ
+about-logins-confirm-export-dialog-title = នាំច�ញការចូលនិងពាក្យសម្ងា�់
+about-logins-confirm-export-dialog-confirm-button = នាំច�ញ…
 confirm-discard-changes-dialog-title = បោះបង់​ការផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក?
 confirm-discard-changes-dialog-message = ការផ្លាស់ប្ដូរ​ដែល​មិន​បាន​រក្សាទុក​ទាំងអស់​នឹង​បា�់។
 confirm-discard-changes-dialog-confirm-button = បោះបង់
 
 ## Breach Alert notification
 
+about-logins-breach-alert-title = ការបំពានគ�ហទំព�រ
 breach-alert-text = ពាក្យ​សម្ងា�់​�្រូវបាន​បែកធ្លាយ ឬ​លួច​ពី​គ�ហទំព�រ​ន�ះ ចាប់�ាំង​ពី​អ្នក​បាន​ធ្វើបច្ចុប្បន្នភាព​​ព��៌មាន​លម្អិ�​ការចូល​របស់​អ្នក​ចុងក្រោយ។ សូម​ប្ដូរ​ពាក្យ​សម្ងា�់​របស់​អ្នក ដើម្បី​ការពារ​គណនី​របស់​អ្នក។
+# Variables:
+#   $hostname (String) - The hostname of the website associated with the login, e.g. "example.com"
+about-logins-breach-alert-link = ទៅកាន់ { $hostname }
+about-logins-breach-alert-learn-more-link = ស្វែងយល់​បន្�ែម
 
 ## Vulnerable Password notification
 
+about-logins-vulnerable-alert-title = ពាក្យ​ស្ងា�់​ងាយរងគ្រោះ
+# Variables:
+#   $hostname (String) - The hostname of the website associated with the login, e.g. "example.com"
+about-logins-vulnerable-alert-link = ទៅកាន់ { $hostname }
+about-logins-vulnerable-alert-learn-more-link = ស្វែងយល់​បន្�ែម
 
 ## Error Messages
 
+# This is a generic error message.
+about-logins-error-message-default = បញ្ហា​មួយបានកើ�ឡើង�ណៈព�លព្យាយាមរក្សាទុកពាក្យសម្ងា�់ន�ះ។
 
 ## Login Export Dialog
 
+# Title of the file picker dialog
+about-logins-export-file-picker-title = នាំច�ញឯកសារចូល
+# The default file name shown in the file picker when exporting saved logins.
+# This must end in .csv
+about-logins-export-file-picker-default-filename = logins.csv
+about-logins-export-file-picker-export-button = នាំច�ញ
+# A description for the .csv file format that may be shown as the file type
+# filter by the operating system.
+about-logins-export-file-picker-csv-filter-title =
+    { PLATFORM() ->
+        [macos] CSV Document
+       *[other] CSV File
+    }
 
 ## Login Import Dialog
 
+# Title of the file picker dialog
+about-logins-import-file-picker-title = នាំចូលឯកសារចូល
+about-logins-import-file-picker-import-button = នាំចូល
+# A description for the .csv file format that may be shown as the file type
+# filter by the operating system.
+about-logins-import-file-picker-csv-filter-title =
+    { PLATFORM() ->
+        [macos] ឯកសារ CSV
+       *[other] CSV File
+    }
diff -Nru firefox-84.0.2+build1/l10n/km/browser/browser/aboutPrivateBrowsing.ftl firefox-85.0+build1/l10n/km/browser/browser/aboutPrivateBrowsing.ftl
--- firefox-84.0.2+build1/l10n/km/browser/browser/aboutPrivateBrowsing.ftl	2021-01-06 11:42:56.000000000 +0000
+++ firefox-85.0+build1/l10n/km/browser/browser/aboutPrivateBrowsing.ftl	2021-01-18 20:06:05.000000000 +0000
@@ -10,7 +10,8 @@
 about-private-browsing =
     .title = ស្វែងរក​ទំព�រ​បណ្ដាញ
 about-private-browsing-not-private = បច្ចុប្បន្ន​អ្នក​មិន​នៅ​ក្នុង​បង្អួច​ឯកជន​ទ�។
-
+about-private-browsing-need-more-privacy = �្រូវការឯកជនភាព​បន្�ែមទៀ�?
+about-private-browsing-turn-on-vpn = សាកល្បង { -mozilla-vpn-brand-name }
 # This string is the title for the banner for search engine selection
 # in a private window.
 # Variables:
diff -Nru firefox-84.0.2+build1/l10n/km/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/km/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/km/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:42:56.000000000 +0000
+++ firefox-85.0+build1/l10n/km/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:06:05.000000000 +0000
@@ -14,6 +14,7 @@
 crashed-request-help-message = របាយការណ�​គាំង​គឺ​ជួយ​យើង​រក​ឲ្យ​ឃើញ​បញ្ហា ហើយ​ធ្វើឲ្យ { -brand-short-name } ប្រសើរ​ឡើង។
 crashed-request-report-title = រាយការណ�​ផ្ទាំង​ន�ះ
 crashed-send-report = ផ្ញើរបាយការណ�គាំងដោយស្វ�យប្រវ�្�ិដើម្បីឱ្យយើងអាចដោះស្រាយបញ្ហាដូចន�ះបាន។
+crashed-send-report-2 = ផ្ញើរបាយការណ�គាំងដោយស្វ�យប្រវ�្�ិ ដូច្ន�ះយើងអាចដោះស្រាយបញ្ហាដូចន�ះ
 crashed-comment =
     .placeholder = ម�ិយោបល់​ជា​ជម្រើស (ម�ិយោបល់​អាច​មើល​ឃើញ​ជា​សាធារណៈ)
 crashed-include-URL = រួមបញ្ចូល URL របស់ទំព�រ​ដែលអ្នកកំពុងចូល​មើល​នៅព�ល { -brand-short-name } គាំង។
diff -Nru firefox-84.0.2+build1/l10n/km/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/km/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/km/browser/browser/appmenu.ftl	2021-01-06 11:42:56.000000000 +0000
+++ firefox-85.0+build1/l10n/km/browser/browser/appmenu.ftl	2021-01-18 20:06:05.000000000 +0000
@@ -10,15 +10,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = បង្អួច​​​�្មី
+appmenuitem-new-private-window =
+    .label = បង្អួច​ឯកជន​�្មី
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = ពង្រីក
 appmenuitem-zoom-reduce =
     .label = បង្រួម
+appmenuitem-fullscreen =
+    .label = អ�ក្រង់​ព�ញ
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ធ្វើ​សមកាលកម្ម​ឥឡូវ
+appmenuitem-save-page =
+    .label = រក្សា​ទុក​ទំព�រជា...
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/km/browser/browser/browser.ftl firefox-85.0+build1/l10n/km/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/km/browser/browser/browser.ftl	2021-01-06 11:42:56.000000000 +0000
+++ firefox-85.0+build1/l10n/km/browser/browser/browser.ftl	2021-01-18 20:06:05.000000000 +0000
@@ -261,6 +261,9 @@
 browser-window-close-button =
     .tooltiptext = បិទ
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -330,3 +333,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> មាន​ការ​គ្រប់គ្រង​លើ​ព្រួញ​ចង្អុល​របស់​អ្នក។ ចុច Esc ដើម្បី​ទទួល​បាន​ការ​គ្រប់គ្រង​មកវិញ។
 pointerlock-warning-no-domain = ឯកសារន�ះ​មាន​សិទ្ធ​គ្រប់គ្រង​លើ​ព្រួញ​ចង្អុល​របស់​អ្នក។ ចុច Esc ដើម្បី​ទទួល​បាន​ការ​គ្រប់គ្រង​មក​វិញ។
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = បង្ហាញ​ចំណាំ​ទាំងអស់
+bookmarks-recent-bookmarks =
+    .value = ដែល​បាន​ចំណាំ​�្មីៗ
+bookmarks-toolbar-chevron =
+    .tooltiptext = បង្ហាញ​ចំណាំ​​�ែមទៀ�
+bookmarks-sidebar-content =
+    .aria-label = ចំណាំ
+bookmarks-menu-button =
+    .label = ម៉ឺនុយ​ចំណាំ
+bookmarks-other-bookmarks-menu =
+    .label = ចំណាំ​ផ្ស�ងៗ
+bookmarks-mobile-bookmarks-menu =
+    .label = ចំណាំ​ចល��
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] លាក់​របារ​ឧបករណ�​ចំណាំ
+           *[other] មើល​របារ​ឧបករណ�​ចំណាំ
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] លាក់របារឧបករណ�ចំណាំ
+           *[other] មើល​របារ​ឧបករណ�​ចំណាំ
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ដក​ម៉ឺនុយចំណាំច�ញពីរបារឧបករណ�
+           *[other] បញ្ចូល​ម៉ឺនុយចំណាំទៅកាន់របារឧបករណ�
+        }
+bookmarks-search =
+    .label = ស្វែងរក​ចំណាំ
+bookmarks-tools =
+    .label = ​ឧបករណ�​ចំណាំ
+bookmarks-toolbar-menu =
+    .label = របារ​ឧបករណ�​ចំណាំ
+bookmarks-toolbar-placeholder =
+    .title = ធា�ុ​របារ​ឧបករណ�​​ចំណាំ
+bookmarks-toolbar-placeholder-button =
+    .label = ធា�ុ​របារ​ឧបករណ�​​ចំណាំ
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ចំណាំ
+library-bookmarks-bookmark-this-page =
+    .label = ចំណាំ​ទំព�រ​ន�ះ
+library-bookmarks-bookmark-edit =
+    .label = កែ​សម្រួល​ចំណាំ​ន�ះ
+
+## More items
+
+more-menu-go-offline =
+    .label = ធ្វើ​ការដោយ​គ្មាន​អ៊ីនធឺណិ�
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/kn/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/kn/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/kn/browser/browser/appmenu.ftl	2021-01-06 11:43:00.000000000 +0000
+++ firefox-85.0+build1/l10n/kn/browser/browser/appmenu.ftl	2021-01-18 20:06:09.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = ಹೊಸ ಕಿಟಕಿ
+appmenuitem-new-private-window =
+    .label = ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = ಪೂರ�ಣ ಪರದೆ
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ಈಗಲೆ ಸಿಂಕ� ಮಾಡ�
+appmenuitem-save-page =
+    .label = ಈ ಪ�ಟವನ�ನ� ಹೀಗೆ ಉಳಿಸ�...
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/kn/browser/browser/browser.ftl firefox-85.0+build1/l10n/kn/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/kn/browser/browser/browser.ftl	2021-01-06 11:43:00.000000000 +0000
+++ firefox-85.0+build1/l10n/kn/browser/browser/browser.ftl	2021-01-18 20:06:09.000000000 +0000
@@ -237,6 +237,9 @@
 browser-window-close-button =
     .tooltiptext = ಮ�ಚ�ಚ�
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -302,3 +305,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ಯ� ನಿಮ�ಮ ಪಾಯಿಂಟರ���ನ ನಿಯಂತ�ರಣ ಹೊಂದಿದೆ. ನಿಯಂತ�ರಣ ಹಿಂಪಡೆಯಲ� ಎಸ�ಕೇಪ� ಪ�ರೆಸ� ಮಾಡಿ.
 pointerlock-warning-no-domain = ಈ ದಸ�ತಾವೇಜ� ನಿಮ�ಮ ಪಾಯಿಂಟರ���ನ ನಿಯಂತ�ರಣ ಹೊಂದಿದೆ. ನಿಯಂತ�ರಣ ಹಿಂಪಡೆಯಲ� ಎಸ�ಕೇಪ� ಪ�ರೆಸ� ಮಾಡಿ.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ಎಲ�ಲಾ ಪ�ಟಗ�ರ�ತ�ಗಳನ�ನ� ತೋರಿಸ�
+bookmarks-recent-bookmarks =
+    .value = ಇತ�ತೀಚಿಗೆ ಮಾಡಲಾದ ಪ�ಟಗ�ರ�ತ�ಗಳ�
+bookmarks-toolbar-chevron =
+    .tooltiptext = ಇನ�ನಷ�ಟ� ಪ�ಟಗ�ರ�ತ�ಗಳನ�ನ� ತೋರಿಸ�
+bookmarks-sidebar-content =
+    .aria-label = ಪ�ಟಗ�ರ�ತ�ಗಳ�
+bookmarks-menu-button =
+    .label = ಪ�ಟಗ�ರ�ತ�ಗಳ ಪರಿವಿಡಿ
+bookmarks-other-bookmarks-menu =
+    .label = ಇತರೆ ಪ�ಟಗ�ರ�ತ�ಗಳ�
+bookmarks-mobile-bookmarks-menu =
+    .label = ಮೊಬೈಲ� ಬ�ಕ�‌ಮಾರ�ಕ�ಗಳ�
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ಪ�ಟಗ�ರ�ತ�ಗಳ ಬದಿಪಟ�ಟಿಯನ�ನ� ಅಡಗಿಸ�
+           *[other] ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣಪಟ�ಟಿಯನ�ನ� ನೋಡ�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] �ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣಪಟ�ಟಿಯನ�ನ� ಅಡಗಿಸ�
+           *[other] ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣಪಟ�ಟಿಯನ�ನ� ನೋಡ�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] �ಪ�ಟಗ�ರ�ತ�ಗಳ ಮೆನ�ವನ�ನ� ಉಪಕರಣಪಟ�ಟಿಯಿಂದ ತೆಗೆಯಿರಿ
+           *[other] �ಪ�ಟಗ�ರ�ತ�ಗಳ ಮೆನ�ವನ�ನ� ಉಪಕರಣಪಟ�ಟಿಗೆ ಸೇರಿಸಿ
+        }
+bookmarks-search =
+    .label = ಬ�ಕ�‌ಮಾರ�ಕ�ಗಳಿಗಾಗಿ ಹ�ಡ�ಕ�
+bookmarks-tools =
+    .label = ಬ�ಕ�‌ಮಾರ�ಕ�ಗಳ ಉಪಕರಣಗಳ�
+bookmarks-toolbar-menu =
+    .label = ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣ ಪಟ�ಟಿ
+bookmarks-toolbar-placeholder =
+    .title = ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣ ಪಟ�ಟಿ ಯ ಅಂಶಗಳ�
+bookmarks-toolbar-placeholder-button =
+    .label = ಪ�ಟಗ�ರ�ತ�ಗಳ ಉಪಕರಣ ಪಟ�ಟಿ ಯ ಅಂಶಗಳ�
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ಪ�ಟಗ�ರ�ತ�ಗಳ�
+library-bookmarks-bookmark-this-page =
+    .label = ಈ ಪ�ಟವನ�ನ� ಪ�ಟಗ�ರ�ತ� ಮಾಡ�
+library-bookmarks-bookmark-edit =
+    .label = ಈ ಬ�ಕ�‌ಮಾರ�ಕನ�ನ� ಸಂಪಾದಿಸ�
+
+## More items
+
+more-menu-go-offline =
+    .label = ಆಫ��ಲೈನ��ನಲ�ಲಿ ಕೆಲಸ ಮಾಡ�
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ko/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/aboutLogins.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/aboutLogins.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -168,7 +168,11 @@
 about-logins-confirm-remove-dialog-title = � 로그�� 삭제하시겠습니까?
 confirm-delete-dialog-message = � 작업� 취소할 수 없습니다.
 about-logins-confirm-remove-dialog-confirm-button = 삭제
-about-logins-confirm-remove-all-dialog-confirm-button = 모� 삭제
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] 삭제
+       *[other] 모� 삭제
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] 예, � 로그�� 삭제합니다
@@ -195,6 +199,8 @@
 about-logins-confirm-export-dialog-title = 로그�과 비밀번호 내보내기
 about-logins-confirm-export-dialog-message = 비밀번호는 �� 수 있는 �스트 (예: BadP@ssw0rd)로 저장�므로, 내보낸 파�� 열 수 있는 사람� 누구나 볼 수 있습니다.
 about-logins-confirm-export-dialog-confirm-button = 내보내기…
+about-logins-alert-import-title = 가져오기 완료
+about-logins-alert-import-message = �세한 가져오기 요약 보기
 confirm-discard-changes-dialog-title = 저장�지 않� 변경 내용� 버리시겠습니까?
 confirm-discard-changes-dialog-message = 저장�지 않� 모든 변경 내용� 잃게 �니다.
 confirm-discard-changes-dialog-confirm-button = 버리기
@@ -256,3 +262,26 @@
         [macos] CSV 문서
        *[other] CSV 파�
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = 가져오기 완료
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>추가� 새 로그�:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>업��트� 기존 로그�:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>찾� 중복 로그�:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(가져오지 않�)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>오류:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(가져오지 않�)</span>
+    }
+about-logins-import-dialog-done = 완료
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ko/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/appmenu.ftl	2021-01-06 11:43:04.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/appmenu.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = 새 창
+appmenuitem-new-private-window =
+    .label = 새 사�활 보호 창
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = 확대
 appmenuitem-zoom-reduce =
     .label = 축소
+appmenuitem-fullscreen =
+    .label = 전체 화면
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = 지금 �기화
+appmenuitem-save-page =
+    .label = 다른 �름으로 저장…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = 새 기능
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ko/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/appMenuNotifications.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/appMenuNotifications.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = 나중�
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = 빠른 다시 시작 후 { -brand-shorter-name }가 사�활 보호 모드� 있지 않� 모든 열려있는 탭과 창� 복�합니다.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name }를 ��으로 최신 버전으로 업��트를 할 수 없습니다.
+    .buttonlabel = { -brand-shorter-name } 업��트
+    .buttonaccesskey = U
+    .secondarybuttonlabel = 나중�
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = 새 { -brand-shorter-name } 업��트를 사용할 수 있지만 { -brand-shorter-name }� 다른 복사본� 실행 중�므로 설치할 수 없습니다. 업��트를 계�하려면 복사본� 닫거나 업��트를 선�하세요 (다른 복사본� 다시 시작할 때까지 제대로 작�하지 않� 수 있�).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = 확�
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/browser.ftl firefox-85.0+build1/l10n/ko/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/browser.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/browser.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -495,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> 사�트가 ��터를 제어하려 합니다. 다시 제어하려면 ESC 키를 누르세요.
 pointerlock-warning-no-domain = � 문서가 ��터를 제어하려 합니다. 다시 제어하려면 ESC 키를 누르세요.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = 모든 �마� 보기
+bookmarks-recent-bookmarks =
+    .value = 최근 �마��
+bookmarks-toolbar-chevron =
+    .tooltiptext = �마� �보기
+bookmarks-sidebar-content =
+    .aria-label = �마�
+bookmarks-menu-button =
+    .label = �마� 메뉴
+bookmarks-other-bookmarks-menu =
+    .label = 다른 �마�
+bookmarks-mobile-bookmarks-menu =
+    .label = 모바� �마�
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] �마� �색창 숨기기
+           *[other] �마� �색창 보기
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] �마� �구 모� 숨기기
+           *[other] �마� �구 모� 표시
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] �구 모��서 �마� 메뉴 제거
+           *[other] �구 모�� �마� 메뉴 추가
+        }
+bookmarks-search =
+    .label = �마� 검색
+bookmarks-tools =
+    .label = �마� �구
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = �마� �구 모�
+    .accesskey = B
+    .aria-label = �마�
+bookmarks-toolbar-menu =
+    .label = �마� �구 모�
+bookmarks-toolbar-placeholder =
+    .title = �마� �구 모� 항목
+bookmarks-toolbar-placeholder-button =
+    .label = �마� �구 모� 항목
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = �마�
+library-bookmarks-bookmark-this-page =
+    .label = � 페�지 �마�
+library-bookmarks-bookmark-edit =
+    .label = � �마� 편집
+library-recent-activity-label = 최근 활�
+
+## More items
+
+more-menu-go-offline =
+    .label = 오프��으로 작업
+    .accesskey = w
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/defaultBrowserNotification.ftl firefox-85.0+build1/l10n/ko/browser/browser/defaultBrowserNotification.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/defaultBrowserNotification.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/defaultBrowserNotification.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The question portion of the following message should have the <strong> and </strong> tags surrounding it.
-default-browser-notification-message = <strong>{ -brand-short-name }를 기본 브�우저로 설정하시겠습니까?</strong>웹� 사용할 때마다 빠르고 안전하며 사�활 보호를 할 수 있습니다.
+default-browser-notification-message = <strong>{ -brand-short-name }를 기본 브�우저로 설정하시겠습니까?</strong> 웹� 사용할 때마다 빠르고 안전하며 사�활 보호를 할 수 있습니다.
 default-browser-notification-button =
     .label = 기본값으로 설정
     .accesskey = S
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ko/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/newtab/asrouter.ftl	2021-01-06 11:43:04.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/newtab/asrouter.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -117,6 +117,9 @@
 
 cfr-whatsnew-searchbar-title = 주소 표시줄� � �게 입력하고 � 많� 찾기
 cfr-whatsnew-searchbar-body-topsites = �제 주소 표시줄� 선�하면, ��가 확장�어 �위 사�트� 대한 ��가 표시�니다.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �보기 아�콘
 
 ## Picture-in-Picture
@@ -270,3 +273,13 @@
 
 cfr-whatsnew-search-shortcuts-header = 주소 표시줄� 검색 바로 가기
 cfr-whatsnew-search-shortcuts-body = �제, 검색 엔진�나 특정 사�트를 주소 표시줄� 입력하면 아래� 검색 제안� 파란색 바로 가기가 나타납니다. 주소 표시줄�서 바로 검색� 완료하려면 해당 바로 가기를 선�하세요.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = 악성 슈�쿠키로부터 보호
+cfr-whatsnew-supercookies-body = 웹 사�트는 사용�가 쿠키를 지운 후�� 웹�서 사용�를 추�할 수 있는 "슈�쿠키"를 브�우저� 몰래 첨부할 수 있습니다. { -brand-short-name }는 �제 슈�쿠키� 대한 강력한 보호 기능� 제공하므로 한 사�트�서 다� 사�트로 온�� 활�� 추�하는 � 사용할 수 없습니다.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = � 나� �마�
+cfr-whatsnew-bookmarking-body = �겨찾는 사�트를 � 쉽게 추�할 수 있습니다. �제 { -brand-short-name }는 저장� �마�� 선호 위치를 기억하고, 새 탭� �마� �구 모�� 기본�으로 표시하며, �구 모� ��를 통해 나머지 �마�� 쉽게 액세스할 수 있습니다.
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ko/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/newtab/newtab.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/newtab/newtab.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = 새 탭
 newtab-settings-button =
     .title = 새 탭 페�지 사용� 지정
+newtab-personalize-button-label = 개�화
+    .title = 새 탭 개�화
+    .aria-label = 새 탭 개�화
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = 웹 검색
     .title = 웹 검색
     .aria-label = 웹 검색
+newtab-search-box-text = 웹 검색
+newtab-search-box-input =
+    .placeholder = 웹 검색
+    .aria-label = 웹 검색
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = 검색 엔진 추가
 newtab-topsites-add-topsites-header = 새 �위 사�트
+newtab-topsites-add-shortcut-header = 새 바로 가기
 newtab-topsites-edit-topsites-header = �위 사�트 편집
+newtab-topsites-edit-shortcut-header = 바로 가기 편집
 newtab-topsites-title-label = 제목
 newtab-topsites-title-input =
     .placeholder = 제목 입력
@@ -98,7 +107,7 @@
 newtab-privacy-modal-paragraph-2 =
     매력�� �야기를 정리해서 보여주는 것 �만 아니�, 엄선� 스�서로 부터
     관련성 높� 콘�츠를 보여�니다. 안심하세요. <strong>사용�� �색 ��터는 
-    { -brand-product-name }� 개� 사본� 남기지 않습니다</strong> — 저�와 스�서 모�
+    { -brand-product-name }� 개� 복사본� 남기지 않습니다</strong> — 저�와 스�서 모�
     들여다보지 않습니다.
 newtab-privacy-modal-link = 새 탭�서 개� 정보 보호 작� 방� 알아보기
 
@@ -207,3 +216,26 @@
 
 newtab-error-fallback-info = �런! � 콘�츠를 불러오는� 오류가 발�하였습니다.
 newtab-error-fallback-refresh-link = 페�지를 새로 고침해서 다시 시�하세요.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = 바로 가기
+newtab-custom-shortcuts-subtitle = 저장 �는 방문 사�트
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } í–‰
+    }
+newtab-custom-sponsored-sites = 스�서 바로 가기
+newtab-custom-pocket-title = { -pocket-brand-name } 추천
+newtab-custom-pocket-subtitle = { -brand-product-name } 제품군� �부� { -pocket-brand-name }�서 선별한 뛰어난 콘�츠
+newtab-custom-pocket-sponsored = 스�서 소�
+newtab-custom-recent-title = 최근 활�
+newtab-custom-recent-subtitle = 최근 사�트 � 콘�츠 선�
+newtab-custom-close-button = 닫기
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = 짧� 소�
+newtab-custom-snippets-subtitle = { -vendor-short-name }와 { -brand-product-name }� � � 뉴스
+newtab-custom-settings = � 많� 설정 관리
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/places.ftl firefox-85.0+build1/l10n/ko/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/places.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/places.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = 하위 ��
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = 다른 �마�
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ko/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/preferences/preferences.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/preferences/preferences.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -488,6 +488,11 @@
 home-prefs-topsites-description = 가장 많� 방문한 사�트
 home-prefs-topsites-by-option-sponsored =
     .label = 스�서 �위 사�트
+home-prefs-shortcuts-header =
+    .label = 바로 가기
+home-prefs-shortcuts-description = 저장 �는 방문 사�트
+home-prefs-shortcuts-by-option-sponsored =
+    .label = 스�서 바로 가기
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -495,6 +500,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } 추천
 home-prefs-recommended-by-description-update = { $provider }� �해 �레�션� 웹� 뛰어난 콘�츠
+home-prefs-recommended-by-description-new = { -brand-product-name } 제품군� �부� { $provider }�서 선별한 뛰어난 콘�츠
 
 ##
 
@@ -503,8 +509,6 @@
     .label = 스�서 소�
 home-prefs-highlights-header =
     .label = 하���트
-home-prefs-recent-activity-header =
-    .label = 최근 활�
 home-prefs-highlights-description = 저장하거나 방문한 사�트 모�
 home-prefs-highlights-option-visited-pages =
     .label = 방문한 페�지
@@ -514,6 +518,9 @@
     .label = 가장 최근 다운로드
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }� 저장� 페�지
+home-prefs-recent-activity-header =
+    .label = 최근 활�
+home-prefs-recent-activity-description = 최근 사�트 � 콘�츠 선�
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -521,6 +528,7 @@
 home-prefs-snippets-header =
     .label = 짧� 소�
 home-prefs-snippets-description = { -vendor-short-name }와 { -brand-product-name }� 대한 업��트
+home-prefs-snippets-description-new = { -vendor-short-name }와 { -brand-product-name }� � � 뉴스
 home-prefs-sections-rows-option =
     .label = { $num } í–‰
 
@@ -908,9 +916,16 @@
 addressbar-locbar-openpage-option =
     .label = 열린 탭
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = 바로 가기
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = �위 사�트
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = 검색 엔진
+    .accesskey = a
 addressbar-suggestions-settings = 검색 엔진 제안 설정 변경
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ko/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ko/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ko/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = 새 탭�서만 표시
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = 항� 표시
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = 표시 안 함
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = 새 탭�서만 표시
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = 다른 �마� 표시
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/ko/chat/commands.properties firefox-85.0+build1/l10n/ko/chat/commands.properties
--- firefox-84.0.2+build1/l10n/ko/chat/commands.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/chat/commands.properties	2021-01-18 20:06:14.000000000 +0000
@@ -4,24 +4,24 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands	=명령어: %S\n �세한 정보는 /help <명령어명>� 사용해 주십시오.
+commands=명령어: %S\n �세한 정보는 /help <명령어명>� 사용해 주십시오.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
-noCommand	='%S'�는 명령어는 없습니다.
-noHelp		='%S'명령어� �움� 메시지는 아� 없습니다.
+noCommand='%S'�는 명령어는 없습니다.
+noHelp='%S'명령어� �움� 메시지는 아� 없습니다.
 
-sayHelpString	=say <메시지 >: 명령어를 처리하지 않고 메시지를 송신합니다.
-rawHelpString	=raw <메시지 >: HTML� 빼고 내용만 메시지로 송신합니다.
-helpHelpString	=help <명령어명 >: <명령어명 > 명령어� �움� 메시지를 표시, �는 파�메타 없� 사용하는 경우 가능한 명령어 목�� 표시합니다.
+sayHelpString=say <메시지 >: 명령어를 처리하지 않고 메시지를 송신합니다.
+rawHelpString=�본 &lt;메시지&gt;: HTML 엔터티를 �스케�프하지 않고 메시지를 보냅니다.
+helpHelpString=help <명령어명 >: <명령어명 > 명령어� �움� 메시지를 표시, �는 파�메타 없� 사용하는 경우 가능한 명령어 목�� 표시합니다.
 
 # LOCALIZATION NOTE (statusCommand):
 #  %1$S is replaced with a status command name
 #   (one of "back", "away", "busy", "dnd", or "offline").
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
-statusCommand	=%1$S <�태 메시지 >: 현재 �태를 [%2$S]로 바꾸어 임�로 �태 메시지를 보냅니다.
-back		=�리 있�
-away		=�리 비움 
-busy		=바�
-dnd		=비통지
-offline		=오프��
+statusCommand=%1$S <�태 메시지 >: 현재 �태를 [%2$S]로 바꾸어 임�로 �태 메시지를 보냅니다.
+back=�리 있�
+away=�리 비움 
+busy=바�
+dnd=비통지
+offline=오프��
diff -Nru firefox-84.0.2+build1/l10n/ko/chat/matrix.properties firefox-85.0+build1/l10n/ko/chat/matrix.properties
--- firefox-84.0.2+build1/l10n/ko/chat/matrix.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/chat/matrix.properties	2021-01-18 20:06:14.000000000 +0000
@@ -14,7 +14,7 @@
 #   The _ character won't be displayed; it indicates the next
 #   character of the string should be used as the access key for this
 #   field.
-chatRoomField.room=_Room
+chatRoomField.room=그룹채팅 공간
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
diff -Nru firefox-84.0.2+build1/l10n/ko/devtools/client/markers.properties firefox-85.0+build1/l10n/ko/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ko/devtools/client/markers.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/devtools/client/markers.properties	2021-01-18 20:06:14.000000000 +0000
@@ -25,11 +25,11 @@
 marker.label.parseXML=XML 파싱
 marker.label.domevent=DOM �벤트
 marker.label.consoleTime=콘솔
-marker.label.garbageCollection2=가비지 콜렉션
+marker.label.garbageCollection2=가비지 컬렉션
 marker.label.garbageCollection.incremental=�가형 GC
 marker.label.garbageCollection.nonIncremental=비�가형 GC
 marker.label.minorGC=마�너 GC
-marker.label.cycleCollection=사�틀 콜렉션
+marker.label.cycleCollection=사�� 컬렉션
 marker.label.cycleCollection.forgetSkippable=CC 그래프 �소
 marker.label.timestamp=타임스탬프
 marker.label.worker=Worker
@@ -118,8 +118,9 @@
 marker.gcreason.label.INCREMENTAL_TOO_SLOW=너무 빠른 할당 ��
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=메모리 작�
-marker.gcreason.label.CC_WAITING=사�� 콜랙터가 강제 수행
-marker.gcreason.label.CC_FORCED=사�� 콜랙터가 강제 수행
+marker.gcreason.label.CC_WAITING=사�� 컬렉션� �해 강제 수행
+marker.gcreason.label.CC_FINISHED=사�� 컬렉션 완료
+marker.gcreason.label.CC_FORCED=사�� 컬렉션� �해 강제 수행
 marker.gcreason.label.LOAD_END=페�지 로드 종료
 marker.gcreason.label.PAGE_HIDE=배경으로 전환
 marker.gcreason.label.NSJSCONTEXT_DESTROY=JS 문맥 파기
@@ -135,5 +136,4 @@
 marker.gcreason.label.USER_INACTIVE=사용� 비활성화
 
 # The name of a nursery collection.
-marker.nurseryCollection=너서리 콜렉션
-
+marker.nurseryCollection=너서리 컬렉션
diff -Nru firefox-84.0.2+build1/l10n/ko/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ko/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ko/devtools/client/toolbox.properties	2021-01-06 11:43:04.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/devtools/client/toolbox.properties	2021-01-18 20:06:14.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=스타� 편집기�서 파� 열기
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=개발� �구 닫기
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=콘솔 분할 보기
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ko/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ko/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ko/devtools/client/tooltips.ftl	2021-01-06 11:43:04.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/devtools/client/tooltips.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = 위치가 지정� 요소가 아니기 때문� <strong>{ $property }</strong> �성� � 요소� �향� 미치지 않습니다.
 inactive-text-overflow-when-no-overflow = <strong>overflow:hidden</strong>� 설정�어 있지 않으므로 <strong>{ $property }</strong> �성� � 요소� �향� 미치지 않습니다.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>outline-style</strong> �성� <strong>auto</strong> �는 <strong>none</strong>�기 때문� <strong>{ $property }</strong> �성� � 요소� �향� 미치지 않습니다.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> �성� 내부 테�블 요소� �향� 미치지 않습니다.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> �성� 테�블 셀� 제외하고 내부 테�블 요소� �향� 미치지 않습니다.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = <strong>float</strong>를 제거하거나 <strong>display:block</strong>� 추가해보세요. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = <strong>position</strong> �성� <strong>static</strong> �외� 것으로 설정해 보세요. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = <strong>overflow:hidden</strong>� 추가하세요. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = <strong>display</strong> �성� <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, �는 <strong>table-footer-group</strong> �외� 것으로 설정해 보세요. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = <strong>display</strong> �성� <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, �는 <strong>table-footer-group</strong> �외� 것으로 설정해 보세요. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = <strong>outline-style</strong> �성� <strong>auto</strong> �는 <strong>none</strong> �외� 것으로 설정해보세요. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/ko/devtools/shared/screenshot.properties firefox-85.0+build1/l10n/ko/devtools/shared/screenshot.properties
--- firefox-84.0.2+build1/l10n/ko/devtools/shared/screenshot.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/devtools/shared/screenshot.properties	2021-01-18 20:06:14.000000000 +0000
@@ -79,7 +79,7 @@
 # LOCALIZATION NOTE (screenshotFileManual) A fuller description of the
 # 'file' parameter to the 'screenshot' command. Displayed when the
 # --help flag is passed to the `screenshot command.
-screenshotFileManual=다른 옵션� 활성화(예. �립보드)�어 있어서 파�로 저장해야 한다면 true입니다.
+screenshotFileManual=다른 옵션 (예: �립 보드)� 활성화� 경우�� 스�린샷� 파�� 저장해야 하는 경우 ture입니다.
 
 # LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
 # when no file name is provided. The first argument (%1$S) is the date string
@@ -122,9 +122,9 @@
 # height of the image.
 screenshotTruncationWarning=결과 �미지가 너무 커서 �미지가 %1$S×%2$S �기로 잘렸습니다
 
-# LOCALIZATION NOTE (screenshotDPRDecreasedWarning) Text displayed to user when the
-# screenshot they want to take is for the full page and the Device Pixel Ratio is
-# decreased to 1, to avoid creating images that are too big which may cause errors.
+# LOCALIZATION NOTE (screenshotDPRDecreasedWarning2) Text displayed to user when
+# taking the screenshot initially failed. When the Device Pixel Ratio is larger
+# than 1.0 a second try immediately after displaying this message is attempted.
 screenshotDPRDecreasedWarning=결과 �미지가 너무 커서 기기 픽셀 비율� 1로 �소�었습니다
 
 # LOCALIZATION NOTE (screenshotRenderingError) Text displayed to user upon
diff -Nru firefox-84.0.2+build1/l10n/ko/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ko/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ko/dom/chrome/dom/dom.properties	2021-01-06 11:43:04.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/dom/chrome/dom/dom.properties	2021-01-18 20:06:14.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=사용� 활성화 부족으로 <input> 선�기가 차단�었습니다.
 ExternalProtocolFrameBlockedNoUserActivation=사용� 활성화 부족 �는 마지막 iframe� 로드� �후 시간� 충분하지 않아 외부 프로토콜� 있는 Iframe� 차단�었습니다.
 MultiplePopupsBlockedNoUserActivation=사용� 활성화 부족으로 여러 �업 열기가 차단�었습니다.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=알 수 없는 "as" �는 "type" 값 �는 �치하지 않는 "media" �성으로 �해 %S� 미리로드가 무시�었습니다.
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/chrome/global/extensions.properties firefox-85.0+build1/l10n/ko/toolkit/chrome/global/extensions.properties
--- firefox-84.0.2+build1/l10n/ko/toolkit/chrome/global/extensions.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/chrome/global/extensions.properties	2021-01-18 20:06:14.000000000 +0000
@@ -39,5 +39,5 @@
 homepageControlled.learnMore = � 알아보기
 
 #LOCALIZATION NOTE (tabHideControlled.message) %1$S is the icon and name of the extension which hid tabs, %2$S is the icon of the all tabs button.
-tabHideControlled.message = %1$S 확장 기능� 사용� 탭� �추고 있습니다. %2$S�서 모든 탭� 접근할 수 있습니다.
+tabHideControlled.message = %1$S 확장 기능� �부 탭� 숨기고 있습니다. %2$S�서 모든 탭� 접근할 수 있습니다.
 tabHideControlled.learnMore = � 알아보기
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:06:14.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=�
 
 downloadErrorAlertTitle=다운로드 오류
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=다운로드가 %S 확장 기능� �해 차단�었기 때문� 저장할 수 없습니다.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=다운로드가 확장 기능� �해 차단�었기 때문� 저장할 수 없습니다.
 downloadErrorGeneric=알 수 없는 오류가 발�하여 다운로드를 저장할 수 없습니다.\n\n다시 시�하세요.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/profile/profileSelection.properties firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/profile/profileSelection.properties
--- firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/profile/profileSelection.properties	2021-01-18 20:06:14.000000000 +0000
@@ -50,7 +50,7 @@
 
 flushFailTitle=변경 내용� 저장�지 않�
 # LOCALIZATION NOTE (conflictMessage): %1$S is brandProductName, %2$S is brandShortName.
-conflictMessage=%1$S� 다른 사본� 프로필� 변경했습니다. � 변경하기 전� %2$S를 다시 시작해야 합니다.
+conflictMessage=%1$S� 다른 복사본� 프로필� 변경했습니다. � 변경하기 전� %2$S를 다시 시작해야 합니다.
 flushFailMessage=예�치 못한 오류가 발�하여 변경 내용� 저장하지 못했습니다.
 # LOCALIZATION NOTE (flushFailRestartButton): $S is brandShortName.
 flushFailRestartButton=%S 다시 시작
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ko/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:06:14.000000000 +0000
@@ -7,7 +7,7 @@
 # example: MyApplication 10.0.5
 updateName=%S %S
 
-noThanksButton=취소
+noThanksButton=아니요
 noThanksButton.accesskey=N
 # NOTE: The restartLaterButton string is also used in
 # mozapps/extensions/content/blocklist.js
@@ -42,3 +42,4 @@
 check_error-2152398920=프�시 서버 연결� 거부�었습니다
 check_error-2153390069=서버 ��서가 만료�었습니다 (시스템 시계가 부정확한 경우 정확한 날짜와 시간으로 조정하세요)
 check_error-verification_failed=업��트� 무결성� 확�할 수 없습니다
+check_error-move_failed=설치할 업��트를 준비하지 못했습니다
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/crashreporter/crashreporter.ini firefox-85.0+build1/l10n/ko/toolkit/crashreporter/crashreporter.ini
--- firefox-84.0.2+build1/l10n/ko/toolkit/crashreporter/crashreporter.ini	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/crashreporter/crashreporter.ini	2021-01-18 20:06:14.000000000 +0000
@@ -19,7 +19,7 @@
 CrashReporterSorry=불편� �� 드려 죄송합니다.
 # LOCALIZATION NOTE (CrashReporterDescriptionText2): The %s is replaced with the product name.
 CrashReporterDescriptionText2=%s� 문제가 발�하여 충�했습니다.\n\n문제를 진단하고 해결하는� �움���� 충� 보고서를 보내주실 수 있습니다.
-CrashReporterDefault=� 프로그램� 제조사� 문제�� 보고할 때만 실행 합니다. �접 실행할 수 없습니다.
+CrashReporterDefault=� �용 프로그램� 충� 후 실행�어 �용 프로그램 공급업체� 문제를 보고합니다.  �접 실행해서는 안 �니다.
 Details=�세 보기…
 ViewReportTitle=보고서 내용
 CommentGrayText=�견 추가 (�견� 공개�으로 표시�)
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/about/aboutProfiles.ftl firefox-85.0+build1/l10n/ko/toolkit/toolkit/about/aboutProfiles.ftl
--- firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/about/aboutProfiles.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/toolkit/about/aboutProfiles.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -2,25 +2,22 @@
 # 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/.
 
-
 profiles-title = 프로필 정보
 profiles-subtitle = � 페�지�서는 프로필� 관리할 수 있습니다. ��� 프로필� 분리� 기�과 �마�, 설정, 부가 기능� �함합니다.
 profiles-create = 새 프로필 만들기
 profiles-restart-title = 다시 시작
 profiles-restart-in-safe-mode = 부가 기능� �고 다시 시작…
 profiles-restart-normal = 정��으로 다시 시작…
-profiles-conflict = { -brand-product-name }� 다른 사본� 프로필� 변경했습니다. 변경하기 전� { -brand-short-name }를 다시 시작해야 합니다.
+profiles-conflict = { -brand-product-name }� 다른 복사본� 프로필� 변경했습니다. 변경하기 전� { -brand-short-name }를 다시 시작해야 합니다.
 profiles-flush-fail-title = 변경 내용� 저장�지 않�
 profiles-flush-conflict = { profiles-conflict }
 profiles-flush-failed = 예�치 못한 오류가 발�하여 변경 내용� 저장하지 못했습니다.
 profiles-flush-restart-button = { -brand-short-name } 다시 시작
-
 # Variables:
 #   $name (String) - Name of the profile
 profiles-name = 프로필: { $name }
 profiles-is-default = 기본 프로필
 profiles-rootdir = 루트 디렉터리
-
 # localDir is used to show the directory corresponding to
 # the main profile directory that exists for the purpose of storing data on the
 # local filesystem, including cache files or other data files that may not
@@ -30,28 +27,22 @@
 profiles-localdir = 로컬 디렉터리
 profiles-current-profile = � 프로필� 사용 중�므로 삭제할 수 없습니다.
 profiles-in-use-profile = � 프로필� 다른 프로그램�서 사용하고 있기 때문� 삭제할 수 없습니다.
-
 profiles-rename = �름 변경
 profiles-remove = 삭제
 profiles-set-as-default = 기본 프로필로 설정
 profiles-launch-profile = 새 브�우저�서 프로필 실행
-
 profiles-cannot-set-as-default-title = 기본값으로 설정할 수 없�
 profiles-cannot-set-as-default-message = { -brand-short-name }� 기본 프로필� 변경할 수 없습니다.
-
 profiles-yes = 예
 profiles-no = 아니오
-
 profiles-rename-profile-title = 프로필 �름 변경
 # Variables:
 #   $name (String) - Name of the profile
 profiles-rename-profile = { $name } 프로필 �름 변경
-
 profiles-invalid-profile-name-title = 유효하지 않� 프로필 �름
 # Variables:
 #   $name (String) - Name of the profile
 profiles-invalid-profile-name = "{ $name }"는 프로필 �름으로 사용할 수 없습니다.
-
 profiles-delete-profile-title = 프로필 삭제
 # Variables:
 #   $dir (String) - Path to be displayed
@@ -61,11 +52,8 @@
     프로필 ��터 파�� 같� 삭제하시겠습니까?
 profiles-delete-files = 파� 삭제
 profiles-dont-delete-files = 삭제 안 함
-
 profiles-delete-profile-failed-title = 오류
 profiles-delete-profile-failed-message = � 프로필� 삭제하는 �안 오류가 발�했습니다.
-
-
 profiles-opendir =
     { PLATFORM() ->
         [macos] Finder�서 보기
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ko/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -147,7 +147,7 @@
 media-input-devices-title = 입력 기기
 media-device-name = �름
 media-device-group = 그룹
-media-device-vendor = 벤�
+media-device-vendor = 공급업체
 media-device-state = �태
 media-device-preferred = 기본
 media-device-format = 형�
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = 제3� 모듈
+support-third-party-modules-module = 모듈 파�
+support-third-party-modules-version = 파� 버전
+support-third-party-modules-vendor = 공급업체 정보
+support-third-party-modules-occurrence = 발� 빈�
+support-third-party-modules-process = 프로세스 유형 � ID
+support-third-party-modules-thread = 스레드
+support-third-party-modules-base = Imagebase 주소
+support-third-party-modules-uptime = 프로세스 작� 시간 (ms)
+support-third-party-modules-duration = 로딩 시간 (ms)
+support-third-party-modules-empty = 제3� 모듈� 로드�지 않았습니다.
+support-third-party-modules-no-value = (값 없�)
+support-third-party-modules-button-open =
+    .title = 파� 위치 열기…
+support-third-party-modules-expand =
+    .title = �세한 정보 표시
+support-third-party-modules-collapse =
+    .title = �세한 정보 접기
+support-third-party-modules-unsigned-icon =
+    .title = � 모듈� 서명�지 않�
+support-third-party-modules-folder-icon =
+    .title = 파� 위치 열기…
+support-third-party-modules-down-icon =
+    .title = �세한 정보 표시
+support-third-party-modules-up-icon =
+    .title = �세한 정보 접기
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = 지난 { $days }�간� 충� 보고서
@@ -232,12 +258,12 @@
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = 설명
-gpu-vendor-id = 벤� ID
+gpu-vendor-id = 공급업체 ID
 gpu-device-id = 기기 ID
 gpu-subsys-id = 하위시스템 ID
 gpu-drivers = 드��버
 gpu-ram = RAM
-gpu-driver-vendor = 드��버 공급 업체
+gpu-driver-vendor = 드��버 공급업체
 gpu-driver-version = 드��버 버전
 gpu-driver-date = 드��버 날짜
 gpu-active = 활성화
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ko/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = 다중 화면 � 화면 지�
 experimental-features-multi-pip-description = 여러 화면 � 화면 창� �시� 열 수 있는 기능� 실험�으로 지�합니다.
+experimental-features-http3 =
+    .label = HTTP/3 프로토콜
+experimental-features-http3-description = HTTP/3 프로토콜� 실험�으로 지�합니다.
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ko/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = 페�지:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } / { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = 마지막 페�지
-
+printpreview-homearrow-button =
+    .title = 첫 페�지
+printpreview-previousarrow-button =
+    .title = �전 페�지
+printpreview-nextarrow-button =
+    .title = 다� 페�지
+printpreview-endarrow-button =
+    .title = 마지막 페�지
diff -Nru firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ko/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ko/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:43:05.000000000 +0000
+++ firefox-85.0+build1/l10n/ko/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:06:14.000000000 +0000
@@ -24,6 +24,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = �:
+printui-page-custom-range-input =
+    .aria-label = 사용� 지정 페�지 범위 입력
+    .placeholder = 예: 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = 매수
 printui-orientation = ë°©í–¥
@@ -47,6 +50,7 @@
 printui-options = 옵션
 printui-headers-footers-checkbox = 머리글 � 바닥글 �쇄
 printui-backgrounds-checkbox = 배경 �쇄
+printui-selection-checkbox = 선� �역만 �쇄
 printui-color-mode-label = 색� 모드
 printui-color-mode-color = 컬러
 printui-color-mode-bw = �백
@@ -55,19 +59,29 @@
 printui-margins-min = 최소값
 printui-margins-none = 없�
 printui-margins-custom = 사용� 지정
+printui-margins-custom-inches = 사용� 정� (�치)
 printui-margins-custom-top = 위쪽
+printui-margins-custom-top-inches = 위쪽 (�치)
 printui-margins-custom-bottom = 아래쪽
+printui-margins-custom-bottom-inches = 아래쪽 (�치)
 printui-margins-custom-left = 왼쪽
+printui-margins-custom-left-inches = 왼쪽 (�치)
 printui-margins-custom-right = 오른쪽
+printui-margins-custom-right-inches = 오른쪽 (�치)
 printui-system-dialog-link = 시스템 대화 ��를 사용하여 �쇄…
 printui-primary-button = �쇄
 printui-primary-button-save = 저장
 printui-cancel-button = 취소
+printui-close-button = 닫기
 printui-loading = 미리보기 준비 중
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = �쇄 미리보기
+printui-pages-per-sheet = 용지당 페�지
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = �쇄 중…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/lij/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/lij/browser/browser/aboutCertError.ftl	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/browser/aboutCertError.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -5,42 +5,29 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } o l'adeuvia 'n certificato de seguessa che o no l'é valido.
-
 cert-error-mitm-intro = I sciti dimonstran a seu identitæ pe mezo di certificati, che son distriboii da-e aotoritæ de certificaçion.
-
 cert-error-trust-unknown-issuer-intro = Quarchedun o porrieiva ese apreuvo a provâ a usurpâ l'identitæ do scito. No ti dovieiva anâ avanti.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-trust-unknown-issuer = I sciti dimonstran a seu identitæ pe mezo di certificati. { -brand-short-name } o no se fia de { $hostname } perché o distribotô do seu certificato o l'é sconosciuo, o certificato o l'é aoto-firmou, ò o server o no l'à mandou i certificati intermezi previsti.
-
 cert-error-trust-cert-invalid = O certificato o no l'é fidou perché o l'é pubricou da 'na CA che a no l'é valida.
-
 cert-error-trust-untrusted-issuer = O certificato o no l'é fidou perché o l'é pubricou da un pubricatô no fidou.
-
 cert-error-trust-signature-algorithm-disabled = O certificato o no l'é afidabile perché o l'é stæto firmou co-in algoritmo de firma dizativou in quanto no seguo.
-
 cert-error-trust-expired-issuer = O certificato o no l'é fidou perché o pubricatô o l'é scheito.
-
 cert-error-trust-self-signed = O certificato o no l'é fidou perché s'é firmou da solo.
-
 cert-error-untrusted-default = A fonte de questo certificato a no l'é da fiase.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = Còdice d'erô: <a data-l10n-name="error-code-link">{ $error }</a>
-
 cert-error-symantec-distrust-admin = Ti peu segnalâ o problema a l'aministratô do scito.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP Strict Transport Security: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = Key Pinning HTTP pubrico: { $hasHPKP }
-
 cert-error-details-cert-chain-label = Cadenna de certificati:
+open-in-new-window-for-csp-or-xfo-error = Arvi o scito inte 'n neuvo barcon
 
 ## Messages used for certificate error titles
 
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/browser/aboutDialog.ftl firefox-85.0+build1/l10n/lij/browser/browser/aboutDialog.ftl
--- firefox-84.0.2+build1/l10n/lij/browser/browser/aboutDialog.ftl	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/browser/aboutDialog.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -4,54 +4,37 @@
 
 aboutDialog-title =
     .title = Informaçioin rigoardo { -brand-full-name }
-
-releaseNotes-link = Novitæ
-
+releaseNotes-link = Cöse gh’é de neuvo
 update-checkForUpdatesButton =
     .label = Contròlla agiornamenti
     .accesskey = C
-
 update-updateButton =
     .label = Arvi torna { -brand-shorter-name } pe agiornâ
     .accesskey = R
-
 update-checkingForUpdates = Çerco i agiornamenti…
 update-downloading = <img data-l10n-name="icon"/>Descarego agiornamenti — <label data-l10n-name="download-status"/>
 update-applying = Instalaçion de l'agiornamento…
-
 update-failed = Agiornamento no ariescio. <label data-l10n-name="failed-link">Descarega l'urtima verscion</label>
 update-failed-main = Agiornamento no ariescio. <a data-l10n-name="failed-link-main">Descarega l'urtima verscion</a>
-
 update-adminDisabled = I agiornamenti en dizabilitæ da-o teu aministratô do scistema
 update-noUpdatesFound = { -brand-short-name } o l'é agiornòu
 update-otherInstanceHandlingUpdates = Agiornamento de { -brand-short-name } inte n'atra istansa
-
 update-manual = I agiornamenti en in <label data-l10n-name="manual-link"/>
-
 update-unsupported = No l'é poscibile instalâ atri agiornamenti in sce sto scistema.<label data-l10n-name="unsupported-link">Atre informaçioin</label>
-
 update-restarting = Arvo torna…
-
 channel-description = Òua ti ê into canâ de agiornamento <label data-l10n-name="current-channel"></label>.
-
 warningDesc-version = { -brand-short-name } o l'é sperimentale e o peu ese instabile.
-
 community-exp = <label data-l10n-name="community-exp-mozillaLink">{ -vendor-short-name }</label> a l'é 'na <label data-l10n-name="community-exp-creditsLink">comunitæ globale</label> ch'a travaggia insemme pe mantegnî a Ræ averta, pubrica e acesibile a tutti.
-
 community-2 = { -brand-short-name } o l'é fæto da <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, 'na <label data-l10n-name="community-creditsLink">comunitæ globale</label> ch'a travaggia insemme pe mantegnî a Ræ averta, pubrica e acesibile a tutti.
-
 helpus = Ti ne veu agiutâ? <label data-l10n-name="helpus-donateLink">Fanni 'na donaçion</label> ò <label data-l10n-name="helpus-getInvolvedLink">travaggia con niatri</label>
-
 bottomLinks-license = Informaçion de licensa
 bottomLinks-rights = Diritti de l'utente
 bottomLinks-privacy = Informativa in sciâ privacy
-
 # Example of resulting string: 66.0.1 (64-bit)
 # Variables:
 #   $version (String): version of Firefox, e.g. 66.0.1
 #   $bits (Number): bits of the architecture (32 or 64)
 aboutDialog-version = { $version } ({ $bits }-bit)
-
 # Example of resulting string: 66.0a1 (2019-01-16) (64-bit)
 # Variables:
 #   $version (String): version of Firefox for Nightly builds, e.g. 66.0a1
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/lij/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/lij/browser/browser/appmenu.ftl	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/browser/appmenu.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Neuvo barcon
+appmenuitem-new-private-window =
+    .label = Neuvo barcon privòu
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Aomenta zoom
 appmenuitem-zoom-reduce =
     .label = Riduci zoom
+appmenuitem-fullscreen =
+    .label = A tutto schermo
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Scincronizza òua
+appmenuitem-save-page =
+    .label = Sarva pagina co-o nomme…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Cöse gh'é de neuvo
-
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/browser/browser.ftl firefox-85.0+build1/l10n/lij/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/lij/browser/browser/browser.ftl	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/browser/browser.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -299,6 +299,9 @@
 browser-window-close-button =
     .tooltiptext = Særa
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -378,3 +381,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> o l'à o contròllo do teu pontatô. Sciacca ESC pe pigiâ torna o controllo.
 pointerlock-warning-no-domain = Sto documento o l'à o contròllo do teu pontatô. Sciacca ESC pe pigiâ torna o controllo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Fanni vedde tutti i segnalibbri
+bookmarks-recent-bookmarks =
+    .value = Segnalibbri reçenti
+bookmarks-toolbar-chevron =
+    .tooltiptext = Fanni vedde ciù segnalibbri
+bookmarks-sidebar-content =
+    .aria-label = Segnalibbri
+bookmarks-menu-button =
+    .label = Menû di segnalibbri
+bookmarks-other-bookmarks-menu =
+    .label = Atri segnalibbri
+bookmarks-mobile-bookmarks-menu =
+    .label = Segnalibbri mòbili
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ascondi bara di segnalibbri
+           *[other] Veddi a bara de scianco segnalibbri
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ascondi bara di segnalibbri
+           *[other] Fanni vedde a bara di segnalibbri
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Scancella menû di segnalibbri a-a bara di atressi
+           *[other] Azonzi o menû di segnalibbri a-a bara di atressi
+        }
+bookmarks-search =
+    .label = Çerca segnalibbri
+bookmarks-tools =
+    .label = Atressi di segnalibbri
+bookmarks-toolbar-menu =
+    .label = Bara di segnalibbri
+bookmarks-toolbar-placeholder =
+    .title = Ã’getti da bara di segnalibbri
+bookmarks-toolbar-placeholder-button =
+    .label = Ã’getti da bara di segnalibbri
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Segnalibbri
+library-bookmarks-bookmark-this-page =
+    .label = Azonzi questa pagina a-i segnalibbri
+library-bookmarks-bookmark-edit =
+    .label = Cangia segnalibbro
+
+## More items
+
+more-menu-go-offline =
+    .label = Lòua feua linia
+    .accesskey = L
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/browser/menubar.ftl firefox-85.0+build1/l10n/lij/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/lij/browser/browser/menubar.ftl	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/browser/menubar.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -3,6 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+# NOTE: For English locales, strings in this file should be in APA-style Title Case.
+# See https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case
+#
+# NOTE: For Engineers, please don't re-use these strings outside of the menubar.
+
+
 ## File Menu
 
 menu-file =
@@ -12,7 +18,7 @@
     .label = Neuvo feuggio
     .accesskey = N
 menu-file-new-container-tab =
-    .label = Neuvo feuggio contenitô
+    .label = Neuvo feuggio contegnitô
     .accesskey = c
 menu-file-new-window =
     .label = Neuvo barcon
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/lij/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/accounts.properties	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/chrome/browser/accounts.properties	2021-01-18 20:06:18.000000000 +0000
@@ -16,12 +16,41 @@
 verificationNotSentTitle = No se peu mandâ a verifica
 verificationNotSentBody = Òua no ariescimmo a mandâ 'na email de verifica, pe piaxei preuva torna dòppo.
 
+# LOCALIZATION NOTE (deviceConnDisconnTitle) - the title shown in a notification
+# when either this device or another device has connected to, or disconnected
+# from, a Firefox Account.
+
+# LOCALIZATION NOTE (otherDeviceConnectedBody, otherDeviceConnectedBody.noDeviceName)
+# These strings are used in a notification shown when a new device joins the
+# Firefox account.
+# %S is the name of the new device; otherDeviceConnectedBody.noDeviceName is shown
+# instead of otherDeviceConnectedBody when the name is not known.
+otherDeviceConnectedBody = Sto computer oua o l’é connesso con %S.
+otherDeviceConnectedBody.noDeviceName = Sto computer oua o l’é stæto connesso con un neuvo dispoxitivo.
+
+# LOCALIZATION NOTE (thisDeviceConnectedBody) - used in a notification shown
+# after a Firefox Account is connected to the current device.
+
+# LOCALIZATION NOTE (thisDeviceDisconnectedBody) - used in a notification shown
+# after the Firefox Account was disconnected remotely.
+
 # LOCALIZATION NOTE (sendToAllDevices.menuitem)
 # Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
 sendToAllDevices.menuitem = Manda a tutti i dispoxitivi
 
+# LOCALIZATION NOTE (manageDevices.menuitem)
+# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
+
+# LOCALIZATION NOTE (sendTabToDevice.unconfigured, sendTabToDevice.unconfigured.label2)
+# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
+# and the Sync account is unconfigured. Redirects to a marketing page.
 sendTabToDevice.unconfigured = Informaçioin in sciâ spediçion di feuggi…
 
+# LOCALIZATION NOTE (sendTabToDevice.signintofxa)
+# Displayed in the Send Tabs context menu and the page action panel when FxA is not
+# configured. Allows users to immediately sign into FxA via the preferences.
+# %S is replaced by brandProductName.
+
 # LOCALIZATION NOTE (sendTabToDevice.singledevice, sendTabToDevice.connectdevice,
 # sendTabToDevice.singledevice.status)
 # Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
@@ -79,3 +108,13 @@
 # Used as a default header for the FxA toolbar menu.
 account.title = Conto
 
+# LOCALIZATION NOTE (account.accountSettings):
+# Used as the description below user's email in the FxA toolbar menu.
+
+# LOCALIZATION NOTE (account.finishAccountSetup):
+# Used as the FxA toolbar menu item value when user has not
+# finished setting up an account.
+
+# LOCALIZATION NOTE (account.reconnectToFxA):
+# Used as the FxA toolbar menu item title when the user
+# needs to reconnect their account.
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/lij/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/browser.properties	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/chrome/browser/browser.properties	2021-01-18 20:06:18.000000000 +0000
@@ -15,7 +15,6 @@
 # %2$S is the selection string.
 contextMenuSearch=Riçerca "%2$S" con %1$S
 contextMenuSearch.accesskey=r
-
 # LOCALIZATION NOTE (contextMenuPrivateSearchOtherEngine): %S is the search
 # engine name as set for Private Browsing mode. This label is only used when
 # this engine is different from the default engine name used in normal mode.
@@ -45,7 +44,6 @@
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # the administration can add to the message.
 
-
 # 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.
@@ -272,6 +270,8 @@
 
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+
 crashedpluginsMessage.title=O plugin %S o s'é ciantou.
 crashedpluginsMessage.reloadButton.label=Carega torna a pagina
 crashedpluginsMessage.reloadButton.accesskey=R
@@ -392,7 +392,7 @@
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=Arvi neuvo feuggio (%S)
-
+newTabAlwaysContainer.tooltip=Çerni un contegnitô pe arvî un neuvo feuggio
 
 # Offline web applications
 offlineApps.available2=Ti veu permette a %S de sarvâ dæti into computer?
@@ -442,19 +442,16 @@
 identity.identified.verified_by_you=T’æ azonto 'na eceçion de seguessa pe sto scito.
 identity.identified.state_and_country=%S, %S
 
-
 # LOCALIZATION NOTE (identity.notSecure.label):
 # Keep this string as short as possible, this is displayed in the URL bar
 # use a synonym for "safe" or "private" if "secure" is too long.
 identity.notSecure.label=No seguo
-
 identity.notSecure.tooltip=A conescion a no l'é segua
 
 identity.extension.label=Estenscion (%S)
 identity.extension.tooltip=Caregou da l'estenscion: %S
 identity.showDetails.tooltip=Fanni vedde i detalli da conescion
 
-
 # LOCALIZATION NOTE (contentBlocking.trackersView.blocked.label):
 #   This label is shown next to a tracker in the trackers subview.
 #   It forms the end of the (imaginary) sentence "www.example.com [was] Blocked"
@@ -502,8 +499,6 @@
 #   It forms the end of the (imaginary) sentence "www.example.com [was] Blocked"
 contentBlocking.cryptominersView.blocked.label=Blocòu
 
-# LOCALIZATION NOTE (contentBlocking.socialblock.prompt): %S is brandShortName
-
 # LOCALIZATION NOTE (trackingProtection.icon.noTrackersDetectedTooltip): %S is brandShortName.
 
 # LOCALIZATION NOTE (protections.header):
@@ -583,8 +578,12 @@
 geolocation.dontAllowLocation.accesskey=N
 geolocation.shareWithSite3=Ti veu dâ o permisso a %S de acede a teu localizaçion?
 geolocation.shareWithFile3=Ti permetti che sto schedaio locale o l'acede a-a teu lòcaçion?
+# LOCALIZATION NOTE(geolocation.shareWithSiteUnsafeDelegation):
+# %1$S is the first party origin, %2$S is the third party origin.
 geolocation.remember=Aregòrda sta decixon
 
+# Virtual Reality Device UI
+
 # Persistent storage UI
 persistentStorage.allow=Permetti
 persistentStorage.allow.accesskey=P
@@ -687,6 +686,16 @@
 getUserMedia.shareScreenAndAudioCapture3.message = Permette a %S de sentî l'òudio de sto feuggio e vedde o schermo?
 getUserMedia.shareAudioCapture2.message = Permette a %S de sentî l'òudio de sto feuggio?
 
+# LOCALIZATION NOTE (getUserMedia.shareCameraUnsafeDelegation.message,
+#                    getUserMedia.shareMicrophoneUnsafeDelegation.message,
+#                    getUserMedia.shareScreenUnsafeDelegation.message,
+#                    getUserMedia.shareCameraAndMicrophoneUnsafeDelegation.message,
+#                    getUserMedia.shareCameraAndAudioCaptureUnsafeDelegation.message,
+#                    getUserMedia.shareScreenAndMicrophoneUnsafeDelegation.message,
+#                    getUserMedia.shareScreenAndAudioCaptureUnsafeDelegation.message,
+# %1$S is the first party origin.
+# %2$S is the third party origin.
+
 # LOCALIZATION NOTE (getUserMedia.shareScreenWarning.message): NB: inserted via innerHTML, so please don't use <, > or & in this string.
 # %S will be the 'learn more' link
 getUserMedia.shareScreenWarning.message = Condividdi o schermo solo con sciti che ti fii. A condivixon a peu permette sciti grammi de navegâ comme fisi ti e aröbâ dæti privæ. %S
@@ -958,6 +967,13 @@
 storageAccess.Allow.accesskey = P
 storageAccess.DontAllow.label = Blòcca l'accesso
 storageAccess.DontAllow.accesskey = B
+# LOCALIZATION NOTE (storageAccess2.message):
+# %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
+# %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
+
+# LOCALIZATION NOTE (storageAccess3.message, storageAccess.hintText):
+# %1$S and %3$S are both the name of the site URL (www.site1.example) trying to track the user's activity.
+# %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
 
 
 
@@ -968,9 +984,10 @@
 confirmationHint.pinTab.label = Apontou!
 confirmationHint.pinTab.description = Sciacca drito in sciô feuggio pe tiâlo zu.
 
-
 # LOCALIZATION NOTE (livebookmarkMigration.title):
 # Used by the export of user's live bookmarks to an OPML file as a title for the file.
 # %S will be replaced with brandShortName
 livebookmarkMigration.title                      = Segnalibbri dò-u vivo de %S
 
+# LOCALIZATION NOTE (gnomeSearchProviderSearch):
+# Used for search by Gnome Shell activity screen, %S is a searched string.
diff -Nru firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/newInstall.dtd firefox-85.0+build1/l10n/lij/browser/chrome/browser/newInstall.dtd
--- firefox-84.0.2+build1/l10n/lij/browser/chrome/browser/newInstall.dtd	2021-01-06 11:43:16.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/browser/chrome/browser/newInstall.dtd	2021-01-18 20:06:18.000000000 +0000
@@ -7,7 +7,7 @@
  revision number of a given Firefox channel". These terms are not synonymous.
 -->
 
-<!ENTITY window.title "Notiçie inportanti">
+<!ENTITY window.title "Notiçie inportante">
 <!ENTITY window.style "width: 490px">
 <!ENTITY sync "Pe scincronizâ e informaçioin za sarvæ in Firefox con sta instalaçion de &brandShortName;, intra co-o teu &syncBrand.fxAccount.label;.">
 <!ENTITY continue-button "Continoa">
diff -Nru firefox-84.0.2+build1/l10n/lij/dom/dom/media.ftl firefox-85.0+build1/l10n/lij/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/lij/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/dom/dom/media.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/lij/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/lij/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/lij/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/lij/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:06:18.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/lt/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/aboutLogins.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/aboutLogins.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Pašalinti šį prisijungimą?
 confirm-delete-dialog-message = Atlikus šį veiksmą, jo atšaukti neįmanoma.
 about-logins-confirm-remove-dialog-confirm-button = Pašalinti
-about-logins-confirm-remove-all-dialog-confirm-button = Pašalinti visus
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Pašalinti
+        [one] Pašalinti
+        [few] Pašalinti visus
+       *[other] Pašalinti visus
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Taip, pašalinti šį prisijungimą
@@ -207,6 +213,8 @@
 about-logins-confirm-export-dialog-title = Eksportuoti prisijungimus ir slaptažodžius
 about-logins-confirm-export-dialog-message = Jūsų slaptažodžiai bus įrašyti kaip perskaitomas tekstas (pvz., BlogasSl@ptaz0dis), tad bet kas galintis atverti eksportuotą failą galės juos peržiūrėti.
 about-logins-confirm-export-dialog-confirm-button = Eksportuoti…
+about-logins-alert-import-title = Importas baigtas
+about-logins-alert-import-message = Rodyti išsamią importo suvestinę
 confirm-discard-changes-dialog-title = Atsisakyti neįrašytų pakeitimų?
 confirm-discard-changes-dialog-message = Visi neįrašyti pakeitimai bus prarasti.
 confirm-discard-changes-dialog-confirm-button = Atsisakyti
@@ -268,3 +276,34 @@
         [macos] CSV failas
        *[other] CSV failas
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importas baigtas
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>PridÄ—tas naujas prisijungimas:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>PridÄ—ti nauji prisijungimai:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Pridėta naujų prisijungimų:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Atnaujintas esamas prisijungimas:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Atnaujinti esami prisijungimai:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Atnaujinta esamų prisijungimų:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Rastas pasikartojantis prisijungimas:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+        [few] <span>Rasti pasikartojantys prisijungimai:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+       *[other] <span>Rasta pasikartojan�ių prisijungimų:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Klaida:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+        [few] <span>Klaidos:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+       *[other] <span>Klaidų:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(neimportuota)</span>
+    }
+about-logins-import-dialog-done = Atlikta
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/lt/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/appmenu.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/appmenu.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Naujas langas
+appmenuitem-new-private-window =
+    .label = Naujas privataus naršymo langas
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Padidinti
 appmenuitem-zoom-reduce =
     .label = Sumažinti
+appmenuitem-fullscreen =
+    .label = Visas ekranas
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinchronizuoti dabar
+appmenuitem-save-page =
+    .label = Įrašyti kaip…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Kas naujo
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/lt/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/appMenuNotifications.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/appMenuNotifications.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ne dabar
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Po greito perleidimo, „{ -brand-shorter-name }“ atkurs visas jūsų atviras korteles ir langus, kurie nėra priva�iojo naršymo veiksenoje.
+appmenu-update-other-instance =
+    .label = Automatinis „{ -brand-shorter-name }“ naujinimas nepavyko.
+    .buttonlabel = Vis tiek naujinti „{ -brand-shorter-name }“
+    .buttonaccesskey = V
+    .secondarybuttonlabel = Ne dabar
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Yra išleistas „{ -brand-shorter-name }“ naujinimas, ta�iau jo negalima įdiegti dėl šiuo metu veikian�ios kitos „{ -brand-shorter-name }“ kopijos. Užverkite ją, norėdami tęsti naujinimą, arba pasirinkite „Vis tiek naujinti“ (kita kopija gali veikti netinkamai, kol nepaleisite iš naujo).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Gerai, supratau
     .buttonaccesskey = G
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/browser.ftl firefox-85.0+build1/l10n/lt/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/browser.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/browser.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -505,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> valdo jūsų žymeklį. Spustelėkite Esc, norėdami atgauti valdymą.
 pointerlock-warning-no-domain = Šis dokumentas valdo jūsų žymeklį. Spustelėkite Esc, norėdami atgauti valdymą.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Rodyti visÄ… adresynÄ…
+bookmarks-recent-bookmarks =
+    .value = Paskiausiai įtraukti į adresyną
+bookmarks-toolbar-chevron =
+    .tooltiptext = Kiti adresai
+bookmarks-sidebar-content =
+    .aria-label = Adresynas
+bookmarks-menu-button =
+    .label = Adresyno meniu
+bookmarks-other-bookmarks-menu =
+    .label = Kiti adresai
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilusis adresynas
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Nerodyti adresyno parankinÄ—je
+           *[other] Rodyti adresynÄ… parankinÄ—je
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] SlÄ—pti adresyno juostÄ…
+           *[other] Rodyti adresyno juostÄ…
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Išimti adresyno meniu iš priemonių juostos
+           *[other] Pridėti adresyno meniu į priemonių juostą
+        }
+bookmarks-search =
+    .label = Ieškoti adresyne
+bookmarks-tools =
+    .label = Adresyno priemonÄ—s
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Adresyno juosta
+    .accesskey = A
+    .aria-label = Adresynas
+bookmarks-toolbar-menu =
+    .label = Adresyno juosta
+bookmarks-toolbar-placeholder =
+    .title = Adresyno juostos elementai
+bookmarks-toolbar-placeholder-button =
+    .label = Adresyno juostos elementai
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Adresynas
+library-bookmarks-bookmark-this-page =
+    .label = Įrašyti į adresyną
+library-bookmarks-bookmark-edit =
+    .label = Taisyti adresyno įrašą
+library-recent-activity-label = Paskiausia veikla
+
+## More items
+
+more-menu-go-offline =
+    .label = Atsijungti nuo tinklo
+    .accesskey = t
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/lt/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/newtab/asrouter.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/newtab/asrouter.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -129,6 +129,9 @@
 
 cfr-whatsnew-searchbar-title = Rašykite mažiau, raskite daugiau su adreso juosta
 cfr-whatsnew-searchbar-body-topsites = Dabar jums spustelėjus ant adreso juostos, pasirodys jūsų lankomiausių svetainių sąrašas.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Didinamojo stiklo piktograma
 
 ## Picture-in-Picture
@@ -286,3 +289,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Paieškos leistukai adreso lauke
 cfr-whatsnew-search-shortcuts-body = Dabar jums renkant ieškyklės ar tam tikros svetainės pavadinimą adreso lauke, žemiau esan�iuose paieškos siūlymuose pasirodys mėlynas leistukas. Pasirinkę šį leistuką, paiešką įvykdysite tiesiai iš adreso lauko.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Apsauga nuo kenkėjiškų „super“ slapukų
+cfr-whatsnew-supercookies-body = Svetainės gali slapta prieš jūsų naršyklės pridėti „super“ slapuką, kuris seks jus naršant, net kai išvalote slapukus. „{ -brand-short-name }“ dabar suteikia stiprią apsaugą nuo „super“ slapukų, tad jie nebegali būtų naudojami sekti jūsų naršymo veiksmus tarp svetainių.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Geresnis adresynas
+cfr-whatsnew-bookmarking-body = Dabar dar lengviau sekti savo mėgstamas svetaines. „{ -brand-short-name }“ nuo šiol įsimena jūsų adresyno įrašų vietą, rodo adresyno juostą naujose kortelėse, ir suteikia jums lengvą priėjimą prie likusio adresyno per priemonių juostos aplanką.
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/lt/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/newtab/newtab.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/newtab/newtab.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nauja kortelÄ—
 newtab-settings-button =
     .title = Tinkinkite savo naujos kortelės puslapį
+newtab-personalize-button-label = Tinkinti
+    .title = Tinkinti naujÄ… kortelÄ™
+    .aria-label = Tinkinti naujÄ… kortelÄ™
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Ieškokite saityne
     .title = Ieškokite saityne
     .aria-label = Ieškokite saityne
+newtab-search-box-text = Ieškokite saityne
+newtab-search-box-input =
+    .placeholder = Ieškokite saityne
+    .aria-label = Ieškokite saityne
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Pridėti ieškyklę
 newtab-topsites-add-topsites-header = Nauja mÄ—gstama svetainÄ—
+newtab-topsites-add-shortcut-header = Naujas leistukas
 newtab-topsites-edit-topsites-header = Redaguoti mÄ—gstamÄ… svetainÄ™
+newtab-topsites-edit-shortcut-header = Keisti leistukÄ…
 newtab-topsites-title-label = Pavadinimas
 newtab-topsites-title-input =
     .placeholder = Įveskite pavadinimą
@@ -174,7 +183,7 @@
 newtab-section-header-recent-activity = Paskiausia veikla
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
-newtab-section-header-pocket = Rekomendavo „{ $provider }“
+newtab-section-header-pocket = Rekomenduoja „{ $provider }“
 
 ## Empty Section States: These show when there are no more items in a section. Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 
@@ -207,3 +216,28 @@
 
 newtab-error-fallback-info = Ups, įkeliant šį turinį įvyko klaida.
 newtab-error-fallback-refresh-link = Pabandykite iš naujo įkelti tinklalapį.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Leistukai
+newtab-custom-shortcuts-subtitle = Jūsų įrašytos arba lankomos svetainės
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } eilutÄ—
+        [few] { $num } eilutÄ—s
+       *[other] { $num } eilu�ių
+    }
+newtab-custom-sponsored-sites = Rėmėjų leistukai
+newtab-custom-pocket-title = Rekomenduoja „{ -pocket-brand-name }“
+newtab-custom-pocket-subtitle = Išskirtinis turinys, kuruojamas „{ -pocket-brand-name }“, kuri yra „{ -brand-product-name }“ šeimos dalis
+newtab-custom-pocket-sponsored = Rėmėjų straipsniai
+newtab-custom-recent-title = Paskiausia veikla
+newtab-custom-recent-subtitle = Paskiausiai lankytos svetainės ir žiūrėtas turinys
+newtab-custom-close-button = Užverti
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = IÅ¡karpos
+newtab-custom-snippets-subtitle = Patarimai ir naujienos iš „{ -vendor-short-name }“ ir „{ -brand-product-name }“
+newtab-custom-settings = Keisti daugiau nuostatų
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/places.ftl firefox-85.0+build1/l10n/lt/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/places.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/places.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Poaplankis
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Kiti adresyno įrašai
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/lt/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/preferences/preferences.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/preferences/preferences.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -503,13 +503,19 @@
 home-prefs-topsites-description = Dažniausiai lankomos svetainės
 home-prefs-topsites-by-option-sponsored =
     .label = Rėmėjų svetainės
+home-prefs-shortcuts-header =
+    .label = Leistukai
+home-prefs-shortcuts-description = Jūsų įrašytos arba lankomos svetainės
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Rėmėjų leistukai
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
-    .label = Rekomendavo „{ $provider }“
+    .label = Rekomenduoja „{ $provider }“
 home-prefs-recommended-by-description-update = Išskirtinis turinys iš viso interneto, atrinktas „{ $provider }“
+home-prefs-recommended-by-description-new = Išskirtinis turinys, kuruojamas „{ $provider }“, kuri yra „{ -brand-product-name }“ šeimos dalis
 
 ##
 
@@ -518,8 +524,6 @@
     .label = Rėmėjų straipsniai
 home-prefs-highlights-header =
     .label = Akcentai
-home-prefs-recent-activity-header =
-    .label = Paskiausia veikla
 home-prefs-highlights-description = Aplankytų bei išsaugotų svetainių rinkinys
 home-prefs-highlights-option-visited-pages =
     .label = Aplankyti tinklalapiai
@@ -529,6 +533,9 @@
     .label = Paskiausias atsisiuntimas
 home-prefs-highlights-option-saved-to-pocket =
     .label = Į „{ -pocket-brand-name }“ įrašyti tinklalapiai
+home-prefs-recent-activity-header =
+    .label = Paskiausia veikla
+home-prefs-recent-activity-description = Paskiausiai lankytos svetainės ir žiūrėtas turinys
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,12 +543,13 @@
 home-prefs-snippets-header =
     .label = IÅ¡karpos
 home-prefs-snippets-description = „{ -vendor-short-name }“ ir „{ -brand-product-name }“ naujienos
+home-prefs-snippets-description-new = Patarimai ir naujienos iš „{ -vendor-short-name }“ ir „{ -brand-product-name }“
 home-prefs-sections-rows-option =
     .label =
         { $num ->
             [one] { $num } eilutÄ—
-            [few] { $num } eilu�ių
-           *[other] { $num } eilutÄ—s
+            [few] { $num } eilutÄ—s
+           *[other] { $num } eilu�ių
         }
 
 ## Search Section
@@ -928,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = atvertų kortelių
     .accesskey = v
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Leistukai
+    .accesskey = L
 addressbar-locbar-topsites-option =
     .label = Lankomiausios svetainÄ—s
     .accesskey = L
+addressbar-locbar-engines-option =
+    .label = Ieškyklės
+    .accesskey = e
 addressbar-suggestions-settings = Keisti ieškyklių siūlymų nuostatas
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/lt/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/lt/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/lt/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -62,6 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Tik naujoje kortelÄ—je
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Visada rodyti
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Niekada nerodyti
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Rodyti tik naujoje kortelÄ—je
+    .accesskey = R
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Rodyti kitus adresyno įrašus
     .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/lt/devtools/client/markers.properties firefox-85.0+build1/l10n/lt/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/lt/devtools/client/markers.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/devtools/client/markers.properties	2021-01-18 20:06:24.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Trūksta atminties
 marker.gcreason.label.CC_WAITING=Priverstas ciklų surinkimo
+marker.gcreason.label.CC_FINISHED=Periodinis surinkimas užbaigtas
 marker.gcreason.label.CC_FORCED=Priver�iamas ciklų surinkimo
 marker.gcreason.label.LOAD_END=Tinklalapis įkeltas.
 marker.gcreason.label.PAGE_HIDE=Perkelta į foną
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Saugyklos rinkinys
-
diff -Nru firefox-84.0.2+build1/l10n/lt/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/lt/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/lt/devtools/client/netmonitor.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/devtools/client/netmonitor.properties	2021-01-18 20:06:24.000000000 +0000
@@ -1001,7 +1001,7 @@
 
 # LOCALIZATION NOTE (netmonitor.toolbar.resetSorting): This is the label
 # displayed in the network table header context menu to reset sorting
-netmonitor.toolbar.resetSorting=Atstatyti rūšiavimą
+netmonitor.toolbar.resetSorting=Atstatyti rikiavimÄ…
 
 # LOCALIZATION NOTE (netmonitor.toolbar.resizeColumnToFitContent): This is the label
 # displayed in the network table header context menu to resize a column to fit its content
diff -Nru firefox-84.0.2+build1/l10n/lt/devtools/client/toolbox.properties firefox-85.0+build1/l10n/lt/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/lt/devtools/client/toolbox.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/devtools/client/toolbox.properties	2021-01-18 20:06:24.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Užverti saityno kūrėjų priemones
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Rodyti skeltÄ… pultÄ…
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/lt/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/lt/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/lt/devtools/client/tooltips.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/devtools/client/tooltips.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> nedaro poveikio Å¡iam elementui, kadangi jis nÄ—ra pozicionuotas elementas.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> nedaro poveikio Å¡iam elementui, kadangi nÄ—ra nustatyta <strong>overflow:hidden</strong> savybÄ—.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> nedaro poveikio šiam elementui, kadangi jo savybė <strong>outline-style</strong> turi reikšmę <strong>auto</strong> arba <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> neturi jokios įtakos vidiniams lentelės elementams.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> neturi jokios įtakos vidiniams lentelės elementams, išskyrus langelius.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,7 +48,9 @@
 inactive-css-not-display-block-on-floated-fix = Pabandykite nuimti <strong>float</strong> arba pridÄ—ti <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Pabandykite nustatyti jo <strong>position</strong> savybės reikšmę į kitą negu <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Pabandykite pridÄ—ti <strong>overflow:hidden</strong>. { learn-more }
-inactive-outline-radius-when-outline-style-auto-or-none-fix = Pabandykite nustatyti jo <strong>outline-style</strong> savynės reikšmę į kitą negu <strong>auto</strong> ar <strong>none</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Pabandykite nustatyti jo <strong>display</strong> savybės reikšmę į kitą negu <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, arba <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Pabandykite nustatyti jo <strong>display</strong> savybės reikšmę į kitą negu <strong>table-column</strong>, <strong>table-column</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, arba <strong>table-footer-group</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Pabandykite nustatyti jo <strong>outline-style</strong> savybės reikšmę į kitą negu <strong>auto</strong> ar <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/lt/dom/chrome/accessibility/AccessFu.properties firefox-85.0+build1/l10n/lt/dom/chrome/accessibility/AccessFu.properties
--- firefox-84.0.2+build1/l10n/lt/dom/chrome/accessibility/AccessFu.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/dom/chrome/accessibility/AccessFu.properties	2021-01-18 20:06:24.000000000 +0000
@@ -129,7 +129,6 @@
 main           =       pagrindinis turinys
 navigation     =       navigacija
 search         =       paieška
-
 region         =       sritis
 
 # LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
@@ -139,7 +138,7 @@
 # LOCALIZATION NOTE (tblRowInfo): Semi-colon list of plural forms.
 # Number of rows within the table or grid.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-tblRowInfo = ir #1 eilutės;ir #1 eilu�ių;ir #1 eilu�ių
+tblRowInfo = ir #1 eilutė;ir #1 eilutės;ir #1 eilu�ių
 
 # table or grid cell information
 columnInfo = %S-asis stulpelis
diff -Nru firefox-84.0.2+build1/l10n/lt/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/lt/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/lt/dom/chrome/dom/dom.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/dom/chrome/dom/dom.properties	2021-01-18 20:06:24.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input> pasirinkimas buvo užblokuotas dėl neįvykusio naudotojo veiksmo.
 ExternalProtocolFrameBlockedNoUserActivation=„Iframe“ su išoriniu protokolu buvo užblokuotas dėl neįvykusio naudotojo veiksmo, arba dėl per mažo laiko tarpo nuo nuo paskutinio tokio „iframe“ įkėlimo.
 MultiplePopupsBlockedNoUserActivation=Keleto iškylan�iųjų langų atvėrimas buvo užblokuotas dėl neįvykusio naudotojo veiksmo.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Išankstinis %S įkėlimas buvo ignoruotas dėl nežinomų „as“ arba „type“ reikšmių, arba nesutampan�io „media“ atributo.
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/lt/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/lt/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:06:24.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d.;d.;d.
 
 downloadErrorAlertTitle=Atsiuntimo klaida
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Atsiuntimo nepavyko įrašyti, nes jį blokuoja „%S“.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Atsiuntimo nepavyko įrašyti, nes jį blokuoja priedas.
 downloadErrorGeneric=Siuntinio nepavyko įrašyti dėl nežinomos klaidos.\n\nPabandykite dar kartą.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Liko kelios sekundÄ—s
 timeUnknown2=Liko nežinia kiek
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S išteklius
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/lt/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/lt/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:06:24.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Atmestas ryšys su įgaliotuoju serveriu
 check_error-2153390069=Serverio liudijimas nebegalioja (prašom patikslinti kompiuteryje nurodytą laiką, jei šis netikslus)
 check_error-verification_failed=Nepavyko patikrinti naujinimo duomenų nepažeistumo
+check_error-move_failed=Nepavyko naujinimo paruošti įdiegimui
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/lt/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -185,6 +185,31 @@
 
 ##
 
+support-third-party-modules-title = Tre�iųjų šalių moduliai
+support-third-party-modules-module = Modulio failas
+support-third-party-modules-version = Failo versija
+support-third-party-modules-vendor = Gamintojo informacija
+support-third-party-modules-occurrence = Pasikartojimai
+support-third-party-modules-process = Proceso tipas ir ID
+support-third-party-modules-base = „Imagebase“ adresas
+support-third-party-modules-uptime = Proceso veikimo laikas (ms)
+support-third-party-modules-duration = Įkėlimo trukmė (ms)
+support-third-party-modules-empty = Nėra įkeltų tre�iųjų šalių modulių.
+support-third-party-modules-no-value = (reikšmės nėra)
+support-third-party-modules-button-open =
+    .title = Atverti failą…
+support-third-party-modules-expand =
+    .title = Rodyti detaliÄ… informacijÄ…
+support-third-party-modules-collapse =
+    .title = Suskleisti detaliÄ… informacijÄ…
+support-third-party-modules-unsigned-icon =
+    .title = Šis modulis nėra pasirašytas
+support-third-party-modules-folder-icon =
+    .title = Atverti failą…
+support-third-party-modules-down-icon =
+    .title = Rodyti detaliÄ… informacijÄ…
+support-third-party-modules-up-icon =
+    .title = Suskleisti detaliÄ… informacijÄ…
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/lt/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Keleto vaizdų-vaizde palaikymas
 experimental-features-multi-pip-description = Eksperimentinis keleto vaizdo-vaizde langų, atvertų tuo pa�iu metu, palaikymas.
+experimental-features-http3 =
+    .label = HTTP/3 protokolas
+experimental-features-http3-description = Eksperimentinis HTTP/3 protokolo palaikymas.
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/lt/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Puslapis:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } iš { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Paskutinis puslapis
-
+printpreview-homearrow-button =
+    .title = Pirmas puslapis
+printpreview-previousarrow-button =
+    .title = Ankstesnis puslapis
+printpreview-nextarrow-button =
+    .title = Kitas puslapis
+printpreview-endarrow-button =
+    .title = Paskutinis puslapis
diff -Nru firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/lt/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/lt/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:44:14.000000000 +0000
+++ firefox-85.0+build1/l10n/lt/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:06:24.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = iki
+printui-page-custom-range-input =
+    .aria-label = Įveskite norimą puslapių intervalą
+    .placeholder = pvz., 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopijos
 printui-orientation = Orientacija
@@ -49,6 +52,7 @@
 printui-options = Nuostatos
 printui-headers-footers-checkbox = Spausdinti antraštes ir poraštes
 printui-backgrounds-checkbox = Spausdinti fonÄ…
+printui-selection-checkbox = Spausdinti tik pažymėtą sritį
 printui-color-mode-label = Spalvotas spausdinimas
 printui-color-mode-color = Spalvotai
 printui-color-mode-bw = Juodai ir baltai
@@ -57,19 +61,29 @@
 printui-margins-min = Mažiausios
 printui-margins-none = Jokių
 printui-margins-custom = PasirinktinÄ—s
+printui-margins-custom-inches = PasirinktinÄ—s (coliai)
 printui-margins-custom-top = Viršutinė
+printui-margins-custom-top-inches = Viršutinė (coliai)
 printui-margins-custom-bottom = ApatinÄ—
+printui-margins-custom-bottom-inches = ApatinÄ— (coliai)
 printui-margins-custom-left = KairÄ—
+printui-margins-custom-left-inches = KairÄ— (coliai)
 printui-margins-custom-right = Dešinė
+printui-margins-custom-right-inches = Dešinė (coliai)
 printui-system-dialog-link = Spausdinti naudojant sistemos dialogą…
 printui-primary-button = Spausdinti
 printui-primary-button-save = Įrašyti
 printui-cancel-button = Atsisakyti
+printui-close-button = Užverti
 printui-loading = Ruošiama peržiūra
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Spaudinio peržiūra
+printui-pages-per-sheet = Puslapiai per lapÄ…
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Spausdinama…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/lv/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/lv/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/lv/browser/browser/appmenu.ftl	2021-01-06 11:46:12.000000000 +0000
+++ firefox-85.0+build1/l10n/lv/browser/browser/appmenu.ftl	2021-01-18 20:06:31.000000000 +0000
@@ -10,13 +10,23 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Jauns logs
+appmenuitem-new-private-window =
+    .label = Jauns priv�tais logs
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Pa visu ekr�nu
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinhronizēt
+appmenuitem-save-page =
+    .label = Saglab�t lapu k�…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Kas jauns?
-
diff -Nru firefox-84.0.2+build1/l10n/lv/browser/browser/browser.ftl firefox-85.0+build1/l10n/lv/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/lv/browser/browser/browser.ftl	2021-01-06 11:46:12.000000000 +0000
+++ firefox-85.0+build1/l10n/lv/browser/browser/browser.ftl	2021-01-18 20:06:31.000000000 +0000
@@ -277,6 +277,9 @@
 browser-window-close-button =
     .tooltiptext = Aizvērt
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -346,3 +349,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> kontrolē kursoru. Nospiediet taustiņu Esc, lai atgūtu kontroli.
 pointerlock-warning-no-domain = Šis dokuments kontrolē kursoru. Nospiediet taustiņu Esc, lai atgūtu kontroli.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = R�dīt visas gr�matzīmes
+bookmarks-recent-bookmarks =
+    .value = Nesen saglab�t�s
+bookmarks-toolbar-chevron =
+    .tooltiptext = R�dīt vair�k gr�matzīmju
+bookmarks-sidebar-content =
+    .aria-label = Gr�matzīmes
+bookmarks-menu-button =
+    .label = Gr�matzīmju izvēlne
+bookmarks-other-bookmarks-menu =
+    .label = Citas gr�matzīmes
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil�s gr�matzīmes
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Paslēpt gr�matzīmju s�njoslu
+           *[other] Atvērt gr�matzīmes s�njosl�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Paslēpt gr�matzīmju s�njoslu
+           *[other] Attēlo gr�matzīmes s�nu josl�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Aizv�kt gr�matzīmju izvēlni no rīkjoslas
+           *[other] Pievienot gr�matzīmju izvēlni rīkjoslai
+        }
+bookmarks-search =
+    .label = Meklēt gr�matzīmes
+bookmarks-tools =
+    .label = Gr�matzīmju rīki
+bookmarks-toolbar-menu =
+    .label = Gr�matzīmju rīkjosla
+bookmarks-toolbar-placeholder =
+    .title = Gr�matzīmju rīkjoslas elementi
+bookmarks-toolbar-placeholder-button =
+    .label = Gr�matzīmju rīkjoslas elementi
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Gr�matzīmes
+library-bookmarks-bookmark-this-page =
+    .label = Saglab�t šo lapu gr�matzīmēs
+library-bookmarks-bookmark-edit =
+    .label = Rediģēt šo gr�matzīmi
+
+## More items
+
+more-menu-go-offline =
+    .label = Str�d�t nesaistē
+    .accesskey = r
diff -Nru firefox-84.0.2+build1/l10n/lv/dom/dom/media.ftl firefox-85.0+build1/l10n/lv/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/lv/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/lv/dom/dom/media.ftl	2021-01-18 20:06:31.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/lv/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/lv/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/lv/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/lv/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:06:31.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/mk/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/mk/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/mk/browser/browser/appmenu.ftl	2021-01-06 11:46:16.000000000 +0000
+++ firefox-85.0+build1/l10n/mk/browser/browser/appmenu.ftl	2021-01-18 20:06:35.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �ов прозорец
+appmenuitem-new-private-window =
+    .label = �ов приватен прозорец
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = �а цел екран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Синхронизирај �ега
+appmenuitem-save-page =
+    .label = Сними �траница како…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/mk/browser/browser/browser.ftl firefox-85.0+build1/l10n/mk/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/mk/browser/browser/browser.ftl	2021-01-06 11:46:16.000000000 +0000
+++ firefox-85.0+build1/l10n/mk/browser/browser/browser.ftl	2021-01-18 20:06:35.000000000 +0000
@@ -203,6 +203,9 @@
 browser-window-close-button =
     .tooltiptext = Затвора
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -266,3 +269,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> го контролира вашиот покажувач. Прити�нете Esc за да ја преземете контролата.
 pointerlock-warning-no-domain = Овој документ ви ја презема контролата врз покажувачот. Прити�нете Esc за да �и ја вратите.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Прикажи ги �ите обележувачи
+bookmarks-recent-bookmarks =
+    .value = �еодамна обележани
+bookmarks-toolbar-chevron =
+    .tooltiptext = Покажува уште обележувачи
+bookmarks-sidebar-content =
+    .aria-label = Обележувачи
+bookmarks-menu-button =
+    .label = Мени за обележувачи
+bookmarks-other-bookmarks-menu =
+    .label = Други обележувачи
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобилни обележувачи
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скриј �транична лента �о обележувачи
+           *[other] Прикажи �транична лента �о обележувачи
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скриј алатник �о обележувачи
+           *[other] Прикажи алатник �о обележувачи
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] От�трани мени за обележувачи од алатник
+           *[other] Додај мени за обележувачи во алатник
+        }
+bookmarks-search =
+    .label = Барај во обележувачите
+bookmarks-tools =
+    .label = �латки за обележување
+bookmarks-toolbar-menu =
+    .label = �латник �о обележувачи
+bookmarks-toolbar-placeholder =
+    .title = Ставки во алатникот �о обележувачи
+bookmarks-toolbar-placeholder-button =
+    .label = Ставки во алатникот �о обележувачи
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Обележувачи
+library-bookmarks-bookmark-this-page =
+    .label = Обележи ја оваа �траница
+library-bookmarks-bookmark-edit =
+    .label = Уреди го овој обележувач
+
+## More items
+
+more-menu-go-offline =
+    .label = Работи локално
+    .accesskey = Р
diff -Nru firefox-84.0.2+build1/l10n/mr/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/mr/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/mr/browser/browser/appmenu.ftl	2021-01-06 11:46:20.000000000 +0000
+++ firefox-85.0+build1/l10n/mr/browser/browser/appmenu.ftl	2021-01-18 20:06:39.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = नवीन पटल
+appmenuitem-new-private-window =
+    .label = नवीन खाजगी पटल
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = मोठे करा
 appmenuitem-zoom-reduce =
     .label = छोटे करा
+appmenuitem-fullscreen =
+    .label = पडदाभर
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = आत�ता सिंक करा
+appmenuitem-save-page =
+    .label = पृष�ठ असे साठवा…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = नवीन काय आहे
-
diff -Nru firefox-84.0.2+build1/l10n/mr/browser/browser/browser.ftl firefox-85.0+build1/l10n/mr/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/mr/browser/browser/browser.ftl	2021-01-06 11:46:20.000000000 +0000
+++ firefox-85.0+build1/l10n/mr/browser/browser/browser.ftl	2021-01-18 20:06:39.000000000 +0000
@@ -273,6 +273,9 @@
 browser-window-close-button =
     .tooltiptext = बंद करा
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -344,3 +347,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> कडे आपल�या पॉईंटरचे नियंत�रण आहे. नियंत�रण परत घेण�यासाठी Esc दाबा.
 pointerlock-warning-no-domain = ह�या दस�त�वजाकडे आपल�या पॉईंटरचे नियंत�रण आहे. नियंत�रण परत घेण�यासाठी Esc दाबा.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = सर�व वाचणखूणा दाखवा
+bookmarks-recent-bookmarks =
+    .value = अलिकडील वाचनखूणा
+bookmarks-toolbar-chevron =
+    .tooltiptext = आणखी वाचनखूणा दर�शवा
+bookmarks-sidebar-content =
+    .aria-label = वाचनखूणा
+bookmarks-menu-button =
+    .label = वाचनखूणा यादी
+bookmarks-other-bookmarks-menu =
+    .label = इतर वाचनखूणा
+bookmarks-mobile-bookmarks-menu =
+    .label = मोबाईल वाचनखूणा
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] वाचनखूणांची बाजूपट�टी दृष�टीआड ठेवा
+           *[other] वाचनखूणा साधनपट�टी दृष�य
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] वाचनखूणांची साधनपट�टी दृष�टीआड ठेवा
+           *[other] वाचनखूणा साधनपट�टी दृष�य
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] साधनपट�टीवरील वाचनख�णा मेनू काढा
+           *[other] साधनपट�टी मध�ये वाचनख�णा मेनू जोडा
+        }
+bookmarks-search =
+    .label = वाचनख�णा शोधा
+bookmarks-tools =
+    .label = वाचनख�णा साधने
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = वाचनखूणा साधनपट�टी
+    .accesskey = B
+    .aria-label = वाचनखूणा
+bookmarks-toolbar-menu =
+    .label = वाचनखूणा साधनपट�टी
+bookmarks-toolbar-placeholder =
+    .title = साधनपट�टीतील घटकांना वाचनखूण लावा
+bookmarks-toolbar-placeholder-button =
+    .label = साधनपट�टीतील घटकांना वाचनखूण लावा
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = वाचनखूणा
+library-bookmarks-bookmark-this-page =
+    .label = या पृष�ठास वाचनखूण लावा
+library-bookmarks-bookmark-edit =
+    .label = ही वाचनखूण संपादीत करा
+
+## More items
+
+more-menu-go-offline =
+    .label = ऑफलाईन काम करा
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/mr/dom/dom/media.ftl firefox-85.0+build1/l10n/mr/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/mr/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/mr/dom/dom/media.ftl	2021-01-18 20:06:39.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/mr/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/mr/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/mr/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/mr/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:06:39.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ms/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ms/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ms/browser/browser/appmenu.ftl	2021-01-06 11:46:24.000000000 +0000
+++ firefox-85.0+build1/l10n/ms/browser/browser/appmenu.ftl	2021-01-18 20:06:44.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Tetingkap Baru
+appmenuitem-new-private-window =
+    .label = Tetingkap Peribadi Baru
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Skrin Penuh
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sync Sekarang
+appmenuitem-save-page =
+    .label = Simpan Halaman Sebagai…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/ms/browser/browser/browser.ftl firefox-85.0+build1/l10n/ms/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ms/browser/browser/browser.ftl	2021-01-06 11:46:25.000000000 +0000
+++ firefox-85.0+build1/l10n/ms/browser/browser/browser.ftl	2021-01-18 20:06:44.000000000 +0000
@@ -267,6 +267,9 @@
 browser-window-close-button =
     .tooltiptext = Tutup
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -336,3 +339,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> mempunyai kawalan ke atas penunjuk anda. Tekan Esc untuk mengambil kembali kawalan.
 pointerlock-warning-no-domain = Dokumen ini mempunyai kawalan ke atas penunjuk anda. Tekan Esc untuk mengambil kembali kawalan.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Papar Semua Tandabuku
+bookmarks-recent-bookmarks =
+    .value = Tandabuku Terkini
+bookmarks-toolbar-chevron =
+    .tooltiptext = Papar tandabuku selanjutnya
+bookmarks-sidebar-content =
+    .aria-label = Tandabuku
+bookmarks-menu-button =
+    .label = Menu Tandabuku
+bookmarks-other-bookmarks-menu =
+    .label = Tandabuku Lain
+bookmarks-mobile-bookmarks-menu =
+    .label = Tandabuku Telefon
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sorok Bar sisi Tandabuku
+           *[other] Papar Tandabuku Bar Sisi
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Sorok Bar alat Tandabuku
+           *[other] Papar Bar alat Tandabuku
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Buang Menu Tandabuku daripada Bar alatan
+           *[other] Tambah Menu Tandabuku dalam Bar alatan
+        }
+bookmarks-search =
+    .label = Cari Tandabuku
+bookmarks-tools =
+    .label = Alatan Tandabuku
+bookmarks-toolbar-menu =
+    .label = Bar alatan Tandabuku
+bookmarks-toolbar-placeholder =
+    .title = Item Bar alatan Tandabuku
+bookmarks-toolbar-placeholder-button =
+    .label = Item Bar alatan Tandabuku
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Tandabuku
+library-bookmarks-bookmark-this-page =
+    .label = Tandabuku Halaman Ini
+library-bookmarks-bookmark-edit =
+    .label = Edit Tandabuku Ini
+
+## More items
+
+more-menu-go-offline =
+    .label = Kerja Luar Talian
+    .accesskey = K
diff -Nru firefox-84.0.2+build1/l10n/ms/dom/dom/media.ftl firefox-85.0+build1/l10n/ms/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ms/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ms/dom/dom/media.ftl	2021-01-18 20:06:44.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ms/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ms/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ms/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ms/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:06:44.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/my/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/my/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/my/browser/browser/appmenu.ftl	2021-01-06 11:46:28.000000000 +0000
+++ firefox-85.0+build1/l10n/my/browser/browser/appmenu.ftl	2021-01-18 20:06:48.000000000 +0000
@@ -11,15 +11,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �င်းဒိုးအသစ်
+appmenuitem-new-private-window =
+    .label = သီးသန့်�င်းဒိုးအသစ်
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = �ျဲ့ ကြည့်ရန်
 appmenuitem-zoom-reduce =
     .label = �ျုံ့ကြည့်ရန်
+appmenuitem-fullscreen =
+    .label = အပြည့်ကြည့်ရန်
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ယ�ုပင် Sync ကို အသုံးပြုပါ
+appmenuitem-save-page =
+    .label = စာမျက်နှာကို သိမ်းမည်…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/my/browser/browser/browser.ftl firefox-85.0+build1/l10n/my/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/my/browser/browser/browser.ftl	2021-01-06 11:46:28.000000000 +0000
+++ firefox-85.0+build1/l10n/my/browser/browser/browser.ftl	2021-01-18 20:06:48.000000000 +0000
@@ -365,3 +365,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> သင့်ပွိုင်�ာကို ထိန်း�ျုပ်ထားသည်� ပြန်လည်ရယူရန် Esc ကို နှိပ်ပါ�
 pointerlock-warning-no-domain = ဒီစာ�မ်းသည် သင့်ပွိုင်�ာကို ထိန်း�ျုပ်ထားသည်� ပြန်လည်ရယူရန် Esc ကို နှိပ်ပါ�
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = မှ�်သား�ျက်များအားလုံးကို ပြသပါ
+bookmarks-recent-bookmarks =
+    .value = မကြာသေးမီက မှ�်သားထားသော�ဘ်စာမျက်နှာများ
+bookmarks-toolbar-chevron =
+    .tooltiptext = မှ�်သား�ျက်များကို ပိုမို ဖေါ်ပြသပါ
+bookmarks-sidebar-content =
+    .aria-label = မှ�်သား�ျက်များ
+bookmarks-menu-button =
+    .label = စာမှ�်များစာရင်း
+bookmarks-other-bookmarks-menu =
+    .label = အ�ြား စာမှ�်များ
+bookmarks-mobile-bookmarks-menu =
+    .label = မိုဘိုင်းလ် စာအမှ�်များ
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] စာမှ�်များဘေး�န်းကို ပိ�်ရန်
+           *[other] စာမှ�်များ ဘေး�န်းကို ပြပါ
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] စာမှ�်များအ�န်းကို ပိ�်ရန်
+           *[other] စာမှ�်များ ကိရိယာအ�န်းကို ပြပါ
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] စာမှ�်များစာရင်းကို �န်ဆာပလာအ�န်းမှ ဖယ်ရှားပါ
+           *[other] စာမှ�်များစာရင်းကို �န်ဆာပလာအ�န်း�ွင် ပြပါ
+        }
+bookmarks-search =
+    .label = စာမှ�်များကို ရှာရန်
+bookmarks-tools =
+    .label = စာမှ�်ဆိုင်ရာ �န်ဆာပလာများ
+bookmarks-toolbar-menu =
+    .label = စာမှ�်များကိရိယာအ�န်း
+bookmarks-toolbar-placeholder =
+    .title = စာမှ�်များကိရိယာအ�န်းရှိ အရာများ
+bookmarks-toolbar-placeholder-button =
+    .label = စာမှ�်များကိရိယာအ�န်းရှိ အရာများ
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = စာမှ�်များ
+library-bookmarks-bookmark-this-page =
+    .label = ဒီစာမျက်နှာကို မှ�်သားပါ
+library-bookmarks-bookmark-edit =
+    .label = ဒီစာမှ�်ကို ပြင်ဆင်မည်
+
+## More items
+
+more-menu-go-offline =
+    .label = �ျိ�်ဆက်မဲ့သုံးရန်
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/aboutLogins.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/aboutLogins.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Fjerne denne innloggingen?
 confirm-delete-dialog-message = Denne handlingen kan ikke angres.
 about-logins-confirm-remove-dialog-confirm-button = Fjern
-about-logins-confirm-remove-all-dialog-confirm-button = Fjern alle
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Fjern
+       *[other] Fjern alle
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, fjern denne innloggingen
@@ -198,6 +202,8 @@
 about-logins-confirm-export-dialog-title = Eksporter innlogginger og passord
 about-logins-confirm-export-dialog-message = Passordene dine blir lagret som lesbar tekst (f.eks. DårligP@ss0rd), slik at alle som kan åpne den eksporterte filen kan se dem.
 about-logins-confirm-export-dialog-confirm-button = Eksporter…
+about-logins-alert-import-title = Import fullført
+about-logins-alert-import-message = Se detaljert importoversikt
 confirm-discard-changes-dialog-title = Vil du forkaste endringer som ikke er lagret?
 confirm-discard-changes-dialog-message = Alle ikke-lagrede endringer vil gå tapt.
 confirm-discard-changes-dialog-confirm-button = Forkast
@@ -259,3 +265,26 @@
         [macos] CSV-dokument
        *[other] CSV-fil
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Import fullført
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Nye innloggninger lagt til: </span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Eksisterende innlogginger oppdatert:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Duplikate innlogginger funnet:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ikke importert)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Feil:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ikke importert)</span>
+    }
+about-logins-import-dialog-done = Ferdig
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/appmenu.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/appmenu.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nytt vindu
+appmenuitem-new-private-window =
+    .label = Nytt privat vindu
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Forstørre
 appmenuitem-zoom-reduce =
     .label = Forminske
+appmenuitem-fullscreen =
+    .label = Fullskjerm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synkroniser nå
+appmenuitem-save-page =
+    .label = Lagre side som …
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Hva er nytt
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/appMenuNotifications.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/appMenuNotifications.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ikke nå
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Etter en rask omstart, vil { -brand-shorter-name } gjenopprette alle dine åpne faner og vinduer som ikke er i privat nettlesingsmodus.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kan ikke oppdateres automatisk til den seneste versjonen.
+    .buttonlabel = Oppdater { -brand-shorter-name } likevel
+    .buttonaccesskey = O
+    .secondarybuttonlabel = Ikke nå
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message = En ny { -brand-shorter-name }-oppdatering er tilgjengelig, men den kan ikke installeres fordi en annen kopi av { -brand-shorter-name } kjører. Lukk den for å fortsette oppdateringen, eller velg å oppdatere uansett (den andre kopien fungerer kanskje ikke riktig før du starter den på nytt).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, jeg forstår
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/browser.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/browser.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/browser.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> har kontroll over musepekeren din. Trykk Esc for å ta tilbake kontrollen.
 pointerlock-warning-no-domain = Dette dokumentet har kontroll over musepekeren din. Trykk på Esc for å ta tilbake kontrollen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Vis alle bokmerker
+bookmarks-recent-bookmarks =
+    .value = Nylig bokmerket
+bookmarks-toolbar-chevron =
+    .tooltiptext = Vis flere bokmerker
+bookmarks-sidebar-content =
+    .aria-label = Bokmerker
+bookmarks-menu-button =
+    .label = Bokmerkemeny
+bookmarks-other-bookmarks-menu =
+    .label = Andre bokmerker
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobile bokmerker
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skjul bokmerkesidestolpen
+           *[other] Vis bokmerkesidestolpen
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skjul bokmerkeverktøylinje
+           *[other] Vis bokmerkeverktøylinje
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fjern bokmerkemeny fra verktøylinjen
+           *[other] Legg til bokmerkemeny til verktøylinjen
+        }
+bookmarks-search =
+    .label = Søk i bokmerker
+bookmarks-tools =
+    .label = Verktøy for bokmerker
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bokmerker
+    .accesskey = B
+    .aria-label = Bokmerker
+bookmarks-toolbar-menu =
+    .label = Bokmerker
+bookmarks-toolbar-placeholder =
+    .title = Elementer i bokmerkelinje
+bookmarks-toolbar-placeholder-button =
+    .label = Elementer i bokmerkelinje
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bokmerker
+library-bookmarks-bookmark-this-page =
+    .label = Bokmerk denne siden
+library-bookmarks-bookmark-edit =
+    .label = Rediger dette bokmerket
+library-recent-activity-label = Nylig aktivitet
+
+## More items
+
+more-menu-go-offline =
+    .label = Arbeid frakoblet
+    .accesskey = r
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/newtab/asrouter.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/newtab/asrouter.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Skriv mindre, finn mer med adressefeltet
 cfr-whatsnew-searchbar-body-topsites = Velg adresselinjen, og en boks med lenker til dine mest besøkte nettsteder vil bli vist.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Forstørrelsesglassikon
 
 ## Picture-in-Picture
@@ -280,3 +283,11 @@
 
 cfr-whatsnew-search-shortcuts-header = Søk snarveier i adresselinjen
 cfr-whatsnew-search-shortcuts-body = Når nå du skriver inn en søkemotor eller et spesifikt nettsted i adresselinjen, vises en blå snarvei i søkeforslagene nedenfor. Velg snarveien for å fullføre søket direkte fra adresselinjen.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Beskyttelse mot ondsinnede super-infokapsler
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Bedre bokmerking
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/newtab/newtab.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/newtab/newtab.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Ny fane
 newtab-settings-button =
     .title = Tilpass siden for Ny fane
+newtab-personalize-button-label = Tilpass
+    .title = Tilpass ny fane-side
+    .aria-label = Tilpass ny fane-side
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Søk på nettet
     .title = Søk på nettet
     .aria-label = Søk på nettet
+newtab-search-box-text = Søk på nettet
+newtab-search-box-input =
+    .placeholder = Søk på nettet
+    .aria-label = Søk på nettet
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Legg til søkemotor
 newtab-topsites-add-topsites-header = Nytt toppsted
+newtab-topsites-add-shortcut-header = Ny snarvei
 newtab-topsites-edit-topsites-header = Rediger toppsted
+newtab-topsites-edit-shortcut-header = Rediger snarvei
 newtab-topsites-title-label = Tittel
 newtab-topsites-title-input =
     .placeholder = Oppgi en tittel
@@ -206,3 +215,27 @@
 
 newtab-error-fallback-info = Ups, noe gikk galt når innholdet skulle lastes inn.
 newtab-error-fallback-refresh-link = Oppdater siden for å prøve igjen.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Snarveier
+newtab-custom-shortcuts-subtitle = Nettsteder du lagrer eller besøker
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rad
+       *[other] { $num } rader
+    }
+newtab-custom-sponsored-sites = Sponsede snarveier
+newtab-custom-pocket-title = Anbefalt av { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Eksepsjonelt innhold satt sammen av { -pocket-brand-name }, en del av { -brand-product-name }-familien
+newtab-custom-pocket-sponsored = Sponsede historier
+newtab-custom-recent-title = Nylig aktivitet
+newtab-custom-recent-subtitle = Et utvalg av nylige nettsteder og innhold
+newtab-custom-close-button = Lukk
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snutter
+newtab-custom-snippets-subtitle = Tips og nyheter fra { -vendor-short-name } og { -brand-product-name }
+newtab-custom-settings = Behandle flere innstillinger
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/places.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/places.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/places.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Undermappe
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Andre bokmerker
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/preferences/preferences.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/preferences/preferences.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Mest besøkte nettsteder
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsede toppsider
+home-prefs-shortcuts-header =
+    .label = Snarveier
+home-prefs-shortcuts-description = Nettsteder du lagrer eller besøker
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsede snarveier
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Anbefalt av { $provider }
 home-prefs-recommended-by-description-update = Enestående innhold fra hele nettet, satt sammen av { $provider }
+home-prefs-recommended-by-description-new = Eksepsjonelt innhold satt sammen av { $provider }, en del av { -brand-product-name }-familien
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsede historier
 home-prefs-highlights-header =
     .label = Høydepunkter
-home-prefs-recent-activity-header =
-    .label = Nylig aktivitet
 home-prefs-highlights-description = Et utvalg av nettsteder som du har lagret eller besøkt
 home-prefs-highlights-option-visited-pages =
     .label = Besøkte nettsider
@@ -526,6 +530,9 @@
     .label = Siste nedlasting
 home-prefs-highlights-option-saved-to-pocket =
     .label = Side lagret til { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Nylig aktivitet
+home-prefs-recent-activity-description = Et utvalg av nylige nettsteder og innhold
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Snutter
 home-prefs-snippets-description = Nyheter fra { -vendor-short-name } og { -brand-product-name }
+home-prefs-snippets-description-new = Tips og nyheter fra { -vendor-short-name } og { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Ã…pne faner
     .accesskey = f
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Snarveier
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Mest besøkte nettsteder
     .accesskey = M
+addressbar-locbar-engines-option =
+    .label = Søkemotorer
+    .accesskey = k
 addressbar-suggestions-settings = Endre innstillinger for søkeforslag
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/nb-NO/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Bare på ny fane
     .accesskey = B
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vis alltid
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Vis aldri
+    .accesskey = s
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Vis bare på ny fane
+    .accesskey = V
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Vis andre bokmerker
     .accesskey = V
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/devtools/client/markers.properties firefox-85.0+build1/l10n/nb-NO/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/nb-NO/devtools/client/markers.properties	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/devtools/client/markers.properties	2021-01-18 20:06:53.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/devtools/client/toolbox.properties firefox-85.0+build1/l10n/nb-NO/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/nb-NO/devtools/client/toolbox.properties	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/devtools/client/toolbox.properties	2021-01-18 20:06:53.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Open File in Style-Editor
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Show Split Console
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/nb-NO/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/devtools/client/tooltips.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/devtools/client/tooltips.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> has no effect on internal table elements.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> has no effect on internal table elements except table cells.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Try removing <strong>float</strong> or adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Try setting its <strong>position</strong> property to something other than <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Try setting its <strong>display</strong> property to something else than <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Try setting its <strong>display</strong> property to something else than <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/nb-NO/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:06:53.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Nedlastingsfeil
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Nedlastingen kan ikke lagres fordi den er blokkert av %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Nedlastingen kan ikke lagres fordi den er blokkert av en utvidelse.
 downloadErrorGeneric=Nedlastingen kan ikke lagres fordi en ukjent feil oppstod.\n\nPrøv igjen.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Noen få sekunder igjen
 timeUnknown2=Ukjent tid gjenstår
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S-ressurs
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/nb-NO/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:06:53.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Proxy-tilkobling ble nektet
 check_error-2153390069=Serversertifikatet er utløpt på dato (Juster datamaskinens klokke til riktig tid dersom den er feil)
 check_error-verification_failed=Klarte ikke bekrefte integriteten til oppdateringen
+check_error-move_failed=Kunne ikke klargjøre oppdateringen for installasjon
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Tredjepartsmoduler
+support-third-party-modules-module = Modulfil
+support-third-party-modules-version = Filversjon
+support-third-party-modules-vendor = Leverandørinformasjon
+support-third-party-modules-occurrence = Forekomst
+support-third-party-modules-process = Prosesstype og ID
+support-third-party-modules-thread = Tråd
+support-third-party-modules-base = Bildebaseadresse
+support-third-party-modules-uptime = Prosess-oppetid (ms)
+support-third-party-modules-duration = Lastetid (ms)
+support-third-party-modules-empty = Ingen tredjepartsmoduler ble lastet inn.
+support-third-party-modules-no-value = (Ingen verdi)
+support-third-party-modules-button-open =
+    .title = Åpne filplassering …
+support-third-party-modules-expand =
+    .title = Vis detaljert informasjon
+support-third-party-modules-collapse =
+    .title = Skjul detaljert informasjon
+support-third-party-modules-unsigned-icon =
+    .title = Denne modulen er ikke signert
+support-third-party-modules-folder-icon =
+    .title = Åpne filplassering …
+support-third-party-modules-down-icon =
+    .title = Vis detaljert informasjon
+support-third-party-modules-up-icon =
+    .title = Skjul detaljert informasjon
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Støtte for flere bilde-i-bilde (PiP)
 experimental-features-multi-pip-description = Eksperimentell støtte for å åpne flere bilde-i-bilde (PiP) vinduer samtidig.
+experimental-features-http3 =
+    .label = HTTP/3-protokoll
+experimental-features-http3-description = Eksperimentell støtte for HTTP/3-protokollen.
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Side:
     .accesskey = i
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } av { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Siste side
-
+printpreview-homearrow-button =
+    .title = Første side
+printpreview-previousarrow-button =
+    .title = Forrige side
+printpreview-nextarrow-button =
+    .title = Neste side
+printpreview-endarrow-button =
+    .title = Siste side
diff -Nru firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/nb-NO/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:46:33.000000000 +0000
+++ firefox-85.0+build1/l10n/nb-NO/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:06:53.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = til
+printui-page-custom-range-input =
+    .aria-label = Angi tilpassset sideområde
+    .placeholder = f.eks. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Eksemplarer
 printui-orientation = Papirretning
@@ -48,6 +51,7 @@
 printui-options = Innstillinger
 printui-headers-footers-checkbox = Skriv ut topptekst og bunntekst
 printui-backgrounds-checkbox = Skriv ut bakgrunner
+printui-selection-checkbox = Skriv ut bare utvalget
 printui-color-mode-label = Fargemodus
 printui-color-mode-color = Farge
 printui-color-mode-bw = Svart-hvit
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Ingen
 printui-margins-custom = Tilpasset
+printui-margins-custom-inches = Egendefinert (tommer)
 printui-margins-custom-top = Topp
+printui-margins-custom-top-inches = Topp (tommer)
 printui-margins-custom-bottom = Bunn
+printui-margins-custom-bottom-inches = Bunn (tommer)
 printui-margins-custom-left = Venstre
+printui-margins-custom-left-inches = Venstre (tommer)
 printui-margins-custom-right = Høyre
+printui-margins-custom-right-inches = Høyre (tommer)
 printui-system-dialog-link = Skriv ut ved hjelp av systemdialogvinduet…
 printui-primary-button = Skriv ut
 printui-primary-button-save = Lagre
 printui-cancel-button = Avbryt
+printui-close-button = Lukk
 printui-loading = Forbereder forhåndsvisning
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Forhåndsvisning
+printui-pages-per-sheet = Sider per ark
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Skriver ut …
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ne-NP/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ne-NP/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ne-NP/browser/browser/appmenu.ftl	2021-01-06 11:46:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ne-NP/browser/browser/appmenu.ftl	2021-01-18 20:06:57.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = नया� सञ���याल
+appmenuitem-new-private-window =
+    .label = नया� निजी सञ���याल
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = पूरा पर�दा
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = अहिले सिङ�क गर�न�होस�
+appmenuitem-save-page =
+    .label = यस रूपमा पृष�ठ सङ�ग�रह गर�न�होस�...
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/ne-NP/browser/browser/browser.ftl firefox-85.0+build1/l10n/ne-NP/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ne-NP/browser/browser/browser.ftl	2021-01-06 11:46:37.000000000 +0000
+++ firefox-85.0+build1/l10n/ne-NP/browser/browser/browser.ftl	2021-01-18 20:06:57.000000000 +0000
@@ -238,6 +238,9 @@
 browser-window-close-button =
     .tooltiptext = बन�द गर�न�होस�
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -307,3 +310,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> तपाई�को सूचक नियन�त�रण बाहिर छ। नियन�त�रण आफ�नो नियन�त�रणमा ल�याउन Esc थिच�न�होस�।
 pointerlock-warning-no-domain = तपाई�को पोइन�टर यो डक�मेन�टको नियन�त�रणमा छ। नियन�त�रण फिर�ता लिन Esc थिच�न�होस�।
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = सबै प�स�तकचिनोहरू देखाउन�होस�
+bookmarks-recent-bookmarks =
+    .value = हालसालै थपि�को प�स�तकचिनो
+bookmarks-toolbar-chevron =
+    .tooltiptext = अरू प�स�तकचिनोहरू देखाउन�होस�
+bookmarks-sidebar-content =
+    .aria-label = प�स�तकचिनोहरू
+bookmarks-menu-button =
+    .label = प�स�तकचिनोहरूको मेन�
+bookmarks-other-bookmarks-menu =
+    .label = अन�य प�स�तकचिनोहरू
+bookmarks-mobile-bookmarks-menu =
+    .label = मोबाइल प�स�तकचिनोहरू
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] प�स�तकचिनो साइडबार ल�काउन�होस�
+           *[other] प�स�तकचिनो उपकरणपट�टि देखाउन�होस�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] प�स�तकचिनो उपकरणपट�टि ल�काउन�होस�
+           *[other] प�स�तकचिनो उपकरणपट�टि देखाउन�होस�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] प�स�तकचिनो मेन� उपकरणपट�टिबाट हटाउन�होस�
+           *[other] प�स�तकचिनो मेन� उपकरणपट�टिमा थप�न�होस�
+        }
+bookmarks-search =
+    .label = प�स�तकचिनोहरू खोज�न�होस�
+bookmarks-tools =
+    .label = प�स�तकचिनो लगाउने उपकरणहरू
+bookmarks-toolbar-menu =
+    .label = प�स�तकचिनो उपकरणपट�टि
+bookmarks-toolbar-placeholder =
+    .title = उपकरणपट�टि मा वस�त�हरू प�स�तकचिनो लगाउन�होस�
+bookmarks-toolbar-placeholder-button =
+    .label = उपकरणपट�टि मा वस�त�हरू प�स�तकचिनो लगाउन�होस�
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = प�स�तकचिनोहरू
+library-bookmarks-bookmark-this-page =
+    .label = यस पृष�ठमा प�स�तकचिनो लगाउन�होस�
+library-bookmarks-bookmark-edit =
+    .label = यो प�स�तकचिनोलाई सम�पादन गर�न�होस�
+
+## More items
+
+more-menu-go-offline =
+    .label = अफलाइन कार�य गर�न�होस�
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/nl/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/aboutLogins.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/aboutLogins.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Deze aanmelding verwijderen?
 confirm-delete-dialog-message = Deze actie kan niet ongedaan worden gemaakt.
 about-logins-confirm-remove-dialog-confirm-button = Verwijderen
-about-logins-confirm-remove-all-dialog-confirm-button = Alle verwijderen
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Verwijderen
+        [one] Verwijderen
+       *[other] Alle verwijderen
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, deze aanmelding verwijderen
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Aanmeldingen en wachtwoorden exporteren
 about-logins-confirm-export-dialog-message = Uw wachtwoorden worden opgeslagen als leesbare tekst (bijvoorbeeld BadP@ssw0rd), dus iedereen die het geëxporteerde bestand kan openen, kan ze bekijken.
 about-logins-confirm-export-dialog-confirm-button = Exporteren…
+about-logins-alert-import-title = Importeren voltooid
+about-logins-alert-import-message = Gedetailleerde importsamenvatting bekijken
 confirm-discard-changes-dialog-title = Deze wijzigingen verwerpen?
 confirm-discard-changes-dialog-message = Alle niet-opgeslagen wijzigingen gaan verloren.
 confirm-discard-changes-dialog-confirm-button = Verwerpen
@@ -262,3 +269,30 @@
         [macos] CSV-document
        *[other] CSV-bestand
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importeren voltooid
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nieuwe aanmelding toegevoegd:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Nieuwe aanmeldingen toegevoegd:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Bestaande aanmelding bijgewerkt:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Bestaande aanmeldingen bijgewerkt:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Dubbele aanmelding gevonden:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(niet geïmporteerd)</span>
+       *[other] <span>Dubbele aanmeldingen gevonden:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(niet geïmporteerd)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Fout:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(niet geïmporteerd)</span>
+       *[other] <span>Fouten:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(niet geïmporteerd)</span>
+    }
+about-logins-import-dialog-done = Gereed
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/nl/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/appmenu.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/appmenu.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nieuw venster
+appmenuitem-new-private-window =
+    .label = Nieuw privévenster
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Inzoomen
 appmenuitem-zoom-reduce =
     .label = Uitzoomen
+appmenuitem-fullscreen =
+    .label = Volledig scherm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Nu synchroniseren
+appmenuitem-save-page =
+    .label = Pagina opslaan als…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/nl/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/appMenuNotifications.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Niet nu
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Na een snelle herstart zal { -brand-shorter-name } al uw open tabbladen en vensters herstellen die zich niet in privénavigatiemodus bevinden.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kan niet automatisch naar de nieuwste versie bijwerken.
+    .buttonlabel = { -brand-shorter-name } toch bijwerken
+    .buttonaccesskey = b
+    .secondarybuttonlabel = j
+    .secondarybuttonaccesskey = w
+appmenu-update-other-instance-message = Er is een nieuwe update voor { -brand-shorter-name } beschikbaar, maar deze kan niet worden geïnstalleerd omdat er een ander exemplaar van { -brand-shorter-name } wordt uitgevoerd. Sluit deze om de update door te voeren, of kies ervoor om toch bij te werken (het andere exemplaar werkt mogelijk niet goed totdat u dit opnieuw start).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Oké, begrepen
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/browser.ftl firefox-85.0+build1/l10n/nl/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/browser.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/browser.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -505,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> heeft de controle over uw aanwijzer. Druk op Esc om de controle weer over te nemen.
 pointerlock-warning-no-domain = Dit document heeft de controle over uw aanwijzer. Druk op Esc om de controle weer over te nemen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Alle bladwijzers tonen
+bookmarks-recent-bookmarks =
+    .value = Recent aangemaakte bladwijzers
+bookmarks-toolbar-chevron =
+    .tooltiptext = Meer bladwijzers tonen
+bookmarks-sidebar-content =
+    .aria-label = Bladwijzers
+bookmarks-menu-button =
+    .label = Bladwijzermenu
+bookmarks-other-bookmarks-menu =
+    .label = Andere bladwijzers
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobiel-bladwijzers
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Bladwijzerzijbalk verbergen
+           *[other] Bladwijzerzijbalk weergeven
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Bladwijzerwerkbalk verbergen
+           *[other] Bladwijzerwerkbalk weergeven
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Bladwijzermenu verwijderen van werkbalk
+           *[other] Bladwijzermenu toevoegen aan werkbalk
+        }
+bookmarks-search =
+    .label = Bladwijzers doorzoeken
+bookmarks-tools =
+    .label = Bladwijzerhulpmiddelen
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bladwijzerwerkbalk
+    .accesskey = B
+    .aria-label = Bladwijzers
+bookmarks-toolbar-menu =
+    .label = Bladwijzerwerkbalk
+bookmarks-toolbar-placeholder =
+    .title = Bladwijzerwerkbalkitems
+bookmarks-toolbar-placeholder-button =
+    .label = Bladwijzerwerkbalkitems
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bladwijzers
+library-bookmarks-bookmark-this-page =
+    .label = Bladwijzer voor deze pagina maken
+library-bookmarks-bookmark-edit =
+    .label = Deze bladwijzer bewerken
+library-recent-activity-label = Recente activiteit
+
+## More items
+
+more-menu-go-offline =
+    .label = Offline werken
+    .accesskey = f
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/nl/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/newtab/asrouter.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Typ minder, vind meer met de adresbalk
 cfr-whatsnew-searchbar-body-topsites = Selecteer nu eenvoudigweg de adresbalk en een vak zal uitbreiden met snelkoppelingen naar uw topwebsites.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Vergrootglaspictogram
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Zoeksnelkoppelingen in de adresbalk
 cfr-whatsnew-search-shortcuts-body = Wanneer u voortaan een zoekmachine of specifieke website in de adresbalk typt, verschijnt een blauwe snelkoppeling in de zoeksuggesties eronder. Selecteer die snelkoppeling om uw zoekopdracht rechtstreeks vanuit de zoekbalk te voltooien.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Bescherming tegen kwaadaardige supercookies
+cfr-whatsnew-supercookies-body = Websites kunnen stiekem een ‘supercookie’ aan uw browser koppelen, dat u op het internet kan volgen, zelfs nadat u uw cookies hebt gewist. { -brand-short-name } biedt nu krachtige bescherming tegen supercookies, zodat ze niet kunnen worden gebruikt om uw online activiteiten op verschillende websites te volgen.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Beter bladwijzers maken
+cfr-whatsnew-bookmarking-body = Het is gemakkelijker om uw favoriete websites bij te houden. { -brand-short-name } onthoudt nu uw voorkeurslocatie voor opgeslagen bladwijzers, toont de bladwijzerwerkbalk standaard op nieuwe tabbladen en geeft u eenvoudige toegang tot de rest van uw bladwijzers via een werkbalkmap.
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/nl/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/newtab/newtab.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nieuw tabblad
 newtab-settings-button =
     .title = Uw Nieuw-tabbladpagina aanpassen
+newtab-personalize-button-label = Personaliseren
+    .title = Nieuw tabblad personaliseren
+    .aria-label = Nieuw tabblad personaliseren
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Zoeken op het web
     .title = Zoeken op het web
     .aria-label = Zoeken op het web
+newtab-search-box-text = Zoeken op het web
+newtab-search-box-input =
+    .placeholder = Zoeken op het web
+    .aria-label = Zoeken op het web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Zoekmachine toevoegen
 newtab-topsites-add-topsites-header = Nieuwe topwebsite
+newtab-topsites-add-shortcut-header = Nieuwe snelkoppeling
 newtab-topsites-edit-topsites-header = Topwebsite bewerken
+newtab-topsites-edit-shortcut-header = Snelkoppeling bewerken
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Voer een titel in
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oeps, er is iets misgegaan bij het laden van deze inhoud.
 newtab-error-fallback-refresh-link = Vernieuw de pagina om het opnieuw te proberen.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Snelkoppelingen
+newtab-custom-shortcuts-subtitle = Opgeslagen of bezochte websites
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rij
+       *[other] { $num } rijen
+    }
+newtab-custom-sponsored-sites = Gesponsorde snelkoppelingen
+newtab-custom-pocket-title = Aanbevolen door { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Uitzonderlijke inhoud, samengesteld door { -pocket-brand-name }, onderdeel van de { -brand-product-name }-familie
+newtab-custom-pocket-sponsored = Gesponsorde verhalen
+newtab-custom-recent-title = Recente activiteit
+newtab-custom-recent-subtitle = Een selectie van recente websites en inhoud
+newtab-custom-close-button = Sluiten
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippets
+newtab-custom-snippets-subtitle = Tips en nieuws van { -vendor-short-name } en { -brand-product-name }
+newtab-custom-settings = Meer instellingen beheren
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/places.ftl firefox-85.0+build1/l10n/nl/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/places.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/places.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Submap
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Andere bladwijzers
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/nl/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/preferences/preferences.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = De websites die u het vaakst bezoekt
 home-prefs-topsites-by-option-sponsored =
     .label = Gesponsorde topwebsites
+home-prefs-shortcuts-header =
+    .label = Snelkoppelingen
+home-prefs-shortcuts-description = Opgeslagen of bezochte websites
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Gesponsorde snelkoppelingen
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Aanbevolen door { $provider }
 home-prefs-recommended-by-description-update = Uitzonderlijke inhoud van het hele internet, samengesteld door { $provider }
+home-prefs-recommended-by-description-new = Uitzonderlijke inhoud, samengesteld door { $provider }, onderdeel van de { -brand-product-name }-familie
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Gesponsorde verhalen
 home-prefs-highlights-header =
     .label = Highlights
-home-prefs-recent-activity-header =
-    .label = Recente activiteit
 home-prefs-highlights-description = Een selectie van websites die u hebt opgeslagen of bezocht
 home-prefs-highlights-option-visited-pages =
     .label = Bezochte pagina’s
@@ -526,6 +530,9 @@
     .label = Meest recent gedownload
 home-prefs-highlights-option-saved-to-pocket =
     .label = Naar { -pocket-brand-name } opgeslagen pagina’s
+home-prefs-recent-activity-header =
+    .label = Recente activiteit
+home-prefs-recent-activity-description = Een selectie van recente websites en inhoud
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Snippets
 home-prefs-snippets-description = Updates van { -vendor-short-name } en { -brand-product-name }
+home-prefs-snippets-description-new = Tips en nieuws van { -vendor-short-name } en { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Open tabbladen
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Snelkoppelingen
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Topwebsites
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Zoekmachines
+    .accesskey = o
 addressbar-suggestions-settings = Voorkeuren voor zoekmachinesuggesties wijzigen
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/nl/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/nl/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/nl/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Alleen op een nieuw tabblad
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Altijd tonen
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nooit tonen
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Alleen op nieuw tabblad tonen
+    .accesskey = t
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Andere bladwijzers tonen
     .accesskey = t
diff -Nru firefox-84.0.2+build1/l10n/nl/devtools/client/markers.properties firefox-85.0+build1/l10n/nl/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/nl/devtools/client/markers.properties	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/devtools/client/markers.properties	2021-01-18 20:07:05.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Weinig geheugen
 marker.gcreason.label.CC_WAITING=Afgedwongen door cycluscollectie
+marker.gcreason.label.CC_FINISHED=Cyclusverzameling voltooid
 marker.gcreason.label.CC_FORCED=Afgedwongen door cycluscollectie
 marker.gcreason.label.LOAD_END=Pagina laden voltooid
 marker.gcreason.label.PAGE_HIDE=Verplaatst naar achtergrond
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/nl/devtools/client/toolbox.properties firefox-85.0+build1/l10n/nl/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/nl/devtools/client/toolbox.properties	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/devtools/client/toolbox.properties	2021-01-18 20:07:05.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Bestand openen in Stijleditor
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Ontwikkelaarshulpmiddelen sluiten
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Gesplitste console tonen
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/nl/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/nl/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/nl/devtools/client/tooltips.ftl	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/devtools/client/tooltips.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> heeft geen effect op dit element aangezien het geen gepositioneerd element is.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> heeft geen effect op dit element, aangezien <strong>overflow:hidden</strong> niet is ingesteld.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> heeft geen effect op dit element, omdat <strong>outline-style</strong> <strong>auto</strong> of <strong>none</strong> is.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> heeft geen effect op interne tabelelementen.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> heeft geen effect op interne tabelelementen, behalve op tabelcellen.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Probeer <strong>float</strong> te verwijderen of <strong>display:block</strong> toe te voegen. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Probeer de eigenschap <strong>position</strong> op iets anders dan <strong>static</strong> in te stellen. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Probeer <strong>overflow:hidden</strong> toe te voegen. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Probeer de property <strong>display</strong> op iets anders dan <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> of <strong>table-footer-group</strong> in te stellen. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Probeer de property <strong>display</strong> op iets anders dan <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> of <strong>table-footer-group</strong> in te stellen. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Probeer de eigenschap <strong>outline-style</strong> op iets anders dan <strong>auto</strong> of <strong>none</strong> in te stellen. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/nl/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/nl/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/nl/dom/chrome/dom/dom.properties	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/dom/chrome/dom/dom.properties	2021-01-18 20:07:05.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input>-kiezer geblokkeerd vanwege gebrek aan activering door de gebruiker.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe met extern protocol is geblokkeerd vanwege gebrek aan activering door de gebruiker, of omdat er sinds de laatste keer dat een dergelijk iframe is geladen niet genoeg tijd is verstreken.
 MultiplePopupsBlockedNoUserActivation=Het openen van meerdere pop-upvensters is geblokkeerd vanwege gebrek aan activering door de gebruiker.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Vooraf laden van %S is genegeerd vanwege onbekende waarden ‘as’ of ‘type’, of een niet-overeenkomend attribuut ‘media’.
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/nl/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/nl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:48:50.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:05.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Downloadfout
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=De download kan niet worden opgeslagen, omdat deze door %S wordt geblokkeerd.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=De download kan niet worden opgeslagen, omdat deze door een extensie wordt geblokkeerd.
 downloadErrorGeneric=De download kan niet worden opgeslagen, omdat een onbekende fout is opgetreden.\n\nProbeer het opnieuw.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/nl/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/nl/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:05.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Verbinding met proxyserver geweigerd
 check_error-2153390069=Servercertificaat is verlopen (Stel uw systeemklok in op de juiste datum en tijd als die niet juist zijn)
 check_error-verification_failed=De integriteit van de update kon niet worden geverifieerd
+check_error-move_failed=Het voorbereiden van de update voor installatie is mislukt
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -90,7 +90,7 @@
 ##                   of `duration-unit-*`.
 
 # Common case.
-about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "procent") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) } { $unit })
 # Special case: data is not available yet.
 about-processes-cpu-user-and-kernel-not-ready = (wordt gemeten)
 # Special case: process or thread is currently idle.
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Modules van derden
+support-third-party-modules-module = Modulebestand
+support-third-party-modules-version = Bestandsversie
+support-third-party-modules-vendor = Leveranciersinfo
+support-third-party-modules-occurrence = Aantal
+support-third-party-modules-process = Procestype & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Imagebase-adres
+support-third-party-modules-uptime = Proces-uptime (ms)
+support-third-party-modules-duration = Laadduur (ms)
+support-third-party-modules-empty = Er zijn geen modules van derden geladen.
+support-third-party-modules-no-value = (Geen waarde)
+support-third-party-modules-button-open =
+    .title = Bestandslocatie openen…
+support-third-party-modules-expand =
+    .title = Detailinformatie tonen
+support-third-party-modules-collapse =
+    .title = Detailinformatie samenvouwen
+support-third-party-modules-unsigned-icon =
+    .title = Deze module is niet ondertekend
+support-third-party-modules-folder-icon =
+    .title = Bestandslocatie openen…
+support-third-party-modules-down-icon =
+    .title = Detailinformatie tonen
+support-third-party-modules-up-icon =
+    .title = Detailinformatie samenvouwen
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Ondersteuning voor meerdere Picture-in-picture
 experimental-features-multi-pip-description = Experimentele ondersteuning voor gelijktijdig openen van meerdere Picture-in-Picturevensters.
+experimental-features-http3 =
+    .label = HTTP/3-protocol
+experimental-features-http3-description = Experimentele ondersteuning voor het HTTP/3-protocol.
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> wil een <strong>{ $scheme }</strong>-koppeling openen.
 
 ## Permission Dialog
 ## Variables:
@@ -40,7 +32,7 @@
     .label = Toepassing kiezen
     .accessKey = T
 permission-dialog-unset-description = U dient een toepassing te kiezen.
-permission-dialog-set-change-app-link = Kies een andere toepassing.
+permission-dialog-set-change-app-link = Een andere toepassing kiezen.
 
 ## Chooser dialog
 ## Variables:
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pagina:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } van { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Laatste pagina
-
+printpreview-homearrow-button =
+    .title = Eerste pagina
+printpreview-previousarrow-button =
+    .title = Vorige pagina
+printpreview-nextarrow-button =
+    .title = Volgende pagina
+printpreview-endarrow-button =
+    .title = Laatste pagina
diff -Nru firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/nl/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/nl/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:48:51.000000000 +0000
+++ firefox-85.0+build1/l10n/nl/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:05.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = tot
+printui-page-custom-range-input =
+    .aria-label = Aangepast paginabereik invoeren
+    .placeholder = b.v. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopieën
 printui-orientation = Oriëntatie
@@ -48,6 +51,7 @@
 printui-options = Opties
 printui-headers-footers-checkbox = Kop- en voetteksten afdrukken
 printui-backgrounds-checkbox = Achtergronden afdrukken
+printui-selection-checkbox = Alleen selectie afdrukken
 printui-color-mode-label = Kleurmodus
 printui-color-mode-color = Kleur
 printui-color-mode-bw = Zwart-wit
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Geen
 printui-margins-custom = Aangepast
+printui-margins-custom-inches = Aangepast (inches)
 printui-margins-custom-top = Boven
+printui-margins-custom-top-inches = Bovenzijde (inches)
 printui-margins-custom-bottom = Onder
+printui-margins-custom-bottom-inches = Onderzijde (inches)
 printui-margins-custom-left = Links
+printui-margins-custom-left-inches = Links (inches)
 printui-margins-custom-right = Rechts
+printui-margins-custom-right-inches = Rechts (inches)
 printui-system-dialog-link = Afdrukken via het systeemdialoogvenster…
 printui-primary-button = Afdrukken
 printui-primary-button-save = Opslaan
 printui-cancel-button = Annuleren
+printui-close-button = Sluiten
 printui-loading = Voorbeeld voorbereiden
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Afdrukvoorbeeld
+printui-pages-per-sheet = Pagina’s per vel
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Afdrukken…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/aboutLogins.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/aboutLogins.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -169,7 +169,11 @@
 about-logins-confirm-remove-dialog-title = Fjerne denne innlogginga?
 confirm-delete-dialog-message = Denne handlinga kan ikkje angrast.
 about-logins-confirm-remove-dialog-confirm-button = Fjern
-about-logins-confirm-remove-all-dialog-confirm-button = Fjern alle
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Fjern
+       *[other] Fjern alle
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, fjern denne innlogginga
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/appmenu.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/appmenu.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nytt vindauge
+appmenuitem-new-private-window =
+    .label = Nytt privat vindauge
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Forstørre
 appmenuitem-zoom-reduce =
     .label = Forminske
+appmenuitem-fullscreen =
+    .label = Fullskjerm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synkroniser no
+appmenuitem-save-page =
+    .label = Lagre sida som…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Kva er nytt
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/browser.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/browser.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/browser.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -503,3 +503,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> har kontroll over peikaren din. Trykk Esc for å ta tilbake kontrollen.
 pointerlock-warning-no-domain = Dette dokumentet har kontroll over musepeikaren. Trykk på Esc for å ta tilbake kontrollen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Vis alle bokmerke
+bookmarks-recent-bookmarks =
+    .value = Nyleg bokmerkt
+bookmarks-toolbar-chevron =
+    .tooltiptext = Vis fleire bokmerke
+bookmarks-sidebar-content =
+    .aria-label = Bokmerke
+bookmarks-menu-button =
+    .label = Bokmerkemeny
+bookmarks-other-bookmarks-menu =
+    .label = Andre bokmerke
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobile bokmerke
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Gøym bokmerkesidestolpen
+           *[other] Vis sidestolpe for bokmerke
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Gøym bokmerkeverktøylinja
+           *[other] Vis verktøylinje for bokmerke
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fjern bokmerkemeny frå verktøylinja
+           *[other] Legg til bokmerkemeny i verktøylinja
+        }
+bookmarks-search =
+    .label = Søk i bokmerke
+bookmarks-tools =
+    .label = Verktøy for bokmerke
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bokmerke
+    .accesskey = B
+    .aria-label = Bokmerke
+bookmarks-toolbar-menu =
+    .label = Bokmerke
+bookmarks-toolbar-placeholder =
+    .title = Element i bokmerkelinja
+bookmarks-toolbar-placeholder-button =
+    .label = Element i bokmerkelinja
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bokmerke
+library-bookmarks-bookmark-this-page =
+    .label = Bokmerk denne sida
+library-bookmarks-bookmark-edit =
+    .label = Rediger dette bokmerket
+
+## More items
+
+more-menu-go-offline =
+    .label = Arbeid fråkopla
+    .accesskey = r
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/newtab/newtab.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Ny fane
 newtab-settings-button =
     .title = Tilpass sida for Ny fane
+newtab-personalize-button-label = Tilpass
+    .title = Tilpass ny fane-side
+    .aria-label = Tilpass ny fane-side
 
 ## Search box component.
 
@@ -170,6 +173,7 @@
 
 newtab-section-header-topsites = Mest besøkte nettstadar
 newtab-section-header-highlights = Høgdepunkt
+newtab-section-header-recent-activity = Nyleg aktivitet
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Tilrådd av { $provider }
@@ -205,3 +209,22 @@
 
 newtab-error-fallback-info = Ops, noko gjekk gale då innhaldet skulle lastast inn.
 newtab-error-fallback-refresh-link = Oppdater sida for å prøve på nytt.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Snarvegar
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rad
+       *[other] { $num } rader
+    }
+newtab-custom-sponsored-sites = Sponsa snarvegar
+newtab-custom-pocket-title = Tilrådd av { -pocket-brand-name }
+newtab-custom-pocket-sponsored = Sponsa historier
+newtab-custom-recent-title = Nyleg aktivitet
+newtab-custom-close-button = Lat att
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snuttar
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/places.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/places.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/places.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Undermappe
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Andre bokmerke
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/preferences/preferences.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -52,6 +52,9 @@
 pane-experimental-subtitle = GÃ¥ varsamt til verks
 pane-experimental-search-results-header = { -brand-short-name }-eksperiment: Fortset med varsemd
 pane-experimental-description = Endrar du avanserte konfigurasjonsinnstillingar kan det påverke yting eller sikkerheit i { -brand-short-name }.
+pane-experimental-reset =
+    .label = Gjenopprett standard
+    .accesskey = G
 help-button-label = Brukarstøtte for { -brand-short-name }
 addons-button-label = Utvidingar og tema
 focus-search =
@@ -497,6 +500,8 @@
 home-prefs-topsites-description = Sidene du besøkjer mest
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsa toppsider
+home-prefs-shortcuts-header =
+    .label = Snarvegar
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -521,6 +526,8 @@
     .label = Siste nedlasting
 home-prefs-highlights-option-saved-to-pocket =
     .label = Sider lagra til { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Nyleg aktivitet
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/nn-NO/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -60,3 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Berre på ny fane
     .accesskey = B
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vis alltid
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Vis aldri
+    .accesskey = s
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Vis berre på ny fane
+    .accesskey = V
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Vis andre bokmerke
+    .accesskey = V
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/devtools/client/markers.properties firefox-85.0+build1/l10n/nn-NO/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/nn-NO/devtools/client/markers.properties	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/devtools/client/markers.properties	2021-01-18 20:07:11.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/nn-NO/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/nn-NO/dom/chrome/dom/dom.properties	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/dom/chrome/dom/dom.properties	2021-01-18 20:07:11.000000000 +0000
@@ -419,3 +419,6 @@
 RequestStorageAccessUserGesture=document.requestStorageAccess() kan kun bli bedt om om frå ein snøgg, brukar-generert hendingshandsamar.
 # LOCALIZATION NOTE: Do not translate "Location" and "History".
 LocChangeFloodingPrevented=For mange kallingar til API-er for plassering eller historikk innan ei kort tidsramme.
+FolderUploadPrompt.title = Stadfest opplasting
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
+FolderUploadPrompt.acceptButtonLabel = Last opp
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/dom/chrome/security/security.properties firefox-85.0+build1/l10n/nn-NO/dom/chrome/security/security.properties
--- firefox-84.0.2+build1/l10n/nn-NO/dom/chrome/security/security.properties	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/dom/chrome/security/security.properties	2021-01-18 20:07:11.000000000 +0000
@@ -101,6 +101,10 @@
 # LOCALIZATION NOTE (BrowserUpgradeInsecureDisplayRequest):
 # %1$S is the browser name "brandShortName"; %2$S is the URL of the upgraded request; %1$S is the upgraded scheme.
 BrowserUpgradeInsecureDisplayRequest = %1$S oppgraderer ein usikker visingsførespurnad «%2$S» til å bruke «%3$S»
+
+# LOCALIZATION NOTE (MixedContentAutoUpgrade):
+# %1$S is the URL of the upgraded request; %2$S is the upgraded scheme.
+MixedContentAutoUpgrade=Oppgraderer utrygg visingsførespurnad «%1$S’ til å bruke ‘%2$S»
 # LOCALIZATION NOTE (RunningClearSiteDataValue):
 # %S is the URI of the resource whose data was cleaned up
 RunningClearSiteDataValue=Clear-Site-Data header tvinga opprydding av “%S� data.
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -382,12 +382,12 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } tilrår berre utvidingar som oppfyller standardane våre for sikkerheit og yting
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Denne utvidinga vart laga av utviklarane av { -brand-product-name }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Kjeldekoden til denne utvidinga er sjekka av sikkerheitsgrunnar.
-    .aria-label = { addon-badge-verified.title }
+addon-badge-line2 =
+    .title = Dette er ei offisiell utviding utvikla av utviklaranee av { -brand-product-name }
+    .aria-label = { addon-badge-line2.title }
+addon-badge-verified2 =
+    .title = Denne utvidinga er gjennomgått for å oppfylle standardane våre for sikkerheit og yting.
+    .aria-label = { addon-badge-verified2.title }
 
 ##
 
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -82,10 +82,6 @@
     .label = Utviklarverktøy: Feilsøking av Service Worker
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support-description = Aktiverer eksperimentell støtte for Service Workers i feilsøkingspanelet. Denne funksjonen kan gjere utviklerverktøyet treg og auke minneforbruket.
-# Desktop zooming experiment
-experimental-features-graphics-desktop-zooming =
-    .label = Grafikk: Jamn knipeskalering
-experimental-features-graphics-desktop-zooming-description = Slå på støtte for jamn knipeskalering med berøringsskjermar og presisjonspeikeplate.
 # WebRTC global mute toggle controls
 experimental-features-webrtc-global-mute-toggles =
     .label = Global WebRTC dempekontroll
@@ -98,3 +94,5 @@
 experimental-features-fission =
     .label = Fission (nettstadisolering)
 experimental-features-fission-description = Fission (nettstadisolering) er ein eksperimentell funksjon i { -brand-short-name } for å gi eit ekstra forsvarslag mot sikkerheitsfeil. Ved å isolere kvar nettstad i ein eigen prosess, gjer Fission det vanskelegare for vondsinna nettstadar å få tilgang til informasjon frå andre sider du besøkjer. Dette er ei stor arkitektonisk endring i { -brand-short-name }, og vi set pris på at du testar og rapporterer eventuelle problem du kan støyte på. For meir informasjon, sjå <a data-l10n-name="wiki">wiki-en</a>.
+experimental-features-http3 =
+    .label = HTTP/3-protokoll
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> ønskjer å opne ei <strong>{ $scheme }</strong>-lenke.
 
 ## Permission Dialog
 ## Variables:
@@ -18,10 +10,25 @@
 ##  $appName - Name of the application that will be opened.
 
 
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+
+##
+
+permission-dialog-btn-open-link =
+    .label = Opne lenke
+    .accessKey = p
+
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-dialog =
+    .buttonlabelaccept = Opne lenke
+    .buttonaccesskeyaccept = O
+chooser-dialog-description = Vel eit program for å opne { $scheme }-lenka.
 choose-other-app-description = Vel eit anna program
 choose-app-btn =
     .label = Vel…
diff -Nru firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/nn-NO/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:48:55.000000000 +0000
+++ firefox-85.0+build1/l10n/nn-NO/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:11.000000000 +0000
@@ -61,11 +61,15 @@
 printui-primary-button = Skriv ut
 printui-primary-button-save = Lagre
 printui-cancel-button = Avbryt
+printui-close-button = Lat att
 printui-loading = Førebur førehandsvising
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Førehandsvising
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Skriv ut…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/oc/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/aboutLogins.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/aboutLogins.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Suprimir aqueste identificant ?
 confirm-delete-dialog-message = Aquesta accion es irreversibla.
 about-logins-confirm-remove-dialog-confirm-button = Suprimir
-about-logins-confirm-remove-all-dialog-confirm-button = Suprimir tot
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Suprimir
+        [one] Lo suprimir
+       *[other] O suprimir tot
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ã’c-ben, suprimir aqueste identificant
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportacion dels identificants e senhals
 about-logins-confirm-export-dialog-message = Vòstres senhals seràn salvats jos la forma de tèxt legible (per exemple, « senh4l-f3bl3 ») ; atal qual que siá que pòt dobrir lo fichièr poirà los consultar.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importacion acabada
+about-logins-alert-import-message = Veire lo resumit detalhat de l’importacion
 confirm-discard-changes-dialog-title = Ignorar las modificacions pas enregistradas ?
 confirm-discard-changes-dialog-message = Totas las modificacions pas enregistradas seràn perdudas.
 confirm-discard-changes-dialog-confirm-button = Ignorar
@@ -262,3 +269,26 @@
         [macos] Document CSV
        *[other] Fichièr CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importacion acabada
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Identificants novèls aponduts :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Identificants existents actualizats :</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Identificants en doble trobats :</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(pas importats)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Errors :</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(pas importats)</span>
+    }
+about-logins-import-dialog-done = Acabat
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/oc/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/appmenu.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/appmenu.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Fenèstra novèla
+appmenuitem-new-private-window =
+    .label = Novèla fenèstra de navegacion privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zoom avant
 appmenuitem-zoom-reduce =
     .label = Zoom arrièr
+appmenuitem-fullscreen =
+    .label = Ecran complet
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar ara
+appmenuitem-save-page =
+    .label = Enregistrar jos…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Qué de nòu
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/oc/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/appMenuNotifications.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Pas ara
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Aprèp una pichoneta reaviada, { -brand-shorter-name } restablirà totes vòstres onglets dobèrts que son pas en navegacion privada.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } a pas pogut se metre a jorn automaticament cap a la version mai recenta.
+    .buttonlabel = Metre a jorn { -brand-shorter-name } de tot biais
+    .buttonaccesskey = M
+    .secondarybuttonlabel = Pas ara
+    .secondarybuttonaccesskey = P
+appmenu-update-other-instance-message = Una version novèla de { -brand-shorter-name } es disponibla, mas una còpia ja en execucion de { -brand-shorter-name } empacha de l’installar. Tampatz-la per contunhar la mesa a jorn o causissètz de metre a jorn de tot biais (pòt arribar que l’autra còpia foncione pas mai abans reaviada).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Comprés
     .buttonaccesskey = C
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/browser.ftl firefox-85.0+build1/l10n/oc/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/browser.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/browser.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -288,7 +288,7 @@
 identity-active-loaded = Avètz desactivat la proteccion sus aquela pagina.
 identity-weak-encryption = Aquela pagina utiliza un chiframent flac.
 identity-insecure-login-forms = Los identificants marcats sus aquela pagina pòdon far perilh.
-identity-https-only-connection-upgraded = (passat al HTTPS)
+identity-https-only-connection-upgraded = (passada al HTTPS)
 identity-https-only-label = Mòde HTTPS sonque
 identity-https-only-dropdown-on =
     .label = Activat
@@ -296,7 +296,7 @@
     .label = Desactivat
 identity-https-only-dropdown-off-temporarily =
     .label = Temporàriament desactivat
-identity-https-only-info-turn-on2 = Activar lo mòde HTTPS solament per aqueste site se vol_tz que { -brand-short-name } passe la connexion en mòde securizat s’es possible.
+identity-https-only-info-turn-on2 = Activar lo mòde HTTPS solament per aqueste site se volètz que { -brand-short-name } passe la connexion en mòde securizat s’es possible.
 identity-https-only-info-turn-off2 = Se la page sembla copada, ensajatz de desactivar lo mòde HTTPS sonque per tornar cargar lo site en HTTP pas segur.
 identity-https-only-info-no-upgrade = Passatge de la connexion en HTTPS impossible.
 identity-permissions =
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> a lo contra-ròtle sus la vòstra mirga. Quichatz sus Esc per tornar recuperar lo contra-ròtle.
 pointerlock-warning-no-domain = Aqueste document a lo contraròtle sul vòstre gredon. Quichatz Esc per tornar prendre lo contra-ròtle.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Afichar totes los marcapaginas
+bookmarks-recent-bookmarks =
+    .value = Marcats recentament
+bookmarks-toolbar-chevron =
+    .tooltiptext = Afichar mai de marcapaginas
+bookmarks-sidebar-content =
+    .aria-label = Marcapaginas
+bookmarks-menu-button =
+    .label = Menú dels marcapaginas
+bookmarks-other-bookmarks-menu =
+    .label = Autres marcapaginas
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcapaginas del mobile
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amagar la barra laterala d'onglets
+           *[other] Afichar la barra laterala d'onglets
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Amagar la barra personala
+           *[other] Afichar la barra personala
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Levar lo menú personalizat dels marcapaginas
+           *[other] Apondre lo menú personalizat als marcapaginas
+        }
+bookmarks-search =
+    .label = Recercar dins los marcapaginas
+bookmarks-tools =
+    .label = Aisinas dels marcapaginas
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra personala
+    .accesskey = B
+    .aria-label = Marcapaginas
+bookmarks-toolbar-menu =
+    .label = Barra personala
+bookmarks-toolbar-placeholder =
+    .title = Elements de la barra personala
+bookmarks-toolbar-placeholder-button =
+    .label = Elements de la barra personala
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcapaginas
+library-bookmarks-bookmark-this-page =
+    .label = Marcar aquesta pagina
+library-bookmarks-bookmark-edit =
+    .label = Modificar aqueste marcapagina
+library-recent-activity-label = Activitat recenta
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabalhar fòra connexion
+    .accesskey = T
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/oc/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/newtab/asrouter.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Escrivètz mens, trobatz mai amb la barra d’adreça
 cfr-whatsnew-searchbar-body-topsites = Ara, seleccionatz simplament la barra d'adreça, e una bóstia s'agrandirà amb de ligams cap a vòstres melhors sites.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icòna de la lópia
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Acorchis de recèrca dins la barra d’adreça
 cfr-whatsnew-search-shortcuts-body = Ara quand picatz lo nom d’un motor de recèrcas o un site especific dins la barra d’adreça, un acorchi blau apareisserà en dejós de las suggestions de recèrca. Causissètz aquel acorchi per acabar vòstra recèrca dirèctament de la barra d’adreça estant.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Proteccion contra los supercookies malvolents
+cfr-whatsnew-supercookies-body = D’unes sites web pòdon estacar un « supercookie » a vòstre navegador que vos pòt seguir sul Web, encara qu’ajatz escafat los cookies. { -brand-short-name } provesís ara una proteccion robusta contra los supercookies per que sián pas utilizats per pistar vòstra activitat en linha d’un site a l’autre.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = De melhors marcapaginas
+cfr-whatsnew-bookmarking-body = Es mai simple de gardar vòstres sites preferits. { -brand-short-name } remembra ara vòstre lòc favorit per enregistrar los marcapaginas, mòstra la barra d’aisinas dels marcapaginas per defaut suls onglets novèls, e vos dòna accès a la rèsta de vòstres marcapaginas via una icòna de dossièr per la barra d’aisinas.
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/oc/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/newtab/newtab.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Onglet novèl
 newtab-settings-button =
     .title = Personalizar la pagina Onglet novèl
+newtab-personalize-button-label = Personalizar
+    .title = Personalizacion de la pagina onglet novèl
+    .aria-label = Personalizacion de la pagina onglet novèl
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Recèrca sul web
     .title = Recèrca sul web
     .aria-label = Recèrca sul web
+newtab-search-box-text = Recercar sul web
+newtab-search-box-input =
+    .placeholder = Recercar sul web
+    .aria-label = Recercar sul web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Apondre un motor de recèrca
 newtab-topsites-add-topsites-header = Noù site popular
+newtab-topsites-add-shortcut-header = Acorchi novèl
 newtab-topsites-edit-topsites-header = Modificar lo site popular
+newtab-topsites-edit-shortcut-header = Modificar acorchi
 newtab-topsites-title-label = Títol
 newtab-topsites-title-input =
     .placeholder = Picar un títol
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Ops, una error s’es producha en cargant aqueste contengut.
 newtab-error-fallback-refresh-link = Actualizatz la pagina per tornar ensajar.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Acorchis
+newtab-custom-shortcuts-subtitle = Los sites qu’enregistratz o consultatz
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } linha
+       *[other] { $num } linhas
+    }
+newtab-custom-sponsored-sites = Acorchis pairinejats
+newtab-custom-pocket-title = Recomandat per { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Contengut excepcional seleccionat per { -pocket-brand-name }, membre de la familha { -brand-product-name }
+newtab-custom-pocket-sponsored = Istòrias pairinejadas
+newtab-custom-recent-title = Activitat recenta
+newtab-custom-recent-subtitle = Una seleccion de sites e contenguts recents
+newtab-custom-close-button = Tampar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Nòtas cortas
+newtab-custom-snippets-subtitle = Astúcias e novetats de { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Gerir mai de paramètres
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/places.ftl firefox-85.0+build1/l10n/oc/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/places.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/places.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Sosdossièr
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Autres marcapaginas
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/oc/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/connection.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/preferences/connection.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -9,15 +9,11 @@
             [macos] width: 44em
            *[other] width: 49em
         }
-
 connection-close-key =
     .key = w
-
 connection-disable-extension =
     .label = Desactivar l’extension
-
 connection-proxy-configure = Configurar lo servidor proxy per accedir a Internet
-
 connection-proxy-option-no =
     .label = Pas cap de servidor mandatari
     .accesskey = c
@@ -30,31 +26,25 @@
 connection-proxy-option-manual =
     .label = Configuracion manuala del servidor mandatari
     .accesskey = m
-
 connection-proxy-http = Servidor mandatari HTTP
     .accesskey = H
 connection-proxy-http-port = Pòrt
     .accesskey = P
-
 connection-proxy-http-sharing =
     .label = Utilizar tanben aqueste servidor mandatari pel FTP e HTTPS
     .accesskey = s
-
 connection-proxy-https = Servidor mandatari HTTPS
     .accesskey = H
 connection-proxy-ssl-port = Pòrt
     .accesskey = P
-
 connection-proxy-ftp = Servidor mandatari FTP
     .accesskey = F
 connection-proxy-ftp-port = Pòrt
     .accesskey = P
-
 connection-proxy-socks = Ã’ste SOCKS
     .accesskey = C
 connection-proxy-socks-port = Pòrt
     .accesskey = P
-
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
@@ -63,45 +53,34 @@
     .accesskey = v
 connection-proxy-noproxy = Cap servidor mandatari per
     .accesskey = p
-
 connection-proxy-noproxy-desc = Exemple : .mozilla.org, .net.nz, 192.168.1.0/24
-
 # Do not translate localhost, 127.0.0.1 and ::1.
 connection-proxy-noproxy-localhost-desc = Las connexion a localhost, 127.0.0.1 e ::1 passan pas jamai per un servidor mandatari.
-
 connection-proxy-autotype =
     .label = URL de configuracion automatica de servidor mandatari
     .accesskey = A
-
 connection-proxy-reload =
     .label = Tornar cargar
     .accesskey = T
-
 connection-proxy-autologin =
     .label = Me demandar pas de m'autentificar se lo senhal es enregistrat
     .accesskey = g
     .tooltip = Aquesta opcion vos autentifica automaticament suls servidors proxy que lo senhal n'es enregistrat. Se l'autentificacion fracassa, lo senhal vos serà demandat.
-
 connection-proxy-socks-remote-dns =
-    .label = Proxy DNS al utilizar SOCKS v5
+    .label = Proxy DNS en utilizant SOCKS v5
     .accesskey = d
-
 connection-dns-over-https =
     .label = Activar lo DNS via HTTPS
     .accesskey = v
-
 connection-dns-over-https-url-resolver = Utilizar lo provesidor
     .accesskey = p
-
 # Variables:
 #   $name (String) - Display name or URL for the DNS over HTTPS provider
 connection-dns-over-https-url-item-default =
     .label = { $name } (per defaut)
     .tooltiptext = Utilizar l‘URL per defaut per la resolucion DNS via HTTPS
-
 connection-dns-over-https-url-custom =
     .label = Personalizat
     .accesskey = P
     .tooltiptext = Picatz vòstra URL preferida per la resolucion de DNS via HTTPS
-
 connection-dns-over-https-custom-label = Personalizat
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/languages.ftl firefox-85.0+build1/l10n/oc/browser/browser/preferences/languages.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/languages.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/preferences/languages.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -5,34 +5,25 @@
 webpage-languages-window =
     .title = Paramètres de lenga de la pagina
     .style = width: 40em
-
 languages-close-key =
     .key = w
-
 languages-description = De còps las paginas web son dins mai d'una lenga. Causissètz las lengas d'afichatge d'aquestas paginas web, per òrdre de preferéncia
-
 languages-customize-spoof-english =
     .label = Demandar las versions en anglés de las paginas web per mai de confidencialitat
-
 languages-customize-moveup =
     .label = Montar
     .accesskey = M
-
 languages-customize-movedown =
     .label = Davalar
     .accesskey = D
-
 languages-customize-remove =
     .label = Suprimir
     .accesskey = S
-
 languages-customize-select-language =
-    .placeholder = Seleccionatz una lenga de mai…
-
+    .placeholder = Seleccionar una lenga d’apondre…
 languages-customize-add =
     .label = Apondre
     .accesskey = A
-
 # The pattern used to generate strings presented to the user in the
 # locale selection list.
 #
@@ -45,29 +36,20 @@
 #   $code (String) - Locale code of the locale (for example: "is", "es-CL")
 languages-code-format =
     .label = { $locale }  [{ $code }]
-
 languages-active-code-format =
     .value = { languages-code-format.label }
-
 browser-languages-window =
     .title = Paramètres de lenga de { -brand-short-name }
     .style = width: 40em
-
 browser-languages-description = { -brand-short-name } utilizarà la primièra lenga per defaut e se cal utilizarà las lengas alternativas dins l’òrdre qu’apareisson.
-
 browser-languages-search = Recercar mai de lengas…
-
 browser-languages-searching =
     .label = Recèrca de lengas…
-
 browser-languages-downloading =
     .label = Telecargament…
-
 browser-languages-select-language =
     .label = Seleccionatz una lenga d’apondre…
     .placeholder = Seleccionatz una lenga d’apondre…
-
 browser-languages-installed-label = Lengas installadas
 browser-languages-available-label = Lengas disponiblas
-
 browser-languages-error = { -brand-short-name } pòt pas actualizar las lengas pel moment. Verificatz la connexion Internet e tornatz ensajar.
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/oc/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/preferences/preferences.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Los sites que visitatz mai sovent
 home-prefs-topsites-by-option-sponsored =
     .label = Sites pairinejats
+home-prefs-shortcuts-header =
+    .label = Acorchis
+home-prefs-shortcuts-description = Los sites qu’enregistratz o consultatz
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Acorchis pairinejats
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomandat per { $provider }
 home-prefs-recommended-by-description-update = Contengut excepcional de pertot del web, seleccionat per { $provider }
+home-prefs-recommended-by-description-new = Contengut excepcional seleccionat per { $provider }, membre de la familha { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Articles pairinejats
 home-prefs-highlights-header =
     .label = Notables
-home-prefs-recent-activity-header =
-    .label = Activitat recenta
 home-prefs-highlights-description = Una seleccion de sites qu’avètz enregistrats o visitats
 home-prefs-highlights-option-visited-pages =
     .label = Paginas visitadas
@@ -526,6 +530,9 @@
     .label = Telecargament mai recent
 home-prefs-highlights-option-saved-to-pocket =
     .label = Paginas enregistradas dins { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Activitat recenta
+home-prefs-recent-activity-description = Una seleccion de sites e contenguts recents
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Extraches
 home-prefs-snippets-description = Actualitat de { -vendor-short-name } e { -brand-product-name }
+home-prefs-snippets-description-new = Astúcias e novetats de { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Onglets dobèrts
     .accesskey = D
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Acorchis
+    .accesskey = A
 addressbar-locbar-topsites-option =
     .label = Mai visitats
     .accesskey = M
+addressbar-locbar-engines-option =
+    .label = Motors de recèrca
+    .accesskey = a
 addressbar-suggestions-settings = Cambiar las preferéncias per las suggestions del motor de recèrca
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/tabContextMenu.ftl firefox-85.0+build1/l10n/oc/browser/browser/tabContextMenu.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/tabContextMenu.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/tabContextMenu.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -83,7 +83,7 @@
 tab-context-close-tabs =
     .label =
         { $tabCount ->
-            [1] Tampadura d’onglet
+            [1] Tampar l’onglet
             [one] Tampar l’onglet
            *[other] Tampar los onglets
         }
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/oc/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/oc/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Dobrir dins un onglet novèl
     .accesskey = D
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Totjorn afichar
+    .accesskey = T
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Afichar pas jamai
+    .accesskey = p
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Sonque afichar suls onglets novèls
+    .accesskey = S
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Veire los autres marcapaginas
     .accesskey = V
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/oc/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/oc/browser/chrome/browser/browser.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/chrome/browser/browser.properties	2021-01-18 20:07:16.000000000 +0000
@@ -36,7 +36,7 @@
 xpinstallPromptMessage.message.unknown=Ensajatz d’installar un modul complementari d’un site desconegut. Asseguratz-vos qu’es un site de fisança abans de contunhar.
 xpinstallPromptMessage.learnMore=Ne saber mai sus l’installacion de moduls de forma segura
 xpinstallPromptMessage.dontAllow=Autorizar pas
-xpinstallPromptMessage.dontAllow.accesskey=P
+xpinstallPromptMessage.dontAllow.accesskey=p
 xpinstallPromptMessage.neverAllow=Autorizar pas jamai
 xpinstallPromptMessage.neverAllow.accesskey=j
 # Accessibility Note:
@@ -48,7 +48,7 @@
 xpinstallDisabledMessageLocked=L'installacion de programas es estada desactivada per l'administrator de vòstre sistèma.
 xpinstallDisabledMessage=L'installacion de programas es desactivada. Clicatz sus Activar puèi tornatz ensajar.
 xpinstallDisabledButton=Activar
-xpinstallDisabledButton.accesskey=a
+xpinstallDisabledButton.accesskey=A
 
 # LOCALIZATION NOTE (addonInstallBlockedByPolicy)
 # This message is shown when the installation of an add-on is blocked by
@@ -76,7 +76,7 @@
 webextPerms.add.label=Apondre
 webextPerms.add.accessKey=A
 webextPerms.cancel.label=Anullar
-webextPerms.cancel.accessKey=N
+webextPerms.cancel.accessKey=n
 
 # LOCALIZATION NOTE (webextPerms.sideloadMenuItem)
 # %1$S will be replaced with the localized name of the sideloaded add-on.
@@ -95,7 +95,7 @@
 webextPerms.sideloadEnable.label=Activar
 webextPerms.sideloadEnable.accessKey=A
 webextPerms.sideloadCancel.label=Anullar
-webextPerms.sideloadCancel.accessKey=A
+webextPerms.sideloadCancel.accessKey=n
 
 # LOCALIZATION NOTE (webextPerms.updateMenuItem)
 # %S will be replaced with the localized name of the extension which
@@ -273,11 +273,11 @@
 popupWarningButton=Opcions
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Preferéncias
-popupWarningButtonUnix.accesskey=e
+popupWarningButtonUnix.accesskey=P
 popupAllow=Autorizar las fenèstras sorgissentas de %S
 popupBlock=Blocar las fenèstras sorgissentas de %S
 popupWarningDontShowFromMessage=Afichar pas aqueste messatge quand se blòcan de fenèstras sorgissentas
-popupShowPopupPrefix=Afichar '%S'
+popupShowPopupPrefix=Afichar « %S »
 
 # LOCALIZATION NOTE (popupShowBlockedPopupsIndicatorText): Semicolon separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -304,7 +304,7 @@
 # whether he rather wanted to visit the host.  %S is the recognized host.
 keywordURIFixup.message=Voliatz anar a %S ?
 keywordURIFixup.goTo=Ã’c, dobrir %S
-keywordURIFixup.goTo.accesskey=Y
+keywordURIFixup.goTo.accesskey=O
 keywordURIFixup.dismiss=Non, mercé
 keywordURIFixup.dismiss.accesskey=N
 
@@ -315,7 +315,7 @@
 flashActivate.outdated.message=Volètz autorizar una version obsolèta d’Adobe Flash per aqueste site ? Una version obsolèta pòt aportar de problèmas de seguretat e performanças per vòstre navegador.
 flashActivate.noAllow=Autorizar pas
 flashActivate.allow=Autorizar
-flashActivate.noAllow.accesskey=P
+flashActivate.noAllow.accesskey=p
 flashActivate.allow.accesskey=A
 
 # in-page UI
@@ -424,7 +424,7 @@
 # LOCALIZATION NOTE (canvas.siteprompt): %S is hostname
 canvas.siteprompt=Autorizar %S a utilizar las donadas de l’imatge canvas HTML5 ? Aquò pòt permetre d’identificar vòstre ordenador d’un biais unic.
 canvas.notAllow=Autorizar pas
-canvas.notAllow.accesskey=n
+canvas.notAllow.accesskey=p
 canvas.allow=Autorizar l’accès a las donadas
 canvas.allow.accesskey=A
 canvas.remember=Totjorn memorizar ma decision
@@ -598,7 +598,7 @@
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Suprimir lo marcapagina;Suprimir los #1 marcapaginas
-editBookmark.removeBookmarks.accesskey=r
+editBookmark.removeBookmarks.accesskey=S
 
 # Application menu
 
@@ -633,7 +633,7 @@
 xr.allow=Autorizar l’accès a la realitat virtuala
 xr.allow.accesskey=A
 xr.dontAllow=Interdire
-xr.dontAllow.accesskey=n
+xr.dontAllow.accesskey=I
 xr.shareWithSite3=Volètz autorizar %S a accedir als periferics de realitat virtuala ? Aquò poiriá exposar d’informacions confidencialas.
 xr.shareWithFile3=Volètz autorizar aqueste fichièr local a accedir als periferics de realitat virtuala ? Aquò poiriá exposar d’informacions confidencialas.
 xr.remember=Memorizar aquesta decision
@@ -674,7 +674,7 @@
 # LOCALIZATION NOTE (ctrlTab.listAllTabs.label): #1 represents the number
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-ctrlTab.listAllTabs.label=;Lista los #1 onglets
+ctrlTab.listAllTabs.label=;Listar los #1 onglets
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
@@ -788,7 +788,7 @@
 getUserMedia.allow.label = Autorizar
 getUserMedia.allow.accesskey = A
 getUserMedia.dontAllow.label = Autorizar pas
-getUserMedia.dontAllow.accesskey = P
+getUserMedia.dontAllow.accesskey = p
 getUserMedia.remember=Memorizar aquesta decision
 # LOCALIZATION NOTE (getUserMedia.reasonForNoPermanentAllow.screen3,
 #                    getUserMedia.reasonForNoPermanentAllow.audio,
@@ -871,7 +871,7 @@
 # LOCALIZATION NOTE(emeNotifications.drmContentDisabled.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S will be the 'learn more' link
 emeNotifications.drmContentDisabled.message = Cal activar lo DRM per legir d'àudio e de vidèo sus aquela pagina. %S
 emeNotifications.drmContentDisabled.button.label = Activar lo DRM
-emeNotifications.drmContentDisabled.button.accesskey = v
+emeNotifications.drmContentDisabled.button.accesskey = A
 # LOCALIZATION NOTE(emeNotifications.drmContentDisabled.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.
 emeNotifications.drmContentDisabled.learnMoreLabel = Ne saber mai
 
diff -Nru firefox-84.0.2+build1/l10n/oc/browser/chrome/overrides/netError.dtd firefox-85.0+build1/l10n/oc/browser/chrome/overrides/netError.dtd
--- firefox-84.0.2+build1/l10n/oc/browser/chrome/overrides/netError.dtd	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/browser/chrome/overrides/netError.dtd	2021-01-18 20:07:16.000000000 +0000
@@ -5,7 +5,7 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
-<!ENTITY loadError.label "Problèma al moment de cargar la pagina">
+<!ENTITY loadError.label "Problèma al cargament de la pagina">
 <!ENTITY retry.label "Tornar ensajar">
 <!ENTITY returnToPreviousPage.label "Tornar en arrièr">
 <!ENTITY returnToPreviousPage1.label "Tornar (recomandat)">
diff -Nru firefox-84.0.2+build1/l10n/oc/devtools/client/markers.properties firefox-85.0+build1/l10n/oc/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/oc/devtools/client/markers.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/devtools/client/markers.properties	2021-01-18 20:07:16.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Memòria bassa
 marker.gcreason.label.CC_WAITING=Forçat per la colleccion de cicles
+marker.gcreason.label.CC_FINISHED=Cicle de collècta acabat
 marker.gcreason.label.CC_FORCED=Forçat per la colleccion de cicles
 marker.gcreason.label.LOAD_END=Cargament de la pagina acabat
 marker.gcreason.label.PAGE_HIDE=Desplaçat al rèire plan
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Colleccion de gardariá
-
diff -Nru firefox-84.0.2+build1/l10n/oc/devtools/client/toolbox.properties firefox-85.0+build1/l10n/oc/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/oc/devtools/client/toolbox.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/devtools/client/toolbox.properties	2021-01-18 20:07:16.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Tampar las aisinas de desvolopament
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Afichar la consòla separada
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/oc/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/oc/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/oc/devtools/client/tooltips.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/devtools/client/tooltips.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> a pas cap d’efèit sus aqueste element per çò que es pas un element posicionat.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> a pas cap d’efèit sus aqueste element per çò que <strong>overflow:hidde</strong> es pas definit.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> a cap d’efèit sus aqueste element per çò que son <strong>outline-style</strong> es definit a <strong>auto</strong> o <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> a cap d’efècte suls elements de tablèu intèrns.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> a cap d’efècte suls elements de tablèu intèrns levat per las cellulas de tablèu.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Ensajatz de tirar <strong>float</strong> o d’apondre adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Ensajar de definir sa proprietat <strong>position</strong> amb una valor diferenta de <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Ensajatz d’apondre <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Ensajatz d’atribuir a la proprietat <strong>display</strong> una valor diferenta de <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Ensajatz d’atribuir a la proprietat <strong>display</strong> una valor diferenta de <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Ensajar de definir sa proprietat <strong>outline-style</strong> a una valor diferenta de <strong>auto</strong> o <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/oc/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/oc/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/oc/dom/chrome/dom/dom.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/dom/chrome/dom/dom.properties	2021-01-18 20:07:16.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input> es estat blocat per manca d’activitat de l’utilizaire.
 ExternalProtocolFrameBlockedNoUserActivation=L’iframe amb un protocòl extèrn es estat blocada per manca d’activitat de l’utilizaire, o a causa del pauc de temps passat dempuèi que la darrièra iframe es estada cargada.
 MultiplePopupsBlockedNoUserActivation=La dobertura de mantuna fenèstras sorgissentas per manca d’activitat de l’utilizaire.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Lo precargament de %S es estat ignorat a causa de las valors desconegudas d’« as » o « type », o encara d’un atribut « media » que correspond pas.
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/oc/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/oc/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:16.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=j;j
 
 downloadErrorAlertTitle=Error de telecargament
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=%S bloca l’enregistrament del telecargament.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Enregistrament impossible del telecargat pr’amor qu’una extension lo bloca.
 downloadErrorGeneric=Lo telecargament pòt pas èsser enregistrat perque una error desconeguda s'es producha.\n\nEnsajatz tornarmai.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/oc/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/oc/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:16.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Connexion al servidor proxy refusada (contactatz vòstre administrator)
 check_error-2153390069=Lo certificat del servidor a expirat (reglatz lo relòtge de vòstre ordenador a las bonas data e ora se son incorrèctas)
 check_error-verification_failed=L'integritat de la mesa a jorn a pas pogut èsser verificada (contactatz vòstre administrator)
+check_error-move_failed=Fracàs de la preparacion de la mesa a jorn de l’installacion
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -14,7 +14,7 @@
 # Variables:
 #   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
 about-httpsonly-explanation-unavailable2 = Avètz activat lo mòde HTTPS solament e cap de version HTTPS de <em>{ $websiteUrl } es pas disponibla.
-about-httpsonly-explanation-question = Qué poiriá èsser la causa ?
+about-httpsonly-explanation-question = Quina poiriá èsser la causa ?
 about-httpsonly-explanation-nosupport = Fòrt probablament lo site web pren simplament pas en carga lo HTTPS.
 about-httpsonly-explanation-risk = Es tanben possible qu’un malfactor siá implicat, se decidissètz de visitar lo site web, val mai evitar de dintrar d’informacions sensiblas coma de senhals, adreças electronicas o de cartas bancàrias.
 about-httpsonly-explanation-continue = Se contunhatz, lo mòde HTTPS solament serà desactivat temporàriament per aqueste site.
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Moduls tèrces
+support-third-party-modules-module = Fichièr del modul
+support-third-party-modules-version = Version del fichièr
+support-third-party-modules-vendor = ID del vendeire
+support-third-party-modules-occurrence = Occuréncia
+support-third-party-modules-process = Tipe et ID de procediment
+support-third-party-modules-thread = Fil d’execucion
+support-third-party-modules-base = Adreça imagebase
+support-third-party-modules-uptime = Durada de foncionament del processús (ms)
+support-third-party-modules-duration = Durada de cargament (ms)
+support-third-party-modules-empty = Cap de module tèrç pas cargat.
+support-third-party-modules-no-value = (Cap de valor)
+support-third-party-modules-button-open =
+    .title = Dobrir l’emplaçament del fichièr…
+support-third-party-modules-expand =
+    .title = Mostrar las informacions detalhadas
+support-third-party-modules-collapse =
+    .title = Amagar las informacions detalhadas
+support-third-party-modules-unsigned-icon =
+    .title = Aqueste modul es pas signat
+support-third-party-modules-folder-icon =
+    .title = Dobrir l’emplaçament del fichièr…
+support-third-party-modules-down-icon =
+    .title = Mostrar las informacions detalhadas
+support-third-party-modules-up-icon =
+    .title = Amagar las informacions detalhadas
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Presa en carga de vidèos incrustadas multiplas
 experimental-features-multi-pip-description = Presa en carga experimentala de la compatibilitat de vidèos incrustadas multiplas per aver mantunas fenèstras dubèrtas.
+experimental-features-http3 =
+    .label = Protocòl HTTP/3
+experimental-features-http3-description = Presa en carga experimentala del protocòl HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/global/resetProfile.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/global/resetProfile.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/global/resetProfile.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/global/resetProfile.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -8,7 +8,7 @@
     .label = Reïnicializar { -brand-short-name }
 refresh-profile-description = Tornar partir per reparar los problèmas e restablir las performanças.
 refresh-profile-description-details = En contunhant anatz :
-refresh-profile-remove = Suprimir vòstres moduls e personalisacions
+refresh-profile-remove = Suprimir vòstres moduls e personalizacions
 refresh-profile-restore = Restablir los paramètres de vòstre navegador per defaut
 refresh-profile = Rejovenir { -brand-short-name }
 refresh-profile-button = Reïnicializar { -brand-short-name }…
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pagina :
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } sus { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Darrièra pagina
-
+printpreview-homearrow-button =
+    .title = Primièra pagina
+printpreview-previousarrow-button =
+    .title = Pagina precedenta
+printpreview-nextarrow-button =
+    .title = Pagina seguenta
+printpreview-endarrow-button =
+    .title = Darrièra pagina
diff -Nru firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/oc/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/oc/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:48:59.000000000 +0000
+++ firefox-85.0+build1/l10n/oc/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:16.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = fins a
+printui-page-custom-range-input =
+    .aria-label = Picar una plaja de paginas personalizada
+    .placeholder = ex : 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Còpias
 printui-orientation = Orientacion
@@ -46,8 +49,9 @@
 printui-duplex-checkbox = Imprimir los dos costats
 # Section title for miscellaneous print options
 printui-options = Opcions
-printui-headers-footers-checkbox = Imprimir las entèstas e los pè de pagina
+printui-headers-footers-checkbox = Imprimir las entèstas e los pès de pagina
 printui-backgrounds-checkbox = Imprimir los rèireplans
+printui-selection-checkbox = Sonque imprimir la seleccion
 printui-color-mode-label = Mòde color
 printui-color-mode-color = Color
 printui-color-mode-bw = Blanc e negre
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Pas cap
 printui-margins-custom = Personalizats
+printui-margins-custom-inches = Personalizats (poces)
 printui-margins-custom-top = Naut
+printui-margins-custom-top-inches = Naut (poces)
 printui-margins-custom-bottom = Bas
+printui-margins-custom-bottom-inches = Bas (poces)
 printui-margins-custom-left = Esquèrra
+printui-margins-custom-left-inches = Esquèrra (poces)
 printui-margins-custom-right = Drecha
+printui-margins-custom-right-inches = Drecha (poces)
 printui-system-dialog-link = Imprimir en utilizant los menús del sistèma…
 printui-primary-button = Imprimir
 printui-primary-button-save = Enregistrar
 printui-cancel-button = Anullar
+printui-close-button = Tampar
 printui-loading = Preparacion de l’apercebut
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Apercebut abans impression
+printui-pages-per-sheet = Pagina per fuèlh
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Impression…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/aboutLogins.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/aboutLogins.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = ਇਹ ਲਾਗਇਨ ਹਟਾਉਣਾ ਹੈ?
 confirm-delete-dialog-message = ਇਹ ਕਾਰਵਾਈ ਵਾਪਸ ਨਹੀਂ ਲਈ ਜਾ ਸਕਦੀ ਹੈ।
 about-logins-confirm-remove-dialog-confirm-button = ਹਟਾਓ
-about-logins-confirm-remove-all-dialog-confirm-button = ਸਾਰੇ ਹਟਾਓ
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] ਹਟਾਓ
+        [one] ਹਟਾਓ
+       *[other] ਸਾਰੇ ਹਟਾਓ
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] ਹਾਂ, ਇਹ ਲਾਗਇਨ ਹਟਾਓ
@@ -200,6 +205,8 @@
 about-logins-confirm-export-dialog-title = ਲਾਗਇਨ ਅਤੇ ਪਾਸਵਰਡ �ਕਸਪੋਰਟ ਕਰੋ
 about-logins-confirm-export-dialog-message = ਤ�ਹਾਡੇ ਪਾਸਵਰਡਾਂ ਨੂੰ ਪੜ�ਹਨਯੋਗ ਲਿਖਤ ਵਜੋਂ ਸੰਭਾਲਿਆ ਜਾਵੇਗਾ (ਜਿਵੇਂ, BadP@ssw0rd), ਤਾਂ ਕਰਕੇ �ਕਸਪੋਰਟ ਕੀਤੀ ਫਾਇਲ ਖੋਲ�ਹ ਸਕਣ ਵਾਲਾ ਕੋਈ ਵੀ ਉਨ�ਹਾਂ ਨੂੰ ਵੇਖ ਸਕਦਾ ਹੈ।
 about-logins-confirm-export-dialog-confirm-button = …�ਕਸਪੋਰਟ ਕਰੋ
+about-logins-alert-import-title = ਇੰਪੋਰਟ ਮ�ਕੰਮਲ ਹੋਇਆ
+about-logins-alert-import-message = ਵੇਰਵੇ ਸਮੇਤ ਇੰਪੋਰਟ ਕਰਨ ਦਾ ਸਾਰ ਵੇਖੋ
 confirm-discard-changes-dialog-title = ਨਾ-ਸੰਭਾਲੀਆਂ ਤਬਦੀਲੀਆਂ ਖ਼ਾਰਜ ਕਰਨੀਆਂ ਹਨ?
 confirm-discard-changes-dialog-message = ਸਾਰੀਆਂ ਨਾ-ਸੰਭਾਲੀਆਂ ਤਬਦੀਲੀਆਂ ਗ�ਆਚ ਜਾਣਗੀਆਂ।
 confirm-discard-changes-dialog-confirm-button = ਖ਼ਾਰਜ ਕਰੋ
@@ -261,3 +268,26 @@
         [macos] CSV ਦਸਤਾਵੇਜ਼
        *[other] CSV ਫ਼ਾਈਲ
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = ਇੰਪੋਰਟ ਮ�ਕੰਮਲ ਹੋਇਆ
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>ਨਵੇਂ ਲਾਗਇਨ ਜੋੜੇ ਗ�:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>ਮੌਜੂਦਾ ਲਾਗਇਨ ਅੱਪਡੇਟ ਕੀਤੇ:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>ਡ�ਪਲੀਕੇਟ ਲਾਗਇਨ ਲੱਭੇ:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੇ)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>ਗ਼ਲਤੀ:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੇ)</span>
+    }
+about-logins-import-dialog-done = ਮ�ਕੰਮਲ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/appmenu.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/appmenu.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = ਨਵੀਂ ਵਿੰਡੋ
+appmenuitem-new-private-window =
+    .label = ਨਵੀਂ ਪ�ਰਾਈਵੇਟ ਵਿੰਡੋ
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = ਜ਼ੂਮ ਇਨ
 appmenuitem-zoom-reduce =
     .label = ਜ਼ੂਮ ਆਉਟ
+appmenuitem-fullscreen =
+    .label = ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ਹ�ਣੇ ਸਿੰਕ ਕਰੋ
+appmenuitem-save-page =
+    .label = …ਸਫ਼ੇ ਨੂੰ ਇੰ� ਸੰਭਾਲੋ
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = ਨਵਾਂ ਕੀ ਹੈ
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/appMenuNotifications.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = ਹ�ਣੇ ਨਹੀਂ
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = ਤ�ਰੰਤ ਮ�ੜ-ਚਾਲੂ ਕਰਨ ਦੇ ਬਾਅਦ { -brand-shorter-name } ਤ�ਹਾਡੀਆਂ ਖ�ੱਲੀਆਂ ਟੈਬਾਂ ਅਤੇ ਵਿੰਡੋ, ਜੋ ਕਿ ਤ�ਸੀਂ ਪ�ਰਾਈਵੇਟ ਬਰਾਊਜ਼ਿੰਗ ਮੋਡ 'ਚ ਨਹੀਂ ਹਨ, ਨੂੰ ਬਹਾਲ ਕਰੇਗਾ।
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } ਆਪਣੇ-ਆਪ ਨਵੇਂ ਵਰਜ਼ਨ ਲਈ ਅੱਪਡੇਟ ਕਰਨ ਵਾਸਤੇ ਅਸਮਰੱਥ ਹੈ।
+    .buttonlabel = ਕਿਵੇਂ ਵੀ { -brand-shorter-name } ਅੱਪਡੇਟ ਕਰੋ।
+    .buttonaccesskey = U
+    .secondarybuttonlabel = ਹ�ਣੇ ਨਹੀਂ
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = ਨਵਾਂ { -brand-shorter-name } ਅੱਪਡੇਟ ਮੌਜੂਦ ਹੈ, ਪਰ { -brand-shorter-name } ਦੀ ਹੋਰ ਕਾਪੀ ਚੱਲ ਰਹੀ ਹੋਣ ਕਰਕੇ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਅੱਪਡੇਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇਸ ਨੂੰ ਬੰਦ ਕਰੋ ਜਾਂ ਕਿਵੇਂ ਵੀ ਅੱਪਡੇਟ ਕਰੋ (ਤ�ਹਾਡੇ ਵਲੋਂ ਉਸ ਕਾਪੀ ਨੂੰ ਮ�ੜ-ਚਾਲੂ ਕਰਨ ਤੋਂ ਉਹ ਠੀਕ ਤਰ�ਹਾਂ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੀ ਹੈ)।
 appmenu-addon-private-browsing-installed =
     .buttonlabel = ਠੀਕ ਹੈ, ਸਮ� ਗ�
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/browser.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/browser.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/browser.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -511,3 +511,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ਤ�ਹਾਡੇ ਪ�ਆਇੰਟਰ ਨੂੰ ਕੰਟੋਰਲ ਕਰਦਾ ਹੈ। ਕੰਟਰੋਲ ਵਾਪਸ ਲੈਣ ਲਈ Esc ਦਬਾਉ।
 pointerlock-warning-no-domain = ਇਹ ਦਸਤਾਵੇਜ਼ ਤ�ਹਾਡੇ ਪ�ਆਇੰਟਰ ਨੂੰ ਕੰਟੋਰਲ ਕਰਦਾ ਹੈ। ਕੰਟਰੋਲ ਵਾਪਸ ਲੈਣ ਲਈ Esc ਦਬਾਉ।
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ਸਭ ਬ�ੱਕਮਾਰਕਾਂ ਨੂੰ ਵੇਖੋ
+bookmarks-recent-bookmarks =
+    .value = ਤਾਜ਼ਾ ਬ�ੱਕਮਾਰਕ ਕੀਤੇ
+bookmarks-toolbar-chevron =
+    .tooltiptext = ਹੋਰ ਬ�ੱਕਮਾਰਕਾਂ ਨੂੰ ਵੇਖੋ
+bookmarks-sidebar-content =
+    .aria-label = ਬ�ੱਕਮਾਰਕ
+bookmarks-menu-button =
+    .label = ਬ�ੱਕਮਾਰਕ ਮੇਨੂ
+bookmarks-other-bookmarks-menu =
+    .label = ਹੋਰ ਬ�ੱਕਮਾਰਕ
+bookmarks-mobile-bookmarks-menu =
+    .label = ਮੋਬਾਈਲ ਬ�ੱਕਮਾਰਕ
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ਬ�ੱਕਮਾਰਕ ਬਾਹੀ ਓਹਲੇ ਕਰੋ
+           *[other] ਬ�ੱਕਮਾਰਕ ਬਾਹੀ ਵੇਖੋ
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ ਓਹਲੇ ਕਰੋ
+           *[other] ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ ਵੇਖੋ
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ਬ�ੱਕਮਾਰਕ ਮੇਨੂ ਨੂੰ ਆਪਣੇ ਟੂਲਬਾਰ 'ਚੋਂ ਹਟਾਓ
+           *[other] ਬ�ੱਕਮਾਰਕ ਮੇਨੂ ਨੂੰ ਆਪਣੇ ਟੂਲਬਾਰ 'ਚ ਜੋੜੋ
+        }
+bookmarks-search =
+    .label = ਬ�ੱਕਮਾਰਕ ਲੱਭੋ
+bookmarks-tools =
+    .label = ਬ�ੱਕਮਾਰਕ ਬਣਾਉਣ ਵਾਲਾ ਟੂਲ
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ
+    .accesskey = B
+    .aria-label = ਬ�ੱਕਮਾਰਕ
+bookmarks-toolbar-menu =
+    .label = ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ
+bookmarks-toolbar-placeholder =
+    .title = ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ ਆਈਟਮਾਂ
+bookmarks-toolbar-placeholder-button =
+    .label = ਬ�ੱਕਮਾਰਕ ਟੂਲਬਾਰ ਆਈਟਮਾਂ
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ਬ�ੱਕਮਾਰਕ
+library-bookmarks-bookmark-this-page =
+    .label = ਇਹ ਸਫ਼ੇ ਨੂੰ ਬ�ੱਕਮਾਰਕ ਕਰੋ
+library-bookmarks-bookmark-edit =
+    .label = ਇਹ ਬ�ੱਕਮਾਰਕ ਨੂੰ ਸੋਧੋ
+library-recent-activity-label = ਹਾਲੀਆ ਸਰਗਰਮੀ
+
+## More items
+
+more-menu-go-offline =
+    .label = ਆਫਲਾਈਨ ਕੰਮ ਕਰੋ
+    .accesskey = w
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/newtab/asrouter.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = ਘੱਟ ਟਾਈਪ ਕਰੋ, �ਡਰੈਸ ਬਾਰ ਨਾਲ ਹੋਰ ਲੱਭੋ
 cfr-whatsnew-searchbar-body-topsites = ਹ�ਣ ਸਿਰਫ਼ ਸਿਰਨਾਵਾਂ ਪੱਟੀ ਚ�ਣੋ ਅਤੇ ਡੱਬਾ ਤ�ਹਾਡੀਆਂ ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ ਦੇ ਲਿੰਕਾਂ ਨਾਲ ਭਰ ਜਾਵੇਗਾ।
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = ਵੱਡਦਰਸ਼ੀ ਸ਼ੀਸ਼ਾ ਆਈਕਾਨ
 
 ## Picture-in-Picture
@@ -276,8 +279,17 @@
 ## What's new: Media controls message
 
 cfr-whatsnew-media-keys-header = ਹੋਰ ਮੀਡੀਆ ਕੰਟਰੋਲ
+cfr-whatsnew-media-keys-body = ਆਪਣੇ ਕੀਬੋਰਡ ਜਾਂ ਹੈੱਡ-ਸੈੱਟ ਤੋਂ ਆਡੀਓ ਜਾਂ ਵੀਡੀਓ ਨੂੰ ਚਲਾਓ ਜਾਂ ਰੋਕੋ, ਇਸ ਨਾਲ ਹੋਰ ਟੈਬ, ਪ�ਰੋਗਰਾਮ ਜਾਂ ਜਦੋਂ ਵੀ ਤ�ਹਾਡਾ ਕੰਪਿਊਟਰ ਲਾਕ ਕੀਤਾ ਹੋਵੇ ਤਾਂ ਵੀ ਮੀਡੀ� ਨੂੰ ਕੰਟਰੋਲ ਕਰਨਾ ਸੌਖਾ ਹੋ ਜਾਂਦਾ ਹੈ। ਤ�ਸੀਂ ਅੱਗੇ ਜਾਂ ਪਿੱਛੇ ਦੀਆਂ ਸਵਿੱਚਾਂ ਨਾਲ ਆਪਣੇ ਟਰੈਕਾਂ ਵਿੱਚ ਅੱਗੇ ਪਿੱਛੇ ਵੀ ਜਾ ਸਕਦੇ ਹੋ।
 cfr-whatsnew-media-keys-button = ਸਿੱਖੋ ਕਿ ਕਿਵੇਂ
 
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = ਸਿਰਨਾਵਾਂ ਪੱਟੀ ਵਿੱਚ ਖੋਜ ਸ਼ਾਰਟਕੱਟ
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = ਦੋਖੀ ਸ�ਪਰ-ਕੂਕੀਜ਼ ਤੋਂ ਸ�ਰੱਖਿਆ
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = ਵਧੀਆ ਬ�ੱਕਮਾਰਕ ਬਣਾਉਣੇ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/newtab/newtab.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = ਨਵੀਂ ਟੈਬ
 newtab-settings-button =
     .title = ਆਪਣੇ ਨਵੀਂ ਟੈਬ ਸਫ਼ੇ ਨੂੰ ਆਪਣੇ ਮ�ਤਾਬਕ ਢਾਲੋ
+newtab-personalize-button-label = ਨਿੱਜੀ ਬਣਾਓ
+    .title = ਨਵੀਂ ਟੈਬ ਨਿੱਜੀ ਬਣਾਓ
+    .aria-label = ਨਵੀਂ ਟੈਬ ਨਿੱਜੀ ਬਣਾਓ
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = ਵੈੱਬ ਨੂੰ ਖੋਜੋ
     .title = ਵੈੱਬ ਨੂੰ ਖੋਜੋ
     .aria-label = ਵੈੱਬ ਨੂੰ ਖੋਜੋ
+newtab-search-box-text = ਵੈੱਬ ‘ਤੇ ਖੋਜੋ
+newtab-search-box-input =
+    .placeholder = ਵੈੱਬ ‘ਤੇ ਖੋਜੋ
+    .aria-label = ਵੈੱਬ ‘ਤੇ ਖੋਜੋ
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = ਖੋਜ ਇੰਜਣ ਜੋੜੋ
 newtab-topsites-add-topsites-header = ਨਵੀਂ ਉਪਰਲੀ ਸਾਈਟ
+newtab-topsites-add-shortcut-header = ਨਵਾਂ ਸ਼ਾਰਟਕੱਟ
 newtab-topsites-edit-topsites-header = ਉਪਰਲੀ ਸਾਈਟ ਸੋਧੋ
+newtab-topsites-edit-shortcut-header = ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਸੋਧੋ
 newtab-topsites-title-label = ਸਿਰਲੇਖ
 newtab-topsites-title-input =
     .placeholder = ਸਿਰਲੇਖ ਦਿਓ
@@ -206,3 +215,27 @@
 
 newtab-error-fallback-info = ਓਹ ਹੋ, ਇਸ ਸਮੱਗਰੀ ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਕ�� ਗਲਤ ਹੋ ਗਿਆ।
 newtab-error-fallback-refresh-link = ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਲਈ ਸਫ਼ੇ ਨੂੰ ਤਾਜ਼ਾ ਕਰੋ।
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = ਸ਼ਾਰਟਕੱਟ
+newtab-custom-shortcuts-subtitle = ਸਾਈਟਾਂ ਤ�ਸੀਂ ਸੰਭਾਲੀਆਂ ਜਾਂ ਖੋਲ�ਹੀਆਂ
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } ਕਤਾਰ
+       *[other] { $num } ਕਤਾਰ
+    }
+newtab-custom-sponsored-sites = ਸਪਾਂਸਰ ਕੀਤੇ ਸ਼ਾਰਟਕੱਟ
+newtab-custom-pocket-title = { -pocket-brand-name } ਵਲੋਂ ਸਿਫਾਰਸ਼ ਕੀਤੇ
+newtab-custom-pocket-subtitle = { -brand-product-name } ਦੇ ਹਿੱਸੇ ਵਜੋਂ { -pocket-brand-name } ਵਲੋਂ ਖਾਸ ਇਕੱਤਰ ਕੀਤੀ ਸਮੱਗਰੀ
+newtab-custom-pocket-sponsored = ਸਪਾਂਸਰ ਕੀਤੀਆਂ ਕਹਾਣੀਆਂ
+newtab-custom-recent-title = ਤਾਜ਼ਾ ਸਰਗਰਮੀ
+newtab-custom-recent-subtitle = ਤਾਜ਼ਾ ਸਾਈਟਾਂ ਤੇ ਸਮੱਗਰੀ ਦੀ ਚੋਣ
+newtab-custom-close-button = ਬੰਦ ਕਰੋ
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = ਛੋਟੇ ਟੋਟਕੇ
+newtab-custom-snippets-subtitle = { -vendor-short-name } ਅਤੇ { -brand-product-name } ਵਲੋਂ ਟੋਟਕੇ ਤੇ ਖ਼ਬਰਾਂ
+newtab-custom-settings = ਹੋਰ ਸੈਟਿੰਗਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰੋ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/places.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/places.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/places.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = ਅਧੀਨ-ਫੋਲਡਰ
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = ਹੋਰ ਬ�ੱਕਮਾਰਕ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/preferences/preferences.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = ਤ�ਹਾਡੇ ਵੱਲੋਂ ਸਭ ਤੋਂ ਵੱਧ ਵੇਖੀਆਂ ਸਾਈਟਾਂ
 home-prefs-topsites-by-option-sponsored =
     .label = ਸਪਾਂਸਰ ਕੀਤੀਆਂ ਸਾਈਟਾਂ
+home-prefs-shortcuts-header =
+    .label = ਸ਼ਾਰਟਕੱਟ
+home-prefs-shortcuts-description = ਸਾਈਟਾਂ, ਜੋ ਤ�ਸੀਂ ਸੰਭਾਲੀਆਂ ਜਾਂ ਖੋਲ�ਹੀਆਂ
+home-prefs-shortcuts-by-option-sponsored =
+    .label = ਸਪਾਂਸਰ ਕੀਤੇ ਸ਼ਾਰਟਕੱਟ
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } ਵਲੋਂ ਸਿਫਾਰਸ਼ੀ
 home-prefs-recommended-by-description-update = { $provider } ਦੀ ਮੇਹਰ ਸਕਦਾ ਵੈੱਬ ਭਰ ਤੋਂ ਖ਼ਾਸ ਸਮੱਗਰੀ
+home-prefs-recommended-by-description-new = { -brand-product-name } ਦੇ ਹਿੱਸੇ ਵਜੋਂ { $provider } ਵਲੋਂ ਖਾਸ ਇਕੱਤਰ ਕੀਤੀ ਸਮੱਗਰੀ
 
 ##
 
@@ -515,8 +521,6 @@
     .label = ਸਪਾਂਸਰ ਕੀਤੀਆਂ ਕਹਾਣੀਆਂ
 home-prefs-highlights-header =
     .label = ਹਾਈਲਾਈਟ
-home-prefs-recent-activity-header =
-    .label = ਤਾਜ਼ਾ ਸਰਗਰਮੀ
 home-prefs-highlights-description = ਉਹਨਾਂ ਸਾਈਟਾਂ ਦੀ ਚੋਣ ਕਰੋ ਜੋ ਤ�ਸੀਂ ਸ�ਰੱਖਿਅਤ ਜਾਂ ਵਿਜ਼ਿਟ ਕੀਤੀ ਹੈ
 home-prefs-highlights-option-visited-pages =
     .label = ਵੇਖੇ ਗ� ਸਫੇ
@@ -526,6 +530,9 @@
     .label = ਸਭ ਤੋਂ ਤਾਜ਼ਾ ਕੀਤੇ ਡਾਊਨਲੋਡ
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name } ਵਿੱਚ ਸੰਭਾਲੇ ਗ� ਸਫ਼ੇ
+home-prefs-recent-activity-header =
+    .label = ਤਾਜ਼ਾ ਸਰਗਰਮੀ
+home-prefs-recent-activity-description = ਤਾਜ਼ਾ ਸਾਈਟਾਂ ਤੇ ਸਮੱਗਰੀ ਦੀ ਚੋਣ
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = ਛੋਟੇ ਟੋਟੇ
 home-prefs-snippets-description = { -vendor-short-name } ਅਤੇ { -brand-product-name } ਤੋਂ ਅੱਪਡੇਟ
+home-prefs-snippets-description-new = { -vendor-short-name } ਅਤੇ { -brand-product-name } ਵਲੋਂ ਟੋਟਕੇ ਤੇ ਖ਼ਬਰਾਂ
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = ਖ�ੱਲ�ਹੀਆਂ ਟੈਬਾਂ
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = ਸ਼ਾਰਟਕੱਟ
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = ਚੋਟੀ ਦੀਆਂ ਸਾਈਟਾਂ
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = ਖੋਜ ਇੰਜਣ
+    .accesskey = a
 addressbar-suggestions-settings = ਖੋਜ ਇੰਜਣ ਸ��ਾਵਾਂ ਲਈ ਪਸੰਦਾਂ ਨੂੰ ਬਦਲੋ
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/pa-IN/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = ਨਵੀਂ ਟੈਬ ਉੱਤੇ ਹੀ
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = ਹਮੇਸ਼ਾਂ ਵੇਖਾਓ
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = ਕਦੇ ਨਾ ਵੇਖਾਓ
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = ਨਵੀਂ ਟੈਬ ਉੱਤੇ ਹੀ ਵੇਖਾਓ
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = ਸਭ ਬ�ੱਕਮਾਰਕਾਂ ਨੂੰ ਵੇਖੋ
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/pa-IN/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/pa-IN/browser/chrome/browser/browser.properties	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/chrome/browser/browser.properties	2021-01-18 20:07:21.000000000 +0000
@@ -994,6 +994,7 @@
 
 permissions.remove.tooltip = ਇਹ ਇਜਾਜ਼ਤ ਸਾਫ਼ ਕਰੋ ਅਤੇ ਮ�ੜ ਪ�ੱਛੋ
 
+permissions.fullscreen.promptCanceled = ਬਾਕੀ ਰਹਿੰਦੀਆਂ ਇਜਾਜ਼ਤ ਬੇਨਤੀਆਂ ਰੱਦ ਕੀਤੀਆਂ: DOM ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਇਜ਼ਾਜ਼ਤ ਬੇਨਤੀਆਂ ਜਾਰੀ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।
 permissions.fullscreen.fullScreenCanceled = ਬੰਦ ਕੀਤੀ DOM ਪੂਰੀ ਸਕਰੀਨ: DOM ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਇਜਾਜ਼ਤ ਬੇਨਤੀਆਂ 
 
 # LOCALIZATION NOTE (aboutDialog.architecture.*):
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/browser/chrome/overrides/netError.dtd firefox-85.0+build1/l10n/pa-IN/browser/chrome/overrides/netError.dtd
--- firefox-84.0.2+build1/l10n/pa-IN/browser/chrome/overrides/netError.dtd	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/browser/chrome/overrides/netError.dtd	2021-01-18 20:07:21.000000000 +0000
@@ -133,8 +133,15 @@
 
 <!ENTITY certerror.whatCanYouDoAboutItTitle "ਇਸ ਬਾਰੇ ਤ�ਸੀਂ ਕੀ ਕਰ ਸਕਦੇ ਹੋ?">
 
+<!ENTITY certerror.unknownIssuer.whatCanYouDoAboutIt "
+<p>ਮਸਲਾ ਬਹ�ਤੀ ਉਮੀਦ ਹੈ ਕਿ ਵੈੱਬਸਾਈਟ ਨਾਲ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਠੀਕ ਕਰਨ ਲਈ ਤ�ਸੀਂ ਕ�� ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।</p>
+<p>ਜੇ ਤ�ਸੀਂ ਕਾਰਪੋਰੇਟ ਨੈੱਟਵਰਕ ਵਰਤ ਰਹੇ ਹੋ ਜਾਂ ਕੋਈ �ਂਟੀ-ਵਾਈਰਸ ਸਾਫਟਵੇਅਰ ਵਰਤ ਰਹੇ ਹੋ ਤਾਂ ਤ�ਸੀਂ ਸਹਾਇਤਾ ਲਈ ਸਹਾਇਕ ਟੀਮਾਂ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹੋ। ਤ�ਸੀਂ ਸਮੱਸਿਆ ਬਾਰੇ ਵੈੱਬਸਾਈਟ ਦੇ ਪਰਸ਼ਾਸ਼ਕ ਨੂੰ ਵੀ ਸੂਚਿਤ ਕਰ ਸਕਦੇ ਹੋ।</p>
+">
 
 
+<!ENTITY certerror.badCertDomain.whatCanYouDoAboutIt "
+<p>ਮਸਲਾ ਬਹ�ਤੀ ਉਮੀਦ ਹੈ ਕਿ ਵੈੱਬਸਾਈਟ ਨਾਲ ਹੈ ਅਤੇ ਇਸ ਨੂੰ ਠੀਕ ਕਰਨ ਲਈ ਤ�ਸੀਂ ਕ�� ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਤ�ਸੀਂ ਸਮੱਸਿਆ ਬਾਰੇ ਵੈੱਬਸਾਈਟ ਦੇ ਪਰਸ਼ਾਸਕ ਨੂੰ ਸੂਚਿਤ ਕਰ ਸਕਦੇ ਹੋ।</p>
+">
 
 <!ENTITY sharedLongDesc "
 <ul>
@@ -176,6 +183,7 @@
 <!ENTITY certerror.mitm.whatCanYouDoAboutIt3 "ਜੇ ਤ�ਸੀਂ <span class='mitm-name'/> ਨੂੰ ਜਾਣਦੇ ਨਹੀਂ ਹੋ ਤਾਂ ਤਦ ਇਹ ਹਮਲਾ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਤ�ਹਾਨੂੰ ਸਾਈਟ ਨਾਲ ਜਾਰੀ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ।">
 <!ENTITY certerror.mitm.sts.whatCanYouDoAboutIt3 "ਜੇ ਤ�ਸੀਂ <span class='mitm-name'/> ਨੂੰ ਜਾਣਦੇ ਨਹੀਂ ਹੋ ਤਾਂ ਤਦ ਇਹ ਹਮਲਾ ਹੋ ਸਕਦਾ ਹੈ ਅਤੇ ਇਹ ਸਾਈਟ ਵਰਤਣ ਲਈ ਤ�ਸੀਂ ਕ�� ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ।">
 
+
 <!ENTITY prefReset.longDesc "ਜਾਪਦਾ ਹੈ ਕਿ ਤ�ਹਾਡੀ ਨੈੱਟਵਰਕ ਸ�ਰੱਖਿਆ ਸੈਟਿੰਗਾਂ ਇਸ ਦਾ ਕਾਰਨ ਹੋ ਸਕਦੀਆਂ ਹਨ। ਕੀ ਤ�ਸੀਂ ਡਿਫਾਲਟ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਹਾਲ ਕਰਨਾ ਚਾਹ�ੰਦੇ ਹੋ?">
 <!ENTITY prefReset.label "ਡਿਫਾਲਟ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਹਾਲ ਕਰੋ">
 
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/pa-IN/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:21.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=ਦਿ;ਦਿ
 
 downloadErrorAlertTitle=ਡਾਊਨਲੋਡ ਗਲਤੀ
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=%S ਵਲੋਂ ਪਾਬੰਦੀ ਲਾ� ਜਾਣ ਕਰਕੇ ਡਾਊਨਲੋਡ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=ਇਕਸਟੈਨਸ਼ਨ ਵਲੋਂ ਪਾਬੰਦੀ ਲਾ� ਜਾਣ ਕਰਕੇ ਡਾਊਨਲੋਡ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।
 downloadErrorGeneric=ਡਾਊਨਲੋਡ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਇੱਕ ਅਣਜਾਣ ਗਲਤੀ ਆਈ ਹੈ।\n\nਬਾਅਦ 'ਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -165,9 +165,9 @@
 addon-category-locale = ਭਾਸ਼ਾਵਾਂ
 addon-category-locale-title =
     .title = ਭਾਸ਼ਾਵਾਂ
-addon-category-available-updates = ਅੱਪਡੇਟ ਮੌਜੂਦ ਹਨ
+addon-category-available-updates = ਮੌਜੂਦ ਅੱਪਡੇਟ
 addon-category-available-updates-title =
-    .title = ਅੱਪਡੇਟ ਮੌਜੂਦ ਹਨ
+    .title = ਮੌਜੂਦ ਅੱਪਡੇਟ
 addon-category-recent-updates = ਤਾਜ਼ਾ ਅੱਪਡੇਟ
 addon-category-recent-updates-title =
     .title = ਤਾਜ਼ਾ ਅੱਪਡੇਟ
@@ -378,12 +378,6 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } ਉਹ ਇਕਸਟੈਨਸ਼ਨਾਂ ਦੀ ਸਿਫਾਰਸ਼ ਕਰਦਾ ਹੈ, ਜੋ ਸ�ਰੱਖਿਆ ਅਤੇ ਕਾਰਗ�ਜ਼ਾਰੀ ਲਈ ਸਾਡੇ ਮਿਆਰ ਪੂਰੇ ਕਰਦੇ ਹਨ।
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = ਇਸ ਇਕਸਟੈਨਸ਼ਨ ਨੂੰ { -brand-product-name } ਦੇ ਨਿਰਮਾਤਾ ਵਲੋਂ ਬਣਾਇਆ ਗਿਆ ਸੀ।
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = ਸ�ਰੱਖਿਆ ਲਈ ਇਸ ਇਕਸਟੈਨਸ਼ਨ ਦੇ ਕੋਡ ਦੀ ਪੜਤਾਲ ਹੋ ਚ�ੱਕੀ ਹੈ
-    .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
     .title = ਇਹ ਅਧਿਕਾਰਿਤ ਇਕਸਟੈਨਸ਼ਨ ਨੂੰ { -brand-product-name } ਦੇ ਨਿਰਮਾਤਾ ਵਲੋਂ ਬਣਾਇਆ ਗਿਆ ਹੈ।
     .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -62,12 +62,16 @@
 app-basics-build-config = ਬਿਲਡ ਸੰਰਚਨਾ
 app-basics-user-agent = ਯੂਜ਼ਰ �ਜੰਟ
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta ਉਲੱਥਾ
 app-basics-memory-use = ਮੈਮੋਰੀ ਵਰਤੋਂ
 app-basics-performance = ਕਾਰਗ�ਜ਼ਾਰੀ
 app-basics-service-workers = ਰਜਿਸਟਰ ਕੀਤੇ Service Workers
 app-basics-profiles = ਪਰੋਫਾਈਲ
 app-basics-launcher-process-status = ਲਾਂਚਰ ਪਰੋਸੈਸ
 app-basics-multi-process-support = ਬਹ�-ਕਾਰਜ ਵਿੰਡੋਜ਼
+app-basics-fission-support = ਫਿਊਜ਼ਨ ਵਿੰਡੋਜ਼
 app-basics-remote-processes-count = ਰਿਮੋਟ ਪਰੋਸੈਸ
 app-basics-enterprise-policies = ਇੰਟਰਪ�ਰਾਈਜ਼ ਨੀਤੀਆਂ
 app-basics-location-service-key-google = ਗੂਗਲ ਟਿਕਾਣਾ ਸੇਵਾ ਕ�ੰਜੀ
@@ -184,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = ਤੀਜੀ ਧਿਰ ਮੋਡੀਊਲ
+support-third-party-modules-module = ਮੋਡੀਊਲ ਫਾਇਲ
+support-third-party-modules-version = ਫਾਇਲ ਦਾ ਵਰਜ਼ਨ
+support-third-party-modules-vendor = ਵੇਂਡਰ ਦੀ ਜਾਣਕਾਰੀ
+support-third-party-modules-occurrence = ਮੌਜੂਦਗੀ
+support-third-party-modules-process = ਪ�ਰੋਸੈਸ ਦੀ ਕਿਸਮ ਤੇ ਆਈਡੀ
+support-third-party-modules-thread = ਥਰਿੱਡ
+support-third-party-modules-base = ਚਿੱਤਰ-ਬੇਸ ਸਿਰਨਾਵਾਂ
+support-third-party-modules-uptime = ਪਰੋਸੈਸ ਅੱਪਟਾਈਮ (ਮਿਲੀਸਕਿੰਟ)
+support-third-party-modules-duration = ਲੋਡਿੰਗ ਅੰਤਰਾਲ (ਮਿਲੀਸਕਿੰਟ)
+support-third-party-modules-empty = ਕੋਈ ਵੀ ਸ�ਤੰਤਰ ਧਿਰ ਦਾ ਮੋਡੀਊਲੋਡ ਲੋਡ  ਨਹੀਂ ਕੀਤਾ ਗਿਆ।
+support-third-party-modules-no-value = (ਕੋਈ ਮ�ੱਲ ਨਹੀਂ)
+support-third-party-modules-button-open =
+    .title = …ਫਾਇਲ ਟਿਕਾਣੇ ਨੂੰ ਖੋਲ�ਹੋ
+support-third-party-modules-expand =
+    .title = ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖਾਓ
+support-third-party-modules-collapse =
+    .title = ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਨੂੰ ਸਮੇਟੋ
+support-third-party-modules-unsigned-icon =
+    .title = ਇਹ ਮੋਡੀਊਲ ਸਾਈਨ ਨਹੀਂ ਹੈ
+support-third-party-modules-folder-icon =
+    .title = …ਫਾਇਲ ਟਿਕਾਣੇ ਨੂੰ ਖੋਲ�ਹੋ
+support-third-party-modules-down-icon =
+    .title = ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਵੇਖਾਓ
+support-third-party-modules-up-icon =
+    .title = ਵੇਰਵੇ ਸਮੇਤ ਜਾਣਕਾਰੀ ਨੂੰ ਸਮੇਟੋ
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -333,7 +363,16 @@
 # $fissionWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
 fission-windows = { $fissionWindows }/{ $totalWindows }
+fission-status-experiment-control = ਤਰਜਬੇ ਵਲੋਂ ਅਸਮਰੱਥ ਕੀਤਾ
+fission-status-experiment-treatment = ਤਜਰਬੇ ਵਲੋਂ ਸਮਰੱਥ ਕੀਤਾ
+fission-status-disabled-by-e10s-env = ਵਾਤਾਵਰਨ ਰਾਹੀਂ ਅਸਮਰੱਥ ਕੀਤਾ
+fission-status-enabled-by-env = ਵਾਤਾਵਰਨ ਰਾਹੀਂ ਸਮਰੱਥ ਕੀਤਾ
+fission-status-disabled-by-safe-mode = ਸ�ਰੱਖਿਅਤ ਢੰਗ ਰਾਹੀਂ ਅਸਮਰੱਥ ਕੀਤਾ
+fission-status-enabled-by-default = ਮੂਲ ਰੂਪ ਵਿੱਚ ਸਮਰੱਥ ਹੈ
+fission-status-disabled-by-default = ਮੂਲ ਰੂਪ 'ਚ ਅਸਮਰੱਥ ਹੈ
+fission-status-enabled-by-user-pref = ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਸਮਰੱਥ ਕੀਤਾ
 fission-status-disabled-by-user-pref = ਵਰਤੋਂਕਾਰ ਵਲੋਂ ਅਸਮਰੱਥ ਹੈ
+fission-status-disabled-by-e10s-other = E10s ਅਸਮਰੱਥ ਹੈ
 async-pan-zoom = ਅਸਮਕਾਲੀ ਪੈਨ/ਜ਼ੂਮ
 apz-none = ਕੋਈ ਨਹੀਂ
 wheel-enabled = ਵ�ਹੀਲ ਇਨਪ�ਟ ਸਮਰੱਥ ਹੈ
@@ -357,3 +396,9 @@
 
 ## Printing section
 
+support-printing-title = ਪਰਿੰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
+support-printing-troubleshoot = ਸਮੱਸਿਆ ਨਿਵਾਰਨ
+support-printing-clear-settings-button = ਸੰਭਾਲੀਆਂ ਪਰਿੰਟ ਸੈਟਿੰਗਾਂ ਨੂੰ ਸਾਫ਼ ਕਰੋ
+support-printing-modified-settings = ਸੋਧੀਆਂ ਪਰਿੰਟ ਸੈਟਿੰਗਾਂ
+support-printing-prefs-name = ਨਾਂ
+support-printing-prefs-value = ਮ�ੱਲ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/abuseReports.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/abuseReports.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/about/abuseReports.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/about/abuseReports.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -8,15 +8,15 @@
 # Variables:
 #   $addon-name (string) - Name of the add-on being reported
 abuse-report-dialog-title = { $addon-name } ਲਈ ਰਿਪੋਰਟ ਕਰੋ
-
 abuse-report-title-extension = { -vendor-short-name } ਨੂੰ ਇਸ ਇਕਸਨੈਸ਼ਨ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਓ
 abuse-report-title-theme = ਇਹ ਥੀਮ ਬਾਰੇ { -vendor-short-name } ਨੂੰ ਰਿਪੋਰਟ ਕਰੋ
 abuse-report-subtitle = ਕੀ ਸਮੱਸਿਆ ਹੈ?
-
 # Variables:
 #   $author-name (string) - Name of the add-on author
 abuse-report-addon-authored-by = <a data-l10n-name="author-name">{ $author-name }</a> ਵਲੋਂ
-
+abuse-report-learnmore =
+    ਪੱਕਾ ਨਹੀਂ ਕਿ ਕਿਹੜਾ ਮਸਲਾ ਚ�ਣਨਾ ਹੈ?
+    <a data-l10n-name="learnmore-link">ਇਕਸਟੈਨਸ਼ਨਾਂ ਤੇ ਥੀਮਾਂ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰਨ ਬਾਰੇ ਹੋਰ ਸਿੱਖੋ</a>
 abuse-report-submit-description = ਸਮੱਸਿਆ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਓ (ਚੋਣਵਾਂ)
 
 ## Panel buttons.
@@ -32,7 +32,14 @@
 ## Variables:
 ##   $addon-name (string) - Name of the add-on
 
+abuse-report-messagebar-aborted = <span data-l10n-name="addon-name">{ $addon-name } ਲਈ ਰਿਪੋਰਟ ਰੱਦ ਕੀਤੀ ਹੈ।
+abuse-report-messagebar-submitting = <span data-l10n-name="addon-name">{ $addon-name }</span> ਲਈ ਰਿਪੋਰਟ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ।
+abuse-report-messagebar-submitted = ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਤ�ਹਾਡਾ ਧੰਨਵਾਦ ਹੈ। ਕੀ ਤ�ਸੀਂ <span data-l10n-name="addon-name">{ $addon-name }</span> ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?
 abuse-report-messagebar-submitted-noremove = ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਤ�ਹਾਡਾ ਧੰਨਵਾਦ ਹੈ।
+abuse-report-messagebar-removed-extension = ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਤ�ਹਾਡਾ ਧੰਨਵਾਦ ਹੈ। ਤ�ਸੀਂ ਇਕਟੈਨਸ਼ਨ <span data-l10n-name="addon-name">{ $addon-name }</span> ਨੂੰ ਹਟਾ ਚ�ੱਕੇ ਹੋ।
+abuse-report-messagebar-removed-theme = ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਤ�ਹਾਡਾ ਧੰਨਵਾਦ ਹੈ। ਤ�ਸੀਂ ਥੀਮ  <span data-l10n-name="addon-name">{ $addon-name }</span> ਨੂੰ ਹਟਾ ਚ�ੱਕੇ ਹੋ।
+abuse-report-messagebar-error = <span data-l10n-name="addon-name">{ $addon-name }</span> ਬਾਰੇ ਰਿਪੋਰਟ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।
+abuse-report-messagebar-error-recent-submit = ਹ�ਣੇ ਹ�ਣੇ ਇੱਕ ਹੋਰ ਰਿਪੋਰਟ ਭੇਜੀ ਜਾਣ ਕਰਕੇ <span data-l10n-name="addon-name">{ $addon-name }</span> ਬਾਰੇ ਰਿਪੋਰਟ ਭੇਜੀ ਨਹੀਂ ਗਈ ਸੀ।
 
 ## Message bars actions.
 
@@ -47,30 +54,22 @@
 
 abuse-report-damage-reason-v2 = ਇਸ ਨੇ ਮੇਰੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨ�ਕਸਾਨ ਕੀਤਾ ਜਾਂ ਮੇਰੇ ਡਾਟੇ ਨਾਲ ਛੇੜਛਾੜ ਕੀਤੀ
 abuse-report-damage-example = ਉਦਾਹਰਨ: ਪਾਇਆ ਹੋਇਆ ਮਾਲਵੇਅਰ ਜਾਂ ਡਾਟਾ ਚੋਰੀ
-
 abuse-report-spam-reason-v2 = ਇਸ ਵਿੱਚ ਸਮੈਪ ਜਾਂ ਅਣਚਾਹੇ ਇਸ਼ਤਿਹਾਰ ਪਾ� ਹੋ ਸਕਦੇ ਹਨ
 abuse-report-spam-example = ਉਦਾਹਰਨ: ਵੈੱਬ-ਸਫ਼ਿਆਂ ਵਿੱਚ ਇਸ਼ਤਿਹਾਰ ਪਾਓ
-
 abuse-report-settings-reason-v2 = ਇਸ ਨੇ ਮੇਰਾ ਖੋਜ ਇੰਜਣ, ਮ�ੱਖ ਸਫ਼ਾ ਜਾਂ ਨਵੀਂ ਟੈਬ ਮੈਨੂੰ ਬਿਨਾਂ ਦੱਸੇ ਜਾਂ ਪ�ੱਛੇ ਬਦਲੀ ਹੈ
 abuse-report-settings-suggestions = ਇਕਸਟੈਨਸ਼ਨ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤ�ਸੀਂ ਆਪਣੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲ ਕੇ ਵੇਖ ਸਕਦੇ ਹੋ:
 abuse-report-settings-suggestions-search = ਮੇਰੀਆਂ ਡਿਫਾਲਟ ਖੋਜ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਦੀ ਹੈ
 abuse-report-settings-suggestions-homepage = ਤ�ਹਾਡੇ ਮ�ੱਖ ਸਫ਼ੇ ਅਤੇ ਨਵੀ ਟੈਬ ਨੂੰ ਬਦਲਦੀ ਹੈ
-
 abuse-report-deceptive-reason-v2 = ਇਹ ਦਾਅਵਾ ਕ�� ਹੋਰ ਕਰਦੀ ਹੈ, ਜੋ ਕਿ ਨਹੀਂ ਹੈ
 abuse-report-deceptive-example = ਮਿਸਾਲ: ਗ�ੰਮਰਾਹਕ�ੰਨ ਵਰਣਨ ਜਾਂ ਚਿੱਤਰਕਾਰੀ
-
 abuse-report-broken-reason-extension-v2 = ਇਹ ਕੰਮ ਨਹੀਂ ਕਰਦੀ, ਵੈੱਬਸਾਈਟਾਂ ਨਹੀਂ ਚੱਲਦੀਆਂ ਜਾਂ { -brand-product-name } ਨੂੰ ਹੌਲੀ ਬਣਾਉਂਦੀ ਹੈ
 abuse-report-broken-reason-theme-v2 = ਇਹ ਕੰਮ ਨਹੀਂ ਕਰਦੀ ਹੈ ਜਾਂ ਬਰਾਊਜ਼ਰ �ਲਕ ਨੂੰ ਖ਼ਰਾਬ ਕਰ ਦਿੰਦੀ ਹੈ
 abuse-report-broken-example = ਮਿਸਾਲ ਵਜੋਂ: ਫ਼ੀਚਰ ਹੌਲੀ ਹਨ, ਵਰਤਣ ਲਈ ਔਖੇ ਹਨ ਜਾਂ ਕੰਮ ਨਹੀਂ ਕਰਦੇ, ਵੈੱਬਸਾਈਟਾਂ ਦੇ ਹਿੱਸੇ ਲੋਡ ਨਹੀਂ ਹ�ੰਦੇ ਜਾਂ ਅਜੀਬ ਜਿਹੇ ਲੱਗਦੇ ਹਨ
-
 abuse-report-policy-reason-v2 = ਇਸ ਵਿੱਚ ਨਫ਼ਰਤੀ, ਹਿੰਸਕ ਜਾਂ ਗ਼ੈਰਕਨੂੰਨੀ ਸਮੱਗਰੀ ਹੈ
 abuse-report-policy-suggestions =
     ਯਾਦ ਰੱਖੋ: ਕਾਪੀਰਾਈਟ ਤੇ ਟਰੇਡਮਾਰਕ ਮਸਲੇ ਵੱਖਰੇ ਢੰਗ ਨਾਲ ਰਿਪੋਰਟ ਕੀਤੇ ਜਾਂਦੇ ਹਨ।
     ਸਮੱਸਿਆ ਬਾਰੇ ਜਾਣਕਾਰੀ ਲਈ <a data-l10n-name="report-infringement-link">ਇਹ 
     ਹਦਾਇਤਾਂ</a> ਦੀ ਪਾਲਣਾ ਕਰੋ।
-
 abuse-report-unwanted-reason-v2 = ਇਹ ਕਦੇ ਵੀ ਮੇਰੀ ਪਸੰਦ ਨਹੀਂ ਹੈ ਅਤੇ ਪਤਾ ਨਹੀਂ ਲੱਗਦਾ ਕਿ ਇਸ ਤੋਂ ਖਹਿੜਾ ਕਿਵੇਂ ਪਾਈ�
 abuse-report-unwanted-example = ਮਿਸਾਲ: �ਪਲੀਕੇਸ਼ਨ ਮੇਰੀ ਇਜਾਜ਼ਤ ਤੋਂ ਬਿਨਾਂ ਇਸ ਨੂੰ ਇੰਸਟਾਲ ਕੀਤਾ ਹੈ
-
 abuse-report-other-reason = ਕ�� ਹੋਰ
-
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = ਸਫ਼ਾ:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetCount } ਚੋਂ { $sheetNum }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = ਆਖਰੀ ਸਫ਼ਾ
-
+printpreview-homearrow-button =
+    .title = ਪਹਿਲਾਂ ਸਫ਼ਾ
+printpreview-previousarrow-button =
+    .title = ਪਿਛਲਾ ਸਫ਼ਾ
+printpreview-nextarrow-button =
+    .title = ਅਗਲਾ ਸਫ਼ਾ
+printpreview-endarrow-button =
+    .title = ਆਖਰੀ ਸਫ਼ਾ
diff -Nru firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/pa-IN/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:49:53.000000000 +0000
+++ firefox-85.0+build1/l10n/pa-IN/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:21.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = ਤੱਕ
+printui-page-custom-range-input =
+    .aria-label = ਪਸੰਦੀਦਾ ਸਫ਼ਾ ਹੱਦ ਦਿਓ
+    .placeholder = ਜਿਵੇਂ 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = ਕਾਪੀਆਂ
 printui-orientation = ਸਥਿਤੀ
@@ -48,6 +51,7 @@
 printui-options = ਚੋਣਾਂ
 printui-headers-footers-checkbox = ਸਿਰਲੇਖ ਅਤੇ ਫ�ੱਟਰ ਨੂੰ ਪਰਿੰਟ ਕਰੋ
 printui-backgrounds-checkbox = ਬੈਕਗਰਾਊਂਡ ਪਰਿੰਟ ਕਰੋ
+printui-selection-checkbox = ਚੋਣ ਨੂੰ ਹੀ ਛਾਪੋ
 printui-color-mode-label = ਰੰਗ ਮੋਡ
 printui-color-mode-color = ਰੰਗ
 printui-color-mode-bw = ਕਾਲਾ ਅਤੇ ਚਿੱਟਾ
@@ -56,19 +60,29 @@
 printui-margins-min = ਘੱਟੋ-ਘੱਟ
 printui-margins-none = ਕੋਈ ਨਹੀਂ
 printui-margins-custom = ਕਸਟਮ
+printui-margins-custom-inches = ਪਸੰਦੀਦਾ (ਇੰਚ)
 printui-margins-custom-top = ਸਿਖਰ
+printui-margins-custom-top-inches = ਉੱਤੇ (ਇੰਚ)
 printui-margins-custom-bottom = ਥੱਲਾ
+printui-margins-custom-bottom-inches = ਹੇਠਾਂ (ਇੰਚ)
 printui-margins-custom-left = ਖੱਬੇ
+printui-margins-custom-left-inches = ਖੱਬੇ (ਇੰਚ)
 printui-margins-custom-right = ਸੱਜੇ
+printui-margins-custom-right-inches = ਸੱਜੇ (ਇੰਚ)
 printui-system-dialog-link = …ਸਿਸਟਮ ਡਾਈਲਾਗ ਨੂੰ ਵਰਤ ਕੇ ਪਰਿੰਟ ਕਰੋ
 printui-primary-button = ਪਰਿੰਟ ਕਰੋ
 printui-primary-button-save = ਸੰਭਾਲੋ
 printui-cancel-button = ਰੱਦ ਕਰੋ
+printui-close-button = ਬੰਦ ਕਰੋ
 printui-loading = �ਲਕ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = ਪਰਿੰਟ �ਲਕ
+printui-pages-per-sheet = ਹਰ ਸ਼ੀਟ ਲਈ ਸਫ਼ੇ
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = …ਪਰਿੰਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/pl/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/aboutLogins.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/aboutLogins.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -170,7 +170,11 @@
 about-logins-confirm-remove-dialog-title = Czy usunąć te dane logowania?
 confirm-delete-dialog-message = Tej czynności nie można cofnąć.
 about-logins-confirm-remove-dialog-confirm-button = Usuń
-about-logins-confirm-remove-all-dialog-confirm-button = Usuń wszystkie
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Usuń
+       *[other] Usuń wszystkie
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Tak, usuń te dane logowania
@@ -207,6 +211,8 @@
 about-logins-confirm-export-dialog-title = Eksport danych logowania i haseł
 about-logins-confirm-export-dialog-message = Twoje hasła zostaną zapisane jako zwykły tekst (np. SłabeH@s1o), więc każdy, kto może otworzyć wyeksportowany plik, będzie mógł je zobaczyć.
 about-logins-confirm-export-dialog-confirm-button = Eksportuj…
+about-logins-alert-import-title = Ukończono importowanie
+about-logins-alert-import-message = Wyświetl szczegółowe podsumowanie importowania
 confirm-discard-changes-dialog-title = Czy odrzucić niezachowane zmiany?
 confirm-discard-changes-dialog-message = Wszystkie niezachowane zmiany zostanÄ… utracone.
 confirm-discard-changes-dialog-confirm-button = Odrzuć
@@ -268,3 +274,26 @@
         [macos] Dokument CSV
        *[other] Plik CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Ukończono importowanie
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Dodano nowe dane logowania:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Zaktualizowano istniejÄ…ce dane logowania:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Odnaleziono podwójne dane logowania:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nie zaimportowano)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Błędy:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(nie zaimportowano)</span>
+    }
+about-logins-import-dialog-done = Gotowe
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/pl/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/appmenu.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/appmenu.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nowe okno
+appmenuitem-new-private-window =
+    .label = Nowe okno prywatne
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Powiększ
 appmenuitem-zoom-reduce =
     .label = Pomniejsz
+appmenuitem-fullscreen =
+    .label = Tryb pełnoekranowy
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchronizuj teraz
+appmenuitem-save-page =
+    .label = Zapisz stronę jako…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Co nowego
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/pl/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/appMenuNotifications.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Nie teraz
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = { -brand-shorter-name } po ponownym uruchomieniu przywróci wszystkie karty i okna (oprócz okien prywatnych).
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } nie może zostać automatycznie uaktualniony do najnowszej wersji.
+    .buttonlabel = Uaktualnij przeglÄ…darkÄ™ { -brand-shorter-name } mimo to
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Nie teraz
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Dostępna jest nowa aktualizacja przeglądarki { -brand-shorter-name }, ale nie można jej zainstalować, ponieważ uruchomiona jest inna kopia programu. Zamknij ją, aby kontynuować aktualizację lub zdecyduj się uaktualnić mimo to (druga kopia programu może nie działać poprawnie do czasu uruchomienia jej ponownie).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/browser.ftl firefox-85.0+build1/l10n/pl/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/browser.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/browser.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -505,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> kontroluje teraz kursor. Naciśnij klawisz Esc, aby przejąć nad nim kontrolę.
 pointerlock-warning-no-domain = Dokument kontroluje teraz kursor. Naciśnij klawisz Esc, aby przejąć nad nim kontrolę.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Wyświetl wszystkie zakładki
+bookmarks-recent-bookmarks =
+    .value = Ostatnio dodane
+bookmarks-toolbar-chevron =
+    .tooltiptext = Wyświetl więcej zakładek
+bookmarks-sidebar-content =
+    .aria-label = Zakładki
+bookmarks-menu-button =
+    .label = Menu zakładki
+bookmarks-other-bookmarks-menu =
+    .label = Pozostałe zakładki
+bookmarks-mobile-bookmarks-menu =
+    .label = Zakładki z telefonu
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ukryj panel zakładek
+           *[other] Wyświetl panel zakładek
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ukryj pasek zakładek
+           *[other] Wyświetl pasek zakładek
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Usuń menu Zakładki z paska narzędzi
+           *[other] Dodaj menu Zakładki do paska narzędzi
+        }
+bookmarks-search =
+    .label = Szukaj w zakładkach
+bookmarks-tools =
+    .label = Narzędzia zakładek
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Pasek zakładek
+    .accesskey = z
+    .aria-label = Zakładki
+bookmarks-toolbar-menu =
+    .label = Pasek zakładek
+bookmarks-toolbar-placeholder =
+    .title = Elementy paska zakładek
+bookmarks-toolbar-placeholder-button =
+    .label = Elementy paska zakładek
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Zakładki
+library-bookmarks-bookmark-this-page =
+    .label = Dodaj zakładkę
+library-bookmarks-bookmark-edit =
+    .label = Edytuj zakładkę
+library-recent-activity-label = Ostatnia aktywność
+
+## More items
+
+more-menu-go-offline =
+    .label = Pracuj w trybie offline
+    .accesskey = c
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/pl/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/newtab/asrouter.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -131,6 +131,9 @@
 
 cfr-whatsnew-searchbar-title = Pisz mniej, znajdź więcej za pomocą paska adresu
 cfr-whatsnew-searchbar-body-topsites = Teraz wystarczy kliknąć pasek adresu, a pojawią się odnośniki do najczęściej odwiedzanych stron.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Ikona lupy
 
 ## Picture-in-Picture
@@ -288,3 +291,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Skróty wyszukiwania na pasku adresu
 cfr-whatsnew-search-shortcuts-body = Od teraz kiedy na pasku adresu wpiszesz nazwę wyszukiwarki lub konkretnej witryny, w podpowiedziach wyszukiwania poniżej pojawi się niebieski skrót. Kliknij ten skrót, aby dokończyć wyszukiwanie bezpośrednio z paska adresu.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Ochrona przed złośliwymi superciasteczkami
+cfr-whatsnew-supercookies-body = Strony internetowe mogą potajemnie dołączyć do przeglądarki „superciasteczko�, które jest w stanie śledzić Cię w Internecie nawet po wyczyszczeniu ciasteczek. { -brand-short-name } zapewnia teraz silną ochronę przed superciasteczkami, uniemożliwiając używanie ich do śledzenia Twoich ruchów w sieci z jednej witryny na drugą.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Lepsza obsługa zakładek
+cfr-whatsnew-bookmarking-body = Zarządzanie ulubionymi stronami jest łatwiejsze. { -brand-short-name } pamięta teraz preferowane miejsce zachowywania zakładek, domyślnie wyświetla pasek zakładek w nowych kartach i zapewnia łatwy dostęp do pozostałych zakładek za pomocą folderu na pasku zakładek.
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/pl/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/newtab/newtab.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nowa karta
 newtab-settings-button =
     .title = Dostosuj stronÄ™ nowej karty
+newtab-personalize-button-label = Personalizuj
+    .title = Personalizuj nowÄ… kartÄ™
+    .aria-label = Personalizuj nowÄ… kartÄ™
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Szukaj w Internecie
     .title = Szukaj w Internecie
     .aria-label = Szukaj w Internecie
+newtab-search-box-text = Szukaj w Internecie
+newtab-search-box-input =
+    .placeholder = Szukaj w Internecie
+    .aria-label = Szukaj w Internecie
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Dodaj wyszukiwarkÄ™
 newtab-topsites-add-topsites-header = Dodawanie strony do sekcji Popularne
+newtab-topsites-add-shortcut-header = Nowy skrót
 newtab-topsites-edit-topsites-header = Edycja strony z sekcji Popularne
+newtab-topsites-edit-shortcut-header = Edycja skrótu
 newtab-topsites-title-label = Tytuł
 newtab-topsites-title-input =
     .placeholder = Wpisz tytuł
@@ -207,3 +216,28 @@
 
 newtab-error-fallback-info = Coś się nie powiodło podczas wczytywania tej treści
 newtab-error-fallback-refresh-link = Odśwież stronę, by spróbować ponownie
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Skróty
+newtab-custom-shortcuts-subtitle = Zachowane i odwiedzane strony.
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } wiersz
+        [few] { $num } wiersze
+       *[many] { $num } wierszy
+    }
+newtab-custom-sponsored-sites = Sponsorowane skróty
+newtab-custom-pocket-title = Polecane przez { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Wyjątkowe rzeczy wybrane przez { -pocket-brand-name }, część rodziny produktów { -brand-product-name }.
+newtab-custom-pocket-sponsored = Sponsorowane artykuły
+newtab-custom-recent-title = Ostatnia aktywność
+newtab-custom-recent-subtitle = Wybierane z ostatnio odwiedzanych stron i treści.
+newtab-custom-close-button = Zamknij
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Od Mozilli
+newtab-custom-snippets-subtitle = Wskazówki i aktualności od organizacji { -vendor-short-name } i przeglądarki { -brand-product-name }.
+newtab-custom-settings = Więcej ustawień
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/places.ftl firefox-85.0+build1/l10n/pl/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/places.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/places.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podfolder
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Pozostałe zakładki
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/pl/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/preferences/preferences.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -503,13 +503,19 @@
 home-prefs-topsites-description = Najczęściej odwiedzane strony.
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsorowane popularne witryny
+home-prefs-shortcuts-header =
+    .label = Skróty
+home-prefs-shortcuts-description = Zachowane i odwiedzane strony.
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsorowane skróty
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = Polecane przez { $provider }
-home-prefs-recommended-by-description-update = Wyjątkowe rzeczy z całego Internetu, wybrane przez { $provider }
+home-prefs-recommended-by-description-update = Wyjątkowe rzeczy z całego Internetu, wybrane przez { $provider }.
+home-prefs-recommended-by-description-new = Wyjątkowe rzeczy wybrane przez { $provider }, część rodziny produktów { -brand-product-name }.
 
 ##
 
@@ -518,8 +524,6 @@
     .label = Sponsorowane artykuły
 home-prefs-highlights-header =
     .label = Wyróżnione
-home-prefs-recent-activity-header =
-    .label = Ostatnia aktywność
 home-prefs-highlights-description = Wybierane z zachowanych i odwiedzonych stron.
 home-prefs-highlights-option-visited-pages =
     .label = Historia
@@ -529,6 +533,9 @@
     .label = Ostatnio pobrane pliki
 home-prefs-highlights-option-saved-to-pocket =
     .label = Zachowane w { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Ostatnia aktywność
+home-prefs-recent-activity-description = Wybierane z ostatnio odwiedzanych stron i treści.
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Od Mozilli
 home-prefs-snippets-description = Informacje od organizacji { -vendor-short-name } i przeglądarki { -brand-product-name }.
+home-prefs-snippets-description-new = Wskazówki i aktualności od organizacji { -vendor-short-name } i przeglądarki { -brand-product-name }.
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -928,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = otwartych kartach
     .accesskey = k
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = skrótach
+    .accesskey = s
 addressbar-locbar-topsites-option =
     .label = popularnych witrynach
     .accesskey = w
+addressbar-locbar-engines-option =
+    .label = wyszukiwarkach
+    .accesskey = w
 addressbar-suggestions-settings = Zmień preferencje podpowiedzi dostarczanych przez wyszukiwarki
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/pl/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/pl/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -62,6 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Tylko w nowej karcie
     .accesskey = T
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Zawsze wyświetlaj
+    .accesskey = Z
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nigdy nie wyświetlaj
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Wyświetlaj tylko w nowej karcie
+    .accesskey = k
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Wyświetlaj pozostałe zakładki
     .accesskey = W
diff -Nru firefox-84.0.2+build1/l10n/pl/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/pl/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/pl/browser/chrome/browser/browser.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/browser/chrome/browser/browser.properties	2021-01-18 20:07:29.000000000 +0000
@@ -919,7 +919,7 @@
 userContextWork.label = Praca
 userContextBanking.label = Bankowość
 userContextShopping.label = Zakupy
-userContextNone.label = Brak kontekstu
+userContextNone.label = Bez kontekstu
 
 userContextPersonal.accesskey = O
 userContextWork.accesskey = P
diff -Nru firefox-84.0.2+build1/l10n/pl/devtools/client/markers.properties firefox-85.0+build1/l10n/pl/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/pl/devtools/client/markers.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/devtools/client/markers.properties	2021-01-18 20:07:29.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Mało pamięci
 marker.gcreason.label.CC_WAITING=Wymuszone Cycle Collection
+marker.gcreason.label.CC_FINISHED=Ukończono Cycle Collection
 marker.gcreason.label.CC_FORCED=Wymuszone przez Cycle Collection
 marker.gcreason.label.LOAD_END=Ukończono wczytywanie strony
 marker.gcreason.label.PAGE_HIDE=Przeniesiono w tło
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/pl/devtools/client/toolbox.properties firefox-85.0+build1/l10n/pl/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/pl/devtools/client/toolbox.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/devtools/client/toolbox.properties	2021-01-18 20:07:29.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Otwórz plik w edytorze stylów
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Zamknij narzędzia dla programistów
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Pokaż konsolę
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/pl/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/pl/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/pl/devtools/client/tooltips.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/devtools/client/tooltips.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> nie ma wpływu na ten element, ponieważ nie jest on elementem pozycjonowanym.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> nie ma wpływu na ten element, ponieważ <strong>overflow:hidden</strong> nie jest ustawione.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> nie ma wpływu na ten element, ponieważ jego <strong>outline-style</strong> to <strong>auto</strong> lub <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> nie ma wpływu na wewnętrzne elementy tabeli.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> nie ma wpływu na wewnętrzne elementy tabeli, z wyjątkiem komórek tabeli.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Spróbuj usunąć <strong>float</strong> lub dodać <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Spróbuj ustawić jego własność <strong>position</strong> na coś innego niż <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Spróbuj dodać <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Spróbuj ustawić jego własność <strong>display</strong> na coś innego niż <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> lub <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Spróbuj ustawić jego własność <strong>display</strong> na coś innego niż <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> lub <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Spróbuj ustawić jego własność <strong>outline-style</strong> na coś innego niż <strong>auto</strong> lub <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/pl/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/pl/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/pl/dom/chrome/dom/dom.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/dom/chrome/dom/dom.properties	2021-01-18 20:07:29.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Selektor <input> został zablokowany z powodu braku aktywacji przez użytkownika.
 ExternalProtocolFrameBlockedNoUserActivation=Ramka z zewnętrznym protokołem została zablokowana z powodu braku aktywacji przez użytkownika lub z powodu za krótkiego czasu od ostatniego wczytania takiej ramki.
 MultiplePopupsBlockedNoUserActivation=Otwarcie wielu wyskakujących okien zostało zablokowane z powodu braku aktywacji przez użytkownika.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Wstępne wczytanie %S zostało zignorowane z powodu nieznanych wartości „as� lub „type� albo niepasującego atrybutu „media�.
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/pl/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/pl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:29.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=dzień;dni;dni
 
 downloadErrorAlertTitle=BÅ‚Ä…d pobierania pliku
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Nie można zapisać pobieranego pliku, ponieważ jest zablokowany przez rozszerzenie %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Nie można zapisać pobieranego pliku, ponieważ jest zablokowany przez rozszerzenie.
 downloadErrorGeneric=Nie można zapisać pobieranego pliku z powodu nieznanego błędu.\n\nNależy spróbować ponownie.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/pl/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/pl/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:29.000000000 +0000
@@ -16,7 +16,7 @@
 restartNowButton=Uruchom program %S ponownie
 restartNowButton.accesskey=U
 
-statusFailed=Instalacja zakończyła się niepowodzeniem
+statusFailed=Instalacja się nie powiodła
 
 installSuccess=aktualizacja została zainstalowana
 installPending=Instalacja w toku
@@ -27,7 +27,7 @@
 check_error-403=Odmowa dostępu (403)
 check_error-404=Plik XML aktualizacji nie został odnaleziony (404)
 check_error-500=Wewnętrzny błąd serwera (500)
-check_error-2152398849=BÅ‚Ä…d (z nieznanych przyczyn)
+check_error-2152398849=Błąd (z nieznanych przyczyn)
 check_error-2152398861=Odmowa połączenia
 check_error-2152398862=Upłynął limit czasu połączenia
 # NS_ERROR_OFFLINE
@@ -42,3 +42,4 @@
 check_error-2152398920=Odmowa połączenia z serwerem proxy
 check_error-2153390069=Certyfikat serwera utracił ważność (należy poprawić czas systemowy, jeśli jest nieprawidłowy)
 check_error-verification_failed=Nie udało się zweryfikować integralności aktualizacji
+check_error-move_failed=Przygotowanie aktualizacji do instalacji się nie powiodło
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/pl/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -189,6 +189,32 @@
 
 ##
 
+support-third-party-modules-title = Moduły zewnętrzne
+support-third-party-modules-module = Plik modułu
+support-third-party-modules-version = Wersja pliku
+support-third-party-modules-vendor = Informacje o dostawcy
+support-third-party-modules-occurrence = Liczba wystąpień
+support-third-party-modules-process = Typ i ID procesu
+support-third-party-modules-thread = WÄ…tek
+support-third-party-modules-base = Adres ImageBase
+support-third-party-modules-uptime = Czas działania procesu (ms)
+support-third-party-modules-duration = Czas wczytywania (ms)
+support-third-party-modules-empty = Nie wczytano żadnych modułów zewnętrznych.
+support-third-party-modules-no-value = (Brak wartości)
+support-third-party-modules-button-open =
+    .title = Otwórz położenie pliku…
+support-third-party-modules-expand =
+    .title = Wyświetl szczegółowe informacje
+support-third-party-modules-collapse =
+    .title = Zwiń szczegółowe informacje
+support-third-party-modules-unsigned-icon =
+    .title = Ten moduł nie jest podpisany
+support-third-party-modules-folder-icon =
+    .title = Otwórz położenie pliku…
+support-third-party-modules-down-icon =
+    .title = Wyświetl szczegółowe informacje
+support-third-party-modules-up-icon =
+    .title = Zwiń szczegółowe informacje
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/pl/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Obsługa wielu okien „Obraz w obrazie�
 experimental-features-multi-pip-description = Eksperymentalna obsługa otwierania wielu okien „Obraz w obrazie� jednocześnie.
+experimental-features-http3 =
+    .label = Protokół HTTP/3
+experimental-features-http3-description = Eksperymentalna obsługa protokołu HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printDialogs.ftl firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printDialogs.ftl
--- firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printDialogs.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printDialogs.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -34,9 +34,9 @@
     .label = Drukuj tło (kolory oraz obrazy)
     .accesskey = k
 margin-group-label-inches =
-    .value = Marginesy (w calach)
+    .value = Marginesy (w calach)
 margin-group-label-metric =
-    .value = Marginesy (w milimetrach)
+    .value = Marginesy (w milimetrach)
 margin-top =
     .value = Górny:
     .accesskey = G
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Strona:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } z { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Ostatnia strona
-
+printpreview-homearrow-button =
+    .title = Pierwsza strona
+printpreview-previousarrow-button =
+    .title = Poprzednia strona
+printpreview-nextarrow-button =
+    .title = Następna strona
+printpreview-endarrow-button =
+    .title = Ostatnia strona
diff -Nru firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/pl/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:50:27.000000000 +0000
+++ firefox-85.0+build1/l10n/pl/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:29.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Wprowadź inny zakres stron
+    .placeholder = np. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopie
 printui-orientation = Orientacja
@@ -49,6 +52,7 @@
 printui-options = Opcje
 printui-headers-footers-checkbox = Drukuj nagłówki i stopki
 printui-backgrounds-checkbox = Drukuj tła
+printui-selection-checkbox = Drukuj tylko zaznaczenie
 printui-color-mode-label = Tryb kolorów
 printui-color-mode-color = Kolorowy
 printui-color-mode-bw = Czarno-biały
@@ -57,19 +61,29 @@
 printui-margins-min = Minimalne
 printui-margins-none = Bez
 printui-margins-custom = Niestandardowe
+printui-margins-custom-inches = Niestandardowe (w calach)
 printui-margins-custom-top = Górny
+printui-margins-custom-top-inches = Górny (w calach)
 printui-margins-custom-bottom = Dolny
+printui-margins-custom-bottom-inches = Dolny (w calach)
 printui-margins-custom-left = Lewy
+printui-margins-custom-left-inches = Lewy (w calach)
 printui-margins-custom-right = Prawy
+printui-margins-custom-right-inches = Prawy (w calach)
 printui-system-dialog-link = Drukuj za pomocą okna systemowego…
 printui-primary-button = Drukuj
 printui-primary-button-save = Zapisz
 printui-cancel-button = Anuluj
+printui-close-button = Zamknij
 printui-loading = Przygotowywanie podglÄ…du
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = PodglÄ…d wydruku
+printui-pages-per-sheet = Strony na kartkÄ™
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Drukowanie…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/aboutLogins.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/aboutLogins.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -129,7 +129,7 @@
 
 ## Master Password notification
 
-master-password-notification-message = Digite sua senha mestra para ver contas e senhas salvas
+master-password-notification-message = Digite sua senha principal para ver contas e senhas salvas
 # This message can be seen when attempting to export a password in about:logins on Windows.
 about-logins-export-password-os-auth-dialog-message-win = Para exportar suas contas, insira suas credenciais de acesso ao Windows. Isso ajuda a proteger a segurança de suas contas.
 # This message can be seen when attempting to export a password in about:logins
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Remover esta conta?
 confirm-delete-dialog-message = Esta ação não pode ser desfeita.
 about-logins-confirm-remove-dialog-confirm-button = Remover
-about-logins-confirm-remove-all-dialog-confirm-button = Remover tudo
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Remover
+        [one] Remover
+       *[other] Remover tudo
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sim, remover esta conta
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportar contas e senhas
 about-logins-confirm-export-dialog-message = Suas senhas serão salvas em texto legível (exemplo, Senh@Ruim123), qualquer pessoa que consiga abrir o arquivo exportado poderá ver.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importação concluída
+about-logins-alert-import-message = Ver resumo detalhado da importação
 confirm-discard-changes-dialog-title = Descartar alterações não salvas?
 confirm-discard-changes-dialog-message = Todas as alterações não salvas serão perdidas.
 confirm-discard-changes-dialog-confirm-button = Descartar
@@ -262,3 +269,30 @@
         [macos] Documento CSV
        *[other] Arquivo CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importação concluída
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nova conta adicionada:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Novas contas adicionadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Conta existente atualizada:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Contas existentes atualizadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Conta duplicada encontrada:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importada)</span>
+       *[other] <span>Contas duplicadas encontradas:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importadas)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Erro:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importado)</span>
+       *[other] <span>Erros:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importados)</span>
+    }
+about-logins-import-dialog-done = Concluído
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -19,8 +19,8 @@
     .placeholder = Comentários opcionais (comentários são visíveis publicamente)
 crashed-include-URL = Incluir as URLs dos sites em que você estava quando { -brand-short-name } travou.
 crashed-include-URL-2 = Incluir as URLs dos sites em que você estava quando o { -brand-short-name } travou
-crashed-email-placeholder = Digite aqui seu endereço de e-mail
-crashed-email-me = Enviar um e-mail quando mais informações estiverem disponíveis
+crashed-email-placeholder = Digite aqui seu endereço de email
+crashed-email-me = Enviar um email quando mais informações estiverem disponíveis
 crashed-report-sent = Relato do travamento já enviado; obrigado por ajudar a melhorar o { -brand-short-name }!
 crashed-request-auto-submit-title = Informar abas em segundo plano
 crashed-auto-submit-checkbox = Atualizar as preferências para enviar relato automaticamente quando o { -brand-short-name } travar.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/appmenu.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/appmenu.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nova janela
+appmenuitem-new-private-window =
+    .label = Nova janela privativa
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Ampliar
 appmenuitem-zoom-reduce =
     .label = Reduzir
+appmenuitem-fullscreen =
+    .label = Tela inteira
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar agora
+appmenuitem-save-page =
+    .label = Salvar página como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novidades
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/appMenuNotifications.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Agora não
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Após um reinício rápido, o { -brand-shorter-name } irá restaurar todas as abas e janelas abertas que não sejam de navegação privativa.
+appmenu-update-other-instance =
+    .label = O { -brand-shorter-name } não conseguiu atualizar automaticamente para a versão mais recente.
+    .buttonlabel = Atualizar o { -brand-shorter-name } mesmo assim
+    .buttonaccesskey = A
+    .secondarybuttonlabel = Mais tarde
+    .secondarybuttonaccesskey = M
+appmenu-update-other-instance-message = Uma nova atualização do { -brand-shorter-name } está disponível, mas não pode ser instalada porque outra cópia do { -brand-shorter-name } está em execução. Feche a outra cópia para continuar a atualização, ou escolha atualizar assim mesmo (a outra cópia pode não funcionar corretamente enquanto não for reiniciada).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK, entendi
     .buttonaccesskey = O
@@ -40,7 +47,7 @@
     .label = Permitir esta extensão em janelas privativas
     .accesskey = P
 appmenu-new-tab-controlled =
-    .label = Sua nova aba foi alterada.
+    .label = Sua página de nova aba foi alterada.
     .buttonlabel = Manter alterações
     .buttonaccesskey = M
     .secondarybuttonlabel = Desativar extensão
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/browserContext.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/browserContext.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/browserContext.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/browserContext.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -112,7 +112,7 @@
 ## are mutually exclusive.
 
 main-context-menu-copy-email =
-    .label = Copiar endereço do e-mail
+    .label = Copiar endereço de email
     .accesskey = o
 main-context-menu-copy-link =
     .label = Copiar link
@@ -211,7 +211,7 @@
     .label = Salvar imagem como…
     .accesskey = i
 main-context-menu-image-email =
-    .label = Enviar imagem por e-mail…
+    .label = Enviar imagem por email…
     .accesskey = v
 main-context-menu-image-set-as-background =
     .label = Definir como papel de parede…
@@ -232,10 +232,10 @@
     .label = Salvar quadro atual como…
     .accesskey = S
 main-context-menu-video-email =
-    .label = Enviar vídeo por e-mail…
+    .label = Enviar vídeo por email…
     .accesskey = r
 main-context-menu-audio-email =
-    .label = Enviar áudio por e-mail…
+    .label = Enviar áudio por email…
     .accesskey = r
 main-context-menu-plugin-play =
     .label = Ativar este plugin
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/browser.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/browser.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/browser.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -188,9 +188,9 @@
 page-action-copy-url-urlbar =
     .tooltiptext = Copiar link
 page-action-email-link-panel =
-    .label = Enviar link por e-mail…
+    .label = Enviar link por email…
 page-action-email-link-urlbar =
-    .tooltiptext = Enviar link por e-mail…
+    .tooltiptext = Enviar link por email…
 page-action-share-url-panel =
     .label = Compartilhar
 page-action-share-url-urlbar =
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tem controle de seu ponteiro. Pressione Esc para retomar o controle.
 pointerlock-warning-no-domain = Este documento tem o controle do seu ponteiro. Pressionar Esc para retomar o controle.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos os favoritos
+bookmarks-recent-bookmarks =
+    .value = Favoritos recentes
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar mais favoritos
+bookmarks-sidebar-content =
+    .aria-label = Favoritos
+bookmarks-menu-button =
+    .label = Menu de favoritos
+bookmarks-other-bookmarks-menu =
+    .label = Outros favoritos
+bookmarks-mobile-bookmarks-menu =
+    .label = Favoritos do celular
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar Painel de Favoritos
+           *[other] Ver painel de favoritos
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar Barra de Favoritos
+           *[other] Ver barra de favoritos
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Remover menu de favoritos da barra de ferramentas
+           *[other] Adicionar menu de favoritos à barra de ferramentas
+        }
+bookmarks-search =
+    .label = Pesquisar nos favoritos
+bookmarks-tools =
+    .label = Ferramentas de favoritos
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de favoritos
+    .accesskey = r
+    .aria-label = Favoritos
+bookmarks-toolbar-menu =
+    .label = Barra de favoritos
+bookmarks-toolbar-placeholder =
+    .title = Itens da barra de favoritos
+bookmarks-toolbar-placeholder-button =
+    .label = Itens da barra de favoritos
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Favoritos
+library-bookmarks-bookmark-this-page =
+    .label = Adicionar página aos favoritos
+library-bookmarks-bookmark-edit =
+    .label = Editar este favorito
+library-recent-activity-label = Atividade recente
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabalhar offline
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/menubar.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/menubar.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/menubar.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/menubar.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -3,6 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+# NOTE: For English locales, strings in this file should be in APA-style Title Case.
+# See https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case
+#
+# NOTE: For Engineers, please don't re-use these strings outside of the menubar.
+
+
 ## File Menu
 
 menu-file =
@@ -38,7 +44,7 @@
     .label = Salvar página como…
     .accesskey = v
 menu-file-email-link =
-    .label = Enviar link por e-mail…
+    .label = Enviar link por email…
     .accesskey = E
 menu-file-print-setup =
     .label = Configurar página…
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newInstallPage.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/newInstallPage.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newInstallPage.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/newInstallPage.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -9,24 +9,19 @@
 
 title = Notícias importantes
 heading = Mudanças no seu perfil do { -brand-short-name }
-
 changed-title = O que mudou?
 changed-desc-profiles = Esta instalação do { -brand-short-name } tem um novo perfil. Um perfil é um conjunto de arquivos onde o Firefox salva informações como favoritos, senhas e preferências do usuário.
 changed-desc-dedicated = Para tornar mais fácil e seguro alternar entre instalações do Firefox (incluindo Firefox, Firefox ESR, Firefox Beta, Firefox Developer Edition e Firefox Nightly), esta instalação agora tem um perfil dedicado. Ele não compartilha automaticamente suas informações salvas com outras instalações do Firefox.
-
 lost = <b>Você não perdeu nenhum dado pessoal nem personalização.</b> Se você já tiver salvo informações no Firefox neste computador, elas ainda estão disponíveis em outra instalação do Firefox.
-
 options-title = Quais são minhas opções?
 options-do-nothing = Se não fizer nada, seus dados de perfil no { -brand-short-name } serão diferentes dos dados de perfil em outras instalações do Firefox.
 options-use-sync = Se quiser que todos os seus dados de perfil sejam os mesmos em todas as instalações do Firefox, pode usar uma { -fxaccount-brand-name } para mantê-los sincronizados.
-
 resources = Recursos:
 support-link = Como usar o gerenciador de perfis (artigo de suporte)
-
 sync-header = Entre na sua { -fxaccount-brand-name }, ou crie uma
-sync-label = Digite seu e-mail
+sync-label = Digite seu email
 sync-input =
-    .placeholder = E-mail
+    .placeholder = Email
 sync-button = Continuar
 sync-terms = Ao continuar, você concorda com os <a data-l10n-name="terms">Termos do serviço</a> e o <a data-l10n-name="privacy">Aviso de privacidade</a>.
 sync-first = Primeira vez usando o { -sync-brand-name }? Você precisa se identificar em cada instalação do Firefox para sincronizar suas informações.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/asrouter.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -93,7 +93,7 @@
     .label = Novidades
     .tooltiptext = Novidades
 cfr-whatsnew-panel-header = Novidades
-cfr-whatsnew-release-notes-link-text = Ler as notas da versão
+cfr-whatsnew-release-notes-link-text = Ler as notas de atualização
 cfr-whatsnew-fx70-title = O { -brand-short-name } agora luta mais intensamente por sua privacidade
 cfr-whatsnew-fx70-body =
     A última atualização aprimora o recurso de proteção contra rastreamento
@@ -122,6 +122,9 @@
 
 cfr-whatsnew-searchbar-title = Digite menos, encontre mais usando a barra de endereços
 cfr-whatsnew-searchbar-body-topsites = Agora basta selecionar a barra de endereços e aparecem links para seus sites preferidos.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �cone da lente de aumento
 
 ## Picture-in-Picture
@@ -191,9 +194,9 @@
 cfr-doorhanger-socialtracking-heading = O { -brand-short-name } impediu que uma rede social rastreasse você aqui
 cfr-doorhanger-socialtracking-description = Sua privacidade é importante. Agora o { -brand-short-name } bloqueia rastreadores comuns de mídias sociais, limitando quantos dados conseguem coletar sobre o que você faz online.
 cfr-doorhanger-fingerprinters-heading = O { -brand-short-name } bloqueou um fingerprinter nesta página
-cfr-doorhanger-fingerprinters-description = Sua privacidade é importante. Agora o { -brand-short-name } bloqueia fingerprinters, que coletam elementos de informação unicamente identificáveis sobre seu dispositivo para rastrear você.
+cfr-doorhanger-fingerprinters-description = Sua privacidade é importante. Agora o { -brand-short-name } bloqueia fingerprinters (rastreadores de identidade digital), que tentam coletar elementos de informação unicamente identificáveis sobre seu dispositivo para rastrear você.
 cfr-doorhanger-cryptominers-heading = O { -brand-short-name } bloqueou um criptominerador nesta página
-cfr-doorhanger-cryptominers-description = Sua privacidade é importante. Agora o { -brand-short-name } bloqueia criptomineradores, que usam o poder computacional do seu sistema para minerar moedas digitais.
+cfr-doorhanger-cryptominers-description = Sua privacidade é importante. Agora o { -brand-short-name } bloqueia criptomineradores, que tentam usar o poder computacional do seu sistema para minerar moedas digitais.
 
 ## Enhanced Tracking Protection Milestones
 
@@ -269,10 +272,20 @@
 ## What's new: Media controls message
 
 cfr-whatsnew-media-keys-header = Mais controles de mídia
-cfr-whatsnew-media-keys-body = Reproduza e pause áudio ou vídeo diretamente do teclado ou do fone de ouvido, facilitando controlar mídias a partir de outra aba, outro programa ou mesmo quando o computador estiver bloqueado. Você também pode mudar de faixa usando as teclas de avançar e voltar.
+cfr-whatsnew-media-keys-body = Reproduza e interrompa áudio ou vídeo, usando diretamente o teclado ou fone de ouvido, o que facilita controlar mídias a partir de outra aba, outro programa ou mesmo quando o computador estiver bloqueado. Você também pode mudar de faixa usando as teclas de avançar e voltar.
 cfr-whatsnew-media-keys-button = Saiba como
 
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Atalhos de pesquisa na barra de endereços
-cfr-whatsnew-search-shortcuts-body = Agora, quando você digita um mecanismo de pesquisa ou site específico na barra de endereços, um atalho azul aparece nas sugestões de pesquisa abaixo. Selecione esse atalho para concluir a pesquisa diretamente na barra de endereços.
+cfr-whatsnew-search-shortcuts-body = Agora, quando você digita um mecanismo de pesquisa ou site específico na barra de endereços, um atalho azul aparece nas sugestões de pesquisa. Selecione esse atalho para concluir a pesquisa diretamente na barra de endereços.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Proteção contra supercookies maliciosos
+cfr-whatsnew-supercookies-body = Alguns sites podem anexar secretamente ao seu navegador um “supercookie� que pode te seguir pela web, mesmo após você limpar seus cookies. O { -brand-short-name } agora oferece forte proteção contra supercookies, assim eles não podem ser usados para rastrear suas atividades online de um site para outro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Melhora nos favoritos
+cfr-whatsnew-bookmarking-body = É mais fácil acompanhar seus sites preferidos. Agora o { -brand-short-name } memoriza seu local preferido de salvar favoritos, mostra por padrão a barra de ferramentas de favoritos em novas abas e oferece acesso fácil ao restante de seus favoritos por meio de uma pasta na barra de ferramentas.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/newtab.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nova aba
 newtab-settings-button =
     .title = Personalizar sua página de nova aba
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar nova aba
+    .aria-label = Personalizar nova aba
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Pesquisar na web
     .title = Pesquisar na web
     .aria-label = Pesquisar na web
+newtab-search-box-text = Pesquisar na web
+newtab-search-box-input =
+    .placeholder = Pesquisar na web
+    .aria-label = Pesquisar na web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Adicionar mecanismo de pesquisa
 newtab-topsites-add-topsites-header = Novo site preferido
+newtab-topsites-add-shortcut-header = Novo atalho
 newtab-topsites-edit-topsites-header = Editar site preferido
+newtab-topsites-edit-shortcut-header = Editar atalho
 newtab-topsites-title-label = Título
 newtab-topsites-title-input =
     .placeholder = Digite um título
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Opa, algo deu errado ao carregar esse conteúdo.
 newtab-error-fallback-refresh-link = Atualize a página para tentar novamente.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Atalhos
+newtab-custom-shortcuts-subtitle = Sites que você salva ou visita
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } linha
+       *[other] { $num } linhas
+    }
+newtab-custom-sponsored-sites = Atalhos patrocinados
+newtab-custom-pocket-title = Recomendado pelo { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Conteúdo excepcional selecionado pelo { -pocket-brand-name }, parte da família { -brand-product-name }
+newtab-custom-pocket-sponsored = Histórias patrocinadas
+newtab-custom-recent-title = Atividade recente
+newtab-custom-recent-subtitle = Uma seleção de sites e conteúdos recentes
+newtab-custom-close-button = Fechar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Snippets
+newtab-custom-snippets-subtitle = Dicas e novidades da { -vendor-short-name } e do { -brand-product-name }
+newtab-custom-settings = Gerenciar mais configurações
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/newtab/onboarding.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/newtab/onboarding.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -33,10 +33,10 @@
 onboarding-welcome-modal-privacy-body = Você instalou o navegador. Vamos adicionar mais proteção de privacidade.
 onboarding-welcome-modal-family-learn-more = Saiba mais sobre a família de produtos  { -brand-product-name }.
 onboarding-welcome-form-header = Início
-onboarding-join-form-body = Digite seu endereço de e-mail para começar.
+onboarding-join-form-body = Digite seu endereço de email para começar.
 onboarding-join-form-email =
-    .placeholder = Digite seu e-mail
-onboarding-join-form-email-error = É necessário um e-mail válido
+    .placeholder = Digite seu email
+onboarding-join-form-email-error = É necessário um email válido
 onboarding-join-form-legal = Ao continuar, você concorda com os <a data-l10n-name="terms">Termos do serviço</a> e o <a data-l10n-name="privacy">Aviso de privacidade</a>.
 onboarding-join-form-continue = Continuar
 # This message is followed by a link using onboarding-join-form-signin ("Sign In") as text.
@@ -53,7 +53,7 @@
 
 onboarding-fullpage-welcome-subheader = Vamos descobrir tudo o que você pode fazer.
 onboarding-fullpage-form-email =
-    .placeholder = Seu endereço de e-mail…
+    .placeholder = Seu endereço de email…
 
 ## Firefox Sync modal dialog strings.
 
@@ -61,7 +61,7 @@
 onboarding-sync-welcome-content = Tenha seus favoritos, histórico, senhas e outras configurações em todos os seus dispositivos.
 onboarding-sync-welcome-learn-more-link = Saiba mais sobre a Conta Firefox
 onboarding-sync-form-input =
-    .placeholder = E-mail
+    .placeholder = Email
 onboarding-sync-form-continue-button = Continuar
 onboarding-sync-form-skip-login-button = Pular essa etapa
 
@@ -179,7 +179,7 @@
 onboarding-data-sync-text2 = Sincronize favoritos, senhas e outras coisas em todo lugar que usar o { -brand-product-name }.
 onboarding-data-sync-button2 = Entre no { -sync-brand-short-name }
 onboarding-firefox-monitor-title = Fique atento a vazamentos de dados
-onboarding-firefox-monitor-text2 = O { -monitor-brand-name } verifica se seu e-mail apareceu em um vazamento de dados conhecido e envia um alerta caso apareça em um novo vazamento.
+onboarding-firefox-monitor-text2 = O { -monitor-brand-name } verifica se seu email apareceu em um vazamento de dados conhecido e envia um alerta caso apareça em um novo vazamento.
 onboarding-firefox-monitor-button = Cadastre-se para receber alertas
 onboarding-browse-privately-title = Navegue com privacidade
 onboarding-browse-privately-text = A navegação privativa limpa seu histórico de pesquisa e navegação para manter em segredo de qualquer um que use o computador.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/nsserrors.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/nsserrors.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/nsserrors.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/nsserrors.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -201,7 +201,7 @@
 sec-error-invalid-key = A chave não oferece suporte à operação solicitada.
 sec-error-unknown-critical-extension = O certificado contém uma extensão obrigatória desconhecida.
 sec-error-old-crl = A nova CRL não é mais recente que a utilizada no momento.
-sec-error-no-email-cert = Não criptografado ou assinado: você ainda não possui um certificado de e-mail.
+sec-error-no-email-cert = Não criptografado nem assinado: você ainda não tem um certificado de email.
 sec-error-no-recipient-certs-query = Não criptografado: você não possui certificados para cada um dos destinatários.
 sec-error-not-a-recipient = Não é possível descriptografar: você não é o destinatário ou o certificado correspondente ou a chave privativa não foram encontrados.
 sec-error-pkcs7-keyalg-mismatch = Não é possível descriptografar: a chave de criptografia não confere com a do seu certificado.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/places.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/places.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/places.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subpasta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Outros favoritos
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/preferences/preferences.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -270,7 +270,7 @@
     .label = Sempre perguntar onde salvar arquivos
     .accesskey = a
 applications-header = Aplicativos
-applications-description = Escolha o que o { -brand-short-name } faz com os arquivos que você baixa e os aplicativos que você usa enquanto navega.
+applications-description = Escolha o que o { -brand-short-name } deve fazer com os arquivos que você baixa e aplicativos que você usa ao navegar.
 applications-filter =
     .placeholder = Pesquisar tipos de arquivos ou aplicativos
 applications-type-column =
@@ -348,7 +348,7 @@
 
 ##
 
-drm-content-header = Conteúdo DRM (Gerenciamento de Direitos Digitais)
+drm-content-header = Conteúdo DRM (gerenciamento de direitos digitais)
 play-drm-content =
     .label = Reproduzir conteúdo controlado por DRM
     .accesskey = R
@@ -455,7 +455,7 @@
 ## Home Section
 
 home-new-windows-tabs-header = Novas janelas e abas
-home-new-windows-tabs-description2 = Escolha o que ver quando abrir a página inicial, novas janelas e novas abas.
+home-new-windows-tabs-description2 = Escolha o que aparece quando você abre sua página inicial, novas janelas e novas abas.
 
 ## Home Section - Home Page Customization
 
@@ -499,7 +499,12 @@
     .label = Sites preferidos
 home-prefs-topsites-description = Os sites que você mais visita
 home-prefs-topsites-by-option-sponsored =
-    .label = Sites principais patrocinados
+    .label = Sites preferidos patrocinados
+home-prefs-shortcuts-header =
+    .label = Atalhos
+home-prefs-shortcuts-description = Sites que você salva ou visita
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Atalhos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado pelo { $provider }
 home-prefs-recommended-by-description-update = Conteúdo excepcional da web afora, curadoria de { $provider }
+home-prefs-recommended-by-description-new = Conteúdo excepcional selecionado pelo { $provider }, parte da família { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Histórias patrocinadas
 home-prefs-highlights-header =
     .label = Destaques
-home-prefs-recent-activity-header =
-    .label = Atividade recente
 home-prefs-highlights-description = Uma seleção de sites que você salvou ou visitou
 home-prefs-highlights-option-visited-pages =
     .label = Páginas visitadas
@@ -526,6 +530,9 @@
     .label = Downloads mais recentes
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas salvas no { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Atividade recente
+home-prefs-recent-activity-description = Uma seleção de sites e conteúdos recentes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Snippets
 home-prefs-snippets-description = Novidades da { -vendor-short-name } e do { -brand-product-name }
+home-prefs-snippets-description-new = Dicas e novidades da { -vendor-short-name } e do { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Abas abertas
     .accesskey = A
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Atalhos
+    .accesskey = s
 addressbar-locbar-topsites-option =
     .label = Sites preferidos
     .accesskey = S
+addressbar-locbar-engines-option =
+    .label = Mecanismos de pesquisa
+    .accesskey = a
 addressbar-suggestions-settings = Alterar preferências de sugestões de mecanismos de pesquisa
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/protections.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/protections.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/protections.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -9,7 +9,6 @@
         [one] O { -brand-short-name } bloqueou { $count } rastreador na semana passada
        *[other] O { -brand-short-name } bloqueou { $count } rastreadores na semana passada
     }
-
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
@@ -19,57 +18,43 @@
         [one] <b>{ $count }</b> rastreador bloqueado desde { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
        *[other] <b>{ $count }</b> rastreadores bloqueados desde { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
-
 # Text displayed instead of the graph when in Private Mode
 graph-private-window = O { -brand-short-name } continua a bloquear rastreadores em janelas privativas, mas não guarda registro do que foi bloqueado.
 # Weekly summary of the graph when the graph is empty in Private Mode
 graph-week-summary-private-window = Rastreadores que o { -brand-short-name } bloqueou esta semana
-
 protection-report-webpage-title = Painel de proteções
 protection-report-page-content-title = Painel de proteções
 # This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
 protection-report-page-summary = O { -brand-short-name } pode proteger sua privacidade nos bastidores enquanto você navega. Este é um resumo personalizado dessas proteções, incluindo ferramentas para você assumir o controle de sua segurança online.
 # This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
 protection-report-page-summary-default = O { -brand-short-name } protege sua privacidade nos bastidores enquanto você navega. Este é um resumo personalizado dessas proteções, incluindo ferramentas para você assumir o controle de sua segurança online.
-
 protection-report-settings-link = Gerenciar suas configurações de privacidade e segurança
-
 etp-card-title-always = Proteção aprimorada contra rastreamento: Sempre ATIVADA
 etp-card-title-custom-not-blocking = Proteção aprimorada contra rastreamento: DESATIVADA
 etp-card-content-description = O { -brand-short-name } impede automaticamente que empresas sigam você secretamente pela web.
 protection-report-etp-card-content-custom-not-blocking = Todas as proteções estão desativadas no momento. Escolha que rastreadores bloquear gerenciando as configurações de proteção do { -brand-short-name }.
 protection-report-manage-protections = Gerenciar configurações
-
 # 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 = Hoje
-
 # This string is used to describe the graph for screenreader users.
 graph-legend-description = Um gráfico contendo o número total de cada tipo de rastreador bloqueado esta semana.
-
 social-tab-title = Rastreadores de mídias sociais
 social-tab-contant = Redes sociais colocam rastreadores em outros sites para seguir o que você faz, vê e assiste online. Isto permite que empresas de mídias sociais saibam mais sobre você, muito além do que você compartilha em seus perfis de mídias sociais. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
 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 analíticas. 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-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>
-
 cryptominer-tab-title = Criptomineradores
 cryptominer-tab-content = Criptomineradores usam o poder computacional do seu sistema para minerar moedas digitais. Scripts de criptomineração drenam sua bateria, fazem seu computador ficar mais lento e podem aumentar sua conta de energia elétrica. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
 protections-close-button2 =
     .aria-label = Fechar
     .title = Fechar
-  
 mobile-app-title = Bloqueie rastreadores de anúncios em mais dispositivos
 mobile-app-card-content = Use o navegador móvel com proteção integrada contra rastreamento de anúncios.
 mobile-app-links = Navegador { -brand-product-name } para <a data-l10n-name="android-mobile-inline-link">Android</a> e <a data-l10n-name="ios-mobile-inline-link">iOS</a>
-
 lockwise-title = Nunca esqueça uma senha novamente
 lockwise-title-logged-in2 = Gerenciamento de senhas
 lockwise-header-content = O { -lockwise-brand-name } armazena com segurança suas senhas em seu navegador.
@@ -81,7 +66,6 @@
 lockwise-mobile-app-title = Tenha suas senhas em qualquer lugar
 lockwise-no-logins-card-content = Use as senhas salvas no { -brand-short-name } em qualquer dispositivo.
 lockwise-app-links = { -lockwise-brand-name } para <a data-l10n-name="lockwise-android-inline-link">Android</a> e <a data-l10n-name="lockwise-ios-inline-link">iOS</a>
-
 # Variables:
 # $count (Number) - Number of passwords exposed in data breaches.
 lockwise-scanned-text-breached-logins =
@@ -89,7 +73,6 @@
         [one] 1 senha pode ter sido exposta em um vazamento de dados.
        *[other] { $count } senhas podem ter sido expostas em vazamentos de dados.
     }
-
 # While English doesn't use the number in the plural form, you can add $count to your language
 # if needed for grammatical reasons.
 # Variables:
@@ -100,10 +83,8 @@
        *[other] Suas senhas estão sendo armazenadas com segurança.
     }
 lockwise-how-it-works-link = Como funciona
-
 turn-on-sync = Ativar o { -sync-brand-short-name }…
     .title = Ir para as preferências de sincronização
-
 monitor-title = Fique atento a vazamentos de dados
 monitor-link = Como funciona
 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.
@@ -111,23 +92,20 @@
 monitor-sign-up-link = Cadastre-se para receber alertas de vazamentos
     .title = Cadastre-se no { -monitor-brand-name } para receber alertas de vazamentos
 auto-scan = Analisados automaticamente hoje:
-
 monitor-emails-tooltip =
-    .title = Ver no { -monitor-brand-short-name } os endereços de e-mail monitorados
+    .title = Ver no { -monitor-brand-short-name } os endereços de email monitorados
 monitor-breaches-tooltip =
     .title = Ver no { -monitor-brand-short-name } os vazamentos conhecidos de dados
 monitor-passwords-tooltip =
     .title = Ver no { -monitor-brand-short-name } as senhas expostas
-
 # 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.
-       *[other] Endereços de e-mail sendo monitorados.
+        [one] Endereço de email sendo monitorado.
+       *[other] Endereços de email 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.
@@ -136,7 +114,6 @@
         [one] Vazamento conhecido de dados expôs suas informações
        *[other] Vazamentos conhecidos de dados expuseram suas informações
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -145,7 +122,6 @@
         [one] Vazamento de dados conhecido marcado como resolvido
        *[other] Vazamentos de dados conhecidos marcados como resolvidos
     }
-
 # 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.
@@ -154,7 +130,6 @@
         [one] Senha exposta em todos os vazamentos
        *[other] Senhas expostas em todos os vazamentos
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -163,7 +138,6 @@
         [one] Senha exposta em vazamentos não resolvidos
        *[other] Senhas expostas em vazamentos não resolvidos
     }
-
 monitor-no-breaches-title = Boas notícias!
 monitor-no-breaches-description = Você não tem vazamentos conhecidos. Se isso mudar, te avisaremos.
 monitor-view-report-link = Ver relatório
@@ -173,8 +147,7 @@
 monitor-manage-breaches-link = Gerenciar vazamentos
     .title = Gerenciar vazamentos no { -monitor-brand-short-name }
 monitor-breaches-resolved-title = Ótimo! Você resolveu todos os vazamentos conhecidos.
-monitor-breaches-resolved-description = Se o seu e-mail aparecer em novos vazamentos, te avisaremos.
-
+monitor-breaches-resolved-description = Se o seu email aparecer em novos vazamentos, te avisaremos.
 # Variables:
 # $numBreachesResolved (Number) - Number of breaches marked as resolved by the user on Monitor.
 # $numBreaches (Number) - Number of breaches in which a user's data was involved, detected by Monitor.
@@ -183,11 +156,9 @@
         [one] { $numBreachesResolved } de { $numBreaches } vazamento marcado como resolvido
        *[other] { $numBreachesResolved } de { $numBreaches } vazamentos marcados como resolvidos
     }
-
 # Variables:
 # $percentageResolved (Number) - Percentage of breaches marked as resolved by a user on Monitor.
 monitor-partial-breaches-percentage = { $percentageResolved }% concluído
-
 monitor-partial-breaches-motivation-title-start = Ótimo começo!
 monitor-partial-breaches-motivation-title-middle = Continue assim!
 monitor-partial-breaches-motivation-title-end = Falta pouco! Continue assim.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/pt-BR/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Só em novas abas
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Sempre mostrar
+    .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar apenas em nova aba
+    .accesskey = a
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mostrar outros favoritos
     .accesskey = M
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/accounts.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/accounts.properties	2021-01-18 20:07:36.000000000 +0000
@@ -14,7 +14,7 @@
 # LOCALIZATION NOTE (verificationSentBody) - %S = Email address of user's Firefox Account
 verificationSentBody = Um link de verificação foi enviado para %S.
 verificationNotSentTitle = Não foi possível enviar a verificação
-verificationNotSentBody = Não é possível enviar um e-mail de confirmação neste momento, tente novamente mais tarde.
+verificationNotSentBody = Não conseguimos enviar um email de confirmação neste momento, tente novamente mais tarde.
 
 # LOCALIZATION NOTE (deviceConnDisconnTitle) - the title shown in a notification
 # when either this device or another device has connected to, or disconnected
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/browser.dtd	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/browser.dtd	2021-01-18 20:07:36.000000000 +0000
@@ -221,7 +221,7 @@
   "Pocket" is a brand name. -->
 <!ENTITY pocketMenuitem.label         "Ver lista do Pocket">
 
-<!ENTITY emailPageCmd.label           "Enviar link por e-mail…">
+<!ENTITY emailPageCmd.label           "Enviar link por email…">
 
 <!ENTITY fullZoom.label                 "Zoom">
 
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/customizableui/customizableWidgets.properties firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/customizableui/customizableWidgets.properties
--- firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/customizableui/customizableWidgets.properties	2021-01-18 20:07:36.000000000 +0000
@@ -82,8 +82,8 @@
 characterencoding-button2.label = \u00adCodificação de texto
 characterencoding-button2.tooltiptext = Mostrar opções de codificação de texto
 
-email-link-button.label = Enviar link por e-mail
-email-link-button.tooltiptext3 = Enviar link para esta página por e-mail
+email-link-button.label = Enviar link por email
+email-link-button.tooltiptext3 = Enviar link desta página por email
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/pocket.properties firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/pocket.properties
--- firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/browser/pocket.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/chrome/browser/pocket.properties	2021-01-18 20:07:36.000000000 +0000
@@ -17,7 +17,7 @@
 removepage = Remover página
 save = Salvar
 saving = Salvando…
-signupemail = Cadastre-se por e-mail
+signupemail = Cadastre-se por email
 signuptosave = Cadastre-se no Pocket. É gratuito.
 suggestedtags = Etiquetas sugeridas
 tagline = Salve artigos e vídeos do Firefox para ver no Pocket em qualquer dispositivo, quando quiser.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/overrides/netError.dtd firefox-85.0+build1/l10n/pt-BR/browser/chrome/overrides/netError.dtd
--- firefox-84.0.2+build1/l10n/pt-BR/browser/chrome/overrides/netError.dtd	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/chrome/overrides/netError.dtd	2021-01-18 20:07:36.000000000 +0000
@@ -105,7 +105,7 @@
 <!-- Localization note (certerror.introPara2) - The text content of the span tag
 will be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
-<!ENTITY certerror.introPara2 "O &brandShortName; detectou uma potencial ameaça de segurança e não continuou para <span class='hostname'/>. Se você visitar este site, invasores poderão roubar suas informações, como senhas, endereços de e-mail e detalhes de cartões de crédito.">
+<!ENTITY certerror.introPara2 "O &brandShortName; detectou uma potencial ameaça de segurança e não seguiu para <span class='hostname'/>. Se você visitar este site, invasores podem tentar roubar suas informações, como senhas, endereços de email e detalhes de cartões de crédito.">
 <!ENTITY certerror.sts.introPara "O &brandShortName; detectou uma potencial ameaça de segurança e não prosseguiu para <span class='hostname'/> porque este site exige uma conexão segura.">
 
 <!ENTITY certerror.expiredCert.introPara "O &brandShortName; detectou um problema e não prosseguiu para <span class='hostname'/>. O site foi mal configurado ou o relógio interno do seu computador está errado.">
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/pt-BR/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/pt-BR/browser/extensions/formautofill/formautofill.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:07:36.000000000 +0000
@@ -79,7 +79,7 @@
 category.name = nome
 category.organization2 = organização
 category.tel = telefone
-category.email = e-mail
+category.email = email
 # LOCALIZATION NOTE (fieldNameSeparator): This is used as a separator between categories.
 fieldNameSeparator = ,\u0020
 # LOCALIZATION NOTE (phishingWarningMessage, phishingWarningMessage2): The warning
@@ -194,7 +194,7 @@
 
 country = País
 tel = Telefone
-email = E-mail
+email = Email
 cancelBtnLabel = Cancelar
 saveBtnLabel = Salvar
 countryWarningMessage2 = O preenchimento automático de formulários só está disponível em alguns países.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/aboutdebugging.ftl firefox-85.0+build1/l10n/pt-BR/devtools/client/aboutdebugging.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/aboutdebugging.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/aboutdebugging.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -9,71 +9,55 @@
 # Page Title strings
 
 # Page title (ie tab title) for the Setup page
-about-debugging-page-title-setup-page = Debugging - Setup
-
+about-debugging-page-title-setup-page = Depuração - Configuração
 # Page title (ie tab title) for the Runtime page
 # { $selectedRuntimeId } is the id of the current runtime, such as "this-firefox", "localhost:6080", ...
-about-debugging-page-title-runtime-page = Debugging - Runtime / { $selectedRuntimeId }
+about-debugging-page-title-runtime-page = Depuração - Tempo de execução / { $selectedRuntimeId }
 
 # Sidebar strings
 
 # Display name of the runtime for the currently running instance of Firefox. Used in the
 # Sidebar and in the Setup page.
-about-debugging-this-firefox-runtime-name = This { -brand-shorter-name }
-
+about-debugging-this-firefox-runtime-name = Este { -brand-shorter-name }
 # Sidebar heading for selecting the currently running instance of Firefox
 about-debugging-sidebar-this-firefox =
     .name = { about-debugging-this-firefox-runtime-name }
-
 # Sidebar heading for connecting to some remote source
 about-debugging-sidebar-setup =
-    .name = Setup
-
+    .name = Configuração
 # Text displayed in the about:debugging sidebar when USB devices discovery is enabled.
-about-debugging-sidebar-usb-enabled = USB enabled
-
+about-debugging-sidebar-usb-enabled = USB ativado
 # Text displayed in the about:debugging sidebar when USB devices discovery is disabled
 # (for instance because the mandatory ADB extension is not installed).
-about-debugging-sidebar-usb-disabled = USB disabled
-
+about-debugging-sidebar-usb-disabled = USB desativado
 # Connection status (connected) for runtime items in the sidebar
-aboutdebugging-sidebar-runtime-connection-status-connected = Connected
+aboutdebugging-sidebar-runtime-connection-status-connected = Conectado
 # Connection status (disconnected) for runtime items in the sidebar
-aboutdebugging-sidebar-runtime-connection-status-disconnected = Disconnected
-
+aboutdebugging-sidebar-runtime-connection-status-disconnected = Desconectado
 # Text displayed in the about:debugging sidebar when no device was found.
-about-debugging-sidebar-no-devices = No devices discovered
-
+about-debugging-sidebar-no-devices = Nenhum dispositivo encontrado
 # Text displayed in buttons found in sidebar items representing remote runtimes.
 # Clicking on the button will attempt to connect to the runtime.
-about-debugging-sidebar-item-connect-button = Connect
-
+about-debugging-sidebar-item-connect-button = Conectar
 # Text displayed in buttons found in sidebar items when the runtime is connecting.
-about-debugging-sidebar-item-connect-button-connecting = Connecting…
-
+about-debugging-sidebar-item-connect-button-connecting = Conectando…
 # Text displayed in buttons found in sidebar items when the connection failed.
-about-debugging-sidebar-item-connect-button-connection-failed = Connection failed
-
+about-debugging-sidebar-item-connect-button-connection-failed = Falha na conexão
 # Text displayed in connection warning on sidebar item of the runtime when connecting to
 # the runtime is taking too much time.
-about-debugging-sidebar-item-connect-button-connection-not-responding = Connection still pending, check for messages on the target browser
-
+about-debugging-sidebar-item-connect-button-connection-not-responding = Conexão ainda pendente, verifique se há mensagens no navegador alvo
 # Text displayed as connection error in sidebar item when the connection has timed out.
-about-debugging-sidebar-item-connect-button-connection-timeout = Connection timed out
-
+about-debugging-sidebar-item-connect-button-connection-timeout = Atingido o tempo limite de conexão
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
-about-debugging-sidebar-item-connected-label = Connected
-
+about-debugging-sidebar-item-connected-label = Conectado
 # Text displayed in sidebar items for remote devices where a compatible browser (eg
 # Firefox) has not been detected yet. Typically, Android phones connected via USB with
 # USB debugging enabled, but where Firefox is not started.
-about-debugging-sidebar-runtime-item-waiting-for-browser = Waiting for browser…
-
+about-debugging-sidebar-runtime-item-waiting-for-browser = Aguardando o navegador…
 # Text displayed in sidebar items for remote devices that have been disconnected from the
 # computer.
-about-debugging-sidebar-runtime-item-unplugged = Unplugged
-
+about-debugging-sidebar-runtime-item-unplugged = Não conectado
 # Title for runtime sidebar items that are related to a specific device (USB, WiFi).
 about-debugging-sidebar-runtime-item-name =
     .title = { $displayName } ({ $deviceName })
@@ -81,105 +65,80 @@
 # locations).
 about-debugging-sidebar-runtime-item-name-no-device =
     .title = { $displayName }
-
 # Text to show in the footer of the sidebar that links to a help page
 # (currently: https://developer.mozilla.org/docs/Tools/about:debugging)
-about-debugging-sidebar-support = Debugging Support
-
+about-debugging-sidebar-support = Suporte para depuração
 # Text to show as the ALT attribute of a help icon that accompanies the help about
 # debugging link in the footer of the sidebar
 about-debugging-sidebar-support-icon =
-    .alt = Help icon
-
+    .alt = �cone de ajuda
 # Text displayed in a sidebar button to refresh the list of USB devices. Clicking on it
 # will attempt to update the list of devices displayed in the sidebar.
-about-debugging-refresh-usb-devices-button = Refresh devices
+about-debugging-refresh-usb-devices-button = Atualizar dispositivos
 
 # Setup Page strings
 
 # Title of the Setup page.
-about-debugging-setup-title = Setup
-
+about-debugging-setup-title = Configuração
 # Introduction text in the Setup page to explain how to configure remote debugging.
-about-debugging-setup-intro = Configure the connection method you wish to remotely debug your device with.
-
+about-debugging-setup-intro = Configure o método de conexão que quer usar para depurar remotamente seu dispositivo.
 # Explanatory text in the Setup page about what the 'This Firefox' page is for
-about-debugging-setup-this-firefox2 = Use <a>{ about-debugging-this-firefox-runtime-name }</a> to debug extensions and service workers on this version of { -brand-shorter-name }.
-
+about-debugging-setup-this-firefox2 = Usar <a>{ about-debugging-this-firefox-runtime-name }</a> para depurar extensões e service workers nesta versão do { -brand-shorter-name }.
 # Title of the heading Connect section of the Setup page.
-about-debugging-setup-connect-heading = Connect a Device
-
+about-debugging-setup-connect-heading = Conectar um dispositivo
 # USB section of the Setup page
 about-debugging-setup-usb-title = USB
-
 # Explanatory text displayed in the Setup page when USB debugging is disabled
-about-debugging-setup-usb-disabled = Enabling this will download and add the required Android USB debugging components to { -brand-shorter-name }.
-
+about-debugging-setup-usb-disabled = Ativar isso irá baixar e adicionar os componentes de depuração USB Android necessários ao { -brand-shorter-name }.
 # Text of the button displayed in the USB section of the setup page when USB debugging is disabled.
 # Clicking on it will download components needed to debug USB Devices remotely.
-about-debugging-setup-usb-enable-button = Enable USB Devices
-
+about-debugging-setup-usb-enable-button = Ativar dispositivos USB
 # Text of the button displayed in the USB section of the setup page when USB debugging is enabled.
-about-debugging-setup-usb-disable-button = Disable USB Devices
-
+about-debugging-setup-usb-disable-button = Desativar dispositivos USB
 # Text of the button displayed in the USB section of the setup page while USB debugging
 # components are downloaded and installed.
-about-debugging-setup-usb-updating-button = Updating…
-
+about-debugging-setup-usb-updating-button = Atualizando…
 # USB section of the Setup page (USB status)
-about-debugging-setup-usb-status-enabled = Enabled
-about-debugging-setup-usb-status-disabled = Disabled
-about-debugging-setup-usb-status-updating = Updating…
-
+about-debugging-setup-usb-status-enabled = Ativado
+about-debugging-setup-usb-status-disabled = Desativado
+about-debugging-setup-usb-status-updating = Atualizando…
 # USB section step by step guide
-about-debugging-setup-usb-step-enable-dev-menu2 = Enable Developer menu on your Android device.
-
+about-debugging-setup-usb-step-enable-dev-menu2 = Ativar menu de desenvolvimento no seu dispositivo Android.
 # USB section step by step guide
-about-debugging-setup-usb-step-enable-debug2 = Enable USB Debugging in the Android Developer Menu.
-
+about-debugging-setup-usb-step-enable-debug2 = Ativar depuração USB no menu de desenvolvimento do Android.
 # USB section step by step guide
-about-debugging-setup-usb-step-enable-debug-firefox2 = Enable USB Debugging in Firefox on the Android device.
-
+about-debugging-setup-usb-step-enable-debug-firefox2 = Ativar depuração USB no Firefox no dispositivo Android.
 # USB section step by step guide
-about-debugging-setup-usb-step-plug-device = Connect the Android device to your computer.
-
+about-debugging-setup-usb-step-plug-device = Conectar o dispositivo Android ao seu computador.
 # Text shown in the USB section of the setup page with a link to troubleshoot connection errors.
 # The link goes to https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_over_USB
-about-debugging-setup-usb-troubleshoot = Problems connecting to the USB device? <a>Troubleshoot</a>
-
+about-debugging-setup-usb-troubleshoot = Problemas na conexão com o dispositivo USB? <a>Soluções de problemas</a>
 # Network section of the Setup page
 about-debugging-setup-network =
-    .title = Network Location
-
+    .title = Localização de rede
 # Text shown in the Network section of the setup page with a link to troubleshoot connection errors.
 # The link goes to https://developer.mozilla.org/en-US/docs/Tools/Remote_Debugging/Debugging_over_a_network
-about-debugging-setup-network-troubleshoot = Problems connecting via network location? <a>Troubleshoot</a>
-
+about-debugging-setup-network-troubleshoot = Problemas na conexão via localização de rede? <a>Soluções de problemas</a>
 # Text of a button displayed after the network locations "Host" input.
 # Clicking on it will add the new network location to the list.
-about-debugging-network-locations-add-button = Add
-
+about-debugging-network-locations-add-button = Adicionar
 # Text to display when there are no locations to show.
-about-debugging-network-locations-empty-text = No network locations have been added yet.
-
+about-debugging-network-locations-empty-text = Nenhum local de rede foi adicionado ainda.
 # Text of the label for the text input that allows users to add new network locations in
 # the Connect page. A host is a hostname and a port separated by a colon, as suggested by
 # the input's placeholder "localhost:6080".
-about-debugging-network-locations-host-input-label = Host
-
+about-debugging-network-locations-host-input-label = Servidor
 # Text of a button displayed next to existing network locations in the Connect page.
 # Clicking on it removes the network location from the list.
-about-debugging-network-locations-remove-button = Remove
-
+about-debugging-network-locations-remove-button = Remover
 # Text used as error message if the format of the input value was invalid in the network locations form of the Setup page.
 # Variables:
 #   $host-value (string) - The input value submitted by the user in the network locations form
-about-debugging-network-location-form-invalid = Invalid host “{ $host-value }�. The expected format is “hostname:portnumber�.
-
+about-debugging-network-location-form-invalid = Servidor “{ $host-value }� inválido. O formato esperado é “hostname:portnumber�.
 # Text used as error message if the input value was already registered in the network locations form of the Setup page.
 # Variables:
 #   $host-value (string) - The input value submitted by the user in the network locations form
-about-debugging-network-location-form-duplicate = The host “{ $host-value }� is already registered
+about-debugging-network-location-form-duplicate = O servidor “{ $host-value }� já está registrado
 
 # Runtime Page strings
 
@@ -187,208 +146,166 @@
 # on "runtime" pages of about:debugging.
 # Title of the temporary extensions category (only available for "This Firefox" runtime).
 about-debugging-runtime-temporary-extensions =
-    .name = Temporary Extensions
+    .name = Extensões temporárias
 # Title of the extensions category.
 about-debugging-runtime-extensions =
-    .name = Extensions
+    .name = Extensões
 # Title of the tabs category.
 about-debugging-runtime-tabs =
-    .name = Tabs
+    .name = Abas
 # Title of the service workers category.
 about-debugging-runtime-service-workers =
     .name = Service Workers
 # Title of the shared workers category.
 about-debugging-runtime-shared-workers =
-    .name = Shared Workers
+    .name = Workers compartilhados
 # Title of the other workers category.
 about-debugging-runtime-other-workers =
-    .name = Other Workers
+    .name = Outros Workers
 # Title of the processes category.
 about-debugging-runtime-processes =
-    .name = Processes
-
+    .name = Processos
 # Label of the button opening the performance profiler panel in runtime pages for remote
 # runtimes.
-about-debugging-runtime-profile-button2 = Profile performance
-
+about-debugging-runtime-profile-button2 = Analisar desempenho
 # This string is displayed in the runtime page if the current configuration of the
 # target runtime is incompatible with service workers. "Learn more" points to MDN.
 # https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible
-about-debugging-runtime-service-workers-not-compatible = Your browser configuration is not compatible with Service Workers. <a>Learn more</a>
-
+about-debugging-runtime-service-workers-not-compatible = A configuração do seu navegador não é compatível com Service Workers. <a>Saiba mais</a>
 # This string is displayed in the runtime page if the remote browser version is too old.
 # "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
 # { $minVersion } is the minimum version that is compatible with the current Firefox instance (same format)
-about-debugging-browser-version-too-old = The connected browser has an old version ({ $runtimeVersion }). The minimum supported version is ({ $minVersion }). This is an unsupported setup and may cause DevTools to fail. Please update the connected browser. <a>Troubleshooting</a>
-
+about-debugging-browser-version-too-old = O navegador conectado está numa versão antiga ({ $runtimeVersion }). A versão mínima suportada é ({ $minVersion }). Esta é uma configuração não suportada e pode causar falhas no DevTools. Atualize o navegador conectado. <a>Soluções de problemas</a>
 # Dedicated message for a backward compatibility issue that occurs when connecting:
 # from Fx 70+ to the old Firefox for Android (aka Fennec) which uses Fx 68.
-about-debugging-browser-version-too-old-fennec = This version of Firefox cannot debug Firefox for Android (68). We recommend installing Firefox for Android Nightly on your phone for testing. <a>More details</a>
-
+about-debugging-browser-version-too-old-fennec = Esta versão do Firefox não pode depurar o Firefox para Android (68). Recomendamos instalar o Firefox para Android Nightly em seu celular para testes. <a>Mais detalhes</a>
 # This string is displayed in the runtime page if the remote browser version is too recent.
 # "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
 # { $runtimeID } is the build ID of the remote browser (for instance "20181231", format is yyyyMMdd)
 # { $localID } is the build ID of the current Firefox instance (same format)
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
 # { $localVersion } is the version of your current browser (same format)
-about-debugging-browser-version-too-recent = The connected browser is more recent ({ $runtimeVersion }, buildID { $runtimeID }) than your { -brand-shorter-name } ({ $localVersion }, buildID { $localID }). This is an unsupported setup and may cause DevTools to fail. Please update Firefox. <a>Troubleshooting</a>
-
+about-debugging-browser-version-too-recent = O navegador conectado é mais recente ({ $runtimeVersion }, buildID { $runtimeID }) do que seu { -brand-shorter-name } ({ $localVersion }, buildID { $localID }). Esta é uma configuração não suportada e pode causar falhas no DevTools. Atualize o Firefox. <a>Soluções de problemas</a>
 # Displayed for runtime info in runtime pages.
 # { $name } is brand name such as "Firefox Nightly"
 # { $version } is version such as "64.0a1"
 about-debugging-runtime-name = { $name } ({ $version })
-
 # Text of a button displayed in Runtime pages for remote runtimes.
 # Clicking on the button will close the connection to the runtime.
-about-debugging-runtime-disconnect-button = Disconnect
-
+about-debugging-runtime-disconnect-button = Deconectar
 # Text of the connection prompt button displayed in Runtime pages, when the preference
 # "devtools.debugger.prompt-connection" is false on the target runtime.
-about-debugging-connection-prompt-enable-button = Enable connection prompt
-
+about-debugging-connection-prompt-enable-button = Pedido de ativar conexão
 # Text of the connection prompt button displayed in Runtime pages, when the preference
 # "devtools.debugger.prompt-connection" is true on the target runtime.
-about-debugging-connection-prompt-disable-button = Disable connection prompt
-
+about-debugging-connection-prompt-disable-button = Pedido de desativar conexão
 # Title of a modal dialog displayed on remote runtime pages after clicking on the Profile Runtime button.
-about-debugging-profiler-dialog-title2 = Profiler
-
+about-debugging-profiler-dialog-title2 = Analisador de desempenho
 # Clicking on the header of a debug target category will expand or collapse the debug
 # target items in the category. This text is used as ’title’ attribute of the header,
 # to describe this feature.
-about-debugging-collapse-expand-debug-targets = Collapse / expand
+about-debugging-collapse-expand-debug-targets = Recolher / expandir
 
 # Debug Targets strings
 
 # Displayed in the categories of "runtime" pages that don't have any debug target to
 # show. Debug targets depend on the category (extensions, tabs, workers...).
-about-debugging-debug-target-list-empty = Nothing yet.
-
+about-debugging-debug-target-list-empty = Nada ainda.
 # Text of a button displayed next to debug targets of "runtime" pages. Clicking on this
 # button will open a DevTools toolbox that will allow inspecting the target.
 # A target can be an addon, a tab, a worker...
-about-debugging-debug-target-inspect-button = Inspect
-
+about-debugging-debug-target-inspect-button = Inspecionar
 # Text of a button displayed in the "This Firefox" page, in the Temporary Extension
 # section. Clicking on the button will open a file picker to load a temporary extension
-about-debugging-tmp-extension-install-button = Load Temporary Add-on…
-
+about-debugging-tmp-extension-install-button = Carregar extensão temporária…
 # Text displayed when trying to install a temporary extension in the "This Firefox" page.
-about-debugging-tmp-extension-install-error = There was an error during the temporary add-on installation.
-
+about-debugging-tmp-extension-install-error = Houve um erro ao instalar a extensão temporária.
 # Text of a button displayed for a temporary extension loaded in the "This Firefox" page.
 # Clicking on the button will reload the extension.
-about-debugging-tmp-extension-reload-button = Reload
-
+about-debugging-tmp-extension-reload-button = Recarregar
 # Text of a button displayed for a temporary extension loaded in the "This Firefox" page.
 # Clicking on the button will uninstall the extension and remove it from the page.
-about-debugging-tmp-extension-remove-button = Remove
-
+about-debugging-tmp-extension-remove-button = Remover
 # Message displayed in the file picker that opens to select a temporary extension to load
 # (triggered by the button using "about-debugging-tmp-extension-install-button")
 # manifest.json .xpi and .zip should not be localized.
 # Note: this message is only displayed in Windows and Linux platforms.
-about-debugging-tmp-extension-install-message = Select manifest.json file or .xpi/.zip archive
-
+about-debugging-tmp-extension-install-message = Selecionar arquivo manifest.json ou pacote compactado .xpi/.zip
 # This string is displayed as a message about the add-on having a temporaryID.
-about-debugging-tmp-extension-temporary-id = This WebExtension has a temporary ID. <a>Learn more</a>
-
+about-debugging-tmp-extension-temporary-id = Esta WebExtension tem um ID temporário. <a>Saiba mais</a>
 # Text displayed for extensions in "runtime" pages, before displaying a link the extension's
 # manifest URL.
 about-debugging-extension-manifest-url =
-    .label = Manifest URL
-
+    .label = URL do manifesto
 # Text displayed for extensions in "runtime" pages, before displaying the extension's uuid.
 # UUIDs look like b293e463-481e-5148-a487-5aaf7a130429
 about-debugging-extension-uuid =
-    .label = Internal UUID
-
+    .label = UUID interno
 # Text displayed for extensions (temporary extensions only) in "runtime" pages, before
 # displaying the location of the temporary extension.
 about-debugging-extension-location =
-    .label = Location
-
+    .label = Localização
 # Text displayed for extensions in "runtime" pages, before displaying the extension's ID.
 # For instance "geckoprofiler@mozilla.com" or "{ed26ddcb-5611-4512-a89a-51b8db81cfb2}".
 about-debugging-extension-id =
-    .label = Extension ID
-
+    .label = ID da extensão
 # 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 }
-
+    .disabledTitle = Push de service worker no momento está desativado para multiprocessamento do { -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 }
-
+    .disabledTitle = Start de service worker no momento está desativado para multiprocessamento do { -brand-shorter-name }
 # This string is displayed as a label of the button that unregisters a service worker.
-about-debugging-worker-action-unregister = Unregister
-
+about-debugging-worker-action-unregister = Cancelar registro
 # Displayed for service workers in runtime pages that listen to Fetch events.
 about-debugging-worker-fetch-listening =
     .label = Fetch
-    .value = Listening for fetch events
-
+    .value = Ouvindo eventos de fetch
 # Displayed for service workers in runtime pages that do not listen to Fetch events.
 about-debugging-worker-fetch-not-listening =
     .label = Fetch
-    .value = Not listening for fetch events
-
+    .value = Não ouvindo eventos de fetch
 # Displayed for service workers in runtime pages that are currently running (service
 # worker instance is active).
-about-debugging-worker-status-running = Running
-
+about-debugging-worker-status-running = Executando
 # Displayed for service workers in runtime pages that are registered but stopped.
-about-debugging-worker-status-stopped = Stopped
-
+about-debugging-worker-status-stopped = Parado
 # Displayed for service workers in runtime pages that are registering.
-about-debugging-worker-status-registering = Registering
-
+about-debugging-worker-status-registering = Registrando
 # Displayed for service workers in runtime pages, to label the scope of a worker
 about-debugging-worker-scope =
-    .label = Scope
-
+    .label = Escopo
 # Displayed for service workers in runtime pages, to label the push service endpoint (url)
 # of a worker
 about-debugging-worker-push-service =
-    .label = Push Service
-
+    .label = Serviço Push
 # 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 }
-
+    .title = Inspeção de service worker no momento está desativada para multiprocessamento do { -brand-shorter-name }
 # Displayed as title of the inspect button for zombie tabs (e.g. tabs loaded via a session restore).
 about-debugging-zombie-tab-inspect-action-disabled =
-    .title = Tab is not fully loaded and cannot be inspected
-
+    .title = A aba não foi carregada totalmente e não pode ser inspecionada
 # 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
-
+about-debugging-main-process-name = Processo principal
 # Displayed as description for the Main Process debug target in the Processes category.
 # Only for remote browsers, if `devtools.aboutdebugging.process-debugging` is true.
-about-debugging-main-process-description2 = Main Process for the target browser
-
+about-debugging-main-process-description2 = Processo principal do navegador de destino
 # Displayed instead of the Main Process debug target when the preference
 # `devtools.browsertoolbox.fission` is true.
-about-debugging-multiprocess-toolbox-name = Multiprocess Toolbox
-
+about-debugging-multiprocess-toolbox-name = Caixa de ferramentas de multiprocessamento
 # Description for the Multiprocess Toolbox target.
-about-debugging-multiprocess-toolbox-description = Main Process and Content Processes for the target browser
-
+about-debugging-multiprocess-toolbox-description = Processo principal e processos de conteúdo do navegador de destino
 # Alt text used for the close icon of message component (warnings, errors and notifications).
 about-debugging-message-close-icon =
-    .alt = Close message
-
+    .alt = Fechar mensagem
 # Label text used for the error details of message component.
-about-debugging-message-details-label-error = Error details
-
+about-debugging-message-details-label-error = Detalhes do erro
 # Label text used for the warning details of message component.
-about-debugging-message-details-label-warning = Warning details
-
+about-debugging-message-details-label-warning = Detalhes do aviso
 # Label text used for default state of details of message component.
-about-debugging-message-details-label = Details
+about-debugging-message-details-label = Detalhes
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/accessibility.ftl firefox-85.0+build1/l10n/pt-BR/devtools/client/accessibility.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/accessibility.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/accessibility.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -6,74 +6,48 @@
 ### These strings are used inside the Accessibility panel.
 
 accessibility-learn-more = Saiba mais
-
-accessibility-text-label-header = Text Labels and Names
-
-accessibility-keyboard-header = Keyboard
+accessibility-text-label-header = Nomes e rótulos de texto
+accessibility-keyboard-header = Teclado
 
 ## Text entries that are used as text alternative for icons that depict accessibility isses.
 
 accessibility-warning =
-    .alt = Warning
-
+    .alt = Aviso
 accessibility-fail =
-    .alt = Error
-
+    .alt = Erro
 accessibility-best-practices =
-    .alt = Best Practices
+    .alt = Melhores práticas
 
 ## 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-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-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>
+accessibility-text-label-issue-area = Use o atributo <code>alt</code> para rotular elementos <div>area</div> que têm o atributo <span>href</span>. <a>Saiba mais</a>
+accessibility-text-label-issue-dialog = Diálogos devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-document-title = Documentos devem ter um <code>title</code>. <a>Saiba mais</a>
+accessibility-text-label-issue-embed = Conteúdo incorporado deve ser rotulado. <a>Saiba mais</a>
+accessibility-text-label-issue-figure = Figuras com legendas opcionais devem ser rotuladas. <a>Saiba mais</a>
+accessibility-text-label-issue-fieldset = Elementos <code>fieldset</code> devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-fieldset-legend2 = Use um elemento <code>legend</code> para rotular um <span>fieldset</span>. <a>Saiba mais</a>
+accessibility-text-label-issue-form = Elementos de formulários devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-form-visible = Elementos de formulários devem ter um rótulo de texto visível. <a>Saiba mais</a>
+accessibility-text-label-issue-frame = Elementos <code>frame</code> devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-glyph = Use o atributo <code>alt</code> para rotular elementos <span>mglyph</span>. <a>Saiba mais</a>
+accessibility-text-label-issue-heading = Cabeçalhos devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-heading-content = Cabeçalhos devem ter conteúdo de texto visível. <a>Saiba mais</a>
+accessibility-text-label-issue-iframe = Use o atributo <code>title</code> para descrever conteúdo <span>iframe</span>. <a>Saiba mais</a>
+accessibility-text-label-issue-image = Imagens de conteúdo devem ser rotuladas. <a>Saiba mais</a>
+accessibility-text-label-issue-interactive = Elementos interativos devem ser rotulados. <a>Saiba mais</a>
+accessibility-text-label-issue-optgroup-label2 = Use um atributo <code>label</code> para rotular um <span>optgroup</span>. <a>Saiba mais</a>
+accessibility-text-label-issue-toolbar = Barras de ferramentas devem ser rotuladas quando há mais de uma barra de ferramentas. <a>Saiba mais</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>
+accessibility-keyboard-issue-semantics = Elementos que podem receber foco devem ter semânticas interativas. <a>Saiba mais</a>
+accessibility-keyboard-issue-tabindex = Evite usar o atributo <code>tabindex</code> maior que zero. <a>Saiba mais</a>
+accessibility-keyboard-issue-action = Elementos interativos devem poder ser ativados através do teclado. <a>Saiba mais</a>
+accessibility-keyboard-issue-focusable = Elementos interativos devem poder receber foco. <a>Saiba mais</a>
+accessibility-keyboard-issue-focus-visible = Pode estar faltando estilo de foco em elementos que podem receber foco. <a>Saiba mais</a>
+accessibility-keyboard-issue-mouse-only = Elementos cicláveis devem poder receber foco e ter semânticas interativas. <a>Saiba mais</a>
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/accessibility.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/accessibility.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/accessibility.properties	2021-01-18 20:07:36.000000000 +0000
@@ -12,28 +12,28 @@
 
 # LOCALIZATION NOTE (accessibility.role): A title text used for Accessibility
 # tree header column that represents accessible element role.
-accessibility.role=Role
+accessibility.role=Função
 
 # LOCALIZATION NOTE (accessibility.name): A title text used for Accessibility
 # tree header column that represents accessible element name.
-accessibility.name=Name
+accessibility.name=Nome
 
 # LOCALIZATION NOTE (accessibility.logo): A title text used for Accessibility
 # logo used on the accessibility panel landing page.
-accessibility.logo=Accessibility Logo
+accessibility.logo=Logotipo de acessibilidade
 
 # LOCALIZATION NOTE (accessibility.properties): A title text used for header
 # for Accessibility details sidebar.
-accessibility.properties=Properties
+accessibility.properties=Propriedades
 
 # LOCALIZATION NOTE (accessibility.treeName): A title text used for
 # Accessibility tree (that represents accessible element name) container.
-accessibility.treeName=Accessibility Tree
+accessibility.treeName=�rvore de acessibilidade
 
 # LOCALIZATION NOTE (accessibility.accessible.notAvailable): A title text
 # displayed when accessible sidebar panel does not have an accessible object to
 # display.
-accessibility.accessible.notAvailable=Accessible Information Unavailable
+accessibility.accessible.notAvailable=Informações de acessibilidade não disponíveis
 
 # LOCALIZATION NOTE (accessibility.enable): A title text for Enable
 # accessibility button used to enable accessibility service.
@@ -41,41 +41,41 @@
 
 # LOCALIZATION NOTE (accessibility.enabling): A title text for Enable
 # accessibility button used when accessibility service is being enabled.
-accessibility.enabling=Turning on accessibility features…
+accessibility.enabling=Ativando recursos de acessibilidade…
 
 # LOCALIZATION NOTE (accessibility.disable): A title text for Disable
 # accessibility button used to disable accessibility service.
-accessibility.disable=Turn Off Accessibility Features
+accessibility.disable=Desativar recursos de acessibilidade
 
 # LOCALIZATION NOTE (accessibility.disabling): A title text for Disable
 # accessibility button used when accessibility service is being
 # disabled.
-accessibility.disabling=Turning off accessibility features…
+accessibility.disabling=Desativando recursos de acessibilidade…
 
 # LOCALIZATION NOTE (accessibility.pick): A title text for Picker button
 # button used to pick accessible objects from the page.
-accessibility.pick=Pick accessible object from the page
+accessibility.pick=Escolha um objeto acessível na página
 
 # LOCALIZATION NOTE (accessibility.disable.disabledTitle): A title text used for
 # a tooltip for Disable accessibility button when accessibility service can not
 # be disabled. It is the case when a user is using a 3rd party accessibility
 # tool such as screen reader.
-accessibility.disable.disabledTitle=Accessibility service can not be turned off. It is used outside Developer Tools.
+accessibility.disable.disabledTitle=O serviço de acessibilidade não pode ser desativado. É usado fora das ferramentas de desenvolvimento.
 
 # LOCALIZATION NOTE (accessibility.disable.enabledTitle): A title text used for
 # a tooltip for Disable accessibility button when accessibility service can be
 # disabled.
-accessibility.disable.enabledTitle=Accessibility service will be turned off for all tabs and windows.
+accessibility.disable.enabledTitle=O serviço de acessibilidade será desativado em todas as abas e janelas.
 
 # LOCALIZATION NOTE (accessibility.enable.disabledTitle): A title text used for
 # a tooltip for Enabled accessibility button when accessibility service can not
 # be enabled.
-accessibility.enable.disabledTitle=Accessibility service can not be turned on. It is turned off via accessibility services privacy preference.
+accessibility.enable.disabledTitle=O serviço de acessibilidade não pode ser ativado. Ele fica desativado por meio da preferência de privacidade de serviços de acessibilidade.
 
 # LOCALIZATION NOTE (accessibility.enable.enabledTitle): A title text used for
 # a tooltip for Enabled accessibility button when accessibility service can be
 # enabled.
-accessibility.enable.enabledTitle=Accessibility service will be turned on for all tabs and windows.
+accessibility.enable.enabledTitle=O serviço de acessibilidade será ativado em todas as abas e janelas.
 
 # LOCALIZATION NOTE (accessibility.learnMore): A text that is used as is or as textual
 # description in places that link to accessibility inspector documentation.
@@ -99,148 +99,148 @@
 
 # LOCALIZATION NOTE (accessibility.checks): A title text used for header for checks
 # section in Accessibility details sidebar.
-accessibility.checks=Checks
+accessibility.checks=Verificações
 
 # 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.
-accessibility.checks.empty2=No checks for this node.
+accessibility.checks.empty2=Nenhuma verificação neste nó.
 
 # LOCALIZATION NOTE (accessibility.contrast.header): A title text used for header for
 # checks related to color and contrast.
-accessibility.contrast.header=Color and Contrast
+accessibility.contrast.header=Cor e contraste
 
 # LOCALIZATION NOTE (accessibility.contrast.error): A title text for the color
 # contrast ratio, used when the tool is unable to calculate the contrast ratio value.
-accessibility.contrast.error=Unable to calculate
+accessibility.contrast.error=Não foi possível calcular
 
 # LOCALIZATION NOTE (accessibility.contrast.large.text): A title text for the color
 # contrast ratio label indicating that the color contrast criteria used is if for large
 # text. This is lower case because it's used as a label for a tree item in accessibility
 # tree.
-accessibility.contrast.large.text=large text
+accessibility.contrast.large.text=texto grande
 
 # LOCALIZATION NOTE (accessibility.contrast.large.title): A title text for the tooltip
 # used for the large text label (see accessibility.contrast.large.text).
-accessibility.contrast.large.title=Text is 14 point and bold or larger, or 18 point or larger.
+accessibility.contrast.large.title=O texto está em negrito e tem 14 pontos ou mais, ou tem 18 pontos ou mais.
 
 # LOCALIZATION NOTE (accessibility.contrast.annotation.AA): A title text for the paragraph
 # describing that the given colour contrast satisfies AA standard 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.AA=Meets WCAG AA standards for accessible text. %S
+accessibility.contrast.annotation.AA=Atende às normas WCAG AA de acessibilidade de texto. %S
 
 # LOCALIZATION NOTE (accessibility.contrast.annotation.AAA): A title text for the
 # paragraph describing that the given colour contrast satisfies AAA standard 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.AAA=Atende as normas WCAG AAA de acessibilidade de texto. %S
+accessibility.contrast.annotation.AAA=Atende às normas WCAG AAA de acessibilidade de texto. %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
+accessibility.contrast.annotation.FAIL=Não atende às normas WCAG de acessibilidade de texto. %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.
+accessibility.contrast.annotation.transparent.error=Escolha uma cor que não seja transparente.
 
 # 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.
-accessibility.badges=Accessibility checks
+accessibility.badges=Verificações de acessibilidade
 
 # 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
+accessibility.filter.none=Nenhum
 
 # 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
+accessibility.filter.all2=Todos os problemas
 
 # 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
+accessibility.filter.contrast=Contraste
 
 # 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
+accessibility.filter.textLabel=Rótulos de texto
 
 # 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
+accessibility.filter.keyboard=Teclado
 
 # 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
 # contrast.
-accessibility.badge.contrast=contrast
+accessibility.badge.contrast=contraste
 
 # LOCALIZATION NOTE (accessibility.badge.contrast.warning): A label for the
 # badge and attached warning icon 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 contrast.
-accessibility.badge.contrast.warning=contrast warning
+accessibility.badge.contrast.warning=aviso de contraste
 
 # 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
+accessibility.badge.keyboard=teclado
 
 # 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
 # alternative.
-accessibility.badge.textLabel=text label
+accessibility.badge.textLabel=rótulo de texto
 
 # LOCALIZATION NOTE (accessibility.badge.contrast.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 colour contrast.
-accessibility.badge.contrast.tooltip=Não atende as normas WCAG de acessibilidade de texto.
+accessibility.badge.contrast.tooltip=Não atende às normas WCAG de acessibilidade de texto.
 
 # 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.
+accessibility.badge.keyboard.tooltip=Não atende às normas WCAG de acessibilidade de teclado.
 
 # 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
 # does not satisfy the WCAG guideline for text alternative.
-accessibility.badge.textLabel.tooltip=Does not meet WCAG standards for text alternative.
+accessibility.badge.textLabel.tooltip=Não atende às normas WCAG de alternativa de texto.
 
 # LOCALIZATION NOTE (accessibility.tree.filters): A title text for the toolbar
 # within the main accessibility panel that contains a list of filters to be for
 # accessibility audit.
-accessibility.tree.filters=Check for issues:
+accessibility.tree.filters=Verificar problemas:
 
 # 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
+accessibility.tree.filters.prefs=Configurar preferências
 
 # LOCALIZATION NOTE (accessibility.progress.initializing): A title text for the
 # accessibility panel overlay shown when accessibility audit is starting up.
-accessibility.progress.initializing=Initializing…
+accessibility.progress.initializing=Iniciando…
 
 # LOCALIZATION NOTE (accessibility.progress.initializing): A title text for the
 # accessibility panel overlay shown when accessibility audit is running showing
 # the number of nodes being audited. Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
-accessibility.progress.progressbar=Checking #1 node;Checking #1 nodes
+accessibility.progress.progressbar=Verificando #1 nó;Verificando #1 nós
 
 # LOCALIZATION NOTE (accessibility.progress.finishing): A title text for the
 # accessibility panel overlay shown when accessibility audit is finishing up.
-accessibility.progress.finishing=Finishing up…
+accessibility.progress.finishing=Terminando…
 
 # LOCALIZATION NOTE (accessibility.beta): A title text for the features in the
 # accessibility panel that are currently in beta.
@@ -249,12 +249,12 @@
 # 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
+accessibility.pref.scroll.into.view.title=Deslizar automaticamente o nó selecionado dentro da visão
 
 # 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
+accessibility.pref.scroll.into.view.label=Deslizar dentro da visão
 
 # LOCALIZATION NOTE (accessibility.documentation.label): This is the label for
 # the Documentation menu item.
@@ -263,48 +263,48 @@
 # 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:
+accessibility.simulation=Simular:
 
 # 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)
+accessibility.simulation.deuteranomaly=Deuteranomalia (pouco verde)
 
 # 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)
+accessibility.simulation.protanomaly=Protanomalia (pouco vermelho)
 
 # 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)
+accessibility.simulation.protanopia=Protanopia (nenhum vermelho)
 
 # 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)
+accessibility.simulation.deuteranopia=Deuteranopia (nenhum verde)
 
 # 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)
+accessibility.simulation.tritanopia=Tritanopia (nenhum azul)
 
 # 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)
+accessibility.simulation.tritanomaly=Tritanomalia (pouco azul)
 
 # 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
+accessibility.simulation.contrastLoss=Perda de contraste
 
 # LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
 # in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
-accessibility.simulation.achromatopsia=Acromatopsia (sem cores)
+accessibility.simulation.achromatopsia=Acromatopsia (nenhuma cor)
 
 # LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.label): A title text for a checkbox label
 # in the accessibility panel toolbar that turns on/off the overlay of focusable elements in their
 # tabbing order.
-accessibility.toolbar.displayTabbingOrder.label=Show Tabbing Order
+accessibility.toolbar.displayTabbingOrder.label=Exibir ordem de tabulação
 
 # LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
 # tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
 # their tabbing order.
-accessibility.toolbar.displayTabbingOrder.tooltip=Show tabbing order of elements and their tabbing index.
+accessibility.toolbar.displayTabbingOrder.tooltip=Exibir ordem de tabulação dos elementos e seus índices de tabulação.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/animationinspector.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/animationinspector.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/animationinspector.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/animationinspector.properties	2021-01-18 20:07:36.000000000 +0000
@@ -13,12 +13,12 @@
 # LOCALIZATION NOTE (panel.noAnimation):
 # This is the label shown in the panel when there are no displayable animations.
 # (e.g. In case of user selected a non-element node or a node that is not animated).
-panel.noAnimation=No animations were found for the current element.\nPick another element from the page.
+panel.noAnimation=Nenhuma animação foi encontrada no elemento atual.\nEscolha outro elemento da página.
 
 # LOCALIZATION NOTE (player.animationDurationLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation duration.
-player.animationDurationLabel=Duration:
+player.animationDurationLabel=Duração:
 
 # LOCALIZATION NOTE (player.infiniteDurationText):
 # This string is displayed in a tooltip on animation player widget, in case the
@@ -28,22 +28,22 @@
 # LOCALIZATION NOTE (player.animationDelayLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation delay.
-player.animationDelayLabel=Delay:
+player.animationDelayLabel=Atraso:
 
 # LOCALIZATION NOTE (player.animationEndDelayLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation endDelay.
-player.animationEndDelayLabel=End delay:
+player.animationEndDelayLabel=Final do atraso:
 
 # LOCALIZATION NOTE (player.animationRateLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the animation playback rate.
-player.animationRateLabel=Playback rate:
+player.animationRateLabel=Taxa de reprodução:
 
 # LOCALIZATION NOTE (player.animationIterationCountLabel):
 # This string is displayed in each animation player widget. It is the label
 # displayed before the number of times the animation is set to repeat.
-player.animationIterationCountLabel=Repeats:
+player.animationIterationCountLabel=Repetições:
 
 # LOCALIZATION NOTE (player.infiniteIterationCount):
 # In case the animation repeats infinitely, this string is displayed next to the
@@ -65,32 +65,32 @@
 # e.g.
 # If iterationStart of animation is 0.5 and duration is 1 sec, the string will be
 # "Iteration start: 0.5 (0.5s)"
-player.animationIterationStartLabel2=Iteration start: %1$S (%2$S)
+player.animationIterationStartLabel2=Início da iteração: %1$S (%2$S)
 
 # LOCALIZATION NOTE (player.animationOverallEasingLabel):
 # This string is displayed in a tooltip that appears when hovering over
 # animations in the timeline. It is the label displayed before the easing
 # that applies to a whole iteration of an animation as opposed to the
 # easing that applies between animation keyframes.
-player.animationOverallEasingLabel=Overall easing:
+player.animationOverallEasingLabel=Suavização geral:
 
 # LOCALIZATION NOTE (player.animationTimingFunctionLabel):
 # This string is displayed in a tooltip that appears when hovering over
 # animations in the timeline. It is the label displayed before the
 # animation-timing-function for CSS Animations.
-player.animationTimingFunctionLabel=Animation timing function:
+player.animationTimingFunctionLabel=Função de temporização de animação:
 
 # LOCALIZATION NOTE (player.animationFillLabel):
 # This string is displayed in a tooltip that appears when hovering over
 # animations in the timeline. It is the label displayed before the animation
 # fill mode value.
-player.animationFillLabel=Fill:
+player.animationFillLabel=Preenchimento:
 
 # LOCALIZATION NOTE (player.animationDirectionLabel):
 # This string is displayed in a tooltip that appears when hovering over
 # animations in the timeline. It is the label displayed before the animation
 # direction value.
-player.animationDirectionLabel=Direction:
+player.animationDirectionLabel=Direção:
 
 # LOCALIZATION NOTE (player.timeLabel):
 # This string is displayed in each animation player widget, to indicate either
@@ -107,37 +107,37 @@
 # This string is displayed in each animation player widget, as the label of
 # drop-down list items that can be used to change the rate at which the
 # animation runs (1× being the default, 2× being twice as fast).
-player.playbackRateLabel=%Sx
+player.playbackRateLabel=%S×
 
 # LOCALIZATION NOTE (player.runningOnCompositorTooltip):
 # This string is displayed as a tooltip for the icon that indicates that the
 # animation is running on the compositor thread.
-player.runningOnCompositorTooltip=This animation is running on compositor thread
+player.runningOnCompositorTooltip=Esta animação está sendo executada no thread do compositor
 
 # LOCALIZATION NOTE (player.allPropertiesOnCompositorTooltip):
 # This string is displayed as a tooltip for the icon that indicates that
 # all of animation is running on the compositor thread.
-player.allPropertiesOnCompositorTooltip=All animation properties are optimized
+player.allPropertiesOnCompositorTooltip=Todas as propriedades de animação estão otimizadas
 
 # LOCALIZATION NOTE (player.somePropertiesOnCompositorTooltip):
 # This string is displayed as a tooltip for the icon that indicates that
 # all of animation is not running on the compositor thread.
-player.somePropertiesOnCompositorTooltip=Some animation properties are optimized
+player.somePropertiesOnCompositorTooltip=Algumas propriedades de animação estão otimizadas
 
 # LOCALIZATION NOTE (timeline.pausedButtonTooltip):
 # This string is displayed in the timeline toolbar, as the tooltip of the
 # pause/resume button that can be used to pause or resume the animations
-timeline.pausedButtonTooltip=Resume the animations
+timeline.pausedButtonTooltip=Retomar as animações
 
 # LOCALIZATION NOTE (timeline.resumedButtonTooltip):
 # This string is displayed in the timeline toolbar, as the tooltip of the
 # pause/resume button that can be used to pause or resume the animations
-timeline.resumedButtonTooltip=Pause the animations
+timeline.resumedButtonTooltip=Pausar as animações
 
 # LOCALIZATION NOTE (timeline.rewindButtonTooltip):
 # This string is displayed in the timeline toolbar, as the tooltip of the
 # rewind button that can be used to rewind the animations
-timeline.rewindButtonTooltip=Rewind the animations
+timeline.rewindButtonTooltip=Reiniciar as animações
 
 # LOCALIZATION NOTE (timeline.timeGraduationLabel):
 # This string is displayed at the top of the animation panel, next to each time
@@ -149,24 +149,24 @@
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.cssanimation.nameLabel=%S - CSS Animation
+timeline.cssanimation.nameLabel=%S — Animação por CSS
 
 # LOCALIZATION NOTE (timeline.csstransition.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Transition in the timeline UI.
 # %S will be replaced by the name of the transition at run-time.
-timeline.csstransition.nameLabel=%S - CSS Transition
+timeline.csstransition.nameLabel=%S — Transição por CSS
 
 # LOCALIZATION NOTE (timeline.scriptanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a script-generated animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.scriptanimation.nameLabel=%S - Script Animation
+timeline.scriptanimation.nameLabel=%S — Animação por script
 
 # LOCALIZATION NOTE (timeline.scriptanimation.unnamedLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over an unnamed script-generated animation in the timeline UI.
-timeline.scriptanimation.unnamedLabel=Script Animation
+timeline.scriptanimation.unnamedLabel=Animação por script
 
 # LOCALIZATION NOTE (timeline.unknown.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
@@ -180,4 +180,3 @@
 # %S represents the value in percentage with two decimal points, localized.
 # there are two "%" after %S to escape and display "%"
 detail.propertiesHeader.percentage=%S%%
-
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/application.ftl firefox-85.0+build1/l10n/pt-BR/devtools/client/application.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/application.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/application.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -14,45 +14,35 @@
 
 # Header for the list of Service Workers displayed in the application panel for the current page.
 serviceworker-list-header = Service Workers
-
 # Text displayed next to the list of Service Workers to encourage users to check out
 # about:debugging to see all registered Service Workers.
-serviceworker-list-aboutdebugging = Open <a>about:debugging</a> for Service Workers from other domains
-
+serviceworker-list-aboutdebugging = Abrir <a>about:debugging</a> de service workers de outros domínios
 # Text for the button to unregister a Service Worker. Displayed for active Service Workers.
-serviceworker-worker-unregister = Unregister
-
+serviceworker-worker-unregister = Cancelar registro
 # Text for the debug link displayed for an already started Service Worker. Clicking on the
 # link opens a new devtools toolbox for this service worker. The title attribute is only
 # displayed when the link is disabled.
 serviceworker-worker-debug = Debug
-    .title = Only running service workers can be debugged
-
+    .title = Só service workers em execução podem ser depurados
 # Text for the debug link displayed for an already started Service Worker, when we
 # are in multi e10s mode, which effectively disables this link.
 serviceworker-worker-debug-forbidden = Debug
-    .title = Can only debug service workers if multi e10s is disabled
-
+    .title = Só pode depurar service workers se multi e10s estiver desativado
 # Text for the start link displayed for a registered but not running Service Worker.
 # Clicking on the link will attempt to start the service worker.
-serviceworker-worker-start2 = Start
-    .title = Can only start service workers if multi e10s is disabled
-
+serviceworker-worker-start2 = Iniciar
+    .title = Só pode iniciar service workers se multi e10s estiver desativado
 # Alt text for the image icon displayed inside a debug link for a service worker.
 serviceworker-worker-inspect-icon =
-    .alt = Inspect
-
+    .alt = Inspecionar
 # Text for the start link displayed for a registered but not running Service Worker.
 # Clicking on the link will attempt to start the service worker.
 serviceworker-worker-start3 = Iniciar
-
 # Text displayed for the updated time of the service worker. The <time> element will
 # display the last update time of the service worker script.
-serviceworker-worker-updated = Updated <time>{ DATETIME($date, month: "long", year: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric") }</time>
-
+serviceworker-worker-updated = Atualizado em <time>{ DATETIME($date, month: "long", year: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric") }</time>
 # Text displayed next to the URL for the source of the service worker (e-g. "Source my/path/to/worker-js")
-serviceworker-worker-source = Source
-
+serviceworker-worker-source = Origem
 # Text displayed next to the current status of the service worker.
 serviceworker-worker-status = Status
 
@@ -61,127 +51,94 @@
 
 # Service Worker status. A running service worker is registered, currently executed, can
 # be debugged and stopped.
-serviceworker-worker-status-running = Running
-
+serviceworker-worker-status-running = Executando
 # Service Worker status. A stopped service worker is registered but not currently active.
-serviceworker-worker-status-stopped = Stopped
-
+serviceworker-worker-status-stopped = Parado
 # Text displayed when no service workers are visible for the current page. Clicking on the
 # link will open https://developer-mozilla-org/docs/Web/API/Service_Worker_API/Using_Service_Workers
-serviceworker-empty-intro = Você precisa registrar um Service Worker para ser inspecionado aqui. <a>Saiba mais</a>
-
+serviceworker-empty-intro = Você precisa registrar um service worker para ser inspecionado aqui. <a>Saiba mais</a>
 # Text displayed when there are no Service Workers to display for the current page,
 # introducing hints to debug Service Worker issues.
 serviceworker-empty-suggestions = Se a página atual deveria ter um service worker, eis algumas coisas que você pode tentar fazer
-
 # Suggestion to check for errors in the Console to investigate why a service worker is not
 # registered. Clicking on the link opens the webconsole.
 serviceworker-empty-suggestions-console = Procurar erros no Console. <a>Abrir o Console</a>
-
 # Suggestion to use the debugger to investigate why a service worker is not registered.
 # Clicking on the link will switch from the Application panel to the debugger.
-serviceworker-empty-suggestions-debugger = Percorrer o registro do seu Service Worker e procurar exceções. <a>Abrir o Debugger</a>
-
+serviceworker-empty-suggestions-debugger = Percorrer o registro do seu service worker e procurar exceções. <a>Abrir o Debugger</a>
 # 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 = Inspecionar Service Workers de outros domínios. <a>Abrir about:debugging</a>
-
+serviceworker-empty-suggestions-aboutdebugging = Inspecionar service workers de outros domínios. <a>Abrir about:debugging</a>
 # Text displayed when no service workers are visible for the current page.
 serviceworker-empty-intro2 = Nenhum service worker encontrado
-
 # Link will open https://developer.mozilla.org/docs/Web/API/Service_Worker_API/Using_Service_Workers
 serviceworker-empty-intro-link = Saiba mais
-
 # Text displayed when there are no Service Workers to display for the current page,
 # introducing hints to debug Service Worker issues.
 # <a> and <span> are links that will open the webconsole and the debugger, respectively.
 serviceworker-empty-suggestions2 = Se a página atual deveria ter um service worker, você pode procurar erros no <a>Console</a> ou percorrer seu registro de service worker no <span>Debugger</span>.
-
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Link will open about:debugging in a new tab.
 serviceworker-empty-suggestions-aboutdebugging2 = Ver service workers de outros domínios
-
 # Header for the Manifest page when we have an actual manifest
-manifest-view-header = App Manifest
-
+manifest-view-header = Manifest do app
 # 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 = Você precisa adicionar um Manifest de app web para ser inspecionado aqui. <a>Saiba mais</a>
-
+manifest-empty-intro = Você precisa adicionar um manifest de app web para ser inspecionado aqui. <a>Saiba mais</a>
 # Header for the Manifest page when there's no manifest to inspect
 manifest-empty-intro2 = Nenhum manifest de aplicativo web detectado
-
 # The link will open https://developer.mozilla.org/en-US/docs/Web/Manifest
 manifest-empty-intro-link = Saiba como adicionar um manifest
-
 # Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
-manifest-item-warnings = Errors and Warnings
-
+manifest-item-warnings = Erros e avisos
 # Header for the Identity section of Manifest inspection displayed in the application panel.
-manifest-item-identity = Identity
-
+manifest-item-identity = Identidade
 # Header for the Presentation section of Manifest inspection displayed in the application panel.
-manifest-item-presentation = Presentation
-
+manifest-item-presentation = Apresentação
 # Header for the Icon section of Manifest inspection displayed in the application panel.
-manifest-item-icons = Icons
-
+manifest-item-icons = �cones
 # Text displayed while we are loading the manifest file
-manifest-loading = Loading manifest…
-
+manifest-loading = Carregando manifest…
 # Text displayed when the manifest has been successfully loaded
-manifest-loaded-ok = Manifest loaded.
-
+manifest-loaded-ok = Manifest carregado.
 # Text displayed as a caption when there has been an error while trying to
 # load the manifest
-manifest-loaded-error = There was an error while loading the manifest:
-
+manifest-loaded-error = Houve um erro ao carregar o manifest:
 # Text displayed as an error when there has been a Firefox DevTools error while
 # trying to load the manifest
-manifest-loaded-devtools-error = Firefox DevTools error
-
+manifest-loaded-devtools-error = Erro no Firefox DevTools
 # Text displayed when the page has no manifest available
 manifest-non-existing = Nenhum manifest encontrado para ser inspecionado.
-
 # 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.
-
+manifest-json-link-data-url = O manifest está incorporado em uma URL de dados.
 # Text displayed at manifest icons to label their purpose, as declared
 # in the manifest.
-manifest-icon-purpose = Purpose: <code>{ $purpose }</code>
-
+manifest-icon-purpose = Objetivo: <code>{ $purpose }</code>
 # Text displayed as the alt attribute for <img> tags showing the icons in the
 # manifest.
 manifest-icon-img =
-    .alt = Icon
-
+    .alt = �cone
 # Text displayed as the title attribute for <img> tags showing the icons in the
 # manifest. `$sizes` is a user-dependent string that has been parsed as a
 # space-separated list of `<width>x<height>` sizes or the keyword `any`.
-manifest-icon-img-title = Icon with sizes: { $sizes }
-
+manifest-icon-img-title = �cone com tamanhos: { $sizes }
 # Text displayed as the title attribute for <img> tags showing the icons in the
 # manifest, in case there's no icon size specified by the user
-manifest-icon-img-title-no-sizes = Unspecified size icon
-
+manifest-icon-img-title-no-sizes = �cone de tamanho não especificado
 # Sidebar navigation item for Manifest sidebar item section
 sidebar-item-manifest = Manifest
-    .alt = Manifest Icon
+    .alt = �cone de manifest
     .title = Manifest
-
 # Sidebar navigation item for Service Workers sidebar item section
 sidebar-item-service-workers = Service Workers
-    .alt = Service Workers Icon
+    .alt = �cone de Service Workers
     .title = Service Workers
-
 # Text for the ALT and TITLE attributes of the warning icon
 icon-warning =
-    .alt = Warning icon
-    .title = Warning
-
+    .alt = �cone de aviso
+    .title = Aviso
 # Text for the ALT and TITLE attributes of the error icon
 icon-error =
-    .alt = Error icon
-    .title = Error
-
+    .alt = �cone de erro
+    .title = Erro
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/boxmodel.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/boxmodel.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/boxmodel.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/boxmodel.properties	2021-01-18 20:07:36.000000000 +0000
@@ -18,31 +18,31 @@
 # LOCALIZATION NOTE: (boxmodel.geometryButton.tooltip) This label is displayed as a
 # tooltip that appears when hovering over the button that allows users to edit the
 # position of an element in the page.
-boxmodel.geometryButton.tooltip=Edit position
+boxmodel.geometryButton.tooltip=Editar posição
 
 # LOCALIZATION NOTE: (boxmodel.propertiesLabel) This label is displayed as the header
 # for showing and collapsing the properties underneath the box model in the layout view
-boxmodel.propertiesLabel=Box Model Properties
+boxmodel.propertiesLabel=Propriedades do Box Model
 
 # LOCALIZATION NOTE (boxmodel.propertiesHideLabel):
 # This is the spoken label for the twisty.
 # If the properties are currently showing, it will say "Hide".
-boxmodel.propertiesHideLabel=Hide
+boxmodel.propertiesHideLabel=Ocultar
 
 # LOCALIZATION NOTE (boxmodel.propertiesShowLabel):
 # This is the spoken label for the twisty.
 # If the properties are currently hidden, it will say "Show".
-boxmodel.propertiesShowLabel=Show
+boxmodel.propertiesShowLabel=Exibir
 
 # LOCALIZATION NOTE: (boxmodel.offsetParent) This label is displayed inside the list of
 # properties, below the box model, in the layout view. It is displayed next to the
 # position property, when position is absolute, relative, sticky. This label tells users
 # what the DOM node previewed next to it is: an offset parent for the position element.
-boxmodel.offsetParent=offset
+boxmodel.offsetParent=deslocamento
 
 # LOCALIZATION NOTE: (boxmodel.offsetParent.title) This label is displayed as a
 # tooltip that appears when hovering over the offset label, inside the list of properties,
 # below the box model, in the layout view. This label tells users
 # what the DOM node previewed next to it is: an offset parent for the position element.
-boxmodel.offsetParent.title=Offset parent of the selected element
+boxmodel.offsetParent.title=Superior de deslocamento do elemento selecionado
 
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/changes.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/changes.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/changes.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/changes.properties	2021-01-18 20:07:36.000000000 +0000
@@ -6,11 +6,11 @@
 # the Inspector sidebar.
 
 # LOCALIZATION NOTE (changes.noChanges): This text is shown when no changes are available.
-changes.noChanges=No changes found.
+changes.noChanges=Nenhuma alteração encontrada.
 
 # LOCALIZATION NOTE (changes.noChangesDescription): This text is shown when no changes are
 # available and provides additional context for the purpose of the Changes panel.
-changes.noChangesDescription=Changes to CSS in Inspector will appear here.
+changes.noChangesDescription=Alterações no CSS feitas no Inspector aparecem aqui.
 
 # LOCALIZATION NOTE (changes.inlineStyleSheetLabel): This label appears in the Changes
 # panel above changes done to inline stylesheets. The variable will be replaced with the
@@ -19,7 +19,7 @@
 
 # LOCALIZATION NOTE (changes.elementStyleLabel): This label appears in the Changes
 # panel above changes done to element styles.
-changes.elementStyleLabel=Element
+changes.elementStyleLabel=Elemento
 
 # LOCALIZATION NOTE (changes.iframeLabel): This label appears next to URLs of stylesheets
 # and element inline styles hosted by iframes. Lowercase intentional.
@@ -27,7 +27,7 @@
 
 # LOCALIZATION NOTE (changes.contextmenu.copy): Label for "Copy" option in Changes panel
 # context menu
-changes.contextmenu.copy=Copy
+changes.contextmenu.copy=Copiar
 
 # LOCALIZATION NOTE (changes.contextmenu.copy.accessKey): Access key for "Copy"
 # option in the Changes panel.
@@ -41,11 +41,11 @@
 # LOCALIZATION NOTE (changes.contextmenu.copyAllChangesDescription): Detailed explanation
 # for "Copy All Changes" option in Changes panel. Used as title attribute on "Copy All
 # Changes" button
-changes.contextmenu.copyAllChangesDescription=Copy a list of all CSS changes to clipboard.
+changes.contextmenu.copyAllChangesDescription=Copiar uma lista de todas as alterações no CSS para a área de transferência.
 
 # LOCALIZATION NOTE (changes.contextmenu.copyDeclaration): Label for "Copy Declaration"
 # option in Changes panel context menu which copies the target CSS declaration.
-changes.contextmenu.copyDeclaration=Copy Declaration
+changes.contextmenu.copyDeclaration=Copiar declaração
 
 # LOCALIZATION NOTE (changes.contextmenu.copyRule): Label for "Copy Rule" option in
 # Changes panel context menu which copies the complete contents of a CSS rule.
@@ -53,12 +53,12 @@
 
 # LOCALIZATION NOTE (changes.contextmenu.copyRuleDescription): Detailed explanation for
 # "Copy Rule" option in Changes panel. Used as title attribute on "Copy Rule" button.
-changes.contextmenu.copyRuleDescription=Copy contents of this CSS rule to clipboard.
+changes.contextmenu.copyRuleDescription=Copiar o conteúdo desta regra CSS para a área de transferência.
 
 # LOCALIZATION NOTE (changes.contextmenu.selectAll): Label for "Select All" option in the
 # Changes panel context menu to select all text content.
-changes.contextmenu.selectAll=Select All
+changes.contextmenu.selectAll=Selecionar tudo
 
 # LOCALIZATION NOTE (changes.contextmenu.selectAll.accessKey): Access key for "Select All"
 # option in the Changes panel.
-changes.contextmenu.selectAll.accessKey=A
+changes.contextmenu.selectAll.accessKey=S
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/components.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/components.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/components.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/components.properties	2021-01-18 20:07:36.000000000 +0000
@@ -7,18 +7,18 @@
 
 # LOCALIZATION NOTE (frame.unknownSource): When we do not know the source filename of
 # a frame, we use this string instead.
-frame.unknownSource=(unknown)
+frame.unknownSource=(desconhecido)
 
 # 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
+frame.viewsourceindebugger=Ver fonte no 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
+frame.viewsourceinstyleeditor=Ver fonte no editor de estilos → %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
+notificationBox.closeTooltip=Fechar esta mensagem
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/debugger.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/debugger.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/debugger.properties	2021-01-18 20:07:36.000000000 +0000
@@ -12,127 +12,127 @@
 
 # LOCALIZATION NOTE (collapseSources): This is the tooltip for the button
 # that collapses the Sources and Outlines panes in the debugger UI.
-collapseSources=Collapse Sources and Outline panes
+collapseSources=Recolher painéis de fontes e outline
 
 # LOCALIZATION NOTE (collapseBreakpoints): This is the tooltip for the button
 # that collapses the Breakpoints panes in the debugger UI.
-collapseBreakpoints=Collapse Breakpoints pane
+collapseBreakpoints=Recolher painel de breakpoints
 
 # LOCALIZATION NOTE (copyToClipboard.label): This is the text that appears in the
 # context menu to copy the text that the user selected.
-copyToClipboard.label=Copy to clipboard
+copyToClipboard.label=Copiar para área de transferência
 copyToClipboard.accesskey=C
 
 # LOCALIZATION NOTE (copySource.label): This is the text that appears in the
 # context menu to copy all of the text in the open file.
-copySource.label=Copy source text
-copySource.accesskey=y
+copySource.label=Copiar texto de origem
+copySource.accesskey=t
 
 # LOCALIZATION NOTE (copySourceUri2): This is the text that appears in the
 # context menu to copy the source URI of file open.
-copySourceUri2=Copy source URI
-copySourceUri2.accesskey=u
+copySourceUri2=Copiar URI de origem
+copySourceUri2.accesskey=U
 
 # LOCALIZATION NOTE (collapseAll.label): This is the text that appears in the
 # context menu to collapse a directory and all of its subdirectories.
-collapseAll.label=Collapse all
+collapseAll.label=Recolher tudo
 
 # LOCALIZATION NOTE (expandAll.label): This is the text that appears in the
 # context menu to expand a directory and all of its subdirectories.
-expandAll.label=Expand all
+expandAll.label=Expandir tudo
 
 # LOCALIZATION NOTE (setDirectoryRoot.label): This is the text that appears in the
 # context menu to set a directory as root directory
-setDirectoryRoot.label=Set directory root
+setDirectoryRoot.label=Definir raiz do diretório
 setDirectoryRoot.accesskey=r
 
 # LOCALIZATION NOTE (removeDirectoryRoot.label): This is the text that appears in the
 # context menu to remove a directory as root directory
-removeDirectoryRoot.label=Remove directory root
+removeDirectoryRoot.label=Remover raiz do diretório
 
 # LOCALIZATION NOTE (blackBoxAll.label): Text associated with the blackbox context menu item
 blackBoxAll.label=Blackbox
 
 # LOCALIZATION NOTE (blackBoxAllInGroup.label): This is the text that appears in the
 # context submenu to blackbox all files inside of the selected group
-blackBoxAllInGroup.label=Blackbox files in this group
+blackBoxAllInGroup.label=Colocar em Blackbox arquivos deste grupo
 
 # LOCALIZATION NOTE (unblackBoxAllInGroup.label): This is the text that appears in the
 # context submenu to unblackbox all files inside of the selected group
-unblackBoxAllInGroup.label=Unblackbox files in this group
+unblackBoxAllInGroup.label=Retirar de Blackbox arquivos deste grupo
 
 # LOCALIZATION NOTE (blackBoxAllOutsideGroup.label): This is the text that appears in the
 # context submenu to blackbox all files outside of the selected group
-blackBoxAllOutsideGroup.label=Blackbox files outside this group
+blackBoxAllOutsideGroup.label=Colocar em Blackbox arquivos de fora deste grupo
 
 # LOCALIZATION NOTE (unblackBoxAllOutsideGroup.label): This is the text that appears in the
 # context submenu to unblackbox all files outside of the selected group
-unblackBoxAllOutsideGroup.label=Unblackbox files outside this group
+unblackBoxAllOutsideGroup.label=Retirar de Blackbox arquivos de fora deste grupo
 
 # LOCALIZATION NOTE (blackBoxAllInDir.label): This is the text that appears in the
 # context submenu to blackbox all files inside of the selected directory
-blackBoxAllInDir.label=Blackbox files in this directory
+blackBoxAllInDir.label=Colocar em Blackbox arquivos deste diretório
 
 # LOCALIZATION NOTE (unblackBoxAllInDir.label): This is the text that appears in the
 # context submenu to unblackbox all files inside of the selected directory
-unblackBoxAllInDir.label=Unblackbox files in this directory
+unblackBoxAllInDir.label=Retirar de Blackbox arquivos deste diretório
 
 # LOCALIZATION NOTE (blackBoxAllOutsideDir.label): This is the text that appears in the
 # context submenu to blackbox all files outside of the selected directory
-blackBoxAllOutsideDir.label=Blackbox files outside this directory
+blackBoxAllOutsideDir.label=Colocar em Blackbox arquivos de fora deste diretório
 
 # LOCALIZATION NOTE (unblackBoxAllOutsideDir.label: This is the text that appears in the
 # context submenu to unblackbox all files outside of the selected directory
-unblackBoxAllOutsideDir.label=Unblackbox files outside this directory
+unblackBoxAllOutsideDir.label=Retirar de Blackbox arquivos de fora deste diretório
 
 # LOCALIZATION NOTE (ignoreAll.label): Text associated with the ignore context menu item
-ignoreAll.label=Ignore
+ignoreAll.label=Ignorar
 
 # LOCALIZATION NOTE (ignoreAllInGroup.label): This is the text that appears in the
 # context submenu to ignore all files inside of the selected group
-ignoreAllInGroup.label=Ignore files in this group
+ignoreAllInGroup.label=Ignorar arquivos deste grupo
 
 # LOCALIZATION NOTE (unignoreAllInGroup.label): This is the text that appears in the
 # context submenu to unignore all files inside of the selected group
-unignoreAllInGroup.label=Unignore files in this group
+unignoreAllInGroup.label=Deixar de ignorar arquivos deste grupo
 
 # LOCALIZATION NOTE (ignoreAllOutsideGroup.label): This is the text that appears in the
 # context submenu to ignore all files outside of the selected group
-ignoreAllOutsideGroup.label=Ignore files outside this group
+ignoreAllOutsideGroup.label=Ignorar arquivos de fora deste grupo
 
 # LOCALIZATION NOTE (unignoreAllOutsideGroup.label): This is the text that appears in the
 # context submenu to unignore all files outside of the selected group
-unignoreAllOutsideGroup.label=Unignore files outside this group
+unignoreAllOutsideGroup.label=Deixar de ignorar arquivos de fora deste grupo
 
 # LOCALIZATION NOTE (ignoreAllInDir.label): This is the text that appears in the
 # context submenu to ignore all files inside of the selected directory
-ignoreAllInDir.label=Ignore files in this directory
+ignoreAllInDir.label=Ignorar arquivos deste diretório
 
 # LOCALIZATION NOTE (unignoreAllInDir.label): This is the text that appears in the
 # context submenu to unignore all files inside of the selected directory
-unignoreAllInDir.label=Unignore files in this directory
+unignoreAllInDir.label=Deixar de ignorar arquivos deste diretório
 
 # LOCALIZATION NOTE (ignoreAllOutsideDir.label): This is the text that appears in the
 # context submenu to ignore all files outside of the selected directory
-ignoreAllOutsideDir.label=Ignore files outside this directory
+ignoreAllOutsideDir.label=Ignorar arquivos de fora deste diretório
 
 # LOCALIZATION NOTE (unignoreAllOutsideDir.label: This is the text that appears in the
 # context submenu to unignore all files outside of the selected directory
-unignoreAllOutsideDir.label=Unignore files outside this directory
+unignoreAllOutsideDir.label=Deixar de ignorar arquivos de fora deste diretório
 
 # LOCALIZATION NOTE (copyFunction.label): This is the text that appears in the
 # context menu to copy the function the user selected
-copyFunction.label=Copy function
+copyFunction.label=Copiar função
 copyFunction.accesskey=F
 
 # LOCALIZATION NOTE (copyStackTrace): This is the text that appears in the
 # context menu to copy the stack trace methods, file names and row number.
-copyStackTrace=Copy Stack Trace
+copyStackTrace=Copiar Stack Trace
 copyStackTrace.accesskey=c
 
 # LOCALIZATION NOTE (restartFrame): This is the text that appears in the
 # context menu to restart a frame.
-restartFrame=Restart frame
+restartFrame=Reiniciar frame
 restartFrame.accesskey=r
 
 # LOCALIZATION NOTE (expandSources): This is the tooltip for the button
@@ -141,7 +141,7 @@
 
 # LOCALIZATION NOTE (expandBreakpoints): This is the tooltip for the button
 # that expands the Breakpoints panes in the debugger UI.
-expandBreakpoints=Expand Breakpoints pane
+expandBreakpoints=Expandir painel de breakpoints
 
 # LOCALIZATION NOTE (evaluateInConsole.label): Editor right-click menu item
 # to execute selected text in browser console.
@@ -149,15 +149,15 @@
 
 # LOCALIZATION NOTE (pauseButtonTooltip): The tooltip that is displayed for the pause
 # button when the debugger is in a running state.
-pauseButtonTooltip=Click to pause (%S)
+pauseButtonTooltip=Pausar %S
 
 # LOCALIZATION NOTE (pausePendingButtonTooltip): The tooltip that is displayed for
 # the pause button after it's been clicked but before the next JavaScript to run.
-pausePendingButtonTooltip=Waiting for next execution
+pausePendingButtonTooltip=Esperando a próxima execução
 
 # LOCALIZATION NOTE (resumeButtonTooltip): The label that is displayed on the pause
 # button when the debugger is in a paused state.
-resumeButtonTooltip=Click to resume (%S)
+resumeButtonTooltip=Retomar %S
 
 # LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
 # button that steps over a function call.
@@ -173,30 +173,30 @@
 
 # LOCALIZATION NOTE (skipPausingTooltip.label): The tooltip text for disabling all
 # breakpoints and pausing triggers
-skipPausingTooltip.label=Deactivate breakpoints
+skipPausingTooltip.label=Desativar breakpoints
 
 # LOCALIZATION NOTE (undoSkipPausingTooltip.label): The tooltip text for enabling all
 # breakpoints and pausing triggers
-undoSkipPausingTooltip.label=Activate breakpoints
+undoSkipPausingTooltip.label=Ativar breakpoints
 
 # LOCALIZATION NOTE (pauseOnExceptionsItem2): The pause on exceptions checkbox description
 # when the debugger will pause on all exceptions.
-pauseOnExceptionsItem2=Pause on exceptions
+pauseOnExceptionsItem2=Pausar em exceções
 
 # LOCALIZATION NOTE (pauseOnCaughtExceptionsItem): The pause on exceptions checkbox description
 # when the debugger should pause on caught exceptions
-pauseOnCaughtExceptionsItem=Pause on caught exceptions
+pauseOnCaughtExceptionsItem=Pausar em exceções capturadas
 
 # LOCALIZATION NOTE (threadsHeader): The text to describe the threads header
 threadsHeader=Threads
 
 # LOCALIZATION NOTE (mainThread): The text to describe the thread of the
 # program as opposed to worker threads.
-mainThread=Main Thread
+mainThread=Thread principal
 
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources list
 # when there are no sources.
-noSourcesText=This page has no sources.
+noSourcesText=Esta página não tem fontes.
 
 # LOCALIZATION NOTE (eventListenersHeader1): The text to display in the events
 # header.
@@ -205,30 +205,30 @@
 # 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
+noDomMutationBreakpoints=Clique com o botão direito em um elemento em %S e selecione “Interromper em…� para adicionar um breakpoint
 
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
-inspectorTool=Inspector
+inspectorTool=Inspetor
 
 # LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
 # the event search input bar
-eventListenersHeader1.placeholder=Filter by event type
+eventListenersHeader1.placeholder=Filtrar por tipo de evento
 
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
-domMutationHeader=DOM Mutation Breakpoints
+domMutationHeader=Breakpoints de mutação de DOM
 
 # LOCALIZATION NOTE (domMutationTypes.attribute): The text to display in the
 # DOM Mutation Breakpoints panel for an attribute change
-domMutationTypes.attribute=Attribute Modification
+domMutationTypes.attribute=Modificação de atributos
 
 # LOCALIZATION NOTE (domMutationTypes.removal): The text to display in the
 # DOM Mutation Breakpoints panel for a DOM node removal
-domMutationTypes.removal=Node Removal
+domMutationTypes.removal=Remoção de nó
 
 # LOCALIZATION NOTE (domMutationTypes.subtree): The text to display in the
 # DOM Mutation Breakpoints panel for a DOM subtree change
-domMutationTypes.subtree=Subtree Modification
+domMutationTypes.subtree=Modificação de subárvore
 
 # LOCALIZATION NOTE (sources.search.key2): Key shortcut to open the search for
 # searching all the source files the debugger has seen.
@@ -292,15 +292,15 @@
 
 # LOCALIZATION NOTE (shortcuts.header.search): Sections header in
 # the shortcuts modal for keyboard shortcuts related to search.
-shortcuts.header.search=Search
+shortcuts.header.search=Pesquisa
 
 # LOCALIZATION NOTE (projectTextSearch.placeholder): A placeholder shown
 # when searching across all of the files in a project.
-projectTextSearch.placeholder=Find in files…
+projectTextSearch.placeholder=Procurar em arquivos…
 
 # LOCALIZATION NOTE (projectTextSearch.noResults): The center pane Text Search
 # message when the query did not match any text of all files in a project.
-projectTextSearch.noResults=No results found
+projectTextSearch.noResults=Nenhum resultado encontrado
 
 # LOCALIZATION NOTE (sourceSearch.search.key2): Key shortcut to open the search
 # for searching within a the currently opened files in the editor
@@ -310,11 +310,11 @@
 
 # LOCALIZATION NOTE (sourceSearch.search.placeholder): placeholder text in
 # the source search input bar
-sourceSearch.search.placeholder=Search in file…
+sourceSearch.search.placeholder=Pesquisar em arquivo…
 
 # LOCALIZATION NOTE (sourceSearch.search.placeholder2): placeholder text in
 # the source search input bar
-sourceSearch.search.placeholder2=Find in file…
+sourceSearch.search.placeholder2=Procurar em arquivo…
 
 # LOCALIZATION NOTE (sourceSearch.search.again.key3): Key shortcut to highlight
 # the next occurrence of the last search triggered from a source search
@@ -331,54 +331,54 @@
 # 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
+sourceSearch.resultsSummary2=#1 resultado;#1 resultados
 
 # LOCALIZATION NOTE (breakpointHeadingMenuItem.*): The text for all the elements
 # that are displayed in the breakpoint headings menu item popup.
-breakpointHeadingsMenuItem.enableInSource.label=Enable breakpoints
-breakpointHeadingsMenuItem.enableInSource.accesskey=E
-breakpointHeadingsMenuItem.disableInSource.label=Disable breakpoints
+breakpointHeadingsMenuItem.enableInSource.label=Ativar breakpoints
+breakpointHeadingsMenuItem.enableInSource.accesskey=A
+breakpointHeadingsMenuItem.disableInSource.label=Desativar breakpoints
 breakpointHeadingsMenuItem.disableInSource.accesskey=D
-breakpointHeadingsMenuItem.removeInSource.label=Remove breakpoints
+breakpointHeadingsMenuItem.removeInSource.label=Remover breakpoints
 breakpointHeadingsMenuItem.removeInSource.accesskey=R
 
 # 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.enableSelf2.label=Ativar
+breakpointMenuItem.enableSelf2.accesskey=A
+breakpointMenuItem.disableSelf2.label=Desativar
 breakpointMenuItem.disableSelf2.accesskey=D
-breakpointMenuItem.deleteSelf2.label=Remove
+breakpointMenuItem.deleteSelf2.label=Remover
 breakpointMenuItem.deleteSelf2.accesskey=R
-breakpointMenuItem.disabledbg.label=Never pause here
-breakpointMenuItem.enabledbg.label=Pause here
-breakpointMenuItem.enableOthers2.label=Enable others
+breakpointMenuItem.disabledbg.label=Nunca pausar aqui
+breakpointMenuItem.enabledbg.label=Pausar aqui
+breakpointMenuItem.enableOthers2.label=Ativar outros
 breakpointMenuItem.enableOthers2.accesskey=o
-breakpointMenuItem.disableOthers2.label=Disable others
+breakpointMenuItem.disableOthers2.label=Desativar outros
 breakpointMenuItem.disableOthers2.accesskey=s
-breakpointMenuItem.deleteOthers2.label=Remove others
-breakpointMenuItem.deleteOthers2.accesskey=h
-breakpointMenuItem.enableAll2.label=Enable all
-breakpointMenuItem.enableAll2.accesskey=b
-breakpointMenuItem.disableAll2.label=Disable all
+breakpointMenuItem.deleteOthers2.label=Remover outros
+breakpointMenuItem.deleteOthers2.accesskey=u
+breakpointMenuItem.enableAll2.label=Ativar todos
+breakpointMenuItem.enableAll2.accesskey=v
+breakpointMenuItem.disableAll2.label=Desativar todos
 breakpointMenuItem.disableAll2.accesskey=k
-breakpointMenuItem.deleteAll2.label=Remove all
-breakpointMenuItem.deleteAll2.accesskey=a
-breakpointMenuItem.removeCondition2.label=Remove condition
+breakpointMenuItem.deleteAll2.label=Remover todos
+breakpointMenuItem.deleteAll2.accesskey=t
+breakpointMenuItem.removeCondition2.label=Remover condição
 breakpointMenuItem.removeCondition2.accesskey=c
-breakpointMenuItem.addCondition2.label=Add condition
+breakpointMenuItem.addCondition2.label=Adicionar condição
 breakpointMenuItem.addCondition2.accesskey=A
-breakpointMenuItem.editCondition2.label=Edit condition
+breakpointMenuItem.editCondition2.label=Editar condição
 breakpointMenuItem.editCondition2.accesskey=n
-breakpointMenuItem.enableSelf=Enable breakpoint
-breakpointMenuItem.disableSelf=Disable breakpoint
-breakpointMenuItem.deleteSelf=Remove breakpoint
-breakpointMenuItem.enableOthers=Enable others
-breakpointMenuItem.disableOthers=Disable others
-breakpointMenuItem.deleteOthers=Remove others
-breakpointMenuItem.enableAll=Enable all breakpoints
-breakpointMenuItem.disableAll=Disable all breakpoints
-breakpointMenuItem.deleteAll=Remove all breakpoints
+breakpointMenuItem.enableSelf=Ativar breakpoint
+breakpointMenuItem.disableSelf=Desativar breakpoint
+breakpointMenuItem.deleteSelf=Remover breakpoint
+breakpointMenuItem.enableOthers=Ativar outros
+breakpointMenuItem.disableOthers=Desativar outros
+breakpointMenuItem.deleteOthers=Remover outros
+breakpointMenuItem.enableAll=Ativar todos os breakpoints
+breakpointMenuItem.disableAll=Desativar todos os breakpoints
+breakpointMenuItem.deleteAll=Remover todos os breakpoints
 breakpointMenuItem.disableAllAtLine.label=Disable breakpoints on line
 breakpointMenuItem.disableAllAtLine.accesskey=K
 breakpointMenuItem.enableAllAtLine.label=Enable breakpoints on line
@@ -391,49 +391,49 @@
 
 # LOCALIZATION NOTE (breakpoints.enable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.enable=Enable Breakpoints
+breakpoints.enable=Ativar breakpoints
 
 # LOCALIZATION NOTE (breakpoints.disable): The text that may appear as a tooltip
 # when hovering over the 'disable breakpoints' switch button in right sidebar
-breakpoints.disable=Disable Breakpoints
+breakpoints.disable=Desativar breakpoints
 
 # LOCALIZATION NOTE (breakpoints.removeBreakpointTooltip): The tooltip that is displayed
 # for remove breakpoint button in right sidebar
-breakpoints.removeBreakpointTooltip=Remove Breakpoint
+breakpoints.removeBreakpointTooltip=Remover breakpoint
 
 # LOCALIZATION NOTE (callStack.header): Call Stack right sidebar pane header.
-callStack.header=Call Stack
+callStack.header=Pilha de chamadas
 
 # LOCALIZATION NOTE (callStack.notPaused): Call Stack right sidebar pane
 # message when not paused.
-callStack.notPaused=Not Paused
+callStack.notPaused=Não pausado
 
 # LOCALIZATION NOTE (callStack.collapse): Call Stack right sidebar pane
 # message to hide some of the frames that are shown.
-callStack.collapse=Collapse Rows
+callStack.collapse=Recolher linhas
 
 # LOCALIZATION NOTE (callStack.expand): Call Stack right sidebar pane
 # message to show more of the frames.
-callStack.expand=Expand Rows
+callStack.expand=Expandir linhas
 
 # LOCALIZATION NOTE (callStack.group.expandTooltip): The text that will appear
 # when hovering a collapsed Group of frames in the callStack panel. `frames` is
 # always plural since a group can only exist if it contain more that 1 frame.
 # %S is replaced by the name of the library of the frames in the group.
 # example: `Show React frames`.
-callStack.group.expandTooltip=Show %S frames
+callStack.group.expandTooltip=Mostrar frames %S
 
 # LOCALIZATION NOTE (callStack.group.collapseTooltip): The text that will appear
 # when hovering an expanded Group of frames in the callStack panel. `frames` is
 # always plural since a group can only exist if it contain more that 1 frame.
 # %S is replaced by the name of the library of the frames in the group.
 # example: `Collapse React frames`.
-callStack.group.collapseTooltip=Collapse %S frames
+callStack.group.collapseTooltip=Recolher frames %S
 
 # 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
+editor.searchResults1=%d de #1 resultado;%d de #1 resultados
 
 # LOCALIZATION NOTE (editor.noResultsFound): Editor Search bar message
 # for when no results found.
@@ -441,33 +441,33 @@
 
 # LOCALIZATION NOTE (editor.searchResults.nextResult): Editor Search bar
 # tooltip for traversing to the Next Result
-editor.searchResults.nextResult=Next Result
+editor.searchResults.nextResult=Próximo resultado
 
 # LOCALIZATION NOTE (editor.searchResults.prevResult): Editor Search bar
 # tooltip for traversing to the Previous Result
-editor.searchResults.prevResult=Previous Result
+editor.searchResults.prevResult=Resultado anterior
 
 # LOCALIZATION NOTE (editor.continueToHere.label): Editor gutter context
 # menu item for jumping to a new paused location
-editor.continueToHere.label=Continue to here
-editor.continueToHere.accesskey=H
+editor.continueToHere.label=Continuar até aqui
+editor.continueToHere.accesskey=q
 
 # LOCALIZATION NOTE (editor.addBreakpoint): Editor gutter context menu item
 # for adding a breakpoint on a line.
-editor.addBreakpoint=Add Breakpoint
+editor.addBreakpoint=Adicionar breakpoint
 
 # LOCALIZATION NOTE (editor.disableBreakpoint): Editor gutter context menu item
 # for disabling a breakpoint on a line.
-editor.disableBreakpoint=Disable Breakpoint
+editor.disableBreakpoint=Desativar breakpoint
 editor.disableBreakpoint.accesskey=D
 
 # LOCALIZATION NOTE (editor.enableBreakpoint): Editor gutter context menu item
 # for enabling a breakpoint on a line.
-editor.enableBreakpoint=Enable Breakpoint
+editor.enableBreakpoint=Ativar breakpoint
 
 # LOCALIZATION NOTE (editor.removeBreakpoint): Editor gutter context menu item
 # for removing a breakpoint on a line.
-editor.removeBreakpoint=Remove Breakpoint
+editor.removeBreakpoint=Remover breakpoint
 
 # LOCALIZATION NOTE (editor.addConditionBreakpoint): Editor gutter context
 # menu item for adding a breakpoint condition on a line.
@@ -480,36 +480,36 @@
 
 # LOCALIZATION NOTE (editor.addLogPoint): Editor gutter context
 # menu item for adding a log point on a line.
-editor.addLogPoint=Adicionar registro
-editor.addLogPoint.accesskey=r
+editor.addLogPoint=Adicionar log
+editor.addLogPoint.accesskey=l
 
 # LOCALIZATION NOTE (editor.editLogPoint): Editor gutter context menu item
 # for editing a log point already set on a line.
-editor.editLogPoint=Editar registro
+editor.editLogPoint=Editar log
 editor.editLogPoint.accesskey=E
 
 # LOCALIZATION NOTE (editor.removeLogPoint): Context menu item for removing
 # a log point on a line.
-editor.removeLogPoint.label=Remove log
+editor.removeLogPoint.label=Remover log
 editor.removeLogPoint.accesskey=V
 
 # LOCALIZATION NOTE (editor.conditionalPanel.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component
-editor.conditionalPanel.placeholder2=Breakpoint condition, e.g. items.length > 0
+editor.conditionalPanel.placeholder2=Condição de breakpoint, por exemplo, items.length > 0
 
 # LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component when a log point is set
-editor.conditionalPanel.logPoint.placeholder2=Log message, e.g. displayName
+editor.conditionalPanel.logPoint.placeholder2=Mensagem de log, por exemplo, displayName
 
 # LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item
 # for navigating to a source mapped location
-editor.jumpToMappedLocation1=Jump to %S location
-editor.jumpToMappedLocation1.accesskey=m
+editor.jumpToMappedLocation1=Pular para local %S
+editor.jumpToMappedLocation1.accesskey=P
 
 # LOCALIZATION NOTE (downloadFile.label): Context menu item
 # for downloading a source's content
-downloadFile.label=Download file
-downloadFile.accesskey=d
+downloadFile.label=Baixar arquivo
+downloadFile.accesskey=B
 
 # LOCALIZATION NOTE (inlinePreview.show.label): Context menu item
 # for showing the inline preview blocks
@@ -517,7 +517,7 @@
 
 # LOCALIZATION NOTE (inlinePreview.hide.label): Context menu item
 # for hiding the inline preview block
-inlinePreview.hide.label=Hide inline preview
+inlinePreview.hide.label=Ocultar visão inline
 
 # LOCALIZATION NOTE (inlinePreview.toggle.label): Context menu item
 # that will toggle display of inline preview
@@ -525,34 +525,34 @@
 
 # LOCALIZATION NOTE (inlinePreview.toggle.tooltip): Context menu item
 # tooltip that will describe toggling inline preview
-inlinePreview.toggle.tooltip=Show inline preview in the debugger editor
+inlinePreview.toggle.tooltip=Exibir visão inline no editor do debugger
 
 # LOCALIZATION NOTE (editorWrapping.show.label): Context menu item
 # for showing the wrap lines block
-editorWrapping.show.label=Wrap lines
+editorWrapping.show.label=Quebrar linhas
 
 # LOCALIZATION NOTE (editorWrapping.hide.label): Context menu item
 # for showing the wrap lines block
-editorWrapping.hide.label=Unwrap lines
+editorWrapping.hide.label=Não quebrar linhas
 
 # LOCALIZATION NOTE (editorWrapping.toggle.label): Context menu item
 # label for toggling the lines wrapping feature
-editorWrapping.toggle.label=Wrap Lines
+editorWrapping.toggle.label=Quebrar linhas
 
 # LOCALIZATION NOTE (editorWrapping.toggle.tooltip): Context menu item
 # tooltip for toggling the lines wrapping feature
-editorWrapping.toggle.tooltip=Wrap lines in the debugger editor
+editorWrapping.toggle.tooltip=Quebrar linhas no editor do debugger
 
 # LOCALIZATION NOTE (settings.button.label): Label for Settings button
-settings.button.label=Debugger Settings
+settings.button.label=Configurações do debugger
 
 # LOCALIZATION NOTE (settings.disableJavaScript.label): Context menu item
 # label for disabling JavaScript
-settings.disableJavaScript.label=Disable JavaScript
+settings.disableJavaScript.label=Desativar JavaScript
 
 # LOCALIZATION NOTE (settings.disableJavaScript.tooltip): Context menu item
 # tooltip for disabling JavaScript
-settings.disableJavaScript.tooltip=Disables JavaScript (Requires refresh)
+settings.disableJavaScript.tooltip=Desativa JavaScript (precisa recarregar)
 
 # LOCALIZATION NOTE (settings.toggleSourceMaps.tooltip): Context menu item
 # tooltip for toggling the source maps feature
@@ -564,7 +564,7 @@
 
 # LOCALIZATION NOTE (preview.noProperties): Label shown in the preview
 # popup when there are no properties to show.
-preview.noProperties=No properties
+preview.noProperties=Nenhuma propriedade
 
 # LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
 # context menu to disable framework grouping.
@@ -577,86 +577,86 @@
 framework.enableGrouping.accesskey=u
 
 # LOCALIZATION NOTE (generated): Source Map term for a server source location
-generated=generated
+generated=gerado
 
 # LOCALIZATION NOTE (original): Source Map term for a debugger UI source location
 original=original
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
-expressions.placeholder=Add Watch Expression
+expressions.placeholder=Adicionar expressão de monitoramento
 
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
 expressions.errorMsg=Expressão inválida…
-expressions.label=Add watch expression
+expressions.label=Adicionar expressão de monitoramento
 expressions.accesskey=e
-expressions.remove.tooltip=Remove watch expression
+expressions.remove.tooltip=Remover expressão de monitoramento
 
 # LOCALIZATION NOTE (xhrBreakpoints.header): The pause on any XHR breakpoints headings
-xhrBreakpoints.header=XHR Breakpoints
-xhrBreakpoints.placeholder=Break when URL contains
-xhrBreakpoints.label=Add XHR breakpoint
+xhrBreakpoints.header=Breakpoints XHR
+xhrBreakpoints.placeholder=Interromper quando a URL conter
+xhrBreakpoints.label=Adicionar breakpoint XHR
 
 # LOCALIZATION NOTE (xhrBreakpoints.item.label): message displayed when reaching a breakpoint for XHR requests. %S is replaced by the path provided as condition for the breakpoint.
-xhrBreakpoints.item.label=URL contains “%S�
+xhrBreakpoints.item.label=URL contém “%S�
 
 # LOCALIZATION NOTE (pauseOnAnyXHR): The pause on any XHR checkbox description
 # when the debugger will pause on any XHR requests.
-pauseOnAnyXHR=Pause on any URL
+pauseOnAnyXHR=Pausar em qualquer URL
 
 # LOCALIZATION NOTE (watchpoints.submenu): This is the text for the watchpoints sub-menu.
-watchpoints.submenu=Break on…
+watchpoints.submenu=Interromper ao…
 
 # LOCALIZATION NOTE (watchpoints.getWatchpoint): This is the text that appears in the
 # watchpoints sub-menu to add a "get" watchpoint on an object property.
-watchpoints.getWatchpoint=Property get
+watchpoints.getWatchpoint=Obter propriedade
 
 # LOCALIZATION NOTE (watchpoints.setWatchpoint): This is the text that appears in the
 # watchpoints submenu to add a "set" watchpoint on an object property.
-watchpoints.setWatchpoint=Property set
+watchpoints.setWatchpoint=Definir propriedade
 
 # LOCALIZATION NOTE (watchpoints.getOrSetWatchpoint): This is the text that appears in the
 # watchpoints submenu to add a "set" watchpoint on an object property.
-watchpoints.getOrSetWatchpoint=Property get or set
+watchpoints.getOrSetWatchpoint=Obter ou definir propriedade
 
 # 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
+watchpoints.removeWatchpoint=Remover watchpoint
 
 # LOCALIZATION NOTE (watchpoints.removeWatchpointTooltip): This is the text that appears in the
 # tooltip to delete a watchpoint on an object property.
-watchpoints.removeWatchpointTooltip=Remove watchpoint
+watchpoints.removeWatchpointTooltip=Remover watchpoint
 
 # LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item
 # for closing the selected tab below the mouse.
-sourceTabs.closeTab=Close tab
+sourceTabs.closeTab=Fechar aba
 sourceTabs.closeTab.accesskey=c
 sourceTabs.closeTab.key=CmdOrCtrl+W
 
 # LOCALIZATION NOTE (sourceTabs.closeOtherTabs): Editor source tab context menu item
 # for closing the other tabs.
-sourceTabs.closeOtherTabs=Close others
+sourceTabs.closeOtherTabs=Fechar outras abas
 sourceTabs.closeOtherTabs.accesskey=o
 
 # LOCALIZATION NOTE (sourceTabs.closeTabsToEnd): Editor source tab context menu item
 # for closing the tabs to the end (the right for LTR languages) of the selected tab.
-sourceTabs.closeTabsToEnd=Close tabs to the right
+sourceTabs.closeTabsToEnd=Fechar abas à direita
 sourceTabs.closeTabsToEnd.accesskey=e
 
 # LOCALIZATION NOTE (sourceTabs.closeAllTabs): Editor source tab context menu item
 # for closing all tabs.
-sourceTabs.closeAllTabs=Close all tabs
+sourceTabs.closeAllTabs=Fechar todas as abas
 sourceTabs.closeAllTabs.accesskey=a
 
 # LOCALIZATION NOTE (sourceTabs.revealInTree): Editor source tab context menu item
 # for revealing source in tree.
-sourceTabs.revealInTree=Reveal in Tree
+sourceTabs.revealInTree=Revelar na árvore
 sourceTabs.revealInTree.accesskey=r
 
 # LOCALIZATION NOTE (sourceTabs.prettyPrint): Editor source tab context menu item
 # for pretty printing the source.
-sourceTabs.prettyPrint=Pretty Print Source
+sourceTabs.prettyPrint=Formatar fonte para impressão
 sourceTabs.prettyPrint.accesskey=p
 
 # LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated
@@ -679,64 +679,64 @@
 
 # LOCALIZATION NOTE (sourceFooter.ignores): Tooltip text associated
 # with the ignores button
-sourceFooter.ignore=Ignore source
+sourceFooter.ignore=Ignorar fonte
 
 # LOCALIZATION NOTE (sourceFooter.unignore): Tooltip text associated
 # with the ignore button
-sourceFooter.unignore=Unignore source
+sourceFooter.unignore=Deixar de ignorar fonte
 
 # LOCALIZATION NOTE (ignoreContextItem.ignore): Text associated
 # with the ignore context menu item
-ignoreContextItem.ignore=Ignore source
+ignoreContextItem.ignore=Ignorar fonte
 ignoreContextItem.ignore.accesskey=I
 
 # LOCALIZATION NOTE (ignoreContextItem.unignore): Text associated
 # with the unignore context menu item
-ignoreContextItem.unignore=Unignore source
+ignoreContextItem.unignore=Deixar de ignorar fonte
 ignoreContextItem.unignore.accesskey=U
 
 # LOCALIZATION NOTE (sourceFooter.mappedSource): Text associated
 # with a mapped source. %S is replaced by the source map origin.
-sourceFooter.mappedSource=(From %S)
+sourceFooter.mappedSource=(de %S)
 
 # LOCALIZATION NOTE (sourceFooter.mappedSourceTooltip): Tooltip text associated
 # with a mapped source. %S is replaced by the source map origin.
-sourceFooter.mappedSourceTooltip=(Source mapped from %S)
+sourceFooter.mappedSourceTooltip=(fonte mapeado de %S)
 
 # LOCALIZATION NOTE (sourceFooter.mappedSuffix): Text associated
 # with a mapped source.  Displays next to URLs in tree and tabs.
-sourceFooter.mappedSuffix=(mapped)
+sourceFooter.mappedSuffix=(mapeado)
 
 # LOCALIZATION NOTE (sourceFooter.currentCursorPosition): Text associated
 # with the current cursor line and column
-sourceFooter.currentCursorPosition=(%S, %S)
+sourceFooter.currentCursorPosition=(%1$S, %2$S)
 
 # LOCALIZATION NOTE (sourceFooter.currentCursorPosition.tooltip): Text associated
 # with the current cursor line and column
-sourceFooter.currentCursorPosition.tooltip=(Line %1$S, column %2$S)
+sourceFooter.currentCursorPosition.tooltip=(linha %1$S, coluna %2$S)
 
 # LOCALIZATION NOTE (sourceTabs.closeTabButtonTooltip): The tooltip that is displayed
 # for close tab button in source tabs.
-sourceTabs.closeTabButtonTooltip=Close tab
+sourceTabs.closeTabButtonTooltip=Fechar aba
 
 # LOCALIZATION NOTE (scopes.header): Scopes right sidebar pane header.
 scopes.header=Scopes
 
 # LOCALIZATION NOTE (scopes.notAvailable): Scopes right sidebar pane message
 # for when the debugger is paused, but there isn't pause data.
-scopes.notAvailable=Scopes Unavailable
+scopes.notAvailable=Scopes não disponível
 
 # LOCALIZATION NOTE (scopes.notPaused): Scopes right sidebar pane message
 # for when the debugger is not paused.
-scopes.notPaused=Not Paused
+scopes.notPaused=Não pausado
 
 # LOCALIZATION NOTE (scopes.mapping.label): Scopes right sidebar pane
 # tooltip for checkbox and label
-scopes.mapping.label=Map original variable names
+scopes.mapping.label=Mapear nomes originais de variáveis
 
 # LOCALIZATION NOTE (eventlisteners.log.label): Event listeners tooltip for
 # checkbox and label
-eventlisteners.log.label=Log events to the console
+eventlisteners.log.label=Logar eventos no console
 
 # LOCALIZATION NOTE (eventlisteners.log): Checkbox label for logging events
 eventlisteners.log=Log
@@ -750,31 +750,31 @@
 
 # LOCALIZATION NOTE (scopes.block): Refers to a block of code in
 # the scopes pane when the debugger is paused.
-scopes.block=Block
+scopes.block=Bloco
 
 # LOCALIZATION NOTE (sources.header): Sources left sidebar header
-sources.header=Sources
+sources.header=Fontes
 
 # LOCALIZATION NOTE (outline.header): Outline left sidebar header
 outline.header=Outline
 
 # LOCALIZATION NOTE (outline.placeholder): Placeholder text for the filter input
 # element
-outline.placeholder=Filter functions
+outline.placeholder=Filtrar funções
 
 # LOCALIZATION NOTE (outline.sortLabel): Label for the sort button
-outline.sortLabel=Sort by name
+outline.sortLabel=Ordenar por nome
 
 # LOCALIZATION NOTE (outline.noFunctions): Outline text when there are no functions to display
-outline.noFunctions=No functions
+outline.noFunctions=Nenhuma função
 
 # LOCALIZATION NOTE (outline.noFileSelected): Outline text when there are no files selected
-outline.noFileSelected=No file selected
+outline.noFileSelected=Nenhum arquivo selecionado
 
 # LOCALIZATION NOTE (sources.search): Sources left sidebar prompt
 # e.g. Cmd+P to search. On a mac, we use the command unicode character.
 # On windows, it's ctrl.
-sources.search=%S to search
+sources.search=%S para pesquisar
 
 # LOCALIZATION NOTE (watchExpressions.header): Watch Expressions right sidebar
 # pane header.
@@ -782,64 +782,64 @@
 
 # LOCALIZATION NOTE (watchExpressions.refreshButton): Watch Expressions header
 # button for refreshing the expressions.
-watchExpressions.refreshButton=Refresh
+watchExpressions.refreshButton=Atualizar
 
 # LOCALIZATION NOTE (welcome.search): The center pane welcome panel's
 # search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on
 # a mac we use the unicode character.
-welcome.search=%S to search for files
+welcome.search=%S para procurar fontes
 
 # LOCALIZATION NOTE (welcome.search2): The center pane welcome panel's
 # search prompt. e.g. cmd+p to search for files. On windows, it's ctrl, on
 # a mac we use the unicode character.
-welcome.search2=%S Go to file
+welcome.search2=%S Ir para arquivo
 
 # LOCALIZATION NOTE (welcome.findInFiles): The center pane welcome panel's
 # search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on
 # a mac we use the unicode character.
-welcome.findInFiles=%S to find in files
+welcome.findInFiles=%S para procurar em arquivos
 
 # LOCALIZATION NOTE (welcome.findInFiles2): The center pane welcome panel's
 # search prompt. e.g. cmd+f to search for files. On windows, it's ctrl+shift+f, on
 # a mac we use the unicode character.
-welcome.findInFiles2=%S Find in files
+welcome.findInFiles2=%S Procurar em arquivos
 
 # LOCALIZATION NOTE (welcome.allShortcuts): The label to open the modal of
 # shortcuts, displayed in the welcome panel.
-welcome.allShortcuts=Show all shortcuts
+welcome.allShortcuts=Exibir todos os atalhos
 
 # LOCALIZATION NOTE (sourceSearch.search): The center pane Source Search
 # prompt for searching for files.
-sourceSearch.search=Search…
+sourceSearch.search=Pesquisar fontes…
 
 # LOCALIZATION NOTE (sourceSearch.search2): The center pane Source Search
 # prompt for searching for files.
-sourceSearch.search2=Go to file…
+sourceSearch.search2=Ir para arquivo…
 
 # LOCALIZATION NOTE (pauseOnExceptions): The pause on exceptions button tooltip
 # when the debugger will pause on all exceptions.
-pauseOnExceptions=Pause on all exceptions. Click to ignore exceptions
+pauseOnExceptions=Pausar em todas as exceções. Clique para ignorar exceções
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the loading process has started but there is no file to display
 # yet.
-loadingText=Loading\u2026
+loadingText=Carregando\u2026
 
 # LOCALIZATION NOTE (wasmIsNotAvailable): The text that is displayed in the
 # script editor when the WebAssembly source is not available.
-wasmIsNotAvailable=Please refresh to debug this module
+wasmIsNotAvailable=Atualize para depurar este módulo
 
 # LOCALIZATION NOTE (errorLoadingText3): The text that is displayed in the debugger
 # viewer when there is an error loading a file
-errorLoadingText3=Error loading this URI: %S
+errorLoadingText3=Erro ao carregar esta URI: %S
 
 # LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder
 # text displayed when the user searches for specific lines in a file
-gotoLineModal.placeholder=Go to line…
+gotoLineModal.placeholder=Ir para linha…
 
 # LOCALIZATION NOTE(gotoLineModal.title): The message shown to users
 # to open the go to line modal
-gotoLineModal.title=Ir para uma linha em um arquivo
+gotoLineModal.title=Ir para um número de linha em um arquivo
 
 # LOCALIZATION NOTE(gotoLineModal.key3): The shortcut for opening the
 # go to line modal
@@ -849,13 +849,13 @@
 
 # LOCALIZATION NOTE(symbolSearch.search.functionsPlaceholder): The placeholder
 # text displayed when the user searches for functions in a file
-symbolSearch.search.functionsPlaceholder=Search functions…
-symbolSearch.search.functionsPlaceholder.title=Pesquisar uma função em um arquivo
+symbolSearch.search.functionsPlaceholder=Procurar funções…
+symbolSearch.search.functionsPlaceholder.title=Procurar uma função em um arquivo
 
 # LOCALIZATION NOTE(symbolSearch.search.variablesPlaceholder): The placeholder
 # text displayed when the user searches for variables in a file
-symbolSearch.search.variablesPlaceholder=Search variables…
-symbolSearch.search.variablesPlaceholder.title=Search for a variable in a file
+symbolSearch.search.variablesPlaceholder=Procurar variáveis…
+symbolSearch.search.variablesPlaceholder.title=Procurar uma variável em um arquivo
 
 # LOCALIZATION NOTE(symbolSearch.search.key2): The Key Shortcut for
 # searching for a function or variable
@@ -865,7 +865,7 @@
 
 # LOCALIZATION NOTE(symbolSearch.searchModifier.modifiersLabel): A label
 # preceding the group of modifiers
-symbolSearch.searchModifier.modifiersLabel=Modifiers:
+symbolSearch.searchModifier.modifiersLabel=Modificadores:
 
 # LOCALIZATION NOTE(symbolSearch.searchModifier.regex): A search option
 # when searching text in a file
@@ -873,98 +873,98 @@
 
 # LOCALIZATION NOTE(symbolSearch.searchModifier.caseSensitive): A search option
 # when searching text in a file
-symbolSearch.searchModifier.caseSensitive=Case sensitive
+symbolSearch.searchModifier.caseSensitive=Diferenciar maiúsc./minúsc.
 
 # LOCALIZATION NOTE(symbolSearch.searchModifier.wholeWord): A search option
 # when searching text in a file
-symbolSearch.searchModifier.wholeWord=Whole word
+symbolSearch.searchModifier.wholeWord=Palavra inteira
 
-experimental=This is an experimental feature
+experimental=Este é um recurso experimental
 
 # LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed
 # in a info block explaining how the debugger is currently paused due to a `debugger`
 # statement in the code
-whyPaused.debuggerStatement=Paused on debugger statement
+whyPaused.debuggerStatement=Pausado em instrução do depurador
 
 # LOCALIZATION NOTE (whyPaused.breakpoint): The text that is displayed
 # in a info block explaining how the debugger is currently paused on a breakpoint
-whyPaused.breakpoint=Paused on breakpoint
+whyPaused.breakpoint=Pausado em 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
+whyPaused.eventBreakpoint=Pausado em breakpoint de evento
 
 # 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
+whyPaused.exception=Pausado em exceção
 
 # 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
+whyPaused.mutationBreakpoint=Pausado em mutação do DOM
 
 # LOCALIZATION NOTE (whyPaused.mutationBreakpointAdded): The text that
 # is displayed to describe an added node which triggers a subtree modification
-whyPaused.mutationBreakpointAdded=Added:
+whyPaused.mutationBreakpointAdded=Adicionado:
 
 # LOCALIZATION NOTE (whyPaused.mutationBreakpointRemoved): The text that
 # is displayed to describe a removed node which triggers a subtree modification
-whyPaused.mutationBreakpointRemoved=Removed:
+whyPaused.mutationBreakpointRemoved=Removido:
 
 # 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
+whyPaused.interrupted=Pausado em execução
 
 # 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
-whyPaused.resumeLimit=Paused while stepping
+whyPaused.resumeLimit=Pausado em step
 
 # LOCALIZATION NOTE (whyPaused.pauseOnDOMEvents): The text that is displayed
 # in a info block explaining how the debugger is currently paused on a
 # dom event
-whyPaused.pauseOnDOMEvents=Paused on event listener
+whyPaused.pauseOnDOMEvents=Pausado em event listener
 
 # LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed
 # in an info block when evaluating a conditional breakpoint throws an error
-whyPaused.breakpointConditionThrown=Error with conditional breakpoint
+whyPaused.breakpointConditionThrown=Erro com breakpoint condicional
 
 # LOCALIZATION NOTE (whyPaused.XHR): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an
 # xml http request
-whyPaused.XHR=Paused on XMLHttpRequest
+whyPaused.XHR=Pausado em XMLHttpRequest
 
 # LOCALIZATION NOTE (whyPaused.promiseRejection): The text that is displayed
 # in a info block explaining how the debugger is currently paused on a
 # promise rejection
-whyPaused.promiseRejection=Paused on promise rejection
+whyPaused.promiseRejection=Pausado em 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
+whyPaused.getWatchpoint=Pausado ao obter propriedade
 
 # LOCALIZATION NOTE (whyPaused.setWatchpoint): The text that is displayed
 # in an info block explaining how the debugger is currently paused at a
 # watchpoint on an object property
-whyPaused.setWatchpoint=Paused on property set
+whyPaused.setWatchpoint=Pausado ao definir propriedade
 
 # LOCALIZATION NOTE (whyPaused.assert): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an
 # assert
-whyPaused.assert=Paused on assertion
+whyPaused.assert=Pausado em assertion
 
 # LOCALIZATION NOTE (whyPaused.debugCommand): The text that is displayed
 # in a info block explaining how the debugger is currently paused on a
 # debugger statement
-whyPaused.debugCommand=Paused on debugged function
+whyPaused.debugCommand=Pausado em função depurada
 
 # LOCALIZATION NOTE (whyPaused.other): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an event
 # listener breakpoint set
-whyPaused.other=Debugger paused
+whyPaused.other=Debugger pausado
 
 # LOCALIZATION NOTE (ctrl): The text that is used for documenting
 # keyboard shortcuts that use the control key
@@ -978,24 +978,24 @@
 # LOCALIZATION NOTE (stacktrace.asyncStack): this string is used to
 # indicate that a given stack frame has an async parent.
 # %S is the "Async Cause" of the frame.
-stacktrace.asyncStack=(Async: %S)
+stacktrace.asyncStack=(assíncrono: %S)
 
 # LOCALIZATION NOTE (shortcuts.toggleBreakpoint): text describing
 # keyboard shortcut action for toggling breakpoint
-shortcuts.toggleBreakpoint=Toggle Breakpoint
+shortcuts.toggleBreakpoint=Alternar breakpoint
 shortcuts.toggleBreakpoint.accesskey=B
 
 # LOCALIZATION NOTE (shortcuts.toggleCondPanel.breakpoint): text describing
 # keyboard shortcut action for toggling conditional panel for breakpoints
-shortcuts.toggleCondPanel.breakpoint=Edit Conditional Breakpoint
+shortcuts.toggleCondPanel.breakpoint=Editar breakpoint condicional
 
 # LOCALIZATION NOTE (shortcuts.toggleCondPanel.logPoint): text describing
 # keyboard shortcut action for toggling conditional panel for log points
-shortcuts.toggleCondPanel.logPoint=Edit Log Point
+shortcuts.toggleCondPanel.logPoint=Editar ponto de log
 
 # LOCALIZATION NOTE (shortcuts.pauseOrResume): text describing
 # keyboard shortcut action for pause of resume
-shortcuts.pauseOrResume=Pause/Resume
+shortcuts.pauseOrResume=Pausar/Continuar
 
 # LOCALIZATION NOTE (shortcuts.stepOver): text describing
 # keyboard shortcut action for stepping over
@@ -1011,60 +1011,59 @@
 
 # LOCALIZATION NOTE (shortcuts.fileSearch): text describing
 # keyboard shortcut action for source file search
-shortcuts.fileSearch=Source File Search
+shortcuts.fileSearch=Pesquisa em arquivo fonte
 
 # LOCALIZATION NOTE (shortcuts.fileSearch2): text describing
 # keyboard shortcut action for source file search
-shortcuts.fileSearch2=Go to file
+shortcuts.fileSearch2=Ir para arquivo
 
 # LOCALIZATION NOTE (shortcuts.gotoLine): text describing
 # keyboard shortcut for jumping to a specific line
-shortcuts.gotoLine=Go to line
+shortcuts.gotoLine=Ir para linha
 
 # LOCALIZATION NOTE (shortcuts.searchAgain): text describing
 # keyboard shortcut action for searching again
-shortcuts.searchAgain=Search Again
+shortcuts.searchAgain=Procurar novamente
 
 # LOCALIZATION NOTE (shortcuts.searchAgain2): text describing
 # keyboard shortcut action for searching again
-shortcuts.searchAgain2=Find next
+shortcuts.searchAgain2=Procurar próximo
 
 # LOCALIZATION NOTE (shortcuts.projectSearch): text describing
 # keyboard shortcut action for full project search
-shortcuts.projectSearch=Full Project Search
+shortcuts.projectSearch=Pesquisa no projeto todo
 
 # LOCALIZATION NOTE (shortcuts.projectSearch2): text describing
 # keyboard shortcut action for full project search
-shortcuts.projectSearch2=Find in files
+shortcuts.projectSearch2=Procurar em arquivos
 
 # LOCALIZATION NOTE (shortcuts.functionSearch): text describing
 # keyboard shortcut action for function search
-shortcuts.functionSearch=Function Search
+shortcuts.functionSearch=Pesquisa de funções
 
 # LOCALIZATION NOTE (shortcuts.functionSearch2): text describing
 # keyboard shortcut action for function search
-shortcuts.functionSearch2=Find function
+shortcuts.functionSearch2=Procurar função
 
 # LOCALIZATION NOTE (shortcuts.buttonName): text describing
 # keyboard shortcut button text
-shortcuts.buttonName=Keyboard shortcuts
+shortcuts.buttonName=Atalhos de teclado
 
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
-variablesViewOptimizedOut=(optimized away)
-variablesViewUninitialized=(uninitialized)
-variablesViewMissingArgs=(unavailable)
+variablesViewOptimizedOut=(removido por otimização)
+variablesViewUninitialized=(não inicializado)
+variablesViewMissingArgs=(não disponível)
 
 # 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
+variablesDomNodeValueTooltip=Clique para selecionar o nó no inspetor
 
 # 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
+variablesEditButtonTooltip=Clique para definir valor
 
 # LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
 # shown before the stack trace in an error.
@@ -1077,19 +1076,19 @@
 # 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…
+variablesViewMoreObjects=mais #1…;mais #1…
 
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
-variablesEditableNameTooltip=Double click to edit
+variablesEditableNameTooltip=Duplo clique para editar
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in the variables list on an item with an editable value.
-variablesEditableValueTooltip=Click to change value
+variablesEditableValueTooltip=Clique para alterar valor
 
 # LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
 # in the variables list on an item which can be removed.
-variablesCloseButtonTooltip=Click to remove
+variablesCloseButtonTooltip=Clique para remover
 
 # LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
 # in the variables list on certain variables or properties as tooltips.
@@ -1099,13 +1098,13 @@
 # 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
+configurableTooltip=configurável
+enumerableTooltip=enumerável
+writableTooltip=gravável
+frozenTooltip=congelado
+sealedTooltip=selado
+extensibleTooltip=extensível
+overriddenTooltip=substituído
 WebIDLTooltip=WebIDL
 
 # LOCALIZATION NOTE (serviceWorkerInfo.parsed): State displayed for a service
@@ -1113,19 +1112,19 @@
 serviceWorkerInfo.parsed=parsed
 # LOCALIZATION NOTE (serviceWorkerInfo.installing): State displayed for a
 # service worker that is being installed.
-serviceWorkerInfo.installing=installing
+serviceWorkerInfo.installing=instalando
 # LOCALIZATION NOTE (serviceWorkerInfo.installed): State displayed for a
 # service worker that has finished being installed.
-serviceWorkerInfo.installed=installed
+serviceWorkerInfo.installed=instalado
 # LOCALIZATION NOTE (serviceWorkerInfo.activating): State displayed for a
 # service worker that is being activated.
-serviceWorkerInfo.activating=activating
+serviceWorkerInfo.activating=ativando
 # LOCALIZATION NOTE (serviceWorkerInfo.activated): State displayed for a
 # service worker that has finished being activated.
-serviceWorkerInfo.activated=activated
+serviceWorkerInfo.activated=ativado
 # LOCALIZATION NOTE (serviceWorkerInfo.redundant): State displayed for a
 # service worker that is redundant.
-serviceWorkerInfo.redundant=redundant
+serviceWorkerInfo.redundant=redundante
 # LOCALIZATION NOTE (serviceWorkerInfo.unknown): State displayed for a
 # service worker that is in an unknown state.
-serviceWorkerInfo.unknown=unknown
+serviceWorkerInfo.unknown=desconhecido
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/device.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/device.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/device.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/device.properties	2021-01-18 20:07:36.000000000 +0000
@@ -12,9 +12,9 @@
 # LOCALIZATION NOTE:
 # These strings are category names in a list of devices that a user can choose
 # to simulate (e.g. "ZTE Open C", "VIA Vixen", "720p HD Television", etc).
-device.phones=Phones
+device.phones=Celulares
 device.tablets=Tablets
-device.laptops=Laptops
+device.laptops=Notebooks
 device.televisions=TVs
-device.consoles=Gaming consoles
-device.watches=Watches
+device.consoles=Consoles de jogos
+device.watches=Relógios
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/font-inspector.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/font-inspector.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/font-inspector.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/font-inspector.properties	2021-01-18 20:07:36.000000000 +0000
@@ -7,63 +7,63 @@
 
 # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
 # system font.
-fontinspector.system=system
+fontinspector.system=sistema
 
 # LOCALIZATION NOTE (fontinspector.noFontsUsedOnCurrentElement): This label is shown when
 # no fonts were used on the selected element.
-fontinspector.noFontsUsedOnCurrentElement=No fonts used on the current element.
+fontinspector.noFontsUsedOnCurrentElement=Nenhuma fonte usada no elemento atual.
 
 # LOCALIZATION NOTE (fontinspector.copyURL): This is the text that appears in a tooltip
 # displayed when the user hovers over the copy icon next to the font URL.
 # Clicking the copy icon copies the full font URL to the user's clipboard
-fontinspector.copyURL=Copy URL
+fontinspector.copyURL=Copiar URL
 
 # LOCALIZATION NOTE (fontinspector.customInstanceName): Think of instances as presets
 # (groups of settings that apply in bulk to a thing). Instances have names. When the user
 # creates a new instance, it doesn't have a name. This is the text that appears as the
 # default name for a new instance. It shows up in a dropdown from which users can select
 # between predefined instances and this custom instance.
-fontinspector.customInstanceName=Custom
+fontinspector.customInstanceName=Personalizado
 
 # LOCALIZATION NOTE (fontinspector.fontInstanceLabel): This label is shown next to the UI
 # in the font editor which allows a user to select a font instance option from a
 # dropdown. An instance is like a preset. A "font instance" is the term used by the font
 # authors to mean a group of predefined font settings.
-fontinspector.fontInstanceLabel=Instance
+fontinspector.fontInstanceLabel=Instância
 
 # LOCALIZATION NOTE (fontinspector.fontSizeLabel): This label is shown next to the UI
 # in the font editor which allows the user to change the font size.
-fontinspector.fontSizeLabel=Size
+fontinspector.fontSizeLabel=Tamanho
 
 # LOCALIZATION NOTE (fontinspector.fontWeightLabel): This label is shown next to the UI
 # in the font editor which allows the user to change the font weight.
-fontinspector.fontWeightLabel=Weight
+fontinspector.fontWeightLabel=Peso
 
 # LOCALIZATION NOTE (fontinspector.fontItalicLabel): This label is shown next to the UI
 # in the font editor which allows the user to change the style of the font to italic.
-fontinspector.fontItalicLabel=Italic
+fontinspector.fontItalicLabel=Itálico
 
 # LOCALIZATION NOTE (fontinspector.showMore): Label for a collapsed list of fonts.
-fontinspector.showMore=Show more
+fontinspector.showMore=Mostrar mais
 
 # LOCALIZATION NOTE (fontinspector.showLess): Label for an expanded list of fonts.
-fontinspector.showLess=Show less
+fontinspector.showLess=Mostrar menos
 
 # LOCALIZATION NOTE (fontinspector.letterSpacingLabel): Label for the UI to change the
 # letter spacing in the font editor.
-fontinspector.letterSpacingLabel=Spacing
+fontinspector.letterSpacingLabel=Espaçamento
 
 # LOCALIZATION NOTE (fontinspector.lineHeightLabelCapitalized): Label for the UI to change the line height in the font editor.
-fontinspector.lineHeightLabelCapitalized=Line Height
+fontinspector.lineHeightLabelCapitalized=Altura da linha
 
 # LOCALIZATION NOTE (fontinspector.allFontsOnPageHeader): Header for the section listing
 # all the fonts on the current page.
-fontinspector.allFontsOnPageHeader=Todas as fontes na página
+fontinspector.allFontsOnPageHeader=Todos as fontes na página
 
 # LOCALIZATION NOTE (fontinspector.fontsUsedLabel): Label for the Font Editor section
 # which shows the fonts used on the selected element.
-fontinspector.fontsUsedLabel=Fonts Used
+fontinspector.fontsUsedLabel=Fontes usadas
 
 # LOCALIZATION NOTE (fontinspector.previewTextPlaceholder): Placeholder for the input
 # where the user can type text to get a preview of it using a font.
-fontinspector.previewTextPlaceholder=Font preview text
+fontinspector.previewTextPlaceholder=Texto de visualização da fonte
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/markers.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/markers.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/markers.properties	2021-01-18 20:07:36.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Ciclo de coleta concluído
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/memory.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/memory.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/memory.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/memory.properties	2021-01-18 20:07:36.000000000 +0000
@@ -355,7 +355,7 @@
 
 # LOCALIZATION NOTE (heapview.field.retainedSize.tooltip): The tooltip for the
 # column header in the dominator tree view for retained byte sizes.
-heapview.field.retainedSize.tooltip=A soma do tamanho do próprio objeto e os tamanhos de todos os outros objetos mantidos vivos por ele
+heapview.field.retainedSize.tooltip=Soma do tamanho do próprio objeto e de todos os outros objetos mantidos vivos por ele
 
 # LOCALIZATION NOTE (heapview.field.shallowSize): The name of the column in the
 # dominator tree view for shallow byte sizes.
@@ -363,7 +363,7 @@
 
 # LOCALIZATION NOTE (heapview.field.shallowSize.tooltip): The tooltip for the
 # column header in the dominator tree view for shallow byte sizes.
-heapview.field.shallowSize.tooltip=O tamanho do próprio objeto
+heapview.field.shallowSize.tooltip=Tamanho do próprio objeto
 
 # LOCALIZATION NOTE (dominatortree.field.label): The name of the column in the
 # dominator tree for an object's label.
@@ -371,7 +371,7 @@
 
 # LOCALIZATION NOTE (dominatortree.field.label.tooltip): The tooltip for the column
 # header in the dominator tree view for an object's label.
-dominatortree.field.label.tooltip=O rótulo de um objeto no heap
+dominatortree.field.label.tooltip=Rótulo de um objeto em memória
 
 # LOCALIZATION NOTE (heapview.field.bytes): The name of the column in the heap
 # view for bytes.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/storage.ftl firefox-85.0+build1/l10n/pt-BR/devtools/client/storage.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/storage.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/storage.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -7,27 +7,21 @@
 
 # Hint shown when the selected storage host does not contain any data
 storage-table-empty-text = Nenhum dado presente no host selecionado
-
 # Hint shown when the cookies storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/Cookies
 storage-table-type-cookies-hint = Veja e edite cookies selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
 # Hint shown when the local storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/Local_Storage_Session_Storage
-storage-table-type-localstorage-hint = Veja e edite o armazenamento local selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
+storage-table-type-localstorage-hint = Veja e edite armazenamento local selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
 # Hint shown when the session storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/Local_Storage_Session_Storage
-storage-table-type-sessionstorage-hint = Veja e edite o armazenamento de sessão selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
+storage-table-type-sessionstorage-hint = Veja e edite armazenamento de sessão selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
 # Hint shown when the IndexedDB storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/IndexedDB
 storage-table-type-indexeddb-hint = Veja e exclua itens de IndexedDB selecionando um database. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
 # Hint shown when the cache storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/Cache_Storage
-storage-table-type-cache-hint = Veja e exclua os itens de armazenamento em cache selecionando um storage. <a data-l10n-name="learn-more-link">Saiba mais</a>
-
+storage-table-type-cache-hint = Veja e exclua itens de armazenamento em cache selecionando um storage. <a data-l10n-name="learn-more-link">Saiba mais</a>
 # Hint shown when the extension storage type is selected. Clicking the link will open
 # https://developer.mozilla.org/docs/Tools/Storage_Inspector/Extension_Storage
-storage-table-type-extensionstorage-hint = Veja e edite o armazenamento de extensão selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
+storage-table-type-extensionstorage-hint = Veja e edite armazenamento de extensão selecionando um host. <a data-l10n-name="learn-more-link">Saiba mais</a>
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/toolbox.properties firefox-85.0+build1/l10n/pt-BR/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/toolbox.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/toolbox.properties	2021-01-18 20:07:36.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Mostrar console dividido
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/pt-BR/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/client/tooltips.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/client/tooltips.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> não tem efeito nesse elemento porque seu <strong>outline-style</strong> é <strong>auto</strong> ou <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> não tem efeito em elementos internos de tabelas.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> não tem efeito em elementos internos de tabelas, exceto células de tabelas.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Experimente remover <strong>float</strong> ou adicionar <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Experimente definir sua propriedade <strong>position</strong> com algo diferente de <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Experimente adicionar <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Experimente definir sua propriedade <strong>display</strong> para algo diferente de <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Experimente definir sua propriedade <strong>display</strong> como algo diferente de <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Experimente definir sua propriedade <strong>outline-style</strong> como algo diferente de <strong>auto</strong> ou <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/devtools/startup/aboutDevTools.ftl firefox-85.0+build1/l10n/pt-BR/devtools/startup/aboutDevTools.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/devtools/startup/aboutDevTools.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/devtools/startup/aboutDevTools.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -13,21 +13,18 @@
 enable-learn-more-link = Saiba mais sobre o Developer Tools
 enable-enable-button = Ativar ferramentas de desenvolvimento
 enable-close-button = Fechar esta aba
-
 welcome-title = Boas-vindas às ferramentas de desenvolvimento do Firefox!
 newsletter-title = Mozilla Developer Newsletter
 newsletter-message = Receba novidades, truques e recursos para o desenvolvedor diretamente na sua caixa de entrada.
 newsletter-email-placeholder =
-    .placeholder = E-mail
+    .placeholder = Email
 newsletter-privacy-label = Eu aceito a Mozilla lidar com minhas informações conforme explicado nesta <a data-l10n-name="privacy-policy">política de privacidade</a>.
 newsletter-subscribe-button = Inscrever
 newsletter-thanks-title = Obrigado!
-newsletter-thanks-message = Se você não confirmou anteriormente uma inscrição em um boletim informativo relacionado à Mozilla, pode precisar fazê-lo. Verifique se recebeu um e-mail nosso em sua caixa de entrada ou filtro de spam.
-
+newsletter-thanks-message = Se você não confirmou anteriormente uma inscrição em um boletim informativo relacionado à Mozilla, pode precisar fazê-lo. Verifique se recebeu um email nosso em sua caixa de entrada ou filtro de spam.
 footer-title = Firefox Developer Edition
 footer-message = Procurando mais do que as ferramentas de desenvolvimento? Confira o navegador Firefox que é construído especificamente para desenvolvedores e fluxos de trabalho modernos.
 footer-learn-more-link = Saiba mais
-
 features-learn-more = Saiba mais
 features-inspector-title = Inspetor
 features-inspector-desc = Inspecione e refine código para construir layouts perfeitos a cada pixel. <a data-l10n-name="learn-more">{ features-learn-more }</a>
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/accessibility/AccessFu.properties firefox-85.0+build1/l10n/pt-BR/dom/chrome/accessibility/AccessFu.properties
--- firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/accessibility/AccessFu.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/dom/chrome/accessibility/AccessFu.properties	2021-01-18 20:07:36.000000000 +0000
@@ -15,7 +15,7 @@
 document       =       document
 pane           =       pane
 dialog         =       dialog
-separator      =       separator
+separator      =       separador
 toolbar        =       toolbar
 statusbar      =       status bar
 table          =       table
@@ -102,7 +102,7 @@
 
 # Text input types
 textInputType_date   =       date
-textInputType_email  =       e-mail
+textInputType_email  =       email
 textInputType_search =       search
 textInputType_tel    =       telephone
 textInputType_url    =       URL
@@ -129,7 +129,6 @@
 main           =       main
 navigation     =       navigation
 search         =       search
-
 region         =       região
 
 # LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
@@ -211,7 +210,7 @@
 quicknav_List        = Lists
 quicknav_PageTab     = Page tabs
 quicknav_RadioButton = Radio buttons
-quicknav_Separator   = Separators
+quicknav_Separator   = Separadores
 quicknav_Table       = Tables
 quicknav_Checkbox    = Check boxes
 
@@ -244,7 +243,7 @@
 documentAbbr       =       document
 paneAbbr           =       pane
 dialogAbbr         =       dialog
-separatorAbbr      =       separator
+separatorAbbr      =       separador
 toolbarAbbr        =       toolbar
 statusbarAbbr      =       status bar
 tableAbbr          =       tbl
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/accessibility/mac/accessible.properties firefox-85.0+build1/l10n/pt-BR/dom/chrome/accessibility/mac/accessible.properties
--- firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/accessibility/mac/accessible.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/dom/chrome/accessibility/mac/accessible.properties	2021-01-18 20:07:36.000000000 +0000
@@ -55,7 +55,7 @@
 status      =      application status
 timer       =      timer
 tooltip     =      tooltip
-separator    =      separator
+separator    =      separador
 tabPanel     =      tab panel
 # The roleDescription for the html:mark element
 highlight = destacar
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/pt-BR/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/dom/dom.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/dom/chrome/dom/dom.properties	2021-01-18 20:07:36.000000000 +0000
@@ -34,12 +34,12 @@
 FormValidationRadioMissing=Selecione uma destas opções.
 FormValidationFileMissing=Selecione um arquivo.
 FormValidationSelectMissing=Selecione um item da lista.
-FormValidationInvalidEmail=Digite um endereço de e-mail.
+FormValidationInvalidEmail=Digite um endereço de email.
 FormValidationInvalidURL=Digite uma URL.
 FormValidationInvalidDate =Digite uma data válida.
-FormValidationPatternMismatch=Atenda o formato solicitado.
+FormValidationPatternMismatch=Atenda ao formato solicitado.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
-FormValidationPatternMismatchWithTitle=Atenda o formato solicitado: %S.
+FormValidationPatternMismatchWithTitle=Atenda ao formato solicitado: %S.
 # LOCALIZATION NOTE (FormValidationNumberRangeOverflow): %S is a number.
 FormValidationNumberRangeOverflow=Selecione um valor que não seja maior que %S.
 # LOCALIZATION NOTE (FormValidationDateTimeRangeOverflow): %S is a date or a time.
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=O seletor <input> foi bloqueado devido à falta de ativação do usuário.
 ExternalProtocolFrameBlockedNoUserActivation=O iframe com protocolo externo foi bloqueado devido à falta de ativação do usuário, ou porque não passou tempo suficiente desde que o último iframe como esse foi carregado.
 MultiplePopupsBlockedNoUserActivation=A abertura de várias janelas foi bloqueada devido à falta de ativação do usuário.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=O carregamento prévio de %S foi ignorado devido a valores “as� ou “type� desconhecidos, ou atributo “media� que não corresponde.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/netError.dtd firefox-85.0+build1/l10n/pt-BR/dom/chrome/netError.dtd
--- firefox-84.0.2+build1/l10n/pt-BR/dom/chrome/netError.dtd	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/dom/chrome/netError.dtd	2021-01-18 20:07:36.000000000 +0000
@@ -26,7 +26,7 @@
 <!ENTITY generic.longDesc "<p>Informações adicionais sobre este problema ou erro não estão disponíveis neste momento.</p>">
 
 <!ENTITY malformedURI.title "Endereço inválido">
-<!ENTITY malformedURI.longDesc "<p>O endereço fornecido não possui um formato reconhecido. Verifique se há erros na barra de endereços e tente novamente.</p>">
+<!ENTITY malformedURI.longDesc "<p>O endereço fornecido não tem formato reconhecido. Verifique se há erros na barra de endereços e tente novamente.</p>">
 
 <!ENTITY netInterrupt.title "Transferência de dados interrompida">
 <!ENTITY netInterrupt.longDesc "<p>A conexão foi efetuada com êxito, mas foi interrompida durante a transferência de dados. Tente novamente.</p><ul><li>Não consegue abrir outros sites? Verifique a conexão de rede do computador.</li><li>O problema persiste? Peça ajuda ao seu administrador de rede ou ao provedor de internet.</li></ul>">
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pipnss/nsserrors.properties firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pipnss/nsserrors.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pipnss/nsserrors.properties	2021-01-18 20:07:36.000000000 +0000
@@ -181,7 +181,7 @@
 SEC_ERROR_INVALID_KEY=A chave não oferece suporte à operação solicitada.
 SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION=O certificado contém uma extensão obrigatória desconhecida.
 SEC_ERROR_OLD_CRL=A nova CRL não é mais recente que a utilizada no momento.
-SEC_ERROR_NO_EMAIL_CERT=Não criptografado ou assinado: você ainda não possui um certificado de e-mail.
+SEC_ERROR_NO_EMAIL_CERT=Não criptografado nem assinado: você ainda não tem um certificado de email.
 SEC_ERROR_NO_RECIPIENT_CERTS_QUERY=Não criptografado: você não possui certificados para cada um dos destinatários.
 SEC_ERROR_NOT_A_RECIPIENT=Não é possível descriptografar: você não é o destinatário ou o certificado correspondente ou a chave privativa não foram encontrados.
 SEC_ERROR_PKCS7_KEYALG_MISMATCH=Não é possível descriptografar: a chave de criptografia não confere com a do seu certificado.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:07:36.000000000 +0000
@@ -146,7 +146,7 @@
 CertDumpEKU_1_3_6_1_5_5_7_3_1=Autenticação de servidor web TLS
 CertDumpEKU_1_3_6_1_5_5_7_3_2=Autenticação de cliente web TLS
 CertDumpEKU_1_3_6_1_5_5_7_3_3=Assinatura de código
-CertDumpEKU_1_3_6_1_5_5_7_3_4=Proteção de e-mail
+CertDumpEKU_1_3_6_1_5_5_7_3_4=Proteção de email
 CertDumpEKU_1_3_6_1_5_5_7_3_8=Carimbo de data/hora
 CertDumpEKU_1_3_6_1_5_5_7_3_9=Assinatura OCSP
 CertDumpEKU_1_3_6_1_4_1_311_2_1_21=Assinatura de código individual da Microsoft
@@ -168,7 +168,7 @@
 CertDumpMSCAVersion=Versão da CA Microsoft
 CertDumpMSDomainGUID=GUID de domínio Microsoft
 CertDumpEKU_2_16_840_1_113730_4_1=Netscape Server Gated Crypto
-CertDumpRFC822Name=Endereço de e-mail
+CertDumpRFC822Name=Endereço de email
 CertDumpDNSName=Nome de DNS
 CertDumpX400Address=Endereço X.400
 CertDumpDirectoryName=Nome X.500
@@ -297,7 +297,7 @@
 
 P12DefaultNickname=Certificado importado
 CertUnknown=Desconhecido
-CertNoEmailAddress=(sem endereço de e-mail)
+CertNoEmailAddress=(sem endereço de email)
 CaCertExists=Este certificado já está instalado como uma autoridade certificadora.
 NotACACert=Este certificado não é o de uma autoridade certificadora. Desse modo ele não pode ser importado para a lista de autoridades certificadoras.
 UserCertIgnoredNoPrivateKey=Este certificado pessoal não pôde ser instalado porque você não possui a chave privada correspondente que foi criada quando o certificado foi solicitado.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pippki/pippki.properties firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pippki/pippki.properties
--- firefox-84.0.2+build1/l10n/pt-BR/security/manager/chrome/pippki/pippki.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/security/manager/chrome/pippki/pippki.properties	2021-01-18 20:07:36.000000000 +0000
@@ -44,7 +44,7 @@
 clientAuthKeyUsages=Chaves usadas: %1$S
 # LOCALIZATION NOTE(clientAuthEmailAddresses): %1$S is a comma separated list of
 # e-mail addresses the selected cert is valid for.
-clientAuthEmailAddresses=Endereço de e-mail: %1$S
+clientAuthEmailAddresses=Endereços de email: %1$S
 # LOCALIZATION NOTE(clientAuthIssuedBy): %1$S is the Distinguished Name of the
 # cert which issued the selected cert.
 clientAuthIssuedBy=Emitido por: %1$S
@@ -73,11 +73,11 @@
 # Token Manager
 password_not_set=(não definida)
 failed_pw_change=Não foi possível alterar a senha mestra.
-incorrect_pw=Você não digitou a senha mestra atual correta. Tente novamente.
+incorrect_pw=Você não digitou a senha principal atual correta. Tente novamente.
 pw_change_ok=A senha mestra foi alterada com sucesso.
 pw_erased_ok=Atenção! Você excluiu a sua senha mestra.  
 pw_not_wanted=Atenção! Você decidiu não usar uma senha mestra.
-pw_empty_warning=Suas senhas da web e de e-mail, dados de formulários e chaves privadas não serão protegidas.
+pw_empty_warning=Suas senhas de contas e emails, dados de formulários e chaves privadas não ficarão protegidos.
 pw_change2empty_in_fips_mode=Você está no momento no modo FIPS. O FIPS necessita de uma senha mestra não vazia.
 enable_fips=Ativar FIPS
 
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/pt-BR/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/security/manager/security/certificates/certManager.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/security/manager/security/certificates/certManager.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -49,7 +49,7 @@
 certmgr-edit-cert-trust-ssl =
     .label = Este certificado pode identificar sites.
 certmgr-edit-cert-trust-email =
-    .label = Este certificado pode identificar usuários de e-mail.
+    .label = Este certificado pode identificar usuários de email.
 certmgr-delete-cert =
     .title = Excluir certificados
     .style = width: 48em; height: 24em;
@@ -70,7 +70,7 @@
 certmgr-expires-label =
     .label = Fim
 certmgr-email =
-    .label = Endereço de e-mail
+    .label = Endereço de email
 certmgr-serial =
     .label = Número de série
 certmgr-view =
@@ -144,7 +144,7 @@
 
 file-browse-certificate-spec = Arquivos de certificados
 import-ca-certs-prompt = Selecionar arquivo contendo os certificados de CA a importar
-import-email-cert-prompt = Selecionar arquivo contendo o certificado de e-mail de alguém a importar
+import-email-cert-prompt = Selecione um arquivo contendo o certificado de email de alguém a importar
 
 ## For editing certificates trust
 
@@ -171,9 +171,9 @@
 delete-ca-cert-confirm = Você solicitou excluir estes certificados de CA. Certificados internos passarão a ser rejeitados em vez de ser excluídos, o que produz o mesmo efeito. Tem certeza que deseja excluir ou deixar de confiar?
 delete-ca-cert-impact = Se você excluir ou deixar de confiar em um certificado de uma autoridade certificadora (CA), este aplicativo rejeitará qualquer certificado emitido pela CA.
 delete-email-cert-title =
-    .title = Excluir certificados de e-mail
-delete-email-cert-confirm = Deseja realmente excluir os certificados de e-mail dessas pessoas?
-delete-email-cert-impact = Se você excluir o certificado de e-mail de alguém, não poderá mais enviar e-mails criptografados a esta pessoa.
+    .title = Excluir certificados de email
+delete-email-cert-confirm = Tem certeza que quer excluir os certificados de email dessas pessoas?
+delete-email-cert-impact = Se você excluir o certificado de email de alguém, não poderá mais enviar emails criptografados a esta pessoa.
 # Used for semi-uniquely representing a cert.
 #
 # Variables:
@@ -201,9 +201,9 @@
 verify-ssl-ca =
     .value = Autoridade certificadora de SSL
 verify-email-signer =
-    .value = Certificado de assinante de e-mail
+    .value = Certificado de assinante de email
 verify-email-recip =
-    .value = Certificado de destinatário de e-mail
+    .value = Certificado de destinatário de email
 # Cert verification
 cert-not-verified-cert-revoked = Não foi possível verificar este certificado porque ele foi revogado.
 cert-not-verified-cert-expired = Não foi possível verificar este certificado porque ele expirou.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/security/manager/security/pippki/pippki.ftl firefox-85.0+build1/l10n/pt-BR/security/manager/security/pippki/pippki.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/security/manager/security/pippki/pippki.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/security/manager/security/pippki/pippki.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -8,14 +8,12 @@
 
 change-password-window =
     .title = Alterar senha mestra
-
 change-device-password-window =
     .title = Alterar senha
-
 # Variables:
 # $tokenName (String) - Security device of the change password dialog
 change-password-token = Dispositivo de segurança: { $tokenName }
-change-password-old = Senha mestra atual:
+change-password-old = Senha atual:
 change-password-new = Nova senha:
 change-password-reenter = Confirmar a nova senha:
 
@@ -24,15 +22,12 @@
 reset-password-window =
     .title = Redefinir senha mestra
     .style = width: 40em
-
 pippki-failed-pw-change = Não foi possível alterar a senha.
 pippki-incorrect-pw = Você não digitou corretamente a senha atual. Tente novamente.
 pippki-pw-change-ok = Senha alterada com sucesso.
-
 pippki-pw-empty-warning = Suas senhas e chaves privadas armazenadas não estarão protegidas.
 pippki-pw-erased-ok = Você excluiu sua senha. { pippki-pw-empty-warning }
 pippki-pw-not-wanted = Atenção! Você decidiu não usar uma senha. { pippki-pw-empty-warning }
-
 pippki-pw-change2empty-in-fips-mode = Você está no momento no modo FIPS. O modo FIPS exige uma senha não vazia.
 
 ## Reset Primary Password dialog
@@ -42,10 +37,8 @@
     .style = width: 40em
 reset-password-button-label =
     .label = Redefinir
-reset-password-text = Se redefinir a senha mestra, todas as suas senhas de sites e e-mails, dados de formulários, certificados pessoais e chaves privadas serão esquecidas. Tem certeza que quer redefinir sua senha mestra?
-
-reset-primary-password-text = Se você redefinir a senha principal, todas as suas senhas de sites e e-mails, chaves privadas e certificados pessoais armazenados serão esquecidos. Tem certeza que quer redefinir sua senha principal?
-
+reset-password-text = Se redefinir a senha mestra, todas as suas senhas de contas e emails, dados de formulários, certificados pessoais e chaves privadas serão esquecidas. Tem certeza que quer redefinir sua senha mestra?
+reset-primary-password-text = Se você redefinir a senha principal, todas as suas senhas de contas e emails, chaves privadas e certificados pessoais armazenados serão esquecidos. Tem certeza que quer redefinir sua senha principal?
 pippki-reset-password-confirmation-title = Redefinir senha principal
 pippki-reset-password-confirmation-message = Sua senha principal foi redefinida.
 
@@ -58,7 +51,7 @@
 download-cert-trust-ssl =
     .label = Confiar nesta CA para identificar sites.
 download-cert-trust-email =
-    .label = Confiar nesta CA para identificar usuários de e-mail.
+    .label = Confiar nesta autoridade certificadora para identificar usuários de email.
 download-cert-message-desc = Antes de considerar confiável esta CA para algum fim, você deve examinar seu certificado, sua diretiva e procedimentos (se disponíveis).
 download-cert-view-cert =
     .label = Ver
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/autoconfig/autoconfig.properties firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/autoconfig/autoconfig.properties
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/autoconfig/autoconfig.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/autoconfig/autoconfig.properties	2021-01-18 20:07:36.000000000 +0000
@@ -8,5 +8,5 @@
 autoConfigTitle = Alerta AutoConfig
 autoConfigMsg = Falha em Netscape.cfg/AutoConfig. Avise o administrador do sistema. \n Erro: Falha em %S:
 
-emailPromptTitle = Endereço de e-mail
-emailPromptMsg = Forneça seu endereço de e-mail
+emailPromptTitle = Endereço de email
+emailPromptMsg = Digite seu endereço de email
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/global/aboutStudies.properties firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/global/aboutStudies.properties
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/global/aboutStudies.properties	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/global/aboutStudies.properties	2021-01-18 20:07:36.000000000 +0000
@@ -17,11 +17,11 @@
 # LOCALIZATION NOTE (completeStatus): Displayed for a study that is already complete
 completeStatus = Concluído
 
-updateButtonWin = Opções de atualização
-updateButtonUnix = Preferências de atualização
+updateButtonWin = Atualizar opções
+updateButtonUnix = Atualizar preferências
 learnMore = Saiba mais
 noStudies = Você não participou de nenhum estudo.
-disabledList = Esta é uma lista de estudos que você participou. Nenhum novo estudo acontecerá.
+disabledList = Esta é uma lista de estudos em que você participou. Nenhum novo estudo acontecerá.
 # LOCALIZATION NOTE (enabledList): %S is brandShortName (e.g. Firefox)
 enabledList = O que é isso? O %S pode instalar e executar estudos de vez em quando.
 
@@ -29,4 +29,4 @@
 # name of a preference (such as "stream.improvesearch.topSiteSearchShortcuts")
 # and $2%S will be replaced with the value of that preference. Both values will
 # be formatted differently than the surrounding text.
-preferenceStudyDescription = Este estudo define %1$S como %2$S.
\ No newline at end of file
+preferenceStudyDescription = Este estudo define %1$S como %2$S.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/global/extensions.properties firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/global/extensions.properties
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/global/extensions.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/global/extensions.properties	2021-01-18 20:07:36.000000000 +0000
@@ -31,14 +31,13 @@
 saveaspdf.saveasdialog.title = Salvar como
 
 #LOCALIZATION NOTE (newTabControlled.message2) %S is the icon and name of the extension which updated the New Tab page.
-newTabControlled.message2 = Uma extensão, %S, mudou a página que você vê quando abre uma nova aba.
+newTabControlled.message2 = Uma extensão, %S, alterou a página que aparece quando você abre uma nova aba.
 newTabControlled.learnMore = Saiba mais
 
 #LOCALIZATION NOTE (homepageControlled.message) %S is the icon and name of the extension which updated the homepage.
-homepageControlled.message = Uma extensão, %S, alterou o que você vê quando abre sua página inicial e novas janelas.
+homepageControlled.message = Uma extensão, %S, alterou o que aparece quando você abre sua página inicial e novas janelas.
 homepageControlled.learnMore = Saiba mais
 
 #LOCALIZATION NOTE (tabHideControlled.message) %1$S is the icon and name of the extension which hid tabs, %2$S is the icon of the all tabs button.
 tabHideControlled.message = Uma extensão, %1$S, está ocultando algumas das suas abas. Você ainda pode acessar todas as suas abas por meio de %2$S.
 tabHideControlled.learnMore = Saiba mais
-
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:36.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=dia; dias
 
 downloadErrorAlertTitle=Erro no download
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=O download não pode ser salvo porque está bloqueado por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=O download não pode ser salvo porque está bloqueado por uma extensão.
 downloadErrorGeneric=O arquivo não pôde ser salvo porque ocorreu um erro desconhecido.\n\nTente novamente.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:36.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Conexão ao servidor proxy recusada
 check_error-2153390069=O certificado do servidor está com a validade vencida (se a data/hora do seu computador estiver errada, ajuste-a)
 check_error-verification_failed=A integridade da atualização não pôde ser verificada
+check_error-move_failed=Falha ao preparar a atualização para ser instalada
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/crashreporter/crashreporter.ini firefox-85.0+build1/l10n/pt-BR/toolkit/crashreporter/crashreporter.ini
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/crashreporter/crashreporter.ini	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/crashreporter/crashreporter.ini	2021-01-18 20:07:36.000000000 +0000
@@ -28,7 +28,7 @@
 CheckSendReport=Informar a %s para que eles possam corrigi-lo
 CheckIncludeURL=Incluir o endereço da página em que eu estava
 CheckAllowEmail=Permitir que a %s contate-me sobre este relatório
-EmailGrayText=Digite seu endereço de e-mail aqui
+EmailGrayText=Digite aqui seu endereço de email
 ReportPreSubmit2=O relatório de travamento será enviado antes de você sair ou reiniciar.
 ReportDuringSubmit2=Enviando relatório…
 ReportSubmitSuccess=Relatório enviado com êxito!
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -314,7 +314,7 @@
        *[other] Preferências
     }
 details-addon-button = Detalhes
-release-notes-addon-button = Notas da versão
+release-notes-addon-button = Notas de atualização
 permissions-addon-button = Permissões
 extension-enabled-heading = Ativado
 extension-disabled-heading = Desativado
@@ -380,14 +380,8 @@
 ## badge is a small icon displayed next to an extension when it is recommended on AMO.
 
 addon-badge-recommended2 =
-    .title = O { -brand-product-name } só recomenda extensões que atendem nossos padrões de segurança e desempenho
+    .title = O { -brand-product-name } só recomenda extensões que atendem aos nossos padrões de segurança e desempenho
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Esta extensão foi feita pelos criadores do { -brand-product-name }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = O código desta extensão foi revisado para garantir a segurança
-    .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
     .title = Esta é uma extensão oficial, feita pelos criadores do { -brand-product-name }
     .aria-label = { addon-badge-line2.title }
@@ -400,7 +394,7 @@
 available-updates-heading = Atualizações disponíveis
 recent-updates-heading = Atualizações recentes
 release-notes-loading = Carregando…
-release-notes-error = Desculpe, houve um erro ao carregar as notas de lançamento.
+release-notes-error = Desculpe, houve um erro ao carregar as notas de atualização.
 addon-permissions-empty = Esta extensão não exige nenhum permissão
 addon-permissions-required = Permissões necessárias para a funcionalidade principal:
 addon-permissions-optional = Permissões opcionais para funcionalidades adicionais:
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -7,7 +7,7 @@
 #   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
 about-httpsonly-insecure-explanation-unavailable = Você está navegando no modo somente HTTPS e uma versão HTTPS segura de <em>{ $websiteUrl }</em> não está disponível.
 about-httpsonly-insecure-explanation-reasons = Provavelmente o site não oferece suporte a HTTPS, mas também é possível que um invasor esteja bloqueando a versão HTTPS.
-about-httpsonly-insecure-explanation-exception = Embora o risco à segurança seja baixo, se você decidir visitar a versão HTTP do site, não deve inserir nenhuma informação confidencial, como senhas, e-mails ou detalhes de cartões de crédito.
+about-httpsonly-insecure-explanation-exception = Embora o risco à segurança seja baixo, se você decidir visitar a versão HTTP do site, não deve inserir nenhuma informação sensível, como senhas, emails ou detalhes de cartões de crédito.
 about-httpsonly-button-make-exception = Aceitar o risco e continuar para o site
 about-httpsonly-title-alert = Alerta de modo somente HTTPS
 about-httpsonly-title-connection-not-available = Conexão segura não disponível
@@ -16,7 +16,7 @@
 about-httpsonly-explanation-unavailable2 = Você ativou o modo somente HTTPS para maior segurança, mas uma versão HTTPS de <em>{ $websiteUrl }</em> não está disponível.
 about-httpsonly-explanation-question = O que pode estar causando isso?
 about-httpsonly-explanation-nosupport = Provavelmente, o site simplesmente não oferece suporte a HTTPS.
-about-httpsonly-explanation-risk = Também é possível que um invasor esteja envolvido. Se você decidir visitar o site, não deve inserir nenhuma informação sensível, como senhas, e-mails ou detalhes de cartões de crédito.
+about-httpsonly-explanation-risk = Também é possível que um invasor esteja envolvido. Se você decidir visitar o site, não deve inserir nenhuma informação sensível, como senhas, emails ou detalhes de cartões de crédito.
 about-httpsonly-explanation-continue = Se você continuar, o modo somente HTTPS será desativado temporariamente neste site.
 about-httpsonly-button-continue-to-site = Continuar para a versão HTTP do site
 about-httpsonly-button-go-back = Voltar
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutRights.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutRights.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutRights.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutRights.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -4,7 +4,7 @@
 
 rights-title = Sobre os seus direitos
 rights-intro = O { -brand-full-name } é um software livre e de código aberto, construído por uma comunidade de milhares de pessoas de todo o mundo. Há algumas coisas que deve saber:
-rights-intro-point-1 = O { -brand-short-name } é disponibilizado de acordo com os termos da <a data-l10n-name="mozilla-public-license-link">Licença Pública Mozilla</a>. Isso significa que pode usar, copiar e distribuir o { -brand-short-name } para outras pessoas.  Também é bem-vindo para modificar o código-fonte do { -brand-short-name } para atender suas necessidades. A Licença Pública Mozilla também lhe dá o direito de distribuir as suas versões modificadas.
+rights-intro-point-1 = O { -brand-short-name } é disponibilizado de acordo com os termos da <a data-l10n-name="mozilla-public-license-link">Licença Pública Mozilla</a>. Significa que você pode usar, copiar e distribuir o { -brand-short-name } para outras pessoas.  Também pode ficar à vontade para modificar o código-fonte do { -brand-short-name } como quiser para atender a suas necessidades. A Licença Pública Mozilla também lhe dá o direito de distribuir suas versões modificadas.
 rights-intro-point-2 = Não lhe são concedidos quaisquer direitos sobre marcas comerciais ou licenças sobre as marcas comerciais da Fundação Mozilla ou de terceiros, incluindo, entre outras, ao nome ou logotipo do Firefox. Informações adicionais sobre as marcas comerciais podem ser encontradas <a data-l10n-name="mozilla-trademarks-link">aqui</a>.
 rights-intro-point-3 = Algumas funcionalidades do { -brand-short-name }, como o relator de travamentos, dão a você a opção de enviar comentários à { -vendor-short-name }. Ao escolher enviar sua opinião, você dá à { -vendor-short-name } permissão de usá-la para aperfeiçoar seus produtos, publicá-la em seus sites e distribuí-la.
 rights-intro-point-4 = A forma como nós usamos seus dados pessoais e informações enviadas à { -vendor-short-name } pelo { -brand-short-name } está descrita na <a data-l10n-name="mozilla-privacy-policy-link">Política de privacidade do { -brand-short-name }</a>.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutServiceWorkers.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutServiceWorkers.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -9,7 +9,6 @@
 about-service-workers-main-title = Service Workers registrados
 about-service-workers-warning-not-enabled = Os Service Workers não estão ativados.
 about-service-workers-warning-no-service-workers = Nenhum Service Workers registrado.
-
 # The original title of service workers' information
 #
 # Variables:
@@ -29,12 +28,8 @@
 waiting-cache-name = <strong>Nome da cache em espera:</strong> { $name }
 push-end-point-waiting = <strong>Ponto final de publicação:</strong> { waiting }
 push-end-point-result = <strong>Ponto final de publicação:</strong> { $name }
-
 # This term is used as a button label (verb, not noun).
 update-button = Atualizar
-
-unregister-button = Cancelar o registro
-
+unregister-button = Cancelar registro
 unregister-error = Falha ao cancelar o registro deste Service Worker.
-
 waiting = Esperando…
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceiros
+support-third-party-modules-module = Arquivo do módulo
+support-third-party-modules-version = Versão do arquivo
+support-third-party-modules-vendor = Informações do fornecedor
+support-third-party-modules-occurrence = Ocorrência
+support-third-party-modules-process = Tipo e ID do processo
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Endereço do imagebase
+support-third-party-modules-uptime = Tempo de atividade do processo (ms)
+support-third-party-modules-duration = Duração do carregamento (ms)
+support-third-party-modules-empty = Nenhum módulo de terceiros foi carregado.
+support-third-party-modules-no-value = (sem valor)
+support-third-party-modules-button-open =
+    .title = Abrir local do arquivo…
+support-third-party-modules-expand =
+    .title = Mostrar informações detalhadas
+support-third-party-modules-collapse =
+    .title = Recolher informações detalhadas
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo não está assinado
+support-third-party-modules-folder-icon =
+    .title = Abrir local do arquivo…
+support-third-party-modules-down-icon =
+    .title = Mostrar informações detalhadas
+support-third-party-modules-up-icon =
+    .title = Recolher informações detalhadas
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/abuseReports.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/abuseReports.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/abuseReports.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/abuseReports.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -2,30 +2,25 @@
 # 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/.
 
-# Localized string used as the dialog window title (a new behavior locked
-# behind the "extensions.abuseReport.openDialog" preference).
+# Localized string used as the dialog window title.
 # "Report" is a noun in this case, "Report for AddonName".
 #
 # Variables:
 #   $addon-name (string) - Name of the add-on being reported
 abuse-report-dialog-title = Relatório de { $addon-name }
-
 abuse-report-title-extension = Denunciar esta extensão para a { -vendor-short-name }
 abuse-report-title-theme = Denunciar este tema para a { -vendor-short-name }
 abuse-report-subtitle = Qual é o problema?
-
 # Variables:
 #   $author-name (string) - Name of the add-on author
 abuse-report-addon-authored-by = por <a data-l10n-name="author-name">{ $author-name }</a>
-
 abuse-report-learnmore =
     Não tem certeza de qual problema selecionar?
     <a data-l10n-name="learnmore-link">Saiba mais sobre como denunciar extensões e temas</a>
-
 abuse-report-submit-description = Descreva o problema (opcional)
 abuse-report-textarea =
     .placeholder = É mais fácil para nós abordar um problema se tivermos detalhes. Descreva o que está acontecendo. Obrigado por nos ajudar a manter a web saudável.
-abuse-report-submit-note = Nota: Não inclua informações pessoais (como nome, endereço de e-mail, número de telefone, endereço físico). A { -vendor-short-name } guarda um registro permanente desses relatos.
+abuse-report-submit-note = Nota: Não inclua informações pessoais (como nome, endereço de email, número de telefone, endereço físico). A { -vendor-short-name } guarda um registro permanente desses relatos.
 
 ## Panel buttons.
 
@@ -62,18 +57,14 @@
 
 abuse-report-damage-reason-v2 = Danificou meu computador ou comprometeu meus dados
 abuse-report-damage-example = Exemplo: injetou código malicioso ou roubou dados
-
 abuse-report-spam-reason-v2 = Contém spam ou insere publicidade indesejada
 abuse-report-spam-example = Exemplo: insere anúncios em páginas web
-
 abuse-report-settings-reason-v2 = Mudou meu mecanismo de pesquisa, página inicial ou página de nova aba, sem me informar ou me perguntar
 abuse-report-settings-suggestions = Antes de denunciar a extensão, você pode tentar alterar suas configurações:
 abuse-report-settings-suggestions-search = Muda sua configuração de pesquisa padrão
 abuse-report-settings-suggestions-homepage = Muda a página inicial e a página de nova aba
-
 abuse-report-deceptive-reason-v2 = Alega ser algo que não é
 abuse-report-deceptive-example = Exemplo: descrição ou imagens enganosas
-
 abuse-report-broken-reason-extension-v2 = Não funciona, atrapalha sites, ou faz o { -brand-product-name } ficar mais lento
 abuse-report-broken-reason-theme-v2 = Não funciona ou atrapalha a exibição do navegador
 abuse-report-broken-example = Exemplo: recursos são lentos, difíceis de usar, ou não funcionam; partes de sites não são carregadas ou aparecem erradas
@@ -85,14 +76,10 @@
     Parece que você identificou um bug. Além de enviar um relato aqui, a melhor maneira de
     ter um problema de funcionalidade resolvido é entrar em contato com o desenvolvedor do tema.
     <a data-l10n-name="support-link">Visite o site do tema</a> para obter informações do desenvolvedor.
-
 abuse-report-policy-reason-v2 = Contém conteúdo de ódio, violento ou ilegal
 abuse-report-policy-suggestions =
     Nota: Problemas de direitos autorais (copyright) e marcas registradas (trademark) devem ser relatados em um processo diferente.
     <a data-l10n-name="report-infringement-link">Siga essas instruções</a> para relatar um problema.
-
 abuse-report-unwanted-reason-v2 = Eu nunca quis e não sei como me livrar disso
 abuse-report-unwanted-example = Exemplo: uma aplicação instalou sem minha permissão
-
 abuse-report-other-reason = Outra coisa
-
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/about/certviewer.ftl	2021-01-06 11:50:58.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -15,7 +15,7 @@
 certificate-viewer-certificate-authority = Autoridade certificadora
 certificate-viewer-cipher-suite = Suíte de criptografia
 certificate-viewer-common-name = Nome da empresa
-certificate-viewer-email-address = Endereço de e-mail
+certificate-viewer-email-address = Endereço de email
 # Variables:
 #   $firstCertName (String) - Common Name for the displayed certificate
 certificate-viewer-tab-title = Certificado de { $firstCertName }
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Suporte a vários Picture-in-Picture
 experimental-features-multi-pip-description = Suporte experimental para permitir que várias janelas Picture-in-Picture sejam abertas ao mesmo tempo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Suporte experimental ao protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/preferences/preferences.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/preferences/preferences.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/preferences/preferences.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -4,37 +4,29 @@
 
 password-not-set =
     .value = (não definida)
-
 failed-pw-change = Não foi possível alterar a senha mestra.
-incorrect-pw = Você não digitou corretamente a senha mestra atual. Tente novamente.
+incorrect-pw = Você não digitou corretamente a senha principal atual. Tente novamente.
 pw-change-ok = A senha mestra foi alterada com sucesso.
-
-pw-empty-warning = Suas senhas da web e de e-mail, dados de formulários e chaves privadas não serão protegidos.
+pw-empty-warning = Suas senhas de contas e emails, dados de formulários e chaves privadas não ficarão protegidos.
 pw-erased-ok = Você excluiu sua senha mestra.  { pw-empty-warning }
 pw-not-wanted = Atenção! Você decidiu não usar uma senha mestra. { pw-empty-warning }
-
 pw-change2empty-in-fips-mode = Você está no momento no modo FIPS. O FIPS necessita de uma senha mestra não vazia.
-
 failed-pp-change = Não foi possível alterar a senha principal.
 incorrect-pp = Você não digitou corretamente a senha principal atual. Tente novamente.
 pp-change-ok = Senha principal alterada com sucesso.
-
 pp-empty-warning = Suas senhas e chaves privadas armazenadas não estarão protegidas.
 pp-erased-ok = Você excluiu sua senha principal. { pp-empty-warning }
 pp-not-wanted = Atenção! Você decidiu não usar uma senha principal. { pp-empty-warning }
-
 pp-change2empty-in-fips-mode = Você está no momento no modo FIPS. O modo FIPS exige uma senha principal não vazia.
 pw-change-success-title = Alteração da senha bem-sucedida
 pw-change-failed-title = Falha na alteração da senha
 pw-remove-button =
     .label = Remover
-
 set-password =
     .title = Alterar senha mestra
-
 primary-password-dialog =
     .title = Senha principal
-set-password-old-password = Senha mestra atual:
+set-password-old-password = Senha atual:
 set-password-new-password = Digite a nova senha:
 set-password-reenter-password = Confirme a nova senha:
 set-password-meter = Medidor de qualidade da senha
@@ -42,13 +34,11 @@
 master-password-admin = Seu administrador exige que você tenha uma senha mestra definida para poder salvar senhas.
 master-password-description = A senha mestra é usada para proteger informações confidenciais como senhas de sites. Se você criar uma senha mestra, precisará fornecê-la uma vez por sessão, quando o { -brand-short-name } precisar de informações protegidas pela senha.
 master-password-warning = Certifique-se de que vai lembrar da senha mestra. Caso a esqueça, você não conseguirá acessar nenhuma informação protegida por ela.
-
 remove-password =
     .title = Remover senha mestra
 primary-password-admin = Seu administrador exige que você tenha uma senha principal definida para poder salvar contas e senhas.
 primary-password-description = A senha principal é usada para proteger algumas informações sensíveis, como contas e senhas, neste dispositivo. Se você criar uma senha principal, precisará digitar uma vez por sessão, quando o { -brand-short-name } precisar de informações salvas protegidas pela senha.
 primary-password-warning = Certifique-se de que vai lembrar da senha principal. Se você esquecer sua senha principal, não conseguirá acessar nenhuma informação protegida por ela neste dispositivo.
-
 remove-primary-password =
     .title = Remover senha principal
 remove-info =
@@ -58,4 +48,4 @@
 remove-primary-password-warning1 = Sua senha principal é usada para proteger informações sensíveis, como contas e senhas.
 remove-primary-password-warning2 = Se você remover sua senha principal, suas informações não estarão protegidas caso seu computador seja comprometido.
 remove-password-old-password =
-    .value = Senha mestra atual:
+    .value = Senha atual:
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primeira página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Próxima página
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/pt-BR/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:50:59.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-BR/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:36.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = até
+printui-page-custom-range-input =
+    .aria-label = Digite um intervalo de páginas personalizado
+    .placeholder = exemplo: 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Cópias
 printui-orientation = Orientação
@@ -48,6 +51,7 @@
 printui-options = Opções
 printui-headers-footers-checkbox = Imprimir cabeçalhos e rodapés
 printui-backgrounds-checkbox = Imprimir planos de fundo
+printui-selection-checkbox = Imprimir somente a seleção
 printui-color-mode-label = Modo de cor
 printui-color-mode-color = Colorido
 printui-color-mode-bw = Preto e branco
@@ -56,19 +60,29 @@
 printui-margins-min = Mínimo
 printui-margins-none = Nenhuma
 printui-margins-custom = Personalizado
+printui-margins-custom-inches = Personalizado (polegadas)
 printui-margins-custom-top = Acima
+printui-margins-custom-top-inches = Acima (polegadas)
 printui-margins-custom-bottom = Abaixo
+printui-margins-custom-bottom-inches = Abaixo (polegadas)
 printui-margins-custom-left = Esquerda
+printui-margins-custom-left-inches = Esquerda (polegadas)
 printui-margins-custom-right = Direita
+printui-margins-custom-right-inches = Direita (polegadas)
 printui-system-dialog-link = Imprimir usando o diálogo do sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Salvar
 printui-cancel-button = Cancelar
+printui-close-button = Fechar
 printui-loading = Preparando visão prévia
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Visualizar impressão
+printui-pages-per-sheet = Páginas por folha
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Imprimindo…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/aboutLogins.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/aboutLogins.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Remover esta credencial?
 confirm-delete-dialog-message = Esta ação não pode ser anulada.
 about-logins-confirm-remove-dialog-confirm-button = Remover
-about-logins-confirm-remove-all-dialog-confirm-button = Remover todas
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Remover
+        [one] Remover
+       *[other] Remover tudo
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Sim, remover esta credencial
@@ -198,6 +203,8 @@
 about-logins-confirm-export-dialog-title = Exportar credenciais e palavras-passe
 about-logins-confirm-export-dialog-message = As suas palavras-passe serão guardadas como texto legível (por exemplo, BadP@ssw0rd) para que qualquer pessoa que possa abrir o ficheiro exportado as possa visualizar.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = Importação concluída
+about-logins-alert-import-message = Ver resumo detalhado da importação
 confirm-discard-changes-dialog-title = Descartar alterações não guardadas?
 confirm-discard-changes-dialog-message = Todas as alterações não guardadas irão ser perdidas.
 confirm-discard-changes-dialog-confirm-button = Descartar
@@ -259,3 +266,30 @@
         [macos] Documento CSV
        *[other] Ficheiro CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Importação concluída
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Nova credencial adicionada:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Novas credenciais adicionadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Credencial existente atualizada:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Credenciais existentes atualizadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>Foi encontrada uma credencial duplicada:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importada)</span>
+       *[other] <span>Foram encontradas credenciais duplicadas:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importadas)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Erro:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importada)</span>
+       *[other] <span>Erros:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(não importadas)</span>
+    }
+about-logins-import-dialog-done = Concluído
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/appmenu.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/appmenu.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nova janela
+appmenuitem-new-private-window =
+    .label = Nova janela privada
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Ampliar
 appmenuitem-zoom-reduce =
     .label = Reduzir
+appmenuitem-fullscreen =
+    .label = Ecrã completo
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizar agora
+appmenuitem-save-page =
+    .label = Guardar página como…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novidades
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/appMenuNotifications.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Agora não
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Após um reinício rápido, o { -brand-shorter-name } irá restaurar todos os seus separadores abertos e janelas que não estão no modo de navegação privada.
+appmenu-update-other-instance =
+    .label = O { -brand-shorter-name } não consegue atualizar automaticamente para a nova versão.
+    .buttonlabel = Atualizar o { -brand-shorter-name } mesmo assim
+    .buttonaccesskey = u
+    .secondarybuttonlabel = Agora não
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message = Está disponível uma nova atualização para o { -brand-shorter-name }, mas a mesma não pode ser instalada porque está em execução uma outra cópia do { -brand-shorter-name }. Encerre a mesma para continuar a atualização ou opte por atualizar mesmo assim (a outra cópia pode não funcionar corretamente até que a reinicie).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, entendi
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/browser.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/browser.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/browser.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> tem controlo do seu apontador. Pressione Esc para retomar o controlo.
 pointerlock-warning-no-domain = Este documento tem controlo do seu apontador. Pressione Esc para retomar o controlo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mostrar todos os marcadores
+bookmarks-recent-bookmarks =
+    .value = Marcadores recentes
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mostrar mais marcadores
+bookmarks-sidebar-content =
+    .aria-label = Marcadores
+bookmarks-menu-button =
+    .label = Menu de marcadores
+bookmarks-other-bookmarks-menu =
+    .label = Outros marcadores
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcadores de dispositivo móvel
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra lateral de marcadores
+           *[other] Ver barra lateral de marcadores
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ocultar barra de ferramentas de marcadores
+           *[other] Ver barra de ferramentas de marcadores
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Remover menu de marcadores da barra de ferramentas
+           *[other] Adicionar menu de marcadores à barra de ferramentas
+        }
+bookmarks-search =
+    .label = Pesquisar marcadores
+bookmarks-tools =
+    .label = Ferramentas de marcadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Barra de ferramentas de marcadores
+    .accesskey = B
+    .aria-label = Marcadores
+bookmarks-toolbar-menu =
+    .label = Barra de ferramentas de marcadores
+bookmarks-toolbar-placeholder =
+    .title = Itens da barra de ferramentas marcadores
+bookmarks-toolbar-placeholder-button =
+    .label = Itens da barra de ferramentas marcadores
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcadores
+library-bookmarks-bookmark-this-page =
+    .label = Adicionar esta página aos marcadores
+library-bookmarks-bookmark-edit =
+    .label = Editar este marcador
+library-recent-activity-label = Atividade recente
+
+## More items
+
+more-menu-go-offline =
+    .label = Trabalhar offline
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/newtab/asrouter.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Escreva menos e encontre mais, com a barra de endereço
 cfr-whatsnew-searchbar-body-topsites = Agora, basta selecionar a barra de endereço e será expandida uma caixa com ligações para os principais sites.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = �cone de lupa
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Atalhos de pesquisa na barra de endereço
 cfr-whatsnew-search-shortcuts-body = Agora, quando digita um motor de pesquisa ou um site específico na barra de endereço, será apresentado um atalho azul nas sugestões de pesquisa. Selecione este atalho para completar a sua pesquisa diretamente da barra de endereço.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Proteção contra super-cookies maliciosos
+cfr-whatsnew-supercookies-body = Os sites podem, secretamente, anexar uma “super-cookie� ao seu navegador que pode seguir o que faz na Internet, mesmo depois de limpar os cookies. O { -brand-short-name } fornece agora uma forte proteção contra super-cookies, de modo a que estas não possam ser utilizadas para monitorizar as suas atividades online de um site para outro.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Marcadores melhorados
+cfr-whatsnew-bookmarking-body = É mais fácil seguir os seus sites favoritos. O { -brand-short-name } agora lembra-se da sua localização preferida para os favoritos guardados, mostra a barra de ferramentas de favoritos por predefinição em novos separadores e oferece um acesso fácil ao resto dos seus favoritos através de uma pasta na barra de ferramentas.
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/newtab/newtab.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Novo separador
 newtab-settings-button =
     .title = Personalizar a sua página de novo separador
+newtab-personalize-button-label = Personalizar
+    .title = Personalizar novo separador
+    .aria-label = Personalizar novo separador
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Pesquisar na Web
     .title = Pesquisar na Web
     .aria-label = Pesquisar na Web
+newtab-search-box-text = Pesquisar na Internet
+newtab-search-box-input =
+    .placeholder = Pesquisar na Internet
+    .aria-label = Pesquisar na Internet
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Adicionar motor de pesquisa
 newtab-topsites-add-topsites-header = Novo site mais visitado
+newtab-topsites-add-shortcut-header = Novo atalho
 newtab-topsites-edit-topsites-header = Editar site mais visitado
+newtab-topsites-edit-shortcut-header = Editar atalho
 newtab-topsites-title-label = Título
 newtab-topsites-title-input =
     .placeholder = Digite um título
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oops, algo correu mal ao carregar este conteúdo.
 newtab-error-fallback-refresh-link = Atualize a página para tentar novamente.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Atalhos
+newtab-custom-shortcuts-subtitle = Sites que guarda ou visita
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } linha
+       *[other] { $num } linhas
+    }
+newtab-custom-sponsored-sites = Atalhos patrocinados
+newtab-custom-pocket-title = Recomendado por { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Conteúdo excecional com curadoria de { -pocket-brand-name }, parte da família { -brand-product-name }
+newtab-custom-pocket-sponsored = Histórias patrocinadas
+newtab-custom-recent-title = Atividade recente
+newtab-custom-recent-subtitle = Uma seleção de sites e conteúdos recentes
+newtab-custom-close-button = Fechar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Excertos
+newtab-custom-snippets-subtitle = Dicas e notícias da { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Gerir mais configurações
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/places.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/places.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/places.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Subpasta
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Outros marcadores
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/preferences/preferences.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Os sites que mais visita
 home-prefs-topsites-by-option-sponsored =
     .label = Principais sites patrocinados
+home-prefs-shortcuts-header =
+    .label = Atalhos
+home-prefs-shortcuts-description = Sites que guarda ou visita
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Atalhos patrocinados
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recomendado por { $provider }
 home-prefs-recommended-by-description-update = Excelente conteúdo de toda a Internet, selecionado por { $provider }
+home-prefs-recommended-by-description-new = Conteúdo excecional com curadoria de { $provider }, parte da família { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Histórias patrocinadas
 home-prefs-highlights-header =
     .label = Destaques
-home-prefs-recent-activity-header =
-    .label = Atividade recente
 home-prefs-highlights-description = Uma seleção de sites que guardou ou visitou
 home-prefs-highlights-option-visited-pages =
     .label = Páginas visitadas
@@ -526,6 +530,9 @@
     .label = Transferência mais recente
 home-prefs-highlights-option-saved-to-pocket =
     .label = Páginas guardadas no { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Atividade recente
+home-prefs-recent-activity-description = Uma seleção de sites e conteúdos recentes
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Excertos
 home-prefs-snippets-description = Atualizações da { -vendor-short-name } e do { -brand-product-name }
+home-prefs-snippets-description-new = Dicas e notícias da { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Separadores abertos
     .accesskey = o
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Atalhos
+    .accesskey = A
 addressbar-locbar-topsites-option =
     .label = Principais sites
     .accesskey = t
+addressbar-locbar-engines-option =
+    .label = Motores de pesquisa
+    .accesskey = a
 addressbar-suggestions-settings = Alterar preferências para as sugestões dos motores de pesquisa
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/pt-PT/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Apenas num novo separador
     .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Mostrar sempre
+    .accesskey = r
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nunca mostrar
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mostrar apenas em novo separador
+    .accesskey = M
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mostrar outros marcadores
     .accesskey = r
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/devtools/client/markers.properties firefox-85.0+build1/l10n/pt-PT/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/pt-PT/devtools/client/markers.properties	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/devtools/client/markers.properties	2021-01-18 20:07:44.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Pouca memória
 marker.gcreason.label.CC_WAITING=Forçado por ciclo de recolha
+marker.gcreason.label.CC_FINISHED=Ciclo da coleção concluído
 marker.gcreason.label.CC_FORCED=Forçado por ciclo de recolha
 marker.gcreason.label.LOAD_END=Carregamento da página concluído
 marker.gcreason.label.PAGE_HIDE=Movido para segundo plano
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Coleção de berçário
-
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/devtools/client/toolbox.properties firefox-85.0+build1/l10n/pt-PT/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/pt-PT/devtools/client/toolbox.properties	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/devtools/client/toolbox.properties	2021-01-18 20:07:44.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Fechar ferramentas de programador
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Mostrar consola dividida
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/pt-PT/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/devtools/client/tooltips.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/devtools/client/tooltips.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> não tem efeito neste elemento porque não é um elemento posicional.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> não tem qualquer efeito neste elemento dado que <strong>overflow:hidden</strong> não está definido.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> não tem qualquer efeito neste elemento porque o seu <strong>outline-style</strong> é <strong>auto</strong> ou <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> não tem qualquer efeito em elementos de tabelas.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> não tem qualquer efeito em elementos internos de tabelas com excepção das células da tabela.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Tente remover o <strong>float</strong> ou adicione <strong>display: block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Tente definir a sua propriedade <strong>position</strong> para algo diferente de <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Tente adicionar <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Experimente definir a respetiva propriedade <strong>display</strong> para algo diferente de <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Experimente definir a respetiva propriedade <strong>display</strong> para algo diferente de <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> ou <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Experimente definir a respetiva propriedade <strong>outline-style</strong> para algo diferente de <strong>auto</strong> ou <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/pt-PT/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/pt-PT/dom/chrome/dom/dom.properties	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/dom/chrome/dom/dom.properties	2021-01-18 20:07:44.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=O seletor <input> foi bloqueado por não ter sido ativado pelo utilizador.
 ExternalProtocolFrameBlockedNoUserActivation=O iframe com protocolo externo foi bloqueado por não ter sido ativado pelo utilizador ou porque não passou tempo suficiente desde que o último iframe deste tipo foi carregado.
 MultiplePopupsBlockedNoUserActivation=A abertura de múltiplos pop-ups foi bloqueada por não ter sido ativada pelo utilizador.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=O pré-carregamento de %S foi ignorado devido a valores desconhecidos de “as� ou “type� ou atributo “media� não coincidente.
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/pt-PT/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:44.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Erro de transferência
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=A transferência não pôde ser guardada porque está a ser bloqueada por %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=A transferência não pôde ser guardada porque está a ser bloqueada por uma extensão.
 downloadErrorGeneric=Não foi possível guardar a transferência devido a um erro desconhecido.\n\nPor favor, volte a tentar.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/pt-PT/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:44.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Ligação ao servidor proxy recusada
 check_error-2153390069=Certificado de servidor expirado (ajuste o relógio do sistema para a data e horas corretas se estiverem erradas)
 check_error-verification_failed=Integridade da atualização não pode ser verificada
+check_error-move_failed=A preparação da instalação da atualização falhou
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Módulos de terceiros
+support-third-party-modules-module = Ficheiro do módulo
+support-third-party-modules-version = Versão do ficheiro
+support-third-party-modules-vendor = Informação do fornecedor
+support-third-party-modules-occurrence = Ocorrência
+support-third-party-modules-process = Tipo e ID do processo
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Endereço Imagebase
+support-third-party-modules-uptime = Tempo de atividade do processo (ms)
+support-third-party-modules-duration = Duração do carregamento (ms)
+support-third-party-modules-empty = Não foi carregado nenhum módulo de terceiros.
+support-third-party-modules-no-value = (Sem valor)
+support-third-party-modules-button-open =
+    .title = Abrir localização do ficheiro…
+support-third-party-modules-expand =
+    .title = Mostrar informações detalhadas
+support-third-party-modules-collapse =
+    .title = Recolher informações detalhadas
+support-third-party-modules-unsigned-icon =
+    .title = Este módulo não está assinado
+support-third-party-modules-folder-icon =
+    .title = Abrir localização do ficheiro…
+support-third-party-modules-down-icon =
+    .title = Mostrar informações detalhadas
+support-third-party-modules-up-icon =
+    .title = Recolher informações detalhadas
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Suporte a múltiplos vídeos em janelas flutuantes
 experimental-features-multi-pip-description = Suporte experimental para permitir que múltiplos vídeos possam ser abertos em várias janelas flutuantes em simultâneo.
+experimental-features-http3 =
+    .label = Protocolo HTTP/3
+experimental-features-http3-description = Suporte experimental para o protocolo HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Página:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } de { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Última página
-
+printpreview-homearrow-button =
+    .title = Primeira página
+printpreview-previousarrow-button =
+    .title = Página anterior
+printpreview-nextarrow-button =
+    .title = Página seguinte
+printpreview-endarrow-button =
+    .title = Última página
diff -Nru firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/pt-PT/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:52:04.000000000 +0000
+++ firefox-85.0+build1/l10n/pt-PT/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:44.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = até
+printui-page-custom-range-input =
+    .aria-label = Especifique o intervalo personalizado de páginas
+    .placeholder = por exemplo, 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Cópias
 printui-orientation = Orientação
@@ -48,6 +51,7 @@
 printui-options = Opções
 printui-headers-footers-checkbox = Imprimir cabeçalhos e rodapés
 printui-backgrounds-checkbox = Imprimir fundos
+printui-selection-checkbox = Imprimir apenas a seleção
 printui-color-mode-label = Modo de cor
 printui-color-mode-color = Cor
 printui-color-mode-bw = Preto e branco
@@ -56,19 +60,29 @@
 printui-margins-min = Mínima
 printui-margins-none = Nenhuma
 printui-margins-custom = Personalizadas
+printui-margins-custom-inches = Personalizado (polegadas)
 printui-margins-custom-top = Superior
+printui-margins-custom-top-inches = Topo (polegadas)
 printui-margins-custom-bottom = Inferior
+printui-margins-custom-bottom-inches = Inferior (polegadas)
 printui-margins-custom-left = Esquerda
+printui-margins-custom-left-inches = Esquerda (polegadas)
 printui-margins-custom-right = Direita
+printui-margins-custom-right-inches = Direita (polegadas)
 printui-system-dialog-link = Imprimir utilizando a janela do sistema…
 printui-primary-button = Imprimir
 printui-primary-button-save = Guardar
 printui-cancel-button = Cancelar
+printui-close-button = Fechar
 printui-loading = A preparar a pré-visualização
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Pré-visualização da impressão
+printui-pages-per-sheet = Páginas por folha
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = A imprimir…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/rm/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/aboutLogins.ftl	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/aboutLogins.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Allontanar questas infurmaziuns d'annunzia?
 confirm-delete-dialog-message = Questa acziun na po betg vegnir revocada.
 about-logins-confirm-remove-dialog-confirm-button = Allontanar
-about-logins-confirm-remove-all-dialog-confirm-button = Allontanar tut
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Allontanar
+        [one] Allontanar tut
+       *[other] Allontanar tut
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Gea, allontanar questa data d'annunzia
@@ -198,6 +203,8 @@
 about-logins-confirm-export-dialog-title = Exportar infurmaziuns d'annunzia e pleds-clav
 about-logins-confirm-export-dialog-message = Tes pleds-clav vegnan memorisads sco text legibel (p.ex. «M@lPledc1av»), uschia che mintgin che po avrir la datoteca exportada als po vesair.
 about-logins-confirm-export-dialog-confirm-button = Exportar…
+about-logins-alert-import-title = L'import è cumplet
+about-logins-alert-import-message = Mussar ina resumaziun detagliada da l'import
 confirm-discard-changes-dialog-title = Ignorar las modificaziuns betg memorisadas?
 confirm-discard-changes-dialog-message = Tut las modificaziuns betg memorisadas van a perder.
 confirm-discard-changes-dialog-confirm-button = Ignorar
@@ -259,3 +266,26 @@
         [macos] Document CSV
        *[other] Datoteca CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = L'import è cumplet
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Novas infurmaziuns d'annunzia agiuntadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Infurmaziuns d'annunzia existentas actualisadas:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Duplicats dad infurmaziuns d'annunzia:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(betg importà)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Errurs:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(betg importà)</span>
+    }
+about-logins-import-dialog-done = Finì
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/rm/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/appmenu.ftl	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/appmenu.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nova fanestra
+appmenuitem-new-private-window =
+    .label = Nova fanestra privata
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Engrondir
 appmenuitem-zoom-reduce =
     .label = Empitschnir
+appmenuitem-fullscreen =
+    .label = Maletg entir
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronisar ussa
+appmenuitem-save-page =
+    .label = Memorisar la pagina sut…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novaziuns
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/rm/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/appMenuNotifications.ftl	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/appMenuNotifications.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Betg ussa
     .secondarybuttonaccesskey = B
 appmenu-update-restart-message = Suenter reaviar restaurescha { -brand-shorter-name } tut tes tabs e tias fanestras avertas che n'èn betg en il modus privat.
+appmenu-update-other-instance =
+    .label = Impussibel dad actualisar automaticamain { -brand-shorter-name } a la pli nova versiun.
+    .buttonlabel = Tuttina actualisar { -brand-shorter-name }
+    .buttonaccesskey = T
+    .secondarybuttonlabel = Betg ussa
+    .secondarybuttonaccesskey = B
+appmenu-update-other-instance-message = Ina nova actualisaziun da { -brand-shorter-name } è disponibla, ma ella n'è betg vegnida installada perquai ch'ina autra copia da { -brand-shorter-name } vegn exequida. La serra per cuntinuar cun l'actualisaziun u tscherna da tuttina actualisar (tschella copia na funcziunescha eventualmain betg endretg enfin ch'ella vegn reaviada).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, chapì
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/browser.ftl firefox-85.0+build1/l10n/rm/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/browser.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/browser.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> controllescha il punctader. Smatga ESC per reacquistar la controlla.
 pointerlock-warning-no-domain = Quest document controllescha il punctader. Smatga ESC per reacquistar la controlla.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Mussar tut ils segnapaginas
+bookmarks-recent-bookmarks =
+    .value = Tschernì dacurt sco segnapagina
+bookmarks-toolbar-chevron =
+    .tooltiptext = Mussar dapli segnapaginas
+bookmarks-sidebar-content =
+    .aria-label = Segnapaginas
+bookmarks-menu-button =
+    .label = Menu da segnapaginas
+bookmarks-other-bookmarks-menu =
+    .label = Auters segnapaginas
+bookmarks-mobile-bookmarks-menu =
+    .label = Segnapaginas mobils
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Zuppentar la trav laterala da segnapaginas
+           *[other] Mussar la trav laterala da segnapaginas
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Zuppentar la trav d'utensils da segnapaginas
+           *[other] Mussar la trav d'utensils da segnapaginas
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Allontanar il menu da segnapaginas da la trav d'utensils
+           *[other] Agiuntar il menu da segnapaginas a la trav d'utensils
+        }
+bookmarks-search =
+    .label = Tschertgar en ils segnapaginas
+bookmarks-tools =
+    .label = Utensils da segnapaginas
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Trav d'utensils dals segnapaginas
+    .accesskey = u
+    .aria-label = Segnapaginas
+bookmarks-toolbar-menu =
+    .label = Trav d'utensils dals segnapaginas
+bookmarks-toolbar-placeholder =
+    .title = Simbols dals segnapaginas
+bookmarks-toolbar-placeholder-button =
+    .label = Simbols dals segnapaginas
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Segnapaginas
+library-bookmarks-bookmark-this-page =
+    .label = Agiuntar in segnapagina…
+library-bookmarks-bookmark-edit =
+    .label = Modifitgar quest segnapagina
+library-recent-activity-label = Activitad recenta
+
+## More items
+
+more-menu-go-offline =
+    .label = Lavurar offline
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/rm/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/newtab/asrouter.ftl	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/newtab/asrouter.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -120,6 +120,9 @@
 
 cfr-whatsnew-searchbar-title = Tippar main e chattar dapli cun la trav d'adressas
 cfr-whatsnew-searchbar-body-topsites = Ussa tanschi da tscherner la trav d'adressas ed ina chascha cun colliaziuns a tias paginas principalas s'avra.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Icona da marella
 
 ## Picture-in-Picture
@@ -275,3 +278,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Scursanidas da tschertga en la trav d'adressas
 cfr-whatsnew-search-shortcuts-body = Da nov cumpara ina scursanida blaua en las propostas da tschertgar sche ti tippas il num dad ina maschina da tschertgar u in'adressa specifica en la trav d'adressas. Tscherna questa scursanida per tschertgar directamain en la trav d'adressas.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Protecziun cunter supercookies malvulents
+cfr-whatsnew-supercookies-body = Websites pon deponer a la zuppada in «supercookie» en tes navigatur che ta persequitescha en il web – perfin suenter avair stizzà tes cookies. { -brand-short-name } porscha ussa ina ferma protecziun cunter supercookies per ch'els na possian betg servir per ta fastizar dad ina website a la proxima.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Administraziun da segnapaginas optimada
+cfr-whatsnew-bookmarking-body = Igl è pli simpel da tegnair en egl tias websites preferidas. { -brand-short-name } tegna ussa endament tes ordinatur preferì per segnapaginas memorisads, mussa gia en la configuraziun da standard la trav da segnapaginas en novs tabs e ta porscha in access simpel al rest da tes segnapaginas via in ordinatur en la trav d'utensils.
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/rm/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/newtab/newtab.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/newtab/newtab.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nov tab
 newtab-settings-button =
     .title = Persunalisar tia pagina per novs tabs
+newtab-personalize-button-label = Persunalisar
+    .title = Persunalisar novs tabs
+    .aria-label = Persunalisar novs tabs
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Tschertgar en il Web
     .title = Tschertgar en il Web
     .aria-label = Tschertgar en il Web
+newtab-search-box-text = Tschertgar en il web
+newtab-search-box-input =
+    .placeholder = Tschertgar en il web
+    .aria-label = Tschertgar en il web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Agiuntar maschina da tschertgar
 newtab-topsites-add-topsites-header = Nova pagina principala
+newtab-topsites-add-shortcut-header = Nova scursanida
 newtab-topsites-edit-topsites-header = Modifitgar la pagina principala
+newtab-topsites-edit-shortcut-header = Modifitgar la scursanida
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Endatar in titel
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oha, igl è succedì in sbagl cun chargiar il cuntegn.
 newtab-error-fallback-refresh-link = Rechargia la pagina per reempruvar.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Scursanidas
+newtab-custom-shortcuts-subtitle = Websites che ti memoriseschas u visitas
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } lingia
+       *[other] { $num } lingias
+    }
+newtab-custom-sponsored-sites = Scursanidas sponsuradas
+newtab-custom-pocket-title = Recumandà da { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Cuntegn excepziunal, tschernì da { -pocket-brand-name }, in product da { -brand-product-name }
+newtab-custom-pocket-sponsored = Artitgels sponsurads
+newtab-custom-recent-title = Activitad recenta
+newtab-custom-recent-subtitle = Ina selecziun da websites e cuntegn visità dacurt
+newtab-custom-close-button = Serrar
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Zinslas
+newtab-custom-snippets-subtitle = Tips e novitads da { -vendor-short-name } e { -brand-product-name }
+newtab-custom-settings = Administrar ulteriurs parameters
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/places.ftl firefox-85.0+build1/l10n/rm/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/places.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/places.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Sutordinatur
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Auters segnapaginas
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/rm/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/preferences/preferences.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/preferences/preferences.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Las paginas che ti visitas il pli savens
 home-prefs-topsites-by-option-sponsored =
     .label = Websites principalas sponsurisadas
+home-prefs-shortcuts-header =
+    .label = Scursanidas
+home-prefs-shortcuts-description = Websites che ti memoriseschas u visitas
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Scursanidas sponsuradas
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Recumandà da { $provider }
 home-prefs-recommended-by-description-update = Cuntegn excepziunal ord il web, tschernì da { $provider }
+home-prefs-recommended-by-description-new = Cuntegn spezial, tschernì da { $provider } che fa part da { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Artitgels sponsurads
 home-prefs-highlights-header =
     .label = Accents
-home-prefs-recent-activity-header =
-    .label = Activitad recenta
 home-prefs-highlights-description = Ina selecziun da paginas che ti has memorisà u visità
 home-prefs-highlights-option-visited-pages =
     .label = Paginas visitadas
@@ -526,6 +530,9 @@
     .label = L'ultima telechargiada
 home-prefs-highlights-option-saved-to-pocket =
     .label = Paginas memorisadas en { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Activitad recenta
+home-prefs-recent-activity-description = Ina selecziun da websites e cuntegn visità dacurt
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Zinslas
 home-prefs-snippets-description = Novitads da { -vendor-short-name } e { -brand-product-name }
+home-prefs-snippets-description-new = Tips e novitads da { -vendor-short-name } e { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Tabs averts
     .accesskey = b
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Scursanidas
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Paginas preferidas
     .accesskey = P
+addressbar-locbar-engines-option =
+    .label = Maschinas da tschertgar
+    .accesskey = a
 addressbar-suggestions-settings = Midar las preferenzas per propostas da maschinas da tschertgar
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/rm/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/rm/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/rm/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Mo en in nov tab
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Adina mussar
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Mai mussar
+    .accesskey = M
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Mo mussar en in nov tab
+    .accesskey = o
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Mussar auters segnapaginas
     .accesskey = u
diff -Nru firefox-84.0.2+build1/l10n/rm/devtools/client/markers.properties firefox-85.0+build1/l10n/rm/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/rm/devtools/client/markers.properties	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/devtools/client/markers.properties	2021-01-18 20:07:48.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/rm/devtools/client/toolbox.properties firefox-85.0+build1/l10n/rm/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/rm/devtools/client/toolbox.properties	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/devtools/client/toolbox.properties	2021-01-18 20:07:48.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Show Split Console
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/rm/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/rm/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/rm/devtools/client/tooltips.ftl	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/devtools/client/tooltips.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> has no effect on this element since it’s not a positioned element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> has no effect on this element since <strong>overflow:hidden</strong> is not set.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> has no effect on this element because its <strong>outline-style</strong> is <strong>auto</strong> or <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> has no effect on internal table elements.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> has no effect on internal table elements except table cells.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Try removing <strong>float</strong> or adding <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Try setting its <strong>position</strong> property to something other than <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Try adding <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Try setting its <strong>display</strong> property to something else than <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Try setting its <strong>display</strong> property to something else than <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, or <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Try setting its <strong>outline-style</strong> property to something other than <strong>auto</strong> or <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/rm/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/rm/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/rm/dom/chrome/dom/dom.properties	2021-01-06 11:52:08.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/dom/chrome/dom/dom.properties	2021-01-18 20:07:48.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Il selectur <input> è vegnì bloccà perquai ch'el n'è betg vegnì activà da l'utilisader.
 ExternalProtocolFrameBlockedNoUserActivation=In iframe cun protocol extern è vegnì bloccà perquai ch'el n'è betg vegnì activà da l'utilisader u perquai ch'i n'è betg passà avunda temp dapi che l'ultim iframe da quest gener è vegnì chargià.
 MultiplePopupsBlockedNoUserActivation=L'avertura da plirs pop-ups è vegnida bloccada perquai ch'ella n'è betg vegnida activada da l'utilisader.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Il prechargiar da %S è vegnì ignorà pervia da valurs «as» u «type» nunenconuschentas u in attribut «media» senza correspundenza.
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/rm/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/rm/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:07:48.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=di;dis
 
 downloadErrorAlertTitle=Errur cun telechargiar
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Impussibel da memorisar la telechargiada perquai ch'ella vegn bloccada da %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Impussibel da memorisar la telechargiada perquai ch'ella vegn bloccada dad ina extensiun.
 downloadErrorGeneric=La telechargiada na po betg vegnir memorisada pervi d'ina errur nunenconuschenta.\n\nEmprova per plaschair anc ina giada.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Anc in pèr secundas
 timeUnknown2=Temp restant betg enconuschent
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=Resursa da %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/rm/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/rm/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:07:48.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Refusà la connexiun al proxy server
 check_error-2153390069=Il certificat dal server è scrudà (actualisescha la data ed il temp da tes sistem, sche quels èn incorrects)
 check_error-verification_failed=Impussibel da garantir l'integritad da l'actualisaziun
+check_error-move_failed=Betg reussì da preparar l'actualisaziun per l'installaziun
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/rm/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Moduls da terzas partidas
+support-third-party-modules-module = Datoteca dal modul
+support-third-party-modules-version = Versiun da la datoteca
+support-third-party-modules-vendor = Infurmaziuns dal vendider
+support-third-party-modules-occurrence = Occurrenzas
+support-third-party-modules-process = Tip da process & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Adressa imagebase
+support-third-party-modules-uptime = Temp d'activitad dal process (ms)
+support-third-party-modules-duration = Temp per chargiar (ms)
+support-third-party-modules-empty = Na chargià nagin modul da terzas partidas.
+support-third-party-modules-no-value = (nagina valur)
+support-third-party-modules-button-open =
+    .title = Avrir l'ordinatur da la datoteca…
+support-third-party-modules-expand =
+    .title = Mussar infurmaziuns detagliadas
+support-third-party-modules-collapse =
+    .title = Reducir las infurmaziuns detagliadas
+support-third-party-modules-unsigned-icon =
+    .title = Quest modul n'è betg signà
+support-third-party-modules-folder-icon =
+    .title = Avrir l'ordinatur da la datoteca…
+support-third-party-modules-down-icon =
+    .title = Mussar infurmaziuns detagliadas
+support-third-party-modules-up-icon =
+    .title = Reducir las infurmaziuns detagliadas
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/rm/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Sustegn per pliras fanestras maletg-en-maletg
 experimental-features-multi-pip-description = Sustegn experimental per permetter pliras fanestras maletg-en-maletg avertas il medem mument.
+experimental-features-http3 =
+    .label = Protocol HTTP/3
+experimental-features-http3-description = Sustegn experimental per il protocol HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/rm/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Pagina:
     .accesskey = P
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } da { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Ultima pagina
-
+printpreview-homearrow-button =
+    .title = Emprima pagina
+printpreview-previousarrow-button =
+    .title = Pagina precedenta
+printpreview-nextarrow-button =
+    .title = Proxima pagina
+printpreview-endarrow-button =
+    .title = Ultima pagina
diff -Nru firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/rm/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/rm/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:52:09.000000000 +0000
+++ firefox-85.0+build1/l10n/rm/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:07:48.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = enfin
+printui-page-custom-range-input =
+    .aria-label = Endatar in interval da paginas persunalisà
+    .placeholder = p.ex. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Copias
 printui-orientation = Orientaziun
@@ -48,6 +51,7 @@
 printui-options = Opziuns
 printui-headers-footers-checkbox = Stampar ils chaus-pagina ed ils pes-pagina
 printui-backgrounds-checkbox = Stampar ils funds davos
+printui-selection-checkbox = Mo stampar la selecziun
 printui-color-mode-label = Modus da colur
 printui-color-mode-color = Colur
 printui-color-mode-bw = Nair ed alv
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Nagins
 printui-margins-custom = Persunalisà
+printui-margins-custom-inches = Persunalisà (poleschs/inches)
 printui-margins-custom-top = Sura
+printui-margins-custom-top-inches = Sura (poleschs/inches)
 printui-margins-custom-bottom = Sut
+printui-margins-custom-bottom-inches = Sut (poleschs/inches)
 printui-margins-custom-left = A sanestra
+printui-margins-custom-left-inches = A sanestra (poleschs/inches)
 printui-margins-custom-right = A dretga
+printui-margins-custom-right-inches = A dretga (poleschs/inches)
 printui-system-dialog-link = Stampar cun agid dal dialog dal sistem…
 printui-primary-button = Stampar
 printui-primary-button-save = Memorisar
 printui-cancel-button = Interrumper
+printui-close-button = Serrar
 printui-loading = Preparar la prevista
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Prevista da stampa
+printui-pages-per-sheet = Paginas per fegl
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Stampar…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ro/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ro/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ro/browser/browser/appmenu.ftl	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/browser/browser/appmenu.ftl	2021-01-18 20:07:56.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Fereastră nouă
+appmenuitem-new-private-window =
+    .label = Fereastră privată nouă
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Mărește
 appmenuitem-zoom-reduce =
     .label = Micșorează
+appmenuitem-fullscreen =
+    .label = Ecran complet
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sincronizează acum
+appmenuitem-save-page =
+    .label = Salvează pagina ca…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Ce este nou
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ro/browser/browser/browser.ftl firefox-85.0+build1/l10n/ro/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ro/browser/browser/browser.ftl	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/browser/browser/browser.ftl	2021-01-18 20:07:56.000000000 +0000
@@ -461,3 +461,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> controlează acum cursorul. Apasă Esc pentru a prelua controlul.
 pointerlock-warning-no-domain = Documentul controlează acum cursorul. Apasă Esc pentru a prelua controlul.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Afișează toate marcajele
+bookmarks-recent-bookmarks =
+    .value = Marcate recent
+bookmarks-toolbar-chevron =
+    .tooltiptext = Afișează mai multe marcaje
+bookmarks-sidebar-content =
+    .aria-label = Marcaje
+bookmarks-menu-button =
+    .label = Meniu de marcaje
+bookmarks-other-bookmarks-menu =
+    .label = Alte marcaje
+bookmarks-mobile-bookmarks-menu =
+    .label = Marcaje mobile
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ascunde bara laterală de marcaje
+           *[other] Vezi bara laterală de marcaje
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ascunde bara de marcaje
+           *[other] Vezi bara de marcaje
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Elimină meniul de marcaje din bara de unelte
+           *[other] Adaugă meniul de marcaje în bara de unelte
+        }
+bookmarks-search =
+    .label = Caută marcaje
+bookmarks-tools =
+    .label = Instrumente pentru marcaje
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bară de marcaje
+    .accesskey = B
+    .aria-label = Marcaje
+bookmarks-toolbar-menu =
+    .label = Bară de marcaje
+bookmarks-toolbar-placeholder =
+    .title = Elemente pe bara de marcaje
+bookmarks-toolbar-placeholder-button =
+    .label = Elemente pe bara de marcaje
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Marcaje
+library-bookmarks-bookmark-this-page =
+    .label = Marchează pagina
+library-bookmarks-bookmark-edit =
+    .label = Editează acest marcaj
+
+## More items
+
+more-menu-go-offline =
+    .label = Lucrează offline
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ro/devtools/client/accessibility.properties firefox-85.0+build1/l10n/ro/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/ro/devtools/client/accessibility.properties	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/devtools/client/accessibility.properties	2021-01-18 20:07:56.000000000 +0000
@@ -70,7 +70,7 @@
 # LOCALIZATION NOTE (accessibility.enable.disabledTitle): A title text used for
 # a tooltip for Enabled accessibility button when accessibility service can not
 # be enabled.
-accessibility.enable.disabledTitle=Nu se poate activa serviciul de accesibilitate. Este dezactivat din preferințele de confidențialitate ale serviciilor de accesibilitate.
+accessibility.enable.disabledTitle=Nu se poate activa serviciul de accesibilitate. Este dezactivat din preferințele de confidențialitate a serviciilor de accesibilitate.
 
 # LOCALIZATION NOTE (accessibility.enable.enabledTitle): A title text used for
 # a tooltip for Enabled accessibility button when accessibility service can be
@@ -298,3 +298,13 @@
 # LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
 # in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
 accessibility.simulation.achromatopsia=Acromatopsie (nicio culoare)
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.label): A title text for a checkbox label
+# in the accessibility panel toolbar that turns on/off the overlay of focusable elements in their
+# tabbing order.
+accessibility.toolbar.displayTabbingOrder.label=Afișează ordinea de tabulare
+
+# LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
+# tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
+# their tabbing order.
+accessibility.toolbar.displayTabbingOrder.tooltip=Afișează ordinea de tabulare a elementelor și indexul lor de tabulare.
diff -Nru firefox-84.0.2+build1/l10n/ro/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/ro/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/ro/devtools/client/netmonitor.properties	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/devtools/client/netmonitor.properties	2021-01-18 20:07:56.000000000 +0000
@@ -60,7 +60,7 @@
 
 # LOCALIZATION NOTE (collapseActionPane): This is the tooltip for the button
 # that collapses the network action pane in the UI.
-collapseActionPane=Ascunde acțiunea în rețea
+collapseActionPane=Ascunde acțiunea pentru rețea
 
 # LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
 # displayed when hovering over the tabs overflow button.
@@ -181,11 +181,11 @@
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.domContentLoaded): A tooltip explaining
 # what the DOMContentLoaded label displays
-networkMenu.summary.tooltip.domContentLoaded=Ora la care a avut loc evenimentul „DOMContentLoad�
+networkMenu.summary.tooltip.domContentLoaded=Durată după care a avut loc evenimentul „DOMContentLoad�
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.load): A tooltip explaining
 # what the load label displays
-networkMenu.summary.tooltip.load=Ora la care a avut loc evenimentul „load�
+networkMenu.summary.tooltip.load=Durată după care a avut loc evenimentul „load�
 
 # LOCALIZATION NOTE (networkMenu.summary.requestsCount2): This label is displayed
 # in the network table footer providing the number of requests
@@ -206,7 +206,7 @@
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.transferred): A tooltip explaining
 # what the transferred label displays
-networkMenu.summary.tooltip.transferred=Date / date transferate pentru toate cererile (requests)
+networkMenu.summary.tooltip.transferred=Dimensiunea/dimensiunea transferată a tuturor cererilor
 
 # LOCALIZATION NOTE (networkMenu.summary.finish): This label is displayed
 # in the network table footer providing the transfer time.
@@ -231,7 +231,7 @@
 
 # LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalSize): A tooltip explaining
 # what the framesTotalSize label displays
-networkMenu.ws.summary.tooltip.framesTotalSize=Mărime totală a mesajelor afișate
+networkMenu.ws.summary.tooltip.framesTotalSize=Dimensiune totală a mesajelor afișate
 
 # LOCALIZATION NOTE (networkMenu.ws.summary.label.framesTranferredSize): A label showing
 # summary size info related to the current list of WS messages
@@ -266,7 +266,7 @@
 # LOCALIZATION NOTE (networkMenu.sizeUnavailable.title): This is the tooltip
 # displayed in the network menu specifying that the transferred size of a
 # request is unavailable.
-networkMenu.sizeUnavailable.title=Mărimea transferului nu este disponibilă
+networkMenu.sizeUnavailable.title=Dimensiunea transferată nu este disponibilă
 
 # LOCALIZATION NOTE (networkMenu.sizeCached): This is the label displayed
 # in the network menu and the headers panel specifying the transfer or a request is
@@ -405,7 +405,7 @@
 
 # LOCALIZATION NOTE (charts.totalTransferredSize): This is the label displayed
 # in the performance analysis view for total transferred size, in kilobytes.
-charts.totalTransferredSize=Mărime transferată: %S KB
+charts.totalTransferredSize=Dimensiune transferată: %S KB
 
 # LOCALIZATION NOTE (charts.cacheEnabled): This is the label displayed
 # in the performance analysis view for "cache enabled" charts.
@@ -421,7 +421,7 @@
 
 # LOCALIZATION NOTE (charts.totalSize): This is the label displayed
 # in the performance analysis view for total requests size, in kilobytes.
-charts.totalSize=Mărime: %S KB
+charts.totalSize=Dimensiune: %S KB
 
 # LOCALIZATION NOTE (charts.totalSeconds): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -445,7 +445,7 @@
 
 # LOCALIZATION NOTE (charts.size): This is the label displayed
 # in the header column in the performance analysis view for size of the request.
-charts.size=Mărime
+charts.size=Dimensiune
 
 # LOCALIZATION NOTE (charts.type): This is the label displayed
 # in the header column in the performance analysis view for type of request.
@@ -640,7 +640,7 @@
 # LOCALIZATION NOTE (netmonitor.toolbar.contentSize): This is the label displayed
 # in the network table toolbar, above the "size" column, which is the
 # uncompressed / decoded size.
-netmonitor.toolbar.contentSize=Mărime
+netmonitor.toolbar.contentSize=Dimensiune
 
 # LOCALIZATION NOTE (netmonitor.toolbar.waterfall): This is the label displayed
 # in the network table toolbar, above the "waterfall" column.
@@ -648,7 +648,7 @@
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.size): This is the label displayed
 # in the messages table header, above the "size" column.
-netmonitor.ws.toolbar.size=Mărime
+netmonitor.ws.toolbar.size=Dimensiune
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.data): This is the label displayed
 # in the messages table header, above the "data" column.
@@ -802,15 +802,15 @@
 
 # LOCALIZATION NOTE (netmonitor.toolbar.requestBlocking): This is the tooltip displayed
 # over the toolbar's Request Blocking buttonn
-netmonitor.toolbar.requestBlocking=Blocare cereri
+netmonitor.toolbar.requestBlocking=Blocare de cereri
 
 # LOCALIZATION NOTE (netmonitor.actionbar.requestBlocking2): This is the label displayed
 # in the action bar's request blocking tab
-netmonitor.actionbar.requestBlocking2=Se blochează
+netmonitor.actionbar.requestBlocking2=Blocare
 
 # LOCALIZATION NOTE (netmonitor.actionbar.enableBlocking): This is the label displayed
 # in request blocking tab to represent if requests blocking should be enabled
-netmonitor.actionbar.enableBlocking=Activează blocarea cererilor
+netmonitor.actionbar.enableBlocking=Activează blocarea de cereri
 
 # LOCALIZATION NOTE (netmonitor.actionbar.blockSearchPlaceholder): This is the
 # placeholder text for the request addition form
@@ -1035,12 +1035,12 @@
 
 # LOCALIZATION NOTE (netmonitor.headers.size): This is the label displayed
 # in the network details headers tab identifying the size.
-netmonitor.headers.size=Mărime
+netmonitor.headers.size=Dimensiune
 
 # LOCALIZATION NOTE (networkMenu.headers.sizeDetails): This label is displayed
 # in the network details headers tab providing the size details.
 # %1$S is the transferred size, %2$S is the size.
-netmonitor.headers.sizeDetails=%1$S (mărime %2$S)
+netmonitor.headers.sizeDetails=%1$S (dimensiune %2$S)
 
 # LOCALIZATION NOTE (netmonitor.headers.version): This is the label displayed
 # in the network details headers tab identifying the http version.
@@ -1295,7 +1295,7 @@
 
 # LOCALIZATION NOTE (netmonitor.context.useAsFetch): This is the label displayed
 # on the context menu that copies the selected request as a fetch command.
-netmonitor.context.useAsFetch=Utilizare ca cerere Fetch în consolă
+netmonitor.context.useAsFetch=Folosește ca cerere Fetch în consolă
 
 # LOCALIZATION NOTE (netmonitor.context.useAsFetch.accesskey): This is the access key
 # for the Copy as fetch menu item displayed in the context menu for a request
@@ -1491,7 +1491,7 @@
 
 # LOCALIZATION NOTE (netmonitor.cache.dataSize): This is the label text for
 # the datasize of the cached object.
-netmonitor.cache.dataSize=Mărimea datelor
+netmonitor.cache.dataSize=Dimensiunea datelor
 
 # LOCALIZATION NOTE (netmonitor.cache.expires): This is the label text for the
 # expires time of the cached object.
@@ -1528,3 +1528,9 @@
 # LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
 # when the HAR copy menu item is hovered
 netmonitor.settings.copyHarTooltip=Copiază datele de rețea în clipboard
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
diff -Nru firefox-84.0.2+build1/l10n/ro/devtools/client/storage.properties firefox-85.0+build1/l10n/ro/devtools/client/storage.properties
--- firefox-84.0.2+build1/l10n/ro/devtools/client/storage.properties	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/devtools/client/storage.properties	2021-01-18 20:07:56.000000000 +0000
@@ -21,7 +21,6 @@
 tree.labels.sessionStorage=Stocare pentru sesiune
 tree.labels.indexedDB=DB indexată
 tree.labels.Cache=Stocare cache
-
 tree.labels.extensionStorage=Stocare extensii
 
 # LOCALIZATION NOTE (table.headers.*.*):
@@ -29,7 +28,6 @@
 # each type of storage available through the Storage Tree to the side.
 table.headers.cookies.name=Nume
 table.headers.cookies.value=Valoare
-
 table.headers.cookies.expires2=Expiră / Durată maximă
 table.headers.cookies.size=Mărime
 table.headers.cookies.lastAccessed2=Ultima accesare
@@ -71,11 +69,11 @@
 
 # LOCALIZATION NOTE (storage.popupMenu.deleteLabel):
 # Label of popup menu action to delete storage item.
-storage.popupMenu.deleteLabel=Șterge “%S�
+storage.popupMenu.deleteLabel=Șterge „%S�
 
 # LOCALIZATION NOTE (storage.popupMenu.addItemLabel):
 # Label of popup menu action to add an item.
-storage.popupMenu.addItemLabel=Adaugă element
+storage.popupMenu.addItemLabel=Adaugă un element
 
 # LOCALIZATION NOTE (storage.popupMenu.refreshItemLabel):
 # Label of popup menu action to refresh an item.
@@ -83,7 +81,7 @@
 
 # LOCALIZATION NOTE (storage.popupMenu.deleteAllFromLabel):
 # Label of popup menu action to delete all storage items.
-storage.popupMenu.deleteAllFromLabel=Șterge tot de la “%S�
+storage.popupMenu.deleteAllFromLabel=Șterge tot de la „%S�
 
 # LOCALIZATION NOTE (storage.idb.deleteBlocked):
 # Warning notification when IndexedDB database could not be deleted immediately.
diff -Nru firefox-84.0.2+build1/l10n/ro/dom/dom/media.ftl firefox-85.0+build1/l10n/ro/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ro/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/dom/dom/media.ftl	2021-01-18 20:07:56.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ro/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ro/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ro/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 11:53:36.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:07:56.000000000 +0000
@@ -385,6 +385,8 @@
 release-notes-loading = Se încarcă...
 release-notes-error = Ne pare rău, dar a intervenit o eroare la încărcarea notelor privind versiunea.
 addon-permissions-empty = Această extensie nu necesită nicio permisiune
+addon-permissions-required = Permisiuni necesare pentru funcționalitatea de bază:
+addon-permissions-learnmore = Află mai multe despre permisiuni
 recommended-extensions-heading = Extensii recomandate
 recommended-themes-heading = Teme recomandate
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
diff -Nru firefox-84.0.2+build1/l10n/ro/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ro/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ro/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ro/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:07:56.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ru/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/aboutLogins.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/aboutLogins.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Удалить �тот логин?
 confirm-delete-dialog-message = Это дей�твие нельз� отменить.
 about-logins-confirm-remove-dialog-confirm-button = Удалить
-about-logins-confirm-remove-all-dialog-confirm-button = Удалить в�е
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Удалить
+        [one] Удалить в�е
+        [few] Удалить в�е
+       *[many] Удалить в�е
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Да, удалить �тот логин
@@ -199,14 +205,16 @@
     }
 about-logins-confirm-remove-all-sync-dialog-message =
     { $count ->
-        [1] Это приведет к удалению логина, �охранённого вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизированных � вашим { -fxaccount-brand-name(case: "instrumental") }. Это также удалит предупреждени� об утечках, по�вл�ющих�� зде�ь. Вы не �можете отменить �то дей�твие.
-        [one] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизированных � вашим { -fxaccount-brand-name(case: "instrumental") }. Это также удалит предупреждени� об утечках, по�вл�ющих�� зде�ь. Вы не �можете отменить �то дей�твие.
-        [few] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизированных � вашим { -fxaccount-brand-name(case: "instrumental") }. Это также удалит предупреждени� об утечках, по�вл�ющих�� зде�ь. Вы не �можете отменить �то дей�твие.
-       *[many] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизированных � вашим { -fxaccount-brand-name(case: "instrumental") }. Это также удалит предупреждени� об утечках, по�вл�ющих�� зде�ь. Вы не �можете отменить �то дей�твие.
+        [1] Это приведет к удалению логина, �охранённого вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизируемых � вашим { -fxaccount-brand-name(case: "instrumental") }. Также будут удалены по�вл�ющие�� зде�ь предупреждени� об утечках. Вы не �можете отменить �то дей�твие.
+        [one] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизируемых � вашим { -fxaccount-brand-name(case: "instrumental") }. Также будут удалены по�вл�ющие�� зде�ь предупреждени� об утечках. Вы не �можете отменить �то дей�твие.
+        [few] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизируемых � вашим { -fxaccount-brand-name(case: "instrumental") }. Также будут удалены по�вл�ющие�� зде�ь предупреждени� об утечках. Вы не �можете отменить �то дей�твие.
+       *[many] Это приведет к удалению в�ех логинов, �охранённых вами в { -brand-short-name } на в�ех у�трой�твах, �инхронизируемых � вашим { -fxaccount-brand-name(case: "instrumental") }. Также будут удалены по�вл�ющие�� зде�ь предупреждени� об утечках. Вы не �можете отменить �то дей�твие.
     }
 about-logins-confirm-export-dialog-title = Эк�порт логинов и паролей
 about-logins-confirm-export-dialog-message = Ваши пароли будут �охранены в виде читаемого тек�та (например, BadP@ssw0rd), по�тому любой, кто может открыть файл � ними, �может их про�мотреть.
 about-logins-confirm-export-dialog-confirm-button = Эк�портировать…
+about-logins-alert-import-title = Импорт завершён
+about-logins-alert-import-message = По�мотреть подробную �водку импорта
 confirm-discard-changes-dialog-title = Отменить не�охранённые изменени�?
 confirm-discard-changes-dialog-message = В�е не�охранённые изменени� будут потер�ны.
 confirm-discard-changes-dialog-confirm-button = Отменить
@@ -268,3 +276,34 @@
         [macos] Документ CSV
        *[other] CSV-файл
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Импорт завершён
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Добавлены новые логины:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Добавлены новые логины:</span> <span data-l10n-name="count">{ $count }</span>
+       *[many] <span>Добавлены новые логины:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Обновлены �уще�твующие логины:</span> <span data-l10n-name="count">{ $count }</span>
+        [few] <span>Обновлены �уще�твующие логины:</span> <span data-l10n-name="count">{ $count }</span>
+       *[many] <span>Обновлены �уще�твующие логины:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span>�айдены повтор�ющие логины:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортирован)</span>
+        [few] <span>�айдены повтор�ющие логины:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортированы)</span>
+       *[many] <span>�айдены повтор�ющие логины:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортированы)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Ошибки:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортирован)</span>
+        [few] <span>Ошибки:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортированы)</span>
+       *[many] <span>Ошибки:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(не импортированы)</span>
+    }
+about-logins-import-dialog-done = Готово
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ru/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/appmenu.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/appmenu.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �овое окно
+appmenuitem-new-private-window =
+    .label = �овое приватное окно
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Увеличить
 appmenuitem-zoom-reduce =
     .label = Уменьшить
+appmenuitem-fullscreen =
+    .label = Полный �кран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Синхронизировать
+appmenuitem-save-page =
+    .label = Сохранить как…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Что нового
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/ru/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/appMenuNotifications.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = �е �ейча�
     .secondarybuttonaccesskey = е
 appmenu-update-restart-message = По�ле бы�трого перезапу�ка, { -brand-shorter-name } во��тановит в�е открытые вкладки и окна, которые не были открыты в режиме приватного про�мотра.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } не может автоматиче�ки обновить�� до по�ледней вер�ии.
+    .buttonlabel = В�ё равно обновить { -brand-shorter-name }
+    .buttonaccesskey = н
+    .secondarybuttonlabel = �е �ейча�
+    .secondarybuttonaccesskey = е
+appmenu-update-other-instance-message = До�тупно новое обновление { -brand-shorter-name }, но его нельз� у�тановить, так как запущена друга� копи� { -brand-shorter-name }. Закройте её, чтобы продолжить обновление, или выберите обновление в любом �лучае (друга� копи� может работать неправильно, пока вы её не перезапу�тите).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ок, пон�тно
     .buttonaccesskey = �
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/branding/sync-brand.ftl firefox-85.0+build1/l10n/ru/browser/browser/branding/sync-brand.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/branding/sync-brand.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/branding/sync-brand.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -22,6 +22,8 @@
     { $case ->
        *[nominative] �ккаунт Firefox
         [genitive] �ккаунта Firefox
+        [dative] �ккаунту Firefox
+        [accusative] �ккаунт Firefox
         [instrumental] �ккаунтом Firefox
         [prepositional] �ккаунте Firefox
     }
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/browser.ftl firefox-85.0+build1/l10n/ru/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/browser.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/browser.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -172,6 +172,7 @@
 page-action-send-tabs-panel =
     .label =
         { $tabCount ->
+            [1] Отправить вкладку на у�трой�тво
             [one] Отправить { $tabCount } вкладку на у�трой�тво
             [few] Отправить { $tabCount } вкладки на у�трой�тво
            *[many] Отправить { $tabCount } вкладок на у�трой�тво
@@ -179,6 +180,7 @@
 page-action-send-tabs-urlbar =
     .tooltiptext =
         { $tabCount ->
+            [1] Отправить вкладку на у�трой�тво
             [one] Отправить { $tabCount } вкладку на у�трой�тво
             [few] Отправить { $tabCount } вкладки на у�трой�тво
            *[many] Отправить { $tabCount } вкладок на у�трой�тво
@@ -227,7 +229,7 @@
 
 # This string prompts the user to use the list of search shortcuts in
 # the Urlbar and searchbar.
-search-one-offs-with-title = В �тот раз и�кать � помощью:
+search-one-offs-with-title = В �тот раз и�кать в:
 # This string won't wrap, so if the translated string is longer,
 # consider translating it as if it said only "Search Settings".
 search-one-offs-change-settings-button =
@@ -258,11 +260,11 @@
 ##    bookmarks).
 
 search-one-offs-bookmarks =
-    .tooltiptext = Закладки ({ $restrict })
+    .tooltiptext = Закладках ({ $restrict })
 search-one-offs-tabs =
-    .tooltiptext = Вкладки ({ $restrict })
+    .tooltiptext = Вкладках ({ $restrict })
 search-one-offs-history =
-    .tooltiptext = Журнал ({ $restrict })
+    .tooltiptext = Журнале ({ $restrict })
 
 ## Bookmark Panel
 
@@ -370,7 +372,7 @@
 popup-screen-sharing-never =
     .label = �икогда не разрешать
     .accesskey = и
-popup-silence-notifications-checkbox = Отключить уведомлени� от { -brand-short-name } е�ли к нему предо�тавлен до�туп
+popup-silence-notifications-checkbox = Отключить уведомлени� { -brand-short-name }, когда к нему предо�тавлен до�туп
 popup-silence-notifications-checkbox-warning = { -brand-short-name } не будет отображать уведомлени�, пока к нему предо�тавлен до�туп.
 
 ## WebRTC window or screen share tab switch warning
@@ -476,11 +478,11 @@
 # Variables
 #  $engine (String): the name of a search engine that searches the entire Web
 #  (e.g. Google).
-urlbar-result-action-tabtosearch-web = �айдите в { $engine } пр�мо из адре�ной �троки
+urlbar-result-action-tabtosearch-web = Ищите в { $engine } пр�мо в адре�ной �троке
 # Variables
 #  $engine (String): the name of a search engine that searches a specific site
 #  (e.g. Amazon).
-urlbar-result-action-tabtosearch-other-engine = �айдите в { $engine } пр�мо из адре�ной �троки
+urlbar-result-action-tabtosearch-other-engine = Ищите на { $engine } пр�мо в адре�ной �троке
 
 ## Action text shown in urlbar results, usually appended after the search
 ## string or the url, like "result value - action text".
@@ -503,5 +505,73 @@
 # Please ensure that the domain stays in the `<span data-l10n-name="domain">` markup.
 # Variables
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
-pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> контролирует ваш указатель мыши. �ажмите Esc, чтобы вернуть �ебе контроль.
-pointerlock-warning-no-domain = Этот документ контролирует ваш указатель мыши. �ажмите Esc, чтобы вернуть �ебе контроль.
+pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> контролирует ваш кур�ор. �ажмите Esc, чтобы вернуть �ебе контроль.
+pointerlock-warning-no-domain = Этот документ контролирует ваш кур�ор. �ажмите Esc, чтобы вернуть �ебе контроль.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Показать в�е закладки
+bookmarks-recent-bookmarks =
+    .value = �едавно добавленные закладки
+bookmarks-toolbar-chevron =
+    .tooltiptext = Показать больше закладок
+bookmarks-sidebar-content =
+    .aria-label = Закладки
+bookmarks-menu-button =
+    .label = Меню закладок
+bookmarks-other-bookmarks-menu =
+    .label = Другие закладки
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобильные закладки
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скрыть боковую панель закладок
+           *[other] Показать боковую панель закладок
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Скрыть панель закладок
+           *[other] Показать панель закладок
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Удалить меню закладок � панели
+           *[other] Добавить меню закладок на панель
+        }
+bookmarks-search =
+    .label = Пои�к закладок
+bookmarks-tools =
+    .label = Ин�трументы закладок
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Панель закладок
+    .accesskey = з
+    .aria-label = Закладки
+bookmarks-toolbar-menu =
+    .label = Панель закладок
+bookmarks-toolbar-placeholder =
+    .title = Элементы панели закладок
+bookmarks-toolbar-placeholder-button =
+    .label = Элементы панели закладок
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Закладки
+library-bookmarks-bookmark-this-page =
+    .label = Добавить �траницу в закладки
+library-bookmarks-bookmark-edit =
+    .label = Редактировать �ту закладку
+library-recent-activity-label = По�ледние дей�тви�
+
+## More items
+
+more-menu-go-offline =
+    .label = Работать автономно
+    .accesskey = б
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ru/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/asrouter.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/newtab/asrouter.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -125,6 +125,9 @@
 
 cfr-whatsnew-searchbar-title = С новой �трокой адре�а можно печатать меньше и находить больше
 cfr-whatsnew-searchbar-body-topsites = Теперь щёлкните по адре�ной �троке и она ра�ширит�� �пи�ком ваших попул�рных �айтов.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Значок увеличительного �текла
 
 ## Picture-in-Picture
@@ -232,7 +235,7 @@
 
 ## Picture-in-Picture fullscreen message
 
-cfr-whatsnew-pip-fullscreen-header = Про�матривайте картинку в картинке в полно�кранном режиме
+cfr-whatsnew-pip-fullscreen-header = «Картинка в картинке» в полно�кранном режиме
 cfr-whatsnew-pip-fullscreen-body = Теперь, когда вы выно�ите видео в плавающее окно, вы можете дважды щёлкнуть по �тому окну и перейти в полно�кранный режим.
 cfr-whatsnew-pip-fullscreen-icon-alt = Значок «Картинка в картинке»
 
@@ -277,3 +280,18 @@
 cfr-whatsnew-media-keys-header = Больше �ред�тв управлени� медиа
 cfr-whatsnew-media-keys-body = �ачинайте и о�танавливайте во�произведение аудио или видео при помощи вашей клавиатуры или наушников, дела� удобным контроль во�произведени� из другой вкладки, программы, или даже �крана блокировки компьютера. Кроме того, вы можете переключать�� между треками, и�пользу� клавиши вперед и назад.
 cfr-whatsnew-media-keys-button = Узнайте как
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Бы�трые клавиши дл� пои�ка в адре�ной �троке
+cfr-whatsnew-search-shortcuts-body = Теперь при наборе названи� пои�ковой �и�темы или определенного �айта в адре�ной �троке, под ней, в пои�ковых предложени�х, по�вит�� �иний �рлык. Выберите �тот �рлык, чтобы �овершить пои�к пр�мо из адре�ной �троки.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Защита от вредоно�ных �уперкук
+cfr-whatsnew-supercookies-body = Веб-�айты могут тайно у�танавливать «�уперкуки» в вашем браузере, которые могут от�леживать ва� в Интернете, даже е�ли вы удалите в�е куки. { -brand-short-name } теперь обе�печивает надёжную защиту против �уперкук, так что их нельз� будет и�пользовать дл� меж�айтового от�леживани�.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Улучшенные закладки
+cfr-whatsnew-bookmarking-body = Стало проще �ледить за �воими любимыми �айтами. { -brand-short-name } теперь запоминает ме�то, куда вы предпочитаете �охран�ть закладки, показывает панель закладок по умолчанию в новых вкладках, а также позвол�ет легко получить до�туп к о�тальным закладкам через папку на панели ин�трументов.
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ru/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/newtab.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ова� вкладка
 newtab-settings-button =
     .title = �а�троить �вою �траницу новой вкладки
+newtab-personalize-button-label = Пер�онализировать
+    .title = Пер�онализировать новую вкладку
+    .aria-label = Пер�онализировать новую вкладку
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = И�кать в Интернете
     .title = И�кать в Интернете
     .aria-label = И�кать в Интернете
+newtab-search-box-text = Пои�к в Интернете
+newtab-search-box-input =
+    .placeholder = Пои�к в Интернете
+    .aria-label = Пои�к в Интернете
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Добавить пои�ковую �и�тему
 newtab-topsites-add-topsites-header = �овый �айт в топе
+newtab-topsites-add-shortcut-header = �овый �рлык
 newtab-topsites-edit-topsites-header = Изменить �айт из топа
+newtab-topsites-edit-shortcut-header = Изменить �рлык
 newtab-topsites-title-label = Заголовок
 newtab-topsites-title-input =
     .placeholder = Введите название
@@ -207,3 +216,28 @@
 
 newtab-error-fallback-info = К �ожалению что-то пошло не так при загрузке �того �одержимого.
 newtab-error-fallback-refresh-link = Обновить �траницу, чтобы попробовать ещё раз.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Ярлыки
+newtab-custom-shortcuts-subtitle = Сайты, которые вы �охран�ете или по�ещаете
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } �трока
+        [few] { $num } �троки
+       *[many] { $num } �трок
+    }
+newtab-custom-sponsored-sites = Спон�ируемые �рлыки
+newtab-custom-pocket-title = Рекомендуемые { -pocket-brand-name }
+newtab-custom-pocket-subtitle = О�обый контент, курируемый { -pocket-brand-name }, ча�тью �емей�тва { -brand-product-name }
+newtab-custom-pocket-sponsored = Статьи �пон�оров
+newtab-custom-recent-title = По�ледние дей�тви�
+newtab-custom-recent-subtitle = Подборка недавних �айтов и контента
+newtab-custom-close-button = Закрыть
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Заметки
+newtab-custom-snippets-subtitle = Советы и ново�ти от { -vendor-short-name } и { -brand-product-name }
+newtab-custom-settings = Управление дополнительными на�тройками
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/ru/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/newtab/onboarding.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/newtab/onboarding.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -142,32 +142,32 @@
 # Tooltip displayed on hover of automatic theme
 onboarding-multistage-theme-tooltip-automatic-2 =
     .title =
-        �а�ледует внешний вид вашей операционной
+        И�пользует тему вашей операционной
         �и�темы дл� кнопок, меню и окон.
 # Input description for automatic theme
 onboarding-multistage-theme-description-automatic-2 =
     .aria-description =
-        �а�ледует внешний вид вашей операционной
+        И�пользует тему вашей операционной
         �и�темы дл� кнопок, меню и окон.
 # Tooltip displayed on hover of light theme
 onboarding-multistage-theme-tooltip-light-2 =
     .title =
-        И�пользует �ветлый внешний вид дл� кнопок,
+        И�пользует �ветлую тему дл� кнопок,
         меню и окон.
 # Input description for light theme
 onboarding-multistage-theme-description-light =
     .aria-description =
-        И�пользует �ветлый внешний вид дл� кнопок,
+        И�пользует �ветлую тему дл� кнопок,
         меню и окон.
 # Tooltip displayed on hover of dark theme
 onboarding-multistage-theme-tooltip-dark-2 =
     .title =
-        И�пользует тёмный внешний вид дл� кнопок,
+        И�пользует тёмную тему дл� кнопок,
         меню и окон.
 # Input description for dark theme
 onboarding-multistage-theme-description-dark =
     .aria-description =
-        И�пользует тёмный внешний вид дл� кнопок,
+        И�пользует тёмную тему дл� кнопок,
         меню и окон.
 # Tooltip displayed on hover of Alpenglow theme
 onboarding-multistage-theme-tooltip-alpenglow-2 =
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/places.ftl firefox-85.0+build1/l10n/ru/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/places.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/places.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Вложенна� папка
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Другие закладки
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/ru/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -73,14 +73,14 @@
 
 ## Do not translate "SameSite", it's the name of a cookie attribute.
 
-policy-LegacySameSiteCookieBehaviorEnabled = И�пользовать на�тройку у�таревшего поведени� куки SameSite по умолчанию.
+policy-LegacySameSiteCookieBehaviorEnabled = И�пользовать у�таревшее поведение атрибута SameSite куки по умолчанию.
 policy-LegacySameSiteCookieBehaviorEnabledForDomainList = Переключить�� на у�таревшее поведение SameSite дл� кук на выбранных �айтах.
 
 ##
 
 policy-LocalFileLinks = Разрешает определённым веб-�айтам ��ылать�� на локальные файлы.
-policy-MasterPassword = Требовать или не давать и�пользовать ма�тер-пароль.
 policy-ManagedBookmarks = �а�траивает �пи�ок закладок, управл�емых админи�тратором и недо�тупных дл� изменени� пользователем.
+policy-MasterPassword = Требовать или не давать и�пользовать ма�тер-пароль.
 policy-PrimaryPassword = Требовать или не давать и�пользовать ма�тер-пароль.
 policy-NetworkPrediction = Включает или отключает прогнозирование �ети (предварительна� выборка DNS).
 policy-NewTabPage = Включает или отключает �траницу новой вкладки.
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ru/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/preferences/preferences.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -353,7 +353,7 @@
 
 drm-content-header = Содержимое и�пользующее техниче�кие �ред�тва защиты автор�ких прав (DRM)
 play-drm-content =
-    .label = Во�производить контролируемое DRM �одержимое
+    .label = Во�производить защищённое DRM �одержимое
     .accesskey = п
 play-drm-content-learn-more = Подробнее
 update-application-title = Обновлени� { -brand-short-name }
@@ -472,7 +472,7 @@
 home-mode-choice-default =
     .label = Домашн�� �траница Firefox (по умолчанию)
 home-mode-choice-custom =
-    .label = Мои URL...
+    .label = Мой URL...
 home-mode-choice-blank =
     .label = Пу�та� �траница
 home-homepage-custom-url =
@@ -503,6 +503,11 @@
 home-prefs-topsites-description = Сайты, которые вы чаще в�его по�ещаете
 home-prefs-topsites-by-option-sponsored =
     .label = Топ �айтов �пон�оров
+home-prefs-shortcuts-header =
+    .label = Ярлыки
+home-prefs-shortcuts-description = Сайты, которые вы �охран�ете или по�ещаете
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Спон�ируемые �рлыки
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -510,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Рекомендовано { $provider }
 home-prefs-recommended-by-description-update = Интере�ные материалы из Интернета, подобранные { $provider }
+home-prefs-recommended-by-description-new = О�обый контент, курируемый { $provider }, ча�тью �емей�тва { -brand-product-name }
 
 ##
 
@@ -518,8 +524,6 @@
     .label = Статьи �пон�оров
 home-prefs-highlights-header =
     .label = Избранное
-home-prefs-recent-activity-header =
-    .label = По�ледние дей�тви�
 home-prefs-highlights-description = Избранные �айты, которые вы �охранили или по�ещали
 home-prefs-highlights-option-visited-pages =
     .label = По�ещённые �траницы
@@ -529,6 +533,9 @@
     .label = �едавние загрузки
 home-prefs-highlights-option-saved-to-pocket =
     .label = Страницы, �охранённые в { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = По�ледние дей�тви�
+home-prefs-recent-activity-description = Подборка недавних �айтов и контента
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Заметки
 home-prefs-snippets-description = Обновлени� от { -vendor-short-name } и { -brand-product-name }
+home-prefs-snippets-description-new = Советы и ново�ти от { -vendor-short-name } и { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -574,7 +582,7 @@
     .label = Отображать пои�ковые предложени� перед и�торией веб-�ёрфинга при и�пользовании панели адре�а
 search-show-suggestions-private-windows =
     .label = Отображать пои�ковые предложени� в Приватных окнах
-suggestions-addressbar-settings-generic = Изменить на�тройки дл� других предложений дл� адре�ной �троки
+suggestions-addressbar-settings-generic = Изменить другие на�тройки предложений в адре�ной �троке
 search-suggestions-cant-show = При и�пользовании панели адре�а пои�ковые предложени� отображать�� не будут, так как вы на�троили { -brand-short-name } никогда не запоминать и�торию.
 search-one-click-header = Пои�к одним щелчком
 search-one-click-header2 = Значки пои�ковых �и�тем
@@ -928,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = из открытых вкладок
     .accesskey = к
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = из �рлыков
+    .accesskey = з
 addressbar-locbar-topsites-option =
     .label = из топа �айтов
     .accesskey = й
+addressbar-locbar-engines-option =
+    .label = из пои�ковых �и�тем
+    .accesskey = Ñ‹
 addressbar-suggestions-settings = Изменить на�тройки дл� предложений пои�ковых �и�тем
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/protections.ftl firefox-85.0+build1/l10n/ru/browser/browser/protections.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/protections.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/protections.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -10,7 +10,6 @@
         [few] { -brand-short-name } заблокировал { $count } трекера за по�леднюю неделю
        *[many] { -brand-short-name } заблокировал { $count } трекеров за по�леднюю неделю
     }
-
 # Variables:
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
@@ -21,57 +20,43 @@
         [few] <b>{ $count }</b> трекера заблокировано � { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
        *[many] <b>{ $count }</b> трекеров заблокировано � { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
-
 # Text displayed instead of the graph when in Private Mode
 graph-private-window = { -brand-short-name } продолжает блокировать трекеры во врем� работы в режиме Приватного про�мотра, но не ведет запи�ь того, что было заблокировано.
 # Weekly summary of the graph when the graph is empty in Private Mode
 graph-week-summary-private-window = Трекеры, заблокированные { -brand-short-name } на �той неделе.
-
 protection-report-webpage-title = Панель �о�то�ни� защиты
 protection-report-page-content-title = Панель �о�то�ни� защиты
 # This message shows when all privacy protections are turned off, which is why we use the word "can", Firefox is able to protect your privacy, but it is currently not.
 protection-report-page-summary = { -brand-short-name } может незаметно защищать вашу приватно�ть во врем� пребывани� в Интернете. Это пер�онализированна� �водка �о�то�ни� защиты, включа� �ред�тва контрол� вашей безопа�но�ти в Интернете.
 # This message shows when at least some protections are turned on, we are more assertive compared to the message above, Firefox is actively protecting you.
 protection-report-page-summary-default = { -brand-short-name } незаметно защищает вашу приватно�ть во врем� пребывани� в Интернете. Это пер�онализированна� �водка �о�то�ни� защиты, включа� �ред�тва контрол� вашей безопа�но�ти в Интернете.
-
 protection-report-settings-link = Управление на�тройками защиты и приватно�ти
-
 etp-card-title-always = Улучшенна� защита от от�леживани�: в�егда включена
 etp-card-title-custom-not-blocking = Улучшенна� защита от от�леживани�: ОТКЛЮЧЕ��
 etp-card-content-description = { -brand-short-name } автоматиче�ки блокирует тайную �лежку компаний за вами в Интернете.
 protection-report-etp-card-content-custom-not-blocking = В�е защиты в на�то�щее врем� отключены. Выберите, какие трекеры нужно блокировать, управл�� на�тройками защиты { -brand-short-name }.
 protection-report-manage-protections = Управление на�тройками
-
 # 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 = Сегодн�
-
 # This string is used to describe the graph for screenreader users.
 graph-legend-description = График �одержит общее чи�ло трекеров каждого типа, заблокированных на �той неделе.
-
 social-tab-title = Трекеры �оциальных �етей
 social-tab-contant = Социальные �ети размещают трекеры на других веб-�айтах, чтобы �ледить за тем, что вы делаете, видите и �мотрите в Интернете. Это позвол�ет их владельцам узнавать о ва� больше, чем вы указываете в �воих профил�х в �оциальных �ет�х. <a data-l10n-name="learn-more-link">Подробнее</a>
-
 cookie-tab-title = Меж�айтовые от�леживающие куки
 cookie-tab-content = Такие куки ход�т за вами � �айта на �айт дл� �бора информации о том, что вы делаете в Интернете. Они у�танавливают�� такими �торонними организаци�ми, как рекламодатели и аналитиче�кие компании. Блокировка меж�айтовых от�леживающих куков �нижает количе�тво рекламы, от�леживающей ва�. <a data-l10n-name="learn-more-link">Подробнее</a>
-
 tracker-tab-title = От�леживающее �одержимое
 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>
-
 cryptominer-tab-title = Криптомайнеры
 cryptominer-tab-content = Криптомайнеры и�пользуют вычи�лительные мощно�ти вашей �и�темы дл� добычи цифровых валют. Такие �крипты разр�жают вашу батарею, замедл�ют работу компьютера и могут увеличить ваш �чёт за �лектро�нергию. <a data-l10n-name="learn-more-link">Подробнее</a>
-
 protections-close-button2 =
     .aria-label = Закрыть
     .title = Закрыть
-  
 mobile-app-title = Блокируйте рекламные трекеры �разу на не�кольких у�трой�твах
 mobile-app-card-content = И�пользуйте мобильный браузер �о в�троенной защитой от рекламных трекеров.
 mobile-app-links = Браузер { -brand-product-name } дл� <a data-l10n-name="android-mobile-inline-link">Android</a> и <a data-l10n-name="ios-mobile-inline-link">iOS</a>
-
 lockwise-title = �икогда больше не забывайте �вои пароли
 lockwise-title-logged-in2 = Управление парол�ми
 lockwise-header-content = { -lockwise-brand-name } надёжно хранит пароли в вашем браузере.
@@ -83,16 +68,15 @@
 lockwise-mobile-app-title = Возьмите �вои пароли � �обой
 lockwise-no-logins-card-content = И�пользуйте пароли, �охранённые в { -brand-short-name }, на любом у�трой�тве.
 lockwise-app-links = { -lockwise-brand-name } дл� <a data-l10n-name="lockwise-android-inline-link">Android</a> и <a data-l10n-name="lockwise-ios-inline-link">iOS</a>
-
 # Variables:
 # $count (Number) - Number of passwords exposed in data breaches.
 lockwise-scanned-text-breached-logins =
     { $count ->
-        [one] 1 пароль возможно был обнаружен в результате утечки данных.
-        [few] { $count } парол� возможно были обнаружены в результате утечки данных.
-       *[many] { $count } паролей возможно были обнаружены в результате утечки данных.
+        [1] Возможно, произошла утечка одного парол�.
+        [one] Возможно, произошла утечка { $count } парол�.
+        [few] Возможно, произошла утечка { $count } паролей.
+       *[many] Возможно, произошла утечка { $count } паролей.
     }
-
 # While English doesn't use the number in the plural form, you can add $count to your language
 # if needed for grammatical reasons.
 # Variables:
@@ -104,10 +88,8 @@
        *[many] { $count } паролей хран�т�� в безопа�но�ти.
     }
 lockwise-how-it-works-link = Как �то работает
-
 turn-on-sync = Включить { -sync-brand-short-name(case: "accusative") }…
     .title = Перейти в на�тройки �инхронизации
-
 monitor-title = Следите за утечками данных
 monitor-link = Как �то работает
 monitor-header-content-no-account = Попробуйте { -monitor-brand-name }, чтобы узнать, не �тали ли вы жертвой изве�тной утечки данных, и получать уведомлени� о новых утечках.
@@ -115,14 +97,12 @@
 monitor-sign-up-link = Подпишите�ь на уведомлени� об утечках
     .title = Подпишите�ь на уведомлени� об утечках от { -monitor-brand-name }
 auto-scan = �втоматиче�ки про�канировано �егодн�
-
 monitor-emails-tooltip =
     .title = По�мотреть от�леживаемые адре�а �лектронной почты на { -monitor-brand-short-name }
 monitor-breaches-tooltip =
     .title = Про�мотреть изве�тные утечки данных на { -monitor-brand-short-name }
 monitor-passwords-tooltip =
     .title = Про�мотреть ра�крытые пароли на { -monitor-brand-short-name }
-
 # 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.
@@ -132,7 +112,6 @@
         [few] �дре�а �лектронной почты от�леживают��
        *[many] �дре�ов �лектронной почты от�леживают��
     }
-
 # 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.
@@ -142,7 +121,6 @@
         [few] Изве�тных утечки данных ра�крыли вашу информацию
        *[many] Изве�тных утечек данных ра�крыли вашу информацию
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -152,7 +130,6 @@
         [few] Изве�тные утечки отмеченные как решённые
        *[many] Изве�тных утечек отмеченных как решённые
     }
-
 # 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.
@@ -162,7 +139,6 @@
         [few] Ра�крытых парол� во в�ех утечках
        *[many] Ра�крытых паролей во в�ех утечках
     }
-
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords that are marked as resolved by the user. Don’t add $count
 # to your localization, because it would result in the number showing twice.
@@ -172,7 +148,6 @@
         [few] Ра�крытых парол� в нерешённых утечках
        *[many] Ра�крытых паролей в нерешённых утечках
     }
-
 monitor-no-breaches-title = Хорошие ново�ти!
 monitor-no-breaches-description = Ваши адре�а не замечены ни в одной утечке. Е�ли �то изменит��, мы дадим вам знать.
 monitor-view-report-link = По�мотреть отчёт
@@ -183,7 +158,6 @@
     .title = Управление утечками � помощью { -monitor-brand-short-name }
 monitor-breaches-resolved-title = Отлично! Вы разобрали�ь �о в�еми изве�тными утечками.
 monitor-breaches-resolved-description = Е�ли ваш адре� �лектронной почты по�вит�� в каких-либо новых утечках, мы �ообщим вам об �том.
-
 # Variables:
 # $numBreachesResolved (Number) - Number of breaches marked as resolved by the user on Monitor.
 # $numBreaches (Number) - Number of breaches in which a user's data was involved, detected by Monitor.
@@ -193,11 +167,9 @@
         [few] Вы разобрали�ь � { $numBreachesResolved } из { $numBreaches } утечек
        *[many] Вы разобрали�ь � { $numBreachesResolved } из { $numBreaches } утечек
     }
-
 # Variables:
 # $percentageResolved (Number) - Percentage of breaches marked as resolved by a user on Monitor.
 monitor-partial-breaches-percentage = { $percentageResolved }% завершено
-
 monitor-partial-breaches-motivation-title-start = Отличное начало!
 monitor-partial-breaches-motivation-title-middle = Так держать!
 monitor-partial-breaches-motivation-title-end = Почти готово! Так держать.
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/protectionsPanel.ftl firefox-85.0+build1/l10n/ru/browser/browser/protectionsPanel.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/protectionsPanel.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/protectionsPanel.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 protections-panel-sendreportview-error = При отправке �ообщени� произошла ошибка. Пожалуй�та, повторите попытку позже.
-
 # A link shown when ETP is disabled for a site. Opens the breakage report subview when clicked.
 protections-panel-sitefixedsendreport-label = Сайт был и�правлен? Отправьте �ообщение
 
@@ -22,13 +21,10 @@
 # The text a screen reader speaks when focused on the info button.
 protections-panel-etp-more-info =
     .aria-label = Больше информации об улучшенной защите от от�леживани�
-
 protections-panel-etp-on-header = Улучшенна� защита от от�леживани� на �том �айте ВКЛЮЧЕ��
 protections-panel-etp-off-header = Улучшенна� защита от от�леживани� на �том �айте ОТКЛЮЧЕ��
-
 # The link to be clicked to open the sub-panel view
 protections-panel-site-not-working = Сайт не работает?
-
 # The heading/title of the sub-panel view
 protections-panel-site-not-working-view =
     .title = Сайт не работает?
@@ -43,9 +39,7 @@
 ##
 
 protections-panel-no-trackers-found = �а �той �транице не обнаружено трекеров изве�тных { -brand-short-name }.
-
 protections-panel-content-blocking-tracking-protection = От�леживающее �одержимое
-
 protections-panel-content-blocking-socialblock = Трекеры �оциальных �етей
 protections-panel-content-blocking-cryptominers-label = Криптомайнеры
 protections-panel-content-blocking-fingerprinters-label = Сборщики цифровых отпечатков
@@ -71,14 +65,12 @@
 
 # The header of the list
 protections-panel-site-not-working-view-header = Отключите защиту, е�ли у ва� возникли проблемы �:
-
 # The list items, shown in a <ul>
-protections-panel-site-not-working-view-issue-list-login-fields = Пол�ми дл� входа
+protections-panel-site-not-working-view-issue-list-login-fields = Пол�ми ввода
 protections-panel-site-not-working-view-issue-list-forms = Формами
-protections-panel-site-not-working-view-issue-list-payments = Платежами
-protections-panel-site-not-working-view-issue-list-comments = Комментари�ми
-protections-panel-site-not-working-view-issue-list-videos = Видео
-
+protections-panel-site-not-working-view-issue-list-payments = Совершением платежей
+protections-panel-site-not-working-view-issue-list-comments = �апи�анием комментариев
+protections-panel-site-not-working-view-issue-list-videos = Про�мотром видео
 protections-panel-site-not-working-view-send-report = Отправьте �ообщение
 
 ##
@@ -88,13 +80,11 @@
 protections-panel-fingerprinters = Сборщики цифровых отпечатков и�пользуют параметры вашего браузера и компьютера, чтобы �оздать ваш профиль. И�пользу� �тот цифровой отпечаток, они могут от�леживать ва� на различных веб-�айтах.
 protections-panel-tracking-content = Веб-�айты могут загружать внешнюю рекламу, видео и другой контент � от�леживающим кодом. Блокировка от�леживающего �одержимого может помочь �айтам загружать�� бы�трее, но некоторые кнопки, формы и пол� дл� входа могут не работать.
 protections-panel-social-media-trackers = Социальные �ети размещают трекеры на других веб-�айтах, чтобы �ледить за тем, что вы делаете, видите и �мотрите в Интернете. Это позвол�ет их владельцам узнавать о ва� больше, чем вы указываете в �воих профил�х в �оциальных �ет�х.
-
 protections-panel-content-blocking-manage-settings =
     .label = Управление на�тройками защиты
     .accesskey = п
-
 protections-panel-content-blocking-breakage-report-view =
-    .title = Сообщить о �ломанном �айте
+    .title = Сообщить о неработающем �айте
 protections-panel-content-blocking-breakage-report-view-description = Блокировка некоторых трекеров может вызывать проблемы � некоторыми веб-�айтами. Сообща� о таких проблемах, вы помогаете �делать { -brand-short-name } лучше дл� в�ех и каждого. При отправке �ообщени� в Mozilla будет отправлен адре� �айта, а также информаци� о на�тройках вашего браузера. <label data-l10n-name="learn-more">Подробнее</label>
 protections-panel-content-blocking-breakage-report-view-collection-url = �дре� �траницы
 protections-panel-content-blocking-breakage-report-view-collection-url-label =
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/screenshots.ftl firefox-85.0+build1/l10n/ru/browser/browser/screenshots.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/screenshots.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/screenshots.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 screenshots-context-menu = Сделать �криншот
-
 screenshots-my-shots-button = Мои �нимки
 screenshots-instructions = Пот�ните мышью или щёлкните по �транице, чтобы выбрать обла�ть. �ажмите ESC дл� отмены.
 screenshots-cancel-button = Отмена
@@ -13,7 +12,6 @@
 screenshots-download-button-tooltip = Загрузить �криншот
 screenshots-copy-button = Копировать
 screenshots-copy-button-tooltip = Копировать �криншот в буфер обмена
-
 screenshots-meta-key =
     { PLATFORM() ->
         [macos] ⌘
@@ -21,27 +19,18 @@
     }
 screenshots-notification-link-copied-title = С�ылка �копирована
 screenshots-notification-link-copied-details = С�ылка на ваш �нимок была �копирована в буфер обмена. �ажмите { screenshots-meta-key }-V дл� её в�тавки.
-
 screenshots-notification-image-copied-title = Снимок �копирован
 screenshots-notification-image-copied-details = Ваш �нимок был �копирован в буфер обмена. �ажмите { screenshots-meta-key }-V дл� его в�тавки.
-
 screenshots-request-error-title = Произошла ошибка.
 screenshots-request-error-details = Извините! Мы не �могли �охранить ваш �нимок. Пожалуй�та, попробуйте позже.
-
 screenshots-connection-error-title = Мы не �могли получить до�туп к вашим �криншотам.
 screenshots-connection-error-details = Пожалуй�та, проверьте �оединение � Интернетом. Е�ли вам удаёт�� войти в Интернет, то возможно, возникла временна� проблема �о �лужбой { -screenshots-brand-name }.
-
 screenshots-login-error-details = Мы не можем �охранить ваш �нимок, так как возникла проблема �о �лужбой { -screenshots-brand-name }. Пожалуй�та, попробуйте позже.
-
 screenshots-unshootable-page-error-title = Мы не можем �делать �криншот �той �траницы.
 screenshots-unshootable-page-error-details = Так как �то не обычна� веб-�траница, мы не �можем �делать её �криншот.
-
 screenshots-self-screenshot-error-title = Вы не можете �делать �нимок �траницы { -screenshots-brand-name }.
-
 screenshots-empty-selection-error-title = Выбрана �лишком небольша� обла�ть
-
 screenshots-private-window-error-title = { -screenshots-brand-name } отключены в режиме Приватного про�мотра
-screenshots-private-window-error-details = Прино�им извинени� за неудоб�тва. Мы работаем над включением �той функции в будущих релизах.
-
+screenshots-private-window-error-details = Прино�им извинени� за неудоб�тва. Мы работаем над добавлением �той функции в будущих релизах.
 screenshots-generic-error-title = Ого! { -screenshots-brand-name } вышли из �тро�.
 screenshots-generic-error-details = Мы не уверены, в чём проблема. Попробуете ещё раз или �делаете �нимок другой �траницы?
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ru/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ru/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -62,6 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Только в новой вкладке
     .accesskey = н
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = В�егда отображать
+    .accesskey = е
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = �икогда не отображать
+    .accesskey = и
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Отображать только на новой вкладке
+    .accesskey = л
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Показать другие закладки
     .accesskey = з
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/ru/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/browser.dtd	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/chrome/browser/browser.dtd	2021-01-18 20:08:03.000000000 +0000
@@ -42,7 +42,6 @@
 
 <!ENTITY fullScreenCmd.label "Полный �кран">
 
-
 <!ENTITY pictureInPictureHideToggle.label "Скрыть переключатель «Картинка в картинке»">
 <!ENTITY pictureInPictureHideToggle.accesskey "Ñ‹">
 
@@ -52,7 +51,6 @@
 <!ENTITY fxa.menu.syncSettings2.label "�а�тройки Синхронизации">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Подключить другое у�трой�тво…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
-
 <!ENTITY fxa.menu.signin.label "Войти в &brandProductName;">
 <!ENTITY fxa.menu.turnOnSync.label "Включить Синхронизацию">
 <!ENTITY fxa.menu.firefoxServices.label "Серви�ы &brandProductName;">
@@ -88,8 +86,8 @@
      Localizers can use one of them, or both, to better adapt this
      sentence to their language. -->
 <!ENTITY pointerlockWarning.beforeDomain.label "">
-<!ENTITY pointerlockWarning.afterDomain.label "контролирует ваш указатель мыши. �ажмите Esc, чтобы вернуть �ебе контроль.">
-<!ENTITY pointerlockWarning.generic.label "Этот документ контролирует ваш указатель мыши. �ажмите Esc, чтобы вернуть �ебе контроль.">
+<!ENTITY pointerlockWarning.afterDomain.label "контролирует ваш кур�ор. �ажмите Esc, чтобы вернуть �ебе контроль.">
+<!ENTITY pointerlockWarning.generic.label "Этот документ контролирует ваш кур�ор. �ажмите Esc, чтобы вернуть �ебе контроль.">
 
 <!ENTITY showAllBookmarks2.label "Показать в�е закладки">
 <!ENTITY recentBookmarks.label "�едавно добавленные закладки">
@@ -98,7 +96,6 @@
 <!ENTITY printButton.label            "Печать">
 <!ENTITY printButton.tooltip          "Ра�печатать �ту �траницу">
 
-
 <!ENTITY searchItem.title             "Пои�к">
 
 <!-- Toolbar items -->
@@ -188,7 +185,7 @@
 <!ENTITY customizeMenu.addToToolbar.label "Добавить на панель ин�трументов">
 <!ENTITY customizeMenu.addToToolbar.accesskey "о">
 <!-- LOCALIZATION NOTE (customizeMenu.addToOverflowMenu.label,
-     customizeMenu.pinToOverflowMenu.label, customizeMenu.unpinFromOverflowMenu.label)
+     customizeMenu.unpinFromOverflowMenu.label)
      The overflow menu is the menu that appears if you click the chevron (>> button)
      in the location bar. -->
 <!ENTITY customizeMenu.addToOverflowMenu.label "Добавить в ра�ширенное меню">
@@ -216,19 +213,16 @@
 
 <!ENTITY pageAction.copyLink.label    "Копировать ��ылку">
 
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY saveToPocketCmd.label        "Сохранить �траницу в Pocket">
+
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 <!ENTITY pocketMenuitem.label         "Показать �пи�ок Pocket">
 
 <!ENTITY emailPageCmd.label           "Отправить ��ылку по почте…">
 
-<!-- Media (video/audio) controls -->
-
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
 <!ENTITY fullZoom.label                 "Ма�штаб">
 
 <!ENTITY sidebarCloseButton.tooltip     "Закрыть боковую панель">
@@ -254,7 +248,6 @@
 <!ENTITY spellAddDictionaries.label "Добавить �ловари…">
 <!ENTITY spellAddDictionaries.accesskey "Д">
 
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Вкладки браузера">
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/ru/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/browser.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/chrome/browser/browser.properties	2021-01-18 20:08:03.000000000 +0000
@@ -1039,7 +1039,7 @@
 # LOCALIZATION NOTE (storageAccess3.message, storageAccess.hintText):
 # %1$S and %3$S are both the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
-storageAccess3.message = Разрешаете ли вы %1$S и�пользовать куки и данные �айта на %2$S? Такое разрешение может позволить %3$S от�леживать, что вы делаете на �том �айте.
+storageAccess3.message = Разрешаете ли вы %1$S и�пользовать куки и данные �айта %2$S? Такое разрешение может позволить %3$S от�леживать, что вы делаете на �том �айте.
 storageAccess.hintText = Вам �ледует заблокировать до�туп, е�ли вы не довер�ете или не знаете %1$S.
 
 
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/ru/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ru/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:08:03.000000000 +0000
@@ -32,7 +32,6 @@
 # be longer than the other existing status strings.
 blockedMalware=Этот файл �одержит виру� или вредоно�ную программу.
 blockedPotentiallyUnwanted=Этот файл может причинить вред вашему компьютеру.
-blockedInsecure = �е удало�ь загрузить �тот файл безопа�ным �по�обом.
 blockedPotentiallyInsecure=Файл не загружен: потенциальна� угроза безопа�но�ти.
 blockedUncommon2=Этот файл загружают редко.
 
@@ -53,7 +52,7 @@
 unblockTypeMalware=Этот файл �одержит виру� или другую вредоно�ную программу, котора� причинит вред вашему компьютеру.
 unblockTypePotentiallyUnwanted2=Этот файл зама�кирован под полезную загрузку, но он может произве�ти неожиданные изменени� в ваших программах и на�тройках.
 unblockTypeUncommon2=Этот файл загружают редко и он может быть небезопа�ен дл� открыти�. Он может �одержать виру� или произве�ти неожиданные изменени� в ваших программах и на�тройках.
-unblockInsecure=Файл и�пользует незащищённое �оединение. Он может быть поврежден или подделан в проце��е загрузки.
+unblockInsecure=Файл передаёт�� по незащищённому �оединению. Он может быть поврежден или подделан в проце��е загрузки.
 unblockTip2=Вы можете пои�кать альтернативный и�точник загрузки или повторить попытку позже.
 unblockButtonOpen=Открыть
 unblockButtonUnblock=Разрешить загрузку
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/installer/mui.properties firefox-85.0+build1/l10n/ru/browser/installer/mui.properties
--- firefox-84.0.2+build1/l10n/ru/browser/installer/mui.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/installer/mui.properties	2021-01-18 20:08:03.000000000 +0000
@@ -26,7 +26,7 @@
 MUI_TEXT_COMPONENTS_TITLE=Компоненты у�танавливаемой программы
 MUI_TEXT_COMPONENTS_SUBTITLE=Выберите компоненты $BrandFullNameDA, которые вы хотите у�тановить.
 MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE=Опи�ание
-MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=�аведите кур�ор мыши на название компонента, чтобы проче�ть его опи�ание.
+MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=�аведите кур�ор на название компонента, чтобы проче�ть его опи�ание.
 MUI_TEXT_DIRECTORY_TITLE=Выбор папки у�тановки
 MUI_TEXT_DIRECTORY_SUBTITLE=Выберите папку дл� у�тановки $BrandFullNameDA.
 MUI_TEXT_INSTALLING_TITLE=Копирование файлов
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/ru/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/ru/browser/pdfviewer/viewer.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/pdfviewer/viewer.properties	2021-01-18 20:08:03.000000000 +0000
@@ -248,4 +248,4 @@
 
 printing_not_supported=Предупреждение: В �том браузере не полно�тью поддерживает�� печать.
 printing_not_ready=Предупреждение: PDF не полно�тью загружен дл� печати.
-web_fonts_disabled=Веб-шрифты отключены: невозможно и�пользовать в�троенные PDF-шрифты.
+web_fonts_disabled=Веб-шрифты отключены: не удало�ь задей�твовать в�троенные PDF-шрифты.
diff -Nru firefox-84.0.2+build1/l10n/ru/browser/profile/bookmarks.inc firefox-85.0+build1/l10n/ru/browser/profile/bookmarks.inc
--- firefox-84.0.2+build1/l10n/ru/browser/profile/bookmarks.inc	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/browser/profile/bookmarks.inc	2021-01-18 20:08:03.000000000 +0000
@@ -27,7 +27,7 @@
 
 # LOCALIZATION NOTE (firefox_customize):
 # link title for https://www.mozilla.org/en-US/firefox/customize/
-#define firefox_customize �а�тройка Firefox
+#define firefox_customize Пер�онализаци� Firefox
 
 # LOCALIZATION NOTE (firefox_community):
 # link title for https://www.mozilla.org/en-US/contribute/
@@ -61,10 +61,6 @@
 # Nightly builds only, link title for about:crashes
 #define crashes В�е ваши падени�
 
-# LOCALIZATION NOTE (irc):
-# Nightly builds only, link title for ircs://irc.mozilla.org/nightly
-#define irc Об�уждение Nightly на IRC
-
 # LOCALIZATION NOTE (planet):
 # Nightly builds only, link title for https://planet.mozilla.org/
 #define planet Планета Mozilla
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/aboutdebugging.ftl firefox-85.0+build1/l10n/ru/devtools/client/aboutdebugging.ftl
--- firefox-84.0.2+build1/l10n/ru/devtools/client/aboutdebugging.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/aboutdebugging.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -83,7 +83,7 @@
 # Introduction text in the Setup page to explain how to configure remote debugging.
 about-debugging-setup-intro = Выберите метод подключени�, � помощью которого вы хотите удалённо отлаживать ваше у�трой�тво.
 # Explanatory text in the Setup page about what the 'This Firefox' page is for
-about-debugging-setup-this-firefox2 = И�пользуйте <a>{ about-debugging-this-firefox-runtime-name }</a> дл� отладки ра�ширений и service workers на �той вер�ии { -brand-shorter-name }.
+about-debugging-setup-this-firefox2 = И�пользуйте <a>{ about-debugging-this-firefox-runtime-name }</a> дл� отладки ра�ширений и service worker'ов в �той вер�ии { -brand-shorter-name }.
 # Title of the heading Connect section of the Setup page.
 about-debugging-setup-connect-heading = Подключить у�трой�тво
 # USB section of the Setup page
@@ -155,13 +155,13 @@
     .name = Вкладки
 # Title of the service workers category.
 about-debugging-runtime-service-workers =
-    .name = Service Workers
+    .name = Service Worker'Ñ‹
 # Title of the shared workers category.
 about-debugging-runtime-shared-workers =
-    .name = Shared Workers
+    .name = Shared Worker'Ñ‹
 # Title of the other workers category.
 about-debugging-runtime-other-workers =
-    .name = Другие Workers
+    .name = Другие Worker'ы
 # Title of the processes category.
 about-debugging-runtime-processes =
     .name = Проце��ы
@@ -171,7 +171,7 @@
 # This string is displayed in the runtime page if the current configuration of the
 # target runtime is incompatible with service workers. "Learn more" points to MDN.
 # https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible
-about-debugging-runtime-service-workers-not-compatible = Конфигураци� вашего браузера не �овме�тима � Service Workers. <a>Узнайте больше</a>
+about-debugging-runtime-service-workers-not-compatible = Конфигураци� вашего браузера не �овме�тима � Service Worker'ами. <a>Узнайте больше</a>
 # This string is displayed in the runtime page if the remote browser version is too old.
 # "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/animationinspector.properties firefox-85.0+build1/l10n/ru/devtools/client/animationinspector.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/animationinspector.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/animationinspector.properties	2021-01-18 20:08:03.000000000 +0000
@@ -149,13 +149,13 @@
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.cssanimation.nameLabel=%S — �нимаци� CSS
+timeline.cssanimation.nameLabel=%S — CSS-анимаци�
 
 # LOCALIZATION NOTE (timeline.csstransition.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Transition in the timeline UI.
 # %S will be replaced by the name of the transition at run-time.
-timeline.csstransition.nameLabel=%S — Переход CSS
+timeline.csstransition.nameLabel=%S — CSS-переход
 
 # LOCALIZATION NOTE (timeline.scriptanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/application.ftl firefox-85.0+build1/l10n/ru/devtools/client/application.ftl
--- firefox-84.0.2+build1/l10n/ru/devtools/client/application.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/application.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -13,10 +13,10 @@
 ### best documentation on web development on the web.
 
 # Header for the list of Service Workers displayed in the application panel for the current page.
-serviceworker-list-header = Service Workers
+serviceworker-list-header = Service Worker'Ñ‹
 # Text displayed next to the list of Service Workers to encourage users to check out
 # about:debugging to see all registered Service Workers.
-serviceworker-list-aboutdebugging = Откройте <a>about:debugging</a> дл� отображени� Service Workers � других доменов
+serviceworker-list-aboutdebugging = Откройте <a>about:debugging</a> дл� отображени� Service Worker'ов � других доменов
 # Text for the button to unregister a Service Worker. Displayed for active Service Workers.
 serviceworker-worker-unregister = Отменить реги�трацию
 # Text for the debug link displayed for an already started Service Worker. Clicking on the
@@ -68,9 +68,9 @@
 serviceworker-empty-suggestions-debugger = Пройдите по шагам процедуру реги�трации cвоего Service Worker и поищите и�ключени�. <a>Открыть Отладчик</a>
 # 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 = И��ледуйте Service Workers � других доменов. <a>Открыть about:debugging</a>
+serviceworker-empty-suggestions-aboutdebugging = И��ледуйте Service Worker'ы � других доменов. <a>Открыть about:debugging</a>
 # Text displayed when no service workers are visible for the current page.
-serviceworker-empty-intro2 = Service workers не найдены
+serviceworker-empty-intro2 = Service worker'ов не найдено
 # Link will open https://developer.mozilla.org/docs/Web/API/Service_Worker_API/Using_Service_Workers
 serviceworker-empty-intro-link = Подробнее
 # Text displayed when there are no Service Workers to display for the current page,
@@ -79,7 +79,7 @@
 serviceworker-empty-suggestions2 = Е�ли на текущей �транице должен быть service worker, вы можете пои�кать ошибки в <a>Кон�оли</a> или проверить реги�трацию вашего service worker в <span>Отладчике</span>.
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Link will open about:debugging in a new tab.
-serviceworker-empty-suggestions-aboutdebugging2 = Про�мотр service workers из других доменов
+serviceworker-empty-suggestions-aboutdebugging2 = Про�мотр service worker'ов � других доменов
 # Header for the Manifest page when we have an actual manifest
 manifest-view-header = Манифе�т приложени�
 # Header for the Manifest page when there's no manifest to inspect
@@ -131,9 +131,9 @@
     .alt = Значок манифе�та
     .title = Манифе�т
 # Sidebar navigation item for Service Workers sidebar item section
-sidebar-item-service-workers = Service Workers
-    .alt = Значок Service Workers
-    .title = Service Workers
+sidebar-item-service-workers = Service Worker'Ñ‹
+    .alt = Значок Service Worker'ов
+    .title = Service Worker'Ñ‹
 # Text for the ALT and TITLE attributes of the warning icon
 icon-warning =
     .alt = Значок предупреждени�
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/debugger.properties firefox-85.0+build1/l10n/ru/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/debugger.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/debugger.properties	2021-01-18 20:08:03.000000000 +0000
@@ -212,7 +212,7 @@
 
 # LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
 # the event search input bar
-eventListenersHeader1.placeholder=Фильтр по типу �обыти�
+eventListenersHeader1.placeholder=Пои�к по типу �обыти�
 
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
@@ -552,15 +552,15 @@
 
 # LOCALIZATION NOTE (settings.disableJavaScript.tooltip): Context menu item
 # tooltip for disabling JavaScript
-settings.disableJavaScript.tooltip=Отключает JavaScript (требует�� обновление)
+settings.disableJavaScript.tooltip=Отключает JavaScript (необходимо обновление �траницы)
 
 # LOCALIZATION NOTE (settings.toggleSourceMaps.tooltip): Context menu item
 # tooltip for toggling the source maps feature
-settings.toggleSourceMaps.tooltip=Включить карты и�точников, чтобы DevTools загружал ваши оригинальные и�точники в дополнение к �генерированными вами
+settings.toggleSourceMaps.tooltip=Включить карты и�ходников, чтобы Ин�трументы разработчика загружали оригинальные и�ходники в дополнение к �генерированным
 
 # LOCALIZATION NOTE (settings.toggleSourceMaps.label): Context menu item
 # label for toggling the source maps feature
-settings.toggleSourceMaps.label=Карты и�точников
+settings.toggleSourceMaps.label=Карты и�ходников
 
 # LOCALIZATION NOTE (preview.noProperties): Label shown in the preview
 # popup when there are no properties to show.
@@ -1052,7 +1052,6 @@
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
 variablesViewOptimizedOut=(оптимизировано)
 variablesViewUninitialized=(неинициализировано)
 variablesViewMissingArgs=(недо�тупно)
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/markers.properties firefox-85.0+build1/l10n/ru/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/markers.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/markers.properties	2021-01-18 20:08:03.000000000 +0000
@@ -102,7 +102,7 @@
 # LOCALIZATION NOTE (marker.gcreason.label.*):
 # These strings are used to give a concise but readable description of a GC reason.
 marker.gcreason.label.API=Вызов API
-marker.gcreason.label.EAGER_ALLOC_TRIGGER=Триггер интен�ивной аллокации
+marker.gcreason.label.EAGER_ALLOC_TRIGGER=Триггер интен�ивного выделени�
 marker.gcreason.label.DESTROY_RUNTIME=Завершение работы
 marker.gcreason.label.LAST_DITCH=�едо�таточно пам�ти
 marker.gcreason.label.TOO_MUCH_MALLOC=Слишком много выделенных байт
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Мало пам�ти
 marker.gcreason.label.CC_WAITING=Вызвано �боркой му�ора
+marker.gcreason.label.CC_FINISHED=Сборка му�ора завершена
 marker.gcreason.label.CC_FORCED=Вызвано �боркой му�ора
 marker.gcreason.label.LOAD_END=Загрузка �траницы завершена
 marker.gcreason.label.PAGE_HIDE=Перемещено в фон
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Подборка инкубатора
-
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/performance.dtd firefox-85.0+build1/l10n/ru/devtools/client/performance.dtd
--- firefox-84.0.2+build1/l10n/ru/devtools/client/performance.dtd	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/performance.dtd	2021-01-18 20:08:03.000000000 +0000
@@ -43,7 +43,7 @@
 <!ENTITY performanceUI.toolbar.allocations.tooltiptext "Показывает, как была ра�пределена пам�ть во врем� запи�и.">
 <!ENTITY performanceUI.toolbar.js-flamegraph "Пламенный График JS">
 <!ENTITY performanceUI.toolbar.js-flamegraph.tooltiptext "Показывает �тек вызовов JavaScript во врем� запи�и.">
-<!ENTITY performanceUI.toolbar.memory-flamegraph "Пламенный График �ллокаций">
+<!ENTITY performanceUI.toolbar.memory-flamegraph "Пламенный График Выделений">
 
 <!-- LOCALIZATION NOTE (performanceUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/responsive.properties firefox-85.0+build1/l10n/ru/devtools/client/responsive.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/responsive.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/responsive.properties	2021-01-18 20:08:03.000000000 +0000
@@ -148,7 +148,7 @@
 
 # LOCALIZATION NOTE (responsive.reloadNotification.description2): Text in notification bar
 # shown on first open to clarify that some features need a reload to apply.
-responsive.reloadNotification.description2=Дл� изменени� �мул�ции у�трой�тва требует�� полна� перезагрузка. �втоматиче�кие перезагрузки по умолчанию отключены, чтобы избежать потери любых изменений в DevTools. Вы можете включить перезагрузку через меню Параметры.
+responsive.reloadNotification.description2=Дл� изменени� �мул�ции у�трой�тва требует�� перезагрузка �траницы. �втоматиче�кие перезагрузки по умолчанию отключены, чтобы избежать потери любых изменений в Ин�трументах разработчика. Вы можете включить перезагрузку через меню Параметры.
 
 # LOCALIZATION NOTE (responsive.leftAlignViewport): Label on checkbox used in the settings
 # menu.
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/toolbox-options.ftl firefox-85.0+build1/l10n/ru/devtools/client/toolbox-options.ftl
--- firefox-84.0.2+build1/l10n/ru/devtools/client/toolbox-options.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/toolbox-options.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -10,19 +10,15 @@
 
 # The heading
 options-select-default-tools-label = Ин�трументы разработчика по умолчанию
-
 # The label for the explanation of the * marker on a tool which is currently not supported
 # for the target of the toolbox.
 options-tool-not-supported-label = * �е поддерживает�� дл� текущей цели ин�трумента
-
 # The label for the heading of group of checkboxes corresponding to the developer tools
 # added by add-ons. This heading is hidden when there is no developer tool installed by add-ons.
 options-select-additional-tools-label = Ин�трументы разработчика у�тановленные дополнени�ми
-
 # The label for the heading of group of checkboxes corresponding to the default developer
 # tool buttons.
 options-select-enabled-toolbox-buttons-label = До�тупные кнопки ин�трументов
-
 # The label for the heading of the radiobox corresponding to the theme
 options-select-dev-tools-theme-label = Темы
 
@@ -30,12 +26,10 @@
 
 # The heading
 options-context-inspector = Ин�пектор
-
 # The label for the checkbox option to show user agent styles
 options-show-user-agent-styles-label = Отображать �тили браузера
 options-show-user-agent-styles-tooltip =
     .title = Включение приведёт к отображению �тилей по умолчанию, примен�емых браузером.
-
 # The label for the checkbox option to enable collapse attributes
 options-collapse-attrs-label = Обрезать атрибуты DOM
 options-collapse-attrs-tooltip =
@@ -54,7 +48,6 @@
 
 # The heading
 options-styleeditor-label = Редактор �тилей
-
 # The label for the checkbox that toggles autocompletion of css in the Style Editor
 options-stylesheet-autocompletion-label = �втодополнение CSS
 options-stylesheet-autocompletion-tooltip =
@@ -64,12 +57,10 @@
 
 # The heading
 options-screenshot-label = �а�тройки �н�ти� �криншотов
-
 # Label for the checkbox that toggles screenshot to clipboard feature
 options-screenshot-clipboard-label = Копировать �криншот в буфер обмена
 options-screenshot-clipboard-tooltip =
     .title = Копировать �криншот пр�мо в буфер обмена
-
 # Label for the checkbox that toggles the camera shutter audio for screenshot tool
 options-screenshot-audio-label = Проигрывать звук затвора камеры
 options-screenshot-audio-tooltip =
@@ -79,7 +70,6 @@
 
 # The heading
 options-sourceeditor-label = �а�тройки редактора
-
 options-sourceeditor-detectindentation-tooltip =
     .title = Угадывать �тиль от�тупов на о�нове �одержимого и�ходников
 options-sourceeditor-detectindentation-label = Определ�ть �тиль от�тупов
@@ -97,41 +87,32 @@
 
 # The heading
 options-context-advanced-settings = Дополнительные параметры
-
 # The label for the checkbox that toggles the HTTP cache on or off
 options-disable-http-cache-label = Отключить HTTP-к�ш (когда открыта панель ин�трументов)
 options-disable-http-cache-tooltip =
-    .title = Включение �той опции отключит HTTP-к�ш дл� в�ех вкладок, в которых открыта панель ин�трументов. Эта опци� не вли�ет на Service Workers.
-
+    .title = Включение �той опции отключит HTTP-к�ш дл� в�ех вкладок, в которых открыта панель ин�трументов. Эта опци� не вли�ет на Service Worker'ы.
 # The label for checkbox that toggles JavaScript on or off
 options-disable-javascript-label = Отключить JavaScript *
 options-disable-javascript-tooltip =
     .title = Включение �той опции приведёт к отключению JavaScript дл� текущей вкладки. Е�ли вкладка или панель ин�трументов будут закрыты, то �тот параметр будет �брошен.
-
 # The label for checkbox that toggles chrome debugging, i.e. the devtools.chrome.enabled preference
 options-enable-chrome-label = Включить ин�трументы отладки browser chrome и дополнений
 options-enable-chrome-tooltip =
     .title = Включение �той опции позволит вам и�пользовать различные ин�трументы разработчика в контек�те браузера (через Ин�трументы > Веб-разработка > Ин�трументы браузера) и отлаживать дополнени� из окна Управлени� дополнени�ми
-
 # The label for checkbox that toggles remote debugging, i.e. the devtools.debugger.remote-enabled preference
 options-enable-remote-label = Включить удалённую отладку
-
 options-enable-remote-tooltip2 =
     .title = Включение �той опции позволит удалённо отлаживать �тот �кземпл�р браузера
-
 # The label for checkbox that toggles the service workers testing over HTTP on or off.
-options-enable-service-workers-http-label = Включить Service Workers поверх HTTP (когда открыта панель ин�трументов)
+options-enable-service-workers-http-label = Включить Service Worker'ы поверх HTTP (когда открыта панель ин�трументов)
 options-enable-service-workers-http-tooltip =
-    .title = Включение �той опции включит service workers поверх HTTP дл� в�ех вкладок, в которых открыта панель ин�трументов.
-
+    .title = Включение �той опции включит service worker'ы поверх HTTP дл� в�ех вкладок, в которых открыта панель ин�трументов.
 # The label for the checkbox that toggles source maps in all tools.
 options-source-maps-label = Включить Карты И�ходников
 options-source-maps-tooltip =
     .title = Е�ли вы включите �ту на�тройку, и�ходники будут картированы в ин�трументах.
-
 # The message shown for settings that trigger page reload
 options-context-triggers-page-refresh = * Только текуща� �е��и�, перезагружает �траницу
-
 # The label for the checkbox that toggles the display of the platform data in the
 # Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference in about:config
 options-show-platform-data-label = Отображать данные платформы Gecko
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/toolbox.properties firefox-85.0+build1/l10n/ru/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/toolbox.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/toolbox.properties	2021-01-18 20:08:03.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Закрыть ин�трументы разработчика
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Показать кон�оль внизу
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/ru/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/ru/devtools/client/tooltips.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/tooltips.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -27,7 +27,9 @@
 inactive-css-property-is-impossible-to-override-in-visited = �ельз� переопределить <strong>{ $property }</strong> из-за ограничений п�евдокла��а <strong>:visited</strong>.
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> не �работает дл� �лемента, так как он не �вл�ет�� позиционированным �лементом.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> не �работает дл� �лемента, так как <strong>overflow:hidden</strong> не у�тановлено.
-inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> не �работает дл� �лемента, так как его <strong>outline-style</strong> у�тановлен в <strong>auto</strong> или <strong>none</strong>.
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> не �работает дл� �лемента, так как его <strong>outline-style</strong> у�тановлено в <strong>auto</strong> или <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> не �работает дл� внутренних �лементов таблиц.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> не �работает дл� внутренних �лементов таблиц, кроме их �чеек.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -44,9 +46,11 @@
 inactive-css-non-replaced-inline-or-table-row-or-row-group-fix = Попробуйте добавить <strong>display:inline-block</strong> или <strong>display:block</strong>. { learn-more }
 inactive-css-non-replaced-inline-or-table-column-or-column-group-fix = Попробуйте добавить <strong>display:inline-block</strong>. { learn-more }
 inactive-css-not-display-block-on-floated-fix = Попробуйте удалить �вой�тво <strong>float</strong> или добавить <strong>display:block</strong>. { learn-more }
-inactive-css-position-property-on-unpositioned-box-fix = Попробуйте у�тановить дл� его �вой�тва <strong>position</strong> значение, отличное от <strong>static</strong>. { learn-more }
+inactive-css-position-property-on-unpositioned-box-fix = Попробуйте у�тановить дл� �вой�тва <strong>position</strong> значение, отличное от <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Попробуйте добавить <strong>overflow:hidden</strong>. { learn-more }
-inactive-outline-radius-when-outline-style-auto-or-none-fix = Попробуйте у�тановить дл� его �вой�тва <strong>outline-style</strong> значение, отличное от <strong>auto</strong> или <strong>none</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Попробуйте у�тановить дл� �вой�тва <strong>display</strong> значение, отличное от <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> или <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Попробуйте у�тановить дл� �вой�тва <strong>display</strong> значение, отличное от <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> или <strong>table-footer-group</strong>. { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = Попробуйте у�тановить дл� �вой�тва <strong>outline-style</strong> значение, отличное от <strong>auto</strong> или <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/client/webconsole.properties firefox-85.0+build1/l10n/ru/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/ru/devtools/client/webconsole.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/client/webconsole.properties	2021-01-18 20:08:03.000000000 +0000
@@ -140,7 +140,7 @@
 
 # LOCALIZATION NOTE (blockedReason.title)
 # Tooltip shown for blocked network events sent from the network panel
-blockedrequest.label=Заблокировано DevTools
+blockedrequest.label=Заблокировано Ин�трументами разработчика
 
 # LOCALIZATION NOTE (webconsole.find.key)
 # Key shortcut used to focus the search box on upper right of the console
diff -Nru firefox-84.0.2+build1/l10n/ru/devtools/startup/aboutDevTools.ftl firefox-85.0+build1/l10n/ru/devtools/startup/aboutDevTools.ftl
--- firefox-84.0.2+build1/l10n/ru/devtools/startup/aboutDevTools.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/devtools/startup/aboutDevTools.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -6,14 +6,13 @@
 enable-title = Включить Ин�трументы разработчика
 enable-inspect-element-title = Включить Ин�трументы разработчика дл� и�пользовани� Ин�пектора �лементов
 enable-inspect-element-message = Про�мотр и редактирование HTML и CSS помощью Ин�пектора из Ин�трументов разработчика.
-enable-about-debugging-message = Разработка и отладка WebExtensions, Web workers, Service workers и много другого в Ин�трументах разработчика.
+enable-about-debugging-message = Разработка и отладка WebExtensions, Web worker'ов, Service worker'ов и много другого в Ин�трументах разработчика.
 enable-key-shortcut-message = Вы активировали �рлык Ин�трументов разработчика. Е�ли вы ошибли�ь, то можете закрыть �ту вкладку.
 enable-menu-message = Улучшите HTML, CSS и JavaScript �воего веб-�айта, и�пользу� ин�трументы, такие как Ин�пектор и Отладчик.
 enable-common-message = Ин�трументы разработчика по умолчанию отключены, что даёт вам лучший контроль над браузером.
 enable-learn-more-link = Подробнее об Ин�трументах разработчика
 enable-enable-button = Включить Ин�трументы разработчика
 enable-close-button = Закрыть �ту вкладку
-
 welcome-title = Добро пожаловать в Ин�трументы разработчика!
 newsletter-title = �ово�тна� ра��ылка дл� разработчиков от Mozilla
 newsletter-message = Получайте ново�ти от разработчиков, �оветы и ре�ур�ы, отправл�емые пр�мо к вам в почтовый �щик.
@@ -23,11 +22,9 @@
 newsletter-subscribe-button = Подпи�ать��
 newsletter-thanks-title = Спа�ибо!
 newsletter-thanks-message = Е�ли вы ранее не подтверждали подпи�ку на ново�тные ра��ылки Mozilla, то вам может понадобит�� �делать �то. Пожалуй�та, проверьте вашу папку "Вход�щие" или "Спам" на наличие пи�ьма от на�.
-
 footer-title = Firefox Developer Edition
 footer-message = Ищете не только Ин�трументы разработчика? И�пытайте браузер Firefox, по�троенный �пециально дл� разработчиков и �овременных рабочих проце��ов.
 footer-learn-more-link = Подробнее
-
 features-learn-more = Подробнее
 features-inspector-title = Ин�пектор
 features-inspector-desc = Изучайте и �овершен�твуйте код, чтобы �оздавать попик�ельно-идеальные макеты. <a data-l10n-name="learn-more">{ features-learn-more }</a>
diff -Nru firefox-84.0.2+build1/l10n/ru/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/ru/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/ru/dom/chrome/dom/dom.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/dom/chrome/dom/dom.properties	2021-01-18 20:08:03.000000000 +0000
@@ -58,7 +58,7 @@
 FullscreenDeniedDisabled=В запро�е полно�кранного режима было отказано, так как Полно�кранное API было отключено в на�тройках пользовател�.
 FullscreenDeniedFocusedPlugin=В запро�е полно�кранного режима было отказано, так как windowed-плагин находит�� в фоку�е.
 FullscreenDeniedHidden=В запро�е полно�кранного режима было отказано, так как документ более не виден.
-FullscreenDeniedHTMLDialog=В запро�е полно�кранного режима было отказано, так как запрашивающий �лемент �вл�ет�� �лементом <dialog>.
+FullscreenDeniedHTMLDialog=В запро�е полно�кранного режима было отказано, так как его запрашивает �лемент <dialog>.
 FullscreenDeniedContainerNotAllowed=В запро�е полно�кранного режима было отказано, так как по меньшей мере один из �лементов, �одержащих документ, не �вл�ет�� iframe'ом или не имеет атрибута «allowfullscreen».
 FullscreenDeniedNotInputDriven=В запро�е полно�кранного режима было отказано, так как Element.requestFullscreen() не был вызван пользователь�ким короткоживущим обработчиком �обытий.
 FullscreenDeniedMouseEventOnlyLeftBtn=В запро�е полно�кранного режима было отказано, так как Element.requestFullscreen() был вызван изнутри обработчика �обытий мыши, не вызванного левой кнопкой мыши.
@@ -73,15 +73,15 @@
 FullscreenExitWindowFocus=Из полно�кранного режима произведён выход, так как в фоку�е было окно.
 RemovedFullscreenElement=Из полно�кранного режима произведён выход, так как полно�кранный �лемент был удалён из документа.
 FocusedWindowedPluginWhileFullscreen=Из полно�кранного режима произведён выход, так как в фоку�е был windowed-плагин.
-PointerLockDeniedDisabled=В запро�е контрол� за указателем мыши было отказано, так как Pointer Lock API было отключено в на�тройках пользовател�.
-PointerLockDeniedInUse=В запро�е контрол� за указателем мыши было отказано, так как указатель �ейча� контролирует�� другим документом.
-PointerLockDeniedNotInDocument=В запро�е контрол� за указателем мыши было отказано, так как запрашивающий �лемент не в документе.
-PointerLockDeniedSandboxed=В запро�е контрол� за указателем мыши было отказано, так как до�туп к Pointer Lock API ограничен через пе�очницу.
-PointerLockDeniedHidden=В запро�е контрол� за указателем мыши было отказано, так как документ не виден.
-PointerLockDeniedNotFocused=В запро�е контрол� за указателем мыши было отказано, так как документ не находит�� в фоку�е.
-PointerLockDeniedMovedDocument=В запро�е контрол� за указателем мыши было отказано, так как запрашивающий �лемент переме�тил документ.
-PointerLockDeniedNotInputDriven=В запро�е контрол� над указателем мыши было отказано, так как Element.requestPointerLock() не был вызван пользователь�ким короткоживущим обработчиком �обытий, а документ не был развернут на полный �кран.
-PointerLockDeniedFailedToLock=В запро�е контрол� за указателем мыши было отказано, так как браузеру не удало�ь захватить контроль над указателем.
+PointerLockDeniedDisabled=В запро�е контрол� за кур�ором было отказано, так как Pointer Lock API было отключено в на�тройках пользовател�.
+PointerLockDeniedInUse=В запро�е контрол� за кур�ором было отказано, так как он �ейча� контролирует�� другим документом.
+PointerLockDeniedNotInDocument=В запро�е контрол� за кур�ором было отказано, так как запрашивающий �лемент не в документе.
+PointerLockDeniedSandboxed=В запро�е контрол� за кур�ором было отказано, так как до�туп к Pointer Lock API ограничен через пе�очницу.
+PointerLockDeniedHidden=В запро�е контрол� за кур�ором было отказано, так как документ не виден.
+PointerLockDeniedNotFocused=В запро�е контрол� за кур�ором было отказано, так как документ не находит�� в фоку�е.
+PointerLockDeniedMovedDocument=В запро�е контрол� за кур�ором было отказано, так как запрашивающий �лемент переме�тил документ.
+PointerLockDeniedNotInputDriven=В запро�е контрол� над кур�ором было отказано, так как метод Element.requestPointerLock() не был вызван пользователь�ким короткоживущим обработчиком �обытий, а документ не был развернут на полный �кран.
+PointerLockDeniedFailedToLock=В запро�е контрол� за кур�ором было отказано, так как браузеру не удало�ь захватить контроль над кур�ором.
 HTMLSyncXHRWarning=Пар�инг HTML в XMLHttpRequest в �инхронном режиме не поддерживает��.
 # LOCALIZATION NOTE: %S is the name of the header in question
 ForbiddenHeaderWarning=Попытка у�тановки запрещённого заголовка была пре�ечена: %S
@@ -133,10 +133,10 @@
 # LOCALIZATION NOTE: %1$S is the URL of the media resource, %2$S is technical information (in English)
 MediaDecodeWarning=Удало�ь декодировать медиаре�ур� %1$S, но произошла ошибка: %2$S
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
-MediaCannotPlayNoDecoders=�евозможно во�произве�ти медиа. �ет декодеров дл� запрошенных форматов: %S
+MediaCannotPlayNoDecoders=�е удало�ь во�произве�ти медиа. �ет декодеров дл� запрошенных форматов: %S
 # LOCALIZATION NOTE: %S is a comma-separated list of codecs (e.g. 'video/mp4, video/webm')
 MediaNoDecoders=�ет декодеров дл� некоторых из запрошенных форматов: %S
-MediaCannotInitializePulseAudio=�евозможно и�пользовать PulseAudio
+MediaCannotInitializePulseAudio=И�пользование PulseAudio не удало�ь
 # LOCALIZATION NOTE: Do not translate "MediaRecorder".
 MediaRecorderMultiTracksNotSupported=MediaRecorder в данное врем� не поддерживает запи�ь не�кольких треков одного и того же типа.
 # LOCALIZATION NOTE: %S is the URL of the web page which is not served on HTTPS and thus is not encrypted and considered insecure.
@@ -173,7 +173,7 @@
 # LOCALIZATION NOTE: Do not translate Will-change, %1$S,%2$S are numbers.
 IgnoringWillChangeOverBudgetWarning=Will-change потребл�ет �лишком много пам�ти. Лимитом бюджета �вл�ет�� площадь поверхно�ти документа умноженна� на %1$S (%2$S пик�елей). Вхождени� will-change, превышающие бюджет, будут проигнорированы.
 # LOCALIZATION NOTE: Do not translate "Worker".
-HittingMaxWorkersPerDomain2=Worker не может быть немедленно запущен, так как другие документы из того же и�точника уже и�пользуют мак�имальное чи�ло workers. Worker �ейча� по�тавлен в очередь и будет запущен по�ле завершени� некоторых из других workers.
+HittingMaxWorkersPerDomain2=Worker не может быть немедленно запущен, так как другие документы из того же и�точника уже и�пользуют мак�имальное чи�ло worker'ов. Worker �ейча� по�тавлен в очередь и будет запущен по�ле завершени� некоторых из других worker'ов.
 # LOCALIZATION NOTE: Do not translate "Application Cache API", "AppCache" and "ServiceWorker".
 AppCacheWarning=Application Cache API (AppCache) у�тарел и в будущем будет удалён. Дл� поддержки автономной работы, пожалуй�та, ра��мотрите применение ServiceWorker.
 # LOCALIZATION NOTE: Do not translate "Worker".
@@ -205,7 +205,7 @@
 # LOCALIZATION NOTE: Do not translate "mozImageSmoothingEnabled", or "imageSmoothingEnabled"
 PrefixedImageSmoothingEnabledWarning=Применение mozImageSmoothingEnabled �вл�ет�� у�таревшим. Дл� его замены и�пользуйте безпрефик�ный imageSmoothingEnabled.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker", "Service-Worker-Allowed" or "HTTP". %1$S and %2$S are URLs.
-ServiceWorkerScopePathMismatch=�е удало�ь зареги�трировать ServiceWorker: Путь предо�тавленной обла�ти видимо�ти «%1$S» не находит�� в пределах мак�имально разрешенной обла�ти видимо�ти «%2$S». Отрегулируйте обла�ть видимо�ти, переме�тите �ценарий Service Worker, или и�пользуйте HTTP-заголовок Service-Worker-Allowed, чтобы разрешить обла�ть видимо�ти.
+ServiceWorkerScopePathMismatch=�е удало�ь зареги�трировать ServiceWorker: Путь предо�тавленной обла�ти видимо�ти «%1$S» не находит�� в пределах мак�имально разрешенной обла�ти видимо�ти «%2$S». Отрегулируйте обла�ть видимо�ти, переме�тите �ценарий Service Worker'а, или и�пользуйте HTTP-заголовок Service-Worker-Allowed, чтобы разрешить обла�ть видимо�ти.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is a URL representing the scope of the ServiceWorker, %2$S is a stringified numeric HTTP status code like "404" and %3$S is a URL.
 ServiceWorkerRegisterNetworkError=�е удало�ь зареги�трировать/обновить ServiceWorker дл� обла�ти видимо�ти «%1$S»: Загрузка не удала�ь �о �тату�ом «%2$S» дл� �ценари� «%3$S».
 # LOCALIZATION NOTE: Do not translate "ServiceWorker". %1$S is a URL representing the scope of the ServiceWorker, %2$S is a MIME Media Type like "text/plain" and %3$S is a URL.
@@ -241,7 +241,7 @@
 ManifestImageUnsupportedPurposes=Элемент %1$S по индек�у %2$S имеет неподдерживаемое назначение(�): %3$S.
 # LOCALIZATION NOTE: %1$S is the name of the parent property that has a repeated purpose (e.g., "icons"). %2$S is the index of the image object that has the repeated purpose (from 0). %3$S is the repeated purposes. E.g. "icons item at index 2 includes repeated purpose(s): a b."
 ManifestImageRepeatedPurposes=Элемент %1$S по индек�у %2$S имеет повтор�ющее�� назначение(�): %3$S.
-PatternAttributeCompileFailure=�евозможно проверить <input pattern='%S'>, потому что pattern не �вл�ет�� корректным regexp: %S
+PatternAttributeCompileFailure=�е удало�ь проверить <input pattern='%S'>, потому что pattern не �вл�ет�� корректным regexp: %S
 # LOCALIZATION NOTE: Do not translate "postMessage" or DOMWindow. %S values are origins, like https://domain.com:port
 TargetPrincipalDoesNotMatch=�е удало�ь выполнить «postMessage» над «DOMWindow»: указанный и�точник цели («%S») не �оответ�твует и�точнику окна получател� («%S»).
 # LOCALIZATION NOTE: Do not translate 'YouTube'. %S values are origins, like https://domain.com:port
@@ -423,3 +423,8 @@
 # LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
 FolderUploadPrompt.message = Вы уверены, что хотите выгрузить в�е файлы из «%S»? Делайте �то только в том �лучае, е�ли довер�ете �айту.
 FolderUploadPrompt.acceptButtonLabel = Выгрузить
+InputPickerBlockedNoUserActivation=Элемент <input> был заблокирован, так как пользователь не �овершал никаких дей�твий дл� его активации.
+ExternalProtocolFrameBlockedNoUserActivation=Iframe, и�пользующий внешний протокол, был заблокирован, так как пользователь не �овершал никаких дей�твий дл� его активации, или так как прошло недо�таточно времени � момента загрузки предыдущего похожего iframe.
+MultiplePopupsBlockedNoUserActivation=Открытие не�кольких в�плывающих окон было заблокировано, так как пользователь не �овершал никаких дей�твий дл� их активации.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Предзагрузка %S была проигнорирована из-за неизве�тного значени� атрибута «as» или «type», или неподход�щего атрибута «media».
diff -Nru firefox-84.0.2+build1/l10n/ru/dom/chrome/layout/htmlparser.properties firefox-85.0+build1/l10n/ru/dom/chrome/layout/htmlparser.properties
--- firefox-84.0.2+build1/l10n/ru/dom/chrome/layout/htmlparser.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/dom/chrome/layout/htmlparser.properties	2021-01-18 20:08:03.000000000 +0000
@@ -22,7 +22,7 @@
 
 # Tokenizer errors
 errGarbageAfterLtSlash=Му�ор по�ле «</».
-errLtSlashGt=Обнаружен «</>». Веро�тные причины: �е�кранированный «<» (�кранируйте как «&lt;») или ошибка в имени конечного тега.
+errLtSlashGt=Обнаружен «</>». Веро�тные причины: �е�кранированный «<» (�кранируйте как «&lt;») или ошибка в имени закрывающего тега.
 errCharRefLacksSemicolon=С�ылка на �имвол не была завершена точкой � зап�той.
 errNoDigitsInNCR=�ет цифр в чи�ловой ��ылке на �имвол.
 errGtInSystemId=«>» в �и�темном идентификаторе.
@@ -39,7 +39,7 @@
 errNoSpaceBetweenAttributes=�ет пробела между атрибутами.
 errUnquotedAttributeStartLt=«<» в начале незакавыченного значени� атрибута. Веро�тна� причина: Сразу перед �тим нехватает «>».
 errUnquotedAttributeStartGrave=«`» в начале незакавыченного значени� атрибута. Веро�тна� причина: И�пользование в каче�тве кавычки неверного �имвола.
-errUnquotedAttributeStartEquals=«=» в начале незакавыченного значени� атрибута. Веро�тна� причина: Бездомный двойной знак равен�тва.
+errUnquotedAttributeStartEquals=«=» в начале незакавыченного значени� атрибута. Веро�тна� причина: Случайный двойной знак равен�тва.
 errAttributeValueMissing=От�ут�твует значение атрибута.
 errBadCharBeforeAttributeNameLt=Обнаружен «<», хот� ожидало�ь им� атрибута. Веро�тна� причина: Сразу перед �тим нехватает «>».
 errEqualsSignBeforeAttributeName=Обнаружен «=», хот� ожидало�ь им� атрибута. Веро�тна� причина: От�ут�твует им� атрибута.
@@ -49,13 +49,13 @@
 errUnescapedAmpersandInterpretedAsCharacterReference=Строка, �ледующа� за «&», была интерпретирована как ��ылка на �имвол. («&» веро�тно должен быть �кранирован как «&amp;»).
 errNotSemicolonTerminated=Именованна� ��ылка на �имвол не была завершена точкой � зап�той. (Или «&» веро�тно должен быть �кранирован как «&amp;»).
 errNoNamedCharacterMatch=«&» не начинает ��ылку на �имвол. («&» веро�тно должен быть �кранирован как «&amp;»).
-errQuoteBeforeAttributeName=Обнаружен кавычка, хот� ожидало�ь им� атрибута. Веро�тна� причина: �разу перед �тим от�ут�твует «=».
+errQuoteBeforeAttributeName=Обнаружена кавычка, хот� ожидало�ь им� атрибута. Веро�тна� причина: �разу перед �тим от�ут�твует «=».
 errLtInAttributeName=«<» в имени атрибута. Веро�тна� причина: �разу перед �тим от�ут�твует «>».
 errQuoteInAttributeName=Кавычка в имени атрибута. Веро�тна� причина: Где-то раньше недо�таёт парной кавычки.
 errExpectedPublicId=Ожидал�� публичный идентификатор, но doctype был завершён.
 errBogusDoctype=Фальшивый doctype.
-maybeErrAttributesOnEndTag=Конечный тег имел атрибуты.
-maybeErrSlashInEndTag=Бездомный «/» в конце конечного тега.
+maybeErrAttributesOnEndTag=Закрывающий тег имеет атрибуты.
+maybeErrSlashInEndTag=Случайный «/» в конце закрывающего тега.
 errNcrNonCharacter=С�ылка на �имвол разворачивает�� в non-character.
 errNcrSurrogate=С�ылка на �имвол разворачивает�� в �уррогат.
 errNcrControlChar=С�ылка на �имвол разворачивает�� в контрольный �имвол.
@@ -66,9 +66,9 @@
 errEofInDoctype=Конец файла внутри doctype.
 errEofInAttributeValue=При нахождении внутри значени� атрибута до�тигнут конец файла. Тег проигнорирован.
 errEofInAttributeName=При нахождении в имени атрибута до�тигнут конец файла. Тег проигнорирован.
-errEofWithoutGt=До�тигнут конец файла, а предыдущий тег не завершён � помощью «>». Тег проигнорирован.
+errEofWithoutGt=До�тигнут конец файла, а предыдущий тег не закрыт � помощью «>». Тег проигнорирован.
 errEofInTagName=До�тигнут конец файла при пои�ке имени тега. Тег проигнорирован.
-errEofInEndTag=Конец файла внутри завершающего тега. Тег проигнорирован.
+errEofInEndTag=Конец файла внутри закрывающего тега. Тег проигнорирован.
 errEofAfterLt=Конец файла по�ле «<».
 errNcrOutOfRange=С�ылка на �имвол находит�� за пределами допу�тимого диапазона Юникода.
 errNcrUnassigned=С�ылка на �имвол разворачивает�� в никогда не назначаемую точку кода.
@@ -84,12 +84,12 @@
 
 # Tree builder errors
 errDeepTree=Дерево документа имеет �лишком большую вложенно�ть. Дерево будет обрезано до глубины в 513 �лементов.
-errStrayStartTag2=Бездомный начальный тег «%1$S».
-errStrayEndTag=Бездомный конечный тег «%1$S».
-errUnclosedElements=Обнаружен конечный тег «%1$S», но имеют�� открытые �лементы.
-errUnclosedElementsImplied=Предполагает�� конечный тег «%1$S», но имеют�� открытые �лементы.
+errStrayStartTag2=Случайный открывающий тег «%1$S».
+errStrayEndTag=Случайный закрывающий тег «%1$S».
+errUnclosedElements=Обнаружен закрывающий тег «%1$S», но имеют�� открытые �лементы.
+errUnclosedElementsImplied=Предполагает�� закрывающий тег «%1$S», но имеют�� открытые �лементы.
 errUnclosedElementsCell=Ячейка таблицы была не�вно закрыта, но имеют�� открытые �лементы.
-errStrayDoctype=Бездомный doctype.
+errStrayDoctype=Случайный doctype.
 errAlmostStandardsDoctype=Almost standards mode doctype. Ожидал�� «<!DOCTYPE html>».
 errQuirkyDoctype=Quirky doctype. Ожидал�� «<!DOCTYPE html>».
 errNonSpaceInTrailer=�епробельный �имвол в трейлере �траницы.
@@ -99,36 +99,36 @@
 errNonSpaceInColgroupInFragment=�епробельный �имвол в «colgroup» при пар�инге фрагмента.
 errNonSpaceInNoscriptInHead=�епробельный �имвол внутри «noscript» внутри «head».
 errFooBetweenHeadAndBody=«%1$S» �лемент между «head» и «body».
-errStartTagWithoutDoctype=Обнаружен начальный тег, а doctype перед ним не обнаружен. Ожидал�� «<!DOCTYPE html>».
+errStartTagWithoutDoctype=Обнаружен открывающий тег, а doctype перед ним не обнаружен. Ожидал�� «<!DOCTYPE html>».
 errNoSelectInTableScope=�ет «select» в диапазоне таблицы.
-errStartSelectWhereEndSelectExpected=�ачальный тег «select» где ожидал�� конечный тег.
-errStartTagWithSelectOpen=Открыт начальный тег «%1$S» � «select».
-errBadStartTagInHead2=�еправильный начальный тег «%1$S» в «head».
-errBadStartTagInNoscriptInHead=�еправильный начальный тег «%1$S» в «noscript» в «head».
-errImage=Обнаружен начальный тег «image».
-errFooSeenWhenFooOpen=Обнаружен начальный тег «%1$S», но �лемент того же типа уже был открыт.
-errFooSeenWhenFooOpen2=Обнаружен начальный тег «%1$S», но �лемент того же типа уже был открыт.
+errStartSelectWhereEndSelectExpected=Открывающий тег «select» там, где ожидал�� закрывающий.
+errStartTagWithSelectOpen=Открывающий тег «%1$S» р�дом � открытым «select».
+errBadStartTagInHead2=�еправильный открывающий тег «%1$S» в «head».
+errBadStartTagInNoscriptInHead=�еправильный открывающий тег «%1$S» в «noscript» в «head».
+errImage=Обнаружен открывающий тег «image».
+errFooSeenWhenFooOpen=Обнаружен открывающий тег «%1$S», но такой �лемент уже был открыт.
+errFooSeenWhenFooOpen2=Обнаружен открывающий тег «%1$S», но такой �лемент уже был открыт.
 errHeadingWhenHeadingOpen=Заголовок не может потомком другого заголовка.
-errFramesetStart=обнаружен начальный тег «frameset».
+errFramesetStart=Обнаружен открывающий тег «frameset».
 errNoCellToClose=�ет �чейки дл� закрыти�.
-errStartTagInTable=В «table» обнаружен начальный тег «%1$S».
-errFormWhenFormOpen=Обнаружен начальный тег «form», но там уже е�ть активный �лемент «form». Вложенные формы не разрешены. Тег проигнорирован.
-errTableSeenWhileTableOpen=Обнаружен начальный тег дл� «table», но предыдуща� «table» в�ё ещё открыта.
-errStartTagInTableBody=�ачальный тег «%1$S» в теле таблицы.
-errEndTagSeenWithoutDoctype=Обнаружен конечный тег, а doctype перед ним не обнаружен. Ожидал�� «<!DOCTYPE html>».
-errEndTagAfterBody=Обнаружен конечный тег по�ле закрытого «body».
-errEndTagSeenWithSelectOpen=Конечный тег «%1$S» � открытым «select».
+errStartTagInTable=В «table» обнаружен открывающий тег «%1$S».
+errFormWhenFormOpen=Обнаружен открывающий тег «form», но там уже е�ть активный �лемент «form». Вложенные формы не разрешены. Тег проигнорирован.
+errTableSeenWhileTableOpen=Обнаружен открывающий тег «table», но предыдуща� «table» в�ё ещё открыта.
+errStartTagInTableBody=Открывающий тег «%1$S» в теле таблицы.
+errEndTagSeenWithoutDoctype=Обнаружен закрывающий тег, а doctype перед ним не обнаружен. Ожидал�� «<!DOCTYPE html>».
+errEndTagAfterBody=Обнаружен закрывающий тег по�ле закрытого «body».
+errEndTagSeenWithSelectOpen=Закрывающий тег «%1$S» р�дом � открытым «select».
 errGarbageInColgroup=Му�ор во фрагменте «colgroup».
-errEndTagBr=Конечный тег «br».
-errNoElementToCloseButEndTagSeen=В диапазоне нет �лемента «%1$S», но обнаружен конечный тег «%1$S».
-errHtmlStartTagInForeignContext=�ачальный тег HTML «%1$S» в чужом контек�те про�тран�тва имён.
+errEndTagBr=Закрывающий тег «br».
+errNoElementToCloseButEndTagSeen=Р�дом нет �лементов «%1$S», но обнаружен закрывающий тег «%1$S».
+errHtmlStartTagInForeignContext=Открывающий HTML-тег «%1$S» в чужом контек�те про�тран�тва имён.
 errTableClosedWhileCaptionOpen=«table» закрыта, но «caption» была в�ё ещё открыта.
 errNoTableRowToClose=�ет �троки таблицы дл� закрыти�.
 errNonSpaceInTable=�еверно размещённые непробельные �имволы внутри таблицы.
 errUnclosedChildrenInRuby=�езакрытые потомки в «ruby».
-errStartTagSeenWithoutRuby=Обнаружен начальный тег «%1$S» без открытого �лемента «ruby».
+errStartTagSeenWithoutRuby=Обнаружен открывающий тег «%1$S» без открытого �лемента «ruby».
 errSelfClosing=Самозакрывающий�� �интак�и� («/>») и�пользован в непу�том HTML-�лементе. Игнорирую �л�ш и �читаю �то начальным т�гом.
 errNoCheckUnclosedElementsOnStack=�езакрытые �лементы в �теке.
-errEndTagDidNotMatchCurrentOpenElement=Конечный тег «%1$S» не �оответ�твует имени текущего открытого �лемента («%2$S»).
-errEndTagViolatesNestingRules=Конечный тег «%1$S» нарушает правила вложени�.
-errEndWithUnclosedElements=Обнаружен конечный тег «%1$S», но имеют�� незакрытые �лементы.
+errEndTagDidNotMatchCurrentOpenElement=Закрывающий тег «%1$S» не �оответ�твует имени текущего открытого �лемента («%2$S»).
+errEndTagViolatesNestingRules=Закрывающий тег «%1$S» нарушает правила вложени�.
+errEndWithUnclosedElements=Обнаружен закрывающий тег «%1$S», но имеют�� незакрытые �лементы.
diff -Nru firefox-84.0.2+build1/l10n/ru/dom/chrome/layout/layout_errors.properties firefox-85.0+build1/l10n/ru/dom/chrome/layout/layout_errors.properties
--- firefox-84.0.2+build1/l10n/ru/dom/chrome/layout/layout_errors.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/dom/chrome/layout/layout_errors.properties	2021-01-18 20:08:03.000000000 +0000
@@ -36,7 +36,7 @@
 CompositorAnimationWarningTransformIsBlockedByImportantRules=Transform-анимации не могут быть запущены в композитном �лое, так как transform-�вой�тва переопределены !important правилами
 CompositorAnimationWarningOpacityFrameInactive=�нимаци� не может быть запущена в композитном �лое, так как фрейм не был отмечен как активный дл� «opacity» анимации
 CompositorAnimationWarningHasRenderingObserver=�нимаци� не может быть запущена в композитном �лое, так как �лемент имеет наблюдателей рендеринга (-moz-element или SVG clipping/masking)
-CompositorAnimationWarningHasCurrentColor=�нимации «background-color» не могут быть запущены на композиторе � ключевым кадром «current-color».
+CompositorAnimationWarningHasCurrentColor=�нимации «background-color» не могут быть запущены в композитном �лое, е�ли в правилах keyframe и�пользует�� «current-color».
 
 ## LOCALIZATION NOTE: Do not translate zoom, calc(), "transform", "transform-origin: 0 0"
 ZoomPropertyWarning=�а �той �транице и�пользует�� не�тандартное �вой�тво «zoom». Попробуйте и�пользовать calc() в �оответ�твующих значени�х �вой�тв или и�пользовать «transform» вме�те � «transform-origin: 0 0».
@@ -51,4 +51,4 @@
 ## %3$S is a floating point value with the total adjusted distance
 ScrollAnchoringDisabledInContainer=Закрепление прокрутки в контейнере прокрутки было отключено из-за �лишком большого чи�ла по�ледовательных корректировок (%1$S) при �лишком малом общем ра��то�нии (в �реднем %2$S px, в�его %3$S px).
 
-ForcedLayoutStart=Макет был принудительно применён перед полной загрузкой �траницы. Е�ли таблицы �тилей ещё не загружены, �то может вызвать в�пышку не�тилизованного �одержимого.
+ForcedLayoutStart=Макет был принудительно применён перед полной загрузкой �траницы. Е�ли таблицы �тилей ещё не загружены, то �то может �провоцировать отображение не�тилизованного �одержимого.
diff -Nru firefox-84.0.2+build1/l10n/ru/netwerk/necko.properties firefox-85.0+build1/l10n/ru/netwerk/necko.properties
--- firefox-84.0.2+build1/l10n/ru/netwerk/necko.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/netwerk/necko.properties	2021-01-18 20:08:03.000000000 +0000
@@ -96,7 +96,7 @@
 # LOCALIZATION NOTE (CookieRejectedInvalidCharValue): %1$S is the cookie name.
 CookieRejectedInvalidCharValue=Кука «%1$S» была отклонена из-за некорректных �имволов в �воём значении.
 # LOCALIZATION NOTE (CookieRejectedHttpOnlyButFromScript): %1$S is the cookie name.
-CookieRejectedHttpOnlyButFromScript=Кука «%1$S» была отклонена, так как кука HTTP-Only уже имеет��, но �крипт попытал�� �охранить ещё одну.
+CookieRejectedHttpOnlyButFromScript=Кука «%1$S» была отклонена, так как HTTP-Only кука уже имеет��, но �крипт попытал�� у�тановить ещё одну.
 # LOCALIZATION NOTE (CookieRejectedSecureButHttp): %1$S is the cookie name.
 CookieRejectedSecureButNonHttps=Кука «%1$S» была отклонена, так как не-HTTPS-кука не может быть у�тановлена как «secure».
 # LOCALIZATION NOTE (CookieRejectedThirdParty): %1$S is the cookie response header.
diff -Nru firefox-84.0.2+build1/l10n/ru/security/manager/chrome/pippki/pippki.properties firefox-85.0+build1/l10n/ru/security/manager/chrome/pippki/pippki.properties
--- firefox-84.0.2+build1/l10n/ru/security/manager/chrome/pippki/pippki.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/security/manager/chrome/pippki/pippki.properties	2021-01-18 20:08:03.000000000 +0000
@@ -55,7 +55,7 @@
 # Page Info
 pageInfo_NoEncryption=Соединение не зашифровано
 pageInfo_Privacy_None1=Веб-�айт %S не поддерживает шифрование дл� про�матриваемой вами �траницы.
-pageInfo_Privacy_None2=Информаци�, отправленна� по Интернету без шифровани�, может быть до�тупна другим во врем� передачи. 
+pageInfo_Privacy_None2=Информаци�, отправл�ема� по Интернету без шифровани�, может быть до�тупна другим во врем� передачи. 
 pageInfo_Privacy_None4=Про�матриваема� вами �траница не была зашифрована перед передачей через Интернет.
 # LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
 # %1$S is the name of the encryption standard,
diff -Nru firefox-84.0.2+build1/l10n/ru/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/ru/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/ru/security/manager/security/certificates/certManager.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/security/manager/security/certificates/certManager.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -131,7 +131,7 @@
 pkcs12-unknown-err-restore = �е удало�ь во��тановить файл PKCS#12 по неизве�тным причинам.
 pkcs12-unknown-err-backup = �е удало�ь �оздать резервную копию файла PKCS#12 по неизве�тным причинам.
 pkcs12-unknown-err = Операци� PKCS #12 завершила�ь неудачей по неизве�тным причинам.
-pkcs12-info-no-smartcard-backup = �евозможно �оздать резервную копию �ертификатов, наход�щих�� в аппаратном у�трой�тве защиты, таком как �март-карта.
+pkcs12-info-no-smartcard-backup = �е удало�ь �оздать резервную копию �ертификатов, наход�щих�� в аппаратном у�трой�тве защиты, таком как �март-карта.
 pkcs12-dup-data = Сертификат и закрытый ключ уже �уще�твуют в у�трой�тве защиты.
 
 ## PKCS#12 file dialogs
@@ -165,7 +165,7 @@
 delete-ssl-override-title =
     .title = Удаление и�ключени� дл� �ертификата �ервера
 delete-ssl-override-confirm = Вы уверены, что хотите удалить и�ключение дл� данного �ервера?
-delete-ssl-override-impact = Е�ли вы удалите и�ключение дл� �ервера, вы во��тановите дл� данного �ервера обычные проверки безопа�но�ти и потребуете от него и�пользовани� дей�твительного �ертификата.
+delete-ssl-override-impact = Е�ли вы удалите и�ключение дл� �ервера, вы во��тановите дл� данного �ервера обычную процедуру проверки безопа�но�ти и потребуете от него и�пользовани� дей�твительного �ертификата.
 delete-ca-cert-title =
     .title = Удаление или объ�вление недовери� �ертификатам центров �ертификации
 delete-ca-cert-confirm = Вы хотите удалить �ти �ертификаты центра �ертификации. Е�ли в �пи�ке �тих �ертификатов имеют�� в�троенные �ертификаты, то они будут объ�влены недоверенными, что имеет тот же �ффект. Вы уверены, что хотите удалить их или объ�вить их недоверенными?
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:03.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=\u0020д; д; д
 
 downloadErrorAlertTitle=Ошибка загрузки
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Загруженный файл не может быть �охранён, так как он был заблокирован %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Загруженный файл не может быть �охранён, так как он был заблокирован ра�ширением.
 downloadErrorGeneric=Загрузка не может быть �охранена, так как произошла неизве�тна� ошибка.\n\nПожалуй�та, попробуйте �нова.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=О�тало�ь не�колько �екунд
 timeUnknown2=О�тавшее�� врем� неизве�тно
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=ре�ур� %1$S
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/ru/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/ru/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:08:03.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=В �оединении � прок�и-�ервером отказано
 check_error-2153390069=И�тёк �рок дей�тви� �ертификата �ервера (пожалуй�та, у�тановите правильную дату и врем� на �и�темных ча�ах, е�ли они некорректны)
 check_error-verification_failed=Цело�тно�ть обновлени� не может быть подтверждена
+check_error-move_failed=�е удало�ь подготовить обновление к у�тановке
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/about/aboutServiceWorkers.ftl firefox-85.0+build1/l10n/ru/toolkit/toolkit/about/aboutServiceWorkers.ftl
--- firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/toolkit/about/aboutServiceWorkers.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -5,11 +5,10 @@
 
 ### The term "Service Workers" and "Workers" should not be translated
 
-about-service-workers-title = О Service Workers
-about-service-workers-main-title = Зареги�трированные Service Workers
-about-service-workers-warning-not-enabled = Service Workers не включены.
-about-service-workers-warning-no-service-workers = �и одного Service Worker не зареги�трировано.
-
+about-service-workers-title = О Service Worker'ах
+about-service-workers-main-title = Зареги�трированные Service Worker'ы
+about-service-workers-warning-not-enabled = �ет включённых Service Worker'ов.
+about-service-workers-warning-no-service-workers = �и одного Service Worker'а не зареги�трировано.
 # The original title of service workers' information
 #
 # Variables:
@@ -29,12 +28,8 @@
 waiting-cache-name = <strong>Им� к�ша ожидани�:</strong> { $name }
 push-end-point-waiting = <strong>Конечна� точка Push:</strong> { waiting }
 push-end-point-result = <strong>Конечна� точка Push:</strong> { $name }
-
 # This term is used as a button label (verb, not noun).
 update-button = Обновить
-
 unregister-button = Разреги�трировать
-
 unregister-error = �е удало�ь разреги�трировать �тот Service Worker.
-
 waiting = Ожидание…
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ru/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -64,7 +64,7 @@
 app-basics-rosetta = Бинарна� тран�л�ци� Rosetta
 app-basics-memory-use = И�пользование пам�ти
 app-basics-performance = Производительно�ть
-app-basics-service-workers = Зареги�трированные Service Workers
+app-basics-service-workers = Зареги�трированные Service Worker'ы
 app-basics-profiles = Профили
 app-basics-launcher-process-status = Запу�кающий проце��
 app-basics-multi-process-support = Многопроце��ные окна
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Сторонние модули
+support-third-party-modules-module = Файл модул�
+support-third-party-modules-version = Вер�и� файла
+support-third-party-modules-vendor = Информаци� производител�
+support-third-party-modules-occurrence = Вхождени�
+support-third-party-modules-process = Тип и идентификатор проце��а
+support-third-party-modules-thread = Поток
+support-third-party-modules-base = �дре� базовой загрузки образа
+support-third-party-modules-uptime = Врем� работы проце��а (м�)
+support-third-party-modules-duration = Продолжительно�ть загрузки (м�)
+support-third-party-modules-empty = Сторонние модули не загружали�ь.
+support-third-party-modules-no-value = (�ет значени�)
+support-third-party-modules-button-open =
+    .title = Открыть ра�положение файла…
+support-third-party-modules-expand =
+    .title = Показать подробную информацию
+support-third-party-modules-collapse =
+    .title = Свернуть подробную информацию
+support-third-party-modules-unsigned-icon =
+    .title = Этот модуль не подпи�ан
+support-third-party-modules-folder-icon =
+    .title = Открыть ра�положение файла…
+support-third-party-modules-down-icon =
+    .title = Показать подробную информацию
+support-third-party-modules-up-icon =
+    .title = Свернуть подробную информацию
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -282,7 +308,7 @@
 bug-link = проблема { $bugNumber }
 # Variables
 #   $bugNumber (string) - Bug number on Bugzilla
-support-blocklisted-bug = Зане�ено в чёрный �пи�ок из-за изве�тных проблем: <a data-l10n-name="bug-link">bug { $bugNumber }</a>
+support-blocklisted-bug = Зане�ено в чёрный �пи�ок из-за изве�тных проблем: <a data-l10n-name="bug-link">баг { $bugNumber }</a>
 # Variables
 # $failureCode (string) - String that can be searched in the source tree.
 unknown-failure = Заблокировано; код ошибки { $failureCode }
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/ru/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -29,7 +29,7 @@
     .label = Web API: <link rel="preload">
 # Do not translate "rel", "preload" or "link" here, as they are all HTML spec
 # values that do not get translated.
-experimental-features-web-api-link-preload-description = �трибут <a data-l10n-name="rel">rel</a> �о значением <code>"preload"</code> в �лементе <a data-l10n-name="link">&lt;link&gt;</a> предназначен дл� повышени� производительно�ти, позвол�� вам загружать ре�ур�ы на более ранних �тапах жизненного цикла �траницы, гарантиру�, что они до�тупны раньше и � меньшей веро�тно�тью блокиру� рендеринг �траниц. Дл� получени� дополнительной информации прочитайте <a data-l10n-name="readmore">“Предзагрузка �одержимого � помощью <code>rel="preload"</code>�</a> или прочитайте  <a data-l10n-name="bugzilla">баг 1583604</a>.
+experimental-features-web-api-link-preload-description = �трибут <a data-l10n-name="rel">rel</a> �о значением <code>"preload"</code> в �лементе <a data-l10n-name="link">&lt;link&gt;</a> предназначен дл� повышени� производительно�ти, позвол�� вам загружать ре�ур�ы на более ранних �тапах жизненного цикла �траницы, гарантиру�, что они будут до�тупны раньше и � меньшей веро�тно�тью будут блокировать рендеринг �траниц. Дл� получени� дополнительной информации прочитайте <a data-l10n-name="readmore">“Предзагрузка �одержимого � помощью <code>rel="preload"</code>�</a> или прочитайте <a data-l10n-name="bugzilla">баг 1583604</a>.
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-css-focus-visible =
@@ -55,7 +55,7 @@
 experimental-features-devtools-execution-context-selector-description = Эта функци� отображает кнопку в командной �троке кон�оли, позвол�ющую изменить контек�т, в котором будет выполн�ть�� введённое вами выражение. Дл� получени� дополнительной информации прочитайте <a data-l10n-name="bugzilla1">баг 1605154</a> и <a data-l10n-name="bugzilla2">баг 1605153</a>.
 experimental-features-devtools-compatibility-panel =
     .label = Ин�трументы разработчика: Панель �овме�тимо�ти
-experimental-features-devtools-compatibility-panel-description = Бокова� панель дл� Ин�пектора �траниц, отображающа� информацию о �о�то�нии кро��-браузерной �овме�тимо�ти  вашего приложени�. Дл� получени� дополнительной информации прочитайте <a data-l10n-name="bugzilla">баг 1584464</a>.
+experimental-features-devtools-compatibility-panel-description = Бокова� панель дл� Ин�пектора �траниц, отображающа� информацию о �о�то�нии кро��браузерной �овме�тимо�ти вашего приложени�. Дл� получени� дополнительной информации прочитайте <a data-l10n-name="bugzilla">баг 1584464</a>.
 # Do not translate 'SameSite', 'Lax' and 'None'.
 experimental-features-cookie-samesite-lax-by-default2 =
     .label = Куки: SameSite = Lax по умолчанию
@@ -76,12 +76,12 @@
 # by various online articles and is technical in nature.
 experimental-features-cookie-samesite-schemeful =
     .label = Куки: Schemeful SameSite
-experimental-features-cookie-samesite-schemeful-description = Ра��матривать куки из одинакового домена, но � отличающими�� �хемами (например, http://example.com и https://example.com) как кро��-�айтовые, а не отно��щие�� к одному �айту. Повышает безопа�но�ть, но потенциально может приве�ти к нарушению работы.
+experimental-features-cookie-samesite-schemeful-description = Ра��матривать куки из одинакового домена, но � отличающими�� �хемами (например, http://example.com и https://example.com) как меж�айтовые, а не отно��щие�� к одному �айту. Повышает безопа�но�ть, но потенциально может приве�ти к нарушению работы.
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support =
     .label = Ин�трументы разработчика: Отладка Service Worker
 # "Service Worker" is an API name and is usually not translated.
-experimental-features-devtools-serviceworker-debugger-support-description = Включает �к�периментальную поддержку дл� Service Workers на Панели отладчика. Это функци� может замедл�ть работу Ин�трументов разработчика и увеличить потребление пам�ти.
+experimental-features-devtools-serviceworker-debugger-support-description = Добавл�ет �к�периментальную поддержку Service Workers'ов на Панель отладчика. Это функци� может замедл�ть работу Ин�трументов разработчика и увеличить потребление пам�ти.
 # WebRTC global mute toggle controls
 experimental-features-webrtc-global-mute-toggles =
     .label = Переключатель глобального отключени� звука WebRTC
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Поддержка не�кольких окон «Картинка-в-картинке»
 experimental-features-multi-pip-description = Эк�периментальна� поддержка, позвол�юща� одновременно открывать не�колько окон «Картинка-в-картинке».
+experimental-features-http3 =
+    .label = Протокол HTTP/3
+experimental-features-http3-description = Эк�периментальна� поддержка протокола HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ru/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Страница:
     .accesskey = и
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } из { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = По�ледн�� �траница
-
+printpreview-homearrow-button =
+    .title = Перва� �траница
+printpreview-previousarrow-button =
+    .title = Предыдуща� �траница
+printpreview-nextarrow-button =
+    .title = Следующа� �траница
+printpreview-endarrow-button =
+    .title = По�ледн�� �траница
diff -Nru firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ru/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ru/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:54:53.000000000 +0000
+++ firefox-85.0+build1/l10n/ru/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:03.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = по
+printui-page-custom-range-input =
+    .aria-label = Введите �вой диапазон �траниц
+    .placeholder = например, 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Чи�ло копий
 printui-orientation = Ориентаци�
@@ -49,6 +52,7 @@
 printui-options = �а�тройки
 printui-headers-footers-checkbox = Печатать колонтитулы
 printui-backgrounds-checkbox = Печатать фон
+printui-selection-checkbox = Печатать только выделенную обла�ть
 printui-color-mode-label = Цветовой режим
 printui-color-mode-color = Цветной
 printui-color-mode-bw = Чёрно-белый
@@ -57,19 +61,29 @@
 printui-margins-min = Минимальные
 printui-margins-none = �ет
 printui-margins-custom = �а�траиваемые
+printui-margins-custom-inches = �а�траиваемые (дюймы)
 printui-margins-custom-top = Верхнее
+printui-margins-custom-top-inches = Верхнее (дюймы)
 printui-margins-custom-bottom = �ижнее
+printui-margins-custom-bottom-inches = �ижнее (дюймы)
 printui-margins-custom-left = Левое
+printui-margins-custom-left-inches = Левое (дюймы)
 printui-margins-custom-right = Правое
+printui-margins-custom-right-inches = Правое (дюймы)
 printui-system-dialog-link = Печатать, и�пользу� �и�темный диалог…
 printui-primary-button = Печать
 printui-primary-button-save = Сохранить
 printui-cancel-button = Отмена
+printui-close-button = Закрыть
 printui-loading = Подготовка к предпро�мотру
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Предварительный про�мотр
+printui-pages-per-sheet = Страниц на одном ли�те
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Печать…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
@@ -93,5 +107,5 @@
 printui-error-invalid-margin = Пожалуй�та, введите допу�тимые значени� полей дл� выбранного размера бумаги.
 # Variables
 # $numPages (integer) - Number of pages
-printui-error-invalid-range = Диапазон должен быть чи�лом от 1 до { $numPages }.
+printui-error-invalid-range = Диапазон должен �одержать чи�ла от 1 до { $numPages }.
 printui-error-invalid-start-overflow = �омер �траницы «С» должен быть меньше, чем номер �траницы «по».
diff -Nru firefox-84.0.2+build1/l10n/si/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/si/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/si/browser/browser/appmenu.ftl	2021-01-06 11:54:57.000000000 +0000
+++ firefox-85.0+build1/l10n/si/browser/browser/appmenu.ftl	2021-01-18 20:08:08.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = නව කවුළුවක්
+appmenuitem-new-private-window =
+    .label = නව පුද්ගලික කවුළුව
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = පූර්ණ තිරය
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ද�න් සම්මුහුර්ත කරන්න
+appmenuitem-save-page =
+    .label = පිටුව සුරකින්න...
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/si/browser/browser/browser.ftl firefox-85.0+build1/l10n/si/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/si/browser/browser/browser.ftl	2021-01-06 11:54:57.000000000 +0000
+++ firefox-85.0+build1/l10n/si/browser/browser/browser.ftl	2021-01-18 20:08:08.000000000 +0000
@@ -244,6 +244,9 @@
 browser-window-close-button =
     .tooltiptext = වසන්න
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -313,3 +316,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> හට ඔබගේ දක්වනයේ ප�ලනය පවතී. ප�ලනය න�වත ල�බීමට Esc ඔබන්න.
 pointerlock-warning-no-domain = මෙම ලේඛනය හට ඔබගේ දක්වනයේ ප�ලනය පවතී. ප�ලනය න�වත ල�බීමට Esc ඔබන්න.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = සියළු පිටුසලකුණු පෙන්වන්න…
+bookmarks-recent-bookmarks =
+    .value = මෑතදී පිටුසලකුණු කළ
+bookmarks-toolbar-chevron =
+    .tooltiptext = තවත් පිටුසලකුණු පෙන්වන්න
+bookmarks-sidebar-content =
+    .aria-label = පිටු සලකුණු
+bookmarks-menu-button =
+    .label = පිටු සලකුණු මෙනුව
+bookmarks-other-bookmarks-menu =
+    .label = වෙනත් පිටුසලකුණු
+bookmarks-mobile-bookmarks-menu =
+    .label = ජංගම පිටු සළකුණු
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] පිටු සලකුණු ප�ති තීරුව සඟවන්න
+           *[other] පිටුලකුණු ප�ති තීරුව පෙන්වන්න
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] පිටු සලකුණු මෙවලම් තීරුව සඟවන්න
+           *[other] පිටුලකුණු මෙවලම්තීරුව පෙන්වන්න
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] මෙවලම් තීරුවෙන් පිටු සලකුණු මෙනුව ඉවත් කරන්න
+           *[other] මෙවලම් තීරුවට පිටුසලකුණු මෙනුව එක් කරන්න
+        }
+bookmarks-search =
+    .label = පිටුසලකුණු සොයන්න
+bookmarks-tools =
+    .label = පිටු සලකුණු මෙවලම්
+bookmarks-toolbar-menu =
+    .label = පිටු සලකුණු මෙවලම් තීරුව
+bookmarks-toolbar-placeholder =
+    .title = පිටු සලකුණු මෙවලම් තීරුවේ අයිතමයන්
+bookmarks-toolbar-placeholder-button =
+    .label = පිටු සලකුණු මෙවලම් තීරුවේ අයිතමයන්
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = පිටු සලකුණු
+library-bookmarks-bookmark-this-page =
+    .label = මෙම පිටුව සලකුණු කරගන්න
+library-bookmarks-bookmark-edit =
+    .label = මෙම පිටු සලකුණ සකසන්න
+
+## More items
+
+more-menu-go-offline =
+    .label = නොබ�ඳිව ක්�රිය� කරන්න
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/sk/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/appmenu.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/appmenu.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nové okno
+appmenuitem-new-private-window =
+    .label = Nové súkromné okno
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Priblížiť
 appmenuitem-zoom-reduce =
     .label = Oddialiť
+appmenuitem-fullscreen =
+    .label = Na celú obrazovku
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synchronizovať teraz
+appmenuitem-save-page =
+    .label = Uložiť stránku ako…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Čo je nové
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/sk/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/appMenuNotifications.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -32,6 +32,7 @@
     .secondarybuttonlabel = Teraz nie
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Po rýchlom reštarte obnoví { -brand-shorter-name } všetky vaše otvorené karty okná, ktoré nie sú otvorené v súkromnom prehliadaní.
+appmenu-update-other-instance-message = K dispozícii je nová aktualizácia aplikácie { -brand-shorter-name }, ale nemôže byť nainštalovaná, pretože je spustená �alšia kópia aplikácie { -brand-shorter-name }. Pre spustenie aktualizácie túto kópiu ukon�ite alebo spustenie aktualizácie vynúťte (spustená aplikácia môže prestať správne fungovať, dokým ju nereštartujete).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, rozumiem
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/browserContext.ftl firefox-85.0+build1/l10n/sk/browser/browser/browserContext.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/browserContext.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/browserContext.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -253,8 +253,8 @@
     .label = Zobraziť obrázok pozadia
     .accesskey = b
 main-context-menu-generate-new-password =
-    .label = Používať vygenerované heslo…
-    .accesskey = g
+    .label = Použiť vygenerované heslo…
+    .accesskey = u
 main-context-menu-keyword =
     .label = Pridať kľú�ové slovo pre toto vyhľadávanie…
     .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/browser.ftl firefox-85.0+build1/l10n/sk/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/browser.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/browser.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -427,3 +427,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> má kontrolu nad vaším kurzorom. Ovládanie kurzora prevezmete stla�ením klávesu Esc.
 pointerlock-warning-no-domain = Tento dokument má kontrolu nad vaším kurzorom. Ovládanie kurzora prevezmete stla�ením klávesu Esc.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Zobraziť všetky záložky
+bookmarks-recent-bookmarks =
+    .value = Nedávno pridané medzi záložky
+bookmarks-toolbar-chevron =
+    .tooltiptext = Zobraziť �alšie záložky
+bookmarks-sidebar-content =
+    .aria-label = Záložky
+bookmarks-menu-button =
+    .label = Ponuka záložiek
+bookmarks-other-bookmarks-menu =
+    .label = Ostatné záložky
+bookmarks-mobile-bookmarks-menu =
+    .label = Záložky mobilného Firefoxu
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skryť bo�ný panel Záložky
+           *[other] Zobraziť bo�ný panel Záložky
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skryť panel nástrojov Záložky
+           *[other] Zobraziť panel nástrojov Záložky
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Odstrániť ponuku záložiek z panela nástrojov
+           *[other] Pridať ponuku záložiek do panela nástrojov
+        }
+bookmarks-search =
+    .label = Hľadať v záložkách
+bookmarks-tools =
+    .label = Nástroje pre prácu so záložkami
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Panel záložiek
+    .accesskey = z
+    .aria-label = Záložky
+bookmarks-toolbar-menu =
+    .label = Panel záložiek
+bookmarks-toolbar-placeholder =
+    .title = Položky panela záložiek
+bookmarks-toolbar-placeholder-button =
+    .label = Položky panela záložiek
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Záložky
+library-bookmarks-bookmark-this-page =
+    .label = Pridať stránku medzi záložky
+library-bookmarks-bookmark-edit =
+    .label = Upraviť túto záložku
+
+## More items
+
+more-menu-go-offline =
+    .label = Pracovať offline
+    .accesskey = f
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/sk/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/newtab/newtab.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Nová karta
 newtab-settings-button =
     .title = Prispôsobte si svoju stránku Nová karta
+newtab-personalize-button-label = Prispôsobiť
+    .title = Prispôsobiť stránku novej karty
+    .aria-label = Prispôsobiť stránku novej karty
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Vyhľadávanie na webe
     .title = Vyhľadávanie na webe
     .aria-label = Vyhľadávanie na webe
+newtab-search-box-text = Vyhľadávanie na webe
+newtab-search-box-input =
+    .placeholder = Vyhľadávanie na webe
+    .aria-label = Vyhľadávanie na webe
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Pridať vyhľadávací modul
 newtab-topsites-add-topsites-header = Nová top stránka
+newtab-topsites-add-shortcut-header = Nová skratka
 newtab-topsites-edit-topsites-header = Upraviť top stránku
+newtab-topsites-edit-shortcut-header = Upraviť skratku
 newtab-topsites-title-label = Názov
 newtab-topsites-title-input =
     .placeholder = Zadajte názov
@@ -203,3 +212,28 @@
 
 newtab-error-fallback-info = Hups, pri na�ítavaní tohto obsahu sa nie�o pokazilo.
 newtab-error-fallback-refresh-link = Obnovením stránky to skúsite znova.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Skratky
+newtab-custom-shortcuts-subtitle = Stránky, ktoré si uložíte alebo navštívite
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } riadok
+        [few] { $num } riadky
+       *[other] { $num } riadkov
+    }
+newtab-custom-sponsored-sites = Sponzorované skratky
+newtab-custom-pocket-title = Odporú�ané službou { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Výnimo�ný obsah vybraný službou { -pocket-brand-name }, ktorá je sú�asťou { -brand-product-name(case: "gen") }
+newtab-custom-pocket-sponsored = Sponzorované príbehy
+newtab-custom-recent-title = Nedávna aktivita
+newtab-custom-recent-subtitle = Výber z nedávno navštívených stránok a obsahu
+newtab-custom-close-button = Zavrieť
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Úryvky
+newtab-custom-snippets-subtitle = Tipy a novinky od spolo�nosti { -vendor-short-name } a aplikácie { -brand-product-name }
+newtab-custom-settings = Ďalšie nastavenia
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/places.ftl firefox-85.0+build1/l10n/sk/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/places.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/places.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podprie�inok
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Ostatné záložky
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/sk/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/preferences/preferences.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -503,6 +503,11 @@
 home-prefs-topsites-description = Najnavštevovanejšie stránky
 home-prefs-topsites-by-option-sponsored =
     .label = Sponzorované top stránky
+home-prefs-shortcuts-header =
+    .label = Skratky
+home-prefs-shortcuts-description = Stránky, ktoré si uložíte alebo navštívite
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponzorované skratky
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -510,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Odporú�a { $provider }
 home-prefs-recommended-by-description-update = Výnimo�ný obsah z celého internetu, vybraný službou { $provider }
+home-prefs-recommended-by-description-new = Výnimo�ný obsah vybraný službou { $provider }, ktorá je sú�asťou { -brand-product-name(case: "gen") }
 
 ##
 
@@ -518,8 +524,6 @@
     .label = Sponzorované stránky
 home-prefs-highlights-header =
     .label = Vybrané stránky
-home-prefs-recent-activity-header =
-    .label = Posledná aktivita
 home-prefs-highlights-description = Výber stránok, ktoré ste si uložili alebo ste ich navštívili
 home-prefs-highlights-option-visited-pages =
     .label = Navštívené stránky
@@ -529,6 +533,9 @@
     .label = Nedávne prevzatia
 home-prefs-highlights-option-saved-to-pocket =
     .label = Stránky uložené do služby { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Posledná aktivita
+home-prefs-recent-activity-description = Výber z nedávno navštívených stránok a obsahu
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Snippety
 home-prefs-snippets-description = Informácie od spolo�nosti { -vendor-short-name } a aplikácie { -brand-product-name }
+home-prefs-snippets-description-new = Tipy a novinky od spolo�nosti { -vendor-short-name } a aplikácie { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = otvorené karty
     .accesskey = e
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Skratky
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = Top stránky
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Vyhľadávacie moduly
+    .accesskey = V
 addressbar-suggestions-settings = Zmeniť nastavenia pre návrhy vyhľadávania
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/sk/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -62,6 +62,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Iba na novej karte
     .accesskey = o
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vždy zobrazovať
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nikdy nezobrazovať
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Zobrazovať iba na novej karte
+    .accesskey = Z
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Zobraziť ostatné záložky
     .accesskey = r
diff -Nru firefox-84.0.2+build1/l10n/sk/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/sk/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/sk/browser/browser/webrtcIndicator.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/browser/browser/webrtcIndicator.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -29,3 +29,12 @@
     .title = Zapnúť kameru
 webrtc-minimize =
     .title = Minimalizovať ukazovateľ
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = Zdieľate svoju kameru. Pre úpravu zdieľania kliknite sem.
+webrtc-microphone-system-menu =
+    .label = Zdieľate svoj mikrofón. Pre úpravu zdieľania kliknite sem.
+webrtc-screen-system-menu =
+    .label = Zdieľate svoje okno alebo obrazovku. Pre úpravu zdieľania kliknite sem.
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/chrome/global/textcontext.dtd firefox-85.0+build1/l10n/sk/toolkit/chrome/global/textcontext.dtd
--- firefox-84.0.2+build1/l10n/sk/toolkit/chrome/global/textcontext.dtd	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/chrome/global/textcontext.dtd	2021-01-18 20:08:15.000000000 +0000
@@ -17,7 +17,7 @@
 <!ENTITY fillLoginMenu.label          "Doplniť prihlasovacie údaje">
 <!ENTITY fillLoginMenu.accesskey      "V">
 <!ENTITY fillPasswordMenu.label       "Doplniť heslo">
-<!ENTITY fillPasswordMenu.accesskey   "V">
+<!ENTITY fillPasswordMenu.accesskey   "D">
 <!ENTITY fillUsernameMenu.label       "Doplniť používateľské meno">
 <!ENTITY fillUsernameMenu.accesskey   "V">
 <!ENTITY noLoginSuggestions.label     "(žiadne návrhy prihlasovacích údajov)">
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/sk/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/sk/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:15.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d
 
 downloadErrorAlertTitle=Chyba pri preberaní
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Súbor nemohol byť uložený, pretože je blokovaný rozšírením %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Súbor nemohol byť uložený, pretože je blokovaný rozšírením.
 downloadErrorGeneric=Súbor nemohol byť uložený, pretože sa objavila neznáma chyba.\n\nProsím, skúste to znova.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/sk/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/sk/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:08:15.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Server proxy odmietol pripojenie
 check_error-2153390069=Platnosť certifikátu servera uplynula (skontrolujte správnosť nastavenia systémového �asu alebo kontaktujte správcu systému)
 check_error-verification_failed=Nepodarilo sa overiť neporušenosť aktualizácie
+check_error-move_failed=Nepodarilo sa pripraviť inštaláciu aktualizácie
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/chrome/passwordmgr/passwordmgr.properties firefox-85.0+build1/l10n/sk/toolkit/chrome/passwordmgr/passwordmgr.properties
--- firefox-84.0.2+build1/l10n/sk/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-18 20:08:15.000000000 +0000
@@ -48,7 +48,7 @@
 
 # LOCALIZATION NOTE (useASecurelyGeneratedPassword):
 # Shown in the autocomplete popup to allow filling a generated password into a password field.
-useASecurelyGeneratedPassword=Používať bezpe�ne vygenerované heslo
+useASecurelyGeneratedPassword=Použiť bezpe�ne vygenerované heslo
 # LOCALIZATION NOTE (generatedPasswordWillBeSaved):
 # %S will contain the brandShorterName. This informs the user that the generated password will be automatically saved.
 generatedPasswordWillBeSaved=%S si toto heslo pre túto stránku uloží.
@@ -59,7 +59,6 @@
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=Žiadne používateľské meno
-
 # LOCALIZATION NOTE (displaySameOrigin):
 # String is used on the autocomplete row when the login origin is a domain match with the document origin
 displaySameOrigin=Z tejto stránky
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutGlean.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutGlean.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutGlean.ftl	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutGlean.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -2,5 +2,13 @@
 # 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/.
 
+
 ### "Glean" and "Glean SDK" should remain in English.
 
+about-glean-page-title = ÄŒo je Glean
+about-glean-description = <a data-l10n-name="glean-sdk-doc-link">Glean SDK</a> je knižnica na zhromaž�ovanie údajov používaná v produktoch Mozilla. Táto stránka je ur�ená pre vývojárov a testerov, ktorí potrebujú <a data-l10n-name="fog-debug-doc-link">konfigurovať podmienky ladenia a úroveň záznamu údajov pre Glean SDK</a>.
+about-glean-warning = Nesprávne použitie tohto rozhrania môže viesť k zlyhaniu aplikácie { -brand-short-name }.
+tag-pings-label = Ozna�iť touto zna�kou všetky odoslané pingy
+log-pings-label = Pred odoslaním zaznamenať zaťaženie pingu?
+send-pings-label = Odoslať pomenovaný ping
+controls-button-label = Odoslať nastavenia
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -2,11 +2,18 @@
 # 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/.
 
+# Page title
+about-processes-title = Správca procesov
+# The Actions column
+about-processes-column-action =
+    .title = Akcie
 
 ## Tooltips
 
+about-processes-shutdown-process =
+    .title = Zavrieť karty a zrušiť proces
 about-processes-shutdown-tab =
-    .title = Zatvoriť kartu
+    .title = Zavrieť kartu
 
 ## Column headers
 
@@ -20,9 +27,58 @@
 ##    $origin (String) The domain name for this process.
 ##    $type (String) The raw type for this process. Used for unknown processes.
 
+about-processes-browser-process-name = { -brand-short-name } (proces { $pid })
+about-processes-web-process-name = Webová stránka (proces { $pid }, zdieľaný)
+about-processes-web-isolated-process-name = Webová stránka (proces { $pid }) z { $origin }
+about-processes-web-large-allocation = Webová stránka (proces { $pid }, veľký) z { $origin }
+about-processes-with-coop-coep-process-name = Webová stránka (process { $pid }, izolovaný kvôli cross-origin) z { $origin }
+about-processes-file-process-name = Súbory (proces { $pid })
+about-processes-extension-process-name = Rozšírenia (proces { $pid })
+about-processes-privilegedabout-process-name = ÄŒo je (proces { $pid })
+about-processes-plugin-process-name = Zásuvné moduly (proces { $pid })
+about-processes-privilegedmozilla-process-name = Webová stránka (process { $pid }) pre stránky { -vendor-short-name }
+about-processes-gmp-plugin-process-name = Zásuvné moduly Gecko Media (proces { $pid })
+about-processes-gpu-process-name = Grafický procesor (proces { $pid })
+about-processes-vr-process-name = VR (proces { $pid })
+about-processes-rdd-process-name = Dekodér údajov (proces { $pid })
+about-processes-socket-process-name = Sieť (proces { $pid })
+about-processes-remote-sandbox-broker-process-name = Broker vzdialeného sandboxu (proces { $pid })
+about-processes-fork-server-process-name = Fork Server (proces { $pid })
+about-processes-preallocated-process-name = Vopred pridelený (proces { $pid })
+about-processes-unknown-process-name = Iný ({ $type }, proces { $pid })
+# Process
+# Variables:
+#   $name (String) The name assigned to the process.
+#   $pid (String) The process id of this process, assigned by the OS.
+about-processes-process-name = Proces { $pid }: { $name }
 
 ## Details within processes
 
+# Single-line summary of threads
+# Variables:
+#    $number (Number) The number of threads in the process. Typically larger
+#                     than 30. We don't expect to ever have processes with less
+#                     than 5 threads.
+about-processes-thread-summary = Vlákien: ({ $number })
+# Thread details
+# Variables:
+#   $name (String) The name assigned to the thread.
+#   $tid (String) The thread id of this thread, assigned by the OS.
+about-processes-thread-name = Vlákno { $tid }: { $name }
+# Tab
+# Variables:
+#   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
+about-processes-tab-name = Karta: { $name }
+about-processes-preloaded-tab = Predna�ítaná Nová karta
+# Single subframe
+# Variables:
+#   $url (String) The full url of this subframe.
+about-processes-frame-name-one = Podrámec: { $url }
+# Group of subframes
+# Variables:
+#   $number (Number) The number of subframes in this group. Always ≥ 1.
+#   $shortUrl (String) The shared prefix for the subframes in the group.
+about-processes-frame-name-many = Podrámce ({ $number }): { $shortUrl }
 
 ## Displaying CPU (percentage and total)
 ## Variables:
@@ -33,6 +89,12 @@
 ##    $unit (String) The unit in which to display $total. See the definitions
 ##                   of `duration-unit-*`.
 
+# Common case.
+about-processes-cpu-user-and-kernel = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) } { $unit })
+# Special case: data is not available yet.
+about-processes-cpu-user-and-kernel-not-ready = (prebieha meranie)
+# Special case: process or thread is currently idle.
+about-processes-cpu-user-and-kernel-idle = ne�inný ({ NUMBER($total, maximumFractionDigits: 2) } { $unit })
 
 ## Displaying Memory (total and delta)
 ## Variables:
@@ -45,6 +107,10 @@
 ##    $deltaUnit (String) The unit in which to display $delta. See the definitions
 ##                        of `memory-unit-*`.
 
+# Common case.
+about-processes-total-memory-size = { NUMBER($total, maximumFractionDigits: 0) } { $totalUnit } ({ $deltaSign }{ NUMBER($delta, maximumFractionDigits: 0) } { $deltaUnit })
+# Special case: no change.
+about-processes-total-memory-size-no-change = { NUMBER($total, maximumFractionDigits: 0) } { $totalUnit }
 
 ## Duration units
 
@@ -59,7 +125,7 @@
 ## Memory units
 
 memory-unit-B = B
-memory-unit-KB = KB
+memory-unit-KB = kB
 memory-unit-MB = MB
 memory-unit-GB = GB
 memory-unit-TB = TB
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -7,7 +7,6 @@
     Táto stránka obsahuje technické informácie, ktoré môžu byť užito�né pri riešení
     problémov s touto aplikáciou. Ak hľadáte odpovede na bežné otázky
     o programe { -brand-short-name }, navštívte <a data-l10n-name="support-link">stránku podpory</a>.
-
 crashes-title = Správy o zlyhaní
 crashes-id = Identifikátor správy
 crashes-send-date = Dátum odoslania
@@ -127,7 +126,6 @@
 sandbox-sys-call-args = Argumenty
 safe-mode-title = Vyskúšajte núdzový režim
 restart-in-safe-mode-label = Reštartovať a zakázať doplnky…
-
 restart-button-label = Reštartovať
 
 ## Media titles
@@ -178,6 +176,12 @@
 
 ##
 
+support-third-party-modules-title = Moduly tretích strán
+support-third-party-modules-no-value = (Žiadna hodnota)
+support-third-party-modules-button-open =
+    .title = Otvoriť umiestnenie súboru…
+support-third-party-modules-folder-icon =
+    .title = Otvoriť umiestnenie súboru…
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -186,7 +190,6 @@
         [few] Správy o zlyhaní za posledné { $days } dni
        *[other] Správy o zlyhaní za posledných { $days } dní
     }
-
 # Variables
 # $minutes (integer) - Number of minutes since crash
 crashes-time-minutes =
@@ -195,7 +198,6 @@
         [few] pred { $minutes } minútami
        *[other] pred { $minutes } minútami
     }
-
 # Variables
 # $hours (integer) - Number of hours since crash
 crashes-time-hours =
@@ -204,7 +206,6 @@
         [few] pred { $hours } hodinami
        *[other] pred { $hours } hodinami
     }
-
 # Variables
 # $days (integer) - Number of days since crash
 crashes-time-days =
@@ -213,7 +214,6 @@
         [few] pred { $days } dňami
        *[other] pred { $days } dňami
     }
-
 # Variables
 # $reports (integer) - Number of pending reports
 pending-reports =
@@ -222,7 +222,6 @@
         [few] Všetky správy o zlyhaní (vrátane { $reports } �akajúcich správ za dané obdobie)
        *[other] Všetky správy o zlyhaní (vrátane { $reports } �akajúcich správ za dané obdobie)
     }
-
 raw-data-copied = Údaje boli skopírované do schránky
 text-copied = Text bol skopírovaný do schránky
 
@@ -235,11 +234,9 @@
 # Variables
 # $driverVersion - The graphics driver version string
 try-newer-driver = Blokované kvôli verzii ovláda�a grafickej karty. Skúste ovláda� aktualizovať na verziu { $driverVersion } alebo novšiu.
-
 # "ClearType" is a proper noun and should not be translated. Feel free to leave English strings if
 # there are no good translations, these are only used in about:support
 clear-type-parameters = Technológia ClearType
-
 compositing = Skladanie
 hardware-h264 = Hardvérové dekódovanie H264
 main-thread-no-omtc = hlavné vlákno, bez OMTC
@@ -254,7 +251,6 @@
 
 found = Nájdený
 missing = Chýba
-
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = Popis
@@ -278,21 +274,17 @@
 webgl2-driver-extensions = Rozšírenia ovláda�a WebGL 2
 webgl2-extensions = Rozšírenia WebGL 2
 blocklisted-bug = Zablokované kvôli známej chybe
-
 # Variables
 # $bugNumber (string) - String of bug number from Bugzilla
 bug-link = bug { $bugNumber }
-
 # Variables
 # $failureCode (string) - String that can be searched in the source tree.
 unknown-failure = Zablokované; chybový kód { $failureCode }
-
 d3d11layers-crash-guard = D3D11 Compositor
 d3d11video-crash-guard = D3D11 Video dekodér
 d3d9video-crash-guard = D3D9 Video dekodér
 glcontext-crash-guard = OpenGL
 wmfvpxvideo-crash-guard = WMF VPX video dekodér
-
 reset-on-next-restart = Obnoviť pri nasledujúcom reštarte
 gpu-process-kill-button = Ukon�iť GPU proces
 gpu-device-reset = Obnova zariadenia
@@ -302,10 +294,8 @@
 off-main-thread-paint-enabled = Vykresľovanie mimo hlavného vlákna povolené
 off-main-thread-paint-worker-count = Po�et vlákien pre vykresľovanie mimo hlavného vlákna
 target-frame-rate = Cieľová obrazová frekvencia
-
 min-lib-versions = O�akávaná minimálna verzia
 loaded-lib-versions = Používaná verzia
-
 has-seccomp-bpf = Seccomp-BPF (filtrovanie systémových volaní)
 has-seccomp-tsync = Synchronizácia vlákien Seccomp
 has-user-namespaces = Priestory názvov používateľa
@@ -318,12 +308,10 @@
 sandbox-proc-type-file = obsah súboru
 sandbox-proc-type-media-plugin = zásuvný modul médií
 sandbox-proc-type-data-decoder = dekóder údajov
-
 launcher-process-status-0 = Povolený
 launcher-process-status-1 = Zakázaný kvôli chybe
 launcher-process-status-2 = Vynútene zakázaný
 launcher-process-status-unknown = Neznámy stav
-
 # Variables
 # $remoteWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
@@ -336,7 +324,6 @@
 multi-process-status-7 = Zakázané doplnkami
 multi-process-status-8 = Vynútene zakázané
 multi-process-status-unknown = Neznámy stav
-
 async-pan-zoom = Asynchrónna lupa/panning
 apz-none = žiadna
 wheel-enabled = vstup kolieskom povolený
@@ -356,3 +343,12 @@
 policies-inactive = Neaktívne
 policies-active = Aktívne
 policies-error = Chyba
+
+## Printing section
+
+support-printing-title = Tla�
+support-printing-troubleshoot = Riešenie problémov
+support-printing-clear-settings-button = Vymazať uložené nastavenia tla�e
+support-printing-modified-settings = Upravené nastavenia tla�e
+support-printing-prefs-name = Názov
+support-printing-prefs-value = Hodnota
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/global/profileDowngrade.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/global/profileDowngrade.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/global/profileDowngrade.ftl	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/global/profileDowngrade.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -3,15 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 profiledowngrade-window =
-    .title = Spustili ste staršiu verziu { -brand-product-name }u
+    .title = Spustili ste staršiu verziu aplikácie { -brand-product-name }
     .style = width: 490px;
-
 profiledowngrade-window-create =
     .label = Vytvoriť nový profil
-
-profiledowngrade-sync = Používaním staršej verzie { -brand-product-name }u môžete poškodiť záložky a históriu prehliadania, ktoré sú uložené vo vašom existujúcom profile. Aby ste svoje údaje ochránili, vytvorte si nový profil pre túto verziu aplikácie { -brand-short-name }. Pomocou ú�tu { -brand-product-name } sa vždy môžete prihlásiť a zosynchronizovať svoje záložky a históriu prehliadania s ostatnými profilmi.
+profiledowngrade-sync = Používaním staršej verzie prehliada�a { -brand-product-name } môžete poškodiť záložky a históriu prehliadania, ktoré sú uložené vo vašom existujúcom profile. Aby ste svoje údaje ochránili, vytvorte si nový profil pre túto verziu prehliada�a { -brand-short-name }. Následne sa môžete prihlásiť pomocou ú�tu { -fxaccount-brand-name } a zosynchronizovať svoje záložky a históriu prehliadania s ostatnými profilmi.
 profiledowngrade-nosync = Používaním staršej verzie { -brand-product-name }u môžete poškodiť záložky a históriu prehliadania, ktoré sú uložené vo vašom existujúcom profile. Aby ste svoje údaje ochránili, vytvorte si nový profil pre túto verziu aplikácie { -brand-short-name }.
-
 profiledowngrade-quit =
     .label =
         { PLATFORM() ->
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:56:11.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Strana:
     .accesskey = S
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } z { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Posledná stránka
-
+printpreview-homearrow-button =
+    .title = Prvá stránka
+printpreview-previousarrow-button =
+    .title = Predchádzajúca stránka
+printpreview-nextarrow-button =
+    .title = Ďalšia stránka
+printpreview-endarrow-button =
+    .title = Posledná stránka
diff -Nru firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/sk/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/sk/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:56:12.000000000 +0000
+++ firefox-85.0+build1/l10n/sk/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:15.000000000 +0000
@@ -26,11 +26,16 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Zadajte vlastný rozsah strán
+    .placeholder = napr. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kópie
 printui-orientation = Orientácia
 printui-landscape = Na šírku
 printui-portrait = Na výšku
+# Section title for the printer or destination device to target
+printui-destination-label = Zariadenie pre tla�
 printui-destination-pdf-label = Uložiť ako PDF
 printui-more-settings = Ďalšie nastavenia
 printui-less-settings = Menej nastavení
@@ -47,6 +52,7 @@
 printui-options = Možnosti
 printui-headers-footers-checkbox = Vytla�iť hlavi�ku a pätu
 printui-backgrounds-checkbox = Vytla�iť pozadie
+printui-selection-checkbox = Vytla�iť len výber
 printui-color-mode-label = Nastavenia farby
 printui-color-mode-color = Farebne
 printui-color-mode-bw = ÄŒiernobielo
@@ -55,15 +61,29 @@
 printui-margins-min = Minimálne
 printui-margins-none = Žiadne
 printui-margins-custom = Vlastné
+printui-margins-custom-inches = Vlastné (palce)
+printui-margins-custom-top = Hore
+printui-margins-custom-top-inches = Hore (palce)
+printui-margins-custom-bottom = Dole
+printui-margins-custom-bottom-inches = Dole (palce)
+printui-margins-custom-left = Vľavo
+printui-margins-custom-left-inches = Vľavo (palce)
+printui-margins-custom-right = Vpravo
+printui-margins-custom-right-inches = Vpravo (palce)
 printui-system-dialog-link = Vytla�iť pomocou systémového dialógu…
 printui-primary-button = Tla�iť
 printui-primary-button-save = Uložiť
 printui-cancel-button = Zrušiť
+printui-close-button = Zavrieť
 printui-loading = Pripravuje sa ukážka pred tla�ou
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Ukážka pred tla�ou
+printui-pages-per-sheet = Stránok na list papiera
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Prebieha tla�…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
@@ -77,7 +97,15 @@
 printui-paper-b4 = B4
 printui-paper-jis-b5 = JIS-B5
 printui-paper-jis-b4 = JIS-B4
+printui-paper-letter = US Letter
+printui-paper-legal = US Legal
+printui-paper-tabloid = Tabloid
 
 ## Error messages shown when a user has an invalid input
 
 printui-error-invalid-scale = Mierka musí byť �íslo medzi 10 a 200.
+printui-error-invalid-margin = Zadajte platné okraje pre vybranú veľkosť papiera.
+# Variables
+# $numPages (integer) - Number of pages
+printui-error-invalid-range = Rozsah strán musí byť �íslo medzi 1 a { $numPages }.
+printui-error-invalid-start-overflow = Číslo strany „od“ musí byť menšie ako �íslo strany „do“.
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/sl/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/aboutLogins.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/aboutLogins.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -171,7 +171,14 @@
 about-logins-confirm-remove-dialog-title = Odstranim to prijavo?
 confirm-delete-dialog-message = Tega dejanja ni mogo�e razveljaviti.
 about-logins-confirm-remove-dialog-confirm-button = Odstrani
-about-logins-confirm-remove-all-dialog-confirm-button = Odstrani vse
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Odstrani
+        [one] Odstrani
+        [two] Odstrani obe
+        [few] Odstrani vse
+       *[other] Odstrani vse
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Da, odstrani to prijavo
@@ -180,9 +187,33 @@
         [few] Da, odstrani te prijave
        *[other] Da, odstrani te prijave
     }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] Odstranim { $count } prijavo?
+        [two] Odstranim { $count } prijavi?
+        [few] Odstranim { $count } prijave?
+       *[other] Odstranim { $count } prijav?
+    }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] S tem boste odstranili prijavo, ki ste jo shranili v { -brand-short-name }, in vsa morebitna prikazana opozorila o krajah. Dejanja ne boste mogli razveljaviti.
+        [one] S tem boste odstranili prijavo, ki ste jo shranili v { -brand-short-name }, in vsa morebitna prikazana opozorila o krajah. Dejanja ne boste mogli razveljaviti.
+        [two] S tem boste odstranili prijavi, ki ste ju shranili v { -brand-short-name }, in vsa morebitna prikazana opozorila o krajah. Dejanja ne boste mogli razveljaviti.
+        [few] S tem boste odstranili prijave, ki ste jih shranili v { -brand-short-name }, in vsa morebitna prikazana opozorila o krajah. Dejanja ne boste mogli razveljaviti.
+       *[other] S tem boste odstranili prijave, ki ste jih shranili v { -brand-short-name }, in vsa morebitna prikazana opozorila o krajah. Dejanja ne boste mogli razveljaviti.
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] Odstrani { $count } prijavo z vseh naprav?
+        [two] Odstrani { $count } prijavi z vseh naprav?
+        [few] Odstrani { $count } prijave z vseh naprav?
+       *[other] Odstrani { $count } prijav z vseh naprav?
+    }
 about-logins-confirm-export-dialog-title = Izvozite prijave in gesla
 about-logins-confirm-export-dialog-message = Vaša gesla bodo shranjena kot berljivo besedilo (npr. Sl@boG3slo), zato bodo vidna vsakomur, ki bo lahko odprl izvoženo datoteko.
 about-logins-confirm-export-dialog-confirm-button = Izvozi …
+about-logins-alert-import-title = Uvoz dokon�an
+about-logins-alert-import-message = Prikaži podroben povzetek uvoza
 confirm-discard-changes-dialog-title = Zavržem neshranjene spremembe?
 confirm-discard-changes-dialog-message = Vse neshranjene spremembe bodo izgubljene.
 confirm-discard-changes-dialog-confirm-button = Prezri
@@ -244,3 +275,10 @@
         [macos] Dokument CSV
        *[other] Datoteka CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Uvoz dokon�an
+about-logins-import-dialog-done = Kon�ano
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/sl/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/appmenu.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/appmenu.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Novo okno
+appmenuitem-new-private-window =
+    .label = Novo zasebno okno
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Pove�aj
 appmenuitem-zoom-reduce =
     .label = Pomanjšaj
+appmenuitem-fullscreen =
+    .label = Celoten zaslon
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinhroniziraj
+appmenuitem-save-page =
+    .label = Shrani stran kot …
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Novosti
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/sl/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/appMenuNotifications.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Ne zdaj
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Po hitrem ponovnem zagonu bo { -brand-shorter-name } obnovil vse vaše odprte zavihke in okna, razen tistih v zasebnem brskanju.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name }a ni mogo�e samodejno posodobiti na najnovejšo razli�ico.
+    .buttonlabel = Vseeno posodobi { -brand-shorter-name }
+    .buttonaccesskey = V
+    .secondarybuttonlabel = Ne zdaj
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = Na voljo je nova posodobitev za { -brand-shorter-name }, vendar je ni mogo�e namestiti, ker se izvaja drug izvod { -brand-shorter-name }a. Za nadaljevanje posodobitve ga zaprite, lahko pa jo vseeno namestite, pri �emer drugi izvod morda ne bo deloval pravilno, dokler ga ne zaženete znova.
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Razumem
     .buttonaccesskey = z
@@ -39,7 +46,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = Dovoli, da se ta razširitev izvaja v zasebnih oknih
     .accesskey = D
-    
 appmenu-new-tab-controlled =
     .label = Stran novega zavihka se je spremenila.
     .buttonlabel = Ohrani spremembe
@@ -52,6 +58,18 @@
     .buttonaccesskey = h
     .secondarybuttonlabel = Onemogo�i razširitev
     .secondarybuttonaccesskey = n
+appmenu-new-tab-controlled-changes =
+    .label = Stran novega zavihka se je spremenila.
+    .buttonlabel = Obdrži spremembe
+    .buttonaccesskey = O
+    .secondarybuttonlabel = Nastavitve novega zavihka
+    .secondarybuttonaccesskey = N
+appmenu-homepage-controlled-changes =
+    .label = Doma�a stran se je spremenila.
+    .buttonlabel = Obdrži spremembe
+    .buttonaccesskey = O
+    .secondarybuttonlabel = Nastavitve doma�e strani
+    .secondarybuttonaccesskey = N
 appmenu-tab-hide-controlled =
     .label = Dostopajte do skritih zavihkov
     .buttonlabel = Ohrani zavihke skrite
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/browser.ftl firefox-85.0+build1/l10n/sl/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/browser.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/browser.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -497,3 +497,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ima nadzor nad vašim kazalcem. Pritisnite Esc za ponovni prevzem nadzora.
 pointerlock-warning-no-domain = Ta dokument ima nadzor nad vašim kazalcem. Pritisnite Esc za ponovni prevzem nadzora.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Prikaži vse zaznamke
+bookmarks-recent-bookmarks =
+    .value = Nedavni zaznamki
+bookmarks-toolbar-chevron =
+    .tooltiptext = Prikaži ve� zaznamkov
+bookmarks-sidebar-content =
+    .aria-label = Zaznamki
+bookmarks-menu-button =
+    .label = Meni zaznamkov
+bookmarks-other-bookmarks-menu =
+    .label = Drugi zaznamki
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobilni zaznamki
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skrij stransko vrstico zaznamkov
+           *[other] Prikaži stransko vrstico zaznamkov
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Skrij orodno vrstico zaznamkov
+           *[other] Prikaži orodno vrstico zaznamkov
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Odstrani meni zaznamkov iz orodne vrstice
+           *[other] Dodaj meni zaznamkov v orodno vrstico
+        }
+bookmarks-search =
+    .label = Iskanje po zaznamkih
+bookmarks-tools =
+    .label = Orodja zaznamkov
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Vrstica zaznamkov
+    .accesskey = Z
+    .aria-label = Zaznamki
+bookmarks-toolbar-menu =
+    .label = Vrstica zaznamkov
+bookmarks-toolbar-placeholder =
+    .title = Predmeti orodne vrstice z zaznamki
+bookmarks-toolbar-placeholder-button =
+    .label = Predmeti orodne vrstice z zaznamki
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Zaznamki
+library-bookmarks-bookmark-this-page =
+    .label = Dodaj stran med zaznamke
+library-bookmarks-bookmark-edit =
+    .label = Uredi ta zaznamek
+
+## More items
+
+more-menu-go-offline =
+    .label = Nepovezan na�in
+    .accesskey = e
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/migration.ftl firefox-85.0+build1/l10n/sl/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/migration.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/migration.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = ÄŒarovnik za uvoz
-
 import-from =
     { PLATFORM() ->
         [windows] Uvozi možnosti, zaznamke, zgodovino, gesla in ostale podatke iz:
        *[other] Uvozi nastavitve, zaznamke, zgodovino, gesla in ostale podatke iz:
     }
-
 import-from-bookmarks = Uvozi zaznamke iz:
 import-from-ie =
     .label = Microsoft Internet Explorerja
@@ -51,34 +49,24 @@
 import-from-360se =
     .label = 360 Secure Browser
     .accesskey = 3
-
 no-migration-sources = Ni bilo mogo�e najti nobenega programa z zaznamki, zgodovino ali gesli za uvoz.
-
 import-source-page-title = Uvoz nastavitev in podatkov
 import-items-page-title = Možnosti uvoza
-
 import-items-description = Izberite, kaj želite uvoziti:
-
+# Do not translate "Bookmarks.plist"; the file name is the same everywhere.
+import-permissions-description = macOS zahteva, da { -brand-short-name }u izrecno dovolite odstop do Safarijevih zaznamkov. Kliknite "Continue" in na ploš�i "File Open", ki se pojavi, izberite datoteko "Bookmarks.plist".
 import-migrating-page-title = Uvoz ...
-
 import-migrating-description = Trenutno se uvaža ...
-
 import-select-profile-page-title = Izbira profila
-
 import-select-profile-description = Uvoz je možen iz naslednjih profilov:
-
 import-done-page-title = Konec uvoza
-
 import-done-description = Uspešno je bilo uvoženo naslednje:
-
 import-close-source-browser = Pred nadaljevanjem se prepri�ajte, da je izbrani brskalnik zaprt.
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = Od { $source }
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
 source-name-edge-beta = Microsoft Edge Beta
@@ -90,7 +78,6 @@
 source-name-chromium = Chromium
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 Secure Browser
-
 imported-safari-reading-list = Bralni seznam (iz Safarija)
 imported-edge-reading-list = Bralni seznam (iz Edgea)
 
@@ -103,19 +90,6 @@
 ## chrome
 ## edge
 ## firefox
-## safari
-## The various beta and development versions of edge and chrome all get
-## normalized to just "edge" and "chrome" for these strings.
-
-## Browser data types
-## All of these strings get a $browser variable passed in.
-## You can use the browser variable to differentiate the name of items,
-## which may have different labels in different browsers.
-## The supported values for the $browser variable are:
-## 360se
-## chrome
-## edge
-## firefox
 ## ie
 ## safari
 ## The various beta and development versions of edge and chrome all get
@@ -125,7 +99,6 @@
     .label = Piškotke
 browser-data-cookies-label =
     .value = Piškotke
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -138,12 +111,10 @@
             [firefox] Zgodovino brskanja in zaznamke
            *[other] Zgodovino brskanja
         }
-
 browser-data-formdata-checkbox =
     .label = Shranjene obrazce
 browser-data-formdata-label =
     .value = Shranjene obrazce
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -152,7 +123,6 @@
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-label =
     .value = Shranjene prijave in gesla
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -167,12 +137,10 @@
             [edge] Priljubljene
            *[other] Zaznamke
         }
-
 browser-data-otherdata-checkbox =
     .label = Druge podatke
 browser-data-otherdata-label =
     .label = Druge podatke
-
 browser-data-session-checkbox =
     .label = Okna in zavihki
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/sl/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/newtab/asrouter.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/newtab/asrouter.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -132,6 +132,9 @@
 
 cfr-whatsnew-searchbar-title = Pišite manj, najdite ve� z naslovno vrstico
 cfr-whatsnew-searchbar-body-topsites = Izberite naslovno vrstico in polje se bo razširilo s povezavami do vaših najljubših strani.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Ikona pove�evalnega stekla
 
 ## Picture-in-Picture
@@ -268,6 +271,7 @@
 
 ## Fission Experiment Message
 
+cfr-doorhanger-fission-body-approved = Vaša zasebnost je pomembna. { -brand-short-name } zdaj medsebojno izolira spletna mesta ali jih izvaja v peskovnikih, kar napadalcem otežuje krajo gesel, številk kreditnih kartic in ostalih ob�utljivih podatkov.
 cfr-doorhanger-fission-primary-button = V redu, razumem
     .accesskey = V
 cfr-doorhanger-fission-secondary-button = Ve� o tem
@@ -283,3 +287,6 @@
 
 cfr-whatsnew-media-keys-header = Ve� kontrolnikov predstavnosti
 cfr-whatsnew-media-keys-button = Poglejte, kako
+
+## What's new: Search shortcuts
+
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/sl/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/newtab/newtab.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -170,6 +170,7 @@
 
 newtab-section-header-topsites = Glavne strani
 newtab-section-header-highlights = Poudarki
+newtab-section-header-recent-activity = Nedavna dejavnost
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Priporo�a { $provider }
@@ -205,3 +206,23 @@
 
 newtab-error-fallback-info = Ojoj, pri nalaganju te vsebine je Å¡lo nekaj narobe.
 newtab-error-fallback-refresh-link = Osvežite stran za ponoven poskus.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Bližnjice
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } vrstica
+        [two] { $num } vrstici
+        [few] { $num } vrstice
+       *[other] { $num } vrstic
+    }
+newtab-custom-pocket-title = Priporo�a { -pocket-brand-name }
+newtab-custom-pocket-sponsored = Zgodbe oglaševalcev
+newtab-custom-recent-title = Nedavna dejavnost
+newtab-custom-close-button = Zapri
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Izrezki
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/places.ftl firefox-85.0+build1/l10n/sl/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/places.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/places.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -63,3 +63,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Podmapa
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Drugi zaznamki
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/sl/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/preferences/preferences.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -52,6 +52,9 @@
 pane-experimental-subtitle = Nadaljujte previdno
 pane-experimental-search-results-header = { -brand-short-name }ovi poskusi: nadaljujte previdno
 pane-experimental-description = Spreminjanje naprednih nastavitev lahko vpliva na delovanje ali varnost { -brand-short-name }a.
+pane-experimental-reset =
+    .label = Ponastavi privzeto
+    .accesskey = P
 help-button-label = Podpora za { -brand-short-name }
 addons-button-label = Razširitve in teme
 focus-search =
@@ -501,6 +504,8 @@
 home-prefs-topsites-header =
     .label = Glavne strani
 home-prefs-topsites-description = Strani, ki jih najve�krat obiš�ete
+home-prefs-shortcuts-header =
+    .label = Bližnjice
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -525,6 +530,8 @@
     .label = Najnovejši prenos
 home-prefs-highlights-option-saved-to-pocket =
     .label = Strani, shranjene v { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Nedavna dejavnost
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/sl/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/sl/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -63,3 +63,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Samo na novih zavihkih
     .accesskey = S
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Vedno prikaži
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Nikoli ne prikazuj
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Prikaži samo v novem zavihku
+    .accesskey = s
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Prikaži druge zaznamke
+    .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/sl/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/sl/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/sl/browser/chrome/browser/browser.properties	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/browser/chrome/browser/browser.properties	2021-01-18 20:08:21.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=O
 getUserMedia.pickWindowOrScreen.label = Izberi okno ali zaslon
 getUserMedia.shareEntireScreen.label = Celoten zaslon
+getUserMedia.sharePipeWirePortal.label = Uporabi nastavitve operacijskega sistema
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/sl/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/sl/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/sl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:21.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d;d;d
 
 downloadErrorAlertTitle=Napaka pri prenosu
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Shranjevanje tega prenosa je prepre�ila razširitev %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Ena od razširitev je prepre�ila shranjevanje tega prenosa.
 downloadErrorGeneric=Prenosa ni mogo�e shraniti, ker je prišlo do neznane napake.\n\nPoskusite znova.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=Å e nekaj sekund
 timeUnknown2=Preostali �as ni znan
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S vir
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/sl/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/sl/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -62,6 +62,9 @@
 app-basics-build-config = Nastavitev graditve
 app-basics-user-agent = Uporabniški agent
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Prevedeno z Rosetto
 app-basics-memory-use = Poraba pomnilnika
 app-basics-performance = U�inkovitost
 app-basics-service-workers = Registrirani Service Workerji
@@ -147,7 +150,7 @@
 media-input-devices-title = Vhodne naprave
 media-device-name = Ime
 media-device-group = Skupina
-media-device-vendor = Ponudnik
+media-device-vendor = Izdelovalec
 media-device-state = Stanje
 media-device-preferred = Prednostno
 media-device-format = Oblika
@@ -185,6 +188,28 @@
 
 ##
 
+support-third-party-modules-title = Moduli drugih ponudnikov
+support-third-party-modules-module = Datoteka modula
+support-third-party-modules-version = Razli�ica datoteke
+support-third-party-modules-vendor = Podatki o izdelovalcu
+support-third-party-modules-process = Vrsta in ID procesa
+support-third-party-modules-thread = Nit
+support-third-party-modules-empty = Ni naloženih modulov drugih ponudnikov.
+support-third-party-modules-no-value = (brez vrednosti)
+support-third-party-modules-button-open =
+    .title = Odpri mesto datoteke …
+support-third-party-modules-expand =
+    .title = Prikaži podrobne informacije
+support-third-party-modules-collapse =
+    .title = Skrij podrobne informacije
+support-third-party-modules-unsigned-icon =
+    .title = Ta modul ni podpisan
+support-third-party-modules-folder-icon =
+    .title = Odpri mesto datoteke …
+support-third-party-modules-down-icon =
+    .title = Prikaži podrobne informacije
+support-third-party-modules-up-icon =
+    .title = Skrij podrobne informacije
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -267,7 +292,7 @@
 gpu-subsys-id = ID podsistema
 gpu-drivers = Gonilniki
 gpu-ram = RAM
-gpu-driver-vendor = Ponudnik gonilnika
+gpu-driver-vendor = Izdelovalec gonilnika
 gpu-driver-version = Razli�ica gonilnika
 gpu-driver-date = Datum gonilnika
 gpu-active = Dejaven
@@ -344,6 +369,9 @@
 # $fissionWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
 fission-windows = { $fissionWindows }/{ $totalWindows }
+fission-status-experiment-control = Onemogo�eno zaradi poskusa
+fission-status-experiment-treatment = Omogo�eno zaradi poskusa
+fission-status-disabled-by-safe-mode = Onemogo�eno zaradi varnega na�ina
 fission-status-enabled-by-default = Privzeto omogo�eno
 fission-status-disabled-by-default = Privzeto onemogo�eno
 fission-status-enabled-by-user-pref = Omogo�il uporabnik
diff -Nru firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/sl/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Stran:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } od { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Zadnja stran
-
+printpreview-homearrow-button =
+    .title = Prva stran
+printpreview-previousarrow-button =
+    .title = Prejšnja stran
+printpreview-nextarrow-button =
+    .title = Naslednja stran
+printpreview-endarrow-button =
+    .title = Zadnja stran
diff -Nru firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/sl/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/sl/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:56:16.000000000 +0000
+++ firefox-85.0+build1/l10n/sl/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:21.000000000 +0000
@@ -27,6 +27,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = do
+printui-page-custom-range-input =
+    .aria-label = Vnesite obseg strani po meri
+    .placeholder = npr. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopije
 printui-orientation = Usmerjenost
@@ -50,6 +53,7 @@
 printui-options = Možnosti
 printui-headers-footers-checkbox = Natisni glave in noge
 printui-backgrounds-checkbox = Natisni ozadja
+printui-selection-checkbox = Natisni samo izbor
 printui-color-mode-label = Barvni na�in
 printui-color-mode-color = Barva
 printui-color-mode-bw = ÄŒrno-belo
@@ -58,19 +62,29 @@
 printui-margins-min = Najmanj
 printui-margins-none = Brez
 printui-margins-custom = Po meri
+printui-margins-custom-inches = Po meri (palci)
 printui-margins-custom-top = Zgoraj
+printui-margins-custom-top-inches = Vrh (palci)
 printui-margins-custom-bottom = Spodaj
+printui-margins-custom-bottom-inches = Dno (palci)
 printui-margins-custom-left = Levo
+printui-margins-custom-left-inches = Levo (palci)
 printui-margins-custom-right = Desno
+printui-margins-custom-right-inches = Desno (palci)
 printui-system-dialog-link = Natisni s pomo�jo pogovornega okna sistema …
 printui-primary-button = Natisni
 printui-primary-button-save = Shrani
 printui-cancel-button = Prekli�i
+printui-close-button = Zapri
 printui-loading = Priprava predogleda
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Predogled tiskanja
+printui-pages-per-sheet = Strani na list
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Tiskanje …
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/son/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/son/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/son/browser/browser/appmenu.ftl	2021-01-06 11:56:22.000000000 +0000
+++ firefox-85.0+build1/l10n/son/browser/browser/appmenu.ftl	2021-01-18 20:08:26.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Zanfun taaga
+appmenuitem-new-private-window =
+    .label = Sutura zanfun taaga
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Dijikul
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sync sohõ
+appmenuitem-save-page =
+    .label = Moɲoo gaabu sanda…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/son/browser/browser/browser.ftl firefox-85.0+build1/l10n/son/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/son/browser/browser/browser.ftl	2021-01-06 11:56:22.000000000 +0000
+++ firefox-85.0+build1/l10n/son/browser/browser/browser.ftl	2021-01-18 20:08:26.000000000 +0000
@@ -213,6 +213,9 @@
 browser-window-close-button =
     .tooltiptext = Daabu
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -278,3 +281,39 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ga war cebejiyoo juwal. Esc naagu ka juwaloo taa koyne.
 pointerlock-warning-no-domain = Takaddaa woo ga war cebejiyoo juwal. Esc naagu ka juwaloo taa koyne.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Doo-Å¡ilbawey kul cebe
+bookmarks-recent-bookmarks =
+    .value = Kokor doo-Å¡ilbantey
+bookmarks-toolbar-chevron =
+    .tooltiptext = Doo-Å¡ilbay tontoney cebe
+bookmarks-sidebar-content =
+    .aria-label = Doo-Å¡ilbawey
+bookmarks-other-bookmarks-menu =
+    .label = Doo-Å¡ilbay taaney
+bookmarks-mobile-bookmarks-menu =
+    .label = Doo-Å¡ilbay dirantey
+bookmarks-search =
+    .label = Doo-Å¡ilbawey ceeci
+bookmarks-toolbar-menu =
+    .label = Doo-šilbawey goyjinay žeeri
+bookmarks-toolbar-placeholder =
+    .title = Doo-šilbawey goyjinay žeeri hayiizey
+bookmarks-toolbar-placeholder-button =
+    .label = Doo-šilbawey goyjinay žeeri hayiizey
+
+## Library Panel items
+
+library-bookmarks-bookmark-this-page =
+    .label = Moɲoo woo šilbay
+library-bookmarks-bookmark-edit =
+    .label = Doo-Å¡ilbaa woo fasal
+
+## More items
+
+more-menu-go-offline =
+    .label = Goy bila nda cinari
+    .accesskey = G
diff -Nru firefox-84.0.2+build1/l10n/sq/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/sq/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/sq/browser/browser/appmenu.ftl	2021-01-06 11:56:26.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/browser/browser/appmenu.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Dritare e Re
+appmenuitem-new-private-window =
+    .label = Dritare e Re Private
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zmadhojeni
 appmenuitem-zoom-reduce =
     .label = Zvogëlojeni
+appmenuitem-fullscreen =
+    .label = Sa Krejt Ekrani
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Njëkohësohu Tani
+appmenuitem-save-page =
+    .label = Ruajeni Faqen Si…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/sq/browser/browser/browser.ftl firefox-85.0+build1/l10n/sq/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/sq/browser/browser/browser.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/browser/browser/browser.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -502,3 +502,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> është në kontroll të kursorit tuaj. Shtypni Esc që të rimerrni kontrollin.
 pointerlock-warning-no-domain = Kursori është nën kontrollin e kursorit tuaj. Shtypni Esc që të rimerrni kontrollin.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Shfaqni Krejt Faqerojtësit
+bookmarks-recent-bookmarks =
+    .value = Faqeruajtur Së Fundi
+bookmarks-toolbar-chevron =
+    .tooltiptext = Shfaqni më tepër faqerojtës
+bookmarks-sidebar-content =
+    .aria-label = Faqerojtës
+bookmarks-menu-button =
+    .label = Menu Faqerojtësish
+bookmarks-other-bookmarks-menu =
+    .label = Faqerojtës të Tjerë
+bookmarks-mobile-bookmarks-menu =
+    .label = Faqerojtës Celulari
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fshihe Anështyllën e Faqerojtësve
+           *[other] Shihni Anështyllë Faqerojtësish
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Fshihe Panelin e Faqerojtësve
+           *[other] Shihni Panel Faqerojtësish
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Hiqe Menunë e Faqerojtësve nga Paneli
+           *[other] Shtoje Menunë e Faqerojtësve te Paneli
+        }
+bookmarks-search =
+    .label = Kërkoni Te Faqerojtësit
+bookmarks-tools =
+    .label = Mjete Faqeruajtjeje
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Panel Faqerojtësish
+    .accesskey = F
+    .aria-label = Faqerojtës
+bookmarks-toolbar-menu =
+    .label = Panel Faqerojtësish
+bookmarks-toolbar-placeholder =
+    .title = Objekte Paneli Faqerojtësish
+bookmarks-toolbar-placeholder-button =
+    .label = Objekte Paneli Faqerojtësish
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Faqerojtës
+library-bookmarks-bookmark-this-page =
+    .label = Faqeruaje Këtë Faqe
+library-bookmarks-bookmark-edit =
+    .label = Përpunojeni Këtë Faqerojtës
+
+## More items
+
+more-menu-go-offline =
+    .label = Puno i Palidhur
+    .accesskey = o
diff -Nru firefox-84.0.2+build1/l10n/sq/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/sq/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/sq/browser/browser/preferences/preferences.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Sajtet që vizitoni më tepër
 home-prefs-topsites-by-option-sponsored =
     .label = Sajte Kryesorë të Sponsorizuar
+home-prefs-shortcuts-header =
+    .label = Shkurtore
+home-prefs-shortcuts-description = Sajte që ruani ose vizitoni
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Shkurtore të sponsorizuara
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Rekomanduar nga { $provider }
 home-prefs-recommended-by-description-update = Lëndë e jashtëzakonshme nga anembanë intereti, nën përkujdesjen e { $provider }
+home-prefs-recommended-by-description-new = Lëndë e jashtëzakonshme, në kujdesin e { $provider }, pjesë e familjes { -brand-product-name }
 
 ##
 
@@ -524,6 +530,9 @@
     .label = Shkarkimet Më të Reja
 home-prefs-highlights-option-saved-to-pocket =
     .label = Faqe të Ruajtura te { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Veprimtari së fundi
+home-prefs-recent-activity-description = Një përzgjedhje sajtesh dhe lënde së fundi
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -531,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Copëza
 home-prefs-snippets-description = Përditësime nga { -vendor-short-name } dhe { -brand-product-name }-i
+home-prefs-snippets-description-new = Ndihmëza dhe lajme nga { -vendor-short-name } dhe { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -925,6 +935,9 @@
 addressbar-locbar-topsites-option =
     .label = Sajte Kryesues
     .accesskey = K
+addressbar-locbar-engines-option =
+    .label = Motorë kërkimesh
+    .accesskey = k
 addressbar-suggestions-settings = Ndryshoni parapëlqimet mbi sugjerime nga motorë kërkimi
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/sq/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -62,6 +62,9 @@
 app-basics-build-config = Formësim Montimi
 app-basics-user-agent = Agjent Përdoruesi
 app-basics-os = OS
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta Translated
 app-basics-memory-use = Përdorim Kujtese
 app-basics-performance = Punim
 app-basics-service-workers = Service Workers të Regjistruar
@@ -182,6 +185,30 @@
 
 ##
 
+support-third-party-modules-title = Module Palësh të Treta
+support-third-party-modules-module = Kartelë Moduli
+support-third-party-modules-version = Version Kartele
+support-third-party-modules-vendor = Të dhëna Tregtuesi
+support-third-party-modules-occurrence = Përsëritje
+support-third-party-modules-process = Lloj & ID Procesi
+support-third-party-modules-thread = Rrjedhë
+support-third-party-modules-duration = Kohëzgjatje Ngarkese (ms)
+support-third-party-modules-empty = S’u ngarkuan module palësh të treta.
+support-third-party-modules-no-value = (S’ka vlerë)
+support-third-party-modules-button-open =
+    .title = Hapni vendndodhje kartele…
+support-third-party-modules-expand =
+    .title = Shfaq të dhëna të hollësishme
+support-third-party-modules-collapse =
+    .title = Tkurri të dhënat e hollësishme
+support-third-party-modules-unsigned-icon =
+    .title = Ky modul s’është i nënshkruar
+support-third-party-modules-folder-icon =
+    .title = Hapni vendndodhje kartele…
+support-third-party-modules-down-icon =
+    .title = Shfaq të dhëna të hollësishme
+support-third-party-modules-up-icon =
+    .title = Tkurri të dhënat e hollësishme
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/sq/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Mbulim për “Picture-in-Picture�  të Shumta
 experimental-features-multi-pip-description = Mbulim eksperimental për lejim hapjeje të shumë dritareve “Picture-in-Picture�  në të njëjtën kohë.
+experimental-features-http3 =
+    .label = Protokoll HTTP/3
+experimental-features-http3-description = Mbulim eksperimental për protokollin HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/sq/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> dëshiron të hapë një lidhje <strong>{ $scheme }</strong>.
 
 ## Permission Dialog
 ## Variables:
@@ -28,7 +20,7 @@
 ## `<strong>` HTML tags). Please also keep the hostname as close to the start
 ## of the sentence as your language's grammar allows.
 
-permission-dialog-remember = Lejo përherë <strong>{ $host }</strong> të hapë lidhje<strong>{ $scheme }</strong>
+permission-dialog-remember = Lejo përherë <strong>{ $host }</strong> të hapë lidhje <strong>{ $scheme }</strong>
 permission-dialog-remember-file = Lejoje përherë këtë kartelë të hapë lidhje <strong>{ $scheme }</strong>
 
 ##
diff -Nru firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/sq/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/sq/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:56:27.000000000 +0000
+++ firefox-85.0+build1/l10n/sq/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:31.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = në
+printui-page-custom-range-input =
+    .aria-label = Jepni interval vetjak faqesh
+    .placeholder = p.sh., 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopje
 printui-orientation = Orientim
@@ -48,6 +51,7 @@
 printui-options = Mundësi
 printui-headers-footers-checkbox = Shtyp kryefaqe dhe fundfaqe
 printui-backgrounds-checkbox = Shtyp sfonde
+printui-selection-checkbox = Shtyp vetëm përzgjedhjen
 printui-color-mode-label = Mënyrë ngjyrash
 printui-color-mode-color = Ngjyrë
 printui-color-mode-bw = Bardhezi
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Asnjë
 printui-margins-custom = Vetjake
+printui-margins-custom-inches = Vetjake (inç)
 printui-margins-custom-top = Në Krye
+printui-margins-custom-top-inches = Krye (inç)
 printui-margins-custom-bottom = Në fund
+printui-margins-custom-bottom-inches = Fund (inç)
 printui-margins-custom-left = Majtas
+printui-margins-custom-left-inches = Majtas (inç)
 printui-margins-custom-right = Djathtas
+printui-margins-custom-right-inches = Djathtas (inç)
 printui-system-dialog-link = Shtyp duke përdorur dialogun e sistemit…
 printui-primary-button = Shtype
 printui-primary-button-save = Ruaje
 printui-cancel-button = Anuloje
+printui-close-button = Mbylle
 printui-loading = Po Përgatitet Paraparje
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Paraparje e Shtypjes
+printui-pages-per-sheet = Faqe për fletë
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Po shtypet…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/sr/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/aboutLogins.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/aboutLogins.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Уклонити ову пријаву?
 confirm-delete-dialog-message = Ова радња �е не може опозвати.
 about-logins-confirm-remove-dialog-confirm-button = Уклони
-about-logins-confirm-remove-all-dialog-confirm-button = Уклони �ве
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Уклони
+        [one] Уклони
+        [few] Уклони �ве
+       *[other] Уклони �ве
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Да, уклони ову пријаву
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/sr/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/appmenu.ftl	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/appmenu.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �ови прозор
+appmenuitem-new-private-window =
+    .label = �ови приватан прозор
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Увећајте
 appmenuitem-zoom-reduce =
     .label = Смањите
+appmenuitem-fullscreen =
+    .label = Кори�ти цео екран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Синхронизуј �ада
+appmenuitem-save-page =
+    .label = Сачувај �траницу као…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Шта је ново
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/sr/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/appMenuNotifications.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = �е �ада
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = �акон ре�тартовања, { -brand-shorter-name } ће обновити �ве ваше отворене језичке и прозоре који ни�у у приватном режиму.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } �е не може аутомат�ки ажурирати на најновију верзију.
+    .buttonlabel = Ипак ажурирај { -brand-shorter-name }
+    .buttonaccesskey = U
+    .secondarybuttonlabel = �е �ада
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = До�тупно је ажурирање за { -brand-shorter-name }, али �е не може ин�талирати јер је покренута друга копија { -brand-shorter-name }-а. Затворите је да на�тавите �а ажурирањем или одаберите да ажурирате (друга копија можда неће радити и�правно док је поново не покренете).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = У реду, разумем
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/browser.ftl firefox-85.0+build1/l10n/sr/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/browser.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/browser.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -505,3 +505,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> управља �а вашим показивачем. Прити�ните Esc да преузмете контролу.
 pointerlock-warning-no-domain = Овај документ управља �а вашим показивачем. Прити�ните Esc да преузмете контролу.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Прикажи �ве забелешке
+bookmarks-recent-bookmarks =
+    .value = �едавно забележене
+bookmarks-toolbar-chevron =
+    .tooltiptext = Прикажи још забелешки
+bookmarks-sidebar-content =
+    .aria-label = Забелешке
+bookmarks-menu-button =
+    .label = Мени �а забелешкама
+bookmarks-other-bookmarks-menu =
+    .label = О�тале забелешке
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобилне забелешке
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Сакриј палету �а забелешкама
+           *[other] Прикажи у бочној палети
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Сакриј траку �а забелешкама
+           *[other] Прикажи траку �а забелешкама
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Уклони мени �а забелешкама �а алатне траке
+           *[other] Додај мени �а забелешкама на траку �а алатима
+        }
+bookmarks-search =
+    .label = Претражи забелешке
+bookmarks-tools =
+    .label = �латке за забелешке
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Трака �а забелешкама
+    .accesskey = з
+    .aria-label = Ознаке
+bookmarks-toolbar-menu =
+    .label = Трака �а забелешкама
+bookmarks-toolbar-placeholder =
+    .title = Забележи �тавке из алатне траке
+bookmarks-toolbar-placeholder-button =
+    .label = Забележи �тавке из алатне траке
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Забелешке
+library-bookmarks-bookmark-this-page =
+    .label = Забележи ову �траницу
+library-bookmarks-bookmark-edit =
+    .label = Уреди ову забелешку
+
+## More items
+
+more-menu-go-offline =
+    .label = Рад ван мреже
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/migration.ftl firefox-85.0+build1/l10n/sr/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/migration.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/migration.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -54,6 +54,8 @@
 import-items-page-title = Ставке за увоз
 import-items-description = Изаберите �тавке за увоз:
 import-permissions-page-title = Одобрите дозволе за { -brand-short-name }
+# Do not translate "Bookmarks.plist"; the file name is the same everywhere.
+import-permissions-description = macOS захтева да дозволите { -brand-short-name }-у изричит при�туп Safari обележивачима. Кликните “�а�тави� и на приказаном File Open панелу одаберите “Bookmarks.plist� датотеку.
 import-migrating-page-title = Увоз…
 import-migrating-description = �аредне �тавке �е тренутно увозе…
 import-select-profile-page-title = Избор профила
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/sr/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/asrouter.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/newtab/asrouter.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -129,6 +129,9 @@
 
 cfr-whatsnew-searchbar-title = Куцајте мање, нађите више помоћу адре�не траке
 cfr-whatsnew-searchbar-body-topsites = Сада �амо одаберите адре�ну траку и оквир ће �е проширити �а везама до ваших најпо�ећенијих �траница.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Иконица лупе
 
 ## Picture-in-Picture
@@ -263,6 +266,8 @@
 
 ## Fission Experiment Message
 
+cfr-doorhanger-fission-body-approved = Ваша приватно�т је битна. { -brand-short-name } �ада изолује веб �транице, што хакерима отежава крађу лозинки, бројева кредитних картица и других о�етљивих података.
+cfr-doorhanger-fission-header = Изолација �ајта
 cfr-doorhanger-fission-primary-button = У реду, разумем
     .accesskey = O
 cfr-doorhanger-fission-secondary-button = Сазнајте више
@@ -276,4 +281,11 @@
 
 ## What's new: Media controls message
 
+cfr-whatsnew-media-keys-header = Више медиј�ких контрола
+cfr-whatsnew-media-keys-body = Репродукујте и паузирајте звук или видео преко та�татуре или �лушалица, олакшавајући тако управљање медијима из другог језичка, програма или док је рачунар закључан. Такође �е можете кори�тити та�терима напред и назад за кретање између нумера.
 cfr-whatsnew-media-keys-button = Сазнајте како
+
+## What's new: Search shortcuts
+
+cfr-whatsnew-search-shortcuts-header = Пречице за претраживање у адре�ној траци
+cfr-whatsnew-search-shortcuts-body = Сада кад у адре�ну траку укуцате неки претраживач или одређени �ајт, појавиће �е плава пречица у предлозима за претраживање и�под. Изаберите ту пречицу за довршавање претраживања дирекнто у адре�ној траци.
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/sr/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/newtab.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ови језичак
 newtab-settings-button =
     .title = Прилагодите �траницу новог језичка
+newtab-personalize-button-label = Пер�онализуј
+    .title = Пер�онализуј нови језичак
+    .aria-label = Пер�онализуј нови језичак
 
 ## Search box component.
 
@@ -171,6 +174,7 @@
 
 newtab-section-header-topsites = Омиљени �ајтови
 newtab-section-header-highlights = И�такнуто
+newtab-section-header-recent-activity = �едавна активно�т
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Предложио { $provider }
@@ -206,3 +210,28 @@
 
 newtab-error-fallback-info = Уп�, дошло је до грешке приликом учитавања овог �адржаја.
 newtab-error-fallback-refresh-link = О�вежите �траницу да покушате поново.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Пречице
+newtab-custom-shortcuts-subtitle = Сајтови које чувате или по�ећујете
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } ред
+        [few] { $num } реда
+       *[other] { $num } редова
+    }
+newtab-custom-sponsored-sites = Спонзори�ане пречице
+newtab-custom-pocket-title = Препоручио { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Изузетан �адржај који је уредио { -pocket-brand-name }, део { -brand-product-name } породице
+newtab-custom-pocket-sponsored = Спонзори�ане приче
+newtab-custom-recent-title = �едавна активно�т
+newtab-custom-recent-subtitle = Избор недавних �ајтова и �адржаја
+newtab-custom-close-button = Затвори
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = И�ечци
+newtab-custom-snippets-subtitle = Савети и ново�ти од { -vendor-short-name }-а и { -brand-product-name }-а
+newtab-custom-settings = Управљај подешавањима
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/sr/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/newtab/onboarding.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/newtab/onboarding.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -95,6 +95,7 @@
 # Variables:
 #   $addon-name (String) - Name of the add-on
 return-to-amo-addon-title = Сада преузмите и <img data-l10n-name="icon"/> { $addon-name }</b>.
+return-to-amo-add-extension-label = Додајте проширење
 
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
 
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/places.ftl firefox-85.0+build1/l10n/sr/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/places.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/places.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -17,7 +17,6 @@
 places-open-private-window =
     .label = Отвори у новом приватном прозору
     .accesskey = P
-
 places-new-bookmark =
     .label = �ова забелешка…
     .accesskey = B
@@ -30,7 +29,6 @@
 places-new-separator =
     .label = �ови �епаратор
     .accesskey = S
-
 places-view =
     .label = Преглед
     .accesskey = w
@@ -49,12 +47,10 @@
 places-by-day-and-site =
     .label = По датуму и �ајту
     .accesskey = t
-
 places-history-search =
     .placeholder = Претражите и�торију
 places-bookmarks-search =
     .placeholder = Претражите забелешке
-
 places-delete-domain-data =
     .label = Заборави на овај �ајт
     .accesskey = F
@@ -64,3 +60,12 @@
 places-properties =
     .label = Свој�тва
     .accesskey = i
+# Managed bookmarks are created by an administrator and cannot be changed by the user.
+managed-bookmarks =
+    .label = Управљај обележивачима
+# This label is used when a managed bookmarks folder doesn't have a name.
+managed-bookmarks-subfolder =
+    .label = Подфа�цикла
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = О�тали обележивачи
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/policies/policies-descriptions.ftl firefox-85.0+build1/l10n/sr/browser/browser/policies/policies-descriptions.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/policies/policies-descriptions.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/policies/policies-descriptions.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -11,183 +11,103 @@
 ## in the documentation section in about:policies.
 
 policy-3rdparty = По�тавите правила којим WebExtensions може при�тупити преко chrome.storage.managed.
-
 policy-AppAutoUpdate = Омогућите или онемогућите аутомат�ко ажурирање апликације.
-
 policy-AppUpdateURL = Поде�и прилагођену адре�у за ажурирање програма.
-
 policy-Authentication = Поде�ите уграђену идентификацију за �ајтове који то подржавају.
-
 policy-BlockAboutAddons = Блокирај при�туп управнику додатака (about:addons).
-
 policy-BlockAboutConfig = Блокирај при�туп �траници about:config.
-
 policy-BlockAboutProfiles = Блокирај при�туп �траници about:profiles.
-
 policy-BlockAboutSupport = Блокирај при�туп �траници about:support.
-
 policy-Bookmarks = �аправи забелешку у траци �а забелешкама, менију �а забелешкама или у наведеној фа�цикли унутар.
-
 policy-CaptivePortal = Омогући или онемогући подршку за каптивне портале.
-
 policy-CertificatesDescription = Додај �ертификате или кори�ти уграђене �ертификате.
-
 policy-Cookies = Дозволи или забрани �ајтовима да о�тављају колачиће.
-
 policy-DisabledCiphers = Онемогућите алгоритам шифровања.
-
 policy-DefaultDownloadDirectory = По�тавите подразумевану фа�циклу за преузимање.
-
 policy-DisableAppUpdate = Спречи ажурирање прегледача.
-
 policy-DisableBuiltinPDFViewer = Онемогући PDF.js, уграђеног прегледача PDF-ова у програму { -brand-short-name }.
-
 policy-DisableDefaultBrowserAgent = Спречите подразумеваног агента прегледача да предузме мере. Применљиво �амо за Windows; друге платформе немају агента.
-
 policy-DisableDeveloperTools = Блокирај при�туп програмер�ким алаткама.
-
 policy-DisableFeedbackCommands = Онемогући наредбе за �лање повратних информација из менија „Помоћ“ (опције „Пошаљи повратне информације“ и „Пријави обманљив �ајт“).
-
 policy-DisableFirefoxAccounts = Онемогући { -fxaccount-brand-name } у�луге, укључујући Sync.
-
 # Firefox Screenshots is the name of the feature, and should not be translated.
 policy-DisableFirefoxScreenshots = Онемогући Firefox Screenshots могућно�т.
-
 policy-DisableFirefoxStudies = Спречи извођење { -brand-short-name } �тудија.
-
 policy-DisableForgetButton = Спречи при�туп дугмету „Заборави“.
-
 policy-DisableFormHistory = �е памти и�торију претраживања и формулара.
-
 policy-DisableMasterPasswordCreation = �ко је тачно, неће бити могуће по�тављање главне лозинке.
-
 policy-DisablePrimaryPasswordCreation = �ко је тачно, главна лозинка �е не може направити.
-
 policy-DisablePasswordReveal = �е дозволите приказивање лозинке у �ачуваним подацима за пријаву.
-
 policy-DisablePocket = Онемогући могућно�т чувања веб �траница у �ерви�у Pocket.
-
 policy-DisablePrivateBrowsing = Онемогући приватно прегледање.
-
 policy-DisableProfileImport = Онемогући наредбу у менију за увоз података из других прегледача.
-
 policy-DisableProfileRefresh = Онемогући дугме за о�вежавање програма { -brand-short-name } на �трани about:support.
-
 policy-DisableSafeMode = Онемогући могућно�т поновног покретања програма у безбедном режиму. �апомена: онемогућавање ула�ка у безбедни режим преко та�тера Shift �е може онемогућити на Windows-у �амо коришћењем групне поли�е.
-
 policy-DisableSecurityBypass = Спречи кори�нику заобилажење одређених безбедно�них упозорења.
-
 policy-DisableSetAsDesktopBackground = Онемогући наредбу менија „По�тави на радну површину“ за �лике.
-
 policy-DisableSystemAddonUpdate = Спречи прегледача да ин�талира и ажурира �и�тем�ке додатке.
-
 policy-DisableTelemetry = И�кључи телеметрију.
-
 policy-DisplayBookmarksToolbar = Подразумевано приказуј алатну траку �а забелешкама.
-
 policy-DisplayMenuBar = Подразумевано приказуј траку �а менијем.
-
 policy-DNSOverHTTPS = Поде�и DNS преко HTTPS-а.
-
 policy-DontCheckDefaultBrowser = Онемогући проверу подразумеваног прегледача при покретању.
-
 policy-DownloadDirectory = По�тавите и закључајте директоријум за преузимање.
-
 # “lock� means that the user won’t be able to change this setting
 policy-EnableTrackingProtection = Омогући или онемогући блокирање �адржаја и (изборно) закључај подешавање.
-
 # “lock� means that the user won’t be able to change this setting
 policy-EncryptedMediaExtensions = Омогућите или онемогућите шифрирана проширења медија и опционално закључајте избор.
-
 # A “locked� extension can’t be disabled or removed by the user. This policy
 # takes 3 keys (“Install�, �Uninstall�, �Locked�), you can either keep them in
 # English or translate them as verbs.
 policy-Extensions = Ин�талирајте, деин�талирајте или закључавајте проширање. Опција за ин�талирање узима URL-ове или путање као параметре. Опције за деин�талирање и закључавање узимау ИБ-јеве проширења.
-
 policy-ExtensionSettings = Управљајте �вим а�пектима ин�талације проширења.
-
 policy-ExtensionUpdate = Омогућите или онемогућите аутомат�ка ажурирања проширења.
-
 policy-FirefoxHome = Поде�ите Firefox Home.
-
 policy-FlashPlugin = Дозволи или забрани коришћење Flash прикључка.
-
 policy-Handlers = Поде�ите подразумеване менаџере апликација.
-
 policy-HardwareAcceleration = �ко је нетачно, и�кључи хардвер�ко убрзавање.
-
 # “lock� means that the user won’t be able to change this setting
 policy-Homepage = По�тави и по избору закључај почетну �трану.
-
 policy-InstallAddonsPermission = Дозволи ин�талирање додатака за одређене веб �ајтове.
-
 policy-LegacyProfiles = Онемогућите функцију намећући по�ебан налог за �ваку ин�талацију
 
 ## Do not translate "SameSite", it's the name of a cookie attribute.
 
 policy-LegacySameSiteCookieBehaviorEnabled = Омогућите подразумевано на�леђено подешавање понашања SameSite колачића.
-
 policy-LegacySameSiteCookieBehaviorEnabledForDomainList = Вратите �е на на�леђено SameSite понашање за колачиће на одређеним �траницама.
 
 ##
 
 policy-LocalFileLinks = Дозволи одређеним �ајтовима везе ка локалним датотекама.
-
+policy-ManagedBookmarks = Конфигурише �пи�ак обележивача којима управља админи�тратор, а које кори�ник не може мењати.
 policy-MasterPassword = Захтевајте или �пречите употребу главне лозинке.
-
 policy-PrimaryPassword = Захтевајте или �пречите употребу главне лозинке.
-
 policy-NetworkPrediction = Омогући или онемогући предвиђање мрежних захтева (превентивни DNS упити).
-
 policy-NewTabPage = Омогућите или онемогућите �траницу новог језичка.
-
 policy-NoDefaultBookmarks = Онемогући �тварање подразумеваних белешки упакованих уз програм { -brand-short-name } и �тварање паметних белешки (најчешће по�ећене, недавне ознаке). �апомена: ова поли�а је делотворна �амо ако �е и�кори�ти пре првог покретања профила.
-
 policy-OfferToSaveLogins = �аметни подешавање да би дозволили програму { -brand-short-name } да понуди чување пријава и лозинки. Дозвољене вредно�ти �у тачно или нетачно.
-
 policy-OfferToSaveLoginsDefault = Дефинишите да ли би, подразумевано, { -brand-short-name } требало да нуди чување пријава и лозинки. И и�тин�ке и лажне вредно�ти �у прихваћене.
-
 policy-OverrideFirstRunPage = Премо�ти подешавање �транице првог покретања. И�празните ову поли�у уколико желите да онемогућите �траницу за прво покретање програма.
-
 policy-OverridePostUpdatePage = Премо�ти �траницу „Шта је ново“ која �е појављује након ажурирања. И�празните ову поли�у уколико желите да онемогућите ову �траницу након ажурирања.
-
 policy-PasswordManagerEnabled = Омогућите �нимање лозинки у менаџеру лозинки.
-
 # PDF.js and PDF should not be translated
 policy-PDFjs = Онемогућите или поде�ите PDF.js, уграђени PDF читач за { -brand-short-name }.
-
 policy-Permissions2 = Конфигуришите дозволе за камеру, микрофон, локацију, обавештења и аутомат�ку репродукцију.
-
 policy-PictureInPicture = Омогућите или онемогућите режим �лике-у-�лици.
-
 policy-PopupBlocking = Подразумевано дозволи одређеним �ајтовима приказ и�качућих прозора .
-
 policy-Preferences = Поде�ите и закључајте вредно�т за под�куп по�тавки.
-
 policy-PromptForDownloadLocation = Упитај где треба �ачувати датотеке након преузимања.
-
 policy-Proxy = Поде�и подешавања прок�ија.
-
 policy-RequestedLocales = По�тави �пи�ак тражених језика у програму по жељеном редо�леду.
-
 policy-SanitizeOnShutdown2 = Очи�тити навигационе податке на и�кључењу.
-
 policy-SearchBar = Поде�и подразумевано ме�то приказа траке за претраживање. Кори�нику је и даље дозвољено прилагођавање.
-
 policy-SearchEngines = Поде�и по�тавке претраживача. Ова поли�а је до�тупна �амо у издањима �а продуженом подршком (ткз. ESR издања).
-
 policy-SearchSuggestEnabled = Омогућите или онемогућите предлоге за претрагу.
-
 # For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/PKCS11/Module_Installation
 policy-SecurityDevices = Ин�талирај PKCS #11 модуле.
-
 policy-SSLVersionMax = По�тави највеће могуће издање SSL-a.
-
 policy-SSLVersionMin = По�тави најмање могуће издање SSL-a.
-
 policy-SupportMenu = Додај прилагођену �тавку за подршку у менију помоћи.
-
 policy-UserMessaging = Сакриј одређене поруке намењене кори�нику.
-
 # “format� refers to the format used for the value of this policy.
 policy-WebsiteFilter = Блокирај по�ету веб �ајтовима. Погледајте документацију за више детаља о формату.
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/preferences/fxaPairDevice.ftl firefox-85.0+build1/l10n/sr/browser/browser/preferences/fxaPairDevice.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/preferences/fxaPairDevice.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/preferences/fxaPairDevice.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -5,11 +5,11 @@
 fxa-pair-device-dialog =
     .title = Закачи други уређај
     .style = width: 26em; min-height: 35em;
-
 fxa-qrcode-heading-phase1 = 1. �ко већ ни�те, ин�талирајте <a data-l10n-name="connect-another-device">Firefox на ваш мобилни уређај</a>.
-
 fxa-qrcode-heading-phase2 = 2. Онда �е пријавите на { -sync-brand-short-name }, или �кенирајте код упаривања на �ндроид уређају унутар { -sync-brand-short-name } по�тавки.
-
+fxa-qrcode-heading-step1 = 1. �ко већ ни�те, ин�талирајте <a data-l10n-name="connect-another-device">Firefox на ваш мобилни уређај</a>.
+fxa-qrcode-heading-step2 = 2. Отворите Firefox на вашем мобилном уређају.
+fxa-qrcode-heading-step3 = 3. Оворите <b>мени</b> (<img data-l10n-name="ios-menu-icon"/> или <img data-l10n-name="android-menu-icon"/>), тапните <img data-l10n-name="settings-icon"/> <b>Подешавања</b> и изаберите <b>Укључите Sync</b>
+fxa-qrcode-heading-step4 = 4. Скенирајте овај код:
 fxa-qrcode-error-title = Упаривање није у�пело.
-
 fxa-qrcode-error-body = Покушај поново.
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/sr/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/preferences/preferences.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -29,6 +29,8 @@
            *[other] �ађи у по�тавкама
         }
 managed-notice = Вашим прегледачем управља ваша организација.
+category-list =
+    .aria-label = Категорије
 pane-general-title = Опште
 category-general =
     .tooltiptext = { pane-general-title }
@@ -50,6 +52,9 @@
 pane-experimental-subtitle = �а�тавите � опрезом
 pane-experimental-search-results-header = { -brand-short-name } ек�перименти: на�тавите � опрезом
 pane-experimental-description = Измена напредних подешавања може деловати на { -brand-short-name } перформан�е или безбедно�т.
+pane-experimental-reset =
+    .label = Врати подразумеване вредно�ти
+    .accesskey = R
 help-button-label = { -brand-short-name } подршка
 addons-button-label = Проширења и теме
 focus-search =
@@ -429,6 +434,10 @@
     .label = Омогућите �лика-у-�лици видео контролу
     .accesskey = О
 browsing-picture-in-picture-learn-more = Сазнајте више
+browsing-media-control =
+    .label = Управљај медијима преко та�татуре, �лушалица или виртуелног интерфеј�а
+    .accesskey = v
+browsing-media-control-learn-more = Сазнајте више
 browsing-cfr-recommendations =
     .label = Препоручи проширења приликом прегледања
     .accesskey = р
@@ -492,6 +501,13 @@
 home-prefs-topsites-header =
     .label = Омиљени �ајтови
 home-prefs-topsites-description = Сајтови које највише по�ећујете
+home-prefs-topsites-by-option-sponsored =
+    .label = Спонзори�ани популарни �ајтови
+home-prefs-shortcuts-header =
+    .label = Пречице
+home-prefs-shortcuts-description = Сајтови које чувате или по�ећујете
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Спонзори�ане пречице
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -499,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Предложио { $provider }
 home-prefs-recommended-by-description-update = И�такнути �адржај �а интернета, који обезбеђује { $provider }
+home-prefs-recommended-by-description-new = Изузетан �адржај који је уредио { $provider }, део { -brand-product-name } породице
 
 ##
 
@@ -516,6 +533,9 @@
     .label = �ајновије преузимање
 home-prefs-highlights-option-saved-to-pocket =
     .label = Странице �ачуване у { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = �едавна активно�т
+home-prefs-recent-activity-description = Избор недавних �ајтова и �адржаја
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -523,6 +543,7 @@
 home-prefs-snippets-header =
     .label = И�ечци
 home-prefs-snippets-description = �ово�ти од { -vendor-short-name }-е и { -brand-product-name }-а
+home-prefs-snippets-description-new = Савети и ново�ти од { -vendor-short-name }-а и { -brand-product-name }-а
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -564,6 +585,7 @@
 suggestions-addressbar-settings-generic = Измените по�дешавања предлога претраживања
 search-suggestions-cant-show = Предлози претраге неће бити приказани у траци за локацију зато што �те поде�или да { -brand-short-name } никада не памти и�торију.
 search-one-click-header = One-click претраживачи
+search-one-click-header2 = Претражи пречице
 search-one-click-desc = Изаберите алтернативне претраживаче који ће �е појављивати и�под адре�не траке и траке за претрагу приликом уно�а кључне речи.
 search-choose-engine-column =
     .label = Претраживач
@@ -876,6 +898,10 @@
     .label = Виеш�транични пратиоци
 sitedata-option-block-cross-site-and-social-media-trackers =
     .label = Више�транични пратиоци и пратиоци �а друштвених мрежа
+sitedata-option-block-cross-site-tracking-cookies-including-social-media =
+    .label = Више�транични колачићи — укључују колачиће друштвених мрежа
+sitedata-option-block-cross-site-cookies-including-social-media =
+    .label = Више�транични колачићи — укључују колачиће друштвених мрежа
 sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
     .label = Пратиоци � унакр�них �траница и друштвених мрежа, те изолација прео�талих колачића
 sitedata-option-block-unvisited =
@@ -913,6 +939,9 @@
 addressbar-locbar-topsites-option =
     .label = Популарне �транице
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Претраживачи
+    .accesskey = a
 addressbar-suggestions-settings = Измени по�тавке предлога претраживања
 
 ## Privacy Section - Content Blocking
@@ -920,6 +949,7 @@
 content-blocking-enhanced-tracking-protection = Побољшана заштита од праћења
 content-blocking-section-top-level-description = Софтвери за праћење прате ваше мрежне активно�ти и �акупљају ваше навике и интере�овања. { -brand-short-name } блокира многе ове �офтвере и друге злонамерне �крипте.
 content-blocking-learn-more = Сазнајте више
+content-blocking-fpi-incompatibility-warning = Кори�тите First Party Isolation (FPI), која замењује нека { -brand-short-name } подешавања колачића.
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
@@ -941,6 +971,7 @@
 content-blocking-etp-strict-desc = Заштита је моћнија, али може проузроковати да �е неке веб �транице или �адржај не учитају.
 content-blocking-etp-custom-desc = Изаберите које пратиоце и �крипте треба блокирати.
 content-blocking-private-windows = Садржај који прати у приватним прозорима
+content-blocking-cross-site-cookies = Више�транични колачићи
 content-blocking-cross-site-tracking-cookies = Више�транични колачићи-пратиоци
 content-blocking-cross-site-tracking-cookies-plus-isolate = Пратиоци � унакр�них �траница и изолација прео�талих колачића
 content-blocking-social-media-trackers = Пратиоци � друштвених мрежа
@@ -952,6 +983,7 @@
 content-blocking-fingerprinters = Хватаче оти�ка
 content-blocking-warning-title = �апомена!
 content-blocking-and-isolating-etp-warning-description = Блокирање пратилаца и изолација колачића може утицати на функционално�т неких �траница. Поново учитајте �траницу � пратиоцима да би�те учитали �ав �адржај.
+content-blocking-and-isolating-etp-warning-description-2 = Ово подешавање може дове�ти до тога да неки �ајтови не приказују �адржај или не раде и�правно. �ко �е чини да неки �ајт не ради и�правно, покушајте да онемогућите заштиту од праћења да би онда учитао �ав �адржај.
 content-blocking-warning-learn-how = �аучите како
 content-blocking-reload-description = Да би�те применили ове измене, морате поново учитати �воје језичке.
 content-blocking-reload-tabs-button =
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/sr/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -19,6 +19,8 @@
 safeb-blocked-malware-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи злонамерни �офтвер</a>. Можете <a data-l10n-name='report_detection'>пријавити проблем</a> или <a data-l10n-name='ignore_warning_link'>игнори�ати упозорење</a> и на�тавити на�тави на �ајт.
 safeb-blocked-malware-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи злонамерни �офтвер</a>. Можете <a data-l10n-name='report_detection'>пријавити проблем</a>.
 safeb-blocked-malware-page-learn-more = Сазнајте више о штетном веб �адржају укључујући и виру�е и друге злонамерне �офтвере и како да заштитите ваш рачунар на <a data-l10n-name='learn_more_link'>StopBadware.org</a>. Сазнајте више о { -brand-short-name }-овој заштити од “пецања� и злонамерног �офтвера на <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
+safeb-blocked-malware-page-error-desc-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи штетан �офтвер</a>. Можете <a data-l10n-name='ignore_warning_link'>игнори�ати ризик</a> и на�тавити на овај не�игурни �ајт.
+safeb-blocked-malware-page-error-desc-no-override-sumo = { $sitename }<span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи штетан �офтвер</a>.
 safeb-blocked-malware-page-learn-more-sumo = Сазнате више о { -brand-short-name }-овој заштити од "пецања" и злонамерног �офтвера на <a data-l10n-name='firefox_support'>support.mozilla.org</a>.
 safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи штетан �офтвер</a>. Можете <a data-l10n-name='ignore_warning_link'>игнори�ати ризик</a> и на�тавити на овај штетан �ајт.
 safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> је <a data-l10n-name='error_desc_link'>пријављен да �адржи штетан �офтвер</a>.
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/sr/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -26,21 +26,18 @@
            *[other] Врати затворених језичака
         }
     .accesskey = U
-
 toolbar-context-menu-manage-extension =
     .label = Управљај ек�тензијама
     .accesskey = е
 toolbar-context-menu-remove-extension =
     .label = Обриши ек�тензију
     .accesskey = ш
-
 # This label is used in the extensions toolbar buttons context menus,
 # a user can use this command to submit to Mozilla an abuse report
 # related to that extension. "Report" is a verb.
 toolbar-context-menu-report-extension =
     .label = Пријави проширење
     .accesskey = о
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -56,3 +53,24 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = Прилагоди…
     .accesskey = ш
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = Увек
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show =
+    .label = �икад
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab =
+    .label = Само у новом језичку
+    .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Увек прикажи
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = �икад не приказуј
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Прикажи �амо у новом језичку
+    .accesskey = O
+toolbar-context-menu-bookmarks-show-other-bookmarks =
+    .label = Прикажи о�тале обележиваче
+    .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/sr/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/sr/browser/browser/webrtcIndicator.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/browser/webrtcIndicator.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -29,3 +29,12 @@
     .title = Укључи камеру
 webrtc-minimize =
     .title = Смањи индикатор
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = Делите вашу камеру. Кликните да контролишете дељење.
+webrtc-microphone-system-menu =
+    .label = Делите ваш микрофон. Кликните да контролишете дељење.
+webrtc-screen-system-menu =
+    .label = Делите прозор или екран. Кликните да контролишете дељење.
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/sr/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/browser.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/chrome/browser/browser.properties	2021-01-18 20:08:38.000000000 +0000
@@ -770,6 +770,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=П
 getUserMedia.pickWindowOrScreen.label = Изабери прозор или екран
 getUserMedia.shareEntireScreen.label = Цео екран
+getUserMedia.sharePipeWirePortal.label = Кори�тите подешавања оперативног �и�тема
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/downloads/downloads.properties firefox-85.0+build1/l10n/sr/browser/chrome/browser/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/downloads/downloads.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/chrome/browser/downloads/downloads.properties	2021-01-18 20:08:38.000000000 +0000
@@ -32,7 +32,7 @@
 # be longer than the other existing status strings.
 blockedMalware=Ова датотека �адржи виру� или малвер.
 blockedPotentiallyUnwanted=Ова датотека може да нашкоди рачунару.
-blockedInsecure = Ова датотека није могла бити �игурно преузета.
+blockedPotentiallyInsecure=Датотека није преузета; потенцијални безбедно�ни ризик.
 blockedUncommon2=Ова датотека �е не преузима че�то.
 
 # LOCALIZATION NOTE (fileMovedOrMissing):
@@ -42,7 +42,7 @@
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
 #                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
 #                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
-#                    unblockButtonUnblock, unblockButtonConfirmBlock):
+#                    unblockButtonUnblock, unblockButtonConfirmBlock, unblockInsecure):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
@@ -52,6 +52,7 @@
 unblockTypeMalware=Ова датотека �адржи виру� или малвер који могу оштетити рачунар.
 unblockTypePotentiallyUnwanted2=Ова датотека је ма�кирана као кори�но преузимање, али може учинти неочекиване промене вашим програмима и по�тавкама.
 unblockTypeUncommon2=Ова датотека �е не преузима че�то и можда није �угурна за отварање. Можда �адржи виру� или може да уради промене на вашим програмима и по�тавкама.
+unblockInsecure=Датотека кори�ти не�игурну везу. Може бити оштећена или измењена током проце�а преузимања.
 unblockTip2=Можете претражити алтернативни извор преузимања или покушати поново.
 unblockButtonOpen=Отвори
 unblockButtonUnblock=Дозволи преузимање
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/sr/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/sr/browser/chrome/browser/sitePermissions.properties	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:08:38.000000000 +0000
@@ -47,4 +47,6 @@
 permission.canvas.label = Ек�трактује податке �лике
 permission.midi.label = При�тупи MIDI уређајима
 permission.midi-sysex.label = При�тупи MIDI уређајима �а SysEx подршком
-permission.https-only-load-insecure.label = Кори�тите не�игурни HTTP
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = Отвори апликације
diff -Nru firefox-84.0.2+build1/l10n/sr/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/sr/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/sr/browser/defaultagent/defaultagent_localized.ini	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:08:38.000000000 +0000
@@ -6,5 +6,7 @@
 [Strings]
 DefaultBrowserAgentTaskDescription=Задатак агента подразумеваног прегледача проверава када �е подразумевани прегледач промени из %MOZ_APP_DISPLAYNAME% у неки други. �ко �е промена догоди под �умњивим околно�тима, он тражи од %MOZ_APP_DISPLAYNAME% кори�ника да �е врате највише два пута. Овај задатак %MOZ_APP_DISPLAYNAME% аутомат�ки ин�талира и реин�талира га када �е %MOZ_APP_DISPLAYNAME% ажурира. Да би�те онемогућили овај задатак, промените вредно�т “default-browser-agent.enabled� подешавања на about:config �траници или измените подешавање корпоративне %MOZ_APP_DISPLAYNAME% политике, “DisableDefaultBrowserAgent�.
 
+DefaultBrowserNotificationTitle=По�тавите %MOZ_APP_DISPLAYNAME% као задани прегледач
+DefaultBrowserNotificationText=%MOZ_APP_DISPLAYNAME% више није ваш задани прегледач. По�тавити као задани?
 DefaultBrowserNotificationYesButtonText=Да
 DefaultBrowserNotificationNoButtonText=�е
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/client/aboutdebugging.ftl firefox-85.0+build1/l10n/sr/devtools/client/aboutdebugging.ftl
--- firefox-84.0.2+build1/l10n/sr/devtools/client/aboutdebugging.ftl	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/client/aboutdebugging.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -10,7 +10,6 @@
 
 # Page title (ie tab title) for the Setup page
 about-debugging-page-title-setup-page = Debugging - Setup
-
 # Page title (ie tab title) for the Runtime page
 # { $selectedRuntimeId } is the id of the current runtime, such as "this-firefox", "localhost:6080", ...
 about-debugging-page-title-runtime-page = Debugging - Runtime / { $selectedRuntimeId }
@@ -20,60 +19,45 @@
 # Display name of the runtime for the currently running instance of Firefox. Used in the
 # Sidebar and in the Setup page.
 about-debugging-this-firefox-runtime-name = This { -brand-shorter-name }
-
 # Sidebar heading for selecting the currently running instance of Firefox
 about-debugging-sidebar-this-firefox =
     .name = { about-debugging-this-firefox-runtime-name }
-
 # Sidebar heading for connecting to some remote source
 about-debugging-sidebar-setup =
     .name = Setup
-
 # Text displayed in the about:debugging sidebar when USB devices discovery is enabled.
 about-debugging-sidebar-usb-enabled = USB омогућен
-
 # Text displayed in the about:debugging sidebar when USB devices discovery is disabled
 # (for instance because the mandatory ADB extension is not installed).
 about-debugging-sidebar-usb-disabled = USB disabled
-
 # Connection status (connected) for runtime items in the sidebar
 aboutdebugging-sidebar-runtime-connection-status-connected = Connected
 # Connection status (disconnected) for runtime items in the sidebar
 aboutdebugging-sidebar-runtime-connection-status-disconnected = Disconnected
-
 # Text displayed in the about:debugging sidebar when no device was found.
 about-debugging-sidebar-no-devices = No devices discovered
-
 # Text displayed in buttons found in sidebar items representing remote runtimes.
 # Clicking on the button will attempt to connect to the runtime.
 about-debugging-sidebar-item-connect-button = Connect
-
 # Text displayed in buttons found in sidebar items when the runtime is connecting.
 about-debugging-sidebar-item-connect-button-connecting = Connecting…
-
 # Text displayed in buttons found in sidebar items when the connection failed.
 about-debugging-sidebar-item-connect-button-connection-failed = Connection failed
-
 # Text displayed in connection warning on sidebar item of the runtime when connecting to
 # the runtime is taking too much time.
 about-debugging-sidebar-item-connect-button-connection-not-responding = Connection still pending, check for messages on the target browser
-
 # Text displayed as connection error in sidebar item when the connection has timed out.
 about-debugging-sidebar-item-connect-button-connection-timeout = Connection timed out
-
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Connected
-
 # Text displayed in sidebar items for remote devices where a compatible browser (eg
 # Firefox) has not been detected yet. Typically, Android phones connected via USB with
 # USB debugging enabled, but where Firefox is not started.
 about-debugging-sidebar-runtime-item-waiting-for-browser = Чекам прегледача...
-
 # Text displayed in sidebar items for remote devices that have been disconnected from the
 # computer.
 about-debugging-sidebar-runtime-item-unplugged = Unplugged
-
 # Title for runtime sidebar items that are related to a specific device (USB, WiFi).
 about-debugging-sidebar-runtime-item-name =
     .title = { $displayName } ({ $deviceName })
@@ -81,16 +65,13 @@
 # locations).
 about-debugging-sidebar-runtime-item-name-no-device =
     .title = { $displayName }
-
 # Text to show in the footer of the sidebar that links to a help page
 # (currently: https://developer.mozilla.org/docs/Tools/about:debugging)
 about-debugging-sidebar-support = Debugging Support
-
 # Text to show as the ALT attribute of a help icon that accompanies the help about
 # debugging link in the footer of the sidebar
 about-debugging-sidebar-support-icon =
     .alt = Help icon
-
 # Text displayed in a sidebar button to refresh the list of USB devices. Clicking on it
 # will attempt to update the list of devices displayed in the sidebar.
 about-debugging-refresh-usb-devices-button = Refresh devices
@@ -99,83 +80,61 @@
 
 # Title of the Setup page.
 about-debugging-setup-title = Setup
-
 # Introduction text in the Setup page to explain how to configure remote debugging.
 about-debugging-setup-intro = Configure the connection method you wish to remotely debug your device with.
-
 # Explanatory text in the Setup page about what the 'This Firefox' page is for
 about-debugging-setup-this-firefox2 = Use <a>{ about-debugging-this-firefox-runtime-name }</a> to debug extensions and service workers on this version of { -brand-shorter-name }.
-
 # Title of the heading Connect section of the Setup page.
 about-debugging-setup-connect-heading = Connect a Device
-
 # USB section of the Setup page
 about-debugging-setup-usb-title = USB
-
 # Explanatory text displayed in the Setup page when USB debugging is disabled
 about-debugging-setup-usb-disabled = Enabling this will download and add the required Android USB debugging components to { -brand-shorter-name }.
-
 # Text of the button displayed in the USB section of the setup page when USB debugging is disabled.
 # Clicking on it will download components needed to debug USB Devices remotely.
 about-debugging-setup-usb-enable-button = Enable USB Devices
-
 # Text of the button displayed in the USB section of the setup page when USB debugging is enabled.
 about-debugging-setup-usb-disable-button = Онемогућите USB уређаје
-
 # Text of the button displayed in the USB section of the setup page while USB debugging
 # components are downloaded and installed.
 about-debugging-setup-usb-updating-button = Updating…
-
 # USB section of the Setup page (USB status)
 about-debugging-setup-usb-status-enabled = Омогућено
 about-debugging-setup-usb-status-disabled = Онемогућено
 about-debugging-setup-usb-status-updating = Updating…
-
 # USB section step by step guide
 about-debugging-setup-usb-step-enable-dev-menu2 = Enable Developer menu on your Android device.
-
 # USB section step by step guide
 about-debugging-setup-usb-step-enable-debug2 = Enable USB Debugging in the Android Developer Menu.
-
 # USB section step by step guide
 about-debugging-setup-usb-step-enable-debug-firefox2 = Enable USB Debugging in Firefox on the Android device.
-
 # USB section step by step guide
 about-debugging-setup-usb-step-plug-device = Connect the Android device to your computer.
-
 # Text shown in the USB section of the setup page with a link to troubleshoot connection errors.
 # The link goes to https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_over_USB
 about-debugging-setup-usb-troubleshoot = Problems connecting to the USB device? <a>Troubleshoot</a>
-
 # Network section of the Setup page
 about-debugging-setup-network =
     .title = Network Location
-
 # Text shown in the Network section of the setup page with a link to troubleshoot connection errors.
 # The link goes to https://developer.mozilla.org/en-US/docs/Tools/Remote_Debugging/Debugging_over_a_network
 about-debugging-setup-network-troubleshoot = Problems connecting via network location? <a>Troubleshoot</a>
-
 # Text of a button displayed after the network locations "Host" input.
 # Clicking on it will add the new network location to the list.
 about-debugging-network-locations-add-button = Add
-
 # Text to display when there are no locations to show.
 about-debugging-network-locations-empty-text = No network locations have been added yet.
-
 # Text of the label for the text input that allows users to add new network locations in
 # the Connect page. A host is a hostname and a port separated by a colon, as suggested by
 # the input's placeholder "localhost:6080".
 about-debugging-network-locations-host-input-label = Host
-
 # Text of a button displayed next to existing network locations in the Connect page.
 # Clicking on it removes the network location from the list.
 about-debugging-network-locations-remove-button = Remove
-
 # Text used as error message if the format of the input value was invalid in the network locations form of the Setup page.
 # Variables:
 #   $host-value (string) - The input value submitted by the user in the network locations form
 about-debugging-network-location-form-invalid = Invalid host “{ $host-value }�. The expected format is “hostname:portnumber�.
-
 # Text used as error message if the input value was already registered in the network locations form of the Setup page.
 # Variables:
 #   $host-value (string) - The input value submitted by the user in the network locations form
@@ -206,26 +165,21 @@
 # Title of the processes category.
 about-debugging-runtime-processes =
     .name = Processes
-
 # Label of the button opening the performance profiler panel in runtime pages for remote
 # runtimes.
 about-debugging-runtime-profile-button2 = Profile performance
-
 # This string is displayed in the runtime page if the current configuration of the
 # target runtime is incompatible with service workers. "Learn more" points to MDN.
 # https://developer.mozilla.org/en-US/docs/Tools/about%3Adebugging#Service_workers_not_compatible
 about-debugging-runtime-service-workers-not-compatible = Your browser configuration is not compatible with Service Workers. <a>Learn more</a>
-
 # This string is displayed in the runtime page if the remote browser version is too old.
 # "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
 # { $minVersion } is the minimum version that is compatible with the current Firefox instance (same format)
 about-debugging-browser-version-too-old = Повезани прегледач има �тару верзију ({ $runtimeVersion }). Минимална подржана верзија је ({ $minVersion }). Ово је неподржана конфигурација која може изазвати проблеме у раду DevTools-а. �журирајте повезани прегледач. <a>Отклањање проблема</a>
-
 # Dedicated message for a backward compatibility issue that occurs when connecting:
 # from Fx 70+ to the old Firefox for Android (aka Fennec) which uses Fx 68.
 about-debugging-browser-version-too-old-fennec = Ова Firefox верзија не може да уклања грешке за Firefox за Android (68). Препоручујемо вам да на телефон ин�талирате Firefox за Android Nightly за те�тирање. <a>Више детаља</a>
-
 # This string is displayed in the runtime page if the remote browser version is too recent.
 # "Troubleshooting" link points to https://developer.mozilla.org/docs/Tools/about:debugging#Troubleshooting
 # { $runtimeID } is the build ID of the remote browser (for instance "20181231", format is yyyyMMdd)
@@ -233,27 +187,21 @@
 # { $runtimeVersion } is the version of the remote browser (for instance "67.0a1")
 # { $localVersion } is the version of your current browser (same format)
 about-debugging-browser-version-too-recent = The connected browser is more recent ({ $runtimeVersion }, buildID { $runtimeID }) than your { -brand-shorter-name } ({ $localVersion }, buildID { $localID }). This is an unsupported setup and may cause DevTools to fail. Please update Firefox. <a>Troubleshooting</a>
-
 # Displayed for runtime info in runtime pages.
 # { $name } is brand name such as "Firefox Nightly"
 # { $version } is version such as "64.0a1"
 about-debugging-runtime-name = { $name } ({ $version })
-
 # Text of a button displayed in Runtime pages for remote runtimes.
 # Clicking on the button will close the connection to the runtime.
 about-debugging-runtime-disconnect-button = Disconnect
-
 # Text of the connection prompt button displayed in Runtime pages, when the preference
 # "devtools.debugger.prompt-connection" is false on the target runtime.
 about-debugging-connection-prompt-enable-button = Enable connection prompt
-
 # Text of the connection prompt button displayed in Runtime pages, when the preference
 # "devtools.debugger.prompt-connection" is true on the target runtime.
 about-debugging-connection-prompt-disable-button = Disable connection prompt
-
 # Title of a modal dialog displayed on remote runtime pages after clicking on the Profile Runtime button.
 about-debugging-profiler-dialog-title2 = Profiler
-
 # Clicking on the header of a debug target category will expand or collapse the debug
 # target items in the category. This text is used as ’title’ attribute of the header,
 # to describe this feature.
@@ -264,127 +212,100 @@
 # Displayed in the categories of "runtime" pages that don't have any debug target to
 # show. Debug targets depend on the category (extensions, tabs, workers...).
 about-debugging-debug-target-list-empty = Nothing yet.
-
 # Text of a button displayed next to debug targets of "runtime" pages. Clicking on this
 # button will open a DevTools toolbox that will allow inspecting the target.
 # A target can be an addon, a tab, a worker...
 about-debugging-debug-target-inspect-button = Inspect
-
 # Text of a button displayed in the "This Firefox" page, in the Temporary Extension
 # section. Clicking on the button will open a file picker to load a temporary extension
 about-debugging-tmp-extension-install-button = Load Temporary Add-on…
-
 # Text displayed when trying to install a temporary extension in the "This Firefox" page.
 about-debugging-tmp-extension-install-error = There was an error during the temporary add-on installation.
-
 # Text of a button displayed for a temporary extension loaded in the "This Firefox" page.
 # Clicking on the button will reload the extension.
 about-debugging-tmp-extension-reload-button = Reload
-
 # Text of a button displayed for a temporary extension loaded in the "This Firefox" page.
 # Clicking on the button will uninstall the extension and remove it from the page.
 about-debugging-tmp-extension-remove-button = Remove
-
 # Message displayed in the file picker that opens to select a temporary extension to load
 # (triggered by the button using "about-debugging-tmp-extension-install-button")
 # manifest.json .xpi and .zip should not be localized.
 # Note: this message is only displayed in Windows and Linux platforms.
 about-debugging-tmp-extension-install-message = Select manifest.json file or .xpi/.zip archive
-
 # This string is displayed as a message about the add-on having a temporaryID.
 about-debugging-tmp-extension-temporary-id = This WebExtension has a temporary ID. <a>Learn more</a>
-
 # Text displayed for extensions in "runtime" pages, before displaying a link the extension's
 # manifest URL.
 about-debugging-extension-manifest-url =
     .label = Manifest URL
-
 # Text displayed for extensions in "runtime" pages, before displaying the extension's uuid.
 # UUIDs look like b293e463-481e-5148-a487-5aaf7a130429
 about-debugging-extension-uuid =
     .label = Internal UUID
-
 # Text displayed for extensions (temporary extensions only) in "runtime" pages, before
 # displaying the location of the temporary extension.
 about-debugging-extension-location =
     .label = Location
-
 # Text displayed for extensions in "runtime" pages, before displaying the extension's ID.
 # For instance "geckoprofiler@mozilla.com" or "{ed26ddcb-5611-4512-a89a-51b8db81cfb2}".
 about-debugging-extension-id =
     .label = Extension ID
-
 # 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.
 about-debugging-worker-fetch-listening =
     .label = Fetch
     .value = Listening for fetch events
-
 # Displayed for service workers in runtime pages that do not listen to Fetch events.
 about-debugging-worker-fetch-not-listening =
     .label = Fetch
     .value = Not listening for fetch events
-
 # Displayed for service workers in runtime pages that are currently running (service
 # worker instance is active).
 about-debugging-worker-status-running = Running
-
 # Displayed for service workers in runtime pages that are registered but stopped.
 about-debugging-worker-status-stopped = Stopped
-
 # Displayed for service workers in runtime pages that are registering.
 about-debugging-worker-status-registering = Registering
-
 # Displayed for service workers in runtime pages, to label the scope of a worker
 about-debugging-worker-scope =
     .label = Scope
-
 # Displayed for service workers in runtime pages, to label the push service endpoint (url)
 # 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 title of the inspect button for zombie tabs (e.g. tabs loaded via a session restore).
+about-debugging-zombie-tab-inspect-action-disabled =
+    .title = Језичак није потпуно учитан и не може �е прегледати
 # 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
-
 # Displayed as description for the Main Process debug target in the Processes category.
 # Only for remote browsers, if `devtools.aboutdebugging.process-debugging` is true.
 about-debugging-main-process-description2 = Main Process for the target browser
-
 # Displayed instead of the Main Process debug target when the preference
 # `devtools.browsertoolbox.fission` is true.
 about-debugging-multiprocess-toolbox-name = Вишепроце�не алатке
-
 # Description for the Multiprocess Toolbox target.
 about-debugging-multiprocess-toolbox-description = Главни проце� и проце�и �адржаја за циљани прегледач
-
 # Alt text used for the close icon of message component (warnings, errors and notifications).
 about-debugging-message-close-icon =
     .alt = Close message
-
 # Label text used for the error details of message component.
 about-debugging-message-details-label-error = Error details
-
 # Label text used for the warning details of message component.
 about-debugging-message-details-label-warning = Warning details
-
 # Label text used for default state of details of message component.
 about-debugging-message-details-label = Детаљи
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/client/boxmodel.properties firefox-85.0+build1/l10n/sr/devtools/client/boxmodel.properties
--- firefox-84.0.2+build1/l10n/sr/devtools/client/boxmodel.properties	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/client/boxmodel.properties	2021-01-18 20:08:38.000000000 +0000
@@ -24,6 +24,16 @@
 # for showing and collapsing the properties underneath the box model in the layout view
 boxmodel.propertiesLabel=Box Model Properties
 
+# LOCALIZATION NOTE (boxmodel.propertiesHideLabel):
+# This is the spoken label for the twisty.
+# If the properties are currently showing, it will say "Hide".
+boxmodel.propertiesHideLabel=Hide
+
+# LOCALIZATION NOTE (boxmodel.propertiesShowLabel):
+# This is the spoken label for the twisty.
+# If the properties are currently hidden, it will say "Show".
+boxmodel.propertiesShowLabel=Show
+
 # LOCALIZATION NOTE: (boxmodel.offsetParent) This label is displayed inside the list of
 # properties, below the box model, in the layout view. It is displayed next to the
 # position property, when position is absolute, relative, sticky. This label tells users
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/client/inspector.properties firefox-85.0+build1/l10n/sr/devtools/client/inspector.properties
--- firefox-84.0.2+build1/l10n/sr/devtools/client/inspector.properties	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/client/inspector.properties	2021-01-18 20:08:38.000000000 +0000
@@ -111,6 +111,10 @@
 #LOCALIZATION NOTE: Used in the tooltip for Capturing
 eventsTooltip.Capturing=Capturing
 
+# LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
+# displayed when hovering over the tabs overflow button.
+allTabsMenuButton.tooltip=Прикажи �ве језичке
+
 # LOCALIZATION NOTE (inspector.showThreePaneMode): This is the tooltip for the button
 # that toggles on the 3 pane inspector mode.
 inspector.showThreePaneMode=Toggle on the 3-pane inspector
@@ -503,6 +507,18 @@
 # when hovering over badges next to scrollable elements in the inspector.
 markupView.scrollableBadge.tooltip=This element has scrollable overflow.
 
+# LOCALIZATION NOTE (markupView.scrollableBadge.interactive.tooltip): This is the tooltip that is displayed
+# when hovering over interactive badges next to scrollable elements in the inspector.
+markupView.scrollableBadge.interactive.tooltip=Ова �тавка има прелив (overflow) који �е може померати. Кликните да би�те видели које �у �тавке криве за преливање.
+
+# LOCALIZATION NOTE (markupView.overflowBadge.label): This is the text displayed inside a
+# badge, in the inspector, next to nodes that are causing overflow in other elements.
+markupView.overflowBadge.label=overflow
+
+# LOCALIZATION NOTE (markupView.overflowBadge.tooltip): This is the tooltip that is displayed
+# when hovering over badges next to overflow causing elements in the inspector.
+markupView.overflowBadge.tooltip=Овај елемент узрокује преливање (overflow) другог елемента.
+
 # 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
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/client/layout.properties firefox-85.0+build1/l10n/sr/devtools/client/layout.properties
--- firefox-84.0.2+build1/l10n/sr/devtools/client/layout.properties	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/client/layout.properties	2021-01-18 20:08:38.000000000 +0000
@@ -9,6 +9,11 @@
 # no flex container or item is selected.
 flexbox.header=Flexbox
 
+# LOCALIZATION NOTE (flexbox.backButtonLabel): The spoken label for the button
+# that returns from the display of a flex item to the flex item list.
+# This label is spoken by screen readers, not displayed on screen.
+flexbox.backButtonLabel=Врати на Flex Container
+
 # LOCALIZATION (flexbox.flexContainer): The accordion header for the Flexbox panel
 # when a flex container is selected.
 flexbox.flexContainer=Flex Container
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/client/markers.properties firefox-85.0+build1/l10n/sr/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/sr/devtools/client/markers.properties	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/client/markers.properties	2021-01-18 20:08:38.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Low Memory
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=Cycle Collection Finished
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=Page Load Finished
 marker.gcreason.label.PAGE_HIDE=Moved to Background
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/sr/devtools/shared/styleinspector.properties firefox-85.0+build1/l10n/sr/devtools/shared/styleinspector.properties
--- firefox-84.0.2+build1/l10n/sr/devtools/shared/styleinspector.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/devtools/shared/styleinspector.properties	2021-01-18 20:08:38.000000000 +0000
@@ -145,6 +145,14 @@
 # toolbar that toggles color-scheme simulation.
 rule.colorSchemeSimulation.tooltip=Укључите/и�кључите �имулацију шеме боја за �траницу
 
+# LOCALIZATION NOTE (rule.twistyCollapse.label): The text a screen reader
+# speaks when the header of a rule is expanded.
+rule.twistyCollapse.label=Скупи
+
+# LOCALIZATION NOTE (rule.twistyExpand.label): The text a screen reader
+# speaks when the header of a rule is collapsed.
+rule.twistyExpand.label=Прошири
+
 # LOCALIZATION NOTE (styleinspector.contextmenu.copyColor): Text displayed in the rule
 # and computed view context menu when a color value was clicked.
 styleinspector.contextmenu.copyColor=Copy Color
diff -Nru firefox-84.0.2+build1/l10n/sr/dom/chrome/layout/htmlparser.properties firefox-85.0+build1/l10n/sr/dom/chrome/layout/htmlparser.properties
--- firefox-84.0.2+build1/l10n/sr/dom/chrome/layout/htmlparser.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/dom/chrome/layout/htmlparser.properties	2021-01-18 20:08:38.000000000 +0000
@@ -104,8 +104,10 @@
 errStartSelectWhereEndSelectExpected=Почетна ознака „select“ на крајњој ознаци.
 errStartTagWithSelectOpen=„%1$S“ почетна ознака �а отвореном ознаком „select“.
 errBadStartTagInHead2=Лоша почетна ознака „%1$S“ у „head“.
+errBadStartTagInNoscriptInHead=Почетна ознака “%1$S� у “noscript� у “head� је нетачна.
 errImage=�ађена је почетна ознака „image“.
 errFooSeenWhenFooOpen=�ађена почетна ознака „%1$S“ али је елемент и�тог типа већ отворен.
+errFooSeenWhenFooOpen2=Почетна ознака “%1$S� је пронађена, али је елемент и�тог типа већ отворен.
 errHeadingWhenHeadingOpen=Заглавље не може да буде уметнуто унутар другог заглавља.
 errFramesetStart=�ађена почетна ознака „frameset“.
 errNoCellToClose=�ема ћелије коју треба затворити.
diff -Nru firefox-84.0.2+build1/l10n/sr/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/sr/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/sr/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:08:38.000000000 +0000
@@ -7,6 +7,10 @@
 
 CertPassPromptDefault=Уне�ите вашу главну лозинку.
 
+CertPasswordPrompt=Уне�ите лозинку за PKCS#11 токен %S.
+
+CertPasswordPromptDefault=Уне�ите вашу главну лозинку.
+
 # The following strings have special requirements: they must fit in a 32 or 64
 # bytes buffer after being encoded to UTF-8.
 #
diff -Nru firefox-84.0.2+build1/l10n/sr/security/manager/security/certificates/certManager.ftl firefox-85.0+build1/l10n/sr/security/manager/security/certificates/certManager.ftl
--- firefox-84.0.2+build1/l10n/sr/security/manager/security/certificates/certManager.ftl	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/security/manager/security/certificates/certManager.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -4,183 +4,128 @@
 
 certmgr-title =
     .title = Менаџер �ертификата
-
 certmgr-tab-mine =
     .label = Ваши �ертификати
-
 certmgr-tab-remembered =
     .label = Одлуке о аутентификацији
-
 certmgr-tab-people =
     .label = Људи
-
 certmgr-tab-servers =
     .label = Сервери
-
 certmgr-tab-ca =
     .label = �уторитети
-
 certmgr-mine = Имате �ертификате ових организација које ва� идентификују
 certmgr-remembered = Ови �ертификати �е кори�те за вашу идентификацију на веб �траницама.
 certmgr-people = Имате �ертификате датотеке која идентификује ове људе
 certmgr-servers = Имате �ертификате датотеке која идентификује ове �ервере
+certmgr-server = Ови уно�и идентификују изузетке грешака �ертификата �ервера
 certmgr-ca = Имате �ертификате датотеке која идентификује ова �ертификациона тела
-
 certmgr-detail-general-tab-title =
     .label = О�новне по�тавке
     .accesskey = О
-
 certmgr-detail-pretty-print-tab-title =
     .label = Детаљи
     .accesskey = Д
-
 certmgr-pending-label =
     .value = Провера �ертификата је у току…
-
 certmgr-subject-label = Издато за
-
 certmgr-issuer-label = Издато од
-
 certmgr-period-of-validity = Период важења
-
 certmgr-fingerprints = Оти�ак кључа
-
 certmgr-cert-detail =
     .title = Детаљи �ертификата
     .buttonlabelaccept = Затвори
     .buttonaccesskeyaccept = З
-
 certmgr-cert-detail-commonname = Општи назив (CN)
-
 certmgr-cert-detail-org = Организација (O)
-
 certmgr-cert-detail-orgunit = Организациона јединица (OU)
-
 certmgr-cert-detail-serial-number = Сериј�ки број
-
 certmgr-cert-detail-sha-256-fingerprint = SHA-256 оти�ак кључа
-
 certmgr-cert-detail-sha-1-fingerprint = SHA1 оти�ак кључа
-
 certmgr-edit-ca-cert =
     .title = Измени по�тавке поверења �ертификационог тела
     .style = width: 48em;
-
 certmgr-edit-cert-edit-trust = Измени по�тавке поверења:
-
 certmgr-edit-cert-trust-ssl =
     .label = Овај �ертификат може да идентификује веб �ајтове.
-
 certmgr-edit-cert-trust-email =
     .label = Овај �ертификат може да идентификује кори�нике е-поште.
-
 certmgr-delete-cert =
     .title = Избриши �ертификат
     .style = width: 48em; height: 24em;
-
 certmgr-cert-host =
     .label = Хо�т
-
 certmgr-cert-name =
     .label = �азив �ертификата
-
 certmgr-cert-server =
     .label = Сервер
-
 certmgr-override-lifetime =
     .label = Животни век
-
 certmgr-token-name =
     .label = Безбедно�ни уређај
-
 certmgr-begins-on = Важи од
-
 certmgr-begins-label =
     .label = Важи од
-
 certmgr-expires-on = И�тиче
-
 certmgr-expires-label =
     .label = И�тиче
-
 certmgr-email =
     .label = �дре�а е-поште
-
 certmgr-serial =
     .label = Сериј�ки број
-
 certmgr-view =
     .label = Преглед…
     .accesskey = П
-
 certmgr-edit =
     .label = Уреди поверење…
     .accesskey = р
-
 certmgr-export =
     .label = Извоз…
     .accesskey = И
-
 certmgr-delete =
     .label = Уклони…
     .accesskey = к
-
 certmgr-delete-builtin =
     .label = Уклони или укини поверење…
     .accesskey = в
-
 certmgr-backup =
     .label = �рхивирај…
     .accesskey = �
-
 certmgr-backup-all =
     .label = �рхивирај �ве…
     .accesskey = �
-
 certmgr-restore =
     .label = Увоз…
     .accesskey = У
-
 certmgr-details =
     .value = Поља �ертификата
     .accesskey = П
-
 certmgr-fields =
     .value = Вредно�т поља
     .accesskey = Ð’
-
 certmgr-hierarchy =
     .value = Хијерархија �ертификата
     .accesskey = Х
-
 certmgr-add-exception =
     .label = Додај изузетак…
     .accesskey = Ñ‚
-
 exception-mgr =
     .title = Додавање безбедно�ног изузетка
-
 exception-mgr-extra-button =
     .label = Потврди безбедно�ни изузетак
     .accesskey = П
-
 exception-mgr-supplemental-warning = Легитимне банке, продавнице и други јавни �ајтови неће тражити да ово радите.
-
 exception-mgr-cert-location-url =
     .value = �дре�а:
-
 exception-mgr-cert-location-download =
     .label = Добави �ертификат
     .accesskey = Ð’
-
 exception-mgr-cert-status-view-cert =
     .label = Преглед…
     .accesskey = е
-
 exception-mgr-permanent =
     .label = Трајно �ачувај овај изузетак
     .accesskey = Т
-
 pk11-bad-password = Унешена лозинка није и�правна.
 pkcs12-decode-err = Грешка при дешифровању датотеке. Можда то није датотека PKCS#12 , датотека није у реду или унешена лозинка није и�правна.
 pkcs12-unknown-err-restore = �емогуће је обновити датотеку PKCS #12 из непознатог разлога.
@@ -213,24 +158,22 @@
     .title = Бри�ање �ертификата
 delete-user-cert-confirm = Да ли �игурно желите да уклоните ове �ертификате?
 delete-user-cert-impact = �ко избришете један од �ертификата, нећете бити у могућно�ти да �е пред�тавите.
-
-
 delete-ssl-cert-title =
     .title = Уклони изузетак о �ервер�ком �ертификату
 delete-ssl-cert-confirm = Да ли �игурно желите да уклоните ове �ервер�ке изузетке?
 delete-ssl-cert-impact = �ко уклоните �ервер�ки изузетак, враћате уобичајену проверу безбедно�ти за �ервер и захтевате да по�едује важећи �ертификат.
-
+delete-ssl-override-title =
+    .title = Избриши изузетак �ертификата �ервера
+delete-ssl-override-confirm = Да ли �те �игурни да желите да избришете овај изузетак �ервера?
+delete-ssl-override-impact = �ко избришете изузетак �ервера, онда вратите �тандардне безбедно�не провере за овај �ервер и захтевајте да кори�ти важећи �ертификат.
 delete-ca-cert-title =
     .title = Избриши или укини поверење �ертификационом телу
 delete-ca-cert-confirm = Захтевали �те да �е избришу ови �ертификати. За уграђене �ертификате, �ве дозволе и поверења ће бити уклоњени, што има и�ти ефекат. Желите ли да их избришете или укинете поверења?
 delete-ca-cert-impact = �ко избришете или укинете �ертификат �ертификационог тела (CA), ова апликација неће више веровати ни једном �ертификату који је тај издавач издао.
-
-
 delete-email-cert-title =
     .title = Избришите �ертификат е-поште
 delete-email-cert-confirm = Да ли �те �игурни да желите да избришете �ертификате е-поште за �ледеће кори�нике?
 delete-email-cert-impact = �ко уклоните �ертификат за е-пошту неке о�обе, више нећете моћи да јој шаљете е-пошту.
-
 # Used for semi-uniquely representing a cert.
 #
 # Variables:
@@ -246,29 +189,21 @@
 #   $certificate : a string representative of the certificate being viewed.
 cert-viewer-title =
     .title = Прегледач �ертификата: “{ $certName }�
-
 not-present =
     .value = <�ије део �ертификата>
-
 # Cert verification
 cert-verified = Сертификат је потврђен за �ледеће кори�нике:
-
 # Add usage
 verify-ssl-client =
     .value = SSL �ертификат клијента
-
 verify-ssl-server =
     .value = SSL �ертификат �ервера
-
 verify-ssl-ca =
     .value = SSL �ертификационо тело
-
 verify-email-signer =
     .value = Сертификат потпи�ника е-поште
-
 verify-email-recip =
     .value = Сертификат примаоца е-поште
-
 # Cert verification
 cert-not-verified-cert-revoked = Провера �ертификата није могућа зато што је отказана.
 cert-not-verified-cert-expired = Провера �ертификата није могућа зато што је рок трајања и�текао.
@@ -278,6 +213,15 @@
 cert-not-verified-ca-invalid = Провера �ертификата није могућа зато што је �ертификационо тело непо�тојеће.
 cert-not-verified_algorithm-disabled = Провера �ертификата није могућа зато што је алгоритам који �лужи за учитавање небезбедан.
 cert-not-verified-unknown = Провера �ертификата није могућа.
+# Used to indicate that the user chose not to send a client authentication certificate to a server that requested one in a TLS handshake.
+send-no-client-certificate = �е шаљи потврду клијента
+# Used when no cert is stored for an override
+no-cert-stored-for-override = (�ије �ачувано)
+
+## Used to show whether an override is temporary or permanent
+
+permanent-override = Трајно
+temporary-override = Привремено
 
 ## Add Security Exception dialog
 
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/sr/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/sr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:38.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=д;д;д
 
 downloadErrorAlertTitle=Грешка при преузимању
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Преузимање није могуће �ачувати јер га блокира %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Преузимање није могуће �ачувати јер га блокира проширење.
 downloadErrorGeneric=�е могу да �ачувам преузимање јер је дошло до непознате грешке.\n\nПокушајте поново.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=�еколико �екунди
 timeUnknown2=�епознато време
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S ре�ур�
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/sr/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/sr/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:08:38.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Прок�и �ервер је одбио везу
 check_error-2153390069=Сертификат �ервера је и�текао. �ко је ово нетачно, поде�ите �и�тем�ки датум и време
 check_error-verification_failed=�е могу да проверим целовито�т ажурирања
+check_error-move_failed=Припрема и�правке за ин�талацију није у�пела
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutHttpsOnlyError.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -9,14 +9,15 @@
 about-httpsonly-insecure-explanation-reasons = �ајвероватније је да �траница не подржава HTTPS, али такође је могуће да нападач блокира HTTPS верзију.
 about-httpsonly-insecure-explanation-exception = Иако је безбедно�ни ризик мали, ако �е одлучите да по�етите HTTP верзију �транице, најбоље је избегавати уношење о�етљивих података као што �у лозинке, адре�е е-поште или подаци о кредитној картици.
 about-httpsonly-button-make-exception = Прихватите ризик и на�тавите на �траницу
-about-httpsonly-title = { -brand-short-name } је открио потенцијални �игурно�ни проблем
-# Variables:
-#   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
-about-httpsonly-explanation-unavailable = Прегледате у HTTPS-Only режиму, а �игурна HTTPS верзија <em>{ $websiteUrl }</em> адре�е није до�тупна.
 about-httpsonly-title-alert = HTTPS-Only упозорење
 about-httpsonly-title-connection-not-available = Сигурна веза није до�тупна
+# Variables:
+#   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
+about-httpsonly-explanation-unavailable2 = Омогућили �те HTTPS-Only режим за већу �игурно�т, али HTTPS верзија није до�тупна за <em>{ $websiteUrl }</em>.
 about-httpsonly-explanation-question = Шта би могао бити узрок овоме?
 about-httpsonly-explanation-nosupport = �ајвероватније, �траница једно�тавно не подржава HTTPS.
 about-httpsonly-explanation-risk = Могуће је и да је уплетен нападач. �ко �е одлучите да по�етите ову �траницу, не треба да уно�ите о�етљиве податке као што �у лозинке, адре�е е-поште или подаци о кредитној картици.
-about-httpsonly-button-accept-and-continue = Прихватите ризик и на�тавите
+about-httpsonly-explanation-continue = �ко на�тавите, HTTPS-Only режим ће бити привремено и�кључен за овај �ајт.
+about-httpsonly-button-continue-to-site = �а�тавите на HTTP �ајт
 about-httpsonly-button-go-back = Иди назад
+about-httpsonly-link-learn-more = Сазнајте више…
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutMozilla.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutMozilla.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutMozilla.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -2,3 +2,10 @@
 # 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/.
 
+about-mozilla-title-6-27 = Књига о Mozilla-и, 6:27
+about-mozilla-quote-6-27 =
+    Звер је на�тавила �тудије �а обновљеним <em>фоку�ом</em>, правећи �јајна <em>референтна</em>
+    дела и размишљање о новим <em>�тварно�тима</em>. Звер је позвала �воје �ледбенике и
+    помагаче да �творе нову, мању верзију �ебе и да је, на <em>лукави</em> начин,
+    шире читавим �ветом.
+about-mozilla-from-6-27 = из <strong>Књиге о Mozilla-и,</strong> 6:27
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutNetworking.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutNetworking.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -6,6 +6,8 @@
 about-networking-http = HTTP
 about-networking-sockets = Sockets
 about-networking-dns = DNS
+about-networking-dns-clear-cache-button = Очи�ти DNS кеш
+about-networking-dns-trr-url = DoH адре�а
 about-networking-dns-suffix = DNS �уфик�
 about-networking-websockets = WebSockets
 about-networking-refresh = О�вежи
@@ -41,6 +43,7 @@
 about-networking-dns-lookup-button = Решити
 about-networking-dns-domain = Домен:
 about-networking-dns-lookup-table-column = IP адре�е
+about-networking-dns-https-rr-lookup-table-column = HTTP RRs
 about-networking-rcwn = RCWN �тати�тика
 about-networking-rcwn-status = RCWN �тање
 about-networking-rcwn-cache-won-count = Кеш је победио
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -7,7 +7,6 @@
     Ова �траница �адржи техничке податке који могу бити кори�ни када
     покушавате да решите неки проблем. �ко вам требају одговори на че�то по�тављана питања
     о програму { -brand-short-name }, прегледајте наш <a data-l10n-name="support-link">веб �ајт за подршку</a>.
-
 crashes-title = Извештаји о рушењу
 crashes-id = ID извештаја
 crashes-send-date = Подне�ено
@@ -63,12 +62,16 @@
 app-basics-build-config = Конфигурација изградње
 app-basics-user-agent = Кори�ник
 app-basics-os = ОС
+# Rosetta is Apple's translation process to run apps containing x86_64
+# instructions on Apple Silicon. This should remain in English.
+app-basics-rosetta = Rosetta Translated
 app-basics-memory-use = Меморија
 app-basics-performance = Перформан�е
 app-basics-service-workers = Реги�тровани Service Workers
 app-basics-profiles = Профили
 app-basics-launcher-process-status = Покретачки проце�
 app-basics-multi-process-support = Вишепроце�ор�ки прозори
+app-basics-fission-support = Прозори фи�ије
 app-basics-remote-processes-count = Удаљени проце�и
 app-basics-enterprise-policies = Поли�е предузећа
 app-basics-location-service-key-google = Google кључ за у�луге локације
@@ -81,6 +84,9 @@
         [windows] Отвори фа�циклу
        *[other] Отвори фа�циклу
     }
+environment-variables-title = Варијабле окружења
+environment-variables-name = �азив
+environment-variables-value = Вредно�т
 experimental-features-title = Ек�перименталне функције
 experimental-features-name = �азив
 experimental-features-value = Вредно�т
@@ -127,7 +133,6 @@
 sandbox-sys-call-args = �ргументи
 safe-mode-title = Покушај безбедни режим
 restart-in-safe-mode-label = Ре�тартуј �а онемогућеним додацима…
-
 clear-startup-cache-title = Покушајте да избришете предмеморију покретања
 clear-startup-cache-label = Избриши предмеморију покретања…
 startup-cache-dialog-title = Избриши предмеморију покретања
@@ -183,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Модули незави�них произвођача
+support-third-party-modules-module = Датотека модула
+support-third-party-modules-version = Верзија датотеке
+support-third-party-modules-vendor = Информације о добављачу
+support-third-party-modules-occurrence = Уче�тало�т
+support-third-party-modules-process = Тип проце�а и ID
+support-third-party-modules-thread = �ит
+support-third-party-modules-base = Imagebase адре�а
+support-third-party-modules-uptime = Трајање проце�а (ms)
+support-third-party-modules-duration = Трајање учитавања (ms)
+support-third-party-modules-empty = �и�у учитани модули незави�них произвођача.
+support-third-party-modules-no-value = (Без вредно�ти)
+support-third-party-modules-button-open =
+    .title = Отвори локацију датотеке…
+support-third-party-modules-expand =
+    .title = Прикажи детаљне информације
+support-third-party-modules-collapse =
+    .title = Сакриј детаљне информације
+support-third-party-modules-unsigned-icon =
+    .title = Овај модул није потпи�ан
+support-third-party-modules-folder-icon =
+    .title = Отвори локацију датотеке…
+support-third-party-modules-down-icon =
+    .title = Прикажи детаљне информације
+support-third-party-modules-up-icon =
+    .title = Сакриј детаљне информације
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -191,7 +222,6 @@
         [few] Извештаји о рушењу у по�ледња { $days } дана
        *[other] Извештаји о рушењу у по�ледњих { $days } дана
     }
-
 # Variables
 # $minutes (integer) - Number of minutes since crash
 crashes-time-minutes =
@@ -200,7 +230,6 @@
         [few] Пре { $minutes } минута
        *[other] Пре { $minutes } минута
     }
-
 # Variables
 # $hours (integer) - Number of hours since crash
 crashes-time-hours =
@@ -209,7 +238,6 @@
         [few] Пре { $hours } �ата
        *[other] Пре { $hours } �ати
     }
-
 # Variables
 # $days (integer) - Number of days since crash
 crashes-time-days =
@@ -218,7 +246,6 @@
         [few] Пре { $days } дана
        *[other] Пре { $days } дана
     }
-
 # Variables
 # $reports (integer) - Number of pending reports
 pending-reports =
@@ -227,7 +254,6 @@
         [few] Сви извештаји о рушењу(укључујући { $reports } који чекају да буду по�лати)
        *[other] Сви извештаји о рушењу(укључујући { $reports } који чекају да буду по�лати)
     }
-
 raw-data-copied = Подаци копирани у бележницу
 text-copied = Тек�т копиран у бележницу
 
@@ -240,11 +266,9 @@
 # Variables
 # $driverVersion - The graphics driver version string
 try-newer-driver = Блокирано за верзију драјвера графике коју имате. Покушајте да ажурирате управљачки програм на верзију { $driverVersion } или новију.
-
 # "ClearType" is a proper noun and should not be translated. Feel free to leave English strings if
 # there are no good translations, these are only used in about:support
 clear-type-parameters = ClearType параметри
-
 compositing = Са�тављање
 hardware-h264 = Hardware H264 декодирање
 main-thread-no-omtc = главна нит, без OMTC
@@ -259,7 +283,6 @@
 
 found = Пронађено
 missing = �едо�таје
-
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = Опи�
@@ -283,25 +306,20 @@
 webgl2-driver-extensions = WebGL 2 ек�тензија драјвера
 webgl2-extensions = WebGL 2 ек�тензије
 blocklisted-bug = �а црној ли�ти због познатих проблема
-
 # Variables
 # $bugNumber (string) - String of bug number from Bugzilla
 bug-link = грешка { $bugNumber }
-
 # Variables
 #   $bugNumber (string) - Bug number on Bugzilla
 support-blocklisted-bug = Блокирано због познатих проблема: <a data-l10n-name="bug-link">bug { $bugNumber }</a>
-
 # Variables
 # $failureCode (string) - String that can be searched in the source tree.
 unknown-failure = �а црној ли�ти; код грешке { $failureCode }
-
 d3d11layers-crash-guard = D3D11 композитор
 d3d11video-crash-guard = D3D11 видео декодер
 d3d9video-crash-guard = D3D9 видео декодер
 glcontext-crash-guard = OpenGL
 wmfvpxvideo-crash-guard = WMF VPX видео декодер
-
 reset-on-next-restart = Ре�етуј при �ледећем покретању
 gpu-process-kill-button = Уга�и GPU проце�
 gpu-device-reset = Поновно покретање уређаја
@@ -311,10 +329,8 @@
 off-main-thread-paint-enabled = �ит за �ликање омогућена
 off-main-thread-paint-worker-count = Thread Painting Worker бројач
 target-frame-rate = Циљана брзина о�вежавања тј. Framerate
-
 min-lib-versions = Очекивано минимално издање
 loaded-lib-versions = Издање у употреби
-
 has-seccomp-bpf = Seccomp-BPF (Си�тем�ко филтрирање позива)
 has-seccomp-tsync = Seccomp �инхронизација нити
 has-user-namespaces = Имен�ки про�тор кори�ника
@@ -327,18 +343,15 @@
 sandbox-proc-type-file = �адржај дадотеке
 sandbox-proc-type-media-plugin = медија прикључак
 sandbox-proc-type-data-decoder = декодер података
-
 startup-cache-title = Кеш покретања
 startup-cache-disk-cache-path = Путања до ди�ковног кеша
 startup-cache-ignore-disk-cache = Игноришите ди�ковни кеш
 startup-cache-found-disk-cache-on-init = Ди�ковни кеш пронађен током иницијализације
 startup-cache-wrote-to-disk-cache = Запи�ано у ди�ковни кеш
-
 launcher-process-status-0 = Омогућено
 launcher-process-status-1 = Онемогућено због грешке
 launcher-process-status-2 = Онемогућен �илом
 launcher-process-status-unknown = �епознат �тату�
-
 # Variables
 # $remoteWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
@@ -351,7 +364,20 @@
 multi-process-status-7 = Онемогућено од �тране додатака
 multi-process-status-8 = При�илно онемогућено
 multi-process-status-unknown = �епознат �тату�
-
+# Variables
+# $fissionWindows (integer) - Number of remote windows
+# $totalWindows (integer) - Number of total windows
+fission-windows = { $fissionWindows }/{ $totalWindows }
+fission-status-experiment-control = Онемогућио ек�перимент
+fission-status-experiment-treatment = Омогућио ек�перимент
+fission-status-disabled-by-e10s-env = Онемогућило окружење
+fission-status-enabled-by-env = Омогућило окружење
+fission-status-disabled-by-safe-mode = Онемогућио �игурни режим
+fission-status-enabled-by-default = Подразумевано омогућено
+fission-status-disabled-by-default = Подразумевано онемогућено
+fission-status-enabled-by-user-pref = Омогућио кори�ник
+fission-status-disabled-by-user-pref = Онемогућио кори�ник
+fission-status-disabled-by-e10s-other = E10s онемогућен
 async-pan-zoom = ��инхроно кретање/увеличавање
 apz-none = нема
 wheel-enabled = уно� точкића омогућен
@@ -372,3 +398,12 @@
 policies-inactive = �еактивно
 policies-active = �ктивно
 policies-error = Грешка
+
+## Printing section
+
+support-printing-title = Штампање
+support-printing-troubleshoot = Отклањање грешака
+support-printing-clear-settings-button = Обриши �ачувана подешавања штампања
+support-printing-modified-settings = Измењена подешавања штампања
+support-printing-prefs-name = �азив
+support-printing-prefs-value = Вредно�т
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/about/certviewer.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -81,8 +81,7 @@
 certificate-viewer-certificate-policies = Сертификационе политике
 certificate-viewer-embedded-scts = Уграђени SCTs
 certificate-viewer-crl-endpoints = Крајње тачке CRL-а
-
-# This message is used as a row header in the Miscellaneous section. 
+# This message is used as a row header in the Miscellaneous section.
 # The associated data cell contains links to download the certificate.
 certificate-viewer-download = Преузми
 # This message is used to replace boolean values (true/false) in several certificate fields, e.g. Certificate Authority
@@ -101,13 +100,17 @@
     .download = { $fileName }.pem
 certificate-viewer-download-pem-chain = PEM (ланац)
     .download = { $fileName }-chain.pem
-
 # The title attribute for Critical Extension icon
 certificate-viewer-critical-extension =
     .title = Ово проширење је означено као критично, што значи да би купци требало да одбаце �ертификат ако га не разумеју.
 certificate-viewer-export = Извоз
     .download = { $fileName }.pem
 
+##
+
+# Label for a tab where we haven't found a better label:
+certificate-viewer-unknown-group-label = (непознато)
+
 ## Labels for tabs displayed in stand-alone about:certificate page
 
 certificate-viewer-tab-mine = Ваши �ертификати
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 11:57:03.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> жели да отвори <strong>{ $scheme }</strong> везу.
 
 ## Permission Dialog
 ## Variables:
@@ -17,11 +9,49 @@
 ##  $scheme - the type of link that's being opened.
 ##  $appName - Name of the application that will be opened.
 
+permission-dialog-description = Дозволити овој �траници да отвори { $scheme } везу?
+permission-dialog-description-file = Дозволити овој датотеци да отвори { $scheme } везу?
+permission-dialog-description-host = Дозволити { $host } да отвори { $scheme } везу?
+permission-dialog-description-app = Дозволити овој �траници да отвори { $scheme } везу преко { $appName }?
+permission-dialog-description-host-app = Дозволити { $host } да отвори { $scheme } везу преко { $appName }?
+permission-dialog-description-file-app = Дозволити овој датотеци да отвори { $scheme } везу преко { $appName }?
+
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+permission-dialog-remember = Увек дозволи <strong>{ $host }</strong> да отвори <strong>{ $scheme }</strong> везе
+permission-dialog-remember-file = Увек дозволи овој датотеци да отвори <strong>{ $scheme }</strong> везе
+
+##
+
+permission-dialog-btn-open-link =
+    .label = Отвори везу
+    .accessKey = O
+permission-dialog-btn-choose-app =
+    .label = Изабери апликацију
+    .accessKey = A
+permission-dialog-unset-description = Мораћете да изабере апликацију.
+permission-dialog-set-change-app-link = Изаберите неку другу апликацију.
 
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-window =
+    .title = Изабери апликацију
+    .style = min-width: 26em; min-height: 26em;
+chooser-dialog =
+    .buttonlabelaccept = Отвори везу
+    .buttonaccesskeyaccept = O
+chooser-dialog-description = Изаберите апликацију за отварање { $scheme } везе.
+# Please keep the emphasis around the scheme (ie the `<strong>` HTML tags).
+chooser-dialog-remember = Увек кори�ти ову апликацију за отварање <strong>{ $scheme }</strong> веза
+chooser-dialog-remember-extra =
+    { PLATFORM() ->
+        [windows] Ово �е може променити у { -brand-short-name } опцијама.
+       *[other] Ово �е може променити у { -brand-short-name } подешавањима.
+    }
 choose-other-app-description = Избор друге апликације
 choose-app-btn =
     .label = Избор…
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/global/videocontrols.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/global/videocontrols.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/global/videocontrols.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/global/videocontrols.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -1,3 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+videocontrols-scrubber =
+    .aria-label = Положај
+# This label is used by screenreaders and other assistive technology to indicate
+# to users how much of the video has been loaded from the network. It will be
+# followed by the percentage of the video that has loaded (e.g. "Loading: 13%").
+videocontrols-buffer-bar-label = Учитано:
+videocontrols-volume-control =
+    .aria-label = Јачина звука
+videocontrols-closed-caption-button =
+    .aria-label = Титл
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Страница:
     .accesskey = С
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } од { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = По�ледња �траница
-
+printpreview-homearrow-button =
+    .title = Прва �траница
+printpreview-previousarrow-button =
+    .title = Претходна �траница
+printpreview-nextarrow-button =
+    .title = Следећа �траница
+printpreview-endarrow-button =
+    .title = По�ледња �траница
diff -Nru firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/sr/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/sr/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:57:04.000000000 +0000
+++ firefox-85.0+build1/l10n/sr/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:38.000000000 +0000
@@ -2,3 +2,110 @@
 # 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/.
 
+printui-title = Штампај
+# Dialog title to prompt the user for a filename to save print to PDF.
+printui-save-to-pdf-title = Сачувај као
+# Variables
+# $sheetCount (integer) - Number of paper sheets
+printui-sheets-count =
+    { $sheetCount ->
+        [one] { $sheetCount } ли�т папира
+        [few] { $sheetCount } ли�та папира
+       *[other] { $sheetCount } ли�това папира
+    }
+printui-page-range-all = Све
+printui-page-range-custom = Прилагођено
+printui-page-range-label = Странице
+printui-page-range-picker =
+    .aria-label = Изабери оп�ег �траница
+printui-page-custom-range =
+    .aria-label = Уне�и прилагођени оп�ег �траница
+# This label is displayed before the first input field indicating
+# the start of the range to print.
+printui-range-start = Од
+# This label is displayed between the input fields indicating
+# the start and end page of the range to print.
+printui-range-end = до
+printui-page-custom-range-input =
+    .aria-label = Уне�и прилагођени оп�ег �траница
+    .placeholder = нпр. 2-6, 9, 12-16
+# Section title for the number of copies to print
+printui-copies-label = Копије
+printui-orientation = Положај
+printui-landscape = Водоравно
+printui-portrait = У�правно
+# Section title for the printer or destination device to target
+printui-destination-label = Одредиште
+printui-destination-pdf-label = Сачувај у PDF-у
+printui-more-settings = Више подешавања
+printui-less-settings = Мање подешавања
+printui-paper-size-label = Величина папира
+# Section title (noun) for the print scaling options
+printui-scale = Размера
+printui-scale-fit-to-page-width = Прилагоди ширини �транице
+# Label for input control where user can set the scale percentage
+printui-scale-pcent = Размера
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = Дво�трано штампање
+printui-duplex-checkbox = Штампај на обе �транице
+# Section title for miscellaneous print options
+printui-options = Опције
+printui-headers-footers-checkbox = Штампај заглавља и подножја
+printui-backgrounds-checkbox = Штампај позадине
+printui-selection-checkbox = Штампај �амо изабрано
+printui-color-mode-label = Режим боје
+printui-color-mode-color = У боји
+printui-color-mode-bw = Црно-бело
+printui-margins = Маргине
+printui-margins-default = Подразумевано
+printui-margins-min = Минимално
+printui-margins-none = �икако
+printui-margins-custom = Прилагођено
+printui-margins-custom-inches = Прилагођено (инчи)
+printui-margins-custom-top = Врх
+printui-margins-custom-top-inches = Врх (инчи)
+printui-margins-custom-bottom = Дно
+printui-margins-custom-bottom-inches = Дно (инчи)
+printui-margins-custom-left = Лево
+printui-margins-custom-left-inches = Лево (инчи)
+printui-margins-custom-right = Де�но
+printui-margins-custom-right-inches = Де�но (инчи)
+printui-system-dialog-link = Штампај помоћу �и�тем�ког дијалога…
+printui-primary-button = Штампај
+printui-primary-button-save = Сачувај
+printui-cancel-button = Откажи
+printui-close-button = Затвори
+printui-loading = Припрема прегледа
+# Reported by screen readers and other accessibility tools to indicate that
+# the print preview has focus.
+printui-preview-label =
+    .aria-label = Преглед пре штампе
+printui-pages-per-sheet = Страница по ли�ту
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Штампам…
+
+## Paper sizes that may be supported by the Save to PDF destination:
+
+printui-paper-a5 = A5
+printui-paper-a4 = A4
+printui-paper-a3 = A3
+printui-paper-a2 = A2
+printui-paper-a1 = A1
+printui-paper-a0 = A0
+printui-paper-b5 = B5
+printui-paper-b4 = B4
+printui-paper-jis-b5 = JIS-B5
+printui-paper-jis-b4 = JIS-B4
+printui-paper-letter = С�Д пи�мо
+printui-paper-legal = С�Д правни
+printui-paper-tabloid = Таблоид
+
+## Error messages shown when a user has an invalid input
+
+printui-error-invalid-scale = Мера мора бити број између 10 и 200.
+printui-error-invalid-margin = Уне�ите важећу маргину за изабрану величину папира.
+# Variables
+# $numPages (integer) - Number of pages
+printui-error-invalid-range = Мера мора бити број између 1 и { $numPages }.
+printui-error-invalid-start-overflow = Број �транице “од� мора бити мањи од броја �транице “до�.
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/aboutLogins.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/aboutLogins.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Ta bort denna inloggning?
 confirm-delete-dialog-message = Den här åtgärden kan inte ångras.
 about-logins-confirm-remove-dialog-confirm-button = Ta bort
-about-logins-confirm-remove-all-dialog-confirm-button = Ta bort alla
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Ta bort
+        [one] Ta bort
+       *[other] Ta bort alla
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Ja, ta bort den här inloggningen
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Exportera inloggningar och lösenord
 about-logins-confirm-export-dialog-message = Dina lösenord sparas som läsbar text (t.ex. BadP@ssw0rd) så att alla som kan öppna den exporterade filen kan se dem.
 about-logins-confirm-export-dialog-confirm-button = Exportera…
+about-logins-alert-import-title = Import slutförd
+about-logins-alert-import-message = Visa detaljerad importöversikt
 confirm-discard-changes-dialog-title = Ignorera dessa förändringar?
 confirm-discard-changes-dialog-message = Alla ändringar som inte är sparade kommer att gå förlorade.
 confirm-discard-changes-dialog-confirm-button = Ignorera
@@ -262,3 +269,30 @@
         [macos] CSV-dokument
        *[other] CSV-fil
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Import slutförd
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span data-l10n-name="count">{ $count }</span><span>ny inloggning tillagd</span>
+       *[other] <span data-l10n-name="count">{ $count }</span><span>nya inloggningar tillagda</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span data-l10n-name="count">{ $count }</span><span>befintlig inloggning uppdaterad</span>
+       *[other] <span data-l10n-name="count">{ $count }</span><span>befintliga inloggningar uppdaterade</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+        [one] <span data-l10n-name="count">{ $count }</span><span>duplicerad inloggning hittades</span><span data-l10n-name="meta">(ej importerad)</span>
+       *[other] <span data-l10n-name="count">{ $count }</span><span>duplicerad inloggningar hittades</span><span data-l10n-name="meta">(ej importerade)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span data-l10n-name="count">{ $count }</span><span>fel</span><span data-l10n-name="meta">(ej importerad)</span>
+       *[other] <span data-l10n-name="count">{ $count }</span><span>fel</span><span data-l10n-name="meta">(ej importerade)</span>
+    }
+about-logins-import-dialog-done = Klar
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/appmenu.ftl	2021-01-06 11:59:06.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/appmenu.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Nytt fönster
+appmenuitem-new-private-window =
+    .label = Nytt privat fönster
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Zooma in
 appmenuitem-zoom-reduce =
     .label = Zooma ut
+appmenuitem-fullscreen =
+    .label = Helskärm
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Synka nu
+appmenuitem-save-page =
+    .label = Spara sida som…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Vad är nytt
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/appMenuNotifications.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Inte nu
     .secondarybuttonaccesskey = n
 appmenu-update-restart-message = Efter en snabb omstart, kommer { -brand-shorter-name } att återställa alla dina öppna flikar och fönster som inte är i privat surfläge.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } kan inte uppdateras automatiskt till den senaste versionen.
+    .buttonlabel = Uppdatera { -brand-shorter-name } ändå
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Inte nu
+    .secondarybuttonaccesskey = n
+appmenu-update-other-instance-message = En ny { -brand-shorter-name }-uppdatering är tillgänglig, men den kan inte installeras eftersom en annan kopia av { -brand-shorter-name } körs. Stäng den för att fortsätta uppdateringen eller välj att uppdatera ändå (den andra kopian kanske inte fungerar korrekt förrän du startar om den).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Ok, jag förstår
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/browser.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/browser.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/browser.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> har kontroll över pekaren. Tryck på Esc för att ta tillbaka kontrollen.
 pointerlock-warning-no-domain = Detta dokument har kontroll över pekaren. Tryck på Esc för att ta tillbaka kontrollen.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Visa alla bokmärken
+bookmarks-recent-bookmarks =
+    .value = Nyligen bokmärkt
+bookmarks-toolbar-chevron =
+    .tooltiptext = Visa fler bokmärken
+bookmarks-sidebar-content =
+    .aria-label = Bokmärken
+bookmarks-menu-button =
+    .label = Bokmärkesmeny
+bookmarks-other-bookmarks-menu =
+    .label = Andra bokmärken
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobila bokmärken
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Dölj sidofältet Bokmärken
+           *[other] Visa sidofältet Bokmärken
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Dölj bokmärkesfältet
+           *[other] Visa bokmärkesfältet
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ta bort bokmärkesmeny från verktygsfältet
+           *[other] Lägg till bokmärkesmeny till verktygsfältet
+        }
+bookmarks-search =
+    .label = Sök bokmärken
+bookmarks-tools =
+    .label = Verktyg för bokmärken
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bokmärkesfältet
+    .accesskey = B
+    .aria-label = Bokmärken
+bookmarks-toolbar-menu =
+    .label = Bokmärkesfältet
+bookmarks-toolbar-placeholder =
+    .title = Bokmärkesfältsposter
+bookmarks-toolbar-placeholder-button =
+    .label = Bokmärkesfältsposter
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Bokmärken
+library-bookmarks-bookmark-this-page =
+    .label = Bokmärk denna sida
+library-bookmarks-bookmark-edit =
+    .label = Redigera bokmärket
+library-recent-activity-label = Senaste aktivitet
+
+## More items
+
+more-menu-go-offline =
+    .label = Arbeta nedkopplad
+    .accesskey = b
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/newtab/asrouter.ftl	2021-01-06 11:59:06.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/newtab/asrouter.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -126,6 +126,9 @@
 
 cfr-whatsnew-searchbar-title = Skriv mindre, hitta mer med adressfältet
 cfr-whatsnew-searchbar-body-topsites = Välj adressfältet och en ruta kommer att utvidgas med länkar till dina mest besökta webbplatser.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Förstoringsglasikonen
 
 ## Picture-in-Picture
@@ -281,3 +284,13 @@
 
 cfr-whatsnew-search-shortcuts-header = Sökgenvägar i adressfältet
 cfr-whatsnew-search-shortcuts-body = När du nu skriver en sökmotor eller specifik webbplats i adressfältet visas en blå genväg i sökförslagen nedan. Välj den genvägen för att slutföra din sökning direkt från adressfältet.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Skydd mot skadliga superkakor
+cfr-whatsnew-supercookies-body = Webbplatser kan i hemlighet lägga till en "superkaka" i din webbläsare som kan följa dig runt på nätet, även efter att du har rensat dina kakor. { -brand-short-name } ger nu starkt skydd mot superkakor så att de inte kan användas för att spåra dina onlineaktiviteter från en webbplats till en annan.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Bättre bokmärkning
+cfr-whatsnew-bookmarking-body = Det är lättare att hålla koll på dina favoritsidor. { -brand-short-name } kommer nu ihåg din önskade plats för sparade bokmärken, visar bokmärkesverktygsfältet som standard på nya flikar och ger dig enkel åtkomst till resten av dina bokmärken via en verktygsfältmapp.
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/newtab/newtab.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Ny flik
 newtab-settings-button =
     .title = Anpassa sidan för Ny flik
+newtab-personalize-button-label = Anpassa
+    .title = Anpassa ny flik
+    .aria-label = Anpassa ny flik
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Sök på webben
     .title = Sök på webben
     .aria-label = Sök på webben
+newtab-search-box-text = Sök på webben
+newtab-search-box-input =
+    .placeholder = Sök på webben
+    .aria-label = Sök på webben
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Lägg till sökmotor
 newtab-topsites-add-topsites-header = Ny mest besökt
+newtab-topsites-add-shortcut-header = Ny genväg
 newtab-topsites-edit-topsites-header = Redigera mest besökta
+newtab-topsites-edit-shortcut-header = Redigera genväg
 newtab-topsites-title-label = Titel
 newtab-topsites-title-input =
     .placeholder = Ange en titel
@@ -207,3 +216,27 @@
 
 newtab-error-fallback-info = Oj, något gick fel när innehållet skulle laddas.
 newtab-error-fallback-refresh-link = Uppdatera sidan för att försöka igen.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Genvägar
+newtab-custom-shortcuts-subtitle = Webbplatser du sparar eller besöker
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } rad
+       *[other] { $num } rader
+    }
+newtab-custom-sponsored-sites = Sponsrade genvägar
+newtab-custom-pocket-title = Rekommenderas av { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Särskilt innehåll valt av { -pocket-brand-name }, en del av familjen { -brand-product-name }
+newtab-custom-pocket-sponsored = Sponsrade nyheter
+newtab-custom-recent-title = Senaste aktivitet
+newtab-custom-recent-subtitle = Ett urval av senaste webbplatser och innehåll
+newtab-custom-close-button = Stäng
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Kort information
+newtab-custom-snippets-subtitle = Tips och nyheter från { -vendor-short-name } och { -brand-product-name }
+newtab-custom-settings = Hantera fler inställningar
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/places.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/places.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/places.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Undermapp
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Andra bokmärken
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/preferences/preferences.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = Sidorna du besöker mest
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsrade toppwebbplatser
+home-prefs-shortcuts-header =
+    .label = Genvägar
+home-prefs-shortcuts-description = Webbplatser du sparar eller besöker
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsrade genvägar
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = Rekommenderas av { $provider }
 home-prefs-recommended-by-description-update = Exceptionellt innehåll från hela internet, sammanställt av { $provider }
+home-prefs-recommended-by-description-new = Särskilt innehåll valt av { $provider }, en del av familjen { -brand-product-name }
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsrade nyheter
 home-prefs-highlights-header =
     .label = Höjdpunkter
-home-prefs-recent-activity-header =
-    .label = Senaste aktivitet
 home-prefs-highlights-description = Ett urval av sidor du har sparat eller besökt
 home-prefs-highlights-option-visited-pages =
     .label = Besökta sidor
@@ -526,6 +530,9 @@
     .label = Senaste nedladdning
 home-prefs-highlights-option-saved-to-pocket =
     .label = Sidor sparade till { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Senaste aktivitet
+home-prefs-recent-activity-description = Ett urval av senaste webbplatser och innehåll
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Kort information
 home-prefs-snippets-description = Uppdateringar från { -vendor-short-name } och { -brand-product-name }
+home-prefs-snippets-description-new = Tips och nyheter från { -vendor-short-name } och { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Öppna flikar
     .accesskey = Ö
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Genvägar
+    .accesskey = G
 addressbar-locbar-topsites-option =
     .label = Mest besökta
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Sökmotorer
+    .accesskey = m
 addressbar-suggestions-settings = Ändra inställningar för förslag från sökmotorn
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/sv-SE/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Endast på ny flik
     .accesskey = E
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Visa alltid
+    .accesskey = V
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Visa aldrig
+    .accesskey = d
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Visa endast på ny flik
+    .accesskey = e
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Visa andra bokmärken
     .accesskey = n
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/devtools/client/markers.properties firefox-85.0+build1/l10n/sv-SE/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/sv-SE/devtools/client/markers.properties	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/devtools/client/markers.properties	2021-01-18 20:08:45.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=LÃ¥gt minne
 marker.gcreason.label.CC_WAITING=Tvingad av cykel-insamling
+marker.gcreason.label.CC_FINISHED=Cykel-insamling avslutad
 marker.gcreason.label.CC_FORCED=Tvingad av cykel-insamling
 marker.gcreason.label.LOAD_END=Sidladdning slutförd
 marker.gcreason.label.PAGE_HIDE=Flyttad till bakgrunden
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Sophämtning stacken
-
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/devtools/client/toolbox.properties firefox-85.0+build1/l10n/sv-SE/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/sv-SE/devtools/client/toolbox.properties	2021-01-06 11:59:06.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/devtools/client/toolbox.properties	2021-01-18 20:08:45.000000000 +0000
@@ -59,7 +59,7 @@
 # LOCALIZATION NOTE (toolbox.viewCssSourceInStyleEditor.label)
 # Used as a message in either tooltips or contextual menu items to open the
 # corresponding URL as a css file in the Style-Editor tool.
-# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditor is used.
+# DEV NOTE: Mostly used wherever toolbox.viewSourceInStyleEditorByXX is used.
 toolbox.viewCssSourceInStyleEditor.label=Öppna fil i stileditor
 
 # LOCALIZATION NOTE (toolbox.viewJsSourceInDebugger.label)
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Stäng utvecklarverktygen
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Visa delad konsol
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/sv-SE/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/devtools/client/tooltips.ftl	2021-01-06 11:59:06.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/devtools/client/tooltips.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> har ingen effekt på detta element eftersom det inte är ett positionerat element.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> har ingen effekt på detta element eftersom <strong>overflow:hidden</strong> inte är satt.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> påverkar inte detta element eftersom dess <strong>outline-style</strong> är <strong>auto</strong> eller <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> har ingen effekt på interna tabellelement.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> har ingen effekt på interna tabellelement utom tabellceller.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Försök ta bort <strong>float</strong> eller lägga till <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Försök ställa in egenskapen <strong>position</strong> till något annat än <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Försök att lägga till <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Prova att ställa in egenskapen <strong>display</strong> till något annat än <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> eller <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Prova att ställa in egenskapen <strong>display</strong> till något annat än <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong> eller <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Försök att ställa in egenskapen <strong>outline-style</strong> till något annat än <strong>auto</strong> eller <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/sv-SE/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/sv-SE/dom/chrome/dom/dom.properties	2021-01-06 11:59:06.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/dom/chrome/dom/dom.properties	2021-01-18 20:08:45.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=<input>-väljaren blockerades på grund av brist på användaraktivering.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe med externt protokoll blockerades på grund av avsaknad av användaraktivering eller eftersom det inte har gått tillräckligt med tid sedan den senaste iframe laddades.
 MultiplePopupsBlockedNoUserActivation=Öppning av flera popup-fönster blockerades på grund av brist på användaraktivering.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Förladdning av %S ignorerades på grund av okända "as"- eller "type"-värden eller att "media"-attributet inte matchade.
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/sv-SE/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:45.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Filhämtningsfel
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Nedladdningen kan inte sparas eftersom den blockeras av %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Nedladdningen kan inte sparas eftersom den blockeras av ett tillägg.
 downloadErrorGeneric=Filhämtningen kan inte sparas eftersom ett okänt fel har uppstått.\n\nFörsök igen.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
@@ -93,7 +99,7 @@
 timeFewSeconds2=NÃ¥gra sekunder kvar
 timeUnknown2=Okänd tid kvar
 
-# LOCALIZATION NOTE (doneScheme): #1 URI scheme like data: jar: about:
+# LOCALIZATION NOTE (doneScheme2): #1 URI scheme like data: jar: about:
 doneScheme2=%1$S-resurs
 # LOCALIZATION NOTE (doneFileScheme): Special case of doneScheme for file:
 # This is used as an eTLD replacement for local files, so make it lower case
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/sv-SE/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:08:45.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Proxyservern avvisade anslutningen
 check_error-2153390069=Servercertifikatet har förfallit (justera systemklockan till rätt datum och tid ifall den är felaktig)
 check_error-verification_failed=Integriteten hos uppdateringen kunde inte verifieras
+check_error-move_failed=Det gick inte att förbereda uppdateringen för installation
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Tredjepartsmoduler
+support-third-party-modules-module = Modulfil
+support-third-party-modules-version = Filversion
+support-third-party-modules-vendor = Leverantörsinformation
+support-third-party-modules-occurrence = Förekomster
+support-third-party-modules-process = Processtyp & ID
+support-third-party-modules-thread = Tråd
+support-third-party-modules-base = Bildbaserad adress
+support-third-party-modules-uptime = Processdrifttid (ms)
+support-third-party-modules-duration = Laddningstid (ms)
+support-third-party-modules-empty = Inga tredjepartsmoduler laddades.
+support-third-party-modules-no-value = (Inget värde)
+support-third-party-modules-button-open =
+    .title = Öppna filplats…
+support-third-party-modules-expand =
+    .title = Visa detaljerad information
+support-third-party-modules-collapse =
+    .title = Dölj detaljerad information
+support-third-party-modules-unsigned-icon =
+    .title = Denna modul är inte signerad
+support-third-party-modules-folder-icon =
+    .title = Öppna filplats…
+support-third-party-modules-down-icon =
+    .title = Visa detaljerad information
+support-third-party-modules-up-icon =
+    .title = Dölj detaljerad information
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/featuregates/features.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Stöd för flera bild-i-bild
 experimental-features-multi-pip-description = Experimentellt stöd för att låta flera bild-i-bild-fönster vara öppna samtidigt.
+experimental-features-http3 =
+    .label = HTTP/3-protokoll
+experimental-features-http3-description = Experimentellt stöd för HTTP/3-protokollet.
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Sida:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } av { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Sista sidan
-
+printpreview-homearrow-button =
+    .title = Första sidan
+printpreview-previousarrow-button =
+    .title = Föregående sida
+printpreview-nextarrow-button =
+    .title = Nästa sida
+printpreview-endarrow-button =
+    .title = Sista sidan
diff -Nru firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/sv-SE/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:59:07.000000000 +0000
+++ firefox-85.0+build1/l10n/sv-SE/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:45.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = till
+printui-page-custom-range-input =
+    .aria-label = Ange anpassat sidintervall
+    .placeholder = t.ex. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopior
 printui-orientation = Orientering
@@ -48,6 +51,7 @@
 printui-options = Alternativ
 printui-headers-footers-checkbox = Skriv ut sidhuvud och sidfot
 printui-backgrounds-checkbox = Skriv ut bakgrunder
+printui-selection-checkbox = Skriv endast ut markering
 printui-color-mode-label = Färgläge
 printui-color-mode-color = Färg
 printui-color-mode-bw = Svartvit
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Ingen
 printui-margins-custom = Anpassad
+printui-margins-custom-inches = Anpassad (tum)
 printui-margins-custom-top = Toppen
+printui-margins-custom-top-inches = Toppen (tum)
 printui-margins-custom-bottom = Botten
+printui-margins-custom-bottom-inches = Botten (tum)
 printui-margins-custom-left = Vänster
+printui-margins-custom-left-inches = Vänster (tum)
 printui-margins-custom-right = Höger
+printui-margins-custom-right-inches = Höger (tum)
 printui-system-dialog-link = Skriv ut via systemets dialogruta…
 printui-primary-button = Skriv ut
 printui-primary-button-save = Spara
 printui-cancel-button = Avbryt
+printui-close-button = Stäng
 printui-loading = Förbereder förhandsvisning
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Förhandsgranska
+printui-pages-per-sheet = Sidor per blad
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Skriver ut…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ta/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/ta/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/ta/browser/browser/aboutCertError.ftl	2021-01-06 11:59:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ta/browser/browser/aboutCertError.ftl	2021-01-18 20:08:50.000000000 +0000
@@ -5,51 +5,37 @@
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-intro = { $hostname } தளம� செல�ல�படியாகாத SSL சான�றிதழைப� பாவிக�கிறத�.
-
+cert-error-trust-unknown-issuer-intro = யாரோ ஒர�வர� தளத�தை ஆள�மாறாட�டம� செய�ய ம�யற�சி செய�யலாம�, தாங�கள� தொடரக�கூடாத�.
 cert-error-trust-cert-invalid = இந�த சான�றிதழ� ஒர� செல�ல�படியாகாத CA சான�றிதழால� வழங�கப�பட�ட�ள�ளதால�, இத� நம�பகமானதல�ல.
-
 cert-error-trust-untrusted-issuer = சான�றிதழை வழங�க�பவர� நம�பகமாக இல�லாததால�, சான�றிதழ� நம�பகமானதல�ல.
-
 cert-error-trust-signature-algorithm-disabled = இந�த சான�றிதழானத� பாத�காப�பற�றத� என�ற காரணத�திற�காக ம�டக�கப�பட�ட ஒர� கையொப�ப வழிம�றையைப� பயன�பட�த�தி கையொப�பமிடப�பட�ட�ள�ளதால�, இந�த சான�றிதழ� நம�பகமானதல�ல.
-
 cert-error-trust-expired-issuer = சான�றிதழை வழங�க�ம� அமைப�ப� காலாவதியானதால�, சான�றிதழ� நம�பகமானதல�ல.
-
-cert-error-trust-self-signed = ச�யமாக உர�வாக�கப�பட�ட சான�றிதழ� ஆதலால� நம�பகமற�றத�.
-
+cert-error-trust-self-signed = தற�சான�றாக உர�வாக�கப�பட�ட சான�றிதழ� ஆதலால� நம�பகமற�றத�.
 cert-error-untrusted-default = சான�றிதழ� ஒர� நம�பகமான மூலத�திலிர�ந�த� வரவில�லை.
-
 # Variables:
 # $subject-alt-names (String) - Alternate domain names for which the cert is valid.
 cert-error-domain-mismatch-multiple = வலைத�தளங�கள� தங�கள� அடையாளத�தைச� சான�றிதழ�கள�மூலம� நிரூபிக�கின�றன. { -brand-short-name } இந�தத� தளத�தை நம�பவில�லை, �னெனில� { $hostname } செல�ல�படியாகாத சான�றிதழைப� பயன�பட�த�த�கிறத�. இந�தச� சான�றிதழ� பின�வர�ம� பெயர�கள�க�க� மட�ட�மே செல�ல�படியாக�ம�: { $subject-alt-names }
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-after-local-time (Date) - Certificate is not valid after this time.
 cert-error-expired-now = வலைத�தளங�கள� தங�கள� அடையாளத�தைச� சான�றிதழ�கள�மூலம� நிரூபிக�கின�றன, அவை ஒர� க�றிப�பிட�ட காலத�திற�க� செல�ல�படியாக�ம�. { $hostname } க�கான சான�றிதழ� { $not-after-local-time } அன�ற� காலாவதியானத�.
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 # $not-before-local-time (Date) - Certificate is not valid before this time.
 cert-error-not-yet-valid-now = வலைத�தளங�கள� தங�கள� அடையாளத�தைச� சான�றிதழ�கள�மூலம� நிரூபிக�கின�றன, அவை ஒர� க�றிப�பிட�ட காலத�திற�க� செல�ல�படியாக�ம�. { $hostname } க�கான சான�றிதழ� { $not-before-local-time } வரை செல�ல�படியாகாத�.
-
 # Variables:
 # $error (String) - NSS error code string that specifies type of cert error. e.g. unknown issuer, invalid cert, etc.
 cert-error-code-prefix-link = பிழைக� க�றியீட�: <a data-l10n-name="error-code-link">{ $error }</a>
-
 # Variables:
 # $hostname (String) - Hostname of the website with cert error.
 cert-error-symantec-distrust-description = வலைத�தளங�கள� தங�கள� அடையாளத�தைச� சான�றிதழ�கள�மூலம� நிரூபிக�கின�றன, அவை சான�றிதழ� நிற�வனங�களால� வழங�கப�பட�கின�றன. பெர�ம�பாலான உலாவிகள� GeoTrust, RapidSSL, Symantec, Thawte, மற�ற�ம� VeriSign வழங�கிய சான�றிதழ�களை நம�ப�வதில�லை. { $hostname } இந�த நிற�வனங�களின� �தோ ஒன�றிடமிர�ந�த� சான�றிதழைப� பெற�ற�ள�ளத�, எனவே வலைத�தளத�தின� அடையாளத�தை நிரூபிக�க ம�டியாத�.
-
 cert-error-symantec-distrust-admin = இந�தச� சிக�கல�க�றித�த� வலைத�தள நிர�வாகிக�க� நீங�கள� அறிவிக�கலாம�.
-
 # Variables:
 # $hasHSTS (Boolean) - Indicates whether HSTS header is present.
 cert-error-details-hsts-label = HTTP கண�டிப�பான போக�க�வரத�த� பாத�காப�ப�: { $hasHSTS }
-
 # Variables:
 # $hasHPKP (Boolean) - Indicates whether HPKP header is present.
 cert-error-details-key-pinning-label = HTTP பொத� விசை பிணைப�ப�: { $hasHPKP }
-
 cert-error-details-cert-chain-label = சான�றிதழ� சங�கிலி:
 
 ## Messages used for certificate error titles
diff -Nru firefox-84.0.2+build1/l10n/ta/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ta/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ta/browser/browser/appmenu.ftl	2021-01-06 11:59:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ta/browser/browser/appmenu.ftl	2021-01-18 20:08:50.000000000 +0000
@@ -10,13 +10,23 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = ப�திய சாளரம�
+appmenuitem-new-private-window =
+    .label = ப�திய கம�க�க சாளரம�
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = ம�ழ�த�திரை
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = இப�போத� ஒத�திசை
+appmenuitem-save-page =
+    .label = இவ�வாற� சேமி…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = ப�தியவை என�ன
-
diff -Nru firefox-84.0.2+build1/l10n/ta/browser/browser/browser.ftl firefox-85.0+build1/l10n/ta/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ta/browser/browser/browser.ftl	2021-01-06 11:59:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ta/browser/browser/browser.ftl	2021-01-18 20:08:50.000000000 +0000
@@ -258,6 +258,9 @@
 browser-window-close-button =
     .tooltiptext = மூட�க
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -323,3 +326,63 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> உங�கள� ச�ட�டியைக� கட�ட�ப�பட�த�த�கிறத�. கட�ட�ப�பாட�டை எட�க�க Esc விசையை அழ�த�தவ�ம�.
 pointerlock-warning-no-domain = இந�த ஆவணம� உங�கள� ச�ட�டியைக� கட�ட�ப�பாட�டில� வைத�திர�க�கிறத�. கட�ட�ப�பாட�டைத� திர�ம�ப எட�க�க Esc விசையை அழ�த�தவ�ம�.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = அனைத�தைய�ம� காண�பி
+bookmarks-recent-bookmarks =
+    .value = சமீபத�திய ப�த�தகக�க�றிகள�
+bookmarks-toolbar-chevron =
+    .tooltiptext = இன�ன�ம� காண�பி
+bookmarks-sidebar-content =
+    .aria-label = ப�த�தகக�க�றிகள�
+bookmarks-menu-button =
+    .label = ப�த�தகக�க�றிகள� பட�டி
+bookmarks-other-bookmarks-menu =
+    .label = பிற ப�த�தகக�க�றிகள�
+bookmarks-mobile-bookmarks-menu =
+    .label = கைகப�பேசி ப�த�தகக�க�றிகள�
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ப�த�தகக�க�றிகள� பக�கப�பட�டையை மறை
+           *[other] ப�த�தகக�க�றிகள� பக�கப�பட�டையைக� காட�ட�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ப�த�தகக�க�றிகள� கர�விப�பட�டையை மறை
+           *[other] ப�த�தகக�க�றிகள� கர�விப�பட�டையைக� காட�ட�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] கர�விப�பட�டையிலிர�ந�த� ப�த�தகக�க�றிகள� பட�டியை நீக�கவ�ம�
+           *[other] ப�த�தகக�க�றி பட�டியைக� கர�விப�பட�டையில� சேர�க�கவ�ம�
+        }
+bookmarks-search =
+    .label = ப�த�தகக�க�றிகளைத� தேட�
+bookmarks-tools =
+    .label = ப�த�தக�க�றியிட�ம� கர�விகள�
+bookmarks-toolbar-menu =
+    .label = ப�த�தகக�க�றி கர�விப�பட�டை
+bookmarks-toolbar-placeholder =
+    .title = ப�த�தகக�க�றிகள� கர�விப�பட�டை உர�ப�படிகள�
+bookmarks-toolbar-placeholder-button =
+    .label = ப�த�தகக�க�றிகள� கர�விப�பட�டை உர�ப�படிகள�
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ப�த�தகக�க�றிகள�
+library-bookmarks-bookmark-this-page =
+    .label = ப�த�தகக�க�றியிட�
+library-bookmarks-bookmark-edit =
+    .label = ப�த�தகக�க�றியைத� திர�த�த�
+
+## More items
+
+more-menu-go-offline =
+    .label = ம�டக�க நிலை
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ta/toolkit/toolkit/payments/payments.ftl firefox-85.0+build1/l10n/ta/toolkit/toolkit/payments/payments.ftl
--- firefox-84.0.2+build1/l10n/ta/toolkit/toolkit/payments/payments.ftl	2021-01-06 11:59:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ta/toolkit/toolkit/payments/payments.ftl	2021-01-18 20:08:50.000000000 +0000
@@ -2,9 +2,46 @@
 # 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 value isn't used directly, but is defined to avoid duplication
+# in the "credit-card-label-*" strings.
+#
+# Variables:
+#   $month (String): Numeric month the credit card expires
+#   $year (String): Four-digit year the credit card expires
+credit-card-expiration = { $month }/{ $year } இல� காலாவதியாகிறத�
 
 ## These labels serve as a description of a credit card.
 ## The description must include a credit card number, and may optionally
 ## include a cardholder name, an expiration date, or both, so we have
 ## four variations.
 
+# Label for a credit card with a number only
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $type (String): Credit card type
+credit-card-label-number-2 = { $number }
+    .aria-label = { $type }{ credit-card-label-number-2 }
+# Label for a credit card with a number and name
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+#   $type (String): Credit card type
+credit-card-label-number-name-2 = { $number }, { $name }
+    .aria-label = { $type } { credit-card-label-number-name-2 }
+# Label for a credit card with a number and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $type (String): Credit card type
+credit-card-label-number-expiration-2 = { $number }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-expiration-2 }
+# Label for a credit card with a number, name, and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+#   $type (String): Credit card type
+credit-card-label-number-name-expiration-2 = { $number }, { $name }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-name-expiration-2 }
diff -Nru firefox-84.0.2+build1/l10n/ta/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ta/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ta/toolkit/toolkit/printing/printUI.ftl	2021-01-06 11:59:14.000000000 +0000
+++ firefox-85.0+build1/l10n/ta/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:50.000000000 +0000
@@ -2,3 +2,19 @@
 # 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/.
 
+printui-title = அச�சிட�
+# Dialog title to prompt the user for a filename to save print to PDF.
+printui-save-to-pdf-title = இப�படி சேமி
+# Variables
+# $sheetCount (integer) - Number of paper sheets
+printui-sheets-count =
+    { $sheetCount ->
+        [one] { $sheetCount } தாள�
+       *[other] { $sheetCount } தாள�கள�
+    }
+
+## Paper sizes that may be supported by the Save to PDF destination:
+
+
+## Error messages shown when a user has an invalid input
+
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/te/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/aboutLogins.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/aboutLogins.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -121,6 +121,7 @@
 
 ## Primary Password notification
 
+about-logins-primary-password-notification-message = భద�రపరచిన ప�రవేశాలన�, సంకేతపదాలన� చూడటానికి దయచేసి మీ ప�రధాన సంకేతపదాన�ని ఇవ�వండి.
 master-password-reload-button =
     .label = ప�రవేశించండి
     .accesskey = L
@@ -151,6 +152,28 @@
 about-logins-confirm-remove-dialog-title = ఈ ప�రవేశాన�ని తొలగించాలా?
 confirm-delete-dialog-message = ఈ చర�యన� రద�ద� చేయలేర�.
 about-logins-confirm-remove-dialog-confirm-button = తొలగించ�
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] తొలగించ�
+        [one] తొలగించ�
+       *[other] అన�నీ తొలగించ�
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] అవ�న�, ఈ ప�రవేశాన�ని తొలగించ�
+        [one] అవ�న�, ఈ ప�రవేశాన�ని తొలగించ�
+       *[other] అవ�న�, ఈ ప�రవేశాలన� తొలగించ�
+    }
+about-logins-confirm-remove-all-dialog-title =
+    { $count ->
+        [one] ఒక { $count } ప�రవేశాన�ని తొలగించాలా?
+       *[other] { $count } ప�రవేశాలనూ తొలగించాలా?
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+        [one] { $count } ప�రవేశాన�ని అన�ని పరికరాల న�ండి తొలగించాలా?
+       *[other] { $count } ప�రవేశాలనూ అన�ని పరికరాల న�ండి తొలగించాలా?
+    }
 about-logins-confirm-export-dialog-title = ప�రవేశాలన�, సంకేతపదాలన� ఎగ�మతిచేయి
 about-logins-confirm-export-dialog-confirm-button = ఎగ�మతించ�…
 confirm-discard-changes-dialog-title = భద�రపరచని మార�ప�లన� విస�మరించాలా?
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/aboutTabCrashed.ftl firefox-85.0+build1/l10n/te/browser/browser/aboutTabCrashed.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/aboutTabCrashed.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/aboutTabCrashed.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -14,6 +14,7 @@
 crashed-request-help-message = క�రాష� నివేదికల� మాక� సమస�యలన� నిర�ధారించడానికి మరియ� { -brand-short-name } ని మంచిగా చేయడానికి సహాయపడ�తాయి.
 crashed-request-report-title = ఈ ట�యాబ�ని నివేదించ�
 crashed-send-report = ఆటోమేటెడ� క�రాష� నివేదికన� పంపించండి అంద�వల�ల మేమ� ఇట�వంటి సమస�యలన� పరిష�కరించగలమ�.
+crashed-send-report-2 = క�రాష� నివేదికలన� అటోమెటిగ�గా పంపించండి, అంద�వల�ల ఇట�వంటి సమస�యలన� పరిష�కరించగలం
 crashed-comment =
     .placeholder = ఇష�టప�రకారమైన వ�యాఖ�యల� (వ�యాఖ�యల� అందరికీ కనిపిస�తాయి)
 crashed-include-URL = { -brand-short-name } క�రాషయినప�ప�డ� మీర� ఉన�న సైట�ల చిర�నామాలన� కూడా చేర�చండి.
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/te/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/appmenu.ftl	2021-01-06 11:59:47.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/appmenu.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = కొత�త విండో
+appmenuitem-new-private-window =
+    .label = కొత�త ఆంతరంగిక విండో
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = పెద�దగించ�
 appmenuitem-zoom-reduce =
     .label = చిన�నగించ�
+appmenuitem-fullscreen =
+    .label = నిండ� తెర
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ఇప�ప�డ� సింక� చేయి
+appmenuitem-save-page =
+    .label = పేజీని ఇలా భద�రపరచ�…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = కొత�తవి �మిటి
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/te/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/appMenuNotifications.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/appMenuNotifications.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -39,7 +39,6 @@
 appmenu-addon-post-install-incognito-checkbox =
     .label = ఈ పొడగింతన� అంతరంగీక కిటికీలలో నడవడానికి అన�మతించ�
     .accesskey = A
-    
 appmenu-new-tab-controlled =
     .label = మీ కొత�త ట�యాబ� మారిపోయింది.
     .buttonlabel = మార�ప�లన� ఉండనివ�వ�
@@ -52,6 +51,18 @@
     .buttonaccesskey = K
     .secondarybuttonlabel = పొడగింతన� అచేతనం చేయి
     .secondarybuttonaccesskey = D
+appmenu-new-tab-controlled-changes =
+    .label = మీ కొత�త ట�యాబ� మారిపోయింది.
+    .buttonlabel = మార�ప�లన� ఉండనివ�వ�
+    .buttonaccesskey = K
+    .secondarybuttonlabel = కొత�త ట�యాబ�లన� నిర�వహణ
+    .secondarybuttonaccesskey = M
+appmenu-homepage-controlled-changes =
+    .label = మీ మ�ంగిలిపేజీ మారిపోయింది.
+    .buttonlabel = మార�ప�లన� ఉండనివ�వ�
+    .buttonaccesskey = K
+    .secondarybuttonlabel = మ�ంగిలిపేజీ నిర�వహణ
+    .secondarybuttonaccesskey = M
 appmenu-tab-hide-controlled =
     .label = మీ దాచిన ట�యాబ�లన� చూడండి
     .buttonlabel = ట�యాబ�లన� దాచి ఉంచండి
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/browserContext.ftl firefox-85.0+build1/l10n/te/browser/browser/browserContext.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/browserContext.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/browserContext.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -15,10 +15,8 @@
     .tooltiptext = ఒక పేజీ వెన�కక� వెళ�ళండి
     .aria-label = వెన�కక�
     .accesskey = B
-
 navbar-tooltip-back =
     .value = { main-context-menu-back.tooltiptext }
-
 toolbar-button-back =
     .label = { main-context-menu-back.aria-label }
 
@@ -28,10 +26,8 @@
     .tooltiptext = ఒక పేజీ మ�ంద�క� వెళ�ళండి
     .aria-label = మ�ంద�క�
     .accesskey = F
-
 navbar-tooltip-forward =
     .value = { main-context-menu-forward.tooltiptext }
-
 toolbar-button-forward =
     .label = { main-context-menu-forward.aria-label }
 
@@ -40,7 +36,6 @@
 main-context-menu-reload =
     .aria-label = మళ�ళీ లోడ�చేయి
     .accesskey = R
-
 toolbar-button-reload =
     .label = { main-context-menu-reload.aria-label }
 
@@ -49,7 +44,6 @@
 main-context-menu-stop =
     .aria-label = ఆపివేయి
     .accesskey = S
-
 toolbar-button-stop =
     .label = { main-context-menu-stop.aria-label }
 
@@ -63,7 +57,6 @@
 main-context-menu-page-save =
     .label = పేజీని ఇలా భద�రపరచ�…
     .accesskey = P
-
 toolbar-button-page-save =
     .label = { main-context-menu-page-save.label }
 
@@ -73,54 +66,43 @@
     .aria-label = ఈ పేజీని ఇష�టాంశమ�చేయి
     .accesskey = m
     .tooltiptext = ఈ పేజీన� ఇష�టాంశమ�చేయ�మ�
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the add bookmark command.
 main-context-menu-bookmark-add-with-shortcut =
     .aria-label = ఈ పేజీని ఇష�టాంశమ�చేయి
     .accesskey = m
     .tooltiptext = ఈ పేజీన� ఇష�టాంశమ�చేయ�మ� ({ $shortcut })
-
 main-context-menu-bookmark-change =
     .aria-label = ఈ ఇష�టాంశాన�ని సరిదిద�ద�
     .accesskey = m
     .tooltiptext = ఈ ఇష�టాంశమ�న� సవరించ�
-
 # Variables
 #   $shortcut (String) - A keyboard shortcut for the edit bookmark command.
 main-context-menu-bookmark-change-with-shortcut =
     .aria-label = ఈ ఇష�టాంశాన�ని సరిదిద�ద�
     .accesskey = m
     .tooltiptext = ఈ ఇష�టాంశమ�న� సవరించ� ({ $shortcut })
-
 main-context-menu-open-link =
     .label = లింక�న� తెర�వ�
     .accesskey = O
-
 main-context-menu-open-link-new-tab =
     .label = లింక�ని కొత�త ట�యాబ�లో తెర�వ�
     .accesskey = T
-
 main-context-menu-open-link-container-tab =
     .label = లింక�న� కొత�త కంటైనర� ట�యాబ�లో తెర�వ�
     .accesskey = b
-
 main-context-menu-open-link-new-window =
     .label = లింక�ని కొత�త విండోలో తెర�వ�
     .accesskey = W
-
 main-context-menu-open-link-new-private-window =
     .label = లింక�ని కొత�త అంతరంగిక విండోలో తెర�వ�
     .accesskey = P
-
 main-context-menu-bookmark-this-link =
     .label = ఈ లింక�న� ఇష�టాంశమ� చేయి
     .accesskey = L
-
 main-context-menu-save-link =
     .label = లింక�ని ఇలా భద�రపరచ�…
     .accesskey = k
-
 main-context-menu-save-link-to-pocket =
     .label = లంకెన� { -pocket-brand-name }క� భద�రపర�చ�
     .accesskey = o
@@ -132,7 +114,6 @@
 main-context-menu-copy-email =
     .label = ఈమెయిల� చిర�నామాన� కాపీచేయి
     .accesskey = E
-
 main-context-menu-copy-link =
     .label = లింక� స�థానాన�ని కాపీచేయి
     .accesskey = a
@@ -146,7 +127,6 @@
 main-context-menu-media-play =
     .label = ఆడించ�
     .accesskey = P
-
 main-context-menu-media-pause =
     .label = కొద�దిసేప� ఆప�
     .accesskey = P
@@ -156,37 +136,29 @@
 main-context-menu-media-mute =
     .label = ధ�వని లేక�ండా చేయి
     .accesskey = M
-
 main-context-menu-media-unmute =
     .label = ధ�వనిని ప�రవేశపెట�ట�
     .accesskey = m
-
 main-context-menu-media-play-speed =
     .label = నడిపే వేగం
     .accesskey = d
-
 main-context-menu-media-play-speed-slow =
     .label = నిదానం (0.5×)
     .accesskey = S
-
 main-context-menu-media-play-speed-normal =
     .label = సాధారణం
     .accesskey = N
-
 main-context-menu-media-play-speed-fast =
     .label = వేగం (1.25×)
     .accesskey = F
-
 main-context-menu-media-play-speed-faster =
     .label = మరింత వేగం (1.5×)
     .accesskey = a
-
 # "Ludicrous" is a reference to the movie "Space Balls" and is meant
 # to say that this speed is very fast.
 main-context-menu-media-play-speed-fastest =
     .label = హాస�యాస�పదం (2×)
     .accesskey = L
-
 main-context-menu-media-loop =
     .label = లూప�
     .accesskey = L
@@ -197,7 +169,6 @@
 main-context-menu-media-show-controls =
     .label = నియంత�రికలన� చూపించ�
     .accesskey = C
-
 main-context-menu-media-hide-controls =
     .label = నియంత�రికల� దాచ�
     .accesskey = C
@@ -207,184 +178,142 @@
 main-context-menu-media-video-fullscreen =
     .label = నిండ� తెర
     .accesskey = F
-
 main-context-menu-media-video-leave-fullscreen =
     .label = నిండ� తెరన� వదలివెళ�ళ�
     .accesskey = u
-
 # This is used when right-clicking on a video in the
 # content area when the Picture-in-Picture feature is enabled.
 main-context-menu-media-pip =
     .label = బొమ�మలో-బొమ�మ
     .accesskey = u
-
 main-context-menu-image-reload =
     .label = బొమ�మని మళ�ళీ లోడ�చేయి
     .accesskey = R
-
 main-context-menu-image-view =
     .label = బొమ�మని చూడండి
     .accesskey = I
-
 main-context-menu-video-view =
     .label = వీడియోన� చూడండి
     .accesskey = I
-
 main-context-menu-image-copy =
     .label = బొమ�మని కాపీచేయి
     .accesskey = y
-
 main-context-menu-image-copy-location =
     .label = బొమ�మ స�థానాన�ని కాపీచేయి
     .accesskey = o
-
 main-context-menu-video-copy-location =
     .label = వీడియో స�థానాన�ని కాపీచేయి
     .accesskey = o
-
 main-context-menu-audio-copy-location =
     .label = ధ�వని స�థానాన�ని కాపీచేయి
     .accesskey = o
-
 main-context-menu-image-save-as =
     .label = బొమ�మని ఇలా భద�రపరచ�…
     .accesskey = v
-
 main-context-menu-image-email =
     .label = బొమ�మన� ఈమెయిల� చేయి…
     .accesskey = g
-
 main-context-menu-image-set-as-background =
     .label = డెస�క�‌టాప� వెన�తలంగా అమర�చ�…
     .accesskey = S
-
 main-context-menu-image-info =
     .label = బొమ�మ సమాచారాన�ని చూడండి
     .accesskey = f
-
 main-context-menu-image-desc =
     .label = వివరణన� చూడండి
     .accesskey = D
-
 main-context-menu-video-save-as =
     .label = వీడియోన� వేరే పేర�తో భద�రపరచ�…
     .accesskey = v
-
 main-context-menu-audio-save-as =
     .label = ఆడియోన� వేరే పేర�తో భద�రపరచ�…
     .accesskey = v
-
 main-context-menu-video-image-save-as =
     .label = స�నాప�‌షాట� ఇలా భద�రపర�చ�…
     .accesskey = S
-
 main-context-menu-video-email =
     .label = వీడియోన� ఈమెయిల� చేయి…
     .accesskey = a
-
 main-context-menu-audio-email =
     .label = ఆడియోన� ఈమెయిల� చేయి…
     .accesskey = a
-
 main-context-menu-plugin-play =
     .label = ఈ ప�లగిన�న� చేతనించ�
     .accesskey = c
-
 main-context-menu-plugin-hide =
     .label = ఈ ప�లగిన�న� దాచ�
     .accesskey = H
-
 main-context-menu-save-to-pocket =
     .label = { -pocket-brand-name }‌లో భద�రపర�చ�
     .accesskey = k
-
 main-context-menu-send-to-device =
     .label = పేజీని పరికరానికి పంప�
     .accesskey = D
-
 main-context-menu-view-background-image =
     .label = వెన�తలప� బొమ�మని చూడండి
     .accesskey = w
-
 main-context-menu-generate-new-password =
     .label = సృష�టించిన సంకేతపదాన�ని వాడ�…
     .accesskey = G
-
 main-context-menu-keyword =
     .label = ఈ శోధనక� కీలక పదాన�ని చేర�చండి…
     .accesskey = K
-
 main-context-menu-link-send-to-device =
     .label = లంకెన� పరికరానికి పంప�
     .accesskey = D
-
 main-context-menu-frame =
     .label = ఈ ఫ�రేమ�
     .accesskey = h
-
 main-context-menu-frame-show-this =
     .label = ఈ ఫ�రేమ�న� మాత�రమే చూపించ�
     .accesskey = S
-
 main-context-menu-frame-open-tab =
     .label = ఫ�రేమ�ని కొత�త ట�యాబ�లో తెర�వ�
     .accesskey = T
-
 main-context-menu-frame-open-window =
     .label = ఫ�రేమ�ని కొత�త విండోలో తెర�వ�
     .accesskey = W
-
 main-context-menu-frame-reload =
     .label = ఫ�రేమ�న� మళ�ళీ లోడ�చేయి
     .accesskey = R
-
 main-context-menu-frame-bookmark =
     .label = ఈ ఫ�రేమ�న� ఇష�టాంశంగా చేయి
     .accesskey = m
-
 main-context-menu-frame-save-as =
     .label = ఫ�రేమ�ని ఇలా భద�రపరచ�…
     .accesskey = F
-
 main-context-menu-frame-print =
     .label = ఫ�రేమ�న� మ�ద�రించ�…
     .accesskey = P
-
 main-context-menu-frame-view-source =
     .label = ఫ�రేమ� మూలాన�ని చూడండి
     .accesskey = V
-
 main-context-menu-frame-view-info =
     .label = ఫ�రేమ� సమాచారాన�ని చూడండి
     .accesskey = I
-
+main-context-menu-print-selection =
+    .label = మ�ద�రణ ఎంపిక
+    .accesskey = r
 main-context-menu-view-selection-source =
     .label = ఎంపిక మూలాన�ని చూడండి
     .accesskey = e
-
 main-context-menu-view-page-source =
     .label = పేజీ మూలాన�ని చూడండి
     .accesskey = V
-
 main-context-menu-view-page-info =
     .label = పేజీ సమాచారాన�ని చూడండి
     .accesskey = I
-
 main-context-menu-bidi-switch-text =
     .label = పాఠ�య దిశన� మార�చ�
     .accesskey = w
-
 main-context-menu-bidi-switch-page =
     .label = పేజీ దిశన� మార�చ�
     .accesskey = D
-
 main-context-menu-inspect-element =
     .label = మూలకం విచారణచేయి
     .accesskey = Q
-
 main-context-menu-inspect-a11y-properties =
     .label = ప�రాప�యత లక�షణాలన� పరిశీలించండి
-
 main-context-menu-eme-learn-more =
     .label = DRM గ�రించి ఇంకా తెల�స�కోండి…
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/browser.ftl firefox-85.0+build1/l10n/te/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/browser.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/browser.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -163,6 +163,15 @@
 
 ## Page Action menu
 
+# Variables
+# $tabCount (integer) - Number of tabs selected
+page-action-send-tabs-panel =
+    .label =
+        { $tabCount ->
+            [1] ట�యాబ�న� పరికరానికి పంపించ�
+            [one] { $tabCount } ట�యాబ�న� పరికరానికి పంపించ�
+           *[other] { $tabCount } ట�యాబ�లన� పరికరానికి పంపించ�
+        }
 page-action-copy-url-panel =
     .label = లంకెన� కాపీచెయ�యి
 page-action-copy-url-urlbar =
@@ -268,8 +277,16 @@
 identity-active-loaded = ఈ పేజీకి రక�షణన� మీర� అచేతనం చేసార�.
 identity-weak-encryption = ఈ పేజీ బలహీనమైన ఎన�‌క�రిప�షన� వాడ�తోంది.
 identity-insecure-login-forms = ఈ పేజీలో మీర� ఇచ�చే లాగిన�ల� రాజీపడవచ�చ�.
+identity-https-only-label = HTTPS-మాత�రమే రీతి
+identity-https-only-dropdown-on =
+    .label = చేతనం
+identity-https-only-dropdown-off =
+    .label = అచేతనం
+identity-https-only-dropdown-off-temporarily =
+    .label = తాత�కాలికంగా అచేతనం
 identity-permissions =
     .value = అన�మత�ల�
+identity-permissions-storage-access-header = క�రాస�-సైట� క�కీల�
 identity-permissions-reload-hint = మార�ప�ల� ప�రతిఫలించడానికి మీర� ఈ పేజీని మళ�ళీ లోడ� చెయ�యాల�సిరావచ�చ�.
 identity-permissions-empty = ఈ సైట�కి మీర� ఎట�వంటి ప�రత�యేక అన�మత�ల� ఇవ�వలేద�.
 identity-clear-site-data =
@@ -411,6 +428,8 @@
 ## In these actions "Search" is a verb, followed by where the search is performed.
 
 urlbar-result-action-search-bookmarks = ఇష�టాంశాలన� వెతకండి
+urlbar-result-action-search-history = చరిత�రలో వెతకండి
+urlbar-result-action-search-tabs = ట�యాబ�లలో వెతకండి
 
 ## Full Screen and Pointer Lock UI
 
@@ -427,3 +446,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = మీ పాయింటర� <span data-l10n-name="domain">{ $domain }</span> నియంత�రణలో ఉంది. తిరిగి మీ ఆధీనం లోనికి తెచ�చ�కోడానికి Esc నొక�కండి.
 pointerlock-warning-no-domain = మీ పాయింటర� ఈ పత�రప� నియంత�రణలో ఉంది. తిరిగి మీ ఆధీనం లోనికి తెచ�చ�కోడానికి Esc నొక�కండి.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = ఇష�టాంశాలన�నింటినీ చూపించ�
+bookmarks-recent-bookmarks =
+    .value = ఇటీవల ఇష�టాంశాల�గా చేసినవి
+bookmarks-toolbar-chevron =
+    .tooltiptext = మరిన�ని ఇష�టాంశాలన� చూపించ�
+bookmarks-sidebar-content =
+    .aria-label = ఇష�టాంశాల�
+bookmarks-menu-button =
+    .label = ఇష�టాంశాల మెనూ
+bookmarks-other-bookmarks-menu =
+    .label = ఇతర ఇష�టాంశాల�
+bookmarks-mobile-bookmarks-menu =
+    .label = మొబైల� ఇష�టాంశాల�
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ఇష�టాంశాల ప�రక�కపట�టీని దాచ�
+           *[other] ఇష�టాంశాల ప�రక�కపట�టీని చూడండి
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ఇష�టాంశాల పనిమ�ట�లపట�టీని దాచ�
+           *[other] ఇష�టాంశాల పట�టీని చూడండి
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] ఉపకరణపట�టీ న�ండి ఇష�టాంశాల మెన�ని తీసివేయండి
+           *[other] ఉపకరణపట�టీకి ఇష�టాంశాల మెనూని జోడించండి
+        }
+bookmarks-search =
+    .label = ఇష�టాంశాలన� వెతకండి
+bookmarks-tools =
+    .label = ఇష�టాంశాల పనిమ�ట�ల�
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = ఇష�టాంశాల పట�టీ
+    .accesskey = B
+    .aria-label = ఇష�టాంశాల�
+bookmarks-toolbar-menu =
+    .label = ఇష�టాంశాల పట�టీ
+bookmarks-toolbar-placeholder =
+    .title = ఇష�టాంశాల పట�టీ అంశాల�
+bookmarks-toolbar-placeholder-button =
+    .label = ఇష�టాంశాల పట�టీ అంశాల�
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ఇష�టాంశాల�
+library-bookmarks-bookmark-this-page =
+    .label = ఈ పేజీని ఇష�టాంశంగా చేయి
+library-bookmarks-bookmark-edit =
+    .label = ఈ ఇష�టాంశాన�ని సరిదిద�ద�
+
+## More items
+
+more-menu-go-offline =
+    .label = ఆఫ�‌లైన�‌లో పనిచేయి
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/defaultBrowserNotification.ftl firefox-85.0+build1/l10n/te/browser/browser/defaultBrowserNotification.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/defaultBrowserNotification.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/defaultBrowserNotification.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -1,3 +1,7 @@
 # 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/.
+
+default-browser-notification-button =
+    .label = అప�రమేయంగా అమర�చ�
+    .accesskey = S
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/downloads.ftl firefox-85.0+build1/l10n/te/browser/browser/downloads.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/downloads.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/downloads.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -18,7 +18,6 @@
 # in-progress and blocked downloads.
 downloads-panel-list =
     .style = width: 72ch
-
 downloads-cmd-pause =
     .label = నిలిపివ�ంచ�
     .accesskey = P
@@ -29,32 +28,26 @@
     .tooltiptext = రద�ద�చేయి
 downloads-cmd-cancel-panel =
     .aria-label = రద�ద�చేయి
-
 # This message is only displayed on Windows and Linux devices
 downloads-cmd-show-menuitem =
     .label = ఈ ఫైల� ఉన�న సంచయాన�ని తెర�వ�
     .accesskey = F
-
 # This message is only displayed on macOS devices
 downloads-cmd-show-menuitem-mac =
     .label = ఫైండర�‌లో చూపించ�
     .accesskey = F
-
 downloads-cmd-use-system-default =
     .label = వ�యవస�థ దర�శనిలో తెర�వ�
     .accesskey = V
-
 downloads-cmd-always-use-system-default =
     .label = ఎల�లప�ప�డూ వ�యవస�థ దర�శినిలో తెర�వ�
     .accesskey = w
-
 downloads-cmd-show-button =
     .tooltiptext =
         { PLATFORM() ->
             [macos] ఫైండర�‌లో చూపించ�
            *[other] ఈ ఫైల� ఉన�న సంచయాన�ని తెర�వ�
         }
-
 downloads-cmd-show-panel =
     .aria-label =
         { PLATFORM() ->
@@ -67,7 +60,6 @@
             [macos] ఫైండర�‌లో చూపించ�
            *[other] ఈ ఫైల� ఉన�న సంచయాన�ని తెర�వ�
         }
-
 downloads-cmd-show-downloads =
     .label = దింప�కోళ�ళ సంచయాన�ని తెర�వ�
 downloads-cmd-retry =
@@ -78,7 +70,7 @@
     .label = దింప�కోళ�ళ పేజీకి వెళ�ళ�
     .accesskey = G
 downloads-cmd-copy-download-link =
-    .label = డౌన�లోడ� లింక�న� కాపీచేయి
+    .label = దింప�కోల� లంకెన� కాపీచేయి
     .accesskey = L
 downloads-cmd-remove-from-history =
     .label = చరిత�ర న�ండి తొలగించ�
@@ -89,78 +81,62 @@
 downloads-cmd-clear-downloads =
     .label = దింప�కోళ�ళన� శ�భ�రంచేయి
     .accesskey = D
-
 # This command is shown in the context menu when downloads are blocked.
 downloads-cmd-unblock =
     .label = దింప�కోల�ని అన�మతించ�
     .accesskey = o
-
 # This is the tooltip of the action button shown when malware is blocked.
 downloads-cmd-remove-file =
     .tooltiptext = ఫైల�ని తీసివేయి
-
 downloads-cmd-remove-file-panel =
     .aria-label = ఫైల�ని తీసివేయి
-
 # This is the tooltip of the action button shown when potentially unwanted
 # downloads are blocked. This opens a dialog where the user can choose
 # whether to unblock or remove the download. Removing is the default option.
 downloads-cmd-choose-unblock =
     .tooltiptext = ఫైల� తొలగించ� లేదా దింప�కోల�ని అన�మతించ�
-
 downloads-cmd-choose-unblock-panel =
     .aria-label = ఫైల� తొలగించ� లేదా దింప�కోల�ని అన�మతించ�
-
 # This is the tooltip of the action button shown when uncommon downloads are
 # blocked.This opens a dialog where the user can choose whether to open the
 # file or remove the download. Opening is the default option.
 downloads-cmd-choose-open =
     .tooltiptext = తెర�వ� లేదా ఫైల�ని తొలగించ�
-
 downloads-cmd-choose-open-panel =
     .aria-label = తెర�వ� లేదా ఫైల�ని తొలగించ�
-
 # Displayed when hovering a blocked download, indicates that it's possible to
 # show more information for user to take the next action.
 downloads-show-more-information =
     .value = మరింత సమాచారాన�ని చూపించ�
-
 # Displayed when hovering a complete download, indicates that it's possible to
 # open the file using an app available in the system.
 downloads-open-file =
     .value = ఫైల�న� తెర�వ�
-
 # Displayed when hovering a download which is able to be retried by users,
 # indicates that it's possible to download this file again.
 downloads-retry-download =
     .value = దింప�కోల�న� మళ�ళీ ప�రయత�నించ�
-
 # Displayed when hovering a download which is able to be cancelled by users,
 # indicates that it's possible to cancel and stop the download.
 downloads-cancel-download =
     .value = దింప�కోల�న� రద�ద�చేయి
-
 # This string is shown at the bottom of the Downloads Panel when all the
 # downloads fit in the available space, or when there are no downloads in
 # the panel at all.
 downloads-history =
     .label = దింప�కోళ�ళంటినీ చూపించ�
     .accesskey = S
-
 # This string is shown at the top of the Download Details Panel, to indicate
 # that we are showing the details of a single download.
 downloads-details =
     .title = దింప�కోల� వివరాల�
-
 downloads-clear-downloads-button =
     .label = దింప�కోళ�ళన� శ�భ�రంచేయి
     .tooltiptext = పూర�తయిన, రద�ద�చేసిన మరియ� విఫలమైన దింప�కోళ�ళన� త�డిచివేస�త�ంది
-
 # This string is shown when there are no items in the Downloads view, when it
 # is displayed inside a browser tab.
 downloads-list-empty =
     .value = దింప�కోళ�ళేమీ లేవ�.
-
 # This string is shown when there are no items in the Downloads Panel.
 downloads-panel-empty =
     .value = ఈ సెషన�‌క� � దింప�కోళ�ళ� లేవ�.
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/migration.ftl firefox-85.0+build1/l10n/te/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/migration.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/migration.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = విజార�డ� దిగ�మతిచేయి
-
 import-from =
     { PLATFORM() ->
         [windows] ఎంపికలన�, ఇష�టాంశాలన�, చరిత�రన�, సంకేతపదాలన� మరియ� ఇతర డేటాన� దిగ�మతి చేయండి:
        *[other] అభిర�చ�లన�, ఇష�టాంశాలన�, చరిత�రన�, సంకేతపదాలన�, ఇతర డాటాన� దిగ�మతి చేయి:
     }
-
 import-from-bookmarks = ఇష�టాంశాలన� దిగ�మతిచేయి:
 import-from-ie =
     .label = మైక�రోసాఫ�ట� ఇంటర�నెట�‌ ఎక�స�‌ప�లోరర�
@@ -51,34 +49,23 @@
 import-from-360se =
     .label = 360 స�రక�షిత విహారిణి
     .accesskey = 3
-
 no-migration-sources = ఇష�టాంశమ�ల�, చరిత�ర లేదా సంకేతపద డాటాన� కలిగివ�న�న ప�రొగ�రామ� కన�గొనబడలేద�.
-
 import-source-page-title = డేటాన�, అమరికలన� దిగ�మతిచేయి
 import-items-page-title = దిగ�మతి కావడానికి అంశమ�ల�
-
 import-items-description = �యే అంశాల� దిగ�మతి కావాలో ఎంచ�కోండి:
-
+import-permissions-page-title = దయచేసి { -brand-short-name }కి అన�మత�ల� ఇవ�వండి
 import-migrating-page-title = దిగ�మతవ�త�న�నది...
-
 import-migrating-description = ఈ క�రింది అంశమ�ల� ప�రస�త�తం దిగ�మతవ�త�న�నవి...
-
 import-select-profile-page-title = ప�రొఫైల� ఎంచ�కోండి
-
 import-select-profile-description = ఈ క�రింది ప�రొఫైల�స� దిగ�మతికి అంద�బాట�లో వ�న�నాయి న�ండి:
-
 import-done-page-title = పూర�తిగా దిగ�మతిచేయి
-
 import-done-description = ఈ క�రింది అంశమ�ల� సమర�ధంగా దిగ�మతైనవి:
-
 import-close-source-browser = కొనసాగే మ�ంద� ఎంచ�క�న�న విహారిణి మూసివ�ందని నిర�ధారించ�కోండి.
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = { $source } న�ండి
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
 source-name-edge-beta = Microsoft Edge బీటా
@@ -90,7 +77,6 @@
 source-name-chromium = Chromium
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 స�రక�షిత విహారిణి
-
 imported-safari-reading-list = జాబితాన� చద�వ�తోంది (సఫారీ న�ండి)
 imported-edge-reading-list = చదవాల�సిన జాబితా (ఎడ�జ� న�ండి)
 
@@ -112,7 +98,6 @@
     .label = క�కీల�
 browser-data-cookies-label =
     .value = క�కీల�
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -125,12 +110,10 @@
             [firefox] విహరణ చరిత�ర, ఇష�టాంశాల�
            *[other] విహరణ చరిత�ర
         }
-
 browser-data-formdata-checkbox =
     .label = భద�రపరచిన ఫారాల చరిత�ర
 browser-data-formdata-label =
     .value = భద�రపరచిన ఫారాల చరిత�ర
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -139,7 +122,6 @@
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-label =
     .value = భద�రపరచిన ప�రవేశాల�, సంకేతపదాల�
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -154,12 +136,10 @@
             [edge] ఇష�టాంశాల�
            *[other] ఇష�టాంశాల�
         }
-
 browser-data-otherdata-checkbox =
     .label = ఇతర డేటా
 browser-data-otherdata-label =
     .label = ఇతర డేటా
-
 browser-data-session-checkbox =
     .label = విండోల�, ట�యాబ�ల�
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/te/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/newtab/asrouter.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/newtab/asrouter.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -243,4 +243,8 @@
 
 ## What's new: Media controls message
 
+cfr-whatsnew-media-keys-header = మరిన�ని మాధ�యమ నియంత�రణల�
 cfr-whatsnew-media-keys-button = ఎలానో తెల�స�కోండి
+
+## What's new: Search shortcuts
+
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/te/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/newtab/newtab.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -166,6 +166,7 @@
 
 newtab-section-header-topsites = మేటి సైట�ల�
 newtab-section-header-highlights = విశేషాల�
+newtab-section-header-recent-activity = ఇటీవలి కార�యకలాపం
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = { $provider }చే సిఫార�స� చేయబడినది
@@ -198,3 +199,19 @@
 
 newtab-error-fallback-info = అయ�యో, ఈ విషయం తేవడంలో �దో తప�ప� దొర�లింది.
 newtab-error-fallback-refresh-link = మళ�ళీ ప�రయత�నించడానికి పేజీని రీఫ�రెష� చెయ�యండి.
+
+## Customization Menu
+
+newtab-custom-shortcuts-subtitle = మీర� భద�రపరచ�క�న�న లేదా చూసిన సైట�ల�
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } వర�స
+       *[other] { $num } వర�సల�
+    }
+newtab-custom-recent-title = ఇటీవలి కార�యకలాపం
+newtab-custom-close-button = మూసివేయి
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = సంగత�ల�
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/places.ftl firefox-85.0+build1/l10n/te/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/places.ftl	2021-01-06 11:59:47.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/places.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -17,7 +17,6 @@
 places-open-private-window =
     .label = కొత�త ఆంతరంగిక విండోలో తెర�వ�
     .accesskey = P
-
 places-new-bookmark =
     .label = కొత�త ఇష�టాంశమ�…
     .accesskey = B
@@ -30,7 +29,6 @@
 places-new-separator =
     .label = కొత�త సెపరేటర�
     .accesskey = S
-
 places-view =
     .label = చూడండి
     .accesskey = w
@@ -49,12 +47,10 @@
 places-by-day-and-site =
     .label = తేదీ, సైట� క�రమంలో
     .accesskey = t
-
 places-history-search =
     .placeholder = చరిత�రలో వెతకండి
 places-bookmarks-search =
     .placeholder = ఇష�టాంశాలన� వెతకండి
-
 places-delete-domain-data =
     .label = ఈ సైట�ని మర�చిపో
     .accesskey = F
@@ -64,3 +60,6 @@
 places-properties =
     .label = లక�షణమ�ల�
     .accesskey = i
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = ఇతర ఇష�టాంశాల�
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/preferences/applicationManager.ftl firefox-85.0+build1/l10n/te/browser/browser/preferences/applicationManager.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/preferences/applicationManager.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/preferences/applicationManager.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -5,15 +5,12 @@
 app-manager-window =
     .title = అన�వర�తనప� వివరాల�
     .style = width: 30em; min-height: 20em;
-
 app-manager-remove =
     .label = తీసివేయి
     .accesskey = R
-
 # Variables:
 #   $type (String) - the URI scheme of the link (e.g. mailto:)
-app-manager-handle-protocol = { $type } లింక�ల� న� సంభాళించ�టక� ఈ క�రింది అన�వర�తనాలన� ఉపయోగించవచ�చ�.
-
+app-manager-handle-protocol = { $type }లంకెలన� సంభాళించ�టక� ఈ క�రింది అన�వర�తనాలన� వాడవచ�చ�.
 # Variables:
 #   $type (String) - the MIME type (e.g. application/binary)
 app-manager-handle-file = { $type } సారమ� న� సంభాళించ�టక� ఈ క�రింది అన�వర�తనాలన� ఉపయోగించవచ�చ�.
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/te/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/preferences/preferences.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -29,6 +29,8 @@
            *[other] ప�రాధాన�యతల� తెర�వ�
         }
 managed-notice = మీ విహారిణి మీ సంస�థ ద�వారా నిర�వహించబడ�తోంది.
+category-list =
+    .aria-label = వర�గాల�
 pane-general-title = సాధారణం
 category-general =
     .tooltiptext = { pane-general-title }
@@ -464,6 +466,8 @@
     .label = ఇటీవలి దింప�కోల�
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }లో భద�రపరచిన పేజీల�
+home-prefs-recent-activity-header =
+    .label = ఇటీవలి కార�యకలాపం
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
diff -Nru firefox-84.0.2+build1/l10n/te/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/te/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/te/browser/browser/toolbarContextMenu.ftl	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -11,11 +11,9 @@
 toolbar-context-menu-select-all-tabs =
     .label = అన�ని ట�యాబ�లన� ఎంచ�కో
     .accesskey = S
-
 toolbar-context-menu-manage-extension =
     .label = పొడగింత నిర�వహణ
     .accesskey = E
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -28,3 +26,6 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = అభిమతీకరించ�…
     .accesskey = C
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = ఎల�లప�ప�డూ
+    .accesskey = A
diff -Nru firefox-84.0.2+build1/l10n/te/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/te/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/te/browser/chrome/browser/accounts.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/chrome/browser/accounts.properties	2021-01-18 20:08:54.000000000 +0000
@@ -39,9 +39,14 @@
 # Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
 sendToAllDevices.menuitem = పరికరాలన�నిటికీ పంపించ�
 
+# LOCALIZATION NOTE (manageDevices.menuitem)
+# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
+manageDevices.menuitem = పరికరాలన� నిర�వహించండి…
+
 # LOCALIZATION NOTE (sendTabToDevice.unconfigured, sendTabToDevice.unconfigured.label2)
 # Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
 # and the Sync account is unconfigured. Redirects to a marketing page.
+sendTabToDevice.unconfigured.label2 = ప�రవేశించి లేర�
 sendTabToDevice.unconfigured = ట�యాబ�లన� పంపడం గ�రించి తెల�స�కోండి…
 
 # LOCALIZATION NOTE (sendTabToDevice.signintofxa)
diff -Nru firefox-84.0.2+build1/l10n/te/browser/chrome/browser/browser.dtd firefox-85.0+build1/l10n/te/browser/chrome/browser/browser.dtd
--- firefox-84.0.2+build1/l10n/te/browser/chrome/browser/browser.dtd	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/chrome/browser/browser.dtd	2021-01-18 20:08:54.000000000 +0000
@@ -40,13 +40,13 @@
 
 <!ENTITY fullScreenCmd.label "నిండ� తెర">
 
+<!ENTITY pictureInPictureHideToggle.accesskey "H">
 
 <!-- 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.syncSettings2.label "&syncBrand.shortName.label; అమరికల�">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
-
 <!ENTITY fxa.menu.firefoxServices.label "&brandProductName; సేవల�">
 <!ENTITY fxa.menu.account.label "ఖాతా">
 <!ENTITY fxa.menu.settings.label "అమరికల�">
@@ -118,7 +118,6 @@
 
 <!ENTITY webDeveloperMenu.label       "వెబ� అభివృద�దికారి">
 
-
 <!ENTITY newNavigatorCmd.label        "కొత�త విండో">
 <!ENTITY newPrivateWindow.label     "కొత�త ఆంతరంగిక విండో">
 
@@ -183,9 +182,6 @@
 <!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
 <!ENTITY customizeMenu.addMoreItems.label "మరిన�ని అంశాలన� చేర�చండి…">
 <!ENTITY customizeMenu.addMoreItems.accesskey "A">
-<!-- LOCALIZATION NOTE (reportExtension.label) This label is used in the extensions
-     toolbar buttons context menus, a user can use this command to submit to Mozilla
-     an abuse report related to that extension. "Report" is a verb. -->
 
 <!-- LOCALIZATION NOTE (moreMenu.label) This label is used in the new Photon
     app (hamburger) menu. When clicked, it opens a subview that contains
@@ -206,15 +202,10 @@
 <!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
   "Pocket" is a brand name. -->
 
-<!ENTITY emailPageCmd.label           "లింక�న� ఈమెయిల� చేయి…">
-
-<!-- Media (video/audio) controls -->
+<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+  "Pocket" is a brand name. -->
 
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
+<!ENTITY emailPageCmd.label           "లింక�న� ఈమెయిల� చేయి…">
 
 <!ENTITY fullZoom.label                 "జూమ�">
 
@@ -241,7 +232,6 @@
 <!ENTITY spellAddDictionaries.label "నిఘంట�వ�లన� చేర�చ�…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "విహారిణి ట�యాబ�ల�">
diff -Nru firefox-84.0.2+build1/l10n/te/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/te/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/te/browser/chrome/browser/browser.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/chrome/browser/browser.properties	2021-01-18 20:08:54.000000000 +0000
@@ -278,6 +278,9 @@
 
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+openProtocolHandlerPermissionEntryLabel=%S:// లంకెల�
+
 crashedpluginsMessage.title=%S ప�లగిన� క�రాష� అయినది.
 crashedpluginsMessage.reloadButton.label=పేజీన� తిరిగిలోడ�చేయ�మ�
 crashedpluginsMessage.reloadButton.accesskey=R
@@ -585,6 +588,7 @@
 
 # Virtual Reality Device UI
 xr.dontAllow=అన�మతించ వద�ద�
+xr.remember=ఈ నిర�ణయాన�ని గ�ర�త�ంచ�కో
 
 # Persistent storage UI
 persistentStorage.allow=అన�మతించ�
@@ -712,6 +716,7 @@
 getUserMedia.selectWindowOrScreen.accesskey=W
 getUserMedia.pickWindowOrScreen.label = కిటికీ లేదా తెరన� ఎంచ�కోండి
 getUserMedia.shareEntireScreen.label = మొత�తం తెర
+getUserMedia.sharePipeWirePortal.label = నిర�వాహక వ�యవస�థ అమరికలన� వాడ�
 # LOCALIZATION NOTE (getUserMedia.shareMonitor.label):
 # %S is screen number (digits 1, 2, etc)
 # Example: Screen 1, Screen 2,..
@@ -974,6 +979,7 @@
 confirmationHint.addSearchEngine.label = శోధన యంత�రమ� జోడించబడింది!
 confirmationHint.passwordSaved.label = సంకేతపదం భద�రమయ�యింది!
 confirmationHint.loginRemoved.label = ప�రవేశం తొలగించబడింది!
+confirmationHint.breakageReport.label = నివేదిక పంపబడింది. మీక� కృతజ�ఞతల�!
 
 # LOCALIZATION NOTE (livebookmarkMigration.title):
 # Used by the export of user's live bookmarks to an OPML file as a title for the file.
diff -Nru firefox-84.0.2+build1/l10n/te/browser/chrome/browser/pocket.properties firefox-85.0+build1/l10n/te/browser/chrome/browser/pocket.properties
--- firefox-84.0.2+build1/l10n/te/browser/chrome/browser/pocket.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/chrome/browser/pocket.properties	2021-01-18 20:08:54.000000000 +0000
@@ -8,7 +8,7 @@
 learnmore = ఇంకా తెల�స�కోండి
 loginnow = ప�రవేశించండి
 maxtaglength = ట�యాగ�ల� 25 అక�షరాలక� పరిమితం
-onlylinkssaved = కేవలం లింక�ల� సేవ� చేయవచ�చ�
+onlylinkssaved = కేవలం లంకెలన� మాత�రమే భద�రపరచగలర�
 pagenotsaved = పేజీ భద�రమవలేద�
 pageremoved = పేజీ తీసివేయబడెన�
 pagesaved = Pocketక� భద�రపరచబడింది
diff -Nru firefox-84.0.2+build1/l10n/te/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/te/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/te/browser/defaultagent/defaultagent_localized.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/te/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:08:54.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/.
+
+# This file is in the UTF-8 encoding
+[Strings]
+
+DefaultBrowserNotificationYesButtonText=అవ�న�
+DefaultBrowserNotificationNoButtonText=వద�ద�
diff -Nru firefox-84.0.2+build1/l10n/te/devtools/client/boxmodel.properties firefox-85.0+build1/l10n/te/devtools/client/boxmodel.properties
--- firefox-84.0.2+build1/l10n/te/devtools/client/boxmodel.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/devtools/client/boxmodel.properties	2021-01-18 20:08:54.000000000 +0000
@@ -24,9 +24,24 @@
 # for showing and collapsing the properties underneath the box model in the layout view
 boxmodel.propertiesLabel=బాక�స� మోడల� లక�షణాల�
 
+# LOCALIZATION NOTE (boxmodel.propertiesHideLabel):
+# This is the spoken label for the twisty.
+# If the properties are currently showing, it will say "Hide".
+boxmodel.propertiesHideLabel=దాచ�
+
+# LOCALIZATION NOTE (boxmodel.propertiesShowLabel):
+# This is the spoken label for the twisty.
+# If the properties are currently hidden, it will say "Show".
+boxmodel.propertiesShowLabel=చూపించ�
+
 # LOCALIZATION NOTE: (boxmodel.offsetParent) This label is displayed inside the list of
 # properties, below the box model, in the layout view. It is displayed next to the
 # position property, when position is absolute, relative, sticky. This label tells users
 # what the DOM node previewed next to it is: an offset parent for the position element.
 boxmodel.offsetParent=సర�ద�బాట�
 
+# LOCALIZATION NOTE: (boxmodel.offsetParent.title) This label is displayed as a
+# tooltip that appears when hovering over the offset label, inside the list of properties,
+# below the box model, in the layout view. This label tells users
+# what the DOM node previewed next to it is: an offset parent for the position element.
+
diff -Nru firefox-84.0.2+build1/l10n/te/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/te/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/te/devtools/client/netmonitor.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/devtools/client/netmonitor.properties	2021-01-18 20:08:54.000000000 +0000
@@ -265,10 +265,6 @@
 # computed by a service worker.
 networkMenu.sizeServiceWorker=సేవా వర�కర�
 
-# LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
-# in the network menu specifying the request was blocked by something.
-# %S is replaced by the blocked reason, which could be "DevTools", "CORS", etc.
-
 # LOCALIZATION NOTE (networkMenu.blocked2): This is a generic message for a
 # URL that has been blocked for an unknown reason
 networkMenu.blocked2=నిరోధించబడినది
@@ -949,13 +945,16 @@
 
 # LOCALIZATION NOTE (netmonitor.headers.status): This is the label displayed
 # in the network details headers tab identifying the status code.
+netmonitor.headers.status=స�థితి
 
 # LOCALIZATION NOTE (netmonitor.headers.size): This is the label displayed
 # in the network details headers tab identifying the size.
+netmonitor.headers.size=పరిమాణం
 
 # LOCALIZATION NOTE (networkMenu.headers.sizeDetails): This label is displayed
 # in the network details headers tab providing the size details.
 # %1$S is the transferred size, %2$S is the size.
+netmonitor.headers.sizeDetails=%1$S (%2$S పరిమాణం)
 
 # LOCALIZATION NOTE (netmonitor.headers.version): This is the label displayed
 # in the network details headers tab identifying the http version.
@@ -964,9 +963,6 @@
 # in the network details headers tab, with a link to external documentation for
 # status codes.
 
-# LOCALIZATION NOTE (netmonitor.summary.referrerPolicy): This is the label displayed
-# in the network details headers tab identifying the referrer policy.
-
 # LOCALIZATION NOTE (netmonitor.headers.referrerPolicy): This is the label displayed
 # in the network details headers tab identifying the referrer policy.
 
@@ -1417,3 +1413,8 @@
 # LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
 # when the HAR copy menu item is hovered
 
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
diff -Nru firefox-84.0.2+build1/l10n/te/devtools/client/storage.properties firefox-85.0+build1/l10n/te/devtools/client/storage.properties
--- firefox-84.0.2+build1/l10n/te/devtools/client/storage.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/devtools/client/storage.properties	2021-01-18 20:08:54.000000000 +0000
@@ -22,8 +22,12 @@
 tree.labels.indexedDB=ఇండెక�స�డ� డీబీ
 tree.labels.Cache=క�యాషేనిల�వ
 
+# 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.
 table.headers.cookies.name=పేర�
 table.headers.cookies.value=విల�వ
+table.headers.cookies.size=పరిమాణం
 
 table.headers.Cache.status=స�థితి
 
@@ -40,6 +44,7 @@
 table.headers.indexedDB.autoIncrement=స�వియ పెంప�దల
 table.headers.indexedDB.indexes=సూచికల�
 
+
 # LOCALIZATION NOTE (label.expires.session):
 # This string is displayed in the expires column when the cookie is Session
 # Cookie
@@ -65,6 +70,9 @@
 # Label of popup menu action to add an item.
 storage.popupMenu.addItemLabel=అంశాన�ని జోడించ�
 
+# LOCALIZATION NOTE (storage.popupMenu.refreshItemLabel):
+# Label of popup menu action to refresh an item.
+
 # LOCALIZATION NOTE (storage.popupMenu.deleteAllFromLabel):
 # Label of popup menu action to delete all storage items.
 storage.popupMenu.deleteAllFromLabel=అన�నింటి న�ండి “%S� న� తొలగించ�
diff -Nru firefox-84.0.2+build1/l10n/te/dom/chrome/accessibility/AccessFu.properties firefox-85.0+build1/l10n/te/dom/chrome/accessibility/AccessFu.properties
--- firefox-84.0.2+build1/l10n/te/dom/chrome/accessibility/AccessFu.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/dom/chrome/accessibility/AccessFu.properties	2021-01-18 20:08:54.000000000 +0000
@@ -130,7 +130,6 @@
 navigation     =       విహరిస�తోంది
 search         =       వెత�క�
 
-
 # LOCALIZATION NOTE (tblColumnInfo): Semi-colon list of plural forms.
 # Number of columns within the table.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
@@ -206,7 +205,7 @@
 quicknav_Graphic     = చిత�రమ�ల�
 quicknav_Heading     = శీర�షికల�
 quicknav_ListItem    = జాబితా అంశాల�
-quicknav_Link        = లింక�ల�
+quicknav_Link        = లంకెల�
 quicknav_List        = జాబితాల�
 quicknav_PageTab     = పేజీ ట�యాబ�ల�
 quicknav_RadioButton = రేడియో బటన�ల�
diff -Nru firefox-84.0.2+build1/l10n/te/dom/dom/media.ftl firefox-85.0+build1/l10n/te/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/te/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/te/dom/dom/media.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/te/toolkit/chrome/global/findbar.properties firefox-85.0+build1/l10n/te/toolkit/chrome/global/findbar.properties
--- firefox-84.0.2+build1/l10n/te/toolkit/chrome/global/findbar.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/toolkit/chrome/global/findbar.properties	2021-01-18 20:08:54.000000000 +0000
@@ -8,7 +8,7 @@
 WrappedToBottom=పేజీ పైకి చేర�క�న�నది, క�రింది న�ండి కొనసాగించండి
 NormalFind=పేజీలో వెతకండి
 FastFind=త�వరిత కన�గోల�
-FastFindLinks=త�వరిత కన�గోల� (లింక�ల� మాత�రమే)
+FastFindLinks=త�వరిత కన�గోల� (లంకెల� మాత�రమే)
 CaseSensitive=(చిన�నాపెద�దా అక�షరంతేడా)
 EntireWord=(పూర�తి పదాల� మాత�రమే)
 # LOCALIZATION NOTE (FoundMatches): Semicolon-separated list of plural forms.
diff -Nru firefox-84.0.2+build1/l10n/te/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/te/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/te/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:59:48.000000000 +0000
+++ firefox-85.0+build1/l10n/te/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:08:54.000000000 +0000
@@ -23,18 +23,22 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=దింప�కోల� దోషం
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
 downloadErrorGeneric=డౌన�‌లోడ� భద�రపరచలేమ� ఎంద�కంటే తెలియని దోషమ� సంభవించింది.\n\nదయచేసి మరలా ప�రయత�నించండి.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
-quitCancelDownloadsAlertTitle=అన�ని డౌన�లోడ�లన� రద�ద�చేయాలా?
+quitCancelDownloadsAlertTitle=దింప�కోళ�ళనిటినీ రద�ద�చేయాలా?
 quitCancelDownloadsAlertMsg=ఇప�ప�డ� వైదొలగితే,1 డౌన�లోడ�  రద�దవ�త�ంది. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
 quitCancelDownloadsAlertMsgMultiple=ఇప�ప�డ� వైదొలగితే, %S డౌన�లోడ�ల� రద�దవ�తాయి. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
 quitCancelDownloadsAlertMsgMac=ఇప�ప�డ� నిష�క�రమిస�తే, 1 డౌన�లోడ�  రద�దవ�త�ంది. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
 quitCancelDownloadsAlertMsgMacMultiple=ఇప�ప�డ� నిష�క�రమిస�తే, %S డౌన�లోడ�ల� రద�దవ�తాయి. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
-offlineCancelDownloadsAlertTitle=అన�ని డౌన�లోడ�లన� రద�ద� చేయాలా?
+offlineCancelDownloadsAlertTitle=దింప�కోళ�ళనిటినీ రద�ద�చేయాలా?
 offlineCancelDownloadsAlertMsg=ఇప�ప�డ� మీర� ఆఫ�‌లైన�‌లోకి వెళితే, 1 డౌన�లోడ�  రద�దవ�త�ంది. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
 offlineCancelDownloadsAlertMsgMultiple=ఇప�ప�డ� మీర� ఆఫ�‌లైన�‌లోకి వెళితే, %S డౌన�లోడ�ల� రద�దవ�తాయి. మీర� ఖచ�చితంగా వైదొలగాలని అన�క�ంట�న�నారా?
-leavePrivateBrowsingCancelDownloadsAlertTitle=అన�ని డౌన�లోడ�లన� రద�ద�చేయాలా?
+leavePrivateBrowsingCancelDownloadsAlertTitle=దింప�కోళ�ళనిటినీ రద�ద�చేయాలా?
 leavePrivateBrowsingWindowsCancelDownloadsAlertMsg2=ఇప�ప�డ� అంతరంగిక విహరణ కిటికీలన�నింటినీ మూసివేస�తే, 1 దింప�కోల� రద�దవ�త�ంది. మీర� నిజంగానే అంతరంగిత విహరణన� వదిలి వెళ�ళాలన�క�ంట�న�నారా?
 leavePrivateBrowsingWindowsCancelDownloadsAlertMsgMultiple2=ఇప�ప�డ� అంతరంగిక విహరణ కిటికీలన�నింటినీ మూసివేస�తే, %S దింప�కోళ�ళ� రద�దవ�తాయి. మీర� నిజంగానే అంతరంగిత విహరణిని వదిలి వెళ�ళాలన�క�ంట�న�నారా?
 cancelDownloadsOKText=1 దింప�కోల�న� రద�ద�చేయండి
diff -Nru firefox-84.0.2+build1/l10n/te/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/te/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/te/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/te/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:08:54.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/th/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/aboutLogins.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/aboutLogins.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -168,7 +168,11 @@
 about-logins-confirm-remove-dialog-title = ลบ�ารเข้าสู่ระบบนี้?
 confirm-delete-dialog-message = �าร�ระทำนี้ไม่สามารถเลิ�ทำได้
 about-logins-confirm-remove-dialog-confirm-button = ลบ
-about-logins-confirm-remove-all-dialog-confirm-button = เอาทั้งหมดออ�
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] เอาออ�
+       *[other] เอาออ�ทั้งหมด
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] ใช่ ลบ�ารเข้าสู่ระบบนี้
@@ -178,9 +182,24 @@
     { $count ->
        *[other] ลบ�ารเข้าสู่ระบบทั้งหมด { $count } ราย�ารหรือไม่?
     }
+about-logins-confirm-remove-all-dialog-message =
+    { $count ->
+        [1] �ารดำเนิน�ารนี้จะเอาข้อมูล�ารเข้าสู่ระบบที่คุณบันทึ�ลงใน { -brand-short-name } �ละ�าร�จ้งเตือนเ�ี่ยว�ับ�ารละเมิดใด ๆ ที่ปรา��ที่นี่ออ� คุณจะไม่สามารถย�เลิ��ารดำเนิน�ารนี้ได้
+       *[other] �ารดำเนิน�ารนี้จะเอาข้อมูล�ารเข้าสู่ระบบที่คุณบันทึ�ลงใน { -brand-short-name } �ละ�าร�จ้งเตือนเ�ี่ยว�ับ�ารละเมิดใด ๆ ที่ปรา��ที่นี่ออ� คุณจะไม่สามารถย�เลิ��ารดำเนิน�ารนี้ได้
+    }
+about-logins-confirm-remove-all-sync-dialog-title =
+    { $count ->
+       *[other] ต้อง�ารเอาข้อมูล�ารเข้าสู่ระบบ { $count } ราย�ารออ�จา�อุป�รณ์ทั้งหมดหรือไม่?
+    }
+about-logins-confirm-remove-all-sync-dialog-message =
+    { $count ->
+        [1] �ารดำเนิน�ารนี้จะเอาข้อมูล�ารเข้าสู่ระบบที่คุณบันทึ�ลงใน { -brand-short-name } บนอุป�รณ์ทั้งหมดที่ซิงค์�ับ{ -fxaccount-brand-name } ของคุณ �ารดำเนิน�ารนี้จะเอา�าร�จ้งเตือนเ�ี่ยว�ับ�ารละเมิดที่ปรา��ที่นี่ออ�ด้วย คุณจะไม่สามารถย�เลิ��ารดำเนิน�ารนี้ได้
+       *[other] �ารดำเนิน�ารนี้จะเอาข้อมูล�ารเข้าสู่ระบบที่คุณบันทึ�ลงใน { -brand-short-name } บนอุป�รณ์ทั้งหมดที่ซิงค์�ับ{ -fxaccount-brand-name } ของคุณ �ารดำเนิน�ารนี้จะเอา�าร�จ้งเตือนเ�ี่ยว�ับ�ารละเมิดที่ปรา��ที่นี่ออ�ด้วย คุณจะไม่สามารถย�เลิ��ารดำเนิน�ารนี้ได้
+    }
 about-logins-confirm-export-dialog-title = ส่งออ�ข้อมูล�ารเข้าสู่ระบบ�ละรหัสผ่าน
 about-logins-confirm-export-dialog-message = รหัสผ่านของคุณจะถู�บันทึ�เป็นข้อความที่อ่านได้ (เช่น BadP@ssw0rd) ดังนั้นใคร�็ตามที่สามารถเปิดไฟล์ที่ส่งออ�ได้จะสามารถดูได้
 about-logins-confirm-export-dialog-confirm-button = ส่งออ�…
+about-logins-alert-import-title = �ารนำเข้าเสร็จสมบูรณ์
 confirm-discard-changes-dialog-title = ละทิ้ง�ารเปลี่ยน�ปลงที่ยังไม่ได้บันทึ�?
 confirm-discard-changes-dialog-message = �ารเปลี่ยน�ปลงที่ยังไม่ได้บันทึ�ทั้งหมดจะสู�หาย
 confirm-discard-changes-dialog-confirm-button = ละทิ้ง
@@ -242,3 +261,10 @@
         [macos] เอ�สาร CSV
        *[other] ไฟล์ CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = �ารนำเข้าเสร็จสมบูรณ์
+about-logins-import-dialog-done = เสร็จสิ้น
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/th/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/appmenu.ftl	2021-01-06 12:00:02.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/appmenu.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = หน้าต่างใหม่
+appmenuitem-new-private-window =
+    .label = หน้าต่างส่วนตัวใหม่
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = ขยายเข้า
 appmenuitem-zoom-reduce =
     .label = ขยายออ�
+appmenuitem-fullscreen =
+    .label = เต็มหน้าจอ
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ซิงค์ตอนนี้
+appmenuitem-save-page =
+    .label = บันทึ�หน้าเป็น…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = มีอะไรใหม่
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/browser.ftl firefox-85.0+build1/l10n/th/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/browser.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/browser.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -294,6 +294,7 @@
 identity-permissions =
     .value = สิทธิอนุ�าต
 identity-permissions-storage-access-header = คุ��ี้ข้ามไซต์
+identity-permissions-storage-access-hint = บุคคลเหล่านี้สามารถใช้คุ��ี้ข้ามไซต์�ละข้อมูลไซต์ในขณะที่คุณอยู่บนไซต์นี้ได้
 identity-permissions-reload-hint = คุณอาจจำเป็นต้องโหลดหน้าใหม่เพื่อให้�ารเปลี่ยน�ปลงมีผล
 identity-permissions-empty = คุณไม่ได้อนุ�าตไซต์นี้ด้วยสิทธิอนุ�าตพิเศษใด ๆ
 identity-clear-site-data =
@@ -342,6 +343,7 @@
 browser-import-button2 =
     .label = นำเข้าที่คั่นหน้า…
     .tooltiptext = นำเข้าที่คั่นหน้าจา�เบราว์เซอร์อื่นมายัง { -brand-short-name }
+bookmarks-toolbar-empty-message = วางที่คั่นหน้าของคุณไว้ที่นี่บน�ถบเครื่องมือที่คั่นหน้าเพื่อให้เข้าถึงได้อย่างรวดเร็ว <a data-l10n-name="manage-bookmarks">จัด�ารที่คั่นหน้า…</a>
 
 ## WebRTC Pop-up notifications
 
@@ -493,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ได้ควบคุมตัวชี้ของคุณ �ด Esc เพื่อดึง�ารควบคุมคืน
 pointerlock-warning-no-domain = เอ�สารชิ้นนี้ได้ควบคุมตัวชี้ของคุณ �ด Esc เพื่อดึง�ารควบคุมคืน
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = �สดงที่คั่นหน้าทั้งหมด
+bookmarks-recent-bookmarks =
+    .value = ที่คั่นหน้าที่เพิ่มล่าสุด
+bookmarks-toolbar-chevron =
+    .tooltiptext = �สดงที่คั่นหน้าเพิ่มเติม
+bookmarks-sidebar-content =
+    .aria-label = ที่คั่นหน้า
+bookmarks-menu-button =
+    .label = เมนูที่คั่นหน้า
+bookmarks-other-bookmarks-menu =
+    .label = ที่คั่นหน้าอื่น ๆ
+bookmarks-mobile-bookmarks-menu =
+    .label = ที่คั่นหน้าในมือถือ
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ซ่อน�ถบข้างที่คั่นหน้า
+           *[other] ดู�ถบข้างที่คั่นหน้า
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ซ่อน�ถบเครื่องมือที่คั่นหน้า
+           *[other] ดู�ถบเครื่องมือที่คั่นหน้า
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] เอาเมนูที่คั่นหน้าออ�จา��ถบเครื่องมือ
+           *[other] เพิ่มเมนูที่คั่นหน้าไปยัง�ถบเครื่องมือ
+        }
+bookmarks-search =
+    .label = ค้นหาที่คั่นหน้า
+bookmarks-tools =
+    .label = เครื่องมือที่คั่นหน้า
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = �ถบเครื่องมือที่คั่นหน้า
+    .accesskey = บ
+    .aria-label = ที่คั่นหน้า
+bookmarks-toolbar-menu =
+    .label = �ถบเครื่องมือที่คั่นหน้า
+bookmarks-toolbar-placeholder =
+    .title = ราย�าร�ถบเครื่องมือที่คั่นหน้า
+bookmarks-toolbar-placeholder-button =
+    .label = ราย�าร�ถบเครื่องมือที่คั่นหน้า
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = ที่คั่นหน้า
+library-bookmarks-bookmark-this-page =
+    .label = เพิ่มที่คั่นหน้าสำหรับหน้านี้
+library-bookmarks-bookmark-edit =
+    .label = ��้ไขที่คั่นหน้านี้
+library-recent-activity-label = �ิจ�รรมล่าสุด
+
+## More items
+
+more-menu-go-offline =
+    .label = ทำงานออฟไลน์
+    .accesskey = ฟ
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/th/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/newtab/newtab.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/newtab/newtab.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ท็บใหม่
 newtab-settings-button =
     .title = ปรับ�ต่งหน้า�ท็บใหม่ของคุณ
+newtab-personalize-button-label = ปรับให้เป็น�บบส่วนตัว
+    .title = ปรับ�ท็บใหม่ให้เป็นส่วนตัว
+    .aria-label = ปรับ�ท็บใหม่ให้เป็นส่วนตัว
 
 ## Search box component.
 
@@ -20,6 +23,10 @@
     .placeholder = ค้นหาเว็บ
     .title = ค้นหาเว็บ
     .aria-label = ค้นหาเว็บ
+newtab-search-box-text = ค้นหาเว็บ
+newtab-search-box-input =
+    .placeholder = ค้นหาเว็บ
+    .aria-label = ค้นหาเว็บ
 
 ## Top Sites - General form dialog.
 
@@ -207,3 +214,20 @@
 
 newtab-error-fallback-info = อุปส์ มีบางอย่างผิดพลาดใน�ารโหลดเนื้อหานี้
 newtab-error-fallback-refresh-link = เรีย�หน้าใหม่เพื่อลองอี�ครั้ง
+
+## Customization Menu
+
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } �ถว
+    }
+newtab-custom-pocket-title = �นะนำโดย { -pocket-brand-name }
+newtab-custom-pocket-sponsored = เรื่องราวที่ได้รับ�ารสนับสนุน
+newtab-custom-recent-title = �ิจ�รรมล่าสุด
+newtab-custom-close-button = ปิด
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = ส่วนย่อย
+newtab-custom-settings = จัด�าร�ารตั้งค่าเพิ่มเติม
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/places.ftl firefox-85.0+build1/l10n/th/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/places.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/places.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = โฟลเดอร์ย่อย
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = ที่คั่นหน้าอื่น ๆ
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/th/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/preferences/preferences.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/preferences/preferences.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -503,8 +503,6 @@
     .label = เรื่องราวที่ได้รับ�ารสนับสนุน
 home-prefs-highlights-header =
     .label = ราย�ารเด่น
-home-prefs-recent-activity-header =
-    .label = �ิจ�รรมล่าสุด
 home-prefs-highlights-description = �ารคัดเลือ�ไซต์ที่คุณได้บันทึ�ไว้หรือเยี่ยมชม
 home-prefs-highlights-option-visited-pages =
     .label = หน้าที่เยี่ยมชม�ล้ว
@@ -514,6 +512,8 @@
     .label = �ารดาวน์โหลดล่าสุด
 home-prefs-highlights-option-saved-to-pocket =
     .label = หน้าที่บันทึ�ไว้ใน { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = �ิจ�รรมล่าสุด
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -911,6 +911,9 @@
 addressbar-locbar-topsites-option =
     .label = ไซต์เด่น
     .accesskey = ด
+addressbar-locbar-engines-option =
+    .label = เครื่องมือค้นหา
+    .accesskey = a
 addressbar-suggestions-settings = เปลี่ยนค่า�ำหนดข้อเสนอ�นะจา�เครื่องมือค้นหา
 
 ## Privacy Section - Content Blocking
@@ -918,6 +921,7 @@
 content-blocking-enhanced-tracking-protection = �ารป้อง�ัน�ารติดตามที่มา�ขึ้น
 content-blocking-section-top-level-description = ตัวติดตามจะติดตามคุณทางออนไลน์เพื่อรวบรวมข้อมูลเ�ี่ยว�ับพฤติ�รรม�ารค้นหา�ละความสนใจของคุณ { -brand-short-name } ปิด�ั้นตัวติดตาม�ละสคริปต์ที่เป็นอันตรายอื่น ๆ จำนวนมา�
 content-blocking-learn-more = เรียนรู้เพิ่มเติม
+content-blocking-fpi-incompatibility-warning = คุณ�ำลังใช้ First Party Isolation (FPI) ซึ่งจะเขียนทับ�ารตั้งค่าคุ��ี้บางอย่างของ { -brand-short-name }
 
 ## These strings are used to define the different levels of
 ## Enhanced Tracking Protection.
@@ -951,6 +955,7 @@
 content-blocking-fingerprinters = ลายนิ้วมือดิจิทัล
 content-blocking-warning-title = ระวัง!
 content-blocking-and-isolating-etp-warning-description = �ารปิด�ั้นตัวติดตาม�ละ�ย�คุ��ี้อาจส่งผล�ระทบต่อ�ารทำงานของบางไซต์ได้ โหลดหน้าใหม่พร้อมตัวติดตามเพื่อโหลดเนื้อหาทั้งหมด
+content-blocking-and-isolating-etp-warning-description-2 = �ารตั้งค่านี้อาจส่งผลให้บางเว็บไซต์ไม่�สดงผลเนื้อหาหรือไม่ทำงานอย่างถู�ต้อง หา�ไซต์ดูเหมือนจะพัง คุณอาจต้องปิด�ารป้อง�ัน�ารติดตามสำหรับไซต์นั้นเพื่อโหลดเนื้อหาทั้งหมด
 content-blocking-warning-learn-how = เรียนรู้วิธี
 content-blocking-reload-description = คุณจะต้องโหลด�ท็บของคุณใหม่เพื่อใช้�ารเปลี่ยน�ปลงเหล่านี้
 content-blocking-reload-tabs-button =
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/safebrowsing/blockedSite.ftl firefox-85.0+build1/l10n/th/browser/browser/safebrowsing/blockedSite.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/safebrowsing/blockedSite.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/safebrowsing/blockedSite.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -19,6 +19,8 @@
 safeb-blocked-malware-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>ถู�รายงานว่ามีซอฟต์�วร์ที่ประสงค์ร้าย</a> คุณสามารถ <a data-l10n-name='report_detection'>รายงานปั�หา�ารตรวจพบ</a> หรือ <a data-l10n-name='ignore_warning_link'>ไม่สนใจความเสี่ยง</a> �ละไปยังไซต์ที่ไม่ปลอดภัยนี้
 safeb-blocked-malware-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>ถู�รายงานว่ามีซอฟต์�วร์ที่ประสงค์ร้าย</a> คุณสามารถ <a data-l10n-name='report_detection'>รายงานปั�หา�ารตรวจพบ</a>
 safeb-blocked-malware-page-learn-more = เรียนรู้เพิ่มเติมเ�ี่ยว�ับเนื้อหาเว็บที่เป็นอันตรายที่ประ�อบด้วยไวรัส�ละมัล�วร์อื่น ๆ �ละวิธีป�ป้องคอมพิวเตอร์ของคุณได้ที่ <a data-l10n-name='learn_more_link'>StopBadware.org</a> เรียนรู้เพิ่มเติมเ�ี่ยว�ับระบบฟิชชิ่ง�ละระบบป้อง�ันมัล�วร์ของ { -brand-short-name } ได้ที่ <a data-l10n-name='firefox_support'>support.mozilla.org</a>
+safeb-blocked-malware-page-error-desc-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> ได้ถู�<a data-l10n-name='error_desc_link'>รายงานว่ามีซอฟต์�วร์ที่เป็นอันตราย</a> คุณสามารถ<a data-l10n-name='ignore_warning_link'>เพิ�เฉยความเสี่ยง</a>�ละไปยังไซต์ที่ไม่ปลอดภัยนี้ได้
+safeb-blocked-malware-page-error-desc-no-override-sumo = <span data-l10n-name='sitename'>{ $sitename }</span> ได้ถู�<a data-l10n-name='error_desc_link'>รายงานว่ามีซอฟต์�วร์ที่เป็นอันตราย</a>
 safeb-blocked-malware-page-learn-more-sumo = เรียนรู้เพิ่มเติมเ�ี่ยว�ับระบบฟิชชิ่ง�ละระบบป้อง�้นมัล�วร์ของ { -brand-short-name } ได้ที่ <a data-l10n-name='firefox_support'>support.mozilla.org</a>
 safeb-blocked-unwanted-page-error-desc-override = <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>ถู�รายงานว่ามีซอฟต์�วร์ที่เป็นอันตราย</a> คุณสามารถ <a data-l10n-name='ignore_warning_link'>ไม่สนใจความเสี่ยง</a> �ละไปยังไซต์ที่ไม่ปลอดภัยนี้
 safeb-blocked-unwanted-page-error-desc-no-override = <span data-l10n-name='sitename'>{ $sitename }</span> <a data-l10n-name='error_desc_link'>ถู�รายงานว่ามีซอฟต์�วร์ที่เป็นอันตราย</a>
diff -Nru firefox-84.0.2+build1/l10n/th/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/th/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/th/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = บน�ท็บใหม่เท่านั้น
     .accesskey = บ
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = �สดงเสมอ
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = ไม่ต้อง�สดง
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = �สดงบน�ท็บใหม่เท่านั้น
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = �สดงที่คั่นหน้าอื่น ๆ
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/th/devtools/client/accessibility.properties firefox-85.0+build1/l10n/th/devtools/client/accessibility.properties
--- firefox-84.0.2+build1/l10n/th/devtools/client/accessibility.properties	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/devtools/client/accessibility.properties	2021-01-18 20:08:59.000000000 +0000
@@ -307,3 +307,4 @@
 # LOCALIZATION NOTE (accessibility.toolbar.displayTabbingOrder.tooltip): A title text for a checkbox
 # tooltip in the accessibility panel toolbar that turns on/off the overlay of focusable elements in
 # their tabbing order.
+accessibility.toolbar.displayTabbingOrder.tooltip=�สดงลำดับ�ท็บขององค์ประ�อบ�ละดัชนี�ท็บ
diff -Nru firefox-84.0.2+build1/l10n/th/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/th/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/th/devtools/client/netmonitor.properties	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/devtools/client/netmonitor.properties	2021-01-18 20:08:59.000000000 +0000
@@ -1530,8 +1530,10 @@
 netmonitor.settings.copyHarTooltip=คัดลอ�ข้อมูลเครือข่ายไปยังคลิปบอร์ด
 
 # LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+netmonitor.errorpanel.description=�ผงเครือข่ายล่ม
 
 # LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
 netmonitor.errorpanel.fileBugButton=รายงานข้อบ�พร่อง
 
 # LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
+netmonitor.errorpanel.reloadPanelInfo=ปิด�ละเปิด�ล่องเครื่องมือใหม่เพื่อล้างข้อผิดพลาดนี้
diff -Nru firefox-84.0.2+build1/l10n/th/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/th/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/th/devtools/client/tooltips.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/devtools/client/tooltips.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -27,6 +27,7 @@
 inactive-css-property-is-impossible-to-override-in-visited = ไม่สามารถเขียนทับ <strong>{ $property }</strong> เนื่องจา�ข้อจำ�ัดของ <strong>:visited</strong>
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> ไม่มีผลต่อองค์ประ�อบนี้เนื่องจา�ไม่ใช่องค์ประ�อบที่ถู�จัดตำ�หน่ง
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> ไม่มีผลต่อองค์ประ�อบนี้เนื่องจา�ไม่ได้ตั้งค่า <strong>overflow:hidden</strong>
+inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> ไม่มีผลต่อองค์ประ�อบนี้เนื่องจา� <strong>outline-style</strong> เป็น <strong>auto</strong> or <strong>none</strong>
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -45,6 +46,7 @@
 inactive-css-not-display-block-on-floated-fix = ลองเอา <strong>float</strong> ออ�หรือเพิ่ม <strong>display:block</strong> { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = ลองตั้งค่าคุณสมบัติ <strong>position</strong> เป็นอย่างอื่นนอ�จา� <strong>static</strong> { learn-more }
 inactive-text-overflow-when-no-overflow-fix = ลองเพิ่ม <strong>overflow:hidden</strong> { learn-more }
+inactive-outline-radius-when-outline-style-auto-or-none-fix = ลองตั้งค่าคุณสมบัติ <strong>outline-style</strong> เป็นอย่างอื่นนอ�จา� <strong>auto</strong> หรือ <strong>none</strong> { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
 ## we display an icon. When this icon is hovered this message is displayed to explain why
diff -Nru firefox-84.0.2+build1/l10n/th/devtools/client/webconsole.properties firefox-85.0+build1/l10n/th/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/th/devtools/client/webconsole.properties	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/devtools/client/webconsole.properties	2021-01-18 20:08:59.000000000 +0000
@@ -479,6 +479,11 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=เรีย�ใช้นิพจน์ (%S) �ารดำเนิน�ารนี้จะไม่ล้างข้อมูลที่ป้อน
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.prettyPrintButton.tooltip=Pretty print expression
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/th/dom/chrome/security/security.properties firefox-85.0+build1/l10n/th/dom/chrome/security/security.properties
--- firefox-84.0.2+build1/l10n/th/dom/chrome/security/security.properties	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/dom/chrome/security/security.properties	2021-01-18 20:08:59.000000000 +0000
@@ -104,6 +104,7 @@
 
 # LOCALIZATION NOTE (MixedContentAutoUpgrade):
 # %1$S is the URL of the upgraded request; %2$S is the upgraded scheme.
+MixedContentAutoUpgrade=อัปเ�รดคำขอ�สดงผลที่ไม่ปลอดภัย ‘%1$S’ ให้ใช้ ‘%2$S’
 # LOCALIZATION NOTE (RunningClearSiteDataValue):
 # %S is the URI of the resource whose data was cleaned up
 RunningClearSiteDataValue=ส่วนหัว Clear-Site-Data บังคับให้ล้างข้อมูล “%S�
diff -Nru firefox-84.0.2+build1/l10n/th/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/th/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/th/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -185,6 +185,15 @@
 
 ##
 
+support-third-party-modules-no-value = (ไม่มีค่า)
+support-third-party-modules-button-open =
+    .title = เปิดตำ�หน่งที่ตั้งไฟล์…
+support-third-party-modules-expand =
+    .title = �สดงข้อมูลโดยละเอียด
+support-third-party-modules-folder-icon =
+    .title = เปิดตำ�หน่งที่ตั้งไฟล์…
+support-third-party-modules-down-icon =
+    .title = �สดงข้อมูลโดยละเอียด
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = รายงานข้อขัดข้องของ { $days } วันที่ผ่านมา
diff -Nru firefox-84.0.2+build1/l10n/th/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/th/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/th/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = หน้า:
     .accesskey = ห
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } จา� { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = หน้าสุดท้าย
-
+printpreview-homearrow-button =
+    .title = หน้า�ร�
+printpreview-previousarrow-button =
+    .title = หน้า�่อนหน้า
+printpreview-nextarrow-button =
+    .title = หน้าถัดไป
+printpreview-endarrow-button =
+    .title = หน้าสุดท้าย
diff -Nru firefox-84.0.2+build1/l10n/th/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/th/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/th/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:00:03.000000000 +0000
+++ firefox-85.0+build1/l10n/th/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:08:59.000000000 +0000
@@ -63,11 +63,16 @@
 printui-primary-button = พิมพ์
 printui-primary-button-save = บันทึ�
 printui-cancel-button = ย�เลิ�
+printui-close-button = ปิด
 printui-loading = �ำลังเตรียมตัวอย่าง
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = ตัวอย่าง�่อนพิมพ์
+printui-pages-per-sheet = หน้าต่อ�ผ่น
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = �ำลังพิมพ์…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/tl/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/tl/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/tl/browser/browser/appmenu.ftl	2021-01-06 12:00:06.000000000 +0000
+++ firefox-85.0+build1/l10n/tl/browser/browser/appmenu.ftl	2021-01-18 20:09:03.000000000 +0000
@@ -13,15 +13,26 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Bagong Window
+appmenuitem-new-private-window =
+    .label = Bagong Private Window
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = i-Zoom in
 appmenuitem-zoom-reduce =
     .label = i-Zoom out
+appmenuitem-fullscreen =
+    .label = Buong Screen
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Mag-sync Na
+appmenuitem-save-page =
+    .label = I-save ang Pahina Bilang…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/tl/browser/browser/browser.ftl firefox-85.0+build1/l10n/tl/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/tl/browser/browser/browser.ftl	2021-01-06 12:00:06.000000000 +0000
+++ firefox-85.0+build1/l10n/tl/browser/browser/browser.ftl	2021-01-18 20:09:03.000000000 +0000
@@ -293,8 +293,6 @@
     .label = Nakasara
 identity-https-only-dropdown-off-temporarily =
     .label = Pansamantalang nakasara
-identity-https-only-info-turn-on = Buksan kung gusto mo na mag-upgrade ang { -brand-short-name } sa isang secure connection kung posible.
-identity-https-only-info-turn-off = Kung mukhang sira ang site, maaari mong isara ang HTTPS-Only Mode para mag-reload gamit ang insecure HTTP.
 identity-https-only-info-no-upgrade = Hindi kayang mag-upgrade ng koneksyon mula sa HTTP.
 identity-permissions =
     .value = Mga Pahintulot
@@ -341,6 +339,9 @@
 browser-window-close-button =
     .tooltiptext = Isara
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -446,14 +447,6 @@
 urlbar-result-action-search-w-engine = Maghanap gamit ang { $engine }
 urlbar-result-action-switch-tab = Lumipat sa Tab
 urlbar-result-action-visit = Puntahan
-
-## Action text shown in urlbar results, usually appended after the search
-## string or the url, like "result value - action text".
-## In these actions "Search" is a verb, followed by where the search is performed.
-
-urlbar-result-action-search-bookmarks = Hanapin sa mga Bookmark
-urlbar-result-action-search-history = Hanapin sa Kasaysayan
-urlbar-result-action-search-tabs = Hanapin sa mga Tab
 # Variables
 #  $engine (String): the name of a search engine that searches the entire Web
 #  (e.g. Google).
@@ -463,6 +456,14 @@
 #  (e.g. Amazon).
 urlbar-result-action-tabtosearch-other-engine = Maghanap sa { $engine } direkta mula sa address bar
 
+## Action text shown in urlbar results, usually appended after the search
+## string or the url, like "result value - action text".
+## In these actions "Search" is a verb, followed by where the search is performed.
+
+urlbar-result-action-search-bookmarks = Hanapin sa mga Bookmark
+urlbar-result-action-search-history = Hanapin sa Kasaysayan
+urlbar-result-action-search-tabs = Hanapin sa mga Tab
+
 ## Full Screen and Pointer Lock UI
 
 # Please ensure that the domain stays in the `<span data-l10n-name="domain">` markup.
@@ -478,3 +479,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ay may kontrol sa iyong pointer. Pindutin ang ESC para mabawi ang kontrol.
 pointerlock-warning-no-domain = Ang dokumentong ito ay may kontrol sa iyong pointer. Pindutin ang Esc para manumbalik ang kontrol.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Ipakita Lahat ng mga Bookmark
+bookmarks-recent-bookmarks =
+    .value = Mga Na-bookmark Kamakailan
+bookmarks-toolbar-chevron =
+    .tooltiptext = Magpakita ng karagdagang mga bookmark
+bookmarks-sidebar-content =
+    .aria-label = Mga bookmark
+bookmarks-menu-button =
+    .label = Menu ng mga Bookmark
+bookmarks-other-bookmarks-menu =
+    .label = Iba pang mga Bookmark
+bookmarks-mobile-bookmarks-menu =
+    .label = Mga Mobile Bookmark
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Itago ang Bookmark Sidebar
+           *[other] Ipakita ang Bookmark Sidebar
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Itago ang Bookmark Toolbar
+           *[other] Ipakita ang Bookmark Sidebar
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Alisin ang Bookmark Menu mula sa Toolbar
+           *[other] Idagdag ang Bookmark Menu sa Toolbar
+        }
+bookmarks-search =
+    .label = Hanapin sa mga Bookmark
+bookmarks-tools =
+    .label = Mga Gamit sa Pag-bookmark
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Bookmark Toolbar
+    .accesskey = B
+    .aria-label = Mga bookmark
+bookmarks-toolbar-menu =
+    .label = Bookmark Toolbar
+bookmarks-toolbar-placeholder =
+    .title = Mga nakalagay sa Bookmark Toolbar
+bookmarks-toolbar-placeholder-button =
+    .label = Mga nakalagay sa Bookmark Toolbar
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Mga bookmark
+library-bookmarks-bookmark-this-page =
+    .label = i-Bookmark ang Pahinang Ito
+library-bookmarks-bookmark-edit =
+    .label = i-Edit ang bookmark na ito
+
+## More items
+
+more-menu-go-offline =
+    .label = Magtrabaho nang Offline
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/tl/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/tl/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/tl/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/tl/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:09:03.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/tr/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/aboutLogins.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/aboutLogins.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -169,7 +169,12 @@
 about-logins-confirm-remove-dialog-title = Bu hesap kaldırılsın mı?
 confirm-delete-dialog-message = Bu işlem geri alınamaz.
 about-logins-confirm-remove-dialog-confirm-button = Kaldır
-about-logins-confirm-remove-all-dialog-confirm-button = Tümünü kaldır
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Kaldır
+        [one] Kaldır
+       *[other] Tümünü kaldır
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Evet, bu hesabı kaldır
@@ -201,6 +206,8 @@
 about-logins-confirm-export-dialog-title = Hesapları ve parolaları dışa aktarma
 about-logins-confirm-export-dialog-message = Parolalarınız okunabilir metin olarak kaydedilecek (örn. KotuP@r0la), yani dışa aktarılan dosyayı açabilen herkes parolalarınızı görebilecektir.
 about-logins-confirm-export-dialog-confirm-button = Dışa aktar…
+about-logins-alert-import-title = İçe aktarma tamamlandı
+about-logins-alert-import-message = Ayrıntılı içe aktarma özetini görüntüle
 confirm-discard-changes-dialog-title = Kaydedilmemiş değişikliklerden vazgeçilsin mi?
 confirm-discard-changes-dialog-message = Kaydedilmemiş değişikliklerin tümü kaybolacak.
 confirm-discard-changes-dialog-confirm-button = Vazgeç
@@ -262,3 +269,25 @@
         [macos] CSV belgesi
        *[other] CSV dosyası
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = İçe aktarma tamamlandı
+about-logins-import-dialog-items-added =
+    { $count ->
+        [one] <span>Eklenen hesap sayısı:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Eklenen hesap sayısı:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+        [one] <span>Güncellenen hesap sayısı:</span> <span data-l10n-name="count">{ $count }</span>
+       *[other] <span>Güncellenen hesap sayısı:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+        [one] <span>Hata:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(içe aktarılamadı)</span>
+       *[other] <span>Hata:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(içe aktarılamadı)</span>
+    }
+about-logins-import-dialog-done = Tamam
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/aboutRestartRequired.ftl firefox-85.0+build1/l10n/tr/browser/browser/aboutRestartRequired.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/aboutRestartRequired.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/aboutRestartRequired.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -4,7 +4,6 @@
 
 restart-required-title = Yeniden baÅŸlatma gerekiyor
 restart-required-header = Kusura bakmayın, devam etmeden önce küçük bir işimiz daha var.
-restart-required-intro-brand = { -brand-short-name } arka planda güncellendi. Güncellemeyi tamamlamak için “{ -brand-short-name } yeniden başlatılsın�a tıklayın.
+restart-required-intro-brand = { -brand-short-name } arka planda güncellendi. Güncellemeyi tamamlamak için “{ -brand-short-name } tarayıcısını yeniden başlat�a tıklayın.
 restart-required-description = Güncellemeden sonra hemen işinize dönebilmeniz için tüm sayfa, pencere ve sekmelerinizi geri yükleyeceğiz.
-
 restart-button-label = { -brand-short-name } tarayıcısını yeniden başlat
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/tr/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/appmenu.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/appmenu.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Yeni pencere
+appmenuitem-new-private-window =
+    .label = Yeni gizli pencere
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Yakınlaştır
 appmenuitem-zoom-reduce =
     .label = Uzaklaştır
+appmenuitem-fullscreen =
+    .label = Tam ekran
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Åžimdi eÅŸitle
+appmenuitem-save-page =
+    .label = Sayfayı farklı kaydet…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Yeni neler var?
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/tr/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/appMenuNotifications.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/appMenuNotifications.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Daha sonra
     .secondarybuttonaccesskey = D
 appmenu-update-restart-message = Yeniden başlatmanın ardından { -brand-shorter-name } tüm açık sekme ve pencerelerinizi geri yükleyecek (Gizli Gezinti modundakiler hariç).
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } otomatik olarak en son sürüme güncellenemedi.
+    .buttonlabel = Yine de { -brand-shorter-name }’u güncelle
+    .buttonaccesskey = Y
+    .secondarybuttonlabel = Daha sonra
+    .secondarybuttonaccesskey = D
+appmenu-update-other-instance-message = Yeni bir { -brand-shorter-name } güncellemesi mevcut ama şu anda başka bir { -brand-shorter-name } kopyası çalıştığı için yüklenemiyor. Güncellemeye devam etmek için çalışan kopyayı kapatın veya “yine de güncelle�yi seçin. (Diğer kopya yeniden başlatılana kadar düzgün çalışmayabilir.)
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Tamam, anladım
     .buttonaccesskey = T
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/browser.ftl firefox-85.0+build1/l10n/tr/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/browser.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/browser.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -503,3 +503,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> işaretçinizi kontrol ediyor. Kontrolü geri almak için Esc tuşuna basın.
 pointerlock-warning-no-domain = Bu belge işaretçinizi kontrol ediyor. Kontrolü geri almak için Esc tuşuna basın.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Tüm yer imlerini göster
+bookmarks-recent-bookmarks =
+    .value = Yer imlerine yeni eklenenler
+bookmarks-toolbar-chevron =
+    .tooltiptext = Daha fazla yer imi göster
+bookmarks-sidebar-content =
+    .aria-label = Yer imleri
+bookmarks-menu-button =
+    .label = Yer imleri menüsü
+bookmarks-other-bookmarks-menu =
+    .label = DiÄŸer yer imleri
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil yer imleri
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Yer imleri kenar çubuğunu gizle
+           *[other] Yer imleri kenar çubuğunu göster
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Yer imleri kenar çubuğunu gizle
+           *[other] Yer imleri araç çubuğunu göster
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Yer imleri menüsünü araç çubuğundan çıkar
+           *[other] Yer imleri menüsünü araç çubuğuna ekle
+        }
+bookmarks-search =
+    .label = Yer imlerinde ara
+bookmarks-tools =
+    .label = Yer imi araçları
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Yer imleri araç çubuğu
+    .accesskey = Y
+    .aria-label = Yer imleri
+bookmarks-toolbar-menu =
+    .label = Yer imleri araç çubuğu
+bookmarks-toolbar-placeholder =
+    .title = Yer imleri araç çubuğu öğeleri
+bookmarks-toolbar-placeholder-button =
+    .label = Yer imleri araç çubuğu öğeleri
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Yer imleri
+library-bookmarks-bookmark-this-page =
+    .label = Bu sayfayı yer imlerine ekle
+library-bookmarks-bookmark-edit =
+    .label = Bu yer imini düzenle
+library-recent-activity-label = Son etkinlikler
+
+## More items
+
+more-menu-go-offline =
+    .label = Çevrimdışı çalış
+    .accesskey = d
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/tr/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/newtab/asrouter.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/newtab/asrouter.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -120,6 +120,9 @@
 
 cfr-whatsnew-searchbar-title = Adres çubuğuna daha az yazın, daha çok bulun
 cfr-whatsnew-searchbar-body-topsites = Şimdi adres çubuğunu seçin. Sık kullandığınız bağlantıları gösteren bir kutu açılacak.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Büyüteç simgesi
 
 ## Picture-in-Picture
@@ -275,3 +278,10 @@
 
 cfr-whatsnew-search-shortcuts-header = Adres çubuğunda arama kısayolları
 cfr-whatsnew-search-shortcuts-body = Adres çubuğuna bir arama motorunun veya belirli bir sitenin adını yazdığınızda açılan arama önerilerinde mavi bir kısayol görünecek. Adres çubuğu üzerinden hemen arama yapmak için bu kısayolu seçebilirsiniz.
+
+## What's new: Cookies protection
+
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Daha iyi yer imleri
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/tr/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/newtab/newtab.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Yeni Sekme
 newtab-settings-button =
     .title = Yeni Sekme sayfanızı özelleştirin
+newtab-personalize-button-label = KiÅŸiselleÅŸtir
+    .title = Yeni sekmeyi kiÅŸiselleÅŸtir
+    .aria-label = Yeni sekmeyi kiÅŸiselleÅŸtir
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Web’de ara
     .title = Web’de ara
     .aria-label = Web’de ara
+newtab-search-box-text = Web’de ara
+newtab-search-box-input =
+    .placeholder = Web’de ara
+    .aria-label = Web’de ara
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Arama motoru ekle
 newtab-topsites-add-topsites-header = Yeni sık kullanılan site
+newtab-topsites-add-shortcut-header = Yeni kısayol
 newtab-topsites-edit-topsites-header = Sık kullanılan siteyi düzenle
+newtab-topsites-edit-shortcut-header = Kısayolu düzenle
 newtab-topsites-title-label = Başlık
 newtab-topsites-title-input =
     .placeholder = Başlık yazın
@@ -145,7 +154,7 @@
 ## Section Menu: These strings are displayed in the section context menu and are
 ## meant as a call to action for the given section.
 
-newtab-section-menu-remove-section = Bölümü sil
+newtab-section-menu-remove-section = Bölümü kaldır
 newtab-section-menu-collapse-section = Bölümü daralt
 newtab-section-menu-expand-section = Bölümü genişlet
 newtab-section-menu-manage-section = Bölümü yönet
@@ -203,3 +212,27 @@
 
 newtab-error-fallback-info = Bu içerik yüklenirken bir hata oluştu.
 newtab-error-fallback-refresh-link = Yeniden denemek için sayfayı tazeleyin.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Kısayollar
+newtab-custom-shortcuts-subtitle = KaydettiÄŸiniz veya ziyaret ettiÄŸiniz siteler
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } satır
+       *[other] { $num } satır
+    }
+newtab-custom-sponsored-sites = Sponsorlu kısayollar
+newtab-custom-pocket-title = { -pocket-brand-name } önerileri
+newtab-custom-pocket-subtitle = { -brand-product-name } ailesinin bir parçası olan { -pocket-brand-name }’ın seçtiği harika içerikler
+newtab-custom-pocket-sponsored = Sponsorlu haberler
+newtab-custom-recent-title = Son etkinlikler
+newtab-custom-recent-subtitle = Son kullanılan siteler ve içeriklerden bir seçki
+newtab-custom-close-button = Kapat
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Duyurular
+newtab-custom-snippets-subtitle = { -vendor-short-name } ve { -brand-product-name }’tan ipuçları ve haberler
+newtab-custom-settings = Diğer ayarları yönet
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/places.ftl firefox-85.0+build1/l10n/tr/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/places.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/places.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Alt klasör
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = DiÄŸer yer imleri
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/tr/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/preferences/preferences.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -500,6 +500,11 @@
 home-prefs-topsites-description = En çok ziyaret ettiğiniz siteler
 home-prefs-topsites-by-option-sponsored =
     .label = Sponsorlu sık kullanılanlar
+home-prefs-shortcuts-header =
+    .label = Kısayollar
+home-prefs-shortcuts-description = KaydettiÄŸiniz veya ziyaret ettiÄŸiniz siteler
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Sponsorlu kısayollar
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -507,6 +512,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } öneriyor
 home-prefs-recommended-by-description-update = { $provider } tarafından seçilen harika içerikler
+home-prefs-recommended-by-description-new = { -brand-product-name } ailesinin bir parçası olan { $provider }’ın seçtiği harika içerikler
 
 ##
 
@@ -515,8 +521,6 @@
     .label = Sponsorlu haberler
 home-prefs-highlights-header =
     .label = Öne çıkanlar
-home-prefs-recent-activity-header =
-    .label = Son etkinlikler
 home-prefs-highlights-description = Kaydettiğiniz ve ziyaret ettiğiniz sitelerin bir seçkisi
 home-prefs-highlights-option-visited-pages =
     .label = Ziyaret ettiÄŸim sayfalar
@@ -526,6 +530,9 @@
     .label = Son indirme
 home-prefs-highlights-option-saved-to-pocket =
     .label = { -pocket-brand-name }’a kaydettiğim sayfalar
+home-prefs-recent-activity-header =
+    .label = Son etkinlikler
+home-prefs-recent-activity-description = Son kullanılan siteler ve içeriklerden bir seçki
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -533,6 +540,7 @@
 home-prefs-snippets-header =
     .label = Duyurular
 home-prefs-snippets-description = { -vendor-short-name } ve { -brand-product-name }’tan haberler
+home-prefs-snippets-description-new = { -vendor-short-name } ve { -brand-product-name }’tan ipuçları ve haberler
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -924,9 +932,16 @@
 addressbar-locbar-openpage-option =
     .label = Açık sekmeler
     .accesskey = s
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Kısayollar
+    .accesskey = K
 addressbar-locbar-topsites-option =
     .label = Sık kullanılanlar
     .accesskey = S
+addressbar-locbar-engines-option =
+    .label = Arama motorları
+    .accesskey = m
 addressbar-suggestions-settings = Arama motoru önerileri için tercihleri değiştir
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/tr/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/tr/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/tr/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Yalnızca yeni sekmede
     .accesskey = Y
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Her zaman göster
+    .accesskey = H
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Asla gösterme
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Yalnızca yeni sekmede göster
+    .accesskey = Y
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Diğer yer imlerini göster
     .accesskey = D
diff -Nru firefox-84.0.2+build1/l10n/tr/devtools/client/markers.properties firefox-85.0+build1/l10n/tr/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/tr/devtools/client/markers.properties	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/devtools/client/markers.properties	2021-01-18 20:09:09.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Yetersiz bellek
 marker.gcreason.label.CC_WAITING=Döngü koleksiyonu tarafından zorlandı
+marker.gcreason.label.CC_FINISHED=Döngü toplama tamamlandı
 marker.gcreason.label.CC_FORCED=Döngü koleksiyonu tarafından zorlandı
 marker.gcreason.label.LOAD_END=Sayfa yüklemesi tamamlandı
 marker.gcreason.label.PAGE_HIDE=Arka plana taşındı
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery koleksiyonu
-
diff -Nru firefox-84.0.2+build1/l10n/tr/devtools/client/toolbox.properties firefox-85.0+build1/l10n/tr/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/tr/devtools/client/toolbox.properties	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/devtools/client/toolbox.properties	2021-01-18 20:09:09.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Geliştirici araçlarını kapat
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Ayrık konsolu göster
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/tr/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/tr/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/tr/dom/chrome/dom/dom.properties	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/dom/chrome/dom/dom.properties	2021-01-18 20:09:09.000000000 +0000
@@ -424,4 +424,7 @@
 FolderUploadPrompt.message = “%S� klasöründeki tüm dosyaları yüklemek istediğinizden emin misiniz? Yalnızca siteye güveniyorsanız yükleme yapın.
 FolderUploadPrompt.acceptButtonLabel = Yükle
 InputPickerBlockedNoUserActivation=Kullanıcı etkinleştirmesi olmadığı için <input> seçici engellendi.
+ExternalProtocolFrameBlockedNoUserActivation=Harici protokole sahip iframe, kullanıcı etkinleştirmesinin olmaması veya bu tür son iframe'in yüklenmesinden bu yana yeterli zaman geçmemesi nedeniyle engellendi.
 MultiplePopupsBlockedNoUserActivation=Kullanıcı etkinleştirmesi olmadığı için çoklu açılır pencere açılması engellendi.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Bilinmeyen “as� veya “type� değerleri ya da eşleşmeyen “media� özniteliği nedeniyle %S önyüklemesi yok sayıldı.
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/tr/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/tr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:09:09.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=gün;gün
 
 downloadErrorAlertTitle=İndirme hatası
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=İndirme %S tarafından engellendiği için kaydedilemiyor.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=İndirme bir eklenti tarafından engellendiği için kaydedilemiyor.
 downloadErrorGeneric=Bilinmeyen bir hata oluştuğu için indirilen dosya kaydedilemiyor.\n\nLütfen tekrar deneyin.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/tr/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/tr/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:09:09.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Vekil sunucusu bağlantıyı reddetti
 check_error-2153390069=Sunucu onay belgesinin süresi doldu (Yanlışsa lütfen sistem tarih ve saatini doğru ayarlayın ya da ağ yöneticinize başvurun)
 check_error-verification_failed=Güncellemenin bütünlüğü doğrulanamadı
+check_error-move_failed=Güncelleme kurulum için hazırlanamadı
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/tr/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -185,6 +185,31 @@
 
 ##
 
+support-third-party-modules-title = Üçüncü taraf modülleri
+support-third-party-modules-module = Modül dosyası
+support-third-party-modules-version = Dosya sürümü
+support-third-party-modules-vendor = Sağlayıcı bilgileri
+support-third-party-modules-process = İşlem türü ve kimliği
+support-third-party-modules-thread = İş parçacığı
+support-third-party-modules-base = Imagebase adresi
+support-third-party-modules-uptime = İşlemin çalışma süresi (ms)
+support-third-party-modules-duration = Yükleme süresi (ms)
+support-third-party-modules-empty = Hiçbir üçüncü taraf modülü yüklenmedi.
+support-third-party-modules-no-value = (DeÄŸer yok)
+support-third-party-modules-button-open =
+    .title = Dosya konumunu aç…
+support-third-party-modules-expand =
+    .title = Ayrıntılı bilgileri göster
+support-third-party-modules-collapse =
+    .title = Ayrıntılı bilgileri gizle
+support-third-party-modules-unsigned-icon =
+    .title = Bu modül imzalanmamış
+support-third-party-modules-folder-icon =
+    .title = Dosya konumunu aç…
+support-third-party-modules-down-icon =
+    .title = Ayrıntılı bilgileri göster
+support-third-party-modules-up-icon =
+    .title = Ayrıntılı bilgileri gizle
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/tr/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/featuregates/features.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -41,12 +41,14 @@
     .label = Geliştirici Araçları: Execution Context Selector
 experimental-features-devtools-compatibility-panel =
     .label = Geliştirici Araçları: Uyumluluk Paneli
+experimental-features-devtools-compatibility-panel-description = Sayfa Denetçisi için, uygulamanızın tarayıcılar arası uyumluluk durumunu ayrıntılı olarak gösteren yan panel. Daha fazla bilgi için bkz. <a data-l10n-name="bugzilla">bug 1584464</a>.
 # Do not translate 'SameSite', 'Lax' and 'None'.
 experimental-features-cookie-samesite-lax-by-default2 =
     .label = Çerezler: Varsayılan olarak SameSite=Lax
 # Do not translate 'SameSite', 'Lax' and 'None'.
 experimental-features-cookie-samesite-none-requires-secure2 =
     .label = Çerezler: SameSite=None, secure özniteliği gerektirsin
+experimental-features-cookie-samesite-none-requires-secure2-description = “SameSite=None� özniteliğine sahip çerezler secure özniteliği gerektirir. Bu özellik “Çerezler: Varsayılan olarak SameSite=Lax� deneyini gerektirir.
 # about:home should be kept in English, as it refers to the the URI for
 # the internal default home page.
 experimental-features-abouthome-startup-cache =
@@ -78,3 +80,6 @@
 experimental-features-multi-pip =
     .label = Çoklu Görüntü İçinde Görüntü Desteği
 experimental-features-multi-pip-description = Birden çok görüntü içinde görüntü penceresinin aynı anda açılmasını sağlamak için deneysel destek.
+experimental-features-http3 =
+    .label = HTTP/3 protokolü
+experimental-features-http3-description = Deneysel HTTP/3 protokolü desteği.
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/tr/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Sayfa:
     .accesskey = f
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } / { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Son sayfa
-
+printpreview-homearrow-button =
+    .title = Ä°lk sayfa
+printpreview-previousarrow-button =
+    .title = Önceki sayfa
+printpreview-nextarrow-button =
+    .title = Sonraki sayfa
+printpreview-endarrow-button =
+    .title = Son sayfa
diff -Nru firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/tr/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/tr/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:01:03.000000000 +0000
+++ firefox-85.0+build1/l10n/tr/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:09.000000000 +0000
@@ -25,6 +25,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = BitiÅŸ
+printui-page-custom-range-input =
+    .aria-label = Özel sayfa aralığını yazın
+    .placeholder = örn. 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Kopya sayısı
 printui-orientation = Yönlendirme
@@ -48,6 +51,7 @@
 printui-options = Seçenekler
 printui-headers-footers-checkbox = Üst bilgi ve alt bilgileri yazdır
 printui-backgrounds-checkbox = Arka planları yazdır
+printui-selection-checkbox = Yalnızca seçimi yazdır
 printui-color-mode-label = Renk modu
 printui-color-mode-color = Renkli
 printui-color-mode-bw = Siyah beyaz
@@ -56,19 +60,29 @@
 printui-margins-min = Minimum
 printui-margins-none = Yok
 printui-margins-custom = Özel
+printui-margins-custom-inches = Özel (inç)
 printui-margins-custom-top = Ãœst
+printui-margins-custom-top-inches = Üst (inç)
 printui-margins-custom-bottom = Alt
+printui-margins-custom-bottom-inches = Alt (inç)
 printui-margins-custom-left = Sol
+printui-margins-custom-left-inches = Sol (inç)
 printui-margins-custom-right = SaÄŸ
+printui-margins-custom-right-inches = Sağ (inç)
 printui-system-dialog-link = Sistem iletişim kutusuyla yazdır…
 printui-primary-button = Yazdır
 printui-primary-button-save = Kaydet
 printui-cancel-button = Vazgeç
+printui-close-button = Kapat
 printui-loading = Ön izleme hazırlanıyor
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Yazdırma ön izleme
+printui-pages-per-sheet = Yaprak başına sayfa
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Yazdırılıyor…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/trs/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/trs/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/trs/browser/browser/appmenu.ftl	2021-01-06 12:01:06.000000000 +0000
+++ firefox-85.0+build1/l10n/trs/browser/browser/appmenu.ftl	2021-01-18 20:09:12.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Ventana nakàa
+appmenuitem-new-private-window =
+    .label = Nànin' 'ngo ventana huìi
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = N�gi’iaj nichrùn’
 appmenuitem-zoom-reduce =
     .label = N�gi’iaj gùn’
+appmenuitem-fullscreen =
+    .label = Nagi'iaj gachrò' riña aga' sikà' ràa
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Gi'iaj sun nugua'�n ma
+appmenuitem-save-page =
+    .label = Na'nïnj sà' Pâjina Gù'na…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Nù huin sa nakà hua
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/trs/browser/browser/browser.ftl firefox-85.0+build1/l10n/trs/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/trs/browser/browser/browser.ftl	2021-01-06 12:01:06.000000000 +0000
+++ firefox-85.0+build1/l10n/trs/browser/browser/browser.ftl	2021-01-18 20:09:12.000000000 +0000
@@ -298,6 +298,9 @@
 browser-window-close-button =
     .tooltiptext = Narán
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -373,3 +376,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> hua a'ngo sa nikaj ñu'unj si punterôt. Ga'ui' Esc da' narit.
 pointerlock-warning-no-domain = Ñaj na nikaj ñu'unj si punterôt. Ga'ui' Esc da' narit.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Ni'io' sa raj sun nichro' doj
+bookmarks-recent-bookmarks =
+    .value = Markador nakà doj
+bookmarks-toolbar-chevron =
+    .tooltiptext = Ni'io' a'ngò da'j markador
+bookmarks-sidebar-content =
+    .aria-label = Sa raj sun nichrò' doj
+bookmarks-menu-button =
+    .label = Menu raj sun nichrò doj
+bookmarks-other-bookmarks-menu =
+    .label = A'ngo sa raj sun nichrò' doj
+bookmarks-mobile-bookmarks-menu =
+    .label = Nej marcador aché
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Gachi hui' dukuán markador
+           *[other] Ni'io riña panel markador
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Gachrī hui' dukuâ sa raj sun'
+           *[other] Ni'io riña sa gara sun'
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Gahī hui' dukuân sa raj sun'
+           *[other] Nuto' dukuân sa raj sun'
+        }
+bookmarks-search =
+    .label = Nana'ui' sa raj sun nichrò' doj
+bookmarks-tools =
+    .label = Si rasun markadores
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Riñan man sa gara sun'
+    .accesskey = B
+    .aria-label = Sa raj sun nichrò' doj
+bookmarks-toolbar-menu =
+    .label = Riñan man sa gara sun'
+bookmarks-toolbar-placeholder =
+    .title = Dukuán màn sa garasun' ngà nej markador
+bookmarks-toolbar-placeholder-button =
+    .label = Dukuán màn sa garasun' ngà nej markador
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Sa raj sun nichrò' doj
+library-bookmarks-bookmark-this-page =
+    .label = Sa raj sun nichrà' doj pagina na
+library-bookmarks-bookmark-edit =
+    .label = Nagi'io' sa arajsun nichrò' doj
+
+## More items
+
+more-menu-go-offline =
+    .label = Gi'iaj sun nùnj si nitaj koneksiôn hua
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/trs/dom/dom/media.ftl firefox-85.0+build1/l10n/trs/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/trs/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/trs/dom/dom/media.ftl	2021-01-18 20:09:12.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/trs/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/trs/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/trs/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/trs/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:09:12.000000000 +0000
@@ -0,0 +1,3 @@
+# 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/.
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/aboutCertError.ftl firefox-85.0+build1/l10n/uk/browser/browser/aboutCertError.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/aboutCertError.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/aboutCertError.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -88,7 +88,7 @@
 unknownSocketType-title = �еочікувана відповідь �ервера
 nssFailure2-title = �е вдало�� в�тановити безпечне з’єднанн�
 csp-xfo-error-title = { -brand-short-name } не може відкрити цю �торінку
-corruptedContentError-title = Помилка. Вмі�т пошкоджено
+corruptedContentError-title = Помилка пошкодженого вмі�ту
 remoteXUL-title = Віддалений XUL
 sslv3Used-title = �еможливо безпечно з’єднати��
 inadequateSecurityError-title = Ваше з'єднанн� незахищене
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/uk/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/aboutLogins.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/aboutLogins.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -170,7 +170,13 @@
 about-logins-confirm-remove-dialog-title = Вилучити цей запи�?
 confirm-delete-dialog-message = Це незворотна ді�.
 about-logins-confirm-remove-dialog-confirm-button = Вилучити
-about-logins-confirm-remove-all-dialog-confirm-button = Вилучити в�і
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [one] Вилучити
+        [few] Вилучити { $count }
+        [many] Вилучити { $count }
+       *[other] Вилучити в�е
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Так, вилучити цей пароль
@@ -207,6 +213,8 @@
 about-logins-confirm-export-dialog-title = Ек�портувати паролі
 about-logins-confirm-export-dialog-message = Ваші паролі буде збережено у вигл�ді звичайного тек�ту (наприклад, BadP@ssw0rd), тож кожен, хто може відкрити ек�портований файл, зможе їх перегл�нути.
 about-logins-confirm-export-dialog-confirm-button = Ек�порт…
+about-logins-alert-import-title = Імпорт завершено
+about-logins-alert-import-message = Перегл�нути детальний під�умок імпорту
 confirm-discard-changes-dialog-title = Відхилити незбережені зміни?
 confirm-discard-changes-dialog-message = В�і незбережені зміни будуть втрачені.
 confirm-discard-changes-dialog-confirm-button = Відхилити
@@ -268,3 +276,26 @@
         [macos] Документ CSV
        *[other] Файл CSV
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = Імпорт завершено
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>Додано нових запи�ів:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>Оновлено на�вних запи�ів:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>Знайдено дублікатів:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>Помилки:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">(not imported)</span>
+    }
+about-logins-import-dialog-done = Готово
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/aboutPolicies.ftl firefox-85.0+build1/l10n/uk/browser/browser/aboutPolicies.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/aboutPolicies.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/aboutPolicies.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -3,15 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 about-policies-title = Корпоративна політика
-
 # 'Active' is used to describe the policies that are currently active
-active-policies-tab = �ктивно
+active-policies-tab = �ктивні
 errors-tab = Помилки
 documentation-tab = Документаці�
-
 no-specified-policies-message = Служба корпоративних політик активна, але жодної політики не увімкнено.
 inactive-message = Служба корпоративних політик неактивна.
-
 policy-name = �азва політики
 policy-value = Значенн� політики
 policy-errors = Помилки політики
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/uk/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/appmenu.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/appmenu.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = �ове вікно
+appmenuitem-new-private-window =
+    .label = Приватне вікно
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Збільшити
 appmenuitem-zoom-reduce =
     .label = Зменшити
+appmenuitem-fullscreen =
+    .label = �а ве�ь екран
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Синхронізувати зараз
+appmenuitem-save-page =
+    .label = Зберегти �к…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Що нового
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/uk/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/appMenuNotifications.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/appMenuNotifications.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = �е зараз
     .secondarybuttonaccesskey = �
 appmenu-update-restart-message = Пі�л� швидкого перезапу�ку { -brand-shorter-name } відновить в�і відкриті вкладки й вікна, �кі не були відкриті в режимі приватного перегл�ду.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } не може автоматично в�тановити найновішу вер�ію.
+    .buttonlabel = В�е одно оновити { -brand-shorter-name }
+    .buttonaccesskey = Ñ‚
+    .secondarybuttonlabel = �е зараз
+    .secondarybuttonaccesskey = �
+appmenu-update-other-instance-message = До�тупне оновленн� дл� { -brand-shorter-name }, але його не можна в�тановити, тому що працює інша копі� { -brand-shorter-name }. Закрийте її, щоб продовжити оновленн�, або виберіть оновленн� в будь-�кому випадку (інша копі� може працювати неправильно, доки ви її не перезапу�тите).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = Гаразд, зрозуміло
     .buttonaccesskey = Г
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/browser.ftl firefox-85.0+build1/l10n/uk/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/browser.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/browser.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -505,3 +505,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> отримав контроль над вашим вказівником. �ати�ніть Esc дл� поверненн� контролю.
 pointerlock-warning-no-domain = Цей документ отримав контроль над вашим вказівником. �ати�ніть Esc дл� поверненн� контролю.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Показати в�і закладки
+bookmarks-recent-bookmarks =
+    .value = О�танні закладки
+bookmarks-toolbar-chevron =
+    .tooltiptext = Показати інші закладки
+bookmarks-sidebar-content =
+    .aria-label = Закладки
+bookmarks-menu-button =
+    .label = Меню закладок
+bookmarks-other-bookmarks-menu =
+    .label = Інші закладки
+bookmarks-mobile-bookmarks-menu =
+    .label = Мобільні закладки
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Приховати бічну панель закладок
+           *[other] Показати панель закладок
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Приховати панель закладок
+           *[other] Показати панель закладок
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Вилучити меню закладок з панелі ін�трументів
+           *[other] Додати меню закладок до панелі ін�трументів
+        }
+bookmarks-search =
+    .label = Пошук закладок
+bookmarks-tools =
+    .label = Ін�трументи закладок
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Панель закладок
+    .accesskey = к
+    .aria-label = Закладки
+bookmarks-toolbar-menu =
+    .label = Панель закладок
+bookmarks-toolbar-placeholder =
+    .title = Елементи панелі закладок
+bookmarks-toolbar-placeholder-button =
+    .label = Елементи панелі закладок
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Закладки
+library-bookmarks-bookmark-this-page =
+    .label = Закла�ти цю �торінку
+library-bookmarks-bookmark-edit =
+    .label = Редагувати цю закладку
+library-recent-activity-label = �ещодавн� активні�ть
+
+## More items
+
+more-menu-go-offline =
+    .label = Працювати автономно
+    .accesskey = ÑŽ
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/uk/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/asrouter.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/newtab/asrouter.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -129,6 +129,9 @@
 
 cfr-whatsnew-searchbar-title = Вводьте менше, знаходьте більше в панелі адре�и
 cfr-whatsnew-searchbar-body-topsites = Тепер про�то оберіть панель адре�и і перед вами розгорнеть�� перелік ваших найпопул�рніших �айтів.
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = Піктограма лупи
 
 ## Picture-in-Picture
@@ -285,4 +288,14 @@
 ## What's new: Search shortcuts
 
 cfr-whatsnew-search-shortcuts-header = Ярлики пошуку в панелі адре�и
-cfr-whatsnew-search-shortcuts-body = Тепер, коли ви вводите назву пошукової �и�теми або певний �айт до панелі адре�, �иній �рлик з’�вить�� �еред пропозицій пошуку внизу. Виберіть цей �рлик, щоб завершити пошук безпо�ередньо з панелі адре�.
+cfr-whatsnew-search-shortcuts-body = Тепер, коли ви вводите назву за�обу пошуку або певний �айт в панелі адре�и, �еред пропозицій пошуку внизу з’�вить�� �иній �рлик. Виберіть цей �рлик, щоб завершити пошук безпо�ередньо з панелі адре�и.
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = Захи�т від зловми�них �уперкук
+cfr-whatsnew-supercookies-body = Веб�айти можуть таємно прикріплювати "�уперкуки" до вашого браузера, �кі можуть пере�лідувати ва� в Інтернеті, навіть �кщо ви очи�тите в�і куки. { -brand-short-name } тепер забезпечує надійний захи�т проти �уперкук, тому їх не можна буде викори�товувати дл� �теженн� за вами між �айтами.
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = Поліпшено взаємодію з закладками
+cfr-whatsnew-bookmarking-body = Стало про�тіше від�тежувати ваші улюблені �айти. { -brand-short-name } тепер запам'�товує ваше бажане розташуванн� дл� збережених закладок, показує панель закладок у нових вкладках, а також дозвол�є легко отримати до�туп до решти закладок через теку панелі ін�трументів.
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/uk/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/newtab.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = �ова вкладка
 newtab-settings-button =
     .title = �алаштуйте �вою �торінку нової вкладки
+newtab-personalize-button-label = Пер�оналізувати
+    .title = Пер�оналізувати нову вкладку
+    .aria-label = Пер�оналізувати нову вкладку
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = Пошук в Інтернеті
     .title = Пошук в Інтернеті
     .aria-label = Пошук в Інтернеті
+newtab-search-box-text = Пошук в Інтернеті
+newtab-search-box-input =
+    .placeholder = Пошук в Інтернеті
+    .aria-label = Пошук в Інтернеті
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Додати за�іб пошуку
 newtab-topsites-add-topsites-header = �овий попул�рний �айт
+newtab-topsites-add-shortcut-header = �овий �рлик
 newtab-topsites-edit-topsites-header = Редагувати попул�рний �айт
+newtab-topsites-edit-shortcut-header = Редагувати �рлик
 newtab-topsites-title-label = Заголовок
 newtab-topsites-title-input =
     .placeholder = Введіть назву
@@ -207,3 +216,28 @@
 
 newtab-error-fallback-info = Йой, під ча� завантаженн� цього вмі�ту що�ь пішло не так.
 newtab-error-fallback-refresh-link = Оновіть �торінку, щоб �пробувати знову.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Ярлики
+newtab-custom-shortcuts-subtitle = Сайти, �кі ви зберігаєте чи відвідуєте
+newtab-custom-row-selector =
+    { $num ->
+        [one] { $num } р�док
+        [few] { $num } р�дки
+       *[many] { $num } р�дків
+    }
+newtab-custom-sponsored-sites = Спон�оровані �рлики
+newtab-custom-pocket-title = Рекомендовано { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Добірні матеріали від { -pocket-brand-name }, що входить до родини { -brand-product-name }
+newtab-custom-pocket-sponsored = Матеріали від �пон�орів
+newtab-custom-recent-title = �едавн� активні�ть
+newtab-custom-recent-subtitle = Добірка недавніх �айтів та вмі�ту
+newtab-custom-close-button = Закрити
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Фрагменти
+newtab-custom-snippets-subtitle = Поради та новини від { -vendor-short-name } та { -brand-product-name }
+newtab-custom-settings = Керувати іншими налаштуванн�ми
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/uk/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/newtab/onboarding.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/newtab/onboarding.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -95,7 +95,7 @@
 # Variables:
 #   $addon-name (String) - Name of the add-on
 return-to-amo-addon-title = Тепер перейдімо до <img data-l10n-name="icon"/> <b>{ $addon-name }</b>.
-return-to-amo-add-extension-label = В�тановити розширенн�
+return-to-amo-add-extension-label = Додати розширенн�
 
 ## Multistage 3-screen onboarding flow strings (about:welcome pages)
 
@@ -221,7 +221,7 @@
 onboarding-lockwise-strong-passwords-button = Керуйте �воїми парол�ми
 onboarding-facebook-container-title = В�тановіть обмеженн� дл� Facebook
 onboarding-facebook-container-text2 = { -facebook-container-brand-name } обмежує ваш �оціальний профіль від до�тупу до в�ього іншого, у�кладнюючи дл� Facebook можливі�ть �тежити за вами з метою показу реклами.
-onboarding-facebook-container-button = В�тановити розширенн�
+onboarding-facebook-container-button = Додати розширенн�
 onboarding-import-browser-settings-title = Імпортуйте �вої закладки, паролі та іншу інформацію
 onboarding-import-browser-settings-text = Швидке зануренн� — легко перене�іть �вої �айти й налаштуванн� з Chrome.
 onboarding-import-browser-settings-button = Імпорт даних Chrome
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/places.ftl firefox-85.0+build1/l10n/uk/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/places.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/places.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Підтека
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Інші закладки
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/preferences/fonts.ftl firefox-85.0+build1/l10n/uk/browser/browser/preferences/fonts.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/preferences/fonts.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/preferences/fonts.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -4,7 +4,6 @@
 
 fonts-window =
     .title = Шрифти
-
 fonts-window-close =
     .key = w
 
@@ -12,7 +11,6 @@
 
 fonts-langgroup-header = Шрифти дл�
     .accesskey = Ш
-
 fonts-langgroup-arabic =
     .label = �раб�ька
 fonts-langgroup-armenian =
@@ -77,33 +75,24 @@
 
 fonts-proportional-header = Пропорційний
     .accesskey = П
-
 fonts-default-serif =
     .label = Із зарубками
 fonts-default-sans-serif =
     .label = Без зарубок
-
 fonts-proportional-size = Розмір
     .accesskey = Р
-
 fonts-serif = Із зарубками
     .accesskey = к
-
 fonts-sans-serif = Без зарубок
     .accesskey = Б
-
 fonts-monospace = Моноширинний
     .accesskey = М
-
 fonts-monospace-size = Розмір
     .accesskey = м
-
 fonts-minsize = Мінімальний розмір шрифту
     .accesskey = н
-
 fonts-minsize-none =
     .label = Без обмеженн�
-
 fonts-allow-own =
     .label = Дозволити �айтам обирати вла�ні шрифти, замі�ть в�тановлених вгорі
     .accesskey = л
@@ -115,10 +104,8 @@
 
 fonts-languages-fallback-header = Кодуванн� дл� за�тарілих веб�торінок
 fonts-languages-fallback-desc = Це кодуванн� викори�товуєть�� дл� за�тарілих веб�торінок, в �ких не вказано кодуванн�.
-
 fonts-languages-fallback-label = Резервне кодуванн� тек�ту
     .accesskey = Р
-
 fonts-languages-fallback-name-auto =
     .label = Типове дл� поточної локалі
 fonts-languages-fallback-name-arabic =
@@ -151,7 +138,6 @@
     .label = В’єтнам�ьке
 fonts-languages-fallback-name-other =
     .label = Інше (вкл. Західноєвропей�ьке)
-
 # Variables:
 #   $name {string, "Arial"} - Name of the default font
 fonts-label-default =
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/uk/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/preferences/preferences.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -89,10 +89,10 @@
 extension-controlled-new-tab-url = Розширенн� <img data-l10n-name="icon"/> { $name } контролює вашу �торінку нової вкладки.
 # This string is shown to notify the user that the password manager setting
 # is being controlled by an extension
-extension-controlled-password-saving = Розширенн� <img data-l10n-name="icon"/> { $name } контролює ці налаштуванн�.
+extension-controlled-password-saving = Розширенн� <img data-l10n-name="icon"/> { $name } контролює цей параметр.
 # This string is shown to notify the user that their notifications permission
 # is being controlled by an extension.
-extension-controlled-web-notifications = Розширенн� <img data-l10n-name="icon"/> { $name } контролює це налаштуванн�.
+extension-controlled-web-notifications = Розширенн� <img data-l10n-name="icon"/> { $name } контролює цей параметр.
 # This string is shown to notify the user that the default search engine
 # is being controlled by an extension.
 extension-controlled-default-search = Розширенн� <img data-l10n-name="icon"/> { $name } в�тановило ваш типовий за�іб пошуку.
@@ -101,7 +101,7 @@
 extension-controlled-privacy-containers = Дл� роботи розширенн� <img data-l10n-name="icon"/> { $name } необхідні вкладки в контейнері.
 # This string is shown to notify the user that their content blocking "All Detected Trackers"
 # preferences are being controlled by an extension.
-extension-controlled-websites-content-blocking-all-trackers = Розширенн� <img data-l10n-name="icon"/> { $name } контролює ці налаштуванн�.
+extension-controlled-websites-content-blocking-all-trackers = Розширенн� <img data-l10n-name="icon"/> { $name } контролює цей параметр.
 # This string is shown to notify the user that their proxy configuration preferences
 # are being controlled by an extension.
 extension-controlled-proxy-config = Розширенн� <img data-l10n-name="icon"/> { $name } контролює �по�іб з'єднанн� { -brand-short-name } з Інтернетом.
@@ -503,6 +503,11 @@
 home-prefs-topsites-description = Сайти, �кі ви відвідуєте найча�тіше
 home-prefs-topsites-by-option-sponsored =
     .label = Попул�рні �пон�оровані �айти
+home-prefs-shortcuts-header =
+    .label = Ярлики
+home-prefs-shortcuts-description = Сайти, �кі ви зберігаєте чи відвідуєте
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Спон�оровані �рлики
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -510,6 +515,7 @@
 home-prefs-recommended-by-header =
     .label = Рекомендовано { $provider }
 home-prefs-recommended-by-description-update = Вин�тково цікаві матеріали з мережі від { $provider }
+home-prefs-recommended-by-description-new = Добірні матеріали від { $provider }, що входить до родини { -brand-product-name }
 
 ##
 
@@ -518,8 +524,6 @@
     .label = Матеріали від �пон�орів
 home-prefs-highlights-header =
     .label = Обране
-home-prefs-recent-activity-header =
-    .label = �едавні дії
 home-prefs-highlights-description = Відібрані веб�айти, �кі ви зберегли чи відвідали
 home-prefs-highlights-option-visited-pages =
     .label = Відвідані �торінки
@@ -529,6 +533,9 @@
     .label = О�танні завантаженн�
 home-prefs-highlights-option-saved-to-pocket =
     .label = Збережене в { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = �едавні дії
+home-prefs-recent-activity-description = Добірка недавніх �айтів та вмі�ту
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -536,6 +543,7 @@
 home-prefs-snippets-header =
     .label = Фрагменти
 home-prefs-snippets-description = Оновленн� від { -vendor-short-name } та { -brand-product-name }
+home-prefs-snippets-description-new = Поради та новини від { -vendor-short-name } та { -brand-product-name }
 home-prefs-sections-rows-option =
     .label =
         { $num ->
@@ -920,7 +928,7 @@
 addressbar-header = Панель адре�и
 addressbar-suggest = При викори�танні панелі адре�и, пропонувати
 addressbar-locbar-history-option =
-    .label = І�торію перегл�дів
+    .label = І�торію перегл�ду
     .accesskey = Ñ‚
 addressbar-locbar-bookmarks-option =
     .label = Закладки
@@ -928,9 +936,16 @@
 addressbar-locbar-openpage-option =
     .label = Відкриті вкладки
     .accesskey = в
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = Ярлики
+    .accesskey = Я
 addressbar-locbar-topsites-option =
     .label = Попул�рні �айти
     .accesskey = �
+addressbar-locbar-engines-option =
+    .label = За�оби пошуку
+    .accesskey = ш
 addressbar-suggestions-settings = Змінити налаштуванн� пропозицій за�обів пошуку
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/search.ftl firefox-85.0+build1/l10n/uk/browser/browser/search.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/search.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/search.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -11,7 +11,7 @@
 opensearch-error-duplicate-title = Помилка в�тановленн�
 opensearch-error-duplicate-desc = { -brand-short-name } не зміг в�тановити за�іб пошуку з „{ $location-url }“ бо за�іб з таким ім’�м вже і�нує.
 opensearch-error-format-title = �екоректний формат
-opensearch-error-format-desc = { -brand-short-name } не зміг в�тановити пошукову �и�тему з: { $location-url }
+opensearch-error-format-desc = { -brand-short-name } не зміг в�тановити за�іб пошуку з: { $location-url }
 opensearch-error-download-title = Помилка завантаженн�
 opensearch-error-download-desc = { -brand-short-name } не зміг завантажити за�іб пошуку з: { $location-url }
 
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/uk/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/uk/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -61,6 +61,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Лише у новій вкладці
     .accesskey = й
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Завжди показувати
+    .accesskey = ж
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = �іколи не показувати
+    .accesskey = �
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Показувати лише на новій вкладці
+    .accesskey = л
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Показати інші закладки
     .accesskey = о
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/chrome/browser/migration/migration.properties firefox-85.0+build1/l10n/uk/browser/chrome/browser/migration/migration.properties
--- firefox-84.0.2+build1/l10n/uk/browser/chrome/browser/migration/migration.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/chrome/browser/migration/migration.properties	2021-01-18 20:09:23.000000000 +0000
@@ -39,7 +39,7 @@
 2_360se=Куки
 
 4_ie=Журнал
-4_edge=І�торі� перегл�ду
+4_edge=Журнал
 4_safari=І�торі� перегл�ду
 4_chrome=І�торі� перегл�ду
 4_firefox_history_and_bookmarks=І�торі� перегл�ду і закладки
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/chrome/browser/syncSetup.properties firefox-85.0+build1/l10n/uk/browser/chrome/browser/syncSetup.properties
--- firefox-84.0.2+build1/l10n/uk/browser/chrome/browser/syncSetup.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/chrome/browser/syncSetup.properties	2021-01-18 20:09:23.000000000 +0000
@@ -11,4 +11,4 @@
 relinkVerify.title = Попередженн� про об’єднанн�
 relinkVerify.heading = Ви дій�но хочете увійти в �инхронізацію?
 # LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.
-relinkVerify.description = Інший кори�тувач раніше входив в �инхронізацію на цьому комп’ютері. Вхід об’єднає закладки, паролі та інші налаштуванн� з даними %S
+relinkVerify.description = В �инхронізацію на цьому комп’ютері раніше входив інший кори�тувач. Вхід об’єднає закладки, паролі та інші налаштуванн� з даними %S
diff -Nru firefox-84.0.2+build1/l10n/uk/browser/installer/override.properties firefox-85.0+build1/l10n/uk/browser/installer/override.properties
--- firefox-84.0.2+build1/l10n/uk/browser/installer/override.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/browser/installer/override.properties	2021-01-18 20:09:23.000000000 +0000
@@ -38,7 +38,7 @@
 ClickNext=�ати�ніть кнопку Далі дл� продовженн�.
 ClickInstall=�ати�ніть кнопку В�тановити, щоб почати в�тановленн�.
 ClickUninstall=�ати�ніть кнопку Вилучити, щоб вилучити програму з комп’ютера.
-Completed=Готово
+Completed=Завершено
 LicenseTextRB=Перед в�тановленн�м $BrandFullNameDA ознайомте�ь з ліцензійною угодою. Якщо ви приймаєте умови угоди, виберіть перший варіант із наведених нижче. $_CLICK
 ComponentsText=Виберіть компоненти програми, �кі ви хочете в�тановити. $_CLICK
 ComponentsSubText2_NoInstTypes=Виберіть компоненти програми дл� в�тановленн�:
@@ -52,7 +52,7 @@
 FileError=Помилка відкритт� файлу дл� запи�у: \r\n\r\n$0\r\n\r\n�ати�ніть Перервати, щоб зупинити в�тановленн�,\r\nПовторити, щоб �пробувати знову, або\r\nІгнорувати, щоб пропу�тити цей файл.
 FileError_NoIgnore=Помилка відкритт� файлу дл� запи�у: \r\n\r\n$0\r\n\r\n�ати�ніть Повторити, щоб �пробувати знову, або\r\nСка�увати, щоб зупинити в�тановленн�.
 CantWrite="�еможливо запи�ати: "
-CopyFailed=Помилка при копіюванні
+CopyFailed=�е вдало�� �копіювати
 CopyTo="Копіюванн� в "
 Registering="Реє�траці�: "
 Unregistering="Ска�уванн� реє�трації: "
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/accounts.properties firefox-85.0+build1/l10n/uk/chat/accounts.properties
--- firefox-84.0.2+build1/l10n/uk/chat/accounts.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/accounts.properties	2021-01-18 20:09:23.000000000 +0000
@@ -6,4 +6,4 @@
 # %S is replaced with the name of the account
 passwordPromptTitle=Пароль дл� %S
 passwordPromptText=Дл� під'єднанн� до %S введіть його пароль.
-passwordPromptSaveCheckbox=Викори�тати Менеджер Паролів щоб запам'�тати цей пароль.
+passwordPromptSaveCheckbox=Викори�тати дл� запам'�товуванн� цього парол� Менеджер паролів.
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/commands.properties firefox-85.0+build1/l10n/uk/chat/commands.properties
--- firefox-84.0.2+build1/l10n/uk/chat/commands.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/commands.properties	2021-01-18 20:09:23.000000000 +0000
@@ -4,15 +4,15 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands=Команди: %S.\nВведіть /help &lt;команда&gt; дл� детальних по��нень.
+commands=Команди: %S.\nДл� детальних по��нень введіть /help &lt;команда&gt;.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
 noCommand=�емає команди '%S'.
-noHelp=Вибачте, немає довідкового повідомленн� дл� команди '%S'!
+noHelp=Вибачте, дл� команди '%S' довідкового повідомленн� немає!
 
 sayHelpString=say &lt;повідомленн�&gt;: відправити повідомленн� без обробки команд.
 rawHelpString=raw &lt;повідомленн�&gt;: відправити повідомленн� без екрануванн� HTML одиниць.
-helpHelpString=help &lt;назва&gt;: показати довідкове повідомленн� дл� команди &lt;назва&gt;, або �пи�ок можливих команд �кщо параметр не вказаний.
+helpHelpString=help &lt;назва&gt;: показати довідкове повідомленн� дл� команди &lt;назва&gt;, або, �кщо параметр не зазначено, �пи�ок можливих команд.
 
 # LOCALIZATION NOTE (statusCommand):
 #  %1$S is replaced with a status command name
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/facebook.properties firefox-85.0+build1/l10n/uk/chat/facebook.properties
--- firefox-84.0.2+build1/l10n/uk/chat/facebook.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/facebook.properties	2021-01-18 20:09:23.000000000 +0000
@@ -3,4 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 facebook.chat.name=Чат Facebook
-facebook.disabled=Чат Facebook більше не підтримуєть��, о�кільки Facebook вимикає �вій XMPP вихід.
+facebook.disabled=Чат Facebook більше не підтримуєть��, о�кільки Facebook вимикає �вій шлюз XMPP.
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/imtooltip.properties firefox-85.0+build1/l10n/uk/chat/imtooltip.properties
--- firefox-84.0.2+build1/l10n/uk/chat/imtooltip.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/imtooltip.properties	2021-01-18 20:09:23.000000000 +0000
@@ -7,4 +7,4 @@
 contact.tags=Мітки
 
 otr.tag=Стан OTR
-message.status=Повідомленн� захищено
+message.status=Повідомленн� зашифровано
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/irc.properties firefox-85.0+build1/l10n/uk/chat/irc.properties
--- firefox-84.0.2+build1/l10n/uk/chat/irc.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/irc.properties	2021-01-18 20:09:23.000000000 +0000
@@ -12,7 +12,7 @@
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=З’єднанн� з �ервером втрачено
-connection.error.timeOut=Тайм-аут з'єднанн�
+connection.error.timeOut=Ча� очікуванн� з’єднанн� закінчив��
 connection.error.invalidUsername=%S є недозволеним ім’�м кори�тувача
 connection.error.invalidPassword=�еправильний пароль �ервера
 connection.error.passwordRequired=Потрібен пароль
@@ -53,7 +53,7 @@
 command.chanserv=%S &lt;команда&gt;: �аді�лати команду до ChanServ.
 command.deop=%S &lt;п�евдонім1&gt;[,&lt;п�евдонім2&gt;]*: Забрати в кого�ь �тату� оператора каналу. Щоб зробити це, ви маєте бути оператором каналу.
 command.devoice=%S &lt;п�евдонім1&gt;[,&lt;п�евдонім2&gt;]*: Забрати в кого�ь голо� на каналі, щоб він не балакав, �кщо канал модерований (+m). Щоб зробити це, ви маєте бути оператором каналу.
-command.invite2=%S &lt;п�евдонім&gt;[ &lt;п�евдонім&gt;]* [&lt;канал&gt;]: Запро�ити одного чи більше п�евдонімів приєднати�� до ва� в поточному каналі, або до зазначеного каналу.
+command.invite2=%S &lt;п�евдонім&gt;[ &lt;п�евдонім&gt;]* [&lt;канал&gt;]: Запро�ити одного чи більше п�евдонімів приєднати�� до ва� у поточному каналі, або до зазначеного каналу.
 command.join=%S &lt;кімната1&gt;[ &lt;ключ1&gt;][,&lt;кімната2&gt;[ &lt;ключ2&gt;]]*: Введіть один або більше каналів, та (опціонально) ключі каналів, �кщо вони потрібні.
 command.kick=%S &lt;п�евдонім&gt; [&lt;повідомленн�&gt;]: Видалити кого�ь із каналу. Дл� цього ви маєте бути оператором каналу.
 command.list=%S: Показати �пи�ок кімнат у мережі. Увага, де�кі �ервери можуть ва� при цьому від'єднати.
@@ -69,8 +69,8 @@
 command.part=%S [повідомленн�]: Покинути поточний канал із необов'�зковим повідомленн�м.
 command.ping=%S [&lt;п�евдонім&gt;]: Запитує, �кий лаг має кори�тувач (або �ервер, �кщо кори�тувач не вказаний).
 command.quit=%S &lt;повідомленн�&gt;: Від'єднати�ь від �ервера, із необов'�зковим повідомленн�м.
-command.quote=%S &lt;команда&gt;: Відправити �иру команду на �ервер.
-command.time=%S: Показує поточний локальний ча� на IRC �ервері.
+command.quote=%S &lt;команда&gt;: Відправити на �ервер �иру команду.
+command.time=%S: Показує поточний локальний ча� на �ервері IRC.
 command.topic=%S [&lt;нова тема&gt;]: Задати тему цього каналу.
 command.umode=%S (+|-)&lt;новий режим&gt;: В�тановити або зн�ти режим кори�тувача.
 command.version=%S &lt;п�евдонім&gt;: Дати запит вер�ії клієнта кори�тувача.
@@ -100,9 +100,9 @@
 #    Could not change the nickname. %S is the user's nick.
 message.nick.fail=�еможливо викори�тати вказаний п�евдонім. Ваш п�евдонім лишаєть�� %S.
 #    The parameter is the message.parted.reason, if a part message is given.
-message.parted.you=Ви покинули кімнату (Part%1$S).
+message.parted.you=Ви залишили кімнату (Part%1$S).
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
-message.parted=%1$S покинув кімнату (Part%2$S).
+message.parted=%1$S залишив кімнату (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
@@ -169,7 +169,7 @@
 error.notChannelOp=Ви не є оператором каналу на %S.
 error.notChannelOwner=Ви не є вла�ником каналу %S.
 error.wrongKey=�е можу ввійти до %S, невірний пароль каналу.
-error.sendMessageFailed=Помилка під ча� над�иланн� о�таннього повідомленн�. Спробуйте, будь ла�ка, ще раз пі�л� того, �к зв'�зок був відновлений.
+error.sendMessageFailed=Помилка над�иланн� о�таннього повідомленн�. Спробуйте ще раз пі�л� відновленн� зв'�зку.
 #    %1$S is the channel the user tried to join, %2$S is the channel
 #    he was forwarded to.
 error.channelForward=Ви не можете приєднати�� до %1$S і були автоматично переадре�овані на %2$S.
@@ -182,14 +182,14 @@
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Ім'�
-tooltip.server=При'єднаний до
+tooltip.server=Під'єднаний до
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
 #    protect users).
-tooltip.connectedFrom=У мережі з
+tooltip.connectedFrom=Під'єднаний з
 tooltip.registered=Зареє�трований
 tooltip.registeredAs=Зареє�трований �к
-tooltip.secure=Викори�товує безпечне з'єднанн�
+tooltip.secure=Викори�товує захищене з'єднанн�
 # The away message of the user
 tooltip.away=Відійшов
 tooltip.ircOp=Оператор IRC
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/twitter.properties firefox-85.0+build1/l10n/uk/chat/twitter.properties
--- firefox-84.0.2+build1/l10n/uk/chat/twitter.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/twitter.properties	2021-01-18 20:09:23.000000000 +0000
@@ -30,7 +30,7 @@
 
 # LOCALIZATION NOTE (action.*):
 #  This will be an action in the context menu of displayed tweets.
-action.copyLink=Копіювати по�иланн� на Твіт
+action.copyLink=Копіювати по�иланн� на твіт
 action.retweet=Ретвіт
 action.reply=Відпові�ти
 action.delete=Видалити
@@ -116,7 +116,7 @@
 yes=Так
 no=�і
 
-command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: почав читати кори�тувача(ів).
-command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: припинив читати кори�тувача(ів).
+command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: почати читати кори�тувача(ів).
+command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: припинити читати кори�тувача(ів).
 
 twitter.disabled=Twitter більше не підтримуєть��, о�кільки він відключає протокол потокового передаванн�.
diff -Nru firefox-84.0.2+build1/l10n/uk/chat/xmpp.properties firefox-85.0+build1/l10n/uk/chat/xmpp.properties
--- firefox-84.0.2+build1/l10n/uk/chat/xmpp.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/chat/xmpp.properties	2021-01-18 20:09:23.000000000 +0000
@@ -19,7 +19,7 @@
 #   These will show in the account manager if an error occurs during the
 #   connection attempt.
 connection.error.invalidUsername=�евірне ім'� кори�тувача (ваше ім'� повинно мі�тити �имвол '@')
-connection.error.failedToCreateASocket=Помилка �творенн� �окету (У ва� є інтернет?)
+connection.error.failedToCreateASocket=Помилка �творенн� �окету (Ви під'єднані до Інтернету?)
 connection.error.serverClosedConnection=Сервер закрив з'єднанн�
 connection.error.resetByPeer=З'єднанн� розірвано
 connection.error.timedOut=Ча� очікуванн� з'єднанн� завершив��
@@ -34,7 +34,7 @@
 connection.error.authenticationFailure=Збій автентифікації
 connection.error.notAuthorized=�е авторизовано (Ви ввели невірний пароль?)
 connection.error.failedToGetAResource=�е вдало�� отримати ре�ур�
-connection.error.failedMaxResourceLimit=Цей обліковий запи� під'єднано з дуже багатьох мі�ць одноча�но.
+connection.error.failedMaxResourceLimit=Цей обліковий запи� під'єднано з надто багатьох мі�ць одноча�но.
 connection.error.failedResourceNotValid=Джерело недій�не.
 connection.error.XMPPNotSupported=Цей �ервер не підтримує XMPP
 
@@ -50,7 +50,7 @@
 #   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=�е вдало�� приєднати�� до %S, так �к в цій кімнаті ва� забанено.
+conversation.error.joinForbidden=�е вдало�� приєднати�� до %S, о�кільки вам заблоковано до�туп до цієї кімнати.
 conversation.error.joinFailedNotAuthorized=Потрібна реє�траці�: Ви не авторизовані, щоб приєднати�� до цієї кімнати.
 conversation.error.creationFailedNotAllowed=Обмежений до�туп: Вам не дозволено �творювати кімнати.
 #   This is displayed in a conversation as an error message when remote server
@@ -70,7 +70,7 @@
 conversation.error.sendFailedAsRecipientNotInRoom=Повідомленн� не може бути наді�лане до %1$S, тому що отримувач більше не знаходить�� в кімнаті: %2$S
 #   These are displayed in a conversation as a system error message.
 conversation.error.remoteServerNotFound=�еможливо зв'�зати�� з �ервером отримувача
-conversation.error.unknownSendError=Стала�� невідома помилка під ча� над�иланн� цього повідомленн�.
+conversation.error.unknownSendError=Під ча� над�иланн� цього повідомленн� �тала�� невідома помилка.
 #   %S is the name of the message recipient.
 conversation.error.sendServiceUnavailable=�аразі неможливо над�илати повідомленн� до %S.
 #   %S is the nick of participant that is not in room.
@@ -78,8 +78,8 @@
 conversation.error.banCommandAnonymousRoom=Ви не можете блокувати уча�ників з анонімних кімнат. Спробуйте натомі�ть /kick.
 conversation.error.banKickCommandNotAllowed=Ви не маєте необхідних прав на вилученн� цього уча�ника з кімнати.
 conversation.error.banKickCommandConflict=Шкода, але ви не можете вилучити �ебе з кімнати.
-conversation.error.changeNickFailedConflict=�е вдало�� змінити ваш п�евдонім на %S, так �к він вже викори�товуєть��.
-conversation.error.changeNickFailedNotAcceptable=�е вдало�� змінити ваш п�евдонім на %S, так �к в цій кімнаті п�евдоніми заблоковані.
+conversation.error.changeNickFailedConflict=�е вдало�� змінити ваш п�евдонім на %S, тому що він уже викори�товуєть��.
+conversation.error.changeNickFailedNotAcceptable=�е вдало�� змінити ваш п�евдонім на %S, тому що в цій кімнаті п�евдоніми заблоковані.
 conversation.error.inviteFailedForbidden=Ви не маєте необхідних прав запрошувати кори�тувачів до цієї кімнати.
 #   %S is the jid of user that is invited.
 conversation.error.failedJIDNotFound=�еможливо з'єднати�� з %S.
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/aboutdebugging.ftl firefox-85.0+build1/l10n/uk/devtools/client/aboutdebugging.ftl
--- firefox-84.0.2+build1/l10n/uk/devtools/client/aboutdebugging.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/aboutdebugging.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -47,7 +47,7 @@
 # the runtime is taking too much time.
 about-debugging-sidebar-item-connect-button-connection-not-responding = З'єднанн� в�е ще очікуєть��. Перевірте повідомленн� в цільовому браузері
 # Text displayed as connection error in sidebar item when the connection has timed out.
-about-debugging-sidebar-item-connect-button-connection-timeout = Перевищено термін очікуванн� з’єднанн�
+about-debugging-sidebar-item-connect-button-connection-timeout = Ча� очікуванн� з’єднанн� закінчив��
 # Temporary text displayed in sidebar items representing remote runtimes after
 # successfully connecting to them. Temporary UI, do not localize.
 about-debugging-sidebar-item-connected-label = Під'єднано
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/debugger.properties firefox-85.0+build1/l10n/uk/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/uk/devtools/client/debugger.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/debugger.properties	2021-01-18 20:09:23.000000000 +0000
@@ -584,12 +584,12 @@
 
 # LOCALIZATION NOTE (expressions.placeholder): Placeholder text for expression
 # input element
-expressions.placeholder=Додати вираз дл� �по�тереженн�
+expressions.placeholder=Додати вираз дл� від�теженн�
 
 # LOCALIZATION NOTE (expressions.errorMsg): Error text for expression
 # input element
 expressions.errorMsg=�еприпу�тимий вираз…
-expressions.label=Додати вираз �по�тереженн�
+expressions.label=Додати вираз дл� від�теженн�
 expressions.accesskey=ж
 expressions.remove.tooltip=Вилучити вираз дл� �по�тереженн�
 
@@ -1052,7 +1052,6 @@
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
 variablesViewOptimizedOut=(оптимізовано)
 variablesViewUninitialized=(не ініціалізовано)
 variablesViewMissingArgs=(недо�тупно)
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/markers.properties firefox-85.0+build1/l10n/uk/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/uk/devtools/client/markers.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/markers.properties	2021-01-18 20:09:23.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=Мало пам'�ті
 marker.gcreason.label.CC_WAITING=Викликано збіркою циклів
+marker.gcreason.label.CC_FINISHED=Колекці� циклів завершена
 marker.gcreason.label.CC_FORCED=Викликано збіркою циклів
 marker.gcreason.label.LOAD_END=Завантаженн� �торінки завершене
 marker.gcreason.label.PAGE_HIDE=Переміщено в фон
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Дит�ча збірка
-
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/startup.properties firefox-85.0+build1/l10n/uk/devtools/client/startup.properties
--- firefox-84.0.2+build1/l10n/uk/devtools/client/startup.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/startup.properties	2021-01-18 20:09:23.000000000 +0000
@@ -43,7 +43,7 @@
 
 # LOCALIZATION NOTE (MenuWebconsole.label): the string displayed in the Tools
 # menu as a shortcut to open the devtools with the Web Console tab selected.
-MenuWebconsole.label=Веб кон�оль
+MenuWebconsole.label=Вебкон�оль
 
 # LOCALIZATION NOTE (ToolboxTabWebconsole.label): the string displayed as the
 # label of the tab in the devtools window.
@@ -57,7 +57,7 @@
 # tooltip of the tab when the Web Console is displayed inside the developer
 # tools window.
 # Keyboard shortcut for Console will be shown inside the brackets.
-ToolboxWebconsole.tooltip2=Веб кон�оль (%S)
+ToolboxWebconsole.tooltip2=Вебкон�оль (%S)
 
 webConsoleCmd.accesskey=Ð’
 
@@ -250,4 +250,3 @@
 # This is the tooltip of the button in the toolbox toolbar that toggles the
 # measuring tools
 toolbox.buttons.measure = Вимір�ти ча�тину �торінки
-
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/toolbox.properties firefox-85.0+build1/l10n/uk/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/uk/devtools/client/toolbox.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/toolbox.properties	2021-01-18 20:09:23.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Закрити ін�трументи розробника
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=Показати розділену кон�оль
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/uk/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/uk/devtools/client/tooltips.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/tooltips.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = <strong>{ $property }</strong> не впливає на цей елемент, тому що це не позиціонований елемент.
 inactive-text-overflow-when-no-overflow = <strong>{ $property }</strong> не впливає на цей елемент, о�кільки не в�тановлено <strong>overflow:hidden</strong>.
 inactive-outline-radius-when-outline-style-auto-or-none = <strong>{ $property }</strong> не впливає на цей елемент, о�кільки його <strong>outline-style</strong> має значенн� <strong>auto</strong> чи <strong>none</strong>.
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> не впливає на внутрішні елементи таблиці.
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> не впливає на внутрішні елементи таблиці, окрім комірок таблиці.
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = Спробуйте вилучити <strong>float</strong> або додати <strong>display:block</strong>. { learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = Спробуйте налаштувати його вла�тиві�ть <strong>позиції</strong> на що�ь інше, ніж <strong>static</strong>. { learn-more }
 inactive-text-overflow-when-no-overflow-fix = Спробуйте додати <strong>overflow:hidden</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-fix = Спробуйте в�тановити вла�тиві�ть <strong>display</strong> на що�ь інше, ніж <strong>table-cell</strong>, <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, або <strong>table-footer-group</strong>. { learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = Спробуйте в�тановити вла�тиві�ть <strong>display</strong> на що�ь інше, ніж <strong>table-column</strong>, <strong>table-row</strong>, <strong>table-column-group</strong>, <strong>table-row-group</strong>, або <strong>table-footer-group</strong>. { learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = Спробуйте в�тановити дл� його вла�тиво�ті <strong>outline-style</strong> що�ь інше, ніж <strong>auto</strong> чи <strong>none</strong>. { learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/client/webconsole.properties firefox-85.0+build1/l10n/uk/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/uk/devtools/client/webconsole.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/client/webconsole.properties	2021-01-18 20:09:23.000000000 +0000
@@ -76,7 +76,7 @@
 
 # LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
-connectionTimeout=Ча� очікуванн� завершив��. Перевірте кон�оль помилок на обох кінц�х на на�вні�ть можливих повідомлень про помилки. Відкрийте повторно Веб кон�оль і �пробуйте знову.
+connectionTimeout=Ча� очікуванн� завершив��. Перевірте кон�оль помилок на обох кінц�х на на�вні�ть можливих повідомлень про помилки. Відкрийте повторно Вебкон�оль і �пробуйте знову.
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
diff -Nru firefox-84.0.2+build1/l10n/uk/devtools/startup/aboutDevTools.ftl firefox-85.0+build1/l10n/uk/devtools/startup/aboutDevTools.ftl
--- firefox-84.0.2+build1/l10n/uk/devtools/startup/aboutDevTools.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/devtools/startup/aboutDevTools.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -13,7 +13,6 @@
 enable-learn-more-link = Докладніше про ін�трументи розробника
 enable-enable-button = Увімкнути ін�трументи розробника
 enable-close-button = Закрити цю вкладку
-
 welcome-title = Ла�каво про�имо до ін�трументів розробника Firefox!
 newsletter-title = �овини дл� розробників Mozilla
 newsletter-message = Отримуйте новини про за�оби та можливо�ті розробки на �вою електронну пошту.
@@ -23,11 +22,9 @@
 newsletter-subscribe-button = Підпи�ати�ь
 newsletter-thanks-title = Д�куємо!
 newsletter-thanks-message = Якщо ви раніше не підтвердили підпи�ку на новини від Mozilla, то вам, можливо, доведеть�� це зробити. Будь ла�ка, пошукайте наше повідомленн� �еред вхідних або небажаних ли�тів.
-
 footer-title = Firefox Developer Edition
 footer-message = Шукаєте більшого, ніж про�то ін�трументи розробника? Спробуйте браузер Firefox, �творений �аме дл� розробників та потреб �уча�ної розробки.
 footer-learn-more-link = Докладніше
-
 features-learn-more = Докладніше
 features-inspector-title = Ін�пектор
 features-inspector-desc = Вивчайте і вдо�коналюйте код, щоб �творювати ідеальні макети. <a data-l10n-name="learn-more">{ features-learn-more }</a>
@@ -46,7 +43,7 @@
 features-performance-title = Швидкоді�
 features-performance-desc = Розблокуйте вузькі мі�ц�, забезпечте �прощенн� проце�ів і оптимізуйте продуктивні�ть. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 features-memory-title = Пам'�ть
-features-memory-desc = Знаходьте витоки пам'�ті і зменшуйте її �поживанн� вашим додатком. <a data-l10n-name="learn-more">{ features-learn-more }</a>
+features-memory-desc = Знаходьте витоки пам'�ті та зробіть �вою програму швидкою. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 # Variables:
 #   $errorDescription (String) - The error that occurred e.g. 404 - Not Found
 newsletter-error-common = Запит на підпи�ку зазнав невдачі ({ $errorDescription }).
diff -Nru firefox-84.0.2+build1/l10n/uk/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/uk/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/uk/dom/chrome/dom/dom.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/dom/chrome/dom/dom.properties	2021-01-18 20:09:23.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=Селектор <input> заблоковано через від�утні�ть пов'�заних з його по�вою дій кори�тувача.
 ExternalProtocolFrameBlockedNoUserActivation=Iframe із зовнішнім протоколом було заблоковано через від�утні�ть пов'�заних з ним дій кори�тувача або через те, що минуло недо�татньо ча�у з моменту завантаженн� о�таннього такого iframe.
 MultiplePopupsBlockedNoUserActivation=Відкритт� кількох інформаційних вікон було заблоковано, о�кільки їхн� по�ва не пов'�зана з ді�ми кори�тувача.
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=Попереднє завантаженн� %S було проігноровано через невідомі значенн� “as� або “type�, або невідповідний атрибут “media�.
diff -Nru firefox-84.0.2+build1/l10n/uk/dom/chrome/netError.dtd firefox-85.0+build1/l10n/uk/dom/chrome/netError.dtd
--- firefox-84.0.2+build1/l10n/uk/dom/chrome/netError.dtd	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/dom/chrome/netError.dtd	2021-01-18 20:09:23.000000000 +0000
@@ -90,7 +90,7 @@
 <!ENTITY xfoBlocked.title "Блокуєть�� політикою X-Frame-Options">
 <!ENTITY xfoBlocked.longDesc "<p>Браузер не дозволив цій �торінці завантажити�ь таким чином, тому що вона має політику X-Frame-Options, що заборон�є це.</p>">
 
-<!ENTITY corruptedContentErrorv2.title "Пошкоджений вмі�т">
+<!ENTITY corruptedContentErrorv2.title "Помилка пошкодженого вмі�ту">
 <!ENTITY corruptedContentErrorv2.longDesc "<p>Сторінка, �ку ви намагаєте�ь перегл�нути, не може бути показана через те, що було ви�влено помилку в передачі даних.</p><ul><li>Будь ла�ка, зв'�жіть�� з вла�никами веб�айту та повідомте їх про цю проблему.</li></ul>">
 
 <!ENTITY remoteXUL.title "Віддалений XUL">
diff -Nru firefox-84.0.2+build1/l10n/uk/security/manager/security/certificates/deviceManager.ftl firefox-85.0+build1/l10n/uk/security/manager/security/certificates/deviceManager.ftl
--- firefox-84.0.2+build1/l10n/uk/security/manager/security/certificates/deviceManager.ftl	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/security/manager/security/certificates/deviceManager.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -8,40 +8,30 @@
 devmgr =
     .title = Менеджер при�троїв
     .style = width: 67em; height: 32em;
-
 devmgr-devlist =
     .label = Модулі і при�трої захи�ту
-
 devmgr-header-details =
     .label = Подробиці
-
 devmgr-header-value =
     .label = Значенн�
-
 devmgr-button-login =
     .label = Почати �еан�
     .accesskey = о
-
 devmgr-button-logout =
     .label = Завершити �еан�
     .accesskey = а
-
 devmgr-button-changepw =
     .label = Змінити пароль
     .accesskey = Ñ–
-
 devmgr-button-load =
     .label = Завантажити
     .accesskey = З
-
 devmgr-button-unload =
     .label = Вивантажити
     .accesskey = и
-
 devmgr-button-enable-fips =
     .label = Викори�товувати FIPS
     .accesskey = F
-
 devmgr-button-disable-fips =
     .label = Вимкнути FIPS
     .accesskey = F
@@ -50,86 +40,62 @@
 
 load-device =
     .title = Завантажити драйвер при�трою PKCS#11
-
 load-device-info = Введіть інформацію про модуль, �кий хочете додати.
-
 load-device-modname =
     .value = �азва модул�
     .accesskey = м
-
 load-device-modname-default =
     .value = �овий модуль PKCS#11
-
 load-device-filename =
     .value = �азва файлу модул�
     .accesskey = в
-
 load-device-browse =
-    .label = Перегл�д…
-    .accesskey = �
+    .label = Огл�д…
+    .accesskey = г
 
 ## Token Manager
 
 devinfo-status =
     .label = Стан
-
 devinfo-status-disabled =
     .label = Вимкнено
-
 devinfo-status-not-present =
     .label = Від�утній
-
 devinfo-status-uninitialized =
     .label = �е ініціалізовано
-
 devinfo-status-not-logged-in =
-    .label = �езареє�трований в �и�темі
-
+    .label = Вхід не виконано
 devinfo-status-logged-in =
-    .label = Зареє�трований в �и�темі
-
+    .label = Вхід виконано
 devinfo-status-ready =
     .label = Готовий
-
 devinfo-desc =
     .label = Опи�
-
 devinfo-man-id =
     .label = Виробник
-
 devinfo-hwversion =
     .label = Вер�і� HW
 devinfo-fwversion =
     .label = Вер�і� FW
-
 devinfo-modname =
     .label = Модуль
-
 devinfo-modpath =
     .label = Шл�х
-
-login-failed = Помилка реє�трації в �и�тему
-
+login-failed = �е вдало�� увійти
 devinfo-label =
     .label = Мітка
-
 devinfo-serialnum =
     .label = Серійний номер
-
 fips-nonempty-password-required = Дл� роботи в режимі відповідно�ті FIPS потрібно вказати головний пароль дл� кожного при�трою захи�ту. Вкажіть ці паролі до перемиканн� в цей режим.
-
 fips-nonempty-primary-password-required = Дл� роботи в режимі відповідно�ті FIPS потрібно вказати головний пароль дл� кожного при�трою захи�ту. Вкажіть ці паролі до перемиканн� в цей режим.
 unable-to-toggle-fips = �еможливо змінити режим FIPS дл� при�трою захи�ту. Рекомендуєть�� вийти і перезапу�тити програму.
 load-pk11-module-file-picker-title = Оберіть драйвер при�трою PKCS#11 дл� завантаженн�
-
 # Load Module Dialog
 load-module-help-empty-module-name =
     .value = �азва модул� не може бути порожньою.
-
 # Do not translate 'Root Certs'
 load-module-help-root-certs-module-name =
     .value = ‘Root Certs‘ зарезервовано і не може викори�товувати�ь дл� назви модул�.
-
 add-module-failure = �е вдало�� додати модуль
 del-module-warning = Ви дій�но хочете вилучити цей модуль захи�ту?
 del-module-error = �еможливо вилучити модуль
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/global/appPicker.dtd firefox-85.0+build1/l10n/uk/toolkit/chrome/global/appPicker.dtd
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/global/appPicker.dtd	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/global/appPicker.dtd	2021-01-18 20:09:23.000000000 +0000
@@ -3,5 +3,5 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY NoAppFound.label      "Жодної програми не знайдено дл� цього типу файлів.">
-<!ENTITY BrowseButton.label    "Вибрати…">
+<!ENTITY BrowseButton.label    "Огл�д…">
 <!ENTITY SendMsg.label         "Пере�лати у:">
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/global/printdialog.properties firefox-85.0+build1/l10n/uk/toolkit/chrome/global/printdialog.properties
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/global/printdialog.properties	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/global/printdialog.properties	2021-01-18 20:09:23.000000000 +0000
@@ -30,7 +30,7 @@
 printBGImages=Друкувати _малюнки тла
 headerFooter=Верхній та нижній колонтитули
 left=Ліворуч
-center=По�ередині
+center=По центру
 right=Праворуч
 headerFooterBlank=--порожньо--
 headerFooterTitle=Заголовок
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:09:23.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=д;д;д
 
 downloadErrorAlertTitle=Помилка завантаженн�
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Завантаженн� не можна зберегти, о�кільки воно заблоковане %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Завантаженн� не можна зберегти, о�кільки воно заблоковане розширенн�м.
 downloadErrorGeneric=Завантаженн� не може бути збережено через невідому помилку.\n\nБудь ла�ка, �пробуйте ще раз.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/downloads/unknownContentType.dtd firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/downloads/unknownContentType.dtd	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/downloads/unknownContentType.dtd	2021-01-18 20:09:23.000000000 +0000
@@ -20,7 +20,7 @@
 
 <!ENTITY  chooseHandlerMac.label      "Вибрати…">
 <!ENTITY  chooseHandlerMac.accesskey  "б">
-<!ENTITY  chooseHandler.label         "Вибрати…">
-<!ENTITY  chooseHandler.accesskey     "б">
+<!ENTITY  chooseHandler.label         "Огл�д…">
+<!ENTITY  chooseHandler.accesskey     "г">
 
 <!ENTITY  unknownPromptText.label     "Зберегти цей файл?">
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:09:23.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=У з’єднанні з прок�і-�ервером відмовлено
 check_error-2153390069=Сертифікат �ервера за�тарів (�кщо ваш �и�темний годинник в�тановлено на неправильні ча� та дату, будь ла�ка, виправте це)
 check_error-verification_failed=Цілі�ні�ть цього оновленн� не може бути перевірена
+check_error-move_failed=�е вдало�� підготувати оновленн� до ін�тал�ції
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/chrome/search/search.properties firefox-85.0+build1/l10n/uk/toolkit/chrome/search/search.properties
--- firefox-84.0.2+build1/l10n/uk/toolkit/chrome/search/search.properties	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/chrome/search/search.properties	2021-01-18 20:09:23.000000000 +0000
@@ -15,5 +15,4 @@
 error_invalid_engine_title=Помилка в�тановленн�
 error_invalid_format_title=�екоректний формат
 # LOCALIZATION NOTE (error_invalid_engine_msg2): %1$S = brandShortName, %2$S = location (url)
-error_invalid_engine_msg2=%1$S не зміг в�тановити пошукову �и�тему з: %2$S
-
+error_invalid_engine_msg2=%1$S не зміг в�тановити за�іб пошуку з: %2$S
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -67,15 +67,15 @@
 cmd-contribute =
     .label = По�при�ти
     .accesskey = П
-    .tooltiptext = По�при�ти розвитку цього додатку
+    .tooltiptext = По�при�ти розвитку цього додатка
 detail-version =
     .label = Вер�і�
 detail-last-updated =
     .label = Во�таннє оновлено
 detail-contributions-description = Розробник цього додатку про�ить ва� по�при�ти його подальшому розвитку, зробивши невеликий вне�ок.
-detail-contributions-button = Допомогти
-    .title = Допомогти з розробкою цього додатка
-    .accesskey = п
+detail-contributions-button = По�при�ти
+    .title = По�при�ти розвитку цього додатка
+    .accesskey = П
 detail-update-type =
     .value = �втоматичні оновленн�
 detail-update-default =
@@ -111,9 +111,9 @@
 detail-repository-value =
     .value = { detail-repository.label }
 detail-check-for-updates =
-    .label = Перевірити на�вні�ть оновлень
+    .label = Перевірити оновленн�
     .accesskey = П
-    .tooltiptext = Перевірити на�вні�ть оновлень дл� цього додатку
+    .tooltiptext = Перевірити на�вні�ть оновлень дл� цього додатка
 detail-show-preferences =
     .label =
         { PLATFORM() ->
@@ -382,12 +382,6 @@
 addon-badge-recommended2 =
     .title = { -brand-product-name } рекомендує лише розширенн�, що задовольн�ють наші �тандарти безпеки та швидкодії
     .aria-label = { addon-badge-recommended2.title }
-addon-badge-line =
-    .title = Це розширенн� �творене розробниками { -brand-product-name }
-    .aria-label = { addon-badge-line.title }
-addon-badge-verified =
-    .title = Код цього розширенн� перевірений на безпеку
-    .aria-label = { addon-badge-verified.title }
 addon-badge-line2 =
     .title = Це офіційне розширенн�, �творене розробниками { -brand-product-name }
     .aria-label = { addon-badge-line2.title }
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutProfiles.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutProfiles.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutProfiles.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutProfiles.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -2,7 +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/.
 
-
 profiles-title = Про профілі
 profiles-subtitle = Ц� �торінка допомагає керувати вашими профіл�ми. Кожен профіль є окремим �вітом, що мі�тить окрему і�торію, закладки, налаштуванн� й додатки.
 profiles-create = Створити новий профіль
@@ -12,15 +11,13 @@
 profiles-conflict = Інша копі� { -brand-product-name } зробила зміни в профіл�х. �еобхідно перезапу�тити { -brand-short-name }, щоб виконувати інші зміни.
 profiles-flush-fail-title = Зміни не збережено
 profiles-flush-conflict = { profiles-conflict }
-profiles-flush-failed = �еочікувана помилка не дозволила зберегти ваші зміни.
+profiles-flush-failed = �еочікувана помилка не дозволила зберегти зміни.
 profiles-flush-restart-button = Перезапу�тити { -brand-short-name }
-
 # Variables:
 #   $name (String) - Name of the profile
 profiles-name = Профіль: { $name }
 profiles-is-default = Типовий профіль
 profiles-rootdir = Кореневий каталог
-
 # localDir is used to show the directory corresponding to
 # the main profile directory that exists for the purpose of storing data on the
 # local filesystem, including cache files or other data files that may not
@@ -30,28 +27,22 @@
 profiles-localdir = Локальний каталог
 profiles-current-profile = Цей профіль викори�товуєть�� і не може бути видалений.
 profiles-in-use-profile = Цей профіль викори�товуєть�� в іншій програмі й не може бути видалений.
-
 profiles-rename = Перейменувати
 profiles-remove = Видалити
 profiles-set-as-default = В�тановити типовим профілем
 profiles-launch-profile = Запу�тити профіль в новому браузері
-
 profiles-cannot-set-as-default-title = �е вдало�� в�тановити типовим
 profiles-cannot-set-as-default-message = �е вдало�� змінити типовий профіль дл� { -brand-short-name }.
-
 profiles-yes = так
 profiles-no = ні
-
 profiles-rename-profile-title = Перейменувати профіль
 # Variables:
 #   $name (String) - Name of the profile
 profiles-rename-profile = Перейменувати профіль { $name }
-
 profiles-invalid-profile-name-title = �еприпу�тиме ім’� профілю
 # Variables:
 #   $name (String) - Name of the profile
 profiles-invalid-profile-name = �азва профілю “{ $name }� не дозволена.
-
 profiles-delete-profile-title = Видалити профіль
 # Variables:
 #   $dir (String) - Path to be displayed
@@ -61,11 +52,8 @@
     Чи бажаєте видалити файли даних профілю?
 profiles-delete-files = Видалити файли
 profiles-dont-delete-files = �е видал�ти файли
-
 profiles-delete-profile-failed-title = Помилка
 profiles-delete-profile-failed-message = Стала�� помилка під ча� �проби видаленн� цього профілю.
-
-
 profiles-opendir =
     { PLATFORM() ->
         [macos] Показати у Finder
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = Сторонні модулі
+support-third-party-modules-module = Файл модул�
+support-third-party-modules-version = Вер�і� файлу
+support-third-party-modules-vendor = Інформаці� про по�тачальника
+support-third-party-modules-occurrence = Повторенн�
+support-third-party-modules-process = Тип проце�у та ID
+support-third-party-modules-thread = Гілка
+support-third-party-modules-base = �дре�а бази зображень
+support-third-party-modules-uptime = Ча� роботи проце�у (м�)
+support-third-party-modules-duration = Тривалі�ть завантаженн� (м�)
+support-third-party-modules-empty = �е завантажено �торонні модулі.
+support-third-party-modules-no-value = (�емає значенн�)
+support-third-party-modules-button-open =
+    .title = Відкрити розташуванн� файлу…
+support-third-party-modules-expand =
+    .title = Показати подробиці
+support-third-party-modules-collapse =
+    .title = Згорнути подробиці
+support-third-party-modules-unsigned-icon =
+    .title = Цей модуль не підпи�аний
+support-third-party-modules-folder-icon =
+    .title = Відкрити розташуванн� файлу…
+support-third-party-modules-down-icon =
+    .title = Показати подробиці
+support-third-party-modules-up-icon =
+    .title = Згорнути подробиці
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -369,8 +395,8 @@
 
 ## Strings representing the status of the Enterprise Policies engine.
 
-policies-inactive = �еактивно
-policies-active = �ктивно
+policies-inactive = �еактивні
+policies-active = �ктивні
 policies-error = Помилка
 
 ## Printing section
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/extensions/blocklist.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/extensions/blocklist.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/extensions/blocklist.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/extensions/blocklist.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -8,15 +8,13 @@
 blocklist-accept =
     .label = Перезапу�тити { -brand-short-name }
     .accesskey = П
-
 blocklist-label-summary = { -brand-short-name } визначив, що на�тупні додатки можуть �причинити проблеми з безпекою та �табільні�тю:
 blocklist-soft-and-hard = Додатки, що вход�ть до групи ви�окого ризику були блоковані. Інші додатки є менш ризиковими, проте наполегливо рекомендуєть�� перезапу�тити�ь, вимкнувши і їх теж.
 blocklist-hard-blocked = Ці додатки вход�ть до групи ви�окого ризику і тому їх було заблоковано, проте дл� повного їх вимкненн� потрібен перезапу�к.
 blocklist-soft-blocked = Заради вашого захи�ту рекомендуєть�� перезапу�ти�ь, вимкнувши їх.
 blocklist-more-information =
     .value = Докладніше
-
 blocklist-blocked =
-    .label = Заблокований
+    .label = Заблоковано
 blocklist-checkbox =
     .label = Вимкнути
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/featuregates/features.ftl	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Підтримка кількох вікон зображенн� в зображенні
 experimental-features-multi-pip-description = Ек�периментальна підтримка одноча�ного відкритт� кількох вікон Зображенн� в зображенні.
+experimental-features-http3 =
+    .label = Протокол HTTP/3
+experimental-features-http3-description = Ек�периментальна підтримка протоколу HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/global/wizard.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/global/wizard.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/global/wizard.ftl	2021-01-06 12:03:24.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/global/wizard.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -11,24 +11,21 @@
 wizard-win-button-back =
     .label = < �азад
     .accesskey = �
-
 wizard-macos-button-next =
-    .label = Далі
-    .accesskey = Д
+    .label = Продовжити
+    .accesskey = П
 wizard-linux-button-next =
     .label = Далі
     .accesskey = Д
 wizard-win-button-next =
     .label = Далі >
     .accesskey = Д
-
 wizard-macos-button-finish =
     .label = Гаразд
 wizard-linux-button-finish =
     .label = Гаразд
 wizard-win-button-finish =
     .label = Гаразд
-
 wizard-macos-button-cancel =
     .label = Ска�увати
 wizard-linux-button-cancel =
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Сторінка:
     .accesskey = С
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } з { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = О�танн� �торінка
-
+printpreview-homearrow-button =
+    .title = Перша �торінка
+printpreview-previousarrow-button =
+    .title = Попередн� �торінка
+printpreview-nextarrow-button =
+    .title = �а�тупна �торінка
+printpreview-endarrow-button =
+    .title = О�танн� �торінка
diff -Nru firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/uk/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/uk/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:03:25.000000000 +0000
+++ firefox-85.0+build1/l10n/uk/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:23.000000000 +0000
@@ -26,6 +26,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = по
+printui-page-custom-range-input =
+    .aria-label = Введіть вла�ний діапазон �торінок
+    .placeholder = наприклад, 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Копії
 printui-orientation = Орієнтаці�
@@ -49,6 +52,7 @@
 printui-options = Параметри
 printui-headers-footers-checkbox = Друкувати колонтитули
 printui-backgrounds-checkbox = Друкувати тло
+printui-selection-checkbox = Друкувати тільки вибране
 printui-color-mode-label = Кольоровий режим
 printui-color-mode-color = Кольоровий
 printui-color-mode-bw = Чорно-білий
@@ -57,19 +61,29 @@
 printui-margins-min = Якнайменше
 printui-margins-none = �емає
 printui-margins-custom = Вла�ні
+printui-margins-custom-inches = Вла�не (дюймів)
 printui-margins-custom-top = Вгорі
+printui-margins-custom-top-inches = Вгорі (дюймів)
 printui-margins-custom-bottom = Внизу
+printui-margins-custom-bottom-inches = Внизу (дюймів)
 printui-margins-custom-left = Ліворуч
+printui-margins-custom-left-inches = Ліворуч (дюймів)
 printui-margins-custom-right = Праворуч
+printui-margins-custom-right-inches = Праворуч (дюймів)
 printui-system-dialog-link = Друк за допомогою за�обу �и�теми…
 printui-primary-button = �адрукувати
 printui-primary-button-save = Зберегти
 printui-cancel-button = Ска�увати
+printui-close-button = Закрити
 printui-loading = Підготовка до попереднього перегл�ду
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Попередній перегл�д
+printui-pages-per-sheet = Сторінок на аркуші
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = Друк…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/ur/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/aboutLogins.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/aboutLogins.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -13,12 +13,9 @@
     .alt = Google Play سے حاصل کریں
 login-app-promo-apple =
     .alt = App Store پر سے ڈائونلوڈ کریں
-
 login-filter =
     .placeholder = لاگ ان تلاش کریں
-
 create-login-button = نیا لاگ ان بنائیں
-
 fxaccounts-sign-in-text = اپنے پاسورڈ  دوسرے آلات پر حاصل کریں
 fxaccounts-sign-in-button = { -sync-brand-short-name } میں  سائن ان کریں
 fxaccounts-avatar-button =
@@ -32,6 +29,7 @@
 about-logins-menu-menuitem-import-from-another-browser = دوسرے براؤزر سے درآمد کریں…
 about-logins-menu-menuitem-import-from-a-file = �ائل سے درآمد کریں...
 about-logins-menu-menuitem-export-logins = لاگ انس برآمد کریں…
+about-logins-menu-menuitem-remove-all-logins = تمام لاگ انز کو �ٹائیں…
 menu-menuitem-preferences =
     { PLATFORM() ->
         [windows] اختیارات
@@ -71,7 +69,6 @@
 ## Introduction screen
 
 login-intro-heading = اپنے مح�وظ شد� لاگ ان ڈھونڈ ر�ے �یں؟ { -sync-brand-short-name } مرتب کریں۔
-
 about-logins-login-intro-heading-logged-out = اپنے مح�وظ شد� لاگ ان ڈھونڈ ر�ے �یں؟ { -sync-brand-short-name } مرتب کریں یا انھیں درآمد کریں۔
 about-logins-login-intro-heading-logged-in = کوئی سینکڈ لاگ ان ن�یں ملا۔
 login-intro-description = اگر آپ نے اپنے لاگ انز { -brand-product-name } کو کسی دوسرے آلے پر مح�وظ کیا�وا �ے تو، ان�یں ی�اں حاصل کرنے کا طریق� یوں �ے:
@@ -116,11 +113,9 @@
 # This message can be seen when attempting to edit a login in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-edit-login-os-auth-dialog-message-macosx = مح�وظ کرد� لاگ ان میں تدوین کریں
-
 # This message can be seen when attempting to reveal a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-reveal-password-os-auth-dialog-message-macosx = مح�وظ شد� پاس ورڈ کو ظا�ر کریں
-
 # This message can be seen when attempting to copy a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-copy-password-os-auth-dialog-message-macosx = مح�وظ شد� پاس ورڈ کو نقل کریں
@@ -128,7 +123,6 @@
 ## Master Password notification
 
 master-password-notification-message = برا� کرم مح�وظ لاگ ان اور پاس ورڈز کو دیکھنے کے لئے اپنا ماسٹر پاس ورڈ درج کریں
-
 # This message can be seen when attempting to export a password in about:logins
 # On MacOS, only provide the reason that account verification is needed. Do not put a complete sentence here.
 about-logins-export-password-os-auth-dialog-message-macosx = مح�وظ شد� لاگ ان اور پاس ورڈ برآمد کریں
@@ -157,14 +151,25 @@
 confirmation-dialog-cancel-button = منسوخ کریں
 confirmation-dialog-dismiss-button =
     .title = منسوخ کریں
-
 about-logins-confirm-remove-dialog-title = اس لاگ ان کو �ٹائیں؟
 confirm-delete-dialog-message = ی� عمل کلعدم ن�یں �و سکتا۔
 about-logins-confirm-remove-dialog-confirm-button = �ٹائیں
-
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] �ٹائیں
+        [one] تمام �ٹائیں
+       *[other] تمام �ٹائیں
+    }
+about-logins-confirm-remove-all-dialog-checkbox-label =
+    { $count ->
+        [1] �اں ، ی� لاگ ان �ٹائیں
+        [one] �اں ، ی� لاگ ان �ٹائیں
+       *[other] �اں ، ان لاگ ان کو �ٹائیں
+    }
 about-logins-confirm-export-dialog-title = لاگ ان اور پاس ورڈ برآمد کریں
 about-logins-confirm-export-dialog-confirm-button = برآمد کریں…
-
+about-logins-alert-import-title = درآمد مکمل �وئی
+about-logins-alert-import-message = درآمد کا ت�صیلی خلاص� دیکھیں
 confirm-discard-changes-dialog-title = غیر مح�وظ شد� تبدیلیاں �ٹاییں؟
 confirm-discard-changes-dialog-message = سبھی غیر مح�وظ شد� تبدیلیاں ختم �وجائیں گی۔
 confirm-discard-changes-dialog-confirm-button = رد کريں
@@ -192,7 +197,6 @@
 # This is a generic error message.
 about-logins-error-message-default = اس پاس ورڈ کو مح�وظ کرنے کی کوشش کرتے وقت ایک نقص پیش آگیا۔
 
-
 ## Login Export Dialog
 
 # Title of the file picker dialog
@@ -221,3 +225,10 @@
         [macos] CSV دستاویز
        *[other] CSV �ائل
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = درآمد مکمل �وئی
+about-logins-import-dialog-done = �وگیا
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/ur/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/appmenu.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/appmenu.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = نیا ونڈوں
+appmenuitem-new-private-window =
+    .label = نیا نجی ونڈوں
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = اندر زوم کریں
 appmenuitem-zoom-reduce =
     .label = با�ر زوم کریں
+appmenuitem-fullscreen =
+    .label = پوری اسکرین
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = ابھی Sync کریں
+appmenuitem-save-page =
+    .label = ص�ح� مح�وظ کریں بطور…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = نیا کیا �ے
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/browser.ftl firefox-85.0+build1/l10n/ur/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/browser.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/browser.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -23,7 +23,7 @@
 # there is no content title:
 #
 # "default" - "Mozilla Firefox"
-# "private" - "Mozilla Firefox - (Private Browsing)"
+# "private" - "Mozilla Firefox — (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Do not use the brand name in the last two attributes, as we do on non-macOS.
@@ -206,7 +206,7 @@
 
 ## Search Engine selection buttons (one-offs)
 
-# This string prompts the user to use the list of one-click search engines in
+# This string prompts the user to use the list of search shortcuts in
 # the Urlbar and searchbar.
 search-one-offs-with-title = اس بار ، کے ساتھ تلاش کریں:
 # This string won't wrap, so if the translated string is longer,
@@ -270,6 +270,12 @@
 identity-active-loaded = آپ نے اس ص�حے پر ح�اظت نا ا�ل بنا دی �ے۔
 identity-weak-encryption = ی� ص�ح� کمزور خ�ی� کاری استعمال کرتا �ے۔
 identity-insecure-login-forms = اس ص�ح� پر داخل کرد� لاگ ان اشتبا� کیا جا سکتا �ے۔
+identity-https-only-dropdown-on =
+    .label = چالو
+identity-https-only-dropdown-off =
+    .label = بند
+identity-https-only-dropdown-off-temporarily =
+    .label = عارضی طور پر بندکریں
 identity-permissions =
     .value = اجازتیں
 identity-permissions-reload-hint = تبدیلی کو لگانے کے لیئے آپکو ص�ح� کو دوبار� لوڈ کرنے کی شاید ظرورت �و۔
@@ -314,6 +320,9 @@
 browser-window-close-button =
     .tooltiptext = بند کریں
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -392,6 +401,7 @@
 # Variables
 #  $engine (String): the name of a search engine
 urlbar-result-action-search-w-engine = { $engine } سے تلاش کریں
+urlbar-result-action-sponsored = سپانسر شد�
 urlbar-result-action-switch-tab = ٹیب پر جائیں
 urlbar-result-action-visit = دور�
 
@@ -399,6 +409,8 @@
 ## string or the url, like "result value - action text".
 ## In these actions "Search" is a verb, followed by where the search is performed.
 
+urlbar-result-action-search-bookmarks = بک مارک تلاش کریں
+urlbar-result-action-search-history = سابقات تلاش کریں
 
 ## Full Screen and Pointer Lock UI
 
@@ -415,3 +427,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> آپ کے نشان کار کا کنٹرول �ے۔ Esc دبا کر کنٹرول واپس لیں
 pointerlock-warning-no-domain = اس دستاویز ک� پاس آپ ک� نشان کار کا کنٹرول �ے ۔ کنٹرول واپس حاصل کرنے کے لیے Esc دبائیں ۔
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = تمام بک مارک دکھائیں
+bookmarks-recent-bookmarks =
+    .value = حالی� بک مارک کرد�
+bookmarks-toolbar-chevron =
+    .tooltiptext = مزید بک مارک دکھائیں
+bookmarks-sidebar-content =
+    .aria-label = بک مارک
+bookmarks-menu-button =
+    .label = بک مارک مینیو
+bookmarks-other-bookmarks-menu =
+    .label = دیگر بک مارک
+bookmarks-mobile-bookmarks-menu =
+    .label = موبائل بک مارک
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] بک مارک سائڈبار چھپائیں
+           *[other] بغلی بار میں بک مارک دیکھیں
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] بک مارک ٹولبار چھپائیں
+           *[other] بک مارک ٹولبار دیکھیں
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] بک مارک مینو کو ٹولبار سے �ٹائے
+           *[other] بک مارک مینو کو ٹولبار میں شامل کریں
+        }
+bookmarks-search =
+    .label = بک مارک تلاش کریں
+bookmarks-tools =
+    .label = بک مارک ٹول
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = بک مارک ٹولبار
+    .accesskey = B
+    .aria-label = بک مارکس
+bookmarks-toolbar-menu =
+    .label = بک مارک ٹولبار
+bookmarks-toolbar-placeholder =
+    .title = ٹولبار اشیا� کو بک مارک کگاتا �ے
+bookmarks-toolbar-placeholder-button =
+    .label = ٹولبار اشیا� کو بک مارک کگاتا �ے
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = بک مارک
+library-bookmarks-bookmark-this-page =
+    .label = ی� ص�ح� نشان زد کریں
+library-bookmarks-bookmark-edit =
+    .label = اس بک مارک کی تدوین کریں
+library-recent-activity-label = حالی� سرگرمی
+
+## More items
+
+more-menu-go-offline =
+    .label = آ� لائن کام کریں
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/browserSets.ftl firefox-85.0+build1/l10n/ur/browser/browser/browserSets.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/browserSets.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/browserSets.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -4,46 +4,33 @@
 
 window-minimize-command =
     .label = چھوٹا کریں
-
 window-zoom-command =
     .label = زوم کریں
-
 window-new-shortcut =
     .key = N
-
 window-minimize-shortcut =
     .key = m
-
 close-shortcut =
     .key = W
-
 tab-new-shortcut =
     .key = t
-
 location-open-shortcut =
     .key = l
-
 location-open-shortcut-alt =
     .key = d
-
 search-focus-shortcut =
     .key = k
-
 # This shortcut is used in two contexts:
 #   - web search
 #   - find in page
 find-shortcut =
     .key = f
-
 search-find-again-shortcut =
     .key = g
-
 search-find-again-shortcut-alt =
     .keycode = VK_F3
-
 search-find-selection-shortcut =
     .key = e
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -53,7 +40,6 @@
             [linux] j
            *[other] e
         }
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -63,19 +49,14 @@
             [linux] y
            *[other] j
         }
-
 addons-shortcut =
     .key = A
-
 file-open-shortcut =
     .key = o
-
 save-page-shortcut =
     .key = s
-
 page-source-shortcut =
     .key = u
-
 # This should match the Option+Command keyboard shortcut letter that Safari
 # and Chrome use for "View Source" on macOS. `page-source-shortcut` above
 # is Firefox's official keyboard shortcut shown in the GUI.
@@ -83,59 +64,49 @@
 # users on macOS. See bug 1398988.
 page-source-shortcut-safari =
     .key = u
-
 page-info-shortcut =
     .key = i
-
 print-shortcut =
     .key = p
-
 mute-toggle-shortcut =
     .key = M
-
 nav-back-shortcut-alt =
     .key = [
-
 nav-fwd-shortcut-alt =
     .key = ]
-
 nav-reload-shortcut =
     .key = r
-
 # Shortcut available only on macOS.
 nav-stop-shortcut =
     .key = .
-
 history-show-all-shortcut =
     .key = H
-
 history-show-all-shortcut-mac =
     .key = Y
-
 history-sidebar-shortcut =
     .key = h
-
 full-screen-shortcut =
     .key = f
-
 reader-mode-toggle-shortcut-windows =
     .keycode = VK_F9
-
 reader-mode-toggle-shortcut-other =
     .key = R
-
+picture-in-picture-toggle-shortcut-mac =
+    .key = ]
+# Pick the key that is commonly present
+# in your locale keyboards above the
+# `picture-in-picture-toggle-shortcut-mac` key.
+picture-in-picture-toggle-shortcut-mac-alt =
+    .key = { "}" }
 picture-in-picture-toggle-shortcut =
     .key = ]
-
 # Pick the key that is commonly present
 # in your locale keyboards above the
 # `picture-in-picture-toggle-shortcut` key.
 picture-in-picture-toggle-shortcut-alt =
     .key = { "}" }
-
 bookmark-this-page-shortcut =
     .key = d
-
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
@@ -145,12 +116,21 @@
             [linux] o
            *[other] b
         }
-
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-library-shortcut =
+    .key = O
 # Verify what shortcut for that operation
 # are recommended by the Human Interface Guidelines
 # of each platform for your locale.
 bookmark-show-sidebar-shortcut =
     .key = b
+# Verify what shortcut for that operation
+# are recommended by the Human Interface Guidelines
+# of each platform for your locale.
+bookmark-show-toolbar-shortcut =
+    .key = B
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
@@ -158,31 +138,23 @@
 
 full-zoom-reduce-shortcut =
     .key = -
-
 # If in keyboard layouts popular for your locale you need to use the shift key
 # to access the original shortcuts, the following shortcuts can be used.
 # Otherwise their values should remain empty.
 full-zoom-reduce-shortcut-alt =
     .key = { "" }
-
 full-zoom-reduce-shortcut-alt-a =
     .key = _
-
 full-zoom-reduce-shortcut-alt-b =
     .key = { "" }
-
 full-zoom-enlarge-shortcut =
     .key = +
-
 full-zoom-enlarge-shortcut-alt =
     .key = =
-
 full-zoom-enlarge-shortcut-alt2 =
     .key = { "" }
-
 full-zoom-reset-shortcut =
     .key = 0
-
 full-zoom-reset-shortcut-alt =
     .key = { "" }
 
@@ -190,7 +162,6 @@
 
 bidi-switch-direction-shortcut =
     .key = X
-
 private-browsing-shortcut =
     .key = P
 
@@ -199,15 +170,11 @@
 
 quit-app-shortcut =
     .key = Q
-
 help-shortcut =
     .key = ?
-
 preferences-shortcut =
     .key = ,
-
 hide-app-shortcut =
     .key = H
-
 hide-other-apps-shortcut =
     .key = H
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/migration.ftl firefox-85.0+build1/l10n/ur/browser/browser/migration.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/migration.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/migration.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -4,13 +4,11 @@
 
 migration-wizard =
     .title = درآمد مددگار
-
 import-from =
     { PLATFORM() ->
         [windows] اختیارات، بک مارک، سابقات، پاس ورڈ اور دیگر کوائ� ی�اں سے درآمد کریں:
        *[other] ترجیحات، بک مارک، سابقات، پاس ورڈ اور دیگر کوائ� ی�اں سے درآمد کریں:
     }
-
 import-from-bookmarks = بک مارک ی�اں سے درآمد کریں:
 import-from-ie =
     .label = Microsoft انٹرنیٹ ایکسپلورر
@@ -51,34 +49,23 @@
 import-from-360se =
     .label = 360 قابل بھروسا براؤزر
     .accesskey = 3
-
 no-migration-sources = کوئی بھی بک مارکوں، سابقات یا پاس ورڈ کوائ� کا حامل پروگرام ن�یں ملا۔
-
 import-source-page-title = سیٹنگز اور کوائ� درآمد کریں
 import-items-page-title = درآمد کرنے کی اشیا
-
 import-items-description = درآمد کرنے کے لیے اشیا منتخب کریں:
-
+import-permissions-page-title = براۓ  م�ربانی { -brand-short-name } کو  اجات  دیں
 import-migrating-page-title = درآمد کر ر�ے �ے...
-
 import-migrating-description = مندرج� ذیل اشیا اس وقت درآمد �و ر�ے �یں۔۔۔
-
 import-select-profile-page-title = پرو�ائل منتخب کیجیے
-
 import-select-profile-description = مندرج� ذیل پرو�ائل درآمد کے لیے دستیاب �یں:
-
 import-done-page-title = درآمد مکمل
-
 import-done-description = مندرج� ذیل اشیا کامیابی سے درآمد �و گئیں:
-
 import-close-source-browser = جاری رکھنے سے پ�لے برا� کرم یقینی بنائیں کے منتخب براؤزر بند کر دیا �ے۔
-
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
 #   $source (String): The browser the user has chosen to import bookmarks from.
 imported-bookmarks-source = { $source } سے
-
 source-name-ie = انٹرنیٹ ایکسپلورر
 source-name-edge = مائیکروسا�ٹ عیدج
 source-name-edge-beta = Microsoft Edge Beta
@@ -90,7 +77,6 @@
 source-name-chromium = کرومیم
 source-name-firefox = Mozilla Firefox
 source-name-360se = 360 قابل بھروسا براؤزر
-
 imported-safari-reading-list = ��رست پڑھ ر�ا �ے (س�اری سے)
 imported-edge-reading-list = ��رست پڑھ ر�ا �ے (عیدج سے)
 
@@ -103,19 +89,6 @@
 ## chrome
 ## edge
 ## firefox
-## safari
-## The various beta and development versions of edge and chrome all get
-## normalized to just "edge" and "chrome" for these strings.
-
-## Browser data types
-## All of these strings get a $browser variable passed in.
-## You can use the browser variable to differentiate the name of items,
-## which may have different labels in different browsers.
-## The supported values for the $browser variable are:
-## 360se
-## chrome
-## edge
-## firefox
 ## ie
 ## safari
 ## The various beta and development versions of edge and chrome all get
@@ -125,7 +98,6 @@
     .label = کوکیز
 browser-data-cookies-label =
     .value = کوکیز
-
 browser-data-history-checkbox =
     .label =
         { $browser ->
@@ -138,12 +110,10 @@
             [firefox] براؤزنگ کی تاریخ اور بک مارک
            *[other] براؤزنگ کی تاریخ
         }
-
 browser-data-formdata-checkbox =
     .label = �ارم کی تاریخ مح�وظ کی گئی
 browser-data-formdata-label =
     .value = �ارم کی تاریخ مح�وظ کی گئی
-
 # This string should use the same phrase for "logins and passwords" as the
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-checkbox =
@@ -152,7 +122,6 @@
 # label in the main hamburger menu that opens about:logins.
 browser-data-passwords-label =
     .value = لاگ انز اور پاس ورڈز مح�وظ کیے گئے
-
 browser-data-bookmarks-checkbox =
     .label =
         { $browser ->
@@ -167,12 +136,10 @@
             [edge] پسندید�
            *[other] بک مارک
         }
-
 browser-data-otherdata-checkbox =
     .label = دیگر ڈیٹا
 browser-data-otherdata-label =
     .label = دیگر ڈیٹا
-
 browser-data-session-checkbox =
     .label = دریچے اور ٹیب
 browser-data-session-label =
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/ur/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/asrouter.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/newtab/asrouter.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -13,35 +13,27 @@
 
 cfr-doorhanger-extension-sumo-link =
     .tooltiptext = میں ی� کیوں دیکھ ر�ا �وں
-
 cfr-doorhanger-extension-cancel-button = ابھی ن�یں
     .accesskey = N
-
 cfr-doorhanger-extension-ok-button = اب شامل کریں
     .accesskey = A
 cfr-doorhanger-pintab-ok-button = اس ٹیب کو پن کریں
     .accesskey = P
-
 cfr-doorhanger-extension-manage-settings-button = س�ارش کی سیٹنگز منظم کریں
     .accesskey = M
-
 cfr-doorhanger-extension-never-show-recommendation = مجھے اس کی س�ارش نا دکھائیں
     .accesskey = S
-
 cfr-doorhanger-extension-learn-more-link = مزید سیکھیں
-
 # This string is used on a new line below the add-on name
 # Variables:
 #   $name (String) - Add-on author name
 cfr-doorhanger-extension-author = { $name } کے ساتھ
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-extension-notification = س�ارش
 cfr-doorhanger-extension-notification2 = س�ارش
     .tooltiptext = ایکسٹینشن کی س�ارش
     .a11y-announcement = ایکسٹینشن کی  دتستیاب س�ارش
-
 # This is a notification displayed in the address bar.
 # When clicked it opens a panel with a message for the user.
 cfr-doorhanger-feature-notification = س�ارشات
@@ -67,7 +59,6 @@
         [one] { $total } صار�
        *[other] { $total } صار�ین
     }
-
 cfr-doorhanger-pintab-description = اپنی سب سے زیاد� استعمال شد� سائٹس تک آسانی سے رسائی حاصل کریں۔ سائٹس کو ٹیب میں کھلا رکھیں (ی�اں تک ک� جب آپ دوبار� شروع کریں)۔
 
 ## These messages are steps on how to use the feature and are shown together.
@@ -75,11 +66,9 @@
 cfr-doorhanger-pintab-step1 = آپ ٹیب پر <b> دائیں کلک کریں </ b> جس پر آپ پن کرنا چا�تے �یں۔
 cfr-doorhanger-pintab-step2 = مینو سے <b> پن ٹیب </ b> منتخب کریں۔
 cfr-doorhanger-pintab-step3 = اگر سائٹ میں تاز� کاری �وئی تو آپ کو اپنے پن شد� ٹیب پر ایک نیلا نقط� نظر آئے گا۔
-
 cfr-doorhanger-pintab-animation-pause = توق� کریں
 cfr-doorhanger-pintab-animation-resume = پھر جاری کریں
 
-
 ## Firefox Accounts Message
 
 cfr-doorhanger-bookmark-fxa-header = �ر جگ� اپنے بک مارکس کی �م� وقت سازی کریں
@@ -100,22 +89,16 @@
 # This string is used by screen readers to offer a text based alternative for
 # the notification icon
 cfr-badge-reader-label-newfeature = نئی خصوصیات
-
 cfr-whatsnew-button =
     .label = نیا کیا �ے
     .tooltiptext = نیا کیا �ے
-
 cfr-whatsnew-panel-header = نیا کیا �ے
-
 cfr-whatsnew-release-notes-link-text = اجرائی نوٹس پڑھیں
-
 cfr-whatsnew-fx70-title = { -brand-short-name } اب آپ کی رازداری کے لئے اب سخت مقابل� کرر�ا �ے
 cfr-whatsnew-fx70-body = تاز� ترین اپ ڈیٹ ٹریکنگ، پروٹیکشن کی خصوصیت میں اضا�� کرتی �ے اور اسے�ر سائٹ کے لئے مح�وظ پاس ورڈ بنانے میں  پ�لے سے ک�یں زیاد� آسان بناتی �ے۔
-
 cfr-whatsnew-tracking-protect-title = اپنے آپ کو  سراغ  کاری سے بچائیں
 cfr-whatsnew-tracking-protect-body = { -brand-short-name } ب�ت سے عام سماجی اور کراس سائٹ ٹریکروں کو روکتا �ے جواسکی پیروی کر تےھیں کے آپ آن لائن کیا کرتے �یں
 cfr-whatsnew-tracking-protect-link-text = اپنی رپورٹ دیکھیں
-
 # 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.
@@ -126,11 +109,9 @@
     }
 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 = اب مح�وظ پاس ورڈ بنائیں جسکو آپ ک�یں بھی ج�اں آپ سائن ان کرتے �یں و�اں حاصل کر سکتے �یں ۔
 cfr-whatsnew-lockwise-backup-link-text = بیک اپ کو چالو کریں
-
 cfr-whatsnew-lockwise-take-title = اپنے پاس ورڈ اپنے ساتھ رکھیں
 cfr-whatsnew-lockwise-take-body =
      { -lockwise-brand-short-name } موبائل ایپ کی مدد سے آپ کو اپنے پاس مح�وظ طریقے سے رسائی حاصل کرنے کی س�ولت ملتی �ے
@@ -141,6 +122,9 @@
 
 cfr-whatsnew-searchbar-title = ایڈریس بار کے ساتھ کم ٹائپ کریں ،  مزید ڈھونڈیں
 cfr-whatsnew-searchbar-body-topsites = اب ، صر� پتے والی بار منتخب کریں ، اور ایک خان� آپ کی سر��رست سائٹوں کے ربط کے ساتھ پھیل جائے گا۔
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = میگن�ائنگ گلاس آئکن
 
 ## Picture-in-Picture
@@ -166,7 +150,6 @@
        *[other] �نگر پرنٹرز مسدود �یں
     }
 cfr-whatsnew-fingerprinter-counter-body = { -brand-shorter-name } ب�ت سے �نگر پرنٹوں کو روکتا �ے جو آپ کی اشت�اری پرو�ائل بنانے کے لیے چپکے سے آپ کے آلے اور اعمال کے بارے میں معلومات اکٹھا کرتے �یں۔
-
 # Message variation when fingerprinters count is less than 10
 cfr-whatsnew-fingerprinter-counter-header-alt = �نگر پرنٹرز
 cfr-whatsnew-fingerprinter-counter-body-alt = { -brand-shorter-name } ب�ت سے �نگر پرنٹوں کو روکتا �ے جو آپ کی اشت�اری پرو�ائل بنانے کے لیے چپکے سے آپ کے آلے اور اعمال کے بارے میں معلومات اکٹھا کرتے �یں۔
@@ -213,7 +196,6 @@
 
 cfr-doorhanger-milestone-ok-button = تمام دیکھیں
     .accesskey = س
-
 cfr-doorhanger-milestone-close-button = بند کریں
     .accesskey = C
 
@@ -252,5 +234,26 @@
 cfr-doorhanger-doh-secondary-button = غیر �عال بنایے
     .accesskey = D
 
+## Fission Experiment Message
+
+cfr-doorhanger-fission-primary-button = ٹھیک �ے مجھے سمجھ آگئی �ے
+    .accesskey = O
+cfr-doorhanger-fission-secondary-button = مزید سیکھیں
+    .accesskey = L
+
 ## What's new: Cookies message
 
+
+## What's new: Media controls message
+
+cfr-whatsnew-media-keys-header = مزید میڈیا کنٹرول
+cfr-whatsnew-media-keys-button = کیسے سیکھیں
+
+## What's new: Search shortcuts
+
+
+## What's new: Cookies protection
+
+
+## What's new: Better bookmarking
+
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/ur/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/newtab.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -15,12 +15,15 @@
 newtab-search-box-search-button =
     .title = تلاش
     .aria-label = تلاش
-
 newtab-search-box-search-the-web-text = ويب پر تلاش کريں
 newtab-search-box-search-the-web-input =
     .placeholder = ويب پر تلاش کريں
     .title = ويب پر تلاش کريں
     .aria-label = ويب پر تلاش کريں
+newtab-search-box-text = ويب پر تلاش کريں
+newtab-search-box-input =
+    .placeholder = ويب پر تلاش کريں
+    .aria-label = ويب پر تلاش کريں
 
 ## Top Sites - General form dialog.
 
@@ -30,12 +33,10 @@
 newtab-topsites-title-label = عنوان
 newtab-topsites-title-input =
     .placeholder = ایک عنوان داخل کریں
-
 newtab-topsites-url-label = URL
 newtab-topsites-url-input =
     .placeholder = ٹائپ کریں یا ایک URL چسباں کریں
 newtab-topsites-url-validation = جائز URL درکار �ے
-
 newtab-topsites-image-url-label = مخصوص نقش کا URL
 newtab-topsites-use-image-link = ایک مخصوص تصویر استعمال کریں…
 newtab-topsites-image-validation = نقش لوڈ �ونے میں ناکام ر�ا۔ برا� م�ربانی ایک مختل� URL کو آزمائیں۔
@@ -54,18 +55,20 @@
 # "This action" refers to deleting a page from history.
 newtab-confirm-delete-history-p2 = ی� عمل کلعدم ن�یں �و سکتا۔
 
+## Top Sites - Sponsored label
+
+newtab-topsite-sponsored = سپانسر شد�
+
 ## Context Menu - Action Tooltips.
 
 # General tooltip for context menus.
 newtab-menu-section-tooltip =
     .title = مینیو کھولیں
     .aria-label = مینیو کھولیں
-
 # Tooltip for dismiss button
 newtab-dismiss-button-tooltip =
     .title = �ٹائیں
     .aria-label = �ٹائیں
-
 # This tooltip is for the context menu of Pocket cards or Topsites
 # Variables:
 #  $title (String): The label or hostname of the site. This is for screen readers when the context menu button is focused/active.
@@ -132,7 +135,6 @@
 newtab-label-recommended = رجحان سازی
 newtab-label-saved = { -pocket-brand-name } میں مح�وظ شد�
 newtab-label-download = ڈاؤن لوڈ شد�
-
 # This string is used in the story cards to indicate sponsored content
 # Variables:
 #  $sponsorOrSource (String): This is the name of a company or their domain
@@ -163,6 +165,7 @@
 
 newtab-section-header-topsites = ب�ترین سائٹیں
 newtab-section-header-highlights = ش� سرخياں
+newtab-section-header-recent-activity = حالی� سرگرمی
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = { $provider } کی جانب سے تجویز کرد�
@@ -171,7 +174,6 @@
 
 newtab-empty-section-highlights = برائوزنگگ شروع کریں،اور �م آپ کو کچھ ب�ترین عبارات، وڈیوز اور حالی� دور� شدد� دیگر ص�حات یا نشانیاں دکھائیں گے۔
 
-
 ## Empty Section (Content Discovery Experience). These show when there are no more stories or when some stories fail to load.
 
 newtab-discovery-empty-section-topstories-header = آپ پکڑے گئے!
@@ -194,3 +196,14 @@
 
 newtab-error-fallback-info = ا�و� ، اس مواد کو لوڈ کرنے میں کچھ غلط �و گیا۔
 newtab-error-fallback-refresh-link = دوبار� کوشش کرنے کے لئے پیج کو ری�ریش کریں۔
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = تیز را�
+newtab-custom-recent-title = حالی� سرگرمی
+newtab-custom-close-button = بند کریں
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = سنپیٹ
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/onboarding.ftl firefox-85.0+build1/l10n/ur/browser/browser/newtab/onboarding.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/newtab/onboarding.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/newtab/onboarding.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -17,6 +17,14 @@
 
 ## Welcome modal dialog strings
 
+
+### UI strings for the simplified onboarding / multistage about:welcome
+### Various strings use a non-breaking space to avoid a single dangling /
+### widowed word, so test on various window sizes if you also want this.
+
+
+## Welcome page strings
+
 onboarding-welcome-header = { -brand-short-name } میں خوش آمدید
 onboarding-welcome-body = آپ کو براؤزر مل گیا �ے۔ <br/> باقی { -brand-product-name } سے ملیں۔
 onboarding-welcome-learn-more = �وائد کے بارے میں مزید سیکھیں۔
@@ -25,57 +33,21 @@
 onboarding-welcome-modal-privacy-body = آپ کو براؤزر مل گیا �ے۔ آئیے مزید رازداری تح�ظات شامل کریں۔
 onboarding-welcome-modal-family-learn-more = مصنوعات کے { -brand-product-name } کے کنب� کے بارے میں جانیں۔
 onboarding-welcome-form-header = ی�اں سے شروع کرو
-
 onboarding-join-form-body = شروع کرنے کے لئے اپنا ای میل ایڈریس درج کریں۔
 onboarding-join-form-email =
     .placeholder = ای میل درز کریں
 onboarding-join-form-email-error = جائز ای میل کی ظرورت �ے
 onboarding-join-form-continue = جاری رکھیں
-
 # This message is followed by a link using onboarding-join-form-signin ("Sign In") as text.
 onboarding-join-form-signin-label = کیا پ�لے سے �ی ایک اکاؤنٹ �ے؟
 # Text for link to submit the sign in form
 onboarding-join-form-signin = سائن ان کریں
-
 onboarding-start-browsing-button-label = براؤزنگ شروع کریں
+onboarding-not-now-button-label = ابھی ن�یں
 onboarding-cards-dismiss =
     .title = برخاست کریں
     .aria-label = برخاست کریں
 
-## Multistage 3-screen onboarding flow strings (about:welcome pages)
-
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. { -brand-short-name } should stay inside the span.
-onboarding-multistage-welcome-header = <span data-l10n-name="zap">{ -brand-short-name }</span> میں خوشامدید
-onboarding-multistage-welcome-subtitle = تیز ، مح�وظ ، اور نجی براؤزر جس کو غیر منا�ع بخش کی حمایت حاصل �ے۔
-onboarding-multistage-welcome-primary-button-label = سیٹ اپ شروع کریں
-onboarding-multistage-welcome-secondary-button-label = سائن ان کریں
-onboarding-multistage-welcome-secondary-button-text = کیا آپ کا اکاؤنٹ �ے؟
-
-onboarding-multistage-import-subtitle = کسی دوسرے براؤزر سے آر�ے �یں؟ سب چیزوں کو { -brand-short-name } پر لانا آسان �ے۔
-onboarding-multistage-import-primary-button-label = درآمد شروع کریں
-onboarding-multistage-import-secondary-button-label = ابھی ن�یں
-
-onboarding-multistage-theme-primary-button-label = تھیم کو مح�وظ کریں
-onboarding-multistage-theme-secondary-button-label = ابھی ن�یں
-
-# Automatic theme uses operating system color settings
-onboarding-multistage-theme-label-automatic = خودکار
-
-# System refers to the operating system
-onboarding-multistage-theme-description-automatic = سسٹم تھیم استعمال کریں
-
-onboarding-multistage-theme-label-light = �لکا
-onboarding-multistage-theme-label-dark = گ�را
-# "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
-onboarding-multistage-theme-label-alpenglow = Firefox الپینگلو
-
-## Please make sure to split the content of the title attribute into lines whose
-## width corresponds to about 40 Latin characters, to ensure that the tooltip
-## doesn't become too long. Line breaks will be preserved when displaying the
-## tooltip.
-
-
 ## Welcome full page string
 
 onboarding-fullpage-welcome-subheader = آئیے آپ جو کچھ بھی کر سکتے �یں اس کی دریا�ت شروع کریں۔
@@ -87,10 +59,8 @@
 onboarding-sync-welcome-header = { -brand-product-name }کو  اپنے ساتھ جائے
 onboarding-sync-welcome-content = اپنے تمام آلات پر اپنی نشانیاں ، سابقات ، پاس ورڈ اور دیگر سیٹنگز حاصل کریں۔
 onboarding-sync-welcome-learn-more-link = Firefox اکاؤنٹس کے بارے میں مزید سیکھیں
-
 onboarding-sync-form-input =
     .placeholder = ای میل
-
 onboarding-sync-form-continue-button = جاری رکھیں
 onboarding-sync-form-skip-login-button = اس مرحلے کو چھوڑیں
 
@@ -99,7 +69,6 @@
 onboarding-sync-form-header = اپنی ای میل داخل کریں
 onboarding-sync-form-sub-header = { -sync-brand-name } کو جاری رکھنے کے  لیے
 
-
 ## These are individual benefit messages shown with an image, title and
 ## description.
 
@@ -109,15 +78,42 @@
 # make and do. We take less data. We keep it safe. And we make sure that we are
 # transparent about how we use it."
 onboarding-benefit-privacy-text = �م جو بھی کام کرتے �یں و� �مارے ذاتی ڈیٹا کے وعدے کی قدر کرتا �ے: کم لیں۔ اسے مح�وظ رکھیں۔ کوئی راز ن�یں۔
-
 onboarding-benefit-sync-title = { -sync-brand-short-name }
-
 onboarding-benefit-monitor-title = { -monitor-brand-short-name }
 onboarding-benefit-monitor-text = جب آپ کی ذاتی معلومات معرو� ڈیٹا کی خلا� ورزی میں �ے تو مطلع ھوں۔
-
 onboarding-benefit-lockwise-title = { -lockwise-brand-short-name }
 onboarding-benefit-lockwise-text = پاس ورڈ کا نظم کریں جو مح�وظ اور پورٹیبل �یں۔
 
+## Custom Return To AMO onboarding strings
+
+return-to-amo-add-extension-label = ایکسٹینشن  شامل کریں
+
+## Multistage 3-screen onboarding flow strings (about:welcome pages)
+
+# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
+# automatically added to the text inside it. { -brand-short-name } should stay inside the span.
+onboarding-multistage-welcome-header = <span data-l10n-name="zap">{ -brand-short-name }</span> میں خوشامدید
+onboarding-multistage-welcome-subtitle = تیز ، مح�وظ ، اور نجی براؤزر جس کو غیر منا�ع بخش کی حمایت حاصل �ے۔
+onboarding-multistage-welcome-primary-button-label = سیٹ اپ شروع کریں
+onboarding-multistage-welcome-secondary-button-label = سائن ان کریں
+onboarding-multistage-welcome-secondary-button-text = کیا آپ کا اکاؤنٹ �ے؟
+onboarding-multistage-import-subtitle = کسی دوسرے براؤزر سے آر�ے �یں؟ سب چیزوں کو { -brand-short-name } پر لانا آسان �ے۔
+onboarding-multistage-import-primary-button-label = درآمد شروع کریں
+onboarding-multistage-import-secondary-button-label = ابھی ن�یں
+onboarding-multistage-theme-primary-button-label = تھیم کو مح�وظ کریں
+onboarding-multistage-theme-secondary-button-label = ابھی ن�یں
+# Automatic theme uses operating system color settings
+onboarding-multistage-theme-label-automatic = خودکار
+onboarding-multistage-theme-label-light = �لکا
+onboarding-multistage-theme-label-dark = گ�را
+# "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
+onboarding-multistage-theme-label-alpenglow = Firefox الپینگلو
+
+## Please make sure to split the content of the title attribute into lines whose
+## width corresponds to about 40 Latin characters, to ensure that the tooltip
+## doesn't become too long. Line breaks will be preserved when displaying the
+## tooltip.
+
 
 ## These strings belong to the individual onboarding messages.
 
@@ -128,55 +124,43 @@
 
 onboarding-tracking-protection-title2 = سراغ کاری سے تح�ظ
 onboarding-tracking-protection-button2 = ی� کیسے کام کرتا �ے
-
 onboarding-data-sync-title = اپنی سیٹنگز اپنے ساتھ رکھیں
 # "Sync" is short for synchronize.
 onboarding-data-sync-text2 = ج�اں بھی آپ { -brand-product-name } استعمال کرتے �یں �ر جگ� اپنے ب�ک مارکس ، پاس ورڈز اور  مزید چیزوں کو سنک کریں ۔
 onboarding-data-sync-button2 = { -sync-brand-short-name } میں  سائن ان کریں
-
 onboarding-firefox-monitor-title = ڈیٹا کی خلا� ورزیوں پر الرٹ ر�یں
 onboarding-firefox-monitor-button = الرٹس کے لئے سائن اپ کریں
-
 onboarding-browse-privately-title = رازداری سے براؤز کریں
 onboarding-browse-privately-text = نجی براؤزنگ آپ کے کمپیوٹر کو استعمال کرنے والے �ر شخص سے خ�ی� رکھنے کے لیے آپ کی تلاش اور براؤزنگ کی سابقات کو صا� کردیتی �ے۔
 onboarding-browse-privately-button = نجی ونڈو میں کھولیں؟
-
 onboarding-firefox-send-title = اپنی مشترک� امسال نجی رکھیں
 onboarding-firefox-send-button = { -send-brand-name }آزمائیں
-
 onboarding-mobile-phone-title = { -brand-product-name }  اپنے �ون پر حاصل کریں
 onboarding-mobile-phone-text = iOS یا Android  کے لئے { -brand-product-name } ڈونلوڈ کریں اور تمام آلات پر ڈیٹا سنک کریں.
 # "Mobile" is short for mobile/cellular phone, "Browser" is short for web
 # browser.
 onboarding-mobile-phone-button = موبائل براؤزر ڈاؤن لوڈ کریں
-
 onboarding-send-tabs-title = �وری طور پر خود کو ٹیبس ارسال کریں
 # "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a
 # tab's context menu.
 onboarding-send-tabs-text2 = لنکس کاپی کیے بغیر یا براؤزر کو چھوڑے بغیر اپنے آلات کے درمیان آسانی سے ص�حات کا اشتراک کریں۔
 onboarding-send-tabs-button = Send Tabs کا  استعمال شروع کریں
-
 onboarding-pocket-anywhere-title = ک�یں بھی پڑھیں اور سنیں
 onboarding-pocket-anywhere-text2 = اپنے پسندید� مواد کو آ� لائن{ -pocket-brand-name }ایپ کے ساتھ مح�وظ کریں اور جب بھی آپ کے لئے مناسب �و پڑھیں ، سنیں اور دیکھیں۔
 onboarding-pocket-anywhere-button = { -pocket-brand-name } آزمائیں
-
 onboarding-lockwise-strong-passwords-title = مضبوط پاس ورڈز بنائیں اور مح�وظ کریں
 onboarding-lockwise-strong-passwords-button = اپنے  لاگ ان بندوبست کریں
-
 onboarding-facebook-container-title = Facebook کے ساتھ حدود طے کریں
 onboarding-facebook-container-button = ایکسٹینشن شامل کریں
-
 onboarding-import-browser-settings-title = اپنے ب�ک مارکس ، پاس ورڈز اور ب�ت کچھ درآمد کریں
 onboarding-import-browser-settings-text = سیدھے ڈوبکی  لگائیں — آسانی سے اپنے ساتھ اپنی Chrome سائٹس اور سیٹنگیں اپنے ساتھ لائیں۔
 onboarding-import-browser-settings-button = chrome ڈیٹا درآمد کریں
-
 onboarding-personal-data-promise-title = ڈیزائن کے طور پر نجی �ے
 onboarding-personal-data-promise-button = �مارا وعد� پڑھیں
 
 ## Message strings belonging to the Return to AMO flow
 
 return-to-amo-sub-header = ب�ت اچھا ، آپ کو { -brand-short-name } مل گیا �ے
-
 # <icon></icon> will be replaced with the icon belonging to the extension
 #
 # Variables:
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/places.ftl firefox-85.0+build1/l10n/ur/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/places.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/places.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -17,7 +17,6 @@
 places-open-private-window =
     .label = ربط نئے نجی دریچے میں کھولیں
     .accesskey = P
-
 places-new-bookmark =
     .label = نئی بک مارک…
     .accesskey = Ù†
@@ -30,7 +29,6 @@
 places-new-separator =
     .label = نیا جداکار
     .accesskey = ج
-
 places-view =
     .label = نظار�
     .accesskey = Ù†
@@ -49,12 +47,10 @@
 places-by-day-and-site =
     .label = حسب تاریخ اور سائٹ
     .accesskey = ت
-
 places-history-search =
     .placeholder = سابقات تلاش کریں
 places-bookmarks-search =
     .placeholder = بک مارک تلاش کریں
-
 places-delete-domain-data =
     .label = اس سائٹ کے بارے میں بھول جائیں
     .accesskey = ب
@@ -64,3 +60,9 @@
 places-properties =
     .label = خواص
     .accesskey = Ø®
+# This label is used when a managed bookmarks folder doesn't have a name.
+managed-bookmarks-subfolder =
+    .label = ذيلى پوش�
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = دیگر بک مارک
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/addEngine.ftl firefox-85.0+build1/l10n/ur/browser/browser/preferences/addEngine.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/addEngine.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/preferences/addEngine.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -6,7 +6,8 @@
     .title = تلاش انجن شامل کریں
     .style = width: 32em;
 add-engine-button = مخصوص انجن شامل کریں
+add-engine-name = تلاش انجن کا نام
 add-engine-alias = عر�
-add-engine-cancel =
-    .label = منسوخ کریں
-    .accesskey = C
+add-engine-dialog =
+    .buttonlabelaccept = انجن شامل کریں
+    .buttonaccesskeyaccept = A
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/fxaPairDevice.ftl firefox-85.0+build1/l10n/ur/browser/browser/preferences/fxaPairDevice.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/fxaPairDevice.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/preferences/fxaPairDevice.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -5,9 +5,7 @@
 fxa-pair-device-dialog =
     .title = ایک اور آل� جوڑیں
     .style = width: 26em; min-height: 35em;
-
 fxa-qrcode-heading-phase1 = 1. اگر آپ کے پاس پ�لے سے �ی ن�یں �ے تو ، <a data-l10n-name="connect-another-device"> اپنے موبائل آل� پر Firefox </a> انسٹال کریں۔
-
+fxa-qrcode-heading-step2 = 2. اپنے موبائل آل� پر Firefox کھولیں۔
 fxa-qrcode-error-title = جوٰڑنے میں ناکام ر�ا
-
 fxa-qrcode-error-body = دوبار� کوشش کریں۔
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/ur/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/preferences/preferences.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -6,13 +6,11 @@
 do-not-track-learn-more = مزید سیکھیں
 do-not-track-option-always =
     .label = �میش�
-
 pref-page-title =
     { PLATFORM() ->
         [windows] اختیارات
        *[other] ترجیحات
     }
-
 # This is used to determine the width of the search field in about:preferences,
 # in order to make the entire placeholder string visible
 #
@@ -28,40 +26,32 @@
             [windows] اختیارات میں تلاش کریں
            *[other] ترجیحات میں تلاش کریں
         }
-
 managed-notice = آپ کا براؤزر آپ کی تنظیم کے زیر انتظام �ے۔
-
+category-list =
+    .aria-label = زمر� جات
 pane-general-title = عمومی
 category-general =
     .tooltiptext = { pane-general-title }
-
 pane-home-title = ابتدائی ص�ح�
 category-home =
     .tooltiptext = { pane-home-title }
-
 pane-search-title = تلاش کریں
 category-search =
     .tooltiptext = { pane-search-title }
-
 pane-privacy-title = رازداری اور سلامتی
 category-privacy =
     .tooltiptext = { pane-privacy-title }
-
 pane-sync-title2 = { -sync-brand-short-name }
 category-sync2 =
     .tooltiptext = { pane-sync-title2 }
-
 pane-experimental-title = { -brand-short-name } تجربات
 category-experimental =
     .tooltiptext = { -brand-short-name } تجربات
 pane-experimental-subtitle = احتیاط سے آگے بڑھیں
-
 help-button-label = { -brand-short-name } تعاون
 addons-button-label = ایکسٹینشن اور تھیم
-
 focus-search =
     .key = f
-
 close-button =
     .aria-label = بند کریں
 
@@ -87,15 +77,12 @@
 # This string is shown to notify the user that their home page
 # is being controlled by an extension.
 extension-controlled-homepage-override = ایک توسیع، <img data-l10n-name="icon"/>{ $name }، آپ کا ابتدائی ص�ح� کنٹرول کر ر�ی�ے۔
-
 # This string is shown to notify the user that their new tab page
 # is being controlled by an extension.
 extension-controlled-new-tab-url = ایک توسیع، <img data-l10n-name="icon"/>{ $name }، آپ کے نئے ٹیب کا ص�ح� کنٹرول کر ر�ی �یں۔
-
 # This string is shown to notify the user that the default search engine
 # is being controlled by an extension.
 extension-controlled-default-search = ایک ایکسٹینشن، <img data-l10n-name="icon"/> { $name } نے، آپکے پ�لے سے طے شد� سرچ انجن کو سیٹ کیا �ے۔
-
 # This string is shown to notify the user that Container Tabs
 # are being enabled by an extension.
 extension-controlled-privacy-containers = ایک ایکسٹینشن , <img data-l10n-name="icon"/> { $name }, کو کنٹینر ٹیب کی ضرورت �ے۔
@@ -103,13 +90,11 @@
 ## Preferences UI Search Results
 
 search-results-header = تلاش کے نتائج
-
 search-results-help-link = مدد کی ضرورت �ے؟ <a data-l10n-name="url">{ -brand-short-name } معاونت</a>
 
 ## General Section
 
 startup-header = سٹارٹ اپ
-
 # { -brand-short-name } will be 'Firefox Developer Edition',
 # since this setting is only exposed in Firefox Developer Edition
 separate-profile-mode =
@@ -117,75 +102,55 @@
 use-firefox-sync = تجاویز: ی� الگ الگ پرو�ائل استعمال کرتا �ے۔ ان کے درمیان ڈیٹا کا اشتراک کرنے کے لئے { -sync-brand-short-name } استعمال کریں۔
 get-started-not-logged-in = { -sync-brand-short-name } میں سائن ان کریں
 get-started-configured = { -sync-brand-short-name } ترجیحات کھولیں
-
 always-check-default =
     .label = �میش� جانچ پڑتال کریں ک� { -brand-short-name } آپ کا پ�لے سے طے شد� براؤزر �ے
     .accesskey = y
-
 is-default = { -brand-short-name } اس وقت آپ کا طےشد� براؤزر �ے
 is-not-default = { -brand-short-name } اس وقت آپ کا طےشد� براؤزر نھیں �ے
-
 set-as-my-default-browser =
     .label = طے شد� بنائیں…
     .accesskey = D
-
 startup-restore-previous-session =
     .label = پچھلا سیشن بحال کریں
     .accesskey = s
-
 startup-restore-warn-on-quit =
     .label = برائوزر چھوڑتے وقت تنبی� کریں
-
 disable-extension =
     .label = ایکسٹینشن غیر�عال بنائیں
-
 tabs-group-header = ٹیبس
-
 ctrl-tab-recently-used-order =
     .label = Ctrl+Tab ٹ�بس کے زر�یعے دور� حالی� اسرتعمال شدپ ترغیب میں
     .accesskey = T
-
 open-new-link-as-tabs =
     .label = ربط ونڈوز کے بجائے ٹیبس میں کھولیں
     .accesskey = w
-
 warn-on-close-multiple-tabs =
     .label = متعدد ٹیب ایک ساتھ بند کرنے پر مجھے تنبیح کیجیئے
     .accesskey = m
-
 warn-on-open-many-tabs =
     .label = متعدد ٹیب کھولنے پر شاید { -brand-short-name } آ�ست� �و تو منتب� کریں
     .accesskey = d
-
 switch-links-to-new-tabs =
     .label = جب میں ایک ربط نئے ٹیب میں کھولوں، تو �وراً اسی کی طر� سوئچ �و جائیں
     .accesskey = h
-
 show-tabs-in-taskbar =
     .label = Windows ٹاسک بار میں ٹیب پیش نظارے دکھائیں
     .accesskey = k
-
 browser-containers-enabled =
     .label = حامل ٹ�ن بحال کریں
     .accesskey = n
-
 browser-containers-learn-more = مزید سیکھیں
-
 browser-containers-settings =
     .label = سیٹنگز…
     .accesskey = i
-
 containers-disable-alert-title = تمام  حامل ٹیبس بند کریں
-
 containers-disable-alert-ok-button =
     { $tabCount ->
         [one] { $tabCount } کنٹینر ٹیب بند کریں
        *[other] { $tabCount } کنٹینر ٹیبس بند کریں
     }
 containers-disable-alert-cancel-button = ا�ل بنایا رکھیں
-
 containers-remove-alert-title = اس حامل کو �ٹائیں؟
-
 # Variables:
 #   $count (Number) - Number of tabs that will be closed.
 containers-remove-alert-msg =
@@ -193,69 +158,51 @@
         [one] اگر اپ اس کنٹینر کو ابھی �ٹاتیں �ے، تو { $count } کا کنٹینر ٹیب بند �و جائے گا۔ کیا یقینن اپ اس کنٹینر کو �ٹانا چا�تے �ے؟
        *[other] اگر اپ اس کنٹینر کو ابھی �ٹاتیں �ے، تو { $count } کے کنٹینر ٹیب بند �و جائے گے۔ کیا یقینن اپ اس کنٹینر کو �ٹانا چا�تے �ے؟
     }
-
 containers-remove-ok-button = اس حامل کو �ٹائیں
 containers-remove-cancel-button = اس حامل کو مت �ٹائیں
 
-
 ## General Section - Language & Appearance
 
 language-and-appearance-header = زبان اور ظا�ری شکل
-
 fonts-and-colors-header = �انٹ اور رنگ
-
 default-font = طےشد� �انٹ
     .accesskey = D
 default-font-size = ماپ
     .accesskey = S
-
 advanced-fonts =
     .label = اعلٰی…
     .accesskey = A
-
 colors-settings =
     .label = رنگ…
     .accesskey = C
-
 # Zoom is a noun, and the message is used as header for a group of options
 preferences-zoom-header = زوم
-
 preferences-default-zoom = طے شد� زوم
     .accesskey = z
-
 preferences-default-zoom-value =
     .label = { $percentage }%
-
 preferences-zoom-text-only =
     .label = ْصر� متن زوم کریں
     .accesskey = t
-
 language-header = زبان
-
 choose-language-description = ص�ح� دکھانے کے لیے اپنی زبان چنیں
-
 choose-button =
     .label = انتخاب کریں…
     .accesskey = o
-
 manage-browser-languages-button =
     .label = متبادل سیٹ کریں...
     .accesskey = I
 confirm-browser-language-change-description = { -brand-short-name } دوبار� شروع کریں ان تبدیلیوں کو لاگو کرنے کے لیے
 confirm-browser-language-change-button = لاگو کرے اور دوبار� شروع کریں
-
 translate-web-pages =
     .label = ترجم� کریں ویب کے مواد کا
     .accesskey = T
-
 # The <img> element is replaced by the logo of the provider
 # used to provide machine translations for web pages.
 translate-attribution = کی طر� سے ترجمے <img data-l10n-name="logo"/>
-
 translate-exceptions =
     .label = استثنیات ...
     .accesskey = x
-
 check-user-spelling =
     .label = ٹائپ کرتے وقت اپنی املا کی پڑتال کریں
     .accesskey = t
@@ -263,13 +210,10 @@
 ## General Section - Files and Applications
 
 files-and-applications-title = �لیں اور ایپلی کیشن
-
 download-header = ڈاؤن لوڈ
-
 download-save-to =
     .label = مسل مح�وظ کریں بر
     .accesskey = v
-
 download-choose-folder =
     .label =
         { PLATFORM() ->
@@ -281,64 +225,50 @@
             [macos] e
            *[other] o
         }
-
 download-always-ask-where =
     .label = مجھ سے �میش� پوچھیں ک� مسل ک�اں مح�وظ کرنی �ے
     .accesskey = A
-
 applications-header = ایپلی کیشنیں
-
 applications-filter =
     .placeholder = مسل کی اقسام یا ایپلی کیشنز تلاش کریں
-
 applications-type-column =
     .label = مواد قسم
     .accesskey = T
-
 applications-action-column =
     .label = عمل
     .accesskey = A
-
 # Variables:
 #   $extension (String) - file extension (e.g .TXT)
 applications-file-ending = { $extension } مسل
 applications-action-save =
     .label = مسل مح�وظ کریں
-
 # Variables:
 #   $app-name (String) - Name of an application (e.g Adobe Acrobat)
 applications-use-app =
     .label = { $app-name } استعمال کریں
-
 # Variables:
 #   $app-name (String) - Name of an application (e.g Adobe Acrobat)
 applications-use-app-default =
     .label = { $app-name } استعمال کریں (طے شد�)
-
 applications-use-other =
     .label = دیگر استعمال کریں…
 applications-select-helper = دستگیر ایپلی کیشن منتخب کریں
-
 applications-manage-app =
     .label = ایپلی کیشن ت�اصیل…
 applications-always-ask =
     .label = �میش� پوچھیں
 applications-type-pdf = پورٹبل ڈاکیومنٹ �ارمیٹ (PDF)
-
 # Variables:
 #   $type (String) - the MIME type (e.g application/binary)
 applications-type-pdf-with-type = { applications-type-pdf } ({ $type })
-
 # Variables:
 #   $type-description (String) - Description of the type (e.g "Portable Document Format")
 #   $type (String) - the MIME type (e.g application/binary)
 applications-type-description-with-type = { $type-description } ({ $type })
-
 # Variables:
 #   $extension (String) - file extension (e.g .TXT)
 #   $type (String) - the MIME type (e.g application/binary)
 applications-file-ending-with-type = { applications-file-ending }{ $type }
-
 # Variables:
 #   $plugin-name (String) - Name of a plugin (e.g Adobe Flash)
 applications-use-plugin-in =
@@ -352,70 +282,49 @@
 
 applications-use-plugin-in-label =
     .value = { applications-use-plugin-in.label }
-
 applications-action-save-label =
     .value = { applications-action-save.label }
-
 applications-use-app-label =
     .value = { applications-use-app.label }
-
 applications-open-inapp-label =
     .value = { applications-open-inapp.label }
-
 applications-always-ask-label =
     .value = { applications-always-ask.label }
-
 applications-use-app-default-label =
     .value = { applications-use-app-default.label }
-
 applications-use-other-label =
     .value = { applications-use-other.label }
-
 applications-use-os-default-label =
     .value = { applications-use-os-default.label }
 
 ##
 
 drm-content-header = عددی حقوق بندرستگی(DRM) مواد
-
 play-drm-content =
     .label = DRM کے زیرانتظام مواد چلائیں
     .accesskey = P
-
 play-drm-content-learn-more = مزید سیکھیں
-
 update-application-title = { -brand-short-name } تاز� کاریاں:
-
 update-application-version = ورژن{ $version } <a data-l10n-name="learn-more">نیا کیا �ے</a>
-
 update-history =
     .label = تاز� ترین سابقات دکھائیں
     .accesskey = p
-
 update-application-allow-description = { -brand-short-name } کو اجازت دیں
-
 update-application-auto =
     .label = خودکار  طور  پر  تاز�کاری  انسٹال کریں (تجویز شد�)
     .accesskey = A
-
 update-application-check-choose =
     .label = تاز� کاریوں کی پڑتال کریں، لیکن مجھے ان�یں انسٹال کرنے کا انتخاب کرنے دیں
     .accesskey = c
-
 update-application-manual =
     .label = کبھی بھی تاز� کاری کی پڑتال ن�یں کریں
     .accesskey = N
-
 update-application-use-service =
     .label = تاز� کاریاں تنصیب کرنے کے لیے پس منظر سروس استعمال کریں
     .accesskey = b
-
 update-setting-write-failure-title = تاز� کاری کی ترجیحات کو مح�وظ کرنے میں مسل� �ے
-
 update-in-progress-title = اپ ڈیٹ جاری �ے
-
 update-in-progress-message = کیا آپ { -brand-short-name } کی تاز� کاری جاریرکھناچاھتے �یں؟
-
 update-in-progress-ok-button = &رد کريں
 # Continue is the cancel button so pressing escape or using a platform standard
 # method of closing the UI will not discard the update.
@@ -424,22 +333,16 @@
 ## General Section - Performance
 
 performance-title = کارکردگی
-
 performance-use-recommended-settings-checkbox =
     .label = تجویز کرد� کارکردگی کی سیٹنگز استعمال کریں
     .accesskey = U
-
 performance-use-recommended-settings-desc = ی� سیٹنگز آپ کے کمپیوٹر کے �ارڈ ویئر اور آپریٹنگ سسٹم کے مطابق �یں۔
-
 performance-settings-learn-more = مزید سیکھیں
-
 performance-allow-hw-accel =
     .label = جب دستیاب �و تو �ارڈ ویئر سرعت کاری استعمال کریں
     .accesskey = r
-
 performance-limit-content-process-option = مواد کی عمل کی حد
     .accesskey = I
-
 # Variables:
 #   $num - default value of the `dom.ipc.processCount` pref.
 performance-default-content-process-count =
@@ -448,48 +351,38 @@
 ## General Section - Browsing
 
 browsing-title = براؤزنگ
-
 browsing-use-autoscroll =
     .label = خودبخود سکرولنگ کااستعمال کریں
     .accesskey = a
-
 browsing-use-smooth-scrolling =
     .label = �موار طومار استعمال کریں
     .accesskey = m
-
 browsing-use-onscreen-keyboard =
     .label = ضرورت کے وقت ٹچ کی بورڈ دکھایں
     .accesskey = c
-
 browsing-use-cursor-navigation =
     .label = ص�حات میں آگے پیچھے جانے کے لیے �میش� کرسر کلیدیں استعمال کریں
     .accesskey = k
-
 browsing-search-on-start-typing =
     .label = میرے ٹائپ کرنے پر متن کے لیے تلاش شروع کریں
     .accesskey = x
-
 browsing-picture-in-picture-toggle-enabled =
     .label = تصویر میں تصویر ویڈیو کنٹرول کو قابل بنائیں
     .accesskey = E
-
 browsing-picture-in-picture-learn-more = مزید سیکھیں
-
+browsing-media-control-learn-more = مزید سیکھیں
 browsing-cfr-recommendations =
     .label = براؤز کرتے وقت ایکسٹینشن کی تجویز کریں
     .accesskey = R
 browsing-cfr-features =
     .label = براؤز کرتے وقت خصوصیات کی تجویز کریں
     .accesskey = f
-
 browsing-cfr-recommendations-learn-more = مزید سیکھیں
 
 ## General Section - Proxy
 
 network-settings-title = نیٹ ورک سیٹنگز
-
 network-proxy-connection-learn-more = مزید سیکھیں
-
 network-proxy-connection-settings =
     .label = سیٹنگز…
     .accesskey = e
@@ -497,33 +390,25 @@
 ## Home Section
 
 home-new-windows-tabs-header = نئے دریچے اور ٹیبس
-
 home-new-windows-tabs-description2 = جب آپ اپنا ابتدیی ص�ح� ، نئی ونڈوز اور نئی ٹیبز کھولتے �یں تو  کا انتخاب کریں اپ کیا دیکھنا چا�تے �یں۔
 
 ## Home Section - Home Page Customization
 
 home-homepage-mode-label = ابتدائی ص�ح� اور نیا ونڈوں
-
 home-newtabs-mode-label = نئے ٹیبس
-
 home-restore-defaults =
     .label = طےشد� بحال کریں
     .accesskey = R
-
 # "Firefox" should be treated as a brand and kept in English,
 # while "Home" and "(Default)" can be localized.
 home-mode-choice-default =
     .label = Firefox کا ابتائی ص�ح�
-
 home-mode-choice-custom =
     .label = مخصوص …URLs
-
 home-mode-choice-blank =
     .label = خالی ص�ح�
-
 home-homepage-custom-url =
     .placeholder = ایک URL چسپاں کریں...
-
 # This string has a special case for '1' and [other] (default). If necessary for
 # your language, you can add {$tabCount} to your translations and use the
 # standard CLDR forms, or only use the form for [other] if both strings should
@@ -535,7 +420,6 @@
            *[other] حالی� ص�حے استعمال کریں
         }
     .accesskey = C
-
 choose-bookmark =
     .label = بک مارک استعمال کریں…
     .accesskey = B
@@ -544,7 +428,6 @@
 
 home-prefs-content-header = Firefox ابتائی مواد
 home-prefs-content-description = اپنی Firefox کی ابتدائی اسکرین پر آپ کون سا مواد چا�تے پیں اسکا انتخاب کریں۔
-
 home-prefs-search-header =
     .label = وءب تلاش
 home-prefs-topsites-header =
@@ -562,7 +445,6 @@
 home-prefs-recommended-by-learn-more = ی� کیسے کام کرتا �ے
 home-prefs-recommended-by-option-sponsored-stories =
     .label = سرپرست شد� ک�اناں
-
 home-prefs-highlights-header =
     .label = ش� سرخياں
 home-prefs-highlights-description = ان سائٹس کا ایک انتخاب جو آپ نے مح�وظ کیا �ے یا ملاحظ� کیا �ے
@@ -574,7 +456,8 @@
     .label = حالی� ڈاؤن لوڈ شد�
 home-prefs-highlights-option-saved-to-pocket =
     .label = ص�حات { -pocket-brand-name } میں مح�وظ کر دیئے گئے �یں
-
+home-prefs-recent-activity-header =
+    .label = حالی� سرگرمی
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -596,47 +479,38 @@
     .label = تلاش اور نیویگیشن کے لئے ایڈریس بار کا استعمال کریں
 search-bar-shown =
     .label = سرچ بار کا ٹولبار مے ا ضا�� کریں۔
-
 search-engine-default-header = طےشد� تلاش انجن
 search-engine-default-desc-2 = ی� پت� کی بار اور تلاش کی بار میں ی� آپکا طے شد� تلاش انجن �ے۔ آپ کسی بھی وقت سوئچ کر سکتے �یں
 search-engine-default-private-desc-2 = نجی ونڈوں کے لیئے مختل�'طے شد� تلاش انجن منتخب کریں
 search-separate-default-engine =
     .label = اس تلاش انجن کو نجی ونڈوز میں استعمال کریں
     .accesskey = U
-
 search-suggestions-header = تلاش تجاویز
 search-suggestions-desc = منتخب کریں ک� تلاش انجن سے تجاویز کیسے ظا�ر �وں۔
-
 search-suggestions-option =
     .label = تلاش تجاویز م�یا کریں
     .accesskey = s
-
 search-show-suggestions-url-bar-option =
     .label = ایڈریس بار کے نتائج میں تلاش کی تجاویز دکھائیں
     .accesskey = I
-
 search-show-suggestions-private-windows =
     .label = نجی ونڈوز میں تلاش کی تجاویز دکھائیں
-
 search-suggestions-cant-show = تلاش کرد� تجاویز محل وقوع کے بار کے نتائج میں دکھاءی نھیں جائنگے کیونک� { -brand-short-name } سابقات کبھی یاد ن�یں رکھنے پر تشکیل کرد� �ے۔
-
 search-one-click-header = ایک کلک تلاش انجن
-
 search-choose-engine-column =
     .label = تلاش انجن
 search-choose-keyword-column =
     .label = کلیدی ل�ظ
-
 search-restore-default =
     .label = طےشد� تلاش انجن بحال کریں
     .accesskey = D
-
 search-remove-engine =
     .label = �ٹائیں
     .accesskey = R
-
+search-add-engine =
+    .label = شامل کریں
+    .accesskey = A
 search-find-more-link = مزید تلاش انجن تلاش کریں
-
 # This warning is displayed when the chosen keyword is already in use
 # ('Duplicate' is an adjective)
 search-keyword-warning-title = کلیدی ل�ظ مثنی کریں
@@ -657,29 +531,22 @@
 containers-add-button =
     .label = نئے حامل کا اضا�� کریں
     .accesskey = A
-
 containers-new-tab-check =
     .label = �ر نئے ٹیب کے لئے ایک کنٹینر منتخب کریں
     .accesskey = S
-
 containers-preferences-button =
     .label = ترجیحات
 containers-remove-button =
     .label = �ٹائیں
 
-## Sync Section - Signed out
-
-
 ## Firefox Account - Signed out. Note that "Sync" and "Firefox Account" are now
 ## more discrete ("signed in" no longer means "and sync is connected").
 
 sync-signedout-caption = اپنی ویب اپنے ساتھ رکھیں
 sync-signedout-description = اپنے تمام ڈیوائس اپنے بک مارکس، سابقات، ٹیب، پاس ورڈ، ایڈ اون، اور ترجیحات کو �م وقت ساز کریں۔
-
 sync-signedout-account-signin2 =
     .label = { -sync-brand-short-name } میں سائن ان کریں
     .accesskey = i
-
 # This message contains two links and two icon images.
 #   `<img data-l10n-name="android-icon"/>` - Android logo icon
 #   `<a data-l10n-name="android-link">` - Link to Android Download
@@ -690,32 +557,23 @@
 # to your language, but should not be changed or translated.
 sync-mobile-promo = Firefox ڈاؤن لوڈ کریں <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> یا <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a>آپ کے موبائل ڈیوائس کے ساتھ �م� وقت ساز
 
-## Sync Section - Signed in
-
-
 ## Firefox Account - Signed in
 
 sync-profile-picture =
     .tooltiptext = پرو�ائل کی تصویر تبدیل کریں
-
 sync-sign-out =
     .label = سائن آؤٹ…
     .accesskey = Ú¯
-
 sync-manage-account = اکاؤنٹ کا منظم کریں
     .accesskey = o
-
 sync-signedin-unverified = { $email } توثیق شد� ن�یں �ے۔
 sync-signedin-login-failure = پھر جڑنے کے لیے سائن ان کریں { $email }
-
 sync-resend-verification =
     .label = توژیق کاری دوبار� ارسال کریں
     .accesskey = d
-
 sync-remove-account =
     .label = اکائونٹ �ٹائیں
     .accesskey = R
-
 sync-sign-in =
     .label = سائن ان کریں
     .accesskey = g
@@ -723,13 +581,10 @@
 ## Sync section - enabling or disabling sync.
 
 prefs-syncing-on = سنکنگ چالو �ے
-
 prefs-syncing-off = سنکنگ بند �ے
-
 prefs-sync-setup =
     .label = { -sync-brand-short-name } مرتب کریں۔
     .accesskey = S
-
 prefs-sync-now =
     .labelnotsyncing = ابھی �م� وقت سازی کریں
     .accesskeynotsyncing = Ù†
@@ -738,7 +593,6 @@
 ## The list of things currently syncing.
 
 sync-currently-syncing-heading = آپ �ی الحال ان اشیاء کو سنک کر ر�ے �یں:
-
 sync-currently-syncing-bookmarks = بک مارک
 sync-currently-syncing-history = سابقات
 sync-currently-syncing-tabs = ٹیب کھولیں
@@ -751,7 +605,6 @@
         [windows] اختیارات
        *[other] ترجیحات
     }
-
 sync-change-options =
     .label = تبدیل…
     .accesskey = Ú†
@@ -765,35 +618,28 @@
     .buttonaccesskeyaccept = S
     .buttonlabelextra2 = منقطع کریں…
     .buttonaccesskeyextra2 = D
-
 sync-engine-bookmarks =
     .label = بک مارک
     .accesskey = m
-
 sync-engine-history =
     .label = سابقات
     .accesskey = r
-
 sync-engine-tabs =
     .label = ٹیبس کھولیں
     .tooltiptext = تمام �م� وقت ساز آلات میں  کیا کھلا �ے اس کی ��رست
     .accesskey = t
-
 sync-engine-logins-passwords =
     .label = لاگ ان اور پاس ورڈ
     .tooltiptext = صار� کے نام اور پاسورڈ جو آپ  نے مح�وظ کیے
     .accesskey = L
-
 sync-engine-creditcards =
     .label = کریڈٹ کارڈز
     .tooltiptext = نام،نمبر اور اختتام کی تاریخ (صر� ڈیسک ٹاپ کے لیئے)
     .accesskey = C
-
 sync-engine-addons =
     .label = ایڈ-اون
     .tooltiptext = Firefox ڈیسک ٹاپ کے لئے ایکسٹینشن اور تھیم
     .accesskey = A
-
 sync-engine-prefs =
     .label =
         { PLATFORM() ->
@@ -806,33 +652,26 @@
 ## The device name controls.
 
 sync-device-name-header = آل� کا نام
-
 sync-device-name-change =
     .label = آل� کا نام تبدیل کریں…
     .accesskey = h
-
 sync-device-name-cancel =
     .label = منسوخ کریں
     .accesskey = n
-
 sync-device-name-save =
     .label = مح�وظ کریں
     .accesskey = v
-
 sync-connect-another-device = ایک اور آل� جوڑیں
 
 ## Privacy Section
 
 privacy-header = براؤزر رازداری
 
-## Privacy Section - Forms
-
 ## Privacy Section - Logins and Passwords
 
 # The search keyword isn't shown to users but is used to find relevant settings in about:preferences.
 pane-privacy-logins-and-passwords-header = لاگ ان & پاس ورڈ
     .searchkeywords = { -lockwise-brand-short-name }
-
 # Checkbox to control whether UI is shown to users to save or fill logins/passwords.
 forms-ask-to-save-logins =
     .label = ویب سائٹس کے لئے لاگ ان اور پاس ورڈ کو مح�وظ کرنے کے لئے پوچھیں
@@ -844,7 +683,6 @@
     .label = تجویز کریں اور مضبوط پاس ورڈ تیار کریں
     .accesskey = u
 forms-breach-alerts-learn-more-link = مزید سیکھیں
-
 # Checkbox which controls filling saved logins into fields automatically when they appear, in some cases without user interaction.
 forms-fill-logins-and-passwords =
     .label = خودبخود �ل �ونے والے لاگ انز اور پاس ورڈز
@@ -865,7 +703,6 @@
 forms-master-pw-change =
     .label = ماسٹر پاس ورڈ تبدیل کریں…
     .accesskey = M
-
 forms-master-pw-fips-title = �ی الحال آپ FIPS موڈ میں �یں۔ FIPS کو ایک ناخالی ماسٹر پاس ورڈ درکار �ے۔
 forms-primary-pw-change =
     .label = بنیادی پاس ورڈ تبدیل کریں…
@@ -874,7 +711,6 @@
 # "Master Password" in your language. If you're editing the FTL file directly,
 # use { "" } as the value.
 forms-primary-pw-former-name = پ�لے ماسٹر پاس ورڈ کے نام سے جانا جاتا تھا
-
 forms-master-pw-fips-desc = پاس ورڈ تبدیلی ناکام
 
 ## OS Authentication dialog
@@ -884,7 +720,6 @@
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
 # notes are only valid for English. Please test in your locale.
 master-password-os-auth-dialog-message-macosx = ماسٹر پاس ورڈ بنائیں
-
 # This message can be seen by trying to add a Primary Password.
 # The macOS strings are preceded by the operating system with "Firefox is trying to "
 # and includes subtitle of "Enter password for the user "xxx" to allow this." These
@@ -895,7 +730,6 @@
 ## Privacy Section - History
 
 history-header = سابقات
-
 # This label is followed, on the same line, by a dropdown list of options
 # (Remember history, etc.).
 # In English it visually creates a full sentence, e.g.
@@ -907,37 +741,29 @@
 #   - As a stand-alone message, for example "Firefox history settings:".
 history-remember-label = { -brand-short-name }
     .accesskey = 	w
-
 history-remember-option-all =
     .label = سابقات یاد رکھے
 history-remember-option-never =
     .label = کبھی سابقات ن� یاد رکھے
 history-remember-option-custom =
     .label = سابقات کے لیے مخصوص سیٹنگز استعمال کریں
-
 history-remember-description = { -brand-short-name } آپکی برائوزنگ ڈائونلوڈ اور تلاش سابقات یاد رکھے گا۔
 history-dontremember-description = { -brand-short-name } نجی براؤزنگ کی سیٹنگز استعمال کرے گا، اور آپ کے براوز کرتے وقت کوئی سابقات ن�یں یاد رکھے گا۔
-
 history-private-browsing-permanent =
     .label = �میش� نجی براوزنگ موڈ استعمال کریں
     .accesskey = p
-
 history-remember-browser-option =
     .label = براؤزنگ اور ڈاؤن لوڈ سابقات یاد رکھیں
     .accesskey = b
-
 history-remember-search-option =
     .label = تلاش اور �ارم سابقات یاد رکھیں
     .accesskey = f
-
 history-clear-on-close-option =
     .label = { -brand-short-name } کے بند �ونے پر سابقات صا� کریں
     .accesskey = r
-
 history-clear-on-close-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 history-clear-button =
     .label = سابقات صا� کریں
     .accesskey = s
@@ -945,28 +771,21 @@
 ## Privacy Section - Site Data
 
 sitedata-header = کوکیز اور سائٹ کے کوا�ئ�
-
 sitedata-total-size-calculating = سائٹ کے ڈیٹا اور کیشے کے ماپ کا حساب لگا ر�ے �یں…
-
 sitedata-learn-more = مزید سیکھیں
-
 sitedata-delete-on-close =
     .label = { -brand-short-name } بند �ونے پر سائٹ کاڈیٹااور کوکیز حذ� کریں
     .accesskey = c
-
 sitedata-allow-cookies-option =
     .label = کوکیز اور سائٹ کا ڈیٹا قبول کریں
     .accesskey = A
-
 sitedata-disallow-cookies-option =
     .label = کوکیز اور سائٹ کا ڈیٹا روکیں
     .accesskey = B
-
 # This label means 'type of content that is blocked', and is followed by a drop-down list with content types below.
 # The list items are the strings named sitedata-block-*-option*.
 sitedata-block-desc = بلاک کی �وئی مواد
     .accesskey = T
-
 sitedata-option-block-cross-site-trackers =
     .label = کراس-سائٹ ٹریکر
 sitedata-option-block-cross-site-and-social-media-trackers =
@@ -977,19 +796,15 @@
     .label = تمام تیسری تنظیم کے کوکیز (ویب سائٹس کے ٹوٹنے کا سبب بن سکتی �ے)
 sitedata-option-block-all =
     .label = تمام کوکیز (ویب سائٹس کے ٹوٹنے کا سبب بن سکتی �ے)
-
 sitedata-clear =
     .label = کوائ�… خالی کریں
     .accesskey = l
-
 sitedata-settings =
     .label = کوائ�… منظم کریں
     .accesskey = M
-
 sitedata-cookies-permissions =
     .label = اجازتوں کو منظم کریں…
     .accesskey = P
-
 sitedata-cookies-exceptions =
     .label = مستثنیات کو منظم کریں…
     .accesskey = x
@@ -997,9 +812,7 @@
 ## Privacy Section - Address Bar
 
 addressbar-header = پت� کی بار
-
 addressbar-suggest = �ت� کی بار استعمال کرتے وقت، تجویز دیں
-
 addressbar-locbar-history-option =
     .label = براؤزنگ سابقات
     .accesskey = h
@@ -1012,13 +825,11 @@
 addressbar-locbar-topsites-option =
     .label = مقبول سائٹس
     .accesskey = T
-
 addressbar-suggestions-settings = تلاش کے انجن کی تجاویز کے لئے ترجیحات کو بدلیں
 
 ## Privacy Section - Content Blocking
 
 content-blocking-enhanced-tracking-protection = ب�تر سراغ کاری تح�ظ
-
 content-blocking-learn-more = مزید سیکھیں
 
 ## These strings are used to define the different levels of
@@ -1039,7 +850,6 @@
 
 content-blocking-etp-standard-desc = تح�ظ اور کارکردگی کیلئے متوازن۔ ص�حات عام طور پر لوڈ �وں گے۔
 content-blocking-etp-custom-desc = منتخب کریں ک� کون سے ٹریکرز اور اسکرپٹ کو مسدود کرنا �ے۔
-
 content-blocking-private-windows = نجی ونڈوز میں مواد  کی  ٹریکنگ
 content-blocking-cross-site-tracking-cookies = کراس-سائٹ ٹریکنگ کوکیز
 content-blocking-social-media-trackers = سوشل میڈیا ٹریکرز
@@ -1049,15 +859,12 @@
 content-blocking-all-third-party-cookies = تمام تیسری تنظیم کے کوکیز
 content-blocking-cryptominers = کریپٹومینر
 content-blocking-fingerprinters = �نگر پرنٹرز
-
 content-blocking-warning-title = دھیان دیں!
 content-blocking-warning-learn-how = کیسے سیکھیں
-
 content-blocking-reload-description = آپ کو ان تبدیلیوں کو لاگو کرنے کے لئے اپنے ٹیب کو دوبار� لوڈ کرنے کی ضرورت �وگی۔
 content-blocking-reload-tabs-button =
     .label = تمام ٹیب پھر لوڈ کریں
     .accesskey = R
-
 content-blocking-tracking-content-label =
     .label = مواد کی ٹریکنگ
     .accesskey = T
@@ -1068,19 +875,15 @@
     .label = صر� نجی ونڈوں میں
     .accesskey = p
 content-blocking-tracking-protection-change-block-list = بلاک ��رست تبدیل کریں
-
 content-blocking-cookies-label =
     .label = کوکیز
     .accesskey = C
-
 content-blocking-expand-section =
     .tooltiptext = مزید معلومات
-
 # Cryptomining refers to using scripts on websites that can use a computer’s resources to mine cryptocurrency without a user’s knowledge.
 content-blocking-cryptominers-label =
     .label = کریپٹومینر
     .accesskey = y
-
 # Browser fingerprinting is a method of tracking users by the configuration and settings information (their "digital fingerprint")
 # that is visible to websites they browse, rather than traditional tracking methods such as IP addresses and unique cookies.
 content-blocking-fingerprinters-label =
@@ -1096,73 +899,55 @@
 ## Privacy Section - Permissions
 
 permissions-header = اجازتیں
-
 permissions-location = محل وقوع
 permissions-location-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 permissions-xr = مجازی حقیقت
 permissions-xr-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 permissions-camera = کیمر�
 permissions-camera-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 permissions-microphone = مائیکرو�ون
 permissions-microphone-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 permissions-notification = اعلانات
 permissions-notification-settings =
     .label = سیٹنگز…
     .accesskey = t
 permissions-notification-link = مزید سیکھیں
-
 permissions-autoplay = آٹو پلے
-
 permissions-autoplay-settings =
     .label = سیٹنگز…
     .accesskey = t
-
 permissions-block-popups =
     .label = پوپ اپ دریچے بلاک کیجیے
     .accesskey = B
-
 permissions-block-popups-exceptions =
     .label = استثنیات…
     .accesskey = E
-
 permissions-addon-install-warning =
     .label = متنب� کریں  جب ویب سائٹس اظا�� جات تنصیب کرنے کی کوشش کریں
     .accesskey = W
-
 permissions-addon-exceptions =
     .label = استثنیات…
     .accesskey = E
-
 permissions-a11y-privacy-checkbox =
     .label = قابل رسائی خدمات کو اپنے براؤزر تک رسائی سے روکیں
     .accesskey = a
-
 permissions-a11y-privacy-link = مزید سیکھیں
 
 ## Privacy Section - Data Collection
 
 collection-privacy-notice = رازداری کا نوٹس
-
 collection-health-report-telemetry-disabled-link = مزید سیکھیں
-
 collection-health-report-link = مزید سیکھیں
-
 collection-studies-link = { -brand-short-name } کی مطالعات دیکھیں
-
 addon-recommendations-link = مزید سیکھیں
-
 collection-backlogged-crash-reports-link = مزید سیکھیں
 
 ## Privacy Section - Security
@@ -1171,16 +956,13 @@
 ## https://developers.google.com/safe-browsing/developers_guide_v2#AcceptableUsage
 
 security-header = سلامتی
-
 security-enable-safe-browsing =
     .label = خطرناک اور دھوک� دینے والے مواد کو بلاک کریں
     .accesskey = B
 security-enable-safe-browsing-link = مزید سیکھیں
-
 security-block-downloads =
     .label = خطرناک ڈاؤن لوڈز کو بلاک کریں
     .accesskey = d
-
 security-block-uncommon-software =
     .label = غیر عمومی سا�ٹ ویئر کے متعلق مجھیں خبردار کریں
     .accesskey = c
@@ -1188,33 +970,25 @@
 ## Privacy Section - Certificates
 
 certs-header = تصدیق نامے
-
 certs-personal-label = جب پیش کار آپ کے ذاتی تصدیق نام� کی درخواست کرے
-
 certs-select-auto-option =
     .label = خودبخود ایک منتخب کریں
     .accesskey = S
-
 certs-select-ask-option =
     .label = مجھے �ر بار پوچھیں
     .accesskey = A
-
 certs-enable-ocsp =
     .label = سوال OCSP ریسپانڈر سرور کی موجود� سرٹی�کیٹ کی تصدیق کرتی �ے
     .accesskey = Q
-
 certs-view =
     .label = تصدیق نام� دیکھیں
     .accesskey = C
-
 certs-devices =
     .label = سلامتی آلات
     .accesskey = D
-
 space-alert-learn-more-button =
     .label = مزید سیکھیں
     .accesskey = Ù…
-
 space-alert-over-5gb-pref-button =
     .label =
         { PLATFORM() ->
@@ -1226,7 +1000,6 @@
             [windows] O
            *[other] O
         }
-
 space-alert-under-5gb-ok-button =
     .label = ٹھیک �ے مجھے سمجھ آگئی �ے
     .accesskey = K
@@ -1240,7 +1013,6 @@
 desktop-folder-name = ڈیسک ٹاپ
 downloads-folder-name = ڈاؤن لوڈ
 choose-download-folder-title = ڈاؤن لوڈ پوش� انتخاب کریں:
-
 # Variables:
 #   $service-name (String) - Name of a cloud storage provider like Dropbox, Google Drive, etc...
 save-files-to-cloud-storage =
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/tabContextMenu.ftl firefox-85.0+build1/l10n/ur/browser/browser/tabContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/tabContextMenu.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/tabContextMenu.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -47,6 +47,9 @@
 move-to-new-window =
     .label = نئے دریچے میں بڑھائیں
     .accesskey = W
+tab-context-close-multiple-tabs =
+    .label = تمام ٹیب بند کریں
+    .accesskey = M
 
 ## Variables:
 ##  $tabCount (Number): the number of tabs that are affected by the action.
@@ -63,3 +66,19 @@
 move-tab =
     .label = ٹیب منتقل کریں
     .accesskey = v
+tab-context-close-tabs =
+    .label =
+        { $tabCount ->
+            [1] ٹیب بند کریں
+            [one] ٹیب بند کریں
+           *[other] ٹیبز بند کریں
+        }
+    .accesskey = C
+tab-context-move-tabs =
+    .label =
+        { $tabCount ->
+            [1] ٹیب منتقل کریں
+            [one] ٹیب منتقل کریں
+           *[other] ٹیب منتقل کریں
+        }
+    .accesskey = v
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/ur/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -28,21 +28,18 @@
                 U
         }
     .accesskey = U
-
 toolbar-context-menu-manage-extension =
     .label = توسیع بندرست کریں
     .accesskey = E
 toolbar-context-menu-remove-extension =
     .label = ایکسٹینشن �ٹائیں
     .accesskey = v
-
 # This label is used in the extensions toolbar buttons context menus,
 # a user can use this command to submit to Mozilla an abuse report
 # related to that extension. "Report" is a verb.
 toolbar-context-menu-report-extension =
     .label = ایکسٹینشن کی رپورٹ کریں
     .accesskey = o
-
 # Can appear on the same context menu as menubarCmd ("Menu Bar") and
 # personalbarCmd ("Bookmarks Toolbar"), so they should have different
 # access keys.
@@ -58,3 +55,21 @@
 toolbar-context-menu-view-customize-toolbar =
     .label = تخصیص کریں…
     .accesskey = C
+toolbar-context-menu-bookmarks-toolbar-always-show =
+    .label = �میش�
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show =
+    .label = کبھی ن�یں
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab =
+    .label = صر� نئی ٹیب پر
+    .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = �میش� دکھائیں
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = کبھی ن� دکھائیں
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = صر� نئی ٹیب پر دکھائیں
+    .accesskey = O
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/browser/webrtcIndicator.ftl firefox-85.0+build1/l10n/ur/browser/browser/webrtcIndicator.ftl
--- firefox-84.0.2+build1/l10n/ur/browser/browser/webrtcIndicator.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/browser/webrtcIndicator.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -15,3 +15,5 @@
     .title = آپکا مائیکرو�ون شیئر کیا جا ر�ا �ے۔ شیئرنگ کنٹرول کرنے کے لئے کلک کریں۔
 webrtc-camera-button =
     .title = آپکا کیمر� شیئر کیا جا ر�ا �ے۔ شیئرنگ کنٹرول کرنے کے لئے کلک کریں۔
+webrtc-camera-unmuted =
+    .title = کیمرا بند کردیں
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/accounts.properties firefox-85.0+build1/l10n/ur/browser/chrome/browser/accounts.properties
--- firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/accounts.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/chrome/browser/accounts.properties	2021-01-18 20:09:27.000000000 +0000
@@ -41,6 +41,10 @@
 # Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
 sendToAllDevices.menuitem = �تمام آلات پر ارسال کریں
 
+# LOCALIZATION NOTE (manageDevices.menuitem)
+# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
+manageDevices.menuitem = آلات بندرست کریں…
+
 # LOCALIZATION NOTE (sendTabToDevice.unconfigured, sendTabToDevice.unconfigured.label2)
 # Displayed in the Send Tabs context menu when right clicking a tab, a page or a link
 # and the Sync account is unconfigured. Redirects to a marketing page.
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/app-extension-fields.properties firefox-85.0+build1/l10n/ur/browser/chrome/browser/app-extension-fields.properties
--- firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/app-extension-fields.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/chrome/browser/app-extension-fields.properties	2021-01-18 20:09:27.000000000 +0000
@@ -10,3 +10,5 @@
 extension.firefox-compact-dark@mozilla.org.name=گ�را
 extension.firefox-compact-dark@mozilla.org.description=ایک تھیم گ�رے رنگ کی سکیم کے ساتھ۔
 
+# LOCALIZATION NOTE (extension.firefox-alpenglow@mozilla.org.name): This is displayed in about:addons -> Appearance
+extension.firefox-alpenglow@mozilla.org.name=Firefox الپینگلو
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/browser.properties firefox-85.0+build1/l10n/ur/browser/chrome/browser/browser.properties
--- firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/browser.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/chrome/browser/browser.properties	2021-01-18 20:09:27.000000000 +0000
@@ -15,7 +15,6 @@
 # %2$S is the selection string.
 contextMenuSearch=%1$S کے لئے "%2$S" کو تلاش کریں
 contextMenuSearch.accesskey=S
-
 contextMenuPrivateSearch=نجی ونڈو میں تلاش کریں
 contextMenuPrivateSearch.accesskey=h
 # LOCALIZATION NOTE (contextMenuPrivateSearchOtherEngine): %S is the search
@@ -54,7 +53,6 @@
 # %2$S is replaced by the ID of add-on. %3$S is a custom message that
 # the administration can add to the message.
 
-
 # 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.
@@ -277,6 +275,8 @@
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 geolocationLastAccessIndicatorText=آخری رسائی %S
 
+# LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
+
 crashedpluginsMessage.title=%S پلگ ان تبا� �و گیا �ے۔
 crashedpluginsMessage.reloadButton.label=ص�ح� پھر لوڈ کریں
 crashedpluginsMessage.reloadButton.accesskey=R
@@ -297,6 +297,7 @@
 
 pluginInfo.unknownPlugin=نامعلوم
 
+# Flash activation doorhanger UI
 flashActivate.noAllow=اجازت مت دیں
 flashActivate.allow=اجازت دیں
 flashActivate.noAllow.accesskey=D
@@ -355,10 +356,6 @@
 # LOCALIZATION NOTE (urlbar.placeholder):
 # %S is the name of the user's current search engine
 urlbar.placeholder=%S کے ساتھ تلاش کریں یا پت� درج کریں
-# LOCALIZATION NOTE (urlbarSearchTip.onboarding):
-# %S is the name of the user's current search engine
-# LOCALIZATION NOTE (urlbarSearchTip.engineIsCurrentPage):
-# %S is the name of the user's current search engine
 
 # LOCALIZATION NOTE(zoom-button.label): %S is the current page zoom level,
 # %% will be displayed as a single % character (% is commonly used to define
@@ -397,7 +394,6 @@
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
 newTabButton.tooltip=نیا ٹیب کھولیں (%S)
-
 newTabAlwaysContainer.tooltip=تیا ٹیب کھولنے کے لئے ایک کنٹینر کا انتخاب کریں
 
 # Offline web applications
@@ -443,12 +439,10 @@
 identity.identified.verified_by_you=آپ نے اس سائٹ کے لیے سیکیورٹی ایکسپشن ڈالی �ے۔
 identity.identified.state_and_country=%S، %S
 
-
 # LOCALIZATION NOTE (identity.notSecure.label):
 # Keep this string as short as possible, this is displayed in the URL bar
 # use a synonym for "safe" or "private" if "secure" is too long.
 identity.notSecure.label=مح�وظ ن�یں
-
 identity.notSecure.tooltip=کنکشن مح�وظ ن�یں �ے
 
 identity.extension.label=ایکسٹینشن (%S)
@@ -982,12 +976,12 @@
 storageAccess.Allow.accesskey = A
 storageAccess.DontAllow.label = رسائی مسدود کریں
 storageAccess.DontAllow.accesskey = B
-# LOCALIZATION NOTE (storageAccess.message):
+# LOCALIZATION NOTE (storageAccess2.message):
 # %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
 
-# LOCALIZATION NOTE (storageAccess2.message):
-# %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
+# LOCALIZATION NOTE (storageAccess3.message, storageAccess.hintText):
+# %1$S and %3$S are both the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
 
 
@@ -997,8 +991,8 @@
 confirmationHint.pageBookmarked.label = لائبریری میں مح�وظ کریں!
 confirmationHint.addSearchEngine.label = تلاش انجن شامل کر دیا گیا!
 confirmationHint.pinTab.label = پن شد�!
-
 confirmationHint.passwordSaved.label = پاس ورڈ مح�وظ �وگیا!
+confirmationHint.loginRemoved.label = لاگ ان کو �ٹا دیا گیا!
 confirmationHint.breakageReport.label = رپورٹ بھیجی گئی۔ آپ کا شکری�!
 
 # LOCALIZATION NOTE (livebookmarkMigration.title):
@@ -1007,4 +1001,3 @@
 
 # LOCALIZATION NOTE (gnomeSearchProviderSearch):
 # Used for search by Gnome Shell activity screen, %S is a searched string.
-
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/sitePermissions.properties firefox-85.0+build1/l10n/ur/browser/chrome/browser/sitePermissions.properties
--- firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/sitePermissions.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/chrome/browser/sitePermissions.properties	2021-01-18 20:09:27.000000000 +0000
@@ -27,7 +27,6 @@
 state.multichoice.allowForSession = سیشن کے لیے اجازت دیں
 state.multichoice.block = بلاک کریں
 
-
 state.multichoice.autoplayblock = آڈیو کو مسدود کریں۔
 state.multichoice.autoplayblockall = آڈیو اور ویڈیو کو مسدود کریں
 state.multichoice.autoplayallow = آڈیو اور ویڈیو کی اجازت دیں
@@ -44,3 +43,6 @@
 permission.xr.label = ورچوئل رئیلٹی آلات تک رسائی حاصل کریں
 permission.focus-tab-by-prompt.label = اس ٹیب پر سوئچ کریں
 permission.midi.label = MIDI آلات تک رسائی حاصل کریں
+# LOCALIZATION NOTE (permission.open-protocol-handler.label):
+# Open as a verb. "This site may open applications".
+permission.open-protocol-handler.label = ایپلی کیشنیں کھولیں
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/tabbrowser.properties firefox-85.0+build1/l10n/ur/browser/chrome/browser/tabbrowser.properties
--- firefox-84.0.2+build1/l10n/ur/browser/chrome/browser/tabbrowser.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/chrome/browser/tabbrowser.properties	2021-01-18 20:09:27.000000000 +0000
@@ -112,3 +112,4 @@
 tabs.openButtonMultiple=ٹیب کھولیں
 tabs.openWarningPromptMeBranded=اگر زیاد� ٹیب کھولنے سے %S آ�ست� �وتا �و تو مجھے آگا� کیجیے
 
+browsewithcaret.checkWindowTitle=کیریٹ براؤزنگ
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/defaultagent/defaultagent_localized.ini firefox-85.0+build1/l10n/ur/browser/defaultagent/defaultagent_localized.ini
--- firefox-84.0.2+build1/l10n/ur/browser/defaultagent/defaultagent_localized.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/defaultagent/defaultagent_localized.ini	2021-01-18 20:09:27.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/.
+
+# This file is in the UTF-8 encoding
+[Strings]
+
+DefaultBrowserNotificationYesButtonText=جی �اں
+DefaultBrowserNotificationNoButtonText=ن�یں
diff -Nru firefox-84.0.2+build1/l10n/ur/browser/extensions/formautofill/formautofill.properties firefox-85.0+build1/l10n/ur/browser/extensions/formautofill/formautofill.properties
--- firefox-84.0.2+build1/l10n/ur/browser/extensions/formautofill/formautofill.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/browser/extensions/formautofill/formautofill.properties	2021-01-18 20:09:27.000000000 +0000
@@ -57,6 +57,16 @@
 autocompleteFooterOptionShort = مزید اختیارات
 autocompleteFooterOptionOSXShort = ترجیحات
 
+# LOCALIZATION NOTE (autocompleteFooterOption2):
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+# LOCALIZATION NOTE (autocompleteFooterOptionOSX2):
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+# LOCALIZATION NOTE (autocompleteFooterOptionShort2):
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+# The short version is used for inputs below a certain width (e.g. 150px).
+# LOCALIZATION NOTE (autocompleteFooterOptionOSXShort2):
+# Used as a label for the button, displayed at the bottom of the dropdown suggestion, to open Form Autofill browser preferences.
+# The short version is used for inputs below a certain width (e.g. 150px).
 # LOCALIZATION NOTE (category.address, category.name, category.organization2, category.tel, category.email):
 # Used in autofill drop down suggestion to indicate what other categories Form Autofill will attempt to fill.
 category.address = پت�
@@ -84,13 +94,21 @@
 learnMoreLabel = مزید سیکھیں
 # LOCALIZATION NOTE (savedAddressesBtnLabel): Label for the button that opens a dialog that shows the
 # list of saved addresses.
+savedAddressesBtnLabel = مح�وظ شد� پتے…
 # LOCALIZATION NOTE (autofillCreditCardsCheckbox): Label for the checkbox that enables autofilling credit cards.
 # LOCALIZATION NOTE (savedCreditCardsBtnLabel): Label for the button that opens a dialog that shows the list
 # of saved credit cards.
+savedCreditCardsBtnLabel = مح�وظ شد� کریڈٹ کارڈ…
+
+
+# LOCALIZATION NOTE (autofillReauthOSDialogMac): This string is
+# preceded by the operating system (macOS) with "Firefox is trying to ", and
+# has a period added to its end. Make sure to test in your locale.
 
 # LOCALIZATION NOTE (manageAddressesTitle, manageCreditCardsTitle): The dialog title for the list of addresses or
 # credit cards in browser preferences.
 manageAddressesTitle = مح�وظ شد� پتے
+manageCreditCardsTitle = مح�وظ شد� کریڈٹ کارڈ…
 # LOCALIZATION NOTE (addressesListHeader, creditCardsListHeader): The header for the list of addresses or credit cards
 # in browser preferences.
 addressesListHeader = پتے
@@ -192,6 +210,14 @@
 
 # LOCALIZATION NOTE (editCreditCardPasswordPrompt.*, useCreditCardPasswordPrompt.*): %S is brandShortName.
 editCreditCardPasswordPrompt.macosx = %S کریڈٹ کارڈ کی معلومات دکھانے کی کوشش کر ر�ا �ے۔
+# LOCALIZATION NOTE (editCreditCardPasswordPrompt.macos): This string is
+# preceded by the operating system (macOS) with "Firefox is trying to ", and
+# has a period added to its end. Make sure to test in your locale.
+editCreditCardPasswordPrompt.macos = کریڈٹ کارڈ کی معلومات دکھائیں
 editCreditCardPasswordPrompt.linux = %S کریڈٹ کارڈ کی معلومات دکھانے کی کوشش کر ر�ا �ے۔
 useCreditCardPasswordPrompt.macosx = %S مح�وظ شد� کریڈٹ کارڈ کی معلومات استعمال کرنے کی کوشش کر ر�ا �ے۔
+# LOCALIZATION NOTE (useCreditCardPasswordPrompt.macos): This string is
+# preceded by the operating system (macOS) with "Firefox is trying to ", and
+# has a period added to its end. Make sure to test in your locale.
+useCreditCardPasswordPrompt.macos = مح�وظ شد� کریڈٹ کارڈ کی معلومات استعمال کریں
 useCreditCardPasswordPrompt.linux = %S مح�وظ شد� کریڈٹ کارڈ کی معلومات استعمال کرنے کی کوشش کر ر�ا �ے۔
diff -Nru firefox-84.0.2+build1/l10n/ur/devtools/client/application.ftl firefox-85.0+build1/l10n/ur/devtools/client/application.ftl
--- firefox-84.0.2+build1/l10n/ur/devtools/client/application.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/devtools/client/application.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -14,28 +14,28 @@
 
 # Header for the list of Service Workers displayed in the application panel for the current page.
 serviceworker-list-header = خدمت کارکنان
-
 # Text for the button to unregister a Service Worker. Displayed for active Service Workers.
 serviceworker-worker-unregister = ریجسٹریشن ختم کریں
-
 # Text for the debug link displayed for an already started Service Worker. Clicking on the
 # link opens a new devtools toolbox for this service worker. The title attribute is only
 # displayed when the link is disabled.
 serviceworker-worker-debug = ٹھیک کریں
     .title = �عال خدت کارکنان کو ٹھیک کیا جا سکتا �ے
-
 # Text for the debug link displayed for an already started Service Worker, when we
 # are in multi e10s mode, which effectively disables this link.
 serviceworker-worker-debug-forbidden = ڈیبگ
     .title = �وخدمت کارکنان کو ڈیبگ کر سکتا �ے اگرmulti e10s غیر �عال
-
+# Alt text for the image icon displayed inside a debug link for a service worker.
+serviceworker-worker-inspect-icon =
+    .alt = معائن� کریں
+# Text for the start link displayed for a registered but not running Service Worker.
+# Clicking on the link will attempt to start the service worker.
+serviceworker-worker-start3 = شروع کریں
 # Text displayed for the updated time of the service worker. The <time> element will
 # display the last update time of the service worker script.
 serviceworker-worker-updated = تذکاری <time>{ DATETIME($date, month: "long", year: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric") }</time>
-
 # Text displayed next to the URL for the source of the service worker (e-g. "Source my/path/to/worker-js")
 serviceworker-worker-source = ماخذ
-
 # Text displayed next to the current status of the service worker.
 serviceworker-worker-status = حالت
 
@@ -45,89 +45,68 @@
 # Service Worker status. A running service worker is registered, currently executed, can
 # be debugged and stopped.
 serviceworker-worker-status-running = چلائے
-
 # Service Worker status. A stopped service worker is registered but not currently active.
 serviceworker-worker-status-stopped = رکا �وا
-
 # Text displayed when no service workers are visible for the current page. Clicking on the
 # link will open https://developer-mozilla-org/docs/Web/API/Service_Worker_API/Using_Service_Workers
 serviceworker-empty-intro = ی�اں معائن� کرنے کیلئے آپ کو سروس ورکر کو رجسٹر کرنے کی ضرورت �ے۔ <a> مزید جانیں </a>
-
 # Text displayed when there are no Service Workers to display for the current page,
 # introducing hints to debug Service Worker issues.
 serviceworker-empty-suggestions = اگر موجود� ص�حے میں خدمت کا کارکن �نے تو ، ی�اں کچھ چیزیں �یں جن کی آپ کوشش کرسکتے �یں
-
 # Suggestion to check for errors in the Console to investigate why a service worker is not
 # registered. Clicking on the link opens the webconsole.
 serviceworker-empty-suggestions-console = کنسول میں غلطیاں تلاش کریں۔ <a> کنسول کھولیں </a>
-
+# Link will open https://developer.mozilla.org/docs/Web/API/Service_Worker_API/Using_Service_Workers
+serviceworker-empty-intro-link = مزید سیکھیں
 # Header for the Manifest page when we have an actual manifest
 manifest-view-header = ایپ منشور
-
 # Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
 manifest-item-warnings = نقائص اور انتبا�ات
-
 # Header for the Identity section of Manifest inspection displayed in the application panel.
 manifest-item-identity = شناخت
-
 # Header for the Presentation section of Manifest inspection displayed in the application panel.
 manifest-item-presentation = پيشکاری
-
 # Header for the Icon section of Manifest inspection displayed in the application panel.
 manifest-item-icons = آئیکن
-
 # Text displayed while we are loading the manifest file
 manifest-loading = منشور لوڈ �و ر�ا �ے…
-
 # Text displayed when the manifest has been successfully loaded
 manifest-loaded-ok = منشور لوڈ �و گیا
-
 # Text displayed as a caption when there has been an error while trying to
 # load the manifest
 manifest-loaded-error = ااس مشور کو لوڈ  کرنے میں ایک نقص تھا
-
 # Text displayed as an error when there has been a Firefox DevTools error while
 # trying to load the manifest
 manifest-loaded-devtools-error = Firefox DevTools نقص
-
 # Text displayed when the page has no manifest available
 manifest-non-existing = معائن� کرنے کیلئے کوئی منشور ن�یں ملا۔
-
 # Text displayed at manifest icons to label their purpose, as declared
 # in the manifest.
 manifest-icon-purpose = مقصد:  <code>{ $purpose }</code>
-
 # Text displayed as the alt attribute for <img> tags showing the icons in the
 # manifest.
 manifest-icon-img =
     .alt = آئکن
-
 # Text displayed as the title attribute for <img> tags showing the icons in the
 # manifest. `$sizes` is a user-dependent string that has been parsed as a
 # space-separated list of `<width>x<height>` sizes or the keyword `any`.
 manifest-icon-img-title = سائز کے ساتھ آئیکن : { $sizes }
-
 # Text displayed as the title attribute for <img> tags showing the icons in the
 # manifest, in case there's no icon size specified by the user
 manifest-icon-img-title-no-sizes = غیر متعین� سائز کا آئیکن
-
 # Sidebar navigation item for Manifest sidebar item section
 sidebar-item-manifest = منشور
     .alt = منشور آئیکن
     .title = منشور
-
 # Sidebar navigation item for Service Workers sidebar item section
 sidebar-item-service-workers = خدمت کارکنان
     .alt = خدمت کارکنان آئیکن
     .title = خدمت کارکنان
-
 # Text for the ALT and TITLE attributes of the warning icon
 icon-warning =
     .alt = انتبا� آئیکن
     .title = انتبا�
-
 # Text for the ALT and TITLE attributes of the error icon
 icon-error =
     .alt = خرابی کا آئیکن
     .title = خرابی
-
diff -Nru firefox-84.0.2+build1/l10n/ur/devtools/client/debugger.properties firefox-85.0+build1/l10n/ur/devtools/client/debugger.properties
--- firefox-84.0.2+build1/l10n/ur/devtools/client/debugger.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/devtools/client/debugger.properties	2021-01-18 20:09:27.000000000 +0000
@@ -17,12 +17,12 @@
 # that collapses the Breakpoints panes in the debugger UI.
 
 # LOCALIZATION NOTE (copyToClipboard.label): This is the text that appears in the
-# context menu to copy the complete source of the open file.
+# context menu to copy the text that the user selected.
 copyToClipboard.label=تخت� تراش� پر نقل کریں
 copyToClipboard.accesskey=C
 
 # LOCALIZATION NOTE (copySource.label): This is the text that appears in the
-# context menu to copy the selected source of file open.
+# context menu to copy all of the text in the open file.
 copySource.label=ماخذ متن کو کاپی کریں
 copySource.accesskey=y
 
@@ -171,10 +171,6 @@
 # when there are no sources.
 noSourcesText=اس ص�ح� کے پاس کوئی ماخذ ن�یں۔
 
-# LOCALIZATION NOTE (blackboxCheckboxTooltip2): The tooltip text to display when
-# the user hovers over the checkbox used to toggle blackboxing its associated
-# source.
-
 # LOCALIZATION NOTE (eventListenersHeader1): The text to display in the events
 # header.
 eventListenersHeader1=ایونٹ لیستینر بریک پوائنٹ
@@ -276,9 +272,6 @@
 # message when the query did not match any text of all files in a project.
 projectTextSearch.noResults=کوئی نتائج ن�یں ملے
 
-# LOCALIZATION NOTE (sources.noSourcesAvailableRoot): Text shown when the debugger
-# does not have any sources under a specific directory root.
-
 # LOCALIZATION NOTE (sourceSearch.search.key2): Key shortcut to open the search
 # for searching within a the currently opened files in the editor
 # Do not localize "CmdOrCtrl+F", or change the format of the string. These are
@@ -358,6 +351,7 @@
 breakpointMenuItem.disableAllAtLine.label=سطر پربریک پوائنٹ کو غیر�عال بناییں
 breakpointMenuItem.disableAllAtLine.accesskey=K
 breakpointMenuItem.enableAllAtLine.accesskey=L
+breakpointMenuItem.removeAllAtLine.label=سطر پر بریک پوائنٹ کو �ٹائیں
 breakpointMenuItem.removeAllAtLine.accesskey=X
 
 # LOCALIZATION NOTE (breakpoints.header): Breakpoints right sidebar pane header.
@@ -471,9 +465,6 @@
 # LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component when a log point is set
 
-# LOCALIZATION NOTE (editor.conditionalPanel.close): Tooltip text for
-# close button inside ConditionalPanel component
-
 # LOCALIZATION NOTE (editor.jumpToMappedLocation1): Context menu item
 # for navigating to a source mapped location
 editor.jumpToMappedLocation1=%S محل وقوع پر جست لگائیں
@@ -496,6 +487,18 @@
 # LOCALIZATION NOTE (inlinePreview.toggle.tooltip): Context menu item
 # tooltip that will describe toggling inline preview
 
+# LOCALIZATION NOTE (editorWrapping.show.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.hide.label): Context menu item
+# for showing the wrap lines block
+
+# LOCALIZATION NOTE (editorWrapping.toggle.label): Context menu item
+# label for toggling the lines wrapping feature
+
+# LOCALIZATION NOTE (editorWrapping.toggle.tooltip): Context menu item
+# tooltip for toggling the lines wrapping feature
+
 # LOCALIZATION NOTE (settings.button.label): Label for Settings button
 
 # LOCALIZATION NOTE (settings.disableJavaScript.label): Context menu item
@@ -592,6 +595,12 @@
 # for pretty printing the source.
 sourceTabs.prettyPrint.accesskey=p
 
+# LOCALIZATION NOTE (sourceFooter.blackbox): Tooltip text associated
+# with the blackbox button
+
+# LOCALIZATION NOTE (sourceFooter.unblackbox): Tooltip text associated
+# with the blackbox button
+
 # LOCALIZATION NOTE (blackboxContextItem.blackbox): Text associated
 # with the blackbox context menu item
 blackboxContextItem.blackbox.accesskey=��B
@@ -670,8 +679,6 @@
 # LOCALIZATION NOTE (outline.header): Outline left sidebar header
 outline.header=آؤٹ لائن
 
-# LOCALIZATION NOTE (scopes.mapScopes): Label for toggling scope mappings
-
 # LOCALIZATION NOTE (outline.placeholder): Placeholder text for the filter input
 # element
 
@@ -715,9 +722,6 @@
 # a mac we use the unicode character.
 welcome.findInFiles2=%S �ائل میں تلاش کریں…
 
-# LOCALIZATION NOTE (welcome.searchFunction): Label displayed in the welcome
-# panel. %S is replaced by the keyboard shortcut to search for functions.
-
 # LOCALIZATION NOTE (welcome.allShortcuts): The label to open the modal of
 # shortcuts, displayed in the welcome panel.
 
@@ -945,7 +949,6 @@
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
-
 variablesViewOptimizedOut=(احسن دور �وں کریں )
 variablesViewUninitialized=غیر ابتدا شد�
 variablesViewMissingArgs=عدم دستیاب
diff -Nru firefox-84.0.2+build1/l10n/ur/devtools/client/layout.properties firefox-85.0+build1/l10n/ur/devtools/client/layout.properties
--- firefox-84.0.2+build1/l10n/ur/devtools/client/layout.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/devtools/client/layout.properties	2021-01-18 20:09:27.000000000 +0000
@@ -9,6 +9,10 @@
 # no flex container or item is selected.
 flexbox.header=�لیکس باکس
 
+# LOCALIZATION NOTE (flexbox.backButtonLabel): The spoken label for the button
+# that returns from the display of a flex item to the flex item list.
+# This label is spoken by screen readers, not displayed on screen.
+
 # LOCALIZATION (flexbox.flexContainer): The accordion header for the Flexbox panel
 # when a flex container is selected.
 flexbox.flexContainer=�لیکس کنٹینر
@@ -91,6 +95,7 @@
 
 # LOCALIZATION NOTE (layout.displayLineNumbers): Label of the display line numbers
 # setting option in the CSS Grid panel.
+layout.displayLineNumbers=سطر کا نمبر دکھائیں
 
 # LOCALIZATION NOTE (layout.extendLinesInfinitely): Label of the extend lines
 # infinitely setting option in the CSS Grid panel.
@@ -108,4 +113,4 @@
 
 # LOCALIZATION NOTE (layout.overlayGrid): Alternate header for the list of grid container
 # elements if only one item can be selected.
-
+layout.overlayGrid=اوورلے گرڈ
diff -Nru firefox-84.0.2+build1/l10n/ur/devtools/client/netmonitor.properties firefox-85.0+build1/l10n/ur/devtools/client/netmonitor.properties
--- firefox-84.0.2+build1/l10n/ur/devtools/client/netmonitor.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/devtools/client/netmonitor.properties	2021-01-18 20:09:27.000000000 +0000
@@ -62,6 +62,9 @@
 # that collapses the network action pane in the UI.
 collapseActionPane=نیٹ ورک کی کارروائی چھپائیں
 
+# LOCALIZATION NOTE (allTabsMenuButton.tooltip): The tooltip that gets
+# displayed when hovering over the tabs overflow button.
+
 # LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
 # headers tab of the network details pane when there are no headers available.
 headersEmptyText=اس درخواست کے لیئے کو ئی سر تحریر ن�یں
@@ -88,23 +91,23 @@
 responseEmptyText=اس درخواست کے جواب کا کوئی ڈیٹا دستیاب ن�یں �ے
 
 # LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
-# params tab of the network details pane when there are no params available.
+# request tab of the network details pane when there are no params available.
 paramsEmptyText=اس درخواست کے لیئے کوئی پیرامیٹر ن�یں �ے
 
 # LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
-# params tab of the network details pane for the filtering input.
+# request tab of the network details pane for the filtering input.
 paramsFilterText=درخواست پیرامیٹر �لٹر کریں
 
 # LOCALIZATION NOTE (paramsQueryString): This is the label displayed
-# in the network details params tab identifying the query string.
+# in the network details request tab identifying the query string.
 paramsQueryString=طلب سٹرنگ
 
 # LOCALIZATION NOTE (paramsFormData): This is the label displayed
-# in the network details params tab identifying the form data.
+# in the network details request tab identifying the form data.
 paramsFormData=�ارم کوائ�
 
 # LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
-# in the network details params tab identifying the request payload.
+# in the network details request tab identifying the request payload.
 paramsPostPayload=پے لوڈ درخواست کریں
 
 # LOCALIZATION NOTE (requestHeaders): This is the label displayed
@@ -121,11 +124,11 @@
 responseHeaders=جوابی عمل سر تحریر
 
 # LOCALIZATION NOTE (requestCookies): This is the label displayed
-# in the network details params tab identifying the request cookies.
+# in the network details request tab identifying the request cookies.
 requestCookies=کوکیز کی درخواست کریں
 
 # LOCALIZATION NOTE (responseCookies): This is the label displayed
-# in the network details params tab identifying the response cookies.
+# in the network details request tab identifying the response cookies.
 responseCookies=جوابی عمل کوکیز
 
 # LOCALIZATION NOTE (responsePayload): This is the label displayed
@@ -150,7 +153,7 @@
 responseTruncated=جواب کو مقطوع  کر دیا گیا �ے
 
 # LOCALIZATION NOTE (requestTruncated): This is the text displayed
-# in the params tab of the network details pane when the request is over
+# in the request tab of the network details pane when the request is over
 # the truncation limit and thus was truncated.
 requestTruncated=درخواست کو مقطوع  کر دیا گیا �ے
 
@@ -255,23 +258,23 @@
 networkMenu.sizeUnavailable.title=منتقل شد� سائز دستیاب ن�یں �ے
 
 # LOCALIZATION NOTE (networkMenu.sizeCached): This is the label displayed
-# in the network menu specifying the transfer or a request is
+# in the network menu and the headers panel specifying the transfer or a request is
 # cached.
 networkMenu.sizeCached=کیس� کی گَی
 
 # LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
-# in the network menu specifying the transferred of a request computed
-# by a service worker.
+# in the network menu and the headers panel specifying the transferred of a request
+# computed by a service worker.
 networkMenu.sizeServiceWorker=خدمت کے کارکنان
 
-# LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
-# in the network menu specifying the request was blocked by something.
-# %S is replaced by the blocked reason, which could be "DevTools", "CORS", etc.
-
 # LOCALIZATION NOTE (networkMenu.blocked2): This is a generic message for a
 # URL that has been blocked for an unknown reason
 networkMenu.blocked2=بلاک شد�
 
+# LOCALIZATION NOTE (networkMenu.blockedby): This is a generic message for a
+# URL that has been blocked by an extension
+# %S is the extension name.
+
 # LOCALIZATION NOTE (networkMenu.blockedTooltip): This is a the text displayed
 # as a tooltip for the blocked icon in the request list
 networkMenu.blockedTooltip=بلاک شد�
@@ -472,7 +475,7 @@
 
 # LOCALIZATION NOTE (certmgr.periodofvalidity.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.periodofvalidity.label=جواز کا عرص�
 
 # LOCALIZATION NOTE (certmgr.begins):
@@ -485,7 +488,7 @@
 
 # LOCALIZATION NOTE (certmgr.fingerprints.label):
 # A label used for a certificate section in security tab
-# This section displays the valide period of this fingerprints
+# This section displays the valid period of this fingerprints
 certmgr.fingerprints.label=انگلیوں کے نشان
 
 # LOCALIZATION NOTE (certmgr.certdetail.sha256fingerprint):
@@ -600,8 +603,8 @@
 netmonitor.toolbar.latency=لیٹینسی
 
 # LOCALIZATION NOTE (netmonitor.toolbar.transferred): This is the label displayed
-# in the network table toolbar, above the "transferred" column, which is the
-# compressed / encoded size.
+# in the network table toolbar, above the "transferred" column and in general
+# section of the headers panel, which is the compressed / encoded size.
 netmonitor.toolbar.transferred=منتقل کر دیا گیا
 
 # LOCALIZATION NOTE (netmonitor.toolbar.contentSize): This is the label displayed
@@ -614,38 +617,48 @@
 netmonitor.toolbar.waterfall=ٹائم لائن
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.size): This is the label displayed
-# in the websocket frame table header, above the "size" column.
+# in the messages table header, above the "size" column.
 netmonitor.ws.toolbar.size=ماپ
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.data): This is the label displayed
-# in the websocket frame table header, above the "data" column.
+# in the messages table header, above the "data" column.
 netmonitor.ws.toolbar.data=کوائ�
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.opCode): This is the label displayed
-# in the websocket frame table header, above the "opCode" column.
+# in the messages 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.
+# in the messages 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.
+# in the messages 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.
+# in the messages table header, above the "time" column.
 netmonitor.ws.toolbar.time=وقت
 
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.eventName): This is the label displayed
+# in the messages table header, above the "eventName" column.
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.retry): This is the label displayed
+# in the messages table header, above the "retry" column.
+netmonitor.ws.toolbar.retry=پھر کوشش کریں
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.lastEventId): This is the label displayed
+# in the messages table header, above the "lastEventId" column.
+
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.clear): This is the label displayed
-# in the websocket toolbar for the "Clear" button.
+# in the messages panel toolbar for the "Clear" button.
 netmonitor.ws.toolbar.clear=صا�
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.label): This is the label
-# displayed in the websocket toolbar for the frames filtering textbox.
+# displayed in the messages panel toolbar for the frames filtering textbox.
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.key): This is the
-# shortcut key to focus on the websocket toolbar frames filtering textbox
+# shortcut key to focus on the messages panel toolbar messages filtering textbox
 netmonitor.ws.toolbar.filterFreetext.key=CmdOrCtrl+E
 
 # LOCALIZATION NOTE (netmonitor.ws.toolbar.resetColumns): This is the label
@@ -766,6 +779,23 @@
 # tooltip shown over the remove button for blocked URL item
 netmonitor.actionbar.removeBlockedUrl=پیٹرن کو �ٹا دیں
 
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingUsageNotice): This is the
+# usage notice displayed when network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.actionbar.requestBlockingAddNotice): This is the
+# add notice that explains ways to add blocking pattern that is displayed when
+# network blocking list is empty
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.removeAllBlockedUrls): This is the
+# context menu item for removing all blocked URLs
+netmonitor.requestBlockingMenu.removeAllBlockedUrls=تمام �ٹائیں
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.enableAllBlockedUrls): This is the
+# context menu item for enabling all blocked URLs
+
+# LOCALIZATION NOTE (netmonitor.requestBlockingMenu.disableAllBlockedUrls): This is the
+# context menu item for disabling all blocked URLs
+
 # LOCALIZATION NOTE (netmonitor.actionbar.search): This is the label displayed
 # in the action bar's search tab
 netmonitor.actionbar.search=تلاش
@@ -805,6 +835,9 @@
 # in the network details pane identifying the params tab.
 netmonitor.tab.params=مساوات
 
+# LOCALIZATION NOTE (netmonitor.tab.request): This is the label displayed
+# in the network details pane identifying the request tab.
+
 # LOCALIZATION NOTE (netmonitor.tab.response): This is the label displayed
 # in the network details pane identifying the response tab.
 netmonitor.tab.response=جوابی عمل
@@ -929,15 +962,50 @@
 # label displayed in the network table header context menu for the
 # response headers submenu.
 
+# LOCALIZATION NOTE (netmonitor.headers.toolbar.block): This is the
+# label displayed in the network details headers tab identifying the
+# block url toolbar button.
+
+# LOCALIZATION NOTE (netmonitor.headers.address): This is the label displayed
+# in the network details headers tab identifying the remote address.
+netmonitor.headers.address=پتے
+
+# LOCALIZATION NOTE (netmonitor.headers.status): This is the label displayed
+# in the network details headers tab identifying the status code.
+netmonitor.headers.status=سٹیٹس
+
+# LOCALIZATION NOTE (netmonitor.headers.size): This is the label displayed
+# in the network details headers tab identifying the size.
+netmonitor.headers.size=ماپ
+
+# LOCALIZATION NOTE (networkMenu.headers.sizeDetails): This label is displayed
+# in the network details headers tab providing the size details.
+# %1$S is the transferred size, %2$S is the size.
+
+# LOCALIZATION NOTE (netmonitor.headers.version): This is the label displayed
+# in the network details headers tab identifying the http version.
+
 # LOCALIZATION NOTE (netmonitor.summary.learnMore): This is the label displayed
-# in the network details headers tab, with a link to external documentation.
+# in the network details headers tab, with a link to external documentation for
+# status codes.
 netmonitor.summary.learnMore=اسٹیٹس کوڈ کے بارے میں مزید سیکھیں
 
+# LOCALIZATION NOTE (netmonitor.headers.referrerPolicy): This is the label displayed
+# in the network details headers tab identifying the referrer policy.
+
+# LOCALIZATION NOTE (netmonitor.headers.contentBlocking): This is the label displayed
+# in the network details headers tab identifying the content blocking mode.
+
 # LOCALIZATION NOTE (netmonitor.summary.editAndResend): This is the label displayed
 # on the button in the headers tab that opens a form to edit and resend the currently
 # displayed request
 netmonitor.summary.editAndResend=تدوین کریں اور دوبار� بھیجیں
 
+# LOCALIZATION NOTE (netmonitor.headers.raw): This is the label displayed
+# on the button in the headers tab that toggle view for raw request/response headers
+# from the currently displayed request
+netmonitor.headers.raw=خام
+
 # LOCALIZATION NOTE (netmonitor.response.name): This is the label displayed
 # in the network details response tab identifying an image's file name.
 netmonitor.response.name=نام:
@@ -988,6 +1056,10 @@
 # in the network details timings tab, with a link to external documentation
 netmonitor.timings.learnMore=اوقات ک� بارے میں مزید سیکھیں
 
+# LOCALIZATION NOTE (netmonitor.audits.slowIconTooltip): This is the tooltip text displayed
+# in the network request list file column, on the slow icon button.
+# %1$S is the waiting time %2$S is the slow threshold.
+
 # LOCALIZATION NOTE (netmonitor.security.warning.cipher): A tooltip
 # for warning icon that indicates a connection uses insecure cipher suite.
 netmonitor.security.warning.cipher=خ�ی� کاری کے لئے استعمال کیا ص�ر کے �رسود� اور غیر مح�وظ �ے.
@@ -1053,6 +1125,13 @@
 # LOCALIZATION NOTE (netmonitor.trackingResource.tooltip): This is the label used
 # in the Network monitor panel as a tooltip for tracking resource icon.
 
+# LOCALIZATION NOTE (netmonitor.trackingResource.enhancedTrackingProtection): This is
+# the label used in the Network monitor panel for showing enhanced tracking protection.
+
+# LOCALIZATION NOTE (netmonitor.enhancedTrackingProtection.learnMore): This is the label
+# displayed in the network details headers tab, with a link to external documentation for
+# enhanced tracking protection.
+
 # LOCALIZATION NOTE (netmonitor.context.copy): This is the label displayed
 # for the copy sub-menu in the context menu for a request
 netmonitor.context.copy=نقل کریں
@@ -1353,3 +1432,20 @@
 # where a cached object was fetched from (e.g. "disk").
 netmonitor.cache.device=آل�
 
+# LOCALIZATION NOTE (netmonitor.settings.menuTooltip): This is the tooltip that gets displayed
+# when the settings menu button is hovered.
+
+# LOCALIZATION NOTE (netmonitor.settings.importHarTooltip): This is the tooltip that gets displayed
+# when the HAR import menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.saveHarTooltip): This is the tooltip that gets displayed
+# when the HAR save menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
+# when the HAR copy menu item is hovered
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
+
+# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
diff -Nru firefox-84.0.2+build1/l10n/ur/devtools/client/responsive.properties firefox-85.0+build1/l10n/ur/devtools/client/responsive.properties
--- firefox-84.0.2+build1/l10n/ur/devtools/client/responsive.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/devtools/client/responsive.properties	2021-01-18 20:09:27.000000000 +0000
@@ -78,6 +78,7 @@
 
 # LOCALIZATION NOTE (responsive.deviceAdderPixelRatio2): Label of form field for
 # the device pixel ratio of a new device.
+responsive.deviceAdderPixelRatio2=آل� پکسل تناسب
 
 # LOCALIZATION NOTE (responsive.deviceAdderUserAgent2): Label of form field for
 # the user agent of a new device.
@@ -142,10 +143,6 @@
 # LOCALIZATION NOTE (responsive.leftAlignViewport): Label on checkbox used in the settings
 # menu.
 
-# LOCALIZATION NOTE (responsive.settingOnboarding.content): This is the content shown in
-# the setting onboarding tooltip that is displayed below the settings menu button in
-# Responsive Design Mode.
-
 # LOCALIZATION NOTE (responsive.customUserAgent): This is the placeholder for the user
 # agent input in the responsive design mode toolbar.
 
diff -Nru firefox-84.0.2+build1/l10n/ur/dom/chrome/accessibility/mac/accessible.properties firefox-85.0+build1/l10n/ur/dom/chrome/accessibility/mac/accessible.properties
--- firefox-84.0.2+build1/l10n/ur/dom/chrome/accessibility/mac/accessible.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/dom/chrome/accessibility/mac/accessible.properties	2021-01-18 20:09:27.000000000 +0000
@@ -38,6 +38,7 @@
 # The (spoken) role description for various WAI-ARIA roles
 alert       =      انتبا�
 alertDialog =      انتبا� مکالم�
+dialog      =      ڈائیلاگ
 article     =      عبارت
 document    =      دستاویز
 # The (spoken) role description for the WAI-ARIA figure role
@@ -58,3 +59,6 @@
 tabPanel     =      ٹیب پینل
 # The roleDescription for the html:mark element
 highlight = نمایاں کریں
+# The roleDescription for the details element
+# The roleDescription for the summary element
+summary = خلاص�
diff -Nru firefox-84.0.2+build1/l10n/ur/dom/chrome/netError.dtd firefox-85.0+build1/l10n/ur/dom/chrome/netError.dtd
--- firefox-84.0.2+build1/l10n/ur/dom/chrome/netError.dtd	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/dom/chrome/netError.dtd	2021-01-18 20:09:27.000000000 +0000
@@ -90,3 +90,4 @@
 
 <!ENTITY blockedByPolicy.title "بلاک شد� ص�ح�">
 
+<!ENTITY networkProtocolError.title "نیٹ ورک پروٹوکول کی خرابی">
diff -Nru firefox-84.0.2+build1/l10n/ur/dom/dom/media.ftl firefox-85.0+build1/l10n/ur/dom/dom/media.ftl
--- firefox-84.0.2+build1/l10n/ur/dom/dom/media.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/dom/dom/media.ftl	2021-01-18 20:09:27.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/.
+
+mediastatus-fallback-title = { -brand-short-name } میڈیا چلا ر�ا �ے
diff -Nru firefox-84.0.2+build1/l10n/ur/security/manager/chrome/pipnss/pipnss.properties firefox-85.0+build1/l10n/ur/security/manager/chrome/pipnss/pipnss.properties
--- firefox-84.0.2+build1/l10n/ur/security/manager/chrome/pipnss/pipnss.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/security/manager/chrome/pipnss/pipnss.properties	2021-01-18 20:09:27.000000000 +0000
@@ -5,6 +5,10 @@
 
 CertPassPrompt=%S کے لیے ماسٹر پاس ورڈ داخل کریں۔
 
+CertPassPromptDefault=برا� م�ربانی اپنا ماسٹر پاس ورڈ درج کریں۔
+
+
+CertPasswordPromptDefault=برا� م�ربانی اپنا بنیادی پاس ورڈ درج کریں۔
 
 # The following strings have special requirements: they must fit in a 32 or 64
 # bytes buffer after being encoded to UTF-8.
@@ -260,7 +264,6 @@
 certErrorTrust_UnknownIssuer=ی� تصدیق نام� قابل اعتماد ن�یں �ے کیوں ک� جاری کنند� کا تصدیق نام� نامعلوم �ے۔
 certErrorTrust_UnknownIssuer2=پیش کار شاید مناسب وسطی حالت میں تصدیق نامے ن�یں بھیج ر�ا �یں۔
 certErrorTrust_UnknownIssuer3=ایک اضا�ی اساس تصدیق نام� مئی درآمد کرنا پڑیگا۔
-# LOCALIZATION NOTE (certErrorTrust_UnknownIssuer6): %1$S is replaced by the brand name, %2$S is replaced by host name.
 certErrorTrust_CaInvalid=ی� تصدیق نام� قابل اعتماد ن�یں �ے کیوں ک� اسے ایک ناجائز CA تصدیق نامے نے جاری کیا �ے۔
 certErrorTrust_Issuer=ی� تصدیق نام� قابل اعتماد ن�یں �ے کیوں ک� جاری کنند� کا تصدیق نام� نامعلوم ن�یں �ے۔
 certErrorTrust_SignatureAlgorithmDisabled=تصدیق نام� ناقابل بھروسا �ے کیونک� اس کو دستخط کیا گپا دستخط شد� الگورزم کو استعمال کرتے �وئے جس کو ناا�ل بنا دیا گیا تھا کیونک� و� الگورزم قابل بھروسا ن�یں تھا۔
@@ -268,7 +271,6 @@
 certErrorTrust_Untrusted=ی� تصدیق نام� قابل اعتماد ماخذ سے ن�یں �ے۔
 
 certErrorMismatch=ی� تصدیق نام� اس نام %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
 certErrorMismatchMultiple=ی� تصدیق نامے صر� مندرج� ذیل نام کے لیئے جائز �ے:
 
@@ -281,8 +283,6 @@
 # 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.
 
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/aboutReader.properties firefox-85.0+build1/l10n/ur/toolkit/chrome/global/aboutReader.properties
--- firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/aboutReader.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/chrome/global/aboutReader.properties	2021-01-18 20:09:27.000000000 +0000
@@ -35,11 +35,17 @@
 aboutReader.fontType.sans-serif=Sans-serif
 
 # LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
+# For followup see: https://bugzilla.mozilla.org/show_bug.cgi?id=1637089
 aboutReader.fontTypeSample=Aa
 
 aboutReader.toolbar.close=ناظر نظار� بند کریں
 aboutReader.toolbar.typeControls=قسم کنٹرول
 
+# This is used as a label for the Reader View toolbar button.
+# This is a label used for the Save to Pocket option in the toolbar.
+# %S is replaced by Pocket.
+# This is a label used for done option in the toolbar
+readerView.done.label=�وگیا
 # These are used for the Reader View toolbar button and the menuitem within the
 # View menu.
 readerView.enter=ناظر نظارے میں جائیں
@@ -48,6 +54,7 @@
 readerView.close.accesskey=R
 
 # These are used as tooltips in Type Control
+aboutReader.toolbar.minus = �ونٹ کا ماپ گھٹائیں
 aboutReader.toolbar.plus = �ونٹ کا سائز بڑھائیں
 aboutReader.toolbar.contentwidthminus = مواد کی چوڑائی کو کم کریں
 aboutReader.toolbar.contentwidthplus = مواد کی چوڑائی میں اضا�� کریں
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/ur/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:09:27.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/.
 
-# LOCALIZATION NOTE (document_title, cannot_retrieve_log):
+# LOCALIZATION NOTE (document_title):
 # The text "WebRTC" is a proper noun and should not be translated.
 # It is the general label for the standards based technology. see http://www.webrtc.org
 document_title = WebRTC ت�اصیل
@@ -42,13 +42,20 @@
 # should not normally be translated and is used as a data label.
 peer_connection_id_label = PeerConnection شناخت
 
-# LOCALIZATION NOTE (sdp_heading, local_sdp_heading, remote_sdp_heading):
+# LOCALIZATION NOTE (sdp_heading, local_sdp_heading, remote_sdp_heading, sdp_history_heading, sdp_parsing_errors_heading):
 # "SDP" is an abbreviation for Session Description Protocol, an IETF standard.
 # See http://wikipedia.org/wiki/Session_Description_Protocol
 sdp_heading = SDP
 local_sdp_heading = مقامی SDP
 remote_sdp_heading = بعید SDP
 
+# LOCALIZATION NOTE (sdp_set_at_timestamp): the local or remote SDP and when it was set
+# %1$S will be replaced by local_sdp_heading or remote sdp_heading and %2$S
+# will be a numeric timestamp.
+# LOCALIZATION NOTE (sdp_set_timestamp): the absolute and relative times
+# when the sdp was set. %1$S and $2$S are both numeric timestamps. The
+# first is the absolute time, the second is the elapsed time since the
+# first sdp was set. ms is an abbreviation for milliseconds.
 # LOCALIZATION NOTE (offer, answer):
 # offer and answer describe whether the local sdp is an offer or answer or
 # the remote sdp is an offer or answer.  These are appended to the local and
@@ -131,3 +138,23 @@
 jitter_label = پرجوش
 sent_label = ارسال شد�
 
+show_tab_label = ٹیب دکھائیں
+
+n_a = دستياب ن�يں
+# SSRCs are identifiers that represent endpoints in an RTP stream
+# This is an SSRC on the local side of the connection that is receiving RTP
+# This is an SSRC on the remote side of the connection that is sending RTP
+# An option whose value will not be displayed but instead noted as having been
+# provided
+# An option whose value will not be displayed but instead noted as having not
+# been provided
+# The options set by the user in about:config that could impact a WebRTC call
+# Section header for estimated bandwidths of WebRTC media flows
+# The ID of the MediaStreamTrack
+# The estimated bandwidth available for sending WebRTC media in bytes per second
+# The estimated bandwidth available for receiving WebRTC media in bytes per second
+# Maximum number of bytes per second that will be padding zeros at the ends of packets
+# The amount of time inserted between packets to keep them spaced out
+# The amount of time it takes for a packet to travel from the local machine to the remote machine,
+# and then have a packet return
+
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/narrate.properties firefox-85.0+build1/l10n/ur/toolkit/chrome/global/narrate.properties
--- firefox-84.0.2+build1/l10n/ur/toolkit/chrome/global/narrate.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/chrome/global/narrate.properties	2021-01-18 20:09:27.000000000 +0000
@@ -2,6 +2,10 @@
 # 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/.
 
+# "Listen, which allows users to listen to Firefox reading the text,
+# instead of having to read it themselves." This is the name
+# of the feature and it is the label for the popup button.
+listen = سنیں
 back = واپس
 start = آغاز
 stop = روکیے
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/chrome/mozapps/extensions/extensions.properties firefox-85.0+build1/l10n/ur/toolkit/chrome/mozapps/extensions/extensions.properties
--- firefox-84.0.2+build1/l10n/ur/toolkit/chrome/mozapps/extensions/extensions.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/chrome/mozapps/extensions/extensions.properties	2021-01-18 20:09:27.000000000 +0000
@@ -70,12 +70,10 @@
 type.legacy.name=میراث توسیعات
 type.unsupported.name=غیر معاونتی
 
-#LOCALIZATION NOTE(legacyWarning.description) %S is the brandShortName
-#LOCALIZATION NOTE(legacyThemeWarning.description) %S is the brandShortName
-
 #LOCALIZATION NOTE(listHeading.discover) %S is the brandShortName
 listHeading.theme=اپنی تھیمز بندوبست کریں
 listHeading.plugin=اپنی پلگانز بندوبست کریں
+listHeading.dictionary=اپنی لغت کو منظم کریں
 
 searchLabel.extension=مزید ایکسٹینشنز تلاش کریں
 searchLabel.theme=مزید تھیمز ڈھونڈیں
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/chrome/passwordmgr/passwordmgr.properties firefox-85.0+build1/l10n/ur/toolkit/chrome/passwordmgr/passwordmgr.properties
--- firefox-84.0.2+build1/l10n/ur/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/chrome/passwordmgr/passwordmgr.properties	2021-01-18 20:09:27.000000000 +0000
@@ -21,6 +21,8 @@
 updateLoginButtonAccessKey = U
 updateLoginButtonDeny.label = تاز� کاری نا کریں
 updateLoginButtonDeny.accesskey = Ù…
+updateLoginButtonDelete.label = مح�وظ شد�  لاگ ان �ٹائیں 
+updateLoginButtonDelete.accesskey = R
 # LOCALIZATION NOTE (rememberPasswordMsg):
 # 1st string is the username for the login, 2nd is the login's hostname.
 # Note that long usernames may be truncated.
@@ -55,7 +57,6 @@
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=کوئی نام صار� ن�یں
-
 # LOCALIZATION NOTE (displaySameOrigin):
 # String is used on the autocomplete row when the login origin is a domain match with the document origin
 displaySameOrigin=اس ویب سائٹ سے
@@ -67,4 +68,4 @@
 
 # LOCALIZATION NOTE (viewSavedLogins.label):
 # This label is used in the footer of login autocomplete menus.
-
+viewSavedLogins.label= مح�وظ شد� لاگ ان دیکھیں 
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutAddons.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutAddons.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutAddons.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -236,10 +236,15 @@
 
 discopane-notice-learn-more = مزید سیکھیں
 privacy-policy = رازداری پالیسی
+# Refers to the author of an add-on, shown below the name of the add-on.
+# Variables:
+#   $author (string) - The name of the add-on developer.
+created-by-author = <a data-l10n-name="author">{ $author }</a> کی جانب سے
 # Shows the number of daily users of the add-on.
 # Variables:
 #   $dailyUsers (number) - The number of daily users.
 user-count = صار�ین: { $dailyUsers }
+install-extension-button = { -brand-product-name } شامل کریں
 install-theme-button = تھیم انسٹال کریں
 # The label of the button that appears after installing an add-on. Upon click,
 # the detailed add-on view is opened, from where the add-on can be managed.
@@ -286,6 +291,7 @@
 addon-detail-last-updated-label = آخری تاز� کاری
 addon-detail-homepage-label = ابتدائی ص�ح�
 addon-detail-rating-label = شرح کاری
+install-postponed-button = ابھی تاز� کاری کریں
 
 ## Pending uninstall message bar
 
@@ -308,6 +314,7 @@
 available-updates-heading = دستیاب تاز� کاریاں
 recent-updates-heading = حالی� تاز� کاریاں
 release-notes-loading = لوڈ �و ر�ا �ے…
+addon-permissions-learnmore = اجازتوں کے بارے میں مزید سیکھیں
 recommended-extensions-heading = تجویز شد� ایکسٹنشن
 recommended-themes-heading = تجویز شد� تھیمز
 
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutProcesses.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutProcesses.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutProcesses.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutProcesses.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -0,0 +1,85 @@
+# 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/.
+
+# The Actions column
+about-processes-column-action =
+    .title = اعمال
+
+## Tooltips
+
+about-processes-shutdown-tab =
+    .title = ٹیب بند کریں
+
+## Column headers
+
+about-processes-column-name = نام
+about-processes-column-memory-resident = میموری
+about-processes-column-cpu-total = CPU
+
+## Process names
+## Variables:
+##    $pid (String) The process id of this process, assigned by the OS.
+##    $origin (String) The domain name for this process.
+##    $type (String) The raw type for this process. Used for unknown processes.
+
+
+## Details within processes
+
+# Tab
+# Variables:
+#   $name (String) The name of the tab (typically the title of the page, might be the url while the page is loading).
+about-processes-tab-name = ٹیب : { $name }
+about-processes-preloaded-tab = پ�لے سے لوڈ شد� نیا ٹیب
+
+## Displaying CPU (percentage and total)
+## Variables:
+##    $percent (Number) The percentage of CPU used by the process or thread.
+##                      Always > 0, generally <= 200.
+##    $total (Number) The amount of time used by the process or thread since
+##                    its start.
+##    $unit (String) The unit in which to display $total. See the definitions
+##                   of `duration-unit-*`.
+
+# Common case.
+about-processes-cpu-user-and-kernel =
+    { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") } ({ NUMBER($total, maximumFractionDigits: 0) }{ $unit })
+    COMMENT Common case.
+# Special case: data is not available yet.
+about-processes-cpu-user-and-kernel-not-ready = (پیمائش)
+
+## Displaying Memory (total and delta)
+## Variables:
+##    $total (Number) The amount of memory currently used by the process.
+##    $totalUnit (String) The unit in which to display $total. See the definitions
+##                        of `memory-unit-*`.
+##    $delta (Number) The absolute value of the amount of memory added recently.
+##    $deltaSign (String) Either "+" if the amount of memory has increased
+##                        or "-" if it has decreased.
+##    $deltaUnit (String) The unit in which to display $delta. See the definitions
+##                        of `memory-unit-*`.
+
+# Common case.
+about-processes-total-memory-size = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit } ({ $deltaSign }{ NUMBER($delta, maximumFractionDigits: 0) }{ $deltaUnit })
+# Special case: no change.
+about-processes-total-memory-size-no-change = { NUMBER($total, maximumFractionDigits: 0) }{ $totalUnit }
+
+## Duration units
+
+duration-unit-ns = ns
+duration-unit-us = µs
+duration-unit-ms = ms
+duration-unit-s = s
+duration-unit-m = m
+duration-unit-h = h
+duration-unit-d = d
+
+## Memory units
+
+memory-unit-B = B
+memory-unit-KB = KB
+memory-unit-MB = MB
+memory-unit-GB = GB
+memory-unit-TB = TB
+memory-unit-PB = PB
+memory-unit-EB = EB
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -4,7 +4,6 @@
 
 page-title = ازال� کاری معلومات
 page-subtitle = اس ص�حے کو آپ ایک مسئل� کو حل کرنے کی کوشش کر ر�ے �یں جب م�ید �و سکتا �ے ک� تکنیکی معلومات پر مشتمل �ے. آپ { -brand-short-name },  بارے میں عمومی سوالات کے جوابات کے لئے تلاش کر ر�ے �یں تو ؛، �مارے <a data-l10n-name="support-link"> حمایت کی ویب سائٹ کو چیک کریں</a>.
-
 crashes-title = کریش رپورٹیں
 crashes-id = شناخت رپورٹ کریں
 crashes-send-date = ارسال کرد�
@@ -15,7 +14,10 @@
 extensions-enabled = ا�ل بنایا گیا
 extensions-version = ورژن
 extensions-id = ID
+support-addons-title = ایڈ اون
 support-addons-name = نام
+support-addons-type = قسم
+support-addons-enabled = ا�ل بنایا گیا
 support-addons-version = ورژن
 support-addons-id = ID
 security-software-title = سلامتی سا�ٹ ویئر
@@ -63,6 +65,11 @@
         [windows] پوش� کھولیں
        *[other] ڈائریکٹری کھولیں
     }
+environment-variables-name = نام
+environment-variables-value = قدر
+experimental-features-title = تجرباتی �یچر
+experimental-features-name = نام
+experimental-features-value = قدر
 modified-key-prefs-title = ا�م ترمیمی ترجیحات
 modified-prefs-name = نام
 modified-prefs-value = قدر
@@ -104,6 +111,7 @@
 sandbox-sys-call-args = دلائل
 safe-mode-title = مح�وظ موڈ آزمائیں
 restart-in-safe-mode-label = ایڈز آن نا ا�ل کر کے دوبار� شروع کریں...
+restart-button-label = دوبار� شروع کریں
 
 ## Media titles
 
@@ -150,6 +158,8 @@
 
 ##
 
+support-third-party-modules-thread = تھریڈ
+support-third-party-modules-no-value = (کوئی قدر ن�یں)
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
@@ -157,7 +167,6 @@
         [one] پچھلے { $days } دن کی کریش رپورٹیں
        *[other] پچھلے { $days } دنوں کی کریش رپورٹیں
     }
-
 # Variables
 # $minutes (integer) - Number of minutes since crash
 crashes-time-minutes =
@@ -165,7 +174,6 @@
         [one] { $minutes } منٹ قبل
        *[other] { $minutes } منٹ قبل
     }
-
 # Variables
 # $hours (integer) - Number of hours since crash
 crashes-time-hours =
@@ -173,7 +181,6 @@
         [one] { $hours } گھنٹ� قبل
        *[other] { $hours } گھنٹے قبل
     }
-
 # Variables
 # $days (integer) - Number of days since crash
 crashes-time-days =
@@ -181,7 +188,6 @@
         [one] { $days } دن قبل
        *[other] { $days } دن قبل
     }
-
 # Variables
 # $reports (integer) - Number of pending reports
 pending-reports =
@@ -189,7 +195,6 @@
         [one] تمام کریش رپورٹیں(دیئے گئے وقت کی حد میں { $reports } زیر التواء حادث� بھی شامل �ے)
        *[other] تمام کریش رپورٹیں(دیئے گئے وقت کی حد میں { $reports } زیر التواء حادث� بھی شامل �ے)
     }
-
 raw-data-copied = خام کوائ� تخت� تراش� پر نقل �و گئے
 text-copied = متن نقل شد� پر نقل �و گیا
 
@@ -202,17 +207,16 @@
 # Variables
 # $driverVersion - The graphics driver version string
 try-newer-driver = آپ کے گرا�کس ڈرائیور ورژن کے لئے بلاک �ے اپنے گرا�کس ڈرائیور کو ورژن { $driverVersion } یا جدید تر ورژن میں اپڈیٹ کرنے کی کوشیش کرییں۔
-
 # "ClearType" is a proper noun and should not be translated. Feel free to leave English strings if
 # there are no good translations, these are only used in about:support
 clear-type-parameters = ClearType پیرامیٹر
-
 compositing = کمپوزیٹنگ
 hardware-h264 = �ارڈویئر 264 H کی ضابط� کشائی
 main-thread-no-omtc = مرکزی دھاگے، OMTC کے بخیر
 yes = �اں
 no = ن�یں
 unknown = نامعلوم
+virtual-monitor-disp = ورچوئل مانیٹر ڈسپلے
 
 ## The following strings indicate if an API key has been found.
 ## In some development versions, it's expected for some API keys that they are
@@ -220,7 +224,6 @@
 
 found = مل گيا
 missing = لاپت�
-
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = وضاحت
@@ -244,20 +247,16 @@
 webgl2-driver-extensions = WebGL 2 Driver Extensions
 webgl2-extensions = WebGL 2 Extensions
 blocklisted-bug = معلوم مسائل کی وج� سے بلاک لسٹ
-
 # Variables
 # $bugNumber (string) - String of bug number from Bugzilla
 bug-link = گڑبڑ { $bugNumber }
-
 # Variables
 # $failureCode (string) - String that can be searched in the source tree.
 unknown-failure = بلیک لسٹ؛ ناکامی کوڈ { $failureCode }
-
 d3d11layers-crash-guard = D3D11 کمپوزیٹر
 d3d11video-crash-guard = D3D11 ویڈیو کوٹواچک
 d3d9video-crash-guard = D3D9 ویڈیو کوٹواچک
 glcontext-crash-guard = OpenGL
-
 reset-on-next-restart = اگلی بار دوبار� شروع کرنے پر پھر سیٹ  کریں
 gpu-process-kill-button = GPU عمل کاری بند کریں
 gpu-device-reset-button = ٹریگگر آلات دوبار� سیٹ کرے
@@ -265,10 +264,8 @@
 content-uses-tiling = ٹائل(مواد) کا استعمال
 off-main-thread-paint-enabled = Off Main Thread Painting Enabled
 off-main-thread-paint-worker-count = Off Main Thread Painting Worker Count
-
 min-lib-versions = متوقع کم سے کم ورژن
 loaded-lib-versions = استعمال میں ورژن
-
 has-seccomp-bpf = Seccomp-BFP (نظام کال �لٹرنگ)
 has-seccomp-tsync = Seccomp دھاگ� �م وقت سازی
 has-user-namespaces = صار� نیم اسپیسز
@@ -280,16 +277,13 @@
 sandbox-proc-type-content = مواد
 sandbox-proc-type-file = مسل کے مشمول
 sandbox-proc-type-media-plugin = میڈیا پلگ ان
-
 startup-cache-disk-cache-path = ڈسک کیشے کا راست�
 startup-cache-ignore-disk-cache = ڈسک کیشے کو نظرانداز کریں
 startup-cache-wrote-to-disk-cache = ڈسک کیشے پر لکھ دیا
-
 launcher-process-status-0 = �عال
 launcher-process-status-1 = ناکامی کی وج� سے غیر�عال �ے
 launcher-process-status-2 = زبردستی نغیر�عال
 launcher-process-status-unknown = نامعلوم اسٹیٹس
-
 # Variables
 # $remoteWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
@@ -302,7 +296,10 @@
 multi-process-status-7 = add-ons کی طر� سے غیر �عال
 multi-process-status-8 = زبردستی نا ا�ل بنائیں
 multi-process-status-unknown = نامعلوم اسٹیٹس
-
+# Variables
+# $fissionWindows (integer) - Number of remote windows
+# $totalWindows (integer) - Number of total windows
+fission-windows = { $fissionWindows }/{ $totalWindows }
 async-pan-zoom = غیر �م آ�نگ پین / زوم
 apz-none = کوئی ن�یں
 wheel-enabled = و�یل کی ان پٹ کا �عال
@@ -322,3 +319,9 @@
 policies-inactive = غیر �عال
 policies-active = متحرک
 policies-error = نقص
+
+## Printing section
+
+support-printing-title = چھاپ ر�ا �ے
+support-printing-prefs-name = نام
+support-printing-prefs-value = قدر
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/certviewer.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/certviewer.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/about/certviewer.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/about/certviewer.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -17,6 +17,7 @@
 certificate-viewer-country = ��ملک
 certificate-viewer-curve = خم
 certificate-viewer-distribution-point = تقسیمی  نقت�
+certificate-viewer-ip-address = آئی پی پت�
 certificate-viewer-other-name = دوسرا نام
 certificate-viewer-exponent = قوت
 certificate-viewer-key-exchange-group = کلیدی تبادل� وا؛ا گرو�
@@ -55,8 +56,7 @@
 certificate-viewer-basic-constraints = بنیادی رکاوٹیں
 certificate-viewer-key-usages = کلیدی استعمال
 certificate-viewer-certificate-policies = تصدیق نام� پالیسیاں
-
-# This message is used as a row header in the Miscellaneous section. 
+# This message is used as a row header in the Miscellaneous section.
 # The associated data cell contains links to download the certificate.
 certificate-viewer-download = ڈاؤن لوڈ
 # This message is used to replace boolean values (true/false) in several certificate fields, e.g. Certificate Authority
@@ -71,5 +71,18 @@
 ## Variables:
 ##   $fileName (String) - The file name to save the PEM data in, derived from the common name from the certificate being displayed.
 
+certificate-viewer-export = برآمد کریں
+    .download = { $fileName }.pem
+
+##
+
+# Label for a tab where we haven't found a better label:
+certificate-viewer-unknown-group-label = (نامعلوم)
+
 ## Labels for tabs displayed in stand-alone about:certificate page
 
+certificate-viewer-tab-mine = آپ کے تصدیق نامے
+certificate-viewer-tab-people = لوگ
+certificate-viewer-tab-servers = سرورز
+certificate-viewer-tab-ca = حکام
+certificate-viewer-tab-unkonwn = نامعلوم
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/global/handlerDialog.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/global/handlerDialog.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/global/handlerDialog.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/global/handlerDialog.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -2,14 +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/.
 
-# Please keep the emphasis around the hostname and scheme (ie the
-# `<strong>` HTML tags). Please also keep the hostname as close to the start
-# of the sentence as your language's grammar allows.
-#
-# Variables:
-#  $host - the hostname that is initiating the request
-#  $scheme - the type of link that's being opened.
-handler-dialog-host = <strong>{ $host }</strong> کھولنا چا�تا �وں ایک <strong>{ $scheme }</strong> لنک
 
 ## Permission Dialog
 ## Variables:
@@ -18,10 +10,32 @@
 ##  $appName - Name of the application that will be opened.
 
 
+## Please keep the emphasis around the hostname and scheme (ie the
+## `<strong>` HTML tags). Please also keep the hostname as close to the start
+## of the sentence as your language's grammar allows.
+
+
+##
+
+permission-dialog-btn-open-link =
+    .label = ربط کھولیں
+    .accessKey = O
+permission-dialog-btn-choose-app =
+    .label = ایپلیکیشن منتخب کریں
+    .accessKey = A
+permission-dialog-unset-description = آپ کو ایک ایپلیکیشن منتخب کرنے کی ضرورت �وگی۔
+permission-dialog-set-change-app-link = ایک مختل�  ایپلیکیشن منتخب کریں۔
+
 ## Chooser dialog
 ## Variables:
 ##  $scheme - the type of link that's being opened.
 
+chooser-window =
+    .title = ایپلی کیشن منتخب کریں
+    .style = min-width: 26em; min-height: 26em;
+chooser-dialog =
+    .buttonlabelaccept = ربط کھولیں
+    .buttonaccesskeyaccept = O
 choose-other-app-description = دوسری ایپلی کیشن کا انتخاب کریں
 choose-app-btn =
     .label = چنیں...
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/payments/payments.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/payments/payments.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/payments/payments.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/payments/payments.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -12,24 +12,22 @@
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
-credit-card-label-number = { $number }
-
+#   $type (String): Credit card type
+credit-card-label-number-2 = { $number }
+    .aria-label = { $type } { credit-card-label-number-2 }
 # Label for a credit card with a number and name
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name = { $number }, { $name }
-
-# Label for a credit card with a number and expiration date
-#
-# Variables:
-#   $number (String): Partially-redacted credit card number
-credit-card-label-number-expiration = { $number }, { credit-card-expiration }
-
+#   $type (String): Credit card type
+credit-card-label-number-name-2 = { $number }, { $name }
+    .aria-label = { $type } { credit-card-label-number-name-2 }
 # Label for a credit card with a number, name, and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
-credit-card-label-number-name-expiration = { $number }, { $name }, { credit-card-expiration }
+#   $type (String): Credit card type
+credit-card-label-number-name-expiration-2 = { $number }, { $name }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-name-expiration-2 }
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -56,4 +56,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = آخری ص�ح�
-
+printpreview-homearrow-button =
+    .title = پ�لا ص�ح�
+printpreview-previousarrow-button =
+    .title = پچھلا ص�ح�
+printpreview-nextarrow-button =
+    .title = اگلا ص�ح�
+printpreview-endarrow-button =
+    .title = آخری ص�ح�
diff -Nru firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/ur/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/ur/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:03:29.000000000 +0000
+++ firefox-85.0+build1/l10n/ur/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:27.000000000 +0000
@@ -29,9 +29,11 @@
 printui-paper-size-label = کاغذ کا ماپ:
 # Section title (noun) for the print scaling options
 printui-scale = اسکیل
-printui-scale-fit-to-page = ص�حے پر �ٹ
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = اسکیل
+# Section title (noun) for the two-sided print options
+printui-two-sided-printing = دو طر�� چھپائی
+printui-duplex-checkbox = دونوں طر� چھاپیں
 # Section title for miscellaneous print options
 printui-options = اختیارات
 printui-backgrounds-checkbox = پس منظر چھاپیں
@@ -41,9 +43,18 @@
 printui-margins-default = طے شد�
 printui-margins-min = کم سے کم
 printui-margins-none = کوئی ن�یں
+printui-margins-custom-left = بایاں
+printui-margins-custom-left-inches = بائیں (انچ)
+printui-margins-custom-right = دایاں
+printui-margins-custom-right-inches = بائیں (انچ)
 printui-primary-button = چھاپیں
 printui-primary-button-save = مح�وظ کریں
 printui-cancel-button = منسوخ کریں
+printui-close-button = بند کریں
+# Reported by screen readers and other accessibility tools to indicate that
+# the print preview has focus.
+printui-preview-label =
+    .aria-label = چھپائی کا  پیش نظار�
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
@@ -57,6 +68,7 @@
 printui-paper-b4 = B4
 printui-paper-jis-b5 = JIS-B5
 printui-paper-jis-b4 = JIS-B4
+printui-paper-tabloid = ٹیبلوئڈ
 
 ## Error messages shown when a user has an invalid input
 
diff -Nru firefox-84.0.2+build1/l10n/uz/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/uz/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/uz/browser/browser/appmenu.ftl	2021-01-06 12:03:32.000000000 +0000
+++ firefox-85.0+build1/l10n/uz/browser/browser/appmenu.ftl	2021-01-18 20:09:30.000000000 +0000
@@ -10,17 +10,27 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Yangi oyna
+appmenuitem-new-private-window =
+    .label = Yangi maxfiy oyna
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Kattalashtirish
 appmenuitem-zoom-reduce =
     .label = Kichiklashtirish
+appmenuitem-fullscreen =
+    .label = Butun ekran
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Sinxronlash
+appmenuitem-save-page =
+    .label = Sahifani saqlash…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Yangi xususiyatlar
-
diff -Nru firefox-84.0.2+build1/l10n/uz/browser/browser/browser.ftl firefox-85.0+build1/l10n/uz/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/uz/browser/browser/browser.ftl	2021-01-06 12:03:32.000000000 +0000
+++ firefox-85.0+build1/l10n/uz/browser/browser/browser.ftl	2021-01-18 20:09:30.000000000 +0000
@@ -315,6 +315,9 @@
 browser-window-close-button =
     .tooltiptext = Yopish
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -412,3 +415,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ko‘rsatkichingiz ustidan nazorat o‘rnatgan. Nazoratni qo‘lga olish uchun Esc tugmasini bosing.
 pointerlock-warning-no-domain = Bu hujat ko‘rsatkichingiz ustidan nazorat o‘rnatgan. Nazoratni qo‘lga olish uchun Esc tugmasini bosing.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Barcha xatcho‘plarni ko‘rsatish
+bookmarks-recent-bookmarks =
+    .value = Soʻnggi xatchoʻpga qoʻshilgan saytlar
+bookmarks-toolbar-chevron =
+    .tooltiptext = Ko‘proq xatcho‘plarni ko‘rsatish
+bookmarks-sidebar-content =
+    .aria-label = Xatcho‘plar
+bookmarks-menu-button =
+    .label = Xatcho‘plar menyusi
+bookmarks-other-bookmarks-menu =
+    .label = Boshqa xatcho‘plar
+bookmarks-mobile-bookmarks-menu =
+    .label = Mobil xatcho‘plar
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Xatcho‘plar yon panelini berkitish
+           *[other] Xatcho‘plarni yon panelda ko‘rsatish
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Xatcho‘plar panelini berkitish
+           *[other] Xatcho‘plar panelini ko‘rsatish
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Xatcho‘plar menyusini paneldan olib tashlash
+           *[other] Xatcho‘plar menyusini panelga qo‘shish
+        }
+bookmarks-search =
+    .label = Xatcho‘plarni qidirish
+bookmarks-tools =
+    .label = Xatcho‘p vositalari
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Xatchoʻplar paneli
+    .accesskey = X
+    .aria-label = Xatchoʻplar
+bookmarks-toolbar-menu =
+    .label = Xatchoʻplar paneli
+bookmarks-toolbar-placeholder =
+    .title = Xatcho‘plar paneli bandlari
+bookmarks-toolbar-placeholder-button =
+    .label = Xatcho‘plar paneli bandlari
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Xatcho‘plar
+library-bookmarks-bookmark-this-page =
+    .label = Sahifani xatcho‘plarga qo‘shish
+library-bookmarks-bookmark-edit =
+    .label = Ushbu xatcho‘pni o‘zgartirish
+
+## More items
+
+more-menu-go-offline =
+    .label = Oflayn ishlash
+    .accesskey = i
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/vi/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/aboutLogins.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/aboutLogins.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -168,7 +168,11 @@
 about-logins-confirm-remove-dialog-title = Xoá thông tin đăng nhập này?
 confirm-delete-dialog-message = Thao tác này không thể hoàn tác được.
 about-logins-confirm-remove-dialog-confirm-button = Xóa
-about-logins-confirm-remove-all-dialog-confirm-button = Xóa tất cả
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] Xóa
+       *[other] Xóa tất cả
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] Có, xóa thông tin đăng nhập này
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/vi/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/appmenu.ftl	2021-01-06 12:03:36.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/appmenu.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Cửa sổ mới
+appmenuitem-new-private-window =
+    .label = Cửa sổ riêng tư mới
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = Phóng to
 appmenuitem-zoom-reduce =
     .label = Thu nh�
+appmenuitem-fullscreen =
+    .label = Toàn màn hình
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = �ồng bộ ngay
+appmenuitem-save-page =
+    .label = Lưu trang dưới dạng…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = Có gì mới
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/vi/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/appMenuNotifications.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/appMenuNotifications.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = Không phải bây gi�
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = Sau khi khởi động lại, { -brand-shorter-name } sẽ khôi phục toàn bộ những thẻ đang mở và cửa sổ của bạn mà không ở chế độ duyệt web riêng tư.
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } không thể tự động cập nhật lên phiên bản mới nhất.
+    .buttonlabel = Vẫn cập nhật { -brand-shorter-name }
+    .buttonaccesskey = U
+    .secondarybuttonlabel = Không phải lúc này
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = �ã có bản cập nhật { -brand-shorter-name } mới nhưng không thể cài đặt bản cập nhật này vì một bản sao khác của { -brand-shorter-name } đang chạy. �óng nó để tiếp tục cập nhật hoặc ch�n vẫn cập nhật (bản sao khác có thể không hoạt động chính xác cho đến khi bạn khởi động lại nó).
 appmenu-addon-private-browsing-installed =
     .buttonlabel = OK, đã hiểu
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/browser.ftl firefox-85.0+build1/l10n/vi/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/browser.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/browser.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -495,3 +495,70 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> có quy�n đi�u khiển con tr� của bạn. Ấn Esc để lấy lại quy�n đi�u khiển.
 pointerlock-warning-no-domain = Trang này có quy�n đi�u khiển con tr� của bạn. Ấn Esc để lấy lại quy�n đi�u khiển.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Xem tất cả dấu trang
+bookmarks-recent-bookmarks =
+    .value = Dấu trang gần đây
+bookmarks-toolbar-chevron =
+    .tooltiptext = Hiện thêm các dấu trang
+bookmarks-sidebar-content =
+    .aria-label = Dấu trang
+bookmarks-menu-button =
+    .label = Trình đơn dấu trang
+bookmarks-other-bookmarks-menu =
+    .label = Dấu trang khác
+bookmarks-mobile-bookmarks-menu =
+    .label = Dấu trang trên di động
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ẩn thanh l� dấu trang
+           *[other] Hiển thị thanh l� dấu trang
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] Ẩn thanh công cụ dấu trang
+           *[other] Hiển thị thanh công cụ dấu trang
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] Xóa bảng ch�n dấu trang từ thanh công cụ
+           *[other] Thêm bảng ch�n dấu trang vào thanh công cụ
+        }
+bookmarks-search =
+    .label = Tìm kiếm dấu trang
+bookmarks-tools =
+    .label = Công cụ đánh dấu trang
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = Thanh dấu trang
+    .accesskey = B
+    .aria-label = Dấu trang
+bookmarks-toolbar-menu =
+    .label = Thanh dấu trang
+bookmarks-toolbar-placeholder =
+    .title = Các mục của thanh dấu trang
+bookmarks-toolbar-placeholder-button =
+    .label = Các mục của thanh dấu trang
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = Dấu trang
+library-bookmarks-bookmark-this-page =
+    .label = �ánh dấu trang này
+library-bookmarks-bookmark-edit =
+    .label = Chỉnh sửa dấu trang này
+
+## More items
+
+more-menu-go-offline =
+    .label = Làm việc ngoại tuyến
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/vi/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/newtab/newtab.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = Thẻ mới
 newtab-settings-button =
     .title = Tùy biến trang thẻ mới
+newtab-personalize-button-label = Ca� nhân ho�a
+    .title = Cá nhân hóa thẻ mới
+    .aria-label = Cá nhân hóa thẻ mới
 
 ## Search box component.
 
@@ -207,3 +210,26 @@
 
 newtab-error-fallback-info = Rất tiếc, đã xảy ra lỗi khi tải nội dung này.
 newtab-error-fallback-refresh-link = Thử làm mới lại trang.
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = Lối tắt
+newtab-custom-shortcuts-subtitle = Các trang web bạn lưu hoặc truy cập
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } hàng
+    }
+newtab-custom-sponsored-sites = Các lối tắt được tài trợ
+newtab-custom-pocket-title = �ược đ� xuất bởi { -pocket-brand-name }
+newtab-custom-pocket-subtitle = Nội dung đặc biệt do { -pocket-brand-name }, một phần của { -brand-product-name }, quản lý
+newtab-custom-pocket-sponsored = Câu chuyện được tài trợ
+newtab-custom-recent-title = Hoạt động gần đây
+newtab-custom-recent-subtitle = Tuyển ch�n các trang và nội dung gần đây
+newtab-custom-close-button = �óng
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = Ghi chú nh�
+newtab-custom-snippets-subtitle = Mẹo và tin tức từ { -vendor-short-name } và { -brand-product-name }
+newtab-custom-settings = Quản lý các cài đặt khác
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/places.ftl firefox-85.0+build1/l10n/vi/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/places.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/places.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = Thư mục con
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = Dấu trang khác
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/vi/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/preferences/preferences.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -488,6 +488,11 @@
 home-prefs-topsites-description = Những trang bạn truy cập nhi�u nhất
 home-prefs-topsites-by-option-sponsored =
     .label = Các trang hàng đầu được tài trợ
+home-prefs-shortcuts-header =
+    .label = Lối tắt
+home-prefs-shortcuts-description = Các trang web bạn lưu hoặc truy cập
+home-prefs-shortcuts-by-option-sponsored =
+    .label = Các lối tắt được tài trợ
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -495,6 +500,7 @@
 home-prefs-recommended-by-header =
     .label = �ược đ� xuất bởi { $provider }
 home-prefs-recommended-by-description-update = Nội dung đặc biệt trên web, được quản lý bởi { $provider }
+home-prefs-recommended-by-description-new = Nội dung đặc biệt do { $provider }, một phần của { -brand-product-name }, quản lý
 
 ##
 
@@ -503,8 +509,6 @@
     .label = Bài viết quảng cáo
 home-prefs-highlights-header =
     .label = Nổi bật
-home-prefs-recent-activity-header =
-    .label = Hoạt động gần đây
 home-prefs-highlights-description = Một lựa ch�n các trang web mà bạn đã lưu hoặc truy cập
 home-prefs-highlights-option-visited-pages =
     .label = Trang đã truy cập
@@ -514,13 +518,17 @@
     .label = Tải xuống gần đây nhất
 home-prefs-highlights-option-saved-to-pocket =
     .label = Trang đã được lưu vào { -pocket-brand-name }
+home-prefs-recent-activity-header =
+    .label = Hoạt động gần đây
+home-prefs-recent-activity-description = Tuyển ch�n các trang và nội dung gần đây
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
 # and non-essential but also not entirely trivial and useless.
 home-prefs-snippets-header =
-    .label = �oạn
+    .label = Ghi chú nh�
 home-prefs-snippets-description = Cập nhật từ { -vendor-short-name } và { -brand-product-name }
+home-prefs-snippets-description-new = Mẹo và tin tức từ { -vendor-short-name } và { -brand-product-name }
 home-prefs-sections-rows-option =
     .label = { $num } hàng
 
@@ -911,6 +919,9 @@
 addressbar-locbar-topsites-option =
     .label = Trang web hàng đầu
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = Công cụ tìm kiếm
+    .accesskey = t
 addressbar-suggestions-settings = Thay đổi tùy chỉnh phần gợi ý của công cụ tìm kiếm
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/vi/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/vi/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/vi/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = Chỉ trên thẻ mới
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = Luôn hiển thị
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = Không bao gi� hiển thị
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = Chỉ hiện trong thẻ mới
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = Hiển thị các dấu trang khác
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/vi/devtools/client/accessibility.ftl firefox-85.0+build1/l10n/vi/devtools/client/accessibility.ftl
--- firefox-84.0.2+build1/l10n/vi/devtools/client/accessibility.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/devtools/client/accessibility.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -6,19 +6,15 @@
 ### These strings are used inside the Accessibility panel.
 
 accessibility-learn-more = Tìm hiểu thêm
-
 accessibility-text-label-header = Nhãn và tên văn bản
-
 accessibility-keyboard-header = Bàn phím
 
 ## Text entries that are used as text alternative for icons that depict accessibility isses.
 
 accessibility-warning =
     .alt = Cảnh báo
-
 accessibility-fail =
     .alt = Lá»—i
-
 accessibility-best-practices =
     .alt = Thực hành tốt nhất
 
@@ -27,46 +23,29 @@
 ## with its text label or accessible name.
 
 accessibility-text-label-issue-area = Sử dụng thuộc tính <code>alt</code> để gắn nhãn các phần tử <div>area</div> có thuộc tính <span>href</span>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-dialog = Hộp thoại phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-document-title = Tài liệu phải có <code>title</code>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-embed = Nội dung nhúng phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-figure = Số liệu với chú thích tùy ch�n nên được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-fieldset = Các phần tử </code>fieldset</code> phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-fieldset-legend2 = Sử dụng một phần tử <code>legend</code> để gắn nhãn <span>fieldset</span>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-form = Các yếu tố hình thức phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-form-visible = Các yếu tố hình thức nên có một nhãn văn bản có thể nhìn thấy. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-frame = Các phần tử <code>frame</code> phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-glyph = Sử dụng thuộc tính <code>alt</code> để gắn nhãn các phần tử <span>mglyph</span>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-heading = Headings phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-heading-content = Headings nên có nội dung văn bản hiển thị. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-iframe = Sử dụng thuộc tính <code>title</code> để mô tả nội dung <span>iframe</span>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-image = Nội dung với hình ảnh phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-interactive = Các yếu tố tương tác phải được dán nhãn. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-optgroup-label2 = Sử dụng một thuộc tính <code>label</code> để gắn nhãn <span>optgroup</span>. <a>Tìm hiểu thêm</a>
-
 accessibility-text-label-issue-toolbar = Thanh công cụ phải được dán nhãn khi có nhi�u hơn một thanh công cụ. <a>Tìm hiểu thêm</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 = Các phần tử có thuộc tính focus nên có tính tương tác. <a>Tìm hiểu thêm</a>
 accessibility-keyboard-issue-tabindex = Tránh sử dụng thuộc tính <code>tabindex</code> lớn hơn 0. <a>Tìm hiểu thêm</a>
-
 accessibility-keyboard-issue-action = Các yếu tố tương tác phải có thể được kích hoạt bằng bàn phím. <a>Tìm hiểu thêm</a>
-
+accessibility-keyboard-issue-focusable = Các phần tử tương tác phải có thuộc tính focus. <a>Tìm hiểu thêm</a>
diff -Nru firefox-84.0.2+build1/l10n/vi/devtools/client/webconsole.properties firefox-85.0+build1/l10n/vi/devtools/client/webconsole.properties
--- firefox-84.0.2+build1/l10n/vi/devtools/client/webconsole.properties	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/devtools/client/webconsole.properties	2021-01-18 20:09:34.000000000 +0000
@@ -464,12 +464,14 @@
 # The Reverse Search is a feature that mimics the bash-like reverse search of
 # command history in WebConsole, searching commands from the last item backwards.
 # Parameters: %S is the keyboard shortcut.
+webconsole.editor.toolbar.reverseSearchButton.openReverseSearch.tooltip=Mở trình tìm kiếm ngược lịch sử (%S)
 
 # LOCALIZATION NOTE (webconsole.editor.toolbar.reverseSearchButton.closeReverseSearch.tooltip)
 # Label used for the tooltip on the reverse search button for closing the Reverse Search UI.
 # The Reverse Search is a feature that mimics the bash-like reverse search of
 # command history in WebConsole, searching commands from the last item backwards.
 # Parameters: %S is the keyboard shortcut.
+webconsole.editor.toolbar.reverseSearchButton.closeReverseSearch.tooltip=�óng trình tìm kiếm ngược lịch sử (%S)
 
 # LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.tooltip)
 # Label used for the tooltip on the execute button, in the editor toolbar, which is
@@ -477,6 +479,10 @@
 # Parameters: %S is the keyboard shortcut.
 webconsole.editor.toolbar.executeButton.tooltip=Chạy biểu thức (%S). �i�u này sẽ không xóa đầu vào.
 
+# LOCALIZATION NOTE (webconsole.editor.toolbar.prettyPrintButton.tooltip)
+# Label used for the tooltip on the prettyPrint button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+
 # 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).
diff -Nru firefox-84.0.2+build1/l10n/vi/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/vi/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/vi/dom/chrome/dom/dom.properties	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/dom/chrome/dom/dom.properties	2021-01-18 20:09:34.000000000 +0000
@@ -26,6 +26,7 @@
 SpeculationFailed=Một cây không cân bằng được viết bằng document.write() khiến dữ liệu từ mạng bị phân tách. ��c thêm thông tin https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=Một lệnh g�i tới document.write() từ một mã script nạp không đồng bộ bên ngoài đã bị b� qua.
 # LOCALIZATION NOTE (EditorFileDropFailed): Do not translate contenteditable, %S is the error message explaining why the drop failed.
+EditorFileDropFailed=Lỗi kéo thả tập tin vào phần tử có thuộc tính contenteditable: %S.
 FormValidationTextTooLong=Vui lòng rút ngắn đoạn này xuống còn %S kí tự hoặc ít hơn (bạn hiện đang dùng %S kí tự).
 FormValidationTextTooShort=Vui lòng sử dụng ít nhất %S ký tự (bạn hiện đang sử dụng %S ký tự).
 FormValidationValueMissing=Vui lòng đi�n vào trư�ng này.
@@ -52,23 +53,36 @@
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue=Vui lòng ch�n một giá trị hợp lệ. Giá trị hợp lệ gần nhất là %S.
 # LOCALIZATION NOTE (FormValidationTimeReversedRangeUnderflowAndOverflow): %1$S,%2$S are time.
+FormValidationTimeReversedRangeUnderflowAndOverflow=Vui lòng ch�n giá trị trong khoảng từ %1$S đến %2$S.
 FormValidationBadInputNumber=Vui lòng nhập số.
 FullscreenDeniedDisabled=Yêu cầu toàn màn hình đã bị từ chối vì API toàn màn hình bị tắt theo ưu tiên của ngư�i dùng.
 FullscreenDeniedFocusedPlugin=Yêu cầu toàn màn hình đã bị từ chối vì một phần bổ trợ có cửa sổ được ch�n.
 FullscreenDeniedHidden=Yêu cầu toàn màn hình đã bị từ chối vì tài liệu không còn hiển thị.
+FullscreenDeniedHTMLDialog=Yêu cầu toàn màn hình đã bị từ chối vì phần tử yêu cầu là phần tử <dialog>.
 FullscreenDeniedContainerNotAllowed=Yêu cầu hiển thị toàn màn hình bị từ chối vì có ít nhất một trang không phải là iframe hoặc không có thuộc tính "allowfullscreen".
 FullscreenDeniedNotInputDriven=Yêu cầu toàn màn hình đã bị từ chối vì Element.requestFullscreen() không được g�i từ bên trong trình xử lý sự kiện do ngư�i dùng tạo.
+FullscreenDeniedMouseEventOnlyLeftBtn=Yêu cầu toàn màn hình đã bị từ chối vì hàm Element.requestFullscreen() được g�i từ bên trong một trình xử lý sự kiện chuột mà không được kích hoạt bằng nút chuột trái.
 FullscreenDeniedNotHTMLSVGOrMathML=Yêu cầu chế độ toàn màn hình bị từ chối vì phần tử được yêu cầu không phải là <svg>, <math>, hay một phần tử HTML.
 FullscreenDeniedNotInDocument=Yêu cầu toàn màn hình đã bị từ chối vì không còn yêu cầu yếu tố trong tài liệu của nó.
 FullscreenDeniedMovedDocument=Yêu cầu toàn màn hình đã bị từ chối vì yêu cầu yếu tố đã di chuyển tài liệu.
 FullscreenDeniedLostWindow=Yêu cầu toàn màn hình đã bị từ chối vì chúng tôi không còn một cửa sổ.
 FullscreenDeniedSubDocFullscreen=Yêu cầu toàn màn hình đã bị từ chối vì một tài liệu con của tài liệu yêu cầu toàn màn hình đã ở chế độ toàn màn hình.
+FullscreenDeniedNotDescendant=Yêu cầu toàn màn hình đã bị từ chối vì phần tử yêu cầu không phải là phần tử con của phần tử toàn màn hình hiện tại.
 FullscreenDeniedNotFocusedTab=Yêu cầu toàn màn hình đã bị từ chối vì yếu tố yêu cầu không nằm trong thẻ hiện đang ch�n.
 FullscreenDeniedFeaturePolicy=Yêu cầu toàn màn hình đã bị từ chối vì các chỉ thị FeaturePolicy.
+FullscreenExitWindowFocus=Thoát toàn màn hình vì một cửa sổ đã được ch�n.
 RemovedFullscreenElement=�ã thoát toàn màn hình vì yếu tố toàn màn hình đã bị xóa kh�i tài liệu.
 FocusedWindowedPluginWhileFullscreen=Thoát toàn màn hình vì cửa sổ của phần bổ trợ đã được ch�n.
+PointerLockDeniedDisabled=Yêu cầu khóa con tr� bị từ chối vì API khóa con tr� đã bị tắt bởi cấu hình tùy ch�n của ngư�i dùng.
+PointerLockDeniedInUse=Yêu cầu khóa con tr� đã bị từ chối vì con tr� hiện tại đang được đi�u khiển bởi một document khác.
+PointerLockDeniedNotInDocument=Yêu cầu khóa con tr� đã bị từ chối vì phần tử yêu cầu không có trong document.
+PointerLockDeniedSandboxed=Yêu cầu khóa con tr� đã bị từ chối vì API khóa con tr� bị hạn chế qua sandbox.
+PointerLockDeniedHidden=Yêu cầu khóa con tr� đã bị từ chối vì document đang không hiển thị.
+PointerLockDeniedNotFocused=Yêu cầu khóa con tr� đã bị từ chối vì document không được ch�n.
+PointerLockDeniedFailedToLock=Yêu cầu khóa con tr� đã bị từ chối vì trình duyệt không khóa được con tr�.
 HTMLSyncXHRWarning=Việc phân tích HTML trong XMLHttpRequest không được hỗ trợ ở chế độ đồng bộ.
 # LOCALIZATION NOTE: %S is the name of the header in question
+ForbiddenHeaderWarning=Cố gắng đặt một tiêu đ� không được phép đã bị từ chối: %S
 ResponseTypeSyncXHRWarning=Việc dùng thuộc tính responseType của XMLHttpRequest không được hỗ trợ ở chế độ đồng bộ trong phạm vi cửa sổ.
 TimeoutSyncXHRWarning=Việc dùng thuộc tính timeout của XMLHttpRequest không còn được hỗ trợ ở chế độ đồng bộ trong phạm vi cửa sổ.
 # LOCALIZATION NOTE: Do not translate navigator.sendBeacon, unload, pagehide, or XMLHttpRequest.
@@ -86,10 +100,10 @@
 # LOCALIZATION NOTE : Do not translate MediaStreamTrack and createMediaStreamTrackSource.
 # LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaElementAudioCaptureOfMediaStreamError=HTMLMediaEuity đã chụp đang phát MediaStream. Chỉnh âm lượng hoặc trạng thái tắt tiếng hiện không được hỗ trợ.
+# LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaLoadExhaustedCandidates=Không thể tải xuống các nguồn tài nguyên. Phương tiện đã tạm dừng tải.
 MediaLoadSourceMissingSrc=Phần tử <source> không có thuộc tính “src�. Nguồn media không tải được.
 MediaStreamAudioSourceNodeDifferentRate=Kết nối AudioNodes từ AudioContexts với tốc độ mẫu khác nhau hiện không được hỗ trợ.
-# LOCALIZATION NOTE: Do not translate ConvolverNode
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Không tải được HTTP với trạng thái %1$S. Không tải được media từ %2$S.
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load.
@@ -117,7 +131,6 @@
 MediaCannotInitializePulseAudio=Không thể sử dụng PulseAudio
 # LOCALIZATION NOTE: Do not translate "MediaRecorder".
 MediaRecorderMultiTracksNotSupported=MediaRecorder không hỗ trợ ghi nhi�u bài cùng loại lúc này.
-# LOCALIZATION NOTE: %S is the ID of the MediaStreamTrack passed to MediaStream.addTrack(). Do not translate "MediaStreamTrack" and "AudioChannel".
 # LOCALIZATION NOTE: %S is the URL of the web page which is not served on HTTPS and thus is not encrypted and considered insecure.
 # LOCALIZATION NOTE: %S is the URL of the web page which is calling web APIs without passing data (either an audioCapabilities or a videoCapabilities) that will soon be required. See https://bugzilla.mozilla.org/show_bug.cgi?id=1368583#c21 for explanation of this string.
 # LOCALIZATION NOTE: %S is the URL of the web page which is calling web APIs without passing data (a "codecs" string in the "contentType") that will soon be required. See https://bugzilla.mozilla.org/show_bug.cgi?id=1368583#c21 for explanation of this string.
@@ -148,7 +161,6 @@
 IgnoringWillChangeOverBudgetWarning=Việc tiêu thụ bộ nhớ will-change là rất lớn. Mức giới hạn được tính bằng diện tích b� mặt của document nhân với %1$S (%2$S px). Sự xuất hiện của will-change vượt quá mức giới hạn này sẽ bị loại b�.
 # LOCALIZATION NOTE: Do not translate "Worker".
 # LOCALIZATION NOTE: Do not translate "Application Cache API", "AppCache" and "ServiceWorker".
-# LOCALIZATION NOTE: Do not translate "Application Cache API", "AppCache".
 # LOCALIZATION NOTE: Do not translate "Worker".
 # LOCALIZATION NOTE: Do not translate "RTCPeerConnection", "getLocalStreams", "getRemoteStreams", "getSenders" or "getReceivers".
 # LOCALIZATION NOTE: Do not translate "ServiceWorker". %S is a URL.
@@ -200,6 +212,33 @@
 # Do not translate "ServiceWorker", "Encryption-Key", "dh", "Crypto-Key", and
 # "Content-Encoding: aesgcm". %1$S is the ServiceWorker scope URL.
 PushMessageBadEncryptionKeyHeader=ServiceWorker cho phạm vi ‘%1$S’ không thể giải mã thông báo đẩy. Tiêu đ� ‘Encryption-Key’ phải bao gồm tham số ‘dh‘. Tiêu đ� này không được chấp nhận và sẽ sớm bị xóa. Vui lòng sử dụng ‘Crypto-Key‘ với ‘Content-Encoding: aesgcm‘ để thay thế. Xem tại https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding-02#section-4 để biết thêm thông tin.
+# LOCALIZATION NOTE: This error is reported when a push message fails to decrypt
+# because the "Content-Encoding" header is missing or contains an
+# unsupported encoding. Do not translate "ServiceWorker", "Content-Encoding",
+# "aesgcm", and "aesgcm128". %1$S is the ServiceWorker scope URL.
+# LOCALIZATION NOTE: This error is reported when a push message fails to decrypt
+# because the "dh" parameter is not valid base64url. Do not translate
+# "ServiceWorker", "dh", "Crypto-Key", and "base64url". %1$S is the
+# ServiceWorker scope URL.
+# LOCALIZATION NOTE: This error is reported when a push message fails to decrypt
+# because the "salt" parameter is not valid base64url. Do not translate
+# "ServiceWorker", "salt", "Encryption", and "base64url". %1$S is the
+# ServiceWorker scope URL.
+# LOCALIZATION NOTE: This error is reported when a push message fails to decrypt
+# because the "rs" parameter is not a number, or is less than the pad size.
+# Do not translate "ServiceWorker", "rs", or "Encryption". %1$S is the
+# ServiceWorker scope URL. %2$S is the minimum value (1 for aesgcm128, 2 for
+# aesgcm).
+# LOCALIZATION NOTE: This error is reported when a push message fails to decrypt
+# because an encrypted record is shorter than the pad size, the pad is larger
+# than the record, or any of the padding bytes are non-zero. Do not translate
+# "ServiceWorker". %1$S is the ServiceWorker scope URL. %2$S is the pad size
+# (1 for aesgcm128, 2 for aesgcm).
+# LOCALIZATION NOTE: This error is reported when push message decryption fails
+# and no specific error info is available. Do not translate "ServiceWorker".
+# %1$S is the ServiceWorker scope URL.
+# LOCALIZATION NOTE: %1$S is the type of a DOM event. 'passive' is a literal parameter from the DOM spec.
+# LOCALIZATION NOTE: 'ImageBitmapRenderingContext.transferImageBitmap' and 'ImageBitmapRenderingContext.transferFromImageBitmap' should not be translated
 # LOCALIZATION NOTE: Do not translate ".png"
 GenericImageNamePNG=ảnh.png
 GenericFileName=tập tin
@@ -233,8 +272,8 @@
 IDBOpenDBOptions_StorageTypeWarning=Thuộc tính ‘storage’ trong tùy ch�n được truy�n cho indexedDB.open không còn được dùng nữa và sẽ sớm bị xóa. �ể có được dung lượng lưu trữ liên tục, vui lòng thay thế thành navigator.storage.persist().
 UnsupportedEntryTypesIgnored=B� qua entryTypes không được hỗ trợ: %S.
 AllEntryTypesIgnored=Không có entryTypes hợp lệ; hủy b� đăng ký.
-
 # LOCALIZATION NOTE: do not localize key=“%S� modifiers=“%S� id=“%S�
+# LOCALIZATION NOTE: do not trnaslated "document.domain"
 
 #LOCALIZATION NOTE(DeprecatedTestingInterfaceWarning): Do not translate this message. It's just testing only.
 DeprecatedTestingInterfaceWarning=TestingDeprecatedInterface là một giao diện chỉ dành cho thử nghiệm và đây là thông báo không dùng thử.
@@ -264,5 +303,15 @@
 # LOCALIZATION NOTE: Do not translate MathML, subscriptshift and superscriptshift.
 # LOCALIZATION NOTE: Do not translate MathML, background, color, fontfamily, fontsize, fontstyle and fontweight.
 # LOCALIZATION NOTE: Do not translate MathML and XLink.
+# LOCALIZATION NOTE: Do not translate MathML and STIXGeneral. %S is a documentation URL.
+# LOCALIZATION NOTE: Do not translate MathML and scriptminsize.
+# LOCALIZATION NOTE: Do not translate MathML and scriptsizemultiplier.
 # LOCALIZATION NOTE (UnknownProtocolNavigationPrevented): %1$S is the destination URL.
+# LOCALIZATION NOTE: %S is the URL of the resource in question
 
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-same-origin and sandbox (though you may translate "sandboxed").
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-storage-access-by-user-activation and sandbox (though you may translate "sandboxed").
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess() and iframe.
+# LOCALIZATION NOTE: Do not translate document.requestStorageAccess(). In some locales it may be preferable to not translate "event handler", either.
+# LOCALIZATION NOTE: Do not translate "Location" and "History".
+# LOCALIZATION NOTE: %S is the name of the folder the user selected in the file picker.
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/chrome/global/aboutWebrtc.properties firefox-85.0+build1/l10n/vi/toolkit/chrome/global/aboutWebrtc.properties
--- firefox-84.0.2+build1/l10n/vi/toolkit/chrome/global/aboutWebrtc.properties	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/chrome/global/aboutWebrtc.properties	2021-01-18 20:09:34.000000000 +0000
@@ -138,7 +138,9 @@
 jitter_label = �ộ rung
 sent_label = �ã gửi
 
+show_tab_label = Hiển thị thẻ
 
+frame_stats_heading = Thống kê khung hình video
 n_a = N/A
 width_px = Chi�u rộng (px)
 height_px = Chi�u cao (px)
@@ -155,12 +157,13 @@
 configuration_element_not_provided = Không cung cấp
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = Ngư�i dùng thiết lập tùy ch�n WebRTC
-
 # Section header for estimated bandwidths of WebRTC media flows
 bandwidth_stats_heading = Băng thông ước tính
 # The ID of the MediaStreamTrack
 # The estimated bandwidth available for sending WebRTC media in bytes per second
+send_bandwidth_bytes_sec = Băng thông gửi (byte/giây)
 # The estimated bandwidth available for receiving WebRTC media in bytes per second
+receive_bandwidth_bytes_sec = Băng thông nhận (byte/giây)
 # Maximum number of bytes per second that will be padding zeros at the ends of packets
 # The amount of time inserted between packets to keep them spaced out
 # The amount of time it takes for a packet to travel from the local machine to the remote machine,
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/vi/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/vi/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:09:34.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d
 
 downloadErrorAlertTitle=Lỗi Tải Xuống
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=Không thể lưu tải xuống vì bị chặn bởi %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=Không thể lưu tải xuống do bị chặn bởi tiện ích mở rộng.
 downloadErrorGeneric=Không thể lưu tập tin tải xuống vì có lỗi xảy ra.\n\nVui lòng thử lại lần nữa.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/vi/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/vi/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:09:34.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=Kết nối máy chủ proxy bị từ chối
 check_error-2153390069=Chứng chỉ máy chủ đã hết hạn (vui lòng đi�u chỉnh đồng hồ hệ thống v� lại ngày gi� đúng nếu như nó chưa chính xác)
 check_error-verification_failed=Tính toàn vẹn của bản cập nhật không thể xác minh được
+check_error-move_failed=Không chuẩn bị được bản cập nhật để cài đặt
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/vi/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -185,6 +185,32 @@
 
 ##
 
+support-third-party-modules-title = Module của bên thứ ba
+support-third-party-modules-module = Tập tin module
+support-third-party-modules-version = Phiên bản tập tin
+support-third-party-modules-vendor = Thông tin nhà cung cấp
+support-third-party-modules-occurrence = Tần suất xảy ra
+support-third-party-modules-process = Loại tiến trình & ID
+support-third-party-modules-thread = Luồng
+support-third-party-modules-base = �ịa chỉ Imagebase
+support-third-party-modules-uptime = Th�i gian hoạt động của tiến trình (mili giây)
+support-third-party-modules-duration = Th�i lượng tải (mili giây)
+support-third-party-modules-empty = Không có module của bên thứ ba được tải.
+support-third-party-modules-no-value = (Không có giá trị)
+support-third-party-modules-button-open =
+    .title = Mở vị trí tập tin…
+support-third-party-modules-expand =
+    .title = Hiển thị thông tin chi tiết
+support-third-party-modules-collapse =
+    .title = Thu g�n thông tin chi tiết
+support-third-party-modules-unsigned-icon =
+    .title = Module này chưa được ký
+support-third-party-modules-folder-icon =
+    .title = Mở vị trí tập tin…
+support-third-party-modules-down-icon =
+    .title = Hiển thị thông tin chi tiết
+support-third-party-modules-up-icon =
+    .title = Thu g�n thông tin chi tiết
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = Báo cáo lỗi trong { $days } ngày gần đây
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/vi/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/featuregates/features.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = Hỗ trợ nhi�u cửa sổ Hình-trong-hình
 experimental-features-multi-pip-description = Thử nghiệm cho phép hỗ trợ mở nhi�u cửa sổ Hình-trong-hình cùng lúc.
+experimental-features-http3 =
+    .label = Giao thức HTTP/3
+experimental-features-http3-description = Hỗ trợ thử nghiệm cho giao thức HTTP/3.
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/vi/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = Trang:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } của { $sheetCount }
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = Trang cuối
-
+printpreview-homearrow-button =
+    .title = Trang đầu
+printpreview-previousarrow-button =
+    .title = Trang trÆ°á»›c
+printpreview-nextarrow-button =
+    .title = Trang tiếp theo
+printpreview-endarrow-button =
+    .title = Trang cuối
diff -Nru firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/vi/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/vi/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:03:37.000000000 +0000
+++ firefox-85.0+build1/l10n/vi/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:34.000000000 +0000
@@ -24,6 +24,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = đến
+printui-page-custom-range-input =
+    .aria-label = Nhập phạm vi trang tùy chỉnh
+    .placeholder = ví dụ: 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = Bản sao
 printui-orientation = Hươ�ng
@@ -47,6 +50,7 @@
 printui-options = Tùy ch�n
 printui-headers-footers-checkbox = In đầu trang và chân trang
 printui-backgrounds-checkbox = In phần n�n
+printui-selection-checkbox = Chỉ in phần được ch�n
 printui-color-mode-label = Chế độ màu
 printui-color-mode-color = Màu
 printui-color-mode-bw = �en và trắng
@@ -55,19 +59,29 @@
 printui-margins-min = Tối thiểu
 printui-margins-none = Không có
 printui-margins-custom = Tùy ch�n
+printui-margins-custom-inches = Tùy chỉnh (inch)
 printui-margins-custom-top = Trên
+printui-margins-custom-top-inches = Trên (inch)
 printui-margins-custom-bottom = DÆ°á»›i
+printui-margins-custom-bottom-inches = DÆ°á»›i (inch)
 printui-margins-custom-left = Trái
+printui-margins-custom-left-inches = Trái (inch)
 printui-margins-custom-right = Phải
+printui-margins-custom-right-inches = Phải (inch)
 printui-system-dialog-link = In bằng hộp thoại hệ thống…
 printui-primary-button = In
 printui-primary-button-save = LÆ°u
 printui-cancel-button = Hủy b�
+printui-close-button = �óng
 printui-loading = �ang chuẩn bị xem trước
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = Xem trÆ°á»›c trang in
+printui-pages-per-sheet = Số trang trên mỗi t�
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = �ang in...
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/xh/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/xh/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/xh/browser/browser/appmenu.ftl	2021-01-06 12:03:41.000000000 +0000
+++ firefox-85.0+build1/l10n/xh/browser/browser/appmenu.ftl	2021-01-18 20:09:38.000000000 +0000
@@ -10,11 +10,22 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = Ifestile entsha
+appmenuitem-new-private-window =
+    .label = Ifestile yangasese entsha
+
+## Zoom and Fullscreen Controls
+
+appmenuitem-fullscreen =
+    .label = Isikrini esiZeleyo
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = Ngqamanisa ngoku
+appmenuitem-save-page =
+    .label = Gcina iphepha njenge…
 
 ## What's New panel in App menu.
 
diff -Nru firefox-84.0.2+build1/l10n/xh/browser/browser/browser.ftl firefox-85.0+build1/l10n/xh/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/xh/browser/browser/browser.ftl	2021-01-06 12:03:41.000000000 +0000
+++ firefox-85.0+build1/l10n/xh/browser/browser/browser.ftl	2021-01-18 20:09:38.000000000 +0000
@@ -218,6 +218,9 @@
 browser-window-close-button =
     .tooltiptext = Vala
 
+## Bookmarks toolbar items
+
+
 ## WebRTC Pop-up notifications
 
 popup-select-camera =
@@ -283,3 +286,39 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> ilawula ipoyinta yakho. Cofa uEsc ukuze uphinde uthathe ulawulo.
 pointerlock-warning-no-domain = Olu xwebhu lulawula ipoyinta yakho. Cofa uEsc ukuze uphinde uthathe ulawulo.
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = Bonisa zonke iibhukhmakhi
+bookmarks-recent-bookmarks =
+    .value = Okufakwe Ibhukmakhi Kutshanje
+bookmarks-toolbar-chevron =
+    .tooltiptext = Bonisa iibhukhmakhi ezininzi
+bookmarks-sidebar-content =
+    .aria-label = Iibhukhmakhi
+bookmarks-other-bookmarks-menu =
+    .label = Ezinye iiBhukmakhi
+bookmarks-mobile-bookmarks-menu =
+    .label = IZalathisi eZiphawulayo zeMobhayili
+bookmarks-search =
+    .label = Khangela iiBhukhmakhi
+bookmarks-toolbar-menu =
+    .label = Ithulbha yebhukhmakhi
+bookmarks-toolbar-placeholder =
+    .title = Iiayithem zethulbha yeebhukhmakhi
+bookmarks-toolbar-placeholder-button =
+    .label = Iiayithem zethulbha yeebhukhmakhi
+
+## Library Panel items
+
+library-bookmarks-bookmark-this-page =
+    .label = Faka ibhukhmakhi kweli khasi
+library-bookmarks-bookmark-edit =
+    .label = Hlela Le Bhukhmakhi
+
+## More items
+
+more-menu-go-offline =
+    .label = Sebenza ngaphandle kweIntanethi
+    .accesskey = e
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/aboutLogins.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/aboutLogins.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -168,7 +168,11 @@
 about-logins-confirm-remove-dialog-title = 删除此登录信�？
 confirm-delete-dialog-message = 此�作��撤销。
 about-logins-confirm-remove-dialog-confirm-button = 移除
-about-logins-confirm-remove-all-dialog-confirm-button = 移除全部
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] 移除
+       *[other] 全部移除
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] 是的，移除此登录信�
@@ -194,6 +198,8 @@
 about-logins-confirm-export-dialog-title = 导出登录�和密�
 about-logins-confirm-export-dialog-message = 您的密�将存为�读文本（如 BadP@ssw0rd），因此任何�以打开导出文件的人都�以进行查看。
 about-logins-confirm-export-dialog-confirm-button = 导出…
+about-logins-alert-import-title = 导入完�
+about-logins-alert-import-message = 查看详细的导入摘�
 confirm-discard-changes-dialog-title = �丢弃未�存的更改�？
 confirm-discard-changes-dialog-message = 将失去所有未�存的更改。
 confirm-discard-changes-dialog-confirm-button = 丢弃
@@ -255,3 +261,26 @@
         [macos] CSV 文档
        *[other] CSV 文件
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = 导入完�
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>新增的登录信�：</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>更新的现有登录信�：</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>��的登录信�：</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">（未导入）</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>错误：</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">（未导入）</span>
+    }
+about-logins-import-dialog-done = 完�
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/appmenu.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/appmenu.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = 新建窗�
+appmenuitem-new-private-window =
+    .label = 新建��窗�
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = 放大
 appmenuitem-zoom-reduce =
     .label = 缩�
+appmenuitem-fullscreen =
+    .label = 全�
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = 立��步
+appmenuitem-save-page =
+    .label = �存页�为…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = 新版�化
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/appMenuNotifications.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/appMenuNotifications.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = 暂时��
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = �等片刻，{ -brand-shorter-name } ���将��您所有�在���览模�中打开的标签页和窗�。
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } 无法自动更新至最新版本。
+    .buttonlabel = ��更新 { -brand-shorter-name }
+    .buttonaccesskey = U
+    .secondarybuttonlabel = 暂时��
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = { -brand-shorter-name } 有更新�用，由于 { -brand-shorter-name } 的�一副本还在�行，因此无法安装。您�以将其关闭以继续更新，或选择��更新（其他副本在�新�动之��能无法正常工作）。
 appmenu-addon-private-browsing-installed =
     .buttonlabel = 好的，明白了
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/browser.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/browser.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/browser.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -217,7 +217,7 @@
 
 # This string prompts the user to use the list of search shortcuts in
 # the Urlbar and searchbar.
-search-one-offs-with-title = 这次�用的�索引擎：
+search-one-offs-with-title = 本次�索使用：
 # This string won't wrap, so if the translated string is longer,
 # consider translating it as if it said only "Search Settings".
 search-one-offs-change-settings-button =
@@ -495,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> 已控制您的鼠标指针。按 Esc 键�收回控制�。
 pointerlock-warning-no-domain = 此文档已控制您的鼠标指针。按 Esc 键�收回控制�。
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = 管�所有书签
+bookmarks-recent-bookmarks =
+    .value = 最近的书签
+bookmarks-toolbar-chevron =
+    .tooltiptext = 显示更多书签
+bookmarks-sidebar-content =
+    .aria-label = 书签
+bookmarks-menu-button =
+    .label = 书签��
+bookmarks-other-bookmarks-menu =
+    .label = 其他书签
+bookmarks-mobile-bookmarks-menu =
+    .label = 移动设备上的书签
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ��书签侧�
+           *[other] 显示书签侧�
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] ��书签工具�
+           *[other] 查看书签工具�
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] 从工具�移除书签��
+           *[other] 添加书签��到工具�
+        }
+bookmarks-search =
+    .label = 在书签中�索
+bookmarks-tools =
+    .label = 书签工具
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = 书签工具�
+    .accesskey = B
+    .aria-label = 书签
+bookmarks-toolbar-menu =
+    .label = 书签工具�
+bookmarks-toolbar-placeholder =
+    .title = 书签工具�项目
+bookmarks-toolbar-placeholder-button =
+    .label = 书签工具�项目
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = 书签
+library-bookmarks-bookmark-this-page =
+    .label = 为此页添加书签
+library-bookmarks-bookmark-edit =
+    .label = 编辑此书签
+library-recent-activity-label = 近期动�
+
+## More items
+
+more-menu-go-offline =
+    .label = 脱机工作
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/newtab/asrouter.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/newtab/asrouter.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -117,6 +117,9 @@
 
 cfr-whatsnew-searchbar-title = 使用地��，输入寥寥，��万�
 cfr-whatsnew-searchbar-body-topsites = 现在�需选择地��，就会显示包�常用网站链接的下拉框。
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = 放大镜图标
 
 ## Picture-in-Picture
@@ -270,3 +273,13 @@
 
 cfr-whatsnew-search-shortcuts-header = 在地���索快�方�
 cfr-whatsnew-search-shortcuts-body = 现在起，当您在地��输入�索引擎或特定网�时，下方�索建议中将会显示一个�色快�方�。选择它��直接从地��完��索。
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = 阻止有害的超级 Cookie 跟踪
+cfr-whatsnew-supercookies-body = �些网站会��将“超级 Cookie�置入�览器，在网上肆无忌惮地跟踪您，�使清�掉常规 Cookie 也无法消除。{ -brand-short-name } 现在起��供应对超级 Cookie 的强大�护，阻止其跟踪您的网上活动。
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = 更佳的书签体验
+cfr-whatsnew-bookmarking-body = 更轻�地追踪您喜爱的网站。{ -brand-short-name } 现在起会记忆您�存书签的的�好�置�在新标签页默认显示书签工具�，并�让您通过工具�上的文件夹快速访问其他书签。
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/newtab/newtab.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = 新标签页
 newtab-settings-button =
     .title = 定制您的新标签页
+newtab-personalize-button-label = 个性化
+    .title = 个性化标签页
+    .aria-label = 个性化标签页
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = 在网络上�索
     .title = 在网络上�索
     .aria-label = 在网络上�索
+newtab-search-box-text = 在网上�索
+newtab-search-box-input =
+    .placeholder = 在网上�索
+    .aria-label = 在网上�索
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = 添加�索引擎
 newtab-topsites-add-topsites-header = 新建常用网站
+newtab-topsites-add-shortcut-header = 新建快�方�
 newtab-topsites-edit-topsites-header = 编辑常用网站
+newtab-topsites-edit-shortcut-header = 编辑快�方�
 newtab-topsites-title-label = 标题
 newtab-topsites-title-input =
     .placeholder = 输入标题
@@ -203,3 +212,26 @@
 
 newtab-error-fallback-info = 哎呀，载入内容时�生错误。
 newtab-error-fallback-refresh-link = 刷新页�以�试。
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = 快�方�
+newtab-custom-shortcuts-subtitle = 您�存或访问过的网站
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } 行
+    }
+newtab-custom-sponsored-sites = 赞助商网站
+newtab-custom-pocket-title = 由 { -pocket-brand-name } 推�
+newtab-custom-pocket-subtitle = 由 { -brand-product-name } 旗下 { -pocket-brand-name } 策划的特别内容
+newtab-custom-pocket-sponsored = 赞助内容
+newtab-custom-recent-title = 近期动�
+newtab-custom-recent-subtitle = 近期访问的网站与内容精选
+newtab-custom-close-button = 关闭
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = �言片语
+newtab-custom-snippets-subtitle = �自 { -vendor-short-name } 和 { -brand-product-name } 的使用�门与快讯
+newtab-custom-settings = 管�更多设置
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/places.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/places.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/places.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = �文件夹
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = 其他书签
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/preferences/connection.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/preferences/connection.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/preferences/connection.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/preferences/connection.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -9,15 +9,11 @@
             [macos] width: 44em
            *[other] width: 49em
         }
-
 connection-close-key =
     .key = w
-
 connection-disable-extension =
     .label = �用扩展
-
 connection-proxy-configure = �置访问互�网的代��务器
-
 connection-proxy-option-no =
     .label = �使用代��务器
     .accesskey = y
@@ -28,33 +24,27 @@
     .label = 自动检测此网络的代�设置
     .accesskey = w
 connection-proxy-option-manual =
-    .label = 手动代��置
+    .label = 手动�置代�
     .accesskey = m
-
 connection-proxy-http = HTTP 代�
     .accesskey = x
 connection-proxy-http-port = 端�
     .accesskey = P
-
 connection-proxy-http-sharing =
     .label = 也将此代�用于 FTP 和 HTTPS
     .accesskey = s
-
 connection-proxy-https = HTTPS Proxy
     .accesskey = H
 connection-proxy-ssl-port = 端�
     .accesskey = o
-
 connection-proxy-ftp = FTP 代�
     .accesskey = F
 connection-proxy-ftp-port = 端�
     .accesskey = r
-
 connection-proxy-socks = SOCKS 主机
     .accesskey = C
 connection-proxy-socks-port = 端�
     .accesskey = t
-
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
@@ -63,45 +53,34 @@
     .accesskey = v
 connection-proxy-noproxy = �使用代�
     .accesskey = n
-
 connection-proxy-noproxy-desc = 例如：.mozilla.org, .net.nz, 192.168.1.0/24
-
 # Do not translate localhost, 127.0.0.1 and ::1.
 connection-proxy-noproxy-localhost-desc = 与 localhost�127.0.0.1 和 ::1 的连接永��过代�。
-
 connection-proxy-autotype =
     .label = 自动代��置的 URL（PAC）
     .accesskey = A
-
 connection-proxy-reload =
     .label = �新载入
     .accesskey = e
-
 connection-proxy-autologin =
     .label = 如果密�已�存，��示身份验�
     .accesskey = i
     .tooltip = 此选项将�许在您已�存凭�的情况下自动�代�进行身份验�，如果验�失败��示您输入信�。
-
 connection-proxy-socks-remote-dns =
     .label = 使用 SOCKS v5 时代� DNS 查询
     .accesskey = D
-
 connection-dns-over-https =
     .label = �用基于 HTTPS 的 DNS
     .accesskey = H
-
 connection-dns-over-https-url-resolver = 选用�供商
     .accesskey = P
-
 # Variables:
 #   $name (String) - Display name or URL for the DNS over HTTPS provider
 connection-dns-over-https-url-item-default =
     .label = { $name }（默认值）
     .tooltiptext = 使用默认 URL 完�基于 HTTPS 的 DNS 解�
-
 connection-dns-over-https-url-custom =
     .label = 自定义
     .accesskey = C
     .tooltiptext = 输入您�好的 URL，用�完�基于 HTTPS 的 DNS 解�
-
 connection-dns-over-https-custom-label = 自定义
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/preferences/preferences.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -496,6 +496,11 @@
 home-prefs-topsites-description = 您�常访问的网站
 home-prefs-topsites-by-option-sponsored =
     .label = 赞助商网站
+home-prefs-shortcuts-header =
+    .label = 快�方�
+home-prefs-shortcuts-description = 您�存或访问过的网站
+home-prefs-shortcuts-by-option-sponsored =
+    .label = 赞助商网站
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
@@ -503,6 +508,7 @@
 home-prefs-recommended-by-header =
     .label = { $provider } 推�
 home-prefs-recommended-by-description-update = 由 { $provider } 整��供的网络精选内容
+home-prefs-recommended-by-description-new = 由 { -brand-product-name } 旗下 { $provider } 策划的特别内容
 
 ##
 
@@ -511,8 +517,6 @@
     .label = 赞助内容
 home-prefs-highlights-header =
     .label = 集锦
-home-prefs-recent-activity-header =
-    .label = 近期动�
 home-prefs-highlights-description = 您访问过或�存过的网站精选
 home-prefs-highlights-option-visited-pages =
     .label = 访问过的页�
@@ -522,6 +526,9 @@
     .label = 最近下载
 home-prefs-highlights-option-saved-to-pocket =
     .label = �存在 { -pocket-brand-name } 的页�
+home-prefs-recent-activity-header =
+    .label = 近期动�
+home-prefs-recent-activity-description = 近期访问的网站与内容精选
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -529,6 +536,7 @@
 home-prefs-snippets-header =
     .label = �言片语
 home-prefs-snippets-description = �自 { -vendor-short-name } 和 { -brand-product-name } 的快讯
+home-prefs-snippets-description-new = �自 { -vendor-short-name } 和 { -brand-product-name } 的使用�门与快讯
 home-prefs-sections-rows-option =
     .label = { $num } 行
 
@@ -914,11 +922,18 @@
     .label = 书签
     .accesskey = k
 addressbar-locbar-openpage-option =
-    .label = 已打开的标签页
+    .label = 打开的标签页
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = 快�方�
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = 常用网站
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = �索引擎
+    .accesskey = a
 addressbar-suggestions-settings = 更改�索引擎建议的首选项
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/zh-CN/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = �在新标签页
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = 始终显示
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = 永�显示
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = �在新标签页显示
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = 显示 - 其他书签
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/devtools/client/markers.properties firefox-85.0+build1/l10n/zh-CN/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/zh-CN/devtools/client/markers.properties	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/devtools/client/markers.properties	2021-01-18 20:09:43.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=内存�低
 marker.gcreason.label.CC_WAITING=循环收集强迫
+marker.gcreason.label.CC_FINISHED=循环收集完�
 marker.gcreason.label.CC_FORCED=循环收集强迫
 marker.gcreason.label.LOAD_END=页�载入完�
 marker.gcreason.label.PAGE_HIDE=移动到��
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=新生区集�
-
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/devtools/client/toolbox.properties firefox-85.0+build1/l10n/zh-CN/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/zh-CN/devtools/client/toolbox.properties	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/devtools/client/toolbox.properties	2021-01-18 20:09:43.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=关闭开�者工具
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=显示分离�控制�
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/zh-CN/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/devtools/client/tooltips.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/devtools/client/tooltips.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = 由于�是定�元素，<strong>{ $property }</strong> 对此元素无效。
 inactive-text-overflow-when-no-overflow = 由于未设置 <strong>overflow:hidden</strong>，<strong>{ $property }</strong> 对此元素无效。
 inactive-outline-radius-when-outline-style-auto-or-none = 由于此元素的 <strong>outline-style</strong> 是 <strong>auto</strong> 或 <strong>none</strong>，<strong>{ $property }</strong> 对此元素没有影�。
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> 对内部表格元素无影�。
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> 对内部表格元素（表格�元格除外）无影�。
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = 请�试移除 <strong>float</ strong> 或添加 <strong>display:block</strong>。{ learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = 请�试将其 <strong>position</strong> 属性设为� <strong>static</strong> 的值。{ learn-more }
 inactive-text-overflow-when-no-overflow-fix = 请�试添加 <strong>overflow:hidden</strong>。{ learn-more }
+inactive-css-not-for-internal-table-elements-fix = 请�试将其 <strong>display</strong> 设为 <strong>table-cell</strong>�<strong>table-column</strong>�<strong>table-row</strong>�<strong>table-column-group</strong>�<strong>table-row-group</strong> 或 <strong>table-footer-group</strong> 以外的值。{ learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = 请�试将其 <strong>display</strong> 设为 <strong>table-column</strong>�<strong>table-row</strong>�<strong>table-column-group</strong>�<strong>table-row-group</strong> 或 <strong>table-footer-group</strong> 以外的值。{ learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = 请�试将其 <strong>outline-style</strong> 属性设为� <strong>auto</strong> 或 <strong>none</strong> 的值。{ learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/zh-CN/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/zh-CN/dom/chrome/dom/dom.properties	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/dom/chrome/dom/dom.properties	2021-01-18 20:09:43.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=由于用户并未触�，已�用 <input> 选择器。
 ExternalProtocolFrameBlockedNoUserActivation=由于用户并未触�，或此 iframe 上次加载以�的时间�足，已�蔽使用外部�议的 iframe。
 MultiplePopupsBlockedNoUserActivation=由于用户并未触�，已阻止弹出多个窗�的行为。
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=由于未知的“as�或“type�值，或“media�属性�匹�，已忽略预加载 %S。
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:09:43.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=天
 
 downloadErrorAlertTitle=下载错误
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=下载项已被 %S 拦截，无法�存。
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=下载项已被�扩展拦截，无法�存。
 downloadErrorGeneric=�生未知错误，无法�存下载项。\n\n请�试。
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/zh-CN/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:09:43.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=代��务器拒�连接
 check_error-2153390069=�务器�书已过期（如果您的系统时间�正确，请调整您的系统时钟至正确的日期时间）
 check_error-verification_failed=无法验�更新的完整性
+check_error-move_failed=准备安装所需更新失败
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = 第三方模�
+support-third-party-modules-module = 模�文件
+support-third-party-modules-version = 文件版本
+support-third-party-modules-vendor = 厂商信�
+support-third-party-modules-occurrence = 加载次数
+support-third-party-modules-process = 进程类型与 ID
+support-third-party-modules-thread = 线程
+support-third-party-modules-base = 映�基�
+support-third-party-modules-uptime = 进程�行时间（毫秒）
+support-third-party-modules-duration = 加载�续时间（毫秒）
+support-third-party-modules-empty = 未加载第三方模�。
+support-third-party-modules-no-value = （暂无值）
+support-third-party-modules-button-open =
+    .title = 打开文件所在�置…
+support-third-party-modules-expand =
+    .title = 显示详细信�
+support-third-party-modules-collapse =
+    .title = 收起详细信�
+support-third-party-modules-unsigned-icon =
+    .title = 此模�未签�
+support-third-party-modules-folder-icon =
+    .title = 打开文件所在�置…
+support-third-party-modules-down-icon =
+    .title = 显示详细信�
+support-third-party-modules-up-icon =
+    .title = 收起详细信�
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = 近 { $days } 天的崩溃报告
@@ -235,7 +261,7 @@
 gpu-process-pid = GPUProcessPid
 gpu-process = GPUProcess
 gpu-description = �述
-gpu-vendor-id = 供应商 ID
+gpu-vendor-id = 厂商 ID
 gpu-device-id = 设备 ID
 gpu-subsys-id = �系统 ID
 gpu-drivers = 驱动程�
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/featuregates/features.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = 画中画支�多开
 experimental-features-multi-pip-description = �许�时打开多个画中画窗�的实验性支�。
+experimental-features-http3 =
+    .label = HTTP/3 �议
+experimental-features-http3-description = 对 HTTP/3 �议的实验性支�。
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = 第
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = 第 { $sheetNum } 页，共 { $sheetCount } 页
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = 末页
-
+printpreview-homearrow-button =
+    .title = 首页
+printpreview-previousarrow-button =
+    .title = 上一页
+printpreview-nextarrow-button =
+    .title = 下一页
+printpreview-endarrow-button =
+    .title = 尾页
diff -Nru firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/zh-CN/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:03:46.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-CN/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:43.000000000 +0000
@@ -24,6 +24,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = 到
+printui-page-custom-range-input =
+    .aria-label = 输入自定义页�范围
+    .placeholder = 如：2-6�9�12-16
 # Section title for the number of copies to print
 printui-copies-label = 份数
 printui-orientation = 方�
@@ -47,6 +50,7 @@
 printui-options = 选项
 printui-headers-footers-checkbox = 打�页眉和页脚
 printui-backgrounds-checkbox = 打�背景
+printui-selection-checkbox = 仅打�选中内容
 printui-color-mode-label = 色彩模�
 printui-color-mode-color = 彩色
 printui-color-mode-bw = 黑白
@@ -55,19 +59,29 @@
 printui-margins-min = 最�
 printui-margins-none = æ— 
 printui-margins-custom = 自定义
+printui-margins-custom-inches = 自定义（英寸）
 printui-margins-custom-top = 上
+printui-margins-custom-top-inches = 上（英寸）
 printui-margins-custom-bottom = 下
+printui-margins-custom-bottom-inches = 下（英寸）
 printui-margins-custom-left = å·¦
+printui-margins-custom-left-inches = 左（英寸）
 printui-margins-custom-right = �
+printui-margins-custom-right-inches = �（英寸）
 printui-system-dialog-link = 使用系统对�框打�...
 printui-primary-button = 打�
 printui-primary-button-save = �存
 printui-cancel-button = �消
+printui-close-button = 关闭
 printui-loading = 正在准备预览
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = 打�预览
+printui-pages-per-sheet = �张纸打�的页数
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = 正在打�...
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/aboutLogins.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/aboutLogins.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/aboutLogins.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/aboutLogins.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -168,7 +168,11 @@
 about-logins-confirm-remove-dialog-title = �移除這筆登入資訊嗎？
 confirm-delete-dialog-message = 此動作無法復原。
 about-logins-confirm-remove-dialog-confirm-button = 移除
-about-logins-confirm-remove-all-dialog-confirm-button = 移除全部
+about-logins-confirm-remove-all-dialog-confirm-button-label =
+    { $count ->
+        [1] 移除
+       *[other] 移除全部
+    }
 about-logins-confirm-remove-all-dialog-checkbox-label =
     { $count ->
         [1] 好，移除這筆登入資訊
@@ -194,6 +198,8 @@
 about-logins-confirm-export-dialog-title = 匯出登入資訊與密碼
 about-logins-confirm-export-dialog-message = 您的密碼將以�閱讀的明文格�（例如 BadP@ssw0rd）儲存，任何能夠開啟檔案的人都能得知密碼內容。
 about-logins-confirm-export-dialog-confirm-button = 匯出…
+about-logins-alert-import-title = 匯入完�
+about-logins-alert-import-message = 檢視詳細的匯入摘�
 confirm-discard-changes-dialog-title = �放棄未儲存的變更嗎？
 confirm-discard-changes-dialog-message = 將失去所有未儲存的變更。
 confirm-discard-changes-dialog-confirm-button = �棄
@@ -255,3 +261,26 @@
         [macos] CSV 文件
        *[other] CSV 檔案
     }
+
+##
+## Variables:
+##  $count (number) - The number of affected elements
+
+about-logins-import-dialog-title = 匯入完�
+about-logins-import-dialog-items-added =
+    { $count ->
+       *[other] <span>新增的登入資訊:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-modified =
+    { $count ->
+       *[other] <span>更新的�有登入資訊:</span> <span data-l10n-name="count">{ $count }</span>
+    }
+about-logins-import-dialog-items-no-change =
+    { $count ->
+       *[other] <span>�複的登入資訊:</span> <span data-l10n-name="count">{ $count }</span><span data-l10n-name="meta">（未匯入）</span>
+    }
+about-logins-import-dialog-items-error =
+    { $count ->
+       *[other] <span>錯誤:</span> <span data-l10n-name="count">{ $count }</span> <span data-l10n-name="meta">（未匯入）</span>
+    }
+about-logins-import-dialog-done = 完�
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/appmenu.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/appmenu.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/appmenu.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/appmenu.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -13,20 +13,30 @@
 
 ## Zoom Controls
 
+appmenuitem-new-window =
+    .label = 開新視窗
+appmenuitem-new-private-window =
+    .label = 新增隱�視窗
+
+## Zoom and Fullscreen Controls
+
 appmenuitem-zoom-enlarge =
     .label = 放大
 appmenuitem-zoom-reduce =
     .label = 縮�
+appmenuitem-fullscreen =
+    .label = 全螢幕
 
 ## Firefox Account toolbar button and Sync panel in App menu.
 
 fxa-toolbar-sync-now =
     .label = 立刻�步
+appmenuitem-save-page =
+    .label = �存新檔…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = 有什麼新鮮事
-
 # Checkbox displayed at the bottom of the What's New panel, allowing users to
 # enable/disable What's New notifications.
 whatsnew-panel-footer-checkbox =
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/appMenuNotifications.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/appMenuNotifications.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/appMenuNotifications.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/appMenuNotifications.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -32,6 +32,13 @@
     .secondarybuttonlabel = 暫時��
     .secondarybuttonaccesskey = N
 appmenu-update-restart-message = 快速�新啟動後，{ -brand-shorter-name } 將還原您所有�在隱��覽模�中開啟的分�與視窗。
+appmenu-update-other-instance =
+    .label = { -brand-shorter-name } 無法自動更新至最新版本。
+    .buttonlabel = �然更新 { -brand-shorter-name }
+    .buttonaccesskey = U
+    .secondarybuttonlabel = �在��
+    .secondarybuttonaccesskey = N
+appmenu-update-other-instance-message = { -brand-shorter-name } 已經推出，但由於有�一份 { -brand-shorter-name } �在執行，無法安�。請將其關閉來完�更新，或是點擊「�然更新�（但那一份 { -brand-shorter-name } 在�新啟動��作�能會�正常）。
 appmenu-addon-private-browsing-installed =
     .buttonlabel = 好的，知�了
     .buttonaccesskey = O
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/browser.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/browser.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/browser.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/browser.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -495,3 +495,71 @@
 #  $domain (String): the domain that is using pointer-lock, e.g. "mozilla.org"
 pointerlock-warning-domain = <span data-l10n-name="domain">{ $domain }</span> �控制您的滑鼠游標，按 Esc �回控制權。
 pointerlock-warning-no-domain = 此文件�控制您的滑鼠游標，按 Esc �回控制權。
+
+## Bookmarks panels, menus and toolbar
+
+bookmarks-show-all-bookmarks =
+    .label = 顯示所有書籤
+bookmarks-recent-bookmarks =
+    .value = 最近加入的書籤
+bookmarks-toolbar-chevron =
+    .tooltiptext = 顯示更多書籤
+bookmarks-sidebar-content =
+    .aria-label = 書籤
+bookmarks-menu-button =
+    .label = 書籤�單
+bookmarks-other-bookmarks-menu =
+    .label = 其他書籤
+bookmarks-mobile-bookmarks-menu =
+    .label = 行動書籤
+bookmarks-tools-sidebar-visibility =
+    .label =
+        { $isVisible ->
+            [true] 隱�書籤�邊欄
+           *[other] 檢視書籤欄
+        }
+bookmarks-tools-toolbar-visibility =
+    .label =
+        { $isVisible ->
+            [true] 隱�書籤工具列
+           *[other] 檢視書籤工具列
+        }
+bookmarks-tools-menu-button-visibility =
+    .label =
+        { $isVisible ->
+            [true] 從工具列移除書籤�單
+           *[other] 在工具列中加入書籤�單
+        }
+bookmarks-search =
+    .label = �尋書籤
+bookmarks-tools =
+    .label = 書籤工具
+# The aria-label 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.
+bookmarks-toolbar =
+    .toolbarname = 書籤工具列
+    .accesskey = B
+    .aria-label = 書籤
+bookmarks-toolbar-menu =
+    .label = 書籤工具列
+bookmarks-toolbar-placeholder =
+    .title = 書籤工具列項目
+bookmarks-toolbar-placeholder-button =
+    .label = 書籤工具列項目
+
+## Library Panel items
+
+library-bookmarks-menu =
+    .label = 書籤
+library-bookmarks-bookmark-this-page =
+    .label = 將本�加入書籤
+library-bookmarks-bookmark-edit =
+    .label = 編輯此書籤
+library-recent-activity-label = 近期動態
+
+## More items
+
+more-menu-go-offline =
+    .label = 離線模�
+    .accesskey = k
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/newtab/asrouter.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/newtab/asrouter.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/newtab/asrouter.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/newtab/asrouter.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -117,6 +117,9 @@
 
 cfr-whatsnew-searchbar-title = 使用網�列，打得更少，找得更多
 cfr-whatsnew-searchbar-body-topsites = �在���擇網�列，就會顯示包�熱門網站連�的方框。
+
+## Search bar
+
 cfr-whatsnew-searchbar-icon-alt-text = 放大�圖示
 
 ## Picture-in-Picture
@@ -270,3 +273,13 @@
 
 cfr-whatsnew-search-shortcuts-header = 在網�列�尋�徑
 cfr-whatsnew-search-shortcuts-body = �在起，當您在網�列輸入�尋引擎�稱或特定網�時，將於�尋建議的下方顯示�色�徑。�擇該�徑��直接從網�列完��尋。
+
+## What's new: Cookies protection
+
+cfr-whatsnew-supercookies-header = 防止有害的超級 Cookie 追蹤
+cfr-whatsnew-supercookies-body = �些網站會��將「超級 Cookie��入到�覽器，在網路上到處跟著您，就算清�掉一般 Cookie 後也無法清除。{ -brand-short-name } �在起會��超級 Cookie 加強�護，�讓它們被用來追蹤您的線上活動。
+
+## What's new: Better bookmarking
+
+cfr-whatsnew-bookmarking-header = 書籤功能更完善
+cfr-whatsnew-bookmarking-body = 很簡單就能追蹤您最愛的網站。{ -brand-short-name } �在起會記�您儲存書籤的�好�置�在新分��設顯示書籤工具列，並且讓您��工具列中的資料夾快速開啟其他書籤。
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/newtab/newtab.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/newtab/newtab.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/newtab/newtab.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/newtab/newtab.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -8,6 +8,9 @@
 newtab-page-title = 新分�
 newtab-settings-button =
     .title = 自訂您的新分���
+newtab-personalize-button-label = 個人化
+    .title = 個人化新分�
+    .aria-label = 個人化新分�
 
 ## Search box component.
 
@@ -20,12 +23,18 @@
     .placeholder = �尋 Web
     .title = �尋 Web
     .aria-label = �尋 Web
+newtab-search-box-text = �尋 Web
+newtab-search-box-input =
+    .placeholder = �尋 Web
+    .aria-label = �尋 Web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = 新增�尋引擎
 newtab-topsites-add-topsites-header = 新增熱門網站
+newtab-topsites-add-shortcut-header = 新增�徑
 newtab-topsites-edit-topsites-header = 編輯熱門網站
+newtab-topsites-edit-shortcut-header = 編輯�徑
 newtab-topsites-title-label = 標題
 newtab-topsites-title-input =
     .placeholder = 輸入標題
@@ -203,3 +212,26 @@
 
 newtab-error-fallback-info = 唉唷，載入內容時發生錯誤。
 newtab-error-fallback-refresh-link = 請�新整����試一次。
+
+## Customization Menu
+
+newtab-custom-shortcuts-title = �徑
+newtab-custom-shortcuts-subtitle = 您儲存或造訪�的網站
+newtab-custom-row-selector =
+    { $num ->
+       *[other] { $num } 行
+    }
+newtab-custom-sponsored-sites = 贊助�徑
+newtab-custom-pocket-title = 由 { -pocket-brand-name } 推薦
+newtab-custom-pocket-subtitle = 由 { -brand-product-name } 的姊妹作 { -pocket-brand-name } 精心策展的內容
+newtab-custom-pocket-sponsored = 贊助內容
+newtab-custom-recent-title = 近期動態
+newtab-custom-recent-subtitle = 近期造訪�的網站與內容精�
+newtab-custom-close-button = 關閉
+# For the "Snippets" feature traditionally on about:home.
+# Alternative translation options: "Small Note" or something that
+# expresses the idea of "a small message, shortened from something else,
+# and non-essential but also not entirely trivial and useless.
+newtab-custom-snippets-title = 隻字片語
+newtab-custom-snippets-subtitle = 來自 { -vendor-short-name } � { -brand-product-name } 的使用秘訣與新�
+newtab-custom-settings = 管�更多設定
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/places.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/places.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/places.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/places.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -66,3 +66,6 @@
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
     .label = �資料夾
+# This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
+other-bookmarks-folder =
+    .label = 其他書籤
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/preferences/preferences.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/preferences/preferences.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/preferences/preferences.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/preferences/preferences.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -488,13 +488,19 @@
 home-prefs-topsites-description = 最常造訪的網站
 home-prefs-topsites-by-option-sponsored =
     .label = 贊助的熱門網站
+home-prefs-shortcuts-header =
+    .label = �徑
+home-prefs-shortcuts-description = 您儲存或造訪�的網站
+home-prefs-shortcuts-by-option-sponsored =
+    .label = 贊助�徑
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = { $provider } 推薦
-home-prefs-recommended-by-description-update = 由 { $provider } 整��供的網路精�內容
+home-prefs-recommended-by-description-update = { $provider } 整��供的網路精�內容
+home-prefs-recommended-by-description-new = 由 { -brand-product-name } 的姊妹作 { $provider } 精心策展的內容
 
 ##
 
@@ -503,8 +509,6 @@
     .label = 贊助內容
 home-prefs-highlights-header =
     .label = 精�網站
-home-prefs-recent-activity-header =
-    .label = 近期動態
 home-prefs-highlights-description = 您儲存或造訪�的網站精�
 home-prefs-highlights-option-visited-pages =
     .label = 造訪�的��
@@ -514,6 +518,9 @@
     .label = 最新下載
 home-prefs-highlights-option-saved-to-pocket =
     .label = 儲存至 { -pocket-brand-name } 的��
+home-prefs-recent-activity-header =
+    .label = 近期動態
+home-prefs-recent-activity-description = 近期造訪�的網站與內容精�
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
@@ -521,6 +528,7 @@
 home-prefs-snippets-header =
     .label = 隻字片語
 home-prefs-snippets-description = 來自 { -vendor-short-name } � { -brand-product-name } 的大�事
+home-prefs-snippets-description-new = 來自 { -vendor-short-name } � { -brand-product-name } 的使用秘訣與新�
 home-prefs-sections-rows-option =
     .label = { $num } 行
 
@@ -908,9 +916,16 @@
 addressbar-locbar-openpage-option =
     .label = 開啟分�
     .accesskey = O
+# Shortcuts refers to the shortcut tiles on the new tab page, previously known as top sites. Translation should be consistent.
+addressbar-locbar-shortcuts-option =
+    .label = �徑
+    .accesskey = S
 addressbar-locbar-topsites-option =
     .label = 熱門網站
     .accesskey = T
+addressbar-locbar-engines-option =
+    .label = �索引擎
+    .accesskey = a
 addressbar-suggestions-settings = 修改�尋建議�好設定
 
 ## Privacy Section - Content Blocking
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/browser/toolbarContextMenu.ftl firefox-85.0+build1/l10n/zh-TW/browser/browser/toolbarContextMenu.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/browser/browser/toolbarContextMenu.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/browser/toolbarContextMenu.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -60,6 +60,15 @@
 toolbar-context-menu-bookmarks-toolbar-on-new-tab =
     .label = �在新分�
     .accesskey = O
+toolbar-context-menu-bookmarks-toolbar-always-show-2 =
+    .label = �次都顯示
+    .accesskey = A
+toolbar-context-menu-bookmarks-toolbar-never-show-2 =
+    .label = 永�顯示
+    .accesskey = N
+toolbar-context-menu-bookmarks-toolbar-on-new-tab-2 =
+    .label = �在新分�顯示
+    .accesskey = O
 toolbar-context-menu-bookmarks-show-other-bookmarks =
     .label = 顯示其他書籤
     .accesskey = h
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/browser/pdfviewer/viewer.properties firefox-85.0+build1/l10n/zh-TW/browser/pdfviewer/viewer.properties
--- firefox-84.0.2+build1/l10n/zh-TW/browser/pdfviewer/viewer.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/browser/pdfviewer/viewer.properties	2021-01-18 20:09:52.000000000 +0000
@@ -41,7 +41,7 @@
 print_label=列�
 download.title=下載
 download_label=下載
-bookmark.title=目�檢視的內容（複製或開啟於新視窗）
+bookmark.title=目�畫�（複製或開啟於新視窗）
 bookmark_label=目�檢視
 
 # Secondary toolbar and context menu
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/devtools/client/layout.properties firefox-85.0+build1/l10n/zh-TW/devtools/client/layout.properties
--- firefox-84.0.2+build1/l10n/zh-TW/devtools/client/layout.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/devtools/client/layout.properties	2021-01-18 20:09:52.000000000 +0000
@@ -107,7 +107,7 @@
 
 # LOCALIZATION NOTE (layout.displayLineNumbers): Label of the display line numbers
 # setting option in the CSS Grid panel.
-layout.displayLineNumbers=顯示行號
+layout.displayLineNumbers=顯示行數
 
 # LOCALIZATION NOTE (layout.extendLinesInfinitely): Label of the extend lines
 # infinitely setting option in the CSS Grid panel.
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/devtools/client/markers.properties firefox-85.0+build1/l10n/zh-TW/devtools/client/markers.properties
--- firefox-84.0.2+build1/l10n/zh-TW/devtools/client/markers.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/devtools/client/markers.properties	2021-01-18 20:09:52.000000000 +0000
@@ -119,6 +119,7 @@
 marker.gcreason.label.COMPONENT_UTILS=Cu.forceGC
 marker.gcreason.label.MEM_PRESSURE=記憶體�足
 marker.gcreason.label.CC_WAITING=Forced by Cycle Collection
+marker.gcreason.label.CC_FINISHED=循環收集完�
 marker.gcreason.label.CC_FORCED=Forced by Cycle Collection
 marker.gcreason.label.LOAD_END=��載入完�
 marker.gcreason.label.PAGE_HIDE=移動至背景
@@ -136,4 +137,3 @@
 
 # The name of a nursery collection.
 marker.nurseryCollection=Nursery Collection
-
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/devtools/client/toolbox.properties firefox-85.0+build1/l10n/zh-TW/devtools/client/toolbox.properties
--- firefox-84.0.2+build1/l10n/zh-TW/devtools/client/toolbox.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/devtools/client/toolbox.properties	2021-01-18 20:09:52.000000000 +0000
@@ -179,6 +179,10 @@
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=關閉開發者工具
 
+# LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
+# the error count button displayed in the developer tools toolbox.
+toolbox.errorCountButton.tooltip=顯示分割主控�
+
 # LOCALIZATION NOTE (toolbox.sourceMapFailure): This is shown in the web console
 # when there is a failure to fetch or parse a source map.
 # The text of the error: %1$S
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/devtools/client/tooltips.ftl firefox-85.0+build1/l10n/zh-TW/devtools/client/tooltips.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/devtools/client/tooltips.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/devtools/client/tooltips.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -28,6 +28,8 @@
 inactive-css-position-property-on-unpositioned-box = 由於元素未置入，<strong>{ $property }</strong> �此元素沒有影響。
 inactive-text-overflow-when-no-overflow = 由於未設定 <strong>overflow:hidden</strong>，<strong>{ $property }</strong> �此元素沒有影響。
 inactive-outline-radius-when-outline-style-auto-or-none = 由於此元素的 <strong>outline-style</strong> 是 <strong>auto</strong> 或 <strong>none</strong>，<strong>{ $property }</strong> �此元素沒有影響。
+inactive-css-not-for-internal-table-elements = <strong>{ $property }</strong> �內部表格元素沒有影響。
+inactive-css-not-for-internal-table-elements-except-table-cells = <strong>{ $property }</strong> �表格欄�之外的內部表格元素沒有影響。
 
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
@@ -46,6 +48,8 @@
 inactive-css-not-display-block-on-floated-fix = �試著移除 <strong>float</strong> 或加入 <strong>display:block</strong>。{ learn-more }
 inactive-css-position-property-on-unpositioned-box-fix = 請試著將 <strong>position</strong> 屬性設定為 <strong>static</strong> 以外的值。{ learn-more }
 inactive-text-overflow-when-no-overflow-fix = 請嘗試加入 <strong>overflow:hidden</strong>。{ learn-more }
+inactive-css-not-for-internal-table-elements-fix = 請嘗試將其 <strong>display</strong> 設定� <strong>table-cell</strong>�<strong>table-column</strong>�<strong>table-row</strong>�<strong>table-column-group</strong>�<strong>table-row-group</strong> 或<strong>table-footer-group</strong> 以外的值。{ learn-more }
+inactive-css-not-for-internal-table-elements-except-table-cells-fix = 請嘗試將其 <strong>display</strong> 設定� <strong>table-column</strong>�<strong>table-row</strong>�<strong>table-column-group</strong>�<strong>table-row-group</strong> 或<strong>table-footer-group</strong> 以外的值。{ learn-more }
 inactive-outline-radius-when-outline-style-auto-or-none-fix = 請試著將 <strong>outline-style</strong> 屬性設定為 <strong>auto</strong> 或 <strong>none</strong> 以外的值。{ learn-more }
 
 ## In the Rule View when a CSS property may have compatibility issues with other browsers
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/dom/chrome/dom/dom.properties firefox-85.0+build1/l10n/zh-TW/dom/chrome/dom/dom.properties
--- firefox-84.0.2+build1/l10n/zh-TW/dom/chrome/dom/dom.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/dom/chrome/dom/dom.properties	2021-01-18 20:09:52.000000000 +0000
@@ -426,3 +426,5 @@
 InputPickerBlockedNoUserActivation=由於使用者並未觸發，已�鎖 <input> �擇器。
 ExternalProtocolFrameBlockedNoUserActivation=由於使用者並未觸發，或此 iframe 上次載入以來的時間�足，已�鎖使用外部通訊�定的 iframe。
 MultiplePopupsBlockedNoUserActivation=由於使用者並未觸發，已�鎖彈出多個視窗的行為。
+# LOCALIZATION NOTE: %S is the URL of the preload that was ignored.
+PreloadIgnoredInvalidAttr=由於未知的「as�或「type�值，或「media�屬性�符�，已忽略�載 %S。
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/dom/chrome/plugins.properties firefox-85.0+build1/l10n/zh-TW/dom/chrome/plugins.properties
--- firefox-84.0.2+build1/l10n/zh-TW/dom/chrome/plugins.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/dom/chrome/plugins.properties	2021-01-18 20:09:52.000000000 +0000
@@ -2,15 +2,11 @@
 # 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:
-#    Those strings are inserted into an HTML page, so all HTML characters
-#    have to be escaped in a way that they show up correctly in HTML!
-
 # GMP Plugins
 gmp_license_info=授權資訊
 gmp_privacy_info=隱�權資訊
 
-openH264_name=由 Cisco Systems, Inc. �供的 OpenH264 視訊解碼器
+openH264_name=Cisco Systems, Inc. �供的 OpenH264 視訊解碼器
 openH264_description2=此外掛程�是由 Mozilla 自動安�，以符� WebRTC �範，並讓您能夠與需�使用 H.264 視訊解碼器的�置�通。您�至 http://www.openh264.org/ �得解碼器的原始碼，並了解此實作的相關資訊。
 
 cdm_description2=此外掛程�讓您�播放相容於 Encrypted Media Extensions �格的加密媒體內容。加密媒體內容通常用於防止複製，或是需收費的媒體內容。�到 https://www.w3.org/TR/encrypted-media/ �得 Encrypted Media Extensions 的更多資訊。
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/l10n/zh-TW/toolkit/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/chrome/mozapps/downloads/downloads.properties	2021-01-18 20:09:52.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=æ—¥
 
 downloadErrorAlertTitle=下載錯誤
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=由於被 %S �鎖，無法儲存此下載項目。
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=由於被擴充套件�鎖，無法儲存此下載項目。
 downloadErrorGeneric=下載工作無法進行，因為發生未知錯誤。\n\n請�試一次。
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/chrome/mozapps/update/updates.properties firefox-85.0+build1/l10n/zh-TW/toolkit/chrome/mozapps/update/updates.properties
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/chrome/mozapps/update/updates.properties	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/chrome/mozapps/update/updates.properties	2021-01-18 20:09:52.000000000 +0000
@@ -42,3 +42,4 @@
 check_error-2152398920=被 Proxy 代�伺�器拒絕連線
 check_error-2153390069=伺�器憑證�期 (請調整您的系統時間，確定時間與日期是�正確)
 check_error-verification_failed=無法確�更新檔案的完整性
+check_error-move_failed=無法準備�安�的更新
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/about/aboutSupport.ftl firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/about/aboutSupport.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/about/aboutSupport.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -188,6 +188,32 @@
 
 ##
 
+support-third-party-modules-title = 第三方模組
+support-third-party-modules-module = 模組檔案
+support-third-party-modules-version = 檔案版本
+support-third-party-modules-vendor = 供應商資訊
+support-third-party-modules-occurrence = 次數
+support-third-party-modules-process = 程�類型與 ID
+support-third-party-modules-thread = 執行緒
+support-third-party-modules-base = Imagebase �置
+support-third-party-modules-uptime = 程�執行時間（ms）
+support-third-party-modules-duration = 載入時間長度（ms）
+support-third-party-modules-empty = 並未載入任何第三方模組。
+support-third-party-modules-no-value = （沒有值）
+support-third-party-modules-button-open =
+    .title = 開啟檔案�置…
+support-third-party-modules-expand =
+    .title = 顯示詳細資訊
+support-third-party-modules-collapse =
+    .title = 摺疊詳細資訊
+support-third-party-modules-unsigned-icon =
+    .title = 此模組未經簽署
+support-third-party-modules-folder-icon =
+    .title = 開啟檔案�置…
+support-third-party-modules-down-icon =
+    .title = 顯示詳細資訊
+support-third-party-modules-up-icon =
+    .title = 摺疊詳細資訊
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days = 最近 { $days } 天內的錯誤資訊報表
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/featuregates/features.ftl firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/featuregates/features.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/featuregates/features.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/featuregates/features.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -98,3 +98,6 @@
 experimental-features-multi-pip =
     .label = 支�多組��畫�
 experimental-features-multi-pip-description = 實驗性支��時開啟多組��畫�。
+experimental-features-http3 =
+    .label = HTTP/3 protocol
+experimental-features-http3-description = 實驗性支� HTTP/3 通訊�定。
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/printing/printPreview.ftl firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/printing/printPreview.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/printing/printPreview.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -38,6 +38,10 @@
 printpreview-page =
     .value = é �:
     .accesskey = a
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = 第 { $sheetNum } �，共 { $sheetCount } �
 
 ## Variables
 ## $percent (integer) - menuitem percent label
@@ -57,4 +61,11 @@
 printpreview-endarrow =
     .label = { $arrow }
     .tooltiptext = 最後一�
-
+printpreview-homearrow-button =
+    .title = 第一�
+printpreview-previousarrow-button =
+    .title = 上一�
+printpreview-nextarrow-button =
+    .title = 下一�
+printpreview-endarrow-button =
+    .title = 最後一�
diff -Nru firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/printing/printUI.ftl firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/l10n/zh-TW/toolkit/toolkit/printing/printUI.ftl	2021-01-06 12:03:51.000000000 +0000
+++ firefox-85.0+build1/l10n/zh-TW/toolkit/toolkit/printing/printUI.ftl	2021-01-18 20:09:52.000000000 +0000
@@ -24,6 +24,9 @@
 # This label is displayed between the input fields indicating
 # the start and end page of the range to print.
 printui-range-end = 到
+printui-page-custom-range-input =
+    .aria-label = 輸入自訂��範�
+    .placeholder = 例如 2-6, 9, 12-16
 # Section title for the number of copies to print
 printui-copies-label = 份數
 printui-orientation = 方�
@@ -47,6 +50,7 @@
 printui-options = �項
 printui-headers-footers-checkbox = 列��首與�尾
 printui-backgrounds-checkbox = 列�背景
+printui-selection-checkbox = ����範�
 printui-color-mode-label = 色彩模�
 printui-color-mode-color = 彩色
 printui-color-mode-bw = 黑白
@@ -55,19 +59,29 @@
 printui-margins-min = 最�
 printui-margins-none = ç„¡
 printui-margins-custom = 自訂
+printui-margins-custom-inches = 自訂（英寸）
 printui-margins-custom-top = 頂端
+printui-margins-custom-top-inches = 頂端（英寸）
 printui-margins-custom-bottom = 底端
+printui-margins-custom-bottom-inches = 底端（英寸）
 printui-margins-custom-left = 左邊
+printui-margins-custom-left-inches = 左方（英寸）
 printui-margins-custom-right = �邊
+printui-margins-custom-right-inches = �方（英寸）
 printui-system-dialog-link = 使用系統�話框列�…
 printui-primary-button = 列�
 printui-primary-button-save = 儲存
 printui-cancel-button = �消
+printui-close-button = 關閉
 printui-loading = 正在準備�覽列�
 # Reported by screen readers and other accessibility tools to indicate that
 # the print preview has focus.
 printui-preview-label =
     .aria-label = �覽列�
+printui-pages-per-sheet = �張紙��的��數
+# This is shown next to the Print button with an indefinite loading spinner
+# when the user prints a page and it is being sent to the printer.
+printui-print-progress-indicator = 列�中…
 
 ## Paper sizes that may be supported by the Save to PDF destination:
 
diff -Nru firefox-84.0.2+build1/layout/base/AccessibleCaret.cpp firefox-85.0+build1/layout/base/AccessibleCaret.cpp
--- firefox-84.0.2+build1/layout/base/AccessibleCaret.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/AccessibleCaret.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -281,6 +281,10 @@
                         : PositionChangedResult::Position;
 }
 
+nsIFrame* AccessibleCaret::RootFrame() const {
+  return mPresShell->GetRootFrame();
+}
+
 nsIFrame* AccessibleCaret::CustomContentContainerFrame() const {
   nsCanvasFrame* canvasFrame = mPresShell->GetCanvasFrame();
   Element* container = canvasFrame->GetCustomContentContainer();
diff -Nru firefox-84.0.2+build1/layout/base/AccessibleCaret.h firefox-85.0+build1/layout/base/AccessibleCaret.h
--- firefox-84.0.2+build1/layout/base/AccessibleCaret.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/AccessibleCaret.h	2021-01-18 19:58:16.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/AnonymousContent.h"
-#include "mozilla/dom/Element.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMEventListener.h"
 #include "nsIFrame.h"  // for WeakFrame only
@@ -26,6 +25,7 @@
 namespace mozilla {
 class PresShell;
 namespace dom {
+class Element;
 class Event;
 }  // namespace dom
 
@@ -159,7 +159,7 @@
     return mCaretElementHolder->GetElementById(sCaretImageElementId);
   }
 
-  nsIFrame* RootFrame() const { return mPresShell->GetRootFrame(); }
+  nsIFrame* RootFrame() const;
 
   nsIFrame* CustomContentContainerFrame() const;
 
diff -Nru firefox-84.0.2+build1/layout/base/AccessibleCaretManager.cpp firefox-85.0+build1/layout/base/AccessibleCaretManager.cpp
--- firefox-84.0.2+build1/layout/base/AccessibleCaretManager.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/AccessibleCaretManager.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -29,6 +29,8 @@
 #include "nsFrameSelection.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIHapticFeedback.h"
+#include "nsIScrollableFrame.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 
@@ -677,10 +679,6 @@
 }
 
 void AccessibleCaretManager::OnScrollEnd() {
-  if (mLastUpdateCaretMode != GetCaretMode()) {
-    return;
-  }
-
   AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
   mAllowFlushingLayout = false;
 
@@ -712,10 +710,6 @@
 }
 
 void AccessibleCaretManager::OnScrollPositionChanged() {
-  if (mLastUpdateCaretMode != GetCaretMode()) {
-    return;
-  }
-
   AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
   mAllowFlushingLayout = false;
 
@@ -740,10 +734,6 @@
 }
 
 void AccessibleCaretManager::OnReflow() {
-  if (mLastUpdateCaretMode != GetCaretMode()) {
-    return;
-  }
-
   AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
   mAllowFlushingLayout = false;
 
@@ -882,7 +872,7 @@
 
 void AccessibleCaretManager::ChangeFocusToOrClearOldFocus(
     nsIFrame* aFrame) const {
-  nsFocusManager* fm = nsFocusManager::GetFocusManager();
+  RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
   MOZ_ASSERT(fm);
 
   if (aFrame) {
diff -Nru firefox-84.0.2+build1/layout/base/AccessibleCaretManager.h firefox-85.0+build1/layout/base/AccessibleCaretManager.h
--- firefox-84.0.2+build1/layout/base/AccessibleCaretManager.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/AccessibleCaretManager.h	2021-01-18 19:58:16.000000000 +0000
@@ -184,7 +184,8 @@
 
   // Change focus to aFrame if it isn't nullptr. Otherwise, clear the old focus
   // then re-focus the window.
-  void ChangeFocusToOrClearOldFocus(nsIFrame* aFrame) const;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void ChangeFocusToOrClearOldFocus(
+      nsIFrame* aFrame) const;
 
   MOZ_CAN_RUN_SCRIPT
   nsresult SelectWord(nsIFrame* aFrame, const nsPoint& aPoint) const;
diff -Nru firefox-84.0.2+build1/layout/base/AutoProfilerStyleMarker.h firefox-85.0+build1/layout/base/AutoProfilerStyleMarker.h
--- firefox-84.0.2+build1/layout/base/AutoProfilerStyleMarker.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/AutoProfilerStyleMarker.h	2021-01-18 19:58:16.000000000 +0000
@@ -8,16 +8,15 @@
 #define mozilla_AutoProfilerStyleMarker_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/ProfilerMarkers.h"
 #include "mozilla/ServoTraversalStatistics.h"
 #include "mozilla/TimeStamp.h"
-#include "GeckoProfiler.h"
-#include "ProfilerMarkerPayload.h"
 
 namespace mozilla {
 
 class MOZ_RAII AutoProfilerStyleMarker {
  public:
-  explicit AutoProfilerStyleMarker(UniqueProfilerBacktrace aCause,
+  explicit AutoProfilerStyleMarker(UniquePtr<ProfileChunkedBuffer> aCause,
                                    const Maybe<uint64_t>& aInnerWindowID)
       : mActive(profiler_can_accept_markers()),
         mStartTime(TimeStamp::Now()),
@@ -36,17 +35,57 @@
     if (!mActive) {
       return;
     }
+
+    struct StyleMarker {
+      static constexpr mozilla::Span<const char> MarkerTypeName() {
+        return mozilla::MakeStringSpan("Styles");
+      }
+      static void StreamJSONMarkerData(
+          baseprofiler::SpliceableJSONWriter& aWriter,
+          uint32_t aElementsTraversed, uint32_t aElementsStyled,
+          uint32_t aElementsMatched, uint32_t aStylesShared,
+          uint32_t aStylesReused) {
+        aWriter.IntProperty("elementsTraversed", aElementsTraversed);
+        aWriter.IntProperty("elementsStyled", aElementsStyled);
+        aWriter.IntProperty("elementsMatched", aElementsMatched);
+        aWriter.IntProperty("stylesShared", aStylesShared);
+        aWriter.IntProperty("stylesReused", aStylesReused);
+      }
+      static MarkerSchema MarkerTypeDisplay() {
+        using MS = MarkerSchema;
+        MS schema{MS::Location::markerChart, MS::Location::markerTable,
+                  MS::Location::timelineOverview};
+        schema.AddKeyLabelFormat("elementsTraversed", "Elements traversed",
+                                 MS::Format::integer);
+        schema.AddKeyLabelFormat("elementsStyled", "Elements styled",
+                                 MS::Format::integer);
+        schema.AddKeyLabelFormat("elementsMatched", "Elements matched",
+                                 MS::Format::integer);
+        schema.AddKeyLabelFormat("stylesShared", "Styles shared",
+                                 MS::Format::integer);
+        schema.AddKeyLabelFormat("stylesReused", "Styles reused",
+                                 MS::Format::integer);
+        return schema;
+      }
+    };
+
     ServoTraversalStatistics::sActive = false;
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "Styles", LAYOUT, StyleMarkerPayload,
-        (mStartTime, TimeStamp::Now(), std::move(mCause),
-         ServoTraversalStatistics::sSingleton, mInnerWindowID));
+    profiler_add_marker("Styles", geckoprofiler::category::LAYOUT,
+                        {MarkerTiming::IntervalUntilNowFrom(mStartTime),
+                         MarkerStack::TakeBacktrace(std::move(mCause)),
+                         MarkerInnerWindowId(mInnerWindowID)},
+                        StyleMarker{},
+                        ServoTraversalStatistics::sSingleton.mElementsTraversed,
+                        ServoTraversalStatistics::sSingleton.mElementsStyled,
+                        ServoTraversalStatistics::sSingleton.mElementsMatched,
+                        ServoTraversalStatistics::sSingleton.mStylesShared,
+                        ServoTraversalStatistics::sSingleton.mStylesReused);
   }
 
  private:
   bool mActive;
   TimeStamp mStartTime;
-  UniqueProfilerBacktrace mCause;
+  UniquePtr<ProfileChunkedBuffer> mCause;
   Maybe<uint64_t> mInnerWindowID;
 };
 
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/1676301-1.html firefox-85.0+build1/layout/base/crashtests/1676301-1.html
--- firefox-84.0.2+build1/layout/base/crashtests/1676301-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/1676301-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,16 @@
+<style>
+#a { max-width: 1 }
+</style>
+<script>
+function go() {
+  a.value = ">"
+  a.selectionDirection = "foo"
+  b.requestFullscreen()
+  document.createElement("body").onresize = () => { a.selectionEnd = 0 }
+  setTimeout(window.close, 100)
+}
+</script>
+<body onload=go()>
+<textarea id="a"></textarea>
+<ol id="b">
+<div>
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/363729-1.html firefox-85.0+build1/layout/base/crashtests/363729-1.html
--- firefox-84.0.2+build1/layout/base/crashtests/363729-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/363729-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,3 +1,3 @@
 <html class="reftest-paged">
 <body>
-<b onfocus="event.target.setAttribute('tabindex', Math.floor(Math.random()*5)-9)"display: inline-table;position: fixed;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: always;page-break-inside: inherit; style="display: inline-table;position: fixed;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: always;page-break-inside: inherit;"><sup rowspan="12"display: table-caption;position: static;overflow: clip;float: auto;direction: ltr;page-break-before: avoid;page-break-after: right;page-break-inside: inherit; style="display: table-caption;position: static;overflow: clip;float: auto;direction: ltr;page-break-before: avoid;page-break-after: right;page-break-inside: inherit;"><bdo onfocus="event.target.parentNode.removeChild(event.target)"display: table-footer-group;position: absolute;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: right;page-break-inside: auto; style="display: table-footer-group;position: absolute;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: right;page-break-inside: auto;"><dir tabindex="12"display: -moz-grid;position: static;overflow: auto;float: left;direction: ltr;page-break-before: avoid;page-break-after: inherit;page-break-inside: inherit; style="display: -moz-grid;position: static;overflow: auto;float: left;direction: ltr;page-break-before: avoid;page-break-after: inherit;page-break-inside: inherit;"><i rowspan="1"display: -moz-stack;position: fixed;overflow: visible;float: right;direction: rtl;page-break-before: right;page-break-after: always;page-break-inside: avoid; style="display: -moz-stack;position: fixed;overflow: visible;float: right;direction: rtl;page-break-before: right;page-break-after: always;page-break-inside: avoid;"><select colspan="1"display: block;position: absolute;overflow: hidden;float: right;direction: auto;page-break-before: auto;page-break-after: avoid;page-break-inside: auto; style="display: block;position: absolute;overflow: hidden;float: right;direction: auto;page-break-before: auto;page-break-after: avoid;page-break-inside: auto;"></abbr></var></u></base></em></button></optgroup></menu></body>
+<b onfocus="event.target.setAttribute('tabindex', Math.floor(Math.random()*5)-9)"display: inline-table;position: fixed;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: always;page-break-inside: inherit; style="display: inline-table;position: fixed;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: always;page-break-inside: inherit;"><sup rowspan="12"display: table-caption;position: static;overflow: clip;float: auto;direction: ltr;page-break-before: avoid;page-break-after: right;page-break-inside: inherit; style="display: table-caption;position: static;overflow: clip;float: auto;direction: ltr;page-break-before: avoid;page-break-after: right;page-break-inside: inherit;"><bdo onfocus="event.target.parentNode.removeChild(event.target)"display: table-footer-group;position: absolute;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: right;page-break-inside: auto; style="display: table-footer-group;position: absolute;overflow: hidden;float: left;direction: ltr;page-break-before: right;page-break-after: right;page-break-inside: auto;"><dir tabindex="12"display: -moz-box;position: static;overflow: auto;float: left;direction: ltr;page-break-before: avoid;page-break-after: inherit;page-break-inside: inherit; style="display: -moz-box;position: static;overflow: auto;float: left;direction: ltr;page-break-before: avoid;page-break-after: inherit;page-break-inside: inherit;"><i rowspan="1"display: -moz-stack;position: fixed;overflow: visible;float: right;direction: rtl;page-break-before: right;page-break-after: always;page-break-inside: avoid; style="display: -moz-stack;position: fixed;overflow: visible;float: right;direction: rtl;page-break-before: right;page-break-after: always;page-break-inside: avoid;"><select colspan="1"display: block;position: absolute;overflow: hidden;float: right;direction: auto;page-break-before: auto;page-break-after: avoid;page-break-inside: auto; style="display: block;position: absolute;overflow: hidden;float: right;direction: auto;page-break-before: auto;page-break-after: avoid;page-break-inside: auto;"></abbr></var></u></base></em></button></optgroup></menu></body>
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/367498-1.html firefox-85.0+build1/layout/base/crashtests/367498-1.html
--- firefox-84.0.2+build1/layout/base/crashtests/367498-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/367498-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<html><head>
-</head><body>
-This page should not have a very large height;
-<span style="display: -moz-grid-line;">
-<select></select>
-</span>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/367498-2.html firefox-85.0+build1/layout/base/crashtests/367498-2.html
--- firefox-84.0.2+build1/layout/base/crashtests/367498-2.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/367498-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<html><head>
-</head><body>
-<marquee>
-<div style="border: 1px solid black; -moz-border-radius: 2em;">
-<marquee>
-<span style="display: -moz-grid-line;">
-<select></select>
-</span>
-</marquee>
-</div>
-</marquee>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/373628.html firefox-85.0+build1/layout/base/crashtests/373628.html
--- firefox-84.0.2+build1/layout/base/crashtests/373628.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/373628.html	2021-01-18 19:58:16.000000000 +0000
@@ -18,17 +18,17 @@
 <p>
 </p>
 <q style=" display: table-header-group; ">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
-<s style=" display: -moz-grid-group; position: absolute; direction: rtl;">
+<s style=" display: -moz-box; position: absolute; direction: rtl;">
 </s>
 </q>
 <pre style=" display: -moz-inline-box; position: absolute; direction: ltr;">
 <q style=" display: table-header-group; ">
-<s style=" display: -moz-grid-group; position: absolute; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<s style=" display: -moz-box; position: absolute; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
 </q>
 <ol style=" display: block; direction: rtl;">
 <q style=" display: table-header-group; ">
-<s style=" display: -moz-grid-group; position: absolute; direction: rtl;">
+<s style=" display: -moz-box; position: absolute; direction: rtl;">
 <q style=" display: table-cell; ">
 </q>
 </s>
@@ -38,7 +38,7 @@
 </pre>
 </nobr>
 <q style=" display: table-header-group; ">
-<s style=" display: -moz-grid-group; position: absolute; direction: rtl;">
+<s style=" display: -moz-box; position: absolute; direction: rtl;">
 <q style=" display: table-cell; ">
 <s style=" display: -moz-box; position: absolute; direction: ltr;">
 <q style=" display: table; direction: ltr;">
@@ -53,7 +53,7 @@
 </p>
 <pre style=" display: inline; position: absolute; float: left; direction: ltr;">
 <q style=" display: table-header-group; ">
-<s style=" display: -moz-grid-group; position: absolute; direction: rtl;">
+<s style=" display: -moz-box; position: absolute; direction: rtl;">
 <q style=" display: table-cell; ">
 <s style=" display: -moz-box; position: absolute; direction: ltr;">
 <q style=" display: table; direction: ltr;">
@@ -102,7 +102,7 @@
 </samp>
 <p>
 </p>
-<p style=" display: -moz-grid; direction: rtl;">
+<p style=" display: -moz-box; direction: rtl;">
 <q style=" display: table-header-group; ">
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
@@ -123,7 +123,7 @@
 <bdo style=" display: block;">
 <bdo style=" display: -moz-inline-box; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </bdo>
-<q style=" display: -moz-grid-group; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<q style=" display: -moz-box; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 </bdo>
@@ -139,7 +139,7 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
@@ -166,7 +166,7 @@
 </nobr>
 </small>
 <samp style=" display: -moz-inline-box; direction: rtl;">
-<bdo style=" display: -moz-grid-line;">
+<bdo style=" display: -moz-box;">
 <samp style=" display: table-row;  direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </samp>
 </bdo>
@@ -185,19 +185,19 @@
 </q>
 <pre style=" display: table-row; direction: ltr;">
 <samp style=" display: -moz-inline-box; direction: rtl;">
-<map style=" display: -moz-grid-line; position: fixed; direction: ltr;">
+<map style=" display: -moz-box; position: fixed; direction: ltr;">
 <q style=" display: table-header-group; ">
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<bdo style=" display: -moz-box;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </bdo>
 </s>
 </bdo>
@@ -217,15 +217,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m m
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m m
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 </bdo>
 </bdo>
 </s>
@@ -244,15 +244,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <s style=" display: -moz-stack; position: fixed; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
 </bdo>
@@ -273,15 +273,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <s style=" display: -moz-stack; position: fixed; direction: rtl;">
 <s style=" display: -moz-inline-box;  direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
@@ -305,15 +305,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <s style=" display: -moz-stack; position: fixed; direction: rtl;">
 <s style=" display: -moz-inline-box;  direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
@@ -338,15 +338,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <s style=" display: -moz-stack; position: fixed; direction: rtl;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
@@ -372,15 +372,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <s style=" display: -moz-stack; position: fixed; direction: rtl;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
@@ -410,15 +410,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </q>
@@ -444,15 +444,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </q>
@@ -475,15 +475,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 <samp style=" display: inherit; position: fixed; direction: ltr;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
@@ -549,15 +549,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -594,15 +594,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -635,15 +635,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -651,7 +651,7 @@
 <bdo style=" display: inline-block; direction: rtl;">
 <small style=" display: -moz-inline-box; position: fixed; direction: ltr;">
 <bdo style=" display: table-row-group;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
-<s style=" display: -moz-grid-line; position: fixed;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<s style=" display: -moz-box; position: fixed;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </body>mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </map>
 <ol style="display: inline-block;direction: ltr;">
@@ -695,15 +695,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -736,15 +736,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -776,15 +776,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <q style=" display: list-item; direction: ltr;">
 <s style="overflow: auto; display: inline-table; ">
@@ -804,21 +804,21 @@
 
 </q>
 <nobr style=" display: inherit; position: fixed; direction: rtl;">
-<q style=" display: -moz-grid;  direction: rtl;">
+<q style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table; position: absolute; direction: ltr;">
-<q style=" display: -moz-grid-line; position: absolute;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<q style=" display: -moz-box; position: absolute;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </q>mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
 <s style=" display: inherit; position: fixed; direction: rtl;">
-<small style=" display: -moz-grid-line;">
+<small style=" display: -moz-box;">
 </small>
 </s>
 </q>
-<ol style=" display: -moz-grid;  direction: rtl;">
+<ol style=" display: -moz-box;  direction: rtl;">
 <pre style=" display: table-column-group; position: absolute;">
-<q style=" display: -moz-grid;  direction: rtl;">
+<q style=" display: -moz-box;  direction: rtl;">
 <s style=" display: inherit; position: fixed; direction: rtl;">
-<small style=" display: -moz-grid-line;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
+<small style=" display: -moz-box;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </small>mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </s>
 <samp style=" display: table-column-group; ">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
@@ -826,20 +826,20 @@
 </q>
 </pre>
 </ol>
-<q style=" display: -moz-grid;  direction: rtl;">
+<q style=" display: -moz-box;  direction: rtl;">
 <bdo style=" display: inline-block; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </bdo>
 </q>
 <p>
 </p>
-<q style=" display: -moz-grid;  direction: rtl;">
+<q style=" display: -moz-box;  direction: rtl;">
 <bdo style=" display: inline-block; direction: rtl;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 <samp style=" display: inline-block; ">
 </samp>
 </bdo>
 </q>
-<p style=" display: -moz-grid-group; position: absolute; direction: rtl;">
-<q style=" display: -moz-grid;  direction: rtl;">
+<p style=" display: -moz-box; position: absolute; direction: rtl;">
+<q style=" display: -moz-box;  direction: rtl;">
 <bdo style=" display: inline-block; direction: rtl;">
 <bdo style=" display: table-row-group;">mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m mm m 
 </bdo>
@@ -876,15 +876,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <s style="overflow: auto; display: inline-table; ">
 <s style=" display: table-column-group; direction: rtl;">
@@ -915,15 +915,15 @@
 <q style=" display: table-cell; ">
 <q style=" display: table; direction: ltr;">
 <bdo style=" display: block;">
-<q style=" display: -moz-grid-group; direction: rtl;">
+<q style=" display: -moz-box; direction: rtl;">
 <q style=" display: -moz-inline-box; position: absolute; direction: rtl;">
 <bdo style=" display: -moz-box;  direction: rtl;">
 <s style=" display: table-row; position: fixed; direction: rtl;">
 <bdo style=" display: table-column; position: absolute; direction: ltr;">
 <bdo style=" display: inline-table;  direction: ltr;">
 <s style=" display: table-cell;">
-<bdo style=" display: -moz-grid-line;">
-<bdo style="overflow: scroll; display: -moz-grid; float: right;">
+<bdo style=" display: -moz-box;">
+<bdo style="overflow: scroll; display: -moz-box; float: right;">
 <bdo style="overflow: hidden; display: -moz-popup; ">
 <s style="overflow: auto; display: inline-table; ">
 <s style=" display: table-column-group; direction: rtl;">
@@ -931,3 +931,4 @@
 <bdo style=" display: table-row-group;">
 </body>
 </html>
+
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/487544-1.html firefox-85.0+build1/layout/base/crashtests/487544-1.html
--- firefox-84.0.2+build1/layout/base/crashtests/487544-1.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/487544-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html><body style="display: -moz-grid-group;"><br style="position: fixed;"></body></html>
diff -Nru firefox-84.0.2+build1/layout/base/crashtests/crashtests.list firefox-85.0+build1/layout/base/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/base/crashtests/crashtests.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/crashtests/crashtests.list	2021-01-18 19:58:16.000000000 +0000
@@ -133,8 +133,6 @@
 load 366967-1.html
 load 367015-1.html
 load 367243-1.html
-load 367498-1.html
-load 367498-2.html
 load 369176-1.html
 load 369547-1.html
 load 369547-2.html
@@ -275,7 +273,6 @@
 load 481806-1.html
 load 483604-1.xhtml
 load 485501-1.html
-load 487544-1.html
 load 488390-1.xhtml
 load 489691.html
 load 490376-1.xhtml
@@ -557,3 +554,4 @@
 load 1599518.html
 load 1599532.html
 pref(layout.accessiblecaret.enabled,true) load 1606492.html
+load 1676301-1.html
diff -Nru firefox-84.0.2+build1/layout/base/DisplayPortUtils.cpp firefox-85.0+build1/layout/base/DisplayPortUtils.cpp
--- firefox-84.0.2+build1/layout/base/DisplayPortUtils.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/DisplayPortUtils.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "FrameMetrics.h"
 #include "Layers.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/layers/APZCCallbackHelper.h"
@@ -15,6 +16,7 @@
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "mozilla/layers/PAPZ.h"
 #include "mozilla/layers/RepaintRequest.h"
+#include "mozilla/PresShell.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "nsDeckFrame.h"
 #include "nsIScrollableFrame.h"
diff -Nru firefox-84.0.2+build1/layout/base/GeometryUtils.h firefox-85.0+build1/layout/base/GeometryUtils.h
--- firefox-84.0.2+build1/layout/base/GeometryUtils.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/base/GeometryUtils.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef MOZILLA_GEOMETRYUTILS_H_
 #define MOZILLA_GEOMETRYUTILS_H_
 
-#include "mozilla/ErrorResult.h"
 #include "nsTArray.h"
 #include "nsCOMPtr.h"
 
@@ -19,6 +18,7 @@
 class nsINode;
 
 namespace mozilla {
+class ErrorResult;
 
 namespace dom {
 struct BoxQuadOptions;
diff -Nru firefox-84.0.2+build1/layout/base/gtest/TestAccessibleCaretManager.cpp firefox-85.0+build1/layout/base/gtest/TestAccessibleCaretManager.cpp
--- firefox-84.0.2+build1/layout/base/gtest/TestAccessibleCaretManager.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/gtest/TestAccessibleCaretManager.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -100,6 +100,7 @@
     }
 
     bool IsTerminated() const override { return false; }
+    bool IsScrollStarted() const { return mIsScrollStarted; }
 
     MOCK_CONST_METHOD0(GetCaretMode, CaretMode());
     MOCK_METHOD1(DispatchCaretStateChangedEvent,
@@ -716,6 +717,11 @@
     EXPECT_CALL(check, Call("scrollend3"));
   }
 
+  // Simulate a pinch-zoom operation before tapping on an empty content.
+  mManager.OnScrollStart();
+  mManager.OnScrollEnd();
+  EXPECT_EQ(mManager.IsScrollStarted(), false);
+
   // Simulate a single tap on an empty content.
   mManager.UpdateCarets();
   EXPECT_EQ(FirstCaretAppearance(), Appearance::NormalNotShown);
diff -Nru firefox-84.0.2+build1/layout/base/MobileViewportManager.h firefox-85.0+build1/layout/base/MobileViewportManager.h
--- firefox-84.0.2+build1/layout/base/MobileViewportManager.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/MobileViewportManager.h	2021-01-18 19:58:16.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Maybe.h"
 #include "mozilla/MVMContext.h"
+#include "mozilla/PresShellForwards.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMEventListener.h"
 #include "nsIObserver.h"
diff -Nru firefox-84.0.2+build1/layout/base/MotionPathUtils.h firefox-85.0+build1/layout/base/MotionPathUtils.h
--- firefox-84.0.2+build1/layout/base/MotionPathUtils.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/MotionPathUtils.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,7 +7,9 @@
 #ifndef mozilla_MotionPathUtils_h
 #define mozilla_MotionPathUtils_h
 
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Rect.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ServoStyleConsts.h"
 #include "Units.h"
diff -Nru firefox-84.0.2+build1/layout/base/MVMContext.h firefox-85.0+build1/layout/base/MVMContext.h
--- firefox-84.0.2+build1/layout/base/MVMContext.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/MVMContext.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,10 +7,10 @@
 
 #include "Units.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/PresShellForwards.h"
 #include "nsISupportsImpl.h"
 #include "nsStringFwd.h"
 #include "nsViewportInfo.h"
-#include "PresShell.h"
 
 class nsIDOMEventListener;
 class nsIObserver;
diff -Nru firefox-84.0.2+build1/layout/base/nsCSSFrameConstructor.cpp firefox-85.0+build1/layout/base/nsCSSFrameConstructor.cpp
--- firefox-84.0.2+build1/layout/base/nsCSSFrameConstructor.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsCSSFrameConstructor.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -30,6 +30,7 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
 #include "mozilla/PrintedSheetFrame.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoStyleSetInlines.h"
 #include "mozilla/StaticPrefs_layout.h"
@@ -129,6 +130,10 @@
 #include "nsTextNode.h"
 #include "ActiveLayerTracker.h"
 
+#ifdef MOZ_GECKO_PROFILER
+#  include "mozilla/ProfilerMarkerTypes.h"
+#endif
+
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -245,13 +250,6 @@
 
 nsIFrame* NS_NewTreeBodyFrame(PresShell* aPresShell, ComputedStyle* aStyle);
 
-// grid
-nsresult NS_NewGridLayout2(nsBoxLayout** aNewLayout);
-nsIFrame* NS_NewGridRowLeafFrame(PresShell* aPresShell, ComputedStyle* aStyle);
-nsIFrame* NS_NewGridRowGroupFrame(PresShell* aPresShell, ComputedStyle* aStyle);
-
-// end grid
-
 nsIFrame* NS_NewTitleBarFrame(PresShell* aPresShell, ComputedStyle* aStyle);
 
 nsIFrame* NS_NewResizerFrame(PresShell* aPresShell, ComputedStyle* aStyle);
@@ -3991,13 +3989,6 @@
 #define SCROLLABLE_XUL_CREATE(_tag, _func) \
   { nsGkAtoms::_tag, SCROLLABLE_XUL_FCDATA(_func) }
 
-static nsIFrame* NS_NewGridBoxFrame(PresShell* aPresShell,
-                                    ComputedStyle* aComputedStyle) {
-  nsCOMPtr<nsBoxLayout> layout;
-  NS_NewGridLayout2(getter_AddRefs(layout));
-  return NS_NewBoxFrame(aPresShell, aComputedStyle, false, layout);
-}
-
 /* static */
 const nsCSSFrameConstructor::FrameConstructionData*
 nsCSSFrameConstructor::FindXULTagData(const Element& aElement,
@@ -4408,7 +4399,8 @@
     case StyleDisplayInside::MozBox: {
       if (!aElement.IsInNativeAnonymousSubtree() &&
           aElement.OwnerDoc()->IsContentDocument()) {
-        aElement.OwnerDoc()->WarnOnceAbout(Document::eMozBoxOrInlineBoxDisplay);
+        aElement.OwnerDoc()->WarnOnceAbout(
+            DeprecatedOperations::eMozBoxOrInlineBoxDisplay);
       }
 
       // If we're emulating -moz-box with flexbox, then treat it as non-XUL and
@@ -4477,21 +4469,6 @@
       return &data;
     }
 #ifdef MOZ_XUL
-    case StyleDisplayInside::MozGrid: {
-      static const FrameConstructionData data =
-          SCROLLABLE_XUL_FCDATA(NS_NewGridBoxFrame);
-      return &data;
-    }
-    case StyleDisplayInside::MozGridGroup: {
-      static const FrameConstructionData data =
-          SCROLLABLE_XUL_FCDATA(NS_NewGridRowGroupFrame);
-      return &data;
-    }
-    case StyleDisplayInside::MozGridLine: {
-      static const FrameConstructionData data =
-          SCROLLABLE_XUL_FCDATA(NS_NewGridRowLeafFrame);
-      return &data;
-    }
     case StyleDisplayInside::MozStack: {
       static const FrameConstructionData data =
           SCROLLABLE_XUL_FCDATA(NS_NewStackFrame);
@@ -8194,9 +8171,8 @@
 bool nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(
     nsIFrame* aFrame) {
 #define TRACE(reason)                                                       \
-  PROFILER_TRACING_MARKER("Layout",                                         \
-                          "MaybeRecreateContainerForFrameRemoval: " reason, \
-                          LAYOUT, TRACING_EVENT)
+  PROFILER_MARKER("MaybeRecreateContainerForFrameRemoval: " reason, LAYOUT, \
+                  {}, Tracing, "Layout")
   MOZ_ASSERT(aFrame, "Must have a frame");
   MOZ_ASSERT(aFrame->GetParent(), "Frame shouldn't be root");
   MOZ_ASSERT(aFrame == aFrame->FirstContinuation(),
@@ -10719,9 +10695,8 @@
     // some of them have column-span:all descendants. Sadly, there's no way to
     // detect this by checking FrameConstructionItems in WipeContainingBlock().
     // Otherwise, we would have already wiped the multi-column containing block.
-    PROFILER_TRACING_MARKER(
-        "Layout", "Reframe multi-column after constructing frame list", LAYOUT,
-        TRACING_EVENT);
+    PROFILER_MARKER("Reframe multi-column after constructing frame list",
+                    LAYOUT, {}, Tracing, "Layout");
 
     // aFrameList can contain placeholder frames. In order to destroy their
     // associated out-of-flow frames properly, we need to manually flush all the
@@ -11046,9 +11021,9 @@
 }
 
 bool nsCSSFrameConstructor::WipeInsertionParent(nsContainerFrame* aFrame) {
-#define TRACE(reason)                                                       \
-  PROFILER_TRACING_MARKER("Layout", "WipeInsertionParent: " reason, LAYOUT, \
-                          TRACING_EVENT)
+#define TRACE(reason)                                                  \
+  PROFILER_MARKER("WipeInsertionParent: " reason, LAYOUT, {}, Tracing, \
+                  "Layout");
 
   const LayoutFrameType frameType = aFrame->Type();
 
@@ -11108,9 +11083,9 @@
     nsFrameConstructorState& aState, nsIFrame* aContainingBlock,
     nsIFrame* aFrame, FrameConstructionItemList& aItems, bool aIsAppend,
     nsIFrame* aPrevSibling) {
-#define TRACE(reason)                                                       \
-  PROFILER_TRACING_MARKER("Layout", "WipeContainingBlock: " reason, LAYOUT, \
-                          TRACING_EVENT)
+#define TRACE(reason)                                                  \
+  PROFILER_MARKER("WipeContainingBlock: " reason, LAYOUT, {}, Tracing, \
+                  "Layout");
 
   if (aItems.IsEmpty()) {
     return false;
diff -Nru firefox-84.0.2+build1/layout/base/nsDocumentViewer.cpp firefox-85.0+build1/layout/base/nsDocumentViewer.cpp
--- firefox-84.0.2+build1/layout/base/nsDocumentViewer.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsDocumentViewer.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -23,6 +23,7 @@
 #include "nsIContentViewer.h"
 #include "nsIDocumentViewerPrint.h"
 #include "nsIScreen.h"
+#include "mozilla/dom/AutoSuppressEventHandlingAndSuspend.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/BeforeUnloadEvent.h"
 #include "mozilla/dom/PopupBlocker.h"
@@ -46,6 +47,7 @@
 #include "mozilla/Encoding.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/WeakPtr.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_javascript.h"
@@ -3278,19 +3280,9 @@
 static const nsIFrame* GetTargetPageFrame(int32_t aTargetPageNum,
                                           nsPageSequenceFrame* aSequenceFrame) {
   MOZ_ASSERT(aTargetPageNum > 0 &&
-             aTargetPageNum < aSequenceFrame->PrincipalChildList().GetLength());
-
-  int32_t pageNum = 1;
-  for (const nsIFrame* sheetFrame : aSequenceFrame->PrincipalChildList()) {
-    if (pageNum == aTargetPageNum) {
-      return sheetFrame;
-    }
-    pageNum++;
-  }
-
-  MOZ_ASSERT_UNREACHABLE("Should have found the target frame");
-
-  return nullptr;
+             aTargetPageNum <=
+                 aSequenceFrame->PrincipalChildList().GetLength());
+  return aSequenceFrame->PrincipalChildList().FrameAt(aTargetPageNum - 1);
 }
 
 // Calculate the scroll position where the center of |aFrame| is positioned at
@@ -3361,7 +3353,7 @@
       break;
     }
     case nsIWebBrowserPrint::PRINTPREVIEW_GOTO_PAGENUM: {
-      if (aPageNum < 0 || aPageNum > sheetCount) {
+      if (aPageNum <= 0 || aPageNum > sheetCount) {
         return NS_ERROR_INVALID_ARG;
       }
 
diff -Nru firefox-84.0.2+build1/layout/base/nsLayoutHistoryState.cpp firefox-85.0+build1/layout/base/nsLayoutHistoryState.cpp
--- firefox-84.0.2+build1/layout/base/nsLayoutHistoryState.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsLayoutHistoryState.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsILayoutHistoryState.h"
 #include "nsWeakReference.h"
 #include "nsClassHashtable.h"
+#include "nsDataHashtable.h"
 #include "mozilla/PresState.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/layout/base/nsLayoutUtils.cpp firefox-85.0+build1/layout/base/nsLayoutUtils.cpp
--- firefox-84.0.2+build1/layout/base/nsLayoutUtils.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsLayoutUtils.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -28,6 +28,7 @@
 #include "ImageRegion.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"
+#include "Layers.h"
 #include "LayoutLogging.h"
 #include "MobileViewportManager.h"
 #include "mozilla/AccessibleCaretEventHub.h"
@@ -547,7 +548,7 @@
 }
 
 void nsLayoutUtils::UnionChildOverflow(nsIFrame* aFrame,
-                                       nsOverflowAreas& aOverflowAreas,
+                                       OverflowAreas& aOverflowAreas,
                                        FrameChildListIDs aSkipChildLists) {
   // Iterate over all children except pop-ups.
   FrameChildListIDs skip(aSkipChildLists);
@@ -558,7 +559,7 @@
       continue;
     }
     for (nsIFrame* child : list) {
-      nsOverflowAreas childOverflow =
+      OverflowAreas childOverflow =
           child->GetOverflowAreas() + child->GetPosition();
       aOverflowAreas.UnionWith(childOverflow);
     }
@@ -1099,7 +1100,7 @@
   // TODO: remove the uglyness, see bug 598468.
   NS_ASSERTION(gPreventAssertInCompareTreePosition || parent,
                "no common ancestor at all???");
-#endif            // DEBUG
+#endif  // DEBUG
   if (!parent) {  // different documents??
     return 0;
   }
@@ -2044,13 +2045,13 @@
   return ctm;
 }
 
-gfxSize nsLayoutUtils::GetTransformToAncestorScale(nsIFrame* aFrame) {
+gfxSize nsLayoutUtils::GetTransformToAncestorScale(const nsIFrame* aFrame) {
   Matrix4x4Flagged transform = GetTransformToAncestor(
       RelativeTo{aFrame},
       RelativeTo{nsLayoutUtils::GetDisplayRootFrame(aFrame)});
   Matrix transform2D;
   if (transform.Is2D(&transform2D)) {
-    return ThebesMatrix(transform2D).ScaleFactors(true);
+    return ThebesMatrix(transform2D).ScaleFactors();
   }
   return gfxSize(1, 1);
 }
@@ -2086,7 +2087,7 @@
       aFrame, nsLayoutUtils::GetDisplayRootFrame(aFrame));
   Matrix transform2D;
   if (transform.Is2D(&transform2D)) {
-    return ThebesMatrix(transform2D).ScaleFactors(true);
+    return ThebesMatrix(transform2D).ScaleFactors();
   }
   return gfxSize(1, 1);
 }
@@ -2640,8 +2641,7 @@
 #endif
 
 nsIFrame* nsLayoutUtils::GetFrameForPoint(
-    RelativeTo aRelativeTo, nsPoint aPt,
-    EnumSet<FrameForPointOption> aOptions) {
+    RelativeTo aRelativeTo, nsPoint aPt, const FrameForPointOptions& aOptions) {
   AUTO_PROFILER_LABEL("nsLayoutUtils::GetFrameForPoint", LAYOUT);
 
   nsresult rv;
@@ -2652,9 +2652,10 @@
   return outFrames.Length() ? outFrames.ElementAt(0) : nullptr;
 }
 
-nsresult nsLayoutUtils::GetFramesForArea(
-    RelativeTo aRelativeTo, const nsRect& aRect,
-    nsTArray<nsIFrame*>& aOutFrames, EnumSet<FrameForPointOption> aOptions) {
+nsresult nsLayoutUtils::GetFramesForArea(RelativeTo aRelativeTo,
+                                         const nsRect& aRect,
+                                         nsTArray<nsIFrame*>& aOutFrames,
+                                         const FrameForPointOptions& aOptions) {
   AUTO_PROFILER_LABEL("nsLayoutUtils::GetFramesForArea", LAYOUT);
 
   nsIFrame* frame = const_cast<nsIFrame*>(aRelativeTo.mFrame);
@@ -2664,10 +2665,10 @@
   builder.BeginFrame();
   nsDisplayList list;
 
-  if (aOptions.contains(FrameForPointOption::IgnorePaintSuppression)) {
+  if (aOptions.mBits.contains(FrameForPointOption::IgnorePaintSuppression)) {
     builder.IgnorePaintSuppression();
   }
-  if (aOptions.contains(FrameForPointOption::IgnoreRootScrollFrame)) {
+  if (aOptions.mBits.contains(FrameForPointOption::IgnoreRootScrollFrame)) {
     nsIFrame* rootScrollFrame = frame->PresShell()->GetRootScrollFrame();
     if (rootScrollFrame) {
       builder.SetIgnoreScrollFrame(rootScrollFrame);
@@ -2676,12 +2677,13 @@
   if (aRelativeTo.mViewportType == ViewportType::Layout) {
     builder.SetIsRelativeToLayoutViewport();
   }
-  if (aOptions.contains(FrameForPointOption::IgnoreCrossDoc)) {
+  if (aOptions.mBits.contains(FrameForPointOption::IgnoreCrossDoc)) {
     builder.SetDescendIntoSubdocuments(false);
   }
 
-  builder.SetHitTestIsForVisibility(
-      aOptions.contains(FrameForPointOption::OnlyVisible));
+  if (aOptions.mBits.contains(FrameForPointOption::OnlyVisible)) {
+    builder.SetHitTestIsForVisibility(aOptions.mVisibleThreshold);
+  }
 
   builder.EnterPresShell(frame);
 
@@ -3147,10 +3149,8 @@
     builder->IgnorePaintSuppression();
   }
 
-  if (nsIDocShell* doc = presContext->GetDocShell()) {
-    bool isActive = false;
-    doc->GetIsActive(&isActive);
-    builder->SetInActiveDocShell(isActive);
+  if (BrowsingContext* bc = presContext->Document()->GetBrowsingContext()) {
+    builder->SetInActiveDocShell(bc->IsActive());
   }
 
   nsRect rootInkOverflow = aFrame->InkOverflowRectRelativeToSelf();
@@ -4338,12 +4338,16 @@
                  "unknown min block-size unit");
   }
 
-  // Now adjust h for box-sizing styles on the parent.  We never ignore padding
-  // here.  That could conceivably cause some problems with fieldsets (which are
-  // the one place that wants to ignore padding), but solving that here without
-  // hardcoding a check for f being a fieldset-content frame is a bit of a pain.
-  nscoord bSizeTakenByBoxSizing =
-      GetBSizeTakenByBoxSizing(pos->mBoxSizing, f, aHorizontalAxis, false);
+  // Ignore padding if we're an abspos box, as percentages in that case resolve
+  // against the padding box.
+  //
+  // TODO: This could conceivably cause some problems with fieldsets (which are
+  // the other place that wants to ignore padding), but solving that here
+  // without hardcoding a check for f being a fieldset-content frame is a bit of
+  // a pain.
+  const bool ignorePadding = aFrame->IsAbsolutelyPositioned();
+  nscoord bSizeTakenByBoxSizing = GetBSizeTakenByBoxSizing(
+      pos->mBoxSizing, f, aHorizontalAxis, ignorePadding);
   h = std::max(0, h - bSizeTakenByBoxSizing);
 
   aResult = std::max(aStyle.Resolve(h), 0);
@@ -4880,9 +4884,10 @@
         AddStateBitToAncestors(
             aFrame, NS_FRAME_DESCENDANT_INTRINSIC_ISIZE_DEPENDS_ON_BSIZE);
 
+        const bool ignorePadding =
+            (aFlags & IGNORE_PADDING) || aFrame->IsAbsolutelyPositioned();
         nscoord bSizeTakenByBoxSizing = GetDefiniteSizeTakenByBoxSizing(
-            boxSizing, aFrame, !isInlineAxis, aFlags & IGNORE_PADDING,
-            aPercentageBasis);
+            boxSizing, aFrame, !isInlineAxis, ignorePadding, aPercentageBasis);
         // NOTE: This is only the minContentSize if we've been passed
         // MIN_INTRINSIC_ISIZE (which is fine, because this should only be used
         // inside a check for that flag).
@@ -6005,7 +6010,7 @@
   // scale and has integer coordinates. If not, we need these properties to
   // compute the optimal drawn image size, so compute |snappedDestSize| here.
   gfxSize snappedDestSize = dest.Size();
-  gfxSize scaleFactors = currentMatrix.ScaleFactors(true);
+  gfxSize scaleFactors = currentMatrix.ScaleFactors();
   if (!didSnap) {
     snappedDestSize.Scale(scaleFactors.width, scaleFactors.height);
     snappedDestSize.width = NS_round(snappedDestSize.width);
@@ -6096,7 +6101,7 @@
     // follow the pattern that we take |currentMatrix| into account only if
     // |didSnap| is true.
     gfxSize unsnappedDestSize =
-        didSnap ? devPixelDest.Size() * currentMatrix.ScaleFactors(true)
+        didSnap ? devPixelDest.Size() * currentMatrix.ScaleFactors()
                 : devPixelDest.Size();
 
     gfxRect anchoredDestRect(anchorPoint, unsnappedDestSize);
@@ -7822,7 +7827,7 @@
 
 /* static */
 bool nsLayoutUtils::GetContentViewerSize(
-    nsPresContext* aPresContext, LayoutDeviceIntSize& aOutSize,
+    const nsPresContext* aPresContext, LayoutDeviceIntSize& aOutSize,
     SubtractDynamicToolbar aSubtractDynamicToolbar) {
   nsCOMPtr<nsIDocShell> docShell = aPresContext->GetDocShell();
   if (!docShell) {
@@ -7856,7 +7861,7 @@
 }
 
 bool nsLayoutUtils::UpdateCompositionBoundsForRCDRSF(
-    ParentLayerRect& aCompBounds, nsPresContext* aPresContext) {
+    ParentLayerRect& aCompBounds, const nsPresContext* aPresContext) {
   SubtractDynamicToolbar shouldSubtractDynamicToolbar =
       SubtractDynamicToolbar::Yes;
 
@@ -7892,7 +7897,7 @@
 
 /* static */
 nsMargin nsLayoutUtils::ScrollbarAreaToExcludeFromCompositionBoundsFor(
-    nsIFrame* aScrollFrame) {
+    const nsIFrame* aScrollFrame) {
   if (!aScrollFrame || !aScrollFrame->GetScrollTargetFrame()) {
     return nsMargin();
   }
@@ -7958,7 +7963,7 @@
 
 /* static */
 CSSSize nsLayoutUtils::CalculateRootCompositionSize(
-    nsIFrame* aFrame, bool aIsRootContentDocRootScrollFrame,
+    const nsIFrame* aFrame, bool aIsRootContentDocRootScrollFrame,
     const FrameMetrics& aMetrics) {
   if (aIsRootContentDocRootScrollFrame) {
     return ViewAs<LayerPixel>(
@@ -8019,7 +8024,7 @@
 
 /* static */
 nsRect nsLayoutUtils::CalculateScrollableRectForFrame(
-    nsIScrollableFrame* aScrollableFrame, nsIFrame* aRootFrame) {
+    const nsIScrollableFrame* aScrollableFrame, const nsIFrame* aRootFrame) {
   nsRect contentBounds;
   if (aScrollableFrame) {
     contentBounds = aScrollableFrame->GetScrollRange();
@@ -8290,12 +8295,13 @@
 
 /* static */
 ScrollMetadata nsLayoutUtils::ComputeScrollMetadata(
-    nsIFrame* aForFrame, nsIFrame* aScrollFrame, nsIContent* aContent,
-    const nsIFrame* aReferenceFrame, LayerManager* aLayerManager,
-    ViewID aScrollParentId, const nsSize& aScrollPortSize,
-    const Maybe<nsRect>& aClipRect, bool aIsRootContent,
+    const nsIFrame* aForFrame, const nsIFrame* aScrollFrame,
+    nsIContent* aContent, const nsIFrame* aReferenceFrame,
+    LayerManager* aLayerManager, ViewID aScrollParentId,
+    const nsSize& aScrollPortSize, const Maybe<nsRect>& aClipRect,
+    bool aIsRootContent,
     const Maybe<ContainerLayerParameters>& aContainerParameters) {
-  nsPresContext* presContext = aForFrame->PresContext();
+  const nsPresContext* presContext = aForFrame->PresContext();
   int32_t auPerDevPixel = presContext->AppUnitsPerDevPixel();
 
   PresShell* presShell = presContext->GetPresShell();
@@ -8305,7 +8311,8 @@
       CSSRect(CSSPoint(), CSSSize::FromAppUnits(aScrollPortSize)));
 
   nsIDocShell* docShell = presContext->GetDocShell();
-  BrowsingContext* bc = docShell ? docShell->GetBrowsingContext() : nullptr;
+  const BrowsingContext* bc =
+      docShell ? docShell->GetBrowsingContext() : nullptr;
   bool isTouchEventsEnabled =
       bc &&
       bc->TouchEventsOverride() == mozilla::dom::TouchEventsOverride::Enabled;
@@ -8341,7 +8348,7 @@
     }
   }
 
-  nsIScrollableFrame* scrollableFrame = nullptr;
+  const nsIScrollableFrame* scrollableFrame = nullptr;
   if (aScrollFrame) scrollableFrame = aScrollFrame->GetScrollTargetFrame();
 
   metrics.SetScrollableRect(
@@ -8450,7 +8457,7 @@
   metrics.SetIsRootContent(aIsRootContent);
   metadata.SetScrollParentId(aScrollParentId);
 
-  nsIFrame* rootScrollFrame = presShell->GetRootScrollFrame();
+  const nsIFrame* rootScrollFrame = presShell->GetRootScrollFrame();
   bool isRootScrollFrame = aScrollFrame == rootScrollFrame;
   Document* document = presShell->GetDocument();
 
@@ -8472,8 +8479,8 @@
   // For the concept of this and the reason why we need to get this kind of
   // information, see the definition of |mIsAutoDirRootContentRTL| in struct
   // |ScrollMetadata|.
-  Element* bodyElement = document ? document->GetBodyElement() : nullptr;
-  nsIFrame* primaryFrame =
+  const Element* bodyElement = document ? document->GetBodyElement() : nullptr;
+  const nsIFrame* primaryFrame =
       bodyElement ? bodyElement->GetPrimaryFrame() : rootScrollFrame;
   if (!primaryFrame) {
     primaryFrame = rootScrollFrame;
@@ -8536,7 +8543,7 @@
   // its origin relative to the reference frame.
   // If aScrollFrame is null, we are in a document without a root scroll frame,
   // so it's a xul document. In this case, use the size of the viewport frame.
-  nsIFrame* frameForCompositionBoundsCalculation =
+  const nsIFrame* frameForCompositionBoundsCalculation =
       aScrollFrame ? aScrollFrame : aForFrame;
   nsRect compositionBounds(
       frameForCompositionBoundsCalculation->GetOffsetToCrossDoc(
@@ -8596,7 +8603,7 @@
       metrics));
 
   if (StaticPrefs::apz_printtree() || StaticPrefs::apz_test_logging_enabled()) {
-    if (nsIContent* content =
+    if (const nsIContent* content =
             frameForCompositionBoundsCalculation->GetContent()) {
       nsAutoString contentDescription;
       if (content->IsElement()) {
@@ -8864,33 +8871,40 @@
   return static_cast<nsBlockFrame*>(ancestor);
 }
 
-// The implementation of this calculation is adapted from
+// The implementations of this calculation are adapted from
 // Element::GetBoundingClientRect().
 /* static */
 CSSRect nsLayoutUtils::GetBoundingContentRect(
     const nsIContent* aContent, const nsIScrollableFrame* aRootScrollFrame) {
-  CSSRect result;
   if (nsIFrame* frame = aContent->GetPrimaryFrame()) {
-    nsIFrame* relativeTo = aRootScrollFrame->GetScrolledFrame();
-    result = CSSRect::FromAppUnits(nsLayoutUtils::GetAllInFlowRectsUnion(
-        frame, relativeTo, nsLayoutUtils::RECTS_ACCOUNT_FOR_TRANSFORMS));
-
-    // If the element is contained in a scrollable frame that is not
-    // the root scroll frame, make sure to clip the result so that it is
-    // not larger than the containing scrollable frame's bounds.
-    nsIScrollableFrame* scrollFrame =
-        nsLayoutUtils::GetNearestScrollableFrame(frame);
-    if (scrollFrame && scrollFrame != aRootScrollFrame) {
-      nsIFrame* subFrame = do_QueryFrame(scrollFrame);
-      MOZ_ASSERT(subFrame);
-      // Get the bounds of the scroll frame in the same coordinate space
-      // as |result|.
-      CSSRect subFrameRect =
-          CSSRect::FromAppUnits(nsLayoutUtils::TransformFrameRectToAncestor(
-              subFrame, subFrame->GetRectRelativeToSelf(), relativeTo));
+    return GetBoundingFrameRect(frame, aRootScrollFrame);
+  }
+  return CSSRect();
+}
 
-      result = subFrameRect.Intersect(result);
-    }
+/* static */
+CSSRect nsLayoutUtils::GetBoundingFrameRect(
+    nsIFrame* aFrame, const nsIScrollableFrame* aRootScrollFrame) {
+  CSSRect result;
+  nsIFrame* relativeTo = aRootScrollFrame->GetScrolledFrame();
+  result = CSSRect::FromAppUnits(nsLayoutUtils::GetAllInFlowRectsUnion(
+      aFrame, relativeTo, nsLayoutUtils::RECTS_ACCOUNT_FOR_TRANSFORMS));
+
+  // If the element is contained in a scrollable frame that is not
+  // the root scroll frame, make sure to clip the result so that it is
+  // not larger than the containing scrollable frame's bounds.
+  nsIScrollableFrame* scrollFrame =
+      nsLayoutUtils::GetNearestScrollableFrame(aFrame);
+  if (scrollFrame && scrollFrame != aRootScrollFrame) {
+    nsIFrame* subFrame = do_QueryFrame(scrollFrame);
+    MOZ_ASSERT(subFrame);
+    // Get the bounds of the scroll frame in the same coordinate space
+    // as |result|.
+    CSSRect subFrameRect =
+        CSSRect::FromAppUnits(nsLayoutUtils::TransformFrameRectToAncestor(
+            subFrame, subFrame->GetRectRelativeToSelf(), relativeTo));
+
+    result = subFrameRect.Intersect(result);
   }
   return result;
 }
@@ -8972,7 +8986,7 @@
   }
 
   gfx::Rect result(0, 0, aMaxSize.width, aMaxSize.height);
-  gfx::Size scale = transform2D.ScaleFactors(true);
+  gfx::Size scale = transform2D.ScaleFactors();
   if (scale.width != 0 && scale.height != 0) {
     result.width /= scale.width;
     result.height /= scale.height;
@@ -9515,8 +9529,7 @@
   MOZ_ASSERT(browserChild);
 
   Size scale =
-      browserChild->GetChildToParentConversionMatrix().As2D().ScaleFactors(
-          true);
+      browserChild->GetChildToParentConversionMatrix().As2D().ScaleFactors();
   ScreenSize margin(scale.width * CSSPixel::FromAppUnits(aMargin),
                     scale.height * CSSPixel::FromAppUnits(aMargin));
 
@@ -9544,7 +9557,7 @@
 
 template <typename SizeType>
 /* static */ SizeType ExpandHeightForDynamicToolbarImpl(
-    nsPresContext* aPresContext, const SizeType& aSize) {
+    const nsPresContext* aPresContext, const SizeType& aSize) {
   RefPtr<MobileViewportManager> MVM =
       aPresContext->PresShell()->GetMobileViewportManager();
   MOZ_ASSERT(MVM);
@@ -9561,10 +9574,10 @@
 }
 
 CSSSize nsLayoutUtils::ExpandHeightForDynamicToolbar(
-    nsPresContext* aPresContext, const CSSSize& aSize) {
+    const nsPresContext* aPresContext, const CSSSize& aSize) {
   return ExpandHeightForDynamicToolbarImpl(aPresContext, aSize);
 }
-nsSize nsLayoutUtils::ExpandHeightForDynamicToolbar(nsPresContext* aPresContext,
-                                                    const nsSize& aSize) {
+nsSize nsLayoutUtils::ExpandHeightForDynamicToolbar(
+    const nsPresContext* aPresContext, const nsSize& aSize) {
   return ExpandHeightForDynamicToolbarImpl(aPresContext, aSize);
 }
diff -Nru firefox-84.0.2+build1/layout/base/nsLayoutUtils.h firefox-85.0+build1/layout/base/nsLayoutUtils.h
--- firefox-84.0.2+build1/layout/base/nsLayoutUtils.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsLayoutUtils.h	2021-01-18 19:58:16.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/ReflowOutput.h"
 #include "mozilla/RelativeTo.h"
 #include "mozilla/StaticPrefs_nglayout.h"
 #include "mozilla/SurfaceFromElementResult.h"
@@ -20,18 +19,15 @@
 #include "mozilla/ToString.h"
 #include "mozilla/TypedEnumBits.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/WritingModes.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "mozilla/layers/ScrollableLayerGuid.h"
 #include "mozilla/gfx/2D.h"
 
-#include "gfx2DGlue.h"
 #include "gfxPoint.h"
 #include "nsBoundingMetrics.h"
 #include "nsCSSPropertyIDSet.h"
-#include "nsClassHashtable.h"
-#include "nsGkAtoms.h"
 #include "nsThreadUtils.h"
-#include "ImageContainer.h"  // for layers::Image
 #include "Units.h"
 #include "mozilla/layers/LayersTypes.h"
 #include <limits>
@@ -69,7 +65,6 @@
 class nsPIDOMWindowOuter;
 class imgIRequest;
 struct nsStyleFont;
-struct nsOverflowAreas;
 
 namespace mozilla {
 struct AspectRatio;
@@ -81,12 +76,14 @@
 enum class LayoutFrameType : uint8_t;
 struct IntrinsicSize;
 struct ContainerLayerParameters;
+class ReflowOutput;
 class WritingMode;
 class DisplayItemClip;
 class EffectSet;
 struct ActiveScrolledRoot;
 enum class ScrollOrigin : uint8_t;
 enum class StyleImageOrientation : uint8_t;
+struct OverflowAreas;
 namespace dom {
 class CanvasRenderingContext2D;
 class DOMRectList;
@@ -750,16 +747,32 @@
     OnlyVisible,
   };
 
+  struct FrameForPointOptions {
+    using Bits = mozilla::EnumSet<FrameForPointOption>;
+
+    Bits mBits;
+    // If mBits contains OnlyVisible, what is the opacity threshold which we
+    // consider "opaque enough" to clobber stuff underneath.
+    float mVisibleThreshold;
+
+    FrameForPointOptions(Bits aBits, float aVisibleThreshold)
+        : mBits(aBits), mVisibleThreshold(aVisibleThreshold){};
+
+    MOZ_IMPLICIT FrameForPointOptions(Bits aBits)
+        : FrameForPointOptions(aBits, 1.0f) {}
+
+    FrameForPointOptions() : FrameForPointOptions(Bits()){};
+  };
+
   /**
    * Given aFrame, the root frame of a stacking context, find its descendant
    * frame under the point aPt that receives a mouse event at that location,
    * or nullptr if there is no such frame.
    * @param aPt the point, relative to the frame origin, in either visual
    *            or layout coordinates depending on aRelativeTo.mViewportType
-   * @param aFlags some combination of FrameForPointOption.
    */
   static nsIFrame* GetFrameForPoint(RelativeTo aRelativeTo, nsPoint aPt,
-                                    mozilla::EnumSet<FrameForPointOption> = {});
+                                    const FrameForPointOptions& = {});
 
   /**
    * Given aFrame, the root frame of a stacking context, find all descendant
@@ -768,11 +781,10 @@
    * @param aRect the rect, relative to the frame origin, in either visual
    *              or layout coordinates depending on aRelativeTo.mViewportType
    * @param aOutFrames an array to add all the frames found
-   * @param aFlags some combination of FrameForPointOption.
    */
   static nsresult GetFramesForArea(RelativeTo aRelativeTo, const nsRect& aRect,
                                    nsTArray<nsIFrame*>& aOutFrames,
-                                   mozilla::EnumSet<FrameForPointOption> = {});
+                                   const FrameForPointOptions& = {});
 
   /**
    * Transform aRect relative to aFrame up to the coordinate system of
@@ -861,7 +873,7 @@
    * Gets the scale factors of the transform for aFrame relative to the root
    * frame if this transform is 2D, or the identity scale factors otherwise.
    */
-  static gfxSize GetTransformToAncestorScale(nsIFrame* aFrame);
+  static gfxSize GetTransformToAncestorScale(const nsIFrame* aFrame);
 
   /**
    * Gets the scale factors of the transform for aFrame relative to the root
@@ -2304,7 +2316,7 @@
    * kSelectPopupList and kPopupList are always skipped.
    */
   static void UnionChildOverflow(
-      nsIFrame* aFrame, nsOverflowAreas& aOverflowAreas,
+      nsIFrame* aFrame, mozilla::OverflowAreas& aOverflowAreas,
       mozilla::layout::FrameChildListIDs aSkipChildLists =
           mozilla::layout::FrameChildListIDs());
 
@@ -2485,12 +2497,12 @@
    */
   enum class SubtractDynamicToolbar { No, Yes };
   static bool GetContentViewerSize(
-      nsPresContext* aPresContext, LayoutDeviceIntSize& aOutSize,
+      const nsPresContext* aPresContext, LayoutDeviceIntSize& aOutSize,
       SubtractDynamicToolbar = SubtractDynamicToolbar::Yes);
 
  private:
   static bool UpdateCompositionBoundsForRCDRSF(
-      mozilla::ParentLayerRect& aCompBounds, nsPresContext* aPresContext);
+      mozilla::ParentLayerRect& aCompBounds, const nsPresContext* aPresContext);
 
  public:
   /**
@@ -2518,7 +2530,7 @@
    *          mDevPixelsPerCSSPixel set.
    */
   static CSSSize CalculateRootCompositionSize(
-      nsIFrame* aFrame, bool aIsRootContentDocRootScrollFrame,
+      const nsIFrame* aFrame, bool aIsRootContentDocRootScrollFrame,
       const FrameMetrics& aMetrics);
 
   /**
@@ -2528,7 +2540,7 @@
    * scrollable rect as the rect of the root frame.
    */
   static nsRect CalculateScrollableRectForFrame(
-      nsIScrollableFrame* aScrollableFrame, nsIFrame* aRootFrame);
+      const nsIScrollableFrame* aScrollableFrame, const nsIFrame* aRootFrame);
 
   /**
    * Calculate the expanded scrollable rect for a frame. See FrameMetrics.h for
@@ -2644,8 +2656,8 @@
   static bool CanScrollOriginClobberApz(ScrollOrigin aScrollOrigin);
 
   static ScrollMetadata ComputeScrollMetadata(
-      nsIFrame* aForFrame, nsIFrame* aScrollFrame, nsIContent* aContent,
-      const nsIFrame* aReferenceFrame,
+      const nsIFrame* aForFrame, const nsIFrame* aScrollFrame,
+      nsIContent* aContent, const nsIFrame* aReferenceFrame,
       mozilla::layers::LayerManager* aLayerManager, ViewID aScrollParentId,
       const nsSize& aScrollPortSize, const mozilla::Maybe<nsRect>& aClipRect,
       bool aIsRoot,
@@ -2674,7 +2686,7 @@
    *     scrollable content.
    */
   static nsMargin ScrollbarAreaToExcludeFromCompositionBoundsFor(
-      nsIFrame* aScrollFrame);
+      const nsIFrame* aScrollFrame);
 
   /**
    * Looks in the layer subtree rooted at aLayer for a metrics with scroll id
@@ -2724,6 +2736,12 @@
       const nsIContent* aContent, const nsIScrollableFrame* aRootScrollFrame);
 
   /**
+   * Similar to GetBoundingContentRect for nsIFrame.
+   */
+  static CSSRect GetBoundingFrameRect(
+      nsIFrame* aFrame, const nsIScrollableFrame* aRootScrollFrame);
+
+  /**
    * Returns the first ancestor who is a float containing block.
    */
   static nsBlockFrame* GetFloatContainingBlock(nsIFrame* aFrame);
@@ -2875,9 +2893,9 @@
   static nsSize ExpandHeightForViewportUnits(nsPresContext* aPresContext,
                                              const nsSize& aSize);
 
-  static CSSSize ExpandHeightForDynamicToolbar(nsPresContext* aPresContext,
-                                               const CSSSize& aSize);
-  static nsSize ExpandHeightForDynamicToolbar(nsPresContext* aPresContext,
+  static CSSSize ExpandHeightForDynamicToolbar(
+      const nsPresContext* aPresContext, const CSSSize& aSize);
+  static nsSize ExpandHeightForDynamicToolbar(const nsPresContext* aPresContext,
                                               const nsSize& aSize);
 
   /**
diff -Nru firefox-84.0.2+build1/layout/base/nsPresContext.cpp firefox-85.0+build1/layout/base/nsPresContext.cpp
--- firefox-84.0.2+build1/layout/base/nsPresContext.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsPresContext.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -13,6 +13,7 @@
 #if defined(MOZ_WIDGET_ANDROID)
 #  include "mozilla/AsyncEventDispatcher.h"
 #endif
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/EventDispatcher.h"
diff -Nru firefox-84.0.2+build1/layout/base/nsPresContext.h firefox-85.0+build1/layout/base/nsPresContext.h
--- firefox-84.0.2+build1/layout/base/nsPresContext.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsPresContext.h	2021-01-18 19:58:16.000000000 +0000
@@ -18,7 +18,6 @@
 #include "mozilla/PreferenceSheet.h"
 #include "mozilla/PresShellForwards.h"
 #include "mozilla/ScrollStyles.h"
-#include "mozilla/ServoStyleSet.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
@@ -27,23 +26,20 @@
 #include "nsCompatibility.h"
 #include "nsCoord.h"
 #include "nsCOMPtr.h"
+#include "nsHashKeys.h"
 #include "nsRect.h"
 #include "nsStringFwd.h"
-#include "gfxFontConstants.h"
+#include "nsTHashtable.h"
 #include "nsAtom.h"
-#include "nsCRT.h"
 #include "nsIWidgetListener.h"  // for nsSizeMode
 #include "nsGkAtoms.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsChangeHint.h"
-#include <algorithm>
 #include "gfxTypes.h"
 #include "gfxRect.h"
 #include "nsTArray.h"
-#include "prclist.h"
 #include "nsThreadUtils.h"
 #include "Units.h"
-#include "prenv.h"
 
 class nsBidi;
 class nsIPrintSettings;
@@ -81,6 +77,7 @@
 class CounterStyleManager;
 class PresShell;
 class RestyleManager;
+class ServoStyleSet;
 class StaticPresData;
 struct MediaFeatureChange;
 enum class MediaFeatureChangePropagation : uint8_t;
diff -Nru firefox-84.0.2+build1/layout/base/nsPresContextInlines.h firefox-85.0+build1/layout/base/nsPresContextInlines.h
--- firefox-84.0.2+build1/layout/base/nsPresContextInlines.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsPresContextInlines.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef nsPresContextInlines_h
 #define nsPresContextInlines_h
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/PresShell.h"
 #include "nsCSSFrameConstructor.h"
 
diff -Nru firefox-84.0.2+build1/layout/base/nsRefreshDriver.cpp firefox-85.0+build1/layout/base/nsRefreshDriver.cpp
--- firefox-84.0.2+build1/layout/base/nsRefreshDriver.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsRefreshDriver.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -32,6 +32,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/DisplayPortUtils.h"
 #include "mozilla/InputTaskManager.h"
@@ -70,6 +71,7 @@
 #include "nsDocShell.h"
 #include "nsISimpleEnumerator.h"
 #include "nsJSEnvironment.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"
 
 #include "BackgroundChild.h"
@@ -1266,7 +1268,10 @@
 #endif
   array.AppendElement(ObserverData{aObserver, aObserverDescription,
                                    TimeStamp::Now(), innerWindowID,
-                                   profiler_capture_backtrace(), aFlushType});
+#ifdef MOZ_GECKO_PROFILER
+                                   profiler_capture_backtrace(),
+#endif
+                                   aFlushType});
   EnsureTimerStarted();
 }
 
@@ -1413,6 +1418,11 @@
   }
 }
 
+void nsRefreshDriver::RegisterCompositionPayload(
+    const mozilla::layers::CompositionPayload& aPayload) {
+  mCompositionPayloads.AppendElement(aPayload);
+}
+
 void nsRefreshDriver::RunDelayedEventsSoon() {
   // Place entries for delayed events into their corresponding normal list,
   // and schedule a refresh. When these delayed events run, if their document
@@ -1511,7 +1521,9 @@
 
   mActiveTimer->RemoveRefreshDriver(this);
   mActiveTimer = nullptr;
+#ifdef MOZ_GECKO_PROFILER
   mRefreshTimerStartedCause = nullptr;
+#endif
 }
 
 uint32_t nsRefreshDriver::ObserverCount() const {
@@ -2055,6 +2067,9 @@
   TickReasons tickReasons = GetReasonsToTick();
   if (tickReasons == TickReasons::eNone) {
     // We no longer have any observers.
+    // Discard composition payloads because there is no paint.
+    mCompositionPayloads.Clear();
+
     // We don't want to stop the timer when observers are initially
     // removed, because sometimes observers can be added and removed
     // often depending on what other things are going on and in that
@@ -2064,9 +2079,8 @@
     // On top level content pages keep the timer running initially so that we
     // paint the page soon enough.
     if (ShouldKeepTimerRunningWhileWaitingForFirstContentfulPaint()) {
-      PROFILER_TRACING_MARKER(
-          "Paint", "RefreshDriver waiting for first contentful paint", GRAPHICS,
-          TRACING_EVENT);
+      PROFILER_MARKER("RefreshDriver waiting for first contentful paint",
+                      GRAPHICS, {}, Tracing, "Paint");
     } else {
       StopTimer();
     }
@@ -2076,18 +2090,18 @@
   AUTO_PROFILER_LABEL("nsRefreshDriver::Tick", LAYOUT);
 
   nsAutoCString profilerStr;
-#if MOZ_GECKO_PROFILER
+#ifdef MOZ_GECKO_PROFILER
   if (profiler_can_accept_markers()) {
     profilerStr.AppendLiteral("Tick reasons:");
     AppendTickReasonsToString(tickReasons, profilerStr);
   }
-#endif
   AUTO_PROFILER_MARKER_TEXT(
       "RefreshDriverTick", GRAPHICS,
       MarkerOptions(
           MarkerStack::TakeBacktrace(std::move(mRefreshTimerStartedCause)),
           MarkerInnerWindowIdFromDocShell(GetDocShell(mPresContext))),
       profilerStr);
+#endif
 
   mResizeSuppressed = false;
 
@@ -2340,7 +2354,7 @@
   if (mViewManagerFlushIsPending) {
     AutoRecordPhase paintRecord(&phasePaint);
     nsCString transactionId;
-#if MOZ_GECKO_PROFILER
+#ifdef MOZ_GECKO_PROFILER
     if (profiler_can_accept_markers()) {
       transactionId.AppendLiteral("Transaction ID: ");
       transactionId.AppendInt((uint64_t)mNextTransactionId);
@@ -2351,6 +2365,16 @@
         MarkerStack::TakeBacktrace(std::move(mViewManagerFlushCause)),
         transactionId);
 
+    // Forward our composition payloads to the layer manager.
+    if (!mCompositionPayloads.IsEmpty()) {
+      nsIWidget* widget = mPresContext->GetRootWidget();
+      layers::LayerManager* lm = widget ? widget->GetLayerManager() : nullptr;
+      if (lm) {
+        lm->RegisterPayloads(mCompositionPayloads);
+      }
+      mCompositionPayloads.Clear();
+    }
+
     RefPtr<TimelineConsumers> timelines = TimelineConsumers::Get();
 
     nsTArray<nsDocShell*> profilingDocShells;
@@ -2397,6 +2421,9 @@
 
     dispatchRunnablesAfterTick = true;
     mHasScheduleFlush = false;
+  } else {
+    // No paint happened, discard composition payloads.
+    mCompositionPayloads.Clear();
   }
 
   double totalMs = (TimeStamp::Now() - mTickStart).ToMilliseconds();
@@ -2688,9 +2715,11 @@
   NS_ASSERTION(mPresContext->IsRoot(),
                "Should only schedule view manager flush on root prescontexts");
   mViewManagerFlushIsPending = true;
+#ifdef MOZ_GECKO_PROFILER
   if (!mViewManagerFlushCause) {
     mViewManagerFlushCause = profiler_capture_backtrace();
   }
+#endif
   mHasScheduleFlush = true;
   EnsureTimerStarted(eNeverAdjustTimer);
 }
diff -Nru firefox-84.0.2+build1/layout/base/nsRefreshDriver.h firefox-85.0+build1/layout/base/nsRefreshDriver.h
--- firefox-84.0.2+build1/layout/base/nsRefreshDriver.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/nsRefreshDriver.h	2021-01-18 19:58:16.000000000 +0000
@@ -28,6 +28,11 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/VisualViewport.h"
 #include "mozilla/layers/TransactionIdAllocator.h"
+#include "LayersTypes.h"
+
+#ifdef MOZ_GECKO_PROFILER
+#  include "mozilla/ProfileChunkedBuffer.h"
+#endif
 
 class nsPresContext;
 
@@ -393,6 +398,8 @@
     EnsureTimerStarted();
   }
 
+  bool HasPendingTick() const { return mActiveTimer; }
+
   void EnsureIntersectionObservationsUpdateHappens() {
     // This is enough to make sure that UpdateIntersectionObservations runs at
     // least once. This is presumably the intent of step 5 in [1]:
@@ -408,6 +415,13 @@
     mNeedToUpdateIntersectionObservations = true;
   }
 
+  // Register a composition payload that will be forwarded to the layer manager
+  // if the current or upcoming refresh tick does a paint.
+  // If no paint happens, the payload is discarded.
+  // Should only be called on root refresh drivers.
+  void RegisterCompositionPayload(
+      const mozilla::layers::CompositionPayload& aPayload);
+
   enum class TickReasons : uint32_t {
     eNone = 0,
     eHasObservers = 1 << 0,
@@ -436,7 +450,9 @@
     const char* mDescription;
     mozilla::TimeStamp mRegisterTime;
     mozilla::Maybe<uint64_t> mInnerWindowId;
+#ifdef MOZ_GECKO_PROFILER
     mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> mCause;
+#endif
     mozilla::FlushType mFlushType;
 
     bool operator==(nsARefreshObserver* aObserver) const {
@@ -489,7 +505,9 @@
   mozilla::RefreshDriverTimer* ChooseTimer();
   mozilla::RefreshDriverTimer* mActiveTimer;
   RefPtr<mozilla::RefreshDriverTimer> mOwnTimer;
+#ifdef MOZ_GECKO_PROFILER
   mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> mRefreshTimerStartedCause;
+#endif
 
   // nsPresContext passed in constructor and unset in Disconnect.
   mozilla::WeakPtr<nsPresContext> mPresContext;
@@ -518,7 +536,9 @@
   // flush since the last time we did it.
   const mozilla::TimeDuration mMinRecomputeVisibilityInterval;
 
+#ifdef MOZ_GECKO_PROFILER
   mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> mViewManagerFlushCause;
+#endif
 
   bool mThrottled : 1;
   bool mNeedToRecomputeVisibility : 1;
@@ -575,6 +595,7 @@
   // to be called when the timer is re-started and should not influence its
   // starting or stopping.
   nsTObserverArray<nsATimerAdjustmentObserver*> mTimerAdjustmentObservers;
+  nsTArray<mozilla::layers::CompositionPayload> mCompositionPayloads;
   RequestTable mRequests;
   ImageStartTable mStartTable;
   AutoTArray<nsCOMPtr<nsIRunnable>, 16> mEarlyRunners;
diff -Nru firefox-84.0.2+build1/layout/base/OverflowChangedTracker.h firefox-85.0+build1/layout/base/OverflowChangedTracker.h
--- firefox-84.0.2+build1/layout/base/OverflowChangedTracker.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/base/OverflowChangedTracker.h	2021-01-18 19:58:16.000000000 +0000
@@ -116,16 +116,16 @@
             frame->GetProperty(nsIFrame::DebugInitialOverflowPropertyApplied()),
             "InitialOverflowProperty must be set first.");
 
-        nsOverflowAreas* overflow =
+        OverflowAreas* overflow =
             frame->GetProperty(nsIFrame::InitialOverflowProperty());
         if (overflow) {
           // FinishAndStoreOverflow will change the overflow areas passed in,
           // so make a copy.
-          nsOverflowAreas overflowCopy = *overflow;
+          OverflowAreas overflowCopy = *overflow;
           frame->FinishAndStoreOverflow(overflowCopy, frame->GetSize());
         } else {
           nsRect bounds(nsPoint(0, 0), frame->GetSize());
-          nsOverflowAreas boundsOverflow;
+          OverflowAreas boundsOverflow;
           boundsOverflow.SetAllTo(bounds);
           frame->FinishAndStoreOverflow(boundsOverflow, bounds.Size());
         }
diff -Nru firefox-84.0.2+build1/layout/base/PositionedEventTargeting.cpp firefox-85.0+build1/layout/base/PositionedEventTargeting.cpp
--- firefox-84.0.2+build1/layout/base/PositionedEventTargeting.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/PositionedEventTargeting.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_ui.h"
 #include "mozilla/ToString.h"
 #include "mozilla/dom/MouseEventBinding.h"
diff -Nru firefox-84.0.2+build1/layout/base/PresShell.cpp firefox-85.0+build1/layout/base/PresShell.cpp
--- firefox-84.0.2+build1/layout/base/PresShell.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/PresShell.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -28,6 +28,7 @@
 #include "mozilla/PerfStats.h"
 #include "mozilla/PresShellInlines.h"
 #include "mozilla/RangeUtils.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_dom.h"
@@ -53,6 +54,8 @@
 #include "mozilla/dom/BrowserBridgeChild.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/PointerEventHandler.h"
 #include "mozilla/dom/PopupBlocker.h"
@@ -1190,13 +1193,37 @@
 
   AUTO_PROFILER_LABEL("PresShell::Destroy", LAYOUT);
 
-  // If we have a RCD that has been painted (mIsFirstPaint=false), then record
-  // whether or not it had an APZ zoom applied to it during its lifetime, and
-  // whether or not it's in responsive design mode. We omit unpainted presShells
-  // because we get a handful of transient presShells that always report no
-  // zoom, and those skew the numbers.
-  if (!mIsFirstPaint && mPresContext->IsRootContentDocumentCrossProcess() &&
-      !InRDMPane()) {
+  // Try to determine if the page is the user had a meaningful opportunity to
+  // zoom this page. This is not 100% accurate but should be "good enough" for
+  // telemetry purposes.
+  auto isUserZoomablePage = [&]() -> bool {
+    if (mIsFirstPaint) {
+      // Page was never painted, so it wasn't zoomable by the user. We get a
+      // handful of these "transient" presShells.
+      return false;
+    }
+    if (!mPresContext->IsRootContentDocumentCrossProcess()) {
+      // Not a root content document, so APZ doesn't support zooming it.
+      return false;
+    }
+    if (InRDMPane()) {
+      // Responsive design mode is a special case that we want to ignore here.
+      return false;
+    }
+    if (mDocument && mDocument->IsInitialDocument()) {
+      // Ignore initial about:blank page loads
+      return false;
+    }
+    if (XRE_IsContentProcess() &&
+        IsExtensionRemoteType(ContentChild::GetSingleton()->GetRemoteType())) {
+      // Also omit presShells from the extension process because they sometimes
+      // can't be zoomed by the user.
+      return false;
+    }
+    // Otherwise assume the page is user-zoomable.
+    return true;
+  };
+  if (isUserZoomablePage()) {
     Telemetry::Accumulate(Telemetry::APZ_ZOOM_ACTIVITY,
                           IsResolutionUpdatedByApz());
   }
@@ -2455,12 +2482,6 @@
           nsISelectionController::SCROLL_FOR_CARET_MOVE);
 }
 
-NS_IMETHODIMP
-PresShell::SelectAll() {
-  RefPtr<nsFrameSelection> frameSelection = mSelection;
-  return frameSelection->SelectAll();
-}
-
 static void DoCheckVisibility(nsPresContext* aPresContext, nsIContent* aNode,
                               int16_t aStartOffset, int16_t aEndOffset,
                               bool* aRetval) {
@@ -2778,9 +2799,11 @@
       do {
         nsIFrame* f = stack.PopLastElement();
 
-        if (styleChange) {
-          if (f->IsPlaceholderFrame()) {
-            nsIFrame* oof = nsPlaceholderFrame::GetRealFrameForPlaceholder(f);
+        if (styleChange && f->IsPlaceholderFrame()) {
+          // Call `GetOutOfFlowFrame` directly because we can get here from
+          // frame destruction and the placeholder might be already torn down.
+          if (nsIFrame* oof =
+                  static_cast<nsPlaceholderFrame*>(f)->GetOutOfFlowFrame()) {
             if (!nsLayoutUtils::IsProperAncestorFrame(subtreeRoot, oof)) {
               // We have another distinct subtree we need to mark.
               subtrees.AppendElement(oof);
@@ -5359,6 +5382,11 @@
     MOZ_ASSERT(mResolution.isSome());
     return NS_OK;
   }
+
+  // GetResolution handles mResolution being nothing by returning 1 so this
+  // is checking that the resolution is actually changing.
+  bool resolutionUpdated = (aResolution != GetResolution());
+
   RenderingState state(this);
   state.mResolution = Some(aResolution);
   SetRenderingState(state);
@@ -5367,7 +5395,7 @@
   }
   if (aOrigin == ResolutionChangeOrigin::Apz) {
     mResolutionUpdatedByApz = true;
-  } else {
+  } else if (resolutionUpdated) {
     mResolutionUpdated = true;
   }
 
@@ -5378,7 +5406,7 @@
   return NS_OK;
 }
 
-float PresShell::GetCumulativeResolution() {
+float PresShell::GetCumulativeResolution() const {
   float resolution = GetResolution();
   nsPresContext* parentCtx = GetPresContext()->GetParentPresContext();
   if (parentCtx) {
@@ -9539,7 +9567,7 @@
     innerWindowID = Some(window->WindowID());
   }
   AutoProfilerTracing tracingLayoutFlush(
-      "Paint", "Reflow", JS::ProfilingCategoryPair::LAYOUT,
+      "Paint", "Reflow", geckoprofiler::category::LAYOUT,
       std::move(mReflowCause), innerWindowID);
   mReflowCause = nullptr;
 #endif
@@ -9575,7 +9603,7 @@
     size = target->GetLogicalSize();
   }
 
-  nsOverflowAreas oldOverflow;  // initialized and used only when !isRoot
+  OverflowAreas oldOverflow;  // initialized and used only when !isRoot
   if (!isRoot) {
     oldOverflow = target->GetOverflowAreas();
   }
@@ -10837,32 +10865,29 @@
 
 // Asks our docshell whether we're active.
 void PresShell::QueryIsActive() {
-  nsCOMPtr<nsISupports> container = mPresContext->GetContainerWeak();
-  if (mDocument) {
-    Document* displayDoc = mDocument->GetDisplayDocument();
-    if (displayDoc) {
-      // Ok, we're an external resource document -- we need to use our display
-      // document's docshell to determine "IsActive" status, since we lack
-      // a container.
-      MOZ_ASSERT(!container,
-                 "external resource doc shouldn't have its own container");
-
-      nsPresContext* displayPresContext = displayDoc->GetPresContext();
-      if (displayPresContext) {
-        container = displayPresContext->GetContainerWeak();
-      }
-    }
+  Document* doc = mDocument;
+  if (!doc) {
+    return;
+  }
+  if (Document* displayDoc = doc->GetDisplayDocument()) {
+    // Ok, we're an external resource document -- we need to use our display
+    // document's docshell to determine "IsActive" status, since we lack
+    // a browsing context of our own.
+    MOZ_ASSERT(!doc->GetBrowsingContext(),
+               "external resource doc shouldn't have its own BC");
+    doc = displayDoc;
   }
 
-  nsCOMPtr<nsIDocShell> docshell(do_QueryInterface(container));
-  if (docshell) {
-    bool isActive;
-    nsresult rv = docshell->GetIsActive(&isActive);
+  if (BrowsingContext* bc = doc->GetBrowsingContext()) {
     // Even though in theory the docshell here could be "Inactive and
-    // Foreground", thus implying aIsHidden=false for SetIsActive(),
-    // this is a newly created PresShell so we'd like to invalidate anyway
-    // upon being made active to ensure that the contents get painted.
-    if (NS_SUCCEEDED(rv)) SetIsActive(isActive);
+    // Foreground", thus implying aIsHidden=false for SetIsActive(), this is a
+    // newly created PresShell so we'd like to invalidate anyway upon being made
+    // active to ensure that the contents get painted.
+    auto* browserChild = BrowserChild::GetFrom(doc->GetDocShell());
+    const bool hiddenInRemoteFrame = browserChild &&
+                                     !browserChild->IsTopLevel() &&
+                                     !browserChild->IsVisible();
+    SetIsActive(bc->IsActive() && !hiddenInRemoteFrame);
   }
 }
 
diff -Nru firefox-84.0.2+build1/layout/base/PresShell.h firefox-85.0+build1/layout/base/PresShell.h
--- firefox-84.0.2+build1/layout/base/PresShell.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/PresShell.h	2021-01-18 19:58:16.000000000 +0000
@@ -13,7 +13,6 @@
 
 #include <stdio.h>  // for FILE definition
 #include "FrameMetrics.h"
-#include "GeckoProfiler.h"
 #include "TouchManager.h"
 #include "Units.h"
 #include "Visibility.h"
@@ -25,6 +24,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WeakPtr.h"
+#include "mozilla/dom/DocumentBinding.h"
 #include "mozilla/layers/FocusTarget.h"
 #include "mozilla/layout/LayoutTelemetryTools.h"
 #include "mozilla/widget/ThemeChangeKind.h"
@@ -95,6 +95,10 @@
 class OverflowChangedTracker;
 class StyleSheet;
 
+#ifdef MOZ_GECKO_PROFILER
+class ProfileChunkedBuffer;
+#endif
+
 #ifdef ACCESSIBILITY
 namespace a11y {
 class DocAccessible;
@@ -931,7 +935,7 @@
   }
 
   float GetResolution() const { return mResolution.valueOr(1.0); }
-  float GetCumulativeResolution();
+  float GetCumulativeResolution() const;
 
   /**
    * Accessors for a flag that tracks whether the most recent change to
@@ -1316,7 +1320,6 @@
   NS_IMETHOD ScrollCharacter(bool aRight) override;
   NS_IMETHOD CompleteScroll(bool aForward) override;
   NS_IMETHOD CompleteMove(bool aForward, bool aExtend) override;
-  NS_IMETHOD SelectAll() override;
   NS_IMETHOD CheckVisibility(nsINode* node, int16_t startOffset,
                              int16_t EndOffset, bool* _retval) override;
   nsresult CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset,
@@ -2861,8 +2864,8 @@
   // These two fields capture call stacks of any changes that require a restyle
   // or a reflow. Only the first change per restyle / reflow is recorded (the
   // one that caused a call to SetNeedStyleFlush() / SetNeedLayoutFlush()).
-  UniqueProfilerBacktrace mStyleCause;
-  UniqueProfilerBacktrace mReflowCause;
+  UniquePtr<ProfileChunkedBuffer> mStyleCause;
+  UniquePtr<ProfileChunkedBuffer> mReflowCause;
 #endif
 
   nsTArray<UniquePtr<DelayedEvent>> mDelayedEvents;
diff -Nru firefox-84.0.2+build1/layout/base/PresShellInlines.h firefox-85.0+build1/layout/base/PresShellInlines.h
--- firefox-84.0.2+build1/layout/base/PresShellInlines.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/PresShellInlines.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_PresShellInlines_h
 #define mozilla_PresShellInlines_h
 
+#include "GeckoProfiler.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
@@ -23,7 +24,7 @@
 
 #ifdef MOZ_GECKO_PROFILER
   if (!mReflowCause) {
-    mReflowCause = profiler_get_backtrace();
+    mReflowCause = profiler_capture_backtrace();
   }
 #endif
 
@@ -40,7 +41,7 @@
 
 #ifdef MOZ_GECKO_PROFILER
   if (!mStyleCause) {
-    mStyleCause = profiler_get_backtrace();
+    mStyleCause = profiler_capture_backtrace();
   }
 #endif
 
diff -Nru firefox-84.0.2+build1/layout/base/PresState.ipdlh firefox-85.0+build1/layout/base/PresState.ipdlh
--- firefox-84.0.2+build1/layout/base/PresState.ipdlh	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/PresState.ipdlh	2021-01-18 19:58:16.000000000 +0000
@@ -4,9 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-using mozilla::void_t from "ipc/IPCMessageUtils.h";
-using nsPoint from "mozilla/GfxMessageUtils.h";
-using refcounted class mozilla::dom::BlobImpl from "mozilla/dom/IPCBlobUtils.h";
+include "mozilla/GfxMessageUtils.h";
+include "mozilla/dom/IPCBlobUtils.h";
+
+using struct mozilla::void_t from "mozilla/ipc/IPCCore.h";
+using struct nsPoint from "nsPoint.h";
+using refcounted class mozilla::dom::BlobImpl from "mozilla/dom/BlobImpl.h";
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/layout/base/RestyleManager.cpp firefox-85.0+build1/layout/base/RestyleManager.cpp
--- firefox-84.0.2+build1/layout/base/RestyleManager.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/RestyleManager.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1247,12 +1247,11 @@
   return nullptr;
 }
 
-// If |aFrame| is dirty or has dirty children, or has never been reflowed,
-// then we can skip updating overflows since that will happen when it's
-// reflowed.
+// If |aFrame| is dirty or has dirty children, then we can skip updating
+// overflows since that will happen when it's reflowed.
 static inline bool CanSkipOverflowUpdates(const nsIFrame* aFrame) {
   return aFrame->HasAnyStateBits(
-      NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN | NS_FRAME_FIRST_REFLOW);
+      NS_FRAME_IS_DIRTY | NS_FRAME_HAS_DIRTY_CHILDREN);
 }
 
 void RestyleManager::ProcessRestyledFrames(nsStyleChangeList& aChangeList) {
@@ -1492,7 +1491,7 @@
     } else {
       NS_ASSERTION(frame, "This shouldn't happen");
 
-      if (!frame->FrameMaintainsOverflow() || CanSkipOverflowUpdates(frame)) {
+      if (!frame->FrameMaintainsOverflow()) {
         // frame does not maintain overflow rects, so avoid calling
         // FinishAndStoreOverflow on it:
         hint &=
diff -Nru firefox-84.0.2+build1/layout/base/SurfaceFromElementResult.h firefox-85.0+build1/layout/base/SurfaceFromElementResult.h
--- firefox-84.0.2+build1/layout/base/SurfaceFromElementResult.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/SurfaceFromElementResult.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_SurfaceFromElementResult_h
 #define mozilla_SurfaceFromElementResult_h
 
+#include "ImageContainer.h"
 #include "gfxTypes.h"
 #include "mozilla/gfx/Point.h"
 #include "nsCOMPtr.h"
@@ -27,10 +28,6 @@
 class SourceSurface;
 }
 
-namespace layers {
-class Image;
-}
-
 struct DirectDrawInfo {
   /* imgIContainer to directly draw to a context */
   nsCOMPtr<imgIContainer> mImgContainer;
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser_disableDialogs_onbeforeunload.js firefox-85.0+build1/layout/base/tests/browser_disableDialogs_onbeforeunload.js
--- firefox-84.0.2+build1/layout/base/tests/browser_disableDialogs_onbeforeunload.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser_disableDialogs_onbeforeunload.js	2021-01-18 19:58:16.000000000 +0000
@@ -58,10 +58,10 @@
         }, "document-element-inserted");
       });
       // Load the page.
-      await BrowserTestUtils.loadURI(browser, PAGE_URL);
+      BrowserTestUtils.loadURI(browser, PAGE_URL);
       await BrowserTestUtils.browserLoaded(browser);
       // And then navigate away.
-      await BrowserTestUtils.loadURI(browser, "http://example.com/");
+      BrowserTestUtils.loadURI(browser, "http://example.com/");
       await BrowserTestUtils.browserLoaded(browser);
     }
   );
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser.ini firefox-85.0+build1/layout/base/tests/browser.ini
--- firefox-84.0.2+build1/layout/base/tests/browser.ini	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser.ini	2021-01-18 19:58:16.000000000 +0000
@@ -7,7 +7,6 @@
   file_bug839103.html
   bug839103.css
 [browser_disableDialogs_onbeforeunload.js]
-skip-if = fission
 [browser_onbeforeunload_only_after_interaction.js]
 [browser_onbeforeunload_only_after_interaction_in_frame.js]
 [browser_scroll_into_view_in_out_of_process_iframe.js]
@@ -23,6 +22,3 @@
 support-files =
   !/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
   !/browser/base/content/test/forms/head.js
-[browser_is_active_on_out_of_process_iframe.js]
-support-files =
-  empty.html
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser_is_active_on_out_of_process_iframe.js firefox-85.0+build1/layout/base/tests/browser_is_active_on_out_of_process_iframe.js
--- firefox-84.0.2+build1/layout/base/tests/browser_is_active_on_out_of_process_iframe.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser_is_active_on_out_of_process_iframe.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const DIRPATH = getRootDirectory(gTestPath).replace(
-  "chrome://mochitests/content/",
-  ""
-);
-const parentPATH = DIRPATH + "empty.html";
-const iframePATH = DIRPATH + "empty.html";
-
-const parentURL = `http://example.com/${parentPATH}`;
-const iframeURL = `http://example.org/${iframePATH}`;
-
-add_task(async function() {
-  const win = await BrowserTestUtils.openNewBrowserWindow({
-    fission: true,
-  });
-
-  try {
-    const browser = win.gBrowser.selectedTab.linkedBrowser;
-
-    BrowserTestUtils.loadURI(browser, parentURL);
-    await BrowserTestUtils.browserLoaded(browser, false, parentURL);
-
-    async function setup(url) {
-      const scroller = content.document.createElement("div");
-      scroller.style = "width: 300px; height: 300px; overflow: scroll;";
-      scroller.setAttribute("id", "scroller");
-      content.document.body.appendChild(scroller);
-
-      // Make a space bigger than display port.
-      const spacer = content.document.createElement("div");
-      spacer.style = "width: 100%; height: 2000vh;";
-      scroller.appendChild(spacer);
-
-      const iframe = content.document.createElement("iframe");
-      scroller.appendChild(iframe);
-
-      iframe.contentWindow.location = url;
-      await new Promise(resolve => {
-        iframe.addEventListener("load", resolve, { once: true });
-      });
-
-      return iframe.browsingContext;
-    }
-
-    // Setup an iframe which is initially out of the display port.
-    const iframe = await SpecialPowers.spawn(browser, [iframeURL], setup);
-
-    await new Promise(resolve => requestAnimationFrame(resolve));
-
-    await SpecialPowers.spawn(iframe, [], () => {
-      const docShell = SpecialPowers.wrap(content.window).docShell;
-      Assert.ok(!docShell.isActive, "the doc shell should be inactive");
-    });
-  } finally {
-    await BrowserTestUtils.closeWindow(win);
-  }
-});
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction_in_frame.js firefox-85.0+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction_in_frame.js
--- firefox-84.0.2+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction_in_frame.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction_in_frame.js	2021-01-18 19:58:16.000000000 +0000
@@ -57,7 +57,7 @@
     { gBrowser, url: "about:blank" },
     async function(browser) {
       // Load the page.
-      await BrowserTestUtils.loadURI(browser, PAGE_URL);
+      BrowserTestUtils.loadURI(browser, PAGE_URL);
       await BrowserTestUtils.browserLoaded(browser);
 
       let frameBC = browser.browsingContext.children[0];
@@ -85,7 +85,7 @@
         "Click should update frame interactivity state"
       );
       // And then navigate away.
-      await BrowserTestUtils.loadURI(browser, "http://example.com/");
+      BrowserTestUtils.loadURI(browser, "http://example.com/");
       await BrowserTestUtils.browserLoaded(browser);
     }
   );
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction.js firefox-85.0+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction.js
--- firefox-84.0.2+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser_onbeforeunload_only_after_interaction.js	2021-01-18 19:58:16.000000000 +0000
@@ -45,7 +45,7 @@
     { gBrowser, url: "about:blank" },
     async function(browser) {
       // Load the page.
-      await BrowserTestUtils.loadURI(browser, PAGE_URL);
+      BrowserTestUtils.loadURI(browser, PAGE_URL);
       await BrowserTestUtils.browserLoaded(browser);
 
       if (shouldClick) {
@@ -64,7 +64,7 @@
         "Click should update document interactivity state"
       );
       // And then navigate away.
-      await BrowserTestUtils.loadURI(browser, "http://example.com/");
+      BrowserTestUtils.loadURI(browser, "http://example.com/");
       await BrowserTestUtils.browserLoaded(browser);
     }
   );
diff -Nru firefox-84.0.2+build1/layout/base/tests/browser_select_popup_position_in_out_of_process_iframe.js firefox-85.0+build1/layout/base/tests/browser_select_popup_position_in_out_of_process_iframe.js
--- firefox-84.0.2+build1/layout/base/tests/browser_select_popup_position_in_out_of_process_iframe.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/browser_select_popup_position_in_out_of_process_iframe.js	2021-01-18 19:58:16.000000000 +0000
@@ -58,7 +58,7 @@
     newWin.gBrowser.selectedBrowser,
     true /* includeSubFrames */
   );
-  await BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, pageUrl);
+  BrowserTestUtils.loadURI(newWin.gBrowser.selectedBrowser, pageUrl);
   await browserLoadedPromise;
 
   newWin.gBrowser.selectedBrowser.focus();
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/chrome.ini firefox-85.0+build1/layout/base/tests/chrome/chrome.ini
--- firefox-84.0.2+build1/layout/base/tests/chrome/chrome.ini	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/chrome.ini	2021-01-18 19:58:16.000000000 +0000
@@ -31,6 +31,10 @@
   printpreview_images_sw.html
   printpreview_images_sw_ref.html
   printpreview_images_sw.js
+  printpreview_pps_uw4.html
+  printpreview_pps_uw4_ref.html
+  printpreview_pps_uw9.html
+  printpreview_pps_uw9_ref.html
   printpreview_pps4.html
   printpreview_pps4_ref.html
   printpreview_pps9.html
@@ -73,10 +77,6 @@
   bug1041200_frame.html
   bug1041200_window.html
 [test_chrome_content_integration.xhtml]
-[test_chrome_over_plugin.xhtml]
-support-files =
-  chrome_over_plugin_window.xhtml
-  chrome_over_plugin_window_frame.html
 [test_default_background.xhtml]
 [test_dialog_with_positioning.html]
 tags = openwindow
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/chrome_over_plugin_window_frame.html firefox-85.0+build1/layout/base/tests/chrome/chrome_over_plugin_window_frame.html
--- firefox-84.0.2+build1/layout/base/tests/chrome/chrome_over_plugin_window_frame.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/chrome_over_plugin_window_frame.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<embed id="e" type="application/x-test" wmode="window"
-       style="position:absolute;left:0;top:0;width:100px;height:100px"></embed>
-<div style="position:absolute;left:0;top:80px;width:100px;height:10px;background:rgba(0,0,128,0.5)"></div>
-<div style="position:absolute;left:0;top:90px;width:100px;height:10px;background:blue"></div>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/chrome_over_plugin_window.xhtml firefox-85.0+build1/layout/base/tests/chrome/chrome_over_plugin_window.xhtml
--- firefox-84.0.2+build1/layout/base/tests/chrome/chrome_over_plugin_window.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/chrome_over_plugin_window.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<window title="Content/chrome integration subwindow"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="runTests()">\
-  <!-- We're mainly testing that a) translucent chrome elements cause the plugin to be clipped away and
-       b) translucent content elements do NOT cause the plugin to be clipped away -->
-  <stack style="height:100px; width:150px;">
-    <iframe type="content" style="border:none;" id="f"
-            src="http://example.org/chrome/layout/base/tests/chrome/chrome_over_plugin_window_frame.html"/>
-    <vbox>
-      <vbox style="height:25px; background:yellow;"/> <!-- plugin should be covered here -->
-      <vbox style="height:25px; background:rgba(0,128,0,0.5);"/> <!-- plugin should be covered here -->
-      <vbox style="height:50px;"/> <!-- plugin should be visible here -->
-    </vbox>
-  </stack>
-
-  <script type="application/javascript">
-    <![CDATA[
-    var imports = [ "SimpleTest", "is", "isnot", "ok", "todo" ];
-    for (var name of imports) {
-      window[name] = window.arguments[0][name];
-    }
-
-    var plugin;
-    function waitForPaint() {
-      if (plugin.getPaintCount() < 1) {
-        setTimeout(waitForPaint, 0);
-        return;
-      }
-
-      if (plugin.hasWidget()) {
-        is(plugin.getClipRegionRectCount(), 1, "plugin clip rect count");
-        var left = plugin.getEdge(0);
-        var top = plugin.getEdge(1);
-        is(plugin.getClipRegionRectEdge(0,0) - left, 0, "plugin clip rect left");
-        // our two vboxes with backgrounds should cause the top of the plugin to be clipped
-        is(plugin.getClipRegionRectEdge(0,1) - top, 50, "plugin clip rect top");
-        is(plugin.getClipRegionRectEdge(0,2) - left, 100, "plugin clip rect right");
-        // of the two content DIVs, the first one should not cause the plugin to be clipped because
-        // it's transparent. The second one should cause the plugin to be clipped.
-        is(plugin.getClipRegionRectEdge(0,3) - top, 90, "plugin clip rect bottom");
-      } else {
-        todo(false, "Test only tests windowed plugins");
-      }
-
-      var tester = window.SimpleTest;
-      window.close();
-      tester.finish();
-    }
-
-    function runTests() {
-      plugin = document.getElementById("f").contentDocument.getElementById("e").wrappedJSObject;
-      waitForPaint();
-    }
-    ]]>
-  </script>
-</window>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_helper.xhtml firefox-85.0+build1/layout/base/tests/chrome/printpreview_helper.xhtml
--- firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_helper.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/printpreview_helper.xhtml	2021-01-18 19:58:16.000000000 +0000
@@ -786,7 +786,7 @@
 // And eventually 2 and 6, per bug 1669905.
 async function runTest31() {
   // XXXdholbert On windows, our zero-margin settings aren't reliably respected
-  // for some reason; see bug 1671036. For now, we just account for that with a
+  // for some reason; see bug 1680838. For now, we just account for that with a
   // hefty amount of fuzz, guarded behind a platform-specific check so that we
   // can keep this strict on other platforms.
   let fuzz = navigator.platform.includes("Win") ?
@@ -800,7 +800,7 @@
 }
 async function runTest32() {
   let fuzz = navigator.platform.includes("Win") ?
-      { maxDifferent: 121116, maxDifference: 255 } :
+      { maxDifferent: 130170, maxDifference: 255 } :
       { maxDifferent: 0, maxDifference: 0 };
 
   await checkSupportedPagesPerSheetValue("printpreview_pps9.html",
@@ -817,6 +817,177 @@
                                          "printpreview_pps16_ref.html", 16,
                                          fuzz);
 
+  requestAnimationFrame(() => setTimeout(runTest34));
+}
+
+// Testcases for pages-per-sheet with nonzero unwriteable margin values:
+// ---------------------------------------------------------------------
+    
+// In this subtest, the vertical scale-factor is more-severe and hence ends up
+// "winning", and we have a bit of extra space in the horizontal axis which we
+// distribute equally on either side (see the _ref.html file used below for
+// more details).
+async function runTest34() {
+  let fuzz = navigator.platform.includes("Win") ?
+      { maxDifferent: 124044, maxDifference: 255 } :
+      { maxDifferent: 0, maxDifference: 0 };
+
+  let test = "printpreview_pps_uw4.html";
+  let ref = "printpreview_pps_uw4_ref.html";
+  await compareFiles(test, ref, {
+    maxDifferent: fuzz.maxDifferent,
+    maxDifference: fuzz.maxDifference,
+    test: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+        paperSizeUnit: Ci.nsIPrintSettings.kPaperSizeInches,
+        marginTop: 0,
+        marginRight: 0,
+        marginBottom: 0,
+        marginLeft: 0,
+        unwriteableMarginTop: 0.6,
+        unwriteableMarginRight: 0.1,
+        unwriteableMarginBottom: 0.4,
+        unwriteableMarginLeft: 0.3,
+        numPagesPerSheet: 4,
+      },
+    },
+    ref: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+        marginTop: 0,
+        marginRight: 0,
+        marginBottom: 0,
+        marginLeft: 0,
+        unwriteableMarginTop: 0,
+        unwriteableMarginRight: 0,
+        unwriteableMarginBottom: 0,
+        unwriteableMarginLeft: 0,
+      },
+    },
+  });
+
+  requestAnimationFrame(() => setTimeout(runTest35));
+}
+
+// In this subtest, the horizontal scale-factor is more-severe and hence ends
+// up "winning", and we have a bit of extra space in the vertical axis which we
+// distribute equally on either side (see the _ref.html file used below for
+// more details).
+async function runTest35() {
+  let fuzz = navigator.platform.includes("Win") ?
+      { maxDifferent: 151350, maxDifference: 255 } :
+      { maxDifferent: 0, maxDifference: 0 };
+
+  let test = "printpreview_pps_uw9.html";
+  let ref = "printpreview_pps_uw9_ref.html";
+  await compareFiles(test, ref, {
+    maxDifferent: fuzz.maxDifferent,
+    maxDifference: fuzz.maxDifference,
+    test: {
+      settings: {
+        paperWidth: 5,
+        paperHeight: 10,
+        paperSizeUnit: Ci.nsIPrintSettings.kPaperSizeInches,
+        marginTop: 0,
+        marginRight: 0,
+        marginBottom: 0,
+        marginLeft: 0,
+        unwriteableMarginTop: 0.2,
+        unwriteableMarginRight: 0.8,
+        unwriteableMarginBottom: 0.4,
+        unwriteableMarginLeft: 1.2,
+        numPagesPerSheet: 9,
+      },
+    },
+    ref: {
+      settings: {
+        paperWidth: 5,
+        paperHeight: 10,
+        marginTop: 0,
+        marginRight: 0,
+        marginBottom: 0,
+        marginLeft: 0,
+        unwriteableMarginTop: 0,
+        unwriteableMarginRight: 0,
+        unwriteableMarginBottom: 0,
+        unwriteableMarginLeft: 0,
+      },
+    },
+  });
+
+  requestAnimationFrame(() => setTimeout(runTest36));
+}
+
+// In this subtest, the vertical unwriteable margins exactly consume the full
+// pageHeight, so we don't have any space available for printing and we just
+// print a blank sheet. (This is mostly a stress test to be sure we don't
+// crash, hang, divide-by-zero, etc. in this edge case.)
+async function runTest36() {
+  let fuzz = navigator.platform.includes("Win") ?
+      { maxDifferent: 254, maxDifference: 255 } :
+      { maxDifferent: 0, maxDifference: 0 };
+
+  let test = "data:text/html,Unwriteable-Margins-Too-Tall-To-See-This";
+  let ref = "about:blank";
+  await compareFiles(test, ref, {
+    maxDifferent: fuzz.maxDifferent,
+    maxDifference: fuzz.maxDifference,
+    test: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+        paperSizeUnit: Ci.nsIPrintSettings.kPaperSizeInches,
+        unwriteableMarginTop: 3,
+        unwriteableMarginBottom: 2,
+        numPagesPerSheet: 4,
+      },
+    },
+    ref: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+      },
+    },
+  });
+
+  requestAnimationFrame(() => setTimeout(runTest37));
+}
+
+// In this subtest, the horizontal unwriteable margins consume more than the
+// full pageWidth, so we don't have any space available for printing and we
+// just print a blank sheet. (This is mostly a stress test to be sure we don't
+// crash, hang, divide-by-zero, etc. in this edge case.)
+async function runTest37() {
+  let fuzz = navigator.platform.includes("Win") ?
+      { maxDifferent: 172, maxDifference: 255 } :
+      { maxDifferent: 0, maxDifference: 0 };
+
+  let test = "data:text/html,Unwriteable-Margins-Too-Wide-To-See-This";
+  let ref = "about:blank";
+  await compareFiles(test, ref, {
+    maxDifferent: fuzz.maxDifferent,
+    maxDifference: fuzz.maxDifference,
+    test: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+        paperSizeUnit: Ci.nsIPrintSettings.kPaperSizeInches,
+        unwriteableMarginRight: 3,
+        unwriteableMarginLeft: 4,
+        numPagesPerSheet: 9,
+      },
+    },
+    ref: {
+      settings: {
+        paperWidth: 4,
+        paperHeight: 5,
+      },
+    },
+  });
+
   finish();
 }
 
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw4.html firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw4.html
--- firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw4.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw4.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- This is a testcase for a "4-pages-per-sheet" scenario.
+     There are 4 full-page "swatches" with large colorful borders. -->
+<style>
+html, body { margin: 0; height: 100%; }
+.swatch {
+  box-sizing: border-box;
+  border: 120px solid;
+  height: 100%;
+}
+.swatch:nth-child(1) { border-color: cyan; }
+.swatch:nth-child(2) { border-color: yellow; }
+.swatch:nth-child(3) { border-color: pink; }
+.swatch:nth-child(4) { border-color: orange; }
+</style>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw4_ref.html firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw4_ref.html
--- firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw4_ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw4_ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<!-- This is a reference case for a "4-pages-per-sheet" scenario. This file is
+     a mockup of a sheet with 4 pages, with the pages all having a 0.4x scale
+     scale factor applied. (We end up with that scale factor by subtracting the
+     requested unwriteable margins from the sheet, and dividing up the
+     remaining space equally among the "virtual pages".)  -->
+<style>
+html {
+  display: flex;
+  height: 100%;
+  margin: 0;
+}
+body {
+  /* As a flex item (a child of the html element), fill the available area. */
+  flex: 1;
+
+  /* We lay out the body as a column-oriented flex container (whose children,
+     in turn, are rows). */
+  display: flex;
+  flex-direction: column;
+
+  /* These margins represent the margins around the pages-per-sheet "page grid"
+     in the testcase.  They represent the unwriteable area, as well as the
+     "centering" area in the axis that has extra space, which in this case is
+     the horizontal axis. These values come directly from the
+     unwriteableMargin{Top,Right,Bottom,Left} values in this testcase's setup
+     code in printpreview_helper.xhtml, with 0.2in added to margin-right and
+     margin-left, to horizontally center the page-grid within the sheet's
+     writeable area. */
+  margin-top: 0.6in;
+  margin-right: 0.3in;  /* 0.1in + 0.2in for centering */
+  margin-bottom: 0.4in;
+  margin-left: 0.5in;   /* 0.3in + 0.2in for centering */
+}
+
+.row {
+  /* Give each row an equal share of the available height: */
+  flex: 1;
+
+  /* ...and render them as row-oriented (by default) flex containers: */
+  display: flex;
+}
+
+.swatch {
+  box-sizing: border-box;
+
+  /* These represent the 120px borders in the testcase, scaled down 0.4x: */
+  border: 48px solid;
+
+  /* Share the width equally among the swatches. (The height will be
+     automatically set to the flex container's row height, via default
+     'align-self' behavior.) */
+  flex: 1;
+
+  /* These values come directly from the unwriteableMargin values in the
+     testcase's configuration code in printpreview_helper.xhtml, with
+     each measurement scaled down by exactly 0.4x. */
+  margin-top: 0.24in;
+  margin-right: 0.04in;
+  margin-bottom: 0.16in;
+  margin-left: 0.12in;
+}
+.row:nth-child(1) > .swatch:nth-child(1) { border-color: cyan; }
+.row:nth-child(1) > .swatch:nth-child(2) { border-color: yellow; }
+.row:nth-child(2) > .swatch:nth-child(1) { border-color: pink; }
+.row:nth-child(2) > .swatch:nth-child(2) { border-color: orange; }
+</style>
+<div class="row">
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+</div>
+<div class="row">
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+</div>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw9.html firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw9.html
--- firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw9.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw9.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- This is a testcase for a "9-pages-per-sheet" scenario.
+     There are 9 full-page "swatches" with large colorful borders. -->
+<style>
+html, body { margin: 0; height: 100%; }
+.swatch {
+  box-sizing: border-box;
+  border: 120px solid;
+  height: 100%;
+}
+.swatch:nth-child(1) { border-color: cyan; }
+.swatch:nth-child(2) { border-color: yellow; }
+.swatch:nth-child(3) { border-color: pink; }
+.swatch:nth-child(4) { border-color: orange; }
+.swatch:nth-child(5) { border-color: purple; }
+.swatch:nth-child(6) { border-color: olive; }
+.swatch:nth-child(7) { border-color: blue; }
+.swatch:nth-child(8) { border-color: tan; }
+.swatch:nth-child(9) { border-color: fuchsia; }
+</style>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
+<div class="swatch"></div>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw9_ref.html firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw9_ref.html
--- firefox-84.0.2+build1/layout/base/tests/chrome/printpreview_pps_uw9_ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/printpreview_pps_uw9_ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<!-- This is a reference case for a "9-pages-per-sheet" scenario. This file is
+     a mockup of a sheet with 9 pages, with the pages all having a 0.2x scale
+     scale factor applied. (We end up with that scale factor by subtracting the
+     requested unwriteable margins from the sheet, and dividing up the
+     remaining space equally among the "virtual pages".)  -->
+<style>
+html {
+  display: flex;
+  height: 100%;
+  margin: 0;
+}
+body {
+  /* As a flex item (a child of the html element), fill the available area. */
+  flex: 1;
+
+  /* We lay out the body as a column-oriented flex container (whose children,
+     in turn, are rows). */
+  display: flex;
+  flex-direction: column;
+
+  /* These margins represent the margins around the pages-per-sheet "page grid"
+     in the testcase.  They represent the unwriteable area, as well as the
+     "centering" area in the axis that has extra space, which in this case is
+     the vertical axis. These values come directly from the
+     unwriteableMargin{Top,Right,Bottom,Left} values in this testcase's setup
+     code in printpreview_helper.xhtml, with 1.7in added to margin-top and to
+     margin-bottom, to vertically center the page-grid within the sheet's
+     writeable area. */
+  margin-top: 1.9in;    /* 0.2in + 1.7in for centering */
+  margin-right: 0.8in;
+  margin-bottom: 2.1in; /* 0.4in + 1.7in for centering */
+  margin-left: 1.2in;
+}
+
+.row {
+  /* Give each row an equal share of the available height: */
+  flex: 1;
+
+  /* ...and render them as row-oriented (by default) flex containers: */
+  display: flex;
+}
+
+.swatch {
+  box-sizing: border-box;
+
+  /* These represent the 120px borders in the testcase, scaled down 0.2x: */
+  border: 24px solid;
+
+  /* Share the width equally among the swatches. (The height will be
+     automatically set to the flex container's row height, via default
+     'align-self' behavior.) */
+  flex: 1;
+
+  /* These values come directly from the unwriteableMargin values in the
+     testcase's configuration code in printpreview_helper.xhtml, with
+     each measurement scaled down by exactly 0.2x. */
+  margin-top: 0.04in;
+  margin-right: 0.16in;
+  margin-bottom: 0.08in;
+  margin-left: 0.24in;
+}
+.row:nth-child(1) > .swatch:nth-child(1) { border-color: cyan; }
+.row:nth-child(1) > .swatch:nth-child(2) { border-color: yellow; }
+.row:nth-child(1) > .swatch:nth-child(3) { border-color: pink; }
+.row:nth-child(2) > .swatch:nth-child(1) { border-color: orange; }
+.row:nth-child(2) > .swatch:nth-child(2) { border-color: purple; }
+.row:nth-child(2) > .swatch:nth-child(3) { border-color: olive; }
+.row:nth-child(3) > .swatch:nth-child(1) { border-color: blue; }
+.row:nth-child(3) > .swatch:nth-child(2) { border-color: tan; }
+.row:nth-child(3) > .swatch:nth-child(3) { border-color: fuchsia; }
+</style>
+<div class="row">
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+</div>
+<div class="row">
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+</div>
+<div class="row">
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+  <div class="swatch"></div>
+</div>
diff -Nru firefox-84.0.2+build1/layout/base/tests/chrome/test_chrome_over_plugin.xhtml firefox-85.0+build1/layout/base/tests/chrome/test_chrome_over_plugin.xhtml
--- firefox-84.0.2+build1/layout/base/tests/chrome/test_chrome_over_plugin.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/chrome/test_chrome_over_plugin.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
-                 type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript"
-          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
-    SimpleTest.waitForExplicitFinish();
-    // Run the test in a separate window so that the test runs as a chrome
-    // window
-    SpecialPowers.setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    var w = window.openDialog("chrome_over_plugin_window.xhtml", "chrome_over_plugin",
-                              "chrome,width=200,height=300,noopener", window);
-  ]]>
-  </script>
-</window>
diff -Nru firefox-84.0.2+build1/layout/base/tests/empty.html firefox-85.0+build1/layout/base/tests/empty.html
--- firefox-84.0.2+build1/layout/base/tests/empty.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/empty.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
diff -Nru firefox-84.0.2+build1/layout/base/tests/mochitest.ini firefox-85.0+build1/layout/base/tests/mochitest.ini
--- firefox-84.0.2+build1/layout/base/tests/mochitest.ini	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/mochitest.ini	2021-01-18 19:58:16.000000000 +0000
@@ -100,7 +100,6 @@
 [test_bug851485.html]
 skip-if =
     toolkit == 'android'  # Bug 1355821
-    fission  # Hangs, undefined assertion name - got 4904, expected 500
 [test_bug858459.html]
 skip-if = toolkit == 'android' # Bug 1355822
 [test_bug968148.html]
diff -Nru firefox-84.0.2+build1/layout/base/tests/test_bug629838.html firefox-85.0+build1/layout/base/tests/test_bug629838.html
--- firefox-84.0.2+build1/layout/base/tests/test_bug629838.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/test_bug629838.html	2021-01-18 19:58:16.000000000 +0000
@@ -3,16 +3,11 @@
 <head>
   <title>Tests for MozAfterPaint</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display">
-<embed type="application/x-test" width="100" height="100" id="p"
-       drawmode="solid" color="FF00FF00"></embed>
+<div width="100" height="100" id="p" style="background-color: rgb(0,0,0)"/>
 </p>
 <div id="content" style="display: none">
   
@@ -46,24 +41,19 @@
 // Instead, wait for a minimum number of afterPaint events to at least ensure that they are being fired.
 const minimumAfterPaintsToPass = 10;
 
-function doPluginFlicker() {
-  ok(true, "Plugin color iteration " + color + 
+function doElementFlicker() {
+  ok(true, "Element color iteration " + color + 
      ", afterpaint count: " + afterPaintCount +
      ", mozpaint count: " + SpecialPowers.DOMWindowUtils.paintCount);
   if (afterPaintCount >= minimumAfterPaintsToPass) { 
-    ok(true, "afterPaintCount incremented enough from plugin color changes.");
+    ok(true, "afterPaintCount incremented enough from color changes.");
     SimpleTest.finish();
     return;
   }
 
   color = (color + 1) % 256;
-  var str = color.toString(16);
-  if (str.length < 2) {
-    str = "0" + str;
-  }
-  str = "FF" + str + str + str;
-  document.getElementById("p").setColor(str);
-  setTimeout(doPluginFlicker, 0);
+  document.getElementById("p").style.backgroundColor = "rgb(" + color + "," + color + "," + color + ")";
+  setTimeout(doElementFlicker, 0);
 }
 
 function doBackgroundFlicker() {
@@ -74,7 +64,7 @@
     ok(true, "afterPaintCount incremented enough from background color changes.");
     afterPaintCount = 0;
     initialPaintCount = SpecialPowers.DOMWindowUtils.paintCount;
-    doPluginFlicker();
+    doElementFlicker();
     return;
   }
 
diff -Nru firefox-84.0.2+build1/layout/base/tests/test_bug851485.html firefox-85.0+build1/layout/base/tests/test_bug851485.html
--- firefox-84.0.2+build1/layout/base/tests/test_bug851485.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/test_bug851485.html	2021-01-18 19:58:16.000000000 +0000
@@ -14,48 +14,50 @@
   /** Test for Bug 851485 **/
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
 
-function delayedVerifyScroll(win) {
-  ok(win.scrollY > 3000);
-  SimpleTest.finish();
-}
+var testRunning = false;
+async function runTest() {
+  if (testRunning) {
+    return;
+  }
+  testRunning = true;
 
-function verifyScroll(event) {
-  var win = event.target.defaultView;
-  win.onscroll = "";
-  setTimeout(function(){delayedVerifyScroll(win)},500)
-}
+  var e = document.getElementsByTagName('iframe')[0];
+  var win = e.contentWindow;
 
-function clickLink(link,win) {
+  var p = new Promise((r) => { win.addEventListener("hashchange", r, { once: true }); });
+  win.location.hash = '#anchor';
+  await p;
+
+  win.scrollTo(0, 500);
+
+  p = new Promise((r) => { e.addEventListener("load", r, { once: true }); });
+  win.location.reload();
+  await p;
+
+  is(win.location.hash, "#anchor", "We set the location's hash to 'anchor'");
+  is(win.scrollY, 500, "Reloading keeps scroll position");
+
+  var link = win.document.getElementsByTagName('a')[0];
+  var anchor = win.document.getElementsByTagName('a')[1];
+  p = new Promise((r) => {
+    var observer = new IntersectionObserver((entries) => {
+      if (entries.some((entry) => entry.isIntersecting)) {
+        observer.disconnect();
+        r();
+      }
+    });
+    observer.observe(anchor);
+  });
   win.document.body.offsetHeight;
   synthesizeMouseAtCenter(link, {type: "mousedown"}, win);
   synthesizeMouseAtCenter(link, {type: "mouseup"}, win);
   sendMouseEvent({type: "click"}, link, win);
-}
+  await p;
 
-function verifyAfterLoad() {
-  var e = document.getElementsByTagName('iframe')[0];
-  var win = e.contentWindow;
-  if (win.location.hash != '') {
-    is(win.scrollY,500);
-    var link = win.document.getElementsByTagName('a')[0];
-    win.onscroll = verifyScroll;
-    clickLink(link,win);
-    return;
-  }
-}
+  ok(win.scrollY > 3000, "Scrolling after load works.");
 
-function runTest() {
-  var e = document.getElementsByTagName('iframe')[0];
-  var win = e.contentWindow;
-  if (win.location.hash != '') {
-    return;
-  }
-  win.location.hash='#anchor'
-  win.scrollTo(0,500);
-  e.setAttribute("onload","verifyAfterLoad()");
-  win.location.reload()
+  SimpleTest.finish();
 }
 
 
diff -Nru firefox-84.0.2+build1/layout/base/tests/test_mozPaintCount.html firefox-85.0+build1/layout/base/tests/test_mozPaintCount.html
--- firefox-84.0.2+build1/layout/base/tests/test_mozPaintCount.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/tests/test_mozPaintCount.html	2021-01-18 19:58:16.000000000 +0000
@@ -3,16 +3,11 @@
 <head>
   <title>Tests for DOMWindowUtils.paintCount</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="doBackgroundFlicker()">
 <p id="display">
-<embed type="application/x-test" width="100" height="100" id="p"
-       drawmode="solid" color="FF00FF00"></embed>
+<div width="100" height="100" id="p" style="background-color: rgb(0,0,0)"/>
 </p>
 <div id="content" style="display: none">
   
@@ -26,7 +21,7 @@
 ok(true, "Got to initial paint count: " + startPaintCount);
 var color = 0;
 
-function doPluginFlicker() {
+function doElementFlicker() {
   ok(true, "Plugin color iteration " + color + ", paint count: " + SpecialPowers.DOMWindowUtils.paintCount);
   if (SpecialPowers.DOMWindowUtils.paintCount - startPaintCount > 20) {
     ok(true, "Got enough paints from plugin color changes");
@@ -35,13 +30,8 @@
   }
 
   color = (color + 1) % 256;
-  var str = color.toString(16);
-  if (str.length < 2) {
-    str = "0" + str;
-  }
-  str = "FF" + str + str + str;
-  document.getElementById("p").setColor(str);
-  setTimeout(doPluginFlicker, 0);
+  document.getElementById("p").style.backgroundColor = "rgb(" + color + "," + color + "," + color + ")";
+  setTimeout(doElementFlicker, 0);
 }
 
 function doBackgroundFlicker() {
@@ -49,7 +39,7 @@
   if (SpecialPowers.DOMWindowUtils.paintCount - startPaintCount > 20) {
     ok(true, "Got enough paints from background color changes");
     startPaintCount = SpecialPowers.DOMWindowUtils.paintCount;
-    doPluginFlicker();
+    doElementFlicker();
     return;
   }
 
diff -Nru firefox-84.0.2+build1/layout/base/TouchManager.cpp firefox-85.0+build1/layout/base/TouchManager.cpp
--- firefox-84.0.2+build1/layout/base/TouchManager.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/base/TouchManager.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include "TouchManager.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/PresShell.h"
 #include "nsIFrame.h"
diff -Nru firefox-84.0.2+build1/layout/forms/crashtests/1679471.html firefox-85.0+build1/layout/forms/crashtests/1679471.html
--- firefox-84.0.2+build1/layout/forms/crashtests/1679471.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/forms/crashtests/1679471.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,8 @@
+<style>
+* {
+  rotate: 0.8339rad;
+  inset: 84pt -15742cm 8% ! important;
+  position: fixed;
+}
+</style>
+<button>
diff -Nru firefox-84.0.2+build1/layout/forms/crashtests/323499-1.html firefox-85.0+build1/layout/forms/crashtests/323499-1.html
--- firefox-84.0.2+build1/layout/forms/crashtests/323499-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/crashtests/323499-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<html>
-<head>
-
-<style>
-select {
-  visibility: collapse;
-}
-
-body {
-  display: -moz-grid-group;
-}
-
-</style>
-</head>
-
-<body>
-
-<select><option>a</option></select>
-
-</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/forms/crashtests/363696-2.html firefox-85.0+build1/layout/forms/crashtests/363696-2.html
--- firefox-84.0.2+build1/layout/forms/crashtests/363696-2.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/crashtests/363696-2.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,2 +1,2 @@
-<div  style="display: -moz-grid-line;">
-<input type="file">
\ No newline at end of file
+<div style="display: -moz-box;">
+<input type="file">
diff -Nru firefox-84.0.2+build1/layout/forms/crashtests/crashtests.list firefox-85.0+build1/layout/forms/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/forms/crashtests/crashtests.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/crashtests/crashtests.list	2021-01-18 19:58:16.000000000 +0000
@@ -9,7 +9,6 @@
 load 315752-1.xhtml
 load 317502-1.xhtml
 load 321894.html
-load 323499-1.html
 load 343510-1.html
 load chrome://reftest/content/crashtests/layout/forms/crashtests/363696-1.xhtml
 load 363696-2.html
@@ -76,3 +75,4 @@
 load 1600207.html
 load 1600367.html
 load 1617753.html
+load 1679471.html
diff -Nru firefox-84.0.2+build1/layout/forms/nsComboboxControlFrame.cpp firefox-85.0+build1/layout/forms/nsComboboxControlFrame.cpp
--- firefox-84.0.2+build1/layout/forms/nsComboboxControlFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsComboboxControlFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1346,7 +1346,7 @@
   return mDisplayFrame;
 }
 
-nsIScrollableFrame* nsComboboxControlFrame::GetScrollTargetFrame() {
+nsIScrollableFrame* nsComboboxControlFrame::GetScrollTargetFrame() const {
   return do_QueryFrame(mDropdownFrame);
 }
 
diff -Nru firefox-84.0.2+build1/layout/forms/nsComboboxControlFrame.h firefox-85.0+build1/layout/forms/nsComboboxControlFrame.h
--- firefox-84.0.2+build1/layout/forms/nsComboboxControlFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsComboboxControlFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -102,7 +102,7 @@
         aFlags & ~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
   }
 
-  virtual nsIScrollableFrame* GetScrollTargetFrame() override;
+  virtual nsIScrollableFrame* GetScrollTargetFrame() const override;
 
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const override;
diff -Nru firefox-84.0.2+build1/layout/forms/nsFieldSetFrame.cpp firefox-85.0+build1/layout/forms/nsFieldSetFrame.cpp
--- firefox-84.0.2+build1/layout/forms/nsFieldSetFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsFieldSetFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -395,7 +395,7 @@
   NS_WARNING_ASSERTION(aReflowInput.ComputedISize() != NS_UNCONSTRAINEDSIZE,
                        "Should have a precomputed inline-size!");
 
-  nsOverflowAreas ocBounds;
+  OverflowAreas ocBounds;
   nsReflowStatus ocStatus;
   auto* prevInFlow = static_cast<nsFieldSetFrame*>(GetPrevInFlow());
   if (prevInFlow) {
diff -Nru firefox-84.0.2+build1/layout/forms/nsFieldSetFrame.h firefox-85.0+build1/layout/forms/nsFieldSetFrame.h
--- firefox-84.0.2+build1/layout/forms/nsFieldSetFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsFieldSetFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -64,7 +64,7 @@
     return nsContainerFrame::IsFrameOfType(
         aFlags & ~nsIFrame::eCanContainOverflowContainers);
   }
-  virtual nsIScrollableFrame* GetScrollTargetFrame() override {
+  virtual nsIScrollableFrame* GetScrollTargetFrame() const override {
     return do_QueryFrame(GetInner());
   }
 
diff -Nru firefox-84.0.2+build1/layout/forms/nsFileControlFrame.cpp firefox-85.0+build1/layout/forms/nsFileControlFrame.cpp
--- firefox-84.0.2+build1/layout/forms/nsFileControlFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsFileControlFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "nsGkAtoms.h"
 #include "nsCOMPtr.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/NodeInfo.h"
 #include "mozilla/dom/Element.h"
@@ -26,6 +27,7 @@
 #include "nsNodeInfoManager.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentUtils.h"
+#include "nsIFile.h"
 #include "nsUnicodeProperties.h"
 #include "mozilla/EventStates.h"
 #include "nsTextNode.h"
@@ -165,10 +167,12 @@
         labelBP +=
             lastLabelCont->GetLogicalUsedBorderAndPadding(wm).IStartEnd(wm);
       }
-      auto* buttonFrame = mBrowseFilesOrDirs->GetPrimaryFrame();
-      nscoord availableISizeForLabel =
-          contentISize - buttonFrame->ISize(wm) -
-          buttonFrame->GetLogicalUsedMargin(wm).IStartEnd(wm);
+      nscoord availableISizeForLabel = contentISize;
+      if (auto* buttonFrame = mBrowseFilesOrDirs->GetPrimaryFrame()) {
+        availableISizeForLabel -=
+            buttonFrame->ISize(wm) +
+            buttonFrame->GetLogicalUsedMargin(wm).IStartEnd(wm);
+      }
       if (CropTextToWidth(*aReflowInput.mRenderingContext, labelFrame,
                           availableISizeForLabel - labelBP, filename)) {
         nsBlockFrame::DidReflow(aPresContext, &aReflowInput);
diff -Nru firefox-84.0.2+build1/layout/forms/nsSearchControlFrame.cpp firefox-85.0+build1/layout/forms/nsSearchControlFrame.cpp
--- firefox-84.0.2+build1/layout/forms/nsSearchControlFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsSearchControlFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsSearchControlFrame.h"
 
 #include "HTMLInputElement.h"
+#include "mozilla/PresShell.h"
 #include "nsGkAtoms.h"
 #include "nsNameSpaceManager.h"
 #include "nsStyleConsts.h"
diff -Nru firefox-84.0.2+build1/layout/forms/nsTextControlFrame.cpp firefox-85.0+build1/layout/forms/nsTextControlFrame.cpp
--- firefox-84.0.2+build1/layout/forms/nsTextControlFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsTextControlFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -125,7 +125,7 @@
 
 nsTextControlFrame::~nsTextControlFrame() = default;
 
-nsIScrollableFrame* nsTextControlFrame::GetScrollTargetFrame() {
+nsIScrollableFrame* nsTextControlFrame::GetScrollTargetFrame() const {
   if (!mRootNode) {
     return nullptr;
   }
@@ -793,25 +793,6 @@
 nsresult nsTextControlFrame::SetSelectionInternal(
     nsINode* aStartNode, uint32_t aStartOffset, nsINode* aEndNode,
     uint32_t aEndOffset, nsITextControlFrame::SelectionDirection aDirection) {
-  // Create a new range to represent the new selection.
-  // Note that we use a new range to avoid having to do
-  // isIncreasing checks to avoid possible errors.
-
-  // Be careful to use internal nsRange methods which do not check to make sure
-  // we have access to the node.
-  // XXXbz nsRange::SetStartAndEnd takes int32_t (and ranges generally work on
-  // int32_t), but we're passing uint32_t.  The good news is that at this point
-  // our endpoints should really be within our length, so not really that big.
-  // And if they _are_ that big, SetStartAndEnd() will simply error out, which
-  // is not too bad for a case we don't expect to happen.
-  ErrorResult error;
-  RefPtr<nsRange> range =
-      nsRange::Create(aStartNode, aStartOffset, aEndNode, aEndOffset, error);
-  if (NS_WARN_IF(error.Failed())) {
-    return error.StealNSResult();
-  }
-  MOZ_ASSERT(range);
-
   // Get the selection, clear it and add the new range to it!
   TextControlElement* textControlElement =
       TextControlElement::FromNode(GetContent());
@@ -831,16 +812,10 @@
     direction = (aDirection == eBackward) ? eDirPrevious : eDirNext;
   }
 
-  selection->RemoveAllRanges(error);
-  if (NS_WARN_IF(error.Failed())) {
-    return error.StealNSResult();
-  }
-
-  selection->AddRangeAndSelectFramesAndNotifyListeners(
-      *range, error);  // NOTE: can destroy the world
-  if (NS_WARN_IF(error.Failed())) {
-    return error.StealNSResult();
-  }
+  ErrorResult error;
+  selection->SetStartAndEndInLimiter(*aStartNode, aStartOffset, *aEndNode,
+                                     aEndOffset, error);
+  MOZ_TRY(error.StealNSResult());
 
   selection->SetDirection(direction);
   return NS_OK;
diff -Nru firefox-84.0.2+build1/layout/forms/nsTextControlFrame.h firefox-85.0+build1/layout/forms/nsTextControlFrame.h
--- firefox-84.0.2+build1/layout/forms/nsTextControlFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/forms/nsTextControlFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TextControlElement.h"
-#include "mozilla/dom/Element.h"
 #include "nsContainerFrame.h"
 #include "nsIAnonymousContentCreator.h"
 #include "nsIContent.h"
@@ -61,10 +60,7 @@
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void DestroyFrom(nsIFrame* aDestructRoot,
                                                PostDestroyData&) override;
 
-  nsIScrollableFrame* GetScrollTargetFrame() override;
-  nsIScrollableFrame* GetScrollTargetFrame() const {
-    return const_cast<nsTextControlFrame*>(this)->GetScrollTargetFrame();
-  }
+  nsIScrollableFrame* GetScrollTargetFrame() const override;
 
   nscoord GetMinISize(gfxContext* aRenderingContext) override;
   nscoord GetPrefISize(gfxContext* aRenderingContext) override;
diff -Nru firefox-84.0.2+build1/layout/generic/AspectRatio.cpp firefox-85.0+build1/layout/generic/AspectRatio.cpp
--- firefox-84.0.2+build1/layout/generic/AspectRatio.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/AspectRatio.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,31 @@
+/* -*- 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 "AspectRatio.h"
+
+#include "mozilla/WritingModes.h"
+
+namespace mozilla {
+
+nscoord AspectRatio::ComputeRatioDependentSize(
+    LogicalAxis aRatioDependentAxis, const WritingMode& aWM,
+    nscoord aRatioDeterminingSize,
+    const LogicalSize& aContentBoxSizeToBoxSizingAdjust) const {
+  MOZ_ASSERT(*this,
+             "Infinite or zero ratio may have undefined behavior when "
+             "computing the size");
+  return aRatioDependentAxis == LogicalAxis::eLogicalAxisInline
+             ? ConvertToWritingMode(aWM).ApplyTo(
+                   aRatioDeterminingSize +
+                   aContentBoxSizeToBoxSizingAdjust.BSize(aWM)) -
+                   aContentBoxSizeToBoxSizingAdjust.ISize(aWM)
+             : ConvertToWritingMode(aWM).Inverted().ApplyTo(
+                   aRatioDeterminingSize +
+                   aContentBoxSizeToBoxSizingAdjust.ISize(aWM)) -
+                   aContentBoxSizeToBoxSizingAdjust.BSize(aWM);
+}
+
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/layout/generic/AspectRatio.h firefox-85.0+build1/layout/generic/AspectRatio.h
--- firefox-84.0.2+build1/layout/generic/AspectRatio.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/AspectRatio.h	2021-01-18 19:58:16.000000000 +0000
@@ -15,8 +15,15 @@
 #include <algorithm>
 #include <limits>
 
+namespace IPC {
+template <typename T>
+struct ParamTraits;
+}  // namespace IPC
+
 namespace mozilla {
 
+enum LogicalAxis : uint8_t;
+class LogicalSize;
 class WritingMode;
 
 struct AspectRatio {
@@ -64,6 +71,38 @@
   [[nodiscard]] inline AspectRatio ConvertToWritingMode(
       const WritingMode& aWM) const;
 
+  /**
+   * This method computes the ratio-dependent size by the ratio-determining size
+   * and aspect-ratio (i.e. preferred aspect ratio). Basically this function
+   * will be used in the calculation of 'auto' sizes when the preferred
+   * aspect ratio is not 'auto'.
+   *
+   * @param aRatioDependentAxis  The ratio depenedent axis of the box.
+   * @param aWM  The writing mode of the box.
+   * @param aRatioDetermingSize  The size on the ratio determining axis.
+   *                             Basically, we use this size and |mRatio| to
+   *                             compute the size on the ratio-dependent axis.
+   * @param aContentBoxSizeToBoxSizingAdjust  The border padding box size
+   *                                          adjustment. We need this because
+   *                                          aspect-ratio should take the
+   *                                          box-sizing into account if its
+   *                                          style is '<ratio>'. If its style
+   *                                          is 'auto & <ratio>', we should use
+   *                                          content-box dimensions always.
+   *                                          If the callers want the ratio to
+   *                                          apply to the content-box size, we
+   *                                          should pass a zero LogicalSize.
+   *
+   * The return value is the content-box size on the ratio-dependent axis.
+   * Plese see the definition of the ratio-dependent axis and the
+   * ratio-determining axis in the spec:
+   * https://drafts.csswg.org/css-sizing-4/#aspect-ratio
+   */
+  [[nodiscard]] nscoord ComputeRatioDependentSize(
+      LogicalAxis aRatioDependentAxis, const WritingMode& aWM,
+      nscoord aRatioDeterminingSize,
+      const LogicalSize& aContentBoxSizeToBoxSizingAdjust) const;
+
   bool operator==(const AspectRatio& aOther) const {
     return mRatio == aOther.mRatio;
   }
diff -Nru firefox-84.0.2+build1/layout/generic/BlockReflowInput.cpp firefox-85.0+build1/layout/generic/BlockReflowInput.cpp
--- firefox-84.0.2+build1/layout/generic/BlockReflowInput.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/BlockReflowInput.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -42,9 +42,7 @@
       mBorderPadding(
           mReflowInput
               .ComputedLogicalBorderPadding(mReflowInput.GetWritingMode())
-              .ApplySkipSides(aFrame->GetLogicalSkipSides(
-                  Some(nsIFrame::SkipSidesDuringReflow{aReflowInput,
-                                                       aConsumedBSize})))),
+              .ApplySkipSides(aFrame->PreReflowBlockLevelLogicalSkipSides())),
       mPrevBEndMargin(),
       mLineNumber(0),
       mFloatBreakType(StyleClear::None),
@@ -120,8 +118,11 @@
     // We are in a paginated situation. The block-end edge is just inside the
     // block-end border and padding. The content area block-size doesn't include
     // either border or padding edge.
-    mContentArea.BSize(wm) = std::max(
-        0, aReflowInput.AvailableBSize() - mBorderPadding.BStartEnd(wm));
+    auto bp = aFrame->StyleBorder()->mBoxDecorationBreak ==
+                      StyleBoxDecorationBreak::Clone
+                  ? mBorderPadding.BStartEnd(wm)
+                  : mBorderPadding.BStart(wm);
+    mContentArea.BSize(wm) = std::max(0, aReflowInput.AvailableBSize() - bp);
   } else {
     // When we are not in a paginated situation, then we always use a
     // unconstrained block-size.
diff -Nru firefox-84.0.2+build1/layout/generic/BlockReflowInput.h firefox-85.0+build1/layout/generic/BlockReflowInput.h
--- firefox-84.0.2+build1/layout/generic/BlockReflowInput.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/BlockReflowInput.h	2021-01-18 19:58:16.000000000 +0000
@@ -329,7 +329,7 @@
   mozilla::LogicalMargin mBorderPadding;
 
   // The overflow areas of all floats placed so far
-  nsOverflowAreas mFloatOverflowAreas;
+  mozilla::OverflowAreas mFloatOverflowAreas;
 
   nsFloatCacheFreeList mFloatCacheFreeList;
 
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1058954-1.html firefox-85.0+build1/layout/generic/crashtests/1058954-1.html
--- firefox-84.0.2+build1/layout/generic/crashtests/1058954-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1058954-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -2,7 +2,7 @@
 <html>
 <body>
 
-    <div style="display: -moz-grid-line;">
+    <div style="display: -moz-box;">
         <div style="position: relative; direction: rtl;">
             <div style="position: absolute;">
             </div>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1638860-1.html firefox-85.0+build1/layout/generic/crashtests/1638860-1.html
--- firefox-84.0.2+build1/layout/generic/crashtests/1638860-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1638860-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,24 @@
+<html>
+<body>
+    <style>
+        html {
+            -moz-transform-style: preserve-3d;
+        }
+        div,html {
+            display: inline-grid;
+            grid-template-columns: subgrid;
+        }
+        div {
+            position: fixed;
+        }
+    </style>
+    <script>
+      window.addEventListener('load', () => {
+        const div = document.createElementNS('http://www.w3.org/1999/xhtml', 'div')
+        const text = document.createTextNode('BAR')
+        div.appendChild(text)
+        document.documentElement.appendChild(div)
+      })
+    </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1638860-2.html firefox-85.0+build1/layout/generic/crashtests/1638860-2.html
--- firefox-84.0.2+build1/layout/generic/crashtests/1638860-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1638860-2.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,26 @@
+<html>
+<body>
+    <style>
+        div {
+            position: relative;
+        }
+        span,div {
+            display: inline-grid;
+            grid-template-columns: subgrid;
+        }
+        span {
+            position: absolute;
+        }
+    </style>
+    <script>
+      window.addEventListener('load', () => {
+        const span = document.createElementNS('http://www.w3.org/1999/xhtml', 'span')
+        const text = document.createTextNode('BAR')
+        span.appendChild(text)
+        const div = document.getElementsByTagName('div')[0];
+        div.appendChild(span)
+      })
+    </script>
+<div>FOO</div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1638906.html firefox-85.0+build1/layout/generic/crashtests/1638906.html
--- firefox-84.0.2+build1/layout/generic/crashtests/1638906.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1638906.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,25 @@
+<html>
+<head>
+    <style>
+        *, LI {
+            display: inline-grid;
+            grid-row: line_name_1 / auto;
+        }
+        HTML {
+            scale: -102 63;
+        }
+        * {
+            grid: subgrid [ line_name_5 ] / auto-flow dense fit-content(40%);
+        }
+    </style>
+
+    <script>
+      document.addEventListener('DOMContentLoaded', () => {
+        const style = document.createElement('style')
+        document.head.appendChild(style)
+        const sheet = style.sheet
+        sheet.addRule('script', 'position:absolute!important', (820656062 % sheet.cssRules.length))
+      })
+    </script>
+</head>
+</html>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1677518-1.html firefox-85.0+build1/layout/generic/crashtests/1677518-1.html
--- firefox-84.0.2+build1/layout/generic/crashtests/1677518-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1677518-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,15 @@
+<html class="reftest-wait">
+<head>
+<script>
+function finish() {
+	document.documentElement.className = "";
+}
+      window.addEventListener('load', () => {
+        const video = document.createElementNS('http://www.w3.org/1999/xhtml', 'video')
+        document.documentElement.appendChild(video)
+        setTimeout(async  () => { video.poster = '1677518-1.jpg'; setTimeout(finish, 500); }, 165 )
+        video.setAttribute('poster', '1677518-1.svg')
+      })
+    </script>
+</head>
+</html>
\ No newline at end of file
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/layout/generic/crashtests/1677518-1.jpg and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/layout/generic/crashtests/1677518-1.jpg differ
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/1677518-1.svg firefox-85.0+build1/layout/generic/crashtests/1677518-1.svg
--- firefox-84.0.2+build1/layout/generic/crashtests/1677518-1.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/1677518-1.svg	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,29 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     class="reftest-wait"
+     onload="setTimeAndSnapshot(2, true)">
+  <script xlink:href="../smil-util.js" type="text/javascript"/>
+  <!--
+    Test that ends are sampled first.
+   -->
+  <rect width="100" height="100" fill="red">
+    <animate attributeName="y" attributeType="XML" from="0" to="0" id="a"
+      begin="-3s; 1.5s" dur="20s"/>
+    <animate attributeName="fill" attributeType="CSS"
+      values="orange; green; purple"
+      begin="a.begin-0.5s; 1.5s" dur="2s" restart="whenNotActive"/>
+    <!--
+      So initially we have:
+      a: -3->17s
+      (b): -3.5->-1.5s (instance times: -3.5s, 1.5s)
+
+      At t=1.5s we get an early end on 'a', giving us:
+      a: 1.5->21.5s
+      (b): 1.0->3.0s (instance times: 1.0s, 1.5s)
+
+      If, at t=1.5s, we sample the second animation first, we'll start an
+      interval from 1.5s instead of 1.0s. So this is a test that ends are
+      actually sampled first.
+     -->
+  </rect>
+</svg>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/348991-1.xhtml firefox-85.0+build1/layout/generic/crashtests/348991-1.xhtml
--- firefox-84.0.2+build1/layout/generic/crashtests/348991-1.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/348991-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <div style="width: 10em; display: -moz-grid;">
-      <select><option>A</option></select>
-      <select><option>B</option></select>
-    </div>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/403143-1.html firefox-85.0+build1/layout/generic/crashtests/403143-1.html
--- firefox-84.0.2+build1/layout/generic/crashtests/403143-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/403143-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -10,7 +10,7 @@
 </script>
 </head>
 
-<body onload="boom();" style="overflow: auto; display: -moz-grid-line;">
+<body onload="boom();" style="overflow: auto; display: -moz-box;">
 <img id="i1" style="width: 30px; float: right;">
 <img id="i2" style="margin: 0 100%; padding: 0 60px;">
 <img id="i3" style="margin: 100% 0; float: right;">
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/430744-1.html firefox-85.0+build1/layout/generic/crashtests/430744-1.html
--- firefox-84.0.2+build1/layout/generic/crashtests/430744-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/430744-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -4,7 +4,7 @@
 </head>
 <body onload="document.getElementById('x').appendChild(document.createTextNode('b'));">
 
-<div style="display: -moz-grid;"><div style="column-count: 2;">a<div id="x" style="padding: 1em;"></div><wbr></div></div>
+<div style="display: -moz-box;"><div style="column-count: 2;">a<div id="x" style="padding: 1em;"></div><wbr></div></div>
 
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/generic/crashtests/crashtests.list firefox-85.0+build1/layout/generic/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/generic/crashtests/crashtests.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/crashtests/crashtests.list	2021-01-18 19:58:16.000000000 +0000
@@ -51,7 +51,6 @@
 load 348510-1.html
 load 348510-2.html
 load 348887-1.html
-load 348991-1.xhtml
 load 350370.html
 load 354458-1.html
 load 354458-2.html
@@ -343,7 +342,7 @@
 load 478185-1.html
 load 478504.html
 asserts-if(!Android,0-1) load 479938-1.html # Bug 575011
-asserts(60) load 480345-1.html # bug 1655630
+asserts(20) load 480345-1.html # bug 1655630
 load 481921.html
 load 489462-1.html
 load 489477.html
@@ -405,12 +404,12 @@
 load 564368-1.xhtml
 load 564968.xhtml
 load 569193-1.html
-asserts(2) load 570160.html # bug 1655630
+load 570160.html
 load 570289-1.html
 load 571618-1.svg
 asserts(0-1) load 571975-1.html # bug 574889
 load 571995.xhtml
-asserts(3) load 574958.xhtml # bug 1655630
+asserts(1) load 574958.xhtml # bug 1655630
 asserts(0-6) load 578977.html # bug 757305
 load 580504-1.xhtml
 load 585598-1.xhtml
@@ -774,6 +773,9 @@
 load 1633737-4.html
 load 1633737-5.html
 load 1633828.html
+load 1638860-1.html
+load 1638860-2.html
+load 1638906.html
 load 1640028.html
 load 1640051.html
 load 1640275.html
@@ -784,3 +786,4 @@
 load 1652897.html
 asserts(0-7) load 1654925.html
 load 1666592.html
+HTTP load 1677518-1.html
diff -Nru firefox-84.0.2+build1/layout/generic/FrameClasses.py firefox-85.0+build1/layout/generic/FrameClasses.py
--- firefox-84.0.2+build1/layout/generic/FrameClasses.py	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/FrameClasses.py	2021-01-18 19:58:16.000000000 +0000
@@ -34,8 +34,6 @@
     Frame("nsIFrame", "None", NOT_LEAF),
     Frame("nsGfxButtonControlFrame", "GfxButtonControl", LEAF),
     Frame("nsGridContainerFrame", "GridContainer", NOT_LEAF),
-    Frame("nsGridRowGroupFrame", "Box", NOT_LEAF),
-    Frame("nsGridRowLeafFrame", "Box", NOT_LEAF),
     Frame("nsHTMLButtonControlFrame", "HTMLButtonControl", NOT_LEAF),
     Frame("nsHTMLCanvasFrame", "HTMLCanvas", NOT_LEAF),
     Frame("nsHTMLFramesetBlankFrame", "None", LEAF),
diff -Nru firefox-84.0.2+build1/layout/generic/MathMLTextRunFactory.cpp firefox-85.0+build1/layout/generic/MathMLTextRunFactory.cpp
--- firefox-84.0.2+build1/layout/generic/MathMLTextRunFactory.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/MathMLTextRunFactory.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -678,6 +678,7 @@
     transformedChild->FinishSettingProperties(aRefDrawTarget, aMFR);
   }
 
+  aTextRun->ResetGlyphRuns();
   if (mergeNeeded) {
     // Now merge multiple characters into one multi-glyph character as required
     NS_ASSERTION(charsToMergeArray.Length() == child->GetLength(),
@@ -690,7 +691,6 @@
     // No merging to do, so just copy; this produces a more optimized textrun.
     // We can't steal the data because the child may be cached and stealing
     // the data would break the cache.
-    aTextRun->ResetGlyphRuns();
     aTextRun->CopyGlyphDataFrom(child, Range(child), 0);
   }
 }
diff -Nru firefox-84.0.2+build1/layout/generic/moz.build firefox-85.0+build1/layout/generic/moz.build
--- firefox-84.0.2+build1/layout/generic/moz.build	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/moz.build	2021-01-18 19:58:16.000000000 +0000
@@ -164,6 +164,7 @@
 ]
 
 UNIFIED_SOURCES += [
+    "AspectRatio.cpp",
     "BlockReflowInput.cpp",
     "BRFrame.cpp",
     "ColumnSetWrapperFrame.cpp",
diff -Nru firefox-84.0.2+build1/layout/generic/nsAbsoluteContainingBlock.cpp firefox-85.0+build1/layout/generic/nsAbsoluteContainingBlock.cpp
--- firefox-84.0.2+build1/layout/generic/nsAbsoluteContainingBlock.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsAbsoluteContainingBlock.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -155,7 +155,7 @@
                                        nsReflowStatus& aReflowStatus,
                                        const nsRect& aContainingBlock,
                                        AbsPosReflowFlags aFlags,
-                                       nsOverflowAreas* aOverflowAreas) {
+                                       OverflowAreas* aOverflowAreas) {
   // PageContentFrame replicates fixed pos children so we really don't want
   // them contributing to overflow areas because that means we'll create new
   // pages ad infinitum if one of them overflows the page.
@@ -666,7 +666,7 @@
     nsIFrame* aDelegatingFrame, nsPresContext* aPresContext,
     const ReflowInput& aReflowInput, const nsRect& aContainingBlock,
     AbsPosReflowFlags aFlags, nsIFrame* aKidFrame, nsReflowStatus& aStatus,
-    nsOverflowAreas* aOverflowAreas) {
+    OverflowAreas* aOverflowAreas) {
   MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
 
 #ifdef DEBUG
@@ -712,25 +712,6 @@
       initFlags += ReflowInput::InitFlag::StaticPosIsCBOrigin;
     }
   }
-  ReflowInput kidReflowInput(aPresContext, aReflowInput, aKidFrame,
-                             LogicalSize(wm, availISize, NS_UNCONSTRAINEDSIZE),
-                             Some(logicalCBSize), initFlags);
-
-  // Get the border values
-  WritingMode outerWM = aReflowInput.GetWritingMode();
-  const LogicalMargin border(outerWM, aDelegatingFrame->GetUsedBorder());
-
-  LogicalMargin margin = kidReflowInput.ComputedLogicalMargin(outerWM);
-
-  // If we're doing CSS Box Alignment in either axis, that will apply the
-  // margin for us in that axis (since the thing that's aligned is the margin
-  // box).  So, we clear out the margin here to avoid applying it twice.
-  if (kidReflowInput.mFlags.mIOffsetsNeedCSSAlign) {
-    margin.IStart(outerWM) = margin.IEnd(outerWM) = 0;
-  }
-  if (kidReflowInput.mFlags.mBOffsetsNeedCSSAlign) {
-    margin.BStart(outerWM) = margin.BEnd(outerWM) = 0;
-  }
 
   bool constrainBSize =
       (aReflowInput.AvailableBSize() != NS_UNCONSTRAINEDSIZE) &&
@@ -751,10 +732,22 @@
       (aKidFrame->GetLogicalRect(aContainingBlock.Size()).BStart(wm) <=
        aReflowInput.AvailableBSize());
 
-  if (constrainBSize) {
-    kidReflowInput.AvailableBSize() =
-        aReflowInput.AvailableBSize() -
-        border.ConvertTo(wm, outerWM).BStart(wm) -
+  // Get the border values
+  const WritingMode outerWM = aReflowInput.GetWritingMode();
+  const LogicalMargin border = aDelegatingFrame->GetLogicalUsedBorder(outerWM);
+
+  const nscoord availBSize = constrainBSize
+                                 ? aReflowInput.AvailableBSize() -
+                                       border.ConvertTo(wm, outerWM).BStart(wm)
+                                 : NS_UNCONSTRAINEDSIZE;
+
+  ReflowInput kidReflowInput(aPresContext, aReflowInput, aKidFrame,
+                             LogicalSize(wm, availISize, availBSize),
+                             Some(logicalCBSize), initFlags);
+
+  if (kidReflowInput.AvailableBSize() != NS_UNCONSTRAINEDSIZE) {
+    // Shrink available block-size if it's constrained.
+    kidReflowInput.AvailableBSize() -=
         kidReflowInput.ComputedLogicalMargin(wm).BStart(wm);
     const nscoord kidOffsetBStart =
         kidReflowInput.ComputedLogicalOffsets(wm).BStart(wm);
@@ -767,9 +760,20 @@
   ReflowOutput kidDesiredSize(kidReflowInput);
   aKidFrame->Reflow(aPresContext, kidDesiredSize, kidReflowInput, aStatus);
 
-  const LogicalSize kidSize = kidDesiredSize.Size(wm).ConvertTo(outerWM, wm);
+  const LogicalSize kidSize = kidDesiredSize.Size(outerWM);
 
   LogicalMargin offsets = kidReflowInput.ComputedLogicalOffsets(outerWM);
+  LogicalMargin margin = kidReflowInput.ComputedLogicalMargin(outerWM);
+
+  // If we're doing CSS Box Alignment in either axis, that will apply the
+  // margin for us in that axis (since the thing that's aligned is the margin
+  // box).  So, we clear out the margin here to avoid applying it twice.
+  if (kidReflowInput.mFlags.mIOffsetsNeedCSSAlign) {
+    margin.IStart(outerWM) = margin.IEnd(outerWM) = 0;
+  }
+  if (kidReflowInput.mFlags.mBOffsetsNeedCSSAlign) {
+    margin.BStart(outerWM) = margin.BEnd(outerWM) = 0;
+  }
 
   // If we're solving for start in either inline or block direction,
   // then compute it now that we know the dimensions.
diff -Nru firefox-84.0.2+build1/layout/generic/nsAbsoluteContainingBlock.h firefox-85.0+build1/layout/generic/nsAbsoluteContainingBlock.h
--- firefox-84.0.2+build1/layout/generic/nsAbsoluteContainingBlock.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsAbsoluteContainingBlock.h	2021-01-18 19:58:16.000000000 +0000
@@ -91,7 +91,7 @@
   void Reflow(nsContainerFrame* aDelegatingFrame, nsPresContext* aPresContext,
               const ReflowInput& aReflowInput, nsReflowStatus& aReflowStatus,
               const nsRect& aContainingBlock, AbsPosReflowFlags aFlags,
-              nsOverflowAreas* aOverflowAreas);
+              mozilla::OverflowAreas* aOverflowAreas);
 
   using PostDestroyData = nsIFrame::PostDestroyData;
   void DestroyFrames(nsIFrame* aDelegatingFrame, nsIFrame* aDestructRoot,
@@ -141,7 +141,7 @@
                            const nsRect& aContainingBlockRect,
                            AbsPosReflowFlags aFlags, nsIFrame* aKidFrame,
                            nsReflowStatus& aStatus,
-                           nsOverflowAreas* aOverflowAreas);
+                           mozilla::OverflowAreas* aOverflowAreas);
 
   /**
    * Mark our absolute frames dirty.
diff -Nru firefox-84.0.2+build1/layout/generic/nsBlockFrame.cpp firefox-85.0+build1/layout/generic/nsBlockFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsBlockFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsBlockFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1253,7 +1253,7 @@
 
   const ReflowInput* reflowInput = &aReflowInput;
   WritingMode wm = aReflowInput.GetWritingMode();
-  nscoord consumedBSize = CalcAndCacheConsumedBSize(wm);
+  nscoord consumedBSize = CalcAndCacheConsumedBSize();
   nscoord effectiveComputedBSize =
       GetEffectiveComputedBSize(aReflowInput, consumedBSize);
   Maybe<ReflowInput> mutableReflowInput;
@@ -1336,7 +1336,7 @@
   }
 
   // Handle paginated overflow (see nsContainerFrame.h)
-  nsOverflowAreas ocBounds;
+  OverflowAreas ocBounds;
   nsReflowStatus ocStatus;
   if (GetPrevInFlow()) {
     ReflowOverflowContainerChildren(
@@ -1351,9 +1351,8 @@
 
   // Drain & handle pushed floats
   DrainPushedFloats();
-  nsOverflowAreas fcBounds;
-  nsReflowStatus fcStatus;
-  ReflowPushedFloats(state, fcBounds, fcStatus);
+  OverflowAreas fcBounds;
+  ReflowPushedFloats(state, fcBounds);
 
   // If we're not dirty (which means we'll mark everything dirty later)
   // and our inline-size has changed, mark the lines dirty that we need to
@@ -1401,7 +1400,6 @@
   }
 
   state.mReflowStatus.MergeCompletionStatusFrom(ocStatus);
-  state.mReflowStatus.MergeCompletionStatusFrom(fcStatus);
 
   // If we end in a BR with clear and affected floats continue,
   // we need to continue, too.
@@ -1504,12 +1502,17 @@
     nsSize containerSize = aMetrics.PhysicalSize();
     nscoord deltaX = containerSize.width - state.ContainerSize().width;
     if (deltaX != 0) {
+      // We compute our lines and markers' overflow areas later in
+      // ComputeOverflowAreas(), so we don't need to adjust their overflow areas
+      // here.
       const nsPoint physicalDelta(deltaX, 0);
       for (auto& line : Lines()) {
         UpdateLineContainerSize(&line, containerSize);
       }
+      fcBounds.Clear();
       for (nsIFrame* f : mFloats) {
         f->MovePositionBy(physicalDelta);
+        ConsiderChildOverflow(fcBounds, f);
       }
       nsFrameList* markerList = GetOutsideMarkerList();
       if (markerList) {
@@ -1518,8 +1521,10 @@
         }
       }
       if (nsFrameList* overflowContainers = GetOverflowContainers()) {
+        ocBounds.Clear();
         for (nsIFrame* f : *overflowContainers) {
           f->MovePositionBy(physicalDelta);
+          ConsiderChildOverflow(ocBounds, f);
         }
       }
     }
@@ -1879,8 +1884,8 @@
   }
 
   if (NS_UNCONSTRAINEDSIZE != aReflowInput.ComputedBSize()) {
-    // Note: We don't use blockEndEdgeOfChildren because it inclues the previous
-    // margin.
+    // Note: We don't use blockEndEdgeOfChildren because it includes the
+    // previous margin.
     nscoord contentBSize = aState.mBCoord + nonCarriedOutBDirMargin;
     finalSize.BSize(wm) =
         ComputeFinalBSize(aReflowInput, aState.mReflowStatus, contentBSize,
@@ -2029,8 +2034,8 @@
   aMetrics.SetSize(wm, finalSize);
 
 #ifdef DEBUG_blocks
-  if ((CRAZY_SIZE(aMetrics.Width()) || CRAZY_SIZE(aMetrics.Height())) &&
-      !GetParent()->IsCrazySizeAssertSuppressed()) {
+  if ((ABSURD_SIZE(aMetrics.Width()) || ABSURD_SIZE(aMetrics.Height())) &&
+      !GetParent()->IsAbsurdSizeAssertSuppressed()) {
     ListTag(stdout);
     printf(": WARNING: desired:%d,%d\n", aMetrics.Width(), aMetrics.Height());
   }
@@ -2039,7 +2044,7 @@
 
 static void ConsiderBlockEndEdgeOfChildren(const WritingMode aWritingMode,
                                            nscoord aBEndEdgeOfChildren,
-                                           nsOverflowAreas& aOverflowAreas,
+                                           OverflowAreas& aOverflowAreas,
                                            const nsStyleDisplay* aDisplay) {
   // Factor in the block-end edge of the children.  Child frames will be added
   // to the overflow area as we iterate through the lines, but their margins
@@ -2052,8 +2057,9 @@
   // to be stored logically, this can be simplified again.
   if (aWritingMode.IsVertical()) {
     if (aWritingMode.IsVerticalLR()) {
-      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-        if (!(aDisplay->IsContainLayout() && otype == eScrollableOverflow)) {
+      for (const auto otype : AllOverflowTypes()) {
+        if (!(aDisplay->IsContainLayout() &&
+              otype == OverflowType::Scrollable)) {
           // Layout containment should force all overflow to be ink (visual)
           // overflow, so if we're layout-contained, we only add our children's
           // block-end edge to the ink (visual) overflow -- not to the
@@ -2063,8 +2069,9 @@
         }
       }
     } else {
-      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-        if (!(aDisplay->IsContainLayout() && otype == eScrollableOverflow)) {
+      for (const auto otype : AllOverflowTypes()) {
+        if (!(aDisplay->IsContainLayout() &&
+              otype == OverflowType::Scrollable)) {
           nsRect& o = aOverflowAreas.Overflow(otype);
           nscoord xmost = o.XMost();
           o.x = std::min(o.x, xmost - aBEndEdgeOfChildren);
@@ -2073,8 +2080,8 @@
       }
     }
   } else {
-    NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-      if (!(aDisplay->IsContainLayout() && otype == eScrollableOverflow)) {
+    for (const auto otype : AllOverflowTypes()) {
+      if (!(aDisplay->IsContainLayout() && otype == OverflowType::Scrollable)) {
         nsRect& o = aOverflowAreas.Overflow(otype);
         o.height = std::max(o.YMost(), aBEndEdgeOfChildren) - o.y;
       }
@@ -2085,11 +2092,11 @@
 void nsBlockFrame::ComputeOverflowAreas(const nsRect& aBounds,
                                         const nsStyleDisplay* aDisplay,
                                         nscoord aBEndEdgeOfChildren,
-                                        nsOverflowAreas& aOverflowAreas) {
+                                        OverflowAreas& aOverflowAreas) {
   // Compute the overflow areas of our children
   // XXX_perf: This can be done incrementally.  It is currently one of
   // the things that makes incremental reflow O(N^2).
-  nsOverflowAreas areas(aBounds, aBounds);
+  OverflowAreas areas(aBounds, aBounds);
   if (ShouldApplyOverflowClipping(aDisplay) != PhysicalAxes::Both) {
     for (const auto& line : Lines()) {
       if (aDisplay->IsContainLayout()) {
@@ -2100,8 +2107,8 @@
         // so this has the same affect as unioning the child's visual and
         // scrollable overflow with its parent's ink overflow.
         nsRect childVisualRect = line.InkOverflowRect();
-        nsOverflowAreas childVisualArea =
-            nsOverflowAreas(childVisualRect, nsRect());
+        OverflowAreas childVisualArea =
+            OverflowAreas(childVisualRect, nsRect());
         areas.UnionWith(childVisualArea);
       } else {
         areas.UnionWith(line.GetOverflowAreas());
@@ -2121,27 +2128,23 @@
                                    aDisplay);
   }
 
-#ifdef NOISY_COMBINED_AREA
-  ListTag(stdout);
-  const nsRect& vis = areas.InkOverflow();
-  printf(": InkOverflowArea CA=%d,%d,%d,%d\n", vis.x, vis.y, vis.width,
-         vis.height);
-  const nsRect& scr = areas.ScrollableOverflow();
-  printf(": ScrollableOverflowArea CA=%d,%d,%d,%d\n", scr.x, scr.y, scr.width,
-         scr.height);
+#ifdef NOISY_OVERFLOW_AREAS
+  printf("%s: InkOverflowArea=%s, ScrollableOverflowArea=%s\n", ListTag().get(),
+         ToString(areas.InkOverflow()).c_str(),
+         ToString(areas.ScrollableOverflow()).c_str());
 #endif
 
   aOverflowAreas = areas;
 }
 
-void nsBlockFrame::UnionChildOverflow(nsOverflowAreas& aOverflowAreas) {
+void nsBlockFrame::UnionChildOverflow(OverflowAreas& aOverflowAreas) {
   // We need to update the overflow areas of lines manually, as they
   // get cached and re-used otherwise. Lines aren't exposed as normal
   // frame children, so calling UnionChildOverflow alone will end up
   // using the old cached values.
   for (auto& line : Lines()) {
     nsRect bounds = line.GetPhysicalBounds();
-    nsOverflowAreas lineAreas(bounds, bounds);
+    OverflowAreas lineAreas(bounds, bounds);
 
     int32_t n = line.GetChildCount();
     for (nsIFrame* lineFrame = line.mFirstChild; n > 0;
@@ -2166,7 +2169,7 @@
                                     {kPrincipalList, kFloatList});
 }
 
-bool nsBlockFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool nsBlockFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   bool found;
   nscoord blockEndEdgeOfChildren =
       GetProperty(BlockEndEdgeOfChildrenProperty(), &found);
@@ -2365,7 +2368,7 @@
     WritingMode wm = aState.mReflowInput.GetWritingMode();
     nsSize containerSize = aState.ContainerSize();
     LogicalRect overflow =
-        aLine->GetOverflowArea(eScrollableOverflow, wm, containerSize);
+        aLine->GetOverflowArea(OverflowType::Scrollable, wm, containerSize);
     nscoord lineBCoordCombinedBefore = overflow.BStart(wm) + aDeltaBCoord;
     nscoord lineBCoordCombinedAfter =
         lineBCoordCombinedBefore + overflow.BSize(wm);
@@ -3193,7 +3196,7 @@
       nsFlowAreaRect r = aState.GetFloatAvailableSpaceForBSize(
           aLine->BStart(), aLine->BSize(), nullptr);
       if (r.HasFloats()) {
-        LogicalRect so = aLine->GetOverflowArea(eScrollableOverflow, wm,
+        LogicalRect so = aLine->GetOverflowArea(OverflowType::Scrollable, wm,
                                                 aLine->mContainerSize);
         nscoord s = r.mRect.IStart(wm);
         nscoord e = r.mRect.IEnd(wm);
@@ -3771,9 +3774,12 @@
       // input for ColumnSet so that ColumnSet can use it to compute its max
       // column block size.
       if (frame->IsColumnSetFrame()) {
-        if (availSize.BSize(wm) != NS_UNCONSTRAINEDSIZE) {
+        if (availSize.BSize(wm) != NS_UNCONSTRAINEDSIZE &&
+            StyleBorder()->mBoxDecorationBreak ==
+                StyleBoxDecorationBreak::Clone) {
           // If the available size is constrained, we need to subtract
-          // ColumnSetWrapper's block-end border and padding.
+          // ColumnSetWrapper's block-end border and padding, if we know we're
+          // going to use it.
           availSize.BSize(wm) -= aState.BorderPadding().BEnd(wm);
         }
 
@@ -3986,7 +3992,7 @@
       bool forceFit = aState.IsAdjacentWithTop() && clearance <= 0 &&
                       !floatAvailableSpace.HasFloats();
       nsCollapsingMargin collapsedBEndMargin;
-      nsOverflowAreas overflowAreas;
+      OverflowAreas overflowAreas;
       *aKeepReflowGoing =
           brc.PlaceBlock(*childReflowInput, forceFit, aLine.get(),
                          collapsedBEndMargin, overflowAreas, frameReflowStatus);
@@ -4925,11 +4931,11 @@
   }
 
 #ifdef DEBUG
-  if (!GetParent()->IsCrazySizeAssertSuppressed()) {
+  if (!GetParent()->IsAbsurdSizeAssertSuppressed()) {
     static nscoord lastHeight = 0;
-    if (CRAZY_SIZE(aLine->BStart())) {
+    if (ABSURD_SIZE(aLine->BStart())) {
       lastHeight = aLine->BStart();
-      if (abs(aLine->BStart() - lastHeight) > CRAZY_COORD / 10) {
+      if (abs(aLine->BStart() - lastHeight) > ABSURD_COORD / 10) {
         nsIFrame::ListTag(stdout);
         printf(": line=%p y=%d line.bounds.height=%d\n",
                static_cast<void*>(aLine.get()), aLine->BStart(),
@@ -4961,7 +4967,7 @@
 
   // From here on, pfd->mBounds rectangles are incorrect because bidi
   // might have moved frames around!
-  nsOverflowAreas overflowAreas;
+  OverflowAreas overflowAreas;
   aLineLayout.RelativePositionFrames(overflowAreas);
   aLine->SetOverflowAreas(overflowAreas);
   if (addedMarker) {
@@ -5036,31 +5042,20 @@
     aState.PlaceBelowCurrentLineFloats(aLine);
   }
 
-  // When a line has floats, factor them into the combined-area
-  // computations.
+  // When a line has floats, factor them into the overflow areas computations.
   if (aLine->HasFloats()) {
-    // Combine the float combined area (stored in aState) and the
-    // value computed by the line layout code.
-    nsOverflowAreas lineOverflowAreas;
-    NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-      nsRect& o = lineOverflowAreas.Overflow(otype);
-      o = aLine->GetOverflowArea(otype);
-#ifdef NOISY_COMBINED_AREA
-      ListTag(stdout);
-      printf(": overflow %d lineCA=%d,%d,%d,%d floatCA=%d,%d,%d,%d\n", otype,
-             o.x, o.y, o.width, o.height,
-             aState.mFloatOverflowAreas.Overflow(otype).x,
-             aState.mFloatOverflowAreas.Overflow(otype).y,
-             aState.mFloatOverflowAreas.Overflow(otype).width,
-             aState.mFloatOverflowAreas.Overflow(otype).height);
-#endif
-      o.UnionRect(aState.mFloatOverflowAreas.Overflow(otype), o);
+    // Union the float overflow areas (stored in aState) and the value computed
+    // by the line layout code.
+    OverflowAreas lineOverflowAreas = aState.mFloatOverflowAreas;
+    lineOverflowAreas.UnionWith(aLine->GetOverflowAreas());
+    aLine->SetOverflowAreas(lineOverflowAreas);
 
-#ifdef NOISY_COMBINED_AREA
-      printf("  ==> final lineCA=%d,%d,%d,%d\n", o.x, o.y, o.width, o.height);
+#ifdef NOISY_OVERFLOW_AREAS
+    printf("%s: Line %p, InkOverflowRect=%s, ScrollableOverflowRect=%s\n",
+           ListTag().get(), aLine.get(),
+           ToString(aLine->InkOverflowRect()).c_str(),
+           ToString(aLine->ScrollableOverflowRect()).c_str());
 #endif
-    }
-    aLine->SetOverflowAreas(lineOverflowAreas);
   }
 
   // Apply break-after clearing if necessary
@@ -6694,8 +6689,7 @@
 }
 
 void nsBlockFrame::ReflowPushedFloats(BlockReflowInput& aState,
-                                      nsOverflowAreas& aOverflowAreas,
-                                      nsReflowStatus& aStatus) {
+                                      OverflowAreas& aOverflowAreas) {
   // Pushed floats live at the start of our float list; see comment
   // above nsBlockFrame::DrainPushedFloats.
   nsIFrame* f = mFloats.FirstChild();
@@ -7678,13 +7672,12 @@
   NS_ASSERTION(!(IsTrueOverflowContainer() && computedBSizeLeftOver),
                "overflow container must not have computedBSizeLeftOver");
 
-  const nsReflowStatus statusFromChildren = aStatus;
   const nscoord availBSize = aReflowInput.AvailableBSize();
   nscoord finalBSize = NSCoordSaturatingAdd(
       NSCoordSaturatingAdd(aBorderPadding.BStart(wm), computedBSizeLeftOver),
       aBorderPadding.BEnd(wm));
 
-  if (statusFromChildren.IsIncomplete() && finalBSize <= availBSize) {
+  if (aStatus.IsIncomplete() && finalBSize <= availBSize) {
     // We used up all of our element's remaining computed block-size on this
     // page/column, but our children are incomplete. Set aStatus to
     // overflow-incomplete.
@@ -7707,7 +7700,7 @@
     return std::min(finalBSize, aBEndEdgeOfChildren);
   }
 
-  if (statusFromChildren.IsComplete()) {
+  if (aStatus.IsComplete()) {
     if (computedBSizeLeftOver > 0 && NS_UNCONSTRAINEDSIZE != availBSize &&
         finalBSize > availBSize) {
       if (ShouldAvoidBreakInside(aReflowInput)) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsBlockFrame.h firefox-85.0+build1/layout/generic/nsBlockFrame.h
--- firefox-84.0.2+build1/layout/generic/nsBlockFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsBlockFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -475,7 +475,7 @@
   void ComputeOverflowAreas(const nsRect& aBounds,
                             const nsStyleDisplay* aDisplay,
                             nscoord aBEndEdgeOfChildren,
-                            nsOverflowAreas& aOverflowAreas);
+                            mozilla::OverflowAreas& aOverflowAreas);
 
   /**
    * Add the frames in aFrameList to this block after aPrevSibling.
@@ -535,9 +535,11 @@
   void ReparentFloats(nsIFrame* aFirstFrame, nsBlockFrame* aOldParent,
                       bool aReparentSiblings);
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  virtual bool ComputeCustomOverflow(
+      mozilla::OverflowAreas& aOverflowAreas) override;
 
-  virtual void UnionChildOverflow(nsOverflowAreas& aOverflowAreas) override;
+  virtual void UnionChildOverflow(
+      mozilla::OverflowAreas& aOverflowAreas) override;
 
   /**
    * Load all of aFrame's floats into the float manager iff aFrame is not a
@@ -644,8 +646,7 @@
   /** Reflow pushed floats
    */
   void ReflowPushedFloats(BlockReflowInput& aState,
-                          nsOverflowAreas& aOverflowAreas,
-                          nsReflowStatus& aStatus);
+                          mozilla::OverflowAreas& aOverflowAreas);
 
   /** Find any trailing BR clear from the last line of the block (or its PIFs)
    */
diff -Nru firefox-84.0.2+build1/layout/generic/nsBlockReflowContext.cpp firefox-85.0+build1/layout/generic/nsBlockReflowContext.cpp
--- firefox-84.0.2+build1/layout/generic/nsBlockReflowContext.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsBlockReflowContext.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -290,9 +290,9 @@
 
 #ifdef DEBUG
   if (!aFrameReflowStatus.IsInlineBreakBefore()) {
-    if ((CRAZY_SIZE(mMetrics.ISize(mWritingMode)) ||
-         CRAZY_SIZE(mMetrics.BSize(mWritingMode))) &&
-        !mFrame->GetParent()->IsCrazySizeAssertSuppressed()) {
+    if ((ABSURD_SIZE(mMetrics.ISize(mWritingMode)) ||
+         ABSURD_SIZE(mMetrics.BSize(mWritingMode))) &&
+        !mFrame->GetParent()->IsAbsurdSizeAssertSuppressed()) {
       printf("nsBlockReflowContext: ");
       mFrame->ListTag(stdout);
       printf(" metrics=%d,%d!\n", mMetrics.ISize(mWritingMode),
@@ -313,11 +313,13 @@
   }
 
   if (!aFrameReflowStatus.IsInlineBreakBefore() &&
+      !aFrameRI.WillReflowAgainForClearance() &&
       aFrameReflowStatus.IsFullyComplete()) {
-    // If frame is complete and has a next-in-flow, we need to delete
-    // them now. Do not do this when a break-before is signaled because
-    // the frame is going to get reflowed again (whether the frame is
-    // (in)complete is undefined in that case anyway).
+    // If mFrame is fully-complete and has a next-in-flow, we need to delete
+    // them now. Do not do this when a break-before is signaled or when a
+    // clearance frame is discovered in mFrame's subtree because mFrame is going
+    // to get reflowed again (whether the frame is (in)complete is undefined in
+    // that case anyway).
     if (nsIFrame* kidNextInFlow = mFrame->GetNextInFlow()) {
       // Remove all of the childs next-in-flows. Make sure that we ask
       // the right parent to do the removal (it's possible that the
@@ -339,7 +341,7 @@
 bool nsBlockReflowContext::PlaceBlock(const ReflowInput& aReflowInput,
                                       bool aForceFit, nsLineBox* aLine,
                                       nsCollapsingMargin& aBEndMarginResult,
-                                      nsOverflowAreas& aOverflowAreas,
+                                      OverflowAreas& aOverflowAreas,
                                       const nsReflowStatus& aReflowStatus) {
   // Compute collapsed block-end margin value.
   WritingMode parentWM = mMetrics.GetWritingMode();
diff -Nru firefox-84.0.2+build1/layout/generic/nsBlockReflowContext.h firefox-85.0+build1/layout/generic/nsBlockReflowContext.h
--- firefox-84.0.2+build1/layout/generic/nsBlockReflowContext.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsBlockReflowContext.h	2021-01-18 19:58:16.000000000 +0000
@@ -40,7 +40,7 @@
   bool PlaceBlock(const ReflowInput& aReflowInput, bool aForceFit,
                   nsLineBox* aLine,
                   nsCollapsingMargin& aBEndMarginResult /* out */,
-                  nsOverflowAreas& aOverflowAreas,
+                  mozilla::OverflowAreas& aOverflowAreas,
                   const nsReflowStatus& aReflowStatus);
 
   nsCollapsingMargin& GetCarriedOutBEndMargin() {
diff -Nru firefox-84.0.2+build1/layout/generic/nsCanvasFrame.cpp firefox-85.0+build1/layout/generic/nsCanvasFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsCanvasFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsCanvasFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -23,6 +23,7 @@
 #include "gfxPlatform.h"
 #include "nsPrintfCString.h"
 #include "mozilla/AccessibleCaretEventHub.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/dom/AnonymousContent.h"
@@ -735,79 +736,118 @@
     nsIFrame* kidFrame = mFrames.FirstChild();
     bool kidDirty = kidFrame->HasAnyStateBits(NS_FRAME_IS_DIRTY);
 
-    ReflowInput kidReflowInput(
-        aPresContext, aReflowInput, kidFrame,
-        aReflowInput.AvailableSize(kidFrame->GetWritingMode()));
-
-    if (aReflowInput.IsBResizeForWM(kidReflowInput.GetWritingMode()) &&
-        kidFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
-      // Tell our kid it's being block-dir resized too.  Bit of a
-      // hack for framesets.
-      kidReflowInput.SetBResize(true);
+    WritingMode kidWM = kidFrame->GetWritingMode();
+    auto availableSize = aReflowInput.AvailableSize(kidWM);
+    nscoord bOffset = 0;
+    nscoord canvasBSizeSum = 0;
+    WritingMode wm = aReflowInput.GetWritingMode();
+    if (prevCanvasFrame && availableSize.BSize(kidWM) != NS_UNCONSTRAINEDSIZE &&
+        StaticPrefs::layout_display_list_improve_fragmentation()) {
+      for (auto* pif = prevCanvasFrame; pif;
+           pif = static_cast<nsCanvasFrame*>(pif->GetPrevInFlow())) {
+        canvasBSizeSum += pif->BSize(kidWM);
+        auto* pifChild = pif->PrincipalChildList().FirstChild();
+        if (pifChild) {
+          nscoord layoutOverflow = pifChild->BSize(kidWM) - canvasBSizeSum;
+          // A negative value means that the :root frame does not fill
+          // the canvas.  In this case we can't determine the offset exactly
+          // so we use the end edge of the scrollable overflow as the offset
+          // instead.  This will likely push down the content below where it
+          // should be placed, creating a gap.  That's preferred over making
+          // content overlap which would otherwise occur.
+          // See layout/reftests/pagination/inline-block-slice-7.html for an
+          // example of this.
+          if (layoutOverflow < 0) {
+            LogicalRect so(kidWM, pifChild->ScrollableOverflowRect(),
+                           pifChild->GetSize());
+            layoutOverflow = so.BEnd(kidWM) - canvasBSizeSum;
+          }
+          bOffset = std::max(bOffset, layoutOverflow);
+        }
+      }
+      availableSize.BSize(kidWM) -= bOffset;
     }
 
-    WritingMode wm = aReflowInput.GetWritingMode();
-    WritingMode kidWM = kidReflowInput.GetWritingMode();
-    nsSize containerSize = aReflowInput.ComputedPhysicalSize();
+    LogicalSize finalSize = aReflowInput.ComputedSize();
+    if (MOZ_LIKELY(availableSize.BSize(kidWM) > 0)) {
+      ReflowInput kidReflowInput(aPresContext, aReflowInput, kidFrame,
+                                 availableSize);
+
+      if (aReflowInput.IsBResizeForWM(kidReflowInput.GetWritingMode()) &&
+          kidFrame->HasAnyStateBits(NS_FRAME_CONTAINS_RELATIVE_BSIZE)) {
+        // Tell our kid it's being block-dir resized too.  Bit of a
+        // hack for framesets.
+        kidReflowInput.SetBResize(true);
+      }
 
-    LogicalMargin margin = kidReflowInput.ComputedLogicalMargin(kidWM);
-    LogicalPoint kidPt(kidWM, margin.IStart(kidWM), margin.BStart(kidWM));
+      nsSize containerSize = aReflowInput.ComputedPhysicalSize();
+      LogicalMargin margin = kidReflowInput.ComputedLogicalMargin(kidWM);
+      LogicalPoint kidPt(kidWM, margin.IStart(kidWM), margin.BStart(kidWM));
+      (kidWM.IsOrthogonalTo(wm) ? kidPt.I(kidWM) : kidPt.B(kidWM)) += bOffset;
+
+      // Reflow the frame
+      ReflowChild(kidFrame, aPresContext, kidDesiredSize, kidReflowInput, kidWM,
+                  kidPt, containerSize, ReflowChildFlags::Default, aStatus);
+
+      // Complete the reflow and position and size the child frame
+      FinishReflowChild(kidFrame, aPresContext, kidDesiredSize, &kidReflowInput,
+                        kidWM, kidPt, containerSize,
+                        ReflowChildFlags::ApplyRelativePositioning);
+
+      if (!aStatus.IsFullyComplete()) {
+        nsIFrame* nextFrame = kidFrame->GetNextInFlow();
+        NS_ASSERTION(nextFrame || aStatus.NextInFlowNeedsReflow(),
+                     "If it's incomplete and has no nif yet, it must flag a "
+                     "nif reflow.");
+        if (!nextFrame) {
+          nextFrame = aPresContext->PresShell()
+                          ->FrameConstructor()
+                          ->CreateContinuingFrame(kidFrame, this);
+          SetOverflowFrames(nsFrameList(nextFrame, nextFrame));
+          // Root overflow containers will be normal children of
+          // the canvas frame, but that's ok because there
+          // aren't any other frames we need to isolate them from
+          // during reflow.
+        }
+        if (aStatus.IsOverflowIncomplete()) {
+          nextFrame->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
+        }
+      }
 
-    // Reflow the frame
-    ReflowChild(kidFrame, aPresContext, kidDesiredSize, kidReflowInput, kidWM,
-                kidPt, containerSize, ReflowChildFlags::Default, aStatus);
-
-    // Complete the reflow and position and size the child frame
-    FinishReflowChild(kidFrame, aPresContext, kidDesiredSize, &kidReflowInput,
-                      kidWM, kidPt, containerSize,
-                      ReflowChildFlags::ApplyRelativePositioning);
-
-    if (!aStatus.IsFullyComplete()) {
-      nsIFrame* nextFrame = kidFrame->GetNextInFlow();
-      NS_ASSERTION(
-          nextFrame || aStatus.NextInFlowNeedsReflow(),
-          "If it's incomplete and has no nif yet, it must flag a nif reflow.");
-      if (!nextFrame) {
-        nextFrame = aPresContext->PresShell()
-                        ->FrameConstructor()
-                        ->CreateContinuingFrame(kidFrame, this);
-        SetOverflowFrames(nsFrameList(nextFrame, nextFrame));
-        // Root overflow containers will be normal children of
-        // the canvas frame, but that's ok because there
-        // aren't any other frames we need to isolate them from
-        // during reflow.
-      }
-      if (aStatus.IsOverflowIncomplete()) {
-        nextFrame->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
+      // If the child frame was just inserted, then we're responsible for making
+      // sure it repaints
+      if (kidDirty) {
+        // But we have a new child, which will affect our background, so
+        // invalidate our whole rect.
+        // Note: Even though we request to be sized to our child's size, our
+        // scroll frame ensures that we are always the size of the viewport.
+        // Also note: GetPosition() on a CanvasFrame is always going to return
+        // (0, 0). We only want to invalidate GetRect() since Get*OverflowRect()
+        // could also include overflow to our top and left (out of the viewport)
+        // which doesn't need to be painted.
+        nsIFrame* viewport = PresContext()->GetPresShell()->GetRootFrame();
+        viewport->InvalidateFrame();
       }
-    }
 
-    // If the child frame was just inserted, then we're responsible for making
-    // sure it repaints
-    if (kidDirty) {
-      // But we have a new child, which will affect our background, so
-      // invalidate our whole rect.
-      // Note: Even though we request to be sized to our child's size, our
-      // scroll frame ensures that we are always the size of the viewport.
-      // Also note: GetPosition() on a CanvasFrame is always going to return
-      // (0, 0). We only want to invalidate GetRect() since Get*OverflowRect()
-      // could also include overflow to our top and left (out of the viewport)
-      // which doesn't need to be painted.
-      nsIFrame* viewport = PresContext()->GetPresShell()->GetRootFrame();
-      viewport->InvalidateFrame();
-    }
-
-    // Return our desired size. Normally it's what we're told, but
-    // sometimes we can be given an unconstrained height (when a window
-    // is sizing-to-content), and we should compute our desired height.
-    LogicalSize finalSize(wm);
-    finalSize.ISize(wm) = aReflowInput.ComputedISize();
-    if (aReflowInput.ComputedBSize() == NS_UNCONSTRAINEDSIZE) {
-      finalSize.BSize(wm) =
-          kidFrame->GetLogicalSize(wm).BSize(wm) +
-          kidReflowInput.ComputedLogicalMargin(wm).BStartEnd(wm);
+      // Return our desired size. Normally it's what we're told, but
+      // sometimes we can be given an unconstrained height (when a window
+      // is sizing-to-content), and we should compute our desired height.
+      if (aReflowInput.ComputedBSize() == NS_UNCONSTRAINEDSIZE) {
+        finalSize.BSize(wm) =
+            kidFrame->GetLogicalSize(wm).BSize(wm) +
+            kidReflowInput.ComputedLogicalMargin(wm).BStartEnd(wm);
+      }
     } else {
-      finalSize.BSize(wm) = aReflowInput.ComputedBSize();
+      // This only occurs in paginated mode.  There is no available space on
+      // this page due to reserving space for overflow from a previous page,
+      // so we push our child to the next page.  Note that we can have some
+      // placeholders for fixed pos. frames in mFrames too, so we need to be
+      // careful to only push `kidFrame`.
+      MOZ_ASSERT(!kidFrame->IsPlaceholderFrame(),
+                 "we should never push fixed pos placeholders");
+      mFrames.RemoveFrame(kidFrame);
+      SetOverflowFrames(nsFrameList(kidFrame, kidFrame));
+      aStatus.SetIncomplete();
     }
 
     aDesiredSize.SetSize(wm, finalSize);
diff -Nru firefox-84.0.2+build1/layout/generic/nsColumnSetFrame.cpp firefox-85.0+build1/layout/generic/nsColumnSetFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsColumnSetFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsColumnSetFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -525,7 +525,7 @@
   }
 
   nsRect contentRect(0, 0, 0, 0);
-  nsOverflowAreas overflowRects;
+  OverflowAreas overflowRects;
 
   nsIFrame* child = mFrames.FirstChild();
   LogicalPoint childOrigin(wm, 0, 0);
@@ -918,7 +918,7 @@
   if ((wm.IsVerticalRL() || isRTL) &&
       containerSize.width != contentSize.Width(wm)) {
     const nsSize finalContainerSize = aDesiredSize.PhysicalSize();
-    nsOverflowAreas overflowRects;
+    OverflowAreas overflowRects;
     for (nsIFrame* child : mFrames) {
       // Get the logical position as set previously using a provisional or
       // dummy containerSize, and reset with the correct container size.
diff -Nru firefox-84.0.2+build1/layout/generic/nsContainerFrame.cpp firefox-85.0+build1/layout/generic/nsContainerFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsContainerFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsContainerFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1189,9 +1189,7 @@
   }
 
   nsPoint curOrigin = aKidFrame->GetPosition();
-  WritingMode outerWM = aDesiredSize.GetWritingMode();
-  LogicalSize convertedSize =
-      aDesiredSize.Size(outerWM).ConvertTo(aWM, outerWM);
+  const LogicalSize convertedSize = aDesiredSize.Size(aWM);
   LogicalPoint pos(aPos);
 
   if (aFlags & ReflowChildFlags::ApplyRelativePositioning) {
@@ -1280,7 +1278,7 @@
 
 void nsContainerFrame::ReflowOverflowContainerChildren(
     nsPresContext* aPresContext, const ReflowInput& aReflowInput,
-    nsOverflowAreas& aOverflowRects, ReflowChildFlags aFlags,
+    OverflowAreas& aOverflowRects, ReflowChildFlags aFlags,
     nsReflowStatus& aStatus, ChildFrameMerger aMergeFunc,
     Maybe<nsSize> aContainerSize) {
   MOZ_ASSERT(aPresContext, "null pointer");
@@ -1826,9 +1824,9 @@
     }
   }
 
-  // Pull up item's next-in-flow (if any) into aItems, and reparent it to our
-  // next-in-flow, unless its parent is already our next-in-flow (to avoid
-  // leaving a hole there).
+  // For each item in aItems, pull up its next-in-flow (if any), and reparent it
+  // to our next-in-flow, unless its parent is already ourselves or our
+  // next-in-flow (to avoid leaving a hole there).
   auto PullItemsNextInFlow = [this](const nsFrameList& aItems) {
     auto* firstNIF = static_cast<nsContainerFrame*>(GetNextInFlow());
     if (!firstNIF) {
@@ -1837,15 +1835,16 @@
     nsFrameList childNIFs;
     nsFrameList childOCNIFs;
     for (auto* child : aItems) {
-      auto* childNIF = child->GetNextInFlow();
-      if (childNIF && childNIF->GetParent() != firstNIF) {
-        auto* parent = childNIF->GetParent();
-        parent->StealFrame(childNIF);
-        ReparentFrame(childNIF, parent, firstNIF);
-        if (childNIF->HasAnyStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER)) {
-          childOCNIFs.AppendFrame(nullptr, childNIF);
-        } else {
-          childNIFs.AppendFrame(nullptr, childNIF);
+      if (auto* childNIF = child->GetNextInFlow()) {
+        if (auto* parent = childNIF->GetParent();
+            parent != this && parent != firstNIF) {
+          parent->StealFrame(childNIF);
+          ReparentFrame(childNIF, parent, firstNIF);
+          if (childNIF->HasAnyStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER)) {
+            childOCNIFs.AppendFrame(nullptr, childNIF);
+          } else {
+            childNIFs.AppendFrame(nullptr, childNIF);
+          }
         }
       }
     }
@@ -2850,7 +2849,7 @@
          !GetPrevInFlow();
 }
 
-void nsContainerFrame::ConsiderChildOverflow(nsOverflowAreas& aOverflowAreas,
+void nsContainerFrame::ConsiderChildOverflow(OverflowAreas& aOverflowAreas,
                                              nsIFrame* aChildFrame) {
   if (StyleDisplay()->IsContainLayout() &&
       IsFrameOfType(eSupportsContainLayoutAndPaint)) {
@@ -2861,7 +2860,7 @@
     // so this has the same affect as unioning the child's visual and
     // scrollable overflow with the parent's ink overflow.
     nsRect childVisual = aChildFrame->InkOverflowRect();
-    nsOverflowAreas combined = nsOverflowAreas(childVisual, nsRect());
+    OverflowAreas combined = OverflowAreas(childVisual, nsRect());
     aOverflowAreas.UnionWith(combined + aChildFrame->GetPosition());
   } else {
     aOverflowAreas.UnionWith(aChildFrame->GetOverflowAreas() +
diff -Nru firefox-84.0.2+build1/layout/generic/nsContainerFrame.h firefox-85.0+build1/layout/generic/nsContainerFrame.h
--- firefox-84.0.2+build1/layout/generic/nsContainerFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsContainerFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "mozilla/Attributes.h"
 #include "LayoutConstants.h"
+#include "nsISelectionDisplay.h"
 #include "nsSplittableFrame.h"
 #include "nsFrameList.h"
 #include "nsLineBox.h"
@@ -29,9 +30,9 @@
 #ifdef DEBUG
 // 10 million pixels, converted to app units. Note that this a bit larger
 // than 1/4 of nscoord_MAX. So, if any content gets to be this large, we're
-// definitely in danger of grazing up against nscoord_MAX; hence, it's CRAZY.
-#  define CRAZY_COORD (10000000 * 60)
-#  define CRAZY_SIZE(_x) (((_x) < -CRAZY_COORD) || ((_x) > CRAZY_COORD))
+// definitely in danger of grazing up against nscoord_MAX; hence, it's ABSURD.
+#  define ABSURD_COORD (10000000 * 60)
+#  define ABSURD_SIZE(_x) (((_x) < -ABSURD_COORD) || ((_x) > ABSURD_COORD))
 #endif
 
 /**
@@ -369,7 +370,7 @@
    */
   void ReflowOverflowContainerChildren(
       nsPresContext* aPresContext, const ReflowInput& aReflowInput,
-      nsOverflowAreas& aOverflowRects, ReflowChildFlags aFlags,
+      mozilla::OverflowAreas& aOverflowRects, ReflowChildFlags aFlags,
       nsReflowStatus& aStatus,
       ChildFrameMerger aMergeFunc = DefaultChildFrameMerge,
       Maybe<nsSize> aContainerSize = Nothing());
@@ -482,16 +483,16 @@
   void ClearHasFirstLetterChild() { mHasFirstLetterChild = false; }
 
 #ifdef DEBUG
-  // Use this to suppress the CRAZY_SIZE assertions.
+  // Use this to suppress the ABSURD_SIZE assertions.
   NS_DECLARE_FRAME_PROPERTY_SMALL_VALUE(DebugReflowingWithInfiniteISize, bool)
-  bool IsCrazySizeAssertSuppressed() const {
+  bool IsAbsurdSizeAssertSuppressed() const {
     return GetProperty(DebugReflowingWithInfiniteISize());
   }
 #endif
 
   // Incorporate the child overflow areas into aOverflowAreas.
   // If the child does not have a overflow, use the child area.
-  void ConsiderChildOverflow(nsOverflowAreas& aOverflowAreas,
+  void ConsiderChildOverflow(mozilla::OverflowAreas& aOverflowAreas,
                              nsIFrame* aChildFrame);
 
  protected:
diff -Nru firefox-84.0.2+build1/layout/generic/nsFirstLetterFrame.cpp firefox-85.0+build1/layout/generic/nsFirstLetterFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsFirstLetterFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFirstLetterFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -198,7 +198,7 @@
     mBaseline = kidMetrics.BlockStartAscent();
 
     // Place and size the child and update the output metrics
-    LogicalSize convertedSize = kidMetrics.Size(lineWM).ConvertTo(wm, lineWM);
+    LogicalSize convertedSize = kidMetrics.Size(wm);
     kid->SetRect(nsRect(bp.IStart(wm), bp.BStart(wm), convertedSize.ISize(wm),
                         convertedSize.BSize(wm)));
     kid->FinishAndStoreOverflow(&kidMetrics, rs.mStyleDisplay);
@@ -379,8 +379,7 @@
   return mBaseline;
 }
 
-nsIFrame::LogicalSides nsFirstLetterFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsFirstLetterFrame::GetLogicalSkipSides() const {
   if (GetPrevContinuation()) {
     // We shouldn't get calls to GetSkipSides for later continuations since
     // they have separate ComputedStyles with initial values for all the
diff -Nru firefox-84.0.2+build1/layout/generic/nsFirstLetterFrame.h firefox-85.0+build1/layout/generic/nsFirstLetterFrame.h
--- firefox-84.0.2+build1/layout/generic/nsFirstLetterFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFirstLetterFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -62,8 +62,7 @@
   virtual bool CanContinueTextRun() const override;
   virtual nscoord GetLogicalBaseline(
       mozilla::WritingMode aWritingMode) const override;
-  virtual LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>&) const override;
+  virtual LogicalSides GetLogicalSkipSides() const override;
 
   // override of nsFrame method
   virtual nsresult GetChildFrameContainingOffset(
diff -Nru firefox-84.0.2+build1/layout/generic/nsFlexContainerFrame.cpp firefox-85.0+build1/layout/generic/nsFlexContainerFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsFlexContainerFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFlexContainerFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1535,13 +1535,6 @@
   }
 
   if (specifiedSizeSuggestion != nscoord_MAX) {
-    // Clamp specified size suggestion by the max main-size property if it's
-    // definite.
-    if (aFlexItem.MainMaxSize() != NS_UNCONSTRAINEDSIZE) {
-      specifiedSizeSuggestion =
-          std::min(specifiedSizeSuggestion, aFlexItem.MainMaxSize());
-    }
-
     // We have the specified size suggestion. Return it now since we don't need
     // to consider transferred size suggestion.
     FLEX_LOGV(" Specified size suggestion: %d", specifiedSizeSuggestion);
@@ -1589,7 +1582,7 @@
     return;
   }
 
-  FLEX_LOGV("Resolving auto main size or main min size for flex item %p",
+  FLEX_LOGV("Resolving auto main size or auto min main size for flex item %p",
             aFlexItem.Frame());
 
   nscoord resolvedMinSize;  // (only set/used if isMainMinSizeAuto==true)
@@ -1673,14 +1666,15 @@
         contentSizeSuggestion = ClampMainSizeViaCrossAxisConstraints(
             contentSizeSuggestion, aFlexItem, aAxisTracker);
       }
-      // Further clamp it by the max main-size property if it's definite.
-      if (aFlexItem.MainMaxSize() != NS_UNCONSTRAINEDSIZE) {
-        contentSizeSuggestion =
-            std::min(contentSizeSuggestion, aFlexItem.MainMaxSize());
-      }
 
       FLEX_LOGV(" Content size suggestion: %d", contentSizeSuggestion);
       resolvedMinSize = std::min(resolvedMinSize, contentSizeSuggestion);
+
+      // Clamp the resolved min main size by the max main size if it's definite.
+      if (aFlexItem.MainMaxSize() != NS_UNCONSTRAINEDSIZE) {
+        resolvedMinSize = std::min(resolvedMinSize, aFlexItem.MainMaxSize());
+      }
+      FLEX_LOGV(" Resolved auto min main size: %d", resolvedMinSize);
     }
   }
 
@@ -4394,18 +4388,7 @@
   // be filled out for use by devtools.
   ComputedFlexContainerInfo* containerInfo = CreateOrClearFlexContainerInfo();
 
-  // We assume we are the last fragment by using
-  // PreReflowBlockLevelLogicalSkipSides(). We will skip block-end
-  // border/padding when we know our content-box size after DoFlexLayout.
-  LogicalMargin borderPadding =
-      aReflowInput.ComputedLogicalBorderPadding(wm).ApplySkipSides(
-          PreReflowBlockLevelLogicalSkipSides());
-
-  const LogicalSize availableSizeForItems =
-      ComputeAvailableSizeForItems(aReflowInput, borderPadding);
-
-  const nscoord consumedBSize =
-      CalcAndCacheConsumedBSize(aReflowInput.GetWritingMode());
+  const nscoord consumedBSize = CalcAndCacheConsumedBSize();
   nscoord contentBoxMainSize =
       GetMainSizeFromReflowInput(aReflowInput, axisTracker, consumedBSize);
   nscoord contentBoxCrossSize;
@@ -4467,6 +4450,16 @@
     contentBoxCrossSize = data->mContentBoxCrossSize;
   }
 
+  // We assume we are the last fragment by using
+  // PreReflowBlockLevelLogicalSkipSides(), and skip block-end border and
+  // padding if needed.
+  LogicalMargin borderPadding =
+      aReflowInput.ComputedLogicalBorderPadding(wm).ApplySkipSides(
+          PreReflowBlockLevelLogicalSkipSides());
+
+  const LogicalSize availableSizeForItems =
+      ComputeAvailableSizeForItems(aReflowInput, borderPadding);
+
   const LogicalSize contentBoxSize =
       axisTracker.LogicalSizeFromFlexRelativeSizes(contentBoxMainSize,
                                                    contentBoxCrossSize);
@@ -4484,14 +4477,30 @@
     }
   }
 
+  // Determine this frame's tentative border-box size. This is used for logical
+  // to physical coordinate conversion when positioning children.
+  //
+  // Note that vertical-rl writing-mode is the only case where the block flow
+  // direction progresses in a negative physical direction, and therefore block
+  // direction coordinate conversion depends on knowing the width of the
+  // coordinate space in order to translate between the logical and physical
+  // origins. As a result, if our final border-box block-size is different from
+  // this tentative one, and we are in vertical-rl writing mode, we need to
+  // adjust our children's position after reflowing them.
+  const LogicalSize tentativeBorderBoxSize(
+      wm, contentBoxSize.ISize(wm) + borderPadding.IStartEnd(wm),
+      std::min(effectiveContentBSize + borderPadding.BStartEnd(wm),
+               aReflowInput.AvailableBSize()));
+  const nsSize containerSize = tentativeBorderBoxSize.GetPhysicalSize(wm);
+
   const auto* prevInFlow = static_cast<nsFlexContainerFrame*>(GetPrevInFlow());
-  nsOverflowAreas ocBounds;
+  OverflowAreas ocBounds;
   nsReflowStatus ocStatus;
   nscoord sumOfChildrenBlockSize;
   if (prevInFlow) {
-    ReflowOverflowContainerChildren(aPresContext, aReflowInput, ocBounds,
-                                    ReflowChildFlags::Default, ocStatus,
-                                    MergeSortedFrameListsFor);
+    ReflowOverflowContainerChildren(
+        aPresContext, aReflowInput, ocBounds, ReflowChildFlags::Default,
+        ocStatus, MergeSortedFrameListsFor, Some(containerSize));
     sumOfChildrenBlockSize =
         prevInFlow->GetProperty(SumOfChildrenBlockSizeProperty());
   } else {
@@ -4500,7 +4509,7 @@
 
   const auto [maxBlockEndEdgeOfChildren, areChildrenComplete] =
       ReflowChildren(aReflowInput, contentBoxMainSize, contentBoxCrossSize,
-                     availableSizeForItems, borderPadding,
+                     containerSize, availableSizeForItems, borderPadding,
                      sumOfChildrenBlockSize, flexContainerAscent, lines,
                      placeholders, axisTracker, hasLineClampEllipsis);
 
@@ -4518,6 +4527,27 @@
                        maxBlockEndEdgeOfChildren, areChildrenComplete,
                        flexContainerAscent, lines, axisTracker);
 
+  if (wm.IsVerticalRL()) {
+    // If the final border-box block-size is different from the tentative one,
+    // adjust our children's position.
+    const nscoord deltaBCoord =
+        tentativeBorderBoxSize.BSize(wm) - aReflowOutput.Size(wm).BSize(wm);
+    if (deltaBCoord != 0) {
+      const LogicalPoint delta(wm, 0, deltaBCoord);
+      for (const FlexLine& line : lines) {
+        for (const FlexItem& item : line.Items()) {
+          item.Frame()->MovePositionBy(wm, delta);
+        }
+      }
+    }
+  }
+
+  // Overflow area = union(my overflow area, kids' overflow areas)
+  aReflowOutput.SetOverflowAreasToDesiredBounds();
+  for (nsIFrame* childFrame : mFrames) {
+    ConsiderChildOverflow(aReflowOutput.mOverflowAreas, childFrame);
+  }
+
   // Merge overflow container bounds and status.
   aReflowOutput.mOverflowAreas.UnionWith(ocBounds);
   aStatus.MergeCompletionStatusFrom(ocStatus);
@@ -5058,7 +5088,7 @@
 
 std::tuple<nscoord, bool> nsFlexContainerFrame::ReflowChildren(
     const ReflowInput& aReflowInput, const nscoord aContentBoxMainSize,
-    const nscoord aContentBoxCrossSize,
+    const nscoord aContentBoxCrossSize, const nsSize& aContainerSize,
     const LogicalSize& aAvailableSizeForItems,
     const LogicalMargin& aBorderPadding,
     const nscoord aSumOfPrevInFlowsChildrenBlockSize,
@@ -5072,12 +5102,6 @@
   const LogicalPoint containerContentBoxOrigin(
       flexWM, aBorderPadding.IStart(flexWM), aBorderPadding.BStart(flexWM));
 
-  // Determine flex container's border-box size (used in positioning children):
-  LogicalSize logSize = aAxisTracker.LogicalSizeFromFlexRelativeSizes(
-      aContentBoxMainSize, aContentBoxCrossSize);
-  logSize += aBorderPadding.Size(flexWM);
-  nsSize containerSize = logSize.GetPhysicalSize(flexWM);
-
   // If the flex container has no baseline-aligned items, it will use the first
   // item to determine its baseline:
   const FlexItem* firstItem =
@@ -5155,9 +5179,9 @@
                         availableBSizeForItem)
                 .ConvertTo(itemWM, flexWM);
 
-        const nsReflowStatus childReflowStatus =
-            ReflowFlexItem(aAxisTracker, aReflowInput, item, framePos,
-                           availableSize, containerSize, aHasLineClampEllipsis);
+        const nsReflowStatus childReflowStatus = ReflowFlexItem(
+            aAxisTracker, aReflowInput, item, framePos, availableSize,
+            aContainerSize, aHasLineClampEllipsis);
 
         if (childReflowStatus.IsIncomplete()) {
           incompleteItems.PutEntry(item.Frame());
@@ -5166,7 +5190,7 @@
         }
       } else {
         MoveFlexItemToFinalPosition(aReflowInput, item, framePos,
-                                    containerSize);
+                                    aContainerSize);
         // We didn't perform a final reflow of the item. If we still have a
         // -webkit-line-clamp ellipsis hanging around, but we shouldn't have
         // one any more, we need to clear that now.  Technically, we only need
@@ -5211,7 +5235,7 @@
 
   if (!aPlaceholders.IsEmpty()) {
     ReflowPlaceholders(aReflowInput, aPlaceholders, containerContentBoxOrigin,
-                       containerSize);
+                       aContainerSize);
   }
 
   const bool anyChildIncomplete = PushIncompleteChildren(
@@ -5362,12 +5386,6 @@
 
   // Convert flex container's final desired size to parent's WM, for outparam.
   aReflowOutput.SetSize(flexWM, desiredSizeInFlexWM);
-
-  // Overflow area = union(my overflow area, kids' overflow areas)
-  aReflowOutput.SetOverflowAreasToDesiredBounds();
-  for (nsIFrame* childFrame : mFrames) {
-    ConsiderChildOverflow(aReflowOutput.mOverflowAreas, childFrame);
-  }
 }
 
 void nsFlexContainerFrame::MoveFlexItemToFinalPosition(
diff -Nru firefox-84.0.2+build1/layout/generic/nsFlexContainerFrame.h firefox-85.0+build1/layout/generic/nsFlexContainerFrame.h
--- firefox-84.0.2+build1/layout/generic/nsFlexContainerFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFlexContainerFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -546,6 +546,8 @@
    *                            container.
    * @param aContentBoxCrossSize the final content-box cross-size of the flex
    *                             container.
+   * @param aContainerSize this frame's tentative physical border-box size, used
+   *                       only for logical to physical coordinate conversion.
    * @param aAvailableSizeForItems the size of the available space for our
    *                               children to reflow into.
    * @param aBorderPadding the border and padding for this frame (possibly with
@@ -566,7 +568,7 @@
    */
   std::tuple<nscoord, bool> ReflowChildren(
       const ReflowInput& aReflowInput, const nscoord aContentBoxMainSize,
-      const nscoord aContentBoxCrossSize,
+      const nscoord aContentBoxCrossSize, const nsSize& aContainerSize,
       const mozilla::LogicalSize& aAvailableSizeForItems,
       const mozilla::LogicalMargin& aBorderPadding,
       const nscoord aSumOfPrevInFlowsChildrenBlockSize,
diff -Nru firefox-84.0.2+build1/layout/generic/nsFrameSelection.cpp firefox-85.0+build1/layout/generic/nsFrameSelection.cpp
--- firefox-84.0.2+build1/layout/generic/nsFrameSelection.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFrameSelection.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -2129,27 +2129,6 @@
   return range;
 }
 
-nsresult nsFrameSelection::SelectAll() {
-  nsCOMPtr<nsIContent> rootContent;
-  if (mLimiters.mLimiter) {
-    rootContent = mLimiters.mLimiter;  // addrefit
-  } else if (mLimiters.mAncestorLimiter) {
-    rootContent = mLimiters.mAncestorLimiter;
-  } else {
-    NS_ENSURE_STATE(mPresShell);
-    Document* doc = mPresShell->GetDocument();
-    if (!doc) return NS_ERROR_FAILURE;
-    rootContent = doc->GetRootElement();
-    if (!rootContent) return NS_ERROR_FAILURE;
-  }
-  int32_t numChildren = rootContent->GetChildCount();
-  SetChangeReasons(nsISelectionListener::NO_REASON);
-  int8_t index = GetIndexFromSelectionType(SelectionType::eNormal);
-  AutoPrepareFocusRange prep(mDomSelections[index], false);
-  return TakeFocus(rootContent, 0, numChildren, CARET_ASSOCIATE_BEFORE,
-                   FocusMode::kCollapseToNewPoint);
-}
-
 //////////END FRAMESELECTION
 
 void nsFrameSelection::StartBatchChanges() { mBatching.mCounter++; }
diff -Nru firefox-84.0.2+build1/layout/generic/nsFrameSelection.h firefox-85.0+build1/layout/generic/nsFrameSelection.h
--- firefox-84.0.2+build1/layout/generic/nsFrameSelection.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsFrameSelection.h	2021-01-18 19:58:16.000000000 +0000
@@ -608,12 +608,6 @@
                                                      eLogical);
   }
 
-  /**
-   * Select All will generally be called from the nsiselectioncontroller
-   * implementations. it will select the whole doc
-   */
-  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult SelectAll();
-
   /** Sets/Gets The display selection enum.
    */
   void SetDisplaySelection(int16_t aState) { mDisplaySelection = aState; }
diff -Nru firefox-84.0.2+build1/layout/generic/nsGfxScrollFrame.cpp firefox-85.0+build1/layout/generic/nsGfxScrollFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsGfxScrollFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsGfxScrollFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -11,6 +11,7 @@
 #include "ActiveLayerTracker.h"
 #include "base/compiler_specific.h"
 #include "DisplayItemClip.h"
+#include "Layers.h"
 #include "nsCOMPtr.h"
 #include "nsIContentViewer.h"
 #include "nsPresContext.h"
@@ -44,6 +45,7 @@
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/ScrollbarPreferences.h"
 #include "mozilla/SVGOuterSVGFrame.h"
 #include "mozilla/ViewportUtils.h"
@@ -311,7 +313,7 @@
   nsMargin mComputedBorder;
 
   // === Filled in by ReflowScrolledFrame ===
-  nsOverflowAreas mContentsOverflowAreas;
+  OverflowAreas mContentsOverflowAreas;
   MOZ_INIT_OUTSIDE_CTOR
   bool mReflowedContentsWithHScrollbar;
   MOZ_INIT_OUTSIDE_CTOR
@@ -783,7 +785,7 @@
   if (MOZ_UNLIKELY(
           disp->mOverflowClipBoxBlock == StyleOverflowClipBox::ContentBox ||
           disp->mOverflowClipBoxInline == StyleOverflowClipBox::ContentBox)) {
-    nsOverflowAreas childOverflow;
+    OverflowAreas childOverflow;
     nsLayoutUtils::UnionChildOverflow(mHelper.mScrolledFrame, childOverflow);
     nsRect childScrollableOverflow = childOverflow.ScrollableOverflow();
     if (disp->mOverflowClipBoxBlock == StyleOverflowClipBox::PaddingBox) {
@@ -992,7 +994,7 @@
   // scrolled frames can't have 'overflow' either.
   // This needs to happen before SyncFrameViewAfterReflow so
   // HasOverflowRect() will return the correct value.
-  nsOverflowAreas overflow(scrolledArea, scrolledArea);
+  OverflowAreas overflow(scrolledArea, scrolledArea);
   scrolledFrame->FinishAndStoreOverflow(overflow, scrolledFrame->GetSize());
 
   // Note that making the view *exactly* the size of the scrolled area
@@ -3528,6 +3530,26 @@
   }
 };
 
+// Finds the max z-index of the items in aList that meet the following
+// conditions
+//   1) have z-index auto or z-index >= 0.
+//   2) aFrame is a proper ancestor of the item's frame.
+// Returns -1 if there is no such item.
+static int32_t MaxZIndexInListOfItemsContainedInFrame(nsDisplayList* aList,
+                                                      nsIFrame* aFrame) {
+  int32_t maxZIndex = -1;
+  for (nsDisplayItem* item = aList->GetBottom(); item;
+       item = item->GetAbove()) {
+    nsIFrame* itemFrame = item->Frame();
+    // Perspective items return the scroll frame as their Frame(), so consider
+    // their TransformFrame() instead.
+    if (nsLayoutUtils::IsProperAncestorFrame(aFrame, itemFrame)) {
+      maxZIndex = std::max(maxZIndex, item->ZIndex());
+    }
+  }
+  return maxZIndex;
+}
+
 void ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                          const nsDisplayListSet& aLists) {
   SetAndNullOnExit<const nsIFrame> tmpBuilder(
@@ -4046,11 +4068,35 @@
     // create a displayport for this frame. We'll add the item later on.
     if (!mWillBuildScrollableLayer) {
       if (aBuilder->BuildCompositorHitTestInfo()) {
+        int32_t zIndex = MaxZIndexInListOfItemsContainedInFrame(
+            scrolledContent.PositionedDescendants(), mOuter);
+        if (aBuilder->IsPartialUpdate()) {
+          if (auto* items =
+                  mScrolledFrame->GetProperty(nsIFrame::DisplayItems())) {
+            for (nsDisplayItemBase* item : *items) {
+              if (item->GetType() ==
+                  DisplayItemType::TYPE_COMPOSITOR_HITTEST_INFO) {
+                auto* hitTestItem =
+                    static_cast<nsDisplayCompositorHitTestInfo*>(item);
+                if (hitTestItem->HasHitTestInfo() &&
+                    hitTestItem->HitTestFlags().contains(
+                        CompositorHitTestFlags::eInactiveScrollframe)) {
+                  zIndex = std::max(zIndex, hitTestItem->ZIndex());
+                  item->SetCantBeReused();
+                }
+              }
+            }
+          }
+        }
+        // Make sure the z-index of the inactive item is at least zero.
+        // Otherwise, it will end up behind non-positioned items in the scrolled
+        // content.
+        zIndex = std::max(zIndex, 0);
         nsDisplayCompositorHitTestInfo* hitInfo =
             MakeDisplayItemWithIndex<nsDisplayCompositorHitTestInfo>(
                 aBuilder, mScrolledFrame, 1, info, Some(area));
         if (hitInfo) {
-          AppendInternalItemToTop(scrolledContent, hitInfo, Some(INT32_MAX));
+          AppendInternalItemToTop(scrolledContent, hitInfo, Some(zIndex));
         }
       }
     }
@@ -6154,7 +6200,7 @@
     nsRect clippedRect = origRect;
     clippedRect.MoveBy(mHelper.mScrollPort.TopLeft());
     clippedRect.IntersectRect(clippedRect, mHelper.mScrollPort);
-    nsOverflowAreas overflow = f->GetOverflowAreas();
+    OverflowAreas overflow = f->GetOverflowAreas();
     f->FinishAndStoreOverflow(overflow, clippedRect.Size());
     clippedRect.MoveTo(origRect.TopLeft());
     f->SetRect(clippedRect);
@@ -6490,7 +6536,7 @@
   mPostedReflowCallback = false;
 }
 
-bool ScrollFrameHelper::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool ScrollFrameHelper::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   nsIScrollableFrame* sf = do_QueryFrame(mOuter);
   ScrollStyles ss = sf->GetScrollStyles();
 
diff -Nru firefox-84.0.2+build1/layout/generic/nsGfxScrollFrame.h firefox-85.0+build1/layout/generic/nsGfxScrollFrame.h
--- firefox-84.0.2+build1/layout/generic/nsGfxScrollFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsGfxScrollFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -381,7 +381,7 @@
     mScrollPosForLayerPixelAlignment = GetScrollPosition();
   }
 
-  bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas);
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas);
 
   void UpdateSticky();
 
@@ -835,7 +835,7 @@
   void DidReflow(nsPresContext* aPresContext,
                  const ReflowInput* aReflowInput) override;
 
-  bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) final {
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) final {
     return mHelper.ComputeCustomOverflow(aOverflowAreas);
   }
 
@@ -867,7 +867,9 @@
 
   void DestroyFrom(nsIFrame* aDestructRoot, PostDestroyData&) override;
 
-  nsIScrollableFrame* GetScrollTargetFrame() final { return this; }
+  nsIScrollableFrame* GetScrollTargetFrame() const final {
+    return const_cast<nsHTMLScrollFrame*>(this);
+  }
 
   nsContainerFrame* GetContentInsertionFrame() override {
     return mHelper.GetScrolledFrame()->GetContentInsertionFrame();
@@ -1055,7 +1057,7 @@
   bool IsScrollAnimating(IncludeApzAnimation aIncludeApz) final {
     return mHelper.IsScrollAnimating(aIncludeApz);
   }
-  mozilla::ScrollGeneration CurrentScrollGeneration() final {
+  mozilla::ScrollGeneration CurrentScrollGeneration() const final {
     return mHelper.CurrentScrollGeneration();
   }
   nsPoint LastScrollDestination() final {
@@ -1290,7 +1292,7 @@
   nscoord GetMinISize(gfxContext *aRenderingContext) final;
 #endif
 
-  bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) final {
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) final {
     return mHelper.ComputeCustomOverflow(aOverflowAreas);
   }
 
@@ -1312,7 +1314,9 @@
   void DestroyFrom(nsIFrame* aDestructRoot,
                    PostDestroyData& aPostDestroyData) final;
 
-  nsIScrollableFrame* GetScrollTargetFrame() final { return this; }
+  nsIScrollableFrame* GetScrollTargetFrame() const final {
+    return const_cast<nsXULScrollFrame*>(this);
+  }
 
   nsContainerFrame* GetContentInsertionFrame() final {
     return mHelper.GetScrolledFrame()->GetContentInsertionFrame();
@@ -1531,7 +1535,7 @@
   bool IsScrollAnimating(IncludeApzAnimation aIncludeApz) final {
     return mHelper.IsScrollAnimating(aIncludeApz);
   }
-  mozilla::ScrollGeneration CurrentScrollGeneration() final {
+  mozilla::ScrollGeneration CurrentScrollGeneration() const final {
     return mHelper.CurrentScrollGeneration();
   }
   nsPoint LastScrollDestination() final {
diff -Nru firefox-84.0.2+build1/layout/generic/nsGridContainerFrame.cpp firefox-85.0+build1/layout/generic/nsGridContainerFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsGridContainerFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsGridContainerFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -618,6 +618,11 @@
                                     uint32_t aGridAxisTrackCount);
 
   /**
+   * Inhibit subgridding in aAxis for this item.
+   */
+  void InhibitSubgrid(nsGridContainerFrame* aParent, LogicalAxis aAxis);
+
+  /**
    * Return a copy of this item with its row/column data swapped.
    */
   GridItemInfo Transpose() const {
@@ -817,28 +822,31 @@
   state = newState;
 }
 
+void GridItemInfo::InhibitSubgrid(nsGridContainerFrame* aParent,
+                                  LogicalAxis aAxis) {
+  MOZ_ASSERT(IsSubgrid(aAxis));
+  auto bit = NS_STATE_GRID_IS_COL_SUBGRID;
+  if (aParent->GetWritingMode().IsOrthogonalTo(mFrame->GetWritingMode()) !=
+      (aAxis == eLogicalAxisBlock)) {
+    bit = NS_STATE_GRID_IS_ROW_SUBGRID;
+  }
+  MOZ_ASSERT(SubgridFrame()->HasAnyStateBits(bit));
+  SubgridFrame()->RemoveStateBits(bit);
+  mState[aAxis] &= StateBits(~StateBits::eIsSubgrid);
+}
+
 void GridItemInfo::MaybeInhibitSubgridInMasonry(nsGridContainerFrame* aParent,
                                                 uint32_t aGridAxisTrackCount) {
   if (IsSubgrid(eLogicalAxisInline) && aParent->IsMasonry(eLogicalAxisBlock) &&
       mArea.mRows.mStart != 0 && mArea.mCols.Extent() != aGridAxisTrackCount &&
       (mState[eLogicalAxisInline] & eAutoPlacement)) {
-    mState[eLogicalAxisInline] &= StateBits(~StateBits::eIsSubgrid);
-    if (aParent->GetWritingMode().IsOrthogonalTo(mFrame->GetWritingMode())) {
-      mFrame->RemoveStateBits(NS_STATE_GRID_IS_ROW_SUBGRID);
-    } else {
-      mFrame->RemoveStateBits(NS_STATE_GRID_IS_COL_SUBGRID);
-    }
+    InhibitSubgrid(aParent, eLogicalAxisInline);
     return;
   }
   if (IsSubgrid(eLogicalAxisBlock) && aParent->IsMasonry(eLogicalAxisInline) &&
       mArea.mCols.mStart != 0 && mArea.mRows.Extent() != aGridAxisTrackCount &&
       (mState[eLogicalAxisBlock] & eAutoPlacement)) {
-    mState[eLogicalAxisBlock] &= StateBits(~StateBits::eIsSubgrid);
-    if (aParent->GetWritingMode().IsOrthogonalTo(mFrame->GetWritingMode())) {
-      mFrame->RemoveStateBits(NS_STATE_GRID_IS_COL_SUBGRID);
-    } else {
-      mFrame->RemoveStateBits(NS_STATE_GRID_IS_ROW_SUBGRID);
-    }
+    InhibitSubgrid(aParent, eLogicalAxisBlock);
   }
 }
 
@@ -4411,23 +4419,25 @@
   }
 
   // Abs.pos. subgrids may have kAutoLine in their area.  Map those to the edge
-  // line in the parent's explicit grid (zero-based line numbers).  This is ok
-  // because it's only used for translating lines and such, not for layout.
+  // line in the parent's grid (zero-based line numbers).
   if (MOZ_UNLIKELY(subgrid->mArea.mCols.mStart == kAutoLine)) {
     subgrid->mArea.mCols.mStart = 0;
   }
   if (MOZ_UNLIKELY(subgrid->mArea.mCols.mEnd == kAutoLine)) {
-    subgrid->mArea.mCols.mEnd = aParentGrid->mExplicitGridOffsetCol +
-                                aParentGrid->mExplicitGridColEnd - 1;
+    subgrid->mArea.mCols.mEnd = aParentGrid->mGridColEnd - 1;
   }
   if (MOZ_UNLIKELY(subgrid->mArea.mRows.mStart == kAutoLine)) {
     subgrid->mArea.mRows.mStart = 0;
   }
   if (MOZ_UNLIKELY(subgrid->mArea.mRows.mEnd == kAutoLine)) {
-    subgrid->mArea.mRows.mEnd = aParentGrid->mExplicitGridOffsetRow +
-                                aParentGrid->mExplicitGridRowEnd - 1;
+    subgrid->mArea.mRows.mEnd = aParentGrid->mGridRowEnd - 1;
   }
 
+  MOZ_ASSERT((subgrid->mArea.mCols.Extent() > 0 &&
+              subgrid->mArea.mRows.Extent() > 0) ||
+                 state.mGridItems.IsEmpty(),
+             "subgrid needs at least one track for its items");
+
   // The min/sz/max sizes are the input to the "repeat-to-fill" algorithm:
   // https://drafts.csswg.org/css-grid/#auto-repeat
   // They're only used for auto-repeat in a non-subgridded axis so we skip
@@ -4760,8 +4770,8 @@
     const int32_t offsetToColZero = int32_t(mExplicitGridOffsetCol) - 1;
     const int32_t offsetToRowZero = int32_t(mExplicitGridOffsetRow) - 1;
     // Untranslate the grid again temporarily while resolving abs.pos. lines.
-    AutoRestore<uint32_t> save1(mGridColEnd);
-    AutoRestore<uint32_t> save2(mGridRowEnd);
+    AutoRestore<uint32_t> zeroOffsetGridColEnd(mGridColEnd);
+    AutoRestore<uint32_t> zeroOffsetGridRowEnd(mGridRowEnd);
     mGridColEnd -= offsetToColZero;
     mGridRowEnd -= offsetToRowZero;
     aState.mAbsPosItems.ClearAndRetainStorage();
@@ -4807,6 +4817,22 @@
       if (isMasonry) {
         info->MaybeInhibitSubgridInMasonry(aState.mFrame, gridAxisTrackCount);
       }
+
+      // An abs.pos. subgrid with placement auto/1 or -1/auto technically
+      // doesn't span any parent tracks.  Inhibit subgridding in this case.
+      if (info->IsSubgrid(eLogicalAxisInline)) {
+        if (info->mArea.mCols.mStart == zeroOffsetGridColEnd.SavedValue() ||
+            info->mArea.mCols.mEnd == 0) {
+          info->InhibitSubgrid(aState.mFrame, eLogicalAxisInline);
+        }
+      }
+      if (info->IsSubgrid(eLogicalAxisBlock)) {
+        if (info->mArea.mRows.mStart == zeroOffsetGridRowEnd.SavedValue() ||
+            info->mArea.mRows.mEnd == 0) {
+          info->InhibitSubgrid(aState.mFrame, eLogicalAxisBlock);
+        }
+      }
+
       if (info->IsSubgrid()) {
         Grid grid(this);
         grid.SubgridPlaceGridItems(aState, this, *info);
@@ -4939,7 +4965,7 @@
     rs = dummyParentState.ptr();
   }
 #ifdef DEBUG
-  // This will suppress various CRAZY_SIZE warnings for this reflow.
+  // This will suppress various ABSURD_SIZE warnings for this reflow.
   parent->SetProperty(nsContainerFrame::DebugReflowingWithInfiniteISize(),
                       true);
 #endif
@@ -8338,7 +8364,7 @@
   MOZ_ASSERT(aState.mReflowInput);
   MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
 
-  nsOverflowAreas ocBounds;
+  OverflowAreas ocBounds;
   nsReflowStatus ocStatus;
   if (GetPrevInFlow()) {
     ReflowOverflowContainerChildren(PresContext(), *aState.mReflowInput,
@@ -8532,7 +8558,7 @@
       }
     }
   } else {
-    consumedBSize = CalcAndCacheConsumedBSize(wm);
+    consumedBSize = CalcAndCacheConsumedBSize();
     gridReflowInput.InitializeForContinuation(this, consumedBSize);
     // XXX Technically incorrect: We're ignoring our row sizes, when really
     // we should use them but *they* should be computed as if we had no
diff -Nru firefox-84.0.2+build1/layout/generic/nsHTMLCanvasFrame.h firefox-85.0+build1/layout/generic/nsHTMLCanvasFrame.h
--- firefox-84.0.2+build1/layout/generic/nsHTMLCanvasFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsHTMLCanvasFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -17,6 +17,7 @@
 namespace mozilla {
 class PresShell;
 namespace layers {
+class CanvasRenderer;
 class Layer;
 class LayerManager;
 class WebRenderCanvasData;
diff -Nru firefox-84.0.2+build1/layout/generic/nsIAnonymousContentCreator.h firefox-85.0+build1/layout/generic/nsIAnonymousContentCreator.h
--- firefox-84.0.2+build1/layout/generic/nsIAnonymousContentCreator.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsIAnonymousContentCreator.h	2021-01-18 19:58:16.000000000 +0000
@@ -13,13 +13,11 @@
 #define nsIAnonymousContentCreator_h___
 
 #include "mozilla/AnonymousContentKey.h"
-#include "mozilla/ComputedStyle.h"
 
 #include "nsQueryFrame.h"
 #include "nsTArrayForwardDeclare.h"
 
 class nsIContent;
-class nsIFrame;
 
 /**
  * Any source for anonymous content can implement this interface to provide it.
diff -Nru firefox-84.0.2+build1/layout/generic/nsIFrame.cpp firefox-85.0+build1/layout/generic/nsIFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsIFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsIFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -434,11 +434,30 @@
 
 void nsIFrame::ContentStatesChanged(mozilla::EventStates aStates) {}
 
+void WeakFrame::Clear(mozilla::PresShell* aPresShell) {
+  if (aPresShell) {
+    aPresShell->RemoveWeakFrame(this);
+  }
+  mFrame = nullptr;
+}
+
 AutoWeakFrame::AutoWeakFrame(const WeakFrame& aOther)
     : mPrev(nullptr), mFrame(nullptr) {
   Init(aOther.GetFrame());
 }
 
+void AutoWeakFrame::Clear(mozilla::PresShell* aPresShell) {
+  if (aPresShell) {
+    aPresShell->RemoveAutoWeakFrame(this);
+  }
+  mFrame = nullptr;
+  mPrev = nullptr;
+}
+
+AutoWeakFrame::~AutoWeakFrame() {
+  Clear(mFrame ? mFrame->PresContext()->GetPresShell() : nullptr);
+}
+
 void AutoWeakFrame::Init(nsIFrame* aFrame) {
   Clear(mFrame ? mFrame->PresContext()->GetPresShell() : nullptr);
   mFrame = aFrame;
@@ -3384,7 +3403,15 @@
 
     CheckForApzAwareEventHandlers(aBuilder, this);
 
-    if (usingMask) {
+    // If we have a mask, compute a clip to bound the masked content.
+    // This is necessary in case the content moves with an ancestor
+    // ASR of the mask.
+    // Don't do this if we also have a filter, because then the clip
+    // would be applied before the filter, violating
+    // https://www.w3.org/TR/filter-effects-1/#placement.
+    // Filters are a containing block for fixed and absolute descendants,
+    // so the masked content cannot move with an ancestor ASR.
+    if (usingMask && !usingFilter) {
       clipForMask = ComputeClipForMaskItem(aBuilder, this);
       if (clipForMask) {
         aBuilder->IntersectDirtyRect(*clipForMask);
@@ -5999,33 +6026,6 @@
 /* virtual */
 AspectRatio nsIFrame::GetIntrinsicRatio() const { return AspectRatio(); }
 
-static nscoord ComputeInlineSizeFromAspectRatio(
-    WritingMode aWM, const StyleAspectRatio& aAspectRatio, nscoord aBlockSize,
-    const LogicalSize& aBoxSizingAdjustment) {
-  MOZ_ASSERT(aAspectRatio.HasFiniteRatio(),
-             "Infinite or zero ratio may have undefined behavior when "
-             "computing the size");
-  return aAspectRatio.ratio.AsRatio()
-             .ToLayoutRatio()
-             .ConvertToWritingMode(aWM)
-             .ApplyTo(aBlockSize + aBoxSizingAdjustment.BSize(aWM)) -
-         aBoxSizingAdjustment.ISize(aWM);
-}
-
-static nscoord ComputeBlockSizeFromAspectRatio(
-    WritingMode aWM, const StyleAspectRatio& aAspectRatio, nscoord aInlineSize,
-    const LogicalSize& aBoxSizingAdjustment) {
-  MOZ_ASSERT(aAspectRatio.HasFiniteRatio(),
-             "Infinite or zero ratio may have undefined behavior when "
-             "computing the size");
-  return aAspectRatio.ratio.AsRatio()
-             .ToLayoutRatio()
-             .ConvertToWritingMode(aWM)
-             .Inverted()
-             .ApplyTo(aInlineSize + aBoxSizingAdjustment.ISize(aWM)) -
-         aBoxSizingAdjustment.BSize(aWM);
-}
-
 static bool ShouldApplyAutomaticMinimumOnInlineAxis(
     WritingMode aWM, const nsStyleDisplay* aDisplay,
     const nsStylePosition* aPosition) {
@@ -6066,13 +6066,17 @@
   MinMaxSize transferredISize;
 
   if (aMinMaxBSize.mMinSize > 0) {
-    transferredISize.mMinSize = ComputeInlineSizeFromAspectRatio(
-        aWM, aAspectRatio, aMinMaxBSize.mMinSize, aBoxSizingAdjustment);
+    transferredISize.mMinSize =
+        aAspectRatio.ToLayoutRatio().ComputeRatioDependentSize(
+            LogicalAxis::eLogicalAxisInline, aWM, aMinMaxBSize.mMinSize,
+            aBoxSizingAdjustment);
   }
 
   if (aMinMaxBSize.mMaxSize != NS_UNCONSTRAINEDSIZE) {
-    transferredISize.mMaxSize = ComputeInlineSizeFromAspectRatio(
-        aWM, aAspectRatio, aMinMaxBSize.mMaxSize, aBoxSizingAdjustment);
+    transferredISize.mMaxSize =
+        aAspectRatio.ToLayoutRatio().ComputeRatioDependentSize(
+            LogicalAxis::eLogicalAxisInline, aWM, aMinMaxBSize.mMaxSize,
+            aBoxSizingAdjustment);
   }
 
   // Minimum size wins over maximum size.
@@ -6208,8 +6212,9 @@
     auto bSize = nsLayoutUtils::ComputeBSizeValue(
         aCBSize.BSize(aWM), boxSizingAdjust.BSize(aWM),
         blockStyleCoord->AsLengthPercentage());
-    result.ISize(aWM) = ComputeInlineSizeFromAspectRatio(
-        aWM, stylePos->mAspectRatio, bSize, boxSizingAdjust);
+    result.ISize(aWM) =
+        stylePos->mAspectRatio.ToLayoutRatio().ComputeRatioDependentSize(
+            LogicalAxis::eLogicalAxisInline, aWM, bSize, boxSizingAdjust);
     aspectRatioUsage = AspectRatioUsage::ToComputeISize;
   } else if (MOZ_UNLIKELY(isGridItem) && !IsTrueOverflowContainer()) {
     // 'auto' inline-size for grid-level box - fill the CB for 'stretch' /
@@ -6341,8 +6346,10 @@
           blockStyleCoord->AsLengthPercentage());
     } else if (stylePos->mAspectRatio.HasFiniteRatio() &&
                result.ISize(aWM) != NS_UNCONSTRAINEDSIZE) {
-      result.BSize(aWM) = ComputeBlockSizeFromAspectRatio(
-          aWM, stylePos->mAspectRatio, result.ISize(aWM), boxSizingAdjust);
+      result.BSize(aWM) =
+          stylePos->mAspectRatio.ToLayoutRatio().ComputeRatioDependentSize(
+              LogicalAxis::eLogicalAxisBlock, aWM, result.ISize(aWM),
+              boxSizingAdjust);
       MOZ_ASSERT(aspectRatioUsage == AspectRatioUsage::None);
       aspectRatioUsage = AspectRatioUsage::ToComputeBSize;
     } else if (MOZ_UNLIKELY(isGridItem) && blockStyleCoord->IsAuto() &&
@@ -7492,10 +7499,7 @@
                      : GetPosition();
 }
 
-nsRect nsIFrame::GetOverflowRect(nsOverflowType aType) const {
-  MOZ_ASSERT(aType == eInkOverflow || aType == eScrollableOverflow,
-             "unexpected type");
-
+nsRect nsIFrame::GetOverflowRect(OverflowType aType) const {
   // Note that in some cases the overflow area might not have been
   // updated (yet) to reflect any outline set on the frame or the area
   // of child frames. That's OK because any reflow that updates these
@@ -7508,34 +7512,34 @@
     return GetOverflowAreasProperty()->Overflow(aType);
   }
 
-  if (aType == eInkOverflow && mOverflow.mType != NS_FRAME_OVERFLOW_NONE) {
+  if (aType == OverflowType::Ink && mOverflow.mType != NS_FRAME_OVERFLOW_NONE) {
     return InkOverflowFromDeltas();
   }
 
   return nsRect(nsPoint(0, 0), GetSize());
 }
 
-nsOverflowAreas nsIFrame::GetOverflowAreas() const {
+OverflowAreas nsIFrame::GetOverflowAreas() const {
   if (mOverflow.mType == NS_FRAME_OVERFLOW_LARGE) {
     // there is an overflow rect, and it's not stored as deltas but as
     // a separately-allocated rect
     return *GetOverflowAreasProperty();
   }
 
-  return nsOverflowAreas(InkOverflowFromDeltas(),
-                         nsRect(nsPoint(0, 0), GetSize()));
+  return OverflowAreas(InkOverflowFromDeltas(),
+                       nsRect(nsPoint(0, 0), GetSize()));
 }
 
-nsOverflowAreas nsIFrame::GetOverflowAreasRelativeToSelf() const {
+OverflowAreas nsIFrame::GetOverflowAreasRelativeToSelf() const {
   if (IsTransformed()) {
-    nsOverflowAreas* preTransformOverflows =
+    OverflowAreas* preTransformOverflows =
         GetProperty(PreTransformOverflowAreasProperty());
     if (preTransformOverflows) {
-      return nsOverflowAreas(preTransformOverflows->InkOverflow(),
-                             preTransformOverflows->ScrollableOverflow());
+      return OverflowAreas(preTransformOverflows->InkOverflow(),
+                           preTransformOverflows->ScrollableOverflow());
     }
   }
-  return nsOverflowAreas(InkOverflowRect(), ScrollableOverflowRect());
+  return OverflowAreas(InkOverflowRect(), ScrollableOverflowRect());
 }
 
 nsRect nsIFrame::ScrollableOverflowRectRelativeToParent() const {
@@ -7548,7 +7552,7 @@
 
 nsRect nsIFrame::ScrollableOverflowRectRelativeToSelf() const {
   if (IsTransformed()) {
-    nsOverflowAreas* preTransformOverflows =
+    OverflowAreas* preTransformOverflows =
         GetProperty(PreTransformOverflowAreasProperty());
     if (preTransformOverflows)
       return preTransformOverflows->ScrollableOverflow();
@@ -7558,7 +7562,7 @@
 
 nsRect nsIFrame::InkOverflowRectRelativeToSelf() const {
   if (IsTransformed()) {
-    nsOverflowAreas* preTransformOverflows =
+    OverflowAreas* preTransformOverflows =
         GetProperty(PreTransformOverflowAreasProperty());
     if (preTransformOverflows) return preTransformOverflows->InkOverflow();
   }
@@ -7575,7 +7579,7 @@
              "Non-display SVG do not maintain ink overflow rects");
 
   nsRect rect(nsPoint(0, 0), GetSize());
-  nsOverflowAreas overflowAreas(rect, rect);
+  OverflowAreas overflowAreas(rect, rect);
 
   if (!ComputeCustomOverflow(overflowAreas)) {
     // If updating overflow wasn't supported by this frame, then it should
@@ -7609,12 +7613,12 @@
 }
 
 /* virtual */
-bool nsIFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool nsIFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   return true;
 }
 
 /* virtual */
-void nsIFrame::UnionChildOverflow(nsOverflowAreas& aOverflowAreas) {
+void nsIFrame::UnionChildOverflow(OverflowAreas& aOverflowAreas) {
   if (!DoesClipChildrenInBothAxes() &&
       !(IsXULCollapsed() && (IsXULBoxFrame() || ::IsXULBoxWrapped(this)))) {
     nsLayoutUtils::UnionChildOverflow(this, aOverflowAreas);
@@ -9167,9 +9171,9 @@
 /** Set the overflowArea rect, storing it as deltas or a separate rect
  * depending on its size in relation to the primary frame rect.
  */
-bool nsIFrame::SetOverflowAreas(const nsOverflowAreas& aOverflowAreas) {
+bool nsIFrame::SetOverflowAreas(const OverflowAreas& aOverflowAreas) {
   if (mOverflow.mType == NS_FRAME_OVERFLOW_LARGE) {
-    nsOverflowAreas* overflow = GetOverflowAreasProperty();
+    OverflowAreas* overflow = GetOverflowAreasProperty();
     bool changed = *overflow != aOverflowAreas;
     *overflow = aOverflowAreas;
 
@@ -9215,7 +9219,7 @@
 
     // it's a large overflow area that we need to store as a property
     mOverflow.mType = NS_FRAME_OVERFLOW_LARGE;
-    AddProperty(OverflowAreasProperty(), new nsOverflowAreas(aOverflowAreas));
+    AddProperty(OverflowAreasProperty(), new OverflowAreas(aOverflowAreas));
     return changed;
   }
 }
@@ -9228,7 +9232,7 @@
 static nsRect UnionBorderBoxes(
     nsIFrame* aFrame, bool aApplyTransform, bool& aOutValid,
     const nsSize* aSizeOverride = nullptr,
-    const nsOverflowAreas* aOverflowOverride = nullptr) {
+    const OverflowAreas* aOverflowOverride = nullptr) {
   const nsRect bounds(nsPoint(0, 0),
                       aSizeOverride ? *aSizeOverride : aFrame->GetSize());
 
@@ -9358,7 +9362,7 @@
 }
 
 static void ComputeAndIncludeOutlineArea(nsIFrame* aFrame,
-                                         nsOverflowAreas& aOverflowAreas,
+                                         OverflowAreas& aOverflowAreas,
                                          const nsSize& aNewSize) {
   const nsStyleOutline* outline = aFrame->StyleOutline();
   if (!outline->ShouldPaintOutline()) {
@@ -9444,7 +9448,7 @@
   vo.UnionRectEdges(vo, innerRect.Union(outerRect));
 }
 
-bool nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
+bool nsIFrame::FinishAndStoreOverflow(OverflowAreas& aOverflowAreas,
                                       nsSize aNewSize, nsSize* aOldSize,
                                       const nsStyleDisplay* aStyleDisplay) {
   MOZ_ASSERT(FrameMaintainsOverflow(),
@@ -9459,11 +9463,10 @@
   if (hasTransform || Combines3DTransformWithAncestors(disp)) {
     if (!aOverflowAreas.InkOverflow().IsEqualEdges(bounds) ||
         !aOverflowAreas.ScrollableOverflow().IsEqualEdges(bounds)) {
-      nsOverflowAreas* initial =
-          GetProperty(nsIFrame::InitialOverflowProperty());
+      OverflowAreas* initial = GetProperty(nsIFrame::InitialOverflowProperty());
       if (!initial) {
         AddProperty(nsIFrame::InitialOverflowProperty(),
-                    new nsOverflowAreas(aOverflowAreas));
+                    new OverflowAreas(aOverflowAreas));
       } else if (initial != &aOverflowAreas) {
         *initial = aOverflowAreas;
       }
@@ -9524,7 +9527,7 @@
   // contain the frame border-box. Don't warn in that case.
   // Don't warn for SVG either, since SVG doesn't need the overflow area
   // to contain the frame bounds.
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+  for (const auto otype : AllOverflowTypes()) {
     DebugOnly<nsRect*> r = &aOverflowAreas.Overflow(otype);
     NS_ASSERTION(aNewSize.width == 0 || aNewSize.height == 0 ||
                      r->width == nscoord_MAX || r->height == nscoord_MAX ||
@@ -9562,7 +9565,7 @@
   // the area unnecessarily.
   if ((aNewSize.width != 0 || !IsInlineFrame()) &&
       !HasAnyStateBits(NS_FRAME_SVG_LAYOUT)) {
-    NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+    for (const auto otype : AllOverflowTypes()) {
       nsRect& o = aOverflowAreas.Overflow(otype);
       o.UnionRectEdges(o, bounds);
     }
@@ -9591,7 +9594,7 @@
   const nsStyleEffects* effects = StyleEffects();
   Maybe<nsRect> clipPropClipRect = GetClipPropClipRect(disp, effects, aNewSize);
   if (clipPropClipRect) {
-    NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+    for (const auto otype : AllOverflowTypes()) {
       nsRect& o = aOverflowAreas.Overflow(otype);
       o.IntersectRect(o, *clipPropClipRect);
     }
@@ -9601,7 +9604,7 @@
    * transformation. */
   if (hasTransform) {
     SetProperty(nsIFrame::PreTransformOverflowAreasProperty(),
-                new nsOverflowAreas(aOverflowAreas));
+                new OverflowAreas(aOverflowAreas));
 
     if (Combines3DTransformWithAncestors(disp)) {
       /* If we're a preserve-3d leaf frame, then our pre-transform overflow
@@ -9614,7 +9617,7 @@
       aOverflowAreas.SetAllTo(nsRect());
     } else {
       TransformReferenceBox refBox(this);
-      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+      for (const auto otype : AllOverflowTypes()) {
         nsRect& o = aOverflowAreas.Overflow(otype);
         o = nsDisplayTransform::TransformRect(o, this, refBox);
       }
@@ -9636,7 +9639,7 @@
   SetSize(oldSize, false);
 
   bool anyOverflowChanged;
-  if (aOverflowAreas != nsOverflowAreas(bounds, bounds)) {
+  if (aOverflowAreas != OverflowAreas(bounds, bounds)) {
     anyOverflowChanged = SetOverflowAreas(aOverflowAreas);
   } else {
     anyOverflowChanged = ClearOverflowRects();
@@ -9663,14 +9666,14 @@
         continue;  // frame does not maintain overflow rects
       }
       if (child->HasPerspective()) {
-        nsOverflowAreas* overflow =
+        OverflowAreas* overflow =
             child->GetProperty(nsIFrame::InitialOverflowProperty());
         nsRect bounds(nsPoint(0, 0), child->GetSize());
         if (overflow) {
-          nsOverflowAreas overflowCopy = *overflow;
+          OverflowAreas overflowCopy = *overflow;
           child->FinishAndStoreOverflow(overflowCopy, bounds.Size());
         } else {
-          nsOverflowAreas boundsOverflow;
+          OverflowAreas boundsOverflow;
           boundsOverflow.SetAllTo(bounds);
           child->FinishAndStoreOverflow(boundsOverflow, bounds.Size());
         }
@@ -9688,7 +9691,7 @@
 }
 
 void nsIFrame::ComputePreserve3DChildrenOverflow(
-    nsOverflowAreas& aOverflowAreas) {
+    OverflowAreas& aOverflowAreas) {
   // Find all descendants that participate in the 3d context, and include their
   // overflow. These descendants have an empty overflow, so won't have been
   // included in the normal overflow calculation. Any children that don't
@@ -9704,9 +9707,9 @@
       // root coordinate space.
       const nsStyleDisplay* childDisp = child->StyleDisplay();
       if (child->Combines3DTransformWithAncestors(childDisp)) {
-        nsOverflowAreas childOverflow = child->GetOverflowAreasRelativeToSelf();
+        OverflowAreas childOverflow = child->GetOverflowAreasRelativeToSelf();
         TransformReferenceBox refBox(child);
-        NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+        for (const auto otype : AllOverflowTypes()) {
           nsRect& o = childOverflow.Overflow(otype);
           o = nsDisplayTransform::TransformRect(o, child, refBox);
         }
@@ -10435,7 +10438,6 @@
   }
 
   nsReflowStatus status;
-  WritingMode wm = aDesiredSize.GetWritingMode();
 
   bool needsReflow = IsSubtreeDirty();
 
@@ -10450,7 +10452,7 @@
         needsReflow = false;
         aDesiredSize.Width() = aWidth;
         aDesiredSize.Height() = aHeight;
-        SetSize(aDesiredSize.Size(wm).ConvertTo(GetWritingMode(), wm));
+        SetSize(aDesiredSize.Size(GetWritingMode()));
       } else {
         aDesiredSize.Width() = metrics->mLastSize.width;
         aDesiredSize.Height() = metrics->mLastSize.height;
@@ -11202,9 +11204,12 @@
     } else if (touchAction & StyleTouchAction::MANIPULATION) {
       result += CompositorHitTestFlags::eTouchActionDoubleTapZoomDisabled;
     } else {
-      // This path handles the cases none | [pan-x || pan-y] and so both
-      // double-tap and pinch zoom are disabled in here.
-      result += CompositorHitTestFlags::eTouchActionPinchZoomDisabled;
+      // This path handles the cases none | [pan-x || pan-y || pinch-zoom] so
+      // double-tap is disabled in here.
+      if (!(touchAction & StyleTouchAction::PINCH_ZOOM)) {
+        result += CompositorHitTestFlags::eTouchActionPinchZoomDisabled;
+      }
+
       result += CompositorHitTestFlags::eTouchActionDoubleTapZoomDisabled;
 
       if (!(touchAction & StyleTouchAction::PAN_X)) {
@@ -11342,6 +11347,28 @@
   return clip ? PhysicalAxes::Both : PhysicalAxes::None;
 }
 
+void nsIFrame::AddPaintedPresShell(mozilla::PresShell* aPresShell) {
+  PaintedPresShellList()->AppendElement(do_GetWeakReference(aPresShell));
+}
+
+void nsIFrame::UpdatePaintCountForPaintedPresShells() {
+  for (nsWeakPtr& item : *PaintedPresShellList()) {
+    if (RefPtr<mozilla::PresShell> presShell = do_QueryReferent(item)) {
+      presShell->IncrementPaintCount();
+    }
+  }
+}
+
+bool nsIFrame::DidPaintPresShell(mozilla::PresShell* aPresShell) {
+  for (nsWeakPtr& item : *PaintedPresShellList()) {
+    RefPtr<mozilla::PresShell> presShell = do_QueryReferent(item);
+    if (presShell == aPresShell) {
+      return true;
+    }
+  }
+  return false;
+}
+
 #ifdef DEBUG
 static void GetTagName(nsIFrame* aFrame, nsIContent* aContent, int aResultSize,
                        char* aResult) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsIFrame.h firefox-85.0+build1/layout/generic/nsIFrame.h
--- firefox-84.0.2+build1/layout/generic/nsIFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsIFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -54,16 +54,18 @@
 #include "LayoutConstants.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "mozilla/AspectRatio.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/RelativeTo.h"
 #include "mozilla/Result.h"
 #include "mozilla/SmallPointerArray.h"
-#include "mozilla/PresShell.h"
 #include "mozilla/ToString.h"
 #include "mozilla/WritingModes.h"
 #include "nsDirection.h"
 #include "nsFrameList.h"
 #include "nsFrameState.h"
 #include "mozilla/ReflowInput.h"
+#include "nsIContent.h"
 #include "nsITheme.h"
 #include "nsQueryFrame.h"
 #include "mozilla/ComputedStyle.h"
@@ -72,9 +74,11 @@
 #include "nsChangeHint.h"
 #include "mozilla/ComputedStyleInlines.h"
 #include "mozilla/EnumSet.h"
+#include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/CompositorHitTestInfo.h"
 #include "mozilla/gfx/MatrixFwd.h"
 #include "nsDisplayItemTypes.h"
+#include "nsPresContext.h"
 
 #ifdef ACCESSIBILITY
 #  include "mozilla/a11y/AccTypes.h"
@@ -102,6 +106,7 @@
 class nsView;
 class nsFrameSelection;
 class nsIWidget;
+class nsIScrollableFrame;
 class nsISelectionController;
 class nsBoxLayoutState;
 class nsBoxLayout;
@@ -119,6 +124,7 @@
 class nsContainerFrame;
 class nsPlaceholderFrame;
 class nsStyleChangeList;
+class nsViewManager;
 class nsWindowSizes;
 
 struct nsBoxLayoutMetrics;
@@ -133,6 +139,10 @@
 class ServoRestyleState;
 class DisplayItemData;
 class EffectSet;
+class LazyLogModule;
+class PresShell;
+class WidgetGUIEvent;
+class WidgetMouseEvent;
 
 namespace layers {
 class Layer;
@@ -855,7 +865,7 @@
    * like nsTextControlFrame that contain a scrollframe, will return
    * that scrollframe.
    */
-  virtual nsIScrollableFrame* GetScrollTargetFrame() { return nullptr; }
+  virtual nsIScrollableFrame* GetScrollTargetFrame() const { return nullptr; }
 
   /**
    * Get the offsets of the frame. most will be 0,0
@@ -1162,7 +1172,7 @@
     }
     if (mOverflow.mType != NS_FRAME_OVERFLOW_LARGE &&
         mOverflow.mType != NS_FRAME_OVERFLOW_NONE) {
-      nsOverflowAreas overflow = GetOverflowAreas();
+      mozilla::OverflowAreas overflow = GetOverflowAreas();
       mRect = aRect;
       SetOverflowAreas(overflow);
     } else {
@@ -1343,17 +1353,19 @@
   NS_DECLARE_FRAME_PROPERTY_DELETABLE(OutlineInnerRectProperty, nsRect)
   NS_DECLARE_FRAME_PROPERTY_DELETABLE(PreEffectsBBoxProperty, nsRect)
   NS_DECLARE_FRAME_PROPERTY_DELETABLE(PreTransformOverflowAreasProperty,
-                                      nsOverflowAreas)
+                                      mozilla::OverflowAreas)
 
   NS_DECLARE_FRAME_PROPERTY_DELETABLE(CachedBorderImageDataProperty,
                                       CachedBorderImageData)
 
-  NS_DECLARE_FRAME_PROPERTY_DELETABLE(OverflowAreasProperty, nsOverflowAreas)
+  NS_DECLARE_FRAME_PROPERTY_DELETABLE(OverflowAreasProperty,
+                                      mozilla::OverflowAreas)
 
   // The initial overflow area passed to FinishAndStoreOverflow. This is only
   // set on frames that Preserve3D() or HasPerspective() or IsTransformed(), and
   // when at least one of the overflow areas differs from the frame bound rect.
-  NS_DECLARE_FRAME_PROPERTY_DELETABLE(InitialOverflowProperty, nsOverflowAreas)
+  NS_DECLARE_FRAME_PROPERTY_DELETABLE(InitialOverflowProperty,
+                                      mozilla::OverflowAreas)
 
 #ifdef DEBUG
   // InitialOverflowPropertyDebug is added to the frame to indicate that either
@@ -2078,7 +2090,8 @@
    * Includes the overflow area of all descendants that participate in the
    * current 3d context into aOverflowAreas.
    */
-  void ComputePreserve3DChildrenOverflow(nsOverflowAreas& aOverflowAreas);
+  void ComputePreserve3DChildrenOverflow(
+      mozilla::OverflowAreas& aOverflowAreas);
 
   void RecomputePerspectiveChildrenOverflow(const nsIFrame* aStartFrame);
 
@@ -2942,13 +2955,13 @@
    * If the frame requires a reflow instead, then it is responsible
    * for scheduling one.
    */
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas);
+  virtual bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas);
 
   /**
    * Computes any overflow area created by children of this frame and
    * includes it into aOverflowAreas.
    */
-  virtual void UnionChildOverflow(nsOverflowAreas& aOverflowAreas);
+  virtual void UnionChildOverflow(mozilla::OverflowAreas& aOverflowAreas);
 
   // Represents zero or more physical axes.
   enum class PhysicalAxes : uint8_t {
@@ -3537,7 +3550,9 @@
    * system, and may not contain the frame's border-box, e.g. if there
    * is a CSS transform scaling it down)
    */
-  nsRect InkOverflowRect() const { return GetOverflowRect(eInkOverflow); }
+  nsRect InkOverflowRect() const {
+    return GetOverflowRect(mozilla::OverflowType::Ink);
+  }
 
   /**
    * Returns a rect that encompasses the area of this frame that the
@@ -3560,12 +3575,12 @@
    * is a CSS transform scaling it down)
    */
   nsRect ScrollableOverflowRect() const {
-    return GetOverflowRect(eScrollableOverflow);
+    return GetOverflowRect(mozilla::OverflowType::Scrollable);
   }
 
-  nsRect GetOverflowRect(nsOverflowType aType) const;
+  nsRect GetOverflowRect(mozilla::OverflowType aType) const;
 
-  nsOverflowAreas GetOverflowAreas() const;
+  mozilla::OverflowAreas GetOverflowAreas() const;
 
   /**
    * Same as GetOverflowAreas, except in this frame's coordinate
@@ -3574,7 +3589,7 @@
    * @return the overflow areas relative to this frame, before any CSS
    * transforms have been applied, i.e. in this frame's coordinate system
    */
-  nsOverflowAreas GetOverflowAreasRelativeToSelf() const;
+  mozilla::OverflowAreas GetOverflowAreasRelativeToSelf() const;
 
   /**
    * Same as ScrollableOverflowRect, except relative to the parent
@@ -3625,8 +3640,8 @@
    * be retrieved later without reflowing the frame. Returns true if either of
    * the overflow areas changed.
    */
-  bool FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas, nsSize aNewSize,
-                              nsSize* aOldSize = nullptr,
+  bool FinishAndStoreOverflow(mozilla::OverflowAreas& aOverflowAreas,
+                              nsSize aNewSize, nsSize* aOldSize = nullptr,
                               const nsStyleDisplay* aStyleDisplay = nullptr);
 
   bool FinishAndStoreOverflow(ReflowOutput* aMetrics,
@@ -3659,23 +3674,12 @@
    * @note (See also bug 743402, comment 11) GetSkipSides() checks to see
    *       if this frame has a previous or next continuation to determine
    *       if a side should be skipped.
-   *       Unfortunately, this only works after reflow has been completed. In
-   *       lieu of this, during reflow, a SkipSidesDuringReflow parameter can
-   *       be passed in, indicating that it should be used to determine if sides
-   *       should be skipped during reflow.
-   *
-   * FIXME(emilio, bug 1677917): That's wrong, fix BlockReflowInput and remove
-   * SkipSidesDuringReflow and related code.
+   *       So this only works after the entire frame tree has been reflowed.
+   *       During reflow, if this frame can be split in the block axis, you
+   *       should use nsSplittableFrame::PreReflowBlockLevelLogicalSkipSides().
    */
   Sides GetSkipSides() const;
-
-  struct SkipSidesDuringReflow {
-    const ReflowInput& mReflowInput;
-    const nscoord mConsumedBSize = NS_UNCONSTRAINEDSIZE;
-  };
-
-  virtual LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>& = Nothing()) const {
+  virtual LogicalSides GetLogicalSkipSides() const {
     return LogicalSides(mWritingMode);
   }
 
@@ -4401,34 +4405,18 @@
    * Flag a child PresShell as painted so that it will get its paint count
    * incremented during empty transactions.
    */
-  void AddPaintedPresShell(mozilla::PresShell* aPresShell) {
-    PaintedPresShellList()->AppendElement(do_GetWeakReference(aPresShell));
-  }
+  void AddPaintedPresShell(mozilla::PresShell* aPresShell);
 
   /**
    * Increment the paint count of all child PresShells that were painted during
    * the last repaint.
    */
-  void UpdatePaintCountForPaintedPresShells() {
-    for (nsWeakPtr& item : *PaintedPresShellList()) {
-      if (RefPtr<mozilla::PresShell> presShell = do_QueryReferent(item)) {
-        presShell->IncrementPaintCount();
-      }
-    }
-  }
+  void UpdatePaintCountForPaintedPresShells();
 
   /**
    * @return true if we painted @aPresShell during the last repaint.
    */
-  bool DidPaintPresShell(mozilla::PresShell* aPresShell) {
-    for (nsWeakPtr& item : *PaintedPresShellList()) {
-      RefPtr<mozilla::PresShell> presShell = do_QueryReferent(item);
-      if (presShell == aPresShell) {
-        return true;
-      }
-    }
-    return false;
-  }
+  bool DidPaintPresShell(mozilla::PresShell* aPresShell);
 
   /**
    * Accessors for the absolute containing block.
@@ -5256,9 +5244,9 @@
 
  private:
   // Get a pointer to the overflow areas property attached to the frame.
-  nsOverflowAreas* GetOverflowAreasProperty() const {
+  mozilla::OverflowAreas* GetOverflowAreasProperty() const {
     MOZ_ASSERT(mOverflow.mType == NS_FRAME_OVERFLOW_LARGE);
-    nsOverflowAreas* overflow = GetProperty(OverflowAreasProperty());
+    mozilla::OverflowAreas* overflow = GetProperty(OverflowAreasProperty());
     MOZ_ASSERT(overflow);
     return overflow;
   }
@@ -5280,7 +5268,7 @@
   /**
    * Returns true if any overflow changed.
    */
-  bool SetOverflowAreas(const nsOverflowAreas& aOverflowAreas);
+  bool SetOverflowAreas(const mozilla::OverflowAreas& aOverflowAreas);
 
   bool HasOpacityInternal(float aThreshold, const nsStyleDisplay* aStyleDisplay,
                           const nsStyleEffects* aStyleEffects,
@@ -5464,13 +5452,7 @@
 
   operator nsIFrame*() { return mFrame; }
 
-  void Clear(mozilla::PresShell* aPresShell) {
-    if (aPresShell) {
-      aPresShell->RemoveAutoWeakFrame(this);
-    }
-    mFrame = nullptr;
-    mPrev = nullptr;
-  }
+  void Clear(mozilla::PresShell* aPresShell);
 
   bool IsAlive() const { return !!mFrame; }
 
@@ -5480,9 +5462,7 @@
 
   void SetPreviousWeakFrame(AutoWeakFrame* aPrev) { mPrev = aPrev; }
 
-  ~AutoWeakFrame() {
-    Clear(mFrame ? mFrame->PresContext()->GetPresShell() : nullptr);
-  }
+  ~AutoWeakFrame();
 
  private:
   // Not available for the heap!
@@ -5536,12 +5516,7 @@
   nsIFrame* operator->() { return mFrame; }
   operator nsIFrame*() { return mFrame; }
 
-  void Clear(mozilla::PresShell* aPresShell) {
-    if (aPresShell) {
-      aPresShell->RemoveWeakFrame(this);
-    }
-    mFrame = nullptr;
-  }
+  void Clear(mozilla::PresShell* aPresShell);
 
   bool IsAlive() const { return !!mFrame; }
   nsIFrame* GetFrame() const { return mFrame; }
diff -Nru firefox-84.0.2+build1/layout/generic/nsImageFrame.cpp firefox-85.0+build1/layout/generic/nsImageFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsImageFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsImageFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1095,7 +1095,6 @@
     // We include the altFeedbackSize in our ink overflow, but not in our
     // scrollable overflow, since it doesn't really need to be scrolled to
     // outside the image.
-    static_assert(eOverflowType_LENGTH == 2, "Unknown overflow types?");
     nsRect& inkOverflow = aMetrics.InkOverflow();
     inkOverflow.UnionRect(inkOverflow, altFeedbackSize);
   } else if (PresShell()->IsActive()) {
@@ -2010,10 +2009,11 @@
     case ImgDrawResult::TEMPORARY_ERROR:
       if (mPrevImage && mPrevImage != mImage) {
         RefPtr<ImageContainer> prevContainer;
-        drawResult = mPrevImage->GetImageContainerAtSize(
+        ImgDrawResult newDrawResult = mPrevImage->GetImageContainerAtSize(
             aManager->LayerManager(), decodeSize, svgContext, flags,
             getter_AddRefs(prevContainer));
-        if (prevContainer && drawResult == ImgDrawResult::SUCCESS) {
+        if (prevContainer && newDrawResult == ImgDrawResult::SUCCESS) {
+          drawResult = newDrawResult;
           container = std::move(prevContainer);
           break;
         }
@@ -2457,8 +2457,7 @@
 }
 #endif
 
-nsIFrame::LogicalSides nsImageFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsImageFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsImageFrame.h firefox-85.0+build1/layout/generic/nsImageFrame.h
--- firefox-84.0.2+build1/layout/generic/nsImageFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsImageFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -118,8 +118,7 @@
             ListFlags aFlags = ListFlags()) const final;
 #endif
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>&) const final;
+  LogicalSides GetLogicalSkipSides() const final;
 
   static void ReleaseGlobals() {
     if (gIconLoad) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsInlineFrame.cpp firefox-85.0+build1/layout/generic/nsInlineFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsInlineFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsInlineFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -791,8 +791,7 @@
 
 //////////////////////////////////////////////////////////////////////
 
-nsIFrame::LogicalSides nsInlineFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsInlineFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsInlineFrame.h firefox-85.0+build1/layout/generic/nsInlineFrame.h
--- firefox-84.0.2+build1/layout/generic/nsInlineFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsInlineFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -148,8 +148,7 @@
       : nsContainerFrame(aStyle, aPresContext, aID),
         mBaseline(NS_INTRINSIC_ISIZE_UNKNOWN) {}
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>&) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   void ReflowFrames(nsPresContext* aPresContext,
                     const ReflowInput& aReflowInput, InlineReflowInput& rs,
diff -Nru firefox-84.0.2+build1/layout/generic/nsIScrollableFrame.h firefox-85.0+build1/layout/generic/nsIScrollableFrame.h
--- firefox-84.0.2+build1/layout/generic/nsIScrollableFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsIScrollableFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -446,7 +446,7 @@
    * Returns the current generation counter for the scrollframe. This counter
    * increments every time the scroll position is set.
    */
-  virtual mozilla::ScrollGeneration CurrentScrollGeneration() = 0;
+  virtual mozilla::ScrollGeneration CurrentScrollGeneration() const = 0;
   /**
    * LastScrollDestination returns the destination of the most recently
    * requested smooth scroll animation.
diff -Nru firefox-84.0.2+build1/layout/generic/nsLeafFrame.cpp firefox-85.0+build1/layout/generic/nsLeafFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsLeafFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLeafFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,8 @@
 /* base class for rendering objects that do not have child lists */
 
 #include "nsLeafFrame.h"
+
+#include "mozilla/PresShell.h"
 #include "nsPresContext.h"
 
 using namespace mozilla;
@@ -14,6 +16,13 @@
 nsLeafFrame::~nsLeafFrame() = default;
 
 /* virtual */
+void nsLeafFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
+                                   const nsDisplayListSet& aLists) {
+  DO_GLOBAL_REFLOW_COUNT_DSP("nsLeafFrame");
+  DisplayBorderBackgroundOutline(aBuilder, aLists);
+}
+
+/* virtual */
 nscoord nsLeafFrame::GetMinISize(gfxContext* aRenderingContext) {
   nscoord result;
   DISPLAY_MIN_INLINE_SIZE(this, result);
diff -Nru firefox-84.0.2+build1/layout/generic/nsLeafFrame.h firefox-85.0+build1/layout/generic/nsLeafFrame.h
--- firefox-84.0.2+build1/layout/generic/nsLeafFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLeafFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -24,11 +24,8 @@
   NS_DECL_ABSTRACT_FRAME(nsLeafFrame)
 
   // nsIFrame replacements
-  virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
-                                const nsDisplayListSet& aLists) override {
-    DO_GLOBAL_REFLOW_COUNT_DSP("nsLeafFrame");
-    DisplayBorderBackgroundOutline(aBuilder, aLists);
-  }
+  void BuildDisplayList(nsDisplayListBuilder* aBuilder,
+                        const nsDisplayListSet& aLists) override;
 
   /**
    * Both GetMinISize and GetPrefISize will return whatever GetIntrinsicISize
diff -Nru firefox-84.0.2+build1/layout/generic/nsLineBox.cpp firefox-85.0+build1/layout/generic/nsLineBox.cpp
--- firefox-84.0.2+build1/layout/generic/nsLineBox.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLineBox.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -453,7 +453,7 @@
 
 void nsLineBox::MaybeFreeData() {
   nsRect bounds = GetPhysicalBounds();
-  if (mData && mData->mOverflowAreas == nsOverflowAreas(bounds, bounds)) {
+  if (mData && mData->mOverflowAreas == OverflowAreas(bounds, bounds)) {
     if (IsInline()) {
       if (mInlineData->mFloats.IsEmpty()) {
         delete mInlineData;
@@ -528,13 +528,16 @@
   }
 }
 
-void nsLineBox::SetOverflowAreas(const nsOverflowAreas& aOverflowAreas) {
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+void nsLineBox::SetOverflowAreas(const OverflowAreas& aOverflowAreas) {
+#ifdef DEBUG
+  for (const auto otype : mozilla::AllOverflowTypes()) {
     NS_ASSERTION(aOverflowAreas.Overflow(otype).width >= 0,
-                 "illegal width for combined area");
+                 "Illegal width for an overflow area!");
     NS_ASSERTION(aOverflowAreas.Overflow(otype).height >= 0,
-                 "illegal height for combined area");
+                 "Illegal height for an overflow area!");
   }
+#endif
+
   nsRect bounds = GetPhysicalBounds();
   if (!aOverflowAreas.InkOverflow().IsEqualInterior(bounds) ||
       !aOverflowAreas.ScrollableOverflow().IsEqualEdges(bounds)) {
diff -Nru firefox-84.0.2+build1/layout/generic/nsLineBox.h firefox-85.0+build1/layout/generic/nsLineBox.h
--- firefox-84.0.2+build1/layout/generic/nsLineBox.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLineBox.h	2021-01-18 19:58:16.000000000 +0000
@@ -403,25 +403,27 @@
   // The ink overflow area should never be used for things that affect layout.
   // The scrollable overflow area are permitted to affect layout for handling of
   // overflow and scrollbars.
-  void SetOverflowAreas(const nsOverflowAreas& aOverflowAreas);
-  mozilla::LogicalRect GetOverflowArea(nsOverflowType aType,
+  void SetOverflowAreas(const mozilla::OverflowAreas& aOverflowAreas);
+  mozilla::LogicalRect GetOverflowArea(mozilla::OverflowType aType,
                                        mozilla::WritingMode aWM,
                                        const nsSize& aContainerSize) {
     return mozilla::LogicalRect(aWM, GetOverflowArea(aType), aContainerSize);
   }
-  nsRect GetOverflowArea(nsOverflowType aType) const {
+  nsRect GetOverflowArea(mozilla::OverflowType aType) const {
     return mData ? mData->mOverflowAreas.Overflow(aType) : GetPhysicalBounds();
   }
-  nsOverflowAreas GetOverflowAreas() const {
+  mozilla::OverflowAreas GetOverflowAreas() const {
     if (mData) {
       return mData->mOverflowAreas;
     }
     nsRect bounds = GetPhysicalBounds();
-    return nsOverflowAreas(bounds, bounds);
+    return mozilla::OverflowAreas(bounds, bounds);
+  }
+  nsRect InkOverflowRect() const {
+    return GetOverflowArea(mozilla::OverflowType::Ink);
   }
-  nsRect InkOverflowRect() const { return GetOverflowArea(eInkOverflow); }
   nsRect ScrollableOverflowRect() {
-    return GetOverflowArea(eScrollableOverflow);
+    return GetOverflowArea(mozilla::OverflowType::Scrollable);
   }
 
   void SlideBy(nscoord aDBCoord, const nsSize& aContainerSize) {
@@ -436,7 +438,7 @@
       nsPoint physicalDelta =
           mozilla::LogicalPoint(mWritingMode, 0, aDBCoord)
               .GetPhysicalPoint(mWritingMode, nullContainerSize);
-      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+      for (const auto otype : mozilla::AllOverflowTypes()) {
         mData->mOverflowAreas.Overflow(otype) += physicalDelta;
       }
     }
@@ -453,7 +455,7 @@
     // this has a physical-coordinate effect only in vertical-rl mode
     if (mWritingMode.IsVerticalRL() && mData) {
       nsPoint physicalDelta(-delta.width, 0);
-      NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
+      for (const auto otype : mozilla::AllOverflowTypes()) {
         mData->mOverflowAreas.Overflow(otype) += physicalDelta;
       }
     }
@@ -638,7 +640,7 @@
   struct ExtraData {
     explicit ExtraData(const nsRect& aBounds)
         : mOverflowAreas(aBounds, aBounds) {}
-    nsOverflowAreas mOverflowAreas;
+    mozilla::OverflowAreas mOverflowAreas;
   };
 
   struct ExtraBlockData : public ExtraData {
diff -Nru firefox-84.0.2+build1/layout/generic/nsLineLayout.cpp firefox-85.0+build1/layout/generic/nsLineLayout.cpp
--- firefox-84.0.2+build1/layout/generic/nsLineLayout.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLineLayout.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -153,13 +153,13 @@
                        "very large sizes, not attempts at intrinsic width "
                        "calculation");
 #ifdef DEBUG
-  if ((aISize != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(aISize) &&
-      !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) {
+  if ((aISize != NS_UNCONSTRAINEDSIZE) && ABSURD_SIZE(aISize) &&
+      !LineContainerFrame()->GetParent()->IsAbsurdSizeAssertSuppressed()) {
     mBlockReflowInput->mFrame->ListTag(stdout);
     printf(": Init: bad caller: width WAS %d(0x%x)\n", aISize, aISize);
   }
-  if ((aBSize != NS_UNCONSTRAINEDSIZE) && CRAZY_SIZE(aBSize) &&
-      !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) {
+  if ((aBSize != NS_UNCONSTRAINEDSIZE) && ABSURD_SIZE(aBSize) &&
+      !LineContainerFrame()->GetParent()->IsAbsurdSizeAssertSuppressed()) {
     mBlockReflowInput->mFrame->ListTag(stdout);
     printf(": Init: bad caller: height WAS %d(0x%x)\n", aBSize, aBSize);
   }
@@ -293,15 +293,15 @@
 #endif
 #ifdef DEBUG
   if ((availSpace.ISize(lineWM) != NS_UNCONSTRAINEDSIZE) &&
-      CRAZY_SIZE(availSpace.ISize(lineWM)) &&
-      !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) {
+      ABSURD_SIZE(availSpace.ISize(lineWM)) &&
+      !LineContainerFrame()->GetParent()->IsAbsurdSizeAssertSuppressed()) {
     mBlockReflowInput->mFrame->ListTag(stdout);
     printf(": UpdateBand: bad caller: ISize WAS %d(0x%x)\n",
            availSpace.ISize(lineWM), availSpace.ISize(lineWM));
   }
   if ((availSpace.BSize(lineWM) != NS_UNCONSTRAINEDSIZE) &&
-      CRAZY_SIZE(availSpace.BSize(lineWM)) &&
-      !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) {
+      ABSURD_SIZE(availSpace.BSize(lineWM)) &&
+      !LineContainerFrame()->GetParent()->IsAbsurdSizeAssertSuppressed()) {
     mBlockReflowInput->mFrame->ListTag(stdout);
     printf(": UpdateBand: bad caller: BSize WAS %d(0x%x)\n",
            availSpace.BSize(lineWM), availSpace.BSize(lineWM));
@@ -965,9 +965,9 @@
   // Note: break-before means ignore the reflow metrics since the
   // frame will be reflowed another time.
   if (!aReflowStatus.IsInlineBreakBefore()) {
-    if ((CRAZY_SIZE(reflowOutput.ISize(lineWM)) ||
-         CRAZY_SIZE(reflowOutput.BSize(lineWM))) &&
-        !LineContainerFrame()->GetParent()->IsCrazySizeAssertSuppressed()) {
+    if ((ABSURD_SIZE(reflowOutput.ISize(lineWM)) ||
+         ABSURD_SIZE(reflowOutput.BSize(lineWM))) &&
+        !LineContainerFrame()->GetParent()->IsAbsurdSizeAssertSuppressed()) {
       printf("nsLineLayout: ");
       aFrame->ListTag(stdout);
       printf(" metrics=%d,%d!\n", reflowOutput.Width(), reflowOutput.Height());
@@ -2368,7 +2368,7 @@
     // they might end up being aligned anywhere.  However, we'll guess
     // that they'll be placed aligned with the top or bottom of this
     // frame (as though this frame is the only thing in the line).
-    // (Guessing isn't crazy, since all we're doing is reducing the
+    // (Guessing isn't unreasonable, since all we're doing is reducing the
     // scope of a quirk and making the behavior more standards-like.)
     if (maxStartBoxBSize > maxBCoord - minBCoord) {
       // Distribute maxStartBoxBSize to ascent (baselineBCoord - minBCoord), and
@@ -3219,8 +3219,8 @@
 }
 
 // This method do relative positioning for ruby annotations.
-void nsLineLayout::RelativePositionAnnotations(
-    PerSpanData* aRubyPSD, nsOverflowAreas& aOverflowAreas) {
+void nsLineLayout::RelativePositionAnnotations(PerSpanData* aRubyPSD,
+                                               OverflowAreas& aOverflowAreas) {
   MOZ_ASSERT(aRubyPSD->mFrame->mFrame->IsRubyFrame());
   for (PerFrameData* pfd = aRubyPSD->mFirstFrame; pfd; pfd = pfd->mNext) {
     MOZ_ASSERT(pfd->mFrame->IsRubyBaseContainerFrame());
@@ -3229,7 +3229,7 @@
       nsIFrame* rtcFrame = rtc->mFrame;
       MOZ_ASSERT(rtcFrame->IsRubyTextContainerFrame());
       ApplyRelativePositioning(rtc);
-      nsOverflowAreas rtcOverflowAreas;
+      OverflowAreas rtcOverflowAreas;
       RelativePositionFrames(rtc->mSpan, rtcOverflowAreas);
       aOverflowAreas.UnionWith(rtcOverflowAreas + rtcFrame->GetPosition());
     }
@@ -3237,8 +3237,8 @@
 }
 
 void nsLineLayout::RelativePositionFrames(PerSpanData* psd,
-                                          nsOverflowAreas& aOverflowAreas) {
-  nsOverflowAreas overflowAreas;
+                                          OverflowAreas& aOverflowAreas) {
+  OverflowAreas overflowAreas;
   WritingMode wm = psd->mWritingMode;
   if (psd != mRootSpan) {
     // The span's overflow areas come in three parts:
@@ -3287,7 +3287,7 @@
     // system. We adjust the childs combined area into our coordinate
     // system before computing the aggregated value by adding in
     // <b>x</b> and <b>y</b> which were computed above.
-    nsOverflowAreas r;
+    OverflowAreas r;
     if (pfd->mSpan) {
       // Compute a new combined area for the child span before
       // aggregating it into our combined area.
diff -Nru firefox-84.0.2+build1/layout/generic/nsLineLayout.h firefox-85.0+build1/layout/generic/nsLineLayout.h
--- firefox-84.0.2+build1/layout/generic/nsLineLayout.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsLineLayout.h	2021-01-18 19:58:16.000000000 +0000
@@ -113,7 +113,7 @@
    * combined area (== overflow area) for the line, and handle view
    * sizing/positioning and the setting of the overflow rect.
    */
-  void RelativePositionFrames(nsOverflowAreas& aOverflowAreas) {
+  void RelativePositionFrames(mozilla::OverflowAreas& aOverflowAreas) {
     RelativePositionFrames(mRootSpan, aOverflowAreas);
   }
 
@@ -402,7 +402,7 @@
     // When setting frame coordinates, we have to convert to the frame's
     //  writing mode
     mozilla::LogicalRect mBounds;
-    nsOverflowAreas mOverflowAreas;
+    mozilla::OverflowAreas mOverflowAreas;
 
     // From reflow-state
     mozilla::LogicalMargin mMargin;         // in *line* writing mode
@@ -640,10 +640,10 @@
   void ApplyRelativePositioning(PerFrameData* aPFD);
 
   void RelativePositionAnnotations(PerSpanData* aRubyPSD,
-                                   nsOverflowAreas& aOverflowAreas);
+                                   mozilla::OverflowAreas& aOverflowAreas);
 
   void RelativePositionFrames(PerSpanData* psd,
-                              nsOverflowAreas& aOverflowAreas);
+                              mozilla::OverflowAreas& aOverflowAreas);
 
   bool TrimTrailingWhiteSpaceIn(PerSpanData* psd, nscoord* aDeltaISize);
 
diff -Nru firefox-84.0.2+build1/layout/generic/nsPageContentFrame.cpp firefox-85.0+build1/layout/generic/nsPageContentFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsPageContentFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPageContentFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -49,6 +49,13 @@
   nsSize maxSize(aReflowInput.ComputedWidth(), aReflowInput.ComputedHeight());
   SetSize(maxSize);
 
+  WritingMode wm = aReflowInput.GetWritingMode();
+  aReflowOutput.ISize(wm) = aReflowInput.ComputedISize();
+  if (aReflowInput.ComputedBSize() != NS_UNCONSTRAINEDSIZE) {
+    aReflowOutput.BSize(wm) = aReflowInput.ComputedBSize();
+  }
+  aReflowOutput.SetOverflowAreasToDesiredBounds();
+
   // A PageContentFrame must always have one child: the canvas frame.
   // Resize our frame allowing it only to be as big as we are
   // XXX Pay attention to the page's border and padding...
@@ -58,11 +65,8 @@
     LogicalSize logicalSize(wm, maxSize);
     ReflowInput kidReflowInput(aPresContext, aReflowInput, frame, logicalSize);
     kidReflowInput.SetComputedBSize(logicalSize.BSize(wm));
-
-    // Reflow the page content area
-    // XXXdholbert It's weird that we're passing down our own aReflowOutput
-    // outparam to be used for the child frame's reflow here. See bug 1655856.
-    ReflowChild(frame, aPresContext, aReflowOutput, kidReflowInput, 0, 0,
+    ReflowOutput kidReflowOutput(kidReflowInput);
+    ReflowChild(frame, aPresContext, kidReflowOutput, kidReflowInput, 0, 0,
                 ReflowChildFlags::Default, aStatus);
 
     // The document element's background should cover the entire canvas, so
@@ -81,8 +85,8 @@
     if (frame->HasOverflowAreas()) {
       // The background covers the content area and padding area, so check
       // for children sticking outside the child frame's padding edge
-      nscoord xmost = aReflowOutput.ScrollableOverflow().XMost();
-      if (xmost > aReflowOutput.Width()) {
+      nscoord xmost = kidReflowOutput.ScrollableOverflow().XMost();
+      if (xmost > kidReflowOutput.Width()) {
         nscoord widthToFit =
             xmost + padding.right +
             kidReflowInput.mStyleBorder->GetComputedBorderWidth(eSideRight);
@@ -95,8 +99,8 @@
       // so that we don't clip the page in either axis if the aspect ratio of
       // the PDF doesn't match the destination.
       if (nsContentUtils::IsPDFJS(PresContext()->Document()->GetPrincipal())) {
-        nscoord ymost = aReflowOutput.ScrollableOverflow().YMost();
-        if (ymost > aReflowOutput.Height()) {
+        nscoord ymost = kidReflowOutput.ScrollableOverflow().YMost();
+        if (ymost > kidReflowOutput.Height()) {
           nscoord heightToFit =
               ymost + padding.bottom +
               kidReflowInput.mStyleBorder->GetComputedBorderWidth(eSideBottom);
@@ -108,45 +112,42 @@
     }
 
     // Place and size the child
-    FinishReflowChild(frame, aPresContext, aReflowOutput, &kidReflowInput, 0, 0,
-                      ReflowChildFlags::Default);
+    FinishReflowChild(frame, aPresContext, kidReflowOutput, &kidReflowInput, 0,
+                      0, ReflowChildFlags::Default);
 
     NS_ASSERTION(aPresContext->IsDynamic() || !aStatus.IsFullyComplete() ||
                      !frame->GetNextInFlow(),
                  "bad child flow list");
+
+    aReflowOutput.mOverflowAreas.UnionWith(kidReflowOutput.mOverflowAreas);
   }
 
+  FinishAndStoreOverflow(&aReflowOutput);
+
   // Reflow our fixed frames
   nsReflowStatus fixedStatus;
   ReflowAbsoluteFrames(aPresContext, aReflowOutput, aReflowInput, fixedStatus);
   NS_ASSERTION(fixedStatus.IsComplete(),
                "fixed frames can be truncated, but not incomplete");
 
-  // Return our desired size
-  WritingMode wm = aReflowInput.GetWritingMode();
-  aReflowOutput.ISize(wm) = aReflowInput.ComputedISize();
-  if (aReflowInput.ComputedBSize() != NS_UNCONSTRAINEDSIZE) {
-    aReflowOutput.BSize(wm) = aReflowInput.ComputedBSize();
-  }
-  FinishAndStoreOverflow(&aReflowOutput);
-
   if (StaticPrefs::layout_display_list_improve_fragmentation() &&
       mFrames.NotEmpty()) {
     auto* previous = static_cast<nsPageContentFrame*>(GetPrevContinuation());
     const nscoord previousPageOverflow =
         previous ? previous->mRemainingOverflow : 0;
-
-    const nscoord overflowHeight = InkOverflowRect().YMost();
-    const nscoord pageHeight = GetRect().Height();
-    const nscoord currentPageOverflow = overflowHeight - pageHeight;
-
+    const nsSize containerSize(aReflowInput.AvailableWidth(),
+                               aReflowInput.AvailableHeight());
+    const nscoord pageBSize = GetLogicalRect(containerSize).BSize(wm);
+    const nscoord overflowBSize =
+        LogicalRect(wm, ScrollableOverflowRect(), GetSize()).BEnd(wm);
+    const nscoord currentPageOverflow = overflowBSize - pageBSize;
     nscoord remainingOverflow =
-        std::max(currentPageOverflow, previousPageOverflow - pageHeight);
+        std::max(currentPageOverflow, previousPageOverflow - pageBSize);
+
     if (aStatus.IsFullyComplete() && remainingOverflow > 0) {
-      // If we have InkOverflow off the end of our page, then we report
+      // If we have ScrollableOverflow off the end of our page, then we report
       // ourselves as overflow-incomplete in order to produce an additional
-      // content-less page, which we expect to draw our InkOverflow on our
-      // behalf.
+      // content-less page, which we expect to draw our overflow on our behalf.
       aStatus.SetOverflowIncomplete();
     }
 
diff -Nru firefox-84.0.2+build1/layout/generic/nsPageFrame.cpp firefox-85.0+build1/layout/generic/nsPageFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsPageFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPageFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -551,12 +551,13 @@
 
   nsPageContentFrame* pageCF = aPage;
   // The collective height of all prev-continuations we've traversed so far:
-  nscoord offsetToCurrentPageTop = 0;
+  nscoord offsetToCurrentPageBStart = 0;
+  const auto wm = pageCF->GetWritingMode();
   while ((pageCF = GetPreviousPageContentFrame(pageCF))) {
-    offsetToCurrentPageTop += pageCF->GetSize().Height();
+    offsetToCurrentPageBStart += pageCF->BSize(wm);
 
     if (pageCF->HasOverflowAreas()) {
-      pages.EmplaceBack(pageCF, offsetToCurrentPageTop);
+      pages.EmplaceBack(pageCF, offsetToCurrentPageBStart);
     }
   }
 
@@ -570,28 +571,34 @@
   const auto previousPagesAndOffsets =
       GetPreviousPagesWithOverflow(aCurrentPageCF);
 
+  const auto wm = aCurrentPageCF->GetWritingMode();
   for (const PageAndOffset& pair : Reversed(previousPagesAndOffsets)) {
     auto* prevPageCF = pair.first;
-    const nscoord offsetToCurrentPageTop = pair.second;
-    const auto inkOverflow = prevPageCF->InkOverflowRectRelativeToSelf();
-    const auto remainingOverflow = inkOverflow.YMost() - offsetToCurrentPageTop;
-
+    const nscoord offsetToCurrentPageBStart = pair.second;
+    // Only scrollable overflow create new pages, not ink overflow.
+    const LogicalRect scrollableOverflow(
+        wm, prevPageCF->ScrollableOverflowRectRelativeToSelf(),
+        prevPageCF->GetSize());
+    const auto remainingOverflow =
+        scrollableOverflow.BEnd(wm) - offsetToCurrentPageBStart;
     if (remainingOverflow <= 0) {
       continue;
     }
 
     // This rect represents the piece of prevPageCF's overflow that ends up on
     // the current pageContentFrame (in prevPageCF's coordinate system).
-    nsRect overflowRect = inkOverflow;
-    overflowRect.y = offsetToCurrentPageTop;
-    overflowRect.height =
-        std::min(remainingOverflow, prevPageCF->GetSize().Height());
+    // Note that we use InkOverflow here since this is for painting.
+    LogicalRect overflowRect(wm, prevPageCF->InkOverflowRectRelativeToSelf(),
+                             prevPageCF->GetSize());
+    overflowRect.BStart(wm) = offsetToCurrentPageBStart;
+    overflowRect.BSize(wm) = std::min(remainingOverflow, prevPageCF->BSize(wm));
 
     {
       // Convert the overflowRect to the coordinate system of aPageFrame, and
       // set it as the visible rect for display list building.
       const nsRect visibleRect =
-          overflowRect + prevPageCF->GetOffsetTo(aPageFrame);
+          overflowRect.GetPhysicalRect(wm, aPageFrame->GetSize()) +
+          prevPageCF->GetOffsetTo(aPageFrame);
       nsDisplayListBuilder::AutoBuildingDisplayList buildingForChild(
           aBuilder, aPageFrame, visibleRect, visibleRect);
 
@@ -599,12 +606,14 @@
       // frame tree, building a display list for the previous page yields
       // display items that are outside of the current page bounds.
       // To fix that, an additional reference frame offset is added, which
-      // shifts the display items down as if the current and previous page were
-      // one long page in the same coordinate system.
-      const nsPoint pageOffset = aCurrentPageCF->GetOffsetTo(prevPageCF);
-      const nsPoint additionalOffset(pageOffset.X(),
-                                     pageOffset.Y() - offsetToCurrentPageTop);
-      buildingForChild.SetAdditionalOffset(additionalOffset);
+      // shifts the display items down (block axis) as if the current and
+      // previous page were one long page in the same coordinate system.
+      const nsSize containerSize = aPageFrame->GetSize();
+      LogicalPoint pageOffset(wm, aCurrentPageCF->GetOffsetTo(prevPageCF),
+                              containerSize);
+      pageOffset.B(wm) -= offsetToCurrentPageBStart;
+      buildingForChild.SetAdditionalOffset(
+          pageOffset.GetPhysicalPoint(wm, containerSize));
 
       aPageFrame->BuildDisplayListForChild(aBuilder, prevPageCF, aLists);
     }
@@ -660,9 +669,10 @@
       BuildPreviousPageOverflow(aBuilder, this, currentPageCF, set);
     }
 
-    // Set the visible rect to ink overflow rect of the child nsPageContentFrame
-    // in parent nsPageFrame coordinate space.
-    const nsRect childOverflowRect = child->InkOverflowRectRelativeToSelf();
+    // Set the visible rect to scrollable overflow rect of the child
+    // nsPageContentFrame in parent nsPageFrame coordinate space.
+    const nsRect childOverflowRect =
+        child->ScrollableOverflowRectRelativeToSelf();
     const nsRect visibleRect = childOverflowRect + child->GetOffsetTo(this);
 
     nsDisplayListBuilder::AutoBuildingDisplayList buildingForChild(
diff -Nru firefox-84.0.2+build1/layout/generic/nsPageSequenceFrame.cpp firefox-85.0+build1/layout/generic/nsPageSequenceFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsPageSequenceFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPageSequenceFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -49,12 +49,12 @@
 NS_IMPL_FRAMEARENA_HELPERS(nsPageSequenceFrame)
 
 static const nsPagesPerSheetInfo kSupportedPagesPerSheet[] = {
-    {1, 1, 1},  // Note: we default to this if no match is found.
+    {1, 1},  // Note: we default to this if no match is found.
     // {2, ... }, // XXXdholbert Coming in bug 1669905.
-    {4, 2, 2},
+    {4, 2},
     // {6, ... }, // XXXdholbert Coming in bug 1669905.
-    {9, 3, 3},
-    {16, 4, 4},
+    {9, 3},
+    {16, 4},
 };
 
 inline void SanityCheckPagesPerSheetInfo() {
@@ -68,16 +68,12 @@
   uint16_t prevInfoPPS = 0;
   for (const auto& info : kSupportedPagesPerSheet) {
     MOZ_ASSERT(info.mNumPages > prevInfoPPS,
-               "page count field should be nonzero & monotonically increase");
-    // The uint32_t cast here is to ensure this assertion is robust even if the
-    // mNumRows * mNumCols multiplication would overflow past the maximum
-    // representable uint16_t value. That overflow would be bad because it
-    // could result in us incorrectly passing this assertion.  We prevent this
-    // problem by doing the operation in 32-bit number space; that way, the
-    // multiplication (of two known-to-be-16-bit values) can't overflow.
-    MOZ_ASSERT(
-        (uint32_t)info.mNumRows * (uint32_t)info.mNumCols == info.mNumPages,
-        "page count should match rows*cols");
+               "page count field should be positive & monotonically increase");
+    MOZ_ASSERT(info.mLargerNumTracks > 0,
+               "page grid has to have a positive number of tracks");
+    MOZ_ASSERT(info.mNumPages % info.mLargerNumTracks == 0,
+               "page count field should be evenly divisible by "
+               "the given track-count");
     prevInfoPPS = info.mNumPages;
   }
 #endif
@@ -232,6 +228,16 @@
   return NSToCoordRound(scaledExtraSpace * 0.5 / scale);
 }
 
+uint32_t nsPageSequenceFrame::GetPagesInFirstSheet() const {
+  nsIFrame* firstSheet = mFrames.FirstChild();
+  if (!firstSheet) {
+    return 0;
+  }
+
+  MOZ_DIAGNOSTIC_ASSERT(firstSheet->IsPrintedSheetFrame());
+  return static_cast<PrintedSheetFrame*>(firstSheet)->GetNumPages();
+}
+
 /*
  * Note: we largely position/size out our children (page frames) using
  * \*physical\* x/y/width/height values, because the print preview UI is always
diff -Nru firefox-84.0.2+build1/layout/generic/nsPageSequenceFrame.h firefox-85.0+build1/layout/generic/nsPageSequenceFrame.h
--- firefox-84.0.2+build1/layout/generic/nsPageSequenceFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPageSequenceFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -6,8 +6,6 @@
 #ifndef nsPageSequenceFrame_h___
 #define nsPageSequenceFrame_h___
 
-#include <tuple>
-
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 #include "nsContainerFrame.h"
@@ -31,18 +29,11 @@
   static const nsPagesPerSheetInfo& LookupInfo(int32_t aPPS);
 
   uint16_t mNumPages;
-  uint16_t mNumRows;
-  uint16_t mNumCols;
 
-  std::tuple<uint16_t, uint16_t> GetRowAndColFromIdx(
-      uint16_t aIdxOnSheet) const {
-    // Compute the row index by *dividing* the item's ordinal position by how
-    // many items fit in each row (i.e. the number of columns), and flooring.
-    // Compute the column index by getting the remainder of that division:
-    // Notably, mNumRows is irrelevant to this computation; that's because
-    // we're adding new items column-by-column rather than row-by-row.
-    return {aIdxOnSheet / mNumCols, aIdxOnSheet % mNumCols};
-  }
+  // This is the larger of the row-count vs. column-count for this layout
+  // (if they aren't the same). We'll aim to stack this number of pages
+  // in the sheet's longer axis.
+  uint16_t mLargerNumTracks;
 };
 
 /**
@@ -80,6 +71,23 @@
   // frames that overflowed.  It's 1.0 if none overflowed horizontally.
   float mShrinkToFitRatio = 1.0f;
 
+  // The mPagesPerSheet{...} members are only used if
+  // PagesPerSheetInfo()->mNumPages > 1.  They're initialized with reasonable
+  // defaults here (which correspond to what we do for the regular
+  // 1-page-per-sheet scenario, though we don't actually use these members in
+  // that case).  If we're in >1 pages-per-sheet scenario, then these members
+  // will be assigned "real" values during the reflow of the first
+  // PrintedSheetFrame.
+  float mPagesPerSheetScale = 1.0f;
+  // Number of "columns" in our pages-per-sheet layout. For example: if we're
+  // printing with 6 pages-per-sheet (once we've fixed Bug 1669905), then this
+  // could be either 3 or 2, depending on whether we're printing
+  // portrait-oriented pages onto a landscape-oriented sheet (3 cols) vs. if
+  // we're printing landscape-oriented pages onto a portrait-oriented sheet (2
+  // cols).
+  uint32_t mPagesPerSheetNumCols = 1;
+  nsPoint mPagesPerSheetGridOrigin;
+
   // Lazy getter, to look up our pages-per-sheet info based on mPrintSettings
   // (if it's available).  The result is stored in our mPagesPerSheetInfo
   // member-var to speed up subsequent lookups.
@@ -133,6 +141,8 @@
 
   int32_t GetRawNumPages() const { return mPageData->mRawNumPages; }
 
+  uint32_t GetPagesInFirstSheet() const;
+
   nsresult DoPageEnd();
 
   // We must allow Print Preview UI to have a background, no matter what the
diff -Nru firefox-84.0.2+build1/layout/generic/nsPluginFrame.cpp firefox-85.0+build1/layout/generic/nsPluginFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsPluginFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPluginFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1476,14 +1476,12 @@
   mInstanceOwner->ConsiderNewEventloopNestingLevel();
 
   if (anEvent->mMessage == ePluginActivate) {
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
       RefPtr<dom::Element> elem = GetContent()->AsElement();
       return fm->SetFocus(elem, 0);
     }
   } else if (anEvent->mMessage == ePluginFocus) {
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
       RefPtr<dom::Element> elem = GetContent()->AsElement();
       return fm->FocusPlugin(elem);
     }
diff -Nru firefox-84.0.2+build1/layout/generic/nsPluginFrame.h firefox-85.0+build1/layout/generic/nsPluginFrame.h
--- firefox-84.0.2+build1/layout/generic/nsPluginFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsPluginFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -85,9 +85,9 @@
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
-  virtual nsresult HandleEvent(nsPresContext* aPresContext,
-                               mozilla::WidgetGUIEvent* aEvent,
-                               nsEventStatus* aEventStatus) override;
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY virtual nsresult HandleEvent(
+      nsPresContext* aPresContext, mozilla::WidgetGUIEvent* aEvent,
+      nsEventStatus* aEventStatus) override;
 
   virtual bool IsFrameOfType(uint32_t aFlags) const override {
     return nsIFrame::IsFrameOfType(
diff -Nru firefox-84.0.2+build1/layout/generic/nsRubyFrame.cpp firefox-85.0+build1/layout/generic/nsRubyFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsRubyFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsRubyFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -183,8 +183,7 @@
   WritingMode lineWM = aReflowInput.mLineLayout->GetWritingMode();
   LogicalSize availSize(lineWM, aReflowInput.AvailableISize(),
                         aReflowInput.AvailableBSize());
-  WritingMode rubyWM = GetWritingMode();
-  NS_ASSERTION(!rubyWM.IsOrthogonalTo(lineWM),
+  NS_ASSERTION(!GetWritingMode().IsOrthogonalTo(lineWM),
                "Ruby frame writing-mode shouldn't be orthogonal to its line");
 
   AutoRubyTextContainerArray textContainers(aBaseContainer);
@@ -297,9 +296,7 @@
     // handled when reflowing the base containers.
     NS_ASSERTION(textReflowStatus.IsEmpty(),
                  "Ruby text container must not break itself inside");
-    // The metrics is initialized with reflow input of this ruby frame,
-    // hence the writing-mode is tied to rubyWM instead of rtcWM.
-    LogicalSize size = textMetrics.Size(rubyWM).ConvertTo(lineWM, rubyWM);
+    const LogicalSize size = textMetrics.Size(lineWM);
     textContainer->SetSize(lineWM, size);
 
     nscoord reservedISize = RubyUtils::GetReservedISize(textContainer);
diff -Nru firefox-84.0.2+build1/layout/generic/nsSplittableFrame.cpp firefox-85.0+build1/layout/generic/nsSplittableFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsSplittableFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsSplittableFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -186,14 +186,15 @@
 
 NS_DECLARE_FRAME_PROPERTY_SMALL_VALUE(ConsumedBSizeProperty, nscoord);
 
-nscoord nsSplittableFrame::CalcAndCacheConsumedBSize(WritingMode aWM) {
+nscoord nsSplittableFrame::CalcAndCacheConsumedBSize() {
   nsIFrame* prev = GetPrevContinuation();
   if (!prev) {
     return 0;
   }
+  const auto wm = GetWritingMode();
   nscoord bSize = 0;
   for (; prev; prev = prev->GetPrevContinuation()) {
-    bSize += prev->ContentSize(aWM).BSize(aWM);
+    bSize += prev->ContentSize(wm).BSize(wm);
     bool found = false;
     nscoord consumed = prev->GetProperty(ConsumedBSizeProperty(), &found);
     if (found) {
@@ -233,10 +234,10 @@
   return std::max(0, bSize);
 }
 
-nsIFrame::LogicalSides nsSplittableFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>& aDuringReflow) const {
+LogicalSides nsSplittableFrame::GetBlockLevelLogicalSkipSides(
+    bool aAfterReflow) const {
   LogicalSides skip(mWritingMode);
-  if (IsTrueOverflowContainer()) {
+  if (MOZ_UNLIKELY(IsTrueOverflowContainer())) {
     skip |= eLogicalSideBitsBBoth;
     return skip;
   }
@@ -250,49 +251,18 @@
     skip |= eLogicalSideBitsBStart;
   }
 
-  if (aDuringReflow) {
-    nscoord availBSize = aDuringReflow->mReflowInput.AvailableBSize();
-    // We're in the midst of reflow right now, so it's possible that we haven't
-    // created a next-in-flow yet. If our content block-size is going to exceed
-    // our available block-size, though, then we're going to need a
-    // next-in-flow, it just hasn't been created yet.
-    if (NS_UNCONSTRAINEDSIZE != availBSize) {
-      nscoord effectiveBSize = GetEffectiveComputedBSize(
-          aDuringReflow->mReflowInput, aDuringReflow->mConsumedBSize);
-      if (effectiveBSize != NS_UNCONSTRAINEDSIZE &&
-          effectiveBSize > availBSize) {
-        // Our computed block-size is going to exceed our available block-size,
-        // so we're going to need a next-in-flow.
-        skip |= eLogicalSideBitsBEnd;
-      }
-    }
-  } else {
-    nsIFrame* nif = GetNextContinuation();
-    if (nif && !nif->IsTrueOverflowContainer()) {
-      skip |= eLogicalSideBitsBEnd;
-    }
-  }
-
   // Always skip block-end side if we have a *later* sibling across column-span
   // split.
   if (HasColumnSpanSiblings()) {
     skip |= eLogicalSideBitsBEnd;
   }
 
-  return skip;
-}
-
-LogicalSides nsSplittableFrame::PreReflowBlockLevelLogicalSkipSides() const {
-  LogicalSides skip(mWritingMode);
-  if (MOZ_UNLIKELY(IsTrueOverflowContainer())) {
-    skip |= mozilla::eLogicalSideBitsBBoth;
-    return skip;
-  }
-  if (MOZ_LIKELY(StyleBorder()->mBoxDecorationBreak !=
-                 StyleBoxDecorationBreak::Clone) &&
-      GetPrevInFlow()) {
-    skip |= mozilla::eLogicalSideBitsBStart;
-    return skip;
+  if (aAfterReflow) {
+    nsIFrame* nif = GetNextContinuation();
+    if (nif && !nif->IsTrueOverflowContainer()) {
+      skip |= eLogicalSideBitsBEnd;
+    }
   }
+
   return skip;
 }
diff -Nru firefox-84.0.2+build1/layout/generic/nsSplittableFrame.h firefox-85.0+build1/layout/generic/nsSplittableFrame.h
--- firefox-84.0.2+build1/layout/generic/nsSplittableFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsSplittableFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -93,36 +93,39 @@
    *
    * This guarantees that the internal cache works, by refreshing it. Calling it
    * multiple times in the same reflow is wasteful, but not an error.
-   *
-   * @param aWM a writing-mode to determine the block-axis
    */
-  nscoord CalcAndCacheConsumedBSize(mozilla::WritingMode aWM);
+  nscoord CalcAndCacheConsumedBSize();
 
   /**
    * Retrieve the effective computed block size of this frame, which is the
    * computed block size, minus the block size consumed by any previous
    * continuations.
    */
-  nscoord GetEffectiveComputedBSize(
-      const ReflowInput& aReflowInput, nscoord aConsumed) const;
+  nscoord GetEffectiveComputedBSize(const ReflowInput& aReflowInput,
+                                    nscoord aConsumed) const;
 
   /**
    * @see nsIFrame::GetLogicalSkipSides()
    */
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>& = Nothing()) const override;
+  LogicalSides GetLogicalSkipSides() const override {
+    return GetBlockLevelLogicalSkipSides(true);
+  }
+
+  LogicalSides GetBlockLevelLogicalSkipSides(bool aAfterReflow) const;
 
   /**
-   * A faster version of GetLogicalSkipSides() that is intended to be used
-   * inside Reflow before it's known if |this| frame will be COMPLETE or not.
+   * A version of GetLogicalSkipSides() that is intended to be used inside
+   * Reflow before it's known if |this| frame will be COMPLETE or not.
    * It returns a result that assumes this fragment is the last and thus
    * should apply the block-end border/padding etc (except for "true" overflow
    * containers which always skip block sides).  You're then expected to
    * recalculate the block-end side (as needed) when you know |this| frame's
    * reflow status is INCOMPLETE.
-   * This method is intended for frames that breaks in the block axis.
+   * This method is intended for frames that break in the block axis.
    */
-  LogicalSides PreReflowBlockLevelLogicalSkipSides() const;
+  LogicalSides PreReflowBlockLevelLogicalSkipSides() const {
+    return GetBlockLevelLogicalSkipSides(false);
+  };
 
   nsIFrame* mPrevContinuation;
   nsIFrame* mNextContinuation;
diff -Nru firefox-84.0.2+build1/layout/generic/nsSubDocumentFrame.cpp firefox-85.0+build1/layout/generic/nsSubDocumentFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsSubDocumentFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsSubDocumentFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -45,6 +45,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsQueryObject.h"
 #include "RetainedDisplayListBuilder.h"
+#include "nsObjectLoadingContent.h"
 
 #include "Layers.h"
 #include "BasicLayers.h"
@@ -585,7 +586,10 @@
   nscoord result;
   DISPLAY_MIN_INLINE_SIZE(this, result);
 
-  if (mSubdocumentIntrinsicSize) {
+  nsCOMPtr<nsIObjectLoadingContent> iolc = do_QueryInterface(mContent);
+  auto olc = static_cast<nsObjectLoadingContent*>(iolc.get());
+
+  if (olc && olc->GetSubdocumentIntrinsicSize()) {
     // The subdocument is an SVG document, so technically we should call
     // SVGOuterSVGFrame::GetMinISize() on its root frame.  That method always
     // returns 0, though, so we can just do that & don't need to bother with
@@ -621,9 +625,13 @@
     return IntrinsicSize(0, 0);
   }
 
-  if (mSubdocumentIntrinsicSize) {
-    // Use the intrinsic size from the child SVG document, if available.
-    return *mSubdocumentIntrinsicSize;
+  if (nsCOMPtr<nsIObjectLoadingContent> iolc = do_QueryInterface(mContent)) {
+    auto olc = static_cast<nsObjectLoadingContent*>(iolc.get());
+
+    if (auto size = olc->GetSubdocumentIntrinsicSize()) {
+      // Use the intrinsic size from the child SVG document, if available.
+      return *size;
+    }
   }
 
   if (!IsInline()) {
@@ -643,9 +651,15 @@
   // FIXME(emilio): This should probably respect contain: size and return no
   // ratio in the case subDocRoot is non-null. Otherwise we do it by virtue of
   // using a zero-size below and reusing GetIntrinsicSize().
-  if (mSubdocumentIntrinsicRatio && *mSubdocumentIntrinsicRatio) {
-    // Use the intrinsic aspect ratio from the child SVG document, if available.
-    return *mSubdocumentIntrinsicRatio;
+  if (nsCOMPtr<nsIObjectLoadingContent> iolc = do_QueryInterface(mContent)) {
+    auto olc = static_cast<nsObjectLoadingContent*>(iolc.get());
+
+    auto ratio = olc->GetSubdocumentIntrinsicRatio();
+    if (ratio && *ratio) {
+      // Use the intrinsic aspect ratio from the child SVG document, if
+      // available.
+      return *ratio;
+    }
   }
 
   // NOTE(emilio): Even though we have an intrinsic size, we may not have an
@@ -1156,16 +1170,7 @@
   return mInnerView->GetPosition();
 }
 
-void nsSubDocumentFrame::SubdocumentIntrinsicSizeOrRatioChanged(
-    const Maybe<IntrinsicSize>& aIntrinsicSize,
-    const Maybe<AspectRatio>& aIntrinsicRatio) {
-  if (mSubdocumentIntrinsicSize == aIntrinsicSize &&
-      mSubdocumentIntrinsicRatio == aIntrinsicRatio) {
-    return;
-  }
-  mSubdocumentIntrinsicSize = aIntrinsicSize;
-  mSubdocumentIntrinsicRatio = aIntrinsicRatio;
-
+void nsSubDocumentFrame::SubdocumentIntrinsicSizeOrRatioChanged() {
   if (MOZ_UNLIKELY(HasAllStateBits(NS_FRAME_IS_DIRTY))) {
     // We will be reflowed soon anyway.
     return;
diff -Nru firefox-84.0.2+build1/layout/generic/nsSubDocumentFrame.h firefox-85.0+build1/layout/generic/nsSubDocumentFrame.h
--- firefox-84.0.2+build1/layout/generic/nsSubDocumentFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsSubDocumentFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,10 +7,8 @@
 #ifndef NSSUBDOCUMENTFRAME_H_
 #define NSSUBDOCUMENTFRAME_H_
 
-#include "Layers.h"
 #include "LayerState.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/layers/WebRenderScrollData.h"
 #include "nsDisplayList.h"
 #include "nsAtomicContainerFrame.h"
 #include "nsIReflowCallback.h"
@@ -21,6 +19,14 @@
 class PresShell;
 }  // namespace mozilla
 
+namespace mozilla::layers {
+class Layer;
+class RefLayer;
+class RenderRootStateManager;
+class WebRenderLayerScrollData;
+class WebRenderScrollData;
+}  // namespace mozilla::layers
+
 /******************************************************************************
  * nsSubDocumentFrame
  *****************************************************************************/
@@ -129,9 +135,7 @@
 
   void ClearDisplayItems();
 
-  void SubdocumentIntrinsicSizeOrRatioChanged(
-      const mozilla::Maybe<mozilla::IntrinsicSize>& aIntrinsicSize,
-      const mozilla::Maybe<mozilla::AspectRatio>& aIntrinsicRatio);
+  void SubdocumentIntrinsicSizeOrRatioChanged();
 
  protected:
   friend class AsyncFrameInit;
@@ -165,12 +169,6 @@
   nsView* mOuterView;
   nsView* mInnerView;
 
-  // The intrinsic size and aspect ratio from a child SVG document that
-  // we should use.  These are only set when we are an <object> or <embed>
-  // and the inner document is SVG.
-  mozilla::Maybe<mozilla::IntrinsicSize> mSubdocumentIntrinsicSize;
-  mozilla::Maybe<mozilla::AspectRatio> mSubdocumentIntrinsicRatio;
-
   bool mIsInline;
   bool mPostedReflowCallback;
   bool mDidCreateDoc;
diff -Nru firefox-84.0.2+build1/layout/generic/nsTextFrame.cpp firefox-85.0+build1/layout/generic/nsTextFrame.cpp
--- firefox-84.0.2+build1/layout/generic/nsTextFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsTextFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -782,15 +782,18 @@
   }
 }
 
+constexpr char16_t kOghamSpaceMark = 0x1680;
+
 // Check whether the string aChars/aLength starts with space that's
 // trimmable according to CSS 'white-space:normal/nowrap'.
 static bool IsTrimmableSpace(const char16_t* aChars, uint32_t aLength) {
   NS_ASSERTION(aLength > 0, "No text for IsSpace!");
 
   char16_t ch = *aChars;
-  if (ch == ' ')
+  if (ch == ' ' || ch == kOghamSpaceMark) {
     return !nsTextFrameUtils::IsSpaceCombiningSequenceTail(aChars + 1,
                                                            aLength - 1);
+  }
   return ch == '\t' || ch == '\f' || ch == '\n' || ch == '\r';
 }
 
@@ -807,6 +810,7 @@
 
   switch (aFrag->CharAt(aPos)) {
     case ' ':
+    case kOghamSpaceMark:
       return (!aStyleText->WhiteSpaceIsSignificant() || aAllowHangingWS) &&
              !IsSpaceCombiningSequenceTail(aFrag, aPos + 1);
     case '\n':
@@ -7184,7 +7188,7 @@
 nsRect nsTextFrame::WebRenderBounds() {
   nsRect* cachedBounds = GetProperty(WebRenderTextBounds());
   if (!cachedBounds) {
-    nsOverflowAreas overflowAreas;
+    OverflowAreas overflowAreas;
     ComputeCustomOverflowInternal(overflowAreas, false);
     cachedBounds = new nsRect();
     *cachedBounds = overflowAreas.InkOverflow();
@@ -8413,8 +8417,8 @@
       aData->mAtStartOfLine = false;
 
       if (collapseWhitespace || whitespaceCanHang) {
-        uint32_t trimStart =
-            GetEndOfTrimmedText(frag, textStyle, wordStart, i, &iter, whitespaceCanHang);
+        uint32_t trimStart = GetEndOfTrimmedText(frag, textStyle, wordStart, i,
+                                                 &iter, whitespaceCanHang);
         if (trimStart == start) {
           // This is *all* trimmable whitespace, so whatever trailingWhitespace
           // we saw previously is still trailing...
@@ -9697,12 +9701,12 @@
   return result;
 }
 
-nsOverflowAreas nsTextFrame::RecomputeOverflow(nsIFrame* aBlockFrame,
-                                               bool aIncludeShadows) {
+OverflowAreas nsTextFrame::RecomputeOverflow(nsIFrame* aBlockFrame,
+                                             bool aIncludeShadows) {
   RemoveProperty(WebRenderTextBounds());
 
   nsRect bounds(nsPoint(0, 0), GetSize());
-  nsOverflowAreas result(bounds, bounds);
+  OverflowAreas result(bounds, bounds);
 
   gfxSkipCharsIterator iter = EnsureTextRun(nsTextFrame::eInflated);
   if (!mTextRun) return result;
@@ -10150,11 +10154,11 @@
   return skippedOffset != skippedOffsetEnd;
 }
 
-bool nsTextFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool nsTextFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   return ComputeCustomOverflowInternal(aOverflowAreas, true);
 }
 
-bool nsTextFrame::ComputeCustomOverflowInternal(nsOverflowAreas& aOverflowAreas,
+bool nsTextFrame::ComputeCustomOverflowInternal(OverflowAreas& aOverflowAreas,
                                                 bool aIncludeShadows) {
   if (HasAnyStateBits(NS_FRAME_FIRST_REFLOW)) {
     return true;
diff -Nru firefox-84.0.2+build1/layout/generic/nsTextFrame.h firefox-85.0+build1/layout/generic/nsTextFrame.h
--- firefox-84.0.2+build1/layout/generic/nsTextFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsTextFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -428,8 +428,8 @@
       TrailingWhitespace aTrimTrailingWhitespace =
           TrailingWhitespace::Trim) final;
 
-  nsOverflowAreas RecomputeOverflow(nsIFrame* aBlockFrame,
-                                    bool aIncludeShadows = true);
+  mozilla::OverflowAreas RecomputeOverflow(nsIFrame* aBlockFrame,
+                                           bool aIncludeShadows = true);
 
   enum TextRunType : uint8_t {
     // Anything in reflow (but not intrinsic width calculation) or
@@ -751,8 +751,8 @@
 
   bool IsInitialLetterChild() const;
 
-  bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) final;
-  bool ComputeCustomOverflowInternal(nsOverflowAreas& aOverflowAreas,
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) final;
+  bool ComputeCustomOverflowInternal(mozilla::OverflowAreas& aOverflowAreas,
                                      bool aIncludeShadows);
 
   void AssignJustificationGaps(const mozilla::JustificationAssignment& aAssign);
diff -Nru firefox-84.0.2+build1/layout/generic/nsTextRunTransformations.cpp firefox-85.0+build1/layout/generic/nsTextRunTransformations.cpp
--- firefox-84.0.2+build1/layout/generic/nsTextRunTransformations.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/nsTextRunTransformations.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -123,6 +123,7 @@
 void MergeCharactersInTextRun(gfxTextRun* aDest, gfxTextRun* aSrc,
                               const bool* aCharsToMerge,
                               const bool* aDeletedChars) {
+  MOZ_ASSERT(!aDest->TrailingGlyphRun(), "unexpected glyphRuns in aDest!");
   gfxTextRun::GlyphRunIterator iter(aSrc, gfxTextRun::Range(aSrc));
   uint32_t offset = 0;
   AutoTArray<gfxTextRun::DetailedGlyph, 2> glyphs;
diff -Nru firefox-84.0.2+build1/layout/generic/PrintedSheetFrame.cpp firefox-85.0+build1/layout/generic/PrintedSheetFrame.cpp
--- firefox-84.0.2+build1/layout/generic/PrintedSheetFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/PrintedSheetFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -8,6 +8,8 @@
 
 #include "mozilla/PrintedSheetFrame.h"
 
+#include <tuple>
+
 #include "mozilla/StaticPrefs_print.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsPageFrame.h"
@@ -29,30 +31,38 @@
 
 NS_IMPL_FRAMEARENA_HELPERS(PrintedSheetFrame)
 
+std::tuple<uint32_t, uint32_t> GetRowAndColFromIdx(uint32_t aIdxOnSheet,
+                                                   uint32_t aNumCols) {
+  // Compute the row index by *dividing* the item's ordinal position by how
+  // many items fit in each row (i.e. the number of columns), and flooring.
+  // Compute the column index by getting the remainder of that division:
+  // Notably, mNumRows is irrelevant to this computation; that's because
+  // we're adding new items column-by-column rather than row-by-row.
+  return {aIdxOnSheet / aNumCols, aIdxOnSheet % aNumCols};
+}
+
 // Helper for BuildDisplayList:
 gfx::Matrix4x4 ComputePagesPerSheetTransform(nsIFrame* aFrame,
                                              float aAppUnitsPerPixel) {
   MOZ_ASSERT(aFrame->IsPageFrame());
   auto* pageFrame = static_cast<nsPageFrame*>(aFrame);
 
-  // Variables that we use in our transform (initialized with sane defaults):
+  // Variables that we use in our transform (initialized with reasonable
+  // defaults that work for the regular one-page-per-sheet scenario):
   float scale = 1.0f;
+  nsPoint gridOrigin;
   uint32_t rowIdx = 0;
   uint32_t colIdx = 0;
 
   nsSharedPageData* pd = pageFrame->GetSharedPageData();
   if (pd) {
     const auto* ppsInfo = pd->PagesPerSheetInfo();
-
-    // XXXdholbert For now, we just scale down evenly based on the number of
-    // columns (which is the same as the number of rows, for all the values we
-    // currently support). When we support possibly-rotated pages-per-sheet
-    // values (2 & 6), we'll need a more subtle scale factor here, based on the
-    // page's aspect ratio as well as the ppsInfo. (See bug 1669905.)
-    scale = 1.0f / static_cast<float>(ppsInfo->mNumCols);
-
-    std::tie(rowIdx, colIdx) =
-        ppsInfo->GetRowAndColFromIdx(pageFrame->IndexOnSheet());
+    if (ppsInfo->mNumPages > 1) {
+      scale = pd->mPagesPerSheetScale;
+      gridOrigin = pd->mPagesPerSheetGridOrigin;
+      std::tie(rowIdx, colIdx) = GetRowAndColFromIdx(pageFrame->IndexOnSheet(),
+                                                     pd->mPagesPerSheetNumCols);
+    }
   }
 
   // Scale down the page based on the above-computed scale:
@@ -60,9 +70,18 @@
 
   // Draw the page at an offset, to get it in its pages-per-sheet "cell":
   nsSize pageSize = pageFrame->PresContext()->GetPageSize();
-  return transform.PreTranslate(
+  transform.PreTranslate(
       NSAppUnitsToFloatPixels(colIdx * pageSize.width, aAppUnitsPerPixel),
       NSAppUnitsToFloatPixels(rowIdx * pageSize.height, aAppUnitsPerPixel), 0);
+
+  // Also add the grid origin as an offset (so that we're not drawing into the
+  // sheet's unwritable area). Note that this is a PostTranslate operation
+  // (vs. PreTranslate above), since gridOrigin is an offset on the sheet
+  // itself, whereas the offset above was in the scaled coordinate space of the
+  // pages.
+  return transform.PostTranslate(
+      NSAppUnitsToFloatPixels(gridOrigin.x, aAppUnitsPerPixel),
+      NSAppUnitsToFloatPixels(gridOrigin.y, aAppUnitsPerPixel), 0);
 }
 
 void PrintedSheetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
@@ -133,6 +152,12 @@
   // Target for numPagesOnThisSheet.
   const uint32_t desiredPagesPerSheet = mPD->PagesPerSheetInfo()->mNumPages;
 
+  // If we're the first continuation and we're doing >1 pages per sheet,
+  // precompute some metrics that we'll use when painting the pages:
+  if (desiredPagesPerSheet > 1 && !GetPrevContinuation()) {
+    ComputePagesPerSheetOriginAndScale();
+  }
+
   // NOTE: I'm intentionally *not* using a range-based 'for' loop here, since
   // we potentially mutate the frame list (appending to the end) during the
   // list, which is not generally safe with range-based 'for' loops.
@@ -202,7 +227,7 @@
 
       // If we've already reached the target number of pages for this sheet,
       // and this continuation page that we just created is meant to be
-      // dispayed (i.e. it's in the chosen page range), then we need to push it
+      // displayed (i.e. it's in the chosen page range), then we need to push it
       // to our overflow list so that it'll go onto a subsequent sheet.
       // Otherwise we leave it on this sheet. This ensures we *only* generate
       // another sheet IFF there's a displayable page that will end up on it.
@@ -244,6 +269,7 @@
   MOZ_ASSERT(numPagesOnThisSheet <= desiredPagesPerSheet,
              "Shouldn't have more than desired number of displayable pages "
              "on this sheet");
+  mNumPages = numPagesOnThisSheet;
 
   // Populate our ReflowOutput outparam -- just use up all the
   // available space, for both our desired size & overflow areas.
@@ -257,6 +283,90 @@
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowInput, aReflowOutput);
 }
 
+void PrintedSheetFrame::ComputePagesPerSheetOriginAndScale() {
+  MOZ_ASSERT(mPD->PagesPerSheetInfo()->mNumPages > 1,
+             "Unnecessary to call this in a regular 1-page-per-sheet scenario; "
+             "the computed values won't ever be used in that case");
+  MOZ_ASSERT(!GetPrevContinuation(),
+             "Only needs to be called once, so 1st continuation handles it");
+
+  // The "full-scale" size of a page (if it weren't shrunk down into a grid):
+  const nsSize pageSize = PresContext()->GetPageSize();
+
+  // Compute the space available for the pages-per-sheet "page grid" (just
+  // subtract the sheet's unwriteable margin area):
+  nsSize availSpaceOnSheet = pageSize;
+  nsMargin uwm = nsPresContext::CSSTwipsToAppUnits(
+      mPD->mPrintSettings->GetUnwriteableMarginInTwips());
+  availSpaceOnSheet.width -= uwm.LeftRight();
+  availSpaceOnSheet.height -= uwm.TopBottom();
+  nsPoint pageGridOrigin(uwm.left, uwm.top);
+
+  // Compute the full size of the "page grid" that'll we'll be scaling down &
+  // placing onto a given sheet:
+  const auto* ppsInfo = mPD->PagesPerSheetInfo();
+
+  // XXXdholbert Bug 1669905 will add a bit more reasoning around here, to
+  // ensure that we use the larger track-count in the sheet's longer axis, to
+  // make the best use of space. (At this point, we don't have to worry about
+  // that, because we only support pages-per-sheet values that have the same
+  // number of rows and columns.)
+  uint32_t numCols = ppsInfo->mLargerNumTracks;
+  uint32_t numRows = ppsInfo->mNumPages / numCols;
+
+  nsSize pageGridFullSize(numCols * pageSize.width, numRows * pageSize.height);
+
+  if (MOZ_UNLIKELY(availSpaceOnSheet.IsEmpty() || pageGridFullSize.IsEmpty())) {
+    // Either we have a 0-sized available area, or we have a 0-sized page-grid
+    // to draw into the available area. This sort of thing should be rare, but
+    // it can happen if there are bizarre page sizes, and/or if there's an
+    // unexpectedly large unwritable margin area. Regardless: if we get here,
+    // we shouldn't be drawing anything onto the sheet; so let's just use a
+    // scale factor of 0, and bail early to avoid division by 0 in hScale &
+    // vScale computations below.
+    NS_WARNING("Zero area for pages-per-sheet grid, or zero-sized grid");
+    mPD->mPagesPerSheetGridOrigin = pageGridOrigin;
+    mPD->mPagesPerSheetNumCols = 1;
+    mPD->mPagesPerSheetScale = 0.0f;
+    return;
+  }
+
+  // Compute the scale factors required in each axis:
+  float hScale =
+      availSpaceOnSheet.width / static_cast<float>(pageGridFullSize.width);
+  float vScale =
+      availSpaceOnSheet.height / static_cast<float>(pageGridFullSize.height);
+
+  // Choose the more restrictive scale factor (so that we don't overflow the
+  // sheet's printable area in either axis). And center the page-grid in the
+  // other axis (since it probably ends up with extra space).
+  float scale = std::min(hScale, vScale);
+  if (hScale < vScale) {
+    // hScale is the more restrictive scale-factor, so we'll be using that.
+    // Nudge the grid in the vertical axis to center it:
+    nscoord extraSpace = availSpaceOnSheet.height -
+                         NSToCoordFloor(scale * pageGridFullSize.height);
+    if (MOZ_LIKELY(extraSpace > 0)) {
+      pageGridOrigin.y += extraSpace / 2;
+    }
+  } else if (vScale < hScale) {
+    // vScale is the more restrictive scale-factor, so we'll be using that.
+    // Nudge the grid in the vertical axis to center it:
+    nscoord extraSpace = availSpaceOnSheet.width -
+                         NSToCoordFloor(scale * pageGridFullSize.width);
+    if (MOZ_LIKELY(extraSpace > 0)) {
+      pageGridOrigin.x += extraSpace / 2;
+    }
+  }
+  // else, we fit exactly in both axes, with the same scale factor, so there's
+  // no extra space in either axis, i.e. no need to center.
+
+  // Update the nsSharedPageData member data:
+  mPD->mPagesPerSheetGridOrigin = pageGridOrigin;
+  mPD->mPagesPerSheetNumCols = numCols;
+  mPD->mPagesPerSheetScale = scale;
+}
+
 void PrintedSheetFrame::AppendDirectlyOwnedAnonBoxes(
     nsTArray<OwnedAnonBox>& aResult) {
   MOZ_ASSERT(mFrames.FirstChild() && mFrames.FirstChild()->IsPageFrame(),
diff -Nru firefox-84.0.2+build1/layout/generic/PrintedSheetFrame.h firefox-85.0+build1/layout/generic/PrintedSheetFrame.h
--- firefox-84.0.2+build1/layout/generic/PrintedSheetFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/PrintedSheetFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -41,6 +41,8 @@
   nsresult GetFrameName(nsAString& aResult) const override;
 #endif
 
+  uint32_t GetNumPages() const { return mNumPages; }
+
  private:
   // Private construtor & destructor, to avoid accidental (non-FrameArena)
   // instantiation/deletion:
@@ -48,9 +50,15 @@
       : nsContainerFrame(aStyle, aPresContext, kClassID) {}
   ~PrintedSheetFrame() = default;
 
+  // Helper function to populate some pages-per-sheet metrics in our
+  // nsSharedPageData.
+  void ComputePagesPerSheetOriginAndScale();
+
   // Note: this will be set before reflow, and it's strongly owned by our
   // nsPageSequenceFrame, which outlives us.
   nsSharedPageData* mPD = nullptr;
+  // The number of visible pages in this sheet.
+  uint32_t mNumPages = 0;
 };
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/layout/generic/ReflowInput.cpp firefox-85.0+build1/layout/generic/ReflowInput.cpp
--- firefox-84.0.2+build1/layout/generic/ReflowInput.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ReflowInput.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -1468,6 +1468,85 @@
   }
 }
 
+bool ReflowInput::IsInlineSizeComputableByBlockSizeAndAspectRatio(
+    nscoord aBlockSize) const {
+  WritingMode wm = GetWritingMode();
+  MOZ_ASSERT(!mStylePosition->mOffset.GetBStart(wm).IsAuto() &&
+                 !mStylePosition->mOffset.GetBEnd(wm).IsAuto(),
+             "If any of the block-start and block-end are auto, aBlockSize "
+             "doesn't make sense");
+  MOZ_ASSERT(
+      aBlockSize >= 0 && aBlockSize != NS_UNCONSTRAINEDSIZE,
+      "The caller shouldn't give us an unresolved or invalid block size");
+
+  if (!mStylePosition->mAspectRatio.HasFiniteRatio()) {
+    return false;
+  }
+
+  // We don't have to compute the inline size by aspect-ratio and the resolved
+  // block size (from insets) for replaced elements.
+  if (mFrame->IsFrameOfType(nsIFrame::eReplaced)) {
+    return false;
+  }
+
+  // If inline size is specified, we should have it by mFrame->ComputeSize()
+  // already.
+  if (mStylePosition->ISize(wm).IsLengthPercentage()) {
+    return false;
+  }
+
+  // If both inline insets are non-auto, mFrame->ComputeSize() should get a
+  // possible inline size by those insets, so we don't rely on aspect-ratio.
+  if (!mStylePosition->mOffset.GetIStart(wm).IsAuto() &&
+      !mStylePosition->mOffset.GetIEnd(wm).IsAuto()) {
+    return false;
+  }
+
+  // Just an error handling. If |aBlockSize| is NS_UNCONSTRAINEDSIZE, there must
+  // be something wrong, and we don't want to continue the calculation for
+  // aspect-ratio. So we return false if this happens.
+  return aBlockSize != NS_UNCONSTRAINEDSIZE;
+}
+
+LogicalSize ReflowInput::CalculateAbsoluteSizeWithResolvedAutoBlockSize(
+    nscoord aAutoBSize, bool aNeedsComputeInlineSizeByAspectRatio,
+    const LogicalSize& aTentativeComputedSize) {
+  NS_WARNING_ASSERTION(aAutoBSize != NS_UNCONSTRAINEDSIZE,
+                       "Shouldn't give an unresolved block size");
+  NS_WARNING_ASSERTION(
+      !mFrame->IsFrameOfType(nsIFrame::eReplaced),
+      "Replaced element shouldn't have unconstrained block size");
+
+  LogicalSize resultSize = aTentativeComputedSize;
+  WritingMode wm = GetWritingMode();
+
+  // For non-replaced elements with block-size auto, the block-size
+  // fills the remaining space, and we clamp it by min/max size constraints.
+  resultSize.BSize(wm) = ApplyMinMaxBSize(aAutoBSize);
+
+  if (!aNeedsComputeInlineSizeByAspectRatio) {
+    return resultSize;
+  }
+
+  // Calculate transferred inline size through aspect-ratio.
+  // For non-replaced elements, we always take box-sizing into account.
+  const auto boxSizingAdjust =
+      mStylePosition->mBoxSizing == StyleBoxSizing::Border
+          ? ComputedLogicalBorderPadding(wm).Size(wm)
+          : LogicalSize(wm);
+  auto transferredISize =
+      mStylePosition->mAspectRatio.ToLayoutRatio().ComputeRatioDependentSize(
+          LogicalAxis::eLogicalAxisInline, wm, aAutoBSize, boxSizingAdjust);
+  resultSize.ISize(wm) = ApplyMinMaxISize(transferredISize);
+
+  MOZ_ASSERT(mFlags.mBSizeIsSetByAspectRatio,
+             "This flag should have been set because nsIFrame::ComputeSize() "
+             "returns AspectRatioUsage::ToComputeBSize unintentionally");
+  mFlags.mBSizeIsSetByAspectRatio = false;
+
+  return resultSize;
+}
+
 void ReflowInput::InitAbsoluteConstraints(nsPresContext* aPresContext,
                                           const ReflowInput* aCBReflowInput,
                                           const LogicalSize& aCBSize,
@@ -1694,20 +1773,18 @@
         autoISize = 0;
       }
 
-      if (computedSize.ISize(cbwm) == NS_UNCONSTRAINEDSIZE) {
-        // For non-replaced elements with block-size auto, the block-size
-        // fills the remaining space.
-        computedSize.ISize(cbwm) = autoISize;
-
-        // XXX Do these need box-sizing adjustments?
-        LogicalSize maxSize = ComputedMaxSize(cbwm);
-        LogicalSize minSize = ComputedMinSize(cbwm);
-        if (computedSize.ISize(cbwm) > maxSize.ISize(cbwm)) {
-          computedSize.ISize(cbwm) = maxSize.ISize(cbwm);
-        }
-        if (computedSize.ISize(cbwm) < minSize.ISize(cbwm)) {
-          computedSize.ISize(cbwm) = minSize.ISize(cbwm);
-        }
+      // We handle the unconstrained block-size in current block's writing
+      // mode 'wm'.
+      nscoord autoBSizeInWM = autoISize;
+      bool needsComputeInlineSizeByAspectRatio =
+          IsInlineSizeComputableByBlockSizeAndAspectRatio(autoBSizeInWM);
+      if (computedSize.ISize(cbwm) == NS_UNCONSTRAINEDSIZE ||
+          needsComputeInlineSizeByAspectRatio) {
+        LogicalSize computedSizeInWM =
+            CalculateAbsoluteSizeWithResolvedAutoBlockSize(
+                autoBSizeInWM, needsComputeInlineSizeByAspectRatio,
+                computedSize.ConvertTo(wm, cbwm));
+        computedSize = computedSizeInWM.ConvertTo(cbwm, wm);
       }
     }
 
@@ -1787,20 +1864,30 @@
       autoBSize = 0;
     }
 
-    if (computedSize.BSize(cbwm) == NS_UNCONSTRAINEDSIZE) {
-      // For non-replaced elements with block-size auto, the block-size
-      // fills the remaining space.
-      computedSize.BSize(cbwm) = autoBSize;
-
-      // XXX Do these need box-sizing adjustments?
-      LogicalSize maxSize = ComputedMaxSize(cbwm);
-      LogicalSize minSize = ComputedMinSize(cbwm);
-      if (computedSize.BSize(cbwm) > maxSize.BSize(cbwm)) {
-        computedSize.BSize(cbwm) = maxSize.BSize(cbwm);
-      }
-      if (computedSize.BSize(cbwm) < minSize.BSize(cbwm)) {
-        computedSize.BSize(cbwm) = minSize.BSize(cbwm);
-      }
+    // |autoBSize| is in the writing mode of the containing block, so if |wm|
+    // and |cbwm| are orthogonal, |autoBSize| is |autoBSizeInCBWM|. After
+    // converting its writing mode into |wm|, it is |autoISizeInWM|, instead of
+    // |autoBSizeInWM|, so it shouldn't be the input of
+    // IsInlineSizeComputableByBlockSizeAndAspectRatio() because we assume
+    // its input should be the block-size of the current block.
+    // That's why we have to check the orthogonal for |wm| and |cbwm| first.
+    bool needsComputeInlineSizeByAspectRatio =
+        !wm.IsOrthogonalTo(cbwm) &&
+        IsInlineSizeComputableByBlockSizeAndAspectRatio(autoBSize);
+    // 'computedSize.BSize(cbwm) == NS_UNCONSTRAINEDSIZE' implicitly makes
+    // sure that |wm| and |cbwm| are not orthogonal.
+    // (If |wm| and |cbwm| are orthogonal, computedSize.BSize(cbwm) is
+    // computedSize.ISize(wm), and we always get a constrained inline size via
+    // nsIFrame::ComputeSize.)
+    if (computedSize.BSize(cbwm) == NS_UNCONSTRAINEDSIZE ||
+        needsComputeInlineSizeByAspectRatio) {
+      // We handle the unconstrained block-size in current block's writing mode
+      // 'wm'.
+      LogicalSize computedSizeInWM =
+          CalculateAbsoluteSizeWithResolvedAutoBlockSize(
+              autoBSize, needsComputeInlineSizeByAspectRatio,
+              computedSize.ConvertTo(wm, cbwm));
+      computedSize = computedSizeInWM.ConvertTo(cbwm, wm);
     }
 
     // The block-size might still not fill all the available space in case:
diff -Nru firefox-84.0.2+build1/layout/generic/ReflowInput.h firefox-85.0+build1/layout/generic/ReflowInput.h
--- firefox-84.0.2+build1/layout/generic/ReflowInput.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ReflowInput.h	2021-01-18 19:58:16.000000000 +0000
@@ -1016,6 +1016,19 @@
                                      nsHypotheticalPosition& aHypotheticalPos,
                                      mozilla::LayoutFrameType aFrameType) const;
 
+  // Check if we can use the resolved auto block size (by insets) to compute
+  // the inline size through aspect-ratio on absolute-positioned elements.
+  // This is only needed for non-replaced elements.
+  // https://drafts.csswg.org/css-position/#abspos-auto-size
+  bool IsInlineSizeComputableByBlockSizeAndAspectRatio(
+      nscoord aBlockSize) const;
+
+  // This calculates the size by using the resolved auto block size (from
+  // non-auto block insets), according to the writing mode of current block.
+  LogicalSize CalculateAbsoluteSizeWithResolvedAutoBlockSize(
+      nscoord aAutoBSize, bool aNeedsComputeInlineSizeByAspectRatio,
+      const LogicalSize& aTentativeComputedSize);
+
   void InitAbsoluteConstraints(nsPresContext* aPresContext,
                                const ReflowInput* aCBReflowInput,
                                const mozilla::LogicalSize& aContainingBlockSize,
diff -Nru firefox-84.0.2+build1/layout/generic/ReflowOutput.cpp firefox-85.0+build1/layout/generic/ReflowOutput.cpp
--- firefox-84.0.2+build1/layout/generic/ReflowOutput.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ReflowOutput.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -9,45 +9,33 @@
 #include "mozilla/ReflowOutput.h"
 #include "mozilla/ReflowInput.h"
 
-void nsOverflowAreas::UnionWith(const nsOverflowAreas& aOther) {
-  // FIXME: We should probably change scrollable overflow to use
-  // UnionRectIncludeEmpty (but leave ink overflow using UnionRect).
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-    mRects[otype].UnionRect(mRects[otype], aOther.mRects[otype]);
-  }
-}
+namespace mozilla {
 
-void nsOverflowAreas::UnionAllWith(const nsRect& aRect) {
-  // FIXME: We should probably change scrollable overflow to use
-  // UnionRectIncludeEmpty (but leave ink overflow using UnionRect).
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-    mRects[otype].UnionRect(mRects[otype], aRect);
-  }
+void OverflowAreas::UnionWith(const OverflowAreas& aOther) {
+  InkOverflow().UnionRect(InkOverflow(), aOther.InkOverflow());
+  ScrollableOverflow().UnionRect(ScrollableOverflow(),
+                                 aOther.ScrollableOverflow());
 }
 
-void nsOverflowAreas::SetAllTo(const nsRect& aRect) {
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) { mRects[otype] = aRect; }
+void OverflowAreas::UnionAllWith(const nsRect& aRect) {
+  InkOverflow().UnionRect(InkOverflow(), aRect);
+  ScrollableOverflow().UnionRect(ScrollableOverflow(), aRect);
 }
 
-namespace mozilla {
+void OverflowAreas::SetAllTo(const nsRect& aRect) {
+  InkOverflow() = aRect;
+  ScrollableOverflow() = aRect;
+}
 
 ReflowOutput::ReflowOutput(const ReflowInput& aReflowInput)
     : ReflowOutput(aReflowInput.GetWritingMode()) {}
 
 void ReflowOutput::SetOverflowAreasToDesiredBounds() {
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-    mOverflowAreas.Overflow(otype).SetRect(0, 0, Width(), Height());
-  }
+  mOverflowAreas.SetAllTo(nsRect(0, 0, Width(), Height()));
 }
 
 void ReflowOutput::UnionOverflowAreasWithDesiredBounds() {
-  // FIXME: We should probably change scrollable overflow to use
-  // UnionRectIncludeEmpty (but leave ink overflow using UnionRect).
-  nsRect rect(0, 0, Width(), Height());
-  NS_FOR_FRAME_OVERFLOW_TYPES(otype) {
-    nsRect& o = mOverflowAreas.Overflow(otype);
-    o.UnionRect(o, rect);
-  }
+  mOverflowAreas.UnionAllWith(nsRect(0, 0, Width(), Height()));
 }
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/layout/generic/ReflowOutput.h firefox-85.0+build1/layout/generic/ReflowOutput.h
--- firefox-84.0.2+build1/layout/generic/ReflowOutput.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ReflowOutput.h	2021-01-18 19:58:16.000000000 +0000
@@ -9,6 +9,7 @@
 #ifndef mozilla_ReflowOutput_h
 #define mozilla_ReflowOutput_h
 
+#include "mozilla/EnumeratedRange.h"
 #include "mozilla/WritingModes.h"
 #include "nsBoundingMetrics.h"
 #include "nsRect.h"
@@ -17,100 +18,74 @@
 
 namespace mozilla {
 struct ReflowInput;
-}  // namespace mozilla
-
-/**
- * When we store overflow areas as an array of scrollable and visual
- * overflow, we use these indices.
- *
- * eOverflowType_LENGTH is needed (for gcc 4.5.*, at least) to ensure
- * that 2 is a valid value of nsOverflowType for use in
- * NS_FOR_FRAME_OVERFLOW_TYPES.
- */
-enum nsOverflowType { eInkOverflow, eScrollableOverflow, eOverflowType_LENGTH };
 
-#define NS_FOR_FRAME_OVERFLOW_TYPES(var_)                 \
-  for (nsOverflowType var_ = nsOverflowType(0); var_ < 2; \
-       var_ = nsOverflowType(var_ + 1))
-
-struct nsOverflowAreas {
- private:
-  nsRect mRects[2];
+enum class OverflowType : uint8_t { Ink, Scrollable };
+constexpr auto AllOverflowTypes() {
+  return mozilla::MakeInclusiveEnumeratedRange(OverflowType::Ink,
+                                               OverflowType::Scrollable);
+}
 
+struct OverflowAreas {
  public:
-  nsRect& Overflow(size_t aIndex) {
-    NS_ASSERTION(aIndex < 2, "index out of range");
-    return mRects[aIndex];
-  }
-  const nsRect& Overflow(size_t aIndex) const {
-    NS_ASSERTION(aIndex < 2, "index out of range");
-    return mRects[aIndex];
-  }
+  nsRect& InkOverflow() { return mInk; }
+  const nsRect& InkOverflow() const { return mInk; }
 
-  nsRect& InkOverflow() { return mRects[eInkOverflow]; }
-  const nsRect& InkOverflow() const { return mRects[eInkOverflow]; }
+  nsRect& ScrollableOverflow() { return mScrollable; }
+  const nsRect& ScrollableOverflow() const { return mScrollable; }
 
-  nsRect& ScrollableOverflow() { return mRects[eScrollableOverflow]; }
-  const nsRect& ScrollableOverflow() const {
-    return mRects[eScrollableOverflow];
+  nsRect& Overflow(OverflowType aType) {
+    return aType == OverflowType::Ink ? InkOverflow() : ScrollableOverflow();
   }
-
-  nsOverflowAreas() {
-    // default-initializes to zero due to nsRect's default constructor
+  const nsRect& Overflow(OverflowType aType) const {
+    return aType == OverflowType::Ink ? InkOverflow() : ScrollableOverflow();
   }
 
-  nsOverflowAreas(const nsRect& aInkOverflow,
-                  const nsRect& aScrollableOverflow) {
-    mRects[eInkOverflow] = aInkOverflow;
-    mRects[eScrollableOverflow] = aScrollableOverflow;
-  }
+  OverflowAreas() = default;
 
-  nsOverflowAreas(const nsOverflowAreas& aOther) { *this = aOther; }
+  OverflowAreas(const nsRect& aInkOverflow, const nsRect& aScrollableOverflow)
+      : mInk(aInkOverflow), mScrollable(aScrollableOverflow) {}
 
-  nsOverflowAreas& operator=(const nsOverflowAreas& aOther) {
-    mRects[0] = aOther.mRects[0];
-    mRects[1] = aOther.mRects[1];
-    return *this;
-  }
-
-  bool operator==(const nsOverflowAreas& aOther) const {
+  bool operator==(const OverflowAreas& aOther) const {
     // Scrollable overflow is a point-set rectangle and ink overflow
     // is a pixel-set rectangle.
     return InkOverflow().IsEqualInterior(aOther.InkOverflow()) &&
            ScrollableOverflow().IsEqualEdges(aOther.ScrollableOverflow());
   }
 
-  bool operator!=(const nsOverflowAreas& aOther) const {
+  bool operator!=(const OverflowAreas& aOther) const {
     return !(*this == aOther);
   }
 
-  nsOverflowAreas operator+(const nsPoint& aPoint) const {
-    nsOverflowAreas result(*this);
+  OverflowAreas operator+(const nsPoint& aPoint) const {
+    OverflowAreas result(*this);
     result += aPoint;
     return result;
   }
 
-  nsOverflowAreas& operator+=(const nsPoint& aPoint) {
-    mRects[0] += aPoint;
-    mRects[1] += aPoint;
+  OverflowAreas& operator+=(const nsPoint& aPoint) {
+    mInk += aPoint;
+    mScrollable += aPoint;
     return *this;
   }
 
-  void Clear() {
-    mRects[0].SetRect(0, 0, 0, 0);
-    mRects[1].SetRect(0, 0, 0, 0);
-  }
+  void Clear() { SetAllTo(nsRect()); }
 
   // Mutates |this| by unioning both overflow areas with |aOther|.
-  void UnionWith(const nsOverflowAreas& aOther);
+  void UnionWith(const OverflowAreas& aOther);
 
   // Mutates |this| by unioning both overflow areas with |aRect|.
   void UnionAllWith(const nsRect& aRect);
 
   // Mutates |this| by setting both overflow areas to |aRect|.
   void SetAllTo(const nsRect& aRect);
+
+ private:
+  nsRect mInk;
+  nsRect mScrollable;
 };
 
+}  // namespace mozilla
+
 /**
  * An nsCollapsingMargin represents a vertical collapsing margin between
  * blocks as described in section 8.3.1 of CSS2,
@@ -249,7 +224,7 @@
   // desired size. If there is no content that overflows, then the
   // overflow area is identical to the desired size and should be {0, 0,
   // width, height}.
-  nsOverflowAreas mOverflowAreas;
+  OverflowAreas mOverflowAreas;
 
   nsRect& InkOverflow() { return mOverflowAreas.InkOverflow(); }
   const nsRect& InkOverflow() const { return mOverflowAreas.InkOverflow(); }
diff -Nru firefox-84.0.2+build1/layout/generic/test/mochitest.ini firefox-85.0+build1/layout/generic/test/mochitest.ini
--- firefox-84.0.2+build1/layout/generic/test/mochitest.ini	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/mochitest.ini	2021-01-18 19:58:16.000000000 +0000
@@ -7,12 +7,6 @@
   ../../reftests/backgrounds/blue-32x32.png
   ../../reftests/backgrounds/fuchsia-32x32.png
   ../../../dom/plugins/test/mochitest/plugin-utils.js
-  plugin_clipping_helper.xhtml
-  plugin_clipping_helper2.xhtml
-  plugin_clipping_helper_transformed.xhtml
-  plugin_clipping_helper_table.xhtml
-  plugin_clipping_lib.js
-  plugin_focus_helper.html
   file_BrokenImageReference.png
   file_Dolske.png
   file_IconTestServer.sjs
@@ -116,8 +110,6 @@
 [test_image_selection.html]
 [test_image_selection_2.html]
 [test_image_selection_in_contenteditable.html]
-[test_invalidate_during_plugin_paint.html]
-skip-if = headless # Headless:Bug 1405871
 [test_intrinsic_size_on_loading.html]
 [test_movement_by_characters.html]
 [test_movement_by_words.html]
@@ -128,18 +120,6 @@
 [test_overflow_event.html]
 [test_page_scroll_with_fixed_pos.html]
 support-files = page_scroll_with_fixed_pos_window.html
-[test_plugin_clipping.xhtml]
-skip-if = e10s
-[test_plugin_clipping2.xhtml]
-skip-if = e10s
-[test_plugin_clipping_transformed.xhtml]
-skip-if = e10s
-[test_plugin_clipping_table.xhtml]
-skip-if = e10s
-[test_plugin_focus.html]
-skip-if  = os == 'win' # bug 1207918
-[test_plugin_mouse_coords.html]
-skip-if = headless # Headless:Bug 1405871
 [test_plugin_position.xhtml]
 skip-if = e10s
 [test_scroll_behavior.html]
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper2.xhtml firefox-85.0+build1/layout/generic/test/plugin_clipping_helper2.xhtml
--- firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper2.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_clipping_helper2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Dynamic Tests">
-<head>
-  <style>
-  embed { width:300px; height:200px; display:block; }
-  </style>
-</head>
-<body>
-
-<!-- Use a XUL element here so we can get its screenX/Y -->
-<hbox style="height:10px; position:absolute; left:0; top:0; z-index:-100;" id="h1"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <hbox style="width:100px;"></hbox><hbox id="h2"/>
-</hbox>
-
-<div id="d1" style="width:200px; overflow:hidden; position:absolute; top:0; left:0;">
-  <embed id="p1" type="application/x-test" wmode="window" style="position:relative"></embed>
-</div>
-<div id="d2" style="width:200px; height:200px; overflow:hidden; position:absolute; top:100px; left:0;">
-  <embed id="p2" type="application/x-test" wmode="window"></embed>
-  <div id="zbox" style="position:absolute; left:50px; top:50px; width:100px; height:100px; background:yellow;">
-  </div>
-</div>
-
-<div id="scroll"
-     style="position:absolute; top:0; left:0; width:300px; height:400px; overflow:scroll;">
-  <div id="sbox"
-       style="margin-top:350px; margin-left:50px; margin-bottom:1000px; width:100px; height:100px; background:blue;"></div>
-</div>
-
-<script src="plugin_clipping_lib.js"></script>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-var scroll = document.getElementById("scroll");
-var zbox = document.getElementById("zbox");
-var sbox = document.getElementById("sbox");
-var p1 = document.getElementById("p1");
-var d2 = document.getElementById("d2");
-
-function runTests() {
-
-  checkClipRegion("p1", [[0, 0, 200, 100]]);
-  checkClipRegion("p2", [[0, 0, 200, 50], [0, 50, 50, 150], [150, 50, 200, 150], [0, 150, 200, 200]]);
-
-  scroll.scrollTop = 150;
-
-  // A non-zero timeout is needed on X11 (unless an XSync could be performed)
-  // to delay an OOP plugin's X requests enough so that the X server processes
-  // them after the parent processes requests (for the changes above).
-  setTimeout(part2, 1000);
-}
-
-function part2() {
-  checkClipRegion("p2", [[0, 0, 200, 50], [0, 50, 50, 200], [150, 50, 200, 200]]);
-
-  zbox.style.zIndex = -1;
-
-  setTimeout(part3, 1000);
-}
-
-function part3() {
-  checkClipRegion("p2", [[0, 0, 200, 100], [0, 100, 50, 200], [150, 100, 200, 200]]);
-
-  sbox.style.background = "";
-
-  setTimeout(part4, 1000);
-}
-
-function part4() {
-  checkClipRegion("p2", [[0, 0, 200, 200]]);
-  
-  p1.style.zIndex = 1;
-
-  setTimeout(part5, 1000);
-}
-
-function part5() {
-  checkClipRegion("p1", [[0, 0, 200, 200]]);
-  checkClipRegion("p2", [[0, 100, 200, 200]]);
-
-  // Test subpixel stuff
-  p1.style.zIndex = -1;
-  zbox.style.zIndex = 1;
-  zbox.style.top = "50.3px;"
-  d2.style.top = "100.3px";
-
-  setTimeout(done, 1000);
-}
-
-function done() {
-  checkClipRegionNoBounds("p2", [[0, 0, 200, 50], [0, 50, 50, 150], [150, 50, 200, 150], [0, 150, 200, 200]]);
-
-  window.opener.SimpleTest.finish();
-  window.close();
-}
-
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper_table.xhtml firefox-85.0+build1/layout/generic/test/plugin_clipping_helper_table.xhtml
--- firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper_table.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_clipping_helper_table.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Plugins and Tables">
-<head>
-  <style>
-  embed { width:300px; height:200px; display:block; }
-  </style>
-</head>
-<body>
-
-<!-- Use a XUL element here so we can get its screenX/Y -->
-<hbox style="height:10px; position:absolute; left:0; top:0; z-index:-100;" id="h1"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <hbox style="width:100px;"></hbox><hbox id="h2"/>
-</hbox>
-
-<embed id="p1" type="application/x-test" wmode="window"
-       style="position:absolute; top:0; left:0;"></embed>
-<table style="width:300px; height:100px; position:absolute; top:100px; left:0; background:white;">
-</table>
-<embed id="p2" type="application/x-test" wmode="window"
-       style="position:absolute; top:200px; left:0;"></embed>
-<table style="width:300px; height:300px; position:absolute; top:300px; left:0; background:white; border-collapse:collapse;">
-</table>
-
-<script src="plugin_clipping_lib.js"></script>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-function runTests() {
-  // p1 is partially covered by a table with an opaque background
-  checkClipRegion("p1", [[0, 0, 300, 100]]);
-  // p2 is partially covered by a table with an opaque background
-  checkClipRegion("p2", [[0, 0, 300, 100]]);
-
-  window.opener.SimpleTest.finish();
-  window.close();
-}
-
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper_transformed.xhtml firefox-85.0+build1/layout/generic/test/plugin_clipping_helper_transformed.xhtml
--- firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper_transformed.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_clipping_helper_transformed.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Plugins in Transforms">
-<head>
-  <style>
-  embed { width:300px; height:200px; display:block; }
-  </style>
-</head>
-<body>
-
-<!-- Use a XUL element here so we can get its screenX/Y -->
-<hbox style="height:10px; position:absolute; left:0; top:0; z-index:-100;" id="h1"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <hbox style="width:100px;"></hbox><hbox id="h2"/>
-</hbox>
-
-<div style="width:200px; position:absolute; top:0; left:0; -moz-transform:rotate(90deg)">
-  <embed id="p1" type="application/x-test" wmode="window"></embed>
-</div>
-<svg xmlns="http://www.w3.org/2000/svg" style="width:200px; position:absolute; top:200px; left:0;">
-  <foreignObject width="200" height="200">
-    <embed xmlns="http://www.w3.org/1999/xhtml" id="p2" type="application/x-test" wmode="window"></embed>
-  </foreignObject>
-</svg>
-
-<script src="plugin_clipping_lib.js"></script>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-function runTests() {
-  // p1 and p2 are both in a transformed context so they should be hidden.
-  checkClipRegionNoBounds("p1", []);
-  checkClipRegionNoBounds("p2", []);
-
-  window.opener.childDone();
-}
-
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper.xhtml firefox-85.0+build1/layout/generic/test/plugin_clipping_helper.xhtml
--- firefox-84.0.2+build1/layout/generic/test/plugin_clipping_helper.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_clipping_helper.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping">
-<head>
-  <style>
-  embed { width:200px; height:200px; display:block; }
-  iframe { border:none; }
-  </style>
-</head>
-<body>
-
-<!-- Use a XUL element here so we can get its screenX/Y -->
-<hbox style="height:10px; position:absolute; left:0; top:0; z-index:-100;" id="h1"
-      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <hbox style="width:100px;"></hbox><hbox id="h2"/>
-</hbox>
-
-<!-- Non-clipped plugin -->
-<embed id="p1" type="application/x-test" wmode="window"
-       style="position:absolute; left:300px; top:0"></embed>
-<!-- Clipped to the top and left by the viewport -->
-<embed id="p2" type="application/x-test" wmode="window"
-       style="position:absolute; left:-100px; top:-100px;"></embed>
-<!-- Clipped by a scrollable DIV -->
-<div style="overflow:auto; width:200px; height:200px;
-            position:absolute; left:100px; top:0;">
-  <div style="position:relative; left:-100px; top:-100px;">
-    <embed id="p3" type="application/x-test" wmode="window"></embed>
-  </div>
-</div>
-<!-- Clipped by a scrollable DIV *and* to the viewport -->
-<div style="overflow:auto; width:200px; height:200px; position:absolute; top:100px; left:-100px;">
-  <div style="position:relative; top:-100px;">
-    <embed id="p4" type="application/x-test" wmode="window"></embed>
-  </div>
-</div>
-<!-- Clipped by an iframe -->
-<iframe id="f1" style="position:absolute; left:200px; top:200px; width:200px; height:200px;"
-        src="data:text/html,&lt;embed style='position:absolute; left:-100px; top:-100px; width:200px; height:200px;' id='p5' type='application/x-test' wmode='window'&gt;"></iframe>
-
-<script src="plugin_clipping_lib.js"></script>
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-function runTests() {
-  checkClipRegion("p1", [[0, 0, 200, 200]]);
-  checkClipRegion("p2", [[100, 100, 200, 200]]);
-  checkClipRegion("p3", [[100, 100, 200, 200]]);
-  checkClipRegion("p4", [[100, 100, 200, 200]]);
-  checkClipRegionForFrame("f1", "p5", [[100, 100, 200, 200]]);
-
-  window.opener.SimpleTest.finish();
-  window.close();
-}
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_clipping_lib.js firefox-85.0+build1/layout/generic/test/plugin_clipping_lib.js
--- firefox-84.0.2+build1/layout/generic/test/plugin_clipping_lib.js	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_clipping_lib.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-var checkClipRegion, checkClipRegionForFrame, checkClipRegionNoBounds;
-
-(function() {
-  var windowFrameX, windowFrameY;
-
-  // Import test API
-  var is = window.opener.is;
-  var ok = window.opener.ok;
-  var todo = window.opener.todo;
-  var finish = window.opener.SimpleTest.finish;
-  window.onerror = function(event) {
-    window.opener.onerror(event);
-    window.close();
-  };
-
-  function dumpRect(r) {
-    return "{" + r.join(",") + "}";
-  }
-
-  function dumpRegion(rects) {
-    var s = [];
-    for (var i = 0; i < rects.length; ++i) {
-      var r = rects[i];
-      s.push(dumpRect(r));
-    }
-    return s.join(", ");
-  }
-
-  function generateSpan(coords) {
-    coords.sort(function(a, b) {
-      return a - b;
-    });
-    var result = [coords[0]];
-    for (var i = 1; i < coords.length; ++i) {
-      if (coords[i] != coords[i - 1]) {
-        result.push(coords[i]);
-      }
-    }
-    return result;
-  }
-
-  function containsRect(r1, r2) {
-    return r1[0] <= r2[0] && r1[2] >= r2[2] && r1[1] <= r2[1] && r1[3] >= r2[3];
-  }
-
-  function subtractRect(r1, r2, rlist) {
-    var spanX = generateSpan([r1[0], r1[2], r2[0], r2[2]]);
-    var spanY = generateSpan([r1[1], r1[3], r2[1], r2[3]]);
-    for (var i = 1; i < spanX.length; ++i) {
-      for (var j = 1; j < spanY.length; ++j) {
-        var subrect = [spanX[i - 1], spanY[j - 1], spanX[i], spanY[j]];
-        if (containsRect(r1, subrect) && !containsRect(r2, subrect)) {
-          rlist.push(subrect);
-        }
-      }
-    }
-  }
-
-  function regionContainsRect(rs, r) {
-    var rectList = [r];
-    for (var i = 0; i < rs.length; ++i) {
-      var newList = [];
-      for (var j = 0; j < rectList.length; ++j) {
-        subtractRect(rectList[j], rs[i], newList);
-      }
-      if (newList.length == 0) {
-        return true;
-      }
-      rectList = newList;
-    }
-    return false;
-  }
-
-  function regionContains(r1s, r2s) {
-    for (var i = 0; i < r2s.length; ++i) {
-      if (!regionContainsRect(r1s, r2s[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  function equalRegions(r1s, r2s) {
-    return regionContains(r1s, r2s) && regionContains(r2s, r1s);
-  }
-
-  // Checks that a plugin's clip region equals the specified rectangle list.
-  // The rectangles are given relative to the plugin's top-left. They are in
-  // [left, top, right, bottom] format.
-  function checkClipRegionWithDoc(
-    doc,
-    offsetX,
-    offsetY,
-    id,
-    rects,
-    checkBounds
-  ) {
-    var p = doc.getElementById(id);
-    var bounds = p.getBoundingClientRect();
-    var pX = p.getEdge(0);
-    var pY = p.getEdge(1);
-
-    if (checkBounds) {
-      var pWidth = p.getEdge(2) - pX;
-      var pHeight = p.getEdge(3) - pY;
-
-      is(pX, windowFrameX + bounds.left + offsetX, id + " plugin X");
-      is(pY, windowFrameY + bounds.top + offsetY, id + " plugin Y");
-      is(pWidth, bounds.width, id + " plugin width");
-      is(pHeight, bounds.height, id + " plugin height");
-    }
-
-    // Now check clip region. 'rects' is relative to the plugin's top-left.
-    var clipRects = [];
-    var n = p.getClipRegionRectCount();
-    for (var i = 0; i < n; ++i) {
-      // Convert the clip rect to be relative to the plugin's top-left.
-      clipRects[i] = [
-        p.getClipRegionRectEdge(i, 0) - pX,
-        p.getClipRegionRectEdge(i, 1) - pY,
-        p.getClipRegionRectEdge(i, 2) - pX,
-        p.getClipRegionRectEdge(i, 3) - pY,
-      ];
-    }
-
-    ok(
-      equalRegions(clipRects, rects),
-      "Matching regions for '" +
-        id +
-        "': expected " +
-        dumpRegion(rects) +
-        ", got " +
-        dumpRegion(clipRects)
-    );
-  }
-
-  checkClipRegion = function(id, rects) {
-    checkClipRegionWithDoc(document, 0, 0, id, rects, true);
-  };
-
-  checkClipRegionForFrame = function(fid, id, rects) {
-    var f = document.getElementById(fid);
-    var bounds = f.getBoundingClientRect();
-    checkClipRegionWithDoc(
-      f.contentDocument,
-      bounds.left,
-      bounds.top,
-      id,
-      rects,
-      true
-    );
-  };
-
-  checkClipRegionNoBounds = function(id, rects) {
-    checkClipRegionWithDoc(document, 0, 0, id, rects, false);
-  };
-
-  function loaded() {
-    var h1 = document.getElementById("h1");
-    var h2 = document.getElementById("h2");
-    var hwidth = h2.screenX - h1.screenX;
-    if (hwidth != 100) {
-      // Maybe it's a DPI issue
-      todo(false, "Unexpected DPI?");
-      finish();
-      window.close();
-      return;
-    }
-
-    if (!document.getElementById("p1").identifierToStringTest) {
-      todo(false, "Test plugin not available");
-      finish();
-      window.close();
-      return;
-    }
-
-    var bounds = h1.getBoundingClientRect();
-    windowFrameX = h1.screenX - bounds.left - window.screenX;
-    windowFrameY = h1.screenY - bounds.top - window.screenY;
-
-    // Run actual test code
-    runTests();
-  }
-
-  // Need to run 'loaded' after painting is unsuppressed, or we'll set clip
-  // regions to empty.  The timeout must be non-zero on X11 so that
-  // gtk_container_idle_sizer runs after the GtkSocket gets the plug_window.
-  window.addEventListener("load", function() {
-    setTimeout(loaded, 1000);
-  });
-})();
diff -Nru firefox-84.0.2+build1/layout/generic/test/plugin_focus_helper.html firefox-85.0+build1/layout/generic/test/plugin_focus_helper.html
--- firefox-84.0.2+build1/layout/generic/test/plugin_focus_helper.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/plugin_focus_helper.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-<html>
-<head>
-  <title>Test that clicking on plugins transfers focus correctly</title>
-  <style>
-  embed { width:200px; height:200px; }
-  </style>
-</head>
-<body>
-
-<p><input type="text" id="input"></input>
-<p><embed id="p1" type="application/x-test" wmode="window" paintscript="didPaint('p1')">
-   <embed id="p2" type="application/x-test" paintscript="didPaint('p2')"></p>
-
-<script type="text/javascript">
-var SimpleTest = window.opener.SimpleTest;
-var is = window.opener.is;
-var ok = window.opener.ok;
-var todo = window.opener.todo;
-var info = window.opener.info;
-
-SimpleTest.waitForExplicitFinish();
-
-// We don't want to trigger native mouse events until the document is fully
-// loaded and each plugin has painted once.
-var expectPaints = 2;
-var loaded = false;
-function didPaint(id) {
-  ok(--expectPaints >= 0, "Got plugin painted event from "+id);
-  document.getElementById(id).setAttribute("paintscript", null);
-  if (expectPaints == 0) {
-    if (document.readyState == "complete") {
-      theTest();
-    } else {
-      info("Waiting for document load to continue");
-      window.addEventListener("load", function() { theTest(); });
-    }
-  }
-}
-
-//
-// Begin the test
-//
-function theTest() {
-
-const Cc = SpecialPowers.Cc;
-const Ci = SpecialPowers.Ci;
-var gWindowUtils = SpecialPowers.getDOMWindowUtils(window);
-
-var nativeMouseDown;
-var nativeMouseUp;
-
-function nativeClickElement(id) {
-  return function() {
-
-    var element = document.getElementById(id);
-    var bounds = element.getBoundingClientRect();
-    var x = (bounds.left + window.mozInnerScreenX + 10);
-    var y = (bounds.top + window.mozInnerScreenY + 10);
-
-    SimpleTest.executeSoon(function () {
-      gWindowUtils.sendNativeMouseEvent(x, y, nativeMouseDown, 0, element);
-      gWindowUtils.sendNativeMouseEvent(x, y, nativeMouseUp, 0, element);
-    });
-  };
-}
-
-function done() {
-  // Something about this test is losing focus to the OS intermittently, remove
-  // the windowed plugins and wait for this window to be focused before
-  // continuing. (Bug 874843)
-  for (var p of [ "p1", "p2" ]) {
-    p = document.getElementById(p);
-    p.remove();
-    p = null;
-  }
-  SimpleTest.waitForFocus(window.opener.childDone, window);
-}
-
-var step = 0;
-var steps = [
-  { event:"focus", id:"input", action:nativeClickElement("p1") },
-  { event:"blur", id:"input" },
-  { event:"focus", id:"p1", action:nativeClickElement("p2") },
-  { event:"blur", id:"p1" },
-  { event:"focus", id:"p2", action:nativeClickElement("input") },
-  { event:"blur", id:"p2" },
-  { event:"focus", id:"input", action:done }
-];
-
-function handleEvent(event) {
-  if (step >= steps.length)
-    return;
-
-  var s = steps[step++];
-  is(event.type, s.event, "Check event type");
-  is(event.target.id, s.id, "Check event target");
-
-  if (s.action) {
-    SimpleTest.executeSoon(s.action);
-  }
-}
-
-var elems = ["input", "p1", "p2"];
-for (var i = 0; i < elems.length; ++i) {
-  var e = document.getElementById(elems[i]);
-  e.addEventListener("focus", handleEvent);
-  e.addEventListener("blur", handleEvent);
-}
-
-function doTest() {
-  input.focus();
-}
-
-if (navigator.platform.includes("Mac")) {
-  nativeMouseDown = 1; // NSLeftMouseDown
-  nativeMouseUp = 2; // NSLeftMouseUp
-  SimpleTest.waitForFocus(doTest, window);
-} else if (navigator.platform.includes("Win")) {
-  nativeMouseDown = 2; // MOUSEEVENTF_LEFTDOWN
-  nativeMouseUp = 4; // MOUSEEVENTF_LEFTUP
-  SimpleTest.waitForFocus(doTest, window);
-} else {
-  // XXX(johns): our gtk2 sendNativeMouseEvent doesn't support clicks
-  todo(false, "Platform not supported");
-  done();
-}
-
-} // function theTest
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_invalidate_during_plugin_paint.html firefox-85.0+build1/layout/generic/test/test_invalidate_during_plugin_paint.html
--- firefox-84.0.2+build1/layout/generic/test/test_invalidate_during_plugin_paint.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_invalidate_during_plugin_paint.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test handling plugins invalidating during paint</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>    
-  <script type="text/javascript" src="plugin-utils.js"></script>
-  <script type="text/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <style>
-  embed { width:200px; height:200px; display:block; }
-  </style>
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: block">
-  <embed id="p1" type="application/x-test" drawmode="solid" color="80808080"></embed>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var p1 = document.getElementById("p1");
-var initialPaintCount;
-
-function checkEnded() {
-  var paints = p1.getPaintCount() - initialPaintCount;
-  if (paints > 20) {
-    ok(true, "Got " + paints + " paints");
-    SimpleTest.finish();
-    return;
-  }
-
-  setTimeout(checkEnded, 30);  
-}
-
-function doTest() {
-  initialPaintCount = p1.getPaintCount();
-
-  // Tell the plugin to invalidate every time it paints
-  p1.setInvalidateDuringPaint(true);
-  // Trigger an invalidation to get painting started
-  p1.setColor("FFFFFFFF");
-  // Now we should have an infinite cycle of painting and invalidations.
-
-  // Poll for more than 20 paints to happen.
-  checkEnded();
-}
-
-// Need to run 'doTest' after painting is unsuppressed, or we'll set clip
-// regions to empty.
-addLoadEvent(doTest);
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-
-</script>
-</pre>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping2.xhtml firefox-85.0+build1/layout/generic/test/test_plugin_clipping2.xhtml
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping2.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_clipping2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Dynamic Tests">
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-</head>
-<body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-if (navigator.platform.indexOf("Mac") == 0) {
-  todo(false, "Mac plugins do not support complex clipping");
-} else {
-  window.open("plugin_clipping_helper2.xhtml", "", "width=620,height=320");
-  SimpleTest.waitForExplicitFinish();
-}
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping_table.xhtml firefox-85.0+build1/layout/generic/test/test_plugin_clipping_table.xhtml
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping_table.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_clipping_table.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Plugins and Tables">
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-</head>
-<body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-window.open("plugin_clipping_helper_table.xhtml", "", "width=620,height=320");
-SimpleTest.waitForExplicitFinish();
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping_transformed.xhtml firefox-85.0+build1/layout/generic/test/test_plugin_clipping_transformed.xhtml
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping_transformed.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_clipping_transformed.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping: Plugins in Transforms">
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-</head>
-<body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-var child;
-function childDone() {
-  child.close();
-  SimpleTest.executeSoon(SimpleTest.finish);
-}
-
-if (navigator.platform.indexOf("Mac") == 0) {
-  todo(false, "Mac plugins do not run in windowed mode");
-} else {
-  SimpleTest.waitForExplicitFinish();
-  child = window.open("plugin_clipping_helper_transformed.xhtml", "", "width=620,height=320");
-}
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping.xhtml firefox-85.0+build1/layout/generic/test/test_plugin_clipping.xhtml
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_clipping.xhtml	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_clipping.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" title="Test Plugin Clipping">
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-</head>
-<body>
-
-<script class="testbody" type="application/javascript">
-<![CDATA[
-
-window.open("plugin_clipping_helper.xhtml", "", "width=620,height=320");
-SimpleTest.waitForExplicitFinish();
-
-]]>
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_focus.html firefox-85.0+build1/layout/generic/test/test_plugin_focus.html
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_focus.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_focus.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<html title="Test plugin focus control">
-<head>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-
-<script class="testbody" type="application/javascript">
-
-var child;
-function childDone() {
-  child.close();
-  // This test has a history of focus issues, but waiting for focus to return
-  // from the child window instead of attempting to reclaim it after finish
-  // seems to prevent some kind of race on win8 (Bug 874843)
-  SimpleTest.waitForFocus(SimpleTest.finish, window);
-}
-
-SimpleTest.waitForExplicitFinish();
-child = window.open("plugin_focus_helper.html", "", "width=620,height=320");
-</script>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/test/test_plugin_mouse_coords.html firefox-85.0+build1/layout/generic/test/test_plugin_mouse_coords.html
--- firefox-84.0.2+build1/layout/generic/test/test_plugin_mouse_coords.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/test/test_plugin_mouse_coords.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test delivering mouse events to plugins</title>
-  <script src="/tests/SimpleTest/SimpleTest.js"></script>    
-  <script src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="plugin-utils.js"></script>
-  <script type="application/javascript">
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-  </script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <style>
-  embed { width:200px; height:200px; display:block; }
-  iframe { border:none; }
-  </style>
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: block">
-  <embed id="p1" type="application/x-test"
-         style="position:absolute; left:300px; top:10px;"></embed>
-  <iframe id="f1" style="position:absolute; left:0; top:250px;"
-          srcdoc="&lt;embed id='p2' type='application/x-test' style='position:absolute; left:10px; top:10px'&gt;"></iframe>
-  <embed id="p3" type="application/x-test"
-         style="position:absolute; left:320px; top:250px;
-                outline:5px solid blue;
-                border:solid black; border-width:4px 8px 4px 8px;
-                padding:3px 1px;"></embed>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-function doTest() {
-  var p1 = document.getElementById("p1");
-  synthesizeMouse(p1, 15, 18, { type:"mousedown" });
-  is(p1.getLastMouseX(), 15, "p1 mouse down X");
-  is(p1.getLastMouseY(), 18, "p1 mouse down Y");
-  synthesizeMouse(p1, 15, 38, { type:"mousemove" });
-  is(p1.getLastMouseX(), 15, "p1 mouse move X");
-  is(p1.getLastMouseY(), 38, "p1 mouse move Y");
-  synthesizeMouse(p1, 15, 28, { type:"mouseup" });
-  is(p1.getLastMouseX(), 15, "p1 mouse up X");
-  is(p1.getLastMouseY(), 28, "p1 mouse up Y");
-
-  var f1 = document.getElementById("f1");
-  var p2 = f1.contentDocument.getElementById("p2");
-  synthesizeMouse(p2, 15, 18, { type:"mousedown" }, f1.contentWindow);
-  is(p2.getLastMouseX(), 15, "p2 mouse down X");
-  is(p2.getLastMouseY(), 18, "p2 mouse down Y");
-  synthesizeMouse(p2, 15, 38, { type:"mousemove" }, f1.contentWindow);
-  is(p2.getLastMouseX(), 15, "p2 mouse move X");
-  is(p2.getLastMouseY(), 38, "p2 mouse move Y");
-  synthesizeMouse(p2, 15, 28, { type:"mouseup" }, f1.contentWindow);
-  is(p2.getLastMouseX(), 15, "p2 mouse up X");
-  is(p2.getLastMouseY(), 28, "p2 mouse up Y");
-
-  var p3 = document.getElementById("p3");
-  // The synthesized coordinates are relative to the border-box, but the plugin
-  // is at offset (9,7) relative to the border-box
-  synthesizeMouse(p3, 15, 18, { type:"mousedown" });
-  is(p3.getLastMouseX(), 6, "p3 mouse down X");
-  is(p3.getLastMouseY(), 11, "p3 mouse down Y");
-  synthesizeMouse(p3, 15, 38, { type:"mousemove" });
-  is(p3.getLastMouseX(), 6, "p3 mouse move X");
-  is(p3.getLastMouseY(), 31, "p3 mouse move Y");
-  synthesizeMouse(p3, 15, 28, { type:"mouseup" });
-  is(p3.getLastMouseX(), 6, "p3 mouse up X");
-  is(p3.getLastMouseY(), 21, "p3 mouse up Y");
-
-  SimpleTest.finish();
-}
-// Need to run 'doTest' after painting is unsuppressed, or we'll set clip
-// regions to empty.
-addLoadEvent(function() { setTimeout(doTest, 1000); } );
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-
-</script>
-</pre>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/generic/ViewportFrame.cpp firefox-85.0+build1/layout/generic/ViewportFrame.cpp
--- firefox-84.0.2+build1/layout/generic/ViewportFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ViewportFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -182,13 +182,11 @@
       }
       if (nsIFrame* backdropPh =
               frame->GetChildList(kBackdropList).FirstChild()) {
-        MOZ_ASSERT(backdropPh->IsPlaceholderFrame());
         MOZ_ASSERT(!backdropPh->GetNextSibling(), "more than one ::backdrop?");
         MOZ_ASSERT(backdropPh->HasAnyStateBits(NS_FRAME_FIRST_REFLOW),
                    "did you intend to reflow ::backdrop placeholders?");
         nsIFrame* backdropFrame =
-            static_cast<nsPlaceholderFrame*>(backdropPh)->GetOutOfFlowFrame();
-        MOZ_ASSERT(backdropFrame);
+            nsPlaceholderFrame::GetRealFrameForPlaceholder(backdropPh);
         BuildDisplayListForTopLayerFrame(aBuilder, backdropFrame, aList);
 
         if (aIsOpaque) {
diff -Nru firefox-84.0.2+build1/layout/generic/ViewportFrame.h firefox-85.0+build1/layout/generic/ViewportFrame.h
--- firefox-84.0.2+build1/layout/generic/ViewportFrame.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/ViewportFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -61,7 +61,7 @@
                       const ReflowInput& aReflowInput,
                       nsReflowStatus& aStatus) override;
 
-  bool ComputeCustomOverflow(nsOverflowAreas&) override { return false; }
+  bool ComputeCustomOverflow(mozilla::OverflowAreas&) override { return false; }
 
   /**
    * Adjust aReflowInput to account for scrollbars and pres shell
diff -Nru firefox-84.0.2+build1/layout/generic/WritingModes.h firefox-85.0+build1/layout/generic/WritingModes.h
--- firefox-84.0.2+build1/layout/generic/WritingModes.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/generic/WritingModes.h	2021-01-18 19:58:16.000000000 +0000
@@ -613,16 +613,19 @@
 };
 
 inline std::ostream& operator<<(std::ostream& aStream, const WritingMode& aWM) {
-  return aStream
-         << (aWM.IsVertical()
-                 ? aWM.IsVerticalLR()
-                       ? aWM.IsBidiLTR()
-                             ? aWM.IsSideways() ? "sw-lr-ltr" : "v-lr-ltr"
-                             : aWM.IsSideways() ? "sw-lr-rtl" : "v-lr-rtl"
-                       : aWM.IsBidiLTR()
-                             ? aWM.IsSideways() ? "sw-rl-ltr" : "v-rl-ltr"
-                             : aWM.IsSideways() ? "sw-rl-rtl" : "v-rl-rtl"
-                 : aWM.IsBidiLTR() ? "h-ltr" : "h-rtl");
+  return aStream << (aWM.IsVertical()
+                         ? aWM.IsVerticalLR() ? aWM.IsBidiLTR()
+                                                    ? aWM.IsSideways()
+                                                          ? "sw-lr-ltr"
+                                                          : "v-lr-ltr"
+                                                : aWM.IsSideways() ? "sw-lr-rtl"
+                                                                   : "v-lr-rtl"
+                           : aWM.IsBidiLTR()
+                               ? aWM.IsSideways() ? "sw-rl-ltr" : "v-rl-ltr"
+                           : aWM.IsSideways() ? "sw-rl-rtl"
+                                              : "v-rl-rtl"
+                     : aWM.IsBidiLTR() ? "h-ltr"
+                                       : "h-rtl");
 }
 
 /**
diff -Nru firefox-84.0.2+build1/layout/inspector/InspectorUtils.cpp firefox-85.0+build1/layout/inspector/InspectorUtils.cpp
--- firefox-84.0.2+build1/layout/inspector/InspectorUtils.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/inspector/InspectorUtils.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -769,7 +769,7 @@
 
       if (FrameHasSpecifiedSize(child) &&
           IsFrameOutsideOfAncestor(child, aAncestorFrame, aRect)) {
-        aList.AppendElement(child->GetContent());
+        aList.MaybeAppendElement(child->GetContent());
         continue;
       }
 
@@ -780,7 +780,7 @@
       // calling AddOverflowingChildrenOfElement on it.
       if (currListLength == aList.Length() &&
           IsFrameOutsideOfAncestor(child, aAncestorFrame, aRect)) {
-        aList.AppendElement(child->GetContent());
+        aList.MaybeAppendElement(child->GetContent());
       }
     }
   }
diff -Nru firefox-84.0.2+build1/layout/inspector/tests/test_bug877690.html firefox-85.0+build1/layout/inspector/tests/test_bug877690.html
--- firefox-84.0.2+build1/layout/inspector/tests/test_bug877690.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/inspector/tests/test_bug877690.html	2021-01-18 19:58:16.000000000 +0000
@@ -47,12 +47,10 @@
     "-webkit-repeating-radial-gradient",
     "-moz-repeating-radial-gradient",
     "-webkit-gradient",
+    "conic-gradient",
+    "repeating-conic-gradient",
   ];
 
-  if (SpecialPowers.getBoolPref("layout.css.conic-gradient.enabled")) {
-    allGradients.push("conic-gradient", "repeating-conic-gradient");
-  }
-
   // test a property with keywords and colors
   var prop = "color";
   var values = InspectorUtils.getCSSValuesForProperty(prop);
diff -Nru firefox-84.0.2+build1/layout/mathml/crashtests/1373767-1.html firefox-85.0+build1/layout/mathml/crashtests/1373767-1.html
--- firefox-84.0.2+build1/layout/mathml/crashtests/1373767-1.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/crashtests/1373767-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -10,7 +10,7 @@
   transform: translateZ(0px);
 }
 body {
-  display: -moz-grid;
+  display: -moz-box;
 }
 </style>
 </head>
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLChar.cpp firefox-85.0+build1/layout/mathml/nsMathMLChar.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLChar.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLChar.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -9,6 +9,7 @@
 #include "gfxContext.h"
 #include "gfxTextRun.h"
 #include "gfxUtils.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/ComputedStyle.h"
 #include "mozilla/MathAlgorithms.h"
@@ -1533,7 +1534,8 @@
               u"https://developer.mozilla.org/docs/Mozilla/"
               "MathML_Project/Fonts"_ns};
           aForFrame->PresContext()->Document()->WarnOnceAbout(
-              dom::Document::eMathML_DeprecatedStixgeneralOperatorStretching,
+              dom::DeprecatedOperations::
+                  eMathML_DeprecatedStixgeneralOperatorStretching,
               false, params);
         }
         break;
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLContainerFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLContainerFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLContainerFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLContainerFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -749,7 +749,7 @@
 }
 
 bool nsMathMLContainerFrame::ComputeCustomOverflow(
-    nsOverflowAreas& aOverflowAreas) {
+    OverflowAreas& aOverflowAreas) {
   // All non-child-frame content such as nsMathMLChars (and most child-frame
   // content) is included in mBoundingMetrics.
   nsRect boundingBox(
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLContainerFrame.h firefox-85.0+build1/layout/mathml/nsMathMLContainerFrame.h
--- firefox-84.0.2+build1/layout/mathml/nsMathMLContainerFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLContainerFrame.h	2021-01-18 19:58:16.000000000 +0000
@@ -109,7 +109,7 @@
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
   virtual void MarkIntrinsicISizesDirty() override;
 
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -9,6 +9,7 @@
 #include "gfxContext.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
+#include "nsCSSValue.h"
 #include "nsLayoutUtils.h"
 #include "nsNameSpaceManager.h"
 #include "nsMathMLChar.h"
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmencloseFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmencloseFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmencloseFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmencloseFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -108,7 +108,7 @@
   } else if (aNotation.EqualsLiteral("radical")) {
     if (!StaticPrefs::mathml_deprecated_menclose_notation_radical_disabled()) {
       mContent->OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedMencloseNotationRadical);
+          dom::DeprecatedOperations::eMathML_DeprecatedMencloseNotationRadical);
       rv = AllocateMathMLChar(NOTATION_RADICAL);
       NS_ENSURE_SUCCESS(rv, rv);
       mNotationsToDraw += NOTATION_RADICAL;
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmfracFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmfracFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmfracFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmfracFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -141,7 +141,7 @@
       }
       if (isDeprecatedLineThicknessValue) {
         mContent->OwnerDoc()->WarnOnceAbout(
-            dom::Document::eMathML_DeprecatedLineThicknessValue);
+            dom::DeprecatedOperations::eMathML_DeprecatedLineThicknessValue);
       }
     }
   }
@@ -259,7 +259,7 @@
     if (mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::bevelled_,
                                        value)) {
       mContent->OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedBevelledAttribute);
+          dom::DeprecatedOperations::eMathML_DeprecatedBevelledAttribute);
       mIsBevelled = value.EqualsLiteral("true");
     }
   }
@@ -405,7 +405,7 @@
       if (mContent->AsElement()->GetAttr(kNameSpaceID_None,
                                          nsGkAtoms::numalign_, value)) {
         mContent->OwnerDoc()->WarnOnceAbout(
-            dom::Document::eMathML_DeprecatedAlignmentAttributes);
+            dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes);
         if (value.EqualsLiteral("left")) {
           dxNum = leftSpace;
         } else if (value.EqualsLiteral("right")) {
@@ -417,7 +417,7 @@
       if (mContent->AsElement()->GetAttr(kNameSpaceID_None,
                                          nsGkAtoms::denomalign_, value)) {
         mContent->OwnerDoc()->WarnOnceAbout(
-            dom::Document::eMathML_DeprecatedAlignmentAttributes);
+            dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes);
         if (value.EqualsLiteral("left")) {
           dxDen = leftSpace;
         } else if (value.EqualsLiteral("right")) {
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmmultiscriptsFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmmultiscriptsFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmmultiscriptsFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmmultiscriptsFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -113,7 +113,7 @@
         mContent->AsElement()->GetAttr(kNameSpaceID_None,
                                        nsGkAtoms::subscriptshift_, value)) {
       mContent->OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedScriptShiftAttributes);
+          dom::DeprecatedOperations::eMathML_DeprecatedScriptShiftAttributes);
       ParseNumericValue(value, &subScriptShift, 0, PresContext(),
                         mComputedStyle, fontSizeInflation);
     }
@@ -132,7 +132,7 @@
         mContent->AsElement()->GetAttr(kNameSpaceID_None,
                                        nsGkAtoms::superscriptshift_, value)) {
       mContent->OwnerDoc()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedScriptShiftAttributes);
+          dom::DeprecatedOperations::eMathML_DeprecatedScriptShiftAttributes);
       ParseNumericValue(value, &supScriptShift, 0, PresContext(),
                         mComputedStyle, fontSizeInflation);
     }
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmoFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmoFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmoFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmoFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "gfxContext.h"
 #include "mozilla/PresShell.h"
+#include "nsCSSValue.h"
 #include "nsMathMLmoFrame.h"
 #include "nsPresContext.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmtableFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmtableFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmtableFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmtableFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsCSSRendering.h"
 #include "mozilla/dom/MathMLElement.h"
 
+#include "nsCRT.h"
 #include "nsTArray.h"
 #include "nsTableFrame.h"
 #include "celldata.h"
diff -Nru firefox-84.0.2+build1/layout/mathml/nsMathMLmunderoverFrame.cpp firefox-85.0+build1/layout/mathml/nsMathMLmunderoverFrame.cpp
--- firefox-84.0.2+build1/layout/mathml/nsMathMLmunderoverFrame.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/mathml/nsMathMLmunderoverFrame.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -584,7 +584,7 @@
       mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::align,
                                      valueAlign)) {
     mContent->OwnerDoc()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedAlignmentAttributes);
+        dom::DeprecatedOperations::eMathML_DeprecatedAlignmentAttributes);
     if (valueAlign.EqualsLiteral("left")) {
       alignPosition = left;
     } else if (valueAlign.EqualsLiteral("right")) {
diff -Nru firefox-84.0.2+build1/layout/painting/ActiveLayerTracker.cpp firefox-85.0+build1/layout/painting/ActiveLayerTracker.cpp
--- firefox-84.0.2+build1/layout/painting/ActiveLayerTracker.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/ActiveLayerTracker.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -294,7 +294,7 @@
     return;
   }
 
-  Size scale = transform2D.ScaleFactors(true);
+  Size scale = transform2D.ScaleFactors();
   if (aActivity->mPreviousTransformScale == Some(scale)) {
     return;  // Nothing changed.
   }
diff -Nru firefox-84.0.2+build1/layout/painting/FrameLayerBuilder.cpp firefox-85.0+build1/layout/painting/FrameLayerBuilder.cpp
--- firefox-84.0.2+build1/layout/painting/FrameLayerBuilder.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/painting/FrameLayerBuilder.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -21,6 +21,7 @@
 #include "Layers.h"
 #include "MaskLayerImageCache.h"
 #include "MatrixStack.h"
+#include "TransformClipNode.h"
 #include "UnitTransforms.h"
 #include "Units.h"
 #include "gfx2DGlue.h"
@@ -129,6 +130,47 @@
   return gMaskLayerImageCache;
 }
 
+struct InactiveLayerData {
+  RefPtr<layers::BasicLayerManager> mLayerManager;
+  RefPtr<layers::Layer> mLayer;
+  UniquePtr<layers::LayerProperties> mProps;
+
+  ~InactiveLayerData();
+};
+
+struct AssignedDisplayItem {
+  AssignedDisplayItem(nsPaintedDisplayItem* aItem, LayerState aLayerState,
+                      DisplayItemData* aData, const nsRect& aContentRect,
+                      DisplayItemEntryType aType, const bool aHasOpacity,
+                      const RefPtr<TransformClipNode>& aTransform,
+                      const bool aIsMerged);
+  AssignedDisplayItem(AssignedDisplayItem&& aRhs) = default;
+
+  bool HasOpacity() const { return mHasOpacity; }
+
+  bool HasTransform() const { return mTransform; }
+
+  nsPaintedDisplayItem* mItem;
+  DisplayItemData* mDisplayItemData;
+
+  /**
+   * If the display item is being rendered as an inactive
+   * layer, then this stores the layer manager being
+   * used for the inactive transaction.
+   */
+  UniquePtr<InactiveLayerData> mInactiveLayerData;
+  RefPtr<TransformClipNode> mTransform;
+
+  nsRect mContentRect;
+  LayerState mLayerState;
+  DisplayItemEntryType mType;
+
+  bool mReused;
+  bool mMerged;
+  bool mHasOpacity;
+  bool mHasPaintRect;
+};
+
 struct DisplayItemEntry {
   DisplayItemEntry(nsDisplayItem* aItem, DisplayItemEntryType aType)
       : mItem(aItem), mType(aType) {}
@@ -246,6 +288,19 @@
   }
 }
 
+void DisplayItemData::Destroy() {
+  // Get the pres context.
+  RefPtr<nsPresContext> presContext = mFrameList[0]->PresContext();
+
+  // Call our destructor.
+  this->~DisplayItemData();
+
+  // Don't let the memory be freed, since it will be recycled
+  // instead. Don't call the global operator delete.
+  presContext->PresShell()->FreeByObjectID(eArenaObjectID_DisplayItemData,
+                                           this);
+}
+
 void DisplayItemData::AddFrame(nsIFrame* aFrame) {
   MOZ_RELEASE_ASSERT(mLayer);
   MOZ_RELEASE_ASSERT(!mFrameList.Contains(aFrame));
@@ -443,6 +498,12 @@
   return aData;
 }
 
+void* DisplayItemData::operator new(size_t sz, nsPresContext* aPresContext) {
+  // Check the recycle list first.
+  return aPresContext->PresShell()->AllocateByObjectID(
+      eArenaObjectID_DisplayItemData, sz);
+}
+
 /**
  * This is the userdata we associate with a layer manager.
  */
@@ -4978,12 +5039,25 @@
       NS_ASSERTION(FindIndexOfLayerIn(mNewChildLayers, ownLayer) < 0,
                    "Layer already in list???");
 
+      // NewLayerEntry::mClipChain is used by SetupScrollingMetadata() to
+      // populate any scroll clips in the scroll metadata. Perspective layers
+      // have their ASR adjusted such that a scroll metadata that would normally
+      // go on the perspective layer goes on its transform layer child instead.
+      // However, the transform item's clip chain does not contain the
+      // corresponding scroll clip, so we use the perspective item's clip
+      // chain instead.
+      const DisplayItemClipChain* clipChainForScrollClips = layerClipChain;
+      if (itemType == DisplayItemType::TYPE_TRANSFORM && mContainerItem &&
+          mContainerItem->GetType() == DisplayItemType::TYPE_PERSPECTIVE) {
+        clipChainForScrollClips = mContainerItem->GetClipChain();
+      }
+
       NewLayerEntry* newLayerEntry = mNewChildLayers.AppendElement();
       newLayerEntry->mLayer = ownLayer;
       newLayerEntry->mAnimatedGeometryRoot = itemAGR;
       newLayerEntry->mASR = itemASR;
       newLayerEntry->mScrollMetadataASR = scrollMetadataASR;
-      newLayerEntry->mClipChain = layerClipChain;
+      newLayerEntry->mClipChain = clipChainForScrollClips;
       newLayerEntry->mLayerState = layerState;
       if (itemType == DisplayItemType::TYPE_FIXED_POSITION) {
         newLayerEntry->mIsFixedToRootScrollFrame =
@@ -5044,8 +5118,8 @@
         nsDisplayScrollInfoLayer* scrollItem =
             static_cast<nsDisplayScrollInfoLayer*>(item);
         newLayerEntry->mOpaqueForAnimatedGeometryRootParent = false;
-        newLayerEntry->mBaseScrollMetadata =
-            scrollItem->ComputeScrollMetadata(ownLayer->Manager(), mParameters);
+        newLayerEntry->mBaseScrollMetadata = scrollItem->ComputeScrollMetadata(
+            mBuilder, ownLayer->Manager(), mParameters);
       }
 
       /**
@@ -6048,7 +6122,7 @@
     } else {
       // Scale factors are normalized to a power of 2 to reduce the number of
       // resolution changes
-      scale = aTransform2d.ScaleFactors(true);
+      scale = aTransform2d.ScaleFactors();
       // For frames with a changing scale transform round scale factors up to
       // nearest power-of-2 boundary so that we don't keep having to redraw
       // the content as it scales up and down. Rounding up to nearest
@@ -6506,7 +6580,7 @@
 
   Matrix transform2d;
   if (transform.CanDraw2D(&transform2d)) {
-    return ThebesMatrix(transform2d).ScaleFactors(true);
+    return ThebesMatrix(transform2d).ScaleFactors();
   }
 
   return gfxSize(1.0, 1.0);
diff -Nru firefox-84.0.2+build1/layout/painting/FrameLayerBuilder.h firefox-85.0+build1/layout/painting/FrameLayerBuilder.h
--- firefox-84.0.2+build1/layout/painting/FrameLayerBuilder.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/FrameLayerBuilder.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,36 +7,57 @@
 #ifndef FRAMELAYERBUILDER_H_
 #define FRAMELAYERBUILDER_H_
 
-#include "nsCSSPropertyIDSet.h"
-#include "nsTHashtable.h"
-#include "nsHashKeys.h"
-#include "nsTArray.h"
-#include "nsRegion.h"
-#include "nsIFrame.h"
-#include "DisplayItemClip.h"
-#include "mozilla/gfx/MatrixFwd.h"
-#include "mozilla/layers/LayersTypes.h"
-#include "mozilla/UniquePtr.h"
-#include "LayerState.h"
-#include "Layers.h"
-#include "LayerUserData.h"
-#include "nsDisplayItemTypes.h"
-#include "TransformClipNode.h"
+#include <cstddef>  // for size_t
+#include <cstdint>  // for uint32_t, UINT32_MAX, int32_t, uint64_t, uint8_t
+#include <iosfwd>   // for stringstream
+#include <vector>   // for vector
+#include "DisplayItemClip.h"  // for DisplayItemClip
+#include "LayerState.h"       // for LayerState
+#include "LayerUserData.h"    // for LayerUserData
+#include "Units.h"            // for LayerIntPoint, LayoutDeviceToLayerScale2D
+#include "gfxPoint.h"         // for gfxSize
+#include "mozilla/AlreadyAddRefed.h"  // for already_AddRefed
+#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT_HELPER2
+#include "mozilla/FunctionRef.h"          // for FunctionRef
+#include "mozilla/RefPtr.h"               // for RefPtr
+#include "mozilla/UniquePtr.h"            // for UniquePtr
+#include "mozilla/gfx/Matrix.h"           // for Matrix, Matrix4x4
+#include "mozilla/gfx/Point.h"            // for Size
+#include "mozilla/layers/LayerManager.h"  // for LayerManager, LayerManager::NONE, LayerManager::PaintedLayerCreationHint, LayerMetricsW...
+#include "mozilla/layers/LayersTypes.h"   // for DrawRegionClip, EventRegions
+#include "nsColor.h"                      // for NS_RGBA, nscolor
+#include "nsDebug.h"                      // for NS_WARNING
+#include "nsDisplayItemTypes.h"           // for DisplayItemType
+#include "nsISupports.h"  // for NS_INLINE_DECL_REFCOUNTING, NS_LOG_ADDREF, NS_LOG_RELEASE
+#include "nsPoint.h"   // for nsIntPoint
+#include "nsRect.h"    // for nsRect (ptr only), nsIntRect
+#include "nsRegion.h"  // for nsIntRegion, nsRegion
+#include "nsTArray.h"  // for AutoTArray, nsTArray_Impl
+#include "nscore.h"    // for nsrefcnt
 
-class nsDisplayListBuilder;
-class nsDisplayList;
-class nsDisplayItem;
-class nsPaintedDisplayItem;
 class gfxContext;
+class nsDisplayItem;
 class nsDisplayItemGeometry;
+class nsDisplayList;
+class nsDisplayListBuilder;
 class nsDisplayMasksAndClipPaths;
+class nsIFrame;
+class nsPaintedDisplayItem;
+class nsPresContext;
+class nsRootPresContext;
 
 namespace mozilla {
 struct ActiveScrolledRoot;
 struct DisplayItemClipChain;
+class TransformClipNode;
+template <class T>
+class Maybe;
+template <typename T>
+class SmallPointerArray;
+
 namespace layers {
 class ContainerLayer;
-class LayerManager;
+class Layer;
 class BasicLayerManager;
 class PaintedLayer;
 class ImageLayer;
@@ -98,11 +119,7 @@
 
   static DisplayItemData* AssertDisplayItemData(DisplayItemData* aData);
 
-  void* operator new(size_t sz, nsPresContext* aPresContext) {
-    // Check the recycle list first.
-    return aPresContext->PresShell()->AllocateByObjectID(
-        eArenaObjectID_DisplayItemData, sz);
-  }
+  void* operator new(size_t sz, nsPresContext* aPresContext);
 
   nsrefcnt AddRef() {
     if (mRefCnt == UINT32_MAX) {
@@ -141,18 +158,7 @@
    */
   ~DisplayItemData();
 
-  void Destroy() {
-    // Get the pres context.
-    RefPtr<nsPresContext> presContext = mFrameList[0]->PresContext();
-
-    // Call our destructor.
-    this->~DisplayItemData();
-
-    // Don't let the memory be freed, since it will be recycled
-    // instead. Don't call the global operator delete.
-    presContext->PresShell()->FreeByObjectID(eArenaObjectID_DisplayItemData,
-                                             this);
-  }
+  void Destroy();
 
   /**
    * Associates this DisplayItemData with a frame, and adds it
@@ -227,46 +233,7 @@
   bool mIsInfinite;
 };
 
-struct InactiveLayerData {
-  RefPtr<layers::BasicLayerManager> mLayerManager;
-  RefPtr<layers::Layer> mLayer;
-  UniquePtr<layers::LayerProperties> mProps;
-
-  ~InactiveLayerData();
-};
-
-struct AssignedDisplayItem {
-  AssignedDisplayItem(nsPaintedDisplayItem* aItem, LayerState aLayerState,
-                      DisplayItemData* aData, const nsRect& aContentRect,
-                      DisplayItemEntryType aType, const bool aHasOpacity,
-                      const RefPtr<TransformClipNode>& aTransform,
-                      const bool aIsMerged);
-  AssignedDisplayItem(AssignedDisplayItem&& aRhs) = default;
-
-  bool HasOpacity() const { return mHasOpacity; }
-
-  bool HasTransform() const { return mTransform; }
-
-  nsPaintedDisplayItem* mItem;
-  DisplayItemData* mDisplayItemData;
-
-  /**
-   * If the display item is being rendered as an inactive
-   * layer, then this stores the layer manager being
-   * used for the inactive transaction.
-   */
-  UniquePtr<InactiveLayerData> mInactiveLayerData;
-  RefPtr<TransformClipNode> mTransform;
-
-  nsRect mContentRect;
-  LayerState mLayerState;
-  DisplayItemEntryType mType;
-
-  bool mReused;
-  bool mMerged;
-  bool mHasOpacity;
-  bool mHasPaintRect;
-};
+struct AssignedDisplayItem;
 
 struct ContainerLayerParameters {
   ContainerLayerParameters()
@@ -576,36 +543,6 @@
   static DisplayItemData* GetOldDataFor(nsDisplayItem* aItem);
 
   /**
-   * Return the layer that all display items of aFrame were assigned to in the
-   * last paint, or nullptr if there was no single layer assigned to all of the
-   * frame's display items (i.e. zero, or more than one).
-   * This function is for testing purposes and not performance sensitive.
-   */
-  template <class T>
-  static T* GetDebugSingleOldLayerForFrame(nsIFrame* aFrame) {
-    SmallPointerArray<DisplayItemData>& array = aFrame->DisplayItemData();
-
-    Layer* layer = nullptr;
-    for (DisplayItemData* data : array) {
-      DisplayItemData::AssertDisplayItemData(data);
-      if (data->mLayer->GetType() != T::Type()) {
-        continue;
-      }
-      if (layer && layer != data->mLayer) {
-        // More than one layer assigned, bail.
-        return nullptr;
-      }
-      layer = data->mLayer;
-    }
-
-    if (!layer) {
-      return nullptr;
-    }
-
-    return static_cast<T*>(layer);
-  }
-
-  /**
    * Destroy any stored LayerManagerDataProperty and the associated data for
    * aFrame.
    */
@@ -740,6 +677,10 @@
 
   void ComputeGeometryChangeForItem(DisplayItemData* aData);
 
+  // Defined and used only in dom/base/nsDOMWindowUtils.cpp
+  template <class T>
+  static T* GetDebugSingleOldLayerForFrame(nsIFrame* aFrame);
+
  protected:
   /**
    * The layer manager belonging to the widget that is being retained
diff -Nru firefox-84.0.2+build1/layout/painting/LayerState.h firefox-85.0+build1/layout/painting/LayerState.h
--- firefox-84.0.2+build1/layout/painting/LayerState.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/LayerState.h	2021-01-18 19:58:16.000000000 +0000
@@ -7,6 +7,8 @@
 #ifndef LAYERSTATE_H_
 #define LAYERSTATE_H_
 
+#include <cstdint>
+
 namespace mozilla {
 
 enum class LayerState : uint8_t {
diff -Nru firefox-84.0.2+build1/layout/painting/nsCSSRendering.cpp firefox-85.0+build1/layout/painting/nsCSSRendering.cpp
--- firefox-84.0.2+build1/layout/painting/nsCSSRendering.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/painting/nsCSSRendering.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -524,22 +524,23 @@
                                          const nsRect& aBorderArea) {
   // Inflate the block-axis size as if our continuations were laid out
   // adjacent in that axis.  Note that we don't touch the inline size.
-  nsRect borderArea = aBorderArea;
+  const auto wm = aFrame->GetWritingMode();
+  const nsSize dummyContainerSize;
+  LogicalRect borderArea(wm, aBorderArea, dummyContainerSize);
   nscoord bSize = 0;
-  auto wm = aFrame->GetWritingMode();
   nsIFrame* f = aFrame->GetNextContinuation();
   for (; f; f = f->GetNextContinuation()) {
     bSize += f->BSize(wm);
   }
-  (wm.IsVertical() ? borderArea.width : borderArea.height) += bSize;
+  borderArea.BSize(wm) += bSize;
   bSize = 0;
   f = aFrame->GetPrevContinuation();
   for (; f; f = f->GetPrevContinuation()) {
     bSize += f->BSize(wm);
   }
-  (wm.IsVertical() ? borderArea.x : borderArea.y) -= bSize;
-  (wm.IsVertical() ? borderArea.width : borderArea.height) += bSize;
-  return borderArea;
+  borderArea.BStart(wm) -= bSize;
+  borderArea.BSize(wm) += bSize;
+  return borderArea.GetPhysicalRect(wm, dummyContainerSize);
 }
 
 /**
@@ -1198,7 +1199,7 @@
 // We need to treat the viewport as canvas because, even though
 // it does not actually paint a background, we need to get the right
 // background style so we correctly detect transparent documents.
-bool nsCSSRendering::IsCanvasFrame(nsIFrame* aFrame) {
+bool nsCSSRendering::IsCanvasFrame(const nsIFrame* aFrame) {
   LayoutFrameType frameType = aFrame->Type();
   return frameType == LayoutFrameType::Canvas ||
          frameType == LayoutFrameType::XULRoot ||
@@ -1277,7 +1278,7 @@
   return FindBackgroundStyleFrame(aForFrame)->Style();
 }
 
-inline bool FindElementBackground(nsIFrame* aForFrame,
+inline bool FindElementBackground(const nsIFrame* aForFrame,
                                   nsIFrame* aRootElementFrame) {
   if (aForFrame == aRootElementFrame) {
     // We must have propagated our background to the viewport or canvas. Abort.
@@ -1315,7 +1316,7 @@
   return !htmlBG->IsTransparent(aRootElementFrame);
 }
 
-bool nsCSSRendering::FindBackgroundFrame(nsIFrame* aForFrame,
+bool nsCSSRendering::FindBackgroundFrame(const nsIFrame* aForFrame,
                                          nsIFrame** aBackgroundFrame) {
   nsIFrame* rootElementFrame =
       aForFrame->PresShell()->FrameConstructor()->GetRootElementStyleFrame();
@@ -1324,11 +1325,11 @@
     return true;
   }
 
-  *aBackgroundFrame = aForFrame;
+  *aBackgroundFrame = const_cast<nsIFrame*>(aForFrame);
   return FindElementBackground(aForFrame, rootElementFrame);
 }
 
-bool nsCSSRendering::FindBackground(nsIFrame* aForFrame,
+bool nsCSSRendering::FindBackground(const nsIFrame* aForFrame,
                                     ComputedStyle** aBackgroundSC) {
   nsIFrame* backgroundFrame = nullptr;
   if (FindBackgroundFrame(aForFrame, &backgroundFrame)) {
@@ -4864,7 +4865,7 @@
   // input data to the blur. This way, we don't have to scale the min
   // inset blur to the invert of the dest context, then rescale it back
   // when we draw to the destination surface.
-  gfx::Size scale = aDestinationCtx->CurrentMatrix().ScaleFactors(true);
+  gfx::Size scale = aDestinationCtx->CurrentMatrix().ScaleFactors();
   Matrix transform = aDestinationCtx->CurrentMatrix();
 
   // XXX: we could probably handle negative scales but for now it's easier just
diff -Nru firefox-84.0.2+build1/layout/painting/nsCSSRendering.h firefox-85.0+build1/layout/painting/nsCSSRendering.h
--- firefox-84.0.2+build1/layout/painting/nsCSSRendering.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/nsCSSRendering.h	2021-01-18 19:58:16.000000000 +0000
@@ -276,7 +276,7 @@
   /**
    * @return true if |aFrame| is a canvas frame, in the CSS sense.
    */
-  static bool IsCanvasFrame(nsIFrame* aFrame);
+  static bool IsCanvasFrame(const nsIFrame* aFrame);
 
   /**
    * Fill in an aBackgroundSC to be used to paint the background
@@ -284,9 +284,9 @@
    * backgrounds between BODY, the root element, and the canvas.
    * @return true if there is some meaningful background.
    */
-  static bool FindBackground(nsIFrame* aForFrame,
+  static bool FindBackground(const nsIFrame* aForFrame,
                              mozilla::ComputedStyle** aBackgroundSC);
-  static bool FindBackgroundFrame(nsIFrame* aForFrame,
+  static bool FindBackgroundFrame(const nsIFrame* aForFrame,
                                   nsIFrame** aBackgroundFrame);
 
   /**
@@ -308,7 +308,7 @@
    *   contains background style information for the canvas on return
    */
 
-  static nsIFrame* FindCanvasBackgroundFrame(nsIFrame* aForFrame,
+  static nsIFrame* FindCanvasBackgroundFrame(const nsIFrame* aForFrame,
                                              nsIFrame* aRootElementFrame) {
     MOZ_ASSERT(IsCanvasFrame(aForFrame), "not a canvas frame");
     if (aRootElementFrame) {
@@ -318,7 +318,7 @@
     // This should always give transparent, so we'll fill it in with the
     // default color if needed.  This seems to happen a bit while a page is
     // being loaded.
-    return aForFrame;
+    return const_cast<nsIFrame*>(aForFrame);
   }
 
   static mozilla::ComputedStyle* FindCanvasBackground(
diff -Nru firefox-84.0.2+build1/layout/painting/nsDisplayList.cpp firefox-85.0+build1/layout/painting/nsDisplayList.cpp
--- firefox-84.0.2+build1/layout/painting/nsDisplayList.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/nsDisplayList.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -476,6 +476,10 @@
   mUsed = true;
 }
 
+nsPresContext* nsDisplayListBuilder::CurrentPresContext() {
+  return CurrentPresShellState()->mPresShell->GetPresContext();
+}
+
 /* static */
 nsRect nsDisplayListBuilder::OutOfFlowDisplayData::ComputeVisibleRectForFrame(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
@@ -604,7 +608,6 @@
       mForceLayerForScrollParent(false),
       mAsyncPanZoomEnabled(nsLayoutUtils::AsyncPanZoomEnabled(aReferenceFrame)),
       mBuildingInvisibleItems(false),
-      mHitTestIsForVisibility(false),
       mIsBuilding(false),
       mInInvalidSubtree(false),
       mDisablePartialUpdates(false),
@@ -2806,9 +2809,37 @@
       }
 
       if (aBuilder->HitTestIsForVisibility()) {
-        if (aState->mHitFullyOpaqueItem ||
-            item->GetOpaqueRegion(aBuilder, &snap).Contains(aRect)) {
-          aState->mHitFullyOpaqueItem = true;
+        aState->mHitOccludingItem = [&] {
+          if (aState->mHitOccludingItem) {
+            // We already hit something before.
+            return true;
+          }
+          if (aState->mCurrentOpacity == 1.0f &&
+              item->GetOpaqueRegion(aBuilder, &snap).Contains(aRect)) {
+            // An opaque item always occludes everything. Note that we need to
+            // check wrapping opacity and such as well.
+            return true;
+          }
+          float threshold = aBuilder->VisibilityThreshold();
+          if (threshold == 1.0f) {
+            return false;
+          }
+          float itemOpacity = [&] {
+            switch (item->GetType()) {
+              case DisplayItemType::TYPE_OPACITY:
+                return static_cast<nsDisplayOpacity*>(item)->GetOpacity();
+              case DisplayItemType::TYPE_BACKGROUND_COLOR:
+                return static_cast<nsDisplayBackgroundColor*>(item)
+                    ->GetOpacity();
+              default:
+                // Be conservative and assume it won't occlude other items.
+                return 0.0f;
+            }
+          }();
+          return itemOpacity * aState->mCurrentOpacity >= threshold;
+        }();
+
+        if (aState->mHitOccludingItem) {
           // We're exiting early, so pop the remaining items off the buffer.
           aState->mItemBuffer.TruncateLength(itemBufferStart);
           break;
@@ -4523,6 +4554,14 @@
   return true;
 }
 
+#if defined(MOZ_REFLOW_PERF_DSP) && defined(MOZ_REFLOW_PERF)
+void nsDisplayReflowCount::Paint(nsDisplayListBuilder* aBuilder,
+                                 gfxContext* aCtx) {
+  mFrame->PresShell()->PaintCount(mFrameName, aCtx, mFrame->PresContext(),
+                                  mFrame, ToReferenceFrame(), mColor);
+}
+#endif
+
 void nsDisplayBackgroundColor::ApplyOpacity(nsDisplayListBuilder* aBuilder,
                                             float aOpacity,
                                             const DisplayItemClipChain* aClip) {
@@ -5765,6 +5804,9 @@
                                const nsRect& aRect,
                                nsDisplayItem::HitTestState* aState,
                                nsTArray<nsIFrame*>* aOutFrames) {
+  AutoRestore<float> opacity(aState->mCurrentOpacity);
+  aState->mCurrentOpacity *= mOpacity;
+
   // TODO(emilio): special-casing zero is a bit arbitrary... Maybe we should
   // only consider fully opaque items? Or make this configurable somehow?
   if (aBuilder->HitTestIsForVisibility() && mOpacity == 0.0f) {
@@ -7177,7 +7219,7 @@
 }
 
 UniquePtr<ScrollMetadata> nsDisplayScrollInfoLayer::ComputeScrollMetadata(
-    LayerManager* aLayerManager,
+    nsDisplayListBuilder* aBuilder, LayerManager* aLayerManager,
     const ContainerLayerParameters& aContainerParameters) {
   ScrollMetadata metadata = nsLayoutUtils::ComputeScrollMetadata(
       mScrolledFrame, mScrollFrame, mScrollFrame->GetContent(),
@@ -7186,7 +7228,7 @@
   metadata.GetMetrics().SetIsScrollInfoLayer(true);
   nsIScrollableFrame* scrollableFrame = mScrollFrame->GetScrollTargetFrame();
   if (scrollableFrame) {
-    scrollableFrame->NotifyApzTransaction();
+    aBuilder->AddScrollFrameToNotify(scrollableFrame);
   }
 
   return UniquePtr<ScrollMetadata>(new ScrollMetadata(metadata));
@@ -7196,8 +7238,8 @@
     mozilla::layers::WebRenderScrollData* aData,
     mozilla::layers::WebRenderLayerScrollData* aLayerData) {
   if (aLayerData) {
-    UniquePtr<ScrollMetadata> metadata =
-        ComputeScrollMetadata(aData->GetManager(), ContainerLayerParameters());
+    UniquePtr<ScrollMetadata> metadata = ComputeScrollMetadata(
+        aData->GetBuilder(), aData->GetManager(), ContainerLayerParameters());
     MOZ_ASSERT(aData);
     MOZ_ASSERT(metadata);
     aLayerData->AppendScrollMetadata(*aData, *metadata);
diff -Nru firefox-84.0.2+build1/layout/painting/nsDisplayList.h firefox-85.0+build1/layout/painting/nsDisplayList.h
--- firefox-84.0.2+build1/layout/painting/nsDisplayList.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/painting/nsDisplayList.h	2021-01-18 19:58:16.000000000 +0000
@@ -53,12 +53,17 @@
 #include "Units.h"
 
 #include <stdint.h>
+#include "nsClassHashtable.h"
 #include "nsTHashtable.h"
 
 #include <stdlib.h>
 #include <algorithm>
 #include <unordered_set>
 
+// XXX Includes that could be avoided by moving function implementations to the
+// cpp file.
+#include "gfxPlatform.h"
+
 class gfxContext;
 class nsIContent;
 class nsDisplayList;
@@ -531,7 +536,9 @@
   const nsIFrame* FindReferenceFrameFor(const nsIFrame* aFrame,
                                         nsPoint* aOffset = nullptr) const;
 
-  const Maybe<nsPoint>& AdditionalOffset() const { return mAdditionalOffset; }
+  const mozilla::Maybe<nsPoint>& AdditionalOffset() const {
+    return mAdditionalOffset;
+  }
 
   /**
    * @return the root of the display list's frame (sub)tree, whose origin
@@ -1577,9 +1584,7 @@
     return aFrame->GetParent()->GetProperty(OutOfFlowDisplayDataProperty());
   }
 
-  nsPresContext* CurrentPresContext() {
-    return CurrentPresShellState()->mPresShell->GetPresContext();
-  }
+  nsPresContext* CurrentPresContext();
 
   OutOfFlowDisplayData* GetCurrentFixedBackgroundDisplayData() {
     auto& displayData = CurrentPresShellState()->mFixedBackgroundDisplayData;
@@ -1764,10 +1769,15 @@
   AnimatedGeometryRoot* AnimatedGeometryRootForASR(
       const ActiveScrolledRoot* aASR);
 
-  bool HitTestIsForVisibility() const { return mHitTestIsForVisibility; }
+  bool HitTestIsForVisibility() const { return mVisibleThreshold.isSome(); }
 
-  void SetHitTestIsForVisibility(bool aHitTestIsForVisibility) {
-    mHitTestIsForVisibility = aHitTestIsForVisibility;
+  float VisibilityThreshold() const {
+    MOZ_DIAGNOSTIC_ASSERT(HitTestIsForVisibility());
+    return mVisibleThreshold.valueOr(1.0f);
+  }
+
+  void SetHitTestIsForVisibility(float aVisibleThreshold) {
+    mVisibleThreshold = mozilla::Some(aVisibleThreshold);
   }
 
   bool ShouldBuildAsyncZoomContainer() const {
@@ -2049,7 +2059,6 @@
   bool mForceLayerForScrollParent;
   bool mAsyncPanZoomEnabled;
   bool mBuildingInvisibleItems;
-  bool mHitTestIsForVisibility;
   bool mIsBuilding;
   bool mInInvalidSubtree;
   bool mBuildCompositorHitTestInfo;
@@ -2061,6 +2070,7 @@
   bool mIsRelativeToLayoutViewport;
   bool mUseOverlayScrollbars;
 
+  mozilla::Maybe<float> mVisibleThreshold;
   nsRect mHitTestArea;
   CompositorHitTestInfo mHitTestInfo;
 };
@@ -2559,12 +2569,39 @@
   nsDisplayItem() = delete;
   nsDisplayItem(const nsDisplayItem&) = delete;
 
-  virtual void RestoreState() {
+  /**
+   * Roll back side effects carried out by processing the display list.
+   *
+   * @return true if the rollback actually modified anything, to help the caller
+   * decide whether to invalidate cached information about this node.
+   */
+  virtual bool RestoreState() {
+    if (mClipChain == mState.mClipChain && mClip == mState.mClip &&
+        !mItemFlags.contains(ItemFlag::DisableSubpixelAA)) {
+      return false;
+    }
+
     mClipChain = mState.mClipChain;
     mClip = mState.mClip;
     mItemFlags -= ItemFlag::DisableSubpixelAA;
+    return true;
   }
 
+  /**
+   * Invalidate cached information that depends on this node's contents, after
+   * a mutation of those contents.
+   *
+   * Specifically, if you mutate an |nsDisplayItem| in a way that would change
+   * the WebRender display list items generated for it, you should call this
+   * method.
+   *
+   * If a |RestoreState| method exists to restore some piece of state, that's a
+   * good indication that modifications to said state should be accompanied by a
+   * call to this method. Opacity flattening's effects on
+   * |nsDisplayBackgroundColor| items are one example.
+   */
+  virtual void InvalidateItemCacheEntry() {}
+
   struct HitTestState {
     explicit HitTestState() = default;
 
@@ -2575,10 +2612,13 @@
 
     // Handling transform items for preserve 3D frames.
     bool mInPreserves3D = false;
-    // When hit-testing for visibility, we may hit a fully opaque item in a
+    // When hit-testing for visibility, we may hit an fully opaque item in a
     // nested display list. We want to stop at that point, without looking
     // further on other items.
-    bool mHitFullyOpaqueItem = false;
+    bool mHitOccludingItem = false;
+
+    float mCurrentOpacity = 1.0f;
+
     AutoTArray<nsDisplayItem*, 100> mItemBuffer;
   };
 
@@ -2744,8 +2784,8 @@
   }
 
   /**
-   * This function is called when an item's list of children has been omdified
-   * by RetaineDisplayListBuilder.
+   * This function is called when an item's list of children has been modified
+   * by RetainedDisplayListBuilder.
    */
   virtual void InvalidateCachedChildInfo(nsDisplayListBuilder* aBuilder) {}
 
@@ -3258,7 +3298,14 @@
    * If an item is reused and has the cache index set, it means that
    * |DisplayItemCache| has assigned a cache slot for the item.
    */
-  Maybe<uint16_t>& CacheIndex() { return mCacheIndex; }
+  mozilla::Maybe<uint16_t>& CacheIndex() { return mCacheIndex; }
+
+  void InvalidateItemCacheEntry() override {
+    // |nsPaintedDisplayItem|s may have |DisplayItemCache| entries
+    // that no longer match after a mutation. The cache will notice
+    // on its own that the entry is no longer in use, and free it.
+    mCacheIndex = mozilla::Nothing();
+  }
 
  protected:
   nsPaintedDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
@@ -4215,10 +4262,7 @@
 
   NS_DISPLAY_DECL_NAME("nsDisplayReflowCount", TYPE_REFLOW_COUNT)
 
-  void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override {
-    mFrame->PresShell()->PaintCount(mFrameName, aCtx, mFrame->PresContext(),
-                                    mFrame, ToReferenceFrame(), mColor);
-  }
+  void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
 
  protected:
   const char* mFrameName;
@@ -4921,9 +4965,13 @@
 
   NS_DISPLAY_DECL_NAME("BackgroundColor", TYPE_BACKGROUND_COLOR)
 
-  void RestoreState() override {
-    nsPaintedDisplayItem::RestoreState();
+  bool RestoreState() override {
+    if (!nsPaintedDisplayItem::RestoreState() && mColor == mState.mColor) {
+      return false;
+    }
+
     mColor = mState.mColor;
+    return true;
   }
 
   bool HasBackgroundClipText() const {
@@ -4957,6 +5005,8 @@
 
   bool CanApplyOpacity() const override;
 
+  float GetOpacity() const { return mColor.a; }
+
   nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) const override {
     *aSnap = true;
     return mBackgroundRect;
@@ -5084,10 +5134,15 @@
 
   NS_DISPLAY_DECL_NAME("BoxShadowOuter", TYPE_BOX_SHADOW_OUTER)
 
-  void RestoreState() override {
-    nsPaintedDisplayItem::RestoreState();
+  bool RestoreState() override {
+    if (!nsPaintedDisplayItem::RestoreState() && mOpacity == 1.0f &&
+        mVisibleRegion.IsEmpty()) {
+      return false;
+    }
+
     mVisibleRegion.SetEmpty();
     mOpacity = 1.0f;
+    return true;
   }
 
   void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
@@ -5142,9 +5197,13 @@
 
   NS_DISPLAY_DECL_NAME("BoxShadowInner", TYPE_BOX_SHADOW_INNER)
 
-  void RestoreState() override {
-    nsPaintedDisplayItem::RestoreState();
+  bool RestoreState() override {
+    if (!nsPaintedDisplayItem::RestoreState() && mVisibleRegion.IsEmpty()) {
+      return false;
+    }
+
     mVisibleRegion.SetEmpty();
+    return true;
   }
 
   void Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) override;
@@ -5607,9 +5666,13 @@
 
   NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
 
-  void RestoreState() override {
-    nsDisplayWrapList::RestoreState();
+  bool RestoreState() override {
+    if (!nsDisplayWrapList::RestoreState() && mOpacity == mState.mOpacity) {
+      return false;
+    }
+
     mOpacity = mState.mOpacity;
+    return true;
   }
 
   void InvalidateCachedChildInfo(nsDisplayListBuilder* aBuilder) override {
@@ -6308,7 +6371,7 @@
 
   void WriteDebugInfo(std::stringstream& aStream) override;
   mozilla::UniquePtr<ScrollMetadata> ComputeScrollMetadata(
-      LayerManager* aLayerManager,
+      nsDisplayListBuilder* aBuilder, LayerManager* aLayerManager,
       const ContainerLayerParameters& aContainerParameters);
   bool UpdateScrollData(
       mozilla::layers::WebRenderScrollData* aData,
@@ -6443,9 +6506,13 @@
   void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                HitTestState* aState, nsTArray<nsIFrame*>* aOutFrames) override;
 
-  void RestoreState() override {
-    nsDisplayWrapList::RestoreState();
+  bool RestoreState() override {
+    if (!nsDisplayWrapList::RestoreState() && !mHandleOpacity) {
+      return false;
+    }
+
     mHandleOpacity = false;
+    return true;
   }
 
   bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override {
@@ -6775,9 +6842,13 @@
 
   NS_DISPLAY_DECL_NAME("nsDisplayTransform", TYPE_TRANSFORM)
 
-  void RestoreState() override {
-    nsDisplayHitTestInfoBase::RestoreState();
+  bool RestoreState() override {
+    if (!nsDisplayHitTestInfoBase::RestoreState() && !mShouldFlatten) {
+      return false;
+    }
+
     mShouldFlatten = false;
+    return true;
   }
 
   void UpdateBounds(nsDisplayListBuilder* aBuilder) override;
@@ -6966,7 +7037,7 @@
         const mozilla::StyleTranslate& aTranslate,
         const mozilla::StyleRotate& aRotate, const mozilla::StyleScale& aScale,
         const mozilla::StyleTransform& aTransform,
-        const Maybe<mozilla::ResolvedMotionPathData>& aMotion,
+        const mozilla::Maybe<mozilla::ResolvedMotionPathData>& aMotion,
         const Point3D& aToTransformOrigin)
         : mFrame(nullptr),
           mTranslate(aTranslate),
@@ -7216,10 +7287,15 @@
 
   NS_DISPLAY_DECL_NAME("Text", TYPE_TEXT)
 
-  void RestoreState() final {
-    nsPaintedDisplayItem::RestoreState();
+  bool RestoreState() final {
+    if (!nsPaintedDisplayItem::RestoreState() && mIsFrameSelected.isNothing() &&
+        mOpacity == 1.0f) {
+      return false;
+    }
+
     mIsFrameSelected.reset();
     mOpacity = 1.0f;
+    return true;
   }
 
   nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) const final {
diff -Nru firefox-84.0.2+build1/layout/painting/RetainedDisplayListBuilder.cpp firefox-85.0+build1/layout/painting/RetainedDisplayListBuilder.cpp
--- firefox-84.0.2+build1/layout/painting/RetainedDisplayListBuilder.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/painting/RetainedDisplayListBuilder.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -283,7 +283,9 @@
     // TODO: This is here because we sometimes reuse the previous display list
     // completely. For optimization, we could only restore the state for reused
     // display items.
-    item->RestoreState();
+    if (item->RestoreState()) {
+      item->InvalidateItemCacheEntry();
+    }
 
     // If we're going to keep this linked list and not merge it, then mark the
     // item as used and put it back into the list.
diff -Nru firefox-84.0.2+build1/layout/printing/ipc/RemotePrintJobChild.cpp firefox-85.0+build1/layout/printing/ipc/RemotePrintJobChild.cpp
--- firefox-84.0.2+build1/layout/printing/ipc/RemotePrintJobChild.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/printing/ipc/RemotePrintJobChild.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "RemotePrintJobChild.h"
 
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
 #include "nsPagePrintTimer.h"
 #include "nsPrintJob.h"
diff -Nru firefox-84.0.2+build1/layout/printing/nsPagePrintTimer.cpp firefox-85.0+build1/layout/printing/nsPagePrintTimer.cpp
--- firefox-84.0.2+build1/layout/printing/nsPagePrintTimer.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/printing/nsPagePrintTimer.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsPagePrintTimer.h"
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/Unused.h"
 #include "nsPrintJob.h"
 
diff -Nru firefox-84.0.2+build1/layout/printing/nsPrintJob.cpp firefox-85.0+build1/layout/printing/nsPrintJob.cpp
--- firefox-84.0.2+build1/layout/printing/nsPrintJob.cpp	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/printing/nsPrintJob.cpp	2021-01-18 19:58:16.000000000 +0000
@@ -220,30 +220,6 @@
   return isFrameSet;
 }
 
-static std::tuple<nsPageSequenceFrame*, int32_t>
-GetSeqFrameAndCountSheetsInternal(const UniquePtr<nsPrintObject>& aPO) {
-  if (!aPO) {
-    return {nullptr, 0};
-  }
-
-  // This is sometimes incorrectly called before the pres shell has been created
-  // (bug 1141756). MOZ_DIAGNOSTIC_ASSERT so we'll still see the crash in
-  // Nightly/Aurora in case the other patch fixes this.
-  if (!aPO->mPresShell) {
-    MOZ_DIAGNOSTIC_ASSERT(
-        false, "GetSeqFrameAndCountSheets needs a non-null pres shell");
-    return {nullptr, 0};
-  }
-
-  nsPageSequenceFrame* seqFrame = aPO->mPresShell->GetPageSequenceFrame();
-  if (!seqFrame) {
-    return {nullptr, 0};
-  }
-
-  // count the total number of sheets
-  return {seqFrame, seqFrame->PrincipalChildList().GetLength()};
-}
-
 /**
  * Build a tree of nsPrintObjects under aPO. It also appends a (depth first)
  * flat list of all the nsPrintObjects created to aPrintData->mPrintDocList. If
@@ -435,13 +411,33 @@
 
 //-----------------------------------------------------------------
 std::tuple<nsPageSequenceFrame*, int32_t>
-nsPrintJob::GetSeqFrameAndCountSheets() {
-  MOZ_ASSERT(mPrtPreview);
-  // Guarantee that mPrintPreview->mPrintObject won't be deleted during a call
-  // of GetSeqFrameAndCountSheetsInternal().
-  RefPtr<nsPrintData> printDataForPrintPreview = mPrtPreview;
-  return GetSeqFrameAndCountSheetsInternal(
-      printDataForPrintPreview->mPrintObject);
+nsPrintJob::GetSeqFrameAndCountSheets() const {
+  nsPrintData* printData = mPrtPreview ? mPrtPreview : mPrt;
+  if (NS_WARN_IF(!printData)) {
+    return {nullptr, 0};
+  }
+
+  const nsPrintObject* po = printData->mPrintObject.get();
+  if (NS_WARN_IF(!po)) {
+    return {nullptr, 0};
+  }
+
+  // This is sometimes incorrectly called before the pres shell has been created
+  // (bug 1141756). MOZ_DIAGNOSTIC_ASSERT so we'll still see the crash in
+  // Nightly/Aurora in case the other patch fixes this.
+  if (!po->mPresShell) {
+    MOZ_DIAGNOSTIC_ASSERT(
+        false, "GetSeqFrameAndCountSheets needs a non-null pres shell");
+    return {nullptr, 0};
+  }
+
+  nsPageSequenceFrame* seqFrame = po->mPresShell->GetPageSequenceFrame();
+  if (!seqFrame) {
+    return {nullptr, 0};
+  }
+
+  // count the total number of sheets
+  return {seqFrame, seqFrame->PrincipalChildList().GetLength()};
 }
 //---------------------------------------------------------------------------------
 //-- Done: Methods needed by the DocViewer
@@ -866,39 +862,36 @@
   if (NS_FAILED(rv)) {
     if (mPrintPreviewCallback) {
       mPrintPreviewCallback(
-          PrintPreviewResultInfo(0, 0, false));  // signal error
+          PrintPreviewResultInfo(0, 0, false, false, false));  // signal error
       mPrintPreviewCallback = nullptr;
     }
   }
   return rv;
 }
 
-//----------------------------------------------------------------------------------
 int32_t nsPrintJob::GetRawNumPages() const {
-  RefPtr<nsPrintData> printData = mPrtPreview ? mPrtPreview : mPrt;
-  if (NS_WARN_IF(!printData)) {
-    return 0;
-  }
-  auto [seqFrame, numSheets] =
-      GetSeqFrameAndCountSheetsInternal(printData->mPrintObject);
-
+  auto [seqFrame, numSheets] = GetSeqFrameAndCountSheets();
   Unused << numSheets;
   return seqFrame ? seqFrame->GetRawNumPages() : 0;
 }
 
-//----------------------------------------------------------------------------------
-int32_t nsPrintJob::GetPrintPreviewNumSheets() {
-  RefPtr<nsPrintData> printData = mPrtPreview ? mPrtPreview : mPrt;
-  if (NS_WARN_IF(!printData)) {
-    return 0;
+bool nsPrintJob::GetIsEmpty() const {
+  auto [seqFrame, numSheets] = GetSeqFrameAndCountSheets();
+  if (!seqFrame) {
+    return true;
+  }
+  if (numSheets > 1) {
+    return false;
   }
-  auto [seqFrame, numSheets] =
-      GetSeqFrameAndCountSheetsInternal(printData->mPrintObject);
+  return !seqFrame->GetPagesInFirstSheet();
+}
+
+int32_t nsPrintJob::GetPrintPreviewNumSheets() const {
+  auto [seqFrame, numSheets] = GetSeqFrameAndCountSheets();
   Unused << seqFrame;
   return numSheets;
 }
 
-//----------------------------------------------------------------------------------
 already_AddRefed<nsIPrintSettings> nsPrintJob::GetCurrentPrintSettings() {
   if (mPrt) {
     return do_AddRef(mPrt->mPrintSettings);
@@ -1084,7 +1077,8 @@
 //---------------------------------------------------------------------
 void nsPrintJob::FirePrintingErrorEvent(nsresult aPrintError) {
   if (mPrintPreviewCallback) {
-    mPrintPreviewCallback(PrintPreviewResultInfo(0, 0, false));  // signal error
+    mPrintPreviewCallback(
+        PrintPreviewResultInfo(0, 0, false, false, false));  // signal error
     mPrintPreviewCallback = nullptr;
   }
 
@@ -2606,9 +2600,11 @@
   }
 
   if (mPrintPreviewCallback) {
+    const bool hasSelection =
+        !mDisallowSelectionPrint && printData->mSelectionRoot;
     mPrintPreviewCallback(PrintPreviewResultInfo(
-        GetPrintPreviewNumSheets(), GetRawNumPages(),
-        !mDisallowSelectionPrint && printData->mSelectionRoot));
+        GetPrintPreviewNumSheets(), GetRawNumPages(), GetIsEmpty(),
+        hasSelection, hasSelection && printData->mPrintObject->HasSelection()));
     mPrintPreviewCallback = nullptr;
   }
 
diff -Nru firefox-84.0.2+build1/layout/printing/nsPrintJob.h firefox-85.0+build1/layout/printing/nsPrintJob.h
--- firefox-84.0.2+build1/layout/printing/nsPrintJob.h	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/printing/nsPrintJob.h	2021-01-18 19:58:16.000000000 +0000
@@ -127,12 +127,14 @@
   bool HasEverPrinted() const { return mHasEverPrinted; }
   /// If the returned value is not greater than zero, an error occurred.
   int32_t GetRawNumPages() const;
+  // Returns whether the preview is empty due to page range exclusion.
+  bool GetIsEmpty() const;
 
   // Returns the total number of PrintedSheetFrames (i.e. faces of a sheet of
   // paper) for this print job. (This may be less than the raw number of pages,
   // due to pages having been skipped in a page range or combined into a single
   // sheet via pages-per-sheet.)
-  int32_t GetPrintPreviewNumSheets();
+  int32_t GetPrintPreviewNumSheets() const;
   already_AddRefed<nsIPrintSettings> GetCurrentPrintSettings();
 
   // The setters here also update the DocViewer
@@ -141,7 +143,7 @@
   void SetIsPrintPreview(bool aIsPrintPreview);
   bool GetIsCreatingPrintPreview() const { return mIsCreatingPrintPreview; }
 
-  std::tuple<nsPageSequenceFrame*, int32_t> GetSeqFrameAndCountSheets();
+  std::tuple<nsPageSequenceFrame*, int32_t> GetSeqFrameAndCountSheets() const;
 
   bool PrePrintSheet();
   bool PrintSheet(nsPrintObject* aPOect, bool& aInRange);
diff -Nru firefox-84.0.2+build1/layout/reftests/abs-pos/reftest.list firefox-85.0+build1/layout/reftests/abs-pos/reftest.list
--- firefox-84.0.2+build1/layout/reftests/abs-pos/reftest.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/abs-pos/reftest.list	2021-01-18 19:58:16.000000000 +0000
@@ -9,7 +9,8 @@
 == table-caption-2.html table-internal-2-ref.html
 == table-caption-3.html table-internal-3-ref.html
 == table-caption-4.html table-internal-8-ref.html
-!= table-caption-5.html table-print-1-ref.html # TODO: change to == when bug 967870 is fixed
+pref(layout.display-list.improve-fragmentation,false) != table-caption-5.html table-print-1-ref.html # TODO: change to == and remove pref when bug 967870 is fixed
+pref(layout.display-list.improve-fragmentation,true) == table-caption-5.html table-print-1-ref.html # TODO: remove when bug 967870 is fixed
 == table-cell-1.html table-internal-1-ref.html
 == table-cell-2.html table-internal-2-ref.html
 == table-cell-3.html table-internal-3-ref.html
@@ -17,7 +18,8 @@
 == table-cell-5.html table-internal-5-ref.html
 == table-cell-6.html table-internal-6-ref.html
 == table-cell-7.html table-internal-7-ref.html
-!= table-cell-8.html table-print-1-ref.html # TODO: change to == when bug 967870 is fixed
+pref(layout.display-list.improve-fragmentation,false) != table-cell-8.html table-print-1-ref.html # TODO: change to == and remove pref when bug 967870 is fixed
+pref(layout.display-list.improve-fragmentation,true) == table-cell-8.html table-print-1-ref.html # TODO: remove when bug 967870 is fixed
 == table-row-1.html table-internal-1-ref.html
 == table-row-2.html table-internal-2-ref.html
 == table-row-3.html table-internal-3-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/async-scrolling/reftest.list firefox-85.0+build1/layout/reftests/async-scrolling/reftest.list
--- firefox-84.0.2+build1/layout/reftests/async-scrolling/reftest.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/async-scrolling/reftest.list	2021-01-18 19:58:16.000000000 +0000
@@ -40,7 +40,7 @@
 fails-if(browserIsFission) skip-if(!asyncPan) == position-fixed-iframe-1.html position-fixed-iframe-1-ref.html
 fails-if(browserIsFission) skip-if(!asyncPan) == position-fixed-iframe-2.html position-fixed-iframe-2-ref.html
 fuzzy-if(skiaContent,0-1,0-11300) skip-if(!asyncPan) == position-fixed-in-scroll-container.html position-fixed-in-scroll-container-ref.html
-fuzzy-if(Android,0-1,0-800) skip-if(!asyncPan) == position-fixed-inside-clip-path.html position-fixed-inside-clip-path-ref.html
+fuzzy-if(Android,0-1,0-800) fuzzy-if(webrender,0-1,0-400) skip-if(!asyncPan) == position-fixed-inside-clip-path.html position-fixed-inside-clip-path-ref.html
 skip-if(!asyncPan) == position-fixed-inside-sticky-1.html position-fixed-inside-sticky-1-ref.html
 skip-if(!asyncPan) == position-fixed-inside-sticky-2.html position-fixed-inside-sticky-2-ref.html
 skip-if(!asyncPan) == position-fixed-inside-sticky-3.html position-fixed-inside-sticky-3-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/border-image/reftest.list firefox-85.0+build1/layout/reftests/border-image/reftest.list
--- firefox-84.0.2+build1/layout/reftests/border-image/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/border-image/reftest.list	2021-01-18 19:58:16.000000000 +0000
@@ -42,20 +42,20 @@
 == border-image-style-none-auto.html border-image-style-none-auto-ref.html
 
 # border images with gradients
-fuzzy-if(webrender&&!geckoview,1-3,784-1804) == border-image-linear-gradient.html border-image-linear-gradient-ref.html
+fuzzy-if(webrender&&!geckoview,1-3,554-1804) == border-image-linear-gradient.html border-image-linear-gradient-ref.html
 fuzzy(0-1,0-98) fuzzy-if(skiaContent,0-1,0-350) fuzzy-if(webrender&&!geckoview,1-3,1086-37537) == border-image-linear-gradient-slice-1.html border-image-linear-gradient-slice-1-ref.html
 fuzzy(0-1,0-515) fuzzy-if(OSX,0-1,0-10595) fuzzy-if(webrender&&!geckoview,1-3,272-25136) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2-ref.html
 fuzzy-if(skiaContent,0-1,0-2500) fuzzy-if(webrender&&!geckoview,1-3,2500-86037) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1-ref.html
 fuzzy(0-1,0-649) fuzzy-if(OSX,0-1,0-25771) fuzzy-if(skiaContent&&!Android,0-1,0-546) fuzzy-if(Android,0-1,0-6093) fuzzy-if(webrender&&!geckoview,1-3,480-57480) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
 fuzzy(0-1,0-134)  fuzzy-if(OSX,0-5,0-1676) fuzzy-if(webrender&&!geckoview,1-1,0-4537) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
 fuzzy(0-2,0-60590) fuzzy-if(Android,0-4,0-18022) fuzzy-if(OSX,0-1,0-15000) fuzzy-if(webrender&&!geckoview,1-2,14300-60581) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
-fuzzy(0-2,0-26758) fuzzy-if(OSX,0-1,0-6000) fuzzy-if(webrender&&!geckoview,1-3,3964-26758) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
+fuzzy(0-2,0-26758) fuzzy-if(OSX,0-1,0-6000) fuzzy-if(webrender&&!geckoview,1-3,3803-26758) == 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,1397-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,1400-27131) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1-ref.html
 fuzzy-if(Android,0-1,0-1894) fuzzy-if(webrender&&!geckoview,1-2,3163-67805) == border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2-ref.html
 fuzzy(0-1,0-2000) fuzzy-if(webrender&&!geckoview,1-2,3249-9500) == 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,3188-9500) == border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3-ref.html
-fuzzy(0-3,0-107563) fuzzy-if(webrender&&!geckoview,1-3,43500-107563) == border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3-ref.html
+fuzzy(0-1,0-8533) fuzzy-if(webrender&&!geckoview,1-3,2967-9500) == border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3-ref.html
+fuzzy(0-3,0-107563) fuzzy-if(webrender&&!geckoview,1-3,42909-107563) == 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
@@ -66,7 +66,7 @@
 fuzzy(0-1,0-9000) fuzzy-if(webrender,0-3,0-66698) == border-image-radial-gradient-slice-width.html border-image-radial-gradient-slice-width-ref.html
 
 # OS X failures tracked in bug 957025
-fuzzy-if(webrender&&!geckoview,1-4,940-2000) == border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient-ref.html
+fuzzy-if(webrender&&!geckoview,1-4,938-2000) == border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient-ref.html
 fuzzy(0-1,0-6690) fails-if(OSX) fuzzy-if(skiaContent,0-1,0-6093) fuzzy-if(webrender,0-3,0-95449) == border-image-repeating-linear-gradient-slice-fill-2.html border-image-repeating-linear-gradient-slice-fill-2-ref.html
 fuzzy(0-1,0-19200) fails-if(OSX) fuzzy-if(skiaContent,0-3,0-20000) fuzzy-if(webrender&&!geckoview,1-4,4150-14000) == border-image-repeating-linear-gradient-repeat-round-2.html border-image-repeating-linear-gradient-repeat-round-2-ref.html
 
diff -Nru firefox-84.0.2+build1/layout/reftests/box-shadow/reftest.list firefox-85.0+build1/layout/reftests/box-shadow/reftest.list
--- firefox-84.0.2+build1/layout/reftests/box-shadow/reftest.list	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/box-shadow/reftest.list	2021-01-18 19:58:16.000000000 +0000
@@ -15,7 +15,7 @@
 
 == 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
-fuzzy-if(skiaContent,0-1,0-17) random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
+fuzzy-if(skiaContent,0-1,0-18) random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
 fuzzy-if(skiaContent,0-1,0-17) == boxshadow-mixed-2.html boxshadow-mixed-2-ref.html
 random-if(d2d) fuzzy-if(skiaContent,0-1,0-212) fuzzy-if(webrender,0-127,0-3528) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
 fuzzy-if(skiaContent,0-1,0-50) == chrome://reftest/content/box-shadow/boxshadow-dynamic.xhtml chrome://reftest/content/box-shadow/boxshadow-dynamic-ref.xhtml
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409084-1a.html firefox-85.0+build1/layout/reftests/bugs/409084-1a.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409084-1a.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409084-1a.html	2021-01-18 19:58:16.000000000 +0000
@@ -2,7 +2,7 @@
 <head><style>
     td { vertical-align: top; }
     .tall {
-      height: 4in; /* just longer than a reftest-paged page. */
+      height: 2.1in; /* just longer than a reftest-paged page. */
       width:  1in;
       float:  left;
       border: 0px;
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409084-1b.html firefox-85.0+build1/layout/reftests/bugs/409084-1b.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409084-1b.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409084-1b.html	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 <head><style>
     td { vertical-align: top; }
     .tall {
-      height: 4in; /* just longer than a reftest-paged page. */
+      height: 2.1in; /* just longer than a reftest-paged page. */
       width:  1in;
       float:  left;
       border: 0px;
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-1.html firefox-85.0+build1/layout/reftests/bugs/409089-1.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-1.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-grid;" onload="document.body.firstChild.data = 'x';"> </body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-1-ref.html firefox-85.0+build1/layout/reftests/bugs/409089-1-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-1-ref.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-1-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-grid;">x</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-2.html firefox-85.0+build1/layout/reftests/bugs/409089-2.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-2.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-2.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-grid-group;" onload="document.body.firstChild.data = 'x';"> </body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-2-ref.html firefox-85.0+build1/layout/reftests/bugs/409089-2-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-2-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-2-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-grid-group;">x</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-3.html firefox-85.0+build1/layout/reftests/bugs/409089-3.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-3.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-3.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-box;" onload="document.body.firstChild.data = 'x';"> </body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/409089-3-ref.html firefox-85.0+build1/layout/reftests/bugs/409089-3-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/409089-3-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/409089-3-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<html>
-<head>
-</head>
-<body style="display: -moz-box;">x</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/467444-1.html firefox-85.0+build1/layout/reftests/bugs/467444-1.html
--- firefox-84.0.2+build1/layout/reftests/bugs/467444-1.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/467444-1.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" class="reftest-paged"><head>
 <style>
+@page { size:5in 3in; margin:0.5in; }
 div.spacer {
   height: 5px;
   width:  10px;
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8a.html firefox-85.0+build1/layout/reftests/bugs/563584-8a.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8a.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8a.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="float: left">
   <div><div style="display:inline-block; vertical-align: top; height: 3in; width: 1in; background: aqua"></div></div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8a-ref.html firefox-85.0+build1/layout/reftests/bugs/563584-8a-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8a-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8a-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -1,6 +1,8 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="height: 2in; width: 1in; background: aqua"></div>
-<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: yellow"></div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8b.html firefox-85.0+build1/layout/reftests/bugs/563584-8b.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8b.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8b.html	2021-01-18 19:58:17.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="float: left; height: 1in; width: 1in; background: fuchsia"></div>
 <div style="float: left">
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8b-ref.html firefox-85.0+build1/layout/reftests/bugs/563584-8b-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8b-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8b-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div>
   <div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: fuchsia"></div
   ><div style="display:inline-block; vertical-align: top; height: 2in; width: 1in; background: aqua"></div>
 </div>
 <div style="page-break-before:always">
-  <!-- FIXME: uncomment this when bug 511551 is fixed
-  <div style="display:inline-block; vertical-align: top; height: 1in; width: 1in"></div
-  >--><div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: yellow"></div>
+  <div style="display:inline-block; vertical-align: top; height: 1in; width: 1in"></div><div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: aqua"></div>
+ </div><div style="height: 1in; width: 1in; background: yellow"></div>
 </div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8c.html firefox-85.0+build1/layout/reftests/bugs/563584-8c.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8c.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8c.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="height: 1in"></div>
 <div style="float: left">
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8c-ref.html firefox-85.0+build1/layout/reftests/bugs/563584-8c-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8c-ref.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8c-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,7 +1,9 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="height: 2in"></div>
 <div style="height: 2in; width: 1in; background: aqua; page-break-before: always"></div>
-<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: yellow"></div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8d.html firefox-85.0+build1/layout/reftests/bugs/563584-8d.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8d.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8d.html	2021-01-18 19:58:17.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="height: 1in"></div>
 <div style="float: left; height: 1in; width: 1in; background: fuchsia"></div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/563584-8d-ref.html firefox-85.0+build1/layout/reftests/bugs/563584-8d-ref.html
--- firefox-84.0.2+build1/layout/reftests/bugs/563584-8d-ref.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/563584-8d-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,8 +1,10 @@
 <!DOCTYPE HTML>
 <html class="reftest-paged">
 <title>Test for setting and handling of mIsTopOfPage on floats</title>
+<style>@page { size:5in 3in; margin:0.5in; }</style>
 <body style="margin: 0">
 <div style="height: 1in"></div>
 <div style="height: 1in; width: 1in; background: fuchsia"></div>
 <div style="height: 2in; width: 1in; background: aqua; page-break-before: always"></div>
-<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
+<div style="height: 1in; width: 1in; background: yellow"></div>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/582037-2b.html firefox-85.0+build1/layout/reftests/bugs/582037-2b.html
--- firefox-84.0.2+build1/layout/reftests/bugs/582037-2b.html	2021-01-06 11:23:13.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/582037-2b.html	2021-01-18 19:58:16.000000000 +0000
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!-- This test assumes that the document is 2in tall by 4in wide. -->
-<html style="margin: 0; padding: 0; border: none; height: 100%; overflow: hidden"
+<style>@page { size:5in 3in; margin:0.5in; }</style>
+<html style="margin: 0; padding: 0; border: none; height: 100%"
       class="reftest-paged">
   <body style="margin: 0; padding: 0; border: none; height: 100%">
     <div style="float: left; height: 100%; background: green">
-      <img src="solidblue.png" style="height: 100%; visibility: hidden;">
+      <img src="solidblue.png" style="height: 100%; visibility: hidden; vertical-align:top;">
     </div>
   </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/bugs/reftest.list firefox-85.0+build1/layout/reftests/bugs/reftest.list
--- firefox-84.0.2+build1/layout/reftests/bugs/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/bugs/reftest.list	2021-01-18 19:58:16.000000000 +0000
@@ -272,7 +272,7 @@
 == 243519-5b.html 243519-5-ref.html
 == 243519-5c.html 243519-5-ref.html
 == 243519-5d.html 243519-5-ref.html
-asserts(12) == 243519-6.html 243519-6-ref.html # bug 1655630
+asserts(4) == 243519-6.html 243519-6-ref.html # bug 1655630
 == 243519-7.html 243519-7-ref.html
 == 243519-8.svg 243519-8-ref.svg
 == 243519-9a.html 243519-9-ref.html
@@ -317,7 +317,7 @@
 == 283686-2.html 283686-2-ref.html
 == 283686-3.html about:blank
 == 289384-1.xhtml 289384-ref.xhtml
-random-if(d2d) fuzzy(0-1,0-16) fuzzy-if(Android,0-8,0-1439) fuzzy-if(webrender,0-9,0-2040) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
+random-if(d2d) fuzzy(0-1,0-16) fuzzy-if(Android,0-8,0-1439) fuzzy-if(webrender,0-25,0-2040) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
 == 290129-1.html 290129-1-ref.html
 == 291078-1.html 291078-1-ref.html
 == 291078-2.html 291078-2-ref.html
@@ -919,9 +919,6 @@
 == 408782-2b.html 408782-2-ref.html
 == 409084-1a.html 409084-1-ref.html
 == 409084-1b.html 409084-1-ref.html
-== 409089-1.html 409089-1-ref.html
-== 409089-2.html 409089-2-ref.html
-== 409089-3.html 409089-3-ref.html
 fuzzy-if(winWidget,0-123,0-1600) fuzzy-if(webrender&&swgl,0-1,0-39) == 409659-1a.html 409659-1-ref.html  # Bug 1128229
 != 409659-1b.html 409659-1-ref.html
 != 409659-1c.html 409659-1-ref.html
@@ -998,7 +995,7 @@
 == 421436-1b.html 421436-1-ref.html
 fuzzy-if(skiaContent,0-1,0-40) == 421632-1.html 421632-1-ref.html
 != 421710-1.html about:blank
-fails-if(Android) fuzzy-if(webrender,63-64,1024-1024) fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == 421885-1.xml 421885-1-ref.xml
+fails-if(Android) fuzzy-if(webrender,63-65,1024-1024) fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == 421885-1.xml 421885-1-ref.xml
 == 421955-1.html 421955-1-ref.html
 == 422249-1.html 422249-1-ref.html
 == 422394-1.html 422394-1-ref.html
@@ -1178,7 +1175,7 @@
 fails-if(Android) == 455826-1.html 455826-1-ref.html
 fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xhtml 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-570) == 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-570) == 456219-1b.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-1251) == 456219-1b.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-497) fuzzy-if(geckoview&&webrender&&device,60-60,499-4421) == 456219-1c.html 456219-1-ref.html # bug 1128229
 fuzzy-if(skiaContent,0-1,0-45) fuzzy-if(webrender,8-10,8-8) == 456219-2.html 456219-2-ref.html
 == 456330-1.gif 456330-1-ref.png
@@ -1380,7 +1377,7 @@
 == 507762-3.html 507762-1-ref.html
 == 507762-4.html 507762-2-ref.html
 pref(layout.css.xul-box-display-values.content.enabled,true) == 508816-2.html 508816-2-ref.html
-skip-if(isDebugBuild) == chrome://reftest/content/bugs/508908-1.xhtml chrome://reftest/content/bugs/508908-1-ref.xhtml
+== chrome://reftest/content/bugs/508908-1.xhtml chrome://reftest/content/bugs/508908-1-ref.xhtml
 == 508919-1.xhtml 508919-1-ref.xhtml
 == 509155-1.xhtml 509155-1-ref.xhtml
 fuzzy-if(Android,0-5,0-1656) fuzzy-if(skiaContent,0-1,0-1200) == 512410.html 512410-ref.html
@@ -1494,10 +1491,10 @@
 # FIXME: It would be nice to have variants of these -8 tests for the
 # table narrowing quirk causing a change to mIsTopOfPage (though I'm not
 # entirely sure our behavior is the right one, either).
-fuzzy-if(Android,0-2,0-48) == 563584-8a.html 563584-8a-ref.html
-fuzzy-if(Android,0-2,0-48) == 563584-8b.html 563584-8b-ref.html
-fuzzy-if(Android,0-4,0-180) == 563584-8c.html 563584-8c-ref.html
-fuzzy-if(Android,0-4,0-180) == 563584-8d.html 563584-8d-ref.html
+pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-2,0-48) == 563584-8a.html 563584-8a-ref.html
+pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-2,0-48) == 563584-8b.html 563584-8b-ref.html
+pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-4,0-180) == 563584-8c.html 563584-8c-ref.html
+pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-4,0-180) == 563584-8d.html 563584-8d-ref.html
 == 563584-9a.html 563584-9a-ref.html
 == 563584-9b.html 563584-9b-ref.html
 == 563584-9c.html 563584-9cd-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/css-break/reftest.list firefox-85.0+build1/layout/reftests/css-break/reftest.list
--- firefox-84.0.2+build1/layout/reftests/css-break/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-break/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -9,4 +9,5 @@
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-bug-1235152.html box-decoration-break-bug-1235152-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-bug-1249913.html box-decoration-break-bug-1249913-ref.html # Bug 1392106
 == vertical-wm-001.html vertical-wm-001-ref.html
+== vertical-wm-002.html vertical-wm-002-ref.html
 random-if(Android) == 1405443.html 1405443-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-001.html firefox-85.0+build1/layout/reftests/css-break/vertical-wm-001.html
--- firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-001.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-break/vertical-wm-001.html	2021-01-18 19:58:16.000000000 +0000
@@ -13,30 +13,20 @@
 <style type="text/css">
 body,html { padding:30px; margin:0; }
 .col {
-  -webkit-columns: 2;
-          columns: 2;
-  -webkit-column-gap: 0;
-          column-gap: 0;
-  -webkit-column-fill: auto;
-          column-fill: auto;
+  columns: 2;
+  column-gap: 0;
+  column-fill: auto;
 
-  width: 90px;
-  height: 140px;
+  block-size: 90px;
+  inline-size: 140px;
   border:1px solid;
 }
 .vl { writing-mode: vertical-lr; }
 
-.c {
-  width: 90px;
-  height: 140px;
-  writing-mode: vertical-lr;
-  border:1px solid;
-}
-
 .inner {
-  border-left:25px solid blue;
-  border-right:17px solid grey;
-  height: 70px;
+  border-block-start: 25px solid blue;
+  border-block-end: 17px solid grey;
+  inline-size: 70px;
 }
 
 x {
@@ -44,47 +34,35 @@
   break-inside:avoid;
   page-break-inside:avoid;
   vertical-align: top;
-  width:20px; height:20px;
+  inline-size: 20px;
+  block-size: 20px;
   background:silver;
 }
 x:nth-of-type(2n) {background:purple;}
-
-.h {
-  width: 140px;
-  height: 90px;
-}
-.h x { display:block; }
-.h .inner {
-  border:none;
-  border-top:25px solid blue;
-  border-bottom:17px solid grey;
-  width: 70px;
-  height: auto;
-}
 </style>
 </head>
 <body>
 
 <div class="col vl">
-<div class="inner" style="margin-left:40px">
+<div class="inner" style="margin-block-start:40px">
 <x></x><x></x>
 </div>
 </div>
 
-<div class="col h">
-<div class="inner" style="margin-top:40px">
+<div class="col">
+<div class="inner" style="margin-block-start:40px">
 <x></x><x></x>
 </div>
 </div>
 
 <div class="col vl">
-<div class="inner" style="margin-left:40px; width:90px">
+<div class="inner" style="margin-block-start:40px; block-size:90px">
 <x></x><x></x>
 </div>
 </div>
 
 <div class="col vl">
-<div class="inner" style="margin-left:40px; width:100px">
+<div class="inner" style="margin-block-start:40px; block-size:100px">
 <x></x><x></x>
 </div>
 </div>
diff -Nru firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-001-ref.html firefox-85.0+build1/layout/reftests/css-break/vertical-wm-001-ref.html
--- firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-001-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-break/vertical-wm-001-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -10,45 +10,29 @@
 <style type="text/css">
 body,html { padding:30px; margin:0; }
 .col {
-  -webkit-columns: 2;
-          columns: 2;
-  -webkit-column-gap: 0;
-          column-gap: 0;
-  -webkit-column-fill: auto;
-          column-fill: auto;
+  columns: 2;
+  column-gap: 0;
+  column-fill: auto;
 
-  width: 90px;
-  height: 140px;
+  block-size: 90px;
+  inline-size: 140px;
   border:1px solid;
 }
 .vl { writing-mode: vertical-lr; }
 
-.c {
-  width: 90px;
-  height: 140px;
-  writing-mode: vertical-lr;
-  border:1px solid;
-}
-
 x {
   display:block;
   break-inside:avoid;
   page-break-inside:avoid;
   vertical-align: top;
-  width:20px; height:20px;
+  inline-size: 20px;
+  block-size: 20px;
   background:silver;
 }
 x:nth-of-type(2n) {background:purple;}
 
-.h {
-  width: 140px;
-  height: 90px;
-}
-.h x { display:block; }
-blue { display:block; height: 70px; border-left:25px solid blue; }
-grey { display:block; height: 70px; border-left:17px solid grey; }
-.h blue { display:block; height: auto; border-top:25px solid blue; }
-.h grey { display:block; height: auto; border-top:17px solid grey; }
+blue { display:block; inline-size: 70px; border-block-start: 25px solid blue; }
+grey { display:block; inline-size: 70px; border-block-start: 17px solid grey; }
 </style>
 </head>
 <body>
@@ -60,7 +44,7 @@
 <grey></grey>
 </div>
 
-<div class="col h">
+<div class="col">
 <div class="inner" style="margin-top:40px"></div>
 <blue></blue>
 <x></x><x></x>
diff -Nru firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-002.html firefox-85.0+build1/layout/reftests/css-break/vertical-wm-002.html
--- firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-break/vertical-wm-002.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>Testcase: splitting vertical writing-mode blocks</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1328095">
+  <link rel="help" href="http://dev.w3.org/csswg/css-break/#break-decoration">
+  <link rel="help" href="https://drafts.csswg.org/css-writing-modes-3/">
+  <link rel="match" href="vertical-wm-002-ref.html">
+<style type="text/css">
+body,html { padding:30px; margin:0; }
+.col {
+  columns: 2;
+  column-gap: 0;
+  column-fill: auto;
+
+  block-size: 90px;
+  inline-size: 140px;
+  border:1px solid;
+}
+.vl { writing-mode: vertical-rl; }
+
+.inner {
+  border-block-start: 25px solid blue;
+  border-block-end: 17px solid grey;
+  inline-size: 70px;
+}
+
+x {
+  display:block;
+  break-inside:avoid;
+  page-break-inside:avoid;
+  vertical-align: top;
+  inline-size: 20px;
+  block-size: 20px;
+  background:silver;
+}
+x:nth-of-type(2n) {background:purple;}
+</style>
+</head>
+<body>
+
+<div class="col vl">
+<div class="inner" style="margin-block-start:40px">
+<x></x><x></x>
+</div>
+</div>
+
+<div class="col">
+<div class="inner" style="margin-block-start:40px">
+<x></x><x></x>
+</div>
+</div>
+
+<div class="col vl">
+<div class="inner" style="margin-block-start:40px; block-size:90px">
+<x></x><x></x>
+</div>
+</div>
+
+<div class="col vl">
+<div class="inner" style="margin-block-start:40px; block-size:100px">
+<x></x><x></x>
+</div>
+</div>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-002-ref.html firefox-85.0+build1/layout/reftests/css-break/vertical-wm-002-ref.html
--- firefox-84.0.2+build1/layout/reftests/css-break/vertical-wm-002-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-break/vertical-wm-002-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>Reference: splitting vertical writing-mode blocks</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1328095">
+<style type="text/css">
+body,html { padding:30px; margin:0; }
+.col {
+  columns: 2;
+  column-gap: 0;
+  column-fill: auto;
+
+  block-size: 90px;
+  inline-size: 140px;
+  border:1px solid;
+}
+.vl { writing-mode: vertical-rl; }
+
+x {
+  display:block;
+  break-inside:avoid;
+  page-break-inside:avoid;
+  vertical-align: top;
+  inline-size: 20px;
+  block-size: 20px;
+  background:silver;
+}
+x:nth-of-type(2n) {background:purple;}
+
+blue { display:block; inline-size: 70px; border-block-start: 25px solid blue; }
+grey { display:block; inline-size: 70px; border-block-start: 17px solid grey; }
+</style>
+</head>
+<body>
+
+<div class="col vl">
+<div class="inner" style="margin-left:40px"></div>
+<blue></blue>
+<x></x><x></x>
+<grey></grey>
+</div>
+
+<div class="col">
+<div class="inner" style="margin-top:40px"></div>
+<blue></blue>
+<x></x><x></x>
+<grey></grey>
+</div>
+
+<div class="col vl">
+<div class="inner" style="margin-left:40px"></div>
+<blue></blue>
+<x></x><x></x>
+<div style="width:45px"></div>
+<grey></grey>
+</div>
+
+<div class="col vl">
+<div class="inner" style="margin-left:40px"></div>
+<blue></blue>
+<x></x><x></x>
+<div style="width:60px"></div>
+<grey></grey>
+</div>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/css-grid/grid-fragmentation-013-ref.html firefox-85.0+build1/layout/reftests/css-grid/grid-fragmentation-013-ref.html
--- firefox-84.0.2+build1/layout/reftests/css-grid/grid-fragmentation-013-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-grid/grid-fragmentation-013-ref.html	2021-01-18 19:58:16.000000000 +0000
@@ -15,39 +15,34 @@
 
 .grid {
   display: grid;
-  grid-template-columns: 0.6in 0.6in 0.6in;
-  grid-auto-rows: 1in;
-  grid-gap: 0.1in;
+  height: 1in;
   border: 0.1in solid;
-  align-items: start;
 }
-span { display:block; background:lime; border:0.05in solid black; }
-x { display:block; height:0.2in; }
-.t { border-bottom-width:0; }
-.b { border-top-width:0; }
-br { page-break-after:always; break-after:always; display:block; height:1px; }
-
+.col {
+  height: 0;
+  width: 0.6in;
+}
+.col > div {
+  height: 1in;
+  position: relative;
+  background: lime;
+  border: 0.05in solid black;
+}
 </style>
 </head>
 <body>
 
 <div style="padding-top:1in; background:grey">
-  <div class="grid t">
-    <span class="t" style="align-self:stretch"><x style="height:auto"></x></span>
-  </div>
-  <div class="grid b" style="border-color:transparent; grid-auto-rows: 0;">
-    <span class="b" style="min-height:0"><x style="height:0.04in"></x></span>
+  <div class="grid">
+    <div class="col"><div></div></div>
   </div>
 </div>
 
-<div style="padding-top:0.91in; background:grey;">
-  <div class="grid t" style="height:0.9in">
-    <span class="t" style="height:0.86in"><x></x></span>
+<div style="padding-top:1in; background:grey;">
+  <div class="grid">
+    <div class="col"><div></div></div>
   </div>
 </div>
-  <div class="grid b" style="border-color:transparent; grid-auto-rows: 0;">
-    <span class="b" style="min-height:0"><x style="height:0.04in"></x></span>
-  </div>
 
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/css-grid/reftest.list firefox-85.0+build1/layout/reftests/css-grid/reftest.list
--- firefox-84.0.2+build1/layout/reftests/css-grid/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/css-grid/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -193,7 +193,7 @@
 == grid-fragmentation-010.html grid-fragmentation-010-ref.html
 == grid-fragmentation-011.html grid-fragmentation-011-ref.html
 == grid-fragmentation-012.html grid-fragmentation-012-ref.html
-== grid-fragmentation-013.html grid-fragmentation-013-ref.html
+pref(layout.display-list.improve-fragmentation,true) == grid-fragmentation-013.html grid-fragmentation-013-ref.html
 == grid-fragmentation-014.html grid-fragmentation-014-ref.html
 asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015-ref.html # bug 1144852 (due to vertical writing-mode)
 == grid-fragmentation-016.html grid-fragmentation-016-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/flexbox/pagination/reftest.list firefox-85.0+build1/layout/reftests/flexbox/pagination/reftest.list
--- firefox-84.0.2+build1/layout/reftests/flexbox/pagination/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/flexbox/pagination/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -79,22 +79,22 @@
 
 # Tests for how we fragment flex items in a single-line column flex container
 # under "writing-mode: vertical-rl".
-fails == flexbox-single-column-vertical-rl-1a.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1b.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1c.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1d.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1e.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1f.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1g.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1h.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1i.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-1j.html flexbox-single-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-2.html flexbox-single-column-vertical-rl-2-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-3a.html flexbox-single-column-vertical-rl-3-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-3b.html flexbox-single-column-vertical-rl-3-ref.html # Bug 1674774
+== flexbox-single-column-vertical-rl-1a.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1b.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1c.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1d.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1e.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1f.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1g.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1h.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1i.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-1j.html flexbox-single-column-vertical-rl-1-ref.html
+== flexbox-single-column-vertical-rl-2.html flexbox-single-column-vertical-rl-2-ref.html
+== flexbox-single-column-vertical-rl-3a.html flexbox-single-column-vertical-rl-3-ref.html
+== flexbox-single-column-vertical-rl-3b.html flexbox-single-column-vertical-rl-3-ref.html
 == flexbox-single-column-vertical-rl-4.html flexbox-single-column-vertical-rl-4-ref.html
-fails == flexbox-single-column-vertical-rl-5.html flexbox-single-column-vertical-rl-5-ref.html # Bug 1674774
-fails == flexbox-single-column-vertical-rl-6.html flexbox-single-column-vertical-rl-6-ref.html # Bug 1674774
+== flexbox-single-column-vertical-rl-5.html flexbox-single-column-vertical-rl-5-ref.html
+== flexbox-single-column-vertical-rl-6.html flexbox-single-column-vertical-rl-6-ref.html
 
 # Tests for how we fragment flex items in a multi-line column flex container.
 == flexbox-multi-column-1a.html flexbox-multi-column-1-ref.html
@@ -125,17 +125,17 @@
 
 # Tests for how we fragment flex items in a multi-line column flex container
 # under "writing-mode: vertical-rl".
-fails == flexbox-multi-column-vertical-rl-1a.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1b.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1c.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1d.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1e.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1f.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1g.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1h.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1i.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-1j.html flexbox-multi-column-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-column-vertical-rl-2.html flexbox-multi-column-vertical-rl-2-ref.html # Bug 1674774
+== flexbox-multi-column-vertical-rl-1a.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1b.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1c.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1d.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1e.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1f.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1g.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1h.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1i.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-1j.html flexbox-multi-column-vertical-rl-1-ref.html
+== flexbox-multi-column-vertical-rl-2.html flexbox-multi-column-vertical-rl-2-ref.html
 
 # Tests for how we fragment flex items in a single-line row flex container.
 == flexbox-single-row-1a.html flexbox-single-row-1-ref.html
@@ -168,18 +168,18 @@
 
 # Tests for how we fragment flex items in a single-line row flex container
 # under "writing-mode: vertical-rl".
-fails == flexbox-single-row-vertical-rl-1a.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1b.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1c.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1d.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1e.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1f.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1g.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-1h.html flexbox-single-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-2.html flexbox-single-row-vertical-rl-2-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-3a.html flexbox-single-row-vertical-rl-3-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-3b.html flexbox-single-row-vertical-rl-3-ref.html # Bug 1674774
-fails == flexbox-single-row-vertical-rl-4.html flexbox-single-row-vertical-rl-4-ref.html # Bug 1674774
+== flexbox-single-row-vertical-rl-1a.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1b.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1c.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1d.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1e.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1f.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1g.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-1h.html flexbox-single-row-vertical-rl-1-ref.html
+== flexbox-single-row-vertical-rl-2.html flexbox-single-row-vertical-rl-2-ref.html
+== flexbox-single-row-vertical-rl-3a.html flexbox-single-row-vertical-rl-3-ref.html
+== flexbox-single-row-vertical-rl-3b.html flexbox-single-row-vertical-rl-3-ref.html
+== flexbox-single-row-vertical-rl-4.html flexbox-single-row-vertical-rl-4-ref.html
 
 # Tests for how we fragment flex items in a multi-line row flex container.
 == flexbox-multi-row-1a.html flexbox-multi-row-1-ref.html
@@ -204,11 +204,11 @@
 
 # Tests for how we fragment flex items in a multi-line row flex container.
 # under "writing-mode: vertical-rl".
-fails == flexbox-multi-row-vertical-rl-1a.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-1b.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-1c.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-1d.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-1e.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-1f.html flexbox-multi-row-vertical-rl-1-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-2a.html flexbox-multi-row-vertical-rl-2-ref.html # Bug 1674774
-fails == flexbox-multi-row-vertical-rl-2b.html flexbox-multi-row-vertical-rl-2-ref.html # Bug 1674774
+== flexbox-multi-row-vertical-rl-1a.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-1b.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-1c.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-1d.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-1e.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-1f.html flexbox-multi-row-vertical-rl-1-ref.html
+== flexbox-multi-row-vertical-rl-2a.html flexbox-multi-row-vertical-rl-2-ref.html
+== flexbox-multi-row-vertical-rl-2b.html flexbox-multi-row-vertical-rl-2-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/bfc-004.html firefox-85.0+build1/layout/reftests/pagination/bfc-004.html
--- firefox-84.0.2+build1/layout/reftests/pagination/bfc-004.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/bfc-004.html	2021-01-18 19:58:17.000000000 +0000
@@ -7,12 +7,17 @@
   <style>
 @page { size:5in 3in; margin:0.5in; }
 html,body {
-    color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
+    color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
+}
+.before, .after {
+  height: 0.5in;
+  content: "x";
+  background: black;
 }
 </style>
 </head>
 <body>
-  BEFORE
+  <div class="before"></div>
   <div style="display:flow-root">
     <div style="overflow:hidden; position:relative; min-height:1in">
       <div style="position:absolute">
@@ -20,6 +25,6 @@
       </div>
     </div>
   </div>
-  AFTER
+  <div class="after"></div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/bfc-004-ref.html firefox-85.0+build1/layout/reftests/pagination/bfc-004-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/bfc-004-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/bfc-004-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -7,13 +7,18 @@
   <style>
 @page { size:5in 3in; margin:0.5in; }
 html,body {
-    color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
+    color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
+}
+.before, .after {
+  height: 0.5in;
+  content: "x";
+  background: black;
 }
 </style>
 </head>
 <body>
-  BEFORE
+  <div class="before"></div>
   <div style="height:1in; width:1in; background:black"></div>
-  AFTER
+  <div class="after"></div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/bfc-005.html firefox-85.0+build1/layout/reftests/pagination/bfc-005.html
--- firefox-84.0.2+build1/layout/reftests/pagination/bfc-005.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/bfc-005.html	2021-01-18 19:58:17.000000000 +0000
@@ -7,12 +7,17 @@
   <style>
 @page { size:5in 3in; margin:0.5in; }
 html,body {
-    color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
+    color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
+}
+.before, .after {
+  height: 0.5in;
+  content: "x";
+  background: black;
 }
 </style>
 </head>
 <body>
-  BEFORE
+  <div class="before"></div>
   <div style="overflow:hidden; height:1in">
     <div style="overflow:hidden">
       <div style="float: left">
@@ -20,6 +25,6 @@
       </div>
     </div>
   </div>
-  AFTER
+  <div class="after"></div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/fieldset-00D-ref.html firefox-85.0+build1/layout/reftests/pagination/fieldset-00D-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/fieldset-00D-ref.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/fieldset-00D-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -27,6 +27,5 @@
 </head>
 <body>
   <fieldset><legend></legend></fieldset>
-  <br style="page-break-before: always">
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vh;
+  block-size: 10vw;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vh;
+  block-size: 10vw;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vh;
+  block-size: 10vw;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vh;
+  block-size: 10vw;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 150vh;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vw;
+  block-size: 10vh;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-1-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 150vh;
+  background-color: grey;
+  vertical-align: top;
+}
+
+.after {
+  inline-size: 50vw;
+  block-size: 10vh;
+  background-color: black;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  position: relative;
+  inset-block-start: -20vw;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  position: relative;
+  inset-block-start: -20vw;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  position: relative;
+  inset-block-start: -20vw;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 150vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  position: relative;
+  inset-block-start: -20vw;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 150vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vw;
+  block-size: 10vh;
+  position: relative;
+  inset-block-start: -20vh;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-2-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 150vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  inline-size: 60vw;
+  block-size: 10vh;
+  position: relative;
+  inset-block-start: -20vh;
+  border: 5px solid grey;
+  background-color: white;
+}
+</style>
+</head>
+<body>
+    <div class="ib"></div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 130vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vw;
+  block-size: 150vh;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-3-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-3-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 130vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vw;
+  block-size: 150vh;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { margin-block-start: 80vw; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vh;
+  block-size: 25vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { margin-block-start: 80vw; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 25vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { margin-block-start: 80vw; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vh;
+  block-size: 25vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { margin-block-start: 80vw; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 130vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 25vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+html { margin-block-start: 80vh; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 130vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vw;
+  block-size: 150vh;
+  border: 5px solid grey;
+}
+
+.after {
+  display: inline-block;
+  vertical-align: top;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-4-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-4-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+html { margin-block-start: 80vh; }
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 130vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.ib > div {
+  inline-size: 50vw;
+  block-size: 150vh;
+  border: 5px solid grey;
+}
+
+.after {
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+    <div class="ib">
+      <div></div>
+    </div>
+    <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-end: -20px;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  <div class="ib"></div>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-start: -20px;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-5-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-5-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  border: 5px solid black;
+  margin-left: 20px;
+  margin-top: -20px;
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vw; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  margin-top: 20px;
+  margin-right: -20px;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  <div class="ib"></div>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vw; writing-mode: vertical-rl; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vw; writing-mode: vertical-rl; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  margin-top: 20px;
+  margin-right: -20px;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+
+.after {
+  display: block;
+  inline-size: 60vh;
+  block-size: 10vw;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-6-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-6-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  border: 5px solid black;
+  margin-left: 20px;
+  margin-top: -20px;
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vw; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-7.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-7.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-7.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-7.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  vertical-align: top;
+  border: 5px solid black;
+}
+.ib > div {
+  block-size: 220vh; /* creates a bit of scrollable overflow on .ib */
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  <!--
+    -- Note that the correct rendering is that the grey block placed
+    -- immediately below the black bottom border.  Our fragmentation
+    -- fallback mechanism can't handle this case correctly.
+    -->
+  X<div class="ib"><div></div></div>p
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-7-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-7-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-7-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-7-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  border: 5px solid black;
+  margin-left: 20px;
+  margin-top: -20px;
+}
+.ib > div {
+  block-size: 220vh; /* creates a bit of scrollable overflow on .ib */
+}
+
+.after {
+  display: block;
+  inline-size: 60vw;
+  block-size: 10vh;
+  border: 5px dashed grey;
+  background-color: grey;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vw; border:5px solid transparent"></span>p
+  <div class="ib"><div></div></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8b.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8b.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8b.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8b-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8b-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8b-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8b-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-end: -20px;
+}
+</style>
+</head>
+<body>
+  <div class="ib"></div>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8c.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8c.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8c.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8c.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { block-size: 40vw; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8c-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8c-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8c-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8c-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vw; writing-mode: vertical-rl; }
+
+.ib {
+  display: block;
+  inline-size: 50vh;
+  block-size: 210vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-start: -20px;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vh; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: inline-block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  vertical-align: top;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+}
+</style>
+</head>
+<body>
+  X<div class="ib"></div>p
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8-ref.html firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8-ref.html
--- firefox-84.0.2+build1/layout/reftests/pagination/inline-block-slice-8-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/inline-block-slice-8-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html class="reftest-paged">
+<head>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 Ahem; padding:0; margin:0;
+}
+html { block-size: 40vh; }
+
+.ib {
+  display: block;
+  inline-size: 50vw;
+  block-size: 210vh;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-start: -20px;
+}
+</style>
+</head>
+<body>
+  X<span style="display:inline-block; inline-size:50vw; border:5px solid transparent"></span>p
+  <div class="ib"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/pagination/reftest.list firefox-85.0+build1/layout/reftests/pagination/reftest.list
--- firefox-84.0.2+build1/layout/reftests/pagination/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/pagination/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -2,16 +2,16 @@
 #   and layout/reftests/w3c-css/submitted/multicol3/
 # Pagination tests
 # asserts(3) == abspos-breaking-000.xhtml abspos-breaking-000.ref.xhtml # bug 1067755, 1135556
-asserts(9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-001.xhtml abspos-breaking-000.ref.xhtml # Bug 1655630, Bug 1392106
-asserts(9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-002.xhtml abspos-breaking-000.ref.xhtml # Bug 1655630, Bug 1392106
-asserts(6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-003.html abspos-breaking-003-ref.html # Bug 1655630, Bug 1392106
-asserts(12) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-004.html abspos-breaking-004-ref.html # Bug 1655630, Bug 1392106
-asserts(12) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-005.html abspos-breaking-005-ref.html # Bug 1655630, Bug 1392106
-asserts(12) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-006.html abspos-breaking-006-ref.html # Bug 1655630, Bug 1392106
-asserts(6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-007.html abspos-breaking-007-ref.html # Bug 1655630, Bug 1392106
-asserts(6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-008.html abspos-breaking-008-ref.html # Bug 1655630, Bug 1392106
-asserts(6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-009.html abspos-breaking-009-ref.html # Bug 1655630, Bug 1392106
-asserts(6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-010.html abspos-breaking-010-ref.html # Bug 1655630, Bug 1392106
+asserts(3) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-001.xhtml abspos-breaking-000.ref.xhtml # Bug 1655630, Bug 1392106
+asserts(3) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-002.xhtml abspos-breaking-000.ref.xhtml # Bug 1655630, Bug 1392106
+asserts(2) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-003.html abspos-breaking-003-ref.html # Bug 1655630, Bug 1392106
+asserts(4) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-004.html abspos-breaking-004-ref.html # Bug 1655630, Bug 1392106
+asserts(4) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-005.html abspos-breaking-005-ref.html # Bug 1655630, Bug 1392106
+asserts(4) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-006.html abspos-breaking-006-ref.html # Bug 1655630, Bug 1392106
+asserts(2) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-007.html abspos-breaking-007-ref.html # Bug 1655630, Bug 1392106
+asserts(2) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-008.html abspos-breaking-008-ref.html # Bug 1655630, Bug 1392106
+asserts(2) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-009.html abspos-breaking-009-ref.html # Bug 1655630, Bug 1392106
+asserts(2) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == abspos-breaking-010.html abspos-breaking-010-ref.html # Bug 1655630, Bug 1392106
 == abspos-breaking-011.html abspos-breaking-011-ref.html # Bug 1392106
 == abspos-breaking-dynamic-001.html abspos-breaking-dynamic-001-ref.html
 == abspos-breaking-dynamic-002.html abspos-breaking-dynamic-002-ref.html
@@ -73,14 +73,13 @@
 == table-cell-breaking-1b.html table-cell-breaking-1-ref.html
 == table-cell-breaking-2a.html table-cell-breaking-2-ref.html
 == table-cell-breaking-2b.html table-cell-breaking-2-ref.html
-# Note: table-cell-breaking-3a.html should match table-cell-breaking-3-ref.html, but
-# currently it renders the same as table-cell-breaking-3a-ref.html.
-== table-cell-breaking-3a.html table-cell-breaking-3a-ref.html
-fails == table-cell-breaking-3a.html table-cell-breaking-3-ref.html
-asserts(1-1) == table-cell-breaking-3b.html table-cell-breaking-3-ref.html
+pref(layout.display-list.improve-fragmentation,false) == table-cell-breaking-3a.html table-cell-breaking-3a-ref.html
+pref(layout.display-list.improve-fragmentation,true) == table-cell-breaking-3a.html table-cell-breaking-3-ref.html
+asserts(1-1) pref(layout.display-list.improve-fragmentation,false) == table-cell-breaking-3b.html table-cell-breaking-3-ref.html # bug 714667
+asserts(1-1) pref(layout.display-list.improve-fragmentation,true) fails == table-cell-breaking-3b.html table-cell-breaking-3-ref.html # assert is bug 714667, fails due to bug 1681063
 == column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html
-fuzzy-if(Android,0-4,0-2) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
-fuzzy-if(OSX,23-23,1-1) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html
+fuzzy-if(Android,0-4,0-2) fuzzy-if(swgl,0-1,0-35) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
+pref(layout.display-list.improve-fragmentation,false) fuzzy-if(OSX,23-23,1-1) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html # bug 1681063
 == contain-size-break-001.html contain-size-break-001-ref.html
 == contain-size-break-002.html contain-size-break-002-ref.html
 == contain-size-break-003.html contain-size-break-003-ref.html
@@ -180,8 +179,30 @@
 == bfc-007.html bfc-006-ref.html
 == bfc-008.html bfc-006-ref.html
 
-asserts(10) pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-simple-1.html inline-block-frag-simple-1-ref.html # Bug 1655630
-asserts(10) pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-simple-2.html inline-block-frag-simple-2-ref.html # Bug 1655630
-asserts(2-3) pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-offset-1.html inline-block-frag-offset-1-ref.html # Bug 1655630
-asserts(2-3) pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-offset-2.html inline-block-frag-offset-2-ref.html # Bug 1655630
-asserts(2) pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-text-1.html inline-block-frag-text-1-ref.html # Bug 1655630
+pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-simple-1.html inline-block-frag-simple-1-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-simple-2.html inline-block-frag-simple-2-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-offset-1.html inline-block-frag-offset-1-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-offset-2.html inline-block-frag-offset-2-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-frag-text-1.html inline-block-frag-text-1-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-1.html inline-block-slice-1-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-1b.html inline-block-slice-1b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-1c.html inline-block-slice-1c-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-2.html inline-block-slice-2-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-2b.html inline-block-slice-2b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-2c.html inline-block-slice-2c-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-3.html inline-block-slice-3-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-3b.html inline-block-slice-3b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-3c.html inline-block-slice-3c-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-4.html inline-block-slice-4-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-4b.html inline-block-slice-4b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-4c.html inline-block-slice-4c-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-5.html inline-block-slice-5-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-5b.html inline-block-slice-5b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-5c.html inline-block-slice-5c-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-6.html inline-block-slice-6-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-6b.html inline-block-slice-6b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-6c.html inline-block-slice-6c-ref.html
+pref(layout.display-list.improve-fragmentation,true) != inline-block-slice-7.html inline-block-slice-7-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-8.html inline-block-slice-8-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-8b.html inline-block-slice-8b-ref.html
+pref(layout.display-list.improve-fragmentation,true) == inline-block-slice-8c.html inline-block-slice-8c-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/reftest.list firefox-85.0+build1/layout/reftests/reftest.list
--- firefox-84.0.2+build1/layout/reftests/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -419,9 +419,6 @@
 # xul (no XUL theme on Android)
 skip-if(Android) include ../xul/reftest/reftest.list
 
-# xul grid (no XUL theme on Android)
-skip-if(Android) include ../xul/grid/reftests/reftest.list
-
 # -webkit-box & associated properties (mapped to modern flexbox)
 include webkit-box/reftest.list
 
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/as-image/reftest.list firefox-85.0+build1/layout/reftests/svg/as-image/reftest.list
--- firefox-84.0.2+build1/layout/reftests/svg/as-image/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/as-image/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -99,7 +99,7 @@
 # Simple <img> tests
 == img-simple-1.html  lime100x100-ref.html
 == img-simple-2.html  lime100x100-ref.html
-fuzzy-if(skiaContent,0-255,0-350) fuzzy-if(geckoview&&webrender,0-255,0-4042) == img-simple-3.html  img-simple-3-ref.html #Bug 1564891
+fuzzy-if(skiaContent,0-255,0-350) fuzzy-if(geckoview&&webrender,0-255,0-4063)  == img-simple-3.html  img-simple-3-ref.html #Bug 1564891, bug 1574154
 == img-simple-4.html  lime100x100-ref.html
 fuzzy-if(skiaContent,0-255,0-90) fuzzy-if(geckoview&&webrender,0-255,0-1266) == img-simple-5.html  img-simple-5-ref.html
 == img-simple-6.html  lime100x100-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/filter-and-clip-ref.svg firefox-85.0+build1/layout/reftests/svg/filter-and-clip-ref.svg
--- firefox-84.0.2+build1/layout/reftests/svg/filter-and-clip-ref.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/filter-and-clip-ref.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300">
+ <rect x="100" y="50" width="100" height="100" fill="green" />
+</svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/filter-and-clip.svg firefox-85.0+build1/layout/reftests/svg/filter-and-clip.svg
--- firefox-84.0.2+build1/layout/reftests/svg/filter-and-clip.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/filter-and-clip.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300">
+ <defs>
+  <filter id="shift">
+   <feOffset dx="50"/>
+  </filter>
+  <clipPath id="clip">
+   <rect x="100" y="50" width="100" height="100"/>
+  </clipPath>
+ </defs>
+ <rect x="100" y="50" width="100" height="100" fill="red"/>
+ <rect x="50" y="50" width="200" height="100" fill="green" filter="url(#shift)" clip-path="url(#clip)"/>
+</svg>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/filters/reftest.list firefox-85.0+build1/layout/reftests/svg/filters/reftest.list
--- firefox-84.0.2+build1/layout/reftests/svg/filters/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/filters/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -65,7 +65,7 @@
 
 # no tests for feTurbulence
 
-fuzzy-if(geckoview&&webrender,0-8,0-220) == filter-clipped-rect-01.svg pass.svg
+fuzzy-if(geckoview&&webrender,0-28,0-220) == filter-clipped-rect-01.svg pass.svg
 == filter-in-pattern-01.svg pass.svg
 fuzzy(0-5,0-67) != filter-in-pattern-02.svg filter-in-pattern-02-ref.svg
 random-if(winWidget) == filter-in-mask-01.svg pass.svg # bug 1356139
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/reftest.list firefox-85.0+build1/layout/reftests/svg/reftest.list
--- firefox-84.0.2+build1/layout/reftests/svg/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -208,6 +208,7 @@
 fuzzy-if(skiaContent,0-1,0-2) == fallback-color-04.svg pass.svg
 == fallback-color-05.svg fallback-color-05-ref.svg
 
+== filter-and-clip.svg filter-and-clip-ref.svg
 == filter-basic-01.svg pass.svg
 == filter-basic-02.svg pass.svg
 == filter-basic-03.svg pass.svg
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/reftest.list firefox-85.0+build1/layout/reftests/svg/text/reftest.list
--- firefox-84.0.2+build1/layout/reftests/svg/text/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -114,6 +114,7 @@
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-a.svg textpath-a-ref.svg # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-anchor-middle.svg textpath-anchor-middle-ref.svg # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-anchor-end.svg textpath-anchor-end-ref.svg # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-cluster.svg textpath-cluster-ref.svg # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-invalid-parent.svg textpath-invalid-parent-ref.svg # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-multiline.svg textpath-multiline-ref.svg # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-multiline-2.svg textpath-multiline-2-ref.svg # Bug 1392106
@@ -190,6 +191,7 @@
 
 # vertical text
 fuzzy-if(skiaContent,0-1,0-80) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-vertical-dx.svg textpath-vertical-dx-ref.svg # Bug 1392106
+fuzzy-if(skiaContent,0-1,0-80) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == textpath-vertical-x.svg textpath-vertical-x-ref.svg # Bug 1392106
 
 # selection
 needs-focus == deselectAll.svg deselectAll-ref.svg
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/textpath-cluster-ref.svg firefox-85.0+build1/layout/reftests/svg/text/textpath-cluster-ref.svg
--- firefox-84.0.2+build1/layout/reftests/svg/text/textpath-cluster-ref.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/textpath-cluster-ref.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,12 @@
+<svg width="500" height="500" xmlns="http://www.w3.org/2000/svg" >
+  <defs>
+    <path id="path" d="M 100 200 C 200 100 300 0 400 100" />
+    <style>
+      text {
+        font: 40px monospace;
+      }
+    </style>
+  </defs>
+
+  <text transform="translate(0, 40)">a <textPath href="#path">b </textPath>c</text>
+</svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/textpath-cluster.svg firefox-85.0+build1/layout/reftests/svg/text/textpath-cluster.svg
--- firefox-84.0.2+build1/layout/reftests/svg/text/textpath-cluster.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/textpath-cluster.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,12 @@
+<svg width="500" height="500" xmlns="http://www.w3.org/2000/svg" >
+  <defs>
+    <path id="path" d="M 100 200 C 200 100 300 0 400 100" />
+    <style>
+      text {
+        font: 40px monospace;
+      }
+    </style>
+  </defs>
+
+  <text transform="translate(0, 40)">a <textPath href="#path">b </textPath> c</text>
+</svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/textpath-inherit-position.svg firefox-85.0+build1/layout/reftests/svg/text/textpath-inherit-position.svg
--- firefox-84.0.2+build1/layout/reftests/svg/text/textpath-inherit-position.svg	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/textpath-inherit-position.svg	2021-01-18 19:58:17.000000000 +0000
@@ -5,6 +5,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g transform="translate(150,50)" style="font: 32px sans-serif">
     <path id="p" d="M 100,100 l 100,100"/>
-    <text x="0 20 40 60 80 100 50">hello <textPath xlink:href="#p">there</textPath></text>
+    <text x="0 20 40 60 80 100 50" y="0 0 0 0 0 0 200">hello <textPath xlink:href="#p">there</textPath></text>
   </g>
 </svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/textpath-vertical-x-ref.svg firefox-85.0+build1/layout/reftests/svg/text/textpath-vertical-x-ref.svg
--- firefox-84.0.2+build1/layout/reftests/svg/text/textpath-vertical-x-ref.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/textpath-vertical-x-ref.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <style>
+    path { stroke: red; }
+    text { writing-mode: vertical-rl; font: 24px sans-serif; }
+  </style>
+  <path id="p" d="M 40,40 v 150"/>
+  <text><textPath xlink:href="#p">中国 China</textPath></text>
+</svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/text/textpath-vertical-x.svg firefox-85.0+build1/layout/reftests/svg/text/textpath-vertical-x.svg
--- firefox-84.0.2+build1/layout/reftests/svg/text/textpath-vertical-x.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/text/textpath-vertical-x.svg	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <style>
+    path { stroke: red; }
+    text { writing-mode: vertical-rl; font: 24px sans-serif; }
+  </style>
+  <path id="p" d="M 40,40 v 150"/>
+  <text x="16"><textPath xlink:href="#p">中国 China</textPath></text>
+</svg>
diff -Nru firefox-84.0.2+build1/layout/reftests/svg/textPath-02.svg firefox-85.0+build1/layout/reftests/svg/textPath-02.svg
--- firefox-84.0.2+build1/layout/reftests/svg/textPath-02.svg	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/svg/textPath-02.svg	2021-01-18 19:58:17.000000000 +0000
@@ -8,7 +8,7 @@
     <path id="path" d="M20,20 C20,150 150,150 150,20" pathLength="100" transform="scale(2,1)" fill="none" stroke="black"/>
   </defs>
   <rect width="100%" height="100%" fill="lime"/>
-  <text>
+  <text y="50">
     <textPath xlink:href="#path" font-size="20" fill="red" startOffset="50">FAIL</textPath>
   </text>
   <rect x="160" y="80" width="100" height="60" fill="lime"/>
diff -Nru firefox-84.0.2+build1/layout/reftests/text-stroke/reftest.list firefox-85.0+build1/layout/reftests/text-stroke/reftest.list
--- firefox-84.0.2+build1/layout/reftests/text-stroke/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/text-stroke/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -1,9 +1,9 @@
 # basic tests for webkit-text-stroke
 # fuzzy is needed here for platform dependent backends
 # These fail on Linux without webrender due to lack of antialiasing of the HTML text stroke
-fuzzy(0-64,0-52) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-776) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001-ref.html
-fuzzy(0-4,0-24) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-4,0-27) fuzzy-if(geckoview&&webrender,0-4,0-1476) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002-ref.html
-fuzzy(0-48,0-28) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-528) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003-ref.html
-fuzzy(0-64,0-33) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-575) fuzzy-if(geckoview&&webrender&&device,0-64,0-599) fuzzy-if(geckoview&&webrender&&emulator,96-96,58-58) == webkit-text-stroke-property-004.html webkit-text-stroke-property-004-ref.html
-fuzzy(0-64,0-47) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-860) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005-ref.html
-fuzzy(0-71,0-10) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-006.html webkit-text-stroke-property-006-ref.html
+fuzzy(0-64,0-52) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-776) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001-ref.html
+fuzzy(0-4,0-24) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-4,0-27) fuzzy-if(geckoview&&webrender,0-4,0-1476) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002-ref.html
+fuzzy(0-48,0-28) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-528) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003-ref.html
+fuzzy(0-64,0-33) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-575) fuzzy-if(geckoview&&webrender&&device,0-64,0-599) fuzzy-if(geckoview&&webrender&&emulator,96-96,58-58) == webkit-text-stroke-property-004.html webkit-text-stroke-property-004-ref.html
+fuzzy(0-64,0-47) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) fuzzy-if(webrender,0-64,0-860) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005-ref.html
+fuzzy(0-71,0-10) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!webrender) fails-if(gtkWidget&&!webrender) == webkit-text-stroke-property-006.html webkit-text-stroke-property-006-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/transform/reftest.list firefox-85.0+build1/layout/reftests/transform/reftest.list
--- firefox-84.0.2+build1/layout/reftests/transform/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/transform/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -137,7 +137,7 @@
 == transform-origin-svg-2b.svg transform-origin-svg-2-ref.svg
 # Bug 1122526
 == animate-layer-scale-inherit-1.html animate-layer-scale-inherit-1-ref.html
-== animate-layer-scale-inherit-2.html animate-layer-scale-inherit-2-ref.html
+fuzzy-if(webrender&&swgl,0-1,0-2) == animate-layer-scale-inherit-2.html animate-layer-scale-inherit-2-ref.html
 == animate-layer-scale-inherit-3.html animate-layer-scale-inherit-1-ref.html
 # Bug 1301500
 == dynamic-add-without-change-cb-1.html dynamic-add-without-change-cb-1-ref.html
diff -Nru firefox-84.0.2+build1/layout/reftests/transform-3d/perspective-overflow-2.html firefox-85.0+build1/layout/reftests/transform-3d/perspective-overflow-2.html
--- firefox-84.0.2+build1/layout/reftests/transform-3d/perspective-overflow-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/transform-3d/perspective-overflow-2.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>Transform Overflow Bug</title>
+    <style>
+    .container {
+        width: 100px;
+        height: 100px;
+        overflow: scroll;
+        scrollbar-width: none;
+        perspective: 1px;
+    }
+
+    .inner {
+        will-change: transform;
+        background-color: red;
+        width: 200px;
+        height: 200px;
+    }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        <p class="inner"></p>
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/transform-3d/perspective-overflow-2-ref.html firefox-85.0+build1/layout/reftests/transform-3d/perspective-overflow-2-ref.html
--- firefox-84.0.2+build1/layout/reftests/transform-3d/perspective-overflow-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/transform-3d/perspective-overflow-2-ref.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>Transform Overflow Bug</title>
+    <style>
+    .container {
+        width: 100px;
+        height: 100px;
+        overflow: scroll;
+        scrollbar-width: none;
+        perspective: 1px;
+    }
+
+    .inner {
+        background-color: red;
+        width: 200px;
+        height: 200px;
+    }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        <p class="inner"></p>
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/reftests/transform-3d/reftest.list firefox-85.0+build1/layout/reftests/transform-3d/reftest.list
--- firefox-84.0.2+build1/layout/reftests/transform-3d/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/reftests/transform-3d/reftest.list	2021-01-18 19:58:17.000000000 +0000
@@ -96,6 +96,7 @@
 != preserve3d-scale.html about:blank
 fuzzy(0-51,0-1154) == preserve3d-scale.html preserve3d-scale-ref.html
 fuzzy-if(webrender,0-1,0-5) == perspective-overflow-1.html perspective-overflow-1-ref.html
+== perspective-overflow-2.html perspective-overflow-2-ref.html
 == 1544995-1.html 1544995-1-ref.html
 == preserve3d-will-change-large-frame.html preserve3d-will-change-ref.html
 fuzzy-if(webrender,0-6,0-3117) == 1637067-1.html 1637067-1-ref.html
diff -Nru firefox-84.0.2+build1/layout/style/AnimationCollection.cpp firefox-85.0+build1/layout/style/AnimationCollection.cpp
--- firefox-84.0.2+build1/layout/style/AnimationCollection.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/AnimationCollection.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -128,6 +128,14 @@
   return propName;
 }
 
+template <class AnimationType>
+void AnimationCollection<AnimationType>::Destroy() {
+  mCalledDestroy = true;
+
+  // This will call our destructor.
+  mElement->RemoveProperty(mElementProperty);
+}
+
 // Explicit class instantiations
 
 template class AnimationCollection<dom::CSSAnimation>;
diff -Nru firefox-84.0.2+build1/layout/style/AnimationCollection.h firefox-85.0+build1/layout/style/AnimationCollection.h
--- firefox-84.0.2+build1/layout/style/AnimationCollection.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/AnimationCollection.h	2021-01-18 19:58:17.000000000 +0000
@@ -7,7 +7,6 @@
 #ifndef mozilla_AnimationCollection_h
 #define mozilla_AnimationCollection_h
 
-#include "mozilla/dom/Element.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/RefPtr.h"
@@ -19,6 +18,9 @@
 class nsPresContext;
 
 namespace mozilla {
+namespace dom {
+class Element;
+}
 
 // Traits class to define the specific atoms used when storing specializations
 // of AnimationCollection as a property on an Element (e.g. which atom
@@ -46,12 +48,7 @@
     LinkedListElement<SelfType>::remove();
   }
 
-  void Destroy() {
-    mCalledDestroy = true;
-
-    // This will call our destructor.
-    mElement->RemoveProperty(mElementProperty);
-  }
+  void Destroy();
 
   static void PropertyDtor(void* aObject, nsAtom* aPropertyName,
                            void* aPropertyValue, void* aData);
diff -Nru firefox-84.0.2+build1/layout/style/ComputedStyleInlines.h firefox-85.0+build1/layout/style/ComputedStyleInlines.h
--- firefox-84.0.2+build1/layout/style/ComputedStyleInlines.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ComputedStyleInlines.h	2021-01-18 19:58:17.000000000 +0000
@@ -15,9 +15,11 @@
 #define ComputedStyleInlines_h
 
 #include "mozilla/ComputedStyle.h"
-#include "mozilla/ServoComputedDataInlines.h"
-#include "mozilla/ServoUtils.h"
-#include "nsPresContext.h"
+
+#include "MainThreadUtils.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Unused.h"
+#include "nsStyleStruct.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/layout/style/crashtests/crashtests.list firefox-85.0+build1/layout/style/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/style/crashtests/crashtests.list	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/style/crashtests/crashtests.list	2021-01-18 19:58:17.000000000 +0000
@@ -209,9 +209,9 @@
 load link-transition-before.html
 skip-if(winWidget&&isDebugBuild&&/^Windows\x20NT\x206\.1/.test(http.oscpu)) load long-url-list-stack-overflow.html #Bug 1525117
 load scale-on-block-continuation.html
-skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) skip-if(AddressSanitizer) load 1383981.html # Very sensitive to stack size.
-skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) skip-if(AddressSanitizer) load 1383981-2.html
-skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) skip-if(AddressSanitizer) load 1383981-3.html
+skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) load 1383981.html # Very sensitive to stack size.
+skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) load 1383981-2.html
+skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) load 1383981-3.html
 load 1384824-1.html
 load 1384824-2.html
 load 1386773.html
diff -Nru firefox-84.0.2+build1/layout/style/ErrorReporter.cpp firefox-85.0+build1/layout/style/ErrorReporter.cpp
--- firefox-84.0.2+build1/layout/style/ErrorReporter.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ErrorReporter.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/Services.h"
 #include "nsIConsoleService.h"
 #include "mozilla/dom/Document.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIDocShell.h"
 #include "nsIFactory.h"
 #include "nsINode.h"
diff -Nru firefox-84.0.2+build1/layout/style/FontFaceSet.cpp firefox-85.0+build1/layout/style/FontFaceSet.cpp
--- firefox-84.0.2+build1/layout/style/FontFaceSet.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/FontFaceSet.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/LoadInfo.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentUtils.h"
 #include "nsDeviceContext.h"
diff -Nru firefox-84.0.2+build1/layout/style/FontFaceSet.h firefox-85.0+build1/layout/style/FontFaceSet.h
--- firefox-84.0.2+build1/layout/style/FontFaceSet.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/FontFaceSet.h	2021-01-18 19:58:17.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/FontPropertyTypes.h"
 #include "gfxUserFontSet.h"
 #include "nsICSSLoaderObserver.h"
+#include "nsIDOMEventListener.h"
 
 struct gfxFontFaceSrc;
 class gfxFontSrcPrincipal;
diff -Nru firefox-84.0.2+build1/layout/style/FontPreloader.cpp firefox-85.0+build1/layout/style/FontPreloader.cpp
--- firefox-84.0.2+build1/layout/style/FontPreloader.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/FontPreloader.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "gfxUserFontSet.h"
 #include "nsIClassOfService.h"
+#include "nsIHttpChannel.h"
 #include "nsISupportsPriority.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/layout/style/GeckoBindings.h firefox-85.0+build1/layout/style/GeckoBindings.h
--- firefox-84.0.2+build1/layout/style/GeckoBindings.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/GeckoBindings.h	2021-01-18 19:58:17.000000000 +0000
@@ -27,6 +27,9 @@
 class ServoComputedData;
 
 namespace mozilla {
+#ifdef MOZ_GECKO_PROFILER
+class AutoProfilerLabel;
+#endif
 class ComputedStyle;
 class SeenPtrs;
 class ServoElementSnapshot;
diff -Nru firefox-84.0.2+build1/layout/style/GroupRule.h firefox-85.0+build1/layout/style/GroupRule.h
--- firefox-84.0.2+build1/layout/style/GroupRule.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/GroupRule.h	2021-01-18 19:58:17.000000000 +0000
@@ -13,7 +13,6 @@
 #define mozilla_css_GroupRule_h__
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/ServoCSSRuleList.h"
 #include "mozilla/css/Rule.h"
@@ -21,6 +20,7 @@
 
 namespace mozilla {
 
+class ErrorResult;
 class StyleSheet;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/layout/style/Loader.cpp firefox-85.0+build1/layout/style/Loader.cpp
--- firefox-84.0.2+build1/layout/style/Loader.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/Loader.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -59,6 +59,7 @@
 #include "mozilla/ServoUtils.h"
 #include "mozilla/css/StreamLoader.h"
 #include "mozilla/SharedStyleSheetCache.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "ReferrerInfo.h"
 
 #ifdef MOZ_XUL
diff -Nru firefox-84.0.2+build1/layout/style/MediaList.h firefox-85.0+build1/layout/style/MediaList.h
--- firefox-84.0.2+build1/layout/style/MediaList.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/MediaList.h	2021-01-18 19:58:17.000000000 +0000
@@ -10,7 +10,6 @@
 #define mozilla_dom_MediaList_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/ServoBindingTypes.h"
 #include "mozilla/ServoUtils.h"
 
@@ -19,6 +18,7 @@
 class nsMediaQueryResultCacheKey;
 
 namespace mozilla {
+class ErrorResult;
 class StyleSheet;
 
 namespace dom {
diff -Nru firefox-84.0.2+build1/layout/style/moz.build firefox-85.0+build1/layout/style/moz.build
--- firefox-84.0.2+build1/layout/style/moz.build	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -41,6 +41,7 @@
     "AnimationCommon.h",
     "CounterStyleManager.h",
     "nsAnimationManager.h",
+    "nsComputedDOMStyle.h",
     "nsCSSAnonBoxes.h",
     "nsCSSAnonBoxList.h",
     "nsCSSCounterDescList.h",
diff -Nru firefox-84.0.2+build1/layout/style/nsComputedDOMStyle.cpp firefox-85.0+build1/layout/style/nsComputedDOMStyle.cpp
--- firefox-84.0.2+build1/layout/style/nsComputedDOMStyle.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsComputedDOMStyle.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/StaticPrefs_layout.h"
 
@@ -357,10 +358,8 @@
 
 nsresult nsComputedDOMStyle::GetPropertyValue(const nsCSSPropertyID aPropID,
                                               nsAString& aValue) {
-  // This is mostly to avoid code duplication with GetPropertyCSSValue(); if
-  // perf ever becomes an issue here (doubtful), we can look into changing
-  // this.
-  return GetPropertyValue(nsCSSProps::GetStringValue(aPropID), aValue);
+  MOZ_ASSERT(aPropID != eCSSPropertyExtra_variable);
+  return GetPropertyValue(aPropID, EmptyCString(), aValue);
 }
 
 void nsComputedDOMStyle::SetPropertyValue(const nsCSSPropertyID aPropID,
@@ -403,19 +402,24 @@
 NS_IMETHODIMP
 nsComputedDOMStyle::GetPropertyValue(const nsACString& aPropertyName,
                                      nsAString& aReturn) {
-  aReturn.Truncate();
-
   nsCSSPropertyID prop = nsCSSProps::LookupProperty(aPropertyName);
+  return GetPropertyValue(prop, aPropertyName, aReturn);
+}
+
+nsresult nsComputedDOMStyle::GetPropertyValue(
+    nsCSSPropertyID aPropID, const nsACString& aMaybeCustomPropertyName,
+    nsAString& aReturn) {
+  MOZ_ASSERT(aReturn.IsEmpty());
 
   const ComputedStyleMap::Entry* entry = nullptr;
-  if (prop != eCSSPropertyExtra_variable) {
-    entry = GetComputedStyleMap()->FindEntryForProperty(prop);
+  if (aPropID != eCSSPropertyExtra_variable) {
+    entry = GetComputedStyleMap()->FindEntryForProperty(aPropID);
     if (!entry) {
       return NS_OK;
     }
   }
 
-  UpdateCurrentStyleSources(prop);
+  UpdateCurrentStyleSources(aPropID);
   if (!mComputedStyle) {
     return NS_OK;
   }
@@ -423,28 +427,28 @@
   auto cleanup = mozilla::MakeScopeExit([&] { ClearCurrentStyleSources(); });
 
   if (!entry) {
-    MOZ_ASSERT(nsCSSProps::IsCustomPropertyName(aPropertyName));
+    MOZ_ASSERT(nsCSSProps::IsCustomPropertyName(aMaybeCustomPropertyName));
     const nsACString& name =
-        Substring(aPropertyName, CSS_CUSTOM_NAME_PREFIX_LENGTH);
+        Substring(aMaybeCustomPropertyName, CSS_CUSTOM_NAME_PREFIX_LENGTH);
     Servo_GetCustomPropertyValue(mComputedStyle, &name, &aReturn);
     return NS_OK;
   }
 
-  if (nsCSSProps::PropHasFlags(prop, CSSPropFlags::IsLogical)) {
+  if (nsCSSProps::PropHasFlags(aPropID, CSSPropFlags::IsLogical)) {
     MOZ_ASSERT(entry);
     MOZ_ASSERT(entry->mGetter == &nsComputedDOMStyle::DummyGetter);
 
-    DebugOnly<nsCSSPropertyID> logicalProp = prop;
+    DebugOnly<nsCSSPropertyID> logicalProp = aPropID;
 
-    prop = Servo_ResolveLogicalProperty(prop, mComputedStyle);
-    entry = GetComputedStyleMap()->FindEntryForProperty(prop);
+    aPropID = Servo_ResolveLogicalProperty(aPropID, mComputedStyle);
+    entry = GetComputedStyleMap()->FindEntryForProperty(aPropID);
 
-    MOZ_ASSERT(NeedsToFlushLayout(logicalProp) == NeedsToFlushLayout(prop),
+    MOZ_ASSERT(NeedsToFlushLayout(logicalProp) == NeedsToFlushLayout(aPropID),
                "Logical and physical property don't agree on whether layout is "
                "needed");
   }
 
-  if (!nsCSSProps::PropHasFlags(prop, CSSPropFlags::SerializedByServo)) {
+  if (!nsCSSProps::PropHasFlags(aPropID, CSSPropFlags::SerializedByServo)) {
     if (RefPtr<CSSValue> value = (this->*entry->mGetter)()) {
       ErrorResult rv;
       nsString text;
@@ -456,7 +460,7 @@
   }
 
   MOZ_ASSERT(entry->mGetter == &nsComputedDOMStyle::DummyGetter);
-  mComputedStyle->GetComputedPropertyValue(prop, aReturn);
+  mComputedStyle->GetComputedPropertyValue(aPropID, aReturn);
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/layout/style/nsComputedDOMStyle.h firefox-85.0+build1/layout/style/nsComputedDOMStyle.h
--- firefox-84.0.2+build1/layout/style/nsComputedDOMStyle.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsComputedDOMStyle.h	2021-01-18 19:58:17.000000000 +0000
@@ -12,7 +12,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/StyleColorInlines.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/dom/Element.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nscore.h"
@@ -22,10 +21,16 @@
 #include "mozilla/gfx/Types.h"
 #include "nsCoord.h"
 #include "nsColor.h"
+#include "nsStubMutationObserver.h"
 #include "nsStyleStruct.h"
 #include "mozilla/WritingModes.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/dom/Element.h"
+
 namespace mozilla {
+enum class FlushType : uint8_t;
+
 namespace dom {
 class DocGroup;
 class Element;
@@ -132,6 +137,10 @@
   NS_DECL_NSIMUTATIONOBSERVER_PARENTCHAINCHANGED
 
  private:
+  nsresult GetPropertyValue(const nsCSSPropertyID aPropID,
+                            const nsACString& aMaybeCustomPropertyNme,
+                            nsAString& aValue);
+
   virtual ~nsComputedDOMStyle();
 
   void AssertFlushedPendingReflows() {
diff -Nru firefox-84.0.2+build1/layout/style/nsCSSValue.h firefox-85.0+build1/layout/style/nsCSSValue.h
--- firefox-84.0.2+build1/layout/style/nsCSSValue.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsCSSValue.h	2021-01-18 19:58:17.000000000 +0000
@@ -23,6 +23,9 @@
 
 #include <type_traits>
 
+// XXX Avoid including this here by moving function bodies to the cpp file
+#include "mozilla/FloatingPoint.h"
+
 class imgRequestProxy;
 class nsAtom;
 class nsIContent;
diff -Nru firefox-84.0.2+build1/layout/style/nsDOMCSSDeclaration.cpp firefox-85.0+build1/layout/style/nsDOMCSSDeclaration.cpp
--- firefox-84.0.2+build1/layout/style/nsDOMCSSDeclaration.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsDOMCSSDeclaration.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -37,8 +37,8 @@
                                                nsAString& aValue) {
   MOZ_ASSERT(aPropID != eCSSProperty_UNKNOWN,
              "Should never pass eCSSProperty_UNKNOWN around");
+  MOZ_ASSERT(aValue.IsEmpty());
 
-  aValue.Truncate();
   if (DeclarationBlock* decl =
           GetOrCreateCSSDeclaration(eOperation_Read, nullptr)) {
     decl->GetPropertyValueByID(aPropID, aValue);
@@ -91,10 +91,9 @@
 }
 
 void nsDOMCSSDeclaration::GetCssText(nsAString& aCssText) {
-  DeclarationBlock* decl = GetOrCreateCSSDeclaration(eOperation_Read, nullptr);
-  aCssText.Truncate();
+  MOZ_ASSERT(aCssText.IsEmpty());
 
-  if (decl) {
+  if (auto* decl = GetOrCreateCSSDeclaration(eOperation_Read, nullptr)) {
     decl->ToString(aCssText);
   }
 }
@@ -165,9 +164,8 @@
 NS_IMETHODIMP
 nsDOMCSSDeclaration::GetPropertyValue(const nsACString& aPropertyName,
                                       nsAString& aReturn) {
-  aReturn.Truncate();
-  if (DeclarationBlock* decl =
-          GetOrCreateCSSDeclaration(eOperation_Read, nullptr)) {
+  MOZ_ASSERT(aReturn.IsEmpty());
+  if (auto* decl = GetOrCreateCSSDeclaration(eOperation_Read, nullptr)) {
     decl->GetPropertyValue(aPropertyName, aReturn);
   }
   return NS_OK;
@@ -175,9 +173,8 @@
 
 void nsDOMCSSDeclaration::GetPropertyPriority(const nsACString& aPropertyName,
                                               nsAString& aPriority) {
+  MOZ_ASSERT(aPriority.IsEmpty());
   DeclarationBlock* decl = GetOrCreateCSSDeclaration(eOperation_Read, nullptr);
-
-  aPriority.Truncate();
   if (decl && decl->GetPropertyIsImportant(aPropertyName)) {
     aPriority.AssignLiteral("important");
   }
diff -Nru firefox-84.0.2+build1/layout/style/nsICSSDeclaration.h firefox-85.0+build1/layout/style/nsICSSDeclaration.h
--- firefox-84.0.2+build1/layout/style/nsICSSDeclaration.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsICSSDeclaration.h	2021-01-18 19:58:17.000000000 +0000
@@ -21,14 +21,16 @@
 #include "mozilla/Attributes.h"
 #include "nsCSSPropertyID.h"
 #include "mozilla/dom/CSSValue.h"
+#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "nsStringFwd.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 
 class nsINode;
 class nsIPrincipal;
 namespace mozilla {
+class ErrorResult;
+
 namespace css {
 class Rule;
 }  // namespace css
diff -Nru firefox-84.0.2+build1/layout/style/nsStyleConsts.h firefox-85.0+build1/layout/style/nsStyleConsts.h
--- firefox-84.0.2+build1/layout/style/nsStyleConsts.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsStyleConsts.h	2021-01-18 19:58:17.000000000 +0000
@@ -91,12 +91,6 @@
       StyleDisplayFrom(StyleDisplayOutside::Block, StyleDisplayInside::MozBox),
   MozInlineBox =
       StyleDisplayFrom(StyleDisplayOutside::Inline, StyleDisplayInside::MozBox),
-  MozGrid =
-      StyleDisplayFrom(StyleDisplayOutside::XUL, StyleDisplayInside::MozGrid),
-  MozGridGroup = StyleDisplayFrom(StyleDisplayOutside::XUL,
-                                  StyleDisplayInside::MozGridGroup),
-  MozGridLine = StyleDisplayFrom(StyleDisplayOutside::XUL,
-                                 StyleDisplayInside::MozGridLine),
   MozStack =
       StyleDisplayFrom(StyleDisplayOutside::XUL, StyleDisplayInside::MozStack),
   MozDeck =
diff -Nru firefox-84.0.2+build1/layout/style/nsStyleStruct.h firefox-85.0+build1/layout/style/nsStyleStruct.h
--- firefox-84.0.2+build1/layout/style/nsStyleStruct.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/nsStyleStruct.h	2021-01-18 19:58:17.000000000 +0000
@@ -16,8 +16,6 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/ServoStyleConstsInlines.h"
 #include "mozilla/StaticPrefs_layout.h"
-#include "mozilla/StaticPtr.h"
-#include "mozilla/StyleColorInlines.h"
 #include "mozilla/UniquePtr.h"
 #include "nsColor.h"
 #include "nsCoord.h"
@@ -27,28 +25,21 @@
 #include "nsStyleConsts.h"
 #include "nsChangeHint.h"
 #include "nsTimingFunction.h"
-#include "nsCOMPtr.h"
 #include "nsTArray.h"
-#include "nsCSSValue.h"
 #include "imgIContainer.h"
 #include "imgRequestProxy.h"
-#include "Orientation.h"
 #include "CounterStyleManager.h"
 #include <cstddef>  // offsetof()
-#include <utility>
 #include "X11UndefineNone.h"
 
 class nsIFrame;
 class nsIURI;
 class nsTextFrame;
-class nsPresContext;
 struct nsStyleDisplay;
 struct nsStyleVisibility;
 namespace mozilla {
 class ComputedStyle;
-namespace dom {
-class ImageTracker;
-}  // namespace dom
+
 }  // namespace mozilla
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/layout/style/PreferenceSheet.cpp firefox-85.0+build1/layout/style/PreferenceSheet.cpp
--- firefox-84.0.2+build1/layout/style/PreferenceSheet.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/PreferenceSheet.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -9,6 +9,7 @@
 #include "ServoCSSParser.h"
 #include "MainThreadUtils.h"
 #include "mozilla/Encoding.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_devtools.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/layout/style/res/html.css firefox-85.0+build1/layout/style/res/html.css
--- firefox-84.0.2+build1/layout/style/res/html.css	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/res/html.css	2021-01-18 19:58:17.000000000 +0000
@@ -575,8 +575,10 @@
   padding-inline-start: 40px;
 }
 
-menu[type="context"] {
-  display: none !important;
+@supports -moz-bool-pref("dom.menuitem.enabled") {
+  menu[type="context"] {
+    display: none !important;
+  }
 }
 
 ul, ol, menu {
@@ -841,15 +843,12 @@
 
 dialog:-moz-modal-dialog {
   -moz-top-layer: top !important;
-  /* This is a temporary solution until the relevant CSSWG issues
-   * (https://github.com/w3c/csswg-drafts/issues/4645)
-   * are resolved. */
   position: fixed;
-  max-height: 100vh;
-  max-width: 100vw;
-  top: 50%;
-  transform: translateY(-50%);
   overflow: auto;
+  inset-block-start: 0;
+  inset-block-end: 0;
+  max-width: calc(100% - 6px - 2em);
+  max-height: calc(100% - 6px - 2em);
 }
 
 /* https://html.spec.whatwg.org/#flow-content-3 */
diff -Nru firefox-84.0.2+build1/layout/style/res/pluginproblem.css firefox-85.0+build1/layout/style/res/pluginproblem.css
--- firefox-84.0.2+build1/layout/style/res/pluginproblem.css	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/res/pluginproblem.css	2021-01-18 19:58:17.000000000 +0000
@@ -4,17 +4,9 @@
 
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 
-embed:-moz-handler-blocked,
-embed:-moz-handler-crashed,
-embed:-moz-handler-clicktoplay,
-embed:-moz-handler-vulnerable-updatable,
-embed:-moz-handler-vulnerable-no-update,
-object:-moz-handler-blocked,
-object:-moz-handler-crashed,
-object:-moz-handler-clicktoplay,
-object:-moz-handler-vulnerable-updatable,
-object:-moz-handler-vulnerable-no-update {
+embed:-moz-handler-noplugins,
+object:-moz-handler-noplugins {
     display: inline-block;
     overflow: hidden;
-    opacity: 1 !important;
+    opacity: 0 !important;
 }
diff -Nru firefox-84.0.2+build1/layout/style/ServoBindings.toml firefox-85.0+build1/layout/style/ServoBindings.toml
--- firefox-84.0.2+build1/layout/style/ServoBindings.toml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ServoBindings.toml	2021-01-18 19:58:17.000000000 +0000
@@ -28,6 +28,7 @@
     "mozilla/GeckoBindings.h",
     "mozilla/ServoBindings.h",
     "mozilla/ComputedStyle.h",
+    "mozilla/PresShell.h",
     "mozilla/ServoTraversalStatistics.h",
     "mozilla/SizeOfState.h",
     "nsCSSProps.h",
diff -Nru firefox-84.0.2+build1/layout/style/ServoCSSParser.h firefox-85.0+build1/layout/style/ServoCSSParser.h
--- firefox-84.0.2+build1/layout/style/ServoCSSParser.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ServoCSSParser.h	2021-01-18 19:58:17.000000000 +0000
@@ -9,9 +9,8 @@
 #ifndef mozilla_ServoCSSParser_h
 #define mozilla_ServoCSSParser_h
 
-#include "mozilla/gfx/Types.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/ServoStyleConsts.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/gfx/Matrix.h"
 #include "mozilla/ServoTypes.h"
 #include "nsColor.h"
 #include "nsCSSPropertyID.h"
@@ -21,12 +20,15 @@
 struct nsCSSRect;
 struct nsTimingFunction;
 struct RawServoDeclarationBlock;
+template <class T>
+class RefPtr;
 
 namespace mozilla {
 
 class ServoStyleSet;
 class SharedFontList;
 struct URLExtraData;
+union StyleComputedFontStyleDescriptor;
 
 namespace css {
 class Loader;
diff -Nru firefox-84.0.2+build1/layout/style/ServoElementSnapshot.cpp firefox-85.0+build1/layout/style/ServoElementSnapshot.cpp
--- firefox-84.0.2+build1/layout/style/ServoElementSnapshot.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ServoElementSnapshot.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -38,4 +38,50 @@
   mContains |= Flags::OtherPseudoClassState;
 }
 
+void ServoElementSnapshot::AddAttrs(const Element& aElement,
+                                    int32_t aNameSpaceID, nsAtom* aAttribute) {
+  if (aNameSpaceID == kNameSpaceID_None) {
+    if (aAttribute == nsGkAtoms::_class) {
+      if (mClassAttributeChanged) {
+        return;
+      }
+      mClassAttributeChanged = true;
+    } else if (aAttribute == nsGkAtoms::id) {
+      if (mIdAttributeChanged) {
+        return;
+      }
+      mIdAttributeChanged = true;
+    }
+  }
+
+  if (!mChangedAttrNames.Contains(aAttribute)) {
+    mChangedAttrNames.AppendElement(aAttribute);
+  }
+
+  if (HasAttrs()) {
+    return;
+  }
+
+  uint32_t attrCount = aElement.GetAttrCount();
+  mAttrs.SetCapacity(attrCount);
+  for (uint32_t i = 0; i < attrCount; ++i) {
+    const BorrowedAttrInfo info = aElement.GetAttrInfoAt(i);
+    MOZ_ASSERT(info);
+    mAttrs.AppendElement(AttrArray::InternalAttr{*info.mName, *info.mValue});
+  }
+
+  mContains |= Flags::Attributes;
+  if (aElement.HasID()) {
+    mContains |= Flags::Id;
+  }
+
+  if (const nsAttrValue* classValue = aElement.GetClasses()) {
+    // FIXME(emilio): It's pretty unfortunate that this is only relevant for
+    // SVG, yet it's a somewhat expensive copy. We should be able to do
+    // better!
+    mClass = *classValue;
+    mContains |= Flags::MaybeClass;
+  }
+}
+
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/layout/style/ServoElementSnapshot.h firefox-85.0+build1/layout/style/ServoElementSnapshot.h
--- firefox-84.0.2+build1/layout/style/ServoElementSnapshot.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ServoElementSnapshot.h	2021-01-18 19:58:17.000000000 +0000
@@ -7,10 +7,10 @@
 #ifndef mozilla_ServoElementSnapshot_h
 #define mozilla_ServoElementSnapshot_h
 
+#include "AttrArray.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/TypedEnumBits.h"
 #include "mozilla/dom/BorrowedAttrInfo.h"
-#include "mozilla/dom/Element.h"
 #include "nsAttrName.h"
 #include "nsAttrValue.h"
 #include "nsChangeHint.h"
@@ -18,6 +18,9 @@
 #include "nsAtom.h"
 
 namespace mozilla {
+namespace dom {
+class Element;
+}
 
 /**
  * A bitflags enum class used to determine what data does a ServoElementSnapshot
@@ -79,8 +82,7 @@
    * The attribute name and namespace are used to note which kind of attribute
    * has changed.
    */
-  inline void AddAttrs(const Element&, int32_t aNameSpaceID,
-                       nsAtom* aAttribute);
+  void AddAttrs(const Element&, int32_t aNameSpaceID, nsAtom* aAttribute);
 
   /**
    * Captures some other pseudo-class matching state not included in
@@ -166,53 +168,6 @@
   bool mIdAttributeChanged : 1;
 };
 
-inline void ServoElementSnapshot::AddAttrs(const Element& aElement,
-                                           int32_t aNameSpaceID,
-                                           nsAtom* aAttribute) {
-  if (aNameSpaceID == kNameSpaceID_None) {
-    if (aAttribute == nsGkAtoms::_class) {
-      if (mClassAttributeChanged) {
-        return;
-      }
-      mClassAttributeChanged = true;
-    } else if (aAttribute == nsGkAtoms::id) {
-      if (mIdAttributeChanged) {
-        return;
-      }
-      mIdAttributeChanged = true;
-    }
-  }
-
-  if (!mChangedAttrNames.Contains(aAttribute)) {
-    mChangedAttrNames.AppendElement(aAttribute);
-  }
-
-  if (HasAttrs()) {
-    return;
-  }
-
-  uint32_t attrCount = aElement.GetAttrCount();
-  mAttrs.SetCapacity(attrCount);
-  for (uint32_t i = 0; i < attrCount; ++i) {
-    const BorrowedAttrInfo info = aElement.GetAttrInfoAt(i);
-    MOZ_ASSERT(info);
-    mAttrs.AppendElement(AttrArray::InternalAttr{*info.mName, *info.mValue});
-  }
-
-  mContains |= Flags::Attributes;
-  if (aElement.HasID()) {
-    mContains |= Flags::Id;
-  }
-
-  if (const nsAttrValue* classValue = aElement.GetClasses()) {
-    // FIXME(emilio): It's pretty unfortunate that this is only relevant for
-    // SVG, yet it's a somewhat expensive copy. We should be able to do
-    // better!
-    mClass = *classValue;
-    mContains |= Flags::MaybeClass;
-  }
-}
-
 }  // namespace mozilla
 
 #endif
diff -Nru firefox-84.0.2+build1/layout/style/ServoStyleConstsInlines.h firefox-85.0+build1/layout/style/ServoStyleConstsInlines.h
--- firefox-84.0.2+build1/layout/style/ServoStyleConstsInlines.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/ServoStyleConstsInlines.h	2021-01-18 19:58:17.000000000 +0000
@@ -981,6 +981,11 @@
   return AspectRatio::FromSize(_0, _1);
 }
 
+template <>
+inline AspectRatio StyleAspectRatio::ToLayoutRatio() const {
+  return HasRatio() ? ratio.AsRatio().ToLayoutRatio() : AspectRatio();
+}
+
 }  // namespace mozilla
 
 #endif
diff -Nru firefox-84.0.2+build1/layout/style/SharedStyleSheetCache.cpp firefox-85.0+build1/layout/style/SharedStyleSheetCache.cpp
--- firefox-84.0.2+build1/layout/style/SharedStyleSheetCache.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/SharedStyleSheetCache.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -10,7 +10,9 @@
 #include "mozilla/StyleSheet.h"
 #include "mozilla/css/SheetLoadData.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/ServoBindings.h"
+#include "nsContentUtils.h"
 #include "nsXULPrototypeCache.h"
 
 extern mozilla::LazyLogModule sCssLoaderLog;
diff -Nru firefox-84.0.2+build1/layout/style/SharedStyleSheetCache.h firefox-85.0+build1/layout/style/SharedStyleSheetCache.h
--- firefox-84.0.2+build1/layout/style/SharedStyleSheetCache.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/SharedStyleSheetCache.h	2021-01-18 19:58:17.000000000 +0000
@@ -20,6 +20,7 @@
 //    might re-create it.
 
 #include "mozilla/PrincipalHashKey.h"
+#include "mozilla/WeakPtr.h"
 #include "mozilla/css/Loader.h"
 #include "nsDataHashtable.h"
 #include "nsIMemoryReporter.h"
diff -Nru firefox-84.0.2+build1/layout/style/StreamLoader.cpp firefox-85.0+build1/layout/style/StreamLoader.cpp
--- firefox-84.0.2+build1/layout/style/StreamLoader.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/style/StreamLoader.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -7,7 +7,6 @@
 #include "mozilla/css/StreamLoader.h"
 
 #include "mozilla/Encoding.h"
-#include "mozilla/ScopeExit.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
 #include "nsIInputStream.h"
diff -Nru firefox-84.0.2+build1/layout/style/StyleAnimationValue.cpp firefox-85.0+build1/layout/style/StyleAnimationValue.cpp
--- firefox-84.0.2+build1/layout/style/StyleAnimationValue.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/StyleAnimationValue.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -143,7 +143,7 @@
   if (!canDraw2D) {
     return Size();
   }
-  return transform2d.ScaleFactors(true);
+  return transform2d.ScaleFactors();
 }
 
 void AnimationValue::SerializeSpecifiedValue(nsCSSPropertyID aProperty,
diff -Nru firefox-84.0.2+build1/layout/style/StyleSheet.h firefox-85.0+build1/layout/style/StyleSheet.h
--- firefox-84.0.2+build1/layout/style/StyleSheet.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/StyleSheet.h	2021-01-18 19:58:17.000000000 +0000
@@ -14,17 +14,17 @@
 #include "mozilla/MozPromise.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ServoBindingTypes.h"
-#include "mozilla/ServoUtils.h"
+#include "mozilla/ServoTypes.h"
 #include "mozilla/StyleSheetInfo.h"
-#include "mozilla/URLExtraData.h"
 #include "nsICSSLoaderObserver.h"
+#include "nsIPrincipal.h"
 #include "nsWrapperCache.h"
-#include "nsCompatibility.h"
 #include "nsStringFwd.h"
 
+class nsIGlobalObject;
 class nsINode;
 class nsIPrincipal;
-struct RawServoSharedMemoryBuilder;
+struct ServoCssRules;
 class nsIReferrerInfo;
 
 namespace mozilla {
@@ -53,7 +53,6 @@
 class DocumentOrShadowRoot;
 class MediaList;
 class ShadowRoot;
-class SRIMetadata;
 struct CSSStyleSheetInit;
 }  // namespace dom
 
diff -Nru firefox-84.0.2+build1/layout/style/StyleSheetInfo.h firefox-85.0+build1/layout/style/StyleSheetInfo.h
--- firefox-84.0.2+build1/layout/style/StyleSheetInfo.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/StyleSheetInfo.h	2021-01-18 19:58:17.000000000 +0000
@@ -11,10 +11,11 @@
 #include "mozilla/dom/SRIMetadata.h"
 #include "mozilla/CORSMode.h"
 
-#include "nsIURI.h"
 #include "nsIReferrerInfo.h"
 
 class nsIPrincipal;
+class nsIURI;
+struct RawServoStyleSheetContents;
 
 namespace mozilla {
 class StyleSheet;
diff -Nru firefox-84.0.2+build1/layout/style/StyleSheetInlines.h firefox-85.0+build1/layout/style/StyleSheetInlines.h
--- firefox-84.0.2+build1/layout/style/StyleSheetInlines.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/StyleSheetInlines.h	2021-01-18 19:58:17.000000000 +0000
@@ -7,7 +7,9 @@
 #ifndef mozilla_StyleSheetInlines_h
 #define mozilla_StyleSheetInlines_h
 
+#include "mozilla/dom/Document.h"
 #include "mozilla/StyleSheet.h"
+#include "nsIGlobalObject.h"
 #include "nsINode.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/layout/style/test/chrome/bug418986-2.js firefox-85.0+build1/layout/style/test/chrome/bug418986-2.js
--- firefox-84.0.2+build1/layout/style/test/chrome/bug418986-2.js	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/chrome/bug418986-2.js	2021-01-18 19:58:17.000000000 +0000
@@ -1,9 +1,5 @@
 // # Bug 418986, part 2.
 
-/* jshint esnext:true */
-/* jshint loopfunc:true */
-/* global window, screen, ok, SpecialPowers, matchMedia */
-
 const is_chrome_window = window.location.protocol === "chrome:";
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
diff -Nru firefox-84.0.2+build1/layout/style/test/gtest/StyloParsingBench.cpp firefox-85.0+build1/layout/style/test/gtest/StyloParsingBench.cpp
--- firefox-84.0.2+build1/layout/style/test/gtest/StyloParsingBench.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/gtest/StyloParsingBench.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsString.h"
 #include "ExampleStylesheet.h"
 #include "ServoBindings.h"
+#include "mozilla/dom/DOMString.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/Utf8.h"
 #include "mozilla/NullPrincipalURI.h"
diff -Nru firefox-84.0.2+build1/layout/style/test/mochitest.ini firefox-85.0+build1/layout/style/test/mochitest.ini
--- firefox-84.0.2+build1/layout/style/test/mochitest.ini	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/mochitest.ini	2021-01-18 19:58:17.000000000 +0000
@@ -194,7 +194,6 @@
 skip-if = toolkit == 'android'
 [test_computed_style.html]
 [test_computed_style_bfcache_display_none.html]
-skip-if = fission # bug 1665165
 [test_computed_style_difference.html]
 [test_computed_style_grid_with_pseudo.html]
 [test_computed_style_in_created_document.html]
diff -Nru firefox-84.0.2+build1/layout/style/test/property_database.js firefox-85.0+build1/layout/style/test/property_database.js
--- firefox-84.0.2+build1/layout/style/test/property_database.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/property_database.js	2021-01-18 19:58:17.000000000 +0000
@@ -289,90 +289,87 @@
         "cross-fade(#F0F8FF, rgb(0, 0, 0), rgba(0, 255, 0, 1) 25%)",
       ]
     : []),
-  ...(IsCSSPropertyPrefEnabled("layout.css.conic-gradient.enabled")
-    ? [
-        // Conic gradient
-        "conic-gradient(red, blue)",
-        "conic-gradient(red,blue,yellow)",
-        "conic-gradient(  red  ,  blue,   yellow)",
-        "conic-gradient(red 0, blue 50deg)",
-        "conic-gradient(red 10%, blue 50%)",
-        "conic-gradient(red -50deg, blue 50deg)",
-        "conic-gradient(red 50deg, blue 0.3turn, yellow 200grad, orange 60% 5rad)",
-
-        "conic-gradient(red 0 100%)",
-        "conic-gradient(red 0 50%, blue 50%)",
-        "conic-gradient(red 0 50deg, blue 50% 100%)",
-        "conic-gradient(red 0 50%, 0deg, blue 50%)",
-        "conic-gradient(red 0deg 50%, 0%, blue 50% 100%)",
-
-        "conic-gradient(from 0, red, blue)",
-        "conic-gradient(from 40deg, red, blue)",
-        "conic-gradient(from 0.4turn, red, blue)",
-        "conic-gradient(from 200grad, red, blue)",
-        "conic-gradient(from 5rad, red, blue)",
-
-        "conic-gradient(at top, red, blue)",
-        "conic-gradient(at top left, red, blue)",
-        "conic-gradient(at left top, red, blue)",
-        "conic-gradient(at center center, red, blue)",
-        "conic-gradient(at 20% bottom, red, blue)",
-        "conic-gradient(at center 20%, red, blue)",
-        "conic-gradient(at left 35px, red, blue)",
-        "conic-gradient(at 10% 10em, red, blue)",
-        "conic-gradient(at 44px top, red, blue)",
-        "conic-gradient(at 0 0, red, blue)",
-        "conic-gradient(at 10px, red, blue)",
-
-        "conic-gradient(at calc(25%) top, red, blue)",
-        "conic-gradient(at left calc(25%), red, blue)",
-        "conic-gradient(at calc(25px) top, red, blue)",
-        "conic-gradient(at left calc(25px), red, blue)",
-        "conic-gradient(at calc(-25%) top, red, blue)",
-        "conic-gradient(at left calc(-25%), red, blue)",
-        "conic-gradient(at calc(-25px) top, red, blue)",
-        "conic-gradient(at left calc(-25px), red, blue)",
-        "conic-gradient(at calc(100px + -25%) top, red, blue)",
-        "conic-gradient(at left calc(100px + -25%), red, blue)",
-        "conic-gradient(at calc(100px + -25px) top, red, blue)",
-        "conic-gradient(at left calc(100px + -25px), red, blue)",
-
-        "conic-gradient(from 0 at 0 0, red, blue)",
-        "conic-gradient(from 40deg at 50%, red, blue)",
-        "conic-gradient(from 0.4turn at left 30%, red, blue)",
-        "conic-gradient(from 200grad at calc(100px + -25%) top, red, blue)",
-        "conic-gradient(from 5rad at 10px, red, blue)",
-
-        "repeating-conic-gradient(red, blue)",
-        "repeating-conic-gradient(red, yellow, blue)",
-        "repeating-conic-gradient(red 1deg, yellow 20%, blue 5rad, green)",
-        "repeating-conic-gradient(red, yellow, green, blue 50%)",
-        "repeating-conic-gradient(red -50%, yellow -25%, green, blue)",
-        "repeating-conic-gradient(red -99deg, yellow, green, blue 120%)",
-        "repeating-conic-gradient(#ffff00, #ef3, rgba(10, 20, 30, 0.4))",
-        "repeating-conic-gradient(rgba(10, 20, 30, 0.4), #ffff00, #ef3)",
-
-        "repeating-conic-gradient(from 0, red, blue)",
-        "repeating-conic-gradient(from 40deg, red, blue)",
-        "repeating-conic-gradient(from 0.4turn, red, blue)",
-        "repeating-conic-gradient(from 200grad, red, blue)",
-        "repeating-conic-gradient(from 5rad, red, blue)",
-
-        "repeating-conic-gradient(at top left, red, blue)",
-        "repeating-conic-gradient(at 0 0, red, blue)",
-        "repeating-conic-gradient(at 20% bottom, red, blue)",
-        "repeating-conic-gradient(at center 20%, red, blue)",
-        "repeating-conic-gradient(at left 35px, red, blue)",
-        "repeating-conic-gradient(at 10% 10em, red, blue)",
-        "repeating-conic-gradient(at 44px top, red, blue)",
-
-        "repeating-conic-gradient(from 0 at 0 0, red, blue)",
-        "repeating-conic-gradient(from 40deg at 50%, red, blue)",
-        "repeating-conic-gradient(from 0.4turn at left 30%, red, blue)",
-        "repeating-conic-gradient(from 200grad at calc(100px + -25%) top, red, blue)",
-        "repeating-conic-gradient(from 5rad at 10px, red, blue)",
-      ]
-    : []),
+
+  // Conic gradient
+  "conic-gradient(red, blue)",
+  "conic-gradient(red,blue,yellow)",
+  "conic-gradient(  red  ,  blue,   yellow)",
+  "conic-gradient(red 0, blue 50deg)",
+  "conic-gradient(red 10%, blue 50%)",
+  "conic-gradient(red -50deg, blue 50deg)",
+  "conic-gradient(red 50deg, blue 0.3turn, yellow 200grad, orange 60% 5rad)",
+
+  "conic-gradient(red 0 100%)",
+  "conic-gradient(red 0 50%, blue 50%)",
+  "conic-gradient(red 0 50deg, blue 50% 100%)",
+  "conic-gradient(red 0 50%, 0deg, blue 50%)",
+  "conic-gradient(red 0deg 50%, 0%, blue 50% 100%)",
+
+  "conic-gradient(from 0, red, blue)",
+  "conic-gradient(from 40deg, red, blue)",
+  "conic-gradient(from 0.4turn, red, blue)",
+  "conic-gradient(from 200grad, red, blue)",
+  "conic-gradient(from 5rad, red, blue)",
+
+  "conic-gradient(at top, red, blue)",
+  "conic-gradient(at top left, red, blue)",
+  "conic-gradient(at left top, red, blue)",
+  "conic-gradient(at center center, red, blue)",
+  "conic-gradient(at 20% bottom, red, blue)",
+  "conic-gradient(at center 20%, red, blue)",
+  "conic-gradient(at left 35px, red, blue)",
+  "conic-gradient(at 10% 10em, red, blue)",
+  "conic-gradient(at 44px top, red, blue)",
+  "conic-gradient(at 0 0, red, blue)",
+  "conic-gradient(at 10px, red, blue)",
+
+  "conic-gradient(at calc(25%) top, red, blue)",
+  "conic-gradient(at left calc(25%), red, blue)",
+  "conic-gradient(at calc(25px) top, red, blue)",
+  "conic-gradient(at left calc(25px), red, blue)",
+  "conic-gradient(at calc(-25%) top, red, blue)",
+  "conic-gradient(at left calc(-25%), red, blue)",
+  "conic-gradient(at calc(-25px) top, red, blue)",
+  "conic-gradient(at left calc(-25px), red, blue)",
+  "conic-gradient(at calc(100px + -25%) top, red, blue)",
+  "conic-gradient(at left calc(100px + -25%), red, blue)",
+  "conic-gradient(at calc(100px + -25px) top, red, blue)",
+  "conic-gradient(at left calc(100px + -25px), red, blue)",
+
+  "conic-gradient(from 0 at 0 0, red, blue)",
+  "conic-gradient(from 40deg at 50%, red, blue)",
+  "conic-gradient(from 0.4turn at left 30%, red, blue)",
+  "conic-gradient(from 200grad at calc(100px + -25%) top, red, blue)",
+  "conic-gradient(from 5rad at 10px, red, blue)",
+
+  "repeating-conic-gradient(red, blue)",
+  "repeating-conic-gradient(red, yellow, blue)",
+  "repeating-conic-gradient(red 1deg, yellow 20%, blue 5rad, green)",
+  "repeating-conic-gradient(red, yellow, green, blue 50%)",
+  "repeating-conic-gradient(red -50%, yellow -25%, green, blue)",
+  "repeating-conic-gradient(red -99deg, yellow, green, blue 120%)",
+  "repeating-conic-gradient(#ffff00, #ef3, rgba(10, 20, 30, 0.4))",
+  "repeating-conic-gradient(rgba(10, 20, 30, 0.4), #ffff00, #ef3)",
+
+  "repeating-conic-gradient(from 0, red, blue)",
+  "repeating-conic-gradient(from 40deg, red, blue)",
+  "repeating-conic-gradient(from 0.4turn, red, blue)",
+  "repeating-conic-gradient(from 200grad, red, blue)",
+  "repeating-conic-gradient(from 5rad, red, blue)",
+
+  "repeating-conic-gradient(at top left, red, blue)",
+  "repeating-conic-gradient(at 0 0, red, blue)",
+  "repeating-conic-gradient(at 20% bottom, red, blue)",
+  "repeating-conic-gradient(at center 20%, red, blue)",
+  "repeating-conic-gradient(at left 35px, red, blue)",
+  "repeating-conic-gradient(at 10% 10em, red, blue)",
+  "repeating-conic-gradient(at 44px top, red, blue)",
+
+  "repeating-conic-gradient(from 0 at 0 0, red, blue)",
+  "repeating-conic-gradient(from 40deg at 50%, red, blue)",
+  "repeating-conic-gradient(from 0.4turn at left 30%, red, blue)",
+  "repeating-conic-gradient(from 200grad at calc(100px + -25%) top, red, blue)",
+  "repeating-conic-gradient(from 5rad at 10px, red, blue)",
 
   // 2008 GRADIENTS: -webkit-gradient()
   // ----------------------------------
@@ -815,7 +812,7 @@
         "cross-fade(red blue)",
         "cross-fade()",
         "cross-fade(50%, blue 50%)",
-        // Old sytnax
+        // Old syntax
         "cross-fade(red, white, 50%)",
         // see: <https://github.com/w3c/csswg-drafts/issues/5333>. This
         // may become invalid depending on how discussion on that issue
@@ -11792,8 +11789,19 @@
       "none",
       "pan-x",
       "pan-y",
+      "pinch-zoom",
       "pan-x pan-y",
       "pan-y pan-x",
+      "pinch-zoom pan-x",
+      "pinch-zoom pan-y",
+      "pan-x pinch-zoom",
+      "pan-y pinch-zoom",
+      "pinch-zoom pan-x pan-y",
+      "pinch-zoom pan-y pan-x",
+      "pan-x pinch-zoom pan-y",
+      "pan-y pinch-zoom pan-x",
+      "pan-x pan-y pinch-zoom",
+      "pan-y pan-x pinch-zoom",
       "manipulation",
     ],
     invalid_values: [
@@ -11812,30 +11820,83 @@
       "pan-y none",
       "pan-x pan-x",
       "pan-y pan-y",
+      "auto pinch-zoom",
+      "pinch-zoom auto",
+      "none pinch-zoom",
+      "pinch-zoom none",
+      "pinch-zoom pinch-zoom",
       "pan-x pan-y none",
       "pan-x none pan-y",
       "none pan-x pan-y",
       "pan-y pan-x none",
       "pan-y none pan-x",
       "none pan-y pan-x",
+      "pan-x pinch-zoom none",
+      "pan-x none pinch-zoom",
+      "none pan-x pinch-zoom",
+      "pinch-zoom pan-x none",
+      "pinch-zoom none pan-x",
+      "none pinch-zoom pan-x",
+      "pinch-zoom pan-y none",
+      "pinch-zoom none pan-y",
+      "none pinch-zoom pan-y",
+      "pan-y pinch-zoom none",
+      "pan-y none pinch-zoom",
+      "none pan-y pinch-zoom",
       "pan-x pan-y auto",
       "pan-x auto pan-y",
       "auto pan-x pan-y",
       "pan-y pan-x auto",
       "pan-y auto pan-x",
       "auto pan-y pan-x",
+      "pan-x pinch-zoom auto",
+      "pan-x auto pinch-zoom",
+      "auto pan-x pinch-zoom",
+      "pinch-zoom pan-x auto",
+      "pinch-zoom auto pan-x",
+      "auto pinch-zoom pan-x",
+      "pinch-zoom pan-y auto",
+      "pinch-zoom auto pan-y",
+      "auto pinch-zoom pan-y",
+      "pan-y pinch-zoom auto",
+      "pan-y auto pinch-zoom",
+      "auto pan-y pinch-zoom",
       "pan-x pan-y zoom",
       "pan-x zoom pan-y",
       "zoom pan-x pan-y",
       "pan-y pan-x zoom",
       "pan-y zoom pan-x",
       "zoom pan-y pan-x",
+      "pinch-zoom pan-y zoom",
+      "pinch-zoom zoom pan-y",
+      "zoom pinch-zoom pan-y",
+      "pan-y pinch-zoom zoom",
+      "pan-y zoom pinch-zoom",
+      "zoom pan-y pinch-zoom",
+      "pan-x pinch-zoom zoom",
+      "pan-x zoom pinch-zoom",
+      "zoom pan-x pinch-zoom",
+      "pinch-zoom pan-x zoom",
+      "pinch-zoom zoom pan-x",
+      "zoom pinch-zoom pan-x",
       "pan-x pan-y pan-x",
       "pan-x pan-x pan-y",
       "pan-y pan-x pan-x",
       "pan-y pan-x pan-y",
       "pan-y pan-y pan-x",
       "pan-x pan-y pan-y",
+      "pan-x pinch-zoom pan-x",
+      "pan-x pan-x pinch-zoom",
+      "pinch-zoom pan-x pan-x",
+      "pinch-zoom pan-x pinch-zoom",
+      "pinch-zoom pinch-zoom pan-x",
+      "pan-x pinch-zoom pinch-zoom",
+      "pinch-zoom pan-y pinch-zoom",
+      "pinch-zoom pinch-zoom pan-y",
+      "pan-y pinch-zoom pinch-zoom",
+      "pan-y pinch-zoom pan-y",
+      "pan-y pan-y pinch-zoom",
+      "pinch-zoom pan-y pan-y",
       "manipulation none",
       "none manipulation",
       "manipulation auto",
@@ -11847,12 +11908,26 @@
       "pan-x manipulation",
       "manipulation pan-y",
       "pan-y manipulation",
+      "manipulation pinch-zoom",
+      "pinch-zoom manipulation",
       "manipulation pan-x pan-y",
       "pan-x manipulation pan-y",
       "pan-x pan-y manipulation",
       "manipulation pan-y pan-x",
       "pan-y manipulation pan-x",
       "pan-y pan-x manipulation",
+      "manipulation pinch-zoom pan-y",
+      "pinch-zoom manipulation pan-y",
+      "pinch-zoom pan-y manipulation",
+      "manipulation pan-y pinch-zoom",
+      "pan-y manipulation pinch-zoom",
+      "pan-y pinch-zoom manipulation",
+      "manipulation pan-x pinch-zoom",
+      "pan-x manipulation pinch-zoom",
+      "pan-x pinch-zoom manipulation",
+      "manipulation pinch-zoom pan-x",
+      "pinch-zoom manipulation pan-x",
+      "pinch-zoom pan-x manipulation",
     ],
   };
 }
diff -Nru firefox-84.0.2+build1/layout/style/test/test_layout_css_xul_display_values_content_enabled.html firefox-85.0+build1/layout/style/test/test_layout_css_xul_display_values_content_enabled.html
--- firefox-84.0.2+build1/layout/style/test/test_layout_css_xul_display_values_content_enabled.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/test_layout_css_xul_display_values_content_enabled.html	2021-01-18 19:58:17.000000000 +0000
@@ -5,9 +5,6 @@
 const VALUES = [
   "-moz-box",
   "-moz-inline-box",
-  "-moz-grid",
-  "-moz-grid-group",
-  "-moz-grid-line",
   "-moz-deck",
   "-moz-popup",
 ];
diff -Nru firefox-84.0.2+build1/layout/style/test/test_non_content_accessible_values.html firefox-85.0+build1/layout/style/test/test_non_content_accessible_values.html
--- firefox-84.0.2+build1/layout/style/test/test_non_content_accessible_values.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/test_non_content_accessible_values.html	2021-01-18 19:58:17.000000000 +0000
@@ -11,9 +11,6 @@
     "-moz-colheadertext",
   ],
   "display": [
-    "-moz-grid",
-    "-moz-grid-group",
-    "-moz-grid-line",
     "-moz-deck",
     "-moz-popup",
   ],
diff -Nru firefox-84.0.2+build1/layout/style/test/test_selectors.html firefox-85.0+build1/layout/style/test/test_selectors.html
--- firefox-84.0.2+build1/layout/style/test/test_selectors.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/test/test_selectors.html	2021-01-18 19:58:17.000000000 +0000
@@ -1243,6 +1243,10 @@
     test_balanced_unparseable(":not(:nth-child(2k))");
     test_balanced_unparseable(":not(:nth-child(()))");
 
+    // Bug 1685621 - Serialization of :not()
+    should_serialize_to(":not([disabled][selected])", ":not([disabled][selected])");
+    should_serialize_to(":not([disabled],[selected])", ":not([disabled], [selected])");
+
     // :-moz-any()
     let parseable_if_any_is_is_and_has_better_error_recovery =
       SpecialPowers.getBoolPref("layout.css.moz-any-is-is.enabled") &&
diff -Nru firefox-84.0.2+build1/layout/style/URLExtraData.h firefox-85.0+build1/layout/style/URLExtraData.h
--- firefox-84.0.2+build1/layout/style/URLExtraData.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/style/URLExtraData.h	2021-01-18 19:58:17.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include <utility>
 
-#include "ReferrerInfo.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/UserAgentStyleSheetID.h"
 #include "mozilla/dom/URL.h"
diff -Nru firefox-84.0.2+build1/layout/svg/crashtests/1678947.html firefox-85.0+build1/layout/svg/crashtests/1678947.html
--- firefox-84.0.2+build1/layout/svg/crashtests/1678947.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/layout/svg/crashtests/1678947.html	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,21 @@
+<html>
+<head>
+<style>
+ol { float: right; }
+</style>
+<script>
+function start() {
+	document.elementFromPoint(0,1);
+	document.dir = "rtl";
+}
+</script>
+</head>
+<body>
+<svg onload="start()" requiredExtensions="x">
+  <g id="a"/></g>
+<text>
+<textPath xlink:href="#a">
+</svg>
+<ol></ol>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/layout/svg/crashtests/322185-1.svg firefox-85.0+build1/layout/svg/crashtests/322185-1.svg
--- firefox-84.0.2+build1/layout/svg/crashtests/322185-1.svg	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/crashtests/322185-1.svg	2021-01-18 19:58:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg">
-  <g id="g" style="display: -moz-grid-line; overflow: hidden;">
+  <g id="g" style="display: -moz-box; overflow: hidden;">
     <circle />
   </g>
 </svg>
diff -Nru firefox-84.0.2+build1/layout/svg/crashtests/crashtests.list firefox-85.0+build1/layout/svg/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/svg/crashtests/crashtests.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/crashtests/crashtests.list	2021-01-18 19:58:17.000000000 +0000
@@ -236,3 +236,4 @@
 load 1605223-1.html
 load 1609663.html
 load 1671950.html
+load 1678947.html
diff -Nru firefox-84.0.2+build1/layout/svg/CSSFilterInstance.cpp firefox-85.0+build1/layout/svg/CSSFilterInstance.cpp
--- firefox-84.0.2+build1/layout/svg/CSSFilterInstance.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/CSSFilterInstance.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -281,7 +281,7 @@
   Size radiusInFilterSpace(radiusInFrameSpaceInCSSPx,
                            radiusInFrameSpaceInCSSPx);
   gfxSize frameSpaceInCSSPxToFilterSpaceScale =
-      mFrameSpaceInCSSPxToFilterSpaceTransform.ScaleFactors(true);
+      mFrameSpaceInCSSPxToFilterSpaceTransform.ScaleFactors();
   radiusInFilterSpace.Scale(frameSpaceInCSSPxToFilterSpaceScale.width,
                             frameSpaceInCSSPxToFilterSpaceScale.height);
 
@@ -310,7 +310,7 @@
 
   // Convert the radius to filter space.
   gfxSize frameSpaceInCSSPxToFilterSpaceScale =
-      mFrameSpaceInCSSPxToFilterSpaceTransform.ScaleFactors(true);
+      mFrameSpaceInCSSPxToFilterSpaceTransform.ScaleFactors();
   offsetInFilterSpace.x *= frameSpaceInCSSPxToFilterSpaceScale.width;
   offsetInFilterSpace.y *= frameSpaceInCSSPxToFilterSpaceScale.height;
 
diff -Nru firefox-84.0.2+build1/layout/svg/FilterInstance.cpp firefox-85.0+build1/layout/svg/FilterInstance.cpp
--- firefox-84.0.2+build1/layout/svg/FilterInstance.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/FilterInstance.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/Unused.h"
 #include "mozilla/gfx/Filters.h"
 #include "mozilla/gfx/Helpers.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/PatternHelpers.h"
 #include "mozilla/ISVGDisplayableFrame.h"
 #include "mozilla/StaticPrefs_gfx.h"
@@ -70,7 +71,7 @@
       UserSpaceMetricsForFrame(aFilteredFrame);
 
   gfxContextMatrixAutoSaveRestore autoSR(aCtx);
-  gfxSize scaleFactors = aCtx->CurrentMatrixDouble().ScaleFactors(true);
+  gfxSize scaleFactors = aCtx->CurrentMatrixDouble().ScaleFactors();
   if (scaleFactors.IsEmpty()) {
     return;
   }
@@ -509,7 +510,7 @@
 
 bool FilterInstance::ComputeUserSpaceToFilterSpaceScale() {
   if (mTargetFrame) {
-    mUserSpaceToFilterSpaceScale = mPaintTransform.ScaleFactors(true);
+    mUserSpaceToFilterSpaceScale = mPaintTransform.ScaleFactors();
     if (mUserSpaceToFilterSpaceScale.width <= 0.0f ||
         mUserSpaceToFilterSpaceScale.height <= 0.0f) {
       // Nothing should be rendered.
diff -Nru firefox-84.0.2+build1/layout/svg/FilterInstance.h firefox-85.0+build1/layout/svg/FilterInstance.h
--- firefox-84.0.2+build1/layout/svg/FilterInstance.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/FilterInstance.h	2021-01-18 19:58:17.000000000 +0000
@@ -19,8 +19,10 @@
 #include "nsTArray.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/webrender/WebRenderTypes.h"
+#include "mozilla/ServoStyleConsts.h"
 
 class gfxContext;
+class nsIContent;
 class nsIFrame;
 struct WrFiltersHolder;
 
@@ -31,6 +33,10 @@
 class UserSpaceMetrics;
 }  // namespace dom
 
+namespace image {
+struct imgDrawingParams;
+}
+
 /**
  * This class performs all filter processing.
  *
diff -Nru firefox-84.0.2+build1/layout/svg/SVGContainerFrame.cpp firefox-85.0+build1/layout/svg/SVGContainerFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGContainerFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGContainerFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -67,7 +67,7 @@
   mFrames.DestroyFrame(aOldFrame);
 }
 
-bool SVGContainerFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool SVGContainerFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   if (mState & NS_FRAME_IS_NONDISPLAY) {
     // We don't maintain overflow rects.
     // XXX It would have be better if the restyle request hadn't even happened.
@@ -309,7 +309,7 @@
     RemoveStateBits(NS_FRAME_FIRST_REFLOW);  // tell our children
   }
 
-  nsOverflowAreas overflowRects;
+  OverflowAreas overflowRects;
 
   for (nsIFrame* kid = mFrames.FirstChild(); kid; kid = kid->GetNextSibling()) {
     ISVGDisplayableFrame* SVGFrame = do_QueryFrame(kid);
diff -Nru firefox-84.0.2+build1/layout/svg/SVGContainerFrame.h firefox-85.0+build1/layout/svg/SVGContainerFrame.h
--- firefox-84.0.2+build1/layout/svg/SVGContainerFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGContainerFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -91,7 +91,7 @@
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override {}
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
  protected:
   /**
diff -Nru firefox-84.0.2+build1/layout/svg/SVGContextPaint.cpp firefox-85.0+build1/layout/svg/SVGContextPaint.cpp
--- firefox-84.0.2+build1/layout/svg/SVGContextPaint.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGContextPaint.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -9,6 +9,7 @@
 #include "gfxContext.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/SVGDocument.h"
 #include "mozilla/StaticPrefs_svg.h"
diff -Nru firefox-84.0.2+build1/layout/svg/SVGFEContainerFrame.cpp firefox-85.0+build1/layout/svg/SVGFEContainerFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGFEContainerFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGFEContainerFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -59,7 +59,7 @@
   virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute,
                                     int32_t aModType) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override {
+  virtual bool ComputeCustomOverflow(OverflowAreas& aOverflowAreas) override {
     // We don't maintain a ink overflow rect
     return false;
   }
diff -Nru firefox-84.0.2+build1/layout/svg/SVGFEImageFrame.cpp firefox-85.0+build1/layout/svg/SVGFEImageFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGFEImageFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGFEImageFrame.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -66,7 +66,7 @@
       Visibility aNewVisibility,
       const Maybe<OnNonvisible>& aNonvisibleAction = Nothing()) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override {
+  virtual bool ComputeCustomOverflow(OverflowAreas& aOverflowAreas) override {
     // We don't maintain a ink overflow rect
     return false;
   }
diff -Nru firefox-84.0.2+build1/layout/svg/SVGFELeafFrame.cpp firefox-85.0+build1/layout/svg/SVGFELeafFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGFELeafFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGFELeafFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -56,7 +56,7 @@
   virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute,
                                     int32_t aModType) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override {
+  virtual bool ComputeCustomOverflow(OverflowAreas& aOverflowAreas) override {
     // We don't maintain a ink overflow rect
     return false;
   }
diff -Nru firefox-84.0.2+build1/layout/svg/SVGFEUnstyledLeafFrame.cpp firefox-85.0+build1/layout/svg/SVGFEUnstyledLeafFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGFEUnstyledLeafFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGFEUnstyledLeafFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -50,7 +50,7 @@
   virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute,
                                     int32_t aModType) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override {
+  virtual bool ComputeCustomOverflow(OverflowAreas& aOverflowAreas) override {
     // We don't maintain a ink overflow rect
     return false;
   }
diff -Nru firefox-84.0.2+build1/layout/svg/SVGFilterPaintCallback.h firefox-85.0+build1/layout/svg/SVGFilterPaintCallback.h
--- firefox-84.0.2+build1/layout/svg/SVGFilterPaintCallback.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGFilterPaintCallback.h	2021-01-18 19:58:17.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef LAYOUT_SVG_SVGFILTERPAINTCALLBACK_H_
 #define LAYOUT_SVG_SVGFILTERPAINTCALLBACK_H_
 
+#include "gfxMatrix.h"
 #include "nsRect.h"
 
 class nsIFrame;
@@ -14,6 +15,10 @@
 
 namespace mozilla {
 
+namespace image {
+struct imgDrawingParams;
+}
+
 class SVGFilterPaintCallback {
  public:
   using imgDrawingParams = image::imgDrawingParams;
diff -Nru firefox-84.0.2+build1/layout/svg/SVGForeignObjectFrame.cpp firefox-85.0+build1/layout/svg/SVGForeignObjectFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGForeignObjectFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGForeignObjectFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -365,7 +365,7 @@
   auto* anonKid = PrincipalChildList().FirstChild();
   nsRect overflow = anonKid->InkOverflowRect();
 
-  nsOverflowAreas overflowAreas(overflow, overflow);
+  OverflowAreas overflowAreas(overflow, overflow);
   FinishAndStoreOverflow(overflowAreas, mRect.Size());
 
   // Now unset the various reflow bits:
diff -Nru firefox-84.0.2+build1/layout/svg/SVGGeometryFrame.cpp firefox-85.0+build1/layout/svg/SVGGeometryFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGGeometryFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGGeometryFrame.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -365,7 +365,7 @@
   }
 
   nsRect overflow = nsRect(nsPoint(0, 0), mRect.Size());
-  nsOverflowAreas overflowAreas(overflow, overflow);
+  OverflowAreas overflowAreas(overflow, overflow);
   FinishAndStoreOverflow(overflowAreas, mRect.Size());
 
   RemoveStateBits(NS_FRAME_FIRST_REFLOW | NS_FRAME_IS_DIRTY |
diff -Nru firefox-84.0.2+build1/layout/svg/SVGImageFrame.cpp firefox-85.0+build1/layout/svg/SVGImageFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGImageFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGImageFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -730,7 +730,7 @@
   }
 
   nsRect overflow = nsRect(nsPoint(0, 0), mRect.Size());
-  nsOverflowAreas overflowAreas(overflow, overflow);
+  OverflowAreas overflowAreas(overflow, overflow);
   FinishAndStoreOverflow(overflowAreas, mRect.Size());
 
   RemoveStateBits(NS_FRAME_FIRST_REFLOW | NS_FRAME_IS_DIRTY |
diff -Nru firefox-84.0.2+build1/layout/svg/SVGIntegrationUtils.cpp firefox-85.0+build1/layout/svg/SVGIntegrationUtils.cpp
--- firefox-84.0.2+build1/layout/svg/SVGIntegrationUtils.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGIntegrationUtils.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -10,6 +10,7 @@
 // Keep others in (case-insensitive) order:
 #include "gfxDrawable.h"
 
+#include "Layers.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsCSSRendering.h"
 #include "nsDisplayList.h"
@@ -95,7 +96,7 @@
     // continuations are not set correctly while reflowing.
     if (SVGIntegrationUtils::UsingOverflowAffectingEffects(aFrame) &&
         !aInReflow) {
-      nsOverflowAreas* preTransformOverflows =
+      OverflowAreas* preTransformOverflows =
           aFrame->GetProperty(nsIFrame::PreTransformOverflowAreasProperty());
 
       MOZ_ASSERT(!preTransformOverflows,
diff -Nru firefox-84.0.2+build1/layout/svg/SVGObserverUtils.cpp firefox-85.0+build1/layout/svg/SVGObserverUtils.cpp
--- firefox-84.0.2+build1/layout/svg/SVGObserverUtils.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGObserverUtils.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -27,6 +27,7 @@
 #include "nsInterfaceHashtable.h"
 #include "nsIReflowCallback.h"
 #include "nsISupportsImpl.h"
+#include "nsNetUtil.h"
 #include "nsTHashtable.h"
 #include "nsURIHashKey.h"
 #include "SVGFilterFrame.h"
diff -Nru firefox-84.0.2+build1/layout/svg/SVGObserverUtils.h firefox-85.0+build1/layout/svg/SVGObserverUtils.h
--- firefox-84.0.2+build1/layout/svg/SVGObserverUtils.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGObserverUtils.h	2021-01-18 19:58:17.000000000 +0000
@@ -10,7 +10,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/IDTracker.h"
 #include "FrameProperties.h"
-#include "mozilla/dom/Element.h"
 #include "nsID.h"
 #include "nsIFrame.h"  // only for LayoutFrameType
 #include "nsIMutationObserver.h"
@@ -35,6 +34,7 @@
 
 namespace dom {
 class CanvasRenderingContext2D;
+class Element;
 class SVGGeometryElement;
 }  // namespace dom
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/layout/svg/SVGOuterSVGFrame.cpp firefox-85.0+build1/layout/svg/SVGOuterSVGFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGOuterSVGFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGOuterSVGFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -11,7 +11,7 @@
 #include "gfxContext.h"
 #include "nsDisplayList.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIObjectLoadingContent.h"
+#include "nsObjectLoadingContent.h"
 #include "nsSubDocumentFrame.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/SVGForeignObjectFrame.h"
@@ -518,7 +518,7 @@
 }
 
 /* virtual */
-void SVGOuterSVGFrame::UnionChildOverflow(nsOverflowAreas& aOverflowAreas) {
+void SVGOuterSVGFrame::UnionChildOverflow(OverflowAreas& aOverflowAreas) {
   // See the comments in Reflow above.
 
   // WARNING!! Keep this in sync with Reflow above!
@@ -923,13 +923,12 @@
 
   if (bc->GetParent()->IsInProcess()) {
     if (Element* embedder = bc->GetEmbedderElement()) {
-      nsSubDocumentFrame* sdf = do_QueryFrame(embedder->GetPrimaryFrame());
-      if (!sdf) {
-        return;
+      if (nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(embedder)) {
+        static_cast<nsObjectLoadingContent*>(olc.get())
+            ->SubdocumentIntrinsicSizeOrRatioChanged(aIntrinsicSize,
+                                                     aIntrinsicRatio);
       }
-
-      sdf->SubdocumentIntrinsicSizeOrRatioChanged(aIntrinsicSize,
-                                                  aIntrinsicRatio);
+      return;
     }
   }
 
diff -Nru firefox-84.0.2+build1/layout/svg/SVGOuterSVGFrame.h firefox-85.0+build1/layout/svg/SVGOuterSVGFrame.h
--- firefox-84.0.2+build1/layout/svg/SVGOuterSVGFrame.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGOuterSVGFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -77,7 +77,7 @@
   virtual void DidReflow(nsPresContext* aPresContext,
                          const ReflowInput* aReflowInput) override;
 
-  virtual void UnionChildOverflow(nsOverflowAreas& aOverflowAreas) override;
+  void UnionChildOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
   virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                 const nsDisplayListSet& aLists) override;
diff -Nru firefox-84.0.2+build1/layout/svg/SVGSwitchFrame.cpp firefox-85.0+build1/layout/svg/SVGSwitchFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGSwitchFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGSwitchFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -217,7 +217,7 @@
     RemoveStateBits(NS_FRAME_FIRST_REFLOW);  // tell our children
   }
 
-  nsOverflowAreas overflowRects;
+  OverflowAreas overflowRects;
 
   nsIFrame* child = GetActiveChildFrame();
   ReflowAllSVGTextFramesInsideNonActiveChildren(child);
diff -Nru firefox-84.0.2+build1/layout/svg/SVGTextFrame.cpp firefox-85.0+build1/layout/svg/SVGTextFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGTextFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGTextFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -3369,7 +3369,7 @@
                   NS_FRAME_HAS_DIRTY_CHILDREN);
 
   nsRect overflow = nsRect(nsPoint(0, 0), mRect.Size());
-  nsOverflowAreas overflowAreas(overflow, overflow);
+  OverflowAreas overflowAreas(overflow, overflow);
   FinishAndStoreOverflow(overflowAreas, mRect.Size());
 
   // XXX SVGContainerFrame::ReflowSVG only looks at its ISVGDisplayableFrame
@@ -4136,9 +4136,11 @@
   }
 
   if (aContent->IsSVGElement(nsGkAtoms::textPath)) {
+    // Any ‘y’ attributes on horizontal <textPath> elements are ignored.
+    // Similarly, for vertical <texPath>s x attributes are ignored.
     // <textPath> elements behave as if they have x="0" y="0" on them, but only
-    // if there is not a value for the coordinates that got inherited from a
-    // parent.  We skip this if there is no text content, so that empty
+    // if there is not a value for the non-ignored coordinate that got inherited
+    // from a parent.  We skip this if there is no text content, so that empty
     // <textPath>s don't interrupt the layout of text in the parent element.
     if (HasTextContent(aContent)) {
       if (MOZ_UNLIKELY(aIndex >= mPositions.Length())) {
@@ -4147,10 +4149,11 @@
             "found by iterating content");
         return false;
       }
-      if (!mPositions[aIndex].IsXSpecified()) {
+      bool vertical = GetWritingMode().IsVertical();
+      if (vertical || !mPositions[aIndex].IsXSpecified()) {
         mPositions[aIndex].mPosition.x = 0.0;
       }
-      if (!mPositions[aIndex].IsYSpecified()) {
+      if (!vertical || !mPositions[aIndex].IsYSpecified()) {
         mPositions[aIndex].mPosition.y = 0.0;
       }
       mPositions[aIndex].mStartOfChunk = true;
@@ -4657,9 +4660,10 @@
       it.Next();
     }
 
+    bool skippedEndOfTextPath = false;
+
     // Loop for each character in the text path.
-    while (!it.AtEnd() && it.TextPathFrame() &&
-           it.TextPathFrame()->GetContent() == textPath) {
+    while (!it.AtEnd() && it.TextPathFrame()) {
       // The index of the cluster or ligature group's first character.
       uint32_t i = it.TextElementCharIndex();
 
@@ -4692,6 +4696,10 @@
         // group that begins inside the text path as being affected
         // by it.
         if (it.IsOriginalCharSkipped()) {
+          if (!it.TextPathFrame()) {
+            skippedEndOfTextPath = true;
+            break;
+          }
           // Leave partialAdvance unchanged.
         } else if (it.IsClusterAndLigatureGroupStart()) {
           break;
@@ -4700,6 +4708,9 @@
         }
         partialAdvances.AppendElement(partialAdvance);
       }
+      if (skippedEndOfTextPath) {
+        break;
+      }
 
       // Any final undisplayed characters the CharIterator skipped over.
       MOZ_ASSERT(j <= it.TextElementCharIndex());
diff -Nru firefox-84.0.2+build1/layout/svg/SVGViewFrame.cpp firefox-85.0+build1/layout/svg/SVGViewFrame.cpp
--- firefox-84.0.2+build1/layout/svg/SVGViewFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/svg/SVGViewFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -61,7 +61,7 @@
   virtual nsresult AttributeChanged(int32_t aNameSpaceID, nsAtom* aAttribute,
                                     int32_t aModType) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override {
+  virtual bool ComputeCustomOverflow(OverflowAreas& aOverflowAreas) override {
     // We don't maintain a ink overflow rect
     return false;
   }
diff -Nru firefox-84.0.2+build1/layout/tables/crashtests/1144641.html firefox-85.0+build1/layout/tables/crashtests/1144641.html
--- firefox-84.0.2+build1/layout/tables/crashtests/1144641.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/crashtests/1144641.html	2021-01-18 19:58:17.000000000 +0000
@@ -13,23 +13,23 @@
         padding: 5px;
         display: table;
         -moz-transform:translate3d(0, 80px, 0);
-      } 
+      }
       #el0:before {
-        display: -moz-grid;
+        display: -moz-box;
         content: counter(c, hiragana) attr(id);
         counter-increment: c 694;
-      } 
+      }
       #el0:after {
         counter-reset: c 694;
         content: counter(c, cjk-ideographic) attr(id);
-      } 
+      }
       #el1 {
         text-shadow: 0px 20px 0px, 0px -20px 10px;
         line-height: 4px;
         transform: translate3d(0px, -300px, 0px);
         display: table-row-group;
         border-spacing: 7px;
-      } 
+      }
       #el1:after {
         counter-reset: c;
         display: -moz-box;
@@ -38,11 +38,11 @@
       }
       #el2 {
         display: table-row-group;
-        -moz-transform:translate3d(0, 80px, 0); 
+        -moz-transform:translate3d(0, 80px, 0);
       }
       #el2:after {
         content: counter(c, cjk-ideographic) attr(id);
-      } 
+      }
     </style>
     <script>
       onload = function() {
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableCellFrame.cpp firefox-85.0+build1/layout/tables/nsTableCellFrame.cpp
--- firefox-84.0.2+build1/layout/tables/nsTableCellFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableCellFrame.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -522,8 +522,7 @@
   BuildDisplayListForChild(aBuilder, kid, aLists);
 }
 
-nsIFrame::LogicalSides nsTableCellFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsTableCellFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
@@ -627,7 +626,7 @@
   }
 }
 
-bool nsTableCellFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool nsTableCellFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   nsRect bounds(nsPoint(0, 0), GetSize());
   bounds.Inflate(GetBorderOverflow());
 
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableCellFrame.h firefox-85.0+build1/layout/tables/nsTableCellFrame.h
--- firefox-84.0.2+build1/layout/tables/nsTableCellFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableCellFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -228,7 +228,7 @@
 
   void DecorateForSelection(DrawTarget* aDrawTarget, nsPoint aPt);
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
   virtual bool IsFrameOfType(uint32_t aFlags) const override {
     return nsContainerFrame::IsFrameOfType(aFlags & ~(nsIFrame::eTablePart));
@@ -252,8 +252,7 @@
                    ClassID aID);
   ~nsTableCellFrame();
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>& aConsumed = Nothing()) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   /**
    * GetBorderOverflow says how far the cell's own borders extend
@@ -285,8 +284,7 @@
 }
 
 inline void nsTableCellFrame::SetDesiredSize(const ReflowOutput& aDesiredSize) {
-  mozilla::WritingMode wm = aDesiredSize.GetWritingMode();
-  mDesiredSize = aDesiredSize.Size(wm).ConvertTo(GetWritingMode(), wm);
+  mDesiredSize = aDesiredSize.Size(GetWritingMode());
 }
 
 inline bool nsTableCellFrame::GetContentEmpty() const {
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableColGroupFrame.cpp firefox-85.0+build1/layout/tables/nsTableColGroupFrame.cpp
--- firefox-84.0.2+build1/layout/tables/nsTableColGroupFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableColGroupFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -297,8 +297,7 @@
   }
 }
 
-nsIFrame::LogicalSides nsTableColGroupFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+nsIFrame::LogicalSides nsTableColGroupFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableColGroupFrame.h firefox-85.0+build1/layout/tables/nsTableColGroupFrame.h
--- firefox-84.0.2+build1/layout/tables/nsTableColGroupFrame.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableColGroupFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -214,8 +214,7 @@
 
   void InsertColsReflow(int32_t aColIndex, const nsFrameList::Slice& aCols);
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>& = Nothing()) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   // data members
   int32_t mColCount;
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableFrame.cpp firefox-85.0+build1/layout/tables/nsTableFrame.cpp
--- firefox-84.0.2+build1/layout/tables/nsTableFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -1359,8 +1359,7 @@
   return GetOuterBCBorder(wm).GetPhysicalMargin(wm);
 }
 
-nsIFrame::LogicalSides nsTableFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsTableFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
@@ -2016,7 +2015,7 @@
   nsLayoutUtils::UnionChildOverflow(this, aDesiredSize.mOverflowAreas);
 }
 
-bool nsTableFrame::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) {
+bool nsTableFrame::ComputeCustomOverflow(OverflowAreas& aOverflowAreas) {
   // As above in Reflow, make sure the table overflow area includes the table
   // rect, and check for collapsed borders leaking out.
   if (ShouldApplyOverflowClipping(StyleDisplay()) != PhysicalAxes::Both) {
@@ -2147,7 +2146,7 @@
   nsTableFrame* firstInFlow = static_cast<nsTableFrame*>(FirstInFlow());
   nscoord iSize = firstInFlow->GetCollapsedISize(aWM, aBorderPadding);
   nscoord rgISize = iSize - GetColSpacing(-1) - GetColSpacing(GetColCount());
-  nsOverflowAreas overflow;
+  OverflowAreas overflow;
   // Walk the list of children
   for (uint32_t childX = 0; childX < rowGroups.Length(); childX++) {
     nsTableRowGroupFrame* rgFrame = rowGroups[childX];
@@ -2840,7 +2839,7 @@
 void nsTableFrame::ReflowChildren(TableReflowInput& aReflowInput,
                                   nsReflowStatus& aStatus,
                                   nsIFrame*& aLastChildReflowed,
-                                  nsOverflowAreas& aOverflowAreas) {
+                                  OverflowAreas& aOverflowAreas) {
   aStatus.Reset();
   aLastChildReflowed = nullptr;
 
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableFrame.h firefox-85.0+build1/layout/tables/nsTableFrame.h
--- firefox-84.0.2+build1/layout/tables/nsTableFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -549,7 +549,7 @@
                                    const nsRect& aOrigInkOverflow,
                                    bool aIsFirstReflow);
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
   // Return our wrapper frame.
   void AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult) override;
@@ -570,8 +570,7 @@
 
   void InitChildReflowInput(ReflowInput& aReflowInput);
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>& = Nothing()) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   void IterateBCBorders(BCPaintBorderAction& aAction, const nsRect& aDirtyRect);
 
@@ -589,7 +588,7 @@
 
   void ReflowChildren(TableReflowInput& aReflowInput, nsReflowStatus& aStatus,
                       nsIFrame*& aLastChildReflowed,
-                      nsOverflowAreas& aOverflowAreas);
+                      mozilla::OverflowAreas& aOverflowAreas);
 
   // This calls the col group and column reflow methods, which do two things:
   //  (1) set all the dimensions to 0
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableRowFrame.cpp firefox-85.0+build1/layout/tables/nsTableRowFrame.cpp
--- firefox-84.0.2+build1/layout/tables/nsTableRowFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableRowFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -549,8 +549,7 @@
   }
 }
 
-nsIFrame::LogicalSides nsTableRowFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsTableRowFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
@@ -1124,7 +1123,7 @@
 
   rowRect.BStart(wm) -= aRowOffset;
   rowRect.ISize(wm) = aISize;
-  nsOverflowAreas overflow;
+  OverflowAreas overflow;
   nscoord shift = 0;
   nsSize containerSize = mRect.Size();
 
@@ -1241,7 +1240,7 @@
         LogicalRect cellBounds(wm, 0, 0, cRect.ISize(wm), cRect.BSize(wm));
         nsRect cellPhysicalBounds =
             cellBounds.GetPhysicalRect(wm, containerSize);
-        nsOverflowAreas cellOverflow(cellPhysicalBounds, cellPhysicalBounds);
+        OverflowAreas cellOverflow(cellPhysicalBounds, cellPhysicalBounds);
         cellFrame->FinishAndStoreOverflow(cellOverflow,
                                           cRect.Size(wm).GetPhysicalSize(wm));
         nsTableFrame::RePositionViews(cellFrame);
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableRowFrame.h firefox-85.0+build1/layout/tables/nsTableRowFrame.h
--- firefox-84.0.2+build1/layout/tables/nsTableRowFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableRowFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -269,8 +269,7 @@
                             bool aBorderCollapse,
                             TableCellReflowInput& aReflowInput);
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>&) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   // row-specific methods
 
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableRowGroupFrame.cpp firefox-85.0+build1/layout/tables/nsTableRowGroupFrame.cpp
--- firefox-84.0.2+build1/layout/tables/nsTableRowGroupFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableRowGroupFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -257,8 +257,7 @@
   DisplayRows(aBuilder, this, aLists);
 }
 
-nsIFrame::LogicalSides nsTableRowGroupFrame::GetLogicalSkipSides(
-    const Maybe<SkipSidesDuringReflow>&) const {
+LogicalSides nsTableRowGroupFrame::GetLogicalSkipSides() const {
   LogicalSides skip(mWritingMode);
   if (MOZ_UNLIKELY(StyleBorder()->mBoxDecorationBreak ==
                    StyleBoxDecorationBreak::Clone)) {
@@ -877,7 +876,7 @@
     tableFrame->SetNeedToCollapse(true);
   }
 
-  nsOverflowAreas overflow;
+  OverflowAreas overflow;
 
   nsTableRowFrame* rowFrame = GetFirstRow();
   bool didCollapse = false;
@@ -1101,6 +1100,7 @@
 
   nsTableRowFrame* prevRowFrame = nullptr;
   aDesiredSize.Height() = 0;
+  aDesiredSize.SetOverflowAreasToDesiredBounds();
 
   const nscoord availWidth = aReflowInput.AvailableWidth();
   const nscoord availHeight = aReflowInput.AvailableHeight();
@@ -1441,7 +1441,7 @@
 }
 
 bool nsTableRowGroupFrame::ComputeCustomOverflow(
-    nsOverflowAreas& aOverflowAreas) {
+    OverflowAreas& aOverflowAreas) {
   // Row cursor invariants depend on the ink overflow area of the rows,
   // which may have changed, so we need to clear the cursor now.
   ClearRowCursor();
diff -Nru firefox-84.0.2+build1/layout/tables/nsTableRowGroupFrame.h firefox-85.0+build1/layout/tables/nsTableRowGroupFrame.h
--- firefox-84.0.2+build1/layout/tables/nsTableRowGroupFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tables/nsTableRowGroupFrame.h	2021-01-18 19:58:17.000000000 +0000
@@ -93,7 +93,7 @@
                       const ReflowInput& aReflowInput,
                       nsReflowStatus& aStatus) override;
 
-  virtual bool ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas) override;
+  bool ComputeCustomOverflow(mozilla::OverflowAreas& aOverflowAreas) override;
 
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const override;
@@ -328,8 +328,7 @@
   void InitChildReflowInput(nsPresContext& aPresContext, bool aBorderCollapse,
                             ReflowInput& aReflowInput);
 
-  LogicalSides GetLogicalSkipSides(
-      const Maybe<SkipSidesDuringReflow>&) const override;
+  LogicalSides GetLogicalSkipSides() const override;
 
   void PlaceChild(nsPresContext* aPresContext,
                   TableRowGroupReflowInput& aReflowInput, nsIFrame* aKidFrame,
diff -Nru firefox-84.0.2+build1/layout/tools/reftest/jar.mn firefox-85.0+build1/layout/tools/reftest/jar.mn
--- firefox-84.0.2+build1/layout/tools/reftest/jar.mn	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tools/reftest/jar.mn	2021-01-18 19:58:17.000000000 +0000
@@ -18,7 +18,6 @@
   content/text-shadow (../../reftests/text-shadow/*)
   content/xul-document-load (../../reftests/xul-document-load/*)
   content/xul (../../reftests/xul/*)
-  content/grid (../../xul/grid/reftests/*)
   content/xul/reftest (../../xul/reftest/*)
   content/fonts/fira (../../reftests/fonts/fira/*)
   content/fonts/sil (../../reftests/fonts/sil/*)
@@ -38,7 +37,6 @@
   content/crashtests/layout/base/crashtests (../../../layout/base/crashtests/*)
   content/crashtests/layout/xul/tree/crashtests (../../../layout/xul/tree/crashtests/*)
   content/crashtests/layout/xul/crashtests (../../../layout/xul/crashtests/*)
-  content/crashtests/layout/xul/grid/crashtests (../../../layout/xul/grid/crashtests/*)
   content/crashtests/layout/generic/crashtests (../../../layout/generic/crashtests/*)
   content/crashtests/layout/style/crashtests (../../../layout/style/crashtests/*)
   content/crashtests/gfx/tests/crashtests (../../../gfx/tests/crashtests/*)
diff -Nru firefox-84.0.2+build1/layout/tools/reftest/manifest.jsm firefox-85.0+build1/layout/tools/reftest/manifest.jsm
--- firefox-84.0.2+build1/layout/tools/reftest/manifest.jsm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/tools/reftest/manifest.jsm	2021-01-18 19:58:17.000000000 +0000
@@ -576,9 +576,8 @@
     var osxmatch = /Mac OS X (\d+).(\d+)$/.exec(hh.oscpu);
     sandbox.OSX = osxmatch ? parseInt(osxmatch[1]) * 100 + parseInt(osxmatch[2]) : undefined;
 
-    // see if we have the test plugin available,
-    // and set a sandox prop accordingly
-    sandbox.haveTestPlugin = !sandbox.Android && !!getTestPlugin("Test Plug-in");
+    // Plugins are no longer supported.  Don't try to use TestPlugin.
+    sandbox.haveTestPlugin = false;
 
     // Set a flag on sandbox if the windows default theme is active
     sandbox.windowsDefaultTheme = g.containingWindow.matchMedia("(-moz-windows-default-theme)").matches;
diff -Nru firefox-84.0.2+build1/layout/xul/crashtests/290743.html firefox-85.0+build1/layout/xul/crashtests/290743.html
--- firefox-84.0.2+build1/layout/xul/crashtests/290743.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/crashtests/290743.html	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 <html>
-<head><title>Testcase bug 290743 - This display:-moz-grid testcase freezes Mozilla</title></head>
-<body style="display:-moz-grid;">
+<head><title>Testcase bug 290743 - This display:-moz-deck testcase freezes Mozilla</title></head>
+<body style="display:-moz-deck;">
 <input type="radio"><input type="radio">
 </body>
-</html>
\ No newline at end of file
+</html>
diff -Nru firefox-84.0.2+build1/layout/xul/crashtests/470272.html firefox-85.0+build1/layout/xul/crashtests/470272.html
--- firefox-84.0.2+build1/layout/xul/crashtests/470272.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/crashtests/470272.html	2021-01-18 19:58:17.000000000 +0000
@@ -12,7 +12,7 @@
   <div style="display: none;"></div>
   <ul style="display: -moz-inline-box;"></ul>
   <span id="a">
-    <ul style="display: -moz-grid; overflow: scroll;"></ul>
+    <ul style="display: -moz-box; overflow: scroll;"></ul>
       <span style="display: -moz-inline-box; height: 10px;">
         <span style="position: absolute;"></span>
       </span>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/306911-grid-testcases2.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/306911-grid-testcases2.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/306911-grid-testcases2.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/306911-grid-testcases2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!-- vim:sw=4:ts=4:noet:
-  -->
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<tabbox>
-		<tabs>
-			<tab label="no group" />
-			<tab label="wacky orientations" />
-		</tabs>
-		<tabpanels>
-			<tabpanel>
-				<grid>
-					<row>
-						<label value="row 1,1" />
-						<label value="row 1,2" />
-					</row>
-					<row>
-						<label value="row 2,1" />
-						<label value="row 2,2" />
-					</row>
-					<column>
-						<label value="column 1,1" />
-						<label value="column 1,2" />
-					</column>
-					<column>
-						<label value="column 2,1" />
-						<label value="column 2,2" />
-					</column>
-				</grid>
-			</tabpanel>
-			<tabpanel>
-				<grid>
-					<rows style="color: green">
-						<row>
-							<label value="rows+row 1" />
-							<label value="rows+row 2" />
-						</row>
-						<column>
-							<label value="rows+column 1" />
-							<label value="rows+column 2" />
-						</column>
-						<rows style="color: purple">
-							<row>
-								<label value="rows+rows+row 1" />
-								<label value="rows+rows+row 2" />
-							</row>
-							<column>
-								<label value="rows+rows+column 1" />
-								<label value="rows+rows+column 2" />
-							</column>
-						</rows>
-						<columns style="color: blue">
-							<row>
-								<label value="rows+columns+row 1" />
-								<label value="rows+columns+row 2" />
-							</row>
-							<column>
-								<label value="rows+columns+column 1" />
-								<label value="rows+columns+column 2" />
-							</column>
-						</columns>
-					</rows>
-					<columns style="opacity: 0.7; color: lime">
-						<row>
-							<label value="columns+row 1" />
-							<label value="columns+row 2" />
-						</row>
-						<column>
-							<label value="columns+column 1" />
-							<label value="columns+column 2" />
-						</column>
-						<rows style="color: fuchsia">
-							<row>
-								<label value="columns+rows+row 1" />
-								<label value="columns+rows+row 2" />
-							</row>
-							<column>
-								<label value="columns+rows+column 1" />
-								<label value="columns+rows+column 2" />
-							</column>
-						</rows>
-						<columns style="color: aqua">
-							<row>
-								<label value="columns+columns+row 1" />
-								<label value="columns+columns+row 2" />
-							</row>
-							<column>
-								<label value="columns+columns+column 1" />
-								<label value="columns+columns+column 2" />
-							</column>
-						</columns>
-					</columns>
-				</grid>
-			</tabpanel>
-		</tabpanels>
-	</tabbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/306911-grid-testcases.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/306911-grid-testcases.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/306911-grid-testcases.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/306911-grid-testcases.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<tabbox>
-		<tabs>
-			<tab label="full grid" />
-			<tab label="grid alone" />
-			<tab label="columns alone" />
-			<tab label="rows alone" />
-			<tab label="column alone" />
-			<tab label="row alone" />
-			<tab label="wacky" />
-		</tabs>
-		<tabpanels>
-			<tabpanel>
-				<grid>
-					<rows style="color: blue">
-						<row>
-							<label value="row 1,1" />
-							<label value="row 1,2" />
-						</row>
-						<row>
-							<label value="row 2,1" />
-							<label value="row 2,2" />
-						</row>
-					</rows>
-					<columns style="color: fuchsia; opacity: 0.7">
-						<column>
-							<label value="column 1,1" />
-							<label value="column 1,2" />
-						</column>
-						<column>
-							<label value="column 2,1" />
-							<label value="column 2,2" />
-						</column>
-					</columns>
-				</grid>
-			</tabpanel>
-			<tabpanel>
-				<grid>
-					<label value="Text inside grid" />
-				</grid>
-			</tabpanel>
-			<tabpanel>
-				<columns>
-					<label value="Text inside columns" />
-				</columns>
-			</tabpanel>
-			<tabpanel>
-				<rows>
-					<label value="Text inside rows" />
-				</rows>
-			</tabpanel>
-			<tabpanel>
-				<column>
-					<label value="Text inside column" />
-				</column>
-			</tabpanel>
-			<tabpanel>
-				<row>
-					<label value="Text inside row" />
-				</row>
-			</tabpanel>
-			<tabpanel>
-				<grid>
-					<label value="Text inside grid one" />
-					<rows style="color: blue">
-                                                <label value="Text inside rows #1" />
-						<row>
-							<label value="row 1,1" />
-							<label value="row 1,2" />
-						</row>
-                                                <label value="Text inside rows #2" />
-						<row>
-							<label value="row 2,1" />
-							<label value="row 2,2" />
-						</row>
-                                                <label value="Text inside rows #3" />
-					</rows>
-					<label value="Text inside grid two" style="opacity: 0.7" />
-					<columns style="color: fuchsia; opacity: 0.7">
-                                                <label value="Text inside columns #1" />
-						<column>
-							<label value="column 1,1" />
-							<label value="column 1,2" />
-						</column>
-                                                <label value="Text inside columns #2" />
-						<column>
-							<label value="column 2,1" />
-							<label value="column 2,2" />
-						</column>
-                                                <label value="Text inside columns #3" />
-					</columns>
-					<label value="Text inside grid three" style="opacity: 0.4" />
-				</grid>
-			</tabpanel>
-		</tabpanels>
-	</tabbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/311710-1.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/311710-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/311710-1.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/311710-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<window title="Testcase bug 311710 - Evil xul testcase, using display:-moz-grid-group causes crash [@ nsGridRow::IsCollapsed]"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        xmlns:html="http://www.w3.org/1999/xhtml">
-<script type="application/x-javascript">
-function clickit() {
-  var button = document.getElementById('button');
-  var evt = document.createEvent("MouseEvents");
-  evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-  button.dispatchEvent(evt);
-}
-window.addEventListener('load', clickit, false);
-</script>
-
-        <grid>
-          <rows>
-            <row>
-            <separator/> 
-            </row>
-          </rows>
-        </grid>
-<button id="button" onclick="document.getElementsByTagName('row')[0].style.display='-moz-grid-group'" label="Mozilla should not crash, when clicking this button"/>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/312784-1.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/312784-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/312784-1.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/312784-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/x-JavaScript">
-function crash() {
-  document.getElementById("test").style.display = "none";
-}
-
-function clickit() {
-  var button = document.getElementById('button');
-  var evt = document.createEvent("MouseEvents");
-  evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-  button.dispatchEvent(evt);
-}
-
-window.onload = clickit;
-
-</script>
-
-        <grid>
-          <columns>
-            <column/>
-          </columns>
-          <rows id="test">
-	    <row><button label="placeholder"/></row>
-          </rows>
-        </grid>
-<button id="button" label="Crash me" onclick="crash()"/>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/313173-1.html firefox-85.0+build1/layout/xul/grid/crashtests/313173-1.html
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/313173-1.html	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/313173-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<html class="reftest-wait">
-<head>
-<script>
-setTimeout('document.documentElement.className = ""', 500);
-</script>
-<body>
-<iframe src="313173-1-inner.xhtml"></iframe>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/313173-1-inner.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/313173-1-inner.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/313173-1-inner.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/313173-1-inner.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<window title="Testcase bug - Crash with evil xul testcase, using -moz-grid/table-caption"
-        xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<grid flex="1">
-  <columns>
-    <column flex="1"/>
-  </columns>
-
-  <rows>
-    <row>
-    </row>
-  </rows>
-</grid>
-
-<html:script>
-function doe(){
-document.getElementsByTagName('columns')[0].style.display='table-caption';
-setTimeout(doe2,20);
-}
-function doe2(){
-document.getElementsByTagName('columns')[0].style.display='-moz-grid';
-}     
-
-function clickit() {
-  var button = document.getElementById('button');
-  var evt = document.createEvent("MouseEvents");
-  evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-  button.dispatchEvent(evt);
-setTimeout('clickit();', 20);
-}
-window.addEventListener('load', clickit, false);
-
-</html:script>
-        <html:button id="button" onclick="doe()" label="click">Clicking this should not crash Mozilla</html:button>
-</window>
-
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/321066-1.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/321066-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/321066-1.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/321066-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <grid>
-    <rows>
-      <column/>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/423802-crash.xhtml firefox-85.0+build1/layout/xul/grid/crashtests/423802-crash.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/423802-crash.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/423802-crash.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<window xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<grid>
-  <columns>
-    <column id="col1" flex="1"/>
-  <column id="col2" flex="1"/>
-    <column id="col3" flex="P-2"/>
-  </columns>
-</grid>
-
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/crashtests/crashtests.list firefox-85.0+build1/layout/xul/grid/crashtests/crashtests.list
--- firefox-84.0.2+build1/layout/xul/grid/crashtests/crashtests.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/crashtests/crashtests.list	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/306911-grid-testcases.xhtml
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/306911-grid-testcases2.xhtml
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/311710-1.xhtml
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/312784-1.xhtml
-load 313173-1.html
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/321066-1.xhtml
-load chrome://reftest/content/crashtests/layout/xul/grid/crashtests/423802-crash.xhtml
diff -Nru firefox-84.0.2+build1/layout/xul/grid/moz.build firefox-85.0+build1/layout/xul/grid/moz.build
--- firefox-84.0.2+build1/layout/xul/grid/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/moz.build	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# -*- 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 Files("**"):
-    BUG_COMPONENT = ("Core", "XUL")
-
-EXPORTS += [
-    "nsGrid.h",
-    "nsGridCell.h",
-    "nsGridLayout2.h",
-    "nsGridRow.h",
-    "nsGridRowGroupLayout.h",
-    "nsGridRowLayout.h",
-    "nsGridRowLeafFrame.h",
-    "nsGridRowLeafLayout.h",
-    "nsIGridPart.h",
-]
-
-UNIFIED_SOURCES += [
-    "nsGrid.cpp",
-    "nsGridCell.cpp",
-    "nsGridLayout2.cpp",
-    "nsGridRow.cpp",
-    "nsGridRowGroupFrame.cpp",
-    "nsGridRowGroupLayout.cpp",
-    "nsGridRowLayout.cpp",
-    "nsGridRowLeafFrame.cpp",
-    "nsGridRowLeafLayout.cpp",
-]
-
-FINAL_LIBRARY = "xul"
-LOCAL_INCLUDES += [
-    "..",
-    "../../forms",
-    "../../generic",
-    "../../style",
-]
-
-if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-    CXXFLAGS += ["-Wno-error=shadow"]
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridCell.cpp firefox-85.0+build1/layout/xul/grid/nsGridCell.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridCell.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridCell.cpp	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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGridCell.h"
-#include "nsIFrame.h"
-#include "nsGridLayout2.h"
-
-nsGridCell::nsGridCell() : mBoxInColumn(nullptr), mBoxInRow(nullptr) {
-  MOZ_COUNT_CTOR(nsGridCell);
-}
-
-nsGridCell::~nsGridCell() { MOZ_COUNT_DTOR(nsGridCell); }
-
-nsSize nsGridCell::GetXULPrefSize(nsBoxLayoutState& aState) {
-  nsSize sum(0, 0);
-
-  // take our 2 children and add them up.
-  // we are as wide as the widest child plus its left offset
-  // we are tall as the tallest child plus its top offset
-
-  if (mBoxInColumn) {
-    nsSize pref = mBoxInColumn->GetXULPrefSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInColumn, pref);
-
-    nsBoxLayout::AddLargestSize(sum, pref);
-  }
-
-  if (mBoxInRow) {
-    nsSize pref = mBoxInRow->GetXULPrefSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInRow, pref);
-
-    nsBoxLayout::AddLargestSize(sum, pref);
-  }
-
-  return sum;
-}
-
-nsSize nsGridCell::GetXULMinSize(nsBoxLayoutState& aState) {
-  nsSize sum(0, 0);
-
-  // take our 2 children and add them up.
-  // we are as wide as the widest child plus its left offset
-  // we are tall as the tallest child plus its top offset
-
-  if (mBoxInColumn) {
-    nsSize min = mBoxInColumn->GetXULMinSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInColumn, min);
-
-    nsBoxLayout::AddLargestSize(sum, min);
-  }
-
-  if (mBoxInRow) {
-    nsSize min = mBoxInRow->GetXULMinSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInRow, min);
-
-    nsBoxLayout::AddLargestSize(sum, min);
-  }
-
-  return sum;
-}
-
-nsSize nsGridCell::GetXULMaxSize(nsBoxLayoutState& aState) {
-  nsSize sum(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
-
-  // take our 2 children and add them up.
-  // we are as wide as the smallest child plus its left offset
-  // we are tall as the shortest child plus its top offset
-
-  if (mBoxInColumn) {
-    nsSize max = mBoxInColumn->GetXULMaxSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInColumn, max);
-
-    nsBoxLayout::AddSmallestSize(sum, max);
-  }
-
-  if (mBoxInRow) {
-    nsSize max = mBoxInRow->GetXULMaxSize(aState);
-
-    nsIFrame::AddXULMargin(mBoxInRow, max);
-
-    nsBoxLayout::AddSmallestSize(sum, max);
-  }
-
-  return sum;
-}
-
-bool nsGridCell::IsXULCollapsed() {
-  return ((mBoxInColumn && mBoxInColumn->IsXULCollapsed()) ||
-          (mBoxInRow && mBoxInRow->IsXULCollapsed()));
-}
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridCell.h firefox-85.0+build1/layout/xul/grid/nsGridCell.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridCell.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridCell.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +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/. */
-
-/**
-
-  Author:
-  Eric D Vaughan
-
-**/
-
-#ifndef nsGridCell_h___
-#define nsGridCell_h___
-
-#include "mozilla/Attributes.h"
-
-class nsBoxLayoutState;
-struct nsSize;
-class nsIFrame;
-
-/*
- * Grid cell is what makes up the cellmap in the grid. Each GridCell contains
- * 2 pointers. One to the matching box in the columns and one to the matching
- * box in the rows. Remember that you can put content in both rows and columns.
- * When asked for preferred/min/max sizes it works like a stack and takes the
- * biggest sizes.
- */
-
-class nsGridCell final {
- public:
-  nsGridCell();
-  ~nsGridCell();
-
-  nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState);
-  nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState);
-  nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState);
-  bool IsXULCollapsed();
-
-  // accessors
-  nsIFrame* GetBoxInColumn() { return mBoxInColumn; }
-  nsIFrame* GetBoxInRow() { return mBoxInRow; }
-  void SetBoxInRow(nsIFrame* aBox) { mBoxInRow = aBox; }
-  void SetBoxInColumn(nsIFrame* aBox) { mBoxInColumn = aBox; }
-
- private:
-  nsIFrame* mBoxInColumn;
-  nsIFrame* mBoxInRow;
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGrid.cpp firefox-85.0+build1/layout/xul/grid/nsGrid.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGrid.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGrid.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1146 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGrid.h"
-#include "nsGridRowGroupLayout.h"
-#include "nsIFrame.h"
-#include "nsIScrollableFrame.h"
-#include "nsSprocketLayout.h"
-#include "nsGridLayout2.h"
-#include "nsGridRow.h"
-#include "nsGridCell.h"
-#include "mozilla/ReflowInput.h"
-
-/*
-The grid control expands the idea of boxes from 1 dimension to 2 dimensions.
-It works by allowing the XUL to define a collection of rows and columns and then
-stacking them on top of each other. Here is and example.
-
-Example 1:
-
-<grid>
-   <columns>
-      <column/>
-      <column/>
-   </columns>
-
-   <rows>
-      <row/>
-      <row/>
-   </rows>
-</grid>
-
-example 2:
-
-<grid>
-   <columns>
-      <column flex="1"/>
-      <column flex="1"/>
-   </columns>
-
-   <rows>
-      <row>
-         <label value="hello"/>
-         <label value="there"/>
-      </row>
-   </rows>
-</grid>
-
-example 3:
-
-<grid>
-
-<rows>
-      <row>
-         <label value="hello"/>
-         <label value="there"/>
-      </row>
-   </rows>
-
-   <columns>
-      <column>
-         <label value="Hey I'm in the column and I'm on top!"/>
-      </column>
-      <column/>
-   </columns>
-
-</grid>
-
-Usually the columns are first and the rows are second, so the rows will be drawn
-on top of the columns. You can reverse this by defining the rows first. Other
-tags are then placed in the <row> or <column> tags causing the grid to
-accommodate everyone. It does this by creating 3 things: A cellmap, a row list,
-and a column list. The cellmap is a 2 dimensional array of nsGridCells. Each
-cell contains 2 boxes.  One cell from the column list and one from the row list.
-When a cell is asked for its size it returns that smallest size it can be to
-accommodate the 2 cells. Row lists and Column lists use the same data structure:
-nsGridRow. Essentially a row and column are the same except a row goes alone the
-x axis and a column the y. To make things easier and save code everything is
-written in terms of the x dimension. A flag is passed in called "isHorizontal"
-that can flip the calculations to the y axis.
-
-Usually the number of cells in a row match the number of columns, but not
-always. It is possible to define 5 columns for a grid but have 10 cells in one
-of the rows. In this case 5 extra columns will be added to the column list to
-handle the situation. These are called extraColumns/Rows.
-*/
-
-using namespace mozilla;
-
-nsGrid::nsGrid()
-    : mBox(nullptr),
-      mRowsBox(nullptr),
-      mColumnsBox(nullptr),
-      mNeedsRebuild(true),
-      mRowCount(0),
-      mColumnCount(0),
-      mExtraRowCount(0),
-      mExtraColumnCount(0),
-      mMarkingDirty(false) {
-  MOZ_COUNT_CTOR(nsGrid);
-}
-
-nsGrid::~nsGrid() {
-  FreeMap();
-  MOZ_COUNT_DTOR(nsGrid);
-}
-
-/*
- * This is called whenever something major happens in the grid. And example
- * might be when many cells or row are added. It sets a flag signaling that
- * all the grids caches information should be recalculated.
- */
-void nsGrid::NeedsRebuild(nsBoxLayoutState& aState) {
-  if (mNeedsRebuild) return;
-
-  // iterate through columns and rows and dirty them
-  mNeedsRebuild = true;
-
-  // find the new row and column box. They could have
-  // been changed.
-  mRowsBox = nullptr;
-  mColumnsBox = nullptr;
-  FindRowsAndColumns(&mRowsBox, &mColumnsBox);
-
-  // tell all the rows and columns they are dirty
-  DirtyRows(mRowsBox, aState);
-  DirtyRows(mColumnsBox, aState);
-}
-
-/**
- * If we are marked for rebuild. Then build everything
- */
-void nsGrid::RebuildIfNeeded() {
-  if (!mNeedsRebuild) return;
-
-  mNeedsRebuild = false;
-
-  // find the row and columns frames
-  FindRowsAndColumns(&mRowsBox, &mColumnsBox);
-
-  // count the rows and columns
-  int32_t computedRowCount = 0;
-  int32_t computedColumnCount = 0;
-  int32_t rowCount = 0;
-  int32_t columnCount = 0;
-
-  CountRowsColumns(mRowsBox, rowCount, computedColumnCount);
-  CountRowsColumns(mColumnsBox, columnCount, computedRowCount);
-
-  // computedRowCount are the actual number of rows as determined by the
-  // columns children.
-  // computedColumnCount are the number of columns as determined by the number
-  // of rows children.
-  // We can use this information to see how many extra columns or rows we need.
-  // This can happen if there are are more children in a row that number of
-  // columns defined. Example:
-  //
-  // <columns>
-  //   <column/>
-  // </columns>
-  //
-  // <rows>
-  //   <row>
-  //     <button/><button/>
-  //   </row>
-  // </rows>
-  //
-  // computedColumnCount = 2 // for the 2 buttons in the row tag
-  // computedRowCount = 0 // there is nothing in the  column tag
-  // mColumnCount = 1 // one column defined
-  // mRowCount = 1 // one row defined
-  //
-  // So in this case we need to make 1 extra column.
-  //
-
-  // Make sure to update mExtraColumnCount no matter what, since it might
-  // happen that we now have as many columns as are defined, and we wouldn't
-  // want to have a positive mExtraColumnCount hanging about in that case!
-  mExtraColumnCount = computedColumnCount - columnCount;
-  if (computedColumnCount > columnCount) {
-    columnCount = computedColumnCount;
-  }
-
-  // Same for rows.
-  mExtraRowCount = computedRowCount - rowCount;
-  if (computedRowCount > rowCount) {
-    rowCount = computedRowCount;
-  }
-
-  // build and poplulate row and columns arrays
-  mRows = BuildRows(mRowsBox, rowCount, true);
-  mColumns = BuildRows(mColumnsBox, columnCount, false);
-
-  // build and populate the cell map
-  mCellMap = BuildCellMap(rowCount, columnCount);
-
-  mRowCount = rowCount;
-  mColumnCount = columnCount;
-
-  // populate the cell map from column and row children
-  PopulateCellMap(mRows.get(), mColumns.get(), mRowCount, mColumnCount, true);
-  PopulateCellMap(mColumns.get(), mRows.get(), mColumnCount, mRowCount, false);
-}
-
-void nsGrid::FreeMap() {
-  mRows = nullptr;
-  mColumns = nullptr;
-  mCellMap = nullptr;
-  mColumnCount = 0;
-  mRowCount = 0;
-  mExtraColumnCount = 0;
-  mExtraRowCount = 0;
-  mRowsBox = nullptr;
-  mColumnsBox = nullptr;
-}
-
-/**
- * finds the first <rows> and <columns> tags in the <grid> tag
- */
-void nsGrid::FindRowsAndColumns(nsIFrame** aRows, nsIFrame** aColumns) {
-  *aRows = nullptr;
-  *aColumns = nullptr;
-
-  // find the boxes that contain our rows and columns
-  nsIFrame* child = nullptr;
-  // if we have <grid></grid> then mBox will be null (bug 125689)
-  if (mBox) {
-    child = nsIFrame::GetChildXULBox(mBox);
-  }
-
-  while (child) {
-    nsIFrame* oldBox = child;
-    nsIScrollableFrame* scrollFrame = do_QueryFrame(child);
-    if (scrollFrame) {
-      nsIFrame* scrolledFrame = scrollFrame->GetScrolledFrame();
-      NS_ASSERTION(scrolledFrame, "Error no scroll frame!!");
-      child = do_QueryFrame(scrolledFrame);
-    }
-
-    nsCOMPtr<nsIGridPart> monument = GetPartFromBox(child);
-    if (monument) {
-      nsGridRowGroupLayout* rowGroup = monument->CastToRowGroupLayout();
-      if (rowGroup) {
-        bool isHorizontal = !nsSprocketLayout::IsXULHorizontal(child);
-        if (isHorizontal)
-          *aRows = child;
-        else
-          *aColumns = child;
-
-        if (*aRows && *aColumns) return;
-      }
-    }
-
-    if (scrollFrame) {
-      child = oldBox;
-    }
-
-    child = nsIFrame::GetNextXULBox(child);
-  }
-}
-
-/**
- * Count the number of rows and columns in the given box. aRowCount well become
- * the actual number rows defined in the xul. aComputedColumnCount will become
- * the number of columns by counting the number of cells in each row.
- */
-void nsGrid::CountRowsColumns(nsIFrame* aRowBox, int32_t& aRowCount,
-                              int32_t& aComputedColumnCount) {
-  aRowCount = 0;
-  aComputedColumnCount = 0;
-  // get the rowboxes layout manager. Then ask it to do the work for us
-  if (aRowBox) {
-    nsCOMPtr<nsIGridPart> monument = GetPartFromBox(aRowBox);
-    if (monument)
-      monument->CountRowsColumns(aRowBox, aRowCount, aComputedColumnCount);
-  }
-}
-
-/**
- * Given the number of rows create nsGridRow objects for them and full them out.
- */
-UniquePtr<nsGridRow[]> nsGrid::BuildRows(nsIFrame* aBox, int32_t aRowCount,
-                                         bool aIsHorizontal) {
-  // if no rows then return null
-  if (aRowCount == 0) {
-    return nullptr;
-  }
-
-  // create the array
-  UniquePtr<nsGridRow[]> row;
-
-  // only create new rows if we have to. Reuse old rows.
-  if (aIsHorizontal) {
-    if (aRowCount > mRowCount) {
-      row = MakeUnique<nsGridRow[]>(aRowCount);
-    } else {
-      for (int32_t i = 0; i < mRowCount; i++) mRows[i].Init(nullptr, false);
-
-      row = std::move(mRows);
-    }
-  } else {
-    if (aRowCount > mColumnCount) {
-      row = MakeUnique<nsGridRow[]>(aRowCount);
-    } else {
-      for (int32_t i = 0; i < mColumnCount; i++)
-        mColumns[i].Init(nullptr, false);
-
-      row = std::move(mColumns);
-    }
-  }
-
-  // populate it if we can. If not it will contain only dynamic columns
-  if (aBox) {
-    nsCOMPtr<nsIGridPart> monument = GetPartFromBox(aBox);
-    if (monument) {
-      monument->BuildRows(aBox, row.get());
-    }
-  }
-
-  return row;
-}
-
-/**
- * Given the number of rows and columns. Build a cellmap
- */
-UniquePtr<nsGridCell[]> nsGrid::BuildCellMap(int32_t aRows, int32_t aColumns) {
-  int32_t size = aRows * aColumns;
-  int32_t oldsize = mRowCount * mColumnCount;
-  if (size == 0) {
-    return nullptr;
-  }
-
-  if (size > oldsize) {
-    return MakeUnique<nsGridCell[]>(size);
-  }
-
-  // clear out cellmap
-  for (int32_t i = 0; i < oldsize; i++) {
-    mCellMap[i].SetBoxInRow(nullptr);
-    mCellMap[i].SetBoxInColumn(nullptr);
-  }
-  return std::move(mCellMap);
-}
-
-/**
- * Run through all the cells in the rows and columns and populate then with 2
- * cells. One from the row and one from the column
- */
-void nsGrid::PopulateCellMap(nsGridRow* aRows, nsGridRow* aColumns,
-                             int32_t aRowCount, int32_t aColumnCount,
-                             bool aIsHorizontal) {
-  if (!aRows) return;
-
-  // look through the columns
-  int32_t j = 0;
-
-  for (int32_t i = 0; i < aRowCount; i++) {
-    nsIFrame* child = nullptr;
-    nsGridRow* row = &aRows[i];
-
-    // skip bogus rows. They have no cells
-    if (row->mIsBogus) continue;
-
-    child = row->mBox;
-    if (child) {
-      child = nsIFrame::GetChildXULBox(child);
-
-      j = 0;
-
-      while (child && j < aColumnCount) {
-        // skip bogus column. They have no cells
-        nsGridRow* column = &aColumns[j];
-        if (column->mIsBogus) {
-          j++;
-          continue;
-        }
-
-        if (aIsHorizontal)
-          GetCellAt(j, i)->SetBoxInRow(child);
-        else
-          GetCellAt(i, j)->SetBoxInColumn(child);
-
-        child = nsIFrame::GetNextXULBox(child);
-
-        j++;
-      }
-    }
-  }
-}
-
-/**
- * Run through the rows in the given box and mark them dirty so they
- * will get recalculated and get a layout.
- */
-void nsGrid::DirtyRows(nsIFrame* aRowBox, nsBoxLayoutState& aState) {
-  // make sure we prevent others from dirtying things.
-  mMarkingDirty = true;
-
-  // if the box is a grid part have it recursively hand it.
-  if (aRowBox) {
-    nsCOMPtr<nsIGridPart> part = GetPartFromBox(aRowBox);
-    if (part) part->DirtyRows(aRowBox, aState);
-  }
-
-  mMarkingDirty = false;
-}
-
-nsGridRow* nsGrid::GetColumnAt(int32_t aIndex, bool aIsHorizontal) {
-  return GetRowAt(aIndex, !aIsHorizontal);
-}
-
-nsGridRow* nsGrid::GetRowAt(int32_t aIndex, bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  if (aIsHorizontal) {
-    NS_ASSERTION(aIndex < mRowCount && aIndex >= 0, "Index out of range");
-    return &mRows[aIndex];
-  } else {
-    NS_ASSERTION(aIndex < mColumnCount && aIndex >= 0, "Index out of range");
-    return &mColumns[aIndex];
-  }
-}
-
-nsGridCell* nsGrid::GetCellAt(int32_t aX, int32_t aY) {
-  RebuildIfNeeded();
-
-  NS_ASSERTION(aY < mRowCount && aY >= 0, "Index out of range");
-  NS_ASSERTION(aX < mColumnCount && aX >= 0, "Index out of range");
-  return &mCellMap[aY * mColumnCount + aX];
-}
-
-int32_t nsGrid::GetExtraColumnCount(bool aIsHorizontal) {
-  return GetExtraRowCount(!aIsHorizontal);
-}
-
-int32_t nsGrid::GetExtraRowCount(bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  if (aIsHorizontal)
-    return mExtraRowCount;
-  else
-    return mExtraColumnCount;
-}
-
-/**
- * These methods return the preferred, min, max sizes for a given row index.
- * aIsHorizontal if aIsHorizontal is true. If you pass false you will get the
- * inverse. As if you called GetPrefColumnSize(aState, index, aPref)
- */
-nsSize nsGrid::GetPrefRowSize(nsBoxLayoutState& aState, int32_t aRowIndex,
-                              bool aIsHorizontal) {
-  nsSize size(0, 0);
-  if (!(aRowIndex >= 0 && aRowIndex < GetRowCount(aIsHorizontal))) return size;
-
-  nscoord height = GetPrefRowHeight(aState, aRowIndex, aIsHorizontal);
-  SetLargestSize(size, height, aIsHorizontal);
-
-  return size;
-}
-
-nsSize nsGrid::GetMinRowSize(nsBoxLayoutState& aState, int32_t aRowIndex,
-                             bool aIsHorizontal) {
-  nsSize size(0, 0);
-  if (!(aRowIndex >= 0 && aRowIndex < GetRowCount(aIsHorizontal))) return size;
-
-  nscoord height = GetMinRowHeight(aState, aRowIndex, aIsHorizontal);
-  SetLargestSize(size, height, aIsHorizontal);
-
-  return size;
-}
-
-nsSize nsGrid::GetMaxRowSize(nsBoxLayoutState& aState, int32_t aRowIndex,
-                             bool aIsHorizontal) {
-  nsSize size(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
-  if (!(aRowIndex >= 0 && aRowIndex < GetRowCount(aIsHorizontal))) return size;
-
-  nscoord height = GetMaxRowHeight(aState, aRowIndex, aIsHorizontal);
-  SetSmallestSize(size, height, aIsHorizontal);
-
-  return size;
-}
-
-// static
-nsIGridPart* nsGrid::GetPartFromBox(nsIFrame* aBox) {
-  if (!aBox) return nullptr;
-
-  nsBoxLayout* layout = aBox->GetXULLayoutManager();
-  return layout ? layout->AsGridPart() : nullptr;
-}
-
-nsMargin nsGrid::GetBoxTotalMargin(nsIFrame* aBox, bool aIsHorizontal) {
-  nsMargin margin(0, 0, 0, 0);
-  // walk the boxes parent chain getting the border/padding/margin of our parent
-  // rows
-
-  // first get the layour manager
-  nsIGridPart* part = GetPartFromBox(aBox);
-  if (part) margin = part->GetTotalMargin(aBox, aIsHorizontal);
-
-  return margin;
-}
-
-/**
- * The first and last rows can be affected by <rows> tags with borders or margin
- * gets first and last rows and their indexes.
- * If it fails because there are no rows then:
- * FirstRow is nullptr
- * LastRow is nullptr
- * aFirstIndex = -1
- * aLastIndex = -1
- */
-void nsGrid::GetFirstAndLastRow(int32_t& aFirstIndex, int32_t& aLastIndex,
-                                nsGridRow*& aFirstRow, nsGridRow*& aLastRow,
-                                bool aIsHorizontal) {
-  aFirstRow = nullptr;
-  aLastRow = nullptr;
-  aFirstIndex = -1;
-  aLastIndex = -1;
-
-  int32_t count = GetRowCount(aIsHorizontal);
-
-  if (count == 0) return;
-
-  // We could have collapsed columns either before or after our index.
-  // they should not count. So if we are the 5th row and the first 4 are
-  // collaped we become the first row. Or if we are the 9th row and
-  // 10 up to the last row are collapsed we then become the last.
-
-  // see if we are first
-  int32_t i;
-  for (i = 0; i < count; i++) {
-    nsGridRow* row = GetRowAt(i, aIsHorizontal);
-    if (!row->IsXULCollapsed()) {
-      aFirstIndex = i;
-      aFirstRow = row;
-      break;
-    }
-  }
-
-  // see if we are last
-  for (i = count - 1; i >= 0; i--) {
-    nsGridRow* row = GetRowAt(i, aIsHorizontal);
-    if (!row->IsXULCollapsed()) {
-      aLastIndex = i;
-      aLastRow = row;
-      break;
-    }
-  }
-}
-
-/**
- * A row can have a top and bottom offset. Usually this is just the top and
- * bottom border/padding. However if the row is the first or last it could be
- * affected by the fact a column or columns could have a top or bottom margin.
- */
-void nsGrid::GetRowOffsets(int32_t aIndex, nscoord& aTop, nscoord& aBottom,
-                           bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  nsGridRow* row = GetRowAt(aIndex, aIsHorizontal);
-
-  if (row->IsOffsetSet()) {
-    aTop = row->mTop;
-    aBottom = row->mBottom;
-    return;
-  }
-
-  // first get the rows top and bottom border and padding
-  nsIFrame* box = row->GetBox();
-
-  // add up all the padding
-  nsMargin margin(0, 0, 0, 0);
-  nsMargin border(0, 0, 0, 0);
-  nsMargin padding(0, 0, 0, 0);
-  nsMargin totalBorderPadding(0, 0, 0, 0);
-  nsMargin totalMargin(0, 0, 0, 0);
-
-  // if there is a box and it's not bogus take its
-  // borders padding into account
-  if (box && !row->mIsBogus) {
-    if (!box->IsXULCollapsed()) {
-      // get real border and padding. GetXULBorderAndPadding
-      // is redefined on nsGridRowLeafFrame. If we called it here
-      // we would be in finite recurson.
-      box->GetXULBorder(border);
-      box->GetXULPadding(padding);
-
-      totalBorderPadding += border;
-      totalBorderPadding += padding;
-    }
-
-    // if we are the first or last row
-    // take into account <rows> tags around us
-    // that could have borders or margins.
-    // fortunately they only affect the first
-    // and last row inside the <rows> tag
-
-    totalMargin = GetBoxTotalMargin(box, aIsHorizontal);
-  }
-
-  if (aIsHorizontal) {
-    row->mTop = totalBorderPadding.top;
-    row->mBottom = totalBorderPadding.bottom;
-    row->mTopMargin = totalMargin.top;
-    row->mBottomMargin = totalMargin.bottom;
-  } else {
-    row->mTop = totalBorderPadding.left;
-    row->mBottom = totalBorderPadding.right;
-    row->mTopMargin = totalMargin.left;
-    row->mBottomMargin = totalMargin.right;
-  }
-
-  // if we are the first or last row take into account the top and bottom
-  // borders of each columns.
-
-  // If we are the first row then get the largest top border/padding in
-  // our columns. If that's larger than the rows top border/padding use it.
-
-  // If we are the last row then get the largest bottom border/padding in
-  // our columns. If that's larger than the rows bottom border/padding use it.
-  int32_t firstIndex = 0;
-  int32_t lastIndex = 0;
-  nsGridRow* firstRow = nullptr;
-  nsGridRow* lastRow = nullptr;
-  GetFirstAndLastRow(firstIndex, lastIndex, firstRow, lastRow, aIsHorizontal);
-
-  if (aIndex == firstIndex || aIndex == lastIndex) {
-    nscoord maxTop = 0;
-    nscoord maxBottom = 0;
-
-    // run through the columns. Look at each column
-    // pick the largest top border or bottom border
-    int32_t count = GetColumnCount(aIsHorizontal);
-
-    for (int32_t i = 0; i < count; i++) {
-      nsMargin totalChildBorderPadding(0, 0, 0, 0);
-
-      nsGridRow* column = GetColumnAt(i, aIsHorizontal);
-      nsIFrame* box = column->GetBox();
-
-      if (box) {
-        // ignore collapsed children
-        if (!box->IsXULCollapsed()) {
-          // include the margin of the columns. To the row
-          // at this point border/padding and margins all added
-          // up to more needed space.
-          margin = GetBoxTotalMargin(box, !aIsHorizontal);
-          // get real border and padding. GetXULBorderAndPadding
-          // is redefined on nsGridRowLeafFrame. If we called it here
-          // we would be in finite recurson.
-          box->GetXULBorder(border);
-          box->GetXULPadding(padding);
-          totalChildBorderPadding += border;
-          totalChildBorderPadding += padding;
-          totalChildBorderPadding += margin;
-        }
-
-        nscoord top;
-        nscoord bottom;
-
-        // pick the largest top margin
-        if (aIndex == firstIndex) {
-          if (aIsHorizontal) {
-            top = totalChildBorderPadding.top;
-          } else {
-            top = totalChildBorderPadding.left;
-          }
-          if (top > maxTop) maxTop = top;
-        }
-
-        // pick the largest bottom margin
-        if (aIndex == lastIndex) {
-          if (aIsHorizontal) {
-            bottom = totalChildBorderPadding.bottom;
-          } else {
-            bottom = totalChildBorderPadding.right;
-          }
-          if (bottom > maxBottom) maxBottom = bottom;
-        }
-      }
-
-      // If the biggest top border/padding the columns is larger than this rows
-      // top border/padding the use it.
-      if (aIndex == firstIndex) {
-        if (maxTop > (row->mTop + row->mTopMargin))
-          row->mTop = maxTop - row->mTopMargin;
-      }
-
-      // If the biggest bottom border/padding the columns is larger than this
-      // rows bottom border/padding the use it.
-      if (aIndex == lastIndex) {
-        if (maxBottom > (row->mBottom + row->mBottomMargin))
-          row->mBottom = maxBottom - row->mBottomMargin;
-      }
-    }
-  }
-
-  aTop = row->mTop;
-  aBottom = row->mBottom;
-}
-
-/**
- * These methods return the preferred, min, max coord for a given row index if
- * aIsHorizontal is true. If you pass false you will get the inverse.
- * As if you called GetPrefColumnHeight(aState, index, aPref).
- */
-nscoord nsGrid::GetPrefRowHeight(nsBoxLayoutState& aState, int32_t aIndex,
-                                 bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  nsGridRow* row = GetRowAt(aIndex, aIsHorizontal);
-
-  if (row->IsXULCollapsed()) return 0;
-
-  if (row->IsPrefSet()) return row->mPref;
-
-  nsIFrame* box = row->mBox;
-
-  // set in CSS?
-  if (box) {
-    bool widthSet, heightSet;
-    nsSize cssSize(-1, -1);
-    nsIFrame::AddXULPrefSize(box, cssSize, widthSet, heightSet);
-
-    row->mPref = GET_HEIGHT(cssSize, aIsHorizontal);
-
-    // yep do nothing.
-    if (row->mPref != -1) return row->mPref;
-  }
-
-  // get the offsets so they are cached.
-  nscoord top;
-  nscoord bottom;
-  GetRowOffsets(aIndex, top, bottom, aIsHorizontal);
-
-  // is the row bogus? If so then just ask it for its size
-  // it should not be affected by cells in the grid.
-  if (row->mIsBogus) {
-    nsSize size(0, 0);
-    if (box) {
-      size = box->GetXULPrefSize(aState);
-      nsIFrame::AddXULMargin(box, size);
-    }
-
-    row->mPref = GET_HEIGHT(size, aIsHorizontal);
-    return row->mPref;
-  }
-
-  nsSize size(0, 0);
-
-  nsGridCell* child;
-
-  int32_t count = GetColumnCount(aIsHorizontal);
-
-  for (int32_t i = 0; i < count; i++) {
-    if (aIsHorizontal)
-      child = GetCellAt(i, aIndex);
-    else
-      child = GetCellAt(aIndex, i);
-
-    // ignore collapsed children
-    if (!child->IsXULCollapsed()) {
-      nsSize childSize = child->GetXULPrefSize(aState);
-
-      nsSprocketLayout::AddLargestSize(size, childSize, aIsHorizontal);
-    }
-  }
-
-  row->mPref = GET_HEIGHT(size, aIsHorizontal) + top + bottom;
-
-  return row->mPref;
-}
-
-nscoord nsGrid::GetMinRowHeight(nsBoxLayoutState& aState, int32_t aIndex,
-                                bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  nsGridRow* row = GetRowAt(aIndex, aIsHorizontal);
-
-  if (row->IsXULCollapsed()) return 0;
-
-  if (row->IsMinSet()) return row->mMin;
-
-  nsIFrame* box = row->mBox;
-
-  // set in CSS?
-  if (box) {
-    bool widthSet, heightSet;
-    nsSize cssSize(-1, -1);
-    nsIFrame::AddXULMinSize(box, cssSize, widthSet, heightSet);
-
-    row->mMin = GET_HEIGHT(cssSize, aIsHorizontal);
-
-    // yep do nothing.
-    if (row->mMin != -1) return row->mMin;
-  }
-
-  // get the offsets so they are cached.
-  nscoord top;
-  nscoord bottom;
-  GetRowOffsets(aIndex, top, bottom, aIsHorizontal);
-
-  // is the row bogus? If so then just ask it for its size
-  // it should not be affected by cells in the grid.
-  if (row->mIsBogus) {
-    nsSize size(0, 0);
-    if (box) {
-      size = box->GetXULPrefSize(aState);
-      nsIFrame::AddXULMargin(box, size);
-    }
-
-    row->mMin = GET_HEIGHT(size, aIsHorizontal) + top + bottom;
-    return row->mMin;
-  }
-
-  nsSize size(0, 0);
-
-  nsGridCell* child;
-
-  int32_t count = GetColumnCount(aIsHorizontal);
-
-  for (int32_t i = 0; i < count; i++) {
-    if (aIsHorizontal)
-      child = GetCellAt(i, aIndex);
-    else
-      child = GetCellAt(aIndex, i);
-
-    // ignore collapsed children
-    if (!child->IsXULCollapsed()) {
-      nsSize childSize = child->GetXULMinSize(aState);
-
-      nsSprocketLayout::AddLargestSize(size, childSize, aIsHorizontal);
-    }
-  }
-
-  row->mMin = GET_HEIGHT(size, aIsHorizontal);
-
-  return row->mMin;
-}
-
-nscoord nsGrid::GetMaxRowHeight(nsBoxLayoutState& aState, int32_t aIndex,
-                                bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  nsGridRow* row = GetRowAt(aIndex, aIsHorizontal);
-
-  if (row->IsXULCollapsed()) return 0;
-
-  if (row->IsMaxSet()) return row->mMax;
-
-  nsIFrame* box = row->mBox;
-
-  // set in CSS?
-  if (box) {
-    bool widthSet, heightSet;
-    nsSize cssSize(-1, -1);
-    nsIFrame::AddXULMaxSize(box, cssSize, widthSet, heightSet);
-
-    row->mMax = GET_HEIGHT(cssSize, aIsHorizontal);
-
-    // yep do nothing.
-    if (row->mMax != -1) return row->mMax;
-  }
-
-  // get the offsets so they are cached.
-  nscoord top;
-  nscoord bottom;
-  GetRowOffsets(aIndex, top, bottom, aIsHorizontal);
-
-  // is the row bogus? If so then just ask it for its size
-  // it should not be affected by cells in the grid.
-  if (row->mIsBogus) {
-    nsSize size(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
-    if (box) {
-      size = box->GetXULPrefSize(aState);
-      nsIFrame::AddXULMargin(box, size);
-    }
-
-    row->mMax = GET_HEIGHT(size, aIsHorizontal);
-    return row->mMax;
-  }
-
-  nsSize size(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
-
-  nsGridCell* child;
-
-  int32_t count = GetColumnCount(aIsHorizontal);
-
-  for (int32_t i = 0; i < count; i++) {
-    if (aIsHorizontal)
-      child = GetCellAt(i, aIndex);
-    else
-      child = GetCellAt(aIndex, i);
-
-    // ignore collapsed children
-    if (!child->IsXULCollapsed()) {
-      nsSize min = child->GetXULMinSize(aState);
-      nsSize childSize =
-          nsIFrame::XULBoundsCheckMinMax(min, child->GetXULMaxSize(aState));
-      nsSprocketLayout::AddLargestSize(size, childSize, aIsHorizontal);
-    }
-  }
-
-  row->mMax = GET_HEIGHT(size, aIsHorizontal) + top + bottom;
-
-  return row->mMax;
-}
-
-bool nsGrid::IsGrid(nsIFrame* aBox) {
-  nsIGridPart* part = GetPartFromBox(aBox);
-  if (!part) return false;
-
-  nsGridLayout2* grid = part->CastToGridLayout();
-
-  if (grid) return true;
-
-  return false;
-}
-
-/**
- * This get the flexibilty of the row at aIndex. It's not trivial. There are a
- * few things we need to look at. Specifically we need to see if any <rows> or
- * <columns> tags are around us. Their flexibilty will affect ours.
- */
-nscoord nsGrid::GetRowFlex(int32_t aIndex, bool aIsHorizontal) {
-  RebuildIfNeeded();
-
-  nsGridRow* row = GetRowAt(aIndex, aIsHorizontal);
-
-  if (row->IsFlexSet()) return row->mFlex;
-
-  nsIFrame* box = row->mBox;
-  row->mFlex = 0;
-
-  if (box) {
-    // We need our flex but a inflexible row could be around us. If so
-    // neither are we. However if its the row tag just inside the grid it won't
-    // affect us. We need to do this for this case:
-    // <grid>
-    //   <rows>
-    //     <rows> // this is not flexible.
-    //            // So our children should not be flexible
-    //        <row flex="1"/>
-    //        <row flex="1"/>
-    //     </rows>
-    //        <row/>
-    //   </rows>
-    // </grid>
-    //
-    // or..
-    //
-    // <grid>
-    //  <rows>
-    //   <rows> // this is not flexible. So our children should not be flexible
-    //     <rows flex="1">
-    //        <row flex="1"/>
-    //        <row flex="1"/>
-    //     </rows>
-    //        <row/>
-    //   </rows>
-    //  </row>
-    // </grid>
-
-    // So here is how it looks
-    //
-    // <grid>
-    //   <rows>   // parentsParent
-    //     <rows> // parent
-    //        <row flex="1"/>
-    //        <row flex="1"/>
-    //     </rows>
-    //        <row/>
-    //   </rows>
-    // </grid>
-
-    // so the answer is simple: 1) Walk our parent chain. 2) If we find
-    // someone who is not flexible and they aren't the rows immediately in
-    // the grid. 3) Then we are not flexible
-
-    box = GetScrollBox(box);
-    nsIFrame* parent = nsIFrame::GetParentXULBox(box);
-    nsIFrame* parentsParent = nullptr;
-
-    while (parent) {
-      parent = GetScrollBox(parent);
-      parentsParent = nsIFrame::GetParentXULBox(parent);
-
-      // if our parents parent is not a grid
-      // the get its flex. If its 0 then we are
-      // not flexible.
-      if (parentsParent) {
-        if (!IsGrid(parentsParent)) {
-          nscoord flex = parent->GetXULFlex();
-          nsIFrame::AddXULFlex(parent, flex);
-          if (flex == 0) {
-            row->mFlex = 0;
-            return row->mFlex;
-          }
-        } else
-          break;
-      }
-
-      parent = parentsParent;
-    }
-
-    // get the row flex.
-    row->mFlex = box->GetXULFlex();
-    nsIFrame::AddXULFlex(box, row->mFlex);
-  }
-
-  return row->mFlex;
-}
-
-void nsGrid::SetLargestSize(nsSize& aSize, nscoord aHeight,
-                            bool aIsHorizontal) {
-  if (aIsHorizontal) {
-    if (aSize.height < aHeight) aSize.height = aHeight;
-  } else {
-    if (aSize.width < aHeight) aSize.width = aHeight;
-  }
-}
-
-void nsGrid::SetSmallestSize(nsSize& aSize, nscoord aHeight,
-                             bool aIsHorizontal) {
-  if (aIsHorizontal) {
-    if (aSize.height > aHeight) aSize.height = aHeight;
-  } else {
-    if (aSize.width < aHeight) aSize.width = aHeight;
-  }
-}
-
-int32_t nsGrid::GetRowCount(int32_t aIsHorizontal) {
-  RebuildIfNeeded();
-
-  if (aIsHorizontal)
-    return mRowCount;
-  else
-    return mColumnCount;
-}
-
-int32_t nsGrid::GetColumnCount(int32_t aIsHorizontal) {
-  return GetRowCount(!aIsHorizontal);
-}
-
-/*
- * A cell in the given row or columns at the given index has had a child added
- * or removed
- */
-void nsGrid::CellAddedOrRemoved(nsBoxLayoutState& aState, int32_t aIndex,
-                                bool aIsHorizontal) {
-  // TBD see if the cell will fit in our current row. If it will
-  // just add it in.
-  // but for now rebuild everything.
-  if (mMarkingDirty) return;
-
-  NeedsRebuild(aState);
-}
-
-/**
- * A row or columns at the given index had been added or removed
- */
-void nsGrid::RowAddedOrRemoved(nsBoxLayoutState& aState, int32_t aIndex,
-                               bool aIsHorizontal) {
-  // TBD see if we have extra room in the table and just add the new row in
-  // for now rebuild the world
-  if (mMarkingDirty) return;
-
-  NeedsRebuild(aState);
-}
-
-/*
- * Scrollframes are tranparent. If this is given a scrollframe is will return
- * the frame inside. If there is no scrollframe it does nothing.
- */
-nsIFrame* nsGrid::GetScrolledBox(nsIFrame* aChild) {
-  // first see if it is a scrollframe. If so walk down into it and get the
-  // scrolled child
-  nsIScrollableFrame* scrollFrame = do_QueryFrame(aChild);
-  if (scrollFrame) {
-    nsIFrame* scrolledFrame = scrollFrame->GetScrolledFrame();
-    NS_ASSERTION(scrolledFrame, "Error no scroll frame!!");
-    return scrolledFrame;
-  }
-
-  return aChild;
-}
-
-/*
- * Scrollframes are tranparent. If this is given a child in a scrollframe is
- * will return the scrollframe ourside it. If there is no scrollframe it does
- * nothing.
- */
-nsIFrame* nsGrid::GetScrollBox(nsIFrame* aChild) {
-  if (!aChild) return nullptr;
-
-  // get parent
-  nsIFrame* parent = nsIFrame::GetParentXULBox(aChild);
-
-  // walk up until we find a scrollframe or a part
-  // if it's a scrollframe return it.
-  // if it's a parent then the child passed does not
-  // have a scroll frame immediately wrapped around it.
-  while (parent) {
-    nsIScrollableFrame* scrollFrame = do_QueryFrame(parent);
-    // scrollframe? Yep return it.
-    if (scrollFrame) return parent;
-
-    nsCOMPtr<nsIGridPart> parentGridRow = GetPartFromBox(parent);
-    // if a part then just return the child
-    if (parentGridRow) break;
-
-    parent = nsIFrame::GetParentXULBox(parent);
-  }
-
-  return aChild;
-}
-
-#ifdef DEBUG_grid
-void nsGrid::PrintCellMap() {
-  printf("-----Columns------\n");
-  for (int x = 0; x < mColumnCount; x++) {
-    nsGridRow* column = GetColumnAt(x);
-    printf("%d(pf=%d, mn=%d, mx=%d) ", x, column->mPref, column->mMin,
-           column->mMax);
-  }
-
-  printf("\n-----Rows------\n");
-  for (x = 0; x < mRowCount; x++) {
-    nsGridRow* column = GetRowAt(x);
-    printf("%d(pf=%d, mn=%d, mx=%d) ", x, column->mPref, column->mMin,
-           column->mMax);
-  }
-
-  printf("\n");
-}
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGrid.h firefox-85.0+build1/layout/xul/grid/nsGrid.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGrid.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGrid.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +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 nsGrid_h___
-#define nsGrid_h___
-
-#include "nsStackLayout.h"
-#include "nsIGridPart.h"
-#include "nsCOMPtr.h"
-#include "mozilla/UniquePtr.h"
-
-class nsBoxLayoutState;
-class nsGridCell;
-
-//#define DEBUG_grid 1
-
-/**
- * The grid data structure, i.e., the grid cellmap.
- */
-class nsGrid {
- public:
-  nsGrid();
-  ~nsGrid();
-
-  nsGridRow* GetColumnAt(int32_t aIndex, bool aIsHorizontal = true);
-  nsGridRow* GetRowAt(int32_t aIndex, bool aIsHorizontal = true);
-  nsGridCell* GetCellAt(int32_t aX, int32_t aY);
-
-  void NeedsRebuild(nsBoxLayoutState& aBoxLayoutState);
-  void RebuildIfNeeded();
-
-  // For all the methods taking an aIsHorizontal parameter:
-  // * When aIsHorizontal is true, the words "rows" and (for
-  //   GetColumnCount) "columns" refer to their normal meanings.
-  // * When aIsHorizontal is false, the meanings are flipped.
-  // FIXME:  Maybe eliminate GetColumnCount and change aIsHorizontal to
-  // aIsRows?  (Calling it horizontal doesn't really make sense because
-  // row groups and columns have vertical orientation, whereas column
-  // groups and rows are horizontal.)
-
-  nsSize GetPrefRowSize(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                        bool aIsHorizontal = true);
-  nsSize GetMinRowSize(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                       bool aIsHorizontal = true);
-  nsSize GetMaxRowSize(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                       bool aIsHorizontal = true);
-  nscoord GetRowFlex(int32_t aRowIndex, bool aIsHorizontal = true);
-
-  nscoord GetPrefRowHeight(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                           bool aIsHorizontal = true);
-  nscoord GetMinRowHeight(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                          bool aIsHorizontal = true);
-  nscoord GetMaxRowHeight(nsBoxLayoutState& aBoxLayoutState, int32_t aRowIndex,
-                          bool aIsHorizontal = true);
-  void GetRowOffsets(int32_t aIndex, nscoord& aTop, nscoord& aBottom,
-                     bool aIsHorizontal = true);
-
-  void RowAddedOrRemoved(nsBoxLayoutState& aBoxLayoutState, int32_t aIndex,
-                         bool aIsHorizontal = true);
-  void CellAddedOrRemoved(nsBoxLayoutState& aBoxLayoutState, int32_t aIndex,
-                          bool aIsHorizontal = true);
-  void DirtyRows(nsIFrame* aRowBox, nsBoxLayoutState& aState);
-#ifdef DEBUG_grid
-  void PrintCellMap();
-#endif
-  int32_t GetExtraColumnCount(bool aIsHorizontal = true);
-  int32_t GetExtraRowCount(bool aIsHorizontal = true);
-
-  // accessors
-  void SetBox(nsIFrame* aBox) { mBox = aBox; }
-  nsIFrame* GetBox() { return mBox; }
-  nsIFrame* GetRowsBox() { return mRowsBox; }
-  nsIFrame* GetColumnsBox() { return mColumnsBox; }
-  int32_t GetRowCount(int32_t aIsHorizontal = true);
-  int32_t GetColumnCount(int32_t aIsHorizontal = true);
-
-  static nsIFrame* GetScrolledBox(nsIFrame* aChild);
-  static nsIFrame* GetScrollBox(nsIFrame* aChild);
-  static nsIGridPart* GetPartFromBox(nsIFrame* aBox);
-  void GetFirstAndLastRow(int32_t& aFirstIndex, int32_t& aLastIndex,
-                          nsGridRow*& aFirstRow, nsGridRow*& aLastRow,
-                          bool aIsHorizontal);
-
- private:
-  nsMargin GetBoxTotalMargin(nsIFrame* aBox, bool aIsHorizontal = true);
-
-  void FreeMap();
-  void FindRowsAndColumns(nsIFrame** aRows, nsIFrame** aColumns);
-  mozilla::UniquePtr<nsGridRow[]> BuildRows(nsIFrame* aBox, int32_t aSize,
-                                            bool aIsHorizontal = true);
-  mozilla::UniquePtr<nsGridCell[]> BuildCellMap(int32_t aRows,
-                                                int32_t aColumns);
-  void PopulateCellMap(nsGridRow* aRows, nsGridRow* aColumns, int32_t aRowCount,
-                       int32_t aColumnCount, bool aIsHorizontal = true);
-  void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                        int32_t& aComputedColumnCount);
-  void SetLargestSize(nsSize& aSize, nscoord aHeight,
-                      bool aIsHorizontal = true);
-  void SetSmallestSize(nsSize& aSize, nscoord aHeight,
-                       bool aIsHorizontal = true);
-  bool IsGrid(nsIFrame* aBox);
-
-  // the box that implement the <grid> tag
-  nsIFrame* mBox;
-
-  // an array of row object
-  mozilla::UniquePtr<nsGridRow[]> mRows;
-
-  // an array of columns objects.
-  mozilla::UniquePtr<nsGridRow[]> mColumns;
-
-  // the first in the <grid> that implements the <rows> tag.
-  nsIFrame* mRowsBox;
-
-  // the first in the <grid> that implements the <columns> tag.
-  nsIFrame* mColumnsBox;
-
-  // a flag that is false tells us to rebuild the who grid
-  bool mNeedsRebuild;
-
-  // number of rows and columns as defined by the XUL
-  int32_t mRowCount;
-  int32_t mColumnCount;
-
-  // number of rows and columns that are implied but not
-  // explicitly defined int he XUL
-  int32_t mExtraRowCount;
-  int32_t mExtraColumnCount;
-
-  // x,y array of cells in the rows and columns
-  mozilla::UniquePtr<nsGridCell[]> mCellMap;
-
-  // a flag that when true suppresses all other MarkDirties. This
-  // prevents lots of extra work being done.
-  bool mMarkingDirty;
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridLayout2.cpp firefox-85.0+build1/layout/xul/grid/nsGridLayout2.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridLayout2.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridLayout2.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGridLayout2.h"
-#include "nsGridRowGroupLayout.h"
-#include "nsGridRow.h"
-#include "nsIScrollableFrame.h"
-#include "nsSprocketLayout.h"
-#include "mozilla/ReflowInput.h"
-
-nsresult NS_NewGridLayout2(nsBoxLayout** aNewLayout) {
-  *aNewLayout = new nsGridLayout2();
-  NS_IF_ADDREF(*aNewLayout);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsGridLayout2::XULLayout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) {
-  // XXX This should be set a better way!
-  mGrid.SetBox(aBox);
-  NS_ASSERTION(aBox->GetXULLayoutManager() == this, "setting incorrect box");
-
-  nsresult rv = nsStackLayout::XULLayout(aBox, aBoxLayoutState);
-#ifdef DEBUG_grid
-  mGrid.PrintCellMap();
-#endif
-  return rv;
-}
-
-void nsGridLayout2::IntrinsicISizesDirty(nsIFrame* aBox,
-                                         nsBoxLayoutState& aBoxLayoutState) {
-  nsStackLayout::IntrinsicISizesDirty(aBox, aBoxLayoutState);
-  // XXXldb We really don't need to do all the work that NeedsRebuild
-  // does; we just need to mark intrinsic widths dirty on the
-  // (row/column)(s/-groups).
-  mGrid.NeedsRebuild(aBoxLayoutState);
-}
-
-nsGrid* nsGridLayout2::GetGrid(nsIFrame* aBox, int32_t* aIndex,
-                               nsGridRowLayout* aRequestor) {
-  // XXX This should be set a better way!
-  mGrid.SetBox(aBox);
-  NS_ASSERTION(aBox->GetXULLayoutManager() == this, "setting incorrect box");
-  return &mGrid;
-}
-
-void nsGridLayout2::AddWidth(nsSize& aSize, nscoord aSize2,
-                             bool aIsHorizontal) {
-  nscoord& size = GET_WIDTH(aSize, aIsHorizontal);
-
-  if (size != NS_UNCONSTRAINEDSIZE) {
-    if (aSize2 == NS_UNCONSTRAINEDSIZE)
-      size = NS_UNCONSTRAINEDSIZE;
-    else
-      size += aSize2;
-  }
-}
-
-nsSize nsGridLayout2::GetXULMinSize(nsIFrame* aBox, nsBoxLayoutState& aState) {
-  nsSize minSize = nsStackLayout::GetXULMinSize(aBox, aState);
-
-  // if there are no <rows> tags that will sum up our columns,
-  // sum up our columns here.
-  nsSize total(0, 0);
-  nsIFrame* rowsBox = mGrid.GetRowsBox();
-  nsIFrame* columnsBox = mGrid.GetColumnsBox();
-  if (!rowsBox || !columnsBox) {
-    if (!rowsBox) {
-      // max height is the sum of our rows
-      int32_t rows = mGrid.GetRowCount();
-      for (int32_t i = 0; i < rows; i++) {
-        nscoord height = mGrid.GetMinRowHeight(aState, i, true);
-        AddWidth(total, height, false);  // AddHeight
-      }
-    }
-
-    if (!columnsBox) {
-      // max height is the sum of our rows
-      int32_t columns = mGrid.GetColumnCount();
-      for (int32_t i = 0; i < columns; i++) {
-        nscoord width = mGrid.GetMinRowHeight(aState, i, false);
-        AddWidth(total, width, true);  // AddWidth
-      }
-    }
-
-    AddXULMargin(aBox, total);
-    AddLargestSize(minSize, total);
-  }
-
-  return minSize;
-}
-
-nsSize nsGridLayout2::GetXULPrefSize(nsIFrame* aBox, nsBoxLayoutState& aState) {
-  nsSize pref = nsStackLayout::GetXULPrefSize(aBox, aState);
-
-  // if there are no <rows> tags that will sum up our columns,
-  // sum up our columns here.
-  nsSize total(0, 0);
-  nsIFrame* rowsBox = mGrid.GetRowsBox();
-  nsIFrame* columnsBox = mGrid.GetColumnsBox();
-  if (!rowsBox || !columnsBox) {
-    if (!rowsBox) {
-      // max height is the sum of our rows
-      int32_t rows = mGrid.GetRowCount();
-      for (int32_t i = 0; i < rows; i++) {
-        nscoord height = mGrid.GetPrefRowHeight(aState, i, true);
-        AddWidth(total, height, false);  // AddHeight
-      }
-    }
-
-    if (!columnsBox) {
-      // max height is the sum of our rows
-      int32_t columns = mGrid.GetColumnCount();
-      for (int32_t i = 0; i < columns; i++) {
-        nscoord width = mGrid.GetPrefRowHeight(aState, i, false);
-        AddWidth(total, width, true);  // AddWidth
-      }
-    }
-
-    AddXULMargin(aBox, total);
-    AddLargestSize(pref, total);
-  }
-
-  return pref;
-}
-
-nsSize nsGridLayout2::GetXULMaxSize(nsIFrame* aBox, nsBoxLayoutState& aState) {
-  nsSize maxSize = nsStackLayout::GetXULMaxSize(aBox, aState);
-
-  // if there are no <rows> tags that will sum up our columns,
-  // sum up our columns here.
-  nsSize total(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
-  nsIFrame* rowsBox = mGrid.GetRowsBox();
-  nsIFrame* columnsBox = mGrid.GetColumnsBox();
-  if (!rowsBox || !columnsBox) {
-    if (!rowsBox) {
-      total.height = 0;
-      // max height is the sum of our rows
-      int32_t rows = mGrid.GetRowCount();
-      for (int32_t i = 0; i < rows; i++) {
-        nscoord height = mGrid.GetMaxRowHeight(aState, i, true);
-        AddWidth(total, height, false);  // AddHeight
-      }
-    }
-
-    if (!columnsBox) {
-      total.width = 0;
-      // max height is the sum of our rows
-      int32_t columns = mGrid.GetColumnCount();
-      for (int32_t i = 0; i < columns; i++) {
-        nscoord width = mGrid.GetMaxRowHeight(aState, i, false);
-        AddWidth(total, width, true);  // AddWidth
-      }
-    }
-
-    AddXULMargin(aBox, total);
-    AddSmallestSize(maxSize, total);
-  }
-
-  return maxSize;
-}
-
-int32_t nsGridLayout2::BuildRows(nsIFrame* aBox, nsGridRow* aRows) {
-  if (aBox) {
-    aRows[0].Init(aBox, true);
-    return 1;
-  }
-  return 0;
-}
-
-nsMargin nsGridLayout2::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) {
-  nsMargin margin(0, 0, 0, 0);
-  return margin;
-}
-
-void nsGridLayout2::ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                     nsIFrame* aPrevBox,
-                                     const nsFrameList::Slice& aNewChildren) {
-  mGrid.NeedsRebuild(aState);
-}
-
-void nsGridLayout2::ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                     const nsFrameList::Slice& aNewChildren) {
-  mGrid.NeedsRebuild(aState);
-}
-
-void nsGridLayout2::ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                    nsIFrame* aChildList) {
-  mGrid.NeedsRebuild(aState);
-}
-
-void nsGridLayout2::ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                nsIFrame* aChildList) {
-  mGrid.NeedsRebuild(aState);
-}
-
-NS_IMPL_ADDREF_INHERITED(nsGridLayout2, nsStackLayout)
-NS_IMPL_RELEASE_INHERITED(nsGridLayout2, nsStackLayout)
-
-NS_INTERFACE_MAP_BEGIN(nsGridLayout2)
-  NS_INTERFACE_MAP_ENTRY(nsIGridPart)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIGridPart)
-NS_INTERFACE_MAP_END_INHERITING(nsStackLayout)
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridLayout2.h firefox-85.0+build1/layout/xul/grid/nsGridLayout2.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridLayout2.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridLayout2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +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 nsGridLayout2_h___
-#define nsGridLayout2_h___
-
-#include "mozilla/Attributes.h"
-#include "nsStackLayout.h"
-#include "nsIGridPart.h"
-#include "nsCoord.h"
-#include "nsGrid.h"
-
-class nsGridRowGroupLayout;
-class nsGridRowLayout;
-class nsGridRow;
-class nsBoxLayoutState;
-
-/**
- * The nsBoxLayout implementation for a grid.
- */
-class nsGridLayout2 final : public nsStackLayout, public nsIGridPart {
- public:
-  friend nsresult NS_NewGridLayout2(nsBoxLayout** aNewLayout);
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  NS_IMETHOD XULLayout(nsIFrame* aBox,
-                       nsBoxLayoutState& aBoxLayoutState) override;
-  virtual void IntrinsicISizesDirty(nsIFrame* aBox,
-                                    nsBoxLayoutState& aBoxLayoutState) override;
-
-  virtual nsGridRowGroupLayout* CastToRowGroupLayout() override {
-    return nullptr;
-  }
-  virtual nsGridLayout2* CastToGridLayout() override { return this; }
-  virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex,
-                          nsGridRowLayout* aRequestor = nullptr) override;
-  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox,
-                                         nsIFrame** aParentBox) override {
-    MOZ_ASSERT_UNREACHABLE("Should not be called");
-    return nullptr;
-  }
-  virtual nsSize GetXULMinSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULMaxSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULPrefSize(nsIFrame* aBox,
-                                nsBoxLayoutState& aBoxLayoutState) override;
-  virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                int32_t& aComputedColumnCount) override {
-    aRowCount++;
-  }
-  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) override {}
-  virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) override;
-  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) override;
-  virtual Type GetType() override { return eGrid; }
-  virtual void ChildrenInserted(
-      nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aPrevBox,
-      const nsFrameList::Slice& aNewChildren) override;
-  virtual void ChildrenAppended(
-      nsIFrame* aBox, nsBoxLayoutState& aState,
-      const nsFrameList::Slice& aNewChildren) override;
-  virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
-                               nsIFrame* aChildList) override;
-  virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
-                           nsIFrame* aChildList) override;
-
-  virtual nsIGridPart* AsGridPart() override { return this; }
-
- protected:
-  explicit nsGridLayout2() = default;
-  virtual ~nsGridLayout2() = default;
-  nsGrid mGrid;
-
- private:
-  void AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal);
-
-};  // class nsGridLayout2
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRow.cpp firefox-85.0+build1/layout/xul/grid/nsGridRow.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRow.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRow.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGridRow.h"
-#include "nsBoxLayoutState.h"
-#include "nsIFrame.h"
-
-nsGridRow::nsGridRow()
-    : mIsBogus(false),
-      mBox(nullptr),
-      mFlex(-1),
-      mPref(-1),
-      mMin(-1),
-      mMax(-1),
-      mTop(-1),
-      mBottom(-1),
-      mTopMargin(0),
-      mBottomMargin(0)
-
-{
-  MOZ_COUNT_CTOR(nsGridRow);
-}
-
-void nsGridRow::Init(nsIFrame* aBox, bool aIsBogus) {
-  mBox = aBox;
-  mIsBogus = aIsBogus;
-  mFlex = -1;
-  mPref = -1;
-  mMin = -1;
-  mMax = -1;
-  mTop = -1;
-  mBottom = -1;
-  mTopMargin = 0;
-  mBottomMargin = 0;
-}
-
-nsGridRow::~nsGridRow() { MOZ_COUNT_DTOR(nsGridRow); }
-
-bool nsGridRow::IsXULCollapsed() { return mBox && mBox->IsXULCollapsed(); }
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupFrame.cpp firefox-85.0+build1/layout/xul/grid/nsGridRowGroupFrame.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowGroupFrame.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "mozilla/PresShell.h"
-#include "nsGridRowGroupFrame.h"
-#include "nsGridRowLeafLayout.h"
-#include "nsGridRow.h"
-#include "nsBoxLayoutState.h"
-#include "nsGridLayout2.h"
-
-using namespace mozilla;
-
-already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout();
-
-nsIFrame* NS_NewGridRowGroupFrame(PresShell* aPresShell,
-                                  ComputedStyle* aStyle) {
-  nsCOMPtr<nsBoxLayout> layout = NS_NewGridRowGroupLayout();
-  return new (aPresShell)
-      nsGridRowGroupFrame(aStyle, aPresShell->GetPresContext(), layout);
-}
-
-NS_IMPL_FRAMEARENA_HELPERS(nsGridRowGroupFrame)
-
-/**
- * This is redefined because row groups have a funny property. If they are
- * flexible then their flex must be equal to the sum of their children's flexes.
- */
-nscoord nsGridRowGroupFrame::GetXULFlex() {
-  // if we are flexible out flexibility is determined by our columns.
-  // so first get the our flex. If not 0 then our flex is the sum of
-  // our columns flexes.
-
-  if (!XULNeedsRecalc(mFlex)) {
-    return mFlex;
-  }
-
-  if (nsBoxFrame::GetXULFlex() == 0) {
-    return 0;
-  }
-
-  // ok we are flexible add up our children
-  nscoord totalFlex = 0;
-  nsIFrame* child = nsIFrame::GetChildXULBox(this);
-  while (child) {
-    totalFlex += child->GetXULFlex();
-    child = GetNextXULBox(child);
-  }
-
-  mFlex = totalFlex;
-
-  return totalFlex;
-}
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupFrame.h firefox-85.0+build1/layout/xul/grid/nsGridRowGroupFrame.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupFrame.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowGroupFrame.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +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/. */
-
-/**
-
-  Eric D Vaughan
-  A frame that can have multiple children. Only one child may be displayed at
-one time. So the can be flipped though like a deck of cards.
-
-**/
-
-#ifndef nsGridRowGroupFrame_h___
-#define nsGridRowGroupFrame_h___
-
-#include "mozilla/Attributes.h"
-#include "nsBoxFrame.h"
-
-/**
- * A frame representing a grid row (or column) group, which is usually
- * an element that is a child of a grid and contains all the rows (or
- * all the columns).  However, multiple levels of groups are allowed, so
- * the parent or child could instead be another group.
- */
-class nsGridRowGroupFrame final : public nsBoxFrame {
- public:
-  NS_DECL_FRAMEARENA_HELPERS(nsGridRowGroupFrame)
-
-#ifdef DEBUG_FRAME_DUMP
-  virtual nsresult GetFrameName(nsAString& aResult) const override {
-    return MakeFrameName(u"nsGridRowGroup"_ns, aResult);
-  }
-#endif
-
-  nsGridRowGroupFrame(ComputedStyle* aStyle, nsPresContext* aPresContext,
-                      nsBoxLayout* aLayoutManager)
-      : nsBoxFrame(aStyle, aPresContext, kClassID, false, aLayoutManager) {}
-
-  virtual nscoord GetXULFlex() override;
-
-};  // class nsGridRowGroupFrame
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupLayout.cpp firefox-85.0+build1/layout/xul/grid/nsGridRowGroupLayout.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupLayout.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowGroupLayout.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,237 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-/*
- * The nsGridRowGroupLayout implements the <rows> or <columns> tag in a grid.
- */
-
-#include "nsGridRowGroupLayout.h"
-#include "nsCOMPtr.h"
-#include "nsIScrollableFrame.h"
-#include "nsBoxLayoutState.h"
-#include "nsGridLayout2.h"
-#include "nsGridRow.h"
-#include "mozilla/ReflowInput.h"
-
-already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout() {
-  RefPtr<nsBoxLayout> layout = new nsGridRowGroupLayout();
-  return layout.forget();
-}
-
-nsGridRowGroupLayout::nsGridRowGroupLayout()
-    : nsGridRowLayout(), mRowCount(0) {}
-
-nsGridRowGroupLayout::~nsGridRowGroupLayout() = default;
-
-void nsGridRowGroupLayout::ChildAddedOrRemoved(nsIFrame* aBox,
-                                               nsBoxLayoutState& aState) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  if (grid) grid->RowAddedOrRemoved(aState, index, isHorizontal);
-}
-
-void nsGridRowGroupLayout::AddWidth(nsSize& aSize, nscoord aSize2,
-                                    bool aIsHorizontal) {
-  nscoord& size = GET_WIDTH(aSize, aIsHorizontal);
-
-  if (size == NS_UNCONSTRAINEDSIZE || aSize2 == NS_UNCONSTRAINEDSIZE)
-    size = NS_UNCONSTRAINEDSIZE;
-  else
-    size += aSize2;
-}
-
-nsSize nsGridRowGroupLayout::GetXULPrefSize(nsIFrame* aBox,
-                                            nsBoxLayoutState& aState) {
-  nsSize vpref = nsGridRowLayout::GetXULPrefSize(aBox, aState);
-
-  /* It is possible that we could have some extra columns. This is when less
-   * columns in XUL were defined that needed. And example might be a grid with 3
-   * defined columns but a row with 4 cells in it. We would need an extra column
-   * to make the grid work. But because that extra column does not have a box
-   * associated with it we must add its size in manually. Remember we could have
-   * extra rows as well.
-   */
-
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-
-  if (grid) {
-    // make sure we add in extra columns sizes as well
-    bool isHorizontal = IsXULHorizontal(aBox);
-    int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
-    int32_t start = grid->GetColumnCount(isHorizontal) -
-                    grid->GetExtraColumnCount(isHorizontal);
-    for (int32_t i = 0; i < extraColumns; i++) {
-      nscoord pref = grid->GetPrefRowHeight(
-          aState, i + start, !isHorizontal);  // GetPrefColumnWidth
-
-      AddWidth(vpref, pref, isHorizontal);
-    }
-  }
-
-  return vpref;
-}
-
-nsSize nsGridRowGroupLayout::GetXULMaxSize(nsIFrame* aBox,
-                                           nsBoxLayoutState& aState) {
-  nsSize maxSize = nsGridRowLayout::GetXULMaxSize(aBox, aState);
-
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-
-  if (grid) {
-    // make sure we add in extra columns sizes as well
-    bool isHorizontal = IsXULHorizontal(aBox);
-    int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
-    int32_t start = grid->GetColumnCount(isHorizontal) -
-                    grid->GetExtraColumnCount(isHorizontal);
-    for (int32_t i = 0; i < extraColumns; i++) {
-      nscoord max = grid->GetMaxRowHeight(aState, i + start,
-                                          !isHorizontal);  // GetMaxColumnWidth
-
-      AddWidth(maxSize, max, isHorizontal);
-    }
-  }
-
-  return maxSize;
-}
-
-nsSize nsGridRowGroupLayout::GetXULMinSize(nsIFrame* aBox,
-                                           nsBoxLayoutState& aState) {
-  nsSize minSize = nsGridRowLayout::GetXULMinSize(aBox, aState);
-
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-
-  if (grid) {
-    // make sure we add in extra columns sizes as well
-    bool isHorizontal = IsXULHorizontal(aBox);
-    int32_t extraColumns = grid->GetExtraColumnCount(isHorizontal);
-    int32_t start = grid->GetColumnCount(isHorizontal) -
-                    grid->GetExtraColumnCount(isHorizontal);
-    for (int32_t i = 0; i < extraColumns; i++) {
-      nscoord min = grid->GetMinRowHeight(aState, i + start,
-                                          !isHorizontal);  // GetMinColumnWidth
-      AddWidth(minSize, min, isHorizontal);
-    }
-  }
-
-  return minSize;
-}
-
-/*
- * Run down through our children dirtying them recursively.
- */
-void nsGridRowGroupLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) {
-  if (aBox) {
-    // mark us dirty
-    // XXXldb We probably don't want to walk up the ancestor chain
-    // calling MarkIntrinsicISizesDirty for every row group.
-    aState.PresShell()->FrameNeedsReflow(
-        aBox, mozilla::IntrinsicDirty::TreeChange, NS_FRAME_IS_DIRTY);
-    nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-
-    while (child) {
-      // walk into scrollframes
-      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
-
-      // walk into other monuments
-      nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
-      if (monument) monument->DirtyRows(deepChild, aState);
-
-      child = nsIFrame::GetNextXULBox(child);
-    }
-  }
-}
-
-void nsGridRowGroupLayout::CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                            int32_t& aComputedColumnCount) {
-  if (aBox) {
-    int32_t startCount = aRowCount;
-
-    nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-
-    while (child) {
-      // first see if it is a scrollframe. If so walk down into it and get the
-      // scrolled child
-      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
-
-      nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
-      if (monument) {
-        monument->CountRowsColumns(deepChild, aRowCount, aComputedColumnCount);
-        child = nsIFrame::GetNextXULBox(child);
-        continue;
-      }
-
-      child = nsIFrame::GetNextXULBox(child);
-
-      // if not a monument. Then count it. It will be a bogus row
-      aRowCount++;
-    }
-
-    mRowCount = aRowCount - startCount;
-  }
-}
-
-/**
- * Fill out the given row structure recursively
- */
-int32_t nsGridRowGroupLayout::BuildRows(nsIFrame* aBox, nsGridRow* aRows) {
-  int32_t rowCount = 0;
-
-  if (aBox) {
-    nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-
-    while (child) {
-      // first see if it is a scrollframe. If so walk down into it and get the
-      // scrolled child
-      nsIFrame* deepChild = nsGrid::GetScrolledBox(child);
-
-      nsIGridPart* monument = nsGrid::GetPartFromBox(deepChild);
-      if (monument) {
-        rowCount += monument->BuildRows(deepChild, &aRows[rowCount]);
-        child = nsIFrame::GetNextXULBox(child);
-        continue;
-      }
-
-      aRows[rowCount].Init(child, true);
-
-      child = nsIFrame::GetNextXULBox(child);
-
-      // if not a monument. Then count it. It will be a bogus row
-      rowCount++;
-    }
-  }
-
-  return rowCount;
-}
-
-nsMargin nsGridRowGroupLayout::GetTotalMargin(nsIFrame* aBox,
-                                              bool aIsHorizontal) {
-  // group have border and padding added to the total margin
-
-  nsMargin margin = nsGridRowLayout::GetTotalMargin(aBox, aIsHorizontal);
-
-  // make sure we have the scrollframe on the outside if it has one.
-  // that's where the border is.
-  aBox = nsGrid::GetScrollBox(aBox);
-
-  // add our border/padding to it
-  nsMargin borderPadding(0, 0, 0, 0);
-  aBox->GetXULBorderAndPadding(borderPadding);
-  margin += borderPadding;
-
-  return margin;
-}
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupLayout.h firefox-85.0+build1/layout/xul/grid/nsGridRowGroupLayout.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowGroupLayout.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowGroupLayout.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +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/. */
-
-/**
-
-  Author:
-  Eric D Vaughan
-
-**/
-
-#ifndef nsGridRowGroupLayout_h___
-#define nsGridRowGroupLayout_h___
-
-#include "mozilla/Attributes.h"
-#include "nsGridRowLayout.h"
-
-/**
- * The nsBoxLayout implementation for nsGridRowGroupFrame.
- */
-class nsGridRowGroupLayout : public nsGridRowLayout {
- public:
-  friend already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout();
-
-  virtual nsGridRowGroupLayout* CastToRowGroupLayout() override { return this; }
-  virtual nsSize GetXULMinSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULPrefSize(nsIFrame* aBox,
-                                nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULMaxSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                int32_t& aComputedColumnCount) override;
-  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) override;
-  virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) override;
-  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) override;
-  virtual int32_t GetRowCount() override { return mRowCount; }
-  virtual Type GetType() override { return eRowGroup; }
-
- protected:
-  nsGridRowGroupLayout();
-  virtual ~nsGridRowGroupLayout();
-
-  virtual void ChildAddedOrRemoved(nsIFrame* aBox,
-                                   nsBoxLayoutState& aState) override;
-  static void AddWidth(nsSize& aSize, nscoord aSize2, bool aIsHorizontal);
-
- private:
-  int32_t mRowCount;
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRow.h firefox-85.0+build1/layout/xul/grid/nsGridRow.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRow.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRow.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +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/. */
-
-/**
-
-  Author:
-  Eric D Vaughan
-
-**/
-
-#ifndef nsGridRow_h___
-#define nsGridRow_h___
-
-#include "nsCoord.h"
-
-class nsIFrame;
-
-/**
- * The row (or column) data structure in the grid cellmap.
- */
-class nsGridRow {
- public:
-  nsGridRow();
-  ~nsGridRow();
-
-  void Init(nsIFrame* aBox, bool aIsBogus);
-
-  // accessors
-  nsIFrame* GetBox() { return mBox; }
-  bool IsPrefSet() { return (mPref != -1); }
-  bool IsMinSet() { return (mMin != -1); }
-  bool IsMaxSet() { return (mMax != -1); }
-  bool IsFlexSet() { return (mFlex != -1); }
-  bool IsOffsetSet() { return (mTop != -1 && mBottom != -1); }
-  bool IsXULCollapsed();
-
- public:
-  bool mIsBogus;
-  nsIFrame* mBox;
-  nscoord mFlex;
-  nscoord mPref;
-  nscoord mMin;
-  nscoord mMax;
-  nscoord mTop;
-  nscoord mBottom;
-  nscoord mTopMargin;
-  nscoord mBottomMargin;
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLayout.cpp firefox-85.0+build1/layout/xul/grid/nsGridRowLayout.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLayout.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLayout.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGridRowLayout.h"
-#include "nsBoxLayoutState.h"
-#include "nsIScrollableFrame.h"
-#include "nsStackLayout.h"
-#include "nsGrid.h"
-
-nsGridRowLayout::nsGridRowLayout() : nsSprocketLayout() {}
-
-nsGridRowLayout::~nsGridRowLayout() = default;
-
-void nsGridRowLayout::ChildrenInserted(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                       nsIFrame* aPrevBox,
-                                       const nsFrameList::Slice& aNewChildren) {
-  ChildAddedOrRemoved(aBox, aState);
-}
-
-void nsGridRowLayout::ChildrenAppended(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                       const nsFrameList::Slice& aNewChildren) {
-  ChildAddedOrRemoved(aBox, aState);
-}
-
-void nsGridRowLayout::ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                      nsIFrame* aChildList) {
-  ChildAddedOrRemoved(aBox, aState);
-}
-
-void nsGridRowLayout::ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
-                                  nsIFrame* aChildList) {
-  ChildAddedOrRemoved(aBox, aState);
-}
-
-nsIGridPart* nsGridRowLayout::GetParentGridPart(nsIFrame* aBox,
-                                                nsIFrame** aParentBox) {
-  // go up and find our parent gridRow. Skip and non gridRow
-  // parents.
-  *aParentBox = nullptr;
-
-  // walk up through any scrollboxes
-  aBox = nsGrid::GetScrollBox(aBox);
-
-  // get the parent
-  if (aBox) {
-    aBox = nsIFrame::GetParentXULBox(aBox);
-  }
-
-  if (aBox) {
-    nsIGridPart* parentGridRow = nsGrid::GetPartFromBox(aBox);
-    if (parentGridRow && parentGridRow->CanContain(this)) {
-      *aParentBox = aBox;
-      return parentGridRow;
-    }
-  }
-
-  return nullptr;
-}
-
-nsGrid* nsGridRowLayout::GetGrid(nsIFrame* aBox, int32_t* aIndex,
-                                 nsGridRowLayout* aRequestor) {
-  if (aRequestor == nullptr) {
-    nsIFrame* parentBox;  // nsIFrame is implemented by nsIFrame and is not
-                          // refcounted.
-    nsIGridPart* parent = GetParentGridPart(aBox, &parentBox);
-    if (parent) return parent->GetGrid(parentBox, aIndex, this);
-    return nullptr;
-  }
-
-  int32_t index = -1;
-  nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-  int32_t count = 0;
-  while (child) {
-    // if there is a scrollframe walk inside it to its child
-    nsIFrame* childBox = nsGrid::GetScrolledBox(child);
-
-    nsBoxLayout* layout = childBox->GetXULLayoutManager();
-    nsIGridPart* gridRow = nsGrid::GetPartFromBox(childBox);
-    if (gridRow) {
-      if (layout == aRequestor) {
-        index = count;
-        break;
-      }
-      count += gridRow->GetRowCount();
-    } else
-      count++;
-
-    child = nsIFrame::GetNextXULBox(child);
-  }
-
-  // if we didn't find ourselves then the tree isn't properly formed yet
-  // this could happen during initial construction so lets just
-  // fail.
-  if (index == -1) {
-    *aIndex = -1;
-    return nullptr;
-  }
-
-  (*aIndex) += index;
-
-  nsIFrame*
-      parentBox;  // nsIFrame is implemented by nsIFrame and is not refcounted.
-  nsIGridPart* parent = GetParentGridPart(aBox, &parentBox);
-  if (parent) return parent->GetGrid(parentBox, aIndex, this);
-
-  return nullptr;
-}
-
-nsMargin nsGridRowLayout::GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) {
-  // get our parents margin
-  nsMargin margin(0, 0, 0, 0);
-  nsIFrame* parent = nullptr;
-  nsIGridPart* part = GetParentGridPart(aBox, &parent);
-  if (part && parent) {
-    // if we are the first or last child walk upward and add margins.
-
-    // make sure we check for a scrollbox
-    aBox = nsGrid::GetScrollBox(aBox);
-
-    // see if we have a next to see if we are last
-    nsIFrame* next = nsIFrame::GetNextXULBox(aBox);
-
-    // get the parent first child to see if we are first
-    nsIFrame* child = nsIFrame::GetChildXULBox(parent);
-
-    margin = part->GetTotalMargin(parent, aIsHorizontal);
-
-    // if first or last
-    if (child == aBox || next == nullptr) {
-      // if it's not the first child remove the top margin
-      // we don't need it.
-      if (child != aBox) {
-        if (aIsHorizontal)
-          margin.top = 0;
-        else
-          margin.left = 0;
-      }
-
-      // if it's not the last child remove the bottom margin
-      // we don't need it.
-      if (next != nullptr) {
-        if (aIsHorizontal)
-          margin.bottom = 0;
-        else
-          margin.right = 0;
-      }
-    }
-  }
-
-  // add ours to it.
-  nsMargin ourMargin;
-  aBox->GetXULMargin(ourMargin);
-  margin += ourMargin;
-
-  return margin;
-}
-
-NS_IMPL_ADDREF_INHERITED(nsGridRowLayout, nsBoxLayout)
-NS_IMPL_RELEASE_INHERITED(nsGridRowLayout, nsBoxLayout)
-
-NS_INTERFACE_MAP_BEGIN(nsGridRowLayout)
-  NS_INTERFACE_MAP_ENTRY(nsIGridPart)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIGridPart)
-NS_INTERFACE_MAP_END_INHERITING(nsBoxLayout)
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLayout.h firefox-85.0+build1/layout/xul/grid/nsGridRowLayout.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLayout.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLayout.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +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/. */
-
-/**
-
-  Author:
-  Eric D Vaughan
-
-**/
-
-#ifndef nsGridRowLayout_h___
-#define nsGridRowLayout_h___
-
-#include "mozilla/Attributes.h"
-#include "nsSprocketLayout.h"
-#include "nsIGridPart.h"
-class nsGridRowGroupLayout;
-class nsGridLayout2;
-class nsBoxLayoutState;
-class nsGrid;
-
-/**
- * A common base class for nsGridRowLeafLayout (the nsBoxLayout object
- * for a grid row or column) and nsGridRowGroupLayout (the nsBoxLayout
- * object for a grid row group or column group).
- */
-// XXXldb This needs a name that indicates that it's a base class for
-// both row and rows (row-group).
-class nsGridRowLayout : public nsSprocketLayout, public nsIGridPart {
- public:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  virtual nsGridRowGroupLayout* CastToRowGroupLayout() override {
-    return nullptr;
-  }
-  virtual nsGridLayout2* CastToGridLayout() override { return nullptr; }
-  virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex,
-                          nsGridRowLayout* aRequestor = nullptr) override;
-  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox,
-                                         nsIFrame** aParentBox) override;
-  virtual void ChildrenInserted(
-      nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aPrevBox,
-      const nsFrameList::Slice& aNewChildren) override;
-  virtual void ChildrenAppended(
-      nsIFrame* aBox, nsBoxLayoutState& aState,
-      const nsFrameList::Slice& aNewChildren) override;
-  virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState,
-                               nsIFrame* aChildList) override;
-  virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState,
-                           nsIFrame* aChildList) override;
-  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) override;
-
-  virtual nsIGridPart* AsGridPart() override { return this; }
-
- protected:
-  virtual void ChildAddedOrRemoved(nsIFrame* aBox,
-                                   nsBoxLayoutState& aState) = 0;
-
-  nsGridRowLayout();
-  virtual ~nsGridRowLayout();
-};
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafFrame.cpp firefox-85.0+build1/layout/xul/grid/nsGridRowLeafFrame.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLeafFrame.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "mozilla/PresShell.h"
-#include "nsGridRowLeafFrame.h"
-#include "nsGridRowLeafLayout.h"
-#include "nsGridRow.h"
-#include "nsBoxLayoutState.h"
-#include "nsGridLayout2.h"
-
-using namespace mozilla;
-
-already_AddRefed<nsBoxLayout> NS_NewGridRowLeafLayout();
-
-nsIFrame* NS_NewGridRowLeafFrame(PresShell* aPresShell, ComputedStyle* aStyle) {
-  nsCOMPtr<nsBoxLayout> layout = NS_NewGridRowLeafLayout();
-  return new (aPresShell)
-      nsGridRowLeafFrame(aStyle, aPresShell->GetPresContext(), false, layout);
-}
-
-NS_IMPL_FRAMEARENA_HELPERS(nsGridRowLeafFrame)
-
-/*
- * Our border and padding could be affected by our columns or rows.
- * Let's go check it out.
- */
-nsresult nsGridRowLeafFrame::GetXULBorderAndPadding(
-    nsMargin& aBorderAndPadding) {
-  // if our columns have made our padding larger add it in.
-  nsresult rv = nsBoxFrame::GetXULBorderAndPadding(aBorderAndPadding);
-
-  nsIGridPart* part = nsGrid::GetPartFromBox(this);
-  if (!part) return rv;
-
-  int32_t index = 0;
-  nsGrid* grid = part->GetGrid(this, &index);
-
-  if (!grid) return rv;
-
-  bool isHorizontal = IsXULHorizontal();
-
-  int32_t firstIndex = 0;
-  int32_t lastIndex = 0;
-  nsGridRow* firstRow = nullptr;
-  nsGridRow* lastRow = nullptr;
-  grid->GetFirstAndLastRow(firstIndex, lastIndex, firstRow, lastRow,
-                           isHorizontal);
-
-  // only the first and last rows can be affected.
-  if (firstRow && firstRow->GetBox() == this) {
-    nscoord top = 0;
-    nscoord bottom = 0;
-    grid->GetRowOffsets(firstIndex, top, bottom, isHorizontal);
-
-    if (isHorizontal) {
-      if (top > aBorderAndPadding.top) aBorderAndPadding.top = top;
-    } else {
-      if (top > aBorderAndPadding.left) aBorderAndPadding.left = top;
-    }
-  }
-
-  if (lastRow && lastRow->GetBox() == this) {
-    nscoord top = 0;
-    nscoord bottom = 0;
-    grid->GetRowOffsets(lastIndex, top, bottom, isHorizontal);
-
-    if (isHorizontal) {
-      if (bottom > aBorderAndPadding.bottom) aBorderAndPadding.bottom = bottom;
-    } else {
-      if (bottom > aBorderAndPadding.right) aBorderAndPadding.right = bottom;
-    }
-  }
-
-  return rv;
-}
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafFrame.h firefox-85.0+build1/layout/xul/grid/nsGridRowLeafFrame.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLeafFrame.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +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/. */
-
-/**
-
-  Eric D Vaughan
-  A frame that can have multiple children. Only one child may be displayed at
-one time. So the can be flipped though like a deck of cards.
-
-**/
-
-#ifndef nsGridRowLeafFrame_h___
-#define nsGridRowLeafFrame_h___
-
-#include "mozilla/Attributes.h"
-#include "nsBoxFrame.h"
-
-namespace mozilla {
-class PresShell;
-}  // namespace mozilla
-
-/**
- * A frame representing a grid row (or column).  Grid row (and column)
- * elements are the children of row group (or column group) elements,
- * and their children are placed one to a cell.
- */
-// XXXldb This needs a better name that indicates that it's for any grid
-// row.
-class nsGridRowLeafFrame : public nsBoxFrame {
- public:
-  NS_DECL_FRAMEARENA_HELPERS(nsGridRowLeafFrame)
-
-  friend nsIFrame* NS_NewGridRowLeafFrame(mozilla::PresShell* aPresShell,
-                                          ComputedStyle* aStyle);
-
-#ifdef DEBUG_FRAME_DUMP
-  virtual nsresult GetFrameName(nsAString& aResult) const override {
-    return MakeFrameName(u"nsGridRowLeaf"_ns, aResult);
-  }
-#endif
-
-  nsGridRowLeafFrame(ComputedStyle* aStyle, nsPresContext* aPresContext,
-                     bool aIsRoot, nsBoxLayout* aLayoutManager,
-                     ClassID aID = kClassID)
-      : nsBoxFrame(aStyle, aPresContext, aID, aIsRoot, aLayoutManager) {}
-
-  virtual nsresult GetXULBorderAndPadding(nsMargin& aBorderAndPadding) override;
-
-};  // class nsGridRowLeafFrame
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafLayout.cpp firefox-85.0+build1/layout/xul/grid/nsGridRowLeafLayout.cpp
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafLayout.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLeafLayout.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +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/. */
-
-//
-// Eric Vaughan
-// Netscape Communications
-//
-// See documentation in associated header file
-//
-
-#include "nsGridRowLeafLayout.h"
-#include "nsGridRowGroupLayout.h"
-#include "nsGridRow.h"
-#include "nsBoxLayoutState.h"
-#include "nsIScrollableFrame.h"
-#include "nsBoxFrame.h"
-#include "nsGridLayout2.h"
-#include <algorithm>
-
-already_AddRefed<nsBoxLayout> NS_NewGridRowLeafLayout() {
-  RefPtr<nsBoxLayout> layout = new nsGridRowLeafLayout();
-  return layout.forget();
-}
-
-nsGridRowLeafLayout::nsGridRowLeafLayout() : nsGridRowLayout() {}
-
-nsGridRowLeafLayout::~nsGridRowLeafLayout() = default;
-
-nsSize nsGridRowLeafLayout::GetXULPrefSize(nsIFrame* aBox,
-                                           nsBoxLayoutState& aState) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  // If we are not in a grid. Then we just work like a box. But if we are in a
-  // grid ask the grid for our size.
-  if (!grid) {
-    return nsGridRowLayout::GetXULPrefSize(aBox, aState);
-  } else {
-    return grid->GetPrefRowSize(aState, index, isHorizontal);
-    // AddXULBorderAndPadding(aBox, pref);
-  }
-}
-
-nsSize nsGridRowLeafLayout::GetXULMinSize(nsIFrame* aBox,
-                                          nsBoxLayoutState& aState) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  if (!grid)
-    return nsGridRowLayout::GetXULMinSize(aBox, aState);
-  else {
-    nsSize minSize = grid->GetMinRowSize(aState, index, isHorizontal);
-    AddXULBorderAndPadding(aBox, minSize);
-    return minSize;
-  }
-}
-
-nsSize nsGridRowLeafLayout::GetXULMaxSize(nsIFrame* aBox,
-                                          nsBoxLayoutState& aState) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  if (!grid)
-    return nsGridRowLayout::GetXULMaxSize(aBox, aState);
-  else {
-    nsSize maxSize;
-    maxSize = grid->GetMaxRowSize(aState, index, isHorizontal);
-    AddXULBorderAndPadding(aBox, maxSize);
-    return maxSize;
-  }
-}
-
-/** If a child is added or removed or changes size
- */
-void nsGridRowLeafLayout::ChildAddedOrRemoved(nsIFrame* aBox,
-                                              nsBoxLayoutState& aState) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  if (grid) grid->CellAddedOrRemoved(aState, index, isHorizontal);
-}
-
-void nsGridRowLeafLayout::PopulateBoxSizes(nsIFrame* aBox,
-                                           nsBoxLayoutState& aState,
-                                           nsBoxSize*& aBoxSizes,
-                                           nscoord& aMinSize, nscoord& aMaxSize,
-                                           int32_t& aFlexes) {
-  int32_t index = 0;
-  nsGrid* grid = GetGrid(aBox, &index);
-  bool isHorizontal = IsXULHorizontal(aBox);
-
-  // Our base class SprocketLayout is giving us a chance to change the box sizes
-  // before layout If we are a row lets change the sizes to match our columns.
-  // If we are a column then do the opposite and make them match or rows.
-  if (grid) {
-    nsGridRow* column;
-    int32_t count = grid->GetColumnCount(isHorizontal);
-    nsBoxSize* start = nullptr;
-    nsBoxSize* last = nullptr;
-    nsBoxSize* current = nullptr;
-    nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-    for (int i = 0; i < count; i++) {
-      column = grid->GetColumnAt(i, isHorizontal);
-
-      // make sure the value was computed before we use it.
-      // !isHorizontal is passed in to invert the behavior of these methods.
-      nscoord pref = grid->GetPrefRowHeight(
-          aState, i, !isHorizontal);  // GetPrefColumnWidth
-      nscoord min =
-          grid->GetMinRowHeight(aState, i, !isHorizontal);  // GetMinColumnWidth
-      nscoord max =
-          grid->GetMaxRowHeight(aState, i, !isHorizontal);  // GetMaxColumnWidth
-      nscoord flex = grid->GetRowFlex(i, !isHorizontal);    // GetColumnFlex
-      nscoord left = 0;
-      nscoord right = 0;
-      grid->GetRowOffsets(i, left, right, !isHorizontal);  // GetColumnOffsets
-      nsIFrame* box = column->GetBox();
-      bool collapsed = false;
-      nscoord topMargin = column->mTopMargin;
-      nscoord bottomMargin = column->mBottomMargin;
-
-      if (box) collapsed = box->IsXULCollapsed();
-
-      pref = pref - (left + right);
-      if (pref < 0) pref = 0;
-
-      // if this is the first or last column. Take into account that
-      // our row could have a border that could affect our left or right
-      // padding from our columns. If the row has padding subtract it.
-      // would should always be able to garentee that our margin is smaller
-      // or equal to our left or right
-      int32_t firstIndex = 0;
-      int32_t lastIndex = 0;
-      nsGridRow* firstRow = nullptr;
-      nsGridRow* lastRow = nullptr;
-      grid->GetFirstAndLastRow(firstIndex, lastIndex, firstRow, lastRow,
-                               !isHorizontal);
-
-      if (i == firstIndex || i == lastIndex) {
-        nsMargin offset = GetTotalMargin(aBox, isHorizontal);
-
-        nsMargin border(0, 0, 0, 0);
-        // can't call GetBorderPadding we will get into recursion
-        aBox->GetXULBorder(border);
-        offset += border;
-        aBox->GetXULPadding(border);
-        offset += border;
-
-        // subtract from out left and right
-        if (i == firstIndex) {
-          if (isHorizontal)
-            left -= offset.left;
-          else
-            left -= offset.top;
-        }
-
-        if (i == lastIndex) {
-          if (isHorizontal)
-            right -= offset.right;
-          else
-            right -= offset.bottom;
-        }
-      }
-
-      // initialize the box size here
-      max = std::max(min, max);
-      pref = nsIFrame::XULBoundsCheck(min, pref, max);
-
-      current = new (aState) nsBoxSize();
-      current->pref = pref;
-      current->min = min;
-      current->max = max;
-      current->flex = flex;
-      current->bogus = column->mIsBogus;
-      current->left = left + topMargin;
-      current->right = right + bottomMargin;
-      current->collapsed = collapsed;
-
-      if (!start) {
-        start = current;
-        last = start;
-      } else {
-        last->next = current;
-        last = current;
-      }
-
-      if (child && !column->mIsBogus) {
-        child = nsIFrame::GetNextXULBox(child);
-      }
-    }
-    aBoxSizes = start;
-  }
-
-  nsSprocketLayout::PopulateBoxSizes(aBox, aState, aBoxSizes, aMinSize,
-                                     aMaxSize, aFlexes);
-}
-
-void nsGridRowLeafLayout::ComputeChildSizes(
-    nsIFrame* aBox, nsBoxLayoutState& aState, nscoord& aGivenSize,
-    nsBoxSize* aBoxSizes, nsComputedBoxSize*& aComputedBoxSizes) {
-  // see if we are in a scrollable frame. If we are then there could be
-  // scrollbars present if so we need to subtract them out to make sure our
-  // columns line up.
-  if (aBox) {
-    bool isHorizontal = aBox->IsXULHorizontal();
-
-    // go up the parent chain looking for scrollframes
-    nscoord diff = 0;
-    nsIFrame* parentBox;
-    (void)GetParentGridPart(aBox, &parentBox);
-    while (parentBox) {
-      nsIFrame* scrollbox = nsGrid::GetScrollBox(parentBox);
-      nsIScrollableFrame* scrollable = do_QueryFrame(scrollbox);
-      if (scrollable) {
-        // Don't call GetActualScrollbarSizes here because it's not safe
-        // to call that while we're reflowing the contents of the scrollframe,
-        // which we are here.
-        nsMargin scrollbarSizes = scrollable->GetDesiredScrollbarSizes(&aState);
-        uint32_t visible = scrollable->GetScrollbarVisibility();
-
-        if (isHorizontal && (visible & nsIScrollableFrame::VERTICAL)) {
-          diff += scrollbarSizes.left + scrollbarSizes.right;
-        } else if (!isHorizontal &&
-                   (visible & nsIScrollableFrame::HORIZONTAL)) {
-          diff += scrollbarSizes.top + scrollbarSizes.bottom;
-        }
-      }
-
-      (void)GetParentGridPart(parentBox, &parentBox);
-    }
-
-    if (diff > 0) {
-      aGivenSize += diff;
-
-      nsSprocketLayout::ComputeChildSizes(aBox, aState, aGivenSize, aBoxSizes,
-                                          aComputedBoxSizes);
-
-      aGivenSize -= diff;
-
-      nsComputedBoxSize* s = aComputedBoxSizes;
-      nsComputedBoxSize* last = aComputedBoxSizes;
-      while (s) {
-        last = s;
-        s = s->next;
-      }
-
-      if (last) last->size -= diff;
-
-      return;
-    }
-  }
-
-  nsSprocketLayout::ComputeChildSizes(aBox, aState, aGivenSize, aBoxSizes,
-                                      aComputedBoxSizes);
-}
-
-NS_IMETHODIMP
-nsGridRowLeafLayout::XULLayout(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) {
-  return nsGridRowLayout::XULLayout(aBox, aBoxLayoutState);
-}
-
-void nsGridRowLeafLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) {
-  if (aBox) {
-    // mark us dirty
-    // XXXldb We probably don't want to walk up the ancestor chain
-    // calling MarkIntrinsicISizesDirty for every row.
-    aState.PresShell()->FrameNeedsReflow(
-        aBox, mozilla::IntrinsicDirty::TreeChange, NS_FRAME_IS_DIRTY);
-  }
-}
-
-void nsGridRowLeafLayout::CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                           int32_t& aComputedColumnCount) {
-  if (aBox) {
-    nsIFrame* child = nsIFrame::GetChildXULBox(aBox);
-
-    // count the children
-    int32_t columnCount = 0;
-    while (child) {
-      child = nsIFrame::GetNextXULBox(child);
-      columnCount++;
-    }
-
-    // if our count is greater than the current column count
-    if (columnCount > aComputedColumnCount) aComputedColumnCount = columnCount;
-
-    aRowCount++;
-  }
-}
-
-int32_t nsGridRowLeafLayout::BuildRows(nsIFrame* aBox, nsGridRow* aRows) {
-  if (aBox) {
-    aRows[0].Init(aBox, false);
-    return 1;
-  }
-
-  return 0;
-}
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafLayout.h firefox-85.0+build1/layout/xul/grid/nsGridRowLeafLayout.h
--- firefox-84.0.2+build1/layout/xul/grid/nsGridRowLeafLayout.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsGridRowLeafLayout.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +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/. */
-
-/**
-
-  Author:
-  Eric D Vaughan
-
-**/
-
-#ifndef nsGridRowLeafLayout_h___
-#define nsGridRowLeafLayout_h___
-
-#include "mozilla/Attributes.h"
-#include "nsGridRowLayout.h"
-#include "nsCOMPtr.h"
-
-/**
- * The nsBoxLayout implementation for nsGridRowLeafFrame.
- */
-// XXXldb This needs a better name that indicates that it's for any grid
-// row.
-class nsGridRowLeafLayout final : public nsGridRowLayout {
- public:
-  friend already_AddRefed<nsBoxLayout> NS_NewGridRowLeafLayout();
-
-  virtual nsSize GetXULPrefSize(nsIFrame* aBox,
-                                nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULMinSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual nsSize GetXULMaxSize(nsIFrame* aBox,
-                               nsBoxLayoutState& aBoxLayoutState) override;
-  virtual void ChildAddedOrRemoved(nsIFrame* aBox,
-                                   nsBoxLayoutState& aState) override;
-  NS_IMETHOD XULLayout(nsIFrame* aBox,
-                       nsBoxLayoutState& aBoxLayoutState) override;
-  virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                int32_t& aComputedColumnCount) override;
-  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) override;
-  virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) override;
-  virtual Type GetType() override { return eRowLeaf; }
-
- protected:
-  virtual void PopulateBoxSizes(nsIFrame* aBox,
-                                nsBoxLayoutState& aBoxLayoutState,
-                                nsBoxSize*& aBoxSizes, nscoord& aMinSize,
-                                nscoord& aMaxSize, int32_t& aFlexes) override;
-  virtual void ComputeChildSizes(
-      nsIFrame* aBox, nsBoxLayoutState& aState, nscoord& aGivenSize,
-      nsBoxSize* aBoxSizes, nsComputedBoxSize*& aComputedBoxSizes) override;
-
-  nsGridRowLeafLayout();
-  virtual ~nsGridRowLeafLayout();
-  // virtual void AddXULBorderAndPadding(nsIFrame* aBox, nsSize& aSize);
-
- private:
-};  // class nsGridRowLeafLayout
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/nsIGridPart.h firefox-85.0+build1/layout/xul/grid/nsIGridPart.h
--- firefox-84.0.2+build1/layout/xul/grid/nsIGridPart.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/nsIGridPart.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +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 nsIGridPart_h___
-#define nsIGridPart_h___
-
-#include "nsISupports.h"
-
-class nsGridRowGroupLayout;
-class nsGrid;
-class nsGridRowLayout;
-class nsGridRow;
-class nsGridLayout2;
-
-// 07373ed7-e947-4a5e-b36c-69f7c195677b
-#define NS_IGRIDPART_IID                             \
-  {                                                  \
-    0x07373ed7, 0xe947, 0x4a5e, {                    \
-      0xb3, 0x6c, 0x69, 0xf7, 0xc1, 0x95, 0x67, 0x7b \
-    }                                                \
-  }
-
-/**
- * An additional interface implemented by nsBoxLayout implementations
- * for parts of a grid (excluding cells, which are not special).
- */
-class nsIGridPart : public nsISupports {
- public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IGRIDPART_IID)
-
-  virtual nsGridRowGroupLayout* CastToRowGroupLayout() = 0;
-  virtual nsGridLayout2* CastToGridLayout() = 0;
-
-  /**
-   * @param aBox [IN] The other half of the |this| parameter, i.e., the box
-   *                  whose layout manager is |this|.
-   * @param aIndex [INOUT] For callers not setting aRequestor, the value
-   *                       pointed to by aIndex is incremented by the index
-   *                       of the row (aBox) within its row group; if aBox
-   *                       is not a row/column, it is untouched.
-   *                       The implementation does this by doing the aIndex
-   *                       incrementing in the call to the parent row group
-   *                       when aRequestor is non-null.
-   * @param aRequestor [IN] Non-null if and only if this is a recursive
-   *                   call from the GetGrid method on a child grid part,
-   *                   in which case it is a pointer to that grid part.
-   *                   (This may only be non-null for row groups and
-   *                   grids.)
-   * @return The grid of which aBox (a row, row group, or grid) is a part.
-   */
-  virtual nsGrid* GetGrid(nsIFrame* aBox, int32_t* aIndex,
-                          nsGridRowLayout* aRequestor = nullptr) = 0;
-
-  /**
-   * @param aBox [IN] The other half of the |this| parameter, i.e., the box
-   *                  whose layout manager is |this|.
-   * @param aParentBox [OUT] The box representing the next level up in
-   *                   the grid (i.e., row group for a row, grid for a
-   *                   row group).
-   * @returns The layout manager for aParentBox.
-   */
-  virtual nsIGridPart* GetParentGridPart(nsIFrame* aBox,
-                                         nsIFrame** aParentBox) = 0;
-
-  /**
-   * @param aBox [IN] The other half of the |this| parameter, i.e., the box
-   *                  whose layout manager is |this|.
-   * @param aRowCount [INOUT] Row count
-   * @param aComputedColumnCount [INOUT] Column count
-   */
-  virtual void CountRowsColumns(nsIFrame* aBox, int32_t& aRowCount,
-                                int32_t& aComputedColumnCount) = 0;
-  virtual void DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState) = 0;
-  virtual int32_t BuildRows(nsIFrame* aBox, nsGridRow* aRows) = 0;
-  virtual nsMargin GetTotalMargin(nsIFrame* aBox, bool aIsHorizontal) = 0;
-  virtual int32_t GetRowCount() { return 1; }
-
-  /**
-   * Return the level of the grid hierarchy this grid part represents.
-   */
-  enum Type { eGrid, eRowGroup, eRowLeaf };
-  virtual Type GetType() = 0;
-
-  /**
-   * Return whether this grid part is an appropriate parent for the argument.
-   */
-  bool CanContain(nsIGridPart* aPossibleChild) {
-    Type thisType = GetType(), childType = aPossibleChild->GetType();
-    return thisType + 1 == childType ||
-           (thisType == eRowGroup && childType == eRowGroup);
-  }
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIGridPart, NS_IGRIDPART_IID)
-
-#endif
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/column-sizing-1-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/column-sizing-1-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/column-sizing-1-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/column-sizing-1-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <hbox>
-    <vbox style="background:aqua">
-      <label value="Left" />
-    </vbox>
-    <vbox style="background:yellow">
-      <input xmlns="http://www.w3.org/1999/xhtml" value="Right" />
-    </vbox>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/column-sizing-1.xhtml firefox-85.0+build1/layout/xul/grid/reftests/column-sizing-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/column-sizing-1.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/column-sizing-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <grid>
-    <columns>
-      <column style="background:aqua">
-        <label value="Left" />
-      </column>
-      <column style="background:yellow">
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Right" />
-      </column>
-    </columns>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-basic-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-basic-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-basic-ref.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-basic-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            top: 0px; height: 200px; left: 0px; width: 200px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 200px; bottom: 0px; left: 0px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 200px; height: 100px; left: 100px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 0px; height: 100px; left: 200px; right: 0px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 100px; height: 100px; left: 200px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-basic.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-basic.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-basic.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-basic.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-grid-pack-align.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-grid-pack-align.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-grid-pack-align.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-grid-pack-align.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <!-- align and pack should be no-ops on grid element (not on columns/rows) -->
-  <grid flex="1" align="start" pack="end">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-align-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            top: 100px; height: 100px; left: 100px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 0px; height: 100px; left: 100px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 200px; height: 100px; left: 100px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 100px; height: 100px; left: 0px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 100px; height: 100px; left: 200px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-align.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-align.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-align.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-align.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <grid flex="1">
-    <!-- does anybody actually *want* the way columns align="start" behaves here? -->
-    <columns align="start">
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows align="start">
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-direction-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            bottom: 0px; height: 100px; right: 0px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            bottom: 0px; height: 100px; left: 0px; right: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            bottom: 100px; height: 100px; left: 0px; width: 300px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 0px; bottom: 100px; right: 0px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 0px; height: 300px; right: 100px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-direction.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-direction.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-direction.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-direction.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    rows, columns { -moz-box-direction: reverse; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-pack-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            bottom: 200px; height: 100px; right: 200px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            bottom: 200px; height: 100px; left: 0px; right: 300px;" />
-<div style="background: rgb(0, 0, 153);
-            bottom: 100px; height: 100px; left: 0px; width: 300px;" />
-<div style="background: rgb(0, 0, 153);
-            bottom: 200px; height: 100px; right: 0px; width: 200px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 0px; bottom: 300px; right: 200px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 0px; height: 300px; right: 100px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            bottom: 0px; height: 200px; right: 200px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-pack.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-pack.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-group-pack.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-group-pack.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    rows, columns { -moz-box-pack: end; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-align.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-align.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-align.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-align.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    row, column { -moz-box-align: start; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-direction.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-direction.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-direction.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-direction.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    row, column { -moz-box-direction: reverse; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-pack-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            top: 0px; height: 100px; left: 0px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            top: 100px; bottom: 0px; left: 0px; width: 100px;" />
-<div style="background: rgb(0, 255, 0);
-            bottom: 0px; height: 300px; left: 100px; width: 100px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 0px; height: 100px; left: 100px; right: 0px;" />
-<div style="background: rgb(0, 0, 153);
-            top: 100px; height: 100px; right: 0px; width: 300px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-pack.xhtml firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-pack.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/not-full-row-leaf-pack.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/not-full-row-leaf-pack.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    row, column { -moz-box-pack: end; }
-  ]]></style>
-  <grid flex="1">
-    <columns>
-      <column style="background: rgb(0, 255, 0)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-        <hbox style="background: rgb(0, 255, 0)" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row style="background: rgba(0, 0, 255, 0.6)">
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        <hbox style="background: rgba(0, 0, 255, 0.6)" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/reftest.list firefox-85.0+build1/layout/xul/grid/reftests/reftest.list
--- firefox-84.0.2+build1/layout/xul/grid/reftests/reftest.list	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/reftest.list	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-== chrome://reftest/content/grid/row-sizing-1.xhtml chrome://reftest/content/grid/row-sizing-1-ref.xhtml
-== chrome://reftest/content/grid/column-sizing-1.xhtml chrome://reftest/content/grid/column-sizing-1-ref.xhtml
-== chrome://reftest/content/grid/row-or-column-sizing-1.xhtml chrome://reftest/content/grid/row-or-column-sizing-2.xhtml
-== chrome://reftest/content/grid/row-or-column-sizing-1.xhtml chrome://reftest/content/grid/row-or-column-sizing-3.xhtml
-== chrome://reftest/content/grid/row-or-column-sizing-1.xhtml chrome://reftest/content/grid/row-or-column-sizing-4.xhtml
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/z-order-1.xhtml chrome://reftest/content/grid/z-order-1-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/z-order-2.xhtml chrome://reftest/content/grid/z-order-2-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/not-full-basic.xhtml not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-110000) == chrome://reftest/content/grid/not-full-grid-pack-align.xhtml not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-30000) == chrome://reftest/content/grid/not-full-row-group-align.xhtml not-full-row-group-align-ref.xhtml # does anyone want/need this behavior?
-fuzzy-if(skiaContent,0-1,0-10000) == chrome://reftest/content/grid/not-full-row-group-pack.xhtml not-full-row-group-pack-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-50000) == chrome://reftest/content/grid/not-full-row-group-direction.xhtml not-full-row-group-direction-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-60000) == chrome://reftest/content/grid/not-full-row-leaf-align.xhtml not-full-basic-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-50000) == chrome://reftest/content/grid/not-full-row-leaf-pack.xhtml not-full-row-leaf-pack-ref.xhtml
-fuzzy-if(skiaContent,0-1,0-80000) == chrome://reftest/content/grid/not-full-row-leaf-direction.xhtml not-full-row-leaf-pack-ref.xhtml
-random-if(transparentScrollbars) fuzzy-if(OSX==1010,0-1,0-565) == chrome://reftest/content/grid/scrollable-columns.xhtml scrollable-columns-ref.xhtml # bug 650597
-fails == chrome://reftest/content/grid/scrollable-rows.xhtml scrollable-rows-ref.xhtml
-== chrome://reftest/content/grid/sizing-2d.xhtml chrome://reftest/content/grid/sizing-2d-ref.xhtml
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-1.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-1.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <grid>
-    <columns>
-      <column />
-      <column />
-    </columns>
-    <rows>
-      <row>
-        <hbox />
-        <label value="Upper right" />
-      </row>
-      <row>
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-2.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-2.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-2.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <grid>
-    <columns>
-      <column>
-        <hbox />
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
-      </column>
-      <column>
-        <label value="Upper right" />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row />
-      <row />
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-3.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-3.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-3.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-3.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <grid>
-    <columns>
-      <column>
-        <hbox />
-        <hbox />
-      </column>
-      <column>
-        <label value="Upper right" />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row>
-        <hbox />
-        <hbox />
-      </row>
-      <row>
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-4.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-4.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-or-column-sizing-4.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-or-column-sizing-4.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <grid>
-    <columns>
-      <column>
-        <hbox />
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Lower left" />
-      </column>
-      <column>
-        <hbox />
-        <hbox />
-      </column>
-    </columns>
-    <rows>
-      <row>
-        <hbox />
-        <label value="Upper right" />
-      </row>
-      <row>
-        <hbox />
-        <hbox />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-sizing-1-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-sizing-1-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-sizing-1-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-sizing-1-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="horizontal"
-        title="XUL Grid Test">
-  <vbox>
-    <hbox style="background:aqua">
-      <label value="Top" />
-    </hbox>
-    <hbox style="background:yellow">
-      <input xmlns="http://www.w3.org/1999/xhtml" value="Bottom" />
-    </hbox>
-  </vbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/row-sizing-1.xhtml firefox-85.0+build1/layout/xul/grid/reftests/row-sizing-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/row-sizing-1.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/row-sizing-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="horizontal"
-        title="XUL Grid Test">
-  <grid>
-    <rows>
-      <row style="background:aqua">
-        <label value="Top" />
-      </row>
-      <row style="background:yellow">
-        <input xmlns="http://www.w3.org/1999/xhtml" value="Bottom" />
-      </row>
-    </rows>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-columns-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/scrollable-columns-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-columns-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/scrollable-columns-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            top: 0px; height: 200px; left: 0px; width: 200px;" />
-<div style="background: rgb(0, 255, 0); overflow: auto;
-            top: 200px; height: 100px; left: 0px; width: 200px;">
-  <div style="width: 300px; height: 50px" />
-</div>
-<div style="background: rgb(0, 0, 153);
-            top: 100px; height: 100px; left: 200px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-columns.xhtml firefox-85.0+build1/layout/xul/grid/reftests/scrollable-columns.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-columns.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/scrollable-columns.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    grid { width: 200px; height: 200px; }
-    columns { overflow: auto; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <columns>
-        <column style="background: rgb(0, 255, 0)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-        <column>
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </column>
-        <column>
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-      </columns>
-      <rows>
-        <row style="background: rgba(0, 0, 255, 0.6)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-        <row>
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        </row>
-        <row>
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-      </rows>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-rows-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/scrollable-rows-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-rows-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/scrollable-rows-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>XUL Grid Test</title>
-	<style type="text/css">
-	html { background: black; }
-	html, body { margin: 0; padding: 0; height: 100%; }
-	div { position: absolute; }
-	</style>
-</head>
-<body>
-
-<div style="background: rgb(0, 102, 153);
-            top: 0px; height: 200px; left: 0px; width: 200px;" />
-<div style="background: rgb(0, 0, 153); overflow: auto;
-            top: 0px; height: 200px; left: 200px; width: 100px;">
-  <div style="width: 50px; height: 300px" />
-</div>
-<div style="background: rgb(0, 255, 0);
-            top: 200px; height: 100px; left: 100px; width: 100px;" />
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-rows.xhtml firefox-85.0+build1/layout/xul/grid/reftests/scrollable-rows.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/scrollable-rows.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/scrollable-rows.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-    grid { width: 200px; height: 200px; }
-    rows { overflow: auto; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <columns>
-        <column style="background: rgb(0, 255, 0)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-        <column>
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </column>
-        <column>
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-      </columns>
-      <rows>
-        <row style="background: rgba(0, 0, 255, 0.6)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-        <row>
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        </row>
-        <row>
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-      </rows>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/sizing-2d-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/sizing-2d-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/sizing-2d-ref.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/sizing-2d-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="start">
-  <hbox>
-    <box style="background:aqua; width: 50px; height: 100px" />
-    <box style="background:fuchsia; width: 100px; height: 100px" />
-  </hbox>
-  <hbox>
-    <box style="background:yellow; width: 50px; height: 75px" />
-    <box style="background:blue; width: 100px; height: 75px" />
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/sizing-2d.xhtml firefox-85.0+build1/layout/xul/grid/reftests/sizing-2d.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/sizing-2d.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/sizing-2d.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="start">
-  <grid>
-    <rows>
-      <row>
-        <box style="width: 25px; height: 25px" />
-        <box />
-      </row>
-      <row>
-        <box />
-        <box style="width: 75px; height: 75px" />
-      </row>
-    </rows>
-    <columns>
-      <column>
-        <box style="background: aqua" />
-        <box style="background: yellow; width: 50px; height: 50px" />
-      </column>
-      <column>
-        <box style="background: fuchsia; width: 100px; height: 100px" />
-        <box style="background: blue" />
-      </column>
-    </columns>
-  </grid>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-1-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/z-order-1-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-1-ref.xhtml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/z-order-1-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <rows>
-        <row>
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 0, 153)" />
-        </row>
-        <row>
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 0, 153)" />
-        </row>
-        <row>
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 0, 0)" />
-        </row>
-      </rows>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-1.xhtml firefox-85.0+build1/layout/xul/grid/reftests/z-order-1.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-1.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/z-order-1.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <columns>
-        <column style="background: rgb(0, 255, 0)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-        <column>
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </column>
-        <column>
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-      </columns>
-      <rows>
-        <row style="background: rgba(0, 0, 255, 0.6)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-        <row>
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        </row>
-        <row>
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-      </rows>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-2-ref.xhtml firefox-85.0+build1/layout/xul/grid/reftests/z-order-2-ref.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-2-ref.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/z-order-2-ref.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <rows>
-        <row>
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </row>
-        <row>
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 102, 153)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </row>
-        <row>
-          <hbox style="background: rgb(0, 0, 153)" />
-          <hbox style="background: rgb(0, 0, 153)" />
-          <hbox style="background: rgb(0, 0, 0)" />
-        </row>
-      </rows>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-2.xhtml firefox-85.0+build1/layout/xul/grid/reftests/z-order-2.xhtml
--- firefox-84.0.2+build1/layout/xul/grid/reftests/z-order-2.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/grid/reftests/z-order-2.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="XUL Grid Test">
-  <style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
-    window { background: black; }
-    hbox { height: 100px; width: 100px; }
-  ]]></style>
-  <hbox>
-    <grid>
-      <rows>
-        <row style="background: rgb(0, 255, 0)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-        <row>
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-          <hbox style="background: rgb(0, 255, 0)" />
-        </row>
-        <row>
-          <hbox />
-          <hbox />
-          <hbox />
-        </row>
-      </rows>
-      <columns>
-        <column style="background: rgba(0, 0, 255, 0.6)">
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-        <column>
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-          <hbox style="background: rgba(0, 0, 255, 0.6)" />
-        </column>
-        <column>
-          <hbox />
-          <hbox />
-          <hbox />
-        </column>
-      </columns>
-    </grid>
-  </hbox>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/moz.build firefox-85.0+build1/layout/xul/moz.build
--- firefox-84.0.2+build1/layout/xul/moz.build	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -58,7 +58,7 @@
     ]
 
 if CONFIG["MOZ_XUL"]:
-    DIRS += ["tree", "grid"]
+    DIRS += ["tree"]
 
 CFLAGS += CONFIG["TK_CFLAGS"]
 CXXFLAGS += CONFIG["TK_CFLAGS"]
diff -Nru firefox-84.0.2+build1/layout/xul/nsBox.cpp firefox-85.0+build1/layout/xul/nsBox.cpp
--- firefox-84.0.2+build1/layout/xul/nsBox.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsBox.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -285,7 +285,7 @@
     inkOverflow = InkOverflowRect();
   } else {
     nsRect rect(nsPoint(0, 0), GetSize());
-    nsOverflowAreas overflowAreas(rect, rect);
+    OverflowAreas overflowAreas(rect, rect);
     if (!DoesClipChildrenInBothAxes() && !IsXULCollapsed()) {
       // See if our child frames caused us to overflow after being laid
       // out. If so, store the overflow area.  This normally can't happen
diff -Nru firefox-84.0.2+build1/layout/xul/nsBoxLayout.h firefox-85.0+build1/layout/xul/nsBoxLayout.h
--- firefox-84.0.2+build1/layout/xul/nsBoxLayout.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsBoxLayout.h	2021-01-18 19:58:17.000000000 +0000
@@ -23,8 +23,6 @@
     }                                                \
   }
 
-class nsIGridPart;
-
 class nsBoxLayout : public nsISupports {
  protected:
   virtual ~nsBoxLayout() = default;
@@ -60,8 +58,6 @@
   virtual void AddXULMargin(nsIFrame* aChild, nsSize& aSize);
   virtual void AddXULMargin(nsSize& aSize, const nsMargin& aMargin);
 
-  virtual nsIGridPart* AsGridPart() { return nullptr; }
-
   static void AddLargestSize(nsSize& aSize, const nsSize& aToAdd);
   static void AddSmallestSize(nsSize& aSize, const nsSize& aToAdd);
 };
diff -Nru firefox-84.0.2+build1/layout/xul/nsMenuBarListener.cpp firefox-85.0+build1/layout/xul/nsMenuBarListener.cpp
--- firefox-84.0.2+build1/layout/xul/nsMenuBarListener.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsMenuBarListener.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -164,62 +164,67 @@
 
 ////////////////////////////////////////////////////////////////////////
 nsresult nsMenuBarListener::KeyUp(Event* aKeyEvent) {
-  RefPtr<KeyboardEvent> keyEvent = aKeyEvent->AsKeyboardEvent();
-  if (!keyEvent) {
+  WidgetKeyboardEvent* nativeKeyEvent =
+      aKeyEvent->WidgetEventPtr()->AsKeyboardEvent();
+  if (!nativeKeyEvent) {
     return NS_OK;
   }
 
   InitAccessKey();
 
   // handlers shouldn't be triggered by non-trusted events.
-  if (!keyEvent->IsTrusted()) {
+  if (!nativeKeyEvent->IsTrusted()) {
     return NS_OK;
   }
 
-  if (mAccessKey && StaticPrefs::ui_key_menuAccessKeyFocuses()) {
-    bool defaultPrevented = keyEvent->DefaultPrevented();
+  if (!mAccessKey || !StaticPrefs::ui_key_menuAccessKeyFocuses()) {
+    return NS_OK;
+  }
 
-    // On a press of the ALT key by itself, we toggle the menu's
-    // active/inactive state.
-    // Get the ascii key code.
-    uint32_t theChar = keyEvent->KeyCode();
-
-    if (!defaultPrevented && mAccessKeyDown && !mAccessKeyDownCanceled &&
-        (int32_t)theChar == mAccessKey) {
-      // The access key was down and is now up, and no other
-      // keys were pressed in between.
-      bool toggleMenuActiveState = true;
-      if (!mMenuBarFrame->IsActive()) {
-        // First, close all existing popups because other popups shouldn't
-        // handle key events when menubar is active and IME should be
-        // disabled.
-        nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
-        if (pm) {
-          pm->Rollup(0, false, nullptr, nullptr);
-        }
-        // If menubar active state is changed or the menubar is destroyed
-        // during closing the popups, we should do nothing anymore.
-        toggleMenuActiveState = !Destroyed() && !mMenuBarFrame->IsActive();
+  // On a press of the ALT key by itself, we toggle the menu's
+  // active/inactive state.
+  if (!nativeKeyEvent->DefaultPrevented() && mAccessKeyDown &&
+      !mAccessKeyDownCanceled &&
+      static_cast<int32_t>(nativeKeyEvent->mKeyCode) == mAccessKey) {
+    // The access key was down and is now up, and no other
+    // keys were pressed in between.
+    bool toggleMenuActiveState = true;
+    if (!mMenuBarFrame->IsActive()) {
+      // If the focused content is in a remote process, we should allow the
+      // focused web app to prevent to activate the menubar.
+      if (nativeKeyEvent->WillBeSentToRemoteProcess()) {
+        nativeKeyEvent->StopImmediatePropagation();
+        nativeKeyEvent->MarkAsWaitingReplyFromRemoteProcess();
+        return NS_OK;
       }
-      if (toggleMenuActiveState) {
-        if (!mMenuBarFrame->IsActive()) {
-          mMenuBarFrame->SetActiveByKeyboard();
-        }
-        ToggleMenuActiveState();
+      // First, close all existing popups because other popups shouldn't
+      // handle key events when menubar is active and IME should be
+      // disabled.
+      nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
+      if (pm) {
+        pm->Rollup(0, false, nullptr, nullptr);
       }
+      // If menubar active state is changed or the menubar is destroyed
+      // during closing the popups, we should do nothing anymore.
+      toggleMenuActiveState = !Destroyed() && !mMenuBarFrame->IsActive();
     }
-    mAccessKeyDown = false;
-    mAccessKeyDownCanceled = false;
-
-    bool active = !Destroyed() && mMenuBarFrame->IsActive();
-    if (active) {
-      keyEvent->StopPropagation();
-      keyEvent->PreventDefault();
-      return NS_OK;  // I am consuming event
+    if (toggleMenuActiveState) {
+      if (!mMenuBarFrame->IsActive()) {
+        mMenuBarFrame->SetActiveByKeyboard();
+      }
+      ToggleMenuActiveState();
     }
   }
 
-  return NS_OK;  // means I am NOT consuming event
+  mAccessKeyDown = false;
+  mAccessKeyDownCanceled = false;
+
+  if (!Destroyed() && mMenuBarFrame->IsActive()) {
+    nativeKeyEvent->StopPropagation();
+    nativeKeyEvent->PreventDefault();
+  }
+
+  return NS_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////
diff -Nru firefox-84.0.2+build1/layout/xul/nsMenuFrame.cpp firefox-85.0+build1/layout/xul/nsMenuFrame.cpp
--- firefox-84.0.2+build1/layout/xul/nsMenuFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsMenuFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -212,7 +212,7 @@
   }
 }
 
-nsMenuPopupFrame* nsMenuFrame::GetPopup() {
+nsMenuPopupFrame* nsMenuFrame::GetPopup() const {
   nsFrameList* popupList = GetPopupList();
   return popupList ? static_cast<nsMenuPopupFrame*>(popupList->FirstChild())
                    : nullptr;
@@ -1117,7 +1117,7 @@
   return NS_OK;
 }
 
-nsIScrollableFrame* nsMenuFrame::GetScrollTargetFrame() {
+nsIScrollableFrame* nsMenuFrame::GetScrollTargetFrame() const {
   nsMenuPopupFrame* popupFrame = GetPopup();
   if (!popupFrame) return nullptr;
   nsIFrame* childFrame = popupFrame->PrincipalChildList().FirstChild();
diff -Nru firefox-84.0.2+build1/layout/xul/nsMenuFrame.h firefox-85.0+build1/layout/xul/nsMenuFrame.h
--- firefox-84.0.2+build1/layout/xul/nsMenuFrame.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsMenuFrame.h	2021-01-18 19:58:18.000000000 +0000
@@ -120,7 +120,7 @@
 
   NS_IMETHOD SelectMenu(bool aActivateFlag);
 
-  virtual nsIScrollableFrame* GetScrollTargetFrame() override;
+  virtual nsIScrollableFrame* GetScrollTargetFrame() const override;
 
   /**
    * NOTE: OpenMenu will open the menu asynchronously.
@@ -145,7 +145,7 @@
 
   const nsAString& GetRadioGroupName() { return mGroupName; }
   nsMenuType GetMenuType() { return mType; }
-  nsMenuPopupFrame* GetPopup();
+  nsMenuPopupFrame* GetPopup() const;
 
   /**
    * @return true if this frame has a popup child frame.
diff -Nru firefox-84.0.2+build1/layout/xul/nsMenuPopupFrame.cpp firefox-85.0+build1/layout/xul/nsMenuPopupFrame.cpp
--- firefox-84.0.2+build1/layout/xul/nsMenuPopupFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsMenuPopupFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -36,6 +36,7 @@
 #include "nsIBaseWindow.h"
 #include "nsISound.h"
 #include "nsIScreenManager.h"
+#include "nsServiceManagerUtils.h"
 #include "nsStyleConsts.h"
 #include "nsStyleStructInlines.h"
 #include "nsTransitionManager.h"
diff -Nru firefox-84.0.2+build1/layout/xul/nsResizerFrame.cpp firefox-85.0+build1/layout/xul/nsResizerFrame.cpp
--- firefox-84.0.2+build1/layout/xul/nsResizerFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsResizerFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/MouseEvents.h"
 #include "nsContentUtils.h"
 #include "nsMenuPopupFrame.h"
+#include "nsServiceManagerUtils.h"
 #include "nsIScreenManager.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/MouseEventBinding.h"
diff -Nru firefox-84.0.2+build1/layout/xul/nsTextBoxFrame.cpp firefox-85.0+build1/layout/xul/nsTextBoxFrame.cpp
--- firefox-84.0.2+build1/layout/xul/nsTextBoxFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsTextBoxFrame.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsFontMetrics.h"
 #include "nsReadableUtils.h"
 #include "nsCOMPtr.h"
+#include "nsCRT.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "gfxContext.h"
@@ -945,7 +946,7 @@
   // extend beyond that.
   nsRect visualBounds;
   visualBounds.UnionRect(scrollBounds, textRect);
-  nsOverflowAreas overflow(visualBounds, scrollBounds);
+  OverflowAreas overflow(visualBounds, scrollBounds);
 
   if (textStyle->HasTextShadow()) {
     // text-shadow extends our visual but not scrollable bounds
diff -Nru firefox-84.0.2+build1/layout/xul/nsXULPopupManager.h firefox-85.0+build1/layout/xul/nsXULPopupManager.h
--- firefox-84.0.2+build1/layout/xul/nsXULPopupManager.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsXULPopupManager.h	2021-01-18 19:58:17.000000000 +0000
@@ -28,6 +28,9 @@
 #include "mozilla/Attributes.h"
 #include "Units.h"
 
+// XXX Avoid including this here by moving function bodies to the cpp file.
+#include "mozilla/dom/Element.h"
+
 // X.h defines KeyPress
 #ifdef KeyPress
 #  undef KeyPress
diff -Nru firefox-84.0.2+build1/layout/xul/nsXULTooltipListener.cpp firefox-85.0+build1/layout/xul/nsXULTooltipListener.cpp
--- firefox-84.0.2+build1/layout/xul/nsXULTooltipListener.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/nsXULTooltipListener.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -21,6 +21,7 @@
 #  include "nsXULPopupManager.h"
 #endif
 #include "nsIPopupContainer.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTreeColumns.h"
 #include "nsContentUtils.h"
 #include "mozilla/ErrorResult.h"
diff -Nru firefox-84.0.2+build1/layout/xul/test/chrome.ini firefox-85.0+build1/layout/xul/test/chrome.ini
--- firefox-84.0.2+build1/layout/xul/test/chrome.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/layout/xul/test/chrome.ini	2021-01-18 19:58:17.000000000 +0000
@@ -18,8 +18,6 @@
 [test_bug159346.xhtml]
 [test_bug372685.xhtml]
 [test_bug381167.xhtml]
-[test_bug393970.xhtml]
-skip-if = (verify && debug && (os == 'linux'))
 [test_bug398982-1.xhtml]
 [test_bug398982-2.xhtml]
 [test_bug467442.xhtml]
diff -Nru firefox-84.0.2+build1/layout/xul/test/test_bug393970.xhtml firefox-85.0+build1/layout/xul/test/test_bug393970.xhtml
--- firefox-84.0.2+build1/layout/xul/test/test_bug393970.xhtml	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/test/test_bug393970.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
-<?xml-stylesheet href="data:text/css,description {min-width: 1px; padding: 2px;}" type="text/css"?>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=393970
--->
-<window title="Mozilla Bug 393970"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
-
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=393970"
-     target="_blank">Mozilla Bug 393970</a>
-  </body>
-
-  <hbox flex="1" pack="start" style="visibility: hidden;">
-    <grid min-width="1000" width="1000">
-      <columns>
-        <column flex="1"/>
-        <column flex="2"/>
-        <column flex="3"/>
-      </columns>
-      <rows id="rows1">
-        <row>
-          <description id="cell11">test1</description>
-          <description id="cell12">test2</description>
-          <description id="cell13">test3</description>
-        </row>
-        <rows id="rows2" flex="1">
-          <row>
-            <description id="cell21">test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1</description>
-            <description id="cell22">test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2</description>
-            <description id="cell23">test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3</description>
-          </row>
-          <rows id="rows3">
-            <row>
-              <description id="cell31">test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1 test1</description>
-              <description id="cell32">test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2 test2</description>
-              <description id="cell33">test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3 test3</description>
-            </row>
-          </rows>
-        </rows>
-      </rows>
-    </grid>
-  </hbox>
-
-  <!-- test code goes here -->
-  <script type="application/javascript"><![CDATA[
-    /** Test for Bug 393970 **/
-
-    if (navigator.platform.startsWith("Linux")) {
-      SimpleTest.expectAssertions(0, 24);
-    }
-
-    var tests = [
-      'overflow-x: hidden; overflow-y: hidden;',
-      'overflow-x: scroll; overflow-y: hidden;',
-      'overflow-x: hidden; overflow-y: scroll;',
-      'overflow-x: scroll; overflow-y: scroll;',
-    ];
-    var currentTest = -1;
-
-    function runNextTest() {
-      currentTest++;
-      if (currentTest >= tests.length) {
-        SimpleTest.finish();
-        return;
-      }
-
-      $("rows2").setAttribute("style", tests[currentTest]);
-      setTimeout(checkPositions, 0, tests[currentTest]);
-    }
-
-    function checkPositions(variant) {
-      for (var col = 1; col <= 3; col++) {
-        is(Math.round($('cell1' + col).getBoundingClientRect().x),
-           Math.round($('cell2' + col).getBoundingClientRect().x),
-           "Cells (1," + col + ") and (2," + col + ") line up horizontally (with " + variant + ")");
-        is(Math.round($('cell2' + col).getBoundingClientRect().x),
-           Math.round($('cell3' + col).getBoundingClientRect().x),
-           "Cells (2," + col + ") and (3," + col + ") line up horizontally (with " + variant + ")");
-      }
-      for (var row = 1; row <= 3; row++) {
-        is(Math.round($('cell' + row + '1').getBoundingClientRect().y),
-           Math.round($('cell' + row + '2').getBoundingClientRect().y),
-           "Cells (" + row + ",1) and (" + row + ",2) line up vertically (with " + variant + ")");
-        is(Math.round($('cell' + row + '2').getBoundingClientRect().y),
-           Math.round($('cell' + row + '3').getBoundingClientRect().y),
-           "Cells (" + row + ",2) and (" + row + ",3) line up vertically (with " + variant + ")");
-      }
-      runNextTest();
-    }
- 
-    addLoadEvent(runNextTest);
-    SimpleTest.waitForExplicitFinish()
-   ]]></script>
-</window>
diff -Nru firefox-84.0.2+build1/layout/xul/tree/nsTreeBodyFrame.cpp firefox-85.0+build1/layout/xul/tree/nsTreeBodyFrame.cpp
--- firefox-84.0.2+build1/layout/xul/tree/nsTreeBodyFrame.cpp	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/tree/nsTreeBodyFrame.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -20,6 +20,7 @@
 #include "gfxUtils.h"
 #include "nsAlgorithm.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsFontMetrics.h"
 #include "nsPresContext.h"
 #include "nsNameSpaceManager.h"
@@ -1598,10 +1599,17 @@
   }
 #endif  // #ifdef ACCESSIBILITY
 
+  AutoWeakFrame weakFrame(this);
+
   // Adjust our selection.
+  nsCOMPtr<nsITreeView> view = mView;
   nsCOMPtr<nsITreeSelection> sel;
-  mView->GetSelection(getter_AddRefs(sel));
-  if (sel) sel->AdjustSelection(aIndex, aCount);
+  view->GetSelection(getter_AddRefs(sel));
+  if (sel) {
+    sel->AdjustSelection(aIndex, aCount);
+  }
+
+  NS_ENSURE_STATE(weakFrame.IsAlive());
 
   if (mUpdateBatchNest) return NS_OK;
 
@@ -1972,7 +1980,7 @@
   bool needHeight = false;
 
   // We have to load image even though we already have a size.
-  // Don't change this, otherwise things start to go crazy.
+  // Don't change this, otherwise things start to go awry.
   bool useImageRegion = true;
   nsCOMPtr<imgIContainer> image;
   GetImage(aRowIndex, aCol, aUseContext, aComputedStyle, useImageRegion,
diff -Nru firefox-84.0.2+build1/layout/xul/tree/nsTreeContentView.h firefox-85.0+build1/layout/xul/tree/nsTreeContentView.h
--- firefox-84.0.2+build1/layout/xul/tree/nsTreeContentView.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/layout/xul/tree/nsTreeContentView.h	2021-01-18 19:58:17.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsStubDocumentObserver.h"
 #include "nsITreeView.h"
 #include "nsITreeSelection.h"
+#include "nsWrapperCache.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/UniquePtr.h"
 
@@ -20,6 +21,8 @@
 class Row;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class DataTransfer;
 class Document;
diff -Nru firefox-84.0.2+build1/media/ffvpx/changes.patch firefox-85.0+build1/media/ffvpx/changes.patch
--- firefox-84.0.2+build1/media/ffvpx/changes.patch	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/changes.patch	2021-01-18 19:58:18.000000000 +0000
@@ -50,3 +50,27 @@
          rgba_color[0] = rgba >> 24;
          rgba_color[1] = rgba >> 16;
          rgba_color[2] = rgba >> 8;
+diff --git a/media/ffvpx/libavutil/hwcontext_vaapi.c b/media/ffvpx/libavutil/hwcontext_vaapi.c
+--- a/media/ffvpx/libavutil/hwcontext_vaapi.c
++++ b/media/ffvpx/libavutil/hwcontext_vaapi.c
+@@ -39,17 +39,19 @@
+ #   include <unistd.h>
+ #endif
+ 
+ 
+ #include "avassert.h"
+ #include "buffer.h"
+ #include "common.h"
+ #include "hwcontext.h"
++#if CONFIG_LIBDRM
+ #include "hwcontext_drm.h"
++#endif
+ #include "hwcontext_internal.h"
+ #include "hwcontext_vaapi.h"
+ #include "mem.h"
+ #include "pixdesc.h"
+ #include "pixfmt.h"
+ 
+ 
+ typedef struct VAAPIDevicePriv {
+
diff -Nru firefox-84.0.2+build1/media/ffvpx/config_common.h firefox-85.0+build1/media/ffvpx/config_common.h
--- firefox-84.0.2+build1/media/ffvpx/config_common.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/config_common.h	2021-01-18 19:58:17.000000000 +0000
@@ -18,4 +18,13 @@
 #define CONFIG_RDFT 1
 #endif
 
+#ifdef MOZ_WAYLAND
+#undef CONFIG_VAAPI
+#undef CONFIG_VP8_VAAPI_HWACCEL
+#undef CONFIG_VP9_VAAPI_HWACCEL
+#define CONFIG_VAAPI 1
+#define CONFIG_VP8_VAAPI_HWACCEL 1
+#define CONFIG_VP9_VAAPI_HWACCEL 1
+#endif
+
 #endif
diff -Nru firefox-84.0.2+build1/media/ffvpx/FILES firefox-85.0+build1/media/ffvpx/FILES
--- firefox-84.0.2+build1/media/ffvpx/FILES	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/FILES	2021-01-18 19:58:17.000000000 +0000
@@ -131,6 +131,11 @@
 ./libavcodec/thread.h
 ./libavcodec/unary.h
 ./libavcodec/utils.c
+./libavcodec/vaapi.h
+./libavcodec/vaapi_decode.h
+./libavcodec/vaapi_decode.c
+./libavcodec/vaapi_vp8.c
+./libavcodec/vaapi_vp9.c
 ./libavcodec/version.h
 ./libavcodec/videodsp.c
 ./libavcodec/videodsp.h
@@ -264,6 +269,8 @@
 ./libavutil/hwcontext.c
 ./libavutil/hwcontext.h
 ./libavutil/hwcontext_internal.h
+./libavutil/hwcontext_vaapi.h
+./libavutil/hwcontext_vaapi.c
 ./libavutil/imgutils.c
 ./libavutil/imgutils.h
 ./libavutil/imgutils_internal.h
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/avcodec.symbols firefox-85.0+build1/media/ffvpx/libavcodec/avcodec.symbols
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/avcodec.symbols	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/avcodec.symbols	2021-01-18 19:58:17.000000000 +0000
@@ -28,6 +28,11 @@
 av_get_profile_name
 av_grow_packet
 av_hwaccel_next
+av_hwdevice_ctx_init
+av_hwdevice_ctx_alloc
+av_hwdevice_ctx_create_derived
+av_hwframe_transfer_get_formats
+av_hwframe_ctx_alloc
 av_init_packet
 av_lockmgr_register
 av_new_packet
@@ -93,6 +98,7 @@
 avcodec_get_class
 avcodec_get_context_defaults3
 avcodec_get_frame_class
+avcodec_get_hw_config
 avcodec_get_name
 avcodec_get_subtitle_rect_class
 avcodec_get_type
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/moz.build firefox-85.0+build1/media/ffvpx/libavcodec/moz.build
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/moz.build	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -96,6 +96,13 @@
         'vp9prob.c',
         'vp9recon.c'
     ]
+    if CONFIG['MOZ_WAYLAND']:
+        SOURCES += [
+            'vaapi_decode.c',
+            'vaapi_vp8.c',
+            'vaapi_vp9.c',
+        ]
+        USE_LIBS += ['mozva']
 
 if CONFIG['MOZ_LIBAV_FFT']:
     SOURCES += [
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_decode.c firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_decode.c
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_decode.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_decode.c	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,732 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/pixdesc.h"
+
+#include "avcodec.h"
+#include "decode.h"
+#include "internal.h"
+#include "vaapi_decode.h"
+
+
+int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+                                      VAAPIDecodePicture *pic,
+                                      int type,
+                                      const void *data,
+                                      size_t size)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+    VABufferID buffer;
+
+    av_assert0(pic->nb_param_buffers + 1 <= MAX_PARAM_BUFFERS);
+
+    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+                         type, size, 1, (void*)data, &buffer);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create parameter "
+               "buffer (type %d): %d (%s).\n",
+               type, vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+
+    pic->param_buffers[pic->nb_param_buffers++] = buffer;
+
+    av_log(avctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes) "
+           "is %#x.\n", type, size, buffer);
+    return 0;
+}
+
+
+int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+                                      VAAPIDecodePicture *pic,
+                                      const void *params_data,
+                                      size_t params_size,
+                                      const void *slice_data,
+                                      size_t slice_size)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+    int index;
+
+    av_assert0(pic->nb_slices <= pic->slices_allocated);
+    if (pic->nb_slices == pic->slices_allocated) {
+        if (pic->slices_allocated > 0)
+            pic->slices_allocated *= 2;
+        else
+            pic->slices_allocated = 64;
+
+        pic->slice_buffers =
+            av_realloc_array(pic->slice_buffers,
+                             pic->slices_allocated,
+                             2 * sizeof(*pic->slice_buffers));
+        if (!pic->slice_buffers)
+            return AVERROR(ENOMEM);
+    }
+    av_assert0(pic->nb_slices + 1 <= pic->slices_allocated);
+
+    index = 2 * pic->nb_slices;
+
+    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+                         VASliceParameterBufferType,
+                         params_size, 1, (void*)params_data,
+                         &pic->slice_buffers[index]);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create slice "
+               "parameter buffer: %d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "Slice %d param buffer (%zu bytes) "
+           "is %#x.\n", pic->nb_slices, params_size,
+           pic->slice_buffers[index]);
+
+    vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+                         VASliceDataBufferType,
+                         slice_size, 1, (void*)slice_data,
+                         &pic->slice_buffers[index + 1]);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create slice "
+               "data buffer (size %zu): %d (%s).\n",
+               slice_size, vas, vaErrorStr(vas));
+        vaDestroyBuffer(ctx->hwctx->display,
+                        pic->slice_buffers[index]);
+        return AVERROR(EIO);
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "Slice %d data buffer (%zu bytes) "
+           "is %#x.\n", pic->nb_slices, slice_size,
+           pic->slice_buffers[index + 1]);
+
+    ++pic->nb_slices;
+    return 0;
+}
+
+static void ff_vaapi_decode_destroy_buffers(AVCodecContext *avctx,
+                                            VAAPIDecodePicture *pic)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+    int i;
+
+    for (i = 0; i < pic->nb_param_buffers; i++) {
+        vas = vaDestroyBuffer(ctx->hwctx->display,
+                              pic->param_buffers[i]);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(avctx, AV_LOG_ERROR, "Failed to destroy "
+                   "parameter buffer %#x: %d (%s).\n",
+                   pic->param_buffers[i], vas, vaErrorStr(vas));
+        }
+    }
+
+    for (i = 0; i < 2 * pic->nb_slices; i++) {
+        vas = vaDestroyBuffer(ctx->hwctx->display,
+                              pic->slice_buffers[i]);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(avctx, AV_LOG_ERROR, "Failed to destroy slice "
+                   "slice buffer %#x: %d (%s).\n",
+                   pic->slice_buffers[i], vas, vaErrorStr(vas));
+        }
+    }
+}
+
+int ff_vaapi_decode_issue(AVCodecContext *avctx,
+                          VAAPIDecodePicture *pic)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+    int err;
+
+    av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n",
+           pic->output_surface);
+
+    vas = vaBeginPicture(ctx->hwctx->display, ctx->va_context,
+                         pic->output_surface);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to begin picture decode "
+               "issue: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_with_picture;
+    }
+
+    vas = vaRenderPicture(ctx->hwctx->display, ctx->va_context,
+                          pic->param_buffers, pic->nb_param_buffers);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to upload decode "
+               "parameters: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_with_picture;
+    }
+
+    vas = vaRenderPicture(ctx->hwctx->display, ctx->va_context,
+                          pic->slice_buffers, 2 * pic->nb_slices);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to upload slices: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_with_picture;
+    }
+
+    vas = vaEndPicture(ctx->hwctx->display, ctx->va_context);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to end picture decode "
+               "issue: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks &
+            AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS)
+            goto fail;
+        else
+            goto fail_at_end;
+    }
+
+    if (CONFIG_VAAPI_1 || ctx->hwctx->driver_quirks &
+        AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS)
+        ff_vaapi_decode_destroy_buffers(avctx, pic);
+
+    err = 0;
+    goto exit;
+
+fail_with_picture:
+    vas = vaEndPicture(ctx->hwctx->display, ctx->va_context);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to end picture decode "
+               "after error: %d (%s).\n", vas, vaErrorStr(vas));
+    }
+fail:
+    ff_vaapi_decode_destroy_buffers(avctx, pic);
+fail_at_end:
+exit:
+    pic->nb_param_buffers = 0;
+    pic->nb_slices        = 0;
+    pic->slices_allocated = 0;
+    av_freep(&pic->slice_buffers);
+
+    return err;
+}
+
+int ff_vaapi_decode_cancel(AVCodecContext *avctx,
+                           VAAPIDecodePicture *pic)
+{
+    ff_vaapi_decode_destroy_buffers(avctx, pic);
+
+    pic->nb_param_buffers = 0;
+    pic->nb_slices        = 0;
+    pic->slices_allocated = 0;
+    av_freep(&pic->slice_buffers);
+
+    return 0;
+}
+
+static const struct {
+    uint32_t fourcc;
+    enum AVPixelFormat pix_fmt;
+} vaapi_format_map[] = {
+#define MAP(va, av) { VA_FOURCC_ ## va, AV_PIX_FMT_ ## av }
+    // 4:0:0
+    MAP(Y800, GRAY8),
+    // 4:2:0
+    MAP(NV12, NV12),
+    MAP(YV12, YUV420P),
+    MAP(IYUV, YUV420P),
+#ifdef VA_FOURCC_I420
+    MAP(I420, YUV420P),
+#endif
+    MAP(IMC3, YUV420P),
+    // 4:1:1
+    MAP(411P, YUV411P),
+    // 4:2:2
+    MAP(422H, YUV422P),
+#ifdef VA_FOURCC_YV16
+    MAP(YV16, YUV422P),
+#endif
+    // 4:4:0
+    MAP(422V, YUV440P),
+    // 4:4:4
+    MAP(444P, YUV444P),
+    // 4:2:0 10-bit
+#ifdef VA_FOURCC_P010
+    MAP(P010, P010),
+#endif
+#ifdef VA_FOURCC_I010
+    MAP(I010, YUV420P10),
+#endif
+#undef MAP
+};
+
+static int vaapi_decode_find_best_format(AVCodecContext *avctx,
+                                         AVHWDeviceContext *device,
+                                         VAConfigID config_id,
+                                         AVHWFramesContext *frames)
+{
+    AVVAAPIDeviceContext *hwctx = device->hwctx;
+    VAStatus vas;
+    VASurfaceAttrib *attr;
+    enum AVPixelFormat source_format, best_format, format;
+    uint32_t best_fourcc, fourcc;
+    int i, j, nb_attr;
+
+    source_format = avctx->sw_pix_fmt;
+    av_assert0(source_format != AV_PIX_FMT_NONE);
+
+    vas = vaQuerySurfaceAttributes(hwctx->display, config_id,
+                                   NULL, &nb_attr);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR(ENOSYS);
+    }
+
+    attr = av_malloc_array(nb_attr, sizeof(*attr));
+    if (!attr)
+        return AVERROR(ENOMEM);
+
+    vas = vaQuerySurfaceAttributes(hwctx->display, config_id,
+                                   attr, &nb_attr);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to query surface attributes: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        av_freep(&attr);
+        return AVERROR(ENOSYS);
+    }
+
+    best_format = AV_PIX_FMT_NONE;
+
+    for (i = 0; i < nb_attr; i++) {
+        if (attr[i].type != VASurfaceAttribPixelFormat)
+            continue;
+
+        fourcc = attr[i].value.value.i;
+        for (j = 0; j < FF_ARRAY_ELEMS(vaapi_format_map); j++) {
+            if (fourcc == vaapi_format_map[j].fourcc)
+                break;
+        }
+        if (j >= FF_ARRAY_ELEMS(vaapi_format_map)) {
+            av_log(avctx, AV_LOG_DEBUG, "Ignoring unknown format %#x.\n",
+                   fourcc);
+            continue;
+        }
+        format = vaapi_format_map[j].pix_fmt;
+        av_log(avctx, AV_LOG_DEBUG, "Considering format %#x -> %s.\n",
+               fourcc, av_get_pix_fmt_name(format));
+
+        best_format = av_find_best_pix_fmt_of_2(format, best_format,
+                                                source_format, 0, NULL);
+        if (format == best_format)
+            best_fourcc = fourcc;
+    }
+
+    av_freep(&attr);
+
+    if (best_format == AV_PIX_FMT_NONE) {
+        av_log(avctx, AV_LOG_ERROR, "No usable formats for decoding!\n");
+        return AVERROR(EINVAL);
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "Picked %s (%#x) as best match for %s.\n",
+           av_get_pix_fmt_name(best_format), best_fourcc,
+           av_get_pix_fmt_name(source_format));
+
+    frames->sw_format = best_format;
+    if (avctx->internal->hwaccel_priv_data) {
+        VAAPIDecodeContext    *ctx = avctx->internal->hwaccel_priv_data;
+        AVVAAPIFramesContext *avfc = frames->hwctx;
+
+        ctx->pixel_format_attribute = (VASurfaceAttrib) {
+            .type          = VASurfaceAttribPixelFormat,
+            .value.value.i = best_fourcc,
+        };
+
+        avfc->attributes    = &ctx->pixel_format_attribute;
+        avfc->nb_attributes = 1;
+    }
+
+    return 0;
+}
+
+static const struct {
+    enum AVCodecID codec_id;
+    int codec_profile;
+    VAProfile va_profile;
+} vaapi_profile_map[] = {
+#define MAP(c, p, v) { AV_CODEC_ID_ ## c, FF_PROFILE_ ## p, VAProfile ## v }
+    MAP(MPEG2VIDEO,  MPEG2_SIMPLE,    MPEG2Simple ),
+    MAP(MPEG2VIDEO,  MPEG2_MAIN,      MPEG2Main   ),
+    MAP(H263,        UNKNOWN,         H263Baseline),
+    MAP(MPEG4,       MPEG4_SIMPLE,    MPEG4Simple ),
+    MAP(MPEG4,       MPEG4_ADVANCED_SIMPLE,
+                               MPEG4AdvancedSimple),
+    MAP(MPEG4,       MPEG4_MAIN,      MPEG4Main   ),
+    MAP(H264,        H264_CONSTRAINED_BASELINE,
+                           H264ConstrainedBaseline),
+    MAP(H264,        H264_MAIN,       H264Main    ),
+    MAP(H264,        H264_HIGH,       H264High    ),
+#if VA_CHECK_VERSION(0, 37, 0)
+    MAP(HEVC,        HEVC_MAIN,       HEVCMain    ),
+    MAP(HEVC,        HEVC_MAIN_10,    HEVCMain10  ),
+#endif
+    MAP(MJPEG,       MJPEG_HUFFMAN_BASELINE_DCT,
+                                      JPEGBaseline),
+    MAP(WMV3,        VC1_SIMPLE,      VC1Simple   ),
+    MAP(WMV3,        VC1_MAIN,        VC1Main     ),
+    MAP(WMV3,        VC1_COMPLEX,     VC1Advanced ),
+    MAP(WMV3,        VC1_ADVANCED,    VC1Advanced ),
+    MAP(VC1,         VC1_SIMPLE,      VC1Simple   ),
+    MAP(VC1,         VC1_MAIN,        VC1Main     ),
+    MAP(VC1,         VC1_COMPLEX,     VC1Advanced ),
+    MAP(VC1,         VC1_ADVANCED,    VC1Advanced ),
+    MAP(VP8,         UNKNOWN,       VP8Version0_3 ),
+#if VA_CHECK_VERSION(0, 38, 0)
+    MAP(VP9,         VP9_0,           VP9Profile0 ),
+#endif
+#if VA_CHECK_VERSION(0, 39, 0)
+    MAP(VP9,         VP9_2,           VP9Profile2 ),
+#endif
+#undef MAP
+};
+
+/*
+ * Set *va_config and the frames_ref fields from the current codec parameters
+ * in avctx.
+ */
+static int vaapi_decode_make_config(AVCodecContext *avctx,
+                                    AVBufferRef *device_ref,
+                                    VAConfigID *va_config,
+                                    AVBufferRef *frames_ref)
+{
+    AVVAAPIHWConfig       *hwconfig    = NULL;
+    AVHWFramesConstraints *constraints = NULL;
+    VAStatus vas;
+    int err, i, j;
+    const AVCodecDescriptor *codec_desc;
+    VAProfile *profile_list = NULL, matched_va_profile;
+    int profile_count, exact_match, matched_ff_profile;
+
+    AVHWDeviceContext    *device = (AVHWDeviceContext*)device_ref->data;
+    AVVAAPIDeviceContext *hwctx = device->hwctx;
+
+    codec_desc = avcodec_descriptor_get(avctx->codec_id);
+    if (!codec_desc) {
+        err = AVERROR(EINVAL);
+        goto fail;
+    }
+
+    profile_count = vaMaxNumProfiles(hwctx->display);
+    profile_list  = av_malloc_array(profile_count,
+                                    sizeof(VAProfile));
+    if (!profile_list) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    vas = vaQueryConfigProfiles(hwctx->display,
+                                profile_list, &profile_count);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to query profiles: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(ENOSYS);
+        goto fail;
+    }
+
+    matched_va_profile = VAProfileNone;
+    exact_match = 0;
+
+    for (i = 0; i < FF_ARRAY_ELEMS(vaapi_profile_map); i++) {
+        int profile_match = 0;
+        if (avctx->codec_id != vaapi_profile_map[i].codec_id)
+            continue;
+        if (avctx->profile == vaapi_profile_map[i].codec_profile ||
+            vaapi_profile_map[i].codec_profile == FF_PROFILE_UNKNOWN)
+            profile_match = 1;
+        for (j = 0; j < profile_count; j++) {
+            if (vaapi_profile_map[i].va_profile == profile_list[j]) {
+                exact_match = profile_match;
+                break;
+            }
+        }
+        if (j < profile_count) {
+            matched_va_profile = vaapi_profile_map[i].va_profile;
+            matched_ff_profile = vaapi_profile_map[i].codec_profile;
+            if (exact_match)
+                break;
+        }
+    }
+    av_freep(&profile_list);
+
+    if (matched_va_profile == VAProfileNone) {
+        av_log(avctx, AV_LOG_ERROR, "No support for codec %s "
+               "profile %d.\n", codec_desc->name, avctx->profile);
+        err = AVERROR(ENOSYS);
+        goto fail;
+    }
+    if (!exact_match) {
+        if (avctx->hwaccel_flags &
+            AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) {
+            av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not "
+                   "supported for hardware decode.\n",
+                   codec_desc->name, avctx->profile);
+            av_log(avctx, AV_LOG_WARNING, "Using possibly-"
+                   "incompatible profile %d instead.\n",
+                   matched_ff_profile);
+        } else {
+            av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not "
+                   "supported for hardware decode.\n",
+                   codec_desc->name, avctx->profile);
+            err = AVERROR(EINVAL);
+            goto fail;
+        }
+    }
+
+    vas = vaCreateConfig(hwctx->display, matched_va_profile,
+                         VAEntrypointVLD, NULL, 0,
+                         va_config);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create decode "
+               "configuration: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    hwconfig = av_hwdevice_hwconfig_alloc(device_ref);
+    if (!hwconfig) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+    hwconfig->config_id = *va_config;
+
+    constraints =
+        av_hwdevice_get_hwframe_constraints(device_ref, hwconfig);
+    if (!constraints) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    if (avctx->coded_width  < constraints->min_width  ||
+        avctx->coded_height < constraints->min_height ||
+        avctx->coded_width  > constraints->max_width  ||
+        avctx->coded_height > constraints->max_height) {
+        av_log(avctx, AV_LOG_ERROR, "Hardware does not support image "
+               "size %dx%d (constraints: width %d-%d height %d-%d).\n",
+               avctx->coded_width, avctx->coded_height,
+               constraints->min_width,  constraints->max_width,
+               constraints->min_height, constraints->max_height);
+        err = AVERROR(EINVAL);
+        goto fail;
+    }
+    if (!constraints->valid_sw_formats ||
+        constraints->valid_sw_formats[0] == AV_PIX_FMT_NONE) {
+        av_log(avctx, AV_LOG_ERROR, "Hardware does not offer any "
+               "usable surface formats.\n");
+        err = AVERROR(EINVAL);
+        goto fail;
+    }
+
+    if (frames_ref) {
+        AVHWFramesContext *frames = (AVHWFramesContext *)frames_ref->data;
+
+        frames->format = AV_PIX_FMT_VAAPI;
+        frames->width = avctx->coded_width;
+        frames->height = avctx->coded_height;
+
+        err = vaapi_decode_find_best_format(avctx, device,
+                                            *va_config, frames);
+        if (err < 0)
+            goto fail;
+
+        frames->initial_pool_size = 1;
+        // Add per-codec number of surfaces used for storing reference frames.
+        switch (avctx->codec_id) {
+        case AV_CODEC_ID_H264:
+        case AV_CODEC_ID_HEVC:
+            frames->initial_pool_size += 16;
+            break;
+        case AV_CODEC_ID_VP9:
+            frames->initial_pool_size += 8;
+            break;
+        case AV_CODEC_ID_VP8:
+            frames->initial_pool_size += 3;
+            break;
+        default:
+            frames->initial_pool_size += 2;
+        }
+    }
+
+    av_hwframe_constraints_free(&constraints);
+    av_freep(&hwconfig);
+
+    return 0;
+
+fail:
+    av_hwframe_constraints_free(&constraints);
+    av_freep(&hwconfig);
+    if (*va_config != VA_INVALID_ID) {
+        vaDestroyConfig(hwctx->display, *va_config);
+        *va_config = VA_INVALID_ID;
+    }
+    av_freep(&profile_list);
+    return err;
+}
+
+int ff_vaapi_common_frame_params(AVCodecContext *avctx,
+                                 AVBufferRef *hw_frames_ctx)
+{
+    AVHWFramesContext *hw_frames = (AVHWFramesContext *)hw_frames_ctx->data;
+    AVHWDeviceContext *device_ctx = hw_frames->device_ctx;
+    AVVAAPIDeviceContext *hwctx;
+    VAConfigID va_config = VA_INVALID_ID;
+    int err;
+
+    if (device_ctx->type != AV_HWDEVICE_TYPE_VAAPI)
+        return AVERROR(EINVAL);
+    hwctx = device_ctx->hwctx;
+
+    err = vaapi_decode_make_config(avctx, hw_frames->device_ref, &va_config,
+                                   hw_frames_ctx);
+    if (err)
+        return err;
+
+    if (va_config != VA_INVALID_ID)
+        vaDestroyConfig(hwctx->display, va_config);
+
+    return 0;
+}
+
+int ff_vaapi_decode_init(AVCodecContext *avctx)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+    int err;
+
+    ctx->va_config  = VA_INVALID_ID;
+    ctx->va_context = VA_INVALID_ID;
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+    if (avctx->hwaccel_context) {
+        av_log(avctx, AV_LOG_WARNING, "Using deprecated struct "
+               "vaapi_context in decode.\n");
+
+        ctx->have_old_context = 1;
+        ctx->old_context = avctx->hwaccel_context;
+
+        // Really we only want the VAAPI device context, but this
+        // allocates a whole generic device context because we don't
+        // have any other way to determine how big it should be.
+        ctx->device_ref =
+            av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VAAPI);
+        if (!ctx->device_ref) {
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+        ctx->device = (AVHWDeviceContext*)ctx->device_ref->data;
+        ctx->hwctx  = ctx->device->hwctx;
+
+        ctx->hwctx->display = ctx->old_context->display;
+
+        // The old VAAPI decode setup assumed this quirk was always
+        // present, so set it here to avoid the behaviour changing.
+        ctx->hwctx->driver_quirks =
+            AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS;
+
+    }
+#endif
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+    if (ctx->have_old_context) {
+        ctx->va_config  = ctx->old_context->config_id;
+        ctx->va_context = ctx->old_context->context_id;
+
+        av_log(avctx, AV_LOG_DEBUG, "Using user-supplied decoder "
+               "context: %#x/%#x.\n", ctx->va_config, ctx->va_context);
+    } else {
+#endif
+
+    err = ff_decode_get_hw_frames_ctx(avctx, AV_HWDEVICE_TYPE_VAAPI);
+    if (err < 0)
+        goto fail;
+
+    ctx->frames = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
+    ctx->hwfc   = ctx->frames->hwctx;
+    ctx->device = ctx->frames->device_ctx;
+    ctx->hwctx  = ctx->device->hwctx;
+
+    err = vaapi_decode_make_config(avctx, ctx->frames->device_ref,
+                                   &ctx->va_config, avctx->hw_frames_ctx);
+    if (err)
+        goto fail;
+
+    vas = vaCreateContext(ctx->hwctx->display, ctx->va_config,
+                          avctx->coded_width, avctx->coded_height,
+                          VA_PROGRESSIVE,
+                          ctx->hwfc->surface_ids,
+                          ctx->hwfc->nb_surfaces,
+                          &ctx->va_context);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(avctx, AV_LOG_ERROR, "Failed to create decode "
+               "context: %d (%s).\n", vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    av_log(avctx, AV_LOG_DEBUG, "Decode context initialised: "
+           "%#x/%#x.\n", ctx->va_config, ctx->va_context);
+#if FF_API_STRUCT_VAAPI_CONTEXT
+    }
+#endif
+
+    return 0;
+
+fail:
+    ff_vaapi_decode_uninit(avctx);
+    return err;
+}
+
+int ff_vaapi_decode_uninit(AVCodecContext *avctx)
+{
+    VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data;
+    VAStatus vas;
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+    if (ctx->have_old_context) {
+        av_buffer_unref(&ctx->device_ref);
+    } else {
+#endif
+
+    if (ctx->va_context != VA_INVALID_ID) {
+        vas = vaDestroyContext(ctx->hwctx->display, ctx->va_context);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(avctx, AV_LOG_ERROR, "Failed to destroy decode "
+                   "context %#x: %d (%s).\n",
+                   ctx->va_context, vas, vaErrorStr(vas));
+        }
+    }
+    if (ctx->va_config != VA_INVALID_ID) {
+        vas = vaDestroyConfig(ctx->hwctx->display, ctx->va_config);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(avctx, AV_LOG_ERROR, "Failed to destroy decode "
+                   "configuration %#x: %d (%s).\n",
+                   ctx->va_config, vas, vaErrorStr(vas));
+        }
+    }
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+    }
+#endif
+
+    return 0;
+}
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_decode.h firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_decode.h
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_decode.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_decode.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_DECODE_H
+#define AVCODEC_VAAPI_DECODE_H
+
+#include <va/va.h>
+#include <va/va_dec_vp9.h>
+
+#include "libavutil/frame.h"
+#include "libavutil/hwcontext.h"
+#include "libavutil/hwcontext_vaapi.h"
+
+#include "avcodec.h"
+
+#include "version.h"
+#if FF_API_STRUCT_VAAPI_CONTEXT
+#include "vaapi.h"
+#endif
+
+static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic)
+{
+    return (uintptr_t)pic->data[3];
+}
+
+enum {
+    MAX_PARAM_BUFFERS = 16,
+};
+
+typedef struct VAAPIDecodePicture {
+    VASurfaceID           output_surface;
+
+    int                nb_param_buffers;
+    VABufferID            param_buffers[MAX_PARAM_BUFFERS];
+
+    int                nb_slices;
+    VABufferID           *slice_buffers;
+    int                   slices_allocated;
+} VAAPIDecodePicture;
+
+typedef struct VAAPIDecodeContext {
+    VAConfigID            va_config;
+    VAContextID           va_context;
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+FF_DISABLE_DEPRECATION_WARNINGS
+    int                   have_old_context;
+    struct vaapi_context *old_context;
+    AVBufferRef          *device_ref;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+    AVHWDeviceContext    *device;
+    AVVAAPIDeviceContext *hwctx;
+
+    AVHWFramesContext    *frames;
+    AVVAAPIFramesContext *hwfc;
+
+    enum AVPixelFormat    surface_format;
+    int                   surface_count;
+
+    VASurfaceAttrib       pixel_format_attribute;
+} VAAPIDecodeContext;
+
+
+int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+                                      VAAPIDecodePicture *pic,
+                                      int type,
+                                      const void *data,
+                                      size_t size);
+
+int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+                                      VAAPIDecodePicture *pic,
+                                      const void *params_data,
+                                      size_t params_size,
+                                      const void *slice_data,
+                                      size_t slice_size);
+
+int ff_vaapi_decode_issue(AVCodecContext *avctx,
+                          VAAPIDecodePicture *pic);
+int ff_vaapi_decode_cancel(AVCodecContext *avctx,
+                           VAAPIDecodePicture *pic);
+
+int ff_vaapi_decode_init(AVCodecContext *avctx);
+int ff_vaapi_decode_uninit(AVCodecContext *avctx);
+
+int ff_vaapi_common_frame_params(AVCodecContext *avctx,
+                                 AVBufferRef *hw_frames_ctx);
+
+#endif /* AVCODEC_VAAPI_DECODE_H */
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi.h firefox-85.0+build1/media/ffvpx/libavcodec/vaapi.h
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/vaapi.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ * Video Acceleration API (shared data between FFmpeg and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+/**
+ * @file
+ * @ingroup lavc_codec_hwaccel_vaapi
+ * Public libavcodec VA API header.
+ */
+
+#include <stdint.h>
+#include "libavutil/attributes.h"
+#include "version.h"
+
+#if FF_API_STRUCT_VAAPI_CONTEXT
+
+/**
+ * @defgroup lavc_codec_hwaccel_vaapi VA API Decoding
+ * @ingroup lavc_codec_hwaccel
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the FFmpeg library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ *
+ * Deprecated: use AVCodecContext.hw_frames_ctx instead.
+ */
+struct attribute_deprecated vaapi_context {
+    /**
+     * Window system dependent data
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    void *display;
+
+    /**
+     * Configuration ID
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t config_id;
+
+    /**
+     * Context ID (video decode pipeline)
+     *
+     * - encoding: unused
+     * - decoding: Set by user
+     */
+    uint32_t context_id;
+};
+
+/* @} */
+
+#endif /* FF_API_STRUCT_VAAPI_CONTEXT */
+
+#endif /* AVCODEC_VAAPI_H */
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_vp8.c firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_vp8.c
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_vp8.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_vp8.c	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,237 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <va/va.h>
+#include <va/va_dec_vp8.h>
+
+#include "hwaccel.h"
+#include "vaapi_decode.h"
+#include "vp8.h"
+
+static VASurfaceID vaapi_vp8_surface_id(VP8Frame *vf)
+{
+    if (vf)
+        return ff_vaapi_get_surface_id(vf->tf.f);
+    else
+        return VA_INVALID_SURFACE;
+}
+
+static int vaapi_vp8_start_frame(AVCodecContext          *avctx,
+                                 av_unused const uint8_t *buffer,
+                                 av_unused uint32_t       size)
+{
+    const VP8Context *s = avctx->priv_data;
+    VAAPIDecodePicture *pic = s->framep[VP56_FRAME_CURRENT]->hwaccel_picture_private;
+    VAPictureParameterBufferVP8 pp;
+    VAProbabilityDataBufferVP8 prob;
+    VAIQMatrixBufferVP8 quant;
+    int err, i, j, k;
+
+    pic->output_surface = vaapi_vp8_surface_id(s->framep[VP56_FRAME_CURRENT]);
+
+    pp = (VAPictureParameterBufferVP8) {
+        .frame_width                     = avctx->width,
+        .frame_height                    = avctx->height,
+
+        .last_ref_frame                  = vaapi_vp8_surface_id(s->framep[VP56_FRAME_PREVIOUS]),
+        .golden_ref_frame                = vaapi_vp8_surface_id(s->framep[VP56_FRAME_GOLDEN]),
+        .alt_ref_frame                   = vaapi_vp8_surface_id(s->framep[VP56_FRAME_GOLDEN2]),
+        .out_of_loop_frame               = VA_INVALID_SURFACE,
+
+        .pic_fields.bits = {
+            .key_frame                   = !s->keyframe,
+            .version                     = s->profile,
+
+            .segmentation_enabled        = s->segmentation.enabled,
+            .update_mb_segmentation_map  = s->segmentation.update_map,
+            .update_segment_feature_data = s->segmentation.update_feature_data,
+
+            .filter_type                 = s->filter.simple,
+            .sharpness_level             = s->filter.sharpness,
+
+            .loop_filter_adj_enable      = s->lf_delta.enabled,
+            .mode_ref_lf_delta_update    = s->lf_delta.update,
+
+            .sign_bias_golden            = s->sign_bias[VP56_FRAME_GOLDEN],
+            .sign_bias_alternate         = s->sign_bias[VP56_FRAME_GOLDEN2],
+
+            .mb_no_coeff_skip            = s->mbskip_enabled,
+            .loop_filter_disable         = s->filter.level == 0,
+        },
+
+        .prob_skip_false                 = s->prob->mbskip,
+        .prob_intra                      = s->prob->intra,
+        .prob_last                       = s->prob->last,
+        .prob_gf                         = s->prob->golden,
+    };
+
+    for (i = 0; i < 3; i++)
+        pp.mb_segment_tree_probs[i] = s->prob->segmentid[i];
+
+    for (i = 0; i < 4; i++) {
+        if (s->segmentation.enabled) {
+            pp.loop_filter_level[i] = s->segmentation.filter_level[i];
+            if (!s->segmentation.absolute_vals)
+                pp.loop_filter_level[i] += s->filter.level;
+        } else {
+            pp.loop_filter_level[i] = s->filter.level;
+        }
+        pp.loop_filter_level[i] = av_clip_uintp2(pp.loop_filter_level[i], 6);
+    }
+
+    for (i = 0; i < 4; i++) {
+        pp.loop_filter_deltas_ref_frame[i] = s->lf_delta.ref[i];
+        pp.loop_filter_deltas_mode[i] = s->lf_delta.mode[i + 4];
+    }
+
+    if (s->keyframe) {
+        static const uint8_t keyframe_y_mode_probs[4] = {
+            145, 156, 163, 128
+        };
+        static const uint8_t keyframe_uv_mode_probs[3] = {
+            142, 114, 183
+        };
+        memcpy(pp.y_mode_probs,  keyframe_y_mode_probs,  4);
+        memcpy(pp.uv_mode_probs, keyframe_uv_mode_probs, 3);
+    } else {
+        for (i = 0; i < 4; i++)
+            pp.y_mode_probs[i] = s->prob->pred16x16[i];
+        for (i = 0; i < 3; i++)
+            pp.uv_mode_probs[i] = s->prob->pred8x8c[i];
+    }
+    for (i = 0; i < 2; i++)
+        for (j = 0; j < 19; j++)
+            pp.mv_probs[i][j] = s->prob->mvc[i][j];
+
+    pp.bool_coder_ctx.range = s->coder_state_at_header_end.range;
+    pp.bool_coder_ctx.value = s->coder_state_at_header_end.value;
+    pp.bool_coder_ctx.count = s->coder_state_at_header_end.bit_count;
+
+    err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+                                            VAPictureParameterBufferType,
+                                            &pp, sizeof(pp));
+    if (err < 0)
+        goto fail;
+
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 8; j++) {
+            static const int coeff_bands_inverse[8] = {
+                0, 1, 2, 3, 5, 6, 4, 15
+            };
+            int coeff_pos = coeff_bands_inverse[j];
+
+            for (k = 0; k < 3; k++) {
+                memcpy(prob.dct_coeff_probs[i][j][k],
+                       s->prob->token[i][coeff_pos][k], 11);
+            }
+        }
+    }
+
+    err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+                                            VAProbabilityBufferType,
+                                            &prob, sizeof(prob));
+    if (err < 0)
+        goto fail;
+
+    for (i = 0; i < 4; i++) {
+        int base_qi = s->segmentation.base_quant[i];
+        if (!s->segmentation.absolute_vals)
+            base_qi += s->quant.yac_qi;
+
+        quant.quantization_index[i][0] = av_clip_uintp2(base_qi,                       7);
+        quant.quantization_index[i][1] = av_clip_uintp2(base_qi + s->quant.ydc_delta,  7);
+        quant.quantization_index[i][2] = av_clip_uintp2(base_qi + s->quant.y2dc_delta, 7);
+        quant.quantization_index[i][3] = av_clip_uintp2(base_qi + s->quant.y2ac_delta, 7);
+        quant.quantization_index[i][4] = av_clip_uintp2(base_qi + s->quant.uvdc_delta, 7);
+        quant.quantization_index[i][5] = av_clip_uintp2(base_qi + s->quant.uvac_delta, 7);
+    }
+
+    err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+                                            VAIQMatrixBufferType,
+                                            &quant, sizeof(quant));
+    if (err < 0)
+        goto fail;
+
+    return 0;
+
+fail:
+    ff_vaapi_decode_cancel(avctx, pic);
+    return err;
+}
+
+static int vaapi_vp8_end_frame(AVCodecContext *avctx)
+{
+    const VP8Context *s = avctx->priv_data;
+    VAAPIDecodePicture *pic = s->framep[VP56_FRAME_CURRENT]->hwaccel_picture_private;
+
+    return ff_vaapi_decode_issue(avctx, pic);
+}
+
+static int vaapi_vp8_decode_slice(AVCodecContext *avctx,
+                                  const uint8_t  *buffer,
+                                  uint32_t        size)
+{
+    const VP8Context *s = avctx->priv_data;
+    VAAPIDecodePicture *pic = s->framep[VP56_FRAME_CURRENT]->hwaccel_picture_private;
+    VASliceParameterBufferVP8 sp;
+    int err, i;
+
+    unsigned int header_size = 3 + 7 * s->keyframe;
+    const uint8_t *data = buffer + header_size;
+    unsigned int data_size = size - header_size;
+
+    sp = (VASliceParameterBufferVP8) {
+        .slice_data_size   = data_size,
+        .slice_data_offset = 0,
+        .slice_data_flag   = VA_SLICE_DATA_FLAG_ALL,
+
+        .macroblock_offset = (8 * (s->coder_state_at_header_end.input - data) -
+                              s->coder_state_at_header_end.bit_count - 8),
+        .num_of_partitions = s->num_coeff_partitions + 1,
+    };
+
+    sp.partition_size[0] = s->header_partition_size - ((sp.macroblock_offset + 7) / 8);
+    for (i = 0; i < 8; i++)
+        sp.partition_size[i+1] = s->coeff_partition_size[i];
+
+    err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size);
+    if (err)
+        goto fail;
+
+    return 0;
+
+fail:
+    ff_vaapi_decode_cancel(avctx, pic);
+    return err;
+}
+
+const AVHWAccel ff_vp8_vaapi_hwaccel = {
+    .name                 = "vp8_vaapi",
+    .type                 = AVMEDIA_TYPE_VIDEO,
+    .id                   = AV_CODEC_ID_VP8,
+    .pix_fmt              = AV_PIX_FMT_VAAPI,
+    .start_frame          = &vaapi_vp8_start_frame,
+    .end_frame            = &vaapi_vp8_end_frame,
+    .decode_slice         = &vaapi_vp8_decode_slice,
+    .frame_priv_data_size = sizeof(VAAPIDecodePicture),
+    .init                 = &ff_vaapi_decode_init,
+    .uninit               = &ff_vaapi_decode_uninit,
+    .frame_params         = &ff_vaapi_common_frame_params,
+    .priv_data_size       = sizeof(VAAPIDecodeContext),
+    .caps_internal        = HWACCEL_CAP_ASYNC_SAFE,
+};
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_vp9.c firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_vp9.c
--- firefox-84.0.2+build1/media/ffvpx/libavcodec/vaapi_vp9.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavcodec/vaapi_vp9.c	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,185 @@
+/*
+ * VP9 HW decode acceleration through VA API
+ *
+ * Copyright (C) 2015 Timo Rothenpieler <timo@rothenpieler.org>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/pixdesc.h"
+
+#include "hwaccel.h"
+#include "vaapi_decode.h"
+#include "vp9shared.h"
+
+static VASurfaceID vaapi_vp9_surface_id(const VP9Frame *vf)
+{
+    if (vf)
+        return ff_vaapi_get_surface_id(vf->tf.f);
+    else
+        return VA_INVALID_SURFACE;
+}
+
+static int vaapi_vp9_start_frame(AVCodecContext          *avctx,
+                                 av_unused const uint8_t *buffer,
+                                 av_unused uint32_t       size)
+{
+    const VP9SharedContext *h = avctx->priv_data;
+    VAAPIDecodePicture *pic = h->frames[CUR_FRAME].hwaccel_picture_private;
+    VADecPictureParameterBufferVP9 pic_param;
+    const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
+    int err, i;
+
+    pic->output_surface = vaapi_vp9_surface_id(&h->frames[CUR_FRAME]);
+
+    pic_param = (VADecPictureParameterBufferVP9) {
+        .frame_width                      = avctx->width,
+        .frame_height                     = avctx->height,
+
+        .pic_fields.bits = {
+            .subsampling_x                = pixdesc->log2_chroma_w,
+            .subsampling_y                = pixdesc->log2_chroma_h,
+            .frame_type                   = !h->h.keyframe,
+            .show_frame                   = !h->h.invisible,
+            .error_resilient_mode         = h->h.errorres,
+            .intra_only                   = h->h.intraonly,
+            .allow_high_precision_mv      = h->h.keyframe ? 0 : h->h.highprecisionmvs,
+            .mcomp_filter_type            = h->h.filtermode ^ (h->h.filtermode <= 1),
+            .frame_parallel_decoding_mode = h->h.parallelmode,
+            .reset_frame_context          = h->h.resetctx,
+            .refresh_frame_context        = h->h.refreshctx,
+            .frame_context_idx            = h->h.framectxid,
+
+            .segmentation_enabled          = h->h.segmentation.enabled,
+            .segmentation_temporal_update  = h->h.segmentation.temporal,
+            .segmentation_update_map       = h->h.segmentation.update_map,
+
+            .last_ref_frame                = h->h.refidx[0],
+            .last_ref_frame_sign_bias      = h->h.signbias[0],
+            .golden_ref_frame              = h->h.refidx[1],
+            .golden_ref_frame_sign_bias    = h->h.signbias[1],
+            .alt_ref_frame                 = h->h.refidx[2],
+            .alt_ref_frame_sign_bias       = h->h.signbias[2],
+            .lossless_flag                 = h->h.lossless,
+        },
+
+        .filter_level                      = h->h.filter.level,
+        .sharpness_level                   = h->h.filter.sharpness,
+        .log2_tile_rows                    = h->h.tiling.log2_tile_rows,
+        .log2_tile_columns                 = h->h.tiling.log2_tile_cols,
+
+        .frame_header_length_in_bytes      = h->h.uncompressed_header_size,
+        .first_partition_size              = h->h.compressed_header_size,
+
+        .profile                           = h->h.profile,
+        .bit_depth                         = h->h.bpp,
+    };
+
+    for (i = 0; i < 7; i++)
+        pic_param.mb_segment_tree_probs[i] = h->h.segmentation.prob[i];
+
+    if (h->h.segmentation.temporal) {
+        for (i = 0; i < 3; i++)
+            pic_param.segment_pred_probs[i] = h->h.segmentation.pred_prob[i];
+    } else {
+        memset(pic_param.segment_pred_probs, 255, sizeof(pic_param.segment_pred_probs));
+    }
+
+    for (i = 0; i < 8; i++) {
+        if (h->refs[i].f->buf[0])
+            pic_param.reference_frames[i] = ff_vaapi_get_surface_id(h->refs[i].f);
+        else
+            pic_param.reference_frames[i] = VA_INVALID_ID;
+    }
+
+    err = ff_vaapi_decode_make_param_buffer(avctx, pic,
+                                            VAPictureParameterBufferType,
+                                            &pic_param, sizeof(pic_param));
+    if (err < 0) {
+        ff_vaapi_decode_cancel(avctx, pic);
+        return err;
+    }
+
+    return 0;
+}
+
+static int vaapi_vp9_end_frame(AVCodecContext *avctx)
+{
+    const VP9SharedContext *h = avctx->priv_data;
+    VAAPIDecodePicture *pic = h->frames[CUR_FRAME].hwaccel_picture_private;
+
+    return ff_vaapi_decode_issue(avctx, pic);
+}
+
+static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
+                                  const uint8_t  *buffer,
+                                  uint32_t        size)
+{
+    const VP9SharedContext *h = avctx->priv_data;
+    VAAPIDecodePicture *pic = h->frames[CUR_FRAME].hwaccel_picture_private;
+    VASliceParameterBufferVP9 slice_param;
+    int err, i;
+
+    slice_param = (VASliceParameterBufferVP9) {
+        .slice_data_size   = size,
+        .slice_data_offset = 0,
+        .slice_data_flag   = VA_SLICE_DATA_FLAG_ALL,
+    };
+
+    for (i = 0; i < 8; i++) {
+        slice_param.seg_param[i] = (VASegmentParameterVP9) {
+            .segment_flags.fields = {
+                .segment_reference_enabled = h->h.segmentation.feat[i].ref_enabled,
+                .segment_reference         = h->h.segmentation.feat[i].ref_val,
+                .segment_reference_skipped = h->h.segmentation.feat[i].skip_enabled,
+            },
+
+            .luma_dc_quant_scale           = h->h.segmentation.feat[i].qmul[0][0],
+            .luma_ac_quant_scale           = h->h.segmentation.feat[i].qmul[0][1],
+            .chroma_dc_quant_scale         = h->h.segmentation.feat[i].qmul[1][0],
+            .chroma_ac_quant_scale         = h->h.segmentation.feat[i].qmul[1][1],
+        };
+
+        memcpy(slice_param.seg_param[i].filter_level, h->h.segmentation.feat[i].lflvl, sizeof(slice_param.seg_param[i].filter_level));
+    }
+
+    err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+                                            &slice_param, sizeof(slice_param),
+                                            buffer, size);
+    if (err) {
+        ff_vaapi_decode_cancel(avctx, pic);
+        return err;
+    }
+
+    return 0;
+}
+
+const AVHWAccel ff_vp9_vaapi_hwaccel = {
+    .name                 = "vp9_vaapi",
+    .type                 = AVMEDIA_TYPE_VIDEO,
+    .id                   = AV_CODEC_ID_VP9,
+    .pix_fmt              = AV_PIX_FMT_VAAPI,
+    .start_frame          = vaapi_vp9_start_frame,
+    .end_frame            = vaapi_vp9_end_frame,
+    .decode_slice         = vaapi_vp9_decode_slice,
+    .frame_priv_data_size = sizeof(VAAPIDecodePicture),
+    .init                 = ff_vaapi_decode_init,
+    .uninit               = ff_vaapi_decode_uninit,
+    .frame_params         = ff_vaapi_common_frame_params,
+    .priv_data_size       = sizeof(VAAPIDecodeContext),
+    .caps_internal        = HWACCEL_CAP_ASYNC_SAFE,
+};
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavutil/avutil.symbols firefox-85.0+build1/media/ffvpx/libavutil/avutil.symbols
--- firefox-84.0.2+build1/media/ffvpx/libavutil/avutil.symbols	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavutil/avutil.symbols	2021-01-18 19:58:17.000000000 +0000
@@ -158,6 +158,9 @@
 av_gettime
 av_gettime_relative
 av_gettime_relative_is_monotonic
+av_hwdevice_get_hwframe_constraints
+av_hwdevice_hwconfig_alloc
+av_hwframe_constraints_free
 av_hwframe_get_buffer
 av_image_alloc
 av_image_check_sar
@@ -320,5 +323,9 @@
 av_hwdevice_get_type_name
 av_hwframe_ctx_alloc
 av_hwframe_ctx_init
+av_hwdevice_ctx_alloc
+av_hwdevice_ctx_init
+av_hwframe_transfer_get_formats
+av_hwdevice_ctx_create_derived
 av_malloc_array
 av_mallocz_array
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavutil/hwcontext_vaapi.c firefox-85.0+build1/media/ffvpx/libavutil/hwcontext_vaapi.c
--- firefox-84.0.2+build1/media/ffvpx/libavutil/hwcontext_vaapi.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavutil/hwcontext_vaapi.c	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,1691 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#if HAVE_VAAPI_X11
+#   include <va/va_x11.h>
+#endif
+#if HAVE_VAAPI_DRM
+#   include <va/va_drm.h>
+#endif
+
+#if CONFIG_LIBDRM
+#   include <va/va_drmcommon.h>
+#   include <xf86drm.h>
+#   include <drm_fourcc.h>
+#   ifndef DRM_FORMAT_MOD_INVALID
+#       define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
+#   endif
+#endif
+
+#include <fcntl.h>
+#if HAVE_UNISTD_H
+#   include <unistd.h>
+#endif
+
+
+#include "avassert.h"
+#include "buffer.h"
+#include "common.h"
+#include "hwcontext.h"
+#if CONFIG_LIBDRM
+#include "hwcontext_drm.h"
+#endif
+#include "hwcontext_internal.h"
+#include "hwcontext_vaapi.h"
+#include "mem.h"
+#include "pixdesc.h"
+#include "pixfmt.h"
+
+
+typedef struct VAAPIDevicePriv {
+#if HAVE_VAAPI_X11
+    Display *x11_display;
+#endif
+
+    int drm_fd;
+} VAAPIDevicePriv;
+
+typedef struct VAAPISurfaceFormat {
+    enum AVPixelFormat pix_fmt;
+    VAImageFormat image_format;
+} VAAPISurfaceFormat;
+
+typedef struct VAAPIDeviceContext {
+    // Surface formats which can be used with this device.
+    VAAPISurfaceFormat *formats;
+    int              nb_formats;
+} VAAPIDeviceContext;
+
+typedef struct VAAPIFramesContext {
+    // Surface attributes set at create time.
+    VASurfaceAttrib *attributes;
+    int           nb_attributes;
+    // RT format of the underlying surface (Intel driver ignores this anyway).
+    unsigned int rt_format;
+    // Whether vaDeriveImage works.
+    int derive_works;
+} VAAPIFramesContext;
+
+typedef struct VAAPIMapping {
+    // Handle to the derived or copied image which is mapped.
+    VAImage image;
+    // The mapping flags actually used.
+    int flags;
+} VAAPIMapping;
+
+typedef struct VAAPIFormat {
+    unsigned int fourcc;
+    unsigned int rt_format;
+    enum AVPixelFormat pix_fmt;
+    int chroma_planes_swapped;
+} VAAPIFormatDescriptor;
+
+#define MAP(va, rt, av, swap_uv) { \
+        VA_FOURCC_ ## va, \
+        VA_RT_FORMAT_ ## rt, \
+        AV_PIX_FMT_ ## av, \
+        swap_uv, \
+    }
+// The map fourcc <-> pix_fmt isn't bijective because of the annoying U/V
+// plane swap cases.  The frame handling below tries to hide these.
+static const VAAPIFormatDescriptor vaapi_format_map[] = {
+    MAP(NV12, YUV420,  NV12,    0),
+#ifdef VA_FOURCC_I420
+    MAP(I420, YUV420,  YUV420P, 0),
+#endif
+    MAP(YV12, YUV420,  YUV420P, 1),
+    MAP(IYUV, YUV420,  YUV420P, 0),
+    MAP(422H, YUV422,  YUV422P, 0),
+#ifdef VA_FOURCC_YV16
+    MAP(YV16, YUV422,  YUV422P, 1),
+#endif
+    MAP(UYVY, YUV422,  UYVY422, 0),
+    MAP(YUY2, YUV422,  YUYV422, 0),
+    MAP(411P, YUV411,  YUV411P, 0),
+    MAP(422V, YUV422,  YUV440P, 0),
+    MAP(444P, YUV444,  YUV444P, 0),
+    MAP(Y800, YUV400,  GRAY8,   0),
+#ifdef VA_FOURCC_P010
+    MAP(P010, YUV420_10BPP, P010, 0),
+#endif
+    MAP(BGRA, RGB32,   BGRA, 0),
+    MAP(BGRX, RGB32,   BGR0, 0),
+    MAP(RGBA, RGB32,   RGBA, 0),
+    MAP(RGBX, RGB32,   RGB0, 0),
+#ifdef VA_FOURCC_ABGR
+    MAP(ABGR, RGB32,   ABGR, 0),
+    MAP(XBGR, RGB32,   0BGR, 0),
+#endif
+    MAP(ARGB, RGB32,   ARGB, 0),
+    MAP(XRGB, RGB32,   0RGB, 0),
+};
+#undef MAP
+
+static const VAAPIFormatDescriptor *
+    vaapi_format_from_fourcc(unsigned int fourcc)
+{
+    int i;
+    for (i = 0; i < FF_ARRAY_ELEMS(vaapi_format_map); i++)
+        if (vaapi_format_map[i].fourcc == fourcc)
+            return &vaapi_format_map[i];
+    return NULL;
+}
+
+static const VAAPIFormatDescriptor *
+    vaapi_format_from_pix_fmt(enum AVPixelFormat pix_fmt)
+{
+    int i;
+    for (i = 0; i < FF_ARRAY_ELEMS(vaapi_format_map); i++)
+        if (vaapi_format_map[i].pix_fmt == pix_fmt)
+            return &vaapi_format_map[i];
+    return NULL;
+}
+
+static enum AVPixelFormat vaapi_pix_fmt_from_fourcc(unsigned int fourcc)
+{
+    const VAAPIFormatDescriptor *desc;
+    desc = vaapi_format_from_fourcc(fourcc);
+    if (desc)
+        return desc->pix_fmt;
+    else
+        return AV_PIX_FMT_NONE;
+}
+
+static int vaapi_get_image_format(AVHWDeviceContext *hwdev,
+                                  enum AVPixelFormat pix_fmt,
+                                  VAImageFormat **image_format)
+{
+    VAAPIDeviceContext *ctx = hwdev->internal->priv;
+    int i;
+
+    for (i = 0; i < ctx->nb_formats; i++) {
+        if (ctx->formats[i].pix_fmt == pix_fmt) {
+            if (image_format)
+                *image_format = &ctx->formats[i].image_format;
+            return 0;
+        }
+    }
+    return AVERROR(EINVAL);
+}
+
+static int vaapi_frames_get_constraints(AVHWDeviceContext *hwdev,
+                                        const void *hwconfig,
+                                        AVHWFramesConstraints *constraints)
+{
+    AVVAAPIDeviceContext *hwctx = hwdev->hwctx;
+    const AVVAAPIHWConfig *config = hwconfig;
+    VAAPIDeviceContext *ctx = hwdev->internal->priv;
+    VASurfaceAttrib *attr_list = NULL;
+    VAStatus vas;
+    enum AVPixelFormat pix_fmt;
+    unsigned int fourcc;
+    int err, i, j, attr_count, pix_fmt_count;
+
+    if (config &&
+        !(hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES)) {
+        attr_count = 0;
+        vas = vaQuerySurfaceAttributes(hwctx->display, config->config_id,
+                                       0, &attr_count);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwdev, AV_LOG_ERROR, "Failed to query surface attributes: "
+                   "%d (%s).\n", vas, vaErrorStr(vas));
+            err = AVERROR(ENOSYS);
+            goto fail;
+        }
+
+        attr_list = av_malloc(attr_count * sizeof(*attr_list));
+        if (!attr_list) {
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+
+        vas = vaQuerySurfaceAttributes(hwctx->display, config->config_id,
+                                       attr_list, &attr_count);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwdev, AV_LOG_ERROR, "Failed to query surface attributes: "
+                   "%d (%s).\n", vas, vaErrorStr(vas));
+            err = AVERROR(ENOSYS);
+            goto fail;
+        }
+
+        pix_fmt_count = 0;
+        for (i = 0; i < attr_count; i++) {
+            switch (attr_list[i].type) {
+            case VASurfaceAttribPixelFormat:
+                fourcc = attr_list[i].value.value.i;
+                pix_fmt = vaapi_pix_fmt_from_fourcc(fourcc);
+                if (pix_fmt != AV_PIX_FMT_NONE) {
+                    ++pix_fmt_count;
+                } else {
+                    // Something unsupported - ignore.
+                }
+                break;
+            case VASurfaceAttribMinWidth:
+                constraints->min_width  = attr_list[i].value.value.i;
+                break;
+            case VASurfaceAttribMinHeight:
+                constraints->min_height = attr_list[i].value.value.i;
+                break;
+            case VASurfaceAttribMaxWidth:
+                constraints->max_width  = attr_list[i].value.value.i;
+                break;
+            case VASurfaceAttribMaxHeight:
+                constraints->max_height = attr_list[i].value.value.i;
+                break;
+            }
+        }
+        if (pix_fmt_count == 0) {
+            // Nothing usable found.  Presumably there exists something which
+            // works, so leave the set null to indicate unknown.
+            constraints->valid_sw_formats = NULL;
+        } else {
+            constraints->valid_sw_formats = av_malloc_array(pix_fmt_count + 1,
+                                                            sizeof(pix_fmt));
+            if (!constraints->valid_sw_formats) {
+                err = AVERROR(ENOMEM);
+                goto fail;
+            }
+
+            for (i = j = 0; i < attr_count; i++) {
+                if (attr_list[i].type != VASurfaceAttribPixelFormat)
+                    continue;
+                fourcc = attr_list[i].value.value.i;
+                pix_fmt = vaapi_pix_fmt_from_fourcc(fourcc);
+                if (pix_fmt != AV_PIX_FMT_NONE)
+                    constraints->valid_sw_formats[j++] = pix_fmt;
+            }
+            av_assert0(j == pix_fmt_count);
+            constraints->valid_sw_formats[j] = AV_PIX_FMT_NONE;
+        }
+    } else {
+        // No configuration supplied.
+        // Return the full set of image formats known by the implementation.
+        constraints->valid_sw_formats = av_malloc_array(ctx->nb_formats + 1,
+                                                        sizeof(pix_fmt));
+        if (!constraints->valid_sw_formats) {
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+        for (i = 0; i < ctx->nb_formats; i++)
+            constraints->valid_sw_formats[i] = ctx->formats[i].pix_fmt;
+        constraints->valid_sw_formats[i] = AV_PIX_FMT_NONE;
+    }
+
+    constraints->valid_hw_formats = av_malloc_array(2, sizeof(pix_fmt));
+    if (!constraints->valid_hw_formats) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+    constraints->valid_hw_formats[0] = AV_PIX_FMT_VAAPI;
+    constraints->valid_hw_formats[1] = AV_PIX_FMT_NONE;
+
+    err = 0;
+fail:
+    av_freep(&attr_list);
+    return err;
+}
+
+static const struct {
+    const char *friendly_name;
+    const char *match_string;
+    unsigned int quirks;
+} vaapi_driver_quirks_table[] = {
+#if !VA_CHECK_VERSION(1, 0, 0)
+    // The i965 driver did not conform before version 2.0.
+    {
+        "Intel i965 (Quick Sync)",
+        "i965",
+        AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS,
+    },
+#endif
+    {
+        "Intel iHD",
+        "ubit",
+        AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE,
+    },
+    {
+        "VDPAU wrapper",
+        "Splitted-Desktop Systems VDPAU backend for VA-API",
+        AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES,
+    },
+};
+
+static int vaapi_device_init(AVHWDeviceContext *hwdev)
+{
+    VAAPIDeviceContext *ctx = hwdev->internal->priv;
+    AVVAAPIDeviceContext *hwctx = hwdev->hwctx;
+    VAImageFormat *image_list = NULL;
+    VAStatus vas;
+    const char *vendor_string;
+    int err, i, image_count;
+    enum AVPixelFormat pix_fmt;
+    unsigned int fourcc;
+
+    image_count = vaMaxNumImageFormats(hwctx->display);
+    if (image_count <= 0) {
+        err = AVERROR(EIO);
+        goto fail;
+    }
+    image_list = av_malloc(image_count * sizeof(*image_list));
+    if (!image_list) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+    vas = vaQueryImageFormats(hwctx->display, image_list, &image_count);
+    if (vas != VA_STATUS_SUCCESS) {
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    ctx->formats  = av_malloc(image_count * sizeof(*ctx->formats));
+    if (!ctx->formats) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+    ctx->nb_formats = 0;
+    for (i = 0; i < image_count; i++) {
+        fourcc  = image_list[i].fourcc;
+        pix_fmt = vaapi_pix_fmt_from_fourcc(fourcc);
+        if (pix_fmt == AV_PIX_FMT_NONE) {
+            av_log(hwdev, AV_LOG_DEBUG, "Format %#x -> unknown.\n",
+                   fourcc);
+        } else {
+            av_log(hwdev, AV_LOG_DEBUG, "Format %#x -> %s.\n",
+                   fourcc, av_get_pix_fmt_name(pix_fmt));
+            ctx->formats[ctx->nb_formats].pix_fmt      = pix_fmt;
+            ctx->formats[ctx->nb_formats].image_format = image_list[i];
+            ++ctx->nb_formats;
+        }
+    }
+
+    vendor_string = vaQueryVendorString(hwctx->display);
+    if (vendor_string)
+        av_log(hwdev, AV_LOG_VERBOSE, "VAAPI driver: %s.\n", vendor_string);
+
+    if (hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_USER_SET) {
+        av_log(hwdev, AV_LOG_VERBOSE, "Using quirks set by user (%#x).\n",
+               hwctx->driver_quirks);
+    } else {
+        // Detect the driver in use and set quirk flags if necessary.
+        hwctx->driver_quirks = 0;
+        if (vendor_string) {
+            for (i = 0; i < FF_ARRAY_ELEMS(vaapi_driver_quirks_table); i++) {
+                if (strstr(vendor_string,
+                           vaapi_driver_quirks_table[i].match_string)) {
+                    av_log(hwdev, AV_LOG_VERBOSE, "Matched driver string "
+                           "as known nonstandard driver \"%s\", setting "
+                           "quirks (%#x).\n",
+                           vaapi_driver_quirks_table[i].friendly_name,
+                           vaapi_driver_quirks_table[i].quirks);
+                    hwctx->driver_quirks |=
+                        vaapi_driver_quirks_table[i].quirks;
+                    break;
+                }
+            }
+            if (!(i < FF_ARRAY_ELEMS(vaapi_driver_quirks_table))) {
+                av_log(hwdev, AV_LOG_VERBOSE, "Driver not found in known "
+                       "nonstandard list, using standard behaviour.\n");
+            }
+        } else {
+            av_log(hwdev, AV_LOG_VERBOSE, "Driver has no vendor string, "
+                   "assuming standard behaviour.\n");
+        }
+    }
+
+    av_free(image_list);
+    return 0;
+fail:
+    av_freep(&ctx->formats);
+    av_free(image_list);
+    return err;
+}
+
+static void vaapi_device_uninit(AVHWDeviceContext *hwdev)
+{
+    VAAPIDeviceContext *ctx = hwdev->internal->priv;
+
+    av_freep(&ctx->formats);
+}
+
+static void vaapi_buffer_free(void *opaque, uint8_t *data)
+{
+    AVHWFramesContext     *hwfc = opaque;
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VASurfaceID surface_id;
+    VAStatus vas;
+
+    surface_id = (VASurfaceID)(uintptr_t)data;
+
+    vas = vaDestroySurfaces(hwctx->display, &surface_id, 1);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to destroy surface %#x: "
+               "%d (%s).\n", surface_id, vas, vaErrorStr(vas));
+    }
+}
+
+static AVBufferRef *vaapi_pool_alloc(void *opaque, int size)
+{
+    AVHWFramesContext     *hwfc = opaque;
+    VAAPIFramesContext     *ctx = hwfc->internal->priv;
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    AVVAAPIFramesContext  *avfc = hwfc->hwctx;
+    VASurfaceID surface_id;
+    VAStatus vas;
+    AVBufferRef *ref;
+
+    if (hwfc->initial_pool_size > 0 &&
+        avfc->nb_surfaces >= hwfc->initial_pool_size)
+        return NULL;
+
+    vas = vaCreateSurfaces(hwctx->display, ctx->rt_format,
+                           hwfc->width, hwfc->height,
+                           &surface_id, 1,
+                           ctx->attributes, ctx->nb_attributes);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to create surface: "
+               "%d (%s).\n", vas, vaErrorStr(vas));
+        return NULL;
+    }
+    av_log(hwfc, AV_LOG_DEBUG, "Created surface %#x.\n", surface_id);
+
+    ref = av_buffer_create((uint8_t*)(uintptr_t)surface_id,
+                           sizeof(surface_id), &vaapi_buffer_free,
+                           hwfc, AV_BUFFER_FLAG_READONLY);
+    if (!ref) {
+        vaDestroySurfaces(hwctx->display, &surface_id, 1);
+        return NULL;
+    }
+
+    if (hwfc->initial_pool_size > 0) {
+        // This is a fixed-size pool, so we must still be in the initial
+        // allocation sequence.
+        av_assert0(avfc->nb_surfaces < hwfc->initial_pool_size);
+        avfc->surface_ids[avfc->nb_surfaces] = surface_id;
+        ++avfc->nb_surfaces;
+    }
+
+    return ref;
+}
+
+static int vaapi_frames_init(AVHWFramesContext *hwfc)
+{
+    AVVAAPIFramesContext  *avfc = hwfc->hwctx;
+    VAAPIFramesContext     *ctx = hwfc->internal->priv;
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    const VAAPIFormatDescriptor *desc;
+    VAImageFormat *expected_format;
+    AVBufferRef *test_surface = NULL;
+    VASurfaceID test_surface_id;
+    VAImage test_image;
+    VAStatus vas;
+    int err, i;
+
+    desc = vaapi_format_from_pix_fmt(hwfc->sw_format);
+    if (!desc) {
+        av_log(hwfc, AV_LOG_ERROR, "Unsupported format: %s.\n",
+               av_get_pix_fmt_name(hwfc->sw_format));
+        return AVERROR(EINVAL);
+    }
+
+    if (!hwfc->pool) {
+        if (!(hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES)) {
+            int need_memory_type = !(hwctx->driver_quirks & AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE);
+            int need_pixel_format = 1;
+            for (i = 0; i < avfc->nb_attributes; i++) {
+                if (avfc->attributes[i].type == VASurfaceAttribMemoryType)
+                    need_memory_type  = 0;
+                if (avfc->attributes[i].type == VASurfaceAttribPixelFormat)
+                    need_pixel_format = 0;
+            }
+            ctx->nb_attributes =
+                avfc->nb_attributes + need_memory_type + need_pixel_format;
+
+            ctx->attributes = av_malloc(ctx->nb_attributes *
+                                        sizeof(*ctx->attributes));
+            if (!ctx->attributes) {
+                err = AVERROR(ENOMEM);
+                goto fail;
+            }
+
+            for (i = 0; i < avfc->nb_attributes; i++)
+                ctx->attributes[i] = avfc->attributes[i];
+            if (need_memory_type) {
+                ctx->attributes[i++] = (VASurfaceAttrib) {
+                    .type          = VASurfaceAttribMemoryType,
+                    .flags         = VA_SURFACE_ATTRIB_SETTABLE,
+                    .value.type    = VAGenericValueTypeInteger,
+                    .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_VA,
+                };
+            }
+            if (need_pixel_format) {
+                ctx->attributes[i++] = (VASurfaceAttrib) {
+                    .type          = VASurfaceAttribPixelFormat,
+                    .flags         = VA_SURFACE_ATTRIB_SETTABLE,
+                    .value.type    = VAGenericValueTypeInteger,
+                    .value.value.i = desc->fourcc,
+                };
+            }
+            av_assert0(i == ctx->nb_attributes);
+        } else {
+            ctx->attributes = NULL;
+            ctx->nb_attributes = 0;
+        }
+
+        ctx->rt_format = desc->rt_format;
+
+        if (hwfc->initial_pool_size > 0) {
+            // This pool will be usable as a render target, so we need to store
+            // all of the surface IDs somewhere that vaCreateContext() calls
+            // will be able to access them.
+            avfc->nb_surfaces = 0;
+            avfc->surface_ids = av_malloc(hwfc->initial_pool_size *
+                                          sizeof(*avfc->surface_ids));
+            if (!avfc->surface_ids) {
+                err = AVERROR(ENOMEM);
+                goto fail;
+            }
+        } else {
+            // This pool allows dynamic sizing, and will not be usable as a
+            // render target.
+            avfc->nb_surfaces = 0;
+            avfc->surface_ids = NULL;
+        }
+
+        hwfc->internal->pool_internal =
+            av_buffer_pool_init2(sizeof(VASurfaceID), hwfc,
+                                 &vaapi_pool_alloc, NULL);
+        if (!hwfc->internal->pool_internal) {
+            av_log(hwfc, AV_LOG_ERROR, "Failed to create VAAPI surface pool.\n");
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+    }
+
+    // Allocate a single surface to test whether vaDeriveImage() is going
+    // to work for the specific configuration.
+    if (hwfc->pool) {
+        test_surface = av_buffer_pool_get(hwfc->pool);
+        if (!test_surface) {
+            av_log(hwfc, AV_LOG_ERROR, "Unable to allocate a surface from "
+                   "user-configured buffer pool.\n");
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+    } else {
+        test_surface = av_buffer_pool_get(hwfc->internal->pool_internal);
+        if (!test_surface) {
+            av_log(hwfc, AV_LOG_ERROR, "Unable to allocate a surface from "
+                   "internal buffer pool.\n");
+            err = AVERROR(ENOMEM);
+            goto fail;
+        }
+    }
+    test_surface_id = (VASurfaceID)(uintptr_t)test_surface->data;
+
+    ctx->derive_works = 0;
+
+    err = vaapi_get_image_format(hwfc->device_ctx,
+                                 hwfc->sw_format, &expected_format);
+    if (err == 0) {
+        vas = vaDeriveImage(hwctx->display, test_surface_id, &test_image);
+        if (vas == VA_STATUS_SUCCESS) {
+            if (expected_format->fourcc == test_image.format.fourcc) {
+                av_log(hwfc, AV_LOG_DEBUG, "Direct mapping possible.\n");
+                ctx->derive_works = 1;
+            } else {
+                av_log(hwfc, AV_LOG_DEBUG, "Direct mapping disabled: "
+                       "derived image format %08x does not match "
+                       "expected format %08x.\n",
+                       expected_format->fourcc, test_image.format.fourcc);
+            }
+            vaDestroyImage(hwctx->display, test_image.image_id);
+        } else {
+            av_log(hwfc, AV_LOG_DEBUG, "Direct mapping disabled: "
+                   "deriving image does not work: "
+                   "%d (%s).\n", vas, vaErrorStr(vas));
+        }
+    } else {
+        av_log(hwfc, AV_LOG_DEBUG, "Direct mapping disabled: "
+               "image format is not supported.\n");
+    }
+
+    av_buffer_unref(&test_surface);
+    return 0;
+
+fail:
+    av_buffer_unref(&test_surface);
+    av_freep(&avfc->surface_ids);
+    av_freep(&ctx->attributes);
+    return err;
+}
+
+static void vaapi_frames_uninit(AVHWFramesContext *hwfc)
+{
+    AVVAAPIFramesContext *avfc = hwfc->hwctx;
+    VAAPIFramesContext    *ctx = hwfc->internal->priv;
+
+    av_freep(&avfc->surface_ids);
+    av_freep(&ctx->attributes);
+}
+
+static int vaapi_get_buffer(AVHWFramesContext *hwfc, AVFrame *frame)
+{
+    frame->buf[0] = av_buffer_pool_get(hwfc->pool);
+    if (!frame->buf[0])
+        return AVERROR(ENOMEM);
+
+    frame->data[3] = frame->buf[0]->data;
+    frame->format  = AV_PIX_FMT_VAAPI;
+    frame->width   = hwfc->width;
+    frame->height  = hwfc->height;
+
+    return 0;
+}
+
+static int vaapi_transfer_get_formats(AVHWFramesContext *hwfc,
+                                      enum AVHWFrameTransferDirection dir,
+                                      enum AVPixelFormat **formats)
+{
+    VAAPIDeviceContext *ctx = hwfc->device_ctx->internal->priv;
+    enum AVPixelFormat *pix_fmts;
+    int i, k, sw_format_available;
+
+    sw_format_available = 0;
+    for (i = 0; i < ctx->nb_formats; i++) {
+        if (ctx->formats[i].pix_fmt == hwfc->sw_format)
+            sw_format_available = 1;
+    }
+
+    pix_fmts = av_malloc((ctx->nb_formats + 1) * sizeof(*pix_fmts));
+    if (!pix_fmts)
+        return AVERROR(ENOMEM);
+
+    if (sw_format_available) {
+        pix_fmts[0] = hwfc->sw_format;
+        k = 1;
+    } else {
+        k = 0;
+    }
+    for (i = 0; i < ctx->nb_formats; i++) {
+        if (ctx->formats[i].pix_fmt == hwfc->sw_format)
+            continue;
+        av_assert0(k < ctx->nb_formats);
+        pix_fmts[k++] = ctx->formats[i].pix_fmt;
+    }
+    pix_fmts[k] = AV_PIX_FMT_NONE;
+
+    *formats = pix_fmts;
+    return 0;
+}
+
+static void vaapi_unmap_frame(AVHWFramesContext *hwfc,
+                              HWMapDescriptor *hwmap)
+{
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VAAPIMapping           *map = hwmap->priv;
+    VASurfaceID surface_id;
+    VAStatus vas;
+
+    surface_id = (VASurfaceID)(uintptr_t)hwmap->source->data[3];
+    av_log(hwfc, AV_LOG_DEBUG, "Unmap surface %#x.\n", surface_id);
+
+    vas = vaUnmapBuffer(hwctx->display, map->image.buf);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to unmap image from surface "
+               "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+    }
+
+    if ((map->flags & AV_HWFRAME_MAP_WRITE) &&
+        !(map->flags & AV_HWFRAME_MAP_DIRECT)) {
+        vas = vaPutImage(hwctx->display, surface_id, map->image.image_id,
+                         0, 0, hwfc->width, hwfc->height,
+                         0, 0, hwfc->width, hwfc->height);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwfc, AV_LOG_ERROR, "Failed to write image to surface "
+                   "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+        }
+    }
+
+    vas = vaDestroyImage(hwctx->display, map->image.image_id);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to destroy image from surface "
+               "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+    }
+
+    av_free(map);
+}
+
+static int vaapi_map_frame(AVHWFramesContext *hwfc,
+                           AVFrame *dst, const AVFrame *src, int flags)
+{
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VAAPIFramesContext *ctx = hwfc->internal->priv;
+    VASurfaceID surface_id;
+    const VAAPIFormatDescriptor *desc;
+    VAImageFormat *image_format;
+    VAAPIMapping *map;
+    VAStatus vas;
+    void *address = NULL;
+    int err, i;
+
+    surface_id = (VASurfaceID)(uintptr_t)src->data[3];
+    av_log(hwfc, AV_LOG_DEBUG, "Map surface %#x.\n", surface_id);
+
+    if (!ctx->derive_works && (flags & AV_HWFRAME_MAP_DIRECT)) {
+        // Requested direct mapping but it is not possible.
+        return AVERROR(EINVAL);
+    }
+    if (dst->format == AV_PIX_FMT_NONE)
+        dst->format = hwfc->sw_format;
+    if (dst->format != hwfc->sw_format && (flags & AV_HWFRAME_MAP_DIRECT)) {
+        // Requested direct mapping but the formats do not match.
+        return AVERROR(EINVAL);
+    }
+
+    err = vaapi_get_image_format(hwfc->device_ctx, dst->format, &image_format);
+    if (err < 0) {
+        // Requested format is not a valid output format.
+        return AVERROR(EINVAL);
+    }
+
+    map = av_malloc(sizeof(*map));
+    if (!map)
+        return AVERROR(ENOMEM);
+    map->flags = flags;
+    map->image.image_id = VA_INVALID_ID;
+
+    vas = vaSyncSurface(hwctx->display, surface_id);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to sync surface "
+               "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    // The memory which we map using derive need not be connected to the CPU
+    // in a way conducive to fast access.  On Gen7-Gen9 Intel graphics, the
+    // memory is mappable but not cached, so normal memcpy()-like access is
+    // very slow to read it (but writing is ok).  It is possible to read much
+    // faster with a copy routine which is aware of the limitation, but we
+    // assume for now that the user is not aware of that and would therefore
+    // prefer not to be given direct-mapped memory if they request read access.
+    if (ctx->derive_works && dst->format == hwfc->sw_format &&
+        ((flags & AV_HWFRAME_MAP_DIRECT) || !(flags & AV_HWFRAME_MAP_READ))) {
+        vas = vaDeriveImage(hwctx->display, surface_id, &map->image);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwfc, AV_LOG_ERROR, "Failed to derive image from "
+                   "surface %#x: %d (%s).\n",
+                   surface_id, vas, vaErrorStr(vas));
+            err = AVERROR(EIO);
+            goto fail;
+        }
+        if (map->image.format.fourcc != image_format->fourcc) {
+            av_log(hwfc, AV_LOG_ERROR, "Derive image of surface %#x "
+                   "is in wrong format: expected %#08x, got %#08x.\n",
+                   surface_id, image_format->fourcc, map->image.format.fourcc);
+            err = AVERROR(EIO);
+            goto fail;
+        }
+        map->flags |= AV_HWFRAME_MAP_DIRECT;
+    } else {
+        vas = vaCreateImage(hwctx->display, image_format,
+                            hwfc->width, hwfc->height, &map->image);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(hwfc, AV_LOG_ERROR, "Failed to create image for "
+                   "surface %#x: %d (%s).\n",
+                   surface_id, vas, vaErrorStr(vas));
+            err = AVERROR(EIO);
+            goto fail;
+        }
+        if (!(flags & AV_HWFRAME_MAP_OVERWRITE)) {
+            vas = vaGetImage(hwctx->display, surface_id, 0, 0,
+                             hwfc->width, hwfc->height, map->image.image_id);
+            if (vas != VA_STATUS_SUCCESS) {
+                av_log(hwfc, AV_LOG_ERROR, "Failed to read image from "
+                       "surface %#x: %d (%s).\n",
+                       surface_id, vas, vaErrorStr(vas));
+                err = AVERROR(EIO);
+                goto fail;
+            }
+        }
+    }
+
+    vas = vaMapBuffer(hwctx->display, map->image.buf, &address);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to map image from surface "
+               "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    err = ff_hwframe_map_create(src->hw_frames_ctx,
+                                dst, src, &vaapi_unmap_frame, map);
+    if (err < 0)
+        goto fail;
+
+    dst->width  = src->width;
+    dst->height = src->height;
+
+    for (i = 0; i < map->image.num_planes; i++) {
+        dst->data[i] = (uint8_t*)address + map->image.offsets[i];
+        dst->linesize[i] = map->image.pitches[i];
+    }
+
+    desc = vaapi_format_from_fourcc(map->image.format.fourcc);
+    if (desc && desc->chroma_planes_swapped) {
+        // Chroma planes are YVU rather than YUV, so swap them.
+        FFSWAP(uint8_t*, dst->data[1], dst->data[2]);
+    }
+
+    return 0;
+
+fail:
+    if (map) {
+        if (address)
+            vaUnmapBuffer(hwctx->display, map->image.buf);
+        if (map->image.image_id != VA_INVALID_ID)
+            vaDestroyImage(hwctx->display, map->image.image_id);
+        av_free(map);
+    }
+    return err;
+}
+
+static int vaapi_transfer_data_from(AVHWFramesContext *hwfc,
+                                    AVFrame *dst, const AVFrame *src)
+{
+    AVFrame *map;
+    int err;
+
+    if (dst->width > hwfc->width || dst->height > hwfc->height)
+        return AVERROR(EINVAL);
+
+    map = av_frame_alloc();
+    if (!map)
+        return AVERROR(ENOMEM);
+    map->format = dst->format;
+
+    err = vaapi_map_frame(hwfc, map, src, AV_HWFRAME_MAP_READ);
+    if (err)
+        goto fail;
+
+    map->width  = dst->width;
+    map->height = dst->height;
+
+    err = av_frame_copy(dst, map);
+    if (err)
+        goto fail;
+
+    err = 0;
+fail:
+    av_frame_free(&map);
+    return err;
+}
+
+static int vaapi_transfer_data_to(AVHWFramesContext *hwfc,
+                                  AVFrame *dst, const AVFrame *src)
+{
+    AVFrame *map;
+    int err;
+
+    if (src->width > hwfc->width || src->height > hwfc->height)
+        return AVERROR(EINVAL);
+
+    map = av_frame_alloc();
+    if (!map)
+        return AVERROR(ENOMEM);
+    map->format = src->format;
+
+    err = vaapi_map_frame(hwfc, map, dst, AV_HWFRAME_MAP_WRITE | AV_HWFRAME_MAP_OVERWRITE);
+    if (err)
+        goto fail;
+
+    map->width  = src->width;
+    map->height = src->height;
+
+    err = av_frame_copy(map, src);
+    if (err)
+        goto fail;
+
+    err = 0;
+fail:
+    av_frame_free(&map);
+    return err;
+}
+
+static int vaapi_map_to_memory(AVHWFramesContext *hwfc, AVFrame *dst,
+                               const AVFrame *src, int flags)
+{
+    int err;
+
+    if (dst->format != AV_PIX_FMT_NONE) {
+        err = vaapi_get_image_format(hwfc->device_ctx, dst->format, NULL);
+        if (err < 0)
+            return AVERROR(ENOSYS);
+    }
+
+    err = vaapi_map_frame(hwfc, dst, src, flags);
+    if (err)
+        return err;
+
+    err = av_frame_copy_props(dst, src);
+    if (err)
+        return err;
+
+    return 0;
+}
+
+#if CONFIG_LIBDRM
+
+#define DRM_MAP(va, layers, ...) { \
+        VA_FOURCC_ ## va, \
+        layers, \
+        { __VA_ARGS__ } \
+    }
+static const struct {
+    uint32_t va_fourcc;
+    int   nb_layer_formats;
+    uint32_t layer_formats[AV_DRM_MAX_PLANES];
+} vaapi_drm_format_map[] = {
+#ifdef DRM_FORMAT_R8
+    DRM_MAP(NV12, 2, DRM_FORMAT_R8,  DRM_FORMAT_RG88),
+#endif
+    DRM_MAP(NV12, 1, DRM_FORMAT_NV12),
+#if defined(VA_FOURCC_P010) && defined(DRM_FORMAT_R16)
+    DRM_MAP(P010, 2, DRM_FORMAT_R16, DRM_FORMAT_RG1616),
+#endif
+    DRM_MAP(BGRA, 1, DRM_FORMAT_ARGB8888),
+    DRM_MAP(BGRX, 1, DRM_FORMAT_XRGB8888),
+    DRM_MAP(RGBA, 1, DRM_FORMAT_ABGR8888),
+    DRM_MAP(RGBX, 1, DRM_FORMAT_XBGR8888),
+#ifdef VA_FOURCC_ABGR
+    DRM_MAP(ABGR, 1, DRM_FORMAT_RGBA8888),
+    DRM_MAP(XBGR, 1, DRM_FORMAT_RGBX8888),
+#endif
+    DRM_MAP(ARGB, 1, DRM_FORMAT_BGRA8888),
+    DRM_MAP(XRGB, 1, DRM_FORMAT_BGRX8888),
+};
+#undef DRM_MAP
+
+static void vaapi_unmap_from_drm(AVHWFramesContext *dst_fc,
+                                 HWMapDescriptor *hwmap)
+{
+    AVVAAPIDeviceContext *dst_dev = dst_fc->device_ctx->hwctx;
+
+    VASurfaceID surface_id = (VASurfaceID)(uintptr_t)hwmap->priv;
+
+    av_log(dst_fc, AV_LOG_DEBUG, "Destroy surface %#x.\n", surface_id);
+
+    vaDestroySurfaces(dst_dev->display, &surface_id, 1);
+}
+
+static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+                              const AVFrame *src, int flags)
+{
+    AVHWFramesContext      *dst_fc =
+        (AVHWFramesContext*)dst->hw_frames_ctx->data;
+    AVVAAPIDeviceContext  *dst_dev = dst_fc->device_ctx->hwctx;
+    const AVDRMFrameDescriptor *desc;
+    const VAAPIFormatDescriptor *format_desc;
+    VASurfaceID surface_id;
+    VAStatus vas;
+    uint32_t va_fourcc;
+    int err, i, j, k;
+
+    unsigned long buffer_handle;
+    VASurfaceAttribExternalBuffers buffer_desc;
+    VASurfaceAttrib attrs[2] = {
+        {
+            .type  = VASurfaceAttribMemoryType,
+            .flags = VA_SURFACE_ATTRIB_SETTABLE,
+            .value.type    = VAGenericValueTypeInteger,
+            .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME,
+        },
+        {
+            .type  = VASurfaceAttribExternalBufferDescriptor,
+            .flags = VA_SURFACE_ATTRIB_SETTABLE,
+            .value.type    = VAGenericValueTypePointer,
+            .value.value.p = &buffer_desc,
+        }
+    };
+
+    desc = (AVDRMFrameDescriptor*)src->data[0];
+
+    if (desc->nb_objects != 1) {
+        av_log(dst_fc, AV_LOG_ERROR, "VAAPI can only map frames "
+               "made from a single DRM object.\n");
+        return AVERROR(EINVAL);
+    }
+
+    va_fourcc = 0;
+    for (i = 0; i < FF_ARRAY_ELEMS(vaapi_drm_format_map); i++) {
+        if (desc->nb_layers != vaapi_drm_format_map[i].nb_layer_formats)
+            continue;
+        for (j = 0; j < desc->nb_layers; j++) {
+            if (desc->layers[j].format !=
+                vaapi_drm_format_map[i].layer_formats[j])
+                break;
+        }
+        if (j != desc->nb_layers)
+            continue;
+        va_fourcc = vaapi_drm_format_map[i].va_fourcc;
+        break;
+    }
+    if (!va_fourcc) {
+        av_log(dst_fc, AV_LOG_ERROR, "DRM format not supported "
+               "by VAAPI.\n");
+        return AVERROR(EINVAL);
+    }
+
+    av_log(dst_fc, AV_LOG_DEBUG, "Map DRM object %d to VAAPI as "
+           "%08x.\n", desc->objects[0].fd, va_fourcc);
+
+    format_desc = vaapi_format_from_fourcc(va_fourcc);
+    av_assert0(format_desc);
+
+    buffer_handle = desc->objects[0].fd;
+    buffer_desc.pixel_format = va_fourcc;
+    buffer_desc.width        = src_fc->width;
+    buffer_desc.height       = src_fc->height;
+    buffer_desc.data_size    = desc->objects[0].size;
+    buffer_desc.buffers      = &buffer_handle;
+    buffer_desc.num_buffers  = 1;
+    buffer_desc.flags        = 0;
+
+    k = 0;
+    for (i = 0; i < desc->nb_layers; i++) {
+        for (j = 0; j < desc->layers[i].nb_planes; j++) {
+            buffer_desc.pitches[k] = desc->layers[i].planes[j].pitch;
+            buffer_desc.offsets[k] = desc->layers[i].planes[j].offset;
+            ++k;
+        }
+    }
+    buffer_desc.num_planes = k;
+
+    if (format_desc->chroma_planes_swapped &&
+        buffer_desc.num_planes == 3) {
+        FFSWAP(uint32_t, buffer_desc.pitches[1], buffer_desc.pitches[2]);
+        FFSWAP(uint32_t, buffer_desc.offsets[1], buffer_desc.offsets[2]);
+    }
+
+    vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format,
+                           src->width, src->height,
+                           &surface_id, 1,
+                           attrs, FF_ARRAY_ELEMS(attrs));
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(dst_fc, AV_LOG_ERROR, "Failed to create surface from DRM "
+               "object: %d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+    av_log(dst_fc, AV_LOG_DEBUG, "Create surface %#x.\n", surface_id);
+
+    err = ff_hwframe_map_create(dst->hw_frames_ctx, dst, src,
+                                &vaapi_unmap_from_drm,
+                                (void*)(uintptr_t)surface_id);
+    if (err < 0)
+        return err;
+
+    dst->width   = src->width;
+    dst->height  = src->height;
+    dst->data[3] = (uint8_t*)(uintptr_t)surface_id;
+
+    av_log(dst_fc, AV_LOG_DEBUG, "Mapped DRM object %d to "
+           "surface %#x.\n", desc->objects[0].fd, surface_id);
+
+    return 0;
+}
+
+#if VA_CHECK_VERSION(1, 1, 0)
+static void vaapi_unmap_to_drm_esh(AVHWFramesContext *hwfc,
+                                   HWMapDescriptor *hwmap)
+{
+    AVDRMFrameDescriptor *drm_desc = hwmap->priv;
+    int i;
+
+    for (i = 0; i < drm_desc->nb_objects; i++)
+        close(drm_desc->objects[i].fd);
+
+    av_freep(&drm_desc);
+}
+
+static int vaapi_map_to_drm_esh(AVHWFramesContext *hwfc, AVFrame *dst,
+                                const AVFrame *src, int flags)
+{
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VASurfaceID surface_id;
+    VAStatus vas;
+    VADRMPRIMESurfaceDescriptor va_desc;
+    AVDRMFrameDescriptor *drm_desc = NULL;
+    uint32_t export_flags;
+    int err, i, j;
+
+    surface_id = (VASurfaceID)(uintptr_t)src->data[3];
+
+    export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS;
+    if (flags & AV_HWFRAME_MAP_READ)
+        export_flags |= VA_EXPORT_SURFACE_READ_ONLY;
+    if (flags & AV_HWFRAME_MAP_WRITE)
+        export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY;
+
+    vas = vaExportSurfaceHandle(hwctx->display, surface_id,
+                                VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2,
+                                export_flags, &va_desc);
+    if (vas != VA_STATUS_SUCCESS) {
+        if (vas == VA_STATUS_ERROR_UNIMPLEMENTED)
+            return AVERROR(ENOSYS);
+        av_log(hwfc, AV_LOG_ERROR, "Failed to export surface %#x: "
+               "%d (%s).\n", surface_id, vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+
+    drm_desc = av_mallocz(sizeof(*drm_desc));
+    if (!drm_desc) {
+        err = AVERROR(ENOMEM);
+        goto fail;
+    }
+
+    // By some bizarre coincidence, these structures are very similar...
+    drm_desc->nb_objects = va_desc.num_objects;
+    for (i = 0; i < va_desc.num_objects; i++) {
+        drm_desc->objects[i].fd   = va_desc.objects[i].fd;
+        drm_desc->objects[i].size = va_desc.objects[i].size;
+        drm_desc->objects[i].format_modifier =
+            va_desc.objects[i].drm_format_modifier;
+    }
+    drm_desc->nb_layers = va_desc.num_layers;
+    for (i = 0; i < va_desc.num_layers; i++) {
+        drm_desc->layers[i].format    = va_desc.layers[i].drm_format;
+        drm_desc->layers[i].nb_planes = va_desc.layers[i].num_planes;
+        for (j = 0; j < va_desc.layers[i].num_planes; j++) {
+            drm_desc->layers[i].planes[j].object_index =
+                va_desc.layers[i].object_index[j];
+            drm_desc->layers[i].planes[j].offset =
+                va_desc.layers[i].offset[j];
+            drm_desc->layers[i].planes[j].pitch =
+                va_desc.layers[i].pitch[j];
+        }
+    }
+
+    err = ff_hwframe_map_create(src->hw_frames_ctx, dst, src,
+                                &vaapi_unmap_to_drm_esh, drm_desc);
+    if (err < 0)
+        goto fail;
+
+    dst->width   = src->width;
+    dst->height  = src->height;
+    dst->data[0] = (uint8_t*)drm_desc;
+
+    return 0;
+
+fail:
+    for (i = 0; i < va_desc.num_objects; i++)
+        close(va_desc.objects[i].fd);
+    av_freep(&drm_desc);
+    return err;
+}
+#endif
+
+#if VA_CHECK_VERSION(0, 36, 0)
+typedef struct VAAPIDRMImageBufferMapping {
+    VAImage      image;
+    VABufferInfo buffer_info;
+
+    AVDRMFrameDescriptor drm_desc;
+} VAAPIDRMImageBufferMapping;
+
+static void vaapi_unmap_to_drm_abh(AVHWFramesContext *hwfc,
+                                  HWMapDescriptor *hwmap)
+{
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VAAPIDRMImageBufferMapping *mapping = hwmap->priv;
+    VASurfaceID surface_id;
+    VAStatus vas;
+
+    surface_id = (VASurfaceID)(uintptr_t)hwmap->source->data[3];
+    av_log(hwfc, AV_LOG_DEBUG, "Unmap VAAPI surface %#x from DRM.\n",
+           surface_id);
+
+    // DRM PRIME file descriptors are closed by vaReleaseBufferHandle(),
+    // so we shouldn't close them separately.
+
+    vas = vaReleaseBufferHandle(hwctx->display, mapping->image.buf);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to release buffer "
+               "handle of image %#x (derived from surface %#x): "
+               "%d (%s).\n", mapping->image.buf, surface_id,
+               vas, vaErrorStr(vas));
+    }
+
+    vas = vaDestroyImage(hwctx->display, mapping->image.image_id);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to destroy image "
+               "derived from surface %#x: %d (%s).\n",
+               surface_id, vas, vaErrorStr(vas));
+    }
+
+    av_free(mapping);
+}
+
+static int vaapi_map_to_drm_abh(AVHWFramesContext *hwfc, AVFrame *dst,
+                                const AVFrame *src, int flags)
+{
+    AVVAAPIDeviceContext *hwctx = hwfc->device_ctx->hwctx;
+    VAAPIDRMImageBufferMapping *mapping = NULL;
+    VASurfaceID surface_id;
+    VAStatus vas;
+    int err, i, p;
+
+    surface_id = (VASurfaceID)(uintptr_t)src->data[3];
+    av_log(hwfc, AV_LOG_DEBUG, "Map VAAPI surface %#x to DRM.\n",
+           surface_id);
+
+    mapping = av_mallocz(sizeof(*mapping));
+    if (!mapping)
+        return AVERROR(ENOMEM);
+
+    vas = vaDeriveImage(hwctx->display, surface_id,
+                        &mapping->image);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to derive image from "
+               "surface %#x: %d (%s).\n",
+               surface_id, vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail;
+    }
+
+    for (i = 0; i < FF_ARRAY_ELEMS(vaapi_drm_format_map); i++) {
+        if (vaapi_drm_format_map[i].va_fourcc ==
+            mapping->image.format.fourcc)
+            break;
+    }
+    if (i >= FF_ARRAY_ELEMS(vaapi_drm_format_map)) {
+        av_log(hwfc, AV_LOG_ERROR, "No matching DRM format for "
+               "VAAPI format %#x.\n", mapping->image.format.fourcc);
+        err = AVERROR(EINVAL);
+        goto fail_derived;
+    }
+
+    mapping->buffer_info.mem_type =
+        VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME;
+
+    mapping->drm_desc.nb_layers =
+        vaapi_drm_format_map[i].nb_layer_formats;
+    if (mapping->drm_desc.nb_layers > 1) {
+        if (mapping->drm_desc.nb_layers != mapping->image.num_planes) {
+            av_log(hwfc, AV_LOG_ERROR, "Image properties do not match "
+                   "expected format: got %d planes, but expected %d.\n",
+                   mapping->image.num_planes, mapping->drm_desc.nb_layers);
+            err = AVERROR(EINVAL);
+            goto fail_derived;
+        }
+
+        for(p = 0; p < mapping->drm_desc.nb_layers; p++) {
+            mapping->drm_desc.layers[p] = (AVDRMLayerDescriptor) {
+                .format    = vaapi_drm_format_map[i].layer_formats[p],
+                .nb_planes = 1,
+                .planes[0] = {
+                    .object_index = 0,
+                    .offset       = mapping->image.offsets[p],
+                    .pitch        = mapping->image.pitches[p],
+                },
+            };
+        }
+    } else {
+        mapping->drm_desc.layers[0].format =
+            vaapi_drm_format_map[i].layer_formats[0];
+        mapping->drm_desc.layers[0].nb_planes = mapping->image.num_planes;
+        for (p = 0; p < mapping->image.num_planes; p++) {
+            mapping->drm_desc.layers[0].planes[p] = (AVDRMPlaneDescriptor) {
+                .object_index = 0,
+                .offset       = mapping->image.offsets[p],
+                .pitch        = mapping->image.pitches[p],
+            };
+        }
+    }
+
+    vas = vaAcquireBufferHandle(hwctx->display, mapping->image.buf,
+                                &mapping->buffer_info);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(hwfc, AV_LOG_ERROR, "Failed to get buffer "
+               "handle from image %#x (derived from surface %#x): "
+               "%d (%s).\n", mapping->image.buf, surface_id,
+               vas, vaErrorStr(vas));
+        err = AVERROR(EIO);
+        goto fail_derived;
+    }
+
+    av_log(hwfc, AV_LOG_DEBUG, "DRM PRIME fd is %ld.\n",
+           mapping->buffer_info.handle);
+
+    mapping->drm_desc.nb_objects = 1;
+    mapping->drm_desc.objects[0] = (AVDRMObjectDescriptor) {
+        .fd   = mapping->buffer_info.handle,
+        .size = mapping->image.data_size,
+        // There is no way to get the format modifier with this API.
+        .format_modifier = DRM_FORMAT_MOD_INVALID,
+    };
+
+    err = ff_hwframe_map_create(src->hw_frames_ctx,
+                                dst, src, &vaapi_unmap_to_drm_abh,
+                                mapping);
+    if (err < 0)
+        goto fail_mapped;
+
+    dst->data[0] = (uint8_t*)&mapping->drm_desc;
+    dst->width   = src->width;
+    dst->height  = src->height;
+
+    return 0;
+
+fail_mapped:
+    vaReleaseBufferHandle(hwctx->display, mapping->image.buf);
+fail_derived:
+    vaDestroyImage(hwctx->display, mapping->image.image_id);
+fail:
+    av_freep(&mapping);
+    return err;
+}
+#endif
+
+static int vaapi_map_to_drm(AVHWFramesContext *hwfc, AVFrame *dst,
+                            const AVFrame *src, int flags)
+{
+#if VA_CHECK_VERSION(1, 1, 0)
+    int err;
+    err = vaapi_map_to_drm_esh(hwfc, dst, src, flags);
+    if (err != AVERROR(ENOSYS))
+        return err;
+#endif
+#if VA_CHECK_VERSION(0, 36, 0)
+    return vaapi_map_to_drm_abh(hwfc, dst, src, flags);
+#endif
+    return AVERROR(ENOSYS);
+}
+
+#endif /* CONFIG_LIBDRM */
+
+static int vaapi_map_to(AVHWFramesContext *hwfc, AVFrame *dst,
+                        const AVFrame *src, int flags)
+{
+    switch (src->format) {
+#if CONFIG_LIBDRM
+    case AV_PIX_FMT_DRM_PRIME:
+        return vaapi_map_from_drm(hwfc, dst, src, flags);
+#endif
+    default:
+        return AVERROR(ENOSYS);
+    }
+}
+
+static int vaapi_map_from(AVHWFramesContext *hwfc, AVFrame *dst,
+                          const AVFrame *src, int flags)
+{
+    switch (dst->format) {
+#if CONFIG_LIBDRM
+    case AV_PIX_FMT_DRM_PRIME:
+        return vaapi_map_to_drm(hwfc, dst, src, flags);
+#endif
+    default:
+        return vaapi_map_to_memory(hwfc, dst, src, flags);
+    }
+}
+
+static void vaapi_device_free(AVHWDeviceContext *ctx)
+{
+    AVVAAPIDeviceContext *hwctx = ctx->hwctx;
+    VAAPIDevicePriv      *priv  = ctx->user_opaque;
+
+    if (hwctx->display)
+        vaTerminate(hwctx->display);
+
+#if HAVE_VAAPI_X11
+    if (priv->x11_display)
+        XCloseDisplay(priv->x11_display);
+#endif
+
+    if (priv->drm_fd >= 0)
+        close(priv->drm_fd);
+
+    av_freep(&priv);
+}
+
+#if CONFIG_VAAPI_1
+static void vaapi_device_log_error(void *context, const char *message)
+{
+    AVHWDeviceContext *ctx = context;
+
+    av_log(ctx, AV_LOG_ERROR, "libva: %s", message);
+}
+
+static void vaapi_device_log_info(void *context, const char *message)
+{
+    AVHWDeviceContext *ctx = context;
+
+    av_log(ctx, AV_LOG_VERBOSE, "libva: %s", message);
+}
+#endif
+
+static int vaapi_device_connect(AVHWDeviceContext *ctx,
+                                VADisplay display)
+{
+    AVVAAPIDeviceContext *hwctx = ctx->hwctx;
+    int major, minor;
+    VAStatus vas;
+
+#if CONFIG_VAAPI_1
+    vaSetErrorCallback(display, &vaapi_device_log_error, ctx);
+    vaSetInfoCallback (display, &vaapi_device_log_info,  ctx);
+#endif
+
+    hwctx->display = display;
+
+    vas = vaInitialize(display, &major, &minor);
+    if (vas != VA_STATUS_SUCCESS) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to initialise VAAPI "
+               "connection: %d (%s).\n", vas, vaErrorStr(vas));
+        return AVERROR(EIO);
+    }
+    av_log(ctx, AV_LOG_VERBOSE, "Initialised VAAPI connection: "
+           "version %d.%d\n", major, minor);
+
+    return 0;
+}
+
+static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
+                               AVDictionary *opts, int flags)
+{
+    VAAPIDevicePriv *priv;
+    VADisplay display = NULL;
+    const AVDictionaryEntry *ent;
+    int try_drm, try_x11, try_all;
+
+    priv = av_mallocz(sizeof(*priv));
+    if (!priv)
+        return AVERROR(ENOMEM);
+
+    priv->drm_fd = -1;
+
+    ctx->user_opaque = priv;
+    ctx->free        = vaapi_device_free;
+
+    ent = av_dict_get(opts, "connection_type", NULL, 0);
+    if (ent) {
+        try_all = try_drm = try_x11 = 0;
+        if (!strcmp(ent->value, "drm")) {
+            try_drm = 1;
+        } else if (!strcmp(ent->value, "x11")) {
+            try_x11 = 1;
+        } else {
+            av_log(ctx, AV_LOG_ERROR, "Invalid connection type %s.\n",
+                   ent->value);
+            return AVERROR(EINVAL);
+        }
+    } else {
+        try_all = 1;
+        try_drm = HAVE_VAAPI_DRM;
+        try_x11 = HAVE_VAAPI_X11;
+    }
+
+#if HAVE_VAAPI_DRM
+    while (!display && try_drm) {
+        // If the device is specified, try to open it as a DRM device node.
+        // If not, look for a usable render node, possibly restricted to those
+        // using a specified kernel driver.
+        int loglevel = try_all ? AV_LOG_VERBOSE : AV_LOG_ERROR;
+        if (device) {
+            priv->drm_fd = open(device, O_RDWR);
+            if (priv->drm_fd < 0) {
+                av_log(ctx, loglevel, "Failed to open %s as "
+                       "DRM device node.\n", device);
+                break;
+            }
+        } else {
+            char path[64];
+            int n, max_devices = 8;
+#if CONFIG_LIBDRM
+            const AVDictionaryEntry *kernel_driver;
+            kernel_driver = av_dict_get(opts, "kernel_driver", NULL, 0);
+#endif
+            for (n = 0; n < max_devices; n++) {
+                snprintf(path, sizeof(path),
+                         "/dev/dri/renderD%d", 128 + n);
+                priv->drm_fd = open(path, O_RDWR);
+                if (priv->drm_fd < 0) {
+                    av_log(ctx, AV_LOG_VERBOSE, "Cannot open "
+                           "DRM render node for device %d.\n", n);
+                    break;
+                }
+#if CONFIG_LIBDRM
+                if (kernel_driver) {
+                    drmVersion *info;
+                    info = drmGetVersion(priv->drm_fd);
+                    if (strcmp(kernel_driver->value, info->name)) {
+                        av_log(ctx, AV_LOG_VERBOSE, "Ignoring device %d "
+                               "with non-matching kernel driver (%s).\n",
+                               n, info->name);
+                        drmFreeVersion(info);
+                        close(priv->drm_fd);
+                        priv->drm_fd = -1;
+                        continue;
+                    }
+                    av_log(ctx, AV_LOG_VERBOSE, "Trying to use "
+                           "DRM render node for device %d, "
+                           "with matching kernel driver (%s).\n",
+                           n, info->name);
+                    drmFreeVersion(info);
+                } else
+#endif
+                {
+                    av_log(ctx, AV_LOG_VERBOSE, "Trying to use "
+                           "DRM render node for device %d.\n", n);
+                }
+                break;
+            }
+            if (n >= max_devices)
+                break;
+        }
+
+        display = vaGetDisplayDRM(priv->drm_fd);
+        if (!display) {
+            av_log(ctx, AV_LOG_VERBOSE, "Cannot open a VA display "
+                   "from DRM device %s.\n", device);
+            return AVERROR_EXTERNAL;
+        }
+        break;
+    }
+#endif
+
+#if HAVE_VAAPI_X11
+    if (!display && try_x11) {
+        // Try to open the device as an X11 display.
+        priv->x11_display = XOpenDisplay(device);
+        if (!priv->x11_display) {
+            av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display "
+                   "%s.\n", XDisplayName(device));
+        } else {
+            display = vaGetDisplay(priv->x11_display);
+            if (!display) {
+                av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display "
+                       "from X11 display %s.\n", XDisplayName(device));
+                return AVERROR_UNKNOWN;
+            }
+
+            av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via "
+                   "X11 display %s.\n", XDisplayName(device));
+        }
+    }
+#endif
+
+    if (!display) {
+        if (device)
+            av_log(ctx, AV_LOG_ERROR, "No VA display found for "
+                   "device %s.\n", device);
+        else
+            av_log(ctx, AV_LOG_ERROR, "No VA display found for "
+                   "any default device.\n");
+        return AVERROR(EINVAL);
+    }
+
+    ent = av_dict_get(opts, "driver", NULL, 0);
+    if (ent) {
+#if VA_CHECK_VERSION(0, 38, 0)
+        VAStatus vas;
+        vas = vaSetDriverName(display, ent->value);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "Failed to set driver name to "
+                   "%s: %d (%s).\n", ent->value, vas, vaErrorStr(vas));
+            vaTerminate(display);
+            return AVERROR_EXTERNAL;
+        }
+#else
+        av_log(ctx, AV_LOG_WARNING, "Driver name setting is not "
+               "supported with this VAAPI version.\n");
+#endif
+    }
+
+    return vaapi_device_connect(ctx, display);
+}
+
+static int vaapi_device_derive(AVHWDeviceContext *ctx,
+                               AVHWDeviceContext *src_ctx, int flags)
+{
+#if HAVE_VAAPI_DRM
+    if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) {
+        AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
+        VADisplay *display;
+        VAAPIDevicePriv *priv;
+
+        if (src_hwctx->fd < 0) {
+            av_log(ctx, AV_LOG_ERROR, "DRM instance requires an associated "
+                   "device to derive a VA display from.\n");
+            return AVERROR(EINVAL);
+        }
+
+        priv = av_mallocz(sizeof(*priv));
+        if (!priv)
+            return AVERROR(ENOMEM);
+
+        // Inherits the fd from the source context, which will close it.
+        priv->drm_fd = -1;
+
+        ctx->user_opaque = priv;
+        ctx->free        = &vaapi_device_free;
+
+        display = vaGetDisplayDRM(src_hwctx->fd);
+        if (!display) {
+            av_log(ctx, AV_LOG_ERROR, "Failed to open a VA display from "
+                   "DRM device.\n");
+            return AVERROR(EIO);
+        }
+
+        return vaapi_device_connect(ctx, display);
+    }
+#endif
+    return AVERROR(ENOSYS);
+}
+
+const HWContextType ff_hwcontext_type_vaapi = {
+    .type                   = AV_HWDEVICE_TYPE_VAAPI,
+    .name                   = "VAAPI",
+
+    .device_hwctx_size      = sizeof(AVVAAPIDeviceContext),
+    .device_priv_size       = sizeof(VAAPIDeviceContext),
+    .device_hwconfig_size   = sizeof(AVVAAPIHWConfig),
+    .frames_hwctx_size      = sizeof(AVVAAPIFramesContext),
+    .frames_priv_size       = sizeof(VAAPIFramesContext),
+
+    .device_create          = &vaapi_device_create,
+    .device_derive          = &vaapi_device_derive,
+    .device_init            = &vaapi_device_init,
+    .device_uninit          = &vaapi_device_uninit,
+    .frames_get_constraints = &vaapi_frames_get_constraints,
+    .frames_init            = &vaapi_frames_init,
+    .frames_uninit          = &vaapi_frames_uninit,
+    .frames_get_buffer      = &vaapi_get_buffer,
+    .transfer_get_formats   = &vaapi_transfer_get_formats,
+    .transfer_data_to       = &vaapi_transfer_data_to,
+    .transfer_data_from     = &vaapi_transfer_data_from,
+    .map_to                 = &vaapi_map_to,
+    .map_from               = &vaapi_map_from,
+
+    .pix_fmts = (const enum AVPixelFormat[]) {
+        AV_PIX_FMT_VAAPI,
+        AV_PIX_FMT_NONE
+    },
+};
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavutil/hwcontext_vaapi.h firefox-85.0+build1/media/ffvpx/libavutil/hwcontext_vaapi.h
--- firefox-84.0.2+build1/media/ffvpx/libavutil/hwcontext_vaapi.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavutil/hwcontext_vaapi.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_HWCONTEXT_VAAPI_H
+#define AVUTIL_HWCONTEXT_VAAPI_H
+
+#include <va/va.h>
+
+/**
+ * @file
+ * API-specific header for AV_HWDEVICE_TYPE_VAAPI.
+ *
+ * Dynamic frame pools are supported, but note that any pool used as a render
+ * target is required to be of fixed size in order to be be usable as an
+ * argument to vaCreateContext().
+ *
+ * For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
+ * with the data pointer set to a VASurfaceID.
+ */
+
+enum {
+    /**
+     * The quirks field has been set by the user and should not be detected
+     * automatically by av_hwdevice_ctx_init().
+     */
+    AV_VAAPI_DRIVER_QUIRK_USER_SET = (1 << 0),
+    /**
+     * The driver does not destroy parameter buffers when they are used by
+     * vaRenderPicture().  Additional code will be required to destroy them
+     * separately afterwards.
+     */
+    AV_VAAPI_DRIVER_QUIRK_RENDER_PARAM_BUFFERS = (1 << 1),
+
+    /**
+     * The driver does not support the VASurfaceAttribMemoryType attribute,
+     * so the surface allocation code will not try to use it.
+     */
+    AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE = (1 << 2),
+
+    /**
+     * The driver does not support surface attributes at all.
+     * The surface allocation code will never pass them to surface allocation,
+     * and the results of the vaQuerySurfaceAttributes() call will be faked.
+     */
+    AV_VAAPI_DRIVER_QUIRK_SURFACE_ATTRIBUTES = (1 << 3),
+};
+
+/**
+ * VAAPI connection details.
+ *
+ * Allocated as AVHWDeviceContext.hwctx
+ */
+typedef struct AVVAAPIDeviceContext {
+    /**
+     * The VADisplay handle, to be filled by the user.
+     */
+    VADisplay display;
+    /**
+     * Driver quirks to apply - this is filled by av_hwdevice_ctx_init(),
+     * with reference to a table of known drivers, unless the
+     * AV_VAAPI_DRIVER_QUIRK_USER_SET bit is already present.  The user
+     * may need to refer to this field when performing any later
+     * operations using VAAPI with the same VADisplay.
+     */
+    unsigned int driver_quirks;
+} AVVAAPIDeviceContext;
+
+/**
+ * VAAPI-specific data associated with a frame pool.
+ *
+ * Allocated as AVHWFramesContext.hwctx.
+ */
+typedef struct AVVAAPIFramesContext {
+    /**
+     * Set by the user to apply surface attributes to all surfaces in
+     * the frame pool.  If null, default settings are used.
+     */
+    VASurfaceAttrib *attributes;
+    int           nb_attributes;
+    /**
+     * The surfaces IDs of all surfaces in the pool after creation.
+     * Only valid if AVHWFramesContext.initial_pool_size was positive.
+     * These are intended to be used as the render_targets arguments to
+     * vaCreateContext().
+     */
+    VASurfaceID     *surface_ids;
+    int           nb_surfaces;
+} AVVAAPIFramesContext;
+
+/**
+ * VAAPI hardware pipeline configuration details.
+ *
+ * Allocated with av_hwdevice_hwconfig_alloc().
+ */
+typedef struct AVVAAPIHWConfig {
+    /**
+     * ID of a VAAPI pipeline configuration.
+     */
+    VAConfigID config_id;
+} AVVAAPIHWConfig;
+
+#endif /* AVUTIL_HWCONTEXT_VAAPI_H */
diff -Nru firefox-84.0.2+build1/media/ffvpx/libavutil/moz.build firefox-85.0+build1/media/ffvpx/libavutil/moz.build
--- firefox-84.0.2+build1/media/ffvpx/libavutil/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/libavutil/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -45,6 +45,11 @@
     'time.c',
     'utils.c'
 ]
+if CONFIG['MOZ_WAYLAND']:
+    SOURCES += [
+        'hwcontext_vaapi.c',
+    ]
+    USE_LIBS += ['mozva']
 
 if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
     SOURCES += [
diff -Nru firefox-84.0.2+build1/media/ffvpx/moz.build firefox-85.0+build1/media/ffvpx/moz.build
--- firefox-84.0.2+build1/media/ffvpx/moz.build	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -11,3 +11,8 @@
     'libavutil',
     'libavcodec'
 ]
+
+if CONFIG['MOZ_WAYLAND']:
+    DIRS += [
+        'mozva',
+    ]
diff -Nru firefox-84.0.2+build1/media/ffvpx/mozva/moz.build firefox-85.0+build1/media/ffvpx/mozva/moz.build
--- firefox-84.0.2+build1/media/ffvpx/mozva/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/mozva/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,13 @@
+# -*- 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/.
+
+SOURCES += [
+    'mozva.c',
+]
+
+LOCAL_INCLUDES += ['/media/ffvpx']
+
+Library('mozva')
diff -Nru firefox-84.0.2+build1/media/ffvpx/mozva/mozva.c firefox-85.0+build1/media/ffvpx/mozva/mozva.c
--- firefox-84.0.2+build1/media/ffvpx/mozva/mozva.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/mozva/mozva.c	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,406 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#pragma GCC visibility push(default)
+#include <va/va.h>
+#pragma GCC visibility pop
+
+#include "mozilla/Types.h"
+#include <dlfcn.h>
+#include <pthread.h>
+#include <stdlib.h>
+
+#define GET_FUNC(func, lib) (func##Fn = dlsym(lib, #func))
+
+#define IS_FUNC_LOADED(func) (func##Fn != NULL)
+
+static VAStatus (*vaDestroyBufferFn)(VADisplay dpy, VABufferID buffer_id);
+static VAStatus (*vaBeginPictureFn)(VADisplay dpy, VAContextID context,
+                                    VASurfaceID render_target);
+static VAStatus (*vaEndPictureFn)(VADisplay dpy, VAContextID context);
+static VAStatus (*vaRenderPictureFn)(VADisplay dpy, VAContextID context,
+                                     VABufferID* buffers, int num_buffers);
+static int (*vaMaxNumProfilesFn)(VADisplay dpy);
+static VAStatus (*vaCreateContextFn)(VADisplay dpy, VAConfigID config_id,
+                                     int picture_width, int picture_height,
+                                     int flag, VASurfaceID* render_targets,
+                                     int num_render_targets,
+                                     VAContextID* context /* out */);
+static VAStatus (*vaDestroyContextFn)(VADisplay dpy, VAContextID context);
+static VAStatus (*vaCreateBufferFn)(VADisplay dpy, VAContextID context,
+                                    VABufferType type,         /* in */
+                                    unsigned int size,         /* in */
+                                    unsigned int num_elements, /* in */
+                                    void* data,                /* in */
+                                    VABufferID* buf_id /* out */);
+static VAStatus (*vaQuerySurfaceAttributesFn)(VADisplay dpy, VAConfigID config,
+                                              VASurfaceAttrib* attrib_list,
+                                              unsigned int* num_attribs);
+static VAStatus (*vaQueryConfigProfilesFn)(VADisplay dpy,
+                                           VAProfile* profile_list, /* out */
+                                           int* num_profiles /* out */);
+static const char* (*vaErrorStrFn)(VAStatus error_status);
+static VAStatus (*vaCreateConfigFn)(VADisplay dpy, VAProfile profile,
+                                    VAEntrypoint entrypoint,
+                                    VAConfigAttrib* attrib_list,
+                                    int num_attribs,
+                                    VAConfigID* config_id /* out */);
+static VAStatus (*vaDestroyConfigFn)(VADisplay dpy, VAConfigID config_id);
+static int (*vaMaxNumImageFormatsFn)(VADisplay dpy);
+static VAStatus (*vaQueryImageFormatsFn)(VADisplay dpy,
+                                         VAImageFormat* format_list, /* out */
+                                         int* num_formats /* out */);
+static const char* (*vaQueryVendorStringFn)(VADisplay dpy);
+static VAStatus (*vaDestroySurfacesFn)(VADisplay dpy, VASurfaceID* surfaces,
+                                       int num_surfaces);
+static VAStatus (*vaCreateSurfacesFn)(VADisplay dpy, unsigned int format,
+                                      unsigned int width, unsigned int height,
+                                      VASurfaceID* surfaces,
+                                      unsigned int num_surfaces,
+                                      VASurfaceAttrib* attrib_list,
+                                      unsigned int num_attribs);
+static VAStatus (*vaDeriveImageFn)(VADisplay dpy, VASurfaceID surface,
+                                   VAImage* image /* out */);
+static VAStatus (*vaDestroyImageFn)(VADisplay dpy, VAImageID image);
+static VAStatus (*vaPutImageFn)(VADisplay dpy, VASurfaceID surface,
+                                VAImageID image, int src_x, int src_y,
+                                unsigned int src_width, unsigned int src_height,
+                                int dest_x, int dest_y, unsigned int dest_width,
+                                unsigned int dest_height);
+static VAStatus (*vaSyncSurfaceFn)(VADisplay dpy, VASurfaceID render_target);
+static VAStatus (*vaCreateImageFn)(VADisplay dpy, VAImageFormat* format,
+                                   int width, int height,
+                                   VAImage* image /* out */);
+static VAStatus (*vaGetImageFn)(
+    VADisplay dpy, VASurfaceID surface,
+    int x,                     /* coordinates of the upper left source pixel */
+    int y, unsigned int width, /* width and height of the region */
+    unsigned int height, VAImageID image);
+static VAStatus (*vaMapBufferFn)(VADisplay dpy, VABufferID buf_id, /* in */
+                                 void** pbuf /* out */);
+static VAStatus (*vaUnmapBufferFn)(VADisplay dpy, VABufferID buf_id /* in */);
+static VAStatus (*vaTerminateFn)(VADisplay dpy);
+static VAStatus (*vaInitializeFn)(VADisplay dpy, int* major_version, /* out */
+                                  int* minor_version /* out */);
+static VAStatus (*vaSetDriverNameFn)(VADisplay dpy, char* driver_name);
+
+int LoadVALibrary() {
+  static pthread_mutex_t sVALock = PTHREAD_MUTEX_INITIALIZER;
+  static void* sVALib = NULL;
+  static int sVAInitialized = 0;
+  static int sVALoaded = 0;
+
+  pthread_mutex_lock(&sVALock);
+
+  if (!sVAInitialized) {
+    sVAInitialized = 1;
+    sVALib = dlopen("libva.so.2", RTLD_LAZY);
+    if (!sVALib) {
+      pthread_mutex_unlock(&sVALock);
+      return 0;
+    }
+    GET_FUNC(vaDestroyBuffer, sVALib);
+    GET_FUNC(vaBeginPicture, sVALib);
+    GET_FUNC(vaEndPicture, sVALib);
+    GET_FUNC(vaRenderPicture, sVALib);
+    GET_FUNC(vaMaxNumProfiles, sVALib);
+    GET_FUNC(vaCreateContext, sVALib);
+    GET_FUNC(vaDestroyContext, sVALib);
+    GET_FUNC(vaCreateBuffer, sVALib);
+    GET_FUNC(vaQuerySurfaceAttributes, sVALib);
+    GET_FUNC(vaQueryConfigProfiles, sVALib);
+    GET_FUNC(vaErrorStr, sVALib);
+    GET_FUNC(vaCreateConfig, sVALib);
+    GET_FUNC(vaDestroyConfig, sVALib);
+    GET_FUNC(vaMaxNumImageFormats, sVALib);
+    GET_FUNC(vaQueryImageFormats, sVALib);
+    GET_FUNC(vaQueryVendorString, sVALib);
+    GET_FUNC(vaDestroySurfaces, sVALib);
+    GET_FUNC(vaCreateSurfaces, sVALib);
+    GET_FUNC(vaDeriveImage, sVALib);
+    GET_FUNC(vaDestroyImage, sVALib);
+    GET_FUNC(vaPutImage, sVALib);
+    GET_FUNC(vaSyncSurface, sVALib);
+    GET_FUNC(vaCreateImage, sVALib);
+    GET_FUNC(vaGetImage, sVALib);
+    GET_FUNC(vaMapBuffer, sVALib);
+    GET_FUNC(vaUnmapBuffer, sVALib);
+    GET_FUNC(vaTerminate, sVALib);
+    GET_FUNC(vaInitialize, sVALib);
+    GET_FUNC(vaSetDriverName, sVALib);
+
+    sVALoaded =
+        (IS_FUNC_LOADED(vaDestroyBuffer) && IS_FUNC_LOADED(vaBeginPicture) &&
+         IS_FUNC_LOADED(vaEndPicture) && IS_FUNC_LOADED(vaRenderPicture) &&
+         IS_FUNC_LOADED(vaMaxNumProfiles) && IS_FUNC_LOADED(vaCreateContext) &&
+         IS_FUNC_LOADED(vaDestroyContext) && IS_FUNC_LOADED(vaCreateBuffer) &&
+         IS_FUNC_LOADED(vaQuerySurfaceAttributes) &&
+         IS_FUNC_LOADED(vaQueryConfigProfiles) && IS_FUNC_LOADED(vaErrorStr) &&
+         IS_FUNC_LOADED(vaCreateConfig) && IS_FUNC_LOADED(vaDestroyConfig) &&
+         IS_FUNC_LOADED(vaMaxNumImageFormats) &&
+         IS_FUNC_LOADED(vaQueryImageFormats) &&
+         IS_FUNC_LOADED(vaQueryVendorString) &&
+         IS_FUNC_LOADED(vaDestroySurfaces) &&
+         IS_FUNC_LOADED(vaCreateSurfaces) && IS_FUNC_LOADED(vaDeriveImage) &&
+         IS_FUNC_LOADED(vaDestroyImage) && IS_FUNC_LOADED(vaPutImage) &&
+         IS_FUNC_LOADED(vaSyncSurface) && IS_FUNC_LOADED(vaCreateImage) &&
+         IS_FUNC_LOADED(vaGetImage) && IS_FUNC_LOADED(vaMapBuffer) &&
+         IS_FUNC_LOADED(vaUnmapBuffer) && IS_FUNC_LOADED(vaTerminate) &&
+         IS_FUNC_LOADED(vaInitialize) && IS_FUNC_LOADED(vaSetDriverName));
+  }
+  pthread_mutex_unlock(&sVALock);
+  return sVALoaded;
+}
+
+#pragma GCC visibility push(default)
+
+VAStatus vaDestroyBuffer(VADisplay dpy, VABufferID buffer_id) {
+  if (LoadVALibrary()) {
+    return vaDestroyBufferFn(dpy, buffer_id);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaBeginPicture(VADisplay dpy, VAContextID context,
+                        VASurfaceID render_target) {
+  if (LoadVALibrary()) {
+    return vaBeginPictureFn(dpy, context, render_target);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaEndPicture(VADisplay dpy, VAContextID context) {
+  if (LoadVALibrary()) {
+    return vaEndPictureFn(dpy, context);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaRenderPicture(VADisplay dpy, VAContextID context,
+                         VABufferID* buffers, int num_buffers) {
+  if (LoadVALibrary()) {
+    return vaRenderPictureFn(dpy, context, buffers, num_buffers);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+int vaMaxNumProfiles(VADisplay dpy) {
+  if (LoadVALibrary()) {
+    return vaMaxNumProfilesFn(dpy);
+  }
+  return 0;
+}
+
+VAStatus vaCreateContext(VADisplay dpy, VAConfigID config_id, int picture_width,
+                         int picture_height, int flag,
+                         VASurfaceID* render_targets, int num_render_targets,
+                         VAContextID* context /* out */) {
+  if (LoadVALibrary()) {
+    return vaCreateContextFn(dpy, config_id, picture_width, picture_height,
+                             flag, render_targets, num_render_targets, context);
+  }
+  *context = 0;
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaDestroyContext(VADisplay dpy, VAContextID context) {
+  if (LoadVALibrary()) {
+    return vaDestroyContextFn(dpy, context);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaCreateBuffer(VADisplay dpy, VAContextID context,
+                        VABufferType type,         /* in */
+                        unsigned int size,         /* in */
+                        unsigned int num_elements, /* in */
+                        void* data,                /* in */
+                        VABufferID* buf_id /* out */) {
+  if (LoadVALibrary()) {
+    return vaCreateBufferFn(dpy, context, type, size, num_elements, data,
+                            buf_id);
+  }
+  *buf_id = 0;
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaQuerySurfaceAttributes(VADisplay dpy, VAConfigID config,
+                                  VASurfaceAttrib* attrib_list,
+                                  unsigned int* num_attribs) {
+  if (LoadVALibrary()) {
+    return vaQuerySurfaceAttributesFn(dpy, config, attrib_list, num_attribs);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaQueryConfigProfiles(VADisplay dpy, VAProfile* profile_list, /* out */
+                               int* num_profiles /* out */) {
+  if (LoadVALibrary()) {
+    return vaQueryConfigProfilesFn(dpy, profile_list, num_profiles);
+  }
+  *num_profiles = 0;
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+const char* vaErrorStr(VAStatus error_status) {
+  if (LoadVALibrary()) {
+    return vaErrorStrFn(error_status);
+  }
+  static char tmp[] = "Unimplemented";
+  return tmp;
+}
+
+VAStatus vaCreateConfig(VADisplay dpy, VAProfile profile,
+                        VAEntrypoint entrypoint, VAConfigAttrib* attrib_list,
+                        int num_attribs, VAConfigID* config_id /* out */) {
+  if (LoadVALibrary()) {
+    return vaCreateConfigFn(dpy, profile, entrypoint, attrib_list, num_attribs,
+                            config_id);
+  }
+  *config_id = 0;
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaDestroyConfig(VADisplay dpy, VAConfigID config_id) {
+  if (LoadVALibrary()) {
+    return vaDestroyConfigFn(dpy, config_id);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+int vaMaxNumImageFormats(VADisplay dpy) {
+  if (LoadVALibrary()) {
+    return vaMaxNumImageFormatsFn(dpy);
+  }
+  return 0;
+}
+
+VAStatus vaQueryImageFormats(VADisplay dpy, VAImageFormat* format_list,
+                             int* num_formats) {
+  if (LoadVALibrary()) {
+    return vaQueryImageFormatsFn(dpy, format_list, num_formats);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+const char* vaQueryVendorString(VADisplay dpy) {
+  if (LoadVALibrary()) {
+    return vaQueryVendorStringFn(dpy);
+  }
+  return NULL;
+}
+
+VAStatus vaDestroySurfaces(VADisplay dpy, VASurfaceID* surfaces,
+                           int num_surfaces) {
+  if (LoadVALibrary()) {
+    return vaDestroySurfacesFn(dpy, surfaces, num_surfaces);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaCreateSurfaces(VADisplay dpy, unsigned int format,
+                          unsigned int width, unsigned int height,
+                          VASurfaceID* surfaces, unsigned int num_surfaces,
+                          VASurfaceAttrib* attrib_list,
+                          unsigned int num_attribs) {
+  if (LoadVALibrary()) {
+    return vaCreateSurfacesFn(dpy, format, width, height, surfaces,
+                              num_surfaces, attrib_list, num_attribs);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaDeriveImage(VADisplay dpy, VASurfaceID surface,
+                       VAImage* image /* out */) {
+  if (LoadVALibrary()) {
+    return vaDeriveImageFn(dpy, surface, image);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaDestroyImage(VADisplay dpy, VAImageID image) {
+  if (LoadVALibrary()) {
+    return vaDestroyImageFn(dpy, image);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaPutImage(VADisplay dpy, VASurfaceID surface, VAImageID image,
+                    int src_x, int src_y, unsigned int src_width,
+                    unsigned int src_height, int dest_x, int dest_y,
+                    unsigned int dest_width, unsigned int dest_height) {
+  if (LoadVALibrary()) {
+    return vaPutImageFn(dpy, surface, image, src_x, src_y, src_width,
+                        src_height, dest_x, dest_y, dest_width, dest_height);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaSyncSurface(VADisplay dpy, VASurfaceID render_target) {
+  if (LoadVALibrary()) {
+    return vaSyncSurfaceFn(dpy, render_target);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaCreateImage(VADisplay dpy, VAImageFormat* format, int width,
+                       int height, VAImage* image /* out */) {
+  if (LoadVALibrary()) {
+    return vaCreateImageFn(dpy, format, width, height, image);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaGetImage(VADisplay dpy, VASurfaceID surface,
+                    int x, /* coordinates of the upper left source pixel */
+                    int y,
+                    unsigned int width, /* width and height of the region */
+                    unsigned int height, VAImageID image) {
+  if (LoadVALibrary()) {
+    return vaGetImageFn(dpy, surface, x, y, width, height, image);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaMapBuffer(VADisplay dpy, VABufferID buf_id, /* in */
+                     void** pbuf /* out */) {
+  if (LoadVALibrary()) {
+    return vaMapBufferFn(dpy, buf_id, pbuf);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaUnmapBuffer(VADisplay dpy, VABufferID buf_id /* in */) {
+  if (LoadVALibrary()) {
+    return vaUnmapBufferFn(dpy, buf_id);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaTerminate(VADisplay dpy) {
+  if (LoadVALibrary()) {
+    return vaTerminateFn(dpy);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaInitialize(VADisplay dpy, int* major_version, /* out */
+                      int* minor_version /* out */) {
+  if (LoadVALibrary()) {
+    return vaInitializeFn(dpy, major_version, minor_version);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+VAStatus vaSetDriverName(VADisplay dpy, char* driver_name) {
+  if (LoadVALibrary()) {
+    return vaSetDriverNameFn(dpy, driver_name);
+  }
+  return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
+
+#pragma GCC visibility pop
diff -Nru firefox-84.0.2+build1/media/ffvpx/README_MOZILLA firefox-85.0+build1/media/ffvpx/README_MOZILLA
--- firefox-84.0.2+build1/media/ffvpx/README_MOZILLA	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/README_MOZILLA	2021-01-18 19:58:18.000000000 +0000
@@ -56,3 +56,5 @@
 Then apply patch.diff on the ffvpx tree.
 
 Compilation will reveal if any files are missing.
+
+Apply linux-vaapi-build.patch patch to enable build VA-API support for Linux.
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/README firefox-85.0+build1/media/ffvpx/va/README
--- firefox-84.0.2+build1/media/ffvpx/va/README	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/README	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+There are libva headers from libva 1.7.0 used to build vaapi support for in-tree ffvpx.
+Apply va.patch when you update it to new versions.
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/va_dec_vp8.h firefox-85.0+build1/media/ffvpx/va/va_dec_vp8.h
--- firefox-84.0.2+build1/media/ffvpx/va/va_dec_vp8.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/va_dec_vp8.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2007-2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file va_dec_vp.h
+ * \brief VP8 decoding API
+ *
+ * This file contains the \ref api_dec_vp8 "VP8 decoding API".
+ */
+
+#ifndef VA_DEC_VP8_H
+#define VA_DEC_VP8_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \defgroup api_dec_vp8 VP8 decoding API
+ *
+ * @{
+ */
+
+/**
+ * \brief VPX Bool Coder Context structure 
+ *
+ * This common structure is defined for potential sharing by other VP formats
+ *
+ */
+typedef struct _VABoolCoderContextVPX
+{
+    /* partition 0 "range" */
+    uint8_t range;
+    /* partition 0 "value" */
+    uint8_t value;
+    /*
+     * 'partition 0 number of shifts before an output byte is available'
+     * it is the number of remaining bits in 'value' for decoding, range [0, 7].
+     */
+
+    uint8_t count;
+} VABoolCoderContextVPX;
+
+/**
+ * \brief VP8 Decoding Picture Parameter Buffer Structure
+ *
+ * This structure conveys frame level parameters and should be sent once
+ * per frame.
+ *
+ */
+typedef struct  _VAPictureParameterBufferVP8
+{
+    /* frame width in pixels */
+    uint32_t frame_width;
+    /* frame height in pixels */
+    uint32_t frame_height;
+
+    /* specifies the "last" reference frame */
+    VASurfaceID last_ref_frame;
+    /* specifies the "golden" reference frame */
+    VASurfaceID golden_ref_frame;
+    /* specifies the "alternate" referrence frame */
+    VASurfaceID alt_ref_frame;
+    /* specifies the out-of-loop deblocked frame, not used currently */
+    VASurfaceID out_of_loop_frame;
+
+    union {
+        struct {
+	    /* same as key_frame in bitstream syntax, 0 means a key frame */
+            uint32_t key_frame			: 1; 
+	    /* same as version in bitstream syntax */
+            uint32_t version			: 3;
+	    /* same as segmentation_enabled in bitstream syntax */
+            uint32_t segmentation_enabled		: 1;
+	    /* same as update_mb_segmentation_map in bitstream syntax */
+            uint32_t update_mb_segmentation_map	: 1;
+	    /* same as update_segment_feature_data in bitstream syntax */
+            uint32_t update_segment_feature_data	: 1;
+	    /* same as filter_type in bitstream syntax */
+            uint32_t filter_type			: 1; 
+	    /* same as sharpness_level in bitstream syntax */
+            uint32_t sharpness_level		: 3; 
+	    /* same as loop_filter_adj_enable in bitstream syntax */
+            uint32_t loop_filter_adj_enable		: 1; 
+	    /* same as mode_ref_lf_delta_update in bitstream syntax */
+            uint32_t mode_ref_lf_delta_update	: 1; 
+	    /* same as sign_bias_golden in bitstream syntax */
+            uint32_t sign_bias_golden		: 1; 
+	    /* same as sign_bias_alternate in bitstream syntax */
+            uint32_t sign_bias_alternate		: 1; 
+	    /* same as mb_no_coeff_skip in bitstream syntax */
+            uint32_t mb_no_coeff_skip		: 1; 
+	    /* flag to indicate that loop filter should be disabled */
+            uint32_t loop_filter_disable		: 1; 
+        } bits;
+        uint32_t value;
+    } pic_fields;
+
+    /*
+     * probabilities of the segment_id decoding tree and same as 
+     * mb_segment_tree_probs in the spec.
+     */
+    uint8_t mb_segment_tree_probs[3];
+
+    /* Post-adjustment loop filter levels for the 4 segments */
+    uint8_t loop_filter_level[4];
+    /* loop filter deltas for reference frame based MB level adjustment */
+    int8_t loop_filter_deltas_ref_frame[4];
+    /* loop filter deltas for coding mode based MB level adjustment */
+    int8_t loop_filter_deltas_mode[4];
+
+    /* same as prob_skip_false in bitstream syntax */
+    uint8_t prob_skip_false;
+    /* same as prob_intra in bitstream syntax */
+    uint8_t prob_intra;
+    /* same as prob_last in bitstream syntax */
+    uint8_t prob_last;
+    /* same as prob_gf in bitstream syntax */
+    uint8_t prob_gf;
+
+    /* 
+     * list of 4 probabilities of the luma intra prediction mode decoding
+     * tree and same as y_mode_probs in frame header
+     */
+    uint8_t y_mode_probs[4]; 
+    /*
+     * list of 3 probabilities of the chroma intra prediction mode decoding
+     * tree and same as uv_mode_probs in frame header
+     */
+    uint8_t uv_mode_probs[3];
+    /* 
+     * updated mv decoding probabilities and same as mv_probs in 
+     * frame header
+     */
+    uint8_t mv_probs[2][19];
+
+    VABoolCoderContextVPX bool_coder_ctx;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAPictureParameterBufferVP8;
+
+/**
+ * \brief VP8 Slice Parameter Buffer Structure
+ *
+ * This structure conveys parameters related to data partitions and should be 
+ * sent once per frame. Slice data buffer of VASliceDataBufferType is used
+ * to send the partition data.
+ *
+ */
+typedef struct  _VASliceParameterBufferVP8
+{
+    /*
+     * number of bytes in the slice data buffer for the partitions 
+     */
+    uint32_t slice_data_size;
+    /*
+     * offset to the first byte of partition data (control partition)
+     */
+    uint32_t slice_data_offset;
+    /*
+     * see VA_SLICE_DATA_FLAG_XXX definitions
+     */
+    uint32_t slice_data_flag; 
+    /*
+     * offset to the first bit of MB from the first byte of partition data(slice_data_offset)
+     */
+    uint32_t macroblock_offset;
+
+    /*
+     * Partitions
+     * (1<<log2_nbr_of_dct_partitions)+1, count both control partition (frame header) and toke partition
+     */
+    uint8_t num_of_partitions;
+    /*
+     * partition_size[0] is remaining bytes of control partition after parsed by application.
+     * exclude current byte for the remaining bits in bool_coder_ctx.
+     * exclude the uncompress data chunk since first_part_size 'excluding the uncompressed data chunk'
+     */
+    uint32_t partition_size[9];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VASliceParameterBufferVP8;
+
+/**
+ * \brief VP8 Coefficient Probability Data Buffer Structure
+ *
+ * Contains the contents of the token probability table, which may be 
+ * incrementally modified in the frame header. There are four dimensions to 
+ * the token probability array. The outermost dimension is indexed by the 
+ * type of plane being decoded; the next dimension is selected by the 
+ * position of the coefficient being decoded; the third dimension, * roughly 
+ * speaking, measures the "local complexity" or extent to which nearby 
+ * coefficients are non-zero; the fourth, and final, dimension of the token 
+ * probability array is indexed by the position in the token tree structure, 
+ * as are all tree probability arrays. This structure is sent once per frame.
+ *
+ */
+typedef struct _VAProbabilityDataBufferVP8
+{
+    uint8_t dct_coeff_probs[4][8][3][11];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAProbabilityDataBufferVP8;
+
+/**
+ * \brief VP8 Inverse Quantization Matrix Buffer Structure
+ *
+ * Contains quantization indices for yac(0),ydc(1),y2dc(2),y2ac(3),uvdc(4),
+ * uvac(5) for each segment (0-3). When segmentation is disabled, only  
+ * quantization_index[0][] will be used. This structure is sent once per frame.
+ */
+typedef struct _VAIQMatrixBufferVP8
+{
+    /* 
+     * array first dimensional is segment and 2nd dimensional is Q index
+     * all Q indexs should be clipped to be range [0, 127]
+     */
+    uint16_t quantization_index[4][6];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAIQMatrixBufferVP8;
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* VA_DEC_VP8_H */
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/va_dec_vp9.h firefox-85.0+build1/media/ffvpx/va/va_dec_vp9.h
--- firefox-84.0.2+build1/media/ffvpx/va/va_dec_vp9.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/va_dec_vp9.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2014 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file va_dec_vp9.h
+ * \brief The VP9 decoding API
+ *
+ * This file contains the \ref api_dec_vp9 "VP9 decoding API".
+ */
+
+#ifndef VA_DEC_VP9_H
+#define VA_DEC_VP9_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \defgroup api_dec_vp9 VP9 decoding API
+ *
+ * This VP9 decoding API supports 8-bit 420 format only.
+ *
+ * @{
+ */
+
+
+
+
+/**
+ * \brief VP9 Decoding Picture Parameter Buffer Structure
+ *
+ * This structure conveys picture level parameters.
+ * App should send a surface with this data structure down to VAAPI once
+ * per frame.
+ *
+ */
+typedef struct  _VADecPictureParameterBufferVP9
+{
+    /** \brief picture width
+     *  Picture original resolution. The value may not be multiple of 8.
+     */
+    uint16_t                frame_width;
+    /** \brief picture height
+     *  Picture original resolution. The value may not be multiple of 8.
+     */
+    uint16_t                frame_height;
+
+    /** \brief Surface indices of reference frames in DPB.
+     *
+     *  Each entry of the list specifies the surface index of the picture
+     *  that is referred by current picture or will be referred by any future
+     *  picture.
+     *  Application who calls this API should update this list based on the
+     *  refreshing information from VP9 bitstream.
+     */
+    VASurfaceID             reference_frames[8];
+
+    union
+    {
+        struct
+        {
+            /** \brief flags for current picture
+             *  same syntax and semantic as those in VP9 code
+             */
+            uint32_t        subsampling_x                               : 1;
+            uint32_t        subsampling_y                               : 1;
+            uint32_t        frame_type                                  : 1;
+            uint32_t        show_frame                                  : 1;
+            uint32_t        error_resilient_mode                        : 1;
+            uint32_t        intra_only                                  : 1;
+            uint32_t        allow_high_precision_mv                     : 1;
+            uint32_t        mcomp_filter_type                           : 3;
+            uint32_t        frame_parallel_decoding_mode                : 1;
+            uint32_t        reset_frame_context                         : 2;
+            uint32_t        refresh_frame_context                       : 1;
+            uint32_t        frame_context_idx                           : 2;
+            uint32_t        segmentation_enabled                        : 1;
+
+            /** \brief corresponds to variable temporal_update in VP9 code.
+             */
+            uint32_t        segmentation_temporal_update                : 1;
+            /** \brief corresponds to variable update_mb_segmentation_map
+             *  in VP9 code.
+             */
+            uint32_t        segmentation_update_map                     : 1;
+
+            /** \brief Index of reference_frames[] and points to the
+             *  LAST reference frame.
+             *  It corresponds to active_ref_idx[0] in VP9 code.
+             */
+            uint32_t        last_ref_frame                              : 3;
+            /** \brief Sign Bias of the LAST reference frame.
+             *  It corresponds to ref_frame_sign_bias[LAST_FRAME] in VP9 code.
+             */
+            uint32_t        last_ref_frame_sign_bias                    : 1;
+            /** \brief Index of reference_frames[] and points to the
+             *  GOLDERN reference frame.
+             *  It corresponds to active_ref_idx[1] in VP9 code.
+             */
+            uint32_t        golden_ref_frame                            : 3;
+            /** \brief Sign Bias of the GOLDERN reference frame.
+             *  Corresponds to ref_frame_sign_bias[GOLDERN_FRAME] in VP9 code.
+             */
+            uint32_t        golden_ref_frame_sign_bias                  : 1;
+            /** \brief Index of reference_frames[] and points to the
+             *  ALTERNATE reference frame.
+             *  Corresponds to active_ref_idx[2] in VP9 code.
+             */
+            uint32_t        alt_ref_frame                               : 3;
+            /** \brief Sign Bias of the ALTERNATE reference frame.
+             *  Corresponds to ref_frame_sign_bias[ALTREF_FRAME] in VP9 code.
+             */
+            uint32_t        alt_ref_frame_sign_bias                     : 1;
+            /** \brief Lossless Mode
+             *  LosslessFlag = base_qindex == 0 &&
+             *                 y_dc_delta_q == 0 &&
+             *                 uv_dc_delta_q == 0 &&
+             *                 uv_ac_delta_q == 0;
+             *  Where base_qindex, y_dc_delta_q, uv_dc_delta_q and uv_ac_delta_q
+             *  are all variables in VP9 code.
+             */
+            uint32_t        lossless_flag                               : 1;
+        } bits;
+        uint32_t            value;
+    } pic_fields;
+
+    /* following parameters have same syntax with those in VP9 code */
+    uint8_t                 filter_level;
+    uint8_t                 sharpness_level;
+
+    /** \brief number of tile rows specified by (1 << log2_tile_rows).
+     *  It corresponds the variable with same name in VP9 code.
+     */
+    uint8_t                 log2_tile_rows;
+    /** \brief number of tile columns specified by (1 << log2_tile_columns).
+     *  It corresponds the variable with same name in VP9 code.
+     */
+    uint8_t                 log2_tile_columns;
+    /** \brief Number of bytes taken up by the uncompressed frame header,
+     *  which corresponds to byte length of function
+     *  read_uncompressed_header() in VP9 code.
+     *  Specifically, it is the byte count from bit stream buffer start to
+     *  the last byte of uncompressed frame header.
+     *  If there are other meta data in the buffer before uncompressed header,
+     *  its size should be also included here.
+     */
+    uint8_t                 frame_header_length_in_bytes;
+
+    /** \brief The byte count of compressed header the bitstream buffer,
+     *  which corresponds to syntax first_partition_size in code.
+     */
+    uint16_t                first_partition_size;
+
+    /** These values are segment probabilities with same names in VP9
+     *  function setup_segmentation(). They should be parsed directly from
+     *  bitstream by application.
+     */
+    uint8_t                 mb_segment_tree_probs[7];
+    uint8_t                 segment_pred_probs[3];
+
+    /** \brief VP9 Profile definition
+     *  value range [0..3].
+      */
+    uint8_t                 profile;
+
+    /** \brief VP9 bit depth per sample
+     *  same for both luma and chroma samples.
+     */
+    uint8_t                 bit_depth;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_MEDIUM];
+
+} VADecPictureParameterBufferVP9;
+
+
+
+/**
+ * \brief VP9 Segmentation Parameter Data Structure
+ *
+ * This structure conveys per segment parameters.
+ * 8 of this data structure will be included in VASegmentationParameterBufferVP9
+ * and sent to API in a single buffer.
+ *
+ */
+typedef struct  _VASegmentParameterVP9
+{
+    union
+    {
+        struct
+        {
+            /** \brief Indicates if per segment reference frame indicator
+             *  is enabled.
+             *  Corresponding to variable feature_enabled when
+             *  j == SEG_LVL_REF_FRAME in function setup_segmentation() VP9 code.
+             */
+            uint16_t        segment_reference_enabled                   : 1;
+            /** \brief Specifies per segment reference indication.
+             *  0: reserved
+             *  1: Last ref
+             *  2: golden
+             *  3: altref
+             *  Value can be derived from variable data when
+             *  j == SEG_LVL_REF_FRAME in function setup_segmentation() VP9 code.
+             */
+            uint16_t        segment_reference                           : 2;
+            /** \brief Indicates if per segment skip feature is enabled.
+             *  Corresponding to variable feature_enabled when
+             *  j == SEG_LVL_SKIP in function setup_segmentation() VP9 code.
+             */
+            uint16_t        segment_reference_skipped                   : 1;
+        } fields;
+        uint16_t            value;
+    } segment_flags;
+
+    /** \brief Specifies the filter level information per segment.
+     *  The value corresponds to variable lfi->lvl[seg][ref][mode] in VP9 code,
+     *  where m is [ref], and n is [mode] in FilterLevel[m][n].
+     */
+    uint8_t                 filter_level[4][2];
+    /** \brief Specifies per segment Luma AC quantization scale.
+     *  Corresponding to y_dequant[qindex][1] in vp9_mb_init_quantizer()
+     *  function of VP9 code.
+     */
+    int16_t                 luma_ac_quant_scale;
+    /** \brief Specifies per segment Luma DC quantization scale.
+     *  Corresponding to y_dequant[qindex][0] in vp9_mb_init_quantizer()
+     *  function of VP9 code.
+     */
+    int16_t                 luma_dc_quant_scale;
+    /** \brief Specifies per segment Chroma AC quantization scale.
+     *  Corresponding to uv_dequant[qindex][1] in vp9_mb_init_quantizer()
+     *  function of VP9 code.
+     */
+    int16_t                 chroma_ac_quant_scale;
+    /** \brief Specifies per segment Chroma DC quantization scale.
+     *  Corresponding to uv_dequant[qindex][0] in vp9_mb_init_quantizer()
+     *  function of VP9 code.
+     */
+    int16_t                 chroma_dc_quant_scale;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+
+} VASegmentParameterVP9;
+
+
+
+/**
+ * \brief VP9 Slice Parameter Buffer Structure
+ *
+ * This structure conveys parameters related to segmentation data and should be
+ * sent once per frame.
+ *
+ * When segmentation is disabled, only SegParam[0] has valid values,
+ * all other entries should be populated with 0.
+ * Otherwise, all eight entries should be valid.
+ *
+ * Slice data buffer of VASliceDataBufferType is used
+ * to send the bitstream which should include whole or part of partition 0
+ * (at least compressed header) to the end of frame.
+ *
+ */
+typedef struct _VASliceParameterBufferVP9
+{
+    /** \brief The byte count of current frame in the bitstream buffer,
+     *  starting from first byte of the buffer.
+     *  It uses the name slice_data_size to be consitent with other codec,
+     *  but actually means frame_data_size.
+     */
+    uint32_t slice_data_size;
+    /**
+     * offset to the first byte of partition data (control partition)
+     */
+    uint32_t slice_data_offset;
+    /**
+     * see VA_SLICE_DATA_FLAG_XXX definitions
+     */
+    uint32_t slice_data_flag;
+
+    /**
+     * \brief per segment information
+     */
+    VASegmentParameterVP9   seg_param[8];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+
+} VASliceParameterBufferVP9;
+
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* VA_DEC_VP9_H */
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/va.h firefox-85.0+build1/media/ffvpx/va/va.h
--- firefox-84.0.2+build1/media/ffvpx/va/va.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/va.h	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4636 @@
+/*
+ * Copyright (c) 2007-2009 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Video Acceleration (VA) API Specification
+ *
+ * Rev. 0.30
+ * <jonathan.bian@intel.com>
+ *
+ * Revision History:
+ * rev 0.10 (12/10/2006 Jonathan Bian) - Initial draft
+ * rev 0.11 (12/15/2006 Jonathan Bian) - Fixed some errors
+ * rev 0.12 (02/05/2007 Jonathan Bian) - Added VC-1 data structures for slice level decode
+ * rev 0.13 (02/28/2007 Jonathan Bian) - Added GetDisplay()
+ * rev 0.14 (04/13/2007 Jonathan Bian) - Fixed MPEG-2 PictureParameter structure, cleaned up a few funcs.
+ * rev 0.15 (04/20/2007 Jonathan Bian) - Overhauled buffer management
+ * rev 0.16 (05/02/2007 Jonathan Bian) - Added error codes and fixed some issues with configuration
+ * rev 0.17 (05/07/2007 Jonathan Bian) - Added H.264/AVC data structures for slice level decode.
+ * rev 0.18 (05/14/2007 Jonathan Bian) - Added data structures for MPEG-4 slice level decode
+ *                                       and MPEG-2 motion compensation.
+ * rev 0.19 (08/06/2007 Jonathan Bian) - Removed extra type for bitplane data.
+ * rev 0.20 (08/08/2007 Jonathan Bian) - Added missing fields to VC-1 PictureParameter structure.
+ * rev 0.21 (08/20/2007 Jonathan Bian) - Added image and subpicture support.
+ * rev 0.22 (08/27/2007 Jonathan Bian) - Added support for chroma-keying and global alpha.
+ * rev 0.23 (09/11/2007 Jonathan Bian) - Fixed some issues with images and subpictures.
+ * rev 0.24 (09/18/2007 Jonathan Bian) - Added display attributes.
+ * rev 0.25 (10/18/2007 Jonathan Bian) - Changed to use IDs only for some types.
+ * rev 0.26 (11/07/2007 Waldo Bastian) - Change vaCreateBuffer semantics
+ * rev 0.27 (11/19/2007 Matt Sottek)   - Added DeriveImage
+ * rev 0.28 (12/06/2007 Jonathan Bian) - Added new versions of PutImage and AssociateSubpicture
+ *                                       to enable scaling
+ * rev 0.29 (02/07/2008 Jonathan Bian) - VC1 parameter fixes,
+ *                                       added VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED
+ * rev 0.30 (03/01/2009 Jonathan Bian) - Added encoding support for H.264 BP and MPEG-4 SP and fixes
+ *                                       for ISO C conformance.
+ * rev 0.31 (09/02/2009 Gwenole Beauchesne) - VC-1/H264 fields change for VDPAU and XvBA backend
+ *                                       Application needs to relink with the new library.
+ *
+ * rev 0.31.1 (03/29/2009)              - Data structure for JPEG encode
+ * rev 0.31.2 (01/13/2011 Anthony Pabon)- Added a flag to indicate Subpicture coordinates are screen
+ *                                        screen relative rather than source video relative.
+ * rev 0.32.0 (01/13/2011 Xiang Haihao) - Add profile into VAPictureParameterBufferVC1
+ *                                        update VAAPI to 0.32.0
+ *
+ * Acknowledgements:
+ *  Some concepts borrowed from XvMC and XvImage.
+ *  Waldo Bastian (Intel), Matt Sottek (Intel),  Austin Yuan (Intel), and Gwenole Beauchesne (SDS)
+ *  contributed to various aspects of the API.
+ */
+
+/**
+ * \file va.h
+ * \brief The Core API
+ *
+ * This file contains the \ref api_core "Core API".
+ */
+
+#ifndef _VA_H_
+#define _VA_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include "va_version.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) && !defined(__COVERITY__)
+#define va_deprecated __attribute__((deprecated))
+#if __GNUC__ >= 6
+#define va_deprecated_enum va_deprecated
+#else
+#define va_deprecated_enum
+#endif
+#else
+#define va_deprecated
+#define va_deprecated_enum
+#endif
+
+/**
+ * \mainpage Video Acceleration (VA) API
+ *
+ * \section intro Introduction
+ *
+ * The main motivation for VA-API (Video Acceleration API) is to
+ * enable hardware accelerated video decode and encode at various
+ * entry-points (VLD, IDCT, Motion Compensation etc.) for the
+ * prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4
+ * AVC/H.264, VC-1/VMW3, and JPEG, HEVC/H265, VP8, VP9) and video pre/post
+ * processing
+ *
+ * VA-API is split into several modules:
+ * - \ref api_core
+ * - Encoder (H264, HEVC, JPEG, MPEG2, VP8, VP9)
+ * 	- \ref api_enc_h264
+ * 	- \ref api_enc_hevc
+ * 	- \ref api_enc_jpeg
+ * 	- \ref api_enc_mpeg2
+ * 	- \ref api_enc_vp8
+ * 	- \ref api_enc_vp9
+ * - Decoder (HEVC, JPEG, VP8, VP9)
+ *      - \ref api_dec_hevc
+ *      - \ref api_dec_jpeg
+ *      - \ref api_dec_vp8
+ *      - \ref api_dec_vp9
+ * - \ref api_vpp
+ * - FEI (H264, HEVC)
+ * 	- \ref api_fei
+ * 	- \ref api_fei_h264
+ * 	- \ref api_fei_hevc
+ */
+
+/**
+ * \defgroup api_core Core API
+ *
+ * @{
+ */
+
+/**
+Overview
+
+The VA API is intended to provide an interface between a video decode/encode/processing
+application (client) and a hardware accelerator (server), to off-load
+video decode/encode/processing operations from the host to the hardware accelerator at various
+entry-points.
+
+The basic operation steps are:
+
+- Negotiate a mutually acceptable configuration with the server to lock
+  down profile, entrypoints, and other attributes that will not change on
+  a frame-by-frame basis.
+- Create a video decode, encode or processing context which represents a
+  "virtualized" hardware device
+- Get and fill the render buffers with the corresponding data (depending on
+  profiles and entrypoints)
+- Pass the render buffers to the server to handle the current frame
+
+Initialization & Configuration Management
+
+- Find out supported profiles
+- Find out entrypoints for a given profile
+- Find out configuration attributes for a given profile/entrypoint pair
+- Create a configuration for use by the application
+
+*/
+
+typedef void* VADisplay;	/* window system dependent */
+
+typedef int VAStatus;	/** Return status type from functions */
+/** Values for the return status */
+#define VA_STATUS_SUCCESS			0x00000000
+#define VA_STATUS_ERROR_OPERATION_FAILED	0x00000001
+#define VA_STATUS_ERROR_ALLOCATION_FAILED	0x00000002
+#define VA_STATUS_ERROR_INVALID_DISPLAY		0x00000003
+#define VA_STATUS_ERROR_INVALID_CONFIG		0x00000004
+#define VA_STATUS_ERROR_INVALID_CONTEXT		0x00000005
+#define VA_STATUS_ERROR_INVALID_SURFACE		0x00000006
+#define VA_STATUS_ERROR_INVALID_BUFFER		0x00000007
+#define VA_STATUS_ERROR_INVALID_IMAGE		0x00000008
+#define VA_STATUS_ERROR_INVALID_SUBPICTURE	0x00000009
+#define VA_STATUS_ERROR_ATTR_NOT_SUPPORTED	0x0000000a
+#define VA_STATUS_ERROR_MAX_NUM_EXCEEDED	0x0000000b
+#define VA_STATUS_ERROR_UNSUPPORTED_PROFILE	0x0000000c
+#define VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT	0x0000000d
+#define VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT	0x0000000e
+#define VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE	0x0000000f
+#define VA_STATUS_ERROR_SURFACE_BUSY		0x00000010
+#define VA_STATUS_ERROR_FLAG_NOT_SUPPORTED      0x00000011
+#define VA_STATUS_ERROR_INVALID_PARAMETER	0x00000012
+#define VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED 0x00000013
+#define VA_STATUS_ERROR_UNIMPLEMENTED           0x00000014
+#define VA_STATUS_ERROR_SURFACE_IN_DISPLAYING   0x00000015
+#define VA_STATUS_ERROR_INVALID_IMAGE_FORMAT    0x00000016
+#define VA_STATUS_ERROR_DECODING_ERROR          0x00000017
+#define VA_STATUS_ERROR_ENCODING_ERROR          0x00000018
+/**
+ * \brief An invalid/unsupported value was supplied.
+ *
+ * This is a catch-all error code for invalid or unsupported values.
+ * e.g. value exceeding the valid range, invalid type in the context
+ * of generic attribute values.
+ */
+#define VA_STATUS_ERROR_INVALID_VALUE           0x00000019
+/** \brief An unsupported filter was supplied. */
+#define VA_STATUS_ERROR_UNSUPPORTED_FILTER      0x00000020
+/** \brief An invalid filter chain was supplied. */
+#define VA_STATUS_ERROR_INVALID_FILTER_CHAIN    0x00000021
+/** \brief Indicate HW busy (e.g. run multiple encoding simultaneously). */
+#define VA_STATUS_ERROR_HW_BUSY	                0x00000022
+/** \brief An unsupported memory type was supplied. */
+#define VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE 0x00000024
+/** \brief Indicate allocated buffer size is not enough for input or output. */
+#define VA_STATUS_ERROR_NOT_ENOUGH_BUFFER       0x00000025
+#define VA_STATUS_ERROR_UNKNOWN			0xFFFFFFFF
+
+/**
+ * 1. De-interlacing flags for vaPutSurface()
+ * 2. Surface sample type for input/output surface flag
+ *    - Progressive: VA_FRAME_PICTURE
+ *    - Interleaved: VA_TOP_FIELD_FIRST, VA_BOTTOM_FIELD_FIRST
+ *    - Field: VA_TOP_FIELD, VA_BOTTOM_FIELD
+*/
+#define VA_FRAME_PICTURE        0x00000000
+#define VA_TOP_FIELD            0x00000001
+#define VA_BOTTOM_FIELD         0x00000002
+#define VA_TOP_FIELD_FIRST      0x00000004
+#define VA_BOTTOM_FIELD_FIRST   0x00000008
+
+/**
+ * Enabled the positioning/cropping/blending feature:
+ * 1, specify the video playback position in the isurface
+ * 2, specify the cropping info for video playback
+ * 3, encoded video will blend with background color
+ */
+#define VA_ENABLE_BLEND         0x00000004 /* video area blend with the constant color */
+
+/**
+ * Clears the drawable with background color.
+ * for hardware overlay based implementation this flag
+ * can be used to turn off the overlay
+ */
+#define VA_CLEAR_DRAWABLE       0x00000008
+
+/** Color space conversion flags for vaPutSurface() */
+#define VA_SRC_COLOR_MASK       0x000000f0
+#define VA_SRC_BT601            0x00000010
+#define VA_SRC_BT709            0x00000020
+#define VA_SRC_SMPTE_240        0x00000040
+
+/** Scaling flags for vaPutSurface() */
+#define VA_FILTER_SCALING_DEFAULT       0x00000000
+#define VA_FILTER_SCALING_FAST          0x00000100
+#define VA_FILTER_SCALING_HQ            0x00000200
+#define VA_FILTER_SCALING_NL_ANAMORPHIC 0x00000300
+#define VA_FILTER_SCALING_MASK          0x00000f00
+
+/** Padding size in 4-bytes */
+#define VA_PADDING_LOW          4
+#define VA_PADDING_MEDIUM       8
+#define VA_PADDING_HIGH         16
+#define VA_PADDING_LARGE        32
+
+/**
+ * Returns a short english description of error_status
+ */
+const char *vaErrorStr(VAStatus error_status);
+
+typedef struct _VARectangle
+{
+    int16_t x;
+    int16_t y;
+    uint16_t width;
+    uint16_t height;
+} VARectangle;
+
+/** \brief Generic motion vector data structure. */
+typedef struct _VAMotionVector {
+    /** \mv0[0]: horizontal motion vector for past reference */
+    /** \mv0[1]: vertical motion vector for past reference */
+    /** \mv1[0]: horizontal motion vector for future reference */
+    /** \mv1[1]: vertical motion vector for future reference */
+    int16_t  mv0[2];  /* past reference */
+    int16_t  mv1[2];  /* future reference */
+} VAMotionVector;
+
+/** Type of a message callback, used for both error and info log. */
+typedef void (*VAMessageCallback)(void *user_context, const char *message);
+
+/**
+ * Set the callback for error messages, or NULL for no logging.
+ * Returns the previous one, or NULL if it was disabled.
+ */
+VAMessageCallback vaSetErrorCallback(VADisplay dpy, VAMessageCallback callback, void *user_context);
+
+/**
+ * Set the callback for info messages, or NULL for no logging.
+ * Returns the previous one, or NULL if it was disabled.
+ */
+VAMessageCallback vaSetInfoCallback(VADisplay dpy, VAMessageCallback callback, void *user_context);
+
+/**
+ * Initialization:
+ * A display must be obtained by calling vaGetDisplay() before calling
+ * vaInitialize() and other functions. This connects the API to the
+ * native window system.
+ * For X Windows, native_dpy would be from XOpenDisplay()
+ */
+typedef void* VANativeDisplay;	/* window system dependent */
+
+int vaDisplayIsValid(VADisplay dpy);
+
+/**
+ *  Set the override driver name instead of queried driver driver.
+ */
+VAStatus vaSetDriverName(VADisplay dpy,
+                         char *driver_name
+);
+
+/**
+ * Initialize the library
+ */
+VAStatus vaInitialize (
+    VADisplay dpy,
+    int *major_version,	 /* out */
+    int *minor_version 	 /* out */
+);
+
+/**
+ * After this call, all library internal resources will be cleaned up
+ */
+VAStatus vaTerminate (
+    VADisplay dpy
+);
+
+/**
+ * vaQueryVendorString returns a pointer to a zero-terminated string
+ * describing some aspects of the VA implemenation on a specific
+ * hardware accelerator. The format of the returned string is vendor
+ * specific and at the discretion of the implementer.
+ * e.g. for the Intel GMA500 implementation, an example would be:
+ * "Intel GMA500 - 2.0.0.32L.0005"
+ */
+const char *vaQueryVendorString (
+    VADisplay dpy
+);
+
+typedef int (*VAPrivFunc)(void);
+
+/**
+ * Return a function pointer given a function name in the library.
+ * This allows private interfaces into the library
+ */
+VAPrivFunc vaGetLibFunc (
+    VADisplay dpy,
+    const char *func
+);
+
+/** Currently defined profiles */
+typedef enum
+{
+    /** \brief Profile ID used for video processing. */
+    VAProfileNone                       = -1,
+    VAProfileMPEG2Simple		= 0,
+    VAProfileMPEG2Main			= 1,
+    VAProfileMPEG4Simple		= 2,
+    VAProfileMPEG4AdvancedSimple	= 3,
+    VAProfileMPEG4Main			= 4,
+    VAProfileH264Baseline va_deprecated_enum = 5,
+    VAProfileH264Main			= 6,
+    VAProfileH264High			= 7,
+    VAProfileVC1Simple			= 8,
+    VAProfileVC1Main			= 9,
+    VAProfileVC1Advanced		= 10,
+    VAProfileH263Baseline		= 11,
+    VAProfileJPEGBaseline               = 12,
+    VAProfileH264ConstrainedBaseline    = 13,
+    VAProfileVP8Version0_3              = 14,
+    VAProfileH264MultiviewHigh          = 15,
+    VAProfileH264StereoHigh             = 16,
+    VAProfileHEVCMain                   = 17,
+    VAProfileHEVCMain10                 = 18,
+    VAProfileVP9Profile0                = 19,
+    VAProfileVP9Profile1                = 20,
+    VAProfileVP9Profile2                = 21,
+    VAProfileVP9Profile3                = 22,
+    VAProfileHEVCMain12                 = 23,
+    VAProfileHEVCMain422_10             = 24,
+    VAProfileHEVCMain422_12             = 25,
+    VAProfileHEVCMain444                = 26,
+    VAProfileHEVCMain444_10             = 27,
+    VAProfileHEVCMain444_12             = 28,
+    VAProfileHEVCSccMain                = 29,
+    VAProfileHEVCSccMain10              = 30,
+    VAProfileHEVCSccMain444             = 31
+} VAProfile;
+
+/**
+ *  Currently defined entrypoints
+ */
+typedef enum
+{
+    VAEntrypointVLD		= 1,
+    VAEntrypointIZZ		= 2,
+    VAEntrypointIDCT		= 3,
+    VAEntrypointMoComp		= 4,
+    VAEntrypointDeblocking	= 5,
+    VAEntrypointEncSlice	= 6,	/* slice level encode */
+    VAEntrypointEncPicture 	= 7,	/* pictuer encode, JPEG, etc */
+    /*
+     * For an implementation that supports a low power/high performance variant
+     * for slice level encode, it can choose to expose the
+     * VAEntrypointEncSliceLP entrypoint. Certain encoding tools may not be
+     * available with this entrypoint (e.g. interlace, MBAFF) and the
+     * application can query the encoding configuration attributes to find
+     * out more details if this entrypoint is supported.
+     */
+    VAEntrypointEncSliceLP 	= 8,
+    VAEntrypointVideoProc       = 10,   /**< Video pre/post-processing. */
+    /**
+     * \brief VAEntrypointFEI
+     *
+     * The purpose of FEI (Flexible Encoding Infrastructure) is to allow applications to
+     * have more controls and trade off quality for speed with their own IPs.
+     * The application can optionally provide input to ENC for extra encode control
+     * and get the output from ENC. Application can chose to modify the ENC
+     * output/PAK input during encoding, but the performance impact is significant.
+     *
+     * On top of the existing buffers for normal encode, there will be
+     * one extra input buffer (VAEncMiscParameterFEIFrameControl) and
+     * three extra output buffers (VAEncFEIMVBufferType, VAEncFEIMBModeBufferType
+     * and VAEncFEIDistortionBufferType) for VAEntrypointFEI entry function.
+     * If separate PAK is set, two extra input buffers
+     * (VAEncFEIMVBufferType, VAEncFEIMBModeBufferType) are needed for PAK input.
+     **/
+    VAEntrypointFEI         = 11,
+    /**
+     * \brief VAEntrypointStats
+     *
+     * A pre-processing function for getting some statistics and motion vectors is added,
+     * and some extra controls for Encode pipeline are provided. The application can
+     * optionally call the statistics function to get motion vectors and statistics like
+     * variances, distortions before calling Encode function via this entry point.
+     *
+     * Checking whether Statistics is supported can be performed with vaQueryConfigEntrypoints().
+     * If Statistics entry point is supported, then the list of returned entry-points will
+     * include #VAEntrypointStats. Supported pixel format, maximum resolution and statistics
+     * specific attributes can be obtained via normal attribute query. One input buffer
+     * (VAStatsStatisticsParameterBufferType) and one or two output buffers
+     * (VAStatsStatisticsBufferType, VAStatsStatisticsBottomFieldBufferType (for interlace only)
+     * and VAStatsMVBufferType) are needed for this entry point.
+     **/
+    VAEntrypointStats       = 12,
+} VAEntrypoint;
+
+/** Currently defined configuration attribute types */
+typedef enum
+{
+    VAConfigAttribRTFormat		= 0,
+    VAConfigAttribSpatialResidual	= 1,
+    VAConfigAttribSpatialClipping	= 2,
+    VAConfigAttribIntraResidual		= 3,
+    VAConfigAttribEncryption		= 4,
+    VAConfigAttribRateControl		= 5,
+
+    /** @name Attributes for decoding */
+    /**@{*/
+    /**
+     * \brief Slice Decoding mode. Read/write.
+     *
+     * This attribute determines what mode the driver supports for slice
+     * decoding, through vaGetConfigAttributes(); and what mode the user
+     * will be providing to the driver, through vaCreateConfig(), if the
+     * driver supports those. If this attribute is not set by the user then
+     * it is assumed that VA_DEC_SLICE_MODE_NORMAL mode is used.
+     *
+     * See \c VA_DEC_SLICE_MODE_xxx for the list of slice decoding modes.
+     */
+    VAConfigAttribDecSliceMode		= 6,
+   /**
+     * \brief JPEG decoding attribute. Read-only.
+     *
+     * This attribute exposes a number of capabilities of the underlying
+     * JPEG implementation. The attribute value is partitioned into fields as defined in the
+     * VAConfigAttribValDecJPEG union.
+     */
+    VAConfigAttribDecJPEG             = 7,
+    /**
+     * \brief Decode processing support. Read/write.
+     *
+     * This attribute determines if the driver supports video processing
+     * with decoding using the decoding context in a single call, through
+     * vaGetConfigAttributes(); and if the user may use this feature,
+     * through vaCreateConfig(), if the driver supports the user scenario.
+     * The user will essentially create a regular decode VAContext.  Therefore,
+     * the parameters of vaCreateContext() such as picture_width, picture_height
+     * and render_targets are in relation to the decode output parameters
+     * (not processing output parameters) as normal.
+     * If this attribute is not set by the user then it is assumed that no
+     * extra processing is done after decoding for this decode context.
+     *
+     * Since essentially the application is creating a decoder config and context,
+     * all function calls that take in the config (e.g. vaQuerySurfaceAttributes())
+     * or context are in relation to the decoder, except those video processing
+     * function specified in the next paragraph.
+     *
+     * Once the decode config and context are created, the user must further
+     * query the supported processing filters using vaQueryVideoProcFilters(),
+     * vaQueryVideoProcFilterCaps(), vaQueryVideoProcPipelineCaps() by specifying
+     * the created decode context.  The user must provide processing information
+     * and extra processing output surfaces as "additional_outputs" to the driver
+     * through VAProcPipelineParameterBufferType.  The render_target specified
+     * at vaBeginPicture() time refers to the decode output surface.  The
+     * target surface for the output of processing needs to be a different
+     * surface since the decode process requires the original reconstructed buffer.
+     * The “surface� member of VAProcPipelineParameterBuffer should be set to the
+     * same as “render_target� set in vaBeginPicture(), but the driver may choose
+     * to ignore this parameter.
+     */
+    VAConfigAttribDecProcessing		= 8,
+    /** @name Attributes for encoding */
+    /**@{*/
+    /**
+     * \brief Packed headers mode. Read/write.
+     *
+     * This attribute determines what packed headers the driver supports,
+     * through vaGetConfigAttributes(); and what packed headers the user
+     * will be providing to the driver, through vaCreateConfig(), if the
+     * driver supports those.
+     *
+     * See \c VA_ENC_PACKED_HEADER_xxx for the list of packed headers.
+     */
+    VAConfigAttribEncPackedHeaders      = 10,
+    /**
+     * \brief Interlaced mode. Read/write.
+     *
+     * This attribute determines what kind of interlaced encoding mode
+     * the driver supports.
+     *
+     * See \c VA_ENC_INTERLACED_xxx for the list of interlaced modes.
+     */
+    VAConfigAttribEncInterlaced         = 11,
+    /**
+     * \brief Maximum number of reference frames. Read-only.
+     *
+     * This attribute determines the maximum number of reference
+     * frames supported for encoding.
+     *
+     * Note: for H.264 encoding, the value represents the maximum number
+     * of reference frames for both the reference picture list 0 (bottom
+     * 16 bits) and the reference picture list 1 (top 16 bits).
+     */
+    VAConfigAttribEncMaxRefFrames       = 13,
+    /**
+     * \brief Maximum number of slices per frame. Read-only.
+     *
+     * This attribute determines the maximum number of slices the
+     * driver can support to encode a single frame.
+     */
+    VAConfigAttribEncMaxSlices          = 14,
+    /**
+     * \brief Slice structure. Read-only.
+     *
+     * This attribute determines slice structures supported by the
+     * driver for encoding. This attribute is a hint to the user so
+     * that he can choose a suitable surface size and how to arrange
+     * the encoding process of multiple slices per frame.
+     *
+     * More specifically, for H.264 encoding, this attribute
+     * determines the range of accepted values to
+     * VAEncSliceParameterBufferH264::macroblock_address and
+     * VAEncSliceParameterBufferH264::num_macroblocks.
+     *
+     * See \c VA_ENC_SLICE_STRUCTURE_xxx for the supported slice
+     * structure types.
+     */
+    VAConfigAttribEncSliceStructure     = 15,
+    /**
+     * \brief Macroblock information. Read-only.
+     *
+     * This attribute determines whether the driver supports extra
+     * encoding information per-macroblock. e.g. QP.
+     *
+     * More specifically, for H.264 encoding, if the driver returns a non-zero
+     * value for this attribute, this means the application can create
+     * additional #VAEncMacroblockParameterBufferH264 buffers referenced
+     * through VAEncSliceParameterBufferH264::macroblock_info.
+     */
+    VAConfigAttribEncMacroblockInfo     = 16,
+    /**
+     * \brief Maximum picture width. Read-only.
+     *
+     * This attribute determines the maximum picture width the driver supports
+     * for a given configuration.
+     */
+    VAConfigAttribMaxPictureWidth     = 18,
+    /**
+     * \brief Maximum picture height. Read-only.
+     *
+     * This attribute determines the maximum picture height the driver supports
+     * for a given configuration.
+     */
+    VAConfigAttribMaxPictureHeight    = 19,
+    /**
+     * \brief JPEG encoding attribute. Read-only.
+     *
+     * This attribute exposes a number of capabilities of the underlying
+     * JPEG implementation. The attribute value is partitioned into fields as defined in the
+     * VAConfigAttribValEncJPEG union.
+     */
+    VAConfigAttribEncJPEG             = 20,
+    /**
+     * \brief Encoding quality range attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports different quality level settings
+     * for encoding. A value less than or equal to 1 means that the encoder only has a single
+     * quality setting, and a value greater than 1 represents the number of quality levels
+     * that can be configured. e.g. a value of 2 means there are two distinct quality levels.
+     */
+    VAConfigAttribEncQualityRange     = 21,
+    /**
+     * \brief Encoding quantization attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports certain types of quantization methods
+     * for encoding (e.g. trellis). See \c VA_ENC_QUANTIZATION_xxx for the list of quantization methods
+     */
+    VAConfigAttribEncQuantization     = 22,
+    /**
+     * \brief Encoding intra refresh attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports certain types of intra refresh methods
+     * for encoding (e.g. adaptive intra refresh or rolling intra refresh).
+     * See \c VA_ENC_INTRA_REFRESH_xxx for intra refresh methods
+     */
+    VAConfigAttribEncIntraRefresh     = 23,
+    /**
+     * \brief Encoding skip frame attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports sending skip frame parameters
+     * (VAEncMiscParameterTypeSkipFrame) to the encoder's rate control, when the user has
+     * externally skipped frames.
+     */
+    VAConfigAttribEncSkipFrame        = 24,
+    /**
+     * \brief Encoding region-of-interest (ROI) attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports region-of-interest (ROI) encoding,
+     * based on user provided ROI rectangles.  The attribute value is partitioned into fields
+     * as defined in the VAConfigAttribValEncROI union.
+     *
+     * If ROI encoding is supported, the ROI information is passed to the driver using
+     * VAEncMiscParameterTypeROI.
+     */
+    VAConfigAttribEncROI              = 25,
+    /**
+     * \brief Encoding extended rate control attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports any extended rate control features
+     * The attribute value is partitioned into fields as defined in the
+     * VAConfigAttribValEncRateControlExt union.
+     */
+    VAConfigAttribEncRateControlExt   = 26,
+    /**
+     * \brief Processing rate reporting attribute. Read-only.
+     *
+     * This attribute conveys whether the driver supports reporting of
+     * encode/decode processing rate based on certain set of parameters
+     * (i.e. levels, I frame internvals) for a given configuration.
+     * If this is supported, vaQueryProcessingRate() can be used to get
+     * encode or decode processing rate.
+     * See \c VA_PROCESSING_RATE_xxx for encode/decode processing rate
+     */
+    VAConfigAttribProcessingRate    = 27,
+    /**
+     * \brief Encoding dirty rectangle. Read-only.
+     *
+     * This attribute conveys whether the driver supports dirty rectangle.
+     * encoding, based on user provided ROI rectangles which indicate the rectangular areas
+     * where the content has changed as compared to the previous picture.  The regions of the
+     * picture that are not covered by dirty rect rectangles are assumed to have not changed
+     * compared to the previous picture.  The encoder may do some optimizations based on
+     * this information.  The attribute value returned indicates the number of regions that
+     * are supported.  e.g. A value of 0 means dirty rect encoding is not supported.  If dirty
+     * rect encoding is supported, the ROI information is passed to the driver using
+     * VAEncMiscParameterTypeDirtyRect.
+     */
+     VAConfigAttribEncDirtyRect       = 28,
+    /**
+     * \brief Parallel Rate Control (hierachical B) attribute. Read-only.
+     *
+     * This attribute conveys whether the encoder supports parallel rate control.
+     * It is a integer value 0 - unsupported, > 0 - maximum layer supported.
+     * This is the way when hireachical B frames are encoded, multiple independent B frames
+     * on the same layer may be processed at same time. If supported, app may enable it by
+     * setting enable_parallel_brc in VAEncMiscParameterRateControl,and the number of B frames
+     * per layer per GOP will be passed to driver through VAEncMiscParameterParallelRateControl
+     * structure.Currently three layers are defined.
+     */
+     VAConfigAttribEncParallelRateControl   = 29,
+     /**
+     * \brief Dynamic Scaling Attribute. Read-only.
+     *
+     * This attribute conveys whether encoder is capable to determine dynamic frame
+     * resolutions adaptive to bandwidth utilization and processing power, etc.
+     * It is a boolean value 0 - unsupported, 1 - supported.
+     * If it is supported,for VP9, suggested frame resolution can be retrieved from VACodedBufferVP9Status.
+     */
+     VAConfigAttribEncDynamicScaling        = 30,
+     /**
+     * \brief frame size tolerance support
+     * it indicates the tolerance of frame size
+     */
+     VAConfigAttribFrameSizeToleranceSupport = 31,
+     /**
+     * \brief Encode function type for FEI.
+     *
+     * This attribute conveys whether the driver supports different function types for encode.
+     * It can be VA_FEI_FUNCTION_ENC, VA_FEI_FUNCTION_PAK, or VA_FEI_FUNCTION_ENC_PAK. Currently
+     * it is for FEI entry point only.
+     * Default is VA_FEI_FUNCTION_ENC_PAK.
+     */
+     VAConfigAttribFEIFunctionType     = 32,
+    /**
+     * \brief Maximum number of FEI MV predictors. Read-only.
+     *
+     * This attribute determines the maximum number of MV predictors the driver
+     * can support to encode a single frame. 0 means no MV predictor is supported.
+     * Currently it is for FEI entry point only.
+     */
+    VAConfigAttribFEIMVPredictors     = 33,
+    /**
+     * \brief Statistics attribute. Read-only.
+     *
+     * This attribute exposes a number of capabilities of the VAEntrypointStats entry
+     * point. The attribute value is partitioned into fields as defined in the
+     * VAConfigAttribValStats union. Currently it is for VAEntrypointStats only.
+     */
+    VAConfigAttribStats               = 34,
+     /**
+     * \brief Tile Support Attribute. Read-only.
+     *
+     * This attribute conveys whether encoder is capable to support tiles.
+     * If not supported, the tile related parameters sent to encoder, such as
+     * tiling structure, should be ignored. 0 - unsupported, 1 - supported.
+     */
+     VAConfigAttribEncTileSupport        = 35,
+    /**
+     * \brief whether accept rouding setting from application. Read-only.
+     * This attribute is for encode quality, if it is report,
+     * application can change the rounding setting by VAEncMiscParameterTypeCustomRoundingControl
+     */
+    VAConfigAttribCustomRoundingControl = 36,
+    /**
+     * \brief Encoding QP info block size attribute. Read-only.
+     * This attribute conveys the block sizes that underlying driver
+     * support for QP info for buffer #VAEncQpBuffer.
+     */
+    VAConfigAttribQPBlockSize            = 37,
+    /**
+     * \brief encode max frame size attribute. Read-only
+     * attribute value \c VAConfigAttribValMaxFrameSize represent max frame size support
+     */
+    VAConfigAttribMaxFrameSize           = 38,
+    /** \brief inter frame prediction directrion attribute. Read-only.
+     * this attribute conveys the prediction direction (backward or forword) for specific config
+     * the value could be  VA_PREDICTION_DIRECTION_XXXX. it can be combined with VAConfigAttribEncMaxRefFrames
+     * to describe reference list , and the prediction direction. if this attrib is not present,both direction
+     * should be supported, no restriction.
+     * for example: normal HEVC encoding , maximum reference frame number in reflist 0 and reflist 1 is deduced
+     * by  VAConfigAttribEncMaxRefFrames. so there are typical P frame, B frame,
+     * if VAConfigAttribPredictionDirection is also present. it will stipulate prediction direction in both
+     * reference list. if only one prediction direction present(such as PREVIOUS),all reference frame should be
+     *  previous frame (PoC < current).
+     */
+    VAConfigAttribPredictionDirection   = 39,
+    /** \brief combined submission of multiple frames from different streams, it is optimization for different HW
+     * implementation, multiple frames encode/decode can improve HW concurrency
+     */
+    VAConfigAttribMultipleFrame         = 40,
+    /**@}*/
+    VAConfigAttribTypeMax
+} VAConfigAttribType;
+
+/**
+ * Configuration attributes
+ * If there is more than one value for an attribute, a default
+ * value will be assigned to the attribute if the client does not
+ * specify the attribute when creating a configuration
+ */
+typedef struct _VAConfigAttrib {
+    VAConfigAttribType type;
+    uint32_t value; /* OR'd flags (bits) for this attribute */
+} VAConfigAttrib;
+
+/* Attribute values for VAConfigAttribRTFormat. */
+
+#define VA_RT_FORMAT_YUV420	0x00000001	///< YUV 4:2:0 8-bit.
+#define VA_RT_FORMAT_YUV422	0x00000002	///< YUV 4:2:2 8-bit.
+#define VA_RT_FORMAT_YUV444	0x00000004	///< YUV 4:4:4 8-bit.
+#define VA_RT_FORMAT_YUV411	0x00000008	///< YUV 4:1:1 8-bit.
+#define VA_RT_FORMAT_YUV400	0x00000010	///< Greyscale 8-bit.
+#define VA_RT_FORMAT_YUV420_10	0x00000100	///< YUV 4:2:0 10-bit.
+#define VA_RT_FORMAT_YUV422_10	0x00000200	///< YUV 4:2:2 10-bit.
+#define VA_RT_FORMAT_YUV444_10	0x00000400	///< YUV 4:4:4 10-bit.
+#define VA_RT_FORMAT_YUV420_12	0x00001000	///< YUV 4:2:0 12-bit.
+#define VA_RT_FORMAT_YUV422_12	0x00002000	///< YUV 4:2:2 12-bit.
+#define VA_RT_FORMAT_YUV444_12	0x00004000	///< YUV 4:4:4 12-bit.
+
+#define VA_RT_FORMAT_RGB16	0x00010000	///< Packed RGB, 16 bits per pixel.
+#define VA_RT_FORMAT_RGB32	0x00020000	///< Packed RGB, 32 bits per pixel, 8 bits per colour sample.
+#define VA_RT_FORMAT_RGBP	0x00100000	///< Planar RGB, 8 bits per sample.
+#define VA_RT_FORMAT_RGB32_10	0x00200000	///< Packed RGB, 32 bits per pixel, 10 bits per colour sample.
+
+#define VA_RT_FORMAT_PROTECTED	0x80000000
+
+#define VA_RT_FORMAT_RGB32_10BPP	VA_RT_FORMAT_RGB32_10	///< @deprecated use VA_RT_FORMAT_RGB32_10 instead.
+#define VA_RT_FORMAT_YUV420_10BPP	VA_RT_FORMAT_YUV420_10	///< @deprecated use VA_RT_FORMAT_YUV420_10 instead.
+
+/** @name Attribute values for VAConfigAttribRateControl */
+/**@{*/
+/** \brief Driver does not support any form of rate control. */
+#define VA_RC_NONE                      0x00000001
+/** \brief Constant bitrate. */
+#define VA_RC_CBR                       0x00000002
+/** \brief Variable bitrate. */
+#define VA_RC_VBR                       0x00000004
+/** \brief Video conference mode. */
+#define VA_RC_VCM                       0x00000008
+/** \brief Constant QP. */
+#define VA_RC_CQP                       0x00000010
+/** \brief Variable bitrate with peak rate higher than average bitrate. */
+#define VA_RC_VBR_CONSTRAINED           0x00000020
+/** \brief Intelligent Constant Quality. Provided an initial ICQ_quality_factor,
+ *  adjusts QP at a frame and MB level based on motion to improve subjective quality. */
+#define VA_RC_ICQ			0x00000040
+/** \brief Macroblock based rate control.  Per MB control is decided
+ *  internally in the encoder. It may be combined with other RC modes, except CQP. */
+#define VA_RC_MB                        0x00000080
+/** \brief Constant Frame Size, it is used for small tolerent  */
+#define VA_RC_CFS                       0x00000100
+/** \brief Parallel BRC, for hierachical B.
+ *
+ *  For hierachical B, B frames can be refered by other B frames.
+ *  Currently three layers of hierachy are defined:
+ *  B0 - regular B, no reference to other B frames.
+ *  B1 - reference to only I, P and regular B0 frames.
+ *  B2 - reference to any other frames, including B1.
+ *  In Hierachical B structure, B frames on the same layer can be processed
+ *  simultaneously. And BRC would adjust accordingly. This is so called
+ *  Parallel BRC. */
+#define VA_RC_PARALLEL                  0x00000200
+/** \brief Quality defined VBR
+ * Use Quality factor to determine the good enough QP for each MB such that
+ * good enough quality can be obtained without waste of bits
+ * for this BRC mode, you must set all legacy VBR parameters
+ * and reuse quality_factor in \c VAEncMiscParameterRateControl
+ * */
+#define VA_RC_QVBR                      0x00000400
+/** \brief Average VBR
+ *  Average variable bitrate control algorithm focuses on overall encoding
+ *  quality while meeting the specified target bitrate, within the accuracy
+ *  range, after a convergence period.
+ *  bits_per_second in VAEncMiscParameterRateControl is target bitrate for AVBR.
+ *  Convergence is specified in the unit of frame.
+ *  window_size in VAEncMiscParameterRateControl is equal to convergence for AVBR.
+ *  Accuracy is in the range of [1,100], 1 means one percent, and so on.
+ *  target_percentage in VAEncMiscParameterRateControl is equal to accuracy for AVBR. */
+#define VA_RC_AVBR                      0x00000800
+
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribDecSliceMode */
+/**@{*/
+/** \brief Driver supports normal mode for slice decoding */
+#define VA_DEC_SLICE_MODE_NORMAL       0x00000001
+/** \brief Driver supports base mode for slice decoding */
+#define VA_DEC_SLICE_MODE_BASE         0x00000002
+
+/** @name Attribute values for VAConfigAttribDecJPEG */
+/**@{*/
+typedef union _VAConfigAttribValDecJPEG {
+    struct {
+    /** \brief Set to (1 << VA_ROTATION_xxx) for supported rotation angles. */
+    uint32_t rotation : 4;
+    /** \brief Reserved for future use. */
+    uint32_t reserved : 28;
+    } bits;
+    uint32_t value;
+} VAConfigAttribValDecJPEG;
+/** @name Attribute values for VAConfigAttribDecProcessing */
+/**@{*/
+/** \brief No decoding + processing in a single decoding call. */
+#define VA_DEC_PROCESSING_NONE     0x00000000
+/** \brief Decode + processing in a single decoding call. */
+#define VA_DEC_PROCESSING          0x00000001
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribEncPackedHeaders */
+/**@{*/
+/** \brief Driver does not support any packed headers mode. */
+#define VA_ENC_PACKED_HEADER_NONE       0x00000000
+/**
+ * \brief Driver supports packed sequence headers. e.g. SPS for H.264.
+ *
+ * Application must provide it to driver once this flag is returned through
+ * vaGetConfigAttributes()
+ */
+#define VA_ENC_PACKED_HEADER_SEQUENCE   0x00000001
+/**
+ * \brief Driver supports packed picture headers. e.g. PPS for H.264.
+ *
+ * Application must provide it to driver once this falg is returned through
+ * vaGetConfigAttributes()
+ */
+#define VA_ENC_PACKED_HEADER_PICTURE    0x00000002
+/**
+ * \brief Driver supports packed slice headers. e.g. slice_header() for H.264.
+ *
+ * Application must provide it to driver once this flag is returned through
+ * vaGetConfigAttributes()
+ */
+#define VA_ENC_PACKED_HEADER_SLICE      0x00000004
+/**
+ * \brief Driver supports misc packed headers. e.g. SEI for H.264.
+ *
+ * @deprecated
+ * This is a deprecated packed header flag, All applications can use
+ * \c VA_ENC_PACKED_HEADER_RAW_DATA to pass the corresponding packed
+ * header data buffer to the driver
+ */
+#define VA_ENC_PACKED_HEADER_MISC       0x00000008
+/** \brief Driver supports raw packed header, see VAEncPackedHeaderRawData */
+#define VA_ENC_PACKED_HEADER_RAW_DATA   0x00000010
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribEncInterlaced */
+/**@{*/
+/** \brief Driver does not support interlaced coding. */
+#define VA_ENC_INTERLACED_NONE          0x00000000
+/** \brief Driver supports interlaced frame coding. */
+#define VA_ENC_INTERLACED_FRAME         0x00000001
+/** \brief Driver supports interlaced field coding. */
+#define VA_ENC_INTERLACED_FIELD         0x00000002
+/** \brief Driver supports macroblock adaptive frame field coding. */
+#define VA_ENC_INTERLACED_MBAFF         0x00000004
+/** \brief Driver supports picture adaptive frame field coding. */
+#define VA_ENC_INTERLACED_PAFF          0x00000008
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribEncSliceStructure */
+/**@{*/
+/** \brief Driver supports a power-of-two number of rows per slice. */
+#define VA_ENC_SLICE_STRUCTURE_POWER_OF_TWO_ROWS        0x00000001
+/** \brief Driver supports an arbitrary number of macroblocks per slice. */
+#define VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS    0x00000002
+/** \brief Dirver support 1 rows  per slice */
+#define VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS               0x00000004
+/** \brief Dirver support max encoded slice size per slice */
+#define VA_ENC_SLICE_STRUCTURE_MAX_SLICE_SIZE           0x00000008
+/** \brief Driver supports an arbitrary number of rows per slice. */
+#define VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS           0x00000010
+/**@}*/
+
+/** \brief Attribute value for VAConfigAttribMaxFrameSize */
+typedef union _VAConfigAttribValMaxFrameSize {
+    struct {
+        /** \brief support max frame size
+          * if max_frame_size == 1, VAEncMiscParameterTypeMaxFrameSize/VAEncMiscParameterBufferMaxFrameSize
+          * could be used to set the frame size, if multiple_pass also equal 1, VAEncMiscParameterTypeMultiPassFrameSize
+          * VAEncMiscParameterBufferMultiPassFrameSize could be used to set frame size and pass information
+          */
+        uint32_t max_frame_size : 1;
+        /** \brief multiple_pass support */
+        uint32_t multiple_pass  : 1;
+        /** \brief reserved bits for future, must be zero*/
+        uint32_t reserved       :30;
+    } bits;
+    uint32_t value;
+} VAConfigAttribValMaxFrameSize;
+
+/** \brief Attribute value for VAConfigAttribEncJPEG */
+typedef union _VAConfigAttribValEncJPEG {
+    struct {
+        /** \brief set to 1 for arithmatic coding. */
+        uint32_t arithmatic_coding_mode : 1;
+        /** \brief set to 1 for progressive dct. */
+        uint32_t progressive_dct_mode : 1;
+        /** \brief set to 1 for non-interleaved. */
+        uint32_t non_interleaved_mode : 1;
+        /** \brief set to 1 for differential. */
+        uint32_t differential_mode : 1;
+        uint32_t max_num_components : 3;
+        uint32_t max_num_scans : 4;
+        uint32_t max_num_huffman_tables : 3;
+        uint32_t max_num_quantization_tables : 3;
+    } bits;
+    uint32_t value;
+} VAConfigAttribValEncJPEG;
+
+/** @name Attribute values for VAConfigAttribEncQuantization */
+/**@{*/
+/** \brief Driver does not support special types of quantization */
+#define VA_ENC_QUANTIZATION_NONE                        0x00000000
+/** \brief Driver supports trellis quantization */
+#define VA_ENC_QUANTIZATION_TRELLIS_SUPPORTED           0x00000001
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribPredictionDirection */
+/**@{*/
+/** \brief Driver support forward reference frame (inter frame for vpx, P frame for H26x MPEG)
+ * can work with the VAConfigAttribEncMaxRefFrames. for example: low delay B frame of HEVC.
+ * these value can be OR'd together. typical value should be VA_PREDICTION_DIRECTION_PREVIOUS
+ * or VA_PREDICTION_DIRECTION_PREVIOUS | VA_PREDICTION_DIRECTION_FUTURE, theoretically, there
+ * are no stream only include future reference frame.
+ */
+#define VA_PREDICTION_DIRECTION_PREVIOUS                0x00000001
+/** \brief Driver support backward prediction frame/slice */
+#define VA_PREDICTION_DIRECTION_FUTURE                  0x00000002
+/**@}*/
+
+/** @name Attribute values for VAConfigAttribEncIntraRefresh */
+/**@{*/
+/** \brief Driver does not support intra refresh */
+#define VA_ENC_INTRA_REFRESH_NONE                       0x00000000
+/** \brief Driver supports column based rolling intra refresh */
+#define VA_ENC_INTRA_REFRESH_ROLLING_COLUMN             0x00000001
+/** \brief Driver supports row based rolling intra refresh */
+#define VA_ENC_INTRA_REFRESH_ROLLING_ROW                0x00000002
+/** \brief Driver supports adaptive intra refresh */
+#define VA_ENC_INTRA_REFRESH_ADAPTIVE                   0x00000010
+/** \brief Driver supports cyclic intra refresh */
+#define VA_ENC_INTRA_REFRESH_CYCLIC                     0x00000020
+/** \brief Driver supports intra refresh of P frame*/
+#define VA_ENC_INTRA_REFRESH_P_FRAME                    0x00010000
+/** \brief Driver supports intra refresh of B frame */
+#define VA_ENC_INTRA_REFRESH_B_FRAME                    0x00020000
+/** \brief Driver supports intra refresh of multiple reference encoder */
+#define VA_ENC_INTRA_REFRESH_MULTI_REF                  0x00040000
+
+/**@}*/
+
+/** \brief Attribute value for VAConfigAttribEncROI */
+typedef union _VAConfigAttribValEncROI {
+    struct {
+        /** \brief The number of ROI regions supported, 0 if ROI is not supported. */
+        uint32_t num_roi_regions 		: 8;
+        /**
+         * \brief A flag indicates whether ROI priority is supported
+         *
+         * \ref roi_rc_priority_support equal to 1 specifies the underlying driver supports
+         * ROI priority when VAConfigAttribRateControl != VA_RC_CQP, user can use \c roi_value
+         * in #VAEncROI to set ROI priority. \ref roi_rc_priority_support equal to 0 specifies
+         * the underlying driver doesn't support ROI priority.
+         *
+         * User should ignore \ref roi_rc_priority_support when VAConfigAttribRateControl == VA_RC_CQP
+         * because ROI delta QP is always required when VAConfigAttribRateControl == VA_RC_CQP.
+         */
+        uint32_t roi_rc_priority_support	: 1;
+        /**
+         * \brief A flag indicates whether ROI delta QP is supported
+         *
+         * \ref roi_rc_qp_delta_support equal to 1 specifies the underlying driver supports
+         * ROI delta QP when VAConfigAttribRateControl != VA_RC_CQP, user can use \c roi_value
+         * in #VAEncROI to set ROI delta QP. \ref roi_rc_qp_delta_support equal to 0 specifies
+         * the underlying driver doesn't support ROI delta QP.
+         *
+         * User should ignore \ref roi_rc_qp_delta_support when VAConfigAttribRateControl == VA_RC_CQP
+         * because ROI delta QP is always required when VAConfigAttribRateControl == VA_RC_CQP.
+         */
+        uint32_t roi_rc_qp_delta_support    : 1;
+        uint32_t reserved                   : 22;
+     } bits;
+     uint32_t value;
+} VAConfigAttribValEncROI;
+
+/** \brief Attribute value for VAConfigAttribEncRateControlExt */
+typedef union _VAConfigAttribValEncRateControlExt {
+    struct {
+        /**
+         * \brief The maximum number of temporal layers minus 1
+         *
+         * \ref max_num_temporal_layers_minus1 plus 1 specifies the maximum number of temporal
+         * layers that supported by the underlying driver. \ref max_num_temporal_layers_minus1
+         * equal to 0 implies the underlying driver doesn't support encoding with temporal layer.
+         */
+        uint32_t max_num_temporal_layers_minus1      : 8;
+
+        /**
+         * /brief support temporal layer bit-rate control flag
+         *
+         * \ref temporal_layer_bitrate_control_flag equal to 1 specifies the underlying driver
+         * can support bit-rate control per temporal layer when (#VAConfigAttribRateControl == #VA_RC_CBR ||
+         * #VAConfigAttribRateControl == #VA_RC_VBR).
+         *
+         * The underlying driver must set \ref temporal_layer_bitrate_control_flag to 0 when
+         * \c max_num_temporal_layers_minus1 is equal to 0
+         *
+         * To use bit-rate control per temporal layer, an application must send the right layer
+         * structure via #VAEncMiscParameterTemporalLayerStructure at the beginning of a coded sequence
+         * and then followed by #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate structures
+         * for each layer, using the \c temporal_id field as the layer identifier. Otherwise
+         * the driver doesn't use bitrate control per temporal layer if an application doesn't send the
+         * layer structure via #VAEncMiscParameterTemporalLayerStructure to the driver. The driver returns
+         * VA_STATUS_ERROR_INVALID_PARAMETER if an application sends a wrong layer structure or doesn't send
+         * #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate for each layer.
+         *
+         * The driver will ignore #VAEncMiscParameterTemporalLayerStructure and the \c temporal_id field
+         * in #VAEncMiscParameterRateControl and #VAEncMiscParameterFrameRate if
+         * \ref temporal_layer_bitrate_control_flag is equal to 0 or #VAConfigAttribRateControl == #VA_RC_CQP
+         */
+        uint32_t temporal_layer_bitrate_control_flag : 1;
+        uint32_t reserved                            : 23;
+    } bits;
+    uint32_t value;
+} VAConfigAttribValEncRateControlExt;
+
+/** \brief Attribute value for VAConfigAttribMultipleFrame*/
+typedef union _VAConfigAttribValMultipleFrame {
+    struct {
+        /** \brief max num of concurrent frames from different stream */
+        uint32_t max_num_concurrent_frames      : 8;
+        /** \brief indicate whether all stream must support same quality level
+         *  if mixed_quality_level == 0, same quality level setting for multple streams is required
+         *  if mixed_quality_level == 1, different stream can have different quality level*/
+        uint32_t mixed_quality_level            : 1;
+        /** \brief reserved bit for future, must be zero */
+        uint32_t reserved                       : 23;
+    } bits;
+    uint32_t value;
+}VAConfigAttribValMultipleFrame;
+
+/** @name Attribute values for VAConfigAttribProcessingRate. */
+/**@{*/
+/** \brief Driver does not support processing rate report */
+#define VA_PROCESSING_RATE_NONE                       0x00000000
+/** \brief Driver supports encode processing rate report  */
+#define VA_PROCESSING_RATE_ENCODE                     0x00000001
+/** \brief Driver supports decode processing rate report  */
+#define VA_PROCESSING_RATE_DECODE                     0x00000002
+/**@}*/
+/**
+ * if an attribute is not applicable for a given
+ * profile/entrypoint pair, then set the value to the following
+ */
+#define VA_ATTRIB_NOT_SUPPORTED 0x80000000
+
+/** Get maximum number of profiles supported by the implementation */
+int vaMaxNumProfiles (
+    VADisplay dpy
+);
+
+/** Get maximum number of entrypoints supported by the implementation */
+int vaMaxNumEntrypoints (
+    VADisplay dpy
+);
+
+/** Get maximum number of attributs supported by the implementation */
+int vaMaxNumConfigAttributes (
+    VADisplay dpy
+);
+
+/**
+ * Query supported profiles
+ * The caller must provide a "profile_list" array that can hold at
+ * least vaMaxNumProfile() entries. The actual number of profiles
+ * returned in "profile_list" is returned in "num_profile".
+ */
+VAStatus vaQueryConfigProfiles (
+    VADisplay dpy,
+    VAProfile *profile_list,	/* out */
+    int *num_profiles		/* out */
+);
+
+/**
+ * Query supported entrypoints for a given profile
+ * The caller must provide an "entrypoint_list" array that can hold at
+ * least vaMaxNumEntrypoints() entries. The actual number of entrypoints
+ * returned in "entrypoint_list" is returned in "num_entrypoints".
+ */
+VAStatus vaQueryConfigEntrypoints (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint *entrypoint_list,	/* out */
+    int *num_entrypoints		/* out */
+);
+
+/**
+ * Get attributes for a given profile/entrypoint pair
+ * The caller must provide an "attrib_list" with all attributes to be
+ * retrieved.  Upon return, the attributes in "attrib_list" have been
+ * updated with their value.  Unknown attributes or attributes that are
+ * not supported for the given profile/entrypoint pair will have their
+ * value set to VA_ATTRIB_NOT_SUPPORTED
+ */
+VAStatus vaGetConfigAttributes (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint entrypoint,
+    VAConfigAttrib *attrib_list, /* in/out */
+    int num_attribs
+);
+
+/** Generic ID type, can be re-typed for specific implementation */
+typedef unsigned int VAGenericID;
+
+typedef VAGenericID VAConfigID;
+
+/**
+ * Create a configuration for the video decode/encode/processing pipeline
+ * it passes in the attribute list that specifies the attributes it cares
+ * about, with the rest taking default values.
+ */
+VAStatus vaCreateConfig (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint entrypoint,
+    VAConfigAttrib *attrib_list,
+    int num_attribs,
+    VAConfigID *config_id /* out */
+);
+
+/**
+ * Free resources associdated with a given config
+ */
+VAStatus vaDestroyConfig (
+    VADisplay dpy,
+    VAConfigID config_id
+);
+
+/**
+ * Query all attributes for a given configuration
+ * The profile of the configuration is returned in "profile"
+ * The entrypoint of the configuration is returned in "entrypoint"
+ * The caller must provide an "attrib_list" array that can hold at least
+ * vaMaxNumConfigAttributes() entries. The actual number of attributes
+ * returned in "attrib_list" is returned in "num_attribs"
+ */
+VAStatus vaQueryConfigAttributes (
+    VADisplay dpy,
+    VAConfigID config_id,
+    VAProfile *profile, 	/* out */
+    VAEntrypoint *entrypoint, 	/* out */
+    VAConfigAttrib *attrib_list,/* out */
+    int *num_attribs 		/* out */
+);
+
+
+/**
+ * Contexts and Surfaces
+ *
+ * Context represents a "virtual" video decode, encode or video processing
+ * pipeline. Surfaces are render targets for a given context. The data in the
+ * surfaces are not accessible to the client except if derived image is supported
+ * and the internal data format of the surface is implementation specific.
+ *
+ * Surfaces are provided as a hint of what surfaces will be used when the context
+ * is created through vaCreateContext(). A surface may be used by different contexts
+ * at the same time as soon as application can make sure the operations are synchronized
+ * between different contexts, e.g. a surface is used as the output of a decode context
+ * and the input of a video process context. Surfaces can only be destroyed after all
+ * contexts using these surfaces have been destroyed.
+ *
+ * Both contexts and surfaces are identified by unique IDs and its
+ * implementation specific internals are kept opaque to the clients
+ */
+
+typedef VAGenericID VAContextID;
+
+typedef VAGenericID VASurfaceID;
+
+#define VA_INVALID_ID		0xffffffff
+#define VA_INVALID_SURFACE	VA_INVALID_ID
+
+/** \brief Generic value types. */
+typedef enum  {
+    VAGenericValueTypeInteger = 1,      /**< 32-bit signed integer. */
+    VAGenericValueTypeFloat,            /**< 32-bit floating-point value. */
+    VAGenericValueTypePointer,          /**< Generic pointer type */
+    VAGenericValueTypeFunc              /**< Pointer to function */
+} VAGenericValueType;
+
+/** \brief Generic function type. */
+typedef void (*VAGenericFunc)(void);
+
+/** \brief Generic value. */
+typedef struct _VAGenericValue {
+    /** \brief Value type. See #VAGenericValueType. */
+    VAGenericValueType  type;
+    /** \brief Value holder. */
+    union {
+        /** \brief 32-bit signed integer. */
+        int32_t             i;
+        /** \brief 32-bit float. */
+        float           f;
+        /** \brief Generic pointer. */
+        void           *p;
+        /** \brief Pointer to function. */
+        VAGenericFunc   fn;
+    }                   value;
+} VAGenericValue;
+
+/** @name Surface attribute flags */
+/**@{*/
+/** \brief Surface attribute is not supported. */
+#define VA_SURFACE_ATTRIB_NOT_SUPPORTED 0x00000000
+/** \brief Surface attribute can be got through vaQuerySurfaceAttributes(). */
+#define VA_SURFACE_ATTRIB_GETTABLE      0x00000001
+/** \brief Surface attribute can be set through vaCreateSurfaces(). */
+#define VA_SURFACE_ATTRIB_SETTABLE      0x00000002
+/**@}*/
+
+/** \brief Surface attribute types. */
+typedef enum {
+    VASurfaceAttribNone = 0,
+    /**
+     * \brief Pixel format (fourcc).
+     *
+     * The value is meaningful as input to vaQuerySurfaceAttributes().
+     * If zero, the driver returns the optimal pixel format for the
+     * specified config. Otherwise, if non-zero, the value represents
+     * a pixel format (FOURCC) that is kept as is on output, if the
+     * driver supports it. Otherwise, the driver sets the value to
+     * zero and drops the \c VA_SURFACE_ATTRIB_SETTABLE flag.
+     */
+    VASurfaceAttribPixelFormat,
+    /** \brief Minimal width in pixels (int, read-only). */
+    VASurfaceAttribMinWidth,
+    /** \brief Maximal width in pixels (int, read-only). */
+    VASurfaceAttribMaxWidth,
+    /** \brief Minimal height in pixels (int, read-only). */
+    VASurfaceAttribMinHeight,
+    /** \brief Maximal height in pixels (int, read-only). */
+    VASurfaceAttribMaxHeight,
+    /** \brief Surface memory type expressed in bit fields (int, read/write). */
+    VASurfaceAttribMemoryType,
+    /** \brief External buffer descriptor (pointer, write).
+     *
+     * Refer to the documentation for the memory type being created to
+     * determine what descriptor structure to pass here.  If not otherwise
+     * stated, the common VASurfaceAttribExternalBuffers should be used.
+     */
+    VASurfaceAttribExternalBufferDescriptor,
+    /** \brief Surface usage hint, gives the driver a hint of intended usage
+     *  to optimize allocation (e.g. tiling) (int, read/write). */
+    VASurfaceAttribUsageHint,
+    /** \brief Number of surface attributes. */
+    VASurfaceAttribCount
+} VASurfaceAttribType;
+
+/** \brief Surface attribute. */
+typedef struct _VASurfaceAttrib {
+    /** \brief Type. */
+    VASurfaceAttribType type;
+    /** \brief Flags. See "Surface attribute flags". */
+    uint32_t        flags;
+    /** \brief Value. See "Surface attribute types" for the expected types. */
+    VAGenericValue      value;
+} VASurfaceAttrib;
+
+/**
+ * @name VASurfaceAttribMemoryType values in bit fields.
+ * Bit 0:7 are reserved for generic types, Bit 31:28 are reserved for
+ * Linux DRM, Bit 23:20 are reserved for Android. DRM and Android specific
+ * types are defined in DRM and Android header files.
+ */
+/**@{*/
+/** \brief VA memory type (default) is supported. */
+#define VA_SURFACE_ATTRIB_MEM_TYPE_VA			0x00000001
+/** \brief V4L2 buffer memory type is supported. */
+#define VA_SURFACE_ATTRIB_MEM_TYPE_V4L2			0x00000002
+/** \brief User pointer memory type is supported. */
+#define VA_SURFACE_ATTRIB_MEM_TYPE_USER_PTR		0x00000004
+/**@}*/
+
+/**
+ * \brief VASurfaceAttribExternalBuffers structure for
+ * the VASurfaceAttribExternalBufferDescriptor attribute.
+ */
+typedef struct _VASurfaceAttribExternalBuffers {
+    /** \brief pixel format in fourcc. */
+    uint32_t pixel_format;
+    /** \brief width in pixels. */
+    uint32_t width;
+    /** \brief height in pixels. */
+    uint32_t height;
+    /** \brief total size of the buffer in bytes. */
+    uint32_t data_size;
+    /** \brief number of planes for planar layout */
+    uint32_t num_planes;
+    /** \brief pitch for each plane in bytes */
+    uint32_t pitches[4];
+    /** \brief offset for each plane in bytes */
+    uint32_t offsets[4];
+    /** \brief buffer handles or user pointers */
+    uintptr_t *buffers;
+    /** \brief number of elements in the "buffers" array */
+    uint32_t num_buffers;
+    /** \brief flags. See "Surface external buffer descriptor flags". */
+    uint32_t flags;
+    /** \brief reserved for passing private data */
+    void *private_data;
+} VASurfaceAttribExternalBuffers;
+
+/** @name VASurfaceAttribExternalBuffers flags */
+/**@{*/
+/** \brief Enable memory tiling */
+#define VA_SURFACE_EXTBUF_DESC_ENABLE_TILING	0x00000001
+/** \brief Memory is cacheable */
+#define VA_SURFACE_EXTBUF_DESC_CACHED		0x00000002
+/** \brief Memory is non-cacheable */
+#define VA_SURFACE_EXTBUF_DESC_UNCACHED		0x00000004
+/** \brief Memory is write-combined */
+#define VA_SURFACE_EXTBUF_DESC_WC		0x00000008
+/** \brief Memory is protected */
+#define VA_SURFACE_EXTBUF_DESC_PROTECTED        0x80000000
+
+/** @name VASurfaceAttribUsageHint attribute usage hint flags */
+/**@{*/
+/** \brief Surface usage not indicated. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_GENERIC 	0x00000000
+/** \brief Surface used by video decoder. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_DECODER 	0x00000001
+/** \brief Surface used by video encoder. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_ENCODER 	0x00000002
+/** \brief Surface read by video post-processing. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_VPP_READ 	0x00000004
+/** \brief Surface written by video post-processing. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_VPP_WRITE 	0x00000008
+/** \brief Surface used for display. */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_DISPLAY 	0x00000010
+/** \brief Surface used for export to third-party APIs, e.g. via
+ *  vaExportSurfaceHandle(). */
+#define VA_SURFACE_ATTRIB_USAGE_HINT_EXPORT 	0x00000020
+
+/**@}*/
+
+/**
+ * \brief Queries surface attributes for the supplied config.
+ *
+ * This function queries for all supported attributes for the
+ * supplied VA @config. In particular, if the underlying hardware
+ * supports the creation of VA surfaces in various formats, then
+ * this function will enumerate all pixel formats that are supported.
+ *
+ * The \c attrib_list array is allocated by the user and \c
+ * num_attribs shall be initialized to the number of allocated
+ * elements in that array. Upon successful return, the actual number
+ * of attributes will be overwritten into \c num_attribs. Otherwise,
+ * \c VA_STATUS_ERROR_MAX_NUM_EXCEEDED is returned and \c num_attribs
+ * is adjusted to the number of elements that would be returned if
+ * enough space was available.
+ *
+ * Note: it is perfectly valid to pass NULL to the \c attrib_list
+ * argument when vaQuerySurfaceAttributes() is used to determine the
+ * actual number of elements that need to be allocated.
+ *
+ * @param[in] dpy               the VA display
+ * @param[in] config            the config identifying a codec or a video
+ *     processing pipeline
+ * @param[out] attrib_list      the output array of #VASurfaceAttrib elements
+ * @param[in,out] num_attribs   the number of elements allocated on
+ *      input, the number of elements actually filled in output
+ */
+VAStatus
+vaQuerySurfaceAttributes(
+    VADisplay           dpy,
+    VAConfigID          config,
+    VASurfaceAttrib    *attrib_list,
+    unsigned int       *num_attribs
+);
+
+/**
+ * \brief Creates an array of surfaces
+ *
+ * Creates an array of surfaces. The optional list of attributes shall
+ * be constructed based on what the underlying hardware could expose
+ * through vaQuerySurfaceAttributes().
+ *
+ * @param[in] dpy               the VA display
+ * @param[in] format            the desired surface format. See \c VA_RT_FORMAT_*
+ * @param[in] width             the surface width
+ * @param[in] height            the surface height
+ * @param[out] surfaces         the array of newly created surfaces
+ * @param[in] num_surfaces      the number of surfaces to create
+ * @param[in] attrib_list       the list of (optional) attributes, or \c NULL
+ * @param[in] num_attribs       the number of attributes supplied in
+ *     \c attrib_list, or zero
+ */
+VAStatus
+vaCreateSurfaces(
+    VADisplay           dpy,
+    unsigned int        format,
+    unsigned int        width,
+    unsigned int        height,
+    VASurfaceID        *surfaces,
+    unsigned int        num_surfaces,
+    VASurfaceAttrib    *attrib_list,
+    unsigned int        num_attribs
+);
+
+/**
+ * vaDestroySurfaces - Destroy resources associated with surfaces.
+ *  Surfaces can only be destroyed after all contexts using these surfaces have been
+ *  destroyed.
+ *  dpy: display
+ *  surfaces: array of surfaces to destroy
+ *  num_surfaces: number of surfaces in the array to be destroyed.
+ */
+VAStatus vaDestroySurfaces (
+    VADisplay dpy,
+    VASurfaceID *surfaces,
+    int num_surfaces
+);
+
+#define VA_PROGRESSIVE 0x1
+/**
+ * vaCreateContext - Create a context
+ *  dpy: display
+ *  config_id: configuration for the context
+ *  picture_width: coded picture width
+ *  picture_height: coded picture height
+ *  flag: any combination of the following:
+ *    VA_PROGRESSIVE (only progressive frame pictures in the sequence when set)
+ *  render_targets: a hint for render targets (surfaces) tied to the context
+ *  num_render_targets: number of render targets in the above array
+ *  context: created context id upon return
+ */
+VAStatus vaCreateContext (
+    VADisplay dpy,
+    VAConfigID config_id,
+    int picture_width,
+    int picture_height,
+    int flag,
+    VASurfaceID *render_targets,
+    int num_render_targets,
+    VAContextID *context		/* out */
+);
+
+/**
+ * vaDestroyContext - Destroy a context
+ *  dpy: display
+ *  context: context to be destroyed
+ */
+VAStatus vaDestroyContext (
+    VADisplay dpy,
+    VAContextID context
+);
+
+//Multi-frame context
+typedef VAGenericID VAMFContextID;
+/**
+ * vaCreateMFContext - Create a multi-frame context
+ *  interface encapsulating common for all streams memory objects and structures
+ *  required for single GPU task submission from several VAContextID's.
+ *  Allocation: This call only creates an instance, doesn't allocate any additional memory.
+ *  Support identification: Application can identify multi-frame feature support by ability
+ *  to create multi-frame context. If driver supports multi-frame - call successful,
+ *  mf_context != NULL and VAStatus = VA_STATUS_SUCCESS, otherwise if multi-frame processing
+ *  not supported driver returns VA_STATUS_ERROR_UNIMPLEMENTED and mf_context = NULL.
+ *  return values:
+ *  VA_STATUS_SUCCESS - operation successful.
+ *  VA_STATUS_ERROR_UNIMPLEMENTED - no support for multi-frame.
+ *  dpy: display adapter.
+ *  mf_context: Multi-Frame context encapsulating all associated context
+ *  for multi-frame submission.
+ */
+VAStatus vaCreateMFContext (
+    VADisplay dpy,
+    VAMFContextID *mf_context    /* out */
+);
+
+/**
+ * vaMFAddContext - Provide ability to associate each context used for
+ *  Multi-Frame submission and common Multi-Frame context.
+ *  Try to add context to understand if it is supported.
+ *  Allocation: this call allocates and/or reallocates all memory objects
+ *  common for all contexts associated with particular Multi-Frame context.
+ *  All memory required for each context(pixel buffers, internal driver
+ *  buffers required for processing) allocated during standard vaCreateContext call for each context.
+ *  Runtime dependency - if current implementation doesn't allow to run different entry points/profile,
+ *  first context added will set entry point/profile for whole Multi-Frame context,
+ *  all other entry points and profiles can be rejected to be added.
+ *  Return values:
+ *  VA_STATUS_SUCCESS - operation successful, context was added.
+ *  VA_STATUS_ERROR_OPERATION_FAILED - something unexpected happened - application have to close
+ *  current mf_context and associated contexts and start working with new ones.
+ *  VA_STATUS_ERROR_INVALID_CONTEXT - ContextID is invalid, means:
+ *  1 - mf_context is not valid context or
+ *  2 - driver can't suport different VAEntrypoint or VAProfile simultaneosly
+ *  and current context contradicts with previously added, application can continue with current mf_context
+ *  and other contexts passed this call, rejected context can continue work in stand-alone
+ *  mode or other mf_context.
+ *  VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT - particular context being added was created with with
+ *  unsupported VAEntrypoint. Application can continue with current mf_context
+ *  and other contexts passed this call, rejected context can continue work in stand-alone
+ *  mode.
+ *  VA_STATUS_ERROR_UNSUPPORTED_PROFILE - Current context with Particular VAEntrypoint is supported
+ *  but VAProfile is not supported. Application can continue with current mf_context
+ *  and other contexts passed this call, rejected context can continue work in stand-alone
+ *  mode.
+ *  dpy: display adapter.
+ *  context: context being associated with Multi-Frame context.
+ *  mf_context: - multi-frame context used to associate contexts for multi-frame submission.
+ */
+VAStatus vaMFAddContext (
+    VADisplay dpy,
+    VAMFContextID mf_context,
+    VAContextID context
+);
+
+/**
+ * vaMFReleaseContext - Removes context from multi-frame and
+ *  association with multi-frame context.
+ *  After association removed vaEndPicture will submit tasks, but not vaMFSubmit.
+ *  Return values:
+ *  VA_STATUS_SUCCESS - operation successful, context was removed.
+ *  VA_STATUS_ERROR_OPERATION_FAILED - something unexpected happened.
+ *  application need to destroy this VAMFContextID and all assotiated VAContextID
+ *  dpy: display
+ *  mf_context: VAMFContextID where context is added
+ *  context: VAContextID to be added
+ */
+VAStatus vaMFReleaseContext (
+    VADisplay dpy,
+    VAMFContextID mf_context,
+    VAContextID context
+);
+
+/**
+ * Buffers
+ * Buffers are used to pass various types of data from the
+ * client to the server. The server maintains a data store
+ * for each buffer created, and the client idenfies a buffer
+ * through a unique buffer id assigned by the server.
+ */
+
+typedef VAGenericID VABufferID;
+
+typedef enum
+{
+    VAPictureParameterBufferType	= 0,
+    VAIQMatrixBufferType		= 1,
+    VABitPlaneBufferType		= 2,
+    VASliceGroupMapBufferType		= 3,
+    VASliceParameterBufferType		= 4,
+    VASliceDataBufferType		= 5,
+    VAMacroblockParameterBufferType	= 6,
+    VAResidualDataBufferType		= 7,
+    VADeblockingParameterBufferType	= 8,
+    VAImageBufferType			= 9,
+    VAProtectedSliceDataBufferType	= 10,
+    VAQMatrixBufferType                 = 11,
+    VAHuffmanTableBufferType            = 12,
+    VAProbabilityBufferType             = 13,
+
+/* Following are encode buffer types */
+    VAEncCodedBufferType		= 21,
+    VAEncSequenceParameterBufferType	= 22,
+    VAEncPictureParameterBufferType	= 23,
+    VAEncSliceParameterBufferType	= 24,
+    VAEncPackedHeaderParameterBufferType = 25,
+    VAEncPackedHeaderDataBufferType     = 26,
+    VAEncMiscParameterBufferType	= 27,
+    VAEncMacroblockParameterBufferType	= 28,
+    VAEncMacroblockMapBufferType        = 29,
+
+    /**
+     * \brief Encoding QP buffer
+     *
+     * This buffer contains QP per MB for encoding. Currently
+     * VAEncQPBufferH264 is defined for H.264 encoding, see
+     * #VAEncQPBufferH264 for details
+     */
+    VAEncQPBufferType                   = 30,
+/* Following are video processing buffer types */
+    /**
+     * \brief Video processing pipeline parameter buffer.
+     *
+     * This buffer describes the video processing pipeline. See
+     * #VAProcPipelineParameterBuffer for details.
+     */
+    VAProcPipelineParameterBufferType   = 41,
+    /**
+     * \brief Video filter parameter buffer.
+     *
+     * This buffer describes the video filter parameters. All buffers
+     * inherit from #VAProcFilterParameterBufferBase, thus including
+     * a unique filter buffer type.
+     *
+     * The default buffer used by most filters is #VAProcFilterParameterBuffer.
+     * Filters requiring advanced parameters include, but are not limited to,
+     * deinterlacing (#VAProcFilterParameterBufferDeinterlacing),
+     * color balance (#VAProcFilterParameterBufferColorBalance), etc.
+     */
+    VAProcFilterParameterBufferType     = 42,
+    /**
+     * \brief FEI specific buffer types
+     */
+    VAEncFEIMVBufferType                = 43,
+    VAEncFEIMBCodeBufferType            = 44,
+    VAEncFEIDistortionBufferType        = 45,
+    VAEncFEIMBControlBufferType         = 46,
+    VAEncFEIMVPredictorBufferType       = 47,
+    VAStatsStatisticsParameterBufferType = 48,
+    /** \brief Statistics output for VAEntrypointStats progressive and top field of interlaced case*/
+    VAStatsStatisticsBufferType         = 49,
+    /** \brief Statistics output for VAEntrypointStats bottom field of interlaced case*/
+    VAStatsStatisticsBottomFieldBufferType = 50,
+    VAStatsMVBufferType                 = 51,
+    VAStatsMVPredictorBufferType        = 52,
+    /** Force MB's to be non skip for encode.it's per-mb control buffer, The width of the MB map
+     * Surface is (width of the Picture in MB unit) * 1 byte, multiple of 64 bytes.
+     * The height is (height of the picture in MB unit). The picture is either
+     * frame or non-interleaved top or bottom field.  If the application provides this
+     *surface, it will override the "skipCheckDisable" setting in VAEncMiscParameterEncQuality.
+     */
+    VAEncMacroblockDisableSkipMapBufferType = 53,
+    /**
+     * \brief HEVC FEI CTB level cmd buffer
+     * it is CTB level information for future usage.
+     */
+    VAEncFEICTBCmdBufferType            = 54,
+    /**
+     * \brief HEVC FEI CU level data buffer
+     * it's CTB level information for future usage
+     */
+    VAEncFEICURecordBufferType          = 55,
+    /** decode stream out buffer, intermedia data of decode, it may include MV, MB mode etc.
+      * it can be used to detect motion and analyze the frame contain  */
+    VADecodeStreamoutBufferType             = 56,
+
+    /** \brief HEVC Decoding Subset Parameter buffer type
+     *
+     * The subsets parameter buffer is concatenation with one or multiple
+     * subset entry point offsets. All the offset values are layed out one
+     * by one according to slice order with first slice segment first, second
+     * slice segment second, etc... The entry number is indicated by parameter
+     * \ref num_entry_point_offsets. And the first entry position of the entry
+     * point offsets for any slice segment is indicated by parameter
+     * entry_offset_to_subset_array in VAPictureParameterBufferHEVC data structure.
+     */
+    VASubsetsParameterBufferType        = 57,
+
+    VABufferTypeMax
+} VABufferType;
+
+/**
+ * Processing rate parameter for encode.
+ */
+typedef struct _VAProcessingRateParameterEnc {
+    /** \brief Profile level */
+    uint8_t         level_idc;
+    uint8_t         reserved[3];
+    /** \brief quality level. When set to 0, default quality
+     * level is used.
+     */
+    uint32_t        quality_level;
+    /** \brief Period between I frames. */
+    uint32_t        intra_period;
+    /** \brief Period between I/P frames. */
+    uint32_t        ip_period;
+} VAProcessingRateParameterEnc;
+
+/**
+ * Processing rate parameter for decode.
+ */
+typedef struct _VAProcessingRateParameterDec {
+    /** \brief Profile level */
+    uint8_t         level_idc;
+    uint8_t         reserved0[3];
+    uint32_t        reserved;
+} VAProcessingRateParameterDec;
+
+typedef struct _VAProcessingRateParameter {
+    union {
+        VAProcessingRateParameterEnc proc_buf_enc;
+        VAProcessingRateParameterDec proc_buf_dec;
+    };
+} VAProcessingRateParameter;
+
+/**
+ * \brief Queries processing rate for the supplied config.
+ *
+ * This function queries the processing rate based on parameters in
+ * \c proc_buf for the given \c config. Upon successful return, the processing
+ * rate value will be stored in \c processing_rate. Processing rate is
+ * specified as the number of macroblocks/CTU per second.
+ *
+ * If NULL is passed to the \c proc_buf, the default processing rate for the
+ * given configuration will be returned.
+ *
+ * @param[in] dpy               the VA display
+ * @param[in] config            the config identifying a codec or a video
+ *     processing pipeline
+ * @param[in] proc_buf       the buffer that contains the parameters for
+        either the encode or decode processing rate
+ * @param[out] processing_rate  processing rate in number of macroblocks per
+        second constrained by parameters specified in proc_buf
+ *
+ */
+VAStatus
+vaQueryProcessingRate(
+    VADisplay           dpy,
+    VAConfigID          config,
+    VAProcessingRateParameter *proc_buf,
+    unsigned int       *processing_rate
+);
+
+typedef enum
+{
+    VAEncMiscParameterTypeFrameRate 	= 0,
+    VAEncMiscParameterTypeRateControl  	= 1,
+    VAEncMiscParameterTypeMaxSliceSize	= 2,
+    VAEncMiscParameterTypeAIR    	= 3,
+    /** \brief Buffer type used to express a maximum frame size (in bits). */
+    VAEncMiscParameterTypeMaxFrameSize  = 4,
+    /** \brief Buffer type used for HRD parameters. */
+    VAEncMiscParameterTypeHRD           = 5,
+    VAEncMiscParameterTypeQualityLevel  = 6,
+    /** \brief Buffer type used for Rolling intra refresh */
+    VAEncMiscParameterTypeRIR           = 7,
+    /** \brief Buffer type used for quantization parameters, it's per-sequence parameter*/
+    VAEncMiscParameterTypeQuantization  = 8,
+    /** \brief Buffer type used for sending skip frame parameters to the encoder's
+      * rate control, when the user has externally skipped frames. */
+    VAEncMiscParameterTypeSkipFrame     = 9,
+    /** \brief Buffer type used for region-of-interest (ROI) parameters. */
+    VAEncMiscParameterTypeROI           = 10,
+    /** \brief Buffer type used to express a maximum frame size (in bytes) settings for multiple pass. */
+    VAEncMiscParameterTypeMultiPassFrameSize       = 11,
+    /** \brief Buffer type used for temporal layer structure */
+    VAEncMiscParameterTypeTemporalLayerStructure   = 12,
+    /** \brief Buffer type used for dirty region-of-interest (ROI) parameters. */
+    VAEncMiscParameterTypeDirtyRect      = 13,
+    /** \brief Buffer type used for parallel BRC parameters. */
+    VAEncMiscParameterTypeParallelBRC   = 14,
+    /** \brief Set MB partion mode mask and Half-pel/Quant-pel motion search */
+    VAEncMiscParameterTypeSubMbPartPel = 15,
+    /** \brief set encode quality tuning */
+    VAEncMiscParameterTypeEncQuality = 16,
+    /** \brief Buffer type used for encoder rounding offset parameters. */
+    VAEncMiscParameterTypeCustomRoundingControl = 17,
+    /** \brief Buffer type used for FEI input frame level parameters */
+    VAEncMiscParameterTypeFEIFrameControl = 18,
+    /** \brief encode extension buffer, ect. MPEG2 Sequence extenstion data */
+    VAEncMiscParameterTypeExtensionData = 19
+} VAEncMiscParameterType;
+
+/** \brief Packed header type. */
+typedef enum {
+    /** \brief Packed sequence header. */
+    VAEncPackedHeaderSequence   = 1,
+    /** \brief Packed picture header. */
+    VAEncPackedHeaderPicture    = 2,
+    /** \brief Packed slice header. */
+    VAEncPackedHeaderSlice      = 3,
+    /**
+     * \brief Packed raw header.
+     *
+     * Packed raw data header can be used by the client to insert a header
+     * into the bitstream data buffer at the point it is passed, the driver
+     * will handle the raw packed header based on "has_emulation_bytes" field
+     * in the packed header parameter structure.
+     */
+    VAEncPackedHeaderRawData    = 4,
+    /**
+     * \brief Misc packed header. See codec-specific definitions.
+     *
+     * @deprecated
+     * This is a deprecated packed header type. All applications can use
+     * \c VAEncPackedHeaderRawData to insert a codec-specific packed header
+     */
+    VAEncPackedHeaderMiscMask va_deprecated_enum  = 0x80000000,
+} VAEncPackedHeaderType;
+
+/** \brief Packed header parameter. */
+typedef struct _VAEncPackedHeaderParameterBuffer {
+    /** Type of the packed header buffer. See #VAEncPackedHeaderType. */
+    uint32_t                type;
+    /** \brief Size of the #VAEncPackedHeaderDataBuffer in bits. */
+    uint32_t                bit_length;
+    /** \brief Flag: buffer contains start code emulation prevention bytes? */
+    uint8_t               has_emulation_bytes;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncPackedHeaderParameterBuffer;
+
+/**
+ *  For application, e.g. set a new bitrate
+ *    VABufferID buf_id;
+ *    VAEncMiscParameterBuffer *misc_param;
+ *    VAEncMiscParameterRateControl *misc_rate_ctrl;
+ *
+ *    vaCreateBuffer(dpy, context, VAEncMiscParameterBufferType,
+ *              sizeof(VAEncMiscParameterBuffer) + sizeof(VAEncMiscParameterRateControl),
+ *              1, NULL, &buf_id);
+ *
+ *    vaMapBuffer(dpy,buf_id,(void **)&misc_param);
+ *    misc_param->type = VAEncMiscParameterTypeRateControl;
+ *    misc_rate_ctrl= (VAEncMiscParameterRateControl *)misc_param->data;
+ *    misc_rate_ctrl->bits_per_second = 6400000;
+ *    vaUnmapBuffer(dpy, buf_id);
+ *    vaRenderPicture(dpy, context, &buf_id, 1);
+ */
+typedef struct _VAEncMiscParameterBuffer
+{
+    VAEncMiscParameterType type;
+    uint32_t data[];
+} VAEncMiscParameterBuffer;
+
+/** \brief Temporal layer Structure*/
+typedef struct _VAEncMiscParameterTemporalLayerStructure
+{
+    /** \brief The number of temporal layers */
+    uint32_t number_of_layers;
+    /** \brief The length of the array defining frame layer membership. Should be 1-32 */
+    uint32_t periodicity;
+    /**
+     * \brief The array indicating the layer id for each frame
+     *
+     * The layer id for the first frame in a coded sequence is always 0, so layer_id[] specifies the layer
+     * ids for frames starting from the 2nd frame.
+     */
+    uint32_t layer_id[32];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterTemporalLayerStructure;
+
+
+/** \brief Rate control parameters */
+typedef struct _VAEncMiscParameterRateControl
+{
+    /** The maximum bit-rate which the the rate controller should generate. */
+    uint32_t bits_per_second;
+    /** The target bit-rate which the rate controller should generate, as a percentage of the
+     * maximum bit-rate.
+     *
+     * In CBR mode this value is ignored (treated as 100%).
+     */
+    uint32_t target_percentage;
+    /** Rate control window size in milliseconds.
+     *
+     * The rate controller will attempt to guarantee that the target and maximum bit-rates are
+     * correct over this window.
+     */
+    uint32_t window_size;
+    /** Initial quantiser value used at the start of the stream.
+     *
+     * Ignored if set to zero.
+     */
+    uint32_t initial_qp;
+    /** Minimum quantiser value to use.
+     *
+     * The quantiser will not go below the value - if this limit is hit, the output bitrate may
+     * be lower than the target.  Ignored if set to zero.
+     */
+    uint32_t min_qp;
+    /** Basic unit size.
+     *
+     * Only used by some drivers - see driver documentation for details.  Set to zero if unused.
+     */
+    uint32_t basic_unit_size;
+    union
+    {
+        struct
+        {
+            /** Force rate controller reset.
+             *
+             * The next frame will be treated as the start of a new stream, with all rate
+             * controller state reset to its initial values.
+             */
+            uint32_t reset : 1;
+            /** Disable frame skip in rate control mode. */
+            uint32_t disable_frame_skip : 1;
+            /** Disable bit stuffing in rate control mode. */
+            uint32_t disable_bit_stuffing : 1;
+            /** Macroblock-level rate control.
+             *
+             * 0: use default, 1: always enable, 2: always disable, other: reserved.
+             *
+             * This feature is only available if VAConfigAttribRateControl has the
+             * \ref VA_RC_MB bit set.
+             */
+            uint32_t mb_rate_control : 4;
+            /** The temporal layer that these rate control parameters apply to. */
+            uint32_t temporal_id : 8;
+            /** Ensure that intra frames also conform to the constant frame size. */
+            uint32_t cfs_I_frames : 1;
+            /** Enable parallel rate control for hierarchical B frames.
+             *
+             * See \ref VA_RC_PARALLEL.
+             */
+            uint32_t enable_parallel_brc    : 1;
+            uint32_t enable_dynamic_scaling : 1;
+            /** Frame tolerance mode.
+             *
+             *  Indicates the tolerance the application has to variations in the frame size.
+             *  For example, wireless display scenarios may require very steady bit rate to
+             *  reduce buffering time. It affects the rate control algorithm used,
+             *  but may or may not have an effect based on the combination of other BRC
+             *  parameters.  Only valid when the driver reports support for
+             *  #VAConfigAttribFrameSizeToleranceSupport.
+             *
+             *  equals 0    -- normal mode;
+             *  equals 1    -- maps to sliding window;
+             *  equals 2    -- maps to low delay mode;
+             *  other       -- invalid.
+             */
+            uint32_t frame_tolerance_mode   : 2;
+            /** Reserved for future use, must be zero. */
+            uint32_t reserved               : 12;
+        } bits;
+        uint32_t value;
+    } rc_flags;
+    /** Initial quality factor used in ICQ mode.
+     *
+     * This value must be between 1 and 51.
+     * this value will be deprecated in future, to use quality_factor instead of it.
+     */
+    uint32_t ICQ_quality_factor;
+    /** Maximum quantiser value to use.
+     *
+     * The quantiser will not go above this value - if this limit is hit, the output bitrate
+     * may exceed the target.  Ignored if set to zero.
+     */
+    uint32_t max_qp;
+    /** Quality factor
+     *
+     *  the range will be different for different codec
+     */
+    uint32_t quality_factor;
+    /** Reserved bytes for future use, must be zero. */
+    uint32_t va_reserved[VA_PADDING_MEDIUM - 3];
+} VAEncMiscParameterRateControl;
+
+/** Encode framerate parameters.
+ *
+ * Sets the encode framerate used by the rate controller.  This should be
+ * provided in all modes using a bitrate target (variable framerate is not
+ * supported).
+ */
+typedef struct _VAEncMiscParameterFrameRate
+{
+    /** Encode framerate.
+     *
+     * The framerate is specified as a number of frames per second, as a
+     * fraction.  The denominator of the fraction is given in the top half
+     * (the high two bytes) of the framerate field, and the numerator is
+     * given in the bottom half (the low two bytes).
+     *
+     * That is:
+     * denominator = framerate >> 16 & 0xffff;
+     * numerator   = framerate & 0xffff;
+     * fps         = numerator / denominator;
+     *
+     * For example, if framerate is set to (100 << 16 | 750), this is
+     * 750 / 100, hence 7.5fps.
+     *
+     * If the denominator is zero (the high two bytes are both zero) then
+     * it takes the value one instead, so the framerate is just the integer
+     * in the low 2 bytes.
+     */
+    uint32_t framerate;
+    union
+    {
+        struct
+        {
+            /** The temporal layer that these framerate parameters apply to. */
+            uint32_t temporal_id : 8;
+            /** Reserved for future use, must be zero. */
+            uint32_t reserved : 24;
+         } bits;
+         uint32_t value;
+     } framerate_flags;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterFrameRate;
+
+/**
+ * Allow a maximum slice size to be specified (in bits).
+ * The encoder will attempt to make sure that individual slices do not exceed this size
+ * Or to signal applicate if the slice size exceed this size, see "status" of VACodedBufferSegment
+ */
+typedef struct _VAEncMiscParameterMaxSliceSize
+{
+    uint32_t max_slice_size;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterMaxSliceSize;
+
+typedef struct _VAEncMiscParameterAIR
+{
+    uint32_t air_num_mbs;
+    uint32_t air_threshold;
+    uint32_t air_auto; /* if set to 1 then hardware auto-tune the AIR threshold */
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterAIR;
+
+/*
+ * \brief Rolling intra refresh data structure for encoding.
+ */
+typedef struct _VAEncMiscParameterRIR
+{
+    union
+    {
+        struct
+	/**
+	 * \brief Indicate if intra refresh is enabled in column/row.
+	 *
+	 * App should query VAConfigAttribEncIntraRefresh to confirm RIR support
+	 * by the driver before sending this structure.
+         */
+        {
+	    /* \brief enable RIR in column */
+            uint32_t enable_rir_column : 1;
+	    /* \brief enable RIR in row */
+            uint32_t enable_rir_row : 1;
+	    uint32_t reserved : 30;
+        } bits;
+        uint32_t value;
+    } rir_flags;
+    /**
+     * \brief Indicates the column or row location in MB. It is ignored if
+     * rir_flags is 0.
+     */
+    uint16_t intra_insertion_location;
+    /**
+     * \brief Indicates the number of columns or rows in MB. It is ignored if
+     * rir_flags is 0.
+     */
+    uint16_t intra_insert_size;
+    /**
+     * \brief indicates the Qp difference for inserted intra columns or rows.
+     * App can use this to adjust intra Qp based on bitrate & max frame size.
+     */
+    uint8_t  qp_delta_for_inserted_intra;
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterRIR;
+
+/** HRD / VBV buffering parameters for encoding.
+ *
+ * This sets the HRD / VBV parameters which will be used by the rate
+ * controller for encoding.  It should be specified in modes using a bitrate
+ * target when the buffering of the output stream needs to be constrained.
+ *
+ * If not provided, the encoder may use arbitrary amounts of buffering.
+ */
+typedef struct _VAEncMiscParameterHRD
+{
+    /** The initial fullness of the HRD coded picture buffer, in bits.
+     *
+     * This sets how full the CPB is when encoding begins - that is, how much
+     * buffering will happen on the decoder side before the first frame.
+     * The CPB fullness will be reset to this value after any rate control
+     * reset (a change in parameters or an explicit reset).
+     *
+     * For H.264, it should match the value of initial_cpb_removal_delay in
+     * buffering_period SEI messages.
+     */
+    uint32_t initial_buffer_fullness;
+    /** The HRD coded picture buffer size, in bits.
+     *
+     * For H.264, it should match the value of cpb_size_value_minus1 in the VUI
+     * parameters.
+     */
+    uint32_t buffer_size;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterHRD;
+
+/**
+ * \brief Defines a maximum frame size (in bits).
+ *
+ * This misc parameter buffer defines the maximum size of a frame (in
+ * bits). The encoder will try to make sure that each frame does not
+ * exceed this size. Otherwise, if the frame size exceeds this size,
+ * the \c status flag of #VACodedBufferSegment will contain
+ * #VA_CODED_BUF_STATUS_FRAME_SIZE_OVERFLOW.
+ */
+typedef struct _VAEncMiscParameterBufferMaxFrameSize {
+    /** \brief Type. Shall be set to #VAEncMiscParameterTypeMaxFrameSize. */
+    /** duplicated with VAEncMiscParameterBuffer, should be deprecated*/
+    va_deprecated VAEncMiscParameterType      type;
+    /** \brief Maximum size of a frame (in bits). */
+    uint32_t                max_frame_size;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterBufferMaxFrameSize;
+
+/**
+ * \brief Maximum frame size (in bytes) settings for multiple pass.
+ *
+ * This misc parameter buffer defines the maximum size of a frame (in
+ * bytes) settings for multiple pass. currently only AVC encoder can
+ * support this settings in multiple pass case. If the frame size exceeds
+ * this size, the encoder will do more pak passes to adjust the QP value
+ * to control the frame size.
+ */
+typedef struct _VAEncMiscParameterBufferMultiPassFrameSize {
+    /** \brief Type. Shall be set to #VAEncMiscParameterTypeMultiPassMaxFrameSize. */
+    /** duplicated with VAEncMiscParameterBuffer, should be deprecated*/
+    va_deprecated VAEncMiscParameterType      type;
+    /** \brief Maximum size of a frame (in byte) */
+    uint32_t                max_frame_size;
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                reserved;
+    /** \brief number of passes, every pass has different QP, currently AVC encoder can support up to 4 passes */
+    uint8_t                 num_passes;
+    /** \brief delta QP list for every pass */
+    uint8_t                *delta_qp;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    unsigned long           va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterBufferMultiPassFrameSize;
+
+/**
+ * \brief Encoding quality level.
+ *
+ * The encoding quality could be set through this structure, if the implementation
+ * supports multiple quality levels. The quality level set through this structure is
+ * persistent over the entire coded sequence, or until a new structure is being sent.
+ * The quality level range can be queried through the VAConfigAttribEncQualityRange
+ * attribute. A lower value means higher quality, and a value of 1 represents the highest
+ * quality. The quality level setting is used as a trade-off between quality and speed/power
+ * consumption, with higher quality corresponds to lower speed and higher power consumption.
+ */
+typedef struct _VAEncMiscParameterBufferQualityLevel {
+    /** \brief Encoding quality level setting. When set to 0, default quality
+     * level is used.
+     */
+    uint32_t                quality_level;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterBufferQualityLevel;
+
+/**
+ * \brief Quantization settings for encoding.
+ *
+ * Some encoders support special types of quantization such as trellis, and this structure
+ * can be used by the app to control these special types of quantization by the encoder.
+ */
+typedef struct _VAEncMiscParameterQuantization
+{
+    union
+    {
+    /* if no flags is set then quantization is determined by the driver */
+        struct
+        {
+	    /* \brief disable trellis for all frames/fields */
+            uint32_t disable_trellis : 1;
+	    /* \brief enable trellis for I frames/fields */
+            uint32_t enable_trellis_I : 1;
+	    /* \brief enable trellis for P frames/fields */
+            uint32_t enable_trellis_P : 1;
+	    /* \brief enable trellis for B frames/fields */
+            uint32_t enable_trellis_B : 1;
+            uint32_t reserved : 28;
+        } bits;
+        uint32_t value;
+    } quantization_flags;
+    uint32_t va_reserved;
+} VAEncMiscParameterQuantization;
+
+/**
+ * \brief Encoding skip frame.
+ *
+ * The application may choose to skip frames externally to the encoder (e.g. drop completely or
+ * code as all skip's). For rate control purposes the encoder will need to know the size and number
+ * of skipped frames.  Skip frame(s) indicated through this structure is applicable only to the
+ * current frame.  It is allowed for the application to still send in packed headers for the driver to
+ * pack, although no frame will be encoded (e.g. for HW to encrypt the frame).
+ */
+typedef struct _VAEncMiscParameterSkipFrame {
+    /** \brief Indicates skip frames as below.
+      * 0: Encode as normal, no skip.
+      * 1: One or more frames were skipped prior to the current frame, encode the current frame as normal.
+      * 2: The current frame is to be skipped, do not encode it but pack/encrypt the packed header contents
+      *    (all except VAEncPackedHeaderSlice) which could contain actual frame contents (e.g. pack the frame
+      *    in VAEncPackedHeaderPicture).  */
+    uint8_t               skip_frame_flag;
+    /** \brief The number of frames skipped prior to the current frame.  Valid when skip_frame_flag = 1. */
+    uint8_t               num_skip_frames;
+    /** \brief When skip_frame_flag = 1, the size of the skipped frames in bits.   When skip_frame_flag = 2,
+      * the size of the current skipped frame that is to be packed/encrypted in bits. */
+    uint32_t                size_skip_frames;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterSkipFrame;
+
+/**
+ * \brief Encoding region-of-interest (ROI).
+ *
+ * The encoding ROI can be set through VAEncMiscParameterBufferROI, if the implementation
+ * supports ROI input. The ROI set through this structure is applicable only to the
+ * current frame or field, so must be sent every frame or field to be applied.  The number of
+ * supported ROIs can be queried through the VAConfigAttribEncROI.  The encoder will use the
+ * ROI information to adjust the QP values of the MB's that fall within the ROIs.
+ */
+typedef struct _VAEncROI
+{
+        /** \brief Defines the ROI boundary in pixels, the driver will map it to appropriate
+         *  codec coding units.  It is relative to frame coordinates for the frame case and
+         *  to field coordinates for the field case. */
+        VARectangle     roi_rectangle;
+        /**
+         * \brief ROI value
+         *
+         * \ref roi_value specifies ROI delta QP or ROI priority.
+         * --  ROI delta QP is the value that will be added on top of the frame level QP.
+         * --  ROI priority specifies the priority of a region, it can be positive (more important)
+         * or negative (less important) values and is compared with non-ROI region (taken as value 0),
+         * E.g. ROI region with \ref roi_value -3 is less important than the non-ROI region (\ref roi_value
+         * implied to be 0) which is less important than ROI region with roi_value +2. For overlapping
+         * regions, the roi_value that is first in the ROI array will have priority.
+         *
+         * \ref roi_value always specifes ROI delta QP when VAConfigAttribRateControl == VA_RC_CQP, no matter
+         * the value of \c roi_value_is_qp_delta in #VAEncMiscParameterBufferROI.
+         *
+         * \ref roi_value depends on \c roi_value_is_qp_delta in #VAEncMiscParameterBufferROI when
+         * VAConfigAttribRateControl != VA_RC_CQP. \ref roi_value specifies ROI_delta QP if \c roi_value_is_qp_delta
+         * in VAEncMiscParameterBufferROI is 1, otherwise \ref roi_value specifies ROI priority.
+         */
+        int8_t            roi_value;
+} VAEncROI;
+
+typedef struct _VAEncMiscParameterBufferROI {
+    /** \brief Number of ROIs being sent.*/
+    uint32_t        num_roi;
+
+    /** \brief Valid when VAConfigAttribRateControl != VA_RC_CQP, then the encoder's
+     *  rate control will determine actual delta QPs.  Specifies the max/min allowed delta
+     *  QPs. */
+    int8_t                max_delta_qp;
+    int8_t                min_delta_qp;
+
+   /** \brief Pointer to a VAEncROI array with num_roi elements.  It is relative to frame
+     *  coordinates for the frame case and to field coordinates for the field case.*/
+    VAEncROI            *roi;
+    union {
+        struct {
+            /**
+             * \brief An indication for roi value.
+             *
+             * \ref roi_value_is_qp_delta equal to 1 indicates \c roi_value in #VAEncROI should
+             * be used as ROI delta QP. \ref roi_value_is_qp_delta equal to 0 indicates \c roi_value
+             * in #VAEncROI should be used as ROI priority.
+             *
+             * \ref roi_value_is_qp_delta is only available when VAConfigAttribRateControl != VA_RC_CQP,
+             * the setting must comply with \c roi_rc_priority_support and \c roi_rc_qp_delta_support in
+             * #VAConfigAttribValEncROI. The underlying driver should ignore this field
+             * when VAConfigAttribRateControl == VA_RC_CQP.
+             */
+            uint32_t  roi_value_is_qp_delta    : 1;
+            uint32_t  reserved                 : 31;
+        } bits;
+        uint32_t value;
+    } roi_flags;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncMiscParameterBufferROI;
+/*
+ * \brief Dirty rectangle data structure for encoding.
+ *
+ * The encoding dirty rect can be set through VAEncMiscParameterBufferDirtyRect, if the
+ * implementation supports dirty rect input. The rect set through this structure is applicable
+ * only to the current frame or field, so must be sent every frame or field to be applied.
+ * The number of supported rects can be queried through the VAConfigAttribEncDirtyRect.  The
+ * encoder will use the rect information to know those rectangle areas have changed while the
+ * areas not covered by dirty rect rectangles are assumed to have not changed compared to the
+ * previous picture.  The encoder may do some internal optimizations.
+ */
+typedef struct _VAEncMiscParameterBufferDirtyRect
+{
+    /** \brief Number of Rectangle being sent.*/
+    uint32_t    num_roi_rectangle;
+
+    /** \brief Pointer to a VARectangle array with num_roi_rectangle elements.*/
+     VARectangle    *roi_rectangle;
+} VAEncMiscParameterBufferDirtyRect;
+
+/** \brief Attribute value for VAConfigAttribEncParallelRateControl */
+typedef struct _VAEncMiscParameterParallelRateControl {
+    /** brief Number of layers*/
+    uint32_t num_layers;
+    /** brief Number of B frames per layer per GOP.
+     *
+     * it should be allocated by application, and the is num_layers.
+     *  num_b_in_gop[0] is the number of regular B which refers to only I or P frames. */
+    uint32_t *num_b_in_gop;
+} VAEncMiscParameterParallelRateControl;
+
+/** per frame encoder quality controls, once set they will persist for all future frames
+  *till it is updated again. */
+typedef struct _VAEncMiscParameterEncQuality
+{
+    union
+    {
+        struct
+        {
+            /** Use raw frames for reference instead of reconstructed frames.
+              * it only impact motion estimation (ME)  stage, and will not impact MC stage
+              * so the reconstruct picture will can match with decode side */
+            uint32_t useRawPicForRef                    : 1;
+            /**  Disables skip check for ME stage, it will increase the bistream size
+              * but will improve the qulity */
+            uint32_t skipCheckDisable                   : 1;
+            /**  Indicates app will override default driver FTQ settings using FTQEnable.
+              *  FTQ is forward transform quantization */
+            uint32_t FTQOverride                        : 1;
+            /** Enables/disables FTQ. */
+            uint32_t FTQEnable                          : 1;
+            /** Indicates the app will provide the Skip Threshold LUT to use when FTQ is
+              * enabled (FTQSkipThresholdLUT), else default driver thresholds will be used. */
+            uint32_t FTQSkipThresholdLUTInput           : 1;
+            /** Indicates the app will provide the Skip Threshold LUT to use when FTQ is
+              * disabled (NonFTQSkipThresholdLUT), else default driver thresholds will be used. */
+            uint32_t NonFTQSkipThresholdLUTInput        : 1;
+            uint32_t ReservedBit                        : 1;
+            /** Control to enable the ME mode decision algorithm to bias to fewer B Direct/Skip types.
+              * Applies only to B frames, all other frames will ignore this setting.  */
+            uint32_t directBiasAdjustmentEnable         : 1;
+            /** Enables global motion bias. global motion also is called HME (Heirarchical Motion Estimation )
+              * HME is used to handle large motions and avoiding local minima in the video encoding process
+              * down scaled the input and reference picture, then do ME. the result will be a predictor to next level HME or ME
+              * current interface divide the HME to 3 level. UltraHME , SuperHME, and HME, result of UltraHME will be input of SurperHME,
+              * result of superHME will be a input for HME. HME result will be input of ME. it is a switch for HMEMVCostScalingFactor
+              * can change the HME bias inside RDO stage*/
+            uint32_t globalMotionBiasAdjustmentEnable   : 1;
+            /** MV cost scaling ratio for HME ( predictors.  It is used when
+              * globalMotionBiasAdjustmentEnable == 1, else it is ignored.  Values are:
+              *     0: set MV cost to be 0 for HME predictor.
+              *     1: scale MV cost to be 1/2 of the default value for HME predictor.
+              *     2: scale MV cost to be 1/4 of the default value for HME predictor.
+              *     3: scale MV cost to be 1/8 of the default value for HME predictor. */
+            uint32_t HMEMVCostScalingFactor             : 2;
+            /**disable HME, if it is disabled. Super*ultraHME should also be disabled  */
+            uint32_t HMEDisable                         : 1;
+            /**disable Super HME, if it is disabled, ultraHME should be disabled */
+            uint32_t SuperHMEDisable                    : 1;
+            /** disable Ultra HME */
+            uint32_t UltraHMEDisable                    : 1;
+            /** disable panic mode. Panic mode happened when there are extreme BRC (bit rate control) requirement
+              * frame size cant achieve the target of BRC.  when Panic mode is triggered, Coefficients will
+              *  be set to zero. disable panic mode will improve quality but will impact BRC */
+            uint32_t PanicModeDisable                   : 1;
+            /** Force RepartitionCheck
+             *  0: DEFAULT - follow driver default settings.
+             *  1: FORCE_ENABLE - enable this feature totally for all cases.
+             *  2: FORCE_DISABLE - disable this feature totally for all cases. */
+            uint32_t ForceRepartitionCheck              : 2;
+
+        };
+        uint32_t encControls;
+    };
+
+    /** Maps QP to skip thresholds when FTQ is enabled.  Valid range is 0-255. */
+    uint8_t FTQSkipThresholdLUT[52];
+    /** Maps QP to skip thresholds when FTQ is disabled.  Valid range is 0-65535. */
+    uint16_t NonFTQSkipThresholdLUT[52];
+
+    uint32_t reserved[VA_PADDING_HIGH];  // Reserved for future use.
+
+} VAEncMiscParameterEncQuality;
+
+/**
+ *  \brief Custom Encoder Rounding Offset Control.
+ *  Application may use this structure to set customized rounding
+ *  offset parameters for quantization.
+ *  Valid when \c VAConfigAttribCustomRoundingControl equals 1.
+ */
+typedef struct _VAEncMiscParameterCustomRoundingControl
+{
+    union {
+        struct {
+            /** \brief Enable customized rounding offset for intra blocks.
+             *  If 0, default value would be taken by driver for intra
+             *  rounding offset.
+             */
+            uint32_t    enable_custom_rouding_intra     : 1 ;
+
+            /** \brief Intra rounding offset
+             *  Ignored if \c enable_custom_rouding_intra equals 0.
+             */
+            uint32_t    rounding_offset_intra           : 7;
+
+            /** \brief Enable customized rounding offset for inter blocks.
+             *  If 0, default value would be taken by driver for inter
+             *  rounding offset.
+             */
+            uint32_t    enable_custom_rounding_inter    : 1 ;
+
+            /** \brief Inter rounding offset
+             *  Ignored if \c enable_custom_rouding_inter equals 0.
+             */
+            uint32_t    rounding_offset_inter           : 7;
+
+           /* Reserved */
+            uint32_t    reserved                        :16;
+        }  bits;
+        uint32_t    value;
+    }   rounding_offset_setting;
+} VAEncMiscParameterCustomRoundingControl;
+/**
+ * There will be cases where the bitstream buffer will not have enough room to hold
+ * the data for the entire slice, and the following flags will be used in the slice
+ * parameter to signal to the server for the possible cases.
+ * If a slice parameter buffer and slice data buffer pair is sent to the server with
+ * the slice data partially in the slice data buffer (BEGIN and MIDDLE cases below),
+ * then a slice parameter and data buffer needs to be sent again to complete this slice.
+ */
+#define VA_SLICE_DATA_FLAG_ALL		0x00	/* whole slice is in the buffer */
+#define VA_SLICE_DATA_FLAG_BEGIN	0x01	/* The beginning of the slice is in the buffer but the end if not */
+#define VA_SLICE_DATA_FLAG_MIDDLE	0x02	/* Neither beginning nor end of the slice is in the buffer */
+#define VA_SLICE_DATA_FLAG_END		0x04	/* end of the slice is in the buffer */
+
+/* Codec-independent Slice Parameter Buffer base */
+typedef struct _VASliceParameterBufferBase
+{
+    uint32_t slice_data_size;	/* number of bytes in the slice data buffer for this slice */
+    uint32_t slice_data_offset;	/* the offset to the first byte of slice data */
+    uint32_t slice_data_flag;	/* see VA_SLICE_DATA_FLAG_XXX definitions */
+} VASliceParameterBufferBase;
+
+/**********************************
+ * JPEG common  data structures
+ **********************************/
+/**
+ * \brief Huffman table for JPEG decoding.
+ *
+ * This structure holds the complete Huffman tables. This is an
+ * aggregation of all Huffman table (DHT) segments maintained by the
+ * application. i.e. up to 2 Huffman tables are stored in there for
+ * baseline profile.
+ *
+ * The #load_huffman_table array can be used as a hint to notify the
+ * VA driver implementation about which table(s) actually changed
+ * since the last submission of this buffer.
+ */
+typedef struct _VAHuffmanTableBufferJPEGBaseline {
+    /** \brief Specifies which #huffman_table is valid. */
+    uint8_t       load_huffman_table[2];
+    /** \brief Huffman tables indexed by table identifier (Th). */
+    struct {
+        /** @name DC table (up to 12 categories) */
+        /**@{*/
+        /** \brief Number of Huffman codes of length i + 1 (Li). */
+        uint8_t   num_dc_codes[16];
+        /** \brief Value associated with each Huffman code (Vij). */
+        uint8_t   dc_values[12];
+        /**@}*/
+        /** @name AC table (2 special codes + up to 16 * 10 codes) */
+        /**@{*/
+        /** \brief Number of Huffman codes of length i + 1 (Li). */
+        uint8_t   num_ac_codes[16];
+        /** \brief Value associated with each Huffman code (Vij). */
+        uint8_t   ac_values[162];
+        /** \brief Padding to 4-byte boundaries. Must be set to zero. */
+        uint8_t   pad[2];
+        /**@}*/
+    }                   huffman_table[2];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAHuffmanTableBufferJPEGBaseline;
+
+/****************************
+ * MPEG-2 data structures
+ ****************************/
+
+/* MPEG-2 Picture Parameter Buffer */
+/*
+ * For each frame or field, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferMPEG2
+{
+    uint16_t horizontal_size;
+    uint16_t vertical_size;
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    /* meanings of the following fields are the same as in the standard */
+    int32_t picture_coding_type;
+    int32_t f_code; /* pack all four fcode into this */
+    union {
+        struct {
+            uint32_t intra_dc_precision		: 2;
+            uint32_t picture_structure		: 2;
+            uint32_t top_field_first		: 1;
+            uint32_t frame_pred_frame_dct		: 1;
+            uint32_t concealment_motion_vectors	: 1;
+            uint32_t q_scale_type			: 1;
+            uint32_t intra_vlc_format		: 1;
+            uint32_t alternate_scan			: 1;
+            uint32_t repeat_first_field		: 1;
+            uint32_t progressive_frame		: 1;
+            uint32_t is_first_field			: 1; /* indicate whether the current field
+                                                              * is the first field for field picture
+                                                              */
+        } bits;
+        uint32_t value;
+    } picture_coding_extension;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAPictureParameterBufferMPEG2;
+
+/** MPEG-2 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferMPEG2
+{
+    /** \brief Same as the MPEG-2 bitstream syntax element. */
+    int32_t load_intra_quantiser_matrix;
+    /** \brief Same as the MPEG-2 bitstream syntax element. */
+    int32_t load_non_intra_quantiser_matrix;
+    /** \brief Same as the MPEG-2 bitstream syntax element. */
+    int32_t load_chroma_intra_quantiser_matrix;
+    /** \brief Same as the MPEG-2 bitstream syntax element. */
+    int32_t load_chroma_non_intra_quantiser_matrix;
+    /** \brief Luminance intra matrix, in zig-zag scan order. */
+    uint8_t intra_quantiser_matrix[64];
+    /** \brief Luminance non-intra matrix, in zig-zag scan order. */
+    uint8_t non_intra_quantiser_matrix[64];
+    /** \brief Chroma intra matrix, in zig-zag scan order. */
+    uint8_t chroma_intra_quantiser_matrix[64];
+    /** \brief Chroma non-intra matrix, in zig-zag scan order. */
+    uint8_t chroma_non_intra_quantiser_matrix[64];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAIQMatrixBufferMPEG2;
+
+/** MPEG-2 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferMPEG2
+{
+    uint32_t slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    uint32_t slice_data_offset;/* the offset to the first byte of slice data */
+    uint32_t slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    uint32_t macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    uint32_t slice_horizontal_position;
+    uint32_t slice_vertical_position;
+    int32_t quantiser_scale_code;
+    int32_t intra_slice_flag;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VASliceParameterBufferMPEG2;
+
+/** MPEG-2 Macroblock Parameter Buffer */
+typedef struct _VAMacroblockParameterBufferMPEG2
+{
+    uint16_t macroblock_address;
+    /*
+     * macroblock_address (in raster scan order)
+     * top-left: 0
+     * bottom-right: picture-height-in-mb*picture-width-in-mb - 1
+     */
+    uint8_t macroblock_type;  /* see definition below */
+    union {
+        struct {
+            uint32_t frame_motion_type		: 2;
+            uint32_t field_motion_type		: 2;
+            uint32_t dct_type			: 1;
+        } bits;
+        uint32_t value;
+    } macroblock_modes;
+    uint8_t motion_vertical_field_select;
+    /*
+     * motion_vertical_field_select:
+     * see section 6.3.17.2 in the spec
+     * only the lower 4 bits are used
+     * bit 0: first vector forward
+     * bit 1: first vector backward
+     * bit 2: second vector forward
+     * bit 3: second vector backward
+     */
+    int16_t PMV[2][2][2]; /* see Table 7-7 in the spec */
+    uint16_t coded_block_pattern;
+    /*
+     * The bitplanes for coded_block_pattern are described
+     * in Figure 6.10-12 in the spec
+     */
+
+    /* Number of skipped macroblocks after this macroblock */
+    uint16_t num_skipped_macroblocks;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAMacroblockParameterBufferMPEG2;
+
+/*
+ * OR'd flags for macroblock_type (section 6.3.17.1 in the spec)
+ */
+#define VA_MB_TYPE_MOTION_FORWARD	0x02
+#define VA_MB_TYPE_MOTION_BACKWARD	0x04
+#define VA_MB_TYPE_MOTION_PATTERN	0x08
+#define VA_MB_TYPE_MOTION_INTRA		0x10
+
+/**
+ * MPEG-2 Residual Data Buffer
+ * For each macroblock, there wil be 64 shorts (16-bit) in the
+ * residual data buffer
+ */
+
+/****************************
+ * MPEG-4 Part 2 data structures
+ ****************************/
+
+/* MPEG-4 Picture Parameter Buffer */
+/*
+ * For each frame or field, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferMPEG4
+{
+    uint16_t vop_width;
+    uint16_t vop_height;
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    union {
+        struct {
+            uint32_t short_video_header		: 1;
+            uint32_t chroma_format			: 2;
+            uint32_t interlaced			: 1;
+            uint32_t obmc_disable			: 1;
+            uint32_t sprite_enable			: 2;
+            uint32_t sprite_warping_accuracy	: 2;
+            uint32_t quant_type			: 1;
+            uint32_t quarter_sample			: 1;
+            uint32_t data_partitioned		: 1;
+            uint32_t reversible_vlc			: 1;
+            uint32_t resync_marker_disable		: 1;
+        } bits;
+        uint32_t value;
+    } vol_fields;
+    uint8_t no_of_sprite_warping_points;
+    int16_t sprite_trajectory_du[3];
+    int16_t sprite_trajectory_dv[3];
+    uint8_t quant_precision;
+    union {
+        struct {
+            uint32_t vop_coding_type		: 2;
+            uint32_t backward_reference_vop_coding_type	: 2;
+            uint32_t vop_rounding_type		: 1;
+            uint32_t intra_dc_vlc_thr		: 3;
+            uint32_t top_field_first		: 1;
+            uint32_t alternate_vertical_scan_flag	: 1;
+        } bits;
+        uint32_t value;
+    } vop_fields;
+    uint8_t vop_fcode_forward;
+    uint8_t vop_fcode_backward;
+    uint16_t vop_time_increment_resolution;
+    /* short header related */
+    uint8_t num_gobs_in_vop;
+    uint8_t num_macroblocks_in_gob;
+    /* for direct mode prediction */
+    int16_t TRB;
+    int16_t TRD;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAPictureParameterBufferMPEG4;
+
+/** MPEG-4 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferMPEG4
+{
+    /** Same as the MPEG-4:2 bitstream syntax element. */
+    int32_t load_intra_quant_mat;
+    /** Same as the MPEG-4:2 bitstream syntax element. */
+    int32_t load_non_intra_quant_mat;
+    /** The matrix for intra blocks, in zig-zag scan order. */
+    uint8_t intra_quant_mat[64];
+    /** The matrix for non-intra blocks, in zig-zag scan order. */
+    uint8_t non_intra_quant_mat[64];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAIQMatrixBufferMPEG4;
+
+/** MPEG-4 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferMPEG4
+{
+    uint32_t slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    uint32_t slice_data_offset;/* the offset to the first byte of slice data */
+    uint32_t slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    uint32_t macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    uint32_t macroblock_number;
+    int32_t quant_scale;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VASliceParameterBufferMPEG4;
+
+/**
+ VC-1 data structures
+*/
+
+typedef enum   /* see 7.1.1.32 */
+{
+    VAMvMode1Mv                        = 0,
+    VAMvMode1MvHalfPel                 = 1,
+    VAMvMode1MvHalfPelBilinear         = 2,
+    VAMvModeMixedMv                    = 3,
+    VAMvModeIntensityCompensation      = 4
+} VAMvModeVC1;
+
+/** VC-1 Picture Parameter Buffer */
+/*
+ * For each picture, and before any slice data, a picture parameter
+ * buffer must be send. Multiple picture parameter buffers may be
+ * sent for a single picture. In that case picture parameters will
+ * apply to all slice data that follow it until a new picture
+ * parameter buffer is sent.
+ *
+ * Notes:
+ *   pic_quantizer_type should be set to the applicable quantizer
+ *   type as defined by QUANTIZER (J.1.19) and either
+ *   PQUANTIZER (7.1.1.8) or PQINDEX (7.1.1.6)
+ */
+typedef struct _VAPictureParameterBufferVC1
+{
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    /* if out-of-loop post-processing is done on the render
+       target, then we need to keep the in-loop decoded
+       picture as a reference picture */
+    VASurfaceID inloop_decoded_picture;
+
+    /* sequence layer for AP or meta data for SP and MP */
+    union {
+        struct {
+            uint32_t pulldown	: 1; /* SEQUENCE_LAYER::PULLDOWN */
+            uint32_t interlace	: 1; /* SEQUENCE_LAYER::INTERLACE */
+            uint32_t tfcntrflag	: 1; /* SEQUENCE_LAYER::TFCNTRFLAG */
+            uint32_t finterpflag	: 1; /* SEQUENCE_LAYER::FINTERPFLAG */
+            uint32_t psf		: 1; /* SEQUENCE_LAYER::PSF */
+            uint32_t multires	: 1; /* METADATA::MULTIRES */
+            uint32_t overlap	: 1; /* METADATA::OVERLAP */
+            uint32_t syncmarker	: 1; /* METADATA::SYNCMARKER */
+            uint32_t rangered	: 1; /* METADATA::RANGERED */
+            uint32_t max_b_frames	: 3; /* METADATA::MAXBFRAMES */
+            uint32_t profile	: 2; /* SEQUENCE_LAYER::PROFILE or The MSB of METADATA::PROFILE */
+        } bits;
+        uint32_t value;
+    } sequence_fields;
+
+    uint16_t coded_width;		/* ENTRY_POINT_LAYER::CODED_WIDTH */
+    uint16_t coded_height;	/* ENTRY_POINT_LAYER::CODED_HEIGHT */
+    union {
+	struct {
+            uint32_t broken_link	: 1; /* ENTRY_POINT_LAYER::BROKEN_LINK */
+            uint32_t closed_entry	: 1; /* ENTRY_POINT_LAYER::CLOSED_ENTRY */
+            uint32_t panscan_flag	: 1; /* ENTRY_POINT_LAYER::PANSCAN_FLAG */
+            uint32_t loopfilter	: 1; /* ENTRY_POINT_LAYER::LOOPFILTER */
+	} bits;
+	uint32_t value;
+    } entrypoint_fields;
+    uint8_t conditional_overlap_flag; /* ENTRY_POINT_LAYER::CONDOVER */
+    uint8_t fast_uvmc_flag;	/* ENTRY_POINT_LAYER::FASTUVMC */
+    union {
+        struct {
+            uint32_t luma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPY_FLAG */
+            uint32_t luma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPY */
+            uint32_t chroma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPUV_FLAG */
+            uint32_t chroma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPUV */
+        } bits;
+        uint32_t value;
+    } range_mapping_fields;
+
+    uint8_t b_picture_fraction;	/* Index for PICTURE_LAYER::BFRACTION value in Table 40 (7.1.1.14) */
+    uint8_t cbp_table;		/* PICTURE_LAYER::CBPTAB/ICBPTAB */
+    uint8_t mb_mode_table;	/* PICTURE_LAYER::MBMODETAB */
+    uint8_t range_reduction_frame;/* PICTURE_LAYER::RANGEREDFRM */
+    uint8_t rounding_control;	/* PICTURE_LAYER::RNDCTRL */
+    uint8_t post_processing;	/* PICTURE_LAYER::POSTPROC */
+    uint8_t picture_resolution_index;	/* PICTURE_LAYER::RESPIC */
+    uint8_t luma_scale;		/* PICTURE_LAYER::LUMSCALE */
+    uint8_t luma_shift;		/* PICTURE_LAYER::LUMSHIFT */
+
+    union {
+        struct {
+            uint32_t picture_type		: 3; /* PICTURE_LAYER::PTYPE */
+            uint32_t frame_coding_mode	: 3; /* PICTURE_LAYER::FCM */
+            uint32_t top_field_first	: 1; /* PICTURE_LAYER::TFF */
+            uint32_t is_first_field		: 1; /* set to 1 if it is the first field */
+            uint32_t intensity_compensation	: 1; /* PICTURE_LAYER::INTCOMP */
+        } bits;
+        uint32_t value;
+    } picture_fields;
+    union {
+        struct {
+            uint32_t mv_type_mb	: 1; 	/* PICTURE::MVTYPEMB */
+            uint32_t direct_mb	: 1; 	/* PICTURE::DIRECTMB */
+            uint32_t skip_mb	: 1; 	/* PICTURE::SKIPMB */
+            uint32_t field_tx	: 1; 	/* PICTURE::FIELDTX */
+            uint32_t forward_mb	: 1;	/* PICTURE::FORWARDMB */
+            uint32_t ac_pred	: 1;	/* PICTURE::ACPRED */
+            uint32_t overflags	: 1;	/* PICTURE::OVERFLAGS */
+        } flags;
+        uint32_t value;
+    } raw_coding;
+    union {
+        struct {
+            uint32_t bp_mv_type_mb   : 1;    /* PICTURE::MVTYPEMB */
+            uint32_t bp_direct_mb    : 1;    /* PICTURE::DIRECTMB */
+            uint32_t bp_skip_mb      : 1;    /* PICTURE::SKIPMB */
+            uint32_t bp_field_tx     : 1;    /* PICTURE::FIELDTX */
+            uint32_t bp_forward_mb   : 1;    /* PICTURE::FORWARDMB */
+            uint32_t bp_ac_pred      : 1;    /* PICTURE::ACPRED */
+            uint32_t bp_overflags    : 1;    /* PICTURE::OVERFLAGS */
+        } flags;
+        uint32_t value;
+    } bitplane_present; /* signal what bitplane is being passed via the bitplane buffer */
+    union {
+        struct {
+            uint32_t reference_distance_flag : 1;/* PICTURE_LAYER::REFDIST_FLAG */
+            uint32_t reference_distance	: 5;/* PICTURE_LAYER::REFDIST */
+            uint32_t num_reference_pictures: 1;/* PICTURE_LAYER::NUMREF */
+            uint32_t reference_field_pic_indicator	: 1;/* PICTURE_LAYER::REFFIELD */
+        } bits;
+        uint32_t value;
+    } reference_fields;
+    union {
+        struct {
+            uint32_t mv_mode		: 3; /* PICTURE_LAYER::MVMODE */
+            uint32_t mv_mode2		: 3; /* PICTURE_LAYER::MVMODE2 */
+            uint32_t mv_table		: 3; /* PICTURE_LAYER::MVTAB/IMVTAB */
+            uint32_t two_mv_block_pattern_table: 2; /* PICTURE_LAYER::2MVBPTAB */
+            uint32_t four_mv_switch		: 1; /* PICTURE_LAYER::4MVSWITCH */
+            uint32_t four_mv_block_pattern_table : 2; /* PICTURE_LAYER::4MVBPTAB */
+            uint32_t extended_mv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_MV */
+            uint32_t extended_mv_range	: 2; /* PICTURE_LAYER::MVRANGE */
+            uint32_t extended_dmv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_DMV */
+            uint32_t extended_dmv_range	: 2; /* PICTURE_LAYER::DMVRANGE */
+        } bits;
+        uint32_t value;
+    } mv_fields;
+    union {
+        struct {
+            uint32_t dquant	: 2; 	/* ENTRY_POINT_LAYER::DQUANT */
+            uint32_t quantizer     : 2; 	/* ENTRY_POINT_LAYER::QUANTIZER */
+            uint32_t half_qp	: 1; 	/* PICTURE_LAYER::HALFQP */
+            uint32_t pic_quantizer_scale : 5;/* PICTURE_LAYER::PQUANT */
+            uint32_t pic_quantizer_type : 1;/* PICTURE_LAYER::PQUANTIZER */
+            uint32_t dq_frame	: 1; 	/* VOPDQUANT::DQUANTFRM */
+            uint32_t dq_profile	: 2; 	/* VOPDQUANT::DQPROFILE */
+            uint32_t dq_sb_edge	: 2; 	/* VOPDQUANT::DQSBEDGE */
+            uint32_t dq_db_edge 	: 2; 	/* VOPDQUANT::DQDBEDGE */
+            uint32_t dq_binary_level : 1; 	/* VOPDQUANT::DQBILEVEL */
+            uint32_t alt_pic_quantizer : 5;/* VOPDQUANT::ALTPQUANT */
+        } bits;
+        uint32_t value;
+    } pic_quantizer_fields;
+    union {
+        struct {
+            uint32_t variable_sized_transform_flag	: 1;/* ENTRY_POINT_LAYER::VSTRANSFORM */
+            uint32_t mb_level_transform_type_flag	: 1;/* PICTURE_LAYER::TTMBF */
+            uint32_t frame_level_transform_type	: 2;/* PICTURE_LAYER::TTFRM */
+            uint32_t transform_ac_codingset_idx1	: 2;/* PICTURE_LAYER::TRANSACFRM */
+            uint32_t transform_ac_codingset_idx2	: 2;/* PICTURE_LAYER::TRANSACFRM2 */
+            uint32_t intra_transform_dc_table	: 1;/* PICTURE_LAYER::TRANSDCTAB */
+        } bits;
+        uint32_t value;
+    } transform_fields;
+
+    uint8_t luma_scale2;                  /* PICTURE_LAYER::LUMSCALE2 */
+    uint8_t luma_shift2;                  /* PICTURE_LAYER::LUMSHIFT2 */
+    uint8_t intensity_compensation_field; /* Index for PICTURE_LAYER::INTCOMPFIELD value in Table 109 (9.1.1.48) */
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_MEDIUM - 1];
+} VAPictureParameterBufferVC1;
+
+/** VC-1 Bitplane Buffer
+There will be at most three bitplanes coded in any picture header. To send
+the bitplane data more efficiently, each byte is divided in two nibbles, with
+each nibble carrying three bitplanes for one macroblock.  The following table
+shows the bitplane data arrangement within each nibble based on the picture
+type.
+
+Picture Type	Bit3		Bit2		Bit1		Bit0
+I or BI				OVERFLAGS	ACPRED		FIELDTX
+P				MYTYPEMB	SKIPMB		DIRECTMB
+B				FORWARDMB	SKIPMB		DIRECTMB
+
+Within each byte, the lower nibble is for the first MB and the upper nibble is
+for the second MB.  E.g. the lower nibble of the first byte in the bitplane
+buffer is for Macroblock #1 and the upper nibble of the first byte is for
+Macroblock #2 in the first row.
+*/
+
+/* VC-1 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferVC1
+{
+    uint32_t slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    uint32_t slice_data_offset;/* the offset to the first byte of slice data */
+    uint32_t slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    uint32_t macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    uint32_t slice_vertical_position;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VASliceParameterBufferVC1;
+
+/* VC-1 Slice Data Buffer */
+/*
+This is simplely a buffer containing raw bit-stream bytes
+*/
+
+/****************************
+ * H.264/AVC data structures
+ ****************************/
+
+typedef struct _VAPictureH264
+{
+    VASurfaceID picture_id;
+    uint32_t frame_idx;
+    uint32_t flags;
+    int32_t TopFieldOrderCnt;
+    int32_t BottomFieldOrderCnt;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAPictureH264;
+/* flags in VAPictureH264 could be OR of the following */
+#define VA_PICTURE_H264_INVALID			0x00000001
+#define VA_PICTURE_H264_TOP_FIELD		0x00000002
+#define VA_PICTURE_H264_BOTTOM_FIELD		0x00000004
+#define VA_PICTURE_H264_SHORT_TERM_REFERENCE	0x00000008
+#define VA_PICTURE_H264_LONG_TERM_REFERENCE	0x00000010
+
+/** H.264 Picture Parameter Buffer */
+/*
+ * For each picture, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferH264
+{
+    VAPictureH264 CurrPic;
+    VAPictureH264 ReferenceFrames[16];	/* in DPB */
+    uint16_t picture_width_in_mbs_minus1;
+    uint16_t picture_height_in_mbs_minus1;
+    uint8_t bit_depth_luma_minus8;
+    uint8_t bit_depth_chroma_minus8;
+    uint8_t num_ref_frames;
+    union {
+        struct {
+            uint32_t chroma_format_idc			: 2;
+            uint32_t residual_colour_transform_flag		: 1; /* Renamed to separate_colour_plane_flag in newer standard versions. */
+            uint32_t gaps_in_frame_num_value_allowed_flag	: 1;
+            uint32_t frame_mbs_only_flag			: 1;
+            uint32_t mb_adaptive_frame_field_flag		: 1;
+            uint32_t direct_8x8_inference_flag		: 1;
+            uint32_t MinLumaBiPredSize8x8			: 1; /* see A.3.3.2 */
+            uint32_t log2_max_frame_num_minus4		: 4;
+            uint32_t pic_order_cnt_type			: 2;
+            uint32_t log2_max_pic_order_cnt_lsb_minus4	: 4;
+            uint32_t delta_pic_order_always_zero_flag	: 1;
+        } bits;
+        uint32_t value;
+    } seq_fields;
+    // FMO is not supported.
+    va_deprecated uint8_t num_slice_groups_minus1;
+    va_deprecated uint8_t slice_group_map_type;
+    va_deprecated uint16_t slice_group_change_rate_minus1;
+    int8_t pic_init_qp_minus26;
+    int8_t pic_init_qs_minus26;
+    int8_t chroma_qp_index_offset;
+    int8_t second_chroma_qp_index_offset;
+    union {
+        struct {
+            uint32_t entropy_coding_mode_flag	: 1;
+            uint32_t weighted_pred_flag		: 1;
+            uint32_t weighted_bipred_idc		: 2;
+            uint32_t transform_8x8_mode_flag	: 1;
+            uint32_t field_pic_flag			: 1;
+            uint32_t constrained_intra_pred_flag	: 1;
+            uint32_t pic_order_present_flag			: 1; /* Renamed to bottom_field_pic_order_in_frame_present_flag in newer standard versions. */
+            uint32_t deblocking_filter_control_present_flag : 1;
+            uint32_t redundant_pic_cnt_present_flag		: 1;
+            uint32_t reference_pic_flag			: 1; /* nal_ref_idc != 0 */
+        } bits;
+        uint32_t value;
+    } pic_fields;
+    uint16_t frame_num;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_MEDIUM];
+} VAPictureParameterBufferH264;
+
+/** H.264 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferH264
+{
+    /** \brief 4x4 scaling list, in raster scan order. */
+    uint8_t ScalingList4x4[6][16];
+    /** \brief 8x8 scaling list, in raster scan order. */
+    uint8_t ScalingList8x8[2][64];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAIQMatrixBufferH264;
+
+/** H.264 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferH264
+{
+    uint32_t slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    /** \brief Byte offset to the NAL Header Unit for this slice. */
+    uint32_t slice_data_offset;
+    uint32_t slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    /**
+     * \brief Bit offset from NAL Header Unit to the begining of slice_data().
+     *
+     * This bit offset is relative to and includes the NAL unit byte
+     * and represents the number of bits parsed in the slice_header()
+     * after the removal of any emulation prevention bytes in
+     * there. However, the slice data buffer passed to the hardware is
+     * the original bitstream, thus including any emulation prevention
+     * bytes.
+     */
+    uint16_t slice_data_bit_offset;
+    uint16_t first_mb_in_slice;
+    uint8_t slice_type;
+    uint8_t direct_spatial_mv_pred_flag;
+    /**
+     * H264/AVC syntax element
+     *
+     * if num_ref_idx_active_override_flag equals 0, host decoder should
+     * set its value to num_ref_idx_l0_default_active_minus1.
+     */
+    uint8_t num_ref_idx_l0_active_minus1;
+    /**
+     * H264/AVC syntax element
+     *
+     * if num_ref_idx_active_override_flag equals 0, host decoder should
+     * set its value to num_ref_idx_l1_default_active_minus1.
+     */
+    uint8_t num_ref_idx_l1_active_minus1;
+    uint8_t cabac_init_idc;
+    int8_t slice_qp_delta;
+    uint8_t disable_deblocking_filter_idc;
+    int8_t slice_alpha_c0_offset_div2;
+    int8_t slice_beta_offset_div2;
+    VAPictureH264 RefPicList0[32];	/* See 8.2.4.2 */
+    VAPictureH264 RefPicList1[32];	/* See 8.2.4.2 */
+    uint8_t luma_log2_weight_denom;
+    uint8_t chroma_log2_weight_denom;
+    uint8_t luma_weight_l0_flag;
+    int16_t luma_weight_l0[32];
+    int16_t luma_offset_l0[32];
+    uint8_t chroma_weight_l0_flag;
+    int16_t chroma_weight_l0[32][2];
+    int16_t chroma_offset_l0[32][2];
+    uint8_t luma_weight_l1_flag;
+    int16_t luma_weight_l1[32];
+    int16_t luma_offset_l1[32];
+    uint8_t chroma_weight_l1_flag;
+    int16_t chroma_weight_l1[32][2];
+    int16_t chroma_offset_l1[32][2];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VASliceParameterBufferH264;
+
+/****************************
+ * Common encode data structures
+ ****************************/
+typedef enum
+{
+    VAEncPictureTypeIntra		= 0,
+    VAEncPictureTypePredictive		= 1,
+    VAEncPictureTypeBidirectional	= 2,
+} VAEncPictureType;
+
+/**
+ * \brief Encode Slice Parameter Buffer.
+ *
+ * @deprecated
+ * This is a deprecated encode slice parameter buffer, All applications
+ * \c can use VAEncSliceParameterBufferXXX (XXX = MPEG2, HEVC, H264, JPEG)
+ */
+typedef struct _VAEncSliceParameterBuffer
+{
+    uint32_t start_row_number;	/* starting MB row number for this slice */
+    uint32_t slice_height;	/* slice height measured in MB */
+    union {
+        struct {
+            uint32_t is_intra	: 1;
+            uint32_t disable_deblocking_filter_idc : 2;
+            uint32_t uses_long_term_ref		:1;
+            uint32_t is_long_term_ref		:1;
+        } bits;
+        uint32_t value;
+    } slice_flags;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncSliceParameterBuffer;
+
+
+/****************************
+ * H.263 specific encode data structures
+ ****************************/
+
+typedef struct _VAEncSequenceParameterBufferH263
+{
+    uint32_t intra_period;
+    uint32_t bits_per_second;
+    uint32_t frame_rate;
+    uint32_t initial_qp;
+    uint32_t min_qp;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncSequenceParameterBufferH263;
+
+typedef struct _VAEncPictureParameterBufferH263
+{
+    VASurfaceID reference_picture;
+    VASurfaceID reconstructed_picture;
+    VABufferID coded_buf;
+    uint16_t picture_width;
+    uint16_t picture_height;
+    VAEncPictureType picture_type;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncPictureParameterBufferH263;
+
+/****************************
+ * MPEG-4 specific encode data structures
+ ****************************/
+
+typedef struct _VAEncSequenceParameterBufferMPEG4
+{
+    uint8_t profile_and_level_indication;
+    uint32_t intra_period;
+    uint32_t video_object_layer_width;
+    uint32_t video_object_layer_height;
+    uint32_t vop_time_increment_resolution;
+    uint32_t fixed_vop_rate;
+    uint32_t fixed_vop_time_increment;
+    uint32_t bits_per_second;
+    uint32_t frame_rate;
+    uint32_t initial_qp;
+    uint32_t min_qp;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncSequenceParameterBufferMPEG4;
+
+typedef struct _VAEncPictureParameterBufferMPEG4
+{
+    VASurfaceID reference_picture;
+    VASurfaceID reconstructed_picture;
+    VABufferID coded_buf;
+    uint16_t picture_width;
+    uint16_t picture_height;
+    uint32_t modulo_time_base; /* number of 1s */
+    uint32_t vop_time_increment;
+    VAEncPictureType picture_type;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAEncPictureParameterBufferMPEG4;
+
+
+
+/** Buffer functions */
+
+/**
+ * Creates a buffer for "num_elements" elements of "size" bytes and
+ * initalize with "data".
+ * if "data" is null, then the contents of the buffer data store
+ * are undefined.
+ * Basically there are two ways to get buffer data to the server side. One is
+ * to call vaCreateBuffer() with a non-null "data", which results the data being
+ * copied to the data store on the server side.  A different method that
+ * eliminates this copy is to pass null as "data" when calling vaCreateBuffer(),
+ * and then use vaMapBuffer() to map the data store from the server side to the
+ * client address space for access.
+ * The user must call vaDestroyBuffer() to destroy a buffer.
+ *  Note: image buffers are created by the library, not the client. Please see
+ *        vaCreateImage on how image buffers are managed.
+ */
+VAStatus vaCreateBuffer (
+    VADisplay dpy,
+    VAContextID context,
+    VABufferType type,	/* in */
+    unsigned int size,	/* in */
+    unsigned int num_elements, /* in */
+    void *data,		/* in */
+    VABufferID *buf_id	/* out */
+);
+
+/**
+ * Create a buffer for given width & height get unit_size, pitch, buf_id for 2D buffer
+ * for permb qp buffer, it will return unit_size for one MB or LCU and the pitch for alignments
+ * can call vaMapBuffer with this Buffer ID to get virtual address.
+ * e.g. AVC 1080P encode, 1920x1088, the size in MB is 120x68,but inside driver,
+ * maybe it should align with 256, and one byte present one Qp.so, call the function.
+ * then get unit_size = 1, pitch = 256. call vaMapBuffer to get the virtual address (pBuf).
+ * then read write the memory like 2D. the size is 256x68, application can only use 120x68
+ * pBuf + 256 is the start of next line.
+ * different driver implementation maybe return different unit_size and pitch
+ */
+VAStatus vaCreateBuffer2(
+    VADisplay dpy,
+    VAContextID context,
+    VABufferType type,
+    unsigned int width,
+    unsigned int height,
+    unsigned int *unit_size,
+    unsigned int *pitch,
+    VABufferID *buf_id
+);
+
+/**
+ * Convey to the server how many valid elements are in the buffer.
+ * e.g. if multiple slice parameters are being held in a single buffer,
+ * this will communicate to the server the number of slice parameters
+ * that are valid in the buffer.
+ */
+VAStatus vaBufferSetNumElements (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    unsigned int num_elements /* in */
+);
+
+
+/**
+ * device independent data structure for codedbuffer
+ */
+
+/*
+ * FICTURE_AVE_QP(bit7-0): The average Qp value used during this frame
+ * LARGE_SLICE(bit8):At least one slice in the current frame was large
+ *              enough for the encoder to attempt to limit its size.
+ * SLICE_OVERFLOW(bit9): At least one slice in the current frame has
+ *              exceeded the maximum slice size specified.
+ * BITRATE_OVERFLOW(bit10): The peak bitrate was exceeded for this frame.
+ * BITRATE_HIGH(bit11): The frame size got within the safety margin of the maximum size (VCM only)
+ * AIR_MB_OVER_THRESHOLD: the number of MBs adapted to Intra MB
+ */
+#define VA_CODED_BUF_STATUS_PICTURE_AVE_QP_MASK         0xff
+#define VA_CODED_BUF_STATUS_LARGE_SLICE_MASK            0x100
+#define VA_CODED_BUF_STATUS_SLICE_OVERFLOW_MASK         0x200
+#define VA_CODED_BUF_STATUS_BITRATE_OVERFLOW		0x400
+#define VA_CODED_BUF_STATUS_BITRATE_HIGH		0x800
+/**
+ * \brief The frame has exceeded the maximum requested size.
+ *
+ * This flag indicates that the encoded frame size exceeds the value
+ * specified through a misc parameter buffer of type
+ * #VAEncMiscParameterTypeMaxFrameSize.
+ */
+#define VA_CODED_BUF_STATUS_FRAME_SIZE_OVERFLOW         0x1000
+/**
+ * \brief the bitstream is bad or corrupt.
+ */
+#define VA_CODED_BUF_STATUS_BAD_BITSTREAM               0x8000
+#define VA_CODED_BUF_STATUS_AIR_MB_OVER_THRESHOLD	0xff0000
+
+/**
+ * \brief The coded buffer segment status contains frame encoding passes number
+ *
+ * This is the mask to get the number of encoding passes from the coded
+ * buffer segment status.
+ * NUMBER_PASS(bit24~bit27): the number for encoding passes executed for the coded frame.
+ *
+ */
+#define VA_CODED_BUF_STATUS_NUMBER_PASSES_MASK          0xf000000
+
+/**
+ * \brief The coded buffer segment contains a single NAL unit.
+ *
+ * This flag indicates that the coded buffer segment contains a
+ * single NAL unit. This flag might be useful to the user for
+ * processing the coded buffer.
+ */
+#define VA_CODED_BUF_STATUS_SINGLE_NALU                 0x10000000
+
+/**
+ * \brief Coded buffer segment.
+ *
+ * #VACodedBufferSegment is an element of a linked list describing
+ * some information on the coded buffer. The coded buffer segment
+ * could contain either a single NAL unit, or more than one NAL unit.
+ * It is recommended (but not required) to return a single NAL unit
+ * in a coded buffer segment, and the implementation should set the
+ * VA_CODED_BUF_STATUS_SINGLE_NALU status flag if that is the case.
+ */
+typedef  struct _VACodedBufferSegment  {
+    /**
+     * \brief Size of the data buffer in this segment (in bytes).
+     */
+    uint32_t        size;
+    /** \brief Bit offset into the data buffer where the video data starts. */
+    uint32_t        bit_offset;
+    /** \brief Status set by the driver. See \c VA_CODED_BUF_STATUS_*. */
+    uint32_t        status;
+    /** \brief Reserved for future use. */
+    uint32_t        reserved;
+    /** \brief Pointer to the start of the data buffer. */
+    void               *buf;
+    /**
+     * \brief Pointer to the next #VACodedBufferSegment element,
+     * or \c NULL if there is none.
+     */
+    void               *next;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VACodedBufferSegment;
+
+/**
+ * Map data store of the buffer into the client's address space
+ * vaCreateBuffer() needs to be called with "data" set to NULL before
+ * calling vaMapBuffer()
+ *
+ * if buffer type is VAEncCodedBufferType, pbuf points to link-list of
+ * VACodedBufferSegment, and the list is terminated if "next" is NULL
+ */
+VAStatus vaMapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    void **pbuf 	/* out */
+);
+
+/**
+ * After client making changes to a mapped data store, it needs to
+ * "Unmap" it to let the server know that the data is ready to be
+ * consumed by the server
+ */
+VAStatus vaUnmapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id	/* in */
+);
+
+/**
+ * After this call, the buffer is deleted and this buffer_id is no longer valid
+ *
+ * A buffer can be re-used and sent to the server by another Begin/Render/End
+ * sequence if vaDestroyBuffer() is not called with this buffer.
+ *
+ * Note re-using a shared buffer (e.g. a slice data buffer) between the host and the
+ * hardware accelerator can result in performance dropping.
+ */
+VAStatus vaDestroyBuffer (
+    VADisplay dpy,
+    VABufferID buffer_id
+);
+
+/** \brief VA buffer information */
+typedef struct {
+    /** \brief Buffer handle */
+    uintptr_t           handle;
+    /** \brief Buffer type (See \ref VABufferType). */
+    uint32_t            type;
+    /**
+     * \brief Buffer memory type (See \ref VASurfaceAttribMemoryType).
+     *
+     * On input to vaAcquireBufferHandle(), this field can serve as a hint
+     * to specify the set of memory types the caller is interested in.
+     * On successful return from vaAcquireBufferHandle(), the field is
+     * updated with the best matching memory type.
+     */
+    uint32_t            mem_type;
+    /** \brief Size of the underlying buffer. */
+    size_t              mem_size;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VABufferInfo;
+
+/**
+ * \brief Acquires buffer handle for external API usage
+ *
+ * Locks the VA buffer object \ref buf_id for external API usage like
+ * EGL or OpenCL (OCL). This function is a synchronization point. This
+ * means that any pending operation is guaranteed to be completed
+ * prior to returning from the function.
+ *
+ * If the referenced VA buffer object is the backing store of a VA
+ * surface, then this function acts as if vaSyncSurface() on the
+ * parent surface was called first.
+ *
+ * The \ref VABufferInfo argument shall be zero'ed on input. On
+ * successful output, the data structure is filled in with all the
+ * necessary buffer level implementation details like handle, type,
+ * memory type and memory size.
+ *
+ * Note: the external API implementation, or the application, can
+ * express the memory types it is interested in by filling in the \ref
+ * mem_type field accordingly. On successful output, the memory type
+ * that fits best the request and that was used is updated in the \ref
+ * VABufferInfo data structure. If none of the supplied memory types
+ * is supported, then a \ref VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE
+ * error is returned.
+ *
+ * The \ref VABufferInfo data is valid until vaReleaseBufferHandle()
+ * is called. Besides, no additional operation is allowed on any of
+ * the buffer parent object until vaReleaseBufferHandle() is called.
+ * e.g. decoding into a VA surface backed with the supplied VA buffer
+ * object \ref buf_id would fail with a \ref VA_STATUS_ERROR_SURFACE_BUSY
+ * error.
+ *
+ * Possible errors:
+ * - \ref VA_STATUS_ERROR_UNIMPLEMENTED: the VA driver implementation
+ *   does not support this interface
+ * - \ref VA_STATUS_ERROR_INVALID_DISPLAY: an invalid display was supplied
+ * - \ref VA_STATUS_ERROR_INVALID_BUFFER: an invalid buffer was supplied
+ * - \ref VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE: the implementation
+ *   does not support exporting buffers of the specified type
+ * - \ref VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE: none of the requested
+ *   memory types in \ref VABufferInfo.mem_type was supported
+ *
+ * @param[in] dpy               the VA display
+ * @param[in] buf_id            the VA buffer
+ * @param[in,out] buf_info      the associated VA buffer information
+ * @return VA_STATUS_SUCCESS if successful
+ */
+VAStatus
+vaAcquireBufferHandle(VADisplay dpy, VABufferID buf_id, VABufferInfo *buf_info);
+
+/**
+ * \brief Releases buffer after usage from external API
+ *
+ * Unlocks the VA buffer object \ref buf_id from external API usage like
+ * EGL or OpenCL (OCL). This function is a synchronization point. This
+ * means that any pending operation is guaranteed to be completed
+ * prior to returning from the function.
+ *
+ * The \ref VABufferInfo argument shall point to the original data
+ * structure that was obtained from vaAcquireBufferHandle(), unaltered.
+ * This is necessary so that the VA driver implementation could
+ * deallocate any resources that were needed.
+ *
+ * In any case, returning from this function invalidates any contents
+ * in \ref VABufferInfo. i.e. the underlyng buffer handle is no longer
+ * valid. Therefore, VA driver implementations are free to reset this
+ * data structure to safe defaults.
+ *
+ * Possible errors:
+ * - \ref VA_STATUS_ERROR_UNIMPLEMENTED: the VA driver implementation
+ *   does not support this interface
+ * - \ref VA_STATUS_ERROR_INVALID_DISPLAY: an invalid display was supplied
+ * - \ref VA_STATUS_ERROR_INVALID_BUFFER: an invalid buffer was supplied
+ * - \ref VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE: the implementation
+ *   does not support exporting buffers of the specified type
+ *
+ * @param[in] dpy               the VA display
+ * @param[in] buf_id            the VA buffer
+ * @return VA_STATUS_SUCCESS if successful
+ */
+VAStatus
+vaReleaseBufferHandle(VADisplay dpy, VABufferID buf_id);
+
+/** @name vaExportSurfaceHandle() flags
+ *
+ * @{
+ */
+/** Export surface to be read by external API. */
+#define VA_EXPORT_SURFACE_READ_ONLY        0x0001
+/** Export surface to be written by external API. */
+#define VA_EXPORT_SURFACE_WRITE_ONLY       0x0002
+/** Export surface to be both read and written by external API. */
+#define VA_EXPORT_SURFACE_READ_WRITE       0x0003
+/** Export surface with separate layers.
+ *
+ * For example, NV12 surfaces should be exported as two separate
+ * planes for luma and chroma.
+ */
+#define VA_EXPORT_SURFACE_SEPARATE_LAYERS  0x0004
+/** Export surface with composed layers.
+ *
+ * For example, NV12 surfaces should be exported as a single NV12
+ * composed object.
+ */
+#define VA_EXPORT_SURFACE_COMPOSED_LAYERS  0x0008
+
+/** @} */
+
+/**
+ * \brief Export a handle to a surface for use with an external API
+ *
+ * The exported handles are owned by the caller, and the caller is
+ * responsible for freeing them when no longer needed (e.g. by closing
+ * DRM PRIME file descriptors).
+ *
+ * This does not perform any synchronisation.  If the contents of the
+ * surface will be read, vaSyncSurface() must be called before doing so.
+ * If the contents of the surface are written, then all operations must
+ * be completed externally before using the surface again by via VA-API
+ * functions.
+ *
+ * @param[in] dpy          VA display.
+ * @param[in] surface_id   Surface to export.
+ * @param[in] mem_type     Memory type to export to.
+ * @param[in] flags        Combination of flags to apply
+ *   (VA_EXPORT_SURFACE_*).
+ * @param[out] descriptor  Pointer to the descriptor structure to fill
+ *   with the handle details.  The type of this structure depends on
+ *   the value of mem_type.
+ *
+ * @return Status code:
+ * - VA_STATUS_SUCCESS:    Success.
+ * - VA_STATUS_ERROR_INVALID_DISPLAY:  The display is not valid.
+ * - VA_STATUS_ERROR_UNIMPLEMENTED:  The driver does not implement
+ *     this interface.
+ * - VA_STATUS_ERROR_INVALID_SURFACE:  The surface is not valid, or
+ *     the surface is not exportable in the specified way.
+ * - VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE:  The driver does not
+ *     support exporting surfaces to the specified memory type.
+ */
+VAStatus vaExportSurfaceHandle(VADisplay dpy,
+                               VASurfaceID surface_id,
+                               uint32_t mem_type, uint32_t flags,
+                               void *descriptor);
+
+/**
+ * Render (Video Decode/Encode/Processing) Pictures
+ *
+ * A picture represents either a frame or a field.
+ *
+ * The Begin/Render/End sequence sends the video decode/encode/processing buffers
+ * to the server
+ */
+
+/**
+ * Get ready for a video pipeline
+ * - decode a picture to a target surface
+ * - encode a picture from a target surface
+ * - process a picture to a target surface
+ */
+VAStatus vaBeginPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VASurfaceID render_target
+);
+
+/**
+ * Send video decode, encode or processing buffers to the server.
+ */
+VAStatus vaRenderPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID *buffers,
+    int num_buffers
+);
+
+/**
+ * Make the end of rendering for a picture.
+ * The server should start processing all pending operations for this
+ * surface. This call is non-blocking. The client can start another
+ * Begin/Render/End sequence on a different render target.
+ * if VAContextID used in this function previously successfully passed
+ * vaMFAddContext call, real processing will be started during vaMFSubmit
+ */
+VAStatus vaEndPicture (
+    VADisplay dpy,
+    VAContextID context
+);
+
+/**
+ * Make the end of rendering for a pictures in contexts passed with submission.
+ * The server should start processing all pending operations for contexts.
+ * All contexts passed should be associated through vaMFAddContext
+ * and call sequence Begin/Render/End performed.
+ * This call is non-blocking. The client can start another
+ * Begin/Render/End/vaMFSubmit sequence on a different render targets.
+ * Return values:
+ * VA_STATUS_SUCCESS - operation successful, context was removed.
+ * VA_STATUS_ERROR_INVALID_CONTEXT - mf_context or one of contexts are invalid
+ * due to mf_context not created or one of contexts not assotiated with mf_context
+ * through vaAddContext.
+ * VA_STATUS_ERROR_INVALID_PARAMETER - one of context has not submitted it's frame
+ * through vaBeginPicture vaRenderPicture vaEndPicture call sequence.
+ * dpy: display
+ * mf_context: Multi-Frame context
+ * contexts: list of contexts submitting their tasks for multi-frame operation.
+ * num_contexts: number of passed contexts.
+ */
+VAStatus vaMFSubmit (
+    VADisplay dpy,
+    VAMFContextID mf_context,
+    VAContextID * contexts,
+    int num_contexts
+);
+
+/*
+
+Synchronization
+
+*/
+
+/**
+ * This function blocks until all pending operations on the render target
+ * have been completed.  Upon return it is safe to use the render target for a
+ * different picture.
+ */
+VAStatus vaSyncSurface (
+    VADisplay dpy,
+    VASurfaceID render_target
+);
+
+typedef enum
+{
+    VASurfaceRendering	= 1, /* Rendering in progress */
+    VASurfaceDisplaying	= 2, /* Displaying in progress (not safe to render into it) */
+                             /* this status is useful if surface is used as the source */
+                             /* of an overlay */
+    VASurfaceReady	= 4, /* not being rendered or displayed */
+    VASurfaceSkipped	= 8  /* Indicate a skipped frame during encode */
+} VASurfaceStatus;
+
+/**
+ * Find out any pending ops on the render target
+ */
+VAStatus vaQuerySurfaceStatus (
+    VADisplay dpy,
+    VASurfaceID render_target,
+    VASurfaceStatus *status	/* out */
+);
+
+typedef enum
+{
+    VADecodeSliceMissing            = 0,
+    VADecodeMBError                 = 1,
+} VADecodeErrorType;
+
+/**
+ * Client calls vaQuerySurfaceError with VA_STATUS_ERROR_DECODING_ERROR, server side returns
+ * an array of structure VASurfaceDecodeMBErrors, and the array is terminated by setting status=-1
+*/
+typedef struct _VASurfaceDecodeMBErrors
+{
+    int32_t status; /* 1 if hardware has returned detailed info below, -1 means this record is invalid */
+    uint32_t start_mb; /* start mb address with errors */
+    uint32_t end_mb;  /* end mb address with errors */
+    VADecodeErrorType decode_error_type;
+    uint32_t num_mb;   /* number of mbs with errors */
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW - 1];
+} VASurfaceDecodeMBErrors;
+
+/**
+ * After the application gets VA_STATUS_ERROR_DECODING_ERROR after calling vaSyncSurface(),
+ * it can call vaQuerySurfaceError to find out further details on the particular error.
+ * VA_STATUS_ERROR_DECODING_ERROR should be passed in as "error_status",
+ * upon the return, error_info will point to an array of _VASurfaceDecodeMBErrors structure,
+ * which is allocated and filled by libVA with detailed information on the missing or error macroblocks.
+ * The array is terminated if "status==-1" is detected.
+ */
+VAStatus vaQuerySurfaceError(
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAStatus error_status,
+    void **error_info
+);
+
+/**
+ * Images and Subpictures
+ * VAImage is used to either get the surface data to client memory, or
+ * to copy image data in client memory to a surface.
+ * Both images, subpictures and surfaces follow the same 2D coordinate system where origin
+ * is at the upper left corner with positive X to the right and positive Y down
+ */
+#define VA_FOURCC(ch0, ch1, ch2, ch3) \
+    ((unsigned long)(unsigned char) (ch0) | ((unsigned long)(unsigned char) (ch1) << 8) | \
+    ((unsigned long)(unsigned char) (ch2) << 16) | ((unsigned long)(unsigned char) (ch3) << 24 ))
+
+/* Pre-defined fourcc codes. */
+
+/** NV12: two-plane 8-bit YUV 4:2:0.
+ * The first plane contains Y, the second plane contains U and V in pairs of bytes.
+ */
+#define VA_FOURCC_NV12		0x3231564E
+/** NV21: two-plane 8-bit YUV 4:2:0.
+ * Same as NV12, but with U and V swapped.
+ */
+#define VA_FOURCC_NV21		0x3132564E
+
+/** AI44: packed 4-bit YA.
+ *
+ * The bottom half of each byte contains luma, the top half contains alpha.
+ */
+#define VA_FOURCC_AI44		0x34344149
+
+/** RGBA: packed 8-bit RGBA.
+ *
+ * Four bytes per pixel: red, green, blue, alpha.
+ */
+#define VA_FOURCC_RGBA		0x41424752
+/** RGBX: packed 8-bit RGB.
+ *
+ * Four bytes per pixel: red, green, blue, unspecified.
+ */
+#define VA_FOURCC_RGBX		0x58424752
+/** BGRA: packed 8-bit RGBA.
+ *
+ * Four bytes per pixel: blue, green, red, alpha.
+ */
+#define VA_FOURCC_BGRA		0x41524742
+/** BGRX: packed 8-bit RGB.
+ *
+ * Four bytes per pixel: blue, green, red, unspecified.
+ */
+#define VA_FOURCC_BGRX		0x58524742
+/** ARGB: packed 8-bit RGBA.
+ *
+ * Four bytes per pixel: alpha, red, green, blue.
+ */
+#define VA_FOURCC_ARGB		0x42475241
+/** XRGB: packed 8-bit RGB.
+ *
+ * Four bytes per pixel: unspecified, red, green, blue.
+ */
+#define VA_FOURCC_XRGB		0x42475258
+/** ABGR: packed 8-bit RGBA.
+ *
+ * Four bytes per pixel: alpha, blue, green, red.
+ */
+#define VA_FOURCC_ABGR          0x52474241
+/** XBGR: packed 8-bit RGB.
+ *
+ * Four bytes per pixel: unspecified, blue, green, red.
+ */
+#define VA_FOURCC_XBGR          0x52474258
+
+/** UYUV: packed 8-bit YUV 4:2:2.
+ *
+ * Four bytes per pair of pixels: U, Y, U, V.
+ */
+#define VA_FOURCC_UYVY          0x59565955
+/** YUY2: packed 8-bit YUV 4:2:2.
+ *
+ * Four bytes per pair of pixels: Y, U, Y, V.
+ */
+#define VA_FOURCC_YUY2          0x32595559
+/** AYUV: packed 8-bit YUVA 4:4:4.
+ *
+ * Four bytes per pixel: A, Y, U, V.
+ */
+#define VA_FOURCC_AYUV          0x56555941
+/** NV11: two-plane 8-bit YUV 4:1:1.
+ *
+ * The first plane contains Y, the second plane contains U and V in pairs of bytes.
+ */
+#define VA_FOURCC_NV11          0x3131564e
+/** YV12: three-plane 8-bit YUV 4:2:0.
+ *
+ * The three planes contain Y, V and U respectively.
+ */
+#define VA_FOURCC_YV12          0x32315659
+/** P208: two-plane 8-bit YUV 4:2:2.
+ *
+ * The first plane contains Y, the second plane contains U and V in pairs of bytes.
+ */
+#define VA_FOURCC_P208          0x38303250
+/** I420: three-plane 8-bit YUV 4:2:0.
+ *
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_I420          0x30323449
+/** YV24: three-plane 8-bit YUV 4:4:4.
+ *
+ * The three planes contain Y, V and U respectively.
+ */
+#define VA_FOURCC_YV24          0x34325659
+/** YV32: four-plane 8-bit YUVA 4:4:4
+ *
+ * The four planes contain Y, V, U and A respectively.
+ */
+#define VA_FOURCC_YV32          0x32335659
+/** Y800: 8-bit greyscale.
+ */
+#define VA_FOURCC_Y800          0x30303859
+/** IMC3: three-plane 8-bit YUV 4:2:0.
+ *
+ * Equivalent to YV12, but with the additional constraint that the pitch of all three planes
+ * must be the same.
+ */
+#define VA_FOURCC_IMC3          0x33434D49
+/** 411P: three-plane 8-bit YUV 4:1:1.
+ *
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_411P          0x50313134
+/** 411R: three-plane 8-bit YUV.
+ *
+ * The subsampling is the transpose of 4:1:1 - full chroma appears on every fourth line.
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_411R          0x52313134
+/** 422H: three-plane 8-bit YUV 4:2:2.
+ *
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_422H          0x48323234
+/** 422V: three-plane 8-bit YUV 4:4:0.
+ *
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_422V          0x56323234
+/** 444P: three-plane 8-bit YUV 4:4:4.
+ *
+ * The three planes contain Y, U and V respectively.
+ */
+#define VA_FOURCC_444P          0x50343434
+
+/** RGBP: three-plane 8-bit RGB.
+ *
+ * The three planes contain red, green and blue respectively.
+ */
+#define VA_FOURCC_RGBP          0x50424752
+/** BGRP: three-plane 8-bit RGB.
+ *
+ * The three planes contain blue, green and red respectively.
+ */
+#define VA_FOURCC_BGRP          0x50524742
+/** RG16: packed 5/6-bit RGB.
+ *
+ * Each pixel is a two-byte little-endian value.
+ * Red, green and blue are found in bits 15:11, 10:5, 4:0 respectively.
+ */
+#define VA_FOURCC_RGB565        0x36314752
+/** BG16: packed 5/6-bit RGB.
+ *
+ * Each pixel is a two-byte little-endian value.
+ * Blue, green and red are found in bits 15:11, 10:5, 4:0 respectively.
+ */
+#define VA_FOURCC_BGR565        0x36314742
+
+/** Y210: packed 10-bit YUV 4:2:2.
+ *
+ * Eight bytes represent a pair of pixels.  Each sample is a two-byte little-endian value,
+ * with the bottom six bits ignored.  The samples are in the order Y, U, Y, V.
+ */
+#define VA_FOURCC_Y210          0x30313259
+/** Y216: packed 16-bit YUV 4:2:2.
+ *
+ * Eight bytes represent a pair of pixels.  Each sample is a two-byte little-endian value.
+ * The samples are in the order Y, U, Y, V.
+ */
+#define VA_FOURCC_Y216          0x36313259
+/** Y410: packed 10-bit YUVA 4:4:4.
+ *
+ * Each pixel is a four-byte little-endian value.
+ * A, V, Y, U are found in bits 31:30, 29:20, 19:10, 9:0 respectively.
+ */
+#define VA_FOURCC_Y410          0x30313459
+/** Y416: packed 16-bit YUVA 4:4:4.
+ *
+ * Each pixel is a set of four samples, each of which is a two-byte little-endian value.
+ * The samples are in the order A, V, Y, U.
+ */
+#define VA_FOURCC_Y416          0x36313459
+
+/** YV16: three-plane 8-bit YUV 4:2:2.
+ *
+ * The three planes contain Y, V and U respectively.
+ */
+#define VA_FOURCC_YV16          0x36315659
+/** P010: two-plane 10-bit YUV 4:2:0.
+ *
+ * Each sample is a two-byte little-endian value with the bottom six bits ignored.
+ * The first plane contains Y, the second plane contains U and V in pairs of samples.
+ */
+#define VA_FOURCC_P010          0x30313050
+/** P016: two-plane 16-bit YUV 4:2:0.
+ *
+ * Each sample is a two-byte little-endian value.  The first plane contains Y, the second
+ * plane contains U and V in pairs of samples.
+ */
+#define VA_FOURCC_P016          0x36313050
+
+/** I010: three-plane 10-bit YUV 4:2:0.
+ *
+ * Each sample is a two-byte little-endian value with the top six bits ignored.
+ * The three planes contain Y, V and U respectively.
+ */
+#define VA_FOURCC_I010          0x30313049
+
+/** IYUV: three-plane 8-bit YUV 4:2:0.
+ *
+ * @deprecated Use I420 instead.
+ */
+#define VA_FOURCC_IYUV          0x56555949
+/**
+ * 10-bit Pixel RGB formats.
+ */
+#define VA_FOURCC_A2R10G10B10   0x30335241 /* VA_FOURCC('A','R','3','0') */
+/**
+ * 10-bit Pixel BGR formats.
+ */
+#define VA_FOURCC_A2B10G10R10   0x30334241 /* VA_FOURCC('A','B','3','0') */
+
+/** Y8: 8-bit greyscale.
+ *
+ * Only a single sample, 8 bit Y plane for monochrome images
+ */
+#define VA_FOURCC_Y8            0x20203859
+/** Y16: 16-bit greyscale.
+ *
+ * Only a single sample, 16 bit Y plane for monochrome images
+ */
+#define VA_FOURCC_Y16           0x20363159
+/** VYUV: packed 8-bit YUV 4:2:2.
+ *
+ * Four bytes per pair of pixels: V, Y, U, V.
+ */
+#define VA_FOURCC_VYUY          0x59555956
+/** YVYU: packed 8-bit YUV 4:2:2.
+ *
+ * Four bytes per pair of pixels: Y, V, Y, U.
+ */
+#define VA_FOURCC_YVYU          0x55595659
+/** AGRB64: three-plane 16-bit ARGB 16:16:16:16
+ *
+ * The four planes contain: alpha, red, green, blue respectively.
+ */
+#define VA_FOURCC_ARGB64        0x34475241
+/** ABGR64: three-plane 16-bit ABGR 16:16:16:16
+ *
+ * The four planes contain: alpha, blue, green, red respectively.
+ */
+#define VA_FOURCC_ABGR64        0x34474241
+
+/* byte order */
+#define VA_LSB_FIRST		1
+#define VA_MSB_FIRST		2
+
+typedef struct _VAImageFormat
+{
+    uint32_t	fourcc;
+    uint32_t	byte_order; /* VA_LSB_FIRST, VA_MSB_FIRST */
+    uint32_t	bits_per_pixel;
+    /* for RGB formats */
+    uint32_t	depth; /* significant bits per pixel */
+    uint32_t	red_mask;
+    uint32_t	green_mask;
+    uint32_t	blue_mask;
+    uint32_t	alpha_mask;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAImageFormat;
+
+typedef VAGenericID VAImageID;
+
+typedef struct _VAImage
+{
+    VAImageID		image_id; /* uniquely identify this image */
+    VAImageFormat	format;
+    VABufferID		buf;	/* image data buffer */
+    /*
+     * Image data will be stored in a buffer of type VAImageBufferType to facilitate
+     * data store on the server side for optimal performance. The buffer will be
+     * created by the CreateImage function, and proper storage allocated based on the image
+     * size and format. This buffer is managed by the library implementation, and
+     * accessed by the client through the buffer Map/Unmap functions.
+     */
+    uint16_t	width;
+    uint16_t	height;
+    uint32_t	data_size;
+    uint32_t	num_planes;	/* can not be greater than 3 */
+    /*
+     * An array indicating the scanline pitch in bytes for each plane.
+     * Each plane may have a different pitch. Maximum 3 planes for planar formats
+     */
+    uint32_t	pitches[3];
+    /*
+     * An array indicating the byte offset from the beginning of the image data
+     * to the start of each plane.
+     */
+    uint32_t	offsets[3];
+
+    /* The following fields are only needed for paletted formats */
+    int32_t num_palette_entries;   /* set to zero for non-palette images */
+    /*
+     * Each component is one byte and entry_bytes indicates the number of components in
+     * each entry (eg. 3 for YUV palette entries). set to zero for non-palette images
+     */
+    int32_t entry_bytes;
+    /*
+     * An array of ascii characters describing the order of the components within the bytes.
+     * Only entry_bytes characters of the string are used.
+     */
+    int8_t component_order[4];
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAImage;
+
+/** Get maximum number of image formats supported by the implementation */
+int vaMaxNumImageFormats (
+    VADisplay dpy
+);
+
+/**
+ * Query supported image formats
+ * The caller must provide a "format_list" array that can hold at
+ * least vaMaxNumImageFormats() entries. The actual number of formats
+ * returned in "format_list" is returned in "num_formats".
+ */
+VAStatus vaQueryImageFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    int *num_formats		/* out */
+);
+
+/**
+ * Create a VAImage structure
+ * The width and height fields returned in the VAImage structure may get
+ * enlarged for some YUV formats. Upon return from this function,
+ * image->buf has been created and proper storage allocated by the library.
+ * The client can access the image through the Map/Unmap calls.
+ */
+VAStatus vaCreateImage (
+    VADisplay dpy,
+    VAImageFormat *format,
+    int width,
+    int height,
+    VAImage *image	/* out */
+);
+
+/**
+ * Should call DestroyImage before destroying the surface it is bound to
+ */
+VAStatus vaDestroyImage (
+    VADisplay dpy,
+    VAImageID image
+);
+
+VAStatus vaSetImagePalette (
+    VADisplay dpy,
+    VAImageID image,
+    /*
+     * pointer to an array holding the palette data.  The size of the array is
+     * num_palette_entries * entry_bytes in size.  The order of the components
+     * in the palette is described by the component_order in VAImage struct
+     */
+    unsigned char *palette
+);
+
+/**
+ * Retrive surface data into a VAImage
+ * Image must be in a format supported by the implementation
+ */
+VAStatus vaGetImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    int x,	/* coordinates of the upper left source pixel */
+    int y,
+    unsigned int width, /* width and height of the region */
+    unsigned int height,
+    VAImageID image
+);
+
+/**
+ * Copy data from a VAImage to a surface
+ * Image must be in a format supported by the implementation
+ * Returns a VA_STATUS_ERROR_SURFACE_BUSY if the surface
+ * shouldn't be rendered into when this is called
+ */
+VAStatus vaPutImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImageID image,
+    int src_x,
+    int src_y,
+    unsigned int src_width,
+    unsigned int src_height,
+    int dest_x,
+    int dest_y,
+    unsigned int dest_width,
+    unsigned int dest_height
+);
+
+/**
+ * Derive an VAImage from an existing surface.
+ * This interface will derive a VAImage and corresponding image buffer from
+ * an existing VA Surface. The image buffer can then be mapped/unmapped for
+ * direct CPU access. This operation is only possible on implementations with
+ * direct rendering capabilities and internal surface formats that can be
+ * represented with a VAImage. When the operation is not possible this interface
+ * will return VA_STATUS_ERROR_OPERATION_FAILED. Clients should then fall back
+ * to using vaCreateImage + vaPutImage to accomplish the same task in an
+ * indirect manner.
+ *
+ * Implementations should only return success when the resulting image buffer
+ * would be useable with vaMap/Unmap.
+ *
+ * When directly accessing a surface special care must be taken to insure
+ * proper synchronization with the graphics hardware. Clients should call
+ * vaQuerySurfaceStatus to insure that a surface is not the target of concurrent
+ * rendering or currently being displayed by an overlay.
+ *
+ * Additionally nothing about the contents of a surface should be assumed
+ * following a vaPutSurface. Implementations are free to modify the surface for
+ * scaling or subpicture blending within a call to vaPutImage.
+ *
+ * Calls to vaPutImage or vaGetImage using the same surface from which the image
+ * has been derived will return VA_STATUS_ERROR_SURFACE_BUSY. vaPutImage or
+ * vaGetImage with other surfaces is supported.
+ *
+ * An image created with vaDeriveImage should be freed with vaDestroyImage. The
+ * image and image buffer structures will be destroyed; however, the underlying
+ * surface will remain unchanged until freed with vaDestroySurfaces.
+ */
+VAStatus vaDeriveImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImage *image	/* out */
+);
+
+/**
+ * Subpictures
+ * Subpicture is a special type of image that can be blended
+ * with a surface during vaPutSurface(). Subpicture can be used to render
+ * DVD sub-titles or closed captioning text etc.
+ */
+
+typedef VAGenericID VASubpictureID;
+
+/** Get maximum number of subpicture formats supported by the implementation */
+int vaMaxNumSubpictureFormats (
+    VADisplay dpy
+);
+
+/** flags for subpictures */
+#define VA_SUBPICTURE_CHROMA_KEYING			0x0001
+#define VA_SUBPICTURE_GLOBAL_ALPHA			0x0002
+#define VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD	0x0004
+/**
+ * Query supported subpicture formats
+ * The caller must provide a "format_list" array that can hold at
+ * least vaMaxNumSubpictureFormats() entries. The flags arrary holds the flag
+ * for each format to indicate additional capabilities for that format. The actual
+ * number of formats returned in "format_list" is returned in "num_formats".
+ *  flags: returned value to indicate addtional capabilities
+ *         VA_SUBPICTURE_CHROMA_KEYING - supports chroma-keying
+ *         VA_SUBPICTURE_GLOBAL_ALPHA - supports global alpha
+ * 	   VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD - supports unscaled screen relative subpictures for On Screen Display
+ */
+
+VAStatus vaQuerySubpictureFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    unsigned int *flags,	/* out */
+    unsigned int *num_formats	/* out */
+);
+
+/**
+ * Subpictures are created with an image associated.
+ */
+VAStatus vaCreateSubpicture (
+    VADisplay dpy,
+    VAImageID image,
+    VASubpictureID *subpicture	/* out */
+);
+
+/**
+ * Destroy the subpicture before destroying the image it is assocated to
+ */
+VAStatus vaDestroySubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture
+);
+
+/**
+ * Bind an image to the subpicture. This image will now be associated with
+ * the subpicture instead of the one at creation.
+ */
+VAStatus vaSetSubpictureImage (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VAImageID image
+);
+
+/**
+ * If chromakey is enabled, then the area where the source value falls within
+ * the chromakey [min, max] range is transparent
+ * The chromakey component format is the following:
+ *  For RGB: [0:7] Red [8:15] Blue [16:23] Green
+ *  For YUV: [0:7] V [8:15] U [16:23] Y
+ * The chromakey mask can be used to mask out certain components for chromakey
+ * comparision
+ */
+VAStatus vaSetSubpictureChromakey (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    unsigned int chromakey_min,
+    unsigned int chromakey_max,
+    unsigned int chromakey_mask
+);
+
+/**
+ * Global alpha value is between 0 and 1. A value of 1 means fully opaque and
+ * a value of 0 means fully transparent. If per-pixel alpha is also specified then
+ * the overall alpha is per-pixel alpha multiplied by the global alpha
+ */
+VAStatus vaSetSubpictureGlobalAlpha (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    float global_alpha
+);
+
+/**
+ * vaAssociateSubpicture associates the subpicture with target_surfaces.
+ * It defines the region mapping between the subpicture and the target
+ * surfaces through source and destination rectangles (with the same width and height).
+ * Both will be displayed at the next call to vaPutSurface.  Additional
+ * associations before the call to vaPutSurface simply overrides the association.
+ */
+VAStatus vaAssociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces,
+    int16_t src_x, /* upper left offset in subpicture */
+    int16_t src_y,
+    uint16_t src_width,
+    uint16_t src_height,
+    int16_t dest_x, /* upper left offset in surface */
+    int16_t dest_y,
+    uint16_t dest_width,
+    uint16_t dest_height,
+    /*
+     * whether to enable chroma-keying, global-alpha, or screen relative mode
+     * see VA_SUBPICTURE_XXX values
+     */
+    uint32_t flags
+);
+
+/**
+ * vaDeassociateSubpicture removes the association of the subpicture with target_surfaces.
+ */
+VAStatus vaDeassociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces
+);
+
+/**
+ * Display attributes
+ * Display attributes are used to control things such as contrast, hue, saturation,
+ * brightness etc. in the rendering process.  The application can query what
+ * attributes are supported by the driver, and then set the appropriate attributes
+ * before calling vaPutSurface()
+ */
+/* PowerVR IEP Lite attributes */
+typedef enum
+{
+    VADISPLAYATTRIB_BLE_OFF              = 0x00,
+    VADISPLAYATTRIB_BLE_LOW,
+    VADISPLAYATTRIB_BLE_MEDIUM,
+    VADISPLAYATTRIB_BLE_HIGH,
+    VADISPLAYATTRIB_BLE_NONE,
+} VADisplayAttribBLEMode;
+
+/** attribute value for VADisplayAttribRotation   */
+#define VA_ROTATION_NONE        0x00000000
+#define VA_ROTATION_90          0x00000001
+#define VA_ROTATION_180         0x00000002
+#define VA_ROTATION_270         0x00000003
+/**@}*/
+
+/**
+ * @name Mirroring directions
+ *
+ * Those values could be used for VADisplayAttribMirror attribute or
+ * VAProcPipelineParameterBuffer::mirror_state.
+
+ */
+/**@{*/
+/** \brief No Mirroring. */
+#define VA_MIRROR_NONE              0x00000000
+/** \brief Horizontal Mirroring. */
+#define VA_MIRROR_HORIZONTAL        0x00000001
+/** \brief Vertical Mirroring. */
+#define VA_MIRROR_VERTICAL          0x00000002
+/**@}*/
+
+/** attribute value for VADisplayAttribOutOfLoopDeblock */
+#define VA_OOL_DEBLOCKING_FALSE 0x00000000
+#define VA_OOL_DEBLOCKING_TRUE  0x00000001
+
+/** Render mode */
+#define VA_RENDER_MODE_UNDEFINED           0
+#define VA_RENDER_MODE_LOCAL_OVERLAY       1
+#define VA_RENDER_MODE_LOCAL_GPU           2
+#define VA_RENDER_MODE_EXTERNAL_OVERLAY    4
+#define VA_RENDER_MODE_EXTERNAL_GPU        8
+
+/** Render device */
+#define VA_RENDER_DEVICE_UNDEFINED  0
+#define VA_RENDER_DEVICE_LOCAL      1
+#define VA_RENDER_DEVICE_EXTERNAL   2
+
+/** Currently defined display attribute types */
+typedef enum
+{
+    VADisplayAttribBrightness		= 0,
+    VADisplayAttribContrast		= 1,
+    VADisplayAttribHue			= 2,
+    VADisplayAttribSaturation		= 3,
+    /* client can specifiy a background color for the target window
+     * the new feature of video conference,
+     * the uncovered area of the surface is filled by this color
+     * also it will blend with the decoded video color
+     */
+    VADisplayAttribBackgroundColor      = 4,
+    /*
+     * this is a gettable only attribute. For some implementations that use the
+     * hardware overlay, after PutSurface is called, the surface can not be
+     * re-used until after the subsequent PutSurface call. If this is the case
+     * then the value for this attribute will be set to 1 so that the client
+     * will not attempt to re-use the surface right after returning from a call
+     * to PutSurface.
+     *
+     * Don't use it, use flag VASurfaceDisplaying of vaQuerySurfaceStatus since
+     * driver may use overlay or GPU alternatively
+     */
+    VADisplayAttribDirectSurface       = 5,
+    VADisplayAttribRotation            = 6,
+    VADisplayAttribOutofLoopDeblock    = 7,
+
+    /* PowerVR IEP Lite specific attributes */
+    VADisplayAttribBLEBlackMode        = 8,
+    VADisplayAttribBLEWhiteMode        = 9,
+    VADisplayAttribBlueStretch         = 10,
+    VADisplayAttribSkinColorCorrection = 11,
+    /*
+     * For type VADisplayAttribCSCMatrix, "value" field is a pointer to the color
+     * conversion matrix. Each element in the matrix is float-point
+     */
+    VADisplayAttribCSCMatrix           = 12,
+    /* specify the constant color used to blend with video surface
+     * Cd = Cv*Cc*Ac + Cb *(1 - Ac) C means the constant RGB
+     *      d: the final color to overwrite into the frame buffer
+     *      v: decoded video after color conversion,
+     *      c: video color specified by VADisplayAttribBlendColor
+     *      b: background color of the drawable
+     */
+    VADisplayAttribBlendColor          = 13,
+    /*
+     * Indicate driver to skip painting color key or not.
+     * only applicable if the render is overlay
+     */
+    VADisplayAttribOverlayAutoPaintColorKey   = 14,
+    /*
+     * customized overlay color key, the format is RGB888
+     * [23:16] = Red, [15:08] = Green, [07:00] = Blue.
+     */
+    VADisplayAttribOverlayColorKey	= 15,
+    /*
+     * The hint for the implementation of vaPutSurface
+     * normally, the driver could use an overlay or GPU to render the surface on the screen
+     * this flag provides APP the flexibity to switch the render dynamically
+     */
+    VADisplayAttribRenderMode           = 16,
+    /*
+     * specify if vaPutSurface needs to render into specified monitors
+     * one example is that one external monitor (e.g. HDMI) is enabled,
+     * but the window manager is not aware of it, and there is no associated drawable
+     */
+    VADisplayAttribRenderDevice        = 17,
+    /*
+     * specify vaPutSurface render area if there is no drawable on the monitor
+     */
+    VADisplayAttribRenderRect          = 18,
+} VADisplayAttribType;
+
+/* flags for VADisplayAttribute */
+#define VA_DISPLAY_ATTRIB_NOT_SUPPORTED	0x0000
+#define VA_DISPLAY_ATTRIB_GETTABLE	0x0001
+#define VA_DISPLAY_ATTRIB_SETTABLE	0x0002
+
+typedef struct _VADisplayAttribute
+{
+    VADisplayAttribType type;
+    int32_t min_value;
+    int32_t max_value;
+    int32_t value;	/* used by the set/get attribute functions */
+/* flags can be VA_DISPLAY_ATTRIB_GETTABLE or VA_DISPLAY_ATTRIB_SETTABLE or OR'd together */
+    uint32_t flags;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VADisplayAttribute;
+
+/** Get maximum number of display attributs supported by the implementation */
+int vaMaxNumDisplayAttributes (
+    VADisplay dpy
+);
+
+/**
+ * Query display attributes
+ * The caller must provide a "attr_list" array that can hold at
+ * least vaMaxNumDisplayAttributes() entries. The actual number of attributes
+ * returned in "attr_list" is returned in "num_attributes".
+ */
+VAStatus vaQueryDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* out */
+    int *num_attributes			/* out */
+);
+
+/**
+ * Get display attributes
+ * This function returns the current attribute values in "attr_list".
+ * Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can have their values retrieved.
+ */
+VAStatus vaGetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* in/out */
+    int num_attributes
+);
+
+/**
+ * Set display attributes
+ * Only attributes returned with VA_DISPLAY_ATTRIB_SETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can be set.  If the attribute is not settable or
+ * the value is out of range, the function returns VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
+ */
+VAStatus vaSetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+);
+
+/****************************
+ * HEVC data structures
+ ****************************/
+/**
+ * \brief Description of picture properties of those in DPB surfaces.
+ *
+ * If only progressive scan is supported, each surface contains one whole
+ * frame picture.
+ * Otherwise, each surface contains two fields of whole picture.
+ * In this case, two entries of ReferenceFrames[] may share same picture_id
+ * value.
+ */
+typedef struct _VAPictureHEVC
+{
+    /** \brief reconstructed picture buffer surface index
+     * invalid when taking value VA_INVALID_SURFACE.
+     */
+    VASurfaceID             picture_id;
+    /** \brief picture order count.
+     * in HEVC, POCs for top and bottom fields of same picture should
+     * take different values.
+     */
+    int32_t                 pic_order_cnt;
+    /* described below */
+    uint32_t                flags;
+
+    /** \brief Reserved bytes for future use, must be zero */
+    uint32_t                va_reserved[VA_PADDING_LOW];
+} VAPictureHEVC;
+
+/* flags in VAPictureHEVC could be OR of the following */
+#define VA_PICTURE_HEVC_INVALID                 0x00000001
+/** \brief indication of interlace scan picture.
+ * should take same value for all the pictures in sequence.
+ */
+#define VA_PICTURE_HEVC_FIELD_PIC               0x00000002
+/** \brief polarity of the field picture.
+ * top field takes even lines of buffer surface.
+ * bottom field takes odd lines of buffer surface.
+ */
+#define VA_PICTURE_HEVC_BOTTOM_FIELD            0x00000004
+/** \brief Long term reference picture */
+#define VA_PICTURE_HEVC_LONG_TERM_REFERENCE     0x00000008
+/**
+ * VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE, VA_PICTURE_HEVC_RPS_ST_CURR_AFTER
+ * and VA_PICTURE_HEVC_RPS_LT_CURR of any picture in ReferenceFrames[] should
+ * be exclusive. No more than one of them can be set for any picture.
+ * Sum of NumPocStCurrBefore, NumPocStCurrAfter and NumPocLtCurr
+ * equals NumPocTotalCurr, which should be equal to or smaller than 8.
+ * Application should provide valid values for both short format and long format.
+ * The pictures in DPB with any of these three flags turned on are referred by
+ * the current picture.
+ */
+/** \brief RefPicSetStCurrBefore of HEVC spec variable
+ * Number of ReferenceFrames[] entries with this bit set equals
+ * NumPocStCurrBefore.
+ */
+#define VA_PICTURE_HEVC_RPS_ST_CURR_BEFORE      0x00000010
+/** \brief RefPicSetStCurrAfter of HEVC spec variable
+ * Number of ReferenceFrames[] entries with this bit set equals
+ * NumPocStCurrAfter.
+ */
+#define VA_PICTURE_HEVC_RPS_ST_CURR_AFTER       0x00000020
+/** \brief RefPicSetLtCurr of HEVC spec variable
+ * Number of ReferenceFrames[] entries with this bit set equals
+ * NumPocLtCurr.
+ */
+#define VA_PICTURE_HEVC_RPS_LT_CURR             0x00000040
+
+//#include <va/va_dec_hevc.h>
+//#include <va/va_dec_jpeg.h>
+#include "va_dec_vp8.h"
+#include "va_dec_vp9.h"
+//#include <va/va_enc_hevc.h>
+//#include <va/va_fei_hevc.h>
+//#include <va/va_enc_h264.h>
+//#include <va/va_enc_jpeg.h>
+//#include <va/va_enc_mpeg2.h>
+//#include <va/va_enc_vp8.h>
+//#include <va/va_enc_vp9.h>
+//#include <va/va_fei.h>
+//#include <va/va_fei_h264.h>
+//#include <va/va_vpp.h>
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VA_H_ */
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/va.patch firefox-85.0+build1/media/ffvpx/va/va.patch
--- firefox-84.0.2+build1/media/ffvpx/va/va.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/va.patch	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,33 @@
+--- va.h.old	2020-10-22 10:41:57.805112031 +0200
++++ va.h	2020-10-22 10:37:22.597088670 +0200
+@@ -4613,18 +4613,18 @@
+ #define VA_PICTURE_HEVC_RPS_LT_CURR             0x00000040
+ 
+-#include <va/va_dec_hevc.h>
+-#include <va/va_dec_jpeg.h>
++//#include <va/va_dec_hevc.h>
++//#include <va/va_dec_jpeg.h>
+ #include "va_dec_vp8.h"
+ #include "va_dec_vp9.h"
+-#include <va/va_enc_hevc.h>
+-#include <va/va_fei_hevc.h>
+-#include <va/va_enc_h264.h>
+-#include <va/va_enc_jpeg.h>
+-#include <va/va_enc_mpeg2.h>
+-#include <va/va_enc_vp8.h>
+-#include <va/va_enc_vp9.h>
+-#include <va/va_fei.h>
+-#include <va/va_fei_h264.h>
+-#include <va/va_vpp.h>
++//#include <va/va_enc_hevc.h>
++//#include <va/va_fei_hevc.h>
++//#include <va/va_enc_h264.h>
++//#include <va/va_enc_jpeg.h>
++//#include <va/va_enc_mpeg2.h>
++//#include <va/va_enc_vp8.h>
++//#include <va/va_enc_vp9.h>
++//#include <va/va_fei.h>
++//#include <va/va_fei_h264.h>
++//#include <va/va_vpp.h>
+ 
+ /**@}*/
diff -Nru firefox-84.0.2+build1/media/ffvpx/va/va_version.h firefox-85.0+build1/media/ffvpx/va/va_version.h
--- firefox-84.0.2+build1/media/ffvpx/va/va_version.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/ffvpx/va/va_version.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef VA_VERSION_H
+#define VA_VERSION_H
+
+/**
+ * VA_MAJOR_VERSION:
+ *
+ * The major version of VA-API (1, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MAJOR_VERSION    1
+
+/**
+ * VA_MINOR_VERSION:
+ *
+ * The minor version of VA-API (2, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MINOR_VERSION    7
+
+/**
+ * VA_MICRO_VERSION:
+ *
+ * The micro version of VA-API (3, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MICRO_VERSION    0
+
+/**
+ * VA_VERSION:
+ *
+ * The full version of VA-API, like 1.2.3
+ */
+#define VA_VERSION          1.7.0
+
+/**
+ * VA_VERSION_S:
+ *
+ * The full version of VA-API, in string form (suited for string
+ * concatenation)
+ */
+#define VA_VERSION_S       "1.7.0"
+
+/**
+ * VA_VERSION_HEX:
+ *
+ * Numerically encoded version of VA-API, like 0x010203
+ */
+#define VA_VERSION_HEX     ((VA_MAJOR_VERSION << 24) | \
+                            (VA_MINOR_VERSION << 16) | \
+                            (VA_MICRO_VERSION << 8))
+
+/**
+ * VA_CHECK_VERSION:
+ * @major: major version, like 1 in 1.2.3
+ * @minor: minor version, like 2 in 1.2.3
+ * @micro: micro version, like 3 in 1.2.3
+ *
+ * Evaluates to %TRUE if the version of VA-API is greater than
+ * @major, @minor and @micro
+ */
+#define VA_CHECK_VERSION(major,minor,micro) \
+        (VA_MAJOR_VERSION > (major) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro)))
+
+#endif /* VA_VERSION_H */
diff -Nru firefox-84.0.2+build1/media/libcubeb/aaudio_by_default.patch firefox-85.0+build1/media/libcubeb/aaudio_by_default.patch
--- firefox-84.0.2+build1/media/libcubeb/aaudio_by_default.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/aaudio_by_default.patch	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,31 @@
+diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c
+--- a/media/libcubeb/src/cubeb.c
++++ b/media/libcubeb/src/cubeb.c
+@@ -227,24 +227,22 @@ cubeb_init(cubeb ** context, char const 
+     wasapi_init,
+ #endif
+ #if defined(USE_WINMM)
+     winmm_init,
+ #endif
+ #if defined(USE_SUN)
+     sun_init,
+ #endif
++#if defined(USE_AAUDIO)
++    aaudio_init,
++#endif
+ #if defined(USE_OPENSL)
+     opensl_init,
+ #endif
+-    // TODO: should probably be preferred over OpenSLES when available.
+-    // Initialization will fail on old android devices.
+-#if defined(USE_AAUDIO)
+-    aaudio_init,
+-#endif
+ #if defined(USE_AUDIOTRACK)
+     audiotrack_init,
+ #endif
+ #if defined(USE_KAI)
+     kai_init,
+ #endif
+   };
+   int i;
diff -Nru firefox-84.0.2+build1/media/libcubeb/moz.yaml firefox-85.0+build1/media/libcubeb/moz.yaml
--- firefox-84.0.2+build1/media/libcubeb/moz.yaml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/moz.yaml	2021-01-18 19:58:17.000000000 +0000
@@ -19,5 +19,5 @@
   license: "ISC"
 
   # update.sh will update this value
-  release: "4e851e996031381d03acd26b93e0578101eade33 (2020-11-03 16:36:58 +0100)"
+  release: "85f1cf48dffd749dd32798681955155e1a1a6ff5 (2020-12-07 08:11:33 +0000)"
 
diff -Nru firefox-84.0.2+build1/media/libcubeb/src/cubeb_aaudio.cpp firefox-85.0+build1/media/libcubeb/src/cubeb_aaudio.cpp
--- firefox-84.0.2+build1/media/libcubeb/src/cubeb_aaudio.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/src/cubeb_aaudio.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -130,6 +130,7 @@
   int64_t latest_input_latency = 0;
   bool voice_input;
   bool voice_output;
+  uint64_t previous_clock;
 };
 
 struct cubeb {
@@ -998,6 +999,7 @@
   stm->state_callback = state_callback;
   stm->voice_input = input_stream_params && !!(input_stream_params->prefs & CUBEB_STREAM_PREF_VOICE);
   stm->voice_output = output_stream_params && !!(output_stream_params->prefs & CUBEB_STREAM_PREF_VOICE);
+  stm->previous_clock = 0;
 
   LOG("cubeb stream prefs: voice_input: %s voice_output: %s",
       stm->voice_input ? "true" : "false",
@@ -1238,6 +1240,11 @@
     // getTimestamp is only valid when the stream is playing.
     // Simply return the number of frames passed to aaudio
     *position = WRAP(AAudioStream_getFramesRead)(stream);
+    if (*position < stm->previous_clock) {
+      *position = stm->previous_clock;
+    } else {
+      stm->previous_clock = *position;
+    }
     return CUBEB_OK;
   case stream_state::INIT:
     assert(false && "Invalid stream");
@@ -1252,12 +1259,15 @@
   aaudio_result_t res;
   res = WRAP(AAudioStream_getTimestamp)(stream, CLOCK_MONOTONIC, &pos, &ns);
   if (res != AAUDIO_OK) {
-    // when we are in 'STARTING' state we try it and hope that the stream
-    // has internally started and gives us a valid timestamp.
-    // If that is not the case (invalid_state is returned) we simply
-    // fall back to the method we use for non-playing streams.
-    if (res == AAUDIO_ERROR_INVALID_STATE && state == stream_state::STARTING) {
+    // When the audio stream is not running, invalid_state is returned and we
+    // simply fall back to the method we use for non-playing streams.
+    if (res == AAUDIO_ERROR_INVALID_STATE) {
       *position = WRAP(AAudioStream_getFramesRead)(stream);
+      if (*position < stm->previous_clock) {
+        *position = stm->previous_clock;
+      } else {
+        stm->previous_clock = *position;
+      }
       return CUBEB_OK;
     }
 
@@ -1266,6 +1276,11 @@
   }
 
   *position = pos;
+  if (*position < stm->previous_clock) {
+    *position = stm->previous_clock;
+  } else {
+    stm->previous_clock = *position;
+  }
   return CUBEB_OK;
 }
 
diff -Nru firefox-84.0.2+build1/media/libcubeb/src/cubeb.c firefox-85.0+build1/media/libcubeb/src/cubeb.c
--- firefox-84.0.2+build1/media/libcubeb/src/cubeb.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/src/cubeb.c	2021-01-18 19:58:17.000000000 +0000
@@ -232,14 +232,12 @@
 #if defined(USE_SUN)
     sun_init,
 #endif
-#if defined(USE_OPENSL)
-    opensl_init,
-#endif
-    // TODO: should probably be preferred over OpenSLES when available.
-    // Initialization will fail on old android devices.
 #if defined(USE_AAUDIO)
     aaudio_init,
 #endif
+#if defined(USE_OPENSL)
+    opensl_init,
+#endif
 #if defined(USE_AUDIOTRACK)
     audiotrack_init,
 #endif
diff -Nru firefox-84.0.2+build1/media/libcubeb/src/cubeb_oss.c firefox-85.0+build1/media/libcubeb/src/cubeb_oss.c
--- firefox-84.0.2+build1/media/libcubeb/src/cubeb_oss.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/src/cubeb_oss.c	2021-01-18 19:58:17.000000000 +0000
@@ -741,6 +741,46 @@
   }
 }
 
+static int
+oss_get_rec_frames(cubeb_stream * s, unsigned int nframes)
+{
+  size_t rem = nframes * s->record.frame_size;
+  size_t read_ofs = 0;
+  while (rem > 0) {
+    ssize_t n;
+    if ((n = read(s->record.fd, (uint8_t *)s->record.buf + read_ofs, rem)) < 0) {
+      if (errno == EINTR)
+        continue;
+      return CUBEB_ERROR;
+    }
+    read_ofs += n;
+    rem -= n;
+  }
+  return 0;
+}
+
+
+static int
+oss_put_play_frames(cubeb_stream * s, unsigned int nframes)
+{
+  size_t rem = nframes * s->play.frame_size;
+  size_t write_ofs = 0;
+  while (rem > 0) {
+    ssize_t n;
+    if ((n = write(s->play.fd, (uint8_t *)s->play.buf + write_ofs, rem)) < 0) {
+      if (errno == EINTR)
+        continue;
+      return CUBEB_ERROR;
+    }
+    pthread_mutex_lock(&s->mtx);
+    s->frames_written += n / s->play.frame_size;
+    pthread_mutex_unlock(&s->mtx);
+    write_ofs += n;
+    rem -= n;
+  }
+  return 0;
+}
+
 /* 1 - Stopped by cubeb_stream_stop, otherwise 0 */
 static int
 oss_audio_loop(cubeb_stream * s, cubeb_state *new_state)
@@ -748,18 +788,10 @@
   cubeb_state state = CUBEB_STATE_STOPPED;
   int trig = 0;
   int drain = 0;
-  struct pollfd pfds[2];
-  unsigned int ppending, rpending;
-
-  pfds[0].fd = s->play.fd;
-  pfds[0].events = POLLOUT;
-  pfds[1].fd = s->record.fd;
-  pfds[1].events = POLLIN;
+  const bool play_on = s->play.fd != -1, record_on = s->record.fd != -1;
+  long nfr = s->bufframes;
 
-  ppending = 0;
-  rpending = s->bufframes;
-
-  if (s->record.fd != -1) {
+  if (record_on) {
     if (ioctl(s->record.fd, SNDCTL_DSP_SETTRIGGER, &trig)) {
       LOG("Error %d occured when setting trigger on record fd", errno);
       state = CUBEB_STATE_ERROR;
@@ -771,43 +803,35 @@
       state = CUBEB_STATE_ERROR;
       goto breakdown;
     }
+
     memset(s->record.buf, 0, s->bufframes * s->record.frame_size);
   }
 
-  while (1) {
-    long nfr = 0;
+  if (!play_on && !record_on) {
+    /*
+     * Stop here if the stream is not play & record stream,
+     * play-only stream or record-only stream
+     */
 
+    goto breakdown;
+  }
+
+  while (1) {
     pthread_mutex_lock(&s->mtx);
     if (!s->running || s->destroying) {
       pthread_mutex_unlock(&s->mtx);
       break;
     }
     pthread_mutex_unlock(&s->mtx);
-    if (s->play.fd == -1 && s->record.fd == -1) {
-      /*
-       * Stop here if the stream is not play & record stream,
-       * play-only stream or record-only stream
-       */
-
-      goto breakdown;
-    }
 
-    while ((s->bufframes - ppending) >= s->nfr && rpending >= s->nfr) {
-      long n = ((s->bufframes - ppending) < rpending) ? s->bufframes - ppending : rpending;
-      char *rptr = NULL, *pptr = NULL;
-      if (s->record.fd != -1)
-        rptr = (char *)s->record.buf;
-      if (s->play.fd != -1)
-        pptr = (char *)s->play.buf + ppending * s->play.frame_size;
-      if (s->record.fd != -1 && s->record.floating) {
-        oss_linear32_to_float(s->record.buf, s->record.info.channels * n);
-      }
-      nfr = s->data_cb(s, s->user_ptr, rptr, pptr, n);
-      if (nfr == CUBEB_ERROR) {
+    long got = 0;
+    if (nfr > 0) {
+      got = s->data_cb(s, s->user_ptr, s->record.buf, s->play.buf, nfr);
+      if (got == CUBEB_ERROR) {
         state = CUBEB_STATE_ERROR;
         goto breakdown;
       }
-      if (pptr) {
+      if (play_on) {
         float vol;
 
         pthread_mutex_lock(&s->mtx);
@@ -815,25 +839,15 @@
         pthread_mutex_unlock(&s->mtx);
 
         if (s->play.floating) {
-          oss_float_to_linear32(pptr, s->play.info.channels * nfr, vol);
+          oss_float_to_linear32(s->play.buf, s->play.info.channels * got, vol);
         } else {
-          oss_linear16_set_vol((int16_t *)pptr, s->play.info.channels * nfr, vol);
+          oss_linear16_set_vol((int16_t *)s->play.buf,
+                               s->play.info.channels * got, vol);
         }
       }
-      if (pptr) {
-        ppending += nfr;
-        assert(ppending <= s->bufframes);
-      }
-      if (rptr) {
-        assert(rpending >= nfr);
-        rpending -= nfr;
-        memmove(rptr, rptr + nfr * s->record.frame_size,
-                (s->bufframes - nfr) * s->record.frame_size);
-      }
-      if (nfr < n) {
+      if (got < nfr) {
         if (s->play.fd != -1) {
           drain = 1;
-          break;
         } else {
           /*
            * This is a record-only stream and number of frames
@@ -845,74 +859,48 @@
           goto breakdown;
         }
       }
+      nfr = 0;
     }
 
-    ssize_t n, frames;
-    int nfds;
-
-    pfds[0].revents = 0;
-    pfds[1].revents = 0;
-
-    nfds = poll(pfds, 2, 1000);
-    if (nfds == -1) {
-      if (errno == EINTR)
-        continue;
-      LOG("Error %d occured when polling playback and record fd", errno);
-      state = CUBEB_STATE_ERROR;
-      goto breakdown;
-    } else if (nfds == 0)
-      continue;
-
-    if ((pfds[0].revents & (POLLERR | POLLHUP)) ||
-        (pfds[1].revents & (POLLERR | POLLHUP))) {
-      LOG("Error occured on playback, record fds");
-      state = CUBEB_STATE_ERROR;
-      goto breakdown;
-    }
-
-    if (pfds[0].revents) {
-      while (ppending > 0) {
-        size_t bytes = ppending * s->play.frame_size;
-        if ((n = write(s->play.fd, (uint8_t *)s->play.buf, bytes)) < 0) {
-          if (errno == EINTR)
-            continue;
-          if (errno == EAGAIN) {
-            if (drain)
-              continue;
-            break;
-          }
+    if (got > 0) {
+      if (play_on && oss_put_play_frames(s, got) < 0) {
           state = CUBEB_STATE_ERROR;
           goto breakdown;
-        }
-        frames = n / s->play.frame_size;
-        pthread_mutex_lock(&s->mtx);
-        s->frames_written += frames;
-        pthread_mutex_unlock(&s->mtx);
-        ppending -= frames;
-        memmove(s->play.buf, (uint8_t *)s->play.buf + n,
-                (s->bufframes - frames) * s->play.frame_size);
-      }
-    }
-    if (pfds[1].revents) {
-      while (s->bufframes - rpending > 0) {
-        size_t bytes = (s->bufframes - rpending) * s->record.frame_size;
-        size_t read_ofs = rpending * s->record.frame_size;
-        if ((n = read(s->record.fd, (uint8_t *)s->record.buf + read_ofs, bytes)) < 0) {
-          if (errno == EINTR)
-            continue;
-          if (errno == EAGAIN)
-            break;
-          state = CUBEB_STATE_ERROR;
-          goto breakdown;
-        }
-        frames = n / s->record.frame_size;
-        rpending += frames;
       }
     }
     if (drain) {
       state = CUBEB_STATE_DRAINED;
       goto breakdown;
     }
+
+    audio_buf_info bi;
+    if (play_on) {
+      if (ioctl(s->play.fd, SNDCTL_DSP_GETOSPACE, &bi)) {
+        state = CUBEB_STATE_ERROR;
+        goto breakdown;
+      }
+      /*
+       * In duplex mode, playback direction drives recording direction to
+       * prevent building up latencies.
+       */
+      nfr = bi.fragsize * bi.fragments / s->play.frame_size;
+      if (nfr > s->bufframes) {
+        nfr = s->bufframes;
+      }
+    }
+
+    if (record_on) {
+      if (nfr == 0) {
+        nfr = s->nfr;
+      }
+      if (oss_get_rec_frames(s, nfr) == CUBEB_ERROR) {
+        state = CUBEB_STATE_ERROR;
+        goto breakdown;
+      }
+      if (s->record.floating) {
+        oss_linear32_to_float(s->record.buf, s->record.info.channels * nfr);
+      }
+    }
   }
 
   return 1;
@@ -1035,7 +1023,7 @@
       goto error;
     }
     if (s->record.fd == -1) {
-      if ((s->record.fd = open(s->record.name, O_RDONLY | O_NONBLOCK)) == -1) {
+      if ((s->record.fd = open(s->record.name, O_RDONLY)) == -1) {
         LOG("Audio device \"%s\" could not be opened as read-only",
             s->record.name);
         ret = CUBEB_ERROR_DEVICE_UNAVAILABLE;
@@ -1066,7 +1054,7 @@
       goto error;
     }
     if (s->play.fd == -1) {
-      if ((s->play.fd = open(s->play.name, O_WRONLY | O_NONBLOCK)) == -1) {
+      if ((s->play.fd = open(s->play.name, O_WRONLY)) == -1) {
         LOG("Audio device \"%s\" could not be opened as write-only",
             s->play.name);
         ret = CUBEB_ERROR_DEVICE_UNAVAILABLE;
@@ -1082,22 +1070,40 @@
     s->play.frame_size = s->play.info.channels * (s->play.info.precision / 8);
     playnfr = (1 << oss_calc_frag_shift(s->nfr, s->play.frame_size)) / s->play.frame_size;
   }
-  /* Use the largest nframes among playing and recording streams */
+  /*
+   * Use the largest nframes among playing and recording streams to set OSS buffer size.
+   * After that, use the smallest allocated nframes among both direction to allocate our
+   * temporary buffers.
+   */
   s->nfr = (playnfr > recnfr) ? playnfr : recnfr;
   s->nfrags = OSS_NFRAGS;
-  s->bufframes = s->nfr * s->nfrags;
   if (s->play.fd != -1) {
     int frag = oss_get_frag_params(oss_calc_frag_shift(s->nfr, s->play.frame_size));
-    if (ioctl(s->record.fd, SNDCTL_DSP_SETFRAGMENT, &frag))
-      LOG("Failed to set record fd with SNDCTL_DSP_SETFRAGMENT. frag: 0x%x",
+    if (ioctl(s->play.fd, SNDCTL_DSP_SETFRAGMENT, &frag))
+      LOG("Failed to set play fd with SNDCTL_DSP_SETFRAGMENT. frag: 0x%x",
           frag);
+    audio_buf_info bi;
+    if (ioctl(s->play.fd, SNDCTL_DSP_GETOSPACE, &bi))
+      LOG("Failed to get play fd's buffer info.");
+    else {
+      if (bi.fragsize / s->play.frame_size < s->nfr)
+        s->nfr = bi.fragsize / s->play.frame_size;
+    }
   }
   if (s->record.fd != -1) {
     int frag = oss_get_frag_params(oss_calc_frag_shift(s->nfr, s->record.frame_size));
     if (ioctl(s->record.fd, SNDCTL_DSP_SETFRAGMENT, &frag))
       LOG("Failed to set record fd with SNDCTL_DSP_SETFRAGMENT. frag: 0x%x",
           frag);
+    audio_buf_info bi;
+    if (ioctl(s->record.fd, SNDCTL_DSP_GETISPACE, &bi))
+      LOG("Failed to get record fd's buffer info.");
+    else {
+      if (bi.fragsize / s->record.frame_size < s->nfr)
+        s->nfr = bi.fragsize / s->record.frame_size;
+    }
   }
+  s->bufframes = s->nfr * s->nfrags;
   s->context = context;
   s->volume = 1.0;
   s->state_cb = state_callback;
diff -Nru firefox-84.0.2+build1/media/libcubeb/src/cubeb_wasapi.cpp firefox-85.0+build1/media/libcubeb/src/cubeb_wasapi.cpp
--- firefox-84.0.2+build1/media/libcubeb/src/cubeb_wasapi.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/src/cubeb_wasapi.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -2030,6 +2030,23 @@
   com_heap_ptr<WAVEFORMATEX> mix_format(tmp);
 
   mix_format->wBitsPerSample = stm->bytes_per_sample * 8;
+  if (mix_format->wFormatTag == WAVE_FORMAT_PCM ||
+      mix_format->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) {
+    switch (mix_format->wBitsPerSample) {
+    case 8:
+    case 16:
+      mix_format->wFormatTag = WAVE_FORMAT_PCM;
+      break;
+    case 32:
+      mix_format->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+      break;
+    default:
+      LOG("%u bits per sample is incompatible with PCM wave formats",
+          mix_format->wBitsPerSample);
+      return CUBEB_ERROR;
+    }
+  }
+
   if (mix_format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
     WAVEFORMATEXTENSIBLE * format_pcm = reinterpret_cast<WAVEFORMATEXTENSIBLE *>(mix_format.get());
     format_pcm->SubFormat = stm->waveformatextensible_sub_format;
@@ -2085,9 +2102,11 @@
   cubeb_device_info device_info;
   int rv = wasapi_create_device(stm->context, device_info, stm->device_enumerator.get(), device.get());
   if (rv == CUBEB_OK) {
-    const char* HANDSFREE_TAG = "BTHHFEENUM";
+    const char* HANDSFREE_TAG = "BTHHFENUM";
     size_t len = sizeof(HANDSFREE_TAG);
-    if (direction == eCapture && strncmp(device_info.group_id, HANDSFREE_TAG, len) == 0) {
+    if (direction == eCapture &&
+        strlen(device_info.group_id) >= len &&
+        strncmp(device_info.group_id, HANDSFREE_TAG, len) == 0) {
       // Rather high-latency to prevent constant under-runs in this particular
       // case of an input device using bluetooth handsfree.
       uint32_t default_period_frames = hns_to_frames(device_info.default_rate, default_period);
diff -Nru firefox-84.0.2+build1/media/libcubeb/update.sh firefox-85.0+build1/media/libcubeb/update.sh
--- firefox-84.0.2+build1/media/libcubeb/update.sh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libcubeb/update.sh	2021-01-18 19:58:18.000000000 +0000
@@ -86,3 +86,5 @@
 else
   echo "Remember to update moz.yaml with the version details."
 fi
+
+patch -p3 < ./aaudio_by_default.patch
diff -Nru firefox-84.0.2+build1/media/libdav1d/asm/autovendored_sources.mozbuild firefox-85.0+build1/media/libdav1d/asm/autovendored_sources.mozbuild
--- firefox-84.0.2+build1/media/libdav1d/asm/autovendored_sources.mozbuild	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/asm/autovendored_sources.mozbuild	2021-01-18 19:58:17.000000000 +0000
@@ -1,11 +1,11 @@
 sources = [
-        '../../../third_party/dav1d/src/x86/cdef_sse.asm',
-        '../../../third_party/dav1d/src/x86/cpuid.asm',
-        '../../../third_party/dav1d/src/x86/film_grain_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/ipred_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/itx_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/loopfilter_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/looprestoration_ssse3.asm',
-        '../../../third_party/dav1d/src/x86/mc_sse.asm',
-        '../../../third_party/dav1d/src/x86/msac.asm',
-    ]
\ No newline at end of file
+'../../../third_party/dav1d/src/x86/cdef_sse.asm',
+'../../../third_party/dav1d/src/x86/cpuid.asm',
+'../../../third_party/dav1d/src/x86/film_grain_ssse3.asm',
+'../../../third_party/dav1d/src/x86/ipred_ssse3.asm',
+'../../../third_party/dav1d/src/x86/itx_ssse3.asm',
+'../../../third_party/dav1d/src/x86/loopfilter_ssse3.asm',
+'../../../third_party/dav1d/src/x86/looprestoration_ssse3.asm',
+'../../../third_party/dav1d/src/x86/mc_sse.asm',
+'../../../third_party/dav1d/src/x86/msac.asm',
+]
diff -Nru firefox-84.0.2+build1/media/libdav1d/asm/moz.build firefox-85.0+build1/media/libdav1d/asm/moz.build
--- firefox-84.0.2+build1/media/libdav1d/asm/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/asm/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -182,6 +182,8 @@
     elif CONFIG['CPU_ARCH'] == 'arm':
         SOURCES += [
             '../../../third_party/dav1d/src/arm/32/cdef.S',
+            '../../../third_party/dav1d/src/arm/32/cdef16.S',
+            '../../../third_party/dav1d/src/arm/32/cdef_tmpl.S',
             '../../../third_party/dav1d/src/arm/32/ipred.S',
             '../../../third_party/dav1d/src/arm/32/itx.S',
             '../../../third_party/dav1d/src/arm/32/loopfilter.S',
diff -Nru firefox-84.0.2+build1/media/libdav1d/autovendored_sources.mozbuild firefox-85.0+build1/media/libdav1d/autovendored_sources.mozbuild
--- firefox-84.0.2+build1/media/libdav1d/autovendored_sources.mozbuild	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/autovendored_sources.mozbuild	2021-01-18 19:58:17.000000000 +0000
@@ -9,6 +9,7 @@
     '../../third_party/dav1d/src/itx_1d.c',
     '../../third_party/dav1d/src/lf_mask.c',
     '../../third_party/dav1d/src/log.c',
+    '../../third_party/dav1d/src/mem.c',
     '../../third_party/dav1d/src/msac.c',
     '../../third_party/dav1d/src/obu.c',
     '../../third_party/dav1d/src/picture.c',
diff -Nru firefox-84.0.2+build1/media/libdav1d/moz.build firefox-85.0+build1/media/libdav1d/moz.build
--- firefox-84.0.2+build1/media/libdav1d/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -87,6 +87,7 @@
     '../../third_party/dav1d/src/intra_edge.h',
     '../../third_party/dav1d/src/lf_mask.h',
     '../../third_party/dav1d/src/log.h',
+    '../../third_party/dav1d/src/mem.h',
     '../../third_party/dav1d/src/msac.h',
     '../../third_party/dav1d/src/obu.h',
     '../../third_party/dav1d/src/picture.h',
@@ -163,7 +164,6 @@
     '../../third_party/dav1d/include/common/bitdepth.h',
     '../../third_party/dav1d/include/common/dump.h',
     '../../third_party/dav1d/include/common/intops.h',
-    '../../third_party/dav1d/include/common/mem.h',
     '../../third_party/dav1d/include/common/validate.h',
 ]
 
diff -Nru firefox-84.0.2+build1/media/libdav1d/moz.yaml firefox-85.0+build1/media/libdav1d/moz.yaml
--- firefox-84.0.2+build1/media/libdav1d/moz.yaml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/moz.yaml	2021-01-18 19:58:17.000000000 +0000
@@ -20,11 +20,11 @@
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit 0243c3ffb644e61848b82f24f5e4a7324669d76e (2020-09-27T15:38:45.000+02:00).
+  release: commit 2ca1bfc39fe5c182d885f2750779d5b1678d8ef9 (2020-11-23T21:17:09.000+01:00).
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 0243c3ffb644e61848b82f24f5e4a7324669d76e
+  revision: 2ca1bfc39fe5c182d885f2750779d5b1678d8ef9
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/
@@ -34,6 +34,11 @@
 
   license-file: COPYING
 
+updatebot:
+    enabled: False
+    maintainer-phab: tjr
+    maintainer-bz: tom@mozilla.com
+
 vendoring:
   url: https://code.videolan.org/videolan/dav1d.git
   source-hosting: gitlab
diff -Nru firefox-84.0.2+build1/media/libdav1d/vcs_version.h firefox-85.0+build1/media/libdav1d/vcs_version.h
--- firefox-84.0.2+build1/media/libdav1d/vcs_version.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libdav1d/vcs_version.h	2021-01-18 19:58:17.000000000 +0000
@@ -1,2 +1,2 @@
 /* auto-generated, do not edit */
-#define DAV1D_VERSION "0.7.1-81-g0243c3f"
+#define DAV1D_VERSION "0.8.0-0-g2ca1bfc"
diff -Nru firefox-84.0.2+build1/media/libjpeg/jchuff.c firefox-85.0+build1/media/libjpeg/jchuff.c
--- firefox-84.0.2+build1/media/libjpeg/jchuff.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jchuff.c	2021-01-18 19:58:17.000000000 +0000
@@ -34,10 +34,10 @@
  * memory footprint by 64k, which is important for some mobile applications
  * that create many isolated instances of libjpeg-turbo (web browsers, for
  * instance.)  This may improve performance on some mobile platforms as well.
- * This feature is enabled by default only on ARM processors, because some x86
+ * This feature is enabled by default only on Arm processors, because some x86
  * chips have a slow implementation of bsr, and the use of clz/bsr cannot be
  * shown to have a significant performance impact even on the x86 chips that
- * have a fast implementation of it.  When building for ARMv6, you can
+ * have a fast implementation of it.  When building for Armv6, you can
  * explicitly disable the use of clz/bsr by adding -mthumb to the compiler
  * flags (this defines __thumb__).
  */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jcinit.c firefox-85.0+build1/media/libjpeg/jcinit.c
--- firefox-84.0.2+build1/media/libjpeg/jcinit.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jcinit.c	2021-01-18 19:58:17.000000000 +0000
@@ -1,8 +1,10 @@
 /*
  * jcinit.c
  *
+ * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -19,6 +21,7 @@
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jpegcomp.h"
 
 
 /*
diff -Nru firefox-84.0.2+build1/media/libjpeg/jconfig.h firefox-85.0+build1/media/libjpeg/jconfig.h
--- firefox-84.0.2+build1/media/libjpeg/jconfig.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jconfig.h	2021-01-18 19:58:17.000000000 +0000
@@ -5,10 +5,10 @@
 #define JPEG_LIB_VERSION 62
 
 /* libjpeg-turbo version */
-#define LIBJPEG_TURBO_VERSION 2.0.4
+#define LIBJPEG_TURBO_VERSION 2.0.6
 
 /* libjpeg-turbo version in integer form */
-#define LIBJPEG_TURBO_VERSION_NUMBER 2000004
+#define LIBJPEG_TURBO_VERSION_NUMBER 2000006
 
 /* Support arithmetic encoding */
 /* #undef C_ARITH_CODING_SUPPORTED */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jcphuff.c firefox-85.0+build1/media/libjpeg/jcphuff.c
--- firefox-84.0.2+build1/media/libjpeg/jcphuff.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jcphuff.c	2021-01-18 19:58:17.000000000 +0000
@@ -43,10 +43,10 @@
  * memory footprint by 64k, which is important for some mobile applications
  * that create many isolated instances of libjpeg-turbo (web browsers, for
  * instance.)  This may improve performance on some mobile platforms as well.
- * This feature is enabled by default only on ARM processors, because some x86
+ * This feature is enabled by default only on Arm processors, because some x86
  * chips have a slow implementation of bsr, and the use of clz/bsr cannot be
  * shown to have a significant performance impact even on the x86 chips that
- * have a fast implementation of it.  When building for ARMv6, you can
+ * have a fast implementation of it.  When building for Armv6, you can
  * explicitly disable the use of clz/bsr by adding -mthumb to the compiler
  * flags (this defines __thumb__).
  */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jctrans.c firefox-85.0+build1/media/libjpeg/jctrans.c
--- firefox-84.0.2+build1/media/libjpeg/jctrans.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jctrans.c	2021-01-18 19:58:17.000000000 +0000
@@ -4,8 +4,8 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1995-1998, Thomas G. Lane.
  * Modified 2000-2009 by Guido Vollbeding.
- * It was modified by The libjpeg-turbo Project to include only code relevant
- * to libjpeg-turbo.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -17,6 +17,7 @@
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jpegcomp.h"
 
 
 /* Forward declarations */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdapistd.c firefox-85.0+build1/media/libjpeg/jdapistd.c
--- firefox-84.0.2+build1/media/libjpeg/jdapistd.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdapistd.c	2021-01-18 19:58:17.000000000 +0000
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2015-2018, D. R. Commander.
+ * Copyright (C) 2010, 2015-2018, 2020, D. R. Commander.
  * Copyright (C) 2015, Google, Inc.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -21,6 +21,8 @@
 #include "jinclude.h"
 #include "jdmainct.h"
 #include "jdcoefct.h"
+#include "jdmaster.h"
+#include "jdmerge.h"
 #include "jdsample.h"
 #include "jmemsys.h"
 
@@ -316,6 +318,8 @@
 read_and_discard_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines)
 {
   JDIMENSION n;
+  my_master_ptr master = (my_master_ptr)cinfo->master;
+  JSAMPARRAY scanlines = NULL;
   void (*color_convert) (j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
                          JDIMENSION input_row, JSAMPARRAY output_buf,
                          int num_rows) = NULL;
@@ -332,8 +336,13 @@
     cinfo->cquantize->color_quantize = noop_quantize;
   }
 
+  if (master->using_merged_upsample && cinfo->max_v_samp_factor == 2) {
+    my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
+    scanlines = &upsample->spare_row;
+  }
+
   for (n = 0; n < num_lines; n++)
-    jpeg_read_scanlines(cinfo, NULL, 1);
+    jpeg_read_scanlines(cinfo, scanlines, 1);
 
   if (color_convert)
     cinfo->cconvert->color_convert = color_convert;
@@ -353,6 +362,12 @@
 {
   JDIMENSION rows_left;
   my_main_ptr main_ptr = (my_main_ptr)cinfo->main;
+  my_master_ptr master = (my_master_ptr)cinfo->master;
+
+  if (master->using_merged_upsample && cinfo->max_v_samp_factor == 2) {
+    read_and_discard_scanlines(cinfo, rows);
+    return;
+  }
 
   /* Increment the counter to the next row group after the skipped rows. */
   main_ptr->rowgroup_ctr += rows / cinfo->max_v_samp_factor;
@@ -382,21 +397,27 @@
 {
   my_main_ptr main_ptr = (my_main_ptr)cinfo->main;
   my_coef_ptr coef = (my_coef_ptr)cinfo->coef;
+  my_master_ptr master = (my_master_ptr)cinfo->master;
   my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
   JDIMENSION i, x;
   int y;
   JDIMENSION lines_per_iMCU_row, lines_left_in_iMCU_row, lines_after_iMCU_row;
   JDIMENSION lines_to_skip, lines_to_read;
 
+  /* Two-pass color quantization is not supported. */
+  if (cinfo->quantize_colors && cinfo->two_pass_quantize)
+    ERREXIT(cinfo, JERR_NOTIMPL);
+
   if (cinfo->global_state != DSTATE_SCANNING)
     ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
 
   /* Do not skip past the bottom of the image. */
   if (cinfo->output_scanline + num_lines >= cinfo->output_height) {
+    num_lines = cinfo->output_height - cinfo->output_scanline;
     cinfo->output_scanline = cinfo->output_height;
     (*cinfo->inputctl->finish_input_pass) (cinfo);
     cinfo->inputctl->eoi_reached = TRUE;
-    return cinfo->output_height - cinfo->output_scanline;
+    return num_lines;
   }
 
   if (num_lines == 0)
@@ -445,8 +466,10 @@
     main_ptr->buffer_full = FALSE;
     main_ptr->rowgroup_ctr = 0;
     main_ptr->context_state = CTX_PREPARE_FOR_IMCU;
-    upsample->next_row_out = cinfo->max_v_samp_factor;
-    upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+    if (!master->using_merged_upsample) {
+      upsample->next_row_out = cinfo->max_v_samp_factor;
+      upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+    }
   }
 
   /* Skipping is much simpler when context rows are not required. */
@@ -458,8 +481,10 @@
       cinfo->output_scanline += lines_left_in_iMCU_row;
       main_ptr->buffer_full = FALSE;
       main_ptr->rowgroup_ctr = 0;
-      upsample->next_row_out = cinfo->max_v_samp_factor;
-      upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+      if (!master->using_merged_upsample) {
+        upsample->next_row_out = cinfo->max_v_samp_factor;
+        upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+      }
     }
   }
 
@@ -494,7 +519,8 @@
       cinfo->output_iMCU_row += lines_to_skip / lines_per_iMCU_row;
       increment_simple_rowgroup_ctr(cinfo, lines_to_read);
     }
-    upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+    if (!master->using_merged_upsample)
+      upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
     return num_lines;
   }
 
@@ -535,7 +561,8 @@
    * bit odd, since "rows_to_go" seems to be redundantly keeping track of
    * output_scanline.
    */
-  upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
+  if (!master->using_merged_upsample)
+    upsample->rows_to_go = cinfo->output_height - cinfo->output_scanline;
 
   /* Always skip the requested number of lines. */
   return num_lines;
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdatadst.c firefox-85.0+build1/media/libjpeg/jdatadst.c
--- firefox-84.0.2+build1/media/libjpeg/jdatadst.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdatadst.c	2021-01-18 19:58:18.000000000 +0000
@@ -143,8 +143,7 @@
 
   MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
 
-  if (dest->newbuffer != NULL)
-    free(dest->newbuffer);
+  free(dest->newbuffer);
 
   dest->newbuffer = nextbuffer;
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdcoefct.c firefox-85.0+build1/media/libjpeg/jdcoefct.c
--- firefox-84.0.2+build1/media/libjpeg/jdcoefct.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdcoefct.c	2021-01-18 19:58:17.000000000 +0000
@@ -6,7 +6,7 @@
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * Copyright (C) 2010, 2015-2016, D. R. Commander.
- * Copyright (C) 2015, Google, Inc.
+ * Copyright (C) 2015, 2020, Google, Inc.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -495,11 +495,13 @@
       if (first_row && block_row == 0)
         prev_block_row = buffer_ptr;
       else
-        prev_block_row = buffer[block_row - 1];
+        prev_block_row = buffer[block_row - 1] +
+                         cinfo->master->first_MCU_col[ci];
       if (last_row && block_row == block_rows - 1)
         next_block_row = buffer_ptr;
       else
-        next_block_row = buffer[block_row + 1];
+        next_block_row = buffer[block_row + 1] +
+                         cinfo->master->first_MCU_col[ci];
       /* We fetch the surrounding DC values using a sliding-register approach.
        * Initialize all nine here so as to do the right thing on narrow pics.
        */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdcolor.c firefox-85.0+build1/media/libjpeg/jdcolor.c
--- firefox-84.0.2+build1/media/libjpeg/jdcolor.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdcolor.c	2021-01-18 19:58:17.000000000 +0000
@@ -571,11 +571,10 @@
  * RGB565 conversion
  */
 
-#define PACK_SHORT_565_LE(r, g, b)  ((((r) << 8) & 0xF800) | \
-                                     (((g) << 3) & 0x7E0) | ((b) >> 3))
-#define PACK_SHORT_565_BE(r, g, b)  (((r) & 0xF8) | ((g) >> 5) | \
-                                     (((g) << 11) & 0xE000) | \
-                                     (((b) << 5) & 0x1F00))
+#define PACK_SHORT_565_LE(r, g, b) \
+  ((((r) << 8) & 0xF800) | (((g) << 3) & 0x7E0) | ((b) >> 3))
+#define PACK_SHORT_565_BE(r, g, b) \
+  (((r) & 0xF8) | ((g) >> 5) | (((g) << 11) & 0xE000) | (((b) << 5) & 0x1F00))
 
 #define PACK_TWO_PIXELS_LE(l, r)    ((r << 16) | l)
 #define PACK_TWO_PIXELS_BE(l, r)    ((l << 16) | r)
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdmerge.c firefox-85.0+build1/media/libjpeg/jdmerge.c
--- firefox-84.0.2+build1/media/libjpeg/jdmerge.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdmerge.c	2021-01-18 19:58:17.000000000 +0000
@@ -5,7 +5,7 @@
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2009, 2011, 2014-2015, D. R. Commander.
+ * Copyright (C) 2009, 2011, 2014-2015, 2020, D. R. Commander.
  * Copyright (C) 2013, Linaro Limited.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -40,41 +40,13 @@
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jdmerge.h"
 #include "jsimd.h"
 #include "jconfigint.h"
 
 #ifdef UPSAMPLE_MERGING_SUPPORTED
 
 
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_upsampler pub;    /* public fields */
-
-  /* Pointer to routine to do actual upsampling/conversion of one row group */
-  void (*upmethod) (j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
-                    JDIMENSION in_row_group_ctr, JSAMPARRAY output_buf);
-
-  /* Private state for YCC->RGB conversion */
-  int *Cr_r_tab;                /* => table for Cr to R conversion */
-  int *Cb_b_tab;                /* => table for Cb to B conversion */
-  JLONG *Cr_g_tab;              /* => table for Cr to G conversion */
-  JLONG *Cb_g_tab;              /* => table for Cb to G conversion */
-
-  /* For 2:1 vertical sampling, we produce two output rows at a time.
-   * We need a "spare" row buffer to hold the second output row if the
-   * application provides just a one-row buffer; we also use the spare
-   * to discard the dummy last row if the image height is odd.
-   */
-  JSAMPROW spare_row;
-  boolean spare_full;           /* T if spare buffer is occupied */
-
-  JDIMENSION out_row_width;     /* samples per output row */
-  JDIMENSION rows_to_go;        /* counts rows remaining in image */
-} my_upsampler;
-
-typedef my_upsampler *my_upsample_ptr;
-
 #define SCALEBITS       16      /* speediest right-shift on some machines */
 #define ONE_HALF        ((JLONG)1 << (SCALEBITS - 1))
 #define FIX(x)          ((JLONG)((x) * (1L << SCALEBITS) + 0.5))
@@ -189,7 +161,7 @@
 LOCAL(void)
 build_ycc_rgb_table(j_decompress_ptr cinfo)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   int i;
   JLONG x;
   SHIFT_TEMPS
@@ -232,7 +204,7 @@
 METHODDEF(void)
 start_pass_merged_upsample(j_decompress_ptr cinfo)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
 
   /* Mark the spare buffer empty */
   upsample->spare_full = FALSE;
@@ -254,7 +226,7 @@
                    JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)
 /* 2:1 vertical sampling case: may need a spare row. */
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   JSAMPROW work_ptrs[2];
   JDIMENSION num_rows;          /* number of rows returned to caller */
 
@@ -305,7 +277,7 @@
                    JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)
 /* 1:1 vertical sampling case: much easier, never need a spare row. */
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
 
   /* Just do the upsampling. */
   (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,
@@ -420,11 +392,10 @@
  * RGB565 conversion
  */
 
-#define PACK_SHORT_565_LE(r, g, b)  ((((r) << 8) & 0xF800) | \
-                                     (((g) << 3) & 0x7E0) | ((b) >> 3))
-#define PACK_SHORT_565_BE(r, g, b)  (((r) & 0xF8) | ((g) >> 5) | \
-                                     (((g) << 11) & 0xE000) | \
-                                     (((b) << 5) & 0x1F00))
+#define PACK_SHORT_565_LE(r, g, b) \
+  ((((r) << 8) & 0xF800) | (((g) << 3) & 0x7E0) | ((b) >> 3))
+#define PACK_SHORT_565_BE(r, g, b) \
+  (((r) & 0xF8) | ((g) >> 5) | (((g) << 11) & 0xE000) | (((b) << 5) & 0x1F00))
 
 #define PACK_TWO_PIXELS_LE(l, r)    ((r << 16) | l)
 #define PACK_TWO_PIXELS_BE(l, r)    ((l << 16) | r)
@@ -566,11 +537,11 @@
 GLOBAL(void)
 jinit_merged_upsampler(j_decompress_ptr cinfo)
 {
-  my_upsample_ptr upsample;
+  my_merged_upsample_ptr upsample;
 
-  upsample = (my_upsample_ptr)
+  upsample = (my_merged_upsample_ptr)
     (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
-                                sizeof(my_upsampler));
+                                sizeof(my_merged_upsampler));
   cinfo->upsample = (struct jpeg_upsampler *)upsample;
   upsample->pub.start_pass = start_pass_merged_upsample;
   upsample->pub.need_context_rows = FALSE;
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdmerge.h firefox-85.0+build1/media/libjpeg/jdmerge.h
--- firefox-84.0.2+build1/media/libjpeg/jdmerge.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdmerge.h	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ * jdmerge.h
+ *
+ * This file was part of the Independent JPEG Group's software:
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2020, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README.ijg
+ * file.
+ */
+
+#define JPEG_INTERNALS
+#include "jpeglib.h"
+
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_upsampler pub;    /* public fields */
+
+  /* Pointer to routine to do actual upsampling/conversion of one row group */
+  void (*upmethod) (j_decompress_ptr cinfo, JSAMPIMAGE input_buf,
+                    JDIMENSION in_row_group_ctr, JSAMPARRAY output_buf);
+
+  /* Private state for YCC->RGB conversion */
+  int *Cr_r_tab;                /* => table for Cr to R conversion */
+  int *Cb_b_tab;                /* => table for Cb to B conversion */
+  JLONG *Cr_g_tab;              /* => table for Cr to G conversion */
+  JLONG *Cb_g_tab;              /* => table for Cb to G conversion */
+
+  /* For 2:1 vertical sampling, we produce two output rows at a time.
+   * We need a "spare" row buffer to hold the second output row if the
+   * application provides just a one-row buffer; we also use the spare
+   * to discard the dummy last row if the image height is odd.
+   */
+  JSAMPROW spare_row;
+  boolean spare_full;           /* T if spare buffer is occupied */
+
+  JDIMENSION out_row_width;     /* samples per output row */
+  JDIMENSION rows_to_go;        /* counts rows remaining in image */
+} my_merged_upsampler;
+
+typedef my_merged_upsampler *my_merged_upsample_ptr;
+
+#endif /* UPSAMPLE_MERGING_SUPPORTED */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdmrg565.c firefox-85.0+build1/media/libjpeg/jdmrg565.c
--- firefox-84.0.2+build1/media/libjpeg/jdmrg565.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdmrg565.c	2021-01-18 19:58:17.000000000 +0000
@@ -5,7 +5,7 @@
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
  * Copyright (C) 2013, Linaro Limited.
- * Copyright (C) 2014-2015, 2018, D. R. Commander.
+ * Copyright (C) 2014-2015, 2018, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -19,7 +19,7 @@
                                   JDIMENSION in_row_group_ctr,
                                   JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr;
@@ -90,7 +90,7 @@
                                    JDIMENSION in_row_group_ctr,
                                    JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr;
@@ -163,7 +163,7 @@
                                   JDIMENSION in_row_group_ctr,
                                   JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr0, outptr1;
@@ -259,7 +259,7 @@
                                    JDIMENSION in_row_group_ctr,
                                    JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr0, outptr1;
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdmrgext.c firefox-85.0+build1/media/libjpeg/jdmrgext.c
--- firefox-84.0.2+build1/media/libjpeg/jdmrgext.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdmrgext.c	2021-01-18 19:58:17.000000000 +0000
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1994-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2011, 2015, D. R. Commander.
+ * Copyright (C) 2011, 2015, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -25,7 +25,7 @@
                               JDIMENSION in_row_group_ctr,
                               JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr;
@@ -97,7 +97,7 @@
                               JDIMENSION in_row_group_ctr,
                               JSAMPARRAY output_buf)
 {
-  my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample;
+  my_merged_upsample_ptr upsample = (my_merged_upsample_ptr)cinfo->upsample;
   register int y, cred, cgreen, cblue;
   int cb, cr;
   register JSAMPROW outptr0, outptr1;
diff -Nru firefox-84.0.2+build1/media/libjpeg/jdtrans.c firefox-85.0+build1/media/libjpeg/jdtrans.c
--- firefox-84.0.2+build1/media/libjpeg/jdtrans.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jdtrans.c	2021-01-18 19:58:17.000000000 +0000
@@ -3,8 +3,8 @@
  *
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1995-1997, Thomas G. Lane.
- * It was modified by The libjpeg-turbo Project to include only code relevant
- * to libjpeg-turbo.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -16,6 +16,7 @@
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jpegcomp.h"
 
 
 /* Forward declarations */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jfdctint.c firefox-85.0+build1/media/libjpeg/jfdctint.c
--- firefox-84.0.2+build1/media/libjpeg/jfdctint.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jfdctint.c	2021-01-18 19:58:18.000000000 +0000
@@ -4,11 +4,11 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander.
+ * Copyright (C) 2015, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
- * This file contains a slow-but-accurate integer implementation of the
+ * This file contains a slower but more accurate integer implementation of the
  * forward DCT (Discrete Cosine Transform).
  *
  * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
diff -Nru firefox-84.0.2+build1/media/libjpeg/jidctint.c firefox-85.0+build1/media/libjpeg/jidctint.c
--- firefox-84.0.2+build1/media/libjpeg/jidctint.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jidctint.c	2021-01-18 19:58:17.000000000 +0000
@@ -5,11 +5,11 @@
  * Copyright (C) 1991-1998, Thomas G. Lane.
  * Modification developed 2002-2009 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander.
+ * Copyright (C) 2015, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
- * This file contains a slow-but-accurate integer implementation of the
+ * This file contains a slower but more accurate integer implementation of the
  * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
  * must also perform dequantization of the input coefficients.
  *
diff -Nru firefox-84.0.2+build1/media/libjpeg/jmorecfg.h firefox-85.0+build1/media/libjpeg/jmorecfg.h
--- firefox-84.0.2+build1/media/libjpeg/jmorecfg.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jmorecfg.h	2021-01-18 19:58:17.000000000 +0000
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1997, Thomas G. Lane.
  * Modified 1997-2009 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2009, 2011, 2014-2015, 2018, D. R. Commander.
+ * Copyright (C) 2009, 2011, 2014-2015, 2018, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -252,9 +252,9 @@
 
 /* Capability options common to encoder and decoder: */
 
-#define DCT_ISLOW_SUPPORTED     /* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED     /* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED     /* floating-point: accurate, fast on fast HW */
+#define DCT_ISLOW_SUPPORTED     /* accurate integer method */
+#define DCT_IFAST_SUPPORTED     /* less accurate int method [legacy feature] */
+#define DCT_FLOAT_SUPPORTED     /* floating-point method [legacy feature] */
 
 /* Encoder capability options: */
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/jpegcomp.h firefox-85.0+build1/media/libjpeg/jpegcomp.h
--- firefox-84.0.2+build1/media/libjpeg/jpegcomp.h	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jpegcomp.h	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * jpegcomp.h
  *
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -19,6 +19,7 @@
 #define _min_DCT_v_scaled_size  min_DCT_v_scaled_size
 #define _jpeg_width  jpeg_width
 #define _jpeg_height  jpeg_height
+#define JERR_ARITH_NOTIMPL  JERR_NOT_COMPILED
 #else
 #define _DCT_scaled_size  DCT_scaled_size
 #define _DCT_h_scaled_size  DCT_scaled_size
diff -Nru firefox-84.0.2+build1/media/libjpeg/jpeglib.h firefox-85.0+build1/media/libjpeg/jpeglib.h
--- firefox-84.0.2+build1/media/libjpeg/jpeglib.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jpeglib.h	2021-01-18 19:58:17.000000000 +0000
@@ -5,7 +5,7 @@
  * Copyright (C) 1991-1998, Thomas G. Lane.
  * Modified 2002-2009 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2009-2011, 2013-2014, 2016-2017, D. R. Commander.
+ * Copyright (C) 2009-2011, 2013-2014, 2016-2017, 2020, D. R. Commander.
  * Copyright (C) 2015, Google, Inc.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
@@ -244,9 +244,9 @@
 /* DCT/IDCT algorithm options. */
 
 typedef enum {
-  JDCT_ISLOW,             /* slow but accurate integer algorithm */
-  JDCT_IFAST,             /* faster, less accurate integer method */
-  JDCT_FLOAT              /* floating-point: accurate, fast on fast HW */
+  JDCT_ISLOW,             /* accurate integer method */
+  JDCT_IFAST,             /* less accurate integer method [legacy feature] */
+  JDCT_FLOAT              /* floating-point method [legacy feature] */
 } J_DCT_METHOD;
 
 #ifndef JDCT_DEFAULT            /* may be overridden in jconfig.h */
diff -Nru firefox-84.0.2+build1/media/libjpeg/jquant2.c firefox-85.0+build1/media/libjpeg/jquant2.c
--- firefox-84.0.2+build1/media/libjpeg/jquant2.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jquant2.c	2021-01-18 19:58:18.000000000 +0000
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-1996, Thomas G. Lane.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2009, 2014-2015, D. R. Commander.
+ * Copyright (C) 2009, 2014-2015, 2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -1145,7 +1145,7 @@
   int i;
 
   /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
+  /* If user asks for ordered dither, give them F-S. */
   if (cinfo->dither_mode != JDITHER_NONE)
     cinfo->dither_mode = JDITHER_FS;
 
@@ -1263,7 +1263,7 @@
     cquantize->sv_colormap = NULL;
 
   /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
+  /* If user asks for ordered dither, give them F-S. */
   if (cinfo->dither_mode != JDITHER_NONE)
     cinfo->dither_mode = JDITHER_FS;
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/jversion.h firefox-85.0+build1/media/libjpeg/jversion.h
--- firefox-84.0.2+build1/media/libjpeg/jversion.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/jversion.h	2021-01-18 19:58:17.000000000 +0000
@@ -4,7 +4,7 @@
  * This file was part of the Independent JPEG Group's software:
  * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
  * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2012-2019, D. R. Commander.
+ * Copyright (C) 2010, 2012-2020, D. R. Commander.
  * For conditions of distribution and use, see the accompanying README.ijg
  * file.
  *
@@ -30,23 +30,25 @@
  * NOTE: It is our convention to place the authors in the following order:
  * - libjpeg-turbo authors (2009-) in descending order of the date of their
  *   most recent contribution to the project, then in ascending order of the
- *   date of their first contribution to the project
+ *   date of their first contribution to the project, then in alphabetical
+ *   order
  * - Upstream authors in descending order of the date of the first inclusion of
  *   their code
  */
 
 #define JCOPYRIGHT \
-  "Copyright (C) 2009-2019 D. R. Commander\n" \
-  "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
+  "Copyright (C) 2009-2020 D. R. Commander\n" \
+  "Copyright (C) 2015, 2020 Google, Inc.\n" \
+  "Copyright (C) 2019 Arm Limited\n" \
   "Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \
+  "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
   "Copyright (C) 2015 Intel Corporation\n" \
-  "Copyright (C) 2015 Google, Inc.\n" \
+  "Copyright (C) 2013-2014 Linaro Limited\n" \
   "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
-  "Copyright (C) 2013 Linaro Limited\n" \
+  "Copyright (C) 2009, 2012 Pierre Ossman for Cendio AB\n" \
   "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)\n" \
-  "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \
   "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
-  "Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding"
+  "Copyright (C) 1991-2017 Thomas G. Lane, Guido Vollbeding"
 
 #define JCOPYRIGHT_SHORT \
-  "Copyright (C) 1991-2019 The libjpeg-turbo Project and many others"
+  "Copyright (C) 1991-2020 The libjpeg-turbo Project and many others"
diff -Nru firefox-84.0.2+build1/media/libjpeg/LICENSE.md firefox-85.0+build1/media/libjpeg/LICENSE.md
--- firefox-84.0.2+build1/media/libjpeg/LICENSE.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/LICENSE.md	2021-01-18 19:58:17.000000000 +0000
@@ -91,7 +91,7 @@
 The Modified (3-clause) BSD License
 ===================================
 
-Copyright (C)2009-2019 D. R. Commander.  All Rights Reserved.
+Copyright (C)2009-2020 D. R. Commander.  All Rights Reserved.
 Copyright (C)2015 Viktor Szathmáry.  All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -Nru firefox-84.0.2+build1/media/libjpeg/MOZCHANGES firefox-85.0+build1/media/libjpeg/MOZCHANGES
--- firefox-84.0.2+build1/media/libjpeg/MOZCHANGES	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/MOZCHANGES	2021-01-18 19:58:17.000000000 +0000
@@ -48,6 +48,10 @@
 
     $ hg addremove
 
+== November 19, 2020 (libjpeg-turbo v2.0.6 10ba6ed3365615ed5c2995fe2d240cb2d5000173 2020-11-16) ==
+
+* Updated to v2.0.6 release.
+
 == January 6, 2020 (libjpeg-turbo v2.0.4 166e34213e4f4e2363ce058a7bcc69fd03e38b76 2019-12-31) ==
 
 * Updated to v2.0.4 release.
diff -Nru firefox-84.0.2+build1/media/libjpeg/README.ijg firefox-85.0+build1/media/libjpeg/README.ijg
--- firefox-84.0.2+build1/media/libjpeg/README.ijg	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/README.ijg	2021-01-18 19:58:17.000000000 +0000
@@ -223,12 +223,12 @@
 A PDF file of the older JFIF 1.02 specification is available at
 http://www.w3.org/Graphics/JPEG/jfif3.pdf.
 
-The TIFF 6.0 file format specification can be obtained by FTP from
-ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
-found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
-IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
-Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7).  Copies of this Note can be obtained from
+The TIFF 6.0 file format specification can be obtained from
+http://mirrors.ctan.org/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation
+scheme found in the TIFF 6.0 spec of 3-June-92 has a number of serious
+problems.  IJG does not recommend use of the TIFF 6.0 design (TIFF Compression
+tag 6).  Instead, we recommend the JPEG design proposed by TIFF Technical Note
+#2 (Compression tag 7).  Copies of this Note can be obtained from
 http://www.ijg.org/files/.  It is expected that the next revision
 of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
 Although IJG's own code does not support TIFF/JPEG, the free libtiff library
@@ -243,14 +243,8 @@
 directory "files".
 
 The JPEG FAQ (Frequently Asked Questions) article is a source of some
-general information about JPEG.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
-and other news.answers archive sites, including the official news.answers
-archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
-If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
-with body
-        send usenet/news.answers/jpeg-faq/part1
-        send usenet/news.answers/jpeg-faq/part2
+general information about JPEG.  It is available at
+http://www.faqs.org/faqs/jpeg-faq.
 
 
 FILE FORMAT COMPATIBILITY
diff -Nru firefox-84.0.2+build1/media/libjpeg/README.md firefox-85.0+build1/media/libjpeg/README.md
--- firefox-84.0.2+build1/media/libjpeg/README.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/README.md	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,7 @@
 ==========
 
 libjpeg-turbo is a JPEG image codec that uses SIMD instructions to accelerate
-baseline JPEG compression and decompression on x86, x86-64, ARM, PowerPC, and
+baseline JPEG compression and decompression on x86, x86-64, Arm, PowerPC, and
 MIPS systems, as well as progressive JPEG compression on x86 and x86-64
 systems.  On such systems, libjpeg-turbo is generally 2-6x as fast as libjpeg,
 all else being equal.  On other types of systems, libjpeg-turbo can still
@@ -179,8 +179,8 @@
 
 NOTE:  As of this writing, extensive research has been conducted into the
 usefulness of DCT scaling as a means of data reduction and SmartScale as a
-means of quality improvement.  The reader is invited to peruse the research at
-<http://www.libjpeg-turbo.org/About/SmartScale> and draw his/her own conclusions,
+means of quality improvement.  Readers are invited to peruse the research at
+<http://www.libjpeg-turbo.org/About/SmartScale> and draw their own conclusions,
 but it is the general belief of our project that these features have not
 demonstrated sufficient usefulness to justify inclusion in libjpeg-turbo.
 
@@ -287,12 +287,13 @@
   (and slightly faster) floating point IDCT algorithm introduced in libjpeg
   v8a as opposed to the algorithm used in libjpeg v6b.  It should be noted,
   however, that this algorithm basically brings the accuracy of the floating
-  point IDCT in line with the accuracy of the slow integer IDCT.  The floating
-  point DCT/IDCT algorithms are mainly a legacy feature, and they do not
-  produce significantly more accuracy than the slow integer algorithms (to put
-  numbers on this, the typical difference in PNSR between the two algorithms
-  is less than 0.10 dB, whereas changing the quality level by 1 in the upper
-  range of the quality scale is typically more like a 1.0 dB difference.)
+  point IDCT in line with the accuracy of the accurate integer IDCT.  The
+  floating point DCT/IDCT algorithms are mainly a legacy feature, and they do
+  not produce significantly more accuracy than the accurate integer algorithms
+  (to put numbers on this, the typical difference in PNSR between the two
+  algorithms is less than 0.10 dB, whereas changing the quality level by 1 in
+  the upper range of the quality scale is typically more like a 1.0 dB
+  difference.)
 
 - If the floating point algorithms in libjpeg-turbo are not implemented using
   SIMD instructions on a particular platform, then the accuracy of the
@@ -340,7 +341,7 @@
 correct results whenever the fast integer forward DCT is used along with a JPEG
 quality of 98-100.  Thus, libjpeg-turbo must use the non-SIMD quantization
 function in those cases.  This causes performance to drop by as much as 40%.
-It is therefore strongly advised that you use the slow integer forward DCT
+It is therefore strongly advised that you use the accurate integer forward DCT
 whenever encoding images with a JPEG quality of 98 or higher.
 
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/arm/jsimd.c firefox-85.0+build1/media/libjpeg/simd/arm/jsimd.c
--- firefox-84.0.2+build1/media/libjpeg/simd/arm/jsimd.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/arm/jsimd.c	2021-01-18 19:58:17.000000000 +0000
@@ -13,7 +13,7 @@
  *
  * This file contains the interface between the "normal" portions
  * of the library and the SIMD implementations when running on a
- * 32-bit ARM architecture.
+ * 32-bit Arm architecture.
  */
 
 #define JPEG_INTERNALS
@@ -118,7 +118,7 @@
 #if defined(__ARM_NEON__)
   simd_support |= JSIMD_NEON;
 #elif defined(__linux__) || defined(ANDROID) || defined(__ANDROID__)
-  /* We still have a chance to use NEON regardless of globally used
+  /* We still have a chance to use Neon regardless of globally used
    * -mcpu/-mfpu options passed to gcc by performing runtime detection via
    * /proc/cpuinfo parsing on linux/android */
   while (!parse_proc_cpuinfo(bufsize)) {
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/arm/jsimd_neon.S firefox-85.0+build1/media/libjpeg/simd/arm/jsimd_neon.S
--- firefox-84.0.2+build1/media/libjpeg/simd/arm/jsimd_neon.S	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/arm/jsimd_neon.S	2021-01-18 19:58:17.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * ARMv7 NEON optimizations for libjpeg-turbo
+ * Armv7 Neon optimizations for libjpeg-turbo
  *
  * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
  *                          All Rights Reserved.
@@ -107,69 +107,69 @@
  * Uses some ideas from the comments in 'simd/jiss2int-64.asm'
  */
 #define REF_1D_IDCT(xrow0, xrow1, xrow2, xrow3, xrow4, xrow5, xrow6, xrow7) { \
-    DCTELEM row0, row1, row2, row3, row4, row5, row6, row7; \
-    JLONG   q1, q2, q3, q4, q5, q6, q7; \
-    JLONG   tmp11_plus_tmp2, tmp11_minus_tmp2; \
-    \
-    /* 1-D iDCT input data */ \
-    row0 = xrow0; \
-    row1 = xrow1; \
-    row2 = xrow2; \
-    row3 = xrow3; \
-    row4 = xrow4; \
-    row5 = xrow5; \
-    row6 = xrow6; \
-    row7 = xrow7; \
-    \
-    q5 = row7 + row3; \
-    q4 = row5 + row1; \
-    q6 = MULTIPLY(q5, FIX_1_175875602_MINUS_1_961570560) + \
-         MULTIPLY(q4, FIX_1_175875602); \
-    q7 = MULTIPLY(q5, FIX_1_175875602) + \
-         MULTIPLY(q4, FIX_1_175875602_MINUS_0_390180644); \
-    q2 = MULTIPLY(row2, FIX_0_541196100) + \
-         MULTIPLY(row6, FIX_0_541196100_MINUS_1_847759065); \
-    q4 = q6; \
-    q3 = ((JLONG)row0 - (JLONG)row4) << 13; \
-    q6 += MULTIPLY(row5, -FIX_2_562915447) + \
-          MULTIPLY(row3, FIX_3_072711026_MINUS_2_562915447); \
-    /* now we can use q1 (reloadable constants have been used up) */ \
-    q1 = q3 + q2; \
-    q4 += MULTIPLY(row7, FIX_0_298631336_MINUS_0_899976223) + \
-          MULTIPLY(row1, -FIX_0_899976223); \
-    q5 = q7; \
-    q1 = q1 + q6; \
-    q7 += MULTIPLY(row7, -FIX_0_899976223) + \
-          MULTIPLY(row1, FIX_1_501321110_MINUS_0_899976223); \
-    \
-    /* (tmp11 + tmp2) has been calculated (out_row1 before descale) */ \
-    tmp11_plus_tmp2 = q1; \
-    row1 = 0; \
-    \
-    q1 = q1 - q6; \
-    q5 += MULTIPLY(row5, FIX_2_053119869_MINUS_2_562915447) + \
-          MULTIPLY(row3, -FIX_2_562915447); \
-    q1 = q1 - q6; \
-    q6 = MULTIPLY(row2, FIX_0_541196100_PLUS_0_765366865) + \
-         MULTIPLY(row6, FIX_0_541196100); \
-    q3 = q3 - q2; \
-    \
-    /* (tmp11 - tmp2) has been calculated (out_row6 before descale) */ \
-    tmp11_minus_tmp2 = q1; \
-    \
-    q1 = ((JLONG)row0 + (JLONG)row4) << 13; \
-    q2 = q1 + q6; \
-    q1 = q1 - q6; \
-    \
-    /* pick up the results */ \
-    tmp0  = q4; \
-    tmp1  = q5; \
-    tmp2  = (tmp11_plus_tmp2 - tmp11_minus_tmp2) / 2; \
-    tmp3  = q7; \
-    tmp10 = q2; \
-    tmp11 = (tmp11_plus_tmp2 + tmp11_minus_tmp2) / 2; \
-    tmp12 = q3; \
-    tmp13 = q1; \
+  DCTELEM row0, row1, row2, row3, row4, row5, row6, row7; \
+  JLONG   q1, q2, q3, q4, q5, q6, q7; \
+  JLONG   tmp11_plus_tmp2, tmp11_minus_tmp2; \
+  \
+  /* 1-D iDCT input data */ \
+  row0 = xrow0; \
+  row1 = xrow1; \
+  row2 = xrow2; \
+  row3 = xrow3; \
+  row4 = xrow4; \
+  row5 = xrow5; \
+  row6 = xrow6; \
+  row7 = xrow7; \
+  \
+  q5 = row7 + row3; \
+  q4 = row5 + row1; \
+  q6 = MULTIPLY(q5, FIX_1_175875602_MINUS_1_961570560) + \
+       MULTIPLY(q4, FIX_1_175875602); \
+  q7 = MULTIPLY(q5, FIX_1_175875602) + \
+       MULTIPLY(q4, FIX_1_175875602_MINUS_0_390180644); \
+  q2 = MULTIPLY(row2, FIX_0_541196100) + \
+       MULTIPLY(row6, FIX_0_541196100_MINUS_1_847759065); \
+  q4 = q6; \
+  q3 = ((JLONG)row0 - (JLONG)row4) << 13; \
+  q6 += MULTIPLY(row5, -FIX_2_562915447) + \
+        MULTIPLY(row3, FIX_3_072711026_MINUS_2_562915447); \
+  /* now we can use q1 (reloadable constants have been used up) */ \
+  q1 = q3 + q2; \
+  q4 += MULTIPLY(row7, FIX_0_298631336_MINUS_0_899976223) + \
+        MULTIPLY(row1, -FIX_0_899976223); \
+  q5 = q7; \
+  q1 = q1 + q6; \
+  q7 += MULTIPLY(row7, -FIX_0_899976223) + \
+        MULTIPLY(row1, FIX_1_501321110_MINUS_0_899976223); \
+  \
+  /* (tmp11 + tmp2) has been calculated (out_row1 before descale) */ \
+  tmp11_plus_tmp2 = q1; \
+  row1 = 0; \
+  \
+  q1 = q1 - q6; \
+  q5 += MULTIPLY(row5, FIX_2_053119869_MINUS_2_562915447) + \
+        MULTIPLY(row3, -FIX_2_562915447); \
+  q1 = q1 - q6; \
+  q6 = MULTIPLY(row2, FIX_0_541196100_PLUS_0_765366865) + \
+       MULTIPLY(row6, FIX_0_541196100); \
+  q3 = q3 - q2; \
+  \
+  /* (tmp11 - tmp2) has been calculated (out_row6 before descale) */ \
+  tmp11_minus_tmp2 = q1; \
+  \
+  q1 = ((JLONG)row0 + (JLONG)row4) << 13; \
+  q2 = q1 + q6; \
+  q1 = q1 - q6; \
+  \
+  /* pick up the results */ \
+  tmp0  = q4; \
+  tmp1  = q5; \
+  tmp2  = (tmp11_plus_tmp2 - tmp11_minus_tmp2) / 2; \
+  tmp3  = q7; \
+  tmp10 = q2; \
+  tmp11 = (tmp11_plus_tmp2 + tmp11_minus_tmp2) / 2; \
+  tmp12 = q3; \
+  tmp13 = q1; \
 }
 
 #define XFIX_0_899976223                    d0[0]
@@ -229,7 +229,7 @@
     ROW7L           .req d30
     ROW7R           .req d31
 
-    /* Load and dequantize coefficients into NEON registers
+    /* Load and dequantize coefficients into Neon registers
      * with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
@@ -261,7 +261,7 @@
     vld1.16         {d0, d1, d2, d3}, [ip, :128]  /* load constants */
     add             ip, ip, #16
     vmul.s16        q15, q15, q3
-    vpush           {d8-d15}                      /* save NEON registers */
+    vpush           {d8 - d15}                    /* save Neon registers */
     /* 1-D IDCT, pass 1, left 4x8 half */
     vadd.s16        d4, ROW7L, ROW3L
     vadd.s16        d5, ROW5L, ROW1L
@@ -507,7 +507,7 @@
     vqrshrn.s16     d17, q9, #2
     vqrshrn.s16     d18, q10, #2
     vqrshrn.s16     d19, q11, #2
-    vpop            {d8-d15}                      /* restore NEON registers */
+    vpop            {d8 - d15}                    /* restore Neon registers */
     vqrshrn.s16     d20, q12, #2
       /* Transpose the final 8-bit samples and do signed->unsigned conversion */
       vtrn.16         q8, q9
@@ -688,7 +688,7 @@
  * function from jidctfst.c
  *
  * Normally 1-D AAN DCT needs 5 multiplications and 29 additions.
- * But in ARM NEON case some extra additions are required because VQDMULH
+ * But in Arm Neon case some extra additions are required because VQDMULH
  * instruction can't handle the constants larger than 1. So the expressions
  * like "x * 1.082392200" have to be converted to "x * 0.082392200 + x",
  * which introduces an extra addition. Overall, there are 6 extra additions
@@ -718,7 +718,7 @@
     TMP3            .req r2
     TMP4            .req ip
 
-    /* Load and dequantize coefficients into NEON registers
+    /* Load and dequantize coefficients into Neon registers
      * with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
@@ -749,7 +749,7 @@
     vmul.s16        q13, q13, q1
     vld1.16         {d0}, [ip, :64]  /* load constants */
     vmul.s16        q15, q15, q3
-    vpush           {d8-d13}         /* save NEON registers */
+    vpush           {d8 - d13}       /* save Neon registers */
     /* 1-D IDCT, pass 1 */
     vsub.s16        q2, q10, q14
     vadd.s16        q14, q10, q14
@@ -842,7 +842,7 @@
     vadd.s16        q14, q5, q3
     vsub.s16        q9, q5, q3
     vsub.s16        q13, q10, q2
-    vpop            {d8-d13}      /* restore NEON registers */
+    vpop            {d8 - d13}    /* restore Neon registers */
     vadd.s16        q10, q10, q2
     vsub.s16        q11, q12, q1
     vadd.s16        q12, q12, q1
@@ -913,7 +913,7 @@
  *
  * NOTE: jpeg-8 has an improved implementation of 4x4 inverse-DCT, which
  *       requires much less arithmetic operations and hence should be faster.
- *       The primary purpose of this particular NEON optimized function is
+ *       The primary purpose of this particular Neon optimized function is
  *       bit exact compatibility with jpeg-6b.
  *
  * TODO: a bit better instructions scheduling can be achieved by expanding
@@ -1010,13 +1010,13 @@
     TMP3            .req r2
     TMP4            .req ip
 
-    vpush           {d8-d15}
+    vpush           {d8 - d15}
 
     /* Load constants (d3 is just used for padding) */
     adr             TMP4, jsimd_idct_4x4_neon_consts
     vld1.16         {d0, d1, d2, d3}, [TMP4, :128]
 
-    /* Load all COEF_BLOCK into NEON registers with the following allocation:
+    /* Load all COEF_BLOCK into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | d4      | d5
@@ -1099,7 +1099,7 @@
     vst1.8          {d27[7]}, [TMP4]!
 #endif
 
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     bx              lr
 
     .unreq          DCT_TABLE
@@ -1126,7 +1126,7 @@
  *
  * NOTE: jpeg-8 has an improved implementation of 2x2 inverse-DCT, which
  *       requires much less arithmetic operations and hence should be faster.
- *       The primary purpose of this particular NEON optimized function is
+ *       The primary purpose of this particular Neon optimized function is
  *       bit exact compatibility with jpeg-6b.
  */
 
@@ -1167,13 +1167,13 @@
     TMP1            .req r0
     TMP2            .req ip
 
-    vpush           {d8-d15}
+    vpush           {d8 - d15}
 
     /* Load constants */
     adr             TMP2, jsimd_idct_2x2_neon_consts
     vld1.16         {d0}, [TMP2, :64]
 
-    /* Load all COEF_BLOCK into NEON registers with the following allocation:
+    /* Load all COEF_BLOCK into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | d4      | d5
@@ -1254,7 +1254,7 @@
     vst1.8          {d26[1]}, [TMP2]!
     vst1.8          {d27[5]}, [TMP2]!
 
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     bx              lr
 
     .unreq          DCT_TABLE
@@ -1499,7 +1499,7 @@
     adr             ip, jsimd_ycc_\colorid\()_neon_consts
     vld1.16         {d0, d1, d2, d3}, [ip, :128]
 
-    /* Save ARM registers and handle input arguments */
+    /* Save Arm registers and handle input arguments */
     push            {r4, r5, r6, r7, r8, r9, r10, lr}
     ldr             NUM_ROWS, [sp, #(4 * 8)]
     ldr             INPUT_BUF0, [INPUT_BUF]
@@ -1507,8 +1507,8 @@
     ldr             INPUT_BUF2, [INPUT_BUF, #8]
     .unreq          INPUT_BUF
 
-    /* Save NEON registers */
-    vpush           {d8-d15}
+    /* Save Neon registers */
+    vpush           {d8 - d15}
 
     /* Initially set d10, d11, d12, d13 to 0xFF */
     vmov.u8         q5, #255
@@ -1571,7 +1571,7 @@
     bgt             0b
 9:
     /* Restore all registers and return */
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     pop             {r4, r5, r6, r7, r8, r9, r10, pc}
 
     .unreq          OUTPUT_WIDTH
@@ -1814,7 +1814,7 @@
     adr             ip, jsimd_\colorid\()_ycc_neon_consts
     vld1.16         {d0, d1, d2, d3}, [ip, :128]
 
-    /* Save ARM registers and handle input arguments */
+    /* Save Arm registers and handle input arguments */
     push            {r4, r5, r6, r7, r8, r9, r10, lr}
     ldr             NUM_ROWS, [sp, #(4 * 8)]
     ldr             OUTPUT_BUF0, [OUTPUT_BUF]
@@ -1822,8 +1822,8 @@
     ldr             OUTPUT_BUF2, [OUTPUT_BUF, #8]
     .unreq          OUTPUT_BUF
 
-    /* Save NEON registers */
-    vpush           {d8-d15}
+    /* Save Neon registers */
+    vpush           {d8 - d15}
 
     /* Outer loop over scanlines */
     cmp             NUM_ROWS, #1
@@ -1882,7 +1882,7 @@
     bgt             0b
 9:
     /* Restore all registers and return */
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     pop             {r4, r5, r6, r7, r8, r9, r10, pc}
 
     .unreq          OUTPUT_WIDTH
@@ -2011,13 +2011,13 @@
     DATA            .req r0
     TMP             .req ip
 
-    vpush           {d8-d15}
+    vpush           {d8 - d15}
 
     /* Load constants */
     adr             TMP, jsimd_fdct_ifast_neon_consts
     vld1.16         {d0}, [TMP, :64]
 
-    /* Load all DATA into NEON registers with the following allocation:
+    /* Load all DATA into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | d16     | d17    | q8
@@ -2096,7 +2096,7 @@
     vst1.16         {d24, d25, d26, d27}, [DATA, :128]!
     vst1.16         {d28, d29, d30, d31}, [DATA, :128]
 
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     bx              lr
 
     .unreq          DATA
@@ -2112,8 +2112,8 @@
  *
  * Note: the code uses 2 stage pipelining in order to improve instructions
  *       scheduling and eliminate stalls (this provides ~15% better
- *       performance for this function on both ARM Cortex-A8 and
- *       ARM Cortex-A9 when compared to the non-pipelined variant).
+ *       performance for this function on both Arm Cortex-A8 and
+ *       Arm Cortex-A9 when compared to the non-pipelined variant).
  *       The instructions which belong to the second stage use different
  *       indentation for better readiability.
  */
@@ -2404,7 +2404,7 @@
     TMP               .req lr
 
     push            {r4, r5, r6, lr}
-    vpush           {d8-d15}
+    vpush           {d8 - d15}
 
     ldr             OUTPUT_DATA, [OUTPUT_DATA_PTR]
     cmp             MAX_V_SAMP_FACTOR, #0
@@ -2422,7 +2422,7 @@
     bgt             11b
 
 99:
-    vpop            {d8-d15}
+    vpop            {d8 - d15}
     pop             {r4, r5, r6, pc}
 
     .unreq          MAX_V_SAMP_FACTOR
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/arm64/jsimd.c firefox-85.0+build1/media/libjpeg/simd/arm64/jsimd.c
--- firefox-84.0.2+build1/media/libjpeg/simd/arm64/jsimd.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/arm64/jsimd.c	2021-01-18 19:58:17.000000000 +0000
@@ -12,7 +12,7 @@
  *
  * This file contains the interface between the "normal" portions
  * of the library and the SIMD implementations when running on a
- * 64-bit ARM architecture.
+ * 64-bit Arm architecture.
  */
 
 #define JPEG_INTERNALS
@@ -114,8 +114,8 @@
  */
 
 /*
- * ARMv8 architectures support NEON extensions by default.
- * It is no longer optional as it was with ARMv7.
+ * Armv8 architectures support Neon extensions by default.
+ * It is no longer optional as it was with Armv7.
  */
 
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/arm64/jsimd_neon.S firefox-85.0+build1/media/libjpeg/simd/arm64/jsimd_neon.S
--- firefox-84.0.2+build1/media/libjpeg/simd/arm64/jsimd_neon.S	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/arm64/jsimd_neon.S	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 /*
- * ARMv8 NEON optimizations for libjpeg-turbo
+ * Armv8 Neon optimizations for libjpeg-turbo
  *
  * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
  *                          All Rights Reserved.
  * Author:  Siarhei Siamashka <siarhei.siamashka@nokia.com>
  * Copyright (C) 2013-2014, Linaro Limited.  All Rights Reserved.
  * Author:  Ragesh Radhakrishnan <ragesh.r@linaro.org>
- * Copyright (C) 2014-2016, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2014-2016, 2020, D. R. Commander.  All Rights Reserved.
  * Copyright (C) 2015-2016, 2018, Matthieu Darbois.  All Rights Reserved.
  * Copyright (C) 2016, Siarhei Siamashka.  All Rights Reserved.
  *
@@ -33,6 +33,8 @@
 
 #if defined(__APPLE__)
 .section __DATA, __const
+#elif defined(_WIN32)
+.section .rdata
 #else
 .section .rodata, "a", %progbits
 #endif
@@ -609,23 +611,23 @@
     shrn2           v5.8h, v15.4s, #16  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS+PASS1_BITS+3) */
     shrn2           v6.8h, v17.4s, #16  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS+PASS1_BITS+3) */
     movi            v0.16b, #(CENTERJSAMPLE)
-    /* Prepare pointers (dual-issue with NEON instructions) */
+    /* Prepare pointers (dual-issue with Neon instructions) */
       ldp             TMP1, TMP2, [OUTPUT_BUF], 16
-    sqrshrn         v28.8b, v2.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn         v28.8b, v2.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       ldp             TMP3, TMP4, [OUTPUT_BUF], 16
-    sqrshrn         v29.8b, v3.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn         v29.8b, v3.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       add             TMP1, TMP1, OUTPUT_COL
-    sqrshrn         v30.8b, v4.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn         v30.8b, v4.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       add             TMP2, TMP2, OUTPUT_COL
-    sqrshrn         v31.8b, v5.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn         v31.8b, v5.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       add             TMP3, TMP3, OUTPUT_COL
-    sqrshrn2        v28.16b, v6.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn2        v28.16b, v6.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       add             TMP4, TMP4, OUTPUT_COL
-    sqrshrn2        v29.16b, v7.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn2        v29.16b, v7.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       ldp             TMP5, TMP6, [OUTPUT_BUF], 16
-    sqrshrn2        v30.16b, v8.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn2        v30.16b, v8.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       ldp             TMP7, TMP8, [OUTPUT_BUF], 16
-    sqrshrn2        v31.16b, v9.8h, #(CONST_BITS+PASS1_BITS+3-16)
+    sqrshrn2        v31.16b, v9.8h, #(CONST_BITS + PASS1_BITS + 3 - 16)
       add             TMP5, TMP5, OUTPUT_COL
     add             v16.16b, v28.16b, v0.16b
       add             TMP6, TMP6, OUTPUT_COL
@@ -737,14 +739,14 @@
     add             v14.4s, v6.4s, v10.4s  /* tmp13 + tmp0 */
     sub             v16.4s, v6.4s, v10.4s  /* tmp13 - tmp0 */
 
-    rshrn           v2.4h, v18.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
-    rshrn           v3.4h, v22.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn           v4.4h, v26.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn           v5.4h, v14.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v2.8h, v16.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v3.8h, v28.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn2          v4.8h, v24.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn2          v5.8h, v20.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v2.4h, v18.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v3.4h, v22.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn           v4.4h, v26.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn           v5.4h, v14.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v2.8h, v16.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v3.8h, v28.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn2          v4.8h, v24.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn2          v5.8h, v20.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
     mov             v6.16b, v15.16b
     mov             v7.16b, v15.16b
     mov             v8.16b, v15.16b
@@ -821,14 +823,14 @@
     mov             v3.16b, v14.16b
     mov             v4.16b, v14.16b
     mov             v5.16b, v14.16b
-    rshrn           v6.4h, v19.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
-    rshrn           v7.4h, v23.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn           v8.4h, v27.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn           v9.4h, v15.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v6.8h, v17.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v7.8h, v29.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn2          v8.8h, v25.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn2          v9.8h, v21.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v6.4h, v19.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v7.4h, v23.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn           v8.4h, v27.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn           v9.4h, v15.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v6.8h, v17.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v7.8h, v29.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn2          v8.8h, v25.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn2          v9.8h, v21.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
     b               1b
 
 .balign 16
@@ -931,22 +933,22 @@
     sub             v16.4s, v6.4s, v10.4s   /* tmp13 - tmp0 */
     sub             v17.4s, v31.4s, v11.4s  /* tmp13 - tmp0 */
 
-    rshrn           v2.4h, v18.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
-    rshrn           v3.4h, v22.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn           v4.4h, v26.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn           v5.4h, v14.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn           v6.4h, v19.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
-    rshrn           v7.4h, v23.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn           v8.4h, v27.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn           v9.4h, v15.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v2.8h, v16.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v3.8h, v28.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn2          v4.8h, v24.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn2          v5.8h, v20.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
-    rshrn2          v6.8h, v17.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
-    rshrn2          v7.8h, v29.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
-    rshrn2          v8.8h, v25.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
-    rshrn2          v9.8h, v21.4s, #(CONST_BITS-PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v2.4h, v18.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v3.4h, v22.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn           v4.4h, v26.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn           v5.4h, v14.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn           v6.4h, v19.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*0] = (int)DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn           v7.4h, v23.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*1] = (int)DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn           v8.4h, v27.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*2] = (int)DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn           v9.4h, v15.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*3] = (int)DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v2.8h, v16.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v3.8h, v28.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn2          v4.8h, v24.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn2          v5.8h, v20.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
+    rshrn2          v6.8h, v17.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*4] = (int)DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS) */
+    rshrn2          v7.8h, v29.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*5] = (int)DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS) */
+    rshrn2          v8.8h, v25.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*6] = (int)DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS) */
+    rshrn2          v9.8h, v21.4s, #(CONST_BITS - PASS1_BITS)  /* wsptr[DCTSIZE*7] = (int)DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS) */
     b               1b
 
     .unreq          DCT_TABLE
@@ -990,7 +992,7 @@
  * function from jidctfst.c
  *
  * Normally 1-D AAN DCT needs 5 multiplications and 29 additions.
- * But in ARM NEON case some extra additions are required because VQDMULH
+ * But in Arm Neon case some extra additions are required because VQDMULH
  * instruction can't handle the constants larger than 1. So the expressions
  * like "x * 1.082392200" have to be converted to "x * 0.082392200 + x",
  * which introduces an extra addition. Overall, there are 6 extra additions
@@ -1022,7 +1024,7 @@
        instruction ensures that those bits are set to zero. */
     uxtw x3, w3
 
-    /* Load and dequantize coefficients into NEON registers
+    /* Load and dequantize coefficients into Neon registers
      * with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
@@ -1035,7 +1037,7 @@
      *   6 | d28     | d29     ( v22.8h )
      *   7 | d30     | d31     ( v23.8h )
      */
-    /* Save NEON registers used in fast IDCT */
+    /* Save Neon registers used in fast IDCT */
     get_symbol_loc  TMP5, Ljsimd_idct_ifast_neon_consts
     ld1             {v16.8h, v17.8h}, [COEF_BLOCK], 32
     ld1             {v0.8h, v1.8h}, [DCT_TABLE], 32
@@ -1140,7 +1142,7 @@
     add             v20.8h, v20.8h, v1.8h
     /* Descale to 8-bit and range limit */
     movi            v0.16b, #0x80
-      /* Prepare pointers (dual-issue with NEON instructions) */
+      /* Prepare pointers (dual-issue with Neon instructions) */
       ldp             TMP1, TMP2, [OUTPUT_BUF], 16
     sqshrn          v28.8b, v16.8h, #5
       ldp             TMP3, TMP4, [OUTPUT_BUF], 16
@@ -1219,7 +1221,7 @@
  *
  * NOTE: jpeg-8 has an improved implementation of 4x4 inverse-DCT, which
  *       requires much less arithmetic operations and hence should be faster.
- *       The primary purpose of this particular NEON optimized function is
+ *       The primary purpose of this particular Neon optimized function is
  *       bit exact compatibility with jpeg-6b.
  *
  * TODO: a bit better instructions scheduling can be achieved by expanding
@@ -1289,7 +1291,7 @@
        instruction ensures that those bits are set to zero. */
     uxtw x3, w3
 
-    /* Save all used NEON registers */
+    /* Save all used Neon registers */
     sub             sp, sp, 64
     mov             x9, sp
     /* Load constants (v3.4h is just used for padding) */
@@ -1298,7 +1300,7 @@
     st1             {v12.8b, v13.8b, v14.8b, v15.8b}, [x9], 32
     ld1             {v0.4h, v1.4h, v2.4h, v3.4h}, [TMP4]
 
-    /* Load all COEF_BLOCK into NEON registers with the following allocation:
+    /* Load all COEF_BLOCK into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | v4.4h   | v5.4h
@@ -1403,7 +1405,7 @@
     st1             {v27.b}[7], [TMP4], 1
 #endif
 
-    /* vpop            {v8.4h - v15.4h}    ;not available */
+    /* vpop            {v8.4h - v15.4h}    (not available) */
     ld1             {v8.8b, v9.8b, v10.8b, v11.8b}, [sp], 32
     ld1             {v12.8b, v13.8b, v14.8b, v15.8b}, [sp], 32
     blr             x30
@@ -1432,7 +1434,7 @@
  *
  * NOTE: jpeg-8 has an improved implementation of 2x2 inverse-DCT, which
  *       requires much less arithmetic operations and hence should be faster.
- *       The primary purpose of this particular NEON optimized function is
+ *       The primary purpose of this particular Neon optimized function is
  *       bit exact compatibility with jpeg-6b.
  */
 
@@ -1471,7 +1473,7 @@
        instruction ensures that those bits are set to zero. */
     uxtw x3, w3
 
-    /* vpush           {v8.4h - v15.4h}            ; not available */
+    /* vpush           {v8.4h - v15.4h}    (not available) */
     sub             sp, sp, 64
     mov             x9, sp
 
@@ -1481,7 +1483,7 @@
     st1             {v12.8b, v13.8b, v14.8b, v15.8b}, [x9], 32
     ld1             {v14.4h}, [TMP2]
 
-    /* Load all COEF_BLOCK into NEON registers with the following allocation:
+    /* Load all COEF_BLOCK into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | v4.4h   | v5.4h
@@ -1855,7 +1857,7 @@
     /* Load constants to d1, d2, d3 (v0.4h is just used for padding) */
     get_symbol_loc  x15, Ljsimd_ycc_rgb_neon_consts
 
-    /* Save NEON registers */
+    /* Save Neon registers */
     st1             {v8.8b, v9.8b, v10.8b, v11.8b}, [x9], 32
     st1             {v12.8b, v13.8b, v14.8b, v15.8b}, [x9], 32
     ld1             {v0.4h, v1.4h}, [x15], 16
@@ -2140,7 +2142,7 @@
 .endm
 
 /* TODO: expand macros and interleave instructions if some in-order
- *       ARM64 processor actually can dual-issue LOAD/STORE with ALU */
+ *       AArch64 processor actually can dual-issue LOAD/STORE with ALU */
 .macro do_rgb_to_yuv_stage2_store_load_stage1 fast_ld3
     do_rgb_to_yuv_stage2
     do_load         \bpp, 8, \fast_ld3
@@ -2180,7 +2182,7 @@
     ldr             OUTPUT_BUF2, [OUTPUT_BUF, #16]
     .unreq          OUTPUT_BUF
 
-    /* Save NEON registers */
+    /* Save Neon registers */
     sub             sp, sp, #64
     mov             x9, sp
     st1             {v8.8b, v9.8b, v10.8b, v11.8b}, [x9], 32
@@ -2357,7 +2359,7 @@
 /*
  * jsimd_fdct_islow_neon
  *
- * This file contains a slow-but-accurate integer implementation of the
+ * This file contains a slower but more accurate integer implementation of the
  * forward DCT (Discrete Cosine Transform). The following code is based
  * directly on the IJG''s original jfdctint.c; see the jfdctint.c for
  * more details.
@@ -2394,13 +2396,13 @@
     get_symbol_loc  TMP, Ljsimd_fdct_islow_neon_consts
     ld1             {v0.8h, v1.8h}, [TMP]
 
-    /* Save NEON registers */
+    /* Save Neon registers */
     sub             sp, sp, #64
     mov             x10, sp
     st1             {v8.8b, v9.8b, v10.8b, v11.8b}, [x10], 32
     st1             {v12.8b, v13.8b, v14.8b, v15.8b}, [x10], 32
 
-    /* Load all DATA into NEON registers with the following allocation:
+    /* Load all DATA into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | d16     | d17    | v16.8h
@@ -2627,7 +2629,7 @@
     st1             {v16.8h, v17.8h, v18.8h, v19.8h}, [DATA], 64
     st1             {v20.8h, v21.8h, v22.8h, v23.8h}, [DATA]
 
-    /* Restore NEON registers */
+    /* Restore Neon registers */
     ld1             {v8.8b, v9.8b, v10.8b, v11.8b}, [sp], 32
     ld1             {v12.8b, v13.8b, v14.8b, v15.8b}, [sp], 32
 
@@ -2679,7 +2681,7 @@
     get_symbol_loc  TMP, Ljsimd_fdct_ifast_neon_consts
     ld1             {v0.4h}, [TMP]
 
-    /* Load all DATA into NEON registers with the following allocation:
+    /* Load all DATA into Neon registers with the following allocation:
      *       0 1 2 3 | 4 5 6 7
      *      ---------+--------
      *   0 | d16     | d17    | v0.8h
@@ -3064,7 +3066,7 @@
 .endif
     sub             sp, sp, 272
     sub             BUFFER, BUFFER, #0x1    /* BUFFER=buffer-- */
-    /* Save ARM registers */
+    /* Save Arm registers */
     stp             x19, x20, [sp]
     get_symbol_loc  x15, Ljsimd_huff_encode_one_block_neon_consts
     ldr             PUT_BUFFER, [x0, #0x10]
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-avx2.asm firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-avx2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-avx2.asm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-avx2.asm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,7 @@
 ; jfdctint.asm - accurate integer FDCT (AVX2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, 2018, D. R. Commander.
+; Copyright (C) 2009, 2016, 2018, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jfdctint.c; see the jfdctint.c for
 ; more details.
@@ -103,7 +103,7 @@
 %endmacro
 
 ; --------------------------------------------------------------------------
-; In-place 8x8x16-bit slow integer forward DCT using AVX2 instructions
+; In-place 8x8x16-bit accurate integer forward DCT using AVX2 instructions
 ; %1-%4: Input/output registers
 ; %5-%8: Temp registers
 ; %9:    Pass (1 or 2)
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-mmx.asm firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-mmx.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-mmx.asm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-mmx.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jfdctint.asm - accurate integer FDCT (MMX)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2016, D. R. Commander.
+; Copyright (C) 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jfdctint.c; see the jfdctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-sse2.asm firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-sse2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jfdctint-sse2.asm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jfdctint-sse2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jfdctint.asm - accurate integer FDCT (SSE2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2016, D. R. Commander.
+; Copyright (C) 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jfdctint.c; see the jfdctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-avx2.asm firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-avx2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-avx2.asm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-avx2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jidctint.asm - accurate integer IDCT (AVX2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, 2018, D. R. Commander.
+; Copyright (C) 2009, 2016, 2018, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jidctint.c; see the jidctint.c for
 ; more details.
@@ -113,7 +113,7 @@
 %endmacro
 
 ; --------------------------------------------------------------------------
-; In-place 8x8x16-bit slow integer inverse DCT using AVX2 instructions
+; In-place 8x8x16-bit accurate integer inverse DCT using AVX2 instructions
 ; %1-%4:  Input/output registers
 ; %5-%12: Temp registers
 ; %9:     Pass (1 or 2)
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-mmx.asm firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-mmx.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-mmx.asm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-mmx.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jidctint.asm - accurate integer IDCT (MMX)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2016, D. R. Commander.
+; Copyright (C) 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jidctint.c; see the jidctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-sse2.asm firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-sse2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/i386/jidctint-sse2.asm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/i386/jidctint-sse2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jidctint.asm - accurate integer IDCT (SSE2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2016, D. R. Commander.
+; Copyright (C) 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jidctint.c; see the jidctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/jsimd.h firefox-85.0+build1/media/libjpeg/simd/jsimd.h
--- firefox-84.0.2+build1/media/libjpeg/simd/jsimd.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/jsimd.h	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
  * simd/jsimd.h
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2011, 2014-2016, 2018, D. R. Commander.
+ * Copyright (C) 2011, 2014-2016, 2018, 2020, D. R. Commander.
  * Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
  * Copyright (C) 2014, Linaro Limited.
  * Copyright (C) 2015-2016, 2018, Matthieu Darbois.
@@ -882,7 +882,7 @@
 EXTERN(void) jsimd_convsamp_float_dspr2
   (JSAMPARRAY sample_data, JDIMENSION start_col, FAST_FLOAT *workspace);
 
-/* Slow Integer Forward DCT */
+/* Accurate Integer Forward DCT */
 EXTERN(void) jsimd_fdct_islow_mmx(DCTELEM *data);
 
 extern const int jconst_fdct_islow_sse2[];
@@ -989,7 +989,7 @@
 EXTERN(void) jsimd_idct_12x12_pass2_dspr2
   (int *workspace, int *output);
 
-/* Slow Integer Inverse DCT */
+/* Accurate Integer Inverse DCT */
 EXTERN(void) jsimd_idct_islow_mmx
   (void *dct_table, JCOEFPTR coef_block, JSAMPARRAY output_buf,
    JDIMENSION output_col);
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/loongson/jfdctint-mmi.c firefox-85.0+build1/media/libjpeg/simd/loongson/jfdctint-mmi.c
--- firefox-84.0.2+build1/media/libjpeg/simd/loongson/jfdctint-mmi.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/loongson/jfdctint-mmi.c	2021-01-18 19:58:17.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Loongson MMI optimizations for libjpeg-turbo
  *
- * Copyright (C) 2014, 2018, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2014, 2018, 2020, D. R. Commander.  All Rights Reserved.
  * Copyright (C) 2016-2017, Loongson Technology Corporation Limited, BeiJing.
  *                          All Rights Reserved.
  * Authors:  ZhuChen     <zhuchen@loongson.cn>
@@ -28,7 +28,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-/* SLOW INTEGER FORWARD DCT */
+/* ACCURATE INTEGER FORWARD DCT */
 
 #include "jsimd_mmi.h"
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/loongson/jidctint-mmi.c firefox-85.0+build1/media/libjpeg/simd/loongson/jidctint-mmi.c
--- firefox-84.0.2+build1/media/libjpeg/simd/loongson/jidctint-mmi.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/loongson/jidctint-mmi.c	2021-01-18 19:58:17.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * Loongson MMI optimizations for libjpeg-turbo
  *
- * Copyright (C) 2014-2015, 2018, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2014-2015, 2018, 2020, D. R. Commander.  All Rights Reserved.
  * Copyright (C) 2016-2017, Loongson Technology Corporation Limited, BeiJing.
  *                          All Rights Reserved.
  * Authors:  ZhuChen     <zhuchen@loongson.cn>
@@ -28,7 +28,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-/* SLOW INTEGER INVERSE DCT */
+/* ACCUATE INTEGER INVERSE DCT */
 
 #include "jsimd_mmi.h"
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/loongson/jsimd_mmi.h firefox-85.0+build1/media/libjpeg/simd/loongson/jsimd_mmi.h
--- firefox-84.0.2+build1/media/libjpeg/simd/loongson/jsimd_mmi.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/loongson/jsimd_mmi.h	2021-01-18 19:58:17.000000000 +0000
@@ -47,11 +47,13 @@
    ((uint64_t)(uint8_t)f << 16) | \
    ((uint64_t)(uint8_t)g << 8)  | \
    ((uint64_t)(uint8_t)h))
-#define _uint64_set_pi16(a, b, c, d)  (((uint64_t)(uint16_t)a << 48) | \
-                                       ((uint64_t)(uint16_t)b << 32) | \
-                                       ((uint64_t)(uint16_t)c << 16) | \
-                                       ((uint64_t)(uint16_t)d))
-#define _uint64_set_pi32(a, b)  (((uint64_t)(uint32_t)a << 32) | \
-                                 ((uint64_t)(uint32_t)b))
+#define _uint64_set_pi16(a, b, c, d) \
+  (((uint64_t)(uint16_t)a << 48) | \
+   ((uint64_t)(uint16_t)b << 32) | \
+   ((uint64_t)(uint16_t)c << 16) | \
+   ((uint64_t)(uint16_t)d))
+#define _uint64_set_pi32(a, b) \
+  (((uint64_t)(uint32_t)a << 32) | \
+   ((uint64_t)(uint32_t)b))
 
 #define get_const_value(index)  (*(__m64 *)&const_value[index])
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/mips/jsimd.c firefox-85.0+build1/media/libjpeg/simd/mips/jsimd.c
--- firefox-84.0.2+build1/media/libjpeg/simd/mips/jsimd.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/mips/jsimd.c	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,7 @@
  * jsimd_mips.c
  *
  * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2009-2011, 2014, 2016, 2018, D. R. Commander.
+ * Copyright (C) 2009-2011, 2014, 2016, 2018, 2020, D. R. Commander.
  * Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
  * Copyright (C) 2015-2016, 2018, Matthieu Darbois.
  *
@@ -29,9 +29,9 @@
 
 static unsigned int simd_support = ~0;
 
-#if defined(__linux__)
+#if !(defined(__mips_dsp) && (__mips_dsp_rev >= 2)) && defined(__linux__)
 
-LOCAL(int)
+LOCAL(void)
 parse_proc_cpuinfo(const char *search_string)
 {
   const char *file_name = "/proc/cpuinfo";
@@ -45,13 +45,12 @@
       if (strstr(cpuinfo_line, search_string) != NULL) {
         fclose(f);
         simd_support |= JSIMD_DSPR2;
-        return 1;
+        return;
       }
     }
     fclose(f);
   }
   /* Did not find string in the proc file, or not Linux ELF. */
-  return 0;
 }
 
 #endif
@@ -73,14 +72,13 @@
 
   simd_support = 0;
 
-#if defined(__MIPSEL__) && defined(__mips_dsp) && (__mips_dsp_rev >= 2)
+#if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
   simd_support |= JSIMD_DSPR2;
 #elif defined(__linux__)
   /* We still have a chance to use MIPS DSPR2 regardless of globally used
    * -mdspr2 options passed to gcc by performing runtime detection via
    * /proc/cpuinfo parsing on linux */
-  if (!parse_proc_cpuinfo("MIPS 74K"))
-    return;
+  parse_proc_cpuinfo("MIPS 74K");
 #endif
 
 #ifndef NO_GETENV
@@ -340,8 +338,13 @@
   if (sizeof(JDIMENSION) != 4)
     return 0;
 
+  /* FIXME: jsimd_h2v2_downsample_dspr2() fails some of the TJBench tiling
+   * regression tests, probably because the DSPr2 SIMD implementation predates
+   * those tests. */
+#if 0
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -376,8 +379,13 @@
   if (sizeof(JDIMENSION) != 4)
     return 0;
 
+  /* FIXME: jsimd_h2v1_downsample_dspr2() fails some of the TJBench tiling
+   * regression tests, probably because the DSPr2 SIMD implementation predates
+   * those tests. */
+#if 0
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -441,8 +449,10 @@
   if (sizeof(JDIMENSION) != 4)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -503,8 +513,10 @@
   if (sizeof(JDIMENSION) != 4)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -520,8 +532,10 @@
   if (sizeof(JDIMENSION) != 4)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -669,8 +683,10 @@
   if (sizeof(DCTELEM) != 2)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -727,8 +743,10 @@
   if (sizeof(DCTELEM) != 2)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -744,8 +762,10 @@
   if (sizeof(DCTELEM) != 2)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -872,8 +892,10 @@
   if (sizeof(ISLOW_MULT_TYPE) != 2)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
@@ -1017,8 +1039,10 @@
   if (IFAST_SCALE_BITS != 2)
     return 0;
 
+#if defined(__MIPSEL__)
   if (simd_support & JSIMD_DSPR2)
     return 1;
+#endif
 
   return 0;
 }
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/mips/jsimd_dspr2.S firefox-85.0+build1/media/libjpeg/simd/mips/jsimd_dspr2.S
--- firefox-84.0.2+build1/media/libjpeg/simd/mips/jsimd_dspr2.S	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/mips/jsimd_dspr2.S	2021-01-18 19:58:18.000000000 +0000
@@ -41,10 +41,10 @@
  */
     SAVE_REGS_ON_STACK 8, s0, s1
 
-    lw          t9, 24(sp)      // t9 = num_rows
-    lw          s0, 28(sp)      // s0 = cinfo->num_components
-    andi        t0, a0, 3       // t0 = cinfo->image_width & 3
-    beqz        t0, 4f          // no residual
+    lw          t9, 24(sp)      /* t9 = num_rows */
+    lw          s0, 28(sp)      /* s0 = cinfo->num_components */
+    andi        t0, a0, 3       /* t0 = cinfo->image_width & 3 */
+    beqz        t0, 4f          /* no residual */
      nop
 0:
     addiu       t9, t9, -1
@@ -52,10 +52,10 @@
      li         t1, 0
 1:
     sll         t3, t1, 2
-    lwx         t5, t3(a2)      // t5 = outptr = output_buf[ci]
-    lw          t2, 0(a1)       // t2 = inptr = *input_buf
+    lwx         t5, t3(a2)      /* t5 = outptr = output_buf[ci] */
+    lw          t2, 0(a1)       /* t2 = inptr = *input_buf */
     sll         t4, a3, 2
-    lwx         t5, t4(t5)      // t5 = outptr = output_buf[ci][output_row]
+    lwx         t5, t4(t5)      /* t5 = outptr = output_buf[ci][output_row] */
     addu        t2, t2, t1
     addu        s1, t5, a0
     addu        t6, t5, t0
@@ -94,10 +94,10 @@
      li         t1, 0
 5:
     sll         t3, t1, 2
-    lwx         t5, t3(a2)      // t5 = outptr = output_buf[ci]
-    lw          t2, 0(a1)       // t2 = inptr = *input_buf
+    lwx         t5, t3(a2)      /* t5 = outptr = output_buf[ci] */
+    lw          t2, 0(a1)       /* t2 = inptr = *input_buf */
     sll         t4, a3, 2
-    lwx         t5, t4(t5)      // t5 = outptr = output_buf[ci][output_row]
+    lwx         t5, t4(t5)      /* t5 = outptr = output_buf[ci][output_row] */
     addu        t2, t2, t1
     addu        s1, t5, a0
     addu        t6, t5, t0
@@ -163,29 +163,29 @@
  */
     SAVE_REGS_ON_STACK 32, s0, s1, s2, s3, s4, s5, s6, s7
 
-    lw          t7, 48(sp)      // t7 = num_rows
-    li          s0, 0x4c8b      // FIX(0.29900)
-    li          s1, 0x9646      // FIX(0.58700)
-    li          s2, 0x1d2f      // FIX(0.11400)
-    li          s3, 0xffffd4cd  // -FIX(0.16874)
-    li          s4, 0xffffab33  // -FIX(0.33126)
-    li          s5, 0x8000      // FIX(0.50000)
-    li          s6, 0xffff94d1  // -FIX(0.41869)
-    li          s7, 0xffffeb2f  // -FIX(0.08131)
-    li          t8, 0x807fff    // CBCR_OFFSET + ONE_HALF-1
+    lw          t7, 48(sp)      /* t7 = num_rows */
+    li          s0, 0x4c8b      /* FIX(0.29900) */
+    li          s1, 0x9646      /* FIX(0.58700) */
+    li          s2, 0x1d2f      /* FIX(0.11400) */
+    li          s3, 0xffffd4cd  /* -FIX(0.16874) */
+    li          s4, 0xffffab33  /* -FIX(0.33126) */
+    li          s5, 0x8000      /* FIX(0.50000) */
+    li          s6, 0xffff94d1  /* -FIX(0.41869) */
+    li          s7, 0xffffeb2f  /* -FIX(0.08131) */
+    li          t8, 0x807fff    /* CBCR_OFFSET + ONE_HALF-1 */
 
 0:
-    addiu       t7, -1          // --num_rows
-    lw          t6, 0(a1)       // t6 = input_buf[0]
+    addiu       t7, -1          /* --num_rows */
+    lw          t6, 0(a1)       /* t6 = input_buf[0] */
     lw          t0, 0(a2)
     lw          t1, 4(a2)
     lw          t2, 8(a2)
     sll         t3, a3, 2
-    lwx         t0, t3(t0)      // t0 = output_buf[0][output_row]
-    lwx         t1, t3(t1)      // t1 = output_buf[1][output_row]
-    lwx         t2, t3(t2)      // t2 = output_buf[2][output_row]
+    lwx         t0, t3(t0)      /* t0 = output_buf[0][output_row] */
+    lwx         t1, t3(t1)      /* t1 = output_buf[1][output_row] */
+    lwx         t2, t3(t2)      /* t2 = output_buf[2][output_row] */
 
-    addu        t9, t2, a0      // t9 = end address
+    addu        t9, t2, a0      /* t9 = end address */
     addiu       a3, 1
 
 1:
@@ -273,10 +273,10 @@
 
     lw          s1, 48(sp)
     li          t3, 0x8000
-    li          t4, 0x166e9     // FIX(1.40200)
-    li          t5, 0x1c5a2     // FIX(1.77200)
-    li          t6, 0xffff492e  // -FIX(0.71414)
-    li          t7, 0xffffa7e6  // -FIX(0.34414)
+    li          t4, 0x166e9     /* FIX(1.40200) */
+    li          t5, 0x1c5a2     /* FIX(1.77200) */
+    li          t6, 0xffff492e  /* -FIX(0.71414) */
+    li          t7, 0xffffa7e6  /* -FIX(0.34414) */
     repl.ph     t8, 128
 
 0:
@@ -293,25 +293,25 @@
     addiu       a2, 1
 
 1:
-    lbu         s7, 0(s4)       // cr
-    lbu         s6, 0(s3)       // cb
-    lbu         s5, 0(s2)       // y
+    lbu         s7, 0(s4)       /* cr */
+    lbu         s6, 0(s3)       /* cb */
+    lbu         s5, 0(s2)       /* y */
     addiu       s2, 1
     addiu       s4, 1
     addiu       s7, -128
     addiu       s6, -128
     mul         t2, t7, s6
-    mul         t0, t6, s7      // Crgtab[cr]
+    mul         t0, t6, s7      /* Crgtab[cr] */
     sll         s7, 15
-    mulq_rs.w   t1, t4, s7      // Crrtab[cr]
+    mulq_rs.w   t1, t4, s7      /* Crrtab[cr] */
     sll         s6, 15
-    addu        t2, t3          // Cbgtab[cb]
+    addu        t2, t3          /* Cbgtab[cb] */
     addu        t2, t0
 
-    mulq_rs.w   t0, t5, s6      // Cbbtab[cb]
+    mulq_rs.w   t0, t5, s6      /* Cbbtab[cb] */
     sra         t2, 16
     addu        t1, s5
-    addu        t2, s5          // add y
+    addu        t2, s5          /* add y */
     ins         t2, t1, 16, 16
     subu.ph     t2, t2, t8
     addu        t0, s5
@@ -319,7 +319,7 @@
     subu        t0, 128
     shra.ph     t2, t2, 8
     shll_s.w    t0, t0, 24
-    addu.ph     t2, t2, t8      // clip & store
+    addu.ph     t2, t2, t8      /* clip & store */
     sra         t0, t0, 24
     sra         t1, t2, 16
     addiu       t0, 128
@@ -382,15 +382,15 @@
  */
     SAVE_REGS_ON_STACK 32, s0, s1, s2, s3, s4, s5, s6, s7
 
-    li          s0, 0x4c8b      // s0 = FIX(0.29900)
-    li          s1, 0x9646      // s1 = FIX(0.58700)
-    li          s2, 0x1d2f      // s2 = FIX(0.11400)
-    li          s7, 0x8000      // s7 = FIX(0.50000)
+    li          s0, 0x4c8b      /* s0 = FIX(0.29900) */
+    li          s1, 0x9646      /* s1 = FIX(0.58700) */
+    li          s2, 0x1d2f      /* s2 = FIX(0.11400) */
+    li          s7, 0x8000      /* s7 = FIX(0.50000) */
     lw          s6, 48(sp)
     andi        t7, a0, 3
 
 0:
-    addiu       s6, -1          // s6 = num_rows
+    addiu       s6, -1          /* s6 = num_rows */
     lw          t0, 0(a1)
     lw          t1, 0(a2)
     sll         t3, a3, 2
@@ -532,59 +532,59 @@
  */
     SAVE_REGS_ON_STACK 40, s0, s1, s2, s3, s4, s5, s6, s7, ra
 
-    lw          t9, 56(sp)      // cinfo->sample_range_limit
+    lw          t9, 56(sp)      /* cinfo->sample_range_limit */
     lw          v0, 0(a1)
     lw          v1, 4(a1)
     lw          t0, 8(a1)
     sll         t1, a2, 3
     addiu       t2, t1, 4
     sll         t3, a2, 2
-    lw          t4, 0(a3)       // t4 = output_buf[0]
-    lwx         t1, t1(v0)      // t1 = input_buf[0][in_row_group_ctr*2]
-    lwx         t2, t2(v0)      // t2 = input_buf[0][in_row_group_ctr*2 + 1]
-    lwx         t5, t3(v1)      // t5 = input_buf[1][in_row_group_ctr]
-    lwx         t6, t3(t0)      // t6 = input_buf[2][in_row_group_ctr]
-    lw          t7, 4(a3)       // t7 = output_buf[1]
+    lw          t4, 0(a3)       /* t4 = output_buf[0] */
+    lwx         t1, t1(v0)      /* t1 = input_buf[0][in_row_group_ctr*2] */
+    lwx         t2, t2(v0)      /* t2 = input_buf[0][in_row_group_ctr*2 + 1] */
+    lwx         t5, t3(v1)      /* t5 = input_buf[1][in_row_group_ctr] */
+    lwx         t6, t3(t0)      /* t6 = input_buf[2][in_row_group_ctr] */
+    lw          t7, 4(a3)       /* t7 = output_buf[1] */
     li          s1, 0xe6ea
-    addiu       t8, s1, 0x7fff    // t8 = 0x166e9 [FIX(1.40200)]
-    addiu       s0, t8, 0x5eb9    // s0 = 0x1c5a2 [FIX(1.77200)]
-    addiu       s1, zero, 0xa7e6  // s4 = 0xffffa7e6 [-FIX(0.34414)]
-    xori        s2, s1, 0xeec8    // s3 = 0xffff492e [-FIX(0.71414)]
+    addiu       t8, s1, 0x7fff    /* t8 = 0x166e9 [FIX(1.40200)] */
+    addiu       s0, t8, 0x5eb9    /* s0 = 0x1c5a2 [FIX(1.77200)] */
+    addiu       s1, zero, 0xa7e6  /* s4 = 0xffffa7e6 [-FIX(0.34414)] */
+    xori        s2, s1, 0xeec8    /* s3 = 0xffff492e [-FIX(0.71414)] */
     srl         t3, a0, 1
     blez        t3, 2f
-     addu       t0, t5, t3      // t0 = end address
+     addu       t0, t5, t3      /* t0 = end address */
  1:
     lbu         t3, 0(t5)
     lbu         s3, 0(t6)
     addiu       t5, t5, 1
-    addiu       t3, t3, -128    // (cb - 128)
-    addiu       s3, s3, -128    // (cr - 128)
+    addiu       t3, t3, -128    /* (cb - 128) */
+    addiu       s3, s3, -128    /* (cr - 128) */
     mult        $ac1, s1, t3
     madd        $ac1, s2, s3
     sll         s3, s3, 15
     sll         t3, t3, 15
-    mulq_rs.w   s4, t8, s3      // s4 = (C1 * cr + ONE_HALF)>> SCALEBITS
+    mulq_rs.w   s4, t8, s3      /* s4 = (C1 * cr + ONE_HALF)>> SCALEBITS */
     extr_r.w    s5, $ac1, 16
-    mulq_rs.w   s6, s0, t3      // s6 = (C2 * cb + ONE_HALF)>> SCALEBITS
+    mulq_rs.w   s6, s0, t3      /* s6 = (C2 * cb + ONE_HALF)>> SCALEBITS */
     lbu         v0, 0(t1)
     addiu       t6, t6, 1
     addiu       t1, t1, 2
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         AT, 0(t3)
     lbu         s7, 0(s3)
     lbu         ra, 0(v1)
     lbu         v0, -1(t1)
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         t3, 0(t3)
     lbu         s3, 0(s3)
     lbu         v1, 0(v1)
@@ -592,23 +592,23 @@
 
     STORE_H2V2_2_PIXELS AT, s7, ra, t3, s3, v1, t4
 
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         AT, 0(t3)
     lbu         s7, 0(s3)
     lbu         ra, 0(v1)
     lbu         v0, 1(t2)
     addiu       t2, t2, 2
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         t3, 0(t3)
     lbu         s3, 0(s3)
     lbu         v1, 0(v1)
@@ -622,22 +622,22 @@
     beqz        t0, 4f
      lbu        t3, 0(t5)
     lbu         s3, 0(t6)
-    addiu       t3, t3, -128    // (cb - 128)
-    addiu       s3, s3, -128    // (cr - 128)
+    addiu       t3, t3, -128    /* (cb - 128) */
+    addiu       s3, s3, -128    /* (cr - 128) */
     mult        $ac1, s1, t3
     madd        $ac1, s2, s3
     sll         s3, s3, 15
     sll         t3, t3, 15
     lbu         v0, 0(t1)
     extr_r.w    s5, $ac1, 16
-    mulq_rs.w   s4, t8, s3      // s4 = (C1 * cr + ONE_HALF)>> SCALEBITS
-    mulq_rs.w   s6, s0, t3      // s6 = (C2 * cb + ONE_HALF)>> SCALEBITS
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    mulq_rs.w   s4, t8, s3      /* s4 = (C1 * cr + ONE_HALF)>> SCALEBITS */
+    mulq_rs.w   s6, s0, t3      /* s6 = (C2 * cb + ONE_HALF)>> SCALEBITS */
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         t3, 0(t3)
     lbu         s3, 0(s3)
     lbu         v1, 0(v1)
@@ -645,12 +645,12 @@
 
     STORE_H2V2_1_PIXEL t3, s3, v1, t4
 
-    addu        t3, v0, s4      // y+cred
-    addu        s3, v0, s5      // y+cgreen
-    addu        v1, v0, s6      // y+cblue
-    addu        t3, t9, t3      // y+cred
-    addu        s3, t9, s3      // y+cgreen
-    addu        v1, t9, v1      // y+cblue
+    addu        t3, v0, s4      /* y+cred */
+    addu        s3, v0, s5      /* y+cgreen */
+    addu        v1, v0, s6      /* y+cblue */
+    addu        t3, t9, t3      /* y+cred */
+    addu        s3, t9, s3      /* y+cgreen */
+    addu        v1, t9, v1      /* y+cblue */
     lbu         t3, 0(t3)
     lbu         s3, 0(s3)
     lbu         v1, 0(v1)
@@ -733,41 +733,41 @@
     SAVE_REGS_ON_STACK 40, s0, s1, s2, s3, s4, s5, s6, s7, ra
 
     li          t0, 0xe6ea
-    lw          t1, 0(a1)         // t1 = input_buf[0]
-    lw          t2, 4(a1)         // t2 = input_buf[1]
-    lw          t3, 8(a1)         // t3 = input_buf[2]
-    lw          t8, 56(sp)        // t8 = range_limit
-    addiu       s1, t0, 0x7fff    // s1 = 0x166e9 [FIX(1.40200)]
-    addiu       s2, s1, 0x5eb9    // s2 = 0x1c5a2 [FIX(1.77200)]
-    addiu       s0, t0, 0x9916    // s0 = 0x8000
-    addiu       s4, zero, 0xa7e6  // s4 = 0xffffa7e6 [-FIX(0.34414)]
-    xori        s3, s4, 0xeec8    // s3 = 0xffff492e [-FIX(0.71414)]
+    lw          t1, 0(a1)         /* t1 = input_buf[0] */
+    lw          t2, 4(a1)         /* t2 = input_buf[1] */
+    lw          t3, 8(a1)         /* t3 = input_buf[2] */
+    lw          t8, 56(sp)        /* t8 = range_limit */
+    addiu       s1, t0, 0x7fff    /* s1 = 0x166e9 [FIX(1.40200)] */
+    addiu       s2, s1, 0x5eb9    /* s2 = 0x1c5a2 [FIX(1.77200)] */
+    addiu       s0, t0, 0x9916    /* s0 = 0x8000 */
+    addiu       s4, zero, 0xa7e6  /* s4 = 0xffffa7e6 [-FIX(0.34414)] */
+    xori        s3, s4, 0xeec8    /* s3 = 0xffff492e [-FIX(0.71414)] */
     srl         t0, a0, 1
     sll         t4, a2, 2
-    lwx         s5, t4(t1)      // s5 = inptr0
-    lwx         s6, t4(t2)      // s6 = inptr1
-    lwx         s7, t4(t3)      // s7 = inptr2
-    lw          t7, 0(a3)       // t7 = outptr
+    lwx         s5, t4(t1)      /* s5 = inptr0 */
+    lwx         s6, t4(t2)      /* s6 = inptr1 */
+    lwx         s7, t4(t3)      /* s7 = inptr2 */
+    lw          t7, 0(a3)       /* t7 = outptr */
     blez        t0, 2f
-     addu       t9, s6, t0      // t9 = end address
+     addu       t9, s6, t0      /* t9 = end address */
 1:
-    lbu         t2, 0(s6)       // t2 = cb
-    lbu         t0, 0(s7)       // t0 = cr
-    lbu         t1, 0(s5)       // t1 = y
-    addiu       t2, t2, -128    // t2 = cb - 128
-    addiu       t0, t0, -128    // t0 = cr - 128
+    lbu         t2, 0(s6)       /* t2 = cb */
+    lbu         t0, 0(s7)       /* t0 = cr */
+    lbu         t1, 0(s5)       /* t1 = y */
+    addiu       t2, t2, -128    /* t2 = cb - 128 */
+    addiu       t0, t0, -128    /* t0 = cr - 128 */
     mult        $ac1, s4, t2
     madd        $ac1, s3, t0
     sll         t0, t0, 15
     sll         t2, t2, 15
-    mulq_rs.w   t0, s1, t0      // t0 = (C1*cr + ONE_HALF)>> SCALEBITS
+    mulq_rs.w   t0, s1, t0      /* t0 = (C1*cr + ONE_HALF)>> SCALEBITS */
     extr_r.w    t5, $ac1, 16
-    mulq_rs.w   t6, s2, t2      // t6 = (C2*cb + ONE_HALF)>> SCALEBITS
+    mulq_rs.w   t6, s2, t2      /* t6 = (C2*cb + ONE_HALF)>> SCALEBITS */
     addiu       s7, s7, 1
     addiu       s6, s6, 1
-    addu        t2, t1, t0      // t2 = y + cred
-    addu        t3, t1, t5      // t3 = y + cgreen
-    addu        t4, t1, t6      // t4 = y + cblue
+    addu        t2, t1, t0      /* t2 = y + cred */
+    addu        t3, t1, t5      /* t3 = y + cgreen */
+    addu        t4, t1, t6      /* t4 = y + cblue */
     addu        t2, t8, t2
     addu        t3, t8, t3
     addu        t4, t8, t4
@@ -797,20 +797,20 @@
     lbu         t2, 0(s6)
     lbu         t0, 0(s7)
     lbu         t1, 0(s5)
-    addiu       t2, t2, -128    // (cb - 128)
-    addiu       t0, t0, -128    // (cr - 128)
+    addiu       t2, t2, -128    /* (cb - 128) */
+    addiu       t0, t0, -128    /* (cr - 128) */
     mul         t3, s4, t2
     mul         t4, s3, t0
     sll         t0, t0, 15
     sll         t2, t2, 15
-    mulq_rs.w   t0, s1, t0      // (C1*cr + ONE_HALF)>> SCALEBITS
-    mulq_rs.w   t6, s2, t2      // (C2*cb + ONE_HALF)>> SCALEBITS
+    mulq_rs.w   t0, s1, t0      /* (C1*cr + ONE_HALF)>> SCALEBITS */
+    mulq_rs.w   t6, s2, t2      /* (C2*cb + ONE_HALF)>> SCALEBITS */
     addu        t3, t3, s0
     addu        t3, t4, t3
-    sra         t5, t3, 16      // (C4*cb + ONE_HALF + C3*cr)>> SCALEBITS
-    addu        t2, t1, t0      // y + cred
-    addu        t3, t1, t5      // y + cgreen
-    addu        t4, t1, t6      // y + cblue
+    sra         t5, t3, 16      /* (C4*cb + ONE_HALF + C3*cr)>> SCALEBITS */
+    addu        t2, t1, t0      /* y + cred */
+    addu        t3, t1, t5      /* y + cgreen */
+    addu        t4, t1, t6      /* y + cblue */
     addu        t2, t8, t2
     addu        t3, t8, t3
     addu        t4, t8, t4
@@ -856,15 +856,15 @@
     SAVE_REGS_ON_STACK 24, s0, s1, s2, s3, s4, s5
 
     li            s4, 0
-    lw            s2, 0(a3)       // s2 = *output_data_ptr
+    lw            s2, 0(a3)       /* s2 = *output_data_ptr */
 0:
     li            t9, 2
-    lw            s1, -4(a2)      // s1 = inptr1
+    lw            s1, -4(a2)      /* s1 = inptr1 */
 
 1:
-    lw            s0, 0(a2)       // s0 = inptr0
+    lw            s0, 0(a2)       /* s0 = inptr0 */
     lwx           s3, s4(s2)
-    addiu         s5, a1, -2      // s5 = downsampled_width - 2
+    addiu         s5, a1, -2      /* s5 = downsampled_width - 2 */
     srl           t4, s5, 1
     sll           t4, t4, 1
     lbu           t0, 0(s0)
@@ -873,50 +873,50 @@
     lbu           t3, 1(s1)
     addiu         s0, 2
     addiu         s1, 2
-    addu          t8, s0, t4      // t8 = end address
-    andi          s5, s5, 1       // s5 = residual
+    addu          t8, s0, t4      /* t8 = end address */
+    andi          s5, s5, 1       /* s5 = residual */
     sll           t4, t0, 1
     sll           t6, t1, 1
-    addu          t0, t0, t4      // t0 = (*inptr0++) * 3
-    addu          t1, t1, t6      // t1 = (*inptr0++) * 3
-    addu          t7, t0, t2      // t7 = thiscolsum
-    addu          t6, t1, t3      // t5 = nextcolsum
-    sll           t0, t7, 2       // t0 = thiscolsum * 4
-    subu          t1, t0, t7      // t1 = thiscolsum * 3
+    addu          t0, t0, t4      /* t0 = (*inptr0++) * 3 */
+    addu          t1, t1, t6      /* t1 = (*inptr0++) * 3 */
+    addu          t7, t0, t2      /* t7 = thiscolsum */
+    addu          t6, t1, t3      /* t5 = nextcolsum */
+    sll           t0, t7, 2       /* t0 = thiscolsum * 4 */
+    subu          t1, t0, t7      /* t1 = thiscolsum * 3 */
     shra_r.w      t0, t0, 4
     addiu         t1, 7
     addu          t1, t1, t6
     srl           t1, t1, 4
     sb            t0, 0(s3)
     sb            t1, 1(s3)
-    beq           t8, s0, 22f     // skip to final iteration if width == 3
+    beq           t8, s0, 22f     /* skip to final iteration if width == 3 */
      addiu        s3, 2
 2:
-    lh            t0, 0(s0)       // t0 = A3|A2
-    lh            t2, 0(s1)       // t2 = B3|B2
+    lh            t0, 0(s0)       /* t0 = A3|A2 */
+    lh            t2, 0(s1)       /* t2 = B3|B2 */
     addiu         s0, 2
     addiu         s1, 2
-    preceu.ph.qbr t0, t0          // t0 = 0|A3|0|A2
-    preceu.ph.qbr t2, t2          // t2 = 0|B3|0|B2
+    preceu.ph.qbr t0, t0          /* t0 = 0|A3|0|A2 */
+    preceu.ph.qbr t2, t2          /* t2 = 0|B3|0|B2 */
     shll.ph       t1, t0, 1
     sll           t3, t6, 1
-    addu.ph       t0, t1, t0      // t0 = A3*3|A2*3
-    addu          t3, t3, t6      // t3 = this * 3
-    addu.ph       t0, t0, t2      // t0 = next2|next1
+    addu.ph       t0, t1, t0      /* t0 = A3*3|A2*3 */
+    addu          t3, t3, t6      /* t3 = this * 3 */
+    addu.ph       t0, t0, t2      /* t0 = next2|next1 */
     addu          t1, t3, t7
-    andi          t7, t0, 0xFFFF  // t7 = next1
+    andi          t7, t0, 0xFFFF  /* t7 = next1 */
     sll           t2, t7, 1
-    addu          t2, t7, t2      // t2 = next1*3
+    addu          t2, t7, t2      /* t2 = next1*3 */
     addu          t4, t2, t6
-    srl           t6, t0, 16      // t6 = next2
-    shra_r.w      t1, t1, 4       // t1 = (this*3 + last + 8) >> 4
+    srl           t6, t0, 16      /* t6 = next2 */
+    shra_r.w      t1, t1, 4       /* t1 = (this*3 + last + 8) >> 4 */
     addu          t0, t3, t7
     addiu         t0, 7
-    srl           t0, t0, 4       // t0 = (this*3 + next1 + 7) >> 4
-    shra_r.w      t4, t4, 4       // t3 = (next1*3 + this + 8) >> 4
+    srl           t0, t0, 4       /* t0 = (this*3 + next1 + 7) >> 4 */
+    shra_r.w      t4, t4, 4       /* t3 = (next1*3 + this + 8) >> 4 */
     addu          t2, t2, t6
     addiu         t2, 7
-    srl           t2, t2, 4       // t2 = (next1*3 + next2 + 7) >> 4
+    srl           t2, t2, 4       /* t2 = (next1*3 + next2 + 7) >> 4 */
     sb            t1, 0(s3)
     sb            t0, 1(s3)
     sb            t4, 2(s3)
@@ -933,8 +933,8 @@
     addiu         s1, 1
     sll           t3, t6, 1
     sll           t1, t0, 1
-    addu          t1, t0, t1      // t1 = inptr0 * 3
-    addu          t3, t3, t6      // t3 = thiscolsum * 3
+    addu          t1, t0, t1      /* t1 = inptr0 * 3 */
+    addu          t3, t3, t6      /* t3 = thiscolsum * 3 */
     addu          t5, t1, t2
     addu          t1, t3, t7
     shra_r.w      t1, t1, 4
@@ -948,8 +948,8 @@
     bne           t8, s0, 3b
      move         t6, t5
 4:
-    sll           t0, t6, 2       // t0 = thiscolsum * 4
-    subu          t1, t0, t6      // t1 = thiscolsum * 3
+    sll           t0, t6, 2       /* t0 = thiscolsum * 4 */
+    subu          t1, t0, t6      /* t1 = thiscolsum * 3 */
     addu          t1, t1, t7
     addiu         s4, 4
     shra_r.w      t1, t1, 4
@@ -996,9 +996,9 @@
     lw            t7, 0(a2)
     lw            s2, 0(s1)
     lbu           t0, 0(t7)
-    lbu           t1, 1(t7)       // t1 = inptr[1]
+    lbu           t1, 1(t7)       /* t1 = inptr[1] */
     sll           t2, t0, 1
-    addu          t2, t2, t0      // t2 = invalue*3
+    addu          t2, t2, t0      /* t2 = invalue*3 */
     addu          t2, t2, t1
     shra_r.w      t2, t2, 2
     sb            t0, 0(s2)
@@ -1006,28 +1006,28 @@
     beqz          t9, 11f
      addiu        s2, 2
 1:
-    ulw           t0, 0(t7)       // t0 = |P3|P2|P1|P0|
+    ulw           t0, 0(t7)       /* t0 = |P3|P2|P1|P0| */
     ulw           t1, 1(t7)
-    ulh           t2, 4(t7)       // t2 = |0|0|P5|P4|
-    preceu.ph.qbl t3, t0          // t3 = |0|P3|0|P2|
-    preceu.ph.qbr t0, t0          // t0 = |0|P1|0|P0|
-    preceu.ph.qbr t2, t2          // t2 = |0|P5|0|P4|
-    preceu.ph.qbl t4, t1          // t4 = |0|P4|0|P3|
-    preceu.ph.qbr t1, t1          // t1 = |0|P2|0|P1|
+    ulh           t2, 4(t7)       /* t2 = |0|0|P5|P4| */
+    preceu.ph.qbl t3, t0          /* t3 = |0|P3|0|P2| */
+    preceu.ph.qbr t0, t0          /* t0 = |0|P1|0|P0| */
+    preceu.ph.qbr t2, t2          /* t2 = |0|P5|0|P4| */
+    preceu.ph.qbl t4, t1          /* t4 = |0|P4|0|P3| */
+    preceu.ph.qbr t1, t1          /* t1 = |0|P2|0|P1| */
     shll.ph       t5, t4, 1
     shll.ph       t6, t1, 1
-    addu.ph       t5, t5, t4      // t5 = |P4*3|P3*3|
-    addu.ph       t6, t6, t1      // t6 = |P2*3|P1*3|
+    addu.ph       t5, t5, t4      /* t5 = |P4*3|P3*3| */
+    addu.ph       t6, t6, t1      /* t6 = |P2*3|P1*3| */
     addu.ph       t4, t3, s3
     addu.ph       t0, t0, s3
     addu.ph       t4, t4, t5
     addu.ph       t0, t0, t6
-    shrl.ph       t4, t4, 2       // t4 = |0|P3|0|P2|
-    shrl.ph       t0, t0, 2       // t0 = |0|P1|0|P0|
+    shrl.ph       t4, t4, 2       /* t4 = |0|P3|0|P2| */
+    shrl.ph       t0, t0, 2       /* t0 = |0|P1|0|P0| */
     addu.ph       t2, t2, t5
     addu.ph       t3, t3, t6
-    shra_r.ph     t2, t2, 2       // t2 = |0|P5|0|P4|
-    shra_r.ph     t3, t3, 2       // t3 = |0|P3|0|P2|
+    shra_r.ph     t2, t2, 2       /* t2 = |0|P5|0|P4| */
+    shra_r.ph     t3, t3, 2       /* t3 = |0|P3|0|P2| */
     shll.ph       t2, t2, 8
     shll.ph       t3, t3, 8
     or            t2, t4, t2
@@ -1047,7 +1047,7 @@
     lbu           t0, 0(t7)
     addiu         t7, 1
     sll           t1, t0, 1
-    addu          t2, t0, t1      // t2 = invalue
+    addu          t2, t0, t1      /* t2 = invalue */
     lbu           t3, -2(t7)
     lbu           t4, 0(t7)
     addiu         t3, 1
@@ -1066,7 +1066,7 @@
     lbu           t0, 0(t7)
     lbu           t2, -1(t7)
     sll           t1, t0, 1
-    addu          t1, t1, t0      // t1 = invalue * 3
+    addu          t1, t1, t0      /* t1 = invalue * 3 */
     addu          t1, t1, t2
     addiu         t1, 1
     srl           t1, t1, 2
@@ -1098,22 +1098,22 @@
     SAVE_REGS_ON_STACK 24, s0, s1, s2, s3, s4
 
     beqz        a2, 7f
-     lw         s1, 44(sp)      // s1 = output_data
-    lw          s0, 40(sp)      // s0 = input_data
+     lw         s1, 44(sp)      /* s1 = output_data */
+    lw          s0, 40(sp)      /* s0 = input_data */
     srl         s2, a0, 2
     andi        t9, a0, 2
     srl         t7, t9, 1
     addu        s2, t7, s2
-    sll         t0, a3, 3       // t0 = width_in_blocks*DCT
+    sll         t0, a3, 3       /* t0 = width_in_blocks*DCT */
     srl         t7, t0, 1
     subu        s2, t7, s2
 0:
-    andi        t6, a0, 1       // t6 = temp_index
+    andi        t6, a0, 1       /* t6 = temp_index */
     addiu       t6, -1
-    lw          t4, 0(s1)       // t4 = outptr
-    lw          t5, 0(s0)       // t5 = inptr0
-    li          s3, 0           // s3 = bias
-    srl         t7, a0, 1       // t7 = image_width1
+    lw          t4, 0(s1)       /* t4 = outptr */
+    lw          t5, 0(s0)       /* t5 = inptr0 */
+    li          s3, 0           /* s3 = bias */
+    srl         t7, a0, 1       /* t7 = image_width1 */
     srl         s4, t7, 2
     andi        t8, t7, 3
 1:
@@ -1151,12 +1151,12 @@
 3:
     lbux        t1, t6(t5)
     sll         t1, 1
-    addqh.w     t2, t1, s3      // t2 = pixval1
+    addqh.w     t2, t1, s3      /* t2 = pixval1 */
     xori        s3, s3, 1
-    addqh.w     t3, t1, s3      // t3 = pixval2
+    addqh.w     t3, t1, s3      /* t3 = pixval2 */
     blez        s2, 5f
      append     t3, t2,  8
-    addu        t5, t4, s2      // t5 = loop_end2
+    addu        t5, t4, s2      /* t5 = loop_end2 */
 4:
     ush         t3, 0(t4)
     addiu       s2, -1
@@ -1194,33 +1194,33 @@
     SAVE_REGS_ON_STACK 32, s0, s1, s2, s3, s4, s5, s6, s7
 
     beqz        a2, 8f
-     lw         s1, 52(sp)      // s1 = output_data
-    lw          s0, 48(sp)      // s0 = input_data
+     lw         s1, 52(sp)      /* s1 = output_data */
+    lw          s0, 48(sp)      /* s0 = input_data */
 
-    andi        t6, a0, 1       // t6 = temp_index
+    andi        t6, a0, 1       /* t6 = temp_index */
     addiu       t6, -1
-    srl         t7, a0, 1       // t7 = image_width1
+    srl         t7, a0, 1       /* t7 = image_width1 */
     srl         s4, t7, 2
     andi        t8, t7, 3
     andi        t9, a0, 2
     srl         s2, a0, 2
     srl         t7, t9, 1
     addu        s2, t7, s2
-    sll         t0, a3, 3       // s2 = width_in_blocks*DCT
+    sll         t0, a3, 3       /* s2 = width_in_blocks*DCT */
     srl         t7, t0, 1
     subu        s2, t7, s2
 0:
-    lw          t4, 0(s1)       // t4 = outptr
-    lw          t5, 0(s0)       // t5 = inptr0
-    lw          s7, 4(s0)       // s7 = inptr1
-    li          s6, 1           // s6 = bias
+    lw          t4, 0(s1)       /* t4 = outptr */
+    lw          t5, 0(s0)       /* t5 = inptr0 */
+    lw          s7, 4(s0)       /* s7 = inptr1 */
+    li          s6, 1           /* s6 = bias */
 2:
-    ulw         t0, 0(t5)       // t0 = |P3|P2|P1|P0|
-    ulw         t1, 0(s7)       // t1 = |Q3|Q2|Q1|Q0|
+    ulw         t0, 0(t5)       /* t0 = |P3|P2|P1|P0| */
+    ulw         t1, 0(s7)       /* t1 = |Q3|Q2|Q1|Q0| */
     ulw         t2, 4(t5)
     ulw         t3, 4(s7)
-    precrq.ph.w t7, t0, t1      // t2 = |P3|P2|Q3|Q2|
-    ins         t0, t1, 16, 16  // t0 = |Q1|Q0|P1|P0|
+    precrq.ph.w t7, t0, t1      /* t2 = |P3|P2|Q3|Q2| */
+    ins         t0, t1, 16, 16  /* t0 = |Q1|Q0|P1|P0| */
     raddu.w.qb  t1, t7
     raddu.w.qb  t0, t0
     shra_r.w    t1, t1, 2
@@ -1264,10 +1264,10 @@
     sll         t0, 1
     addu        t1, t1, t0
     addu        t3, t1, s6
-    srl         t0, t3, 2       // t2 = pixval1
+    srl         t0, t3, 2       /* t2 = pixval1 */
     xori        s6, s6, 3
     addu        t2, t1, s6
-    srl         t1, t2, 2       // t3 = pixval2
+    srl         t1, t2, 2       /* t3 = pixval2 */
     blez        s2, 6f
      append     t1, t0, 8
 5:
@@ -1307,15 +1307,15 @@
 
     SAVE_REGS_ON_STACK 32, s0, s1, s2, s3, s4, s5, s6, s7
 
-    lw          s7, 52(sp)      // compptr->width_in_blocks
-    lw          s0, 56(sp)      // cinfo->image_width
-    lw          s6, 48(sp)      // cinfo->smoothing_factor
-    sll         s7, 3           // output_cols = width_in_blocks * DCTSIZE
+    lw          s7, 52(sp)      /* compptr->width_in_blocks */
+    lw          s0, 56(sp)      /* cinfo->image_width */
+    lw          s6, 48(sp)      /* cinfo->smoothing_factor */
+    sll         s7, 3           /* output_cols = width_in_blocks * DCTSIZE */
     sll         v0, s7, 1
     subu        v0, v0, s0
     blez        v0, 2f
     move        v1, zero
-    addiu       t0, a3, 2       // t0 = cinfo->max_v_samp_factor + 2
+    addiu       t0, a3, 2       /* t0 = cinfo->max_v_samp_factor + 2 */
 0:
     addiu       t1, a0, -4
     sll         t2, v1, 2
@@ -1337,20 +1337,20 @@
     li          v1, 16384
     move        t4, zero
     move        t5, zero
-    subu        t6, v1, v0      // t6 = 16384 - tmp_smoot_f * 80
-    sll         t7, s6, 4       // t7 = tmp_smoot_f * 16
+    subu        t6, v1, v0      /* t6 = 16384 - tmp_smoot_f * 80 */
+    sll         t7, s6, 4       /* t7 = tmp_smoot_f * 16 */
 3:
 /* Special case for first column: pretend column -1 is same as column 0 */
     sll         v0, t4, 2
-    lwx         t8, v0(a1)      //  outptr = output_data[outrow]
+    lwx         t8, v0(a1)      /*  outptr = output_data[outrow] */
     sll         v1, t5, 2
     addiu       t9, v1, 4
     addiu       s0, v1, -4
     addiu       s1, v1, 8
-    lwx         s2, v1(a0)      // inptr0 = input_data[inrow]
-    lwx         t9, t9(a0)      // inptr1 = input_data[inrow+1]
-    lwx         s0, s0(a0)      // above_ptr = input_data[inrow-1]
-    lwx         s1, s1(a0)      // below_ptr = input_data[inrow+2]
+    lwx         s2, v1(a0)      /* inptr0 = input_data[inrow] */
+    lwx         t9, t9(a0)      /* inptr1 = input_data[inrow+1] */
+    lwx         s0, s0(a0)      /* above_ptr = input_data[inrow-1] */
+    lwx         s1, s1(a0)      /* below_ptr = input_data[inrow+2] */
     lh          v0, 0(s2)
     lh          v1, 0(t9)
     lh          t0, 0(s0)
@@ -1387,7 +1387,7 @@
     sb          v0, -1(t8)
     addiu       s4, s7, -2
     and         s4, s4, 3
-    addu        s5, s4, t8      // end address
+    addu        s5, s4, t8      /* end address */
 4:
     lh          v0, 0(s2)
     lh          v1, 0(t9)
@@ -1426,7 +1426,7 @@
     addiu       s1, s1, 2
     addiu       s5, s7, -2
     subu        s5, s5, s4
-    addu        s5, s5, t8      // end address
+    addu        s5, s5, t8      /* end address */
 5:
     lh          v0, 0(s2)
     lh          v1, 0(t9)
@@ -1607,24 +1607,24 @@
 
     SAVE_REGS_ON_STACK 16, s0, s1, s2, s3
 
-    lw          s0, 0(a3)       // s0 = output_data
-    lw          s1, 32(sp)      // s1 = cinfo->output_width
-    lw          s2, 36(sp)      // s2 = cinfo->max_v_samp_factor
-    li          t6, 0           // t6 = inrow
+    lw          s0, 0(a3)       /* s0 = output_data */
+    lw          s1, 32(sp)      /* s1 = cinfo->output_width */
+    lw          s2, 36(sp)      /* s2 = cinfo->max_v_samp_factor */
+    li          t6, 0           /* t6 = inrow */
     beqz        s2, 10f
-     li         s3, 0           // s3 = outrow
+     li         s3, 0           /* s3 = outrow */
 0:
     addu        t0, a2, t6
     addu        t7, s0, s3
-    lw          t3, 0(t0)       // t3 = inptr
-    lw          t8, 0(t7)       // t8 = outptr
+    lw          t3, 0(t0)       /* t3 = inptr */
+    lw          t8, 0(t7)       /* t8 = outptr */
     beqz        s1, 4f
-     addu       t5, t8, s1      // t5 = outend
+     addu       t5, t8, s1      /* t5 = outend */
 1:
-    lb          t2, 0(t3)       // t2 = invalue = *inptr++
+    lb          t2, 0(t3)       /* t2 = invalue = *inptr++ */
     addiu       t3, 1
     beqz        a0, 3f
-     move       t0, a0          // t0 = h_expand
+     move       t0, a0          /* t0 = h_expand */
 2:
     sb          t2, 0(t8)
     addiu       t0, -1
@@ -1634,7 +1634,7 @@
     bgt         t5, t8, 1b
      nop
 4:
-    addiu       t9, a1, -1      // t9 = v_expand - 1
+    addiu       t9, a1, -1      /* t9 = v_expand - 1 */
     blez        t9, 9f
      nop
 5:
@@ -1642,8 +1642,8 @@
     lw          t4, 4(s0)
     subu        t0, s1, 0xF
     blez        t0, 7f
-     addu       t5, t3, s1      // t5 = end address
-    andi        t7, s1, 0xF     // t7 = residual
+     addu       t5, t3, s1      /* t5 = end address */
+    andi        t7, s1, 0xF     /* t7 = residual */
     subu        t8, t5, t7
 6:
     ulw         t0, 0(t3)
@@ -1689,33 +1689,33 @@
  * a2 = input_data
  * a3 = output_data_ptr
  */
-    lw          t7, 0(a3)       // t7 = output_data
-    andi        t8, a1, 0xf     // t8 = residual
+    lw          t7, 0(a3)       /* t7 = output_data */
+    andi        t8, a1, 0xf     /* t8 = residual */
     sll         t0, a0, 2
     blez        a0, 4f
-     addu       t9, t7, t0      // t9 = output_data end address
+     addu       t9, t7, t0      /* t9 = output_data end address */
 0:
-    lw          t5, 0(t7)       // t5 = outptr
-    lw          t6, 0(a2)       // t6 = inptr
-    addu        t3, t5, a1      // t3 = outptr + output_width (end address)
-    subu        t3, t8          // t3 = end address - residual
+    lw          t5, 0(t7)       /* t5 = outptr */
+    lw          t6, 0(a2)       /* t6 = inptr */
+    addu        t3, t5, a1      /* t3 = outptr + output_width (end address) */
+    subu        t3, t8          /* t3 = end address - residual */
     beq         t5, t3, 2f
      move       t4, t8
 1:
-    ulw         t0, 0(t6)       // t0 = |P3|P2|P1|P0|
-    ulw         t2, 4(t6)       // t2 = |P7|P6|P5|P4|
-    srl         t1, t0, 16      // t1 = |X|X|P3|P2|
-    ins         t0, t0, 16, 16  // t0 = |P1|P0|P1|P0|
-    ins         t1, t1, 16, 16  // t1 = |P3|P2|P3|P2|
-    ins         t0, t0, 8, 16   // t0 = |P1|P1|P0|P0|
-    ins         t1, t1, 8, 16   // t1 = |P3|P3|P2|P2|
+    ulw         t0, 0(t6)       /* t0 = |P3|P2|P1|P0| */
+    ulw         t2, 4(t6)       /* t2 = |P7|P6|P5|P4| */
+    srl         t1, t0, 16      /* t1 = |X|X|P3|P2| */
+    ins         t0, t0, 16, 16  /* t0 = |P1|P0|P1|P0| */
+    ins         t1, t1, 16, 16  /* t1 = |P3|P2|P3|P2| */
+    ins         t0, t0, 8, 16   /* t0 = |P1|P1|P0|P0| */
+    ins         t1, t1, 8, 16   /* t1 = |P3|P3|P2|P2| */
     usw         t0, 0(t5)
     usw         t1, 4(t5)
-    srl         t0, t2, 16      // t0 = |X|X|P7|P6|
-    ins         t2, t2, 16, 16  // t2 = |P5|P4|P5|P4|
-    ins         t0, t0, 16, 16  // t0 = |P7|P6|P7|P6|
-    ins         t2, t2, 8, 16   // t2 = |P5|P5|P4|P4|
-    ins         t0, t0, 8, 16   // t0 = |P7|P7|P6|P6|
+    srl         t0, t2, 16      /* t0 = |X|X|P7|P6| */
+    ins         t2, t2, 16, 16  /* t2 = |P5|P4|P5|P4| */
+    ins         t0, t0, 16, 16  /* t0 = |P7|P6|P7|P6| */
+    ins         t2, t2, 8, 16   /* t2 = |P5|P5|P4|P4| */
+    ins         t0, t0, 8, 16   /* t0 = |P7|P7|P6|P6| */
     usw         t2, 8(t5)
     usw         t0, 12(t5)
     addiu       t5, 16
@@ -1751,12 +1751,12 @@
  */
     lw          t7, 0(a3)
     blez        a0, 7f
-     andi       t9, a1, 0xf     // t9 = residual
+     andi       t9, a1, 0xf     /* t9 = residual */
 0:
-    lw          t6, 0(a2)       // t6 = inptr
-    lw          t5, 0(t7)       // t5 = outptr
-    addu        t8, t5, a1      // t8 = outptr end address
-    subu        t8, t9          // t8 = end address - residual
+    lw          t6, 0(a2)       /* t6 = inptr */
+    lw          t5, 0(t7)       /* t5 = outptr */
+    addu        t8, t5, a1      /* t8 = outptr end address */
+    subu        t8, t9          /* t8 = end address - residual */
     beq         t5, t8, 2f
      move       t4, t9
 1:
@@ -1790,9 +1790,9 @@
     bgtz        t4, 2b
      addiu      t5, 2
 3:
-    lw          t6, 0(t7)       // t6 = outptr[0]
-    lw          t5, 4(t7)       // t5 = outptr[1]
-    addu        t4, t6, a1      // t4 = new end address
+    lw          t6, 0(t7)       /* t6 = outptr[0] */
+    lw          t5, 4(t7)       /* t5 = outptr[1] */
+    addu        t4, t6, a1      /* t4 = new end address */
     beq         a1, t9, 5f
      subu       t8, t4, t9
 4:
@@ -1838,15 +1838,15 @@
 
     addiu       sp, sp, -256
     move        v0, sp
-    addiu       v1, zero, 8     // v1 = DCTSIZE = 8
+    addiu       v1, zero, 8     /* v1 = DCTSIZE = 8 */
 1:
-    lh          s4, 32(a0)      // s4 = inptr[16]
-    lh          s5, 64(a0)      // s5 = inptr[32]
-    lh          s6, 96(a0)      // s6 = inptr[48]
-    lh          t1, 112(a0)     // t1 = inptr[56]
-    lh          t7, 16(a0)      // t7 = inptr[8]
-    lh          t5, 80(a0)      // t5 = inptr[40]
-    lh          t3, 48(a0)      // t3 = inptr[24]
+    lh          s4, 32(a0)      /* s4 = inptr[16] */
+    lh          s5, 64(a0)      /* s5 = inptr[32] */
+    lh          s6, 96(a0)      /* s6 = inptr[48] */
+    lh          t1, 112(a0)     /* t1 = inptr[56] */
+    lh          t7, 16(a0)      /* t7 = inptr[8] */
+    lh          t5, 80(a0)      /* t5 = inptr[40] */
+    lh          t3, 48(a0)      /* t3 = inptr[24] */
     or          s4, s4, t1
     or          s4, s4, t3
     or          s4, s4, t5
@@ -1855,9 +1855,9 @@
     or          s4, s4, s6
     bnez        s4, 2f
      addiu      v1, v1, -1
-    lh          s5, 0(a1)       // quantptr[DCTSIZE*0]
-    lh          s6, 0(a0)       // inptr[DCTSIZE*0]
-    mul         s5, s5, s6      // DEQUANTIZE(inptr[0], quantptr[0])
+    lh          s5, 0(a1)       /* quantptr[DCTSIZE*0] */
+    lh          s6, 0(a0)       /* inptr[DCTSIZE*0] */
+    mul         s5, s5, s6      /* DEQUANTIZE(inptr[0], quantptr[0]) */
     sll         s5, s5, 2
     sw          s5, 0(v0)
     sw          s5, 32(v0)
@@ -1873,68 +1873,77 @@
     lh          t2, 48(a1)
     lh          t4, 80(a1)
     lh          t6, 16(a1)
-    mul         t0, t0, t1      // DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7])
-    mul         t1, t2, t3      // DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3])
-    mul         t2, t4, t5      // DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5])
-    mul         t3, t6, t7      // DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1])
+    mul         t0, t0, t1      /* DEQUANTIZE(inptr[DCTSIZE*7],
+                                              quantptr[DCTSIZE*7]) */
+    mul         t1, t2, t3      /* DEQUANTIZE(inptr[DCTSIZE*3],
+                                              quantptr[DCTSIZE*3]) */
+    mul         t2, t4, t5      /* DEQUANTIZE(inptr[DCTSIZE*5],
+                                              quantptr[DCTSIZE*5]) */
+    mul         t3, t6, t7      /* DEQUANTIZE(inptr[DCTSIZE*1],
+                                              quantptr[DCTSIZE*1]) */
     lh          t4, 32(a1)
     lh          t5, 32(a0)
     lh          t6, 96(a1)
     lh          t7, 96(a0)
-    addu        s0, t0, t1       // z3 = tmp0 + tmp2
-    addu        s1, t1, t2       // z2 = tmp1 + tmp2
-    addu        s2, t2, t3       // z4 = tmp1 + tmp3
-    addu        s3, s0, s2       // z3 + z4
-    addiu       t9, zero, 9633   // FIX_1_175875602
-    mul         s3, s3, t9       // z5 = MULTIPLY(z3 + z4, FIX_1_175875602)
-    addu        t8, t0, t3       // z1 = tmp0 + tmp3
-    addiu       t9, zero, 2446   // FIX_0_298631336
-    mul         t0, t0, t9       // tmp0 = MULTIPLY(tmp0, FIX_0_298631336)
-    addiu       t9, zero, 16819  // FIX_2_053119869
-    mul         t2, t2, t9       // tmp1 = MULTIPLY(tmp1, FIX_2_053119869)
-    addiu       t9, zero, 25172  // FIX_3_072711026
-    mul         t1, t1, t9       // tmp2 = MULTIPLY(tmp2, FIX_3_072711026)
-    addiu       t9, zero, 12299  // FIX_1_501321110
-    mul         t3, t3, t9       // tmp3 = MULTIPLY(tmp3, FIX_1_501321110)
-    addiu       t9, zero, 16069  // FIX_1_961570560
-    mul         s0, s0, t9       // -z3 = MULTIPLY(z3, FIX_1_961570560)
-    addiu       t9, zero, 3196   // FIX_0_390180644
-    mul         s2, s2, t9       // -z4 = MULTIPLY(z4, FIX_0_390180644)
-    addiu       t9, zero, 7373   // FIX_0_899976223
-    mul         t8, t8, t9       // -z1 = MULTIPLY(z1, FIX_0_899976223)
-    addiu       t9, zero, 20995  // FIX_2_562915447
-    mul         s1, s1, t9       // -z2 = MULTIPLY(z2, FIX_2_562915447)
-    subu        s0, s3, s0       // z3 += z5
-    addu        t0, t0, s0       // tmp0 += z3
-    addu        t1, t1, s0       // tmp2 += z3
-    subu        s2, s3, s2       // z4 += z5
-    addu        t2, t2, s2       // tmp1 += z4
-    addu        t3, t3, s2       // tmp3 += z4
-    subu        t0, t0, t8       // tmp0 += z1
-    subu        t1, t1, s1       // tmp2 += z2
-    subu        t2, t2, s1       // tmp1 += z2
-    subu        t3, t3, t8       // tmp3 += z1
-    mul         s0, t4, t5       // DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2])
-    addiu       t9, zero, 6270   // FIX_0_765366865
-    mul         s1, t6, t7       // DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6])
+    addu        s0, t0, t1       /* z3 = tmp0 + tmp2 */
+    addu        s1, t1, t2       /* z2 = tmp1 + tmp2 */
+    addu        s2, t2, t3       /* z4 = tmp1 + tmp3 */
+    addu        s3, s0, s2       /* z3 + z4 */
+    addiu       t9, zero, 9633   /* FIX_1_175875602 */
+    mul         s3, s3, t9       /* z5 = MULTIPLY(z3 + z4, FIX_1_175875602) */
+    addu        t8, t0, t3       /* z1 = tmp0 + tmp3 */
+    addiu       t9, zero, 2446   /* FIX_0_298631336 */
+    mul         t0, t0, t9       /* tmp0 = MULTIPLY(tmp0, FIX_0_298631336) */
+    addiu       t9, zero, 16819  /* FIX_2_053119869 */
+    mul         t2, t2, t9       /* tmp1 = MULTIPLY(tmp1, FIX_2_053119869) */
+    addiu       t9, zero, 25172  /* FIX_3_072711026 */
+    mul         t1, t1, t9       /* tmp2 = MULTIPLY(tmp2, FIX_3_072711026) */
+    addiu       t9, zero, 12299  /* FIX_1_501321110 */
+    mul         t3, t3, t9       /* tmp3 = MULTIPLY(tmp3, FIX_1_501321110) */
+    addiu       t9, zero, 16069  /* FIX_1_961570560 */
+    mul         s0, s0, t9       /* -z3 = MULTIPLY(z3, FIX_1_961570560) */
+    addiu       t9, zero, 3196   /* FIX_0_390180644 */
+    mul         s2, s2, t9       /* -z4 = MULTIPLY(z4, FIX_0_390180644) */
+    addiu       t9, zero, 7373   /* FIX_0_899976223 */
+    mul         t8, t8, t9       /* -z1 = MULTIPLY(z1, FIX_0_899976223) */
+    addiu       t9, zero, 20995  /* FIX_2_562915447 */
+    mul         s1, s1, t9       /* -z2 = MULTIPLY(z2, FIX_2_562915447) */
+    subu        s0, s3, s0       /* z3 += z5 */
+    addu        t0, t0, s0       /* tmp0 += z3 */
+    addu        t1, t1, s0       /* tmp2 += z3 */
+    subu        s2, s3, s2       /* z4 += z5 */
+    addu        t2, t2, s2       /* tmp1 += z4 */
+    addu        t3, t3, s2       /* tmp3 += z4 */
+    subu        t0, t0, t8       /* tmp0 += z1 */
+    subu        t1, t1, s1       /* tmp2 += z2 */
+    subu        t2, t2, s1       /* tmp1 += z2 */
+    subu        t3, t3, t8       /* tmp3 += z1 */
+    mul         s0, t4, t5       /* DEQUANTIZE(inptr[DCTSIZE*2],
+                                               quantptr[DCTSIZE*2]) */
+    addiu       t9, zero, 6270   /* FIX_0_765366865 */
+    mul         s1, t6, t7       /* DEQUANTIZE(inptr[DCTSIZE*6],
+                                               quantptr[DCTSIZE*6]) */
     lh          t4, 0(a1)
     lh          t5, 0(a0)
     lh          t6, 64(a1)
     lh          t7, 64(a0)
-    mul         s2, t9, s0       // MULTIPLY(z2, FIX_0_765366865)
-    mul         t5, t4, t5       // DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0])
-    mul         t6, t6, t7       // DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4])
-    addiu       t9, zero, 4433   // FIX_0_541196100
-    addu        s3, s0, s1       // z2 + z3
-    mul         s3, s3, t9       // z1 = MULTIPLY(z2 + z3, FIX_0_541196100)
-    addiu       t9, zero, 15137  // FIX_1_847759065
-    mul         t8, s1, t9       // MULTIPLY(z3, FIX_1_847759065)
+    mul         s2, t9, s0       /* MULTIPLY(z2, FIX_0_765366865) */
+    mul         t5, t4, t5       /* DEQUANTIZE(inptr[DCTSIZE*0],
+                                               quantptr[DCTSIZE*0]) */
+    mul         t6, t6, t7       /* DEQUANTIZE(inptr[DCTSIZE*4],
+                                               quantptr[DCTSIZE*4]) */
+    addiu       t9, zero, 4433   /* FIX_0_541196100 */
+    addu        s3, s0, s1       /* z2 + z3 */
+    mul         s3, s3, t9       /* z1 = MULTIPLY(z2 + z3, FIX_0_541196100) */
+    addiu       t9, zero, 15137  /* FIX_1_847759065 */
+    mul         t8, s1, t9       /* MULTIPLY(z3, FIX_1_847759065) */
     addu        t4, t5, t6
     subu        t5, t5, t6
-    sll         t4, t4, 13      // tmp0 = (z2 + z3) << CONST_BITS
-    sll         t5, t5, 13      // tmp1 = (z2 - z3) << CONST_BITS
-    addu        t7, s3, s2      // tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865)
-    subu        t6, s3, t8      // tmp2 = z1 + MULTIPLY(z3, -FIX_1_847759065)
+    sll         t4, t4, 13      /* tmp0 = (z2 + z3) << CONST_BITS */
+    sll         t5, t5, 13      /* tmp1 = (z2 - z3) << CONST_BITS */
+    addu        t7, s3, s2      /* tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865) */
+    subu        t6, s3, t8      /* tmp2 =
+                                     z1 + MULTIPLY(z3, -FIX_1_847759065) */
     addu        s0, t4, t7
     subu        s1, t4, t7
     addu        s2, t5, t6
@@ -1971,14 +1980,14 @@
     move        v0, sp
     addiu       v1, zero, 8
 4:
-    lw          t0, 8(v0)       // z2 = (JLONG)wsptr[2]
-    lw          t1, 24(v0)      // z3 = (JLONG)wsptr[6]
-    lw          t2, 0(v0)       // (JLONG)wsptr[0]
-    lw          t3, 16(v0)      // (JLONG)wsptr[4]
-    lw          s4, 4(v0)       // (JLONG)wsptr[1]
-    lw          s5, 12(v0)      // (JLONG)wsptr[3]
-    lw          s6, 20(v0)      // (JLONG)wsptr[5]
-    lw          s7, 28(v0)      // (JLONG)wsptr[7]
+    lw          t0, 8(v0)       /* z2 = (JLONG)wsptr[2] */
+    lw          t1, 24(v0)      /* z3 = (JLONG)wsptr[6] */
+    lw          t2, 0(v0)       /* (JLONG)wsptr[0] */
+    lw          t3, 16(v0)      /* (JLONG)wsptr[4] */
+    lw          s4, 4(v0)       /* (JLONG)wsptr[1] */
+    lw          s5, 12(v0)      /* (JLONG)wsptr[3] */
+    lw          s6, 20(v0)      /* (JLONG)wsptr[5] */
+    lw          s7, 28(v0)      /* (JLONG)wsptr[7] */
     or          s4, s4, t0
     or          s4, s4, t1
     or          s4, s4, t3
@@ -1997,60 +2006,64 @@
     b           6f
      nop
 5:
-    addu        t4, t0, t1       // z2 + z3
-    addiu       t8, zero, 4433   // FIX_0_541196100
-    mul         t5, t4, t8       // z1 = MULTIPLY(z2 + z3, FIX_0_541196100)
-    addiu       t8, zero, 15137  // FIX_1_847759065
-    mul         t1, t1, t8       // MULTIPLY(z3, FIX_1_847759065)
-    addiu       t8, zero, 6270   // FIX_0_765366865
-    mul         t0, t0, t8       // MULTIPLY(z2, FIX_0_765366865)
-    addu        t4, t2, t3       // (JLONG)wsptr[0] + (JLONG)wsptr[4]
-    subu        t2, t2, t3       // (JLONG)wsptr[0] - (JLONG)wsptr[4]
-    sll         t4, t4, 13       // tmp0 = (wsptr[0] + wsptr[4]) << CONST_BITS
-    sll         t2, t2, 13       // tmp1 = (wsptr[0] - wsptr[4]) << CONST_BITS
-    subu        t1, t5, t1       // tmp2 = z1 + MULTIPLY(z3, -FIX_1_847759065)
-    subu        t3, t2, t1       // tmp12 = tmp1 - tmp2
-    addu        t2, t2, t1       // tmp11 = tmp1 + tmp2
-    addu        t5, t5, t0       // tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865)
-    subu        t1, t4, t5       // tmp13 = tmp0 - tmp3
-    addu        t0, t4, t5       // tmp10 = tmp0 + tmp3
-    lw          t4, 28(v0)       // tmp0 = (JLONG)wsptr[7]
-    lw          t6, 12(v0)       // tmp2 = (JLONG)wsptr[3]
-    lw          t5, 20(v0)       // tmp1 = (JLONG)wsptr[5]
-    lw          t7, 4(v0)        // tmp3 = (JLONG)wsptr[1]
-    addu        s0, t4, t6       // z3 = tmp0 + tmp2
-    addiu       t8, zero, 9633   // FIX_1_175875602
-    addu        s1, t5, t7       // z4 = tmp1 + tmp3
-    addu        s2, s0, s1       // z3 + z4
-    mul         s2, s2, t8       // z5 = MULTIPLY(z3 + z4, FIX_1_175875602)
-    addu        s3, t4, t7       // z1 = tmp0 + tmp3
-    addu        t9, t5, t6       // z2 = tmp1 + tmp2
-    addiu       t8, zero, 16069  // FIX_1_961570560
-    mul         s0, s0, t8       // -z3 = MULTIPLY(z3, FIX_1_961570560)
-    addiu       t8, zero, 3196   // FIX_0_390180644
-    mul         s1, s1, t8       // -z4 = MULTIPLY(z4, FIX_0_390180644)
-    addiu       t8, zero, 2446   // FIX_0_298631336
-    mul         t4, t4, t8       // tmp0 = MULTIPLY(tmp0, FIX_0_298631336)
-    addiu       t8, zero, 7373   // FIX_0_899976223
-    mul         s3, s3, t8       // -z1 = MULTIPLY(z1, FIX_0_899976223)
-    addiu       t8, zero, 16819  // FIX_2_053119869
-    mul         t5, t5, t8       // tmp1 = MULTIPLY(tmp1, FIX_2_053119869)
-    addiu       t8, zero, 20995  // FIX_2_562915447
-    mul         t9, t9, t8       // -z2 = MULTIPLY(z2, FIX_2_562915447)
-    addiu       t8, zero, 25172  // FIX_3_072711026
-    mul         t6, t6, t8       // tmp2 = MULTIPLY(tmp2, FIX_3_072711026)
-    addiu       t8, zero, 12299  // FIX_1_501321110
-    mul         t7, t7, t8       // tmp3 = MULTIPLY(tmp3, FIX_1_501321110)
-    subu        s0, s2, s0       // z3 += z5
-    subu        s1, s2, s1       // z4 += z5
+    addu        t4, t0, t1       /* z2 + z3 */
+    addiu       t8, zero, 4433   /* FIX_0_541196100 */
+    mul         t5, t4, t8       /* z1 = MULTIPLY(z2 + z3, FIX_0_541196100) */
+    addiu       t8, zero, 15137  /* FIX_1_847759065 */
+    mul         t1, t1, t8       /* MULTIPLY(z3, FIX_1_847759065) */
+    addiu       t8, zero, 6270   /* FIX_0_765366865 */
+    mul         t0, t0, t8       /* MULTIPLY(z2, FIX_0_765366865) */
+    addu        t4, t2, t3       /* (JLONG)wsptr[0] + (JLONG)wsptr[4] */
+    subu        t2, t2, t3       /* (JLONG)wsptr[0] - (JLONG)wsptr[4] */
+    sll         t4, t4, 13       /* tmp0 =
+                                      (wsptr[0] + wsptr[4]) << CONST_BITS */
+    sll         t2, t2, 13       /* tmp1 =
+                                      (wsptr[0] - wsptr[4]) << CONST_BITS */
+    subu        t1, t5, t1       /* tmp2 =
+                                      z1 + MULTIPLY(z3, -FIX_1_847759065) */
+    subu        t3, t2, t1       /* tmp12 = tmp1 - tmp2 */
+    addu        t2, t2, t1       /* tmp11 = tmp1 + tmp2 */
+    addu        t5, t5, t0       /* tmp3 =
+                                      z1 + MULTIPLY(z2, FIX_0_765366865) */
+    subu        t1, t4, t5       /* tmp13 = tmp0 - tmp3 */
+    addu        t0, t4, t5       /* tmp10 = tmp0 + tmp3 */
+    lw          t4, 28(v0)       /* tmp0 = (JLONG)wsptr[7] */
+    lw          t6, 12(v0)       /* tmp2 = (JLONG)wsptr[3] */
+    lw          t5, 20(v0)       /* tmp1 = (JLONG)wsptr[5] */
+    lw          t7, 4(v0)        /* tmp3 = (JLONG)wsptr[1] */
+    addu        s0, t4, t6       /* z3 = tmp0 + tmp2 */
+    addiu       t8, zero, 9633   /* FIX_1_175875602 */
+    addu        s1, t5, t7       /* z4 = tmp1 + tmp3 */
+    addu        s2, s0, s1       /* z3 + z4 */
+    mul         s2, s2, t8       /* z5 = MULTIPLY(z3 + z4, FIX_1_175875602) */
+    addu        s3, t4, t7       /* z1 = tmp0 + tmp3 */
+    addu        t9, t5, t6       /* z2 = tmp1 + tmp2 */
+    addiu       t8, zero, 16069  /* FIX_1_961570560 */
+    mul         s0, s0, t8       /* -z3 = MULTIPLY(z3, FIX_1_961570560) */
+    addiu       t8, zero, 3196   /* FIX_0_390180644 */
+    mul         s1, s1, t8       /* -z4 = MULTIPLY(z4, FIX_0_390180644) */
+    addiu       t8, zero, 2446   /* FIX_0_298631336 */
+    mul         t4, t4, t8       /* tmp0 = MULTIPLY(tmp0, FIX_0_298631336) */
+    addiu       t8, zero, 7373   /* FIX_0_899976223 */
+    mul         s3, s3, t8       /* -z1 = MULTIPLY(z1, FIX_0_899976223) */
+    addiu       t8, zero, 16819  /* FIX_2_053119869 */
+    mul         t5, t5, t8       /* tmp1 = MULTIPLY(tmp1, FIX_2_053119869) */
+    addiu       t8, zero, 20995  /* FIX_2_562915447 */
+    mul         t9, t9, t8       /* -z2 = MULTIPLY(z2, FIX_2_562915447) */
+    addiu       t8, zero, 25172  /* FIX_3_072711026 */
+    mul         t6, t6, t8       /* tmp2 = MULTIPLY(tmp2, FIX_3_072711026) */
+    addiu       t8, zero, 12299  /* FIX_1_501321110 */
+    mul         t7, t7, t8       /* tmp3 = MULTIPLY(tmp3, FIX_1_501321110) */
+    subu        s0, s2, s0       /* z3 += z5 */
+    subu        s1, s2, s1       /* z4 += z5 */
     addu        t4, t4, s0
-    subu        t4, t4, s3      // tmp0
+    subu        t4, t4, s3      /* tmp0 */
     addu        t5, t5, s1
-    subu        t5, t5, t9      // tmp1
+    subu        t5, t5, t9      /* tmp1 */
     addu        t6, t6, s0
-    subu        t6, t6, t9      // tmp2
+    subu        t6, t6, t9      /* tmp2 */
     addu        t7, t7, s1
-    subu        t7, t7, s3      // tmp3
+    subu        t7, t7, s3      /* tmp3 */
     addu        s0, t0, t7
     subu        t0, t0, t7
     addu        t7, t2, t6
@@ -2116,124 +2129,124 @@
  */
     SAVE_REGS_ON_STACK 32, s0, s1, s2, s3, s4, s5, s6, s7
 
-    addiu         t9, a0, 16      // end address
+    addiu         t9, a0, 16      /* end address */
     or            AT, a3, zero
 
 0:
-    lw            s0, 0(a1)       // quantptr[DCTSIZE*0]
-    lw            t0, 0(a0)       // inptr[DCTSIZE*0]
-    lw            t1, 16(a0)      // inptr[DCTSIZE*1]
-    muleq_s.w.phl v0, t0, s0      // tmp0 ...
-    lw            t2, 32(a0)      // inptr[DCTSIZE*2]
-    lw            t3, 48(a0)      // inptr[DCTSIZE*3]
-    lw            t4, 64(a0)      // inptr[DCTSIZE*4]
-    lw            t5, 80(a0)      // inptr[DCTSIZE*5]
-    muleq_s.w.phr t0, t0, s0      // ... tmp0 ...
-    lw            t6, 96(a0)      // inptr[DCTSIZE*6]
-    lw            t7, 112(a0)     // inptr[DCTSIZE*7]
+    lw            s0, 0(a1)       /* quantptr[DCTSIZE*0] */
+    lw            t0, 0(a0)       /* inptr[DCTSIZE*0] */
+    lw            t1, 16(a0)      /* inptr[DCTSIZE*1] */
+    muleq_s.w.phl v0, t0, s0      /* tmp0 ... */
+    lw            t2, 32(a0)      /* inptr[DCTSIZE*2] */
+    lw            t3, 48(a0)      /* inptr[DCTSIZE*3] */
+    lw            t4, 64(a0)      /* inptr[DCTSIZE*4] */
+    lw            t5, 80(a0)      /* inptr[DCTSIZE*5] */
+    muleq_s.w.phr t0, t0, s0      /* ... tmp0 ... */
+    lw            t6, 96(a0)      /* inptr[DCTSIZE*6] */
+    lw            t7, 112(a0)     /* inptr[DCTSIZE*7] */
     or            s4, t1, t2
     or            s5, t3, t4
     bnez          s4, 1f
-     ins          t0, v0, 16, 16  // ... tmp0
+     ins          t0, v0, 16, 16  /* ... tmp0 */
     bnez          s5, 1f
      or           s6, t5, t6
     or            s6, s6, t7
     bnez          s6, 1f
-     sw           t0, 0(a2)       // wsptr[DCTSIZE*0]
-    sw            t0, 16(a2)      // wsptr[DCTSIZE*1]
-    sw            t0, 32(a2)      // wsptr[DCTSIZE*2]
-    sw            t0, 48(a2)      // wsptr[DCTSIZE*3]
-    sw            t0, 64(a2)      // wsptr[DCTSIZE*4]
-    sw            t0, 80(a2)      // wsptr[DCTSIZE*5]
-    sw            t0, 96(a2)      // wsptr[DCTSIZE*6]
-    sw            t0, 112(a2)     // wsptr[DCTSIZE*7]
+     sw           t0, 0(a2)       /* wsptr[DCTSIZE*0] */
+    sw            t0, 16(a2)      /* wsptr[DCTSIZE*1] */
+    sw            t0, 32(a2)      /* wsptr[DCTSIZE*2] */
+    sw            t0, 48(a2)      /* wsptr[DCTSIZE*3] */
+    sw            t0, 64(a2)      /* wsptr[DCTSIZE*4] */
+    sw            t0, 80(a2)      /* wsptr[DCTSIZE*5] */
+    sw            t0, 96(a2)      /* wsptr[DCTSIZE*6] */
+    sw            t0, 112(a2)     /* wsptr[DCTSIZE*7] */
     addiu         a0, a0, 4
     b             2f
      addiu        a1, a1, 4
 
 1:
-    lw            s1, 32(a1)      // quantptr[DCTSIZE*2]
-    lw            s2, 64(a1)      // quantptr[DCTSIZE*4]
-    muleq_s.w.phl v0, t2, s1      // tmp1 ...
-    muleq_s.w.phr t2, t2, s1      // ... tmp1 ...
-    lw            s0, 16(a1)      // quantptr[DCTSIZE*1]
-    lw            s1, 48(a1)      // quantptr[DCTSIZE*3]
-    lw            s3, 96(a1)      // quantptr[DCTSIZE*6]
-    muleq_s.w.phl v1, t4, s2      // tmp2 ...
-    muleq_s.w.phr t4, t4, s2      // ... tmp2 ...
-    lw            s2, 80(a1)      // quantptr[DCTSIZE*5]
-    lw            t8, 4(AT)       // FIX(1.414213562)
-    ins           t2, v0, 16, 16  // ... tmp1
-    muleq_s.w.phl v0, t6, s3      // tmp3 ...
-    muleq_s.w.phr t6, t6, s3      // ... tmp3 ...
-    ins           t4, v1, 16, 16  // ... tmp2
-    addq.ph       s4, t0, t4      // tmp10
-    subq.ph       s5, t0, t4      // tmp11
-    ins           t6, v0, 16, 16  // ... tmp3
-    subq.ph       s6, t2, t6      // tmp12 ...
-    addq.ph       s7, t2, t6      // tmp13
-    mulq_s.ph     s6, s6, t8      // ... tmp12 ...
-    addq.ph       t0, s4, s7      // tmp0
-    subq.ph       t6, s4, s7      // tmp3
-    muleq_s.w.phl v0, t1, s0      // tmp4 ...
-    muleq_s.w.phr t1, t1, s0      // ... tmp4 ...
-    shll_s.ph     s6, s6, 1       // x2
-    lw            s3, 112(a1)     // quantptr[DCTSIZE*7]
-    subq.ph       s6, s6, s7      // ... tmp12
-    muleq_s.w.phl v1, t7, s3      // tmp7 ...
-    muleq_s.w.phr t7, t7, s3      // ... tmp7 ...
-    ins           t1, v0, 16, 16  // ... tmp4
-    addq.ph       t2, s5, s6      // tmp1
-    subq.ph       t4, s5, s6      // tmp2
-    muleq_s.w.phl v0, t5, s2      // tmp6 ...
-    muleq_s.w.phr t5, t5, s2      // ... tmp6 ...
-    ins           t7, v1, 16, 16  // ... tmp7
-    addq.ph       s5, t1, t7      // z11
-    subq.ph       s6, t1, t7      // z12
-    muleq_s.w.phl v1, t3, s1      // tmp5 ...
-    muleq_s.w.phr t3, t3, s1      // ... tmp5 ...
-    ins           t5, v0, 16, 16  // ... tmp6
-    ins           t3, v1, 16, 16  // ... tmp5
-    addq.ph       s7, t5, t3      // z13
-    subq.ph       v0, t5, t3      // z10
-    addq.ph       t7, s5, s7      // tmp7
-    subq.ph       s5, s5, s7      // tmp11 ...
-    addq.ph       v1, v0, s6      // z5 ...
-    mulq_s.ph     s5, s5, t8      // ... tmp11
-    lw            t8, 8(AT)       // FIX(1.847759065)
-    lw            s4, 0(AT)       // FIX(1.082392200)
+    lw            s1, 32(a1)      /* quantptr[DCTSIZE*2] */
+    lw            s2, 64(a1)      /* quantptr[DCTSIZE*4] */
+    muleq_s.w.phl v0, t2, s1      /* tmp1 ... */
+    muleq_s.w.phr t2, t2, s1      /* ... tmp1 ... */
+    lw            s0, 16(a1)      /* quantptr[DCTSIZE*1] */
+    lw            s1, 48(a1)      /* quantptr[DCTSIZE*3] */
+    lw            s3, 96(a1)      /* quantptr[DCTSIZE*6] */
+    muleq_s.w.phl v1, t4, s2      /* tmp2 ... */
+    muleq_s.w.phr t4, t4, s2      /* ... tmp2 ... */
+    lw            s2, 80(a1)      /* quantptr[DCTSIZE*5] */
+    lw            t8, 4(AT)       /* FIX(1.414213562) */
+    ins           t2, v0, 16, 16  /* ... tmp1 */
+    muleq_s.w.phl v0, t6, s3      /* tmp3 ... */
+    muleq_s.w.phr t6, t6, s3      /* ... tmp3 ... */
+    ins           t4, v1, 16, 16  /* ... tmp2 */
+    addq.ph       s4, t0, t4      /* tmp10 */
+    subq.ph       s5, t0, t4      /* tmp11 */
+    ins           t6, v0, 16, 16  /* ... tmp3 */
+    subq.ph       s6, t2, t6      /* tmp12 ... */
+    addq.ph       s7, t2, t6      /* tmp13 */
+    mulq_s.ph     s6, s6, t8      /* ... tmp12 ... */
+    addq.ph       t0, s4, s7      /* tmp0 */
+    subq.ph       t6, s4, s7      /* tmp3 */
+    muleq_s.w.phl v0, t1, s0      /* tmp4 ... */
+    muleq_s.w.phr t1, t1, s0      /* ... tmp4 ... */
+    shll_s.ph     s6, s6, 1       /* x2 */
+    lw            s3, 112(a1)     /* quantptr[DCTSIZE*7] */
+    subq.ph       s6, s6, s7      /* ... tmp12 */
+    muleq_s.w.phl v1, t7, s3      /* tmp7 ... */
+    muleq_s.w.phr t7, t7, s3      /* ... tmp7 ... */
+    ins           t1, v0, 16, 16  /* ... tmp4 */
+    addq.ph       t2, s5, s6      /* tmp1 */
+    subq.ph       t4, s5, s6      /* tmp2 */
+    muleq_s.w.phl v0, t5, s2      /* tmp6 ... */
+    muleq_s.w.phr t5, t5, s2      /* ... tmp6 ... */
+    ins           t7, v1, 16, 16  /* ... tmp7 */
+    addq.ph       s5, t1, t7      /* z11 */
+    subq.ph       s6, t1, t7      /* z12 */
+    muleq_s.w.phl v1, t3, s1      /* tmp5 ... */
+    muleq_s.w.phr t3, t3, s1      /* ... tmp5 ... */
+    ins           t5, v0, 16, 16  /* ... tmp6 */
+    ins           t3, v1, 16, 16  /* ... tmp5 */
+    addq.ph       s7, t5, t3      /* z13 */
+    subq.ph       v0, t5, t3      /* z10 */
+    addq.ph       t7, s5, s7      /* tmp7 */
+    subq.ph       s5, s5, s7      /* tmp11 ... */
+    addq.ph       v1, v0, s6      /* z5 ... */
+    mulq_s.ph     s5, s5, t8      /* ... tmp11 */
+    lw            t8, 8(AT)       /* FIX(1.847759065) */
+    lw            s4, 0(AT)       /* FIX(1.082392200) */
     addq.ph       s0, t0, t7
     subq.ph       s1, t0, t7
-    mulq_s.ph     v1, v1, t8      // ... z5
-    shll_s.ph     s5, s5, 1       // x2
-    lw            t8, 12(AT)      // FIX(-2.613125930)
-    sw            s0, 0(a2)       // wsptr[DCTSIZE*0]
-    shll_s.ph     v0, v0, 1       // x4
-    mulq_s.ph     v0, v0, t8      // tmp12 ...
-    mulq_s.ph     s4, s6, s4      // tmp10 ...
-    shll_s.ph     v1, v1, 1       // x2
+    mulq_s.ph     v1, v1, t8      /* ... z5 */
+    shll_s.ph     s5, s5, 1       /* x2 */
+    lw            t8, 12(AT)      /* FIX(-2.613125930) */
+    sw            s0, 0(a2)       /* wsptr[DCTSIZE*0] */
+    shll_s.ph     v0, v0, 1       /* x4 */
+    mulq_s.ph     v0, v0, t8      /* tmp12 ... */
+    mulq_s.ph     s4, s6, s4      /* tmp10 ... */
+    shll_s.ph     v1, v1, 1       /* x2 */
     addiu         a0, a0, 4
     addiu         a1, a1, 4
-    sw            s1, 112(a2)     // wsptr[DCTSIZE*7]
-    shll_s.ph     s6, v0, 1       // x4
-    shll_s.ph     s4, s4, 1       // x2
-    addq.ph       s6, s6, v1      // ... tmp12
-    subq.ph       t5, s6, t7      // tmp6
-    subq.ph       s4, s4, v1      // ... tmp10
-    subq.ph       t3, s5, t5      // tmp5
+    sw            s1, 112(a2)     /* wsptr[DCTSIZE*7] */
+    shll_s.ph     s6, v0, 1       /* x4 */
+    shll_s.ph     s4, s4, 1       /* x2 */
+    addq.ph       s6, s6, v1      /* ... tmp12 */
+    subq.ph       t5, s6, t7      /* tmp6 */
+    subq.ph       s4, s4, v1      /* ... tmp10 */
+    subq.ph       t3, s5, t5      /* tmp5 */
     addq.ph       s2, t2, t5
-    addq.ph       t1, s4, t3      // tmp4
+    addq.ph       t1, s4, t3      /* tmp4 */
     subq.ph       s3, t2, t5
-    sw            s2, 16(a2)      // wsptr[DCTSIZE*1]
-    sw            s3, 96(a2)      // wsptr[DCTSIZE*6]
+    sw            s2, 16(a2)      /* wsptr[DCTSIZE*1] */
+    sw            s3, 96(a2)      /* wsptr[DCTSIZE*6] */
     addq.ph       v0, t4, t3
     subq.ph       v1, t4, t3
-    sw            v0, 32(a2)      // wsptr[DCTSIZE*2]
-    sw            v1, 80(a2)      // wsptr[DCTSIZE*5]
+    sw            v0, 32(a2)      /* wsptr[DCTSIZE*2] */
+    sw            v1, 80(a2)      /* wsptr[DCTSIZE*5] */
     addq.ph       v0, t6, t1
     subq.ph       v1, t6, t1
-    sw            v0, 64(a2)      // wsptr[DCTSIZE*4]
-    sw            v1, 48(a2)      // wsptr[DCTSIZE*3]
+    sw            v0, 64(a2)      /* wsptr[DCTSIZE*4] */
+    sw            v1, 48(a2)      /* wsptr[DCTSIZE*3] */
 
 2:
     bne           a0, t9, 0b
@@ -2257,22 +2270,22 @@
  */
     SAVE_REGS_ON_STACK 40, s0, s1, s2, s3, s4, s5, s6, s7, s8, a3
 
-    addiu         t9, a0, 128     // end address
+    addiu         t9, a0, 128     /* end address */
     lui           s8, 0x8080
     ori           s8, s8, 0x8080
 
 0:
-    lw            AT, 36(sp)      // restore $a3 (mips_idct_ifast_coefs)
-    lw            t0, 0(a0)       // wsptr[DCTSIZE*0+0/1]  b a
-    lw            s0, 16(a0)      // wsptr[DCTSIZE*1+0/1]  B A
-    lw            t2, 4(a0)       // wsptr[DCTSIZE*0+2/3]  d c
-    lw            s2, 20(a0)      // wsptr[DCTSIZE*1+2/3]  D C
-    lw            t4, 8(a0)       // wsptr[DCTSIZE*0+4/5]  f e
-    lw            s4, 24(a0)      // wsptr[DCTSIZE*1+4/5]  F E
-    lw            t6, 12(a0)      // wsptr[DCTSIZE*0+6/7]  h g
-    lw            s6, 28(a0)      // wsptr[DCTSIZE*1+6/7]  H G
-    precrq.ph.w   t1, s0, t0      // B b
-    ins           t0, s0, 16, 16  // A a
+    lw            AT, 36(sp)      /* restore $a3 (mips_idct_ifast_coefs) */
+    lw            t0, 0(a0)       /* wsptr[DCTSIZE*0+0/1]  b a */
+    lw            s0, 16(a0)      /* wsptr[DCTSIZE*1+0/1]  B A */
+    lw            t2, 4(a0)       /* wsptr[DCTSIZE*0+2/3]  d c */
+    lw            s2, 20(a0)      /* wsptr[DCTSIZE*1+2/3]  D C */
+    lw            t4, 8(a0)       /* wsptr[DCTSIZE*0+4/5]  f e */
+    lw            s4, 24(a0)      /* wsptr[DCTSIZE*1+4/5]  F E */
+    lw            t6, 12(a0)      /* wsptr[DCTSIZE*0+6/7]  h g */
+    lw            s6, 28(a0)      /* wsptr[DCTSIZE*1+6/7]  H G */
+    precrq.ph.w   t1, s0, t0      /* B b */
+    ins           t0, s0, 16, 16  /* A a */
     bnez          t1, 1f
      or           s0, t2, s2
     bnez          s0, 1f
@@ -2280,15 +2293,15 @@
     bnez          s0, 1f
      or           s0, t6, s6
     bnez          s0, 1f
-     shll_s.ph    s0, t0, 2       // A a
+     shll_s.ph    s0, t0, 2       /* A a */
     lw            a3, 0(a1)
     lw            AT, 4(a1)
-    precrq.ph.w   t0, s0, s0      // A A
-    ins           s0, s0, 16, 16  // a a
+    precrq.ph.w   t0, s0, s0      /* A A */
+    ins           s0, s0, 16, 16  /* a a */
     addu          a3, a3, a2
     addu          AT, AT, a2
-    precrq.qb.ph  t0, t0, t0      // A A A A
-    precrq.qb.ph  s0, s0, s0      // a a a a
+    precrq.qb.ph  t0, t0, t0      /* A A A A */
+    precrq.qb.ph  s0, s0, s0      /* a a a a */
     addu.qb       s0, s0, s8
     addu.qb       t0, t0, s8
     sw            s0, 0(a3)
@@ -2308,85 +2321,85 @@
     ins           t4, s4, 16, 16
     precrq.ph.w   t7, s6, t6
     ins           t6, s6, 16, 16
-    lw            t8, 4(AT)       // FIX(1.414213562)
-    addq.ph       s4, t0, t4      // tmp10
-    subq.ph       s5, t0, t4      // tmp11
-    subq.ph       s6, t2, t6      // tmp12 ...
-    addq.ph       s7, t2, t6      // tmp13
-    mulq_s.ph     s6, s6, t8      // ... tmp12 ...
-    addq.ph       t0, s4, s7      // tmp0
-    subq.ph       t6, s4, s7      // tmp3
-    shll_s.ph     s6, s6, 1       // x2
-    subq.ph       s6, s6, s7      // ... tmp12
-    addq.ph       t2, s5, s6      // tmp1
-    subq.ph       t4, s5, s6      // tmp2
-    addq.ph       s5, t1, t7      // z11
-    subq.ph       s6, t1, t7      // z12
-    addq.ph       s7, t5, t3      // z13
-    subq.ph       v0, t5, t3      // z10
-    addq.ph       t7, s5, s7      // tmp7
-    subq.ph       s5, s5, s7      // tmp11 ...
-    addq.ph       v1, v0, s6      // z5 ...
-    mulq_s.ph     s5, s5, t8      // ... tmp11
-    lw            t8, 8(AT)       // FIX(1.847759065)
-    lw            s4, 0(AT)       // FIX(1.082392200)
-    addq.ph       s0, t0, t7      // tmp0 + tmp7
-    subq.ph       s7, t0, t7      // tmp0 - tmp7
-    mulq_s.ph     v1, v1, t8      // ... z5
+    lw            t8, 4(AT)       /* FIX(1.414213562) */
+    addq.ph       s4, t0, t4      /* tmp10 */
+    subq.ph       s5, t0, t4      /* tmp11 */
+    subq.ph       s6, t2, t6      /* tmp12 ... */
+    addq.ph       s7, t2, t6      /* tmp13 */
+    mulq_s.ph     s6, s6, t8      /* ... tmp12 ... */
+    addq.ph       t0, s4, s7      /* tmp0 */
+    subq.ph       t6, s4, s7      /* tmp3 */
+    shll_s.ph     s6, s6, 1       /* x2 */
+    subq.ph       s6, s6, s7      /* ... tmp12 */
+    addq.ph       t2, s5, s6      /* tmp1 */
+    subq.ph       t4, s5, s6      /* tmp2 */
+    addq.ph       s5, t1, t7      /* z11 */
+    subq.ph       s6, t1, t7      /* z12 */
+    addq.ph       s7, t5, t3      /* z13 */
+    subq.ph       v0, t5, t3      /* z10 */
+    addq.ph       t7, s5, s7      /* tmp7 */
+    subq.ph       s5, s5, s7      /* tmp11 ... */
+    addq.ph       v1, v0, s6      /* z5 ... */
+    mulq_s.ph     s5, s5, t8      /* ... tmp11 */
+    lw            t8, 8(AT)       /* FIX(1.847759065) */
+    lw            s4, 0(AT)       /* FIX(1.082392200) */
+    addq.ph       s0, t0, t7      /* tmp0 + tmp7 */
+    subq.ph       s7, t0, t7      /* tmp0 - tmp7 */
+    mulq_s.ph     v1, v1, t8      /* ... z5 */
     lw            a3, 0(a1)
-    lw            t8, 12(AT)      // FIX(-2.613125930)
-    shll_s.ph     s5, s5, 1       // x2
+    lw            t8, 12(AT)      /* FIX(-2.613125930) */
+    shll_s.ph     s5, s5, 1       /* x2 */
     addu          a3, a3, a2
-    shll_s.ph     v0, v0, 1       // x4
-    mulq_s.ph     v0, v0, t8      // tmp12 ...
-    mulq_s.ph     s4, s6, s4      // tmp10 ...
-    shll_s.ph     v1, v1, 1       // x2
+    shll_s.ph     v0, v0, 1       /* x4 */
+    mulq_s.ph     v0, v0, t8      /* tmp12 ... */
+    mulq_s.ph     s4, s6, s4      /* tmp10 ... */
+    shll_s.ph     v1, v1, 1       /* x2 */
     addiu         a0, a0, 32
     addiu         a1, a1, 8
-    shll_s.ph     s6, v0, 1       // x4
-    shll_s.ph     s4, s4, 1       // x2
-    addq.ph       s6, s6, v1      // ... tmp12
+    shll_s.ph     s6, v0, 1       /* x4 */
+    shll_s.ph     s4, s4, 1       /* x2 */
+    addq.ph       s6, s6, v1      /* ... tmp12 */
     shll_s.ph     s0, s0, 2
-    subq.ph       t5, s6, t7      // tmp6
-    subq.ph       s4, s4, v1      // ... tmp10
-    subq.ph       t3, s5, t5      // tmp5
+    subq.ph       t5, s6, t7      /* tmp6 */
+    subq.ph       s4, s4, v1      /* ... tmp10 */
+    subq.ph       t3, s5, t5      /* tmp5 */
     shll_s.ph     s7, s7, 2
-    addq.ph       t1, s4, t3      // tmp4
-    addq.ph       s1, t2, t5      // tmp1 + tmp6
-    subq.ph       s6, t2, t5      // tmp1 - tmp6
-    addq.ph       s2, t4, t3      // tmp2 + tmp5
-    subq.ph       s5, t4, t3      // tmp2 - tmp5
-    addq.ph       s4, t6, t1      // tmp3 + tmp4
-    subq.ph       s3, t6, t1      // tmp3 - tmp4
+    addq.ph       t1, s4, t3      /* tmp4 */
+    addq.ph       s1, t2, t5      /* tmp1 + tmp6 */
+    subq.ph       s6, t2, t5      /* tmp1 - tmp6 */
+    addq.ph       s2, t4, t3      /* tmp2 + tmp5 */
+    subq.ph       s5, t4, t3      /* tmp2 - tmp5 */
+    addq.ph       s4, t6, t1      /* tmp3 + tmp4 */
+    subq.ph       s3, t6, t1      /* tmp3 - tmp4 */
     shll_s.ph     s1, s1, 2
     shll_s.ph     s2, s2, 2
     shll_s.ph     s3, s3, 2
     shll_s.ph     s4, s4, 2
     shll_s.ph     s5, s5, 2
     shll_s.ph     s6, s6, 2
-    precrq.ph.w   t0, s1, s0      // B A
-    ins           s0, s1, 16, 16  // b a
-    precrq.ph.w   t2, s3, s2      // D C
-    ins           s2, s3, 16, 16  // d c
-    precrq.ph.w   t4, s5, s4      // F E
-    ins           s4, s5, 16, 16  // f e
-    precrq.ph.w   t6, s7, s6      // H G
-    ins           s6, s7, 16, 16  // h g
-    precrq.qb.ph  t0, t2, t0      // D C B A
-    precrq.qb.ph  s0, s2, s0      // d c b a
-    precrq.qb.ph  t4, t6, t4      // H G F E
-    precrq.qb.ph  s4, s6, s4      // h g f e
+    precrq.ph.w   t0, s1, s0      /* B A */
+    ins           s0, s1, 16, 16  /* b a */
+    precrq.ph.w   t2, s3, s2      /* D C */
+    ins           s2, s3, 16, 16  /* d c */
+    precrq.ph.w   t4, s5, s4      /* F E */
+    ins           s4, s5, 16, 16  /* f e */
+    precrq.ph.w   t6, s7, s6      /* H G */
+    ins           s6, s7, 16, 16  /* h g */
+    precrq.qb.ph  t0, t2, t0      /* D C B A */
+    precrq.qb.ph  s0, s2, s0      /* d c b a */
+    precrq.qb.ph  t4, t6, t4      /* H G F E */
+    precrq.qb.ph  s4, s6, s4      /* h g f e */
     addu.qb       s0, s0, s8
     addu.qb       s4, s4, s8
-    sw            s0, 0(a3)       // outptr[0/1/2/3]       d c b a
-    sw            s4, 4(a3)       // outptr[4/5/6/7]       h g f e
+    sw            s0, 0(a3)       /* outptr[0/1/2/3]       d c b a */
+    sw            s4, 4(a3)       /* outptr[4/5/6/7]       h g f e */
     lw            a3, -4(a1)
     addu.qb       t0, t0, s8
     addu          a3, a3, a2
     addu.qb       t4, t4, s8
-    sw            t0, 0(a3)       // outptr[0/1/2/3]       D C B A
+    sw            t0, 0(a3)       /* outptr[0/1/2/3]       D C B A */
     bne           a0, t9, 0b
-     sw           t4, 4(a3)       // outptr[4/5/6/7]       H G F E
+     sw           t4, 4(a3)       /* outptr[4/5/6/7]       H G F E */
 
 2:
 
@@ -2428,51 +2441,51 @@
     li          s8, 8
     move        a1, a0
 1:
-    lw          s0, 0(a1)       // tmp0 = 1|0
-    lw          s1, 4(a1)       // tmp1 = 3|2
-    lw          s2, 8(a1)       // tmp2 = 5|4
-    lw          s3, 12(a1)      // tmp3 = 7|6
-    packrl.ph   s1, s1, s1      // tmp1 = 2|3
-    packrl.ph   s3, s3, s3      // tmp3 = 6|7
-    subq.ph     s7, s1, s2      // tmp7 = 2-5|3-4 = t5|t4
-    subq.ph     s5, s0, s3      // tmp5 = 1-6|0-7 = t6|t7
-    mult        $0, $0          // ac0  = 0
-    dpa.w.ph    $ac0, s7, t0    // ac0 += t5*  6437 + t4*  2260
-    dpa.w.ph    $ac0, s5, t1    // ac0 += t6*  9633 + t7* 11363
-    mult        $ac1, $0, $0    // ac1  = 0
-    dpa.w.ph    $ac1, s7, t2    // ac1 += t5*-11362 + t4* -6436
-    dpa.w.ph    $ac1, s5, t3    // ac1 += t6* -2259 + t7*  9633
-    mult        $ac2, $0, $0    // ac2  = 0
-    dpa.w.ph    $ac2, s7, t4    // ac2 += t5*  2261 + t4*  9633
-    dpa.w.ph    $ac2, s5, t5    // ac2 += t6*-11362 + t7*  6437
-    mult        $ac3, $0, $0    // ac3  = 0
-    dpa.w.ph    $ac3, s7, t6    // ac3 += t5*  9633 + t4*-11363
-    dpa.w.ph    $ac3, s5, t7    // ac3 += t6* -6436 + t7*  2260
-    addq.ph     s6, s1, s2      // tmp6 = 2+5|3+4 = t2|t3
-    addq.ph     s4, s0, s3      // tmp4 = 1+6|0+7 = t1|t0
-    extr_r.w    s0, $ac0, 11    // tmp0 = (ac0 + 1024) >> 11
-    extr_r.w    s1, $ac1, 11    // tmp1 = (ac1 + 1024) >> 11
-    extr_r.w    s2, $ac2, 11    // tmp2 = (ac2 + 1024) >> 11
-    extr_r.w    s3, $ac3, 11    // tmp3 = (ac3 + 1024) >> 11
-    addq.ph     s5, s4, s6      // tmp5 = t1+t2|t0+t3 = t11|t10
-    subq.ph     s7, s4, s6      // tmp7 = t1-t2|t0-t3 = t12|t13
+    lw          s0, 0(a1)       /* tmp0 = 1|0 */
+    lw          s1, 4(a1)       /* tmp1 = 3|2 */
+    lw          s2, 8(a1)       /* tmp2 = 5|4 */
+    lw          s3, 12(a1)      /* tmp3 = 7|6 */
+    packrl.ph   s1, s1, s1      /* tmp1 = 2|3 */
+    packrl.ph   s3, s3, s3      /* tmp3 = 6|7 */
+    subq.ph     s7, s1, s2      /* tmp7 = 2-5|3-4 = t5|t4 */
+    subq.ph     s5, s0, s3      /* tmp5 = 1-6|0-7 = t6|t7 */
+    mult        $0, $0          /* ac0  = 0 */
+    dpa.w.ph    $ac0, s7, t0    /* ac0 += t5*  6437 + t4*  2260 */
+    dpa.w.ph    $ac0, s5, t1    /* ac0 += t6*  9633 + t7* 11363 */
+    mult        $ac1, $0, $0    /* ac1  = 0 */
+    dpa.w.ph    $ac1, s7, t2    /* ac1 += t5*-11362 + t4* -6436 */
+    dpa.w.ph    $ac1, s5, t3    /* ac1 += t6* -2259 + t7*  9633 */
+    mult        $ac2, $0, $0    /* ac2  = 0 */
+    dpa.w.ph    $ac2, s7, t4    /* ac2 += t5*  2261 + t4*  9633 */
+    dpa.w.ph    $ac2, s5, t5    /* ac2 += t6*-11362 + t7*  6437 */
+    mult        $ac3, $0, $0    /* ac3  = 0 */
+    dpa.w.ph    $ac3, s7, t6    /* ac3 += t5*  9633 + t4*-11363 */
+    dpa.w.ph    $ac3, s5, t7    /* ac3 += t6* -6436 + t7*  2260 */
+    addq.ph     s6, s1, s2      /* tmp6 = 2+5|3+4 = t2|t3 */
+    addq.ph     s4, s0, s3      /* tmp4 = 1+6|0+7 = t1|t0 */
+    extr_r.w    s0, $ac0, 11    /* tmp0 = (ac0 + 1024) >> 11 */
+    extr_r.w    s1, $ac1, 11    /* tmp1 = (ac1 + 1024) >> 11 */
+    extr_r.w    s2, $ac2, 11    /* tmp2 = (ac2 + 1024) >> 11 */
+    extr_r.w    s3, $ac3, 11    /* tmp3 = (ac3 + 1024) >> 11 */
+    addq.ph     s5, s4, s6      /* tmp5 = t1+t2|t0+t3 = t11|t10 */
+    subq.ph     s7, s4, s6      /* tmp7 = t1-t2|t0-t3 = t12|t13 */
     sh          s0, 2(a1)
     sh          s1, 6(a1)
     sh          s2, 10(a1)
     sh          s3, 14(a1)
-    mult        $0, $0          // ac0  = 0
-    dpa.w.ph    $ac0, s7, t8    // ac0 += t12*  4433 + t13* 10703
-    mult        $ac1, $0, $0    // ac1  = 0
-    dpa.w.ph    $ac1, s7, t9    // ac1 += t12*-10704 + t13*  4433
-    sra         s4, s5, 16      // tmp4 = t11
+    mult        $0, $0          /* ac0  = 0 */
+    dpa.w.ph    $ac0, s7, t8    /* ac0 += t12*  4433 + t13* 10703 */
+    mult        $ac1, $0, $0    /* ac1  = 0 */
+    dpa.w.ph    $ac1, s7, t9    /* ac1 += t12*-10704 + t13*  4433 */
+    sra         s4, s5, 16      /* tmp4 = t11 */
     addiu       a1, a1, 16
     addiu       s8, s8, -1
-    extr_r.w    s0, $ac0, 11    // tmp0 = (ac0 + 1024) >> 11
-    extr_r.w    s1, $ac1, 11    // tmp1 = (ac1 + 1024) >> 11
-    addu        s2, s5, s4      // tmp2 = t10 + t11
-    subu        s3, s5, s4      // tmp3 = t10 - t11
-    sll         s2, s2, 2       // tmp2 = (t10 + t11) << 2
-    sll         s3, s3, 2       // tmp3 = (t10 - t11) << 2
+    extr_r.w    s0, $ac0, 11    /* tmp0 = (ac0 + 1024) >> 11 */
+    extr_r.w    s1, $ac1, 11    /* tmp1 = (ac1 + 1024) >> 11 */
+    addu        s2, s5, s4      /* tmp2 = t10 + t11 */
+    subu        s3, s5, s4      /* tmp3 = t10 - t11 */
+    sll         s2, s2, 2       /* tmp2 = (t10 + t11) << 2 */
+    sll         s3, s3, 2       /* tmp3 = (t10 - t11) << 2 */
     sh          s2, -16(a1)
     sh          s3, -8(a1)
     sh          s0, -12(a1)
@@ -2492,62 +2505,62 @@
     li          s8, 8
 
 2:
-    lh          a2, 0(a0)       // 0
-    lh          a3, 16(a0)      // 8
-    lh          v0, 32(a0)      // 16
-    lh          v1, 48(a0)      // 24
-    lh          s4, 64(a0)      // 32
-    lh          s5, 80(a0)      // 40
-    lh          s6, 96(a0)      // 48
-    lh          s7, 112(a0)     // 56
-    addu        s2, v0, s5      // tmp2 = 16 + 40
-    subu        s5, v0, s5      // tmp5 = 16 - 40
-    addu        s3, v1, s4      // tmp3 = 24 + 32
-    subu        s4, v1, s4      // tmp4 = 24 - 32
-    addu        s0, a2, s7      // tmp0 =  0 + 56
-    subu        s7, a2, s7      // tmp7 =  0 - 56
-    addu        s1, a3, s6      // tmp1 =  8 + 48
-    subu        s6, a3, s6      // tmp6 =  8 - 48
-    addu        a2, s0, s3      // tmp10 = tmp0 + tmp3
-    subu        v1, s0, s3      // tmp13 = tmp0 - tmp3
-    addu        a3, s1, s2      // tmp11 = tmp1 + tmp2
-    subu        v0, s1, s2      // tmp12 = tmp1 - tmp2
-    mult        s7, t1          // ac0  = tmp7 * c1
-    madd        s4, t0          // ac0 += tmp4 * c0
-    madd        s5, t4          // ac0 += tmp5 * c4
-    madd        s6, t2          // ac0 += tmp6 * c2
-    mult        $ac1, s7, t2    // ac1  = tmp7 * c2
-    msub        $ac1, s4, t3    // ac1 -= tmp4 * c3
-    msub        $ac1, s5, t6    // ac1 -= tmp5 * c6
-    msub        $ac1, s6, t7    // ac1 -= tmp6 * c7
-    mult        $ac2, s7, t4    // ac2  = tmp7 * c4
-    madd        $ac2, s4, t2    // ac2 += tmp4 * c2
-    madd        $ac2, s5, t5    // ac2 += tmp5 * c5
-    msub        $ac2, s6, t6    // ac2 -= tmp6 * c6
-    mult        $ac3, s7, t0    // ac3  = tmp7 * c0
-    msub        $ac3, s4, t1    // ac3 -= tmp4 * c1
-    madd        $ac3, s5, t2    // ac3 += tmp5 * c2
-    msub        $ac3, s6, t3    // ac3 -= tmp6 * c3
-    extr_r.w    s0, $ac0, 15    // tmp0 = (ac0 + 16384) >> 15
-    extr_r.w    s1, $ac1, 15    // tmp1 = (ac1 + 16384) >> 15
-    extr_r.w    s2, $ac2, 15    // tmp2 = (ac2 + 16384) >> 15
-    extr_r.w    s3, $ac3, 15    // tmp3 = (ac3 + 16384) >> 15
+    lh          a2, 0(a0)       /* 0 */
+    lh          a3, 16(a0)      /* 8 */
+    lh          v0, 32(a0)      /* 16 */
+    lh          v1, 48(a0)      /* 24 */
+    lh          s4, 64(a0)      /* 32 */
+    lh          s5, 80(a0)      /* 40 */
+    lh          s6, 96(a0)      /* 48 */
+    lh          s7, 112(a0)     /* 56 */
+    addu        s2, v0, s5      /* tmp2 = 16 + 40 */
+    subu        s5, v0, s5      /* tmp5 = 16 - 40 */
+    addu        s3, v1, s4      /* tmp3 = 24 + 32 */
+    subu        s4, v1, s4      /* tmp4 = 24 - 32 */
+    addu        s0, a2, s7      /* tmp0 =  0 + 56 */
+    subu        s7, a2, s7      /* tmp7 =  0 - 56 */
+    addu        s1, a3, s6      /* tmp1 =  8 + 48 */
+    subu        s6, a3, s6      /* tmp6 =  8 - 48 */
+    addu        a2, s0, s3      /* tmp10 = tmp0 + tmp3 */
+    subu        v1, s0, s3      /* tmp13 = tmp0 - tmp3 */
+    addu        a3, s1, s2      /* tmp11 = tmp1 + tmp2 */
+    subu        v0, s1, s2      /* tmp12 = tmp1 - tmp2 */
+    mult        s7, t1          /* ac0  = tmp7 * c1 */
+    madd        s4, t0          /* ac0 += tmp4 * c0 */
+    madd        s5, t4          /* ac0 += tmp5 * c4 */
+    madd        s6, t2          /* ac0 += tmp6 * c2 */
+    mult        $ac1, s7, t2    /* ac1  = tmp7 * c2 */
+    msub        $ac1, s4, t3    /* ac1 -= tmp4 * c3 */
+    msub        $ac1, s5, t6    /* ac1 -= tmp5 * c6 */
+    msub        $ac1, s6, t7    /* ac1 -= tmp6 * c7 */
+    mult        $ac2, s7, t4    /* ac2  = tmp7 * c4 */
+    madd        $ac2, s4, t2    /* ac2 += tmp4 * c2 */
+    madd        $ac2, s5, t5    /* ac2 += tmp5 * c5 */
+    msub        $ac2, s6, t6    /* ac2 -= tmp6 * c6 */
+    mult        $ac3, s7, t0    /* ac3  = tmp7 * c0 */
+    msub        $ac3, s4, t1    /* ac3 -= tmp4 * c1 */
+    madd        $ac3, s5, t2    /* ac3 += tmp5 * c2 */
+    msub        $ac3, s6, t3    /* ac3 -= tmp6 * c3 */
+    extr_r.w    s0, $ac0, 15    /* tmp0 = (ac0 + 16384) >> 15 */
+    extr_r.w    s1, $ac1, 15    /* tmp1 = (ac1 + 16384) >> 15 */
+    extr_r.w    s2, $ac2, 15    /* tmp2 = (ac2 + 16384) >> 15 */
+    extr_r.w    s3, $ac3, 15    /* tmp3 = (ac3 + 16384) >> 15 */
     addiu       s8, s8, -1
-    addu        s4, a2, a3      // tmp4 = tmp10 + tmp11
-    subu        s5, a2, a3      // tmp5 = tmp10 - tmp11
+    addu        s4, a2, a3      /* tmp4 = tmp10 + tmp11 */
+    subu        s5, a2, a3      /* tmp5 = tmp10 - tmp11 */
     sh          s0, 16(a0)
     sh          s1, 48(a0)
     sh          s2, 80(a0)
     sh          s3, 112(a0)
-    mult        v0, t8          // ac0  = tmp12 * c8
-    madd        v1, t9          // ac0 += tmp13 * c9
-    mult        $ac1, v1, t8    // ac1  = tmp13 * c8
-    msub        $ac1, v0, a1    // ac1 -= tmp12 * c10
+    mult        v0, t8          /* ac0  = tmp12 * c8 */
+    madd        v1, t9          /* ac0 += tmp13 * c9 */
+    mult        $ac1, v1, t8    /* ac1  = tmp13 * c8 */
+    msub        $ac1, v0, a1    /* ac1 -= tmp12 * c10 */
     addiu       a0, a0, 2
-    extr_r.w    s6, $ac0, 15    // tmp6 = (ac0 + 16384) >> 15
-    extr_r.w    s7, $ac1, 15    // tmp7 = (ac1 + 16384) >> 15
-    shra_r.w    s4, s4, 2       // tmp4 = (tmp4 + 2) >> 2
-    shra_r.w    s5, s5, 2       // tmp5 = (tmp5 + 2) >> 2
+    extr_r.w    s6, $ac0, 15    /* tmp6 = (ac0 + 16384) >> 15 */
+    extr_r.w    s7, $ac1, 15    /* tmp7 = (ac1 + 16384) >> 15 */
+    shra_r.w    s4, s4, 2       /* tmp4 = (tmp4 + 2) >> 2 */
+    shra_r.w    s5, s5, 2       /* tmp5 = (tmp5 + 2) >> 2 */
     sh          s4, -2(a0)
     sh          s5, 62(a0)
     sh          s6, 30(a0)
@@ -2571,55 +2584,59 @@
 
     SAVE_REGS_ON_STACK 8, s0, s1
 
-    li          a1, 0x014e014e  // FIX_1_306562965 (334 << 16)|(334 & 0xffff)
-    li          a2, 0x008b008b  // FIX_0_541196100 (139 << 16)|(139 & 0xffff)
-    li          a3, 0x00620062  // FIX_0_382683433 (98 << 16) |(98 & 0xffff)
-    li          s1, 0x00b500b5  // FIX_0_707106781 (181 << 16)|(181 & 0xffff)
+    li          a1, 0x014e014e  /* FIX_1_306562965 (334 << 16) |
+                                                   (334 & 0xffff) */
+    li          a2, 0x008b008b  /* FIX_0_541196100 (139 << 16) |
+                                                   (139 & 0xffff) */
+    li          a3, 0x00620062  /* FIX_0_382683433 (98 << 16) |
+                                                   (98 & 0xffff) */
+    li          s1, 0x00b500b5  /* FIX_0_707106781 (181 << 16) |
+                                                   (181 & 0xffff) */
 
     move        v0, a0
-    addiu       v1, v0, 128     // end address
+    addiu       v1, v0, 128     /* end address */
 
 0:
-    lw          t0, 0(v0)       // tmp0 = 1|0
-    lw          t1, 4(v0)       // tmp1 = 3|2
-    lw          t2, 8(v0)       // tmp2 = 5|4
-    lw          t3, 12(v0)      // tmp3 = 7|6
-    packrl.ph   t1, t1, t1      // tmp1 = 2|3
-    packrl.ph   t3, t3, t3      // tmp3 = 6|7
-    subq.ph     t7, t1, t2      // tmp7 = 2-5|3-4 = t5|t4
-    subq.ph     t5, t0, t3      // tmp5 = 1-6|0-7 = t6|t7
-    addq.ph     t6, t1, t2      // tmp6 = 2+5|3+4 = t2|t3
-    addq.ph     t4, t0, t3      // tmp4 = 1+6|0+7 = t1|t0
-    addq.ph     t8, t4, t6      // tmp5 = t1+t2|t0+t3 = t11|t10
-    subq.ph     t9, t4, t6      // tmp7 = t1-t2|t0-t3 = t12|t13
-    sra         t4, t8, 16      // tmp4 = t11
-    mult        $0, $0          // ac0  = 0
+    lw          t0, 0(v0)       /* tmp0 = 1|0 */
+    lw          t1, 4(v0)       /* tmp1 = 3|2 */
+    lw          t2, 8(v0)       /* tmp2 = 5|4 */
+    lw          t3, 12(v0)      /* tmp3 = 7|6 */
+    packrl.ph   t1, t1, t1      /* tmp1 = 2|3 */
+    packrl.ph   t3, t3, t3      /* tmp3 = 6|7 */
+    subq.ph     t7, t1, t2      /* tmp7 = 2-5|3-4 = t5|t4 */
+    subq.ph     t5, t0, t3      /* tmp5 = 1-6|0-7 = t6|t7 */
+    addq.ph     t6, t1, t2      /* tmp6 = 2+5|3+4 = t2|t3 */
+    addq.ph     t4, t0, t3      /* tmp4 = 1+6|0+7 = t1|t0 */
+    addq.ph     t8, t4, t6      /* tmp5 = t1+t2|t0+t3 = t11|t10 */
+    subq.ph     t9, t4, t6      /* tmp7 = t1-t2|t0-t3 = t12|t13 */
+    sra         t4, t8, 16      /* tmp4 = t11 */
+    mult        $0, $0          /* ac0  = 0 */
     dpa.w.ph    $ac0, t9, s1
-    mult        $ac1, $0, $0    // ac1  = 0
-    dpa.w.ph    $ac1, t7, a3    // ac1 += t4*98 + t5*98
-    dpsx.w.ph   $ac1, t5, a3    // ac1 += t6*98 + t7*98
-    mult        $ac2, $0, $0    // ac2  = 0
-    dpa.w.ph    $ac2, t7, a2    // ac2 += t4*139 + t5*139
-    mult        $ac3, $0, $0    // ac3  = 0
-    dpa.w.ph    $ac3, t5, a1    // ac3 += t6*334 + t7*334
-    precrq.ph.w t0, t5, t7      // t0 = t5|t6
-    addq.ph     t2, t8, t4      // tmp2 = t10 + t11
-    subq.ph     t3, t8, t4      // tmp3 = t10 - t11
+    mult        $ac1, $0, $0    /* ac1  = 0 */
+    dpa.w.ph    $ac1, t7, a3    /* ac1 += t4*98 + t5*98 */
+    dpsx.w.ph   $ac1, t5, a3    /* ac1 += t6*98 + t7*98 */
+    mult        $ac2, $0, $0    /* ac2  = 0 */
+    dpa.w.ph    $ac2, t7, a2    /* ac2 += t4*139 + t5*139 */
+    mult        $ac3, $0, $0    /* ac3  = 0 */
+    dpa.w.ph    $ac3, t5, a1    /* ac3 += t6*334 + t7*334 */
+    precrq.ph.w t0, t5, t7      /* t0 = t5|t6 */
+    addq.ph     t2, t8, t4      /* tmp2 = t10 + t11 */
+    subq.ph     t3, t8, t4      /* tmp3 = t10 - t11 */
     extr.w      t4, $ac0, 8
-    mult        $0, $0          // ac0  = 0
-    dpa.w.ph    $ac0, t0, s1    // ac0 += t5*181 + t6*181
-    extr.w      t0, $ac1, 8     // t0 = z5
-    extr.w      t1, $ac2, 8     // t1 = MULTIPLY(tmp10, 139)
-    extr.w      t7, $ac3, 8     // t2 = MULTIPLY(tmp12, 334)
-    extr.w      t8, $ac0, 8     // t8 = z3 = MULTIPLY(tmp11, 181)
-    add         t6, t1, t0      // t6 = z2
-    add         t7, t7, t0      // t7 = z4
-    subq.ph     t0, t5, t8      // t0 = z13 = tmp7 - z3
-    addq.ph     t8, t5, t8      // t9 = z11 = tmp7 + z3
-    addq.ph     t1, t0, t6      // t1 = z13 + z2
-    subq.ph     t6, t0, t6      // t6 = z13 - z2
-    addq.ph     t0, t8, t7      // t0 = z11 + z4
-    subq.ph     t7, t8, t7      // t7 = z11 - z4
+    mult        $0, $0          /* ac0  = 0 */
+    dpa.w.ph    $ac0, t0, s1    /* ac0 += t5*181 + t6*181 */
+    extr.w      t0, $ac1, 8     /* t0 = z5 */
+    extr.w      t1, $ac2, 8     /* t1 = MULTIPLY(tmp10, 139) */
+    extr.w      t7, $ac3, 8     /* t2 = MULTIPLY(tmp12, 334) */
+    extr.w      t8, $ac0, 8     /* t8 = z3 = MULTIPLY(tmp11, 181) */
+    add         t6, t1, t0      /* t6 = z2 */
+    add         t7, t7, t0      /* t7 = z4 */
+    subq.ph     t0, t5, t8      /* t0 = z13 = tmp7 - z3 */
+    addq.ph     t8, t5, t8      /* t9 = z11 = tmp7 + z3 */
+    addq.ph     t1, t0, t6      /* t1 = z13 + z2 */
+    subq.ph     t6, t0, t6      /* t6 = z13 - z2 */
+    addq.ph     t0, t8, t7      /* t0 = z11 + z4 */
+    subq.ph     t7, t8, t7      /* t7 = z11 - z4 */
     addq.ph     t5, t4, t9
     subq.ph     t4, t9, t4
     sh          t2, 0(v0)
@@ -2637,64 +2654,69 @@
     addiu       v1, v0, 16
 
 1:
-    lh          t0, 0(v0)       // 0
-    lh          t1, 16(v0)      // 8
-    lh          t2, 32(v0)      // 16
-    lh          t3, 48(v0)      // 24
-    lh          t4, 64(v0)      // 32
-    lh          t5, 80(v0)      // 40
-    lh          t6, 96(v0)      // 48
-    lh          t7, 112(v0)     // 56
-    add         t8, t0, t7      // t8 = tmp0
-    sub         t7, t0, t7      // t7 = tmp7
-    add         t0, t1, t6      // t0 = tmp1
-    sub         t1, t1, t6      // t1 = tmp6
-    add         t6, t2, t5      // t6 = tmp2
-    sub         t5, t2, t5      // t5 = tmp5
-    add         t2, t3, t4      // t2 = tmp3
-    sub         t3, t3, t4      // t3 = tmp4
-    add         t4, t8, t2      // t4 = tmp10 = tmp0 + tmp3
-    sub         t8, t8, t2      // t8 = tmp13 = tmp0 - tmp3
-    sub         s0, t0, t6      // s0 = tmp12 = tmp1 - tmp2
-    ins         t8, s0, 16, 16  // t8 = tmp12|tmp13
-    add         t2, t0, t6      // t2 = tmp11 = tmp1 + tmp2
-    mult        $0, $0          // ac0  = 0
-    dpa.w.ph    $ac0, t8, s1    // ac0 += t12*181 + t13*181
-    add         s0, t4, t2      // t8 = tmp10+tmp11
-    sub         t4, t4, t2      // t4 = tmp10-tmp11
+    lh          t0, 0(v0)       /* 0 */
+    lh          t1, 16(v0)      /* 8 */
+    lh          t2, 32(v0)      /* 16 */
+    lh          t3, 48(v0)      /* 24 */
+    lh          t4, 64(v0)      /* 32 */
+    lh          t5, 80(v0)      /* 40 */
+    lh          t6, 96(v0)      /* 48 */
+    lh          t7, 112(v0)     /* 56 */
+    add         t8, t0, t7      /* t8 = tmp0 */
+    sub         t7, t0, t7      /* t7 = tmp7 */
+    add         t0, t1, t6      /* t0 = tmp1 */
+    sub         t1, t1, t6      /* t1 = tmp6 */
+    add         t6, t2, t5      /* t6 = tmp2 */
+    sub         t5, t2, t5      /* t5 = tmp5 */
+    add         t2, t3, t4      /* t2 = tmp3 */
+    sub         t3, t3, t4      /* t3 = tmp4 */
+    add         t4, t8, t2      /* t4 = tmp10 = tmp0 + tmp3 */
+    sub         t8, t8, t2      /* t8 = tmp13 = tmp0 - tmp3 */
+    sub         s0, t0, t6      /* s0 = tmp12 = tmp1 - tmp2 */
+    ins         t8, s0, 16, 16  /* t8 = tmp12|tmp13 */
+    add         t2, t0, t6      /* t2 = tmp11 = tmp1 + tmp2 */
+    mult        $0, $0          /* ac0  = 0 */
+    dpa.w.ph    $ac0, t8, s1    /* ac0 += t12*181 + t13*181 */
+    add         s0, t4, t2      /* t8 = tmp10+tmp11 */
+    sub         t4, t4, t2      /* t4 = tmp10-tmp11 */
     sh          s0, 0(v0)
     sh          t4, 64(v0)
-    extr.w      t2, $ac0, 8     // z1 = MULTIPLY(tmp12+tmp13, FIX_0_707106781)
-    addq.ph     t4, t8, t2      // t9 = tmp13 + z1
-    subq.ph     t8, t8, t2      // t2 = tmp13 - z1
+    extr.w      t2, $ac0, 8     /* z1 = MULTIPLY(tmp12+tmp13,
+                                                 FIX_0_707106781) */
+    addq.ph     t4, t8, t2      /* t9 = tmp13 + z1 */
+    subq.ph     t8, t8, t2      /* t2 = tmp13 - z1 */
     sh          t4, 32(v0)
     sh          t8, 96(v0)
-    add         t3, t3, t5      // t3 = tmp10 = tmp4 + tmp5
-    add         t0, t5, t1      // t0 = tmp11 = tmp5 + tmp6
-    add         t1, t1, t7      // t1 = tmp12 = tmp6 + tmp7
+    add         t3, t3, t5      /* t3 = tmp10 = tmp4 + tmp5 */
+    add         t0, t5, t1      /* t0 = tmp11 = tmp5 + tmp6 */
+    add         t1, t1, t7      /* t1 = tmp12 = tmp6 + tmp7 */
     andi        t4, a1, 0xffff
     mul         s0, t1, t4
-    sra         s0, s0, 8       // s0 = z4 = MULTIPLY(tmp12, FIX_1_306562965)
-    ins         t1, t3, 16, 16  // t1 = tmp10|tmp12
-    mult        $0, $0          // ac0  = 0
-    mulsa.w.ph  $ac0, t1, a3    // ac0 += t10*98 - t12*98
-    extr.w      t8, $ac0, 8     // z5 = MULTIPLY(tmp10-tmp12, FIX_0_382683433)
-    add         t2, t7, t8      // t2 = tmp7 + z5
-    sub         t7, t7, t8      // t7 = tmp7 - z5
+    sra         s0, s0, 8       /* s0 = z4 =
+                                     MULTIPLY(tmp12, FIX_1_306562965) */
+    ins         t1, t3, 16, 16  /* t1 = tmp10|tmp12 */
+    mult        $0, $0          /* ac0  = 0 */
+    mulsa.w.ph  $ac0, t1, a3    /* ac0 += t10*98 - t12*98 */
+    extr.w      t8, $ac0, 8     /* z5 = MULTIPLY(tmp10-tmp12,
+                                                 FIX_0_382683433) */
+    add         t2, t7, t8      /* t2 = tmp7 + z5 */
+    sub         t7, t7, t8      /* t7 = tmp7 - z5 */
     andi        t4, a2, 0xffff
     mul         t8, t3, t4
-    sra         t8, t8, 8       // t8 = z2 = MULTIPLY(tmp10, FIX_0_541196100)
+    sra         t8, t8, 8       /* t8 = z2 =
+                                     MULTIPLY(tmp10, FIX_0_541196100) */
     andi        t4, s1, 0xffff
     mul         t6, t0, t4
-    sra         t6, t6, 8       // t6 = z3 = MULTIPLY(tmp11, FIX_0_707106781)
-    add         t0, t6, t8      // t0 = z3 + z2
-    sub         t1, t6, t8      // t1 = z3 - z2
-    add         t3, t6, s0      // t3 = z3 + z4
-    sub         t4, t6, s0      // t4 = z3 - z4
-    sub         t5, t2, t1      // t5 = dataptr[5]
-    sub         t6, t7, t0      // t6 = dataptr[3]
-    add         t3, t2, t3      // t3 = dataptr[1]
-    add         t4, t7, t4      // t4 = dataptr[7]
+    sra         t6, t6, 8       /* t6 = z3 =
+                                     MULTIPLY(tmp11, FIX_0_707106781) */
+    add         t0, t6, t8      /* t0 = z3 + z2 */
+    sub         t1, t6, t8      /* t1 = z3 - z2 */
+    add         t3, t6, s0      /* t3 = z3 + z4 */
+    sub         t4, t6, s0      /* t4 = z3 - z4 */
+    sub         t5, t2, t1      /* t5 = dataptr[5] */
+    sub         t6, t7, t0      /* t6 = dataptr[3] */
+    add         t3, t2, t3      /* t3 = dataptr[1] */
+    add         t4, t7, t4      /* t4 = dataptr[7] */
     sh          t5, 80(v0)
     sh          t6, 48(v0)
     sh          t3, 16(v0)
@@ -2721,7 +2743,7 @@
 
     SAVE_REGS_ON_STACK 16, s0, s1, s2
 
-    addiu       v0, a2, 124     // v0 = workspace_end
+    addiu       v0, a2, 124     /* v0 = workspace_end */
     lh          t0, 0(a2)
     lh          t1, 0(a1)
     lh          t2, 128(a1)
@@ -2821,7 +2843,7 @@
  */
     .set at
 
-    li          t1, 0x46800100  // integer representation 16384.5
+    li          t1, 0x46800100  /* integer representation 16384.5 */
     mtc1        t1, f0
     li          t0, 63
 0:
@@ -2913,30 +2935,30 @@
     addiu       s3, zero, -10426
     addiu       s4, zero, 6967
     addiu       s5, zero, -5906
-    lh          t0, 0(a1)       // t0 = inptr[DCTSIZE*0]
-    lh          t5, 0(a0)       // t5 = quantptr[DCTSIZE*0]
-    lh          t1, 48(a1)      // t1 = inptr[DCTSIZE*3]
-    lh          t6, 48(a0)      // t6 = quantptr[DCTSIZE*3]
+    lh          t0, 0(a1)       /* t0 = inptr[DCTSIZE*0] */
+    lh          t5, 0(a0)       /* t5 = quantptr[DCTSIZE*0] */
+    lh          t1, 48(a1)      /* t1 = inptr[DCTSIZE*3] */
+    lh          t6, 48(a0)      /* t6 = quantptr[DCTSIZE*3] */
     mul         t4, t5, t0
-    lh          t0, 16(a1)      // t0 = inptr[DCTSIZE*1]
-    lh          t5, 16(a0)      // t5 = quantptr[DCTSIZE*1]
+    lh          t0, 16(a1)      /* t0 = inptr[DCTSIZE*1] */
+    lh          t5, 16(a0)      /* t5 = quantptr[DCTSIZE*1] */
     mul         t6, t6, t1
     mul         t5, t5, t0
-    lh          t2, 80(a1)      // t2 = inptr[DCTSIZE*5]
-    lh          t7, 80(a0)      // t7 = quantptr[DCTSIZE*5]
-    lh          t3, 112(a1)     // t3 = inptr[DCTSIZE*7]
-    lh          t8, 112(a0)     // t8 = quantptr[DCTSIZE*7]
+    lh          t2, 80(a1)      /* t2 = inptr[DCTSIZE*5] */
+    lh          t7, 80(a0)      /* t7 = quantptr[DCTSIZE*5] */
+    lh          t3, 112(a1)     /* t3 = inptr[DCTSIZE*7] */
+    lh          t8, 112(a0)     /* t8 = quantptr[DCTSIZE*7] */
     mul         t7, t7, t2
     mult        zero, zero
     mul         t8, t8, t3
-    li          s0, 0x73FCD746  // s0 = (29692 << 16) | (-10426 & 0xffff)
-    li          s1, 0x1B37E8EE  // s1 = (6967 << 16) | (-5906 & 0xffff)
-    ins         t6, t5, 16, 16  // t6 = t5|t6
+    li          s0, 0x73FCD746  /* s0 = (29692 << 16) | (-10426 & 0xffff) */
+    li          s1, 0x1B37E8EE  /* s1 = (6967 << 16) | (-5906 & 0xffff) */
+    ins         t6, t5, 16, 16  /* t6 = t5|t6 */
     sll         t4, t4, 15
     dpa.w.ph    $ac0, t6, s0
     lh          t1, 2(a1)
     lh          t6, 2(a0)
-    ins         t8, t7, 16, 16  // t8 = t7|t8
+    ins         t8, t7, 16, 16  /* t8 = t7|t8 */
     dpa.w.ph    $ac0, t8, s1
     mflo        t0, $ac0
     mul         t5, t6, t1
@@ -3122,7 +3144,7 @@
  * a1     = coef_block
  * a2     = output_buf
  * a3     = output_col
- * 16(sp) = workspace[DCTSIZE*4];  // buffers data between passes
+ * 16(sp) = workspace[DCTSIZE*4]  (buffers data between passes)
  */
     .set at
 
@@ -3138,35 +3160,44 @@
     li          s3, 0x52031ccd
 
 0:
-    lh          s6, 32(t0)      // inptr[DCTSIZE*2]
-    lh          t6, 32(a0)      // quantptr[DCTSIZE*2]
-    lh          s7, 96(t0)      // inptr[DCTSIZE*6]
-    lh          t7, 96(a0)      // quantptr[DCTSIZE*6]
-    mul         t6, s6, t6      // z2 = (inptr[DCTSIZE*2] * quantptr[DCTSIZE*2])
-    lh          s4, 0(t0)       // inptr[DCTSIZE*0]
-    mul         t7, s7, t7      // z3 = (inptr[DCTSIZE*6] * quantptr[DCTSIZE*6])
-    lh          s5, 0(a0)       // quantptr[0]
+    lh          s6, 32(t0)      /* inptr[DCTSIZE*2] */
+    lh          t6, 32(a0)      /* quantptr[DCTSIZE*2] */
+    lh          s7, 96(t0)      /* inptr[DCTSIZE*6] */
+    lh          t7, 96(a0)      /* quantptr[DCTSIZE*6] */
+    mul         t6, s6, t6      /* z2 = (inptr[DCTSIZE*2] *
+                                         quantptr[DCTSIZE*2]) */
+    lh          s4, 0(t0)       /* inptr[DCTSIZE*0] */
+    mul         t7, s7, t7      /* z3 = (inptr[DCTSIZE*6] *
+                                         quantptr[DCTSIZE*6]) */
+    lh          s5, 0(a0)       /* quantptr[0] */
     li          s6, 15137
     li          s7, 6270
-    mul         t2, s4, s5      // tmp0 = (inptr[0] * quantptr[0])
-    mul         t6, s6, t6      // z2 = (inptr[DCTSIZE*2] * quantptr[DCTSIZE*2])
-    lh          t5, 112(t0)     // inptr[DCTSIZE*7]
-    mul         t7, s7, t7      // z3 = (inptr[DCTSIZE*6] * quantptr[DCTSIZE*6])
-    lh          s4, 112(a0)     // quantptr[DCTSIZE*7]
-    lh          v0, 80(t0)      // inptr[DCTSIZE*5]
-    lh          s5, 80(a0)      // quantptr[DCTSIZE*5]
-    lh          s6, 48(a0)      // quantptr[DCTSIZE*3]
-    sll         t2, t2, 14      // tmp0 <<= (CONST_BITS+1)
-    lh          s7, 16(a0)      // quantptr[DCTSIZE*1]
-    lh          t8, 16(t0)      // inptr[DCTSIZE*1]
-    subu        t6, t6, t7      // tmp2 = MULTIPLY(z2, t5) - MULTIPLY(z3, t6)
-    lh          t7, 48(t0)      // inptr[DCTSIZE*3]
-    mul         t5, s4, t5      // z1 = (inptr[DCTSIZE*7] * quantptr[DCTSIZE*7])
-    mul         v0, s5, v0      // z2 = (inptr[DCTSIZE*5] * quantptr[DCTSIZE*5])
-    mul         t7, s6, t7      // z3 = (inptr[DCTSIZE*3] * quantptr[DCTSIZE*3])
-    mul         t8, s7, t8      // z4 = (inptr[DCTSIZE*1] * quantptr[DCTSIZE*1])
-    addu        t3, t2, t6      // tmp10 = tmp0 + z2
-    subu        t4, t2, t6      // tmp10 = tmp0 - z2
+    mul         t2, s4, s5      /* tmp0 = (inptr[0] * quantptr[0]) */
+    mul         t6, s6, t6      /* z2 = (inptr[DCTSIZE*2] *
+                                         quantptr[DCTSIZE*2]) */
+    lh          t5, 112(t0)     /* inptr[DCTSIZE*7] */
+    mul         t7, s7, t7      /* z3 = (inptr[DCTSIZE*6] *
+                                         quantptr[DCTSIZE*6]) */
+    lh          s4, 112(a0)     /* quantptr[DCTSIZE*7] */
+    lh          v0, 80(t0)      /* inptr[DCTSIZE*5] */
+    lh          s5, 80(a0)      /* quantptr[DCTSIZE*5] */
+    lh          s6, 48(a0)      /* quantptr[DCTSIZE*3] */
+    sll         t2, t2, 14      /* tmp0 <<= (CONST_BITS+1) */
+    lh          s7, 16(a0)      /* quantptr[DCTSIZE*1] */
+    lh          t8, 16(t0)      /* inptr[DCTSIZE*1] */
+    subu        t6, t6, t7      /* tmp2 =
+                                     MULTIPLY(z2, t5) - MULTIPLY(z3, t6) */
+    lh          t7, 48(t0)      /* inptr[DCTSIZE*3] */
+    mul         t5, s4, t5      /* z1 = (inptr[DCTSIZE*7] *
+                                         quantptr[DCTSIZE*7]) */
+    mul         v0, s5, v0      /* z2 = (inptr[DCTSIZE*5] *
+                                         quantptr[DCTSIZE*5]) */
+    mul         t7, s6, t7      /* z3 = (inptr[DCTSIZE*3] *
+                                         quantptr[DCTSIZE*3]) */
+    mul         t8, s7, t8      /* z4 = (inptr[DCTSIZE*1] *
+                                         quantptr[DCTSIZE*1]) */
+    addu        t3, t2, t6      /* tmp10 = tmp0 + z2 */
+    subu        t4, t2, t6      /* tmp10 = tmp0 - z2 */
     mult        $ac0, zero, zero
     mult        $ac1, zero, zero
     ins         t5, v0, 16, 16
@@ -3185,47 +3216,56 @@
     subu        t5, t4, s4
     addu        s6, t3, s5
     subu        s7, t3, s5
-    shra_r.w    t6, t6, 12      // DESCALE(tmp12 + temp1, 12)
-    shra_r.w    t5, t5, 12      // DESCALE(tmp12 - temp1, 12)
-    shra_r.w    s6, s6, 12      // DESCALE(tmp10 + temp2, 12)
-    shra_r.w    s7, s7, 12      // DESCALE(tmp10 - temp2, 12)
+    shra_r.w    t6, t6, 12      /* DESCALE(tmp12 + temp1, 12) */
+    shra_r.w    t5, t5, 12      /* DESCALE(tmp12 - temp1, 12) */
+    shra_r.w    s6, s6, 12      /* DESCALE(tmp10 + temp2, 12) */
+    shra_r.w    s7, s7, 12      /* DESCALE(tmp10 - temp2, 12) */
     sw          t6, 28(t1)
     sw          t5, 60(t1)
     sw          s6, -4(t1)
     bgtz        t9, 0b
      sw         s7, 92(t1)
-    // second loop three pass
+    /* second loop three pass */
     li          t9, 3
 1:
-    lh          s6, 34(t0)      // inptr[DCTSIZE*2]
-    lh          t6, 34(a0)      // quantptr[DCTSIZE*2]
-    lh          s7, 98(t0)      // inptr[DCTSIZE*6]
-    lh          t7, 98(a0)      // quantptr[DCTSIZE*6]
-    mul         t6, s6, t6      // z2 = (inptr[DCTSIZE*2] * quantptr[DCTSIZE*2])
-    lh          s4, 2(t0)       // inptr[DCTSIZE*0]
-    mul         t7, s7, t7      // z3 = (inptr[DCTSIZE*6] * quantptr[DCTSIZE*6])
-    lh          s5, 2(a0)       // quantptr[DCTSIZE*0]
+    lh          s6, 34(t0)      /* inptr[DCTSIZE*2] */
+    lh          t6, 34(a0)      /* quantptr[DCTSIZE*2] */
+    lh          s7, 98(t0)      /* inptr[DCTSIZE*6] */
+    lh          t7, 98(a0)      /* quantptr[DCTSIZE*6] */
+    mul         t6, s6, t6      /* z2 = (inptr[DCTSIZE*2] *
+                                         quantptr[DCTSIZE*2]) */
+    lh          s4, 2(t0)       /* inptr[DCTSIZE*0] */
+    mul         t7, s7, t7      /* z3 = (inptr[DCTSIZE*6] *
+                                         quantptr[DCTSIZE*6]) */
+    lh          s5, 2(a0)       /* quantptr[DCTSIZE*0] */
     li          s6, 15137
     li          s7, 6270
-    mul         t2, s4, s5      // tmp0 = (inptr[0] * quantptr[0])
-    mul         v0, s6, t6      // z2 = (inptr[DCTSIZE*2] * quantptr[DCTSIZE*2])
-    lh          t5, 114(t0)     // inptr[DCTSIZE*7]
-    mul         t7, s7, t7      // z3 = (inptr[DCTSIZE*6] * quantptr[DCTSIZE*6])
-    lh          s4, 114(a0)     // quantptr[DCTSIZE*7]
-    lh          s5, 82(a0)      // quantptr[DCTSIZE*5]
-    lh          t6, 82(t0)      // inptr[DCTSIZE*5]
-    sll         t2, t2, 14      // tmp0 <<= (CONST_BITS+1)
-    lh          s6, 50(a0)      // quantptr[DCTSIZE*3]
-    lh          t8, 18(t0)      // inptr[DCTSIZE*1]
-    subu        v0, v0, t7      // tmp2 = MULTIPLY(z2, t5) - MULTIPLY(z3, t6)
-    lh          t7, 50(t0)      // inptr[DCTSIZE*3]
-    lh          s7, 18(a0)      // quantptr[DCTSIZE*1]
-    mul         t5, s4, t5      // z1 = (inptr[DCTSIZE*7] * quantptr[DCTSIZE*7])
-    mul         t6, s5, t6      // z2 = (inptr[DCTSIZE*5] * quantptr[DCTSIZE*5])
-    mul         t7, s6, t7      // z3 = (inptr[DCTSIZE*3] * quantptr[DCTSIZE*3])
-    mul         t8, s7, t8      // z4 = (inptr[DCTSIZE*1] * quantptr[DCTSIZE*1])
-    addu        t3, t2, v0      // tmp10 = tmp0 + z2
-    subu        t4, t2, v0      // tmp10 = tmp0 - z2
+    mul         t2, s4, s5      /* tmp0 = (inptr[0] * quantptr[0]) */
+    mul         v0, s6, t6      /* z2 = (inptr[DCTSIZE*2] *
+                                         quantptr[DCTSIZE*2]) */
+    lh          t5, 114(t0)     /* inptr[DCTSIZE*7] */
+    mul         t7, s7, t7      /* z3 = (inptr[DCTSIZE*6] *
+                                         quantptr[DCTSIZE*6]) */
+    lh          s4, 114(a0)     /* quantptr[DCTSIZE*7] */
+    lh          s5, 82(a0)      /* quantptr[DCTSIZE*5] */
+    lh          t6, 82(t0)      /* inptr[DCTSIZE*5] */
+    sll         t2, t2, 14      /* tmp0 <<= (CONST_BITS+1) */
+    lh          s6, 50(a0)      /* quantptr[DCTSIZE*3] */
+    lh          t8, 18(t0)      /* inptr[DCTSIZE*1] */
+    subu        v0, v0, t7      /* tmp2 =
+                                     MULTIPLY(z2, t5) - MULTIPLY(z3, t6) */
+    lh          t7, 50(t0)      /* inptr[DCTSIZE*3] */
+    lh          s7, 18(a0)      /* quantptr[DCTSIZE*1] */
+    mul         t5, s4, t5      /* z1 = (inptr[DCTSIZE*7] *
+                                         quantptr[DCTSIZE*7]) */
+    mul         t6, s5, t6      /* z2 = (inptr[DCTSIZE*5] *
+                                         quantptr[DCTSIZE*5]) */
+    mul         t7, s6, t7      /* z3 = (inptr[DCTSIZE*3] *
+                                         quantptr[DCTSIZE*3]) */
+    mul         t8, s7, t8      /* z4 = (inptr[DCTSIZE*1] *
+                                         quantptr[DCTSIZE*1]) */
+    addu        t3, t2, v0      /* tmp10 = tmp0 + z2 */
+    subu        t4, t2, v0      /* tmp10 = tmp0 - z2 */
     mult        $ac0, zero, zero
     mult        $ac1, zero, zero
     ins         t5, t6, 16, 16
@@ -3244,10 +3284,10 @@
     subu        s4, t4, t5
     addu        s6, t3, t6
     subu        s7, t3, t6
-    shra_r.w    s5, s5, 12      // DESCALE(tmp12 + temp1, 12)
-    shra_r.w    s4, s4, 12      // DESCALE(tmp12 - temp1, 12)
-    shra_r.w    s6, s6, 12      // DESCALE(tmp10 + temp2, 12)
-    shra_r.w    s7, s7, 12      // DESCALE(tmp10 - temp2, 12)
+    shra_r.w    s5, s5, 12      /* DESCALE(tmp12 + temp1, 12) */
+    shra_r.w    s4, s4, 12      /* DESCALE(tmp12 - temp1, 12) */
+    shra_r.w    s6, s6, 12      /* DESCALE(tmp10 + temp2, 12) */
+    shra_r.w    s7, s7, 12      /* DESCALE(tmp10 - temp2, 12) */
     sw          s5, 32(t1)
     sw          s4, 64(t1)
     sw          s6, 0(t1)
@@ -3255,16 +3295,18 @@
      sw         s7, 96(t1)
     move        t1, v1
     li          s4, 15137
-    lw          s6, 8(t1)       // wsptr[2]
+    lw          s6, 8(t1)       /* wsptr[2] */
     li          s5, 6270
-    lw          s7, 24(t1)      // wsptr[6]
-    mul         s4, s4, s6      // MULTIPLY((JLONG)wsptr[2], FIX_1_847759065)
-    lw          t2, 0(t1)       // wsptr[0]
-    mul         s5, s5, s7      // MULTIPLY((JLONG)wsptr[6], -FIX_0_765366865)
-    lh          t5, 28(t1)      // wsptr[7]
-    lh          t6, 20(t1)      // wsptr[5]
-    lh          t7, 12(t1)      // wsptr[3]
-    lh          t8, 4(t1)       // wsptr[1]
+    lw          s7, 24(t1)      /* wsptr[6] */
+    mul         s4, s4, s6      /* MULTIPLY((JLONG)wsptr[2],
+                                            FIX_1_847759065) */
+    lw          t2, 0(t1)       /* wsptr[0] */
+    mul         s5, s5, s7      /* MULTIPLY((JLONG)wsptr[6],
+                                            -FIX_0_765366865) */
+    lh          t5, 28(t1)      /* wsptr[7] */
+    lh          t6, 20(t1)      /* wsptr[5] */
+    lh          t7, 12(t1)      /* wsptr[3] */
+    lh          t8, 4(t1)       /* wsptr[1] */
     ins         t5, t6, 16, 16
     ins         t7, t8, 16, 16
     mult        $ac0, zero, zero
@@ -3273,23 +3315,25 @@
     mult        $ac1, zero, zero
     dpa.w.ph    $ac1, t5, s2
     dpa.w.ph    $ac1, t7, s3
-    sll         t2, t2, 14      // tmp0 = ((JLONG)wsptr[0]) << (CONST_BITS+1)
+    sll         t2, t2, 14      /* tmp0 =
+                                     ((JLONG)wsptr[0]) << (CONST_BITS+1) */
     mflo        s6, $ac0
-    // MULTIPLY(wsptr[2], FIX_1_847759065 + MULTIPLY(wsptr[6], -FIX_0_765366865)
+    /* MULTIPLY(wsptr[2], FIX_1_847759065) +
+       MULTIPLY(wsptr[6], -FIX_0_765366865) */
     subu        s4, s4, s5
-    addu        t3, t2, s4      // tmp10 = tmp0 + z2
+    addu        t3, t2, s4      /* tmp10 = tmp0 + z2 */
     mflo        s7, $ac1
-    subu        t4, t2, s4      // tmp10 = tmp0 - z2
+    subu        t4, t2, s4      /* tmp10 = tmp0 - z2 */
     addu        t7, t4, s6
     subu        t8, t4, s6
     addu        t5, t3, s7
     subu        t6, t3, s7
-    shra_r.w    t5, t5, 19      // DESCALE(tmp10 + temp2, 19)
-    shra_r.w    t6, t6, 19      // DESCALE(tmp10 - temp2, 19)
-    shra_r.w    t7, t7, 19      // DESCALE(tmp12 + temp1, 19)
-    shra_r.w    t8, t8, 19      // DESCALE(tmp12 - temp1, 19)
+    shra_r.w    t5, t5, 19      /* DESCALE(tmp10 + temp2, 19) */
+    shra_r.w    t6, t6, 19      /* DESCALE(tmp10 - temp2, 19) */
+    shra_r.w    t7, t7, 19      /* DESCALE(tmp12 + temp1, 19) */
+    shra_r.w    t8, t8, 19      /* DESCALE(tmp12 - temp1, 19) */
     sll         s4, t9, 2
-    lw          v0, 0(a2)       // output_buf[ctr]
+    lw          v0, 0(a2)       /* output_buf[ctr] */
     shll_s.w    t5, t5, 24
     shll_s.w    t6, t6, 24
     shll_s.w    t7, t7, 24
@@ -3298,7 +3342,7 @@
     sra         t6, t6, 24
     sra         t7, t7, 24
     sra         t8, t8, 24
-    addu        v0, v0, a3      // outptr = output_buf[ctr] + output_col
+    addu        v0, v0, a3      /* outptr = output_buf[ctr] + output_col */
     addiu       t5, t5, 128
     addiu       t6, t6, 128
     addiu       t7, t7, 128
@@ -3307,18 +3351,20 @@
     sb          t7, 1(v0)
     sb          t8, 2(v0)
     sb          t6, 3(v0)
-    // 2
+    /* 2 */
     li          s4, 15137
-    lw          s6, 40(t1)      // wsptr[2]
+    lw          s6, 40(t1)      /* wsptr[2] */
     li          s5, 6270
-    lw          s7, 56(t1)      // wsptr[6]
-    mul         s4, s4, s6      // MULTIPLY((JLONG)wsptr[2], FIX_1_847759065)
-    lw          t2, 32(t1)      // wsptr[0]
-    mul         s5, s5, s7      // MULTIPLY((JLONG)wsptr[6], -FIX_0_765366865)
-    lh          t5, 60(t1)      // wsptr[7]
-    lh          t6, 52(t1)      // wsptr[5]
-    lh          t7, 44(t1)      // wsptr[3]
-    lh          t8, 36(t1)      // wsptr[1]
+    lw          s7, 56(t1)      /* wsptr[6] */
+    mul         s4, s4, s6      /* MULTIPLY((JLONG)wsptr[2],
+                                            FIX_1_847759065) */
+    lw          t2, 32(t1)      /* wsptr[0] */
+    mul         s5, s5, s7      /* MULTIPLY((JLONG)wsptr[6],
+                                            -FIX_0_765366865) */
+    lh          t5, 60(t1)      /* wsptr[7] */
+    lh          t6, 52(t1)      /* wsptr[5] */
+    lh          t7, 44(t1)      /* wsptr[3] */
+    lh          t8, 36(t1)      /* wsptr[1] */
     ins         t5, t6, 16, 16
     ins         t7, t8, 16, 16
     mult        $ac0, zero, zero
@@ -3327,23 +3373,29 @@
     mult        $ac1, zero, zero
     dpa.w.ph    $ac1, t5, s2
     dpa.w.ph    $ac1, t7, s3
-    sll         t2, t2, 14      // tmp0 = ((JLONG)wsptr[0]) << (CONST_BITS+1)
+    sll         t2, t2, 14      /* tmp0 =
+                                     ((JLONG)wsptr[0]) << (CONST_BITS+1) */
     mflo        s6, $ac0
-    // MULTIPLY(wsptr[2], FIX_1_847759065 + MULTIPLY(wsptr[6], -FIX_0_765366865)
+    /* MULTIPLY(wsptr[2], FIX_1_847759065) +
+       MULTIPLY(wsptr[6], -FIX_0_765366865) */
     subu        s4, s4, s5
-    addu        t3, t2, s4      // tmp10 = tmp0 + z2
+    addu        t3, t2, s4      /* tmp10 = tmp0 + z2 */
     mflo        s7, $ac1
-    subu        t4, t2, s4      // tmp10 = tmp0 - z2
+    subu        t4, t2, s4      /* tmp10 = tmp0 - z2 */
     addu        t7, t4, s6
     subu        t8, t4, s6
     addu        t5, t3, s7
     subu        t6, t3, s7
-    shra_r.w    t5, t5, 19      // DESCALE(tmp10 + temp2, CONST_BITS-PASS1_BITS+1)
-    shra_r.w    t6, t6, 19      // DESCALE(tmp10 - temp2, CONST_BITS-PASS1_BITS+1)
-    shra_r.w    t7, t7, 19      // DESCALE(tmp12 + temp1, CONST_BITS-PASS1_BITS+1)
-    shra_r.w    t8, t8, 19      // DESCALE(tmp12 - temp1, CONST_BITS-PASS1_BITS+1)
+    shra_r.w    t5, t5, 19      /* DESCALE(tmp10 + temp2,
+                                           CONST_BITS-PASS1_BITS+1) */
+    shra_r.w    t6, t6, 19      /* DESCALE(tmp10 - temp2,
+                                           CONST_BITS-PASS1_BITS+1) */
+    shra_r.w    t7, t7, 19      /* DESCALE(tmp12 + temp1,
+                                           CONST_BITS-PASS1_BITS+1) */
+    shra_r.w    t8, t8, 19      /* DESCALE(tmp12 - temp1,
+                                           CONST_BITS-PASS1_BITS+1) */
     sll         s4, t9, 2
-    lw          v0, 4(a2)       // output_buf[ctr]
+    lw          v0, 4(a2)       /* output_buf[ctr] */
     shll_s.w    t5, t5, 24
     shll_s.w    t6, t6, 24
     shll_s.w    t7, t7, 24
@@ -3352,7 +3404,7 @@
     sra         t6, t6, 24
     sra         t7, t7, 24
     sra         t8, t8, 24
-    addu        v0, v0, a3      // outptr = output_buf[ctr] + output_col
+    addu        v0, v0, a3      /* outptr = output_buf[ctr] + output_col */
     addiu       t5, t5, 128
     addiu       t6, t6, 128
     addiu       t7, t7, 128
@@ -3361,18 +3413,20 @@
     sb          t7, 1(v0)
     sb          t8, 2(v0)
     sb          t6, 3(v0)
-    // 3
+    /* 3 */
     li          s4, 15137
-    lw          s6, 72(t1)      // wsptr[2]
+    lw          s6, 72(t1)      /* wsptr[2] */
     li          s5, 6270
-    lw          s7, 88(t1)      // wsptr[6]
-    mul         s4, s4, s6      // MULTIPLY((JLONG)wsptr[2], FIX_1_847759065)
-    lw          t2, 64(t1)      // wsptr[0]
-    mul         s5, s5, s7      // MULTIPLY((JLONG)wsptr[6], -FIX_0_765366865)
-    lh          t5, 92(t1)      // wsptr[7]
-    lh          t6, 84(t1)      // wsptr[5]
-    lh          t7, 76(t1)      // wsptr[3]
-    lh          t8, 68(t1)      // wsptr[1]
+    lw          s7, 88(t1)      /* wsptr[6] */
+    mul         s4, s4, s6      /* MULTIPLY((JLONG)wsptr[2],
+                                            FIX_1_847759065) */
+    lw          t2, 64(t1)      /* wsptr[0] */
+    mul         s5, s5, s7      /* MULTIPLY((JLONG)wsptr[6],
+                                            -FIX_0_765366865) */
+    lh          t5, 92(t1)      /* wsptr[7] */
+    lh          t6, 84(t1)      /* wsptr[5] */
+    lh          t7, 76(t1)      /* wsptr[3] */
+    lh          t8, 68(t1)      /* wsptr[1] */
     ins         t5, t6, 16, 16
     ins         t7, t8, 16, 16
     mult        $ac0, zero, zero
@@ -3381,23 +3435,25 @@
     mult        $ac1, zero, zero
     dpa.w.ph    $ac1, t5, s2
     dpa.w.ph    $ac1, t7, s3
-    sll         t2, t2, 14      // tmp0 = ((JLONG)wsptr[0]) << (CONST_BITS+1)
+    sll         t2, t2, 14      /* tmp0 =
+                                     ((JLONG)wsptr[0]) << (CONST_BITS+1) */
     mflo        s6, $ac0
-    // MULTIPLY(wsptr[2], FIX_1_847759065 + MULTIPLY(wsptr[6], -FIX_0_765366865)
+    /* MULTIPLY(wsptr[2], FIX_1_847759065) +
+       MULTIPLY(wsptr[6], -FIX_0_765366865) */
     subu        s4, s4, s5
-    addu        t3, t2, s4      // tmp10 = tmp0 + z2
+    addu        t3, t2, s4      /* tmp10 = tmp0 + z2 */
     mflo        s7, $ac1
-    subu        t4, t2, s4      // tmp10 = tmp0 - z2
+    subu        t4, t2, s4      /* tmp10 = tmp0 - z2 */
     addu        t7, t4, s6
     subu        t8, t4, s6
     addu        t5, t3, s7
     subu        t6, t3, s7
-    shra_r.w    t5, t5, 19      // DESCALE(tmp10 + temp2, 19)
-    shra_r.w    t6, t6, 19      // DESCALE(tmp10 - temp2, 19)
-    shra_r.w    t7, t7, 19      // DESCALE(tmp12 + temp1, 19)
-    shra_r.w    t8, t8, 19      // DESCALE(tmp12 - temp1, 19)
+    shra_r.w    t5, t5, 19      /* DESCALE(tmp10 + temp2, 19) */
+    shra_r.w    t6, t6, 19      /* DESCALE(tmp10 - temp2, 19) */
+    shra_r.w    t7, t7, 19      /* DESCALE(tmp12 + temp1, 19) */
+    shra_r.w    t8, t8, 19      /* DESCALE(tmp12 - temp1, 19) */
     sll         s4, t9, 2
-    lw          v0, 8(a2)       // output_buf[ctr]
+    lw          v0, 8(a2)       /* output_buf[ctr] */
     shll_s.w    t5, t5, 24
     shll_s.w    t6, t6, 24
     shll_s.w    t7, t7, 24
@@ -3406,7 +3462,7 @@
     sra         t6, t6, 24
     sra         t7, t7, 24
     sra         t8, t8, 24
-    addu        v0, v0, a3      // outptr = output_buf[ctr] + output_col
+    addu        v0, v0, a3      /* outptr = output_buf[ctr] + output_col */
     addiu       t5, t5, 128
     addiu       t6, t6, 128
     addiu       t7, t7, 128
@@ -3416,16 +3472,18 @@
     sb          t8, 2(v0)
     sb          t6, 3(v0)
     li          s4, 15137
-    lw          s6, 104(t1)     // wsptr[2]
+    lw          s6, 104(t1)     /* wsptr[2] */
     li          s5, 6270
-    lw          s7, 120(t1)     // wsptr[6]
-    mul         s4, s4, s6      // MULTIPLY((JLONG)wsptr[2], FIX_1_847759065)
-    lw          t2, 96(t1)      // wsptr[0]
-    mul         s5, s5, s7      // MULTIPLY((JLONG)wsptr[6], -FIX_0_765366865)
-    lh          t5, 124(t1)     // wsptr[7]
-    lh          t6, 116(t1)     // wsptr[5]
-    lh          t7, 108(t1)     // wsptr[3]
-    lh          t8, 100(t1)     // wsptr[1]
+    lw          s7, 120(t1)     /* wsptr[6] */
+    mul         s4, s4, s6      /* MULTIPLY((JLONG)wsptr[2],
+                                            FIX_1_847759065) */
+    lw          t2, 96(t1)      /* wsptr[0] */
+    mul         s5, s5, s7      /* MULTIPLY((JLONG)wsptr[6],
+                                            -FIX_0_765366865) */
+    lh          t5, 124(t1)     /* wsptr[7] */
+    lh          t6, 116(t1)     /* wsptr[5] */
+    lh          t7, 108(t1)     /* wsptr[3] */
+    lh          t8, 100(t1)     /* wsptr[1] */
     ins         t5, t6, 16, 16
     ins         t7, t8, 16, 16
     mult        $ac0, zero, zero
@@ -3434,23 +3492,25 @@
     mult        $ac1, zero, zero
     dpa.w.ph    $ac1, t5, s2
     dpa.w.ph    $ac1, t7, s3
-    sll         t2, t2, 14      // tmp0 = ((JLONG)wsptr[0]) << (CONST_BITS+1)
+    sll         t2, t2, 14      /* tmp0 =
+                                     ((JLONG)wsptr[0]) << (CONST_BITS+1) */
     mflo        s6, $ac0
-    // MULTIPLY(wsptr[2], FIX_1_847759065 + MULTIPLY(wsptr[6], -FIX_0_765366865)
+    /* MULTIPLY(wsptr[2], FIX_1_847759065) +
+       MULTIPLY(wsptr[6], -FIX_0_765366865) */
     subu        s4, s4, s5
-    addu        t3, t2, s4      // tmp10 = tmp0 + z2;
+    addu        t3, t2, s4      /* tmp10 = tmp0 + z2; */
     mflo        s7, $ac1
-    subu        t4, t2, s4      // tmp10 = tmp0 - z2;
+    subu        t4, t2, s4      /* tmp10 = tmp0 - z2; */
     addu        t7, t4, s6
     subu        t8, t4, s6
     addu        t5, t3, s7
     subu        t6, t3, s7
-    shra_r.w    t5, t5, 19      // DESCALE(tmp10 + temp2, 19)
-    shra_r.w    t6, t6, 19      // DESCALE(tmp10 - temp2, 19)
-    shra_r.w    t7, t7, 19      // DESCALE(tmp12 + temp1, 19)
-    shra_r.w    t8, t8, 19      // DESCALE(tmp12 - temp1, 19)
+    shra_r.w    t5, t5, 19      /* DESCALE(tmp10 + temp2, 19) */
+    shra_r.w    t6, t6, 19      /* DESCALE(tmp10 - temp2, 19) */
+    shra_r.w    t7, t7, 19      /* DESCALE(tmp12 + temp1, 19) */
+    shra_r.w    t8, t8, 19      /* DESCALE(tmp12 - temp1, 19) */
     sll         s4, t9, 2
-    lw          v0, 12(a2)      // output_buf[ctr]
+    lw          v0, 12(a2)      /* output_buf[ctr] */
     shll_s.w    t5, t5, 24
     shll_s.w    t6, t6, 24
     shll_s.w    t7, t7, 24
@@ -3459,7 +3519,7 @@
     sra         t6, t6, 24
     sra         t7, t7, 24
     sra         t8, t8, 24
-    addu        v0, v0, a3      // outptr = output_buf[ctr] + output_col
+    addu        v0, v0, a3      /* outptr = output_buf[ctr] + output_col */
     addiu       t5, t5, 128
     addiu       t6, t6, 128
     addiu       t7, t7, 128
@@ -3496,54 +3556,54 @@
     addiu       s1, zero, 2998
 
 1:
-    lh          s2, 0(a0)       // q0 = quantptr[ 0]
-    lh          s3, 32(a0)      // q1 = quantptr[16]
-    lh          s4, 64(a0)      // q2 = quantptr[32]
-    lh          t2, 64(a1)      // tmp2 = inptr[32]
-    lh          t1, 32(a1)      // tmp1 = inptr[16]
-    lh          t0, 0(a1)       // tmp0 = inptr[ 0]
-    mul         t2, t2, s4      // tmp2 = tmp2 * q2
-    mul         t1, t1, s3      // tmp1 = tmp1 * q1
-    mul         t0, t0, s2      // tmp0 = tmp0 * q0
-    lh          t6, 16(a1)      // z1 = inptr[ 8]
-    lh          t8, 80(a1)      // z3 = inptr[40]
-    lh          t7, 48(a1)      // z2 = inptr[24]
-    lh          s2, 16(a0)      // q0 = quantptr[ 8]
-    lh          s4, 80(a0)      // q2 = quantptr[40]
-    lh          s3, 48(a0)      // q1 = quantptr[24]
-    mul         t2, t2, t9      // tmp2 = tmp2 * 5793
-    mul         t1, t1, s0      // tmp1 = tmp1 * 10033
-    sll         t0, t0, 13      // tmp0 = tmp0 << 13
-    mul         t6, t6, s2      // z1 = z1 * q0
-    mul         t8, t8, s4      // z3 = z3 * q2
-    mul         t7, t7, s3      // z2 = z2 * q1
-    addu        t3, t0, t2      // tmp10 = tmp0 + tmp2
-    sll         t2, t2, 1       // tmp2 = tmp2 << 2
-    subu        t4, t0, t2      // tmp11 = tmp0 - tmp2;
-    subu        t5, t3, t1      // tmp12 = tmp10 - tmp1
-    addu        t3, t3, t1      // tmp10 = tmp10 + tmp1
-    addu        t1, t6, t8      // tmp1 = z1 + z3
-    mul         t1, t1, s1      // tmp1 = tmp1 * 2998
-    shra_r.w    t4, t4, 11      // tmp11 = (tmp11 + 1024) >> 11
-    subu        t2, t6, t8      // tmp2 = z1 - z3
-    subu        t2, t2, t7      // tmp2 = tmp2 - z2
-    sll         t2, t2, 2       // tmp2 = tmp2 << 2
-    addu        t0, t6, t7      // tmp0 = z1 + z2
-    sll         t0, t0, 13      // tmp0 = tmp0 << 13
-    subu        s2, t8, t7      // q0 = z3 - z2
-    sll         s2, s2, 13      // q0 = q0 << 13
-    addu        t0, t0, t1      // tmp0 = tmp0 + tmp1
-    addu        t1, s2, t1      // tmp1 = q0 + tmp1
-    addu        s2, t4, t2      // q0 = tmp11 + tmp2
-    subu        s3, t4, t2      // q1 = tmp11 - tmp2
-    addu        t6, t3, t0      // z1 = tmp10 + tmp0
-    subu        t7, t3, t0      // z2 = tmp10 - tmp0
-    addu        t4, t5, t1      // tmp11 = tmp12 + tmp1
-    subu        t5, t5, t1      // tmp12 = tmp12 - tmp1
-    shra_r.w    t6, t6, 11      // z1 = (z1 + 1024) >> 11
-    shra_r.w    t7, t7, 11      // z2 = (z2 + 1024) >> 11
-    shra_r.w    t4, t4, 11      // tmp11 = (tmp11 + 1024) >> 11
-    shra_r.w    t5, t5, 11      // tmp12 = (tmp12 + 1024) >> 11
+    lh          s2, 0(a0)       /* q0 = quantptr[ 0] */
+    lh          s3, 32(a0)      /* q1 = quantptr[16] */
+    lh          s4, 64(a0)      /* q2 = quantptr[32] */
+    lh          t2, 64(a1)      /* tmp2 = inptr[32] */
+    lh          t1, 32(a1)      /* tmp1 = inptr[16] */
+    lh          t0, 0(a1)       /* tmp0 = inptr[ 0] */
+    mul         t2, t2, s4      /* tmp2 = tmp2 * q2 */
+    mul         t1, t1, s3      /* tmp1 = tmp1 * q1 */
+    mul         t0, t0, s2      /* tmp0 = tmp0 * q0 */
+    lh          t6, 16(a1)      /* z1 = inptr[ 8] */
+    lh          t8, 80(a1)      /* z3 = inptr[40] */
+    lh          t7, 48(a1)      /* z2 = inptr[24] */
+    lh          s2, 16(a0)      /* q0 = quantptr[ 8] */
+    lh          s4, 80(a0)      /* q2 = quantptr[40] */
+    lh          s3, 48(a0)      /* q1 = quantptr[24] */
+    mul         t2, t2, t9      /* tmp2 = tmp2 * 5793 */
+    mul         t1, t1, s0      /* tmp1 = tmp1 * 10033 */
+    sll         t0, t0, 13      /* tmp0 = tmp0 << 13 */
+    mul         t6, t6, s2      /* z1 = z1 * q0 */
+    mul         t8, t8, s4      /* z3 = z3 * q2 */
+    mul         t7, t7, s3      /* z2 = z2 * q1 */
+    addu        t3, t0, t2      /* tmp10 = tmp0 + tmp2 */
+    sll         t2, t2, 1       /* tmp2 = tmp2 << 2 */
+    subu        t4, t0, t2      /* tmp11 = tmp0 - tmp2; */
+    subu        t5, t3, t1      /* tmp12 = tmp10 - tmp1 */
+    addu        t3, t3, t1      /* tmp10 = tmp10 + tmp1 */
+    addu        t1, t6, t8      /* tmp1 = z1 + z3 */
+    mul         t1, t1, s1      /* tmp1 = tmp1 * 2998 */
+    shra_r.w    t4, t4, 11      /* tmp11 = (tmp11 + 1024) >> 11 */
+    subu        t2, t6, t8      /* tmp2 = z1 - z3 */
+    subu        t2, t2, t7      /* tmp2 = tmp2 - z2 */
+    sll         t2, t2, 2       /* tmp2 = tmp2 << 2 */
+    addu        t0, t6, t7      /* tmp0 = z1 + z2 */
+    sll         t0, t0, 13      /* tmp0 = tmp0 << 13 */
+    subu        s2, t8, t7      /* q0 = z3 - z2 */
+    sll         s2, s2, 13      /* q0 = q0 << 13 */
+    addu        t0, t0, t1      /* tmp0 = tmp0 + tmp1 */
+    addu        t1, s2, t1      /* tmp1 = q0 + tmp1 */
+    addu        s2, t4, t2      /* q0 = tmp11 + tmp2 */
+    subu        s3, t4, t2      /* q1 = tmp11 - tmp2 */
+    addu        t6, t3, t0      /* z1 = tmp10 + tmp0 */
+    subu        t7, t3, t0      /* z2 = tmp10 - tmp0 */
+    addu        t4, t5, t1      /* tmp11 = tmp12 + tmp1 */
+    subu        t5, t5, t1      /* tmp12 = tmp12 - tmp1 */
+    shra_r.w    t6, t6, 11      /* z1 = (z1 + 1024) >> 11 */
+    shra_r.w    t7, t7, 11      /* z2 = (z2 + 1024) >> 11 */
+    shra_r.w    t4, t4, 11      /* tmp11 = (tmp11 + 1024) >> 11 */
+    shra_r.w    t5, t5, 11      /* tmp12 = (tmp12 + 1024) >> 11 */
     sw          s2, 24(v0)
     sw          s3, 96(v0)
     sw          t6, 0(v0)
@@ -3644,7 +3704,7 @@
     li          a3, 8
 
 1:
-    // odd part
+    /* odd part */
     lh          t0, 48(a1)
     lh          t1, 48(a0)
     lh          t2, 16(a1)
@@ -3653,55 +3713,55 @@
     lh          t5, 80(a0)
     lh          t6, 112(a1)
     lh          t7, 112(a0)
-    mul         t0, t0, t1      // z2
-    mul         t1, t2, t3      // z1
-    mul         t2, t4, t5      // z3
-    mul         t3, t6, t7      // z4
-    li          t4, 10703       // FIX(1.306562965)
-    li          t5, 4433        // FIX_0_541196100
-    li          t6, 7053        // FIX(0.860918669)
-    mul         t4, t0, t4      // tmp11
-    mul         t5, t0, t5      // -tmp14
-    addu        t7, t1, t2      // tmp10
-    addu        t8, t7, t3      // tmp10 + z4
-    mul         t6, t6, t8      // tmp15
-    li          t8, 2139        // FIX(0.261052384)
-    mul         t8, t7, t8      // MULTIPLY(tmp10, FIX(0.261052384))
-    li          t7, 2295        // FIX(0.280143716)
-    mul         t7, t1, t7      // MULTIPLY(z1, FIX(0.280143716))
-    addu        t9, t2, t3      // z3 + z4
-    li          s0, 8565        // FIX(1.045510580)
-    mul         t9, t9, s0      // -tmp13
-    li          s0, 12112       // FIX(1.478575242)
-    mul         s0, t2, s0      // MULTIPLY(z3, FIX(1.478575242)
-    li          s1, 12998       // FIX(1.586706681)
-    mul         s1, t3, s1      // MULTIPLY(z4, FIX(1.586706681))
-    li          s2, 5540        // FIX(0.676326758)
-    mul         s2, t1, s2      // MULTIPLY(z1, FIX(0.676326758))
-    li          s3, 16244       // FIX(1.982889723)
-    mul         s3, t3, s3      // MULTIPLY(z4, FIX(1.982889723))
-    subu        t1, t1, t3      // z1-=z4
-    subu        t0, t0, t2      // z2-=z3
-    addu        t2, t0, t1      // z1+z2
-    li          t3, 4433        // FIX_0_541196100
-    mul         t2, t2, t3      // z3
-    li          t3, 6270        // FIX_0_765366865
-    mul         t1, t1, t3      // MULTIPLY(z1, FIX_0_765366865)
-    li          t3, 15137       // FIX_0_765366865
-    mul         t0, t0, t3      // MULTIPLY(z2, FIX_1_847759065)
-    addu        t8, t6, t8      // tmp12
-    addu        t3, t8, t4      // tmp12 + tmp11
-    addu        t3, t3, t7      // tmp10
-    subu        t8, t8, t9      // tmp12 + tmp13
+    mul         t0, t0, t1      /* z2 */
+    mul         t1, t2, t3      /* z1 */
+    mul         t2, t4, t5      /* z3 */
+    mul         t3, t6, t7      /* z4 */
+    li          t4, 10703       /* FIX(1.306562965) */
+    li          t5, 4433        /* FIX_0_541196100 */
+    li          t6, 7053        /* FIX(0.860918669) */
+    mul         t4, t0, t4      /* tmp11 */
+    mul         t5, t0, t5      /* -tmp14 */
+    addu        t7, t1, t2      /* tmp10 */
+    addu        t8, t7, t3      /* tmp10 + z4 */
+    mul         t6, t6, t8      /* tmp15 */
+    li          t8, 2139        /* FIX(0.261052384) */
+    mul         t8, t7, t8      /* MULTIPLY(tmp10, FIX(0.261052384)) */
+    li          t7, 2295        /* FIX(0.280143716) */
+    mul         t7, t1, t7      /* MULTIPLY(z1, FIX(0.280143716)) */
+    addu        t9, t2, t3      /* z3 + z4 */
+    li          s0, 8565        /* FIX(1.045510580) */
+    mul         t9, t9, s0      /* -tmp13 */
+    li          s0, 12112       /* FIX(1.478575242) */
+    mul         s0, t2, s0      /* MULTIPLY(z3, FIX(1.478575242) */
+    li          s1, 12998       /* FIX(1.586706681) */
+    mul         s1, t3, s1      /* MULTIPLY(z4, FIX(1.586706681)) */
+    li          s2, 5540        /* FIX(0.676326758) */
+    mul         s2, t1, s2      /* MULTIPLY(z1, FIX(0.676326758)) */
+    li          s3, 16244       /* FIX(1.982889723) */
+    mul         s3, t3, s3      /* MULTIPLY(z4, FIX(1.982889723)) */
+    subu        t1, t1, t3      /* z1-=z4 */
+    subu        t0, t0, t2      /* z2-=z3 */
+    addu        t2, t0, t1      /* z1+z2 */
+    li          t3, 4433        /* FIX_0_541196100 */
+    mul         t2, t2, t3      /* z3 */
+    li          t3, 6270        /* FIX_0_765366865 */
+    mul         t1, t1, t3      /* MULTIPLY(z1, FIX_0_765366865) */
+    li          t3, 15137       /* FIX_0_765366865 */
+    mul         t0, t0, t3      /* MULTIPLY(z2, FIX_1_847759065) */
+    addu        t8, t6, t8      /* tmp12 */
+    addu        t3, t8, t4      /* tmp12 + tmp11 */
+    addu        t3, t3, t7      /* tmp10 */
+    subu        t8, t8, t9      /* tmp12 + tmp13 */
     addu        s0, t5, s0
-    subu        t8, t8, s0      // tmp12
+    subu        t8, t8, s0      /* tmp12 */
     subu        t9, t6, t9
     subu        s1, s1, t4
-    addu        t9, t9, s1      // tmp13
+    addu        t9, t9, s1      /* tmp13 */
     subu        t6, t6, t5
     subu        t6, t6, s2
-    subu        t6, t6, s3      // tmp15
-    // even part start
+    subu        t6, t6, s3      /* tmp15 */
+    /* even part start */
     lh          t4, 64(a1)
     lh          t5, 64(a0)
     lh          t7, 32(a1)
@@ -3710,39 +3770,43 @@
     lh          s2, 0(a0)
     lh          s3, 96(a1)
     lh          v0, 96(a0)
-    mul         t4, t4, t5      // DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4])
-    mul         t5, t7, s0      // DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2])
-    mul         t7, s1, s2      // DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0])
-    mul         s0, s3, v0      // DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6])
-    // odd part end
-    addu        t1, t2, t1      // tmp11
-    subu        t0, t2, t0      // tmp14
-    // update counter and pointers
+    mul         t4, t4, t5      /* DEQUANTIZE(inptr[DCTSIZE*4],
+                                              quantptr[DCTSIZE*4]) */
+    mul         t5, t7, s0      /* DEQUANTIZE(inptr[DCTSIZE*2],
+                                              quantptr[DCTSIZE*2]) */
+    mul         t7, s1, s2      /* DEQUANTIZE(inptr[DCTSIZE*0],
+                                              quantptr[DCTSIZE*0]) */
+    mul         s0, s3, v0      /* DEQUANTIZE(inptr[DCTSIZE*6],
+                                              quantptr[DCTSIZE*6]) */
+    /* odd part end */
+    addu        t1, t2, t1      /* tmp11 */
+    subu        t0, t2, t0      /* tmp14 */
+    /* update counter and pointers */
     addiu       a3, a3, -1
     addiu       a0, a0, 2
     addiu       a1, a1, 2
-    // even part rest
+    /* even part rest */
     li          s1, 10033
     li          s2, 11190
-    mul         t4, t4, s1      // z4
-    mul         s1, t5, s2      // z4
-    sll         t5, t5, 13      // z1
+    mul         t4, t4, s1      /* z4 */
+    mul         s1, t5, s2      /* z4 */
+    sll         t5, t5, 13      /* z1 */
     sll         t7, t7, 13
-    addiu       t7, t7, 1024    // z3
-    sll         s0, s0, 13      // z2
-    addu        s2, t7, t4      // tmp10
-    subu        t4, t7, t4      // tmp11
-    subu        s3, t5, s0      // tmp12
-    addu        t2, t7, s3      // tmp21
-    subu        s3, t7, s3      // tmp24
-    addu        t7, s1, s0      // tmp12
-    addu        v0, s2, t7      // tmp20
-    subu        s2, s2, t7      // tmp25
-    subu        s1, s1, t5      // z4 - z1
-    subu        s1, s1, s0      // tmp12
-    addu        s0, t4, s1      // tmp22
-    subu        t4, t4, s1      // tmp23
-    // final output stage
+    addiu       t7, t7, 1024    /* z3 */
+    sll         s0, s0, 13      /* z2 */
+    addu        s2, t7, t4      /* tmp10 */
+    subu        t4, t7, t4      /* tmp11 */
+    subu        s3, t5, s0      /* tmp12 */
+    addu        t2, t7, s3      /* tmp21 */
+    subu        s3, t7, s3      /* tmp24 */
+    addu        t7, s1, s0      /* tmp12 */
+    addu        v0, s2, t7      /* tmp20 */
+    subu        s2, s2, t7      /* tmp25 */
+    subu        s1, s1, t5      /* z4 - z1 */
+    subu        s1, s1, s0      /* tmp12 */
+    addu        s0, t4, s1      /* tmp22 */
+    subu        t4, t4, s1      /* tmp23 */
+    /* final output stage */
     addu        t5, v0, t3
     subu        v0, v0, t3
     addu        t3, t2, t1
@@ -3801,86 +3865,86 @@
     li          a3, 12
 
 1:
-    // Odd part
+    /* Odd part */
     lw          t0, 12(a0)
     lw          t1, 4(a0)
     lw          t2, 20(a0)
     lw          t3, 28(a0)
-    li          t4, 10703       // FIX(1.306562965)
-    li          t5, 4433        // FIX_0_541196100
-    mul         t4, t0, t4      // tmp11
-    mul         t5, t0, t5      // -tmp14
-    addu        t6, t1, t2      // tmp10
-    li          t7, 2139        // FIX(0.261052384)
-    mul         t7, t6, t7      // MULTIPLY(tmp10, FIX(0.261052384))
-    addu        t6, t6, t3      // tmp10 + z4
-    li          t8, 7053        // FIX(0.860918669)
-    mul         t6, t6, t8      // tmp15
-    li          t8, 2295        // FIX(0.280143716)
-    mul         t8, t1, t8      // MULTIPLY(z1, FIX(0.280143716))
-    addu        t9, t2, t3      // z3 + z4
-    li          s0, 8565        // FIX(1.045510580)
-    mul         t9, t9, s0      // -tmp13
-    li          s0, 12112       // FIX(1.478575242)
-    mul         s0, t2, s0      // MULTIPLY(z3, FIX(1.478575242))
-    li          s1, 12998       // FIX(1.586706681)
-    mul         s1, t3, s1      // MULTIPLY(z4, FIX(1.586706681))
-    li          s2, 5540        // FIX(0.676326758)
-    mul         s2, t1, s2      // MULTIPLY(z1, FIX(0.676326758))
-    li          s3, 16244       // FIX(1.982889723)
-    mul         s3, t3, s3      // MULTIPLY(z4, FIX(1.982889723))
-    subu        t1, t1, t3      // z1 -= z4
-    subu        t0, t0, t2      // z2 -= z3
-    addu        t2, t1, t0      // z1 + z2
-    li          t3, 4433        // FIX_0_541196100
-    mul         t2, t2, t3      // z3
-    li          t3, 6270        // FIX_0_765366865
-    mul         t1, t1, t3      // MULTIPLY(z1, FIX_0_765366865)
-    li          t3, 15137       // FIX_1_847759065
-    mul         t0, t0, t3      // MULTIPLY(z2, FIX_1_847759065)
-    addu        t3, t6, t7      // tmp12
+    li          t4, 10703       /* FIX(1.306562965) */
+    li          t5, 4433        /* FIX_0_541196100 */
+    mul         t4, t0, t4      /* tmp11 */
+    mul         t5, t0, t5      /* -tmp14 */
+    addu        t6, t1, t2      /* tmp10 */
+    li          t7, 2139        /* FIX(0.261052384) */
+    mul         t7, t6, t7      /* MULTIPLY(tmp10, FIX(0.261052384)) */
+    addu        t6, t6, t3      /* tmp10 + z4 */
+    li          t8, 7053        /* FIX(0.860918669) */
+    mul         t6, t6, t8      /* tmp15 */
+    li          t8, 2295        /* FIX(0.280143716) */
+    mul         t8, t1, t8      /* MULTIPLY(z1, FIX(0.280143716)) */
+    addu        t9, t2, t3      /* z3 + z4 */
+    li          s0, 8565        /* FIX(1.045510580) */
+    mul         t9, t9, s0      /* -tmp13 */
+    li          s0, 12112       /* FIX(1.478575242) */
+    mul         s0, t2, s0      /* MULTIPLY(z3, FIX(1.478575242)) */
+    li          s1, 12998       /* FIX(1.586706681) */
+    mul         s1, t3, s1      /* MULTIPLY(z4, FIX(1.586706681)) */
+    li          s2, 5540        /* FIX(0.676326758) */
+    mul         s2, t1, s2      /* MULTIPLY(z1, FIX(0.676326758)) */
+    li          s3, 16244       /* FIX(1.982889723) */
+    mul         s3, t3, s3      /* MULTIPLY(z4, FIX(1.982889723)) */
+    subu        t1, t1, t3      /* z1 -= z4 */
+    subu        t0, t0, t2      /* z2 -= z3 */
+    addu        t2, t1, t0      /* z1 + z2 */
+    li          t3, 4433        /* FIX_0_541196100 */
+    mul         t2, t2, t3      /* z3 */
+    li          t3, 6270        /* FIX_0_765366865 */
+    mul         t1, t1, t3      /* MULTIPLY(z1, FIX_0_765366865) */
+    li          t3, 15137       /* FIX_1_847759065 */
+    mul         t0, t0, t3      /* MULTIPLY(z2, FIX_1_847759065) */
+    addu        t3, t6, t7      /* tmp12 */
     addu        t7, t3, t4
-    addu        t7, t7, t8      // tmp10
+    addu        t7, t7, t8      /* tmp10 */
     subu        t3, t3, t9
     subu        t3, t3, t5
-    subu        t3, t3, s0      // tmp12
+    subu        t3, t3, s0      /* tmp12 */
     subu        t9, t6, t9
     subu        t9, t9, t4
-    addu        t9, t9, s1      // tmp13
+    addu        t9, t9, s1      /* tmp13 */
     subu        t6, t6, t5
     subu        t6, t6, s2
-    subu        t6, t6, s3      // tmp15
-    addu        t1, t2, t1      // tmp11
-    subu        t0, t2, t0      // tmp14
-    // even part
-    lw          t2, 16(a0)      // z4
-    lw          t4, 8(a0)       // z1
-    lw          t5, 0(a0)       // z3
-    lw          t8, 24(a0)      // z2
-    li          s0, 10033       // FIX(1.224744871)
-    li          s1, 11190       // FIX(1.366025404)
-    mul         t2, t2, s0      // z4
-    mul         s0, t4, s1      // z4
+    subu        t6, t6, s3      /* tmp15 */
+    addu        t1, t2, t1      /* tmp11 */
+    subu        t0, t2, t0      /* tmp14 */
+    /* even part */
+    lw          t2, 16(a0)      /* z4 */
+    lw          t4, 8(a0)       /* z1 */
+    lw          t5, 0(a0)       /* z3 */
+    lw          t8, 24(a0)      /* z2 */
+    li          s0, 10033       /* FIX(1.224744871) */
+    li          s1, 11190       /* FIX(1.366025404) */
+    mul         t2, t2, s0      /* z4 */
+    mul         s0, t4, s1      /* z4 */
     addiu       t5, t5, 0x10
-    sll         t5, t5, 13      // z3
-    sll         t4, t4, 13      // z1
-    sll         t8, t8, 13      // z2
-    subu        s1, t4, t8      // tmp12
-    addu        s2, t5, t2      // tmp10
-    subu        t2, t5, t2      // tmp11
-    addu        s3, t5, s1      // tmp21
-    subu        s1, t5, s1      // tmp24
-    addu        t5, s0, t8      // tmp12
-    addu        v0, s2, t5      // tmp20
-    subu        t5, s2, t5      // tmp25
+    sll         t5, t5, 13      /* z3 */
+    sll         t4, t4, 13      /* z1 */
+    sll         t8, t8, 13      /* z2 */
+    subu        s1, t4, t8      /* tmp12 */
+    addu        s2, t5, t2      /* tmp10 */
+    subu        t2, t5, t2      /* tmp11 */
+    addu        s3, t5, s1      /* tmp21 */
+    subu        s1, t5, s1      /* tmp24 */
+    addu        t5, s0, t8      /* tmp12 */
+    addu        v0, s2, t5      /* tmp20 */
+    subu        t5, s2, t5      /* tmp25 */
     subu        t4, s0, t4
-    subu        t4, t4, t8      // tmp12
-    addu        t8, t2, t4      // tmp22
-    subu        t2, t2, t4      // tmp23
-    // increment counter and pointers
+    subu        t4, t4, t8      /* tmp12 */
+    addu        t8, t2, t4      /* tmp22 */
+    subu        t2, t2, t4      /* tmp23 */
+    /* increment counter and pointers */
     addiu       a3, a3, -1
     addiu       a0, a0, 32
-    // Final stage
+    /* Final stage */
     addu        t4, v0, t7
     subu        v0, v0, t7
     addu        t7, s3, t1
@@ -4169,7 +4233,7 @@
     swc1        f12, 20(a2)
     swc1        f14, 24(a2)
     swc1        f16, 28(a2)
-    // elemr 1
+    /* elemr 1 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4212,7 +4276,7 @@
     swc1        f12, 52(a2)
     swc1        f14, 56(a2)
     swc1        f16, 60(a2)
-    // elemr 2
+    /* elemr 2 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4255,7 +4319,7 @@
     swc1        f12, 84(a2)
     swc1        f14, 88(a2)
     swc1        f16, 92(a2)
-    //  elemr 3
+    /*  elemr 3 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4298,7 +4362,7 @@
     swc1        f12, 116(a2)
     swc1        f14, 120(a2)
     swc1        f16, 124(a2)
-    // elemr 4
+    /* elemr 4 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4341,7 +4405,7 @@
     swc1        f12, 148(a2)
     swc1        f14, 152(a2)
     swc1        f16, 156(a2)
-    // elemr 5
+    /* elemr 5 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4384,7 +4448,7 @@
     swc1        f12, 180(a2)
     swc1        f14, 184(a2)
     swc1        f16, 188(a2)
-    // elemr 6
+    /* elemr 6 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
@@ -4427,7 +4491,7 @@
     swc1        f12, 212(a2)
     swc1        f14, 216(a2)
     swc1        f16, 220(a2)
-    // elemr 7
+    /* elemr 7 */
     lbu         t1, 0(t0)
     lbu         t2, 1(t0)
     lbu         t3, 2(t0)
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/powerpc/jfdctint-altivec.c firefox-85.0+build1/media/libjpeg/simd/powerpc/jfdctint-altivec.c
--- firefox-84.0.2+build1/media/libjpeg/simd/powerpc/jfdctint-altivec.c	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/powerpc/jfdctint-altivec.c	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * AltiVec optimizations for libjpeg-turbo
  *
- * Copyright (C) 2014, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2014, 2020, D. R. Commander.  All Rights Reserved.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-/* SLOW INTEGER FORWARD DCT */
+/* ACCURATE INTEGER FORWARD DCT */
 
 #include "jsimd_altivec.h"
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/powerpc/jidctint-altivec.c firefox-85.0+build1/media/libjpeg/simd/powerpc/jidctint-altivec.c
--- firefox-84.0.2+build1/media/libjpeg/simd/powerpc/jidctint-altivec.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/powerpc/jidctint-altivec.c	2021-01-18 19:58:17.000000000 +0000
@@ -1,7 +1,7 @@
 /*
  * AltiVec optimizations for libjpeg-turbo
  *
- * Copyright (C) 2014-2015, D. R. Commander.  All Rights Reserved.
+ * Copyright (C) 2014-2015, 2020, D. R. Commander.  All Rights Reserved.
  *
  * This software is provided 'as-is', without any express or implied
  * warranty.  In no event will the authors be held liable for any damages
@@ -20,7 +20,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-/* SLOW INTEGER INVERSE DCT */
+/* ACCURATE INTEGER INVERSE DCT */
 
 #include "jsimd_altivec.h"
 
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jfdctint-avx2.asm firefox-85.0+build1/media/libjpeg/simd/x86_64/jfdctint-avx2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jfdctint-avx2.asm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/x86_64/jfdctint-avx2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jfdctint.asm - accurate integer FDCT (64-bit AVX2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, 2018, D. R. Commander.
+; Copyright (C) 2009, 2016, 2018, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jfdctint.c; see the jfdctint.c for
 ; more details.
@@ -103,7 +103,7 @@
 %endmacro
 
 ; --------------------------------------------------------------------------
-; In-place 8x8x16-bit slow integer forward DCT using AVX2 instructions
+; In-place 8x8x16-bit accurate integer forward DCT using AVX2 instructions
 ; %1-%4: Input/output registers
 ; %5-%8: Temp registers
 ; %9:    Pass (1 or 2)
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jfdctint-sse2.asm firefox-85.0+build1/media/libjpeg/simd/x86_64/jfdctint-sse2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jfdctint-sse2.asm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/x86_64/jfdctint-sse2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jfdctint.asm - accurate integer FDCT (64-bit SSE2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, D. R. Commander.
+; Copyright (C) 2009, 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; forward DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jfdctint.c; see the jfdctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jidctint-avx2.asm firefox-85.0+build1/media/libjpeg/simd/x86_64/jidctint-avx2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jidctint-avx2.asm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/x86_64/jidctint-avx2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jidctint.asm - accurate integer IDCT (64-bit AVX2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, 2018, D. R. Commander.
+; Copyright (C) 2009, 2016, 2018, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jidctint.c; see the jidctint.c for
 ; more details.
@@ -113,7 +113,7 @@
 %endmacro
 
 ; --------------------------------------------------------------------------
-; In-place 8x8x16-bit slow integer inverse DCT using AVX2 instructions
+; In-place 8x8x16-bit accurate integer inverse DCT using AVX2 instructions
 ; %1-%4:  Input/output registers
 ; %5-%12: Temp registers
 ; %9:     Pass (1 or 2)
diff -Nru firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jidctint-sse2.asm firefox-85.0+build1/media/libjpeg/simd/x86_64/jidctint-sse2.asm
--- firefox-84.0.2+build1/media/libjpeg/simd/x86_64/jidctint-sse2.asm	2021-01-06 11:23:14.000000000 +0000
+++ firefox-85.0+build1/media/libjpeg/simd/x86_64/jidctint-sse2.asm	2021-01-18 19:58:17.000000000 +0000
@@ -2,7 +2,7 @@
 ; jidctint.asm - accurate integer IDCT (64-bit SSE2)
 ;
 ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright (C) 2009, 2016, D. R. Commander.
+; Copyright (C) 2009, 2016, 2020, D. R. Commander.
 ;
 ; Based on the x86 SIMD extension for IJG JPEG library
 ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -14,7 +14,7 @@
 ; NASM is available from http://nasm.sourceforge.net/ or
 ; http://sourceforge.net/project/showfiles.php?group_id=6208
 ;
-; This file contains a slow-but-accurate integer implementation of the
+; This file contains a slower but more accurate integer implementation of the
 ; inverse DCT (Discrete Cosine Transform). The following code is based
 ; directly on the IJG's original jidctint.c; see the jidctint.c for
 ; more details.
diff -Nru firefox-84.0.2+build1/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp firefox-85.0+build1/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp
--- firefox-84.0.2+build1/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/media/webrtc/signaling/gtest/mediapipeline_unittest.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -13,6 +13,7 @@
 #include "AudioStreamTrack.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "MediaPipeline.h"
 #include "MediaPipelineFilter.h"
 #include "MediaTrackGraph.h"
diff -Nru firefox-84.0.2+build1/memory/app.mozbuild firefox-85.0+build1/memory/app.mozbuild
--- firefox-84.0.2+build1/memory/app.mozbuild	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/memory/app.mozbuild	2021-01-18 19:58:18.000000000 +0000
@@ -12,4 +12,5 @@
 
 DIRS += [
     '/memory',
+    '/mfbt',
 ]
diff -Nru firefox-84.0.2+build1/memory/build/mozjemalloc.cpp firefox-85.0+build1/memory/build/mozjemalloc.cpp
--- firefox-84.0.2+build1/memory/build/mozjemalloc.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/memory/build/mozjemalloc.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -868,7 +868,7 @@
   //    48   4 KiB     64   4 KiB     80   4 KiB     96   4 KiB
   //   112   4 KiB    128   8 KiB    144   4 KiB    160   8 KiB
   //   176   4 KiB    192   4 KiB    208   8 KiB    224   4 KiB
-  //   240   4 KiB    256  16 KiB    272   4 KiB    288   4 KiB
+  //   240   8 KiB    256  16 KiB    272   8 KiB    288   4 KiB
   //   304  12 KiB    320  12 KiB    336   4 KiB    352   8 KiB
   //   368   4 KiB    384   8 KiB    400  20 KiB    416  16 KiB
   //   432  12 KiB    448   4 KiB    464  16 KiB    480   8 KiB
@@ -918,6 +918,15 @@
   // A per-arena opt-in to randomize the offset of small allocations
   bool mRandomizeSmallAllocations;
 
+  // Whether this is a private arena. Multiple public arenas are just a
+  // performance optimization and not a safety feature.
+  //
+  // Since, for example, we don't want thread-local arenas to grow too much, we
+  // use the default arena for bigger allocations. We use this member to allow
+  // realloc() to switch out of our arena if needed (which is not allowed for
+  // private arenas for security).
+  bool mIsPrivate;
+
   // A pseudorandom number generator. Initially null, it gets initialized
   // on first use to avoid recursive malloc initialization (e.g. on OSX
   // arc4random allocates memory).
@@ -962,7 +971,7 @@
   //   --------+------+
   arena_bin_t mBins[1];  // Dynamically sized.
 
-  explicit arena_t(arena_params_t* aParams);
+  explicit arena_t(arena_params_t* aParams, bool aIsPrivate);
   ~arena_t();
 
  private:
@@ -1027,11 +1036,7 @@
 
   void* operator new(size_t aCount) = delete;
 
-  void* operator new(size_t aCount, const fallible_t&)
-#if !defined(_MSC_VER) || defined(_CPPUNWIND)
-      noexcept
-#endif
-      ;
+  void* operator new(size_t aCount, const fallible_t&) noexcept;
 
   void operator delete(void*);
 };
@@ -3039,31 +3044,6 @@
   return ret;
 }
 
-// Return the size of the allocation pointed to by ptr.
-static size_t arena_salloc(const void* ptr) {
-  size_t ret;
-  arena_chunk_t* chunk;
-  size_t pageind, mapbits;
-
-  MOZ_ASSERT(ptr);
-  MOZ_ASSERT(GetChunkOffsetForPtr(ptr) != 0);
-
-  chunk = GetChunkForPtr(ptr);
-  pageind = (((uintptr_t)ptr - (uintptr_t)chunk) >> gPageSize2Pow);
-  mapbits = chunk->map[pageind].bits;
-  MOZ_DIAGNOSTIC_ASSERT((mapbits & CHUNK_MAP_ALLOCATED) != 0);
-  if ((mapbits & CHUNK_MAP_LARGE) == 0) {
-    arena_run_t* run = (arena_run_t*)(mapbits & ~gPageSizeMask);
-    MOZ_DIAGNOSTIC_ASSERT(run->mMagic == ARENA_RUN_MAGIC);
-    ret = run->mBin->mSizeClass;
-  } else {
-    ret = mapbits & ~gPageSizeMask;
-    MOZ_DIAGNOSTIC_ASSERT(ret != 0);
-  }
-
-  return ret;
-}
-
 class AllocInfo {
  public:
   template <bool Validate = false>
@@ -3082,7 +3062,22 @@
 
     if (chunk != aPtr) {
       MOZ_DIAGNOSTIC_ASSERT(chunk->arena->mMagic == ARENA_MAGIC);
-      return AllocInfo(arena_salloc(aPtr), chunk);
+
+      size_t pageind = (((uintptr_t)aPtr - (uintptr_t)chunk) >> gPageSize2Pow);
+      size_t mapbits = chunk->map[pageind].bits;
+      MOZ_DIAGNOSTIC_ASSERT((mapbits & CHUNK_MAP_ALLOCATED) != 0);
+
+      size_t size;
+      if ((mapbits & CHUNK_MAP_LARGE) == 0) {
+        arena_run_t* run = (arena_run_t*)(mapbits & ~gPageSizeMask);
+        MOZ_DIAGNOSTIC_ASSERT(run->mMagic == ARENA_RUN_MAGIC);
+        size = run->mBin->mSizeClass;
+      } else {
+        size = mapbits & ~gPageSizeMask;
+        MOZ_DIAGNOSTIC_ASSERT(size != 0);
+      }
+
+      return AllocInfo(size, chunk);
     }
 
     extent_node_t key;
@@ -3469,8 +3464,8 @@
 
   // If we get here, then aSize and aOldSize are different enough that we
   // need to move the object.  In that case, fall back to allocating new
-  // space and copying.
-  ret = Malloc(aSize, false);
+  // space and copying. Allow non-private arenas to switch arenas.
+  ret = (mIsPrivate ? this : choose_arena(aSize))->Malloc(aSize, false);
   if (!ret) {
     return nullptr;
   }
@@ -3498,11 +3493,7 @@
                                    : RallocHuge(aPtr, aSize, aOldSize);
 }
 
-void* arena_t::operator new(size_t aCount, const fallible_t&)
-#if !defined(_MSC_VER) || defined(_CPPUNWIND)
-    noexcept
-#endif
-{
+void* arena_t::operator new(size_t aCount, const fallible_t&) noexcept {
   MOZ_ASSERT(aCount == sizeof(arena_t));
   return TypedBaseAlloc<arena_t>::alloc();
 }
@@ -3511,7 +3502,7 @@
   TypedBaseAlloc<arena_t>::dealloc((arena_t*)aPtr);
 }
 
-arena_t::arena_t(arena_params_t* aParams) {
+arena_t::arena_t(arena_params_t* aParams, bool aIsPrivate) {
   unsigned i;
 
   MOZ_RELEASE_ASSERT(mLock.Init());
@@ -3543,6 +3534,8 @@
   }
   mPRNG = nullptr;
 
+  mIsPrivate = aIsPrivate;
+
   mNumDirty = 0;
   // The default maximum amount of dirty pages allowed on arenas is a fraction
   // of opt_dirty_max.
@@ -3598,7 +3591,7 @@
 
 arena_t* ArenaCollection::CreateArena(bool aIsPrivate,
                                       arena_params_t* aParams) {
-  arena_t* ret = new (fallible) arena_t(aParams);
+  arena_t* ret = new (fallible) arena_t(aParams, aIsPrivate);
   if (!ret) {
     // Only reached if there is an OOM error.
 
@@ -3786,9 +3779,9 @@
   }
 
   // If we get here, then aSize and aOldSize are different enough that we
-  // need to use a different size class.  In that case, fall back to
-  // allocating new space and copying.
-  ret = MallocHuge(aSize, false);
+  // need to use a different size class.  In that case, fall back to allocating
+  // new space and copying. Allow non-private arenas to switch arenas.
+  ret = (mIsPrivate ? this : choose_arena(aSize))->MallocHuge(aSize, false);
   if (!ret) {
     return nullptr;
   }
@@ -4118,10 +4111,6 @@
     auto arena = info.Arena();
     MOZ_RELEASE_ASSERT(!mArena || arena == mArena);
     ret = arena->Ralloc(aPtr, aSize, info.Size());
-
-    if (!ret) {
-      errno = ENOMEM;
-    }
   } else {
     if (!malloc_init()) {
       ret = nullptr;
@@ -4129,12 +4118,11 @@
       arena_t* arena = mArena ? mArena : choose_arena(aSize);
       ret = arena->Malloc(aSize, /* zero = */ false);
     }
-
-    if (!ret) {
-      errno = ENOMEM;
-    }
   }
 
+  if (!ret) {
+    errno = ENOMEM;
+  }
   return ret;
 }
 
@@ -4330,6 +4318,7 @@
           aBinStats[j].bytes_unused += bin_unused;
           aBinStats[j].bytes_total +=
               bin->mNumRuns * (bin->mRunSize - bin->mRunFirstRegionOffset);
+          aBinStats[j].bytes_per_run = bin->mRunSize;
         }
       }
     }
diff -Nru firefox-84.0.2+build1/memory/build/mozjemalloc_types.h firefox-85.0+build1/memory/build/mozjemalloc_types.h
--- firefox-84.0.2+build1/memory/build/mozjemalloc_types.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/memory/build/mozjemalloc_types.h	2021-01-18 19:58:17.000000000 +0000
@@ -106,7 +106,7 @@
   size_t num_runs;           // The number of runs in this bin
   size_t bytes_unused;       // The unallocated bytes across all these bins
   size_t bytes_total;        // The total storage area for runs in this bin,
-                             // excluding headers..
+  size_t bytes_per_run;      // The number of bytes per run, including headers.
 } jemalloc_bin_stats_t;
 
 #define JEMALLOC_MAX_STATS_BINS 40
diff -Nru firefox-84.0.2+build1/memory/moz.build firefox-85.0+build1/memory/moz.build
--- firefox-84.0.2+build1/memory/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/memory/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -11,8 +11,12 @@
     "build",
 ]
 
-# For now, don't build mozalloc when building with --enable-project=memory
-if CONFIG["MOZ_BUILD_APP"] != "memory":
+if CONFIG["MOZ_BUILD_APP"] == "memory":
+    DIRS += [
+        "mozjemalloc_info",
+    ]
+else:
+    # For now, don't build mozalloc when building with --enable-project=memory
     DIRS += [
         "mozalloc",
     ]
diff -Nru firefox-84.0.2+build1/memory/mozjemalloc_info/moz.build firefox-85.0+build1/memory/mozjemalloc_info/moz.build
--- firefox-84.0.2+build1/memory/mozjemalloc_info/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/memory/mozjemalloc_info/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,26 @@
+# -*- 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/.
+
+Program("mozjemalloc-info")
+
+SOURCES += [
+    "/mfbt/Assertions.cpp",
+    "/mfbt/RandomNum.cpp",
+    "MozjemallocInfo.cpp",
+]
+
+# Link replace-malloc and the default allocator.
+USE_LIBS += [
+    "memory",
+]
+
+# The memory library defines this, so it's needed here too.
+DEFINES["IMPL_MFBT"] = True
+
+if CONFIG["MOZ_NEEDS_LIBATOMIC"]:
+    OS_LIBS += ["atomic"]
+
+DisableStlWrapping()
diff -Nru firefox-84.0.2+build1/memory/mozjemalloc_info/MozjemallocInfo.cpp firefox-85.0+build1/memory/mozjemalloc_info/MozjemallocInfo.cpp
--- firefox-84.0.2+build1/memory/mozjemalloc_info/MozjemallocInfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/memory/mozjemalloc_info/MozjemallocInfo.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,39 @@
+/* -*- 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 <stdio.h>
+#include <stdlib.h>
+
+#include "mozmemory.h"
+
+/*
+ * Print the configured size classes which we can then use to update
+ * documentation.
+ */
+int main() {
+  jemalloc_stats_t stats;
+  jemalloc_bin_stats_t bin_stats[JEMALLOC_MAX_STATS_BINS];
+
+  jemalloc_stats(&stats, bin_stats);
+
+  printf("Page size:    %5zu\n", stats.page_size);
+  printf("Chunk size:   %5zuKiB\n", stats.chunksize / 1024);
+
+  printf("Quantum:      %5zu\n", stats.quantum);
+  printf("Quantum max:  %5zu\n", stats.quantum_max);
+  printf("Sub-page max: %5zu\n", stats.page_size / 2);
+  printf("Large max:    %5zuKiB\n", stats.large_max / 1024);
+
+  printf("\nBin stats:\n");
+  for (auto& bin : bin_stats) {
+    if (bin.size) {
+      printf("  Bin %5zu has runs of %3zuKiB\n", bin.size,
+             bin.bytes_per_run / 1024);
+    }
+  }
+
+  return EXIT_SUCCESS;
+}
diff -Nru firefox-84.0.2+build1/memory/replace/dmd/test/moz.build firefox-85.0+build1/memory/replace/dmd/test/moz.build
--- firefox-84.0.2+build1/memory/replace/dmd/test/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/memory/replace/dmd/test/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -12,10 +12,10 @@
 )
 
 # See the comment at the top of SmokeDMD.cpp:RunTests().
-if CONFIG["CXX_TYPE"] == "clang-cl":
-    CXXFLAGS += ["-Og-"]
+if CONFIG["CC_TYPE"] == "clang-cl":
+    CXXFLAGS += ["-Od", "-clang:-fno-lto"]
 else:
-    CXXFLAGS += ["-O0"]
+    CXXFLAGS += ["-O0", "-fno-lto"]
 
 DEFINES["MOZ_NO_MOZALLOC"] = True
 
diff -Nru firefox-84.0.2+build1/mfbt/Algorithm.h firefox-85.0+build1/mfbt/Algorithm.h
--- firefox-84.0.2+build1/mfbt/Algorithm.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Algorithm.h	2021-01-18 19:58:18.000000000 +0000
@@ -28,6 +28,18 @@
   return true;
 }
 
+// Like C++20's `std::any_of`.
+template <typename Iter, typename Pred>
+constexpr bool AnyOf(Iter aFirst, Iter aLast, Pred aPred) {
+  for (; aFirst != aLast; ++aFirst) {
+    if (aPred(*aFirst)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 namespace detail {
 template <typename Transform, typename SrcIter>
 using ArrayElementTransformType = typename std::invoke_result_t<
diff -Nru firefox-84.0.2+build1/mfbt/ArrayUtils.h firefox-85.0+build1/mfbt/ArrayUtils.h
--- firefox-84.0.2+build1/mfbt/ArrayUtils.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/ArrayUtils.h	2021-01-18 19:58:17.000000000 +0000
@@ -14,18 +14,22 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 
-#include <algorithm>
 #include <stddef.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
+#  include <algorithm>
 #  include <type_traits>
 
 #  include "mozilla/Alignment.h"
-#  include "mozilla/Array.h"
-#  include "mozilla/EnumeratedArray.h"
 
 namespace mozilla {
 
+template <typename T, size_t Length>
+class Array;
+template <typename IndexType, IndexType SizeAsEnumValue, typename ValueType>
+class EnumeratedArray;
+
 /*
  * Safely subtract two pointers when it is known that aEnd >= aBegin, yielding a
  * size_t result.
diff -Nru firefox-84.0.2+build1/mfbt/AtomicBitfields.h firefox-85.0+build1/mfbt/AtomicBitfields.h
--- firefox-84.0.2+build1/mfbt/AtomicBitfields.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/AtomicBitfields.h	2021-01-18 19:58:18.000000000 +0000
@@ -49,9 +49,9 @@
 // |aBitFieldsSize|, so specifying the size is just to prevent accidentally
 // making the storage bigger.
 //
-// Each field will get a Get$NAME and Set$Name method which will atomically
+// Each field will get a Load$NAME and Store$Name method which will atomically
 // load and store the requested value with a Sequentially Consistent memory
-// order (to be on the safe side). Setting a field requires a compare-exchange,
+// order (to be on the safe side). Storing a field requires a compare-exchange,
 // so a thread may get stalled if there's a lot of contention on the bitfields.
 //
 //
@@ -91,7 +91,7 @@
 //     int32_t aNormalInteger;
 //
 //     explicit MyType(uint32_t aSomeData): aNormalInteger(7) {
-//       SetSomeData(aSomeData);
+//       StoreSomeData(aSomeData);
 //       // Other bitfields were already default initialized to 0/false
 //     }
 //   };
@@ -100,9 +100,9 @@
 //   int main() {
 //     MyType val(3);
 //
-//     if (!val.GetIsDownloaded()) {
-//       val.SetOtherData(2);
-//       val.SetIsDownloaded(true);
+//     if (!val.LoadIsDownloaded()) {
+//       val.StoreOtherData(2);
+//       val.StoreIsDownloaded(true);
 //     }
 //   }
 //
@@ -134,22 +134,22 @@
 //     MOZ_ATOMIC_BITFIELDS doesn't support signed payloads");
 //     // ...and so on
 //
-//     // Getters/Setters for all the fields.
+//     // Load/Store methods for all the fields.
 //
-//     bool GetIsDownloaded() { ... }
-//     void SetIsDownloaded(bool aValue) { ... }
+//     bool LoadIsDownloaded() { ... }
+//     void StoreIsDownloaded(bool aValue) { ... }
 //
-//     uint32_t GetSomeData() { ... }
-//     void SetSomeData(uint32_t aValue) { ... }
+//     uint32_t LoadSomeData() { ... }
+//     void StoreSomeData(uint32_t aValue) { ... }
 //
-//     uint8_t GetOtherData() { ... }
-//     void SetOtherData(uint8_t aValue) { ... }
+//     uint8_t LoadOtherData() { ... }
+//     void StoreOtherData(uint8_t aValue) { ... }
 //
 //
 //     // Remainder of the struct body continues normally.
 //     int32_t aNormalInteger;
 //     explicit MyType(uint32_t aSomeData): aNormalInteger(7) {
-//       SetSomeData(aSomeData);
+//       StoreSomeData(aSomeData);
 //       // Other bitfields were already default initialized to 0/false.
 //     }
 //   }
@@ -161,7 +161,7 @@
 //
 // ==================== FIXMES / FUTURE WORK ==================================
 //
-// * It would be nice if GetField could be IsField for booleans.
+// * It would be nice if LoadField could be IsField for booleans.
 //
 // * For the case of setting something to all 1's or 0's, we can use
 //   |fetch_or| or |fetch_and| instead of |compare_exchange_weak|. Is this
@@ -214,14 +214,14 @@
 // We need to disable this with coverity because it doesn't like checking that
 // booleans are < 2 (because they always are).
 #ifdef __COVERITY__
-#  define MOZ_ATOMIC_BITFIELDS_SET_GUARD(aValue, aFieldSize)
+#  define MOZ_ATOMIC_BITFIELDS_STORE_GUARD(aValue, aFieldSize)
 #else
-#  define MOZ_ATOMIC_BITFIELDS_SET_GUARD(aValue, aFieldSize) \
-    MOZ_ASSERT(((uint64_t)aValue) < (1ull << aFieldSize),    \
+#  define MOZ_ATOMIC_BITFIELDS_STORE_GUARD(aValue, aFieldSize) \
+    MOZ_ASSERT(((uint64_t)aValue) < (1ull << aFieldSize),      \
                "Stored value exceeded capacity of bitfield!")
 #endif
 
-// Generates the Get and Set methods for each field.
+// Generates the Load and Store methods for each field.
 //
 // Some comments here because inline macro comments are a pain in the neck:
 //
@@ -238,7 +238,7 @@
 //
 // BITMATH EXPLAINED:
 //
-// For |Get$Name|:
+// For |Load$Name|:
 //
 //    mask = ((1 << fieldSize) - 1) << offset
 //
@@ -253,7 +253,7 @@
 // up to an integer type.
 //
 //
-// For |Set$Name|:
+// For |Store$Name|:
 //
 //    packedValue = (resizedValue << offset) & mask
 //
@@ -290,7 +290,7 @@
   static_assert(std::is_unsigned<aFieldType>(), #aBitfields                \
                 ": MOZ_ATOMIC_BITFIELDS doesn't support signed payloads"); \
                                                                            \
-  aFieldType MOZ_CONCAT(Get, aFieldName)() const {                         \
+  aFieldType MOZ_CONCAT(Load, aFieldName)() const {                        \
     uint##aBitfieldsSize##_t fieldSize, mask, masked, value;               \
     size_t offset = MOZ_CONCAT(aBitfields, aFieldName);                    \
     fieldSize = aFieldSize;                                                \
@@ -300,8 +300,8 @@
     return value;                                                          \
   }                                                                        \
                                                                            \
-  void MOZ_CONCAT(Set, aFieldName)(aFieldType aValue) {                    \
-    MOZ_ATOMIC_BITFIELDS_SET_GUARD(aValue, aFieldSize);                    \
+  void MOZ_CONCAT(Store, aFieldName)(aFieldType aValue) {                  \
+    MOZ_ATOMIC_BITFIELDS_STORE_GUARD(aValue, aFieldSize);                  \
     uint##aBitfieldsSize##_t fieldSize, mask, resizedValue, packedValue,   \
         oldValue, clearedValue, newValue;                                  \
     size_t offset = MOZ_CONCAT(aBitfields, aFieldName);                    \
diff -Nru firefox-84.0.2+build1/mfbt/Buffer.h firefox-85.0+build1/mfbt/Buffer.h
--- firefox-84.0.2+build1/mfbt/Buffer.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Buffer.h	2021-01-18 19:58:17.000000000 +0000
@@ -5,9 +5,10 @@
 #ifndef mozilla_Buffer_h
 #define mozilla_Buffer_h
 
-#include <algorithm>
+#include <cstddef>
 #include <iterator>
 
+#include "mozilla/Assertions.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Span.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/mfbt/BufferList.h firefox-85.0+build1/mfbt/BufferList.h
--- firefox-84.0.2+build1/mfbt/BufferList.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/BufferList.h	2021-01-18 19:58:18.000000000 +0000
@@ -7,17 +7,14 @@
 #ifndef mozilla_BufferList_h
 #define mozilla_BufferList_h
 
-#include <string.h>
-
 #include <algorithm>
-#include <type_traits>
-#include <utility>
+#include <cstdint>
+#include <cstring>
 
-#include "mozilla/AllocPolicy.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/Types.h"
 #include "mozilla/Vector.h"
 
 // BufferList represents a sequence of buffers of data. A BufferList can choose
@@ -276,12 +273,12 @@
       size_t offset = 0;
 
       MOZ_ASSERT(aTarget.IsIn(aBuffers));
+      MOZ_ASSERT(mSegment <= aTarget.mSegment);
 
       char* data = mData;
-      for (uintptr_t segment = mSegment; segment < aTarget.mSegment;
-           segment++) {
+      for (uintptr_t segment = mSegment; segment < aTarget.mSegment;) {
         offset += aBuffers.mSegments[segment].End() - data;
-        data = aBuffers.mSegments[segment].mData;
+        data = aBuffers.mSegments[++segment].mData;
       }
 
       MOZ_RELEASE_ASSERT(IsIn(aBuffers));
diff -Nru firefox-84.0.2+build1/mfbt/CompactPair.h firefox-85.0+build1/mfbt/CompactPair.h
--- firefox-84.0.2+build1/mfbt/CompactPair.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/CompactPair.h	2021-01-18 19:58:17.000000000 +0000
@@ -222,6 +222,14 @@
       std::forward<A>(aA), std::forward<B>(aB));
 }
 
+/**
+ * CompactPair equality comparison
+ */
+template <typename A, typename B>
+bool operator==(const CompactPair<A, B>& aLhs, const CompactPair<A, B>& aRhs) {
+  return aLhs.first() == aRhs.first() && aLhs.second() == aRhs.second();
+}
+
 }  // namespace mozilla
 
 namespace std {
diff -Nru firefox-84.0.2+build1/mfbt/Compression.h firefox-85.0+build1/mfbt/Compression.h
--- firefox-84.0.2+build1/mfbt/Compression.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Compression.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,7 +11,7 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Types.h"
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Span.h"
 #include "mozilla/UniquePtr.h"
 
diff -Nru firefox-84.0.2+build1/mfbt/DoublyLinkedList.h firefox-85.0+build1/mfbt/DoublyLinkedList.h
--- firefox-84.0.2+build1/mfbt/DoublyLinkedList.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/DoublyLinkedList.h	2021-01-18 19:58:18.000000000 +0000
@@ -10,7 +10,9 @@
 #define mozilla_DoublyLinkedList_h
 
 #include <algorithm>
+#include <iosfwd>
 #include <iterator>
+#include <type_traits>
 
 #include "mozilla/Assertions.h"
 
diff -Nru firefox-84.0.2+build1/mfbt/FloatingPoint.h firefox-85.0+build1/mfbt/FloatingPoint.h
--- firefox-84.0.2+build1/mfbt/FloatingPoint.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/FloatingPoint.h	2021-01-18 19:58:18.000000000 +0000
@@ -17,9 +17,9 @@
 #include "mozilla/Types.h"
 
 #include <algorithm>
+#include <climits>
 #include <limits>
 #include <stdint.h>
-#include <type_traits>
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/mfbt/LinkedList.h firefox-85.0+build1/mfbt/LinkedList.h
--- firefox-84.0.2+build1/mfbt/LinkedList.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/LinkedList.h	2021-01-18 19:58:17.000000000 +0000
@@ -64,6 +64,7 @@
 #ifndef mozilla_LinkedList_h
 #define mozilla_LinkedList_h
 
+#include <algorithm>
 #include <utility>
 
 #include "mozilla/Assertions.h"
diff -Nru firefox-84.0.2+build1/mfbt/Maybe.h firefox-85.0+build1/mfbt/Maybe.h
--- firefox-84.0.2+build1/mfbt/Maybe.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Maybe.h	2021-01-18 19:58:17.000000000 +0000
@@ -471,7 +471,9 @@
 
   /* Returns the contents of this Maybe<T> by value. Unsafe unless |isSome()|.
    */
-  constexpr T value() const;
+  constexpr T value() const&;
+  constexpr T value() &&;
+  constexpr T value() const&&;
 
   /**
    * Move the contents of this Maybe<T> out of internal storage and return it
@@ -562,8 +564,10 @@
   constexpr const T* operator->() const;
 
   /* Returns the contents of this Maybe<T> by ref. Unsafe unless |isSome()|. */
-  constexpr T& ref();
-  constexpr const T& ref() const;
+  constexpr T& ref() &;
+  constexpr const T& ref() const&;
+  constexpr T&& ref() &&;
+  constexpr const T&& ref() const&&;
 
   /*
    * Returns the contents of this Maybe<T> by ref. If |isNothing()|, returns
@@ -603,8 +607,10 @@
     return aFunc();
   }
 
-  constexpr T& operator*();
-  constexpr const T& operator*() const;
+  constexpr T& operator*() &;
+  constexpr const T& operator*() const&;
+  constexpr T&& operator*() &&;
+  constexpr const T&& operator*() const&&;
 
   /* If |isSome()|, runs the provided function or functor on the contents of
    * this Maybe. */
@@ -755,12 +761,24 @@
 };
 
 template <typename T>
-constexpr T Maybe<T>::value() const {
+constexpr T Maybe<T>::value() const& {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return ref();
 }
 
 template <typename T>
+constexpr T Maybe<T>::value() && {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(ref());
+}
+
+template <typename T>
+constexpr T Maybe<T>::value() const&& {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(ref());
+}
+
+template <typename T>
 T* Maybe<T>::ptr() {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return &ref();
@@ -785,30 +803,54 @@
 }
 
 template <typename T>
-constexpr T& Maybe<T>::ref() {
+constexpr T& Maybe<T>::ref() & {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return mStorage.val;
 }
 
 template <typename T>
-constexpr const T& Maybe<T>::ref() const {
+constexpr const T& Maybe<T>::ref() const& {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return mStorage.val;
 }
 
 template <typename T>
-constexpr T& Maybe<T>::operator*() {
+constexpr T&& Maybe<T>::ref() && {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(mStorage.val);
+}
+
+template <typename T>
+constexpr const T&& Maybe<T>::ref() const&& {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(mStorage.val);
+}
+
+template <typename T>
+constexpr T& Maybe<T>::operator*() & {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return ref();
 }
 
 template <typename T>
-constexpr const T& Maybe<T>::operator*() const {
+constexpr const T& Maybe<T>::operator*() const& {
   MOZ_DIAGNOSTIC_ASSERT(isSome());
   return ref();
 }
 
 template <typename T>
+constexpr T&& Maybe<T>::operator*() && {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(ref());
+}
+
+template <typename T>
+constexpr const T&& Maybe<T>::operator*() const&& {
+  MOZ_DIAGNOSTIC_ASSERT(isSome());
+  return std::move(ref());
+}
+
+template <typename T>
 template <typename... Args>
 constexpr void Maybe<T>::emplace(Args&&... aArgs) {
   MOZ_DIAGNOSTIC_ASSERT(!isSome());
@@ -839,6 +881,11 @@
 }
 
 template <typename T>
+constexpr Maybe<T&> ToMaybeRef(T* const aPtr) {
+  return aPtr ? SomeRef(*aPtr) : Nothing{};
+}
+
+template <typename T>
 Maybe<std::remove_cv_t<std::remove_reference_t<T>>> ToMaybe(T* aPtr) {
   if (aPtr) {
     return Some(*aPtr);
diff -Nru firefox-84.0.2+build1/mfbt/moz.build firefox-85.0+build1/mfbt/moz.build
--- firefox-84.0.2+build1/mfbt/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -74,6 +74,7 @@
     "NotNull.h",
     "Opaque.h",
     "OperatorNewExtensions.h",
+    "PairHash.h",
     "Path.h",
     "PodOperations.h",
     "Poison.h",
@@ -87,6 +88,7 @@
     "RefPtr.h",
     "Result.h",
     "ResultExtensions.h",
+    "ResultVariant.h",
     "ReverseIterator.h",
     "RollingMean.h",
     "Saturate.h",
@@ -169,8 +171,6 @@
 
 if CONFIG["MOZ_BUILD_APP"] not in (
     "memory",
-    "tools/crashreporter",
-    "tools/update-packaging",
     "tools/update-programs",
 ):
     # Building MFBT tests adds a large overhead when building.
diff -Nru firefox-84.0.2+build1/mfbt/PairHash.h firefox-85.0+build1/mfbt/PairHash.h
--- firefox-84.0.2+build1/mfbt/PairHash.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mfbt/PairHash.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,75 @@
+/* -*- 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/. */
+
+/* Utilities for hashing pairs. */
+
+#ifndef mozilla_PairHash_h
+#define mozilla_PairHash_h
+
+#include "mozilla/CompactPair.h"
+#include "mozilla/HashFunctions.h"
+
+#include <utility>  // std::pair
+
+namespace mozilla {
+
+/**
+ * The HashPair overloads below do just what you'd expect.
+ *
+ * These functions support hash of std::pair<T,U> and mozilla::CompactPair<T,u>
+ * where type T and U both support AddToHash.
+ */
+template <typename U, typename V>
+MOZ_MUST_USE inline HashNumber HashPair(const std::pair<U, V>& pair) {
+  // Pair hash combines the hash of each member
+  return HashGeneric(pair.first, pair.second);
+}
+
+template <typename U, typename V>
+MOZ_MUST_USE inline HashNumber HashCompactPair(const CompactPair<U, V>& pair) {
+  // Pair hash combines the hash of each member
+  return HashGeneric(pair.first(), pair.second());
+}
+
+/**
+ * Hash policy for std::pair compatible with HashTable
+ */
+template <typename T, typename U>
+struct PairHasher {
+  using Key = std::pair<T, U>;
+  using Lookup = Key;
+
+  static HashNumber hash(const Lookup& aLookup) { return HashPair(aLookup); }
+
+  static bool match(const Key& aKey, const Lookup& aLookup) {
+    return aKey == aLookup;
+  }
+
+  static void rekey(Key& aKey, const Key& aNewKey) { aKey = aNewKey; }
+};
+
+/**
+ * Hash policy for mozilla::CompactPair compatible with HashTable
+ */
+template <typename T, typename U>
+struct CompactPairHasher {
+  using Key = CompactPair<T, U>;
+  using Lookup = Key;
+
+  static HashNumber hash(const Lookup& aLookup) {
+    return HashCompactPair(aLookup);
+  }
+
+  static bool match(const Key& aKey, const Lookup& aLookup) {
+    return aKey == aLookup;
+  }
+
+  static void rekey(Key& aKey, const Key& aNewKey) { aKey = aNewKey; }
+};
+
+}  // namespace mozilla
+
+#endif /* mozilla_PairHash_h */
diff -Nru firefox-84.0.2+build1/mfbt/PodOperations.h firefox-85.0+build1/mfbt/PodOperations.h
--- firefox-84.0.2+build1/mfbt/PodOperations.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/PodOperations.h	2021-01-18 19:58:18.000000000 +0000
@@ -15,16 +15,17 @@
 #ifndef mozilla_PodOperations_h
 #define mozilla_PodOperations_h
 
-#include "mozilla/Array.h"
-#include "mozilla/ArrayUtils.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 
-#include <algorithm>
 #include <stdint.h>
 #include <string.h>
 
 namespace mozilla {
 
+template <typename T, size_t Length>
+class Array;
+
 template <typename T>
 class NotNull;
 
diff -Nru firefox-84.0.2+build1/mfbt/RefPtr.h firefox-85.0+build1/mfbt/RefPtr.h
--- firefox-84.0.2+build1/mfbt/RefPtr.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/RefPtr.h	2021-01-18 19:58:18.000000000 +0000
@@ -565,6 +565,17 @@
 
 namespace mozilla {
 
+template <typename T>
+class AlignmentFinder;
+
+// Provide a specialization of AlignmentFinder to allow MOZ_ALIGNOF(RefPtr<T>)
+// with an incomplete T.
+template <typename T>
+class AlignmentFinder<RefPtr<T>> {
+ public:
+  static const size_t alignment = alignof(T*);
+};
+
 /**
  * Helper function to be able to conveniently write things like:
  *
diff -Nru firefox-84.0.2+build1/mfbt/Result.h firefox-85.0+build1/mfbt/Result.h
--- firefox-84.0.2+build1/mfbt/Result.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Result.h	2021-01-18 19:58:18.000000000 +0000
@@ -13,12 +13,9 @@
 #include <cstdint>
 #include <cstring>
 #include <type_traits>
-#include "mozilla/Alignment.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CompactPair.h"
-#include "mozilla/Types.h"
-#include "mozilla/Variant.h"
 
 namespace mozilla {
 
@@ -49,53 +46,28 @@
 template <typename V, typename E, PackingStrategy Strategy>
 class ResultImplementation;
 
-template <typename V, typename E>
-class ResultImplementation<V, E, PackingStrategy::Variant> {
-  mozilla::Variant<V, E> mStorage;
+// The purpose of AlignedStorageOrEmpty is to make an empty class look like
+// std::aligned_storage_t for the purposes of the PackingStrategy::NullIsOk
+// specializations of ResultImplementation below. We can't use
+// std::aligned_storage_t itself with an empty class, since it would no longer
+// be empty.
+template <typename V, bool IsEmpty = std::is_empty_v<V>>
+struct AlignedStorageOrEmpty;
 
- public:
-  ResultImplementation(ResultImplementation&&) = default;
-  ResultImplementation(const ResultImplementation&) = delete;
-  ResultImplementation& operator=(const ResultImplementation&) = delete;
-  ResultImplementation& operator=(ResultImplementation&&) = default;
-
-  explicit ResultImplementation(V&& aValue)
-      : mStorage(std::forward<V>(aValue)) {}
-  explicit ResultImplementation(const V& aValue) : mStorage(aValue) {}
-  template <typename... Args>
-  explicit ResultImplementation(std::in_place_t, Args&&... aArgs)
-      : mStorage(VariantType<V>{}, std::forward<Args>(aArgs)...) {}
-
-  explicit ResultImplementation(const E& aErrorValue) : mStorage(aErrorValue) {}
-  explicit ResultImplementation(E&& aErrorValue)
-      : mStorage(std::forward<E>(aErrorValue)) {}
-
-  bool isOk() const { return mStorage.template is<V>(); }
-
-  // The callers of these functions will assert isOk() has the proper value, so
-  // these functions (in all ResultImplementation specializations) don't need
-  // to do so.
-  V unwrap() { return std::move(mStorage.template as<V>()); }
-  const V& inspect() const { return mStorage.template as<V>(); }
-
-  E unwrapErr() { return std::move(mStorage.template as<E>()); }
-  const E& inspectErr() const { return mStorage.template as<E>(); }
-};
-
-// The purpose of EmptyWrapper is to make an empty class look like
-// AlignedStorage2 for the purposes of the PackingStrategy::NullIsOk
-// specializations of ResultImplementation below. We can't use AlignedStorage2
-// itself with an empty class, since it would no longer be empty, and we want to
-// avoid changing AlignedStorage2 just for this purpose.
 template <typename V>
-struct EmptyWrapper : V {
-  const V* addr() const { return this; }
-  V* addr() { return this; }
+struct AlignedStorageOrEmpty<V, true> : V {
+  constexpr V* addr() { return this; }
+  constexpr const V* addr() const { return this; }
 };
 
 template <typename V>
-using AlignedStorageOrEmpty =
-    std::conditional_t<std::is_empty_v<V>, EmptyWrapper<V>, AlignedStorage2<V>>;
+struct AlignedStorageOrEmpty<V, false> {
+  V* addr() { return reinterpret_cast<V*>(&mData); }
+  const V* addr() const { return reinterpret_cast<const V*>(&mData); }
+
+ private:
+  std::aligned_storage_t<sizeof(V), alignof(V)> mData;
+};
 
 template <typename V, typename E>
 class ResultImplementationNullIsOkBase {
@@ -171,7 +143,7 @@
   const V& inspect() const { return *mValue.first().addr(); }
   V unwrap() { return std::move(*mValue.first().addr()); }
 
-  const E& inspectErr() const {
+  decltype(auto) inspectErr() const {
     return UnusedZero<E>::Inspect(mValue.second());
   }
   E unwrapErr() { return UnusedZero<E>::Unwrap(mValue.second()); }
@@ -349,6 +321,34 @@
   static const bool value = false;
 };
 
+// This template can be used as a helper for specializing UnusedZero for scoped
+// enum types which never use 0 as an error value, e.g.
+//
+// namespace mozilla::detail {
+//
+// template <>
+// struct UnusedZero<MyEnumType> : UnusedZeroEnum<MyEnumType> {};
+//
+// }  // namespace mozilla::detail
+//
+template <typename T>
+struct UnusedZeroEnum {
+  using StorageType = std::underlying_type_t<T>;
+
+  static constexpr bool value = true;
+  static constexpr StorageType nullValue = 0;
+
+  static constexpr T Inspect(const StorageType& aValue) {
+    return static_cast<T>(aValue);
+  }
+  static constexpr T Unwrap(StorageType aValue) {
+    return static_cast<T>(aValue);
+  }
+  static constexpr StorageType Store(T aValue) {
+    return static_cast<StorageType>(aValue);
+  }
+};
+
 // A bit of help figuring out which of the above specializations to use.
 //
 // We begin by safely assuming types don't have a spare bit, unless they are
@@ -379,13 +379,12 @@
   static const PackingStrategy value =
       (HasFreeLSB<V>::value && HasFreeLSB<E>::value)
           ? PackingStrategy::LowBitTagIsError
-          : (UnusedZero<E>::value && sizeof(E) <= sizeof(uintptr_t))
-                ? PackingStrategy::NullIsOk
-                : (std::is_default_constructible_v<V> &&
-                   std::is_default_constructible_v<E> &&
-                   IsPackableVariant<V, E>::value)
-                      ? PackingStrategy::PackedVariant
-                      : PackingStrategy::Variant;
+      : (UnusedZero<E>::value && sizeof(E) <= sizeof(uintptr_t))
+          ? PackingStrategy::NullIsOk
+      : (std::is_default_constructible_v<V> &&
+         std::is_default_constructible_v<E> && IsPackableVariant<V, E>::value)
+          ? PackingStrategy::PackedVariant
+          : PackingStrategy::Variant;
 
   using Type = ResultImplementation<V, E, value>;
 };
diff -Nru firefox-84.0.2+build1/mfbt/ResultVariant.h firefox-85.0+build1/mfbt/ResultVariant.h
--- firefox-84.0.2+build1/mfbt/ResultVariant.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mfbt/ResultVariant.h	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,52 @@
+/* -*- 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/. */
+
+/* A type suitable for returning either a value or an error from a function. */
+
+#ifndef mozilla_ResultVariant_h
+#define mozilla_ResultVariant_h
+
+#include "mozilla/Result.h"
+#include "mozilla/Variant.h"
+
+namespace mozilla::detail {
+
+template <typename V, typename E>
+class ResultImplementation<V, E, PackingStrategy::Variant> {
+  mozilla::Variant<V, E> mStorage;
+
+ public:
+  ResultImplementation(ResultImplementation&&) = default;
+  ResultImplementation(const ResultImplementation&) = delete;
+  ResultImplementation& operator=(const ResultImplementation&) = delete;
+  ResultImplementation& operator=(ResultImplementation&&) = default;
+
+  explicit ResultImplementation(V&& aValue)
+      : mStorage(std::forward<V>(aValue)) {}
+  explicit ResultImplementation(const V& aValue) : mStorage(aValue) {}
+  template <typename... Args>
+  explicit ResultImplementation(std::in_place_t, Args&&... aArgs)
+      : mStorage(VariantType<V>{}, std::forward<Args>(aArgs)...) {}
+
+  explicit ResultImplementation(const E& aErrorValue) : mStorage(aErrorValue) {}
+  explicit ResultImplementation(E&& aErrorValue)
+      : mStorage(std::forward<E>(aErrorValue)) {}
+
+  bool isOk() const { return mStorage.template is<V>(); }
+
+  // The callers of these functions will assert isOk() has the proper value, so
+  // these functions (in all ResultImplementation specializations) don't need
+  // to do so.
+  V unwrap() { return std::move(mStorage.template as<V>()); }
+  const V& inspect() const { return mStorage.template as<V>(); }
+
+  E unwrapErr() { return std::move(mStorage.template as<E>()); }
+  const E& inspectErr() const { return mStorage.template as<E>(); }
+};
+
+}  // namespace mozilla::detail
+
+#endif  // mozilla_ResultVariant_h
diff -Nru firefox-84.0.2+build1/mfbt/SmallPointerArray.h firefox-85.0+build1/mfbt/SmallPointerArray.h
--- firefox-84.0.2+build1/mfbt/SmallPointerArray.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/SmallPointerArray.h	2021-01-18 19:58:17.000000000 +0000
@@ -13,7 +13,7 @@
 #include "mozilla/PodOperations.h"
 
 #include <algorithm>
-#include <iterator>
+#include <cstddef>
 #include <new>
 #include <vector>
 
diff -Nru firefox-84.0.2+build1/mfbt/Span.h firefox-85.0+build1/mfbt/Span.h
--- firefox-84.0.2+build1/mfbt/Span.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Span.h	2021-01-18 19:58:17.000000000 +0000
@@ -22,22 +22,25 @@
 #ifndef mozilla_Span_h
 #define mozilla_Span_h
 
-#include <algorithm>
 #include <array>
+#include <cstddef>
+#include <cstdint>
 #include <iterator>
 #include <limits>
 #include <string>
 #include <type_traits>
 #include <utility>
 
-#include "mozilla/Array.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
-#include "mozilla/IntegerTypeTraits.h"
 #include "mozilla/UniquePtr.h"
 
 namespace mozilla {
 
+template <typename T, size_t Length>
+class Array;
+
 // Stuff from gsl_util
 
 // narrow_cast(): a searchable way to do narrowing casts of values
diff -Nru firefox-84.0.2+build1/mfbt/SPSCQueue.h firefox-85.0+build1/mfbt/SPSCQueue.h
--- firefox-84.0.2+build1/mfbt/SPSCQueue.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/SPSCQueue.h	2021-01-18 19:58:17.000000000 +0000
@@ -14,9 +14,11 @@
 #include "mozilla/PodOperations.h"
 #include <algorithm>
 #include <atomic>
-#include <cstdint>
+#include <cstddef>
+#include <limits>
 #include <memory>
 #include <thread>
+#include <type_traits>
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/mfbt/Tainting.h firefox-85.0+build1/mfbt/Tainting.h
--- firefox-84.0.2+build1/mfbt/Tainting.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Tainting.h	2021-01-18 19:58:18.000000000 +0000
@@ -113,7 +113,7 @@
  * then the value is considered valid.
  *
  * This file contains documentation and examples for the functions;
- * more usage examples are present in mfbt/tests/TestTainting.cpp
+ * more usage examples are present in mfbt/tests/gtest/TestTainting.cpp
  */
 
 /*
@@ -268,6 +268,45 @@
                                           : alternate_value)
 
 /*
+ * MOZ_FIND_AND_VALIDATE is for testing validity of a tainted value by comparing
+ * it against a list of known safe values. Returns a pointer to the matched
+ * safe value or nullptr if none was found.
+ *
+ * Note that for the comparison the macro will loop over the list and that the
+ * current element being tested against is provided as list_item.
+ *
+ * Example:
+ *
+ * Tainted<int> aId;
+ * NSTArray<Person> list;
+ * const Person* foo = MOZ_FIND_AND_VALIDATE(aId, list_item.id == aId, list);
+ *
+ * // Typically you would do nothing if invalid data is passed:
+ * if (MOZ_UNLIKELY(!foo)) {
+ *     return;
+ * }
+ *
+ * // Or alternately you can crash on invalid data
+ * MOZ_RELEASE_ASSERT(foo != nullptr, "Invalid person id sent from content
+ * process.");
+ *
+ * Arguments:
+ *  tainted_value - the name of the Tainted<> variable
+ *  condition - a condition involving the tainted value and list_item
+ *  validation_list - a list of known safe values to compare against
+ */
+#define MOZ_FIND_AND_VALIDATE(tainted_value, condition, validation_list) \
+  [&]() {                                                                \
+    auto& tmp = tainted_value.Coerce();                                  \
+    auto& tainted_value = tmp;                                           \
+    const auto macro_find_it =                                           \
+        std::find_if(validation_list.cbegin(), validation_list.cend(),   \
+                     [&](const auto& list_item) { return condition; });  \
+    return macro_find_it != validation_list.cend() ? &*macro_find_it     \
+                                                   : nullptr;            \
+  }()
+
+/*
  * MOZ_NO_VALIDATE allows unsafe removal of the Taint wrapper.
  * A justification string is required to explain why this is acceptable.
  *
diff -Nru firefox-84.0.2+build1/mfbt/tests/gtest/moz.build firefox-85.0+build1/mfbt/tests/gtest/moz.build
--- firefox-84.0.2+build1/mfbt/tests/gtest/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/gtest/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -9,6 +9,7 @@
     "TestLinkedList.cpp",
     "TestReverseIterator.cpp",
     "TestSpan.cpp",
+    "TestTainting.cpp",
 ]
 
 SOURCES += [
@@ -25,7 +26,7 @@
     ]
 
 # LOCAL_INCLUDES += [
-#    '../../base',
+#    "../../base",
 # ]
 
 FINAL_LIBRARY = "xul-gtest"
diff -Nru firefox-84.0.2+build1/mfbt/tests/gtest/TestAlgorithm.cpp firefox-85.0+build1/mfbt/tests/gtest/TestAlgorithm.cpp
--- firefox-84.0.2+build1/mfbt/tests/gtest/TestAlgorithm.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/gtest/TestAlgorithm.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include "mozilla/Algorithm.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 
 #include <iterator>
 #include <vector>
diff -Nru firefox-84.0.2+build1/mfbt/tests/gtest/TestTainting.cpp firefox-85.0+build1/mfbt/tests/gtest/TestTainting.cpp
--- firefox-84.0.2+build1/mfbt/tests/gtest/TestTainting.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/gtest/TestTainting.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,484 @@
+/* -*- 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 "gtest/gtest.h"
+#include <math.h>
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Range.h"
+#include "mozilla/Tainting.h"
+#include "nsTHashtable.h"
+#include "nsHashKeys.h"
+#include "nsTArray.h"
+#include <array>
+#include <deque>
+#include <forward_list>
+#include <list>
+#include <map>
+#include <set>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
+using mozilla::Tainted;
+
+#define EXPECTED_INT 10
+#define EXPECTED_CHAR 'z'
+
+static bool externalFunction(int arg) { return arg > 2; }
+
+// ==================================================================
+// MOZ_VALIDATE_AND_GET =============================================
+TEST(Tainting, moz_validate_and_get)
+{
+  int bar;
+  int comparisonVariable = 20;
+  Tainted<int> foo = Tainted<int>(EXPECTED_INT);
+
+  bar = MOZ_VALIDATE_AND_GET(foo, foo < 20);
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // This test is for comparison to an external variable, testing the
+  // default capture mode of the lambda used inside the macro.
+  bar = MOZ_VALIDATE_AND_GET(foo, foo < comparisonVariable);
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  bar = MOZ_VALIDATE_AND_GET(
+      foo, foo < 20,
+      "foo must be less than 20 because higher values represent decibel"
+      "levels greater than a a jet engine inside your ear.");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // Test an external variable with a comment.
+  bar = MOZ_VALIDATE_AND_GET(foo, foo < comparisonVariable, "Test comment");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // Test an external function with a comment.
+  bar = MOZ_VALIDATE_AND_GET(foo, externalFunction(foo), "Test comment");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // Lambda Tests
+  bar =
+      MOZ_VALIDATE_AND_GET(foo, ([&foo]() { return externalFunction(foo); }()));
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // This test is for the lambda variant with a supplied assertion
+  // string.
+  bar =
+      MOZ_VALIDATE_AND_GET(foo, ([&foo]() { return externalFunction(foo); }()),
+                           "This tests a comment");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // This test is for the lambda variant with a captured variable
+  bar = MOZ_VALIDATE_AND_GET(foo, ([&foo, &comparisonVariable] {
+                               bool intermediateResult = externalFunction(foo);
+                               return intermediateResult ||
+                                      comparisonVariable < 4;
+                             }()),
+                             "This tests a comment");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // This test is for the lambda variant with full capture mode
+  bar = MOZ_VALIDATE_AND_GET(foo, ([&] {
+                               bool intermediateResult = externalFunction(foo);
+                               return intermediateResult ||
+                                      comparisonVariable < 4;
+                             }()),
+                             "This tests a comment");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // External lambdas
+  auto lambda1 = [](int foo) { return externalFunction(foo); };
+
+  auto lambda2 = [&](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  // Test with an explicit capture
+  auto lambda3 = [&comparisonVariable](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  bar = MOZ_VALIDATE_AND_GET(foo, lambda1(foo));
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // Test with a comment
+  bar = MOZ_VALIDATE_AND_GET(foo, lambda1(foo), "Test comment.");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // Test with a default capture mode
+  bar = MOZ_VALIDATE_AND_GET(foo, lambda2(foo), "Test comment.");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  bar = MOZ_VALIDATE_AND_GET(foo, lambda3(foo), "Test comment.");
+  ASSERT_EQ(bar, EXPECTED_INT);
+
+  // We can't test MOZ_VALIDATE_AND_GET failing, because that triggers
+  // a release assert.
+}
+
+// ==================================================================
+// MOZ_IS_VALID =====================================================
+TEST(Tainting, moz_is_valid)
+{
+  int comparisonVariable = 20;
+  Tainted<int> foo = Tainted<int>(EXPECTED_INT);
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, foo < 20));
+
+  ASSERT_FALSE(MOZ_IS_VALID(foo, foo > 20));
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, foo < comparisonVariable));
+
+  ASSERT_TRUE(
+      MOZ_IS_VALID(foo, ([&foo]() { return externalFunction(foo); }())));
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, ([&foo, &comparisonVariable]() {
+                             bool intermediateResult = externalFunction(foo);
+                             return intermediateResult ||
+                                    comparisonVariable < 4;
+                           }())));
+
+  // External lambdas
+  auto lambda1 = [](int foo) { return externalFunction(foo); };
+
+  auto lambda2 = [&](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  // Test with an explicit capture
+  auto lambda3 = [&comparisonVariable](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, lambda1(foo)));
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, lambda2(foo)));
+
+  ASSERT_TRUE(MOZ_IS_VALID(foo, lambda3(foo)));
+}
+
+// ==================================================================
+// MOZ_VALIDATE_OR ==================================================
+TEST(Tainting, moz_validate_or)
+{
+  int result;
+  int comparisonVariable = 20;
+  Tainted<int> foo = Tainted<int>(EXPECTED_INT);
+
+  result = MOZ_VALIDATE_OR(foo, foo < 20, 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  result = MOZ_VALIDATE_OR(foo, foo > 20, 100);
+  ASSERT_EQ(result, 100);
+
+  result = MOZ_VALIDATE_OR(foo, foo < comparisonVariable, 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  // External lambdas
+  auto lambda1 = [](int foo) { return externalFunction(foo); };
+
+  auto lambda2 = [&](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  // Test with an explicit capture
+  auto lambda3 = [&comparisonVariable](int foo) {
+    bool intermediateResult = externalFunction(foo);
+    return intermediateResult || comparisonVariable < 4;
+  };
+
+  result = MOZ_VALIDATE_OR(foo, lambda1(foo), 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  result = MOZ_VALIDATE_OR(foo, lambda2(foo), 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  result = MOZ_VALIDATE_OR(foo, lambda3(foo), 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  result =
+      MOZ_VALIDATE_OR(foo, ([&foo]() { return externalFunction(foo); }()), 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  // This test is for the lambda variant with a supplied assertion
+  // string.
+  result =
+      MOZ_VALIDATE_OR(foo, ([&foo] { return externalFunction(foo); }()), 100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  // This test is for the lambda variant with a captured variable
+  result =
+      MOZ_VALIDATE_OR(foo, ([&foo, &comparisonVariable] {
+                        bool intermediateResult = externalFunction(foo);
+                        return intermediateResult || comparisonVariable < 4;
+                      }()),
+                      100);
+  ASSERT_EQ(result, EXPECTED_INT);
+
+  // This test is for the lambda variant with full capture mode
+  result =
+      MOZ_VALIDATE_OR(foo, ([&] {
+                        bool intermediateResult = externalFunction(foo);
+                        return intermediateResult || comparisonVariable < 4;
+                      }()),
+                      100);
+  ASSERT_EQ(result, EXPECTED_INT);
+}
+
+// ==================================================================
+// MOZ_FIND_AND_VALIDATE ============================================
+TEST(Tainting, moz_find_and_validate)
+{
+  Tainted<int> foo = Tainted<int>(EXPECTED_INT);
+  Tainted<char> baz = Tainted<char>(EXPECTED_CHAR);
+
+  //-------------------------------
+  const mozilla::Array<int, 6> mozarrayWithFoo(0, 5, EXPECTED_INT, 15, 20, 25);
+  const mozilla::Array<int, 5> mozarrayWithoutFoo(0, 5, 15, 20, 25);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, mozarrayWithFoo) ==
+              mozarrayWithFoo[2]);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo,
+                                    mozarrayWithoutFoo) == nullptr);
+
+  //-------------------------------
+  class TestClass {
+   public:
+    int a;
+    int b;
+
+    TestClass(int a, int b) {
+      this->a = a;
+      this->b = b;
+    }
+
+    bool operator==(const TestClass& other) const {
+      return this->a == other.a && this->b == other.b;
+    }
+  };
+
+  const mozilla::Array<TestClass, 5> mozarrayOfClassesWithFoo(
+      TestClass(0, 1), TestClass(2, 3), TestClass(EXPECTED_INT, EXPECTED_INT),
+      TestClass(4, 5), TestClass(6, 7));
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(
+                  foo, foo == list_item.a && foo == list_item.b,
+                  mozarrayOfClassesWithFoo) == mozarrayOfClassesWithFoo[2]);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(
+                  foo, (foo == list_item.a && foo == list_item.b),
+                  mozarrayOfClassesWithFoo) == mozarrayOfClassesWithFoo[2]);
+
+  ASSERT_TRUE(
+      *MOZ_FIND_AND_VALIDATE(
+          foo,
+          (foo == list_item.a && foo == list_item.b && externalFunction(foo)),
+          mozarrayOfClassesWithFoo) == mozarrayOfClassesWithFoo[2]);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(
+                  foo, ([](int tainted_val, TestClass list_item) {
+                    return tainted_val == list_item.a &&
+                           tainted_val == list_item.b;
+                  }(foo, list_item)),
+                  mozarrayOfClassesWithFoo) == mozarrayOfClassesWithFoo[2]);
+
+  auto lambda4 = [](int tainted_val, TestClass list_item) {
+    return tainted_val == list_item.a && tainted_val == list_item.b;
+  };
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, lambda4(foo, list_item),
+                                     mozarrayOfClassesWithFoo) ==
+              mozarrayOfClassesWithFoo[2]);
+
+  //-------------------------------
+  const char m[] = "m";
+  const char o[] = "o";
+  const char z[] = {EXPECTED_CHAR, '\0'};
+  const char l[] = "l";
+  const char a[] = "a";
+
+  nsTHashtable<nsCharPtrHashKey> hashtableWithBaz;
+  hashtableWithBaz.PutEntry(m);
+  hashtableWithBaz.PutEntry(o);
+  hashtableWithBaz.PutEntry(z);
+  hashtableWithBaz.PutEntry(l);
+  hashtableWithBaz.PutEntry(a);
+  nsTHashtable<nsCharPtrHashKey> hashtableWithoutBaz;
+  hashtableWithoutBaz.PutEntry(m);
+  hashtableWithoutBaz.PutEntry(o);
+  hashtableWithoutBaz.PutEntry(l);
+  hashtableWithoutBaz.PutEntry(a);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(baz, *list_item.GetKey() == baz,
+                                    hashtableWithBaz) ==
+              hashtableWithBaz.GetEntry(z));
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(baz, *list_item.GetKey() == baz,
+                                    hashtableWithoutBaz) == nullptr);
+
+  //-------------------------------
+  const nsTArray<int> nsTArrayWithFoo = {0, 5, EXPECTED_INT, 15, 20, 25};
+  const nsTArray<int> nsTArrayWithoutFoo = {0, 5, 15, 20, 25};
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, nsTArrayWithFoo) ==
+              nsTArrayWithFoo[2]);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo,
+                                    nsTArrayWithoutFoo) == nullptr);
+
+  //-------------------------------
+  const std::array<int, 6> arrayWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::array<int, 5> arrayWithoutFoo{0, 5, 15, 20, 25};
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, arrayWithFoo) ==
+              arrayWithFoo[2]);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, arrayWithoutFoo) ==
+              nullptr);
+
+  //-------------------------------
+  const std::deque<int> dequeWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::deque<int> dequeWithoutFoo{0, 5, 15, 20, 25};
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, dequeWithFoo) ==
+              dequeWithFoo[2]);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, dequeWithoutFoo) ==
+              nullptr);
+
+  //-------------------------------
+  const std::forward_list<int> forwardWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::forward_list<int> forwardWithoutFoo{0, 5, 15, 20, 25};
+
+  auto forwardListIt = forwardWithFoo.begin();
+  std::advance(forwardListIt, 2);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, forwardWithFoo) ==
+              *forwardListIt);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, forwardWithoutFoo) ==
+              nullptr);
+
+  //-------------------------------
+  const std::list<int> listWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::list<int> listWithoutFoo{0, 5, 15, 20, 25};
+
+  auto listIt = listWithFoo.begin();
+  std::advance(listIt, 2);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, listWithFoo) ==
+              *listIt);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, listWithoutFoo) ==
+              nullptr);
+
+  //-------------------------------
+  const std::map<std::string, int> mapWithFoo{{
+      {"zero", 0},
+      {"five", 5},
+      {"ten", EXPECTED_INT},
+      {"fifteen", 15},
+      {"twenty", 20},
+      {"twenty-five", 25},
+  }};
+  const std::map<std::string, int> mapWithoutFoo{{
+      {"zero", 0},
+      {"five", 5},
+      {"fifteen", 15},
+      {"twenty", 20},
+      {"twenty-five", 25},
+  }};
+
+  const auto map_it = mapWithFoo.find("ten");
+
+  ASSERT_TRUE(
+      MOZ_FIND_AND_VALIDATE(foo, list_item.second == foo, mapWithFoo)->second ==
+      map_it->second);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item.second == foo,
+                                    mapWithoutFoo) == nullptr);
+
+  //-------------------------------
+  const std::set<int> setWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::set<int> setWithoutFoo{0, 5, 15, 20, 25};
+
+  auto setIt = setWithFoo.find(EXPECTED_INT);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, setWithFoo) ==
+              *setIt);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, setWithoutFoo) ==
+              nullptr);
+
+  //-------------------------------
+  const std::unordered_map<std::string, int> unordermapWithFoo = {
+      {"zero", 0},     {"five", 5},    {"ten", EXPECTED_INT},
+      {"fifteen", 15}, {"twenty", 20}, {"twenty-five", 25},
+  };
+  const std::unordered_map<std::string, int> unordermapWithoutFoo{{
+      {"zero", 0},
+      {"five", 5},
+      {"fifteen", 15},
+      {"twenty", 20},
+      {"twenty-five", 25},
+  }};
+
+  auto unorderedMapIt = unordermapWithFoo.find("ten");
+
+  ASSERT_TRUE(
+      MOZ_FIND_AND_VALIDATE(foo, list_item.second == foo, unordermapWithFoo)
+          ->second == unorderedMapIt->second);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item.second == foo,
+                                    unordermapWithoutFoo) == nullptr);
+
+  //-------------------------------
+  const std::unordered_set<int> unorderedsetWithFoo{0,  5,  EXPECTED_INT,
+                                                    15, 20, 25};
+  const std::unordered_set<int> unorderedsetWithoutFoo{0, 5, 15, 20, 25};
+
+  auto unorderedSetIt = unorderedsetWithFoo.find(EXPECTED_INT);
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo,
+                                     unorderedsetWithFoo) == *unorderedSetIt);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo,
+                                    unorderedsetWithoutFoo) == nullptr);
+
+  //-------------------------------
+  const std::vector<int> vectorWithFoo{0, 5, EXPECTED_INT, 15, 20, 25};
+  const std::vector<int> vectorWithoutFoo{0, 5, 15, 20, 25};
+
+  ASSERT_TRUE(*MOZ_FIND_AND_VALIDATE(foo, list_item == foo, vectorWithFoo) ==
+              vectorWithFoo[2]);
+
+  ASSERT_TRUE(MOZ_FIND_AND_VALIDATE(foo, list_item == foo, vectorWithoutFoo) ==
+              nullptr);
+}
+
+// ==================================================================
+// MOZ_NO_VALIDATE ==================================================
+TEST(Tainting, moz_no_validate)
+{
+  int result;
+  Tainted<int> foo = Tainted<int>(EXPECTED_INT);
+
+  result = MOZ_NO_VALIDATE(
+      foo,
+      "Value is used to match against a dictionary key in the parent."
+      "If there's no key present, there won't be a match."
+      "There is no risk of grabbing a cross-origin value from the dictionary,"
+      "because the IPC actor is instatiated per-content-process and the "
+      "dictionary is not shared between actors.");
+  ASSERT_TRUE(result == EXPECTED_INT);
+}
diff -Nru firefox-84.0.2+build1/mfbt/tests/moz.build firefox-85.0+build1/mfbt/tests/moz.build
--- firefox-84.0.2+build1/mfbt/tests/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -60,7 +60,6 @@
         "TestSmallPointerArray",
         "TestSplayTree",
         "TestSPSCQueue",
-        "TestTainting",
         "TestTemplateLib",
         "TestTextUtils",
         "TestThreadSafeWeakPtr",
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestAlgorithm.cpp firefox-85.0+build1/mfbt/tests/TestAlgorithm.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestAlgorithm.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestAlgorithm.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -7,13 +7,15 @@
 #include "mozilla/Algorithm.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
+
 #include <iterator>
 
 static constexpr bool even(int32_t n) { return !(n & 1); }
 static constexpr bool odd(int32_t n) { return (n & 1); }
 
+using namespace mozilla;
+
 void TestAllOf() {
-  using namespace mozilla;
   using std::begin;
   using std::end;
 
@@ -36,7 +38,31 @@
   static_assert(!AllOf(arr3, arr3 + ArrayLength(arr3), odd), "3-2");
 }
 
+void TestAnyOf() {
+  using std::begin;
+  using std::end;
+
+  // The Android NDK's STL doesn't support `constexpr` `std::array::begin`, see
+  // bug 1677484. Hence using a raw array here.
+  constexpr int32_t arr1[1] = {0};
+  static_assert(!AnyOf(arr1, arr1, even));
+  static_assert(!AnyOf(arr1, arr1, odd));
+
+  constexpr int32_t arr2[] = {1};
+  static_assert(!AnyOf(begin(arr2), end(arr2), even));
+  static_assert(AnyOf(begin(arr2), end(arr2), odd));
+
+  constexpr int32_t arr3[] = {2};
+  static_assert(AnyOf(begin(arr3), end(arr3), even));
+  static_assert(!AnyOf(begin(arr3), end(arr3), odd));
+
+  constexpr int32_t arr4[] = {1, 2};
+  static_assert(AnyOf(begin(arr4), end(arr4), even));
+  static_assert(AnyOf(begin(arr4), end(arr4), odd));
+}
+
 int main() {
   TestAllOf();
+  TestAnyOf();
   return 0;
 }
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestAtomicBitfields.cpp firefox-85.0+build1/mfbt/tests/TestAtomicBitfields.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestAtomicBitfields.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestAtomicBitfields.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -37,7 +37,7 @@
   int32_t aNormalInteger;
 
   explicit MyType(uint32_t aSomeData) : aNormalInteger(7) {
-    SetSomeData(aSomeData);
+    StoreSomeData(aSomeData);
     // Other bitfields were already default initialized to 0/false
   }
 };
@@ -45,9 +45,9 @@
 void TestDocumentationExample() {
   MyType val(3);
 
-  if (!val.GetIsDownloaded()) {
-    val.SetOtherData(2);
-    val.SetIsDownloaded(true);
+  if (!val.LoadIsDownloaded()) {
+    val.StoreOtherData(2);
+    val.StoreIsDownloaded(true);
   }
 }
 
@@ -65,12 +65,12 @@
       (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, \
        21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32))
 
-#define CHECK_BOOL(aIndex)                    \
-  MOZ_ASSERT(val.GetFlag##aIndex() == false); \
-  val.SetFlag##aIndex(true);                  \
-  MOZ_ASSERT(val.GetFlag##aIndex() == true);  \
-  val.SetFlag##aIndex(false);                 \
-  MOZ_ASSERT(val.GetFlag##aIndex() == false);
+#define CHECK_BOOL(aIndex)                     \
+  MOZ_ASSERT(val.LoadFlag##aIndex() == false); \
+  val.StoreFlag##aIndex(true);                 \
+  MOZ_ASSERT(val.LoadFlag##aIndex() == true);  \
+  val.StoreFlag##aIndex(false);                \
+  MOZ_ASSERT(val.LoadFlag##aIndex() == false);
 
 #define GENERATE_TEST_JAMMED_WITH_FLAGS(aSize) \
   void TestJammedWithFlags##aSize() {          \
@@ -85,28 +85,28 @@
 #define GENERATE_TEST_LOPSIDED_FUNC(aSide, aSize)          \
   void TestLopsided##aSide##aSize() {                      \
     Lopsided##aSide##aSize val;                            \
-    MOZ_ASSERT(val.GetHappyLittleBit() == false);          \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == 0);            \
-    val.SetHappyLittleBit(true);                           \
-    MOZ_ASSERT(val.GetHappyLittleBit() == true);           \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == 0);            \
-    val.SetLargeAndInCharge(1);                            \
-    MOZ_ASSERT(val.GetHappyLittleBit() == true);           \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == 1);            \
-    val.SetLargeAndInCharge(0);                            \
-    MOZ_ASSERT(val.GetHappyLittleBit() == true);           \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == 0);            \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == false);         \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == 0);           \
+    val.StoreHappyLittleBit(true);                         \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == true);          \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == 0);           \
+    val.StoreLargeAndInCharge(1);                          \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == true);          \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == 1);           \
+    val.StoreLargeAndInCharge(0);                          \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == true);          \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == 0);           \
     uint##aSize##_t size = aSize;                          \
     uint##aSize##_t int_max = (~(1ull << (size - 1))) - 1; \
-    val.SetLargeAndInCharge(int_max);                      \
-    MOZ_ASSERT(val.GetHappyLittleBit() == true);           \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == int_max);      \
-    val.SetHappyLittleBit(false);                          \
-    MOZ_ASSERT(val.GetHappyLittleBit() == false);          \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == int_max);      \
-    val.SetLargeAndInCharge(int_max);                      \
-    MOZ_ASSERT(val.GetHappyLittleBit() == false);          \
-    MOZ_ASSERT(val.GetLargeAndInCharge() == int_max);      \
+    val.StoreLargeAndInCharge(int_max);                    \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == true);          \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == int_max);     \
+    val.StoreHappyLittleBit(false);                        \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == false);         \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == int_max);     \
+    val.StoreLargeAndInCharge(int_max);                    \
+    MOZ_ASSERT(val.LoadHappyLittleBit() == false);         \
+    MOZ_ASSERT(val.LoadLargeAndInCharge() == int_max);     \
   }
 
 #define GENERATE_TEST_LOPSIDED(aSize)                                        \
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestBufferList.cpp firefox-85.0+build1/mfbt/tests/TestBufferList.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestBufferList.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestBufferList.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -303,5 +303,69 @@
   MOZ_RELEASE_ASSERT(bl11.ReadBytes(iter, data, 16));
   MOZ_RELEASE_ASSERT(memcmp(data, "abcdefgh12345678", 16) == 0);
 
+  // RangeLength.
+
+  BufferList bl12(0, 0, 8);
+  MOZ_ALWAYS_TRUE(bl12.WriteBytes("abcdefgh", 8));
+  MOZ_ALWAYS_TRUE(bl12.WriteBytes("12345678", 8));
+
+  // |iter| is at position 0 (1st segment).
+  iter = bl12.Iter();
+  iter1 = bl12.Iter();
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 0);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 4);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 8);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 12);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 3));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 15);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(iter1.Done());
+
+  // |iter| is at position 1 (1st segment).
+  iter = bl12.Iter();
+  iter1 = bl12.Iter();
+  MOZ_RELEASE_ASSERT(iter.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 0);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 4);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 8);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 12);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 2));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 14);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(iter1.Done());
+
+  // |iter| is at position 8 (2nd segment).
+  iter = bl12.Iter();
+  iter1 = bl12.Iter();
+  MOZ_RELEASE_ASSERT(iter.AdvanceAcrossSegments(bl12, 8));
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 8));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 0);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 4);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 3));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 7);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(iter1.Done());
+
+  // |iter| is at position 9 (2nd segment).
+  iter = bl12.Iter();
+  iter1 = bl12.Iter();
+  MOZ_RELEASE_ASSERT(iter.AdvanceAcrossSegments(bl12, 9));
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 9));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 0);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 4));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 4);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 2));
+  MOZ_RELEASE_ASSERT(bl12.RangeLength(iter, iter1) == 6);
+  MOZ_RELEASE_ASSERT(iter1.AdvanceAcrossSegments(bl12, 1));
+  MOZ_RELEASE_ASSERT(iter1.Done());
+
   return 0;
 }
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestCheckedInt.cpp firefox-85.0+build1/mfbt/tests/TestCheckedInt.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestCheckedInt.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestCheckedInt.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -490,28 +490,27 @@
   // Check that construction of CheckedInt from an integer value of a
   // mismatched type is checked Also check casting between all types.
 
-#define VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U, V, PostVExpr)       \
-  {                                                                   \
-    bool isUSigned = std::is_signed_v<U>;                             \
-    VERIFY_IS_VALID(CheckedInt<T>(V(0) PostVExpr));                   \
-    VERIFY_IS_VALID(CheckedInt<T>(V(1) PostVExpr));                   \
-    VERIFY_IS_VALID(CheckedInt<T>(V(100) PostVExpr));                 \
-    if (isUSigned) {                                                  \
-      VERIFY_IS_VALID_IF(CheckedInt<T>(V(-1) PostVExpr), isTSigned);  \
-    }                                                                 \
-    if (sizeof(U) > sizeof(T)) {                                      \
-      VERIFY_IS_INVALID(CheckedInt<T>(                                \
-          V(std::numeric_limits<T>::max()) PostVExpr + one.value())); \
-    }                                                                 \
-    VERIFY_IS_VALID_IF(                                               \
-        CheckedInt<T>(std::numeric_limits<U>::max()),                 \
-        (sizeof(T) > sizeof(U) ||                                     \
-         ((sizeof(T) == sizeof(U)) && (isUSigned || !isTSigned))));   \
-    VERIFY_IS_VALID_IF(                                               \
-        CheckedInt<T>(std::numeric_limits<U>::min()),                 \
-        isUSigned == false                                            \
-            ? 1                                                       \
-            : bool(isTSigned) == false ? 0 : sizeof(T) >= sizeof(U)); \
+#define VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U, V, PostVExpr)              \
+  {                                                                          \
+    bool isUSigned = std::is_signed_v<U>;                                    \
+    VERIFY_IS_VALID(CheckedInt<T>(V(0) PostVExpr));                          \
+    VERIFY_IS_VALID(CheckedInt<T>(V(1) PostVExpr));                          \
+    VERIFY_IS_VALID(CheckedInt<T>(V(100) PostVExpr));                        \
+    if (isUSigned) {                                                         \
+      VERIFY_IS_VALID_IF(CheckedInt<T>(V(-1) PostVExpr), isTSigned);         \
+    }                                                                        \
+    if (sizeof(U) > sizeof(T)) {                                             \
+      VERIFY_IS_INVALID(CheckedInt<T>(                                       \
+          V(std::numeric_limits<T>::max()) PostVExpr + one.value()));        \
+    }                                                                        \
+    VERIFY_IS_VALID_IF(                                                      \
+        CheckedInt<T>(std::numeric_limits<U>::max()),                        \
+        (sizeof(T) > sizeof(U) ||                                            \
+         ((sizeof(T) == sizeof(U)) && (isUSigned || !isTSigned))));          \
+    VERIFY_IS_VALID_IF(CheckedInt<T>(std::numeric_limits<U>::min()),         \
+                       isUSigned == false         ? 1                        \
+                       : bool(isTSigned) == false ? 0                        \
+                                                  : sizeof(T) >= sizeof(U)); \
   }
 #define VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE(U)      \
   VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U, U, +zero) \
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestHashTable.cpp firefox-85.0+build1/mfbt/tests/TestHashTable.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestHashTable.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestHashTable.cpp	2021-01-18 19:58:17.000000000 +0000
@@ -5,6 +5,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/HashTable.h"
+#include "mozilla/PairHash.h"
+
+#include <utility>
 
 void TestMoveConstructor() {
   using namespace mozilla;
@@ -44,7 +47,7 @@
   MOZ_RELEASE_ASSERT(map.put(SIMPLE_2, 2));
 
   MOZ_RELEASE_ASSERT(map.lookup(SIMPLE_1)->value() == 1);
-  MOZ_RELEASE_ASSERT(map.lookup(SIMPLE_1)->value() == 2);
+  MOZ_RELEASE_ASSERT(map.lookup(SIMPLE_2)->value() == 2);
 
   HashMap<ClassEnum, int> map2;
   MOZ_RELEASE_ASSERT(map2.put(ClassEnum::CLASS_ENUM_1, 1));
@@ -54,8 +57,47 @@
   MOZ_RELEASE_ASSERT(map2.lookup(ClassEnum::CLASS_ENUM_2)->value() == 2);
 }
 
+void TestHashPair() {
+  using namespace mozilla;
+
+  // Test with std::pair
+  {
+    HashMap<std::pair<int, bool>, int, PairHasher<int, bool>> map;
+    std::pair<int, bool> key1 = std::make_pair(1, true);
+    MOZ_RELEASE_ASSERT(map.putNew(key1, 1));
+    MOZ_RELEASE_ASSERT(map.has(key1));
+    std::pair<int, bool> key2 = std::make_pair(1, false);
+    MOZ_RELEASE_ASSERT(map.putNew(key2, 1));
+    std::pair<int, bool> key3 = std::make_pair(2, false);
+    MOZ_RELEASE_ASSERT(map.putNew(key3, 2));
+    MOZ_RELEASE_ASSERT(map.has(key3));
+
+    MOZ_RELEASE_ASSERT(map.lookup(key1)->value() == 1);
+    MOZ_RELEASE_ASSERT(map.lookup(key2)->value() == 1);
+    MOZ_RELEASE_ASSERT(map.lookup(key3)->value() == 2);
+  }
+  // Test wtih compact pair
+  {
+    HashMap<mozilla::CompactPair<int, bool>, int, CompactPairHasher<int, bool>>
+        map;
+    mozilla::CompactPair<int, bool> key1 = mozilla::MakeCompactPair(1, true);
+    MOZ_RELEASE_ASSERT(map.putNew(key1, 1));
+    MOZ_RELEASE_ASSERT(map.has(key1));
+    mozilla::CompactPair<int, bool> key2 = mozilla::MakeCompactPair(1, false);
+    MOZ_RELEASE_ASSERT(map.putNew(key2, 1));
+    mozilla::CompactPair<int, bool> key3 = mozilla::MakeCompactPair(2, false);
+    MOZ_RELEASE_ASSERT(map.putNew(key3, 2));
+    MOZ_RELEASE_ASSERT(map.has(key3));
+
+    MOZ_RELEASE_ASSERT(map.lookup(key1)->value() == 1);
+    MOZ_RELEASE_ASSERT(map.lookup(key2)->value() == 1);
+    MOZ_RELEASE_ASSERT(map.lookup(key3)->value() == 2);
+  }
+}
+
 int main() {
   TestMoveConstructor();
   TestEnumHash();
+  TestHashPair();
   return 0;
 }
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestMaybe.cpp firefox-85.0+build1/mfbt/tests/TestMaybe.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestMaybe.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestMaybe.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -19,6 +19,7 @@
 using mozilla::Some;
 using mozilla::SomeRef;
 using mozilla::ToMaybe;
+using mozilla::ToMaybeRef;
 
 #define RUN_TEST(t)                                                     \
   do {                                                                  \
@@ -34,11 +35,13 @@
   eWasConstructed,
   eWasCopyConstructed,
   eWasMoveConstructed,
+  eWasConstMoveConstructed,
   eWasAssigned,
   eWasCopyAssigned,
   eWasMoveAssigned,
   eWasCopiedFrom,
   eWasMovedFrom,
+  eWasConstMovedFrom,
 };
 
 static size_t sUndestroyedObjects = 0;
@@ -66,6 +69,12 @@
     aOther.mTag = 0;
   }
 
+  BasicValue(const BasicValue&& aOther)
+      : mStatus(eWasConstMoveConstructed), mTag(aOther.mTag) {
+    ++sUndestroyedObjects;
+    aOther.mStatus = eWasConstMovedFrom;
+  }
+
   ~BasicValue() { --sUndestroyedObjects; }
 
   BasicValue& operator=(const BasicValue& aOther) {
@@ -93,7 +102,7 @@
   int GetTag() const { return mTag; }
 
  private:
-  Status mStatus;
+  mutable Status mStatus;
   int mTag;
 };
 
@@ -240,6 +249,8 @@
   MOZ_RELEASE_ASSERT(mayValue.isSome());
   MOZ_RELEASE_ASSERT(!mayValue.isNothing());
   MOZ_RELEASE_ASSERT(*mayValue == BasicValue());
+  static_assert(std::is_same_v<BasicValue&, decltype(*mayValue)>,
+                "operator*() should return a BasicValue&");
   MOZ_RELEASE_ASSERT(mayValue.value() == BasicValue());
   static_assert(std::is_same_v<BasicValue, decltype(mayValue.value())>,
                 "value() should return a BasicValue");
@@ -288,6 +299,8 @@
   MOZ_RELEASE_ASSERT(mayValueCRef.isSome());
   MOZ_RELEASE_ASSERT(!mayValueCRef.isNothing());
   MOZ_RELEASE_ASSERT(*mayValueCRef == BasicValue());
+  static_assert(std::is_same_v<const BasicValue&, decltype(*mayValueCRef)>,
+                "operator*() should return a BasicValue");
   MOZ_RELEASE_ASSERT(mayValueCRef.value() == BasicValue());
   static_assert(std::is_same_v<BasicValue, decltype(mayValueCRef.value())>,
                 "value() should return a BasicValue");
@@ -314,6 +327,51 @@
   MOZ_RELEASE_ASSERT(mayCValue2.isSome());
   MOZ_RELEASE_ASSERT(*mayCValue2 == BasicValue(6));
 
+  // Check that accessors work through rvalue-references.
+  MOZ_RELEASE_ASSERT(Some(BasicValue()));
+  MOZ_RELEASE_ASSERT(Some(BasicValue()).isSome());
+  MOZ_RELEASE_ASSERT(!Some(BasicValue()).isNothing());
+  MOZ_RELEASE_ASSERT(*Some(BasicValue()) == BasicValue());
+  static_assert(std::is_same_v<BasicValue&&, decltype(*Some(BasicValue()))>,
+                "operator*() should return a BasicValue&&");
+  MOZ_RELEASE_ASSERT(Some(BasicValue()).value() == BasicValue());
+  static_assert(
+      std::is_same_v<BasicValue, decltype(Some(BasicValue()).value())>,
+      "value() should return a BasicValue");
+  MOZ_RELEASE_ASSERT(Some(BasicValue()).ref() == BasicValue());
+  static_assert(
+      std::is_same_v<BasicValue&&, decltype(Some(BasicValue()).ref())>,
+      "ref() should return a BasicValue&&");
+  MOZ_RELEASE_ASSERT(Some(BasicValue()).ptr() != nullptr);
+  static_assert(std::is_same_v<BasicValue*, decltype(Some(BasicValue()).ptr())>,
+                "ptr() should return a BasicValue*");
+  MOZ_RELEASE_ASSERT(Some(BasicValue())->GetStatus() == eWasMoveConstructed);
+
+  // Check that accessors work through const-rvalue-references.
+  auto MakeConstMaybe = []() -> const Maybe<BasicValue> {
+    return Some(BasicValue());
+  };
+  MOZ_RELEASE_ASSERT(MakeConstMaybe());
+  MOZ_RELEASE_ASSERT(MakeConstMaybe().isSome());
+  MOZ_RELEASE_ASSERT(!MakeConstMaybe().isNothing());
+  MOZ_RELEASE_ASSERT(*MakeConstMaybe() == BasicValue());
+  static_assert(std::is_same_v<const BasicValue&&, decltype(*MakeConstMaybe())>,
+                "operator*() should return a const BasicValue&&");
+  MOZ_RELEASE_ASSERT(MakeConstMaybe().value() == BasicValue());
+  static_assert(std::is_same_v<BasicValue, decltype(MakeConstMaybe().value())>,
+                "value() should return a BasicValue");
+  MOZ_RELEASE_ASSERT(MakeConstMaybe().ref() == BasicValue());
+  static_assert(
+      std::is_same_v<const BasicValue&&, decltype(MakeConstMaybe().ref())>,
+      "ref() should return a const BasicValue&&");
+  MOZ_RELEASE_ASSERT(MakeConstMaybe().ptr() != nullptr);
+  static_assert(
+      std::is_same_v<const BasicValue*, decltype(MakeConstMaybe().ptr())>,
+      "ptr() should return a const BasicValue*");
+  MOZ_RELEASE_ASSERT(MakeConstMaybe()->GetStatus() == eWasMoveConstructed);
+  MOZ_RELEASE_ASSERT(BasicValue(*MakeConstMaybe()).GetStatus() ==
+                     eWasConstMoveConstructed);
+
   // Check that take works
   mayValue = Some(BasicValue(6));
   Maybe taken = mayValue.take();
@@ -1363,6 +1421,25 @@
     MOZ_RELEASE_ASSERT(!mapped);
   }
 
+  {
+    int foo = 42;
+    auto someRef = ToMaybeRef(&foo);
+
+    static_assert(std::is_same_v<decltype(someRef), Maybe<int&>>);
+
+    MOZ_RELEASE_ASSERT(someRef.isSome());
+    MOZ_RELEASE_ASSERT(&foo == &someRef.ref());
+  }
+
+  {
+    int* fooPtr = nullptr;
+    auto someRef = ToMaybeRef(fooPtr);
+
+    static_assert(std::is_same_v<decltype(someRef), Maybe<int&>>);
+
+    MOZ_RELEASE_ASSERT(someRef.isNothing());
+  }
+
   return true;
 }
 
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestResult.cpp firefox-85.0+build1/mfbt/tests/TestResult.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestResult.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestResult.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -5,7 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <string.h>
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/UniquePtr.h"
 
 using mozilla::Err;
@@ -14,27 +14,11 @@
 using mozilla::Result;
 using mozilla::UniquePtr;
 
-enum struct UnusedZeroEnum : int32_t { Ok = 0, NotOk = 1 };
+enum struct TestUnusedZeroEnum : int16_t { Ok = 0, NotOk = 1 };
 
 namespace mozilla::detail {
 template <>
-struct UnusedZero<UnusedZeroEnum> {
-  using StorageType = UnusedZeroEnum;
-
-  static constexpr bool value = true;
-  static constexpr StorageType nullValue = UnusedZeroEnum::Ok;
-
-  static constexpr StorageType GetDefaultValue() {
-    return UnusedZeroEnum::NotOk;
-  }
-
-  static constexpr void AssertValid(StorageType aValue) {}
-  static constexpr const UnusedZeroEnum& Inspect(const StorageType& aValue) {
-    return aValue;
-  }
-  static constexpr UnusedZeroEnum Unwrap(StorageType aValue) { return aValue; }
-  static constexpr StorageType Store(UnusedZeroEnum aValue) { return aValue; }
-};
+struct UnusedZero<TestUnusedZeroEnum> : UnusedZeroEnum<TestUnusedZeroEnum> {};
 }  // namespace mozilla::detail
 
 struct Failed {};
@@ -64,15 +48,19 @@
 // for a reference type and for a non-reference type
 static_assert(mozilla::detail::SelectResultImpl<uintptr_t, Failed>::value ==
               mozilla::detail::PackingStrategy::NullIsOk);
-static_assert(mozilla::detail::SelectResultImpl<Ok, UnusedZeroEnum>::value ==
-              mozilla::detail::PackingStrategy::NullIsOk);
+static_assert(
+    mozilla::detail::SelectResultImpl<Ok, TestUnusedZeroEnum>::value ==
+    mozilla::detail::PackingStrategy::NullIsOk);
 static_assert(mozilla::detail::SelectResultImpl<Ok, Failed>::value ==
               mozilla::detail::PackingStrategy::LowBitTagIsError);
 
 static_assert(std::is_trivially_destructible_v<Result<uintptr_t, Failed>>);
-static_assert(std::is_trivially_destructible_v<Result<Ok, UnusedZeroEnum>>);
+static_assert(std::is_trivially_destructible_v<Result<Ok, TestUnusedZeroEnum>>);
 static_assert(std::is_trivially_destructible_v<Result<Ok, Failed>>);
 
+static_assert(
+    sizeof(Result<bool, TestUnusedZeroEnum>) <= sizeof(uintptr_t),
+    "Result with bool value type should not be larger than pointer-sized");
 static_assert(sizeof(Result<Ok, Failed>) == sizeof(uint8_t),
               "Result with empty value type should be size 1");
 static_assert(sizeof(Result<int*, Failed>) == sizeof(uintptr_t),
@@ -111,8 +99,8 @@
   return Err(failed);
 }
 
-static GenericErrorResult<UnusedZeroEnum> FailUnusedZeroEnum() {
-  return Err(UnusedZeroEnum::NotOk);
+static GenericErrorResult<TestUnusedZeroEnum> FailTestUnusedZeroEnum() {
+  return Err(TestUnusedZeroEnum::NotOk);
 }
 
 static Result<Ok, Failed> Task1(bool pass) {
@@ -122,10 +110,10 @@
   return Ok();
 }
 
-static Result<Ok, UnusedZeroEnum> Task1UnusedZeroEnumErr(bool pass) {
+static Result<Ok, TestUnusedZeroEnum> Task1UnusedZeroEnumErr(bool pass) {
   if (!pass) {
-    return FailUnusedZeroEnum();  // implicit conversion from GenericErrorResult
-                                  // to Result
+    return FailTestUnusedZeroEnum();  // implicit conversion from
+                                      // GenericErrorResult to Result
   }
   return Ok();
 }
@@ -136,8 +124,8 @@
   return value;      // implicit conversion from T to Result<T, E>
 }
 
-static Result<int, UnusedZeroEnum> Task2UnusedZeroEnumErr(bool pass,
-                                                          int value) {
+static Result<int, TestUnusedZeroEnum> Task2UnusedZeroEnumErr(bool pass,
+                                                              int value) {
   MOZ_TRY(Task1UnusedZeroEnumErr(
       pass));    // converts one type of result to another in the error case
   return value;  // implicit conversion from T to Result<T, E>
@@ -160,9 +148,9 @@
   MOZ_RELEASE_ASSERT(!Task1UnusedZeroEnumErr(true).isErr());
   MOZ_RELEASE_ASSERT(!Task1UnusedZeroEnumErr(false).isOk());
   MOZ_RELEASE_ASSERT(Task1UnusedZeroEnumErr(false).isErr());
-  MOZ_RELEASE_ASSERT(UnusedZeroEnum::NotOk ==
+  MOZ_RELEASE_ASSERT(TestUnusedZeroEnum::NotOk ==
                      Task1UnusedZeroEnumErr(false).inspectErr());
-  MOZ_RELEASE_ASSERT(UnusedZeroEnum::NotOk ==
+  MOZ_RELEASE_ASSERT(TestUnusedZeroEnum::NotOk ==
                      Task1UnusedZeroEnumErr(false).unwrapErr());
 
   // MOZ_TRY works.
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestTainting.cpp firefox-85.0+build1/mfbt/tests/TestTainting.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestTainting.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestTainting.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +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 <math.h>
-
-#include "mozilla/Assertions.h"
-#include "mozilla/Tainting.h"
-
-using mozilla::Tainted;
-
-#define EXPECTED_VALUE 10
-
-static bool externalFunction(int arg) { return arg > 2; }
-
-static void TestTainting() {
-  int bar;
-  Tainted<int> foo = Tainted<int>(EXPECTED_VALUE);
-
-  // ==================================================================
-  // MOZ_VALIDATE_AND_GET =============================================
-
-  bar = MOZ_VALIDATE_AND_GET(foo, foo < 20);
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // This test is for comparison to an external variable, testing the
-  // default capture mode of the lambda used inside the macro.
-  int comparisonVariable = 20;
-  bar = MOZ_VALIDATE_AND_GET(foo, foo < comparisonVariable);
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  bar = MOZ_VALIDATE_AND_GET(
-      foo, foo < 20,
-      "foo must be less than 20 because higher values represent decibel"
-      "levels greater than a a jet engine inside your ear.");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Test an external variable with a comment.
-  bar = MOZ_VALIDATE_AND_GET(foo, foo < comparisonVariable, "Test comment");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Test an external function with a comment.
-  bar = MOZ_VALIDATE_AND_GET(foo, externalFunction(foo), "Test comment");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Lambda Tests
-  bar = MOZ_VALIDATE_AND_GET(foo, ([&foo]() {
-                               bool intermediateResult = externalFunction(foo);
-                               if (intermediateResult) {
-                                 return true;
-                               }
-                               return false;
-                             }()));
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with a supplied assertion
-  // string.
-  bar = MOZ_VALIDATE_AND_GET(foo, ([&foo]() {
-                               bool intermediateResult = externalFunction(foo);
-                               if (intermediateResult) {
-                                 return true;
-                               }
-                               return false;
-                             }()),
-                             "This tests a comment");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with a captured variable
-  bar =
-      MOZ_VALIDATE_AND_GET(foo, ([&foo, &comparisonVariable] {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult || comparisonVariable < 4) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           "This tests a comment");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with full capture mode
-  bar =
-      MOZ_VALIDATE_AND_GET(foo, ([&] {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult || comparisonVariable < 4) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           "This tests a comment");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // External lambdas
-  auto lambda1 = [](int foo) {
-    bool intermediateResult = externalFunction(foo);
-    if (intermediateResult) {
-      return true;
-    }
-    return false;
-  };
-  bar = MOZ_VALIDATE_AND_GET(foo, lambda1(foo));
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Test with a comment
-  bar = MOZ_VALIDATE_AND_GET(foo, lambda1(foo), "Test comment.");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Test with a default capture mode
-  auto lambda2 = [&](int foo) {
-    bool intermediateResult = externalFunction(foo);
-    if (intermediateResult || comparisonVariable < 4) {
-      return true;
-    }
-    return false;
-  };
-  bar = MOZ_VALIDATE_AND_GET(foo, lambda2(foo), "Test comment.");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // Test with an explicit capture
-  auto lambda3 = [&comparisonVariable](int foo) {
-    bool intermediateResult = externalFunction(foo);
-    if (intermediateResult || comparisonVariable < 4) {
-      return true;
-    }
-    return false;
-  };
-  bar = MOZ_VALIDATE_AND_GET(foo, lambda3(foo), "Test comment.");
-  MOZ_RELEASE_ASSERT(bar == EXPECTED_VALUE);
-
-  // We can't test MOZ_VALIDATE_AND_GET failing, because that triggers
-  // a release assert.
-
-  // ==================================================================
-  // MOZ_IS_VALID =====================================================
-  if (MOZ_IS_VALID(foo, foo < 20)) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, foo > 20)) {
-    MOZ_RELEASE_ASSERT(false);
-  } else {
-    MOZ_RELEASE_ASSERT(true);
-  }
-
-  if (MOZ_IS_VALID(foo, foo < comparisonVariable)) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, ([&foo]() {
-                     bool intermediateResult = externalFunction(foo);
-                     if (intermediateResult) {
-                       return true;
-                     }
-                     return false;
-                   }()))) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, ([&foo, &comparisonVariable]() {
-                     bool intermediateResult = externalFunction(foo);
-                     if (intermediateResult || comparisonVariable < 4) {
-                       return true;
-                     }
-                     return false;
-                   }()))) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, lambda1(foo))) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, lambda2(foo))) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  if (MOZ_IS_VALID(foo, lambda3(foo))) {
-    MOZ_RELEASE_ASSERT(true);
-  } else {
-    MOZ_RELEASE_ASSERT(false);
-  }
-
-  // ==================================================================
-  // MOZ_VALIDATE_OR ==================================================
-
-  int result;
-
-  result = MOZ_VALIDATE_OR(foo, foo < 20, 100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  result = MOZ_VALIDATE_OR(foo, foo > 20, 100);
-  MOZ_RELEASE_ASSERT(result == 100);
-
-  result = MOZ_VALIDATE_OR(foo, foo < comparisonVariable, 100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  result = MOZ_VALIDATE_OR(foo, lambda1(foo), 100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  result = MOZ_VALIDATE_OR(foo, lambda2(foo), 100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  result = MOZ_VALIDATE_OR(foo, lambda3(foo), 100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  result = MOZ_VALIDATE_OR(foo, ([&foo]() {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with a supplied assertion
-  // string.
-  result = MOZ_VALIDATE_OR(foo, ([&foo] {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with a captured variable
-  result = MOZ_VALIDATE_OR(foo, ([&foo, &comparisonVariable] {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult || comparisonVariable < 4) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  // This test is for the lambda variant with full capture mode
-  result = MOZ_VALIDATE_OR(foo, ([&] {
-                             bool intermediateResult = externalFunction(foo);
-                             if (intermediateResult || comparisonVariable < 4) {
-                               return true;
-                             }
-                             return false;
-                           }()),
-                           100);
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-
-  // ==================================================================
-  // MOZ_NO_VALIDATE ==================================================
-  result = MOZ_NO_VALIDATE(
-      foo,
-      "Value is used to match against a dictionary key in the parent."
-      "If there's no key present, there won't be a match."
-      "There is no risk of grabbing a cross-origin value from the dictionary,"
-      "because the IPC actor is instatiated per-content-process and the "
-      "dictionary is not shared between actors.");
-  MOZ_RELEASE_ASSERT(result == EXPECTED_VALUE);
-}
-
-int main() {
-  TestTainting();
-
-  return 0;
-}
diff -Nru firefox-84.0.2+build1/mfbt/tests/TestVariant.cpp firefox-85.0+build1/mfbt/tests/TestVariant.cpp
--- firefox-84.0.2+build1/mfbt/tests/TestVariant.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/tests/TestVariant.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,8 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Variant.h"
 
+#include <tuple>
+
 using mozilla::MakeUnique;
 using mozilla::UniquePtr;
 using mozilla::Variant;
@@ -237,7 +239,10 @@
 
 static void testSimple() {
   printf("testSimple\n");
-  Variant<uint32_t, uint64_t> v(uint64_t(1));
+  using V = Variant<uint32_t, uint64_t>;
+
+  // Non-const lvalue.
+  V v(uint64_t(1));
   MOZ_RELEASE_ASSERT(v.is<uint64_t>());
   MOZ_RELEASE_ASSERT(!v.is<uint32_t>());
   MOZ_RELEASE_ASSERT(v.as<uint64_t>() == 1);
@@ -245,8 +250,44 @@
   MOZ_RELEASE_ASSERT(v.is<1>());
   MOZ_RELEASE_ASSERT(!v.is<0>());
   static_assert(std::is_same_v<decltype(v.as<1>()), uint64_t&>,
-                "as<1>() should return a uint64_t");
+                "v.as<1>() should return a uint64_t&");
   MOZ_RELEASE_ASSERT(v.as<1>() == 1);
+
+  // Const lvalue.
+  const V& cv = v;
+  MOZ_RELEASE_ASSERT(cv.is<uint64_t>());
+  MOZ_RELEASE_ASSERT(!cv.is<uint32_t>());
+  MOZ_RELEASE_ASSERT(cv.as<uint64_t>() == 1);
+
+  MOZ_RELEASE_ASSERT(cv.is<1>());
+  MOZ_RELEASE_ASSERT(!cv.is<0>());
+  static_assert(std::is_same_v<decltype(cv.as<1>()), const uint64_t&>,
+                "cv.as<1>() should return a const uint64_t&");
+  MOZ_RELEASE_ASSERT(cv.as<1>() == 1);
+
+  // Non-const rvalue, using a function to create a temporary.
+  auto MakeV = []() { return V(uint64_t(1)); };
+  MOZ_RELEASE_ASSERT(MakeV().is<uint64_t>());
+  MOZ_RELEASE_ASSERT(!MakeV().is<uint32_t>());
+  MOZ_RELEASE_ASSERT(MakeV().as<uint64_t>() == 1);
+
+  MOZ_RELEASE_ASSERT(MakeV().is<1>());
+  MOZ_RELEASE_ASSERT(!MakeV().is<0>());
+  static_assert(std::is_same_v<decltype(MakeV().as<1>()), uint64_t&&>,
+                "MakeV().as<1>() should return a uint64_t&&");
+  MOZ_RELEASE_ASSERT(MakeV().as<1>() == 1);
+
+  // Const rvalue, using a function to create a temporary.
+  auto MakeCV = []() -> const V { return V(uint64_t(1)); };
+  MOZ_RELEASE_ASSERT(MakeCV().is<uint64_t>());
+  MOZ_RELEASE_ASSERT(!MakeCV().is<uint32_t>());
+  MOZ_RELEASE_ASSERT(MakeCV().as<uint64_t>() == 1);
+
+  MOZ_RELEASE_ASSERT(MakeCV().is<1>());
+  MOZ_RELEASE_ASSERT(!MakeCV().is<0>());
+  static_assert(std::is_same_v<decltype(MakeCV().as<1>()), const uint64_t&&>,
+                "MakeCV().as<1>() should return a const uint64_t&&");
+  MOZ_RELEASE_ASSERT(MakeCV().as<1>() == 1);
 }
 
 static void testDuplicate() {
@@ -382,7 +423,8 @@
 
     {
       Variant<char, UniquePtr<char[]>, Destroyer> v1(d);
-      MOZ_RELEASE_ASSERT(Destroyer::destroyedCount == 0);  // None detroyed yet.
+      MOZ_RELEASE_ASSERT(Destroyer::destroyedCount ==
+                         0);  // None destroyed yet.
     }
 
     MOZ_RELEASE_ASSERT(Destroyer::destroyedCount ==
@@ -431,90 +473,249 @@
   MOZ_RELEASE_ASSERT(v6 == v6);
 }
 
+// Matcher that returns a description of how its call-operator was invoked.
 struct Describer {
-  static const char* littleNonConst;
-  static const char* mediumNonConst;
-  static const char* bigNonConst;
-
-  static const char* littleConst;
-  static const char* mediumConst;
-  static const char* bigConst;
-
-  static const char* littleRRef;
-  static const char* mediumRRef;
-  static const char* bigRRef;
-
-  const char* operator()(const uint8_t&) & { return littleNonConst; }
-  const char* operator()(const uint32_t&) & { return mediumNonConst; }
-  const char* operator()(const uint64_t&) & { return bigNonConst; }
-
-  const char* operator()(const uint8_t&) const& { return littleConst; }
-  const char* operator()(const uint32_t&) const& { return mediumConst; }
-  const char* operator()(const uint64_t&) const& { return bigConst; }
-
-  const char* operator()(const uint8_t&) && { return littleRRef; }
-  const char* operator()(const uint32_t&) && { return mediumRRef; }
-  const char* operator()(const uint64_t&) && { return bigRRef; }
+  enum class ParameterSize { NA, U8, U32, U64 };
+  enum class ParameterQualifier {
+    NA,
+    ParamLREF,
+    ParamCLREF,
+    ParamRREF,
+    ParamCRREF
+  };
+  enum class ThisQualifier { NA, ThisLREF, ThisCLREF, ThisRREF, ThisCRREF };
+
+  using Result =
+      std::tuple<ParameterSize, ParameterQualifier, ThisQualifier, uint64_t>;
+
+#define RESULT(SIZE, PQUAL, TQUAL, VALUE)                 \
+  Describer::Result(Describer::ParameterSize::SIZE,       \
+                    Describer::ParameterQualifier::PQUAL, \
+                    Describer::ThisQualifier::TQUAL, VALUE)
+
+#define CALL(TYPE, SIZE, PQUAL, TREF, TQUAL)   \
+  Result operator()(TYPE aValue) TREF {        \
+    return RESULT(SIZE, PQUAL, TQUAL, aValue); \
+  }
+
+  // All combinations of possible call operators:
+  // Every line, the parameter integer type changes.
+  // Every 3 lines, the parameter type changes constness.
+  // Every 6 lines, the parameter changes reference l/r-valueness.
+  // Every 12 lines, the member function qualifier changes constness.
+  // After 24 lines, the member function qualifier changes ref l/r-valueness.
+  CALL(uint8_t&, U8, ParamLREF, &, ThisLREF)
+  CALL(uint32_t&, U32, ParamLREF, &, ThisLREF)
+  CALL(uint64_t&, U64, ParamLREF, &, ThisLREF)
+
+  CALL(const uint8_t&, U8, ParamCLREF, &, ThisLREF)
+  CALL(const uint32_t&, U32, ParamCLREF, &, ThisLREF)
+  CALL(const uint64_t&, U64, ParamCLREF, &, ThisLREF)
+
+  CALL(uint8_t&&, U8, ParamRREF, &, ThisLREF)
+  CALL(uint32_t&&, U32, ParamRREF, &, ThisLREF)
+  CALL(uint64_t&&, U64, ParamRREF, &, ThisLREF)
+
+  CALL(const uint8_t&&, U8, ParamCRREF, &, ThisLREF)
+  CALL(const uint32_t&&, U32, ParamCRREF, &, ThisLREF)
+  CALL(const uint64_t&&, U64, ParamCRREF, &, ThisLREF)
+
+  CALL(uint8_t&, U8, ParamLREF, const&, ThisCLREF)
+  CALL(uint32_t&, U32, ParamLREF, const&, ThisCLREF)
+  CALL(uint64_t&, U64, ParamLREF, const&, ThisCLREF)
+
+  CALL(const uint8_t&, U8, ParamCLREF, const&, ThisCLREF)
+  CALL(const uint32_t&, U32, ParamCLREF, const&, ThisCLREF)
+  CALL(const uint64_t&, U64, ParamCLREF, const&, ThisCLREF)
+
+  CALL(uint8_t&&, U8, ParamRREF, const&, ThisCLREF)
+  CALL(uint32_t&&, U32, ParamRREF, const&, ThisCLREF)
+  CALL(uint64_t&&, U64, ParamRREF, const&, ThisCLREF)
+
+  CALL(const uint8_t&&, U8, ParamCRREF, const&, ThisCLREF)
+  CALL(const uint32_t&&, U32, ParamCRREF, const&, ThisCLREF)
+  CALL(const uint64_t&&, U64, ParamCRREF, const&, ThisCLREF)
+
+  CALL(uint8_t&, U8, ParamLREF, &&, ThisRREF)
+  CALL(uint32_t&, U32, ParamLREF, &&, ThisRREF)
+  CALL(uint64_t&, U64, ParamLREF, &&, ThisRREF)
+
+  CALL(const uint8_t&, U8, ParamCLREF, &&, ThisRREF)
+  CALL(const uint32_t&, U32, ParamCLREF, &&, ThisRREF)
+  CALL(const uint64_t&, U64, ParamCLREF, &&, ThisRREF)
+
+  CALL(uint8_t&&, U8, ParamRREF, &&, ThisRREF)
+  CALL(uint32_t&&, U32, ParamRREF, &&, ThisRREF)
+  CALL(uint64_t&&, U64, ParamRREF, &&, ThisRREF)
+
+  CALL(const uint8_t&&, U8, ParamCRREF, &&, ThisRREF)
+  CALL(const uint32_t&&, U32, ParamCRREF, &&, ThisRREF)
+  CALL(const uint64_t&&, U64, ParamCRREF, &&, ThisRREF)
+
+  CALL(uint8_t&, U8, ParamLREF, const&&, ThisCRREF)
+  CALL(uint32_t&, U32, ParamLREF, const&&, ThisCRREF)
+  CALL(uint64_t&, U64, ParamLREF, const&&, ThisCRREF)
+
+  CALL(const uint8_t&, U8, ParamCLREF, const&&, ThisCRREF)
+  CALL(const uint32_t&, U32, ParamCLREF, const&&, ThisCRREF)
+  CALL(const uint64_t&, U64, ParamCLREF, const&&, ThisCRREF)
+
+  CALL(uint8_t&&, U8, ParamRREF, const&&, ThisCRREF)
+  CALL(uint32_t&&, U32, ParamRREF, const&&, ThisCRREF)
+  CALL(uint64_t&&, U64, ParamRREF, const&&, ThisCRREF)
+
+  CALL(const uint8_t&&, U8, ParamCRREF, const&&, ThisCRREF)
+  CALL(const uint32_t&&, U32, ParamCRREF, const&&, ThisCRREF)
+  CALL(const uint64_t&&, U64, ParamCRREF, const&&, ThisCRREF)
+
+#undef CALL
 
   // Catch-all, to verify that there is no call with any type other than the
   // expected ones above.
   template <typename Other>
-  const char* operator()(const Other&) {
+  Result operator()(const Other&) {
     MOZ_RELEASE_ASSERT(false);
-    return "uh?";
+    return RESULT(NA, NA, NA, 0);
   }
 };
 
-const char* Describer::littleNonConst = "little non-const";
-const char* Describer::mediumNonConst = "medium non-const";
-const char* Describer::bigNonConst = "big non-const";
-
-const char* Describer::littleConst = "little const";
-const char* Describer::mediumConst = "medium const";
-const char* Describer::bigConst = "big const";
-
-const char* Describer::littleRRef = "little rvalue-ref";
-const char* Describer::mediumRRef = "medium rvalue-ref";
-const char* Describer::bigRRef = "big rvalue-ref";
-
 static void testMatching() {
   printf("testMatching\n");
   using V = Variant<uint8_t, uint32_t, uint64_t>;
 
   Describer desc;
   const Describer descConst;
+  auto MakeDescriber = []() { return Describer(); };
+  auto MakeConstDescriber = []() -> const Describer { return Describer(); };
 
   V v1(uint8_t(1));
   V v2(uint32_t(2));
   V v3(uint64_t(3));
 
-  MOZ_RELEASE_ASSERT(v1.match(desc) == Describer::littleNonConst);
-  MOZ_RELEASE_ASSERT(v2.match(desc) == Describer::mediumNonConst);
-  MOZ_RELEASE_ASSERT(v3.match(desc) == Describer::bigNonConst);
-
-  MOZ_RELEASE_ASSERT(v1.match(descConst) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(v2.match(descConst) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(v3.match(descConst) == Describer::bigConst);
-
-  MOZ_RELEASE_ASSERT(v1.match(Describer()) == Describer::littleRRef);
-  MOZ_RELEASE_ASSERT(v2.match(Describer()) == Describer::mediumRRef);
-  MOZ_RELEASE_ASSERT(v3.match(Describer()) == Describer::bigRRef);
-
   const V& constRef1 = v1;
   const V& constRef2 = v2;
   const V& constRef3 = v3;
 
-  MOZ_RELEASE_ASSERT(constRef1.match(desc) == Describer::littleNonConst);
-  MOZ_RELEASE_ASSERT(constRef2.match(desc) == Describer::mediumNonConst);
-  MOZ_RELEASE_ASSERT(constRef3.match(desc) == Describer::bigNonConst);
-
-  MOZ_RELEASE_ASSERT(constRef1.match(descConst) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(constRef2.match(descConst) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(constRef3.match(descConst) == Describer::bigConst);
-
-  MOZ_RELEASE_ASSERT(constRef1.match(Describer()) == Describer::littleRRef);
-  MOZ_RELEASE_ASSERT(constRef2.match(Describer()) == Describer::mediumRRef);
-  MOZ_RELEASE_ASSERT(constRef3.match(Describer()) == Describer::bigRRef);
+  // Create a temporary variant by returning a copy of one.
+  auto CopyV = [](const V& aV) { return aV; };
+
+  // Create a temporary variant by returning a const copy of one.
+  auto CopyConstV = [](const V& aV) -> const V { return aV; };
+
+  // All combinations of possible calls:
+  // Every line, the variant integer type changes.
+  // Every 3 lines, the variant type changes constness.
+  // Every 6 lines, the variant changes reference l/r-valueness.
+  // Every 12 lines, the matcher changes constness.
+  // After 24 lines, the matcher changes ref l/r-valueness.
+  MOZ_RELEASE_ASSERT(v1.match(desc) == RESULT(U8, ParamLREF, ThisLREF, 1));
+  MOZ_RELEASE_ASSERT(v2.match(desc) == RESULT(U32, ParamLREF, ThisLREF, 2));
+  MOZ_RELEASE_ASSERT(v3.match(desc) == RESULT(U64, ParamLREF, ThisLREF, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(desc) ==
+                     RESULT(U8, ParamCLREF, ThisLREF, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(desc) ==
+                     RESULT(U32, ParamCLREF, ThisLREF, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(desc) ==
+                     RESULT(U64, ParamCLREF, ThisLREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(desc) ==
+                     RESULT(U8, ParamRREF, ThisLREF, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(desc) ==
+                     RESULT(U32, ParamRREF, ThisLREF, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(desc) ==
+                     RESULT(U64, ParamRREF, ThisLREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(desc) ==
+                     RESULT(U8, ParamCRREF, ThisLREF, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(desc) ==
+                     RESULT(U32, ParamCRREF, ThisLREF, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(desc) ==
+                     RESULT(U64, ParamCRREF, ThisLREF, 3));
+
+  MOZ_RELEASE_ASSERT(v1.match(descConst) ==
+                     RESULT(U8, ParamLREF, ThisCLREF, 1));
+  MOZ_RELEASE_ASSERT(v2.match(descConst) ==
+                     RESULT(U32, ParamLREF, ThisCLREF, 2));
+  MOZ_RELEASE_ASSERT(v3.match(descConst) ==
+                     RESULT(U64, ParamLREF, ThisCLREF, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(descConst) ==
+                     RESULT(U8, ParamCLREF, ThisCLREF, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(descConst) ==
+                     RESULT(U32, ParamCLREF, ThisCLREF, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(descConst) ==
+                     RESULT(U64, ParamCLREF, ThisCLREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(descConst) ==
+                     RESULT(U8, ParamRREF, ThisCLREF, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(descConst) ==
+                     RESULT(U32, ParamRREF, ThisCLREF, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(descConst) ==
+                     RESULT(U64, ParamRREF, ThisCLREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(descConst) ==
+                     RESULT(U8, ParamCRREF, ThisCLREF, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(descConst) ==
+                     RESULT(U32, ParamCRREF, ThisCLREF, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(descConst) ==
+                     RESULT(U64, ParamCRREF, ThisCLREF, 3));
+
+  MOZ_RELEASE_ASSERT(v1.match(MakeDescriber()) ==
+                     RESULT(U8, ParamLREF, ThisRREF, 1));
+  MOZ_RELEASE_ASSERT(v2.match(MakeDescriber()) ==
+                     RESULT(U32, ParamLREF, ThisRREF, 2));
+  MOZ_RELEASE_ASSERT(v3.match(MakeDescriber()) ==
+                     RESULT(U64, ParamLREF, ThisRREF, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(MakeDescriber()) ==
+                     RESULT(U8, ParamCLREF, ThisRREF, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(MakeDescriber()) ==
+                     RESULT(U32, ParamCLREF, ThisRREF, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(MakeDescriber()) ==
+                     RESULT(U64, ParamCLREF, ThisRREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(MakeDescriber()) ==
+                     RESULT(U8, ParamRREF, ThisRREF, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(MakeDescriber()) ==
+                     RESULT(U32, ParamRREF, ThisRREF, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(MakeDescriber()) ==
+                     RESULT(U64, ParamRREF, ThisRREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(MakeDescriber()) ==
+                     RESULT(U8, ParamCRREF, ThisRREF, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(MakeDescriber()) ==
+                     RESULT(U32, ParamCRREF, ThisRREF, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(MakeDescriber()) ==
+                     RESULT(U64, ParamCRREF, ThisRREF, 3));
+
+  MOZ_RELEASE_ASSERT(v1.match(MakeConstDescriber()) ==
+                     RESULT(U8, ParamLREF, ThisCRREF, 1));
+  MOZ_RELEASE_ASSERT(v2.match(MakeConstDescriber()) ==
+                     RESULT(U32, ParamLREF, ThisCRREF, 2));
+  MOZ_RELEASE_ASSERT(v3.match(MakeConstDescriber()) ==
+                     RESULT(U64, ParamLREF, ThisCRREF, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(MakeConstDescriber()) ==
+                     RESULT(U8, ParamCLREF, ThisCRREF, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(MakeConstDescriber()) ==
+                     RESULT(U32, ParamCLREF, ThisCRREF, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(MakeConstDescriber()) ==
+                     RESULT(U64, ParamCLREF, ThisCRREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(MakeConstDescriber()) ==
+                     RESULT(U8, ParamRREF, ThisCRREF, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(MakeConstDescriber()) ==
+                     RESULT(U32, ParamRREF, ThisCRREF, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(MakeConstDescriber()) ==
+                     RESULT(U64, ParamRREF, ThisCRREF, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(MakeConstDescriber()) ==
+                     RESULT(U8, ParamCRREF, ThisCRREF, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(MakeConstDescriber()) ==
+                     RESULT(U32, ParamCRREF, ThisCRREF, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(MakeConstDescriber()) ==
+                     RESULT(U64, ParamCRREF, ThisCRREF, 3));
 }
 
 static void testMatchingLambda() {
@@ -522,21 +723,42 @@
   using V = Variant<uint8_t, uint32_t, uint64_t>;
 
   // Note: Lambdas' call operators are const by default (unless the lambda is
-  // declared `mutable`), hence the use of "...Const" strings below.
+  // declared `mutable`).
   // There is no need to test mutable lambdas, nor rvalue lambda, because there
   // would be no way to distinguish how each lambda is actually invoked because
   // there is only one choice of call operator in each overload set.
-  auto desc = [](auto& a) {
-    switch (sizeof(a)) {
-      case 1:
-        return Describer::littleConst;
-      case 4:
-        return Describer::mediumConst;
-      case 8:
-        return Describer::bigConst;
-      default:
-        MOZ_RELEASE_ASSERT(false);
-        return "";
+  auto desc = [](auto&& a) {
+    if constexpr (std::is_same_v<decltype(a), uint8_t&>) {
+      return RESULT(U8, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&>) {
+      return RESULT(U8, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint8_t&&>) {
+      return RESULT(U8, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&&>) {
+      return RESULT(U8, ParamCRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&>) {
+      return RESULT(U32, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&>) {
+      return RESULT(U32, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&&>) {
+      return RESULT(U32, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&&>) {
+      return RESULT(U32, ParamCRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&>) {
+      return RESULT(U64, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&>) {
+      return RESULT(U64, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&&>) {
+      return RESULT(U64, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&&>) {
+      return RESULT(U64, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
     }
   };
 
@@ -544,17 +766,34 @@
   V v2(uint32_t(2));
   V v3(uint64_t(3));
 
-  MOZ_RELEASE_ASSERT(v1.match(desc) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(v2.match(desc) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(v3.match(desc) == Describer::bigConst);
-
   const V& constRef1 = v1;
   const V& constRef2 = v2;
   const V& constRef3 = v3;
 
-  MOZ_RELEASE_ASSERT(constRef1.match(desc) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(constRef2.match(desc) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(constRef3.match(desc) == Describer::bigConst);
+  // Create a temporary variant by returning a copy of one.
+  auto CopyV = [](const V& aV) { return aV; };
+
+  // Create a temporary variant by returning a const copy of one.
+  auto CopyConstV = [](const V& aV) -> const V { return aV; };
+
+  MOZ_RELEASE_ASSERT(v1.match(desc) == RESULT(U8, ParamLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(v2.match(desc) == RESULT(U32, ParamLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(v3.match(desc) == RESULT(U64, ParamLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(desc) == RESULT(U8, ParamCLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(desc) == RESULT(U32, ParamCLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(desc) == RESULT(U64, ParamCLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(desc) == RESULT(U8, ParamRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(desc) == RESULT(U32, ParamRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(desc) == RESULT(U64, ParamRREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(desc) ==
+                     RESULT(U8, ParamCRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(desc) ==
+                     RESULT(U32, ParamCRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(desc) ==
+                     RESULT(U64, ParamCRREF, NA, 3));
 }
 
 static void testMatchingLambdaWithIndex() {
@@ -566,21 +805,51 @@
   // There is no need to test mutable lambdas, nor rvalue lambda, because there
   // would be no way to distinguish how each lambda is actually invoked because
   // there is only one choice of call operator in each overload set.
-  auto desc = [](auto aIndex, auto& a) {
+  auto desc = [](auto aIndex, auto&& a) {
     static_assert(sizeof(aIndex) < sizeof(size_t), "Expected small index type");
-    switch (sizeof(a)) {
-      case 1:
-        MOZ_RELEASE_ASSERT(aIndex == 0);
-        return Describer::littleConst;
-      case 4:
-        MOZ_RELEASE_ASSERT(aIndex == 1);
-        return Describer::mediumConst;
-      case 8:
-        MOZ_RELEASE_ASSERT(aIndex == 2);
-        return Describer::bigConst;
-      default:
-        MOZ_RELEASE_ASSERT(false);
-        return "";
+    if constexpr (std::is_same_v<decltype(a), uint8_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 0);
+      return RESULT(U8, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 0);
+      return RESULT(U8, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint8_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 0);
+      return RESULT(U8, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 0);
+      return RESULT(U8, ParamCRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 1);
+      return RESULT(U32, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 1);
+      return RESULT(U32, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 1);
+      return RESULT(U32, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 1);
+      return RESULT(U32, ParamCRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 2);
+      return RESULT(U64, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 2);
+      return RESULT(U64, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 2);
+      return RESULT(U64, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&&>) {
+      MOZ_RELEASE_ASSERT(aIndex == 2);
+      return RESULT(U64, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
     }
   };
 
@@ -588,84 +857,245 @@
   V v2(uint32_t(2));
   V v3(uint64_t(3));
 
-  MOZ_RELEASE_ASSERT(v1.match(desc) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(v2.match(desc) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(v3.match(desc) == Describer::bigConst);
-
   const V& constRef1 = v1;
   const V& constRef2 = v2;
   const V& constRef3 = v3;
 
-  MOZ_RELEASE_ASSERT(constRef1.match(desc) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(constRef2.match(desc) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(constRef3.match(desc) == Describer::bigConst);
+  // Create a temporary variant by returning a copy of one.
+  auto CopyV = [](const V& aV) { return aV; };
+
+  // Create a temporary variant by returning a const copy of one.
+  auto CopyConstV = [](const V& aV) -> const V { return aV; };
+
+  MOZ_RELEASE_ASSERT(v1.match(desc) == RESULT(U8, ParamLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(v2.match(desc) == RESULT(U32, ParamLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(v3.match(desc) == RESULT(U64, ParamLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(constRef1.match(desc) == RESULT(U8, ParamCLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(constRef2.match(desc) == RESULT(U32, ParamCLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(constRef3.match(desc) == RESULT(U64, ParamCLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(desc) == RESULT(U8, ParamRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(desc) == RESULT(U32, ParamRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(desc) == RESULT(U64, ParamRREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(desc) ==
+                     RESULT(U8, ParamCRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(desc) ==
+                     RESULT(U32, ParamCRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(desc) ==
+                     RESULT(U64, ParamCRREF, NA, 3));
 }
 
 static void testMatchingLambdas() {
   printf("testMatchingLambdas\n");
   using V = Variant<uint8_t, uint32_t, uint64_t>;
 
-  auto desc8 = [](const uint8_t& a) { return Describer::littleConst; };
-  auto desc32 = [](const uint32_t& a) { return Describer::mediumConst; };
-  auto desc64 = [](const uint64_t& a) { return Describer::bigConst; };
+  auto desc8 = [](auto&& a) {
+    if constexpr (std::is_same_v<decltype(a), uint8_t&>) {
+      return RESULT(U8, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&>) {
+      return RESULT(U8, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint8_t&&>) {
+      return RESULT(U8, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&&>) {
+      return RESULT(U8, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
+  };
+  auto desc32 = [](auto&& a) {
+    if constexpr (std::is_same_v<decltype(a), uint32_t&>) {
+      return RESULT(U32, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&>) {
+      return RESULT(U32, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&&>) {
+      return RESULT(U32, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&&>) {
+      return RESULT(U32, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
+  };
+  auto desc64 = [](auto&& a) {
+    if constexpr (std::is_same_v<decltype(a), uint64_t&>) {
+      return RESULT(U64, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&>) {
+      return RESULT(U64, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&&>) {
+      return RESULT(U64, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&&>) {
+      return RESULT(U64, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
+  };
 
   V v1(uint8_t(1));
   V v2(uint32_t(2));
   V v3(uint64_t(3));
 
-  MOZ_RELEASE_ASSERT(v1.match(desc8, desc32, desc64) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(v2.match(desc8, desc32, desc64) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(v3.match(desc8, desc32, desc64) == Describer::bigConst);
-
   const V& constRef1 = v1;
   const V& constRef2 = v2;
   const V& constRef3 = v3;
 
+  // Create a temporary variant by returning a copy of one.
+  auto CopyV = [](const V& aV) { return aV; };
+
+  // Create a temporary variant by returning a const copy of one.
+  auto CopyConstV = [](const V& aV) -> const V { return aV; };
+
+  MOZ_RELEASE_ASSERT(v1.match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(v2.match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(v3.match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamLREF, NA, 3));
+
   MOZ_RELEASE_ASSERT(constRef1.match(desc8, desc32, desc64) ==
-                     Describer::littleConst);
+                     RESULT(U8, ParamCLREF, NA, 1));
   MOZ_RELEASE_ASSERT(constRef2.match(desc8, desc32, desc64) ==
-                     Describer::mediumConst);
+                     RESULT(U32, ParamCLREF, NA, 2));
   MOZ_RELEASE_ASSERT(constRef3.match(desc8, desc32, desc64) ==
-                     Describer::bigConst);
+                     RESULT(U64, ParamCLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamRREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamCRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamCRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamCRREF, NA, 3));
 }
 
 static void testMatchingLambdasWithIndex() {
   printf("testMatchingLambdasWithIndex\n");
   using V = Variant<uint8_t, uint32_t, uint64_t>;
 
-  auto desc8 = [](size_t aIndex, const uint8_t& a) {
+  auto desc8 = [](size_t aIndex, auto&& a) {
     MOZ_RELEASE_ASSERT(aIndex == 0);
-    return Describer::littleConst;
+    if constexpr (std::is_same_v<decltype(a), uint8_t&>) {
+      return RESULT(U8, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&>) {
+      return RESULT(U8, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint8_t&&>) {
+      return RESULT(U8, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint8_t&&>) {
+      return RESULT(U8, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
   };
-  auto desc32 = [](size_t aIndex, const uint32_t& a) {
+  auto desc32 = [](size_t aIndex, auto&& a) {
     MOZ_RELEASE_ASSERT(aIndex == 1);
-    return Describer::mediumConst;
+    if constexpr (std::is_same_v<decltype(a), uint32_t&>) {
+      return RESULT(U32, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&>) {
+      return RESULT(U32, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint32_t&&>) {
+      return RESULT(U32, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint32_t&&>) {
+      return RESULT(U32, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
   };
-  auto desc64 = [](size_t aIndex, const uint64_t& a) {
+  auto desc64 = [](size_t aIndex, auto&& a) {
     MOZ_RELEASE_ASSERT(aIndex == 2);
-    return Describer::bigConst;
+    if constexpr (std::is_same_v<decltype(a), uint64_t&>) {
+      return RESULT(U64, ParamLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&>) {
+      return RESULT(U64, ParamCLREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), uint64_t&&>) {
+      return RESULT(U64, ParamRREF, NA, a);
+    } else if constexpr (std::is_same_v<decltype(a), const uint64_t&&>) {
+      return RESULT(U64, ParamCRREF, NA, a);
+    } else {
+      // We don't expect any other type.
+      // Tech note: We can't just do `static_assert(false)` which would always
+      // fail during the initial parsing. So we depend on the templated
+      // parameter to delay computing `false` until actual instantiation.
+      static_assert(sizeof(a) == size_t(-1));
+      return RESULT(NA, NA, NA, 0);
+    }
   };
 
   V v1(uint8_t(1));
   V v2(uint32_t(2));
   V v3(uint64_t(3));
 
-  MOZ_RELEASE_ASSERT(v1.match(desc8, desc32, desc64) == Describer::littleConst);
-  MOZ_RELEASE_ASSERT(v2.match(desc8, desc32, desc64) == Describer::mediumConst);
-  MOZ_RELEASE_ASSERT(v3.match(desc8, desc32, desc64) == Describer::bigConst);
-
   const V& constRef1 = v1;
   const V& constRef2 = v2;
   const V& constRef3 = v3;
 
+  // Create a temporary variant by returning a copy of one.
+  auto CopyV = [](const V& aV) { return aV; };
+
+  // Create a temporary variant by returning a const copy of one.
+  auto CopyConstV = [](const V& aV) -> const V { return aV; };
+
+  MOZ_RELEASE_ASSERT(v1.match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamLREF, NA, 1));
+  MOZ_RELEASE_ASSERT(v2.match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamLREF, NA, 2));
+  MOZ_RELEASE_ASSERT(v3.match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamLREF, NA, 3));
+
   MOZ_RELEASE_ASSERT(constRef1.match(desc8, desc32, desc64) ==
-                     Describer::littleConst);
+                     RESULT(U8, ParamCLREF, NA, 1));
   MOZ_RELEASE_ASSERT(constRef2.match(desc8, desc32, desc64) ==
-                     Describer::mediumConst);
+                     RESULT(U32, ParamCLREF, NA, 2));
   MOZ_RELEASE_ASSERT(constRef3.match(desc8, desc32, desc64) ==
-                     Describer::bigConst);
+                     RESULT(U64, ParamCLREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyV(v1).match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyV(v2).match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyV(v3).match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamRREF, NA, 3));
+
+  MOZ_RELEASE_ASSERT(CopyConstV(v1).match(desc8, desc32, desc64) ==
+                     RESULT(U8, ParamCRREF, NA, 1));
+  MOZ_RELEASE_ASSERT(CopyConstV(v2).match(desc8, desc32, desc64) ==
+                     RESULT(U32, ParamCRREF, NA, 2));
+  MOZ_RELEASE_ASSERT(CopyConstV(v3).match(desc8, desc32, desc64) ==
+                     RESULT(U64, ParamCRREF, NA, 3));
 }
 
+#undef RESULT
+
 static void testAddTagToHash() {
   printf("testAddToHash\n");
   using V = Variant<uint8_t, uint16_t, uint32_t, uint64_t>;
diff -Nru firefox-84.0.2+build1/mfbt/UniquePtr.h firefox-85.0+build1/mfbt/UniquePtr.h
--- firefox-84.0.2+build1/mfbt/UniquePtr.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/UniquePtr.h	2021-01-18 19:58:18.000000000 +0000
@@ -276,9 +276,12 @@
     return *this;
   }
 
-  std::add_lvalue_reference_t<T> operator*() const { return *get(); }
+  std::add_lvalue_reference_t<T> operator*() const {
+    MOZ_ASSERT(get(), "dereferencing a UniquePtr containing nullptr with *");
+    return *get();
+  }
   Pointer operator->() const {
-    MOZ_ASSERT(get(), "dereferencing a UniquePtr containing nullptr");
+    MOZ_ASSERT(get(), "dereferencing a UniquePtr containing nullptr with ->");
     return get();
   }
 
diff -Nru firefox-84.0.2+build1/mfbt/Variant.h firefox-85.0+build1/mfbt/Variant.h
--- firefox-84.0.2+build1/mfbt/Variant.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mfbt/Variant.h	2021-01-18 19:58:17.000000000 +0000
@@ -10,7 +10,6 @@
 #include <stdint.h>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/FunctionTypeTraits.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/OperatorNewExtensions.h"
 #include "mozilla/TemplateLib.h"
@@ -179,22 +178,28 @@
   }
 
   template <typename Matcher, typename ConcreteVariant>
-  static decltype(auto) match(Matcher&& aMatcher, ConcreteVariant& aV) {
+  static decltype(auto) match(Matcher&& aMatcher, ConcreteVariant&& aV) {
     if constexpr (std::is_invocable_v<Matcher, Tag,
-                                      decltype(aV.template as<N>())>) {
-      return std::forward<Matcher>(aMatcher)(Tag(N), aV.template as<N>());
+                                      decltype(std::forward<ConcreteVariant>(aV)
+                                                   .template as<N>())>) {
+      return std::forward<Matcher>(aMatcher)(
+          Tag(N), std::forward<ConcreteVariant>(aV).template as<N>());
     } else {
-      return std::forward<Matcher>(aMatcher)(aV.template as<N>());
+      return std::forward<Matcher>(aMatcher)(
+          std::forward<ConcreteVariant>(aV).template as<N>());
     }
   }
 
   template <typename ConcreteVariant, typename Matcher>
-  static decltype(auto) matchN(ConcreteVariant& aV, Matcher&& aMatcher) {
+  static decltype(auto) matchN(ConcreteVariant&& aV, Matcher&& aMatcher) {
     if constexpr (std::is_invocable_v<Matcher, Tag,
-                                      decltype(aV.template as<N>())>) {
-      return std::forward<Matcher>(aMatcher)(Tag(N), aV.template as<N>());
+                                      decltype(std::forward<ConcreteVariant>(aV)
+                                                   .template as<N>())>) {
+      return std::forward<Matcher>(aMatcher)(
+          Tag(N), std::forward<ConcreteVariant>(aV).template as<N>());
     } else {
-      return std::forward<Matcher>(aMatcher)(aV.template as<N>());
+      return std::forward<Matcher>(aMatcher)(
+          std::forward<ConcreteVariant>(aV).template as<N>());
     }
   }
 };
@@ -248,13 +253,17 @@
   }
 
   template <typename Matcher, typename ConcreteVariant>
-  static decltype(auto) match(Matcher&& aMatcher, ConcreteVariant& aV) {
+  static decltype(auto) match(Matcher&& aMatcher, ConcreteVariant&& aV) {
     if (aV.template is<N>()) {
       if constexpr (std::is_invocable_v<Matcher, Tag,
-                                        decltype(aV.template as<N>())>) {
-        return std::forward<Matcher>(aMatcher)(Tag(N), aV.template as<N>());
+                                        decltype(
+                                            std::forward<ConcreteVariant>(aV)
+                                                .template as<N>())>) {
+        return std::forward<Matcher>(aMatcher)(
+            Tag(N), std::forward<ConcreteVariant>(aV).template as<N>());
       } else {
-        return std::forward<Matcher>(aMatcher)(aV.template as<N>());
+        return std::forward<Matcher>(aMatcher)(
+            std::forward<ConcreteVariant>(aV).template as<N>());
       }
     } else {
       // If you're seeing compilation errors here like "no matching
@@ -266,18 +275,38 @@
       // return object of type <...> with an rvalue of type <...>" then that
       // means that the Matcher::operator()(T&) overloads are returning
       // different types. They must all return the same type.
-      return Next::match(std::forward<Matcher>(aMatcher), aV);
+      return Next::match(std::forward<Matcher>(aMatcher),
+                         std::forward<ConcreteVariant>(aV));
     }
   }
 
   template <typename ConcreteVariant, typename Mi, typename... Ms>
-  static decltype(auto) matchN(ConcreteVariant& aV, Mi&& aMi, Ms&&... aMs) {
+  static decltype(auto) matchN(ConcreteVariant&& aV, Mi&& aMi, Ms&&... aMs) {
     if (aV.template is<N>()) {
       if constexpr (std::is_invocable_v<Mi, Tag,
-                                        decltype(aV.template as<N>())>) {
-        return std::forward<Mi>(aMi)(Tag(N), aV.template as<N>());
+                                        decltype(
+                                            std::forward<ConcreteVariant>(aV)
+                                                .template as<N>())>) {
+        static_assert(
+            std::is_same_v<
+                decltype(std::forward<Mi>(aMi)(
+                    Tag(N),
+                    std::forward<ConcreteVariant>(aV).template as<N>())),
+                decltype(Next::matchN(std::forward<ConcreteVariant>(aV),
+                                      std::forward<Ms>(aMs)...))>,
+            "all matchers must have the same return type");
+        return std::forward<Mi>(aMi)(
+            Tag(N), std::forward<ConcreteVariant>(aV).template as<N>());
       } else {
-        return std::forward<Mi>(aMi)(aV.template as<N>());
+        static_assert(
+            std::is_same_v<
+                decltype(std::forward<Mi>(aMi)(
+                    std::forward<ConcreteVariant>(aV).template as<N>())),
+                decltype(Next::matchN(std::forward<ConcreteVariant>(aV),
+                                      std::forward<Ms>(aMs)...))>,
+            "all matchers must have the same return type");
+        return std::forward<Mi>(aMi)(
+            std::forward<ConcreteVariant>(aV).template as<N>());
       }
     } else {
       // If you're seeing compilation errors here like "no matching
@@ -285,7 +314,8 @@
       // Matchers don't exhaust all variant types. There must exist a
       // Matcher (with its operator()(T&)) for every variant type T, in the
       // exact same order.
-      return Next::matchN(aV, std::forward<Ms>(aMs)...);
+      return Next::matchN(std::forward<ConcreteVariant>(aV),
+                          std::forward<Ms>(aMs)...);
     }
   }
 };
@@ -706,9 +736,9 @@
 
   // Accessors for working with the contained variant value.
 
-  /** Mutable reference. */
+  /** Mutable lvalue-reference. */
   template <typename T>
-  T& as() {
+  T& as() & {
     static_assert(
         detail::SelectVariantType<T, Ts...>::count == 1,
         "provided a type not uniquely found in this Variant's type list");
@@ -717,16 +747,16 @@
   }
 
   template <size_t N>
-  typename detail::Nth<N, Ts...>::Type& as() {
+  typename detail::Nth<N, Ts...>::Type& as() & {
     static_assert(N < sizeof...(Ts),
                   "provided an index outside of this Variant's type list");
     MOZ_RELEASE_ASSERT(is<N>());
     return *static_cast<typename detail::Nth<N, Ts...>::Type*>(ptr());
   }
 
-  /** Immutable const reference. */
+  /** Immutable const lvalue-reference. */
   template <typename T>
-  const T& as() const {
+  const T& as() const& {
     static_assert(detail::SelectVariantType<T, Ts...>::count == 1,
                   "provided a type not found in this Variant's type list");
     MOZ_RELEASE_ASSERT(is<T>());
@@ -734,13 +764,50 @@
   }
 
   template <size_t N>
-  const typename detail::Nth<N, Ts...>::Type& as() const {
+  const typename detail::Nth<N, Ts...>::Type& as() const& {
     static_assert(N < sizeof...(Ts),
                   "provided an index outside of this Variant's type list");
     MOZ_RELEASE_ASSERT(is<N>());
     return *static_cast<const typename detail::Nth<N, Ts...>::Type*>(ptr());
   }
 
+  /** Mutable rvalue-reference. */
+  template <typename T>
+  T&& as() && {
+    static_assert(
+        detail::SelectVariantType<T, Ts...>::count == 1,
+        "provided a type not uniquely found in this Variant's type list");
+    MOZ_RELEASE_ASSERT(is<T>());
+    return std::move(*static_cast<T*>(ptr()));
+  }
+
+  template <size_t N>
+  typename detail::Nth<N, Ts...>::Type&& as() && {
+    static_assert(N < sizeof...(Ts),
+                  "provided an index outside of this Variant's type list");
+    MOZ_RELEASE_ASSERT(is<N>());
+    return std::move(
+        *static_cast<typename detail::Nth<N, Ts...>::Type*>(ptr()));
+  }
+
+  /** Immutable const rvalue-reference. */
+  template <typename T>
+  const T&& as() const&& {
+    static_assert(detail::SelectVariantType<T, Ts...>::count == 1,
+                  "provided a type not found in this Variant's type list");
+    MOZ_RELEASE_ASSERT(is<T>());
+    return std::move(*static_cast<const T*>(ptr()));
+  }
+
+  template <size_t N>
+  const typename detail::Nth<N, Ts...>::Type&& as() const&& {
+    static_assert(N < sizeof...(Ts),
+                  "provided an index outside of this Variant's type list");
+    MOZ_RELEASE_ASSERT(is<N>());
+    return std::move(
+        *static_cast<const typename detail::Nth<N, Ts...>::Type*>(ptr()));
+  }
+
   /**
    * Extract the contained variant value from this container into a temporary
    * value.  On completion, the value in the variant will be in a
@@ -766,50 +833,52 @@
 
   // Exhaustive matching of all variant types on the contained value.
 
-  /** Match on an immutable const reference. */
+  /** Match on an immutable const lvalue-reference. */
   template <typename Matcher>
-  decltype(auto) match(Matcher&& aMatcher) const {
+  decltype(auto) match(Matcher&& aMatcher) const& {
     return Impl::match(std::forward<Matcher>(aMatcher), *this);
   }
 
   template <typename M0, typename M1, typename... Ms>
-  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) const {
-    static_assert(
-        2 + sizeof...(Ms) == sizeof...(Ts),
-        "Variant<T...>::match() takes either one callable argument that "
-        "accepts every type T; or one for each type T, in order");
-    static_assert(
-        tl::And<std::is_same_v<typename FunctionTypeTraits<M0>::ReturnType,
-                               typename FunctionTypeTraits<M1>::ReturnType>,
-                std::is_same_v<
-                    typename FunctionTypeTraits<M1>::ReturnType,
-                    typename FunctionTypeTraits<Ms>::ReturnType>...>::value,
-        "all matchers must have the same return type");
-    return Impl::matchN(*this, std::forward<M0>(aM0), std::forward<M1>(aM1),
-                        std::forward<Ms>(aMs)...);
+  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) const& {
+    return matchN(*this, std::forward<M0>(aM0), std::forward<M1>(aM1),
+                  std::forward<Ms>(aMs)...);
   }
 
-  /** Match on a mutable non-const reference. */
+  /** Match on a mutable non-const lvalue-reference. */
   template <typename Matcher>
-  decltype(auto) match(Matcher&& aMatcher) {
+  decltype(auto) match(Matcher&& aMatcher) & {
     return Impl::match(std::forward<Matcher>(aMatcher), *this);
   }
 
   template <typename M0, typename M1, typename... Ms>
-  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) {
-    static_assert(
-        2 + sizeof...(Ms) == sizeof...(Ts),
-        "Variant<T...>::match() takes either one callable argument that "
-        "accepts every type T; or one for each type T, in order");
-    static_assert(
-        tl::And<std::is_same_v<typename FunctionTypeTraits<M0>::ReturnType,
-                               typename FunctionTypeTraits<M1>::ReturnType>,
-                std::is_same_v<
-                    typename FunctionTypeTraits<M0>::ReturnType,
-                    typename FunctionTypeTraits<Ms>::ReturnType>...>::value,
-        "all matchers must have the same return type");
-    return Impl::matchN(*this, std::forward<M0>(aM0), std::forward<M1>(aM1),
-                        std::forward<Ms>(aMs)...);
+  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) & {
+    return matchN(*this, std::forward<M0>(aM0), std::forward<M1>(aM1),
+                  std::forward<Ms>(aMs)...);
+  }
+
+  /** Match on an immutable const rvalue-reference. */
+  template <typename Matcher>
+  decltype(auto) match(Matcher&& aMatcher) const&& {
+    return Impl::match(std::forward<Matcher>(aMatcher), std::move(*this));
+  }
+
+  template <typename M0, typename M1, typename... Ms>
+  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) const&& {
+    return matchN(std::move(*this), std::forward<M0>(aM0),
+                  std::forward<M1>(aM1), std::forward<Ms>(aMs)...);
+  }
+
+  /** Match on a mutable non-const rvalue-reference. */
+  template <typename Matcher>
+  decltype(auto) match(Matcher&& aMatcher) && {
+    return Impl::match(std::forward<Matcher>(aMatcher), std::move(*this));
+  }
+
+  template <typename M0, typename M1, typename... Ms>
+  decltype(auto) match(M0&& aM0, M1&& aM1, Ms&&... aMs) && {
+    return matchN(std::move(*this), std::forward<M0>(aM0),
+                  std::forward<M1>(aM1), std::forward<Ms>(aMs)...);
   }
 
   /**
@@ -820,6 +889,19 @@
   mozilla::HashNumber addTagToHash(mozilla::HashNumber hashValue) const {
     return mozilla::AddToHash(hashValue, tag);
   }
+
+ private:
+  template <typename ConcreteVariant, typename M0, typename M1, typename... Ms>
+  static decltype(auto) matchN(ConcreteVariant&& aVariant, M0&& aM0, M1&& aM1,
+                               Ms&&... aMs) {
+    static_assert(
+        2 + sizeof...(Ms) == sizeof...(Ts),
+        "Variant<T...>::match() takes either one callable argument that "
+        "accepts every type T; or one for each type T, in order");
+    return Impl::matchN(std::forward<ConcreteVariant>(aVariant),
+                        std::forward<M0>(aM0), std::forward<M1>(aM1),
+                        std::forward<Ms>(aMs)...);
+  }
 };
 
 /*
diff -Nru firefox-84.0.2+build1/mobile/android/actors/WebBrowserChromeChild.jsm firefox-85.0+build1/mobile/android/actors/WebBrowserChromeChild.jsm
--- firefox-84.0.2+build1/mobile/android/actors/WebBrowserChromeChild.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mobile/android/actors/WebBrowserChromeChild.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -12,7 +12,6 @@
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
-  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
   GeckoViewSettings: "resource://gre/modules/GeckoViewSettings.jsm",
 });
 
@@ -40,28 +39,12 @@
     aTriggeringPrincipal,
     aCsp
   ) {
-    debug`shouldLoadURI ${aURI.displaySpec}`;
-
-    if (!E10SUtils.shouldLoadURI(aDocShell, aURI, aHasPostData)) {
-      E10SUtils.redirectLoad(
-        aDocShell,
-        aURI,
-        aReferrerInfo,
-        aTriggeringPrincipal,
-        null,
-        aCsp
-      );
-      return false;
-    }
-
     return true;
   }
 
   // nsIWebBrowserChrome
   shouldLoadURIInThisProcess(aURI) {
-    debug`shouldLoadURIInThisProcess ${aURI.displaySpec}`;
-    const remoteSubframes = this.docShell.nsILoadContext.useRemoteSubframes;
-    return E10SUtils.shouldLoadURIInThisProcess(aURI, remoteSubframes);
+    return true;
   }
 }
 
diff -Nru firefox-84.0.2+build1/mobile/android/app/geckoview-prefs.js firefox-85.0+build1/mobile/android/app/geckoview-prefs.js
--- firefox-84.0.2+build1/mobile/android/app/geckoview-prefs.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/app/geckoview-prefs.js	2021-01-18 19:58:18.000000000 +0000
@@ -19,13 +19,7 @@
 
 pref("browser.tabs.remote.autostart", true);
 pref("dom.ipc.keepProcessesAlive.web", 1);
-
-#ifdef RELEASE_OR_BETA
-  pref("dom.ipc.processCount", 1);
-#else
-  pref("dom.ipc.processCount", 3);
-#endif
-
+pref("dom.ipc.processCount", 1);
 pref("dom.ipc.processPrelaunch.enabled", false);
 
 // Don't create the hidden window during startup.
diff -Nru firefox-84.0.2+build1/mobile/android/components/extensions/ext-android.json firefox-85.0+build1/mobile/android/components/extensions/ext-android.json
--- firefox-84.0.2+build1/mobile/android/components/extensions/ext-android.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mobile/android/components/extensions/ext-android.json	2021-01-18 19:58:17.000000000 +0000
@@ -6,6 +6,12 @@
     "manifest": ["browser_action"],
     "paths": [["browserAction"]]
   },
+  "browsingData": {
+    "url": "chrome://extensions/content/parent/ext-browsingData.js",
+    "schema": "chrome://extensions/content/schemas/browsing_data.json",
+    "scopes": ["addon_parent"],
+    "paths": [["browsingData"]]
+  },
   "pageAction": {
     "url": "chrome://geckoview/content/ext-pageAction.js",
     "schema": "chrome://extensions/content/schemas/page_action.json",
diff -Nru firefox-84.0.2+build1/mobile/android/components/extensions/ExtensionBrowsingData.jsm firefox-85.0+build1/mobile/android/components/extensions/ExtensionBrowsingData.jsm
--- firefox-84.0.2+build1/mobile/android/components/extensions/ExtensionBrowsingData.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mobile/android/components/extensions/ExtensionBrowsingData.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,65 @@
+/* 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 EXPORTED_SYMBOLS = ["BrowsingDataDelegate"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+const { ExtensionUtils } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  EventDispatcher: "resource://gre/modules/Messaging.jsm",
+});
+
+const { ExtensionError } = ExtensionUtils;
+
+class BrowsingDataDelegate {
+  constructor(extension) {
+    this.extension = extension;
+  }
+
+  async sendRequestForResult(type, data) {
+    try {
+      const result = await EventDispatcher.instance.sendRequestForResult({
+        type,
+        extensionId: this.extension.id,
+        ...data,
+      });
+      return result;
+    } catch (errorMessage) {
+      throw new ExtensionError(errorMessage);
+    }
+  }
+
+  async settings() {
+    return this.sendRequestForResult("GeckoView:BrowsingData:GetSettings");
+  }
+
+  async sendClear(dataType, options) {
+    const { since } = options;
+    return this.sendRequestForResult("GeckoView:BrowsingData:Clear", {
+      dataType,
+      since,
+    });
+  }
+
+  // This method returns undefined for all data types that are _not_ handled by
+  // this delegate.
+  handleRemoval(dataType, options) {
+    switch (dataType) {
+      case "downloads":
+      case "formData":
+      case "history":
+      case "passwords":
+        return this.sendClear(dataType, options);
+
+      default:
+        return undefined;
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/mobile/android/components/extensions/moz.build firefox-85.0+build1/mobile/android/components/extensions/moz.build
--- firefox-84.0.2+build1/mobile/android/components/extensions/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/components/extensions/moz.build	2021-01-18 19:58:17.000000000 +0000
@@ -6,6 +6,10 @@
 
 JAR_MANIFESTS += ["jar.mn"]
 
+EXTRA_JS_MODULES += [
+    "ExtensionBrowsingData.jsm",
+]
+
 EXTRA_COMPONENTS += [
     "extensions-mobile.manifest",
 ]
diff -Nru firefox-84.0.2+build1/mobile/android/components/geckoview/GeckoViewExternalAppService.cpp firefox-85.0+build1/mobile/android/components/geckoview/GeckoViewExternalAppService.cpp
--- firefox-84.0.2+build1/mobile/android/components/geckoview/GeckoViewExternalAppService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/components/geckoview/GeckoViewExternalAppService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/dom/WindowGlobalParent.h"
+#include "nsIChannel.h"
 
 #include "mozilla/widget/EventDispatcher.h"
 #include "mozilla/widget/nsWindow.h"
diff -Nru firefox-84.0.2+build1/mobile/android/components/geckoview/PromptCollection.jsm firefox-85.0+build1/mobile/android/components/geckoview/PromptCollection.jsm
--- firefox-84.0.2+build1/mobile/android/components/geckoview/PromptCollection.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/components/geckoview/PromptCollection.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -38,6 +38,11 @@
       prompter.asyncShowPrompt(msg, resolve);
     }).then(result => !!result?.allow);
   }
+
+  confirmFolderUpload() {
+    // Folder upload is not supported by GeckoView yet, see Bug 1674428.
+    return false;
+  }
 }
 
 PromptCollection.prototype.QueryInterface = ChromeUtils.generateQI([
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/api.txt firefox-85.0+build1/mobile/android/geckoview/api.txt
--- firefox-84.0.2+build1/mobile/android/geckoview/api.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/api.txt	2021-01-18 19:58:18.000000000 +0000
@@ -1636,8 +1636,10 @@
   }
 
   public class WebExtension {
+    method @Nullable @UiThread public WebExtension.BrowsingDataDelegate getBrowsingDataDelegate();
     method @Nullable @UiThread public WebExtension.TabDelegate getTabDelegate();
     method @AnyThread public void setActionDelegate(@Nullable WebExtension.ActionDelegate);
+    method @UiThread public void setBrowsingDataDelegate(@Nullable WebExtension.BrowsingDataDelegate);
     method @UiThread public void setMessageDelegate(@Nullable WebExtension.MessageDelegate, @NonNull String);
     method @UiThread public void setTabDelegate(@Nullable WebExtension.TabDelegate);
     field public final long flags;
@@ -1676,6 +1678,32 @@
     field public static final int VULNERABLE_UPDATE_AVAILABLE = 4;
   }
 
+  @UiThread public static interface WebExtension.BrowsingDataDelegate {
+    method @Nullable default public GeckoResult<Void> onClearDownloads(long);
+    method @Nullable default public GeckoResult<Void> onClearFormData(long);
+    method @Nullable default public GeckoResult<Void> onClearHistory(long);
+    method @Nullable default public GeckoResult<Void> onClearPasswords(long);
+    method @Nullable default public GeckoResult<WebExtension.BrowsingDataDelegate.Settings> onGetSettings();
+  }
+
+  @UiThread public static class WebExtension.BrowsingDataDelegate.Settings {
+    ctor @UiThread public Settings(int, long, long);
+    field public final long selectedTypes;
+    field public final int sinceUnixTimestamp;
+    field public final long toggleableTypes;
+  }
+
+  public static class WebExtension.BrowsingDataDelegate.Type {
+    ctor protected Type();
+    field public static final long CACHE = 1L;
+    field public static final long COOKIES = 2L;
+    field public static final long DOWNLOADS = 4L;
+    field public static final long FORM_DATA = 8L;
+    field public static final long HISTORY = 16L;
+    field public static final long LOCAL_STORAGE = 32L;
+    field public static final long PASSWORDS = 64L;
+  }
+
   public static class WebExtension.CreateTabDetails {
     ctor protected CreateTabDetails();
     field @Nullable public final Boolean active;
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/AndroidManifest.xml firefox-85.0+build1/mobile/android/geckoview/src/androidTest/AndroidManifest.xml
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/AndroidManifest.xml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/AndroidManifest.xml	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 
     <application
             android:allowBackup="true"
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/moz.build firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/moz.build
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 addons = {
+    "browsing-data": [
+        "background.js",
+        "manifest.json",
+    ],
     "tabs-activate-remove": [
         "background.js",
         "manifest.json",
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/background.js firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/background.js
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/background.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/background.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,8 @@
+browser.browsingData.removeDownloads({ since: 10001 });
+browser.browsingData.removeFormData({ since: 10002 });
+browser.browsingData.removeHistory({ since: 10003 });
+browser.browsingData.removePasswords({ since: 10004 });
+browser.browsingData.remove(
+  { since: 10005 },
+  { downloads: true, cookies: true }
+);
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/manifest.json firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/manifest.json
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/manifest.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data/manifest.json	2021-01-18 19:58:17.000000000 +0000
@@ -0,0 +1,15 @@
+{
+  "manifest_version": 2,
+  "name": "BrowsingData",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "browsing-data@tests.mozilla.org"
+    }
+  },
+  "version": "1.0",
+  "description": "Tests the browsingData API",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "permissions": ["browsingData"]
+}
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/background.js firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/background.js
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/background.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/background.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,44 @@
+const port = browser.runtime.connectNative("browser");
+
+async function apiCall(message) {
+  const { type, since, removalOptions, dataTypes } = message;
+  switch (type) {
+    case "clear-downloads":
+      await browser.browsingData.removeDownloads({ since });
+      break;
+    case "clear-form-data":
+      await browser.browsingData.removeFormData({ since });
+      break;
+    case "clear-history":
+      await browser.browsingData.removeHistory({ since });
+      break;
+    case "clear-passwords":
+      await browser.browsingData.removePasswords({ since });
+      break;
+    case "clear":
+      await browser.browsingData.remove(removalOptions, dataTypes);
+      break;
+    case "get-settings":
+      return browser.browsingData.settings();
+  }
+  return null;
+}
+
+port.onMessage.addListener(async message => {
+  const { uuid } = message;
+  try {
+    const result = await apiCall(message);
+    port.postMessage({
+      type: "response",
+      result,
+      uuid,
+    });
+  } catch (exception) {
+    const { message } = exception;
+    port.postMessage({
+      type: "error",
+      error: message,
+      uuid,
+    });
+  }
+});
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/manifest.json firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/manifest.json
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/manifest.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/web_extensions/browsing-data-built-in/manifest.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,15 @@
+{
+  "manifest_version": 2,
+  "name": "BrowsingData",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "browsing-data-settings@tests.mozilla.org"
+    }
+  },
+  "version": "1.0",
+  "description": "Tests the browsingData API",
+  "background": {
+    "scripts": ["background.js"]
+  },
+  "permissions": ["browsingData", "geckoViewAddons", "nativeMessaging"]
+}
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/www/media_session_dom1.html firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/www/media_session_dom1.html
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/assets/www/media_session_dom1.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/assets/www/media_session_dom1.html	2021-01-18 19:58:18.000000000 +0000
@@ -25,8 +25,8 @@
       }
 
       navigator.mediaSession.setActionHandler("play", async () => {
-        await active.play();
         updateMetadata();
+        await active.play();
       });
 
       navigator.mediaSession.setActionHandler("pause", () => {
@@ -91,8 +91,8 @@
 
       window.onload = async () => {
         active = getTrack(0);
-        await active.play();
         updateMetadata();
+        await active.play();
       };
     </script>
   </body>
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ImageResourceTest.kt	2021-01-18 19:58:17.000000000 +0000
@@ -134,6 +134,37 @@
     }
 
     @Test
+    fun invalidImageSize() {
+        val invalidImage1 = TestImage(
+            "path.ico", "image/icon", "16x16 32",
+            arrayOf(16),
+            arrayOf(16)
+        )
+        testValidImage(invalidImage1)
+
+        val invalidImage2 = TestImage(
+            "path.ico", "image/icon", "16x16 32xa32",
+            arrayOf(16),
+            arrayOf(16)
+        )
+        testValidImage(invalidImage2)
+
+        val invalidImage3 = TestImage(
+            "path.ico", "image/icon", "",
+            null,
+            null
+        )
+        testValidImage(invalidImage3)
+
+        val invalidImage4 = TestImage(
+            "path.ico", "image/icon", "abxab",
+            null,
+            null
+        )
+        testValidImage(invalidImage4)
+    }
+
+    @Test
     fun getBestRegular() {
         val collection = buildCollection(arrayOf(
             kValidTestImage1, kValidTestImage2, kValidTestImage3,
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/MediaSessionTest.kt	2021-01-18 19:58:18.000000000 +0000
@@ -608,9 +608,7 @@
                         equalTo(true))
             }
 
-            // TODO: Find out why this is intermittently called more than once.
-            // Bug 1674110.
-            @AssertCalled
+            @AssertCalled(count = 1)
             override fun onMetadata(
                     session: GeckoSession,
                     mediaSession: MediaSession,
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/ScreenshotTest.kt	2021-01-18 19:58:17.000000000 +0000
@@ -143,6 +143,52 @@
         }
     }
 
+    // This tests tries to catch problems like Bug 1644561.
+    @WithDisplay(height = SCREEN_HEIGHT, width = SCREEN_WIDTH)
+    @Test
+    fun capturePixelsStressTest() {
+        val screenshots = mutableListOf<GeckoResult<Bitmap>>()
+        sessionRule.display?.let {
+            for (i in 0..100) {
+                screenshots.add(it.capturePixels())
+            }
+
+            for (i in 0..50) {
+                sessionRule.waitForResult(screenshots[i])
+            }
+
+            it.surfaceDestroyed()
+            screenshots.add(it.capturePixels())
+            it.surfaceDestroyed()
+
+            val texture = SurfaceTexture(0)
+            texture.setDefaultBufferSize(SCREEN_WIDTH, SCREEN_HEIGHT)
+            val surface = Surface(texture)
+            it.surfaceChanged(surface, SCREEN_WIDTH, SCREEN_HEIGHT)
+
+            for (i in 0..100) {
+                screenshots.add(it.capturePixels())
+            }
+
+            for (i in 0..100) {
+                it.surfaceDestroyed()
+                screenshots.add(it.capturePixels())
+                val newTexture = SurfaceTexture(0)
+                newTexture.setDefaultBufferSize(SCREEN_WIDTH, SCREEN_HEIGHT)
+                val newSurface = Surface(newTexture)
+                it.surfaceChanged(newSurface, SCREEN_WIDTH, SCREEN_HEIGHT)
+            }
+
+            try {
+                for (result in screenshots) {
+                    sessionRule.waitForResult(result)
+                }
+            } catch (ex: RuntimeException) {
+                // Rejecting the screenshot is fine
+            }
+        }
+    }
+
     @WithDisplay(height = SCREEN_HEIGHT, width = SCREEN_WIDTH)
     @Test(expected = IllegalStateException::class)
     fun capturePixelsFailsCompositorPaused() {
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java	2021-01-18 19:58:18.000000000 +0000
@@ -363,6 +363,20 @@
                     }
                 });
 
+                extension.setBrowsingDataDelegate(new WebExtension.BrowsingDataDelegate() {
+                    @Nullable
+                    @Override
+                    public GeckoResult<Settings> onGetSettings() {
+                        final long types =
+                                Type.CACHE |
+                                Type.COOKIES |
+                                Type.HISTORY |
+                                Type.FORM_DATA |
+                                Type.DOWNLOADS;
+                        return GeckoResult.fromValue(new Settings(1234, types, types ));
+                    }
+                });
+
                 for (final GeckoSession session : mOwnedSessions) {
                     final WebExtension.SessionController controller =
                             session.getWebExtensionController();
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt
--- firefox-84.0.2+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/WebExtensionTest.kt	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 import java.util.concurrent.CancellationException;
 import org.hamcrest.core.StringEndsWith.endsWith
 import org.hamcrest.core.IsEqual.equalTo
+import org.hamcrest.core.IsNull.nullValue
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Assume.assumeThat
@@ -17,12 +18,14 @@
 import org.junit.runner.RunWith
 import org.mozilla.geckoview.*
 import org.mozilla.geckoview.test.rule.GeckoSessionTestRule
-import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.AssertCalled
 import org.mozilla.geckoview.test.util.Callbacks
 import org.mozilla.geckoview.WebExtension.DisabledFlags
 import org.mozilla.geckoview.WebExtensionController.EnableSource
-import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.Setting
+import org.mozilla.geckoview.test.rule.GeckoSessionTestRule.*
 import org.mozilla.geckoview.test.util.RuntimeCreator
+import org.mozilla.geckoview.WebExtension.BrowsingDataDelegate.Type.*
+import java.util.*
+import kotlin.collections.HashMap
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
@@ -48,6 +51,8 @@
                 "resource://android/assets/web_extensions/openoptionspage-2/"
         private const val EXTENSION_PAGE_RESTORE: String =
                 "resource://android/assets/web_extensions/extension-page-restore/"
+        private const val BROWSING_DATA: String =
+                "resource://android/assets/web_extensions/browsing-data-built-in/"
     }
 
     private val controller
@@ -676,10 +681,316 @@
         sessionRule.waitForResult(controller.uninstall(tabsExtension))
     }
 
+    private fun browsingDataMessage(port: WebExtension.Port, type: String,
+                                    since: Long? = null): GeckoResult<JSONObject> {
+        val message = JSONObject("{" +
+                "\"type\": \"$type\"" +
+                "}")
+        if (since != null) {
+            message.put("since", since)
+        }
+        return browsingDataCall(port, message)
+    }
+
+    private fun browsingDataCall(port: WebExtension.Port,
+                                 json: JSONObject): GeckoResult<JSONObject> {
+        val uuid = UUID.randomUUID().toString()
+        json.put("uuid", uuid)
+        port.postMessage(json)
+
+        val response = GeckoResult<JSONObject>()
+        port.setDelegate(object : WebExtension.PortDelegate {
+            override fun onPortMessage(message: Any, port: WebExtension.Port) {
+                assertThat("Response ID Matches.",
+                        (message as JSONObject).getString("uuid"), equalTo(uuid))
+                response.complete(message)
+            }
+        })
+        return response
+    }
+
+    @Test
+    fun testBrowsingDataDelegateBuiltIn() {
+        sessionRule.setPrefsUntilTestEnd(mapOf(
+                "xpinstall.signatures.required" to false,
+                "extensions.install.requireBuiltInCerts" to false,
+                "extensions.update.requireBuiltInCerts" to false
+        ))
+
+        val extension = sessionRule.waitForResult(
+                controller.installBuiltIn(BROWSING_DATA))
+
+        val portResult = GeckoResult<WebExtension.Port>()
+        extension.setMessageDelegate(object : WebExtension.MessageDelegate {
+            override fun onConnect(port: WebExtension.Port) {
+                portResult.complete(port)
+            }
+        }, "browser")
+
+        val TEST_SINCE_VALUE = 59294;
+
+        sessionRule.addExternalDelegateUntilTestEnd(
+                WebExtension.BrowsingDataDelegate::class,
+                { delegate -> extension.browsingDataDelegate = delegate },
+                { extension.browsingDataDelegate = null },
+                object : WebExtension.BrowsingDataDelegate {
+                    override fun onGetSettings(): GeckoResult<WebExtension.BrowsingDataDelegate.Settings>? {
+                        return GeckoResult.fromValue(WebExtension.BrowsingDataDelegate.Settings(
+                                TEST_SINCE_VALUE,
+                                CACHE or COOKIES or DOWNLOADS or HISTORY or LOCAL_STORAGE,
+                                CACHE or COOKIES or HISTORY
+                        ))
+                    }
+                })
+
+        val port = sessionRule.waitForResult(portResult)
+
+        // Test browsingData.removeDownloads
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearDownloads(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(1234L))
+                return null
+            }
+        })
+        sessionRule.waitForResult(browsingDataMessage(port, "clear-downloads", 1234))
+
+        // Test browsingData.removeFormData
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearFormData(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(1234L))
+                return null
+            }
+        })
+        sessionRule.waitForResult(browsingDataMessage(port,"clear-form-data", 1234))
+
+        // Test browsingData.removeHistory
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearHistory(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(1234L))
+                return null
+            }
+        })
+        sessionRule.waitForResult(browsingDataMessage(port, "clear-history", 1234))
+
+        // Test browsingData.removePasswords
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(1234L))
+                return null
+            }
+        })
+        sessionRule.waitForResult(browsingDataMessage(port, "clear-passwords", 1234))
+
+        // Test browsingData.remove({ indexedDB: true, localStorage: true, passwords: true })
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return null
+            }
+        })
+        var response = sessionRule.waitForResult(browsingDataCall(port,
+                JSONObject("{" +
+                "\"type\": \"clear\"," +
+                "\"removalOptions\": {}," +
+                "\"dataTypes\": {\"indexedDB\": true, \"localStorage\": true, \"passwords\": true}" +
+                "}")))
+        assertThat("browsingData.remove should succeed",
+                response.getString("type"),
+                equalTo("response"))
+
+        // Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return null
+            }
+            @AssertCalled
+            override fun onClearHistory(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return null
+            }
+        })
+        response = sessionRule.waitForResult(browsingDataCall(port,
+                JSONObject("{" +
+                "\"type\": \"clear\"," +
+                "\"removalOptions\": {}," +
+                "\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
+                "}")))
+        assertThat("browsingData.remove should succeed",
+            response.getString("type"),
+            equalTo("response"))
+
+        // Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
+        // with failure
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return null
+            }
+            @AssertCalled
+            override fun onClearHistory(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return GeckoResult.fromException(RuntimeException("Not authorized."));
+            }
+        })
+        response = sessionRule.waitForResult(browsingDataCall(port,
+                JSONObject("{" +
+                "\"type\": \"clear\"," +
+                "\"removalOptions\": {}," +
+                "\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
+                "}")))
+        assertThat("browsingData.remove returns expected error.",
+            response.getString("error"),
+            equalTo("Not authorized."))
+
+        // Test browsingData.remove({ indexedDB: true, history: true, passwords: true })
+        // with multiple failures
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            @AssertCalled
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return GeckoResult.fromException(RuntimeException("Not authorized passwords."));
+            }
+            @AssertCalled
+            override fun onClearHistory(sinceUnixTimestamp: Long): GeckoResult<Void>? {
+                assertThat("timestamp should match", sinceUnixTimestamp,
+                        equalTo(0L))
+                return GeckoResult.fromException(RuntimeException("Not authorized history."));
+            }
+        })
+        response = sessionRule.waitForResult(browsingDataCall(port,
+                JSONObject("{" +
+                        "\"type\": \"clear\"," +
+                        "\"removalOptions\": {}," +
+                        "\"dataTypes\": {\"indexedDB\": true, \"history\": true, \"passwords\": true}" +
+                        "}")))
+        val error = response.getString("error")
+        assertThat("browsingData.remove returns expected error.",
+                error == "Not authorized passwords." || error == "Not authorized history.",
+                equalTo(true))
+
+        // Test browsingData.settings()
+        response = sessionRule.waitForResult(
+                browsingDataMessage(port, "get-settings"))
+
+        val settings = response.getJSONObject("result")
+        val dataToRemove = settings.getJSONObject("dataToRemove")
+        val options = settings.getJSONObject("options")
+
+        assertThat("Since should be correct",
+                options.getInt("since"), equalTo(TEST_SINCE_VALUE))
+        for (key in listOf("cache", "cookies", "history")) {
+            assertThat("Data to remove should be correct",
+                    dataToRemove.getBoolean(key), equalTo(true))
+        }
+        for (key in listOf("downloads", "localStorage")) {
+            assertThat("Data to remove should be correct",
+                    dataToRemove.getBoolean(key), equalTo(false))
+        }
+
+        val dataRemovalPermitted = settings.getJSONObject("dataRemovalPermitted")
+        for (key in listOf("cache", "cookies", "downloads", "history", "localStorage")) {
+            assertThat("Data removal permitted should be correct",
+                    dataRemovalPermitted.getBoolean(key), equalTo(true))
+        }
+
+        // Test browsingData.settings() with no delegate
+        sessionRule.delegateDuringNextWait(object : WebExtension.BrowsingDataDelegate {
+            override fun onGetSettings(): GeckoResult<WebExtension.BrowsingDataDelegate.Settings>? {
+                return null
+            }
+        })
+        response = sessionRule.waitForResult(
+                browsingDataMessage(port, "get-settings"))
+        assertThat("browsingData.settings returns expected error.",
+                response.getString("error"),
+                equalTo("browsingData.settings is not supported"))
+
+        sessionRule.waitForResult(controller.uninstall(extension))
+    }
+
+    @Test
+    fun testBrowsingDataDelegate() {
+        sessionRule.setPrefsUntilTestEnd(mapOf(
+                "xpinstall.signatures.required" to false,
+                "extensions.install.requireBuiltInCerts" to false,
+                "extensions.update.requireBuiltInCerts" to false
+        ))
+
+        sessionRule.delegateDuringNextWait(object : WebExtensionController.PromptDelegate {
+            override fun onInstallPrompt(extension: WebExtension): GeckoResult<AllowOrDeny> {
+                return GeckoResult.fromValue(AllowOrDeny.ALLOW)
+            }
+        })
+
+        val extension = sessionRule.waitForResult(
+                controller.install("https://example.org/tests/junit/browsing-data.xpi"))
+
+        val accumulator = mutableListOf<String>()
+        val result = GeckoResult<List<String>>()
+
+        extension.browsingDataDelegate = object : WebExtension.BrowsingDataDelegate {
+            fun register(type: String, timestamp: Long) {
+                accumulator.add("$type $timestamp")
+                if (accumulator.size >= 5) {
+                    result.complete(accumulator)
+                }
+            }
+
+            override fun onClearDownloads(sinceUnixTimestamp: Long): GeckoResult<Void> {
+                register("downloads", sinceUnixTimestamp)
+                return GeckoResult.fromValue(null);
+            }
+
+            override fun onClearFormData(sinceUnixTimestamp: Long): GeckoResult<Void> {
+                register("formData", sinceUnixTimestamp)
+                return GeckoResult.fromValue(null);
+            }
+
+            override fun onClearHistory(sinceUnixTimestamp: Long): GeckoResult<Void> {
+                register("history", sinceUnixTimestamp)
+                return GeckoResult.fromValue(null);
+            }
+
+            override fun onClearPasswords(sinceUnixTimestamp: Long): GeckoResult<Void> {
+                register("passwords", sinceUnixTimestamp)
+                return GeckoResult.fromValue(null);
+            }
+        }
+
+        val actual = sessionRule.waitForResult(result)
+        assertThat("Delegate methods get called in the right order",
+            actual, equalTo(listOf(
+                "downloads 10001",
+                "formData 10002",
+                "history 10003",
+                "passwords 10004",
+                "downloads 10005"
+        )))
+
+        sessionRule.waitForResult(controller.uninstall(extension))
+    }
+
     // Same as testSetTabActive when the extension is not allowed in private browsing
     @Test
     fun testSetTabActiveNotAllowedInPrivateBrowsing() {
-        // android.os.Debug.waitForDebugger()
         sessionRule.setPrefsUntilTestEnd(mapOf(
                 "xpinstall.signatures.required" to false,
                 "extensions.install.requireBuiltInCerts" to false,
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java	2021-01-18 19:58:18.000000000 +0000
@@ -21,7 +21,7 @@
 import org.mozilla.gecko.mozglue.JNIObject;
 import org.mozilla.gecko.annotation.WrapForJNI;
 
-// Bug 1618560: Currently we only profile the Java Main Thread. Ideally we should
+// Bug 1618560: Currently we only profile the Android UI thread. Ideally we should
 // be able to profile multiple threads.
 public class GeckoJavaSampler {
     private static final String LOGTAG = "GeckoJavaSampler";
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/EventCallback.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/EventCallback.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/EventCallback.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/EventCallback.java	2021-01-18 19:58:18.000000000 +0000
@@ -2,6 +2,9 @@
 
 import org.mozilla.gecko.annotation.RobocopTarget;
 import org.mozilla.gecko.annotation.WrapForJNI;
+import org.mozilla.geckoview.GeckoResult;
+
+import javax.annotation.Nullable;
 
 /**
  * Callback interface for Gecko requests.
@@ -19,7 +22,7 @@
      * @param response The response data to send to Gecko. Can be any of the types accepted by
      *                 JSONObject#put(String, Object).
      */
-    public void sendSuccess(Object response);
+    void sendSuccess(Object response);
 
     /**
      * Sends an error response with the given data.
@@ -27,5 +30,19 @@
      * @param response The response data to send to Gecko. Can be any of the types accepted by
      *                 JSONObject#put(String, Object).
      */
-    public void sendError(Object response);
+    void sendError(Object response);
+
+    /**
+     * Resolve this Event callback with the result from the {@link GeckoResult}.
+     *
+     * @param response the result that will be used for this callback.
+     */
+    default <T> void resolveTo(final @Nullable GeckoResult<T> response) {
+        if (response == null) {
+            sendSuccess(null);
+            return;
+        }
+        response.accept(this::sendSuccess, throwable ->
+            sendError(throwable.getMessage()));
+    }
 }
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ImageResource.java	2021-01-18 19:58:17.000000000 +0000
@@ -109,20 +109,31 @@
         }
 
         final String[] sizesStrs = sizesStr.toLowerCase().split(" ");
-        final Size[] sizes = new Size[sizesStrs.length];
+        final List<Size> sizes = new ArrayList<Size>();
 
-        for (int i = 0; i < sizesStrs.length; ++i) {
-            if (sizesStrs[i].equals("any")) {
+        for (final String sizeStr: sizesStrs) {
+            if (sizesStr.equals("any")) {
                 // 0-width size will always be favored.
-                sizes[i] = new Size(0, 0);
+                sizes.add(new Size(0, 0));
                 continue;
             }
-            final String[] widthHeight = sizesStrs[i].split("x");
-            sizes[i] = new Size(
-                    Integer.valueOf(widthHeight[0]),
-                    Integer.valueOf(widthHeight[1]));
+            final String[] widthHeight = sizeStr.split("x");
+            if (widthHeight.length != 2) {
+                // Not spec-compliant size.
+                continue;
+            }
+            try {
+                sizes.add(new Size(
+                        Integer.valueOf(widthHeight[0]),
+                        Integer.valueOf(widthHeight[1])));
+            } catch (final NumberFormatException e) {
+                Log.e(LOGTAG, "Invalid image resource size", e);
+            }
+        }
+        if (sizes.isEmpty()) {
+            return null;
         }
-        return sizes;
+        return sizes.toArray(new Size[0]);
     }
 
     public static @NonNull ImageResource fromBundle(
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md	2021-01-18 19:58:18.000000000 +0000
@@ -13,6 +13,12 @@
 
 ⚠�  breaking change and deprecation notices
 
+## v85
+- Added [`WebExtension.BrowsingDataDelegate`][85.1] that can be used to
+  implement the WebExtension `browsingData` API.
+
+[85.1]: {{javadoc_uri}}/WebExtension.BrowsingDataDelegate.html
+
 ## v84
 - ⚠�  Removed deprecated [`GeckoRuntimeSettings.Builder.useMultiprocess`] and
   [`GeckoRuntimeSettings.getUseMultiprocess`]. Single-process GeckoView is no
@@ -849,4 +855,4 @@
 [65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport-android.content.Context-android.os.Bundle-java.lang.String-
 [65.25]: {{javadoc_uri}}/GeckoResult.html
 
-[api-version]: 2e4e0b4fb29ca63851687ac1020d9d51589476ce
+[api-version]: e31b1976d9efcce57d7e46996f807b68160a4943
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoEditable.java	2021-01-18 19:58:17.000000000 +0000
@@ -1569,10 +1569,6 @@
                     Log.d(LOGTAG, "restartInput(" + reason + ", " + toggleSoftInput + ')');
                 }
 
-                if (toggleSoftInput) {
-                    mSoftInputReentrancyGuard.incrementAndGet();
-                }
-
                 final GeckoSession session = mSession.get();
                 if (session != null) {
                     session.getTextInput().getDelegate().restartInput(session, reason);
@@ -1723,55 +1719,53 @@
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                final int reentrancyGuard = mSoftInputReentrancyGuard.decrementAndGet();
-                final boolean isReentrant;
-                if (reentrancyGuard < 0) {
-                    mSoftInputReentrancyGuard.incrementAndGet();
-                    isReentrant = false;
-                } else {
-                    isReentrant = reentrancyGuard > 0;
-                }
-
-                // When using Find In Page, we can still receive notifyIMEContext calls due to the
-                // selection changing when highlighting. However in this case we don't want to
-                // show/hide the keyboard because the find box has the focus and is taking input from
-                // the keyboard.
-                final GeckoSession session = mSession.get();
+                try {
+                    final int reentrancyGuard = mSoftInputReentrancyGuard.incrementAndGet();
+                    final boolean isReentrant =  reentrancyGuard > 1;
+
+                    // When using Find In Page, we can still receive notifyIMEContext calls due to the
+                    // selection changing when highlighting. However in this case we don't want to
+                    // show/hide the keyboard because the find box has the focus and is taking input from
+                    // the keyboard.
+                    final GeckoSession session = mSession.get();
 
-                if (session == null) {
-                    return;
-                }
+                    if (session == null) {
+                        return;
+                    }
 
-                final View view = session.getTextInput().getView();
-                final boolean isFocused = (view == null) || view.hasFocus();
+                    final View view = session.getTextInput().getView();
+                    final boolean isFocused = (view == null) || view.hasFocus();
 
-                final boolean isUserAction = ((flags &
-                        SessionTextInput.EditableListener.IME_FLAG_USER_ACTION) != 0);
+                    final boolean isUserAction = ((flags &
+                            SessionTextInput.EditableListener.IME_FLAG_USER_ACTION) != 0);
 
-                if (!force && (isReentrant || !isFocused || !isUserAction)) {
-                    if (DEBUG) {
-                        Log.d(LOGTAG, "toggleSoftInput: no-op, reentrant=" + isReentrant +
-                                ", focused=" + isFocused + ", user=" + isUserAction);
+                    if (!force && (isReentrant || !isFocused || !isUserAction)) {
+                        if (DEBUG) {
+                            Log.d(LOGTAG, "toggleSoftInput: no-op, reentrant=" + isReentrant +
+                                    ", focused=" + isFocused + ", user=" + isUserAction);
+                        }
+                        return;
                     }
-                    return;
-                }
-                if (state == SessionTextInput.EditableListener.IME_STATE_DISABLED) {
-                    session.getTextInput().getDelegate().hideSoftInput(session);
-                    return;
-                }
-                {
-                    final GeckoBundle bundle = new GeckoBundle();
-                    // This bit is subtle. We want to force-zoom to the input
-                    // if we're _not_ force-showing the virtual keyboard.
-                    //
-                    // We only force-show the virtual keyboard as a result of
-                    // something that _doesn't_ switch the focus, and we don't
-                    // want to move the view out of the focused editor unless
-                    // we _actually_ show toggle the keyboard.
-                    bundle.putBoolean("force", !force);
-                    session.getEventDispatcher().dispatch("GeckoView:ZoomToInput", bundle);
+                    if (state == SessionTextInput.EditableListener.IME_STATE_DISABLED) {
+                        session.getTextInput().getDelegate().hideSoftInput(session);
+                        return;
+                    }
+                    {
+                        final GeckoBundle bundle = new GeckoBundle();
+                        // This bit is subtle. We want to force-zoom to the input
+                        // if we're _not_ force-showing the virtual keyboard.
+                        //
+                        // We only force-show the virtual keyboard as a result of
+                        // something that _doesn't_ switch the focus, and we don't
+                        // want to move the view out of the focused editor unless
+                        // we _actually_ show toggle the keyboard.
+                        bundle.putBoolean("force", !force);
+                        session.getEventDispatcher().dispatch("GeckoView:ZoomToInput", bundle);
+                    }
+                    session.getTextInput().getDelegate().showSoftInput(session);
+                } finally {
+                    mSoftInputReentrancyGuard.decrementAndGet();
                 }
-                session.getTextInput().getDelegate().showSoftInput(session);
             }
         });
     }
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java	2021-01-18 19:58:18.000000000 +0000
@@ -171,6 +171,14 @@
 
         public void setDynamicToolbarMaxHeight(final int height) {
             mDynamicToolbarMaxHeight = height;
+
+            // Reset the vertical clipping value to zero whenever we change
+            // the dynamic toolbar __max__ height so that it can be properly
+            // propagated to both the main thread and the compositor thread,
+            // thus we will be able to reset the __current__ toolbar height
+            // on the both threads whatever the __current__ toolbar height is.
+            setVerticalClipping(0);
+
             if (mDisplay != null) {
                 mDisplay.setDynamicToolbarMaxHeight(height);
             }
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoWebExecutor.java	2021-01-18 19:58:17.000000000 +0000
@@ -58,7 +58,6 @@
             FETCH_FLAGS_NONE,
             FETCH_FLAGS_ANONYMOUS,
             FETCH_FLAGS_NO_REDIRECTS,
-            FETCH_FLAGS_ALLOW_SOME_ERRORS,
             FETCH_FLAGS_PRIVATE,
             FETCH_FLAGS_STREAM_FAILURE_TEST,
     })
@@ -81,13 +80,8 @@
     @WrapForJNI
     public static final int FETCH_FLAGS_NO_REDIRECTS = 1 << 1;
 
-    // TODO: implement in WebExecutorSupport and make public bug 1538348
-    /**
-     * Enables downloads to continue even if they encounter HTTP errors.
-     * Using this flag, for example, enables the download of server error pages.
-     */
-    @WrapForJNI
-    /* package */ static final int FETCH_FLAGS_ALLOW_SOME_ERRORS = 1 << 2;
+    // There was supposed to be another flag, which we then decided not to implement.
+    // That's the reason there's no value 1 << 2, and it can absolutely be used :)
 
     /**
      * Associates this download with the current private browsing session
@@ -162,11 +156,6 @@
         return result;
     }
 
-    // TODO: make public bug 1538348
-    /* package */ @NonNull GeckoResult<WebResponse> fetch(final @NonNull WebExtension.DownloadRequest request) {
-        return fetch(request.request, request.downloadFlags);
-    }
-
     /**
      * Resolves the specified host name.
      *
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaSession.java	2021-01-18 19:58:18.000000000 +0000
@@ -695,14 +695,6 @@
             mMediaSession = new MediaSession(session);
         }
 
-        private void ensureActivated(final Delegate delegate) {
-            if (mMediaSession.isActive()) {
-                return;
-            }
-            mMediaSession.setActive(true);
-            delegate.onActivated(mSession, mMediaSession);
-        }
-
         @Override
         public void handleMessage(
                 final Delegate delegate,
@@ -714,31 +706,26 @@
             }
 
             if (ACTIVATED_EVENT.equals(event)) {
-                ensureActivated(delegate);
+                mMediaSession.setActive(true);
+                delegate.onActivated(mSession, mMediaSession);
             } else if (DEACTIVATED_EVENT.equals(event)) {
                 mMediaSession.setActive(false);
                 delegate.onDeactivated(mSession, mMediaSession);
             } else if (METADATA_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 final Metadata meta =
                         Metadata.fromBundle(message.getBundle("metadata"));
                 delegate.onMetadata(mSession, mMediaSession, meta);
             } else if (POSITION_STATE_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 final PositionState state =
                         PositionState.fromBundle(message.getBundle("state"));
                 delegate.onPositionState(mSession, mMediaSession, state);
             } else if (PLAYBACK_NONE_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 delegate.onStop(mSession, mMediaSession);
             } else if (PLAYBACK_PAUSED_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 delegate.onPause(mSession, mMediaSession);
             } else if (PLAYBACK_PLAYING_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 delegate.onPlay(mSession, mMediaSession);
             } else if (FEATURES_EVENT.equals(event)) {
-                ensureActivated(delegate);
                 final long features = Feature.fromBundle(
                         message.getBundle("features"));
                 delegate.onFeatures(mSession, mMediaSession, features);
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java	2021-01-18 19:58:18.000000000 +0000
@@ -39,6 +39,7 @@
     // Map [ (extensionId, nativeApp, session) -> message ]
     private final MultiMap<MessageRecipient, Message> mPendingMessages;
     private final MultiMap<String, Message> mPendingNewTab;
+    private final MultiMap<String, Message> mPendingBrowsingData;
 
     private static class Message {
         final GeckoBundle bundle;
@@ -170,6 +171,23 @@
         }
 
         @Override
+        public void onBrowsingDataDelegate(final WebExtension.BrowsingDataDelegate delegate) {
+            mListener.setBrowsingDataDelegate(mExtension, delegate);
+
+            for (final Message message : mPendingBrowsingData.get(mExtension.id)) {
+                WebExtensionController.this.handleMessage(message.event,
+                        message.bundle, message.callback, message.session);
+            }
+
+            mPendingBrowsingData.remove(mExtension.id);
+        }
+
+        @Override
+        public WebExtension.BrowsingDataDelegate getBrowsingDataDelegate() {
+            return mListener.getBrowsingDataDelegate(mExtension);
+        }
+
+        @Override
         public void onTabDelegate(final WebExtension.TabDelegate delegate) {
             mListener.setTabDelegate(mExtension, delegate);
 
@@ -770,6 +788,7 @@
         mListener = new WebExtension.Listener<>(runtime);
         mPendingMessages = new MultiMap<>();
         mPendingNewTab = new MultiMap<>();
+        mPendingBrowsingData = new MultiMap<>();
         mExtensions.setObserver(mInternals);
     }
 
@@ -830,6 +849,12 @@
             } else if ("GeckoView:WebExtension:OpenOptionsPage".equals(event)) {
                 openOptionsPage(message, extension);
                 return;
+            } else if ("GeckoView:BrowsingData:GetSettings".equals(event)) {
+                getSettings(message, extension);
+                return;
+            } else if ("GeckoView:BrowsingData:Clear".equals(event)) {
+                browsingDataClear(message, extension);
+                return;
             }
             final String nativeApp = bundle.getString("nativeApp");
             if (nativeApp == null) {
@@ -934,6 +959,55 @@
         });
     }
 
+    private void getSettings(final Message message, final WebExtension extension) {
+        final WebExtension.BrowsingDataDelegate delegate =
+                mListener.getBrowsingDataDelegate(extension);
+        if (delegate == null) {
+            mPendingBrowsingData.add(extension.id, message);
+            return;
+        }
+
+        final GeckoResult<WebExtension.BrowsingDataDelegate.Settings> settingsResult =
+                delegate.onGetSettings();
+        if (settingsResult == null) {
+            message.callback.sendError("browsingData.settings is not supported");
+            return;
+        }
+        settingsResult.accept(
+                settings -> {
+                    message.callback.sendSuccess(settings.toGeckoBundle());
+                },
+                message.callback::sendError);
+    }
+
+    private void browsingDataClear(final Message message, final WebExtension extension) {
+        final WebExtension.BrowsingDataDelegate delegate =
+                mListener.getBrowsingDataDelegate(extension);
+        if (delegate == null) {
+            mPendingBrowsingData.add(extension.id, message);
+            return;
+        }
+
+        final long unixTimestamp = message.bundle.getLong("since");
+        final String dataType = message.bundle.getString("dataType");
+
+        final GeckoResult<Void> response;
+        if ("downloads".equals(dataType)) {
+            response = delegate.onClearDownloads(unixTimestamp);
+        } else if ("formData".equals(dataType)) {
+            response = delegate.onClearFormData(unixTimestamp);
+        } else if ("history".equals(dataType)) {
+            response = delegate.onClearHistory(unixTimestamp);
+        } else if ("passwords".equals(dataType)) {
+            response = delegate.onClearPasswords(unixTimestamp);
+        } else {
+            throw new IllegalStateException("Illegal clear data type: " + dataType);
+        }
+
+        message.callback.resolveTo(response);
+    }
+
+
     /* package */ void openOptionsPage(
             final Message message,
             final WebExtension extension) {
@@ -1213,9 +1287,7 @@
             return;
         }
 
-        response.accept(
-            value -> callback.sendSuccess(value),
-            exception -> callback.sendError(exception));
+        callback.resolveTo(response);
     }
 
     private GeckoResult<WebExtension> extensionFromBundle(final GeckoBundle message) {
diff -Nru firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java
--- firefox-84.0.2+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtension.java	2021-01-18 19:58:17.000000000 +0000
@@ -63,8 +63,10 @@
     /* package */ interface DelegateController {
         void onMessageDelegate(final String nativeApp, final MessageDelegate delegate);
         void onActionDelegate(final ActionDelegate delegate);
+        void onBrowsingDataDelegate(final BrowsingDataDelegate delegate);
         void onTabDelegate(final TabDelegate delegate);
         ActionDelegate getActionDelegate();
+        BrowsingDataDelegate getBrowsingDataDelegate();
         TabDelegate getTabDelegate();
     }
 
@@ -174,6 +176,173 @@
         }
     }
 
+    @Retention(RetentionPolicy.SOURCE)
+    @LongDef(value = {
+            BrowsingDataDelegate.Type.CACHE,
+            BrowsingDataDelegate.Type.COOKIES,
+            BrowsingDataDelegate.Type.DOWNLOADS,
+            BrowsingDataDelegate.Type.FORM_DATA,
+            BrowsingDataDelegate.Type.HISTORY,
+            BrowsingDataDelegate.Type.LOCAL_STORAGE,
+            BrowsingDataDelegate.Type.PASSWORDS
+    }, flag = true)
+    @interface BrowsingDataTypes {}
+
+    /**
+     * This delegate is used to handle calls from the |browsingData| WebExtension API.
+     *
+     * See also: <a href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/browsingData">
+     *     WebExtensions/API/browsingData
+     * </a>
+     */
+    @UiThread
+    public interface BrowsingDataDelegate {
+        /**
+         * This class represents the current default settings for the "Clear Data"
+         * functionality in the browser.
+         *
+         * See also: <a href="https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/browsingData/settings">
+         *     WebExtensions/API/browsingData/settings
+         * </a>
+         */
+        @UiThread
+        class Settings {
+            /**
+             * Currently selected setting in the browser's "Clear Data" UI for
+             * how far back in time to remove data given in milliseconds
+             * since the UNIX epoch.
+             */
+            final public int sinceUnixTimestamp;
+            /**
+             * Data types that can be toggled in the browser's "Clear Data" UI.
+             * One or more flags from {@link Type}.
+             */
+            final public @BrowsingDataTypes long toggleableTypes;
+
+            /**
+             * Data types currently selected in the browser's "Clear Data" UI.
+             * One or more flags from {@link Type}.
+             */
+            final public @BrowsingDataTypes long selectedTypes;
+
+            /**
+             * Creates an instance of Settings.
+             *
+             * This class represents the current default settings for the "Clear Data"
+             * functionality in the browser.
+             *
+             * @param since Currently selected setting in the browser's "Clear Data" UI for
+             *              how far back in time to remove data given in milliseconds
+             *              since the UNIX epoch.
+             * @param toggleableTypes Data types that can be toggled in the browser's
+             *                        "Clear Data" UI. One or more flags from {@link Type}.
+             * @param selectedTypes   Data types currently selected in the browser's
+             *                        "Clear Data" UI. One or more flags from {@link Type}.
+             */
+            @UiThread
+            public Settings(final int since,
+                            final @BrowsingDataTypes long toggleableTypes,
+                            final @BrowsingDataTypes long selectedTypes) {
+                this.toggleableTypes = toggleableTypes;
+                this.selectedTypes = selectedTypes;
+                this.sinceUnixTimestamp = since;
+            }
+
+            private GeckoBundle fromBrowsingDataType(final @BrowsingDataTypes long types) {
+                final GeckoBundle result = new GeckoBundle(7);
+                result.putBoolean("cache", (types & Type.CACHE) != 0);
+                result.putBoolean("cookies", (types & Type.COOKIES) != 0);
+                result.putBoolean("downloads", (types & Type.DOWNLOADS) != 0);
+                result.putBoolean("formData", (types & Type.FORM_DATA) != 0);
+                result.putBoolean("history", (types & Type.HISTORY) != 0);
+                result.putBoolean("localStorage", (types & Type.LOCAL_STORAGE) != 0);
+                result.putBoolean("passwords", (types & Type.PASSWORDS) != 0);
+                return result;
+            }
+
+            /* package */ GeckoBundle toGeckoBundle() {
+                final GeckoBundle options = new GeckoBundle(1);
+                options.putLong("since", sinceUnixTimestamp);
+
+                final GeckoBundle result = new GeckoBundle(3);
+                result.putBundle("options", options);
+                result.putBundle("dataToRemove", fromBrowsingDataType(selectedTypes));
+                result.putBundle("dataRemovalPermitted", fromBrowsingDataType(toggleableTypes));
+                return result;
+            }
+        }
+
+        /**
+         * Types of data that a browser "Clear Data" UI might have access to.
+         */
+        class Type {
+            protected Type() {}
+            final public static long CACHE = 1 << 0;
+            final public static long COOKIES = 1 << 1;
+            final public static long DOWNLOADS = 1 << 2;
+            final public static long FORM_DATA = 1 << 3;
+            final public static long HISTORY = 1 << 4;
+            final public static long LOCAL_STORAGE = 1 << 5;
+            final public static long PASSWORDS = 1 << 6;
+        }
+
+        /**
+         * Gets current settings for the browser's "Clear Data" UI.
+         *
+         * @return a {@link GeckoResult} that resolves to an instance of {@link Settings} that
+         *         represents the current state for the browser's "Clear Data" UI.
+         * @see Settings
+         */
+        @Nullable
+        default GeckoResult<Settings> onGetSettings() {
+            return null;
+        }
+
+        /**
+         * Clear form data created after the given timestamp.
+         *
+         * @param sinceUnixTimestamp timestamp in seconds since the UNIX Epoch.
+         * @return a {@link GeckoResult} that resolves when data has been cleared.
+         */
+        @Nullable
+        default GeckoResult<Void> onClearFormData(final long sinceUnixTimestamp) {
+            return null;
+        }
+
+        /**
+         * Clear passwords saved after the given timestamp.
+         *
+         * @param sinceUnixTimestamp timestamp in seconds since the UNIX Epoch.
+         * @return a {@link GeckoResult} that resolves when data has been cleared.
+         */
+        @Nullable
+        default GeckoResult<Void> onClearPasswords(final long sinceUnixTimestamp) {
+            return null;
+        }
+
+        /**
+         * Clear history saved after the given timestamp.
+         *
+         * @param sinceUnixTimestamp timestamp in seconds since the UNIX Epoch.
+         * @return a {@link GeckoResult} that resolves when data has been cleared.
+         */
+        @Nullable
+        default GeckoResult<Void> onClearHistory(final long sinceUnixTimestamp) {
+            return null;
+        }
+
+        /**
+         * Clear downloads created after the given timestamp.
+         *
+         * @param sinceUnixTimestamp timestamp in seconds since the UNIX Epoch.
+         * @return a {@link GeckoResult} that resolves when data has been cleared.
+         */
+        @Nullable
+        default GeckoResult<Void> onClearDownloads(final long sinceUnixTimestamp) {
+            return null;
+        }
+    }
+
     /**
      * Delegates that responds to messages sent from a WebExtension.
      */
@@ -651,6 +820,18 @@
         }
     }
 
+    @UiThread
+    @Nullable
+    public BrowsingDataDelegate getBrowsingDataDelegate() {
+        return mDelegateController.getBrowsingDataDelegate();
+    }
+
+    @UiThread
+    public void setBrowsingDataDelegate(final @Nullable BrowsingDataDelegate delegate) {
+        if (mDelegateController != null) {
+            mDelegateController.onBrowsingDataDelegate(delegate);
+        }
+    }
 
     private static class Sender {
         public String webExtensionId;
@@ -803,14 +984,16 @@
     }
 
     /* package */ final static class Listener<TabDelegate> implements BundleEventListener {
-        final private HashMap<Sender, WebExtension.MessageDelegate> mMessageDelegates;
-        final private HashMap<String, WebExtension.ActionDelegate> mActionDelegates;
+        final private HashMap<Sender, MessageDelegate> mMessageDelegates;
+        final private HashMap<String, ActionDelegate> mActionDelegates;
+        final private HashMap<String, BrowsingDataDelegate> mBrowsingDataDelegates;
         final private HashMap<String, TabDelegate> mTabDelegates;
 
         final private GeckoSession mSession;
         final private EventDispatcher mEventDispatcher;
 
         private boolean mActionDelegateRegistered = false;
+        private boolean mBrowsingDataDelegateRegistered = false;
         private boolean mTabDelegateRegistered = false;
 
         public GeckoRuntime runtime;
@@ -837,6 +1020,7 @@
         private Listener(final GeckoSession session, final GeckoRuntime runtime) {
             mMessageDelegates = new HashMap<>();
             mActionDelegates = new HashMap<>();
+            mBrowsingDataDelegates = new HashMap<>();
             mTabDelegates = new HashMap<>();
             mEventDispatcher = session != null
                     ? session.getEventDispatcher()
@@ -850,12 +1034,15 @@
                     "GeckoView:WebExtension:Message",
                     "GeckoView:WebExtension:PortMessage",
                     "GeckoView:WebExtension:Connect",
-                    "GeckoView:WebExtension:Disconnect");
+                    "GeckoView:WebExtension:Disconnect",
+                    "GeckoView:BrowsingData:GetSettings",
+                    "GeckoView:BrowsingData:Clear");
         }
 
         public void unregisterWebExtension(final WebExtension extension) {
             mMessageDelegates.remove(extension.id);
             mActionDelegates.remove(extension.id);
+            mBrowsingDataDelegates.remove(extension.id);
             mTabDelegates.remove(extension.id);
         }
 
@@ -879,6 +1066,15 @@
             return mTabDelegates.get(webExtension.id);
         }
 
+        public void setBrowsingDataDelegate(final WebExtension webExtension,
+                                            final BrowsingDataDelegate delegate) {
+            mBrowsingDataDelegates.put(webExtension.id, delegate);
+        }
+
+        public BrowsingDataDelegate getBrowsingDataDelegate(final WebExtension webExtension) {
+            return mBrowsingDataDelegates.get(webExtension.id);
+        }
+
         public void setActionDelegate(final WebExtension webExtension,
                                       final WebExtension.ActionDelegate delegate) {
             if (!mActionDelegateRegistered && delegate != null) {
diff -Nru firefox-84.0.2+build1/mobile/android/locales/filter.py firefox-85.0+build1/mobile/android/locales/filter.py
--- firefox-84.0.2+build1/mobile/android/locales/filter.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/locales/filter.py	2021-01-18 19:58:18.000000000 +0000
@@ -24,7 +24,6 @@
             "chrome/global/commonDialogs.properties",
             "chrome/global/intl.properties",
             "chrome/global/intl.css",
-            "chrome/pluginproblem/pluginproblem.dtd",
             "chrome/global/aboutWebrtc.properties",
         ):
             return "error"
diff -Nru firefox-84.0.2+build1/mobile/android/locales/jar.mn firefox-85.0+build1/mobile/android/locales/jar.mn
--- firefox-84.0.2+build1/mobile/android/locales/jar.mn	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/locales/jar.mn	2021-01-18 19:58:18.000000000 +0000
@@ -28,8 +28,6 @@
   locale/@AB_CD@/browser/overrides/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
   locale/@AB_CD@/browser/overrides/intl.properties                 (%chrome/global/intl.properties)
   locale/@AB_CD@/browser/overrides/intl.css                        (%chrome/global/intl.css)
-# plugins
-  locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd       (%chrome/pluginproblem/pluginproblem.dtd)
 #about:webrtc
   locale/@AB_CD@/browser/overrides/global/aboutWebrtc.properties  (%chrome/global/aboutWebrtc.properties)
 
diff -Nru firefox-84.0.2+build1/mobile/android/locales/l10n.toml firefox-85.0+build1/mobile/android/locales/l10n.toml
--- firefox-84.0.2+build1/mobile/android/locales/l10n.toml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/locales/l10n.toml	2021-01-18 19:58:18.000000000 +0000
@@ -201,10 +201,6 @@
     l10n = "{l}toolkit/chrome/global/intl.css"
 
 [[paths]]
-    reference = "toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd"
-    l10n = "{l}toolkit/chrome/pluginproblem/pluginproblem.dtd"
-
-[[paths]]
     reference = "toolkit/locales/en-US/chrome/global/aboutSupport.dtd"
     l10n = "{l}toolkit/chrome/global/aboutSupport.dtd"
 
diff -Nru firefox-84.0.2+build1/mobile/android/modules/geckoview/GeckoViewProgress.jsm firefox-85.0+build1/mobile/android/modules/geckoview/GeckoViewProgress.jsm
--- firefox-84.0.2+build1/mobile/android/modules/geckoview/GeckoViewProgress.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/modules/geckoview/GeckoViewProgress.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -197,13 +197,6 @@
   start(aUri) {
     debug`ProgressTracker start ${aUri}`;
 
-    if (this._data?.uri == aUri && this._eventReceived) {
-      // TODO: Bug 1672430. When switching process we get two START events,
-      // let's ignore the second one.
-      debug`ProgressTracker Ignoring duplicate load`;
-      return;
-    }
-
     if (this._eventReceived) {
       // A request was already in process, let's cancel it
       this.stop(/* isSuccess */ false);
@@ -420,13 +413,6 @@
   }
 
   start(aUri) {
-    if (this._inProgress && this._uri == aUri) {
-      // TODO: Bug 1672430. When switching process we get two START events,
-      // let's ignore the second one.
-      debug`StateTracker Ignoring duplicate load`;
-      return;
-    }
-
     this._inProgress = true;
     this._uri = aUri;
     this.eventDispatcher.sendRequest({
diff -Nru firefox-84.0.2+build1/mobile/android/modules/geckoview/GeckoViewStorageController.jsm firefox-85.0+build1/mobile/android/modules/geckoview/GeckoViewStorageController.jsm
--- firefox-84.0.2+build1/mobile/android/modules/geckoview/GeckoViewStorageController.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/android/modules/geckoview/GeckoViewStorageController.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,9 @@
   "resource://gre/modules/GeckoViewUtils.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { PrincipalsCollector } = ChromeUtils.import(
+  "resource://gre/modules/PrincipalsCollector.jsm"
+);
 
 const { debug, warn } = GeckoViewUtils.initLogging(
   "GeckoViewStorageController"
@@ -38,8 +41,7 @@
     // HISTORY
     1 << 3,
     Ci.nsIClearDataService.CLEAR_HISTORY |
-      Ci.nsIClearDataService.CLEAR_SESSION_HISTORY |
-      Ci.nsIClearDataService.CLEAR_STORAGE_ACCESS,
+      Ci.nsIClearDataService.CLEAR_SESSION_HISTORY,
   ],
   [
     // DOM_STORAGES
@@ -108,9 +110,29 @@
     }
   },
 
-  clearData(aFlags, aCallback) {
+  async clearData(aFlags, aCallback) {
+    const flags = convertFlags(aFlags);
+
+    // storageAccessAPI permissions record every site that the user
+    // interacted with and thus mirror history quite closely. It makes
+    // sense to clear them when we clear history. However, since their absence
+    // indicates that we can purge cookies and site data for tracking origins without
+    // user interaction, we need to ensure that we only delete those permissions that
+    // do not have any existing storage.
+    if (flags & Ci.nsIClearDataService.CLEAR_HISTORY) {
+      const principalsCollector = new PrincipalsCollector();
+      const principals = await principalsCollector.getAllPrincipals();
+      await new Promise(resolve => {
+        Services.clearData.deleteUserInteractionForClearingHistory(
+          principals,
+          0,
+          resolve
+        );
+      });
+    }
+
     new Promise(resolve => {
-      Services.clearData.deleteData(convertFlags(aFlags), resolve);
+      Services.clearData.deleteData(flags, resolve);
     }).then(resultFlags => {
       aCallback.onSuccess();
     });
diff -Nru firefox-84.0.2+build1/mobile/locales/filter.py firefox-85.0+build1/mobile/locales/filter.py
--- firefox-84.0.2+build1/mobile/locales/filter.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mobile/locales/filter.py	2021-01-18 19:58:18.000000000 +0000
@@ -24,7 +24,6 @@
             "chrome/global/commonDialogs.properties",
             "chrome/global/intl.properties",
             "chrome/global/intl.css",
-            "chrome/pluginproblem/pluginproblem.dtd",
             "chrome/global/aboutWebrtc.properties",
         ):
             return "error"
diff -Nru firefox-84.0.2+build1/modules/libjar/nsJARChannel.cpp firefox-85.0+build1/modules/libjar/nsJARChannel.cpp
--- firefox-84.0.2+build1/modules/libjar/nsJARChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libjar/nsJARChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsContentUtils.h"
 #include "nsProxyRelease.h"
 #include "nsContentSecurityManager.h"
+#include "nsComponentManagerUtils.h"
 
 #include "nsIFileURL.h"
 
@@ -499,7 +500,7 @@
 
   nsresult rv;
 
-  auto suspendCount = mPendingEvent.suspendCount;
+  uint32_t suspendCount = mPendingEvent.suspendCount;
   while (suspendCount--) {
     if (NS_WARN_IF(NS_FAILED(rv = mPump->Suspend()))) {
       return rv;
@@ -1051,6 +1052,7 @@
   // events.
   uint32_t from = findFilenameStart(aFileName);
 
+  Telemetry::SetEventRecordingEnabled("network.jar.channel"_ns, true);
   Telemetry::EventID eventType =
       Telemetry::EventID::NetworkJarChannel_Nodata_Onstop;
   Telemetry::RecordEvent(eventType, mozilla::Some(Substring(aFileName, from)),
diff -Nru firefox-84.0.2+build1/modules/libjar/nsJARChannel.h firefox-85.0+build1/modules/libjar/nsJARChannel.h
--- firefox-84.0.2+build1/modules/libjar/nsJARChannel.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libjar/nsJARChannel.h	2021-01-18 19:58:18.000000000 +0000
@@ -24,6 +24,7 @@
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/Logging.h"
 
 class nsJARInputThunk;
@@ -92,7 +93,7 @@
   // |Cancel()|, |Suspend()|, and |Resume()| might be called during AsyncOpen.
   struct {
     bool isCanceled;
-    uint32_t suspendCount;
+    Atomic<uint32_t> suspendCount;
   } mPendingEvent;
 
   nsCOMPtr<nsIInputStreamPump> mPump;
diff -Nru firefox-84.0.2+build1/modules/libjar/nsJARProtocolHandler.cpp firefox-85.0+build1/modules/libjar/nsJARProtocolHandler.cpp
--- firefox-84.0.2+build1/modules/libjar/nsJARProtocolHandler.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libjar/nsJARProtocolHandler.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/ClearOnShutdown.h"
 #include "nsJARProtocolHandler.h"
+#include "nsComponentManagerUtils.h"
 #include "nsCRT.h"
 #include "nsJARURI.h"
 #include "nsJARChannel.h"
diff -Nru firefox-84.0.2+build1/modules/libpref/init/all.js firefox-85.0+build1/modules/libpref/init/all.js
--- firefox-84.0.2+build1/modules/libpref/init/all.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/init/all.js	2021-01-18 19:58:18.000000000 +0000
@@ -172,14 +172,6 @@
 // https://tools.ietf.org/html/rfc7469#section-4.1
 pref("security.cert_pinning.max_max_age_seconds", 5184000);
 
-// security.pki.distrust_ca_policy controls what root program distrust policies
-// are enforced at this time:
-// 0: No distrust policies enforced
-// 1: Symantec roots distrusted for certificates issued after cutoff
-// 2: Symantec roots distrusted regardless of date
-// See https://wiki.mozilla.org/CA/Upcoming_Distrust_Actions for more details.
-pref("security.pki.distrust_ca_policy", 2);
-
 // 0: Disable CRLite entirely
 // 1: Enable and check revocations via CRLite, but only collect telemetry
 // 2: Enable and enforce revocations via CRLite
@@ -890,6 +882,10 @@
 // Stringified array of target browsers that users investigate.
 pref("devtools.inspector.compatibility.target-browsers", "");
 
+// Storage preferencex
+// Force instancing legacy storage actors
+pref("devtools.storage.test.forceLegacyActors", false);
+
 // view source
 pref("view_source.editor.path", "");
 // allows to add further arguments to the editor; use the %LINE% placeholder
@@ -907,6 +903,7 @@
 // URI fixup prefs
 pref("browser.fixup.alternate.enabled", true);
 pref("browser.fixup.alternate.prefix", "www.");
+pref("browser.fixup.alternate.protocol", "https");
 pref("browser.fixup.alternate.suffix", ".com");
 pref("browser.fixup.fallback-to-https", true);
 
@@ -1048,9 +1045,11 @@
 //   3 = openAbused
 pref("privacy.popups.disable_from_plugins", 3);
 
-// Enable Paritioned LocalStorage for a list of hosts when detected as trackers
+// Fix cookie blocking breakage by providing ephemeral Paritioned LocalStorage
+// for a list of hosts when detected as trackers.
 // (See nsICookieService::BEHAVIOR_REJECT_TRACKER cookie behavior)
-pref("privacy.restrict3rdpartystorage.partitionedHosts", "accounts.google.com/o/oauth2/");
+// See: Bug 1505212, Bug 1659394, Bug 1631811, Bug 1665035.
+pref("privacy.restrict3rdpartystorage.partitionedHosts", "accounts.google.com/o/oauth2/,d35nw2lg0ahg0v.cloudfront.net/,datastudio.google.com/embed/reporting/,d3qlaywcwingl6.cloudfront.net/");
 
 // If a host is contained in this pref list, user-interaction is required
 // before granting the storage access permission.
@@ -1096,7 +1095,6 @@
 // Duplicated in JitOptions - ensure both match.
 pref("javascript.options.baselinejit.threshold", 100);
 pref("javascript.options.ion",              true);
-pref("javascript.options.warp",             true);
 // Duplicated in JitOptions - ensure both match.
 pref("javascript.options.ion.threshold",    1500);
 pref("javascript.options.ion.full.threshold", 100000);
@@ -1519,6 +1517,11 @@
   pref("network.http.active_tab_priority", true);
 #endif
 
+// By default the Accept header sent for documents loaded over HTTP(S) is derived
+// by DocumentAcceptHeader() in nsHttpHandler.cpp. If set, this pref overrides it.
+// There is also image.http.accept which works in scope of image.
+pref("network.http.accept", "");
+
 // default values for FTP
 // in a DSCP environment this should be 40 (0x28, or AF11), per RFC-4594,
 // Section 4.8 "High-Throughput Data Service Class", and 80 (0x50, or AF22)
@@ -1987,12 +1990,6 @@
 pref("font.language.group",                 "chrome://global/locale/intl.properties");
 pref("font.cjk_pref_fallback_order",        "zh-cn,zh-hk,zh-tw,ja,ko");
 
-// If you use legacy Chinese IME which puts an ideographic space to composition
-// string as placeholder, this pref might be useful.  If this is true and when
-// web contents forcibly commits composition (e.g., moving focus), the
-// ideographic space will be ignored (i.e., commits with empty string).
-pref("intl.ime.remove_placeholder_character_at_commit", false);
-
 pref("intl.uidirection", -1); // -1 to set from locale; 0 for LTR; 1 for RTL
 
 // use en-US hyphenation by default for content tagged with plain lang="en"
@@ -3156,7 +3153,7 @@
   pref("font.name-list.fantasy.he", "Times New Roman");
 
   pref("font.name-list.serif.ja", "Hiragino Mincho ProN, Hiragino Mincho Pro");
-  pref("font.name-list.sans-serif.ja", "Hiragino Kaku Gothic ProN, Hiragino Kaku Gothic Pro");
+  pref("font.name-list.sans-serif.ja", "Hiragino Kaku Gothic ProN, Hiragino Kaku Gothic Pro, Hiragino Sans");
   pref("font.name-list.monospace.ja", "Osaka-Mono");
 
   pref("font.name-list.serif.ko", "AppleMyungjo");
@@ -3605,7 +3602,7 @@
   pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Noto Sans Mono CJK JP, SEC Mono CJK JP, Droid Sans Mono");
 
   pref("font.name-list.serif.ko", "Charis SIL Compact, Noto Serif CJK KR, Noto Serif, Droid Serif, HYSerif");
-  pref("font.name-list.sans-serif.ko", "Roboto, Google Sans, SmartGothic, NanumGothic, Noto Sans KR, Noto Sans CJK KR, SEC CJK KR, DroidSansFallback, Droid Sans Fallback");
+  pref("font.name-list.sans-serif.ko", "Roboto, Google Sans, SmartGothic, NanumGothic, Noto Sans KR, Noto Sans CJK KR, SamsungKorean_v2.0, SEC CJK KR, DroidSansFallback, Droid Sans Fallback");
   pref("font.name-list.monospace.ko", "Droid Sans Mono, Noto Sans Mono CJK KR, SEC Mono CJK KR");
 
   pref("font.name-list.serif.th", "Charis SIL Compact, Noto Serif, Noto Serif Thai, Droid Serif");
@@ -3746,7 +3743,7 @@
 
 // Zoom prefs
 pref("browser.zoom.full", false);
-pref("toolkit.zoomManager.zoomValues", ".3,.5,.67,.8,.9,1,1.1,1.2,1.33,1.5,1.7,2,2.4,3");
+pref("toolkit.zoomManager.zoomValues", ".3,.5,.67,.8,.9,1,1.1,1.2,1.33,1.5,1.7,2,2.4,3,4,5");
 
 //
 // Image-related prefs
@@ -3754,6 +3751,7 @@
 
 // By default the Accept header sent for images loaded over HTTP(S) is derived
 // by ImageAcceptHeader() in nsHttpHandler.cpp. If set, this pref overrides it.
+// There is also network.http.accept which works in scope of document.
 pref("image.http.accept", "");
 
 //
@@ -3812,6 +3810,7 @@
   pref("gfx.xrender.enabled",false);
   pref("widget.content.gtk-theme-override", "");
   pref("widget.disable-workspace-management", false);
+  pref("widget.titlebar-x11-use-shape-mask", false);
 #endif
 #ifdef MOZ_WAYLAND
   pref("widget.wayland_vsync.enabled", false);
@@ -4332,13 +4331,6 @@
 // Only make voices that match content language available.
 pref("narrate.filter-voices", true);
 
-// Allow control characters appear in composition string.
-// When this is false, control characters except
-// CHARACTER TABULATION (horizontal tab) are removed from
-// both composition string and data attribute of compositionupdate
-// and compositionend events.
-pref("dom.compositionevent.allow_control_characters", false);
-
 pref("memory.report_concurrency", 10);
 
 // Add Mozilla AudioChannel APIs.
@@ -4661,8 +4653,6 @@
   pref("devtools.debugger.remote-enabled", true, sticky);
 #endif
 
-pref("devtools.debugger.features.watchpoints", true);
-
 // Disable service worker debugging on all channels (see Bug 1651605).
 pref("devtools.debugger.features.windowless-service-workers", false);
 
@@ -4728,3 +4718,8 @@
 //preferred external application for a protocol. If a site doesn't have
 // permission we will show a prompt.
 pref("security.external_protocol_requires_permission", true);
+
+// Whether about:support shows a section "Third-Party Modules" or not
+#ifdef XP_WIN
+  pref("browser.enableAboutThirdParty", false);
+#endif
diff -Nru firefox-84.0.2+build1/modules/libpref/init/generate_static_pref_list.py firefox-85.0+build1/modules/libpref/init/generate_static_pref_list.py
--- firefox-84.0.2+build1/modules/libpref/init/generate_static_pref_list.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/init/generate_static_pref_list.py	2021-01-18 19:58:18.000000000 +0000
@@ -57,7 +57,10 @@
     "float": "f32",
 }
 
-FIRST_LINE = "// This file was generated by generate_static_pref_list.py. DO NOT EDIT."
+HEADER_LINE = (
+    "// This file was generated by generate_static_pref_list.py from {input_filename}."
+    " DO NOT EDIT."
+)
 
 MIRROR_TEMPLATES = {
     "never": """\
@@ -222,19 +225,21 @@
         prev_pref = pref
 
 
-def generate_code(pref_list):
+def generate_code(pref_list, input_filename):
     check_pref_list(pref_list)
 
+    first_line = HEADER_LINE.format(input_filename=input_filename)
+
     # The required includes for StaticPrefs_<group>.h.
     includes = defaultdict(set)
 
     # StaticPrefList_<group>.h contains all the pref definitions for this
     # group.
-    static_pref_list_group_h = defaultdict(lambda: [FIRST_LINE, ""])
+    static_pref_list_group_h = defaultdict(lambda: [first_line, ""])
 
     # StaticPrefsCGetters.cpp contains C getters for all the mirrored prefs,
     # for use by Rust code.
-    static_prefs_c_getters_cpp = [FIRST_LINE, ""]
+    static_prefs_c_getters_cpp = [first_line, ""]
 
     # static_prefs.rs contains C getter declarations and a macro.
     static_prefs_rs_decls = []
@@ -310,7 +315,7 @@
 
     # StaticPrefListAll.h contains one `#include "mozilla/StaticPrefList_X.h`
     # line per pref group.
-    static_pref_list_all_h = [FIRST_LINE, ""]
+    static_pref_list_all_h = [first_line, ""]
     static_pref_list_all_h.extend(
         '#include "mozilla/StaticPrefList_{}.h"'.format(group)
         for group in sorted(static_pref_list_group_h)
@@ -319,7 +324,7 @@
 
     # StaticPrefsAll.h contains one `#include "mozilla/StaticPrefs_X.h` line per
     # pref group.
-    static_prefs_all_h = [FIRST_LINE, ""]
+    static_prefs_all_h = [first_line, ""]
     static_prefs_all_h.extend(
         '#include "mozilla/StaticPrefs_{}.h"'.format(group)
         for group in sorted(static_pref_list_group_h)
@@ -330,7 +335,7 @@
     # used directly by application code.
     static_prefs_group_h = defaultdict(list)
     for group in sorted(static_pref_list_group_h):
-        static_prefs_group_h[group] = [FIRST_LINE]
+        static_prefs_group_h[group] = [first_line]
         static_prefs_group_h[group].append(
             STATIC_PREFS_GROUP_H_TEMPLATE1.format(group=group)
         )
@@ -344,7 +349,7 @@
         )
 
     # static_prefs.rs contains the Rust macro getters.
-    static_prefs_rs = [FIRST_LINE, "", 'extern "C" {']
+    static_prefs_rs = [first_line, "", 'extern "C" {']
     static_prefs_rs.extend(static_prefs_rs_decls)
     static_prefs_rs.extend(["}", "", "#[macro_export]", "macro_rules! pref {"])
     static_prefs_rs.extend(static_prefs_rs_macro)
@@ -382,7 +387,11 @@
 
     try:
         pref_list = yaml.safe_load(pp.out.getvalue())
-        code = generate_code(pref_list)
+        input_file = os.path.relpath(
+            pref_list_filename,
+            os.environ.get("GECKO_PATH", os.environ.get("TOPSRCDIR")),
+        )
+        code = generate_code(pref_list, input_file)
     except (IOError, ValueError) as e:
         print("{}: error:\n  {}\n".format(pref_list_filename, e))
         sys.exit(1)
diff -Nru firefox-84.0.2+build1/modules/libpref/init/StaticPrefList.yaml firefox-85.0+build1/modules/libpref/init/StaticPrefList.yaml
--- firefox-84.0.2+build1/modules/libpref/init/StaticPrefList.yaml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/init/StaticPrefList.yaml	2021-01-18 19:58:18.000000000 +0000
@@ -230,6 +230,12 @@
     type: bool
     value: true
     mirror: always
+
+-   name: android.touch_resampling.enabled
+    type: RelaxedAtomicBool
+    value: true
+    mirror: always
+
 #endif
 
 #---------------------------------------------------------------------------
@@ -670,11 +676,6 @@
   value: 500
   mirror: always
 
-- name: apz.relative-update.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
 #---------------------------------------------------------------------------
 # Prefs starting with "beacon."
 #---------------------------------------------------------------------------
@@ -969,6 +970,18 @@
 #endif
   mirror: always
 
+# Whether we should always enable focus rings after focus was moved by keyboard.
+#
+# This behavior matches both historical and GTK / Windows focus behavior.
+#
+# :focus-visible is intended to provide better heuristics than this, so for now
+# we make this false whenever layout.css.focus-visible.enabled is enabled by
+# default.
+- name: browser.display.always_show_rings_after_key_focus
+  type: bool
+  value: false
+  mirror: always
+
 # In theory: 0 = never, 1 = quick, 2 = always, though we always just use it as
 # a bool!
 - name: browser.display.use_document_fonts
@@ -992,6 +1005,11 @@
   value: @IS_NOT_MOZILLA_OFFICIAL@
   mirror: always
 
+- name: browser.download.sanitize_non_media_extensions
+  type: bool
+  value: true
+  mirror: always
+
 # Image document's automatic image sizing.
 - name: browser.enable_automatic_image_resizing
   type: bool
@@ -1004,6 +1022,22 @@
   value: @IS_NOT_ANDROID@
   mirror: always
 
+# The max url length we'll store in history.
+#
+# The default value is mostly a guess based on various facts:
+#
+# * IE didn't support urls longer than 2083 chars
+# * Sitemaps protocol used to support a maximum of 2048 chars
+# * Various SEO guides suggest to not go over 2000 chars
+# * Various apps/services are known to have issues over 2000 chars
+# * RFC 2616 - HTTP/1.1 suggests being cautious about depending
+#   on URI lengths above 255 bytes
+#
+- name: browser.history.maxUrlLength
+  type: uint32_t
+  value: 2000
+  mirror: always
+
 # Render animations and videos as a solid color
 - name: browser.measurement.render_anims_and_video_solid
   type: RelaxedAtomicBool
@@ -1556,19 +1590,35 @@
   value: false
   mirror: always
 
+# Allow control characters appear in composition string.
+# When this is false, control characters except
+# CHARACTER TABULATION (horizontal tab) are removed from
+# both composition string and data attribute of compositionupdate
+# and compositionend events.
+- name: dom.compositionevent.allow_control_characters
+  type: bool
+  value: false
+  mirror: always
+
 # Is support for CSSPseudoElement enabled?
 - name: dom.css_pseudo_element.enabled
   type: bool
   value: false
   mirror: always
 
-# Any how many seconds we allow external protocol URLs in iframe when not in
+# After how many seconds we allow external protocol URLs in iframe when not in
 # single events
 - name: dom.delay.block_external_protocol_in_iframes
   type: uint32_t
   value: 10   # in seconds
   mirror: always
 
+# Whether the above pref has any effect at all.
+- name: dom.delay.block_external_protocol_in_iframes.enabled
+  type: bool
+  value: @IS_NOT_NIGHTLY_BUILD@
+  mirror: always
+
 # HTML <dialog> element
 - name: dom.dialog_element.enabled
   type: bool
@@ -2182,6 +2232,11 @@
   value: 2.0f
   mirror: always
 
+- name: dom.menuitem.enabled
+  type: bool
+  value: false
+  mirror: always
+
 # Enable meta-viewport support in remote APZ-enabled frames.
 - name: dom.meta-viewport.enabled
   type: RelaxedAtomicBool
@@ -2820,6 +2875,12 @@
   value: 5 * 1024
   mirror: always
 
+# Per-site quota for legacy LocalStorage implementation.
+- name: dom.storage.default_site_quota
+  type: RelaxedAtomicUint32
+  value: 25 * 1024
+  mirror: always
+
 # Whether or not LSNG (Next Generation Local Storage) is enabled.
 # See bug 1517090 for enabling this on Nightly.
 # See bug 1534736 for changing it to EARLY_BETA_OR_EARLIER.
@@ -4189,13 +4250,7 @@
 
 - name: gfx.direct3d11.use-double-buffering
   type: RelaxedAtomicBool
-#ifdef XP_WIN
-  # Prefer flipping between two buffers over copying from our back buffer
-  # to the OS.
-  value: @IS_NIGHTLY_BUILD@
-#else
   value: false
-#endif
   mirror: always
 
 - name: gfx.direct3d11.enable-debug-layer
@@ -4470,7 +4525,7 @@
 #ifdef XP_WIN
 - name: gfx.webrender.enabled-no-gpu-process-with-angle-win
   type: bool
-  value: @IS_EARLY_BETA_OR_EARLIER@
+  value: true
   mirror: once
 #endif
 
@@ -4569,6 +4624,8 @@
   value: 25
   mirror: once
 
+# Number of damage rects we can give to the compositor for a new frame with
+# partial present. This controls whether partial present is used or not.
 - name: gfx.webrender.max-partial-present-rects
   type: uint32_t
 #if defined(XP_WIN) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)
@@ -4578,6 +4635,14 @@
 #endif
   mirror: once
 
+# Whether or not we can reuse the buffer contents using the GL buffer age
+# extension, if supported by the platform. This requires partial present
+# to be used.
+- name: gfx.webrender.allow-partial-present-buffer-age
+  type: bool
+  value: true
+  mirror: once
+
 - name: gfx.webrender.enable-gpu-markers
   type: bool
 #ifdef DEBUG
@@ -4695,7 +4760,7 @@
 # Whether to use the D3D11 RenderCompositor when using WebRender software backend
 - name: gfx.webrender.software.d3d11
   type: bool
-  value: true 
+  value: true
   mirror: once
 
 # Use vsync events generated by hardware
@@ -5043,6 +5108,24 @@
   value: @IS_ANDROID@
   mirror: always
 
+#ifdef XP_WIN
+  # If true, automatically extend selection to cluster boundaries when
+  # TSF/TIP requests to select from/by middle of a cluster.
+-   name: intl.tsf.hack.extend_setting_selection_range_to_cluster_boundaries
+    type: bool
+    value: @IS_NOT_EARLY_BETA_OR_EARLIER@
+    mirror: always
+#endif
+
+# If you use legacy Chinese IME which puts an ideographic space to composition
+# string as placeholder, this pref might be useful.  If this is true and when
+# web contents forcibly commits composition (e.g., moving focus), the
+# ideographic space will be ignored (i.e., commits with empty string).
+- name: intl.ime.remove_placeholder_character_at_commit
+  type: bool
+  value: false
+  mirror: always
+
 #---------------------------------------------------------------------------
 # Prefs starting with "javascript."
 #---------------------------------------------------------------------------
@@ -5099,6 +5182,12 @@
   type: RelaxedAtomicBool
   value: false
   mirror: always
+
+  # Experimental support for Top-level Await in JavaScript.
+- name: javascript.options.experimental.top_level_await
+  type: RelaxedAtomicBool
+  value: false
+  mirror: always
 #endif
 
 # The amount of time we wait between a request to GC (due to leaving a page) and doing the actual GC, in ms.
@@ -5113,7 +5202,8 @@
   value: 10000
   mirror: always
 
-# Duration of the dom events full gc delay, in ms.
+# After doing a zonal GC, wait this much time (in ms) and then do a full GC,
+# unless one is already pending.
 - name: javascript.options.gc_delay.full
   type: uint32_t
   value: 60000
@@ -5532,11 +5622,7 @@
 
 - name: layers.mlgpu.enabled
   type: bool
-#if defined(XP_WIN)
-  value: true
-#else
   value: false
-#endif
   mirror: once
   do_not_use_directly: true
 
@@ -5943,11 +6029,12 @@
 
 # Whether the `:focus-visible` pseudo-class is enabled.
 #
-# TODO: There are various ambiguities in the spec about this, so we shouldn't
-# ship this until those are sorted out.
+# NOTE: You probably want to change the default value of
+# browser.display.always_show_rings_after_key_focus whenever you change the
+# default value of this pref.
 - name: layout.css.focus-visible.enabled
   type: RelaxedAtomicBool
-  value: @IS_NIGHTLY_BUILD@
+  value: true
   mirror: always
   rust: true
 
@@ -6016,13 +6103,6 @@
   value: false
   mirror: always
 
-# Is support for CSS conic-gradient enabled?
-- name: layout.css.conic-gradient.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-  rust: true
-
 # Should stray control characters be rendered visibly?
 - name: layout.css.control-characters.visible
   type: RelaxedAtomicBool
@@ -6477,7 +6557,7 @@
 
 - name: layout.display-list.improve-fragmentation
   type: RelaxedAtomicBool
-  value: false
+  value: true
   mirror: always
 
 # Are dynamic reflow roots enabled?
@@ -7142,11 +7222,7 @@
 - name: media.rdd-process.enabled
   type: RelaxedAtomicBool
 #if defined(XP_WIN)
-#if defined(_ARM64_)
-  value: false
-#else
   value: true
-#endif
 #elif defined(XP_MACOSX)
   value: true
 #elif defined(XP_LINUX) && !defined(ANDROID)
@@ -7156,6 +7232,11 @@
 #endif
   mirror: always
 
+- name: media.rdd-retryonfailure.enabled
+  type: RelaxedAtomicBool
+  value: true
+  mirror: always
+
 - name: media.rdd-process.startup_timeout_ms
   type: RelaxedAtomicInt32
   value: 5000
@@ -7171,12 +7252,12 @@
 #ifdef MOZ_FFVPX
 - name: media.rdd-ffvpx.enabled
   type: RelaxedAtomicBool
-#if defined(XP_WIN) && !defined(_ARM64_)
-  value: @IS_NIGHTLY_BUILD@
+#if defined(XP_WIN)
+  value: true
 #elif defined(XP_MACOSX)
-  value: @IS_NIGHTLY_BUILD@
+  value: true
 #elif defined(XP_LINUX) && !defined(ANDROID)
-  value: @IS_NIGHTLY_BUILD@
+  value: true
 #else
   value: false
 #endif
@@ -7186,29 +7267,25 @@
 #ifdef MOZ_WMF
 - name: media.rdd-wmf.enabled
   type: RelaxedAtomicBool
-#if defined(XP_WIN) && !defined(_ARM64_)
-  value: @IS_NIGHTLY_BUILD@
-#else
-  value: false
-#endif
+  value: true
   mirror: always
 #endif
 
 #ifdef MOZ_APPLEMEDIA
 - name: media.rdd-applemedia.enabled
   type: RelaxedAtomicBool
-  value: @IS_NIGHTLY_BUILD@
+  value: true
   mirror: always
 #endif
 
 - name: media.rdd-theora.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && !defined(ANDROID)
-  value: @IS_NIGHTLY_BUILD@
-#elif defined(XP_WIN) && !defined(_ARM64_)
-  value: @IS_NIGHTLY_BUILD@
+#if defined(XP_WIN)
+  value: true
 #elif defined(XP_MACOSX)
-  value: @IS_NIGHTLY_BUILD@
+  value: true
+#elif defined(XP_LINUX) && !defined(ANDROID)
+  value: true
 #else
   value: false
 #endif
@@ -7216,11 +7293,11 @@
 
 - name: media.rdd-vorbis.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && !defined(ANDROID)
+#if defined(XP_WIN)
   value: true
 #elif defined(XP_MACOSX)
   value: true
-#elif defined(XP_WIN) && !defined(_ARM64_)
+#elif defined(XP_LINUX) && !defined(ANDROID)
   value: true
 #else
   value: false
@@ -7229,12 +7306,12 @@
 
 - name: media.rdd-vpx.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && !defined(ANDROID)
-  value: @IS_NIGHTLY_BUILD@
-#elif defined(XP_WIN) && !defined(_ARM64_)
-  value: @IS_NIGHTLY_BUILD@
+#if defined(XP_WIN)
+  value: true
 #elif defined(XP_MACOSX)
-  value: @IS_NIGHTLY_BUILD@
+  value: true
+#elif defined(XP_LINUX) && !defined(ANDROID)
+  value: true
 #else
   value: false
 #endif
@@ -7242,12 +7319,12 @@
 
 - name: media.rdd-wav.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && !defined(ANDROID)
-  value: true
-#elif defined(XP_WIN) && !defined(_ARM64_)
+#if defined(XP_WIN)
   value: true
 #elif defined(XP_MACOSX)
   value: true
+#elif defined(XP_LINUX) && !defined(ANDROID)
+  value: true
 #else
   value: false
 #endif
@@ -7255,12 +7332,12 @@
 
 - name: media.rdd-opus.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && !defined(ANDROID)
-  value: true
-#elif defined(XP_WIN) && !defined(_ARM64_)
+#if defined(XP_WIN)
   value: true
 #elif defined(XP_MACOSX)
   value: true
+#elif defined(XP_LINUX) && !defined(ANDROID)
+  value: true
 #else
   value: false
 #endif
@@ -8433,10 +8510,10 @@
   value: false
   mirror: always
 
-# Enables `<link rel="preload">` tag and `Link: rel=preload` respose header handling.
+# Enables `<link rel="preload">` tag and `Link: rel=preload` response header handling.
 - name: network.preload
   type: RelaxedAtomicBool
-  value: @IS_EARLY_BETA_OR_EARLIER@
+  value: true
   mirror: always
 
 # Whether to use the network process or not
@@ -8540,12 +8617,6 @@
   value: true
   mirror: always
 
-# Whether to use sni encryption.
-- name: network.security.esni.enabled
-  type: bool
-  value: false
-  mirror: always
-
 # Whether to cache SSL resumption tokens in necko.
 - name: network.ssl_tokens_cache_enabled
   type: RelaxedAtomicBool
@@ -8770,6 +8841,13 @@
   value: false
   mirror: always
 
+# When a h3 transaction is inserted in the pending queue, the time (ms) we wait
+# to create a TCP backup connection.
+- name: network.http.http3.backup_timer_delay
+  type: RelaxedAtomicUint32
+  value: 100
+  mirror: always
+
 # When true, a http request will be upgraded to https when HTTPS RR is
 # available.
 - name: network.dns.upgrade_with_https_rr
@@ -8983,6 +9061,12 @@
   value: @IS_EARLY_BETA_OR_EARLIER@
   mirror: always
 
+# Whether the pages per sheet print setting is enabled.
+- name: print.pages_per_sheet.enabled
+  type: RelaxedAtomicBool
+  value: true
+  mirror: always
+
 # Whether we allow the print progress dialog to show up.
 - name: print.show_print_progress
   type: RelaxedAtomicBool
@@ -9336,7 +9420,7 @@
 
 - name: privacy.partition.network_state
   type: RelaxedAtomicBool
-  value: @IS_EARLY_BETA_OR_EARLIER@
+  value: true
   mirror: always
 
 - name: privacy.partition.bloburl_per_agent_cluster
@@ -10397,7 +10481,7 @@
 #ifdef ANDROID
   value: 400
 #else
-  value: 300
+  value: 500
 #endif
   mirror: always
 
diff -Nru firefox-84.0.2+build1/modules/libpref/Preferences.cpp firefox-85.0+build1/modules/libpref/Preferences.cpp
--- firefox-84.0.2+build1/modules/libpref/Preferences.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/Preferences.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -14,9 +14,6 @@
 
 #include "base/basictypes.h"
 #include "GeckoProfiler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "MainThreadUtils.h"
 #include "mozilla/ArenaAllocatorExtensions.h"
 #include "mozilla/ArenaAllocator.h"
@@ -36,6 +33,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/ServoStyleSet.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefsAll.h"
 #include "mozilla/SyncRunnable.h"
@@ -49,6 +47,7 @@
 #include "nsClassHashtable.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsCRT.h"
 #include "nsDataHashtable.h"
 #include "nsDirectoryServiceDefs.h"
@@ -2983,40 +2982,79 @@
   // that there are no outstanding writes left incomplete, and thus our prefs
   // on disk are in sync with what we have in memory.
   static Atomic<int> sPendingWriteCount;
+
+  // See PWRunnable::Run for details on why we need this lock.
+  static StaticMutex sWritingToFile;
 };
 
 Atomic<PrefSaveData*> PreferencesWriter::sPendingWriteData(nullptr);
 Atomic<int> PreferencesWriter::sPendingWriteCount(0);
+StaticMutex PreferencesWriter::sWritingToFile;
 
 class PWRunnable : public Runnable {
  public:
   explicit PWRunnable(nsIFile* aFile) : Runnable("PWRunnable"), mFile(aFile) {}
 
   NS_IMETHOD Run() override {
-    // If we get a nullptr on the exchange, it means that somebody
-    // else has already processed the request, and we can just return.
-    UniquePtr<PrefSaveData> prefs(
-        PreferencesWriter::sPendingWriteData.exchange(nullptr));
+    // Preference writes are handled a bit strangely, in that a "newer"
+    // write is generally regarded as always better. For this reason,
+    // sPendingWriteData can be overwritten multiple times before anyone
+    // gets around to actually using it, minimizing writes. However,
+    // once we've acquired sPendingWriteData we've reached a
+    // "point of no return" and have to complete the write.
+    //
+    // Unfortunately, this design allows the following behaviour:
+    //
+    // 1. write1 is queued up
+    // 2. thread1 acquires write1
+    // 3. write2 is queued up
+    // 4. thread2 acquires write2
+    // 5. thread1 and thread2 concurrently clobber each other
+    //
+    // To avoid this, we use this lock to ensure that only one thread
+    // at a time is trying to acquire the write, and when it does,
+    // all other threads are prevented from acquiring writes until it
+    // completes the write. New writes are still allowed to be queued
+    // up in this time.
+    //
+    // Although it's atomic, the acquire needs to be guarded by the mutex
+    // to avoid reordering of writes -- we don't want an older write to
+    // run after a newer one. To avoid this causing too much waiting, we check
+    // if sPendingWriteData is already null before acquiring the mutex. If it
+    // is, then there's definitely no work to be done (or someone is in the
+    // middle of doing it for us).
+    //
+    // Note that every time a new write is queued up, a new write task is
+    // is also queued up, so there will always be a task that can see the newest
+    // write.
+    //
+    // Ideally this lock wouldn't be necessary, and the PreferencesWriter
+    // would be used more carefully, but it's hard to untangle all that.
     nsresult rv = NS_OK;
-    if (prefs) {
-      rv = PreferencesWriter::Write(mFile, *prefs);
-
-      // Make a copy of these so we can have them in runnable lambda.
-      // nsIFile is only there so that we would never release the
-      // ref counted pointer off main thread.
-      nsresult rvCopy = rv;
-      nsCOMPtr<nsIFile> fileCopy(mFile);
-      SchedulerGroup::Dispatch(
-          TaskCategory::Other,
-          NS_NewRunnableFunction("Preferences::WriterRunnable",
-                                 [fileCopy, rvCopy] {
-                                   MOZ_RELEASE_ASSERT(NS_IsMainThread());
-                                   if (NS_FAILED(rvCopy)) {
-                                     Preferences::HandleDirty();
-                                   }
-                                 }));
+    if (PreferencesWriter::sPendingWriteData) {
+      StaticMutexAutoLock lock(PreferencesWriter::sWritingToFile);
+      // If we get a nullptr on the exchange, it means that somebody
+      // else has already processed the request, and we can just return.
+      UniquePtr<PrefSaveData> prefs(
+          PreferencesWriter::sPendingWriteData.exchange(nullptr));
+      if (prefs) {
+        rv = PreferencesWriter::Write(mFile, *prefs);
+        // Make a copy of these so we can have them in runnable lambda.
+        // nsIFile is only there so that we would never release the
+        // ref counted pointer off main thread.
+        nsresult rvCopy = rv;
+        nsCOMPtr<nsIFile> fileCopy(mFile);
+        SchedulerGroup::Dispatch(
+            TaskCategory::Other,
+            NS_NewRunnableFunction("Preferences::WriterRunnable",
+                                   [fileCopy, rvCopy] {
+                                     MOZ_RELEASE_ASSERT(NS_IsMainThread());
+                                     if (NS_FAILED(rvCopy)) {
+                                       Preferences::HandleDirty();
+                                     }
+                                   }));
+      }
     }
-
     // We've completed the write to the best of our abilities, whether
     // we had prefs to write or another runnable got to them first. If
     // PreferencesWriter::Write failed, this is still correct as the
@@ -4280,6 +4318,59 @@
 // We define these methods in a struct which is made friend of Preferences in
 // order to access private members.
 struct Internals {
+#ifdef MOZ_GECKO_PROFILER
+  struct PreferenceReadMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("PreferenceRead");
+    }
+    static void StreamJSONMarkerData(
+        baseprofiler::SpliceableJSONWriter& aWriter,
+        const ProfilerString8View& aPrefName,
+        const Maybe<PrefValueKind>& aPrefKind, PrefType aPrefType,
+        const ProfilerString8View& aPrefValue) {
+      aWriter.StringProperty("prefName", aPrefName);
+      aWriter.StringProperty("prefKind", PrefValueKindToString(aPrefKind));
+      aWriter.StringProperty("prefType", PrefTypeToString(aPrefType));
+      aWriter.StringProperty("prefValue", aPrefValue);
+    }
+    static MarkerSchema MarkerTypeDisplay() {
+      using MS = MarkerSchema;
+      MS schema{MS::Location::markerChart, MS::Location::markerTable};
+      schema.AddKeyLabelFormat("prefName", "Name", MS::Format::string);
+      schema.AddKeyLabelFormat("prefKind", "Kind", MS::Format::string);
+      schema.AddKeyLabelFormat("prefType", "Type", MS::Format::string);
+      schema.AddKeyLabelFormat("prefValue", "Value", MS::Format::string);
+      return schema;
+    }
+
+   private:
+    static Span<const char> PrefValueKindToString(
+        const Maybe<PrefValueKind>& aKind) {
+      if (aKind) {
+        return *aKind == PrefValueKind::Default ? MakeStringSpan("Default")
+                                                : MakeStringSpan("User");
+      }
+      return "Shared";
+    }
+
+    static Span<const char> PrefTypeToString(PrefType type) {
+      switch (type) {
+        case PrefType::None:
+          return "None";
+        case PrefType::Int:
+          return "Int";
+        case PrefType::Bool:
+          return "Bool";
+        case PrefType::String:
+          return "String";
+        default:
+          MOZ_ASSERT_UNREACHABLE("Unknown preference type.");
+          return "Unknown";
+      }
+    }
+  };
+#endif  // MOZ_GECKO_PROFILER
+
   template <typename T>
   static nsresult GetPrefValue(const char* aPrefName, T&& aResult,
                                PrefValueKind aKind) {
@@ -4291,10 +4382,11 @@
 
 #ifdef MOZ_GECKO_PROFILER
       if (profiler_feature_active(ProfilerFeature::PreferenceReads)) {
-        PROFILER_ADD_MARKER_WITH_PAYLOAD(
-            "PreferenceRead", OTHER_PreferenceRead, PrefMarkerPayload,
-            (aPrefName, Some(aKind), Some(pref->Type()),
-             PrefValueToString(aResult), TimeStamp::Now()));
+        profiler_add_marker(
+            "PreferenceRead", baseprofiler::category::OTHER_PreferenceRead, {},
+            PreferenceReadMarker{},
+            ProfilerString8View::WrapNullTerminatedString(aPrefName),
+            Some(aKind), pref->Type(), PrefValueToString(aResult));
       }
 #endif
     }
@@ -4311,10 +4403,12 @@
 
 #ifdef MOZ_GECKO_PROFILER
       if (profiler_feature_active(ProfilerFeature::PreferenceReads)) {
-        PROFILER_ADD_MARKER_WITH_PAYLOAD(
-            "PreferenceRead", OTHER_PreferenceRead, PrefMarkerPayload,
-            (aName, Nothing() /* indicates Shared */, Some(pref->Type()),
-             PrefValueToString(aResult), TimeStamp::Now()));
+        profiler_add_marker(
+            "PreferenceRead", baseprofiler::category::OTHER_PreferenceRead, {},
+            PreferenceReadMarker{},
+            ProfilerString8View::WrapNullTerminatedString(aName),
+            Nothing() /* indicates Shared */, pref->Type(),
+            PrefValueToString(aResult));
       }
 #endif
     }
@@ -4333,10 +4427,21 @@
   template <typename T>
   static void UpdateMirror(const char* aPref, void* aMirror) {
     StripAtomic<T> value;
-    // We disallow the deletion of mirrored prefs.
-    // This assertion is the only place where we enforce this.
-    MOZ_ALWAYS_SUCCEEDS(GetPrefValue(aPref, &value, PrefValueKind::User));
-    *static_cast<T*>(aMirror) = value;
+
+    nsresult rv = GetPrefValue(aPref, &value, PrefValueKind::User);
+    if (NS_SUCCEEDED(rv)) {
+      *static_cast<T*>(aMirror) = value;
+    } else {
+      // GetPrefValue() can fail if the update is caused by the pref being
+      // deleted or if it fails to make a cast. This assertion is the only place
+      // where we safeguard these. In this case the mirror variable will be
+      // untouched, thus keeping the value it had prior to the change.
+      // (Note that this case won't happen for a deletion via DeleteBranch()
+      // unless bug 343600 is fixed, but it will happen for a deletion via
+      // ClearUserPref().)
+      NS_WARNING(nsPrintfCString("Pref changed failure: %s\n", aPref).get());
+      MOZ_ASSERT(false);
+    }
   }
 
   template <typename T>
diff -Nru firefox-84.0.2+build1/modules/libpref/Preferences.h firefox-85.0+build1/modules/libpref/Preferences.h
--- firefox-84.0.2+build1/modules/libpref/Preferences.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/Preferences.h	2021-01-18 19:58:18.000000000 +0000
@@ -15,7 +15,6 @@
 
 #include "mozilla/Atomics.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Result.h"
 #include "mozilla/StaticPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
diff -Nru firefox-84.0.2+build1/modules/libpref/test/test_generate_static_pref_list.py firefox-85.0+build1/modules/libpref/test/test_generate_static_pref_list.py
--- firefox-84.0.2+build1/modules/libpref/test/test_generate_static_pref_list.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/modules/libpref/test/test_generate_static_pref_list.py	2021-01-18 19:58:18.000000000 +0000
@@ -99,7 +99,7 @@
 good[
     "static_pref_list_all_h"
 ] = """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 #include "mozilla/StaticPrefList_my.h"
 #include "mozilla/StaticPrefList_my_dashed.h"
@@ -108,7 +108,7 @@
 good[
     "static_prefs_all_h"
 ] = """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 #include "mozilla/StaticPrefs_my.h"
 #include "mozilla/StaticPrefs_my_dashed.h"
@@ -116,7 +116,7 @@
 
 good["static_pref_list_group_h"] = {
     "my": """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 NEVER_PREF("my.bool", bool, false)
 
@@ -167,7 +167,7 @@
 )
 """,
     "my_dashed": """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 NEVER_PREF("my-dashed.atomic.float", AtomicFloat, 0.4455667)
 """,
@@ -175,7 +175,7 @@
 
 good["static_prefs_group_h"] = {
     "my": """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 // Include it to gain access to StaticPrefs::my_*.
 
 #ifndef mozilla_StaticPrefs_my_h
@@ -194,7 +194,7 @@
 good[
     "static_prefs_c_getters_cpp"
 ] = """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 extern "C" uint32_t StaticPrefs_my_uint() {
   return mozilla::StaticPrefs::my_uint();
@@ -212,7 +212,7 @@
 good[
     "static_prefs_rs"
 ] = """\
-// This file was generated by generate_static_pref_list.py. DO NOT EDIT.
+// This file was generated by generate_static_pref_list.py from (string input). DO NOT EDIT.
 
 extern "C" {
     pub fn StaticPrefs_my_uint() -> u32;
@@ -417,7 +417,7 @@
         "Test various pieces of good input."
         inp = StringIO(good_input)
         pref_list = yaml.safe_load(inp)
-        code = generate_code(pref_list)
+        code = generate_code(pref_list, "(string input)")
 
         self.assertEqual(good["static_pref_list_all_h"], code["static_pref_list_all_h"])
 
@@ -449,7 +449,7 @@
             inp = StringIO(input_string)
             try:
                 pref_list = yaml.safe_load(inp)
-                generate_code(pref_list)
+                generate_code(pref_list, "(string input")
                 self.assertEqual(0, 1)
             except ValueError as e:
                 self.assertEqual(str(e), expected)
diff -Nru firefox-84.0.2+build1/modules/zlib/src/mozzconf.h firefox-85.0+build1/modules/zlib/src/mozzconf.h
--- firefox-84.0.2+build1/modules/zlib/src/mozzconf.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/modules/zlib/src/mozzconf.h	2021-01-18 19:58:18.000000000 +0000
@@ -6,9 +6,9 @@
 #ifndef MOZZCONF_H
 #define MOZZCONF_H
 
+#if defined(ZLIB_IN_MOZGLUE)
 #include "mozilla/Types.h"
 
-#if defined(ZLIB_IN_MOZGLUE)
 #define ZEXTERN MFBT_API
 #endif
 
diff -Nru firefox-84.0.2+build1/moz.build firefox-85.0+build1/moz.build
--- firefox-84.0.2+build1/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -171,10 +171,6 @@
     GENERATED_FILES["buildid.h"].script = "build/variables.py:buildid_header"
     GENERATED_FILES["source-repo.h"].script = "build/variables.py:source_repo_header"
 
-DIRS += [
-    "mfbt",
-]
-
 if CONFIG["MOZ_BUILD_APP"]:
     # Bring in the configuration for the configured application.
     include("/" + CONFIG["MOZ_BUILD_APP"] + "/app.mozbuild")
diff -Nru firefox-84.0.2+build1/moz.configure firefox-85.0+build1/moz.configure
--- firefox-84.0.2+build1/moz.configure	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/moz.configure	2021-01-18 19:58:18.000000000 +0000
@@ -194,8 +194,8 @@
 include("build/moz.configure/memory.configure", when="--enable-compile-environment")
 include("build/moz.configure/headers.configure", when="--enable-compile-environment")
 include("build/moz.configure/warnings.configure", when="--enable-compile-environment")
-include("build/moz.configure/lto-pgo.configure", when="--enable-compile-environment")
 include("build/moz.configure/flags.configure", when="--enable-compile-environment")
+include("build/moz.configure/lto-pgo.configure", when="--enable-compile-environment")
 # rust.configure is included by js/moz.configure.
 
 option("--enable-valgrind", help="Enable Valgrind integration hooks")
@@ -813,13 +813,25 @@
 option(env="STRIP_FLAGS", nargs=1, when=strip, help="Flags for the strip command")
 
 
-@depends("STRIP_FLAGS", target, when=strip)
-def strip_flags(flags, target):
+@depends("STRIP_FLAGS", profiling, target, when=strip)
+def strip_flags(flags, profiling, target):
     if flags:
         return flags[0].split()
-    # Strip everything we can, which happens without flags on non-Darwin.
+    if profiling:
+        # Only strip debug info and symbols when profiling is enabled, keeping
+        # local symbols.
+        if target.kernel == "Darwin":
+            return ["-S"]
+        elif target.os == "Android":
+            # The tooling we use with Android supports detached symbols, and the
+            # size increase caused by local symbols are too much for mobile. So,
+            # don't restrict the amount of stripping with a flag.
+            return
+        else:
+            return ["--strip-debug"]
+    # Otherwise strip everything we can, which happens without flags on non-Darwin.
     # On Darwin, it tries to strip things it can't, so we need to limit its scope.
-    if target.kernel == "Darwin":
+    elif target.kernel == "Darwin":
         return ["-x", "-S"]
 
 
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/core/platform.cpp firefox-85.0+build1/mozglue/baseprofiler/core/platform.cpp
--- firefox-84.0.2+build1/mozglue/baseprofiler/core/platform.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/core/platform.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -160,12 +160,10 @@
 using detail::RacyFeatures;
 
 bool LogTest(int aLevelToTest) {
-  static const int maxLevel =
-      getenv("MOZ_BASE_PROFILER_VERBOSE_LOGGING")
-          ? 5
-          : getenv("MOZ_BASE_PROFILER_DEBUG_LOGGING")
-                ? 4
-                : getenv("MOZ_BASE_PROFILER_LOGGING") ? 3 : 0;
+  static const int maxLevel = getenv("MOZ_BASE_PROFILER_VERBOSE_LOGGING") ? 5
+                              : getenv("MOZ_BASE_PROFILER_DEBUG_LOGGING") ? 4
+                              : getenv("MOZ_BASE_PROFILER_LOGGING")       ? 3
+                                                                          : 0;
   return aLevelToTest <= maxLevel;
 }
 
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBuffer.cpp firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBuffer.cpp
--- firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBuffer.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBuffer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -133,39 +133,39 @@
                                          TimeDuration aCleaning,
                                          TimeDuration aCounters,
                                          TimeDuration aThreads) {
-  double timeNs = aSamplingTime.ToMilliseconds() * 1000.0;
-  if (mFirstSamplingTimeNs == 0.0) {
-    mFirstSamplingTimeNs = timeNs;
+  double timeUs = aSamplingTime.ToMilliseconds() * 1000.0;
+  if (mFirstSamplingTimeUs == 0.0) {
+    mFirstSamplingTimeUs = timeUs;
   } else {
     // Note that we'll have 1 fewer interval than other numbers (because
     // we need both ends of an interval to know its duration). The final
     // difference should be insignificant over the expected many thousands
     // of iterations.
-    mIntervalsNs.Count(timeNs - mLastSamplingTimeNs);
+    mIntervalsUs.Count(timeUs - mLastSamplingTimeUs);
   }
-  mLastSamplingTimeNs = timeNs;
+  mLastSamplingTimeUs = timeUs;
   // Time to take the lock before sampling.
-  double lockingNs = aLocking.ToMilliseconds() * 1000.0;
+  double lockingUs = aLocking.ToMilliseconds() * 1000.0;
   // Time to discard expired data.
-  double cleaningNs = aCleaning.ToMilliseconds() * 1000.0;
+  double cleaningUs = aCleaning.ToMilliseconds() * 1000.0;
   // Time to gather all counters.
-  double countersNs = aCounters.ToMilliseconds() * 1000.0;
+  double countersUs = aCounters.ToMilliseconds() * 1000.0;
   // Time to sample all threads.
-  double threadsNs = aThreads.ToMilliseconds() * 1000.0;
+  double threadsUs = aThreads.ToMilliseconds() * 1000.0;
 
   // Add to our gathered stats.
-  mOverheadsNs.Count(lockingNs + cleaningNs + countersNs + threadsNs);
-  mLockingsNs.Count(lockingNs);
-  mCleaningsNs.Count(cleaningNs);
-  mCountersNs.Count(countersNs);
-  mThreadsNs.Count(threadsNs);
+  mOverheadsUs.Count(lockingUs + cleaningUs + countersUs + threadsUs);
+  mLockingsUs.Count(lockingUs);
+  mCleaningsUs.Count(cleaningUs);
+  mCountersUs.Count(countersUs);
+  mThreadsUs.Count(threadsUs);
 
   // Record details in buffer.
-  AddEntry(ProfileBufferEntry::ProfilerOverheadTime(timeNs));
-  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(lockingNs));
-  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(cleaningNs));
-  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(countersNs));
-  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(threadsNs));
+  AddEntry(ProfileBufferEntry::ProfilerOverheadTime(timeUs));
+  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(lockingUs));
+  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(cleaningUs));
+  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(countersUs));
+  AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(threadsUs));
 }
 
 ProfilerBufferInfo ProfileBuffer::GetProfilerBufferInfo() const {
@@ -173,12 +173,12 @@
           BufferRangeEnd(),
           static_cast<uint32_t>(*mEntries.BufferLength() /
                                 8),  // 8 bytes per entry.
-          mIntervalsNs,
-          mOverheadsNs,
-          mLockingsNs,
-          mCleaningsNs,
-          mCountersNs,
-          mThreadsNs};
+          mIntervalsUs,
+          mOverheadsUs,
+          mLockingsUs,
+          mCleaningsUs,
+          mCountersUs,
+          mThreadsUs};
 }
 
 /* ProfileBufferCollector */
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBufferEntry.cpp firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBufferEntry.cpp
--- firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBufferEntry.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBufferEntry.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,7 @@
 #include <type_traits>
 
 #include "mozilla/Logging.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StackWalk.h"
 
@@ -785,13 +786,20 @@
     MOZ_ASSERT(static_cast<ProfileBufferEntry::KindUnderlyingType>(type) <
                static_cast<ProfileBufferEntry::KindUnderlyingType>(
                    ProfileBufferEntry::Kind::MODERN_LIMIT));
-    if (type != ProfileBufferEntry::Kind::Marker ||
-        !::mozilla::base_profiler_markers_detail::DeserializeAfterKindAndStream(
-            aER, aWriter, aThreadId, [&](ProfileChunkedBuffer& aChunkedBuffer) {
-              ProfilerBacktrace backtrace("", &aChunkedBuffer);
-              backtrace.StreamJSON(aWriter, TimeStamp::ProcessCreation(),
-                                   aUniqueStacks);
-            })) {
+    bool entryWasFullyRead = false;
+
+    if (type == ProfileBufferEntry::Kind::Marker) {
+      entryWasFullyRead = ::mozilla::base_profiler_markers_detail::
+          DeserializeAfterKindAndStream(
+              aER, aWriter, aThreadId,
+              [&](ProfileChunkedBuffer& aChunkedBuffer) {
+                ProfilerBacktrace backtrace("", &aChunkedBuffer);
+                backtrace.StreamJSON(aWriter, TimeStamp::ProcessCreation(),
+                                     aUniqueStacks);
+              });
+    }
+
+    if (!entryWasFullyRead) {
       // Not a marker, or marker for another thread.
       // We probably didn't read the whole entry, so we need to skip to the end.
       aER.SetRemainingBytes(0);
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBuffer.h firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBuffer.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfileBuffer.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/core/ProfileBuffer.h	2021-01-18 19:58:18.000000000 +0000
@@ -136,22 +136,22 @@
       ProfileBufferChunk::Create(ProfileBufferChunk::SizeofChunkMetadata() +
                                  WorkerBufferBytes.Value())};
 
-  // Time from launch (ns) when first sampling was recorded.
-  double mFirstSamplingTimeNs = 0.0;
-  // Time from launch (ns) when last sampling was recorded.
-  double mLastSamplingTimeNs = 0.0;
-  // Sampling stats: Interval (ns) between successive samplings.
-  ProfilerStats mIntervalsNs;
-  // Sampling stats: Total duration (ns) of each sampling. (Split detail below.)
-  ProfilerStats mOverheadsNs;
-  // Sampling stats: Time (ns) to acquire the lock before sampling.
-  ProfilerStats mLockingsNs;
-  // Sampling stats: Time (ns) to discard expired data.
-  ProfilerStats mCleaningsNs;
-  // Sampling stats: Time (ns) to collect counter data.
-  ProfilerStats mCountersNs;
-  // Sampling stats: Time (ns) to sample thread stacks.
-  ProfilerStats mThreadsNs;
+  // Time from launch (us) when first sampling was recorded.
+  double mFirstSamplingTimeUs = 0.0;
+  // Time from launch (us) when last sampling was recorded.
+  double mLastSamplingTimeUs = 0.0;
+  // Sampling stats: Interval (us) between successive samplings.
+  ProfilerStats mIntervalsUs;
+  // Sampling stats: Total duration (us) of each sampling. (Split detail below.)
+  ProfilerStats mOverheadsUs;
+  // Sampling stats: Time (us) to acquire the lock before sampling.
+  ProfilerStats mLockingsUs;
+  // Sampling stats: Time (us) to discard expired data.
+  ProfilerStats mCleaningsUs;
+  // Sampling stats: Time (us) to collect counter data.
+  ProfilerStats mCountersUs;
+  // Sampling stats: Time (us) to sample thread stacks.
+  ProfilerStats mThreadsUs;
 };
 
 /**
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfilerMarkers.cpp firefox-85.0+build1/mozglue/baseprofiler/core/ProfilerMarkers.cpp
--- firefox-84.0.2+build1/mozglue/baseprofiler/core/ProfilerMarkers.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/core/ProfilerMarkers.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -90,10 +90,18 @@
   {
     aWriter.StringProperty("name", aName);
 
+    if (!mChartLabel.empty()) {
+      aWriter.StringProperty("chartLabel", mChartLabel);
+    }
+
     if (!mTooltipLabel.empty()) {
       aWriter.StringProperty("tooltipLabel", mTooltipLabel);
     }
 
+    if (!mTableLabel.empty()) {
+      aWriter.StringProperty("tableLabel", mTableLabel);
+    }
+
     aWriter.StartArrayProperty("display");
     {
       for (Location location : mLocations) {
@@ -195,3 +203,19 @@
 }
 
 }  // namespace mozilla
+
+namespace mozilla::baseprofiler {
+template MFBT_API ProfileBufferBlockIndex AddMarker(const ProfilerString8View&,
+                                                    const MarkerCategory&,
+                                                    MarkerOptions&&,
+                                                    markers::TextMarker,
+                                                    const std::string&);
+
+template MFBT_API ProfileBufferBlockIndex
+AddMarkerToBuffer(ProfileChunkedBuffer&, const ProfilerString8View&,
+                  const MarkerCategory&, MarkerOptions&&, markers::NoPayload);
+
+template MFBT_API ProfileBufferBlockIndex AddMarkerToBuffer(
+    ProfileChunkedBuffer&, const ProfilerString8View&, const MarkerCategory&,
+    MarkerOptions&&, markers::TextMarker, const std::string&);
+}  // namespace mozilla::baseprofiler
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfileJSONWriter.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfileJSONWriter.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfileJSONWriter.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfileJSONWriter.h	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/HashFunctions.h"
 #include "mozilla/HashTable.h"
 #include "mozilla/JSONWriter.h"
+#include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 
 #include <functional>
@@ -165,6 +166,15 @@
 
   void EndBareList() { EndCollection(scEmptyString); }
 
+  // This function must be used to correctly stream timestamps in profiles.
+  // Null timestamps don't output anything.
+  void TimeProperty(const Span<const char>& aName, const TimeStamp& aTime) {
+    if (!aTime.IsNull()) {
+      DoubleProperty(aName,
+                     (aTime - TimeStamp::ProcessCreation()).ToMilliseconds());
+    }
+  }
+
   void NullElements(uint32_t aCount) {
     for (uint32_t i = 0; i < aCount; i++) {
       NullElement();
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerDetail.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerDetail.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerDetail.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerDetail.h	2021-01-18 19:58:18.000000000 +0000
@@ -29,6 +29,8 @@
 class BaseProfilerMutex : private ::mozilla::detail::MutexImpl {
  public:
   BaseProfilerMutex() : ::mozilla::detail::MutexImpl() {}
+  explicit BaseProfilerMutex(const char* aName)
+      : ::mozilla::detail::MutexImpl(), mName(aName) {}
 
   BaseProfilerMutex(const BaseProfilerMutex&) = delete;
   BaseProfilerMutex& operator=(const BaseProfilerMutex&) = delete;
@@ -77,6 +79,8 @@
     ::mozilla::detail::MutexImpl::unlock();
   }
 
+  const char* GetName() const { return mName; }
+
  private:
   // Thread currently owning the lock, or 0.
   // Atomic because it may be read at any time independent of the mutex.
@@ -85,6 +89,8 @@
   // - If it's different from their thread id it doesn't matter what other
   //   number it is (0 or another id) and that it can change again at any time.
   Atomic<int, MemoryOrdering::Relaxed> mOwningThreadId{0};
+
+  const char* mName = nullptr;
 };
 
 // RAII class to lock a mutex.
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfiler.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfiler.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfiler.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfiler.h	2021-01-18 19:58:18.000000000 +0000
@@ -591,18 +591,18 @@
   uint64_t mRangeEnd;
   // Buffer capacity in number of 8-byte entries.
   uint32_t mEntryCount;
-  // Sampling stats: Interval (ns) between successive samplings.
-  ProfilerStats mIntervalsNs;
-  // Sampling stats: Total duration (ns) of each sampling. (Split detail below.)
-  ProfilerStats mOverheadsNs;
-  // Sampling stats: Time (ns) to acquire the lock before sampling.
-  ProfilerStats mLockingsNs;
-  // Sampling stats: Time (ns) to discard expired data.
-  ProfilerStats mCleaningsNs;
-  // Sampling stats: Time (ns) to collect counter data.
-  ProfilerStats mCountersNs;
-  // Sampling stats: Time (ns) to sample thread stacks.
-  ProfilerStats mThreadsNs;
+  // Sampling stats: Interval (us) between successive samplings.
+  ProfilerStats mIntervalsUs;
+  // Sampling stats: Total duration (us) of each sampling. (Split detail below.)
+  ProfilerStats mOverheadsUs;
+  // Sampling stats: Time (us) to acquire the lock before sampling.
+  ProfilerStats mLockingsUs;
+  // Sampling stats: Time (us) to discard expired data.
+  ProfilerStats mCleaningsUs;
+  // Sampling stats: Time (us) to collect counter data.
+  ProfilerStats mCountersUs;
+  // Sampling stats: Time (us) to sample thread stacks.
+  ProfilerStats mThreadsUs;
 };
 
 // Get information about the current buffer status.
@@ -808,9 +808,10 @@
 MFBT_API void profiler_add_js_marker(const char* aMarkerName,
                                      const char* aMarkerText);
 
-// Returns true if the profiler lock is currently held *on the current thread*.
-// This may be used by re-entrant code that may call profiler functions while
-// the profiler already has the lock (which would deadlock).
+// Returns true if any of the profiler mutexes are currently locked *on the
+// current thread*. This may be used by re-entrant code that may call profiler
+// functions while the same of a different profiler mutex is locked, which could
+// deadlock.
 bool profiler_is_locked_on_current_thread();
 
 //---------------------------------------------------------------------------
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkers.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkers.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkers.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkers.h	2021-01-18 19:58:18.000000000 +0000
@@ -106,17 +106,6 @@
   return AddMarker(aName, aCategory, std::move(aOptions), markers::NoPayload{});
 }
 
-// Marker types' StreamJSONMarkerData functions should use this to correctly
-// output timestamps as a JSON property.
-inline void WritePropertyTime(JSONWriter& aWriter,
-                              const Span<const char>& aName,
-                              const TimeStamp& aTime) {
-  if (!aTime.IsNull()) {
-    aWriter.DoubleProperty(
-        aName, (aTime - TimeStamp::ProcessCreation()).ToMilliseconds());
-  }
-}
-
 }  // namespace mozilla::baseprofiler
 
 // Same as `AddMarker()` (without payload). This macro is safe to use even if
@@ -143,7 +132,7 @@
 
 namespace mozilla::baseprofiler::markers {
 // Most common marker type. Others are in BaseProfilerMarkerTypes.h.
-struct Text {
+struct TextMarker {
   static constexpr Span<const char> MarkerTypeName() {
     return MakeStringSpan("Text");
   }
@@ -160,6 +149,25 @@
     return schema;
   }
 };
+
+struct Tracing {
+  static constexpr Span<const char> MarkerTypeName() {
+    return MakeStringSpan("tracing");
+  }
+  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
+                                   const ProfilerString8View& aCategory) {
+    if (aCategory.Length() != 0) {
+      aWriter.StringProperty("category", aCategory);
+    }
+  }
+  static MarkerSchema MarkerTypeDisplay() {
+    using MS = MarkerSchema;
+    MS schema{MS::Location::markerChart, MS::Location::markerTable,
+              MS::Location::timelineOverview};
+    schema.AddKeyLabelFormat("category", "Type", MS::Format::string);
+    return schema;
+  }
+};
 }  // namespace mozilla::baseprofiler::markers
 
 // Add a text marker. This macro is safe to use even if MOZ_GECKO_PROFILER is
@@ -169,7 +177,7 @@
       AUTO_PROFILER_STATS(BASE_PROFILER_MARKER_TEXT);                        \
       ::mozilla::baseprofiler::AddMarker(                                    \
           markerName, ::mozilla::baseprofiler::category::categoryName,       \
-          options, ::mozilla::baseprofiler::markers::Text{}, text);          \
+          options, ::mozilla::baseprofiler::markers::TextMarker{}, text);    \
     } while (false)
 
 namespace mozilla::baseprofiler {
@@ -197,7 +205,7 @@
     mOptions.TimingRef().SetIntervalEnd();
     AUTO_PROFILER_STATS(AUTO_BASE_PROFILER_MARKER_TEXT);
     AddMarker(ProfilerString8View::WrapNullTerminatedString(mMarkerName),
-              mCategory, std::move(mOptions), markers::Text{}, mText);
+              mCategory, std::move(mOptions), markers::TextMarker{}, mText);
   }
 
  protected:
@@ -207,6 +215,18 @@
   std::string mText;
 };
 
+extern template MFBT_API ProfileBufferBlockIndex
+AddMarker(const ProfilerString8View&, const MarkerCategory&, MarkerOptions&&,
+          markers::TextMarker, const std::string&);
+
+extern template MFBT_API ProfileBufferBlockIndex
+AddMarkerToBuffer(ProfileChunkedBuffer&, const ProfilerString8View&,
+                  const MarkerCategory&, MarkerOptions&&, markers::NoPayload);
+
+extern template MFBT_API ProfileBufferBlockIndex AddMarkerToBuffer(
+    ProfileChunkedBuffer&, const ProfilerString8View&, const MarkerCategory&,
+    MarkerOptions&&, markers::TextMarker, const std::string&);
+
 }  // namespace mozilla::baseprofiler
 
 // Creates an AutoProfilerTextMarker RAII object.  This macro is safe to use
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h	2021-01-18 19:58:18.000000000 +0000
@@ -129,7 +129,8 @@
                            Ownership::Reference) {}
 
   // Implicit constructor from std::string.
-  constexpr MOZ_IMPLICIT ProfilerStringView(const std::string& aString)
+  constexpr MOZ_IMPLICIT ProfilerStringView(
+      const std::basic_string<CHAR>& aString)
       : ProfilerStringView(aString.data(), aString.length(),
                            Ownership::Reference) {}
 
@@ -141,7 +142,7 @@
   static constexpr ProfilerStringView WrapNullTerminatedString(
       const CHAR* aString) {
     return ProfilerStringView(
-        aString, aString ? std::char_traits<char>::length(aString) : 0,
+        aString, aString ? std::char_traits<CHAR>::length(aString) : 0,
         Ownership::Reference);
   }
 
@@ -182,8 +183,8 @@
   }
   // No `IsOwned...()` because it's a secret, only used internally!
 
-  [[nodiscard]] operator Span<const char>() const {
-    return Span<const char>(Data(), Length());
+  [[nodiscard]] operator Span<const CHAR>() const {
+    return Span<const CHAR>(Data(), Length());
   }
 
  private:
@@ -841,6 +842,7 @@
   std::string mTooltipLabel;
   std::string mTableLabel;
   // Main display, made of zero or more rows of key+label+format or label+value.
+ private:
   struct DynamicData {
     std::string mKey;
     mozilla::Maybe<std::string> mLabel;
@@ -852,7 +854,9 @@
     std::string mValue;
   };
   using DataRow = mozilla::Variant<DynamicData, StaticData>;
-  std::vector<DataRow> mData;
+  using DataRowVector = std::vector<DataRow>;
+
+  DataRowVector mData;
 };
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h	2021-01-18 19:58:18.000000000 +0000
@@ -29,153 +29,35 @@
 
 namespace mozilla::baseprofiler::markers {
 
-struct Tracing {
+struct MediaSampleMarker {
   static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("tracing");
-  }
-  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
-                                   const ProfilerString8View& aCategory) {
-    if (aCategory.Length() != 0) {
-      aWriter.StringProperty("category", aCategory);
-    }
-  }
-  static MarkerSchema MarkerTypeDisplay() {
-    using MS = MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineOverview};
-    schema.AddKeyLabelFormat("category", "Type", MS::Format::string);
-    return schema;
-  }
-};
-
-struct UserTimingMark {
-  static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("UserTimingMark");
-  }
-  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
-                                   const ProfilerString8View& aName) {
-    aWriter.StringProperty("name", aName);
-    aWriter.StringProperty("entryType", "mark");
-    aWriter.NullProperty("startMark");
-    aWriter.NullProperty("endMark");
-  }
-  static MarkerSchema MarkerTypeDisplay() {
-    using MS = MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.SetAllLabels("{marker.data.name}");
-    schema.AddStaticLabelValue("Marker", "UserTiming");
-    schema.AddKeyLabelFormat("entryType", "Entry Type", MS::Format::string);
-    schema.AddKeyLabelFormat("name", "Name", MS::Format::string);
-    schema.AddStaticLabelValue(
-        "Description",
-        "UserTimingMark is created using the DOM API performance.mark().");
-    return schema;
-  }
-};
-
-struct UserTimingMeasure {
-  static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("UserTimingMeasure");
+    return MakeStringSpan("MediaSample");
   }
   static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
-                                   const ProfilerString8View& aName,
-                                   const Maybe<ProfilerString8View>& aStartMark,
-                                   const Maybe<ProfilerString8View>& aEndMark) {
-    aWriter.StringProperty("name", aName);
-    aWriter.StringProperty("entryType", "measure");
-
-    if (aStartMark.isSome()) {
-      aWriter.StringProperty("startMark", *aStartMark);
-    } else {
-      aWriter.NullProperty("startMark");
-    }
-    if (aEndMark.isSome()) {
-      aWriter.StringProperty("endMark", *aEndMark);
-    } else {
-      aWriter.NullProperty("endMark");
-    }
+                                   int64_t aSampleStartTimeUs,
+                                   int64_t aSampleEndTimeUs) {
+    aWriter.IntProperty("sampleStartTimeUs", aSampleStartTimeUs);
+    aWriter.IntProperty("sampleEndTimeUs", aSampleEndTimeUs);
   }
   static MarkerSchema MarkerTypeDisplay() {
     using MS = MarkerSchema;
     MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.SetAllLabels("{marker.data.name}");
-    schema.AddStaticLabelValue("Marker", "UserTiming");
-    schema.AddKeyLabelFormat("entryType", "Entry Type", MS::Format::string);
-    schema.AddKeyLabelFormat("name", "Name", MS::Format::string);
-    schema.AddKeyLabelFormat("startMark", "Start Mark", MS::Format::string);
-    schema.AddKeyLabelFormat("endMark", "End Mark", MS::Format::string);
-    schema.AddStaticLabelValue("Description",
-                               "UserTimingMeasure is created using the DOM API "
-                               "performance.measure().");
+    schema.AddKeyLabelFormat("sampleStartTimeUs", "Sample start time",
+                             MS::Format::microseconds);
+    schema.AddKeyLabelFormat("sampleEndTimeUs", "Sample end time",
+                             MS::Format::microseconds);
     return schema;
   }
 };
 
-struct Hang {
+struct ContentBuildMarker {
   static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("BHR-detected hang");
+    return MakeStringSpan("CONTENT_FULL_PAINT_TIME");
   }
   static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter) {}
   static MarkerSchema MarkerTypeDisplay() {
     using MS = MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineOverview};
-    return schema;
-  }
-};
-
-struct LongTask {
-  static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("MainThreadLongTask");
-  }
-  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter) {
-    aWriter.StringProperty("category", "LongTask");
-  }
-  static MarkerSchema MarkerTypeDisplay() {
-    using MS = MarkerSchema;
     MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.AddKeyLabelFormat("category", "Type", MS::Format::string);
-    return schema;
-  }
-};
-
-struct Log {
-  static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("Log");
-  }
-  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
-                                   const ProfilerString8View& aModule,
-                                   const ProfilerString8View& aText) {
-    aWriter.StringProperty("module", aModule);
-    aWriter.StringProperty("name", aText);
-  }
-  static MarkerSchema MarkerTypeDisplay() {
-    using MS = MarkerSchema;
-    MS schema{MS::Location::markerTable};
-    schema.SetTableLabel("({marker.data.module}) {marker.data.name}");
-    schema.AddKeyLabelFormat("module", "Module", MS::Format::string);
-    schema.AddKeyLabelFormat("name", "Name", MS::Format::string);
-    return schema;
-  }
-};
-
-struct MediaSample {
-  static constexpr Span<const char> MarkerTypeName() {
-    return MakeStringSpan("MediaSample");
-  }
-  static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
-                                   int64_t aSampleStartTimeUs,
-                                   int64_t aSampleEndTimeUs) {
-    aWriter.IntProperty("sampleStartTimeUs", aSampleStartTimeUs);
-    aWriter.IntProperty("sampleEndTimeUs", aSampleEndTimeUs);
-  }
-  static MarkerSchema MarkerTypeDisplay() {
-    using MS = MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.AddKeyLabelFormat("sampleStartTimeUs", "Sample start time",
-                             MS::Format::microseconds);
-    schema.AddKeyLabelFormat("sampleEndTimeUs", "Sample end time",
-                             MS::Format::microseconds);
     return schema;
   }
 };
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileBufferEntryKinds.h firefox-85.0+build1/mozglue/baseprofiler/public/ProfileBufferEntryKinds.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileBufferEntryKinds.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/ProfileBufferEntryKinds.h	2021-01-18 19:58:18.000000000 +0000
@@ -70,11 +70,8 @@
   // Any value starting here does *not* represent a `ProfileBufferEntry` and
   // requires separate decoding and handling.
 
-  // Marker data, including payload.
-  MarkerData = LEGACY_LIMIT,
-
-  // Markers from 2.0 specs.
-  Marker,
+  // Markers and their data.
+  Marker = LEGACY_LIMIT,
 
   // Optional between TimeBeforeCompactStack and CompactStack.
   UnresponsiveDurationMs,
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileBufferEntrySerialization.h firefox-85.0+build1/mozglue/baseprofiler/public/ProfileBufferEntrySerialization.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileBufferEntrySerialization.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/ProfileBufferEntrySerialization.h	2021-01-18 19:58:18.000000000 +0000
@@ -749,14 +749,15 @@
 // wrapper necessary.
 template <typename T>
 struct ProfileBufferEntryReader::Deserializer<ProfileBufferRawPointer<T>> {
-  static void ReadInto(ProfileBufferEntryReader& aER, T*& aPtr) {
-    aER.ReadBytes(&aPtr, sizeof(aPtr));
+  static void ReadInto(ProfileBufferEntryReader& aER,
+                       ProfileBufferRawPointer<T>& aPtr) {
+    aER.ReadBytes(&aPtr.mRawPointer, sizeof(aPtr));
   }
 
-  static T* Read(ProfileBufferEntryReader& aER) {
-    T* ptr;
-    ReadInto(aER, ptr);
-    return ptr;
+  static ProfileBufferRawPointer<T> Read(ProfileBufferEntryReader& aER) {
+    ProfileBufferRawPointer<T> rawPointer;
+    ReadInto(aER, rawPointer);
+    return rawPointer;
   }
 };
 
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileChunkedBuffer.h firefox-85.0+build1/mozglue/baseprofiler/public/ProfileChunkedBuffer.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfileChunkedBuffer.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/ProfileChunkedBuffer.h	2021-01-18 19:58:18.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/ProfileBufferEntrySerialization.h"
 #include "mozilla/RefCounted.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 
 #include <cstdio>
diff -Nru firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfilingCategoryList.h firefox-85.0+build1/mozglue/baseprofiler/public/ProfilingCategoryList.h
--- firefox-84.0.2+build1/mozglue/baseprofiler/public/ProfilingCategoryList.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/baseprofiler/public/ProfilingCategoryList.h	2021-01-18 19:58:18.000000000 +0000
@@ -36,6 +36,9 @@
     SUBCATEGORY(OTHER, OTHER_PreferenceRead, "Preference Read") \
     SUBCATEGORY(OTHER, OTHER_Profiling, "Profiling") \
   END_CATEGORY \
+  BEGIN_CATEGORY(TEST, "Test", "darkgray") \
+    SUBCATEGORY(TEST, TEST, "Test") \
+  END_CATEGORY \
   BEGIN_CATEGORY(LAYOUT, "Layout", "purple") \
     SUBCATEGORY(LAYOUT, LAYOUT, "Other") \
     SUBCATEGORY(LAYOUT, LAYOUT_FrameConstruction, "Frame construction") \
@@ -103,6 +106,7 @@
     SUBCATEGORY(IPC, IPC, "Other") \
   END_CATEGORY \
   BEGIN_CATEGORY(MEDIA, "Media", "orange") \
+    SUBCATEGORY(MEDIA, MEDIA, "Other") \
     SUBCATEGORY(MEDIA, MEDIA_CUBEB, "Cubeb") \
     SUBCATEGORY(MEDIA, MEDIA_PLAYBACK, "Playback") \
     SUBCATEGORY(MEDIA, MEDIA_RT, "Real-time rendering") \
diff -Nru firefox-84.0.2+build1/mozglue/build/TsanOptions.cpp firefox-85.0+build1/mozglue/build/TsanOptions.cpp
--- firefox-84.0.2+build1/mozglue/build/TsanOptions.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/build/TsanOptions.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -100,6 +100,8 @@
          "deadlock:mozilla::camera::LockAndDispatch\n"
          // Bug 1606804 - permanent
          "deadlock:third_party/rust/rkv/src/env.rs\n"
+         // Bug 1680655 - permanent
+         "deadlock:EncryptedClientHelloServer\n"
 
 
 
@@ -168,26 +170,18 @@
          // up due to "volatile" being too weak for this.
          "race:third_party/sqlite3/*\n"
          "deadlock:third_party/sqlite3/*\n"
-
-
-
-
-
-         // Lack of proper instrumentation for the Rust stdlib (fix this!).
+         // Bug 1674770 - permanent
+         // Upstream Bug: https://github.com/Amanieu/parking_lot/issues/257
          //
-         // All of these can potentially be removed if we fix Bug 1671691.
-
-         // Bug 1587513 - permanent
-         "race:std::sync::mutex::Mutex\n"
-         // Bug 1590423 - permanent
-         "race:sync..Arc\n"
-         "race:alloc::sync::Arc\n"
+         // parking_lot using incorrect atomic orderings in RwLock, upstream
+         // fix already up for review.
+         "race:StrongRuleNode::ensure_child\n"
          // No Bug - permanent
-         "race:third_party/rust/parking_lot_core/*\n"
-         // No Bug - permanent
-         "race:/rustc/*.rs\n"
-         "deadlock:/rustc/*.rs\n"
-         "thread:std::sys::unix::thread::Thread::new\n"
+         // Upstream Bug: https://github.com/rayon-rs/rayon/issues/812
+         //
+         // Probably a false-positive from crossbeam's deque not being
+         // understood by tsan.
+         "race:crossbeam_deque::Worker*::resize\n"
 
 
 
@@ -202,11 +196,6 @@
          // These should all still be fixed because the compiler is incentivized
          // to combine/cache these accesses without proper atomic annotations.
 
-         // No Bug
-         "race:WalkDiskCacheRunnable::Run\n"
-         // No Bug - Modifying `mResolveAgain` while reading `mGetTtl`
-         "race:RemoveOrRefresh\n"
-         "race:nsHostResolver::ThreadFunc\n"
          // Bug 1614697
          "race:nsHttpChannel::OnCacheEntryCheck\n"
          "race:~AutoCacheWaitFlags\n"
@@ -218,9 +207,6 @@
          // The rest of these suppressions are miscellaneous issues in gecko
          // that should be investigated and ideally fixed.
 
-         // Bug 1619162
-         "race:currentNameHasEscapes\n"
-
          // Bug 1601600
          "race:SkARGB32_Blitter\n"
          "race:SkARGB32_Shader_Blitter\n"
@@ -240,21 +226,18 @@
          // Bug 1606800
          "race:CallInitFunc\n"
 
+         // Bug 1606803
+         "race:ipv6_is_present\n"
+
          // Bug 1606864
          "race:nsSocketTransport::Close\n"
          "race:nsSocketTransport::OnSocketDetached\n"
+         "race:nsSocketTransport::OnMsgInputClosed\n"
+         "race:nsSocketTransport::OpenOutputStream\n"
 
          // Bug 1607138
          "race:gXPCOMThreadsShutDown\n"
 
-         // Bug 1607446
-         "race:nsJARChannel::Suspend\n"
-         "race:nsJARChannel::Resume\n"
-
-         // Bug 1607449
-         "race:fill_CERTCertificateFields\n"
-         "race:CERT_DestroyCertificate\n"
-
          // Bug 1608462
          "deadlock:ScriptPreloader::OffThreadDecodeCallback\n"
 
@@ -303,9 +286,20 @@
          "race:CamerasParent::ActorDestroy\n"
          "race:CamerasParent::DispatchToVideoCaptureThread\n"
 
-         // Bug 1672230
-         "race:ScriptPreloader::Trace\n"
-         "race:ScriptPreloader::WriteCache\n"
+         // Bug 1623541
+         "race:VRShMem::PullSystemState\n"
+         "race:VRShMem::PushSystemState\n"
+
+         // Bug 1674776
+         "race:DocumentTimeline::GetCurrentTimeAsDuration\n"
+
+         // Bug 1674835
+         "race:nsHttpTransaction::ReadSegments\n"
+         "race:nsHttpTransaction::SecurityInfo\n"
+
+         // Bug 1680285
+         "race:style::traversal::note_children\n"
+         "race:style::matching::MatchMethods::apply_selector_flags\n"
 
       // End of suppressions.
       ;  // Please keep this semicolon.
diff -Nru firefox-84.0.2+build1/mozglue/dllservices/WindowsDllBlocklist.cpp firefox-85.0+build1/mozglue/dllservices/WindowsDllBlocklist.cpp
--- firefox-84.0.2+build1/mozglue/dllservices/WindowsDllBlocklist.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/dllservices/WindowsDllBlocklist.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -16,7 +16,6 @@
 #include "nsWindowsDllInterceptor.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/StackWalk_windows.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
diff -Nru firefox-84.0.2+build1/mozglue/misc/interceptor/Arm64.cpp firefox-85.0+build1/mozglue/misc/interceptor/Arm64.cpp
--- firefox-84.0.2+build1/mozglue/misc/interceptor/Arm64.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/mozglue/misc/interceptor/Arm64.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "Arm64.h"
 
+#include "mozilla/ResultVariant.h"
+
 namespace mozilla {
 namespace interceptor {
 namespace arm64 {
diff -Nru firefox-84.0.2+build1/mozglue/misc/PreXULSkeletonUI.cpp firefox-85.0+build1/mozglue/misc/PreXULSkeletonUI.cpp
--- firefox-84.0.2+build1/mozglue/misc/PreXULSkeletonUI.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/misc/PreXULSkeletonUI.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,9 +10,14 @@
 #include <math.h>
 #include <limits.h>
 #include <cmath>
+#include <locale>
+#include <string>
+#include <objbase.h>
+#include <shlobj.h>
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/HashFunctions.h"
 #include "mozilla/HelperMacros.h"
 #include "mozilla/glue/Debug.h"
 #include "mozilla/BaseProfilerMarkers.h"
@@ -30,12 +35,12 @@
 struct ColorRect {
   uint32_t color;
   uint32_t borderColor;
-  uint32_t x;
-  uint32_t y;
-  uint32_t width;
-  uint32_t height;
-  uint32_t borderWidth;
-  uint32_t borderRadius;
+  int x;
+  int y;
+  int width;
+  int height;
+  int borderWidth;
+  int borderRadius;
 };
 
 // DrawRect is mostly the same as ColorRect, but exists as an implementation
@@ -46,12 +51,12 @@
 struct DrawRect {
   uint32_t color;
   uint32_t backgroundColor;
-  uint32_t x;
-  uint32_t y;
-  uint32_t width;
-  uint32_t height;
-  uint32_t borderRadius;
-  uint32_t borderWidth;
+  int x;
+  int y;
+  int width;
+  int height;
+  int borderRadius;
+  int borderWidth;
   bool strokeOnly;
 };
 
@@ -156,13 +161,19 @@
 typedef HBRUSH(WINAPI* CreateSolidBrushProc)(COLORREF);
 CreateSolidBrushProc sCreateSolidBrush = NULL;
 
-static uint32_t sWindowWidth;
-static uint32_t sWindowHeight;
+static int sWindowWidth;
+static int sWindowHeight;
 static double sCSSToDevPixelScaling;
 
 static const int kAnimationCSSPixelsPerFrame = 21;
 static const int kAnimationCSSExtraWindowSize = 300;
 
+// NOTE: these values were pulled out of thin air as round numbers that are
+// likely to be too big to be seen in practice. If we legitimately see windows
+// this big, we probably don't want to be drawing them on the CPU anyway.
+static const uint32_t kMaxWindowWidth = 1 << 16;
+static const uint32_t kMaxWindowHeight = 1 << 16;
+
 static const wchar_t* sEnabledRegSuffix = L"|Enabled";
 static const wchar_t* sScreenXRegSuffix = L"|ScreenX";
 static const wchar_t* sScreenYRegSuffix = L"|ScreenY";
@@ -174,6 +185,30 @@
 static const wchar_t* sSearchbarRegSuffix = L"|SearchbarCSSSpan";
 static const wchar_t* sSpringsCSSRegSuffix = L"|SpringsCSSSpan";
 static const wchar_t* sThemeRegSuffix = L"|Theme";
+static const wchar_t* sMenubarShownRegSuffix = L"|MenubarShown";
+
+struct LoadedCoTaskMemFreeDeleter {
+  void operator()(void* ptr) {
+    static decltype(CoTaskMemFree)* coTaskMemFree = nullptr;
+    if (!coTaskMemFree) {
+      // Just let this get cleaned up when the process is terminated, because
+      // we're going to load it anyway elsewhere.
+      HMODULE ole32Dll = ::LoadLibraryW(L"ole32");
+      if (!ole32Dll) {
+        printf_stderr(
+            "Could not load ole32 - will not free with CoTaskMemFree");
+        return;
+      }
+      coTaskMemFree = reinterpret_cast<decltype(coTaskMemFree)>(
+          ::GetProcAddress(ole32Dll, "CoTaskMemFree"));
+      if (!coTaskMemFree) {
+        printf_stderr("Could not find CoTaskMemFree");
+        return;
+      }
+    }
+    coTaskMemFree(ptr);
+  }
+};
 
 std::wstring GetRegValueName(const wchar_t* prefix, const wchar_t* suffix) {
   std::wstring result(prefix);
@@ -206,6 +241,96 @@
   return buf;
 }
 
+static UniquePtr<wchar_t, LoadedCoTaskMemFreeDeleter> GetKnownFolderPath(
+    REFKNOWNFOLDERID folderId) {
+  static decltype(SHGetKnownFolderPath)* shGetKnownFolderPath = nullptr;
+  if (!shGetKnownFolderPath) {
+    // We could go out of our way to `FreeLibrary` on this, decrementing its
+    // ref count and potentially unloading it. However doing so would be either
+    // effectively a no-op, or counterproductive. Just let it get cleaned up
+    // when the process is terminated, because we're going to load it anyway
+    // elsewhere.
+    HMODULE shell32Dll = ::LoadLibraryW(L"shell32");
+    if (!shell32Dll) {
+      return nullptr;
+    }
+    shGetKnownFolderPath = reinterpret_cast<decltype(shGetKnownFolderPath)>(
+        ::GetProcAddress(shell32Dll, "SHGetKnownFolderPath"));
+    if (!shGetKnownFolderPath) {
+      return nullptr;
+    }
+  }
+  PWSTR path = nullptr;
+  shGetKnownFolderPath(folderId, 0, nullptr, &path);
+  return UniquePtr<wchar_t, LoadedCoTaskMemFreeDeleter>(path);
+}
+
+// Note: this is specifically *not* a robust, multi-locale lowercasing
+// operation. It is not intended to be such. It is simply intended to match the
+// way in which we look for other instances of firefox to remote into.
+// See
+// https://searchfox.org/mozilla-central/rev/71621bfa47a371f2b1ccfd33c704913124afb933/toolkit/components/remote/nsRemoteService.cpp#56
+static void MutateStringToLowercase(wchar_t* ptr) {
+  while (*ptr) {
+    wchar_t ch = *ptr;
+    if (ch >= L'A' && ch <= L'Z') {
+      *ptr = ch + (L'a' - L'A');
+    }
+    ++ptr;
+  }
+}
+
+static bool TryGetSkeletonUILock() {
+  auto localAppDataPath = GetKnownFolderPath(FOLDERID_LocalAppData);
+  if (!localAppDataPath) {
+    return false;
+  }
+
+  // Note: because we're in mozglue, we cannot easily access things from
+  // toolkit, like `GetInstallHash`. We could move `GetInstallHash` into
+  // mozglue, and rip out all of its usage of types defined in toolkit headers.
+  // However, it seems cleaner to just hash the bin path ourselves. We don't
+  // get quite the same robustness that `GetInstallHash` might provide, but
+  // we already don't have that with how we key our registry values, so it
+  // probably makes sense to just match those.
+  UniquePtr<wchar_t[]> binPath = GetBinaryPath();
+  if (!binPath) {
+    return false;
+  }
+
+  // Lowercase the binpath to match how we look for remote instances.
+  MutateStringToLowercase(binPath.get());
+
+  // The number of bytes * 2 characters per byte + 1 for the null terminator
+  uint32_t hexHashSize = sizeof(uint32_t) * 2 + 1;
+  UniquePtr<wchar_t[]> installHash = MakeUnique<wchar_t[]>(hexHashSize);
+  // This isn't perfect - it's a 32-bit hash of the path to our executable. It
+  // could reasonably collide, or casing could potentially affect things, but
+  // the theory is that that should be uncommon enough and the failure case
+  // mild enough that this is fine.
+  uint32_t binPathHash = HashString(binPath.get());
+  swprintf(installHash.get(), hexHashSize, L"%08x", binPathHash);
+
+  std::wstring lockFilePath;
+  lockFilePath.append(localAppDataPath.get());
+  lockFilePath.append(
+      L"\\" MOZ_APP_VENDOR L"\\" MOZ_APP_BASENAME L"\\SkeletonUILock-");
+  lockFilePath.append(installHash.get());
+
+  // We intentionally leak this file - that is okay, and (kind of) the point.
+  // We want to hold onto this handle until the application exits, and hold
+  // onto it with exclusive rights. If this check fails, then we assume that
+  // another instance of the executable is holding it, and thus return false.
+  HANDLE lockFile =
+      ::CreateFileW(lockFilePath.c_str(), GENERIC_READ | GENERIC_WRITE,
+                    0,  // No sharing - this is how the lock works
+                    nullptr, CREATE_ALWAYS,
+                    FILE_FLAG_DELETE_ON_CLOSE,  // Don't leave this lying around
+                    nullptr);
+
+  return lockFile != INVALID_HANDLE_VALUE;
+}
+
 // We could use nsAutoRegKey, but including nsWindowsHelpers.h causes build
 // failures in random places because we're in mozglue. Overall it should be
 // simpler and cleaner to just step around that issue with this class:
@@ -402,6 +527,10 @@
   }
 
   for (const DrawRect& rect : drawRects) {
+    if (rect.height <= 0 || rect.width <= 0) {
+      continue;
+    }
+
     // For rounded rectangles, the first thing we do is draw the top and
     // bottom of the rectangle, with the more complicated logic below. After
     // that we can just draw the vertically centered part of the rect like
@@ -410,10 +539,10 @@
 
     // We then draw the flat, central portion of the rect (which in the case of
     // non-rounded rects, is just the entire thing.)
-    int solidRectStartY = std::clamp(rect.y + rect.borderRadius, 0u,
-                                     (uint32_t)sTotalChromeHeight);
-    int solidRectEndY = std::clamp(rect.y + rect.height - rect.borderRadius, 0u,
-                                   (uint32_t)sTotalChromeHeight);
+    int solidRectStartY =
+        std::clamp(rect.y + rect.borderRadius, 0, sTotalChromeHeight);
+    int solidRectEndY = std::clamp(rect.y + rect.height - rect.borderRadius, 0,
+                                   sTotalChromeHeight);
     for (int y = solidRectStartY; y < solidRectEndY; ++y) {
       // For strokeOnly rects (used to draw borders), we just draw the left
       // and right side here. Looping down a column of pixels is not the most
@@ -424,11 +553,11 @@
       // that we're inside the middle range range before excluding pixels.
       if (rect.strokeOnly && y - rect.y > rect.borderWidth &&
           rect.y + rect.height - y > rect.borderWidth) {
-        int startXLeft = std::clamp(rect.x, 0u, sWindowWidth);
-        int endXLeft = std::clamp(rect.x + rect.borderWidth, 0u, sWindowWidth);
-        int startXRight = std::clamp(rect.x + rect.width - rect.borderWidth, 0u,
-                                     sWindowWidth);
-        int endXRight = std::clamp(rect.x + rect.width, 0u, sWindowWidth);
+        int startXLeft = std::clamp(rect.x, 0, sWindowWidth);
+        int endXLeft = std::clamp(rect.x + rect.borderWidth, 0, sWindowWidth);
+        int startXRight =
+            std::clamp(rect.x + rect.width - rect.borderWidth, 0, sWindowWidth);
+        int endXRight = std::clamp(rect.x + rect.width, 0, sWindowWidth);
 
         uint32_t* lineStart = &sPixelBuffer[y * sWindowWidth];
         uint32_t* dataStartLeft = lineStart + startXLeft;
@@ -438,8 +567,8 @@
         std::fill(dataStartLeft, dataEndLeft, rect.color);
         std::fill(dataStartRight, dataEndRight, rect.color);
       } else {
-        int startX = std::clamp(rect.x, 0u, sWindowWidth);
-        int endX = std::clamp(rect.x + rect.width, 0u, sWindowWidth);
+        int startX = std::clamp(rect.x, 0, sWindowWidth);
+        int endX = std::clamp(rect.x + rect.width, 0, sWindowWidth);
         uint32_t* lineStart = &sPixelBuffer[y * sWindowWidth];
         uint32_t* dataStart = lineStart + startX;
         uint32_t* dataEnd = lineStart + endX;
@@ -511,7 +640,7 @@
 void DrawSkeletonUI(HWND hWnd, CSSPixelSpan urlbarCSSSpan,
                     CSSPixelSpan searchbarCSSSpan,
                     const Vector<CSSPixelSpan>& springs,
-                    const ThemeColors& currentTheme) {
+                    const ThemeColors& currentTheme, const bool& menubarShown) {
   // NOTE: we opt here to paint a pixel buffer for the application chrome by
   // hand, without using native UI library methods. Why do we do this?
   //
@@ -547,9 +676,10 @@
   // found in tabs.inc.css, "--tab-min-height" - depends on uidensity variable
   int tabBarHeight = CSSToDevPixels(33, sCSSToDevPixelScaling) + verticalOffset;
   // found in tabs.inc.css, ".titlebar-spacer"
-  int titlebarSpacerWidth =
-      (sMaximized ? 0 : CSSToDevPixels(40, sCSSToDevPixelScaling)) +
-      horizontalOffset;
+  int titlebarSpacerWidth = horizontalOffset;
+  if (!sMaximized && menubarShown == false) {
+    titlebarSpacerWidth += CSSToDevPixels(40, sCSSToDevPixelScaling);
+  }
   // found in tabs.inc.css, ".tab-line"
   int tabLineHeight = CSSToDevPixels(2, sCSSToDevPixelScaling) + verticalOffset;
   int selectedTabWidth = CSSToDevPixels(224, sCSSToDevPixelScaling);
@@ -571,6 +701,9 @@
 
   int placeholderMargin = CSSToDevPixels(8, sCSSToDevPixelScaling);
 
+  int menubarHeightDevPixels =
+      menubarShown ? CSSToDevPixels(28, sCSSToDevPixelScaling) : 0;
+
   // controlled by css variable urlbarMarginInline in urlbar-searchbar.inc.css
   int urlbarMargin =
       CSSToDevPixels(5, sCSSToDevPixelScaling) + horizontalOffset;
@@ -580,7 +713,7 @@
   int urlbarTextPlaceholderMarginLeft =
       CSSToDevPixels(10, sCSSToDevPixelScaling);
   int urlbarTextPlaceHolderWidth = CSSToDevPixels(
-      std::min((int)(urlbarCSSSpan.end - urlbarCSSSpan.start) - 10, 260),
+      std::clamp(urlbarCSSSpan.end - urlbarCSSSpan.start - 10.0, 0.0, 260.0),
       sCSSToDevPixelScaling);
   int urlbarTextPlaceholderHeight = CSSToDevPixels(10, sCSSToDevPixelScaling);
 
@@ -604,6 +737,16 @@
     return;
   }
 
+  ColorRect menubar = {};
+  menubar.color = currentTheme.tabBarColor;
+  menubar.x = 0;
+  menubar.y = topBorder.height;
+  menubar.width = sWindowWidth;
+  menubar.height = menubarHeightDevPixels;
+  if (!rects.append(menubar)) {
+    return;
+  }
+
   int placeholderBorderRadius = CSSToDevPixels(2, sCSSToDevPixelScaling);
   // found in browser.css "--toolbarbutton-border-radius"
   int urlbarBorderRadius = CSSToDevPixels(2, sCSSToDevPixelScaling);
@@ -615,7 +758,7 @@
   ColorRect tabBar = {};
   tabBar.color = currentTheme.tabBarColor;
   tabBar.x = 0;
-  tabBar.y = topBorder.height;
+  tabBar.y = menubar.height;
   tabBar.width = sWindowWidth;
   tabBar.height = tabBarHeight;
   if (!rects.append(tabBar)) {
@@ -626,7 +769,7 @@
   ColorRect tabLine = {};
   tabLine.color = currentTheme.tabLineColor;
   tabLine.x = titlebarSpacerWidth;
-  tabLine.y = topBorder.height;
+  tabLine.y = menubar.height;
   tabLine.width = selectedTabWidth;
   tabLine.height = tabLineHeight;
   if (!rects.append(tabLine)) {
@@ -834,7 +977,18 @@
   sPixelBuffer =
       (uint32_t*)calloc(sWindowWidth * sTotalChromeHeight, sizeof(uint32_t));
 
-  for (const auto& rect : rects) {
+  for (auto& rect : *sAnimatedRects) {
+    rect.x = std::clamp(rect.x, 0, sWindowWidth);
+    rect.width = std::clamp(rect.width, 0, sWindowWidth - rect.x);
+    rect.y = std::clamp(rect.y, 0, sTotalChromeHeight);
+    rect.height = std::clamp(rect.height, 0, sTotalChromeHeight - rect.y);
+  }
+
+  for (auto& rect : rects) {
+    rect.x = std::clamp(rect.x, 0, sWindowWidth);
+    rect.width = std::clamp(rect.width, 0, sWindowWidth - rect.x);
+    rect.y = std::clamp(rect.y, 0, sTotalChromeHeight);
+    rect.height = std::clamp(rect.height, 0, sTotalChromeHeight - rect.y);
     RasterizeColorRect(rect);
   }
 
@@ -854,7 +1008,7 @@
                  DIB_RGB_COLORS, SRCCOPY);
 
   // Then, we just fill the rest with FillRect
-  RECT rect = {0, sTotalChromeHeight, (LONG)sWindowWidth, (LONG)sWindowHeight};
+  RECT rect = {0, sTotalChromeHeight, sWindowWidth, sWindowHeight};
   HBRUSH brush = sCreateSolidBrush(currentTheme.backgroundColor);
   sFillRect(hdc, &rect, brush);
 
@@ -1271,6 +1425,11 @@
   return nullptr;
 }
 
+static bool EnvHasValue(const char* name) {
+  const char* val = getenv(name);
+  return (val && *val);
+}
+
 // Ensures that we only see arguments in the command line which are acceptable.
 // This is based on manual inspection of the list of arguments listed in the MDN
 // page for Gecko/Firefox commandline options:
@@ -1312,7 +1471,7 @@
 // guarantee that the code which handles the non-default window is set up to
 // properly handle the transition from the skeleton UI window.
 bool AreAllCmdlineArgumentsApproved(int argc, char** argv) {
-  const char* approvedArgumentsList[] = {
+  const char* approvedArgumentsArray[] = {
       // These won't cause the browser to be visualy different in any way
       "new-instance", "no-remote", "browser", "foreground", "setDefaultBrowser",
       "attach-console", "wait-for-browser", "osint",
@@ -1322,10 +1481,21 @@
       // correct enough.
       "new-tab", "new-window",
 
+      // To the extent possible, we want to ensure that existing tests cover
+      // the skeleton UI, so we need to allow marionette
+      "marionette",
+
       // These will cause the content area to appear different, but won't
       // meaningfully affect the chrome
       "preferences", "search", "url",
 
+#ifndef MOZILLA_OFFICIAL
+      // On local builds, we want to allow -profile, because it's how `mach run`
+      // operates, and excluding that would create an unnecessary blind spot for
+      // Firefox devs.
+      "profile"
+#endif
+
       // There are other arguments which are likely okay. However, they are
       // not included here because this list is not intended to be
       // exhaustive - it only intends to green-light some somewhat commonly
@@ -1333,14 +1503,33 @@
       // rejection of the command line.
   };
 
-  // On local builds, we want to allow -profile, because it's how `mach run`
-  // operates, and excluding that would create an unnecessary blind spot for
-  // Firefox devs.
-  const char* releaseChannel = MOZ_STRINGIFY(MOZ_UPDATE_CHANNEL);
-  bool acceptProfileArgument = !strcmp(releaseChannel, "default");
+  int approvedArgumentsArraySize =
+      sizeof(approvedArgumentsArray) / sizeof(approvedArgumentsArray[0]);
+  Vector<const char*> approvedArguments;
+  if (!approvedArguments.reserve(approvedArgumentsArraySize)) {
+    return false;
+  }
+
+  for (int i = 0; i < approvedArgumentsArraySize; ++i) {
+    approvedArguments.infallibleAppend(approvedArgumentsArray[i]);
+  }
+
+#ifdef MOZILLA_OFFICIAL
+  // If we're running mochitests or direct marionette tests, those specify a
+  // temporary profile, and we want to ensure that we get the added coverage
+  // from those.
+  for (int i = 1; i < argc; ++i) {
+    const char* flag = NormalizeFlag(argv[i]);
+    if (flag && !strcmp(flag, "marionette")) {
+      if (!approvedArguments.append("profile")) {
+        return false;
+      }
+
+      break;
+    }
+  }
+#endif
 
-  const int numApproved =
-      sizeof(approvedArgumentsList) / sizeof(approvedArgumentsList[0]);
   for (int i = 1; i < argc; ++i) {
     const char* flag = NormalizeFlag(argv[i]);
     if (!flag) {
@@ -1358,25 +1547,14 @@
       continue;
     }
 
-    // Just force true for marionette - tests are a special case where we
-    // want to ensure we accept things like -profile.
-    if (!strcmp(flag, "marionette")) {
-      return true;
-    }
-
-    if (acceptProfileArgument && !strcmp(flag, "profile")) {
-      continue;
-    }
-
     bool approved = false;
-    for (int j = 0; j < numApproved; ++j) {
-      const char* approvedArg = approvedArgumentsList[j];
+    for (const char* approvedArg : approvedArguments) {
       // We do a case-insensitive compare here with _stricmp. Even though some
       // of these arguments are *not* read as case-insensitive, others *are*.
       // Similar to the flag logic above, we don't really care about this
       // distinction, because we don't need to parse the arguments - we just
       // rely on the assumption that none of the listed flags in our
-      // approvedArgumentsList are overloaded in such a way that a different
+      // approvedArguments are overloaded in such a way that a different
       // casing would visually alter the firefox window.
       if (!_stricmp(flag, approvedArg)) {
         approved = true;
@@ -1392,13 +1570,20 @@
   return true;
 }
 
+static bool VerifyWindowDimensions(uint32_t windowWidth,
+                                   uint32_t windowHeight) {
+  return windowWidth <= kMaxWindowWidth && windowHeight <= kMaxWindowHeight;
+}
+
 void CreateAndStorePreXULSkeletonUI(HINSTANCE hInstance, int argc,
                                     char** argv) {
 #ifdef MOZ_GECKO_PROFILER
   const TimeStamp skeletonStart = TimeStamp::NowUnfuzzed();
 #endif
 
-  if (!AreAllCmdlineArgumentsApproved(argc, argv)) {
+  if (!AreAllCmdlineArgumentsApproved(argc, argv) ||
+      EnvHasValue("MOZ_SAFE_MODE_RESTART") || EnvHasValue("XRE_PROFILE_PATH") ||
+      EnvHasValue("MOZ_RESET_PROFILE_RESTART")) {
     sPreXULSkeletonUIDisallowed = true;
     return;
   }
@@ -1429,6 +1614,11 @@
     return;
   }
 
+  if (!TryGetSkeletonUILock()) {
+    printf_stderr("Error trying to get skeleton UI lock %lu\n", GetLastError());
+    return;
+  }
+
   WNDCLASSW wc;
   wc.style = CS_DBLCLKS;
   wc.lpfnWndProc = PreXULSkeletonUIProc;
@@ -1499,6 +1689,17 @@
   }
   sMaximized = maximized != 0;
 
+  uint32_t menubarShown;
+  result = ::RegGetValueW(
+      regKey, nullptr,
+      GetRegValueName(binPath.get(), sMenubarShownRegSuffix).c_str(),
+      RRF_RT_REG_DWORD, nullptr, reinterpret_cast<PBYTE>(&menubarShown),
+      &dataLen);
+  if (result != ERROR_SUCCESS) {
+    printf_stderr("Error reading menubarShown %lu\n", GetLastError());
+    return;
+  }
+
   dataLen = sizeof(double);
   result = ::RegGetValueW(
       regKey, nullptr,
@@ -1602,6 +1803,11 @@
   }
   ThemeColors currentTheme = GetTheme(themeMode);
 
+  if (!VerifyWindowDimensions(windowWidth, windowHeight)) {
+    printf_stderr("Bad window dimensions for skeleton UI.");
+    return;
+  }
+
   sPreXULSkeletonUIWindow =
       sCreateWindowExW(kPreXULSkeletonUIWindowStyleEx, L"MozillaWindowClass",
                        L"", windowStyle, screenX, screenY, windowWidth,
@@ -1635,15 +1841,15 @@
     sWindowHeight =
         mi.rcWork.bottom - mi.rcWork.top + sNonClientVerticalMargins * 2;
   } else {
-    sWindowWidth = windowWidth;
-    sWindowHeight = windowHeight;
+    sWindowWidth = static_cast<int>(windowWidth);
+    sWindowHeight = static_cast<int>(windowHeight);
   }
 
   sSetWindowPos(sPreXULSkeletonUIWindow, 0, 0, 0, 0, 0,
                 SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE |
                     SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
   DrawSkeletonUI(sPreXULSkeletonUIWindow, urlbar, searchbar, springs,
-                 currentTheme);
+                 currentTheme, menubarShown);
   if (sAnimatedRects) {
     sPreXULSKeletonUIAnimationThread = ::CreateThread(
         nullptr, 256 * 1024, AnimateSkeletonUI, nullptr, 0, nullptr);
@@ -1682,11 +1888,7 @@
   return result;
 }
 
-void PersistPreXULSkeletonUIValues(int screenX, int screenY, int width,
-                                   int height, bool maximized,
-                                   CSSPixelSpan urlbar, CSSPixelSpan searchbar,
-                                   const Vector<CSSPixelSpan>& springs,
-                                   double cssToDevPixelScaling) {
+void PersistPreXULSkeletonUIValues(const SkeletonUISettings& settings) {
   if (!sPreXULSkeletonUIEnabled) {
     return;
   }
@@ -1702,7 +1904,8 @@
   LSTATUS result;
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sScreenXRegSuffix).c_str(), 0,
-      REG_DWORD, reinterpret_cast<PBYTE>(&screenX), sizeof(screenX));
+      REG_DWORD, reinterpret_cast<const BYTE*>(&settings.screenX),
+      sizeof(settings.screenX));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting screenX to Windows registry\n");
     return;
@@ -1710,7 +1913,8 @@
 
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sScreenYRegSuffix).c_str(), 0,
-      REG_DWORD, reinterpret_cast<PBYTE>(&screenY), sizeof(screenY));
+      REG_DWORD, reinterpret_cast<const BYTE*>(&settings.screenY),
+      sizeof(settings.screenY));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting screenY to Windows registry\n");
     return;
@@ -1718,7 +1922,8 @@
 
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sWidthRegSuffix).c_str(), 0,
-      REG_DWORD, reinterpret_cast<PBYTE>(&width), sizeof(width));
+      REG_DWORD, reinterpret_cast<const BYTE*>(&settings.width),
+      sizeof(settings.width));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting width to Windows registry\n");
     return;
@@ -1726,68 +1931,77 @@
 
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sHeightRegSuffix).c_str(), 0,
-      REG_DWORD, reinterpret_cast<PBYTE>(&height), sizeof(height));
+      REG_DWORD, reinterpret_cast<const BYTE*>(&settings.height),
+      sizeof(settings.height));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting height to Windows registry\n");
     return;
   }
 
-  DWORD maximizedDword = maximized ? 1 : 0;
+  DWORD maximizedDword = settings.maximized ? 1 : 0;
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sMaximizedRegSuffix).c_str(), 0,
-      REG_DWORD, reinterpret_cast<PBYTE>(&maximizedDword),
+      REG_DWORD, reinterpret_cast<const BYTE*>(&maximizedDword),
       sizeof(maximizedDword));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting maximized to Windows registry\n");
   }
 
+  DWORD menubarShownDword = settings.menubarShown ? 1 : 0;
+  result = ::RegSetValueExW(
+      regKey, GetRegValueName(binPath.get(), sMenubarShownRegSuffix).c_str(), 0,
+      REG_DWORD, reinterpret_cast<const BYTE*>(&menubarShownDword),
+      sizeof(menubarShownDword));
+  if (result != ERROR_SUCCESS) {
+    printf_stderr("Failed persisting menubarShown to Windows registry\n");
+  }
+
   result = ::RegSetValueExW(
       regKey,
       GetRegValueName(binPath.get(), sCssToDevPixelScalingRegSuffix).c_str(), 0,
-      REG_BINARY, reinterpret_cast<PBYTE>(&cssToDevPixelScaling),
-      sizeof(cssToDevPixelScaling));
+      REG_BINARY, reinterpret_cast<const BYTE*>(&settings.cssToDevPixelScaling),
+      sizeof(settings.cssToDevPixelScaling));
   if (result != ERROR_SUCCESS) {
     printf_stderr(
         "Failed persisting cssToDevPixelScaling to Windows registry\n");
     return;
   }
 
-  double urlbarSpan[2];
-  urlbarSpan[0] = urlbar.start;
-  urlbarSpan[1] = urlbar.end;
+  double urlbar[2];
+  urlbar[0] = settings.urlbarSpan.start;
+  urlbar[1] = settings.urlbarSpan.end;
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sUrlbarCSSRegSuffix).c_str(), 0,
-      REG_BINARY, reinterpret_cast<PBYTE>(urlbarSpan), sizeof(urlbarSpan));
+      REG_BINARY, reinterpret_cast<const BYTE*>(urlbar), sizeof(urlbar));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting urlbar to Windows registry\n");
     return;
   }
 
-  double searchbarSpan[2];
-  searchbarSpan[0] = searchbar.start;
-  searchbarSpan[1] = searchbar.end;
+  double searchbar[2];
+  searchbar[0] = settings.searchbarSpan.start;
+  searchbar[1] = settings.searchbarSpan.end;
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sSearchbarRegSuffix).c_str(), 0,
-      REG_BINARY, reinterpret_cast<PBYTE>(searchbarSpan),
-      sizeof(searchbarSpan));
+      REG_BINARY, reinterpret_cast<const BYTE*>(searchbar), sizeof(searchbar));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting searchbar to Windows registry\n");
     return;
   }
 
   Vector<double> springValues;
-  if (!springValues.reserve(springs.length() * 2)) {
+  if (!springValues.reserve(settings.springs.length() * 2)) {
     return;
   }
 
-  for (auto spring : springs) {
+  for (auto spring : settings.springs) {
     springValues.infallibleAppend(spring.start);
     springValues.infallibleAppend(spring.end);
   }
 
   result = ::RegSetValueExW(
       regKey, GetRegValueName(binPath.get(), sSpringsCSSRegSuffix).c_str(), 0,
-      REG_BINARY, reinterpret_cast<PBYTE>(springValues.begin()),
+      REG_BINARY, reinterpret_cast<const BYTE*>(springValues.begin()),
       springValues.length() * sizeof(double));
   if (result != ERROR_SUCCESS) {
     printf_stderr("Failed persisting springsCSS to Windows registry\n");
@@ -1828,6 +2042,14 @@
     return;
   }
 
+  if (!sPreXULSkeletonUIEnabled && value) {
+    // We specifically don't care if we fail to get this lock. We just want to
+    // do our best effort to lock it so that future instances don't create
+    // skeleton UIs while we're still running, since they will immediately exit
+    // and tell us to open a new window.
+    Unused << TryGetSkeletonUILock();
+  }
+
   sPreXULSkeletonUIEnabled = value;
 }
 
diff -Nru firefox-84.0.2+build1/mozglue/misc/PreXULSkeletonUI.h firefox-85.0+build1/mozglue/misc/PreXULSkeletonUI.h
--- firefox-84.0.2+build1/mozglue/misc/PreXULSkeletonUI.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/misc/PreXULSkeletonUI.h	2021-01-18 19:58:18.000000000 +0000
@@ -32,6 +32,19 @@
   int end;
 };
 
+struct SkeletonUISettings {
+  uint32_t screenX;
+  uint32_t screenY;
+  uint32_t width;
+  uint32_t height;
+  CSSPixelSpan urlbarSpan;
+  CSSPixelSpan searchbarSpan;
+  double cssToDevPixelScaling;
+  Vector<CSSPixelSpan> springs;
+  bool maximized;
+  bool menubarShown;
+};
+
 enum class ThemeMode : uint32_t { Invalid, Default, Dark, Light };
 
 struct ThemeColors {
@@ -48,12 +61,7 @@
                                              char** argv);
 MFBT_API HWND ConsumePreXULSkeletonUIHandle();
 MFBT_API bool WasPreXULSkeletonUIMaximized();
-MFBT_API void PersistPreXULSkeletonUIValues(int screenX, int screenY, int width,
-                                            int height, bool maximized,
-                                            CSSPixelSpan urlbar,
-                                            CSSPixelSpan searchbar,
-                                            const Vector<CSSPixelSpan>& springs,
-                                            double cssToDevPixelScaling);
+MFBT_API void PersistPreXULSkeletonUIValues(const SkeletonUISettings& settings);
 MFBT_API bool GetPreXULSkeletonUIEnabled();
 MFBT_API void SetPreXULSkeletonUIEnabledIfAllowed(bool value);
 MFBT_API void PollPreXULSkeletonUIEvents();
diff -Nru firefox-84.0.2+build1/mozglue/misc/Printf.cpp firefox-85.0+build1/mozglue/misc/Printf.cpp
--- firefox-84.0.2+build1/mozglue/misc/Printf.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/misc/Printf.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -469,10 +469,9 @@
                         sizeof(size_t) == sizeof(long) ||
                         sizeof(size_t) == sizeof(long long),
                     "size_t is not one of the expected sizes");
-      nas[cn].type =
-          sizeof(size_t) == sizeof(int)
-              ? TYPE_INTN
-              : sizeof(size_t) == sizeof(long) ? TYPE_LONG : TYPE_LONGLONG;
+      nas[cn].type = sizeof(size_t) == sizeof(int)    ? TYPE_INTN
+                     : sizeof(size_t) == sizeof(long) ? TYPE_LONG
+                                                      : TYPE_LONGLONG;
       c = *p++;
     }
 
@@ -730,9 +729,9 @@
                         sizeof(size_t) == sizeof(long) ||
                         sizeof(size_t) == sizeof(long long),
                     "size_t is not one of the expected sizes");
-      type = sizeof(size_t) == sizeof(int)
-                 ? TYPE_INTN
-                 : sizeof(size_t) == sizeof(long) ? TYPE_LONG : TYPE_LONGLONG;
+      type = sizeof(size_t) == sizeof(int)    ? TYPE_INTN
+             : sizeof(size_t) == sizeof(long) ? TYPE_LONG
+                                              : TYPE_LONGLONG;
       c = *fmt++;
     }
 
diff -Nru firefox-84.0.2+build1/mozglue/misc/WindowsProcessMitigations.cpp firefox-85.0+build1/mozglue/misc/WindowsProcessMitigations.cpp
--- firefox-84.0.2+build1/mozglue/misc/WindowsProcessMitigations.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/misc/WindowsProcessMitigations.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -15,34 +15,6 @@
     SIZE_T dwLength);
 #endif  // (_WIN32_WINNT < 0x0602)
 
-// MinGW does not have these definitions in winnt.h yet
-#if defined(__MINGW32__)
-constexpr PROCESS_MITIGATION_POLICY ProcessPayloadRestrictionPolicy =
-    static_cast<PROCESS_MITIGATION_POLICY>(12);
-
-typedef struct _PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY {
-  union {
-    DWORD Flags;
-    struct {
-      DWORD EnableExportAddressFilter : 1;
-      DWORD AuditExportAddressFilter : 1;
-      DWORD EnableExportAddressFilterPlus : 1;
-      DWORD AuditExportAddressFilterPlus : 1;
-      DWORD EnableImportAddressFilter : 1;
-      DWORD AuditImportAddressFilter : 1;
-      DWORD EnableRopStackPivot : 1;
-      DWORD AuditRopStackPivot : 1;
-      DWORD EnableRopCallerCheck : 1;
-      DWORD AuditRopCallerCheck : 1;
-      DWORD EnableRopSimExec : 1;
-      DWORD AuditRopSimExec : 1;
-      DWORD ReservedFlags : 20;
-    } DUMMYSTRUCTNAME;
-  } DUMMYUNIONNAME;
-} PROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY,
-    *PPROCESS_MITIGATION_PAYLOAD_RESTRICTION_POLICY;
-#endif  // defined(__MINGW32__)
-
 namespace mozilla {
 
 static decltype(&::GetProcessMitigationPolicy)
diff -Nru firefox-84.0.2+build1/mozglue/tests/TestBaseProfiler.cpp firefox-85.0+build1/mozglue/tests/TestBaseProfiler.cpp
--- firefox-84.0.2+build1/mozglue/tests/TestBaseProfiler.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/mozglue/tests/TestBaseProfiler.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -3014,126 +3014,152 @@
   printf("TestLiteralEmptyStringView done\n");
 }
 
+template <typename CHAR>
 void TestProfilerStringView() {
-  printf("TestProfilerStringView...\n");
+  if constexpr (std::is_same_v<CHAR, char>) {
+    printf("TestProfilerStringView<char>...\n");
+  } else if constexpr (std::is_same_v<CHAR, char16_t>) {
+    printf("TestProfilerStringView<char16_t>...\n");
+  } else {
+    MOZ_RELEASE_ASSERT(false,
+                       "TestProfilerStringView only handles char and char16_t");
+  }
 
   // Used to verify implicit constructions, as this will normally be used in
   // function parameters.
-  auto BS8V = [](mozilla::ProfilerString8View&& aBS8V) {
-    return std::move(aBS8V);
+  auto BSV = [](mozilla::ProfilerStringView<CHAR>&& aBSV) {
+    return std::move(aBSV);
+  };
+
+  // These look like string literals, as expected by some string constructors.
+  const CHAR empty[0 + 1] = {CHAR('\0')};
+  const CHAR hi[2 + 1] = {
+      CHAR('h'),
+      CHAR('i'),
+      CHAR('\0'),
   };
 
   // Literal empty string.
-  MOZ_RELEASE_ASSERT(BS8V("").Data());
-  MOZ_RELEASE_ASSERT(BS8V("").Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V("").Length() == 0);
-  MOZ_RELEASE_ASSERT(BS8V("").IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V("").IsReference());
+  MOZ_RELEASE_ASSERT(BSV(empty).Data());
+  MOZ_RELEASE_ASSERT(BSV(empty).Data()[0] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(empty).Length() == 0);
+  MOZ_RELEASE_ASSERT(BSV(empty).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(empty).IsReference());
 
   // Literal non-empty string.
-  MOZ_RELEASE_ASSERT(BS8V("hi").Data());
-  MOZ_RELEASE_ASSERT(BS8V("hi").Data()[0] == 'h');
-  MOZ_RELEASE_ASSERT(BS8V("hi").Data()[1] == 'i');
-  MOZ_RELEASE_ASSERT(BS8V("hi").Data()[2] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V("hi").Length() == 2);
-  MOZ_RELEASE_ASSERT(BS8V("hi").IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V("hi").IsReference());
+  MOZ_RELEASE_ASSERT(BSV(hi).Data());
+  MOZ_RELEASE_ASSERT(BSV(hi).Data()[0] == CHAR('h'));
+  MOZ_RELEASE_ASSERT(BSV(hi).Data()[1] == CHAR('i'));
+  MOZ_RELEASE_ASSERT(BSV(hi).Data()[2] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(hi).Length() == 2);
+  MOZ_RELEASE_ASSERT(BSV(hi).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(hi).IsReference());
 
   // std::string_view to a literal empty string.
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("")).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("")).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("")).Length() == 0);
-  MOZ_RELEASE_ASSERT(!BS8V(std::string_view("")).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("")).IsReference());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(empty)).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(empty)).Data()[0] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(empty)).Length() == 0);
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string_view<CHAR>(empty)).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(empty)).IsReference());
 
   // std::string_view to a literal non-empty string.
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).Data()[0] == 'h');
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).Data()[1] == 'i');
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).Data()[2] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).Length() == 2);
-  MOZ_RELEASE_ASSERT(!BS8V(std::string_view("hi")).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view("hi")).IsReference());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).Data()[0] ==
+                     CHAR('h'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).Data()[1] ==
+                     CHAR('i'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).Data()[2] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).Length() == 2);
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string_view<CHAR>(hi)).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>(hi)).IsReference());
 
   // Default std::string_view points at nullptr, ProfilerStringView converts it
   // to the literal empty string.
-  MOZ_RELEASE_ASSERT(!std::string_view().data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view()).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view()).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view()).Length() == 0);
-  MOZ_RELEASE_ASSERT(BS8V(std::string_view()).IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V(std::string_view()).IsReference());
+  MOZ_RELEASE_ASSERT(!std::basic_string_view<CHAR>().data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>()).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>()).Data()[0] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>()).Length() == 0);
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string_view<CHAR>()).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string_view<CHAR>()).IsReference());
 
   // std::string to a literal empty string.
-  MOZ_RELEASE_ASSERT(BS8V(std::string("")).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string("")).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string("")).Length() == 0);
-  MOZ_RELEASE_ASSERT(!BS8V(std::string("")).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(std::string("")).IsReference());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(empty)).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(empty)).Data()[0] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(empty)).Length() == 0);
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string<CHAR>(empty)).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(empty)).IsReference());
 
   // std::string to a literal non-empty string.
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).Data()[0] == 'h');
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).Data()[1] == 'i');
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).Data()[2] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).Length() == 2);
-  MOZ_RELEASE_ASSERT(!BS8V(std::string("hi")).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(std::string("hi")).IsReference());
-
-  // Default std::string_view contains an empty null-terminated string.
-  MOZ_RELEASE_ASSERT(std::string().data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string()).Data());
-  MOZ_RELEASE_ASSERT(BS8V(std::string()).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(std::string()).Length() == 0);
-  MOZ_RELEASE_ASSERT(!BS8V(std::string()).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(std::string()).IsReference());
-
-  class FakeNsCString {
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).Data()[0] == CHAR('h'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).Data()[1] == CHAR('i'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).Data()[2] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).Length() == 2);
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string<CHAR>(hi)).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>(hi)).IsReference());
+
+  // Default std::string contains an empty null-terminated string.
+  MOZ_RELEASE_ASSERT(std::basic_string<CHAR>().data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>()).Data());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>()).Data()[0] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>()).Length() == 0);
+  MOZ_RELEASE_ASSERT(!BSV(std::basic_string<CHAR>()).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(std::basic_string<CHAR>()).IsReference());
+
+  // Class that quacks like nsTString (with Data(), Length(), IsLiteral()), to
+  // check that ProfilerStringView can read from them.
+  class FakeNsTString {
    public:
-    FakeNsCString(const char* aData, size_t aLength, bool aIsLiteral)
+    FakeNsTString(const CHAR* aData, size_t aLength, bool aIsLiteral)
         : mData(aData), mLength(aLength), mIsLiteral(aIsLiteral) {}
 
-    const char* Data() const { return mData; }
+    const CHAR* Data() const { return mData; }
     size_t Length() const { return mLength; }
     bool IsLiteral() const { return mIsLiteral; }
 
    private:
-    const char* mData;
+    const CHAR* mData;
     size_t mLength;
     bool mIsLiteral;
   };
 
-  // FakeNsCString to nullptr.
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString(nullptr, 0, true)).Data());
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString(nullptr, 0, true)).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString(nullptr, 0, true)).Length() == 0);
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString(nullptr, 0, true)).IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V(FakeNsCString(nullptr, 0, true)).IsReference());
-
-  // FakeNsCString to a literal empty string.
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("", 0, true)).Data());
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("", 0, true)).Data()[0] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("", 0, true)).Length() == 0);
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("", 0, true)).IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V(FakeNsCString("", 0, true)).IsReference());
-
-  // FakeNsCString to a literal non-empty string.
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).Data());
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).Data()[0] == 'h');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).Data()[1] == 'i');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).Data()[2] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).Length() == 2);
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, true)).IsLiteral());
-  MOZ_RELEASE_ASSERT(!BS8V(FakeNsCString("hi", 2, true)).IsReference());
-
-  // FakeNsCString to a non-literal non-empty string.
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).Data());
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).Data()[0] == 'h');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).Data()[1] == 'i');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).Data()[2] == '\0');
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).Length() == 2);
-  MOZ_RELEASE_ASSERT(!BS8V(FakeNsCString("hi", 2, false)).IsLiteral());
-  MOZ_RELEASE_ASSERT(BS8V(FakeNsCString("hi", 2, false)).IsReference());
+  // FakeNsTString to nullptr.
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(nullptr, 0, true)).Data());
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(nullptr, 0, true)).Data()[0] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(nullptr, 0, true)).Length() == 0);
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(nullptr, 0, true)).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(FakeNsTString(nullptr, 0, true)).IsReference());
+
+  // FakeNsTString to a literal empty string.
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(empty, 0, true)).Data());
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(empty, 0, true)).Data()[0] ==
+                     CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(empty, 0, true)).Length() == 0);
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(empty, 0, true)).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(FakeNsTString(empty, 0, true)).IsReference());
+
+  // FakeNsTString to a literal non-empty string.
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).Data());
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).Data()[0] == CHAR('h'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).Data()[1] == CHAR('i'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).Data()[2] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).Length() == 2);
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, true)).IsLiteral());
+  MOZ_RELEASE_ASSERT(!BSV(FakeNsTString(hi, 2, true)).IsReference());
+
+  // FakeNsTString to a non-literal non-empty string.
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).Data());
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).Data()[0] == CHAR('h'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).Data()[1] == CHAR('i'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).Data()[2] == CHAR('\0'));
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).Length() == 2);
+  MOZ_RELEASE_ASSERT(!BSV(FakeNsTString(hi, 2, false)).IsLiteral());
+  MOZ_RELEASE_ASSERT(BSV(FakeNsTString(hi, 2, false)).IsReference());
 
   // Serialization and deserialization (with ownership).
   constexpr size_t bufferMaxSize = 1024;
@@ -3142,69 +3168,73 @@
   ProfileChunkedBuffer cb(ProfileChunkedBuffer::ThreadSafety::WithMutex, cm);
 
   // Literal string, serialized as raw pointer.
-  MOZ_RELEASE_ASSERT(cb.PutObject(BS8V("hi")));
+  MOZ_RELEASE_ASSERT(cb.PutObject(BSV(hi)));
   {
     unsigned read = 0;
-    ProfilerString8View outerBS8V;
+    ProfilerStringView<CHAR> outerBSV;
     cb.ReadEach([&](ProfileBufferEntryReader& aER) {
       ++read;
-      auto bs8v = aER.ReadObject<ProfilerString8View>();
-      MOZ_RELEASE_ASSERT(bs8v.Data());
-      MOZ_RELEASE_ASSERT(bs8v.Data()[0] == 'h');
-      MOZ_RELEASE_ASSERT(bs8v.Data()[1] == 'i');
-      MOZ_RELEASE_ASSERT(bs8v.Data()[2] == '\0');
-      MOZ_RELEASE_ASSERT(bs8v.Length() == 2);
-      MOZ_RELEASE_ASSERT(bs8v.IsLiteral());
-      MOZ_RELEASE_ASSERT(!bs8v.IsReference());
-      outerBS8V = std::move(bs8v);
+      auto bsv = aER.ReadObject<ProfilerStringView<CHAR>>();
+      MOZ_RELEASE_ASSERT(bsv.Data());
+      MOZ_RELEASE_ASSERT(bsv.Data()[0] == CHAR('h'));
+      MOZ_RELEASE_ASSERT(bsv.Data()[1] == CHAR('i'));
+      MOZ_RELEASE_ASSERT(bsv.Data()[2] == CHAR('\0'));
+      MOZ_RELEASE_ASSERT(bsv.Length() == 2);
+      MOZ_RELEASE_ASSERT(bsv.IsLiteral());
+      MOZ_RELEASE_ASSERT(!bsv.IsReference());
+      outerBSV = std::move(bsv);
     });
     MOZ_RELEASE_ASSERT(read == 1);
-    MOZ_RELEASE_ASSERT(outerBS8V.Data());
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[0] == 'h');
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[1] == 'i');
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[2] == '\0');
-    MOZ_RELEASE_ASSERT(outerBS8V.Length() == 2);
-    MOZ_RELEASE_ASSERT(outerBS8V.IsLiteral());
-    MOZ_RELEASE_ASSERT(!outerBS8V.IsReference());
+    MOZ_RELEASE_ASSERT(outerBSV.Data());
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[0] == CHAR('h'));
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[1] == CHAR('i'));
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[2] == CHAR('\0'));
+    MOZ_RELEASE_ASSERT(outerBSV.Length() == 2);
+    MOZ_RELEASE_ASSERT(outerBSV.IsLiteral());
+    MOZ_RELEASE_ASSERT(!outerBSV.IsReference());
   }
 
   cb.Clear();
 
   // Non-literal string, content is serialized.
-  std::string hiString("hi");
-  MOZ_RELEASE_ASSERT(cb.PutObject(BS8V(hiString)));
+  std::basic_string<CHAR> hiString(hi);
+  MOZ_RELEASE_ASSERT(cb.PutObject(BSV(hiString)));
   {
     unsigned read = 0;
-    ProfilerString8View outerBS8V;
+    ProfilerStringView<CHAR> outerBSV;
     cb.ReadEach([&](ProfileBufferEntryReader& aER) {
       ++read;
-      auto bs8v = aER.ReadObject<ProfilerString8View>();
-      MOZ_RELEASE_ASSERT(bs8v.Data());
-      MOZ_RELEASE_ASSERT(bs8v.Data() != hiString.data());
-      MOZ_RELEASE_ASSERT(bs8v.Data()[0] == 'h');
-      MOZ_RELEASE_ASSERT(bs8v.Data()[1] == 'i');
-      MOZ_RELEASE_ASSERT(bs8v.Data()[2] == '\0');
-      MOZ_RELEASE_ASSERT(bs8v.Length() == 2);
+      auto bsv = aER.ReadObject<ProfilerStringView<CHAR>>();
+      MOZ_RELEASE_ASSERT(bsv.Data());
+      MOZ_RELEASE_ASSERT(bsv.Data() != hiString.data());
+      MOZ_RELEASE_ASSERT(bsv.Data()[0] == CHAR('h'));
+      MOZ_RELEASE_ASSERT(bsv.Data()[1] == CHAR('i'));
+      MOZ_RELEASE_ASSERT(bsv.Data()[2] == CHAR('\0'));
+      MOZ_RELEASE_ASSERT(bsv.Length() == 2);
       // Special ownership case, neither a literal nor a reference!
-      MOZ_RELEASE_ASSERT(!bs8v.IsLiteral());
-      MOZ_RELEASE_ASSERT(!bs8v.IsReference());
+      MOZ_RELEASE_ASSERT(!bsv.IsLiteral());
+      MOZ_RELEASE_ASSERT(!bsv.IsReference());
       // Test move of ownership.
-      outerBS8V = std::move(bs8v);
+      outerBSV = std::move(bsv);
       // NOLINTNEXTLINE(bugprone-use-after-move, clang-analyzer-cplusplus.Move)
-      MOZ_RELEASE_ASSERT(bs8v.Length() == 0);
+      MOZ_RELEASE_ASSERT(bsv.Length() == 0);
     });
     MOZ_RELEASE_ASSERT(read == 1);
-    MOZ_RELEASE_ASSERT(outerBS8V.Data());
-    MOZ_RELEASE_ASSERT(outerBS8V.Data() != hiString.data());
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[0] == 'h');
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[1] == 'i');
-    MOZ_RELEASE_ASSERT(outerBS8V.Data()[2] == '\0');
-    MOZ_RELEASE_ASSERT(outerBS8V.Length() == 2);
-    MOZ_RELEASE_ASSERT(!outerBS8V.IsLiteral());
-    MOZ_RELEASE_ASSERT(!outerBS8V.IsReference());
+    MOZ_RELEASE_ASSERT(outerBSV.Data());
+    MOZ_RELEASE_ASSERT(outerBSV.Data() != hiString.data());
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[0] == CHAR('h'));
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[1] == CHAR('i'));
+    MOZ_RELEASE_ASSERT(outerBSV.Data()[2] == CHAR('\0'));
+    MOZ_RELEASE_ASSERT(outerBSV.Length() == 2);
+    MOZ_RELEASE_ASSERT(!outerBSV.IsLiteral());
+    MOZ_RELEASE_ASSERT(!outerBSV.IsReference());
   }
 
-  printf("TestProfilerStringView done\n");
+  if constexpr (std::is_same_v<CHAR, char>) {
+    printf("TestProfilerStringView<char> done\n");
+  } else if constexpr (std::is_same_v<CHAR, char16_t>) {
+    printf("TestProfilerStringView<char16_t> done\n");
+  }
 }
 
 void TestProfilerDependencies() {
@@ -3224,7 +3254,8 @@
   TestBlocksRingBufferThreading();
   TestBlocksRingBufferSerialization();
   TestLiteralEmptyStringView();
-  TestProfilerStringView();
+  TestProfilerStringView<char>();
+  TestProfilerStringView<char16_t>();
 }
 
 // Increase the depth, to a maximum (to avoid too-deep recursion).
@@ -3440,33 +3471,12 @@
         mozilla::baseprofiler::markers::Tracing{}, "category"));
 
     MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
-        "mark", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::UserTimingMark{}, "mark name"));
-
-    MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
-        "measure", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::UserTimingMeasure{}, "measure name",
-        Some(ProfilerString8View("start")), Some(ProfilerString8View("end"))));
-
-    MOZ_RELEASE_ASSERT(
-        baseprofiler::AddMarker("hang", mozilla::baseprofiler::category::OTHER,
-                                {}, mozilla::baseprofiler::markers::Hang{}));
-
-    MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
-        "longtask", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::LongTask{}));
-
-    MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
         "text", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::Text{}, "text text"));
-
-    MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
-        "log", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::Log{}, "module", "text"));
+        mozilla::baseprofiler::markers::TextMarker{}, "text text"));
 
     MOZ_RELEASE_ASSERT(baseprofiler::AddMarker(
         "media sample", mozilla::baseprofiler::category::OTHER, {},
-        mozilla::baseprofiler::markers::MediaSample{}, 123, 456));
+        mozilla::baseprofiler::markers::MediaSampleMarker{}, 123, 456));
 
     printf("Sleep 1s...\n");
     {
@@ -3487,28 +3497,28 @@
            (static_cast<unsigned long long>(info->mRangeEnd) -
             static_cast<unsigned long long>(info->mRangeStart)) *
                9);
-    printf("Stats:         min(ns) .. mean(ns) .. max(ns)  [count]\n");
+    printf("Stats:         min(us) .. mean(us) .. max(us)  [count]\n");
     printf("- Intervals:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mIntervalsNs.min,
-           info->mIntervalsNs.sum / info->mIntervalsNs.n,
-           info->mIntervalsNs.max, info->mIntervalsNs.n);
+           info->mIntervalsUs.min,
+           info->mIntervalsUs.sum / info->mIntervalsUs.n,
+           info->mIntervalsUs.max, info->mIntervalsUs.n);
     printf("- Overheads:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mOverheadsNs.min,
-           info->mOverheadsNs.sum / info->mOverheadsNs.n,
-           info->mOverheadsNs.max, info->mOverheadsNs.n);
+           info->mOverheadsUs.min,
+           info->mOverheadsUs.sum / info->mOverheadsUs.n,
+           info->mOverheadsUs.max, info->mOverheadsUs.n);
     printf("  - Locking:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mLockingsNs.min, info->mLockingsNs.sum / info->mLockingsNs.n,
-           info->mLockingsNs.max, info->mLockingsNs.n);
+           info->mLockingsUs.min, info->mLockingsUs.sum / info->mLockingsUs.n,
+           info->mLockingsUs.max, info->mLockingsUs.n);
     printf("  - Clearning: %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mCleaningsNs.min,
-           info->mCleaningsNs.sum / info->mCleaningsNs.n,
-           info->mCleaningsNs.max, info->mCleaningsNs.n);
+           info->mCleaningsUs.min,
+           info->mCleaningsUs.sum / info->mCleaningsUs.n,
+           info->mCleaningsUs.max, info->mCleaningsUs.n);
     printf("  - Counters:  %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mCountersNs.min, info->mCountersNs.sum / info->mCountersNs.n,
-           info->mCountersNs.max, info->mCountersNs.n);
+           info->mCountersUs.min, info->mCountersUs.sum / info->mCountersUs.n,
+           info->mCountersUs.max, info->mCountersUs.n);
     printf("  - Threads:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-           info->mThreadsNs.min, info->mThreadsNs.sum / info->mThreadsNs.n,
-           info->mThreadsNs.max, info->mThreadsNs.n);
+           info->mThreadsUs.min, info->mThreadsUs.sum / info->mThreadsUs.n,
+           info->mThreadsUs.max, info->mThreadsUs.n);
 
     printf("baseprofiler_get_profile()...\n");
     UniquePtr<char[]> profile = baseprofiler::profiler_get_profile();
@@ -3522,16 +3532,7 @@
     MOZ_RELEASE_ASSERT(profileSV.find("\"markerSchema\": [") != svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"Text\",") != svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"tracing\",") != svnpos);
-    MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"UserTimingMark\",") !=
-                       svnpos);
-    MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"UserTimingMeasure\",") !=
-                       svnpos);
-    MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"BHR-detected hang\",") !=
-                       svnpos);
-    MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"Log\",") != svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"MediaSample\",") != svnpos);
-    MOZ_RELEASE_ASSERT(profileSV.find("\"name\": \"MainThreadLongTask\",") !=
-                       svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"display\": [") != svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"marker-chart\"") != svnpos);
     MOZ_RELEASE_ASSERT(profileSV.find("\"marker-table\"") != svnpos);
@@ -4035,36 +4036,12 @@
       mozilla::baseprofiler::markers::Tracing{}, "category"));
 
   MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
-      buffer, std::string_view("mark"), mozilla::baseprofiler::category::OTHER,
-      {}, mozilla::baseprofiler::markers::UserTimingMark{}, "mark name"));
-
-  MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
-      buffer, std::string_view("measure"),
-      mozilla::baseprofiler::category::OTHER, {},
-      mozilla::baseprofiler::markers::UserTimingMeasure{}, "measure name ",
-      mozilla::Some(mozilla::ProfilerString8View(" start ")),
-      mozilla::Some(mozilla::ProfilerString8View("end"))));
-
-  MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
-      buffer, std::string_view("hang"), mozilla::baseprofiler::category::OTHER,
-      {}, mozilla::baseprofiler::markers::Hang{}));
-
-  MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
-      buffer, std::string_view("long task"),
-      mozilla::baseprofiler::category::OTHER, {},
-      mozilla::baseprofiler::markers::LongTask{}));
-
-  MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
       buffer, std::string_view("text"), mozilla::baseprofiler::category::OTHER,
-      {}, mozilla::baseprofiler::markers::Text{}, "text text"));
-
-  MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
-      buffer, std::string_view("log"), mozilla::baseprofiler::category::OTHER,
-      {}, mozilla::baseprofiler::markers::Log{}, "module", "text"));
+      {}, mozilla::baseprofiler::markers::TextMarker{}, "text text"));
 
   MOZ_RELEASE_ASSERT(mozilla::baseprofiler::AddMarkerToBuffer(
       buffer, std::string_view("media"), mozilla::baseprofiler::category::OTHER,
-      {}, mozilla::baseprofiler::markers::MediaSample{}, 123, 456));
+      {}, mozilla::baseprofiler::markers::MediaSampleMarker{}, 123, 456));
 
 #  ifdef DEBUG
   buffer.Dump();
diff -Nru firefox-84.0.2+build1/netwerk/base/Dashboard.cpp firefox-85.0+build1/netwerk/base/Dashboard.cpp
--- firefox-84.0.2+build1/netwerk/base/Dashboard.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/Dashboard.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -323,6 +323,19 @@
   return NS_OK;
 }
 
+static void CStringToHexString(const nsACString& aIn, nsAString& aOut) {
+  static const char* const lut = "0123456789ABCDEF";
+
+  size_t len = aIn.Length();
+
+  aOut.SetCapacity(2 * len);
+  for (size_t i = 0; i < aIn.Length(); ++i) {
+    const char c = static_cast<char>(aIn[i]);
+    aOut.Append(lut[(c >> 4) & 0x0F]);
+    aOut.Append(lut[c & 15]);
+  }
+}
+
 nsresult LookupHelper::ConstructHTTPSRRAnswer(LookupArgument* aArgument) {
   nsCOMPtr<nsIDNSHTTPSSVCRecord> httpsRecord =
       do_QueryInterface(aArgument->mRecord);
@@ -363,9 +376,15 @@
             nextRecord->mAlpn.Construct();
             nextRecord->mAlpn.Value().mType = type;
             nsCOMPtr<nsISVCParamAlpn> alpnParam = do_QueryInterface(value);
-            nsCString alpnStr;
-            Unused << alpnParam->GetAlpn(alpnStr);
-            CopyASCIItoUTF16(alpnStr, nextRecord->mAlpn.Value().mAlpn);
+            nsTArray<nsCString> alpn;
+            Unused << alpnParam->GetAlpn(alpn);
+            nsAutoCString alpnStr;
+            for (const auto& str : alpn) {
+              alpnStr.Append(str);
+              alpnStr.Append(',');
+            }
+            CopyASCIItoUTF16(Span(alpnStr.BeginReading(), alpnStr.Length() - 1),
+                             nextRecord->mAlpn.Value().mAlpn);
             break;
           }
           case SvcParamKeyNoDefaultAlpn: {
@@ -433,8 +452,8 @@
                 do_QueryInterface(value);
             nsCString echConfigStr;
             Unused << echConfigParam->GetEchconfig(echConfigStr);
-            CopyASCIItoUTF16(echConfigStr,
-                             nextRecord->mEchConfig.Value().mEchConfig);
+            CStringToHexString(echConfigStr,
+                               nextRecord->mEchConfig.Value().mEchConfig);
             break;
           }
           default:
diff -Nru firefox-84.0.2+build1/netwerk/base/DashboardTypes.h firefox-85.0+build1/netwerk/base/DashboardTypes.h
--- firefox-84.0.2+build1/netwerk/base/DashboardTypes.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/DashboardTypes.h	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,7 @@
 #define mozilla_net_DashboardTypes_h_
 
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "nsHttp.h"
 #include "nsString.h"
 #include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/FuzzySecurityInfo.cpp firefox-85.0+build1/netwerk/base/FuzzySecurityInfo.cpp
--- firefox-84.0.2+build1/netwerk/base/FuzzySecurityInfo.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/FuzzySecurityInfo.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -144,6 +144,13 @@
 }
 
 NS_IMETHODIMP
+FuzzySecurityInfo::GetIsAcceptedEch(bool* aIsAcceptedEch) {
+  NS_ENSURE_ARG_POINTER(aIsAcceptedEch);
+  *aIsAcceptedEch = false;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
 FuzzySecurityInfo::GetInterface(const nsIID& uuid, void** result) {
   if (!NS_IsMainThread()) {
     MOZ_CRASH("FuzzySecurityInfo::GetInterface called off the main thread");
diff -Nru firefox-84.0.2+build1/netwerk/base/LoadInfo.cpp firefox-85.0+build1/netwerk/base/LoadInfo.cpp
--- firefox-84.0.2+build1/netwerk/base/LoadInfo.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/LoadInfo.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/StaticPrefs_network.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/LoadInfo.h firefox-85.0+build1/netwerk/base/LoadInfo.h
--- firefox-84.0.2+build1/netwerk/base/LoadInfo.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/LoadInfo.h	2021-01-18 19:58:18.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/dom/ClientInfo.h"
 #include "mozilla/dom/ServiceWorkerDescriptor.h"
 
+class nsDocShell;
 class nsICookieJarSettings;
 class nsINode;
 class nsPIDOMWindowOuter;
diff -Nru firefox-84.0.2+build1/netwerk/base/moz.build firefox-85.0+build1/netwerk/base/moz.build
--- firefox-84.0.2+build1/netwerk/base/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -188,6 +188,7 @@
     "LoadInfo.cpp",
     "MemoryDownloader.cpp",
     "NetworkConnectivityService.cpp",
+    "NetworkDataCountLayer.cpp",
     "nsAsyncRedirectVerifyHelper.cpp",
     "nsAsyncStreamCopier.cpp",
     "nsAuthInformationHolder.cpp",
diff -Nru firefox-84.0.2+build1/netwerk/base/NetworkDataCountLayer.cpp firefox-85.0+build1/netwerk/base/NetworkDataCountLayer.cpp
--- firefox-84.0.2+build1/netwerk/base/NetworkDataCountLayer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/NetworkDataCountLayer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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 "NetworkDataCountLayer.h"
+#include "nsSocketTransportService2.h"
+#include "prmem.h"
+#include "prio.h"
+
+namespace mozilla {
+namespace net {
+
+static PRDescIdentity sNetworkDataCountLayerIdentity;
+static PRIOMethods sNetworkDataCountLayerMethods;
+static PRIOMethods* sNetworkDataCountLayerMethodsPtr = nullptr;
+
+class NetworkDataCountSecret {
+ public:
+  NetworkDataCountSecret() {}
+
+  uint64_t mSentBytes = 0;
+  uint64_t mReceivedBytes = 0;
+};
+
+static PRInt32 NetworkDataCountSend(PRFileDesc* fd, const void* buf,
+                                    PRInt32 amount, PRIntn flags,
+                                    PRIntervalTime timeout) {
+  MOZ_RELEASE_ASSERT(fd->identity == sNetworkDataCountLayerIdentity);
+
+  NetworkDataCountSecret* secret =
+      reinterpret_cast<NetworkDataCountSecret*>(fd->secret);
+
+  PRInt32 rv =
+      (fd->lower->methods->send)(fd->lower, buf, amount, flags, timeout);
+  if (rv > 0) {
+    secret->mSentBytes += rv;
+  }
+  return rv;
+}
+
+static PRInt32 NetworkDataCountWrite(PRFileDesc* fd, const void* buf,
+                                     PRInt32 amount) {
+  return NetworkDataCountSend(fd, buf, amount, 0, PR_INTERVAL_NO_WAIT);
+}
+
+static PRInt32 NetworkDataCountRecv(PRFileDesc* fd, void* buf, PRInt32 amount,
+                                    PRIntn flags, PRIntervalTime timeout) {
+  MOZ_RELEASE_ASSERT(fd->identity == sNetworkDataCountLayerIdentity);
+
+  NetworkDataCountSecret* secret =
+      reinterpret_cast<NetworkDataCountSecret*>(fd->secret);
+
+  PRInt32 rv =
+      (fd->lower->methods->recv)(fd->lower, buf, amount, flags, timeout);
+  if (rv > 0) {
+    secret->mReceivedBytes += rv;
+  }
+  return rv;
+}
+
+static PRInt32 NetworkDataCountRead(PRFileDesc* fd, void* buf, PRInt32 amount) {
+  return NetworkDataCountRecv(fd, buf, amount, 0, PR_INTERVAL_NO_WAIT);
+}
+
+static PRStatus NetworkDataCountClose(PRFileDesc* fd) {
+  if (!fd) {
+    return PR_FAILURE;
+  }
+
+  PRFileDesc* layer = PR_PopIOLayer(fd, PR_TOP_IO_LAYER);
+
+  MOZ_RELEASE_ASSERT(layer && layer->identity == sNetworkDataCountLayerIdentity,
+                     "NetworkDataCount Layer not on top of stack");
+
+  NetworkDataCountSecret* secret =
+      reinterpret_cast<NetworkDataCountSecret*>(layer->secret);
+  layer->secret = nullptr;
+  layer->dtor(layer);
+  delete secret;
+  return fd->methods->close(fd);
+}
+
+nsresult AttachNetworkDataCountLayer(PRFileDesc* fd) {
+  if (!sNetworkDataCountLayerMethodsPtr) {
+    sNetworkDataCountLayerIdentity =
+        PR_GetUniqueIdentity("NetworkDataCount Layer");
+    sNetworkDataCountLayerMethods = *PR_GetDefaultIOMethods();
+    sNetworkDataCountLayerMethods.send = NetworkDataCountSend;
+    sNetworkDataCountLayerMethods.write = NetworkDataCountWrite;
+    sNetworkDataCountLayerMethods.recv = NetworkDataCountRecv;
+    sNetworkDataCountLayerMethods.read = NetworkDataCountRead;
+    sNetworkDataCountLayerMethods.close = NetworkDataCountClose;
+    sNetworkDataCountLayerMethodsPtr = &sNetworkDataCountLayerMethods;
+  }
+
+  PRFileDesc* layer = PR_CreateIOLayerStub(sNetworkDataCountLayerIdentity,
+                                           sNetworkDataCountLayerMethodsPtr);
+
+  if (!layer) {
+    return NS_ERROR_FAILURE;
+  }
+
+  NetworkDataCountSecret* secret = new NetworkDataCountSecret();
+
+  layer->secret = reinterpret_cast<PRFilePrivate*>(secret);
+
+  PRStatus status = PR_PushIOLayer(fd, PR_NSPR_IO_LAYER, layer);
+
+  if (status == PR_FAILURE) {
+    delete secret;
+    PR_Free(layer);  // PR_CreateIOLayerStub() uses PR_Malloc().
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+void NetworkDataCountSent(PRFileDesc* fd, uint64_t& sentBytes) {
+  PRFileDesc* ndcFd = PR_GetIdentitiesLayer(fd, sNetworkDataCountLayerIdentity);
+  MOZ_RELEASE_ASSERT(ndcFd);
+
+  NetworkDataCountSecret* secret =
+      reinterpret_cast<NetworkDataCountSecret*>(ndcFd->secret);
+  sentBytes = secret->mSentBytes;
+}
+
+void NetworkDataCountReceived(PRFileDesc* fd, uint64_t& receivedBytes) {
+  PRFileDesc* ndcFd = PR_GetIdentitiesLayer(fd, sNetworkDataCountLayerIdentity);
+  MOZ_RELEASE_ASSERT(ndcFd);
+
+  NetworkDataCountSecret* secret =
+      reinterpret_cast<NetworkDataCountSecret*>(ndcFd->secret);
+  receivedBytes = secret->mReceivedBytes;
+}
+
+}  // namespace net
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/base/NetworkDataCountLayer.h firefox-85.0+build1/netwerk/base/NetworkDataCountLayer.h
--- firefox-84.0.2+build1/netwerk/base/NetworkDataCountLayer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/NetworkDataCountLayer.h	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* 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 NetworkDataCountLayer_h__
+#define NetworkDataCountLayer_h__
+
+#include "prerror.h"
+
+namespace mozilla {
+namespace net {
+
+nsresult AttachNetworkDataCountLayer(PRFileDesc* fd);
+
+// Get amount of sent bytes.
+void NetworkDataCountSent(PRFileDesc* fd, uint64_t& sentBytes);
+
+// Get amount of received bytes.
+void NetworkDataCountReceived(PRFileDesc* fd, uint64_t& receivedBytes);
+
+}  // namespace net
+}  // namespace mozilla
+
+#endif  // NetworkDataCountLayer_h__
diff -Nru firefox-84.0.2+build1/netwerk/base/nsAsyncRedirectVerifyHelper.cpp firefox-85.0+build1/netwerk/base/nsAsyncRedirectVerifyHelper.cpp
--- firefox-84.0.2+build1/netwerk/base/nsAsyncRedirectVerifyHelper.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsAsyncRedirectVerifyHelper.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Logging.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsAsyncRedirectVerifyHelper.h firefox-85.0+build1/netwerk/base/nsAsyncRedirectVerifyHelper.h
--- firefox-84.0.2+build1/netwerk/base/nsAsyncRedirectVerifyHelper.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsAsyncRedirectVerifyHelper.h	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsIRunnable.h"
 #include "nsIChannelEventSink.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsINamed.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsBufferedStreams.cpp firefox-85.0+build1/netwerk/base/nsBufferedStreams.cpp
--- firefox-84.0.2+build1/netwerk/base/nsBufferedStreams.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsBufferedStreams.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -3,12 +3,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "ipc/IPCMessageUtils.h"
-
 #include "nsBufferedStreams.h"
 #include "nsStreamUtils.h"
 #include "nsNetCID.h"
 #include "nsIClassInfoImpl.h"
+#include "nsIEventTarget.h"
+#include "nsThreadUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include <algorithm>
diff -Nru firefox-84.0.2+build1/netwerk/base/nsDNSPrefetch.cpp firefox-85.0+build1/netwerk/base/nsDNSPrefetch.cpp
--- firefox-84.0.2+build1/netwerk/base/nsDNSPrefetch.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsDNSPrefetch.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,8 +17,6 @@
 #include "mozilla/Preferences.h"
 
 static nsIDNSService* sDNSService = nullptr;
-static mozilla::Atomic<bool, mozilla::Relaxed> sESNIEnabled(false);
-const char kESNIPref[] = "network.security.esni.enabled";
 
 nsresult nsDNSPrefetch::Initialize(nsIDNSService* aDNSService) {
   MOZ_ASSERT(NS_IsMainThread());
@@ -26,28 +24,14 @@
   NS_IF_RELEASE(sDNSService);
   sDNSService = aDNSService;
   NS_IF_ADDREF(sDNSService);
-  mozilla::Preferences::RegisterCallback(nsDNSPrefetch::PrefChanged, kESNIPref);
-  PrefChanged(nullptr, nullptr);
   return NS_OK;
 }
 
 nsresult nsDNSPrefetch::Shutdown() {
   NS_IF_RELEASE(sDNSService);
-  mozilla::Preferences::UnregisterCallback(nsDNSPrefetch::PrefChanged,
-                                           kESNIPref);
   return NS_OK;
 }
 
-// static
-void nsDNSPrefetch::PrefChanged(const char* aPref, void* aClosure) {
-  if (!aPref || strcmp(aPref, kESNIPref) == 0) {
-    bool enabled = false;
-    if (NS_SUCCEEDED(mozilla::Preferences::GetBool(kESNIPref, &enabled))) {
-      sESNIEnabled = enabled;
-    }
-  }
-}
-
 nsDNSPrefetch::nsDNSPrefetch(nsIURI* aURI,
                              mozilla::OriginAttributes& aOriginAttributes,
                              nsIRequest::TRRMode aTRRMode,
@@ -76,25 +60,10 @@
 
   flags |= nsIDNSService::GetFlagsFromTRRMode(mTRRMode);
 
-  nsresult rv = sDNSService->AsyncResolveNative(
+  return sDNSService->AsyncResolveNative(
       mHostname, nsIDNSService::RESOLVE_TYPE_DEFAULT,
       flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, this, target,
       mOriginAttributes, getter_AddRefs(tmpOutstanding));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // Fetch esni keys if needed.
-  if (sESNIEnabled && mIsHttps) {
-    nsAutoCString esniHost;
-    esniHost.Append("_esni.");
-    esniHost.Append(mHostname);
-    sDNSService->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-                                    flags | nsIDNSService::RESOLVE_SPECULATE,
-                                    nullptr, this, target, mOriginAttributes,
-                                    getter_AddRefs(tmpOutstanding));
-  }
-  return NS_OK;
 }
 
 nsresult nsDNSPrefetch::PrefetchLow(bool refreshDNS) {
diff -Nru firefox-84.0.2+build1/netwerk/base/nsDNSPrefetch.h firefox-85.0+build1/netwerk/base/nsDNSPrefetch.h
--- firefox-84.0.2+build1/netwerk/base/nsDNSPrefetch.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsDNSPrefetch.h	2021-01-18 19:58:18.000000000 +0000
@@ -46,8 +46,6 @@
 
   nsresult FetchHTTPSSVC(bool aRefreshDNS);
 
-  static void PrefChanged(const char* aPref, void* aClosure);
-
  private:
   nsCString mHostname;
   bool mIsHttps;
diff -Nru firefox-84.0.2+build1/netwerk/base/nsILoadInfo.idl firefox-85.0+build1/netwerk/base/nsILoadInfo.idl
--- firefox-84.0.2+build1/netwerk/base/nsILoadInfo.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsILoadInfo.idl	2021-01-18 19:58:18.000000000 +0000
@@ -21,8 +21,8 @@
 native LoadContextRef(already_AddRefed<nsISupports>);
 %{C++
 #include "nsTArray.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/LoadTainting.h"
+#include "mozilla/OriginAttributes.h"
 #include "mozilla/UniquePtr.h"
 #include "nsStringFwd.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/base/nsIncrementalDownload.cpp firefox-85.0+build1/netwerk/base/nsIncrementalDownload.cpp
--- firefox-84.0.2+build1/netwerk/base/nsIncrementalDownload.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsIncrementalDownload.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsIObserver.h"
 #include "nsIStreamListener.h"
 #include "nsIFile.h"
+#include "nsIHttpChannel.h"
 #include "nsITimer.h"
 #include "nsIURI.h"
 #include "nsIInputStream.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsIOService.cpp firefox-85.0+build1/netwerk/base/nsIOService.cpp
--- firefox-84.0.2+build1/netwerk/base/nsIOService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsIOService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -98,83 +98,89 @@
 // A general port blacklist.  Connections to these ports will not be allowed
 // unless the protocol overrides.
 //
-// TODO: I am sure that there are more ports to be added.
-//       This cut is based on the classic mozilla codebase
+// This list is to be kept in sync with "bad ports" as defined in the
+// WHATWG Fetch standard at <https://fetch.spec.whatwg.org/#port-blocking>
 
 int16_t gBadPortList[] = {
-    1,     // tcpmux
-    7,     // echo
-    9,     // discard
-    11,    // systat
-    13,    // daytime
-    15,    // netstat
-    17,    // qotd
-    19,    // chargen
-    20,    // ftp-data
-    21,    // ftp
-    22,    // ssh
-    23,    // telnet
-    25,    // smtp
-    37,    // time
-    42,    // name
-    43,    // nicname
-    53,    // domain
-    77,    // priv-rjs
-    79,    // finger
-    87,    // ttylink
-    95,    // supdup
-    101,   // hostriame
-    102,   // iso-tsap
-    103,   // gppitnp
-    104,   // acr-nema
-    109,   // pop2
-    110,   // pop3
-    111,   // sunrpc
-    113,   // auth
-    115,   // sftp
-    117,   // uucp-path
-    119,   // nntp
-    123,   // ntp
-    135,   // loc-srv / epmap
-    139,   // netbios
-    143,   // imap2
-    179,   // bgp
-    389,   // ldap
-    427,   // afp (alternate)
-    465,   // smtp (alternate)
-    512,   // print / exec
-    513,   // login
-    514,   // shell
-    515,   // printer
-    526,   // tempo
-    530,   // courier
-    531,   // chat
-    532,   // netnews
-    540,   // uucp
-    548,   // afp
-    554,   // rtsp
-    556,   // remotefs
-    563,   // nntp+ssl
-    587,   // smtp (outgoing)
-    601,   // syslog-conn
-    636,   // ldap+ssl
-    993,   // imap+ssl
-    995,   // pop3+ssl
-    1720,  // h323hostcall
-    1723,  // pptp
-    2049,  // nfs
-    3659,  // apple-sasl
-    4045,  // lockd
-    5060,  // sip
-    5061,  // sips
-    6000,  // x11
-    6665,  // irc (alternate)
-    6666,  // irc (alternate)
-    6667,  // irc (default)
-    6668,  // irc (alternate)
-    6669,  // irc (alternate)
-    6697,  // irc+tls
-    0,     // Sentinel value: This MUST be zero
+    1,      // tcpmux
+    7,      // echo
+    9,      // discard
+    11,     // systat
+    13,     // daytime
+    15,     // netstat
+    17,     // qotd
+    19,     // chargen
+    20,     // ftp-data
+    21,     // ftp
+    22,     // ssh
+    23,     // telnet
+    25,     // smtp
+    37,     // time
+    42,     // name
+    43,     // nicname
+    53,     // domain
+    69,     // tftp
+    77,     // priv-rjs
+    79,     // finger
+    87,     // ttylink
+    95,     // supdup
+    101,    // hostriame
+    102,    // iso-tsap
+    103,    // gppitnp
+    104,    // acr-nema
+    109,    // pop2
+    110,    // pop3
+    111,    // sunrpc
+    113,    // auth
+    115,    // sftp
+    117,    // uucp-path
+    119,    // nntp
+    123,    // ntp
+    135,    // loc-srv / epmap
+    137,    // netbios
+    139,    // netbios
+    143,    // imap2
+    161,    // snmp
+    179,    // bgp
+    389,    // ldap
+    427,    // afp (alternate)
+    465,    // smtp (alternate)
+    512,    // print / exec
+    513,    // login
+    514,    // shell
+    515,    // printer
+    526,    // tempo
+    530,    // courier
+    531,    // chat
+    532,    // netnews
+    540,    // uucp
+    548,    // afp
+    554,    // rtsp
+    556,    // remotefs
+    563,    // nntp+ssl
+    587,    // smtp (outgoing)
+    601,    // syslog-conn
+    636,    // ldap+ssl
+    993,    // imap+ssl
+    995,    // pop3+ssl
+    1719,   // h323gatestat
+    1720,   // h323hostcall
+    1723,   // pptp
+    2049,   // nfs
+    3659,   // apple-sasl
+    4045,   // lockd
+    5060,   // sip
+    5061,   // sips
+    6000,   // x11
+    6566,   // sane-port
+    6665,   // irc (alternate)
+    6666,   // irc (alternate)
+    6667,   // irc (default)
+    6668,   // irc (alternate)
+    6669,   // irc (alternate)
+    6697,   // irc+tls
+    10080,  // amanda
+    0,      // Sentinel value: This MUST be zero
 };
 
 static const char kProfileChangeNetTeardownTopic[] =
@@ -226,6 +232,7 @@
     "network.ssl_tokens_cache_enabled",
     "network.send_ODA_to_content_directly",
     "network.trr.",
+    "doh-rollout.",
     "network.dns.disableIPv6",
     "network.dns.skipTRR-when-parental-control-enabled",
     "network.offline-mirrors-connectivity",
diff -Nru firefox-84.0.2+build1/netwerk/base/nsIOService.h firefox-85.0+build1/netwerk/base/nsIOService.h
--- firefox-84.0.2+build1/netwerk/base/nsIOService.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsIOService.h	2021-01-18 19:58:18.000000000 +0000
@@ -24,6 +24,7 @@
 #include "prtime.h"
 #include "nsICaptivePortalService.h"
 #include "nsIObserverService.h"
+#include "nsWeakReference.h"
 
 #define NS_N(x) (sizeof(x) / sizeof(*x))
 
diff -Nru firefox-84.0.2+build1/netwerk/base/nsIPermissionManager.idl firefox-85.0+build1/netwerk/base/nsIPermissionManager.idl
--- firefox-84.0.2+build1/netwerk/base/nsIPermissionManager.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsIPermissionManager.idl	2021-01-18 19:58:18.000000000 +0000
@@ -83,6 +83,17 @@
   Array<nsIPermission> getAllWithTypePrefix(in ACString prefix);
 
   /**
+   * Get all custom permissions of a specific type and that were modified after
+   * the specified date. This will return an array of all permissions which are
+   * not set to default.
+   *
+   * @param type    a case-sensitive ASCII string, identifying the permission.
+   * @param since   a unix timestamp representing the number of milliseconds from
+   *                Jan 1, 1970 00:00:00 UTC.
+   */
+  Array<nsIPermission> getAllByTypeSince(in ACString type, in int64_t since);
+
+  /**
    * Add permission information for a given principal.
    * It is internally calling the other add() method using the nsIURI from the
    * principal.
diff -Nru firefox-84.0.2+build1/netwerk/base/nsISocketTransport.idl firefox-85.0+build1/netwerk/base/nsISocketTransport.idl
--- firefox-84.0.2+build1/netwerk/base/nsISocketTransport.idl	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsISocketTransport.idl	2021-01-18 19:58:18.000000000 +0000
@@ -34,7 +34,7 @@
  * NOTE: This is a free-threaded interface, meaning that the methods on
  * this interface may be called from any thread.
  */
-[scriptable, uuid(79221831-85e2-43a8-8152-05d77d6fde31)]
+[scriptable, builtinclass, uuid(79221831-85e2-43a8-8152-05d77d6fde31)]
 interface nsISocketTransport : nsITransport
 {
     /**
@@ -255,9 +255,9 @@
 
     /**
      * If we know that a server speaks only tls <1.3 there is no need to try
-     * to use esni/ech and query dns for esni/echconfig.
+     * to use ech.
      */
-    const unsigned long DONT_TRY_ESNI_OR_ECH = (1 << 10);
+    const unsigned long DONT_TRY_ECH = (1 << 10);
 
     /**
      * These two bits encode the TRR mode of the request.
@@ -326,15 +326,13 @@
     readonly attribute boolean resetIPFamilyPreference;
 
     /**
-     * This attribute holds information whether esni has been used.
+     * This attribute holds information whether echConfig has been used.
      * The value is set after PR_Connect is called.
      */
-   readonly attribute boolean esniUsed;
+   readonly attribute boolean echConfigUsed;
 
     /**
      * Called to set the echConfig to the securityInfo object.
-     * Note that echConfig taks priority over esni, so when this function is
-     * called esni will not be used.
      */
     void setEchConfig(in ACString echConfig);
 
@@ -342,4 +340,10 @@
      * IP address resolved using TRR.
      */
     bool resolvedByTRR();
+
+    /**
+     * Indicate whether this socket is created from a private window. If yes,
+     * this socket will be closed when the last private window is closed.
+     */
+    [noscript] void setIsPrivate(in boolean isPrivate);
 };
diff -Nru firefox-84.0.2+build1/netwerk/base/nsISocketTransportService.idl firefox-85.0+build1/netwerk/base/nsISocketTransportService.idl
--- firefox-84.0.2+build1/netwerk/base/nsISocketTransportService.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsISocketTransportService.idl	2021-01-18 19:58:18.000000000 +0000
@@ -18,6 +18,16 @@
 [ptr] native PRFileDescPtr(PRFileDesc);
 [ptr] native nsASocketHandlerPtr(nsASocketHandler);
 
+[scriptable, function, uuid(338947df-2f3b-4d24-9ce4-ecf161c1b7df)]
+interface nsISTSShutdownObserver : nsISupports {
+
+   /**
+    * Observe will be called when the SocketTransportService is shutting down,
+    * before threads are stopped.
+    */
+    void observe();
+};
+
 [builtinclass, scriptable, uuid(ad56b25f-e6bb-4db3-9f7b-5b7db33fd2b1)]
 interface nsISocketTransportService : nsISupports
 {
@@ -128,6 +138,9 @@
      *       socket thread.
      */
     [noscript] void notifyWhenCanAttachSocket(in nsIRunnable aEvent);
+
+    [noscript] void addShutdownObserver(in nsISTSShutdownObserver aObserver);
+    [noscript] void removeShutdownObserver(in nsISTSShutdownObserver aObserver);
 };
 
 [builtinclass, scriptable, uuid(c5204623-5b58-4a16-8b2e-67c34dd02e3f)]
diff -Nru firefox-84.0.2+build1/netwerk/base/nsNetUtil.cpp firefox-85.0+build1/netwerk/base/nsNetUtil.cpp
--- firefox-84.0.2+build1/netwerk/base/nsNetUtil.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsNetUtil.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/Telemetry.h"
 #include "nsBufferedStreams.h"
 #include "nsCategoryCache.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsFileStreams.h"
 #include "nsHashKeys.h"
@@ -138,6 +139,18 @@
   return rv;
 }
 
+Result<nsCOMPtr<nsIInputStream>, nsresult> NS_NewLocalFileInputStream(
+    nsIFile* file, int32_t ioFlags /* = -1 */, int32_t perm /* = -1 */,
+    int32_t behaviorFlags /* = 0 */) {
+  nsCOMPtr<nsIInputStream> stream;
+  const nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(stream), file,
+                                                 ioFlags, perm, behaviorFlags);
+  if (NS_SUCCEEDED(rv)) {
+    return stream;
+  }
+  return Err(rv);
+}
+
 nsresult NS_NewLocalFileOutputStream(nsIOutputStream** result, nsIFile* file,
                                      int32_t ioFlags /* = -1 */,
                                      int32_t perm /* = -1 */,
@@ -152,6 +165,18 @@
   return rv;
 }
 
+Result<nsCOMPtr<nsIOutputStream>, nsresult> NS_NewLocalFileOutputStream(
+    nsIFile* file, int32_t ioFlags /* = -1 */, int32_t perm /* = -1 */,
+    int32_t behaviorFlags /* = 0 */) {
+  nsCOMPtr<nsIOutputStream> stream;
+  const nsresult rv = NS_NewLocalFileOutputStream(getter_AddRefs(stream), file,
+                                                  ioFlags, perm, behaviorFlags);
+  if (NS_SUCCEEDED(rv)) {
+    return stream;
+  }
+  return Err(rv);
+}
+
 nsresult NS_NewLocalFileOutputStream(nsIOutputStream** result,
                                      const mozilla::ipc::FileDescriptor& fd) {
   nsCOMPtr<nsIFileOutputStream> out;
@@ -1267,6 +1292,18 @@
   return rv;
 }
 
+mozilla::Result<nsCOMPtr<nsIFileStream>, nsresult> NS_NewLocalFileStream(
+    nsIFile* file, int32_t ioFlags /* = -1 */, int32_t perm /* = -1 */,
+    int32_t behaviorFlags /* = 0 */) {
+  nsCOMPtr<nsIFileStream> stream;
+  const nsresult rv = NS_NewLocalFileStream(getter_AddRefs(stream), file,
+                                            ioFlags, perm, behaviorFlags);
+  if (NS_SUCCEEDED(rv)) {
+    return stream;
+  }
+  return Err(rv);
+}
+
 nsresult NS_NewBufferedOutputStream(
     nsIOutputStream** aResult, already_AddRefed<nsIOutputStream> aOutputStream,
     uint32_t aBufferSize) {
@@ -1303,6 +1340,17 @@
   return rv;
 }
 
+Result<nsCOMPtr<nsIInputStream>, nsresult> NS_NewBufferedInputStream(
+    already_AddRefed<nsIInputStream> aInputStream, uint32_t aBufferSize) {
+  nsCOMPtr<nsIInputStream> stream;
+  const nsresult rv = NS_NewBufferedInputStream(
+      getter_AddRefs(stream), std::move(aInputStream), aBufferSize);
+  if (NS_SUCCEEDED(rv)) {
+    return stream;
+  }
+  return Err(rv);
+}
+
 namespace {
 
 #define BUFFER_SIZE 8192
@@ -2670,13 +2718,9 @@
   nsCOMPtr<nsISupports> psm = do_GetService(PSM_COMPONENT_CONTRACTID, &rv);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
-  nsCOMPtr<nsISupports> sss = do_GetService(NS_SSSERVICE_CONTRACTID);
-#ifdef MOZ_NEW_CERT_STORAGE
-  nsCOMPtr<nsISupports> cbl = do_GetService(NS_CERTSTORAGE_CONTRACTID);
-#else
+#ifndef MOZ_NEW_CERT_STORAGE
   nsCOMPtr<nsISupports> cbl = do_GetService(NS_CERTBLOCKLIST_CONTRACTID);
 #endif
-  nsCOMPtr<nsISupports> cos = do_GetService(NS_CERTOVERRIDE_CONTRACTID);
 }
 
 bool NS_IsAboutBlank(nsIURI* uri) {
diff -Nru firefox-84.0.2+build1/netwerk/base/nsNetUtil.h firefox-85.0+build1/netwerk/base/nsNetUtil.h
--- firefox-84.0.2+build1/netwerk/base/nsNetUtil.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsNetUtil.h	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include <functional>
 #include "mozilla/Maybe.h"
+#include "mozilla/ResultExtensions.h"
 #include "nsCOMPtr.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -464,10 +465,18 @@
                                     int32_t ioFlags = -1, int32_t perm = -1,
                                     int32_t behaviorFlags = 0);
 
+mozilla::Result<nsCOMPtr<nsIInputStream>, nsresult> NS_NewLocalFileInputStream(
+    nsIFile* file, int32_t ioFlags = -1, int32_t perm = -1,
+    int32_t behaviorFlags = 0);
+
 nsresult NS_NewLocalFileOutputStream(nsIOutputStream** result, nsIFile* file,
                                      int32_t ioFlags = -1, int32_t perm = -1,
                                      int32_t behaviorFlags = 0);
 
+mozilla::Result<nsCOMPtr<nsIOutputStream>, nsresult>
+NS_NewLocalFileOutputStream(nsIFile* file, int32_t ioFlags = -1,
+                            int32_t perm = -1, int32_t behaviorFlags = 0);
+
 nsresult NS_NewLocalFileOutputStream(nsIOutputStream** result,
                                      const mozilla::ipc::FileDescriptor& fd);
 
@@ -486,10 +495,17 @@
                                int32_t ioFlags = -1, int32_t perm = -1,
                                int32_t behaviorFlags = 0);
 
+mozilla::Result<nsCOMPtr<nsIFileStream>, nsresult> NS_NewLocalFileStream(
+    nsIFile* file, int32_t ioFlags = -1, int32_t perm = -1,
+    int32_t behaviorFlags = 0);
+
 [[nodiscard]] nsresult NS_NewBufferedInputStream(
     nsIInputStream** aResult, already_AddRefed<nsIInputStream> aInputStream,
     uint32_t aBufferSize);
 
+mozilla::Result<nsCOMPtr<nsIInputStream>, nsresult> NS_NewBufferedInputStream(
+    already_AddRefed<nsIInputStream> aInputStream, uint32_t aBufferSize);
+
 // note: the resulting stream can be QI'ed to nsISafeOutputStream iff the
 // provided stream supports it.
 nsresult NS_NewBufferedOutputStream(
diff -Nru firefox-84.0.2+build1/netwerk/base/nsNetworkInfoService.cpp firefox-85.0+build1/netwerk/base/nsNetworkInfoService.cpp
--- firefox-84.0.2+build1/netwerk/base/nsNetworkInfoService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsNetworkInfoService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,7 +11,6 @@
 #endif
 
 #include "nsNetworkInfoService.h"
-#include "mozilla/ScopeExit.h"
 
 #if defined(XP_MACOSX) || defined(XP_WIN) || defined(XP_LINUX)
 #  include "NetworkInfoServiceImpl.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsNetworkInfoService.h firefox-85.0+build1/netwerk/base/nsNetworkInfoService.h
--- firefox-84.0.2+build1/netwerk/base/nsNetworkInfoService.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsNetworkInfoService.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_net_nsNetworkInfoService_h
 
 #include "nsISupportsImpl.h"
-#include "mozilla/ErrorResult.h"
 
 #include "nsINetworkInfoService.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/base/nsPACMan.cpp firefox-85.0+build1/netwerk/base/nsPACMan.cpp
--- firefox-84.0.2+build1/netwerk/base/nsPACMan.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsPACMan.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/Preferences.h"
 #include "nsContentUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsIAuthPrompt.h"
 #include "nsIDHCPClient.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsProtocolProxyService.cpp firefox-85.0+build1/netwerk/base/nsProtocolProxyService.cpp
--- firefox-84.0.2+build1/netwerk/base/nsProtocolProxyService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsProtocolProxyService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsIDNSService.h"
 #include "nsPIDNSService.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"
 #include "nsQueryObject.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/nsSocketTransport2.cpp firefox-85.0+build1/netwerk/base/nsSocketTransport2.cpp
--- firefox-84.0.2+build1/netwerk/base/nsSocketTransport2.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsSocketTransport2.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsSocketTransport2.h"
 
 #include "mozilla/Attributes.h"
+#include "mozilla/SyncRunnable.h"
 #include "mozilla/Telemetry.h"
 #include "nsIOService.h"
 #include "nsStreamUtils.h"
@@ -34,6 +35,7 @@
 #include "nsIDNSRecord.h"
 #include "nsIDNSByTypeRecord.h"
 #include "nsICancelable.h"
+#include "NetworkDataCountLayer.h"
 #include "QuicSocketControl.h"
 #include "TCPFastOpenLayer.h"
 #include <algorithm>
@@ -710,10 +712,7 @@
       mInputClosed(true),
       mOutputClosed(true),
       mResolving(false),
-      mDNSLookupStatus(NS_OK),
-      mDNSARequestFinished(0),
-      mEsniQueried(false),
-      mEsniUsed(false),
+      mEchConfigUsed(false),
       mResolvedByTRR(false),
       mNetAddrIsSet(false),
       mSelfAddrIsSet(false),
@@ -1028,8 +1027,25 @@
     }
   }
 
-  nsCOMPtr<nsIDNSService> dns = do_GetService(kDNSServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
+  nsCOMPtr<nsIDNSService> dns = nullptr;
+  auto initTask = [&dns]() { dns = do_GetService(kDNSServiceCID); };
+  if (!NS_IsMainThread()) {
+    // Forward to the main thread synchronously.
+    RefPtr<nsIThread> mainThread = do_GetMainThread();
+    if (!mainThread) {
+      return NS_ERROR_FAILURE;
+    }
+
+    SyncRunnable::DispatchToThread(
+        mainThread,
+        new SyncRunnable(NS_NewRunnableFunction(
+            "nsSocketTransport::ResolveHost->GetDNSService", initTask)));
+  } else {
+    initTask();
+  }
+  if (!dns) {
+    return NS_ERROR_FAILURE;
+  }
 
   mResolving = true;
 
@@ -1072,38 +1088,6 @@
       dns->AsyncResolveNative(SocketHost(), nsIDNSService::RESOLVE_TYPE_DEFAULT,
                               dnsFlags, nullptr, this, mSocketTransportService,
                               mOriginAttributes, getter_AddRefs(mDNSRequest));
-  mEsniQueried = false;
-  // NOTE: If we already have echConfig, we don't try ESNI.
-  if (mSocketTransportService->IsEsniEnabled() && NS_SUCCEEDED(rv) &&
-      !(mConnectionFlags & (DONT_TRY_ESNI_OR_ECH | BE_CONSERVATIVE)) &&
-      mEchConfig.IsEmpty()) {
-    bool isSSL = false;
-    for (unsigned int i = 0; i < mTypes.Length(); ++i) {
-      if (mTypes[i].EqualsLiteral("ssl")) {
-        isSSL = true;
-        break;
-      }
-    }
-    if (isSSL) {
-      SOCKET_LOG((" look for esni txt record"));
-      nsAutoCString esniHost;
-      esniHost.Append("_esni.");
-      // This might end up being the SocketHost
-      // see https://github.com/ekr/draft-rescorla-tls-esni/issues/61
-      esniHost.Append(SocketHost());
-      rv = dns->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-                                   dnsFlags, nullptr, this,
-                                   mSocketTransportService, mOriginAttributes,
-                                   getter_AddRefs(mDNSTxtRequest));
-      if (NS_FAILED(rv)) {
-        SOCKET_LOG(("  dns request by type failed."));
-        mDNSTxtRequest = nullptr;
-        rv = NS_OK;
-      } else {
-        mEsniQueried = true;
-      }
-    }
-  }
 
   if (NS_SUCCEEDED(rv)) {
     SOCKET_LOG(("  advancing to STATE_RESOLVING\n"));
@@ -1564,19 +1548,13 @@
   nsCOMPtr<nsISSLSocketControl> secCtrl = do_QueryInterface(mSecInfo);
   if (secCtrl) {
     if (!mEchConfig.IsEmpty() &&
-        !(mConnectionFlags & (DONT_TRY_ESNI_OR_ECH | BE_CONSERVATIVE))) {
+        !(mConnectionFlags & (DONT_TRY_ECH | BE_CONSERVATIVE))) {
       SOCKET_LOG(("nsSocketTransport::InitiateSocket set echconfig."));
       rv = secCtrl->SetEchConfig(mEchConfig);
       if (NS_FAILED(rv)) {
         return rv;
       }
-    } else if (!mDNSRecordTxt.IsEmpty() && !mUsingQuic) {
-      SOCKET_LOG(("nsSocketTransport::InitiateSocket set esni keys."));
-      rv = secCtrl->SetEsniTxt(mDNSRecordTxt);
-      if (NS_FAILED(rv)) {
-        return rv;
-      }
-      mEsniUsed = true;
+      mEchConfigUsed = true;
     }
   }
 
@@ -1612,6 +1590,16 @@
     }
   }
 
+  if (Telemetry::CanRecordPrereleaseData() ||
+      Telemetry::CanRecordReleaseData()) {
+    if (NS_FAILED(AttachNetworkDataCountLayer(fd))) {
+      SOCKET_LOG(
+          ("nsSocketTransport::InitiateSocket "
+           "AttachNetworkDataCountLayer failed [this=%p]\n",
+           this));
+    }
+  }
+
   bool connectCalled = true;  // This is only needed for telemetry.
   status = PR_Connect(fd, &prAddr, NS_SOCKET_CONNECT_TIMEOUT);
   PRErrorCode code = PR_GetError();
@@ -1915,13 +1903,18 @@
               mNetAddr.inet6.ip.u64[1] == 0))) {
           SOCKET_LOG(("  TRR returned 0.0.0.0 and there are no other IPs"));
         } else if (trrEnabled) {
-          // Drop state to closed.  This will trigger a new round of
-          // DNS resolving. Bypass the cache this time since the
-          // cached data came from TRR and failed already!
-          SOCKET_LOG(("  failed to connect with TRR enabled, try w/o\n"));
-          mState = STATE_CLOSED;
-          mConnectionFlags |= DISABLE_TRR | BYPASS_CACHE | REFRESH_CACHE;
-          tryAgain = true;
+          uint32_t trrMode = 0;
+          mDNSRecord->GetEffectiveTRRMode(&trrMode);
+          // If current trr mode is trr only, we should not retry.
+          if (trrMode != 3) {
+            // Drop state to closed.  This will trigger a new round of
+            // DNS resolving. Bypass the cache this time since the
+            // cached data came from TRR and failed already!
+            SOCKET_LOG(("  failed to connect with TRR enabled, try w/o\n"));
+            mState = STATE_CLOSED;
+            mConnectionFlags |= DISABLE_TRR | BYPASS_CACHE | REFRESH_CACHE;
+            tryAgain = true;
+          }
         }
       }
     }
@@ -2191,14 +2184,13 @@
       break;
 
     case MSG_DNS_LOOKUP_COMPLETE:
-      if (mDNSRequest ||
-          mDNSTxtRequest) {  // only send this if we actually resolved anything
+      if (mDNSRequest) {  // only send this if we actually resolved anything
         SendStatus(NS_NET_STATUS_RESOLVED_HOST);
       }
 
       SOCKET_LOG(("  MSG_DNS_LOOKUP_COMPLETE\n"));
       mDNSRequest = nullptr;
-      mDNSTxtRequest = nullptr;
+
       if (mDNSRecord) {
         mDNSRecord->GetNextAddr(SocketPort(), &mNetAddr);
         mDNSRecord->IsTRR(&mResolvedByTRR);
@@ -2471,11 +2463,6 @@
       mDNSRequest = nullptr;
     }
 
-    if (mDNSTxtRequest) {
-      mDNSTxtRequest->Cancel(NS_ERROR_ABORT);
-      mDNSTxtRequest = nullptr;
-    }
-
     //
     // notify input/output streams
     //
@@ -3000,65 +2987,21 @@
               ".",
               this, static_cast<uint32_t>(status)));
 
-  if (request == mDNSTxtRequest) {
-    if (NS_SUCCEEDED(status)) {
-      nsCOMPtr<nsIDNSTXTRecord> txtResponse = do_QueryInterface(rec);
-      txtResponse->GetRecordsAsOneString(mDNSRecordTxt);
-      mDNSRecordTxt.Trim(" ");
-    }
-    Telemetry::Accumulate(Telemetry::ESNI_KEYS_RECORDS_FOUND,
-                          NS_SUCCEEDED(status));
-    // flag host lookup complete for the benefit of the ResolveHost method.
-    if (!mDNSRequest) {
-      mResolving = false;
-      MOZ_ASSERT(mDNSARequestFinished);
-      Telemetry::Accumulate(
-          Telemetry::ESNI_KEYS_RECORD_FETCH_DELAYS,
-          PR_IntervalToMilliseconds(PR_IntervalNow() - mDNSARequestFinished));
-
-      nsresult rv =
-          PostEvent(MSG_DNS_LOOKUP_COMPLETE, mDNSLookupStatus, nullptr);
-
-      // if posting a message fails, then we should assume that the socket
-      // transport has been shutdown.  this should never happen!  if it does
-      // it means that the socket transport service was shutdown before the
-      // DNS service.
-      if (NS_FAILED(rv)) {
-        NS_WARNING("unable to post DNS lookup complete message");
-      }
-    } else {
-      mDNSTxtRequest = nullptr;
-    }
-    return NS_OK;
-  }
-
-  if (NS_FAILED(status) && mDNSTxtRequest) {
-    mDNSTxtRequest->Cancel(NS_ERROR_ABORT);
-  } else if (NS_SUCCEEDED(status)) {
+  if (NS_SUCCEEDED(status)) {
     mDNSRecord = do_QueryInterface(rec);
     MOZ_ASSERT(mDNSRecord);
   }
 
   // flag host lookup complete for the benefit of the ResolveHost method.
-  if (!mDNSTxtRequest) {
-    if (mEsniQueried) {
-      Telemetry::Accumulate(Telemetry::ESNI_KEYS_RECORD_FETCH_DELAYS, 0);
-    }
-    mResolving = false;
-    nsresult rv = PostEvent(MSG_DNS_LOOKUP_COMPLETE, status, nullptr);
-
-    // if posting a message fails, then we should assume that the socket
-    // transport has been shutdown.  this should never happen!  if it does
-    // it means that the socket transport service was shutdown before the
-    // DNS service.
-    if (NS_FAILED(rv)) {
-      NS_WARNING("unable to post DNS lookup complete message");
-    }
-  } else {
-    mDNSLookupStatus =
-        status;  // remember the status to send it when esni lookup is ready.
-    mDNSRequest = nullptr;
-    mDNSARequestFinished = PR_IntervalNow();
+  mResolving = false;
+  nsresult rv = PostEvent(MSG_DNS_LOOKUP_COMPLETE, status, nullptr);
+
+  // if posting a message fails, then we should assume that the socket
+  // transport has been shutdown.  this should never happen!  if it does
+  // it means that the socket transport service was shutdown before the
+  // DNS service.
+  if (NS_FAILED(rv)) {
+    NS_WARNING("unable to post DNS lookup complete message");
   }
 
   return NS_OK;
@@ -3127,8 +3070,12 @@
       ("nsSocketTransport::SetConnectionFlags %p flags=%u", this, value));
 
   mConnectionFlags = value;
-  mIsPrivate = value & nsISocketTransport::NO_PERMANENT_STORAGE;
+  return NS_OK;
+}
 
+NS_IMETHODIMP
+nsSocketTransport::SetIsPrivate(bool aIsPrivate) {
+  mIsPrivate = aIsPrivate;
   return NS_OK;
 }
 
@@ -3633,8 +3580,8 @@
 }
 
 NS_IMETHODIMP
-nsSocketTransport::GetEsniUsed(bool* aEsniUsed) {
-  *aEsniUsed = mEsniUsed;
+nsSocketTransport::GetEchConfigUsed(bool* aEchConfigUsed) {
+  *aEchConfigUsed = mEchConfigUsed;
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/netwerk/base/nsSocketTransport2.h firefox-85.0+build1/netwerk/base/nsSocketTransport2.h
--- firefox-84.0.2+build1/netwerk/base/nsSocketTransport2.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsSocketTransport2.h	2021-01-18 19:58:18.000000000 +0000
@@ -327,13 +327,8 @@
   nsCOMPtr<nsICancelable> mDNSRequest;
   nsCOMPtr<nsIDNSAddrRecord> mDNSRecord;
 
-  nsresult mDNSLookupStatus;
-  PRIntervalTime mDNSARequestFinished;
-  nsCOMPtr<nsICancelable> mDNSTxtRequest;
-  nsCString mDNSRecordTxt;
   nsCString mEchConfig;
-  bool mEsniQueried;
-  bool mEsniUsed;
+  bool mEchConfigUsed = false;
   bool mResolvedByTRR;
 
   // mNetAddr/mSelfAddr is valid from GetPeerAddr()/GetSelfAddr() once we have
diff -Nru firefox-84.0.2+build1/netwerk/base/nsSocketTransportService2.cpp firefox-85.0+build1/netwerk/base/nsSocketTransportService2.cpp
--- firefox-84.0.2+build1/netwerk/base/nsSocketTransportService2.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsSocketTransportService2.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -57,8 +57,6 @@
 #define MAX_TIME_FOR_PR_CLOSE_DURING_SHUTDOWN \
   "network.sts.max_time_for_pr_close_during_shutdown"
 #define POLLABLE_EVENT_TIMEOUT "network.sts.pollable_event_timeout"
-#define ESNI_ENABLED "network.security.esni.enabled"
-#define ESNI_DISABLED_MITM "security.pki.mitm_detected"
 
 #define REPAIR_POLLABLE_EVENT_TIME 10
 
@@ -151,8 +149,6 @@
       mPolling(false)
 #endif
       ,
-      mEsniEnabled(false),
-      mTrustedMitmDetected(false),
       mNotTrustedMitmDetected(false) {
   NS_ASSERTION(NS_IsMainThread(), "wrong thread");
 
@@ -743,8 +739,6 @@
     MAX_TIME_BETWEEN_TWO_POLLS,
     MAX_TIME_FOR_PR_CLOSE_DURING_SHUTDOWN,
     POLLABLE_EVENT_TIMEOUT,
-    ESNI_ENABLED,
-    ESNI_DISABLED_MITM,
     "network.socket.forcePort",
     nullptr,
 };
@@ -822,6 +816,13 @@
     return NS_ERROR_UNEXPECTED;
   }
 
+  {
+    auto observersCopy = mShutdownObservers;
+    for (auto& observer : observersCopy) {
+      observer->Observe();
+    }
+  }
+
   // signal the socket thread to shutdown
   mShuttingDown = true;
 
@@ -1510,18 +1511,6 @@
     mPollableEventTimeout = TimeDuration::FromSeconds(pollableEventTimeout);
   }
 
-  bool esniPref = false;
-  rv = Preferences::GetBool(ESNI_ENABLED, &esniPref);
-  if (NS_SUCCEEDED(rv)) {
-    mEsniEnabled = esniPref;
-  }
-
-  bool esniMitmPref = false;
-  rv = Preferences::GetBool(ESNI_DISABLED_MITM, &esniMitmPref);
-  if (NS_SUCCEEDED(rv)) {
-    mTrustedMitmDetected = esniMitmPref;
-  }
-
   nsAutoCString portMappingPref;
   rv = Preferences::GetCString("network.socket.forcePort", portMappingPref);
   if (NS_SUCCEEDED(rv)) {
@@ -1885,5 +1874,19 @@
   mPollList[0].out_flags = 0;
 }
 
+NS_IMETHODIMP
+nsSocketTransportService::AddShutdownObserver(
+    nsISTSShutdownObserver* aObserver) {
+  mShutdownObservers.AppendElement(aObserver);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSocketTransportService::RemoveShutdownObserver(
+    nsISTSShutdownObserver* aObserver) {
+  mShutdownObservers.RemoveElement(aObserver);
+  return NS_OK;
+}
+
 }  // namespace net
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/base/nsSocketTransportService2.h firefox-85.0+build1/netwerk/base/nsSocketTransportService2.h
--- firefox-84.0.2+build1/netwerk/base/nsSocketTransportService2.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsSocketTransportService2.h	2021-01-18 19:58:18.000000000 +0000
@@ -122,10 +122,6 @@
   bool IsTelemetryEnabledAndNotSleepPhase();
   PRIntervalTime MaxTimeForPrClosePref() { return mMaxTimeForPrClosePref; }
 
-  bool IsEsniEnabled() {
-    return mEsniEnabled && !mTrustedMitmDetected && !mNotTrustedMitmDetected;
-  }
-
   void SetNotTrustedMitmDetected() { mNotTrustedMitmDetected = true; }
 
   // According the preference value of `network.socket.forcePort` this method
@@ -343,9 +339,9 @@
 
   void TryRepairPollableEvent();
 
-  bool mEsniEnabled;
-  bool mTrustedMitmDetected;
   bool mNotTrustedMitmDetected;
+
+  CopyableTArray<nsCOMPtr<nsISTSShutdownObserver>> mShutdownObservers;
 };
 
 extern nsSocketTransportService* gSocketTransportService;
diff -Nru firefox-84.0.2+build1/netwerk/base/nsStandardURL.cpp firefox-85.0+build1/netwerk/base/nsStandardURL.cpp
--- firefox-84.0.2+build1/netwerk/base/nsStandardURL.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsStandardURL.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsNetCID.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/ipc/URIUtils.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/TextUtils.h"
 #include <algorithm>
diff -Nru firefox-84.0.2+build1/netwerk/base/nsStandardURL.h firefox-85.0+build1/netwerk/base/nsStandardURL.h
--- firefox-84.0.2+build1/netwerk/base/nsStandardURL.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsStandardURL.h	2021-01-18 19:58:18.000000000 +0000
@@ -319,8 +319,8 @@
                            public nsISerializable {
     NS_FORWARD_SAFE_NSIURISETTERS_RET(BaseURIMutator<T>::mURI)
 
-    [[nodiscard]] NS_IMETHOD
-        Deserialize(const mozilla::ipc::URIParams& aParams) override {
+    [[nodiscard]] NS_IMETHOD Deserialize(
+        const mozilla::ipc::URIParams& aParams) override {
       return BaseURIMutator<T>::InitFromIPCParams(aParams);
     }
 
diff -Nru firefox-84.0.2+build1/netwerk/base/nsSyncStreamListener.cpp firefox-85.0+build1/netwerk/base/nsSyncStreamListener.cpp
--- firefox-84.0.2+build1/netwerk/base/nsSyncStreamListener.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/nsSyncStreamListener.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -2,6 +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 "mozilla/SpinEventLoopUntil.h"
 #include "nsIOService.h"
 #include "nsSyncStreamListener.h"
 #include "nsThreadUtils.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/PollableEvent.h firefox-85.0+build1/netwerk/base/PollableEvent.h
--- firefox-84.0.2+build1/netwerk/base/PollableEvent.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/PollableEvent.h	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 
+struct PRFileDesc;
+
 namespace mozilla {
 namespace net {
 
diff -Nru firefox-84.0.2+build1/netwerk/base/Predictor.cpp firefox-85.0+build1/netwerk/base/Predictor.cpp
--- firefox-84.0.2+build1/netwerk/base/Predictor.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/Predictor.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1194,20 +1194,7 @@
         nullptr, mDNSListener, nullptr, originAttributes,
         getter_AddRefs(tmpCancelable));
 
-    // Fetch esni keys if needed.
-    if (StaticPrefs::network_security_esni_enabled() &&
-        uri->SchemeIs("https")) {
-      nsAutoCString esniHost;
-      esniHost.Append("_esni.");
-      esniHost.Append(hostname);
-      mDnsService->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
-                                      (nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
-                                       nsIDNSService::RESOLVE_SPECULATE),
-                                      nullptr, mDNSListener, nullptr,
-                                      originAttributes,
-                                      getter_AddRefs(tmpCancelable));
-    }
-
+    // TODO: Fetch HTTPS RRs in bug 1652723.
     predicted = true;
     if (verifier) {
       PREDICTOR_LOG(("    sending preresolve verification"));
diff -Nru firefox-84.0.2+build1/netwerk/base/ProxyAutoConfig.cpp firefox-85.0+build1/netwerk/base/ProxyAutoConfig.cpp
--- firefox-84.0.2+build1/netwerk/base/ProxyAutoConfig.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/ProxyAutoConfig.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -24,6 +24,7 @@
 #include "prnetdb.h"
 #include "nsITimer.h"
 #include "mozilla/Atomics.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/Utf8.h"  // mozilla::Utf8Unit
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/netwerk/base/RequestContextService.cpp firefox-85.0+build1/netwerk/base/RequestContextService.cpp
--- firefox-84.0.2+build1/netwerk/base/RequestContextService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/base/RequestContextService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsIDocShell.h"
 #include "mozilla/dom/Document.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIDocumentLoader.h"
 #include "nsIObserverService.h"
 #include "nsIXULRuntime.h"
diff -Nru firefox-84.0.2+build1/netwerk/cache2/CacheFileChunk.h firefox-85.0+build1/netwerk/cache2/CacheFileChunk.h
--- firefox-84.0.2+build1/netwerk/cache2/CacheFileChunk.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cache2/CacheFileChunk.h	2021-01-18 19:58:18.000000000 +0000
@@ -15,8 +15,8 @@
 namespace mozilla {
 namespace net {
 
-#define kChunkSize (256 * 1024)
-#define kEmptyChunkHash 0x1826
+constexpr int32_t kChunkSize = 256 * 1024;
+constexpr size_t kEmptyChunkHash = 0x1826;
 
 class CacheFileChunk;
 class CacheFile;
diff -Nru firefox-84.0.2+build1/netwerk/cache2/CacheFileContextEvictor.cpp firefox-85.0+build1/netwerk/cache2/CacheFileContextEvictor.cpp
--- firefox-84.0.2+build1/netwerk/cache2/CacheFileContextEvictor.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cache2/CacheFileContextEvictor.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -15,7 +15,8 @@
 #include "nsIDirectoryEnumerator.h"
 #include "mozilla/Base64.h"
 #include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/net/MozURL.h"
+#include "nsContentUtils.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
@@ -672,19 +673,25 @@
         continue;
       }
 
-      RefPtr<MozURL> url;
-      rv = MozURL::Init(getter_AddRefs(url), uriSpec);
+      nsCOMPtr<nsIURI> uri;
+      rv = NS_NewURI(getter_AddRefs(uri), uriSpec);
       if (NS_FAILED(rv)) {
         LOG(
             ("CacheFileContextEvictor::EvictEntries() - Skipping entry since "
-             "MozURL "
-             "fails in the parsing of the uriSpec"));
+             "NS_NewURI failed to parse the uriSpec"));
         continue;
       }
 
-      nsAutoCString urlOrigin;
-      url->Origin(urlOrigin);
-      if (!urlOrigin.Equals(NS_ConvertUTF16toUTF8(mEntries[0]->mOrigin))) {
+      nsAutoString urlOrigin;
+      rv = nsContentUtils::GetUTFOrigin(uri, urlOrigin);
+      if (NS_FAILED(rv)) {
+        LOG(
+            ("CacheFileContextEvictor::EvictEntries() - Skipping entry since "
+             "We failed to extract an origin"));
+        continue;
+      }
+
+      if (!urlOrigin.Equals(mEntries[0]->mOrigin)) {
         LOG(
             ("CacheFileContextEvictor::EvictEntries() - Skipping entry since "
              "origin "
diff -Nru firefox-84.0.2+build1/netwerk/cache2/CacheObserver.h firefox-85.0+build1/netwerk/cache2/CacheObserver.h
--- firefox-84.0.2+build1/netwerk/cache2/CacheObserver.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cache2/CacheObserver.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsWeakReference.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StaticPtr.h"
 #include <algorithm>
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/netwerk/cache2/CacheStorageService.cpp firefox-85.0+build1/netwerk/cache2/CacheStorageService.cpp
--- firefox-84.0.2+build1/netwerk/cache2/CacheStorageService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cache2/CacheStorageService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -29,6 +29,7 @@
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsXULAppAPI.h"
+#include "mozilla/AtomicBitfields.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Services.h"
@@ -202,10 +203,10 @@
         mService(CacheStorageService::Self()),
         mCallback(aVisitor),
         mSize(0),
-        mNotifyStorage(true),
-        mVisitEntries(aVisitEntries),
         mCancel(false) {
     MOZ_ASSERT(NS_IsMainThread());
+    StoreNotifyStorage(true);
+    StoreVisitEntries(aVisitEntries);
   }
 
   virtual ~WalkCacheRunnable() {
@@ -219,8 +220,12 @@
 
   uint64_t mSize;
 
-  bool mNotifyStorage : 1;
-  bool mVisitEntries : 1;
+  // clang-format off
+  MOZ_ATOMIC_BITFIELDS(mAtomicBitfields, 8, (
+    (bool, NotifyStorage, 1),
+    (bool, VisitEntries, 1)
+  ))
+  // clang-format on
 
   Atomic<bool> mCancel;
 };
@@ -275,7 +280,7 @@
     } else if (NS_IsMainThread()) {
       LOG(("WalkMemoryCacheRunnable::Run - notifying [this=%p]", this));
 
-      if (mNotifyStorage) {
+      if (LoadNotifyStorage()) {
         LOG(("  storage"));
 
         uint64_t capacity = CacheObserver::MemoryCacheCapacity();
@@ -284,9 +289,9 @@
         // Second, notify overall storage info
         mCallback->OnCacheStorageInfo(mEntryArray.Length(), mSize, capacity,
                                       nullptr);
-        if (!mVisitEntries) return NS_OK;  // done
+        if (!LoadVisitEntries()) return NS_OK;  // done
 
-        mNotifyStorage = false;
+        StoreNotifyStorage(false);
 
       } else {
         LOG(("  entry [left=%zu, canceled=%d]", mEntryArray.Length(),
@@ -431,7 +436,7 @@
           uint32_t size;
           rv = CacheIndex::GetCacheStats(mLoadInfo, &size, &mCount);
           if (NS_FAILED(rv)) {
-            if (mVisitEntries) {
+            if (LoadVisitEntries()) {
               // both onStorageInfo and onCompleted are expected
               NS_DispatchToMainThread(this);
             }
@@ -443,7 +448,7 @@
           // Invoke onCacheStorageInfo with valid information.
           NS_DispatchToMainThread(this);
 
-          if (!mVisitEntries) {
+          if (!LoadVisitEntries()) {
             return NS_OK;  // done
           }
 
@@ -477,13 +482,13 @@
           NS_DispatchToMainThread(this);
       }
     } else if (NS_IsMainThread()) {
-      if (mNotifyStorage) {
+      if (LoadNotifyStorage()) {
         nsCOMPtr<nsIFile> dir;
         CacheFileIOManager::GetCacheDirectory(getter_AddRefs(dir));
         uint64_t capacity = CacheObserver::DiskCacheCapacity();
         capacity <<= 10;  // kilobytes to bytes
         mCallback->OnCacheStorageInfo(mCount, mSize, capacity, dir);
-        mNotifyStorage = false;
+        StoreNotifyStorage(false);
       } else {
         mCallback->OnCacheEntryVisitCompleted();
       }
diff -Nru firefox-84.0.2+build1/netwerk/cookie/CookieCommons.cpp firefox-85.0+build1/netwerk/cookie/CookieCommons.cpp
--- firefox-84.0.2+build1/netwerk/cookie/CookieCommons.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cookie/CookieCommons.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,8 @@
 #include "mozilla/ContentBlocking.h"
 #include "mozilla/ConsoleReportCollector.h"
 #include "mozilla/ContentBlockingNotifier.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozIThirdPartyUtil.h"
diff -Nru firefox-84.0.2+build1/netwerk/cookie/CookiePersistentStorage.cpp firefox-85.0+build1/netwerk/cookie/CookiePersistentStorage.cpp
--- firefox-84.0.2+build1/netwerk/cookie/CookiePersistentStorage.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cookie/CookiePersistentStorage.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 #include "CookiePersistentStorage.h"
 
 #include "mozilla/FileUtils.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"
 #include "mozIStorageAsyncStatement.h"
 #include "mozIStorageError.h"
diff -Nru firefox-84.0.2+build1/netwerk/cookie/CookieServiceChild.cpp firefox-85.0+build1/netwerk/cookie/CookieServiceChild.cpp
--- firefox-84.0.2+build1/netwerk/cookie/CookieServiceChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cookie/CookieServiceChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/StaticPrefs_network.h"
diff -Nru firefox-84.0.2+build1/netwerk/cookie/CookieService.cpp firefox-85.0+build1/netwerk/cookie/CookieService.cpp
--- firefox-84.0.2+build1/netwerk/cookie/CookieService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/cookie/CookieService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #include "CookieCommons.h"
 #include "CookieLogging.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/net/CookiePersistentStorage.h"
diff -Nru firefox-84.0.2+build1/netwerk/cookie/CookieServiceParent.h firefox-85.0+build1/netwerk/cookie/CookieServiceParent.h
--- firefox-84.0.2+build1/netwerk/cookie/CookieServiceParent.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/cookie/CookieServiceParent.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/net/PCookieServiceParent.h"
 
+class nsIArray;
 class nsICookie;
 namespace mozilla {
 class OriginAttributes;
diff -Nru firefox-84.0.2+build1/netwerk/dns/ChildDNSService.cpp firefox-85.0+build1/netwerk/dns/ChildDNSService.cpp
--- firefox-84.0.2+build1/netwerk/dns/ChildDNSService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/ChildDNSService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -39,27 +39,11 @@
                 XRE_IsContentProcess() || XRE_IsSocketProcess());
 
   if (!gChildDNSService) {
-    auto initTask = []() {
-      gChildDNSService = new ChildDNSService();
-      ClearOnShutdown(&gChildDNSService);
-    };
-
-    // For normal cases, DNS service should be initialized in nsHttpHandler. For
-    // some xpcshell tests, nsHttpHandler is not used at all, so the best we use
-    // SyncRunnable to make sure DNS service is initialized on main thread.
     if (!NS_IsMainThread()) {
-      // Forward to the main thread synchronously.
-      RefPtr<nsIThread> mainThread = do_GetMainThread();
-      if (!mainThread) {
-        return nullptr;
-      }
-
-      SyncRunnable::DispatchToThread(
-          mainThread, new SyncRunnable(NS_NewRunnableFunction(
-                          "ChildDNSService::GetSingleton", initTask)));
-    } else {
-      initTask();
+      return nullptr;
     }
+    gChildDNSService = new ChildDNSService();
+    ClearOnShutdown(&gChildDNSService);
   }
 
   return do_AddRef(gChildDNSService);
diff -Nru firefox-84.0.2+build1/netwerk/dns/DNSPacket.cpp firefox-85.0+build1/netwerk/dns/DNSPacket.cpp
--- firefox-84.0.2+build1/netwerk/dns/DNSPacket.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/DNSPacket.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,967 @@
+/* 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 "DNSPacket.h"
+
+namespace mozilla {
+namespace net {
+
+extern mozilla::LazyLogModule gHostResolverLog;
+#undef LOG
+#undef LOG_ENABLED
+#define LOG(args) MOZ_LOG(gHostResolverLog, mozilla::LogLevel::Debug, args)
+#define LOG_ENABLED() \
+  MOZ_LOG_TEST(mozilla::net::gHostResolverLog, mozilla::LogLevel::Debug)
+
+static uint16_t get16bit(const unsigned char* aData, unsigned int index) {
+  return ((aData[index] << 8) | aData[index + 1]);
+}
+
+static uint32_t get32bit(const unsigned char* aData, unsigned int index) {
+  return (aData[index] << 24) | (aData[index + 1] << 16) |
+         (aData[index + 2] << 8) | aData[index + 3];
+}
+
+// https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-extended-error-16#section-4
+// This is a list of errors for which we should not fallback to Do53.
+// These are normally DNSSEC failures or explicit filtering performed by the
+// recursive resolver.
+bool hardFail(uint16_t code) {
+  const uint16_t noFallbackErrors[] = {
+      4,   // Forged answer (malware filtering)
+      6,   // DNSSEC Boggus
+      7,   // Signature expired
+      8,   // Signature not yet valid
+      9,   // DNSKEY Missing
+      10,  // RRSIG missing
+      11,  // No ZONE Key Bit set
+      12,  // NSEC Missing
+      17,  // Filtered
+  };
+
+  for (const auto& err : noFallbackErrors) {
+    if (code == err) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// static
+nsresult DNSPacket::ParseSvcParam(unsigned int svcbIndex, uint16_t key,
+                                  SvcFieldValue& field, uint16_t length) {
+  switch (key) {
+    case SvcParamKeyMandatory: {
+      if (length % 2 != 0) {
+        // This key should encode a list of uint16_t
+        return NS_ERROR_UNEXPECTED;
+      }
+      while (length > 0) {
+        uint16_t mandatoryKey = get16bit(mResponse, svcbIndex);
+        length -= 2;
+        svcbIndex += 2;
+
+        if (mandatoryKey > SvcParamKeyLast) {
+          LOG(("The mandatory field includes a key we don't support %u",
+               mandatoryKey));
+          return NS_ERROR_UNEXPECTED;
+        }
+      }
+      break;
+    }
+    case SvcParamKeyAlpn: {
+      field.mValue = AsVariant(SvcParamAlpn());
+      auto& alpnArray = field.mValue.as<SvcParamAlpn>().mValue;
+      while (length > 0) {
+        uint8_t alpnIdLength = mResponse[svcbIndex++];
+        length -= 1;
+        if (alpnIdLength > length) {
+          return NS_ERROR_UNEXPECTED;
+        }
+
+        alpnArray.AppendElement(
+            nsCString((const char*)&mResponse[svcbIndex], alpnIdLength));
+        length -= alpnIdLength;
+        svcbIndex += alpnIdLength;
+      }
+      break;
+    }
+    case SvcParamKeyNoDefaultAlpn: {
+      if (length != 0) {
+        // This key should not contain a value
+        return NS_ERROR_UNEXPECTED;
+      }
+      field.mValue = AsVariant(SvcParamNoDefaultAlpn{});
+      break;
+    }
+    case SvcParamKeyPort: {
+      if (length != 2) {
+        // This key should only encode a uint16_t
+        return NS_ERROR_UNEXPECTED;
+      }
+      field.mValue =
+          AsVariant(SvcParamPort{.mValue = get16bit(mResponse, svcbIndex)});
+      break;
+    }
+    case SvcParamKeyIpv4Hint: {
+      if (length % 4 != 0) {
+        // This key should only encode IPv4 addresses
+        return NS_ERROR_UNEXPECTED;
+      }
+
+      field.mValue = AsVariant(SvcParamIpv4Hint());
+      auto& ipv4array = field.mValue.as<SvcParamIpv4Hint>().mValue;
+      while (length > 0) {
+        NetAddr addr;
+        addr.inet.family = AF_INET;
+        addr.inet.port = 0;
+        addr.inet.ip = ntohl(get32bit(mResponse, svcbIndex));
+        ipv4array.AppendElement(addr);
+        length -= 4;
+        svcbIndex += 4;
+      }
+      break;
+    }
+    case SvcParamKeyEchConfig: {
+      field.mValue = AsVariant(SvcParamEchConfig{
+          .mValue = nsCString((const char*)(&mResponse[svcbIndex]), length)});
+      break;
+    }
+    case SvcParamKeyIpv6Hint: {
+      if (length % 16 != 0) {
+        // This key should only encode IPv6 addresses
+        return NS_ERROR_UNEXPECTED;
+      }
+
+      field.mValue = AsVariant(SvcParamIpv6Hint());
+      auto& ipv6array = field.mValue.as<SvcParamIpv6Hint>().mValue;
+      while (length > 0) {
+        NetAddr addr;
+        addr.inet6.family = AF_INET6;
+        addr.inet6.port = 0;      // unknown
+        addr.inet6.flowinfo = 0;  // unknown
+        addr.inet6.scope_id = 0;  // unknown
+        for (int i = 0; i < 16; i++, svcbIndex++) {
+          addr.inet6.ip.u8[i] = mResponse[svcbIndex];
+        }
+        ipv6array.AppendElement(addr);
+        length -= 16;
+        // no need to increase svcbIndex - we did it in the for above.
+      }
+      break;
+    }
+    default: {
+      // Unespected type. We'll just ignore it.
+      return NS_OK;
+      break;
+    }
+  }
+  return NS_OK;
+}
+
+nsresult DNSPacket::PassQName(unsigned int& index) {
+  uint8_t length;
+  do {
+    if (mBodySize < (index + 1)) {
+      LOG(("TRR: PassQName:%d fail at index %d\n", __LINE__, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    length = static_cast<uint8_t>(mResponse[index]);
+    if ((length & 0xc0) == 0xc0) {
+      // name pointer, advance over it and be done
+      if (mBodySize < (index + 2)) {
+        return NS_ERROR_ILLEGAL_VALUE;
+      }
+      index += 2;
+      break;
+    }
+    if (length & 0xc0) {
+      LOG(("TRR: illegal label length byte (%x) at index %d\n", length, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    // pass label
+    if (mBodySize < (index + 1 + length)) {
+      LOG(("TRR: PassQName:%d fail at index %d\n", __LINE__, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    index += 1 + length;
+  } while (length);
+  return NS_OK;
+}
+
+// GetQname: retrieves the qname (stores in 'aQname') and stores the index
+// after qname was parsed into the 'aIndex'.
+nsresult DNSPacket::GetQname(nsACString& aQname, unsigned int& aIndex) {
+  uint8_t clength = 0;
+  unsigned int cindex = aIndex;
+  unsigned int loop = 128;    // a valid DNS name can never loop this much
+  unsigned int endindex = 0;  // index position after this data
+  do {
+    if (cindex >= mBodySize) {
+      LOG(("TRR: bad Qname packet\n"));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    clength = static_cast<uint8_t>(mResponse[cindex]);
+    if ((clength & 0xc0) == 0xc0) {
+      // name pointer, get the new offset (14 bits)
+      if ((cindex + 1) >= mBodySize) {
+        return NS_ERROR_ILLEGAL_VALUE;
+      }
+      // extract the new index position for the next label
+      uint16_t newpos = (clength & 0x3f) << 8 | mResponse[cindex + 1];
+      if (!endindex) {
+        // only update on the first "jump"
+        endindex = cindex + 2;
+      }
+      cindex = newpos;
+      continue;
+    }
+    if (clength & 0xc0) {
+      // any of those bits set individually is an error
+      LOG(("TRR: bad Qname packet\n"));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    cindex++;
+
+    if (clength) {
+      if (!aQname.IsEmpty()) {
+        aQname.Append(".");
+      }
+      if ((cindex + clength) > mBodySize) {
+        return NS_ERROR_ILLEGAL_VALUE;
+      }
+      aQname.Append((const char*)(&mResponse[cindex]), clength);
+      cindex += clength;  // skip label
+    }
+  } while (clength && --loop);
+
+  if (!loop) {
+    LOG(("DNSPacket::DohDecode pointer loop error\n"));
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  if (!endindex) {
+    // there was no "jump"
+    endindex = cindex;
+  }
+  aIndex = endindex;
+  return NS_OK;
+}
+
+nsresult DOHresp::Add(uint32_t TTL, unsigned char const* dns,
+                      unsigned int index, uint16_t len, bool aLocalAllowed) {
+  NetAddr addr;
+  if (4 == len) {
+    // IPv4
+    addr.inet.family = AF_INET;
+    addr.inet.port = 0;  // unknown
+    addr.inet.ip = ntohl(get32bit(dns, index));
+  } else if (16 == len) {
+    // IPv6
+    addr.inet6.family = AF_INET6;
+    addr.inet6.port = 0;      // unknown
+    addr.inet6.flowinfo = 0;  // unknown
+    addr.inet6.scope_id = 0;  // unknown
+    for (int i = 0; i < 16; i++, index++) {
+      addr.inet6.ip.u8[i] = dns[index];
+    }
+  } else {
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  if (addr.IsIPAddrLocal() && !aLocalAllowed) {
+    return NS_ERROR_FAILURE;
+  }
+
+  // While the DNS packet might return individual TTLs for each address,
+  // we can only return one value in the AddrInfo class so pick the
+  // lowest number.
+  if (mTtl < TTL) {
+    mTtl = TTL;
+  }
+
+  if (LOG_ENABLED()) {
+    char buf[128];
+    addr.ToStringBuffer(buf, sizeof(buf));
+    LOG(("DOHresp:Add %s\n", buf));
+  }
+  mAddresses.AppendElement(addr);
+  return NS_OK;
+}
+
+nsresult DNSPacket::OnDataAvailable(nsIRequest* aRequest,
+                                    nsIInputStream* aInputStream,
+                                    uint64_t aOffset, const uint32_t aCount) {
+  if (aCount + mBodySize > MAX_SIZE) {
+    LOG(("DNSPacket::OnDataAvailable:%d fail\n", __LINE__));
+    return NS_ERROR_FAILURE;
+  }
+  uint32_t count;
+  nsresult rv =
+      aInputStream->Read((char*)mResponse + mBodySize, aCount, &count);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  MOZ_ASSERT(count == aCount);
+  mBodySize += aCount;
+  return NS_OK;
+}
+
+const uint8_t kDNS_CLASS_IN = 1;
+
+// static
+nsresult DNSPacket::EncodeRequest(nsCString& aBody, const nsACString& aHost,
+                                  uint16_t aType, bool aDisableECS) {
+  aBody.Truncate();
+  // Header
+  aBody += '\0';
+  aBody += '\0';  // 16 bit id
+  aBody += 0x01;  // |QR|   Opcode  |AA|TC|RD| Set the RD bit
+  aBody += '\0';  // |RA|   Z    |   RCODE   |
+  aBody += '\0';
+  aBody += 1;  // QDCOUNT (number of entries in the question section)
+  aBody += '\0';
+  aBody += '\0';  // ANCOUNT
+  aBody += '\0';
+  aBody += '\0';  // NSCOUNT
+
+  aBody += '\0';                    // ARCOUNT
+  aBody += aDisableECS ? 1 : '\0';  // ARCOUNT low byte for EDNS(0)
+
+  // Question
+
+  // The input host name should be converted to a sequence of labels, where
+  // each label consists of a length octet followed by that number of
+  // octets.  The domain name terminates with the zero length octet for the
+  // null label of the root.
+  // Followed by 16 bit QTYPE and 16 bit QCLASS
+
+  int32_t index = 0;
+  int32_t offset = 0;
+  do {
+    bool dotFound = false;
+    int32_t labelLength;
+    index = aHost.FindChar('.', offset);
+    if (kNotFound != index) {
+      dotFound = true;
+      labelLength = index - offset;
+    } else {
+      labelLength = aHost.Length() - offset;
+    }
+    if (labelLength > 63) {
+      // too long label!
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    if (labelLength > 0) {
+      aBody += static_cast<unsigned char>(labelLength);
+      nsDependentCSubstring label = Substring(aHost, offset, labelLength);
+      aBody.Append(label);
+    }
+    if (!dotFound) {
+      aBody += '\0';  // terminate with a final zero
+      break;
+    }
+    offset += labelLength + 1;  // move over label and dot
+  } while (true);
+
+  aBody += static_cast<uint8_t>(aType >> 8);  // upper 8 bit TYPE
+  aBody += static_cast<uint8_t>(aType);
+  aBody += '\0';           // upper 8 bit CLASS
+  aBody += kDNS_CLASS_IN;  // IN - "the Internet"
+
+  if (aDisableECS) {
+    // EDNS(0) is RFC 6891, ECS is RFC 7871
+    aBody += '\0';  // NAME       | domain name  | MUST be 0 (root domain) |
+    aBody += '\0';
+    aBody += 41;  // TYPE       | u_int16_t    | OPT (41)                     |
+    aBody += 16;  // CLASS      | u_int16_t    | requestor's UDP payload size |
+    aBody +=
+        '\0';  // advertise 4K (high-byte: 16 | low-byte: 0), ignored by DoH
+    aBody += '\0';  // TTL        | u_int32_t    | extended RCODE and flags |
+    aBody += '\0';
+    aBody += '\0';
+    aBody += '\0';
+
+    aBody += '\0';  // upper 8 bit RDLEN
+    aBody += 8;  // RDLEN      | u_int16_t    | length of all RDATA          |
+
+    // RDATA      | octet stream | {attribute,value} pairs      |
+    // The RDATA is just the ECS option setting zero subnet prefix
+
+    aBody += '\0';  // upper 8 bit OPTION-CODE ECS
+    aBody += 8;     // OPTION-CODE, 2 octets, for ECS is 8
+
+    aBody += '\0';  // upper 8 bit OPTION-LENGTH
+    aBody += 4;  // OPTION-LENGTH, 2 octets, contains the length of the payload
+                 // after OPTION-LENGTH
+    aBody += '\0';  // upper 8 bit FAMILY. IANA Address Family Numbers registry,
+                    // not the AF_* constants!
+    aBody += 1;     // FAMILY (Ipv4), 2 octets
+
+    aBody += '\0';  // SOURCE PREFIX-LENGTH      |     SCOPE PREFIX-LENGTH |
+    aBody += '\0';
+
+    // ADDRESS, minimum number of octets == nothing because zero bits
+  }
+  return NS_OK;
+}
+
+//
+// DohDecode() collects the TTL and the IP addresses in the response
+//
+// static
+nsresult DNSPacket::Decode(
+    nsCString& aHost, enum TrrType aType, nsCString& aCname, bool aAllowRFC1918,
+    nsHostRecord::TRRSkippedReason& aReason, DOHresp& aResp,
+    TypeRecordResultType& aTypeResult,
+    nsClassHashtable<nsCStringHashKey, DOHresp>& aAdditionalRecords,
+    uint32_t& aTTL) {
+  // The response has a 12 byte header followed by the question (returned)
+  // and then the answer. The answer section itself contains the name, type
+  // and class again and THEN the record data.
+
+  // www.example.com response:
+  // header:
+  // abcd 8180 0001 0001 0000 0000
+  // the question:
+  // 0377 7777 0765 7861 6d70 6c65 0363 6f6d 0000 0100 01
+  // the answer:
+  // 03 7777 7707 6578 616d 706c 6503 636f 6d00 0001 0001
+  // 0000 0080 0004 5db8 d822
+
+  unsigned int index = 12;
+  uint8_t length;
+  nsAutoCString host;
+  nsresult rv;
+  uint16_t extendedError = UINT16_MAX;
+
+  LOG(("doh decode %s %d bytes\n", aHost.get(), mBodySize));
+
+  aCname.Truncate();
+
+  if (mBodySize < 12 || mResponse[0] || mResponse[1]) {
+    LOG(("TRR bad incoming DOH, eject!\n"));
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+  uint8_t rcode = mResponse[3] & 0x0F;
+  LOG(("TRR Decode %s RCODE %d\n", aHost.get(), rcode));
+  if (rcode) {
+    if (aReason == nsHostRecord::TRR_UNSET) {
+      aReason = nsHostRecord::TRR_RCODE_FAIL;
+    }
+  }
+
+  uint16_t questionRecords = get16bit(mResponse, 4);  // qdcount
+  // iterate over the single(?) host name in question
+  while (questionRecords) {
+    do {
+      if (mBodySize < (index + 1)) {
+        LOG(("TRR Decode 1 index: %u size: %u", index, mBodySize));
+        return NS_ERROR_ILLEGAL_VALUE;
+      }
+      length = static_cast<uint8_t>(mResponse[index]);
+      if (length) {
+        if (host.Length()) {
+          host.Append(".");
+        }
+        if (mBodySize < (index + 1 + length)) {
+          LOG(("TRR Decode 2 index: %u size: %u len: %u", index, mBodySize,
+               length));
+          return NS_ERROR_ILLEGAL_VALUE;
+        }
+        host.Append(((char*)mResponse) + index + 1, length);
+      }
+      index += 1 + length;  // skip length byte + label
+    } while (length);
+    if (mBodySize < (index + 4)) {
+      LOG(("TRR Decode 3 index: %u size: %u", index, mBodySize));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    index += 4;  // skip question's type, class
+    questionRecords--;
+  }
+
+  // Figure out the number of answer records from ANCOUNT
+  uint16_t answerRecords = get16bit(mResponse, 6);
+
+  LOG(("TRR Decode: %d answer records (%u bytes body) %s index=%u\n",
+       answerRecords, mBodySize, host.get(), index));
+
+  while (answerRecords) {
+    nsAutoCString qname;
+    rv = GetQname(qname, index);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+    // 16 bit TYPE
+    if (mBodySize < (index + 2)) {
+      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index + 2));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint16_t TYPE = get16bit(mResponse, index);
+
+    if ((TYPE != TRRTYPE_CNAME) && (TYPE != TRRTYPE_HTTPSSVC) &&
+        (TYPE != static_cast<uint16_t>(aType))) {
+      // Not the same type as was asked for nor CNAME
+      LOG(("TRR: Dohdecode:%d asked for type %d got %d\n", __LINE__, aType,
+           TYPE));
+      return NS_ERROR_UNEXPECTED;
+    }
+    index += 2;
+
+    // 16 bit class
+    if (mBodySize < (index + 2)) {
+      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index + 2));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint16_t CLASS = get16bit(mResponse, index);
+    if (kDNS_CLASS_IN != CLASS) {
+      LOG(("TRR bad CLASS (%u) at index %d\n", CLASS, index));
+      return NS_ERROR_UNEXPECTED;
+    }
+    index += 2;
+
+    // 32 bit TTL (seconds)
+    if (mBodySize < (index + 4)) {
+      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint32_t TTL = get32bit(mResponse, index);
+    index += 4;
+
+    // 16 bit RDLENGTH
+    if (mBodySize < (index + 2)) {
+      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint16_t RDLENGTH = get16bit(mResponse, index);
+    index += 2;
+
+    if (mBodySize < (index + RDLENGTH)) {
+      LOG(("TRR: Dohdecode:%d fail RDLENGTH=%d at index %d\n", __LINE__,
+           RDLENGTH, index));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    // We check if the qname is a case-insensitive match for the host or the
+    // FQDN version of the host
+    bool responseMatchesQuestion =
+        (qname.Length() == aHost.Length() ||
+         (aHost.Length() == qname.Length() + 1 && aHost.Last() == '.')) &&
+        qname.Compare(aHost.BeginReading(), true, qname.Length()) == 0;
+
+    if (responseMatchesQuestion) {
+      // RDATA
+      // - A (TYPE 1):  4 bytes
+      // - AAAA (TYPE 28): 16 bytes
+      // - NS (TYPE 2): N bytes
+
+      switch (TYPE) {
+        case TRRTYPE_A:
+          if (RDLENGTH != 4) {
+            LOG(("TRR bad length for A (%u)\n", RDLENGTH));
+            return NS_ERROR_UNEXPECTED;
+          }
+          rv = aResp.Add(TTL, mResponse, index, RDLENGTH, aAllowRFC1918);
+          if (NS_FAILED(rv)) {
+            LOG(
+                ("TRR:DohDecode failed: local IP addresses or unknown IP "
+                 "family\n"));
+            return rv;
+          }
+          break;
+        case TRRTYPE_AAAA:
+          if (RDLENGTH != 16) {
+            LOG(("TRR bad length for AAAA (%u)\n", RDLENGTH));
+            return NS_ERROR_UNEXPECTED;
+          }
+          rv = aResp.Add(TTL, mResponse, index, RDLENGTH, aAllowRFC1918);
+          if (NS_FAILED(rv)) {
+            LOG(("TRR got unique/local IPv6 address!\n"));
+            return rv;
+          }
+          break;
+
+        case TRRTYPE_NS:
+          break;
+        case TRRTYPE_CNAME:
+          if (aCname.IsEmpty()) {
+            nsAutoCString qname;
+            unsigned int qnameindex = index;
+            rv = GetQname(qname, qnameindex);
+            if (NS_FAILED(rv)) {
+              return rv;
+            }
+            if (!qname.IsEmpty()) {
+              ToLowerCase(qname);
+              aCname = qname;
+              LOG(("DNSPacket::DohDecode CNAME host %s => %s\n", host.get(),
+                   aCname.get()));
+            } else {
+              LOG(("DNSPacket::DohDecode empty CNAME for host %s!\n",
+                   host.get()));
+            }
+          } else {
+            LOG(("DNSPacket::DohDecode CNAME - ignoring another entry\n"));
+          }
+          break;
+        case TRRTYPE_TXT: {
+          // TXT record RRDATA sections are a series of character-strings
+          // each character string is a length byte followed by that many data
+          // bytes
+          nsAutoCString txt;
+          unsigned int txtIndex = index;
+          uint16_t available = RDLENGTH;
+
+          while (available > 0) {
+            uint8_t characterStringLen = mResponse[txtIndex++];
+            available--;
+            if (characterStringLen > available) {
+              LOG(("DNSPacket::DohDecode MALFORMED TXT RECORD\n"));
+              break;
+            }
+            txt.Append((const char*)(&mResponse[txtIndex]), characterStringLen);
+            txtIndex += characterStringLen;
+            available -= characterStringLen;
+          }
+
+          if (!aTypeResult.is<TypeRecordTxt>()) {
+            aTypeResult = AsVariant(CopyableTArray<nsCString>());
+          }
+
+          {
+            auto& results = aTypeResult.as<TypeRecordTxt>();
+            results.AppendElement(txt);
+          }
+          if (aTTL > TTL) {
+            aTTL = TTL;
+          }
+          LOG(("DNSPacket::DohDecode TXT host %s => %s\n", host.get(),
+               txt.get()));
+
+          break;
+        }
+        case TRRTYPE_HTTPSSVC: {
+          struct SVCB parsed;
+          int32_t lastSvcParamKey = -1;
+
+          unsigned int svcbIndex = index;
+          CheckedInt<uint16_t> available = RDLENGTH;
+
+          // Should have at least 2 bytes for the priority and one for the
+          // qname length.
+          if (available.value() < 3) {
+            return NS_ERROR_UNEXPECTED;
+          }
+
+          parsed.mSvcFieldPriority = get16bit(mResponse, svcbIndex);
+          svcbIndex += 2;
+
+          rv = GetQname(parsed.mSvcDomainName, svcbIndex);
+          if (NS_FAILED(rv)) {
+            return rv;
+          }
+
+          if (parsed.mSvcDomainName.IsEmpty()) {
+            if (parsed.mSvcFieldPriority == 0) {
+              // For AliasMode SVCB RRs, a TargetName of "." indicates that the
+              // service is not available or does not exist.
+              continue;
+            }
+
+            // For ServiceMode SVCB RRs, if TargetName has the value ".",
+            // then the owner name of this record MUST be used as
+            // the effective TargetName.
+            parsed.mSvcDomainName = qname;
+          }
+
+          available -= (svcbIndex - index);
+          if (!available.isValid()) {
+            return NS_ERROR_UNEXPECTED;
+          }
+          while (available.value() >= 4) {
+            // Every SvcFieldValues must have at least 4 bytes for the
+            // SvcParamKey (2 bytes) and length of SvcParamValue (2 bytes)
+            // If the length ever goes above the available data, meaning if
+            // available ever underflows, then that is an error.
+            struct SvcFieldValue value;
+            uint16_t key = get16bit(mResponse, svcbIndex);
+            svcbIndex += 2;
+
+            // 2.2 Clients MUST consider an RR malformed if SvcParamKeys are
+            // not in strictly increasing numeric order.
+            if (key <= lastSvcParamKey) {
+              LOG(("SvcParamKeys not in increasing order"));
+              return NS_ERROR_UNEXPECTED;
+            }
+            lastSvcParamKey = key;
+
+            uint16_t len = get16bit(mResponse, svcbIndex);
+            svcbIndex += 2;
+
+            available -= 4 + len;
+            if (!available.isValid()) {
+              return NS_ERROR_UNEXPECTED;
+            }
+
+            rv = ParseSvcParam(svcbIndex, key, value, len);
+            if (NS_FAILED(rv)) {
+              return rv;
+            }
+            svcbIndex += len;
+
+            // If this is an unknown key, we will simply ignore it.
+            // We also don't need to record SvcParamKeyMandatory
+            if (key == SvcParamKeyMandatory || key > SvcParamKeyLast) {
+              continue;
+            }
+
+            if (value.mValue.is<SvcParamIpv4Hint>() ||
+                value.mValue.is<SvcParamIpv6Hint>()) {
+              parsed.mHasIPHints = true;
+            }
+            if (value.mValue.is<SvcParamEchConfig>()) {
+              parsed.mHasEchConfig = true;
+              parsed.mEchConfig = value.mValue.as<SvcParamEchConfig>().mValue;
+            }
+            parsed.mSvcFieldValue.AppendElement(value);
+          }
+
+          // Check for AliasForm
+          if (aCname.IsEmpty() && parsed.mSvcFieldPriority == 0) {
+            // Alias form SvcDomainName must not have the "." value (empty)
+            if (parsed.mSvcDomainName.IsEmpty()) {
+              return NS_ERROR_UNEXPECTED;
+            }
+            aCname = parsed.mSvcDomainName;
+            ToLowerCase(aCname);
+            LOG(("DNSPacket::DohDecode HTTPSSVC AliasForm host %s => %s\n",
+                 host.get(), aCname.get()));
+            break;
+          }
+
+          if (aType != TRRTYPE_HTTPSSVC) {
+            // Ignore the entry that we just parsed if we didn't ask for it.
+            break;
+          }
+
+          if (!aTypeResult.is<TypeRecordHTTPSSVC>()) {
+            aTypeResult = mozilla::AsVariant(CopyableTArray<SVCB>());
+          }
+          {
+            auto& results = aTypeResult.as<TypeRecordHTTPSSVC>();
+            results.AppendElement(parsed);
+          }
+          break;
+        }
+        default:
+          // skip unknown record types
+          LOG(("TRR unsupported TYPE (%u) RDLENGTH %u\n", TYPE, RDLENGTH));
+          break;
+      }
+    } else {
+      LOG(("TRR asked for %s data but got %s\n", aHost.get(), qname.get()));
+    }
+
+    index += RDLENGTH;
+    LOG(("done with record type %u len %u index now %u of %u\n", TYPE, RDLENGTH,
+         index, mBodySize));
+    answerRecords--;
+  }
+
+  // NSCOUNT
+  uint16_t nsRecords = get16bit(mResponse, 8);
+  LOG(("TRR Decode: %d ns records (%u bytes body)\n", nsRecords, mBodySize));
+  while (nsRecords) {
+    rv = PassQName(index);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+
+    if (mBodySize < (index + 8)) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    index += 2;  // type
+    index += 2;  // class
+    index += 4;  // ttl
+
+    // 16 bit RDLENGTH
+    if (mBodySize < (index + 2)) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint16_t RDLENGTH = get16bit(mResponse, index);
+    index += 2;
+    if (mBodySize < (index + RDLENGTH)) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    index += RDLENGTH;
+    LOG(("done with nsRecord now %u of %u\n", index, mBodySize));
+    nsRecords--;
+  }
+
+  // additional resource records
+  uint16_t arRecords = get16bit(mResponse, 10);
+  LOG(("TRR Decode: %d additional resource records (%u bytes body)\n",
+       arRecords, mBodySize));
+
+  while (arRecords) {
+    nsAutoCString qname;
+    rv = GetQname(qname, index);
+    if (NS_FAILED(rv)) {
+      LOG(("Bad qname for additional record"));
+      return rv;
+    }
+
+    if (mBodySize < (index + 8)) {
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+    uint16_t type = get16bit(mResponse, index);
+    index += 2;
+    // The next two bytes encode class
+    // (or udpPayloadSize when type is TRRTYPE_OPT)
+    uint16_t cls = get16bit(mResponse, index);
+    index += 2;
+    // The next 4 bytes encode TTL
+    // (or extRCode + ednsVersion + flags when type is TRRTYPE_OPT)
+    uint32_t ttl = get32bit(mResponse, index);
+    index += 4;
+    // cls and ttl are unused when type is TRRTYPE_OPT
+
+    // 16 bit RDLENGTH
+    if (mBodySize < (index + 2)) {
+      LOG(("Record too small"));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    uint16_t rdlength = get16bit(mResponse, index);
+    index += 2;
+    if (mBodySize < (index + rdlength)) {
+      LOG(("rdlength too big"));
+      return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    auto parseRecord = [&]() {
+      LOG(("Parsing additional record type: %u", type));
+      auto& entry = aAdditionalRecords.GetOrInsert(qname);
+      if (!entry) {
+        entry.reset(new DOHresp());
+      }
+
+      switch (type) {
+        case TRRTYPE_A:
+          if (kDNS_CLASS_IN != cls) {
+            LOG(("NOT IN - returning"));
+            return;
+          }
+          if (rdlength != 4) {
+            LOG(("TRR bad length for A (%u)\n", rdlength));
+            return;
+          }
+          rv = entry->Add(ttl, mResponse, index, rdlength, aAllowRFC1918);
+          if (NS_FAILED(rv)) {
+            LOG(
+                ("TRR:DohDecode failed: local IP addresses or unknown IP "
+                 "family\n"));
+            return;
+          }
+          break;
+        case TRRTYPE_AAAA:
+          if (kDNS_CLASS_IN != cls) {
+            LOG(("NOT IN - returning"));
+            return;
+          }
+          if (rdlength != 16) {
+            LOG(("TRR bad length for AAAA (%u)\n", rdlength));
+            return;
+          }
+          rv = entry->Add(ttl, mResponse, index, rdlength, aAllowRFC1918);
+          if (NS_FAILED(rv)) {
+            LOG(("TRR got unique/local IPv6 address!\n"));
+            return;
+          }
+          break;
+        case TRRTYPE_OPT: {  // OPT
+          LOG(("Parsing opt rdlen: %u", rdlength));
+          unsigned int offset = 0;
+          while (offset + 2 <= rdlength) {
+            uint16_t optCode = get16bit(mResponse, index + offset);
+            LOG(("optCode: %u", optCode));
+            offset += 2;
+            if (offset + 2 > rdlength) {
+              break;
+            }
+            uint16_t optLen = get16bit(mResponse, index + offset);
+            LOG(("optLen: %u", optLen));
+            offset += 2;
+            if (offset + optLen > rdlength) {
+              LOG(("offset: %u, optLen: %u, rdlen: %u", offset, optLen,
+                   rdlength));
+              break;
+            }
+
+            LOG(("OPT: code: %u len:%u", optCode, optLen));
+
+            if (optCode != 15) {
+              offset += optLen;
+              continue;
+            }
+
+            // optCode == 15; Extended DNS error
+
+            if (offset + 2 > rdlength || optLen < 2) {
+              break;
+            }
+            extendedError = get16bit(mResponse, index + offset);
+
+            LOG((
+                "Extended error code: %u message: %s", extendedError,
+                nsAutoCString((char*)mResponse + index + offset + 2, optLen - 2)
+                    .get()));
+            offset += optLen;
+          }
+          break;
+        }
+        default:
+          break;
+      }
+    };
+
+    parseRecord();
+
+    index += rdlength;
+    LOG(("done with additional rr now %u of %u\n", index, mBodySize));
+    arRecords--;
+  }
+
+  if (index != mBodySize) {
+    LOG(("DohDecode failed to parse entire response body, %u out of %u bytes\n",
+         index, mBodySize));
+    // failed to parse 100%, do not continue
+    return NS_ERROR_ILLEGAL_VALUE;
+  }
+
+  if ((aType != TRRTYPE_NS) && aCname.IsEmpty() && aResp.mAddresses.IsEmpty() &&
+      aTypeResult.is<TypeRecordEmpty>()) {
+    // no entries were stored!
+    LOG(("TRR: No entries were stored!\n"));
+    if (extendedError != UINT16_MAX && hardFail(extendedError)) {
+      return NS_ERROR_DEFINITIVE_UNKNOWN_HOST;
+    }
+    return NS_ERROR_FAILURE;
+  }
+
+  // https://tools.ietf.org/html/draft-ietf-dnsop-svcb-httpssvc-03#page-14
+  // If one or more SVCB records of ServiceForm SvcRecordType are returned for
+  // HOST, clients should select the highest-priority option with acceptable
+  // parameters.
+  if (aTypeResult.is<TypeRecordHTTPSSVC>()) {
+    auto& results = aTypeResult.as<TypeRecordHTTPSSVC>();
+    results.Sort();
+  }
+
+  return NS_OK;
+}
+
+}  // namespace net
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/dns/DNSPacket.h firefox-85.0+build1/netwerk/dns/DNSPacket.h
--- firefox-84.0.2+build1/netwerk/dns/DNSPacket.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/DNSPacket.h	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,71 @@
+/* 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_net_DNSPacket_h__
+#define mozilla_net_DNSPacket_h__
+
+#include "mozilla/Result.h"
+#include "nsHostResolver.h"
+
+namespace mozilla {
+namespace net {
+
+class DOHresp {
+ public:
+  nsresult Add(uint32_t TTL, unsigned char const* dns, unsigned int index,
+               uint16_t len, bool aLocalAllowed);
+  nsTArray<NetAddr> mAddresses;
+  uint32_t mTtl = UINT32_MAX;
+};
+
+// the values map to RFC1035 type identifiers
+enum TrrType {
+  TRRTYPE_A = 1,
+  TRRTYPE_NS = 2,
+  TRRTYPE_CNAME = 5,
+  TRRTYPE_AAAA = 28,
+  TRRTYPE_OPT = 41,
+  TRRTYPE_TXT = 16,
+  TRRTYPE_HTTPSSVC = nsIDNSService::RESOLVE_TYPE_HTTPSSVC,  // 65
+};
+
+class DNSPacket {
+ public:
+  // Called in order to feed data into the buffer.
+  nsresult OnDataAvailable(nsIRequest* aRequest, nsIInputStream* aInputStream,
+                           uint64_t aOffset, const uint32_t aCount);
+
+  // Encodes the name request into a buffer that represents a DNS packet
+  static nsresult EncodeRequest(nsCString& aBody, const nsACString& aHost,
+                                uint16_t aType, bool aDisableECS);
+
+  // Decodes the DNS response and extracts the responses, additional records,
+  // etc. XXX: This should probably be refactored to reduce the number of
+  // output parameters and have a common format for different record types.
+  nsresult Decode(
+      nsCString& aHost, enum TrrType aType, nsCString& aCname,
+      bool aAllowRFC1918, nsHostRecord::TRRSkippedReason& reason,
+      DOHresp& aResp, TypeRecordResultType& aTypeResult,
+      nsClassHashtable<nsCStringHashKey, DOHresp>& aAdditionalRecords,
+      uint32_t& aTTL);
+
+ private:
+  // Never accept larger DOH responses than this as that would indicate
+  // something is wrong. Typical ones are much smaller.
+  static const unsigned int MAX_SIZE = 3200;
+
+  nsresult PassQName(unsigned int& index);
+  nsresult GetQname(nsACString& aQname, unsigned int& aIndex);
+  nsresult ParseSvcParam(unsigned int svcbIndex, uint16_t key,
+                         SvcFieldValue& field, uint16_t length);
+
+  // The response buffer.
+  unsigned char mResponse[MAX_SIZE]{};
+  unsigned int mBodySize = 0;
+};
+
+}  // namespace net
+}  // namespace mozilla
+
+#endif  // mozilla_net_DNSPacket_h__
diff -Nru firefox-84.0.2+build1/netwerk/dns/DNSRequestChild.cpp firefox-85.0+build1/netwerk/dns/DNSRequestChild.cpp
--- firefox-84.0.2+build1/netwerk/dns/DNSRequestChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/DNSRequestChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -54,6 +54,7 @@
   double mTrrFetchDuration;
   double mTrrFetchDurationNetworkOnly;
   bool mIsTRR;
+  uint32_t mEffectiveTRRMode;
 };
 
 NS_IMPL_ISUPPORTS(ChildDNSRecord, nsIDNSRecord, nsIDNSAddrRecord)
@@ -64,6 +65,7 @@
   mTrrFetchDuration = reply.trrFetchDuration();
   mTrrFetchDurationNetworkOnly = reply.trrFetchDurationNetworkOnly();
   mIsTRR = reply.isTRR();
+  mEffectiveTRRMode = reply.effectiveTRRMode();
 
   // A shame IPDL gives us no way to grab ownership of array: so copy it.
   const nsTArray<NetAddr>& addrs = reply.addrs();
@@ -174,6 +176,12 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+ChildDNSRecord::GetEffectiveTRRMode(uint32_t* aMode) {
+  *aMode = mEffectiveTRRMode;
+  return NS_OK;
+}
+
 class ChildDNSByTypeRecord : public nsIDNSByTypeRecord,
                              public nsIDNSTXTRecord,
                              public nsIDNSHTTPSSVCRecord,
@@ -274,6 +282,7 @@
 NS_IMETHODIMP
 ChildDNSByTypeRecord::GetAllRecordsWithEchConfig(
     bool aNoHttp2, bool aNoHttp3, bool* aAllRecordsHaveEchConfig,
+    bool* aAllRecordsInH3ExcludedList,
     nsTArray<RefPtr<nsISVCBRecord>>& aResult) {
   if (!mResults.is<TypeRecordHTTPSSVC>()) {
     return NS_ERROR_NOT_AVAILABLE;
@@ -281,7 +290,8 @@
 
   auto& records = mResults.as<TypeRecordHTTPSSVC>();
   GetAllRecordsWithEchConfigInternal(aNoHttp2, aNoHttp3, records,
-                                     aAllRecordsHaveEchConfig, aResult);
+                                     aAllRecordsHaveEchConfig,
+                                     aAllRecordsInH3ExcludedList, aResult);
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/DNSRequestParent.cpp firefox-85.0+build1/netwerk/dns/DNSRequestParent.cpp
--- firefox-84.0.2+build1/netwerk/dns/DNSRequestParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/DNSRequestParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -129,10 +129,13 @@
     bool isTRR = false;
     rec->IsTRR(&isTRR);
 
+    uint32_t effectiveTRRMode = 0;
+    rec->GetEffectiveTRRMode(&effectiveTRRMode);
+
     SendLookupCompletedHelper(
-        mIPCActor,
-        DNSRequestResponse(DNSRecord(cname, array, trrFetchDuration,
-                                     trrFetchDurationNetworkOnly, isTRR)));
+        mIPCActor, DNSRequestResponse(DNSRecord(cname, array, trrFetchDuration,
+                                                trrFetchDurationNetworkOnly,
+                                                isTRR, effectiveTRRMode)));
   } else {
     SendLookupCompletedHelper(mIPCActor, DNSRequestResponse(status));
   }
diff -Nru firefox-84.0.2+build1/netwerk/dns/effective_tld_names.dat firefox-85.0+build1/netwerk/dns/effective_tld_names.dat
--- firefox-84.0.2+build1/netwerk/dns/effective_tld_names.dat	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/effective_tld_names.dat	2021-01-18 19:58:18.000000000 +0000
@@ -7111,7 +7111,7 @@
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-11-30T20:26:10Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-12-21T16:35:44Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7335,7 +7335,7 @@
 // avianca : 2015-01-08 Avianca Holdings S.A.
 avianca
 
-// aws : 2015-06-25 Amazon Registry Services, Inc.
+// aws : 2015-06-25 AWS Registry LLC
 aws
 
 // axa : 2013-12-19 AXA Group Operations SAS
@@ -7656,9 +7656,6 @@
 // cbs : 2015-08-06 CBS Domains Inc.
 cbs
 
-// ceb : 2015-04-09 The Corporate Executive Board Company
-ceb
-
 // center : 2013-11-07 Binky Moon, LLC
 center
 
@@ -7839,7 +7836,7 @@
 // creditcard : 2014-03-20 Binky Moon, LLC
 creditcard
 
-// creditunion : 2015-01-22 CUNA Performance Resources, LLC
+// creditunion : 2015-01-22 DotCooperation LLC
 creditunion
 
 // cricket : 2014-10-09 dot Cricket Limited
@@ -8922,9 +8919,6 @@
 // lundbeck : 2015-08-06 H. Lundbeck A/S
 lundbeck
 
-// lupin : 2014-11-07 LUPIN LIMITED
-lupin
-
 // luxe : 2014-01-09 Minds + Machines Group Limited
 luxe
 
@@ -9207,7 +9201,7 @@
 // obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
 obi
 
-// observer : 2015-04-30 Top Level Spectrum, Inc.
+// observer : 2015-04-30 Dog Beach, LLC
 observer
 
 // off : 2015-07-23 Johnson Shareholdings, Inc.
@@ -9474,7 +9468,7 @@
 // realtor : 2014-05-29 Real Estate Domains LLC
 realtor
 
-// realty : 2015-03-19 Fegistry, LLC
+// realty : 2015-03-19 Dog Beach, LLC
 realty
 
 // recipes : 2013-10-17 Binky Moon, LLC
@@ -11174,6 +11168,11 @@
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
 
+// Deno Land Inc : https://deno.com/
+// Submitted by Luca Casonato <hostmaster@deno.com>
+deno.dev
+deno-staging.dev
+
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
@@ -11195,6 +11194,10 @@
 // Submitted by Paul Fang <mis@draytek.com>
 drayddns.com
 
+// DreamCommerce : https://shoper.pl/
+// Submitted by Konrad Kotarba <konrad.kotarba@dreamcommerce.com>
+shoparena.pl
+
 // DreamHost : http://www.dreamhost.com/
 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
 dreamhosters.com
@@ -11768,10 +11771,6 @@
 fastvps.site
 myfast.space
 
-// Featherhead : https://featherhead.xyz/
-// Submitted by Simon Menke <simon@featherhead.xyz>
-fhapp.xyz
-
 // Fedora : https://fedoraproject.org/
 // submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
 fedorainfracloud.org
@@ -11809,6 +11808,14 @@
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
 
+// Firewebkit : https://www.firewebkit.com
+// Submitted by Majid Qureshi <mqureshi@amrayn.com>
+fireweb.app
+
+// FLAP : https://www.flap.cloud
+// Submitted by Louis Chemineau <louis@chmn.me>
+flap.id
+
 // fly.io: https://fly.io
 // Submitted by Kurt Mackey <kurt@fly.io>
 fly.dev
@@ -11867,6 +11874,10 @@
 lab.ms
 cdn-edges.net
 
+// Ghost Foundation : https://ghost.org
+// Submitted by Matt Hanley <security@ghost.org>
+ghost.io
+
 // GitHub, Inc.
 // Submitted by Patrick Toomey <security@github.com>
 github.io
@@ -12013,6 +12024,11 @@
 // Submitted by Tyler Todd <noc@nova53.net>
 awsmppl.com
 
+// GünstigBestellen : https://günstigbestellen.de
+// Submitted by Furkan Akkoc <info@hendelzon.de>
+günstigbestellen.de
+günstigliefern.de
+
 // Hakaran group: http://hakaran.cz
 // Submited by Arseniy Sokolov <security@hakaran.cz>
 fin.ci
@@ -12057,18 +12073,16 @@
 
 // HOSTBIP REGISTRY : https://www.hostbip.com/
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@hostbip.com>
-bpl.biz
 orx.biz
-ng.city
 biz.gl
-ng.ink
 col.ng
 firm.ng
 gen.ng
 ltd.ng
 ngo.ng
-ng.school
+edu.scot
 sch.so
+org.yt
 
 // HostyHosting (hostyhosting.com)
 hostyhosting.io
@@ -12086,6 +12100,14 @@
 // Submitted by Hannu Aronsson <haa@iki.fi>
 iki.fi
 
+// Incsub, LLC: https://incsub.com/
+// Submitted by Aaron Edwards <sysadmins@incsub.com>
+smushcdn.com
+wphostedmail.com
+wpmucdn.com
+tempurl.host
+wpmudev.host
+
 // Individual Network Berlin e.V. : https://www.in-berlin.de/
 // Submitted by Christian Seitz <chris@in-berlin.de>
 dyn-berlin.de
@@ -12300,6 +12322,11 @@
 co.krd
 edu.krd
 
+// Krellian Ltd. : https://krellian.com
+// Submitted by Ben Francis <ben@krellian.com>
+krellian.net
+webthings.io
+
 // LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
 // Submitted by Lars Laehn <info@lcube.de>
 git-repos.de
@@ -12357,6 +12384,10 @@
 loginline.services
 loginline.site
 
+// Lõhmus Family, The
+// Submitted by Heiki Lõhmus <hostmaster at lohmus dot me>
+lohmus.me
+
 // LubMAN UMCS Sp. z o.o : https://lubman.pl/
 // Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
 krasnik.pl
@@ -12762,6 +12793,10 @@
 // Submitted by Sven Marnach <sven@opencraft.com>
 opencraft.hosting
 
+// OpenResearch GmbH: https://openresearch.com/
+// Submitted by Philipp Schmid <ops@openresearch.com>
+orsites.com
+
 // Opera Software, A.S.A.
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
@@ -13049,6 +13084,10 @@
 // Submitted by Alex Bowers <alex@shopblocks.com>
 myshopblocks.com
 
+// Shopify : https://www.shopify.com
+// Submitted by Alex Richter <alex.richter@shopify.com>
+myshopify.com
+
 // Shopit : https://www.shopitcommerce.com/
 // Submitted by Craig McMahon <craig@shopitcommerce.com>
 shopitsite.com
@@ -13396,6 +13435,7 @@
 
 // WoltLab GmbH : https://www.woltlab.com
 // Submitted by Tim Düsterhus <security@woltlab.cloud>
+woltlab-demo.com
 myforum.community
 community-pro.de
 diskussionsbereich.de
@@ -13488,4 +13528,17 @@
 // GignoSystemJapan: http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
 gsj.bz
+
+// Rusnames Limited: http://rusnames.ru/
+// Submitted by Sergey Zotov <admin@rusnames.ru>
+биз.ру�
+ком.ру�
+крым.ру�
+мир.ру�
+м�к.ру�
+орг.ру�
+�амара.ру�
+�очи.ру�
+�пб.ру�
+�.ру�
 // ===END PRIVATE DOMAINS===
diff -Nru firefox-84.0.2+build1/netwerk/dns/HTTPSSVC.cpp firefox-85.0+build1/netwerk/dns/HTTPSSVC.cpp
--- firefox-84.0.2+build1/netwerk/dns/HTTPSSVC.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/HTTPSSVC.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsHttp.h"
 #include "nsHttpHandler.h"
 #include "nsNetAddr.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace net {
@@ -67,12 +68,12 @@
 }
 
 NS_IMETHODIMP
-SvcParam::GetAlpn(nsACString& aAlpn) {
+SvcParam::GetAlpn(nsTArray<nsCString>& aAlpn) {
   if (!mValue.is<SvcParamAlpn>()) {
     MOZ_ASSERT(false, "Unexpected type for variant");
     return NS_ERROR_NOT_AVAILABLE;
   }
-  aAlpn = mValue.as<SvcParamAlpn>().mValue;
+  aAlpn.AppendElements(mValue.as<SvcParamAlpn>().mValue);
   return NS_OK;
 }
 
@@ -172,13 +173,13 @@
 Maybe<Tuple<nsCString, bool>> SVCB::GetAlpn(bool aNoHttp2,
                                             bool aNoHttp3) const {
   Maybe<Tuple<nsCString, bool>> alpn;
-  nsAutoCString alpnValue;
   for (const auto& value : mSvcFieldValue) {
     if (value.mValue.is<SvcParamAlpn>()) {
-      alpn.emplace();
-      alpnValue = value.mValue.as<SvcParamAlpn>().mValue;
-      if (!alpnValue.IsEmpty()) {
-        alpn = Some(SelectAlpnFromAlpnList(alpnValue, aNoHttp2, aNoHttp3));
+      nsTArray<nsCString> alpnList;
+      alpnList.AppendElements(value.mValue.as<SvcParamAlpn>().mValue);
+      if (!alpnList.IsEmpty()) {
+        alpn.emplace();
+        alpn = Some(SelectAlpnFromAlpnList(alpnList, aNoHttp2, aNoHttp3));
       }
       return alpn;
     }
@@ -233,16 +234,33 @@
   return NS_OK;
 }
 
+static bool CheckAlpnIsUsable(const nsACString& aTargetName,
+                              const nsACString& aAlpn, bool aIsHttp3,
+                              uint32_t& aExcludedCount) {
+  if (aAlpn.IsEmpty()) {
+    return false;
+  }
+
+  if (aIsHttp3 && gHttpHandler->IsHttp3Excluded(aTargetName)) {
+    aExcludedCount++;
+    return false;
+  }
+
+  return true;
+}
+
 already_AddRefed<nsISVCBRecord>
 DNSHTTPSSVCRecordBase::GetServiceModeRecordInternal(
     bool aNoHttp2, bool aNoHttp3, const nsTArray<SVCB>& aRecords,
-    bool& aRecordsAllExcluded) {
+    bool& aRecordsAllExcluded, bool aCheckHttp3ExcludedList) {
   nsCOMPtr<nsISVCBRecord> selectedRecord;
   uint32_t recordHasNoDefaultAlpnCount = 0;
   uint32_t recordExcludedCount = 0;
   aRecordsAllExcluded = false;
   nsCOMPtr<nsIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID);
   bool RRSetHasEchConfig = false;
+  uint32_t h3ExcludedCount = 0;
+
   for (const SVCB& record : aRecords) {
     if (record.mSvcFieldPriority == 0) {
       // In ServiceMode, the SvcPriority should never be 0.
@@ -271,9 +289,12 @@
     }
 
     Maybe<Tuple<nsCString, bool>> alpn = record.GetAlpn(aNoHttp2, aNoHttp3);
-    if (alpn && Get<0>(*alpn).IsEmpty()) {
-      // Can't find any supported protocols, skip.
-      continue;
+    if (alpn) {
+      if (!CheckAlpnIsUsable(record.mSvcDomainName, Get<0>(*alpn),
+                             aCheckHttp3ExcludedList && Get<1>(*alpn),
+                             h3ExcludedCount)) {
+        continue;
+      }
     }
 
     if (gHttpHandler->EchConfigEnabled() && RRSetHasEchConfig &&
@@ -294,6 +315,14 @@
 
   if (recordExcludedCount == aRecords.Length()) {
     aRecordsAllExcluded = true;
+    return nullptr;
+  }
+
+  // If all records are in http3 excluded list, try again without checking the
+  // excluded list. This is better than returning nothing.
+  if (h3ExcludedCount == aRecords.Length() && aCheckHttp3ExcludedList) {
+    return GetServiceModeRecordInternal(aNoHttp2, aNoHttp3, aRecords,
+                                        aRecordsAllExcluded, false);
   }
 
   return selectedRecord.forget();
@@ -301,17 +330,20 @@
 
 void DNSHTTPSSVCRecordBase::GetAllRecordsWithEchConfigInternal(
     bool aNoHttp2, bool aNoHttp3, const nsTArray<SVCB>& aRecords,
-    bool* aAllRecordsHaveEchConfig, nsTArray<RefPtr<nsISVCBRecord>>& aResult) {
+    bool* aAllRecordsHaveEchConfig, bool* aAllRecordsInH3ExcludedList,
+    nsTArray<RefPtr<nsISVCBRecord>>& aResult, bool aCheckHttp3ExcludedList) {
   if (aRecords.IsEmpty()) {
     return;
   }
 
   *aAllRecordsHaveEchConfig = aRecords[0].mHasEchConfig;
+  *aAllRecordsInH3ExcludedList = false;
   // The first record should have echConfig.
   if (!(*aAllRecordsHaveEchConfig)) {
     return;
   }
 
+  uint32_t h3ExcludedCount = 0;
   for (const SVCB& record : aRecords) {
     if (record.mSvcFieldPriority == 0) {
       // This should not happen, since GetAllRecordsWithEchConfigInternal()
@@ -336,15 +368,27 @@
     }
 
     Maybe<Tuple<nsCString, bool>> alpn = record.GetAlpn(aNoHttp2, aNoHttp3);
-    if (alpn && Get<0>(*alpn).IsEmpty()) {
-      // Can't find any supported protocols, skip.
-      continue;
+    if (alpn) {
+      if (!CheckAlpnIsUsable(record.mSvcDomainName, Get<0>(*alpn),
+                             aCheckHttp3ExcludedList && Get<1>(*alpn),
+                             h3ExcludedCount)) {
+        continue;
+      }
     }
 
     RefPtr<nsISVCBRecord> svcbRecord =
         new SVCBRecord(record, std::move(port), std::move(alpn));
     aResult.AppendElement(svcbRecord);
   }
+
+  // If all records are in http3 excluded list, try again without checking the
+  // excluded list. This is better than returning nothing.
+  if (h3ExcludedCount == aRecords.Length() && aCheckHttp3ExcludedList) {
+    GetAllRecordsWithEchConfigInternal(
+        aNoHttp2, aNoHttp3, aRecords, aAllRecordsHaveEchConfig,
+        aAllRecordsInH3ExcludedList, aResult, false);
+    *aAllRecordsInH3ExcludedList = true;
+  }
 }
 
 bool DNSHTTPSSVCRecordBase::HasIPAddressesInternal(
diff -Nru firefox-84.0.2+build1/netwerk/dns/HTTPSSVC.h firefox-85.0+build1/netwerk/dns/HTTPSSVC.h
--- firefox-84.0.2+build1/netwerk/dns/HTTPSSVC.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/HTTPSSVC.h	2021-01-18 19:58:18.000000000 +0000
@@ -29,7 +29,7 @@
   bool operator==(const SvcParamAlpn& aOther) const {
     return mValue == aOther.mValue;
   }
-  nsCString mValue;
+  CopyableTArray<nsCString> mValue;
 };
 
 struct SvcParamNoDefaultAlpn {
@@ -121,13 +121,15 @@
 
   already_AddRefed<nsISVCBRecord> GetServiceModeRecordInternal(
       bool aNoHttp2, bool aNoHttp3, const nsTArray<SVCB>& aRecords,
-      bool& aRecordsAllExcluded);
+      bool& aRecordsAllExcluded, bool aCheckHttp3ExcludedList = true);
 
   bool HasIPAddressesInternal(const nsTArray<SVCB>& aRecords);
 
   void GetAllRecordsWithEchConfigInternal(
       bool aNoHttp2, bool aNoHttp3, const nsTArray<SVCB>& aRecords,
-      bool* aAllRecordsHaveEchConfig, nsTArray<RefPtr<nsISVCBRecord>>& aResult);
+      bool* aAllRecordsHaveEchConfig, bool* aAllRecordsInH3ExcludedList,
+      nsTArray<RefPtr<nsISVCBRecord>>& aResult,
+      bool aCheckHttp3ExcludedList = true);
 
   // The owner name of this HTTPS RR.
   nsCString mHost;
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DataReader.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DataWriter.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSPacket.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSRecord.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSResourceRecord.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/DNSTypes.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm
--- firefox-84.0.2+build1/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/mdns/libmdns/fallback/MulticastDNS.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -2,7 +2,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/. */
-/* jshint esnext: true, moz: true */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/moz.build firefox-85.0+build1/netwerk/dns/moz.build
--- firefox-84.0.2+build1/netwerk/dns/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -61,6 +61,7 @@
     "ChildDNSService.cpp",
     "DNS.cpp",
     "DNSListenerProxy.cpp",
+    "DNSPacket.cpp",
     "DNSRequestChild.cpp",
     "DNSRequestParent.cpp",
     "DNSResolverInfo.cpp",
diff -Nru firefox-84.0.2+build1/netwerk/dns/nsDNSService2.cpp firefox-85.0+build1/netwerk/dns/nsDNSService2.cpp
--- firefox-84.0.2+build1/netwerk/dns/nsDNSService2.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/nsDNSService2.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -345,6 +345,12 @@
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDNSRecord::GetEffectiveTRRMode(uint32_t* aMode) {
+  *aMode = mHostRecord->EffectiveTRRMode();
+  return NS_OK;
+}
+
 class nsDNSByTypeRecord : public nsIDNSByTypeRecord,
                           public nsIDNSTXTRecord,
                           public nsIDNSHTTPSSVCRecord {
@@ -399,9 +405,11 @@
 NS_IMETHODIMP
 nsDNSByTypeRecord::GetAllRecordsWithEchConfig(
     bool aNoHttp2, bool aNoHttp3, bool* aAllRecordsHaveEchConfig,
+    bool* aAllRecordsInH3ExcludedList,
     nsTArray<RefPtr<nsISVCBRecord>>& aResult) {
   return mHostRecord->GetAllRecordsWithEchConfig(
-      aNoHttp2, aNoHttp3, aAllRecordsHaveEchConfig, aResult);
+      aNoHttp2, aNoHttp3, aAllRecordsHaveEchConfig, aAllRecordsInH3ExcludedList,
+      aResult);
 }
 
 NS_IMETHODIMP
@@ -645,27 +653,14 @@
   MOZ_ASSERT_IF(!nsIOService::UseSocketProcess(), XRE_IsParentProcess());
 
   if (!gDNSService) {
-    auto initTask = []() {
-      gDNSService = new nsDNSService();
-      if (NS_SUCCEEDED(gDNSService->Init())) {
-        ClearOnShutdown(&gDNSService);
-      } else {
-        gDNSService = nullptr;
-      }
-    };
-
     if (!NS_IsMainThread()) {
-      // Forward to the main thread synchronously.
-      RefPtr<nsIThread> mainThread = do_GetMainThread();
-      if (!mainThread) {
-        return nullptr;
-      }
-
-      SyncRunnable::DispatchToThread(mainThread,
-                                     new SyncRunnable(NS_NewRunnableFunction(
-                                         "nsDNSService::Init", initTask)));
+      return nullptr;
+    }
+    gDNSService = new nsDNSService();
+    if (NS_SUCCEEDED(gDNSService->Init())) {
+      ClearOnShutdown(&gDNSService);
     } else {
-      initTask();
+      gDNSService = nullptr;
     }
   }
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/nsHostResolver.cpp firefox-85.0+build1/netwerk/dns/nsHostResolver.cpp
--- firefox-84.0.2+build1/netwerk/dns/nsHostResolver.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/nsHostResolver.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -295,13 +295,7 @@
       addr(nullptr),
       mTRRUsed(false),
       mTRRSuccess(0),
-      mNativeSuccess(0),
-      mNative(false),
-      mNativeUsed(false),
-      onQueue(false),
-      usingAnyThread(false),
-      mGetTtl(false),
-      mResolveAgain(false) {}
+      mNativeSuccess(0) {}
 
 AddrHostRecord::~AddrHostRecord() {
   mCallbacks.clear();
@@ -381,21 +375,21 @@
 }
 
 // Returns true if the entry can be removed, or false if it should be left.
-// Sets mResolveAgain true for entries being resolved right now.
+// Sets ResolveAgain true for entries being resolved right now.
 bool AddrHostRecord::RemoveOrRefresh(bool aTrrToo) {
   // no need to flush TRRed names, they're not resolved "locally"
   MutexAutoLock lock(addr_info_lock);
   if (addr_info && !aTrrToo && addr_info->IsTRR()) {
     return false;
   }
-  if (mNative) {
-    if (!onQueue) {
+  if (LoadNative()) {
+    if (!onQueue()) {
       // The request has been passed to the OS resolver. The resultant DNS
       // record should be considered stale and not trusted; set a flag to
       // ensure it is called again.
-      mResolveAgain = true;
+      StoreResolveAgain(true);
     }
-    // if Onqueue is true, the host entry is already added to the cache
+    // if onQueue is true, the host entry is already added to the cache
     // but is still pending to get resolved: just leave it in hash.
     return false;
   }
@@ -404,7 +398,7 @@
 }
 
 void AddrHostRecord::ResolveComplete() {
-  if (mNativeUsed) {
+  if (LoadNativeUsed()) {
     if (mNativeSuccess) {
       uint32_t millis = static_cast<uint32_t>(mNativeDuration.ToMilliseconds());
       Telemetry::Accumulate(Telemetry::DNS_NATIVE_LOOKUP_TIME, millis);
@@ -599,6 +593,7 @@
 NS_IMETHODIMP
 TypeHostRecord::GetAllRecordsWithEchConfig(
     bool aNoHttp2, bool aNoHttp3, bool* aAllRecordsHaveEchConfig,
+    bool* aAllRecordsInH3ExcludedList,
     nsTArray<RefPtr<nsISVCBRecord>>& aResult) {
   MutexAutoLock lock(mResultsLock);
   if (!mResults.is<TypeRecordHTTPSSVC>()) {
@@ -607,7 +602,8 @@
 
   auto& records = mResults.as<TypeRecordHTTPSSVC>();
   GetAllRecordsWithEchConfigInternal(aNoHttp2, aNoHttp3, records,
-                                     aAllRecordsHaveEchConfig, aResult);
+                                     aAllRecordsHaveEchConfig,
+                                     aAllRecordsInH3ExcludedList, aResult);
   return NS_OK;
 }
 
@@ -772,7 +768,7 @@
 //
 // This function removes all existing resolved host entries from the hash.
 // Names that are in the pending queues can be left there. Entries in the
-// cache that have 'Resolve' set true but not 'onQueue' are being resolved
+// cache that have 'Resolve' set true but not 'OnQueue' are being resolved
 // right now, so we need to mark them to get re-resolved on completion!
 
 void nsHostResolver::FlushCache(bool aTrrToo) {
@@ -1235,7 +1231,7 @@
       // Only A/AAAA records are place in a queue. The queues are for
       // the native resolver, therefore by-type request are never put
       // into a queue.
-      if (addrRec && addrRec->onQueue) {
+      if (addrRec && addrRec->onQueue()) {
         Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2,
                               METHOD_NETWORK_SHARED);
 
@@ -1245,16 +1241,12 @@
 
         if (IsHighPriority(flags) && !IsHighPriority(rec->flags)) {
           // Move from (low|med) to high.
-          NS_ASSERTION(addrRec->onQueue,
-                       "Moving Host Record Not Currently Queued");
           rec->remove();
           mHighQ.insertBack(rec);
           rec->flags = flags;
           ConditionallyCreateThread(rec);
         } else if (IsMediumPriority(flags) && IsLowPriority(rec->flags)) {
           // Move from low to med.
-          NS_ASSERTION(addrRec->onQueue,
-                       "Moving Host Record Not Currently Queued");
           rec->remove();
           mMediumQ.insertBack(rec);
           rec->flags = flags;
@@ -1455,9 +1447,8 @@
   }
   mPendingCount++;
 
-  addrRec->mNative = true;
-  addrRec->mNativeUsed = true;
-  addrRec->onQueue = true;
+  addrRec->StoreNative(true);
+  addrRec->StoreNativeUsed(true);
   addrRec->mResolving++;
 
   nsresult rv = ConditionallyCreateThread(rec);
@@ -1575,7 +1566,7 @@
     RefPtr<AddrHostRecord> addrRec = do_QueryObject(rec);
     MOZ_ASSERT(addrRec);
 
-    addrRec->mNativeUsed = false;
+    addrRec->StoreNativeUsed(false);
     addrRec->mTRRUsed = false;
     addrRec->mNativeSuccess = false;
   }
@@ -1653,7 +1644,6 @@
   MOZ_ASSERT(rec->IsAddrRecord());
   RefPtr<AddrHostRecord> addrRec = do_QueryObject(rec);
   MOZ_ASSERT(addrRec);
-  addrRec->onQueue = false;
   addrRec.forget(aResult);
 }
 
@@ -1672,7 +1662,7 @@
     // remove next record from Q; hand over owning reference. Check high, then
     // med, then low
 
-#define SET_GET_TTL(var, val) (var)->mGetTtl = sGetTtlEnabled && (val)
+#define SET_GET_TTL(var, val) (var)->StoreGetTtl(sGetTtlEnabled && (val))
 
     if (!mHighQ.isEmpty()) {
       DeQueue(mHighQ, result);
@@ -1684,7 +1674,7 @@
       if (!mMediumQ.isEmpty()) {
         DeQueue(mMediumQ, result);
         mActiveAnyThreadCount++;
-        (*result)->usingAnyThread = true;
+        (*result)->StoreUsingAnyThread(true);
         SET_GET_TTL(*result, true);
         return true;
       }
@@ -1692,7 +1682,7 @@
       if (!mLowQ.isEmpty()) {
         DeQueue(mLowQ, result);
         mActiveAnyThreadCount++;
-        (*result)->usingAnyThread = true;
+        (*result)->StoreUsingAnyThread(true);
         SET_GET_TTL(*result, true);
         return true;
       }
@@ -1791,7 +1781,18 @@
 }
 
 void nsHostResolver::AddToEvictionQ(nsHostRecord* rec) {
-  MOZ_DIAGNOSTIC_ASSERT(!rec->isInList());
+  if (rec->isInList()) {
+    MOZ_DIAGNOSTIC_ASSERT(!mEvictionQ.contains(rec),
+                          "Already in eviction queue");
+    MOZ_DIAGNOSTIC_ASSERT(!mHighQ.contains(rec), "Already in high queue");
+    MOZ_DIAGNOSTIC_ASSERT(!mMediumQ.contains(rec), "Already in med queue");
+    MOZ_DIAGNOSTIC_ASSERT(!mLowQ.contains(rec), "Already in low queue");
+    MOZ_DIAGNOSTIC_ASSERT(false, "Already on some other queue?");
+
+    // Bug 1678117 - it's not clear why this can happen, but let's fix it
+    // for release users.
+    rec->remove();
+  }
   mEvictionQ.insertBack(rec);
   if (mEvictionQSize < mMaxCacheEntries) {
     mEvictionQSize++;
@@ -1846,10 +1847,10 @@
     newRRSet = nullptr;
   }
 
-  if (addrRec->mResolveAgain && (status != NS_ERROR_ABORT) && !trrResult) {
+  if (addrRec->LoadResolveAgain() && (status != NS_ERROR_ABORT) && !trrResult) {
     LOG(("nsHostResolver record %p resolve again due to flushcache\n",
          addrRec.get()));
-    addrRec->mResolveAgain = false;
+    addrRec->StoreResolveAgain(false);
     return LOOKUP_RESOLVEAGAIN;
   }
 
@@ -1901,18 +1902,20 @@
       status = NS_ERROR_UNKNOWN_HOST;
     }
   } else {  // native resolve completed
-    if (addrRec->usingAnyThread) {
+    if (addrRec->LoadUsingAnyThread()) {
       mActiveAnyThreadCount--;
-      addrRec->usingAnyThread = false;
+      addrRec->StoreUsingAnyThread(false);
     }
 
-    addrRec->mNative = false;
     addrRec->mNativeSuccess = static_cast<bool>(newRRSet);
     if (addrRec->mNativeSuccess) {
       addrRec->mNativeDuration = TimeStamp::Now() - addrRec->mNativeStart;
     }
   }
 
+  // This should always be cleared when a request is completed.
+  addrRec->StoreNative(false);
+
   // update record fields.  We might have a addrRec->addr_info already if a
   // previous lookup result expired and we're reresolving it or we get
   // a late second TRR response.
@@ -1989,8 +1992,8 @@
       hasNativeResult = true;
     }
   }
-  if (hasNativeResult && !mShutdown && !addrRec->mGetTtl && !rec->mResolving &&
-      sGetTtlEnabled) {
+  if (hasNativeResult && !mShutdown && !addrRec->LoadGetTtl() &&
+      !rec->mResolving && sGetTtlEnabled) {
     LOG(("Issuing second async lookup for TTL for host [%s].",
          addrRec->host.get()));
     addrRec->flags = (addrRec->flags & ~RES_PRIORITY_MEDIUM) | RES_PRIORITY_LOW;
@@ -2150,7 +2153,7 @@
           rec->host.get()));
 
     TimeStamp startTime = TimeStamp::Now();
-    bool getTtl = rec->mGetTtl;
+    bool getTtl = rec->LoadGetTtl();
     TimeDuration inQueue = startTime - rec->mNativeStart;
     uint32_t ms = static_cast<uint32_t>(inQueue.ToMilliseconds());
     Telemetry::Accumulate(Telemetry::DNS_NATIVE_QUEUING, ms);
diff -Nru firefox-84.0.2+build1/netwerk/dns/nsHostResolver.h firefox-85.0+build1/netwerk/dns/nsHostResolver.h
--- firefox-84.0.2+build1/netwerk/dns/nsHostResolver.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/nsHostResolver.h	2021-01-18 19:58:18.000000000 +0000
@@ -19,6 +19,7 @@
 #include "GetAddrInfo.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/net/DashboardTypes.h"
+#include "mozilla/AtomicBitfields.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/TimeStamp.h"
@@ -256,6 +257,8 @@
 
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const override;
 
+  nsIRequest::TRRMode EffectiveTRRMode() const { return mEffectiveTRRMode; }
+
  private:
   friend class nsHostResolver;
   friend class mozilla::net::TRR;
@@ -279,6 +282,9 @@
   };
   static DnsPriority GetPriority(uint16_t aFlags);
 
+  // true if pending and on the queue (not yet given to getaddrinfo())
+  bool onQueue() { return LoadNative() && isInList(); }
+
   // When the lookups of this record started and their durations
   mozilla::TimeStamp mTrrStart;
   mozilla::TimeStamp mNativeStart;
@@ -289,19 +295,18 @@
   uint8_t mTRRSuccess;             // number of successful TRR responses
   uint8_t mNativeSuccess;          // number of native lookup responses
 
-  uint16_t mNative : 1;  // true if this record is being resolved "natively",
-                         // which means that it is either on the pending queue
-                         // or owned by one of the worker threads. */
-  uint16_t mNativeUsed : 1;
-  uint16_t onQueue : 1;         // true if pending and on the queue (not yet
-                                // given to getaddrinfo())
-  uint16_t usingAnyThread : 1;  // true if off queue and contributing to
-                                // mActiveAnyThreadCount
-  uint16_t mGetTtl : 1;
-
-  // when the results from this resolve is returned, it is not to be
-  // trusted, but instead a new resolve must be made!
-  uint16_t mResolveAgain : 1;
+  // clang-format off
+  MOZ_ATOMIC_BITFIELDS(mAtomicBitfields, 8, (
+    // true if this record is being resolved "natively", which means that
+    // it is either on the pending queue or owned by one of the worker threads.
+    (uint16_t, Native, 1),
+    (uint16_t, NativeUsed, 1),
+    // true if off queue and contributing to mActiveAnyThreadCount
+    (uint16_t, UsingAnyThread, 1),
+    (uint16_t, GetTtl, 1),
+    (uint16_t, ResolveAgain, 1)
+  ))
+  // clang-format on
 
   // The number of times ReportUnusable() has been called in the record's
   // lifetime.
diff -Nru firefox-84.0.2+build1/netwerk/dns/nsIDNSByTypeRecord.idl firefox-85.0+build1/netwerk/dns/nsIDNSByTypeRecord.idl
--- firefox-84.0.2+build1/netwerk/dns/nsIDNSByTypeRecord.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/nsIDNSByTypeRecord.idl	2021-01-18 19:58:18.000000000 +0000
@@ -60,7 +60,7 @@
 
 [scriptable, uuid(0dc58309-4d67-4fc4-a4e3-38dbde9d9f4c)]
 interface nsISVCParamAlpn : nsISupports {
-  readonly attribute ACString alpn;
+  readonly attribute Array<ACString> alpn;
 };
 
 [scriptable, uuid(b3ed89c3-2ae6-4c92-8176-b76bc2437fcb)]
@@ -115,5 +115,6 @@
 
   Array<nsISVCBRecord> GetAllRecordsWithEchConfig(in boolean aNoHttp2,
                                                   in boolean aNoHttp3,
-                                                  out boolean aAllRecordsHaveEchConfig);
+                                                  out boolean aAllRecordsHaveEchConfig,
+                                                  out boolean aAllRecordsInH3ExcludedList);
 };
diff -Nru firefox-84.0.2+build1/netwerk/dns/nsIDNSRecord.idl firefox-85.0+build1/netwerk/dns/nsIDNSRecord.idl
--- firefox-84.0.2+build1/netwerk/dns/nsIDNSRecord.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/nsIDNSRecord.idl	2021-01-18 19:58:18.000000000 +0000
@@ -128,4 +128,9 @@
      * Thee time is measured in milliseconds.
      */
     readonly attribute double trrFetchDurationNetworkOnly;
+
+    /**
+     * The TRR mode this record is used.
+     */
+    readonly attribute unsigned long effectiveTRRMode;
 };
diff -Nru firefox-84.0.2+build1/netwerk/dns/PDNSRequestParams.ipdlh firefox-85.0+build1/netwerk/dns/PDNSRequestParams.ipdlh
--- firefox-84.0.2+build1/netwerk/dns/PDNSRequestParams.ipdlh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/PDNSRequestParams.ipdlh	2021-01-18 19:58:18.000000000 +0000
@@ -23,6 +23,7 @@
   double trrFetchDuration;
   double trrFetchDurationNetworkOnly;
   bool isTRR;
+  uint32_t effectiveTRRMode;
 };
 
 union DNSRequestResponse
diff -Nru firefox-84.0.2+build1/netwerk/dns/punycode.c firefox-85.0+build1/netwerk/dns/punycode.c
--- firefox-84.0.2+build1/netwerk/dns/punycode.c	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/punycode.c	2021-01-18 19:58:18.000000000 +0000
@@ -51,8 +51,10 @@
 /* base-1, or base if cp is does not represent a value.       */
 
 static punycode_uint decode_digit(punycode_uint cp) {
-  return cp - 48 < 10 ? cp - 22
-                      : cp - 65 < 26 ? cp - 65 : cp - 97 < 26 ? cp - 97 : base;
+  return cp - 48 < 10   ? cp - 22
+         : cp - 65 < 26 ? cp - 65
+         : cp - 97 < 26 ? cp - 97
+                        : base;
 }
 
 /* encode_digit(d,flag) returns the basic code point whose value      */
@@ -186,7 +188,8 @@
             return punycode_big_output;
           }
           t = k <= bias /* + tmin */ ? tmin : /* +tmin not needed */
-                  k >= bias + tmax ? tmax : k - bias;
+                  k >= bias + tmax ? tmax
+                                   : k - bias;
           if (q < t) {
             break;
           }
@@ -277,7 +280,8 @@
       }
       i += digit * w;
       t = k <= bias /* + tmin */ ? tmin : /* +tmin not needed */
-              k >= bias + tmax ? tmax : k - bias;
+              k >= bias + tmax ? tmax
+                               : k - bias;
       if (digit < t) {
         break;
       }
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRR.cpp firefox-85.0+build1/netwerk/dns/TRR.cpp
--- firefox-84.0.2+build1/netwerk/dns/TRR.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRR.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -41,6 +41,7 @@
 namespace net {
 
 #undef LOG
+#undef LOG_ENABLED
 extern mozilla::LazyLogModule gHostResolverLog;
 #define LOG(args) MOZ_LOG(gHostResolverLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() \
@@ -49,8 +50,6 @@
 NS_IMPL_ISUPPORTS(TRR, nsIHttpPushListener, nsIInterfaceRequestor,
                   nsIStreamListener, nsIRunnable)
 
-const uint8_t kDNS_CLASS_IN = 1;
-
 NS_IMETHODIMP
 TRR::Notify(nsITimer* aTimer) {
   if (aTimer == mTimeout) {
@@ -63,103 +62,6 @@
   return NS_OK;
 }
 
-// convert a given host request to a DOH 'body'
-//
-nsresult TRR::DohEncode(nsCString& aBody, bool aDisableECS) {
-  aBody.Truncate();
-  // Header
-  aBody += '\0';
-  aBody += '\0';  // 16 bit id
-  aBody += 0x01;  // |QR|   Opcode  |AA|TC|RD| Set the RD bit
-  aBody += '\0';  // |RA|   Z    |   RCODE   |
-  aBody += '\0';
-  aBody += 1;  // QDCOUNT (number of entries in the question section)
-  aBody += '\0';
-  aBody += '\0';  // ANCOUNT
-  aBody += '\0';
-  aBody += '\0';  // NSCOUNT
-
-  aBody += '\0';                    // ARCOUNT
-  aBody += aDisableECS ? 1 : '\0';  // ARCOUNT low byte for EDNS(0)
-
-  // Question
-
-  // The input host name should be converted to a sequence of labels, where
-  // each label consists of a length octet followed by that number of
-  // octets.  The domain name terminates with the zero length octet for the
-  // null label of the root.
-  // Followed by 16 bit QTYPE and 16 bit QCLASS
-
-  int32_t index = 0;
-  int32_t offset = 0;
-  do {
-    bool dotFound = false;
-    int32_t labelLength;
-    index = mHost.FindChar('.', offset);
-    if (kNotFound != index) {
-      dotFound = true;
-      labelLength = index - offset;
-    } else {
-      labelLength = mHost.Length() - offset;
-    }
-    if (labelLength > 63) {
-      // too long label!
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    if (labelLength > 0) {
-      aBody += static_cast<unsigned char>(labelLength);
-      nsDependentCSubstring label = Substring(mHost, offset, labelLength);
-      aBody.Append(label);
-    }
-    if (!dotFound) {
-      aBody += '\0';  // terminate with a final zero
-      break;
-    }
-    offset += labelLength + 1;  // move over label and dot
-  } while (true);
-
-  aBody += static_cast<uint8_t>(mType >> 8);  // upper 8 bit TYPE
-  aBody += static_cast<uint8_t>(mType);
-  aBody += '\0';           // upper 8 bit CLASS
-  aBody += kDNS_CLASS_IN;  // IN - "the Internet"
-
-  if (aDisableECS) {
-    // EDNS(0) is RFC 6891, ECS is RFC 7871
-    aBody += '\0';  // NAME       | domain name  | MUST be 0 (root domain) |
-    aBody += '\0';
-    aBody += 41;  // TYPE       | u_int16_t    | OPT (41)                     |
-    aBody += 16;  // CLASS      | u_int16_t    | requestor's UDP payload size |
-    aBody +=
-        '\0';  // advertise 4K (high-byte: 16 | low-byte: 0), ignored by DoH
-    aBody += '\0';  // TTL        | u_int32_t    | extended RCODE and flags |
-    aBody += '\0';
-    aBody += '\0';
-    aBody += '\0';
-
-    aBody += '\0';  // upper 8 bit RDLEN
-    aBody += 8;  // RDLEN      | u_int16_t    | length of all RDATA          |
-
-    // RDATA      | octet stream | {attribute,value} pairs      |
-    // The RDATA is just the ECS option setting zero subnet prefix
-
-    aBody += '\0';  // upper 8 bit OPTION-CODE ECS
-    aBody += 8;     // OPTION-CODE, 2 octets, for ECS is 8
-
-    aBody += '\0';  // upper 8 bit OPTION-LENGTH
-    aBody += 4;  // OPTION-LENGTH, 2 octets, contains the length of the payload
-                 // after OPTION-LENGTH
-    aBody += '\0';  // upper 8 bit FAMILY. IANA Address Family Numbers registry,
-                    // not the AF_* constants!
-    aBody += 1;     // FAMILY (Ipv4), 2 octets
-
-    aBody += '\0';  // SOURCE PREFIX-LENGTH      |     SCOPE PREFIX-LENGTH |
-    aBody += '\0';
-
-    // ADDRESS, minimum number of octets == nothing because zero bits
-  }
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 TRR::Run() {
   MOZ_ASSERT_IF(XRE_IsParentProcess() && gTRRService,
@@ -283,7 +185,7 @@
 
   if (useGet) {
     nsAutoCString tmp;
-    rv = DohEncode(tmp, disableECS);
+    rv = DNSPacket::EncodeRequest(tmp, mHost, mType, disableECS);
     NS_ENSURE_SUCCESS(rv, rv);
 
     /* For GET requests, the outgoing packet needs to be Base64url-encoded and
@@ -322,7 +224,7 @@
     rv = NS_MutateURI(dnsURI).SetQuery(query).Finalize(dnsURI);
     LOG(("TRR::SendHTTPRequest GET dns=%s\n", body.get()));
   } else {
-    rv = DohEncode(body, disableECS);
+    rv = DNSPacket::EncodeRequest(body, mHost, mType, disableECS);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsAutoCString uri;
@@ -387,8 +289,6 @@
   rv = internalChannel->SetIsTRRServiceChannel(true);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mAllowRFC1918 = StaticPrefs::network_trr_allow_rfc1918();
-
   if (useGet) {
     rv = httpChannel->SetRequestMethod("GET"_ns);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -693,651 +593,6 @@
   return NS_OK;
 }
 
-static uint16_t get16bit(const unsigned char* aData, unsigned int index) {
-  return ((aData[index] << 8) | aData[index + 1]);
-}
-
-static uint32_t get32bit(const unsigned char* aData, unsigned int index) {
-  return (aData[index] << 24) | (aData[index + 1] << 16) |
-         (aData[index + 2] << 8) | aData[index + 3];
-}
-
-nsresult TRR::PassQName(unsigned int& index) {
-  uint8_t length;
-  do {
-    if (mBodySize < (index + 1)) {
-      LOG(("TRR: PassQName:%d fail at index %d\n", __LINE__, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    length = static_cast<uint8_t>(mResponse[index]);
-    if ((length & 0xc0) == 0xc0) {
-      // name pointer, advance over it and be done
-      if (mBodySize < (index + 2)) {
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-      index += 2;
-      break;
-    }
-    if (length & 0xc0) {
-      LOG(("TRR: illegal label length byte (%x) at index %d\n", length, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    // pass label
-    if (mBodySize < (index + 1 + length)) {
-      LOG(("TRR: PassQName:%d fail at index %d\n", __LINE__, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    index += 1 + length;
-  } while (length);
-  return NS_OK;
-}
-
-// GetQname: retrieves the qname (stores in 'aQname') and stores the index
-// after qname was parsed into the 'aIndex'.
-
-nsresult TRR::GetQname(nsACString& aQname, unsigned int& aIndex) {
-  uint8_t clength = 0;
-  unsigned int cindex = aIndex;
-  unsigned int loop = 128;    // a valid DNS name can never loop this much
-  unsigned int endindex = 0;  // index position after this data
-  do {
-    if (cindex >= mBodySize) {
-      LOG(("TRR: bad Qname packet\n"));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    clength = static_cast<uint8_t>(mResponse[cindex]);
-    if ((clength & 0xc0) == 0xc0) {
-      // name pointer, get the new offset (14 bits)
-      if ((cindex + 1) >= mBodySize) {
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-      // extract the new index position for the next label
-      uint16_t newpos = (clength & 0x3f) << 8 | mResponse[cindex + 1];
-      if (!endindex) {
-        // only update on the first "jump"
-        endindex = cindex + 2;
-      }
-      cindex = newpos;
-      continue;
-    }
-    if (clength & 0xc0) {
-      // any of those bits set individually is an error
-      LOG(("TRR: bad Qname packet\n"));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    cindex++;
-
-    if (clength) {
-      if (!aQname.IsEmpty()) {
-        aQname.Append(".");
-      }
-      if ((cindex + clength) > mBodySize) {
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-      aQname.Append((const char*)(&mResponse[cindex]), clength);
-      cindex += clength;  // skip label
-    }
-  } while (clength && --loop);
-
-  if (!loop) {
-    LOG(("TRR::DohDecode pointer loop error\n"));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-  if (!endindex) {
-    // there was no "jump"
-    endindex = cindex;
-  }
-  aIndex = endindex;
-  return NS_OK;
-}
-
-//
-// DohDecode() collects the TTL and the IP addresses in the response
-//
-nsresult TRR::DohDecode(nsCString& aHost) {
-  // The response has a 12 byte header followed by the question (returned)
-  // and then the answer. The answer section itself contains the name, type
-  // and class again and THEN the record data.
-
-  // www.example.com response:
-  // header:
-  // abcd 8180 0001 0001 0000 0000
-  // the question:
-  // 0377 7777 0765 7861 6d70 6c65 0363 6f6d 0000 0100 01
-  // the answer:
-  // 03 7777 7707 6578 616d 706c 6503 636f 6d00 0001 0001
-  // 0000 0080 0004 5db8 d822
-
-  unsigned int index = 12;
-  uint8_t length;
-  nsAutoCString host;
-  nsresult rv;
-
-  LOG(("doh decode %s %d bytes\n", aHost.get(), mBodySize));
-
-  mCname.Truncate();
-
-  if (mBodySize < 12 || mResponse[0] || mResponse[1]) {
-    LOG(("TRR bad incoming DOH, eject!\n"));
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-  uint8_t rcode = mResponse[3] & 0x0F;
-  LOG(("TRR Decode %s RCODE %d\n", aHost.get(), rcode));
-  if (rcode) {
-    RecordReason(nsHostRecord::TRR_RCODE_FAIL);
-  }
-
-  uint16_t questionRecords = get16bit(mResponse, 4);  // qdcount
-  // iterate over the single(?) host name in question
-  while (questionRecords) {
-    do {
-      if (mBodySize < (index + 1)) {
-        LOG(("TRR Decode 1 index: %u size: %u", index, mBodySize));
-        return NS_ERROR_ILLEGAL_VALUE;
-      }
-      length = static_cast<uint8_t>(mResponse[index]);
-      if (length) {
-        if (host.Length()) {
-          host.Append(".");
-        }
-        if (mBodySize < (index + 1 + length)) {
-          LOG(("TRR Decode 2 index: %u size: %u len: %u", index, mBodySize,
-               length));
-          return NS_ERROR_ILLEGAL_VALUE;
-        }
-        host.Append(((char*)mResponse) + index + 1, length);
-      }
-      index += 1 + length;  // skip length byte + label
-    } while (length);
-    if (mBodySize < (index + 4)) {
-      LOG(("TRR Decode 3 index: %u size: %u", index, mBodySize));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    index += 4;  // skip question's type, class
-    questionRecords--;
-  }
-
-  // Figure out the number of answer records from ANCOUNT
-  uint16_t answerRecords = get16bit(mResponse, 6);
-
-  LOG(("TRR Decode: %d answer records (%u bytes body) %s index=%u\n",
-       answerRecords, mBodySize, host.get(), index));
-
-  while (answerRecords) {
-    nsAutoCString qname;
-    rv = GetQname(qname, index);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-    // 16 bit TYPE
-    if (mBodySize < (index + 2)) {
-      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index + 2));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint16_t TYPE = get16bit(mResponse, index);
-
-    if ((TYPE != TRRTYPE_CNAME) && (TYPE != TRRTYPE_HTTPSSVC) &&
-        (TYPE != static_cast<uint16_t>(mType))) {
-      // Not the same type as was asked for nor CNAME
-      LOG(("TRR: Dohdecode:%d asked for type %d got %d\n", __LINE__, mType,
-           TYPE));
-      return NS_ERROR_UNEXPECTED;
-    }
-    index += 2;
-
-    // 16 bit class
-    if (mBodySize < (index + 2)) {
-      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index + 2));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint16_t CLASS = get16bit(mResponse, index);
-    if (kDNS_CLASS_IN != CLASS) {
-      LOG(("TRR bad CLASS (%u) at index %d\n", CLASS, index));
-      return NS_ERROR_UNEXPECTED;
-    }
-    index += 2;
-
-    // 32 bit TTL (seconds)
-    if (mBodySize < (index + 4)) {
-      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint32_t TTL = get32bit(mResponse, index);
-    index += 4;
-
-    // 16 bit RDLENGTH
-    if (mBodySize < (index + 2)) {
-      LOG(("TRR: Dohdecode:%d fail at index %d\n", __LINE__, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint16_t RDLENGTH = get16bit(mResponse, index);
-    index += 2;
-
-    if (mBodySize < (index + RDLENGTH)) {
-      LOG(("TRR: Dohdecode:%d fail RDLENGTH=%d at index %d\n", __LINE__,
-           RDLENGTH, index));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    // We check if the qname is a case-insensitive match for the host or the
-    // FQDN version of the host
-    bool responseMatchesQuestion =
-        (qname.Length() == aHost.Length() ||
-         (aHost.Length() == qname.Length() + 1 && aHost.Last() == '.')) &&
-        qname.Compare(aHost.BeginReading(), true, qname.Length()) == 0;
-
-    if (responseMatchesQuestion) {
-      // RDATA
-      // - A (TYPE 1):  4 bytes
-      // - AAAA (TYPE 28): 16 bytes
-      // - NS (TYPE 2): N bytes
-
-      switch (TYPE) {
-        case TRRTYPE_A:
-          if (RDLENGTH != 4) {
-            LOG(("TRR bad length for A (%u)\n", RDLENGTH));
-            return NS_ERROR_UNEXPECTED;
-          }
-          rv = mDNS.Add(TTL, mResponse, index, RDLENGTH, mAllowRFC1918);
-          if (NS_FAILED(rv)) {
-            LOG(
-                ("TRR:DohDecode failed: local IP addresses or unknown IP "
-                 "family\n"));
-            return rv;
-          }
-          break;
-        case TRRTYPE_AAAA:
-          if (RDLENGTH != 16) {
-            LOG(("TRR bad length for AAAA (%u)\n", RDLENGTH));
-            return NS_ERROR_UNEXPECTED;
-          }
-          rv = mDNS.Add(TTL, mResponse, index, RDLENGTH, mAllowRFC1918);
-          if (NS_FAILED(rv)) {
-            LOG(("TRR got unique/local IPv6 address!\n"));
-            return rv;
-          }
-          break;
-
-        case TRRTYPE_NS:
-          break;
-        case TRRTYPE_CNAME:
-          if (mCname.IsEmpty()) {
-            nsAutoCString qname;
-            unsigned int qnameindex = index;
-            rv = GetQname(qname, qnameindex);
-            if (NS_FAILED(rv)) {
-              return rv;
-            }
-            if (!qname.IsEmpty()) {
-              ToLowerCase(qname);
-              mCname = qname;
-              LOG(("TRR::DohDecode CNAME host %s => %s\n", host.get(),
-                   mCname.get()));
-            } else {
-              LOG(("TRR::DohDecode empty CNAME for host %s!\n", host.get()));
-            }
-          } else {
-            LOG(("TRR::DohDecode CNAME - ignoring another entry\n"));
-          }
-          break;
-        case TRRTYPE_TXT: {
-          // TXT record RRDATA sections are a series of character-strings
-          // each character string is a length byte followed by that many data
-          // bytes
-          nsAutoCString txt;
-          unsigned int txtIndex = index;
-          uint16_t available = RDLENGTH;
-
-          while (available > 0) {
-            uint8_t characterStringLen = mResponse[txtIndex++];
-            available--;
-            if (characterStringLen > available) {
-              LOG(("TRR::DohDecode MALFORMED TXT RECORD\n"));
-              break;
-            }
-            txt.Append((const char*)(&mResponse[txtIndex]), characterStringLen);
-            txtIndex += characterStringLen;
-            available -= characterStringLen;
-          }
-
-          if (!mResult.is<TypeRecordTxt>()) {
-            mResult = AsVariant(CopyableTArray<nsCString>());
-          }
-
-          {
-            auto& results = mResult.as<TypeRecordTxt>();
-            results.AppendElement(txt);
-          }
-          if (mTTL > TTL) {
-            mTTL = TTL;
-          }
-          LOG(("TRR::DohDecode TXT host %s => %s\n", host.get(), txt.get()));
-
-          break;
-        }
-        case TRRTYPE_HTTPSSVC: {
-          struct SVCB parsed;
-          int32_t lastSvcParamKey = -1;
-
-          unsigned int svcbIndex = index;
-          CheckedInt<uint16_t> available = RDLENGTH;
-
-          // Should have at least 2 bytes for the priority and one for the
-          // qname length.
-          if (available.value() < 3) {
-            return NS_ERROR_UNEXPECTED;
-          }
-
-          parsed.mSvcFieldPriority = get16bit(mResponse, svcbIndex);
-          svcbIndex += 2;
-
-          rv = GetQname(parsed.mSvcDomainName, svcbIndex);
-          if (NS_FAILED(rv)) {
-            return rv;
-          }
-
-          if (parsed.mSvcDomainName.IsEmpty()) {
-            if (parsed.mSvcFieldPriority == 0) {
-              // For AliasMode SVCB RRs, a TargetName of "." indicates that the
-              // service is not available or does not exist.
-              continue;
-            }
-
-            // For ServiceMode SVCB RRs, if TargetName has the value ".",
-            // then the owner name of this record MUST be used as
-            // the effective TargetName.
-            parsed.mSvcDomainName = qname;
-          }
-
-          available -= (svcbIndex - index);
-          if (!available.isValid()) {
-            return NS_ERROR_UNEXPECTED;
-          }
-          while (available.value() >= 4) {
-            // Every SvcFieldValues must have at least 4 bytes for the
-            // SvcParamKey (2 bytes) and length of SvcParamValue (2 bytes)
-            // If the length ever goes above the available data, meaning if
-            // available ever underflows, then that is an error.
-            struct SvcFieldValue value;
-            uint16_t key = get16bit(mResponse, svcbIndex);
-            svcbIndex += 2;
-
-            // 2.2 Clients MUST consider an RR malformed if SvcParamKeys are
-            // not in strictly increasing numeric order.
-            if (key <= lastSvcParamKey) {
-              LOG(("SvcParamKeys not in increasing order"));
-              return NS_ERROR_UNEXPECTED;
-            }
-            lastSvcParamKey = key;
-
-            uint16_t len = get16bit(mResponse, svcbIndex);
-            svcbIndex += 2;
-
-            available -= 4 + len;
-            if (!available.isValid()) {
-              return NS_ERROR_UNEXPECTED;
-            }
-
-            rv = ParseSvcParam(svcbIndex, key, value, len);
-            if (NS_FAILED(rv)) {
-              return rv;
-            }
-            svcbIndex += len;
-
-            // If this is an unknown key, we will simply ignore it.
-            // We also don't need to record SvcParamKeyMandatory
-            if (key == SvcParamKeyMandatory || key > SvcParamKeyLast) {
-              continue;
-            }
-
-            if (value.mValue.is<SvcParamIpv4Hint>() ||
-                value.mValue.is<SvcParamIpv6Hint>()) {
-              parsed.mHasIPHints = true;
-            }
-            if (value.mValue.is<SvcParamEchConfig>()) {
-              parsed.mHasEchConfig = true;
-              parsed.mEchConfig = value.mValue.as<SvcParamEchConfig>().mValue;
-            }
-            parsed.mSvcFieldValue.AppendElement(value);
-          }
-
-          // Check for AliasForm
-          if (mCname.IsEmpty() && parsed.mSvcFieldPriority == 0) {
-            // Alias form SvcDomainName must not have the "." value (empty)
-            if (parsed.mSvcDomainName.IsEmpty()) {
-              return NS_ERROR_UNEXPECTED;
-            }
-            mCname = parsed.mSvcDomainName;
-            ToLowerCase(mCname);
-            LOG(("TRR::DohDecode HTTPSSVC AliasForm host %s => %s\n",
-                 host.get(), mCname.get()));
-            break;
-          }
-
-          if (mType != TRRTYPE_HTTPSSVC) {
-            // Ignore the entry that we just parsed if we didn't ask for it.
-            break;
-          }
-
-          if (!mResult.is<TypeRecordHTTPSSVC>()) {
-            mResult = mozilla::AsVariant(CopyableTArray<SVCB>());
-          }
-          {
-            auto& results = mResult.as<TypeRecordHTTPSSVC>();
-            results.AppendElement(parsed);
-            StoreIPHintAsDNSRecord(parsed);
-          }
-          break;
-        }
-        default:
-          // skip unknown record types
-          LOG(("TRR unsupported TYPE (%u) RDLENGTH %u\n", TYPE, RDLENGTH));
-          break;
-      }
-    } else {
-      LOG(("TRR asked for %s data but got %s\n", aHost.get(), qname.get()));
-    }
-
-    index += RDLENGTH;
-    LOG(("done with record type %u len %u index now %u of %u\n", TYPE, RDLENGTH,
-         index, mBodySize));
-    answerRecords--;
-  }
-
-  // NSCOUNT
-  uint16_t nsRecords = get16bit(mResponse, 8);
-  LOG(("TRR Decode: %d ns records (%u bytes body)\n", nsRecords, mBodySize));
-  while (nsRecords) {
-    rv = PassQName(index);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    if (mBodySize < (index + 8)) {
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    index += 2;  // type
-    index += 2;  // class
-    index += 4;  // ttl
-
-    // 16 bit RDLENGTH
-    if (mBodySize < (index + 2)) {
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint16_t RDLENGTH = get16bit(mResponse, index);
-    index += 2;
-    if (mBodySize < (index + RDLENGTH)) {
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    index += RDLENGTH;
-    LOG(("done with nsRecord now %u of %u\n", index, mBodySize));
-    nsRecords--;
-  }
-
-  // additional resource records
-  uint16_t arRecords = get16bit(mResponse, 10);
-  LOG(("TRR Decode: %d additional resource records (%u bytes body)\n",
-       arRecords, mBodySize));
-
-  nsClassHashtable<nsCStringHashKey, DOHresp> additionalRecords;
-  while (arRecords) {
-    nsAutoCString qname;
-    rv = GetQname(qname, index);
-    if (NS_FAILED(rv)) {
-      LOG(("Bad qname for additional record"));
-      return rv;
-    }
-
-    if (mBodySize < (index + 8)) {
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-    uint16_t type = get16bit(mResponse, index);
-    index += 2;
-    // The next two bytes encode class
-    // (or udpPayloadSize when type is TRRTYPE_OPT)
-    uint16_t cls = get16bit(mResponse, index);
-    index += 2;
-    // The next 4 bytes encode TTL
-    // (or extRCode + ednsVersion + flags when type is TRRTYPE_OPT)
-    uint32_t ttl = get32bit(mResponse, index);
-    index += 4;
-    // cls and ttl are unused when type is TRRTYPE_OPT
-
-    // 16 bit RDLENGTH
-    if (mBodySize < (index + 2)) {
-      LOG(("Record too small"));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    uint16_t rdlength = get16bit(mResponse, index);
-    index += 2;
-    if (mBodySize < (index + rdlength)) {
-      LOG(("rdlength too big"));
-      return NS_ERROR_ILLEGAL_VALUE;
-    }
-
-    auto parseRecord = [&]() {
-      LOG(("Parsing additional record type: %u", type));
-      auto& entry = additionalRecords.GetOrInsert(qname);
-      if (!entry) {
-        entry.reset(new DOHresp());
-      }
-
-      switch (type) {
-        case TRRTYPE_A:
-          if (kDNS_CLASS_IN != cls) {
-            LOG(("NOT IN - returning"));
-            return;
-          }
-          if (rdlength != 4) {
-            LOG(("TRR bad length for A (%u)\n", rdlength));
-            return;
-          }
-          rv = entry->Add(ttl, mResponse, index, rdlength, mAllowRFC1918);
-          if (NS_FAILED(rv)) {
-            LOG(
-                ("TRR:DohDecode failed: local IP addresses or unknown IP "
-                 "family\n"));
-            return;
-          }
-          break;
-        case TRRTYPE_AAAA:
-          if (kDNS_CLASS_IN != cls) {
-            LOG(("NOT IN - returning"));
-            return;
-          }
-          if (rdlength != 16) {
-            LOG(("TRR bad length for AAAA (%u)\n", rdlength));
-            return;
-          }
-          rv = entry->Add(ttl, mResponse, index, rdlength, mAllowRFC1918);
-          if (NS_FAILED(rv)) {
-            LOG(("TRR got unique/local IPv6 address!\n"));
-            return;
-          }
-          break;
-        case TRRTYPE_OPT: {  // OPT
-          LOG(("Parsing opt rdlen: %u", rdlength));
-          unsigned int offset = 0;
-          while (offset + 2 <= rdlength) {
-            uint16_t optCode = get16bit(mResponse, index + offset);
-            LOG(("optCode: %u", optCode));
-            offset += 2;
-            if (offset + 2 > rdlength) {
-              break;
-            }
-            uint16_t optLen = get16bit(mResponse, index + offset);
-            LOG(("optLen: %u", optLen));
-            offset += 2;
-            if (offset + optLen > rdlength) {
-              LOG(("offset: %u, optLen: %u, rdlen: %u", offset, optLen,
-                   rdlength));
-              break;
-            }
-
-            LOG(("OPT: code: %u len:%u", optCode, optLen));
-
-            if (optCode != 15) {
-              offset += optLen;
-              continue;
-            }
-
-            // optCode == 15; Extended DNS error
-
-            if (offset + 2 > rdlength || optLen < 2) {
-              break;
-            }
-            mExtendedError = get16bit(mResponse, index + offset);
-
-            LOG((
-                "Extended error code: %u message: %s", mExtendedError,
-                nsAutoCString((char*)mResponse + index + offset + 2, optLen - 2)
-                    .get()));
-            offset += optLen;
-          }
-          break;
-        }
-        default:
-          break;
-      }
-    };
-
-    parseRecord();
-
-    index += rdlength;
-    LOG(("done with additional rr now %u of %u\n", index, mBodySize));
-    arRecords--;
-  }
-
-  SaveAdditionalRecords(additionalRecords);
-
-  if (index != mBodySize) {
-    LOG(("DohDecode failed to parse entire response body, %u out of %u bytes\n",
-         index, mBodySize));
-    // failed to parse 100%, do not continue
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
-  if ((mType != TRRTYPE_NS) && mCname.IsEmpty() && mDNS.mAddresses.IsEmpty() &&
-      mResult.is<TypeRecordEmpty>()) {
-    // no entries were stored!
-    LOG(("TRR: No entries were stored!\n"));
-    return NS_ERROR_FAILURE;
-  }
-
-  // https://tools.ietf.org/html/draft-ietf-dnsop-svcb-httpssvc-03#page-14
-  // If one or more SVCB records of ServiceForm SvcRecordType are returned for
-  // HOST, clients should select the highest-priority option with acceptable
-  // parameters.
-  if (mResult.is<TypeRecordHTTPSSVC>()) {
-    auto& results = mResult.as<TypeRecordHTTPSSVC>();
-    results.Sort();
-  }
-
-  return NS_OK;
-}
-
 void TRR::SaveAdditionalRecords(
     const nsClassHashtable<nsCStringHashKey, DOHresp>& aRecords) {
   if (!mRec) {
@@ -1377,105 +632,6 @@
   }
 }
 
-nsresult TRR::ParseSvcParam(unsigned int svcbIndex, uint16_t key,
-                            SvcFieldValue& field, uint16_t length) {
-  switch (key) {
-    case SvcParamKeyMandatory: {
-      if (length % 2 != 0) {
-        // This key should encode a list of uint16_t
-        return NS_ERROR_UNEXPECTED;
-      }
-      while (length > 0) {
-        uint16_t mandatoryKey = get16bit(mResponse, svcbIndex);
-        length -= 2;
-        svcbIndex += 2;
-
-        if (mandatoryKey > SvcParamKeyLast) {
-          LOG(("The mandatory field includes a key we don't support %u",
-               mandatoryKey));
-          return NS_ERROR_UNEXPECTED;
-        }
-      }
-      break;
-    }
-    case SvcParamKeyAlpn: {
-      field.mValue = AsVariant(SvcParamAlpn{
-          .mValue = nsCString((const char*)(&mResponse[svcbIndex]), length)});
-      break;
-    }
-    case SvcParamKeyNoDefaultAlpn: {
-      if (length != 0) {
-        // This key should not contain a value
-        return NS_ERROR_UNEXPECTED;
-      }
-      field.mValue = AsVariant(SvcParamNoDefaultAlpn{});
-      break;
-    }
-    case SvcParamKeyPort: {
-      if (length != 2) {
-        // This key should only encode a uint16_t
-        return NS_ERROR_UNEXPECTED;
-      }
-      field.mValue =
-          AsVariant(SvcParamPort{.mValue = get16bit(mResponse, svcbIndex)});
-      break;
-    }
-    case SvcParamKeyIpv4Hint: {
-      if (length % 4 != 0) {
-        // This key should only encode IPv4 addresses
-        return NS_ERROR_UNEXPECTED;
-      }
-
-      field.mValue = AsVariant(SvcParamIpv4Hint());
-      auto& ipv4array = field.mValue.as<SvcParamIpv4Hint>().mValue;
-      while (length > 0) {
-        NetAddr addr;
-        addr.inet.family = AF_INET;
-        addr.inet.port = 0;
-        addr.inet.ip = ntohl(get32bit(mResponse, svcbIndex));
-        ipv4array.AppendElement(addr);
-        length -= 4;
-        svcbIndex += 4;
-      }
-      break;
-    }
-    case SvcParamKeyEchConfig: {
-      field.mValue = AsVariant(SvcParamEchConfig{
-          .mValue = nsCString((const char*)(&mResponse[svcbIndex]), length)});
-      break;
-    }
-    case SvcParamKeyIpv6Hint: {
-      if (length % 16 != 0) {
-        // This key should only encode IPv6 addresses
-        return NS_ERROR_UNEXPECTED;
-      }
-
-      field.mValue = AsVariant(SvcParamIpv6Hint());
-      auto& ipv6array = field.mValue.as<SvcParamIpv6Hint>().mValue;
-      while (length > 0) {
-        NetAddr addr;
-        addr.inet6.family = AF_INET6;
-        addr.inet6.port = 0;      // unknown
-        addr.inet6.flowinfo = 0;  // unknown
-        addr.inet6.scope_id = 0;  // unknown
-        for (int i = 0; i < 16; i++, svcbIndex++) {
-          addr.inet6.ip.u8[i] = mResponse[svcbIndex];
-        }
-        ipv6array.AppendElement(addr);
-        length -= 16;
-        // no need to increase svcbIndex - we did it in the for above.
-      }
-      break;
-    }
-    default: {
-      // Unespected type. We'll just ignore it.
-      return NS_OK;
-      break;
-    }
-  }
-  return NS_OK;
-}
-
 void TRR::StoreIPHintAsDNSRecord(const struct SVCB& aSVCBRecord) {
   LOG(("TRR::StoreIPHintAsDNSRecord [%p] [%s]", this,
        aSVCBRecord.mSvcDomainName.get()));
@@ -1553,31 +709,6 @@
   return NS_OK;
 }
 
-// https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-extended-error-16#section-4
-// This is a list of errors for which we should not fallback to Do53.
-// These are normally DNSSEC failures or explicit filtering performed by the
-// recursive resolver.
-bool hardFail(uint16_t code) {
-  const uint16_t noFallbackErrors[] = {
-      4,   // Forged answer (malware filtering)
-      6,   // DNSSEC Boggus
-      7,   // Signature expired
-      8,   // Signature not yet valid
-      9,   // DNSKEY Missing
-      10,  // RRSIG missing
-      11,  // No ZONE Key Bit set
-      12,  // NSEC Missing
-      17,  // Filtered
-  };
-
-  for (const auto& err : noFallbackErrors) {
-    if (code == err) {
-      return true;
-    }
-  }
-  return false;
-}
-
 nsresult TRR::FailData(nsresult error) {
   if (!mHostResolver) {
     return NS_ERROR_FAILURE;
@@ -1586,10 +717,6 @@
   // If we didn't record a reason until now, record a default one.
   RecordReason(nsHostRecord::TRR_FAILED);
 
-  if (mExtendedError != UINT16_MAX && hardFail(mExtendedError)) {
-    error = NS_ERROR_DEFINITIVE_UNKNOWN_HOST;
-  }
-
   if (mType == TRRTYPE_TXT || mType == TRRTYPE_HTTPSSVC) {
     TypeRecordResultType empty(Nothing{});
     (void)mHostResolver->CompleteLookupByType(mRec, error, empty, 0, mPB);
@@ -1621,7 +748,10 @@
 
     LOG(("TRR: check for CNAME record for %s within previous response\n",
          cname.get()));
-    rv = DohDecode(cname);
+    nsClassHashtable<nsCStringHashKey, DOHresp> additionalRecords;
+    rv = mPacket.Decode(
+        cname, mType, mCname, StaticPrefs::network_trr_allow_rfc1918(),
+        mTRRSkippedReason, mDNS, mResult, additionalRecords, mTTL);
     if (NS_FAILED(rv)) {
       LOG(("TRR::On200Response DohDecode %x\n", (int)rv));
     }
@@ -1651,12 +781,23 @@
 
 nsresult TRR::On200Response(nsIChannel* aChannel) {
   // decode body and create an AddrInfo struct for the response
-  nsresult rv = DohDecode(mHost);
+  nsClassHashtable<nsCStringHashKey, DOHresp> additionalRecords;
+  nsresult rv = mPacket.Decode(
+      mHost, mType, mCname, StaticPrefs::network_trr_allow_rfc1918(),
+      mTRRSkippedReason, mDNS, mResult, additionalRecords, mTTL);
 
   if (NS_FAILED(rv)) {
     LOG(("TRR::On200Response DohDecode %x\n", (int)rv));
     RecordReason(nsHostRecord::TRR_DECODE_FAILED);
-    return NS_ERROR_FAILURE;
+    return rv;
+  }
+  SaveAdditionalRecords(additionalRecords);
+
+  if (mResult.is<TypeRecordHTTPSSVC>()) {
+    auto& results = mResult.as<TypeRecordHTTPSSVC>();
+    for (const auto& rec : results) {
+      StoreIPHintAsDNSRecord(rec);
+    }
   }
 
   if (!mDNS.mAddresses.IsEmpty() || mType == TRRTYPE_TXT || mCname.IsEmpty()) {
@@ -1714,13 +855,13 @@
                                                      : TRRService::OKAY_BAD);
   }
 
+  nsresult rv = NS_OK;
   // if status was "fine", parse the response and pass on the answer
   if (!mFailed && NS_SUCCEEDED(aStatusCode)) {
     nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(aRequest);
     if (!httpChannel) {
       return NS_ERROR_UNEXPECTED;
     }
-    nsresult rv = NS_OK;
     nsAutoCString contentType;
     httpChannel->GetContentType(contentType);
     if (contentType.Length() &&
@@ -1749,7 +890,7 @@
 
   LOG(("TRR:OnStopRequest %p status %x mFailed %d\n", this, (int)aStatusCode,
        mFailed));
-  FailData(NS_ERROR_UNKNOWN_HOST);
+  FailData(NS_SUCCEEDED(rv) ? NS_ERROR_UNKNOWN_HOST : rv);
   return NS_OK;
 }
 
@@ -1763,63 +904,13 @@
     return NS_ERROR_FAILURE;
   }
 
-  if (aCount + mBodySize > kMaxSize) {
-    LOG(("TRR::OnDataAvailable:%d fail\n", __LINE__));
-    mFailed = true;
-    return NS_ERROR_FAILURE;
-  }
-
-  uint32_t count;
   nsresult rv =
-      aInputStream->Read((char*)mResponse + mBodySize, aCount, &count);
+      mPacket.OnDataAvailable(aRequest, aInputStream, aOffset, aCount);
   if (NS_FAILED(rv)) {
     LOG(("TRR::OnDataAvailable:%d fail\n", __LINE__));
     mFailed = true;
     return rv;
   }
-  MOZ_ASSERT(count == aCount);
-  mBodySize += aCount;
-  return NS_OK;
-}
-
-nsresult DOHresp::Add(uint32_t TTL, unsigned char* dns, unsigned int index,
-                      uint16_t len, bool aLocalAllowed) {
-  NetAddr addr;
-  if (4 == len) {
-    // IPv4
-    addr.inet.family = AF_INET;
-    addr.inet.port = 0;  // unknown
-    addr.inet.ip = ntohl(get32bit(dns, index));
-  } else if (16 == len) {
-    // IPv6
-    addr.inet6.family = AF_INET6;
-    addr.inet6.port = 0;      // unknown
-    addr.inet6.flowinfo = 0;  // unknown
-    addr.inet6.scope_id = 0;  // unknown
-    for (int i = 0; i < 16; i++, index++) {
-      addr.inet6.ip.u8[i] = dns[index];
-    }
-  } else {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  if (addr.IsIPAddrLocal() && !aLocalAllowed) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // While the DNS packet might return individual TTLs for each address,
-  // we can only return one value in the AddrInfo class so pick the
-  // lowest number.
-  if (mTtl < TTL) {
-    mTtl = TTL;
-  }
-
-  if (LOG_ENABLED()) {
-    char buf[128];
-    addr.ToStringBuffer(buf, sizeof(buf));
-    LOG(("DOHresp:Add %s\n", buf));
-  }
-  mAddresses.AppendElement(addr);
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRR.h firefox-85.0+build1/netwerk/dns/TRR.h
--- firefox-84.0.2+build1/netwerk/dns/TRR.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRR.h	2021-01-18 19:58:18.000000000 +0000
@@ -17,33 +17,15 @@
 #include "nsHostResolver.h"
 #include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
+#include "DNSPacket.h"
 
 namespace mozilla {
 namespace net {
 
-// the values map to RFC1035 type identifiers
-enum TrrType {
-  TRRTYPE_A = 1,
-  TRRTYPE_NS = 2,
-  TRRTYPE_CNAME = 5,
-  TRRTYPE_AAAA = 28,
-  TRRTYPE_OPT = 41,
-  TRRTYPE_TXT = 16,
-  TRRTYPE_HTTPSSVC = nsIDNSService::RESOLVE_TYPE_HTTPSSVC,  // 65
-};
-
 class TRRService;
 class TRRServiceChannel;
 extern TRRService* gTRRService;
 
-class DOHresp {
- public:
-  nsresult Add(uint32_t TTL, unsigned char* dns, unsigned int index,
-               uint16_t len, bool aLocalAllowed);
-  nsTArray<NetAddr> mAddresses;
-  uint32_t mTtl = UINT32_MAX;
-};
-
 class TRR : public Runnable,
             public nsITimerCallback,
             public nsIHttpPushListener,
@@ -57,10 +39,6 @@
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSITIMERCALLBACK
 
-  // Never accept larger DOH responses than this as that would indicate
-  // something is wrong. Typical ones are much smaller.
-  static const unsigned int kMaxSize = 3200;
-
   // Number of "steps" we follow CNAME chains
   static const unsigned int kCnameChaseMax = 64;
 
@@ -126,10 +104,6 @@
  private:
   ~TRR() = default;
   nsresult SendHTTPRequest();
-  nsresult DohEncode(nsCString& aBody, bool aDisableECS);
-  nsresult PassQName(unsigned int& index);
-  nsresult GetQname(nsACString& aQname, unsigned int& aIndex);
-  nsresult DohDecode(nsCString& aHost);
   nsresult ReturnData(nsIChannel* aChannel);
 
   // FailData() must be called to signal that the asynch TRR resolve is
@@ -139,8 +113,8 @@
   // other error codes must be used. This distinction is important for the
   // subsequent logic to separate the error reasons.
   nsresult FailData(nsresult error);
-  nsresult DohDecodeQuery(const nsCString& query, nsCString& host,
-                          enum TrrType& type);
+  static nsresult DohDecodeQuery(const nsCString& query, nsCString& host,
+                                 enum TrrType& type);
   nsresult ReceivePush(nsIHttpChannel* pushed, nsHostRecord* pushedRec);
   nsresult On200Response(nsIChannel* aChannel);
   nsresult FollowCname(nsIChannel* aChannel);
@@ -155,24 +129,18 @@
   static nsresult SetupTRRServiceChannelInternal(nsIHttpChannel* aChannel,
                                                  bool aUseGet);
 
-  nsresult ParseSvcParam(unsigned int svcbIndex, uint16_t key,
-                         SvcFieldValue& field, uint16_t length);
-
   void StoreIPHintAsDNSRecord(const struct SVCB& aSVCBRecord);
 
   nsCOMPtr<nsIChannel> mChannel;
   enum TrrType mType;
-  unsigned char mResponse[kMaxSize]{};
-  unsigned int mBodySize = 0;
+  DNSPacket mPacket;
   bool mFailed = false;
   bool mPB;
   DOHresp mDNS;
   nsCOMPtr<nsITimer> mTimeout;
   nsCString mCname;
   uint32_t mCnameLoop = kCnameChaseMax;  // loop detection counter
-  bool mAllowRFC1918 = false;
 
-  uint16_t mExtendedError = UINT16_MAX;
   uint32_t mTTL = UINT32_MAX;
   TypeRecordResultType mResult = mozilla::AsVariant(Nothing());
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRRServiceBase.cpp firefox-85.0+build1/netwerk/dns/TRRServiceBase.cpp
--- firefox-84.0.2+build1/netwerk/dns/TRRServiceBase.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRRServiceBase.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -126,7 +126,7 @@
   }
 
   static bool readHosts = false;
-  if ((mMode == 2 || mMode == 3) && !readHosts) {
+  if ((mMode == MODE_TRRFIRST || mMode == MODE_TRRONLY) && !readHosts) {
     readHosts = true;
     ReadEtcHostsFile();
   }
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRRService.cpp firefox-85.0+build1/netwerk/dns/TRRService.cpp
--- firefox-84.0.2+build1/netwerk/dns/TRRService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRRService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,7 +6,9 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsComponentManagerUtils.h"
+#include "nsDirectoryServiceUtils.h"
 #include "nsICaptivePortalService.h"
+#include "nsIFile.h"
 #include "nsIParentalControlsService.h"
 #include "nsINetworkLinkService.h"
 #include "nsIObserverService.h"
@@ -296,7 +298,16 @@
 
   if (!name || !strcmp(name, TRR_PREF("mode")) ||
       !strcmp(name, kRolloutModePref)) {
+    uint32_t prevMode = Mode();
+
     OnTRRModeChange();
+
+    // When the TRR service gets disabled we should purge the TRR cache to
+    // make sure we don't use any of the cached entries on a network where
+    // they are invalid - for example after turning on a VPN.
+    if (TRR_DISABLED(Mode()) && !TRR_DISABLED(prevMode)) {
+      clearEntireCache = true;
+    }
   }
   if (!name || !strcmp(name, TRR_PREF("uri")) ||
       !strcmp(name, kRolloutURIPref)) {
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRRService.h firefox-85.0+build1/netwerk/dns/TRRService.h
--- firefox-84.0.2+build1/netwerk/dns/TRRService.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRRService.h	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/DataMutex.h"
 #include "nsHostResolver.h"
 #include "nsIObserver.h"
+#include "nsITimer.h"
 #include "nsWeakReference.h"
 #include "TRRServiceBase.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/dns/TRRServiceParent.cpp firefox-85.0+build1/netwerk/dns/TRRServiceParent.cpp
--- firefox-84.0.2+build1/netwerk/dns/TRRServiceParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/dns/TRRServiceParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,12 +9,14 @@
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/net/SocketProcessParent.h"
 #include "mozilla/psm/PSMIPCTypes.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
 #include "nsICaptivePortalService.h"
 #include "nsIParentalControlsService.h"
 #include "nsINetworkLinkService.h"
 #include "nsIObserverService.h"
 #include "nsIOService.h"
+#include "nsNetCID.h"
 #include "TRRService.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/netwerk/ipc/ChannelEventQueue.cpp firefox-85.0+build1/netwerk/ipc/ChannelEventQueue.cpp
--- firefox-84.0.2+build1/netwerk/ipc/ChannelEventQueue.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/ChannelEventQueue.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -136,11 +136,11 @@
 
     // Hold a strong reference of mOwner to avoid the channel release
     // before CompleteResume was executed.
-    class CompleteResumeRunnable : public CancelableRunnable {
+    class CompleteResumeRunnable : public Runnable {
      public:
       explicit CompleteResumeRunnable(ChannelEventQueue* aQueue,
                                       nsISupports* aOwner)
-          : CancelableRunnable("CompleteResumeRunnable"),
+          : Runnable("CompleteResumeRunnable"),
             mQueue(aQueue),
             mOwner(aOwner) {}
 
diff -Nru firefox-84.0.2+build1/netwerk/ipc/DocumentChannelChild.cpp firefox-85.0+build1/netwerk/ipc/DocumentChannelChild.cpp
--- firefox-84.0.2+build1/netwerk/ipc/DocumentChannelChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/DocumentChannelChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,7 +6,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DocumentChannelChild.h"
+
+#include "mozilla/extensions/StreamFilterParent.h"
+#include "mozilla/net/HttpBaseChannel.h"
+#include "mozilla/net/NeckoChild.h"
+#include "mozilla/ScopeExit.h"
+#include "nsHashPropertyBag.h"
+#include "nsIHttpChannelInternal.h"
 #include "nsIObjectLoadingContent.h"
+#include "nsIWritablePropertyBag.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::ipc;
diff -Nru firefox-84.0.2+build1/netwerk/ipc/DocumentChannel.cpp firefox-85.0+build1/netwerk/ipc/DocumentChannel.cpp
--- firefox-84.0.2+build1/netwerk/ipc/DocumentChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/DocumentChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -5,34 +5,41 @@
  * 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 "DocumentChannel.h"
+#include "mozilla/net/DocumentChannel.h"
 
-#include "SerializedLoadContext.h"
-#include "mozIThirdPartyUtil.h"
+#include <inttypes.h>
+#include <utility>
+#include "mozIDOMWindow.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/LoadInfo.h"
-#include "mozilla/StaticPrefs_browser.h"
-#include "mozilla/dom/BrowserChild.h"
-#include "mozilla/dom/ContentChild.h"
-#include "mozilla/dom/nsCSPContext.h"
-#include "mozilla/extensions/StreamFilterParent.h"
-#include "mozilla/ipc/IPCStreamUtils.h"
-#include "mozilla/ipc/URIUtils.h"
+#include "mozilla/Logging.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/net/DocumentChannelChild.h"
-#include "mozilla/net/HttpChannelChild.h"
-#include "mozilla/net/NeckoChild.h"
 #include "mozilla/net/ParentProcessDocumentChannel.h"
-#include "mozilla/net/UrlClassifierCommon.h"
-#include "nsContentSecurityManager.h"
+#include "nsCOMPtr.h"
+#include "nsDebug.h"
 #include "nsDocShell.h"
 #include "nsDocShellLoadState.h"
 #include "nsHttpHandler.h"
-#include "nsIInputStreamChannel.h"
+#include "nsIContentPolicy.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsILoadContext.h"
+#include "nsILoadGroup.h"
+#include "nsILoadInfo.h"
+#include "nsIStreamListener.h"
+#include "nsIURI.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
-#include "nsQueryObject.h"
-#include "nsSerializationHelper.h"
-#include "nsStringStream.h"
-#include "nsURLHelper.h"
+#include "nsPIDOMWindow.h"
+#include "nsPIDOMWindowInlines.h"
+#include "nsStringFwd.h"
+#include "nsThreadUtils.h"
+#include "nsXULAppAPI.h"
+#include "nscore.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::ipc;
diff -Nru firefox-84.0.2+build1/netwerk/ipc/DocumentLoadListener.cpp firefox-85.0+build1/netwerk/ipc/DocumentLoadListener.cpp
--- firefox-84.0.2+build1/netwerk/ipc/DocumentLoadListener.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/DocumentLoadListener.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/MozPromiseInlines.h"  // For MozPromise::FromDomPromise
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_extensions.h"
 #include "mozilla/StaticPrefs_fission.h"
 #include "mozilla/StaticPrefs_security.h"
@@ -539,15 +540,6 @@
     }
   }
 
-  // nsViewSourceChannel normally replaces the nsIRequest passed to
-  // OnStart/StopRequest with itself. We don't need this, and instead
-  // we want the original request so that we get different ones for
-  // each part of a multipart channel.
-  nsCOMPtr<nsIViewSourceChannel> viewSourceChannel;
-  if (aPid && (viewSourceChannel = do_QueryInterface(mChannel))) {
-    viewSourceChannel->SetReplaceRequest(false);
-  }
-
   // Setup a ClientChannelHelper to watch for redirects, and copy
   // across any serviceworker related data between channels as needed.
   AddClientChannelHelperInParent(mChannel, std::move(aInfo));
@@ -743,7 +735,7 @@
 
   RefPtr<nsDOMNavigationTiming> timing = new nsDOMNavigationTiming(nullptr);
   timing->NotifyNavigationStart(
-      browsingContext->GetIsActive()
+      browsingContext->IsActive()
           ? nsDOMNavigationTiming::DocShellState::eActive
           : nsDOMNavigationTiming::DocShellState::eInactive);
 
@@ -1709,7 +1701,7 @@
       // This load has already started, so we want to filter out any 'stop'
       // progress events coming from the old process as a result of us
       // disconnecting from it.
-      browserParent->SuspendProgressEventsUntilAfterNextLoadStarts();
+      browserParent->SuspendProgressEvents();
     }
   }
   DisconnectListeners(NS_BINDING_ABORTED, NS_BINDING_ABORTED, true);
@@ -1795,8 +1787,12 @@
   nsCOMPtr<nsIRedirectChannelRegistrar> registrar =
       RedirectChannelRegistrar::GetOrCreate();
   MOZ_ASSERT(registrar);
+  nsCOMPtr<nsIChannel> chan = mChannel;
+  if (nsCOMPtr<nsIViewSourceChannel> vsc = do_QueryInterface(chan)) {
+    chan = vsc->GetInnerChannel();
+  }
   mRedirectChannelId = nsContentUtils::GenerateLoadIdentifier();
-  MOZ_ALWAYS_SUCCEEDS(registrar->RegisterChannel(mChannel, mRedirectChannelId));
+  MOZ_ALWAYS_SUCCEEDS(registrar->RegisterChannel(chan, mRedirectChannelId));
 
   if (aDestinationProcess) {
     if (!*aDestinationProcess) {
@@ -2156,9 +2152,9 @@
       RefPtr<BrowserParent> browserParent =
           loadingContext->GetCurrentWindowGlobal()->GetBrowserParent();
 
-      // This load has already started, so we want to suspend the start progress
-      // events from the docshell from reaching the parent.
-      browserParent->SuspendProgressEventsUntilAfterNextLoadStarts();
+      // XXX(anny) This is currently a dead code path because parent-controlled
+      // DC pref is off. When we enable the pref, we might get extra STATE_START
+      // progress events
 
       // Notify the docshell that it should load using the newly connected
       // channel
diff -Nru firefox-84.0.2+build1/netwerk/ipc/DocumentLoadListener.h firefox-85.0+build1/netwerk/ipc/DocumentLoadListener.h
--- firefox-84.0.2+build1/netwerk/ipc/DocumentLoadListener.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/DocumentLoadListener.h	2021-01-18 19:58:18.000000000 +0000
@@ -10,7 +10,7 @@
 #include "mozilla/MozPromise.h"
 #include "mozilla/Variant.h"
 #include "mozilla/WeakPtr.h"
-#include "mozilla/ipc/ProtocolUtils.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/dom/SessionHistoryEntry.h"
 #include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/NeckoParent.h"
@@ -18,6 +18,7 @@
 #include "mozilla/net/ParentChannelListener.h"
 #include "nsDOMNavigationTiming.h"
 #include "nsIBrowser.h"
+#include "nsIChannelEventSink.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIMultiPartChannel.h"
 #include "nsIParentChannel.h"
diff -Nru firefox-84.0.2+build1/netwerk/ipc/NeckoChannelParams.ipdlh firefox-85.0+build1/netwerk/ipc/NeckoChannelParams.ipdlh
--- firefox-84.0.2+build1/netwerk/ipc/NeckoChannelParams.ipdlh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/NeckoChannelParams.ipdlh	2021-01-18 19:58:18.000000000 +0000
@@ -16,12 +16,16 @@
 include PBackgroundSharedTypes;
 include DOMTypes;
 
+include "mozilla/dom/PropertyBagUtils.h";
+include "mozilla/dom/ReferrerInfoUtils.h";
+include "mozilla/ipc/URIUtils.h";
+
 using mozilla::OriginAttributes from "mozilla/ipc/BackgroundUtils.h";
 using RequestHeaderTuples from "mozilla/net/PHttpChannelParams.h";
 using struct nsHttpAtom from "nsHttp.h";
 using class mozilla::net::nsHttpResponseHead from "nsHttpResponseHead.h";
 using class mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using refcounted class nsIPropertyBag2 from "mozilla/dom/PropertyBagUtils.h";
+using refcounted class nsIPropertyBag2 from "nsIPropertyBag2.h";
 using refcounted class nsDOMNavigationTiming from "nsDOMNavigationTiming.h";
 using nsILoadInfo::CrossOriginEmbedderPolicy from "nsILoadInfo.h";
 using class mozilla::dom::LoadingSessionHistoryInfo from "mozilla/dom/SessionHistoryEntry.h";
diff -Nru firefox-84.0.2+build1/netwerk/ipc/NeckoMessageUtils.h firefox-85.0+build1/netwerk/ipc/NeckoMessageUtils.h
--- firefox-84.0.2+build1/netwerk/ipc/NeckoMessageUtils.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/NeckoMessageUtils.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/DebugOnly.h"
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "nsExceptionHandler.h"
 #include "nsIHttpChannel.h"
diff -Nru firefox-84.0.2+build1/netwerk/ipc/ParentChannelWrapper.cpp firefox-85.0+build1/netwerk/ipc/ParentChannelWrapper.cpp
--- firefox-84.0.2+build1/netwerk/ipc/ParentChannelWrapper.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/ParentChannelWrapper.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -21,7 +21,16 @@
   nsCOMPtr<nsIChannel> dummy;
   MOZ_ALWAYS_SUCCEEDS(
       NS_LinkRedirectChannels(aRegistrarId, this, getter_AddRefs(dummy)));
-  MOZ_ASSERT(dummy == mChannel);
+
+#ifdef DEBUG
+  // The channel registered with the RedirectChannelRegistrar will be the inner
+  // channel when dealing with view-source loads.
+  if (nsCOMPtr<nsIViewSourceChannel> viewSource = do_QueryInterface(mChannel)) {
+    MOZ_ASSERT(dummy == viewSource->GetInnerChannel());
+  } else {
+    MOZ_ASSERT(dummy == mChannel);
+  }
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff -Nru firefox-84.0.2+build1/netwerk/ipc/ParentProcessDocumentChannel.cpp firefox-85.0+build1/netwerk/ipc/ParentProcessDocumentChannel.cpp
--- firefox-84.0.2+build1/netwerk/ipc/ParentProcessDocumentChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/ParentProcessDocumentChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/net/ParentChannelWrapper.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "mozilla/StaticPrefs_extensions.h"
+#include "nsCRT.h"
 #include "nsDocShell.h"
 #include "nsIObserverService.h"
 #include "nsIClassifiedChannel.h"
diff -Nru firefox-84.0.2+build1/netwerk/ipc/PNecko.ipdl firefox-85.0+build1/netwerk/ipc/PNecko.ipdl
--- firefox-84.0.2+build1/netwerk/ipc/PNecko.ipdl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/PNecko.ipdl	2021-01-18 19:58:18.000000000 +0000
@@ -33,12 +33,14 @@
 include NeckoChannelParams;
 include protocol PAltDataOutputStream;
 
+include "mozilla/dom/PermissionMessageUtils.h";
+
 using mozilla::dom::MaybeDiscardedBrowsingContext from "mozilla/dom/BrowsingContext.h";
 using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
 using mozilla::dom::TabId from "mozilla/dom/ipc/IdType.h";
 using refcounted class nsIInputStream from "mozilla/ipc/IPCStreamUtils.h";
 using refcounted class nsIURI from "mozilla/ipc/URIUtils.h";
-using refcounted class nsIPrincipal from "mozilla/dom/PermissionMessageUtils.h";
+using refcounted class nsIPrincipal from "nsIPrincipal.h";
 
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/netwerk/ipc/SocketProcessBridgeParent.cpp firefox-85.0+build1/netwerk/ipc/SocketProcessBridgeParent.cpp
--- firefox-84.0.2+build1/netwerk/ipc/SocketProcessBridgeParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/SocketProcessBridgeParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #include "SocketProcessLogging.h"
 
 #include "mozilla/ipc/BackgroundParent.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "SocketProcessChild.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/netwerk/ipc/SocketProcessChild.cpp firefox-85.0+build1/netwerk/ipc/SocketProcessChild.cpp
--- firefox-84.0.2+build1/netwerk/ipc/SocketProcessChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/SocketProcessChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -35,6 +35,7 @@
 #include "nsHttpHandler.h"
 #include "nsIDNSService.h"
 #include "nsIHttpActivityObserver.h"
+#include "nsNetUtil.h"
 #include "nsNSSComponent.h"
 #include "nsSocketTransportService2.h"
 #include "nsThreadManager.h"
diff -Nru firefox-84.0.2+build1/netwerk/ipc/SocketProcessParent.cpp firefox-85.0+build1/netwerk/ipc/SocketProcessParent.cpp
--- firefox-84.0.2+build1/netwerk/ipc/SocketProcessParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/ipc/SocketProcessParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -88,7 +88,7 @@
           do_GetService("@mozilla.org/toolkit/app-startup;1");
       if (appService) {
         bool userAllowedQuit = true;
-        appService->Quit(nsIAppStartup::eForceQuit, &userAllowedQuit);
+        appService->Quit(nsIAppStartup::eForceQuit, 1, &userAllowedQuit);
       }
     }
   }
diff -Nru firefox-84.0.2+build1/netwerk/protocol/about/nsAboutCache.h firefox-85.0+build1/netwerk/protocol/about/nsAboutCache.h
--- firefox-84.0.2+build1/netwerk/protocol/about/nsAboutCache.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/about/nsAboutCache.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsICacheStorage.h"
 
 #include "nsString.h"
+#include "nsIChannel.h"
 #include "nsIOutputStream.h"
 #include "nsILoadContextInfo.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/data/DataChannelParent.h firefox-85.0+build1/netwerk/protocol/data/DataChannelParent.h
--- firefox-84.0.2+build1/netwerk/protocol/data/DataChannelParent.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/data/DataChannelParent.h	2021-01-18 19:58:18.000000000 +0000
@@ -25,8 +25,7 @@
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-      [[nodiscard]] bool
-      Init(const uint64_t& aChannelId);
+  [[nodiscard]] bool Init(const uint64_t& aChannelId);
 
  private:
   ~DataChannelParent() = default;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/file/FileChannelParent.h firefox-85.0+build1/netwerk/protocol/file/FileChannelParent.h
--- firefox-84.0.2+build1/netwerk/protocol/file/FileChannelParent.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/file/FileChannelParent.h	2021-01-18 19:58:18.000000000 +0000
@@ -25,8 +25,7 @@
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
-      [[nodiscard]] bool
-      Init(const uint64_t& aChannelId);
+  [[nodiscard]] bool Init(const uint64_t& aChannelId);
 
  private:
   ~FileChannelParent() = default;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/ftp/FTPChannelChild.cpp firefox-85.0+build1/netwerk/protocol/ftp/FTPChannelChild.cpp
--- firefox-84.0.2+build1/netwerk/protocol/ftp/FTPChannelChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/ftp/FTPChannelChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "nsIURIMutator.h"
 #include "nsContentSecurityManager.h"
+#include "mozilla/ScopeExit.h"
 
 using mozilla::dom::ContentChild;
 using namespace mozilla::ipc;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/gio/nsGIOProtocolHandler.cpp firefox-85.0+build1/netwerk/protocol/gio/nsGIOProtocolHandler.cpp
--- firefox-84.0.2+build1/netwerk/protocol/gio/nsGIOProtocolHandler.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/gio/nsGIOProtocolHandler.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,8 +10,10 @@
 #include "nsGIOProtocolHandler.h"
 #include "mozilla/Components.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/Logging.h"
 #include "mozilla/NullPrincipal.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsIObserver.h"
 #include "nsThreadUtils.h"
 #include "nsProxyRelease.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/AlternateServices.cpp firefox-85.0+build1/netwerk/protocol/http/AlternateServices.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/AlternateServices.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/AlternateServices.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "AlternateServices.h"
 #include "LoadInfo.h"
+#include "nsComponentManagerUtils.h"
 #include "nsEscape.h"
 #include "nsHttpConnectionInfo.h"
 #include "nsHttpChannel.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/AltServiceChild.h firefox-85.0+build1/netwerk/protocol/http/AltServiceChild.h
--- firefox-84.0.2+build1/netwerk/protocol/http/AltServiceChild.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/AltServiceChild.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,8 @@
 
 #include "mozilla/net/PAltServiceChild.h"
 
+class nsIInterfaceRequestor;
+
 namespace mozilla {
 namespace net {
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/CachePushChecker.cpp firefox-85.0+build1/netwerk/protocol/http/CachePushChecker.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/CachePushChecker.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/CachePushChecker.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #include "CachePushChecker.h"
 
 #include "LoadContextInfo.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/net/SocketProcessChild.h"
 #include "nsICacheEntry.h"
 #include "nsICacheStorageService.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/ClassifierDummyChannelParent.cpp firefox-85.0+build1/netwerk/protocol/http/ClassifierDummyChannelParent.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/ClassifierDummyChannelParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/ClassifierDummyChannelParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "ClassifierDummyChannelParent.h"
 #include "mozilla/net/AsyncUrlChannelClassifier.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 #include "nsIPrincipal.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/ConnectionEntry.cpp firefox-85.0+build1/netwerk/protocol/http/ConnectionEntry.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/ConnectionEntry.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/ConnectionEntry.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -56,8 +56,9 @@
     return true;
   }
 
-  return gHttpHandler->ConnMgr()->GetH2orH3ActiveConn(this, false, false) ? true
-                                                                   : false;
+  return gHttpHandler->ConnMgr()->GetH2orH3ActiveConn(this, false, false)
+             ? true
+             : false;
 }
 
 uint32_t ConnectionEntry::UnconnectedHalfOpens() const {
@@ -220,6 +221,7 @@
     bool aInsertAsFirstForTheSamePriority /* = false */) {
   mPendingQ.InsertTransaction(pendingTransInfo,
                               aInsertAsFirstForTheSamePriority);
+  pendingTransInfo->Transaction()->OnPendingQueueInserted();
 }
 
 nsTArray<RefPtr<PendingTransactionInfo>>*
@@ -911,5 +913,50 @@
   LOG(("]"));
 }
 
+bool ConnectionEntry::RemoveTransFromPendingQ(nsHttpTransaction* aTrans) {
+  // We will abandon all half-open sockets belonging to the given
+  // transaction.
+  nsTArray<RefPtr<PendingTransactionInfo>>* infoArray =
+      GetTransactionPendingQHelper(aTrans);
+
+  RefPtr<PendingTransactionInfo> pendingTransInfo;
+  int32_t transIndex =
+      infoArray ? infoArray->IndexOf(aTrans, 0, PendingComparator()) : -1;
+  if (transIndex >= 0) {
+    pendingTransInfo = (*infoArray)[transIndex];
+    infoArray->RemoveElementAt(transIndex);
+  }
+
+  if (!pendingTransInfo) {
+    return false;
+  }
+
+  // Abandon all half-open sockets belonging to the given transaction.
+  pendingTransInfo->AbandonHalfOpenAndForgetActiveConn();
+  return true;
+}
+
+void ConnectionEntry::MaybeUpdateEchConfig(nsHttpConnectionInfo* aConnInfo) {
+  if (!mConnInfo->HashKey().Equals(aConnInfo->HashKey())) {
+    return;
+  }
+
+  const nsCString& echConfig = aConnInfo->GetEchConfig();
+  if (mConnInfo->GetEchConfig().Equals(echConfig)) {
+    return;
+  }
+
+  LOG(("ConnectionEntry::MaybeUpdateEchConfig [ci=%s]\n",
+       mConnInfo->HashKey().get()));
+
+  mConnInfo->SetEchConfig(echConfig);
+
+  // If echConfig is changed, we should close all half opens and idle
+  // connections. This is to make sure the new echConfig will be used for the
+  // next connection.
+  CloseAllHalfOpens();
+  CloseIdleConnections();
+}
+
 }  // namespace net
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/ConnectionEntry.h firefox-85.0+build1/netwerk/protocol/http/ConnectionEntry.h
--- firefox-84.0.2+build1/netwerk/protocol/http/ConnectionEntry.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/ConnectionEntry.h	2021-01-18 19:58:18.000000000 +0000
@@ -183,6 +183,10 @@
   // active connections and unconnected half open connections.
   uint32_t TotalActiveConnections() const;
 
+  bool RemoveTransFromPendingQ(nsHttpTransaction* aTrans);
+
+  void MaybeUpdateEchConfig(nsHttpConnectionInfo* aConnInfo);
+
  private:
   void InsertIntoIdleConnections_internal(nsHttpConnection* conn);
   void RemoveFromIdleConnectionsIndex(size_t inx);
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HalfOpenSocket.cpp firefox-85.0+build1/netwerk/protocol/http/HalfOpenSocket.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HalfOpenSocket.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HalfOpenSocket.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -167,8 +167,10 @@
     tmpFlags |= nsISocketTransport::NO_PERMANENT_STORAGE;
   }
 
+  Unused << socketTransport->SetIsPrivate(ci->GetPrivate());
+
   if (ci->GetLessThanTls13()) {
-    tmpFlags |= nsISocketTransport::DONT_TRY_ESNI_OR_ECH;
+    tmpFlags |= nsISocketTransport::DONT_TRY_ECH;
   }
 
   if (((mCaps & NS_HTTP_BE_CONSERVATIVE) || ci->GetBeConservative()) &&
@@ -956,16 +958,17 @@
       }
     }
 
-    if (nullTrans) {
-      nullTrans->Close(rv);
-    } else if (nsHttpTransaction* trans =
-                   mTransaction->QueryHttpTransaction()) {
+    if (nsHttpTransaction* trans = mTransaction->QueryHttpTransaction()) {
       if (mIsHttp3) {
         trans->DisableHttp3();
         gHttpHandler->ExcludeHttp3(mEnt->mConnInfo);
       }
-      Unused << gHttpHandler->ConnMgr()->CancelTransaction(trans, rv);
+      // The transaction's connection info is changed after DisableHttp3(), so
+      // this is the only point we can remove this transaction from its conn
+      // entry.
+      mEnt->RemoveTransFromPendingQ(trans);
     }
+    mTransaction->Close(rv);
 
     return rv;
   }
@@ -1172,6 +1175,17 @@
 
     if (NS_SUCCEEDED(rv) && !addressSet.IsEmpty()) {
       for (uint32_t i = 0; i < addressSet.Length(); ++i) {
+        if ((addressSet[i].raw.family == AF_INET &&
+             addressSet[i].inet.ip == 0) ||
+            (addressSet[i].raw.family == AF_INET6 &&
+             addressSet[i].inet6.ip.u64[0] == 0 &&
+             addressSet[i].inet6.ip.u64[1] == 0)) {
+          // Bug 1680249 - Don't create the coalescing key if the ip address is
+          // `0.0.0.0` or `::`.
+          LOG(("HalfOpenSocket: skip creating Coalescing Key for host [%s]",
+               mEnt->mConnInfo->Origin()));
+          continue;
+        }
         nsCString* newKey = mEnt->mCoalescingKeys.AppendElement(nsCString());
         newKey->SetLength(kIPv6CStrBufSize + 26);
         addressSet[i].ToStringBuffer(newKey->BeginWriting(), kIPv6CStrBufSize);
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/Http3Session.cpp firefox-85.0+build1/netwerk/protocol/http/Http3Session.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/Http3Session.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/Http3Session.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -186,8 +186,10 @@
 void Http3Session::Shutdown() {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
 
-  if ((mBeforeConnectedError || (mError == NS_ERROR_NET_HTTP3_PROTOCOL_ERROR)) &&
-      (mError != mozilla::psm::GetXPCOMFromNSSError(SSL_ERROR_BAD_CERT_DOMAIN))) {
+  if ((mBeforeConnectedError ||
+       (mError == NS_ERROR_NET_HTTP3_PROTOCOL_ERROR)) &&
+      (mError !=
+       mozilla::psm::GetXPCOMFromNSSError(SSL_ERROR_BAD_CERT_DOMAIN))) {
     gHttpHandler->ExcludeHttp3(mConnInfo);
   }
 
@@ -467,7 +469,6 @@
       } break;
       case Http3Event::Tag::GoawayReceived:
         LOG(("Http3Session::ProcessEvents - GoawayReceived"));
-        MOZ_ASSERT(!mGoawayReceived);
         mGoawayReceived = true;
         break;
       case Http3Event::Tag::ConnectionClosing:
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/Http3Stream.cpp firefox-85.0+build1/netwerk/protocol/http/Http3Stream.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/Http3Stream.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/Http3Stream.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -468,15 +468,18 @@
     mSendState = PREPARING_HEADERS;
     mRecvState = BEFORE_HEADERS;
     mStreamId = UINT64_MAX;
+    mFlatHttpRequestHeaders = "";
     mQueued = false;
     mDataReceived = false;
     mResetRecv = false;
+    mFlatResponseHeaders.TruncateLength(0);
     mRequestBodyLenRemaining = 0;
     mTotalSent = 0;
     mTotalRead = 0;
     mFin = false;
     mSendingBlockedByFlowControlCount = 0;
-    mFlatResponseHeaders.TruncateLength(0);
+    mSocketInCondition = NS_ERROR_NOT_INITIALIZED;
+    mSocketOutCondition = NS_ERROR_NOT_INITIALIZED;
   }
 
   return rv;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpBaseChannel.cpp firefox-85.0+build1/netwerk/protocol/http/HttpBaseChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpBaseChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpBaseChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -223,6 +223,7 @@
       mAsyncOpenWaitingForStreamLength(false),
       mUpgradableToSecure(true),
       mHasNonEmptySandboxingFlag(false),
+      mTaintedOriginFlag(false),
       mTlsFlags(0),
       mSuspendCount(0),
       mInitialRwin(0),
@@ -4297,6 +4298,9 @@
     CallQueryInterface(newChannel, realChannel.StartAssignment());
     if (realChannel) {
       realChannel->SetTopWindowURI(mTopWindowURI);
+
+      realChannel->mTaintedOriginFlag =
+          ShouldTaintReplacementChannelOrigin(newURI);
     }
 
     // update the DocumentURI indicator since we are being redirected.
@@ -4379,6 +4383,40 @@
   return NS_OK;
 }
 
+bool HttpBaseChannel::ShouldTaintReplacementChannelOrigin(nsIURI* aNewURI) {
+  if (mTaintedOriginFlag) {
+    return true;
+  }
+
+  nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
+  if (!ssm) {
+    return true;
+  }
+  bool isPrivateWin = mLoadInfo->GetOriginAttributes().mPrivateBrowsingId > 0;
+  nsresult rv = ssm->CheckSameOriginURI(aNewURI, mURI, false, isPrivateWin);
+  if (NS_SUCCEEDED(rv)) {
+    return false;
+  }
+  // If aNewURI <-> mURI are not same-origin we need to taint unless
+  // mURI <-> mOriginalURI/LoadingPrincipal are same origin.
+
+  if (mLoadInfo->GetLoadingPrincipal()) {
+    bool sameOrigin = false;
+    rv = mLoadInfo->GetLoadingPrincipal()->IsSameOrigin(mURI, isPrivateWin,
+                                                        &sameOrigin);
+    if (NS_FAILED(rv)) {
+      return true;
+    }
+    return !sameOrigin;
+  }
+  if (!mOriginalURI) {
+    return true;
+  }
+
+  rv = ssm->CheckSameOriginURI(mOriginalURI, mURI, false, isPrivateWin);
+  return NS_FAILED(rv);
+}
+
 // Redirect Tracking
 bool HttpBaseChannel::SameOriginWithOriginalUri(nsIURI* aURI) {
   nsIScriptSecurityManager* ssm = nsContentUtils::GetSecurityManager();
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpBaseChannel.h firefox-85.0+build1/netwerk/protocol/http/HttpBaseChannel.h
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpBaseChannel.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpBaseChannel.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,23 +11,15 @@
 #include <utility>
 
 #include "mozilla/Atomics.h"
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Tuple.h"
 #include "mozilla/dom/DOMTypes.h"
-#include "mozilla/dom/ReferrerInfo.h"
-#include "mozilla/net/ChannelEventQueue.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/net/NeckoCommon.h"
 #include "mozilla/net/PrivateBrowsingChannel.h"
-#include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 #include "nsHashPropertyBag.h"
 #include "nsHttp.h"
-#include "nsHttpConnectionInfo.h"
 #include "nsHttpHandler.h"
 #include "nsHttpRequestHead.h"
-#include "nsHttpResponseHead.h"
-#include "nsIApplicationCache.h"
 #include "nsIClassOfService.h"
 #include "nsIClassifiedChannel.h"
 #include "nsIConsoleReportCollector.h"
@@ -37,9 +29,7 @@
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadInfo.h"
-#include "nsIProgressEventSink.h"
 #include "nsIResumableChannel.h"
-#include "nsISecurityConsoleMessage.h"
 #include "nsIStringEnumerator.h"
 #include "nsISupportsPriority.h"
 #include "nsIThrottledInputChannel.h"
@@ -47,7 +37,6 @@
 #include "nsITraceableChannel.h"
 #include "nsIURI.h"
 #include "nsIUploadChannel2.h"
-#include "nsProxyInfo.h"
 #include "nsStringEnumerator.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
@@ -59,6 +48,7 @@
     }                                                \
   }
 
+class nsIProgressEventSink;
 class nsISecurityConsoleMessage;
 class nsIPrincipal;
 
@@ -248,7 +238,7 @@
 
   using nsIClassifiedChannel::IsThirdPartyTrackingResource;
 
-  virtual void SetSource(UniqueProfilerBacktrace aSource) override {
+  virtual void SetSource(UniquePtr<ProfileChunkedBuffer> aSource) override {
     mSource = std::move(aSource);
   }
 
@@ -645,6 +635,9 @@
   nsCOMPtr<nsIEventTarget> mCurrentThread;
 
  private:
+  // WHATWG Fetch Standard 4.4. HTTP-redirect fetch, step 10
+  bool ShouldTaintReplacementChannelOrigin(nsIURI* aNewURI);
+
   // Proxy release all members above on main thread.
   void ReleaseMainThreadOnlyReferences();
 
@@ -756,7 +749,7 @@
   Atomic<uint32_t, ReleaseAcquire> mThirdPartyClassificationFlags;
   Atomic<uint32_t, ReleaseAcquire> mFlashPluginState;
 
-  UniqueProfilerBacktrace mSource;
+  UniquePtr<ProfileChunkedBuffer> mSource;
 
   uint32_t mLoadFlags;
   uint32_t mCaps;
@@ -834,6 +827,9 @@
   // True if the docshell's sandboxing flag set is not empty.
   uint32_t mHasNonEmptySandboxingFlag : 1;
 
+  // Tainted origin flag of a request, specified by WHATWG Fetch Standard 2.2.5.
+  uint32_t mTaintedOriginFlag : 1;
+
   // An opaque flags for non-standard behavior of the TLS system.
   // It is unlikely this will need to be set outside of telemetry studies
   // relating to the TLS implementation.
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelChild.cpp firefox-85.0+build1/netwerk/protocol/http/HttpChannelChild.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelChild.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpChannelChild.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -43,6 +43,7 @@
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/net/DNS.h"
 #include "mozilla/net/SocketProcessBridgeChild.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StoragePrincipalHelper.h"
 #include "SerializedLoadContext.h"
@@ -67,10 +68,6 @@
 #  include "GeckoTaskTracer.h"
 #endif
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 #include <functional>
 
 using namespace mozilla::dom;
@@ -195,13 +192,13 @@
 
   nsrefcnt count = --mRefCnt;
   MOZ_ASSERT(int32_t(count) >= 0, "dup release");
-  NS_LOG_RELEASE(this, count, "HttpChannelChild");
 
   // Normally we Send_delete in OnStopRequest, but when we need to retain the
   // remote channel for security info IPDL itself holds 1 reference, so we
   // Send_delete when refCnt==1.  But if !CanSend(), then there's nobody to send
   // to, so we fall through.
   if (mKeptAlive && count == 1 && CanSend()) {
+    NS_LOG_RELEASE(this, 1, "HttpChannelChild");
     mKeptAlive = false;
     // We send a message to the parent, which calls SendDelete, and then the
     // child calling Send__delete__() to finally drop the refcount to 0.
@@ -216,6 +213,7 @@
     // has been sucessfully redirected.
     if (MOZ_LIKELY(mOnStartRequestCalled && mOnStopRequestCalled) ||
         !mListener) {
+      NS_LOG_RELEASE(this, 0, "HttpChannelChild");
       delete this;
       return 0;
     }
@@ -224,22 +222,45 @@
     if (NS_SUCCEEDED(mStatus)) {
       mStatus = NS_ERROR_ABORT;
     }
-    nsresult rv = NS_DispatchToMainThread(
-        NewRunnableMethod("~HttpChannelChild>DoNotifyListener", this,
+
+    // Turn the stabilization refcount into a regular strong reference.
+
+    // 1) We tell refcount logging about the "stabilization" AddRef, which
+    // will become the reference for |channel|. We do this first so that we
+    // don't tell refcount logging that the refcount has dropped to zero, which
+    // it will interpret as destroying the object.
+    NS_LOG_ADDREF(this, 2, "HttpChannelChild", sizeof(*this));
+
+    // 2) We tell refcount logging about the original call to Release().
+    NS_LOG_RELEASE(this, 1, "HttpChannelChild");
+
+    // 3) Finally, we turn the reference into a regular smart pointer.
+    RefPtr<HttpChannelChild> channel = dont_AddRef(this);
+
+    // This runnable will create a strong reference to |this|.
+    NS_DispatchToMainThread(
+        NewRunnableMethod("~HttpChannelChild>DoNotifyListener", channel,
                           &HttpChannelChild::DoNotifyListener));
-    if (NS_FAILED(rv)) {
-      // Prevent loops.
-      mOnStartRequestCalled = true;
-      mOnStopRequestCalled = true;
-      // This reverts the stabilization we have made above.  Instead of
-      // doing `delete this` it's safer to call Release() again in case the
-      // dispatch somehow leaks and there has been a reference added.
-      return Release();
-    }
 
-    return 0;
+    // If NS_DispatchToMainThread failed then we're going to leak the runnable,
+    // and thus the channel, so there's no need to do anything else.
+
+    // We should have already done any special handling for the refcount = 1
+    // case when the refcount first went from 2 to 1. We don't want it to happen
+    // when |channel| is destroyed.
+    MOZ_ASSERT(!mKeptAlive || !CanSend());
+
+    // XXX If std::move(channel) is allowed, then we don't have to have extra
+    // checks for the refcount going from 2 to 1. See bug 1680217.
+
+    // This will release the stabilization refcount, which is necessary to avoid
+    // a leak.
+    channel = nullptr;
+
+    return mRefCnt;
   }
 
+  NS_LOG_RELEASE(this, count, "HttpChannelChild");
   return count;
 }
 
@@ -2907,7 +2928,7 @@
 
   if (NS_IsMainThread()) {
     if (NS_WARN_IF(!CanSend())) {
-      // IPC actor is detroyed already, do not send more messages.
+      // IPC actor is destroyed already, do not send more messages.
       return;
     }
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelParams.ipdlh firefox-85.0+build1/netwerk/protocol/http/HttpChannelParams.ipdlh
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelParams.ipdlh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpChannelParams.ipdlh	2021-01-18 19:58:18.000000000 +0000
@@ -9,12 +9,13 @@
 include IPCServiceWorkerDescriptor;
 include NeckoChannelParams;
 
+include "mozilla/dom/ReferrerInfoUtils.h";
 include "mozilla/net/NeckoMessageUtils.h";
 
 using class mozilla::net::nsHttpHeaderArray from "nsHttpHeaderArray.h";
 using mozilla::net::NetAddr from "mozilla/net/DNS.h";
 using nsILoadInfo::CrossOriginOpenerPolicy from "nsILoadInfo.h";
-using refcounted class nsIReferrerInfo from "mozilla/dom/ReferrerInfoUtils.h";
+using refcounted class nsIReferrerInfo from "nsIReferrerInfo.h";
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelParent.cpp firefox-85.0+build1/netwerk/protocol/http/HttpChannelParent.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpChannelParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpChannelParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -55,6 +55,7 @@
 #include "nsThreadUtils.h"
 #include "nsQueryObject.h"
 #include "nsIMultiPartChannel.h"
+#include "nsIViewSourceChannel.h"
 
 using mozilla::BasePrincipal;
 using namespace mozilla::dom;
@@ -1141,6 +1142,9 @@
       multiPartChannel->GetPartID(&partID);
       multiPartID = Some(partID);
       multiPartChannel->GetIsLastPart(&isLastPartOfMultiPart);
+    } else if (nsCOMPtr<nsIViewSourceChannel> viewSourceChannel =
+                   do_QueryInterface(aRequest)) {
+      chan = do_QueryObject(viewSourceChannel->GetInnerChannel());
     }
   }
   MOZ_ASSERT(multiPartID || !isMultiPart, "Changed multi-part state?");
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionBase.cpp firefox-85.0+build1/netwerk/protocol/http/HttpConnectionBase.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionBase.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpConnectionBase.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,11 +17,6 @@
 #define TLS_EARLY_DATA_AVAILABLE_BUT_NOT_USED 1
 #define TLS_EARLY_DATA_AVAILABLE_AND_USED 2
 
-#define ESNI_SUCCESSFUL 0
-#define ESNI_FAILED 1
-#define NO_ESNI_SUCCESSFUL 2
-#define NO_ESNI_FAILED 3
-
 #include "mozilla/Telemetry.h"
 #include "HttpConnectionBase.h"
 #include "nsHttpHandler.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionMgrParent.cpp firefox-85.0+build1/netwerk/protocol/http/HttpConnectionMgrParent.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionMgrParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpConnectionMgrParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "AltSvcTransactionParent.h"
 #include "mozilla/net/HttpTransactionParent.h"
 #include "nsHttpConnectionInfo.h"
+#include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsISpeculativeConnect.h"
 #include "nsIOService.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionUDP.cpp firefox-85.0+build1/netwerk/protocol/http/HttpConnectionUDP.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionUDP.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpConnectionUDP.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,11 +17,6 @@
 #define TLS_EARLY_DATA_AVAILABLE_BUT_NOT_USED 1
 #define TLS_EARLY_DATA_AVAILABLE_AND_USED 2
 
-#define ESNI_SUCCESSFUL 0
-#define ESNI_FAILED 1
-#define NO_ESNI_SUCCESSFUL 2
-#define NO_ESNI_FAILED 3
-
 #include "ASpdySession.h"
 #include "mozilla/ChaosMode.h"
 #include "mozilla/Telemetry.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionUDP.h firefox-85.0+build1/netwerk/protocol/http/HttpConnectionUDP.h
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpConnectionUDP.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpConnectionUDP.h	2021-01-18 19:58:18.000000000 +0000
@@ -96,7 +96,7 @@
 
   PRIntervalTime mLastReadTime;
   PRIntervalTime mLastWriteTime;
-  int64_t mTotalBytesRead;       // total data read
+  int64_t mTotalBytesRead;  // total data read
 
   RefPtr<nsIAsyncInputStream> mInputOverflow;
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionParent.cpp firefox-85.0+build1/netwerk/protocol/http/HttpTransactionParent.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionParent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpTransactionParent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -142,6 +142,7 @@
   mOnPushCallback = std::move(aOnPushCallback);
   mCaps = caps;
   mConnInfo = cinfo->Clone();
+  mIsHttp3Used = cinfo->IsHttp3();
 
   HttpConnectionInfoCloneArgs infoArgs;
   nsHttpConnectionInfo::SerializeHttpConnectionInfo(cinfo, infoArgs);
@@ -359,11 +360,15 @@
 
 int64_t HttpTransactionParent::GetRequestSize() { return mRequestSize; }
 
+bool HttpTransactionParent::IsHttp3Used() { return mIsHttp3Used; }
+
 bool HttpTransactionParent::DataSentToChildProcess() {
   return mDataSentToChildProcess;
 }
 
-nsISupports* HttpTransactionParent::SecurityInfo() { return mSecurityInfo; }
+already_AddRefed<nsISupports> HttpTransactionParent::SecurityInfo() {
+  return do_AddRef(mSecurityInfo);
+}
 
 bool HttpTransactionParent::ProxyConnectFailed() { return mProxyConnectFailed; }
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionParent.h firefox-85.0+build1/netwerk/protocol/http/HttpTransactionParent.h
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionParent.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpTransactionParent.h	2021-01-18 19:58:18.000000000 +0000
@@ -127,6 +127,7 @@
   bool mResponseIsComplete;
   int64_t mTransferSize;
   int64_t mRequestSize;
+  bool mIsHttp3Used = false;
   bool mProxyConnectFailed;
   Atomic<bool, ReleaseAcquire> mCanceled;
   Atomic<nsresult, ReleaseAcquire> mStatus;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionShell.h firefox-85.0+build1/netwerk/protocol/http/HttpTransactionShell.h
--- firefox-84.0.2+build1/netwerk/protocol/http/HttpTransactionShell.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/HttpTransactionShell.h	2021-01-18 19:58:18.000000000 +0000
@@ -104,7 +104,7 @@
   // Returning null if there is no trailer.
   virtual UniquePtr<nsHttpHeaderArray> TakeResponseTrailers() = 0;
 
-  virtual nsISupports* SecurityInfo() = 0;
+  virtual already_AddRefed<nsISupports> SecurityInfo() = 0;
   virtual void SetSecurityCallbacks(nsIInterfaceRequestor* aCallbacks) = 0;
 
   virtual void GetNetworkAddresses(NetAddr& self, NetAddr& peer,
@@ -133,6 +133,7 @@
   virtual bool ResponseIsComplete() = 0;
   virtual int64_t GetTransferSize() = 0;
   virtual int64_t GetRequestSize() = 0;
+  virtual bool IsHttp3Used() = 0;
 
   // Called to notify that a requested DNS cache entry was refreshed.
   virtual void SetDNSWasRefreshed() = 0;
@@ -180,7 +181,7 @@
       override;                                                                \
   virtual UniquePtr<nsHttpResponseHead> TakeResponseHead() override;           \
   virtual UniquePtr<nsHttpHeaderArray> TakeResponseTrailers() override;        \
-  virtual nsISupports* SecurityInfo() override;                                \
+  virtual already_AddRefed<nsISupports> SecurityInfo() override;               \
   virtual void SetSecurityCallbacks(nsIInterfaceRequestor* aCallbacks)         \
       override;                                                                \
   virtual void GetNetworkAddresses(NetAddr& self, NetAddr& peer,               \
@@ -202,6 +203,7 @@
   virtual bool ResponseIsComplete() override;                                  \
   virtual int64_t GetTransferSize() override;                                  \
   virtual int64_t GetRequestSize() override;                                   \
+  virtual bool IsHttp3Used() override;                                         \
   virtual void SetDNSWasRefreshed() override;                                  \
   virtual void DontReuseConnection() override;                                 \
   virtual bool HasStickyConnection() const override;                           \
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/InterceptedHttpChannel.cpp firefox-85.0+build1/netwerk/protocol/http/InterceptedHttpChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/InterceptedHttpChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/InterceptedHttpChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsContentSecurityManager.h"
 #include "nsEscape.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/dom/ChannelInfo.h"
 #include "mozilla/dom/PerformanceStorage.h"
 #include "nsHttpChannel.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsAHttpConnection.h firefox-85.0+build1/netwerk/protocol/http/nsAHttpConnection.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsAHttpConnection.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsAHttpConnection.h	2021-01-18 19:58:18.000000000 +0000
@@ -49,9 +49,10 @@
   //
   // @return failure code to close the transaction.
   //
-  [[nodiscard]] virtual nsresult
-      OnHeadersAvailable(nsAHttpTransaction*, nsHttpRequestHead*,
-                         nsHttpResponseHead*, bool* reset) = 0;
+  [[nodiscard]] virtual nsresult OnHeadersAvailable(nsAHttpTransaction*,
+                                                    nsHttpRequestHead*,
+                                                    nsHttpResponseHead*,
+                                                    bool* reset) = 0;
 
   //
   // called by a transaction to resume either sending or receiving data
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsCORSListenerProxy.h firefox-85.0+build1/netwerk/protocol/http/nsCORSListenerProxy.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsCORSListenerProxy.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsCORSListenerProxy.h	2021-01-18 19:58:18.000000000 +0000
@@ -15,12 +15,12 @@
 #include "nsTArray.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIChannelEventSink.h"
-#include "nsIHttpChannel.h"
 #include "nsIThreadRetargetableStreamListener.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Mutex.h"
 
+class nsIHttpChannel;
 class nsIURI;
 class nsIPrincipal;
 class nsINetworkInterceptController;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpChannel.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -135,10 +135,6 @@
 #  include "GeckoTaskTracer.h"
 #endif
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 namespace mozilla {
 
 using namespace dom;
@@ -1667,13 +1663,14 @@
   // in the pipeline to handle the content and pass it along to our
   // original listener. nsUnknownDecoder doesn't support detecting this type,
   // so we only need to insert this using the response header's mime type.
-  // We only do this for document loads, since we might want to send parts
-  // to the external protocol handler without leaving the parent process.
+  //
+  // We only do this for unwrapped document loads, since we might want to send
+  // parts to the external protocol handler without leaving the parent process.
   bool mustRunStreamFilterInParent = false;
   nsCOMPtr<nsIParentChannel> parentChannel;
   NS_QueryNotificationCallbacks(this, parentChannel);
   RefPtr<DocumentLoadListener> docListener = do_QueryObject(parentChannel);
-  if (mResponseHead && docListener) {
+  if (mResponseHead && docListener && docListener->GetChannel() == this) {
     nsAutoCString contentType;
     mResponseHead->ContentType(contentType);
 
@@ -9364,7 +9361,8 @@
   nsCOMPtr<nsIDeprecationWarner> warner;
   GetCallback(warner);
   if (warner) {
-    warner->IssueWarning(Document::eAppCache, false);
+    warner->IssueWarning(static_cast<uint32_t>(DeprecatedOperations::eAppCache),
+                         false);
   }
 }
 
@@ -9373,16 +9371,34 @@
   if (mRequestHead.IsGet() || mRequestHead.IsHead()) {
     return;
   }
+  if (mLoadInfo->TriggeringPrincipal()->IsSystemPrincipal()) {
+    // Do not set origin header for system principal contexts:
+    return;
+  }
   nsresult rv;
 
   nsAutoCString existingHeader;
   Unused << mRequestHead.GetHeader(nsHttp::Origin, existingHeader);
   if (!existingHeader.IsEmpty()) {
     LOG(("nsHttpChannel::SetOriginHeader Origin header already present"));
-    nsCOMPtr<nsIURI> uri;
-    rv = NS_NewURI(getter_AddRefs(uri), existingHeader);
-    if (NS_SUCCEEDED(rv) &&
-        ReferrerInfo::ShouldSetNullOriginHeader(this, uri)) {
+    // In case we already have an Origin header, check with referrerInfo
+    // if we should "null" it.
+    Unused << mRequestHead.GetHeader(nsHttp::Origin, existingHeader);
+    auto const shouldNullifyOriginHeader =
+        [&existingHeader](nsHttpChannel* self) {
+          if (self->mTaintedOriginFlag) {
+            return true;
+          }
+
+          nsCOMPtr<nsIURI> uri;
+          nsresult rv = NS_NewURI(getter_AddRefs(uri), existingHeader);
+          if (NS_FAILED(rv)) {
+            return false;
+          }
+          return ReferrerInfo::ShouldSetNullOriginHeader(self, uri);
+        };
+
+    if (shouldNullifyOriginHeader(this)) {
       LOG(("nsHttpChannel::SetOriginHeader null Origin by Referrer-Policy"));
       rv = mRequestHead.SetHeader(nsHttp::Origin, "null"_ns, false /* merge */);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
@@ -9390,35 +9406,32 @@
     return;
   }
 
-  if (StaticPrefs::network_http_sendOriginHeader() == 0) {
-    // Origin header suppressed by user setting
-    return;
-  }
-
   nsCOMPtr<nsIURI> referrer;
   auto* basePrin = BasePrincipal::Cast(mLoadInfo->TriggeringPrincipal());
-  basePrin->GetURI(getter_AddRefs(referrer));
-  if (!referrer || !dom::ReferrerInfo::IsReferrerSchemeAllowed(referrer)) {
+  rv = basePrin->GetURI(getter_AddRefs(referrer));
+  if (NS_FAILED(rv)) {
     return;
   }
 
   nsAutoCString origin("null");
-  nsContentUtils::GetASCIIOrigin(referrer, origin);
 
-  // Restrict Origin to same-origin loads if requested by user
-  if (StaticPrefs::network_http_sendOriginHeader() == 1) {
-    nsAutoCString currentOrigin;
-    nsContentUtils::GetASCIIOrigin(mURI, currentOrigin);
-    if (!origin.EqualsIgnoreCase(currentOrigin.get())) {
-      // Origin header suppressed by user setting
-      return;
+  if (StaticPrefs::network_http_sendOriginHeader() != 0 && referrer &&
+      ReferrerInfo::IsReferrerSchemeAllowed(referrer) &&
+      !ReferrerInfo::ShouldSetNullOriginHeader(this, referrer) &&
+      !mTaintedOriginFlag) {
+    nsContentUtils::GetASCIIOrigin(referrer, origin);
+
+    // Restrict Origin to same-origin loads if requested by user
+    if (StaticPrefs::network_http_sendOriginHeader() == 1) {
+      nsAutoCString currentOrigin;
+      nsContentUtils::GetASCIIOrigin(mURI, currentOrigin);
+      if (!origin.EqualsIgnoreCase(currentOrigin.get())) {
+        // Origin header suppressed by user setting
+        origin.AssignLiteral("null");
+      }
     }
   }
 
-  if (ReferrerInfo::ShouldSetNullOriginHeader(this, referrer)) {
-    origin.AssignLiteral("null");
-  }
-
   rv = mRequestHead.SetHeader(nsHttp::Origin, origin, false /* merge */);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 }
@@ -10035,7 +10048,8 @@
               ReferrerInfo::GetDefaultReferrerPolicy(nullptr, nullptr,
                                                      isPrivate)) {
         nsCOMPtr<nsIReferrerInfo> newReferrerInfo =
-            referrerInfo->CloneWithNewPolicy(ReferrerPolicy::_empty);
+            referrerInfo->CloneWithNewPolicy(
+                ReferrerInfo::GetDefaultReferrerPolicy(this, mURI, isPrivate));
         // The arguments passed to SetReferrerInfoInternal here should mirror
         // the arguments passed in
         // HttpChannelChild::RecvOverrideReferrerInfoDuringBeginConnect().
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpChannel.h firefox-85.0+build1/netwerk/protocol/http/nsHttpChannel.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpChannel.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpChannel.h	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,7 @@
 #include "DelayHttpChannelQueue.h"
 #include "HttpBaseChannel.h"
 #include "nsTArray.h"
+#include "nsIApplicationCache.h"
 #include "nsICachingChannel.h"
 #include "nsICacheEntry.h"
 #include "nsICacheEntryOpenCallback.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnection.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpConnection.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnection.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpConnection.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,11 +17,6 @@
 #define TLS_EARLY_DATA_AVAILABLE_BUT_NOT_USED 1
 #define TLS_EARLY_DATA_AVAILABLE_AND_USED 2
 
-#define ESNI_SUCCESSFUL 0
-#define ESNI_FAILED 1
-#define NO_ESNI_SUCCESSFUL 2
-#define NO_ESNI_FAILED 3
-
 #include "ASpdySession.h"
 #include "mozilla/ChaosMode.h"
 #include "mozilla/Telemetry.h"
@@ -443,8 +438,6 @@
   nsCOMPtr<nsITransportSecurityInfo> info;
   nsCOMPtr<nsISSLSocketControl> ssl;
   nsAutoCString negotiatedNPN;
-  // This is neede for telemetry
-  bool handshakeSucceeded = false;
 
   GetSecurityInfo(getter_AddRefs(securityInfo));
   if (!securityInfo) {
@@ -561,8 +554,6 @@
           this, mConnInfo->HashKey().get(), negotiatedNPN.get(),
           mTLSFilter ? " [Double Tunnel]" : ""));
 
-    handshakeSucceeded = true;
-
     int16_t tlsVersion;
     ssl->GetSSLVersionUsed(&tlsVersion);
     mConnInfo->SetLessThanTls13(
@@ -701,18 +692,6 @@
     mDid0RTTSpdy = false;
   }
 
-  if (ssl) {
-    // Telemetry for tls failure rate with and without esni;
-    bool esni = false;
-    if (NS_SUCCEEDED(mSocketTransport->GetEsniUsed(&esni))) {
-      Telemetry::Accumulate(
-          Telemetry::ESNI_NOESNI_TLS_SUCCESS_RATE,
-          (esni)
-              ? ((handshakeSucceeded) ? ESNI_SUCCESSFUL : ESNI_FAILED)
-              : ((handshakeSucceeded) ? NO_ESNI_SUCCESSFUL : NO_ESNI_FAILED));
-    }
-  }
-
   if (rv == psm::GetXPCOMFromNSSError(
                 mozilla::pkix::MOZILLA_PKIX_ERROR_MITM_DETECTED)) {
     gSocketTransportService->SetNotTrustedMitmDetected();
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionInfo.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionInfo.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionInfo.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionInfo.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -378,7 +378,7 @@
     clone = new nsHttpConnectionInfo(
         mOrigin, mOriginPort, alpn ? Get<0>(*alpn) : EmptyCString(), mUsername,
         mTopWindowOrigin, mProxyInfo, mOriginAttributes, name,
-        port ? *port : mRoutedPort, mIsolated, isHttp3);
+        port ? *port : mOriginPort, mIsolated, isHttp3);
   }
 
   // Make sure the anonymous, insecure-scheme, and private flags are transferred
@@ -484,6 +484,9 @@
 void nsHttpConnectionInfo::CloneAsDirectRoute(nsHttpConnectionInfo** outCI) {
   if (mRoutedHost.IsEmpty()) {
     RefPtr<nsHttpConnectionInfo> clone = Clone();
+    // Explicitly set mIsHttp3 to false, since CloneAsDirectRoute() is used to
+    // create a non-http3 connection info.
+    clone->mIsHttp3 = false;
     clone.forget(outCI);
     return;
   }
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionMgr.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionMgr.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionMgr.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -17,6 +17,7 @@
 
 #include "NullHttpTransaction.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "mozilla/net/DNS.h"
@@ -637,8 +638,8 @@
 }
 
 HttpConnectionBase* nsHttpConnectionMgr::FindCoalescableConnectionByHashKey(
-    ConnectionEntry* ent, const nsCString& key, bool justKidding,
-    bool aNoHttp2, bool aNoHttp3) {
+    ConnectionEntry* ent, const nsCString& key, bool justKidding, bool aNoHttp2,
+    bool aNoHttp3) {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
   MOZ_ASSERT(!aNoHttp2 || !aNoHttp3);
   MOZ_ASSERT(ent->mConnInfo);
@@ -736,8 +737,8 @@
   // First try and look it up by origin frame
   nsCString newKey;
   BuildOriginFrameHashKey(newKey, ci, ci->GetOrigin(), ci->OriginPort());
-  HttpConnectionBase* conn =
-      FindCoalescableConnectionByHashKey(ent, newKey, justKidding, aNoHttp2, aNoHttp3);
+  HttpConnectionBase* conn = FindCoalescableConnectionByHashKey(
+      ent, newKey, justKidding, aNoHttp2, aNoHttp3);
   if (conn) {
     LOG(("FindCoalescableConnection(%s) match conn %p on frame key %s\n",
          ci->HashKey().get(), conn, newKey.get()));
@@ -1294,8 +1295,7 @@
   // essentially pipelining without head of line blocking
 
   RefPtr<HttpConnectionBase> conn = GetH2orH3ActiveConn(
-      ent,
-      (!gHttpHandler->IsSpdyEnabled() || (caps & NS_HTTP_DISALLOW_SPDY)),
+      ent, (!gHttpHandler->IsSpdyEnabled() || (caps & NS_HTTP_DISALLOW_SPDY)),
       (!gHttpHandler->IsHttp3Enabled() || (caps & NS_HTTP_DISALLOW_HTTP3)));
   if (conn) {
     if (trans->IsWebsocketUpgrade() && !conn->CanAcceptWebsocket()) {
@@ -1627,6 +1627,10 @@
       trans->Caps() & NS_HTTP_DISALLOW_HTTP3);
   MOZ_ASSERT(ent);
 
+  if (gHttpHandler->EchConfigEnabled()) {
+    ent->MaybeUpdateEchConfig(ci);
+  }
+
   ReportProxyTelemetry(ent);
 
   // Check if the transaction already has a sticky reference to a connection.
@@ -1752,7 +1756,8 @@
   uint32_t index;
   // Dispatch all the transactions we can
   for (index = 0; index < pendingQ.Length() &&
-       ((connH3 && connH3->CanDirectlyActivate()) || (connH2 && connH2->CanDirectlyActivate()));
+                  ((connH3 && connH3->CanDirectlyActivate()) ||
+                   (connH2 && connH2->CanDirectlyActivate()));
        ++index) {
     PendingTransactionInfo* pendingTransInfo = pendingQ[index];
 
@@ -1767,7 +1772,8 @@
     if (!(pendingTransInfo->Transaction()->Caps() & NS_HTTP_DISALLOW_HTTP3) &&
         connH3 && connH3->CanDirectlyActivate()) {
       conn = connH3;
-    } else if (!(pendingTransInfo->Transaction()->Caps() & NS_HTTP_DISALLOW_SPDY) &&
+    } else if (!(pendingTransInfo->Transaction()->Caps() &
+                 NS_HTTP_DISALLOW_SPDY) &&
                connH2 && connH2->CanDirectlyActivate()) {
       conn = connH2;
     } else {
@@ -2064,29 +2070,11 @@
     if (trans->ConnectionInfo()) {
       ent = mCT.GetWeak(trans->ConnectionInfo()->HashKey());
     }
-    if (ent) {
-      int32_t transIndex;
-      // We will abandon all half-open sockets belonging to the given
-      // transaction.
-      nsTArray<RefPtr<PendingTransactionInfo>>* infoArray =
-          ent->GetTransactionPendingQHelper(trans);
-
-      RefPtr<PendingTransactionInfo> pendingTransInfo;
-      transIndex =
-          infoArray ? infoArray->IndexOf(trans, 0, PendingComparator()) : -1;
-      if (transIndex >= 0) {
-        LOG(
-            ("nsHttpConnectionMgr::OnMsgCancelTransaction [trans=%p]"
-             " found in urgentStart queue\n",
-             trans));
-        pendingTransInfo = (*infoArray)[transIndex];
-        infoArray->RemoveElementAt(transIndex);
-      }
-
-      // Abandon all half-open sockets belonging to the given transaction.
-      if (pendingTransInfo) {
-        pendingTransInfo->AbandonHalfOpenAndForgetActiveConn();
-      }
+    if (ent && ent->RemoveTransFromPendingQ(trans)) {
+      LOG(
+          ("nsHttpConnectionMgr::OnMsgCancelTransaction [trans=%p]"
+           " removed from pending queue\n",
+           trans));
     }
 
     trans->Close(closeCode);
@@ -2287,7 +2275,8 @@
     // this can happen if the connection is made outside of the
     // connection manager and is being "reclaimed" for use with
     // future transactions. HTTP/2 tunnels work like this.
-    ent = GetOrCreateConnectionEntry(conn->ConnectionInfo(), true, false, false);
+    ent =
+        GetOrCreateConnectionEntry(conn->ConnectionInfo(), true, false, false);
     LOG(
         ("nsHttpConnectionMgr::OnMsgReclaimConnection conn %p "
          "forced new hash entry %s\n",
@@ -3236,7 +3225,8 @@
   anonInvertedCI->SetAnonymous(!specificCI->GetAnonymous());
   ConnectionEntry* invertedEnt = mCT.GetWeak(anonInvertedCI->HashKey());
   if (invertedEnt) {
-    HttpConnectionBase* h2orh3conn = GetH2orH3ActiveConn(invertedEnt, aNoHttp2, aNoHttp3);
+    HttpConnectionBase* h2orh3conn =
+        GetH2orH3ActiveConn(invertedEnt, aNoHttp2, aNoHttp3);
     if (h2orh3conn && h2orh3conn->IsExperienced() &&
         h2orh3conn->NoClientCertAuth()) {
       MOZ_ASSERT(h2orh3conn->UsingSpdy() || h2orh3conn->UsingHttp3());
@@ -3435,7 +3425,8 @@
     return;
   }
 
-  ConnectionEntry* wcEnt = GetOrCreateConnectionEntry(wildCardCI, true, false, false);
+  ConnectionEntry* wcEnt =
+      GetOrCreateConnectionEntry(wildCardCI, true, false, false);
   if (wcEnt == ent) {
     // nothing to do!
     return;
@@ -3457,53 +3448,25 @@
   ent->MoveConnection(proxyConn, wcEnt);
 }
 
-bool nsHttpConnectionMgr::MoveTransToHTTPSSVCConnEntry(
+bool nsHttpConnectionMgr::MoveTransToNewConnEntry(
     nsHttpTransaction* aTrans, nsHttpConnectionInfo* aNewCI) {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
 
-  LOG(("nsHttpConnectionMgr::MoveTransToHTTPSSVCConnEntry: trans=%p aNewCI=%s",
+  LOG(("nsHttpConnectionMgr::MoveTransToNewConnEntry: trans=%p aNewCI=%s",
        aTrans, aNewCI->HashKey().get()));
 
-  bool prohibitWildCard = !!aTrans->TunnelProvider();
-  bool noHttp3 = aTrans->Caps() & NS_HTTP_DISALLOW_HTTP3;
-  bool noHttp2 = aTrans->Caps() & NS_HTTP_DISALLOW_SPDY;
-  // Step 1: Check if the new entry is the same as the old one.
-  ConnectionEntry* oldEntry = GetOrCreateConnectionEntry(
-      aTrans->ConnectionInfo(), prohibitWildCard, noHttp2, noHttp3);
-
-  ConnectionEntry* newEntry =
-      GetOrCreateConnectionEntry(aNewCI, prohibitWildCard, noHttp2, noHttp3);
-
-  if (oldEntry == newEntry) {
-    return true;
+  // Step 1: Get the transaction's connection entry.
+  ConnectionEntry* entry = mCT.GetWeak(aTrans->ConnectionInfo()->HashKey());
+  if (!entry) {
+    return false;
   }
 
   // Step 2: Try to find the undispatched transaction.
-  int32_t transIndex;
-  // We will abandon all half-open sockets belonging to the given
-  // transaction.
-  nsTArray<RefPtr<PendingTransactionInfo>>* infoArray =
-      oldEntry->GetTransactionPendingQHelper(aTrans);
-
-  RefPtr<PendingTransactionInfo> pendingTransInfo;
-  transIndex =
-      infoArray ? infoArray->IndexOf(aTrans, 0, PendingComparator()) : -1;
-  if (transIndex >= 0) {
-    pendingTransInfo = (*infoArray)[transIndex];
-    infoArray->RemoveElementAt(transIndex);
-  }
-
-  // It's fine we can't find the transaction. The transaction may not be added.
-  if (!pendingTransInfo) {
+  if (!entry->RemoveTransFromPendingQ(aTrans)) {
     return false;
   }
 
-  MOZ_ASSERT(pendingTransInfo->Transaction() == aTrans);
-
-  // Abandon all half-open sockets belonging to the given transaction.
-  pendingTransInfo->AbandonHalfOpenAndForgetActiveConn();
-
-  // Step 3: Add the transaction to the new entry.
+  // Step 3: Add the transaction.
   aTrans->UpdateConnectionInfo(aNewCI);
   Unused << ProcessNewTransaction(aTrans);
   return true;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionMgr.h firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionMgr.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpConnectionMgr.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpConnectionMgr.h	2021-01-18 19:58:18.000000000 +0000
@@ -61,7 +61,6 @@
   [[nodiscard]] nsresult CancelTransactions(nsHttpConnectionInfo*,
                                             nsresult reason);
 
-
   //-------------------------------------------------------------------------
   // NOTE: functions below may be called only on the socket thread.
   //-------------------------------------------------------------------------
@@ -75,8 +74,8 @@
   // Move a transaction from the pendingQ of it's connection entry to another
   // one. Returns true if the transaction is moved successfully, otherwise
   // returns false.
-  bool MoveTransToHTTPSSVCConnEntry(nsHttpTransaction* aTrans,
-                                    nsHttpConnectionInfo* aNewCI);
+  bool MoveTransToNewConnEntry(nsHttpTransaction* aTrans,
+                               nsHttpConnectionInfo* aNewCI);
 
   // This is used to force an idle connection to be closed and removed from
   // the idle connection list. It is called when the idle connection detects
@@ -130,12 +129,11 @@
                                bool aFetchHTTPSRR);
 
   HttpConnectionBase* GetH2orH3ActiveConn(ConnectionEntry* ent, bool aNoHttp2,
-      bool aNoHttp3);
+                                          bool aNoHttp3);
 
   void IncreaseNumHalfOpenConns();
   void DecreaseNumHalfOpenConns();
 
-
   // Wen a new idle connection has been added, this function is called to
   // increment mNumIdleConns and update PruneDeadConnections timer.
   void NewIdleConnectionAdded(uint32_t timeToLive);
@@ -189,14 +187,6 @@
   friend class HalfOpenSocket;
   friend class PendingTransactionInfo;
 
-  class PendingComparator {
-   public:
-    bool Equals(const PendingTransactionInfo* aPendingTrans,
-                const nsAHttpTransaction* aTrans) const {
-      return aPendingTrans->Transaction() == aTrans;
-    }
-  };
-
   //-------------------------------------------------------------------------
   // NOTE: these members may be accessed from any thread (use mReentrantMonitor)
   //-------------------------------------------------------------------------
@@ -271,8 +261,7 @@
   void RecvdConnect();
 
   ConnectionEntry* GetOrCreateConnectionEntry(nsHttpConnectionInfo*,
-                                              bool allowWildCard,
-                                              bool aNoHttp2,
+                                              bool allowWildCard, bool aNoHttp2,
                                               bool aNoHttp3);
 
   [[nodiscard]] nsresult MakeNewConnection(
@@ -283,8 +272,7 @@
   nsClassHashtable<nsCStringHashKey, nsTArray<nsWeakPtr>> mCoalescingHash;
 
   HttpConnectionBase* FindCoalescableConnection(ConnectionEntry* ent,
-                                                bool justKidding,
-                                                bool aNoHttp2,
+                                                bool justKidding, bool aNoHttp2,
                                                 bool aNoHttp3);
   HttpConnectionBase* FindCoalescableConnectionByHashKey(ConnectionEntry* ent,
                                                          const nsCString& key,
@@ -296,7 +284,8 @@
 
   void ProcessSpdyPendingQ(ConnectionEntry* ent);
   void DispatchSpdyPendingQ(nsTArray<RefPtr<PendingTransactionInfo>>& pendingQ,
-      ConnectionEntry* ent, HttpConnectionBase* connH2, HttpConnectionBase* connH3);
+                            ConnectionEntry* ent, HttpConnectionBase* connH2,
+                            HttpConnectionBase* connH3);
   // used to marshall events to the socket transport thread.
   [[nodiscard]] nsresult PostEvent(nsConnEventHandler handler,
                                    int32_t iparam = 0,
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttp.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttp.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttp.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttp.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1003,16 +1003,12 @@
   return rv;
 }
 
-Tuple<nsCString, bool> SelectAlpnFromAlpnList(const nsACString& aAlpnList,
-                                              bool aNoHttp2, bool aNoHttp3) {
+Tuple<nsCString, bool> SelectAlpnFromAlpnList(
+    const nsTArray<nsCString>& aAlpnList, bool aNoHttp2, bool aNoHttp3) {
   nsCString h3Value;
   nsCString h2Value;
   nsCString h1Value;
-  // aAlpnList is a list of alpn-id and use comma as a delimiter.
-  nsCCharSeparatedTokenizer tokenizer(aAlpnList, ',');
-  nsAutoCString npnStr;
-  while (tokenizer.hasMoreTokens()) {
-    const nsACString& npnToken(tokenizer.nextToken());
+  for (const auto& npnToken : aAlpnList) {
     bool isHttp3 = gHttpHandler->IsHttp3VersionSupported(npnToken);
     if (isHttp3 && h3Value.IsEmpty()) {
       h3Value.Assign(npnToken);
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttp.h firefox-85.0+build1/netwerk/protocol/http/nsHttp.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttp.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttp.h	2021-01-18 19:58:18.000000000 +0000
@@ -379,8 +379,8 @@
 // Tuple<alpn-id, isHttp3>. The first element is the alpn-id and the second one
 // is a boolean to indicate if this alpn-id is for http3. If no supported
 // alpn-id is found, the first element would be a n empty string.
-Tuple<nsCString, bool> SelectAlpnFromAlpnList(const nsACString& aAlpnList,
-                                              bool aNoHttp2, bool aNoHttp3);
+Tuple<nsCString, bool> SelectAlpnFromAlpnList(
+    const nsTArray<nsCString>& aAlpnList, bool aNoHttp2, bool aNoHttp3);
 
 }  // namespace net
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpHandler.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpHandler.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpHandler.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpHandler.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -122,8 +122,6 @@
 #define TCP_FAST_OPEN_STALLS_TIMEOUT \
   "network.tcp.tcp_fastopen_http_stalls_timeout"
 
-#define ACCEPT_HEADER_NAVIGATION \
-  "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
 #define ACCEPT_HEADER_STYLE "text/css,*/*;q=0.1"
 #define ACCEPT_HEADER_ALL "*/*"
 
@@ -206,6 +204,14 @@
   return mimeTypes;
 }
 
+static nsCString DocumentAcceptHeader(const nsCString& aImageAcceptHeader) {
+  nsPrintfCString mimeTypes(
+      "text/html,application/xhtml+xml,application/xml;q=0.9,%s;q=0.8",
+      aImageAcceptHeader.get());
+
+  return std::move(mimeTypes);
+}
+
 nsHttpHandler::nsHttpHandler()
     : mHttpVersion(HttpVersion::v1_1),
       mProxyHttpVersion(HttpVersion::v1_1),
@@ -246,6 +252,7 @@
       mQoSBits(0x00),
       mEnforceAssocReq(false),
       mImageAcceptHeader(ImageAcceptHeader()),
+      mDocumentAcceptHeader(DocumentAcceptHeader(ImageAcceptHeader())),
       mLastUniqueID(NowInSeconds()),
       mSessionStartTime(0),
       mLegacyAppName("Mozilla"),
@@ -588,6 +595,7 @@
     obsService->AddObserver(this, "intl:app-locales-changed", true);
     obsService->AddObserver(this, "browser-delayed-startup-finished", true);
     obsService->AddObserver(this, "network:captive-portal-connectivity", true);
+    obsService->AddObserver(this, "network:reset-http3-excluded-list", true);
 
     if (!IsNeckoChild()) {
       obsService->AddObserver(
@@ -697,7 +705,7 @@
   nsAutoCString accept;
   if (aContentPolicyType == nsIContentPolicy::TYPE_DOCUMENT ||
       aContentPolicyType == nsIContentPolicy::TYPE_SUBDOCUMENT) {
-    accept.Assign(ACCEPT_HEADER_NAVIGATION);
+    accept.Assign(mDocumentAcceptHeader);
   } else if (aContentPolicyType == nsIContentPolicy::TYPE_IMAGE ||
              aContentPolicyType == nsIContentPolicy::TYPE_IMAGESET) {
     accept.Assign(mImageAcceptHeader);
@@ -1994,8 +2002,11 @@
     }
   }
 
-  if (PREF_CHANGED("image.http.accept") || PREF_CHANGED("image.avif.enabled") ||
-      PREF_CHANGED("image.webp.enabled")) {
+  const bool imageAcceptPrefChanged = PREF_CHANGED("image.http.accept") ||
+                                      PREF_CHANGED("image.avif.enabled") ||
+                                      PREF_CHANGED("image.webp.enabled");
+
+  if (imageAcceptPrefChanged) {
     nsAutoCString userSetImageAcceptHeader;
 
     if (Preferences::HasUserValue("image.http.accept")) {
@@ -2013,6 +2024,24 @@
     }
   }
 
+  if (PREF_CHANGED("network.http.accept") || imageAcceptPrefChanged) {
+    nsAutoCString userSetDocumentAcceptHeader;
+
+    if (Preferences::HasUserValue("network.http.accept")) {
+      rv = Preferences::GetCString("network.http.accept",
+                                   userSetDocumentAcceptHeader);
+      if (NS_FAILED(rv)) {
+        userSetDocumentAcceptHeader.Truncate();
+      }
+    }
+
+    if (userSetDocumentAcceptHeader.IsEmpty()) {
+      mDocumentAcceptHeader.Assign(DocumentAcceptHeader(mImageAcceptHeader));
+    } else {
+      mDocumentAcceptHeader.Assign(userSetDocumentAcceptHeader);
+    }
+  }
+
   if (PREF_CHANGED(HTTP_PREF("http3.alt-svc-mapping-for-testing"))) {
     nsAutoCString altSvcMappings;
     rv = Preferences::GetCString(HTTP_PREF("http3.alt-svc-mapping-for-testing"),
@@ -2474,6 +2503,9 @@
   } else if (!strcmp(topic, "network:captive-portal-connectivity")) {
     nsAutoCString data8 = NS_ConvertUTF16toUTF8(data);
     mThroughCaptivePortal = data8.EqualsLiteral("captive");
+  } else if (!strcmp(topic, "network:reset-http3-excluded-list")) {
+    MutexAutoLock lock(mHttpExclusionLock);
+    mExcludedHttp3Origins.Clear();
   }
 
   return NS_OK;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpHandler.h firefox-85.0+build1/netwerk/protocol/http/nsHttpHandler.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpHandler.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpHandler.h	2021-01-18 19:58:18.000000000 +0000
@@ -30,7 +30,11 @@
 #  include "nsIOService.h"
 #endif
 
-class nsIHttpChannel;
+// XXX These includes can be replaced by forward declarations by moving the On*
+// method implementations to the cpp file
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
+
 class nsIHttpUpgradeListener;
 class nsIPrefBranch;
 class nsICancelable;
@@ -50,6 +54,7 @@
 class Tickler;
 class nsHttpConnection;
 class nsHttpConnectionInfo;
+class HttpBaseChannel;
 class HttpHandlerInitArgs;
 class HttpTransactionShell;
 class AltSvcMapping;
@@ -634,6 +639,7 @@
   bool mEnforceAssocReq;
 
   nsCString mImageAcceptHeader;
+  nsCString mDocumentAcceptHeader;
 
   nsCString mAcceptLanguages;
   nsCString mHttpAcceptEncodings;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpResponseHead.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpResponseHead.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpResponseHead.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpResponseHead.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -465,9 +465,39 @@
     case 417:
       mStatusText.AssignLiteral("Expectation Failed");
       break;
+    case 418:
+      mStatusText.AssignLiteral("I'm a teapot");
+      break;
     case 421:
       mStatusText.AssignLiteral("Misdirected Request");
       break;
+    case 422:
+      mStatusText.AssignLiteral("Unprocessable Entity");
+      break;
+    case 423:
+      mStatusText.AssignLiteral("Locked");
+      break;
+    case 424:
+      mStatusText.AssignLiteral("Failed Dependency");
+      break;
+    case 425:
+      mStatusText.AssignLiteral("Too Early");
+      break;
+    case 426:
+      mStatusText.AssignLiteral("Upgrade Required");
+      break;
+    case 428:
+      mStatusText.AssignLiteral("Precondition Required");
+      break;
+    case 429:
+      mStatusText.AssignLiteral("Too Many Requests");
+      break;
+    case 431:
+      mStatusText.AssignLiteral("Request Header Fields Too Large");
+      break;
+    case 451:
+      mStatusText.AssignLiteral("Unavailable For Legal Reasons");
+      break;
     case 501:
       mStatusText.AssignLiteral("Not Implemented");
       break;
@@ -483,6 +513,21 @@
     case 505:
       mStatusText.AssignLiteral("HTTP Version Unsupported");
       break;
+    case 506:
+      mStatusText.AssignLiteral("Variant Also Negotiates");
+      break;
+    case 507:
+      mStatusText.AssignLiteral("Insufficient Storage ");
+      break;
+    case 508:
+      mStatusText.AssignLiteral("Loop Detected");
+      break;
+    case 510:
+      mStatusText.AssignLiteral("Not Extended");
+      break;
+    case 511:
+      mStatusText.AssignLiteral("Network Authentication Required");
+      break;
     default:
       mStatusText.AssignLiteral("No Reason Phrase");
       break;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpTransaction.cpp firefox-85.0+build1/netwerk/protocol/http/nsHttpTransaction.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpTransaction.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpTransaction.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -16,6 +16,7 @@
 #include "TCPFastOpenLayer.h"
 #include "TunnelUtils.h"
 #include "base/basictypes.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Tokenizer.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "nsCRT.h"
@@ -54,6 +55,7 @@
 #include "nsStringStream.h"
 #include "nsTransportUtils.h"
 #include "sslerr.h"
+#include "SpeculativeTransaction.h"
 
 //-----------------------------------------------------------------------------
 
@@ -63,11 +65,6 @@
 // looking for a response header
 #define MAX_INVALID_RESPONSE_BODY_SIZE (1024 * 128)
 
-// TODO: These values should be removed when bug 1654332 is landed.
-#define MOCK_SSL_ERROR_ECH_RETRY_WITH_ECH (SSL_ERROR_BASE + 188)
-#define MOCK_SSL_ERROR_ECH_RETRY_WITHOUT_ECH (SSL_ERROR_BASE + 189)
-#define MOCK_SSL_ERROR_ECH_FAILED (SSL_ERROR_BASE + 190)
-
 using namespace mozilla::net;
 
 namespace mozilla {
@@ -147,7 +144,9 @@
       mProxyConnectResponseCode(0),
       m421Received(false),
       mDontRetryWithDirectRoute(false),
-      mFastFallbackTriggered(false) {
+      mFastFallbackTriggered(false),
+      mAllRecordsInH3ExcludedListBefore(false),
+      mHttp3BackupTimerCreated(false) {
   this->mSelfAddr.inet = {};
   this->mPeerAddr.inet = {};
   LOG(("Creating nsHttpTransaction @%p\n", this));
@@ -464,6 +463,33 @@
   return NS_OK;
 }
 
+static inline void CreateAndStartTimer(nsCOMPtr<nsITimer>& aTimer,
+                                       nsITimerCallback* aCallback,
+                                       uint32_t aTimeout) {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+  MOZ_ASSERT(!aTimer);
+
+  if (!aTimeout) {
+    return;
+  }
+
+  NS_NewTimerWithCallback(getter_AddRefs(aTimer), aCallback, aTimeout,
+                          nsITimer::TYPE_ONE_SHOT);
+}
+
+void nsHttpTransaction::OnPendingQueueInserted() {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+
+  if (mConnInfo->IsHttp3() && !mResolver) {
+    // Backup timer should only be created once.
+    if (!mHttp3BackupTimerCreated) {
+      CreateAndStartTimer(mHttp3BackupTimer, this,
+                          StaticPrefs::network_http_http3_backup_timer_delay());
+      mHttp3BackupTimerCreated = true;
+    }
+  }
+}
+
 nsresult nsHttpTransaction::AsyncRead(nsIStreamListener* listener,
                                       nsIRequest** pump) {
   RefPtr<nsInputStreamPump> transactionPump;
@@ -549,6 +575,9 @@
   {
     MutexAutoLock lock(mLock);
     mConnection = conn;
+    if (mConnection) {
+      mIsHttp3Used = mConnection->Version() == HttpVersion::v3_0;
+    }
   }
 }
 
@@ -559,12 +588,6 @@
     return;
   }
 
-  if (mFastFallbackTimer && !m0RTTInProgress) {
-    mFastFallbackTimer->Cancel();
-    mFastFallbackTimer = nullptr;
-    mFastFallbackRecord = nullptr;
-  }
-
   if (mTrafficCategory != HttpTrafficCategory::eInvalid) {
     HttpTrafficAnalyzer* hta = gHttpHandler->GetHttpTrafficAnalyzer();
     if (hta) {
@@ -785,9 +808,16 @@
     return mStatus;
   }
 
+  if (!m0RTTInProgress) {
+    MaybeCancelFallbackTimer();
+  }
+
   if (!mConnected && !m0RTTInProgress) {
     mConnected = true;
-    mConnection->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
+    nsCOMPtr<nsISupports> info;
+    mConnection->GetSecurityInfo(getter_AddRefs(info));
+    MutexAutoLock lock(mLock);
+    mSecurityInfo = std::move(info);
   }
 
   mDeferredSendProgress = false;
@@ -1026,7 +1056,10 @@
 
 bool nsHttpTransaction::DataSentToChildProcess() { return false; }
 
-nsISupports* nsHttpTransaction::SecurityInfo() { return mSecurityInfo; }
+already_AddRefed<nsISupports> nsHttpTransaction::SecurityInfo() {
+  MutexAutoLock lock(mLock);
+  return do_AddRef(mSecurityInfo);
+}
 
 bool nsHttpTransaction::HasStickyConnection() const {
   return mCaps & NS_HTTP_STICKY_CONNECTION;
@@ -1038,6 +1071,8 @@
 
 int64_t nsHttpTransaction::GetRequestSize() { return mRequestSize; }
 
+bool nsHttpTransaction::IsHttp3Used() { return mIsHttp3Used; }
+
 bool nsHttpTransaction::Http2Disabled() const {
   return mCaps & NS_HTTP_DISALLOW_SPDY;
 }
@@ -1133,12 +1168,12 @@
 
   // If we already failed to connect with h3, don't select records that supports
   // h3.
-  bool noHttp3 = (mCaps & NS_HTTP_DISALLOW_HTTP3) | mFastFallbackTriggered;
+  bool noHttp3 = mCaps & NS_HTTP_DISALLOW_HTTP3;
 
   nsTArray<RefPtr<nsISVCBRecord>> records;
   Unused << mHTTPSSVCRecord->GetAllRecordsWithEchConfig(
       mCaps & NS_HTTP_DISALLOW_SPDY, noHttp3, &aAllRecordsHaveEchConfig,
-      records);
+      &mAllRecordsInH3ExcludedListBefore, records);
 
   // Note that it's possible that we can't get any usable record here. For
   // example, when http3 connection is failed, we won't select records with
@@ -1167,15 +1202,47 @@
   return !mRecordsForRetry.IsEmpty();
 }
 
+already_AddRefed<nsHttpConnectionInfo>
+nsHttpTransaction::PrepareFastFallbackConnInfo(bool aEchConfigUsed) {
+  MOZ_ASSERT(mHTTPSSVCRecord && mOrigConnInfo);
+
+  RefPtr<nsHttpConnectionInfo> fallbackConnInfo;
+  nsCOMPtr<nsISVCBRecord> fastFallbackRecord;
+  Unused << mHTTPSSVCRecord->GetServiceModeRecord(
+      mCaps & NS_HTTP_DISALLOW_SPDY, true, getter_AddRefs(fastFallbackRecord));
+
+  if (!fastFallbackRecord) {
+    if (aEchConfigUsed) {
+      LOG(
+          ("nsHttpTransaction::PrepareFastFallbackConnInfo [this=%p] no record "
+           "can be used",
+           this));
+      return nullptr;
+    }
+    fallbackConnInfo = mOrigConnInfo;
+  }
+
+  fallbackConnInfo =
+      mOrigConnInfo->CloneAndAdoptHTTPSSVCRecord(fastFallbackRecord);
+  return fallbackConnInfo.forget();
+}
+
 void nsHttpTransaction::PrepareConnInfoForRetry(nsresult aReason) {
   LOG(("nsHttpTransaction::PrepareConnInfoForRetry [this=%p reason=%" PRIx32
        "]",
        this, static_cast<uint32_t>(aReason)));
   RefPtr<nsHttpConnectionInfo> failedConnInfo = mConnInfo->Clone();
   mConnInfo = nullptr;
+  bool echConfigUsed = gHttpHandler->EchConfigEnabled() &&
+                       !failedConnInfo->GetEchConfig().IsEmpty();
 
-  if (!gHttpHandler->EchConfigEnabled() ||
-      failedConnInfo->GetEchConfig().IsEmpty()) {
+  if (mFastFallbackTriggered) {
+    mFastFallbackTriggered = false;
+    mConnInfo = PrepareFastFallbackConnInfo(echConfigUsed);
+    return;
+  }
+
+  if (!echConfigUsed) {
     LOG((" echConfig is not used, fallback to origin conn info"));
     mOrigConnInfo.swap(mConnInfo);
     return;
@@ -1191,8 +1258,7 @@
     }
   });
 
-  if (aReason ==
-      psm::GetXPCOMFromNSSError(MOCK_SSL_ERROR_ECH_RETRY_WITHOUT_ECH)) {
+  if (aReason == psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_RETRY_WITHOUT_ECH)) {
     LOG((" Got SSL_ERROR_ECH_RETRY_WITHOUT_ECH, use empty echConfig to retry"));
     failedConnInfo->SetEchConfig(EmptyCString());
     failedConnInfo.swap(mConnInfo);
@@ -1200,8 +1266,8 @@
     return;
   }
 
-  if (aReason == psm::GetXPCOMFromNSSError(MOCK_SSL_ERROR_ECH_RETRY_WITH_ECH)) {
-    LOG((" Got SSL_ERROR_ECH_RETRY_WITHOUT_ECH, use retry echConfig"));
+  if (aReason == psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_RETRY_WITH_ECH)) {
+    LOG((" Got SSL_ERROR_ECH_RETRY_WITH_ECH, use retry echConfig"));
     MOZ_ASSERT(mConnection);
 
     nsCOMPtr<nsISupports> secInfo;
@@ -1226,10 +1292,10 @@
 
   // Note that we retry the connection not only for SSL_ERROR_ECH_FAILED, but
   // also for all failure cases.
-  if (aReason == psm::GetXPCOMFromNSSError(MOCK_SSL_ERROR_ECH_FAILED) ||
+  if (aReason == psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_FAILED) ||
       NS_FAILED(aReason)) {
     LOG((" Got SSL_ERROR_ECH_FAILED, try other records"));
-    if (aReason == psm::GetXPCOMFromNSSError(MOCK_SSL_ERROR_ECH_FAILED)) {
+    if (aReason == psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_FAILED)) {
       id = Telemetry::TRANSACTION_ECH_RETRY_ECH_FAILED_COUNT;
     }
     if (mRecordsForRetry.IsEmpty()) {
@@ -1248,8 +1314,12 @@
           return;
         }
       } else {
-        LOG((" No available records to retry"));
-        if (gHttpHandler->FallbackToOriginIfConfigsAreECHAndAllFailed()) {
+        LOG(
+            (" No available records to retry, "
+             "mAllRecordsInH3ExcludedListBefore=%d",
+             mAllRecordsInH3ExcludedListBefore));
+        if (gHttpHandler->FallbackToOriginIfConfigsAreECHAndAllFailed() &&
+            !mAllRecordsInH3ExcludedListBefore) {
           mOrigConnInfo.swap(mConnInfo);
         }
         return;
@@ -1272,6 +1342,28 @@
   }
 }
 
+void nsHttpTransaction::MaybeReportFailedSVCDomain(
+    nsresult aReason, nsHttpConnectionInfo* aFailedConnInfo) {
+  if (aReason == psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_RETRY_WITHOUT_ECH) ||
+      aReason != psm::GetXPCOMFromNSSError(SSL_ERROR_ECH_RETRY_WITH_ECH)) {
+    return;
+  }
+
+  Telemetry::Accumulate(Telemetry::DNS_HTTPSSVC_CONNECTION_FAILED_REASON,
+                        ErrorCodeToFailedReason(aReason));
+
+  nsCOMPtr<nsIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID);
+  if (dns) {
+    const nsCString& failedHost = aFailedConnInfo->GetRoutedHost().IsEmpty()
+                                      ? aFailedConnInfo->GetOrigin()
+                                      : aFailedConnInfo->GetRoutedHost();
+    LOG(("add failed domain name [%s] -> [%s] to exclusion list",
+         aFailedConnInfo->GetOrigin().get(), failedHost.get()));
+    Unused << dns->ReportFailedSVCDomainName(aFailedConnInfo->GetOrigin(),
+                                             failedHost);
+  }
+}
+
 void nsHttpTransaction::Close(nsresult reason) {
   LOG(("nsHttpTransaction::Close [this=%p reason=%" PRIx32 "]\n", this,
        static_cast<uint32_t>(reason)));
@@ -1286,11 +1378,7 @@
     mDNSRequest = nullptr;
   }
 
-  if (mFastFallbackTimer) {
-    LOG(("  cancel fast fallback timer"));
-    mFastFallbackTimer->Cancel();
-    mFastFallbackTimer = nullptr;
-  }
+  MaybeCancelFallbackTimer();
 
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
   if (reason == NS_BINDING_RETARGETED) {
@@ -1441,16 +1529,7 @@
                             !reallySentData || connReused)) ||
         restartToFallbackConnInfo) {
       if (restartToFallbackConnInfo) {
-        Telemetry::Accumulate(Telemetry::DNS_HTTPSSVC_CONNECTION_FAILED_REASON,
-                              ErrorCodeToFailedReason(reason));
-        nsCOMPtr<nsIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID);
-        if (dns) {
-          LOG(("add failed domain name [%s] -> [%s] to exclusion list",
-               mConnInfo->GetOrigin().get(), mConnInfo->GetRoutedHost().get()));
-          Unused << dns->ReportFailedSVCDomainName(mConnInfo->GetOrigin(),
-                                                   mConnInfo->GetRoutedHost());
-        }
-
+        MaybeReportFailedSVCDomain(reason, mConnInfo);
         PrepareConnInfoForRetry(reason);
         mDontRetryWithDirectRoute = true;
         LOG(
@@ -1484,6 +1563,14 @@
         }
         return;
       }
+      // mConnInfo could be set to null in PrepareConnInfoForRetry() when we
+      // can't find an available https rr to retry. We have to set mConnInfo
+      // back to mOrigConnInfo to make sure no crash when mConnInfo being
+      // accessed again.
+      if (!mConnInfo) {
+        mConnInfo.swap(mOrigConnInfo);
+        MOZ_ASSERT(mConnInfo);
+      }
     }
   }
 
@@ -1682,7 +1769,11 @@
   if (seekable) seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
 
   // clear old connection state...
-  mSecurityInfo = nullptr;
+  {
+    MutexAutoLock lock(mLock);
+    mSecurityInfo = nullptr;
+  }
+
   if (mConnection) {
     if (!mReuseOnRestart) {
       mConnection->DontReuse();
@@ -2426,12 +2517,19 @@
 void nsHttpTransaction::DisableHttp3() {
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
 
-  mCaps |= NS_HTTP_DISALLOW_HTTP3;
   // mOrigConnInfo is an indicator that HTTPS RR is used, so don't mess up the
   // connection info.
-  // When HTTPS RR is used, PrepareConnInfoForRetry() will make sure we'll retry
-  // with a non-http3 connection info.
-  if (mConnInfo && !mOrigConnInfo) {
+  // When HTTPS RR is used, PrepareConnInfoForRetry() could select other h3
+  // record to connect.
+  if (mOrigConnInfo) {
+    LOG(("nsHttpTransaction::DisableHttp3 this=%p mOrigConnInfo=%s", this,
+         mOrigConnInfo->HashKey().get()));
+    return;
+  }
+
+  mCaps |= NS_HTTP_DISALLOW_HTTP3;
+  MOZ_ASSERT(mConnInfo);
+  if (mConnInfo) {
     // After CloneAsDirectRoute(), http3 will be disabled.
     RefPtr<nsHttpConnectionInfo> connInfo;
     mConnInfo->CloneAsDirectRoute(getter_AddRefs(connInfo));
@@ -2781,11 +2879,8 @@
        aAlpnChanged));
   MOZ_ASSERT(m0RTTInProgress);
   m0RTTInProgress = false;
-  if (mFastFallbackTimer) {
-    mFastFallbackTimer->Cancel();
-    mFastFallbackTimer = nullptr;
-    mFastFallbackRecord = nullptr;
-  }
+
+  MaybeCancelFallbackTimer();
 
   if (!aRestart && (mEarlyDataDisposition == EARLY_SENT)) {
     // note that if this is invoked by a 3 param version of finish0rtt this
@@ -2803,7 +2898,10 @@
   } else if (!mConnected) {
     // this is code that was skipped in ::ReadSegments while in 0RTT
     mConnected = true;
-    mConnection->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
+    nsCOMPtr<nsISupports> info;
+    mConnection->GetSecurityInfo(getter_AddRefs(info));
+    MutexAutoLock lock(mLock);
+    mSecurityInfo = std::move(info);
   }
   return NS_OK;
 }
@@ -2824,7 +2922,10 @@
   nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mRequestStream);
   if (seekable) seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
   // clear old connection state...
-  mSecurityInfo = nullptr;
+  {
+    MutexAutoLock lock(mLock);
+    mSecurityInfo = nullptr;
+  }
 
   if (!mConnInfo->GetRoutedHost().IsEmpty()) {
     RefPtr<nsHttpConnectionInfo> ci;
@@ -2930,12 +3031,10 @@
   LOG(("nsHttpTransaction::OnProxyConnectComplete %p aResponseCode=%d", this,
        aResponseCode));
 
-  MutexAutoLock lock(mLock);
   mProxyConnectResponseCode = aResponseCode;
 }
 
 int32_t nsHttpTransaction::GetProxyConnectResponseCode() {
-  MutexAutoLock lock(mLock);
   return mProxyConnectResponseCode;
 }
 
@@ -3064,8 +3163,8 @@
   RefPtr<nsHttpConnectionInfo> newInfo =
       mConnInfo->CloneAndAdoptHTTPSSVCRecord(svcbRecord);
   bool needFastFallback = !mConnInfo->IsHttp3() && newInfo->IsHttp3();
-  if (!gHttpHandler->ConnMgr()->MoveTransToHTTPSSVCConnEntry(this, newInfo)) {
-    // MoveTransToHTTPSSVCConnEntry() returning fail means this transaction is
+  if (!gHttpHandler->ConnMgr()->MoveTransToNewConnEntry(this, newInfo)) {
+    // MoveTransToNewConnEntry() returning fail means this transaction is
     // not in the connection entry's pending queue. This could happen if
     // OnLookupComplete() is called before this transaction is added in the
     // queue. We still need to update the connection info, so this transaction
@@ -3073,17 +3172,10 @@
     UpdateConnectionInfo(newInfo);
   }
 
-  uint32_t fastFallbackTimeout =
-      StaticPrefs::network_dns_httpssvc_http3_fast_fallback_timeout();
-  if (needFastFallback && fastFallbackTimeout) {
-    if (NS_SUCCEEDED(record->GetServiceModeRecord(
-            mCaps & NS_HTTP_DISALLOW_SPDY, true,
-            getter_AddRefs(mFastFallbackRecord)))) {
-      LOG(("  Setup fastfallback timer"));
-      MOZ_ASSERT(!mFastFallbackTimer);
-      NS_NewTimerWithCallback(getter_AddRefs(mFastFallbackTimer), this,
-                              fastFallbackTimeout, nsITimer::TYPE_ONE_SHOT);
-    }
+  if (needFastFallback) {
+    CreateAndStartTimer(
+        mFastFallbackTimer, this,
+        StaticPrefs::network_dns_httpssvc_http3_fast_fallback_timeout());
   }
 
   // Prefetch the A/AAAA records of the target name.
@@ -3110,48 +3202,131 @@
   return mHTTPSSVCReceivedStage;
 }
 
-NS_IMETHODIMP
-nsHttpTransaction::Notify(nsITimer* aTimer) {
+void nsHttpTransaction::MaybeCancelFallbackTimer() {
+  if (mFastFallbackTimer) {
+    mFastFallbackTimer->Cancel();
+    mFastFallbackTimer = nullptr;
+  }
+
+  if (mHttp3BackupTimer) {
+    mHttp3BackupTimer->Cancel();
+    mHttp3BackupTimer = nullptr;
+  }
+}
+
+void nsHttpTransaction::OnBackupConnectionReady() {
+  LOG(("nsHttpTransaction::OnBackupConnectionReady [%p] mConnected=%d", this,
+       mConnected));
+  if (mConnected || mClosed) {
+    return;
+  }
+
+  HandleFallback(mBackupConnInfo);
+
+  mCaps |= NS_HTTP_DISALLOW_HTTP3;
+  DebugOnly<nsresult> rv =
+      mRequestHead->SetHeader(nsHttp::Alternate_Service_Used, "0"_ns);
+  MOZ_ASSERT(NS_SUCCEEDED(rv));
+}
+
+void nsHttpTransaction::OnHttp3BackupTimer() {
+  LOG(("nsHttpTransaction::OnHttp3BackupTimer [%p]", this));
   MOZ_ASSERT(OnSocketThread(), "not on socket thread");
-  MOZ_ASSERT(aTimer == mFastFallbackTimer, "wrong timer");
-  MOZ_ASSERT(mFastFallbackRecord);
+  MOZ_ASSERT(mConnInfo->IsHttp3());
+
+  mHttp3BackupTimer = nullptr;
+
+  mConnInfo->CloneAsDirectRoute(getter_AddRefs(mBackupConnInfo));
+  MOZ_ASSERT(!mBackupConnInfo->IsHttp3());
+
+  RefPtr<nsHttpTransaction> self = this;
+  auto callback = [self](bool aSucceded) {
+    if (aSucceded) {
+      self->OnBackupConnectionReady();
+    }
+  };
+
+  RefPtr<SpeculativeTransaction> trans = new SpeculativeTransaction(
+      mBackupConnInfo, mCallbacks, mCaps | NS_HTTP_DISALLOW_HTTP3,
+      std::move(callback));
+  gHttpHandler->ConnMgr()->DoSpeculativeConnection(trans, false);
+}
+
+void nsHttpTransaction::OnFastFallbackTimer() {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+  LOG(("nsHttpTransaction::OnFastFallbackTimer [%p] mConnected=%d", this,
+       mConnected));
 
   mFastFallbackTimer = nullptr;
-  if (mActivated) {
-    return NS_OK;
-  }
+  mFastFallbackTriggered = true;
 
-  if (!gHttpHandler || !gHttpHandler->ConnMgr()) {
-    return NS_OK;
+  MOZ_ASSERT(mHTTPSSVCRecord && mOrigConnInfo);
+  if (!mHTTPSSVCRecord || !mOrigConnInfo) {
+    return;
   }
 
-  RefPtr<nsHttpConnectionInfo> connInfo =
-      mOrigConnInfo->CloneAndAdoptHTTPSSVCRecord(mFastFallbackRecord);
-  LOG(("nsHttpTransaction %p fastfallback to connInfo[%s]", this,
-       connInfo->HashKey().get()));
+  RefPtr<nsHttpConnectionInfo> fallbackConnInfo;
+  bool echConfigUsed =
+      gHttpHandler->EchConfigEnabled() && !mConnInfo->GetEchConfig().IsEmpty();
+  fallbackConnInfo = PrepareFastFallbackConnInfo(echConfigUsed);
 
   // Need to backup the origin conn info, since UpdateConnectionInfo() will be
-  // called in MoveTransToHTTPSSVCConnEntry() and mOrigConnInfo will be
+  // called in HandleFallback() and mOrigConnInfo will be
   // replaced.
-  RefPtr<nsHttpConnectionInfo> backup = mOrigConnInfo->Clone();
+  RefPtr<nsHttpConnectionInfo> backup = mOrigConnInfo;
+  HandleFallback(fallbackConnInfo);
+  mOrigConnInfo.swap(backup);
+
+  if (mResolver) {
+    mResolver->PrefetchAddrRecord(fallbackConnInfo->GetRoutedHost(),
+                                  mCaps & NS_HTTP_REFRESH_DNS);
+  }
+}
+
+void nsHttpTransaction::HandleFallback(
+    nsHttpConnectionInfo* aFallbackConnInfo) {
+  if (mConnection) {
+    MOZ_ASSERT(mActivated);
+    // Close the transaction with NS_ERROR_NET_RESET, since we know doing this
+    // will make transaction to be restarted.
+    mConnection->CloseTransaction(this, NS_ERROR_NET_RESET);
+    return;
+  }
+
+  if (!aFallbackConnInfo) {
+    // Nothing to do here.
+    return;
+  }
+
+  LOG(("nsHttpTransaction %p HandleFallback to connInfo[%s]", this,
+       aFallbackConnInfo->HashKey().get()));
+
   bool foundInPendingQ =
-      gHttpHandler->ConnMgr()->MoveTransToHTTPSSVCConnEntry(this, connInfo);
+      gHttpHandler->ConnMgr()->MoveTransToNewConnEntry(this, aFallbackConnInfo);
   if (!foundInPendingQ) {
-    return NS_OK;
+    MOZ_ASSERT(false, "transaction not in entry");
+    return;
   }
 
-  mOrigConnInfo.swap(backup);
-
   // rewind streams in case we already wrote out the request
   nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mRequestStream);
   if (seekable) {
     seekable->Seek(nsISeekableStream::NS_SEEK_SET, 0);
   }
+}
 
-  nsAutoCString targetName;
-  Unused << mFastFallbackRecord->GetName(targetName);
-  if (mResolver) {
-    mResolver->PrefetchAddrRecord(targetName, mCaps & NS_HTTP_REFRESH_DNS);
+NS_IMETHODIMP
+nsHttpTransaction::Notify(nsITimer* aTimer) {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+
+  if (!gHttpHandler || !gHttpHandler->ConnMgr()) {
+    return NS_OK;
+  }
+
+  if (aTimer == mFastFallbackTimer) {
+    OnFastFallbackTimer();
+  } else if (aTimer == mHttp3BackupTimer) {
+    OnHttp3BackupTimer();
   }
 
   return NS_OK;
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsHttpTransaction.h firefox-85.0+build1/netwerk/protocol/http/nsHttpTransaction.h
--- firefox-84.0.2+build1/netwerk/protocol/http/nsHttpTransaction.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsHttpTransaction.h	2021-01-18 19:58:18.000000000 +0000
@@ -223,6 +223,13 @@
                                   bool& aAllRecordsHaveEchConfig);
   // This function setups a new connection info for restarting this transaction.
   void PrepareConnInfoForRetry(nsresult aReason);
+  // This function is used to select the next non http3 record and is only
+  // executed when the fast fallback timer is triggered.
+  already_AddRefed<nsHttpConnectionInfo> PrepareFastFallbackConnInfo(
+      bool aEchConfigUsed);
+
+  void MaybeReportFailedSVCDomain(nsresult aReason,
+                                  nsHttpConnectionInfo* aFailedConnInfo);
 
   already_AddRefed<Http2PushedStreamWrapper> TakePushedStreamById(
       uint32_t aStreamId);
@@ -242,6 +249,12 @@
   HTTPSSVC_CONNECTION_FAILED_REASON ErrorCodeToFailedReason(
       nsresult aErrorCode);
 
+  void OnHttp3BackupTimer();
+  void OnBackupConnectionReady();
+  void OnFastFallbackTimer();
+  void HandleFallback(nsHttpConnectionInfo* aFallbackConnInfo);
+  void MaybeCancelFallbackTimer();
+
  private:
   class UpdateSecurityCallbacks : public Runnable {
    public:
@@ -386,6 +399,7 @@
   bool mDeferredSendProgress;
   bool mWaitingOnPipeOut;
 
+  bool mIsHttp3Used = false;
   bool mDoNotRemoveAltSvc;
 
   // mClosed           := transaction has been explicitly closed
@@ -462,6 +476,8 @@
   void SetTunnelProvider(ASpdySession* provider) { mTunnelProvider = provider; }
   ASpdySession* TunnelProvider() { return mTunnelProvider; }
   nsIInterfaceRequestor* SecurityCallbacks() { return mCallbacks; }
+  // Called when this transaction is inserted in the pending queue.
+  void OnPendingQueueInserted();
 
  private:
   RefPtr<ASpdySession> mTunnelProvider;
@@ -486,7 +502,7 @@
 
   HttpTrafficCategory mTrafficCategory;
   bool mThroughCaptivePortal;
-  int32_t mProxyConnectResponseCode;
+  Atomic<int32_t> mProxyConnectResponseCode;
 
   OnPushCallback mOnPushCallback;
   nsDataHashtable<nsUint32HashKey, RefPtr<Http2PushedStreamWrapper>>
@@ -499,8 +515,11 @@
   nsTArray<RefPtr<nsISVCBRecord>> mRecordsForRetry;
   bool mDontRetryWithDirectRoute = false;
   bool mFastFallbackTriggered = false;
+  bool mAllRecordsInH3ExcludedListBefore = false;
+  bool mHttp3BackupTimerCreated = false;
   nsCOMPtr<nsITimer> mFastFallbackTimer;
-  nsCOMPtr<nsISVCBRecord> mFastFallbackRecord;
+  nsCOMPtr<nsITimer> mHttp3BackupTimer;
+  RefPtr<nsHttpConnectionInfo> mBackupConnInfo;
   RefPtr<HTTPSRecordResolver> mResolver;
 
   // IMPORTANT: when adding new values, always add them to the end, otherwise
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/nsIHttpChannel.idl firefox-85.0+build1/netwerk/protocol/http/nsIHttpChannel.idl
--- firefox-84.0.2+build1/netwerk/protocol/http/nsIHttpChannel.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/nsIHttpChannel.idl	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,10 @@
 interface nsIHttpHeaderVisitor;
 interface nsIReferrerInfo;
 
+%{C++
+#include "GeckoProfiler.h"
+%}
+
 /**
  * nsIHttpChannel
  *
@@ -501,6 +505,6 @@
                              in AString aContentType);
 
 %{ C++
-  virtual void SetSource(UniqueProfilerBacktrace aSource) {}
+  virtual void SetSource(mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource) {}
 %}
 };
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/ParentChannelListener.cpp firefox-85.0+build1/netwerk/protocol/http/ParentChannelListener.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/ParentChannelListener.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/ParentChannelListener.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "ParentChannelListener.h"
 #include "mozilla/dom/ContentParent.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/ServiceWorkerInterceptController.h"
 #include "mozilla/dom/ServiceWorkerUtils.h"
 #include "mozilla/net/HttpChannelParent.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionInfo.h firefox-85.0+build1/netwerk/protocol/http/PendingTransactionInfo.h
--- firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionInfo.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PendingTransactionInfo.h	2021-01-18 19:58:18.000000000 +0000
@@ -46,6 +46,14 @@
   ~PendingTransactionInfo();
 };
 
+class PendingComparator {
+ public:
+  bool Equals(const PendingTransactionInfo* aPendingTrans,
+              const nsAHttpTransaction* aTrans) const {
+    return aPendingTrans->Transaction() == aTrans;
+  }
+};
+
 }  // namespace net
 }  // namespace mozilla
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionQueue.cpp firefox-85.0+build1/netwerk/protocol/http/PendingTransactionQueue.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionQueue.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PendingTransactionQueue.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -25,14 +25,6 @@
              : 0;
 }
 
-class PendingComparator {
- public:
-  bool Equals(const PendingTransactionInfo* aPendingTrans,
-              const nsAHttpTransaction* aTrans) const {
-    return aPendingTrans->Transaction() == aTrans;
-  }
-};
-
 // This function decides the transaction's order in the pending queue.
 // Given two transactions t1 and t2, returning true means that t2 is
 // more important than t1 and thus should be dispatched first.
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionQueue.h firefox-85.0+build1/netwerk/protocol/http/PendingTransactionQueue.h
--- firefox-84.0.2+build1/netwerk/protocol/http/PendingTransactionQueue.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PendingTransactionQueue.h	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef PendingTransactionQueue_h__
 #define PendingTransactionQueue_h__
 
+#include "nsClassHashtable.h"
 #include "nsHttpTransaction.h"
 #include "PendingTransactionInfo.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PHttpBackgroundChannel.ipdl firefox-85.0+build1/netwerk/protocol/http/PHttpBackgroundChannel.ipdl
--- firefox-84.0.2+build1/netwerk/protocol/http/PHttpBackgroundChannel.ipdl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PHttpBackgroundChannel.ipdl	2021-01-18 19:58:18.000000000 +0000
@@ -13,7 +13,7 @@
 
 include "mozilla/net/NeckoMessageUtils.h";
 
-using nsIHttpChannel::FlashPluginState from "mozilla/net/NeckoMessageUtils.h";
+using nsIHttpChannel::FlashPluginState from "nsIHttpChannel.h";
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PHttpChannel.ipdl firefox-85.0+build1/netwerk/protocol/http/PHttpChannel.ipdl
--- firefox-84.0.2+build1/netwerk/protocol/http/PHttpChannel.ipdl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PHttpChannel.ipdl	2021-01-18 19:58:18.000000000 +0000
@@ -14,6 +14,7 @@
 include IPCStream;
 include HttpChannelParams;
 
+include "mozilla/dom/ReferrerInfoUtils.h";
 include "mozilla/net/NeckoMessageUtils.h";
 
 using mozilla::OriginAttributes from "mozilla/ipc/BackgroundUtils.h";
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/PHttpChannelParams.h firefox-85.0+build1/netwerk/protocol/http/PHttpChannelParams.h
--- firefox-84.0.2+build1/netwerk/protocol/http/PHttpChannelParams.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/PHttpChannelParams.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "nsHttp.h"
 #include "nsHttpHeaderArray.h"
 #include "nsHttpRequestHead.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/SpeculativeTransaction.cpp firefox-85.0+build1/netwerk/protocol/http/SpeculativeTransaction.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/SpeculativeTransaction.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/SpeculativeTransaction.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -16,8 +16,10 @@
 
 SpeculativeTransaction::SpeculativeTransaction(
     nsHttpConnectionInfo* aConnInfo, nsIInterfaceRequestor* aCallbacks,
-    uint32_t aCaps)
-    : NullHttpTransaction(aConnInfo, aCallbacks, aCaps) {}
+    uint32_t aCaps, std::function<void(bool)>&& aCallback)
+    : NullHttpTransaction(aConnInfo, aCallbacks, aCaps),
+      mTriedToWrite(false),
+      mCloseCallback(std::move(aCallback)) {}
 
 SpeculativeTransaction::~SpeculativeTransaction() {}
 
@@ -60,5 +62,23 @@
   return NS_OK;
 }
 
+nsresult SpeculativeTransaction::ReadSegments(nsAHttpSegmentReader* aReader,
+                                              uint32_t aCount,
+                                              uint32_t* aCountRead) {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+  mTriedToWrite = true;
+  return NullHttpTransaction::ReadSegments(aReader, aCount, aCountRead);
+}
+
+void SpeculativeTransaction::Close(nsresult aReason) {
+  MOZ_ASSERT(OnSocketThread(), "not on socket thread");
+  NullHttpTransaction::Close(aReason);
+
+  if (mCloseCallback) {
+    mCloseCallback(mTriedToWrite && aReason == NS_BASE_STREAM_CLOSED);
+    mCloseCallback = nullptr;
+  }
+}
+
 }  // namespace net
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/SpeculativeTransaction.h firefox-85.0+build1/netwerk/protocol/http/SpeculativeTransaction.h
--- firefox-84.0.2+build1/netwerk/protocol/http/SpeculativeTransaction.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/SpeculativeTransaction.h	2021-01-18 19:58:18.000000000 +0000
@@ -18,7 +18,8 @@
 class SpeculativeTransaction : public NullHttpTransaction {
  public:
   SpeculativeTransaction(nsHttpConnectionInfo* aConnInfo,
-                         nsIInterfaceRequestor* aCallbacks, uint32_t aCaps);
+                         nsIInterfaceRequestor* aCallbacks, uint32_t aCaps,
+                         std::function<void(bool)>&& aCallback = nullptr);
 
   already_AddRefed<SpeculativeTransaction> CreateWithNewConnInfo(
       nsHttpConnectionInfo* aConnInfo);
@@ -45,6 +46,10 @@
   const Maybe<bool>& IsFromPredictor() { return mIsFromPredictor; }
   const Maybe<bool>& Allow1918() { return mAllow1918; }
 
+  void Close(nsresult aReason) override;
+  nsresult ReadSegments(nsAHttpSegmentReader* aReader, uint32_t aCount,
+                        uint32_t* aCountRead) override;
+
  protected:
   virtual ~SpeculativeTransaction();
 
@@ -53,6 +58,9 @@
   Maybe<bool> mIgnoreIdle;
   Maybe<bool> mIsFromPredictor;
   Maybe<bool> mAllow1918;
+
+  bool mTriedToWrite = false;
+  std::function<void(bool)> mCloseCallback;
 };
 
 }  // namespace net
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/TRRServiceChannel.cpp firefox-85.0+build1/netwerk/protocol/http/TRRServiceChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/TRRServiceChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/TRRServiceChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "HttpLog.h"
 #include "AltServiceChild.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/Unused.h"
 #include "nsDNSPrefetch.h"
diff -Nru firefox-84.0.2+build1/netwerk/protocol/http/TunnelUtils.cpp firefox-85.0+build1/netwerk/protocol/http/TunnelUtils.cpp
--- firefox-84.0.2+build1/netwerk/protocol/http/TunnelUtils.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/http/TunnelUtils.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -2059,9 +2059,9 @@
 }
 
 NS_IMETHODIMP
-SocketTransportShim::GetEsniUsed(bool* aEsniUsed) {
+SocketTransportShim::GetEchConfigUsed(bool* aEchConfigUsed) {
   if (mIsWebsocket) {
-    LOG3(("WARNING: SocketTransportShim::GetEsniUsed %p", this));
+    LOG3(("WARNING: SocketTransportShim::GetEchConfigUsed %p", this));
   }
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -2106,6 +2106,7 @@
 FWD_TS_PTR(IsAlive, bool);
 FWD_TS_PTR(GetConnectionFlags, uint32_t);
 FWD_TS(SetConnectionFlags, uint32_t);
+FWD_TS(SetIsPrivate, bool);
 FWD_TS_PTR(GetTlsFlags, uint32_t);
 FWD_TS(SetTlsFlags, uint32_t);
 FWD_TS_PTR(GetRecvBufferSize, uint32_t);
diff -Nru firefox-84.0.2+build1/netwerk/protocol/res/ExtensionProtocolHandler.cpp firefox-85.0+build1/netwerk/protocol/res/ExtensionProtocolHandler.cpp
--- firefox-84.0.2+build1/netwerk/protocol/res/ExtensionProtocolHandler.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/res/ExtensionProtocolHandler.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -781,9 +781,9 @@
   }
 
   nsCOMPtr<nsIInputStream> inputStream;
-  MOZ_TRY(NS_NewLocalFileInputStream(getter_AddRefs(inputStream), requestedFile,
-                                     PR_RDONLY, -1,
-                                     nsIFileInputStream::DEFER_OPEN));
+  MOZ_TRY_VAR(inputStream,
+              NS_NewLocalFileInputStream(requestedFile, PR_RDONLY, -1,
+                                         nsIFileInputStream::DEFER_OPEN));
 
   return inputStream;
 }
diff -Nru firefox-84.0.2+build1/netwerk/protocol/viewsource/nsIViewSourceChannel.idl firefox-85.0+build1/netwerk/protocol/viewsource/nsIViewSourceChannel.idl
--- firefox-84.0.2+build1/netwerk/protocol/viewsource/nsIViewSourceChannel.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/viewsource/nsIViewSourceChannel.idl	2021-01-18 19:58:18.000000000 +0000
@@ -35,12 +35,9 @@
     [must_use] attribute nsIURI baseURI;
 
     /**
-     * If true (default), then replaces the nsIRequest* passed to
-     * nsIStreamListener callback functions with itself, so that
-     * nsIViewSourceChannel is available.
-     * Otherwise passes through the the nsIRequest* from the inner channel.
+     * Get the inner channel wrapped by this nsIViewSourceChannel.
      */
-    attribute boolean replaceRequest;
+    [notxpcom, nostdcall] nsIChannel getInnerChannel();
 };
 
 
diff -Nru firefox-84.0.2+build1/netwerk/protocol/viewsource/nsViewSourceChannel.cpp firefox-85.0+build1/netwerk/protocol/viewsource/nsViewSourceChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/viewsource/nsViewSourceChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/viewsource/nsViewSourceChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -77,14 +77,7 @@
   mIsSrcdocChannel = false;
 
   mChannel->SetOriginalURI(mOriginalURI);
-  mHttpChannel = do_QueryInterface(mChannel);
-  mHttpChannelInternal = do_QueryInterface(mChannel);
-  mCachingChannel = do_QueryInterface(mChannel);
-  mCacheInfoChannel = do_QueryInterface(mChannel);
-  mApplicationCacheChannel = do_QueryInterface(mChannel);
-  mUploadChannel = do_QueryInterface(mChannel);
-  mPostChannel = do_QueryInterface(mChannel);
-  mChildChannel = do_QueryInterface(mChannel);
+  UpdateChannelInterfaces();
 
   return NS_OK;
 }
@@ -110,13 +103,7 @@
   mIsSrcdocChannel = true;
 
   mChannel->SetOriginalURI(mOriginalURI);
-  mHttpChannel = do_QueryInterface(mChannel);
-  mHttpChannelInternal = do_QueryInterface(mChannel);
-  mCachingChannel = do_QueryInterface(mChannel);
-  mCacheInfoChannel = do_QueryInterface(mChannel);
-  mApplicationCacheChannel = do_QueryInterface(mChannel);
-  mUploadChannel = do_QueryInterface(mChannel);
-  mChildChannel = do_QueryInterface(mChannel);
+  UpdateChannelInterfaces();
 
   rv = UpdateLoadInfoResultPrincipalURI();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -127,6 +114,17 @@
   return NS_OK;
 }
 
+void nsViewSourceChannel::UpdateChannelInterfaces() {
+  mHttpChannel = do_QueryInterface(mChannel);
+  mHttpChannelInternal = do_QueryInterface(mChannel);
+  mCachingChannel = do_QueryInterface(mChannel);
+  mCacheInfoChannel = do_QueryInterface(mChannel);
+  mApplicationCacheChannel = do_QueryInterface(mChannel);
+  mUploadChannel = do_QueryInterface(mChannel);
+  mPostChannel = do_QueryInterface(mChannel);
+  mChildChannel = do_QueryInterface(mChannel);
+}
+
 void nsViewSourceChannel::ReleaseListeners() {
   mListener = nullptr;
   mCallbacks = nullptr;
@@ -647,43 +645,27 @@
   return NS_OK;
 }
 
+nsIChannel* nsViewSourceChannel::GetInnerChannel() { return mChannel; }
+
 NS_IMETHODIMP
 nsViewSourceChannel::GetProtocolVersion(nsACString& aProtocolVersion) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP
-nsViewSourceChannel::GetReplaceRequest(bool* aReplaceRequest) {
-  *aReplaceRequest = mReplaceRequest;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsViewSourceChannel::SetReplaceRequest(bool aReplaceRequest) {
-  mReplaceRequest = aReplaceRequest;
-  return NS_OK;
-}
-
 // nsIRequestObserver methods
 NS_IMETHODIMP
 nsViewSourceChannel::OnStartRequest(nsIRequest* aRequest) {
   NS_ENSURE_TRUE(mListener, NS_ERROR_FAILURE);
   // The channel may have gotten redirected... Time to update our info
   mChannel = do_QueryInterface(aRequest);
-  mHttpChannel = do_QueryInterface(aRequest);
-  mCachingChannel = do_QueryInterface(aRequest);
-  mCacheInfoChannel = do_QueryInterface(mChannel);
-  mUploadChannel = do_QueryInterface(aRequest);
+  UpdateChannelInterfaces();
 
   nsresult rv = UpdateLoadInfoResultPrincipalURI();
   if (NS_FAILED(rv)) {
     Cancel(rv);
   }
 
-  if (mReplaceRequest) {
-    return mListener->OnStartRequest(static_cast<nsIViewSourceChannel*>(this));
-  }
-  return mListener->OnStartRequest(aRequest);
+  return mListener->OnStartRequest(static_cast<nsIViewSourceChannel*>(this));
 }
 
 NS_IMETHODIMP
@@ -698,13 +680,8 @@
     }
   }
 
-  nsresult rv;
-  if (mReplaceRequest) {
-    rv = mListener->OnStopRequest(static_cast<nsIViewSourceChannel*>(this),
-                                  aStatus);
-  } else {
-    rv = mListener->OnStopRequest(aRequest, aStatus);
-  }
+  nsresult rv = mListener->OnStopRequest(
+      static_cast<nsIViewSourceChannel*>(this), aStatus);
 
   ReleaseListeners();
 
@@ -717,12 +694,8 @@
                                      nsIInputStream* aInputStream,
                                      uint64_t aSourceOffset, uint32_t aLength) {
   NS_ENSURE_TRUE(mListener, NS_ERROR_FAILURE);
-  if (mReplaceRequest) {
-    return mListener->OnDataAvailable(static_cast<nsIViewSourceChannel*>(this),
-                                      aInputStream, aSourceOffset, aLength);
-  }
-  return mListener->OnDataAvailable(aRequest, aInputStream, aSourceOffset,
-                                    aLength);
+  return mListener->OnDataAvailable(static_cast<nsIViewSourceChannel*>(this),
+                                    aInputStream, aSourceOffset, aLength);
 }
 
 // nsIHttpChannel methods
diff -Nru firefox-84.0.2+build1/netwerk/protocol/viewsource/nsViewSourceChannel.h firefox-85.0+build1/netwerk/protocol/viewsource/nsViewSourceChannel.h
--- firefox-84.0.2+build1/netwerk/protocol/viewsource/nsViewSourceChannel.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/viewsource/nsViewSourceChannel.h	2021-01-18 19:58:18.000000000 +0000
@@ -11,9 +11,11 @@
 #include "nsCOMPtr.h"
 #include "nsIApplicationCacheChannel.h"
 #include "nsICachingChannel.h"
+#include "nsIChannelEventSink.h"
 #include "nsIFormPOSTActionChannel.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
+#include "nsIInterfaceRequestor.h"
 #include "nsIStreamListener.h"
 #include "nsIURI.h"
 #include "nsIViewSourceChannel.h"
@@ -52,10 +54,7 @@
 
   // nsViewSourceChannel methods:
   nsViewSourceChannel()
-      : mIsDocument(false),
-        mOpened(false),
-        mIsSrcdocChannel(false),
-        mReplaceRequest(true) {}
+      : mIsDocument(false), mOpened(false), mIsSrcdocChannel(false) {}
 
   [[nodiscard]] nsresult Init(nsIURI* uri, nsILoadInfo* aLoadInfo);
 
@@ -79,6 +78,10 @@
   // Clones aURI and prefixes it with "view-source:" schema,
   nsresult BuildViewSourceURI(nsIURI* aURI, nsIURI** aResult);
 
+  // Called to update the forwarding channel members after the `mChannel` field
+  // has been changed to reflect the new inner channel.
+  void UpdateChannelInterfaces();
+
   nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
   nsCOMPtr<nsIChannel> mChannel;
   nsCOMPtr<nsIHttpChannel> mHttpChannel;
@@ -96,7 +99,6 @@
   bool mIsDocument;  // keeps track of the LOAD_DOCUMENT_URI flag
   bool mOpened;
   bool mIsSrcdocChannel;
-  bool mReplaceRequest;
 };
 
 #endif /* nsViewSourceChannel_h___ */
diff -Nru firefox-84.0.2+build1/netwerk/protocol/websocket/PWebSocketEventListener.ipdl firefox-85.0+build1/netwerk/protocol/websocket/PWebSocketEventListener.ipdl
--- firefox-84.0.2+build1/netwerk/protocol/websocket/PWebSocketEventListener.ipdl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/websocket/PWebSocketEventListener.ipdl	2021-01-18 19:58:18.000000000 +0000
@@ -7,7 +7,7 @@
 
 include protocol PNecko;
 
-using mozilla::net::WebSocketFrameData from "ipc/IPCMessageUtils.h";
+using class mozilla::net::WebSocketFrameData from "mozilla/net/WebSocketFrame.h";
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketChannel.cpp firefox-85.0+build1/netwerk/protocol/websocket/WebSocketChannel.cpp
--- firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/websocket/WebSocketChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -40,6 +40,7 @@
 #include "nsIObserverService.h"
 #include "nsCharSeparatedTokenizer.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "nsCRT.h"
@@ -51,6 +52,7 @@
 #include "nsProxyRelease.h"
 #include "nsNetUtil.h"
 #include "nsINode.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
@@ -639,10 +641,10 @@
 // CallAcknowledge
 //-----------------------------------------------------------------------------
 
-class CallAcknowledge final : public CancelableRunnable {
+class CallAcknowledge final : public Runnable {
  public:
   CallAcknowledge(WebSocketChannel* aChannel, uint32_t aSize)
-      : CancelableRunnable("net::CallAcknowledge"),
+      : Runnable("net::CallAcknowledge"),
         mChannel(aChannel),
         mListenerMT(mChannel->mListenerMT),
         mSize(aSize) {}
diff -Nru firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketFrame.cpp firefox-85.0+build1/netwerk/protocol/websocket/WebSocketFrame.cpp
--- firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketFrame.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/websocket/WebSocketFrame.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,10 +6,14 @@
 
 #include "WebSocketFrame.h"
 
-#include "WebSocketChannel.h"
+#include "ErrorList.h"
+#include "MainThreadUtils.h"
+#include "chrome/common/ipc_message_utils.h"
+#include "mozilla/Assertions.h"
+#include "nsDOMNavigationTiming.h"
 #include "nsSocketTransportService2.h"
-#include "nsThreadUtils.h"  // for NS_IsMainThread
-#include "ipc/IPCMessageUtils.h"
+#include "nscore.h"
+#include "prtime.h"
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketFrame.h firefox-85.0+build1/netwerk/protocol/websocket/WebSocketFrame.h
--- firefox-84.0.2+build1/netwerk/protocol/websocket/WebSocketFrame.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/protocol/websocket/WebSocketFrame.h	2021-01-18 19:58:18.000000000 +0000
@@ -7,14 +7,22 @@
 #ifndef mozilla_net_WebSocketFrame_h
 #define mozilla_net_WebSocketFrame_h
 
-#include "nsIWebSocketEventService.h"
-
+#include <cstdint>
+#include "nsISupports.h"
 #include "nsIWebSocketEventService.h"
 #include "nsString.h"
 
+class PickleIterator;
+
+// Avoid including nsDOMNavigationTiming.h here, where the canonical definition
+// of DOMHighResTimeStamp resides.
+typedef double DOMHighResTimeStamp;
+
 namespace IPC {
 class Message;
-}
+template <class P>
+struct ParamTraits;
+}  // namespace IPC
 
 namespace mozilla {
 namespace net {
@@ -72,4 +80,21 @@
 }  // namespace net
 }  // namespace mozilla
 
+namespace IPC {
+template <>
+struct ParamTraits<mozilla::net::WebSocketFrameData> {
+  typedef mozilla::net::WebSocketFrameData paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    aParam.WriteIPCParams(aMsg);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return aResult->ReadIPCParams(aMsg, aIter);
+  }
+};
+
+}  // namespace IPC
+
 #endif  // mozilla_net_WebSocketFrame_h
diff -Nru firefox-84.0.2+build1/netwerk/sctp/datachannel/DataChannel.cpp firefox-85.0+build1/netwerk/sctp/datachannel/DataChannel.cpp
--- firefox-84.0.2+build1/netwerk/sctp/datachannel/DataChannel.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/sctp/datachannel/DataChannel.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -45,6 +45,7 @@
 #include "nsNetCID.h"
 #include "mozilla/RandomNum.h"
 #include "mozilla/StaticMutex.h"
+#include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/RTCDataChannelBinding.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"
diff -Nru firefox-84.0.2+build1/netwerk/socket/neqo_glue/Cargo.toml firefox-85.0+build1/netwerk/socket/neqo_glue/Cargo.toml
--- firefox-84.0.2+build1/netwerk/socket/neqo_glue/Cargo.toml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/socket/neqo_glue/Cargo.toml	2021-01-18 19:58:18.000000000 +0000
@@ -8,10 +8,10 @@
 name = "neqo_glue"
 
 [dependencies]
-neqo-http3 = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-transport = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-common = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-qpack = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
+neqo-http3 = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-transport = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-common = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-qpack = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
 nserror = { path = "../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
 xpcom = { path = "../../../xpcom/rust/xpcom" }
@@ -20,7 +20,7 @@
 qlog = "0.3.0"
 
 [dependencies.neqo-crypto]
-tag = "v0.4.14"
+tag = "v0.4.16"
 git = "https://github.com/mozilla/neqo"
 default-features = false
 features = ["gecko"]
diff -Nru firefox-84.0.2+build1/netwerk/socket/nsITransportSecurityInfo.idl firefox-85.0+build1/netwerk/socket/nsITransportSecurityInfo.idl
--- firefox-84.0.2+build1/netwerk/socket/nsITransportSecurityInfo.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/socket/nsITransportSecurityInfo.idl	2021-01-18 19:58:18.000000000 +0000
@@ -67,6 +67,8 @@
     readonly attribute unsigned short certificateTransparencyStatus;
 
     [must_use]
+    readonly attribute boolean isAcceptedEch;
+    [must_use]
     readonly attribute boolean isDelegatedCredential;
     [must_use]
     readonly attribute boolean isDomainMismatch;
diff -Nru firefox-84.0.2+build1/netwerk/system/netlink/NetlinkService.cpp firefox-85.0+build1/netwerk/system/netlink/NetlinkService.cpp
--- firefox-84.0.2+build1/netwerk/system/netlink/NetlinkService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/system/netlink/NetlinkService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsThreadUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "NetlinkService.h"
+#include "nsIThread.h"
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "mozilla/Logging.h"
diff -Nru firefox-84.0.2+build1/netwerk/system/netlink/NetlinkService.h firefox-85.0+build1/netwerk/system/netlink/NetlinkService.h
--- firefox-84.0.2+build1/netwerk/system/netlink/NetlinkService.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/system/netlink/NetlinkService.h	2021-01-18 19:58:18.000000000 +0000
@@ -17,6 +17,7 @@
 #include "nsClassHashtable.h"
 #include "mozilla/SHA1.h"
 #include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/test/browser/browser.ini firefox-85.0+build1/netwerk/test/browser/browser.ini
--- firefox-84.0.2+build1/netwerk/test/browser/browser.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/browser/browser.ini	2021-01-18 19:58:18.000000000 +0000
@@ -8,7 +8,10 @@
 [browser_bug1535877.js]
 [browser_NetUtil.js]
 [browser_child_resource.js]
-skip-if = !crashreporter || (e10s && debug && os == "linux" && bits == 64) || debug # Bug 1370783
+skip-if = !crashreporter 
+  (e10s && debug && os == "linux" && bits == 64) 
+  debug # Bug 1370783
+  fission # Bug 1670867
 [browser_post_file.js]
 [browser_nsIFormPOSTActionChannel.js]
 skip-if = e10s # protocol handler and channel does not work in content process
diff -Nru firefox-84.0.2+build1/netwerk/test/fuzz/FuzzingStreamListener.h firefox-85.0+build1/netwerk/test/fuzz/FuzzingStreamListener.h
--- firefox-84.0.2+build1/netwerk/test/fuzz/FuzzingStreamListener.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/fuzz/FuzzingStreamListener.h	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 #ifndef FuzzingStreamListener_h__
 #define FuzzingStreamListener_h__
 
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
 #include "nsString.h"
 #include "nsNetUtil.h"
 #include "nsIStreamListener.h"
-#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace net {
diff -Nru firefox-84.0.2+build1/netwerk/test/fuzz/TestFtpFuzzing.cpp firefox-85.0+build1/netwerk/test/fuzz/TestFtpFuzzing.cpp
--- firefox-84.0.2+build1/netwerk/test/fuzz/TestFtpFuzzing.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/fuzz/TestFtpFuzzing.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1,4 +1,5 @@
 #include "mozilla/Preferences.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
@@ -10,6 +11,7 @@
 #include "nsNetUtil.h"
 #include "NullPrincipal.h"
 #include "nsCycleCollector.h"
+#include "nsIChannel.h"
 #include "nsSandboxFlags.h"
 
 #include "nsFtpProtocolHandler.h"
diff -Nru firefox-84.0.2+build1/netwerk/test/fuzz/TestHttpFuzzing.cpp firefox-85.0+build1/netwerk/test/fuzz/TestHttpFuzzing.cpp
--- firefox-84.0.2+build1/netwerk/test/fuzz/TestHttpFuzzing.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/fuzz/TestHttpFuzzing.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,14 @@
 #include "mozilla/LoadInfo.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
 #include "nsString.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsILoadInfo.h"
 #include "nsIProxiedProtocolHandler.h"
 #include "nsIOService.h"
diff -Nru firefox-84.0.2+build1/netwerk/test/fuzz/TestWebsocketFuzzing.cpp firefox-85.0+build1/netwerk/test/fuzz/TestWebsocketFuzzing.cpp
--- firefox-84.0.2+build1/netwerk/test/fuzz/TestWebsocketFuzzing.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/fuzz/TestWebsocketFuzzing.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -2,6 +2,7 @@
 
 #include "FuzzingInterface.h"
 #include "FuzzyLayer.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestBufferedInputStream.cpp firefox-85.0+build1/netwerk/test/gtest/TestBufferedInputStream.cpp
--- firefox-84.0.2+build1/netwerk/test/gtest/TestBufferedInputStream.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestBufferedInputStream.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,9 @@
 #include "gtest/gtest.h"
 
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsBufferedStreams.h"
 #include "nsStreamUtils.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "Helpers.h"
 
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestCommon.h firefox-85.0+build1/netwerk/test/gtest/TestCommon.h
--- firefox-84.0.2+build1/netwerk/test/gtest/TestCommon.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestCommon.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 //-----------------------------------------------------------------------------
 
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestCookie.cpp firefox-85.0+build1/netwerk/test/gtest/TestCookie.cpp
--- firefox-84.0.2+build1/netwerk/test/gtest/TestCookie.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestCookie.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -18,7 +18,9 @@
 #include "nsServiceManagerUtils.h"
 #include "nsNetCID.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "Cookie.h"
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestMIMEInputStream.cpp firefox-85.0+build1/netwerk/test/gtest/TestMIMEInputStream.cpp
--- firefox-84.0.2+build1/netwerk/test/gtest/TestMIMEInputStream.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestMIMEInputStream.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 
 #include "Helpers.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsComponentManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsStreamUtils.h"
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestPartiallySeekableInputStream.cpp firefox-85.0+build1/netwerk/test/gtest/TestPartiallySeekableInputStream.cpp
--- firefox-84.0.2+build1/netwerk/test/gtest/TestPartiallySeekableInputStream.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestPartiallySeekableInputStream.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,7 @@
 #include "nsStreamUtils.h"
 #include "nsString.h"
 #include "nsStringStream.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/net/PartiallySeekableInputStream.h"
 
 using mozilla::GetCurrentSerialEventTarget;
diff -Nru firefox-84.0.2+build1/netwerk/test/gtest/TestSupportAlpn.cpp firefox-85.0+build1/netwerk/test/gtest/TestSupportAlpn.cpp
--- firefox-84.0.2+build1/netwerk/test/gtest/TestSupportAlpn.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/gtest/TestSupportAlpn.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -15,38 +15,44 @@
       do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http");
 
   // h2 and h3 are enabled, so first appearance h3 alpn-id is returned.
-  Tuple<nsCString, bool> result =
-      SelectAlpnFromAlpnList("h3-28,h3-27,h2,http/1.1"_ns, false, false);
+  nsTArray<nsCString> alpn = {"h3-28"_ns, "h3-27"_ns, "h2"_ns, "http/1.1"_ns};
+  Tuple<nsCString, bool> result = SelectAlpnFromAlpnList(alpn, false, false);
   ASSERT_EQ(Get<0>(result), "h3-28"_ns);
   ASSERT_EQ(Get<1>(result), true);
 
   // We don't support h3-26, so we should choose h2.
-  result = SelectAlpnFromAlpnList("h3-26,h2,http/1.1"_ns, false, false);
+  alpn = {"h3-26"_ns, "h2"_ns, "http/1.1"_ns};
+  result = SelectAlpnFromAlpnList(alpn, false, false);
   ASSERT_EQ(Get<0>(result), "h2"_ns);
   ASSERT_EQ(Get<1>(result), false);
 
   // h3 is disabled, so we will use h2.
-  result = SelectAlpnFromAlpnList("h3-28,h3-27,h2,http/1.1"_ns, false, true);
+  alpn = {"h3-28"_ns, "h3-27"_ns, "h2"_ns, "http/1.1"_ns};
+  result = SelectAlpnFromAlpnList(alpn, false, true);
   ASSERT_EQ(Get<0>(result), "h2"_ns);
   ASSERT_EQ(Get<1>(result), false);
 
   // h3 is disabled and h2 is not found, so we will select http/1.1.
-  result = SelectAlpnFromAlpnList("h3-28,h3-27,http/1.1"_ns, false, true);
+  alpn = {"h3-28"_ns, "h3-27"_ns, "http/1.1"_ns};
+  result = SelectAlpnFromAlpnList(alpn, false, true);
   ASSERT_EQ(Get<0>(result), "http/1.1"_ns);
   ASSERT_EQ(Get<1>(result), false);
 
   // h3 and h2 are disabled, so we will select http/1.1.
-  result = SelectAlpnFromAlpnList("h3-28,h3-27,h2,http/1.1"_ns, true, true);
+  alpn = {"h3-28"_ns, "h3-27"_ns, "h2"_ns, "http/1.1"_ns};
+  result = SelectAlpnFromAlpnList(alpn, true, true);
   ASSERT_EQ(Get<0>(result), "http/1.1"_ns);
   ASSERT_EQ(Get<1>(result), false);
 
   // h3 and h2 are disabled and http1.1 is not found, we return an empty string.
-  result = SelectAlpnFromAlpnList("h3-28,h3-27,h2"_ns, true, true);
+  alpn = {"h3-28"_ns, "h3-27"_ns, "h2"_ns};
+  result = SelectAlpnFromAlpnList(alpn, true, true);
   ASSERT_EQ(Get<0>(result), ""_ns);
   ASSERT_EQ(Get<1>(result), false);
 
   // No supported alpn.
-  result = SelectAlpnFromAlpnList("ftp,h2c"_ns, true, true);
+  alpn = {"ftp"_ns, "h2c"_ns};
+  result = SelectAlpnFromAlpnList(alpn, true, true);
   ASSERT_EQ(Get<0>(result), ""_ns);
   ASSERT_EQ(Get<1>(result), false);
 }
diff -Nru firefox-84.0.2+build1/netwerk/test/http3server/Cargo.toml firefox-85.0+build1/netwerk/test/http3server/Cargo.toml
--- firefox-84.0.2+build1/netwerk/test/http3server/Cargo.toml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/http3server/Cargo.toml	2021-01-18 19:58:18.000000000 +0000
@@ -5,16 +5,16 @@
 edition = "2018"
 
 [dependencies]
-neqo-transport = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-common = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-http3 = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
-neqo-qpack = { tag = "v0.4.14", git = "https://github.com/mozilla/neqo" }
+neqo-transport = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-common = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-http3 = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
+neqo-qpack = { tag = "v0.4.16", git = "https://github.com/mozilla/neqo" }
 mio = "0.6.17"
 mio-extras = "2.0.5"
 log = "0.4.0"
 
 [dependencies.neqo-crypto]
-tag = "v0.4.14"
+tag = "v0.4.16"
 git = "https://github.com/mozilla/neqo"
 default-features = false
 features = ["gecko"]
diff -Nru firefox-84.0.2+build1/netwerk/test/http3server/src/main.rs firefox-85.0+build1/netwerk/test/http3server/src/main.rs
--- firefox-84.0.2+build1/netwerk/test/http3server/src/main.rs	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/http3server/src/main.rs	2021-01-18 19:58:18.000000000 +0000
@@ -88,7 +88,7 @@
                     let default_ret = b"Hello World".to_vec();
                     let default_headers = vec![
                         (String::from(":status"), String::from("200")),
-                        (String::from("Cache-Control"), String::from("no-cache")),
+                        (String::from("cache-control"), String::from("no-cache")),
                         (
                             String::from("content-length"),
                             default_ret.len().to_string(),
@@ -106,7 +106,7 @@
                                         &[
                                             (String::from(":status"), String::from("421")),
                                             (
-                                                String::from("Cache-Control"),
+                                                String::from("cache-control"),
                                                 String::from("no-cache"),
                                             ),
                                             (
@@ -143,11 +143,11 @@
                                                 &[
                                                     (String::from(":status"), String::from("200")),
                                                     (
-                                                        String::from("Cache-Control"),
+                                                        String::from("cache-control"),
                                                         String::from("no-cache"),
                                                     ),
                                                     (
-                                                        String::from("Content-Type"),
+                                                        String::from("content-type"),
                                                         String::from("application/json"),
                                                     ),
                                                     (
@@ -169,7 +169,7 @@
                                         &[
                                             (String::from(":status"), String::from("200")),
                                             (
-                                                String::from("Cache-Control"),
+                                                String::from("cache-control"),
                                                 String::from("no-cache"),
                                             ),
                                         ],
@@ -182,7 +182,7 @@
                                         &[
                                             (String::from(":status"), String::from("200")),
                                             (
-                                                String::from("Cache-Control"),
+                                                String::from("cache-control"),
                                                 String::from("no-cache"),
                                             ),
                                         ],
@@ -195,7 +195,7 @@
                                         &[
                                             (String::from(":status"), String::from("200")),
                                             (
-                                                String::from("Cache-Control"),
+                                                String::from("cache-control"),
                                                 String::from("no-cache"),
                                             ),
                                             (String::from("content-length"), 4000.to_string()),
@@ -213,7 +213,7 @@
                                             &[
                                                 (String::from(":status"), String::from("200")),
                                                 (
-                                                    String::from("Cache-Control"),
+                                                    String::from("cache-control"),
                                                     String::from("no-cache"),
                                                 ),
                                                 (String::from("content-length"), v.to_string()),
@@ -249,7 +249,7 @@
                                 .set_response(
                                     &[
                                         (String::from(":status"), String::from("200")),
-                                        (String::from("Cache-Control"), String::from("no-cache")),
+                                        (String::from("cache-control"), String::from("no-cache")),
                                         (String::from("x-data-received-length"), r.to_string()),
                                         (
                                             String::from("content-length"),
diff -Nru firefox-84.0.2+build1/netwerk/test/mochitests/mochitest.ini firefox-85.0+build1/netwerk/test/mochitests/mochitest.ini
--- firefox-84.0.2+build1/netwerk/test/mochitests/mochitest.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/mochitests/mochitest.ini	2021-01-18 19:58:18.000000000 +0000
@@ -16,6 +16,7 @@
   redirect_idn.html
   empty.html
   redirect.sjs
+  redirect_to.sjs
   origin_header.sjs
   origin_header_form_post.html
   origin_header_form_post_xorigin.html
diff -Nru firefox-84.0.2+build1/netwerk/test/mochitests/redirect_to.sjs firefox-85.0+build1/netwerk/test/mochitests/redirect_to.sjs
--- firefox-84.0.2+build1/netwerk/test/mochitests/redirect_to.sjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/mochitests/redirect_to.sjs	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4 @@
+function handleRequest(request, response) {
+  response.setStatusLine(request.httpVersion, 308, "Permanent Redirect");
+  response.setHeader("Location", request.queryString);
+}
diff -Nru firefox-84.0.2+build1/netwerk/test/mochitests/test_origin_header.html firefox-85.0+build1/netwerk/test/mochitests/test_origin_header.html
--- firefox-84.0.2+build1/netwerk/test/mochitests/test_origin_header.html	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/mochitests/test_origin_header.html	2021-01-18 19:58:18.000000000 +0000
@@ -23,15 +23,18 @@
             ["network.http.sendOriginHeader", 0],
         ],
         results: {
-            framePost: EMPTY_ORIGIN,
-            framePostXOrigin: EMPTY_ORIGIN,
+            framePost: "Origin: null",
+            framePostXOrigin: "Origin: null",
             frameGet: EMPTY_ORIGIN,
-            framePostNonSandboxed: EMPTY_ORIGIN,
-            framePostNonSandboxedXOrigin: EMPTY_ORIGIN,
-            framePostSandboxed: EMPTY_ORIGIN,
-            framePostSrcDoc: EMPTY_ORIGIN,
-            framePostSrcDocXOrigin: EMPTY_ORIGIN,
-            framePostDataURI: EMPTY_ORIGIN,
+            framePostNonSandboxed: "Origin: null",
+            framePostNonSandboxedXOrigin: "Origin: null",
+            framePostSandboxed: "Origin: null",
+            framePostSrcDoc: "Origin: null",
+            framePostSrcDocXOrigin: "Origin: null",
+            framePostDataURI: "Origin: null",
+            framePostSameOriginToXOrigin: "Origin: null",
+            framePostXOriginToSameOrigin: "Origin: null",
+            framePostXOriginToXOrigin: "Origin: null",
         },
     },
     {
@@ -41,14 +44,17 @@
         ],
         results: {
             framePost: "Origin: http://mochi.test:8888",
-            framePostXOrigin: EMPTY_ORIGIN,
+            framePostXOrigin: "Origin: null",
             frameGet: EMPTY_ORIGIN,
             framePostNonSandboxed: "Origin: http://mochi.test:8888",
-            framePostNonSandboxedXOrigin: EMPTY_ORIGIN,
-            framePostSandboxed: EMPTY_ORIGIN,
+            framePostNonSandboxedXOrigin: "Origin: null",
+            framePostSandboxed: "Origin: null",
             framePostSrcDoc: "Origin: http://mochi.test:8888",
-            framePostSrcDocXOrigin: EMPTY_ORIGIN,
-            framePostDataURI: EMPTY_ORIGIN,
+            framePostSrcDocXOrigin: "Origin: null",
+            framePostDataURI: "Origin: null",
+            framePostSameOriginToXOrigin: "Origin: null",
+            framePostXOriginToSameOrigin: "Origin: null",
+            framePostXOriginToXOrigin: "Origin: null",
         },
     },
     {
@@ -62,10 +68,13 @@
             frameGet: EMPTY_ORIGIN,
             framePostNonSandboxed: "Origin: http://mochi.test:8888",
             framePostNonSandboxedXOrigin: "Origin: http://mochi.test:8888",
-            framePostSandboxed: EMPTY_ORIGIN,
+            framePostSandboxed: "Origin: null",
             framePostSrcDoc: "Origin: http://mochi.test:8888",
             framePostSrcDocXOrigin: "Origin: http://mochi.test:8888",
-            framePostDataURI: EMPTY_ORIGIN,
+            framePostDataURI: "Origin: null",
+            framePostSameOriginToXOrigin: "Origin: http://mochi.test:8888",
+            framePostXOriginToSameOrigin: "Origin: null",
+            framePostXOriginToXOrigin: "Origin: http://mochi.test:8888",
         },
     },
     {
@@ -79,10 +88,13 @@
             frameGet: EMPTY_ORIGIN,
             framePostNonSandboxed: "Origin: http://mochi.test:8888",
             framePostNonSandboxedXOrigin: "Origin: http://mochi.test:8888",
-            framePostSandboxed: EMPTY_ORIGIN,
+            framePostSandboxed: "Origin: null",
             framePostSrcDoc: "Origin: http://mochi.test:8888",
             framePostSrcDocXOrigin: "Origin: http://mochi.test:8888",
-            framePostDataURI: EMPTY_ORIGIN,
+            framePostDataURI: "Origin: null",
+            framePostSameOriginToXOrigin: "Origin: http://mochi.test:8888",
+            framePostXOriginToSameOrigin: "Origin: null",
+            framePostXOriginToXOrigin: "Origin: http://mochi.test:8888",
         },
     },
     {
@@ -97,10 +109,13 @@
             frameGet: EMPTY_ORIGIN,
             framePostNonSandboxed: "Origin: null",
             framePostNonSandboxedXOrigin: "Origin: null",
-            framePostSandboxed: EMPTY_ORIGIN,
+            framePostSandboxed: "Origin: null",
             framePostSrcDoc: "Origin: null",
             framePostSrcDocXOrigin: "Origin: null",
-            framePostDataURI: EMPTY_ORIGIN,
+            framePostDataURI: "Origin: null",
+            framePostSameOriginToXOrigin: "Origin: null",
+            framePostXOriginToSameOrigin: "Origin: null",
+            framePostXOriginToXOrigin: "Origin: null",
         },
     },
 ];
@@ -151,6 +166,21 @@
         frameID: "framePostDataURI",
         dataURI: "origin_header_form_post.html",
     },
+    {
+        name: "same-origin POST redirected to cross-origin",
+        frameID: "framePostSameOriginToXOrigin",
+        formID: "formPostSameOriginToXOrigin",
+    },
+    {
+        name: "cross-origin POST redirected to same-origin",
+        frameID: "framePostXOriginToSameOrigin",
+        formID: "formPostXOriginToSameOrigin",
+    },
+    {
+        name: "cross-origin POST redirected to cross-origin",
+        frameID: "framePostXOriginToXOrigin",
+        formID: "formPostXOriginToXOrigin",
+    },
 ];
 
 function frameLoaded(test, check)
@@ -306,6 +336,33 @@
             <input type="submit" value="Submit GET">
         </form>
     </td>
+    <td>
+        <iframe src="about:blank" name="framePostSameOriginToXOrigin" id="framePostSameOriginToXOrigin"></iframe>
+        <form action="redirect_to.sjs?http://test1.mochi.test:8888/tests/netwerk/test/mochitests/origin_header.sjs"
+              method="POST"
+              id="formPostSameOriginToXOrigin"
+              target="framePostSameOriginToXOrigin">
+            <input type="Submit" value="Submit SameOrigin POST redirected to XOrigin">
+        </form>
+    </td>
+    <td>
+        <iframe src="about:blank" name="framePostXOriginToSameOrigin" id="framePostXOriginToSameOrigin"></iframe>
+        <form action="http://test1.mochi.test:8888/tests/netwerk/test/mochitests/redirect_to.sjs?http://mochi.test:8888/tests/netwerk/test/mochitests/origin_header.sjs"
+              method="POST"
+              id="formPostXOriginToSameOrigin"
+              target="framePostXOriginToSameOrigin">
+            <input type="Submit" value="Submit XOrigin POST redirected to SameOrigin">
+        </form>
+    </td>
+    <td>
+        <iframe src="about:blank" name="framePostXOriginToXOrigin" id="framePostXOriginToXOrigin"></iframe>
+        <form action="http://test1.mochi.test:8888/tests/netwerk/test/mochitests/redirect_to.sjs?/tests/netwerk/test/mochitests/origin_header.sjs"
+              method="POST"
+              id="formPostXOriginToXOrigin"
+              target="framePostXOriginToXOrigin">
+            <input type="Submit" value="Submit XOrigin POST redirected to XOrigin">
+        </form>
+    </td>
 </tr>
 <tr>
     <td>
diff -Nru firefox-84.0.2+build1/netwerk/test/perf/hooks_throttling.py firefox-85.0+build1/netwerk/test/perf/hooks_throttling.py
--- firefox-84.0.2+build1/netwerk/test/perf/hooks_throttling.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/perf/hooks_throttling.py	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,201 @@
+# 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/.
+"""
+Drives the throttling feature when the test calls our
+controlled server.
+"""
+import time
+import http.client
+import os
+import json
+from urllib.parse import urlparse
+import sys
+
+from mozperftest.test.browsertime import add_option
+from mozperftest.utils import get_tc_secret
+
+
+ENDPOINTS = {
+    "linux": "h3.dev.mozaws.net",
+    "darwin": "h3.mac.dev.mozaws.net",
+    "win32": "h3.win.dev.mozaws.net",
+}
+CTRL_SERVER = ENDPOINTS[sys.platform]
+TASK_CLUSTER = "TASK_ID" in os.environ.keys()
+_SECRET = {
+    "throttler_host": f"https://{CTRL_SERVER}/_throttler",
+    "throttler_key": os.environ.get("WEBNETEM_KEY", ""),
+}
+if TASK_CLUSTER:
+    _SECRET.update(get_tc_secret())
+
+if _SECRET["throttler_key"] == "":
+    raise Exception("WEBNETEM_KEY not set")
+
+_TIMEOUT = 30
+WAIT_TIME = 60 * 10
+IDLE_TIME = 10
+BREATHE_TIME = 20
+
+
+class Throttler:
+    def __init__(self, env, host, key):
+        self.env = env
+        self.host = host
+        self.key = key
+        self.verbose = env.get_arg("verbose", False)
+        self.logger = self.verbose and self.env.info or self.env.debug
+
+    def log(self, msg):
+        self.logger("[throttler] " + msg)
+
+    def _request(self, action, data=None):
+        kw = {}
+        headers = {b"X-WEBNETEM-KEY": self.key}
+        verb = data is None and "GET" or "POST"
+        if data is not None:
+            data = json.dumps(data)
+            headers[b"Content-type"] = b"application/json"
+
+        parsed = urlparse(self.host)
+        server = parsed.netloc
+        path = parsed.path
+        if action != "status":
+            path += "/" + action
+
+        self.log(f"Calling {verb} {path}")
+        conn = http.client.HTTPSConnection(server, timeout=_TIMEOUT)
+        conn.request(verb, path, body=data, headers=headers, **kw)
+        resp = conn.getresponse()
+        res = resp.read()
+        if resp.status >= 400:
+            raise Exception(res)
+        res = json.loads(res)
+        return res
+
+    def start(self, data=None):
+        self.log("Starting")
+        now = time.time()
+        acquired = False
+
+        while time.time() - now < WAIT_TIME:
+            status = self._request("status")
+            if status.get("test_running"):
+                # a test is running
+                self.log("A test is already controlling the server")
+                self.log(f"Waiting {IDLE_TIME} seconds")
+            else:
+                try:
+                    self._request("start_test")
+                    acquired = True
+                    break
+                except Exception:
+                    # we got beat in the race
+                    self.log("Someone else beat us")
+            time.sleep(IDLE_TIME)
+
+        if not acquired:
+            raise Exception("Could not acquire the test server")
+
+        if data is not None:
+            self._request("shape", data)
+
+    def stop(self):
+        self.log("Stopping")
+        try:
+            self._request("reset")
+        finally:
+            self._request("stop_test")
+
+
+def get_throttler(env):
+    host = _SECRET["throttler_host"]
+    key = _SECRET["throttler_key"].encode()
+    return Throttler(env, host, key)
+
+
+_PROTOCOL = "h2", "h3"
+_PAGE = "gallery", "news", "shopping", "photoblog"
+
+# set the network condition here.
+# each item has a name and some netem options:
+#
+# loss_ratio: specify percentage of packets that will be lost
+# loss_corr: specify a correlation factor for the random packet loss
+# dup_ratio: specify percentage of packets that will be duplicated
+# delay: specify an overall delay for each packet
+# jitter: specify amount of jitter in milliseconds
+# delay_jitter_corr: specify a correlation factor for the random jitter
+# reorder_ratio: specify percentage of packets that will be reordered
+# reorder_corr: specify a correlation factor for the random reordering
+#
+_THROTTLING = (
+    {"name": "full"},  # no throttling.
+    {"name": "one", "delay": "20"},
+    {"name": "two", "delay": "50"},
+    {"name": "three", "delay": "100"},
+    {"name": "four", "delay": "200"},
+    {"name": "five", "delay": "300"},
+)
+
+
+def get_test():
+    """Iterate on test conditions.
+
+    For each cycle, we return a combination of: protocol, page, throttling
+    settings. Each combination has a name, and that name will be used along with
+    the protocol as a prefix for each metrics.
+    """
+    for proto in _PROTOCOL:
+        for page in _PAGE:
+            url = f"https://{CTRL_SERVER}/{page}.html"
+            for throttler_settings in _THROTTLING:
+                yield proto, page, url, throttler_settings
+
+
+combo = get_test()
+
+
+def before_cycle(metadata, env, cycle, script):
+    global combo
+    if "throttlable" not in script["tags"]:
+        return
+    throttler = get_throttler(env)
+    try:
+        proto, page, url, throttler_settings = next(combo)
+    except StopIteration:
+        combo = get_test()
+        proto, page, url, throttler_settings = next(combo)
+
+    # setting the url for the browsertime script
+    add_option(env, "browsertime.url", url, overwrite=True)
+
+    # enabling http if needed
+    if proto == "h3":
+        add_option(env, "firefox.preference", "network.http.http3.enabled:true")
+
+    # prefix used to differenciate metrics
+    name = throttler_settings["name"]
+    script["name"] = f"{name}_{proto}_{page}"
+
+    # throttling the controlled server if needed
+    if throttler_settings != {"name": "full"}:
+        env.info("Calling the controlled server")
+        throttler.start(throttler_settings)
+    else:
+        env.info("No throttling for this call")
+        throttler.start()
+
+
+def after_cycle(metadata, env, cycle, script):
+    if "throttlable" not in script["tags"]:
+        return
+    throttler = get_throttler(env)
+    try:
+        throttler.stop()
+    except Exception:
+        pass
+
+    # give a chance for a competitive job to take over
+    time.sleep(BREATHE_TIME)
diff -Nru firefox-84.0.2+build1/netwerk/test/perf/perftest_http3_controlled.js firefox-85.0+build1/netwerk/test/perf/perftest_http3_controlled.js
--- firefox-84.0.2+build1/netwerk/test/perf/perftest_http3_controlled.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/perf/perftest_http3_controlled.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,32 @@
+// 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/.
+/* eslint-env node */
+
+/*
+Ensure the `--firefox.preference=network.http.http3.enabled:true` is
+set for this test.
+*/
+
+async function test(context, commands) {
+  let url = context.options.browsertime.url;
+
+  // Make firefox learn of HTTP/3 server
+  // XXX: Need to build an HTTP/3-specific conditioned profile
+  // to handle these pre-navigations.
+  await commands.navigate(url);
+
+  // Measure initial pageload
+  await commands.measure.start("pageload");
+  await commands.navigate(url);
+  await commands.measure.stop();
+  commands.measure.result[0].browserScripts.pageinfo.url = url;
+}
+
+module.exports = {
+  test,
+  owner: "Network Team",
+  name: "controlled",
+  description: "User-journey live site test for controlled server",
+  tags: ["throttlable"],
+};
diff -Nru firefox-84.0.2+build1/netwerk/test/perf/perftest.ini firefox-85.0+build1/netwerk/test/perf/perftest.ini
--- firefox-84.0.2+build1/netwerk/test/perf/perftest.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/perf/perftest.ini	2021-01-18 19:58:18.000000000 +0000
@@ -1,4 +1,5 @@
 [perftest_http3_cloudflareblog.js]
+[perftest_http3_controlled.js]
 [perftest_http3_facebook_scroll.js]
 [perftest_http3_google_image.js]
 [perftest_http3_google_search.js]
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/head_channels.js firefox-85.0+build1/netwerk/test/unit/head_channels.js
--- firefox-84.0.2+build1/netwerk/test/unit/head_channels.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/head_channels.js	2021-01-18 19:58:18.000000000 +0000
@@ -351,3 +351,106 @@
   objectInStream.setInputStream(pipe.inputStream);
   return objectInStream.readObject(true);
 }
+
+// Copied from head_psm.js.
+function add_tls_server_setup(serverBinName, certsPath, addDefaultRoot = true) {
+  add_test(function() {
+    _setupTLSServerTest(serverBinName, certsPath, addDefaultRoot);
+  });
+}
+
+// Do not call this directly; use add_tls_server_setup
+function _setupTLSServerTest(serverBinName, certsPath, addDefaultRoot) {
+  asyncStartTLSTestServer(serverBinName, certsPath, addDefaultRoot).then(
+    run_next_test
+  );
+}
+
+async function asyncStartTLSTestServer(
+  serverBinName,
+  certsPath,
+  addDefaultRoot
+) {
+  const { HttpServer } = ChromeUtils.import(
+    "resource://testing-common/httpd.js"
+  );
+  let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  // The trusted CA that is typically used for "good" certificates.
+  if (addDefaultRoot) {
+    addCertFromFile(certdb, `${certsPath}/test-ca.pem`, "CTu,u,u");
+  }
+
+  const CALLBACK_PORT = 8444;
+
+  let envSvc = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  let greBinDir = Services.dirsvc.get("GreBinD", Ci.nsIFile);
+  envSvc.set("DYLD_LIBRARY_PATH", greBinDir.path);
+  // TODO(bug 1107794): Android libraries are in /data/local/xpcb, but "GreBinD"
+  // does not return this path on Android, so hard code it here.
+  envSvc.set("LD_LIBRARY_PATH", greBinDir.path + ":/data/local/xpcb");
+  envSvc.set("MOZ_TLS_SERVER_DEBUG_LEVEL", "3");
+  envSvc.set("MOZ_TLS_SERVER_CALLBACK_PORT", CALLBACK_PORT);
+
+  let httpServer = new HttpServer();
+  let serverReady = new Promise(resolve => {
+    httpServer.registerPathHandler("/", function handleServerCallback(
+      aRequest,
+      aResponse
+    ) {
+      aResponse.setStatusLine(aRequest.httpVersion, 200, "OK");
+      aResponse.setHeader("Content-Type", "text/plain");
+      let responseBody = "OK!";
+      aResponse.bodyOutputStream.write(responseBody, responseBody.length);
+      executeSoon(function() {
+        httpServer.stop(resolve);
+      });
+    });
+    httpServer.start(CALLBACK_PORT);
+  });
+
+  let serverBin = _getBinaryUtil(serverBinName);
+  let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
+  process.init(serverBin);
+  let certDir = do_get_file(certsPath, false);
+  Assert.ok(certDir.exists(), `certificate folder (${certsPath}) should exist`);
+  // Using "sql:" causes the SQL DB to be used so we can run tests on Android.
+  process.run(false, ["sql:" + certDir.path, Services.appinfo.processID], 2);
+
+  registerCleanupFunction(function() {
+    process.kill();
+  });
+
+  await serverReady;
+}
+
+function _getBinaryUtil(binaryUtilName) {
+  let utilBin = Services.dirsvc.get("GreD", Ci.nsIFile);
+  // On macOS, GreD is .../Contents/Resources, and most binary utilities
+  // are located there, but certutil is in GreBinD (or .../Contents/MacOS),
+  // so we have to change the path accordingly.
+  if (binaryUtilName === "certutil") {
+    utilBin = Services.dirsvc.get("GreBinD", Ci.nsIFile);
+  }
+  utilBin.append(binaryUtilName + mozinfo.bin_suffix);
+  // If we're testing locally, the above works. If not, the server executable
+  // is in another location.
+  if (!utilBin.exists()) {
+    utilBin = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+    while (utilBin.path.includes("xpcshell")) {
+      utilBin = utilBin.parent;
+    }
+    utilBin.append("bin");
+    utilBin.append(binaryUtilName + mozinfo.bin_suffix);
+  }
+  // But maybe we're on Android, where binaries are in /data/local/xpcb.
+  if (!utilBin.exists()) {
+    utilBin.initWithPath("/data/local/xpcb/");
+    utilBin.append(binaryUtilName);
+  }
+  Assert.ok(utilBin.exists(), `Binary util ${binaryUtilName} should exist`);
+  return utilBin;
+}
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/http2-ca.pem firefox-85.0+build1/netwerk/test/unit/http2-ca.pem
--- firefox-84.0.2+build1/netwerk/test/unit/http2-ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/http2-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -15,4 +15,4 @@
 z2E91VIdpvJGfEfXC3fIe1uO9Jh/E9NVWci84+njkNsl+OyBfOJ8T+pV3SHfWedp
 Zbjwh6UTukIuc3mW0rS/qZOa2w3HQaO53BMbluo0w1+cscOepsATld2HHvSiHB+0
 K8SWFRHdBOU=
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/socks_client_subprocess.js firefox-85.0+build1/netwerk/test/unit/socks_client_subprocess.js
--- firefox-84.0.2+build1/netwerk/test/unit/socks_client_subprocess.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/socks_client_subprocess.js	2021-01-18 19:58:18.000000000 +0000
@@ -4,8 +4,6 @@
 
 var CC = Components.Constructor;
 
-var dns = Cc["@mozilla.org/network/dns-service;1"].getService(Ci.nsIDNSService);
-
 const BinaryInputStream = CC(
   "@mozilla.org/binaryinputstream;1",
   "nsIBinaryInputStream",
@@ -19,14 +17,39 @@
   Ci.nsISocketTransportService
 );
 
-function launchConnection(socks_vers, socks_port, dest_host, dest_port, dns) {
-  var pi_flags = 0;
+function waitForStream(stream, streamType) {
+  return new Promise((resolve, reject) => {
+    stream = stream.QueryInterface(streamType);
+    if (!stream) {
+      reject("stream didn't implement given stream type");
+    }
+    let currentThread = Cc["@mozilla.org/thread-manager;1"].getService()
+      .currentThread;
+    stream.asyncWait(
+      stream => {
+        resolve(stream);
+      },
+      0,
+      0,
+      currentThread
+    );
+  });
+}
+
+async function launchConnection(
+  socks_vers,
+  socks_port,
+  dest_host,
+  dest_port,
+  dns
+) {
+  let pi_flags = 0;
   if (dns == "remote") {
     pi_flags = Ci.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST;
   }
 
-  var pps = new ProtocolProxyService();
-  var pi = pps.newProxyInfo(
+  let pps = new ProtocolProxyService();
+  let pi = pps.newProxyInfo(
     socks_vers,
     "localhost",
     socks_port,
@@ -36,29 +59,43 @@
     -1,
     null
   );
-  var trans = sts.createTransport([], dest_host, dest_port, pi);
-  var input = trans.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-  var output = trans.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0);
-  var bin = new BinaryInputStream(input);
-  var data = bin.readBytes(5);
+  let trans = sts.createTransport([], dest_host, dest_port, pi);
+  let input = trans.openInputStream(0, 0, 0);
+  let output = trans.openOutputStream(0, 0, 0);
+  input = await waitForStream(input, Ci.nsIAsyncInputStream);
+  let bin = new BinaryInputStream(input);
+  let data = bin.readBytes(5);
+  let response;
   if (data == "PING!") {
     print("client: got ping, sending pong.");
-    output.write("PONG!", 5);
+    response = "PONG!";
   } else {
     print("client: wrong data from server:", data);
-    output.write("Error: wrong data received.", 27);
+    response = "Error: wrong data received.";
   }
+  output = await waitForStream(output, Ci.nsIAsyncOutputStream);
+  output.write(response, response.length);
   output.close();
+  input.close();
 }
 
-for (var arg of arguments) {
-  print("client: running test", arg);
-  let test = arg.split("|");
-  launchConnection(
-    test[0],
-    parseInt(test[1]),
-    test[2],
-    parseInt(test[3]),
-    test[4]
-  );
+async function run(args) {
+  for (let arg of args) {
+    print("client: running test", arg);
+    let test = arg.split("|");
+    await launchConnection(
+      test[0],
+      parseInt(test[1]),
+      test[2],
+      parseInt(test[3]),
+      test[4]
+    );
+  }
+}
+
+var satisfied = false;
+run(arguments).then(() => (satisfied = true));
+var mainThread = Cc["@mozilla.org/thread-manager;1"].getService().mainThread;
+while (!satisfied) {
+  mainThread.processNextEvent(true);
 }
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_altsvc_pref.js firefox-85.0+build1/netwerk/test/unit/test_altsvc_pref.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_altsvc_pref.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_altsvc_pref.js	2021-01-18 19:58:18.000000000 +0000
@@ -92,7 +92,6 @@
       Assert.equal(httpVersion, "h3");
     }
 
-    run_next_test();
     do_test_finished();
   },
 };
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_channel_priority.js firefox-85.0+build1/netwerk/test/unit/test_channel_priority.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_channel_priority.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_channel_priority.js	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,6 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Cu, Ci, Assert, run_next_test, add_test, do_register_cleanup */
-/* globals runningInParent, do_send_remote_message */
-/* globals ChannelListener */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_dns_by_type_resolve.js firefox-85.0+build1/netwerk/test/unit/test_dns_by_type_resolve.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_dns_by_type_resolve.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_dns_by_type_resolve.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,204 @@
+/* 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/NetUtil.jsm");
+
+let prefs;
+let h2Port;
+let listen;
+
+const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
+  Ci.nsIDNSService
+);
+const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
+  Ci.nsIThreadManager
+);
+const mainThread = threadManager.currentThread;
+
+const defaultOriginAttributes = {};
+
+function setup() {
+  let env = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  h2Port = env.get("MOZHTTP2_PORT");
+  Assert.notEqual(h2Port, null);
+  Assert.notEqual(h2Port, "");
+
+  // Set to allow the cert presented by our H2 server
+  do_get_profile();
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  prefs.setBoolPref("network.http.spdy.enabled", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
+  // the TRR server is on 127.0.0.1
+  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
+
+  // make all native resolve calls "secretly" resolve localhost instead
+  prefs.setBoolPref("network.dns.native-is-localhost", true);
+
+  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
+  prefs.setIntPref("network.trr.mode", 2); // TRR first
+  prefs.setBoolPref("network.trr.wait-for-portal", false);
+  // don't confirm that TRR is working, just go!
+  prefs.setCharPref("network.trr.confirmationNS", "skip");
+
+  // So we can change the pref without clearing the cache to check a pushed
+  // record with a TRR path that fails.
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+
+  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
+  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
+  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  addCertFromFile(certdb, "http2-ca.pem", "CTu,u,u");
+}
+
+setup();
+registerCleanupFunction(() => {
+  prefs.clearUserPref("network.http.spdy.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled.http2");
+  prefs.clearUserPref("network.dns.localDomains");
+  prefs.clearUserPref("network.dns.native-is-localhost");
+  prefs.clearUserPref("network.trr.mode");
+  prefs.clearUserPref("network.trr.uri");
+  prefs.clearUserPref("network.trr.credentials");
+  prefs.clearUserPref("network.trr.wait-for-portal");
+  prefs.clearUserPref("network.trr.allow-rfc1918");
+  prefs.clearUserPref("network.trr.useGET");
+  prefs.clearUserPref("network.trr.confirmationNS");
+  prefs.clearUserPref("network.trr.bootstrapAddress");
+  prefs.clearUserPref("network.trr.blacklist-duration");
+  prefs.clearUserPref("network.trr.request-timeout");
+  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
+});
+
+let test_answer = "bXkgdm9pY2UgaXMgbXkgcGFzc3dvcmQ=";
+let test_answer_addr = "127.0.0.1";
+
+class DNSListener {
+  constructor() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+  onLookupComplete(inRequest, inRecord, inStatus) {
+    this.resolve([inRequest, inRecord, inStatus]);
+  }
+  // So we can await this as a promise.
+  then() {
+    return this.promise.then.apply(this.promise, arguments);
+  }
+}
+
+DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIDNSListener",
+]);
+
+add_task(async function testTXTResolve() {
+  // use the h2 server as DOH provider
+  prefs.setCharPref(
+    "network.trr.uri",
+    "https://foo.example.com:" + h2Port + "/doh"
+  );
+
+  let listenerEsni = new DNSListener();
+  let request = dns.asyncResolve(
+    "_esni.example.com",
+    dns.RESOLVE_TYPE_TXT,
+    0,
+    null, // resolverInfo
+    listenerEsni,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerEsni;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  let answer = inRecord
+    .QueryInterface(Ci.nsIDNSTXTRecord)
+    .getRecordsAsOneString();
+  Assert.equal(answer, test_answer, "got correct answer");
+});
+
+// verify TXT record pushed on a A record request
+add_task(async function testTXTRecordPushPart1() {
+  prefs.setCharPref(
+    "network.trr.uri",
+    "https://foo.example.com:" + h2Port + "/txt-dns-push"
+  );
+  let listenerAddr = new DNSListener();
+  let request = dns.asyncResolve(
+    "_esni_push.example.com",
+    dns.RESOLVE_TYPE_DEFAULT,
+    0,
+    null, // resolverInfo
+    listenerAddr,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerAddr;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  inRecord.QueryInterface(Ci.nsIDNSAddrRecord);
+  let answer = inRecord.getNextAddrAsString();
+  Assert.equal(answer, test_answer_addr, "got correct answer");
+});
+
+// verify the TXT pushed record
+add_task(async function testTXTRecordPushPart2() {
+  // At this point the second host name should've been pushed and we can resolve it using
+  // cache only. Set back the URI to a path that fails.
+  prefs.setCharPref(
+    "network.trr.uri",
+    "https://foo.example.com:" + h2Port + "/404"
+  );
+  let listenerEsni = new DNSListener();
+  let request = dns.asyncResolve(
+    "_esni_push.example.com",
+    dns.RESOLVE_TYPE_TXT,
+    0,
+    null, // resolverInfo
+    listenerEsni,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerEsni;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  let answer = inRecord
+    .QueryInterface(Ci.nsIDNSTXTRecord)
+    .getRecordsAsOneString();
+  Assert.equal(answer, test_answer, "got correct answer");
+});
+
+add_task(async function testHTTPSSVCResolve() {
+  prefs.setCharPref(
+    "network.trr.uri",
+    "https://foo.example.com:" + h2Port + "/doh"
+  );
+  let listenerEsni = new DNSListener();
+  let request = dns.asyncResolve(
+    "httpssvc_esni.example.com",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listenerEsni,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerEsni;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  let answer = inRecord.QueryInterface(Ci.nsIDNSHTTPSSVCRecord).records;
+  let esni = answer[0].values[0].QueryInterface(Ci.nsISVCParamEchConfig);
+  Assert.equal(esni.echconfig, "testytestystringstring", "got correct answer");
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_esni_dns_fetch.js firefox-85.0+build1/netwerk/test/unit/test_esni_dns_fetch.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_esni_dns_fetch.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_esni_dns_fetch.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-
-let prefs;
-let h2Port;
-let listen;
-
-const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
-  Ci.nsIDNSService
-);
-const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
-  Ci.nsIThreadManager
-);
-const mainThread = threadManager.currentThread;
-
-const defaultOriginAttributes = {};
-
-function setup() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  h2Port = env.get("MOZHTTP2_PORT");
-  Assert.notEqual(h2Port, null);
-  Assert.notEqual(h2Port, "");
-
-  // Set to allow the cert presented by our H2 server
-  do_get_profile();
-  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-
-  prefs.setBoolPref("network.security.esni.enabled", false);
-  prefs.setBoolPref("network.http.spdy.enabled", true);
-  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
-  // the TRR server is on 127.0.0.1
-  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
-
-  // make all native resolve calls "secretly" resolve localhost instead
-  prefs.setBoolPref("network.dns.native-is-localhost", true);
-
-  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
-  prefs.setIntPref("network.trr.mode", 2); // TRR first
-  prefs.setBoolPref("network.trr.wait-for-portal", false);
-  // don't confirm that TRR is working, just go!
-  prefs.setCharPref("network.trr.confirmationNS", "skip");
-
-  // So we can change the pref without clearing the cache to check a pushed
-  // record with a TRR path that fails.
-  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
-
-  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
-  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
-  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
-    Ci.nsIX509CertDB
-  );
-  addCertFromFile(certdb, "http2-ca.pem", "CTu,u,u");
-}
-
-setup();
-registerCleanupFunction(() => {
-  prefs.clearUserPref("network.security.esni.enabled");
-  prefs.clearUserPref("network.http.spdy.enabled");
-  prefs.clearUserPref("network.http.spdy.enabled.http2");
-  prefs.clearUserPref("network.dns.localDomains");
-  prefs.clearUserPref("network.dns.native-is-localhost");
-  prefs.clearUserPref("network.trr.mode");
-  prefs.clearUserPref("network.trr.uri");
-  prefs.clearUserPref("network.trr.credentials");
-  prefs.clearUserPref("network.trr.wait-for-portal");
-  prefs.clearUserPref("network.trr.allow-rfc1918");
-  prefs.clearUserPref("network.trr.useGET");
-  prefs.clearUserPref("network.trr.confirmationNS");
-  prefs.clearUserPref("network.trr.bootstrapAddress");
-  prefs.clearUserPref("network.trr.blacklist-duration");
-  prefs.clearUserPref("network.trr.request-timeout");
-  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
-});
-
-let test_answer = "bXkgdm9pY2UgaXMgbXkgcGFzc3dvcmQ=";
-let test_answer_addr = "127.0.0.1";
-
-class DNSListener {
-  constructor() {
-    this.promise = new Promise(resolve => {
-      this.resolve = resolve;
-    });
-  }
-  onLookupComplete(inRequest, inRecord, inStatus) {
-    this.resolve([inRequest, inRecord, inStatus]);
-  }
-  // So we can await this as a promise.
-  then() {
-    return this.promise.then.apply(this.promise, arguments);
-  }
-}
-
-DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  "nsIDNSListener",
-]);
-
-add_task(async function testEsniRequest() {
-  // use the h2 server as DOH provider
-  prefs.setCharPref(
-    "network.trr.uri",
-    "https://foo.example.com:" + h2Port + "/doh"
-  );
-
-  let listenerEsni = new DNSListener();
-  let request = dns.asyncResolve(
-    "_esni.example.com",
-    dns.RESOLVE_TYPE_TXT,
-    0,
-    null, // resolverInfo
-    listenerEsni,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerEsni;
-  Assert.equal(inRequest, request, "correct request was used");
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  let answer = inRecord
-    .QueryInterface(Ci.nsIDNSTXTRecord)
-    .getRecordsAsOneString();
-  Assert.equal(answer, test_answer, "got correct answer");
-});
-
-// verify esni record pushed on a A record request
-add_task(async function testEsniPushPart1() {
-  prefs.setCharPref(
-    "network.trr.uri",
-    "https://foo.example.com:" + h2Port + "/esni-dns-push"
-  );
-  let listenerAddr = new DNSListener();
-  let request = dns.asyncResolve(
-    "_esni_push.example.com",
-    dns.RESOLVE_TYPE_DEFAULT,
-    0,
-    null, // resolverInfo
-    listenerAddr,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerAddr;
-  Assert.equal(inRequest, request, "correct request was used");
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  inRecord.QueryInterface(Ci.nsIDNSAddrRecord);
-  let answer = inRecord.getNextAddrAsString();
-  Assert.equal(answer, test_answer_addr, "got correct answer");
-});
-
-// verify the esni pushed record
-add_task(async function testEsniPushPart2() {
-  // At this point the second host name should've been pushed and we can resolve it using
-  // cache only. Set back the URI to a path that fails.
-  prefs.setCharPref(
-    "network.trr.uri",
-    "https://foo.example.com:" + h2Port + "/404"
-  );
-  let listenerEsni = new DNSListener();
-  let request = dns.asyncResolve(
-    "_esni_push.example.com",
-    dns.RESOLVE_TYPE_TXT,
-    0,
-    null, // resolverInfo
-    listenerEsni,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerEsni;
-  Assert.equal(inRequest, request, "correct request was used");
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  let answer = inRecord
-    .QueryInterface(Ci.nsIDNSTXTRecord)
-    .getRecordsAsOneString();
-  Assert.equal(answer, test_answer, "got correct answer");
-});
-
-add_task(async function testEsniHTTPSSVC() {
-  prefs.setCharPref(
-    "network.trr.uri",
-    "https://foo.example.com:" + h2Port + "/doh"
-  );
-  let listenerEsni = new DNSListener();
-  let request = dns.asyncResolve(
-    "httpssvc_esni.example.com",
-    dns.RESOLVE_TYPE_HTTPSSVC,
-    0,
-    null, // resolverInfo
-    listenerEsni,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerEsni;
-  Assert.equal(inRequest, request, "correct request was used");
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  let answer = inRecord.QueryInterface(Ci.nsIDNSHTTPSSVCRecord).records;
-  let esni = answer[0].values[0].QueryInterface(Ci.nsISVCParamEchConfig);
-  Assert.equal(esni.echconfig, "testytestystringstring", "got correct answer");
-});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_http3_error_before_connect.js firefox-85.0+build1/netwerk/test/unit/test_http3_error_before_connect.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_http3_error_before_connect.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_http3_error_before_connect.js	2021-01-18 19:58:18.000000000 +0000
@@ -12,6 +12,7 @@
   Services.prefs.clearUserPref(
     "network.http.http3.alt-svc-mapping-for-testing"
   );
+  Services.prefs.clearUserPref("network.http.http3.backup_timer_delay");
   dump("cleanup done\n");
 });
 
@@ -53,6 +54,7 @@
     "network.http.http3.alt-svc-mapping-for-testing",
     "foo.example.com;h3-27=:" + h3Port
   );
+  Services.prefs.setIntPref("network.http.http3.backup_timer_delay", 0);
 
   let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
     Ci.nsIX509CertDB
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_http3_fast_fallback.js firefox-85.0+build1/netwerk/test/unit/test_http3_fast_fallback.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_http3_fast_fallback.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_http3_fast_fallback.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,597 @@
+/* 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/NetUtil.jsm");
+var { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+
+let prefs;
+let h2Port;
+let h3Port;
+let listen;
+let trrServer;
+
+const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
+  Ci.nsIDNSService
+);
+const certOverrideService = Cc[
+  "@mozilla.org/security/certoverride;1"
+].getService(Ci.nsICertOverrideService);
+const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
+  Ci.nsIThreadManager
+);
+const mainThread = threadManager.currentThread;
+
+const defaultOriginAttributes = {};
+
+function setup() {
+  let env = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  h2Port = env.get("MOZHTTP2_PORT");
+  Assert.notEqual(h2Port, null);
+  Assert.notEqual(h2Port, "");
+
+  h3Port = env.get("MOZHTTP3_PORT_NO_RESPONSE");
+  Assert.notEqual(h3Port, null);
+  Assert.notEqual(h3Port, "");
+
+  // Set to allow the cert presented by our H2 server
+  do_get_profile();
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  prefs.setBoolPref("network.security.esni.enabled", false);
+  prefs.setBoolPref("network.http.spdy.enabled", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
+  // the TRR server is on 127.0.0.1
+  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
+
+  // make all native resolve calls "secretly" resolve localhost instead
+  prefs.setBoolPref("network.dns.native-is-localhost", true);
+
+  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
+  prefs.setIntPref("network.trr.mode", 2); // TRR first
+  prefs.setBoolPref("network.trr.wait-for-portal", false);
+  // don't confirm that TRR is working, just go!
+  prefs.setCharPref("network.trr.confirmationNS", "skip");
+
+  // So we can change the pref without clearing the cache to check a pushed
+  // record with a TRR path that fails.
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+
+  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
+  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
+  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  addCertFromFile(certdb, "http2-ca.pem", "CTu,u,u");
+}
+
+setup();
+registerCleanupFunction(async () => {
+  prefs.clearUserPref("network.security.esni.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled.http2");
+  prefs.clearUserPref("network.dns.localDomains");
+  prefs.clearUserPref("network.dns.native-is-localhost");
+  prefs.clearUserPref("network.trr.mode");
+  prefs.clearUserPref("network.trr.uri");
+  prefs.clearUserPref("network.trr.credentials");
+  prefs.clearUserPref("network.trr.wait-for-portal");
+  prefs.clearUserPref("network.trr.allow-rfc1918");
+  prefs.clearUserPref("network.trr.useGET");
+  prefs.clearUserPref("network.trr.confirmationNS");
+  prefs.clearUserPref("network.trr.bootstrapAddress");
+  prefs.clearUserPref("network.trr.request-timeout");
+  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
+  prefs.clearUserPref("network.dns.upgrade_with_https_rr");
+  prefs.clearUserPref("network.dns.use_https_rr_as_altsvc");
+  prefs.clearUserPref("network.dns.echconfig.enabled");
+  prefs.clearUserPref("network.dns.echconfig.fallback_to_origin");
+  prefs.clearUserPref("network.dns.httpssvc.reset_exclustion_list");
+  prefs.clearUserPref("network.http.http3.enabled");
+  prefs.clearUserPref("network.dns.httpssvc.http3_fast_fallback_timeout");
+  Services.prefs.clearUserPref(
+    "network.http.http3.alt-svc-mapping-for-testing"
+  );
+  Services.prefs.clearUserPref("network.http.http3.backup_timer_delay");
+  Services.prefs.clearUserPref("network.http.speculative-parallel-limit");
+  if (trrServer) {
+    await trrServer.stop();
+  }
+});
+
+class DNSListener {
+  constructor() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+  onLookupComplete(inRequest, inRecord, inStatus) {
+    this.resolve([inRequest, inRecord, inStatus]);
+  }
+  // So we can await this as a promise.
+  then() {
+    return this.promise.then.apply(this.promise, arguments);
+  }
+}
+
+DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIDNSListener",
+]);
+
+function makeChan(url) {
+  let chan = NetUtil.newChannel({
+    uri: url,
+    loadUsingSystemPrincipal: true,
+  }).QueryInterface(Ci.nsIHttpChannel);
+  chan.loadFlags = Ci.nsIChannel.LOAD_INITIAL_DOCUMENT_URI;
+  return chan;
+}
+
+function channelOpenPromise(chan, flags) {
+  return new Promise(resolve => {
+    function finish(req, buffer) {
+      resolve([req, buffer]);
+      certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+        false
+      );
+    }
+    let internal = chan.QueryInterface(Ci.nsIHttpChannelInternal);
+    internal.setWaitForHTTPSSVCRecord();
+    certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+      true
+    );
+    chan.asyncOpen(new ChannelListener(finish, null, flags));
+  });
+}
+
+let CheckOnlyHttp2Listener = function() {};
+
+CheckOnlyHttp2Listener.prototype = {
+  onStartRequest: function testOnStartRequest(request) {},
+
+  onDataAvailable: function testOnDataAvailable(request, stream, off, cnt) {
+    read_stream(stream, cnt);
+  },
+
+  onStopRequest: function testOnStopRequest(request, status) {
+    Assert.equal(status, Cr.NS_OK);
+    let httpVersion = "";
+    try {
+      httpVersion = request.protocolVersion;
+    } catch (e) {}
+    Assert.equal(httpVersion, "h2");
+
+    let routed = "NA";
+    try {
+      routed = request.getRequestHeader("Alt-Used");
+    } catch (e) {}
+    dump("routed is " + routed + "\n");
+    Assert.ok(routed === "0" || routed === "NA");
+    this.finish();
+  },
+};
+
+async function fast_fallback_test() {
+  let result = 1;
+  // We need to loop here because we need to wait for AltSvc storage to
+  // to be started.
+  // We also do not have a way to verify that HTTP3 has been tried, because
+  // the fallback is automatic, so try a couple of times.
+  do {
+    // We need to close HTTP2 connections, otherwise our connection pooling
+    // will dispatch the request over already existing HTTP2 connection.
+    Services.obs.notifyObservers(null, "net:prune-all-connections");
+    let chan = makeChan(`https://foo.example.com:${h2Port}/`);
+    let listener = new CheckOnlyHttp2Listener();
+    await altsvcSetupPromise(chan, listener);
+    result++;
+  } while (result < 3);
+}
+
+// Test the case when speculative connection is enabled. In this case, when the
+// backup connection is ready, the http transaction is still in pending
+// queue because the h3 connection is never ready to accept transactions.
+add_task(async function test_fast_fallback_with_speculative_connection() {
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+  Services.prefs.setCharPref("network.dns.localDomains", "foo.example.com");
+  // Set AltSvc to point to not existing HTTP3 server on port 443
+  Services.prefs.setCharPref(
+    "network.http.http3.alt-svc-mapping-for-testing",
+    "foo.example.com;h3-27=:" + h3Port
+  );
+  Services.prefs.setBoolPref("network.dns.disableIPv6", true);
+  Services.prefs.setIntPref("network.http.speculative-parallel-limit", 6);
+
+  await fast_fallback_test();
+});
+
+let HTTPObserver = {
+  observeActivity(
+    aChannel,
+    aType,
+    aSubtype,
+    aTimestamp,
+    aSizeData,
+    aStringData
+  ) {
+    aChannel.QueryInterface(Ci.nsIChannel);
+    if (aChannel.URI.spec == `https://foo.example.com:${h2Port}/`) {
+      if (
+        aType == Ci.nsIHttpActivityDistributor.ACTIVITY_TYPE_HTTP_TRANSACTION &&
+        aSubtype ==
+          Ci.nsIHttpActivityDistributor.ACTIVITY_SUBTYPE_REQUEST_HEADER
+      ) {
+        // We need to enable speculative connection again, since the backup
+        // connection is done by using speculative connection.
+        Services.prefs.setIntPref("network.http.speculative-parallel-limit", 6);
+        let observerService = Cc[
+          "@mozilla.org/network/http-activity-distributor;1"
+        ].getService(Ci.nsIHttpActivityDistributor);
+        observerService.removeObserver(HTTPObserver);
+      }
+    }
+  },
+};
+
+// Test the case when speculative connection is disabled. In this case, when the
+// back connection is ready, the http transaction is already activated,
+// but the socket is not ready to write.
+add_task(async function test_fast_fallback_without_speculative_connection() {
+  // Make sure the h3 connection created by the previous test is cleared.
+  Services.obs.notifyObservers(null, "net:cancel-all-connections");
+  await new Promise(resolve => setTimeout(resolve, 1000));
+  // Clear the h3 excluded list, otherwise the Alt-Svc mapping will not be used.
+  Services.obs.notifyObservers(null, "network:reset-http3-excluded-list");
+  Services.prefs.setIntPref("network.http.speculative-parallel-limit", 0);
+
+  let observerService = Cc[
+    "@mozilla.org/network/http-activity-distributor;1"
+  ].getService(Ci.nsIHttpActivityDistributor);
+  observerService.addObserver(HTTPObserver);
+
+  await fast_fallback_test();
+
+  Services.prefs.clearUserPref(
+    "network.http.http3.alt-svc-mapping-for-testing"
+  );
+});
+
+// Test when echConfig is disabled and we have https rr for http3. We use a
+// longer timeout in this test, so when fast fallback timer is triggered, the
+// http transaction is already activated.
+add_task(async function testFastfallback() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", false);
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    1000
+  );
+
+  await trrServer.registerDoHAnswers("test.fastfallback.com", "HTTPS", [
+    {
+      name: "test.fastfallback.com",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "test.fastfallback1.com",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "test.fastfallback.com",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "test.fastfallback2.com",
+        values: [
+          { key: "alpn", value: "h2" },
+          { key: "port", value: h2Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.fastfallback1.com", "A", [
+    {
+      name: "test.fastfallback1.com",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.fastfallback2.com", "A", [
+    {
+      name: "test.fastfallback2.com",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let chan = makeChan(`https://test.fastfallback.com/server-timing`);
+  let [req, resp] = await channelOpenPromise(chan);
+  Assert.equal(req.protocolVersion, "h2");
+  let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
+  Assert.equal(internal.remotePort, h2Port);
+
+  await trrServer.stop();
+});
+
+// Like the previous test, but with a shorter timeout, so when fast fallback
+// timer is triggered, the http transaction is still in pending queue.
+add_task(async function testFastfallback1() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", false);
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    10
+  );
+
+  await trrServer.registerDoHAnswers("test.fastfallback.org", "HTTPS", [
+    {
+      name: "test.fastfallback.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "test.fastfallback1.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "test.fastfallback.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "test.fastfallback2.org",
+        values: [
+          { key: "alpn", value: "h2" },
+          { key: "port", value: h2Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.fastfallback1.org", "A", [
+    {
+      name: "test.fastfallback1.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.fastfallback2.org", "A", [
+    {
+      name: "test.fastfallback2.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let chan = makeChan(`https://test.fastfallback.org/server-timing`);
+  let [req, resp] = await channelOpenPromise(chan);
+  Assert.equal(req.protocolVersion, "h2");
+  let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
+  Assert.equal(internal.remotePort, h2Port);
+
+  await trrServer.stop();
+});
+
+// Test when echConfig is enabled, we can sucessfully fallback to the last
+// record.
+add_task(async function testFastfallbackWithEchConfig() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", true);
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    1000
+  );
+
+  await trrServer.registerDoHAnswers("test.ech.org", "HTTPS", [
+    {
+      name: "test.ech.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "test.ech1.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "test.ech.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "test.ech2.org",
+        values: [
+          { key: "alpn", value: "h2" },
+          { key: "port", value: h2Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "test.ech.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 3,
+        name: "test.ech3.org",
+        values: [
+          { key: "alpn", value: "h2" },
+          { key: "port", value: h2Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.ech1.org", "A", [
+    {
+      name: "test.ech1.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.ech3.org", "A", [
+    {
+      name: "test.ech3.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let chan = makeChan(`https://test.ech.org/server-timing`);
+  let [req, resp] = await channelOpenPromise(chan);
+  Assert.equal(req.protocolVersion, "h2");
+  let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
+  Assert.equal(internal.remotePort, h2Port);
+
+  await trrServer.stop();
+});
+
+// Test when echConfig is enabled, the connection should fail when not all
+// records have echConfig.
+add_task(async function testFastfallbackWithpartialEchConfig() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", true);
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    1000
+  );
+
+  await trrServer.registerDoHAnswers("test.partial_ech.org", "HTTPS", [
+    {
+      name: "test.partial_ech.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "test.partial_ech1.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "test.partial_ech.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "test.partial_ech2.org",
+        values: [
+          { key: "alpn", value: "h2" },
+          { key: "port", value: h2Port },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("test.partial_ech1.org", "A", [
+    {
+      name: "test.partial_ech1.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let chan = makeChan(`https://test.partial_ech.org/server-timing`);
+  await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
+
+  await trrServer.stop();
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_http3_fatal_stream_error.js firefox-85.0+build1/netwerk/test/unit/test_http3_fatal_stream_error.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_http3_fatal_stream_error.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_http3_fatal_stream_error.js	2021-01-18 19:58:18.000000000 +0000
@@ -12,6 +12,7 @@
   Services.prefs.clearUserPref(
     "network.http.http3.alt-svc-mapping-for-testing"
   );
+  Services.prefs.clearUserPref("network.http.http3.backup_timer_delay");
   dump("cleanup done\n");
 });
 
@@ -89,6 +90,7 @@
     "network.http.http3.alt-svc-mapping-for-testing",
     "foo.example.com;h3-27=:" + h3Port
   );
+  Services.prefs.setIntPref("network.http.http3.backup_timer_delay", 0);
 
   let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
     Ci.nsIX509CertDB
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_http3_server_not_existing.js firefox-85.0+build1/netwerk/test/unit/test_http3_server_not_existing.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_http3_server_not_existing.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_http3_server_not_existing.js	2021-01-18 19:58:18.000000000 +0000
@@ -12,6 +12,7 @@
   Services.prefs.clearUserPref(
     "network.http.http3.alt-svc-mapping-for-testing"
   );
+  Services.prefs.clearUserPref("network.http.http3.backup_timer_delay");
   dump("cleanup done\n");
 });
 
@@ -60,6 +61,7 @@
     "network.http.http3.alt-svc-mapping-for-testing",
     "foo.example.com;h3-27=:443"
   );
+  Services.prefs.setIntPref("network.http.http3.backup_timer_delay", 0);
 
   let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
     Ci.nsIX509CertDB
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_iphint.js firefox-85.0+build1/netwerk/test/unit/test_httpssvc_iphint.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_iphint.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_httpssvc_iphint.js	2021-01-18 19:58:18.000000000 +0000
@@ -35,7 +35,6 @@
   do_get_profile();
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
-  prefs.setBoolPref("network.security.esni.enabled", false);
   prefs.setBoolPref("network.http.spdy.enabled", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   // the TRR server is on 127.0.0.1
@@ -67,7 +66,6 @@
 
 setup();
 registerCleanupFunction(() => {
-  prefs.clearUserPref("network.security.esni.enabled");
   prefs.clearUserPref("network.http.spdy.enabled");
   prefs.clearUserPref("network.http.spdy.enabled.http2");
   prefs.clearUserPref("network.dns.localDomains");
@@ -108,7 +106,9 @@
 // Test if IP hint addresses can be accessed as regular A/AAAA records.
 add_task(async function testStoreIPHint() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
 
   Services.prefs.setIntPref("network.trr.mode", 3);
@@ -127,7 +127,7 @@
         priority: 1,
         name: "test.IPHint.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "port", value: 8888 },
           { key: "ipv4hint", value: ["1.2.3.4", "5.6.7.8"] },
           { key: "ipv6hint", value: ["::1", "fe80::794f:6d2c:3d5e:7836"] },
@@ -156,9 +156,9 @@
   Assert.equal(answer[0].priority, 1);
   Assert.equal(answer[0].name, "test.IPHint.com");
   Assert.equal(answer[0].values.length, 4);
-  Assert.equal(
+  Assert.deepEqual(
     answer[0].values[0].QueryInterface(Ci.nsISVCParamAlpn).alpn,
-    "h2,h3",
+    ["h2", "h3"],
     "got correct answer"
   );
   Assert.equal(
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_priority.js firefox-85.0+build1/netwerk/test/unit/test_httpssvc_priority.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_priority.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_httpssvc_priority.js	2021-01-18 19:58:18.000000000 +0000
@@ -34,7 +34,6 @@
   do_get_profile();
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
-  prefs.setBoolPref("network.security.esni.enabled", false);
   prefs.setBoolPref("network.http.spdy.enabled", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   // the TRR server is on 127.0.0.1
@@ -63,7 +62,6 @@
 
 setup();
 registerCleanupFunction(() => {
-  prefs.clearUserPref("network.security.esni.enabled");
   prefs.clearUserPref("network.http.spdy.enabled");
   prefs.clearUserPref("network.http.spdy.enabled.http2");
   prefs.clearUserPref("network.dns.localDomains");
@@ -102,7 +100,9 @@
 
 add_task(async function testPriorityAndECHConfig() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
 
   Services.prefs.setBoolPref("network.dns.echconfig.enabled", false);
@@ -121,7 +121,7 @@
       data: {
         priority: 1,
         name: "test.p1.com",
-        values: [{ key: "alpn", value: "h2,h3" }],
+        values: [{ key: "alpn", value: ["h2", "h3"] }],
       },
     },
     {
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_retry_with_ech.js firefox-85.0+build1/netwerk/test/unit/test_httpssvc_retry_with_ech.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_retry_with_ech.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_httpssvc_retry_with_ech.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,288 @@
+/* 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/NetUtil.jsm");
+
+let prefs;
+let h2Port;
+let listen;
+let trrServer;
+
+const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
+  Ci.nsIDNSService
+);
+const certOverrideService = Cc[
+  "@mozilla.org/security/certoverride;1"
+].getService(Ci.nsICertOverrideService);
+const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
+  Ci.nsIThreadManager
+);
+const mainThread = threadManager.currentThread;
+
+const defaultOriginAttributes = {};
+
+function setup() {
+  let env = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  h2Port = env.get("MOZHTTP2_PORT");
+  Assert.notEqual(h2Port, null);
+  Assert.notEqual(h2Port, "");
+
+  // Set to allow the cert presented by our H2 server
+  do_get_profile();
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  prefs.setBoolPref("network.security.esni.enabled", false);
+  prefs.setBoolPref("network.http.spdy.enabled", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
+  // the TRR server is on 127.0.0.1
+  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
+
+  // make all native resolve calls "secretly" resolve localhost instead
+  prefs.setBoolPref("network.dns.native-is-localhost", true);
+
+  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
+  prefs.setIntPref("network.trr.mode", 2); // TRR first
+  prefs.setBoolPref("network.trr.wait-for-portal", false);
+  // don't confirm that TRR is working, just go!
+  prefs.setCharPref("network.trr.confirmationNS", "skip");
+
+  // So we can change the pref without clearing the cache to check a pushed
+  // record with a TRR path that fails.
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", true);
+
+  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
+  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
+  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  addCertFromFile(certdb, "http2-ca.pem", "CTu,u,u");
+
+  add_tls_server_setup(
+    "EncryptedClientHelloServer",
+    "../../../security/manager/ssl/tests/unit/test_encrypted_client_hello"
+  );
+}
+
+setup();
+registerCleanupFunction(async () => {
+  prefs.clearUserPref("network.security.esni.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled.http2");
+  prefs.clearUserPref("network.dns.localDomains");
+  prefs.clearUserPref("network.dns.native-is-localhost");
+  prefs.clearUserPref("network.trr.mode");
+  prefs.clearUserPref("network.trr.uri");
+  prefs.clearUserPref("network.trr.credentials");
+  prefs.clearUserPref("network.trr.wait-for-portal");
+  prefs.clearUserPref("network.trr.allow-rfc1918");
+  prefs.clearUserPref("network.trr.useGET");
+  prefs.clearUserPref("network.trr.confirmationNS");
+  prefs.clearUserPref("network.trr.bootstrapAddress");
+  prefs.clearUserPref("network.trr.request-timeout");
+  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
+  prefs.clearUserPref("network.dns.upgrade_with_https_rr");
+  prefs.clearUserPref("network.dns.use_https_rr_as_altsvc");
+  prefs.clearUserPref("network.dns.echconfig.enabled");
+  prefs.clearUserPref("network.dns.echconfig.fallback_to_origin");
+  if (trrServer) {
+    await trrServer.stop();
+  }
+});
+
+class DNSListener {
+  constructor() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+  onLookupComplete(inRequest, inRecord, inStatus) {
+    this.resolve([inRequest, inRecord, inStatus]);
+  }
+  // So we can await this as a promise.
+  then() {
+    return this.promise.then.apply(this.promise, arguments);
+  }
+}
+
+DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIDNSListener",
+]);
+
+function makeChan(url) {
+  let chan = NetUtil.newChannel({
+    uri: url,
+    loadUsingSystemPrincipal: true,
+  }).QueryInterface(Ci.nsIHttpChannel);
+  return chan;
+}
+
+function channelOpenPromise(chan, flags) {
+  return new Promise(resolve => {
+    function finish(req, buffer) {
+      certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+        false
+      );
+      resolve([req, buffer]);
+    }
+    certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+      true
+    );
+    let internal = chan.QueryInterface(Ci.nsIHttpChannelInternal);
+    internal.setWaitForHTTPSSVCRecord();
+    chan.asyncOpen(new ChannelListener(finish, null, flags));
+  });
+}
+
+add_task(async function testConnectWithECH() {
+  const ECH_CONFIG_FIXED =
+    "AEr+CABGABZlY2gtcHVibGljLmV4YW1wbGUuY29tACCKB1Y5SfrGIyk27W82xPpzWTDs3q72c04xSurDWlb9CgAgAAQAAQADADIAAA==";
+  trrServer = new TRRServer();
+  await trrServer.start();
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+
+  // Only the last record is valid to use.
+  await trrServer.registerDoHAnswers("ech-private.example.com", "HTTPS", [
+    {
+      name: "ech-private.example.com",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "ech-private.example.com",
+        values: [
+          { key: "alpn", value: "http/1.1" },
+          { key: "port", value: 8443 },
+          {
+            key: "echconfig",
+            value: ECH_CONFIG_FIXED,
+            needBase64Decode: true,
+          },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("ech-private.example.com", "A", [
+    {
+      name: "ech-private.example.com",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let listener = new DNSListener();
+
+  let request = dns.asyncResolve(
+    "ech-private.example.com",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listener,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listener;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+
+  let chan = makeChan(`https://ech-private.example.com`);
+  await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
+  let securityInfo = chan.securityInfo.QueryInterface(
+    Ci.nsITransportSecurityInfo
+  );
+  Assert.ok(securityInfo.isAcceptedEch, "This host should have accepted ECH");
+
+  await trrServer.stop();
+});
+
+add_task(async function testEchRetry() {
+  dns.clearCache(true);
+
+  const ECH_CONFIG_TRUSTED_RETRY =
+    "AEr+CABGABZlY2gtcHVibGljLmV4YW1wbGUuY29tACCKB1Y5SfrGIyk27W82xPpzWTDs3q72c04xSurDWlb9CgAgAAQAAQABADIAAA==";
+  trrServer = new TRRServer();
+  await trrServer.start();
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+
+  // Only the last record is valid to use.
+  await trrServer.registerDoHAnswers("ech-private.example.com", "HTTPS", [
+    {
+      name: "ech-private.example.com",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "ech-private.example.com",
+        values: [
+          { key: "alpn", value: "http/1.1" },
+          { key: "port", value: 8443 },
+          {
+            key: "echconfig",
+            value: ECH_CONFIG_TRUSTED_RETRY,
+            needBase64Decode: true,
+          },
+        ],
+      },
+    },
+  ]);
+
+  await trrServer.registerDoHAnswers("ech-private.example.com", "A", [
+    {
+      name: "ech-private.example.com",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let listener = new DNSListener();
+
+  let request = dns.asyncResolve(
+    "ech-private.example.com",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listener,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listener;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", true);
+  let chan = makeChan(`https://ech-private.example.com`);
+  await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
+  let securityInfo = chan.securityInfo.QueryInterface(
+    Ci.nsITransportSecurityInfo
+  );
+  Assert.ok(securityInfo.isAcceptedEch, "This host should have accepted ECH");
+
+  await trrServer.stop();
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_retry_without_ech.js firefox-85.0+build1/netwerk/test/unit/test_httpssvc_retry_without_ech.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_httpssvc_retry_without_ech.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_httpssvc_retry_without_ech.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,223 @@
+/* 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/NetUtil.jsm");
+
+let prefs;
+let h2Port;
+let listen;
+let trrServer;
+
+const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
+  Ci.nsIDNSService
+);
+const certOverrideService = Cc[
+  "@mozilla.org/security/certoverride;1"
+].getService(Ci.nsICertOverrideService);
+const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
+  Ci.nsIThreadManager
+);
+const mainThread = threadManager.currentThread;
+
+const defaultOriginAttributes = {};
+
+function setup() {
+  let env = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  h2Port = env.get("MOZHTTP2_PORT");
+  Assert.notEqual(h2Port, null);
+  Assert.notEqual(h2Port, "");
+
+  // Set to allow the cert presented by our H2 server
+  do_get_profile();
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  prefs.setBoolPref("network.security.esni.enabled", false);
+  prefs.setBoolPref("network.http.spdy.enabled", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
+  // the TRR server is on 127.0.0.1
+  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
+
+  // make all native resolve calls "secretly" resolve localhost instead
+  prefs.setBoolPref("network.dns.native-is-localhost", true);
+
+  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
+  prefs.setIntPref("network.trr.mode", 2); // TRR first
+  prefs.setBoolPref("network.trr.wait-for-portal", false);
+  // don't confirm that TRR is working, just go!
+  prefs.setCharPref("network.trr.confirmationNS", "skip");
+
+  // So we can change the pref without clearing the cache to check a pushed
+  // record with a TRR path that fails.
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+
+  Services.prefs.setBoolPref("network.dns.upgrade_with_https_rr", true);
+  Services.prefs.setBoolPref("network.dns.use_https_rr_as_altsvc", true);
+  Services.prefs.setBoolPref("network.dns.echconfig.enabled", true);
+
+  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
+  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
+  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  addCertFromFile(certdb, "http2-ca.pem", "CTu,u,u");
+
+  // An arbitrary, non-ECH server.
+  add_tls_server_setup(
+    "DelegatedCredentialsServer",
+    "../../../security/manager/ssl/tests/unit/test_delegated_credentials"
+  );
+
+  let nssComponent = Cc["@mozilla.org/psm;1"].getService(Ci.nsINSSComponent);
+  nssComponent.clearSSLExternalAndInternalSessionCache();
+}
+
+setup();
+registerCleanupFunction(async () => {
+  prefs.clearUserPref("network.security.esni.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled.http2");
+  prefs.clearUserPref("network.dns.localDomains");
+  prefs.clearUserPref("network.dns.native-is-localhost");
+  prefs.clearUserPref("network.trr.mode");
+  prefs.clearUserPref("network.trr.uri");
+  prefs.clearUserPref("network.trr.credentials");
+  prefs.clearUserPref("network.trr.wait-for-portal");
+  prefs.clearUserPref("network.trr.allow-rfc1918");
+  prefs.clearUserPref("network.trr.useGET");
+  prefs.clearUserPref("network.trr.confirmationNS");
+  prefs.clearUserPref("network.trr.bootstrapAddress");
+  prefs.clearUserPref("network.trr.request-timeout");
+  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
+  prefs.clearUserPref("network.dns.upgrade_with_https_rr");
+  prefs.clearUserPref("network.dns.use_https_rr_as_altsvc");
+  prefs.clearUserPref("network.dns.echconfig.enabled");
+  prefs.clearUserPref("network.dns.echconfig.fallback_to_origin");
+  if (trrServer) {
+    await trrServer.stop();
+  }
+});
+
+class DNSListener {
+  constructor() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+  onLookupComplete(inRequest, inRecord, inStatus) {
+    this.resolve([inRequest, inRecord, inStatus]);
+  }
+  // So we can await this as a promise.
+  then() {
+    return this.promise.then.apply(this.promise, arguments);
+  }
+}
+
+DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIDNSListener",
+]);
+
+function makeChan(url) {
+  let chan = NetUtil.newChannel({
+    uri: url,
+    loadUsingSystemPrincipal: true,
+  }).QueryInterface(Ci.nsIHttpChannel);
+  return chan;
+}
+
+function channelOpenPromise(chan, flags) {
+  return new Promise(resolve => {
+    function finish(req, buffer) {
+      certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+        false
+      );
+      resolve([req, buffer]);
+    }
+    certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+      false
+    );
+    let internal = chan.QueryInterface(Ci.nsIHttpChannelInternal);
+    internal.setWaitForHTTPSSVCRecord();
+    chan.asyncOpen(new ChannelListener(finish, null, flags));
+  });
+}
+
+add_task(async function testRetryWithoutECH() {
+  const ECH_CONFIG_FIXED =
+    "AFH+CABNAB1kZWxlZ2F0ZWQtZW5hYmxlZC5leGFtcGxlLmNvbQAgigdWOUn6xiMpNu1vNsT6c1kw7N6u9nNOMUrqw1pW/QoAIAAEAAEAAwAyAAA=";
+  trrServer = new TRRServer();
+  await trrServer.start();
+
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+
+  // Only the last record is valid to use.
+  await trrServer.registerDoHAnswers(
+    "delegated-disabled.example.com",
+    "HTTPS",
+    [
+      {
+        name: "delegated-disabled.example.com",
+        ttl: 55,
+        type: "HTTPS",
+        flush: false,
+        data: {
+          priority: 1,
+          name: "delegated-disabled.example.com",
+          values: [
+            {
+              key: "echconfig",
+              value: ECH_CONFIG_FIXED,
+              needBase64Decode: true,
+            },
+          ],
+        },
+      },
+    ]
+  );
+
+  await trrServer.registerDoHAnswers("delegated-disabled.example.com", "A", [
+    {
+      name: "delegated-disabled.example.com",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  let listener = new DNSListener();
+
+  let request = dns.asyncResolve(
+    "delegated-disabled.example.com",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listener,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listener;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+
+  let chan = makeChan(`https://delegated-disabled.example.com:8443`);
+  await channelOpenPromise(chan, CL_ALLOW_UNKNOWN_CL);
+  let securityInfo = chan.securityInfo.QueryInterface(
+    Ci.nsITransportSecurityInfo
+  );
+
+  Assert.ok(
+    !securityInfo.isAcceptedEch,
+    "This host should not have accepted ECH"
+  );
+  await trrServer.stop();
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_socks.js firefox-85.0+build1/netwerk/test/unit/test_socks.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_socks.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_socks.js	2021-01-18 19:58:18.000000000 +0000
@@ -125,6 +125,7 @@
     if (len == 0) {
       print("server: client closed!");
       Assert.equal(this.state, STATE_GOT_PONG);
+      this.close();
       this.server.testCompleted(this);
       return;
     }
@@ -356,14 +357,12 @@
     this.outbuf += "PING!";
     this.inbuf = [];
     this.waitWrite(this.client_out);
-    this.waitRead(this.client_in);
   },
 
   checkPong() {
     var pong = buf2str(this.inbuf);
     Assert.equal(pong, "PONG!");
     this.state = STATE_GOT_PONG;
-    this.waitRead(this.client_in);
   },
 
   close() {
@@ -472,9 +471,6 @@
       }
       this.client_subprocess = null;
     }
-    for (var client of this.client_connections) {
-      client.close();
-    }
     this.client_connections = [];
     if (this.listener) {
       this.listener.close();
@@ -483,11 +479,6 @@
   },
 };
 
-function test_timeout() {
-  socks_test_server.close();
-  do_throw("SOCKS test took too long!");
-}
-
 function run_test() {
   socks_test_server = new SocksTestServer();
 
@@ -524,6 +515,5 @@
   });
   socks_test_server.runClientSubprocess();
 
-  do_timeout(120 * 1000, test_timeout);
   do_test_pending();
 }
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_speculative_connect.js firefox-85.0+build1/netwerk/test/unit/test_speculative_connect.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_speculative_connect.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_speculative_connect.js	2021-01-18 19:58:18.000000000 +0000
@@ -100,6 +100,7 @@
   this.hostname = hostname;
   this.next = next;
   this.dummyContent = "G";
+  this.closed = false;
 }
 
 TestFailedStreamCallback.prototype = {
@@ -108,11 +109,15 @@
     "nsIOutputStreamCallback",
   ]),
   processException(e) {
+    if (this.closed) {
+      return;
+    }
     do_check_instanceof(e, Ci.nsIException);
     // A refusal to connect speculatively should throw an error.
     Assert.equal(e.result, Cr.NS_ERROR_CONNECTION_REFUSED);
+    this.closed = true;
     this.transport.close(Cr.NS_BINDING_ABORTED);
-    return true;
+    this.next();
   },
   onOutputStreamReady(outstream) {
     info("outputstream handler.");
@@ -121,7 +126,6 @@
       outstream.write(this.dummyContent, this.dummyContent.length);
     } catch (e) {
       this.processException(e);
-      this.next();
       return;
     }
     info("no exception on write. Wait for read.");
@@ -133,7 +137,6 @@
       instream.available();
     } catch (e) {
       this.processException(e);
-      this.next();
       return;
     }
     do_throw("Speculative Connect should have failed for " + this.hostname);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_standardurl.js firefox-85.0+build1/netwerk/test/unit/test_standardurl.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_standardurl.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_standardurl.js	2021-01-18 19:58:18.000000000 +0000
@@ -1271,3 +1271,29 @@
     "A pseudo-empty host is not allowed for URLTYPE_AUTHORITY"
   );
 });
+
+add_task(async function test_bug1648493() {
+  let url = stringToURL("https://example.com/");
+  url = url
+    .mutate()
+    .setScheme("file")
+    .finalize();
+  url = url
+    .mutate()
+    .setScheme("resource")
+    .finalize();
+  url = url
+    .mutate()
+    .setPassword("ê")
+    .finalize();
+  url = url
+    .mutate()
+    .setUsername("ç")
+    .finalize();
+  url = url
+    .mutate()
+    .setScheme("t")
+    .finalize();
+  equal(url.spec, "t://%C3%83%C2%A7:%C3%83%C2%AA@example.com/");
+  equal(url.username, "%C3%83%C2%A7");
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_additional_section.js firefox-85.0+build1/netwerk/test/unit/test_trr_additional_section.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_additional_section.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_additional_section.js	2021-01-18 19:58:18.000000000 +0000
@@ -33,7 +33,9 @@
 }
 
 let trrServer = new TRRServer();
-registerCleanupFunction(async () => trrServer.stop());
+registerCleanupFunction(async () => {
+  await trrServer.stop();
+});
 add_task(async function setup_server() {
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_case_sensitivity.js firefox-85.0+build1/netwerk/test/unit/test_trr_case_sensitivity.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_case_sensitivity.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_case_sensitivity.js	2021-01-18 19:58:18.000000000 +0000
@@ -34,7 +34,9 @@
 
 add_task(async function test_trr_casing() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
   let chan = makeChan(`https://localhost:${trrServer.port}/test?bla=some`);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_cname_chain.js firefox-85.0+build1/netwerk/test/unit/test_trr_cname_chain.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_cname_chain.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_cname_chain.js	2021-01-18 19:58:18.000000000 +0000
@@ -34,7 +34,9 @@
 
 add_task(async function test_follow_cnames_same_response() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
   let chan = makeChan(`https://localhost:${trrServer.port}/test?bla=some`);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_extended_error.js firefox-85.0+build1/netwerk/test/unit/test_trr_extended_error.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_extended_error.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_extended_error.js	2021-01-18 19:58:18.000000000 +0000
@@ -35,7 +35,9 @@
 let trrServer;
 add_task(async function setup() {
   trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
   let chan = makeChan(`https://localhost:${trrServer.port}/test?bla=some`);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_https_fallback.js firefox-85.0+build1/netwerk/test/unit/test_trr_https_fallback.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_https_fallback.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_https_fallback.js	2021-01-18 19:58:18.000000000 +0000
@@ -73,7 +73,7 @@
 }
 
 setup();
-registerCleanupFunction(() => {
+registerCleanupFunction(async () => {
   prefs.clearUserPref("network.security.esni.enabled");
   prefs.clearUserPref("network.http.spdy.enabled");
   prefs.clearUserPref("network.http.spdy.enabled.http2");
@@ -96,7 +96,9 @@
   prefs.clearUserPref("network.dns.httpssvc.reset_exclustion_list");
   prefs.clearUserPref("network.http.http3.enabled");
   prefs.clearUserPref("network.dns.httpssvc.http3_fast_fallback_timeout");
-  trrServer.stop();
+  if (trrServer) {
+    await trrServer.stop();
+  }
 });
 
 class DNSListener {
@@ -130,9 +132,15 @@
   return new Promise(resolve => {
     function finish(req, buffer) {
       resolve([req, buffer]);
+      certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+        false
+      );
     }
     let internal = chan.QueryInterface(Ci.nsIHttpChannelInternal);
     internal.setWaitForHTTPSSVCRecord();
+    certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
+      true
+    );
     chan.asyncOpen(new ChannelListener(finish, null, flags));
   });
 }
@@ -159,7 +167,7 @@
         priority: 1,
         name: "test.fallback1.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "123..." },
         ],
       },
@@ -173,7 +181,7 @@
         priority: 4,
         name: "foo.example.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "port", value: h2Port },
           { key: "echconfig", value: "456..." },
         ],
@@ -188,7 +196,7 @@
         priority: 3,
         name: "test.fallback3.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -202,7 +210,7 @@
         priority: 2,
         name: "test.fallback2.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -225,19 +233,11 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://test.fallback.com:${h2Port}/server-timing`);
   let [req, resp] = await channelOpenPromise(chan);
   // Test if this request is done by h2.
   Assert.equal(req.getResponseHeader("x-connection-http2"), "yes");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -262,7 +262,7 @@
         priority: 1,
         name: "test.foo1.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "123..." },
         ],
       },
@@ -276,7 +276,7 @@
         priority: 3,
         name: "test.foo3.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -290,7 +290,7 @@
         priority: 2,
         name: "test.foo2.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -323,19 +323,11 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://test.foo.com:${h2Port}/server-timing`);
   let [req, resp] = await channelOpenPromise(chan);
   // Test if this request is done by h2.
   Assert.equal(req.getResponseHeader("x-connection-http2"), "yes");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -361,7 +353,7 @@
         priority: 1,
         name: "test.bar1.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "123..." },
         ],
       },
@@ -375,7 +367,7 @@
         priority: 3,
         name: "test.bar3.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -389,7 +381,7 @@
         priority: 2,
         name: "test.bar2.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -412,18 +404,10 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   // This channel should be failed.
   let chan = makeChan(`https://test.bar.com:${h2Port}/server-timing`);
   await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -447,7 +431,7 @@
       data: {
         priority: 1,
         name: "test.example1.com",
-        values: [{ key: "alpn", value: "h2,h3" }],
+        values: [{ key: "alpn", value: ["h2", "h3"] }],
       },
     },
     {
@@ -458,7 +442,7 @@
       data: {
         priority: 3,
         name: "test.example3.com",
-        values: [{ key: "alpn", value: "h2,h3" }],
+        values: [{ key: "alpn", value: ["h2", "h3"] }],
       },
     },
   ]);
@@ -479,10 +463,6 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://test.example.com:${h2Port}/server-timing`);
   await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
 
@@ -499,10 +479,6 @@
   chan = makeChan(`https://test.example.com:${h2Port}/server-timing`);
   await channelOpenPromise(chan);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -539,7 +515,7 @@
         priority: 1,
         name: "vulnerable1.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -553,7 +529,7 @@
         priority: 2,
         name: "vulnerable2.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -566,7 +542,7 @@
       data: {
         priority: 3,
         name: "vulnerable3.com",
-        values: [{ key: "alpn", value: "h2,h3" }],
+        values: [{ key: "alpn", value: ["h2", "h3"] }],
       },
     },
   ]);
@@ -587,17 +563,9 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://vulnerable.com:${h2Port}/server-timing`);
   await channelOpenPromise(chan);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -624,7 +592,7 @@
         priority: 1,
         name: "test.reset1.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "port", value: h2Port },
           { key: "echconfig", value: "456..." },
         ],
@@ -639,7 +607,7 @@
         priority: 2,
         name: "test.reset2.com",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "echconfig", value: "456..." },
         ],
       },
@@ -662,10 +630,6 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   // After this request, test.reset1.com and test.reset2.com should be both in
   // the exclusion list.
   let chan = makeChan(`https://test.reset.com:${h2Port}/server-timing`);
@@ -695,10 +659,6 @@
   chan = makeChan(`https://test.reset.com:${h2Port}/server-timing`);
   await channelOpenPromise(chan);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -757,20 +717,12 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://test.h3.com`);
   let [req, resp] = await channelOpenPromise(chan);
   Assert.equal(req.protocolVersion, "h3");
   let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
   Assert.equal(internal.remotePort, h3Port);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -848,10 +800,6 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
-  );
-
   let chan = makeChan(`https://test.fastfallback.com/server-timing`);
   let [req, resp] = await channelOpenPromise(chan);
   Assert.equal(req.protocolVersion, "h2");
@@ -870,10 +818,6 @@
   internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
   Assert.equal(internal.remotePort, h2Port);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
-  );
-
   await trrServer.stop();
 });
 
@@ -927,16 +871,220 @@
   Assert.equal(inRequest, request, "correct request was used");
   Assert.equal(inStatus, Cr.NS_OK, "status OK");
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    true
+  let chan = makeChan(`https://test.h3.org`);
+  await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
+
+  await trrServer.stop();
+});
+
+// Test we don't use the service mode record whose domain is in
+// http3 excluded list.
+add_task(async function testHttp3ExcludedList() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  dns.clearCache(true);
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    0
   );
 
-  let chan = makeChan(`https://test.h3.org`);
+  Services.prefs.setCharPref(
+    "network.http.http3.alt-svc-mapping-for-testing",
+    "www.h3_fail.org;h3-27=:" + h3Port
+  );
+
+  // This will fail because there is no address record for www.h3_fail.org.
+  let chan = makeChan(`https://www.h3_fail.org`);
   await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
 
-  certOverrideService.setDisableAllSecurityChecksAndLetAttackersInterceptMyData(
-    false
+  // Now www.h3_fail.org should be already excluded, so the second record
+  // foo.example.com will be selected.
+  await trrServer.registerDoHAnswers("test.h3_excluded.org", "HTTPS", [
+    {
+      name: "test.h3_excluded.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "www.h3_fail.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+        ],
+      },
+    },
+    {
+      name: "test.h3_excluded.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "foo.example.com",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+        ],
+      },
+    },
+  ]);
+
+  let listener = new DNSListener();
+
+  let request = dns.asyncResolve(
+    "test.h3_excluded.org",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listener,
+    mainThread,
+    defaultOriginAttributes
   );
 
+  let [inRequest, inRecord, inStatus] = await listener;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+
+  chan = makeChan(`https://test.h3_excluded.org`);
+  let [req, resp] = await channelOpenPromise(chan);
+  Assert.equal(req.protocolVersion, "h3");
+  let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
+  Assert.equal(internal.remotePort, h3Port);
+
+  await trrServer.stop();
+});
+
+add_task(async function testAllRecordsInHttp3ExcludedList() {
+  trrServer = new TRRServer();
+  await trrServer.start();
+  dns.clearCache(true);
+  Services.prefs.setIntPref("network.trr.mode", 3);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${trrServer.port}/dns-query`
+  );
+  Services.prefs.setBoolPref("network.http.http3.enabled", true);
+  Services.prefs.setIntPref(
+    "network.dns.httpssvc.http3_fast_fallback_timeout",
+    0
+  );
+
+  Services.prefs.setCharPref(
+    "network.http.http3.alt-svc-mapping-for-testing",
+    "www.h3_fail1.org;h3-27=:" + h3Port
+  );
+
+  await trrServer.registerDoHAnswers("www.h3_all_excluded.org", "A", [
+    {
+      name: "www.h3_all_excluded.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  // Test we can connect to www.h3_all_excluded.org sucessfully.
+  let chan = makeChan(
+    `https://www.h3_all_excluded.org:${h2Port}/server-timing`
+  );
+
+  let [req, resp] = await channelOpenPromise(chan);
+
+  // Test if this request is done by h2.
+  Assert.equal(req.getResponseHeader("x-connection-http2"), "yes");
+
+  // This will fail because there is no address record for www.h3_fail1.org.
+  chan = makeChan(`https://www.h3_fail1.org`);
+  await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
+
+  Services.prefs.setCharPref(
+    "network.http.http3.alt-svc-mapping-for-testing",
+    "www.h3_fail2.org;h3-27=:" + h3Port
+  );
+
+  // This will fail because there is no address record for www.h3_fail2.org.
+  chan = makeChan(`https://www.h3_fail2.org`);
+  await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
+
+  await trrServer.registerDoHAnswers("www.h3_all_excluded.org", "HTTPS", [
+    {
+      name: "www.h3_all_excluded.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 1,
+        name: "www.h3_fail1.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+    {
+      name: "www.h3_all_excluded.org",
+      ttl: 55,
+      type: "HTTPS",
+      flush: false,
+      data: {
+        priority: 2,
+        name: "www.h3_fail2.org",
+        values: [
+          { key: "alpn", value: "h3-27" },
+          { key: "port", value: h3Port },
+          { key: "echconfig", value: "456..." },
+        ],
+      },
+    },
+  ]);
+
+  let listener = new DNSListener();
+
+  let request = dns.asyncResolve(
+    "www.h3_all_excluded.org",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listener,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listener;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+
+  // All HTTPS RRs are in http3 excluded list and all records are failed to
+  // connect, so don't fallback to the origin one.
+  chan = makeChan(`https://www.h3_all_excluded.org:${h2Port}/server-timing`);
+  await channelOpenPromise(chan, CL_EXPECT_LATE_FAILURE | CL_ALLOW_UNKNOWN_CL);
+
+  await trrServer.registerDoHAnswers("www.h3_fail1.org", "A", [
+    {
+      name: "www.h3_fail1.org",
+      ttl: 55,
+      type: "A",
+      flush: false,
+      data: "127.0.0.1",
+    },
+  ]);
+
+  // The the case that when all records are in http3 excluded list, we still
+  // give the first record one more shot.
+  chan = makeChan(`https://www.h3_all_excluded.org`);
+  [req, resp] = await channelOpenPromise(chan);
+  Assert.equal(req.protocolVersion, "h3");
+  let internal = req.QueryInterface(Ci.nsIHttpChannelInternal);
+  Assert.equal(internal.remotePort, h3Port);
+
   await trrServer.stop();
 });
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_httpssvc.js firefox-85.0+build1/netwerk/test/unit/test_trr_httpssvc.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_httpssvc.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_httpssvc.js	2021-01-18 19:58:18.000000000 +0000
@@ -39,7 +39,6 @@
   do_get_profile();
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
-  prefs.setBoolPref("network.security.esni.enabled", false);
   prefs.setBoolPref("network.http.spdy.enabled", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   // the TRR server is on 127.0.0.1
@@ -69,7 +68,6 @@
 if (!inChildProcess()) {
   setup();
   registerCleanupFunction(() => {
-    prefs.clearUserPref("network.security.esni.enabled");
     prefs.clearUserPref("network.http.spdy.enabled");
     prefs.clearUserPref("network.http.spdy.enabled.http2");
     prefs.clearUserPref("network.dns.localDomains");
@@ -134,9 +132,9 @@
   Assert.equal(answer[0].priority, 1);
   Assert.equal(answer[0].name, "h3pool");
   Assert.equal(answer[0].values.length, 6);
-  Assert.equal(
+  Assert.deepEqual(
     answer[0].values[0].QueryInterface(Ci.nsISVCParamAlpn).alpn,
-    "h2,h3",
+    ["h2", "h3"],
     "got correct answer"
   );
   Assert.ok(
@@ -168,9 +166,9 @@
   Assert.equal(answer[1].priority, 2);
   Assert.equal(answer[1].name, "test.httpssvc.com");
   Assert.equal(answer[1].values.length, 4);
-  Assert.equal(
+  Assert.deepEqual(
     answer[1].values[0].QueryInterface(Ci.nsISVCParamAlpn).alpn,
-    "h2",
+    ["h2"],
     "got correct answer"
   );
   Assert.equal(
@@ -209,7 +207,9 @@
 
 add_task(async function test_aliasform() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
 
@@ -310,7 +310,7 @@
         priority: 1,
         name: "h3pool",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "no-default-alpn" },
           { key: "port", value: 8888 },
           { key: "ipv4hint", value: "1.2.3.4" },
@@ -396,7 +396,7 @@
         priority: 1,
         name: "h3pool",
         values: [
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "no-default-alpn" },
           { key: "port", value: 8888 },
           { key: "ipv4hint", value: "1.2.3.4" },
@@ -452,7 +452,7 @@
           { key: "ipv4hint", value: "1.2.3.4" },
           { key: "port", value: 8888 },
           { key: "no-default-alpn" },
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
         ],
       },
     },
@@ -487,8 +487,8 @@
         priority: 1,
         name: "h3pool",
         values: [
-          { key: "alpn", value: "h2,h3" },
-          { key: "alpn", value: "h2,h3,h4" },
+          { key: "alpn", value: ["h2", "h3"] },
+          { key: "alpn", value: ["h2", "h3", "h4"] },
         ],
       },
     },
@@ -524,7 +524,7 @@
         name: "h3pool",
         values: [
           { key: "mandatory", value: ["key100"] },
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "key100" },
         ],
       },
@@ -568,7 +568,7 @@
               "ipv6hint",
             ],
           },
-          { key: "alpn", value: "h2,h3" },
+          { key: "alpn", value: ["h2", "h3"] },
           { key: "no-default-alpn" },
           { key: "port", value: 8888 },
           { key: "ipv4hint", value: "1.2.3.4" },
@@ -634,7 +634,7 @@
       data: {
         priority: 1,
         name: ".",
-        values: [{ key: "alpn", value: "h2,h3" }],
+        values: [{ key: "alpn", value: ["h2", "h3"] }],
       },
     },
   ]);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr.js firefox-85.0+build1/netwerk/test/unit/test_trr.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr.js	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,9 @@
 const mainThread = Services.tm.currentThread;
 
 const gDefaultPref = Services.prefs.getDefaultBranch("");
+const gOverride = Cc["@mozilla.org/network/native-dns-override;1"].getService(
+  Ci.nsINativeDNSResolverOverride
+);
 
 const defaultOriginAttributes = {};
 let h2Port = null;
@@ -2044,7 +2047,7 @@
   const override = Cc["@mozilla.org/network/native-dns-override;1"].getService(
     Ci.nsINativeDNSResolverOverride
   );
-  override.addIPOverride("ipv6.host.com", "1:1::2");
+  gOverride.addIPOverride("ipv6.host.com", "1:1::2");
 
   await new DNSListener(
     "ipv6.host.com",
@@ -2111,3 +2114,24 @@
   await test(`http://unknown.ipv4.stuff:666/path`, "0.0.0.0");
   await test(`http://unknown.ipv6.stuff:666/path`, "::");
 });
+
+// This test checks that normally when the TRR mode goes from ON -> OFF
+// we purge the DNS cache (including TRR), so the entries aren't used on
+// networks where they shouldn't. For example - turning on a VPN.
+add_task(async function test_purge_trr_cache_on_mode_change() {
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", true);
+
+  Services.prefs.setIntPref("network.trr.mode", 0);
+  Services.prefs.setIntPref("doh-rollout.mode", 2);
+  Services.prefs.setCharPref(
+    "network.trr.uri",
+    `https://foo.example.com:${h2Port}/doh?responseIP=3.3.3.3`
+  );
+
+  await new DNSListener("cached.example.com", "3.3.3.3");
+  Services.prefs.clearUserPref("doh-rollout.mode");
+
+  await new DNSListener("cached.example.com", "127.0.0.1");
+
+  Services.prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_trr_nat64.js firefox-85.0+build1/netwerk/test/unit/test_trr_nat64.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_trr_nat64.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_trr_nat64.js	2021-01-18 19:58:18.000000000 +0000
@@ -58,7 +58,9 @@
 
 add_task(async function test_add_nat64_prefix_to_trr() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
   dump(`port = ${trrServer.port}\n`);
   let chan = makeChan(`https://localhost:${trrServer.port}/test?bla=some`);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_udpsocket_offline.js firefox-85.0+build1/netwerk/test/unit/test_udpsocket_offline.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_udpsocket_offline.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_udpsocket_offline.js	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +1,7 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Cc, Cu, Ci, Assert, run_next_test, add_test, do_register_cleanup */
+
 "use strict";
 
 add_test(function test_ipv4_any() {
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/test_use_httpssvc.js firefox-85.0+build1/netwerk/test/unit/test_use_httpssvc.js
--- firefox-84.0.2+build1/netwerk/test/unit/test_use_httpssvc.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/test_use_httpssvc.js	2021-01-18 19:58:18.000000000 +0000
@@ -35,7 +35,6 @@
   do_get_profile();
   prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 
-  prefs.setBoolPref("network.security.esni.enabled", false);
   prefs.setBoolPref("network.http.spdy.enabled", true);
   prefs.setBoolPref("network.http.spdy.enabled.http2", true);
   // the TRR server is on 127.0.0.1
@@ -67,7 +66,6 @@
 
 setup();
 registerCleanupFunction(() => {
-  prefs.clearUserPref("network.security.esni.enabled");
   prefs.clearUserPref("network.http.spdy.enabled");
   prefs.clearUserPref("network.http.spdy.enabled.http2");
   prefs.clearUserPref("network.dns.localDomains");
@@ -230,7 +228,9 @@
 // Test if we can successfully fallback to the original host and port.
 add_task(async function testFallback() {
   let trrServer = new TRRServer();
-  registerCleanupFunction(async () => trrServer.stop());
+  registerCleanupFunction(async () => {
+    await trrServer.stop();
+  });
   await trrServer.start();
 
   Services.prefs.setIntPref("network.trr.mode", 3);
diff -Nru firefox-84.0.2+build1/netwerk/test/unit/xpcshell.ini firefox-85.0+build1/netwerk/test/unit/xpcshell.ini
--- firefox-84.0.2+build1/netwerk/test/unit/xpcshell.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit/xpcshell.ini	2021-01-18 19:58:18.000000000 +0000
@@ -408,7 +408,7 @@
 [test_captive_portal_service.js]
 run-sequentially = node server exceptions dont replay well
 skip-if = socketprocess_networking
-[test_esni_dns_fetch.js]
+[test_dns_by_type_resolve.js]
 [test_network_connectivity_service.js]
 [test_suspend_channel_on_authRetry.js]
 [test_suspend_channel_on_examine_merged_response.js]
@@ -491,5 +491,11 @@
 [test_http3_server_not_existing.js]
 skip-if = asan || tsan || os == 'win' || os =='android' || socketprocess_networking
 run-sequentially = node server exceptions dont replay well
+[test_http3_fast_fallback.js]
+skip-if = asan || tsan || os == 'win' || os =='android' || socketprocess_networking
+run-sequentially = node server exceptions dont replay well
 [test_cookie_ipv6.js]
-
+[test_httpssvc_retry_with_ech.js]
+skip-if = asan || tsan || os == 'win' || os =='android'
+[test_httpssvc_retry_without_ech.js]
+skip-if = asan || tsan || os == 'win' || os =='android'
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/child_dns_by_type_resolve.js firefox-85.0+build1/netwerk/test/unit_ipc/child_dns_by_type_resolve.js
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/child_dns_by_type_resolve.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/child_dns_by_type_resolve.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,76 @@
+"use strict";
+
+const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
+  Ci.nsIDNSService
+);
+const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
+  Ci.nsIThreadManager
+);
+const mainThread = threadManager.currentThread;
+
+const defaultOriginAttributes = {};
+
+let test_answer = "bXkgdm9pY2UgaXMgbXkgcGFzc3dvcmQ=";
+let test_answer_addr = "127.0.0.1";
+
+class DNSListener {
+  constructor() {
+    this.promise = new Promise(resolve => {
+      this.resolve = resolve;
+    });
+  }
+  onLookupComplete(inRequest, inRecord, inStatus) {
+    this.resolve([inRequest, inRecord, inStatus]);
+  }
+  // So we can await this as a promise.
+  then() {
+    return this.promise.then.apply(this.promise, arguments);
+  }
+}
+
+DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIDNSListener",
+]);
+
+add_task(async function testTXTResolve() {
+  // use the h2 server as DOH provider
+  let listenerEsni = new DNSListener();
+  let request = dns.asyncResolve(
+    "_esni.example.com",
+    dns.RESOLVE_TYPE_TXT,
+    0,
+    null, // resolverInfo
+    listenerEsni,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerEsni;
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  Assert.equal(inRequest, request, "correct request was used");
+  let answer = inRecord
+    .QueryInterface(Ci.nsIDNSTXTRecord)
+    .getRecordsAsOneString();
+  Assert.equal(answer, test_answer, "got correct answer");
+});
+
+add_task(async function testHTTPSSVCResolve() {
+  // use the h2 server as DOH provider
+  let listenerEsni = new DNSListener();
+  let request = dns.asyncResolve(
+    "httpssvc_esni.example.com",
+    dns.RESOLVE_TYPE_HTTPSSVC,
+    0,
+    null, // resolverInfo
+    listenerEsni,
+    mainThread,
+    defaultOriginAttributes
+  );
+
+  let [inRequest, inRecord, inStatus] = await listenerEsni;
+  Assert.equal(inRequest, request, "correct request was used");
+  Assert.equal(inStatus, Cr.NS_OK, "status OK");
+  let answer = inRecord.QueryInterface(Ci.nsIDNSHTTPSSVCRecord).records;
+  let esni = answer[0].values[0].QueryInterface(Ci.nsISVCParamEchConfig);
+  Assert.equal(esni.echconfig, "testytestystringstring", "got correct answer");
+});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/child_esni_dns_fetch1.js firefox-85.0+build1/netwerk/test/unit_ipc/child_esni_dns_fetch1.js
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/child_esni_dns_fetch1.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/child_esni_dns_fetch1.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-"use strict";
-
-const dns = Cc["@mozilla.org/network/dns-service;1"].getService(
-  Ci.nsIDNSService
-);
-const threadManager = Cc["@mozilla.org/thread-manager;1"].getService(
-  Ci.nsIThreadManager
-);
-const mainThread = threadManager.currentThread;
-
-const defaultOriginAttributes = {};
-
-let test_answer = "bXkgdm9pY2UgaXMgbXkgcGFzc3dvcmQ=";
-let test_answer_addr = "127.0.0.1";
-
-class DNSListener {
-  constructor() {
-    this.promise = new Promise(resolve => {
-      this.resolve = resolve;
-    });
-  }
-  onLookupComplete(inRequest, inRecord, inStatus) {
-    this.resolve([inRequest, inRecord, inStatus]);
-  }
-  // So we can await this as a promise.
-  then() {
-    return this.promise.then.apply(this.promise, arguments);
-  }
-}
-
-DNSListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  "nsIDNSListener",
-]);
-
-add_task(async function testEsniRequest() {
-  // use the h2 server as DOH provider
-  let listenerEsni = new DNSListener();
-  let request = dns.asyncResolve(
-    "_esni.example.com",
-    dns.RESOLVE_TYPE_TXT,
-    0,
-    null, // resolverInfo
-    listenerEsni,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerEsni;
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  Assert.equal(inRequest, request, "correct request was used");
-  let answer = inRecord
-    .QueryInterface(Ci.nsIDNSTXTRecord)
-    .getRecordsAsOneString();
-  Assert.equal(answer, test_answer, "got correct answer");
-});
-
-add_task(async function testEsniHTTPSSVC() {
-  // use the h2 server as DOH provider
-  let listenerEsni = new DNSListener();
-  let request = dns.asyncResolve(
-    "httpssvc_esni.example.com",
-    dns.RESOLVE_TYPE_HTTPSSVC,
-    0,
-    null, // resolverInfo
-    listenerEsni,
-    mainThread,
-    defaultOriginAttributes
-  );
-
-  let [inRequest, inRecord, inStatus] = await listenerEsni;
-  Assert.equal(inRequest, request, "correct request was used");
-  Assert.equal(inStatus, Cr.NS_OK, "status OK");
-  let answer = inRecord.QueryInterface(Ci.nsIDNSHTTPSSVCRecord).records;
-  let esni = answer[0].values[0].QueryInterface(Ci.nsISVCParamEchConfig);
-  Assert.equal(esni.echconfig, "testytestystringstring", "got correct answer");
-});
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/test_channel_priority_wrap.js firefox-85.0+build1/netwerk/test/unit_ipc/test_channel_priority_wrap.js
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/test_channel_priority_wrap.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/test_channel_priority_wrap.js	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,6 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
-/* jshint esnext:true, globalstrict:true, moz:true, undef:true, unused:true */
-/* globals Cu, do_register_cleanup, do_test_finished */
-/* globals run_test_in_child, sendCommand, do_await_remote_message */
 
 "use strict";
 
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/test_dns_by_type_resolve_wrap.js firefox-85.0+build1/netwerk/test/unit_ipc/test_dns_by_type_resolve_wrap.js
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/test_dns_by_type_resolve_wrap.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/test_dns_by_type_resolve_wrap.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,69 @@
+"use strict";
+
+let h2Port;
+let prefs;
+
+function setup() {
+  let env = Cc["@mozilla.org/process/environment;1"].getService(
+    Ci.nsIEnvironment
+  );
+  h2Port = env.get("MOZHTTP2_PORT");
+  Assert.notEqual(h2Port, null);
+  Assert.notEqual(h2Port, "");
+
+  // Set to allow the cert presented by our H2 server
+  do_get_profile();
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+  prefs.setBoolPref("network.http.spdy.enabled", true);
+  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
+  // the TRR server is on 127.0.0.1
+  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
+
+  // make all native resolve calls "secretly" resolve localhost instead
+  prefs.setBoolPref("network.dns.native-is-localhost", true);
+
+  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
+  prefs.setIntPref("network.trr.mode", 2); // TRR first
+  prefs.setBoolPref("network.trr.wait-for-portal", false);
+  // don't confirm that TRR is working, just go!
+  prefs.setCharPref("network.trr.confirmationNS", "skip");
+
+  // So we can change the pref without clearing the cache to check a pushed
+  // record with a TRR path that fails.
+  prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
+
+  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
+  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
+  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  addCertFromFile(certdb, "../unit/http2-ca.pem", "CTu,u,u");
+}
+
+setup();
+registerCleanupFunction(() => {
+  prefs.clearUserPref("network.http.spdy.enabled");
+  prefs.clearUserPref("network.http.spdy.enabled.http2");
+  prefs.clearUserPref("network.dns.localDomains");
+  prefs.clearUserPref("network.dns.native-is-localhost");
+  prefs.clearUserPref("network.trr.mode");
+  prefs.clearUserPref("network.trr.uri");
+  prefs.clearUserPref("network.trr.credentials");
+  prefs.clearUserPref("network.trr.wait-for-portal");
+  prefs.clearUserPref("network.trr.allow-rfc1918");
+  prefs.clearUserPref("network.trr.useGET");
+  prefs.clearUserPref("network.trr.confirmationNS");
+  prefs.clearUserPref("network.trr.bootstrapAddress");
+  prefs.clearUserPref("network.trr.blacklist-duration");
+  prefs.clearUserPref("network.trr.request-timeout");
+  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
+});
+
+function run_test() {
+  prefs.setCharPref(
+    "network.trr.uri",
+    "https://foo.example.com:" + h2Port + "/doh"
+  );
+  run_test_in_child("child_dns_by_type_resolve.js");
+}
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/test_esni_dns_fetch_wrap.js firefox-85.0+build1/netwerk/test/unit_ipc/test_esni_dns_fetch_wrap.js
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/test_esni_dns_fetch_wrap.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/test_esni_dns_fetch_wrap.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-"use strict";
-
-let h2Port;
-let prefs;
-
-function setup() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-  h2Port = env.get("MOZHTTP2_PORT");
-  Assert.notEqual(h2Port, null);
-  Assert.notEqual(h2Port, "");
-
-  // Set to allow the cert presented by our H2 server
-  do_get_profile();
-  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
-
-  prefs.setBoolPref("network.security.esni.enabled", false);
-  prefs.setBoolPref("network.http.spdy.enabled", true);
-  prefs.setBoolPref("network.http.spdy.enabled.http2", true);
-  // the TRR server is on 127.0.0.1
-  prefs.setCharPref("network.trr.bootstrapAddress", "127.0.0.1");
-
-  // make all native resolve calls "secretly" resolve localhost instead
-  prefs.setBoolPref("network.dns.native-is-localhost", true);
-
-  // 0 - off, 1 - race, 2 TRR first, 3 TRR only, 4 shadow
-  prefs.setIntPref("network.trr.mode", 2); // TRR first
-  prefs.setBoolPref("network.trr.wait-for-portal", false);
-  // don't confirm that TRR is working, just go!
-  prefs.setCharPref("network.trr.confirmationNS", "skip");
-
-  // So we can change the pref without clearing the cache to check a pushed
-  // record with a TRR path that fails.
-  prefs.setBoolPref("network.trr.clear-cache-on-pref-change", false);
-
-  // The moz-http2 cert is for foo.example.com and is signed by http2-ca.pem
-  // so add that cert to the trust list as a signing cert.  // the foo.example.com domain name.
-  const certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
-    Ci.nsIX509CertDB
-  );
-  addCertFromFile(certdb, "../unit/http2-ca.pem", "CTu,u,u");
-}
-
-setup();
-registerCleanupFunction(() => {
-  prefs.clearUserPref("network.security.esni.enabled");
-  prefs.clearUserPref("network.http.spdy.enabled");
-  prefs.clearUserPref("network.http.spdy.enabled.http2");
-  prefs.clearUserPref("network.dns.localDomains");
-  prefs.clearUserPref("network.dns.native-is-localhost");
-  prefs.clearUserPref("network.trr.mode");
-  prefs.clearUserPref("network.trr.uri");
-  prefs.clearUserPref("network.trr.credentials");
-  prefs.clearUserPref("network.trr.wait-for-portal");
-  prefs.clearUserPref("network.trr.allow-rfc1918");
-  prefs.clearUserPref("network.trr.useGET");
-  prefs.clearUserPref("network.trr.confirmationNS");
-  prefs.clearUserPref("network.trr.bootstrapAddress");
-  prefs.clearUserPref("network.trr.blacklist-duration");
-  prefs.clearUserPref("network.trr.request-timeout");
-  prefs.clearUserPref("network.trr.clear-cache-on-pref-change");
-});
-
-function run_test() {
-  prefs.setCharPref(
-    "network.trr.uri",
-    "https://foo.example.com:" + h2Port + "/doh"
-  );
-  run_test_in_child("child_esni_dns_fetch1.js");
-}
diff -Nru firefox-84.0.2+build1/netwerk/test/unit_ipc/xpcshell.ini firefox-85.0+build1/netwerk/test/unit_ipc/xpcshell.ini
--- firefox-84.0.2+build1/netwerk/test/unit_ipc/xpcshell.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/test/unit_ipc/xpcshell.ini	2021-01-18 19:58:18.000000000 +0000
@@ -61,7 +61,7 @@
   !/netwerk/test/unit/test_httpcancel.js
   !/netwerk/test/unit/test_trr_httpssvc.js
   child_cookie_header.js
-  child_esni_dns_fetch1.js
+  child_dns_by_type_resolve.js
 
 [test_cookie_header_stripped.js]
 [test_cacheflags_wrap.js]
@@ -108,6 +108,6 @@
 [test_multipart_streamconv_wrap.js]
 [test_alt-data_cross_process_wrap.js]
 [test_httpcancel_wrap.js]
-[test_esni_dns_fetch_wrap.js]
+[test_dns_by_type_resolve_wrap.js]
 [test_trr_httpssvc_wrap.js]
 skip-if = os == "android"
diff -Nru firefox-84.0.2+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp firefox-85.0+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp
--- firefox-84.0.2+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/net/UrlClassifierCommon.h"
+#include "nsIChannel.h"
 #include "nsIClassifiedChannel.h"
 #include "nsIWebProgressListener.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp firefox-85.0+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp
--- firefox-84.0.2+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/netwerk/url-classifier/UrlClassifierFeatureTrackingProtection.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/AntiTrackingUtils.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "ChannelClassifierService.h"
+#include "nsIChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsILoadContext.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/parser/html/nsHtml5DocumentBuilder.h firefox-85.0+build1/parser/html/nsHtml5DocumentBuilder.h
--- firefox-84.0.2+build1/parser/html/nsHtml5DocumentBuilder.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/html/nsHtml5DocumentBuilder.h	2021-01-18 19:58:18.000000000 +0000
@@ -7,11 +7,15 @@
 #ifndef nsHtml5DocumentBuilder_h
 #define nsHtml5DocumentBuilder_h
 
+#include "mozilla/dom/Document.h"
 #include "nsContentSink.h"
 #include "nsHtml5DocumentMode.h"
-#include "mozilla/dom/Document.h"
 #include "nsIContent.h"
 
+namespace mozilla::dom {
+class Document;
+}
+
 typedef nsIContent* nsIContentPtr;
 
 enum eHtml5FlushState {
diff -Nru firefox-84.0.2+build1/parser/html/nsHtml5MetaScanner.h firefox-85.0+build1/parser/html/nsHtml5MetaScanner.h
--- firefox-84.0.2+build1/parser/html/nsHtml5MetaScanner.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/html/nsHtml5MetaScanner.h	2021-01-18 19:58:18.000000000 +0000
@@ -29,6 +29,7 @@
 #ifndef nsHtml5MetaScanner_h
 #define nsHtml5MetaScanner_h
 
+#include "mozilla/Encoding.h"
 #include "nsAtom.h"
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
diff -Nru firefox-84.0.2+build1/parser/html/nsHtml5StreamParser.cpp firefox-85.0+build1/parser/html/nsHtml5StreamParser.cpp
--- firefox-84.0.2+build1/parser/html/nsHtml5StreamParser.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/html/nsHtml5StreamParser.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,37 +6,85 @@
 
 #include "nsHtml5StreamParser.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <new>
+#include <type_traits>
+#include <utility>
+#include "GeckoProfiler.h"
+#include "js/GCAPI.h"
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/Buffer.h"
+#include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Encoding.h"
+#include "mozilla/EncodingDetector.h"
+#include "mozilla/JapaneseDetector.h"
+#include "mozilla/Likely.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/Services.h"
+#include "mozilla/StaticPrefs_html5.h"
+#include "mozilla/StaticPrefs_intl.h"
+#include "mozilla/TaskCategory.h"
+#include "mozilla/Tuple.h"
+#include "mozilla/UniquePtrExtensions.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/BrowsingContext.h"
+#include "mozilla/dom/DebuggerUtilsBinding.h"
+#include "mozilla/dom/DocGroup.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/mozalloc.h"
+#include "nsCharsetSource.h"
+#include "nsContentSink.h"
 #include "nsContentUtils.h"
-#include "nsHtml5Tokenizer.h"
-#include "nsIHttpChannel.h"
-#include "nsHtml5Parser.h"
-#include "nsHtml5TreeBuilder.h"
+#include "nsCycleCollectionTraversalCallback.h"
 #include "nsHtml5AtomTable.h"
+#include "nsHtml5ByteReadable.h"
+#include "nsHtml5Highlighter.h"
+#include "nsHtml5MetaScanner.h"
 #include "nsHtml5Module.h"
+#include "nsHtml5OwningUTF16Buffer.h"
+#include "nsHtml5Parser.h"
+#include "nsHtml5Speculation.h"
 #include "nsHtml5StreamParserPtr.h"
+#include "nsHtml5Tokenizer.h"
+#include "nsHtml5TreeBuilder.h"
+#include "nsHtml5TreeOpExecutor.h"
+#include "nsHtml5TreeOpStage.h"
+#include "nsIChannel.h"
+#include "nsIContentSink.h"
+#include "nsID.h"
+#include "nsIDTD.h"
 #include "nsIDocShell.h"
-#include "nsIScriptError.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/StaticPrefs_intl.h"
-#include "mozilla/StaticPrefs_html5.h"
-#include "mozilla/UniquePtrExtensions.h"
-#include "nsHtml5Highlighter.h"
-#include "expat_config.h"
-#include "expat.h"
+#include "nsIEventTarget.h"
+#include "nsIHttpChannel.h"
+#include "nsIInputStream.h"
 #include "nsINestedURI.h"
-#include "nsCharsetSource.h"
+#include "nsIObserverService.h"
+#include "nsIRequest.h"
+#include "nsIRunnable.h"
+#include "nsIScriptError.h"
+#include "nsIThread.h"
 #include "nsIThreadRetargetableRequest.h"
-#include "nsPrintfCString.h"
+#include "nsIThreadRetargetableStreamListener.h"
+#include "nsITimer.h"
+#include "nsIURI.h"
+#include "nsJSEnvironment.h"
+#include "nsLiteralString.h"
 #include "nsNetUtil.h"
+#include "nsString.h"
+#include "nsTPromiseFlatString.h"
+#include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
-#include "mozilla/SchedulerGroup.h"
-#include "nsJSEnvironment.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/DebuggerUtilsBinding.h"
-#include "mozilla/ProfilerMarkers.h"
+
+// Include expat after the other, since it defines XML_NS, which conflicts with
+// our symbol names.
+#include "expat_config.h"
+#include "expat.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff -Nru firefox-84.0.2+build1/parser/html/nsHtml5StreamParser.h firefox-85.0+build1/parser/html/nsHtml5StreamParser.h
--- firefox-84.0.2+build1/parser/html/nsHtml5StreamParser.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/parser/html/nsHtml5StreamParser.h	2021-01-18 19:58:18.000000000 +0000
@@ -6,25 +6,52 @@
 #ifndef nsHtml5StreamParser_h
 #define nsHtml5StreamParser_h
 
-#include "nsCOMPtr.h"
-#include "nsHtml5MetaScanner.h"
+#include "MainThreadUtils.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/Encoding.h"
-#include "mozilla/EncodingDetector.h"
-#include "mozilla/JapaneseDetector.h"
-#include "mozilla/UniquePtr.h"
-#include "nsHtml5TreeOpExecutor.h"
-#include "nsHtml5OwningUTF16Buffer.h"
-#include "nsIInputStream.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/NotNull.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/Span.h"
 #include "mozilla/UniquePtr.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsDebug.h"
 #include "nsHtml5AtomTable.h"
-#include "nsHtml5Speculation.h"
+#include "nsIRequestObserver.h"
 #include "nsISerialEventTarget.h"
-#include "nsITimer.h"
-#include "mozilla/dom/DocGroup.h"
-#include "mozilla/Buffer.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nscore.h"
 
+class nsCycleCollectionTraversalCallback;
+class nsHtml5MetaScanner;
+class nsHtml5OwningUTF16Buffer;
 class nsHtml5Parser;
+class nsHtml5Speculation;
+class nsHtml5String;
+class nsHtml5Tokenizer;
+class nsHtml5TreeBuilder;
+class nsHtml5TreeOpExecutor;
+class nsIChannel;
+class nsIInputStream;
+class nsIRequest;
+class nsIRunnable;
+class nsITimer;
+class nsIURI;
+
+namespace mozilla {
+class EncodingDetector;
+class JapaneseDetector;
+template <typename T>
+class Buffer;
+
+namespace dom {
+class DocGroup;
+}
+}  // namespace mozilla
 
 enum eParserMode {
   /**
diff -Nru firefox-84.0.2+build1/parser/html/nsHtml5TreeOperation.cpp firefox-85.0+build1/parser/html/nsHtml5TreeOperation.cpp
--- firefox-84.0.2+build1/parser/html/nsHtml5TreeOperation.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/html/nsHtml5TreeOperation.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -6,8 +6,10 @@
 
 #include "nsHtml5TreeOperation.h"
 #include "mozAutoDocUpdate.h"
+#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/Likely.h"
 #include "mozilla/dom/Comment.h"
+#include "mozilla/dom/CustomElementRegistry.h"
 #include "mozilla/dom/DocumentType.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/LinkStyle.h"
diff -Nru firefox-84.0.2+build1/parser/htmlparser/nsExpatDriver.cpp firefox-85.0+build1/parser/htmlparser/nsExpatDriver.cpp
--- firefox-84.0.2+build1/parser/htmlparser/nsExpatDriver.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/htmlparser/nsExpatDriver.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,9 @@
 #include "nsCRT.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
+#include "nsIScriptGlobalObject.h"
 #include "nsIContentPolicy.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsError.h"
 #include "nsXPCOMCIDInternal.h"
@@ -828,6 +830,10 @@
                                                 nsPrintfCString("%u", code)},
             mozilla::Telemetry::EventExtraEntry{
                 "location"_ns, nsPrintfCString("%u:%u", lineNumber, colNumber)},
+            mozilla::Telemetry::EventExtraEntry{
+                "last_line"_ns, NS_ConvertUTF16toUTF8(mLastLine)},
+            mozilla::Telemetry::EventExtraEntry{
+                "last_line_len"_ns, nsPrintfCString("%u", mLastLine.Length())},
         });
 
     mozilla::Telemetry::SetEventRecordingEnabled("ysod"_ns, true);
diff -Nru firefox-84.0.2+build1/parser/htmlparser/tests/mochitest/browser_ysod_telemetry.js firefox-85.0+build1/parser/htmlparser/tests/mochitest/browser_ysod_telemetry.js
--- firefox-84.0.2+build1/parser/htmlparser/tests/mochitest/browser_ysod_telemetry.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/parser/htmlparser/tests/mochitest/browser_ysod_telemetry.js	2021-01-18 19:58:18.000000000 +0000
@@ -30,7 +30,12 @@
         method: "shown",
         object: "ysod",
         value: PAGE_URL.substr(0, 80),
-        extra: { error_code: "11", location: "3:12" },
+        extra: {
+          error_code: "11",
+          location: "3:12",
+          last_line: "    <title>&nonExistingEntity;</title>",
+          last_line_len: "38",
+        },
       },
     ],
     {
diff -Nru firefox-84.0.2+build1/parser/prototype/PrototypeDocumentParser.cpp firefox-85.0+build1/parser/prototype/PrototypeDocumentParser.cpp
--- firefox-84.0.2+build1/parser/prototype/PrototypeDocumentParser.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/parser/prototype/PrototypeDocumentParser.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsParserCIID.h"
 #include "mozilla/Encoding.h"
 #include "nsCharsetSource.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/URL.h"
 #include "mozilla/dom/PrototypeDocumentContentSink.h"
 
diff -Nru firefox-84.0.2+build1/python/mach/mach/mixin/process.py firefox-85.0+build1/python/mach/mach/mixin/process.py
--- firefox-84.0.2+build1/python/mach/mach/mixin/process.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mach/mach/mixin/process.py	2021-01-18 19:58:18.000000000 +0000
@@ -27,6 +27,9 @@
     _current_shell = os.environ["MOZILLABUILD"] + "/msys/bin/sh.exe"
 elif "COMSPEC" in os.environ:
     _current_shell = os.environ["COMSPEC"]
+elif sys.platform != "win32":
+    # Fall back to a standard shell.
+    _current_shell = "/bin/sh"
 else:
     raise Exception("Could not detect environment shell!")
 
diff -Nru firefox-84.0.2+build1/python/mach_commands.py firefox-85.0+build1/python/mach_commands.py
--- firefox-84.0.2+build1/python/mach_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mach_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -31,6 +31,7 @@
     CommandProvider,
     Command,
 )
+from mach.util import UserError
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -53,8 +54,15 @@
         default=False,
         help="Use ipython instead of the default Python REPL.",
     )
+    @CommandArgument(
+        "--requirements",
+        default=None,
+        help="Install this requirements file before running Python",
+    )
     @CommandArgument("args", nargs=argparse.REMAINDER)
-    def python(self, no_virtualenv, no_activate, exec_file, ipython, args):
+    def python(
+        self, no_virtualenv, no_activate, exec_file, ipython, requirements, args
+    ):
         # Avoid logging the command
         self.log_manager.terminal_handler.setLevel(logging.CRITICAL)
 
@@ -63,6 +71,9 @@
             "PYTHONDONTWRITEBYTECODE": str("1"),
         }
 
+        if requirements and no_virtualenv:
+            raise UserError("Cannot pass both --requirements and --no-virtualenv.")
+
         if no_virtualenv:
             from mach_bootstrap import mach_sys_path
 
@@ -73,6 +84,10 @@
             if not no_activate:
                 self.virtualenv_manager.activate()
             python_path = self.virtualenv_manager.python_path
+            if requirements:
+                self.virtualenv_manager.install_pip_requirements(
+                    requirements, require_hashes=False
+                )
 
         if exec_file:
             exec(open(exec_file).read())
diff -Nru firefox-84.0.2+build1/python/mozboot/mozboot/base.py firefox-85.0+build1/python/mozboot/mozboot/base.py
--- firefox-84.0.2+build1/python/mozboot/mozboot/base.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozboot/mozboot/base.py	2021-01-18 19:58:18.000000000 +0000
@@ -175,7 +175,7 @@
     def suggest_install_distutils(self):
         """Called if distutils.{sysconfig,spawn} can't be imported."""
         print(
-            "Does your distro require installing another package for " "distutils?",
+            "Does your distro require installing another package for distutils?",
             file=sys.stderr,
         )
 
diff -Nru firefox-84.0.2+build1/python/mozboot/mozboot/bootstrap.py firefox-85.0+build1/python/mozboot/mozboot/bootstrap.py
--- firefox-84.0.2+build1/python/mozboot/mozboot/bootstrap.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozboot/mozboot/bootstrap.py	2021-01-18 19:58:18.000000000 +0000
@@ -404,15 +404,19 @@
         )
         self.instance.validate_environment(checkout_root)
         self._validate_python_environment()
-        self.instance.ensure_mach_environment(checkout_root)
 
         if self.instance.no_system_changes:
+            self.instance.ensure_mach_environment(checkout_root)
             self.check_telemetry_opt_in(state_dir)
             self.maybe_install_private_packages_or_exit(state_dir, checkout_root)
             self._output_mozconfig(application, mozconfig_builder)
             sys.exit(0)
 
         self.instance.install_system_packages()
+        # Install mach environment python packages after system packages.
+        # Some mach packages require building native modules, which require
+        # tools which are installed to the system.
+        self.instance.ensure_mach_environment(checkout_root)
 
         # Like 'install_browser_packages' or 'install_mobile_android_packages'.
         getattr(self.instance, "install_%s_packages" % application)(mozconfig_builder)
diff -Nru firefox-84.0.2+build1/python/mozboot/mozboot/osx.py firefox-85.0+build1/python/mozboot/mozboot/osx.py
--- firefox-84.0.2+build1/python/mozboot/mozboot/osx.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/python/mozboot/mozboot/osx.py	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
+import platform
 import re
 import subprocess
 import sys
@@ -188,6 +189,13 @@
         if self.os_version < StrictVersion("10.6"):
             raise Exception("OS X 10.6 or above is required.")
 
+        if platform.machine() == "arm64":
+            print(
+                "Bootstrap is not supported on Apple Silicon yet.\n"
+                "Please see instructions at https://bit.ly/36bUmEx in the meanwhile"
+            )
+            sys.exit(1)
+
         self.minor_version = version.split(".")[1]
 
     def install_system_packages(self):
@@ -369,7 +377,6 @@
         packages = [
             "git",
             "gnu-tar",
-            "node",
             "terminal-notifier",
             "watchman",
         ]
@@ -440,7 +447,7 @@
             self.run_as_root([self.port, "-v", "install"] + missing)
 
     def ensure_macports_system_packages(self, install_mercurial):
-        packages = ["gnutar", "watchman", "nodejs8"]
+        packages = ["gnutar", "watchman"]
         if install_mercurial:
             packages.append("mercurial")
 
diff -Nru firefox-84.0.2+build1/python/mozboot/mozboot/util.py firefox-85.0+build1/python/mozboot/mozboot/util.py
--- firefox-84.0.2+build1/python/mozboot/mozboot/util.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozboot/mozboot/util.py	2021-01-18 19:58:18.000000000 +0000
@@ -17,7 +17,7 @@
 here = os.path.join(os.path.dirname(__file__))
 
 
-MINIMUM_RUST_VERSION = "1.43.0"
+MINIMUM_RUST_VERSION = "1.47.0"
 
 
 def get_state_dir(srcdir=False):
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/action/generate_symbols_file.py firefox-85.0+build1/python/mozbuild/mozbuild/action/generate_symbols_file.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/action/generate_symbols_file.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/action/generate_symbols_file.py	2021-01-18 19:58:18.000000000 +0000
@@ -70,7 +70,10 @@
         # is concerned.
         assert ext == ".def"
         output.write("LIBRARY %s\nEXPORTS\n  %s\n" % (libname, "\n  ".join(symbols)))
-    elif buildconfig.substs.get("GCC_USE_GNU_LD"):
+    elif (
+        buildconfig.substs.get("GCC_USE_GNU_LD")
+        or buildconfig.substs["OS_TARGET"] == "SunOS"
+    ):
         # A linker version script is generated for GNU LD that looks like the
         # following:
         # liblibrary.so {
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/action/test_archive.py firefox-85.0+build1/python/mozbuild/mozbuild/action/test_archive.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/action/test_archive.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/action/test_archive.py	2021-01-18 19:58:18.000000000 +0000
@@ -34,6 +34,7 @@
 TEST_HARNESS_BINS = [
     "BadCertAndPinningServer",
     "DelegatedCredentialsServer",
+    "EncryptedClientHelloServer",
     "GenerateOCSPResponse",
     "OCSPStaplingServer",
     "SanctionsTestServer",
@@ -52,22 +53,6 @@
 
 TEST_HARNESS_DLLS = ["crashinjectdll", "mozglue"]
 
-TEST_PLUGIN_DLLS = [
-    "npsecondtest",
-    "npswftest",
-    "nptest",
-    "nptestjava",
-    "npthirdtest",
-]
-
-TEST_PLUGIN_DIRS = [
-    "JavaTest.plugin/**",
-    "SecondTest.plugin/**",
-    "Test.plugin/**",
-    "ThirdTest.plugin/**",
-    "npswftest.plugin/**",
-]
-
 GMP_TEST_PLUGIN_DIRS = [
     "gmp-clearkey/**",
     "gmp-fake/**",
@@ -240,26 +225,6 @@
         },
         {
             "source": buildconfig.topobjdir,
-            "base": "dist/plugins",
-            "patterns": [
-                "%s%s%s"
-                % (
-                    buildconfig.substs["DLL_PREFIX"],
-                    f,
-                    buildconfig.substs["DLL_SUFFIX"],
-                )
-                for f in TEST_PLUGIN_DLLS
-            ],
-            "dest": "bin/plugins",
-        },
-        {
-            "source": buildconfig.topobjdir,
-            "base": "dist/plugins",
-            "patterns": TEST_PLUGIN_DIRS,
-            "dest": "bin/plugins",
-        },
-        {
-            "source": buildconfig.topobjdir,
             "base": "dist/bin",
             "patterns": GMP_TEST_PLUGIN_DIRS,
             "dest": "bin/plugins",
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/artifact_commands.py firefox-85.0+build1/python/mozbuild/mozbuild/artifact_commands.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/artifact_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/artifact_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -605,20 +605,7 @@
                     "sha256": h.hexdigest(),
                 }
             if record.unpack and not no_unpack:
-                # Try to unpack the file. If we get an exception importing
-                # zstandard when calling unpack_file, we can try installing
-                # zstandard locally and trying again
-                try:
-                    unpack_file(local)
-                except ImportError as e:
-                    # Need to do this branch while this code is still exercised
-                    # by Python 2.
-                    if six.PY3 and e.name != "zstandard":
-                        raise
-                    elif six.PY2 and e.message != "No module named zstandard":
-                        raise
-                    self._ensure_zstd()
-                    unpack_file(local)
+                unpack_file(local)
                 os.unlink(local)
 
         if not downloaded:
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/artifacts.py firefox-85.0+build1/python/mozbuild/mozbuild/artifacts.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/artifacts.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/artifacts.py	2021-01-18 19:58:18.000000000 +0000
@@ -118,6 +118,7 @@
     test_artifact_patterns = {
         ("bin/BadCertAndPinningServer", ("bin", "bin")),
         ("bin/DelegatedCredentialsServer", ("bin", "bin")),
+        ("bin/EncryptedClientHelloServer", ("bin", "bin")),
         ("bin/GenerateOCSPResponse", ("bin", "bin")),
         ("bin/OCSPStaplingServer", ("bin", "bin")),
         ("bin/SanctionsTestServer", ("bin", "bin")),
@@ -547,21 +548,7 @@
             "crashreporter.app/Contents/MacOS/crashreporter",
             "{product}",
             "{product}-bin",
-            "libfreebl3.dylib",
-            "libgraphitewasm.dylib",
-            "liblgpllibs.dylib",
-            # 'liblogalloc.dylib',
-            "libmozglue.dylib",
-            "libnss3.dylib",
-            "libnssckbi.dylib",
-            "libplugin_child_interpose.dylib",
-            # 'libreplace_jemalloc.dylib',
-            # 'libreplace_malloc.dylib',
-            "libmozavutil.dylib",
-            "libmozavcodec.dylib",
-            "liboggwasm.dylib",
-            "libosclientcerts.dylib",
-            "libsoftokn3.dylib",
+            "*.dylib",
             "minidump-analyzer",
             "pingsender",
             "plugin-container.app/Contents/MacOS/plugin-container",
@@ -688,6 +675,7 @@
     test_artifact_patterns = {
         ("bin/BadCertAndPinningServer.exe", ("bin", "bin")),
         ("bin/DelegatedCredentialsServer.exe", ("bin", "bin")),
+        ("bin/EncryptedClientHelloServer.exe", ("bin", "bin")),
         ("bin/GenerateOCSPResponse.exe", ("bin", "bin")),
         ("bin/OCSPStaplingServer.exe", ("bin", "bin")),
         ("bin/SanctionsTestServer.exe", ("bin", "bin")),
@@ -746,14 +734,7 @@
 
 
 class MacThunderbirdArtifactJob(ThunderbirdMixin, MacArtifactJob):
-    _paths_no_keep_path = MacArtifactJob._paths_no_keep_path
-    _paths_no_keep_path[1].extend(
-        [
-            "libldap60.dylib",
-            "libldif60.dylib",
-            "libprldap60.dylib",
-        ]
-    )
+    pass
 
 
 class WinThunderbirdArtifactJob(ThunderbirdMixin, WinArtifactJob):
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/build_commands.py firefox-85.0+build1/python/mozbuild/mozbuild/build_commands.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/build_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/build_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -126,9 +126,10 @@
                 return status
 
             pgo_env = os.environ.copy()
-            pgo_env["LLVM_PROFDATA"] = instr.config_environment.substs.get(
-                "LLVM_PROFDATA"
-            )
+            if instr.config_environment.substs.get("CC_TYPE") in ("clang", "clang-cl"):
+                pgo_env["LLVM_PROFDATA"] = instr.config_environment.substs.get(
+                    "LLVM_PROFDATA"
+                )
             pgo_env["JARLOG_FILE"] = mozpath.join(orig_topobjdir, "jarlog/en-US.log")
             pgo_cmd = [
                 instr.virtualenv_manager.python_path,
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/code_analysis/mach_commands.py firefox-85.0+build1/python/mozbuild/mozbuild/code_analysis/mach_commands.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/code_analysis/mach_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/code_analysis/mach_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -20,6 +20,7 @@
 import yaml
 
 import six
+from six.moves import input
 
 from mach.decorators import (
     CommandArgument,
@@ -68,7 +69,7 @@
 
     for _ in range(limit):
         try:
-            return strtobool(raw_input(prompt + "[Y/N]\n"))
+            return strtobool(input(prompt + "[Y/N]\n"))
         except ValueError:
             print(
                 "ERROR! Please enter a valid option! Please use any of the following:"
@@ -1224,6 +1225,15 @@
                 .strip()
             )
 
+            if "MOZ_AUTOMATION" in os.environ:
+                # Only show it in the CI
+                self.log(
+                    logging.INFO,
+                    "static-analysis",
+                    {},
+                    "{} Version = {} ".format(self._clang_format_path, version_info),
+                )
+
         except subprocess.CalledProcessError as e:
             self.log(
                 logging.ERROR,
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/frontend/context.py firefox-85.0+build1/python/mozbuild/mozbuild/frontend/context.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/frontend/context.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/frontend/context.py	2021-01-18 19:58:18.000000000 +0000
@@ -2405,6 +2405,7 @@
                 "non_unified_sources": StrictOrderingOnAppendList,
                 "mozilla_flags": list,
                 "gn_target": six.text_type,
+                "write_mozbuild_vars": dict,
             }
         ),
         list,
@@ -2419,6 +2420,8 @@
             - mozilla_flags, a set of flags that if present in the gn config
               will be mirrored to the resulting mozbuild configuration.
             - gn_target, the name of the target to build.
+            - write_mozbuild_vars, a dictionary containing variables to control
+              code generation of moz.build files.
         """,
     ),
     "SPHINX_TREES": (
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/frontend/data.py firefox-85.0+build1/python/mozbuild/mozbuild/frontend/data.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/frontend/data.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/frontend/data.py	2021-01-18 19:58:18.000000000 +0000
@@ -1437,3 +1437,4 @@
         self.gn_sandbox_variables = gn_dir_attrs.sandbox_vars
         self.mozilla_flags = gn_dir_attrs.mozilla_flags
         self.gn_target = gn_dir_attrs.gn_target
+        self.write_mozbuild_variables = gn_dir_attrs.write_mozbuild_vars
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/gn_processor.py firefox-85.0+build1/python/mozbuild/mozbuild/gn_processor.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/gn_processor.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/gn_processor.py	2021-01-18 19:58:18.000000000 +0000
@@ -434,7 +434,13 @@
 
 
 def write_mozbuild(
-    config, srcdir, output, non_unified_sources, gn_config_files, mozilla_flags
+    config,
+    srcdir,
+    output,
+    non_unified_sources,
+    gn_config_files,
+    mozilla_flags,
+    write_mozbuild_variables,
 ):
 
     all_mozbuild_results = []
@@ -473,6 +479,13 @@
             mb.write("\n")
             mb.write(generated_header)
 
+            try:
+                if relsrcdir in write_mozbuild_variables["INCLUDE_TK_CFLAGS_DIRS"]:
+                    mb.write('if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":\n')
+                    mb.write('    CXXFLAGS += CONFIG["TK_CFLAGS"]\n')
+            except KeyError:
+                pass
+
             all_args = [args for args, _ in configs]
 
             # Start with attributes that will be a part of the mozconfig
@@ -653,6 +666,7 @@
                     obj.non_unified_sources,
                     gn_config_files,
                     obj.mozilla_flags,
+                    obj.write_mozbuild_variables,
                 )
             else:
                 print(
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/mach_commands.py firefox-85.0+build1/python/mozbuild/mozbuild/mach_commands.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/mach_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/mach_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -2097,11 +2097,21 @@
 
         manager.install_pip_package("zstandard>=0.9.0,<=0.13.0")
 
+        try:
+            # `mach` can handle it perfectly fine if `psutil` is missing, so
+            # there's no reason to freak out in this case.
+            manager.install_pip_package("psutil==5.7.0")
+        except subprocess.CalledProcessError:
+            print(
+                "Could not install psutil, so telemetry will be missing some "
+                "data. Continuing."
+            )
+
         if not PY2:
             # This can fail on some platforms. See
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
             try:
-                manager.install_pip_package("glean_sdk~=32.3.1")
+                manager.install_pip_package("glean_sdk~=33.7.0")
             except subprocess.CalledProcessError:
                 print(
                     "Could not install glean_sdk, so telemetry will not be "
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py firefox-85.0+build1/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py	2021-01-18 19:58:18.000000000 +0000
@@ -2057,7 +2057,7 @@
 
 class RustTest(BaseConfigureTest):
     def get_rust_target(
-        self, target, compiler_type="gcc", version="1.39.0", arm_target=None
+        self, target, compiler_type="gcc", version="1.47.0", arm_target=None
     ):
         environ = {
             "PATH": os.pathsep.join(mozpath.abspath(p) for p in ("/bin", "/usr/bin")),
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/mach_commands.py firefox-85.0+build1/python/mozbuild/mozbuild/vendor/mach_commands.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/mach_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/vendor/mach_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -153,12 +153,6 @@
         "Some extra files like docs and tests will automatically be excluded.",
     )
     @CommandArgument(
-        "--with-windows-wheel",
-        action="store_true",
-        help="Vendor a wheel for Windows along with the source package",
-        default=False,
-    )
-    @CommandArgument(
         "--keep-extra-files",
         action="store_true",
         default=False,
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/moz_yaml.py firefox-85.0+build1/python/mozbuild/mozbuild/vendor/moz_yaml.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/moz_yaml.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/vendor/moz_yaml.py	2021-01-18 19:58:18.000000000 +0000
@@ -23,6 +23,7 @@
 import yaml
 from voluptuous import (
     All,
+    Boolean,
     FqdnUrl,
     Length,
     Match,
@@ -107,6 +108,22 @@
   # optional
   license-file: COPYING
 
+# Configuration for automatic updating system.
+# optional
+updatebot:
+
+  # Whether or not updating this library is enabled
+  # Valid values are 'true', 'false'
+  enabled: false
+
+  # TODO: allow multiple users to be specified
+  # Phabricator username for a maintainer of the library, used for assigning
+  # reviewers
+  maintainer_phab: tjr
+
+  # Bugzilla email address for a maintainer of the library, used for needinfos
+  maintainer_bz: tom@mozilla.com
+
 # Configuration for the automated vendoring system.
 # optional
 vendoring:
@@ -324,6 +341,11 @@
                 Required("release"): All(str, Length(min=1)),
                 Required("revision"): Match(r"^[a-fA-F0-9]{12,40}$"),
             },
+            "updatebot": {
+                Required("enabled"): Boolean(),
+                Required("maintainer-phab"): All(str, Length(min=1)),
+                Required("maintainer-bz"): All(str, Length(min=1)),
+            },
             "vendoring": {
                 Required("url"): FqdnUrl(),
                 Required("source-hosting"): All(
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/vendor_python.py firefox-85.0+build1/python/mozbuild/mozbuild/vendor/vendor_python.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/vendor/vendor_python.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/vendor/vendor_python.py	2021-01-18 19:58:18.000000000 +0000
@@ -16,17 +16,13 @@
 
 
 class VendorPython(MozbuildObject):
-    def vendor(self, packages=None, with_windows_wheel=False, keep_extra_files=False):
+    def vendor(self, packages=None, keep_extra_files=False):
         self.populate_logger()
         self.log_manager.enable_unstructured()
 
         vendor_dir = mozpath.join(self.topsrcdir, os.path.join("third_party", "python"))
 
         packages = packages or []
-        if with_windows_wheel and len(packages) != 1:
-            raise Exception(
-                "--with-windows-wheel is only supported for a single package!"
-            )
 
         self.activate_virtualenv()
         pip_compile = os.path.join(self.virtualenv_manager.bin_path, "pip-compile")
@@ -75,30 +71,6 @@
                         "--disable-pip-version-check",
                     ]
                 )
-                if with_windows_wheel:
-                    # This is hardcoded to CPython 2.7 for win64, which is good
-                    # enough for what we need currently. If we need psutil for Python 3
-                    # in the future that could be added here as well.
-                    self.virtualenv_manager._run_pip(
-                        [
-                            "download",
-                            "--dest",
-                            tmp,
-                            "--no-deps",
-                            "--only-binary",
-                            ":all:",
-                            "--platform",
-                            "win_amd64",
-                            "--implementation",
-                            "cp",
-                            "--python-version",
-                            "27",
-                            "--abi",
-                            "none",
-                            "--disable-pip-version-check",
-                            packages[0],
-                        ]
-                    )
                 self._extract(tmp, vendor_dir, keep_extra_files)
 
             shutil.copyfile(tmpspec_absolute, spec)
@@ -147,27 +119,14 @@
         finder = FileFinder(src)
         for path, _ in finder.find("*"):
             base, ext = os.path.splitext(path)
-            if ext == ".whl":
-                # Wheels would extract into a directory with the name of the package, but
-                # we want the platform signifiers, minus the version number.
-                # Wheel filenames look like:
-                # {distribution}-{version}(-{build tag})?-{python tag}-{abi tag}-{platform tag}
-                bits = base.split("-")
-
-                # Remove the version number.
-                bits.pop(1)
-                target = os.path.join(dest, "-".join(bits))
-                mozfile.remove(target)  # remove existing version of vendored package
-                os.mkdir(target)
-                mozfile.extract(os.path.join(finder.base, path), target, ignore=ignore)
-            else:
-                # packages extract into package-version directory name and we strip the version
-                tld = mozfile.extract(
-                    os.path.join(finder.base, path), dest, ignore=ignore
-                )[0]
-                target = os.path.join(dest, tld.rpartition("-")[0])
-                mozfile.remove(target)  # remove existing version of vendored package
-                mozfile.move(tld, target)
+            # packages extract into package-version directory name and we strip the version
+            tld = mozfile.extract(os.path.join(finder.base, path), dest, ignore=ignore)[
+                0
+            ]
+            target = os.path.join(dest, tld.rpartition("-")[0])
+            mozfile.remove(target)  # remove existing version of vendored package
+            mozfile.move(tld, target)
+
             # If any files inside the vendored package were symlinks, turn them into normal files
             # because hg.mozilla.org forbids symlinks in the repository.
             link_finder = FileFinder(target)
diff -Nru firefox-84.0.2+build1/python/mozbuild/mozbuild/virtualenv.py firefox-85.0+build1/python/mozbuild/mozbuild/virtualenv.py
--- firefox-84.0.2+build1/python/mozbuild/mozbuild/virtualenv.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozbuild/mozbuild/virtualenv.py	2021-01-18 19:58:18.000000000 +0000
@@ -449,7 +449,10 @@
             )
 
             if sysconfig_target is not None:
-                os.environ["MACOSX_DEPLOYMENT_TARGET"] = sysconfig_target
+                # MACOSX_DEPLOYMENT_TARGET is usually a string (e.g.: "10.14.6"), but
+                # in some cases it is an int (e.g.: 11). Since environment variables
+                # must all be str, explicitly convert it.
+                os.environ["MACOSX_DEPLOYMENT_TARGET"] = str(sysconfig_target)
 
             old_env_variables = {}
             for k in IGNORE_ENV_VARIABLES:
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/metadata.py firefox-85.0+build1/python/mozperftest/mozperftest/metadata.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/metadata.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/metadata.py	2021-01-18 19:58:18.000000000 +0000
@@ -16,10 +16,10 @@
         self._env = env
         self.script = script
 
-    def run_hook(self, name, **kw):
+    def run_hook(self, name, *args, **kw):
         # this bypasses layer restrictions on args,
         # which is fine since it's a user script
-        return self._env.hooks.run(name, **kw)
+        return self._env.hooks.run(name, *args, **kw)
 
     def set_output(self, output):
         self._output = output
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/metrics/common.py firefox-85.0+build1/python/mozperftest/mozperftest/metrics/common.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/metrics/common.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/metrics/common.py	2021-01-18 19:58:18.000000000 +0000
@@ -248,22 +248,13 @@
 
         # Simplify the filtered metric names
         if simplify_names:
-            previous = []
-            for data_type, data_info in filtered.items():
-                for res in data_info:
-                    if any([met in res["subtest"] for met in simplify_exclude]):
-                        continue
-
-                    new = res["subtest"].split(".")[-1]
-                    if new in previous:
-                        self.logger.warning(
-                            f"Another metric which ends with `{new}` was already found. "
-                            f"{res['subtest']} will not be simplified."
-                        )
-                        continue
 
-                    res["subtest"] = new
-                    previous.append(new)
+            def _simplify(name):
+                if any([met in name for met in simplify_exclude]):
+                    return None
+                return name.split(".")[-1]
+
+            self._alter_name(filtered, res, filter=_simplify)
 
         # Split the filtered results
         if split_by is not None:
@@ -290,6 +281,22 @@
 
         return filtered
 
+    def _alter_name(self, filtered, res, filter):
+        previous = []
+        for data_type, data_info in filtered.items():
+            for res in data_info:
+                new = filter(res["subtest"])
+                if new is None:
+                    continue
+                if new in previous:
+                    self.logger.warning(
+                        f"Another metric which ends with `{new}` was already found. "
+                        f"{res['subtest']} will not be simplified."
+                    )
+                    continue
+                res["subtest"] = new
+                previous.append(new)
+
 
 _metrics = {}
 
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/metrics/perfherder.py firefox-85.0+build1/python/mozperftest/mozperftest/metrics/perfherder.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/metrics/perfherder.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/metrics/perfherder.py	2021-01-18 19:58:18.000000000 +0000
@@ -6,6 +6,7 @@
 import os
 import pathlib
 import statistics
+import sys
 
 from mozperftest.utils import strtobool
 from mozperftest.layers import Layer
@@ -170,7 +171,14 @@
 
         # XXX "suites" key error occurs when using self.info so a print
         # is being done for now.
-        print("PERFHERDER_DATA: " + json.dumps(all_perfherder_data))
+
+        # print() will produce a BlockingIOError on large outputs, so we use
+        # sys.stdout
+        sys.stdout.write("PERFHERDER_DATA: ")
+        json.dump(all_perfherder_data, sys.stdout)
+        sys.stdout.write("\n")
+        sys.stdout.flush()
+
         metadata.set_output(write_json(all_perfherder_data, output, file))
         return metadata
 
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/system/macos.py firefox-85.0+build1/python/mozperftest/mozperftest/system/macos.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/system/macos.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/system/macos.py	2021-01-18 19:58:18.000000000 +0000
@@ -38,7 +38,7 @@
             universal_newlines=True,
         )
 
-        stdout, stderr = p.communicate(timeout=15)
+        stdout, stderr = p.communicate(timeout=45)
         if p.returncode != 0:
             raise subprocess.CalledProcessError(
                 stdout=stdout, stderr=stderr, returncode=p.returncode
@@ -49,6 +49,9 @@
     def extract_app(self, dmg, target):
         mount = Path(tempfile.mkdtemp())
 
+        if not Path(dmg).exists():
+            raise FileNotFoundError(dmg)
+
         # mounting the DMG with hdiutil
         cmd = f"hdiutil attach -nobrowse -mountpoint {str(mount)} {dmg}"
         try:
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/test/browsertime/__init__.py firefox-85.0+build1/python/mozperftest/mozperftest/test/browsertime/__init__.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/test/browsertime/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/test/browsertime/__init__.py	2021-01-18 19:58:18.000000000 +0000
@@ -5,9 +5,12 @@
 from mozperftest.test.browsertime.runner import BrowsertimeRunner  # noqa
 
 
-def add_option(env, name, value):
-    options = env.get_arg("browsertime-extra-options", "")
-    options += ",%s=%s" % (name, value)
+def add_option(env, name, value, overwrite=False):
+    if not overwrite:
+        options = env.get_arg("browsertime-extra-options", "")
+        options += f",{name}={value}"
+    else:
+        options = f"{name}={value}"
     env.set_arg("browsertime-extra-options", options)
 
 
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/test/browsertime/runner.py firefox-85.0+build1/python/mozperftest/mozperftest/test/browsertime/runner.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/test/browsertime/runner.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/test/browsertime/runner.py	2021-01-18 19:58:18.000000000 +0000
@@ -335,11 +335,15 @@
             result_dir = result_dir.resolve()
 
             # Run the test cycle
-            metadata.run_hook("before_cycle", cycle=cycle)
+            metadata.run_hook(
+                "before_cycle", metadata, self.env, cycle, self._test_script
+            )
             try:
                 metadata = self._one_cycle(metadata, result_dir)
             finally:
-                metadata.run_hook("after_cycle", cycle=cycle)
+                metadata.run_hook(
+                    "after_cycle", metadata, self.env, cycle, self._test_script
+                )
         return metadata
 
     def _one_cycle(self, metadata, result_dir):
diff -Nru firefox-84.0.2+build1/python/mozperftest/mozperftest/utils.py firefox-85.0+build1/python/mozperftest/mozperftest/utils.py
--- firefox-84.0.2+build1/python/mozperftest/mozperftest/utils.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/mozperftest/utils.py	2021-01-18 19:58:18.000000000 +0000
@@ -14,6 +14,7 @@
 import importlib
 import subprocess
 import shlex
+import functools
 
 from redo import retry
 from requests.packages.urllib3.util.retry import Retry
@@ -412,6 +413,7 @@
 _DEFAULT_SERVER = "https://firefox-ci-tc.services.mozilla.com"
 
 
+@functools.lru_cache()
 def get_tc_secret():
     """Returns the Taskcluster secret.
 
diff -Nru firefox-84.0.2+build1/python/mozperftest/perfdocs/config.yml firefox-85.0+build1/python/mozperftest/perfdocs/config.yml
--- firefox-84.0.2+build1/python/mozperftest/perfdocs/config.yml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozperftest/perfdocs/config.yml	2021-01-18 19:58:18.000000000 +0000
@@ -12,6 +12,7 @@
             youtube-scroll: ""
             facebook-scroll: ""
             cloudflare: ""
+            controlled: ""
             g-search: ""
             g-image: ""
             lq-fetch: ""
diff -Nru firefox-84.0.2+build1/python/mozterm/setup.py firefox-85.0+build1/python/mozterm/setup.py
--- firefox-84.0.2+build1/python/mozterm/setup.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/python/mozterm/setup.py	2021-01-18 19:58:18.000000000 +0000
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 VERSION = "1.0.0"
-DEPS = ["six >= 1.10.0"]
+DEPS = ["six >= 1.13.0"]
 
 setup(
     name="mozterm",
diff -Nru firefox-84.0.2+build1/remote/Cargo.toml firefox-85.0+build1/remote/Cargo.toml
--- firefox-84.0.2+build1/remote/Cargo.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/Cargo.toml	2021-01-18 19:58:18.000000000 +0000
@@ -6,10 +6,10 @@
 path = "lib.rs"
 
 [dependencies]
-failure = { version = "0.1", default_features = false, features = ["derive"] }
 http = "0.2"
 libc = "0.2"
 log = "0.4"
 nserror = { path = "../xpcom/rust/nserror" }
 nsstring = { path = "../xpcom/rust/nsstring" }
+thiserror = "1"
 xpcom = { path = "../xpcom/rust/xpcom" }
diff -Nru firefox-84.0.2+build1/remote/Connection.jsm firefox-85.0+build1/remote/Connection.jsm
--- firefox-84.0.2+build1/remote/Connection.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/Connection.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -127,7 +127,7 @@
     this.send({
       sessionId, // this will be undefined for the default session
       id,
-      result,
+      result: typeof result != "undefined" ? result : {},
     });
   }
 
diff -Nru firefox-84.0.2+build1/remote/doc/Architecture.md firefox-85.0+build1/remote/doc/Architecture.md
--- firefox-84.0.2+build1/remote/doc/Architecture.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/doc/Architecture.md	2021-01-18 19:58:18.000000000 +0000
@@ -6,8 +6,8 @@
 Remote Agent startup
 --------------------
 
-Everything starts with `RemoteAgent` class.
-This singleton handles command lines arguments (--remote-debugging-port) to eventually
+Everything starts with the `RemoteAgent` implementation, which handles command line
+arguments (--remote-debugging-port) to eventually
 start a server listening on the TCP port 9222 (or the one specified by the command line).
 The browser target websocket URL will be printed to stderr.
 To do that this component glue together three main high level components:
@@ -31,7 +31,7 @@
       We have a future intention to fix this and report only what Firefox implements.
     You can connect to these websocket URL in order to debug things.
 
-  * `targets/Targets`
+  * `targets/TargetList`
     This component is responsible of maintaining the list of all debuggable targets.
     For now it can be either:
     * The main browser target
@@ -49,7 +49,7 @@
 ---------------------------------
 
 Each target's websocket URL will be registered as a HTTP endpoint via `server/HTTPD:registerPathHandler`.
-(This registration is done from `RemoteAgent:init`)
+(This registration is done from `RemoteAgentClass:listen`)
 Once a HTTP request happens, `server/HTTPD` will call the `handle` method on the object passed to `registerPathHandler`.
 For static endpoints registered by `JSONHandler`, this will call `JSONHandler:handle` and return a JSON string as http body.
 For target's endpoint, it is slightly more complicated as it requires a special handshake to morph the HTTP connection into a WebSocket one.
@@ -81,7 +81,7 @@
     Typically, the `sessions/TabSession` forward the CDP command to the content process where the tab is running.
     It also redirects back the command response as well as Domain events from that process back to the parent process in order to
     forward them to the connection.
-    Sessions will be using the `Domains` class as an helper to manage a list of Domain implementations in a given context.
+    Sessions will be using the `DomainCache` class as a helper to manage a list of Domain implementations in a given context.
 
 Debugging additional Targets
 ----------------------------
@@ -139,25 +139,25 @@
     └───────────────┘       └───────────────┘ 1       └───────────────┘
             │
             │
-            │              1 ┌────────────� 1
-            └───────────────▶│  Targets   │◀─�
-                             └────────────┘  │
-                                    │        │
-                                    ▼ 1..n   │
-                             ┌────────────�  │
-           ┌─────────────────│ Target  [1]│  │
-           │                 └────────────┘  │
-           │                        ▲ 1      │
-           ▼ 1..n                   │        │
-    ┌────────────�       1..n┌────────────�  │
-    │ Connection │◀─────────▶│ Session [2]│──┘
+            │              1 ┌────────────────� 1
+            └───────────────▶│  TargetList    │◀─�
+                             └────────────────┘  │
+                                    │            │
+                                    ▼ 1..n       │
+                             ┌────────────�      │
+           ┌─────────────────│ Target  [1]│      │
+           │                 └────────────┘      │
+           │                        ▲ 1          │
+           ▼ 1..n                   │            │
+    ┌────────────�       1..n┌────────────�      │
+    │ Connection │◀─────────▶│ Session [2]│──────┘
     └────────────┘ 1         └────────────┘
            │                      1 ▲
            │                        │
            â–¼ 1                      â–¼ 1
-┌────────────────────�       ┌────────────�       1..n┌────────────�
-│ WebSocketTransport │       │  Domains   │──────────▶│ Domain  [3]│
-└────────────────────┘       └────────────┘           └────────────┘
+┌────────────────────�       ┌──────────────�         1..n┌────────────�
+│ WebSocketTransport │       │  DomainCache | │──────────▶│ Domain  [3]│
+└────────────────────┘       └──────────────┘             └────────────┘
 ```
  [1] Target is inherited by TabTarget and MainProcessTarget.
  [2] Session is inherited by TabSession and MainProcessSession.
diff -Nru firefox-84.0.2+build1/remote/doc/PuppeteerVendor.md firefox-85.0+build1/remote/doc/PuppeteerVendor.md
--- firefox-84.0.2+build1/remote/doc/PuppeteerVendor.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/doc/PuppeteerVendor.md	2021-01-18 19:58:18.000000000 +0000
@@ -3,12 +3,81 @@
 
 As mentioned in the chapter on [Testing], we run the full [Puppeteer
 test suite] on try.  These tests are vendored in central under
-_remote/test/puppeteer/_ and we have a script to pull in the most
-recent changes.
+_remote/test/puppeteer/_ and we have a script to pull in upstream changes.
 
-To update the vendored copy of Puppeteer under _remote/test/puppeteer/_:
+We periodically perform a manual two-way sync. Below is an outline of the
+process interspersed with some tips.
 
-	% ./mach remote vendor-puppeteer
+1. Clone the Puppeteer git repository and checkout the release tag you want
+   to vendor into mozilla-central.
+
+    	% git checkout tags/v10.0 -b sync-v10.0
+
+2. Apply any recent changes in `remote/test/puppeteer` to the Puppeteer branch
+   created above.
+
+	 You might want to [install the project] at this point and make sure unit
+	 tests pass. Check the project's `package.json` for relevant testing commands.
+
+   You should use this as basis for a PR to the Puppeteer project once you are
+	 satisfied that the two-way sync will be successful in mozilla-central. See
+	 their [CONTRIBUTING.md].
+
+	 Typically, the changes we push to Puppeteer include unskipping newly passing
+	 unit tests for Firefox along with minor fixes to the tests or
+	 to Firefox-specific browser-fetching and launch code.
+
+	 Be sure to [run tests against both Chromium and Firefox] in the Puppeteer
+	 repo. You can specify your local Firefox build when you do so:
+
+		% BINARY=<path-to-objdir-binary> npm run funit
+
+3. Now back in mozilla-central, you can run the following mach command to
+	 copy over the Puppeteer branch you just prepared. The mach command has
+	 flags to specify a local or remote repository as well as a commit.
+
+		% ./mach remote vendor-puppeteer
+
+	 By default, this command also installs the newly-pulled Puppeteer package
+	 in order to generate a new `package-lock.json` file for the purpose of
+	 pinning Puppeteer dependencies for our CI. There is a `--no-install` option
+	 if you want to skip this step; for example, if you want to run installation
+	 separately at a later point.
+
+4. Go through the changes under `remote/test/puppeteer/test` and [unskip] any
+	 newly-skipped tests (e.g. change `itFailsFirefox` to `it`).
+	 A mass-change with `awk` might be useful here.
+
+	 Why do we do this? The Puppeteer team runs their unit tests against Firefox
+	 in their CI with many tests skipped. In contrast, we leave these tests
+	 unskipped in Mozilla CI and track test expectation metadata
+	 in [puppeteer-expected.json] instead.
+
+5. Use `./mach puppeteer-test` (see [Testing]) to run Puppeteer tests against
+   both Chromium and Firefox in headless mode. Again, only running a subset of
+	 tests against Firefox is fine -- at this point you just want to check that
+	 the typescript compiles and the browser binaries are launched successfully.
+
+6. Next you want to update the test expectation metadata: test results might
+   have changed, tests may have been renamed, removed or added. The
+	 easiest way to do this is to run the Puppeteer test job on try
+	 (see [Testing]). You will find the new test metadata as an artifact on that
+	 job and you can copy it over into your sync patch if it looks reasonable.
+
+	 Examine the job logs and makes sure the run didn't get interrupted early
+	 by a crash or a hang, especially if you see a lot of
+	 `TEST-UNEXPECTED-MISSING` in the Treeherder Failure Summary. You might need
+	 to add new test skips or fix some new bug in the unit tests. This is the
+	 fun part.
+
+7. Once you are happy with the metadata and are ready to submit the sync patch
+   up for review, run the Puppeteer test job on try again with `--rebuild 10`
+	 to check for stability.
 
 [Testing]: ./Testing.html
 [Puppeteer test suite]: https://github.com/GoogleChrome/puppeteer/tree/master/test
+[re-install the project]: https://github.com/puppeteer/puppeteer/blob/main/CONTRIBUTING.md#getting-code
+[run tests against both Chromium and Firefox]: https://github.com/puppeteer/puppeteer/blob/main/test/README.md#running-tests
+[puppeteer-expected.json]: https://searchfox.org/mozilla-central/source/remote/puppeteer-expected.json
+[CONTRIBUTING.md]: https://github.com/puppeteer/puppeteer/blob/main/CONTRIBUTING.md
+[unskip]: https://github.com/puppeteer/puppeteer/blob/main/test/README.md#skipping-tests-in-specific-conditions
diff -Nru firefox-84.0.2+build1/remote/doc/Testing.md firefox-85.0+build1/remote/doc/Testing.md
--- firefox-84.0.2+build1/remote/doc/Testing.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/doc/Testing.md	2021-01-18 19:58:18.000000000 +0000
@@ -112,6 +112,9 @@
 towards achieving full [Puppeteer support] in Firefox. The tests are written
 in the behaviour-driven testing framework [Mocha].
 
+Check the upstream [Puppeteer test suite] documentation for instructions on
+how to skip tests, run only one test or a subsuite of tests.
+
 Puppeteer tests are vendored under _remote/test/puppeteer/_ and are
 run locally like this:
 
diff -Nru firefox-84.0.2+build1/remote/domains/content/Log.jsm firefox-85.0+build1/remote/domains/content/Log.jsm
--- firefox-84.0.2+build1/remote/domains/content/Log.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/domains/content/Log.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,13 @@
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
+const CONSOLE_MESSAGE_LEVEL_MAP = {
+  [Ci.nsIConsoleMessage.debug]: "verbose",
+  [Ci.nsIConsoleMessage.info]: "info",
+  [Ci.nsIConsoleMessage.warn]: "warning",
+  [Ci.nsIConsoleMessage.error]: "error",
+};
+
 class Log extends ContentProcessDomain {
   constructor(session) {
     super(session);
@@ -28,38 +35,44 @@
       this.enabled = true;
 
       Services.console.registerListener(this);
-      Services.obs.addObserver(this, "console-api-log-event");
     }
   }
 
   disable() {
     if (this.enabled) {
       this.enabled = false;
+
       Services.console.unregisterListener(this);
-      Services.obs.removeObserver(this, "console-api-log-event");
     }
   }
 
   // nsIObserver
 
   /**
-   * Takes all script error messages belonging to the current window
-   * and emits a "console-service-message" event.
+   * Takes all script error messages belonging to the current window.
+   * and emits a "Log.entryAdded" event.
    *
    * @param {nsIConsoleMessage} message
    *     Message originating from the nsIConsoleService.
    */
-  observe(message, topic) {
-    let entry;
-    if (message instanceof Ci.nsIScriptError) {
-      entry = fromScriptError(message);
-    } else if (message instanceof Ci.nsIConsoleMessage) {
-      entry = fromConsoleMessage(message);
-    } else if (topic == "console-api-log-event") {
-      entry = fromConsoleAPI(message.wrappedJSObject);
-    }
+  observe(message) {
+    // Console messages will be handled via Runtime.consoleAPICalled
+    if (
+      message instanceof Ci.nsIScriptError &&
+      message.flags == Ci.nsIScriptError.errorFlag
+    ) {
+      const entry = {
+        source: "javascript",
+        level: CONSOLE_MESSAGE_LEVEL_MAP[message.flags],
+        lineNumber: message.lineNumber,
+        stacktrace: message.stack,
+        text: message.errorMessage,
+        timestamp: message.timeStamp,
+        url: message.sourceName,
+      };
 
-    this.emit("Log.entryAdded", { entry });
+      this.emit("Log.entryAdded", { entry });
+    }
   }
 
   // XPCOM
@@ -68,62 +81,3 @@
     return ChromeUtils.generateQI(["nsIConsoleListener"]);
   }
 }
-
-const MESSAGE_LEVELS = {
-  [Ci.nsIConsoleMessage.debug]: "verbose",
-  [Ci.nsIConsoleMessage.info]: "info",
-  [Ci.nsIConsoleMessage.warn]: "warning",
-  [Ci.nsIConsoleMessage.error]: "error",
-};
-
-function fromConsoleMessage(message) {
-  const level = MESSAGE_LEVELS[message.logLevel];
-
-  return {
-    source: "javascript",
-    level,
-    text: message.message,
-    timestamp: Date.now(),
-  };
-}
-
-function fromConsoleAPI(message) {
-  // message is a ConsoleEvent instance:
-  // https://searchfox.org/mozilla-central/rev/00c0d068ece99717bea7475f7dc07e61f7f35984/dom/webidl/Console.webidl#83-107
-
-  // A couple of possible level are defined here:
-  // https://searchfox.org/mozilla-central/rev/00c0d068ece99717bea7475f7dc07e61f7f35984/dom/console/Console.cpp#1086-1100
-  const levels = {
-    log: "verbose",
-    info: "info",
-    warn: "warning",
-    error: "error",
-    exception: "error",
-  };
-  const level = levels[message.level] || "info";
-
-  return {
-    source: "javascript",
-    level,
-    text: message.arguments,
-    url: message.filename,
-    lineNumber: message.lineNumber,
-    stackTrace: message.stacktrace,
-    timestamp: Date.now(),
-  };
-}
-
-function fromScriptError(error) {
-  const { logLevel, errorMessage, sourceName, lineNumber, stack } = error;
-  const level = MESSAGE_LEVELS[logLevel];
-
-  return {
-    source: "javascript",
-    level,
-    text: errorMessage,
-    timestamp: Date.now(),
-    url: sourceName,
-    lineNumber,
-    stackTrace: stack,
-  };
-}
diff -Nru firefox-84.0.2+build1/remote/domains/content/runtime/ExecutionContext.jsm firefox-85.0+build1/remote/domains/content/runtime/ExecutionContext.jsm
--- firefox-84.0.2+build1/remote/domains/content/runtime/ExecutionContext.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/domains/content/runtime/ExecutionContext.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -48,9 +48,9 @@
     // Here, we assume that debuggee is a window object and we will propably have
     // to adapt that once we cover workers or contexts that aren't a document.
     this.window = debuggee;
-    this.windowId = debuggee.windowGlobalChild.innerWindowId;
+    this.windowId = this.window.windowGlobalChild.innerWindowId;
     this.id = id;
-    this.frameId = debuggee.docShell.browsingContext.id.toString();
+    this.frameId = this.window.browsingContext.id.toString();
     this.isDefault = isDefault;
 
     // objectId => Debugger.Object
@@ -61,6 +61,10 @@
     this._debugger.removeDebuggee(this._debuggee);
   }
 
+  get browsingContext() {
+    return this.window.browsingContext;
+  }
+
   hasRemoteObject(objectId) {
     return this._remoteObjects.has(objectId);
   }
diff -Nru firefox-84.0.2+build1/remote/domains/content/Runtime.jsm firefox-85.0+build1/remote/domains/content/Runtime.jsm
--- firefox-84.0.2+build1/remote/domains/content/Runtime.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/domains/content/Runtime.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -10,6 +10,7 @@
   "resource://gre/modules/jsdebugger.jsm",
   {}
 );
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { ContentProcessDomain } = ChromeUtils.import(
   "chrome://remote/content/domains/ContentProcessDomain.jsm"
@@ -22,6 +23,8 @@
 // Import the `Debugger` constructor in the current scope
 addDebuggerToGlobal(Cu.getGlobalForObject(this));
 
+const OBSERVER_CONSOLE_API = "console-api-log-event";
+
 class SetMap extends Map {
   constructor() {
     super();
@@ -61,6 +64,7 @@
 
     this._onContextCreated = this._onContextCreated.bind(this);
     this._onContextDestroyed = this._onContextDestroyed.bind(this);
+
     // TODO Bug 1602083
     this.session.contextObserver.on("context-created", this._onContextCreated);
     this.session.contextObserver.on(
@@ -71,11 +75,13 @@
 
   destructor() {
     this.disable();
+
     this.session.contextObserver.off("context-created", this._onContextCreated);
     this.session.contextObserver.off(
       "context-destroyed",
       this._onContextDestroyed
     );
+
     super.destructor();
   }
 
@@ -85,6 +91,9 @@
     if (!this.enabled) {
       this.enabled = true;
 
+      Services.console.registerListener(this);
+      Services.obs.addObserver(this, OBSERVER_CONSOLE_API);
+
       // Spin the event loop in order to send the `executionContextCreated` event right
       // after we replied to `enable` request.
       executeSoon(() => {
@@ -100,6 +109,9 @@
   disable() {
     if (this.enabled) {
       this.enabled = false;
+
+      Services.console.unregisterListener(this);
+      Services.obs.removeObserver(this, OBSERVER_CONSOLE_API);
     }
   }
 
@@ -348,6 +360,30 @@
     return frameContexts;
   }
 
+  _emitConsoleAPICalled(payload) {
+    // Filter out messages that aren't coming from a valid inner window, or from
+    // a different browser tab. Also messages of type "time", which are not
+    // getting reported by Chrome.
+    const curBrowserId = this.session.browsingContext.browserId;
+    const win = Services.wm.getCurrentInnerWindowWithId(payload.innerWindowId);
+    if (
+      !win ||
+      BrowsingContext.getFromWindow(win).browserId != curBrowserId ||
+      payload.type === "time"
+    ) {
+      return;
+    }
+
+    const context = this._getDefaultContextForWindow();
+    this.emit("Runtime.consoleAPICalled", {
+      args: payload.arguments.map(arg => context._toRemoteObject(arg)),
+      executionContextId: context?.id || 0,
+      timestamp: payload.timestamp,
+      type: payload.type,
+      stackTrace: payload.stacktrace,
+    });
+  }
+
   /**
    * Helper method in order to instantiate the ExecutionContext for a given
    * DOM Window as well as emitting the related
@@ -475,4 +511,78 @@
       }
     }
   }
+
+  // nsIObserver
+
+  /**
+   * Takes a console message belonging to the current window that is not
+   * a Javascript error, and emits a "consoleAPICalled" event.
+   *
+   * @param {nsIConsoleMessage} message
+   *     Console message.
+   */
+  observe(subject, topic, data) {
+    let entry;
+
+    if (topic == OBSERVER_CONSOLE_API) {
+      const message = subject.wrappedJSObject;
+      entry = fromConsoleAPI(message);
+      this._emitConsoleAPICalled(entry);
+      return;
+    }
+
+    if (subject instanceof Ci.nsIConsoleMessage) {
+      // Script errors will be handled through Log.entryAdded
+      if (
+        subject instanceof Ci.nsIScriptError &&
+        subject.flags == Ci.nsIScriptError.errorFlag
+      ) {
+        return;
+      }
+
+      entry = fromConsoleMessage(subject);
+      this._emitConsoleAPICalled(entry);
+    }
+  }
+
+  // XPCOM
+
+  get QueryInterface() {
+    return ChromeUtils.generateQI(["nsIConsoleListener"]);
+  }
+}
+
+function fromConsoleAPI(message) {
+  const CONSOLE_API_LEVEL_MAP = {
+    warn: "warning",
+  };
+
+  // From sendConsoleAPIMessage (toolkit/modules/Console.jsm)
+  return {
+    arguments: message.arguments,
+    innerWindowId: message.innerID,
+    // TODO: Fetch the stack (Bug 1679981)
+    stacktrace: undefined,
+    timestamp: message.timeStamp,
+    type: CONSOLE_API_LEVEL_MAP[message.level] || message.level,
+  };
+}
+
+function fromConsoleMessage(message) {
+  const CONSOLE_MESSAGE_LEVEL_MAP = {
+    [Ci.nsIConsoleMessage.debug]: "verbose",
+    [Ci.nsIConsoleMessage.info]: "info",
+    [Ci.nsIConsoleMessage.warn]: "warning",
+    [Ci.nsIConsoleMessage.error]: "error",
+  };
+
+  // From xpcom/base/nsIConsoleMessage.idl and dom/bindings/nsIScriptError.idl
+  return {
+    arguments: [message.message],
+    innerWindowId: message.innerWindowID,
+    // TODO: Fetch the stack (Bug 1679981)
+    stacktrace: undefined,
+    timestamp: message.timeStamp,
+    type: CONSOLE_MESSAGE_LEVEL_MAP[message.logLevel] || message.logLevel,
+  };
 }
diff -Nru firefox-84.0.2+build1/remote/domains/parent/Target.jsm firefox-85.0+build1/remote/domains/parent/Target.jsm
--- firefox-84.0.2+build1/remote/domains/parent/Target.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/domains/parent/Target.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -22,6 +22,9 @@
 const { Domain } = ChromeUtils.import(
   "chrome://remote/content/domains/Domain.jsm"
 );
+const { MainProcessTarget } = ChromeUtils.import(
+  "chrome://remote/content/targets/MainProcessTarget.jsm"
+);
 const { TabManager } = ChromeUtils.import(
   "chrome://remote/content/TabManager.jsm"
 );
@@ -38,8 +41,8 @@
   constructor(session) {
     super(session);
 
-    this.onTargetCreated = this.onTargetCreated.bind(this);
-    this.onTargetDestroyed = this.onTargetDestroyed.bind(this);
+    this._onTargetCreated = this._onTargetCreated.bind(this);
+    this._onTargetDestroyed = this._onTargetDestroyed.bind(this);
   }
 
   getBrowserContexts() {
@@ -60,37 +63,35 @@
     ContextualIdentityService.closeContainerTabs(browserContextId);
   }
 
+  getTargets() {
+    const { targets } = this.session.target;
+
+    const targetInfos = [];
+    for (const target of targets) {
+      if (target instanceof MainProcessTarget) {
+        continue;
+      }
+
+      targetInfos.push(this._getTargetInfo(target));
+    }
+
+    return { targetInfos };
+  }
+
   setDiscoverTargets({ discover }) {
     const { targets } = this.session.target;
     if (discover) {
-      targets.on("target-created", this.onTargetCreated);
-      targets.on("target-destroyed", this.onTargetDestroyed);
+      targets.on("target-created", this._onTargetCreated);
+      targets.on("target-destroyed", this._onTargetDestroyed);
     } else {
-      targets.off("target-created", this.onTargetCreated);
-      targets.off("target-destroyed", this.onTargetDestroyed);
+      targets.off("target-created", this._onTargetCreated);
+      targets.off("target-destroyed", this._onTargetDestroyed);
     }
     for (const target of targets) {
-      this.onTargetCreated("target-created", target);
+      this._onTargetCreated("target-created", target);
     }
   }
 
-  onTargetCreated(eventName, target) {
-    this.emit("Target.targetCreated", {
-      targetInfo: {
-        browserContextId: target.browserContextId,
-        targetId: target.id,
-        type: target.type,
-        url: target.url,
-      },
-    });
-  }
-
-  onTargetDestroyed(eventName, target) {
-    this.emit("Target.targetDestroyed", {
-      targetId: target.id,
-    });
-  }
-
   async createTarget({ browserContextId }) {
     const { targets } = this.session.target;
     const onTarget = targets.once("target-created");
@@ -144,12 +145,8 @@
         .slice(1, -1)
     );
     this.session.connection.registerSession(tabSession);
-    this.emit("Target.attachedToTarget", {
-      targetInfo: {
-        type: "page",
-      },
-      sessionId: tabSession.id,
-    });
+
+    this._emitAttachedToTarget(target, tabSession);
 
     return {
       sessionId: tabSession.id,
@@ -162,4 +159,41 @@
     const { connection } = this.session;
     connection.sendMessageToTarget(sessionId, message);
   }
+
+  /**
+   * Internal methods: the following methods are not part of CDP;
+   * note the _ prefix.
+   */
+
+  _emitAttachedToTarget(target, tabSession) {
+    const targetInfo = this._getTargetInfo(target);
+    this.emit("Target.attachedToTarget", {
+      targetInfo,
+      sessionId: tabSession.id,
+      waitingForDebugger: false,
+    });
+  }
+
+  _getTargetInfo(target) {
+    return {
+      targetId: target.id,
+      type: target.type,
+      title: target.title,
+      url: target.url,
+      // TODO: Correctly determine if target is attached (bug 1680780)
+      attached: target.id == this.session.target.id,
+      browserContextId: target.browserContextId,
+    };
+  }
+
+  _onTargetCreated(eventName, target) {
+    const targetInfo = this._getTargetInfo(target);
+    this.emit("Target.targetCreated", { targetInfo });
+  }
+
+  _onTargetDestroyed(eventName, target) {
+    this.emit("Target.targetDestroyed", {
+      targetId: target.id,
+    });
+  }
 }
diff -Nru firefox-84.0.2+build1/remote/error.rs firefox-85.0+build1/remote/error.rs
--- firefox-84.0.2+build1/remote/error.rs	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/error.rs	2021-01-18 19:58:18.000000000 +0000
@@ -4,35 +4,35 @@
 
 use std::num;
 
-use failure::Fail;
 use http;
 use nserror::{
     nsresult, NS_ERROR_ILLEGAL_VALUE, NS_ERROR_INVALID_ARG, NS_ERROR_LAUNCHED_CHILD_PROCESS,
     NS_ERROR_NOT_AVAILABLE,
 };
+use thiserror::Error;
 
-#[derive(Debug, Fail)]
+#[derive(Debug, Error)]
 pub enum RemoteAgentError {
-    #[fail(display = "expected address syntax [<host>]:<port>: {}", _0)]
-    AddressSpec(http::uri::InvalidUri),
+    #[error("expected address syntax [<host>]:<port>: {0}")]
+    AddressSpec(#[from] http::uri::InvalidUri),
 
-    #[fail(display = "may only be instantiated in parent process")]
+    #[error("may only be instantiated in parent process")]
     ChildProcess,
 
-    #[fail(display = "invalid port: {}", _0)]
-    InvalidPort(num::ParseIntError),
+    #[error("invalid port: {0}")]
+    InvalidPort(#[from] num::ParseIntError),
 
-    #[fail(display = "listener restricted to loopback devices")]
+    #[error("listener restricted to loopback devices")]
     LoopbackRestricted,
 
-    #[fail(display = "missing port number")]
+    #[error("missing port number")]
     MissingPort,
 
-    #[fail(display = "unavailable")]
+    #[error("unavailable")]
     Unavailable,
 
-    #[fail(display = "error result {}", _0)]
-    XpCom(nsresult),
+    #[error("error result {0}")]
+    XpCom(#[source] nsresult),
 }
 
 impl From<RemoteAgentError> for nsresult {
@@ -49,18 +49,6 @@
     }
 }
 
-impl From<num::ParseIntError> for RemoteAgentError {
-    fn from(err: num::ParseIntError) -> Self {
-        RemoteAgentError::InvalidPort(err)
-    }
-}
-
-impl From<http::uri::InvalidUri> for RemoteAgentError {
-    fn from(err: http::uri::InvalidUri) -> Self {
-        RemoteAgentError::AddressSpec(err)
-    }
-}
-
 impl From<nsresult> for RemoteAgentError {
     fn from(result: nsresult) -> Self {
         use RemoteAgentError::*;
diff -Nru firefox-84.0.2+build1/remote/lib.rs firefox-85.0+build1/remote/lib.rs
--- firefox-84.0.2+build1/remote/lib.rs	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/lib.rs	2021-01-18 19:58:18.000000000 +0000
@@ -2,12 +2,12 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-extern crate failure;
 extern crate http;
 extern crate libc;
 extern crate log;
 extern crate nserror;
 extern crate nsstring;
+extern crate thiserror;
 extern crate xpcom;
 
 mod error;
diff -Nru firefox-84.0.2+build1/remote/mach_commands.py firefox-85.0+build1/remote/mach_commands.py
--- firefox-84.0.2+build1/remote/mach_commands.py	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/mach_commands.py	2021-01-18 19:58:18.000000000 +0000
@@ -81,7 +81,14 @@
         required=True,
         help="The commit or tag object name to check out.",
     )
-    def vendor_puppeteer(self, repository, commitish):
+    @CommandArgument(
+        "--no-install",
+        dest="install",
+        action="store_false",
+        default=True,
+        help="Do not install the just-pulled Puppeteer package,",
+    )
+    def vendor_puppeteer(self, repository, commitish, install):
         puppeteer_dir = os.path.join(self.remotedir, "test", "puppeteer")
 
         # Preserve our custom mocha reporter
@@ -109,9 +116,12 @@
         except OSError:
             pass
 
-        experimental_dir = os.path.join(puppeteer_dir, "experimental")
-        if os.path.isdir(experimental_dir):
-            shutil.rmtree(experimental_dir)
+        unwanted_dirs = ["experimental", "docs"]
+
+        for dir in unwanted_dirs:
+            dir_path = os.path.join(puppeteer_dir, dir)
+            if os.path.isdir(dir_path):
+                shutil.rmtree(dir_path)
 
         shutil.move(
             os.path.join(self.remotedir, "json-mocha-reporter.js"), puppeteer_dir
@@ -142,6 +152,10 @@
                 allow_unicode=True,
             )
 
+        if install:
+            env = {"PUPPETEER_SKIP_DOWNLOAD": "1"}
+            npm("install", cwd=os.path.join(self.topsrcdir, puppeteer_dir), env=env)
+
 
 def git(*args, **kwargs):
     cmd = ("git",)
@@ -655,7 +669,7 @@
         if changed_files and os.path.isdir(lib_dir):
             # clobber lib to force `tsc compile` step
             shutil.rmtree(lib_dir)
-        npm("install", cwd=os.path.join(self.topsrcdir, puppeteer_dir), env=env)
+        npm("ci", cwd=os.path.join(self.topsrcdir, puppeteer_dir), env=env)
 
 
 def exit(code, error=None):
diff -Nru firefox-84.0.2+build1/remote/puppeteer-expected.json firefox-85.0+build1/remote/puppeteer-expected.json
--- firefox-84.0.2+build1/remote/puppeteer-expected.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/puppeteer-expected.json	2021-01-18 19:58:18.000000000 +0000
@@ -135,7 +135,7 @@
     "PASS"
   ],
   "Page.click should click offscreen buttons (click.spec.ts)": [
-    "FAIL"
+    "PASS"
   ],
   "Page.click should click wrapped links (click.spec.ts)": [
     "PASS"
@@ -332,6 +332,12 @@
   "ElementHandle specs Custom queries should wait correctly with waitFor (elementhandle.spec.ts)": [
     "PASS"
   ],
+  "ElementHandle specs Custom queries should work when both queryOne and queryAll are registered (elementhandle.spec.ts)": [
+    "PASS"
+  ],
+  "ElementHandle specs Custom queries should eval when both queryOne and queryAll are registered (elementhandle.spec.ts)": [
+    "PASS"
+  ],
   "Emulation Page.viewport should get the proper viewport size (emulation.spec.ts)": [
     "PASS"
   ],
@@ -632,6 +638,12 @@
   "Frame specs Frame Management should report different frame instance when frame re-attaches (frame.spec.ts)": [
     "PASS"
   ],
+  "Frame specs Frame Management should support url fragment (frame.spec.ts)": [
+    "PASS"
+  ],
+  "Emulate idle state changing idle state emulation causes change of the IdleDetector state (idle_override.spec.ts)": [
+    "FAIL"
+  ],
   "ignoreHTTPSErrors should work (ignorehttpserrors.spec.ts)": [
     "PASS"
   ],
@@ -929,6 +941,9 @@
   "Mouse should set modifier keys on click (mouse.spec.ts)": [
     "PASS"
   ],
+  "Mouse should send mouse wheel events (mouse.spec.ts)": [
+    "FAIL"
+  ],
   "Mouse should tween mouse movement (mouse.spec.ts)": [
     "PASS", "FAIL"
   ],
@@ -1211,9 +1226,6 @@
   "Page Page.Events.Load should fire when expected (page.spec.ts)": [
     "PASS"
   ],
-  "Page Async stacks should work (page.spec.ts)": [
-    "TIMEOUT"
-  ],
   "Page removing and adding event handlers should correctly fire event handlers as they are added and then removed (page.spec.ts)": [
     "FAIL"
   ],
@@ -1295,7 +1307,7 @@
   "Page Page.Events.Console should have location when fetch fails (page.spec.ts)": [
     "FAIL"
   ],
-  "Page Page.Events.Console should have location for console API calls (page.spec.ts)": [
+  "Page Page.Events.Console should have location and stack trace for console API calls (page.spec.ts)": [
     "FAIL"
   ],
   "Page Page.Events.Console should not throw when there are console messages in detached iframes (page.spec.ts)": [
@@ -1565,9 +1577,24 @@
   "querySelector Page.$eval should throw error if no element is found (queryselector.spec.ts)": [
     "PASS"
   ],
+  "querySelector pierceHandler should find first element in shadow (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector pierceHandler should find all elements in shadow (queryselector.spec.ts)": [
+    "PASS"
+  ],
   "querySelector Page.$$eval should work (queryselector.spec.ts)": [
     "PASS"
   ],
+  "querySelector Page.$$eval should accept extra arguments (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector Page.$$eval should accept ElementHandles as arguments (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector Page.$$eval should handle many elements (queryselector.spec.ts)": [
+    "PASS"
+  ],
   "querySelector Page.$ should query existing element (queryselector.spec.ts)": [
     "PASS"
   ],
@@ -1625,6 +1652,27 @@
   "querySelector ElementHandle.$x should return null for non-existing element (queryselector.spec.ts)": [
     "PASS"
   ],
+  "querySelector QueryAll should have registered handler (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$ should query existing elements (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$ should return empty array for non-existing elements (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$eval should work (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$eval should accept extra arguments (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$eval should accept ElementHandles as arguments (queryselector.spec.ts)": [
+    "PASS"
+  ],
+  "querySelector QueryAll $$eval should handle many elements (queryselector.spec.ts)": [
+    "PASS"
+  ],
   "request interception Page.setRequestInterception should intercept (requestinterception.spec.ts)": [
     "FAIL"
   ],
@@ -1685,7 +1733,7 @@
   "request interception Page.setRequestInterception should be able to fetch dataURL and fire dataURL requests (requestinterception.spec.ts)": [
     "FAIL"
   ],
-  "request interception Page.setRequestInterception should navigate to URL with hash and and fire requests without hash (requestinterception.spec.ts)": [
+  "request interception Page.setRequestInterception should navigate to URL with hash and fire requests without hash (requestinterception.spec.ts)": [
     "FAIL"
   ],
   "request interception Page.setRequestInterception should work with encoded server (requestinterception.spec.ts)": [
@@ -1868,6 +1916,9 @@
   "waittask specs Page.waitFor should wait for predicate with arguments (waittask.spec.ts)": [
     "PASS"
   ],
+  "waittask specs Page.waitFor should log a deprecation warning (waittask.spec.ts)": [
+    "PASS"
+  ],
   "waittask specs Frame.waitForFunction should accept a string (waittask.spec.ts)": [
     "PASS"
   ],
@@ -1925,6 +1976,12 @@
   "waittask specs Frame.waitForFunction should survive navigations (waittask.spec.ts)": [
     "PASS"
   ],
+  "waittask specs Page.waitForTimeout waits for the given timeout before resolving (waittask.spec.ts)": [
+    "PASS"
+  ],
+  "waittask specs Frame.waitForTimeout waits for the given timeout before resolving (waittask.spec.ts)": [
+    "PASS"
+  ],
   "waittask specs Frame.waitForSelector should immediately resolve promise if node exists (waittask.spec.ts)": [
     "PASS"
   ],
diff -Nru firefox-84.0.2+build1/remote/server/WebSocketHandshake.jsm firefox-85.0+build1/remote/server/WebSocketHandshake.jsm
--- firefox-84.0.2+build1/remote/server/WebSocketHandshake.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/server/WebSocketHandshake.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -82,8 +82,10 @@
   }
 
   const upgrade = headers.get("upgrade");
-  if (!upgrade || upgrade !== "websocket") {
-    throw new Error("The handshake request has incorrect Upgrade header");
+  if (!upgrade || upgrade.toLowerCase() !== "websocket") {
+    throw new Error(
+      `The handshake request has incorrect Upgrade header: ${upgrade}`
+    );
   }
 
   const connection = headers.get("connection");
diff -Nru firefox-84.0.2+build1/remote/targets/TabTarget.jsm firefox-85.0+build1/remote/targets/TabTarget.jsm
--- firefox-84.0.2+build1/remote/targets/TabTarget.jsm	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/targets/TabTarget.jsm	2021-01-18 19:58:18.000000000 +0000
@@ -107,6 +107,10 @@
     });
   }
 
+  get title() {
+    return this.browsingContext.currentWindowGlobal.documentTitle;
+  }
+
   get type() {
     return "page";
   }
@@ -131,7 +135,8 @@
       // TODO(ato): toJSON cannot be marked async )-:
       faviconUrl: "",
       id: this.id,
-      title: this.title,
+      // Bug 1680817: Fails to encode some UTF-8 characters
+      // title: this.title,
       type: this.type,
       url: this.url,
       browsingContextId: this.browsingContext.id,
diff -Nru firefox-84.0.2+build1/remote/test/browser/browser_cdp.js firefox-85.0+build1/remote/test/browser/browser_cdp.js
--- firefox-84.0.2+build1/remote/test/browser/browser_cdp.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/browser_cdp.js	2021-01-18 19:58:18.000000000 +0000
@@ -27,8 +27,9 @@
   );
 
   // receive console.log messages and print them
-  Log.enable();
+  let result = await Log.enable();
   info("Log domain has been enabled");
+  Assert.deepEqual(result, {}, "Got expected result value");
 
   Log.entryAdded(({ entry }) => {
     const { timestamp, level, text, args } = entry;
@@ -37,8 +38,9 @@
   });
 
   // turn on navigation related events, such as DOMContentLoaded et al.
-  await Page.enable();
+  result = await Page.enable();
   info("Page domain has been enabled");
+  Assert.deepEqual(result, {}, "Got expected result value");
 
   const frameStoppedLoading = Page.frameStoppedLoading();
   const navigatedWithinDocument = Page.navigatedWithinDocument();
diff -Nru firefox-84.0.2+build1/remote/test/browser/network/browser_emulateNetworkConditions.js firefox-85.0+build1/remote/test/browser/network/browser_emulateNetworkConditions.js
--- firefox-84.0.2+build1/remote/test/browser/network/browser_emulateNetworkConditions.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/network/browser_emulateNetworkConditions.js	2021-01-18 19:58:18.000000000 +0000
@@ -203,7 +203,7 @@
     const browser = gBrowser.selectedTab.linkedBrowser;
     let netErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
 
-    await BrowserTestUtils.loadURI(browser, pageEmptyURL);
+    BrowserTestUtils.loadURI(browser, pageEmptyURL);
     await netErrorLoaded;
 
     await SpecialPowers.spawn(browser, [], () => {
diff -Nru firefox-84.0.2+build1/remote/test/browser/network/browser_setCacheDisabled.js firefox-85.0+build1/remote/test/browser/network/browser_setCacheDisabled.js
--- firefox-84.0.2+build1/remote/test/browser/network/browser_setCacheDisabled.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/network/browser_setCacheDisabled.js	2021-01-18 19:58:18.000000000 +0000
@@ -78,7 +78,7 @@
           // have the flag, so we just ignore them.
           // We also see, eg, resource://gre-resources/loading-image.png, so
           // skip resource:// URLs too.
-          // We may also see, eg, chrome://browser/skin/chevron.svg, so
+          // We may also see, eg, chrome://global/skin/icons/chevron.svg, so
           // skip chrome:// URLs too.
           if (
             request.name.startsWith("about:") ||
diff -Nru firefox-84.0.2+build1/remote/test/browser/runtime/browser_consoleAPICalled.js firefox-85.0+build1/remote/test/browser/runtime/browser_consoleAPICalled.js
--- firefox-84.0.2+build1/remote/test/browser/runtime/browser_consoleAPICalled.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/runtime/browser_consoleAPICalled.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,199 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const PAGE_CONSOLE_EVENTS =
+  "http://example.com/browser/remote/test/browser/runtime/doc_console_events.html";
+
+add_task(async function noEventsWhenRuntimeDomainDisabled({ client }) {
+  await runConsoleTest(client, 0, async () => {
+    ContentTask.spawn(gBrowser.selectedBrowser, {}, () => console.log("foo"));
+  });
+});
+
+add_task(async function noEventsAfterRuntimeDomainDisabled({ client }) {
+  const { Runtime } = client;
+
+  await Runtime.enable();
+  await Runtime.disable();
+
+  await runConsoleTest(client, 0, async () => {
+    ContentTask.spawn(gBrowser.selectedBrowser, {}, () => console.log("foo"));
+  });
+});
+
+add_task(async function consoleAPI({ client }) {
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(client, 1, async () => {
+    await evaluate(client, context.id, () => {
+      console.log("foo");
+    });
+  });
+
+  is(events[0].type, "log", "Got expected type");
+  is(events[0].args[0].value, "foo", "Got expected argument value");
+  is(
+    events[0].executionContextId,
+    context.id,
+    "Got event from current execution context"
+  );
+});
+
+add_task(async function consoleAPITypes({ client }) {
+  const expectedEvents = ["dir", "error", "log", "timeEnd", "trace", "warning"];
+  const levels = ["dir", "error", "log", "time", "timeEnd", "trace", "warn"];
+
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(
+    client,
+    expectedEvents.length,
+    async () => {
+      for (const level of levels) {
+        await evaluate(
+          client,
+          context.id,
+          level => {
+            console[level]("foo");
+          },
+          level
+        );
+      }
+    }
+  );
+
+  events.forEach((event, index) => {
+    console.log(`Check for event type "${expectedEvents[index]}"`);
+    is(event.type, expectedEvents[index], "Got expected type");
+  });
+});
+
+add_task(async function consoleAPIArgumentsCount({ client }) {
+  const argumentList = [[], ["foo"], ["foo", "bar", "cheese"]];
+
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(client, argumentList.length, async () => {
+    for (const args of argumentList) {
+      await evaluate(
+        client,
+        context.id,
+        args => {
+          console.log(...args);
+        },
+        args
+      );
+    }
+  });
+
+  events.forEach((event, index) => {
+    console.log(`Check for event args "${argumentList[index]}"`);
+
+    const argValues = event.args.map(arg => arg.value);
+    Assert.deepEqual(argValues, argumentList[index], "Got expected args");
+  });
+});
+
+add_task(async function consoleAPIArgumentsAsRemoteObject({ client }) {
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(client, 1, async () => {
+    await evaluate(client, context.id, () => {
+      console.log("foo", Symbol("foo"));
+    });
+  });
+
+  Assert.equal(events[0].args.length, 2, "Got expected amount of arguments");
+
+  is(events[0].args[0].type, "string", "Got expected argument type");
+  is(events[0].args[0].value, "foo", "Got expected argument value");
+
+  is(events[0].args[1].type, "symbol", "Got expected argument type");
+  is(
+    events[0].args[1].description,
+    "Symbol(foo)",
+    "Got expected argument description"
+  );
+  ok(!!events[0].args[1].objectId, "Got objectId for argument");
+});
+
+add_task(async function consoleAPIByContentInteraction({ client }) {
+  await loadURL(PAGE_CONSOLE_EVENTS);
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(client, 1, async () => {
+    evaluate(client, context.id, () => {
+      document.getElementById("console-error").click();
+    });
+  });
+
+  is(events[0].type, "error", "Got expected type");
+  is(events[0].args[0].value, "foo", "Got expected argument value");
+  is(
+    events[0].executionContextId,
+    context.id,
+    "Got event from current execution context"
+  );
+});
+
+add_task(async function consoleMessageByContent({ client }) {
+  await loadURL(PAGE_CONSOLE_EVENTS);
+  const context = await enableRuntime(client);
+
+  const events = await runConsoleTest(client, 1, async () => {
+    evaluate(client, context.id, () => {
+      document.execCommand("copy");
+    });
+  });
+
+  is(events[0].type, "warning", "Got expected type");
+  Assert.equal(events[0].args.length, 1, "Got expected amount of argumnets");
+  ok(
+    events[0].args[0].value.includes("document.execCommand"),
+    "Got expected argument value"
+  );
+  is(
+    events[0].executionContextId,
+    context.id,
+    "Got event from current execution context"
+  );
+});
+
+async function runConsoleTest(client, eventCount, callback, options = {}) {
+  const { Runtime } = client;
+  const { timeout = 250 } = options;
+
+  const EVENT_CONSOLE_API_CALLED = "Runtime.consoleAPICalled";
+
+  const history = new RecordEvents(eventCount);
+  history.addRecorder({
+    event: Runtime.consoleAPICalled,
+    eventName: EVENT_CONSOLE_API_CALLED,
+    messageFn: payload =>
+      `Received ${EVENT_CONSOLE_API_CALLED} for ${payload.type}`,
+  });
+
+  const timeBefore = Date.now();
+  await callback();
+
+  const consoleAPIentries = await history.record(timeout);
+  is(consoleAPIentries.length, eventCount, "Got expected amount of events");
+
+  if (eventCount == 0) {
+    return [];
+  }
+
+  const timeAfter = Date.now();
+
+  // Check basic details for consoleAPICalled events
+  consoleAPIentries.forEach(({ payload }) => {
+    ok(
+      payload.timestamp >= timeBefore && payload.timestamp <= timeAfter,
+      "Got valid timestamp"
+    );
+  });
+
+  return consoleAPIentries.map(event => event.payload);
+}
diff -Nru firefox-84.0.2+build1/remote/test/browser/runtime/browser.ini firefox-85.0+build1/remote/test/browser/runtime/browser.ini
--- firefox-84.0.2+build1/remote/test/browser/runtime/browser.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/runtime/browser.ini	2021-01-18 19:58:18.000000000 +0000
@@ -6,10 +6,12 @@
 support-files =
   !/remote/test/browser/chrome-remote-interface.js
   !/remote/test/browser/head.js
+  doc_console_events.html
   head.js
 
 [browser_callFunctionOn.js]
 [browser_callFunctionOn_returnByValue.js]
+[browser_consoleAPICalled.js]
 [browser_evaluate.js]
 [browser_executionContextEvents.js]
 skip-if = os == "mac" || os == "win" # bug 1586503,1590930
diff -Nru firefox-84.0.2+build1/remote/test/browser/runtime/doc_console_events.html firefox-85.0+build1/remote/test/browser/runtime/doc_console_events.html
--- firefox-84.0.2+build1/remote/test/browser/runtime/doc_console_events.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/runtime/doc_console_events.html	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Empty page</title>
+</head>
+<body>
+  <a id="console-log" href="javascript:console.log('foo')">console.log()</a><br/>
+  <a id="console-error" href="javascript:console.error('foo')">console.error()</a><br/>
+  <a id="js-error" href="javascript:foo.click()">Javascript Error</a><br/>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/remote/test/browser/security/browser_setIgnoreCertificateErrors.js firefox-85.0+build1/remote/test/browser/security/browser_setIgnoreCertificateErrors.js
--- firefox-84.0.2+build1/remote/test/browser/security/browser_setIgnoreCertificateErrors.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/security/browser_setIgnoreCertificateErrors.js	2021-01-18 19:58:18.000000000 +0000
@@ -75,7 +75,7 @@
   for (const url of BAD_CERTS) {
     info(`Navigating to ${url}`);
     const loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-    await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
     await loaded;
 
     is(
@@ -94,7 +94,7 @@
 
   for (const url of BAD_CERTS) {
     info(`Navigating to ${url}`);
-    await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
     await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
     is(
@@ -114,7 +114,7 @@
   for (const url of BAD_CERTS) {
     info(`Navigating to ${url}`);
     const loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-    await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, url);
     await loaded;
 
     is(
@@ -135,7 +135,7 @@
   await Security.setIgnoreCertificateErrors({ ignore: true });
 
   info(`Navigating to ${UNTRUSTED} having set the override`);
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, UNTRUSTED);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, UNTRUSTED);
   await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
   is(
@@ -150,7 +150,7 @@
 
   info(`Navigating to ${UNTRUSTED} having unset the override`);
   loaded = BrowserTestUtils.waitForErrorPage(gBrowser.selectedBrowser);
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, UNTRUSTED);
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, UNTRUSTED);
   await loaded;
 
   is(
diff -Nru firefox-84.0.2+build1/remote/test/browser/target/browser_attachedToTarget.js firefox-85.0+build1/remote/test/browser/target/browser_attachedToTarget.js
--- firefox-84.0.2+build1/remote/test/browser/target/browser_attachedToTarget.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/target/browser_attachedToTarget.js	2021-01-18 19:58:18.000000000 +0000
@@ -3,33 +3,42 @@
 
 "use strict";
 
+const PAGE_TEST =
+  "http://example.com/browser/remote/test/browser/target/doc_test.html";
+
 add_task(
   async function attachedPageTarget({ client }) {
     const { Target } = client;
     const { targetInfo } = await openTab(Target);
 
+    await loadURL(PAGE_TEST);
+
     info("Attach new page target");
     const attachedToTarget = Target.attachedToTarget();
     const { sessionId } = await Target.attachToTarget({
       targetId: targetInfo.targetId,
     });
-    const attachedEvent = await attachedToTarget;
+    const {
+      targetInfo: eventTargetInfo,
+      sessionId: eventSessionId,
+      waitingForDebugger: eventWaitingForDebugger,
+    } = await attachedToTarget;
+
+    is(eventTargetInfo.targetId, targetInfo.targetId, "Got expected target id");
+    is(eventTargetInfo.type, "page", "Got expected target type");
+    is(eventTargetInfo.title, "Test Page", "Got expected target title");
+    is(eventTargetInfo.url, PAGE_TEST, "Got expected target URL");
+    todo(eventTargetInfo.attached, "Set correct attached status (bug 1680780)");
 
     is(
-      typeof attachedEvent.sessionId,
-      "string",
-      "attachedToTarget contains the session id as string"
-    );
-    is(
-      attachedEvent.sessionId,
+      eventSessionId,
       sessionId,
       "attachedToTarget and attachToTarget refer to the same session id"
     );
-
     is(
-      attachedEvent.targetInfo.type,
-      "page",
-      "attachedToTarget refers to a tab by default"
+      typeof eventWaitingForDebugger,
+      "boolean",
+      "Got expected type for waitingForDebugger"
     );
   },
   { createTab: false }
diff -Nru firefox-84.0.2+build1/remote/test/browser/target/browser_getTargets.js firefox-85.0+build1/remote/test/browser/target/browser_getTargets.js
--- firefox-84.0.2+build1/remote/test/browser/target/browser_getTargets.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/target/browser_getTargets.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const PAGE_TEST =
+  "http://example.com/browser/remote/test/browser/target/doc_test.html";
+
+add_task(
+  async function getTargetsDetails({ client }) {
+    const { Target, target } = client;
+
+    await loadURL(PAGE_TEST);
+
+    const { targetInfos } = await Target.getTargets();
+
+    Assert.equal(targetInfos.length, 1, "Got expected amount of targets");
+
+    const targetInfo = targetInfos[0];
+    is(targetInfo.id, target.id, "Got expected target id");
+    is(targetInfo.type, "page", "Got expected target type");
+    is(targetInfo.title, "Test Page", "Got expected target title");
+    is(targetInfo.url, PAGE_TEST, "Got expected target URL");
+  },
+  { createTab: false }
+);
+
+add_task(
+  async function getTargetsCount({ client }) {
+    const { Target, target } = client;
+    const { targetInfo: newTabTargetInfo } = await openTab(Target);
+
+    await loadURL(PAGE_TEST);
+
+    const { targetInfos } = await Target.getTargets();
+
+    Assert.equal(targetInfos.length, 2, "Got expected amount of targets");
+    const targetIds = targetInfos.map(info => info.id);
+    ok(targetIds.includes(target.id), "Got expected original target id");
+    ok(targetIds.includes(newTabTargetInfo.id), "Got expected new target id");
+  },
+  { createTab: false }
+);
diff -Nru firefox-84.0.2+build1/remote/test/browser/target/browser.ini firefox-85.0+build1/remote/test/browser/target/browser.ini
--- firefox-84.0.2+build1/remote/test/browser/target/browser.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/target/browser.ini	2021-01-18 19:58:18.000000000 +0000
@@ -7,13 +7,16 @@
   !/remote/test/browser/chrome-remote-interface.js
   !/remote/test/browser/head.js
   head.js
+  doc_test.html
 
 [browser_activateTarget.js]
 [browser_attachToTarget.js]
 [browser_attachedToTarget.js]
 [browser_browserContext.js]
 [browser_closeTarget.js]
+[browser_getTargets.js]
 [browser_sendMessageToTarget.js]
 skip-if = true  # bug 1598468 - temporarily stop emitting event due to spamming
 [browser_setDiscoverTargets.js]
+[browser_targetCreated.js]
 [browser_targetDestroyed.js]
diff -Nru firefox-84.0.2+build1/remote/test/browser/target/browser_targetCreated.js firefox-85.0+build1/remote/test/browser/target/browser_targetCreated.js
--- firefox-84.0.2+build1/remote/test/browser/target/browser_targetCreated.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/target/browser_targetCreated.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,18 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function eventFiredWhenTabIsCreated({ client }) {
+  const { Target } = client;
+
+  const targetCreated = Target.targetCreated();
+  await BrowserTestUtils.openNewForegroundTab(gBrowser);
+  const { targetInfo } = await targetCreated;
+
+  is(typeof targetInfo.targetId, "string", "Got expected type for target id");
+  is(targetInfo.type, "page", "Got expected target type");
+  is(targetInfo.title, "", "Got expected target title");
+  is(targetInfo.url, "about:blank", "Got expected target URL");
+  is(targetInfo.attached, false, "Got expected attached status");
+});
diff -Nru firefox-84.0.2+build1/remote/test/browser/target/doc_test.html firefox-85.0+build1/remote/test/browser/target/doc_test.html
--- firefox-84.0.2+build1/remote/test/browser/target/doc_test.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/browser/target/doc_test.html	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test Page</title>
+</head>
+<body>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/api-extractor.json firefox-85.0+build1/remote/test/puppeteer/api-extractor.json
--- firefox-84.0.2+build1/remote/test/puppeteer/api-extractor.json	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/api-extractor.json	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-  "mainEntryPointFilePath": "<projectFolder>/lib/cjs/api-docs-entry.d.ts",
-  "bundledPackages": [ ],
+  "mainEntryPointFilePath": "<projectFolder>/lib/cjs/puppeteer/api-docs-entry.d.ts",
+  "bundledPackages": [ "devtools-protocol" ],
 
   "apiReport": {
     "enabled": false
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/CHANGELOG.md firefox-85.0+build1/remote/test/puppeteer/CHANGELOG.md
--- firefox-84.0.2+build1/remote/test/puppeteer/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/CHANGELOG.md	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [5.5.0](https://github.com/puppeteer/puppeteer/compare/v5.4.1...v5.5.0) (2020-11-16)
+
+
+### Features
+
+* **chromium:** roll Chromium to r818858 ([#6526](https://github.com/puppeteer/puppeteer/issues/6526)) ([b549256](https://github.com/puppeteer/puppeteer/commit/b54925695200cad32f470f8eb407259606447a85))
+
+
+### Bug Fixes
+
+* **common:** fix generic type of `_isClosedPromise` ([#6579](https://github.com/puppeteer/puppeteer/issues/6579)) ([122f074](https://github.com/puppeteer/puppeteer/commit/122f074f92f47a7b9aa08091851e51a07632d23b))
+* **domworld:** fix missing binding for waittasks ([#6562](https://github.com/puppeteer/puppeteer/issues/6562)) ([67da1cf](https://github.com/puppeteer/puppeteer/commit/67da1cf866703f5f581c9cce4923697ac38129ef))
+
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/cjs-entry-core.js firefox-85.0+build1/remote/test/puppeteer/cjs-entry-core.js
--- firefox-84.0.2+build1/remote/test/puppeteer/cjs-entry-core.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/cjs-entry-core.js	2021-01-18 19:58:18.000000000 +0000
@@ -25,5 +25,5 @@
  * This means that we can publish to CJS and ESM whilst maintaining the expected
  * import behaviour for CJS and ESM users.
  */
-const puppeteerExport = require('./lib/cjs/index-core');
+const puppeteerExport = require('./lib/cjs/puppeteer/node-puppeteer-core');
 module.exports = puppeteerExport.default;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/cjs-entry.js firefox-85.0+build1/remote/test/puppeteer/cjs-entry.js
--- firefox-84.0.2+build1/remote/test/puppeteer/cjs-entry.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/cjs-entry.js	2021-01-18 19:58:18.000000000 +0000
@@ -25,5 +25,5 @@
  * This means that we can publish to CJS and ESM whilst maintaining the expected
  * import behaviour for CJS and ESM users.
  */
-const puppeteerExport = require('./lib/cjs/index');
+const puppeteerExport = require('./lib/cjs/puppeteer/node');
 module.exports = puppeteerExport.default;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/commitlint.config.js firefox-85.0+build1/remote/test/puppeteer/commitlint.config.js
--- firefox-84.0.2+build1/remote/test/puppeteer/commitlint.config.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/commitlint.config.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'body-max-line-length': [0, 'always', 100],
+    'footer-max-line-length': [0, 'always', 100],
+  },
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/CONTRIBUTING.md firefox-85.0+build1/remote/test/puppeteer/CONTRIBUTING.md
--- firefox-84.0.2+build1/remote/test/puppeteer/CONTRIBUTING.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/CONTRIBUTING.md	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,10 @@
   * [Code reviews](#code-reviews)
   * [Code Style](#code-style)
   * [TypeScript guidelines](#typescript-guidelines)
+  * [Project structure and TypeScript compilation](#project-structure-and-typescript-compilation)
+    - [Shipping CJS and ESM bundles](#shipping-cjs-and-esm-bundles)
+    - [tsconfig for the tests](#tsconfig-for-the-tests)
+    - [Root `tsconfig.json`](#root-tsconfigjson)
   * [API guidelines](#api-guidelines)
   * [Commit Messages](#commit-messages)
   * [Writing Documentation](#writing-documentation)
@@ -13,8 +17,9 @@
   * [Public API Coverage](#public-api-coverage)
   * [Debugging Puppeteer](#debugging-puppeteer)
 - [For Project Maintainers](#for-project-maintainers)
+  * [Rolling new Chromium version](#rolling-new-chromium-version)
+    - [Bisecting upstream changes](#bisecting-upstream-changes)
   * [Releasing to npm](#releasing-to-npm)
-  * [Updating npm dist tags](#updating-npm-dist-tags)
 <!-- gen:stop -->
 
 # How to Contribute
@@ -85,6 +90,42 @@
 
 - Try to avoid the use of `any` when possible. Consider `unknown` as a better alternative. You are able to use `any` if needbe, but it will generate an ESLint warning.
 
+## Project structure and TypeScript compilation
+
+The code in Puppeteer is split primarily into two folders:
+
+- `src` contains all source code
+- `vendor` contains all dependencies that we've vendored into the codebase. See the [`vendor/README.md`](https://github.com/puppeteer/puppeteer/blob/main/vendor/README.md) for details.
+
+We structure these using TypeScript's project references, which lets us treat each folder like a standalone TypeScript project.
+
+### Shipping CJS and ESM bundles
+
+Currently Puppeteer ships two bundles; a CommonJS version for Node and an ESM bundle for the browser. Therefore we maintain two `tsconfig` files for each project; `tsconfig.esm.json` and `tsconfig.cjs.json`. At build time we compile twice, once outputting to CJS and another time to output to ESM.
+
+We compile into the `lib` directory which is what we publish on the npm repository and it's structured like so:
+
+```
+lib
+- cjs
+  - puppeteer <== the output of compiling `src/tsconfig.cjs.json`
+  - vendor <== the output of compiling `vendor/tsconfig.cjs.json`
+- esm
+  - puppeteer <== the output of compiling `src/tsconfig.esm.json`
+  - vendor <== the output of compiling `vendor/tsconfig.esm.json`
+```
+
+The main entry point for the Node module Puppeteer is `cjs-entry.js`. This imports `lib/cjs/puppeteer/index.js` and exposes it to Node users.
+
+### tsconfig for the tests
+
+We also maintain `test/tsconfig.test.json`. This is **only used to compile the unit test `*.spec.ts` files**. When the tests are run, we first compile Puppeteer as normal before running the unit tests **against the compiled output**. Doing this lets the test run against the compiled code we ship to users so it gives us more confidence in our compiled output being correct.
+
+### Root `tsconfig.json`
+
+The root `tsconfig.json` exists for the API Extractor; it has to find a `tsconfig.json` in the project's root directory. It is _not_ used for anything else.
+
+
 ## API guidelines
 
 When authoring new API methods, consider the following:
@@ -97,40 +138,19 @@
 
 ## Commit Messages
 
-Commit messages should follow the Semantic Commit Messages format:
-
-```
-label(namespace): title
-
-description
+Commit messages should follow [the Conventional Commits format](https://www.conventionalcommits.org/en/v1.0.0/#summary). This is enforced via `npm run lint`.
 
-footer
-```
-
-1. *label* is one of the following:
-    - `fix` - puppeteer bug fixes.
-    - `feat` - puppeteer features.
-    - `docs` - changes to docs, e.g. `docs(api.md): ..` to change documentation.
-    - `test` - changes to puppeteer tests infrastructure.
-    - `style` - puppeteer code style: spaces/alignment/wrapping etc.
-    - `chore` - build-related work, e.g. doclint changes / travis / appveyor.
-2. *namespace* is put in parenthesis after label and is optional. Must be lowercase.
-3. *title* is a brief summary of changes.
-4. *description* is **optional**, new-line separated from title and is in present tense.
-5. *footer* is **optional**, new-line separated from *description* and contains "fixes" / "references" attribution to github issues.
-6. *footer* should also include "BREAKING CHANGE" if current API clients will break due to this change. It should explain what changed and how to get the old behavior.
-
-Example:
+In particular, breaking changes should clearly be noted as “BREAKING CHANGE:� in the commit message footer. Example:
 
 ```
 fix(page): fix page.pizza method
 
 This patch fixes page.pizza so that it works with iframes.
 
-Fixes #123, Fixes #234
+Issues: #123, #234
 
 BREAKING CHANGE: page.pizza now delivers pizza at home by default.
-To deliver to a different location, use "deliver" option:
+To deliver to a different location, use the "deliver" option:
   `page.pizza({deliver: 'work'})`.
 ```
 
@@ -153,6 +173,9 @@
 A barrier for introducing new installation dependencies is especially high:
 - **Do not add** installation dependency unless it's critical to project success.
 
+There are additional considerations for dependencies that are environment agonistic. See the [`vendor/README.md`](https://github.com/puppeteer/puppeteer/blob/main/vendor/README.md) for details.
+
+
 ## Running & Writing Tests
 
 - Every feature should be accompanied by a test.
@@ -226,47 +249,42 @@
 
 # For Project Maintainers
 
+## Rolling new Chromium version
+
+The following steps are needed to update the Chromium version.
+
+1. Find a suitable Chromium revision
+   Not all revisions have builds for all platforms, so we need to find one that does.
+   To do so, run `utils/check_availability.js -rb` to find the latest suitable beta Chromium revision (see `utils/check_availability.js -help` for more options).
+1. Update `src/revisions.ts` with the found revision number.
+1. Run `npm run ensure-correct-devtools-protocol-revision`.
+   If it fails, update `package.json` with the expected `devtools-protocol` version.
+1. Run `npm run tsc` and `npm install` and ensure that all tests pass. If a test fails, [bisect](#bisecting-upstream-changes) the upstream cause of the failure, and either update the test expectations accordingly (if it was an intended change) or work around the changes in Puppeteer (if it’s not desirable to change Puppeteer’s observable behavior).
+1. Update `versions.js` with the new Chromium-to-Puppeteer version mapping.
+1. Commit and push your changes and open a pull request.
+
+### Bisecting upstream changes
+
+Sometimes, performing a Chromium roll causes tests to fail. To figure out the cause, you need to bisect Chromium revisions to figure out the earliest possible revision that changed the behavior. The script in `utils/bisect.js` can be helpful here. Given a Node.js script that calls `process.exit(1)` for bad revisions, run this from the Puppeteer repository’s root directory:
+
+```sh
+node utils/bisect.js --good 686378 --bad 706915 script.js
+```
+
 ## Releasing to npm
 
 Releasing to npm consists of the following phases:
 
 1. Source Code: mark a release.
-    1. Bump `package.json` version following the SEMVER rules.
-    2. Run `npm run doc` to update the docs accordingly.
-    3. Update the “Releases per Chromium Version� list in [`docs/api.md`](https://github.com/puppeteer/puppeteer/blob/main/docs/api.md) to include the new version. Note: only do this when the Chrome revision is different from the previous release.
-    4. Send a PR titled `'chore: mark version vXXX.YYY.ZZZ'` ([example](https://github.com/puppeteer/puppeteer/pull/5078)).
-    5. Make sure the PR passes **all checks**.
+    1. Run `npm run release` to bump the version number in `package.json` and populate the changelog.
+    1. Run `npm run doc` to update the docs accordingly.
+    1. Send a PR titled `'chore(release): mark vXXX.YYY.ZZZ'` ([example](https://github.com/puppeteer/puppeteer/pull/5078)).
+    1. Make sure the PR passes **all checks**.
         - **WHY**: there are linters in place that help to avoid unnecessary errors, e.g. [like this](https://github.com/puppeteer/puppeteer/pull/2446)
-    6. Merge the PR.
-    7. Once merged, publish the release notes using [GitHub's “draft new release tag� option](https://github.com/puppeteer/puppeteer/releases/new).
+    1. Merge the PR.
+    1. Once merged, publish the release notes from `CHANGELOG.md` using [GitHub’s “draft new release tag� option](https://github.com/puppeteer/puppeteer/releases/new).
         - **NOTE**: tag names are prefixed with `'v'`, e.g. for version `1.4.0` the tag is `v1.4.0`.
-        - For the “raw notes� section, use `git log --pretty="%h - %s" v2.0.0..HEAD`.
-2. Publish `puppeteer` to npm.
-    1. On your local machine, pull from [upstream](https://github.com/puppeteer/puppeteer) and make sure the last commit is the one just merged.
-    2. Run `git status` and make sure there are no untracked files.
-        - **WHY**: this is to avoid adding unnecessary files to the npm package.
-    3. Run [`npx pkgfiles`](https://www.npmjs.com/package/pkgfiles) to make sure you don't publish anything unnecessary.
-    4. Run `npm publish`. This publishes the `puppeteer` package.
-3. Publish `puppeteer-core` to npm.
-    1. Run `./utils/prepare_puppeteer_core.js`. The script changes the name inside `package.json` to `puppeteer-core`.
-    2. Run `npm publish`. This publishes the `puppeteer-core` package.
-    3. Run `git reset --hard` to reset the changes to `package.json`.
-4. Source Code: mark post-release.
-    1. Bump `package.json` version to `-post` version, run `npm run doc` to update the “released APIs� section at the top of `docs/api.md` accordingly, and send a PR titled `'chore: bump version to vXXX.YYY.ZZZ-post'` ([example](https://github.com/puppeteer/puppeteer/commit/d02440d1eac98028e29f4e1cf55413062a259156))
+    1. As soon as the Git tag is created by completing the previous step, our CI automatically `npm publish`es the new releases for both the `puppeteer` and `puppeteer-core` packages.
+1. Source Code: mark post-release.
+    1. Bump `package.json` version to the `-post` version, run `npm run doc` to update the “released APIs� section at the top of `docs/api.md` accordingly, and send a PR titled `'chore: bump version to vXXX.YYY.ZZZ-post'` ([example](https://github.com/puppeteer/puppeteer/commit/d02440d1eac98028e29f4e1cf55413062a259156))
         - **NOTE**: no other commits should be landed in-between release commit and bump commit.
-
-## Updating npm dist tags
-
-For both `puppeteer` and `puppeteer-core` we maintain `chrome-*` npm dist tags, e.g. `chrome-75` and so on. These tags match the Puppeteer version that corresponds to the `chrome-*` release.
-
-These tags are updated on every Puppeteer release.
-
-Managing tags 101:
-
-```bash
-# List tags
-$ npm dist-tag ls puppeteer
-# Add tags
-$ npm dist-tag add puppeteer@3.0.0 chrome-81
-$ npm dist-tag add puppeteer-core@3.0.0 chrome-81
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/docs/api.md firefox-85.0+build1/remote/test/puppeteer/docs/api.md
--- firefox-84.0.2+build1/remote/test/puppeteer/docs/api.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/docs/api.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,4099 +0,0 @@
-
-# Puppeteer API <!-- GEN:version -->v5.0.0<!-- GEN:stop-->
-<!-- GEN:empty-if-release --><!-- GEN:stop -->
-
-- Interactive Documentation: https://pptr.dev
-- API Translations: [中文|Chinese](https://zhaoqize.github.io/puppeteer-api-zh_CN/#/)
-- Troubleshooting: [troubleshooting.md](https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md)
-- Releases per Chromium Version:
-  * Chromium 83.0.4103.0 - [Puppeteer v3.1.0](https://github.com/puppeteer/puppeteer/blob/v3.1.0/docs/api.md)
-  * Chromium 81.0.4044.0 - [Puppeteer v3.0.0](https://github.com/puppeteer/puppeteer/blob/v3.0.0/docs/api.md)
-  * Chromium 80.0.3987.0 - [Puppeteer v2.1.0](https://github.com/puppeteer/puppeteer/blob/v2.1.0/docs/api.md)
-  * Chromium 79.0.3942.0 - [Puppeteer v2.0.0](https://github.com/puppeteer/puppeteer/blob/v2.0.0/docs/api.md)
-  * Chromium 78.0.3882.0 - [Puppeteer v1.20.0](https://github.com/puppeteer/puppeteer/blob/v1.20.0/docs/api.md)
-  * Chromium 77.0.3803.0 - [Puppeteer v1.19.0](https://github.com/puppeteer/puppeteer/blob/v1.19.0/docs/api.md)
-  * Chromium 76.0.3803.0 - [Puppeteer v1.17.0](https://github.com/puppeteer/puppeteer/blob/v1.17.0/docs/api.md)
-  * Chromium 75.0.3765.0 - [Puppeteer v1.15.0](https://github.com/puppeteer/puppeteer/blob/v1.15.0/docs/api.md)
-  * Chromium 74.0.3723.0 - [Puppeteer v1.13.0](https://github.com/puppeteer/puppeteer/blob/v1.13.0/docs/api.md)
-  * Chromium 73.0.3679.0 - [Puppeteer v1.12.2](https://github.com/puppeteer/puppeteer/blob/v1.12.2/docs/api.md)
-  * [All releases](https://github.com/puppeteer/puppeteer/releases)
-
-
-##### Table of Contents
-
-<!-- GEN:toc -->
-- [Overview](#overview)
-- [puppeteer vs puppeteer-core](#puppeteer-vs-puppeteer-core)
-- [Environment Variables](#environment-variables)
-- [Working with Chrome Extensions](#working-with-chrome-extensions)
-- [class: Puppeteer](#class-puppeteer)
-  * [puppeteer.connect(options)](#puppeteerconnectoptions)
-  * [puppeteer.createBrowserFetcher([options])](#puppeteercreatebrowserfetcheroptions)
-  * [puppeteer.defaultArgs([options])](#puppeteerdefaultargsoptions)
-  * [puppeteer.devices](#puppeteerdevices)
-  * [puppeteer.errors](#puppeteererrors)
-  * [puppeteer.executablePath()](#puppeteerexecutablepath)
-  * [puppeteer.launch([options])](#puppeteerlaunchoptions)
-  * [puppeteer.product](#puppeteerproduct)
-- [class: BrowserFetcher](#class-browserfetcher)
-  * [browserFetcher.canDownload(revision)](#browserfetchercandownloadrevision)
-  * [browserFetcher.download(revision[, progressCallback])](#browserfetcherdownloadrevision-progresscallback)
-  * [browserFetcher.host()](#browserfetcherhost)
-  * [browserFetcher.localRevisions()](#browserfetcherlocalrevisions)
-  * [browserFetcher.platform()](#browserfetcherplatform)
-  * [browserFetcher.product()](#browserfetcherproduct)
-  * [browserFetcher.remove(revision)](#browserfetcherremoverevision)
-  * [browserFetcher.revisionInfo(revision)](#browserfetcherrevisioninforevision)
-- [class: Browser](#class-browser)
-  * [event: 'disconnected'](#event-disconnected)
-  * [event: 'targetchanged'](#event-targetchanged)
-  * [event: 'targetcreated'](#event-targetcreated)
-  * [event: 'targetdestroyed'](#event-targetdestroyed)
-  * [browser.browserContexts()](#browserbrowsercontexts)
-  * [browser.close()](#browserclose)
-  * [browser.createIncognitoBrowserContext()](#browsercreateincognitobrowsercontext)
-  * [browser.defaultBrowserContext()](#browserdefaultbrowsercontext)
-  * [browser.disconnect()](#browserdisconnect)
-  * [browser.isConnected()](#browserisconnected)
-  * [browser.newPage()](#browsernewpage)
-  * [browser.pages()](#browserpages)
-  * [browser.process()](#browserprocess)
-  * [browser.target()](#browsertarget)
-  * [browser.targets()](#browsertargets)
-  * [browser.userAgent()](#browseruseragent)
-  * [browser.version()](#browserversion)
-  * [browser.waitForTarget(predicate[, options])](#browserwaitfortargetpredicate-options)
-  * [browser.wsEndpoint()](#browserwsendpoint)
-- [class: BrowserContext](#class-browsercontext)
-  * [event: 'targetchanged'](#event-targetchanged-1)
-  * [event: 'targetcreated'](#event-targetcreated-1)
-  * [event: 'targetdestroyed'](#event-targetdestroyed-1)
-  * [browserContext.browser()](#browsercontextbrowser)
-  * [browserContext.clearPermissionOverrides()](#browsercontextclearpermissionoverrides)
-  * [browserContext.close()](#browsercontextclose)
-  * [browserContext.isIncognito()](#browsercontextisincognito)
-  * [browserContext.newPage()](#browsercontextnewpage)
-  * [browserContext.overridePermissions(origin, permissions)](#browsercontextoverridepermissionsorigin-permissions)
-  * [browserContext.pages()](#browsercontextpages)
-  * [browserContext.targets()](#browsercontexttargets)
-  * [browserContext.waitForTarget(predicate[, options])](#browsercontextwaitfortargetpredicate-options)
-- [class: Page](#class-page)
-  * [event: 'close'](#event-close)
-  * [event: 'console'](#event-console)
-  * [event: 'dialog'](#event-dialog)
-  * [event: 'domcontentloaded'](#event-domcontentloaded)
-  * [event: 'error'](#event-error)
-  * [event: 'frameattached'](#event-frameattached)
-  * [event: 'framedetached'](#event-framedetached)
-  * [event: 'framenavigated'](#event-framenavigated)
-  * [event: 'load'](#event-load)
-  * [event: 'metrics'](#event-metrics)
-  * [event: 'pageerror'](#event-pageerror)
-  * [event: 'popup'](#event-popup)
-  * [event: 'request'](#event-request)
-  * [event: 'requestfailed'](#event-requestfailed)
-  * [event: 'requestfinished'](#event-requestfinished)
-  * [event: 'response'](#event-response)
-  * [event: 'workercreated'](#event-workercreated)
-  * [event: 'workerdestroyed'](#event-workerdestroyed)
-  * [page.$(selector)](#pageselector)
-  * [page.$$(selector)](#pageselector-1)
-  * [page.$$eval(selector, pageFunction[, ...args])](#pageevalselector-pagefunction-args)
-  * [page.$eval(selector, pageFunction[, ...args])](#pageevalselector-pagefunction-args-1)
-  * [page.$x(expression)](#pagexexpression)
-  * [page.accessibility](#pageaccessibility)
-  * [page.addScriptTag(options)](#pageaddscripttagoptions)
-  * [page.addStyleTag(options)](#pageaddstyletagoptions)
-  * [page.authenticate(credentials)](#pageauthenticatecredentials)
-  * [page.bringToFront()](#pagebringtofront)
-  * [page.browser()](#pagebrowser)
-  * [page.browserContext()](#pagebrowsercontext)
-  * [page.click(selector[, options])](#pageclickselector-options)
-  * [page.close([options])](#pagecloseoptions)
-  * [page.content()](#pagecontent)
-  * [page.cookies([...urls])](#pagecookiesurls)
-  * [page.coverage](#pagecoverage)
-  * [page.deleteCookie(...cookies)](#pagedeletecookiecookies)
-  * [page.emulate(options)](#pageemulateoptions)
-  * [page.emulateMediaFeatures(features)](#pageemulatemediafeaturesfeatures)
-  * [page.emulateMediaType(type)](#pageemulatemediatypetype)
-  * [page.emulateTimezone(timezoneId)](#pageemulatetimezonetimezoneid)
-  * [page.emulateVisionDeficiency(type)](#pageemulatevisiondeficiencytype)
-  * [page.evaluate(pageFunction[, ...args])](#pageevaluatepagefunction-args)
-  * [page.evaluateHandle(pageFunction[, ...args])](#pageevaluatehandlepagefunction-args)
-  * [page.evaluateOnNewDocument(pageFunction[, ...args])](#pageevaluateonnewdocumentpagefunction-args)
-  * [page.exposeFunction(name, puppeteerFunction)](#pageexposefunctionname-puppeteerfunction)
-  * [page.focus(selector)](#pagefocusselector)
-  * [page.frames()](#pageframes)
-  * [page.goBack([options])](#pagegobackoptions)
-  * [page.goForward([options])](#pagegoforwardoptions)
-  * [page.goto(url[, options])](#pagegotourl-options)
-  * [page.hover(selector)](#pagehoverselector)
-  * [page.isClosed()](#pageisclosed)
-  * [page.isJavaScriptEnabled()](#pageisjavascriptenabled)
-  * [page.keyboard](#pagekeyboard)
-  * [page.mainFrame()](#pagemainframe)
-  * [page.metrics()](#pagemetrics)
-  * [page.mouse](#pagemouse)
-  * [page.pdf([options])](#pagepdfoptions)
-  * [page.queryObjects(prototypeHandle)](#pagequeryobjectsprototypehandle)
-  * [page.reload([options])](#pagereloadoptions)
-  * [page.screenshot([options])](#pagescreenshotoptions)
-  * [page.select(selector, ...values)](#pageselectselector-values)
-  * [page.setBypassCSP(enabled)](#pagesetbypasscspenabled)
-  * [page.setCacheEnabled([enabled])](#pagesetcacheenabledenabled)
-  * [page.setContent(html[, options])](#pagesetcontenthtml-options)
-  * [page.setCookie(...cookies)](#pagesetcookiecookies)
-  * [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout)
-  * [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout)
-  * [page.setExtraHTTPHeaders(headers)](#pagesetextrahttpheadersheaders)
-  * [page.setGeolocation(options)](#pagesetgeolocationoptions)
-  * [page.setJavaScriptEnabled(enabled)](#pagesetjavascriptenabledenabled)
-  * [page.setOfflineMode(enabled)](#pagesetofflinemodeenabled)
-  * [page.setRequestInterception(value)](#pagesetrequestinterceptionvalue)
-  * [page.setUserAgent(userAgent)](#pagesetuseragentuseragent)
-  * [page.setViewport(viewport)](#pagesetviewportviewport)
-  * [page.tap(selector)](#pagetapselector)
-  * [page.target()](#pagetarget)
-  * [page.title()](#pagetitle)
-  * [page.touchscreen](#pagetouchscreen)
-  * [page.tracing](#pagetracing)
-  * [page.type(selector, text[, options])](#pagetypeselector-text-options)
-  * [page.url()](#pageurl)
-  * [page.viewport()](#pageviewport)
-  * [page.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])](#pagewaitforselectororfunctionortimeout-options-args)
-  * [page.waitForFileChooser([options])](#pagewaitforfilechooseroptions)
-  * [page.waitForFunction(pageFunction[, options[, ...args]])](#pagewaitforfunctionpagefunction-options-args)
-  * [page.waitForNavigation([options])](#pagewaitfornavigationoptions)
-  * [page.waitForRequest(urlOrPredicate[, options])](#pagewaitforrequesturlorpredicate-options)
-  * [page.waitForResponse(urlOrPredicate[, options])](#pagewaitforresponseurlorpredicate-options)
-  * [page.waitForSelector(selector[, options])](#pagewaitforselectorselector-options)
-  * [page.waitForXPath(xpath[, options])](#pagewaitforxpathxpath-options)
-  * [page.workers()](#pageworkers)
-  * [GeolocationOptions](#geolocationoptions)
-  * [WaitTimeoutOptions](#waittimeoutoptions)
-- [class: WebWorker](#class-webworker)
-  * [webWorker.evaluate(pageFunction[, ...args])](#webworkerevaluatepagefunction-args)
-  * [webWorker.evaluateHandle(pageFunction[, ...args])](#webworkerevaluatehandlepagefunction-args)
-  * [webWorker.executionContext()](#webworkerexecutioncontext)
-  * [webWorker.url()](#webworkerurl)
-- [class: Accessibility](#class-accessibility)
-  * [accessibility.snapshot([options])](#accessibilitysnapshotoptions)
-- [class: Keyboard](#class-keyboard)
-  * [keyboard.down(key[, options])](#keyboarddownkey-options)
-  * [keyboard.press(key[, options])](#keyboardpresskey-options)
-  * [keyboard.sendCharacter(char)](#keyboardsendcharacterchar)
-  * [keyboard.type(text[, options])](#keyboardtypetext-options)
-  * [keyboard.up(key)](#keyboardupkey)
-- [class: Mouse](#class-mouse)
-  * [mouse.click(x, y[, options])](#mouseclickx-y-options)
-  * [mouse.down([options])](#mousedownoptions)
-  * [mouse.move(x, y[, options])](#mousemovex-y-options)
-  * [mouse.up([options])](#mouseupoptions)
-- [class: Touchscreen](#class-touchscreen)
-  * [touchscreen.tap(x, y)](#touchscreentapx-y)
-- [class: Tracing](#class-tracing)
-  * [tracing.start([options])](#tracingstartoptions)
-  * [tracing.stop()](#tracingstop)
-- [class: FileChooser](#class-filechooser)
-  * [fileChooser.accept(filePaths)](#filechooseracceptfilepaths)
-  * [fileChooser.cancel()](#filechoosercancel)
-  * [fileChooser.isMultiple()](#filechooserismultiple)
-- [class: Dialog](#class-dialog)
-  * [dialog.accept([promptText])](#dialogacceptprompttext)
-  * [dialog.defaultValue()](#dialogdefaultvalue)
-  * [dialog.dismiss()](#dialogdismiss)
-  * [dialog.message()](#dialogmessage)
-  * [dialog.type()](#dialogtype)
-- [class: ConsoleMessage](#class-consolemessage)
-  * [consoleMessage.args()](#consolemessageargs)
-  * [consoleMessage.location()](#consolemessagelocation)
-  * [consoleMessage.text()](#consolemessagetext)
-  * [consoleMessage.type()](#consolemessagetype)
-- [class: Frame](#class-frame)
-  * [frame.$(selector)](#frameselector)
-  * [frame.$$(selector)](#frameselector-1)
-  * [frame.$$eval(selector, pageFunction[, ...args])](#frameevalselector-pagefunction-args)
-  * [frame.$eval(selector, pageFunction[, ...args])](#frameevalselector-pagefunction-args-1)
-  * [frame.$x(expression)](#framexexpression)
-  * [frame.addScriptTag(options)](#frameaddscripttagoptions)
-  * [frame.addStyleTag(options)](#frameaddstyletagoptions)
-  * [frame.childFrames()](#framechildframes)
-  * [frame.click(selector[, options])](#frameclickselector-options)
-  * [frame.content()](#framecontent)
-  * [frame.evaluate(pageFunction[, ...args])](#frameevaluatepagefunction-args)
-  * [frame.evaluateHandle(pageFunction[, ...args])](#frameevaluatehandlepagefunction-args)
-  * [frame.executionContext()](#frameexecutioncontext)
-  * [frame.focus(selector)](#framefocusselector)
-  * [frame.goto(url[, options])](#framegotourl-options)
-  * [frame.hover(selector)](#framehoverselector)
-  * [frame.isDetached()](#frameisdetached)
-  * [frame.name()](#framename)
-  * [frame.parentFrame()](#frameparentframe)
-  * [frame.select(selector, ...values)](#frameselectselector-values)
-  * [frame.setContent(html[, options])](#framesetcontenthtml-options)
-  * [frame.tap(selector)](#frametapselector)
-  * [frame.title()](#frametitle)
-  * [frame.type(selector, text[, options])](#frametypeselector-text-options)
-  * [frame.url()](#frameurl)
-  * [frame.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])](#framewaitforselectororfunctionortimeout-options-args)
-  * [frame.waitForFunction(pageFunction[, options[, ...args]])](#framewaitforfunctionpagefunction-options-args)
-  * [frame.waitForNavigation([options])](#framewaitfornavigationoptions)
-  * [frame.waitForSelector(selector[, options])](#framewaitforselectorselector-options)
-  * [frame.waitForXPath(xpath[, options])](#framewaitforxpathxpath-options)
-- [class: ExecutionContext](#class-executioncontext)
-  * [executionContext.evaluate(pageFunction[, ...args])](#executioncontextevaluatepagefunction-args)
-  * [executionContext.evaluateHandle(pageFunction[, ...args])](#executioncontextevaluatehandlepagefunction-args)
-  * [executionContext.frame()](#executioncontextframe)
-  * [executionContext.queryObjects(prototypeHandle)](#executioncontextqueryobjectsprototypehandle)
-- [class: JSHandle](#class-jshandle)
-  * [jsHandle.asElement()](#jshandleaselement)
-  * [jsHandle.dispose()](#jshandledispose)
-  * [jsHandle.evaluate(pageFunction[, ...args])](#jshandleevaluatepagefunction-args)
-  * [jsHandle.evaluateHandle(pageFunction[, ...args])](#jshandleevaluatehandlepagefunction-args)
-  * [jsHandle.executionContext()](#jshandleexecutioncontext)
-  * [jsHandle.getProperties()](#jshandlegetproperties)
-  * [jsHandle.getProperty(propertyName)](#jshandlegetpropertypropertyname)
-  * [jsHandle.jsonValue()](#jshandlejsonvalue)
-- [class: ElementHandle](#class-elementhandle)
-  * [elementHandle.$(selector)](#elementhandleselector)
-  * [elementHandle.$$(selector)](#elementhandleselector-1)
-  * [elementHandle.$$eval(selector, pageFunction[, ...args])](#elementhandleevalselector-pagefunction-args)
-  * [elementHandle.$eval(selector, pageFunction[, ...args])](#elementhandleevalselector-pagefunction-args-1)
-  * [elementHandle.$x(expression)](#elementhandlexexpression)
-  * [elementHandle.asElement()](#elementhandleaselement)
-  * [elementHandle.boundingBox()](#elementhandleboundingbox)
-  * [elementHandle.boxModel()](#elementhandleboxmodel)
-  * [elementHandle.click([options])](#elementhandleclickoptions)
-  * [elementHandle.contentFrame()](#elementhandlecontentframe)
-  * [elementHandle.dispose()](#elementhandledispose)
-  * [elementHandle.evaluate(pageFunction[, ...args])](#elementhandleevaluatepagefunction-args)
-  * [elementHandle.evaluateHandle(pageFunction[, ...args])](#elementhandleevaluatehandlepagefunction-args)
-  * [elementHandle.executionContext()](#elementhandleexecutioncontext)
-  * [elementHandle.focus()](#elementhandlefocus)
-  * [elementHandle.getProperties()](#elementhandlegetproperties)
-  * [elementHandle.getProperty(propertyName)](#elementhandlegetpropertypropertyname)
-  * [elementHandle.hover()](#elementhandlehover)
-  * [elementHandle.isIntersectingViewport()](#elementhandleisintersectingviewport)
-  * [elementHandle.jsonValue()](#elementhandlejsonvalue)
-  * [elementHandle.press(key[, options])](#elementhandlepresskey-options)
-  * [elementHandle.screenshot([options])](#elementhandlescreenshotoptions)
-  * [elementHandle.select(...values)](#elementhandleselectvalues)
-  * [elementHandle.tap()](#elementhandletap)
-  * [elementHandle.toString()](#elementhandletostring)
-  * [elementHandle.type(text[, options])](#elementhandletypetext-options)
-  * [elementHandle.uploadFile(...filePaths)](#elementhandleuploadfilefilepaths)
-- [class: HTTPRequest](#class-httprequest)
-  * [httpRequest.abort([errorCode])](#httprequestaborterrorcode)
-  * [httpRequest.continue([overrides])](#httprequestcontinueoverrides)
-  * [httpRequest.failure()](#httprequestfailure)
-  * [httpRequest.frame()](#httprequestframe)
-  * [httpRequest.headers()](#httprequestheaders)
-  * [httpRequest.isNavigationRequest()](#httprequestisnavigationrequest)
-  * [httpRequest.method()](#httprequestmethod)
-  * [httpRequest.postData()](#httprequestpostdata)
-  * [httpRequest.redirectChain()](#httprequestredirectchain)
-  * [httpRequest.resourceType()](#httprequestresourcetype)
-  * [httpRequest.respond(response)](#httprequestrespondresponse)
-  * [httpRequest.response()](#httprequestresponse)
-  * [httpRequest.url()](#httprequesturl)
-- [class: HTTPResponse](#class-httpresponse)
-  * [httpResponse.buffer()](#httpresponsebuffer)
-  * [httpResponse.frame()](#httpresponseframe)
-  * [httpResponse.fromCache()](#httpresponsefromcache)
-  * [httpResponse.fromServiceWorker()](#httpresponsefromserviceworker)
-  * [httpResponse.headers()](#httpresponseheaders)
-  * [httpResponse.json()](#httpresponsejson)
-  * [httpResponse.ok()](#httpresponseok)
-  * [httpResponse.remoteAddress()](#httpresponseremoteaddress)
-  * [httpResponse.request()](#httpresponserequest)
-  * [httpResponse.securityDetails()](#httpresponsesecuritydetails)
-  * [httpResponse.status()](#httpresponsestatus)
-  * [httpResponse.statusText()](#httpresponsestatustext)
-  * [httpResponse.text()](#httpresponsetext)
-  * [httpResponse.url()](#httpresponseurl)
-- [class: SecurityDetails](#class-securitydetails)
-  * [securityDetails.issuer()](#securitydetailsissuer)
-  * [securityDetails.protocol()](#securitydetailsprotocol)
-  * [securityDetails.subjectAlternativeNames()](#securitydetailssubjectalternativenames)
-  * [securityDetails.subjectName()](#securitydetailssubjectname)
-  * [securityDetails.validFrom()](#securitydetailsvalidfrom)
-  * [securityDetails.validTo()](#securitydetailsvalidto)
-- [class: Target](#class-target)
-  * [target.browser()](#targetbrowser)
-  * [target.browserContext()](#targetbrowsercontext)
-  * [target.createCDPSession()](#targetcreatecdpsession)
-  * [target.opener()](#targetopener)
-  * [target.page()](#targetpage)
-  * [target.type()](#targettype)
-  * [target.url()](#targeturl)
-  * [target.worker()](#targetworker)
-- [class: CDPSession](#class-cdpsession)
-  * [cdpSession.detach()](#cdpsessiondetach)
-  * [cdpSession.send(method[, params])](#cdpsessionsendmethod-params)
-- [class: Coverage](#class-coverage)
-  * [coverage.startCSSCoverage([options])](#coveragestartcsscoverageoptions)
-  * [coverage.startJSCoverage([options])](#coveragestartjscoverageoptions)
-  * [coverage.stopCSSCoverage()](#coveragestopcsscoverage)
-  * [coverage.stopJSCoverage()](#coveragestopjscoverage)
-- [class: TimeoutError](#class-timeouterror)
-- [class: EventEmitter](#class-eventemitter)
-  * [eventEmitter.addListener(event, handler)](#eventemitteraddlistenerevent-handler)
-  * [eventEmitter.emit(event, [eventData])](#eventemitteremitevent-eventdata)
-  * [eventEmitter.listenerCount(event)](#eventemitterlistenercountevent)
-  * [eventEmitter.off(event, handler)](#eventemitteroffevent-handler)
-  * [eventEmitter.on(event, handler)](#eventemitteronevent-handler)
-  * [eventEmitter.once(event, handler)](#eventemitteronceevent-handler)
-  * [eventEmitter.removeAllListeners([event])](#eventemitterremovealllistenersevent)
-  * [eventEmitter.removeListener(event, handler)](#eventemitterremovelistenerevent-handler)
-<!-- GEN:stop -->
-
-### Overview
-
-Puppeteer is a Node library which provides a high-level API to control Chromium or Chrome over the DevTools Protocol.
-
-The Puppeteer API is hierarchical and mirrors the browser structure.
-
-> **NOTE** On the following diagram, faded entities are not currently represented in Puppeteer.
-
-![puppeteer overview](https://user-images.githubusercontent.com/81942/86137523-ab2ba080-baed-11ea-9d4b-30eda784585a.png)
-
-- [`Puppeteer`](#class-puppeteer) communicates with the browser using [DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/).
-- [`Browser`](#class-browser) instance can own multiple browser contexts.
-- [`BrowserContext`](#class-browsercontext) instance defines a browsing session and can own multiple pages.
-- [`Page`](#class-page) has at least one frame: main frame. There might be other frames created by [iframe](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) or [frame](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/frame) tags.
-- [`Frame`](#class-frame) has at least one execution context - the default execution context - where the frame's JavaScript is executed. A Frame might have additional execution contexts that are associated with [extensions](https://developer.chrome.com/extensions).
-- [`Worker`](#class-worker) has a single execution context and facilitates interacting with [WebWorkers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
-
-(Diagram source: [link](https://docs.google.com/drawings/d/1Q_AM6KYs9kbyLZF-Lpp5mtpAWth73Cq8IKCsWYgi8MM/edit?usp=sharing))
-
-### puppeteer vs puppeteer-core
-
-Every release since v1.7.0 we publish two packages:
-- [puppeteer](https://www.npmjs.com/package/puppeteer)
-- [puppeteer-core](https://www.npmjs.com/package/puppeteer-core)
-
-`puppeteer` is a *product* for browser automation. When installed, it downloads a version of
-Chromium, which it then drives using `puppeteer-core`. Being an end-user product, `puppeteer` supports a bunch of convenient `PUPPETEER_*` env variables to tweak its behavior.
-
-`puppeteer-core` is a *library* to help drive anything that supports DevTools protocol. `puppeteer-core` doesn't download Chromium when installed. Being a library, `puppeteer-core` is fully driven
-through its programmatic interface and disregards all the `PUPPETEER_*` env variables.
-
-To sum up, the only differences between `puppeteer-core` and `puppeteer` are:
-- `puppeteer-core` doesn't automatically download Chromium when installed.
-- `puppeteer-core` ignores all `PUPPETEER_*` env variables.
-
-In most cases, you'll be fine using the `puppeteer` package.
-
-However, you should use `puppeteer-core` if:
-- you're building another end-user product or library atop of DevTools protocol. For example, one might build a PDF generator using `puppeteer-core` and write a custom `install.js` script that downloads [`headless_shell`](https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md) instead of Chromium to save disk space.
-- you're bundling Puppeteer to use in Chrome Extension / browser with the DevTools protocol where downloading an additional Chromium binary is unnecessary.
-- you're building a set of tools where `puppeteer-core` is one of the ingredients and you want to postpone `install.js` script execution until Chromium is about to be used.
-
-When using `puppeteer-core`, remember to change the *include* line:
-
-```js
-const puppeteer = require('puppeteer-core');
-```
-
-You will then need to call [`puppeteer.connect([options])`](#puppeteerconnectoptions) or [`puppeteer.launch([options])`](#puppeteerlaunchoptions) with an explicit `executablePath` option.
-
-### Environment Variables
-
-Puppeteer looks for certain [environment variables](https://en.wikipedia.org/wiki/Environment_variable) to aid its operations.
-If Puppeteer doesn't find them in the environment during the installation step, a lowercased variant of these variables will be used from the [npm config](https://docs.npmjs.com/cli/config).
-
-- `HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY` - defines HTTP proxy settings that are used to download and run Chromium.
-- `PUPPETEER_SKIP_CHROMIUM_DOWNLOAD` - do not download bundled Chromium during installation step.
-- `PUPPETEER_DOWNLOAD_HOST` - overwrite URL prefix that is used to download Chromium. Note: this includes protocol and might even include path prefix. Defaults to `https://storage.googleapis.com`.
-- `PUPPETEER_CHROMIUM_REVISION` - specify a certain version of Chromium you'd like Puppeteer to use. See [puppeteer.launch([options])](#puppeteerlaunchoptions) on how executable path is inferred. **BEWARE**: Puppeteer is only [guaranteed to work](https://github.com/puppeteer/puppeteer/#q-why-doesnt-puppeteer-vxxx-work-with-chromium-vyyy) with the bundled Chromium, use at your own risk.
-- `PUPPETEER_EXECUTABLE_PATH` - specify an executable path to be used in `puppeteer.launch`. See [puppeteer.launch([options])](#puppeteerlaunchoptions) on how the executable path is inferred. **BEWARE**: Puppeteer is only [guaranteed to work](https://github.com/puppeteer/puppeteer/#q-why-doesnt-puppeteer-vxxx-work-with-chromium-vyyy) with the bundled Chromium, use at your own risk.
-- `PUPPETEER_PRODUCT` - specify which browser you'd like Puppeteer to use. Must be one of `chrome` or `firefox`. This can also be used during installation to fetch the recommended browser binary. Setting `product` programmatically in [puppeteer.launch([options])](#puppeteerlaunchoptions) supersedes this environment variable. The product is exposed in [`puppeteer.product`](#puppeteerproduct)
-
-> **NOTE** PUPPETEER_* env variables are not accounted for in the [`puppeteer-core`](https://www.npmjs.com/package/puppeteer-core) package.
-
-
-### Working with Chrome Extensions
-
-Puppeteer can be used for testing Chrome Extensions.
-
-> **NOTE** Extensions in Chrome / Chromium currently only work in non-headless mode.
-
-The following is code for getting a handle to the [background page](https://developer.chrome.com/extensions/background_pages) of an extension whose source is located in `./my-extension`:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const pathToExtension = require('path').join(__dirname, 'my-extension');
-  const browser = await puppeteer.launch({
-    headless: false,
-    args: [
-      `--disable-extensions-except=${pathToExtension}`,
-      `--load-extension=${pathToExtension}`
-    ]
-  });
-  const targets = await browser.targets();
-  const backgroundPageTarget = targets.find(target => target.type() === 'background_page');
-  const backgroundPage = await backgroundPageTarget.page();
-  // Test the background page as you would any other page.
-  await browser.close();
-})();
-```
-
-> **NOTE** It is not yet possible to test extension popups or content scripts.
-
-### class: Puppeteer
-
-Puppeteer module provides a method to launch a Chromium instance.
-The following is a typical example of using Puppeteer to drive automation:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://www.google.com');
-  // other actions...
-  await browser.close();
-})();
-```
-
-#### puppeteer.connect(options)
-- `options` <[Object]>
-  - `browserWSEndpoint` <?[string]> a [browser websocket endpoint](#browserwsendpoint) to connect to.
-  - `browserURL` <?[string]> a browser url to connect to, in format `http://${host}:${port}`. Use interchangeably with `browserWSEndpoint` to let Puppeteer fetch it from [metadata endpoint](https://chromedevtools.github.io/devtools-protocol/#how-do-i-access-the-browser-target).
-  - `ignoreHTTPSErrors` <[boolean]> Whether to ignore HTTPS errors during navigation. Defaults to `false`.
-  - `defaultViewport` <?[Object]> Sets a consistent viewport for each page. Defaults to an 800x600 viewport. `null` disables the default viewport.
-    - `width` <[number]> page width in pixels.
-    - `height` <[number]> page height in pixels.
-    - `deviceScaleFactor` <[number]> Specify device scale factor (can be thought of as dpr). Defaults to `1`.
-    - `isMobile` <[boolean]> Whether the `meta viewport` tag is taken into account. Defaults to `false`.
-    - `hasTouch`<[boolean]> Specifies if viewport supports touch events. Defaults to `false`
-    - `isLandscape` <[boolean]> Specifies if viewport is in landscape mode. Defaults to `false`.
-  - `slowMo` <[number]> Slows down Puppeteer operations by the specified amount of milliseconds. Useful so that you can see what is going on.
-  - `transport` <[ConnectionTransport]> **Experimental** Specify a custom transport object for Puppeteer to use.
-  - `product` <[string]> Possible values are: `chrome`, `firefox`. Defaults to `chrome`.
-- returns: <[Promise]<[Browser]>>
-
-This methods attaches Puppeteer to an existing browser instance.
-
-#### puppeteer.createBrowserFetcher([options])
-- `options` <[Object]>
-  - `host` <[string]> A download host to be used. Defaults to `https://storage.googleapis.com`. If the `product` is `firefox`, this defaults to `https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central`.
-  - `path` <[string]> A path for the downloads folder. Defaults to `<root>/.local-chromium`, where `<root>` is puppeteer's package root. If the `product` is `firefox`, this defaults to `<root>/.local-firefox`.
-  - `platform` <"linux"|"mac"|"win32"|"win64"> [string] for the current platform. Possible values are: `mac`, `win32`, `win64`, `linux`. Defaults to the current platform.
-  - `product` <"chrome"|"firefox"> [string] for the product to run. Possible values are: `chrome`, `firefox`. Defaults to `chrome`.
-- returns: <[BrowserFetcher]>
-
-#### puppeteer.defaultArgs([options])
-- `options` <[Object]>  Set of configurable options to set on the browser. Can have the following fields:
-  - `headless` <[boolean]> Whether to run browser in [headless mode](https://developers.google.com/web/updates/2017/04/headless-chrome). Defaults to `true` unless the `devtools` option is `true`.
-  - `args` <[Array]<[string]>> Additional arguments to pass to the browser instance. The list of Chromium flags can be found [here](http://peter.sh/experiments/chromium-command-line-switches/).
-  - `userDataDir` <[string]> Path to a [User Data Directory](https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md).
-  - `devtools` <[boolean]> Whether to auto-open a DevTools panel for each tab. If this option is `true`, the `headless` option will be set `false`.
-- returns: <[Array]<[string]>>
-
-The default flags that Chromium will be launched with.
-
-#### puppeteer.devices
-- returns: <[Object]>
-
-Returns a list of devices to be used with [`page.emulate(options)`](#pageemulateoptions). Actual list of
-devices can be found in [src/common/DeviceDescriptors.js](https://github.com/puppeteer/puppeteer/blob/main/src/common/DeviceDescriptors.ts).
-
-```js
-const puppeteer = require('puppeteer');
-const iPhone = puppeteer.devices['iPhone 6'];
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.emulate(iPhone);
-  await page.goto('https://www.google.com');
-  // other actions...
-  await browser.close();
-})();
-```
-
-#### puppeteer.errors
-- returns: <[Object]>
-  - `TimeoutError` <[function]> A class of [TimeoutError].
-
-Puppeteer methods might throw errors if they are unable to fulfill a request. For example, [page.waitForSelector(selector[, options])](#pagewaitforselectorselector-options)
-might fail if the selector doesn't match any nodes during the given timeframe.
-
-For certain types of errors Puppeteer uses specific error classes.
-These classes are available via [`puppeteer.errors`](#puppeteererrors)
-
-An example of handling a timeout error:
-```js
-try {
-  await page.waitForSelector('.foo');
-} catch (e) {
-  if (e instanceof puppeteer.errors.TimeoutError) {
-    // Do something if this is a timeout.
-  }
-}
-```
-
-> **NOTE** The old way (Puppeteer versions <= v1.14.0) errors can be obtained with `require('puppeteer/Errors')`.
-
-#### puppeteer.executablePath()
-- returns: <[string]> A path where Puppeteer expects to find the bundled browser. The browser binary might not be there if the download was skipped with [`PUPPETEER_SKIP_DOWNLOAD`](#environment-variables).
-
-> **NOTE** `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH` and `PUPPETEER_CHROMIUM_REVISION` env variables. See [Environment Variables](#environment-variables) for details.
-
-
-#### puppeteer.launch([options])
-- `options` <[Object]>  Set of configurable options to set on the browser. Can have the following fields:
-  - `product` <[string]> Which browser to launch. At this time, this is either `chrome` or `firefox`. See also `PUPPETEER_PRODUCT`.
-  - `ignoreHTTPSErrors` <[boolean]> Whether to ignore HTTPS errors during navigation. Defaults to `false`.
-  - `headless` <[boolean]> Whether to run browser in [headless mode](https://developers.google.com/web/updates/2017/04/headless-chrome). Defaults to `true` unless the `devtools` option is `true`.
-  - `executablePath` <[string]> Path to a browser executable to run instead of the bundled Chromium. If `executablePath` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd). **BEWARE**: Puppeteer is only [guaranteed to work](https://github.com/puppeteer/puppeteer/#q-why-doesnt-puppeteer-vxxx-work-with-chromium-vyyy) with the bundled Chromium, use at your own risk.
-  - `slowMo` <[number]> Slows down Puppeteer operations by the specified amount of milliseconds. Useful so that you can see what is going on.
-  - `defaultViewport` <?[Object]> Sets a consistent viewport for each page. Defaults to an 800x600 viewport. `null` disables the default viewport.
-    - `width` <[number]> page width in pixels.
-    - `height` <[number]> page height in pixels.
-    - `deviceScaleFactor` <[number]> Specify device scale factor (can be thought of as dpr). Defaults to `1`.
-    - `isMobile` <[boolean]> Whether the `meta viewport` tag is taken into account. Defaults to `false`.
-    - `hasTouch`<[boolean]> Specifies if viewport supports touch events. Defaults to `false`
-    - `isLandscape` <[boolean]> Specifies if viewport is in landscape mode. Defaults to `false`.
-  - `args` <[Array]<[string]>> Additional arguments to pass to the browser instance. The list of Chromium flags can be found [here](http://peter.sh/experiments/chromium-command-line-switches/), and here is the list of [Firefox flags](https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options).
-  - `ignoreDefaultArgs` <[boolean]|[Array]<[string]>> If `true`, then do not use [`puppeteer.defaultArgs()`](#puppeteerdefaultargsoptions). If an array is given, then filter out the given default arguments. Dangerous option; use with care. Defaults to `false`.
-  - `handleSIGINT` <[boolean]> Close the browser process on Ctrl-C. Defaults to `true`.
-  - `handleSIGTERM` <[boolean]> Close the browser process on SIGTERM. Defaults to `true`.
-  - `handleSIGHUP` <[boolean]> Close the browser process on SIGHUP. Defaults to `true`.
-  - `timeout` <[number]> Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
-  - `dumpio` <[boolean]> Whether to pipe the browser process stdout and stderr into `process.stdout` and `process.stderr`. Defaults to `false`.
-  - `userDataDir` <[string]> Path to a [User Data Directory](https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md).
-  - `env` <[Object]> Specify environment variables that will be visible to the browser. Defaults to `process.env`.
-  - `devtools` <[boolean]> Whether to auto-open a DevTools panel for each tab. If this option is `true`, the `headless` option will be set `false`.
-  - `pipe` <[boolean]> Connects to the browser over a pipe instead of a WebSocket. Defaults to `false`.
-  - `extraPrefsFirefox` <[Object]> Additional [preferences](https://developer.mozilla.org/en-US/docs/Mozilla/Preferences/Preference_reference) that can be passed to Firefox (see `PUPPETEER_PRODUCT`)
-- returns: <[Promise]<[Browser]>> Promise which resolves to browser instance.
-
-
-You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
-```js
-const browser = await puppeteer.launch({
-  ignoreDefaultArgs: ['--mute-audio']
-});
-```
-
-> **NOTE** Puppeteer can also be used to control the Chrome browser, but it works best with the version of Chromium it is bundled with. There is no guarantee it will work with any other version. Use `executablePath` option with extreme caution.
->
-> If Google Chrome (rather than Chromium) is preferred, a [Chrome Canary](https://www.google.com/chrome/browser/canary.html) or [Dev Channel](https://www.chromium.org/getting-involved/dev-channel) build is suggested.
->
-> In [puppeteer.launch([options])](#puppeteerlaunchoptions) above, any mention of Chromium also applies to Chrome.
->
-> See [`this article`](https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/) for a description of the differences between Chromium and Chrome. [`This article`](https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md) describes some differences for Linux users.
-
-#### puppeteer.product
-- returns: <[string]> returns the name of the browser that is under automation (`"chrome"` or `"firefox"`)
-
-The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product` option in [puppeteer.launch([options])](#puppeteerlaunchoptions) and defaults to `chrome`. Firefox support is experimental.
-
-
-### class: BrowserFetcher
-
-BrowserFetcher can download and manage different versions of Chromium and Firefox.
-
-BrowserFetcher operates on revision strings that specify a precise version of Chromium, e.g. `"533271"`. Revision strings can be obtained from [omahaproxy.appspot.com](http://omahaproxy.appspot.com/).
-
-In the Firefox case, BrowserFetcher downloads Firefox Nightly and operates on version numbers such as `"75"`.
-
-An example of using BrowserFetcher to download a specific version of Chromium and running
-Puppeteer against it:
-
-```js
-const browserFetcher = puppeteer.createBrowserFetcher();
-const revisionInfo = await browserFetcher.download('533271');
-const browser = await puppeteer.launch({executablePath: revisionInfo.executablePath})
-```
-
-> **NOTE** BrowserFetcher is not designed to work concurrently with other
-> instances of BrowserFetcher that share the same downloads directory.
-
-#### browserFetcher.canDownload(revision)
-- `revision` <[string]> a revision to check availability.
-- returns: <[Promise]<[boolean]>>  returns `true` if the revision could be downloaded from the host.
-
-The method initiates a HEAD request to check if the revision is available.
-
-#### browserFetcher.download(revision[, progressCallback])
-- `revision` <[string]> a revision to download.
-- `progressCallback` <[function]([number], [number])> A function that will be called with two arguments:
-  - `downloadedBytes` <[number]> how many bytes have been downloaded
-  - `totalBytes` <[number]> how large is the total download.
-- returns: <[Promise]<[Object]>> Resolves with revision information when the revision is downloaded and extracted
-  - `revision` <[string]> the revision the info was created from
-  - `folderPath` <[string]> path to the extracted revision folder
-  - `executablePath` <[string]> path to the revision executable
-  - `url` <[string]> URL this revision can be downloaded from
-  - `local` <[boolean]> whether the revision is locally available on disk
-
-The method initiates a GET request to download the revision from the host.
-
-#### browserFetcher.host()
-- returns: <[string]> The download host being used.
-
-#### browserFetcher.localRevisions()
-- returns: <[Promise]<[Array]<[string]>>> A list of all revisions (for the current `product`) available locally on disk.
-
-#### browserFetcher.platform()
-- returns: <[string]> One of `mac`, `linux`, `win32` or `win64`.
-
-#### browserFetcher.product()
-- returns: <[string]> One of `chrome` or `firefox`.
-
-#### browserFetcher.remove(revision)
-- `revision` <[string]> a revision to remove for the current `product`. The method will throw if the revision has not been downloaded.
-- returns: <[Promise]> Resolves when the revision has been removed.
-
-#### browserFetcher.revisionInfo(revision)
-- `revision` <[string]> a revision to get info for.
-- returns: <[Object]>
-  - `revision` <[string]> the revision the info was created from
-  - `folderPath` <[string]> path to the extracted revision folder
-  - `executablePath` <[string]> path to the revision executable
-  - `url` <[string]> URL this revision can be downloaded from
-  - `local` <[boolean]> whether the revision is locally available on disk
-  - `product` <[string]> one of `chrome` or `firefox`
-
-> **NOTE** Many BrowserFetcher methods, like `remove` and `revisionInfo`
-> are affected by the choice of `product`. See [puppeteer.createBrowserFetcher([options])](#puppeteercreatebrowserfetcheroptions).
-
-### class: Browser
-
-* extends: [EventEmitter](#class-eventemitter)
-
-A Browser is created when Puppeteer connects to a Chromium instance, either through [`puppeteer.launch`](#puppeteerlaunchoptions) or [`puppeteer.connect`](#puppeteerconnectoptions).
-
-An example of using a [Browser] to create a [Page]:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://example.com');
-  await browser.close();
-})();
-```
-
-An example of disconnecting from and reconnecting to a [Browser]:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  // Store the endpoint to be able to reconnect to Chromium
-  const browserWSEndpoint = browser.wsEndpoint();
-  // Disconnect puppeteer from Chromium
-  browser.disconnect();
-
-  // Use the endpoint to reestablish a connection
-  const browser2 = await puppeteer.connect({browserWSEndpoint});
-  // Close Chromium
-  await browser2.close();
-})();
-```
-#### event: 'disconnected'
-Emitted when Puppeteer gets disconnected from the Chromium instance. This might happen because of one of the following:
-- Chromium is closed or crashed
-- The [`browser.disconnect`](#browserdisconnect) method was called
-
-#### event: 'targetchanged'
-- <[Target]>
-
-Emitted when the url of a target changes.
-
-> **NOTE** This includes target changes in incognito browser contexts.
-
-
-#### event: 'targetcreated'
-- <[Target]>
-
-Emitted when a target is created, for example when a new page is opened by [`window.open`](https://developer.mozilla.org/en-US/docs/Web/API/Window/open) or [`browser.newPage`](#browsernewpage).
-
-> **NOTE** This includes target creations in incognito browser contexts.
-
-#### event: 'targetdestroyed'
-- <[Target]>
-
-Emitted when a target is destroyed, for example when a page is closed.
-
-> **NOTE** This includes target destructions in incognito browser contexts.
-
-#### browser.browserContexts()
-- returns: <[Array]<[BrowserContext]>>
-
-Returns an array of all open browser contexts. In a newly created browser, this will return
-a single instance of [BrowserContext].
-
-#### browser.close()
-- returns: <[Promise]>
-
-Closes Chromium and all of its pages (if any were opened). The [Browser] object itself is considered to be disposed and cannot be used anymore.
-
-#### browser.createIncognitoBrowserContext()
-- returns: <[Promise]<[BrowserContext]>>
-
-Creates a new incognito browser context. This won't share cookies/cache with other browser contexts.
-
-```js
-(async () => {
-  const browser = await puppeteer.launch();
-  // Create a new incognito browser context.
-  const context = await browser.createIncognitoBrowserContext();
-  // Create a new page in a pristine context.
-  const page = await context.newPage();
-  // Do stuff
-  await page.goto('https://example.com');
-})();
-```
-
-#### browser.defaultBrowserContext()
-- returns: <[BrowserContext]>
-
-Returns the default browser context. The default browser context can not be closed.
-
-#### browser.disconnect()
-
-Disconnects Puppeteer from the browser, but leaves the Chromium process running. After calling `disconnect`, the [Browser] object is considered disposed and cannot be used anymore.
-
-#### browser.isConnected()
-
-- returns: <[boolean]>
-
-Indicates that the browser is connected.
-
-#### browser.newPage()
-- returns: <[Promise]<[Page]>>
-
-Promise which resolves to a new [Page] object. The [Page] is created in a default browser context.
-
-#### browser.pages()
-- returns: <[Promise]<[Array]<[Page]>>> Promise which resolves to an array of all open pages. Non visible pages, such as `"background_page"`, will not be listed here. You can find them using [target.page()](#targetpage).
-
-An array of all pages inside the Browser. In case of multiple browser contexts,
-the method will return an array with all the pages in all browser contexts.
-
-#### browser.process()
-- returns: <?[ChildProcess]> Spawned browser process. Returns `null` if the browser instance was created with [`puppeteer.connect`](#puppeteerconnectoptions) method.
-
-#### browser.target()
-- returns: <[Target]>
-
-A target associated with the browser.
-
-#### browser.targets()
-- returns: <[Array]<[Target]>>
-
-An array of all active targets inside the Browser. In case of multiple browser contexts,
-the method will return an array with all the targets in all browser contexts.
-
-#### browser.userAgent()
-- returns: <[Promise]<[string]>> Promise which resolves to the browser's original user agent.
-
-> **NOTE** Pages can override browser user agent with [page.setUserAgent](#pagesetuseragentuseragent)
-
-#### browser.version()
-- returns: <[Promise]<[string]>> For headless Chromium, this is similar to `HeadlessChrome/61.0.3153.0`. For non-headless, this is similar to `Chrome/61.0.3153.0`.
-
-> **NOTE** the format of browser.version() might change with future releases of Chromium.
-
-#### browser.waitForTarget(predicate[, options])
-- `predicate` <[function]\([Target]\):[boolean]> A function to be run for every target
-- `options` <[Object]>
-  - `timeout` <[number]> Maximum wait time in milliseconds. Pass `0` to disable the timeout. Defaults to 30 seconds.
-- returns: <[Promise]<[Target]>> Promise which resolves to the first target found that matches the `predicate` function.
-
-This searches for a target in all browser contexts.
-
-An example of finding a target for a page opened via `window.open`:
-```js
-await page.evaluate(() => window.open('https://www.example.com/'));
-const newWindowTarget = await browser.waitForTarget(target => target.url() === 'https://www.example.com/');
-```
-
-#### browser.wsEndpoint()
-- returns: <[string]> Browser websocket url.
-
-Browser websocket endpoint which can be used as an argument to
-[puppeteer.connect](#puppeteerconnectoptions). The format is `ws://${host}:${port}/devtools/browser/<id>`
-
-You can find the `webSocketDebuggerUrl` from `http://${host}:${port}/json/version`. Learn more about the [devtools protocol](https://chromedevtools.github.io/devtools-protocol) and the [browser endpoint](https://chromedevtools.github.io/devtools-protocol/#how-do-i-access-the-browser-target).
-
-### class: BrowserContext
-
-* extends: [EventEmitter](#class-eventemitter)
-
-BrowserContexts provide a way to operate multiple independent browser sessions. When a browser is launched, it has
-a single BrowserContext used by default. The method `browser.newPage()` creates a page in the default browser context.
-
-If a page opens another page, e.g. with a `window.open` call, the popup will belong to the parent page's browser
-context.
-
-Puppeteer allows creation of "incognito" browser contexts with `browser.createIncognitoBrowserContext()` method.
-"Incognito" browser contexts don't write any browsing data to disk.
-
-```js
-// Create a new incognito browser context
-const context = await browser.createIncognitoBrowserContext();
-// Create a new page inside context.
-const page = await context.newPage();
-// ... do stuff with page ...
-await page.goto('https://example.com');
-// Dispose context once it's no longer needed.
-await context.close();
-```
-
-#### event: 'targetchanged'
-- <[Target]>
-
-Emitted when the url of a target inside the browser context changes.
-
-#### event: 'targetcreated'
-- <[Target]>
-
-Emitted when a new target is created inside the browser context, for example when a new page is opened by [`window.open`](https://developer.mozilla.org/en-US/docs/Web/API/Window/open) or [`browserContext.newPage`](#browsercontextnewpage).
-
-#### event: 'targetdestroyed'
-- <[Target]>
-
-Emitted when a target inside the browser context is destroyed, for example when a page is closed.
-
-#### browserContext.browser()
-- returns: <[Browser]>
-
-The browser this browser context belongs to.
-
-#### browserContext.clearPermissionOverrides()
-- returns: <[Promise]>
-
-Clears all permission overrides for the browser context.
-
-```js
-const context = browser.defaultBrowserContext();
-context.overridePermissions('https://example.com', ['clipboard-read']);
-// do stuff ..
-context.clearPermissionOverrides();
-```
-
-#### browserContext.close()
-- returns: <[Promise]>
-
-Closes the browser context. All the targets that belong to the browser context
-will be closed.
-
-> **NOTE** only incognito browser contexts can be closed.
-
-#### browserContext.isIncognito()
-- returns: <[boolean]>
-
-Returns whether BrowserContext is incognito.
-The default browser context is the only non-incognito browser context.
-
-> **NOTE** the default browser context cannot be closed.
-
-#### browserContext.newPage()
-- returns: <[Promise]<[Page]>>
-
-Creates a new page in the browser context.
-
-
-#### browserContext.overridePermissions(origin, permissions)
-- `origin` <[string]> The [origin] to grant permissions to, e.g. "https://example.com".
-- `permissions` <[Array]<[string]>> An array of permissions to grant. All permissions that are not listed here will be automatically denied. Permissions can be one of the following values:
-    - `'geolocation'`
-    - `'midi'`
-    - `'midi-sysex'` (system-exclusive midi)
-    - `'notifications'`
-    - `'push'`
-    - `'camera'`
-    - `'microphone'`
-    - `'background-sync'`
-    - `'ambient-light-sensor'`
-    - `'accelerometer'`
-    - `'gyroscope'`
-    - `'magnetometer'`
-    - `'accessibility-events'`
-    - `'clipboard-read'`
-    - `'clipboard-write'`
-    - `'payment-handler'`
-- returns: <[Promise]>
-
-
-```js
-const context = browser.defaultBrowserContext();
-await context.overridePermissions('https://html5demos.com', ['geolocation']);
-```
-
-
-#### browserContext.pages()
-- returns: <[Promise]<[Array]<[Page]>>> Promise which resolves to an array of all open pages. Non visible pages, such as `"background_page"`, will not be listed here. You can find them using [target.page()](#targetpage).
-
-An array of all pages inside the browser context.
-
-#### browserContext.targets()
-- returns: <[Array]<[Target]>>
-
-An array of all active targets inside the browser context.
-
-#### browserContext.waitForTarget(predicate[, options])
-- `predicate` <[function]\([Target]\):[boolean]> A function to be run for every target
-- `options` <[Object]>
-  - `timeout` <[number]> Maximum wait time in milliseconds. Pass `0` to disable the timeout. Defaults to 30 seconds.
-- returns: <[Promise]<[Target]>> Promise which resolves to the first target found that matches the `predicate` function.
-
-This searches for a target in this specific browser context.
-
-An example of finding a target for a page opened via `window.open`:
-```js
-await page.evaluate(() => window.open('https://www.example.com/'));
-const newWindowTarget = await browserContext.waitForTarget(target => target.url() === 'https://www.example.com/');
-```
-
-### class: Page
-
-* extends: [EventEmitter](#class-eventemitter)
-
-Page provides methods to interact with a single tab or [extension background page](https://developer.chrome.com/extensions/background_pages) in Chromium. One [Browser] instance might have multiple [Page] instances.
-
-This example creates a page, navigates it to a URL, and then saves a screenshot:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://example.com');
-  await page.screenshot({path: 'screenshot.png'});
-  await browser.close();
-})();
-```
-
-The Page class emits various events (described below) which can be handled using
-any of the [`EventEmitter`](#class-eventemitter) methods, such as `on`, `once`
-or `off`.
-
-This example logs a message for a single page `load` event:
-```js
-page.once('load', () => console.log('Page loaded!'));
-```
-
-To unsubscribe from events use the `off` method:
-
-```js
-function logRequest(interceptedRequest) {
-  console.log('A request was made:', interceptedRequest.url());
-}
-page.on('request', logRequest);
-// Sometime later...
-page.off('request', logRequest);
-```
-
-#### event: 'close'
-
-Emitted when the page closes.
-
-#### event: 'console'
-- <[ConsoleMessage]>
-
-Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`. Also emitted if the page throws an error or a warning.
-
-The arguments passed into `console.log` appear as arguments on the event handler.
-
-An example of handling `console` event:
-```js
-page.on('console', msg => {
-  for (let i = 0; i < msg.args().length; ++i)
-    console.log(`${i}: ${msg.args()[i]}`);
-});
-page.evaluate(() => console.log('hello', 5, {foo: 'bar'}));
-```
-
-#### event: 'dialog'
-- <[Dialog]>
-
-Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Puppeteer can respond to the dialog via [Dialog]'s [accept](#dialogacceptprompttext) or [dismiss](#dialogdismiss) methods.
-
-#### event: 'domcontentloaded'
-
-Emitted when the JavaScript [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded) event is dispatched.
-
-#### event: 'error'
-- <[Error]>
-
-Emitted when the page crashes.
-
-> **NOTE** `error` event has a special meaning in Node, see [error events](https://nodejs.org/api/events.html#events_error_events) for details.
-
-#### event: 'frameattached'
-- <[Frame]>
-
-Emitted when a frame is attached.
-
-#### event: 'framedetached'
-- <[Frame]>
-
-Emitted when a frame is detached.
-
-#### event: 'framenavigated'
-- <[Frame]>
-
-Emitted when a frame is navigated to a new url.
-
-#### event: 'load'
-
-Emitted when the JavaScript [`load`](https://developer.mozilla.org/en-US/docs/Web/Events/load) event is dispatched.
-
-#### event: 'metrics'
-- <[Object]>
-  - `title` <[string]> The title passed to `console.timeStamp`.
-  - `metrics` <[Object]> Object containing metrics as key/value pairs. The values
-    of metrics are of <[number]> type.
-
-Emitted when the JavaScript code makes a call to `console.timeStamp`. For the list
-of metrics see `page.metrics`.
-
-#### event: 'pageerror'
-- <[Error]> The exception message
-
-Emitted when an uncaught exception happens within the page.
-
-#### event: 'popup'
-- <[Page]> Page corresponding to "popup" window
-
-Emitted when the page opens a new tab or window.
-
-```js
-const [popup] = await Promise.all([
-  new Promise(resolve => page.once('popup', resolve)),
-  page.click('a[target=_blank]'),
-]);
-```
-
-```js
-const [popup] = await Promise.all([
-  new Promise(resolve => page.once('popup', resolve)),
-  page.evaluate(() => window.open('https://example.com')),
-]);
-```
-
-#### event: 'request'
-- <[HTTPRequest]>
-
-Emitted when a page issues a request. The [request] object is read-only.
-In order to intercept and mutate requests, see `page.setRequestInterception`.
-
-#### event: 'requestfailed'
-- <[HTTPRequest]>
-
-Emitted when a request fails, for example by timing out.
-
-> **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete with [`'requestfinished'`](#event-requestfinished) event and not with [`'requestfailed'`](#event-requestfailed).
-
-#### event: 'requestfinished'
-- <[HTTPRequest]>
-
-Emitted when a request finishes successfully.
-
-#### event: 'response'
-- <[HTTPResponse]>
-
-Emitted when a [response] is received.
-
-#### event: 'workercreated'
-- <[Worker]>
-
-Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned by the page.
-
-#### event: 'workerdestroyed'
-- <[Worker]>
-
-Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is terminated.
-
-#### page.$(selector)
-- `selector` <[string]> A [selector] to query page for
-- returns: <[Promise]<?[ElementHandle]>>
-
-The method runs `document.querySelector` within the page. If no element matches the selector, the return value resolves to `null`.
-
-Shortcut for [page.mainFrame().$(selector)](#frameselector).
-
-#### page.$$(selector)
-- `selector` <[string]> A [selector] to query page for
-- returns: <[Promise]<[Array]<[ElementHandle]>>>
-
-The method runs `document.querySelectorAll` within the page. If no elements match the selector, the return value resolves to `[]`.
-
-Shortcut for [page.mainFrame().$$(selector)](#frameselector-1).
-
-#### page.$$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query page for
-- `pageFunction` <[function]\([Array]<[Element]>\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `Array.from(document.querySelectorAll(selector))` within the page and passes it as the first argument to `pageFunction`.
-
-If `pageFunction` returns a [Promise], then `page.$$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const divCount = await page.$$eval('div', divs => divs.length);
-```
-
-```js
-const options = await page.$$eval('div > span.options', options => options.map(option => option.textContent));
-```
-
-#### page.$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query page for
-- `pageFunction` <[function]\([Element]\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `document.querySelector` within the page and passes it as the first argument to `pageFunction`. If there's no element matching `selector`, the method throws an error.
-
-If `pageFunction` returns a [Promise], then `page.$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const searchValue = await page.$eval('#search', el => el.value);
-const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
-const html = await page.$eval('.main-container', e => e.outerHTML);
-```
-
-Shortcut for [page.mainFrame().$eval(selector, pageFunction)](#frameevalselector-pagefunction-args).
-
-#### page.$x(expression)
-- `expression` <[string]> Expression to [evaluate](https://developer.mozilla.org/en-US/docs/Web/API/Document/evaluate).
-- returns: <[Promise]<[Array]<[ElementHandle]>>>
-
-The method evaluates the XPath expression.
-
-Shortcut for [page.mainFrame().$x(expression)](#framexexpression)
-
-#### page.accessibility
-- returns: <[Accessibility]>
-
-#### page.addScriptTag(options)
-- `options` <[Object]>
-  - `url` <[string]> URL of a script to be added.
-  - `path` <[string]> Path to the JavaScript file to be injected into frame. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-  - `content` <[string]> Raw JavaScript content to be injected into frame.
-  - `type` <[string]> Script type. Use 'module' in order to load a Javascript ES6 module. See [script](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script) for more details.
-- returns: <[Promise]<[ElementHandle]>> which resolves to the added tag when the script's onload fires or when the script content was injected into frame.
-
-Adds a `<script>` tag into the page with the desired url or content.
-
-Shortcut for [page.mainFrame().addScriptTag(options)](#frameaddscripttagoptions).
-
-#### page.addStyleTag(options)
-- `options` <[Object]>
-  - `url` <[string]> URL of the `<link>` tag.
-  - `path` <[string]> Path to the CSS file to be injected into frame. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-  - `content` <[string]> Raw CSS content to be injected into frame.
-- returns: <[Promise]<[ElementHandle]>> which resolves to the added tag when the stylesheet's onload fires or when the CSS content was injected into frame.
-
-Adds a `<link rel="stylesheet">` tag into the page with the desired url or a `<style type="text/css">` tag with the content.
-
-Shortcut for [page.mainFrame().addStyleTag(options)](#frameaddstyletagoptions).
-
-#### page.authenticate(credentials)
-- `credentials` <?[Object]>
-  - `username` <[string]>
-  - `password` <[string]>
-- returns: <[Promise]>
-
-Provide credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication).
-
-To disable authentication, pass `null`.
-
-#### page.bringToFront()
-
-- returns: <[Promise]>
-
-Brings page to front (activates tab).
-
-#### page.browser()
-
-- returns: <[Browser]>
-
-Get the browser the page belongs to.
-
-#### page.browserContext()
-
-- returns: <[BrowserContext]>
-
-Get the browser context that the page belongs to.
-
-#### page.click(selector[, options])
-- `selector` <[string]> A [selector] to search for element to click. If there are multiple elements satisfying the selector, the first will be clicked.
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-  - `delay` <[number]> Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully clicked. The Promise will be rejected if there is no element matching `selector`.
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.mouse](#pagemouse) to click in the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-Bear in mind that if `click()` triggers a navigation event and there's a separate `page.waitForNavigation()` promise to be resolved, you may end up with a race condition that yields unexpected results. The correct pattern for click and wait for navigation is the following:
-
-```javascript
-const [response] = await Promise.all([
-  page.waitForNavigation(waitOptions),
-  page.click(selector, clickOptions),
-]);
-```
-
-Shortcut for [page.mainFrame().click(selector[, options])](#frameclickselector-options).
-
-#### page.close([options])
-- `options` <[Object]>
-  - `runBeforeUnload` <[boolean]> Defaults to `false`. Whether to run the
-    [before unload](https://developer.mozilla.org/en-US/docs/Web/Events/beforeunload)
-    page handlers.
-- returns: <[Promise]>
-
-By default, `page.close()` **does not** run beforeunload handlers.
-
-> **NOTE** if `runBeforeUnload` is passed as true, a `beforeunload` dialog might be summoned
-> and should be handled manually via page's ['dialog'](#event-dialog) event.
-
-#### page.content()
-- returns: <[Promise]<[string]>>
-
-Gets the full HTML contents of the page, including the doctype.
-
-#### page.cookies([...urls])
-- `...urls` <...[string]>
-- returns: <[Promise]<[Array]<[Object]>>>
-  - `name` <[string]>
-  - `value` <[string]>
-  - `domain` <[string]>
-  - `path` <[string]>
-  - `expires` <[number]> Unix time in seconds.
-  - `size` <[number]>
-  - `httpOnly` <[boolean]>
-  - `secure` <[boolean]>
-  - `session` <[boolean]>
-  - `sameSite` <"Strict"|"Lax"|"Extended"|"None">
-
-If no URLs are specified, this method returns cookies for the current page URL.
-If URLs are specified, only cookies for those URLs are returned.
-
-#### page.coverage
-
-- returns: <[Coverage]>
-
-#### page.deleteCookie(...cookies)
-- `...cookies` <...[Object]>
-  - `name` <[string]> **required**
-  - `url` <[string]>
-  - `domain` <[string]>
-  - `path` <[string]>
-- returns: <[Promise]>
-
-#### page.emulate(options)
-- `options` <[Object]>
-  - `viewport` <[Object]>
-    - `width` <[number]> page width in pixels.
-    - `height` <[number]> page height in pixels.
-    - `deviceScaleFactor` <[number]> Specify device scale factor (can be thought of as dpr). Defaults to `1`.
-    - `isMobile` <[boolean]> Whether the `meta viewport` tag is taken into account. Defaults to `false`.
-    - `hasTouch`<[boolean]> Specifies if viewport supports touch events. Defaults to `false`
-    - `isLandscape` <[boolean]> Specifies if viewport is in landscape mode. Defaults to `false`.
-  - `userAgent` <[string]>
-- returns: <[Promise]>
-
-Emulates given device metrics and user agent. This method is a shortcut for calling two methods:
-- [page.setUserAgent(userAgent)](#pagesetuseragentuseragent)
-- [page.setViewport(viewport)](#pagesetviewportviewport)
-
-To aid emulation, puppeteer provides a list of device descriptors which can be obtained via the [`puppeteer.devices`](#puppeteerdevices).
-
-`page.emulate` will resize the page. A lot of websites don't expect phones to change size, so you should emulate before navigating to the page.
-
-```js
-const puppeteer = require('puppeteer');
-const iPhone = puppeteer.devices['iPhone 6'];
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.emulate(iPhone);
-  await page.goto('https://www.google.com');
-  // other actions...
-  await browser.close();
-})();
-```
-
-List of all available devices is available in the source code: [src/common/DeviceDescriptors.ts](https://github.com/puppeteer/puppeteer/blob/main/src/common/DeviceDescriptors.ts).
-
-#### page.emulateMediaFeatures(features)
-- `features` <?[Array]<[Object]>> Given an array of media feature objects, emulates CSS media features on the page. Each media feature object must have the following properties:
-  - `name` <[string]> The CSS media feature name. Supported names are `'prefers-colors-scheme'` and `'prefers-reduced-motion'`.
-  - `value` <[string]> The value for the given CSS media feature.
-- returns: <[Promise]>
-
-```js
-await page.emulateMediaFeatures([{ name: 'prefers-color-scheme', value: 'dark' }]);
-await page.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches);
-// → true
-await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches);
-// → false
-
-await page.emulateMediaFeatures([{ name: 'prefers-reduced-motion', value: 'reduce' }]);
-await page.evaluate(() => matchMedia('(prefers-reduced-motion: reduce)').matches);
-// → true
-await page.evaluate(() => matchMedia('(prefers-reduced-motion: no-preference)').matches);
-// → false
-
-await page.emulateMediaFeatures([
-  { name: 'prefers-color-scheme', value: 'dark' },
-  { name: 'prefers-reduced-motion', value: 'reduce' },
-]);
-await page.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches);
-// → true
-await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches);
-// → false
-await page.evaluate(() => matchMedia('(prefers-reduced-motion: reduce)').matches);
-// → true
-await page.evaluate(() => matchMedia('(prefers-reduced-motion: no-preference)').matches);
-// → false
-```
-
-#### page.emulateMediaType(type)
-- `type` <?[string]> Changes the CSS media type of the page. The only allowed values are `'screen'`, `'print'` and `null`. Passing `null` disables CSS media emulation.
-- returns: <[Promise]>
-
-```js
-await page.evaluate(() => matchMedia('screen').matches);
-// → true
-await page.evaluate(() => matchMedia('print').matches);
-// → false
-
-await page.emulateMediaType('print');
-await page.evaluate(() => matchMedia('screen').matches);
-// → false
-await page.evaluate(() => matchMedia('print').matches);
-// → true
-
-await page.emulateMediaType(null);
-await page.evaluate(() => matchMedia('screen').matches);
-// → true
-await page.evaluate(() => matchMedia('print').matches);
-// → false
-```
-
-#### page.emulateTimezone(timezoneId)
-- `timezoneId` <?[string]> Changes the timezone of the page. See [ICU’s `metaZones.txt`](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1) for a list of supported timezone IDs. Passing `null` disables timezone emulation.
-- returns: <[Promise]>
-
-#### page.emulateVisionDeficiency(type)
-- `type` <?[string]> Simulates the given vision deficiency on the page. Supported vision deficiency types are `'achromatopsia'`, `'deuteranopia'`, `'protanopia'`, `'tritanopia'`, `'blurredVision'`, and `'none'`.
-- returns: <[Promise]>
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://v8.dev/blog/10-years');
-
-  await page.emulateVisionDeficiency('achromatopsia');
-  await page.screenshot({ path: 'achromatopsia.png' });
-
-  await page.emulateVisionDeficiency('deuteranopia');
-  await page.screenshot({ path: 'deuteranopia.png' });
-
-  await page.emulateVisionDeficiency('blurredVision');
-  await page.screenshot({ path: 'blurred-vision.png' });
-
-  await browser.close();
-})();
-```
-
-#### page.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the page context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-If the function passed to the `page.evaluate` returns a [Promise], then `page.evaluate` would wait for the promise to resolve and return its value.
-
-If the function passed to the `page.evaluate` returns a non-[Serializable] value, then `page.evaluate` resolves to `undefined`. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`, and bigint literals.
-
-Passing arguments to `pageFunction`:
-```js
-const result = await page.evaluate(x => {
-  return Promise.resolve(8 * x);
-}, 7);
-console.log(result); // prints "56"
-```
-
-A string can also be passed in instead of a function:
-```js
-console.log(await page.evaluate('1 + 2')); // prints "3"
-const x = 10;
-console.log(await page.evaluate(`1 + ${x}`)); // prints "11"
-```
-
-[ElementHandle] instances can be passed as arguments to the `page.evaluate`:
-```js
-const bodyHandle = await page.$('body');
-const html = await page.evaluate(body => body.innerHTML, bodyHandle);
-await bodyHandle.dispose();
-```
-
-Shortcut for [page.mainFrame().evaluate(pageFunction, ...args)](#frameevaluatepagefunction-args).
-
-#### page.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the page context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-The only difference between `page.evaluate` and `page.evaluateHandle` is that `page.evaluateHandle` returns in-page object (JSHandle).
-
-If the function passed to the `page.evaluateHandle` returns a [Promise], then `page.evaluateHandle` would wait for the promise to resolve and return its value.
-
-A string can also be passed in instead of a function:
-```js
-const aHandle = await page.evaluateHandle('document'); // Handle for the 'document'
-```
-
-[JSHandle] instances can be passed as arguments to the `page.evaluateHandle`:
-```js
-const aHandle = await page.evaluateHandle(() => document.body);
-const resultHandle = await page.evaluateHandle(body => body.innerHTML, aHandle);
-console.log(await resultHandle.jsonValue());
-await resultHandle.dispose();
-```
-
-This function will return a [JSHandle] by default, however if your `pageFunction` returns an HTML element you will get back an `ElementHandle`:
-
-```js
-const button = await page.evaluateHandle(() => document.querySelector('button'))
-// button is an ElementHandle, so you can call methods such as click:
-await button.click();
-```
-
-Shortcut for [page.mainFrame().executionContext().evaluateHandle(pageFunction, ...args)](#executioncontextevaluatehandlepagefunction-args).
-
-#### page.evaluateOnNewDocument(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in browser context
-- `...args` <...[Serializable]> Arguments to pass to `pageFunction`
-- returns: <[Promise]>
-
-Adds a function which would be invoked in one of the following scenarios:
-- whenever the page is navigated
-- whenever the child frame is attached or navigated. In this case, the function is invoked in the context of the newly attached frame
-
-The function is invoked after the document was created but before any of its scripts were run. This is useful to amend  the JavaScript environment, e.g. to seed `Math.random`.
-
-An example of overriding the navigator.languages property before the page loads:
-
-```js
-// preload.js
-
-// overwrite the `languages` property to use a custom getter
-Object.defineProperty(navigator, "languages", {
-  get: function() {
-    return ["en-US", "en", "bn"];
-  }
-});
-
-// In your puppeteer script, assuming the preload.js file is in same folder of our script
-const preloadFile = fs.readFileSync('./preload.js', 'utf8');
-await page.evaluateOnNewDocument(preloadFile);
-```
-
-#### page.exposeFunction(name, puppeteerFunction)
-- `name` <[string]> Name of the function on the window object
-- `puppeteerFunction` <[function]> Callback function which will be called in Puppeteer's context.
-- returns: <[Promise]>
-
-The method adds a function called `name` on the page's `window` object.
-When called, the function executes `puppeteerFunction` in node.js and returns a [Promise] which resolves to the return value of `puppeteerFunction`.
-
-If the `puppeteerFunction` returns a [Promise], it will be awaited.
-
-> **NOTE** Functions installed via `page.exposeFunction` survive navigations.
-
-An example of adding an `md5` function into the page:
-```js
-const puppeteer = require('puppeteer');
-const crypto = require('crypto');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  page.on('console', msg => console.log(msg.text()));
-  await page.exposeFunction('md5', text =>
-    crypto.createHash('md5').update(text).digest('hex')
-  );
-  await page.evaluate(async () => {
-    // use window.md5 to compute hashes
-    const myString = 'PUPPETEER';
-    const myHash = await window.md5(myString);
-    console.log(`md5 of ${myString} is ${myHash}`);
-  });
-  await browser.close();
-})();
-```
-
-An example of adding a `window.readfile` function into the page:
-
-```js
-const puppeteer = require('puppeteer');
-const fs = require('fs');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  page.on('console', msg => console.log(msg.text()));
-  await page.exposeFunction('readfile', async filePath => {
-    return new Promise((resolve, reject) => {
-      fs.readFile(filePath, 'utf8', (err, text) => {
-        if (err)
-          reject(err);
-        else
-          resolve(text);
-      });
-    });
-  });
-  await page.evaluate(async () => {
-    // use window.readfile to read contents of a file
-    const content = await window.readfile('/etc/hosts');
-    console.log(content);
-  });
-  await browser.close();
-})();
-```
-
-#### page.focus(selector)
-- `selector` <[string]> A [selector] of an element to focus. If there are multiple elements satisfying the selector, the first will be focused.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully focused. The promise will be rejected if there is no element matching `selector`.
-
-This method fetches an element with `selector` and focuses it.
-If there's no element matching `selector`, the method throws an error.
-
-Shortcut for [page.mainFrame().focus(selector)](#framefocusselector).
-
-#### page.frames()
-- returns: <[Array]<[Frame]>> An array of all frames attached to the page.
-
-#### page.goBack([options])
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect. If
-can not go back, resolves to `null`.
-
-Navigate to the previous page in history.
-
-#### page.goForward([options])
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect. If
-can not go forward, resolves to `null`.
-
-Navigate to the next page in history.
-
-#### page.goto(url[, options])
-- `url` <[string]> URL to navigate page to. The url should include scheme, e.g. `https://`.
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-  - `referer` <[string]> Referer header value. If provided it will take preference over the referer header value set by [page.setExtraHTTPHeaders()](#pagesetextrahttpheadersheaders).
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect.
-
-`page.goto` will throw an error if:
-- there's an SSL error (e.g. in case of self-signed certificates).
-- target URL is invalid.
-- the `timeout` is exceeded during navigation.
-- the remote server does not respond or is unreachable.
-- the main resource failed to load.
-
-`page.goto` will not throw an error when any valid HTTP status code is returned by the remote server, including 404 "Not Found" and 500 "Internal Server Error".  The status code for such responses can be retrieved by calling [response.status()](#responsestatus).
-
-> **NOTE** `page.goto` either throws an error or returns a main resource response. The only exceptions are navigation to `about:blank` or navigation to the same URL with a different hash, which would succeed and return `null`.
-
-> **NOTE** Headless mode doesn't support navigation to a PDF document. See the [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
-
-Shortcut for [page.mainFrame().goto(url, options)](#framegotourl-options)
-
-#### page.hover(selector)
-- `selector` <[string]> A [selector] to search for element to hover. If there are multiple elements satisfying the selector, the first will be hovered.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully hovered. Promise gets rejected if there's no element matching `selector`.
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.mouse](#pagemouse) to hover over the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-Shortcut for [page.mainFrame().hover(selector)](#framehoverselector).
-
-#### page.isClosed()
-
-- returns: <[boolean]>
-
-Indicates that the page has been closed.
-
-#### page.isJavaScriptEnabled()
-
-- returns: <[boolean]>
-
-Returns `true` if the page has JavaScript enabled, `false` otherwise.
-
-#### page.keyboard
-
-- returns: <[Keyboard]>
-
-#### page.mainFrame()
-- returns: <[Frame]> The page's main frame.
-
-Page is guaranteed to have a main frame which persists during navigations.
-
-#### page.metrics()
-- returns: <[Promise]<[Object]>> Object containing metrics as key/value pairs.
-  - `Timestamp` <[number]> The timestamp when the metrics sample was taken.
-  - `Documents` <[number]> Number of documents in the page.
-  - `Frames` <[number]> Number of frames in the page.
-  - `JSEventListeners` <[number]> Number of events in the page.
-  - `Nodes` <[number]> Number of DOM nodes in the page.
-  - `LayoutCount` <[number]> Total number of full or partial page layout.
-  - `RecalcStyleCount` <[number]> Total number of page style recalculations.
-  - `LayoutDuration` <[number]> Combined durations of all page layouts.
-  - `RecalcStyleDuration` <[number]> Combined duration of all page style recalculations.
-  - `ScriptDuration` <[number]> Combined duration of JavaScript execution.
-  - `TaskDuration` <[number]> Combined duration of all tasks performed by the browser.
-  - `JSHeapUsedSize` <[number]> Used JavaScript heap size.
-  - `JSHeapTotalSize` <[number]> Total JavaScript heap size.
-
-> **NOTE** All timestamps are in monotonic time: monotonically increasing time in seconds since an arbitrary point in the past.
-
-#### page.mouse
-
-- returns: <[Mouse]>
-
-#### page.pdf([options])
-- `options` <[Object]> Options object which might have the following properties:
-  - `path` <[string]> The file path to save the PDF to. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd). If no path is provided, the PDF won't be saved to the disk.
-  - `scale` <[number]> Scale of the webpage rendering. Defaults to `1`. Scale amount must be between 0.1 and 2.
-  - `displayHeaderFooter` <[boolean]> Display header and footer. Defaults to `false`.
-  - `headerTemplate` <[string]> HTML template for the print header. Should be valid HTML markup with following classes used to inject printing values into them:
-    - `date` formatted print date
-    - `title` document title
-    - `url` document location
-    - `pageNumber` current page number
-    - `totalPages` total pages in the document
-  - `footerTemplate` <[string]> HTML template for the print footer. Should use the same format as the `headerTemplate`.
-  - `printBackground` <[boolean]> Print background graphics. Defaults to `false`.
-  - `landscape` <[boolean]> Paper orientation. Defaults to `false`.
-  - `pageRanges` <[string]> Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
-  - `format` <[string]> Paper format. If set, takes priority over `width` or `height` options. Defaults to 'Letter'.
-  - `width` <[string]|[number]> Paper width, accepts values labeled with units.
-  - `height` <[string]|[number]> Paper height, accepts values labeled with units.
-  - `margin` <[Object]> Paper margins, defaults to none.
-    - `top` <[string]|[number]> Top margin, accepts values labeled with units.
-    - `right` <[string]|[number]> Right margin, accepts values labeled with units.
-    - `bottom` <[string]|[number]> Bottom margin, accepts values labeled with units.
-    - `left` <[string]|[number]> Left margin, accepts values labeled with units.
-  - `preferCSSPageSize` <[boolean]> Give any CSS `@page` size declared in the page priority over what is declared in `width` and `height` or `format` options. Defaults to `false`, which will scale the content to fit the paper size.
-- returns: <[Promise]<[Buffer]>> Promise which resolves with PDF buffer.
-
-> **NOTE** Generating a pdf is currently only supported in Chrome headless.
-
-`page.pdf()` generates a pdf of the page with `print` css media. To generate a pdf with `screen` media, call [page.emulateMediaType('screen')](#pageemulatemediatypetype) before calling `page.pdf()`:
-
-> **NOTE** By default, `page.pdf()` generates a pdf with modified colors for printing. Use the [`-webkit-print-color-adjust`](https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-print-color-adjust) property to force rendering of exact colors.
-
-```js
-// Generates a PDF with 'screen' media type.
-await page.emulateMediaType('screen');
-await page.pdf({path: 'page.pdf'});
-```
-
-The `width`, `height`, and `margin` options accept values labeled with units. Unlabeled values are treated as pixels.
-
-A few examples:
-- `page.pdf({width: 100})` - prints with width set to 100 pixels
-- `page.pdf({width: '100px'})` - prints with width set to 100 pixels
-- `page.pdf({width: '10cm'})` - prints with width set to 10 centimeters.
-
-All possible units are:
-- `px` - pixel
-- `in` - inch
-- `cm` - centimeter
-- `mm` - millimeter
-
-The `format` options are:
-- `Letter`: 8.5in x 11in
-- `Legal`: 8.5in x 14in
-- `Tabloid`: 11in x 17in
-- `Ledger`: 17in x 11in
-- `A0`: 33.1in x 46.8in
-- `A1`: 23.4in x 33.1in
-- `A2`: 16.54in x 23.4in
-- `A3`: 11.7in x 16.54in
-- `A4`: 8.27in x 11.7in
-- `A5`: 5.83in x 8.27in
-- `A6`: 4.13in x 5.83in
-
-> **NOTE** `headerTemplate` and `footerTemplate` markup have the following limitations:
-> 1. Script tags inside templates are not evaluated.
-> 2. Page styles are not visible inside templates.
-
-#### page.queryObjects(prototypeHandle)
-- `prototypeHandle` <[JSHandle]> A handle to the object prototype.
-- returns: <[Promise]<[JSHandle]>> Promise which resolves to a handle to an array of objects with this prototype.
-
-The method iterates the JavaScript heap and finds all the objects with the given prototype.
-
-```js
-// Create a Map object
-await page.evaluate(() => window.map = new Map());
-// Get a handle to the Map object prototype
-const mapPrototype = await page.evaluateHandle(() => Map.prototype);
-// Query all map instances into an array
-const mapInstances = await page.queryObjects(mapPrototype);
-// Count amount of map objects in heap
-const count = await page.evaluate(maps => maps.length, mapInstances);
-await mapInstances.dispose();
-await mapPrototype.dispose();
-```
-
-Shortcut for [page.mainFrame().executionContext().queryObjects(prototypeHandle)](#executioncontextqueryobjectsprototypehandle).
-
-#### page.reload([options])
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]<[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect.
-
-#### page.screenshot([options])
-- `options` <[Object]> Options object which might have the following properties:
-  - `path` <[string]> The file path to save the image to. The screenshot type will be inferred from file extension. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd). If no path is provided, the image won't be saved to the disk.
-  - `type` <[string]> Specify screenshot type, can be either `jpeg` or `png`. Defaults to 'png'.
-  - `quality` <[number]> The quality of the image, between 0-100. Not applicable to `png` images.
-  - `fullPage` <[boolean]> When true, takes a screenshot of the full scrollable page. Defaults to `false`.
-  - `clip` <[Object]> An object which specifies clipping region of the page. Should have the following fields:
-    - `x` <[number]> x-coordinate of top-left corner of clip area
-    - `y` <[number]> y-coordinate of top-left corner of clip area
-    - `width` <[number]> width of clipping area
-    - `height` <[number]> height of clipping area
-  - `omitBackground` <[boolean]> Hides default white background and allows capturing screenshots with transparency. Defaults to `false`.
-  - `encoding` <[string]> The encoding of the image, can be either `base64` or `binary`. Defaults to `binary`.
-- returns: <[Promise]<[string]|[Buffer]>> Promise which resolves to buffer or a base64 string (depending on the value of `encoding`) with captured screenshot.
-
-> **NOTE** Screenshots take at least 1/6 second on OS X. See https://crbug.com/741689 for discussion.
-
-#### page.select(selector, ...values)
-- `selector` <[string]> A [selector] to query page for
-- `...values` <...[string]> Values of options to select. If the `<select>` has the `multiple` attribute, all values are considered, otherwise only the first one is taken into account.
-- returns: <[Promise]<[Array]<[string]>>> An array of option values that have been successfully selected.
-
-Triggers a `change` and `input` event once all the provided options have been selected.
-If there's no `<select>` element matching `selector`, the method throws an error.
-
-```js
-page.select('select#colors', 'blue'); // single selection
-page.select('select#colors', 'red', 'green', 'blue'); // multiple selections
-```
-
-Shortcut for [page.mainFrame().select()](#frameselectselector-values)
-
-#### page.setBypassCSP(enabled)
-- `enabled` <[boolean]> sets bypassing of page's Content-Security-Policy.
-- returns: <[Promise]>
-
-Toggles bypassing page's Content-Security-Policy.
-
-> **NOTE** CSP bypassing happens at the moment of CSP initialization rather then evaluation. Usually this means
-that `page.setBypassCSP` should be called before navigating to the domain.
-
-#### page.setCacheEnabled([enabled])
-- `enabled` <[boolean]> sets the `enabled` state of the cache.
-- returns: <[Promise]>
-
-Toggles ignoring cache for each request based on the enabled state. By default, caching is enabled.
-
-#### page.setContent(html[, options])
-- `html` <[string]> HTML markup to assign to the page.
-- `options` <[Object]> Parameters which might have the following properties:
-  - `timeout` <[number]> Maximum time in milliseconds for resources to load, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider setting markup succeeded, defaults to `load`. Given an array of event strings, setting content is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider setting content to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider setting content to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider setting content to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider setting content to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]>
-
-#### page.setCookie(...cookies)
-- `...cookies` <...[Object]>
-  - `name` <[string]> **required**
-  - `value` <[string]> **required**
-  - `url` <[string]>
-  - `domain` <[string]>
-  - `path` <[string]>
-  - `expires` <[number]> Unix time in seconds.
-  - `httpOnly` <[boolean]>
-  - `secure` <[boolean]>
-  - `sameSite` <"Strict"|"Lax">
-- returns: <[Promise]>
-
-```js
-await page.setCookie(cookieObject1, cookieObject2);
-```
-
-#### page.setDefaultNavigationTimeout(timeout)
-- `timeout` <[number]> Maximum navigation time in milliseconds
-
-This setting will change the default maximum navigation time for the following methods and related shortcuts:
-- [page.goBack([options])](#pagegobackoptions)
-- [page.goForward([options])](#pagegoforwardoptions)
-- [page.goto(url[, options])](#pagegotourl-options)
-- [page.reload([options])](#pagereloadoptions)
-- [page.setContent(html[, options])](#pagesetcontenthtml-options)
-- [page.waitForNavigation([options])](#pagewaitfornavigationoptions)
-
-> **NOTE** [`page.setDefaultNavigationTimeout`](#pagesetdefaultnavigationtimeouttimeout) takes priority over [`page.setDefaultTimeout`](#pagesetdefaulttimeouttimeout)
-
-
-#### page.setDefaultTimeout(timeout)
-- `timeout` <[number]> Maximum time in milliseconds
-
-This setting will change the default maximum time for the following methods and related shortcuts:
-- [page.goBack([options])](#pagegobackoptions)
-- [page.goForward([options])](#pagegoforwardoptions)
-- [page.goto(url[, options])](#pagegotourl-options)
-- [page.reload([options])](#pagereloadoptions)
-- [page.setContent(html[, options])](#pagesetcontenthtml-options)
-- [page.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])](#pagewaitforselectororfunctionortimeout-options-args)
-- [page.waitForFileChooser([options])](#pagewaitforfilechooseroptions)
-- [page.waitForFunction(pageFunction[, options[, ...args]])](#pagewaitforfunctionpagefunction-options-args)
-- [page.waitForNavigation([options])](#pagewaitfornavigationoptions)
-- [page.waitForRequest(urlOrPredicate[, options])](#pagewaitforrequesturlorpredicate-options)
-- [page.waitForResponse(urlOrPredicate[, options])](#pagewaitforresponseurlorpredicate-options)
-- [page.waitForSelector(selector[, options])](#pagewaitforselectorselector-options)
-- [page.waitForXPath(xpath[, options])](#pagewaitforxpathxpath-options)
-
-> **NOTE** [`page.setDefaultNavigationTimeout`](#pagesetdefaultnavigationtimeouttimeout) takes priority over [`page.setDefaultTimeout`](#pagesetdefaulttimeouttimeout)
-
-#### page.setExtraHTTPHeaders(headers)
-- `headers` <[Object]> An object containing additional HTTP headers to be sent with every request. All header values must be strings.
-- returns: <[Promise]>
-
-The extra HTTP headers will be sent with every request the page initiates.
-
-> **NOTE** page.setExtraHTTPHeaders does not guarantee the order of headers in the outgoing requests.
-
-#### page.setGeolocation(options)
-- `options` <[GeolocationOptions](####GeolocationOptions)>
-- returns: <[Promise]>
-
-Sets the page's geolocation.
-
-```js
-await page.setGeolocation({latitude: 59.95, longitude: 30.31667});
-```
-
-> **NOTE** Consider using [browserContext.overridePermissions](#browsercontextoverridepermissionsorigin-permissions) to grant permissions for the page to read its geolocation.
-
-#### page.setJavaScriptEnabled(enabled)
-- `enabled` <[boolean]> Whether or not to enable JavaScript on the page.
-- returns: <[Promise]>
-
-> **NOTE** changing this value won't affect scripts that have already been run. It will take full effect on the next [navigation](#pagegotourl-options).
-
-#### page.setOfflineMode(enabled)
-- `enabled` <[boolean]> When `true`, enables offline mode for the page.
-- returns: <[Promise]>
-
-#### page.setRequestInterception(value)
-- `value` <[boolean]> Whether to enable request interception.
-- returns: <[Promise]>
-
-Activating request interception enables `request.abort`, `request.continue` and
-`request.respond` methods.  This provides the capability to modify network requests that are made by a page.
-
-Once request interception is enabled, every request will stall unless it's continued, responded or aborted.
-An example of a naïve request interceptor that aborts all image requests:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.setRequestInterception(true);
-  page.on('request', interceptedRequest => {
-    if (interceptedRequest.url().endsWith('.png') || interceptedRequest.url().endsWith('.jpg'))
-      interceptedRequest.abort();
-    else
-      interceptedRequest.continue();
-  });
-  await page.goto('https://example.com');
-  await browser.close();
-})();
-```
-
-> **NOTE** Enabling request interception disables page caching.
-
-#### page.setUserAgent(userAgent)
-- `userAgent` <[string]> Specific user agent to use in this page
-- returns: <[Promise]> Promise which resolves when the user agent is set.
-
-#### page.setViewport(viewport)
-- `viewport` <[Object]>
-  - `width` <[number]> page width in pixels. **required**
-  - `height` <[number]> page height in pixels. **required**
-  - `deviceScaleFactor` <[number]> Specify device scale factor (can be thought of as dpr). Defaults to `1`.
-  - `isMobile` <[boolean]> Whether the `meta viewport` tag is taken into account. Defaults to `false`.
-  - `hasTouch`<[boolean]> Specifies if viewport supports touch events. Defaults to `false`
-  - `isLandscape` <[boolean]> Specifies if viewport is in landscape mode. Defaults to `false`.
-- returns: <[Promise]>
-
-> **NOTE** in certain cases, setting viewport will reload the page in order to set the `isMobile` or `hasTouch` properties.
-
-In the case of multiple pages in a single browser, each page can have its own viewport size.
-
-`page.setViewport` will resize the page. A lot of websites don't expect phones to change size, so you should set the viewport before navigating to the page.
-
-```js
-const page = await browser.newPage();
-await page.setViewport({
-  width: 640,
-  height: 480,
-  deviceScaleFactor: 1,
-});
-await page.goto('https://example.com');
-```
-
-#### page.tap(selector)
-- `selector` <[string]> A [selector] to search for element to tap. If there are multiple elements satisfying the selector, the first will be tapped.
-- returns: <[Promise]>
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.touchscreen](#pagetouchscreen) to tap in the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-Shortcut for [page.mainFrame().tap(selector)](#frametapselector).
-
-#### page.target()
-- returns: <[Target]> a target this page was created from.
-
-#### page.title()
-- returns: <[Promise]<[string]>> The page's title.
-
-Shortcut for [page.mainFrame().title()](#frametitle).
-
-#### page.touchscreen
-- returns: <[Touchscreen]>
-
-#### page.tracing
-- returns: <[Tracing]>
-
-#### page.type(selector, text[, options])
-- `selector` <[string]> A [selector] of an element to type into. If there are multiple elements satisfying the selector, the first will be used.
-- `text` <[string]> A text to type into a focused element.
-- `options` <[Object]>
-  - `delay` <[number]> Time to wait between key presses in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.
-
-To press a special key, like `Control` or `ArrowDown`, use [`keyboard.press`](#keyboardpresskey-options).
-
-```js
-await page.type('#mytextarea', 'Hello'); // Types instantly
-await page.type('#mytextarea', 'World', {delay: 100}); // Types slower, like a user
-```
-
-Shortcut for [page.mainFrame().type(selector, text[, options])](#frametypeselector-text-options).
-
-#### page.url()
-- returns: <[string]>
-
-This is a shortcut for [page.mainFrame().url()](#frameurl)
-
-#### page.viewport()
-- returns: <?[Object]>
-  - `width` <[number]> page width in pixels.
-  - `height` <[number]> page height in pixels.
-  - `deviceScaleFactor` <[number]> Specify device scale factor (can be though of as dpr). Defaults to `1`.
-  - `isMobile` <[boolean]> Whether the `meta viewport` tag is taken into account. Defaults to `false`.
-  - `hasTouch`<[boolean]> Specifies if viewport supports touch events. Defaults to `false`
-  - `isLandscape` <[boolean]> Specifies if viewport is in landscape mode. Defaults to `false`.
-
-#### page.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])
-- `selectorOrFunctionOrTimeout` <[string]|[number]|[function]> A [selector], predicate or timeout to wait for
-- `options` <[Object]> Optional waiting parameters
-  - `visible` <[boolean]> wait for element to be present in DOM and to be visible. Defaults to `false`.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-  - `hidden` <[boolean]> wait for element to not be found in the DOM or to be hidden. Defaults to `false`.
-  - `polling` <[string]|[number]> An interval at which the `pageFunction` is executed, defaults to `raf`. If `polling` is a number, then it is treated as an interval in milliseconds at which the function would be executed. If `polling` is a string, then it can be one of the following values:
-    - `raf` - to constantly execute `pageFunction` in `requestAnimationFrame` callback. This is the tightest polling mode which is suitable to observe styling changes.
-    - `mutation` - to execute `pageFunction` on every DOM mutation.
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to  `pageFunction`
-- returns: <[Promise]<[JSHandle]>> Promise which resolves to a JSHandle of the success value
-
-This method behaves differently with respect to the type of the first parameter:
-- if `selectorOrFunctionOrTimeout` is a `string`, then the first argument is treated as a [selector] or [xpath], depending on whether or not it starts with '//', and the method is a shortcut for
-  [page.waitForSelector](#pagewaitforselectorselector-options) or [page.waitForXPath](#pagewaitforxpathxpath-options)
-- if `selectorOrFunctionOrTimeout` is a `function`, then the first argument is treated as a predicate to wait for and the method is a shortcut for [page.waitForFunction()](#pagewaitforfunctionpagefunction-options-args).
-- if `selectorOrFunctionOrTimeout` is a `number`, then the first argument is treated as a timeout in milliseconds and the method returns a promise which resolves after the timeout
-- otherwise, an exception is thrown
-
-```js
-// wait for selector
-await page.waitFor('.foo');
-// wait for 1 second
-await page.waitFor(1000);
-// wait for predicate
-await page.waitFor(() => !!document.querySelector('.foo'));
-```
-
-To pass arguments from node.js to the predicate of `page.waitFor` function:
-
-```js
-const selector = '.foo';
-await page.waitFor(selector => !!document.querySelector(selector), {}, selector);
-```
-
-Shortcut for [page.mainFrame().waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])](#framewaitforselectororfunctionortimeout-options-args).
-
-#### page.waitForFileChooser([options])
-- `options` <[WaitTimeoutOptions](####WaitTimeoutOptions)> Optional waiting parameters
-- returns: <[Promise]<[FileChooser]>> A promise that resolves after a page requests a file picker.
-
-> **NOTE** In non-headless Chromium, this method results in the native file picker dialog **not showing up** for the user.
-
-This method is typically coupled with an action that triggers file choosing.
-The following example clicks a button that issues a file chooser, and then
-responds with `/tmp/myfile.pdf` as if a user has selected this file.
-
-```js
-const [fileChooser] = await Promise.all([
-  page.waitForFileChooser(),
-  page.click('#upload-file-button'), // some button that triggers file selection
-]);
-await fileChooser.accept(['/tmp/myfile.pdf']);
-```
-
-> **NOTE** This must be called *before* the file chooser is launched. It will not return a currently active file chooser.
-
-
-#### page.waitForFunction(pageFunction[, options[, ...args]])
-- `pageFunction` <[function]|[string]> Function to be evaluated in browser context
-- `options` <[Object]> Optional waiting parameters
-  - `polling` <[string]|[number]> An interval at which the `pageFunction` is executed, defaults to `raf`. If `polling` is a number, then it is treated as an interval in milliseconds at which the function would be executed. If `polling` is a string, then it can be one of the following values:
-    - `raf` - to constantly execute `pageFunction` in `requestAnimationFrame` callback. This is the tightest polling mode which is suitable to observe styling changes.
-    - `mutation` - to execute `pageFunction` on every DOM mutation.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to  `pageFunction`
-- returns: <[Promise]<[JSHandle]>> Promise which resolves when the `pageFunction` returns a truthy value. It resolves to a JSHandle of the truthy value.
-
-The `waitForFunction` can be used to observe viewport size change:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  const watchDog = page.waitForFunction('window.innerWidth < 100');
-  await page.setViewport({width: 50, height: 50});
-  await watchDog;
-  await browser.close();
-})();
-```
-
-To pass arguments from node.js to the predicate of `page.waitForFunction` function:
-
-```js
-const selector = '.foo';
-await page.waitForFunction(selector => !!document.querySelector(selector), {}, selector);
-```
-
-The predicate of `page.waitForFunction` can be asynchronous too:
-
-```js
-const username = 'github-username';
-await page.waitForFunction(async username => {
-  const githubResponse = await fetch(`https://api.github.com/users/${username}`);
-  const githubUser = await githubResponse.json();
-  // show the avatar
-  const img = document.createElement('img');
-  img.src = githubUser.avatar_url;
-  // wait 3 seconds
-  await new Promise((resolve, reject) => setTimeout(resolve, 3000));
-  img.remove();
-}, {}, username);
-```
-
-Shortcut for [page.mainFrame().waitForFunction(pageFunction[, options[, ...args]])](#framewaitforfunctionpagefunction-options-args).
-
-#### page.waitForNavigation([options])
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect. In case of navigation to a different anchor or navigation due to History API usage, the navigation will resolve with `null`.
-
-This resolves when the page navigates to a new URL or reloads. It is useful for when you run code
-which will indirectly cause the page to navigate. Consider this example:
-
-```js
-const [response] = await Promise.all([
-  page.waitForNavigation(), // The promise resolves after navigation has finished
-  page.click('a.my-link'), // Clicking the link will indirectly cause a navigation
-]);
-```
-
-**NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL is considered a navigation.
-
-Shortcut for [page.mainFrame().waitForNavigation(options)](#framewaitfornavigationoptions).
-
-#### page.waitForRequest(urlOrPredicate[, options])
-- `urlOrPredicate` <[string]|[Function]> A URL or predicate to wait for.
-- `options` <[Object]> Optional waiting parameters
-  - `timeout` <[number]> Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<[HTTPRequest]>> Promise which resolves to the matched request.
-
-```js
-const firstRequest = await page.waitForRequest('http://example.com/resource');
-const finalRequest = await page.waitForRequest(request => request.url() === 'http://example.com' && request.method() === 'GET');
-return firstRequest.url();
-```
-
-#### page.waitForResponse(urlOrPredicate[, options])
-- `urlOrPredicate` <[string]|[Function]> A URL or predicate to wait for.
-- `options` <[Object]> Optional waiting parameters
-  - `timeout` <[number]> Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<[HTTPResponse]>> Promise which resolves to the matched response.
-
-```js
-const firstResponse = await page.waitForResponse('https://example.com/resource');
-const finalResponse = await page.waitForResponse(response => response.url() === 'https://example.com' && response.status() === 200);
-return finalResponse.ok();
-```
-
-#### page.waitForSelector(selector[, options])
-- `selector` <[string]> A [selector] of an element to wait for
-- `options` <[Object]> Optional waiting parameters
-  - `visible` <[boolean]> wait for element to be present in DOM and to be visible, i.e. to not have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `hidden` <[boolean]> wait for element to not be found in the DOM or to be hidden, i.e. have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<?[ElementHandle]>> Promise which resolves when element specified by selector string is added to DOM. Resolves to `null` if waiting for `hidden: true` and selector is not found in DOM.
-
-Wait for the `selector` to appear in page. If at the moment of calling
-the method the `selector` already exists, the method will return
-immediately. If the selector doesn't appear after the `timeout` milliseconds of waiting, the function will throw.
-
-This method works across navigations:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  let currentURL;
-  page
-    .waitForSelector('img')
-    .then(() => console.log('First URL with image: ' + currentURL));
-  for (currentURL of ['https://example.com', 'https://google.com', 'https://bbc.com']) {
-    await page.goto(currentURL);
-  }
-  await browser.close();
-})();
-```
-Shortcut for [page.mainFrame().waitForSelector(selector[, options])](#framewaitforselectorselector-options).
-
-#### page.waitForXPath(xpath[, options])
-- `xpath` <[string]> A [xpath] of an element to wait for
-- `options` <[Object]> Optional waiting parameters
-  - `visible` <[boolean]> wait for element to be present in DOM and to be visible, i.e. to not have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `hidden` <[boolean]> wait for element to not be found in the DOM or to be hidden, i.e. have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<?[ElementHandle]>> Promise which resolves when element specified by xpath string is added to DOM. Resolves to `null` if waiting for `hidden: true` and xpath is not found in DOM.
-
-Wait for the `xpath` to appear in page. If at the moment of calling
-the method the `xpath` already exists, the method will return
-immediately. If the xpath doesn't appear after the `timeout` milliseconds of waiting, the function will throw.
-
-This method works across navigations:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  let currentURL;
-  page
-    .waitForXPath('//img')
-    .then(() => console.log('First URL with image: ' + currentURL));
-  for (currentURL of ['https://example.com', 'https://google.com', 'https://bbc.com']) {
-    await page.goto(currentURL);
-  }
-  await browser.close();
-})();
-```
-Shortcut for [page.mainFrame().waitForXPath(xpath[, options])](#framewaitforxpathxpath-options).
-
-#### page.workers()
-- returns: <[Array]<[Worker]>>
-This method returns all of the dedicated [WebWorkers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) associated with the page.
-
-> **NOTE** This does not contain ServiceWorkers
-
-#### GeolocationOptions
-- `latitude` <[number]> Latitude between -90 and 90.
-- `longitude` <[number]> Longitude between -180 and 180.
-- `accuracy` <[number]> Optional non-negative accuracy value.
-
-#### WaitTimeoutOptions
-- `timeout` <[number]> Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-
-
-### class: WebWorker
-
-The WebWorker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
-The events `workercreated` and `workerdestroyed` are emitted on the page object to signal the worker lifecycle.
-
-```js
-page.on('workercreated', worker => console.log('Worker created: ' + worker.url()));
-page.on('workerdestroyed', worker => console.log('Worker destroyed: ' + worker.url()));
-
-console.log('Current workers:');
-for (const worker of page.workers())
-  console.log('  ' + worker.url());
-```
-
-#### webWorker.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the worker context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-If the function passed to the `worker.evaluate` returns a [Promise], then `worker.evaluate` would wait for the promise to resolve and return its value.
-
-If the function passed to the `worker.evaluate` returns a non-[Serializable] value, then `worker.evaluate` resolves to `undefined`. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`, and bigint literals.
-
-Shortcut for [(await worker.executionContext()).evaluate(pageFunction, ...args)](#executioncontextevaluatepagefunction-args).
-
-#### webWorker.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the page context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-The only difference between `worker.evaluate` and `worker.evaluateHandle` is that `worker.evaluateHandle` returns in-page object (JSHandle).
-
-If the function passed to the `worker.evaluateHandle` returns a [Promise], then `worker.evaluateHandle` would wait for the promise to resolve and return its value.
-
-If the function returns an element, the returned handle is an [ElementHandle].
-
-Shortcut for [(await worker.executionContext()).evaluateHandle(pageFunction, ...args)](#executioncontextevaluatehandlepagefunction-args).
-
-#### webWorker.executionContext()
-- returns: <[Promise]<[ExecutionContext]>>
-
-#### webWorker.url()
-- returns: <[string]>
-
-### class: Accessibility
-
-The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or [switches](https://en.wikipedia.org/wiki/Switch_access).
-
-Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that might have wildly different output.
-
-Blink - Chrome's rendering engine - has a concept of "accessibility tree", which is then translated into different platform-specific APIs. Accessibility namespace gives users
-access to the Blink Accessibility Tree.
-
-Most of the accessibility tree gets filtered out when converting from Blink AX Tree to Platform-specific AX-Tree or by assistive technologies themselves. By default, Puppeteer tries to approximate this filtering, exposing only the "interesting" nodes of the tree.
-
-
-
-#### accessibility.snapshot([options])
-- `options` <[Object]>
-  - `interestingOnly` <[boolean]> Prune uninteresting nodes from the tree. Defaults to `true`.
-  - `root` <[ElementHandle]> The root DOM element for the snapshot. Defaults to the whole page.
-- returns: <[Promise]<[Object]>> An [AXNode] object with the following properties:
-  - `role` <[string]> The [role](https://www.w3.org/TR/wai-aria/#usage_intro).
-  - `name` <[string]> A human readable name for the node.
-  - `value` <[string]|[number]> The current value of the node.
-  - `description` <[string]> An additional human readable description of the node.
-  - `keyshortcuts` <[string]> Keyboard shortcuts associated with this node.
-  - `roledescription` <[string]> A human readable alternative to the role.
-  - `valuetext` <[string]> A description of the current value.
-  - `disabled` <[boolean]> Whether the node is disabled.
-  - `expanded` <[boolean]> Whether the node is expanded or collapsed.
-  - `focused` <[boolean]> Whether the node is focused.
-  - `modal` <[boolean]> Whether the node is [modal](https://en.wikipedia.org/wiki/Modal_window).
-  - `multiline` <[boolean]> Whether the node text input supports multiline.
-  - `multiselectable` <[boolean]> Whether more than one child can be selected.
-  - `readonly` <[boolean]> Whether the node is read only.
-  - `required` <[boolean]> Whether the node is required.
-  - `selected` <[boolean]> Whether the node is selected in its parent node.
-  - `checked` <[boolean]|"mixed"> Whether the checkbox is checked, or "mixed".
-  - `pressed` <[boolean]|"mixed"> Whether the toggle button is checked, or "mixed".
-  - `level` <[number]> The level of a heading.
-  - `valuemin` <[number]> The minimum value in a node.
-  - `valuemax` <[number]> The maximum value in a node.
-  - `autocomplete` <[string]> What kind of autocomplete is supported by a control.
-  - `haspopup` <[string]> What kind of popup is currently being shown for a node.
-  - `invalid` <[string]> Whether and in what way this node's value is invalid.
-  - `orientation` <[string]> Whether the node is oriented horizontally or vertically.
-  - `children` <[Array]<[Object]>> Child [AXNode]s of this node, if any.
-
-Captures the current state of the accessibility tree. The returned object represents the root accessible node of the page.
-
-> **NOTE** The Chromium accessibility tree contains nodes that go unused on most platforms and by
-most screen readers. Puppeteer will discard them as well for an easier to process tree,
-unless `interestingOnly` is set to `false`.
-
-An example of dumping the entire accessibility tree:
-```js
-const snapshot = await page.accessibility.snapshot();
-console.log(snapshot);
-```
-
-An example of logging the focused node's name:
-```js
-const snapshot = await page.accessibility.snapshot();
-const node = findFocusedNode(snapshot);
-console.log(node && node.name);
-
-function findFocusedNode(node) {
-  if (node.focused)
-    return node;
-  for (const child of node.children || []) {
-    const foundNode = findFocusedNode(child);
-    return foundNode;
-  }
-  return null;
-}
-```
-
-### class: Keyboard
-
-Keyboard provides an api for managing a virtual keyboard. The high level api is [`keyboard.type`](#keyboardtypetext-options), which takes raw characters and generates proper keydown, keypress/input, and keyup events on your page.
-
-For finer control, you can use [`keyboard.down`](#keyboarddownkey-options), [`keyboard.up`](#keyboardupkey), and [`keyboard.sendCharacter`](#keyboardsendcharacterchar) to manually fire events as if they were generated from a real keyboard.
-
-An example of holding down `Shift` in order to select and delete some text:
-```js
-await page.keyboard.type('Hello World!');
-await page.keyboard.press('ArrowLeft');
-
-await page.keyboard.down('Shift');
-for (let i = 0; i < ' World'.length; i++)
-  await page.keyboard.press('ArrowLeft');
-await page.keyboard.up('Shift');
-
-await page.keyboard.press('Backspace');
-// Result text will end up saying 'Hello!'
-```
-
-An example of pressing `A`
-```js
-await page.keyboard.down('Shift');
-await page.keyboard.press('KeyA');
-await page.keyboard.up('Shift');
-```
-
-> **NOTE** On MacOS, keyboard shortcuts like `⌘ A` -> Select All do not work. See [#1313](https://github.com/puppeteer/puppeteer/issues/1313)
-
-#### keyboard.down(key[, options])
-- `key` <[string]> Name of key to press, such as `ArrowLeft`. See [USKeyboardLayout] for a list of all key names.
-- `options` <[Object]>
-  - `text` <[string]> If specified, generates an input event with this text.
-- returns: <[Promise]>
-
-Dispatches a `keydown` event.
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`/`input` event will also generated. The `text` option can be specified to force an input event to be generated.
-
-If `key` is a modifier key, `Shift`, `Meta`, `Control`, or `Alt`, subsequent key presses will be sent with that modifier active. To release the modifier key, use [`keyboard.up`](#keyboardupkey).
-
-After the key is pressed once, subsequent calls to [`keyboard.down`](#keyboarddownkey-options) will have [repeat](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat) set to true. To release the key, use [`keyboard.up`](#keyboardupkey).
-
-> **NOTE** Modifier keys DO influence `keyboard.down`. Holding down `Shift` will type the text in upper case.
-
-#### keyboard.press(key[, options])
-- `key` <[string]> Name of key to press, such as `ArrowLeft`. See [USKeyboardLayout] for a list of all key names.
-- `options` <[Object]>
-  - `text` <[string]> If specified, generates an input event with this text.
-  - `delay` <[number]> Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`/`input` event will also generated. The `text` option can be specified to force an input event to be generated.
-
-> **NOTE** Modifier keys DO affect `keyboard.press`. Holding down `Shift` will type the text in upper case.
-
-Shortcut for [`keyboard.down`](#keyboarddownkey-options) and [`keyboard.up`](#keyboardupkey).
-
-#### keyboard.sendCharacter(char)
-- `char` <[string]> Character to send into the page.
-- returns: <[Promise]>
-
-Dispatches a `keypress` and `input` event. This does not send a `keydown` or `keyup` event.
-
-```js
-page.keyboard.sendCharacter('å—¨');
-```
-
-> **NOTE** Modifier keys DO NOT affect `keyboard.sendCharacter`. Holding down `Shift` will not type the text in upper case.
-
-#### keyboard.type(text[, options])
-- `text` <[string]> A text to type into a focused element.
-- `options` <[Object]>
-  - `delay` <[number]> Time to wait between key presses in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.
-
-To press a special key, like `Control` or `ArrowDown`, use [`keyboard.press`](#keyboardpresskey-options).
-
-```js
-await page.keyboard.type('Hello'); // Types instantly
-await page.keyboard.type('World', {delay: 100}); // Types slower, like a user
-```
-
-> **NOTE** Modifier keys DO NOT affect `keyboard.type`. Holding down `Shift` will not type the text in upper case.
-
-#### keyboard.up(key)
-- `key` <[string]> Name of key to release, such as `ArrowLeft`. See [USKeyboardLayout] for a list of all key names.
-- returns: <[Promise]>
-
-Dispatches a `keyup` event.
-
-### class: Mouse
-
-The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
-
-Every `page` object has its own Mouse, accessible with [`page.mouse`](#pagemouse).
-
-```js
-// Using ‘page.mouse’ to trace a 100x100 square.
-await page.mouse.move(0, 0);
-await page.mouse.down();
-await page.mouse.move(0, 100);
-await page.mouse.move(100, 100);
-await page.mouse.move(100, 0);
-await page.mouse.move(0, 0);
-await page.mouse.up();
-```
-
-Note that the mouse events trigger synthetic `MouseEvent`s.
-This means that it does not fully replicate the functionality of what a normal user would be able to do with their mouse.
-
-For example, dragging and selecting text is not possible using `page.mouse`.
-Instead, you can use the [`DocumentOrShadowRoot.getSelection()`](https://developer.mozilla.org/en-US/docs/Web/API/DocumentOrShadowRoot/getSelection) functionality implemented in the platform.
-
-For example, if you want to select all content between nodes:
-```js
-await page.evaluate((from, to) => {
-  const selection = from.getRootNode().getSelection();
-  const range = document.createRange();
-  range.setStartBefore(from);
-  range.setEndAfter(to);
-  selection.removeAllRanges();
-  selection.addRange(range);
-}, fromJSHandle, toJSHandle);
-```
-
-If you then would want to copy-paste your selection, you can use the clipboard api:
-
-```js
-// The clipboard api does not allow you to copy, unless the tab is focused.
-await page.bringToFront();
-await page.evaluate(() => {
-  // Copy the selected content to the clipboard
-  document.execCommand('copy');
-  // Obtain the content of the clipboard as a string
-  return navigator.clipboard.readText();
-});
-```
-
-Note that if you want access to the clipboard API, you have to give it permission to do so:
-
-```js
-await browser.defaultBrowserContext().overridePermissions('<your origin>', ['clipboard-read', 'clipboard-write']);
-```
-
-#### mouse.click(x, y[, options])
-- `x` <[number]>
-- `y` <[number]>
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-  - `delay` <[number]> Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Shortcut for [`mouse.move`](#mousemovex-y-options), [`mouse.down`](#mousedownoptions) and [`mouse.up`](#mouseupoptions).
-
-#### mouse.down([options])
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-- returns: <[Promise]>
-
-Dispatches a `mousedown` event.
-
-#### mouse.move(x, y[, options])
-- `x` <[number]>
-- `y` <[number]>
-- `options` <[Object]>
-  - `steps` <[number]> defaults to 1. Sends intermediate `mousemove` events.
-- returns: <[Promise]>
-
-Dispatches a `mousemove` event.
-
-#### mouse.up([options])
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-- returns: <[Promise]>
-
-Dispatches a `mouseup` event.
-
-### class: Touchscreen
-
-#### touchscreen.tap(x, y)
-- `x` <[number]>
-- `y` <[number]>
-- returns: <[Promise]>
-
-Dispatches a `touchstart` and `touchend` event.
-
-### class: Tracing
-
-You can use [`tracing.start`](#tracingstartoptions) and [`tracing.stop`](#tracingstop) to create a trace file which can be opened in Chrome DevTools or [timeline viewer](https://chromedevtools.github.io/timeline-viewer/).
-
-```js
-await page.tracing.start({path: 'trace.json'});
-await page.goto('https://www.google.com');
-await page.tracing.stop();
-```
-
-#### tracing.start([options])
-- `options` <[Object]>
-  - `path` <[string]> A path to write the trace file to.
-  - `screenshots` <[boolean]> captures screenshots in the trace.
-  - `categories` <[Array]<[string]>> specify custom categories to use instead of default.
-- returns: <[Promise]>
-
-Only one trace can be active at a time per browser.
-
-#### tracing.stop()
-- returns: <[Promise]<[Buffer]>> Promise which resolves to buffer with trace data.
-
-### class: FileChooser
-
-[FileChooser] objects are returned via the ['page.waitForFileChooser'](#pagewaitforfilechooseroptions) method.
-
-File choosers let you react to the page requesting for a file.
-
-An example of using [FileChooser]:
-
-```js
-const [fileChooser] = await Promise.all([
-  page.waitForFileChooser(),
-  page.click('#upload-file-button'), // some button that triggers file selection
-]);
-await fileChooser.accept(['/tmp/myfile.pdf']);
-```
-
-> **NOTE** In browsers, only one file chooser can be opened at a time.
-> All file choosers must be accepted or canceled. Not doing so will prevent subsequent file choosers from appearing.
-
-#### fileChooser.accept(filePaths)
-- `filePaths` <[Array]<[string]>> Accept the file chooser request with given paths. If some of the  `filePaths` are relative paths, then they are resolved relative to the [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-- returns: <[Promise]>
-
-#### fileChooser.cancel()
-- returns: <[Promise]>
-
-Closes the file chooser without selecting any files.
-
-#### fileChooser.isMultiple()
-- returns: <[boolean]> Whether file chooser allow for [multiple](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#attr-multiple) file selection.
-
-### class: Dialog
-
-[Dialog] objects are dispatched by page via the ['dialog'](#event-dialog) event.
-
-An example of using `Dialog` class:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  page.on('dialog', async dialog => {
-    console.log(dialog.message());
-    await dialog.dismiss();
-    await browser.close();
-  });
-  page.evaluate(() => alert('1'));
-})();
-```
-
-#### dialog.accept([promptText])
-- `promptText` <[string]> A text to enter in prompt. Does not cause any effects if the dialog's `type` is not prompt.
-- returns: <[Promise]> Promise which resolves when the dialog has been accepted.
-
-#### dialog.defaultValue()
-- returns: <[string]> If dialog is prompt, returns default prompt value. Otherwise, returns empty string.
-
-#### dialog.dismiss()
-- returns: <[Promise]> Promise which resolves when the dialog has been dismissed.
-
-#### dialog.message()
-- returns: <[string]> A message displayed in the dialog.
-
-#### dialog.type()
-- returns: <[string]> Dialog's type, can be one of `alert`, `beforeunload`, `confirm` or `prompt`.
-
-### class: ConsoleMessage
-
-[ConsoleMessage] objects are dispatched by page via the ['console'](#event-console) event.
-
-#### consoleMessage.args()
-- returns: <[Array]<[JSHandle]>>
-
-#### consoleMessage.location()
-- returns: <[Object]>
-  - `url` <[string]> URL of the resource if known or `undefined` otherwise.
-  - `lineNumber` <[number]> 0-based line number in the resource if known or `undefined` otherwise.
-  - `columnNumber` <[number]> 0-based column number in the resource if known or `undefined` otherwise.
-
-#### consoleMessage.text()
-- returns: <[string]>
-
-#### consoleMessage.type()
-- returns: <[string]>
-
-One of the following values: `'log'`, `'debug'`, `'info'`, `'error'`, `'warning'`, `'dir'`, `'dirxml'`, `'table'`, `'trace'`, `'clear'`, `'startGroup'`, `'startGroupCollapsed'`, `'endGroup'`, `'assert'`, `'profile'`, `'profileEnd'`, `'count'`, `'timeEnd'`.
-
-### class: Frame
-
-At every point of time, page exposes its current frame tree via the [page.mainFrame()](#pagemainframe) and [frame.childFrames()](#framechildframes) methods.
-
-[Frame] object's lifecycle is controlled by three events, dispatched on the page object:
-- ['frameattached'](#event-frameattached) - fired when the frame gets attached to the page. A Frame can be attached to the page only once.
-- ['framenavigated'](#event-framenavigated) - fired when the frame commits navigation to a different URL.
-- ['framedetached'](#event-framedetached) - fired when the frame gets detached from the page.  A Frame can be detached from the page only once.
-
-An example of dumping frame tree:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://www.google.com/chrome/browser/canary.html');
-  dumpFrameTree(page.mainFrame(), '');
-  await browser.close();
-
-  function dumpFrameTree(frame, indent) {
-    console.log(indent + frame.url());
-    for (const child of frame.childFrames()) {
-      dumpFrameTree(child, indent + '  ');
-    }
-  }
-})();
-```
-
-An example of getting text from an iframe element:
-
-```js
-  const frame = page.frames().find(frame => frame.name() === 'myframe');
-  const text = await frame.$eval('.selector', element => element.textContent);
-  console.log(text);
-```
-
-#### frame.$(selector)
-- `selector` <[string]> A [selector] to query frame for
-- returns: <[Promise]<?[ElementHandle]>> Promise which resolves to ElementHandle pointing to the frame element.
-
-The method queries frame for the selector. If there's no such element within the frame, the method will resolve to `null`.
-
-#### frame.$$(selector)
-- `selector` <[string]> A [selector] to query frame for
-- returns: <[Promise]<[Array]<[ElementHandle]>>> Promise which resolves to ElementHandles pointing to the frame elements.
-
-The method runs `document.querySelectorAll` within the frame. If no elements match the selector, the return value resolves to `[]`.
-
-#### frame.$$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query frame for
-- `pageFunction` <[function]\([Array]<[Element]>\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `Array.from(document.querySelectorAll(selector))` within the frame and passes it as the first argument to `pageFunction`.
-
-If `pageFunction` returns a [Promise], then `frame.$$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const divsCounts = await frame.$$eval('div', divs => divs.length);
-```
-
-#### frame.$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query frame for
-- `pageFunction` <[function]\([Element]\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `document.querySelector` within the frame and passes it as the first argument to `pageFunction`. If there's no element matching `selector`, the method throws an error.
-
-If `pageFunction` returns a [Promise], then `frame.$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const searchValue = await frame.$eval('#search', el => el.value);
-const preloadHref = await frame.$eval('link[rel=preload]', el => el.href);
-const html = await frame.$eval('.main-container', e => e.outerHTML);
-```
-
-#### frame.$x(expression)
-- `expression` <[string]> Expression to [evaluate](https://developer.mozilla.org/en-US/docs/Web/API/Document/evaluate).
-- returns: <[Promise]<[Array]<[ElementHandle]>>>
-
-The method evaluates the XPath expression.
-
-#### frame.addScriptTag(options)
-- `options` <[Object]>
-  - `url` <[string]> URL of a script to be added.
-  - `path` <[string]> Path to the JavaScript file to be injected into frame. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-  - `content` <[string]> Raw JavaScript content to be injected into frame.
-  - `type` <[string]> Script type. Use 'module' in order to load a Javascript ES6 module. See [script](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script) for more details.
-- returns: <[Promise]<[ElementHandle]>> which resolves to the added tag when the script's onload fires or when the script content was injected into frame.
-
-Adds a `<script>` tag into the page with the desired url or content.
-
-#### frame.addStyleTag(options)
-- `options` <[Object]>
-  - `url` <[string]> URL of the `<link>` tag.
-  - `path` <[string]> Path to the CSS file to be injected into frame. If `path` is a relative path, then it is resolved relative to [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-  - `content` <[string]> Raw CSS content to be injected into frame.
-- returns: <[Promise]<[ElementHandle]>> which resolves to the added tag when the stylesheet's onload fires or when the CSS content was injected into frame.
-
-Adds a `<link rel="stylesheet">` tag into the page with the desired url or a `<style type="text/css">` tag with the content.
-
-#### frame.childFrames()
-- returns: <[Array]<[Frame]>>
-
-#### frame.click(selector[, options])
-- `selector` <[string]> A [selector] to search for element to click. If there are multiple elements satisfying the selector, the first will be clicked.
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-  - `delay` <[number]> Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully clicked. The Promise will be rejected if there is no element matching `selector`.
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.mouse](#pagemouse) to click in the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-Bear in mind that if `click()` triggers a navigation event and there's a separate `page.waitForNavigation()` promise to be resolved, you may end up with a race condition that yields unexpected results. The correct pattern for click and wait for navigation is the following:
-
-```javascript
-const [response] = await Promise.all([
-  page.waitForNavigation(waitOptions),
-  frame.click(selector, clickOptions),
-]);
-```
-
-#### frame.content()
-- returns: <[Promise]<[string]>>
-
-Gets the full HTML contents of the frame, including the doctype.
-
-#### frame.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to  `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-If the function passed to the `frame.evaluate` returns a [Promise], then `frame.evaluate` would wait for the promise to resolve and return its value.
-
-If the function passed to the `frame.evaluate` returns a non-[Serializable] value, then `frame.evaluate` resolves to `undefined`. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`, and bigint literals.
-
-```js
-const result = await frame.evaluate(() => {
-  return Promise.resolve(8 * 7);
-});
-console.log(result); // prints "56"
-```
-
-A string can also be passed in instead of a function.
-
-```js
-console.log(await frame.evaluate('1 + 2')); // prints "3"
-```
-
-[ElementHandle] instances can be passed as arguments to the `frame.evaluate`:
-```js
-const bodyHandle = await frame.$('body');
-const html = await frame.evaluate(body => body.innerHTML, bodyHandle);
-await bodyHandle.dispose();
-```
-
-#### frame.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the page context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-The only difference between `frame.evaluate` and `frame.evaluateHandle` is that `frame.evaluateHandle` returns in-page object (JSHandle).
-
-If the function, passed to the `frame.evaluateHandle`, returns a [Promise], then `frame.evaluateHandle` would wait for the promise to resolve and return its value.
-
-If the function returns an element, the returned handle is an [ElementHandle].
-
-```js
-const aWindowHandle = await frame.evaluateHandle(() => Promise.resolve(window));
-aWindowHandle; // Handle for the window object.
-```
-
-A string can also be passed in instead of a function.
-
-```js
-const aHandle = await frame.evaluateHandle('document'); // Handle for the 'document'.
-```
-
-[JSHandle] instances can be passed as arguments to the `frame.evaluateHandle`:
-```js
-const aHandle = await frame.evaluateHandle(() => document.body);
-const resultHandle = await frame.evaluateHandle(body => body.innerHTML, aHandle);
-console.log(await resultHandle.jsonValue());
-await resultHandle.dispose();
-```
-
-
-#### frame.executionContext()
-- returns: <[Promise]<[ExecutionContext]>>
-
-Returns promise that resolves to the frame's default execution context.
-
-#### frame.focus(selector)
-- `selector` <[string]> A [selector] of an element to focus. If there are multiple elements satisfying the selector, the first will be focused.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully focused. The promise will be rejected if there is no element matching `selector`.
-
-This method fetches an element with `selector` and focuses it.
-If there's no element matching `selector`, the method throws an error.
-
-#### frame.goto(url[, options])
-- `url` <[string]> URL to navigate frame to. The url should include scheme, e.g. `https://`.
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-  - `referer` <[string]> Referer header value. If provided it will take preference over the referer header value set by [page.setExtraHTTPHeaders()](#pagesetextrahttpheadersheaders).
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect.
-
-`frame.goto` will throw an error if:
-- there's an SSL error (e.g. in case of self-signed certificates).
-- target URL is invalid.
-- the `timeout` is exceeded during navigation.
-- the remote server does not respond or is unreachable.
-- the main resource failed to load.
-
-`frame.goto` will not throw an error when any valid HTTP status code is returned by the remote server, including 404 "Not Found" and 500 "Internal Server Error".  The status code for such responses can be retrieved by calling [response.status()](#responsestatus).
-
-> **NOTE** `frame.goto` either throws an error or returns a main resource response. The only exceptions are navigation to `about:blank` or navigation to the same URL with a different hash, which would succeed and return `null`.
-
-> **NOTE** Headless mode doesn't support navigation to a PDF document. See the [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
-
-
-#### frame.hover(selector)
-- `selector` <[string]> A [selector] to search for element to hover. If there are multiple elements satisfying the selector, the first will be hovered.
-- returns: <[Promise]> Promise which resolves when the element matching `selector` is successfully hovered. Promise gets rejected if there's no element matching `selector`.
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.mouse](#pagemouse) to hover over the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-#### frame.isDetached()
-- returns: <[boolean]>
-
-Returns `true` if the frame has been detached, or `false` otherwise.
-
-#### frame.name()
-- returns: <[string]>
-
-Returns frame's name attribute as specified in the tag.
-
-If the name is empty, returns the id attribute instead.
-
-> **NOTE** This value is calculated once when the frame is created, and will not update if the attribute is changed later.
-
-#### frame.parentFrame()
-- returns: <?[Frame]> Parent frame, if any. Detached frames and main frames return `null`.
-
-#### frame.select(selector, ...values)
-- `selector` <[string]> A [selector] to query frame for
-- `...values` <...[string]> Values of options to select. If the `<select>` has the `multiple` attribute, all values are considered, otherwise only the first one is taken into account.
-- returns: <[Promise]<[Array]<[string]>>> An array of option values that have been successfully selected.
-
-Triggers a `change` and `input` event once all the provided options have been selected.
-If there's no `<select>` element matching `selector`, the method throws an error.
-
-```js
-frame.select('select#colors', 'blue'); // single selection
-frame.select('select#colors', 'red', 'green', 'blue'); // multiple selections
-```
-
-#### frame.setContent(html[, options])
-- `html` <[string]> HTML markup to assign to the page.
-- `options` <[Object]> Parameters which might have the following properties:
-  - `timeout` <[number]> Maximum time in milliseconds for resources to load, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider setting markup succeeded, defaults to `load`. Given an array of event strings, setting content is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider setting content to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider setting content to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider setting content to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider setting content to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]>
-
-#### frame.tap(selector)
-- `selector` <[string]> A [selector] to search for element to tap. If there are multiple elements satisfying the selector, the first will be tapped.
-- returns: <[Promise]>
-
-This method fetches an element with `selector`, scrolls it into view if needed, and then uses [page.touchscreen](#pagetouchscreen) to tap in the center of the element.
-If there's no element matching `selector`, the method throws an error.
-
-#### frame.title()
-- returns: <[Promise]<[string]>> The page's title.
-
-#### frame.type(selector, text[, options])
-- `selector` <[string]> A [selector] of an element to type into. If there are multiple elements satisfying the selector, the first will be used.
-- `text` <[string]> A text to type into a focused element.
-- `options` <[Object]>
-  - `delay` <[number]> Time to wait between key presses in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.
-
-To press a special key, like `Control` or `ArrowDown`, use [`keyboard.press`](#keyboardpresskey-options).
-
-```js
-await frame.type('#mytextarea', 'Hello'); // Types instantly
-await frame.type('#mytextarea', 'World', {delay: 100}); // Types slower, like a user
-```
-
-#### frame.url()
-- returns: <[string]>
-
-Returns frame's url.
-
-#### frame.waitFor(selectorOrFunctionOrTimeout[, options[, ...args]])
-- `selectorOrFunctionOrTimeout` <[string]|[number]|[function]> A [selector], predicate or timeout to wait for
-- `options` <[Object]> Optional waiting parameters
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to  `pageFunction`
-- returns: <[Promise]<[JSHandle]>> Promise which resolves to a JSHandle of the success value
-
-This method behaves differently with respect to the type of the first parameter:
-- if `selectorOrFunctionOrTimeout` is a `string`, then the first argument is treated as a [selector] or [xpath], depending on whether or not it starts with '//', and the method is a shortcut for
-  [frame.waitForSelector](#framewaitforselectorselector-options) or [frame.waitForXPath](#framewaitforxpathxpath-options)
-- if `selectorOrFunctionOrTimeout` is a `function`, then the first argument is treated as a predicate to wait for and the method is a shortcut for [frame.waitForFunction()](#framewaitforfunctionpagefunction-options-args).
-- if `selectorOrFunctionOrTimeout` is a `number`, then the first argument is treated as a timeout in milliseconds and the method returns a promise which resolves after the timeout
-- otherwise, an exception is thrown
-
-```js
-// wait for selector
-await page.waitFor('.foo');
-// wait for 1 second
-await page.waitFor(1000);
-// wait for predicate
-await page.waitFor(() => !!document.querySelector('.foo'));
-```
-
-To pass arguments from node.js to the predicate of `page.waitFor` function:
-
-```js
-const selector = '.foo';
-await page.waitFor(selector => !!document.querySelector(selector), {}, selector);
-```
-
-#### frame.waitForFunction(pageFunction[, options[, ...args]])
-- `pageFunction` <[function]|[string]> Function to be evaluated in browser context
-- `options` <[Object]> Optional waiting parameters
-  - `polling` <[string]|[number]> An interval at which the `pageFunction` is executed, defaults to `raf`. If `polling` is a number, then it is treated as an interval in milliseconds at which the function would be executed. If `polling` is a string, then it can be one of the following values:
-    - `raf` - to constantly execute `pageFunction` in `requestAnimationFrame` callback. This is the tightest polling mode which is suitable to observe styling changes.
-    - `mutation` - to execute `pageFunction` on every DOM mutation.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to  `pageFunction`
-- returns: <[Promise]<[JSHandle]>> Promise which resolves when the `pageFunction` returns a truthy value. It resolves to a JSHandle of the truthy value.
-
-The `waitForFunction` can be used to observe viewport size change:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  const watchDog = page.mainFrame().waitForFunction('window.innerWidth < 100');
-  page.setViewport({width: 50, height: 50});
-  await watchDog;
-  await browser.close();
-})();
-```
-
-To pass arguments from node.js to the predicate of `page.waitForFunction` function:
-
-```js
-const selector = '.foo';
-await page.waitForFunction(selector => !!document.querySelector(selector), {}, selector);
-```
-
-#### frame.waitForNavigation([options])
-- `options` <[Object]> Navigation parameters which might have the following properties:
-  - `timeout` <[number]> Maximum navigation time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultNavigationTimeout(timeout)](#pagesetdefaultnavigationtimeouttimeout) or [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) methods.
-  - `waitUntil` <"load"|"domcontentloaded"|"networkidle0"|"networkidle2"|Array<PuppeteerLifeCycleMethod>> When to consider navigation succeeded, defaults to `load`. Given an array of event strings, navigation is considered to be successful after all events have been fired. Events can be either:
-    - `load` - consider navigation to be finished when the `load` event is fired.
-    - `domcontentloaded` - consider navigation to be finished when the `DOMContentLoaded` event is fired.
-    - `networkidle0` - consider navigation to be finished when there are no more than 0 network connections for at least `500` ms.
-    - `networkidle2` - consider navigation to be finished when there are no more than 2 network connections for at least `500` ms.
-- returns: <[Promise]<?[HTTPResponse]>> Promise which resolves to the main resource response. In case of multiple redirects, the navigation will resolve with the response of the last redirect. In case of navigation to a different anchor or navigation due to History API usage, the navigation will resolve with `null`.
-
-This resolves when the frame navigates to a new URL. It is useful for when you run code
-which will indirectly cause the frame to navigate. Consider this example:
-
-```js
-const [response] = await Promise.all([
-  frame.waitForNavigation(), // The navigation promise resolves after navigation has finished
-  frame.click('a.my-link'), // Clicking the link will indirectly cause a navigation
-]);
-```
-
-**NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL is considered a navigation.
-
-
-#### frame.waitForSelector(selector[, options])
-- `selector` <[string]> A [selector] of an element to wait for
-- `options` <[Object]> Optional waiting parameters
-  - `visible` <[boolean]> wait for element to be present in DOM and to be visible, i.e. to not have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `hidden` <[boolean]> wait for element to not be found in the DOM or to be hidden, i.e. have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<?[ElementHandle]>> Promise which resolves when element specified by selector string is added to DOM. Resolves to `null` if waiting for `hidden: true` and selector is not found in DOM.
-
-Wait for the `selector` to appear in page. If at the moment of calling
-the method the `selector` already exists, the method will return
-immediately. If the selector doesn't appear after the `timeout` milliseconds of waiting, the function will throw.
-
-This method works across navigations:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  let currentURL;
-  page.mainFrame()
-    .waitForSelector('img')
-    .then(() => console.log('First URL with image: ' + currentURL));
-  for (currentURL of ['https://example.com', 'https://google.com', 'https://bbc.com']) {
-    await page.goto(currentURL);
-  }
-  await browser.close();
-})();
-```
-
-#### frame.waitForXPath(xpath[, options])
-- `xpath` <[string]> A [xpath] of an element to wait for
-- `options` <[Object]> Optional waiting parameters
-  - `visible` <[boolean]> wait for element to be present in DOM and to be visible, i.e. to not have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `hidden` <[boolean]> wait for element to not be found in the DOM or to be hidden, i.e. have `display: none` or `visibility: hidden` CSS properties. Defaults to `false`.
-  - `timeout` <[number]> maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The default value can be changed by using the [page.setDefaultTimeout(timeout)](#pagesetdefaulttimeouttimeout) method.
-- returns: <[Promise]<?[ElementHandle]>> Promise which resolves when element specified by xpath string is added to DOM. Resolves to `null` if waiting for `hidden: true` and xpath is not found in DOM.
-
-Wait for the `xpath` to appear in page. If at the moment of calling
-the method the `xpath` already exists, the method will return
-immediately. If the xpath doesn't appear after the `timeout` milliseconds of waiting, the function will throw.
-
-This method works across navigations:
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  let currentURL;
-  page.mainFrame()
-    .waitForXPath('//img')
-    .then(() => console.log('First URL with image: ' + currentURL));
-  for (currentURL of ['https://example.com', 'https://google.com', 'https://bbc.com']) {
-    await page.goto(currentURL);
-  }
-  await browser.close();
-})();
-```
-
-### class: ExecutionContext
-
-The class represents a context for JavaScript execution. A [Page] might have many execution contexts:
-- each [frame](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) has "default" execution context that is
-  always created after frame is attached to DOM. This context is returned by the [`frame.executionContext()`](#frameexecutioncontext) method.
-- [Extensions](https://developer.chrome.com/extensions)'s content scripts create additional execution contexts.
-
-Besides pages, execution contexts can be found in [workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
-
-#### executionContext.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in `executionContext`
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-If the function passed to the `executionContext.evaluate` returns a [Promise], then `executionContext.evaluate` would wait for the promise to resolve and return its value.
-
-If the function passed to the `executionContext.evaluate` returns a non-[Serializable] value, then `executionContext.evaluate` resolves to `undefined`. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`, and bigint literals.
-
-```js
-const executionContext = await page.mainFrame().executionContext();
-const result = await executionContext.evaluate(() => Promise.resolve(8 * 7));
-console.log(result); // prints "56"
-```
-
-A string can also be passed in instead of a function.
-
-```js
-console.log(await executionContext.evaluate('1 + 2')); // prints "3"
-```
-
-[JSHandle] instances can be passed as arguments to the `executionContext.evaluate`:
-```js
-const oneHandle = await executionContext.evaluateHandle(() => 1);
-const twoHandle = await executionContext.evaluateHandle(() => 2);
-const result = await executionContext.evaluate((a, b) => a + b, oneHandle, twoHandle);
-await oneHandle.dispose();
-await twoHandle.dispose();
-console.log(result); // prints '3'.
-```
-
-#### executionContext.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated in the `executionContext`
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-The only difference between `executionContext.evaluate` and `executionContext.evaluateHandle` is that `executionContext.evaluateHandle` returns in-page object (JSHandle).
-
-If the function returns an element, the returned handle is an [ElementHandle].
-
-If the function passed to the `executionContext.evaluateHandle` returns a [Promise], then `executionContext.evaluateHandle` would wait for the promise to resolve and return its value.
-
-```js
-const context = await page.mainFrame().executionContext();
-const aHandle = await context.evaluateHandle(() => Promise.resolve(self));
-aHandle; // Handle for the global object.
-```
-
-A string can also be passed in instead of a function.
-
-```js
-const aHandle = await context.evaluateHandle('1 + 2'); // Handle for the '3' object.
-```
-
-[JSHandle] instances can be passed as arguments to the `executionContext.evaluateHandle`:
-```js
-const aHandle = await context.evaluateHandle(() => document.body);
-const resultHandle = await context.evaluateHandle(body => body.innerHTML, aHandle);
-console.log(await resultHandle.jsonValue()); // prints body's innerHTML
-await aHandle.dispose();
-await resultHandle.dispose();
-```
-
-#### executionContext.frame()
-- returns: <?[Frame]> Frame associated with this execution context.
-
-> **NOTE** Not every execution context is associated with a frame. For example, workers and extensions have execution contexts that are not associated with frames.
-
-
-#### executionContext.queryObjects(prototypeHandle)
-- `prototypeHandle` <[JSHandle]> A handle to the object prototype.
-- returns: <[Promise]<[JSHandle]>> A handle to an array of objects with this prototype
-
-The method iterates the JavaScript heap and finds all the objects with the given prototype.
-
-```js
-// Create a Map object
-await page.evaluate(() => window.map = new Map());
-// Get a handle to the Map object prototype
-const mapPrototype = await page.evaluateHandle(() => Map.prototype);
-// Query all map instances into an array
-const mapInstances = await page.queryObjects(mapPrototype);
-// Count amount of map objects in heap
-const count = await page.evaluate(maps => maps.length, mapInstances);
-await mapInstances.dispose();
-await mapPrototype.dispose();
-```
-
-### class: JSHandle
-
-JSHandle represents an in-page JavaScript object. JSHandles can be created with the [page.evaluateHandle](#pageevaluatehandlepagefunction-args) method.
-
-```js
-const windowHandle = await page.evaluateHandle(() => window);
-// ...
-```
-
-JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is [disposed](#jshandledispose). JSHandles are auto-disposed when their origin frame gets navigated or the parent context gets destroyed.
-
-JSHandle instances can be used as arguments in [`page.$eval()`](#pageevalselector-pagefunction-args), [`page.evaluate()`](#pageevaluatepagefunction-args) and [`page.evaluateHandle`](#pageevaluatehandlepagefunction-args) methods.
-
-#### jsHandle.asElement()
-- returns: <?[ElementHandle]>
-
-Returns either `null` or the object handle itself, if the object handle is an instance of [ElementHandle].
-
-#### jsHandle.dispose()
-- returns: <[Promise]> Promise which resolves when the object handle is successfully disposed.
-
-The `jsHandle.dispose` method stops referencing the element handle.
-
-#### jsHandle.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]\([Object]\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method passes this handle as the first argument to `pageFunction`.
-
-If `pageFunction` returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const tweetHandle = await page.$('.tweet .retweets');
-expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10');
-```
-
-#### jsHandle.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-This method passes this handle as the first argument to `pageFunction`.
-
-The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `executionContext.evaluateHandle` returns in-page object (JSHandle).
-
-If the function returns an element, the returned handle is an [ElementHandle].
-
-If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would wait for the promise to resolve and return its value.
-
-See [Page.evaluateHandle](#pageevaluatehandlepagefunction-args) for more details.
-
-#### jsHandle.executionContext()
-- returns: <[ExecutionContext]>
-
-Returns execution context the handle belongs to.
-
-#### jsHandle.getProperties()
-- returns: <[Promise]<[Map]<[string], [JSHandle]>>>
-
-The method returns a map with property names as keys and JSHandle instances for the property values.
-
-```js
-const handle = await page.evaluateHandle(() => ({window, document}));
-const properties = await handle.getProperties();
-const windowHandle = properties.get('window');
-const documentHandle = properties.get('document');
-await handle.dispose();
-```
-
-#### jsHandle.getProperty(propertyName)
-- `propertyName` <[string]> property to get
-- returns: <[Promise]<[JSHandle]>>
-
-Fetches a single property from the referenced object.
-
-#### jsHandle.jsonValue()
-- returns: <[Promise]<[Object]>>
-
-Returns a JSON representation of the object. If the object has a
-[`toJSON`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#toJSON()_behavior)
-function, it **will not be called**.
-
-> **NOTE** The method will return an empty JSON object if the referenced object is not stringifiable. It will throw an error if the object has circular references.
-
-### class: ElementHandle
-* extends: [JSHandle]
-
-ElementHandle represents an in-page DOM element. ElementHandles can be created with the [page.$](#pageselector) method.
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://example.com');
-  const hrefElement = await page.$('a');
-  await hrefElement.click();
-  // ...
-})();
-```
-
-ElementHandle prevents DOM element from garbage collection unless the handle is [disposed](#elementhandledispose). ElementHandles are auto-disposed when their origin frame gets navigated.
-
-ElementHandle instances can be used as arguments in [`page.$eval()`](#pageevalselector-pagefunction-args) and [`page.evaluate()`](#pageevaluatepagefunction-args) methods.
-
-#### elementHandle.$(selector)
-- `selector` <[string]> A [selector] to query element for
-- returns: <[Promise]<?[ElementHandle]>>
-
-The method runs `element.querySelector` within the page. If no element matches the selector, the return value resolves to `null`.
-
-#### elementHandle.$$(selector)
-- `selector` <[string]> A [selector] to query element for
-- returns: <[Promise]<[Array]<[ElementHandle]>>>
-
-The method runs `element.querySelectorAll` within the page. If no elements match the selector, the return value resolves to `[]`.
-
-#### elementHandle.$$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query page for
-- `pageFunction` <[function]\([Array]<[Element]>\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `document.querySelectorAll` within the element and passes it as the first argument to `pageFunction`. If there's no element matching `selector`, the method throws an error.
-
-If `pageFunction` returns a [Promise], then `frame.$$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```html
-<div class="feed">
-  <div class="tweet">Hello!</div>
-  <div class="tweet">Hi!</div>
-</div>
-```
-```js
-const feedHandle = await page.$('.feed');
-expect(await feedHandle.$$eval('.tweet', nodes => nodes.map(n => n.innerText))).toEqual(['Hello!', 'Hi!']);
-```
-
-#### elementHandle.$eval(selector, pageFunction[, ...args])
-- `selector` <[string]> A [selector] to query page for
-- `pageFunction` <[function]\([Element]\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method runs `document.querySelector` within the element and passes it as the first argument to `pageFunction`. If there's no element matching `selector`, the method throws an error.
-
-If `pageFunction` returns a [Promise], then `frame.$eval` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const tweetHandle = await page.$('.tweet');
-expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
-expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
-```
-
-#### elementHandle.$x(expression)
-- `expression` <[string]> Expression to [evaluate](https://developer.mozilla.org/en-US/docs/Web/API/Document/evaluate).
-- returns: <[Promise]<[Array]<[ElementHandle]>>>
-
-The method evaluates the XPath expression relative to the elementHandle. If there are no such elements, the method will resolve to an empty array.
-
-#### elementHandle.asElement()
-- returns: <[ElementHandle]>
-
-#### elementHandle.boundingBox()
-- returns: <[Promise]<?[Object]>>
-  - x <[number]> the x coordinate of the element in pixels.
-  - y <[number]> the y coordinate of the element in pixels.
-  - width <[number]> the width of the element in pixels.
-  - height <[number]> the height of the element in pixels.
-
-This method returns the bounding box of the element (relative to the main frame), or `null` if the element is not visible.
-
-#### elementHandle.boxModel()
-- returns: <[Promise]<?[Object]>>
-  - content <[Array]<[Object]>> Content box.
-    - x <[number]>
-    - y <[number]>
-  - padding <[Array]<[Object]>> Padding box.
-    - x <[number]>
-    - y <[number]>
-  - border <[Array]<[Object]>> Border box.
-    - x <[number]>
-    - y <[number]>
-  - margin <[Array]<[Object]>> Margin box.
-    - x <[number]>
-    - y <[number]>
-  - width <[number]> Element's width.
-  - height <[number]> Element's height.
-
-This method returns boxes of the element, or `null` if the element is not visible. Boxes are represented as an array of points; each Point is an object `{x, y}`. Box points are sorted clock-wise.
-
-#### elementHandle.click([options])
-- `options` <[Object]>
-  - `button` <"left"|"right"|"middle"> Defaults to `left`.
-  - `clickCount` <[number]> defaults to 1. See [UIEvent.detail].
-  - `delay` <[number]> Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
-- returns: <[Promise]> Promise which resolves when the element is successfully clicked. Promise gets rejected if the element is detached from DOM.
-
-This method scrolls element into view if needed, and then uses [page.mouse](#pagemouse) to click in the center of the element.
-If the element is detached from DOM, the method throws an error.
-
-#### elementHandle.contentFrame()
-- returns: <[Promise]<?[Frame]>> Resolves to the content frame for element handles referencing iframe nodes, or null otherwise
-
-#### elementHandle.dispose()
-- returns: <[Promise]> Promise which resolves when the element handle is successfully disposed.
-
-The `elementHandle.dispose` method stops referencing the element handle.
-
-#### elementHandle.evaluate(pageFunction[, ...args])
-- `pageFunction` <[function]\([Object]\)> Function to be evaluated in browser context
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[Serializable]>> Promise which resolves to the return value of `pageFunction`
-
-This method passes this handle as the first argument to `pageFunction`.
-
-If `pageFunction` returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
-
-Examples:
-```js
-const tweetHandle = await page.$('.tweet .retweets');
-expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10');
-```
-
-#### elementHandle.evaluateHandle(pageFunction[, ...args])
-- `pageFunction` <[function]|[string]> Function to be evaluated
-- `...args` <...[Serializable]|[JSHandle]> Arguments to pass to `pageFunction`
-- returns: <[Promise]<[JSHandle]|[ElementHandle]>> Promise which resolves to the return value of `pageFunction` as an in-page object.
-
-This method passes this handle as the first argument to `pageFunction`.
-
-The only difference between `evaluateHandle.evaluate` and `evaluateHandle.evaluateHandle` is that `executionContext.evaluateHandle` returns in-page object (JSHandle).
-
-If the function returns an element, the returned handle is an [ElementHandle].
-
-If the function passed to the `evaluateHandle.evaluateHandle` returns a [Promise], then `evaluateHandle.evaluateHandle` would wait for the promise to resolve and return its value.
-
-See [Page.evaluateHandle](#pageevaluatehandlepagefunction-args) for more details.
-
-#### elementHandle.executionContext()
-- returns: <[ExecutionContext]>
-
-#### elementHandle.focus()
-- returns: <[Promise]>
-
-Calls [focus](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus) on the element.
-
-#### elementHandle.getProperties()
-- returns: <[Promise]<[Map]<[string], [JSHandle]>>>
-
-The method returns a map with property names as keys and JSHandle instances for the property values.
-
-```js
-const listHandle = await page.evaluateHandle(() => document.body.children);
-const properties = await listHandle.getProperties();
-const children = [];
-for (const property of properties.values()) {
-  const element = property.asElement();
-  if (element)
-    children.push(element);
-}
-children; // holds elementHandles to all children of document.body
-```
-
-#### elementHandle.getProperty(propertyName)
-- `propertyName` <[string]> property to get
-- returns: <[Promise]<[JSHandle]>>
-
-Fetches a single property from the objectHandle.
-
-#### elementHandle.hover()
-- returns: <[Promise]> Promise which resolves when the element is successfully hovered.
-
-This method scrolls element into view if needed, and then uses [page.mouse](#pagemouse) to hover over the center of the element.
-If the element is detached from DOM, the method throws an error.
-
-#### elementHandle.isIntersectingViewport()
-- returns: <[Promise]<[boolean]>> Resolves to true if the element is visible in the current viewport.
-
-#### elementHandle.jsonValue()
-- returns: <[Promise]<[Object]>>
-
-Returns a JSON representation of the object. The JSON is generated by running [`JSON.stringify`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify) on the object in page and consequent [`JSON.parse`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) in puppeteer.
-
-> **NOTE** The method will throw if the referenced object is not stringifiable.
-
-#### elementHandle.press(key[, options])
-- `key` <[string]> Name of key to press, such as `ArrowLeft`. See [USKeyboardLayout] for a list of all key names.
-- `options` <[Object]>
-  - `text` <[string]> If specified, generates an input event with this text.
-  - `delay` <[number]> Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Focuses the element, and then uses [`keyboard.down`](#keyboarddownkey-options) and [`keyboard.up`](#keyboardupkey).
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`/`input` event will also be generated. The `text` option can be specified to force an input event to be generated.
-
-> **NOTE** Modifier keys DO affect `elementHandle.press`. Holding down `Shift` will type the text in upper case.
-
-#### elementHandle.screenshot([options])
-- `options` <[Object]> Same options as in [page.screenshot](#pagescreenshotoptions).
-- returns: <[Promise]<[string]|[Buffer]>> Promise which resolves to buffer or a base64 string (depending on the value of `options.encoding`) with captured screenshot.
-
-This method scrolls element into view if needed, and then uses [page.screenshot](#pagescreenshotoptions) to take a screenshot of the element.
-If the element is detached from DOM, the method throws an error.
-
-#### elementHandle.select(...values)
-- `...values` <...[string]> Values of options to select. If the `<select>` has the `multiple` attribute, all values are considered, otherwise only the first one is taken into account.
-- returns: <[Promise]<[Array]<[string]>>> An array of option values that have been successfully selected.
-
-Triggers a `change` and `input` event once all the provided options have been selected.
-If there's no `<select>` element matching `selector`, the method throws an error.
-
-```js
-handle.select('blue'); // single selection
-handle.select('red', 'green', 'blue'); // multiple selections
-```
-
-#### elementHandle.tap()
-- returns: <[Promise]> Promise which resolves when the element is successfully tapped. Promise gets rejected if the element is detached from DOM.
-
-This method scrolls element into view if needed, and then uses [touchscreen.tap](#touchscreentapx-y) to tap in the center of the element.
-If the element is detached from DOM, the method throws an error.
-
-#### elementHandle.toString()
-- returns: <[string]>
-
-#### elementHandle.type(text[, options])
-- `text` <[string]> A text to type into a focused element.
-- `options` <[Object]>
-  - `delay` <[number]> Time to wait between key presses in milliseconds. Defaults to 0.
-- returns: <[Promise]>
-
-Focuses the element, and then sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.
-
-To press a special key, like `Control` or `ArrowDown`, use [`elementHandle.press`](#elementhandlepresskey-options).
-
-```js
-await elementHandle.type('Hello'); // Types instantly
-await elementHandle.type('World', {delay: 100}); // Types slower, like a user
-```
-
-An example of typing into a text field and then submitting the form:
-```js
-const elementHandle = await page.$('input');
-await elementHandle.type('some text');
-await elementHandle.press('Enter');
-```
-
-#### elementHandle.uploadFile(...filePaths)
-- `...filePaths` <...[string]> Sets the value of the file input to these paths. If some of the  `filePaths` are relative paths, then they are resolved relative to the [current working directory](https://nodejs.org/api/process.html#process_process_cwd).
-- returns: <[Promise]>
-
-This method expects `elementHandle` to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input).
-
-### class: HTTPRequest
-
-Whenever the page sends a request, such as for a network resource, the following events are emitted by puppeteer's page:
-- [`'request'`](#event-request) emitted when the request is issued by the page.
-- [`'response'`](#event-response) emitted when/if the response is received for the request.
-- [`'requestfinished'`](#event-requestfinished) emitted when the response body is downloaded and the request is complete.
-
-If request fails at some point, then instead of `'requestfinished'` event (and possibly instead of 'response' event), the  [`'requestfailed'`](#event-requestfailed) event is emitted.
-
-> **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete with `'requestfinished'` event.
-
-If request gets a 'redirect' response, the request is successfully finished with the 'requestfinished' event, and a new request is  issued to a redirected url.
-
-#### httpRequest.abort([errorCode])
-- `errorCode` <[string]> Optional error code. Defaults to `failed`, could be
-  one of the following:
-  - `aborted` - An operation was aborted (due to user action)
-  - `accessdenied` - Permission to access a resource, other than the network, was denied
-  - `addressunreachable` - The IP address is unreachable. This usually means
-    that there is no route to the specified host or network.
-  - `blockedbyclient` - The client chose to block the request.
-  - `blockedbyresponse` - The request failed because the response was delivered along with requirements which are not met ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).
-  - `connectionaborted` - A connection timed out as a result of not receiving an ACK for data sent.
-  - `connectionclosed` - A connection was closed (corresponding to a TCP FIN).
-  - `connectionfailed` - A connection attempt failed.
-  - `connectionrefused` - A connection attempt was refused.
-  - `connectionreset` - A connection was reset (corresponding to a TCP RST).
-  - `internetdisconnected` - The Internet connection has been lost.
-  - `namenotresolved` - The host name could not be resolved.
-  - `timedout` - An operation timed out.
-  - `failed` - A generic failure occurred.
-- returns: <[Promise]>
-
-Aborts request. To use this, request interception should be enabled with `page.setRequestInterception`.
-Exception is immediately thrown if the request interception is not enabled.
-
-#### httpRequest.continue([overrides])
-- `overrides` <[Object]> Optional request overwrites, which can be one of the following:
-  - `url` <[string]> If set, the request url will be changed. This is not a redirect. The request will be silently forwarded to the new url. For example, the address bar will show the original url.
-  - `method` <[string]> If set changes the request method (e.g. `GET` or `POST`)
-  - `postData` <[string]> If set changes the post data of request
-  - `headers` <[Object]> If set changes the request HTTP headers. Header values will be converted to a string.
-- returns: <[Promise]>
-
-Continues request with optional request overrides. To use this, request interception should be enabled with `page.setRequestInterception`.
-Exception is immediately thrown if the request interception is not enabled.
-
-```js
-await page.setRequestInterception(true);
-page.on('request', request => {
-  // Override headers
-  const headers = Object.assign({}, request.headers(), {
-    foo: 'bar', // set "foo" header
-    origin: undefined, // remove "origin" header
-  });
-  request.continue({headers});
-});
-```
-
-#### httpRequest.failure()
-- returns: <?[Object]> Object describing request failure, if any
-  - `errorText` <[string]> Human-readable error message, e.g. `'net::ERR_FAILED'`.
-
-The method returns `null` unless this request was failed, as reported by
-`requestfailed` event.
-
-Example of logging all failed requests:
-
-```js
-page.on('requestfailed', request => {
-  console.log(request.url() + ' ' + request.failure().errorText);
-});
-```
-
-#### httpRequest.frame()
-- returns: <?[Frame]> A [Frame] that initiated this request, or `null` if navigating to error pages.
-
-#### httpRequest.headers()
-- returns: <[Object]> An object with HTTP headers associated with the request. All header names are lower-case.
-
-#### httpRequest.isNavigationRequest()
-- returns: <[boolean]>
-
-Whether this request is driving frame's navigation.
-
-#### httpRequest.method()
-- returns: <[string]> Request's method (GET, POST, etc.)
-
-#### httpRequest.postData()
-- returns: <[string]> Request's post body, if any.
-
-#### httpRequest.redirectChain()
-- returns: <[Array]<[HTTPRequest]>>
-
-A `redirectChain` is a chain of requests initiated to fetch a resource.
-- If there are no redirects and the request was successful, the chain will be empty.
-- If a server responds with at least a single redirect, then the chain will
-contain all the requests that were redirected.
-
-`redirectChain` is shared between all the requests of the same chain.
-
-For example, if the website `http://example.com` has a single redirect to
-`https://example.com`, then the chain will contain one request:
-
-```js
-const response = await page.goto('http://example.com');
-const chain = response.request().redirectChain();
-console.log(chain.length); // 1
-console.log(chain[0].url()); // 'http://example.com'
-```
-
-If the website `https://google.com` has no redirects, then the chain will be empty:
-```js
-const response = await page.goto('https://google.com');
-const chain = response.request().redirectChain();
-console.log(chain.length); // 0
-```
-
-#### httpRequest.resourceType()
-- returns: <[string]>
-
-Contains the request's resource type as it was perceived by the rendering engine.
-ResourceType will be one of the following: `document`, `stylesheet`, `image`, `media`, `font`, `script`, `texttrack`, `xhr`, `fetch`, `eventsource`, `websocket`, `manifest`, `other`.
-
-#### httpRequest.respond(response)
-- `response` <[Object]> Response that will fulfill this request
-  - `status` <[number]> Response status code, defaults to `200`.
-  - `headers` <[Object]> Optional response headers. Header values will be converted to a string.
-  - `contentType` <[string]> If set, equals to setting `Content-Type` response header
-  - `body` <[string]|[Buffer]> Optional response body
-- returns: <[Promise]>
-
-Fulfills request with given response. To use this, request interception should
-be enabled with `page.setRequestInterception`. Exception is thrown if
-request interception is not enabled.
-
-An example of fulfilling all requests with 404 responses:
-
-```js
-await page.setRequestInterception(true);
-page.on('request', request => {
-  request.respond({
-    status: 404,
-    contentType: 'text/plain',
-    body: 'Not Found!'
-  });
-});
-```
-
-> **NOTE** Mocking responses for dataURL requests is not supported.
-> Calling `request.respond` for a dataURL request is a noop.
-
-#### httpRequest.response()
-- returns: <?[HTTPResponse]> A matching [HTTPResponse] object, or `null` if the response has not been received yet.
-
-#### httpRequest.url()
-- returns: <[string]> URL of the request.
-
-### class: HTTPResponse
-
-[HTTPResponse] class represents responses which are received by page.
-
-#### httpResponse.buffer()
-- returns: <Promise<[Buffer]>> Promise which resolves to a buffer with response body.
-
-#### httpResponse.frame()
-- returns: <?[Frame]> A [Frame] that initiated this response, or `null` if navigating to error pages.
-
-#### httpResponse.fromCache()
-- returns: <[boolean]>
-
-True if the response was served from either the browser's disk cache or memory cache.
-
-#### httpResponse.fromServiceWorker()
-- returns: <[boolean]>
-
-True if the response was served by a service worker.
-
-#### httpResponse.headers()
-- returns: <[Object]> An object with HTTP headers associated with the response. All header names are lower-case.
-
-#### httpResponse.json()
-- returns: <Promise<[Object]>> Promise which resolves to a JSON representation of response body.
-
-This method will throw if the response body is not parsable via `JSON.parse`.
-
-#### httpResponse.ok()
-- returns: <[boolean]>
-
-Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-
-#### httpResponse.remoteAddress()
-- returns: <[Object]>
-  - `ip` <[string]> the IP address of the remote server
-  - `port` <[number]> the port used to connect to the remote server
-
-#### httpResponse.request()
-- returns: <[HTTPRequest]> A matching [HTTPRequest] object.
-
-#### httpResponse.securityDetails()
-- returns: <?[SecurityDetails]> Security details if the response was received over the secure connection, or `null` otherwise.
-
-#### httpResponse.status()
-- returns: <[number]>
-
-Contains the status code of the response (e.g., 200 for a success).
-
-#### httpResponse.statusText()
-- returns: <[string]>
-
-Contains the status text of the response (e.g. usually an "OK" for a success).
-
-#### httpResponse.text()
-- returns: <[Promise]<[string]>> Promise which resolves to a text representation of response body.
-
-#### httpResponse.url()
-- returns: <[string]>
-
-Contains the URL of the response.
-
-### class: SecurityDetails
-
-[SecurityDetails] class represents the security details when response was received over the secure connection.
-
-#### securityDetails.issuer()
-- returns: <[string]> A string with the name of issuer of the certificate.
-
-#### securityDetails.protocol()
-- returns: <[string]> String with the security protocol, eg. "TLS 1.2".
-
-#### securityDetails.subjectAlternativeNames()
-- returns: <[Array]<[string]>> Returns the list of SANs (subject alternative names) of the certificate.
-
-#### securityDetails.subjectName()
-- returns: <[string]> Name of the subject to which the certificate was issued to.
-
-#### securityDetails.validFrom()
-- returns: <[number]> [UnixTime] stating the start of validity of the certificate.
-
-#### securityDetails.validTo()
-- returns: <[number]> [UnixTime] stating the end of validity of the certificate.
-
-### class: Target
-
-#### target.browser()
-
-- returns: <[Browser]>
-
-Get the browser the target belongs to.
-
-#### target.browserContext()
-
-- returns: <[BrowserContext]>
-
-The browser context the target belongs to.
-
-#### target.createCDPSession()
-- returns: <[Promise]<[CDPSession]>>
-
-Creates a Chrome Devtools Protocol session attached to the target.
-
-#### target.opener()
-- returns: <?[Target]>
-
-Get the target that opened this target. Top-level targets return `null`.
-
-#### target.page()
-- returns: <[Promise]<?[Page]>>
-
-If the target is not of type `"page"` or `"background_page"`, returns `null`.
-
-#### target.type()
-- returns: <"page"|"background_page"|"service_worker"|"shared_worker"|"other"|"browser">
-
-Identifies what kind of target this is. Can be `"page"`, [`"background_page"`](https://developer.chrome.com/extensions/background_pages), `"service_worker"`, `"shared_worker"`, `"browser"` or `"other"`.
-
-#### target.url()
-- returns: <[string]>
-
-#### target.worker()
-- returns: <[Promise]<?[WebWorker]>>
-
-If the target is not of type `"service_worker"` or `"shared_worker"`, returns `null`.
-
-### class: CDPSession
-
-* extends: [EventEmitter](#class-eventemitter)
-
-The `CDPSession` instances are used to talk raw Chrome Devtools Protocol:
-- protocol methods can be called with `session.send` method.
-- protocol events can be subscribed to with `session.on` method.
-
-Useful links:
-- Documentation on DevTools Protocol can be found here: [DevTools Protocol Viewer](https://chromedevtools.github.io/devtools-protocol/).
-- Getting Started with DevTools Protocol: https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md
-
-```js
-const client = await page.target().createCDPSession();
-await client.send('Animation.enable');
-client.on('Animation.animationCreated', () => console.log('Animation created!'));
-const response = await client.send('Animation.getPlaybackRate');
-console.log('playback rate is ' + response.playbackRate);
-await client.send('Animation.setPlaybackRate', {
-  playbackRate: response.playbackRate / 2
-});
-```
-
-#### cdpSession.detach()
-- returns: <[Promise]>
-
-Detaches the cdpSession from the target. Once detached, the cdpSession object won't emit any events and can't be used
-to send messages.
-
-#### cdpSession.send(method[, params])
-- `method` <[string]> protocol method name
-- `params` <[Object]> Optional method parameters
-- returns: <[Promise]<[Object]>>
-
-### class: Coverage
-
-Coverage gathers information about parts of JavaScript and CSS that were used by the page.
-
-An example of using JavaScript and CSS coverage to get percentage of initially
-executed code:
-
-```js
-// Enable both JavaScript and CSS coverage
-await Promise.all([
-  page.coverage.startJSCoverage(),
-  page.coverage.startCSSCoverage()
-]);
-// Navigate to page
-await page.goto('https://example.com');
-// Disable both JavaScript and CSS coverage
-const [jsCoverage, cssCoverage] = await Promise.all([
-  page.coverage.stopJSCoverage(),
-  page.coverage.stopCSSCoverage(),
-]);
-let totalBytes = 0;
-let usedBytes = 0;
-const coverage = [...jsCoverage, ...cssCoverage];
-for (const entry of coverage) {
-  totalBytes += entry.text.length;
-  for (const range of entry.ranges)
-    usedBytes += range.end - range.start - 1;
-}
-console.log(`Bytes used: ${usedBytes / totalBytes * 100}%`);
-```
-
-_To output coverage in a form consumable by [Istanbul](https://github.com/istanbuljs),
-  see [puppeteer-to-istanbul](https://github.com/istanbuljs/puppeteer-to-istanbul)._
-
-#### coverage.startCSSCoverage([options])
-- `options` <[Object]>  Set of configurable options for coverage
-  - `resetOnNavigation` <[boolean]> Whether to reset coverage on every navigation. Defaults to `true`.
-- returns: <[Promise]> Promise that resolves when coverage is started
-
-#### coverage.startJSCoverage([options])
-- `options` <[Object]>  Set of configurable options for coverage
-  - `resetOnNavigation` <[boolean]> Whether to reset coverage on every navigation. Defaults to `true`.
-  - `reportAnonymousScripts` <[boolean]> Whether anonymous scripts generated by the page should be reported. Defaults to `false`.
-- returns: <[Promise]> Promise that resolves when coverage is started
-
-> **NOTE** Anonymous scripts are ones that don't have an associated url. These are scripts that are dynamically created on the page using `eval` or `new Function`. If `reportAnonymousScripts` is set to `true`, anonymous scripts will have `__puppeteer_evaluation_script__` as their URL.
-
-#### coverage.stopCSSCoverage()
-- returns: <[Promise]<[Array]<[Object]>>> Promise that resolves to the array of coverage reports for all stylesheets
-  - `url` <[string]> StyleSheet URL
-  - `text` <[string]> StyleSheet content
-  - `ranges` <[Array]<[Object]>> StyleSheet ranges that were used. Ranges are sorted and non-overlapping.
-    - `start` <[number]> A start offset in text, inclusive
-    - `end` <[number]> An end offset in text, exclusive
-
-> **NOTE** CSS Coverage doesn't include dynamically injected style tags without sourceURLs.
-
-#### coverage.stopJSCoverage()
-- returns: <[Promise]<[Array]<[Object]>>> Promise that resolves to the array of coverage reports for all scripts
-  - `url` <[string]> Script URL
-  - `text` <[string]> Script content
-  - `ranges` <[Array]<[Object]>> Script ranges that were executed. Ranges are sorted and non-overlapping.
-    - `start` <[number]> A start offset in text, inclusive
-    - `end` <[number]> An end offset in text, exclusive
-
-> **NOTE** JavaScript Coverage doesn't include anonymous scripts by default. However, scripts with sourceURLs are
-reported.
-
-### class: TimeoutError
-
-* extends: [Error]
-
-TimeoutError is emitted whenever certain operations are terminated due to timeout, e.g. [page.waitForSelector(selector[, options])](#pagewaitforselectorselector-options) or [puppeteer.launch([options])](#puppeteerlaunchoptions).
-
-### class: EventEmitter
-
-A small EventEmitter class backed by [Mitt](https://github.com/developit/mitt/).
-
-#### eventEmitter.addListener(event, handler)
-- `event` <[string]|[symbol]> the event to remove the handler from.
-- `handler` <[Function]> the event listener that will be added.
-- returns: `this` so you can chain method calls
-
-This method is identical to `on` and maintained for compatibility with Node's EventEmitter. We recommend using `on` by default.
-
-#### eventEmitter.emit(event, [eventData])
-- `event` <[string]|[symbol]> the event to trigger.
-- `eventData` <[Object]> additional data to send with the event.
-- returns: `boolean`; `true` if there are any listeners for the event, `false` if there are none.
-
-#### eventEmitter.listenerCount(event)
-- `event` <[string]|[symbol]> the event to check for listeners.
-- returns: <[number]> the number of listeners for the given event.
-
-#### eventEmitter.off(event, handler)
-- `event` <[string]|[symbol]> the event to remove the handler from.
-- `handler` <[Function]> the event listener that will be removed.
-- returns: `this` so you can chain method calls
-
-#### eventEmitter.on(event, handler)
-- `event` <[string]|[symbol]> the event to add the handler to.
-- `handler` <[Function]> the event listener that will be added.
-- returns: `this` so you can chain method calls
-
-#### eventEmitter.once(event, handler)
-- `event` <[string]|[symbol]> the event to add the handler to.
-- `handler` <[Function]> the event listener that will be added.
-- returns: `this` so you can chain method calls
-
-#### eventEmitter.removeAllListeners([event])
-- `event` <[string]|[symbol]> optional argument to remove all listeners for the given event. If it's not given this method will remove all listeners for all events.
-- returns: `this` so you can chain method calls
-
-#### eventEmitter.removeListener(event, handler)
-- `event` <[string]|[symbol]> the event to remove the handler from.
-- `handler` <[Function]> the event listener that will be removed.
-- returns: `this` so you can chain method calls
-
-This method is identical to `off` and maintained for compatibility with Node's EventEmitter. We recommend using `off` by default.
-
-[AXNode]: #accessibilitysnapshotoptions "AXNode"
-[Accessibility]: #class-accessibility "Accessibility"
-[Array]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array "Array"
-[Body]: #class-body  "Body"
-[BrowserContext]: #class-browsercontext  "BrowserContext"
-[BrowserFetcher]: #class-browserfetcher  "BrowserFetcher"
-[Browser]: #class-browser  "Browser"
-[Buffer]: https://nodejs.org/api/buffer.html#buffer_class_buffer "Buffer"
-[CDPSession]: #class-cdpsession  "CDPSession"
-[ChildProcess]: https://nodejs.org/api/child_process.html "ChildProcess"
-[ConnectionTransport]: ../src/WebSocketTransport.js "ConnectionTransport"
-[ConsoleMessage]: #class-consolemessage "ConsoleMessage"
-[Coverage]: #class-coverage "Coverage"
-[Dialog]: #class-dialog "Dialog"
-[ElementHandle]: #class-elementhandle "ElementHandle"
-[Element]: https://developer.mozilla.org/en-US/docs/Web/API/element "Element"
-[Error]: https://nodejs.org/api/errors.html#errors_class_error "Error"
-[ExecutionContext]: #class-executioncontext "ExecutionContext"
-[FileChooser]: #class-filechooser "FileChooser"
-[Frame]: #class-frame "Frame"
-[JSHandle]: #class-jshandle "JSHandle"
-[Keyboard]: #class-keyboard "Keyboard"
-[Map]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map "Map"
-[Mouse]: #class-mouse "Mouse"
-[Object]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object "Object"
-[Page]: #class-page "Page"
-[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise"
-[HTTPRequest]: #class-httprequest  "HTTPRequest"
-[HTTPResponse]: #class-httpresponse  "HTTPResponse"
-[SecurityDetails]: #class-securitydetails "SecurityDetails"
-[Serializable]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#Description "Serializable"
-[Target]: #class-target "Target"
-[TimeoutError]: #class-timeouterror "TimeoutError"
-[Touchscreen]: #class-touchscreen "Touchscreen"
-[Tracing]: #class-tracing "Tracing"
-[UIEvent.detail]: https://developer.mozilla.org/en-US/docs/Web/API/UIEvent/detail "UIEvent.detail"
-[USKeyboardLayout]: ../src/common/USKeyboardLayout.ts "USKeyboardLayout"
-[UnixTime]: https://en.wikipedia.org/wiki/Unix_time "Unix Time"
-[WebWorker]: #class-worker "Worker"
-[boolean]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type "Boolean"
-[function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function "Function"
-[iterator]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols "Iterator"
-[number]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type "Number"
-[origin]: https://developer.mozilla.org/en-US/docs/Glossary/Origin "Origin"
-[selector]: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors "selector"
-[stream.Readable]: https://nodejs.org/api/stream.html#stream_class_stream_readable "stream.Readable"
-[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
-[symbol]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Symbol_type "Symbol"
-[xpath]: https://developer.mozilla.org/en-US/docs/Web/XPath "xpath"
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/remote/test/puppeteer/docs/assets/overview.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/remote/test/puppeteer/docs/assets/overview.png differ
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/docs/assets/overview.svg firefox-85.0+build1/remote/test/puppeteer/docs/assets/overview.svg
--- firefox-84.0.2+build1/remote/test/puppeteer/docs/assets/overview.svg	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/docs/assets/overview.svg	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-<svg fill="none" stroke-linecap="square" stroke-miterlimit="10" viewBox="0 0 968.276 946.921" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="butt"><path d="m427.581 617.073h132.482v62.169h-132.482z" fill="#fff" stroke="#fff" stroke-width="2.491"/><path d="m56.254 687.007h314.89v198.425h-314.89z" fill="#fff" stroke="#fff" stroke-width="6.861"/><path d="m172.559 622.85h107.917v51.091h-107.917z" fill="#fff" stroke="#fff" stroke-width="2.038"/><path d="m178.64 616.662h107.917v51.091h-107.917z" fill="#fff" stroke="#fff" stroke-width="2.038"/><path d="m428.163 471.339h132.482v62.169h-132.482z" fill="#fff" stroke="#fff" stroke-width="2.491"/><path d="m608.039 615.812h107.666v52.284h-107.666z" fill="#fff" stroke="#fff" stroke-width="2.059"/><path d="m791.456 616.115h108.494v51.212h-108.494z" fill="#fff" stroke="#fff" stroke-width="2.046"/><path d="m492.955 531.236v42.598h-260.742a1.4 1.4 0 0 0 -1.4 1.4v44.002h2.8v-42.601l259.343-.543v42.963l2.629.407.133-43.274 164.512.068v42.225h2.8v-42.225l181.395.18-.279 41.84 3.24-.019s.558-44.605.243-44.76l-185.988-.04h-.01l-165.81.204-.067-42.425z" fill="#000" fill-rule="evenodd" stroke="#fff" stroke-linejoin="round" stroke-width="2.6"/><path d="m180.64 619.232h103.12v46.52h-103.12z" stroke="#000" stroke-linejoin="round" stroke-width="1.683"/><path d="m167.965 629.432h107.917v51.091h-107.917z" fill="#fff" stroke="#fff" stroke-width="2.038"/><path d="m56.893 428.141h311.623v129.46h-311.623z" fill="#fff" stroke="#fff" stroke-width="5.513"/><path d="m607.823 471.584h107.563v50.246h-107.563z" fill="#fff" stroke="#fff" stroke-width="2.018"/><path d="m660.15 520.244v21.197h2.801v-21.197h-2.8z" fill="#000" fill-rule="evenodd" stroke="#fff" stroke-linejoin="round" stroke-width="2.775"/><path d="m401.74 768.101h184.979v61.727h-184.979z" fill="#fff" stroke="#fff" stroke-width="2.933"/><path d="m794.28 472.358h106.239v49.338h-106.239z" fill="#fff" stroke="#fff" stroke-width="1.987"/><path d="m708.034 343.153h131.243v50.353h-131.243z" fill="#fff" stroke="#fff" stroke-width="2.231"/><path d="m408.465 211.535h171.499v61.833h-171.499z" fill="#fff" stroke="#fff" stroke-width="2.827"/><path d="m408.984 337.499h171.254v61.255h-171.254z" fill="#fff" stroke="#fff" stroke-width="2.811"/><path d="m139.262 343.348h140.537v50.259h-140.537z" fill="#fff" stroke="#fff" stroke-width="2.307"/><path d="m492.795 269.326.088 37.638-168.194-.048h-115.185a1.4 1.4 0 0 0 -1.4 1.4v36.791h2.8v-35.392h113.786l168.394-.028c-.177 1.154-.024 29.271.084 30.704.626.034 2.247 1.14 2.632.426l-.176-31.205 276.89.107v35.388h2.8v-36.787a1.4 1.4 0 0 0 -1.399-1.4h-278.13l.049-37.498s-2.158-.026-3.04-.096z" fill="#000" fill-rule="evenodd" stroke="#fff" stroke-linejoin="round" stroke-width="3.5"/><path d="m393.238 31.831h201.849v93.335h-201.849z" fill="#fff" stroke="#fff" stroke-width="3.767"/></g><path d="m0 0h968.276v946.921h-968.276z" fill="none"/><path d="m477.83 141.076 16.299-16.3 16.299 16.3h-8.15v54.646h8.15l-16.3 16.299-16.299-16.3h8.15v-54.645z" fill="#cfe2f3" fill-rule="evenodd" stroke="#fff" stroke-width="4.6"/><path d="m410.748 214.021h167.276v57.512h-167.276z" fill="#d9d2e9" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m641.67 516.417h52.442v60.85h-52.442z" fill="none"/><g fill="#000" stroke="#fff" stroke-width="2.191"><path d="m652.323 544.506v5.207h5.19v-5.207zm6.668 0v5.207h5.189v-5.207zm6.668 0v5.207h5.19v-5.207z" stroke-linecap="butt"/><g stroke="none"><path d="m653.227 545.41v3.4h3.381v-3.4zm6.668 0v3.4h3.381v-3.4zm6.668 0v3.4h3.381v-3.4zm-12.346.993h1.4v1.414h-1.4zm6.668 0h1.4v1.414h-1.4zm6.668 0h1.4v1.414h-1.4z"/><path d="m653.722 548.313v-2.406h2.39v2.406zm6.668 0v-2.406h2.39v2.406zm6.668 0v-2.406h2.39v2.406z"/></g></g><path d="m226.478 484.717h103.118v46.52h-103.118z" fill="#fff2cc" fill-rule="evenodd"/><path d="m226.478 484.717h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m256.41 501.714 1.202-.11q.079.72.391 1.188.313.453.953.734.656.282 1.469.282.719 0 1.266-.22.562-.218.828-.577.265-.375.265-.828 0-.454-.265-.782-.25-.328-.844-.562-.39-.156-1.703-.469-1.313-.312-1.844-.594-.672-.359-1.016-.89-.328-.532-.328-1.188 0-.719.407-1.344.406-.625 1.187-.953.797-.328 1.766-.328 1.047 0 1.86.344.812.344 1.25 1.016.437.656.468 1.484l-1.203.094q-.11-.907-.672-1.36-.563-.468-1.656-.468-1.141 0-1.672.421-.516.422-.516 1.016 0 .516.36.844.374.328 1.906.687 1.547.344 2.11.594.843.39 1.233.984.391.579.391 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.813.36-1.829.36-1.296 0-2.171-.375-.875-.375-1.375-1.125-.5-.766-.532-1.72zm13.905.844 1.203.14q-.281 1.063-1.063 1.656-.765.579-1.968.579-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.531-.609 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm6.376 0-2.625-6.906h1.234l1.485 4.14q.234.657.437 1.391.157-.547.438-1.312l1.531-4.219h1.219l-2.625 6.906zm4.758-8.187v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm7.461-2.53 1.156.155q-.187 1.188-.969 1.86-.78.672-1.921.672-1.407 0-2.282-.922-.859-.938-.859-2.657 0-1.125.375-1.968.375-.844 1.125-1.25.766-.422 1.656-.422 1.125 0 1.844.578.719.562.922 1.61l-1.14.171q-.173-.703-.595-1.047-.406-.359-.984-.359-.89 0-1.453.64-.547.641-.547 2 0 1.407.531 2.032.547.625 1.407.625.687 0 1.14-.422.469-.422.594-1.297zm6.883.312 1.203.14q-.281 1.063-1.063 1.656-.765.579-1.968.579-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.546.531-.609 1.437zm-38.571 20.125-2.531-9.546h1.297l1.453 6.265q.234.985.406 1.953.36-1.531.422-1.765l1.828-6.453h1.516l1.375 4.828q.515 1.797.734 3.39.187-.906.484-2.078l1.485-6.14h1.28l-2.624 9.546h-1.219l-2-7.265q-.265-.922-.312-1.125-.141.656-.282 1.125l-2.015 7.265zm10.089-3.453q0-1.922 1.078-2.843.89-.766 2.172-.766 1.422 0 2.328.937.906.922.906 2.579 0 1.328-.406 2.093-.39.766-1.156 1.188-.766.422-1.672.422-1.453 0-2.36-.922-.89-.938-.89-2.688zm1.203 0q0 1.328.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.032 0-1.28-.594-1.937-.578-.656-1.437-.656-.875 0-1.469.656-.578.656-.578 1.984zm6.631 3.453v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm4.47 0v-9.546h1.172v5.453l2.765-2.813h1.516l-2.64 2.563 2.905 4.343h-1.437l-2.281-3.53-.828.796v2.734zm11.383-2.218 1.203.14q-.282 1.063-1.063 1.657-.765.578-1.969.578-1.515 0-2.406-.938-.89-.937-.89-2.61 0-1.75.89-2.702.906-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.157q.063 1.14.64 1.75.58.594 1.438.594.657 0 1.11-.328.453-.344.719-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.296-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm3.985-2.062 1.157-.188q.109.704.546 1.079.454.359 1.25.359.813 0 1.204-.328.39-.328.39-.766 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.204-.843.218-.407.578-.672.28-.188.75-.328.468-.141 1.015-.141.813 0 1.422.234.61.235.906.64.297.392.407 1.063l-1.141.157q-.078-.532-.453-.828-.375-.313-1.063-.313-.812 0-1.156.266-.344.265-.344.625 0 .234.141.422.156.187.453.312.172.063 1.031.297 1.25.328 1.735.547.5.203.781.61.281.405.281 1 0 .593-.343 1.109-.344.515-1 .796-.641.282-1.454.282-1.343 0-2.046-.563-.704-.562-.907-1.656z" fill="#000"/><path d="m232.213 479.215h103.117v46.52h-103.117z" fill="#fff2cc" fill-rule="evenodd"/><path d="m232.213 479.215h103.117v46.52h-103.117z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m262.144 496.213 1.203-.11q.078.719.391 1.188.313.453.953.734.656.281 1.469.281.719 0 1.266-.218.562-.22.828-.579.265-.375.265-.828 0-.453-.265-.78-.25-.33-.844-.563-.39-.157-1.703-.47-1.313-.312-1.844-.593-.672-.36-1.016-.89-.328-.532-.328-1.188 0-.719.407-1.344.406-.625 1.187-.953.797-.328 1.766-.328 1.047 0 1.859.344.813.343 1.25 1.015.438.657.469 1.485l-1.203.093q-.11-.906-.672-1.359-.563-.469-1.656-.469-1.141 0-1.672.422-.516.422-.516 1.016 0 .515.36.844.374.328 1.906.687 1.547.344 2.109.594.844.39 1.234.984.391.578.391 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.813.36-1.829.36-1.296 0-2.171-.376-.875-.375-1.375-1.125-.5-.765-.532-1.718zm13.906.843 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.53-.61 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.735.734-.97.344-.233.766-.233.593 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm6.376 0-2.625-6.906h1.234l1.485 4.14q.234.657.437 1.391.156-.547.438-1.312l1.531-4.22h1.219l-2.625 6.907zm4.758-8.187v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm7.46-2.531 1.157.156q-.187 1.188-.969 1.86-.78.671-1.921.671-1.407 0-2.282-.922-.86-.937-.86-2.656 0-1.125.376-1.969.375-.843 1.125-1.25.766-.421 1.656-.421 1.125 0 1.844.578.719.562.922 1.61l-1.14.17q-.173-.702-.595-1.046-.406-.36-.984-.36-.89 0-1.453.641-.547.64-.547 2 0 1.407.531 2.032.547.625 1.407.625.687 0 1.14-.422.469-.422.594-1.297zm6.884.312 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.53-.61 1.437zm-38.571 20.125-2.531-9.547h1.296l1.454 6.266q.234.984.406 1.953.36-1.531.422-1.766l1.828-6.453h1.515l1.375 4.828q.516 1.797.735 3.391.187-.906.484-2.078l1.485-6.14h1.28l-2.624 9.546h-1.219l-2-7.266q-.266-.921-.312-1.125-.141.657-.282 1.125l-2.015 7.266zm10.089-3.453q0-1.922 1.078-2.844.89-.765 2.172-.765 1.422 0 2.328.937.906.922.906 2.578 0 1.328-.406 2.094-.39.766-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.328.578 1.984.594.657 1.469.657.875 0 1.453-.657.578-.672.578-2.03 0-1.282-.594-1.938-.578-.657-1.437-.657-.875 0-1.47.657-.577.656-.577 1.984zm6.631 3.453v-6.906h1.063v1.047q.406-.735.734-.97.344-.233.766-.233.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.765-2.812h1.516l-2.64 2.562 2.905 4.344h-1.437l-2.281-3.531-.828.797v2.734zm11.382-2.219 1.204.141q-.282 1.062-1.063 1.656-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.594 1.438.594.657 0 1.11-.329.453-.343.718-1.078zm-3.843-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.454-.687-.812 0-1.359.547-.547.53-.61 1.437zm6.506 4.125v-6.906h1.062v1.047q.407-.735.735-.97.344-.233.765-.233.594 0 1.204.375l-.407 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm3.985-2.062 1.156-.188q.11.703.547 1.078.453.36 1.25.36.813 0 1.203-.329.391-.328.391-.765 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.657-.25-.421-.25-.937 0-.453.203-.844.22-.406.579-.672.28-.187.75-.328.468-.14 1.015-.14.813 0 1.422.234.61.234.906.64.297.391.407 1.063l-1.141.156q-.078-.53-.453-.828-.375-.312-1.063-.312-.812 0-1.156.265-.344.266-.344.625 0 .235.14.422.157.188.454.313.172.062 1.031.297 1.25.328 1.735.546.5.204.78.61.282.406.282 1t-.344 1.11q-.343.515-1 .796-.64.281-1.453.281-1.343 0-2.047-.562-.703-.563-.906-1.656z" fill="#000"/><path d="m609.992 473.724h103.118v46.52h-103.118z" fill="#d9ead3" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m609.992 473.724h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m641.461 501.784v-9.547h3.594q.953 0 1.453.094.703.125 1.172.453.484.328.765.922.297.594.297 1.297 0 1.219-.78 2.062-.767.844-2.798.844h-2.437v3.875zm1.266-5h2.453q1.234 0 1.75-.453.515-.469.515-1.281 0-.61-.312-1.031-.297-.422-.797-.563-.312-.094-1.172-.094h-2.437zm11.983 4.14q-.656.563-1.265.798-.594.218-1.282.218-1.14 0-1.75-.546-.609-.563-.609-1.438 0-.5.219-.922.234-.422.61-.672.374-.25.843-.39.344-.078 1.047-.172 1.422-.172 2.093-.406v-.297q0-.719-.328-1.016-.453-.39-1.343-.39-.813 0-1.22.296-.39.282-.577 1.016l-1.14-.156q.155-.735.515-1.188.36-.453 1.031-.687.672-.25 1.563-.25.89 0 1.437.203.563.203.813.531.265.313.375.797.046.297.046 1.078v1.563q0 1.625.079 2.062.078.438.296.828h-1.218q-.188-.36-.235-.86zm-.093-2.609q-.641.266-1.922.438-.72.11-1.016.25-.297.125-.469.375-.156.25-.156.547 0 .469.344.781.36.313 1.047.313.672 0 1.203-.297t.781-.813q.188-.39.188-1.172zm2.771 4.047 1.141.157q.078.53.406.78.438.313 1.188.313.812 0 1.25-.328.453-.312.61-.906.093-.36.077-1.5-.765.906-1.906.906-1.438 0-2.219-1.031-.781-1.031-.781-2.469 0-.984.36-1.812.359-.844 1.03-1.297.688-.453 1.61-.453 1.219 0 2.016.984v-.828h1.078v5.969q0 1.61-.328 2.281-.329.687-1.047 1.078-.703.39-1.75.39-1.235 0-2-.562-.75-.562-.735-1.672zm.985-4.156q0 1.36.531 1.984.547.625 1.36.625.796 0 1.343-.625.547-.625.547-1.953 0-1.265-.562-1.906-.563-.64-1.36-.64-.765 0-1.312.64-.547.625-.547 1.875zm11.381 1.36 1.203.14q-.281 1.063-1.062 1.656-.766.578-1.97.578-1.515 0-2.405-.937-.891-.938-.891-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.391 0 2.266.937.875.938.875 2.656v.313h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.11-.328.452-.344.718-1.079zm-3.844-1.907h3.86q-.078-.86-.438-1.297-.562-.687-1.453-.687-.813 0-1.36.547-.546.531-.609 1.437zm16.053 3v1.125h-6.297q-.015-.422.14-.812.235-.64.767-1.266.53-.625 1.53-1.453 1.563-1.266 2.11-2.016.547-.75.547-1.406 0-.703-.5-1.172-.5-.484-1.297-.484-.86 0-1.375.515-.5.5-.5 1.391l-1.203-.11q.125-1.359.922-2.062.812-.703 2.172-.703 1.375 0 2.172.766.812.75.812 1.875 0 .578-.234 1.14-.235.547-.781 1.157-.547.609-1.813 1.671-1.047.891-1.36 1.22-.296.312-.484.624z" fill="#000"/><path d="m730.693 466.56h47.527v60.85h-47.527zm-236.564-69.44v38.302h.22v38.297" fill="none"/><g style="fill:#000;stroke:#fff;stroke-width:3.1;fill-rule:evenodd;stroke-linecap:butt;stroke-linejoin:round"><path d="m493.629 396.625a.496.496 0 0 0 -.496.496v38.3c0 .167.144.274.22.417v37.88a.496.496 0 0 0 .497.497h1a.496.496 0 0 0 .496-.496v-38.297a.496.496 0 0 0 0-.002c-.001-.165-.145-.27-.221-.41v-37.89a.496.496 0 0 0 -.496-.496h-1zm.496.992h.008v37.393a.496.496 0 0 0 .219.41l.002.004v37.799h-.008v-37.385a.496.496 0 0 0 -.219-.41c-.002-.001-.002-.002-.002-.004a.496.496 0 0 0 0-.002z"/><path d="m493.629 397.121v38.3c0 .168-1.093.663-.954.756l.224 37.474 1.95.068v-38.297a.5.5 0 0 0 -.22-.412v-37.89z"/></g><path d="m430.606 473.724h127.496v57.512h-127.496z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m494.129 397.12v38.302h167.433v38.297" fill="none"/><path d="m430.606 473.724h127.496v57.512h-127.496z" fill="#d9ead3" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m493.629 397.121v38.3a.5.5 0 0 0 .5.5h166.933v37.798l3.205.164v-38.297c0-.276-2.428-.664-2.705-.664h-166.932v-37.8z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:.991;stroke-linecap:butt;stroke-linejoin:round"/><path d="m474.006 509.4v-13.36h5.047q1.328 0 2.032.126.968.172 1.64.64.672.454 1.078 1.282.407.828.407 1.828 0 1.703-1.094 2.89-1.078 1.172-3.922 1.172h-3.422v5.422zm1.766-7h3.453q1.719 0 2.438-.64.718-.64.718-1.797 0-.844-.421-1.438-.422-.593-1.125-.78-.438-.126-1.641-.126h-3.422zm16.787 5.813q-.921.765-1.765 1.094-.828.312-1.797.312-1.594 0-2.453-.781-.86-.781-.86-1.985 0-.718.329-1.296.328-.594.843-.938.532-.36 1.188-.547.469-.125 1.453-.25 1.984-.234 2.922-.562.015-.344.015-.422 0-1-.468-1.422-.625-.547-1.875-.547-1.157 0-1.703.406-.547.407-.813 1.422l-1.61-.219q.22-1.015.72-1.64.5-.64 1.453-.985.953-.343 2.187-.343 1.25 0 2.016.297.78.28 1.14.734.375.437.516 1.11.078.421.078 1.515v2.187q0 2.282.11 2.891.109.594.406 1.156h-1.704q-.265-.515-.328-1.187zm-.14-3.672q-.89.375-2.672.625-1.016.14-1.438.328-.421.188-.656.531-.219.344-.219.782 0 .656.5 1.093.5.438 1.454.438.937 0 1.671-.406.75-.422 1.094-1.141.266-.563.266-1.64zm3.891 5.656 1.594.235q.11.75.562 1.078.61.453 1.672.453 1.14 0 1.75-.453.625-.453.844-1.266.125-.5.11-2.11-1.063 1.266-2.673 1.266-2 0-3.093-1.437-1.094-1.438-1.094-3.453 0-1.39.5-2.563.516-1.172 1.453-1.797.953-.64 2.25-.64 1.703 0 2.813 1.375v-1.157h1.515v8.36q0 2.265-.469 3.203-.453.937-1.453 1.484-.984.547-2.453.547-1.719 0-2.797-.781-1.062-.766-1.03-2.344zm1.36-5.812q0 1.906.75 2.78.765.876 1.906.876 1.125 0 1.89-.86.766-.874.766-2.734 0-1.781-.797-2.672-.781-.906-1.89-.906-1.094 0-1.86.89-.766.876-.766 2.626zm15.953 1.906 1.688.203q-.406 1.484-1.485 2.313-1.078.812-2.765.812-2.125 0-3.375-1.297-1.235-1.312-1.235-3.672 0-2.453 1.25-3.797 1.266-1.343 3.266-1.343 1.938 0 3.156 1.328 1.235 1.312 1.235 3.703v.437h-7.219q.094 1.594.906 2.454.813.843 2.016.843.906 0 1.547-.468.64-.485 1.015-1.516zm-5.39-2.656h5.406q-.11-1.22-.625-1.828-.781-.954-2.031-.954-1.125 0-1.907.766-.765.75-.843 2.016z" fill="#000"/><path d="m494.129 397.12v38.302h353.228v38.297" fill="none"/><path d="m492.729 397.121v38.3a1.4 1.4 0 0 0 1.4 1.401h351.828v36.897h2.8v-38.297a1.4 1.4 0 0 0 -1.4-1.4h-351.827v-36.9h-2.8z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m494.354 531.236v44.075h-.22v44.083m.22-88.158v43.62h167.276v43.624" fill="none"/><path d="m494.354 531.236v43.62h351.213v43.624m-351.438 58.416v46.598h.252v46.6" fill="none"/><path d="m492.729 676.896v34.907h-270.631a1.4 1.4 0 0 0 -1.4 1.4v36.322h2.8v-34.921h269.23c-.08 18.498.239 54.814.252 55.49h2.801c-.133-.657-.32-56.408-.252-56.88v-36.318z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m404.165 770.092h180.441v57.512h-180.44z" fill="#fce5cd" fill-rule="evenodd" stroke="#000" stroke-width="3.3"/><path d="m404.165 770.092h180.441v57.512h-180.44z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m432.948 795.208v-11.453h8.282v1.343h-6.766v3.516h6.344v1.344h-6.344v3.89h7.031v1.36zm9.532 0 3.03-4.313-2.812-3.984h1.766l1.266 1.937q.359.563.578.938.343-.516.64-.922l1.391-1.953h1.687l-2.875 3.906 3.094 4.39h-1.734l-1.703-2.577-.453-.703-2.172 3.28zm14.609-2.672 1.453.172q-.344 1.281-1.281 1.984-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.079-1.157 2.797-1.157 1.657 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.079 1.375.766 2.11.703.718 1.734.718.782 0 1.329-.406.546-.406.859-1.297zm-4.61-2.281h4.626q-.094-1.047-.532-1.563-.672-.812-1.734-.812-.969 0-1.64.656-.657.64-.72 1.719zm13.243 1.906 1.39.187q-.234 1.422-1.171 2.235-.922.812-2.282.812-1.703 0-2.75-1.11-1.031-1.124-1.031-3.202 0-1.344.438-2.344.453-1.016 1.359-1.516.922-.5 1.984-.5 1.36 0 2.219.688.86.672 1.094 1.937l-1.36.204q-.203-.829-.703-1.25-.484-.422-1.187-.422-1.063 0-1.735.765-.656.75-.656 2.407 0 1.671.64 2.437.641.75 1.673.75.828 0 1.375-.5.562-.516.703-1.578zm8.031 3.047v-1.219q-.969 1.406-2.64 1.406-.735 0-1.376-.281-.625-.281-.937-.703-.313-.438-.438-1.047-.078-.422-.078-1.312v-5.141h1.407v4.594q0 1.109.078 1.484.14.563.562.875.438.313 1.063.313.64 0 1.187-.313.563-.328.781-.89.235-.563.235-1.626v-4.437h1.406v8.297zm6.523-1.266.204 1.25q-.594.125-1.063.125-.766 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.031v-1.094h1.031v-2.063l1.406-.843v2.906h1.406v1.094h-1.406v4.843q0 .61.063.782.078.172.25.28.172.095.484.095.234 0 .61-.063zm1.383-8.578v-1.61h1.407v1.61zm0 9.844v-8.297h1.407v8.297zm3.024-4.156q0-2.297 1.281-3.407 1.078-.922 2.61-.922 1.718 0 2.796 1.125 1.094 1.11 1.094 3.094 0 1.594-.484 2.516-.485.922-1.407 1.437-.906.5-2 .5-1.734 0-2.812-1.11-1.078-1.124-1.078-3.233zm1.453 0q0 1.593.687 2.39.703.797 1.75.797 1.047 0 1.735-.797.703-.797.703-2.437 0-1.532-.703-2.328-.688-.797-1.735-.797-1.047 0-1.75.797-.687.78-.687 2.375zm7.976 4.156v-8.297h1.266v1.172q.906-1.36 2.64-1.36.75 0 1.376.266.625.266.937.703.313.438.438 1.047.078.39.078 1.36v5.109h-1.407v-5.047q0-.86-.171-1.281-.157-.438-.579-.688-.406-.25-.968-.25-.907 0-1.563.578-.64.563-.64 2.157v4.53zm17.243-4.016 1.515.375q-.469 1.875-1.719 2.86-1.234.984-3.015.984-1.86 0-3.016-.75-1.156-.766-1.765-2.188-.61-1.437-.61-3.078 0-1.797.688-3.125.687-1.328 1.937-2.015 1.266-.703 2.781-.703 1.72 0 2.891.875 1.172.875 1.64 2.468l-1.5.344q-.39-1.25-1.156-1.812-.75-.579-1.906-.579-1.312 0-2.203.641-.89.625-1.25 1.703-.36 1.063-.36 2.188 0 1.468.423 2.562.437 1.078 1.328 1.625.906.531 1.953.531 1.265 0 2.14-.734.891-.734 1.204-2.172zm2.68-.14q0-2.297 1.28-3.407 1.079-.922 2.61-.922 1.719 0 2.797 1.125 1.093 1.11 1.093 3.094 0 1.594-.484 2.516-.484.922-1.406 1.437-.906.5-2 .5-1.735 0-2.813-1.11-1.078-1.124-1.078-3.233zm1.452 0q0 1.593.688 2.39.703.797 1.75.797 1.047 0 1.734-.797.703-.797.703-2.437 0-1.532-.703-2.328-.687-.797-1.734-.797t-1.75.797q-.688.78-.688 2.375zm7.977 4.156v-8.297h1.266v1.172q.906-1.36 2.64-1.36.75 0 1.375.266t.938.703q.312.438.437 1.047.078.39.078 1.36v5.109h-1.406v-5.047q0-.86-.172-1.281-.156-.438-.578-.688-.406-.25-.969-.25-.906 0-1.562.578-.64.563-.64 2.157v4.53zm11.96-1.266.204 1.25q-.594.125-1.063.125-.765 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.03v-1.094h1.03v-2.063l1.407-.843v2.906h1.406v1.094h-1.406v4.843q0 .61.062.782.078.172.25.28.172.095.484.095.235 0 .61-.063zm7.056-1.406 1.453.172q-.344 1.281-1.282 1.984-.921.703-2.359.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.078 1.375.766 2.11.703.718 1.734.718.781 0 1.328-.406t.86-1.297zm-4.61-2.281h4.625q-.094-1.047-.531-1.563-.672-.812-1.734-.812-.97 0-1.641.656-.656.64-.719 1.719zm6.899 4.953 3.03-4.313-2.812-3.984h1.766l1.266 1.937q.359.563.578.938.343-.516.64-.922l1.391-1.953h1.687l-2.875 3.906 3.094 4.39h-1.734l-1.703-2.577-.453-.703-2.172 3.28zm12-1.266.203 1.25q-.594.125-1.063.125-.765 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.031v-1.094h1.031v-2.063l1.406-.843v2.906h1.407v1.094h-1.407v4.843q0 .61.063.782.078.172.25.28.172.095.484.095.235 0 .61-.063zm-84.411 23.641q-1.171-1.469-1.984-3.438-.797-1.984-.797-4.093 0-1.86.61-3.563.703-1.969 2.171-3.937h1q-.937 1.625-1.25 2.328-.468 1.078-.75 2.25-.328 1.453-.328 2.937 0 3.75 2.329 7.516zm2.97-3.375v-7.203h-1.235v-1.094h1.234v-.89q0-.829.156-1.235.204-.547.704-.89.515-.344 1.437-.344.594 0 1.313.14l-.204 1.235q-.437-.079-.828-.079-.64 0-.906.282-.266.265-.266 1.015v.766h1.61v1.094h-1.61v7.203zm4.1 0v-8.297h1.266v1.25q.485-.875.891-1.156.406-.282.906-.282.703 0 1.438.454l-.485 1.296q-.515-.296-1.03-.296-.454 0-.829.28-.36.266-.516.766-.234.75-.234 1.641v4.344zm10.75-1.031q-.78.671-1.5.953-.718.265-1.546.265-1.375 0-2.11-.672-.734-.671-.734-1.703 0-.61.281-1.11.282-.515.72-.812.452-.312 1.015-.468.422-.11 1.25-.203 1.703-.204 2.515-.485v-.375q0-.86-.39-1.203-.547-.484-1.61-.484-.984 0-1.468.359-.47.344-.688 1.219l-1.375-.188q.188-.875.61-1.422.437-.546 1.25-.828.812-.297 1.875-.297 1.062 0 1.718.25.672.25.985.625.312.375.437.954.078.359.078 1.296v1.875q0 1.97.078 2.485.094.515.36 1h-1.469q-.219-.438-.281-1.031zm-.109-3.141q-.765.312-2.296.531-.875.125-1.235.281-.36.157-.562.47-.188.296-.188.655 0 .563.422.938.438.375 1.25.375.813 0 1.438-.344.64-.36.937-.984.234-.469.234-1.406zm3.602 4.172v-8.297h1.25v1.156q.39-.61 1.031-.969.656-.375 1.485-.375.921 0 1.515.391.594.375.828 1.063.985-1.454 2.563-1.454 1.234 0 1.89.688.672.672.672 2.094v5.703h-1.39v-5.235q0-.843-.14-1.203-.141-.375-.5-.593-.36-.235-.845-.235-.875 0-1.453.578-.578.578-.578 1.86v4.828h-1.406v-5.39q0-.938-.344-1.407-.344-.469-1.125-.469-.594 0-1.094.313-.5.312-.734.922-.219.593-.219 1.718v4.313zm19-2.672 1.453.172q-.344 1.281-1.281 1.984-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.079-3.25 1.078-1.157 2.796-1.157 1.657 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.079 1.375.766 2.11.703.718 1.734.718.782 0 1.329-.406.546-.406.859-1.297zm-4.61-2.281h4.626q-.094-1.047-.532-1.563-.671-.812-1.734-.812-.969 0-1.64.656-.657.64-.72 1.719zm8.758 8.328h-1.015q2.344-3.766 2.344-7.516 0-1.469-.344-2.922-.266-1.172-.735-2.25-.312-.703-1.265-2.343h1.015q1.47 1.968 2.172 3.937.594 1.703.594 3.563 0 2.109-.812 4.093-.797 1.969-1.954 3.438z" fill="#000"/><path d="m239.236 473.724h103.118v46.52h-103.118z" fill="#fff2cc" fill-rule="evenodd"/><path d="m239.236 473.724h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m269.168 490.722 1.203-.11q.078.72.39 1.188.313.453.954.734.656.281 1.469.281.718 0 1.265-.218.563-.219.828-.578.266-.375.266-.829 0-.453-.266-.78-.25-.329-.843-.563-.391-.157-1.704-.469-1.312-.313-1.843-.594-.672-.36-1.016-.89-.328-.532-.328-1.188 0-.719.406-1.344.406-.625 1.188-.953.797-.328 1.765-.328 1.047 0 1.86.344.812.344 1.25 1.015.437.657.468 1.485l-1.203.094q-.11-.907-.672-1.36-.562-.469-1.656-.469-1.14 0-1.672.422-.515.422-.515 1.016 0 .516.359.844.375.328 1.906.687 1.547.344 2.11.594.843.39 1.234.984.39.578.39 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.812.36-1.828.36-1.297 0-2.172-.376-.875-.375-1.375-1.125-.5-.765-.531-1.718zm13.905.843 1.203.141q-.28 1.063-1.062 1.656-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.079zm-3.843-1.906h3.859q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.547-.546.531-.608 1.437zm6.506 4.125v-6.906h1.062v1.047q.406-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm6.376 0-2.625-6.906h1.234l1.484 4.14q.235.657.438 1.391.156-.547.437-1.312l1.532-4.219h1.218l-2.625 6.906zm4.757-8.187v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm7.462-2.531 1.156.156q-.188 1.188-.969 1.86-.781.671-1.922.671-1.406 0-2.281-.921-.86-.938-.86-2.657 0-1.125.376-1.968.375-.844 1.125-1.25.765-.422 1.656-.422 1.125 0 1.844.578.718.562.921 1.61l-1.14.171q-.172-.703-.594-1.047-.406-.36-.984-.36-.891 0-1.453.641-.547.641-.547 2 0 1.407.53 2.032.548.625 1.407.625.688 0 1.14-.422.47-.422.595-1.297zm6.882.312 1.203.141q-.28 1.063-1.062 1.656-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.079zm-3.843-1.906h3.859q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.547-.546.531-.608 1.437zm-38.572 20.125-2.53-9.547h1.296l1.453 6.266q.235.984.406 1.953.36-1.531.422-1.766l1.828-6.453h1.516l1.375 4.828q.516 1.797.734 3.391.188-.906.485-2.078l1.484-6.14h1.281l-2.625 9.546h-1.218l-2-7.265q-.266-.922-.313-1.125-.14.656-.281 1.125l-2.016 7.265zm10.09-3.453q0-1.922 1.077-2.844.891-.765 2.172-.765 1.422 0 2.328.937.907.922.907 2.578 0 1.328-.407 2.094-.39.766-1.156 1.188-.765.421-1.672.421-1.453 0-2.36-.921-.89-.938-.89-2.688zm1.202 0q0 1.328.579 1.984.593.657 1.468.657t1.453-.657q.579-.671.579-2.03 0-1.282-.594-1.938-.578-.657-1.438-.657-.875 0-1.468.657-.579.656-.579 1.984zm6.632 3.453v-6.906h1.062v1.047q.406-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.171v5.453l2.766-2.812h1.515l-2.64 2.562 2.906 4.344h-1.438l-2.28-3.531-.829.797v2.734zm11.382-2.219 1.203.141q-.281 1.063-1.062 1.656-.766.578-1.97.578-1.515 0-2.405-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.343-.968 1.391 0 2.266.937.875.938.875 2.656v.313h-5.156q.062 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.452-.344.718-1.079zm-3.844-1.906h3.86q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.547-.546.531-.609 1.437zm6.507 4.125v-6.906h1.062v1.047q.406-.735.734-.969.344-.234.766-.234.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.296.235-.421.64-.204.626-.204 1.36v3.625zm3.985-2.062 1.156-.188q.11.703.547 1.078.453.36 1.25.36.812 0 1.203-.328.39-.329.39-.766 0-.39-.359-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.844.219-.406.578-.672.281-.187.75-.328.469-.14 1.016-.14.812 0 1.422.234.609.234.906.64.297.391.406 1.063l-1.14.156q-.079-.53-.454-.828-.375-.312-1.062-.312-.813 0-1.156.265-.344.266-.344.625 0 .235.14.422.157.188.454.313.172.062 1.03.297 1.25.328 1.735.547.5.203.782.609.28.406.28 1t-.343 1.11q-.344.515-1 .796-.64.281-1.453.281-1.344 0-2.047-.562-.703-.563-.906-1.656z" fill="#000"/><path d="m730.692 610.559h60.41v60.85h-60.41z" fill="none"/><path d="m170.074 631.61h103.119v46.52h-103.119z" fill="#e6b8af" fill-rule="evenodd"/><path d="m170.074 631.61h103.119v46.52h-103.119z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round" stroke-width="1.083"/><path d="m202.969 659.67-2.532-9.547h1.297l1.453 6.265q.235.985.407 1.953.359-1.53.422-1.765l1.828-6.453h1.515l1.375 4.828q.516 1.797.735 3.39.187-.906.484-2.078l1.484-6.14h1.282l-2.625 9.547h-1.22l-2-7.266q-.265-.922-.312-1.125-.14.656-.28 1.125l-2.016 7.266zm10.088-3.454q0-1.921 1.079-2.843.89-.766 2.171-.766 1.422 0 2.329.938.906.921.906 2.578 0 1.328-.406 2.093-.391.766-1.157 1.188-.765.422-1.672.422-1.453 0-2.359-.922-.89-.938-.89-2.688zm1.204 0q0 1.329.578 1.985.593.656 1.468.656t1.454-.656q.578-.672.578-2.031 0-1.282-.594-1.938-.578-.656-1.438-.656-.875 0-1.468.656-.578.656-.578 1.984zm6.63 3.454v-6.907h1.063v1.047q.407-.734.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.235-.297.234-.422.64-.203.625-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.766-2.813h1.516l-2.641 2.563 2.906 4.344h-1.437l-2.282-3.532-.828.797v2.735zm11.383-2.22 1.203.141q-.28 1.063-1.062 1.657-.766.578-1.969.578-1.515 0-2.406-.938-.89-.937-.89-2.61 0-1.75.89-2.702.906-.969 2.344-.969 1.39 0 2.265.938.875.937.875 2.656v.312h-5.156q.063 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.078zm-3.843-1.905h3.859q-.078-.86-.438-1.297-.562-.688-1.453-.688-.812 0-1.36.547-.546.531-.608 1.438zm6.506 4.125v-6.907h1.062v1.047q.406-.734.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.235-.297.234-.422.64-.203.625-.203 1.36v3.625z" fill="#000"/><path d="m175.357 625.421h103.119v46.52h-103.119z" fill="#e6b8af" fill-rule="evenodd"/><path d="m175.357 625.421h103.119v46.52h-103.119z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round" stroke-width="1.183"/><path d="m208.252 653.48-2.532-9.546h1.297l1.453 6.266q.235.984.407 1.953.359-1.531.422-1.766l1.828-6.453h1.515l1.375 4.828q.516 1.797.735 3.39.187-.905.484-2.077l1.484-6.141h1.282l-2.625 9.547h-1.22l-2-7.266q-.265-.922-.312-1.125-.14.657-.28 1.125l-2.016 7.266zm10.088-3.452q0-1.922 1.079-2.844.89-.766 2.171-.766 1.422 0 2.329.938.906.922.906 2.578 0 1.328-.406 2.094-.391.765-1.157 1.187-.765.422-1.671.422-1.454 0-2.36-.922-.89-.937-.89-2.687zm1.204 0q0 1.328.578 1.984.593.656 1.468.656t1.454-.656q.578-.672.578-2.031 0-1.281-.594-1.938-.578-.656-1.438-.656-.875 0-1.468.656-.578.657-.578 1.985zm6.63 3.453v-6.906h1.063v1.047q.407-.735.735-.97.343-.234.765-.234.594 0 1.203.375l-.406 1.079q-.437-.25-.86-.25-.39 0-.702.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.766-2.812h1.516l-2.641 2.562 2.906 4.344h-1.437l-2.282-3.531-.828.797v2.734zm11.383-2.219 1.203.14q-.28 1.063-1.062 1.657-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.969 2.344-.969 1.39 0 2.265.938.875.937.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.593 1.438.593.656 0 1.11-.328.453-.343.718-1.078zm-3.843-1.906h3.859q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.546-.546.532-.608 1.438zm6.506 4.125v-6.906h1.062v1.047q.407-.735.735-.97.343-.234.765-.234.594 0 1.203.375l-.406 1.079q-.437-.25-.86-.25-.39 0-.702.234-.297.234-.422.64-.203.626-.203 1.36v3.625z" fill="#000"/><path d="m180.64 619.232h103.12v46.52h-103.12z" fill="#e6b8af" fill-rule="evenodd" stroke="#000" stroke-width="2.7"/><path d="m210.203 647.292-2.532-9.547h1.297l1.453 6.266q.235.984.407 1.953.359-1.531.422-1.766l1.828-6.453h1.515l1.375 4.828q.516 1.797.735 3.391.187-.906.484-2.078l1.484-6.14h1.282l-2.625 9.546h-1.22l-2-7.265q-.265-.922-.312-1.125-.14.656-.28 1.125l-2.016 7.265zm10.088-3.453q0-1.922 1.079-2.844.89-.765 2.171-.765 1.422 0 2.329.937.906.922.906 2.578 0 1.328-.406 2.094-.391.766-1.157 1.188-.765.421-1.672.421-1.453 0-2.359-.921-.89-.938-.89-2.688zm1.204 0q0 1.328.578 1.984.593.657 1.468.657t1.454-.657q.578-.671.578-2.03 0-1.282-.594-1.938-.578-.657-1.438-.657-.875 0-1.468.657-.578.656-.578 1.984zm6.63 3.453v-6.906h1.063v1.047q.407-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.766-2.812h1.516l-2.641 2.562 2.906 4.344h-1.437l-2.282-3.531-.828.797v2.734zm11.383-2.219 1.203.141q-.28 1.063-1.062 1.656-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.079zm-3.843-1.906h3.859q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.547-.546.531-.608 1.437zm6.506 4.125v-6.906h1.062v1.047q.406-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm3.985-2.062 1.156-.188q.11.703.547 1.078.453.36 1.25.36.813 0 1.203-.328.39-.329.39-.766 0-.39-.359-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.844.219-.406.578-.672.282-.187.75-.328.47-.14 1.016-.14.812 0 1.422.234.61.234.906.64.297.391.406 1.063l-1.14.156q-.078-.53-.453-.828-.375-.312-1.063-.312-.812 0-1.156.265-.344.266-.344.625 0 .235.14.422.157.188.454.313.172.062 1.031.297 1.25.328 1.734.547.5.203.782.609.281.406.281 1t-.344 1.11q-.344.515-1 .796-.64.281-1.453.281-1.344 0-2.047-.562-.703-.563-.906-1.656z" fill="#000"/><path d="m138.64 760.512h149.423v47.631h-149.424z" fill="#fce5cd" fill-rule="evenodd"/><path d="m138.64 760.512h149.423v47.631h-149.424z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m151.913 780.687v-11.453h8.282v1.344h-6.766v3.516h6.344v1.343h-6.344v3.891h7.031v1.36zm9.532 0 3.031-4.312-2.813-3.984h1.766l1.266 1.937q.36.563.578.938.344-.516.64-.922l1.391-1.953h1.688l-2.875 3.906 3.093 4.39h-1.734l-1.703-2.578-.453-.703-2.172 3.281zm14.61-2.671 1.452.171q-.344 1.282-1.281 1.985-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.079-3.25 1.078-1.157 2.796-1.157 1.657 0 2.704 1.14 1.062 1.126 1.062 3.173v.375h-6.187q.078 1.375.765 2.109.703.719 1.735.719.78 0 1.328-.407.547-.406.86-1.296zm-4.61-2.282h4.625q-.094-1.047-.532-1.562-.671-.813-1.734-.813-.969 0-1.64.657-.657.64-.72 1.718zm13.242 1.907 1.39.187q-.234 1.422-1.171 2.234-.922.813-2.282.813-1.703 0-2.75-1.11-1.03-1.124-1.03-3.203 0-1.343.437-2.343.453-1.016 1.359-1.516.922-.5 1.984-.5 1.36 0 2.22.688.859.671 1.093 1.937l-1.36.203q-.203-.828-.703-1.25-.484-.422-1.187-.422-1.063 0-1.734.766-.657.75-.657 2.406 0 1.672.64 2.438.642.75 1.673.75.828 0 1.375-.5.562-.516.703-1.578zm8.031 3.046v-1.218q-.969 1.406-2.64 1.406-.735 0-1.375-.281-.625-.282-.938-.703-.312-.438-.437-1.047-.079-.422-.079-1.313v-5.14h1.407v4.593q0 1.11.078 1.485.14.562.562.875.438.312 1.063.312.64 0 1.187-.312.563-.328.782-.891.234-.562.234-1.625v-4.437h1.406v8.296zm6.524-1.265.203 1.25q-.594.125-1.063.125-.765 0-1.187-.235-.422-.25-.594-.64-.172-.406-.172-1.672v-4.766h-1.031v-1.093h1.031v-2.063l1.406-.844v2.907h1.407v1.093h-1.407v4.844q0 .61.063.781.078.172.25.282.172.093.484.093.235 0 .61-.062zm1.382-8.578v-1.61h1.407v1.61zm0 9.843v-8.296h1.407v8.296zm3.024-4.156q0-2.297 1.281-3.406 1.078-.922 2.61-.922 1.718 0 2.796 1.125 1.094 1.11 1.094 3.094 0 1.594-.484 2.515-.485.922-1.407 1.438-.906.5-2 .5-1.734 0-2.812-1.11-1.078-1.124-1.078-3.234zm1.453 0q0 1.594.687 2.39.704.798 1.75.798 1.047 0 1.735-.797.703-.797.703-2.438 0-1.531-.703-2.328-.688-.797-1.735-.797-1.046 0-1.75.797-.687.781-.687 2.375zm7.977 4.156v-8.296h1.265v1.171q.906-1.359 2.64-1.359.75 0 1.376.266.625.265.937.703.313.437.438 1.047.078.39.078 1.359v5.11h-1.406v-5.047q0-.86-.172-1.282-.156-.437-.578-.687-.407-.25-.97-.25-.905 0-1.562.578-.64.562-.64 2.156v4.531zm17.242-4.015 1.515.375q-.468 1.875-1.718 2.86-1.235.984-3.016.984-1.86 0-3.016-.75-1.156-.766-1.765-2.188-.61-1.437-.61-3.078 0-1.797.688-3.125.687-1.328 1.937-2.016 1.266-.703 2.782-.703 1.718 0 2.89.875 1.172.875 1.64 2.469l-1.5.344q-.39-1.25-1.155-1.813-.75-.578-1.907-.578-1.312 0-2.203.64-.89.626-1.25 1.704-.36 1.062-.36 2.187 0 1.469.423 2.563.437 1.078 1.328 1.625.906.531 1.953.531 1.266 0 2.14-.734.891-.735 1.204-2.172zm2.68-.14q0-2.298 1.28-3.407 1.079-.922 2.61-.922 1.719 0 2.797 1.125 1.094 1.11 1.094 3.094 0 1.594-.485 2.515-.484.922-1.406 1.438-.906.5-2 .5-1.734 0-2.812-1.11-1.079-1.124-1.079-3.234zm1.453 0q0 1.593.687 2.39.703.797 1.75.797 1.047 0 1.734-.797.704-.797.704-2.438 0-1.531-.704-2.328-.687-.797-1.734-.797t-1.75.797q-.687.781-.687 2.375zm7.976 4.155v-8.296h1.266v1.171q.906-1.359 2.64-1.359.75 0 1.375.266.625.265.938.703.312.437.437 1.047.078.39.078 1.359v5.11h-1.406v-5.047q0-.86-.172-1.282-.156-.437-.578-.687-.406-.25-.969-.25-.906 0-1.562.578-.64.562-.64 2.156v4.531zm11.961-1.265.203 1.25q-.594.125-1.062.125-.766 0-1.188-.235-.422-.25-.594-.64-.171-.406-.171-1.672v-4.766h-1.032v-1.093h1.032v-2.063l1.406-.844v2.907h1.406v1.093h-1.406v4.844q0 .61.062.781.078.172.25.282.172.093.485.093.234 0 .609-.062zm7.055-1.406 1.453.171q-.344 1.282-1.281 1.985-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.14 1.063 1.126 1.063 3.173v.375h-6.188q.078 1.375.766 2.109.703.719 1.734.719.781 0 1.328-.407.547-.406.86-1.296zm-4.61-2.282h4.625q-.093-1.047-.53-1.562-.673-.813-1.735-.813-.969 0-1.64.657-.657.64-.72 1.718zm6.899 4.953 3.031-4.312-2.812-3.984h1.765l1.266 1.937q.36.563.578.938.344-.516.64-.922l1.391-1.953h1.688l-2.875 3.906 3.093 4.39h-1.734l-1.703-2.578-.453-.703-2.172 3.281zm12-1.265.203 1.25q-.594.125-1.063.125-.765 0-1.187-.235-.422-.25-.594-.64-.172-.406-.172-1.672v-4.766h-1.031v-1.093h1.031v-2.063l1.407-.844v2.907h1.406v1.093h-1.406v4.844q0 .61.062.781.078.172.25.282.172.093.484.093.235 0 .61-.062zm-107.68 17.781 1.39-.219q.11.844.641 1.297.547.438 1.5.438.97 0 1.438-.391.469-.406.469-.938 0-.468-.407-.75-.297-.187-1.437-.468-1.547-.39-2.156-.672-.594-.297-.907-.797-.297-.5-.297-1.11 0-.562.25-1.03.25-.47.688-.782.328-.25.89-.406.579-.172 1.22-.172.984 0 1.718.281t1.078.766q.36.469.5 1.281l-1.375.188q-.093-.641-.547-1-.453-.36-1.265-.36-.969 0-1.39.328-.407.313-.407.735 0 .281.172.5.172.218.531.375.219.078 1.25.36 1.484.39 2.078.655.594.25.922.735.344.484.344 1.203 0 .703-.422 1.328-.406.61-1.188.953-.765.344-1.734.344-1.625 0-2.469-.672-.844-.672-1.078-2zm15.695 5.86q-1.171-1.47-1.984-3.438-.797-1.985-.797-4.094 0-1.86.61-3.562.703-1.97 2.171-3.938h1q-.937 1.625-1.25 2.328-.468 1.078-.75 2.25-.328 1.453-.328 2.938 0 3.75 2.328 7.515zm8.313-6.048 1.453.172q-.344 1.282-1.281 1.985-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.095 1.078-3.25 1.079-1.157 2.797-1.157 1.657 0 2.703 1.14 1.063 1.126 1.063 3.173v.375h-6.188q.079 1.375.766 2.109.703.719 1.734.719.782 0 1.329-.407.546-.406.859-1.297zm-4.61-2.28h4.626q-.094-1.048-.532-1.563-.672-.813-1.734-.813-.969 0-1.64.656-.657.641-.72 1.72zm6.899 4.952 3.031-4.312-2.812-3.985h1.765l1.266 1.938q.36.563.578.938.344-.516.64-.922l1.391-1.954h1.688l-2.875 3.907 3.094 4.39h-1.735l-1.703-2.578-.453-.703-2.172 3.281zm12-1.265.203 1.25q-.594.125-1.062.125-.766 0-1.188-.235-.422-.25-.594-.64-.172-.407-.172-1.672v-4.766h-1.03v-1.094h1.03v-2.062l1.407-.844v2.906h1.406v1.094h-1.406v4.844q0 .61.062.781.078.172.25.281.172.094.485.094.234 0 .609-.062zm7.055-1.407 1.453.172q-.344 1.282-1.281 1.985-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.095 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.14 1.063 1.126 1.063 3.173v.375h-6.188q.078 1.375.766 2.109.703.719 1.734.719.781 0 1.328-.407.547-.406.86-1.297zm-4.61-2.28h4.625q-.093-1.048-.531-1.563-.672-.813-1.734-.813-.97 0-1.641.656-.656.641-.719 1.72zm7.836 4.952v-8.297h1.266v1.172q.906-1.359 2.64-1.359.75 0 1.375.266.625.265.938.703.312.437.437 1.047.079.39.079 1.359v5.11h-1.407v-5.048q0-.859-.172-1.28-.156-.438-.578-.688-.406-.25-.968-.25-.907 0-1.563.578-.64.562-.64 2.156v4.531zm8.336-2.484 1.39-.219q.11.844.641 1.297.547.438 1.5.438.97 0 1.438-.391.469-.406.469-.938 0-.468-.407-.75-.296-.187-1.437-.468-1.547-.39-2.156-.672-.594-.297-.907-.797-.296-.5-.296-1.11 0-.562.25-1.03.25-.47.687-.782.328-.25.89-.406.579-.172 1.22-.172.984 0 1.718.281.735.281 1.078.766.36.469.5 1.281l-1.375.188q-.093-.641-.547-1-.453-.36-1.265-.36-.969 0-1.39.328-.407.313-.407.735 0 .281.172.5.172.218.531.375.219.078 1.25.36 1.484.39 2.078.655.594.25.922.735.344.484.344 1.203 0 .703-.422 1.328-.406.61-1.188.953-.765.344-1.734.344-1.625 0-2.469-.672-.843-.672-1.078-2zm8.563-7.36v-1.609h1.406v1.61zm0 9.844v-8.297h1.406v8.297zm3.023-4.156q0-2.297 1.281-3.406 1.078-.922 2.61-.922 1.718 0 2.797 1.125 1.093 1.11 1.093 3.094 0 1.593-.484 2.515-.484.922-1.406 1.438-.907.5-2 .5-1.735 0-2.813-1.11-1.078-1.125-1.078-3.234zm1.453 0q0 1.594.688 2.39.703.798 1.75.798 1.047 0 1.734-.797.703-.797.703-2.438 0-1.531-.703-2.328-.687-.797-1.734-.797t-1.75.797q-.688.781-.688 2.375zm7.977 4.156v-8.297h1.265v1.172q.907-1.359 2.641-1.359.75 0 1.375.266.625.265.938.703.312.437.437 1.047.078.39.078 1.359v5.11h-1.406v-5.048q0-.859-.172-1.28-.156-.438-.578-.688-.406-.25-.969-.25-.906 0-1.562.578-.641.562-.641 2.156v4.531zm9.82 3.375h-1.016q2.344-3.765 2.344-7.515 0-1.469-.344-2.922-.265-1.172-.734-2.25-.312-.703-1.266-2.344h1.016q1.469 1.969 2.172 3.938.594 1.703.594 3.562 0 2.11-.813 4.094-.797 1.969-1.953 3.437z" fill="#000"/><path d="m142.264 754.636h149.423v47.631h-149.423z" fill="#fce5cd" fill-rule="evenodd"/><path d="m142.264 754.636h149.423v47.631h-149.423z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m155.538 774.812v-11.453h8.282v1.343h-6.766v3.516h6.344v1.344h-6.344v3.89h7.031v1.36zm9.532 0 3.03-4.313-2.812-3.984h1.766l1.266 1.937q.359.563.578.938.343-.516.64-.922l1.391-1.953h1.687l-2.875 3.906 3.094 4.39h-1.734l-1.703-2.577-.453-.703-2.172 3.28zm14.609-2.672 1.453.172q-.344 1.281-1.281 1.984-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.079-1.157 2.797-1.157 1.657 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.079 1.375.766 2.11.703.718 1.734.718.782 0 1.329-.406.546-.406.859-1.297zm-4.61-2.281h4.626q-.094-1.047-.532-1.563-.672-.812-1.734-.812-.969 0-1.64.656-.657.64-.72 1.719zm13.243 1.906 1.39.187q-.234 1.422-1.171 2.235-.922.812-2.282.812-1.703 0-2.75-1.11-1.03-1.124-1.03-3.202 0-1.344.437-2.344.453-1.016 1.359-1.516.922-.5 1.984-.5 1.36 0 2.22.688.858.672 1.093 1.937l-1.36.204q-.203-.829-.703-1.25-.484-.422-1.187-.422-1.063 0-1.735.765-.656.75-.656 2.407 0 1.671.64 2.437.641.75 1.673.75.828 0 1.375-.5.562-.516.703-1.578zm8.031 3.047v-1.219q-.969 1.406-2.64 1.406-.735 0-1.376-.281-.625-.281-.937-.703-.313-.438-.438-1.047-.078-.422-.078-1.312v-5.141h1.407v4.594q0 1.109.078 1.484.14.563.562.875.438.313 1.063.313.64 0 1.187-.313.563-.328.781-.89.235-.563.235-1.626v-4.437h1.406v8.297zm6.523-1.266.204 1.25q-.594.125-1.063.125-.766 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.031v-1.094h1.031v-2.063l1.406-.843v2.906h1.406v1.094h-1.406v4.843q0 .61.063.782.078.172.25.28.172.095.484.095.234 0 .61-.063zm1.383-8.578v-1.61h1.407v1.61zm0 9.844v-8.297h1.407v8.297zm3.024-4.156q0-2.297 1.281-3.407 1.078-.922 2.61-.922 1.718 0 2.796 1.125 1.094 1.11 1.094 3.094 0 1.594-.484 2.516-.485.922-1.407 1.437-.906.5-2 .5-1.734 0-2.812-1.11-1.078-1.124-1.078-3.233zm1.453 0q0 1.593.687 2.39.703.797 1.75.797 1.047 0 1.735-.797.703-.797.703-2.437 0-1.532-.703-2.328-.688-.797-1.735-.797-1.047 0-1.75.797-.687.78-.687 2.375zm7.976 4.156v-8.297h1.266v1.172q.906-1.36 2.64-1.36.75 0 1.376.266.625.266.937.703.313.438.438 1.047.078.39.078 1.36v5.109h-1.406v-5.047q0-.86-.172-1.281-.157-.438-.578-.688-.407-.25-.97-.25-.905 0-1.562.578-.64.563-.64 2.157v4.53zm17.243-4.016 1.515.375q-.469 1.875-1.719 2.86-1.234.984-3.015.984-1.86 0-3.016-.75-1.156-.766-1.765-2.188-.61-1.437-.61-3.078 0-1.797.688-3.125.687-1.328 1.937-2.015 1.266-.703 2.781-.703 1.72 0 2.891.875 1.172.875 1.64 2.468l-1.5.344q-.39-1.25-1.156-1.812-.75-.579-1.906-.579-1.312 0-2.203.641-.89.625-1.25 1.703-.36 1.063-.36 2.188 0 1.468.423 2.562.437 1.078 1.328 1.625.906.531 1.953.531 1.265 0 2.14-.734.891-.734 1.204-2.172zm2.68-.14q0-2.297 1.28-3.407 1.079-.922 2.61-.922 1.719 0 2.797 1.125 1.094 1.11 1.094 3.094 0 1.594-.485 2.516-.484.922-1.406 1.437-.906.5-2 .5-1.734 0-2.813-1.11-1.078-1.124-1.078-3.233zm1.452 0q0 1.593.688 2.39.703.797 1.75.797 1.047 0 1.734-.797.703-.797.703-2.437 0-1.532-.703-2.328-.687-.797-1.734-.797t-1.75.797q-.688.78-.688 2.375zm7.977 4.156v-8.297h1.266v1.172q.906-1.36 2.64-1.36.75 0 1.375.266t.938.703q.312.438.437 1.047.078.39.078 1.36v5.109h-1.406v-5.047q0-.86-.172-1.281-.156-.438-.578-.688-.406-.25-.969-.25-.906 0-1.562.578-.64.563-.64 2.157v4.53zm11.96-1.266.204 1.25q-.594.125-1.062.125-.766 0-1.188-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.03v-1.094h1.03v-2.063l1.407-.843v2.906h1.406v1.094h-1.406v4.843q0 .61.062.782.078.172.25.28.172.095.485.095.234 0 .609-.063zm7.056-1.406 1.453.172q-.344 1.281-1.282 1.984-.921.703-2.359.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.078 1.375.766 2.11.703.718 1.734.718.781 0 1.328-.406t.86-1.297zm-4.61-2.281h4.625q-.093-1.047-.531-1.563-.672-.812-1.734-.812-.97 0-1.641.656-.656.64-.719 1.719zm6.899 4.953 3.03-4.313-2.812-3.984h1.766l1.266 1.937q.36.563.578.938.344-.516.64-.922l1.391-1.953h1.688l-2.875 3.906 3.093 4.39h-1.734l-1.703-2.577-.453-.703-2.172 3.28zm12-1.266.203 1.25q-.594.125-1.063.125-.765 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.031v-1.094h1.031v-2.063l1.406-.843v2.906h1.407v1.094h-1.407v4.843q0 .61.063.782.078.172.25.28.172.095.484.095.235 0 .61-.063zm-107.68 17.781 1.39-.218q.11.843.641 1.297.547.437 1.5.437.969 0 1.438-.39.468-.407.468-.938 0-.469-.406-.75-.297-.188-1.437-.469-1.547-.39-2.157-.672-.593-.297-.906-.797-.297-.5-.297-1.109 0-.562.25-1.031.25-.469.688-.781.328-.25.89-.407.579-.172 1.22-.172.984 0 1.718.282.734.28 1.078.765.36.47.5 1.282l-1.375.187q-.094-.64-.547-1-.453-.36-1.265-.36-.97 0-1.391.329-.406.312-.406.734 0 .281.172.5.171.219.53.375.22.078 1.25.36 1.485.39 2.079.656.594.25.922.734.344.485.344 1.203 0 .703-.422 1.328-.407.61-1.188.954-.765.343-1.734.343-1.625 0-2.469-.672-.844-.671-1.078-2zm15.695 5.86q-1.172-1.469-1.984-3.438-.797-1.984-.797-4.093 0-1.86.61-3.563.703-1.969 2.171-3.937h1q-.937 1.625-1.25 2.328-.468 1.078-.75 2.25-.328 1.453-.328 2.937 0 3.75 2.328 7.516zm8.313-6.047 1.453.172q-.344 1.281-1.281 1.984-.922.703-2.36.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.078 1.375.766 2.11.703.718 1.734.718.782 0 1.328-.406.547-.406.86-1.297zm-4.61-2.281h4.625q-.093-1.047-.53-1.563-.673-.812-1.735-.812-.969 0-1.64.656-.657.64-.72 1.719zm6.899 4.953 3.031-4.313-2.812-3.984h1.765l1.266 1.937q.36.563.578.938.344-.516.64-.922l1.391-1.953h1.688l-2.875 3.906 3.093 4.39h-1.734l-1.703-2.577-.453-.703-2.172 3.28zm12-1.266.203 1.25q-.594.125-1.063.125-.765 0-1.187-.234-.422-.25-.594-.64-.172-.407-.172-1.673v-4.765h-1.03v-1.094h1.03v-2.063l1.407-.843v2.906h1.406v1.094h-1.406v4.843q0 .61.062.782.078.172.25.28.172.095.484.095.235 0 .61-.063zm7.055-1.406 1.453.172q-.344 1.281-1.282 1.984-.921.703-2.359.703-1.828 0-2.89-1.125-1.063-1.125-1.063-3.14 0-2.094 1.078-3.25 1.078-1.157 2.797-1.157 1.656 0 2.703 1.141 1.063 1.125 1.063 3.172v.375h-6.188q.078 1.375.766 2.11.703.718 1.734.718.781 0 1.328-.406t.86-1.297zm-4.61-2.281h4.625q-.094-1.047-.531-1.563-.672-.812-1.734-.812-.97 0-1.641.656-.656.64-.719 1.719zm7.836 4.953v-8.297h1.266v1.172q.906-1.36 2.64-1.36.75 0 1.375.266t.938.703q.312.438.437 1.047.078.39.078 1.36v5.109h-1.406v-5.047q0-.86-.172-1.281-.156-.438-.578-.688-.406-.25-.969-.25-.906 0-1.562.578-.64.563-.64 2.157v4.53zm8.336-2.485 1.39-.218q.11.843.641 1.297.547.437 1.5.437.969 0 1.438-.39.469-.407.469-.938 0-.469-.407-.75-.297-.188-1.437-.469-1.547-.39-2.156-.672-.594-.297-.907-.797-.297-.5-.297-1.109 0-.562.25-1.031.25-.469.688-.781.328-.25.89-.407.579-.172 1.22-.172.984 0 1.718.282.734.28 1.078.765.36.47.5 1.282l-1.375.187q-.094-.64-.547-1-.453-.36-1.265-.36-.97 0-1.391.329-.406.312-.406.734 0 .281.172.5.172.219.53.375.22.078 1.25.36 1.485.39 2.079.656.594.25.922.734.344.485.344 1.203 0 .703-.422 1.328-.406.61-1.188.954-.765.343-1.734.343-1.625 0-2.469-.672-.844-.671-1.078-2zm8.563-7.359v-1.61h1.406v1.61zm0 9.844v-8.297h1.406v8.297zm3.023-4.156q0-2.297 1.281-3.407 1.078-.922 2.61-.922 1.718 0 2.796 1.125 1.094 1.11 1.094 3.094 0 1.594-.484 2.516-.485.922-1.406 1.437-.907.5-2 .5-1.735 0-2.813-1.11-1.078-1.124-1.078-3.233zm1.453 0q0 1.593.688 2.39.703.797 1.75.797 1.046 0 1.734-.797.703-.797.703-2.437 0-1.532-.703-2.328-.688-.797-1.734-.797-1.047 0-1.75.797-.688.78-.688 2.375zm7.977 4.156v-8.297h1.265v1.172q.907-1.36 2.64-1.36.75 0 1.376.266.625.266.937.703.313.438.438 1.047.078.39.078 1.36v5.109h-1.406v-5.047q0-.86-.172-1.281-.156-.438-.578-.688-.406-.25-.969-.25-.906 0-1.562.578-.641.563-.641 2.157v4.53zm9.82 3.375h-1.016q2.344-3.766 2.344-7.516 0-1.469-.344-2.922-.265-1.172-.734-2.25-.313-.703-1.266-2.343h1.016q1.469 1.968 2.172 3.937.594 1.703.594 3.563 0 2.109-.813 4.093-.797 1.97-1.953 3.438z" fill="#000"/><path d="m147.39 749.51h149.422v47.632h-149.422z" fill="#fce5cd" fill-rule="evenodd"/><path d="m147.39 749.51h149.422v47.632h-149.422z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m167.583 770.126v-9.546h6.907v1.125h-5.641v2.921h5.281v1.125h-5.281v3.25h5.86v1.125zm7.937 0 2.531-3.593-2.344-3.313h1.47l1.062 1.61q.297.468.484.78.281-.437.516-.765l1.172-1.625h1.406l-2.39 3.25 2.562 3.656h-1.438l-1.422-2.14-.375-.594-1.812 2.734zm12.18-2.218 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.908h3.86q-.079-.859-.438-1.296-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.437zm11.037 1.594 1.157.156q-.188 1.188-.97 1.86-.78.672-1.921.672-1.406 0-2.281-.922-.86-.938-.86-2.656 0-1.125.375-1.97.375-.843 1.125-1.25.766-.421 1.657-.421 1.125 0 1.843.578.72.563.922 1.61l-1.14.171q-.172-.703-.594-1.047-.406-.359-.985-.359-.89 0-1.453.64-.547.641-.547 2 0 1.407.532 2.032.547.625 1.406.625.687 0 1.14-.422.47-.422.594-1.297zm6.68 2.531v-1.015q-.812 1.172-2.187 1.172-.61 0-1.141-.235-.531-.234-.797-.578-.25-.36-.36-.875-.062-.344-.062-1.094v-4.28h1.172v3.827q0 .922.063 1.235.109.468.468.734.36.25.89.25.517 0 .985-.266.469-.265.657-.734.187-.469.187-1.344v-3.703h1.172v6.906zm5.444-1.046.172 1.03q-.5.11-.891.11-.64 0-1-.203-.344-.203-.484-.531-.141-.328-.141-1.39v-3.97h-.86v-.906h.86v-1.719l1.172-.703v2.422h1.172v.906h-1.172v4.047q0 .5.047.64.062.142.203.235.14.078.406.078.203 0 .516-.047zm1.156-7.141v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm2.508-3.453q0-1.922 1.078-2.843.89-.766 2.172-.766 1.422 0 2.328.937.906.922.906 2.579 0 1.328-.406 2.093-.39.766-1.156 1.188-.766.422-1.672.422-1.453 0-2.36-.922-.89-.938-.89-2.688zm1.203 0q0 1.328.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.032 0-1.28-.594-1.937-.578-.656-1.437-.656-.875 0-1.469.656-.578.656-.578 1.984zm6.647 3.453v-6.906h1.062v.985q.75-1.141 2.188-1.141.625 0 1.156.219.531.218.781.593.266.36.375.86.063.328.063 1.14v4.25h-1.172v-4.203q0-.718-.14-1.062-.141-.36-.485-.563-.344-.218-.813-.218-.75 0-1.296.468-.547.469-.547 1.797v3.781zm14.365-3.343 1.266.312q-.39 1.563-1.422 2.375-1.031.813-2.531.813-1.531 0-2.5-.625-.969-.625-1.484-1.813-.5-1.187-.5-2.562 0-1.485.562-2.594.578-1.11 1.625-1.688 1.063-.578 2.328-.578 1.422 0 2.39.735.985.718 1.376 2.047l-1.25.296q-.328-1.046-.969-1.515-.625-.485-1.578-.485-1.094 0-1.844.532-.734.53-1.031 1.422-.297.875-.297 1.828 0 1.218.344 2.125.36.906 1.11 1.359.75.438 1.624.438 1.063 0 1.797-.61t.984-1.812zm2.235-.11q0-1.922 1.078-2.843.89-.766 2.172-.766 1.422 0 2.328.937.906.922.906 2.579 0 1.328-.406 2.093-.39.766-1.156 1.188-.766.422-1.672.422-1.453 0-2.36-.922-.89-.938-.89-2.688zm1.203 0q0 1.328.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.032 0-1.28-.594-1.937-.578-.656-1.437-.656-.875 0-1.469.656-.578.656-.578 1.984zm6.647 3.453v-6.906h1.062v.985q.75-1.141 2.188-1.141.625 0 1.156.219.531.218.781.593.266.36.375.86.063.328.063 1.14v4.25h-1.172v-4.203q0-.718-.14-1.062-.141-.36-.485-.563-.344-.218-.812-.218-.75 0-1.297.468-.547.469-.547 1.797v3.781zm9.975-1.046.172 1.03q-.5.11-.89.11-.641 0-1-.203-.345-.203-.485-.531t-.14-1.39v-3.97h-.86v-.906h.86v-1.719l1.171-.703v2.422h1.172v.906h-1.172v4.047q0 .5.047.64.062.142.203.235.14.078.406.078.203 0 .516-.047zm5.875-1.172 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.296-.563-.688-1.453-.688-.813 0-1.36.547-.546.531-.609 1.437zm5.74 4.125 2.532-3.593-2.344-3.313h1.469l1.062 1.61q.297.468.485.78.281-.437.515-.765l1.172-1.625h1.406l-2.39 3.25 2.562 3.656h-1.437l-1.422-2.14-.375-.594-1.813 2.734zm10.008-1.046.172 1.03q-.5.11-.89.11-.64 0-1-.203-.344-.203-.485-.531-.14-.328-.14-1.39v-3.97h-.86v-.906h.86v-1.719l1.172-.703v2.422h1.171v.906h-1.171v4.047q0 .5.046.64.063.142.204.235.14.078.406.078.203 0 .515-.047zm.672-1.016 1.156-.188q.11.704.547 1.079.453.359 1.25.359.813 0 1.203-.328.391-.328.391-.766 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.843.22-.407.579-.672.28-.188.75-.328.468-.141 1.015-.141.813 0 1.422.234.61.235.906.64.297.392.407 1.063l-1.141.157q-.078-.532-.453-.828-.375-.313-1.063-.313-.812 0-1.156.266-.344.265-.344.625 0 .234.14.422.157.187.454.312.172.063 1.031.297 1.25.328 1.735.547.5.203.78.61.282.405.282 1 0 .593-.344 1.109-.343.515-1 .796-.64.282-1.453.282-1.343 0-2.047-.563-.703-.562-.906-1.656zm-82.479 20.876q-.984-1.234-1.656-2.875-.656-1.64-.656-3.39 0-1.548.5-2.97.578-1.64 1.812-3.28h.828q-.781 1.359-1.031 1.937-.406.89-.625 1.875-.281 1.219-.281 2.437 0 3.14 1.937 6.266zm6.923-5.031 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.908h3.86q-.079-.859-.438-1.296-.563-.688-1.453-.688-.813 0-1.36.547-.546.531-.609 1.437zm5.74 4.125 2.532-3.593-2.344-3.313h1.469l1.062 1.61q.297.468.485.78.281-.437.515-.765l1.172-1.625h1.406l-2.39 3.25 2.562 3.656h-1.437l-1.422-2.14-.375-.594-1.813 2.734zm10.008-1.046.172 1.03q-.5.11-.89.11-.64 0-1-.203-.344-.203-.485-.531-.14-.328-.14-1.39v-3.97h-.86v-.906h.86v-1.719l1.172-.703v2.422h1.171v.906h-1.171v4.047q0 .5.046.64.063.142.204.235.14.078.406.078.203 0 .515-.047zm5.875-1.172 1.203.14q-.28 1.063-1.062 1.657-.766.578-1.969.578-1.515 0-2.406-.938-.89-.937-.89-2.61 0-1.75.89-2.702.906-.97 2.344-.97 1.39 0 2.265.938.875.938.875 2.657v.312h-5.156q.063 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.078zm-3.843-1.907h3.859q-.078-.859-.438-1.296-.562-.688-1.453-.688-.812 0-1.36.547-.546.531-.608 1.437zm6.521 4.125v-6.906h1.063v.985q.75-1.141 2.187-1.141.625 0 1.157.219.53.218.78.593.267.36.376.86.062.328.062 1.14v4.25h-1.171v-4.203q0-.718-.141-1.062-.14-.36-.484-.563-.344-.218-.813-.218-.75 0-1.297.468-.547.469-.547 1.797v3.781zm6.944-2.062 1.156-.188q.11.704.547 1.079.453.359 1.25.359.813 0 1.203-.328.391-.328.391-.766 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.843.22-.407.578-.672.282-.188.75-.328.47-.141 1.016-.141.813 0 1.422.234.61.235.906.64.297.392.406 1.063l-1.14.157q-.078-.532-.453-.828-.375-.313-1.063-.313-.812 0-1.156.266-.344.265-.344.625 0 .234.14.422.157.187.454.312.172.063 1.031.297 1.25.328 1.735.547.5.203.78.61.282.405.282 1 0 .593-.344 1.109-.343.515-1 .796-.64.282-1.453.282-1.344 0-2.047-.563-.703-.562-.906-1.656zm7.149-6.125v-1.36h1.171v1.36zm0 8.187v-6.906h1.171v6.906zm2.508-3.453q0-1.922 1.078-2.843.89-.766 2.172-.766 1.421 0 2.328.937.906.922.906 2.579 0 1.328-.406 2.093-.391.766-1.157 1.188-.765.422-1.671.422-1.454 0-2.36-.922-.89-.938-.89-2.688zm1.203 0q0 1.328.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.032 0-1.28-.594-1.937-.578-.656-1.437-.656-.875 0-1.47.656-.577.656-.577 1.984zm6.646 3.453v-6.906h1.063v.985q.75-1.141 2.187-1.141.625 0 1.157.219.531.218.781.593.266.36.375.86.062.328.062 1.14v4.25h-1.171v-4.203q0-.718-.141-1.062-.14-.36-.484-.563-.344-.218-.813-.218-.75 0-1.297.468-.547.469-.547 1.797v3.781zm6.944-2.062 1.156-.188q.11.704.547 1.079.453.359 1.25.359.813 0 1.203-.328.391-.328.391-.766 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.843.22-.407.579-.672.28-.188.75-.328.468-.141 1.015-.141.813 0 1.422.234.61.235.906.64.297.392.407 1.063l-1.141.157q-.078-.532-.453-.828-.375-.313-1.063-.313-.812 0-1.156.266-.344.265-.344.625 0 .234.141.422.156.187.453.312.172.063 1.031.297 1.25.328 1.735.547.5.203.781.61.281.405.281 1 0 .593-.344 1.109-.343.515-1 .796-.64.282-1.453.282-1.343 0-2.047-.563-.703-.562-.906-1.656zm7.899 4.875h-.828q1.937-3.125 1.937-6.266 0-1.218-.281-2.422-.219-.984-.61-1.875-.265-.593-1.046-1.953h.828q1.234 1.64 1.812 3.282.5 1.421.5 2.968 0 1.75-.672 3.39-.672 1.642-1.64 2.876z" fill="#000"/><path d="m61.402 690.522h306.708v189.638h-306.708z" style="fill:#c5c5c5;fill-opacity:.65;fill-rule:evenodd;stroke:#000;stroke-width:5;stroke-opacity:.75"/><path d="m78.117 484.717h103.118v46.52h-103.118z" fill="#fff2cc" fill-rule="evenodd"/><path d="m78.117 484.717h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m108.048 501.714 1.204-.11q.078.72.39 1.188.313.453.953.734.657.282 1.47.282.718 0 1.265-.22.562-.218.828-.577.265-.375.265-.828 0-.454-.265-.782-.25-.328-.844-.562-.39-.156-1.703-.469-1.313-.312-1.844-.594-.672-.359-1.015-.89-.329-.532-.329-1.188 0-.719.407-1.344.406-.625 1.187-.953.797-.328 1.766-.328 1.047 0 1.86.344.812.344 1.25 1.016.437.656.468 1.484l-1.203.094q-.11-.907-.672-1.36-.563-.468-1.656-.468-1.14 0-1.672.421-.516.422-.516 1.016 0 .516.36.844.375.328 1.906.687 1.547.344 2.11.594.843.39 1.234.984.39.579.39 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.813.36-1.828.36-1.297 0-2.172-.375-.875-.375-1.375-1.125-.5-.766-.532-1.72zm13.906.844 1.203.14q-.281 1.063-1.063 1.656-.765.579-1.968.579-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.11-.328.452-.344.718-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.546.531-.609 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm6.376 0-2.625-6.906h1.235l1.484 4.14q.234.657.437 1.391.157-.547.438-1.312l1.531-4.219h1.219l-2.625 6.906zm4.758-8.187v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm7.461-2.53 1.156.155q-.187 1.188-.968 1.86-.782.672-1.922.672-1.407 0-2.282-.922-.859-.938-.859-2.657 0-1.125.375-1.968.375-.844 1.125-1.25.766-.422 1.656-.422 1.125 0 1.844.578.719.562.922 1.61l-1.14.171q-.173-.703-.594-1.047-.407-.359-.985-.359-.89 0-1.453.64-.547.641-.547 2 0 1.407.531 2.032.547.625 1.407.625.687 0 1.14-.422.47-.422.594-1.297zm6.883.312 1.203.14q-.281 1.063-1.062 1.656-.766.579-1.97.579-1.515 0-2.405-.938-.891-.937-.891-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.11-.328.452-.344.718-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.297-.562-.687-1.453-.687-.813 0-1.36.547-.546.531-.609 1.437zm-38.571 20.125-2.531-9.546h1.297l1.453 6.265q.234.985.406 1.953.36-1.531.422-1.765l1.828-6.453h1.516l1.375 4.828q.515 1.797.734 3.39.188-.906.484-2.078l1.485-6.14h1.281l-2.625 9.546h-1.219l-2-7.265q-.265-.922-.312-1.125-.14.656-.281 1.125l-2.016 7.265zm10.089-3.453q0-1.922 1.078-2.843.89-.766 2.172-.766 1.422 0 2.328.937.906.922.906 2.579 0 1.328-.406 2.093-.39.766-1.156 1.188-.766.422-1.672.422-1.453 0-2.36-.922-.89-.938-.89-2.688zm1.203 0q0 1.328.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.032 0-1.28-.594-1.937-.578-.656-1.437-.656-.875 0-1.469.656-.578.656-.578 1.984zm6.631 3.453v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm4.47 0v-9.546h1.172v5.453l2.765-2.813h1.516l-2.64 2.563 2.906 4.343h-1.438l-2.281-3.53-.828.796v2.734zm11.383-2.218 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.97 2.344-.97 1.39 0 2.266.938.875.938.875 2.657v.312h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.907h3.86q-.079-.859-.438-1.296-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.235-.422.641-.203.625-.203 1.36v3.624zm3.985-2.062 1.157-.188q.109.704.546 1.079.454.359 1.25.359.813 0 1.204-.328.39-.328.39-.766 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.204-.843.218-.407.578-.672.281-.188.75-.328.468-.141 1.015-.141.813 0 1.422.234.61.235.906.64.297.392.407 1.063l-1.14.157q-.079-.532-.454-.828-.375-.313-1.063-.313-.812 0-1.156.266-.344.265-.344.625 0 .234.141.422.156.187.453.312.172.063 1.031.297 1.25.328 1.735.547.5.203.781.61.281.405.281 1 0 .593-.343 1.109-.344.515-1 .796-.641.282-1.454.282-1.343 0-2.046-.563-.704-.562-.907-1.656z" fill="#000"/><path d="m83.852 479.215h103.118v46.52h-103.118z" fill="#fff2cc" fill-rule="evenodd"/><path d="m83.852 479.215h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m113.783 496.213 1.203-.11q.079.719.391 1.188.313.453.953.734.656.281 1.469.281.719 0 1.266-.218.562-.22.828-.579.265-.375.265-.828 0-.453-.265-.78-.25-.33-.844-.563-.39-.157-1.703-.47-1.313-.312-1.844-.593-.672-.36-1.016-.89-.328-.532-.328-1.188 0-.719.407-1.344.406-.625 1.187-.953.797-.328 1.766-.328 1.047 0 1.86.344.812.343 1.25 1.015.437.657.468 1.485l-1.203.093q-.11-.906-.672-1.359-.563-.469-1.656-.469-1.141 0-1.672.422-.516.422-.516 1.016 0 .515.36.844.374.328 1.906.687 1.547.344 2.11.594.843.39 1.233.984.391.578.391 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.813.36-1.829.36-1.296 0-2.171-.376-.875-.375-1.375-1.125-.5-.765-.532-1.718zm13.906.843 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.53-.609 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.735.734-.97.344-.233.766-.233.593 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm6.376 0-2.625-6.906h1.234l1.485 4.14q.234.657.437 1.391.157-.547.438-1.312l1.531-4.22h1.219l-2.625 6.907zm4.758-8.187v-1.36h1.172v1.36zm0 8.187v-6.906h1.172v6.906zm7.461-2.531 1.156.156q-.187 1.188-.969 1.86-.78.671-1.921.671-1.407 0-2.282-.922-.859-.937-.859-2.656 0-1.125.375-1.969.375-.843 1.125-1.25.766-.421 1.656-.421 1.125 0 1.844.578.719.562.922 1.61l-1.14.17q-.173-.702-.595-1.046-.406-.36-.984-.36-.89 0-1.453.641-.547.64-.547 2 0 1.407.531 2.032.547.625 1.407.625.687 0 1.14-.422.469-.422.594-1.297zm6.883.312 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.109-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.546.53-.609 1.437zm-38.571 20.125-2.531-9.547h1.297l1.453 6.266q.234.984.406 1.953.36-1.531.422-1.766l1.828-6.453h1.516l1.375 4.828q.515 1.797.734 3.391.187-.906.484-2.078l1.485-6.14h1.28l-2.624 9.546h-1.219l-2-7.266q-.265-.921-.312-1.125-.141.657-.282 1.125l-2.015 7.266zm10.089-3.453q0-1.922 1.078-2.844.89-.765 2.172-.765 1.422 0 2.328.937.906.922.906 2.578 0 1.328-.406 2.094-.39.766-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.328.578 1.984.594.657 1.469.657.875 0 1.453-.657.578-.672.578-2.03 0-1.282-.594-1.938-.578-.657-1.437-.657-.875 0-1.469.657-.578.656-.578 1.984zm6.631 3.453v-6.906h1.063v1.047q.406-.735.734-.97.344-.233.766-.233.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.765-2.812h1.516l-2.64 2.562 2.905 4.344h-1.437l-2.281-3.531-.828.797v2.734zm11.383-2.219 1.203.141q-.282 1.062-1.063 1.656-.765.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.64 1.75.58.594 1.438.594.657 0 1.11-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.53-.61 1.437zm6.506 4.125v-6.906h1.063v1.047q.406-.735.734-.97.344-.233.766-.233.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm3.985-2.062 1.157-.188q.109.703.546 1.078.454.36 1.25.36.813 0 1.204-.329.39-.328.39-.765 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.657-.25-.421-.25-.937 0-.453.204-.844.218-.406.578-.672.28-.187.75-.328.468-.14 1.015-.14.813 0 1.422.234.61.234.906.64.297.391.407 1.063l-1.141.156q-.078-.53-.453-.828-.375-.312-1.063-.312-.812 0-1.156.265-.344.266-.344.625 0 .235.141.422.156.188.453.313.172.062 1.031.297 1.25.328 1.735.546.5.204.781.61t.281 1q0 .594-.343 1.11-.344.515-1 .796-.641.281-1.454.281-1.343 0-2.046-.562-.704-.563-.907-1.656z" fill="#000"/><path d="m90.875 473.724h103.118v46.52h-103.118z" fill="#fff2cc" fill-rule="evenodd"/><path d="m90.875 473.724h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m121.54 490.722 1.202-.11q.078.72.39 1.188.313.453.954.734.656.281 1.469.281.718 0 1.265-.218.563-.219.828-.578.266-.375.266-.829 0-.453-.266-.78-.25-.329-.843-.563-.39-.157-1.703-.469-1.313-.313-1.844-.594-.672-.36-1.016-.89-.328-.532-.328-1.188 0-.719.406-1.344.407-.625 1.188-.953.797-.328 1.765-.328 1.047 0 1.86.344.812.344 1.25 1.015.437.657.469 1.485l-1.204.094q-.109-.907-.671-1.36-.563-.469-1.657-.469-1.14 0-1.672.422-.515.422-.515 1.016 0 .516.36.844.374.328 1.905.687 1.547.344 2.11.594.844.39 1.234.984.39.578.39 1.36 0 .75-.437 1.437-.422.672-1.25 1.047-.812.36-1.828.36-1.297 0-2.172-.376-.875-.375-1.375-1.125-.5-.765-.53-1.718zm9.17 3.062v-9.547h1.172v3.422q.828-.937 2.078-.937.766 0 1.328.297.563.296.813.843.25.532.25 1.547v4.375h-1.172v-4.375q0-.89-.39-1.281-.376-.406-1.079-.406-.516 0-.984.281-.453.266-.657.734-.187.453-.187 1.266v3.781zm11.928-.86q-.656.563-1.265.798-.594.218-1.282.218-1.14 0-1.75-.546-.609-.563-.609-1.438 0-.5.219-.922.234-.422.61-.672.374-.25.843-.39.344-.078 1.047-.172 1.422-.172 2.093-.406v-.297q0-.719-.328-1.016-.453-.39-1.343-.39-.813 0-1.22.296-.39.282-.577 1.016l-1.14-.156q.155-.735.515-1.188.36-.453 1.031-.687.672-.25 1.562-.25.891 0 1.438.203.562.203.812.531.266.313.375.797.047.297.047 1.078v1.563q0 1.625.078 2.062.079.438.297.828h-1.218q-.188-.36-.235-.86zm-.093-2.609q-.641.266-1.922.438-.72.11-1.016.25-.297.125-.469.375-.156.25-.156.547 0 .469.344.781.36.313 1.047.313.672 0 1.203-.297t.781-.813q.188-.39.188-1.172zm2.974 3.47v-6.907h1.063v1.047q.406-.735.734-.969.344-.234.766-.234.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm9.189-2.22 1.203.141q-.281 1.063-1.063 1.656-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.156q.062 1.14.64 1.75.578.594 1.438.594.656 0 1.11-.328.452-.344.718-1.079zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.546.531-.609 1.437zm11.006 4.125v-.875q-.656 1.031-1.937 1.031-.813 0-1.516-.453-.687-.453-1.078-1.265-.375-.828-.375-1.89 0-1.032.344-1.876.344-.844 1.031-1.281.703-.453 1.547-.453.625 0 1.11.265.5.25.796.672v-3.422h1.172v9.547zm-3.703-3.453q0 1.328.563 1.984.562.657 1.328.657.765 0 1.297-.625.531-.625.531-1.907 0-1.421-.547-2.078-.547-.672-1.344-.672-.78 0-1.312.641-.516.625-.516 2zm-37.729 19.453-2.532-9.547h1.297l1.453 6.266q.235.984.407 1.953.359-1.531.421-1.766l1.829-6.453h1.515l1.375 4.828q.516 1.797.735 3.391.187-.906.484-2.078l1.484-6.14h1.282l-2.625 9.546h-1.22l-2-7.265q-.265-.922-.312-1.125-.14.656-.28 1.125l-2.017 7.265zm10.088-3.453q0-1.922 1.079-2.844.89-.765 2.171-.765 1.422 0 2.329.937.906.922.906 2.578 0 1.328-.406 2.094-.391.766-1.157 1.188-.765.421-1.672.421-1.453 0-2.359-.921-.89-.938-.89-2.688zm1.204 0q0 1.328.578 1.984.593.657 1.468.657t1.454-.657q.578-.671.578-2.03 0-1.282-.594-1.938-.578-.657-1.438-.657-.875 0-1.468.657-.578.656-.578 1.984zm6.63 3.453v-6.906h1.063v1.047q.406-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm4.47 0v-9.547h1.172v5.453l2.766-2.812h1.515l-2.64 2.562 2.906 4.344h-1.437l-2.282-3.531-.828.797v2.734zm11.383-2.219 1.203.141q-.28 1.063-1.062 1.656-.766.578-1.969.578-1.516 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.062 1.14.64 1.75.579.594 1.438.594.656 0 1.11-.328.453-.344.718-1.079zm-3.844-1.906h3.86q-.078-.86-.438-1.297-.562-.687-1.453-.687-.812 0-1.36.547-.546.531-.609 1.437zm6.507 4.125v-6.906h1.062v1.047q.406-.735.735-.969.343-.234.765-.234.594 0 1.203.375l-.406 1.078q-.437-.25-.86-.25-.39 0-.702.234-.297.235-.422.64-.203.626-.203 1.36v3.625zm3.985-2.062 1.156-.188q.11.703.547 1.078.453.36 1.25.36.813 0 1.203-.328.39-.329.39-.766 0-.39-.359-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.656-.25-.422-.25-.938 0-.453.203-.844.219-.406.578-.672.282-.187.75-.328.469-.14 1.016-.14.812 0 1.422.234.61.234.906.64.297.391.406 1.063l-1.14.156q-.078-.53-.453-.828-.375-.312-1.063-.312-.812 0-1.156.265-.344.266-.344.625 0 .235.14.422.157.188.454.313.172.062 1.031.297 1.25.328 1.734.547.5.203.782.609.28.406.28 1t-.343 1.11q-.344.515-1 .796-.64.281-1.453.281-1.344 0-2.047-.562-.703-.563-.906-1.656z" fill="#000"/><path d="m494.354 531.236v43.998h-262.141v44.002m261.916-222.116v38.302h-351.685v38.297" fill="none"/><path d="m493.629 397.121v37.8l-205.49-.863-146.464.192c-.383 1.364-.404 30.823-.308 39.757l2.344-.096.384-37.125 145.004.122 205.03-.986a.5.5 0 0 0 .5-.5v-38.3z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:3.9;stroke-linecap:butt;stroke-linejoin:round"/><path d="m494.129 397.12v38.302h-203.339v38.297" fill="none"/><path d="m492.729 397.121v36.9h-201.939a1.4 1.4 0 0 0 -1.4 1.4v38.298h2.798v-36.897h201.94a1.4 1.4 0 0 0 1.4-1.4v-38.3h-2.8z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m59.436 429.777h306.708v125.386h-306.708z" style="fill:#cdcdcd;fill-opacity:.65;fill-rule:evenodd;stroke:#000;stroke-opacity:.747;stroke-width:4.8"/><path d="m661.551 520.244v21.197m164.873-24.812h52.44v60.85h-52.44z" fill="none"/><path d="m836.248 548.73v-4.575h4.845v4.575zm7.085 0v-4.575h4.845v4.575zm7.085 0v-4.575h4.845v4.575z" fill="#000" stroke="#fff" stroke-width="2.893"/><path d="m846.304 520.456v21.197" fill="none"/><path d="m844.904 520.457v21.195h2.8v-21.195z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m795.803 473.724h103.118v46.52h-103.118z" fill="#d9ead3" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m795.803 473.724h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m826.166 501.784v-9.547h3.594q.953 0 1.453.094.703.125 1.172.453.484.328.765.922.297.594.297 1.297 0 1.219-.781 2.062-.766.844-2.797.844h-2.438v3.875zm1.265-5h2.454q1.234 0 1.75-.453.515-.469.515-1.281 0-.61-.312-1.031-.297-.422-.797-.563-.313-.094-1.172-.094h-2.438zm11.984 4.14q-.656.563-1.266.798-.593.218-1.28.218-1.142 0-1.75-.546-.61-.563-.61-1.438 0-.5.218-.922.235-.422.61-.672.375-.25.844-.39.343-.078 1.046-.172 1.422-.172 2.094-.406v-.297q0-.719-.328-1.016-.453-.39-1.344-.39-.812 0-1.218.296-.391.282-.579 1.016l-1.14-.156q.156-.735.515-1.188.36-.453 1.032-.687.672-.25 1.562-.25t1.438.203q.562.203.812.531.266.313.375.797.047.297.047 1.078v1.563q0 1.625.078 2.062.078.438.297.828h-1.219q-.187-.36-.234-.86zm-.094-2.609q-.64.266-1.922.438-.718.11-1.015.25-.297.125-.469.375-.156.25-.156.547 0 .469.343.781.36.313 1.047.313.672 0 1.203-.297.532-.297.782-.813.187-.39.187-1.172zm2.772 4.047 1.14.157q.079.53.407.78.437.313 1.187.313.813 0 1.25-.328.454-.312.61-.906.094-.36.078-1.5-.766.906-1.906.906-1.438 0-2.22-1.031-.78-1.031-.78-2.469 0-.984.36-1.812.358-.844 1.03-1.297.688-.453 1.61-.453 1.218 0 2.015.984v-.828h1.078v5.969q0 1.61-.328 2.281-.328.687-1.047 1.078-.703.39-1.75.39-1.234 0-2-.562-.75-.562-.734-1.672zm.984-4.156q0 1.36.532 1.984.547.625 1.36.625.796 0 1.343-.625.547-.625.547-1.953 0-1.265-.563-1.906-.562-.64-1.36-.64-.765 0-1.312.64-.547.625-.547 1.875zm11.382 1.36 1.203.14q-.281 1.063-1.063 1.656-.765.578-1.968.578-1.516 0-2.407-.937-.89-.938-.89-2.61 0-1.75.89-2.703.907-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.079zm-3.844-1.907h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.531-.61 1.437zm10.365 4.125v-9.547h1.297l5.016 7.5v-7.5h1.203v9.547h-1.297l-5.015-7.5v7.5z" fill="#000"/><path d="m640.695 661.19h52.441v60.85h-52.44z" fill="none"/><g fill="#000" stroke="#fff" stroke-width="1.491"><g stroke-linecap="butt"><path d="m650.733 688.928v6.197h6.183v-6.197zm6.668 0v6.197h6.183v-6.197zm6.668 0v6.197h6.183v-6.197zm-12.344.992h4.2v4.213h-4.2zm6.668 0h4.2v4.213h-4.2zm6.668 0h4.2v4.213h-4.2z"/><path d="m651.229 689.424v5.205h5.191v-5.205zm6.668 0v5.205h5.191v-5.205zm6.668 0v5.205h5.191v-5.205z"/></g><path d="m652.63 693.23v-2.407h2.39v2.406zm6.667 0v-2.407h2.391v2.406zm6.668 0v-2.407h2.391v2.406z" stroke="none"/></g><path d="m660.576 665.016v21.197" fill="none"/><path d="m659.176 665.016v21.197h2.8v-21.197z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m610.075 618.478h103.118v46.52h-103.118z" fill="#c9daf8" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m610.075 618.478h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m637.916 646.538v-9.547h6.438v1.125h-5.172v2.968h4.469v1.125h-4.47v4.329zm7.907 0v-6.907h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.235-.297.234-.422.64-.203.625-.203 1.36v3.625zm8.97-.86q-.656.563-1.266.797-.593.219-1.28.219-1.142 0-1.75-.547-.61-.563-.61-1.438 0-.5.218-.921.235-.422.61-.672.375-.25.844-.391.343-.078 1.046-.172 1.422-.172 2.094-.406v-.297q0-.719-.328-1.016-.453-.39-1.344-.39-.812 0-1.218.297-.391.28-.579 1.015l-1.14-.156q.156-.734.515-1.187.36-.454 1.032-.688.672-.25 1.562-.25t1.438.203q.562.203.812.531.266.313.375.797.047.297.047 1.078v1.563q0 1.625.078 2.062.078.438.297.829h-1.219q-.187-.36-.234-.86zm-.094-2.61q-.64.266-1.922.438-.718.11-1.015.25-.297.125-.469.375-.156.25-.156.547 0 .469.343.781.36.313 1.047.313.672 0 1.203-.297.532-.297.782-.812.187-.391.187-1.172zm2.99 3.47v-6.907h1.048v.969q.328-.516.86-.812.546-.313 1.233-.313.782 0 1.266.313.484.312.688.89.828-1.203 2.14-1.203 1.031 0 1.578.578.563.563.563 1.735v4.75h-1.172v-4.36q0-.703-.125-1-.11-.312-.406-.5-.297-.187-.703-.187-.72 0-1.204.484t-.484 1.547v4.016h-1.171v-4.485q0-.781-.297-1.172-.28-.39-.922-.39-.5 0-.921.265-.422.25-.61.75-.187.5-.187 1.453v3.579zm15.838-2.22 1.203.141q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.61 0-1.75.89-2.702.907-.969 2.344-.969 1.39 0 2.266.938.875.937.875 2.656v.312h-5.157q.063 1.14.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.905h3.86q-.079-.86-.438-1.297-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.438zm16.053 3v1.125h-6.297q-.016-.422.14-.813.235-.64.766-1.266.531-.625 1.531-1.453 1.563-1.265 2.11-2.015.547-.75.547-1.407 0-.703-.5-1.171-.5-.485-1.297-.485-.86 0-1.375.516-.5.5-.5 1.39l-1.203-.109q.125-1.36.922-2.062.812-.704 2.171-.704 1.375 0 2.172.766.813.75.813 1.875 0 .578-.235 1.14-.234.548-.78 1.157-.548.61-1.813 1.672-1.047.89-1.36 1.219-.297.312-.484.625z" fill="#000"/><path d="m825.208 661.189h52.441v60.85h-52.44z" fill="none"/><g fill="#000" stroke="#fff" stroke-width="1.991"><path d="m835.86 689.422v5.207h5.191v-5.207zm6.668 0v5.207h5.191v-5.207zm6.668 0v5.207h5.191v-5.207z" stroke-linecap="butt"/><path d="m837.26 693.229v-2.407h2.39v2.407zm6.668 0v-2.407h2.39v2.407zm6.668 0v-2.407h2.39v2.407z" stroke="none"/></g><path d="m845.089 665.016v21.197" fill="none"/><path d="m843.69 665.016v21.197h2.798v-21.197z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m794.02 618.478h103.118v46.52h-103.118z" fill="#c9daf8" fill-rule="evenodd" stroke="#000" stroke-width="3"/><path d="m794.02 618.478h103.118v46.52h-103.118z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m820.755 646.538v-9.547h6.438v1.125h-5.172v2.968h4.469v1.125h-4.47v4.329zm7.907 0v-6.907h1.063v1.047q.406-.734.734-.969.344-.234.766-.234.593 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.235-.297.234-.422.64-.203.625-.203 1.36v3.625zm8.97-.86q-.656.563-1.266.797-.594.219-1.281.219-1.14 0-1.75-.547-.61-.563-.61-1.438 0-.5.22-.921.234-.422.609-.672.375-.25.843-.391.344-.078 1.047-.172 1.422-.172 2.094-.406v-.297q0-.719-.328-1.016-.453-.39-1.344-.39-.812 0-1.219.297-.39.28-.578 1.015l-1.14-.156q.156-.734.515-1.187.36-.454 1.032-.688.671-.25 1.562-.25.89 0 1.438.203.562.203.812.531.266.313.375.797.047.297.047 1.078v1.563q0 1.625.078 2.062.078.438.297.829h-1.219q-.187-.36-.234-.86zm-.094-2.61q-.64.266-1.922.438-.719.11-1.015.25-.297.125-.47.375-.155.25-.155.547 0 .469.343.781.36.313 1.047.313.672 0 1.203-.297.532-.297.782-.812.187-.391.187-1.172zm2.99 3.47v-6.907h1.048v.969q.328-.516.859-.812.547-.313 1.234-.313.782 0 1.266.313.484.312.687.89.829-1.203 2.141-1.203 1.031 0 1.578.578.563.563.563 1.735v4.75h-1.172v-4.36q0-.703-.125-1-.11-.312-.406-.5-.297-.187-.704-.187-.718 0-1.203.484-.484.484-.484 1.547v4.016h-1.172v-4.485q0-.781-.297-1.172-.281-.39-.922-.39-.5 0-.922.265-.421.25-.609.75-.187.5-.187 1.453v3.579zm15.837-2.22 1.204.141q-.282 1.063-1.063 1.657-.766.578-1.969.578-1.515 0-2.406-.938-.89-.937-.89-2.61 0-1.75.89-2.702.906-.969 2.344-.969 1.39 0 2.265.938.875.937.875 2.656v.312h-5.156q.063 1.14.64 1.75.579.594 1.438.594.657 0 1.11-.328.453-.344.718-1.078zm-3.843-1.905h3.86q-.079-.86-.438-1.297-.563-.688-1.454-.688-.812 0-1.359.547-.547.531-.61 1.438zm10.365 4.125v-9.547h1.297l5.016 7.5v-7.5h1.203v9.547h-1.297l-5.016-7.5v7.5z" fill="#000"/><path d="m395.126 33.554h198.52v89.543h-198.52z" fill="#0b5394" fill-rule="evenodd" stroke="#000" stroke-width="2.9"/><path d="m477.83 141.076 16.299-16.3 16.299 16.3h-8.15v54.646h8.15l-16.3 16.299-16.299-16.3h8.15v-54.645zm-82.704-107.522h198.52v89.543h-198.52z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m440.868 86.866v-17.188h6.469q1.719 0 2.625.172 1.266.203 2.11.797.859.594 1.374 1.672.532 1.062.532 2.328 0 2.203-1.407 3.719-1.39 1.515-5.03 1.515h-4.407v6.985zm2.266-9.016h4.437q2.204 0 3.125-.813.938-.828.938-2.312 0-1.078-.547-1.844-.547-.765-1.437-1.015-.579-.157-2.125-.157h-4.391zm21.617 9.016v-1.829q-1.453 2.11-3.937 2.11-1.11 0-2.063-.422-.953-.422-1.422-1.063-.453-.64-.64-1.562-.141-.625-.141-1.969v-7.719h2.11v6.907q0 1.656.14 2.234.187.828.828 1.313.656.468 1.61.468.937 0 1.765-.484.844-.5 1.188-1.328.343-.844.343-2.438v-6.672h2.11v12.454zm5.191 4.765v-17.219h1.922v1.625q.688-.953 1.532-1.421.859-.485 2.078-.485 1.593 0 2.812.828 1.219.813 1.844 2.313.625 1.5.625 3.281 0 1.906-.688 3.438-.687 1.53-2 2.343-1.296.813-2.734.813-1.062 0-1.906-.438-.828-.453-1.375-1.14v6.062zm1.922-10.922q0 2.407.97 3.563.968 1.14 2.358 1.14 1.407 0 2.407-1.187 1-1.188 1-3.688 0-2.375-.985-3.562-.968-1.188-2.328-1.188-1.36 0-2.39 1.266-1.032 1.25-1.032 3.656zm11.426 10.922v-17.219h1.922v1.625q.688-.953 1.531-1.421.86-.485 2.078-.485 1.594 0 2.813.828 1.219.813 1.844 2.313.625 1.5.625 3.281 0 1.906-.688 3.438-.687 1.53-2 2.343-1.297.813-2.734.813-1.063 0-1.906-.438-.829-.453-1.375-1.14v6.062zm1.922-10.922q0 2.407.969 3.563.969 1.14 2.36 1.14 1.405 0 2.405-1.187 1-1.188 1-3.688 0-2.375-.984-3.562-.969-1.188-2.328-1.188-1.36 0-2.39 1.266-1.032 1.25-1.032 3.656zm19.957 2.141 2.172.281q-.516 1.906-1.906 2.969-1.391 1.047-3.563 1.047-2.734 0-4.344-1.672-1.593-1.688-1.593-4.734 0-3.141 1.609-4.875 1.625-1.735 4.203-1.735 2.5 0 4.078 1.703 1.594 1.703 1.594 4.782 0 .187-.016.562h-9.28q.109 2.047 1.155 3.14 1.047 1.094 2.61 1.094 1.156 0 1.969-.609.828-.61 1.312-1.953zm-6.937-3.406h6.953q-.141-1.563-.797-2.36-1-1.218-2.61-1.218-1.453 0-2.453.984-.984.969-1.093 2.594zm16.363 5.531.312 1.86q-.89.202-1.593.202-1.157 0-1.797-.359-.625-.375-.89-.969-.25-.593-.25-2.484v-7.172h-1.548v-1.64h1.547v-3.079l2.094-1.265v4.343h2.125v1.641h-2.125v7.281q0 .907.11 1.172.124.25.374.406.25.141.719.141.344 0 .922-.078zm10.59-2.125 2.172.281q-.516 1.906-1.907 2.969-1.39 1.047-3.562 1.047-2.735 0-4.344-1.672-1.594-1.688-1.594-4.734 0-3.141 1.61-4.875 1.625-1.735 4.203-1.735 2.5 0 4.078 1.703 1.594 1.703 1.594 4.782 0 .187-.016.562h-9.281q.11 2.047 1.156 3.14 1.047 1.094 2.61 1.094 1.156 0 1.968-.609.828-.61 1.313-1.953zm-6.938-3.406h6.953q-.14-1.563-.797-2.36-1-1.218-2.609-1.218-1.453 0-2.453.984-.984.969-1.094 2.594zm20.285 3.406 2.172.281q-.515 1.906-1.906 2.969-1.39 1.047-3.563 1.047-2.734 0-4.343-1.672-1.594-1.688-1.594-4.734 0-3.141 1.61-4.875 1.624-1.735 4.202-1.735 2.5 0 4.079 1.703 1.593 1.703 1.593 4.782 0 .187-.015.562h-9.282q.11 2.047 1.157 3.14 1.047 1.094 2.61 1.094 1.155 0 1.968-.609.828-.61 1.312-1.953zm-6.937-3.406h6.953q-.14-1.563-.797-2.36-1-1.218-2.61-1.218-1.452 0-2.452.984-.985.969-1.094 2.594zm11.738 7.422v-12.454h1.89v1.891q.735-1.328 1.344-1.75.625-.422 1.36-.422 1.062 0 2.172.688l-.735 1.953q-.765-.453-1.547-.453-.687 0-1.25.422-.546.406-.78 1.14-.345 1.125-.345 2.469v6.516z" fill="#fff"/><path d="m460.913 202.949v-67.937h34.551v67.937z" fill="none"/><path d="m469.74 199.678h-9.522v-3.717q0-1.262.137-1.925.176-.93.683-1.571.624-.863 1.62-1.284.994-.42 2.263-.42 1.092 0 1.931.287.84.288 1.386.73.546.443.858.996.312.531.488 1.284.156.752.156 1.726zm-1.132-1.416v-2.301q0-1.085-.175-1.682-.176-.62-.488-.974-.449-.509-1.19-.796-.761-.288-1.854-.288-1.483 0-2.283.575-.82.554-1.092 1.35-.195.575-.195 1.837v2.279zm-1.092-14.66.156-1.371q1.053.332 1.639 1.217.585.863.585 2.234 0 1.704-.937 2.722-.936.996-2.614.996-1.737 0-2.693-1.018-.975-1.018-.975-2.633 0-1.571.956-2.567.936-.995 2.653-.995h.293v5.84q1.151-.066 1.756-.73.605-.663.605-1.637 0-.73-.332-1.239-.35-.509-1.092-.818zm-1.893 4.36v-4.382q-.858.089-1.307.51-.664.641-.664 1.637 0 .907.547 1.549.526.62 1.424.685zm4.117-9.566-6.907 2.965v-1.394l4.136-1.681q.664-.266 1.386-.51-.547-.154-1.308-.486l-4.214-1.726v-1.372l6.907 2.965zm0-8.297h-8.41v3.562h-1.112v-8.563h1.113v3.585h8.409zm-3.454-4.136q-1.912 0-2.829-1.195-.78-1.018-.78-2.456 0-1.615.936-2.633.937-1.04 2.576-1.04 1.327 0 2.107.465.761.442 1.19 1.305.41.863.41 1.903 0 1.638-.917 2.655-.937.996-2.693.996zm0-1.35q1.327 0 1.99-.663.664-.664.664-1.638 0-.996-.663-1.637-.664-.664-2.03-.664-1.268 0-1.931.664-.664.641-.664 1.637 0 .974.664 1.638.644.663 1.97.663zm0-7.042q-1.912 0-2.829-1.195-.78-1.018-.78-2.456 0-1.615.936-2.633.937-1.04 2.576-1.04 1.327 0 2.107.464.761.443 1.19 1.306.41.863.41 1.903 0 1.637-.917 2.655-.937.996-2.693.996zm0-1.35q1.327 0 1.99-.664.664-.664.664-1.637 0-.996-.663-1.638-.664-.663-2.03-.663-1.268 0-1.931.663-.664.642-.664 1.638 0 .973.664 1.637.644.664 1.97.664zm3.454-7.507h-9.522v-1.328h9.522zm-2.068-2.844-.176-1.306q.703-.11 1.073-.62.37-.508.37-1.415t-.33-1.35q-.332-.442-.781-.442-.39 0-.625.398-.156.265-.39 1.35-.331 1.46-.566 2.035-.234.553-.643.841-.43.288-.937.288-.449 0-.839-.244-.41-.243-.663-.641-.196-.31-.332-.841-.156-.553-.156-1.15 0-.93.234-1.616.234-.708.644-1.04.39-.332 1.073-.442l.156 1.283q-.546.088-.839.53-.293.421-.293 1.174 0 .929.274 1.327.253.376.604.376.235 0 .41-.155.195-.177.312-.509.078-.199.312-1.172.332-1.416.547-1.97.195-.553.605-.862.39-.332.995-.332.585 0 1.112.398.507.376.8 1.106.273.73.273 1.66 0 1.527-.546 2.323-.566.797-1.678 1.018z" fill="#000" stroke="#fff" stroke-width="2.43"/><path d="m494.187 198.335v-67.937h34.551v67.937z" fill="none"/><path d="m529.122 196.103h-10.024v-1.297h.941q-.552-.449-.818-1.015-.286-.59-.286-1.392 0-1.061.49-1.887.471-.826 1.35-1.227.86-.424 1.903-.424 1.105 0 2.005.471.88.449 1.35 1.322.47.872.47 1.84 0 .707-.245 1.274-.266.566-.675.92h3.539zm-6.362-1.274q1.391 0 2.066-.66.675-.66.675-1.58 0-.945-.695-1.605-.696-.684-2.148-.684-1.37 0-2.066.66-.696.66-.696 1.58 0 .897.737 1.605.736.684 2.127.684zm3.58-7.65h-7.242v-1.274h1.105q-.777-.496-1.023-.897-.245-.425-.245-.92 0-.708.409-1.44l1.125.473q-.266.519-.266 1.038 0 .472.246.85.245.353.675.518.654.236 1.432.236h3.784zm-3.62-4.863q-2.005 0-2.967-1.274-.818-1.085-.818-2.619 0-1.722.982-2.807.982-1.109 2.7-1.109 1.391 0 2.21.495.797.472 1.247 1.392.43.92.43 2.03 0 1.745-.962 2.83-.982 1.062-2.823 1.062zm0-1.44q1.39 0 2.086-.707.695-.708.695-1.746 0-1.061-.695-1.746-.696-.707-2.128-.707-1.33 0-2.025.707-.695.685-.695 1.746 0 1.038.695 1.746.675.708 2.066.708zm2.515-11.118 1.085-.189q.122.59.122 1.062 0 .755-.204 1.18-.225.424-.573.613-.348.165-1.453.165h-4.152v1.038h-.962v-1.038h-1.78l-.736-1.415h2.516v-1.416h.962v1.416h4.234q.512 0 .675-.071.144-.071.246-.236.082-.165.082-.496 0-.235-.062-.613zm-2.516-.86q-2.004 0-2.966-1.275-.818-1.085-.818-2.618 0-1.722.982-2.808.982-1.109 2.7-1.109 1.391 0 2.21.496.797.472 1.247 1.392.43.92.43 2.029 0 1.746-.962 2.83-.982 1.062-2.823 1.062zm0-1.44q1.391 0 2.087-.707.695-.708.695-1.746 0-1.062-.695-1.746-.696-.708-2.128-.708-1.33 0-2.025.708-.695.684-.695 1.746 0 1.038.695 1.746.675.707 2.066.707zm.962-13.478.163-1.392q1.248.236 1.964 1.18.696.944.696 2.312 0 1.699-.962 2.737-.982 1.038-2.782 1.038-1.186 0-2.066-.449-.88-.448-1.31-1.344-.45-.92-.45-2.006 0-1.344.615-2.217.593-.873 1.677-1.11l.184 1.37q-.716.212-1.084.707-.368.495-.368 1.203 0 1.062.675 1.746.654.66 2.086.66 1.453 0 2.128-.636.654-.661.654-1.699 0-.826-.45-1.368-.45-.567-1.37-.732zm-.962-2.076q-2.004 0-2.966-1.274-.818-1.085-.818-2.618 0-1.723.982-2.808.982-1.109 2.7-1.109 1.391 0 2.21.496.797.472 1.247 1.392.43.92.43 2.029 0 1.745-.962 2.83-.982 1.062-2.823 1.062zm0-1.439q1.391 0 2.087-.708.695-.707.695-1.745 0-1.062-.695-1.746-.696-.708-2.128-.708-1.33 0-2.025.708-.695.684-.695 1.746 0 1.038.695 1.745.675.708 2.066.708zm3.621-8.005h-9.983v-1.415h9.983z" fill="#000" stroke="#fff" stroke-linecap="butt" stroke-width="2.706"/><path d="m494.129 676.896v36.307h-272.032v36.323" fill="none"/><path d="m430.38 619.385h127.497v57.511h-127.497z" fill="#c9daf8" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m430.38 619.385h127.497v57.511h-127.497z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m468.71 655.06v-13.359h9.015v1.578h-7.25v4.14h6.266v1.581h-6.266v6.062zm11.083 0v-9.671h1.469v1.468q.562-1.03 1.031-1.359.484-.328 1.063-.328.828 0 1.687.531l-.562 1.516q-.61-.36-1.204-.36-.546 0-.968.329-.422.328-.61.89-.281.875-.281 1.922v5.063zm12.54-1.187q-.921.766-1.765 1.094-.828.312-1.797.312-1.593 0-2.453-.78-.86-.782-.86-1.985 0-.72.329-1.297.328-.594.844-.938.531-.36 1.187-.547.469-.125 1.453-.25 1.985-.234 2.922-.562.016-.344.016-.422 0-1-.469-1.422-.625-.547-1.875-.547-1.156 0-1.703.407-.547.406-.813 1.421l-1.609-.218q.219-1.016.719-1.64.5-.642 1.453-.985.953-.344 2.187-.344 1.25 0 2.016.297.781.281 1.14.734.376.438.516 1.11.078.421.078 1.515v2.188q0 2.28.11 2.89.11.594.406 1.157h-1.703q-.266-.516-.328-1.188zm-.14-3.672q-.89.375-2.672.625-1.015.14-1.437.328-.422.188-.656.532-.22.343-.22.78 0 .657.5 1.095.5.437 1.454.437.937 0 1.672-.406.75-.422 1.094-1.14.265-.563.265-1.641zm4.204 4.86v-9.672h1.469v1.36q.453-.72 1.203-1.142.766-.437 1.719-.437 1.078 0 1.765.453.688.438.97 1.234 1.155-1.687 2.983-1.687 1.454 0 2.22.797.78.797.78 2.453v6.64h-1.64v-6.093q0-.985-.156-1.406-.157-.438-.579-.704-.421-.265-.984-.265-1.016 0-1.687.687-.672.672-.672 2.157v5.625h-1.64v-6.282q0-1.093-.407-1.64-.406-.547-1.313-.547-.687 0-1.28.36-.595.359-.86 1.062-.25.703-.25 2.03v5.017zm22.166-3.11 1.687.203q-.406 1.485-1.484 2.313-1.078.812-2.766.812-2.125 0-3.375-1.297-1.234-1.312-1.234-3.671 0-2.454 1.25-3.797 1.266-1.344 3.266-1.344 1.937 0 3.156 1.328 1.234 1.313 1.234 3.703v.438h-7.219q.094 1.593.907 2.453.812.844 2.015.844.907 0 1.547-.47.64-.484 1.016-1.515zm-5.39-2.656h5.405q-.109-1.219-.625-1.828-.78-.953-2.03-.953-1.126 0-1.907.765-.766.75-.844 2.016z" fill="#000"/><path d="m140.9 345.098h137.197v46.52h-137.197z" fill="#ead1dc" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m140.9 345.098h137.197v46.52h-137.197z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m157.503 373.158v-9.547h3.594q1.094 0 1.75.297.656.281 1.031.89.375.61.375 1.266 0 .61-.344 1.157-.328.53-.984.859.86.25 1.328.875.469.61.469 1.437 0 .672-.297 1.25-.281.579-.703.891-.406.313-1.031.469-.625.156-1.547.156zm1.266-5.531h2.062q.844 0 1.203-.11.485-.14.72-.468.25-.344.25-.844 0-.469-.235-.828-.22-.36-.64-.5-.423-.14-1.454-.14h-1.906zm0 4.406h2.375q.61 0 .86-.047.437-.078.733-.25.297-.187.485-.531.187-.36.187-.813 0-.53-.28-.921-.267-.407-.75-.563-.485-.156-1.407-.156h-2.203zm7.514 1.125v-6.906h1.063v1.047q.406-.735.734-.969.344-.234.766-.234.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm4.017-3.453q0-1.922 1.078-2.844.89-.765 2.172-.765 1.422 0 2.328.937.906.922.906 2.578 0 1.328-.406 2.094-.39.766-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.328.578 1.984.594.657 1.469.657.875 0 1.453-.657.578-.672.578-2.03 0-1.282-.594-1.938-.578-.657-1.437-.657-.875 0-1.469.657-.578.656-.578 1.984zm7.928 3.453-2.125-6.906h1.219l1.094 3.984.422 1.485q.015-.11.359-1.422l1.094-4.047h1.203l1.031 4 .344 1.328.406-1.344 1.172-3.984h1.14l-2.156 6.906h-1.218l-1.094-4.14-.266-1.172-1.406 5.312zm7.875-2.062 1.157-.188q.109.703.546 1.078.454.36 1.25.36.813 0 1.204-.329.39-.328.39-.765 0-.39-.36-.625-.234-.156-1.187-.39-1.297-.329-1.797-.563-.484-.25-.75-.657-.25-.421-.25-.937 0-.453.204-.844.218-.406.578-.672.28-.187.75-.328.468-.14 1.015-.14.813 0 1.422.234.61.234.906.64.297.391.407 1.063l-1.14.156q-.079-.53-.454-.828-.375-.312-1.063-.312-.812 0-1.156.265-.344.266-.344.625 0 .235.141.422.156.188.453.313.172.062 1.031.297 1.25.328 1.735.546.5.204.781.61t.281 1q0 .594-.343 1.11-.344.515-1 .796-.641.281-1.454.281-1.343 0-2.046-.562-.704-.563-.907-1.656zm11.868-.157 1.203.14q-.282 1.063-1.063 1.657-.765.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.266.937.875.938.875 2.656v.313h-5.157q.063 1.14.64 1.75.579.594 1.438.594.657 0 1.11-.329.453-.343.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.453-.687-.813 0-1.36.547-.547.53-.61 1.437zm6.506 4.125v-6.906h1.062v1.047q.407-.735.735-.969.344-.234.765-.234.594 0 1.204.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.234-.297.234-.422.64-.203.626-.203 1.36v3.625zm11.407-3.344 1.266.313q-.39 1.562-1.422 2.375-1.031.812-2.531.812-1.532 0-2.5-.625-.97-.625-1.485-1.812-.5-1.188-.5-2.563 0-1.484.563-2.593.578-1.11 1.625-1.688 1.062-.578 2.328-.578 1.422 0 2.39.734.985.72 1.375 2.047l-1.25.297q-.328-1.047-.968-1.516-.625-.484-1.578-.484-1.094 0-1.844.531-.735.532-1.031 1.422-.297.875-.297 1.828 0 1.22.343 2.125.36.907 1.11 1.36.75.437 1.625.437 1.062 0 1.797-.61.734-.609.984-1.812zm2.235-.11q0-1.92 1.078-2.843.89-.765 2.172-.765 1.422 0 2.328.937.906.922.906 2.578 0 1.328-.406 2.094-.39.766-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.33.578 1.985.594.657 1.469.657.875 0 1.453-.657.578-.672.578-2.03 0-1.282-.594-1.938-.578-.657-1.437-.657-.875 0-1.47.657-.577.656-.577 1.984zm6.647 3.454v-6.906h1.062v.984q.75-1.14 2.188-1.14.625 0 1.156.218.531.22.781.594.266.36.375.86.063.328.063 1.14v4.25h-1.172v-4.203q0-.719-.14-1.063-.142-.359-.485-.562-.344-.219-.813-.219-.75 0-1.297.469-.547.469-.547 1.797v3.781zm9.975-1.047.171 1.031q-.5.11-.89.11-.64 0-1-.203-.344-.203-.485-.532-.14-.328-.14-1.39v-3.969h-.86v-.906h.86v-1.719l1.172-.703v2.422h1.172v.906h-1.172v4.047q0 .5.047.64.062.141.203.235.14.078.406.078.203 0 .516-.047zm5.874-1.172 1.204.14q-.282 1.063-1.063 1.657-.766.578-1.969.578-1.515 0-2.406-.937-.89-.938-.89-2.61 0-1.75.89-2.703.906-.968 2.344-.968 1.39 0 2.265.937.875.938.875 2.656v.313h-5.156q.063 1.14.64 1.75.579.594 1.438.594.657 0 1.11-.329.453-.343.718-1.078zm-3.843-1.906h3.86q-.079-.86-.438-1.297-.563-.687-1.454-.687-.812 0-1.359.547-.547.53-.61 1.437zm5.74 4.125 2.532-3.594-2.344-3.312h1.469l1.062 1.61q.297.468.484.78.282-.437.516-.765l1.172-1.625h1.406l-2.39 3.25 2.562 3.656h-1.437l-1.422-2.14-.375-.594-1.813 2.734zm10.008-1.047.172 1.031q-.5.11-.89.11-.641 0-1-.203-.344-.203-.485-.532-.14-.328-.14-1.39v-3.969h-.86v-.906h.86v-1.719l1.171-.703v2.422h1.172v.906h-1.172v4.047q0 .5.047.64.063.141.203.235.14.078.407.078.203 0 .515-.047zm8.937 1.047h-1.172v-7.469q-.421.407-1.109.813-.687.406-1.234.61v-1.141q.984-.454 1.718-1.11.735-.672 1.032-1.281h.765z" fill="#000"/><path d="m620.2 353.94h47.527v60.85h-47.527z" fill="none"/><path d="m410.748 214.021h167.276v57.512h-167.276z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m461.534 249.697v-13.36h5.016q1.531 0 2.453.407.922.406 1.438 1.25.531.844.531 1.765 0 .86-.469 1.625-.453.75-1.39 1.204 1.203.359 1.859 1.218.656.86.656 2.016 0 .937-.406 1.75-.39.797-.984 1.234-.579.438-1.454.672-.875.219-2.156.219zm1.782-7.75h2.875q1.187 0 1.687-.14.672-.204 1.016-.673.344-.468.344-1.171 0-.657-.329-1.157-.312-.515-.906-.703-.594-.187-2.031-.187h-2.656zm0 6.172h3.312q.86 0 1.203-.063.61-.11 1.016-.36.422-.265.688-.75.265-.483.265-1.124 0-.75-.39-1.297-.376-.547-1.063-.766-.672-.234-1.953-.234h-3.078zm10.521 1.578v-9.672h1.47v1.469q.562-1.031 1.03-1.36.485-.328 1.063-.328.828 0 1.687.532l-.562 1.515q-.61-.36-1.203-.36-.547 0-.969.329-.422.328-.61.89-.28.876-.28 1.922v5.063zm5.62-4.844q0-2.687 1.484-3.969 1.25-1.078 3.047-1.078 2 0 3.265 1.313 1.266 1.297 1.266 3.61 0 1.859-.563 2.937-.562 1.062-1.64 1.656-1.063.594-2.328.594-2.032 0-3.282-1.297-1.25-1.313-1.25-3.766zm1.687 0q0 1.86.797 2.797.812.922 2.047.922 1.218 0 2.03-.922.813-.937.813-2.844 0-1.797-.812-2.718-.813-.922-2.031-.922-1.235 0-2.047.922-.797.906-.797 2.765zm11.079 4.844-2.97-9.672h1.704l1.531 5.578.578 2.078q.047-.156.5-2l1.547-5.656h1.688l1.437 5.61.485 1.843.562-1.86 1.656-5.593h1.594l-3.031 9.672h-1.704l-1.531-5.797-.375-1.64-1.954 7.437zm11.035-2.89 1.625-.25q.125.968.75 1.5.625.515 1.75.515t1.672-.453q.547-.469.547-1.094 0-.547-.484-.875-.329-.219-1.672-.547-1.813-.469-2.516-.797-.687-.328-1.047-.906-.36-.594-.36-1.312 0-.641.298-1.188.297-.562.812-.922.375-.281 1.031-.469.672-.203 1.422-.203 1.14 0 2 .328.86.329 1.266.891.422.563.578 1.5l-1.61.219q-.109-.75-.64-1.172-.516-.422-1.469-.422-1.14 0-1.625.375-.468.375-.468.875 0 .313.187.578.203.266.64.438.235.093 1.438.422 1.75.453 2.438.75.687.296 1.078.859.39.562.39 1.406 0 .828-.484 1.547-.469.719-1.375 1.125-.906.39-2.047.39-1.875 0-2.875-.78-.984-.782-1.25-2.329zm16.61-.22 1.687.204q-.406 1.484-1.484 2.312-1.078.813-2.766.813-2.125 0-3.375-1.297-1.234-1.313-1.234-3.672 0-2.453 1.25-3.797 1.265-1.344 3.265-1.344 1.938 0 3.157 1.328 1.234 1.313 1.234 3.704v.437h-7.219q.094 1.594.906 2.453.813.844 2.016.844.906 0 1.547-.469.64-.484 1.016-1.515zm-5.391-2.656h5.406q-.11-1.218-.625-1.828-.781-.953-2.031-.953-1.125 0-1.906.766-.766.75-.844 2.015zm9.126 5.766v-9.672h1.468v1.469q.563-1.031 1.032-1.36.484-.328 1.062-.328.828 0 1.688.532l-.563 1.515q-.61-.36-1.203-.36-.547 0-.969.329-.422.328-.61.89-.28.876-.28 1.922v5.063z" fill="#000"/><path d="m320.53 352.265h47.528v60.85h-47.528zm173.856-80.732-.252 68.063m.252-68.063v36.783h-284.882v36.792m284.882-73.575v36.786h279.527v36.789" fill="none"/><path d="m410.49 339.609h167.276v57.512h-167.275z" fill="#ead1dc" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m410.49 339.609h167.276v57.512h-167.275z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m429.13 375.285v-13.36h5.015q1.532 0 2.454.407.921.406 1.437 1.25.531.843.531 1.765 0 .86-.468 1.625-.454.75-1.391 1.203 1.203.36 1.86 1.22.656.859.656 2.015 0 .937-.407 1.75-.39.797-.984 1.234-.578.438-1.453.672-.875.219-2.156.219zm1.781-7.75h2.875q1.188 0 1.688-.14.671-.204 1.015-.673.344-.468.344-1.172 0-.656-.328-1.156-.313-.515-.906-.703-.594-.187-2.032-.187h-2.656zm0 6.172h3.313q.859 0 1.203-.063.61-.11 1.015-.36.422-.265.688-.75.265-.484.265-1.124 0-.75-.39-1.297-.375-.547-1.063-.766-.672-.234-1.953-.234h-3.078zm10.522 1.578v-9.672h1.469v1.469q.562-1.032 1.03-1.36.485-.328 1.063-.328.828 0 1.688.531l-.563 1.516q-.61-.36-1.203-.36-.547 0-.969.329-.421.328-.609.89-.281.875-.281 1.922v5.063zm5.619-4.844q0-2.687 1.484-3.969 1.25-1.078 3.047-1.078 2 0 3.266 1.313 1.265 1.297 1.265 3.61 0 1.858-.562 2.937-.563 1.062-1.64 1.656-1.063.594-2.329.594-2.031 0-3.281-1.297-1.25-1.313-1.25-3.766zm1.687 0q0 1.86.797 2.797.813.922 2.047.922 1.219 0 2.031-.922.813-.938.813-2.844 0-1.797-.813-2.719-.812-.921-2.031-.921-1.234 0-2.047.921-.797.907-.797 2.766zm11.08 4.844-2.97-9.672h1.703l1.532 5.578.578 2.078q.047-.156.5-2l1.547-5.656h1.687l1.438 5.61.484 1.843.563-1.86 1.656-5.593h1.594l-3.032 9.672h-1.703l-1.531-5.797-.375-1.64-1.953 7.437zm11.035-2.89 1.625-.25q.125.968.75 1.5.625.515 1.75.515t1.671-.453q.547-.469.547-1.094 0-.547-.484-.875-.328-.219-1.672-.547-1.812-.469-2.516-.797-.687-.328-1.046-.906-.36-.594-.36-1.313 0-.64.297-1.187.297-.563.813-.922.375-.281 1.03-.469.673-.203 1.423-.203 1.14 0 2 .328.859.328 1.265.891.422.562.578 1.5l-1.609.219q-.11-.75-.64-1.172-.516-.422-1.47-.422-1.14 0-1.624.375-.47.375-.47.875 0 .312.188.578.204.266.641.438.234.093 1.438.421 1.75.454 2.437.75.688.297 1.078.86.39.562.39 1.406 0 .828-.484 1.547-.468.719-1.375 1.125-.906.39-2.046.39-1.875 0-2.875-.78-.985-.782-1.25-2.329zm16.609-.22 1.687.204q-.406 1.484-1.484 2.312-1.078.813-2.766.813-2.125 0-3.375-1.297-1.234-1.313-1.234-3.672 0-2.453 1.25-3.797 1.266-1.344 3.266-1.344 1.937 0 3.156 1.328 1.234 1.313 1.234 3.703v.438h-7.218q.093 1.594.906 2.453.812.844 2.015.844.907 0 1.547-.469.64-.484 1.016-1.516zm-5.39-2.656h5.406q-.11-1.219-.625-1.828-.782-.953-2.032-.953-1.125 0-1.906.766-.766.75-.844 2.015zm9.125 5.766v-9.672h1.469v1.469q.562-1.032 1.031-1.36.484-.328 1.062-.328.829 0 1.688.531l-.563 1.516q-.609-.36-1.203-.36-.547 0-.968.329-.422.328-.61.89-.281.875-.281 1.922v5.063zm15.963-4.688 1.765.453q-.562 2.172-2 3.329-1.437 1.14-3.531 1.14-2.156 0-3.516-.875-1.343-.89-2.062-2.547-.703-1.672-.703-3.593 0-2.079.797-3.625.797-1.563 2.265-2.36 1.485-.812 3.25-.812 2 0 3.36 1.015 1.375 1.016 1.906 2.875l-1.734.407q-.47-1.454-1.36-2.11-.875-.672-2.203-.672-1.547 0-2.578.735-1.031.734-1.453 1.984-.422 1.234-.422 2.563 0 1.703.5 2.968.5 1.266 1.547 1.907 1.047.625 2.265.625 1.485 0 2.516-.86t1.39-2.547zm3.129-.156q0-2.687 1.484-3.969 1.25-1.078 3.047-1.078 2 0 3.266 1.313 1.265 1.297 1.265 3.61 0 1.858-.562 2.937-.563 1.062-1.64 1.656-1.063.594-2.329.594-2.031 0-3.281-1.297-1.25-1.313-1.25-3.766zm1.687 0q0 1.86.797 2.797.813.922 2.047.922 1.219 0 2.031-.922.813-.938.813-2.844 0-1.797-.813-2.719-.812-.921-2.03-.921-1.235 0-2.048.921-.797.907-.797 2.766zm9.298 4.844v-9.672h1.469v1.375q1.062-1.594 3.078-1.594.875 0 1.61.313.734.312 1.093.828.375.5.516 1.203.093.453.093 1.594v5.953h-1.64v-5.89q0-1-.203-1.485-.188-.5-.672-.797-.485-.297-1.141-.297-1.047 0-1.812.672-.75.656-.75 2.516v5.28zm13.954-1.469.234 1.453q-.687.14-1.234.14-.89 0-1.39-.28-.485-.282-.688-.735-.203-.469-.203-1.937v-5.578h-1.204v-1.266h1.204v-2.39l1.625-.985v3.375h1.656v1.266h-1.656v5.671q0 .688.078.891.093.203.28.328.204.11.579.11.266 0 .719-.063zm8.23-1.64 1.687.203q-.406 1.484-1.484 2.312-1.078.813-2.766.813-2.125 0-3.375-1.297-1.234-1.313-1.234-3.672 0-2.453 1.25-3.797 1.266-1.344 3.266-1.344 1.937 0 3.156 1.328 1.234 1.313 1.234 3.703v.438h-7.218q.093 1.594.906 2.453.812.844 2.015.844.907 0 1.547-.469.641-.484 1.016-1.516zm-5.39-2.657h5.406q-.11-1.219-.625-1.828-.782-.953-2.032-.953-1.125 0-1.906.766-.766.75-.844 2.015zm8.047 5.766 3.531-5.031-3.265-4.641h2.046l1.485 2.266q.422.64.672 1.078.406-.594.734-1.063l1.64-2.281h1.954l-3.344 4.547 3.594 5.125h-2.016l-1.984-3-.516-.813-2.547 3.813zm14-1.469.234 1.453q-.687.14-1.234.14-.89 0-1.39-.28-.485-.282-.688-.735-.203-.469-.203-1.937v-5.578h-1.203v-1.266h1.203v-2.39l1.625-.985v3.375h1.656v1.266h-1.656v5.671q0 .688.078.891.093.203.281.328.203.11.578.11.266 0 .719-.063z" fill="#000"/><path d="m188.249 390.563h52.44v60.85h-52.44z" fill="none"/><g fill="#000" stroke="#fff" stroke-width=".991"><path d="m200.037 416.797v5.207h5.189v-5.207zm6.668 0v5.207h5.189v-5.207zm6.668 0v5.207h5.19v-5.207z" stroke-linecap="butt" stroke-width="1.791"/><g stroke="none"><path d="m200.941 417.701v3.397h3.381v-3.398zm6.668 0v3.397h3.381v-3.398zm6.668 0v3.397h3.381v-3.398zm-12.345.99h1.4v1.416h-1.4zm6.668 0h1.4v1.416h-1.4zm6.668 0h1.4v1.416h-1.4z"/><path d="m201.436 420.603v-2.406h2.39v2.406zm6.668 0v-2.406h2.39v2.406zm6.668 0v-2.406h2.39v2.406z"/></g></g><path d="m208.423 391.623v21.197" fill="none"/><path d="m208.423 391.623v21.197h2.798v-21.197z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m753.886 388.248h52.44v60.85h-52.44z" fill="none"/><path d="m764.442 416.338v5.206h5.189v-5.206zm6.668 0v5.206h5.189v-5.206zm6.668 0v5.206h5.19v-5.206z" fill="#000" fill-rule="evenodd" stroke="#fff" stroke-linecap="butt" stroke-width="2.775"/><path d="m773.766 392.075v21.197" fill="none"/><path d="m772.365 392.074v21.197h2.801v-21.197h-2.8z" style="fill:#000;fill-rule:evenodd;stroke:#fff;stroke-width:2.775;stroke-linecap:butt;stroke-linejoin:round"/><path d="m710.16 345.106h127.496v46.52h-127.496z" fill="#ead1dc" fill-rule="evenodd" stroke="#000" stroke-width="2.8"/><path d="m710.16 345.106h127.496v46.52h-127.496z" stroke="#000" stroke-linecap="butt" stroke-linejoin="round"/><path d="m720.806 373.166v-9.547h3.594q1.094 0 1.75.297.656.281 1.031.89.375.61.375 1.266 0 .61-.344 1.156-.328.531-.984.86.86.25 1.328.875.469.609.469 1.437 0 .672-.297 1.25-.281.578-.703.89-.406.313-1.031.47-.625.156-1.547.156zm1.266-5.532h2.062q.844 0 1.203-.109.485-.14.72-.469.25-.343.25-.843 0-.47-.235-.829-.219-.359-.64-.5-.423-.14-1.454-.14h-1.906zm0 4.407h2.375q.61 0 .86-.047.437-.078.734-.25.296-.188.484-.531.187-.36.187-.813 0-.531-.28-.922-.266-.406-.75-.562-.485-.157-1.407-.157h-2.203zm7.515 1.125v-6.907h1.062v1.047q.406-.734.734-.968.344-.235.766-.235.594 0 1.203.375l-.406 1.078q-.438-.25-.86-.25-.39 0-.703.235-.296.234-.421.64-.204.625-.204 1.36v3.625zm4.016-3.453q0-1.922 1.078-2.844.89-.766 2.172-.766 1.422 0 2.328.938.906.922.906 2.578 0 1.328-.406 2.094-.39.765-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.328.578 1.984.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.031 0-1.282-.593-1.938-.579-.656-1.438-.656-.875 0-1.469.656-.578.656-.578 1.985zm7.928 3.453-2.125-6.907h1.219l1.094 3.985.422 1.484q.015-.11.359-1.422l1.094-4.047h1.203l1.031 4 .344 1.329.406-1.344 1.172-3.985h1.14l-2.156 6.907h-1.218l-1.094-4.14-.266-1.173-1.406 5.313zm7.875-2.063 1.157-.187q.11.703.547 1.078.453.36 1.25.36.812 0 1.203-.329.39-.328.39-.766 0-.39-.36-.625-.233-.156-1.187-.39-1.296-.328-1.796-.563-.485-.25-.75-.656-.25-.422-.25-.937 0-.454.203-.844.218-.406.578-.672.281-.188.75-.328t1.015-.14q.813 0 1.422.234.61.234.907.64.296.39.406 1.063l-1.14.156q-.079-.531-.454-.828-.375-.313-1.062-.313-.813 0-1.157.266-.343.266-.343.625 0 .234.14.422.156.187.453.312.172.063 1.032.297 1.25.328 1.734.547.5.203.781.61.281.406.281 1 0 .593-.343 1.109-.344.515-1 .797-.64.281-1.453.281-1.344 0-2.047-.563-.703-.562-.907-1.656zm11.868-.156 1.203.14q-.281 1.063-1.063 1.657-.765.578-1.968.578-1.516 0-2.407-.938-.89-.937-.89-2.609 0-1.75.89-2.703.907-.969 2.344-.969 1.39 0 2.266.938.875.937.875 2.656v.312h-5.157q.063 1.141.641 1.75.578.594 1.438.594.656 0 1.109-.328.453-.344.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.438zm6.506 4.125v-6.907h1.063v1.047q.406-.734.734-.968.344-.235.766-.235.593 0 1.203.375l-.407 1.078q-.437-.25-.859-.25-.39 0-.703.235-.297.234-.422.64-.203.625-.203 1.36v3.625zm11.407-3.344 1.266.312q-.39 1.563-1.422 2.375-1.031.813-2.531.813-1.532 0-2.5-.625-.97-.625-1.485-1.813-.5-1.187-.5-2.562 0-1.484.563-2.594.578-1.11 1.625-1.687 1.062-.578 2.328-.578 1.422 0 2.39.734.985.719 1.376 2.047l-1.25.297q-.329-1.047-.97-1.516-.624-.484-1.577-.484-1.094 0-1.844.531-.734.531-1.031 1.422-.297.875-.297 1.828 0 1.219.344 2.125.359.906 1.109 1.36.75.437 1.625.437 1.062 0 1.797-.61.734-.609.984-1.812zm2.235-.11q0-1.921 1.078-2.843.89-.766 2.172-.766 1.422 0 2.328.938.906.922.906 2.578 0 1.328-.406 2.094-.39.765-1.156 1.187-.766.422-1.672.422-1.453 0-2.36-.922-.89-.937-.89-2.687zm1.203 0q0 1.329.578 1.985.594.656 1.469.656.875 0 1.453-.656.578-.672.578-2.031 0-1.282-.594-1.938-.578-.656-1.437-.656-.875 0-1.469.656-.578.656-.578 1.985zm6.647 3.454v-6.907h1.062v.985q.75-1.14 2.188-1.14.625 0 1.156.218.531.219.781.594.266.36.375.86.063.327.063 1.14v4.25h-1.172v-4.203q0-.72-.14-1.063-.141-.36-.485-.562-.344-.22-.813-.22-.75 0-1.297.47-.546.468-.546 1.796v3.782zm9.975-1.047.172 1.031q-.5.11-.891.11-.64 0-1-.204-.344-.203-.484-.53-.141-.33-.141-1.392v-3.968h-.86v-.907h.86v-1.718l1.172-.703v2.421h1.172v.907h-1.172v4.047q0 .5.047.64.062.14.203.235.14.078.406.078.203 0 .516-.047zm5.875-1.172 1.203.14q-.282 1.063-1.063 1.657-.765.578-1.969.578-1.515 0-2.406-.938-.89-.937-.89-2.609 0-1.75.89-2.703.906-.969 2.344-.969 1.39 0 2.266.938.875.937.875 2.656v.312h-5.157q.063 1.141.64 1.75.579.594 1.438.594.657 0 1.11-.328.453-.344.719-1.078zm-3.844-1.906h3.86q-.079-.86-.438-1.297-.563-.688-1.453-.688-.813 0-1.36.547-.547.531-.61 1.438zm5.74 4.125 2.532-3.594-2.344-3.313h1.469l1.062 1.61q.297.469.484.781.282-.437.516-.766l1.172-1.625h1.406l-2.39 3.25 2.562 3.657h-1.437l-1.422-2.14-.375-.595-1.813 2.735zm10.008-1.047.172 1.031q-.5.11-.89.11-.641 0-1-.204-.344-.203-.485-.53-.14-.33-.14-1.392v-3.968h-.86v-.907h.86v-1.718l1.171-.703v2.421h1.172v.907h-1.172v4.047q0 .5.047.64.063.14.203.235.141.078.407.078.203 0 .515-.047zm4.984 1.047v-9.547h1.297l5.016 7.5v-7.5h1.203v9.547h-1.297l-5.016-7.5v7.5z" fill="#000"/></svg>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/docs/issue_template.md firefox-85.0+build1/remote/test/puppeteer/docs/issue_template.md
--- firefox-84.0.2+build1/remote/test/puppeteer/docs/issue_template.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/docs/issue_template.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!--
-STEP 1: Are you in the right place?
-
-- For general technical questions or "how to" guidance, please search StackOverflow for questions tagged "puppeteer" or create a new post.
-
-https://stackoverflow.com/questions/tagged/puppeteer
-
-- For issues or feature requests related to the DevTools Protocol (https://chromedevtools.github.io/devtools-protocol/), file an issue there:
-
-https://github.com/ChromeDevTools/devtools-protocol/issues/new.
-
-- Problem in Headless Chrome? File an issue against Chromium's issue tracker:
-
-https://bugs.chromium.org/p/chromium/issues/entry?components=Internals%3EHeadless&blocking=705916
-
-For issues, feature requests, or setup troubles with Puppeteer, file an issue right here!
--->
-
-### Steps to reproduce
-
-**Tell us about your environment:**
-
-* Puppeteer version:
-* Platform / OS version:
-* URLs (if applicable):
-* Node.js version:
-
-**What steps will reproduce the problem?**
-
-_Please include code that reproduces the issue._
-
-1.
-2.
-3.
-
-**What is the expected result?**
-
-
-**What happens instead?**
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/docs/troubleshooting.md firefox-85.0+build1/remote/test/puppeteer/docs/troubleshooting.md
--- firefox-84.0.2+build1/remote/test/puppeteer/docs/troubleshooting.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/docs/troubleshooting.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,419 +0,0 @@
-# Troubleshooting
-
-<!-- GEN:toc -->
-- [Chrome headless doesn't launch on Windows](#chrome-headless-doesnt-launch-on-windows)
-- [Chrome headless doesn't launch on UNIX](#chrome-headless-doesnt-launch-on-unix)
-- [Setting Up Chrome Linux Sandbox](#setting-up-chrome-linux-sandbox)
-  * [[recommended] Enable user namespace cloning](#recommended-enable-user-namespace-cloning)
-  * [[alternative] Setup setuid sandbox](#alternative-setup-setuid-sandbox)
-- [Running Puppeteer on Travis CI](#running-puppeteer-on-travis-ci)
-- [Running Puppeteer on CircleCI](#running-puppeteer-on-circleci)
-- [Running Puppeteer in Docker](#running-puppeteer-in-docker)
-  * [Running on Alpine](#running-on-alpine)
-    - [Tips](#tips)
-- [Running Puppeteer in the cloud](#running-puppeteer-in-the-cloud)
-  * [Running Puppeteer on Google App Engine](#running-puppeteer-on-google-app-engine)
-  * [Running Puppeteer on Google Cloud Functions](#running-puppeteer-on-google-cloud-functions)
-  * [Running Puppeteer on Heroku](#running-puppeteer-on-heroku)
-  * [Running Puppeteer on AWS Lambda](#running-puppeteer-on-aws-lambda)
-- [Code Transpilation Issues](#code-transpilation-issues)
-<!-- GEN:stop -->
-
-## Chrome headless doesn't launch on Windows
-
-Some [chrome policies](https://support.google.com/chrome/a/answer/7532015) might enforce running Chrome/Chromium
-with certain extensions.
-
-Puppeteer passes `--disable-extensions` flag by default and will fail to launch when such policies are active.
-
-To work around this, try running without the flag:
-
-```js
-const browser = await puppeteer.launch({
-  ignoreDefaultArgs: ['--disable-extensions'],
-});
-```
-
-> Context: [issue 3681](https://github.com/puppeteer/puppeteer/issues/3681#issuecomment-447865342).
-
-## Chrome headless doesn't launch on UNIX
-
-Make sure all the necessary dependencies are installed. You can run `ldd chrome | grep not` on a Linux
-machine to check which dependencies are missing. The common ones are provided below.
-
-<details>
-<summary>Debian (e.g. Ubuntu) Dependencies</summary>
-
-```
-ca-certificates
-fonts-liberation
-gconf-service
-libappindicator1
-libasound2
-libatk-bridge2.0-0
-libatk1.0-0
-libc6
-libcairo2
-libcups2
-libdbus-1-3
-libexpat1
-libfontconfig1
-libgbm1
-libgcc1
-libgconf-2-4
-libgdk-pixbuf2.0-0
-libglib2.0-0
-libgtk-3-0
-libnspr4
-libnss3
-libpango-1.0-0
-libpangocairo-1.0-0
-libstdc++6
-libx11-6
-libx11-xcb1
-libxcb1
-libxcomposite1
-libxcursor1
-libxdamage1
-libxext6
-libxfixes3
-libxi6
-libxrandr2
-libxrender1
-libxss1
-libxtst6
-lsb-release
-wget
-xdg-utils
-```
-</details>
-
-<details>
-<summary>CentOS Dependencies</summary>
-
-```
-alsa-lib.x86_64
-atk.x86_64
-cups-libs.x86_64
-GConf2.x86_64
-gtk3.x86_64
-ipa-gothic-fonts
-libXcomposite.x86_64
-libXcursor.x86_64
-libXdamage.x86_64
-libXext.x86_64
-libXi.x86_64
-libXrandr.x86_64
-libXScrnSaver.x86_64
-libXtst.x86_64
-pango.x86_64
-xorg-x11-fonts-100dpi
-xorg-x11-fonts-75dpi
-xorg-x11-fonts-cyrillic
-xorg-x11-fonts-misc
-xorg-x11-fonts-Type1
-xorg-x11-utils
-```
-
-After installing dependencies you need to update nss library using this command
-
-```
-yum update nss -y
-```
-</details>
-
-<details>
-  <summary>Check out discussions</summary>
-
-- [#290](https://github.com/puppeteer/puppeteer/issues/290) - Debian troubleshooting <br/>
-- [#391](https://github.com/puppeteer/puppeteer/issues/391) - CentOS troubleshooting <br/>
-- [#379](https://github.com/puppeteer/puppeteer/issues/379) - Alpine troubleshooting <br/>
-</details>
-
-## Setting Up Chrome Linux Sandbox
-
-In order to protect the host environment from untrusted web content, Chrome uses [multiple layers of sandboxing](https://chromium.googlesource.com/chromium/src/+/HEAD/docs/linux_sandboxing.md). For this to work properly,
-the host should be configured first. If there's no good sandbox for Chrome to use, it will crash
-with the error `No usable sandbox!`.
-
-If you **absolutely trust** the content you open in Chrome, you can launch Chrome
-with the `--no-sandbox` argument:
-
-```js
-const browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']});
-```
-
-> **NOTE**: Running without a sandbox is **strongly discouraged**. Consider configuring a sandbox instead.
-
-There are 2 ways to configure a sandbox in Chromium.
-
-### [recommended] Enable [user namespace cloning](http://man7.org/linux/man-pages/man7/user_namespaces.7.html)
-
-User namespace cloning is only supported by modern kernels. Unprivileged user namespaces are generally fine to enable,
-but in some cases they open up more kernel attack surface for (unsandboxed) non-root processes to elevate to
-kernel privileges.
-
-```bash
-sudo sysctl -w kernel.unprivileged_userns_clone=1
-```
-
-### [alternative] Setup [setuid sandbox](https://chromium.googlesource.com/chromium/src/+/HEAD/docs/linux_suid_sandbox_development.md)
-
-The setuid sandbox comes as a standalone executable and is located next to the Chromium that Puppeteer downloads. It is
-fine to re-use the same sandbox executable for different Chromium versions, so the following could be
-done only once per host environment:
-
-```bash
-# cd to the downloaded instance
-cd <project-dir-path>/node_modules/puppeteer/.local-chromium/linux-<revision>/chrome-linux/
-sudo chown root:root chrome_sandbox
-sudo chmod 4755 chrome_sandbox
-# copy sandbox executable to a shared location
-sudo cp -p chrome_sandbox /usr/local/sbin/chrome-devel-sandbox
-# export CHROME_DEVEL_SANDBOX env variable
-export CHROME_DEVEL_SANDBOX=/usr/local/sbin/chrome-devel-sandbox
-```
-
-You might want to export the `CHROME_DEVEL_SANDBOX` env variable by default. In this case, add the following to the `~/.bashrc`
-or `.zshenv`:
-
-```bash
-export CHROME_DEVEL_SANDBOX=/usr/local/sbin/chrome-devel-sandbox
-```
-
-
-## Running Puppeteer on Travis CI
-
-> 👋 We run our tests for Puppeteer on Travis CI - see our [`.travis.yml`](https://github.com/puppeteer/puppeteer/blob/main/.travis.yml) for reference.
-
-Tips-n-tricks:
-- [xvfb](https://en.wikipedia.org/wiki/Xvfb) service should be launched in order to run Chromium in non-headless mode
-- Runs on Xenial Linux on Travis by default
-- Runs `npm install` by default
-- `node_modules` is cached by default
-
-`.travis.yml` might look like this:
-
-```yml
-language: node_js
-node_js: node
-services: xvfb
-
-script:
-  - npm run test
-```
-
-## Running Puppeteer on CircleCI
-
-Running Puppeteer smoothly on CircleCI requires the following steps:
-
-1. Start with a [NodeJS
-   image](https://circleci.com/docs/2.0/circleci-images/#nodejs) in your config
-   like so:
-   ```yaml
-   docker:
-     - image: circleci/node:12 # Use your desired version
-       environment:
-         NODE_ENV: development # Only needed if puppeteer is in `devDependencies`
-   ```
-1. Dependencies like `libXtst6` probably need to be installed via `apt-get`,
-   so use the
-   [threetreeslight/puppeteer](https://circleci.com/orbs/registry/orb/threetreeslight/puppeteer)
-   orb
-   ([instructions](https://circleci.com/orbs/registry/orb/threetreeslight/puppeteer#quick-start)),
-   or paste parts of its
-   [source](https://circleci.com/orbs/registry/orb/threetreeslight/puppeteer#orb-source)
-   into your own config.
-1. Lastly, if you’re using Puppeteer through Jest, then you may encounter an
-   error spawning child processes:
-   ```
-   [00:00.0]  jest args: --e2e --spec --max-workers=36
-   Error: spawn ENOMEM
-      at ChildProcess.spawn (internal/child_process.js:394:11)
-   ```
-   This is likely caused by Jest autodetecting the number of processes on the
-   entire machine (`36`) rather than the number allowed to your container
-   (`2`). To fix this, set `jest --maxWorkers=2` in your test command.
-
-## Running Puppeteer in Docker
-
-> 👋 We use [Cirrus Ci](https://cirrus-ci.org/) to run our tests for Puppeteer in a Docker container - see our [`Dockerfile.linux`](https://github.com/puppeteer/puppeteer/blob/main/.ci/node10/Dockerfile.linux) for reference.
-
-Getting headless Chrome up and running in Docker can be tricky.
-The bundled Chromium that Puppeteer installs is missing the necessary
-shared library dependencies.
-
-To fix, you'll need to install the missing dependencies and the
-latest Chromium package in your Dockerfile:
-
-```Dockerfile
-FROM node:10-slim
-
-# Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
-# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
-# installs, work.
-RUN apt-get update \
-    && apt-get install -y wget gnupg \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf \
-      --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*
-
-# If running Docker >= 1.13.0 use docker run's --init arg to reap zombie processes, otherwise
-# uncomment the following lines to have `dumb-init` as PID 1
-# ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 /usr/local/bin/dumb-init
-# RUN chmod +x /usr/local/bin/dumb-init
-# ENTRYPOINT ["dumb-init", "--"]
-
-# Uncomment to skip the chromium download when installing puppeteer. If you do,
-# you'll need to launch puppeteer with:
-#     browser.launch({executablePath: 'google-chrome-unstable'})
-# ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-
-# Install puppeteer so it's available in the container.
-RUN npm i puppeteer \
-    # Add user so we don't need --no-sandbox.
-    # same layer as npm install to keep re-chowned files from using up several hundred MBs more space
-    && groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
-    && mkdir -p /home/pptruser/Downloads \
-    && chown -R pptruser:pptruser /home/pptruser \
-    && chown -R pptruser:pptruser /node_modules
-
-# Run everything after as non-privileged user.
-USER pptruser
-
-CMD ["google-chrome-unstable"]
-```
-
-Build the container:
-
-```bash
-docker build -t puppeteer-chrome-linux .
-```
-
-Run the container by passing `node -e "<yourscript.js content as a string>"` as the command:
-
-```bash
- docker run -i --init --rm --cap-add=SYS_ADMIN \
-   --name puppeteer-chrome puppeteer-chrome-linux \
-   node -e "`cat yourscript.js`"
-```
-
-There's a full example at https://github.com/ebidel/try-puppeteer that shows
-how to run this Dockerfile from a webserver running on App Engine Flex (Node).
-
-### Running on Alpine
-
-The [newest Chromium package](https://pkgs.alpinelinux.org/package/edge/community/x86_64/chromium) supported on Alpine is 77, which corresponds to [Puppeteer v1.19.0](https://github.com/puppeteer/puppeteer/releases/tag/v1.19.0).
-
-Example Dockerfile:
-
-```Dockerfile
-FROM alpine:edge
-
-# Installs latest Chromium (77) package.
-RUN apk add --no-cache \
-      chromium \
-      nss \
-      freetype \
-      freetype-dev \
-      harfbuzz \
-      ca-certificates \
-      ttf-freefont \
-      nodejs \
-      yarn
-
-...
-
-# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
-    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
-
-# Puppeteer v1.19.0 works with Chromium 77.
-RUN yarn add puppeteer@1.19.0
-
-# Add user so we don't need --no-sandbox.
-RUN addgroup -S pptruser && adduser -S -g pptruser pptruser \
-    && mkdir -p /home/pptruser/Downloads /app \
-    && chown -R pptruser:pptruser /home/pptruser \
-    && chown -R pptruser:pptruser /app
-
-# Run everything after as non-privileged user.
-USER pptruser
-
-...
-```
-
-#### Tips
-
-By default, Docker runs a container with a `/dev/shm` shared memory space 64MB.
-This is [typically too small](https://github.com/c0b/chrome-in-docker/issues/1) for Chrome
-and will cause Chrome to crash when rendering large pages. To fix, run the container with
-`docker run --shm-size=1gb` to increase the size of `/dev/shm`. Since Chrome 65, this is no
-longer necessary. Instead, launch the browser with the `--disable-dev-shm-usage` flag:
-
-```js
-const browser = await puppeteer.launch({
-  args: ['--disable-dev-shm-usage']
-});
-```
-
-This will write shared memory files into `/tmp` instead of `/dev/shm`. See [crbug.com/736452](https://bugs.chromium.org/p/chromium/issues/detail?id=736452) for more details.
-
-Seeing other weird errors when launching Chrome? Try running your container
-with `docker run --cap-add=SYS_ADMIN` when developing locally. Since the Dockerfile
-adds a `pptr` user as a non-privileged user, it may not have all the necessary privileges.
-
-[dumb-init](https://github.com/Yelp/dumb-init) is worth checking out if you're
-experiencing a lot of zombies Chrome processes sticking around. There's special
-treatment for processes with PID=1, which makes it hard to terminate Chrome
-properly in some cases (e.g. in Docker).
-
-## Running Puppeteer in the cloud
-
-### Running Puppeteer on Google App Engine
-
-The Node.js runtime of the [App Engine standard environment](https://cloud.google.com/appengine/docs/standard/nodejs/) comes with all system packages needed to run Headless Chrome.
-
-To use `puppeteer`, simply list the module as a dependency in your `package.json` and deploy to Google App Engine. Read more about using `puppeteer` on App Engine by following [the official tutorial](https://cloud.google.com/appengine/docs/standard/nodejs/using-headless-chrome-with-puppeteer).
-
-### Running Puppeteer on Google Cloud Functions
-
-The Node.js 10 runtime of [Google Cloud Functions](https://cloud.google.com/functions/docs/) comes with all system packages needed to run Headless Chrome.
-
-To use `puppeteer`, simply list the module as a dependency in your `package.json` and deploy your function to Google Cloud Functions using the `nodejs10` runtime.
-
-### Running Puppeteer on Heroku
-
-Running Puppeteer on Heroku requires some additional dependencies that aren't included on the Linux box that Heroku spins up for you. To add the dependencies on deploy, add the Puppeteer Heroku buildpack to the list of buildpacks for your app under Settings > Buildpacks.
-
-The url for the buildpack is https://github.com/jontewks/puppeteer-heroku-buildpack
-
-Ensure that you're using `'--no-sandbox'` mode when launching Puppeteer. This can be done by passing it as an argument to your `.launch()` call: `puppeteer.launch({ args: ['--no-sandbox'] });`.
-
-When you click add buildpack, simply paste that url into the input, and click save. On the next deploy, your app will also install the dependencies that Puppeteer needs to run.
-
-If you need to render Chinese, Japanese, or Korean characters you may need to use a buildpack with additional font files like https://github.com/CoffeeAndCode/puppeteer-heroku-buildpack
-
-There's also another [simple guide](https://timleland.com/headless-chrome-on-heroku/) from @timleland that includes a sample project: https://timleland.com/headless-chrome-on-heroku/.
-
-### Running Puppeteer on AWS Lambda
-
-AWS Lambda [limits](https://docs.aws.amazon.com/lambda/latest/dg/limits.html) deployment package sizes to ~50MB. This presents challenges for running headless Chrome (and therefore Puppeteer) on Lambda. The community has put together a few resources that work around the issues:
-
-- https://github.com/alixaxel/chrome-aws-lambda (kept updated with the latest stable release of puppeteer)
-- https://github.com/adieuadieu/serverless-chrome/blob/master/docs/chrome.md (serverless plugin - outdated)
-
-## Code Transpilation Issues
-
-If you are using a JavaScript transpiler like babel or TypeScript, calling `evaluate()` with an async function might not work. This is because while `puppeteer` uses `Function.prototype.toString()` to serialize functions while transpilers could be changing the output code in such a way it's incompatible with `puppeteer`.
-
-Some workarounds to this problem would be to instruct the transpiler not to mess up with the code, for example, configure TypeScript to use latest ecma version (`"target": "es2018"`). Another workaround could be using string templates instead of functions:
-
-```js
-await page.evaluate(`(async() => {
-   console.log('1');
-})()`);
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.eslintignore firefox-85.0+build1/remote/test/puppeteer/.eslintignore
--- firefox-84.0.2+build1/remote/test/puppeteer/.eslintignore	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.eslintignore	2021-01-18 19:58:18.000000000 +0000
@@ -6,9 +6,9 @@
 node6-test/*
 experimental/
 lib/
-src/externs.d.ts
-src/protocol.d.ts
 /index.d.ts
 # We ignore this file because it uses ES imports which we don't yet use
 # in the Puppeteer src, so it trips up the ESLint-TypeScript parser.
 utils/doclint/generate_types/test/test.ts
+vendor/
+web-test-runner.config.mjs
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.eslintrc.js firefox-85.0+build1/remote/test/puppeteer/.eslintrc.js
--- firefox-84.0.2+build1/remote/test/puppeteer/.eslintrc.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.eslintrc.js	2021-01-18 19:58:18.000000000 +0000
@@ -1,118 +1,183 @@
 module.exports = {
-    "root": true,
-    "env": {
-        "node": true,
-        "es6": true
-    },
-
-    "parser": "@typescript-eslint/parser",
-
-    "plugins": [
-        "mocha",
-        "@typescript-eslint",
-        "unicorn"
-    ],
-
-    "extends": [
-        "plugin:prettier/recommended"
-    ],
-
-    "rules": {
-        // Error if files are not formatted with Prettier correctly.
-        "prettier/prettier": 2,
-        // syntax preferences
-        "quotes": [2, "single", {
-            "avoidEscape": true,
-            "allowTemplateLiterals": true
-        }],
-        "spaced-comment": [2, "always", {
-            "markers": ["*"]
-        }],
-        "eqeqeq": [2],
-        "accessor-pairs": [2, {
-            "getWithoutSet": false,
-            "setWithoutGet": false
-        }],
-        "new-parens": 2,
-        "func-call-spacing": 2,
-        "prefer-const": 2,
-
-        "max-len": [2, {
-           /* this setting doesn't impact things as we use Prettier to format
-            * our code and hence dictate the line length.
-            * Prettier aims for 80 but sometimes makes the decision to go just
-            * over 80 chars as it decides that's better than wrapping. ESLint's
-            * rule defaults to 80 but therefore conflicts with Prettier. So we
-            * set it to something far higher than Prettier would allow to avoid
-            * it causing issues and conflicting with Prettier.
-            */
-            "code": 200,
-            "comments": 90,
-            "ignoreTemplateLiterals": true,
-            "ignoreUrls": true,
-            "ignoreStrings": true,
-            "ignoreRegExpLiterals": true
-        }],
-        // anti-patterns
-        "no-var": 2,
-        "no-with": 2,
-        "no-multi-str": 2,
-        "no-caller": 2,
-        "no-implied-eval": 2,
-        "no-labels": 2,
-        "no-new-object": 2,
-        "no-octal-escape": 2,
-        "no-self-compare": 2,
-        "no-shadow-restricted-names": 2,
-        "no-cond-assign": 2,
-        "no-debugger": 2,
-        "no-dupe-keys": 2,
-        "no-duplicate-case": 2,
-        "no-empty-character-class": 2,
-        "no-unreachable": 2,
-        "no-unsafe-negation": 2,
-        "radix": 2,
-        "valid-typeof": 2,
-        "no-unused-vars": [2, { "args": "none", "vars": "local", "varsIgnorePattern": "([fx]?describe|[fx]?it|beforeAll|beforeEach|afterAll|afterEach)" }],
-        "no-implicit-globals": [2],
-
-        // es2015 features
-        "require-yield": 2,
-        "template-curly-spacing": [2, "never"],
-
-        // ensure we don't have any it.only or describe.only in prod
-        "mocha/no-exclusive-tests": "error",
+  root: true,
+  env: {
+    node: true,
+    es6: true,
+  },
+
+  parser: '@typescript-eslint/parser',
+
+  plugins: ['mocha', '@typescript-eslint', 'unicorn', 'import'],
+
+  extends: ['plugin:prettier/recommended'],
+
+  rules: {
+    // Error if files are not formatted with Prettier correctly.
+    'prettier/prettier': 2,
+    // syntax preferences
+    quotes: [
+      2,
+      'single',
+      {
+        avoidEscape: true,
+        allowTemplateLiterals: true,
+      },
+    ],
+    'spaced-comment': [
+      2,
+      'always',
+      {
+        markers: ['*'],
+      },
+    ],
+    eqeqeq: [2],
+    'accessor-pairs': [
+      2,
+      {
+        getWithoutSet: false,
+        setWithoutGet: false,
+      },
+    ],
+    'new-parens': 2,
+    'func-call-spacing': 2,
+    'prefer-const': 2,
+
+    'max-len': [
+      2,
+      {
+        /* this setting doesn't impact things as we use Prettier to format
+         * our code and hence dictate the line length.
+         * Prettier aims for 80 but sometimes makes the decision to go just
+         * over 80 chars as it decides that's better than wrapping. ESLint's
+         * rule defaults to 80 but therefore conflicts with Prettier. So we
+         * set it to something far higher than Prettier would allow to avoid
+         * it causing issues and conflicting with Prettier.
+         */
+        code: 200,
+        comments: 90,
+        ignoreTemplateLiterals: true,
+        ignoreUrls: true,
+        ignoreStrings: true,
+        ignoreRegExpLiterals: true,
+      },
+    ],
+    // anti-patterns
+    'no-var': 2,
+    'no-with': 2,
+    'no-multi-str': 2,
+    'no-caller': 2,
+    'no-implied-eval': 2,
+    'no-labels': 2,
+    'no-new-object': 2,
+    'no-octal-escape': 2,
+    'no-self-compare': 2,
+    'no-shadow-restricted-names': 2,
+    'no-cond-assign': 2,
+    'no-debugger': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-unreachable': 2,
+    'no-unsafe-negation': 2,
+    radix: 2,
+    'valid-typeof': 2,
+    'no-unused-vars': [
+      2,
+      {
+        args: 'none',
+        vars: 'local',
+        varsIgnorePattern:
+          '([fx]?describe|[fx]?it|beforeAll|beforeEach|afterAll|afterEach)',
+      },
+    ],
+    'no-implicit-globals': [2],
 
-        // enforce the variable in a catch block is named error
-        "unicorn/catch-error-name": "error"
+    // es2015 features
+    'require-yield': 2,
+    'template-curly-spacing': [2, 'never'],
+
+    // ensure we don't have any it.only or describe.only in prod
+    'mocha/no-exclusive-tests': 'error',
+
+    // enforce the variable in a catch block is named error
+    'unicorn/catch-error-name': 'error',
+
+    'no-restricted-imports': [
+      'error',
+      {
+        patterns: ['*Events'],
+        paths: [
+          {
+            name: 'mitt',
+            message:
+              'Import Mitt from the vendored location: vendor/mitt/src/index.js',
+          },
+        ],
+      },
+    ],
+    'import/extensions': ['error', 'ignorePackages'],
+  },
+  overrides: [
+    {
+      files: ['*.ts'],
+      extends: [
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended',
+      ],
+      rules: {
+        'no-unused-vars': 0,
+        '@typescript-eslint/no-unused-vars': 2,
+        'func-call-spacing': 0,
+        '@typescript-eslint/func-call-spacing': 2,
+        semi: 0,
+        '@typescript-eslint/semi': 2,
+        '@typescript-eslint/no-empty-function': 0,
+        '@typescript-eslint/no-use-before-define': 0,
+        // We have to use any on some types so the warning isn't valuable.
+        '@typescript-eslint/no-explicit-any': 0,
+        // We don't require explicit return types on basic functions or
+        // dummy functions in tests, for example
+        '@typescript-eslint/explicit-function-return-type': 0,
+        // We know it's bad and use it very sparingly but it's needed :(
+        '@typescript-eslint/ban-ts-ignore': 0,
+        /**
+         * This is the default options (as per
+         * https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/ban-types.md),
+         *
+         * Unfortunately there's no way to
+         */
+        '@typescript-eslint/ban-types': [
+          'error',
+          {
+            extendDefaults: true,
+            types: {
+              /*
+               * Puppeteer's API accepts generic functions in many places so it's
+               * not a useful linting rule to ban the `Function` type. This turns off
+               * the banning of the `Function` type which is a default rule.
+               */
+              Function: false,
+            },
+          },
+        ],
+        '@typescript-eslint/array-type': [
+          2,
+          {
+            default: 'array-simple',
+          },
+        ],
+      },
+    },
+    {
+      files: ['test-browser/**/*.js'],
+      parserOptions: {
+        sourceType: 'module',
+      },
+      env: {
+        es6: true,
+        browser: true,
+        es2020: true,
+      },
     },
-    "overrides": [
-        {
-            "files": ["*.ts"],
-            "extends": [
-                'plugin:@typescript-eslint/eslint-recommended',
-                'plugin:@typescript-eslint/recommended',
-            ],
-            "rules": {
-                "no-unused-vars": 0,
-                "@typescript-eslint/no-unused-vars": 2,
-                "func-call-spacing": 0,
-                "@typescript-eslint/func-call-spacing": 2,
-                "semi": 0,
-                "@typescript-eslint/semi": 2,
-                "@typescript-eslint/no-empty-function": 0,
-                "@typescript-eslint/no-use-before-define": 0,
-                // We have to use any on some types so the warning isn't valuable.
-                "@typescript-eslint/no-explicit-any": 0,
-                // We don't require explicit return types on basic functions or
-                // dummy functions in tests, for example
-                "@typescript-eslint/explicit-function-return-type": 0,
-                // We know it's bad and use it very sparingly but it's needed :(
-                "@typescript-eslint/ban-ts-ignore": 0,
-                "@typescript-eslint/array-type": [2, {
-                    "default": "array-simple"
-                }]
-            }
-        }
-    ]
+  ],
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/examples/oopif.js firefox-85.0+build1/remote/test/puppeteer/examples/oopif.js
--- firefox-84.0.2+build1/remote/test/puppeteer/examples/oopif.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/examples/oopif.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+const puppeteer = require('puppeteer');
+
+async function attachFrame(frameId, url) {
+  const frame = document.createElement('iframe');
+  frame.src = url;
+  frame.id = frameId;
+  document.body.appendChild(frame);
+  await new Promise((x) => (frame.onload = x));
+  return frame;
+}
+
+(async () => {
+  // Launch browser in non-headless mode.
+  const browser = await puppeteer.launch({ headless: false });
+  const page = await browser.newPage();
+
+  // Load a page from one origin:
+  await page.goto('http://example.org/');
+
+  // Inject iframe with the another origin.
+  await page.evaluateHandle(attachFrame, 'frame1', 'https://example.com/');
+
+  // At this point there should be a message in the output:
+  // puppeteer:frame The frame '...' moved to another session. Out-of-proccess
+  // iframes (OOPIF) are not supported by Puppeteer yet.
+  // https://github.com/puppeteer/puppeteer/issues/2548
+
+  await browser.close();
+})();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/examples/search.js firefox-85.0+build1/remote/test/puppeteer/examples/search.js
--- firefox-84.0.2+build1/remote/test/puppeteer/examples/search.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/examples/search.js	2021-01-18 19:58:18.000000000 +0000
@@ -30,7 +30,7 @@
   await page.goto('https://developers.google.com/web/');
 
   // Type into search box.
-  await page.type('#searchbox input', 'Headless Chrome');
+  await page.type('.devsite-searchbox input', 'Headless Chrome');
 
   // Wait for suggest overlay to appear and click "show all results".
   const allResultsSelector = '.devsite-suggest-all-results';
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.github/workflows/publish-on-tag.yml firefox-85.0+build1/remote/test/puppeteer/.github/workflows/publish-on-tag.yml
--- firefox-84.0.2+build1/remote/test/puppeteer/.github/workflows/publish-on-tag.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.github/workflows/publish-on-tag.yml	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,30 @@
+name: publish-on-tag
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: npm install
+      - name: Build
+        run: npm run build
+      - name: Publish puppeteer
+        env:
+          NPM_TOKEN: ${{secrets.NPM_TOKEN_PUPPETEER}}
+        run: |
+          npm config set '//wombat-dressing-room.appspot.com/:_authToken' '${NPM_TOKEN}'
+          npm publish
+      - name: Publish puppeteer-core
+        env:
+          NPM_TOKEN: ${{secrets.NPM_TOKEN_PUPPETEER_CORE}}
+        run: |
+          utils/prepare_puppeteer_core.js
+          npm config set '//wombat-dressing-room.appspot.com/:_authToken' '${NPM_TOKEN}'
+          npm publish
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/install.js firefox-85.0+build1/remote/test/puppeteer/install.js
--- firefox-84.0.2+build1/remote/test/puppeteer/install.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/install.js	2021-01-18 19:58:18.000000000 +0000
@@ -29,7 +29,10 @@
 async function download() {
   await compileTypeScriptIfRequired();
   // need to ensure TS is compiled before loading the installer
-  const { downloadBrowser, logPolitely } = require('./lib/cjs/install');
+  const {
+    downloadBrowser,
+    logPolitely,
+  } = require('./lib/cjs/puppeteer/node/install');
 
   if (process.env.PUPPETEER_SKIP_DOWNLOAD) {
     logPolitely(
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/LICENSE firefox-85.0+build1/remote/test/puppeteer/LICENSE
--- firefox-84.0.2+build1/remote/test/puppeteer/LICENSE	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/LICENSE	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -193,7 +193,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/mocha-config/puppeteer-unit-tests.js firefox-85.0+build1/remote/test/puppeteer/mocha-config/puppeteer-unit-tests.js
--- firefox-84.0.2+build1/remote/test/puppeteer/mocha-config/puppeteer-unit-tests.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/mocha-config/puppeteer-unit-tests.js	2021-01-18 19:58:18.000000000 +0000
@@ -18,11 +18,11 @@
 
 module.exports = {
   ...base,
-  require: ['ts-node/register', './test/mocha-utils.ts'],
+  require: ['./test/mocha-ts-require', './test/mocha-utils.ts'],
   spec: 'test/*.spec.ts',
-  extension: ['ts'],
-  parallel: process.env.CI && !process.env.COVERAGE,
-  // retry twice more, so we run each test up to 3 times if needed.
+  extension: ['js', 'ts'],
   retries: process.env.CI ? 2 : 0,
+  parallel: !!process.env.PARALLEL,
   timeout: 25 * 1000,
+  reporter: process.env.CI ? 'spec' : 'dot',
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/moz.yaml firefox-85.0+build1/remote/test/puppeteer/moz.yaml
--- firefox-84.0.2+build1/remote/test/puppeteer/moz.yaml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/moz.yaml	2021-01-18 19:58:18.000000000 +0000
@@ -5,6 +5,6 @@
   description: Headless Chrome Node API
   license: Apache-2.0
   name: puppeteer
-  release: 6d06adea10572d2667a9d1c5a48193903860341b
+  release: a5dedb7
   url: https://github.com/mjzffr/puppeteer.git
 schema: 1
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/index.md firefox-85.0+build1/remote/test/puppeteer/new-docs/index.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/index.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/index.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md)
-
-## API Reference
-
-## Packages
-
-|  Package | Description |
-|  --- | --- |
-|  [puppeteer](./puppeteer.md) |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Accessibility](./puppeteer.accessibility.md)
-
-## Accessibility class
-
-The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or [switches](https://en.wikipedia.org/wiki/Switch_access)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Accessibility 
-```
-
-## Remarks
-
-Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that might have wildly different output.
-
-Blink - Chrome's rendering engine - has a concept of "accessibility tree", which is then translated into different platform-specific APIs. Accessibility namespace gives users access to the Blink Accessibility Tree.
-
-Most of the accessibility tree gets filtered out when converting from Blink AX Tree to Platform-specific AX-Tree or by assistive technologies themselves. By default, Puppeteer tries to approximate this filtering, exposing only the "interesting" nodes of the tree.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Accessibility` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [snapshot(options)](./puppeteer.accessibility.snapshot.md) |  | Captures the current state of the accessibility tree. The returned object represents the root accessible node of the page. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.snapshot.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.snapshot.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.snapshot.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.accessibility.snapshot.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Accessibility](./puppeteer.accessibility.md) &gt; [snapshot](./puppeteer.accessibility.snapshot.md)
-
-## Accessibility.snapshot() method
-
-Captures the current state of the accessibility tree. The returned object represents the root accessible node of the page.
-
-<b>Signature:</b>
-
-```typescript
-snapshot(options?: SnapshotOptions): Promise<SerializedAXNode>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [SnapshotOptions](./puppeteer.snapshotoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[SerializedAXNode](./puppeteer.serializedaxnode.md)<!-- -->&gt;
-
-An AXNode object representing the snapshot.
-
-## Remarks
-
-\*\*NOTE\*\* The Chromium accessibility tree contains nodes that go unused on most platforms and by most screen readers. Puppeteer will discard them as well for an easier to process tree, unless `interestingOnly` is set to `false`<!-- -->.
-
-## Example 1
-
-An example of dumping the entire accessibility tree:
-
-```js
-const snapshot = await page.accessibility.snapshot();
-console.log(snapshot);
-
-```
-
-## Example 2
-
-An example of logging the focused node's name:
-
-```js
-const snapshot = await page.accessibility.snapshot();
-const node = findFocusedNode(snapshot);
-console.log(node && node.name);
-
-function findFocusedNode(node) {
-  if (node.focused)
-    return node;
-  for (const child of node.children || []) {
-    const foundNode = findFocusedNode(child);
-    return foundNode;
-  }
-  return null;
-}
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.height.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.height.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.height.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.height.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoundingBox](./puppeteer.boundingbox.md) &gt; [height](./puppeteer.boundingbox.height.md)
-
-## BoundingBox.height property
-
-the height of the element in pixels.
-
-<b>Signature:</b>
-
-```typescript
-height: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoundingBox](./puppeteer.boundingbox.md)
-
-## BoundingBox interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface BoundingBox 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [height](./puppeteer.boundingbox.height.md) | number | the height of the element in pixels. |
-|  [width](./puppeteer.boundingbox.width.md) | number | the width of the element in pixels. |
-|  [x](./puppeteer.boundingbox.x.md) | number | the x coordinate of the element in pixels. |
-|  [y](./puppeteer.boundingbox.y.md) | number | the y coordinate of the element in pixels. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.width.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.width.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.width.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.width.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoundingBox](./puppeteer.boundingbox.md) &gt; [width](./puppeteer.boundingbox.width.md)
-
-## BoundingBox.width property
-
-the width of the element in pixels.
-
-<b>Signature:</b>
-
-```typescript
-width: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.x.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.x.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.x.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.x.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoundingBox](./puppeteer.boundingbox.md) &gt; [x](./puppeteer.boundingbox.x.md)
-
-## BoundingBox.x property
-
-the x coordinate of the element in pixels.
-
-<b>Signature:</b>
-
-```typescript
-x: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.y.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.y.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.y.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boundingbox.y.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoundingBox](./puppeteer.boundingbox.md) &gt; [y](./puppeteer.boundingbox.y.md)
-
-## BoundingBox.y property
-
-the y coordinate of the element in pixels.
-
-<b>Signature:</b>
-
-```typescript
-y: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.border.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.border.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.border.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.border.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [border](./puppeteer.boxmodel.border.md)
-
-## BoxModel.border property
-
-<b>Signature:</b>
-
-```typescript
-border: Array<{
-        x: number;
-        y: number;
-    }>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.content.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.content.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.content.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.content.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [content](./puppeteer.boxmodel.content.md)
-
-## BoxModel.content property
-
-<b>Signature:</b>
-
-```typescript
-content: Array<{
-        x: number;
-        y: number;
-    }>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.height.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.height.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.height.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.height.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [height](./puppeteer.boxmodel.height.md)
-
-## BoxModel.height property
-
-<b>Signature:</b>
-
-```typescript
-height: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.margin.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.margin.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.margin.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.margin.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [margin](./puppeteer.boxmodel.margin.md)
-
-## BoxModel.margin property
-
-<b>Signature:</b>
-
-```typescript
-margin: Array<{
-        x: number;
-        y: number;
-    }>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md)
-
-## BoxModel interface
-
-<b>Signature:</b>
-
-```typescript
-export interface BoxModel 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [border](./puppeteer.boxmodel.border.md) | Array&lt;{ x: number; y: number; }&gt; |  |
-|  [content](./puppeteer.boxmodel.content.md) | Array&lt;{ x: number; y: number; }&gt; |  |
-|  [height](./puppeteer.boxmodel.height.md) | number |  |
-|  [margin](./puppeteer.boxmodel.margin.md) | Array&lt;{ x: number; y: number; }&gt; |  |
-|  [padding](./puppeteer.boxmodel.padding.md) | Array&lt;{ x: number; y: number; }&gt; |  |
-|  [width](./puppeteer.boxmodel.width.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.padding.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.padding.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.padding.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.padding.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [padding](./puppeteer.boxmodel.padding.md)
-
-## BoxModel.padding property
-
-<b>Signature:</b>
-
-```typescript
-padding: Array<{
-        x: number;
-        y: number;
-    }>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.width.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.width.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.width.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.boxmodel.width.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BoxModel](./puppeteer.boxmodel.md) &gt; [width](./puppeteer.boxmodel.width.md)
-
-## BoxModel.width property
-
-<b>Signature:</b>
-
-```typescript
-width: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.browsercontexts.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.browsercontexts.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.browsercontexts.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.browsercontexts.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [browserContexts](./puppeteer.browser.browsercontexts.md)
-
-## Browser.browserContexts() method
-
-Returns an array of all open browser contexts. In a newly created browser, this will return a single instance of [BrowserContext](./puppeteer.browsercontext.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-browserContexts(): BrowserContext[];
-```
-<b>Returns:</b>
-
-[BrowserContext](./puppeteer.browsercontext.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.close.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.close.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.close.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.close.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [close](./puppeteer.browser.close.md)
-
-## Browser.close() method
-
-Closes Chromium and all of its pages (if any were opened). The [Browser](./puppeteer.browser.md) object itself is considered to be disposed and cannot be used anymore.
-
-<b>Signature:</b>
-
-```typescript
-close(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.browser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.browser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.browser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.browser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [browser](./puppeteer.browsercontext.browser.md)
-
-## BrowserContext.browser() method
-
-The browser this browser context belongs to.
-
-<b>Signature:</b>
-
-```typescript
-browser(): Browser;
-```
-<b>Returns:</b>
-
-[Browser](./puppeteer.browser.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.clearpermissionoverrides.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.clearpermissionoverrides.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.clearpermissionoverrides.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.clearpermissionoverrides.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [clearPermissionOverrides](./puppeteer.browsercontext.clearpermissionoverrides.md)
-
-## BrowserContext.clearPermissionOverrides() method
-
-Clears all permission overrides for the browser context.
-
-<b>Signature:</b>
-
-```typescript
-clearPermissionOverrides(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Example
-
-
-```js
-const context = browser.defaultBrowserContext();
-context.overridePermissions('https://example.com', ['clipboard-read']);
-// do stuff ..
-context.clearPermissionOverrides();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.close.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.close.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.close.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.close.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [close](./puppeteer.browsercontext.close.md)
-
-## BrowserContext.close() method
-
-Closes the browser context. All the targets that belong to the browser context will be closed.
-
-<b>Signature:</b>
-
-```typescript
-close(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-Only incognito browser contexts can be closed.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.isincognito.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.isincognito.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.isincognito.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.isincognito.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [isIncognito](./puppeteer.browsercontext.isincognito.md)
-
-## BrowserContext.isIncognito() method
-
-Returns whether BrowserContext is incognito. The default browser context is the only non-incognito browser context.
-
-<b>Signature:</b>
-
-```typescript
-isIncognito(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
-## Remarks
-
-The default browser context cannot be closed.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md)
-
-## BrowserContext class
-
-BrowserContexts provide a way to operate multiple independent browser sessions. When a browser is launched, it has a single BrowserContext used by default. The method [Browser.newPage](./puppeteer.browser.newpage.md) creates a page in the default browser context.
-
-<b>Signature:</b>
-
-```typescript
-export declare class BrowserContext extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Remarks
-
-If a page opens another page, e.g. with a `window.open` call, the popup will belong to the parent page's browser context.
-
-Puppeteer allows creation of "incognito" browser contexts with [Browser.createIncognitoBrowserContext](./puppeteer.browser.createincognitobrowsercontext.md) method. "Incognito" browser contexts don't write any browsing data to disk.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `BrowserContext` class.
-
-## Example
-
-
-```js
-// Create a new incognito browser context
-const context = await browser.createIncognitoBrowserContext();
-// Create a new page inside context.
-const page = await context.newPage();
-// ... do stuff with page ...
-await page.goto('https://example.com');
-// Dispose context once it's no longer needed.
-await context.close();
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [browser()](./puppeteer.browsercontext.browser.md) |  | The browser this browser context belongs to. |
-|  [clearPermissionOverrides()](./puppeteer.browsercontext.clearpermissionoverrides.md) |  | Clears all permission overrides for the browser context. |
-|  [close()](./puppeteer.browsercontext.close.md) |  | Closes the browser context. All the targets that belong to the browser context will be closed. |
-|  [isIncognito()](./puppeteer.browsercontext.isincognito.md) |  | Returns whether BrowserContext is incognito. The default browser context is the only non-incognito browser context. |
-|  [newPage()](./puppeteer.browsercontext.newpage.md) |  | Creates a new page in the browser context. |
-|  [overridePermissions(origin, permissions)](./puppeteer.browsercontext.overridepermissions.md) |  |  |
-|  [pages()](./puppeteer.browsercontext.pages.md) |  | An array of all pages inside the browser context. |
-|  [targets()](./puppeteer.browsercontext.targets.md) |  | An array of all active targets inside the browser context. |
-|  [waitForTarget(predicate, options)](./puppeteer.browsercontext.waitfortarget.md) |  | This searches for a target in this specific browser context. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.newpage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.newpage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.newpage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.newpage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [newPage](./puppeteer.browsercontext.newpage.md)
-
-## BrowserContext.newPage() method
-
-Creates a new page in the browser context.
-
-<b>Signature:</b>
-
-```typescript
-newPage(): Promise<Page>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Page](./puppeteer.page.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.overridepermissions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.overridepermissions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.overridepermissions.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.overridepermissions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [overridePermissions](./puppeteer.browsercontext.overridepermissions.md)
-
-## BrowserContext.overridePermissions() method
-
-<b>Signature:</b>
-
-```typescript
-overridePermissions(origin: string, permissions: Protocol.Browser.PermissionType[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  origin | string | The origin to grant permissions to, e.g. "https://example.com". |
-|  permissions | Protocol.Browser.PermissionType\[\] | An array of permissions to grant. All permissions that are not listed here will be automatically denied. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Example
-
-
-```js
-const context = browser.defaultBrowserContext();
-await context.overridePermissions('https://html5demos.com', ['geolocation']);
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.pages.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.pages.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.pages.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.pages.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [pages](./puppeteer.browsercontext.pages.md)
-
-## BrowserContext.pages() method
-
-An array of all pages inside the browser context.
-
-<b>Signature:</b>
-
-```typescript
-pages(): Promise<Page[]>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Page](./puppeteer.page.md)<!-- -->\[\]&gt;
-
-Promise which resolves to an array of all open pages. Non visible pages, such as `"background_page"`<!-- -->, will not be listed here. You can find them using [the target page](./puppeteer.target.page.md)<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.targets.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.targets.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.targets.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.targets.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [targets](./puppeteer.browsercontext.targets.md)
-
-## BrowserContext.targets() method
-
-An array of all active targets inside the browser context.
-
-<b>Signature:</b>
-
-```typescript
-targets(): Target[];
-```
-<b>Returns:</b>
-
-[Target](./puppeteer.target.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.waitfortarget.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.waitfortarget.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.waitfortarget.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browsercontext.waitfortarget.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserContext](./puppeteer.browsercontext.md) &gt; [waitForTarget](./puppeteer.browsercontext.waitfortarget.md)
-
-## BrowserContext.waitForTarget() method
-
-This searches for a target in this specific browser context.
-
-<b>Signature:</b>
-
-```typescript
-waitForTarget(predicate: (x: Target) => boolean, options?: {
-        timeout?: number;
-    }): Promise<Target>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  predicate | (x: [Target](./puppeteer.target.md)<!-- -->) =&gt; boolean | A function to be run for every target |
-|  options | { timeout?: number; } | An object of options. Accepts a timout, which is the maximum wait time in milliseconds. Pass <code>0</code> to disable the timeout. Defaults to 30 seconds. |
-
-<b>Returns:</b>
-
-Promise&lt;[Target](./puppeteer.target.md)<!-- -->&gt;
-
-Promise which resolves to the first target found that matches the `predicate` function.
-
-## Example
-
-An example of finding a target for a page opened via `window.open`<!-- -->:
-
-```js
-await page.evaluate(() => window.open('https://www.example.com/'));
-const newWindowTarget = await browserContext.waitForTarget(target => target.url() === 'https://www.example.com/');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.createincognitobrowsercontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.createincognitobrowsercontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.createincognitobrowsercontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.createincognitobrowsercontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [createIncognitoBrowserContext](./puppeteer.browser.createincognitobrowsercontext.md)
-
-## Browser.createIncognitoBrowserContext() method
-
-Creates a new incognito browser context. This won't share cookies/cache with other browser contexts.
-
-<b>Signature:</b>
-
-```typescript
-createIncognitoBrowserContext(): Promise<BrowserContext>;
-```
-<b>Returns:</b>
-
-Promise&lt;[BrowserContext](./puppeteer.browsercontext.md)<!-- -->&gt;
-
-## Example
-
-
-```js
-(async () => {
- const browser = await puppeteer.launch();
-  // Create a new incognito browser context.
-  const context = await browser.createIncognitoBrowserContext();
-  // Create a new page in a pristine context.
-  const page = await context.newPage();
-  // Do stuff
-  await page.goto('https://example.com');
-})();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.defaultbrowsercontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.defaultbrowsercontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.defaultbrowsercontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.defaultbrowsercontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [defaultBrowserContext](./puppeteer.browser.defaultbrowsercontext.md)
-
-## Browser.defaultBrowserContext() method
-
-Returns the default browser context. The default browser context cannot be closed.
-
-<b>Signature:</b>
-
-```typescript
-defaultBrowserContext(): BrowserContext;
-```
-<b>Returns:</b>
-
-[BrowserContext](./puppeteer.browsercontext.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.disconnect.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.disconnect.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.disconnect.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.disconnect.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [disconnect](./puppeteer.browser.disconnect.md)
-
-## Browser.disconnect() method
-
-Disconnects Puppeteer from the browser, but leaves the Chromium process running. After calling `disconnect`<!-- -->, the [Browser](./puppeteer.browser.md) object is considered disposed and cannot be used anymore.
-
-<b>Signature:</b>
-
-```typescript
-disconnect(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.candownload.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.candownload.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.candownload.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.candownload.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [canDownload](./puppeteer.browserfetcher.candownload.md)
-
-## BrowserFetcher.canDownload() method
-
-Initiates a HEAD request to check if the revision is available.
-
-<b>Signature:</b>
-
-```typescript
-canDownload(revision: string): Promise<boolean>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  revision | string | The revision to check availability for. |
-
-<b>Returns:</b>
-
-Promise&lt;boolean&gt;
-
-A promise that resolves to `true` if the revision could be downloaded from the host.
-
-## Remarks
-
-This method is affected by the current `product`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.download.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.download.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.download.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.download.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [download](./puppeteer.browserfetcher.download.md)
-
-## BrowserFetcher.download() method
-
-Initiates a GET request to download the revision from the host.
-
-<b>Signature:</b>
-
-```typescript
-download(revision: string, progressCallback?: (x: number, y: number) => void): Promise<BrowserFetcherRevisionInfo>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  revision | string | The revision to download. |
-|  progressCallback | (x: number, y: number) =&gt; void | A function that will be called with two arguments: How many bytes have been downloaded and the total number of bytes of the download. |
-
-<b>Returns:</b>
-
-Promise&lt;[BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md)<!-- -->&gt;
-
-A promise with revision information when the revision is downloaded and extracted.
-
-## Remarks
-
-This method is affected by the current `product`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.host.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.host.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.host.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.host.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [host](./puppeteer.browserfetcher.host.md)
-
-## BrowserFetcher.host() method
-
-<b>Signature:</b>
-
-```typescript
-host(): string;
-```
-<b>Returns:</b>
-
-string
-
-The download host being used.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.localrevisions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.localrevisions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.localrevisions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.localrevisions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [localRevisions](./puppeteer.browserfetcher.localrevisions.md)
-
-## BrowserFetcher.localRevisions() method
-
-<b>Signature:</b>
-
-```typescript
-localRevisions(): Promise<string[]>;
-```
-<b>Returns:</b>
-
-Promise&lt;string\[\]&gt;
-
-A promise with a list of all revision strings (for the current `product`<!-- -->) available locally on disk.
-
-## Remarks
-
-This method is affected by the current `product`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md)
-
-## BrowserFetcher class
-
-BrowserFetcher can download and manage different versions of Chromium and Firefox.
-
-<b>Signature:</b>
-
-```typescript
-export declare class BrowserFetcher 
-```
-
-## Remarks
-
-BrowserFetcher operates on revision strings that specify a precise version of Chromium, e.g. `"533271"`<!-- -->. Revision strings can be obtained from [omahaproxy.appspot.com](http://omahaproxy.appspot.com/)<!-- -->. In the Firefox case, BrowserFetcher downloads Firefox Nightly and operates on version numbers such as `"75"`<!-- -->.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `BrowserFetcher` class.
-
-## Example
-
-An example of using BrowserFetcher to download a specific version of Chromium and running Puppeteer against it:
-
-```js
-const browserFetcher = puppeteer.createBrowserFetcher();
-const revisionInfo = await browserFetcher.download('533271');
-const browser = await puppeteer.launch({executablePath: revisionInfo.executablePath})
-
-```
-\*\*NOTE\*\* BrowserFetcher is not designed to work concurrently with other instances of BrowserFetcher that share the same downloads directory.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [canDownload(revision)](./puppeteer.browserfetcher.candownload.md) |  | Initiates a HEAD request to check if the revision is available. |
-|  [download(revision, progressCallback)](./puppeteer.browserfetcher.download.md) |  | Initiates a GET request to download the revision from the host. |
-|  [host()](./puppeteer.browserfetcher.host.md) |  |  |
-|  [localRevisions()](./puppeteer.browserfetcher.localrevisions.md) |  |  |
-|  [platform()](./puppeteer.browserfetcher.platform.md) |  |  |
-|  [product()](./puppeteer.browserfetcher.product.md) |  |  |
-|  [remove(revision)](./puppeteer.browserfetcher.remove.md) |  |  |
-|  [revisionInfo(revision)](./puppeteer.browserfetcher.revisioninfo.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.host.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.host.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.host.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.host.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) &gt; [host](./puppeteer.browserfetcheroptions.host.md)
-
-## BrowserFetcherOptions.host property
-
-<b>Signature:</b>
-
-```typescript
-host?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md)
-
-## BrowserFetcherOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface BrowserFetcherOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [host](./puppeteer.browserfetcheroptions.host.md) | string |  |
-|  [path](./puppeteer.browserfetcheroptions.path.md) | string |  |
-|  [platform](./puppeteer.browserfetcheroptions.platform.md) | [Platform](./puppeteer.platform.md) |  |
-|  [product](./puppeteer.browserfetcheroptions.product.md) | string |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.path.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.path.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.path.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.path.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) &gt; [path](./puppeteer.browserfetcheroptions.path.md)
-
-## BrowserFetcherOptions.path property
-
-<b>Signature:</b>
-
-```typescript
-path?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.platform.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.platform.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.platform.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.platform.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) &gt; [platform](./puppeteer.browserfetcheroptions.platform.md)
-
-## BrowserFetcherOptions.platform property
-
-<b>Signature:</b>
-
-```typescript
-platform?: Platform;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.product.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcheroptions.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) &gt; [product](./puppeteer.browserfetcheroptions.product.md)
-
-## BrowserFetcherOptions.product property
-
-<b>Signature:</b>
-
-```typescript
-product?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.platform.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.platform.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.platform.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.platform.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [platform](./puppeteer.browserfetcher.platform.md)
-
-## BrowserFetcher.platform() method
-
-<b>Signature:</b>
-
-```typescript
-platform(): Platform;
-```
-<b>Returns:</b>
-
-[Platform](./puppeteer.platform.md)
-
-Returns the current `Platform`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.product.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [product](./puppeteer.browserfetcher.product.md)
-
-## BrowserFetcher.product() method
-
-<b>Signature:</b>
-
-```typescript
-product(): Product;
-```
-<b>Returns:</b>
-
-[Product](./puppeteer.product.md)
-
-Returns the current `Product`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.remove.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.remove.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.remove.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.remove.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [remove](./puppeteer.browserfetcher.remove.md)
-
-## BrowserFetcher.remove() method
-
-<b>Signature:</b>
-
-```typescript
-remove(revision: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  revision | string | A revision to remove for the current <code>product</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-A promise that resolves when the revision has been removes or throws if the revision has not been downloaded.
-
-## Remarks
-
-This method is affected by the current `product`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.executablepath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.executablepath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.executablepath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.executablepath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [executablePath](./puppeteer.browserfetcherrevisioninfo.executablepath.md)
-
-## BrowserFetcherRevisionInfo.executablePath property
-
-<b>Signature:</b>
-
-```typescript
-executablePath: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.folderpath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.folderpath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.folderpath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.folderpath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [folderPath](./puppeteer.browserfetcherrevisioninfo.folderpath.md)
-
-## BrowserFetcherRevisionInfo.folderPath property
-
-<b>Signature:</b>
-
-```typescript
-folderPath: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.local.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.local.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.local.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.local.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [local](./puppeteer.browserfetcherrevisioninfo.local.md)
-
-## BrowserFetcherRevisionInfo.local property
-
-<b>Signature:</b>
-
-```typescript
-local: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.revisioninfo.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.revisioninfo.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.revisioninfo.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcher.revisioninfo.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcher](./puppeteer.browserfetcher.md) &gt; [revisionInfo](./puppeteer.browserfetcher.revisioninfo.md)
-
-## BrowserFetcher.revisionInfo() method
-
-<b>Signature:</b>
-
-```typescript
-revisionInfo(revision: string): BrowserFetcherRevisionInfo;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  revision | string | The revision to get info for. |
-
-<b>Returns:</b>
-
-[BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md)
-
-The revision info for the given revision.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md)
-
-## BrowserFetcherRevisionInfo interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface BrowserFetcherRevisionInfo 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [executablePath](./puppeteer.browserfetcherrevisioninfo.executablepath.md) | string |  |
-|  [folderPath](./puppeteer.browserfetcherrevisioninfo.folderpath.md) | string |  |
-|  [local](./puppeteer.browserfetcherrevisioninfo.local.md) | boolean |  |
-|  [product](./puppeteer.browserfetcherrevisioninfo.product.md) | string |  |
-|  [revision](./puppeteer.browserfetcherrevisioninfo.revision.md) | string |  |
-|  [url](./puppeteer.browserfetcherrevisioninfo.url.md) | string |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.product.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [product](./puppeteer.browserfetcherrevisioninfo.product.md)
-
-## BrowserFetcherRevisionInfo.product property
-
-<b>Signature:</b>
-
-```typescript
-product: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.revision.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.revision.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.revision.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.revision.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [revision](./puppeteer.browserfetcherrevisioninfo.revision.md)
-
-## BrowserFetcherRevisionInfo.revision property
-
-<b>Signature:</b>
-
-```typescript
-revision: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.url.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browserfetcherrevisioninfo.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) &gt; [url](./puppeteer.browserfetcherrevisioninfo.url.md)
-
-## BrowserFetcherRevisionInfo.url property
-
-<b>Signature:</b>
-
-```typescript
-url: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.isconnected.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.isconnected.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.isconnected.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.isconnected.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [isConnected](./puppeteer.browser.isconnected.md)
-
-## Browser.isConnected() method
-
-Indicates that the browser is connected.
-
-<b>Signature:</b>
-
-```typescript
-isConnected(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md)
-
-## Browser class
-
-A Browser is created when Puppeteer connects to a Chromium instance, either through [Puppeteer.launch()](./puppeteer.puppeteer.launch.md) or [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Browser extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Browser` class.
-
-## Example 1
-
-An example of using a [Browser](./puppeteer.browser.md) to create a [Page](./puppeteer.page.md)<!-- -->:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://example.com');
-  await browser.close();
-})();
-
-```
-
-## Example 2
-
-An example of disconnecting from and reconnecting to a [Browser](./puppeteer.browser.md)<!-- -->:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  // Store the endpoint to be able to reconnect to Chromium
-  const browserWSEndpoint = browser.wsEndpoint();
-  // Disconnect puppeteer from Chromium
-  browser.disconnect();
-
-  // Use the endpoint to reestablish a connection
-  const browser2 = await puppeteer.connect({browserWSEndpoint});
-  // Close Chromium
-  await browser2.close();
-})();
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [browserContexts()](./puppeteer.browser.browsercontexts.md) |  | Returns an array of all open browser contexts. In a newly created browser, this will return a single instance of [BrowserContext](./puppeteer.browsercontext.md)<!-- -->. |
-|  [close()](./puppeteer.browser.close.md) |  | Closes Chromium and all of its pages (if any were opened). The [Browser](./puppeteer.browser.md) object itself is considered to be disposed and cannot be used anymore. |
-|  [createIncognitoBrowserContext()](./puppeteer.browser.createincognitobrowsercontext.md) |  | Creates a new incognito browser context. This won't share cookies/cache with other browser contexts. |
-|  [defaultBrowserContext()](./puppeteer.browser.defaultbrowsercontext.md) |  | Returns the default browser context. The default browser context cannot be closed. |
-|  [disconnect()](./puppeteer.browser.disconnect.md) |  | Disconnects Puppeteer from the browser, but leaves the Chromium process running. After calling <code>disconnect</code>, the [Browser](./puppeteer.browser.md) object is considered disposed and cannot be used anymore. |
-|  [isConnected()](./puppeteer.browser.isconnected.md) |  | Indicates that the browser is connected. |
-|  [newPage()](./puppeteer.browser.newpage.md) |  | Creates a [Page](./puppeteer.page.md) in the default browser context. |
-|  [pages()](./puppeteer.browser.pages.md) |  | An array of all open pages inside the Browser. |
-|  [process()](./puppeteer.browser.process.md) |  | The spawned browser process. Returns <code>null</code> if the browser instance was created with [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->. |
-|  [target()](./puppeteer.browser.target.md) |  | The target associated with the browser. |
-|  [targets()](./puppeteer.browser.targets.md) |  | All active targets inside the Browser. In case of multiple browser contexts, returns an array with all the targets in all browser contexts. |
-|  [userAgent()](./puppeteer.browser.useragent.md) |  | The browser's original user agent. Pages can override the browser user agent with [Page.setUserAgent()](./puppeteer.page.setuseragent.md)<!-- -->. |
-|  [version()](./puppeteer.browser.version.md) |  | A string representing the browser name and version. |
-|  [waitForTarget(predicate, options)](./puppeteer.browser.waitfortarget.md) |  | Searches for a target in all browser contexts. |
-|  [wsEndpoint()](./puppeteer.browser.wsendpoint.md) |  | The browser websocket endpoint which can be used as an argument to [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.newpage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.newpage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.newpage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.newpage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [newPage](./puppeteer.browser.newpage.md)
-
-## Browser.newPage() method
-
-Creates a [Page](./puppeteer.page.md) in the default browser context.
-
-<b>Signature:</b>
-
-```typescript
-newPage(): Promise<Page>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Page](./puppeteer.page.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.defaultviewport.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.defaultviewport.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.defaultviewport.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.defaultviewport.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserOptions](./puppeteer.browseroptions.md) &gt; [defaultViewport](./puppeteer.browseroptions.defaultviewport.md)
-
-## BrowserOptions.defaultViewport property
-
-<b>Signature:</b>
-
-```typescript
-defaultViewport?: Viewport;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.ignorehttpserrors.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.ignorehttpserrors.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.ignorehttpserrors.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.ignorehttpserrors.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserOptions](./puppeteer.browseroptions.md) &gt; [ignoreHTTPSErrors](./puppeteer.browseroptions.ignorehttpserrors.md)
-
-## BrowserOptions.ignoreHTTPSErrors property
-
-<b>Signature:</b>
-
-```typescript
-ignoreHTTPSErrors?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserOptions](./puppeteer.browseroptions.md)
-
-## BrowserOptions interface
-
-Generic browser options that can be passed when launching any browser.
-
-<b>Signature:</b>
-
-```typescript
-export interface BrowserOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [defaultViewport](./puppeteer.browseroptions.defaultviewport.md) | Viewport |  |
-|  [ignoreHTTPSErrors](./puppeteer.browseroptions.ignorehttpserrors.md) | boolean |  |
-|  [slowMo](./puppeteer.browseroptions.slowmo.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.slowmo.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.slowmo.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.slowmo.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browseroptions.slowmo.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [BrowserOptions](./puppeteer.browseroptions.md) &gt; [slowMo](./puppeteer.browseroptions.slowmo.md)
-
-## BrowserOptions.slowMo property
-
-<b>Signature:</b>
-
-```typescript
-slowMo?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.pages.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.pages.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.pages.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.pages.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [pages](./puppeteer.browser.pages.md)
-
-## Browser.pages() method
-
-An array of all open pages inside the Browser.
-
-<b>Signature:</b>
-
-```typescript
-pages(): Promise<Page[]>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Page](./puppeteer.page.md)<!-- -->\[\]&gt;
-
-## Remarks
-
-In case of multiple browser contexts, returns an array with all the pages in all browser contexts. Non-visible pages, such as `"background_page"`<!-- -->, will not be listed here. You can find them using [Target.page()](./puppeteer.target.page.md)<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.process.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.process.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.process.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.process.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [process](./puppeteer.browser.process.md)
-
-## Browser.process() method
-
-The spawned browser process. Returns `null` if the browser instance was created with [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-process(): ChildProcess | null;
-```
-<b>Returns:</b>
-
-ChildProcess \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.target.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.target.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.target.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.target.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [target](./puppeteer.browser.target.md)
-
-## Browser.target() method
-
-The target associated with the browser.
-
-<b>Signature:</b>
-
-```typescript
-target(): Target;
-```
-<b>Returns:</b>
-
-[Target](./puppeteer.target.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.targets.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.targets.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.targets.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.targets.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [targets](./puppeteer.browser.targets.md)
-
-## Browser.targets() method
-
-All active targets inside the Browser. In case of multiple browser contexts, returns an array with all the targets in all browser contexts.
-
-<b>Signature:</b>
-
-```typescript
-targets(): Target[];
-```
-<b>Returns:</b>
-
-[Target](./puppeteer.target.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.useragent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.useragent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.useragent.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.useragent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [userAgent](./puppeteer.browser.useragent.md)
-
-## Browser.userAgent() method
-
-The browser's original user agent. Pages can override the browser user agent with [Page.setUserAgent()](./puppeteer.page.setuseragent.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-userAgent(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.version.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.version.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.version.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.version.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [version](./puppeteer.browser.version.md)
-
-## Browser.version() method
-
-A string representing the browser name and version.
-
-<b>Signature:</b>
-
-```typescript
-version(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
-## Remarks
-
-For headless Chromium, this is similar to `HeadlessChrome/61.0.3153.0`<!-- -->. For non-headless, this is similar to `Chrome/61.0.3153.0`<!-- -->.
-
-The format of browser.version() might change with future releases of Chromium.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.waitfortarget.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.waitfortarget.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.waitfortarget.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.waitfortarget.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [waitForTarget](./puppeteer.browser.waitfortarget.md)
-
-## Browser.waitForTarget() method
-
-Searches for a target in all browser contexts.
-
-<b>Signature:</b>
-
-```typescript
-waitForTarget(predicate: (x: Target) => boolean, options?: WaitForTargetOptions): Promise<Target>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  predicate | (x: [Target](./puppeteer.target.md)<!-- -->) =&gt; boolean | A function to be run for every target. |
-|  options | [WaitForTargetOptions](./puppeteer.waitfortargetoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[Target](./puppeteer.target.md)<!-- -->&gt;
-
-The first target found that matches the `predicate` function.
-
-## Example
-
-An example of finding a target for a page opened via `window.open`<!-- -->:
-
-```js
-await page.evaluate(() => window.open('https://www.example.com/'));
-const newWindowTarget = await browser.waitForTarget(target => target.url() === 'https://www.example.com/');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.wsendpoint.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.wsendpoint.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.browser.wsendpoint.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.browser.wsendpoint.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Browser](./puppeteer.browser.md) &gt; [wsEndpoint](./puppeteer.browser.wsendpoint.md)
-
-## Browser.wsEndpoint() method
-
-The browser websocket endpoint which can be used as an argument to [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-wsEndpoint(): string;
-```
-<b>Returns:</b>
-
-string
-
-The Browser websocket url.
-
-## Remarks
-
-The format is `ws://${host}:${port}/devtools/browser/<id>`<!-- -->.
-
-You can find the `webSocketDebuggerUrl` from `http://${host}:${port}/json/version`<!-- -->. Learn more about the [devtools protocol](https://chromedevtools.github.io/devtools-protocol) and the [browser endpoint](https://chromedevtools.github.io/devtools-protocol/#how-do-i-access-the-browser-target)<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.detach.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.detach.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.detach.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.detach.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CDPSession](./puppeteer.cdpsession.md) &gt; [detach](./puppeteer.cdpsession.detach.md)
-
-## CDPSession.detach() method
-
-Detaches the cdpSession from the target. Once detached, the cdpSession object won't emit any events and can't be used to send messages.
-
-<b>Signature:</b>
-
-```typescript
-detach(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CDPSession](./puppeteer.cdpsession.md)
-
-## CDPSession class
-
-The `CDPSession` instances are used to talk raw Chrome Devtools Protocol.
-
-<b>Signature:</b>
-
-```typescript
-export declare class CDPSession extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Remarks
-
-Protocol methods can be called with [CDPSession.send()](./puppeteer.cdpsession.send.md) method and protocol events can be subscribed to with `CDPSession.on` method.
-
-Useful links: [DevTools Protocol Viewer](https://chromedevtools.github.io/devtools-protocol/) and [Getting Started with DevTools Protocol](https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md)<!-- -->.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `CDPSession` class.
-
-## Example
-
-
-```js
-const client = await page.target().createCDPSession();
-await client.send('Animation.enable');
-client.on('Animation.animationCreated', () => console.log('Animation created!'));
-const response = await client.send('Animation.getPlaybackRate');
-console.log('playback rate is ' + response.playbackRate);
-await client.send('Animation.setPlaybackRate', {
-  playbackRate: response.playbackRate / 2
-});
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [detach()](./puppeteer.cdpsession.detach.md) |  | Detaches the cdpSession from the target. Once detached, the cdpSession object won't emit any events and can't be used to send messages. |
-|  [send(method, params)](./puppeteer.cdpsession.send.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.send.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.send.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.send.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.cdpsession.send.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CDPSession](./puppeteer.cdpsession.md) &gt; [send](./puppeteer.cdpsession.send.md)
-
-## CDPSession.send() method
-
-<b>Signature:</b>
-
-```typescript
-send<T extends keyof Protocol.CommandParameters>(method: T, params?: Protocol.CommandParameters[T]): Promise<Protocol.CommandReturnValues[T]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  method | T |  |
-|  params | Protocol.CommandParameters\[T\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;Protocol.CommandReturnValues\[T\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.args.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.args.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.args.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.args.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ChromeArgOptions](./puppeteer.chromeargoptions.md) &gt; [args](./puppeteer.chromeargoptions.args.md)
-
-## ChromeArgOptions.args property
-
-<b>Signature:</b>
-
-```typescript
-args?: string[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.devtools.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.devtools.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.devtools.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.devtools.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ChromeArgOptions](./puppeteer.chromeargoptions.md) &gt; [devtools](./puppeteer.chromeargoptions.devtools.md)
-
-## ChromeArgOptions.devtools property
-
-<b>Signature:</b>
-
-```typescript
-devtools?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.headless.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.headless.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.headless.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.headless.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ChromeArgOptions](./puppeteer.chromeargoptions.md) &gt; [headless](./puppeteer.chromeargoptions.headless.md)
-
-## ChromeArgOptions.headless property
-
-<b>Signature:</b>
-
-```typescript
-headless?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ChromeArgOptions](./puppeteer.chromeargoptions.md)
-
-## ChromeArgOptions interface
-
-Launcher options that only apply to Chrome.
-
-<b>Signature:</b>
-
-```typescript
-export interface ChromeArgOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [args](./puppeteer.chromeargoptions.args.md) | string\[\] |  |
-|  [devtools](./puppeteer.chromeargoptions.devtools.md) | boolean |  |
-|  [headless](./puppeteer.chromeargoptions.headless.md) | boolean |  |
-|  [userDataDir](./puppeteer.chromeargoptions.userdatadir.md) | string |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.userdatadir.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.userdatadir.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.userdatadir.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.chromeargoptions.userdatadir.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ChromeArgOptions](./puppeteer.chromeargoptions.md) &gt; [userDataDir](./puppeteer.chromeargoptions.userdatadir.md)
-
-## ChromeArgOptions.userDataDir property
-
-<b>Signature:</b>
-
-```typescript
-userDataDir?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.button.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.button.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.button.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.button.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ClickOptions](./puppeteer.clickoptions.md) &gt; [button](./puppeteer.clickoptions.button.md)
-
-## ClickOptions.button property
-
-<b>Signature:</b>
-
-```typescript
-button?: 'left' | 'right' | 'middle';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.clickcount.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.clickcount.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.clickcount.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.clickcount.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ClickOptions](./puppeteer.clickoptions.md) &gt; [clickCount](./puppeteer.clickoptions.clickcount.md)
-
-## ClickOptions.clickCount property
-
-<b>Signature:</b>
-
-```typescript
-clickCount?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.delay.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.delay.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.delay.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.delay.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ClickOptions](./puppeteer.clickoptions.md) &gt; [delay](./puppeteer.clickoptions.delay.md)
-
-## ClickOptions.delay property
-
-Time to wait between `mousedown` and `mouseup` in milliseconds.
-
-<b>Signature:</b>
-
-```typescript
-delay?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.clickoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ClickOptions](./puppeteer.clickoptions.md)
-
-## ClickOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface ClickOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [button](./puppeteer.clickoptions.button.md) | 'left' \| 'right' \| 'middle' |  |
-|  [clickCount](./puppeteer.clickoptions.clickcount.md) | number |  |
-|  [delay](./puppeteer.clickoptions.delay.md) | number | Time to wait between <code>mousedown</code> and <code>mouseup</code> in milliseconds. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._callbacks.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._callbacks.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._callbacks.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._callbacks.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_callbacks](./puppeteer.connection._callbacks.md)
-
-## Connection.\_callbacks property
-
-<b>Signature:</b>
-
-```typescript
-_callbacks: Map<number, ConnectionCallback>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._closed.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._closed.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._closed.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._closed.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_closed](./puppeteer.connection._closed.md)
-
-## Connection.\_closed property
-
-<b>Signature:</b>
-
-```typescript
-_closed: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [(constructor)](./puppeteer.connection._constructor_.md)
-
-## Connection.(constructor)
-
-Constructs a new instance of the `Connection` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(url: string, transport: ConnectionTransport, delay?: number);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  url | string |  |
-|  transport | ConnectionTransport |  |
-|  delay | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.createsession.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.createsession.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.createsession.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.createsession.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [createSession](./puppeteer.connection.createsession.md)
-
-## Connection.createSession() method
-
-<b>Signature:</b>
-
-```typescript
-createSession(targetInfo: Protocol.Target.TargetInfo): Promise<CDPSession>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  targetInfo | Protocol.Target.TargetInfo |  |
-
-<b>Returns:</b>
-
-Promise&lt;[CDPSession](./puppeteer.cdpsession.md)<!-- -->&gt;
-
-{<!-- -->!Promise<!-- -->&lt;<!-- -->!CDPSession<!-- -->&gt;<!-- -->}
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._delay.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._delay.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._delay.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._delay.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_delay](./puppeteer.connection._delay.md)
-
-## Connection.\_delay property
-
-<b>Signature:</b>
-
-```typescript
-_delay: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.dispose.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.dispose.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.dispose.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.dispose.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [dispose](./puppeteer.connection.dispose.md)
-
-## Connection.dispose() method
-
-<b>Signature:</b>
-
-```typescript
-dispose(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.fromsession.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.fromsession.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.fromsession.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.fromsession.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [fromSession](./puppeteer.connection.fromsession.md)
-
-## Connection.fromSession() method
-
-<b>Signature:</b>
-
-```typescript
-static fromSession(session: CDPSession): Connection;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  session | [CDPSession](./puppeteer.cdpsession.md) |  |
-
-<b>Returns:</b>
-
-[Connection](./puppeteer.connection.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._lastid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._lastid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._lastid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._lastid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_lastId](./puppeteer.connection._lastid.md)
-
-## Connection.\_lastId property
-
-<b>Signature:</b>
-
-```typescript
-_lastId: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md)
-
-## Connection class
-
-<b>Signature:</b>
-
-```typescript
-export declare class Connection extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(url, transport, delay)](./puppeteer.connection._constructor_.md) |  | Constructs a new instance of the <code>Connection</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_callbacks](./puppeteer.connection._callbacks.md) |  | Map&lt;number, ConnectionCallback&gt; |  |
-|  [\_closed](./puppeteer.connection._closed.md) |  | boolean |  |
-|  [\_delay](./puppeteer.connection._delay.md) |  | number |  |
-|  [\_lastId](./puppeteer.connection._lastid.md) |  | number |  |
-|  [\_sessions](./puppeteer.connection._sessions.md) |  | Map&lt;string, [CDPSession](./puppeteer.cdpsession.md)<!-- -->&gt; |  |
-|  [\_transport](./puppeteer.connection._transport.md) |  | ConnectionTransport |  |
-|  [\_url](./puppeteer.connection._url.md) |  | string |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [\_onClose()](./puppeteer.connection._onclose.md) |  |  |
-|  [\_onMessage(message)](./puppeteer.connection._onmessage.md) |  |  |
-|  [\_rawSend(message)](./puppeteer.connection._rawsend.md) |  |  |
-|  [createSession(targetInfo)](./puppeteer.connection.createsession.md) |  |  |
-|  [dispose()](./puppeteer.connection.dispose.md) |  |  |
-|  [fromSession(session)](./puppeteer.connection.fromsession.md) | <code>static</code> |  |
-|  [send(method, params)](./puppeteer.connection.send.md) |  |  |
-|  [session(sessionId)](./puppeteer.connection.session.md) |  |  |
-|  [url()](./puppeteer.connection.url.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onclose.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onclose.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onclose.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onclose.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_onClose](./puppeteer.connection._onclose.md)
-
-## Connection.\_onClose() method
-
-<b>Signature:</b>
-
-```typescript
-_onClose(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onmessage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onmessage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onmessage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._onmessage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_onMessage](./puppeteer.connection._onmessage.md)
-
-## Connection.\_onMessage() method
-
-<b>Signature:</b>
-
-```typescript
-_onMessage(message: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  message | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._rawsend.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._rawsend.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._rawsend.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._rawsend.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_rawSend](./puppeteer.connection._rawsend.md)
-
-## Connection.\_rawSend() method
-
-<b>Signature:</b>
-
-```typescript
-_rawSend(message: {}): number;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  message | {} |  |
-
-<b>Returns:</b>
-
-number
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.send.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.send.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.send.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.send.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [send](./puppeteer.connection.send.md)
-
-## Connection.send() method
-
-<b>Signature:</b>
-
-```typescript
-send<T extends keyof Protocol.CommandParameters>(method: T, params?: Protocol.CommandParameters[T]): Promise<Protocol.CommandReturnValues[T]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  method | T |  |
-|  params | Protocol.CommandParameters\[T\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;Protocol.CommandReturnValues\[T\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.session.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.session.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.session.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.session.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [session](./puppeteer.connection.session.md)
-
-## Connection.session() method
-
-<b>Signature:</b>
-
-```typescript
-session(sessionId: string): CDPSession | null;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  sessionId | string |  |
-
-<b>Returns:</b>
-
-[CDPSession](./puppeteer.cdpsession.md) \| null
-
-{<!-- -->?CDPSession<!-- -->}
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._sessions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._sessions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._sessions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._sessions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_sessions](./puppeteer.connection._sessions.md)
-
-## Connection.\_sessions property
-
-<b>Signature:</b>
-
-```typescript
-_sessions: Map<string, CDPSession>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._transport.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._transport.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._transport.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._transport.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_transport](./puppeteer.connection._transport.md)
-
-## Connection.\_transport property
-
-<b>Signature:</b>
-
-```typescript
-_transport: ConnectionTransport;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection._url.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection._url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [\_url](./puppeteer.connection._url.md)
-
-## Connection.\_url property
-
-<b>Signature:</b>
-
-```typescript
-_url: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.connection.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.connection.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Connection](./puppeteer.connection.md) &gt; [url](./puppeteer.connection.url.md)
-
-## Connection.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.args.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.args.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.args.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.args.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md) &gt; [args](./puppeteer.consolemessage.args.md)
-
-## ConsoleMessage.args() method
-
-<b>Signature:</b>
-
-```typescript
-args(): JSHandle[];
-```
-<b>Returns:</b>
-
-[JSHandle](./puppeteer.jshandle.md)<!-- -->\[\]
-
-An array of arguments passed to the console.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md) &gt; [(constructor)](./puppeteer.consolemessage._constructor_.md)
-
-## ConsoleMessage.(constructor)
-
-Constructs a new instance of the `ConsoleMessage` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(type: ConsoleMessageType, text: string, args: JSHandle[], location?: ConsoleMessageLocation);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  type | [ConsoleMessageType](./puppeteer.consolemessagetype.md) |  |
-|  text | string |  |
-|  args | [JSHandle](./puppeteer.jshandle.md)<!-- -->\[\] |  |
-|  location | [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md) |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.columnnumber.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.columnnumber.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.columnnumber.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.columnnumber.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md) &gt; [columnNumber](./puppeteer.consolemessagelocation.columnnumber.md)
-
-## ConsoleMessageLocation.columnNumber property
-
-0-based column number in the resource if known or `undefined` otherwise.
-
-<b>Signature:</b>
-
-```typescript
-columnNumber?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.linenumber.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.linenumber.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.linenumber.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.linenumber.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md) &gt; [lineNumber](./puppeteer.consolemessagelocation.linenumber.md)
-
-## ConsoleMessageLocation.lineNumber property
-
-0-based line number in the resource if known or `undefined` otherwise.
-
-<b>Signature:</b>
-
-```typescript
-lineNumber?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.location.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.location.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.location.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.location.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md) &gt; [location](./puppeteer.consolemessage.location.md)
-
-## ConsoleMessage.location() method
-
-<b>Signature:</b>
-
-```typescript
-location(): ConsoleMessageLocation;
-```
-<b>Returns:</b>
-
-[ConsoleMessageLocation](./puppeteer.consolemessagelocation.md)
-
-The location of the console message.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md)
-
-## ConsoleMessageLocation interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface ConsoleMessageLocation 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [columnNumber](./puppeteer.consolemessagelocation.columnnumber.md) | number | 0-based column number in the resource if known or <code>undefined</code> otherwise. |
-|  [lineNumber](./puppeteer.consolemessagelocation.linenumber.md) | number | 0-based line number in the resource if known or <code>undefined</code> otherwise. |
-|  [url](./puppeteer.consolemessagelocation.url.md) | string | URL of the resource if known or <code>undefined</code> otherwise. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagelocation.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md) &gt; [url](./puppeteer.consolemessagelocation.url.md)
-
-## ConsoleMessageLocation.url property
-
-URL of the resource if known or `undefined` otherwise.
-
-<b>Signature:</b>
-
-```typescript
-url?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md)
-
-## ConsoleMessage class
-
-ConsoleMessage objects are dispatched by page via the 'console' event.
-
-<b>Signature:</b>
-
-```typescript
-export declare class ConsoleMessage 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(type, text, args, location)](./puppeteer.consolemessage._constructor_.md) |  | Constructs a new instance of the <code>ConsoleMessage</code> class |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [args()](./puppeteer.consolemessage.args.md) |  |  |
-|  [location()](./puppeteer.consolemessage.location.md) |  |  |
-|  [text()](./puppeteer.consolemessage.text.md) |  |  |
-|  [type()](./puppeteer.consolemessage.type.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.text.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.text.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.text.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.text.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md) &gt; [text](./puppeteer.consolemessage.text.md)
-
-## ConsoleMessage.text() method
-
-<b>Signature:</b>
-
-```typescript
-text(): string;
-```
-<b>Returns:</b>
-
-string
-
-The text of the console message.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessage.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessage](./puppeteer.consolemessage.md) &gt; [type](./puppeteer.consolemessage.type.md)
-
-## ConsoleMessage.type() method
-
-<b>Signature:</b>
-
-```typescript
-type(): ConsoleMessageType;
-```
-<b>Returns:</b>
-
-[ConsoleMessageType](./puppeteer.consolemessagetype.md)
-
-The type of the console message.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagetype.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagetype.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagetype.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.consolemessagetype.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ConsoleMessageType](./puppeteer.consolemessagetype.md)
-
-## ConsoleMessageType type
-
-The supported types for console messages.
-
-<b>Signature:</b>
-
-```typescript
-export declare type ConsoleMessageType = 'log' | 'debug' | 'info' | 'error' | 'warning' | 'dir' | 'dirxml' | 'table' | 'trace' | 'clear' | 'startGroup' | 'startGroupCollapsed' | 'endGroup' | 'assert' | 'profile' | 'profileEnd' | 'count' | 'timeEnd' | 'verbose';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md) &gt; [(constructor)](./puppeteer.coverage._constructor_.md)
-
-## Coverage.(constructor)
-
-Constructs a new instance of the `Coverage` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(client: CDPSession);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  client | [CDPSession](./puppeteer.cdpsession.md) |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CoverageEntry](./puppeteer.coverageentry.md)
-
-## CoverageEntry interface
-
-The CoverageEntry class represents one entry of the coverage report.
-
-<b>Signature:</b>
-
-```typescript
-export interface CoverageEntry 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [ranges](./puppeteer.coverageentry.ranges.md) | Array&lt;{ start: number; end: number; }&gt; | The covered range as start and end positions. |
-|  [text](./puppeteer.coverageentry.text.md) | string | The content of the style sheet or script. |
-|  [url](./puppeteer.coverageentry.url.md) | string | The URL of the style sheet or script. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.ranges.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.ranges.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.ranges.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.ranges.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CoverageEntry](./puppeteer.coverageentry.md) &gt; [ranges](./puppeteer.coverageentry.ranges.md)
-
-## CoverageEntry.ranges property
-
-The covered range as start and end positions.
-
-<b>Signature:</b>
-
-```typescript
-ranges: Array<{
-        start: number;
-        end: number;
-    }>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.text.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.text.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.text.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.text.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CoverageEntry](./puppeteer.coverageentry.md) &gt; [text](./puppeteer.coverageentry.text.md)
-
-## CoverageEntry.text property
-
-The content of the style sheet or script.
-
-<b>Signature:</b>
-
-```typescript
-text: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverageentry.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CoverageEntry](./puppeteer.coverageentry.md) &gt; [url](./puppeteer.coverageentry.url.md)
-
-## CoverageEntry.url property
-
-The URL of the style sheet or script.
-
-<b>Signature:</b>
-
-```typescript
-url: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md)
-
-## Coverage class
-
-The Coverage class provides methods to gathers information about parts of JavaScript and CSS that were used by the page.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Coverage 
-```
-
-## Remarks
-
-To output coverage in a form consumable by [Istanbul](https://github.com/istanbuljs)<!-- -->, see [puppeteer-to-istanbul](https://github.com/istanbuljs/puppeteer-to-istanbul)<!-- -->.
-
-## Example
-
-An example of using JavaScript and CSS coverage to get percentage of initially executed code:
-
-```js
-// Enable both JavaScript and CSS coverage
-await Promise.all([
-  page.coverage.startJSCoverage(),
-  page.coverage.startCSSCoverage()
-]);
-// Navigate to page
-await page.goto('https://example.com');
-// Disable both JavaScript and CSS coverage
-const [jsCoverage, cssCoverage] = await Promise.all([
-  page.coverage.stopJSCoverage(),
-  page.coverage.stopCSSCoverage(),
-]);
-let totalBytes = 0;
-let usedBytes = 0;
-const coverage = [...jsCoverage, ...cssCoverage];
-for (const entry of coverage) {
-  totalBytes += entry.text.length;
-  for (const range of entry.ranges)
-    usedBytes += range.end - range.start - 1;
-}
-console.log(`Bytes used: ${usedBytes / totalBytes * 100}%`);
-
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(client)](./puppeteer.coverage._constructor_.md) |  | Constructs a new instance of the <code>Coverage</code> class |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [startCSSCoverage(options)](./puppeteer.coverage.startcsscoverage.md) |  |  |
-|  [startJSCoverage(options)](./puppeteer.coverage.startjscoverage.md) |  |  |
-|  [stopCSSCoverage()](./puppeteer.coverage.stopcsscoverage.md) |  |  |
-|  [stopJSCoverage()](./puppeteer.coverage.stopjscoverage.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startcsscoverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startcsscoverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startcsscoverage.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startcsscoverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md) &gt; [startCSSCoverage](./puppeteer.coverage.startcsscoverage.md)
-
-## Coverage.startCSSCoverage() method
-
-<b>Signature:</b>
-
-```typescript
-startCSSCoverage(options?: CSSCoverageOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [CSSCoverageOptions](./puppeteer.csscoverageoptions.md) | defaults to <code>{ resetOnNavigation : true }</code> |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-Promise that resolves when coverage is started.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startjscoverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startjscoverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startjscoverage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.startjscoverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md) &gt; [startJSCoverage](./puppeteer.coverage.startjscoverage.md)
-
-## Coverage.startJSCoverage() method
-
-<b>Signature:</b>
-
-```typescript
-startJSCoverage(options?: JSCoverageOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [JSCoverageOptions](./puppeteer.jscoverageoptions.md) | defaults to <code>{ resetOnNavigation : true, reportAnonymousScripts : false }</code> |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-Promise that resolves when coverage is started.
-
-## Remarks
-
-Anonymous scripts are ones that don't have an associated url. These are scripts that are dynamically created on the page using `eval` or `new Function`<!-- -->. If `reportAnonymousScripts` is set to `true`<!-- -->, anonymous scripts will have `__puppeteer_evaluation_script__` as their URL.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopcsscoverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopcsscoverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopcsscoverage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopcsscoverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md) &gt; [stopCSSCoverage](./puppeteer.coverage.stopcsscoverage.md)
-
-## Coverage.stopCSSCoverage() method
-
-<b>Signature:</b>
-
-```typescript
-stopCSSCoverage(): Promise<CoverageEntry[]>;
-```
-<b>Returns:</b>
-
-Promise&lt;[CoverageEntry](./puppeteer.coverageentry.md)<!-- -->\[\]&gt;
-
-Promise that resolves to the array of coverage reports for all stylesheets.
-
-## Remarks
-
-CSS Coverage doesn't include dynamically injected style tags without sourceURLs.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopjscoverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopjscoverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopjscoverage.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.coverage.stopjscoverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Coverage](./puppeteer.coverage.md) &gt; [stopJSCoverage](./puppeteer.coverage.stopjscoverage.md)
-
-## Coverage.stopJSCoverage() method
-
-<b>Signature:</b>
-
-```typescript
-stopJSCoverage(): Promise<CoverageEntry[]>;
-```
-<b>Returns:</b>
-
-Promise&lt;[CoverageEntry](./puppeteer.coverageentry.md)<!-- -->\[\]&gt;
-
-Promise that resolves to the array of coverage reports for all scripts.
-
-## Remarks
-
-JavaScript Coverage doesn't include anonymous scripts by default. However, scripts with sourceURLs are reported.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CSSCoverageOptions](./puppeteer.csscoverageoptions.md)
-
-## CSSCoverageOptions interface
-
-Set of configurable options for CSS coverage.
-
-<b>Signature:</b>
-
-```typescript
-export interface CSSCoverageOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [resetOnNavigation](./puppeteer.csscoverageoptions.resetonnavigation.md) | boolean | Whether to reset coverage on every navigation. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.resetonnavigation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.resetonnavigation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.resetonnavigation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.csscoverageoptions.resetonnavigation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [CSSCoverageOptions](./puppeteer.csscoverageoptions.md) &gt; [resetOnNavigation](./puppeteer.csscoverageoptions.resetonnavigation.md)
-
-## CSSCoverageOptions.resetOnNavigation property
-
-Whether to reset coverage on every navigation.
-
-<b>Signature:</b>
-
-```typescript
-resetOnNavigation?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.devicesmap.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.devicesmap.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.devicesmap.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.devicesmap.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [devicesMap](./puppeteer.devicesmap.md)
-
-## devicesMap variable
-
-<b>Signature:</b>
-
-```typescript
-devicesMap: DevicesMap
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.accept.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.accept.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.accept.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.accept.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md) &gt; [accept](./puppeteer.dialog.accept.md)
-
-## Dialog.accept() method
-
-<b>Signature:</b>
-
-```typescript
-accept(promptText?: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  promptText | string | optional text that will be entered in the dialog prompt. Has no effect if the dialog's type is not <code>prompt</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-A promise that resolves when the dialog has been accepted.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.defaultvalue.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.defaultvalue.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.defaultvalue.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.defaultvalue.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md) &gt; [defaultValue](./puppeteer.dialog.defaultvalue.md)
-
-## Dialog.defaultValue() method
-
-<b>Signature:</b>
-
-```typescript
-defaultValue(): string;
-```
-<b>Returns:</b>
-
-string
-
-The default value of the prompt, or an empty string if the dialog is not a `prompt`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.dismiss.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.dismiss.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.dismiss.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.dismiss.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md) &gt; [dismiss](./puppeteer.dialog.dismiss.md)
-
-## Dialog.dismiss() method
-
-<b>Signature:</b>
-
-```typescript
-dismiss(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-A promise which will resolve once the dialog has been dismissed
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md)
-
-## Dialog class
-
-Dialog instances are dispatched by the [Page](./puppeteer.page.md) via the `dialog` event.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Dialog 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Dialog` class.
-
-## Example
-
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  page.on('dialog', async dialog => {
-    console.log(dialog.message());
-    await dialog.dismiss();
-    await browser.close();
-  });
-  page.evaluate(() => alert('1'));
-})();
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [accept(promptText)](./puppeteer.dialog.accept.md) |  |  |
-|  [defaultValue()](./puppeteer.dialog.defaultvalue.md) |  |  |
-|  [dismiss()](./puppeteer.dialog.dismiss.md) |  |  |
-|  [message()](./puppeteer.dialog.message.md) |  |  |
-|  [type()](./puppeteer.dialog.type.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.message.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.message.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.message.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.message.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md) &gt; [message](./puppeteer.dialog.message.md)
-
-## Dialog.message() method
-
-<b>Signature:</b>
-
-```typescript
-message(): string;
-```
-<b>Returns:</b>
-
-string
-
-The message displayed in the dialog.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.dialog.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Dialog](./puppeteer.dialog.md) &gt; [type](./puppeteer.dialog.type.md)
-
-## Dialog.type() method
-
-<b>Signature:</b>
-
-```typescript
-type(): Protocol.Page.DialogType;
-```
-<b>Returns:</b>
-
-Protocol.Page.DialogType
-
-The type of the dialog.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.aselement.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.aselement.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.aselement.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.aselement.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [asElement](./puppeteer.elementhandle.aselement.md)
-
-## ElementHandle.asElement() method
-
-<b>Signature:</b>
-
-```typescript
-asElement(): ElementHandle<ElementType> | null;
-```
-<b>Returns:</b>
-
-[ElementHandle](./puppeteer.elementhandle.md)<!-- -->&lt;ElementType&gt; \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boundingbox.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boundingbox.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boundingbox.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boundingbox.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [boundingBox](./puppeteer.elementhandle.boundingbox.md)
-
-## ElementHandle.boundingBox() method
-
-This method returns the bounding box of the element (relative to the main frame), or `null` if the element is not visible.
-
-<b>Signature:</b>
-
-```typescript
-boundingBox(): Promise<BoundingBox | null>;
-```
-<b>Returns:</b>
-
-Promise&lt;[BoundingBox](./puppeteer.boundingbox.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boxmodel.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boxmodel.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boxmodel.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.boxmodel.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [boxModel](./puppeteer.elementhandle.boxmodel.md)
-
-## ElementHandle.boxModel() method
-
-This method returns boxes of the element, or `null` if the element is not visible.
-
-<b>Signature:</b>
-
-```typescript
-boxModel(): Promise<BoxModel | null>;
-```
-<b>Returns:</b>
-
-Promise&lt;[BoxModel](./puppeteer.boxmodel.md) \| null&gt;
-
-## Remarks
-
-Boxes are represented as an array of points; Each Point is an object `{x, y}`<!-- -->. Box points are sorted clock-wise.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.click.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.click.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.click.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.click.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [click](./puppeteer.elementhandle.click.md)
-
-## ElementHandle.click() method
-
-This method scrolls element into view if needed, and then uses [Page.mouse](./puppeteer.page.mouse.md) to click in the center of the element. If the element is detached from DOM, the method throws an error.
-
-<b>Signature:</b>
-
-```typescript
-click(options?: ClickOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [ClickOptions](./puppeteer.clickoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.contentframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.contentframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.contentframe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.contentframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [contentFrame](./puppeteer.elementhandle.contentframe.md)
-
-## ElementHandle.contentFrame() method
-
-Resolves to the content frame for element handles referencing iframe nodes, or null otherwise
-
-<b>Signature:</b>
-
-```typescript
-contentFrame(): Promise<Frame | null>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Frame](./puppeteer.frame.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [$$eval](./puppeteer.elementhandle.__eval.md)
-
-## ElementHandle.$$eval() method
-
-This method runs `document.querySelectorAll` within the element and passes it as the first argument to `pageFunction`<!-- -->. If there's no element matching `selector`<!-- -->, the method throws an error.
-
-If `pageFunction` returns a Promise, then `frame.$$eval` would wait for the promise to resolve and return its value.
-
-<b>Signature:</b>
-
-```typescript
-$$eval<ReturnType extends any>(selector: string, pageFunction: EvaluateFn | string, ...args: SerializableOrJSHandle[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  pageFunction | [EvaluateFn](./puppeteer.evaluatefn.md) \| string |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
-## Example 1
-
-
-```html
-<div class="feed">
-  <div class="tweet">Hello!</div>
-  <div class="tweet">Hi!</div>
-</div>
-
-```
-
-## Example 2
-
-
-```js
-const feedHandle = await page.$('.feed');
-expect(await feedHandle.$$eval('.tweet', nodes => nodes.map(n => n.innerText)))
- .toEqual(['Hello!', 'Hi!']);
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [$eval](./puppeteer.elementhandle._eval.md)
-
-## ElementHandle.$eval() method
-
-This method runs `document.querySelector` within the element and passes it as the first argument to `pageFunction`<!-- -->. If there's no element matching `selector`<!-- -->, the method throws an error.
-
-If `pageFunction` returns a Promise, then `frame.$eval` would wait for the promise to resolve and return its value.
-
-<b>Signature:</b>
-
-```typescript
-$eval<ReturnType>(selector: string, pageFunction: (element: Element, ...args: unknown[]) => ReturnType | Promise<ReturnType>, ...args: SerializableOrJSHandle[]): Promise<WrapElementHandle<ReturnType>>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  pageFunction | (element: Element, ...args: unknown\[\]) =&gt; ReturnType \| Promise&lt;ReturnType&gt; |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[WrapElementHandle](./puppeteer.wrapelementhandle.md)<!-- -->&lt;ReturnType&gt;&gt;
-
-## Example
-
-
-```js
-const tweetHandle = await page.$('.tweet');
-expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
-expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.focus.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.focus.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.focus.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.focus.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [focus](./puppeteer.elementhandle.focus.md)
-
-## ElementHandle.focus() method
-
-Calls [focus](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus) on the element.
-
-<b>Signature:</b>
-
-```typescript
-focus(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.hover.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.hover.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.hover.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.hover.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [hover](./puppeteer.elementhandle.hover.md)
-
-## ElementHandle.hover() method
-
-This method scrolls element into view if needed, and then uses [Page.mouse](./puppeteer.page.mouse.md) to hover over the center of the element. If the element is detached from DOM, the method throws an error.
-
-<b>Signature:</b>
-
-```typescript
-hover(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.isintersectingviewport.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.isintersectingviewport.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.isintersectingviewport.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.isintersectingviewport.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [isIntersectingViewport](./puppeteer.elementhandle.isintersectingviewport.md)
-
-## ElementHandle.isIntersectingViewport() method
-
-Resolves to true if the element is visible in the current viewport.
-
-<b>Signature:</b>
-
-```typescript
-isIntersectingViewport(): Promise<boolean>;
-```
-<b>Returns:</b>
-
-Promise&lt;boolean&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md)
-
-## ElementHandle class
-
-ElementHandle represents an in-page DOM element.
-
-<b>Signature:</b>
-
-```typescript
-export declare class ElementHandle<ElementType extends Element = Element> extends JSHandle 
-```
-<b>Extends:</b> [JSHandle](./puppeteer.jshandle.md)
-
-## Remarks
-
-ElementHandles can be created with the [Page.$()](./puppeteer.page._.md) method.
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
- const browser = await puppeteer.launch();
- const page = await browser.newPage();
- await page.goto('https://example.com');
- const hrefElement = await page.$('a');
- await hrefElement.click();
- // ...
-})();
-
-```
-ElementHandle prevents the DOM element from being garbage-collected unless the handle is [disposed](./puppeteer.jshandle.dispose.md)<!-- -->. ElementHandles are auto-disposed when their origin frame gets navigated.
-
-ElementHandle instances can be used as arguments in [Page.$eval()](./puppeteer.page._eval.md) and [Page.evaluate()](./puppeteer.page.evaluate.md) methods.
-
-If you're using TypeScript, ElementHandle takes a generic argument that denotes the type of element the handle is holding within. For example, if you have a handle to a `<select>` element, you can type it as `ElementHandle<HTMLSelectElement>` and you get some nicer type checks.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `ElementHandle` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [$(selector)](./puppeteer.elementhandle._.md) |  | Runs <code>element.querySelector</code> within the page. If no element matches the selector, the return value resolves to <code>null</code>. |
-|  [$$(selector)](./puppeteer.elementhandle.__.md) |  | Runs <code>element.querySelectorAll</code> within the page. If no elements match the selector, the return value resolves to <code>[]</code>. |
-|  [$$eval(selector, pageFunction, args)](./puppeteer.elementhandle.__eval.md) |  | This method runs <code>document.querySelectorAll</code> within the element and passes it as the first argument to <code>pageFunction</code>. If there's no element matching <code>selector</code>, the method throws an error.<!-- -->If <code>pageFunction</code> returns a Promise, then <code>frame.$$eval</code> would wait for the promise to resolve and return its value. |
-|  [$eval(selector, pageFunction, args)](./puppeteer.elementhandle._eval.md) |  | This method runs <code>document.querySelector</code> within the element and passes it as the first argument to <code>pageFunction</code>. If there's no element matching <code>selector</code>, the method throws an error.<!-- -->If <code>pageFunction</code> returns a Promise, then <code>frame.$eval</code> would wait for the promise to resolve and return its value. |
-|  [$x(expression)](./puppeteer.elementhandle._x.md) |  | The method evaluates the XPath expression relative to the elementHandle. If there are no such elements, the method will resolve to an empty array. |
-|  [asElement()](./puppeteer.elementhandle.aselement.md) |  |  |
-|  [boundingBox()](./puppeteer.elementhandle.boundingbox.md) |  | This method returns the bounding box of the element (relative to the main frame), or <code>null</code> if the element is not visible. |
-|  [boxModel()](./puppeteer.elementhandle.boxmodel.md) |  | This method returns boxes of the element, or <code>null</code> if the element is not visible. |
-|  [click(options)](./puppeteer.elementhandle.click.md) |  | This method scrolls element into view if needed, and then uses [Page.mouse](./puppeteer.page.mouse.md) to click in the center of the element. If the element is detached from DOM, the method throws an error. |
-|  [contentFrame()](./puppeteer.elementhandle.contentframe.md) |  | Resolves to the content frame for element handles referencing iframe nodes, or null otherwise |
-|  [focus()](./puppeteer.elementhandle.focus.md) |  | Calls [focus](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus) on the element. |
-|  [hover()](./puppeteer.elementhandle.hover.md) |  | This method scrolls element into view if needed, and then uses [Page.mouse](./puppeteer.page.mouse.md) to hover over the center of the element. If the element is detached from DOM, the method throws an error. |
-|  [isIntersectingViewport()](./puppeteer.elementhandle.isintersectingviewport.md) |  | Resolves to true if the element is visible in the current viewport. |
-|  [press(key, options)](./puppeteer.elementhandle.press.md) |  | Focuses the element, and then uses [Keyboard.down()](./puppeteer.keyboard.down.md) and [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->. |
-|  [screenshot(options)](./puppeteer.elementhandle.screenshot.md) |  | This method scrolls element into view if needed, and then uses [Page.screenshot()](./puppeteer.page.screenshot.md) to take a screenshot of the element. If the element is detached from DOM, the method throws an error. |
-|  [select(values)](./puppeteer.elementhandle.select.md) |  | Triggers a <code>change</code> and <code>input</code> event once all the provided options have been selected. If there's no <code>&lt;select&gt;</code> element matching <code>selector</code>, the method throws an error. |
-|  [tap()](./puppeteer.elementhandle.tap.md) |  | This method scrolls element into view if needed, and then uses [Touchscreen.tap()](./puppeteer.touchscreen.tap.md) to tap in the center of the element. If the element is detached from DOM, the method throws an error. |
-|  [type(text, options)](./puppeteer.elementhandle.type.md) |  | Focuses the element, and then sends a <code>keydown</code>, <code>keypress</code>/<code>input</code>, and <code>keyup</code> event for each character in the text.<!-- -->To press a special key, like <code>Control</code> or <code>ArrowDown</code>, use [ElementHandle.press()](./puppeteer.elementhandle.press.md)<!-- -->. |
-|  [uploadFile(filePaths)](./puppeteer.elementhandle.uploadfile.md) |  | This method expects <code>elementHandle</code> to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input)<!-- -->. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.__.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [$$](./puppeteer.elementhandle.__.md)
-
-## ElementHandle.$$() method
-
-Runs `element.querySelectorAll` within the page. If no elements match the selector, the return value resolves to `[]`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-$$(selector: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [$](./puppeteer.elementhandle._.md)
-
-## ElementHandle.$() method
-
-Runs `element.querySelector` within the page. If no element matches the selector, the return value resolves to `null`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-$(selector: string): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.press.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.press.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.press.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.press.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [press](./puppeteer.elementhandle.press.md)
-
-## ElementHandle.press() method
-
-Focuses the element, and then uses [Keyboard.down()](./puppeteer.keyboard.down.md) and [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-press(key: KeyInput, options?: PressOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  key | [KeyInput](./puppeteer.keyinput.md) | Name of key to press, such as <code>ArrowLeft</code>. See [KeyInput](./puppeteer.keyinput.md) for a list of all key names. |
-|  options | [PressOptions](./puppeteer.pressoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`<!-- -->/`input` event will also be generated. The `text` option can be specified to force an input event to be generated.
-
-\*\*NOTE\*\* Modifier keys DO affect `elementHandle.press`<!-- -->. Holding down `Shift` will type the text in upper case.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.screenshot.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.screenshot.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.screenshot.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.screenshot.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [screenshot](./puppeteer.elementhandle.screenshot.md)
-
-## ElementHandle.screenshot() method
-
-This method scrolls element into view if needed, and then uses [Page.screenshot()](./puppeteer.page.screenshot.md) to take a screenshot of the element. If the element is detached from DOM, the method throws an error.
-
-<b>Signature:</b>
-
-```typescript
-screenshot(options?: {}): Promise<string | Buffer | void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | {} |  |
-
-<b>Returns:</b>
-
-Promise&lt;string \| Buffer \| void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.select.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.select.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.select.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.select.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [select](./puppeteer.elementhandle.select.md)
-
-## ElementHandle.select() method
-
-Triggers a `change` and `input` event once all the provided options have been selected. If there's no `<select>` element matching `selector`<!-- -->, the method throws an error.
-
-<b>Signature:</b>
-
-```typescript
-select(...values: string[]): Promise<string[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  values | string\[\] | Values of options to select. If the <code>&lt;select&gt;</code> has the <code>multiple</code> attribute, all values are considered, otherwise only the first one is taken into account. |
-
-<b>Returns:</b>
-
-Promise&lt;string\[\]&gt;
-
-## Example
-
-
-```js
-handle.select('blue'); // single selection
-handle.select('red', 'green', 'blue'); // multiple selections
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.tap.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.tap.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.tap.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.tap.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [tap](./puppeteer.elementhandle.tap.md)
-
-## ElementHandle.tap() method
-
-This method scrolls element into view if needed, and then uses [Touchscreen.tap()](./puppeteer.touchscreen.tap.md) to tap in the center of the element. If the element is detached from DOM, the method throws an error.
-
-<b>Signature:</b>
-
-```typescript
-tap(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [type](./puppeteer.elementhandle.type.md)
-
-## ElementHandle.type() method
-
-Focuses the element, and then sends a `keydown`<!-- -->, `keypress`<!-- -->/`input`<!-- -->, and `keyup` event for each character in the text.
-
-To press a special key, like `Control` or `ArrowDown`<!-- -->, use [ElementHandle.press()](./puppeteer.elementhandle.press.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-type(text: string, options?: {
-        delay: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  text | string |  |
-|  options | { delay: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Example 1
-
-
-```js
-await elementHandle.type('Hello'); // Types instantly
-await elementHandle.type('World', {delay: 100}); // Types slower, like a user
-
-```
-
-## Example 2
-
-An example of typing into a text field and then submitting the form:
-
-```js
-const elementHandle = await page.$('input');
-await elementHandle.type('some text');
-await elementHandle.press('Enter');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.uploadfile.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.uploadfile.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.uploadfile.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle.uploadfile.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [uploadFile](./puppeteer.elementhandle.uploadfile.md)
-
-## ElementHandle.uploadFile() method
-
-This method expects `elementHandle` to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-uploadFile(...filePaths: string[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  filePaths | string\[\] | Sets the value of the file input to these paths. If some of the <code>filePaths</code> are relative paths, then they are resolved relative to the [current working directory](https://nodejs.org/api/process.html#process_process_cwd) |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._x.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._x.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._x.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.elementhandle._x.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ElementHandle](./puppeteer.elementhandle.md) &gt; [$x](./puppeteer.elementhandle._x.md)
-
-## ElementHandle.$x() method
-
-The method evaluates the XPath expression relative to the elementHandle. If there are no such elements, the method will resolve to an empty array.
-
-<b>Signature:</b>
-
-```typescript
-$x(expression: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  expression | string | Expression to [evaluate](https://developer.mozilla.org/en-US/docs/Web/API/Document/evaluate) |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefn.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefn.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefn.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefn.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EvaluateFn](./puppeteer.evaluatefn.md)
-
-## EvaluateFn type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type EvaluateFn<T = any> = string | ((arg1: T, ...args: any[]) => any);
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefnreturntype.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefnreturntype.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefnreturntype.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatefnreturntype.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EvaluateFnReturnType](./puppeteer.evaluatefnreturntype.md)
-
-## EvaluateFnReturnType type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type EvaluateFnReturnType<T extends EvaluateFn> = T extends (...args: any[]) => infer R ? R : unknown;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatehandlefn.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatehandlefn.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatehandlefn.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluatehandlefn.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md)
-
-## EvaluateHandleFn type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type EvaluateHandleFn = string | ((...args: unknown[]) => unknown);
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluation_script_url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluation_script_url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.evaluation_script_url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.evaluation_script_url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EVALUATION\_SCRIPT\_URL](./puppeteer.evaluation_script_url.md)
-
-## EVALUATION\_SCRIPT\_URL variable
-
-<b>Signature:</b>
-
-```typescript
-EVALUATION_SCRIPT_URL = "__puppeteer_evaluation_script__"
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.addlistener.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.addlistener.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.addlistener.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.addlistener.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [addListener](./puppeteer.eventemitter.addlistener.md)
-
-## EventEmitter.addListener() method
-
-> Warning: This API is now obsolete.
-> 
-> please use `on` instead.
-> 
-
-Add an event listener.
-
-<b>Signature:</b>
-
-```typescript
-addListener(event: EventType, handler: Handler): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType |  |
-|  handler | Handler |  |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.emit.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.emit.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.emit.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.emit.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [emit](./puppeteer.eventemitter.emit.md)
-
-## EventEmitter.emit() method
-
-Emit an event and call any associated listeners.
-
-<b>Signature:</b>
-
-```typescript
-emit(event: EventType, eventData?: any): boolean;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event you'd like to emit |
-|  eventData | any | any data you'd like to emit with the event |
-
-<b>Returns:</b>
-
-boolean
-
-`true` if there are any listeners, `false` if there are not.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.listenercount.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.listenercount.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.listenercount.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.listenercount.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [listenerCount](./puppeteer.eventemitter.listenercount.md)
-
-## EventEmitter.listenerCount() method
-
-Gets the number of listeners for a given event.
-
-<b>Signature:</b>
-
-```typescript
-listenerCount(event: EventType): number;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event to get the listener count for |
-
-<b>Returns:</b>
-
-number
-
-the number of listeners bound to the given event
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md)
-
-## EventEmitter class
-
-The EventEmitter class that many Puppeteer classes extend.
-
-<b>Signature:</b>
-
-```typescript
-export declare class EventEmitter implements CommonEventEmitter 
-```
-<b>Implements:</b> CommonEventEmitter
-
-## Remarks
-
-This allows you to listen to events that Puppeteer classes fire and act accordingly. Therefore you'll mostly use [on](./puppeteer.eventemitter.on.md) and [off](./puppeteer.eventemitter.off.md) to bind and unbind to event listeners.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `EventEmitter` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [addListener(event, handler)](./puppeteer.eventemitter.addlistener.md) |  | Add an event listener. |
-|  [emit(event, eventData)](./puppeteer.eventemitter.emit.md) |  | Emit an event and call any associated listeners. |
-|  [listenerCount(event)](./puppeteer.eventemitter.listenercount.md) |  | Gets the number of listeners for a given event. |
-|  [off(event, handler)](./puppeteer.eventemitter.off.md) |  | Remove an event listener from firing. |
-|  [on(event, handler)](./puppeteer.eventemitter.on.md) |  | Bind an event listener to fire when an event occurs. |
-|  [once(event, handler)](./puppeteer.eventemitter.once.md) |  | Like <code>on</code> but the listener will only be fired once and then it will be removed. |
-|  [removeAllListeners(event)](./puppeteer.eventemitter.removealllisteners.md) |  | Removes all listeners. If given an event argument, it will remove only listeners for that event. |
-|  [removeListener(event, handler)](./puppeteer.eventemitter.removelistener.md) |  | Remove an event listener. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.off.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.off.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.off.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.off.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [off](./puppeteer.eventemitter.off.md)
-
-## EventEmitter.off() method
-
-Remove an event listener from firing.
-
-<b>Signature:</b>
-
-```typescript
-off(event: EventType, handler: Handler): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event type you'd like to stop listening to. |
-|  handler | Handler | the function that should be removed. |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
-`this` to enable you to chain calls.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.once.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.once.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.once.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.once.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [once](./puppeteer.eventemitter.once.md)
-
-## EventEmitter.once() method
-
-Like `on` but the listener will only be fired once and then it will be removed.
-
-<b>Signature:</b>
-
-```typescript
-once(event: EventType, handler: Handler): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event you'd like to listen to |
-|  handler | Handler | the handler function to run when the event occurs |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
-`this` to enable you to chain calls.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.on.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.on.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.on.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.on.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [on](./puppeteer.eventemitter.on.md)
-
-## EventEmitter.on() method
-
-Bind an event listener to fire when an event occurs.
-
-<b>Signature:</b>
-
-```typescript
-on(event: EventType, handler: Handler): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event type you'd like to listen to. Can be a string or symbol. |
-|  handler | Handler | the function to be called when the event occurs. |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
-`this` to enable you to chain calls.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removealllisteners.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removealllisteners.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removealllisteners.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removealllisteners.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [removeAllListeners](./puppeteer.eventemitter.removealllisteners.md)
-
-## EventEmitter.removeAllListeners() method
-
-Removes all listeners. If given an event argument, it will remove only listeners for that event.
-
-<b>Signature:</b>
-
-```typescript
-removeAllListeners(event?: EventType): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType | the event to remove listeners for. |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
-`this` to enable you to chain calls.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removelistener.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removelistener.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removelistener.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.eventemitter.removelistener.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [EventEmitter](./puppeteer.eventemitter.md) &gt; [removeListener](./puppeteer.eventemitter.removelistener.md)
-
-## EventEmitter.removeListener() method
-
-> Warning: This API is now obsolete.
-> 
-> please use `off` instead.
-> 
-
-Remove an event listener.
-
-<b>Signature:</b>
-
-```typescript
-removeListener(event: EventType, handler: Handler): EventEmitter;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | EventType |  |
-|  handler | Handler |  |
-
-<b>Returns:</b>
-
-[EventEmitter](./puppeteer.eventemitter.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluatehandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluatehandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluatehandle.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluatehandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ExecutionContext](./puppeteer.executioncontext.md) &gt; [evaluateHandle](./puppeteer.executioncontext.evaluatehandle.md)
-
-## ExecutionContext.evaluateHandle() method
-
-<b>Signature:</b>
-
-```typescript
-evaluateHandle<HandleType extends JSHandle | ElementHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandleType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) | a function to be evaluated in the <code>executionContext</code> |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] | argument to pass to the page function |
-
-<b>Returns:</b>
-
-Promise&lt;HandleType&gt;
-
-A promise that resolves to the return value of the given function as an in-page object (a [JSHandle](./puppeteer.jshandle.md)<!-- -->).
-
-## Remarks
-
-The only difference between `executionContext.evaluate` and `executionContext.evaluateHandle` is that `executionContext.evaluateHandle` returns an in-page object (a [JSHandle](./puppeteer.jshandle.md)<!-- -->). If the function passed to the `executionContext.evaluateHandle` returns a Promise, then `executionContext.evaluateHandle` would wait for the promise to resolve and return its value.
-
-## Example 1
-
-
-```js
-const context = await page.mainFrame().executionContext();
-const aHandle = await context.evaluateHandle(() => Promise.resolve(self));
-aHandle; // Handle for the global object.
-
-```
-
-## Example 2
-
-A string can also be passed in instead of a function.
-
-```js
-// Handle for the '3' * object.
-const aHandle = await context.evaluateHandle('1 + 2');
-
-```
-
-## Example 3
-
-JSHandle instances can be passed as arguments to the `executionContext.* evaluateHandle`<!-- -->:
-
-```js
-const aHandle = await context.evaluateHandle(() => document.body);
-const resultHandle = await context.evaluateHandle(body => body.innerHTML, * aHandle);
-console.log(await resultHandle.jsonValue()); // prints body's innerHTML
-await aHandle.dispose();
-await resultHandle.dispose();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluate.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.evaluate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ExecutionContext](./puppeteer.executioncontext.md) &gt; [evaluate](./puppeteer.executioncontext.evaluate.md)
-
-## ExecutionContext.evaluate() method
-
-<b>Signature:</b>
-
-```typescript
-evaluate<ReturnType extends any>(pageFunction: Function | string, ...args: unknown[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string | a function to be evaluated in the <code>executionContext</code> |
-|  args | unknown\[\] | argument to pass to the page function |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
-A promise that resolves to the return value of the given function.
-
-## Remarks
-
-If the function passed to the `executionContext.evaluate` returns a Promise, then `executionContext.evaluate` would wait for the promise to resolve and return its value. If the function passed to the `executionContext.evaluate` returns a non-serializable value, then `executionContext.evaluate` resolves to `undefined`<!-- -->. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`<!-- -->: `-0`<!-- -->, `NaN`<!-- -->, `Infinity`<!-- -->, `-Infinity`<!-- -->, and bigint literals.
-
-## Example 1
-
-
-```js
-const executionContext = await page.mainFrame().executionContext();
-const result = await executionContext.evaluate(() => Promise.resolve(8 * 7))* ;
-console.log(result); // prints "56"
-
-```
-
-## Example 2
-
-A string can also be passed in instead of a function.
-
-```js
-console.log(await executionContext.evaluate('1 + 2')); // prints "3"
-
-```
-
-## Example 3
-
-[JSHandle](./puppeteer.jshandle.md) instances can be passed as arguments to the `executionContext.* evaluate`<!-- -->:
-
-```js
-const oneHandle = await executionContext.evaluateHandle(() => 1);
-const twoHandle = await executionContext.evaluateHandle(() => 2);
-const result = await executionContext.evaluate(
-   (a, b) => a + b, oneHandle, * twoHandle
-);
-await oneHandle.dispose();
-await twoHandle.dispose();
-console.log(result); // prints '3'.
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.frame.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.frame.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.frame.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.frame.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ExecutionContext](./puppeteer.executioncontext.md) &gt; [frame](./puppeteer.executioncontext.frame.md)
-
-## ExecutionContext.frame() method
-
-<b>Signature:</b>
-
-```typescript
-frame(): Frame | null;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md) \| null
-
-The frame associated with this execution context.
-
-## Remarks
-
-Not every execution context is associated with a frame. For example, workers and extensions have execution contexts that are not associated with frames.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ExecutionContext](./puppeteer.executioncontext.md)
-
-## ExecutionContext class
-
-This class represents a context for JavaScript execution. A \[Page\] might have many execution contexts: - each [frame](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) has "default" execution context that is always created after frame is attached to DOM. This context is returned by the  method. - [Extension](https://developer.chrome.com/extensions)<!-- -->'s content scripts create additional execution contexts.
-
-Besides pages, execution contexts can be found in [workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class ExecutionContext 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `ExecutionContext` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [evaluate(pageFunction, args)](./puppeteer.executioncontext.evaluate.md) |  |  |
-|  [evaluateHandle(pageFunction, args)](./puppeteer.executioncontext.evaluatehandle.md) |  |  |
-|  [frame()](./puppeteer.executioncontext.frame.md) |  |  |
-|  [queryObjects(prototypeHandle)](./puppeteer.executioncontext.queryobjects.md) |  | This method iterates the JavaScript heap and finds all the objects with the given prototype. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.queryobjects.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.queryobjects.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.queryobjects.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.executioncontext.queryobjects.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ExecutionContext](./puppeteer.executioncontext.md) &gt; [queryObjects](./puppeteer.executioncontext.queryobjects.md)
-
-## ExecutionContext.queryObjects() method
-
-This method iterates the JavaScript heap and finds all the objects with the given prototype.
-
-<b>Signature:</b>
-
-```typescript
-queryObjects(prototypeHandle: JSHandle): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  prototypeHandle | [JSHandle](./puppeteer.jshandle.md) | a handle to the object prototype |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
-A handle to an array of objects with the given prototype.
-
-## Remarks
-
-
-## Example
-
-
-```js
-// Create a Map object
-await page.evaluate(() => window.map = new Map());
-// Get a handle to the Map object prototype
-const mapPrototype = await page.evaluateHandle(() => Map.prototype);
-// Query all map instances into an array
-const mapInstances = await page.queryObjects(mapPrototype);
-// Count amount of map objects in heap
-const count = await page.evaluate(maps => maps.length, mapInstances);
-await mapInstances.dispose();
-await mapPrototype.dispose();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.accept.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.accept.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.accept.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.accept.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FileChooser](./puppeteer.filechooser.md) &gt; [accept](./puppeteer.filechooser.accept.md)
-
-## FileChooser.accept() method
-
-Accept the file chooser request with given paths.
-
-<b>Signature:</b>
-
-```typescript
-accept(filePaths: string[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  filePaths | string\[\] | If some of the <code>filePaths</code> are relative paths, then they are resolved relative to the [current working directory](https://nodejs.org/api/process.html#process_process_cwd)<!-- -->. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.cancel.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.cancel.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.cancel.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.cancel.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FileChooser](./puppeteer.filechooser.md) &gt; [cancel](./puppeteer.filechooser.cancel.md)
-
-## FileChooser.cancel() method
-
-Closes the file chooser without selecting any files.
-
-<b>Signature:</b>
-
-```typescript
-cancel(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.ismultiple.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.ismultiple.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.ismultiple.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.ismultiple.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FileChooser](./puppeteer.filechooser.md) &gt; [isMultiple](./puppeteer.filechooser.ismultiple.md)
-
-## FileChooser.isMultiple() method
-
-Whether file chooser allow for [multiple](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#attr-multiple) file selection.
-
-<b>Signature:</b>
-
-```typescript
-isMultiple(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.filechooser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FileChooser](./puppeteer.filechooser.md)
-
-## FileChooser class
-
-File choosers let you react to the page requesting for a file.
-
-<b>Signature:</b>
-
-```typescript
-export declare class FileChooser 
-```
-
-## Remarks
-
-`FileChooser` objects are returned via the `page.waitForFileChooser` method.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `FileChooser` class.
-
-## Example
-
-An example of using `FileChooser`<!-- -->:
-
-```js
-const [fileChooser] = await Promise.all([
-  page.waitForFileChooser(),
-  page.click('#upload-file-button'), // some button that triggers file selection
-]);
-await fileChooser.accept(['/tmp/myfile.pdf']);
-
-```
-\*\*NOTE\*\* In browsers, only one file chooser can be opened at a time. All file choosers must be accepted or canceled. Not doing so will prevent subsequent file choosers from appearing.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [accept(filePaths)](./puppeteer.filechooser.accept.md) |  | Accept the file chooser request with given paths. |
-|  [cancel()](./puppeteer.filechooser.cancel.md) |  | Closes the file chooser without selecting any files. |
-|  [isMultiple()](./puppeteer.filechooser.ismultiple.md) |  | Whether file chooser allow for [multiple](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#attr-multiple) file selection. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addscripttag.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addscripttag.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addscripttag.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addscripttag.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [addScriptTag](./puppeteer.frame.addscripttag.md)
-
-## Frame.addScriptTag() method
-
-<b>Signature:</b>
-
-```typescript
-addScriptTag(options: {
-        url?: string;
-        path?: string;
-        content?: string;
-        type?: string;
-    }): Promise<ElementHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { url?: string; path?: string; content?: string; type?: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addstyletag.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addstyletag.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addstyletag.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.addstyletag.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [addStyleTag](./puppeteer.frame.addstyletag.md)
-
-## Frame.addStyleTag() method
-
-<b>Signature:</b>
-
-```typescript
-addStyleTag(options: {
-        url?: string;
-        path?: string;
-        content?: string;
-    }): Promise<ElementHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { url?: string; path?: string; content?: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._childframes.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._childframes.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._childframes.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._childframes.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_childFrames](./puppeteer.frame._childframes.md)
-
-## Frame.\_childFrames property
-
-<b>Signature:</b>
-
-```typescript
-_childFrames: Set<Frame>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.childframes.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.childframes.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.childframes.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.childframes.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [childFrames](./puppeteer.frame.childframes.md)
-
-## Frame.childFrames() method
-
-<b>Signature:</b>
-
-```typescript
-childFrames(): Frame[];
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.click.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.click.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.click.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.click.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [click](./puppeteer.frame.click.md)
-
-## Frame.click() method
-
-<b>Signature:</b>
-
-```typescript
-click(selector: string, options?: {
-        delay?: number;
-        button?: MouseButton;
-        clickCount?: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  options | { delay?: number; button?: [MouseButton](./puppeteer.mousebutton.md)<!-- -->; clickCount?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._client.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._client.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._client.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._client.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_client](./puppeteer.frame._client.md)
-
-## Frame.\_client property
-
-<b>Signature:</b>
-
-```typescript
-_client: CDPSession;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [(constructor)](./puppeteer.frame._constructor_.md)
-
-## Frame.(constructor)
-
-Constructs a new instance of the `Frame` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(frameManager: FrameManager, client: CDPSession, parentFrame: Frame | null, frameId: string);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameManager | [FrameManager](./puppeteer.framemanager.md) |  |
-|  client | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  parentFrame | [Frame](./puppeteer.frame.md) \| null |  |
-|  frameId | string |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.content.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.content.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.content.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.content.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [content](./puppeteer.frame.content.md)
-
-## Frame.content() method
-
-<b>Signature:</b>
-
-```typescript
-content(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detached.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detached.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detached.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detached.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_detached](./puppeteer.frame._detached.md)
-
-## Frame.\_detached property
-
-<b>Signature:</b>
-
-```typescript
-_detached: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detach.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detach.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detach.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._detach.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_detach](./puppeteer.frame._detach.md)
-
-## Frame.\_detach() method
-
-<b>Signature:</b>
-
-```typescript
-_detach(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [$$eval](./puppeteer.frame.__eval.md)
-
-## Frame.$$eval() method
-
-<b>Signature:</b>
-
-```typescript
-$$eval<ReturnType extends any>(selector: string, pageFunction: EvaluateFn | string, ...args: SerializableOrJSHandle[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  pageFunction | [EvaluateFn](./puppeteer.evaluatefn.md) \| string |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [$eval](./puppeteer.frame._eval.md)
-
-## Frame.$eval() method
-
-<b>Signature:</b>
-
-```typescript
-$eval<ReturnType>(selector: string, pageFunction: (element: Element, ...args: unknown[]) => ReturnType | Promise<ReturnType>, ...args: SerializableOrJSHandle[]): Promise<WrapElementHandle<ReturnType>>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  pageFunction | (element: Element, ...args: unknown\[\]) =&gt; ReturnType \| Promise&lt;ReturnType&gt; |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[WrapElementHandle](./puppeteer.wrapelementhandle.md)<!-- -->&lt;ReturnType&gt;&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluatehandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluatehandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluatehandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluatehandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [evaluateHandle](./puppeteer.frame.evaluatehandle.md)
-
-## Frame.evaluateHandle() method
-
-<b>Signature:</b>
-
-```typescript
-evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandlerType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;HandlerType&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluate.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.evaluate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [evaluate](./puppeteer.frame.evaluate.md)
-
-## Frame.evaluate() method
-
-<b>Signature:</b>
-
-```typescript
-evaluate<ReturnType extends any>(pageFunction: Function | string, ...args: unknown[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string |  |
-|  args | unknown\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.executioncontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.executioncontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.executioncontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.executioncontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [executionContext](./puppeteer.frame.executioncontext.md)
-
-## Frame.executionContext() method
-
-<b>Signature:</b>
-
-```typescript
-executionContext(): Promise<ExecutionContext>;
-```
-<b>Returns:</b>
-
-Promise&lt;[ExecutionContext](./puppeteer.executioncontext.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.focus.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.focus.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.focus.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.focus.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [focus](./puppeteer.frame.focus.md)
-
-## Frame.focus() method
-
-<b>Signature:</b>
-
-```typescript
-focus(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._framemanager.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._framemanager.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._framemanager.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._framemanager.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_frameManager](./puppeteer.frame._framemanager.md)
-
-## Frame.\_frameManager property
-
-<b>Signature:</b>
-
-```typescript
-_frameManager: FrameManager;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.goto.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.goto.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.goto.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.goto.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [goto](./puppeteer.frame.goto.md)
-
-## Frame.goto() method
-
-<b>Signature:</b>
-
-```typescript
-goto(url: string, options?: {
-        referer?: string;
-        timeout?: number;
-        waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-    }): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  url | string |  |
-|  options | { referer?: string; timeout?: number; waitUntil?: PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\]; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.hover.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.hover.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.hover.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.hover.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [hover](./puppeteer.frame.hover.md)
-
-## Frame.hover() method
-
-<b>Signature:</b>
-
-```typescript
-hover(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._id.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._id.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._id.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._id.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_id](./puppeteer.frame._id.md)
-
-## Frame.\_id property
-
-<b>Signature:</b>
-
-```typescript
-_id: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.isdetached.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.isdetached.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.isdetached.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.isdetached.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [isDetached](./puppeteer.frame.isdetached.md)
-
-## Frame.isDetached() method
-
-<b>Signature:</b>
-
-```typescript
-isDetached(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._lifecycleevents.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._lifecycleevents.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._lifecycleevents.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._lifecycleevents.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_lifecycleEvents](./puppeteer.frame._lifecycleevents.md)
-
-## Frame.\_lifecycleEvents property
-
-<b>Signature:</b>
-
-```typescript
-_lifecycleEvents: Set<string>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._loaderid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._loaderid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._loaderid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._loaderid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_loaderId](./puppeteer.frame._loaderid.md)
-
-## Frame.\_loaderId property
-
-<b>Signature:</b>
-
-```typescript
-_loaderId: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._mainworld.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._mainworld.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._mainworld.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._mainworld.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_mainWorld](./puppeteer.frame._mainworld.md)
-
-## Frame.\_mainWorld property
-
-<b>Signature:</b>
-
-```typescript
-_mainWorld: DOMWorld;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._client.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._client.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._client.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._client.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_client](./puppeteer.framemanager._client.md)
-
-## FrameManager.\_client property
-
-<b>Signature:</b>
-
-```typescript
-_client: CDPSession;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [(constructor)](./puppeteer.framemanager._constructor_.md)
-
-## FrameManager.(constructor)
-
-Constructs a new instance of the `FrameManager` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(client: CDPSession, page: Page, ignoreHTTPSErrors: boolean, timeoutSettings: TimeoutSettings);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  client | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  page | [Page](./puppeteer.page.md) |  |
-|  ignoreHTTPSErrors | boolean |  |
-|  timeoutSettings | TimeoutSettings |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._contextidtocontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._contextidtocontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._contextidtocontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._contextidtocontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_contextIdToContext](./puppeteer.framemanager._contextidtocontext.md)
-
-## FrameManager.\_contextIdToContext property
-
-<b>Signature:</b>
-
-```typescript
-_contextIdToContext: Map<number, ExecutionContext>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._ensureisolatedworld.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._ensureisolatedworld.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._ensureisolatedworld.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._ensureisolatedworld.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_ensureIsolatedWorld](./puppeteer.framemanager._ensureisolatedworld.md)
-
-## FrameManager.\_ensureIsolatedWorld() method
-
-<b>Signature:</b>
-
-```typescript
-_ensureIsolatedWorld(name: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  name | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.executioncontextbyid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.executioncontextbyid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.executioncontextbyid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.executioncontextbyid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [executionContextById](./puppeteer.framemanager.executioncontextbyid.md)
-
-## FrameManager.executionContextById() method
-
-<b>Signature:</b>
-
-```typescript
-executionContextById(contextId: number): ExecutionContext;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  contextId | number |  |
-
-<b>Returns:</b>
-
-[ExecutionContext](./puppeteer.executioncontext.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frame.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frame.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frame.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frame.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [frame](./puppeteer.framemanager.frame.md)
-
-## FrameManager.frame() method
-
-<b>Signature:</b>
-
-```typescript
-frame(frameId: string): Frame | null;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameId | string |  |
-
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._frames.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._frames.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._frames.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._frames.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_frames](./puppeteer.framemanager._frames.md)
-
-## FrameManager.\_frames property
-
-<b>Signature:</b>
-
-```typescript
-_frames: Map<string, Frame>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frames.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frames.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frames.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.frames.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [frames](./puppeteer.framemanager.frames.md)
-
-## FrameManager.frames() method
-
-<b>Signature:</b>
-
-```typescript
-frames(): Frame[];
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._handleframetree.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._handleframetree.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._handleframetree.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._handleframetree.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_handleFrameTree](./puppeteer.framemanager._handleframetree.md)
-
-## FrameManager.\_handleFrameTree() method
-
-<b>Signature:</b>
-
-```typescript
-_handleFrameTree(frameTree: Protocol.Page.FrameTree): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameTree | Protocol.Page.FrameTree |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.initialize.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.initialize.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.initialize.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.initialize.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [initialize](./puppeteer.framemanager.initialize.md)
-
-## FrameManager.initialize() method
-
-<b>Signature:</b>
-
-```typescript
-initialize(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._isolatedworlds.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._isolatedworlds.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._isolatedworlds.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._isolatedworlds.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_isolatedWorlds](./puppeteer.framemanager._isolatedworlds.md)
-
-## FrameManager.\_isolatedWorlds property
-
-<b>Signature:</b>
-
-```typescript
-_isolatedWorlds: Set<string>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._mainframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._mainframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._mainframe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._mainframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_mainFrame](./puppeteer.framemanager._mainframe.md)
-
-## FrameManager.\_mainFrame property
-
-<b>Signature:</b>
-
-```typescript
-_mainFrame: Frame;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.mainframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.mainframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.mainframe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.mainframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [mainFrame](./puppeteer.framemanager.mainframe.md)
-
-## FrameManager.mainFrame() method
-
-<b>Signature:</b>
-
-```typescript
-mainFrame(): Frame;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md)
-
-## FrameManager class
-
-<b>Signature:</b>
-
-```typescript
-export declare class FrameManager extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(client, page, ignoreHTTPSErrors, timeoutSettings)](./puppeteer.framemanager._constructor_.md) |  | Constructs a new instance of the <code>FrameManager</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_client](./puppeteer.framemanager._client.md) |  | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  [\_contextIdToContext](./puppeteer.framemanager._contextidtocontext.md) |  | Map&lt;number, [ExecutionContext](./puppeteer.executioncontext.md)<!-- -->&gt; |  |
-|  [\_frames](./puppeteer.framemanager._frames.md) |  | Map&lt;string, [Frame](./puppeteer.frame.md)<!-- -->&gt; |  |
-|  [\_isolatedWorlds](./puppeteer.framemanager._isolatedworlds.md) |  | Set&lt;string&gt; |  |
-|  [\_mainFrame](./puppeteer.framemanager._mainframe.md) |  | [Frame](./puppeteer.frame.md) |  |
-|  [\_networkManager](./puppeteer.framemanager._networkmanager.md) |  | NetworkManager |  |
-|  [\_page](./puppeteer.framemanager._page.md) |  | [Page](./puppeteer.page.md) |  |
-|  [\_timeoutSettings](./puppeteer.framemanager._timeoutsettings.md) |  | TimeoutSettings |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [\_ensureIsolatedWorld(name)](./puppeteer.framemanager._ensureisolatedworld.md) |  |  |
-|  [\_handleFrameTree(frameTree)](./puppeteer.framemanager._handleframetree.md) |  |  |
-|  [\_onExecutionContextCreated(contextPayload)](./puppeteer.framemanager._onexecutioncontextcreated.md) |  |  |
-|  [\_onExecutionContextDestroyed(executionContextId)](./puppeteer.framemanager._onexecutioncontextdestroyed.md) |  |  |
-|  [\_onExecutionContextsCleared()](./puppeteer.framemanager._onexecutioncontextscleared.md) |  |  |
-|  [\_onFrameAttached(frameId, parentFrameId)](./puppeteer.framemanager._onframeattached.md) |  |  |
-|  [\_onFrameDetached(frameId)](./puppeteer.framemanager._onframedetached.md) |  |  |
-|  [\_onFrameNavigated(framePayload)](./puppeteer.framemanager._onframenavigated.md) |  |  |
-|  [\_onFrameNavigatedWithinDocument(frameId, url)](./puppeteer.framemanager._onframenavigatedwithindocument.md) |  |  |
-|  [\_onFrameStoppedLoading(frameId)](./puppeteer.framemanager._onframestoppedloading.md) |  |  |
-|  [\_onLifecycleEvent(event)](./puppeteer.framemanager._onlifecycleevent.md) |  |  |
-|  [\_removeFramesRecursively(frame)](./puppeteer.framemanager._removeframesrecursively.md) |  |  |
-|  [executionContextById(contextId)](./puppeteer.framemanager.executioncontextbyid.md) |  |  |
-|  [frame(frameId)](./puppeteer.framemanager.frame.md) |  |  |
-|  [frames()](./puppeteer.framemanager.frames.md) |  |  |
-|  [initialize()](./puppeteer.framemanager.initialize.md) |  |  |
-|  [mainFrame()](./puppeteer.framemanager.mainframe.md) |  |  |
-|  [navigateFrame(frame, url, options)](./puppeteer.framemanager.navigateframe.md) |  |  |
-|  [networkManager()](./puppeteer.framemanager.networkmanager.md) |  |  |
-|  [page()](./puppeteer.framemanager.page.md) |  |  |
-|  [waitForFrameNavigation(frame, options)](./puppeteer.framemanager.waitforframenavigation.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.navigateframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.navigateframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.navigateframe.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.navigateframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [navigateFrame](./puppeteer.framemanager.navigateframe.md)
-
-## FrameManager.navigateFrame() method
-
-<b>Signature:</b>
-
-```typescript
-navigateFrame(frame: Frame, url: string, options?: {
-        referer?: string;
-        timeout?: number;
-        waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-    }): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frame | [Frame](./puppeteer.frame.md) |  |
-|  url | string |  |
-|  options | { referer?: string; timeout?: number; waitUntil?: PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\]; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._networkmanager.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._networkmanager.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._networkmanager.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._networkmanager.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_networkManager](./puppeteer.framemanager._networkmanager.md)
-
-## FrameManager.\_networkManager property
-
-<b>Signature:</b>
-
-```typescript
-_networkManager: NetworkManager;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.networkmanager.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.networkmanager.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.networkmanager.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.networkmanager.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [networkManager](./puppeteer.framemanager.networkmanager.md)
-
-## FrameManager.networkManager() method
-
-<b>Signature:</b>
-
-```typescript
-networkManager(): NetworkManager;
-```
-<b>Returns:</b>
-
-NetworkManager
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextcreated.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextcreated.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextcreated.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextcreated.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onExecutionContextCreated](./puppeteer.framemanager._onexecutioncontextcreated.md)
-
-## FrameManager.\_onExecutionContextCreated() method
-
-<b>Signature:</b>
-
-```typescript
-_onExecutionContextCreated(contextPayload: Protocol.Runtime.ExecutionContextDescription): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  contextPayload | Protocol.Runtime.ExecutionContextDescription |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextdestroyed.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextdestroyed.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextdestroyed.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextdestroyed.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onExecutionContextDestroyed](./puppeteer.framemanager._onexecutioncontextdestroyed.md)
-
-## FrameManager.\_onExecutionContextDestroyed() method
-
-<b>Signature:</b>
-
-```typescript
-_onExecutionContextDestroyed(executionContextId: number): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  executionContextId | number |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextscleared.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextscleared.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextscleared.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onexecutioncontextscleared.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onExecutionContextsCleared](./puppeteer.framemanager._onexecutioncontextscleared.md)
-
-## FrameManager.\_onExecutionContextsCleared() method
-
-<b>Signature:</b>
-
-```typescript
-_onExecutionContextsCleared(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframeattached.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframeattached.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframeattached.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframeattached.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onFrameAttached](./puppeteer.framemanager._onframeattached.md)
-
-## FrameManager.\_onFrameAttached() method
-
-<b>Signature:</b>
-
-```typescript
-_onFrameAttached(frameId: string, parentFrameId?: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameId | string |  |
-|  parentFrameId | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframedetached.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframedetached.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframedetached.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframedetached.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onFrameDetached](./puppeteer.framemanager._onframedetached.md)
-
-## FrameManager.\_onFrameDetached() method
-
-<b>Signature:</b>
-
-```typescript
-_onFrameDetached(frameId: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameId | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigated.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigated.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigated.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigated.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onFrameNavigated](./puppeteer.framemanager._onframenavigated.md)
-
-## FrameManager.\_onFrameNavigated() method
-
-<b>Signature:</b>
-
-```typescript
-_onFrameNavigated(framePayload: Protocol.Page.Frame): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  framePayload | Protocol.Page.Frame |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigatedwithindocument.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigatedwithindocument.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigatedwithindocument.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframenavigatedwithindocument.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onFrameNavigatedWithinDocument](./puppeteer.framemanager._onframenavigatedwithindocument.md)
-
-## FrameManager.\_onFrameNavigatedWithinDocument() method
-
-<b>Signature:</b>
-
-```typescript
-_onFrameNavigatedWithinDocument(frameId: string, url: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameId | string |  |
-|  url | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframestoppedloading.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframestoppedloading.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframestoppedloading.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onframestoppedloading.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onFrameStoppedLoading](./puppeteer.framemanager._onframestoppedloading.md)
-
-## FrameManager.\_onFrameStoppedLoading() method
-
-<b>Signature:</b>
-
-```typescript
-_onFrameStoppedLoading(frameId: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frameId | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onlifecycleevent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onlifecycleevent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onlifecycleevent.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._onlifecycleevent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_onLifecycleEvent](./puppeteer.framemanager._onlifecycleevent.md)
-
-## FrameManager.\_onLifecycleEvent() method
-
-<b>Signature:</b>
-
-```typescript
-_onLifecycleEvent(event: Protocol.Page.lifecycleEventPayload): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  event | Protocol.Page.lifecycleEventPayload |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._page.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._page.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._page.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._page.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_page](./puppeteer.framemanager._page.md)
-
-## FrameManager.\_page property
-
-<b>Signature:</b>
-
-```typescript
-_page: Page;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.page.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.page.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.page.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.page.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [page](./puppeteer.framemanager.page.md)
-
-## FrameManager.page() method
-
-<b>Signature:</b>
-
-```typescript
-page(): Page;
-```
-<b>Returns:</b>
-
-[Page](./puppeteer.page.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._removeframesrecursively.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._removeframesrecursively.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._removeframesrecursively.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._removeframesrecursively.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_removeFramesRecursively](./puppeteer.framemanager._removeframesrecursively.md)
-
-## FrameManager.\_removeFramesRecursively() method
-
-<b>Signature:</b>
-
-```typescript
-_removeFramesRecursively(frame: Frame): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frame | [Frame](./puppeteer.frame.md) |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._timeoutsettings.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._timeoutsettings.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._timeoutsettings.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager._timeoutsettings.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [\_timeoutSettings](./puppeteer.framemanager._timeoutsettings.md)
-
-## FrameManager.\_timeoutSettings property
-
-<b>Signature:</b>
-
-```typescript
-_timeoutSettings: TimeoutSettings;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.waitforframenavigation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.waitforframenavigation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.waitforframenavigation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.framemanager.waitforframenavigation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [FrameManager](./puppeteer.framemanager.md) &gt; [waitForFrameNavigation](./puppeteer.framemanager.waitforframenavigation.md)
-
-## FrameManager.waitForFrameNavigation() method
-
-<b>Signature:</b>
-
-```typescript
-waitForFrameNavigation(frame: Frame, options?: {
-        timeout?: number;
-        waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-    }): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  frame | [Frame](./puppeteer.frame.md) |  |
-|  options | { timeout?: number; waitUntil?: PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\]; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md)
-
-## Frame class
-
-<b>Signature:</b>
-
-```typescript
-export declare class Frame 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(frameManager, client, parentFrame, frameId)](./puppeteer.frame._constructor_.md) |  | Constructs a new instance of the <code>Frame</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_childFrames](./puppeteer.frame._childframes.md) |  | Set&lt;[Frame](./puppeteer.frame.md)<!-- -->&gt; |  |
-|  [\_client](./puppeteer.frame._client.md) |  | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  [\_detached](./puppeteer.frame._detached.md) |  | boolean |  |
-|  [\_frameManager](./puppeteer.frame._framemanager.md) |  | [FrameManager](./puppeteer.framemanager.md) |  |
-|  [\_id](./puppeteer.frame._id.md) |  | string |  |
-|  [\_lifecycleEvents](./puppeteer.frame._lifecycleevents.md) |  | Set&lt;string&gt; |  |
-|  [\_loaderId](./puppeteer.frame._loaderid.md) |  | string |  |
-|  [\_mainWorld](./puppeteer.frame._mainworld.md) |  | DOMWorld |  |
-|  [\_name](./puppeteer.frame._name.md) |  | string |  |
-|  [\_parentFrame](./puppeteer.frame._parentframe.md) |  | [Frame](./puppeteer.frame.md) |  |
-|  [\_secondaryWorld](./puppeteer.frame._secondaryworld.md) |  | DOMWorld |  |
-|  [\_url](./puppeteer.frame._url.md) |  | string |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [\_detach()](./puppeteer.frame._detach.md) |  |  |
-|  [\_navigated(framePayload)](./puppeteer.frame._navigated.md) |  |  |
-|  [\_navigatedWithinDocument(url)](./puppeteer.frame._navigatedwithindocument.md) |  |  |
-|  [\_onLifecycleEvent(loaderId, name)](./puppeteer.frame._onlifecycleevent.md) |  |  |
-|  [\_onLoadingStopped()](./puppeteer.frame._onloadingstopped.md) |  |  |
-|  [$(selector)](./puppeteer.frame._.md) |  |  |
-|  [$$(selector)](./puppeteer.frame.__.md) |  |  |
-|  [$$eval(selector, pageFunction, args)](./puppeteer.frame.__eval.md) |  |  |
-|  [$eval(selector, pageFunction, args)](./puppeteer.frame._eval.md) |  |  |
-|  [$x(expression)](./puppeteer.frame._x.md) |  |  |
-|  [addScriptTag(options)](./puppeteer.frame.addscripttag.md) |  |  |
-|  [addStyleTag(options)](./puppeteer.frame.addstyletag.md) |  |  |
-|  [childFrames()](./puppeteer.frame.childframes.md) |  |  |
-|  [click(selector, options)](./puppeteer.frame.click.md) |  |  |
-|  [content()](./puppeteer.frame.content.md) |  |  |
-|  [evaluate(pageFunction, args)](./puppeteer.frame.evaluate.md) |  |  |
-|  [evaluateHandle(pageFunction, args)](./puppeteer.frame.evaluatehandle.md) |  |  |
-|  [executionContext()](./puppeteer.frame.executioncontext.md) |  |  |
-|  [focus(selector)](./puppeteer.frame.focus.md) |  |  |
-|  [goto(url, options)](./puppeteer.frame.goto.md) |  |  |
-|  [hover(selector)](./puppeteer.frame.hover.md) |  |  |
-|  [isDetached()](./puppeteer.frame.isdetached.md) |  |  |
-|  [name()](./puppeteer.frame.name.md) |  |  |
-|  [parentFrame()](./puppeteer.frame.parentframe.md) |  |  |
-|  [select(selector, values)](./puppeteer.frame.select.md) |  |  |
-|  [setContent(html, options)](./puppeteer.frame.setcontent.md) |  |  |
-|  [tap(selector)](./puppeteer.frame.tap.md) |  |  |
-|  [title()](./puppeteer.frame.title.md) |  |  |
-|  [type(selector, text, options)](./puppeteer.frame.type.md) |  |  |
-|  [url()](./puppeteer.frame.url.md) |  |  |
-|  [waitFor(selectorOrFunctionOrTimeout, options, args)](./puppeteer.frame.waitfor.md) |  |  |
-|  [waitForFunction(pageFunction, options, args)](./puppeteer.frame.waitforfunction.md) |  |  |
-|  [waitForNavigation(options)](./puppeteer.frame.waitfornavigation.md) |  |  |
-|  [waitForSelector(selector, options)](./puppeteer.frame.waitforselector.md) |  |  |
-|  [waitForXPath(xpath, options)](./puppeteer.frame.waitforxpath.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.__.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [$$](./puppeteer.frame.__.md)
-
-## Frame.$$() method
-
-<b>Signature:</b>
-
-```typescript
-$$(selector: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [$](./puppeteer.frame._.md)
-
-## Frame.$() method
-
-<b>Signature:</b>
-
-```typescript
-$(selector: string): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._name.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._name.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._name.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._name.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_name](./puppeteer.frame._name.md)
-
-## Frame.\_name property
-
-<b>Signature:</b>
-
-```typescript
-_name?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.name.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.name.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.name.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.name.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [name](./puppeteer.frame.name.md)
-
-## Frame.name() method
-
-<b>Signature:</b>
-
-```typescript
-name(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigated.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigated.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigated.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigated.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_navigated](./puppeteer.frame._navigated.md)
-
-## Frame.\_navigated() method
-
-<b>Signature:</b>
-
-```typescript
-_navigated(framePayload: Protocol.Page.Frame): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  framePayload | Protocol.Page.Frame |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigatedwithindocument.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigatedwithindocument.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigatedwithindocument.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._navigatedwithindocument.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_navigatedWithinDocument](./puppeteer.frame._navigatedwithindocument.md)
-
-## Frame.\_navigatedWithinDocument() method
-
-<b>Signature:</b>
-
-```typescript
-_navigatedWithinDocument(url: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  url | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onlifecycleevent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onlifecycleevent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onlifecycleevent.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onlifecycleevent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_onLifecycleEvent](./puppeteer.frame._onlifecycleevent.md)
-
-## Frame.\_onLifecycleEvent() method
-
-<b>Signature:</b>
-
-```typescript
-_onLifecycleEvent(loaderId: string, name: string): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  loaderId | string |  |
-|  name | string |  |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onloadingstopped.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onloadingstopped.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onloadingstopped.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._onloadingstopped.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_onLoadingStopped](./puppeteer.frame._onloadingstopped.md)
-
-## Frame.\_onLoadingStopped() method
-
-<b>Signature:</b>
-
-```typescript
-_onLoadingStopped(): void;
-```
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._parentframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._parentframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._parentframe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._parentframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_parentFrame](./puppeteer.frame._parentframe.md)
-
-## Frame.\_parentFrame property
-
-<b>Signature:</b>
-
-```typescript
-_parentFrame?: Frame;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.parentframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.parentframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.parentframe.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.parentframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [parentFrame](./puppeteer.frame.parentframe.md)
-
-## Frame.parentFrame() method
-
-<b>Signature:</b>
-
-```typescript
-parentFrame(): Frame | null;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._secondaryworld.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._secondaryworld.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._secondaryworld.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._secondaryworld.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_secondaryWorld](./puppeteer.frame._secondaryworld.md)
-
-## Frame.\_secondaryWorld property
-
-<b>Signature:</b>
-
-```typescript
-_secondaryWorld: DOMWorld;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.select.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.select.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.select.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.select.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [select](./puppeteer.frame.select.md)
-
-## Frame.select() method
-
-<b>Signature:</b>
-
-```typescript
-select(selector: string, ...values: string[]): Promise<string[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  values | string\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;string\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.setcontent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.setcontent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.setcontent.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.setcontent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [setContent](./puppeteer.frame.setcontent.md)
-
-## Frame.setContent() method
-
-<b>Signature:</b>
-
-```typescript
-setContent(html: string, options?: {
-        timeout?: number;
-        waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  html | string |  |
-|  options | { timeout?: number; waitUntil?: PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\]; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.tap.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.tap.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.tap.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.tap.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [tap](./puppeteer.frame.tap.md)
-
-## Frame.tap() method
-
-<b>Signature:</b>
-
-```typescript
-tap(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.title.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.title.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.title.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.title.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [title](./puppeteer.frame.title.md)
-
-## Frame.title() method
-
-<b>Signature:</b>
-
-```typescript
-title(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [type](./puppeteer.frame.type.md)
-
-## Frame.type() method
-
-<b>Signature:</b>
-
-```typescript
-type(selector: string, text: string, options?: {
-        delay: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  text | string |  |
-|  options | { delay: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [\_url](./puppeteer.frame._url.md)
-
-## Frame.\_url property
-
-<b>Signature:</b>
-
-```typescript
-_url: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [url](./puppeteer.frame.url.md)
-
-## Frame.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforfunction.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforfunction.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforfunction.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforfunction.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [waitForFunction](./puppeteer.frame.waitforfunction.md)
-
-## Frame.waitForFunction() method
-
-<b>Signature:</b>
-
-```typescript
-waitForFunction(pageFunction: Function | string, options?: {
-        polling?: string | number;
-        timeout?: number;
-    }, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string |  |
-|  options | { polling?: string \| number; timeout?: number; } |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfor.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfor.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfor.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfor.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [waitFor](./puppeteer.frame.waitfor.md)
-
-## Frame.waitFor() method
-
-<b>Signature:</b>
-
-```typescript
-waitFor(selectorOrFunctionOrTimeout: string | number | Function, options?: {}, ...args: SerializableOrJSHandle[]): Promise<JSHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selectorOrFunctionOrTimeout | string \| number \| Function |  |
-|  options | {} |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfornavigation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfornavigation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfornavigation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitfornavigation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [waitForNavigation](./puppeteer.frame.waitfornavigation.md)
-
-## Frame.waitForNavigation() method
-
-<b>Signature:</b>
-
-```typescript
-waitForNavigation(options?: {
-        timeout?: number;
-        waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-    }): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { timeout?: number; waitUntil?: PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\]; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforselector.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforselector.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforselector.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforselector.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [waitForSelector](./puppeteer.frame.waitforselector.md)
-
-## Frame.waitForSelector() method
-
-<b>Signature:</b>
-
-```typescript
-waitForSelector(selector: string, options?: WaitForSelectorOptions): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  options | WaitForSelectorOptions |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforxpath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforxpath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforxpath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame.waitforxpath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [waitForXPath](./puppeteer.frame.waitforxpath.md)
-
-## Frame.waitForXPath() method
-
-<b>Signature:</b>
-
-```typescript
-waitForXPath(xpath: string, options?: WaitForSelectorOptions): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  xpath | string |  |
-|  options | WaitForSelectorOptions |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._x.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._x.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.frame._x.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.frame._x.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Frame](./puppeteer.frame.md) &gt; [$x](./puppeteer.frame._x.md)
-
-## Frame.$x() method
-
-<b>Signature:</b>
-
-```typescript
-$x(expression: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  expression | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.accuracy.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.accuracy.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.accuracy.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.accuracy.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [GeolocationOptions](./puppeteer.geolocationoptions.md) &gt; [accuracy](./puppeteer.geolocationoptions.accuracy.md)
-
-## GeolocationOptions.accuracy property
-
-Optional non-negative accuracy value.
-
-<b>Signature:</b>
-
-```typescript
-accuracy?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.latitude.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.latitude.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.latitude.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.latitude.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [GeolocationOptions](./puppeteer.geolocationoptions.md) &gt; [latitude](./puppeteer.geolocationoptions.latitude.md)
-
-## GeolocationOptions.latitude property
-
-Longitude between -180 and 180.
-
-<b>Signature:</b>
-
-```typescript
-latitude: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.longitude.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.longitude.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.longitude.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.longitude.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [GeolocationOptions](./puppeteer.geolocationoptions.md) &gt; [longitude](./puppeteer.geolocationoptions.longitude.md)
-
-## GeolocationOptions.longitude property
-
-Latitude between -90 and 90.
-
-<b>Signature:</b>
-
-```typescript
-longitude: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.geolocationoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [GeolocationOptions](./puppeteer.geolocationoptions.md)
-
-## GeolocationOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface GeolocationOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [accuracy](./puppeteer.geolocationoptions.accuracy.md) | number | Optional non-negative accuracy value. |
-|  [latitude](./puppeteer.geolocationoptions.latitude.md) | number | Longitude between -180 and 180. |
-|  [longitude](./puppeteer.geolocationoptions.longitude.md) | number | Latitude between -90 and 90. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.abort.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.abort.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.abort.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.abort.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [abort](./puppeteer.httprequest.abort.md)
-
-## HTTPRequest.abort() method
-
-<b>Signature:</b>
-
-```typescript
-abort(errorCode?: ErrorCode): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  errorCode | ErrorCode |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._constructor_.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._constructor_.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._constructor_.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._constructor_.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [(constructor)](./puppeteer.httprequest._constructor_.md)
-
-## HTTPRequest.(constructor)
-
-Constructs a new instance of the `HTTPRequest` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(client: CDPSession, frame: Frame, interceptionId: string, allowInterception: boolean, event: Protocol.Network.requestWillBeSentPayload, redirectChain: HTTPRequest[]);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  client | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  frame | [Frame](./puppeteer.frame.md) |  |
-|  interceptionId | string |  |
-|  allowInterception | boolean |  |
-|  event | Protocol.Network.requestWillBeSentPayload |  |
-|  redirectChain | [HTTPRequest](./puppeteer.httprequest.md)<!-- -->\[\] |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.continue.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.continue.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.continue.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.continue.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [continue](./puppeteer.httprequest.continue.md)
-
-## HTTPRequest.continue() method
-
-<b>Signature:</b>
-
-```typescript
-continue(overrides?: {
-        url?: string;
-        method?: string;
-        postData?: string;
-        headers?: Record<string, string>;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  overrides | { url?: string; method?: string; postData?: string; headers?: Record&lt;string, string&gt;; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.failure.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.failure.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.failure.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.failure.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [failure](./puppeteer.httprequest.failure.md)
-
-## HTTPRequest.failure() method
-
-<b>Signature:</b>
-
-```typescript
-failure(): {
-        errorText: string;
-    } | null;
-```
-<b>Returns:</b>
-
-{ errorText: string; } \| null
-
-{<!-- -->?<!-- -->{<!-- -->errorText: string<!-- -->}<!-- -->}
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._failuretext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._failuretext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._failuretext.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._failuretext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_failureText](./puppeteer.httprequest._failuretext.md)
-
-## HTTPRequest.\_failureText property
-
-<b>Signature:</b>
-
-```typescript
-_failureText: any;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.frame.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.frame.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.frame.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.frame.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [frame](./puppeteer.httprequest.frame.md)
-
-## HTTPRequest.frame() method
-
-<b>Signature:</b>
-
-```typescript
-frame(): Frame | null;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._frommemorycache.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._frommemorycache.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._frommemorycache.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._frommemorycache.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_fromMemoryCache](./puppeteer.httprequest._frommemorycache.md)
-
-## HTTPRequest.\_fromMemoryCache property
-
-<b>Signature:</b>
-
-```typescript
-_fromMemoryCache: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.headers.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.headers.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.headers.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.headers.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [headers](./puppeteer.httprequest.headers.md)
-
-## HTTPRequest.headers() method
-
-<b>Signature:</b>
-
-```typescript
-headers(): Record<string, string>;
-```
-<b>Returns:</b>
-
-Record&lt;string, string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._interceptionid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._interceptionid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._interceptionid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._interceptionid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_interceptionId](./puppeteer.httprequest._interceptionid.md)
-
-## HTTPRequest.\_interceptionId property
-
-<b>Signature:</b>
-
-```typescript
-_interceptionId: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.isnavigationrequest.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.isnavigationrequest.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.isnavigationrequest.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.isnavigationrequest.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [isNavigationRequest](./puppeteer.httprequest.isnavigationrequest.md)
-
-## HTTPRequest.isNavigationRequest() method
-
-<b>Signature:</b>
-
-```typescript
-isNavigationRequest(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md)
-
-## HTTPRequest class
-
-<b>Signature:</b>
-
-```typescript
-export declare class HTTPRequest 
-```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(client, frame, interceptionId, allowInterception, event, redirectChain)](./puppeteer.httprequest._constructor_.md) |  | Constructs a new instance of the <code>HTTPRequest</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_failureText](./puppeteer.httprequest._failuretext.md) |  | any |  |
-|  [\_fromMemoryCache](./puppeteer.httprequest._frommemorycache.md) |  | boolean |  |
-|  [\_interceptionId](./puppeteer.httprequest._interceptionid.md) |  | string |  |
-|  [\_redirectChain](./puppeteer.httprequest._redirectchain.md) |  | [HTTPRequest](./puppeteer.httprequest.md)<!-- -->\[\] |  |
-|  [\_requestId](./puppeteer.httprequest._requestid.md) |  | string |  |
-|  [\_response](./puppeteer.httprequest._response.md) |  | [HTTPResponse](./puppeteer.httpresponse.md) \| null |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [abort(errorCode)](./puppeteer.httprequest.abort.md) |  |  |
-|  [continue(overrides)](./puppeteer.httprequest.continue.md) |  |  |
-|  [failure()](./puppeteer.httprequest.failure.md) |  |  |
-|  [frame()](./puppeteer.httprequest.frame.md) |  |  |
-|  [headers()](./puppeteer.httprequest.headers.md) |  |  |
-|  [isNavigationRequest()](./puppeteer.httprequest.isnavigationrequest.md) |  |  |
-|  [method()](./puppeteer.httprequest.method.md) |  |  |
-|  [postData()](./puppeteer.httprequest.postdata.md) |  |  |
-|  [redirectChain()](./puppeteer.httprequest.redirectchain.md) |  |  |
-|  [resourceType()](./puppeteer.httprequest.resourcetype.md) |  |  |
-|  [respond(response)](./puppeteer.httprequest.respond.md) |  |  |
-|  [response()](./puppeteer.httprequest.response.md) |  |  |
-|  [url()](./puppeteer.httprequest.url.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.method.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.method.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.method.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.method.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [method](./puppeteer.httprequest.method.md)
-
-## HTTPRequest.method() method
-
-<b>Signature:</b>
-
-```typescript
-method(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.postdata.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.postdata.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.postdata.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.postdata.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [postData](./puppeteer.httprequest.postdata.md)
-
-## HTTPRequest.postData() method
-
-<b>Signature:</b>
-
-```typescript
-postData(): string | undefined;
-```
-<b>Returns:</b>
-
-string \| undefined
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._redirectchain.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._redirectchain.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._redirectchain.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._redirectchain.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_redirectChain](./puppeteer.httprequest._redirectchain.md)
-
-## HTTPRequest.\_redirectChain property
-
-<b>Signature:</b>
-
-```typescript
-_redirectChain: HTTPRequest[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.redirectchain.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.redirectchain.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.redirectchain.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.redirectchain.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [redirectChain](./puppeteer.httprequest.redirectchain.md)
-
-## HTTPRequest.redirectChain() method
-
-<b>Signature:</b>
-
-```typescript
-redirectChain(): HTTPRequest[];
-```
-<b>Returns:</b>
-
-[HTTPRequest](./puppeteer.httprequest.md)<!-- -->\[\]
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._requestid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._requestid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._requestid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._requestid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_requestId](./puppeteer.httprequest._requestid.md)
-
-## HTTPRequest.\_requestId property
-
-<b>Signature:</b>
-
-```typescript
-_requestId: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.resourcetype.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.resourcetype.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.resourcetype.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.resourcetype.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [resourceType](./puppeteer.httprequest.resourcetype.md)
-
-## HTTPRequest.resourceType() method
-
-<b>Signature:</b>
-
-```typescript
-resourceType(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.respond.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.respond.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.respond.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.respond.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [respond](./puppeteer.httprequest.respond.md)
-
-## HTTPRequest.respond() method
-
-<b>Signature:</b>
-
-```typescript
-respond(response: {
-        status: number;
-        headers: Record<string, string>;
-        contentType: string;
-        body: string | Buffer;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  response | { status: number; headers: Record&lt;string, string&gt;; contentType: string; body: string \| Buffer; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._response.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._response.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._response.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest._response.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [\_response](./puppeteer.httprequest._response.md)
-
-## HTTPRequest.\_response property
-
-<b>Signature:</b>
-
-```typescript
-_response: HTTPResponse | null;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.response.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.response.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.response.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.response.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [response](./puppeteer.httprequest.response.md)
-
-## HTTPRequest.response() method
-
-<b>Signature:</b>
-
-```typescript
-response(): HTTPResponse | null;
-```
-<b>Returns:</b>
-
-[HTTPResponse](./puppeteer.httpresponse.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httprequest.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPRequest](./puppeteer.httprequest.md) &gt; [url](./puppeteer.httprequest.url.md)
-
-## HTTPRequest.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.buffer.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.buffer.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.buffer.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.buffer.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [buffer](./puppeteer.httpresponse.buffer.md)
-
-## HTTPResponse.buffer() method
-
-<b>Signature:</b>
-
-```typescript
-buffer(): Promise<Buffer>;
-```
-<b>Returns:</b>
-
-Promise&lt;Buffer&gt;
-
-Promise which resolves to a buffer with response body.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.frame.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.frame.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.frame.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.frame.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [frame](./puppeteer.httpresponse.frame.md)
-
-## HTTPResponse.frame() method
-
-<b>Signature:</b>
-
-```typescript
-frame(): Frame | null;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md) \| null
-
-A [Frame](./puppeteer.frame.md) that initiated this response, or `null` if navigating to error pages.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromcache.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromcache.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromcache.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromcache.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [fromCache](./puppeteer.httpresponse.fromcache.md)
-
-## HTTPResponse.fromCache() method
-
-<b>Signature:</b>
-
-```typescript
-fromCache(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
-True if the response was served from either the browser's disk cache or memory cache.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromserviceworker.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromserviceworker.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromserviceworker.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.fromserviceworker.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [fromServiceWorker](./puppeteer.httpresponse.fromserviceworker.md)
-
-## HTTPResponse.fromServiceWorker() method
-
-<b>Signature:</b>
-
-```typescript
-fromServiceWorker(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
-True if the response was served by a service worker.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.headers.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.headers.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.headers.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.headers.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [headers](./puppeteer.httpresponse.headers.md)
-
-## HTTPResponse.headers() method
-
-<b>Signature:</b>
-
-```typescript
-headers(): Record<string, string>;
-```
-<b>Returns:</b>
-
-Record&lt;string, string&gt;
-
-An object with HTTP headers associated with the response. All header names are lower-case.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.json.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.json.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.json.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.json.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [json](./puppeteer.httpresponse.json.md)
-
-## HTTPResponse.json() method
-
-<b>Signature:</b>
-
-```typescript
-json(): Promise<any>;
-```
-<b>Returns:</b>
-
-Promise&lt;any&gt;
-
-Promise which resolves to a JSON representation of response body.
-
-## Remarks
-
-This method will throw if the response body is not parsable via `JSON.parse`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md)
-
-## HTTPResponse class
-
-The HTTPResponse class represents responses which are received by the [Page](./puppeteer.page.md) class.
-
-<b>Signature:</b>
-
-```typescript
-export declare class HTTPResponse 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `HTTPResponse` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [buffer()](./puppeteer.httpresponse.buffer.md) |  |  |
-|  [frame()](./puppeteer.httpresponse.frame.md) |  |  |
-|  [fromCache()](./puppeteer.httpresponse.fromcache.md) |  |  |
-|  [fromServiceWorker()](./puppeteer.httpresponse.fromserviceworker.md) |  |  |
-|  [headers()](./puppeteer.httpresponse.headers.md) |  |  |
-|  [json()](./puppeteer.httpresponse.json.md) |  |  |
-|  [ok()](./puppeteer.httpresponse.ok.md) |  |  |
-|  [remoteAddress()](./puppeteer.httpresponse.remoteaddress.md) |  |  |
-|  [request()](./puppeteer.httpresponse.request.md) |  |  |
-|  [securityDetails()](./puppeteer.httpresponse.securitydetails.md) |  |  |
-|  [status()](./puppeteer.httpresponse.status.md) |  |  |
-|  [statusText()](./puppeteer.httpresponse.statustext.md) |  |  |
-|  [text()](./puppeteer.httpresponse.text.md) |  |  |
-|  [url()](./puppeteer.httpresponse.url.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.ok.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.ok.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.ok.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.ok.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [ok](./puppeteer.httpresponse.ok.md)
-
-## HTTPResponse.ok() method
-
-<b>Signature:</b>
-
-```typescript
-ok(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
-True if the response was successful (status in the range 200-299).
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.remoteaddress.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.remoteaddress.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.remoteaddress.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.remoteaddress.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [remoteAddress](./puppeteer.httpresponse.remoteaddress.md)
-
-## HTTPResponse.remoteAddress() method
-
-<b>Signature:</b>
-
-```typescript
-remoteAddress(): RemoteAddress;
-```
-<b>Returns:</b>
-
-[RemoteAddress](./puppeteer.remoteaddress.md)
-
-The IP address and port number used to connect to the remote server.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.request.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.request.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.request.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.request.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [request](./puppeteer.httpresponse.request.md)
-
-## HTTPResponse.request() method
-
-<b>Signature:</b>
-
-```typescript
-request(): HTTPRequest;
-```
-<b>Returns:</b>
-
-[HTTPRequest](./puppeteer.httprequest.md)
-
-A matching [HTTPRequest](./puppeteer.httprequest.md) object.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.securitydetails.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.securitydetails.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.securitydetails.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.securitydetails.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [securityDetails](./puppeteer.httpresponse.securitydetails.md)
-
-## HTTPResponse.securityDetails() method
-
-<b>Signature:</b>
-
-```typescript
-securityDetails(): SecurityDetails | null;
-```
-<b>Returns:</b>
-
-[SecurityDetails](./puppeteer.securitydetails.md) \| null
-
-[SecurityDetails](./puppeteer.securitydetails.md) if the response was received over the secure connection, or `null` otherwise.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.status.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.status.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.status.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.status.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [status](./puppeteer.httpresponse.status.md)
-
-## HTTPResponse.status() method
-
-<b>Signature:</b>
-
-```typescript
-status(): number;
-```
-<b>Returns:</b>
-
-number
-
-The status code of the response (e.g., 200 for a success).
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.statustext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.statustext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.statustext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.statustext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [statusText](./puppeteer.httpresponse.statustext.md)
-
-## HTTPResponse.statusText() method
-
-<b>Signature:</b>
-
-```typescript
-statusText(): string;
-```
-<b>Returns:</b>
-
-string
-
-The status text of the response (e.g. usually an "OK" for a success).
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.text.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.text.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.text.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.text.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [text](./puppeteer.httpresponse.text.md)
-
-## HTTPResponse.text() method
-
-<b>Signature:</b>
-
-```typescript
-text(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
-Promise which resolves to a text representation of response body.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.httpresponse.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [HTTPResponse](./puppeteer.httpresponse.md) &gt; [url](./puppeteer.httpresponse.url.md)
-
-## HTTPResponse.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
-The URL of the response.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSCoverageOptions](./puppeteer.jscoverageoptions.md)
-
-## JSCoverageOptions interface
-
-Set of configurable options for JS coverage.
-
-<b>Signature:</b>
-
-```typescript
-export interface JSCoverageOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [reportAnonymousScripts](./puppeteer.jscoverageoptions.reportanonymousscripts.md) | boolean | Whether anonymous scripts generated by the page should be reported. |
-|  [resetOnNavigation](./puppeteer.jscoverageoptions.resetonnavigation.md) | boolean | Whether to reset coverage on every navigation. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.reportanonymousscripts.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.reportanonymousscripts.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.reportanonymousscripts.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.reportanonymousscripts.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSCoverageOptions](./puppeteer.jscoverageoptions.md) &gt; [reportAnonymousScripts](./puppeteer.jscoverageoptions.reportanonymousscripts.md)
-
-## JSCoverageOptions.reportAnonymousScripts property
-
-Whether anonymous scripts generated by the page should be reported.
-
-<b>Signature:</b>
-
-```typescript
-reportAnonymousScripts?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.resetonnavigation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.resetonnavigation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.resetonnavigation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jscoverageoptions.resetonnavigation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSCoverageOptions](./puppeteer.jscoverageoptions.md) &gt; [resetOnNavigation](./puppeteer.jscoverageoptions.resetonnavigation.md)
-
-## JSCoverageOptions.resetOnNavigation property
-
-Whether to reset coverage on every navigation.
-
-<b>Signature:</b>
-
-```typescript
-resetOnNavigation?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.aselement.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.aselement.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.aselement.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.aselement.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [asElement](./puppeteer.jshandle.aselement.md)
-
-## JSHandle.asElement() method
-
-Returns either `null` or the object handle itself, if the object handle is an instance of [ElementHandle](./puppeteer.elementhandle.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-asElement(): ElementHandle | null;
-```
-<b>Returns:</b>
-
-[ElementHandle](./puppeteer.elementhandle.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.dispose.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.dispose.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.dispose.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.dispose.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [dispose](./puppeteer.jshandle.dispose.md)
-
-## JSHandle.dispose() method
-
-Stops referencing the element handle, and resolves when the object handle is successfully disposed of.
-
-<b>Signature:</b>
-
-```typescript
-dispose(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluatehandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluatehandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluatehandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluatehandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [evaluateHandle](./puppeteer.jshandle.evaluatehandle.md)
-
-## JSHandle.evaluateHandle() method
-
-This method passes this handle as the first argument to `pageFunction`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-evaluateHandle<HandleType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandleType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;HandleType&gt;
-
-## Remarks
-
-The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle` returns an in-page object (JSHandle).
-
-If the function passed to `jsHandle.evaluateHandle` returns a Promise, then `evaluateHandle.evaluateHandle` waits for the promise to resolve and returns its value.
-
-See [Page.evaluateHandle()](./puppeteer.page.evaluatehandle.md) for more details.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluate.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.evaluate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [evaluate](./puppeteer.jshandle.evaluate.md)
-
-## JSHandle.evaluate() method
-
-This method passes this handle as the first argument to `pageFunction`<!-- -->. If `pageFunction` returns a Promise, then `handle.evaluate` would wait for the promise to resolve and return its value.
-
-<b>Signature:</b>
-
-```typescript
-evaluate<T extends EvaluateFn>(pageFunction: T | string, ...args: SerializableOrJSHandle[]): Promise<EvaluateFnReturnType<T>>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | T \| string |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[EvaluateFnReturnType](./puppeteer.evaluatefnreturntype.md)<!-- -->&lt;T&gt;&gt;
-
-## Example
-
-
-```js
-const tweetHandle = await page.$('.tweet .retweets');
-expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.executioncontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.executioncontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.executioncontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.executioncontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [executionContext](./puppeteer.jshandle.executioncontext.md)
-
-## JSHandle.executionContext() method
-
-Returns the execution context the handle belongs to.
-
-<b>Signature:</b>
-
-```typescript
-executionContext(): ExecutionContext;
-```
-<b>Returns:</b>
-
-[ExecutionContext](./puppeteer.executioncontext.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperties.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperties.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperties.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperties.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [getProperties](./puppeteer.jshandle.getproperties.md)
-
-## JSHandle.getProperties() method
-
-The method returns a map with property names as keys and JSHandle instances for the property values.
-
-<b>Signature:</b>
-
-```typescript
-getProperties(): Promise<Map<string, JSHandle>>;
-```
-<b>Returns:</b>
-
-Promise&lt;Map&lt;string, [JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;&gt;
-
-## Example
-
-
-```js
-const listHandle = await page.evaluateHandle(() => document.body.children);
-const properties = await listHandle.getProperties();
-const children = [];
-for (const property of properties.values()) {
-  const element = property.asElement();
-  if (element)
-    children.push(element);
-}
-children; // holds elementHandles to all children of document.body
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperty.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperty.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperty.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.getproperty.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [getProperty](./puppeteer.jshandle.getproperty.md)
-
-## JSHandle.getProperty() method
-
-Fetches a single property from the referenced object.
-
-<b>Signature:</b>
-
-```typescript
-getProperty(propertyName: string): Promise<JSHandle | undefined>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  propertyName | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md) \| undefined&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.jsonvalue.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.jsonvalue.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.jsonvalue.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.jsonvalue.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [jsonValue](./puppeteer.jshandle.jsonvalue.md)
-
-## JSHandle.jsonValue() method
-
-Returns a JSON representation of the object.
-
-<b>Signature:</b>
-
-```typescript
-jsonValue(): Promise<{}>;
-```
-<b>Returns:</b>
-
-Promise&lt;{}&gt;
-
-## Remarks
-
-The JSON is generated by running [JSON.stringify](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify) on the object in page and consequent [JSON.parse](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) in puppeteer. \*\*NOTE\*\* The method throws if the referenced object is not stringifiable.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md)
-
-## JSHandle class
-
-Represents an in-page JavaScript object. JSHandles can be created with the [page.evaluateHandle](./puppeteer.page.evaluatehandle.md) method.
-
-<b>Signature:</b>
-
-```typescript
-export declare class JSHandle 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `JSHandle` class.
-
-## Example
-
-
-```js
-const windowHandle = await page.evaluateHandle(() => window);
-
-```
-JSHandle prevents the referenced JavaScript object from being garbage-collected unless the handle is [disposed](./puppeteer.jshandle.dispose.md)<!-- -->. JSHandles are auto- disposed when their origin frame gets navigated or the parent context gets destroyed.
-
-JSHandle instances can be used as arguments for [Page.$eval()](./puppeteer.page._eval.md)<!-- -->, [Page.evaluate()](./puppeteer.page.evaluate.md)<!-- -->, and [Page.evaluateHandle()](./puppeteer.page.evaluatehandle.md)<!-- -->.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [asElement()](./puppeteer.jshandle.aselement.md) |  | Returns either <code>null</code> or the object handle itself, if the object handle is an instance of [ElementHandle](./puppeteer.elementhandle.md)<!-- -->. |
-|  [dispose()](./puppeteer.jshandle.dispose.md) |  | Stops referencing the element handle, and resolves when the object handle is successfully disposed of. |
-|  [evaluate(pageFunction, args)](./puppeteer.jshandle.evaluate.md) |  | This method passes this handle as the first argument to <code>pageFunction</code>. If <code>pageFunction</code> returns a Promise, then <code>handle.evaluate</code> would wait for the promise to resolve and return its value. |
-|  [evaluateHandle(pageFunction, args)](./puppeteer.jshandle.evaluatehandle.md) |  | This method passes this handle as the first argument to <code>pageFunction</code>. |
-|  [executionContext()](./puppeteer.jshandle.executioncontext.md) |  | Returns the execution context the handle belongs to. |
-|  [getProperties()](./puppeteer.jshandle.getproperties.md) |  | The method returns a map with property names as keys and JSHandle instances for the property values. |
-|  [getProperty(propertyName)](./puppeteer.jshandle.getproperty.md) |  | Fetches a single property from the referenced object. |
-|  [jsonValue()](./puppeteer.jshandle.jsonvalue.md) |  | Returns a JSON representation of the object. |
-|  [toString()](./puppeteer.jshandle.tostring.md) |  | Returns a string representation of the JSHandle. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.tostring.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.tostring.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.tostring.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jshandle.tostring.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSHandle](./puppeteer.jshandle.md) &gt; [toString](./puppeteer.jshandle.tostring.md)
-
-## JSHandle.toString() method
-
-Returns a string representation of the JSHandle.
-
-<b>Signature:</b>
-
-```typescript
-toString(): string;
-```
-<b>Returns:</b>
-
-string
-
-## Remarks
-
-Useful during debugging.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jsonarray.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jsonarray.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jsonarray.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jsonarray.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSONArray](./puppeteer.jsonarray.md)
-
-## JSONArray type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type JSONArray = Serializable[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jsonobject.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jsonobject.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.jsonobject.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.jsonobject.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [JSONObject](./puppeteer.jsonobject.md)
-
-## JSONObject interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface JSONObject 
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.down.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.down.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.down.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.down.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md) &gt; [down](./puppeteer.keyboard.down.md)
-
-## Keyboard.down() method
-
-Dispatches a `keydown` event.
-
-<b>Signature:</b>
-
-```typescript
-down(key: KeyInput, options?: {
-        text?: string;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  key | [KeyInput](./puppeteer.keyinput.md) | Name of key to press, such as <code>ArrowLeft</code>. See [KeyInput](./puppeteer.keyinput.md) for a list of all key names. |
-|  options | { text?: string; } | An object of options. Accepts text which, if specified, generates an input event with this text. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`<!-- -->/`input` event will also generated. The `text` option can be specified to force an input event to be generated. If `key` is a modifier key, `Shift`<!-- -->, `Meta`<!-- -->, `Control`<!-- -->, or `Alt`<!-- -->, subsequent key presses will be sent with that modifier active. To release the modifier key, use [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->.
-
-After the key is pressed once, subsequent calls to [Keyboard.down()](./puppeteer.keyboard.down.md) will have [repeat](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat) set to true. To release the key, use [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->.
-
-Modifier keys DO influence [Keyboard.down()](./puppeteer.keyboard.down.md)<!-- -->. Holding down `Shift` will type the text in upper case.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md)
-
-## Keyboard class
-
-Keyboard provides an api for managing a virtual keyboard. The high level api is [Keyboard.type()](./puppeteer.keyboard.type.md)<!-- -->, which takes raw characters and generates proper keydown, keypress/input, and keyup events on your page.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Keyboard 
-```
-
-## Remarks
-
-For finer control, you can use [Keyboard.down()](./puppeteer.keyboard.down.md)<!-- -->, [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->, and [Keyboard.sendCharacter()](./puppeteer.keyboard.sendcharacter.md) to manually fire events as if they were generated from a real keyboard.
-
-On MacOS, keyboard shortcuts like `⌘ A` -<!-- -->&gt; Select All do not work. See [\#1313](https://github.com/puppeteer/puppeteer/issues/1313)<!-- -->.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Keyboard` class.
-
-## Example 1
-
-An example of holding down `Shift` in order to select and delete some text:
-
-```js
-await page.keyboard.type('Hello World!');
-await page.keyboard.press('ArrowLeft');
-
-await page.keyboard.down('Shift');
-for (let i = 0; i < ' World'.length; i++)
-  await page.keyboard.press('ArrowLeft');
-await page.keyboard.up('Shift');
-
-await page.keyboard.press('Backspace');
-// Result text will end up saying 'Hello!'
-
-```
-
-## Example 2
-
-An example of pressing `A`
-
-```js
-await page.keyboard.down('Shift');
-await page.keyboard.press('KeyA');
-await page.keyboard.up('Shift');
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [down(key, options)](./puppeteer.keyboard.down.md) |  | Dispatches a <code>keydown</code> event. |
-|  [press(key, options)](./puppeteer.keyboard.press.md) |  | Shortcut for [Keyboard.down()](./puppeteer.keyboard.down.md) and [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->. |
-|  [sendCharacter(char)](./puppeteer.keyboard.sendcharacter.md) |  | Dispatches a <code>keypress</code> and <code>input</code> event. This does not send a <code>keydown</code> or <code>keyup</code> event. |
-|  [type(text, options)](./puppeteer.keyboard.type.md) |  | Sends a <code>keydown</code>, <code>keypress</code>/<code>input</code>, and <code>keyup</code> event for each character in the text. |
-|  [up(key)](./puppeteer.keyboard.up.md) |  | Dispatches a <code>keyup</code> event. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.press.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.press.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.press.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.press.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md) &gt; [press](./puppeteer.keyboard.press.md)
-
-## Keyboard.press() method
-
-Shortcut for [Keyboard.down()](./puppeteer.keyboard.down.md) and [Keyboard.up()](./puppeteer.keyboard.up.md)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-press(key: KeyInput, options?: {
-        delay?: number;
-        text?: string;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  key | [KeyInput](./puppeteer.keyinput.md) | Name of key to press, such as <code>ArrowLeft</code>. See [KeyInput](./puppeteer.keyinput.md) for a list of all key names. |
-|  options | { delay?: number; text?: string; } | An object of options. Accepts text which, if specified, generates an input event with this text. Accepts delay which, if specified, is the time to wait between <code>keydown</code> and <code>keyup</code> in milliseconds. Defaults to 0. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-If `key` is a single character and no modifier keys besides `Shift` are being held down, a `keypress`<!-- -->/`input` event will also generated. The `text` option can be specified to force an input event to be generated.
-
-Modifier keys DO effect [Keyboard.press()](./puppeteer.keyboard.press.md)<!-- -->. Holding down `Shift` will type the text in upper case.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.sendcharacter.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.sendcharacter.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.sendcharacter.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.sendcharacter.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md) &gt; [sendCharacter](./puppeteer.keyboard.sendcharacter.md)
-
-## Keyboard.sendCharacter() method
-
-Dispatches a `keypress` and `input` event. This does not send a `keydown` or `keyup` event.
-
-<b>Signature:</b>
-
-```typescript
-sendCharacter(char: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  char | string | Character to send into the page. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-Modifier keys DO NOT effect [Keyboard.sendCharacter](./puppeteer.keyboard.sendcharacter.md)<!-- -->. Holding down `Shift` will not type the text in upper case.
-
-## Example
-
-
-```js
-page.keyboard.sendCharacter('å—¨');
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md) &gt; [type](./puppeteer.keyboard.type.md)
-
-## Keyboard.type() method
-
-Sends a `keydown`<!-- -->, `keypress`<!-- -->/`input`<!-- -->, and `keyup` event for each character in the text.
-
-<b>Signature:</b>
-
-```typescript
-type(text: string, options?: {
-        delay?: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  text | string | A text to type into a focused element. |
-|  options | { delay?: number; } | An object of options. Accepts delay which, if specified, is the time to wait between <code>keydown</code> and <code>keyup</code> in milliseconds. Defaults to 0. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-To press a special key, like `Control` or `ArrowDown`<!-- -->, use [Keyboard.press()](./puppeteer.keyboard.press.md)<!-- -->.
-
-Modifier keys DO NOT effect `keyboard.type`<!-- -->. Holding down `Shift` will not type the text in upper case.
-
-## Example
-
-
-```js
-await page.keyboard.type('Hello'); // Types instantly
-await page.keyboard.type('World', {delay: 100}); // Types slower, like a user
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.up.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.up.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.up.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyboard.up.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Keyboard](./puppeteer.keyboard.md) &gt; [up](./puppeteer.keyboard.up.md)
-
-## Keyboard.up() method
-
-Dispatches a `keyup` event.
-
-<b>Signature:</b>
-
-```typescript
-up(key: KeyInput): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  key | [KeyInput](./puppeteer.keyinput.md) | Name of key to release, such as <code>ArrowLeft</code>. See [KeyInput](./puppeteer.keyinput.md) for a list of all key names. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyinput.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyinput.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.keyinput.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.keyinput.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [KeyInput](./puppeteer.keyinput.md)
-
-## KeyInput type
-
-All the valid keys that can be passed to functions that take user input, such as [keyboard.press](./puppeteer.keyboard.press.md)
-
-<b>Signature:</b>
-
-```typescript
-export declare type KeyInput = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' | 'Power' | 'Eject' | 'Abort' | 'Help' | 'Backspace' | 'Tab' | 'Numpad5' | 'NumpadEnter' | 'Enter' | '\r' | '\n' | 'ShiftLeft' | 'ShiftRight' | 'ControlLeft' | 'ControlRight' | 'AltLeft' | 'AltRight' | 'Pause' | 'CapsLock' | 'Escape' | 'Convert' | 'NonConvert' | 'Space' | 'Numpad9' | 'PageUp' | 'Numpad3' | 'PageDown' | 'End' | 'Numpad1' | 'Home' | 'Numpad7' | 'ArrowLeft' | 'Numpad4' | 'Numpad8' | 'ArrowUp' | 'ArrowRight' | 'Numpad6' | 'Numpad2' | 'ArrowDown' | 'Select' | 'Open' | 'PrintScreen' | 'Insert' | 'Numpad0' | 'Delete' | 'NumpadDecimal' | 'Digit0' | 'Digit1' | 'Digit2' | 'Digit3' | 'Digit4' | 'Digit5' | 'Digit6' | 'Digit7' | 'Digit8' | 'Digit9' | 'KeyA' | 'KeyB' | 'KeyC' | 'KeyD' | 'KeyE' | 'KeyF' | 'KeyG' | 'KeyH' | 'KeyI' | 'KeyJ' | 'KeyK' | 'KeyL' | 'KeyM' | 'KeyN' | 'KeyO' | 'KeyP' | 'KeyQ' | 'KeyR' | 'KeyS' | 'KeyT' | 'KeyU' | 'KeyV' | 'KeyW' | 'KeyX' | 'KeyY' | 'KeyZ' | 'MetaLeft' | 'MetaRight' | 'ContextMenu' | 'NumpadMultiply' | 'NumpadAdd' | 'NumpadSubtract' | 'NumpadDivide' | 'F1' | 'F2' | 'F3' | 'F4' | 'F5' | 'F6' | 'F7' | 'F8' | 'F9' | 'F10' | 'F11' | 'F12' | 'F13' | 'F14' | 'F15' | 'F16' | 'F17' | 'F18' | 'F19' | 'F20' | 'F21' | 'F22' | 'F23' | 'F24' | 'NumLock' | 'ScrollLock' | 'AudioVolumeMute' | 'AudioVolumeDown' | 'AudioVolumeUp' | 'MediaTrackNext' | 'MediaTrackPrevious' | 'MediaStop' | 'MediaPlayPause' | 'Semicolon' | 'Equal' | 'NumpadEqual' | 'Comma' | 'Minus' | 'Period' | 'Slash' | 'Backquote' | 'BracketLeft' | 'Backslash' | 'BracketRight' | 'Quote' | 'AltGraph' | 'Props' | 'Cancel' | 'Clear' | 'Shift' | 'Control' | 'Alt' | 'Accept' | 'ModeChange' | ' ' | 'Print' | 'Execute' | '\u0000' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z' | 'Meta' | '*' | '+' | '-' | '/' | ';' | '=' | ',' | '.' | '`' | '[' | '\\' | ']' | "'" | 'Attn' | 'CrSel' | 'ExSel' | 'EraseEof' | 'Play' | 'ZoomOut' | ')' | '!' | '@' | '#' | '$' | '%' | '^' | '&' | '(' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' | ':' | '<' | '_' | '>' | '?' | '~' | '{' | '|' | '}' | '"' | 'SoftLeft' | 'SoftRight' | 'Camera' | 'Call' | 'EndCall' | 'VolumeDown' | 'VolumeUp';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.dumpio.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.dumpio.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.dumpio.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.dumpio.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [dumpio](./puppeteer.launchoptions.dumpio.md)
-
-## LaunchOptions.dumpio property
-
-<b>Signature:</b>
-
-```typescript
-dumpio?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.env.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.env.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.env.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.env.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [env](./puppeteer.launchoptions.env.md)
-
-## LaunchOptions.env property
-
-<b>Signature:</b>
-
-```typescript
-env?: Record<string, string | undefined>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.executablepath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.executablepath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.executablepath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.executablepath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [executablePath](./puppeteer.launchoptions.executablepath.md)
-
-## LaunchOptions.executablePath property
-
-<b>Signature:</b>
-
-```typescript
-executablePath?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesighup.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesighup.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesighup.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesighup.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [handleSIGHUP](./puppeteer.launchoptions.handlesighup.md)
-
-## LaunchOptions.handleSIGHUP property
-
-<b>Signature:</b>
-
-```typescript
-handleSIGHUP?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigint.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigint.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigint.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigint.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [handleSIGINT](./puppeteer.launchoptions.handlesigint.md)
-
-## LaunchOptions.handleSIGINT property
-
-<b>Signature:</b>
-
-```typescript
-handleSIGINT?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigterm.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigterm.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigterm.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.handlesigterm.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [handleSIGTERM](./puppeteer.launchoptions.handlesigterm.md)
-
-## LaunchOptions.handleSIGTERM property
-
-<b>Signature:</b>
-
-```typescript
-handleSIGTERM?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.ignoredefaultargs.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.ignoredefaultargs.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.ignoredefaultargs.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.ignoredefaultargs.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [ignoreDefaultArgs](./puppeteer.launchoptions.ignoredefaultargs.md)
-
-## LaunchOptions.ignoreDefaultArgs property
-
-<b>Signature:</b>
-
-```typescript
-ignoreDefaultArgs?: boolean | string[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md)
-
-## LaunchOptions interface
-
-Generic launch options that can be passed when launching any browser.
-
-<b>Signature:</b>
-
-```typescript
-export interface LaunchOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [dumpio](./puppeteer.launchoptions.dumpio.md) | boolean |  |
-|  [env](./puppeteer.launchoptions.env.md) | Record&lt;string, string \| undefined&gt; |  |
-|  [executablePath](./puppeteer.launchoptions.executablepath.md) | string |  |
-|  [handleSIGHUP](./puppeteer.launchoptions.handlesighup.md) | boolean |  |
-|  [handleSIGINT](./puppeteer.launchoptions.handlesigint.md) | boolean |  |
-|  [handleSIGTERM](./puppeteer.launchoptions.handlesigterm.md) | boolean |  |
-|  [ignoreDefaultArgs](./puppeteer.launchoptions.ignoredefaultargs.md) | boolean \| string\[\] |  |
-|  [pipe](./puppeteer.launchoptions.pipe.md) | boolean |  |
-|  [timeout](./puppeteer.launchoptions.timeout.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.pipe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.pipe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.pipe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.pipe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [pipe](./puppeteer.launchoptions.pipe.md)
-
-## LaunchOptions.pipe property
-
-<b>Signature:</b>
-
-```typescript
-pipe?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.timeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.timeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.timeout.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.launchoptions.timeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [LaunchOptions](./puppeteer.launchoptions.md) &gt; [timeout](./puppeteer.launchoptions.timeout.md)
-
-## LaunchOptions.timeout property
-
-<b>Signature:</b>
-
-```typescript
-timeout?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md)
-
-## puppeteer package
-
-## Classes
-
-|  Class | Description |
-|  --- | --- |
-|  [Accessibility](./puppeteer.accessibility.md) | The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or [switches](https://en.wikipedia.org/wiki/Switch_access)<!-- -->. |
-|  [Browser](./puppeteer.browser.md) | A Browser is created when Puppeteer connects to a Chromium instance, either through [Puppeteer.launch()](./puppeteer.puppeteer.launch.md) or [Puppeteer.connect()](./puppeteer.puppeteer.connect.md)<!-- -->. |
-|  [BrowserContext](./puppeteer.browsercontext.md) | BrowserContexts provide a way to operate multiple independent browser sessions. When a browser is launched, it has a single BrowserContext used by default. The method [Browser.newPage](./puppeteer.browser.newpage.md) creates a page in the default browser context. |
-|  [BrowserFetcher](./puppeteer.browserfetcher.md) | BrowserFetcher can download and manage different versions of Chromium and Firefox. |
-|  [CDPSession](./puppeteer.cdpsession.md) | The <code>CDPSession</code> instances are used to talk raw Chrome Devtools Protocol. |
-|  [Connection](./puppeteer.connection.md) |  |
-|  [ConsoleMessage](./puppeteer.consolemessage.md) | ConsoleMessage objects are dispatched by page via the 'console' event. |
-|  [Coverage](./puppeteer.coverage.md) | The Coverage class provides methods to gathers information about parts of JavaScript and CSS that were used by the page. |
-|  [Dialog](./puppeteer.dialog.md) | Dialog instances are dispatched by the [Page](./puppeteer.page.md) via the <code>dialog</code> event. |
-|  [ElementHandle](./puppeteer.elementhandle.md) | ElementHandle represents an in-page DOM element. |
-|  [EventEmitter](./puppeteer.eventemitter.md) | The EventEmitter class that many Puppeteer classes extend. |
-|  [ExecutionContext](./puppeteer.executioncontext.md) | This class represents a context for JavaScript execution. A \[Page\] might have many execution contexts: - each [frame](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe) has "default" execution context that is always created after frame is attached to DOM. This context is returned by the  method. - [Extension](https://developer.chrome.com/extensions)<!-- -->'s content scripts create additional execution contexts.<!-- -->Besides pages, execution contexts can be found in [workers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)<!-- -->. |
-|  [FileChooser](./puppeteer.filechooser.md) | File choosers let you react to the page requesting for a file. |
-|  [Frame](./puppeteer.frame.md) |  |
-|  [FrameManager](./puppeteer.framemanager.md) |  |
-|  [HTTPRequest](./puppeteer.httprequest.md) |  |
-|  [HTTPResponse](./puppeteer.httpresponse.md) | The HTTPResponse class represents responses which are received by the [Page](./puppeteer.page.md) class. |
-|  [JSHandle](./puppeteer.jshandle.md) | Represents an in-page JavaScript object. JSHandles can be created with the [page.evaluateHandle](./puppeteer.page.evaluatehandle.md) method. |
-|  [Keyboard](./puppeteer.keyboard.md) | Keyboard provides an api for managing a virtual keyboard. The high level api is [Keyboard.type()](./puppeteer.keyboard.type.md)<!-- -->, which takes raw characters and generates proper keydown, keypress/input, and keyup events on your page. |
-|  [Mouse](./puppeteer.mouse.md) | The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport. |
-|  [Page](./puppeteer.page.md) | Page provides methods to interact with a single tab or \[extension background page\](https://developer.chrome.com/extensions/background\_pages) in Chromium. One \[Browser\] instance might have multiple \[Page\] instances. |
-|  [Puppeteer](./puppeteer.puppeteer.md) | The main Puppeteer class Puppeteer module provides a method to launch a browser instance. |
-|  [SecurityDetails](./puppeteer.securitydetails.md) | The SecurityDetails class represents the security details of a response that was received over a secure connection. |
-|  [Target](./puppeteer.target.md) |  |
-|  [TimeoutError](./puppeteer.timeouterror.md) | TimeoutError is emitted whenever certain operations are terminated due to timeout. |
-|  [Touchscreen](./puppeteer.touchscreen.md) | The Touchscreen class exposes touchscreen events. |
-|  [Tracing](./puppeteer.tracing.md) | The Tracing class exposes the tracing audit interface. |
-|  [WebWorker](./puppeteer.webworker.md) | The WebWorker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)<!-- -->. |
-
-## Enumerations
-
-|  Enumeration | Description |
-|  --- | --- |
-|  [PageEmittedEvents](./puppeteer.pageemittedevents.md) | All the events that a page instance may emit. |
-
-## Interfaces
-
-|  Interface | Description |
-|  --- | --- |
-|  [BoundingBox](./puppeteer.boundingbox.md) |  |
-|  [BoxModel](./puppeteer.boxmodel.md) |  |
-|  [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) |  |
-|  [BrowserFetcherRevisionInfo](./puppeteer.browserfetcherrevisioninfo.md) |  |
-|  [BrowserOptions](./puppeteer.browseroptions.md) | Generic browser options that can be passed when launching any browser. |
-|  [ChromeArgOptions](./puppeteer.chromeargoptions.md) | Launcher options that only apply to Chrome. |
-|  [ClickOptions](./puppeteer.clickoptions.md) |  |
-|  [ConsoleMessageLocation](./puppeteer.consolemessagelocation.md) |  |
-|  [CoverageEntry](./puppeteer.coverageentry.md) | The CoverageEntry class represents one entry of the coverage report. |
-|  [CSSCoverageOptions](./puppeteer.csscoverageoptions.md) | Set of configurable options for CSS coverage. |
-|  [GeolocationOptions](./puppeteer.geolocationoptions.md) |  |
-|  [JSCoverageOptions](./puppeteer.jscoverageoptions.md) | Set of configurable options for JS coverage. |
-|  [JSONObject](./puppeteer.jsonobject.md) |  |
-|  [LaunchOptions](./puppeteer.launchoptions.md) | Generic launch options that can be passed when launching any browser. |
-|  [Metrics](./puppeteer.metrics.md) |  |
-|  [MouseOptions](./puppeteer.mouseoptions.md) |  |
-|  [PressOptions](./puppeteer.pressoptions.md) |  |
-|  [ProductLauncher](./puppeteer.productlauncher.md) | Describes a launcher - a class that is able to create and launch a browser instance. |
-|  [RemoteAddress](./puppeteer.remoteaddress.md) |  |
-|  [SerializedAXNode](./puppeteer.serializedaxnode.md) | Represents a Node and the properties of it that are relevant to Accessibility. |
-|  [SnapshotOptions](./puppeteer.snapshotoptions.md) |  |
-|  [TracingOptions](./puppeteer.tracingoptions.md) |  |
-|  [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-|  [WaitForTargetOptions](./puppeteer.waitfortargetoptions.md) |  |
-|  [WaitTimeoutOptions](./puppeteer.waittimeoutoptions.md) |  |
-
-## Variables
-
-|  Variable | Description |
-|  --- | --- |
-|  [devicesMap](./puppeteer.devicesmap.md) |  |
-|  [EVALUATION\_SCRIPT\_URL](./puppeteer.evaluation_script_url.md) |  |
-|  [puppeteerErrors](./puppeteer.puppeteererrors.md) |  |
-
-## Type Aliases
-
-|  Type Alias | Description |
-|  --- | --- |
-|  [ConsoleMessageType](./puppeteer.consolemessagetype.md) | The supported types for console messages. |
-|  [DevicesMap](./puppeteer.devicesmap.md) |  |
-|  [EvaluateFn](./puppeteer.evaluatefn.md) |  |
-|  [EvaluateFnReturnType](./puppeteer.evaluatefnreturntype.md) |  |
-|  [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) |  |
-|  [JSONArray](./puppeteer.jsonarray.md) |  |
-|  [KeyInput](./puppeteer.keyinput.md) | All the valid keys that can be passed to functions that take user input, such as [keyboard.press](./puppeteer.keyboard.press.md) |
-|  [MouseButton](./puppeteer.mousebutton.md) |  |
-|  [Platform](./puppeteer.platform.md) | Supported platforms. |
-|  [Product](./puppeteer.product.md) | Supported products. |
-|  [PuppeteerErrors](./puppeteer.puppeteererrors.md) |  |
-|  [Serializable](./puppeteer.serializable.md) |  |
-|  [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md) |  |
-|  [UnwrapElementHandle](./puppeteer.unwrapelementhandle.md) | Unwraps a DOM element out of an ElementHandle instance |
-|  [WrapElementHandle](./puppeteer.wrapelementhandle.md) | Wraps a DOM element into an ElementHandle instance |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.documents.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.documents.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.documents.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.documents.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [Documents](./puppeteer.metrics.documents.md)
-
-## Metrics.Documents property
-
-<b>Signature:</b>
-
-```typescript
-Documents?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.frames.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.frames.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.frames.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.frames.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [Frames](./puppeteer.metrics.frames.md)
-
-## Metrics.Frames property
-
-<b>Signature:</b>
-
-```typescript
-Frames?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jseventlisteners.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jseventlisteners.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jseventlisteners.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jseventlisteners.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [JSEventListeners](./puppeteer.metrics.jseventlisteners.md)
-
-## Metrics.JSEventListeners property
-
-<b>Signature:</b>
-
-```typescript
-JSEventListeners?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheaptotalsize.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheaptotalsize.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheaptotalsize.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheaptotalsize.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [JSHeapTotalSize](./puppeteer.metrics.jsheaptotalsize.md)
-
-## Metrics.JSHeapTotalSize property
-
-<b>Signature:</b>
-
-```typescript
-JSHeapTotalSize?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheapusedsize.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheapusedsize.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheapusedsize.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.jsheapusedsize.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [JSHeapUsedSize](./puppeteer.metrics.jsheapusedsize.md)
-
-## Metrics.JSHeapUsedSize property
-
-<b>Signature:</b>
-
-```typescript
-JSHeapUsedSize?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutcount.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutcount.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutcount.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutcount.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [LayoutCount](./puppeteer.metrics.layoutcount.md)
-
-## Metrics.LayoutCount property
-
-<b>Signature:</b>
-
-```typescript
-LayoutCount?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutduration.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutduration.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutduration.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.layoutduration.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [LayoutDuration](./puppeteer.metrics.layoutduration.md)
-
-## Metrics.LayoutDuration property
-
-<b>Signature:</b>
-
-```typescript
-LayoutDuration?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md)
-
-## Metrics interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface Metrics 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [Documents](./puppeteer.metrics.documents.md) | number |  |
-|  [Frames](./puppeteer.metrics.frames.md) | number |  |
-|  [JSEventListeners](./puppeteer.metrics.jseventlisteners.md) | number |  |
-|  [JSHeapTotalSize](./puppeteer.metrics.jsheaptotalsize.md) | number |  |
-|  [JSHeapUsedSize](./puppeteer.metrics.jsheapusedsize.md) | number |  |
-|  [LayoutCount](./puppeteer.metrics.layoutcount.md) | number |  |
-|  [LayoutDuration](./puppeteer.metrics.layoutduration.md) | number |  |
-|  [Nodes](./puppeteer.metrics.nodes.md) | number |  |
-|  [RecalcStyleCount](./puppeteer.metrics.recalcstylecount.md) | number |  |
-|  [RecalcStyleDuration](./puppeteer.metrics.recalcstyleduration.md) | number |  |
-|  [ScriptDuration](./puppeteer.metrics.scriptduration.md) | number |  |
-|  [TaskDuration](./puppeteer.metrics.taskduration.md) | number |  |
-|  [Timestamp](./puppeteer.metrics.timestamp.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.nodes.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.nodes.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.nodes.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.nodes.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [Nodes](./puppeteer.metrics.nodes.md)
-
-## Metrics.Nodes property
-
-<b>Signature:</b>
-
-```typescript
-Nodes?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstylecount.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstylecount.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstylecount.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstylecount.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [RecalcStyleCount](./puppeteer.metrics.recalcstylecount.md)
-
-## Metrics.RecalcStyleCount property
-
-<b>Signature:</b>
-
-```typescript
-RecalcStyleCount?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstyleduration.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstyleduration.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstyleduration.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.recalcstyleduration.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [RecalcStyleDuration](./puppeteer.metrics.recalcstyleduration.md)
-
-## Metrics.RecalcStyleDuration property
-
-<b>Signature:</b>
-
-```typescript
-RecalcStyleDuration?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.scriptduration.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.scriptduration.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.scriptduration.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.scriptduration.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [ScriptDuration](./puppeteer.metrics.scriptduration.md)
-
-## Metrics.ScriptDuration property
-
-<b>Signature:</b>
-
-```typescript
-ScriptDuration?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.taskduration.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.taskduration.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.taskduration.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.taskduration.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [TaskDuration](./puppeteer.metrics.taskduration.md)
-
-## Metrics.TaskDuration property
-
-<b>Signature:</b>
-
-```typescript
-TaskDuration?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.timestamp.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.timestamp.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.timestamp.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.metrics.timestamp.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Metrics](./puppeteer.metrics.md) &gt; [Timestamp](./puppeteer.metrics.timestamp.md)
-
-## Metrics.Timestamp property
-
-<b>Signature:</b>
-
-```typescript
-Timestamp?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mousebutton.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mousebutton.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mousebutton.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mousebutton.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [MouseButton](./puppeteer.mousebutton.md)
-
-## MouseButton type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type MouseButton = 'left' | 'right' | 'middle';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.click.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.click.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.click.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.click.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Mouse](./puppeteer.mouse.md) &gt; [click](./puppeteer.mouse.click.md)
-
-## Mouse.click() method
-
-Shortcut for `mouse.move`<!-- -->, `mouse.down` and `mouse.up`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-click(x: number, y: number, options?: MouseOptions & {
-        delay?: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  x | number | Horizontal position of the mouse. |
-|  y | number | Vertical position of the mouse. |
-|  options | [MouseOptions](./puppeteer.mouseoptions.md) &amp; { delay?: number; } | Optional <code>MouseOptions</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.down.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.down.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.down.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.down.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Mouse](./puppeteer.mouse.md) &gt; [down](./puppeteer.mouse.down.md)
-
-## Mouse.down() method
-
-Dispatches a `mousedown` event.
-
-<b>Signature:</b>
-
-```typescript
-down(options?: MouseOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [MouseOptions](./puppeteer.mouseoptions.md) | Optional <code>MouseOptions</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Mouse](./puppeteer.mouse.md)
-
-## Mouse class
-
-The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Mouse 
-```
-
-## Remarks
-
-Every `page` object has its own Mouse, accessible with \[`page.mouse`<!-- -->\](\#pagemouse).
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Mouse` class.
-
-## Example 1
-
-
-```js
-// Using ‘page.mouse’ to trace a 100x100 square.
-await page.mouse.move(0, 0);
-await page.mouse.down();
-await page.mouse.move(0, 100);
-await page.mouse.move(100, 100);
-await page.mouse.move(100, 0);
-await page.mouse.move(0, 0);
-await page.mouse.up();
-
-```
-\*\*Note\*\*: The mouse events trigger synthetic `MouseEvent`<!-- -->s. This means that it does not fully replicate the functionality of what a normal user would be able to do with their mouse.
-
-For example, dragging and selecting text is not possible using `page.mouse`<!-- -->. Instead, you can use the [\`DocumentOrShadowRoot.getSelection()\`](https://developer.mozilla.org/en-US/docs/Web/API/DocumentOrShadowRoot/getSelection) functionality implemented in the platform.
-
-## Example 2
-
-For example, if you want to select all content between nodes:
-
-```js
-await page.evaluate((from, to) => {
-  const selection = from.getRootNode().getSelection();
-  const range = document.createRange();
-  range.setStartBefore(from);
-  range.setEndAfter(to);
-  selection.removeAllRanges();
-  selection.addRange(range);
-}, fromJSHandle, toJSHandle);
-
-```
-If you then would want to copy-paste your selection, you can use the clipboard api:
-
-```js
-// The clipboard api does not allow you to copy, unless the tab is focused.
-await page.bringToFront();
-await page.evaluate(() => {
-  // Copy the selected content to the clipboard
-  document.execCommand('copy');
-  // Obtain the content of the clipboard as a string
-  return navigator.clipboard.readText();
-});
-
-```
-\*\*Note\*\*: If you want access to the clipboard API, you have to give it permission to do so:
-
-```js
-await browser.defaultBrowserContext().overridePermissions(
-  '<your origin>', ['clipboard-read', 'clipboard-write']
-);
-
-```
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [click(x, y, options)](./puppeteer.mouse.click.md) |  | Shortcut for <code>mouse.move</code>, <code>mouse.down</code> and <code>mouse.up</code>. |
-|  [down(options)](./puppeteer.mouse.down.md) |  | Dispatches a <code>mousedown</code> event. |
-|  [move(x, y, options)](./puppeteer.mouse.move.md) |  | Dispatches a <code>mousemove</code> event. |
-|  [up(options)](./puppeteer.mouse.up.md) |  | Dispatches a <code>mouseup</code> event. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.move.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.move.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.move.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.move.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Mouse](./puppeteer.mouse.md) &gt; [move](./puppeteer.mouse.move.md)
-
-## Mouse.move() method
-
-Dispatches a `mousemove` event.
-
-<b>Signature:</b>
-
-```typescript
-move(x: number, y: number, options?: {
-        steps?: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  x | number | Horizontal position of the mouse. |
-|  y | number | Vertical position of the mouse. |
-|  options | { steps?: number; } | Optional object. If specified, the <code>steps</code> property sends intermediate <code>mousemove</code> events when set to <code>1</code> (default). |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.button.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.button.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.button.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.button.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [MouseOptions](./puppeteer.mouseoptions.md) &gt; [button](./puppeteer.mouseoptions.button.md)
-
-## MouseOptions.button property
-
-<b>Signature:</b>
-
-```typescript
-button?: MouseButton;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.clickcount.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.clickcount.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.clickcount.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.clickcount.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [MouseOptions](./puppeteer.mouseoptions.md) &gt; [clickCount](./puppeteer.mouseoptions.clickcount.md)
-
-## MouseOptions.clickCount property
-
-<b>Signature:</b>
-
-```typescript
-clickCount?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouseoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [MouseOptions](./puppeteer.mouseoptions.md)
-
-## MouseOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface MouseOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [button](./puppeteer.mouseoptions.button.md) | [MouseButton](./puppeteer.mousebutton.md) |  |
-|  [clickCount](./puppeteer.mouseoptions.clickcount.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.up.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.up.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.up.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.mouse.up.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Mouse](./puppeteer.mouse.md) &gt; [up](./puppeteer.mouse.up.md)
-
-## Mouse.up() method
-
-Dispatches a `mouseup` event.
-
-<b>Signature:</b>
-
-```typescript
-up(options?: MouseOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [MouseOptions](./puppeteer.mouseoptions.md) | Optional <code>MouseOptions</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.accessibility.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.accessibility.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.accessibility.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.accessibility.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [accessibility](./puppeteer.page.accessibility.md)
-
-## Page.accessibility property
-
-<b>Signature:</b>
-
-```typescript
-get accessibility(): Accessibility;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.addscripttag.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.addscripttag.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.addscripttag.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.addscripttag.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [addScriptTag](./puppeteer.page.addscripttag.md)
-
-## Page.addScriptTag() method
-
-<b>Signature:</b>
-
-```typescript
-addScriptTag(options: {
-        url?: string;
-        path?: string;
-        content?: string;
-        type?: string;
-    }): Promise<ElementHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { url?: string; path?: string; content?: string; type?: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.addstyletag.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.addstyletag.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.addstyletag.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.addstyletag.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [addStyleTag](./puppeteer.page.addstyletag.md)
-
-## Page.addStyleTag() method
-
-<b>Signature:</b>
-
-```typescript
-addStyleTag(options: {
-        url?: string;
-        path?: string;
-        content?: string;
-    }): Promise<ElementHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { url?: string; path?: string; content?: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.authenticate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.authenticate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.authenticate.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.authenticate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [authenticate](./puppeteer.page.authenticate.md)
-
-## Page.authenticate() method
-
-<b>Signature:</b>
-
-```typescript
-authenticate(credentials: Credentials): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  credentials | Credentials |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.bringtofront.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.bringtofront.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.bringtofront.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.bringtofront.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [bringToFront](./puppeteer.page.bringtofront.md)
-
-## Page.bringToFront() method
-
-<b>Signature:</b>
-
-```typescript
-bringToFront(): Promise<void>;
-```
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.browsercontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.browsercontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.browsercontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.browsercontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [browserContext](./puppeteer.page.browsercontext.md)
-
-## Page.browserContext() method
-
-<b>Signature:</b>
-
-```typescript
-browserContext(): BrowserContext;
-```
-<b>Returns:</b>
-
-[BrowserContext](./puppeteer.browsercontext.md)
-
-The browser context that the page belongs to
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.browser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.browser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.browser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.browser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [browser](./puppeteer.page.browser.md)
-
-## Page.browser() method
-
-<b>Signature:</b>
-
-```typescript
-browser(): Browser;
-```
-<b>Returns:</b>
-
-[Browser](./puppeteer.browser.md)
-
-The browser this page belongs to.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.click.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.click.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.click.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.click.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [click](./puppeteer.page.click.md)
-
-## Page.click() method
-
-<b>Signature:</b>
-
-```typescript
-click(selector: string, options?: {
-        delay?: number;
-        button?: MouseButton;
-        clickCount?: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  options | { delay?: number; button?: [MouseButton](./puppeteer.mousebutton.md)<!-- -->; clickCount?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.close.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.close.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.close.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.close.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [close](./puppeteer.page.close.md)
-
-## Page.close() method
-
-<b>Signature:</b>
-
-```typescript
-close(options?: {
-        runBeforeUnload?: boolean;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { runBeforeUnload?: boolean; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.content.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.content.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.content.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.content.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [content](./puppeteer.page.content.md)
-
-## Page.content() method
-
-<b>Signature:</b>
-
-```typescript
-content(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.cookies.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.cookies.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.cookies.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.cookies.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [cookies](./puppeteer.page.cookies.md)
-
-## Page.cookies() method
-
-<b>Signature:</b>
-
-```typescript
-cookies(...urls: string[]): Promise<Protocol.Network.Cookie[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  urls | string\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;Protocol.Network.Cookie\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.coverage.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.coverage.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.coverage.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.coverage.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [coverage](./puppeteer.page.coverage.md)
-
-## Page.coverage property
-
-<b>Signature:</b>
-
-```typescript
-get coverage(): Coverage;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.deletecookie.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.deletecookie.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.deletecookie.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.deletecookie.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [deleteCookie](./puppeteer.page.deletecookie.md)
-
-## Page.deleteCookie() method
-
-<b>Signature:</b>
-
-```typescript
-deleteCookie(...cookies: Protocol.Network.deleteCookiesParameters[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  cookies | Protocol.Network.deleteCookiesParameters\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pageemittedevents.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pageemittedevents.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pageemittedevents.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pageemittedevents.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [PageEmittedEvents](./puppeteer.pageemittedevents.md)
-
-## PageEmittedEvents enum
-
-All the events that a page instance may emit.
-
-<b>Signature:</b>
-
-```typescript
-export declare const enum PageEmittedEvents 
-```
-
-## Enumeration Members
-
-|  Member | Value | Description |
-|  --- | --- | --- |
-|  WorkerCreated | <code>&quot;workercreated&quot;</code> | Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned by the page. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulate.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [emulate](./puppeteer.page.emulate.md)
-
-## Page.emulate() method
-
-<b>Signature:</b>
-
-```typescript
-emulate(options: {
-        viewport: Viewport;
-        userAgent: string;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | { viewport: Viewport; userAgent: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediafeatures.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediafeatures.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediafeatures.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediafeatures.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [emulateMediaFeatures](./puppeteer.page.emulatemediafeatures.md)
-
-## Page.emulateMediaFeatures() method
-
-<b>Signature:</b>
-
-```typescript
-emulateMediaFeatures(features?: MediaFeature[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  features | MediaFeature\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediatype.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediatype.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediatype.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatemediatype.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [emulateMediaType](./puppeteer.page.emulatemediatype.md)
-
-## Page.emulateMediaType() method
-
-<b>Signature:</b>
-
-```typescript
-emulateMediaType(type?: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  type | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatetimezone.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatetimezone.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatetimezone.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatetimezone.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [emulateTimezone](./puppeteer.page.emulatetimezone.md)
-
-## Page.emulateTimezone() method
-
-<b>Signature:</b>
-
-```typescript
-emulateTimezone(timezoneId?: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  timezoneId | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatevisiondeficiency.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatevisiondeficiency.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatevisiondeficiency.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.emulatevisiondeficiency.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [emulateVisionDeficiency](./puppeteer.page.emulatevisiondeficiency.md)
-
-## Page.emulateVisionDeficiency() method
-
-<b>Signature:</b>
-
-```typescript
-emulateVisionDeficiency(type?: VisionDeficiency): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  type | VisionDeficiency |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.__eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.__eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.__eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.__eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [$$eval](./puppeteer.page.__eval.md)
-
-## Page.$$eval() method
-
-<b>Signature:</b>
-
-```typescript
-$$eval<ReturnType extends any>(selector: string, pageFunction: EvaluateFn | string, ...args: SerializableOrJSHandle[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  pageFunction | [EvaluateFn](./puppeteer.evaluatefn.md) \| string |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._eval.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._eval.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._eval.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._eval.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [$eval](./puppeteer.page._eval.md)
-
-## Page.$eval() method
-
-This method runs `document.querySelector` within the page and passes the result as the first argument to the `pageFunction`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-$eval<ReturnType>(selector: string, pageFunction: (element: Element, ...args: unknown[]) => ReturnType | Promise<ReturnType>, ...args: SerializableOrJSHandle[]): Promise<WrapElementHandle<ReturnType>>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string | the [selector](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors) to query for |
-|  pageFunction | (element: Element, ...args: unknown\[\]) =&gt; ReturnType \| Promise&lt;ReturnType&gt; | the function to be evaluated in the page context. Will be passed the result of <code>document.querySelector(selector)</code> as its first argument. |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] | any additional arguments to pass through to <code>pageFunction</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;[WrapElementHandle](./puppeteer.wrapelementhandle.md)<!-- -->&lt;ReturnType&gt;&gt;
-
-The result of calling `pageFunction`<!-- -->. If it returns an element it is wrapped in an [ElementHandle](./puppeteer.elementhandle.md)<!-- -->, else the raw value itself is returned.
-
-## Remarks
-
-If no element is found matching `selector`<!-- -->, the method will throw an error.
-
-If `pageFunction` returns a promise `$eval` will wait for the promise to resolve and then return its value.
-
-## Example 1
-
-
-```
-const searchValue = await page.$eval('#search', el => el.value);
-const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
-const html = await page.$eval('.main-container', el => el.outerHTML);
-
-```
-If you are using TypeScript, you may have to provide an explicit type to the first argument of the `pageFunction`<!-- -->. By default it is typed as `Element`<!-- -->, but you may need to provide a more specific sub-type:
-
-## Example 2
-
-
-```
-// if you don't provide HTMLInputElement here, TS will error
-// as `value` is not on `Element`
-const searchValue = await page.$eval('#search', (el: HTMLInputElement) => el.value);
-
-```
-The compiler should be able to infer the return type from the `pageFunction` you provide. If it is unable to, you can use the generic type to tell the compiler what return type you expect from `$eval`<!-- -->:
-
-## Example 3
-
-
-```
-// The compiler can infer the return type in this case, but if it can't
-// or if you want to be more explicit, provide it as the generic type.
-const searchValue = await page.$eval<string>(
- '#search', (el: HTMLInputElement) => el.value
-);
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluatehandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluatehandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluatehandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluatehandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [evaluateHandle](./puppeteer.page.evaluatehandle.md)
-
-## Page.evaluateHandle() method
-
-<b>Signature:</b>
-
-```typescript
-evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<HandlerType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) | a function that is run within the page |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] | arguments to be passed to the pageFunction |
-
-<b>Returns:</b>
-
-Promise&lt;HandlerType&gt;
-
-## Remarks
-
-The only difference between [page.evaluate](./puppeteer.page.evaluate.md) and `page.evaluateHandle` is that `evaluateHandle` will return the value wrapped in an in-page object.
-
-If the function passed to `page.evaluteHandle` returns a Promise, the function will wait for the promise to resolve and return its value.
-
-You can pass a string instead of a function (although functions are recommended as they are easier to debug and use with TypeScript):
-
-## Example 1
-
-
-```
-const aHandle = await page.evaluateHandle('document')
-
-```
-
-## Example 2
-
-[JSHandle](./puppeteer.jshandle.md) instances can be passed as arguments to the `pageFunction`<!-- -->:
-
-```
-const aHandle = await page.evaluateHandle(() => document.body);
-const resultHandle = await page.evaluateHandle(body => body.innerHTML, aHandle);
-console.log(await resultHandle.jsonValue());
-await resultHandle.dispose();
-
-```
-Most of the time this function returns a [JSHandle](./puppeteer.jshandle.md)<!-- -->, but if `pageFunction` returns a reference to an element, you instead get an [ElementHandle](./puppeteer.elementhandle.md) back:
-
-## Example 3
-
-
-```
-const button = await page.evaluateHandle(() => document.querySelector('button'));
-// can call `click` because `button` is an `ElementHandle`
-await button.click();
-
-```
-The TypeScript definitions assume that `evaluateHandle` returns a `JSHandle`<!-- -->, but if you know it's going to return an `ElementHandle`<!-- -->, pass it as the generic argument:
-
-```
-const button = await page.evaluateHandle<ElementHandle>(...);
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluate.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [evaluate](./puppeteer.page.evaluate.md)
-
-## Page.evaluate() method
-
-<b>Signature:</b>
-
-```typescript
-evaluate<ReturnType extends any>(pageFunction: Function | string, ...args: unknown[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string |  |
-|  args | unknown\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluateonnewdocument.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluateonnewdocument.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluateonnewdocument.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.evaluateonnewdocument.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [evaluateOnNewDocument](./puppeteer.page.evaluateonnewdocument.md)
-
-## Page.evaluateOnNewDocument() method
-
-<b>Signature:</b>
-
-```typescript
-evaluateOnNewDocument(pageFunction: Function | string, ...args: unknown[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string |  |
-|  args | unknown\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.exposefunction.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.exposefunction.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.exposefunction.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.exposefunction.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [exposeFunction](./puppeteer.page.exposefunction.md)
-
-## Page.exposeFunction() method
-
-<b>Signature:</b>
-
-```typescript
-exposeFunction(name: string, puppeteerFunction: Function): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  name | string |  |
-|  puppeteerFunction | Function |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.focus.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.focus.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.focus.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.focus.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [focus](./puppeteer.page.focus.md)
-
-## Page.focus() method
-
-<b>Signature:</b>
-
-```typescript
-focus(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.frames.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.frames.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.frames.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.frames.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [frames](./puppeteer.page.frames.md)
-
-## Page.frames() method
-
-<b>Signature:</b>
-
-```typescript
-frames(): Frame[];
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md)<!-- -->\[\]
-
-An array of all frames attached to the page.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goback.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goback.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goback.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goback.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [goBack](./puppeteer.page.goback.md)
-
-## Page.goBack() method
-
-<b>Signature:</b>
-
-```typescript
-goBack(options?: WaitForOptions): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goforward.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goforward.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goforward.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goforward.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [goForward](./puppeteer.page.goforward.md)
-
-## Page.goForward() method
-
-<b>Signature:</b>
-
-```typescript
-goForward(options?: WaitForOptions): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goto.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goto.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.goto.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.goto.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [goto](./puppeteer.page.goto.md)
-
-## Page.goto() method
-
-<b>Signature:</b>
-
-```typescript
-goto(url: string, options?: WaitForOptions & {
-        referer?: string;
-    }): Promise<HTTPResponse>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  url | string |  |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) &amp; { referer?: string; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.hover.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.hover.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.hover.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.hover.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [hover](./puppeteer.page.hover.md)
-
-## Page.hover() method
-
-<b>Signature:</b>
-
-```typescript
-hover(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.isclosed.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.isclosed.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.isclosed.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.isclosed.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [isClosed](./puppeteer.page.isclosed.md)
-
-## Page.isClosed() method
-
-<b>Signature:</b>
-
-```typescript
-isClosed(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.isjavascriptenabled.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.isjavascriptenabled.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.isjavascriptenabled.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.isjavascriptenabled.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [isJavaScriptEnabled](./puppeteer.page.isjavascriptenabled.md)
-
-## Page.isJavaScriptEnabled() method
-
-<b>Signature:</b>
-
-```typescript
-isJavaScriptEnabled(): boolean;
-```
-<b>Returns:</b>
-
-boolean
-
-`true` if the page has JavaScript enabled, `false` otherwise.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.keyboard.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.keyboard.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.keyboard.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.keyboard.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [keyboard](./puppeteer.page.keyboard.md)
-
-## Page.keyboard property
-
-<b>Signature:</b>
-
-```typescript
-get keyboard(): Keyboard;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.mainframe.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.mainframe.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.mainframe.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.mainframe.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [mainFrame](./puppeteer.page.mainframe.md)
-
-## Page.mainFrame() method
-
-<b>Signature:</b>
-
-```typescript
-mainFrame(): Frame;
-```
-<b>Returns:</b>
-
-[Frame](./puppeteer.frame.md)
-
-The page's main frame.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md)
-
-## Page class
-
-Page provides methods to interact with a single tab or \[extension background page\](https://developer.chrome.com/extensions/background\_pages) in Chromium. One \[Browser\] instance might have multiple \[Page\] instances.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Page extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Page` class.
-
-## Example 1
-
-This example creates a page, navigates it to a URL, and then \* saves a screenshot:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://example.com');
-  await page.screenshot({path: 'screenshot.png'});
-  await browser.close();
-})();
-
-```
-The Page class extends from Puppeteer's [EventEmitter](./puppeteer.eventemitter.md) class and will emit various events which are documented in the [PageEmittedEvents](./puppeteer.pageemittedevents.md) enum.
-
-## Example 2
-
-This example logs a message for a single page `load` event:
-
-```js
-page.once('load', () => console.log('Page loaded!'));
-
-```
-To unsubscribe from events use the `off` method:
-
-```js
-function logRequest(interceptedRequest) {
-  console.log('A request was made:', interceptedRequest.url());
-}
-page.on('request', logRequest);
-// Sometime later...
-page.off('request', logRequest);
-
-```
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [accessibility](./puppeteer.page.accessibility.md) |  | [Accessibility](./puppeteer.accessibility.md) |  |
-|  [coverage](./puppeteer.page.coverage.md) |  | [Coverage](./puppeteer.coverage.md) |  |
-|  [keyboard](./puppeteer.page.keyboard.md) |  | [Keyboard](./puppeteer.keyboard.md) |  |
-|  [mouse](./puppeteer.page.mouse.md) |  | [Mouse](./puppeteer.mouse.md) |  |
-|  [touchscreen](./puppeteer.page.touchscreen.md) |  | [Touchscreen](./puppeteer.touchscreen.md) |  |
-|  [tracing](./puppeteer.page.tracing.md) |  | [Tracing](./puppeteer.tracing.md) |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [$(selector)](./puppeteer.page._.md) |  | Runs <code>document.querySelector</code> within the page. If no element matches the selector, the return value resolves to <code>null</code>. |
-|  [$$(selector)](./puppeteer.page.__.md) |  |  |
-|  [$$eval(selector, pageFunction, args)](./puppeteer.page.__eval.md) |  |  |
-|  [$eval(selector, pageFunction, args)](./puppeteer.page._eval.md) |  | This method runs <code>document.querySelector</code> within the page and passes the result as the first argument to the <code>pageFunction</code>. |
-|  [$x(expression)](./puppeteer.page._x.md) |  |  |
-|  [addScriptTag(options)](./puppeteer.page.addscripttag.md) |  |  |
-|  [addStyleTag(options)](./puppeteer.page.addstyletag.md) |  |  |
-|  [authenticate(credentials)](./puppeteer.page.authenticate.md) |  |  |
-|  [bringToFront()](./puppeteer.page.bringtofront.md) |  |  |
-|  [browser()](./puppeteer.page.browser.md) |  |  |
-|  [browserContext()](./puppeteer.page.browsercontext.md) |  |  |
-|  [click(selector, options)](./puppeteer.page.click.md) |  |  |
-|  [close(options)](./puppeteer.page.close.md) |  |  |
-|  [content()](./puppeteer.page.content.md) |  |  |
-|  [cookies(urls)](./puppeteer.page.cookies.md) |  |  |
-|  [deleteCookie(cookies)](./puppeteer.page.deletecookie.md) |  |  |
-|  [emulate(options)](./puppeteer.page.emulate.md) |  |  |
-|  [emulateMediaFeatures(features)](./puppeteer.page.emulatemediafeatures.md) |  |  |
-|  [emulateMediaType(type)](./puppeteer.page.emulatemediatype.md) |  |  |
-|  [emulateTimezone(timezoneId)](./puppeteer.page.emulatetimezone.md) |  |  |
-|  [emulateVisionDeficiency(type)](./puppeteer.page.emulatevisiondeficiency.md) |  |  |
-|  [evaluate(pageFunction, args)](./puppeteer.page.evaluate.md) |  |  |
-|  [evaluateHandle(pageFunction, args)](./puppeteer.page.evaluatehandle.md) |  |  |
-|  [evaluateOnNewDocument(pageFunction, args)](./puppeteer.page.evaluateonnewdocument.md) |  |  |
-|  [exposeFunction(name, puppeteerFunction)](./puppeteer.page.exposefunction.md) |  |  |
-|  [focus(selector)](./puppeteer.page.focus.md) |  |  |
-|  [frames()](./puppeteer.page.frames.md) |  |  |
-|  [goBack(options)](./puppeteer.page.goback.md) |  |  |
-|  [goForward(options)](./puppeteer.page.goforward.md) |  |  |
-|  [goto(url, options)](./puppeteer.page.goto.md) |  |  |
-|  [hover(selector)](./puppeteer.page.hover.md) |  |  |
-|  [isClosed()](./puppeteer.page.isclosed.md) |  |  |
-|  [isJavaScriptEnabled()](./puppeteer.page.isjavascriptenabled.md) |  |  |
-|  [mainFrame()](./puppeteer.page.mainframe.md) |  |  |
-|  [metrics()](./puppeteer.page.metrics.md) |  |  |
-|  [pdf(options)](./puppeteer.page.pdf.md) |  |  |
-|  [queryObjects(prototypeHandle)](./puppeteer.page.queryobjects.md) |  |  |
-|  [reload(options)](./puppeteer.page.reload.md) |  |  |
-|  [screenshot(options)](./puppeteer.page.screenshot.md) |  |  |
-|  [select(selector, values)](./puppeteer.page.select.md) |  |  |
-|  [setBypassCSP(enabled)](./puppeteer.page.setbypasscsp.md) |  |  |
-|  [setCacheEnabled(enabled)](./puppeteer.page.setcacheenabled.md) |  |  |
-|  [setContent(html, options)](./puppeteer.page.setcontent.md) |  |  |
-|  [setCookie(cookies)](./puppeteer.page.setcookie.md) |  |  |
-|  [setDefaultNavigationTimeout(timeout)](./puppeteer.page.setdefaultnavigationtimeout.md) |  |  |
-|  [setDefaultTimeout(timeout)](./puppeteer.page.setdefaulttimeout.md) |  |  |
-|  [setExtraHTTPHeaders(headers)](./puppeteer.page.setextrahttpheaders.md) |  |  |
-|  [setGeolocation(options)](./puppeteer.page.setgeolocation.md) |  | Sets the page's geolocation. |
-|  [setJavaScriptEnabled(enabled)](./puppeteer.page.setjavascriptenabled.md) |  |  |
-|  [setOfflineMode(enabled)](./puppeteer.page.setofflinemode.md) |  |  |
-|  [setRequestInterception(value)](./puppeteer.page.setrequestinterception.md) |  |  |
-|  [setUserAgent(userAgent)](./puppeteer.page.setuseragent.md) |  |  |
-|  [setViewport(viewport)](./puppeteer.page.setviewport.md) |  |  |
-|  [tap(selector)](./puppeteer.page.tap.md) |  |  |
-|  [target()](./puppeteer.page.target.md) |  |  |
-|  [title()](./puppeteer.page.title.md) |  |  |
-|  [type(selector, text, options)](./puppeteer.page.type.md) |  |  |
-|  [url()](./puppeteer.page.url.md) |  |  |
-|  [viewport()](./puppeteer.page.viewport.md) |  |  |
-|  [waitFor(selectorOrFunctionOrTimeout, options, args)](./puppeteer.page.waitfor.md) |  |  |
-|  [waitForFileChooser(options)](./puppeteer.page.waitforfilechooser.md) |  |  |
-|  [waitForFunction(pageFunction, options, args)](./puppeteer.page.waitforfunction.md) |  |  |
-|  [waitForNavigation(options)](./puppeteer.page.waitfornavigation.md) |  |  |
-|  [waitForRequest(urlOrPredicate, options)](./puppeteer.page.waitforrequest.md) |  |  |
-|  [waitForResponse(urlOrPredicate, options)](./puppeteer.page.waitforresponse.md) |  |  |
-|  [waitForSelector(selector, options)](./puppeteer.page.waitforselector.md) |  |  |
-|  [waitForXPath(xpath, options)](./puppeteer.page.waitforxpath.md) |  |  |
-|  [workers()](./puppeteer.page.workers.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.__.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.__.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.__.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.__.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [$$](./puppeteer.page.__.md)
-
-## Page.$$() method
-
-<b>Signature:</b>
-
-```typescript
-$$(selector: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [$](./puppeteer.page._.md)
-
-## Page.$() method
-
-Runs `document.querySelector` within the page. If no element matches the selector, the return value resolves to `null`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-$(selector: string): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string | A [selector](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors) to query page for. |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
-## Remarks
-
-Shortcut for [Page.mainFrame().$(selector)](./puppeteer.frame._.md)<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.metrics.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.metrics.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.metrics.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.metrics.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [metrics](./puppeteer.page.metrics.md)
-
-## Page.metrics() method
-
-<b>Signature:</b>
-
-```typescript
-metrics(): Promise<Metrics>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Metrics](./puppeteer.metrics.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.mouse.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.mouse.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.mouse.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.mouse.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [mouse](./puppeteer.page.mouse.md)
-
-## Page.mouse property
-
-<b>Signature:</b>
-
-```typescript
-get mouse(): Mouse;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.pdf.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.pdf.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.pdf.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.pdf.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [pdf](./puppeteer.page.pdf.md)
-
-## Page.pdf() method
-
-<b>Signature:</b>
-
-```typescript
-pdf(options?: PDFOptions): Promise<Buffer>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | PDFOptions |  |
-
-<b>Returns:</b>
-
-Promise&lt;Buffer&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.queryobjects.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.queryobjects.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.queryobjects.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.queryobjects.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [queryObjects](./puppeteer.page.queryobjects.md)
-
-## Page.queryObjects() method
-
-<b>Signature:</b>
-
-```typescript
-queryObjects(prototypeHandle: JSHandle): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  prototypeHandle | [JSHandle](./puppeteer.jshandle.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.reload.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.reload.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.reload.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.reload.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [reload](./puppeteer.page.reload.md)
-
-## Page.reload() method
-
-<b>Signature:</b>
-
-```typescript
-reload(options?: WaitForOptions): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.screenshot.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.screenshot.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.screenshot.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.screenshot.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [screenshot](./puppeteer.page.screenshot.md)
-
-## Page.screenshot() method
-
-<b>Signature:</b>
-
-```typescript
-screenshot(options?: ScreenshotOptions): Promise<Buffer | string | void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | ScreenshotOptions |  |
-
-<b>Returns:</b>
-
-Promise&lt;Buffer \| string \| void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.select.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.select.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.select.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.select.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [select](./puppeteer.page.select.md)
-
-## Page.select() method
-
-<b>Signature:</b>
-
-```typescript
-select(selector: string, ...values: string[]): Promise<string[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  values | string\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;string\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setbypasscsp.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setbypasscsp.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setbypasscsp.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setbypasscsp.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setBypassCSP](./puppeteer.page.setbypasscsp.md)
-
-## Page.setBypassCSP() method
-
-<b>Signature:</b>
-
-```typescript
-setBypassCSP(enabled: boolean): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  enabled | boolean |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcacheenabled.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcacheenabled.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcacheenabled.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcacheenabled.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setCacheEnabled](./puppeteer.page.setcacheenabled.md)
-
-## Page.setCacheEnabled() method
-
-<b>Signature:</b>
-
-```typescript
-setCacheEnabled(enabled?: boolean): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  enabled | boolean |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcontent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcontent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcontent.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcontent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setContent](./puppeteer.page.setcontent.md)
-
-## Page.setContent() method
-
-<b>Signature:</b>
-
-```typescript
-setContent(html: string, options?: WaitForOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  html | string |  |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcookie.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcookie.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcookie.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setcookie.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setCookie](./puppeteer.page.setcookie.md)
-
-## Page.setCookie() method
-
-<b>Signature:</b>
-
-```typescript
-setCookie(...cookies: Protocol.Network.CookieParam[]): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  cookies | Protocol.Network.CookieParam\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaultnavigationtimeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaultnavigationtimeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaultnavigationtimeout.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaultnavigationtimeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setDefaultNavigationTimeout](./puppeteer.page.setdefaultnavigationtimeout.md)
-
-## Page.setDefaultNavigationTimeout() method
-
-<b>Signature:</b>
-
-```typescript
-setDefaultNavigationTimeout(timeout: number): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  timeout | number | Maximum navigation time in milliseconds. |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaulttimeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaulttimeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaulttimeout.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setdefaulttimeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setDefaultTimeout](./puppeteer.page.setdefaulttimeout.md)
-
-## Page.setDefaultTimeout() method
-
-<b>Signature:</b>
-
-```typescript
-setDefaultTimeout(timeout: number): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  timeout | number | Maximum time in milliseconds. |
-
-<b>Returns:</b>
-
-void
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setextrahttpheaders.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setextrahttpheaders.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setextrahttpheaders.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setextrahttpheaders.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setExtraHTTPHeaders](./puppeteer.page.setextrahttpheaders.md)
-
-## Page.setExtraHTTPHeaders() method
-
-<b>Signature:</b>
-
-```typescript
-setExtraHTTPHeaders(headers: Record<string, string>): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  headers | Record&lt;string, string&gt; |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setgeolocation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setgeolocation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setgeolocation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setgeolocation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setGeolocation](./puppeteer.page.setgeolocation.md)
-
-## Page.setGeolocation() method
-
-Sets the page's geolocation.
-
-<b>Signature:</b>
-
-```typescript
-setGeolocation(options: GeolocationOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [GeolocationOptions](./puppeteer.geolocationoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-Consider using [BrowserContext.overridePermissions()](./puppeteer.browsercontext.overridepermissions.md) to grant permissions for the page to read its geolocation.
-
-## Example
-
-
-```js
-await page.setGeolocation({latitude: 59.95, longitude: 30.31667});
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setjavascriptenabled.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setjavascriptenabled.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setjavascriptenabled.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setjavascriptenabled.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setJavaScriptEnabled](./puppeteer.page.setjavascriptenabled.md)
-
-## Page.setJavaScriptEnabled() method
-
-<b>Signature:</b>
-
-```typescript
-setJavaScriptEnabled(enabled: boolean): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  enabled | boolean |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setofflinemode.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setofflinemode.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setofflinemode.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setofflinemode.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setOfflineMode](./puppeteer.page.setofflinemode.md)
-
-## Page.setOfflineMode() method
-
-<b>Signature:</b>
-
-```typescript
-setOfflineMode(enabled: boolean): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  enabled | boolean | When <code>true</code>, enables offline mode for the page. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setrequestinterception.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setrequestinterception.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setrequestinterception.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setrequestinterception.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setRequestInterception](./puppeteer.page.setrequestinterception.md)
-
-## Page.setRequestInterception() method
-
-<b>Signature:</b>
-
-```typescript
-setRequestInterception(value: boolean): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  value | boolean | Whether to enable request interception. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-Activating request interception enables [HTTPRequest.abort()](./puppeteer.httprequest.abort.md)<!-- -->, [HTTPRequest.continue()](./puppeteer.httprequest.continue.md) and [HTTPRequest.respond()](./puppeteer.httprequest.respond.md) methods. This provides the capability to modify network requests that are made by a page.
-
-Once request interception is enabled, every request will stall unless it's continued, responded or aborted.
-
-\*\*NOTE\*\* Enabling request interception disables page caching.
-
-## Example
-
-An example of a naïve request interceptor that aborts all image requests:
-
-```js
-const puppeteer = require('puppeteer');
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.setRequestInterception(true);
-  page.on('request', interceptedRequest => {
-    if (interceptedRequest.url().endsWith('.png') ||
-        interceptedRequest.url().endsWith('.jpg'))
-      interceptedRequest.abort();
-    else
-      interceptedRequest.continue();
-    });
-  await page.goto('https://example.com');
-  await browser.close();
-})();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setuseragent.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setuseragent.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setuseragent.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setuseragent.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setUserAgent](./puppeteer.page.setuseragent.md)
-
-## Page.setUserAgent() method
-
-<b>Signature:</b>
-
-```typescript
-setUserAgent(userAgent: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  userAgent | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setviewport.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setviewport.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.setviewport.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.setviewport.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [setViewport](./puppeteer.page.setviewport.md)
-
-## Page.setViewport() method
-
-<b>Signature:</b>
-
-```typescript
-setViewport(viewport: Viewport): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  viewport | Viewport |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.tap.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.tap.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.tap.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.tap.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [tap](./puppeteer.page.tap.md)
-
-## Page.tap() method
-
-<b>Signature:</b>
-
-```typescript
-tap(selector: string): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.target.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.target.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.target.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.target.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [target](./puppeteer.page.target.md)
-
-## Page.target() method
-
-<b>Signature:</b>
-
-```typescript
-target(): Target;
-```
-<b>Returns:</b>
-
-[Target](./puppeteer.target.md)
-
-A target this page was created from.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.title.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.title.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.title.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.title.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [title](./puppeteer.page.title.md)
-
-## Page.title() method
-
-<b>Signature:</b>
-
-```typescript
-title(): Promise<string>;
-```
-<b>Returns:</b>
-
-Promise&lt;string&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.touchscreen.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.touchscreen.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.touchscreen.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.touchscreen.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [touchscreen](./puppeteer.page.touchscreen.md)
-
-## Page.touchscreen property
-
-<b>Signature:</b>
-
-```typescript
-get touchscreen(): Touchscreen;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.tracing.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.tracing.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.tracing.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.tracing.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [tracing](./puppeteer.page.tracing.md)
-
-## Page.tracing property
-
-<b>Signature:</b>
-
-```typescript
-get tracing(): Tracing;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [type](./puppeteer.page.type.md)
-
-## Page.type() method
-
-<b>Signature:</b>
-
-```typescript
-type(selector: string, text: string, options?: {
-        delay: number;
-    }): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  text | string |  |
-|  options | { delay: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [url](./puppeteer.page.url.md)
-
-## Page.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.viewport.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.viewport.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.viewport.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.viewport.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [viewport](./puppeteer.page.viewport.md)
-
-## Page.viewport() method
-
-<b>Signature:</b>
-
-```typescript
-viewport(): Viewport | null;
-```
-<b>Returns:</b>
-
-Viewport \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfilechooser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfilechooser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfilechooser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfilechooser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForFileChooser](./puppeteer.page.waitforfilechooser.md)
-
-## Page.waitForFileChooser() method
-
-<b>Signature:</b>
-
-```typescript
-waitForFileChooser(options?: WaitTimeoutOptions): Promise<FileChooser>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [WaitTimeoutOptions](./puppeteer.waittimeoutoptions.md) | Optional waiting parameters |
-
-<b>Returns:</b>
-
-Promise&lt;[FileChooser](./puppeteer.filechooser.md)<!-- -->&gt;
-
-Resolves after a page requests a file picker.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfunction.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfunction.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfunction.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforfunction.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForFunction](./puppeteer.page.waitforfunction.md)
-
-## Page.waitForFunction() method
-
-<b>Signature:</b>
-
-```typescript
-waitForFunction(pageFunction: Function | string, options?: {
-        timeout?: number;
-        polling?: string | number;
-    }, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string |  |
-|  options | { timeout?: number; polling?: string \| number; } |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfor.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfor.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfor.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfor.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitFor](./puppeteer.page.waitfor.md)
-
-## Page.waitFor() method
-
-<b>Signature:</b>
-
-```typescript
-waitFor(selectorOrFunctionOrTimeout: string | number | Function, options?: {
-        visible?: boolean;
-        hidden?: boolean;
-        timeout?: number;
-        polling?: string | number;
-    }, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selectorOrFunctionOrTimeout | string \| number \| Function |  |
-|  options | { visible?: boolean; hidden?: boolean; timeout?: number; polling?: string \| number; } |  |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] |  |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfornavigation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfornavigation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfornavigation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitfornavigation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForNavigation](./puppeteer.page.waitfornavigation.md)
-
-## Page.waitForNavigation() method
-
-<b>Signature:</b>
-
-```typescript
-waitForNavigation(options?: WaitForOptions): Promise<HTTPResponse | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [WaitForOptions](./puppeteer.waitforoptions.md) |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforrequest.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforrequest.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforrequest.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforrequest.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForRequest](./puppeteer.page.waitforrequest.md)
-
-## Page.waitForRequest() method
-
-<b>Signature:</b>
-
-```typescript
-waitForRequest(urlOrPredicate: string | Function, options?: {
-        timeout?: number;
-    }): Promise<HTTPRequest>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  urlOrPredicate | string \| Function |  |
-|  options | { timeout?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPRequest](./puppeteer.httprequest.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforresponse.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforresponse.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforresponse.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforresponse.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForResponse](./puppeteer.page.waitforresponse.md)
-
-## Page.waitForResponse() method
-
-<b>Signature:</b>
-
-```typescript
-waitForResponse(urlOrPredicate: string | Function, options?: {
-        timeout?: number;
-    }): Promise<HTTPResponse>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  urlOrPredicate | string \| Function |  |
-|  options | { timeout?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[HTTPResponse](./puppeteer.httpresponse.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforselector.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforselector.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforselector.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforselector.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForSelector](./puppeteer.page.waitforselector.md)
-
-## Page.waitForSelector() method
-
-<b>Signature:</b>
-
-```typescript
-waitForSelector(selector: string, options?: {
-        visible?: boolean;
-        hidden?: boolean;
-        timeout?: number;
-    }): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  selector | string |  |
-|  options | { visible?: boolean; hidden?: boolean; timeout?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforxpath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforxpath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforxpath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.waitforxpath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [waitForXPath](./puppeteer.page.waitforxpath.md)
-
-## Page.waitForXPath() method
-
-<b>Signature:</b>
-
-```typescript
-waitForXPath(xpath: string, options?: {
-        visible?: boolean;
-        hidden?: boolean;
-        timeout?: number;
-    }): Promise<ElementHandle | null>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  xpath | string |  |
-|  options | { visible?: boolean; hidden?: boolean; timeout?: number; } |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.workers.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.workers.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page.workers.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page.workers.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [workers](./puppeteer.page.workers.md)
-
-## Page.workers() method
-
-<b>Signature:</b>
-
-```typescript
-workers(): WebWorker[];
-```
-<b>Returns:</b>
-
-[WebWorker](./puppeteer.webworker.md)<!-- -->\[\]
-
-all of the dedicated [WebWorkers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) associated with the page.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._x.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._x.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.page._x.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.page._x.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Page](./puppeteer.page.md) &gt; [$x](./puppeteer.page._x.md)
-
-## Page.$x() method
-
-<b>Signature:</b>
-
-```typescript
-$x(expression: string): Promise<ElementHandle[]>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  expression | string |  |
-
-<b>Returns:</b>
-
-Promise&lt;[ElementHandle](./puppeteer.elementhandle.md)<!-- -->\[\]&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.platform.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.platform.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.platform.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.platform.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Platform](./puppeteer.platform.md)
-
-## Platform type
-
-Supported platforms.
-
-<b>Signature:</b>
-
-```typescript
-export declare type Platform = 'linux' | 'mac' | 'win32' | 'win64';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.delay.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.delay.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.delay.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.delay.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [PressOptions](./puppeteer.pressoptions.md) &gt; [delay](./puppeteer.pressoptions.delay.md)
-
-## PressOptions.delay property
-
-Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
-
-<b>Signature:</b>
-
-```typescript
-delay?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [PressOptions](./puppeteer.pressoptions.md)
-
-## PressOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface PressOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [delay](./puppeteer.pressoptions.delay.md) | number | Time to wait between <code>keydown</code> and <code>keyup</code> in milliseconds. Defaults to 0. |
-|  [text](./puppeteer.pressoptions.text.md) | string | If specified, generates an input event with this text. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.text.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.text.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.text.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.pressoptions.text.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [PressOptions](./puppeteer.pressoptions.md) &gt; [text](./puppeteer.pressoptions.text.md)
-
-## PressOptions.text property
-
-If specified, generates an input event with this text.
-
-<b>Signature:</b>
-
-```typescript
-text?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.connect.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.connect.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.connect.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.connect.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md) &gt; [connect](./puppeteer.productlauncher.connect.md)
-
-## ProductLauncher.connect() method
-
-<b>Signature:</b>
-
-```typescript
-connect(object: any): any;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  object | any |  |
-
-<b>Returns:</b>
-
-any
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.defaultargs.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.defaultargs.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.defaultargs.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.defaultargs.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md) &gt; [defaultArgs](./puppeteer.productlauncher.defaultargs.md)
-
-## ProductLauncher.defaultArgs() method
-
-<b>Signature:</b>
-
-```typescript
-defaultArgs(object: any): any;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  object | any |  |
-
-<b>Returns:</b>
-
-any
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.executablepath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.executablepath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.executablepath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.executablepath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md) &gt; [executablePath](./puppeteer.productlauncher.executablepath.md)
-
-## ProductLauncher.executablePath property
-
-<b>Signature:</b>
-
-```typescript
-executablePath: () => string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.launch.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.launch.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.launch.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.launch.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md) &gt; [launch](./puppeteer.productlauncher.launch.md)
-
-## ProductLauncher.launch() method
-
-<b>Signature:</b>
-
-```typescript
-launch(object: any): any;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  object | any |  |
-
-<b>Returns:</b>
-
-any
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md)
-
-## ProductLauncher interface
-
-Describes a launcher - a class that is able to create and launch a browser instance.
-
-<b>Signature:</b>
-
-```typescript
-export interface ProductLauncher 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [executablePath](./puppeteer.productlauncher.executablepath.md) | () =&gt; string |  |
-|  [product](./puppeteer.productlauncher.product.md) | string |  |
-
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [connect(object)](./puppeteer.productlauncher.connect.md) |  |
-|  [defaultArgs(object)](./puppeteer.productlauncher.defaultargs.md) |  |
-|  [launch(object)](./puppeteer.productlauncher.launch.md) |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.product.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.productlauncher.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [ProductLauncher](./puppeteer.productlauncher.md) &gt; [product](./puppeteer.productlauncher.product.md)
-
-## ProductLauncher.product property
-
-<b>Signature:</b>
-
-```typescript
-product: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.product.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Product](./puppeteer.product.md)
-
-## Product type
-
-Supported products.
-
-<b>Signature:</b>
-
-```typescript
-export declare type Product = 'chrome' | 'firefox';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._changedproduct.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._changedproduct.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._changedproduct.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._changedproduct.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [\_changedProduct](./puppeteer.puppeteer._changedproduct.md)
-
-## Puppeteer.\_changedProduct property
-
-<b>Signature:</b>
-
-```typescript
-_changedProduct: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.connect.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.connect.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.connect.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.connect.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [connect](./puppeteer.puppeteer.connect.md)
-
-## Puppeteer.connect() method
-
-This method attaches Puppeteer to an existing browser instance.
-
-<b>Signature:</b>
-
-```typescript
-connect(options: BrowserOptions & {
-        browserWSEndpoint?: string;
-        browserURL?: string;
-        transport?: ConnectionTransport;
-        product?: string;
-    }): Promise<Browser>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [BrowserOptions](./puppeteer.browseroptions.md) &amp; { browserWSEndpoint?: string; browserURL?: string; transport?: ConnectionTransport; product?: string; } | Set of configurable options to set on the browser. |
-
-<b>Returns:</b>
-
-Promise&lt;[Browser](./puppeteer.browser.md)<!-- -->&gt;
-
-Promise which resolves to browser instance.
-
-## Remarks
-
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.createbrowserfetcher.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.createbrowserfetcher.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.createbrowserfetcher.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.createbrowserfetcher.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [createBrowserFetcher](./puppeteer.puppeteer.createbrowserfetcher.md)
-
-## Puppeteer.createBrowserFetcher() method
-
-<b>Signature:</b>
-
-```typescript
-createBrowserFetcher(options: BrowserFetcherOptions): BrowserFetcher;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [BrowserFetcherOptions](./puppeteer.browserfetcheroptions.md) | Set of configurable options to specify the settings of the BrowserFetcher. |
-
-<b>Returns:</b>
-
-[BrowserFetcher](./puppeteer.browserfetcher.md)
-
-A new BrowserFetcher instance.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.defaultargs.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.defaultargs.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.defaultargs.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.defaultargs.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [defaultArgs](./puppeteer.puppeteer.defaultargs.md)
-
-## Puppeteer.defaultArgs() method
-
-<b>Signature:</b>
-
-```typescript
-defaultArgs(options?: ChromeArgOptions): string[];
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [ChromeArgOptions](./puppeteer.chromeargoptions.md) | Set of configurable options to set on the browser. |
-
-<b>Returns:</b>
-
-string\[\]
-
-The default flags that Chromium will be launched with.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.devices.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.devices.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.devices.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.devices.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [devices](./puppeteer.puppeteer.devices.md)
-
-## Puppeteer.devices property
-
-<b>Signature:</b>
-
-```typescript
-get devices(): DevicesMap;
-```
-
-## Remarks
-
-
-## Example
-
-
-```js
-const puppeteer = require('puppeteer');
-const iPhone = puppeteer.devices['iPhone 6'];
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.emulate(iPhone);
-  await page.goto('https://www.google.com');
-  // other actions...
-  await browser.close();
-})();
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.errors.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.errors.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.errors.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.errors.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [errors](./puppeteer.puppeteer.errors.md)
-
-## Puppeteer.errors property
-
-<b>Signature:</b>
-
-```typescript
-get errors(): PuppeteerErrors;
-```
-
-## Remarks
-
-Puppeteer methods might throw errors if they are unable to fulfill a request. For example, `page.waitForSelector(selector[, options])` might fail if the selector doesn't match any nodes during the given timeframe.
-
-For certain types of errors Puppeteer uses specific error classes. These classes are available via `puppeteer.errors`
-
-## Example
-
-An example of handling a timeout error:
-
-```js
-try {
-  await page.waitForSelector('.foo');
-} catch (e) {
-  if (e instanceof puppeteer.errors.TimeoutError) {
-    // Do something if this is a timeout.
-  }
-}
-
-```
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteererrors.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteererrors.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteererrors.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteererrors.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [puppeteerErrors](./puppeteer.puppeteererrors.md)
-
-## puppeteerErrors variable
-
-<b>Signature:</b>
-
-```typescript
-puppeteerErrors: PuppeteerErrors
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.executablepath.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.executablepath.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.executablepath.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.executablepath.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [executablePath](./puppeteer.puppeteer.executablepath.md)
-
-## Puppeteer.executablePath() method
-
-<b>Signature:</b>
-
-```typescript
-executablePath(): string;
-```
-<b>Returns:</b>
-
-string
-
-A path where Puppeteer expects to find the bundled browser. The browser binary might not be there if the download was skipped with the `PUPPETEER_SKIP_DOWNLOAD` environment variable.
-
-## Remarks
-
-\*\*NOTE\*\* `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH` and `PUPPETEER_CHROMIUM_REVISION` environment variables.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._ispuppeteercore.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._ispuppeteercore.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._ispuppeteercore.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._ispuppeteercore.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [\_isPuppeteerCore](./puppeteer.puppeteer._ispuppeteercore.md)
-
-## Puppeteer.\_isPuppeteerCore property
-
-<b>Signature:</b>
-
-```typescript
-_isPuppeteerCore: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.launch.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.launch.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.launch.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.launch.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [launch](./puppeteer.puppeteer.launch.md)
-
-## Puppeteer.launch() method
-
-Launches puppeteer and launches a browser instance with given arguments and options when specified.
-
-<b>Signature:</b>
-
-```typescript
-launch(options?: LaunchOptions & ChromeArgOptions & BrowserOptions & {
-        product?: string;
-        extraPrefsFirefox?: {};
-    }): Promise<Browser>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [LaunchOptions](./puppeteer.launchoptions.md) &amp; [ChromeArgOptions](./puppeteer.chromeargoptions.md) &amp; [BrowserOptions](./puppeteer.browseroptions.md) &amp; { product?: string; extraPrefsFirefox?: {}; } | Set of configurable options to set on the browser. |
-
-<b>Returns:</b>
-
-Promise&lt;[Browser](./puppeteer.browser.md)<!-- -->&gt;
-
-Promise which resolves to browser instance.
-
-## Remarks
-
-
-## Example
-
-You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
-
-```js
-const browser = await puppeteer.launch({
-  ignoreDefaultArgs: ['--mute-audio']
-});
-
-```
-\*\*NOTE\*\* Puppeteer can also be used to control the Chrome browser, but it works best with the version of Chromium it is bundled with. There is no guarantee it will work with any other version. Use `executablePath` option with extreme caution. If Google Chrome (rather than Chromium) is preferred, a [Chrome Canary](https://www.google.com/chrome/browser/canary.html) or [Dev Channel](https://www.chromium.org/getting-involved/dev-channel) build is suggested. In `puppeteer.launch([options])`<!-- -->, any mention of Chromium also applies to Chrome. See [this article](https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/) for a description of the differences between Chromium and Chrome. [This article](https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md) describes some differences for Linux users.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._lazylauncher.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._lazylauncher.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._lazylauncher.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._lazylauncher.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [\_lazyLauncher](./puppeteer.puppeteer._lazylauncher.md)
-
-## Puppeteer.\_lazyLauncher property
-
-<b>Signature:</b>
-
-```typescript
-_lazyLauncher: ProductLauncher;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md)
-
-## Puppeteer class
-
-The main Puppeteer class Puppeteer module provides a method to launch a browser instance.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Puppeteer 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Puppeteer` class.
-
-## Example
-
-The following is a typical example of using Puppeteer to drive automation:
-
-```js
-const puppeteer = require('puppeteer');
-
-(async () => {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
-  await page.goto('https://www.google.com');
-  // other actions...
-  await browser.close();
-})();
-
-```
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_\_productName](./puppeteer.puppeteer.__productname.md) |  | string |  |
-|  [\_changedProduct](./puppeteer.puppeteer._changedproduct.md) |  | boolean |  |
-|  [\_isPuppeteerCore](./puppeteer.puppeteer._ispuppeteercore.md) |  | boolean |  |
-|  [\_lazyLauncher](./puppeteer.puppeteer._lazylauncher.md) |  | [ProductLauncher](./puppeteer.productlauncher.md) |  |
-|  [\_preferredRevision](./puppeteer.puppeteer._preferredrevision.md) |  | string |  |
-|  [devices](./puppeteer.puppeteer.devices.md) |  | [DevicesMap](./puppeteer.devicesmap.md) |  |
-|  [errors](./puppeteer.puppeteer.errors.md) |  | [PuppeteerErrors](./puppeteer.puppeteererrors.md) |  |
-|  [product](./puppeteer.puppeteer.product.md) |  | string |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [connect(options)](./puppeteer.puppeteer.connect.md) |  | This method attaches Puppeteer to an existing browser instance. |
-|  [createBrowserFetcher(options)](./puppeteer.puppeteer.createbrowserfetcher.md) |  |  |
-|  [defaultArgs(options)](./puppeteer.puppeteer.defaultargs.md) |  |  |
-|  [executablePath()](./puppeteer.puppeteer.executablepath.md) |  |  |
-|  [launch(options)](./puppeteer.puppeteer.launch.md) |  | Launches puppeteer and launches a browser instance with given arguments and options when specified. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._preferredrevision.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._preferredrevision.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._preferredrevision.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer._preferredrevision.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [\_preferredRevision](./puppeteer.puppeteer._preferredrevision.md)
-
-## Puppeteer.\_preferredRevision property
-
-<b>Signature:</b>
-
-```typescript
-_preferredRevision: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.product.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.product.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.product.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.product.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [product](./puppeteer.puppeteer.product.md)
-
-## Puppeteer.product property
-
-<b>Signature:</b>
-
-```typescript
-get product(): string;
-```
-
-## Remarks
-
-The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product` option in `puppeteer.launch([options])` and defaults to `chrome`<!-- -->. Firefox support is experimental.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.__productname.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.__productname.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.__productname.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.puppeteer.__productname.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Puppeteer](./puppeteer.puppeteer.md) &gt; [\_\_productName](./puppeteer.puppeteer.__productname.md)
-
-## Puppeteer.\_\_productName property
-
-<b>Signature:</b>
-
-```typescript
-__productName: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.ip.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.ip.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.ip.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.ip.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [RemoteAddress](./puppeteer.remoteaddress.md) &gt; [ip](./puppeteer.remoteaddress.ip.md)
-
-## RemoteAddress.ip property
-
-<b>Signature:</b>
-
-```typescript
-ip: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [RemoteAddress](./puppeteer.remoteaddress.md)
-
-## RemoteAddress interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface RemoteAddress 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [ip](./puppeteer.remoteaddress.ip.md) | string |  |
-|  [port](./puppeteer.remoteaddress.port.md) | number |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.port.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.port.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.port.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.remoteaddress.port.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [RemoteAddress](./puppeteer.remoteaddress.md) &gt; [port](./puppeteer.remoteaddress.port.md)
-
-## RemoteAddress.port property
-
-<b>Signature:</b>
-
-```typescript
-port: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.issuer.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.issuer.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.issuer.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.issuer.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [issuer](./puppeteer.securitydetails.issuer.md)
-
-## SecurityDetails.issuer() method
-
-<b>Signature:</b>
-
-```typescript
-issuer(): string;
-```
-<b>Returns:</b>
-
-string
-
-The name of the issuer of the certificate.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md)
-
-## SecurityDetails class
-
-The SecurityDetails class represents the security details of a response that was received over a secure connection.
-
-<b>Signature:</b>
-
-```typescript
-export declare class SecurityDetails 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SecurityDetails` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [issuer()](./puppeteer.securitydetails.issuer.md) |  |  |
-|  [protocol()](./puppeteer.securitydetails.protocol.md) |  |  |
-|  [subjectAlternativeNames()](./puppeteer.securitydetails.subjectalternativenames.md) |  |  |
-|  [subjectName()](./puppeteer.securitydetails.subjectname.md) |  |  |
-|  [validFrom()](./puppeteer.securitydetails.validfrom.md) |  |  |
-|  [validTo()](./puppeteer.securitydetails.validto.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.protocol.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.protocol.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.protocol.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.protocol.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [protocol](./puppeteer.securitydetails.protocol.md)
-
-## SecurityDetails.protocol() method
-
-<b>Signature:</b>
-
-```typescript
-protocol(): string;
-```
-<b>Returns:</b>
-
-string
-
-The security protocol being used, e.g. "TLS 1.2".
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectalternativenames.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectalternativenames.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectalternativenames.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectalternativenames.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [subjectAlternativeNames](./puppeteer.securitydetails.subjectalternativenames.md)
-
-## SecurityDetails.subjectAlternativeNames() method
-
-<b>Signature:</b>
-
-```typescript
-subjectAlternativeNames(): string[];
-```
-<b>Returns:</b>
-
-string\[\]
-
-The list of [subject alternative names (SANs)](https://en.wikipedia.org/wiki/Subject_Alternative_Name) of the certificate.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectname.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectname.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectname.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.subjectname.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [subjectName](./puppeteer.securitydetails.subjectname.md)
-
-## SecurityDetails.subjectName() method
-
-<b>Signature:</b>
-
-```typescript
-subjectName(): string;
-```
-<b>Returns:</b>
-
-string
-
-The name of the subject to which the certificate was issued.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validfrom.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validfrom.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validfrom.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validfrom.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [validFrom](./puppeteer.securitydetails.validfrom.md)
-
-## SecurityDetails.validFrom() method
-
-<b>Signature:</b>
-
-```typescript
-validFrom(): number;
-```
-<b>Returns:</b>
-
-number
-
-[Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) marking the start of the certificate's validity.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validto.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validto.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validto.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.securitydetails.validto.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SecurityDetails](./puppeteer.securitydetails.md) &gt; [validTo](./puppeteer.securitydetails.validto.md)
-
-## SecurityDetails.validTo() method
-
-<b>Signature:</b>
-
-```typescript
-validTo(): number;
-```
-<b>Returns:</b>
-
-number
-
-[Unix timestamp](https://en.wikipedia.org/wiki/Unix_time) marking the end of the certificate's validity.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializable.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializable.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializable.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializable.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Serializable](./puppeteer.serializable.md)
-
-## Serializable type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type Serializable = number | string | boolean | null | JSONArray | JSONObject;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializableorjshandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializableorjshandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializableorjshandle.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializableorjshandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)
-
-## SerializableOrJSHandle type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type SerializableOrJSHandle = Serializable | JSHandle;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.autocomplete.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.autocomplete.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.autocomplete.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.autocomplete.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [autocomplete](./puppeteer.serializedaxnode.autocomplete.md)
-
-## SerializedAXNode.autocomplete property
-
-<b>Signature:</b>
-
-```typescript
-autocomplete?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.checked.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.checked.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.checked.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.checked.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [checked](./puppeteer.serializedaxnode.checked.md)
-
-## SerializedAXNode.checked property
-
-Whether the checkbox is checked, or in a [mixed state](https://www.w3.org/TR/wai-aria-practices/examples/checkbox/checkbox-2/checkbox-2.html)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-checked?: boolean | 'mixed';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.children.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.children.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.children.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.children.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [children](./puppeteer.serializedaxnode.children.md)
-
-## SerializedAXNode.children property
-
-Children of this node, if there are any.
-
-<b>Signature:</b>
-
-```typescript
-children?: SerializedAXNode[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.description.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.description.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.description.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.description.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [description](./puppeteer.serializedaxnode.description.md)
-
-## SerializedAXNode.description property
-
-An additional human readable description of the node.
-
-<b>Signature:</b>
-
-```typescript
-description?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.disabled.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.disabled.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.disabled.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.disabled.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [disabled](./puppeteer.serializedaxnode.disabled.md)
-
-## SerializedAXNode.disabled property
-
-<b>Signature:</b>
-
-```typescript
-disabled?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.expanded.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.expanded.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.expanded.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.expanded.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [expanded](./puppeteer.serializedaxnode.expanded.md)
-
-## SerializedAXNode.expanded property
-
-<b>Signature:</b>
-
-```typescript
-expanded?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.focused.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.focused.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.focused.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.focused.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [focused](./puppeteer.serializedaxnode.focused.md)
-
-## SerializedAXNode.focused property
-
-<b>Signature:</b>
-
-```typescript
-focused?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.haspopup.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.haspopup.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.haspopup.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.haspopup.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [haspopup](./puppeteer.serializedaxnode.haspopup.md)
-
-## SerializedAXNode.haspopup property
-
-<b>Signature:</b>
-
-```typescript
-haspopup?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.invalid.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.invalid.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.invalid.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.invalid.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [invalid](./puppeteer.serializedaxnode.invalid.md)
-
-## SerializedAXNode.invalid property
-
-Whether and in what way this node's value is invalid.
-
-<b>Signature:</b>
-
-```typescript
-invalid?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.keyshortcuts.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.keyshortcuts.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.keyshortcuts.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.keyshortcuts.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [keyshortcuts](./puppeteer.serializedaxnode.keyshortcuts.md)
-
-## SerializedAXNode.keyshortcuts property
-
-Any keyboard shortcuts associated with this node.
-
-<b>Signature:</b>
-
-```typescript
-keyshortcuts?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.level.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.level.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.level.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.level.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [level](./puppeteer.serializedaxnode.level.md)
-
-## SerializedAXNode.level property
-
-The level of a heading.
-
-<b>Signature:</b>
-
-```typescript
-level?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md)
-
-## SerializedAXNode interface
-
-Represents a Node and the properties of it that are relevant to Accessibility.
-
-<b>Signature:</b>
-
-```typescript
-export interface SerializedAXNode 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [autocomplete](./puppeteer.serializedaxnode.autocomplete.md) | string |  |
-|  [checked](./puppeteer.serializedaxnode.checked.md) | boolean \| 'mixed' | Whether the checkbox is checked, or in a [mixed state](https://www.w3.org/TR/wai-aria-practices/examples/checkbox/checkbox-2/checkbox-2.html)<!-- -->. |
-|  [children](./puppeteer.serializedaxnode.children.md) | [SerializedAXNode](./puppeteer.serializedaxnode.md)<!-- -->\[\] | Children of this node, if there are any. |
-|  [description](./puppeteer.serializedaxnode.description.md) | string | An additional human readable description of the node. |
-|  [disabled](./puppeteer.serializedaxnode.disabled.md) | boolean |  |
-|  [expanded](./puppeteer.serializedaxnode.expanded.md) | boolean |  |
-|  [focused](./puppeteer.serializedaxnode.focused.md) | boolean |  |
-|  [haspopup](./puppeteer.serializedaxnode.haspopup.md) | string |  |
-|  [invalid](./puppeteer.serializedaxnode.invalid.md) | string | Whether and in what way this node's value is invalid. |
-|  [keyshortcuts](./puppeteer.serializedaxnode.keyshortcuts.md) | string | Any keyboard shortcuts associated with this node. |
-|  [level](./puppeteer.serializedaxnode.level.md) | number | The level of a heading. |
-|  [modal](./puppeteer.serializedaxnode.modal.md) | boolean |  |
-|  [multiline](./puppeteer.serializedaxnode.multiline.md) | boolean |  |
-|  [multiselectable](./puppeteer.serializedaxnode.multiselectable.md) | boolean | Whether more than one child can be selected. |
-|  [name](./puppeteer.serializedaxnode.name.md) | string | A human readable name for the node. |
-|  [orientation](./puppeteer.serializedaxnode.orientation.md) | string |  |
-|  [pressed](./puppeteer.serializedaxnode.pressed.md) | boolean \| 'mixed' | Whether the node is checked or in a mixed state. |
-|  [readonly](./puppeteer.serializedaxnode.readonly.md) | boolean |  |
-|  [required](./puppeteer.serializedaxnode.required.md) | boolean |  |
-|  [role](./puppeteer.serializedaxnode.role.md) | string | The [role](https://www.w3.org/TR/wai-aria/#usage_intro) of the node. |
-|  [roledescription](./puppeteer.serializedaxnode.roledescription.md) | string | A human readable alternative to the role. |
-|  [selected](./puppeteer.serializedaxnode.selected.md) | boolean |  |
-|  [value](./puppeteer.serializedaxnode.value.md) | string \| number | The current value of the node. |
-|  [valuemax](./puppeteer.serializedaxnode.valuemax.md) | number |  |
-|  [valuemin](./puppeteer.serializedaxnode.valuemin.md) | number |  |
-|  [valuetext](./puppeteer.serializedaxnode.valuetext.md) | string | A description of the current value. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.modal.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.modal.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.modal.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.modal.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [modal](./puppeteer.serializedaxnode.modal.md)
-
-## SerializedAXNode.modal property
-
-<b>Signature:</b>
-
-```typescript
-modal?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiline.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiline.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiline.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiline.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [multiline](./puppeteer.serializedaxnode.multiline.md)
-
-## SerializedAXNode.multiline property
-
-<b>Signature:</b>
-
-```typescript
-multiline?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiselectable.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiselectable.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiselectable.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.multiselectable.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [multiselectable](./puppeteer.serializedaxnode.multiselectable.md)
-
-## SerializedAXNode.multiselectable property
-
-Whether more than one child can be selected.
-
-<b>Signature:</b>
-
-```typescript
-multiselectable?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.name.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.name.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.name.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.name.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [name](./puppeteer.serializedaxnode.name.md)
-
-## SerializedAXNode.name property
-
-A human readable name for the node.
-
-<b>Signature:</b>
-
-```typescript
-name?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.orientation.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.orientation.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.orientation.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.orientation.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [orientation](./puppeteer.serializedaxnode.orientation.md)
-
-## SerializedAXNode.orientation property
-
-<b>Signature:</b>
-
-```typescript
-orientation?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.pressed.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.pressed.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.pressed.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.pressed.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [pressed](./puppeteer.serializedaxnode.pressed.md)
-
-## SerializedAXNode.pressed property
-
-Whether the node is checked or in a mixed state.
-
-<b>Signature:</b>
-
-```typescript
-pressed?: boolean | 'mixed';
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.readonly.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.readonly.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.readonly.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.readonly.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [readonly](./puppeteer.serializedaxnode.readonly.md)
-
-## SerializedAXNode.readonly property
-
-<b>Signature:</b>
-
-```typescript
-readonly?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.required.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.required.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.required.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.required.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [required](./puppeteer.serializedaxnode.required.md)
-
-## SerializedAXNode.required property
-
-<b>Signature:</b>
-
-```typescript
-required?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.roledescription.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.roledescription.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.roledescription.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.roledescription.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [roledescription](./puppeteer.serializedaxnode.roledescription.md)
-
-## SerializedAXNode.roledescription property
-
-A human readable alternative to the role.
-
-<b>Signature:</b>
-
-```typescript
-roledescription?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.role.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.role.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.role.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.role.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [role](./puppeteer.serializedaxnode.role.md)
-
-## SerializedAXNode.role property
-
-The [role](https://www.w3.org/TR/wai-aria/#usage_intro) of the node.
-
-<b>Signature:</b>
-
-```typescript
-role: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.selected.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.selected.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.selected.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.selected.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [selected](./puppeteer.serializedaxnode.selected.md)
-
-## SerializedAXNode.selected property
-
-<b>Signature:</b>
-
-```typescript
-selected?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemax.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemax.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemax.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemax.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [valuemax](./puppeteer.serializedaxnode.valuemax.md)
-
-## SerializedAXNode.valuemax property
-
-<b>Signature:</b>
-
-```typescript
-valuemax?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.value.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.value.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.value.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.value.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [value](./puppeteer.serializedaxnode.value.md)
-
-## SerializedAXNode.value property
-
-The current value of the node.
-
-<b>Signature:</b>
-
-```typescript
-value?: string | number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemin.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemin.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemin.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuemin.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [valuemin](./puppeteer.serializedaxnode.valuemin.md)
-
-## SerializedAXNode.valuemin property
-
-<b>Signature:</b>
-
-```typescript
-valuemin?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuetext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuetext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuetext.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.serializedaxnode.valuetext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SerializedAXNode](./puppeteer.serializedaxnode.md) &gt; [valuetext](./puppeteer.serializedaxnode.valuetext.md)
-
-## SerializedAXNode.valuetext property
-
-A description of the current value.
-
-<b>Signature:</b>
-
-```typescript
-valuetext?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.interestingonly.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.interestingonly.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.interestingonly.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.interestingonly.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SnapshotOptions](./puppeteer.snapshotoptions.md) &gt; [interestingOnly](./puppeteer.snapshotoptions.interestingonly.md)
-
-## SnapshotOptions.interestingOnly property
-
-Prune unintersting nodes from the tree.
-
-<b>Signature:</b>
-
-```typescript
-interestingOnly?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SnapshotOptions](./puppeteer.snapshotoptions.md)
-
-## SnapshotOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface SnapshotOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [interestingOnly](./puppeteer.snapshotoptions.interestingonly.md) | boolean | Prune unintersting nodes from the tree. |
-|  [root](./puppeteer.snapshotoptions.root.md) | [ElementHandle](./puppeteer.elementhandle.md) | Prune unintersting nodes from the tree. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.root.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.root.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.root.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.snapshotoptions.root.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [SnapshotOptions](./puppeteer.snapshotoptions.md) &gt; [root](./puppeteer.snapshotoptions.root.md)
-
-## SnapshotOptions.root property
-
-Prune unintersting nodes from the tree.
-
-<b>Signature:</b>
-
-```typescript
-root?: ElementHandle;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.browsercontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.browsercontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.browsercontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.browsercontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [browserContext](./puppeteer.target.browsercontext.md)
-
-## Target.browserContext() method
-
-<b>Signature:</b>
-
-```typescript
-browserContext(): BrowserContext;
-```
-<b>Returns:</b>
-
-[BrowserContext](./puppeteer.browsercontext.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.browser.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.browser.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.browser.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.browser.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [browser](./puppeteer.target.browser.md)
-
-## Target.browser() method
-
-Get the browser the target belongs to.
-
-<b>Signature:</b>
-
-```typescript
-browser(): Browser;
-```
-<b>Returns:</b>
-
-[Browser](./puppeteer.browser.md)
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.createcdpsession.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.createcdpsession.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.createcdpsession.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.createcdpsession.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [createCDPSession](./puppeteer.target.createcdpsession.md)
-
-## Target.createCDPSession() method
-
-Creates a Chrome Devtools Protocol session attached to the target.
-
-<b>Signature:</b>
-
-```typescript
-createCDPSession(): Promise<CDPSession>;
-```
-<b>Returns:</b>
-
-Promise&lt;[CDPSession](./puppeteer.cdpsession.md)<!-- -->&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md)
-
-## Target class
-
-<b>Signature:</b>
-
-```typescript
-export declare class Target 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Target` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [browser()](./puppeteer.target.browser.md) |  | Get the browser the target belongs to. |
-|  [browserContext()](./puppeteer.target.browsercontext.md) |  |  |
-|  [createCDPSession()](./puppeteer.target.createcdpsession.md) |  | Creates a Chrome Devtools Protocol session attached to the target. |
-|  [opener()](./puppeteer.target.opener.md) |  | Get the target that opened this target. Top-level targets return <code>null</code>. |
-|  [page()](./puppeteer.target.page.md) |  | If the target is not of type <code>&quot;page&quot;</code> or <code>&quot;background_page&quot;</code>, returns <code>null</code>. |
-|  [type()](./puppeteer.target.type.md) |  | Identifies what kind of target this is. |
-|  [url()](./puppeteer.target.url.md) |  |  |
-|  [worker()](./puppeteer.target.worker.md) |  | If the target is not of type <code>&quot;service_worker&quot;</code> or <code>&quot;shared_worker&quot;</code>, returns <code>null</code>. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.opener.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.opener.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.opener.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.opener.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [opener](./puppeteer.target.opener.md)
-
-## Target.opener() method
-
-Get the target that opened this target. Top-level targets return `null`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-opener(): Target | null;
-```
-<b>Returns:</b>
-
-[Target](./puppeteer.target.md) \| null
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.page.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.page.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.page.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.page.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [page](./puppeteer.target.page.md)
-
-## Target.page() method
-
-If the target is not of type `"page"` or `"background_page"`<!-- -->, returns `null`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-page(): Promise<Page | null>;
-```
-<b>Returns:</b>
-
-Promise&lt;[Page](./puppeteer.page.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.type.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.type.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.type.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.type.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [type](./puppeteer.target.type.md)
-
-## Target.type() method
-
-Identifies what kind of target this is.
-
-<b>Signature:</b>
-
-```typescript
-type(): 'page' | 'background_page' | 'service_worker' | 'shared_worker' | 'other' | 'browser' | 'webview';
-```
-<b>Returns:</b>
-
-'page' \| 'background\_page' \| 'service\_worker' \| 'shared\_worker' \| 'other' \| 'browser' \| 'webview'
-
-## Remarks
-
-See [docs](https://developer.chrome.com/extensions/background_pages) for more info about background pages.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [url](./puppeteer.target.url.md)
-
-## Target.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.worker.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.worker.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.target.worker.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.target.worker.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Target](./puppeteer.target.md) &gt; [worker](./puppeteer.target.worker.md)
-
-## Target.worker() method
-
-If the target is not of type `"service_worker"` or `"shared_worker"`<!-- -->, returns `null`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-worker(): Promise<WebWorker | null>;
-```
-<b>Returns:</b>
-
-Promise&lt;[WebWorker](./puppeteer.webworker.md) \| null&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.timeouterror.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.timeouterror.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.timeouterror.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.timeouterror.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [TimeoutError](./puppeteer.timeouterror.md)
-
-## TimeoutError class
-
-TimeoutError is emitted whenever certain operations are terminated due to timeout.
-
-<b>Signature:</b>
-
-```typescript
-export declare class TimeoutError extends CustomError 
-```
-<b>Extends:</b> CustomError
-
-## Remarks
-
-Example operations are [page.waitForSelector](./puppeteer.page.waitforselector.md) or [puppeteer.launch](./puppeteer.puppeteer.launch.md)<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Touchscreen](./puppeteer.touchscreen.md)
-
-## Touchscreen class
-
-The Touchscreen class exposes touchscreen events.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Touchscreen 
-```
-
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Touchscreen` class.
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [tap(x, y)](./puppeteer.touchscreen.tap.md) |  | Dispatches a <code>touchstart</code> and <code>touchend</code> event. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.tap.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.tap.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.tap.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.touchscreen.tap.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Touchscreen](./puppeteer.touchscreen.md) &gt; [tap](./puppeteer.touchscreen.tap.md)
-
-## Touchscreen.tap() method
-
-Dispatches a `touchstart` and `touchend` event.
-
-<b>Signature:</b>
-
-```typescript
-tap(x: number, y: number): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  x | number | Horizontal position of the tap. |
-|  y | number | Vertical position of the tap. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._client.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._client.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._client.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._client.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md) &gt; [\_client](./puppeteer.tracing._client.md)
-
-## Tracing.\_client property
-
-<b>Signature:</b>
-
-```typescript
-_client: CDPSession;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md)
-
-## Tracing class
-
-The Tracing class exposes the tracing audit interface.
-
-<b>Signature:</b>
-
-```typescript
-export declare class Tracing 
-```
-
-## Remarks
-
-You can use `tracing.start` and `tracing.stop` to create a trace file which can be opened in Chrome DevTools or [timeline viewer](https://chromedevtools.github.io/timeline-viewer/)<!-- -->.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `Tracing` class.
-
-## Example
-
-
-```js
-await page.tracing.start({path: 'trace.json'});
-await page.goto('https://www.google.com');
-await page.tracing.stop();
-
-```
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_client](./puppeteer.tracing._client.md) |  | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  [\_path](./puppeteer.tracing._path.md) |  | string |  |
-|  [\_recording](./puppeteer.tracing._recording.md) |  | boolean |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [start(options)](./puppeteer.tracing.start.md) |  | Starts a trace for the current page. |
-|  [stop()](./puppeteer.tracing.stop.md) |  | Stops a trace started with the <code>start</code> method. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.categories.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.categories.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.categories.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.categories.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [TracingOptions](./puppeteer.tracingoptions.md) &gt; [categories](./puppeteer.tracingoptions.categories.md)
-
-## TracingOptions.categories property
-
-<b>Signature:</b>
-
-```typescript
-categories?: string[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [TracingOptions](./puppeteer.tracingoptions.md)
-
-## TracingOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface TracingOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [categories](./puppeteer.tracingoptions.categories.md) | string\[\] |  |
-|  [path](./puppeteer.tracingoptions.path.md) | string |  |
-|  [screenshots](./puppeteer.tracingoptions.screenshots.md) | boolean |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.path.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.path.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.path.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.path.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [TracingOptions](./puppeteer.tracingoptions.md) &gt; [path](./puppeteer.tracingoptions.path.md)
-
-## TracingOptions.path property
-
-<b>Signature:</b>
-
-```typescript
-path?: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.screenshots.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.screenshots.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.screenshots.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracingoptions.screenshots.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [TracingOptions](./puppeteer.tracingoptions.md) &gt; [screenshots](./puppeteer.tracingoptions.screenshots.md)
-
-## TracingOptions.screenshots property
-
-<b>Signature:</b>
-
-```typescript
-screenshots?: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._path.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._path.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._path.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._path.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md) &gt; [\_path](./puppeteer.tracing._path.md)
-
-## Tracing.\_path property
-
-<b>Signature:</b>
-
-```typescript
-_path: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._recording.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._recording.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._recording.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing._recording.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md) &gt; [\_recording](./puppeteer.tracing._recording.md)
-
-## Tracing.\_recording property
-
-<b>Signature:</b>
-
-```typescript
-_recording: boolean;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.start.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.start.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.start.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.start.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md) &gt; [start](./puppeteer.tracing.start.md)
-
-## Tracing.start() method
-
-Starts a trace for the current page.
-
-<b>Signature:</b>
-
-```typescript
-start(options?: TracingOptions): Promise<void>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  options | [TracingOptions](./puppeteer.tracingoptions.md) | Optional <code>TracingOptions</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;void&gt;
-
-## Remarks
-
-Only one trace can be active at a time per browser.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.stop.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.stop.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.stop.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.tracing.stop.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [Tracing](./puppeteer.tracing.md) &gt; [stop](./puppeteer.tracing.stop.md)
-
-## Tracing.stop() method
-
-Stops a trace started with the `start` method.
-
-<b>Signature:</b>
-
-```typescript
-stop(): Promise<Buffer>;
-```
-<b>Returns:</b>
-
-Promise&lt;Buffer&gt;
-
-Promise which resolves to buffer with trace data.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.unwrapelementhandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.unwrapelementhandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.unwrapelementhandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.unwrapelementhandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [UnwrapElementHandle](./puppeteer.unwrapelementhandle.md)
-
-## UnwrapElementHandle type
-
-Unwraps a DOM element out of an ElementHandle instance
-
-<b>Signature:</b>
-
-```typescript
-export declare type UnwrapElementHandle<X> = X extends ElementHandle<infer E> ? E : X;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitForOptions](./puppeteer.waitforoptions.md)
-
-## WaitForOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface WaitForOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [timeout](./puppeteer.waitforoptions.timeout.md) | number | Maximum wait time in milliseconds, defaults to 30 seconds, pass <code>0</code> to disable the timeout. |
-|  [waitUntil](./puppeteer.waitforoptions.waituntil.md) | PuppeteerLifeCycleEvent \| PuppeteerLifeCycleEvent\[\] |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.timeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.timeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.timeout.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.timeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitForOptions](./puppeteer.waitforoptions.md) &gt; [timeout](./puppeteer.waitforoptions.timeout.md)
-
-## WaitForOptions.timeout property
-
-Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout.
-
-<b>Signature:</b>
-
-```typescript
-timeout?: number;
-```
-
-## Remarks
-
-The default value can be changed by using the [Page.setDefaultTimeout()](./puppeteer.page.setdefaulttimeout.md) or [Page.setDefaultNavigationTimeout()](./puppeteer.page.setdefaultnavigationtimeout.md) methods.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.waituntil.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.waituntil.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.waituntil.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitforoptions.waituntil.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitForOptions](./puppeteer.waitforoptions.md) &gt; [waitUntil](./puppeteer.waitforoptions.waituntil.md)
-
-## WaitForOptions.waitUntil property
-
-<b>Signature:</b>
-
-```typescript
-waitUntil?: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[];
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitForTargetOptions](./puppeteer.waitfortargetoptions.md)
-
-## WaitForTargetOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface WaitForTargetOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [timeout](./puppeteer.waitfortargetoptions.timeout.md) | number | Maximum wait time in milliseconds. Pass <code>0</code> to disable the timeout. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.timeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.timeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.timeout.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waitfortargetoptions.timeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitForTargetOptions](./puppeteer.waitfortargetoptions.md) &gt; [timeout](./puppeteer.waitfortargetoptions.timeout.md)
-
-## WaitForTargetOptions.timeout property
-
-Maximum wait time in milliseconds. Pass `0` to disable the timeout.
-
-<b>Signature:</b>
-
-```typescript
-timeout?: number;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitTimeoutOptions](./puppeteer.waittimeoutoptions.md)
-
-## WaitTimeoutOptions interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface WaitTimeoutOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [timeout](./puppeteer.waittimeoutoptions.timeout.md) | number | Maximum wait time in milliseconds, defaults to 30 seconds, pass <code>0</code> to disable the timeout. |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.timeout.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.timeout.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.timeout.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.waittimeoutoptions.timeout.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WaitTimeoutOptions](./puppeteer.waittimeoutoptions.md) &gt; [timeout](./puppeteer.waittimeoutoptions.timeout.md)
-
-## WaitTimeoutOptions.timeout property
-
-Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout.
-
-<b>Signature:</b>
-
-```typescript
-timeout?: number;
-```
-
-## Remarks
-
-The default value can be changed by using the [Page.setDefaultTimeout()](./puppeteer.page.setdefaulttimeout.md) method.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._client.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._client.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._client.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._client.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [\_client](./puppeteer.webworker._client.md)
-
-## WebWorker.\_client property
-
-<b>Signature:</b>
-
-```typescript
-_client: CDPSession;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluatehandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluatehandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluatehandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluatehandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [evaluateHandle](./puppeteer.webworker.evaluatehandle.md)
-
-## WebWorker.evaluateHandle() method
-
-The only difference between `worker.evaluate` and `worker.evaluateHandle` is that `worker.evaluateHandle` returns in-page object (JSHandle). If the function passed to the `worker.evaluateHandle` returns a \[Promise\], then `worker.evaluateHandle` would wait for the promise to resolve and return its value. Shortcut for `await worker.executionContext()).evaluateHandle(pageFunction, ...args)`
-
-<b>Signature:</b>
-
-```typescript
-evaluateHandle<HandlerType extends JSHandle = JSHandle>(pageFunction: EvaluateHandleFn, ...args: SerializableOrJSHandle[]): Promise<JSHandle>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | [EvaluateHandleFn](./puppeteer.evaluatehandlefn.md) | Function to be evaluated in the page context. |
-|  args | [SerializableOrJSHandle](./puppeteer.serializableorjshandle.md)<!-- -->\[\] | Arguments to pass to <code>pageFunction</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;[JSHandle](./puppeteer.jshandle.md)<!-- -->&gt;
-
-Promise which resolves to the return value of `pageFunction`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluate.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluate.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluate.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.evaluate.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [evaluate](./puppeteer.webworker.evaluate.md)
-
-## WebWorker.evaluate() method
-
-If the function passed to the `worker.evaluate` returns a Promise, then `worker.evaluate` would wait for the promise to resolve and return its value. If the function passed to the `worker.evaluate` returns a non-serializable value, then `worker.evaluate` resolves to `undefined`<!-- -->. DevTools Protocol also supports transferring some additional values that are not serializable by `JSON`<!-- -->: `-0`<!-- -->, `NaN`<!-- -->, `Infinity`<!-- -->, `-Infinity`<!-- -->, and bigint literals. Shortcut for `await worker.executionContext()).evaluate(pageFunction, ...args)`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-evaluate<ReturnType extends any>(pageFunction: Function | string, ...args: any[]): Promise<ReturnType>;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  pageFunction | Function \| string | Function to be evaluated in the worker context. |
-|  args | any\[\] | Arguments to pass to <code>pageFunction</code>. |
-
-<b>Returns:</b>
-
-Promise&lt;ReturnType&gt;
-
-Promise which resolves to the return value of `pageFunction`<!-- -->.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextcallback.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextcallback.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextcallback.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextcallback.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [\_executionContextCallback](./puppeteer.webworker._executioncontextcallback.md)
-
-## WebWorker.\_executionContextCallback property
-
-<b>Signature:</b>
-
-```typescript
-_executionContextCallback: (value: ExecutionContext) => void;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.executioncontext.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.executioncontext.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.executioncontext.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.executioncontext.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [executionContext](./puppeteer.webworker.executioncontext.md)
-
-## WebWorker.executionContext() method
-
-Returns the ExecutionContext the WebWorker runs in
-
-<b>Signature:</b>
-
-```typescript
-executionContext(): Promise<ExecutionContext>;
-```
-<b>Returns:</b>
-
-Promise&lt;[ExecutionContext](./puppeteer.executioncontext.md)<!-- -->&gt;
-
-The ExecutionContext the web worker runs in.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextpromise.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextpromise.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextpromise.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._executioncontextpromise.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [\_executionContextPromise](./puppeteer.webworker._executioncontextpromise.md)
-
-## WebWorker.\_executionContextPromise property
-
-<b>Signature:</b>
-
-```typescript
-_executionContextPromise: Promise<ExecutionContext>;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md)
-
-## WebWorker class
-
-The WebWorker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API)<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-export declare class WebWorker extends EventEmitter 
-```
-<b>Extends:</b> [EventEmitter](./puppeteer.eventemitter.md)
-
-## Remarks
-
-The events `workercreated` and `workerdestroyed` are emitted on the page object to signal the worker lifecycle.
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `WebWorker` class.
-
-## Example
-
-
-```js
-page.on('workercreated', worker => console.log('Worker created: ' + worker.url()));
-page.on('workerdestroyed', worker => console.log('Worker destroyed: ' + worker.url()));
-
-console.log('Current workers:');
-for (const worker of page.workers()) {
-  console.log('  ' + worker.url());
-}
-
-```
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [\_client](./puppeteer.webworker._client.md) |  | [CDPSession](./puppeteer.cdpsession.md) |  |
-|  [\_executionContextCallback](./puppeteer.webworker._executioncontextcallback.md) |  | (value: [ExecutionContext](./puppeteer.executioncontext.md)<!-- -->) =&gt; void |  |
-|  [\_executionContextPromise](./puppeteer.webworker._executioncontextpromise.md) |  | Promise&lt;[ExecutionContext](./puppeteer.executioncontext.md)<!-- -->&gt; |  |
-|  [\_url](./puppeteer.webworker._url.md) |  | string |  |
-
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [evaluate(pageFunction, args)](./puppeteer.webworker.evaluate.md) |  | If the function passed to the <code>worker.evaluate</code> returns a Promise, then <code>worker.evaluate</code> would wait for the promise to resolve and return its value. If the function passed to the <code>worker.evaluate</code> returns a non-serializable value, then <code>worker.evaluate</code> resolves to <code>undefined</code>. DevTools Protocol also supports transferring some additional values that are not serializable by <code>JSON</code>: <code>-0</code>, <code>NaN</code>, <code>Infinity</code>, <code>-Infinity</code>, and bigint literals. Shortcut for <code>await worker.executionContext()).evaluate(pageFunction, ...args)</code>. |
-|  [evaluateHandle(pageFunction, args)](./puppeteer.webworker.evaluatehandle.md) |  | The only difference between <code>worker.evaluate</code> and <code>worker.evaluateHandle</code> is that <code>worker.evaluateHandle</code> returns in-page object (JSHandle). If the function passed to the <code>worker.evaluateHandle</code> returns a \[Promise\], then <code>worker.evaluateHandle</code> would wait for the promise to resolve and return its value. Shortcut for <code>await worker.executionContext()).evaluateHandle(pageFunction, ...args)</code> |
-|  [executionContext()](./puppeteer.webworker.executioncontext.md) |  | Returns the ExecutionContext the WebWorker runs in |
-|  [url()](./puppeteer.webworker.url.md) |  |  |
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker._url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [\_url](./puppeteer.webworker._url.md)
-
-## WebWorker.\_url property
-
-<b>Signature:</b>
-
-```typescript
-_url: string;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.url.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.url.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.url.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.webworker.url.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WebWorker](./puppeteer.webworker.md) &gt; [url](./puppeteer.webworker.url.md)
-
-## WebWorker.url() method
-
-<b>Signature:</b>
-
-```typescript
-url(): string;
-```
-<b>Returns:</b>
-
-string
-
-The URL of this web worker.
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.wrapelementhandle.md firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.wrapelementhandle.md
--- firefox-84.0.2+build1/remote/test/puppeteer/new-docs/puppeteer.wrapelementhandle.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/new-docs/puppeteer.wrapelementhandle.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [puppeteer](./puppeteer.md) &gt; [WrapElementHandle](./puppeteer.wrapelementhandle.md)
-
-## WrapElementHandle type
-
-Wraps a DOM element into an ElementHandle instance
-
-<b>Signature:</b>
-
-```typescript
-export declare type WrapElementHandle<X> = X extends Element ? ElementHandle<X> : X;
-```
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.npmrc firefox-85.0+build1/remote/test/puppeteer/.npmrc
--- firefox-84.0.2+build1/remote/test/puppeteer/.npmrc	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.npmrc	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+registry=https://wombat-dressing-room.appspot.com/
+access=public
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/package.json firefox-85.0+build1/remote/test/puppeteer/package.json
--- firefox-84.0.2+build1/remote/test/puppeteer/package.json	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/package.json	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 {
   "name": "puppeteer",
-  "version": "5.0.0",
+  "version": "5.5.0",
   "description": "A high-level API to control headless Chrome over the DevTools Protocol",
   "main": "./cjs-entry.js",
   "repository": "github:puppeteer/puppeteer",
@@ -8,33 +8,33 @@
     "node": ">=10.18.1"
   },
   "scripts": {
-    "unit": "tsc --version && mocha --config mocha-config/puppeteer-unit-tests.js",
+    "test-browser": "wtr",
+    "test-browser-watch": "wtr --watch",
+    "unit": "npm run tsc-cjs && mocha --config mocha-config/puppeteer-unit-tests.js",
+    "unit-debug": "npm run tsc-cjs && mocha --inspect-brk --config mocha-config/puppeteer-unit-tests.js",
     "unit-with-coverage": "cross-env COVERAGE=1 npm run unit",
     "assert-unit-coverage": "cross-env COVERAGE=1 mocha --config mocha-config/coverage-tests.js",
     "funit": "PUPPETEER_PRODUCT=firefox npm run unit",
-    "debug-unit": "node --inspect-brk test/test.js",
-    "test-doclint": "mocha --config mocha-config/doclint-tests.js",
-    "test": "npm run tsc && npm run lint --silent && npm run unit-with-coverage && npm run test-doclint && npm run test-types",
+    "test": "npm run tsc && npm run lint --silent && npm run unit-with-coverage && npm run test-browser",
     "prepare": "node typescript-if-required.js",
     "prepublishOnly": "npm run tsc",
     "dev-install": "npm run tsc && node install.js",
     "install": "node install.js",
     "eslint": "([ \"$CI\" = true ] && eslint --ext js --ext ts --quiet -f codeframe . || eslint --ext js --ext ts .)",
     "eslint-fix": "eslint --ext js --ext ts --fix .",
-    "lint": "npm run eslint && npm run tsc && npm run doc",
+    "commitlint": "commitlint --from=HEAD~1",
+    "lint": "npm run eslint && npm run tsc && npm run doc && npm run commitlint",
     "doc": "node utils/doclint/cli.js",
     "clean-lib": "rm -rf lib",
+    "build": "npm run tsc",
     "tsc": "npm run clean-lib && tsc --version && npm run tsc-cjs && npm run tsc-esm",
-    "tsc-cjs": "tsc -p . && cp src/protocol.d.ts lib/cjs",
-    "tsc-esm": "tsc --build tsconfig-esm.json && cp src/protocol.d.ts lib/esm",
-    "typecheck": "tsc -p . --noEmit",
+    "tsc-cjs": "tsc -b src/tsconfig.cjs.json",
+    "tsc-esm": "tsc -b src/tsconfig.esm.json",
     "apply-next-version": "node utils/apply_next_version.js",
-    "update-protocol-d-ts": "node utils/protocol-types-generator update",
-    "compare-protocol-d-ts": "node utils/protocol-types-generator compare",
     "test-install": "scripts/test-install.sh",
     "generate-docs": "npm run tsc && api-extractor run --local --verbose && api-documenter markdown -i temp -o new-docs",
-    "ensure-new-docs-up-to-date": "npm run generate-docs && exit `git status --porcelain | head -255 | wc -l`",
-    "generate-dependency-graph": "echo 'Requires graphviz installed locally!' && depcruise --exclude 'api.ts' --do-not-follow '^node_modules' --output-type dot src/index.ts | dot -T png > dependency-chart.png"
+    "ensure-correct-devtools-protocol-revision": "ts-node -s scripts/ensure-correct-devtools-protocol-package",
+    "release": "standard-version"
   },
   "files": [
     "lib/",
@@ -47,10 +47,10 @@
   "license": "Apache-2.0",
   "dependencies": {
     "debug": "^4.1.0",
+    "devtools-protocol": "0.0.818844",
     "extract-zip": "^2.0.0",
     "https-proxy-agent": "^4.0.0",
-    "mime": "^2.0.3",
-    "mitt": "^2.0.1",
+    "node-fetch": "^2.6.1",
     "pkg-dir": "^4.2.0",
     "progress": "^2.0.1",
     "proxy-from-env": "^1.0.0",
@@ -60,46 +60,56 @@
     "ws": "^7.2.3"
   },
   "devDependencies": {
-    "@microsoft/api-documenter": "7.8.14",
-    "@microsoft/api-extractor": "7.8.12",
+    "@commitlint/cli": "^11.0.0",
+    "@commitlint/config-conventional": "^11.0.0",
+    "@microsoft/api-documenter": "7.9.7",
+    "@microsoft/api-extractor": "7.10.4",
     "@types/debug": "0.0.31",
     "@types/mime": "^2.0.0",
     "@types/mocha": "^7.0.2",
     "@types/node": "^14.0.13",
     "@types/proxy-from-env": "^1.0.1",
     "@types/rimraf": "^2.0.2",
+    "@types/sinon": "^9.0.4",
     "@types/tar-fs": "^1.16.2",
     "@types/ws": "^7.2.4",
-    "@typescript-eslint/eslint-plugin": "^2.28.0",
-    "@typescript-eslint/parser": "^2.28.0",
+    "@typescript-eslint/eslint-plugin": "^4.4.0",
+    "@typescript-eslint/parser": "^4.4.0",
+    "@web/test-runner": "^0.9.2",
     "commonmark": "^0.28.1",
-    "cross-env": "^5.0.5",
-    "dependency-cruiser": "^9.7.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-mocha": "^6.3.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-unicorn": "^19.0.1",
+    "cross-env": "^7.0.2",
+    "eslint": "^7.10.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-mocha": "^8.0.0",
+    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-unicorn": "^22.0.0",
     "esprima": "^4.0.0",
     "expect": "^25.2.7",
+    "husky": "^4.3.0",
     "jpeg-js": "^0.3.7",
+    "mime": "^2.0.3",
     "minimist": "^1.2.0",
-    "mocha": "^8.0.1",
+    "mocha": "^8.2.0",
     "ncp": "^2.0.0",
     "pixelmatch": "^4.0.2",
     "pngjs": "^5.0.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.2",
     "sinon": "^9.0.2",
+    "standard-version": "^9.0.0",
     "text-diff": "^1.0.1",
-    "ts-node": "^8.10.2",
+    "ts-node": "^9.0.0",
     "typescript": "3.9.5"
   },
-  "browser": {
-    "./lib/BrowserFetcher.js": false,
-    "ws": "./utils/browser/WebSocket",
-    "fs": false,
-    "child_process": false,
-    "rimraf": false,
-    "readline": false
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint --env HUSKY_GIT_PARAMS"
+    }
+  },
+  "standard-version": {
+    "skip": {
+      "commit": true,
+      "tag": true
+    }
   }
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/package-lock.json firefox-85.0+build1/remote/test/puppeteer/package-lock.json
--- firefox-84.0.2+build1/remote/test/puppeteer/package-lock.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/package-lock.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,9746 @@
+{
+  "name": "puppeteer",
+  "version": "5.5.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+      "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.12.5",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+      "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.11.0"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+      "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
+      "dev": true
+    },
+    "@babel/runtime": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+      "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.12.5",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/parser": "^7.12.5",
+        "@babel/types": "^7.12.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.19"
+      },
+      "dependencies": {
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.12.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+      "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.19",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@commitlint/cli": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-11.0.0.tgz",
+      "integrity": "sha512-YWZWg1DuqqO5Zjh7vUOeSX76vm0FFyz4y0cpGMFhrhvUi5unc4IVfCXZ6337R9zxuBtmveiRuuhQqnRRer+13g==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@commitlint/format": "^11.0.0",
+        "@commitlint/lint": "^11.0.0",
+        "@commitlint/load": "^11.0.0",
+        "@commitlint/read": "^11.0.0",
+        "chalk": "4.1.0",
+        "core-js": "^3.6.1",
+        "get-stdin": "8.0.0",
+        "lodash": "^4.17.19",
+        "resolve-from": "5.0.0",
+        "resolve-global": "1.0.0",
+        "yargs": "^15.1.0"
+      }
+    },
+    "@commitlint/config-conventional": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-11.0.0.tgz",
+      "integrity": "sha512-SNDRsb5gLuDd2PL83yCOQX6pE7gevC79UPFx+GLbLfw6jGnnbO9/tlL76MLD8MOViqGbo7ZicjChO9Gn+7tHhA==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-conventionalcommits": "^4.3.1"
+      }
+    },
+    "@commitlint/ensure": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-11.0.0.tgz",
+      "integrity": "sha512-/T4tjseSwlirKZdnx4AuICMNNlFvRyPQimbZIOYujp9DSO6XRtOy9NrmvWujwHsq9F5Wb80QWi4WMW6HMaENug==",
+      "dev": true,
+      "requires": {
+        "@commitlint/types": "^11.0.0",
+        "lodash": "^4.17.19"
+      }
+    },
+    "@commitlint/execute-rule": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-11.0.0.tgz",
+      "integrity": "sha512-g01p1g4BmYlZ2+tdotCavrMunnPFPhTzG1ZiLKTCYrooHRbmvqo42ZZn4QMStUEIcn+jfLb6BRZX3JzIwA1ezQ==",
+      "dev": true
+    },
+    "@commitlint/format": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-11.0.0.tgz",
+      "integrity": "sha512-bpBLWmG0wfZH/svzqD1hsGTpm79TKJWcf6EXZllh2J/LSSYKxGlv967lpw0hNojme0sZd4a/97R3qA2QHWWSLg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/types": "^11.0.0",
+        "chalk": "^4.0.0"
+      }
+    },
+    "@commitlint/is-ignored": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-11.0.0.tgz",
+      "integrity": "sha512-VLHOUBN+sOlkYC4tGuzE41yNPO2w09sQnOpfS+pSPnBFkNUUHawEuA44PLHtDvQgVuYrMAmSWFQpWabMoP5/Xg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/types": "^11.0.0",
+        "semver": "7.3.2"
+      }
+    },
+    "@commitlint/lint": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-11.0.0.tgz",
+      "integrity": "sha512-Q8IIqGIHfwKr8ecVZyYh6NtXFmKw4YSEWEr2GJTB/fTZXgaOGtGFZDWOesCZllQ63f1s/oWJYtVv5RAEuwN8BQ==",
+      "dev": true,
+      "requires": {
+        "@commitlint/is-ignored": "^11.0.0",
+        "@commitlint/parse": "^11.0.0",
+        "@commitlint/rules": "^11.0.0",
+        "@commitlint/types": "^11.0.0"
+      }
+    },
+    "@commitlint/load": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-11.0.0.tgz",
+      "integrity": "sha512-t5ZBrtgvgCwPfxmG811FCp39/o3SJ7L+SNsxFL92OR4WQxPcu6c8taD0CG2lzOHGuRyuMxZ7ps3EbngT2WpiCg==",
+      "dev": true,
+      "requires": {
+        "@commitlint/execute-rule": "^11.0.0",
+        "@commitlint/resolve-extends": "^11.0.0",
+        "@commitlint/types": "^11.0.0",
+        "chalk": "4.1.0",
+        "cosmiconfig": "^7.0.0",
+        "lodash": "^4.17.19",
+        "resolve-from": "^5.0.0"
+      }
+    },
+    "@commitlint/message": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-11.0.0.tgz",
+      "integrity": "sha512-01ObK/18JL7PEIE3dBRtoMmU6S3ecPYDTQWWhcO+ErA3Ai0KDYqV5VWWEijdcVafNpdeUNrEMigRkxXHQLbyJA==",
+      "dev": true
+    },
+    "@commitlint/parse": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-11.0.0.tgz",
+      "integrity": "sha512-DekKQAIYWAXIcyAZ6/PDBJylWJ1BROTfDIzr9PMVxZRxBPc1gW2TG8fLgjZfBP5mc0cuthPkVi91KQQKGri/7A==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "^5.0.0",
+        "conventional-commits-parser": "^3.0.0"
+      }
+    },
+    "@commitlint/read": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-11.0.0.tgz",
+      "integrity": "sha512-37V0V91GSv0aDzMzJioKpCoZw6l0shk7+tRG8RkW1GfZzUIytdg3XqJmM+IaIYpaop0m6BbZtfq+idzUwJnw7g==",
+      "dev": true,
+      "requires": {
+        "@commitlint/top-level": "^11.0.0",
+        "fs-extra": "^9.0.0",
+        "git-raw-commits": "^2.0.0"
+      }
+    },
+    "@commitlint/resolve-extends": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-11.0.0.tgz",
+      "integrity": "sha512-WinU6Uv6L7HDGLqn/To13KM1CWvZ09VHZqryqxXa1OY+EvJkfU734CwnOEeNlSCK7FVLrB4kmodLJtL1dkEpXw==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^3.0.0",
+        "lodash": "^4.17.19",
+        "resolve-from": "^5.0.0",
+        "resolve-global": "^1.0.0"
+      }
+    },
+    "@commitlint/rules": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-11.0.0.tgz",
+      "integrity": "sha512-2hD9y9Ep5ZfoNxDDPkQadd2jJeocrwC4vJ98I0g8pNYn/W8hS9+/FuNpolREHN8PhmexXbkjrwyQrWbuC0DVaA==",
+      "dev": true,
+      "requires": {
+        "@commitlint/ensure": "^11.0.0",
+        "@commitlint/message": "^11.0.0",
+        "@commitlint/to-lines": "^11.0.0",
+        "@commitlint/types": "^11.0.0"
+      }
+    },
+    "@commitlint/to-lines": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-11.0.0.tgz",
+      "integrity": "sha512-TIDTB0Y23jlCNubDROUVokbJk6860idYB5cZkLWcRS9tlb6YSoeLn1NLafPlrhhkkkZzTYnlKYzCVrBNVes1iw==",
+      "dev": true
+    },
+    "@commitlint/top-level": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-11.0.0.tgz",
+      "integrity": "sha512-O0nFU8o+Ws+py5pfMQIuyxOtfR/kwtr5ybqTvR+C2lUPer2x6lnQU+OnfD7hPM+A+COIUZWx10mYQvkR3MmtAA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^5.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        }
+      }
+    },
+    "@commitlint/types": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-11.0.0.tgz",
+      "integrity": "sha512-VoNqai1vR5anRF5Tuh/+SWDFk7xi7oMwHrHrbm1BprYXjB2RJsWLhUrStMssDxEl5lW/z3EUdg8RvH/IUBccSQ==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz",
+      "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "lodash": "^4.17.19",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        }
+      }
+    },
+    "@jest/types": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
+      }
+    },
+    "@mdn/browser-compat-data": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz",
+      "integrity": "sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw==",
+      "dev": true,
+      "requires": {
+        "extend": "3.0.2"
+      }
+    },
+    "@microsoft/api-documenter": {
+      "version": "7.9.7",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-documenter/-/api-documenter-7.9.7.tgz",
+      "integrity": "sha512-wSlBDGbUd4Ld7YB8wmvsZ2yCwVdUh8zXmJHmggpZ13/TF/sForhhjd3MXfj0348h1RpVKE3foPxfxsDP6ON1Eg==",
+      "dev": true,
+      "requires": {
+        "@microsoft/api-extractor-model": "7.10.3",
+        "@microsoft/tsdoc": "0.12.19",
+        "@rushstack/node-core-library": "3.34.3",
+        "@rushstack/ts-command-line": "4.7.3",
+        "colors": "~1.2.1",
+        "js-yaml": "~3.13.1",
+        "resolve": "~1.17.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@microsoft/api-extractor": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.10.4.tgz",
+      "integrity": "sha512-vod9Y8IHhBtB3hcKiOe4OLi/hNeWtgRh/mxGrye5SeHaJpu5urAAA9CxLxBT8fDe+pyr1ipzlaiM/eMm2vXKgw==",
+      "dev": true,
+      "requires": {
+        "@microsoft/api-extractor-model": "7.10.3",
+        "@microsoft/tsdoc": "0.12.19",
+        "@rushstack/node-core-library": "3.34.3",
+        "@rushstack/rig-package": "0.2.4",
+        "@rushstack/ts-command-line": "4.7.3",
+        "colors": "~1.2.1",
+        "lodash": "~4.17.15",
+        "resolve": "~1.17.0",
+        "semver": "~7.3.0",
+        "source-map": "~0.6.1",
+        "typescript": "~3.9.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "typescript": {
+          "version": "3.9.7",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+          "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
+          "dev": true
+        }
+      }
+    },
+    "@microsoft/api-extractor-model": {
+      "version": "7.10.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.10.3.tgz",
+      "integrity": "sha512-etP4NbZpj+zPCuO3YYigIYXkXq5zYhfE3vo/hrCj1OOd/159HDbSHnEQrNWRVy5TR79RAzHvkYAwtLYKeYP8Ag==",
+      "dev": true,
+      "requires": {
+        "@microsoft/tsdoc": "0.12.19",
+        "@rushstack/node-core-library": "3.34.3"
+      }
+    },
+    "@microsoft/tsdoc": {
+      "version": "0.12.19",
+      "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz",
+      "integrity": "sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A==",
+      "dev": true
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.3",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.3",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.4.0.tgz",
+      "integrity": "sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deep-freeze": "^0.0.1",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.17.0"
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      }
+    },
+    "@rushstack/node-core-library": {
+      "version": "3.34.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.34.3.tgz",
+      "integrity": "sha512-WNXHEk5/uoZsbrKzGpYUzDDymJvZarRkByab4uS1fbEcTSDFSVB9e0rREzCkU9yDAQlRutbFwiTXLu3LVR5F6w==",
+      "dev": true,
+      "requires": {
+        "@types/node": "10.17.13",
+        "colors": "~1.2.1",
+        "fs-extra": "~7.0.1",
+        "import-lazy": "~4.0.0",
+        "jju": "~1.4.0",
+        "resolve": "~1.17.0",
+        "semver": "~7.3.0",
+        "timsort": "~0.3.0",
+        "z-schema": "~3.18.3"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "10.17.13",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz",
+          "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
+        }
+      }
+    },
+    "@rushstack/rig-package": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.2.4.tgz",
+      "integrity": "sha512-/UXb6N0m0l+5kU4mLmRxyw3we+/w1fesgvfg96xllty5LyQxKDvkscmjlvCU/Yx55WO1tVxN4/7YlNEB2DcHyA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "10.17.13",
+        "resolve": "~1.17.0",
+        "strip-json-comments": "~3.1.1"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "10.17.13",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.13.tgz",
+          "integrity": "sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rushstack/ts-command-line": {
+      "version": "4.7.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.7.3.tgz",
+      "integrity": "sha512-8FNrUSbMgKLgRVcsg1STsIC2xAdyes7qJtVwg36hSnBAMZgCCIM+Z36nnxyrnYTS/6qwiXv7fwVaUxXH+SyiAQ==",
+      "dev": true,
+      "requires": {
+        "@types/argparse": "1.0.38",
+        "argparse": "~1.0.9",
+        "colors": "~1.2.1",
+        "string-argv": "~0.3.1"
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+      "dev": true
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
+      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "@sinonjs/formatio": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz",
+      "integrity": "sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1",
+        "@sinonjs/samsam": "^5.0.2"
+      }
+    },
+    "@sinonjs/samsam": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.0.tgz",
+      "integrity": "sha512-hXpcfx3aq+ETVBwPlRFICld5EnrkexXuXDwqUNhDdr5L8VjvMeSRwyOa0qL7XFmR+jVWR4rUZtnxlG7RX72sBg==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.6.0",
+        "lodash.get": "^4.4.2",
+        "type-detect": "^4.0.8"
+      }
+    },
+    "@sinonjs/text-encoding": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
+      "dev": true
+    },
+    "@szmarczak/http-timer": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
+      "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^2.0.0"
+      }
+    },
+    "@types/accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/argparse": {
+      "version": "1.0.38",
+      "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz",
+      "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==",
+      "dev": true
+    },
+    "@types/babel__code-frame": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__code-frame/-/babel__code-frame-7.0.2.tgz",
+      "integrity": "sha512-imO+jT/yjOKOAS5GQZ8SDtwiIloAGGr6OaZDKB0V5JVaSfGZLat5K5/ZRtyKW6R60XHV3RHYPTFfhYb+wDKyKg==",
+      "dev": true
+    },
+    "@types/body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/cacheable-request": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
+      "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
+      "dev": true,
+      "requires": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "*",
+        "@types/node": "*",
+        "@types/responselike": "*"
+      }
+    },
+    "@types/connect": {
+      "version": "3.4.33",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz",
+      "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==",
+      "dev": true
+    },
+    "@types/cookies": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.5.tgz",
+      "integrity": "sha512-3+TAFSm78O7/bAeYdB8FoYGntuT87vVP9JKuQRL8sRhv9313LP2SpHHL50VeFtnyjIcb3UELddMk5Yt0eOSOkg==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/express": "*",
+        "@types/keygrip": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/debug": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-0.0.31.tgz",
+      "integrity": "sha512-LS1MCPaQKqspg7FvexuhmDbWUhE2yIJ+4AgVIyObfc06/UKZ8REgxGNjZc82wPLWmbeOm7S+gSsLgo75TanG4A==",
+      "dev": true
+    },
+    "@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true
+    },
+    "@types/express": {
+      "version": "4.17.9",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz",
+      "integrity": "sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw==",
+      "dev": true,
+      "requires": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "*",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.17.13",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz",
+      "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*"
+      }
+    },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/http-assert": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz",
+      "integrity": "sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==",
+      "dev": true
+    },
+    "@types/http-cache-semantics": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
+      "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
+      "dev": true
+    },
+    "@types/http-errors": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz",
+      "integrity": "sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA==",
+      "dev": true
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "@types/istanbul-reports": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/json-schema": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+      "dev": true
+    },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "@types/keygrip": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz",
+      "integrity": "sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==",
+      "dev": true
+    },
+    "@types/keyv": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
+      "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/koa": {
+      "version": "2.11.6",
+      "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz",
+      "integrity": "sha512-BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A==",
+      "dev": true,
+      "requires": {
+        "@types/accepts": "*",
+        "@types/content-disposition": "*",
+        "@types/cookies": "*",
+        "@types/http-assert": "*",
+        "@types/http-errors": "*",
+        "@types/keygrip": "*",
+        "@types/koa-compose": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/koa-compose": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz",
+      "integrity": "sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==",
+      "dev": true,
+      "requires": {
+        "@types/koa": "*"
+      }
+    },
+    "@types/mime": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz",
+      "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==",
+      "dev": true
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/minimist": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
+      "dev": true
+    },
+    "@types/mocha": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
+      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "14.14.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz",
+      "integrity": "sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw=="
+    },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
+      "dev": true
+    },
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "@types/parse5": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz",
+      "integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==",
+      "dev": true
+    },
+    "@types/proxy-from-env": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/proxy-from-env/-/proxy-from-env-1.0.1.tgz",
+      "integrity": "sha512-luG++TFHyS61eKcfkR1CVV6a1GMNXDjtqEQIIfaSHax75xp0HU3SlezjOi1yqubJwrG8e9DeW59n6wTblIDwFg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/puppeteer": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.0.tgz",
+      "integrity": "sha512-zTYDLjnHjgzokrwKt7N0rgn7oZPYo1J0m8Ghu+gXqzLCEn8RWbELa2uprE2UFJ0jU/Sk0x9jXXdOH/5QQLFHhQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/puppeteer-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer-core/-/puppeteer-core-2.0.0.tgz",
+      "integrity": "sha512-JvoEb7KgEkUet009ZDrtpUER3hheXoHgQByuYpJZ5WWT7LWwMH+0NTqGQXGgoOKzs+G5NA1T4DZwXK79Bhnejw==",
+      "dev": true,
+      "requires": {
+        "@types/puppeteer": "*"
+      }
+    },
+    "@types/qs": {
+      "version": "6.9.5",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz",
+      "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==",
+      "dev": true
+    },
+    "@types/range-parser": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
+      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
+      "dev": true
+    },
+    "@types/resolve": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/rimraf": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz",
+      "integrity": "sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/serve-static": {
+      "version": "1.13.8",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz",
+      "integrity": "sha512-MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA==",
+      "dev": true,
+      "requires": {
+        "@types/mime": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/sinon": {
+      "version": "9.0.8",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.8.tgz",
+      "integrity": "sha512-IVnI820FZFMGI+u1R+2VdRaD/82YIQTdqLYC9DLPszZuynAJDtCvCtCs3bmyL66s7FqRM3+LPX7DhHnVTaagDw==",
+      "dev": true,
+      "requires": {
+        "@types/sinonjs__fake-timers": "*"
+      }
+    },
+    "@types/sinonjs__fake-timers": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz",
+      "integrity": "sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==",
+      "dev": true
+    },
+    "@types/stack-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "dev": true
+    },
+    "@types/tar-fs": {
+      "version": "1.16.3",
+      "resolved": "https://registry.npmjs.org/@types/tar-fs/-/tar-fs-1.16.3.tgz",
+      "integrity": "sha512-Y+fdeg11tb9J3UNIatNtrTPM1i8U+WLv2mMhZ3W13mtU19stCgrXJ4iXLkTpoF8jqHi3T/qTS8+fQ3IPzXxpuA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/tar-stream": "*"
+      }
+    },
+    "@types/tar-stream": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/tar-stream/-/tar-stream-2.1.0.tgz",
+      "integrity": "sha512-s1UQxQUVMHbSkCC0X4qdoiWgHF8DoyY1JjQouFsnk/8ysoTdBaiCHud/exoAZzKDbzAXVc+ah6sczxGVMAohFw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.4.0.tgz",
+      "integrity": "sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/yargs": {
+      "version": "15.0.10",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz",
+      "integrity": "sha512-z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ==",
+      "dev": true,
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "dev": true
+    },
+    "@types/yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.1.tgz",
+      "integrity": "sha512-d7LeQ7dbUrIv5YVFNzGgaW3IQKMmnmKFneRWagRlGYOSfLJVaRbj/FrBNOBC1a3tVO+TgNq1GbHvRtg1kwL0FQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "4.8.1",
+        "@typescript-eslint/scope-manager": "4.8.1",
+        "debug": "^4.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^3.0.0",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      }
+    },
+    "@typescript-eslint/experimental-utils": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.1.tgz",
+      "integrity": "sha512-WigyLn144R3+lGATXW4nNcDJ9JlTkG8YdBWHkDlN0lC3gUGtDi7Pe3h5GPvFKMcRz8KbZpm9FJV9NTW8CpRHpg==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.3",
+        "@typescript-eslint/scope-manager": "4.8.1",
+        "@typescript-eslint/types": "4.8.1",
+        "@typescript-eslint/typescript-estree": "4.8.1",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.8.1.tgz",
+      "integrity": "sha512-QND8XSVetATHK9y2Ltc/XBl5Ro7Y62YuZKnPEwnNPB8E379fDsvzJ1dMJ46fg/VOmk0hXhatc+GXs5MaXuL5Uw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "4.8.1",
+        "@typescript-eslint/types": "4.8.1",
+        "@typescript-eslint/typescript-estree": "4.8.1",
+        "debug": "^4.1.1"
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.1.tgz",
+      "integrity": "sha512-r0iUOc41KFFbZdPAdCS4K1mXivnSZqXS5D9oW+iykQsRlTbQRfuFRSW20xKDdYiaCoH+SkSLeIF484g3kWzwOQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.8.1",
+        "@typescript-eslint/visitor-keys": "4.8.1"
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.1.tgz",
+      "integrity": "sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.1.tgz",
+      "integrity": "sha512-bJ6Fn/6tW2g7WIkCWh3QRlaSU7CdUUK52shx36/J7T5oTQzANvi6raoTsbwGM11+7eBbeem8hCCKbyvAc0X3sQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.8.1",
+        "@typescript-eslint/visitor-keys": "4.8.1",
+        "debug": "^4.1.1",
+        "globby": "^11.0.1",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.15",
+        "semver": "^7.3.2",
+        "tsutils": "^3.17.1"
+      }
+    },
+    "@typescript-eslint/visitor-keys": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.1.tgz",
+      "integrity": "sha512-3nrwXFdEYALQh/zW8rFwP4QltqsanCDz4CwWMPiIZmwlk9GlvBeueEIbq05SEq4ganqM0g9nh02xXgv5XI3PeQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "4.8.1",
+        "eslint-visitor-keys": "^2.0.0"
+      }
+    },
+    "@ungap/promise-all-settled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
+      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
+      "dev": true
+    },
+    "@web/browser-logs": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@web/browser-logs/-/browser-logs-0.1.5.tgz",
+      "integrity": "sha512-WXIvoXtugpSYQuredglsbbqsLRXpclFG4nLRebhIRARUNpfOK+1xTglh8HJjdk7bEHTX9jIbnyhtQVxHuo97fg==",
+      "dev": true
+    },
+    "@web/config-loader": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@web/config-loader/-/config-loader-0.1.2.tgz",
+      "integrity": "sha512-uh+VL79V/TJjrleAQM66Rke8jKu/J/sqzhiJ08iwGcUKV5lqUbLxGoC4RiNRwcEh8dna9HLBPpi935EuAD5tnw==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.3.2"
+      }
+    },
+    "@web/dev-server-core": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/@web/dev-server-core/-/dev-server-core-0.2.17.tgz",
+      "integrity": "sha512-fBxj5cqf+PjkBUMxnMZ4YS9vfARxVfl4cB20nc0y8jwy5zGAE7RPUcVSRoKP+1uWHnXos0oEqth0hphzyJxBbw==",
+      "dev": true,
+      "requires": {
+        "@types/koa": "^2.11.6",
+        "@types/ws": "^7.2.6",
+        "@web/parse5-utils": "^1.0.0",
+        "chokidar": "^3.4.0",
+        "clone": "^2.1.2",
+        "es-module-lexer": "^0.3.24",
+        "get-stream": "^6.0.0",
+        "is-stream": "^2.0.0",
+        "isbinaryfile": "^4.0.6",
+        "koa": "^2.13.0",
+        "koa-etag": "^3.0.0",
+        "koa-static": "^5.0.0",
+        "lru-cache": "^5.1.1",
+        "mime-types": "^2.1.27",
+        "parse5": "^6.0.0",
+        "picomatch": "^2.2.2",
+        "ws": "^7.3.1"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz",
+          "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "@web/dev-server-esbuild": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@web/dev-server-esbuild/-/dev-server-esbuild-0.2.6.tgz",
+      "integrity": "sha512-nOtQEI63kPux9vPRcQb2P5323RxuWdSu9GMMiVVRqPqDVxSa8IJHhnzV5yRidGnea9TsgV+caFeTTW0leod34g==",
+      "dev": true,
+      "requires": {
+        "@mdn/browser-compat-data": "^2.0.2",
+        "@web/dev-server-core": "^0.2.2",
+        "esbuild": "^0.7.15",
+        "parse5": "^6.0.1",
+        "ua-parser-js": "^0.7.21"
+      }
+    },
+    "@web/dev-server-rollup": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@web/dev-server-rollup/-/dev-server-rollup-0.2.11.tgz",
+      "integrity": "sha512-cqeXC93BElaKIV0Bel05M86Or5HQKem7FuBjfoMMlgp0irt6ZYCovYe7l2rG0Hw+/MCYaNs+uxjMK5UYLuWMBw==",
+      "dev": true,
+      "requires": {
+        "@web/dev-server-core": "^0.2.17",
+        "chalk": "^4.1.0",
+        "parse5": "^6.0.1",
+        "rollup": "^2.33.2",
+        "whatwg-url": "^8.1.0"
+      }
+    },
+    "@web/parse5-utils": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@web/parse5-utils/-/parse5-utils-1.1.2.tgz",
+      "integrity": "sha512-/JQHbK53BmYiFK2igr2B+Psl2Ivp2ju75Nx1InZweTbxLQNGG9yUBaudER85aqebIH6smkPkKwVtpdBXBiwy1A==",
+      "dev": true,
+      "requires": {
+        "@types/parse5": "^5.0.3",
+        "parse5": "^6.0.1"
+      }
+    },
+    "@web/test-runner": {
+      "version": "0.9.12",
+      "resolved": "https://registry.npmjs.org/@web/test-runner/-/test-runner-0.9.12.tgz",
+      "integrity": "sha512-ufpYHVN7GQU3ZN6qAXnstlSVnZ0QAj/gIKdiBwl8eOK1Ucg9wxknpaidTouX/nqdey9MI8qCYIl5wRtfo5iHMg==",
+      "dev": true,
+      "requires": {
+        "@rollup/plugin-node-resolve": "^8.4.0",
+        "@web/config-loader": "^0.1.2",
+        "@web/dev-server-rollup": "^0.2.9",
+        "@web/test-runner-chrome": "^0.7.3",
+        "@web/test-runner-cli": "^0.6.13",
+        "@web/test-runner-commands": "^0.2.1",
+        "@web/test-runner-core": "^0.8.11",
+        "@web/test-runner-mocha": "^0.5.1",
+        "@web/test-runner-saucelabs": "^0.1.1",
+        "command-line-args": "^5.1.1",
+        "deepmerge": "^4.2.2",
+        "globby": "^11.0.1"
+      }
+    },
+    "@web/test-runner-chrome": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-chrome/-/test-runner-chrome-0.7.3.tgz",
+      "integrity": "sha512-wf4SZ8nPTontLML/QwAmsR/+e9+rcuPiirbz63ulsBpX939Kn6LuOPPF4axL66gxJJ/BP++PJeCWtsCnowzveA==",
+      "dev": true,
+      "requires": {
+        "@types/puppeteer-core": "^2.0.0",
+        "@web/test-runner-core": "^0.8.11",
+        "@web/test-runner-coverage-v8": "^0.2.3",
+        "chrome-launcher": "^0.13.4",
+        "puppeteer-core": "^5.3.1"
+      }
+    },
+    "@web/test-runner-cli": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-cli/-/test-runner-cli-0.6.13.tgz",
+      "integrity": "sha512-c2Hm+n0CxpyHoch+17ODmpepYmTWZ1YleG3J7nCwLGzvnI3umv5pi/82AFcuMYJnW+9R2YYfhW+8bHKX7Mq6Cw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@types/babel__code-frame": "^7.0.2",
+        "@web/browser-logs": "^0.1.2",
+        "@web/config-loader": "^0.1.1",
+        "@web/test-runner-chrome": "^0.7.3",
+        "@web/test-runner-core": "^0.8.11",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "command-line-args": "^5.1.1",
+        "command-line-usage": "^6.1.0",
+        "convert-source-map": "^1.7.0",
+        "deepmerge": "^4.2.2",
+        "diff": "^4.0.2",
+        "globby": "^11.0.1",
+        "ip": "^1.1.5",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-reports": "^3.0.2",
+        "log-update": "^4.0.0",
+        "open": "^7.0.4",
+        "portfinder": "^1.0.28",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "@web/test-runner-commands": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-commands/-/test-runner-commands-0.2.1.tgz",
+      "integrity": "sha512-usbgVGIihxfHIPv1FPDueEzET51SM8X6ZVZY+k8MgFzab018JyhqvkDVEgRVmSfg1gWKvqRdA5Qpr11b+GGBeA==",
+      "dev": true,
+      "requires": {
+        "@web/test-runner-core": "^0.8.4"
+      }
+    },
+    "@web/test-runner-core": {
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-core/-/test-runner-core-0.8.11.tgz",
+      "integrity": "sha512-NyCm9tNaUFkO9P7sI9/z/E7CSP4sxlEnygHmo9mqbWOGW3aNsasqEcYHxQgGMW1HJrohDCigWRJZhMSFNOYd1Q==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@web/browser-logs": "^0.1.5",
+        "@web/dev-server-core": "^0.2.11",
+        "co-body": "^6.0.0",
+        "debounce": "^1.2.0",
+        "dependency-graph": "^0.9.0",
+        "globby": "^11.0.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "picomatch": "^2.2.2",
+        "uuid": "^8.1.0"
+      }
+    },
+    "@web/test-runner-coverage-v8": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-coverage-v8/-/test-runner-coverage-v8-0.2.3.tgz",
+      "integrity": "sha512-vfDjbENCJsDxY2NwAclOKC5y9MkI+KIx0U/JSPZsowzx2dYZHOqKQfRknZa2nyC9wf3pqbBUrgy0g231t5nkyQ==",
+      "dev": true,
+      "requires": {
+        "@web/test-runner-core": "^0.8.11",
+        "istanbul-lib-coverage": "^3.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      }
+    },
+    "@web/test-runner-mocha": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-mocha/-/test-runner-mocha-0.5.1.tgz",
+      "integrity": "sha512-/8VBh3nP2sE/a320CfRI/J1TLT8ChPy0xGBafh3gg59+jOTtHCfZzHet7nre/VTOOvu1H24XEZiyhMFud6WVXQ==",
+      "dev": true,
+      "requires": {
+        "@types/mocha": "^8.0.1",
+        "@web/test-runner-core": "^0.8.4"
+      },
+      "dependencies": {
+        "@types/mocha": {
+          "version": "8.0.4",
+          "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.0.4.tgz",
+          "integrity": "sha512-M4BwiTJjHmLq6kjON7ZoI2JMlBvpY3BYSdiP6s/qCT3jb1s9/DeJF0JELpAxiVSIxXDzfNKe+r7yedMIoLbknQ==",
+          "dev": true
+        }
+      }
+    },
+    "@web/test-runner-saucelabs": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-saucelabs/-/test-runner-saucelabs-0.1.3.tgz",
+      "integrity": "sha512-f0i3vn96WKs9zwpghUCkuYztALaNv5m5on8NTj7JoLY00FhVpdxbeanpB4Ej5i9xTu6aelmKoILPK88KIE+dAw==",
+      "dev": true,
+      "requires": {
+        "@web/dev-server-esbuild": "^0.2.4",
+        "@web/test-runner-selenium": "^0.3.3",
+        "ip": "^1.1.5",
+        "saucelabs": "^4.5.0",
+        "selenium-webdriver": "^4.0.0-alpha.7",
+        "uuid": "^8.3.0"
+      }
+    },
+    "@web/test-runner-selenium": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@web/test-runner-selenium/-/test-runner-selenium-0.3.3.tgz",
+      "integrity": "sha512-KyHH7ZZ0SkyAXmwpx+lTCuDs6/YXnqHn5mSdhNw2oYA6ZHrPWOdw8bvLXJItfLBGkJc0nn6hs9bqYp9qdyHHVA==",
+      "dev": true,
+      "requires": {
+        "@web/test-runner-core": "^0.8.4",
+        "selenium-webdriver": "^4.0.0-alpha.7"
+      }
+    },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true
+    },
+    "add-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz",
+      "integrity": "sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.11.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
+      }
+    },
+    "ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^2.0.1"
+      }
+    },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+      "dev": true
+    },
+    "archive-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
+      "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
+      "dev": true,
+      "requires": {
+        "file-type": "^4.2.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
+          "dev": true
+        }
+      }
+    },
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-ify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
+      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
+      }
+    },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
+    "array.prototype.flat": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
+    "babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
+    "bin-check": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
+      "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.7.0",
+        "executable": "^4.1.0"
+      }
+    },
+    "bin-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
+      "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "find-versions": "^3.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "bin-version-check": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
+      "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
+      "dev": true,
+      "requires": {
+        "bin-version": "^3.0.0",
+        "semver": "^5.6.0",
+        "semver-truncate": "^1.1.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "bin-wrapper": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
+      "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
+      "dev": true,
+      "requires": {
+        "bin-check": "^4.1.0",
+        "bin-version-check": "^4.0.0",
+        "download": "^7.1.0",
+        "import-lazy": "^3.1.0",
+        "os-filter-obj": "^2.0.0",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "import-lazy": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
+          "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
+          "dev": true
+        }
+      }
+    },
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "dev": true
+    },
+    "bl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
+      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "dev": true
+    },
+    "cache-content-type": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
+      "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
+      "dev": true,
+      "requires": {
+        "mime-types": "^2.1.18",
+        "ylru": "^1.2.0"
+      }
+    },
+    "cacheable-lookup": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz",
+      "integrity": "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==",
+      "dev": true
+    },
+    "cacheable-request": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+      "dev": true,
+      "requires": {
+        "clone-response": "1.0.2",
+        "get-stream": "3.0.0",
+        "http-cache-semantics": "3.8.1",
+        "keyv": "3.0.0",
+        "lowercase-keys": "1.0.0",
+        "normalize-url": "2.0.1",
+        "responselike": "1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "lowercase-keys": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+          "dev": true
+        }
+      }
+    },
+    "call-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
+      "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.0"
+      }
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz",
+      "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==",
+      "dev": true,
+      "requires": {
+        "pascal-case": "^3.1.1",
+        "tslib": "^1.10.0"
+      }
+    },
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      }
+    },
+    "capital-case": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.3.tgz",
+      "integrity": "sha512-OlUSJpUr7SY0uZFOxcwnDOU7/MpHlKTZx2mqnDYQFrDudXLFm0JJ9wr/l4csB+rh2Ug0OPuoSO53PqiZBqno9A==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0",
+        "upper-case-first": "^2.0.1"
+      }
+    },
+    "caw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+      "dev": true,
+      "requires": {
+        "get-proxy": "^2.0.0",
+        "isurl": "^1.0.0-alpha5",
+        "tunnel-agent": "^0.6.0",
+        "url-to-options": "^1.0.1"
+      }
+    },
+    "chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "change-case": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.1.tgz",
+      "integrity": "sha512-qRlUWn/hXnX1R1LBDF/RelJLiqNjKjUqlmuBVSEIyye8kq49CXqkZWKmi8XeUAdDXWFOcGLUMZ+aHn3Q5lzUXw==",
+      "dev": true,
+      "requires": {
+        "camel-case": "^4.1.1",
+        "capital-case": "^1.0.3",
+        "constant-case": "^3.0.3",
+        "dot-case": "^3.0.3",
+        "header-case": "^2.0.3",
+        "no-case": "^3.0.3",
+        "param-case": "^3.0.3",
+        "pascal-case": "^3.1.1",
+        "path-case": "^3.0.3",
+        "sentence-case": "^3.0.3",
+        "snake-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+      "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.5.0"
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
+    "chrome-launcher": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.4.tgz",
+      "integrity": "sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "escape-string-regexp": "^1.0.5",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^0.5.3",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "clean-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
+      "integrity": "sha1-jffHquUf02h06PjQW5GAvBGj/tc=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
+    },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "co-body": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/co-body/-/co-body-6.1.0.tgz",
+      "integrity": "sha512-m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ==",
+      "dev": true,
+      "requires": {
+        "inflation": "^2.0.0",
+        "qs": "^6.5.2",
+        "raw-body": "^2.3.3",
+        "type-is": "^1.6.16"
+      }
+    },
+    "color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "requires": {
+        "color-name": "~1.1.4"
+      }
+    },
+    "color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz",
+      "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "command-line-args": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
+      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+      "dev": true,
+      "requires": {
+        "array-back": "^3.0.1",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      }
+    },
+    "command-line-usage": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz",
+      "integrity": "sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==",
+      "dev": true,
+      "requires": {
+        "array-back": "^4.0.1",
+        "chalk": "^2.4.2",
+        "table-layout": "^1.0.1",
+        "typical": "^5.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "array-back": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz",
+          "integrity": "sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+          "dev": true
+        }
+      }
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "commonmark": {
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
+      "integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
+      "dev": true,
+      "requires": {
+        "entities": "~ 1.1.1",
+        "mdurl": "~ 1.0.1",
+        "minimist": "~ 1.2.0",
+        "string.prototype.repeat": "^0.2.0"
+      }
+    },
+    "compare-func": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
+      "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==",
+      "dev": true,
+      "requires": {
+        "array-ify": "^1.0.0",
+        "dot-prop": "^5.1.0"
+      }
+    },
+    "compare-versions": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.0.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "config-chain": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "constant-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.3.tgz",
+      "integrity": "sha512-FXtsSnnrFYpzDmvwDGQW+l8XK3GV1coLyBN0eBz16ZUzGaZcT2ANVCJmLeuw2GQgxKHQIe9e0w2dzkSfaRlUmA==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0",
+        "upper-case": "^2.0.1"
+      }
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "conventional-changelog": {
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.23.tgz",
+      "integrity": "sha512-sScUu2NHusjRC1dPc5p8/b3kT78OYr95/Bx7Vl8CPB8tF2mG1xei5iylDTRjONV5hTlzt+Cn/tBWrKdd299b7A==",
+      "dev": true,
+      "requires": {
+        "conventional-changelog-angular": "^5.0.11",
+        "conventional-changelog-atom": "^2.0.7",
+        "conventional-changelog-codemirror": "^2.0.7",
+        "conventional-changelog-conventionalcommits": "^4.4.0",
+        "conventional-changelog-core": "^4.2.0",
+        "conventional-changelog-ember": "^2.0.8",
+        "conventional-changelog-eslint": "^3.0.8",
+        "conventional-changelog-express": "^2.0.5",
+        "conventional-changelog-jquery": "^3.0.10",
+        "conventional-changelog-jshint": "^2.0.8",
+        "conventional-changelog-preset-loader": "^2.3.4"
+      }
+    },
+    "conventional-changelog-angular": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz",
+      "integrity": "sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^2.0.0",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-atom": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz",
+      "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-codemirror": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz",
+      "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-config-spec": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz",
+      "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==",
+      "dev": true
+    },
+    "conventional-changelog-conventionalcommits": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz",
+      "integrity": "sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^2.0.0",
+        "lodash": "^4.17.15",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-core": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.1.tgz",
+      "integrity": "sha512-8cH8/DEoD3e5Q6aeogdR5oaaKs0+mG6+f+Om0ZYt3PNv7Zo0sQhu4bMDRsqAF+UTekTAtP1W/C41jH/fkm8Jtw==",
+      "dev": true,
+      "requires": {
+        "add-stream": "^1.0.0",
+        "conventional-changelog-writer": "^4.0.18",
+        "conventional-commits-parser": "^3.2.0",
+        "dateformat": "^3.0.0",
+        "get-pkg-repo": "^1.0.0",
+        "git-raw-commits": "2.0.0",
+        "git-remote-origin-url": "^2.0.0",
+        "git-semver-tags": "^4.1.1",
+        "lodash": "^4.17.15",
+        "normalize-package-data": "^3.0.0",
+        "q": "^1.5.1",
+        "read-pkg": "^3.0.0",
+        "read-pkg-up": "^3.0.0",
+        "shelljs": "^0.8.3",
+        "through2": "^4.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "dargs": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+          "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "git-raw-commits": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
+          "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+          "dev": true,
+          "requires": {
+            "dargs": "^4.0.1",
+            "lodash.template": "^4.0.2",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0"
+          },
+          "dependencies": {
+            "through2": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+              "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+              "dev": true,
+              "requires": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+              }
+            }
+          }
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+          "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist": "^1.1.3",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0"
+          },
+          "dependencies": {
+            "normalize-package-data": {
+              "version": "2.5.0",
+              "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+              "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+              "dev": true,
+              "requires": {
+                "hosted-git-info": "^2.1.4",
+                "resolve": "^1.10.0",
+                "semver": "2 || 3 || 4 || 5",
+                "validate-npm-package-license": "^3.0.1"
+              }
+            }
+          }
+        },
+        "minimist-options": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+          "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+          "dev": true,
+          "requires": {
+            "arrify": "^1.0.1",
+            "is-plain-obj": "^1.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "quick-lru": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+          "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          },
+          "dependencies": {
+            "normalize-package-data": {
+              "version": "2.5.0",
+              "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+              "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+              "dev": true,
+              "requires": {
+                "hosted-git-info": "^2.1.4",
+                "resolve": "^1.10.0",
+                "semver": "2 || 3 || 4 || 5",
+                "validate-npm-package-license": "^3.0.1"
+              }
+            }
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        }
+      }
+    },
+    "conventional-changelog-ember": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz",
+      "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-eslint": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz",
+      "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-express": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz",
+      "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-jquery": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz",
+      "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==",
+      "dev": true,
+      "requires": {
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-jshint": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz",
+      "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^2.0.0",
+        "q": "^1.5.1"
+      }
+    },
+    "conventional-changelog-preset-loader": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz",
+      "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==",
+      "dev": true
+    },
+    "conventional-changelog-writer": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.18.tgz",
+      "integrity": "sha512-mAQDCKyB9HsE8Ko5cCM1Jn1AWxXPYV0v8dFPabZRkvsiWUul2YyAqbIaoMKF88Zf2ffnOPSvKhboLf3fnjo5/A==",
+      "dev": true,
+      "requires": {
+        "compare-func": "^2.0.0",
+        "conventional-commits-filter": "^2.0.7",
+        "dateformat": "^3.0.0",
+        "handlebars": "^4.7.6",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.15",
+        "meow": "^8.0.0",
+        "semver": "^6.0.0",
+        "split": "^1.0.0",
+        "through2": "^4.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "conventional-commits-filter": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz",
+      "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==",
+      "dev": true,
+      "requires": {
+        "lodash.ismatch": "^4.4.0",
+        "modify-values": "^1.0.0"
+      }
+    },
+    "conventional-commits-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz",
+      "integrity": "sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==",
+      "dev": true,
+      "requires": {
+        "JSONStream": "^1.0.4",
+        "is-text-path": "^1.0.1",
+        "lodash": "^4.17.15",
+        "meow": "^8.0.0",
+        "split2": "^2.0.0",
+        "through2": "^4.0.0",
+        "trim-off-newlines": "^1.0.0"
+      }
+    },
+    "conventional-recommended-bump": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.0.10.tgz",
+      "integrity": "sha512-2ibrqAFMN3ZA369JgVoSbajdD/BHN6zjY7DZFKTHzyzuQejDUCjQ85S5KHxCRxNwsbDJhTPD5hOKcis/jQhRgg==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^2.0.0",
+        "conventional-changelog-preset-loader": "^2.3.4",
+        "conventional-commits-filter": "^2.0.6",
+        "conventional-commits-parser": "^3.1.0",
+        "git-raw-commits": "2.0.0",
+        "git-semver-tags": "^4.1.0",
+        "meow": "^7.0.0",
+        "q": "^1.5.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "dargs": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
+          "integrity": "sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "git-raw-commits": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz",
+          "integrity": "sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==",
+          "dev": true,
+          "requires": {
+            "dargs": "^4.0.1",
+            "lodash.template": "^4.0.2",
+            "meow": "^4.0.0",
+            "split2": "^2.0.0",
+            "through2": "^2.0.0"
+          },
+          "dependencies": {
+            "meow": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz",
+              "integrity": "sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==",
+              "dev": true,
+              "requires": {
+                "camelcase-keys": "^4.0.0",
+                "decamelize-keys": "^1.0.0",
+                "loud-rejection": "^1.0.0",
+                "minimist": "^1.1.3",
+                "minimist-options": "^3.0.1",
+                "normalize-package-data": "^2.3.4",
+                "read-pkg-up": "^3.0.0",
+                "redent": "^2.0.0",
+                "trim-newlines": "^2.0.0"
+              }
+            }
+          }
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+          "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
+          "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
+          "dev": true,
+          "requires": {
+            "@types/minimist": "^1.2.0",
+            "camelcase-keys": "^6.2.2",
+            "decamelize-keys": "^1.1.0",
+            "hard-rejection": "^2.1.0",
+            "minimist-options": "4.1.0",
+            "normalize-package-data": "^2.5.0",
+            "read-pkg-up": "^7.0.1",
+            "redent": "^3.0.0",
+            "trim-newlines": "^3.0.0",
+            "type-fest": "^0.13.1",
+            "yargs-parser": "^18.1.3"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+              "dev": true
+            },
+            "camelcase-keys": {
+              "version": "6.2.2",
+              "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+              "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+              "dev": true,
+              "requires": {
+                "camelcase": "^5.3.1",
+                "map-obj": "^4.0.0",
+                "quick-lru": "^4.0.1"
+              }
+            },
+            "find-up": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+              "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+              }
+            },
+            "indent-string": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+              "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+              "dev": true
+            },
+            "locate-path": {
+              "version": "5.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+              "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^4.1.0"
+              }
+            },
+            "map-obj": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
+              "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
+              "dev": true
+            },
+            "minimist-options": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+              "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+              "dev": true,
+              "requires": {
+                "arrify": "^1.0.1",
+                "is-plain-obj": "^1.1.0",
+                "kind-of": "^6.0.3"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+              "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.2.0"
+              }
+            },
+            "p-try": {
+              "version": "2.2.0",
+              "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+              "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+              "dev": true
+            },
+            "parse-json": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+              "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+              "dev": true,
+              "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+              }
+            },
+            "path-exists": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+              "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+              "dev": true
+            },
+            "quick-lru": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+              "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+              "dev": true
+            },
+            "read-pkg": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+              "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+              "dev": true,
+              "requires": {
+                "@types/normalize-package-data": "^2.4.0",
+                "normalize-package-data": "^2.5.0",
+                "parse-json": "^5.0.0",
+                "type-fest": "^0.6.0"
+              },
+              "dependencies": {
+                "type-fest": {
+                  "version": "0.6.0",
+                  "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+                  "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+                  "dev": true
+                }
+              }
+            },
+            "read-pkg-up": {
+              "version": "7.0.1",
+              "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+              "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+              "dev": true,
+              "requires": {
+                "find-up": "^4.1.0",
+                "read-pkg": "^5.2.0",
+                "type-fest": "^0.8.1"
+              },
+              "dependencies": {
+                "type-fest": {
+                  "version": "0.8.1",
+                  "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+                  "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+                  "dev": true
+                }
+              }
+            },
+            "redent": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+              "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+              "dev": true,
+              "requires": {
+                "indent-string": "^4.0.0",
+                "strip-indent": "^3.0.0"
+              }
+            },
+            "strip-indent": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+              "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+              "dev": true,
+              "requires": {
+                "min-indent": "^1.0.0"
+              }
+            },
+            "trim-newlines": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
+              "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
+              "dev": true
+            }
+          }
+        },
+        "minimist-options": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz",
+          "integrity": "sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==",
+          "dev": true,
+          "requires": {
+            "arrify": "^1.0.1",
+            "is-plain-obj": "^1.1.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "quick-lru": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz",
+          "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
+      }
+    },
+    "cookies": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz",
+      "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==",
+      "dev": true,
+      "requires": {
+        "depd": "~2.0.0",
+        "keygrip": "~1.1.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        }
+      }
+    },
+    "core-js": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
+      "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
+      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+      "dev": true,
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      }
+    },
+    "cross-env": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz",
+      "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
+        }
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "dargs": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz",
+      "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==",
+      "dev": true
+    },
+    "dateformat": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
+      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
+      "dev": true
+    },
+    "debounce": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz",
+      "integrity": "sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "map-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "dev": true
+        }
+      }
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "decompress": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
+      "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.0.0",
+        "decompress-tarbz2": "^4.0.0",
+        "decompress-targz": "^4.0.0",
+        "decompress-unzip": "^4.0.1",
+        "graceful-fs": "^4.1.10",
+        "make-dir": "^1.0.0",
+        "pify": "^2.3.0",
+        "strip-dirs": "^2.0.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+              "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+              "dev": true
+            }
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
+    "decompress-tar": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+      "dev": true,
+      "requires": {
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0",
+        "tar-stream": "^1.5.2"
+      },
+      "dependencies": {
+        "bl": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+          "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.3.5",
+            "safe-buffer": "^5.1.1"
+          }
+        },
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "dev": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+              "dev": true
+            }
+          }
+        },
+        "tar-stream": {
+          "version": "1.6.2",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+          "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+          "dev": true,
+          "requires": {
+            "bl": "^1.0.0",
+            "buffer-alloc": "^1.2.0",
+            "end-of-stream": "^1.0.0",
+            "fs-constants": "^1.0.0",
+            "readable-stream": "^2.3.0",
+            "to-buffer": "^1.1.1",
+            "xtend": "^4.0.0"
+          }
+        }
+      }
+    },
+    "decompress-tarbz2": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.1.0",
+        "file-type": "^6.1.0",
+        "is-stream": "^1.1.0",
+        "seek-bzip": "^1.0.5",
+        "unbzip2-stream": "^1.0.9"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+      "dev": true,
+      "requires": {
+        "decompress-tar": "^4.1.1",
+        "file-type": "^5.2.0",
+        "is-stream": "^1.1.0"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        }
+      }
+    },
+    "decompress-unzip": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+      "dev": true,
+      "requires": {
+        "file-type": "^3.8.0",
+        "get-stream": "^2.2.0",
+        "pify": "^2.3.0",
+        "yauzl": "^2.4.2"
+      },
+      "dependencies": {
+        "file-type": {
+          "version": "3.9.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+          "dev": true
+        },
+        "get-stream": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
+    },
+    "deep-freeze": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
+      "integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
+    "defer-to-connect": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz",
+      "integrity": "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "dependency-graph": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz",
+      "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==",
+      "dev": true
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
+      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
+      "dev": true
+    },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true
+    },
+    "devtools-protocol": {
+      "version": "0.0.818844",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+      "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg=="
+    },
+    "diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true
+    },
+    "diff-sequences": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
+      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "dev": true
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dot-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz",
+      "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "dotgitignore": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz",
+      "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "download": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
+      "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+      "dev": true,
+      "requires": {
+        "archive-type": "^4.0.0",
+        "caw": "^2.0.1",
+        "content-disposition": "^0.5.2",
+        "decompress": "^4.2.0",
+        "ext-name": "^5.0.0",
+        "file-type": "^8.1.0",
+        "filenamify": "^2.0.0",
+        "get-stream": "^3.0.0",
+        "got": "^8.3.1",
+        "make-dir": "^1.2.0",
+        "p-event": "^2.1.0",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "got": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+          "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+          "dev": true,
+          "requires": {
+            "@sindresorhus/is": "^0.7.0",
+            "cacheable-request": "^2.1.1",
+            "decompress-response": "^3.3.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "into-stream": "^3.1.0",
+            "is-retry-allowed": "^1.1.0",
+            "isurl": "^1.0.0-alpha5",
+            "lowercase-keys": "^1.0.0",
+            "mimic-response": "^1.0.0",
+            "p-cancelable": "^0.4.0",
+            "p-timeout": "^2.0.1",
+            "pify": "^3.0.0",
+            "safe-buffer": "^5.1.1",
+            "timed-out": "^4.0.1",
+            "url-parse-lax": "^3.0.0",
+            "url-to-options": "^1.0.1"
+          }
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.7",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+      "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.2",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.1",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      }
+    },
+    "es-module-lexer": {
+      "version": "0.3.26",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz",
+      "integrity": "sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==",
+      "dev": true
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "esbuild": {
+      "version": "0.7.22",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.7.22.tgz",
+      "integrity": "sha512-B43SYg8LGWYTCv9Gs0RnuLNwjzpuWOoCaZHTWEDEf5AfrnuDMerPVMdCEu7xOdhFvQ+UqfP2MGU9lxEy0JzccA==",
+      "dev": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint": {
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz",
+      "integrity": "sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@eslint/eslintrc": "^0.2.1",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.0",
+        "esquery": "^1.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash": "^4.17.19",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-ast-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz",
+      "integrity": "sha512-otzzTim2/1+lVrlH19EfQQJEhVJSu0zOb9ygb3iapN6UlyaDtyRq4b5U1FuW0v1lRa9Fp/GJyHkSwm6NqABgCA==",
+      "dev": true,
+      "requires": {
+        "lodash.get": "^4.4.2",
+        "lodash.zip": "^4.2.0"
+      }
+    },
+    "eslint-config-prettier": {
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz",
+      "integrity": "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==",
+      "dev": true,
+      "requires": {
+        "get-stdin": "^6.0.0"
+      },
+      "dependencies": {
+        "get-stdin": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.1.0"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-module-utils": "^2.6.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
+        "tsconfig-paths": "^3.9.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-mocha": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-8.0.0.tgz",
+      "integrity": "sha512-n67etbWDz6NQM+HnTwZHyBwz/bLlYPOxUbw7bPuCyFujv7ZpaT/Vn6KTAbT02gf7nRljtYIjWcTxK/n8a57rQQ==",
+      "dev": true,
+      "requires": {
+        "eslint-utils": "^2.1.0",
+        "ramda": "^0.27.1"
+      }
+    },
+    "eslint-plugin-prettier": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz",
+      "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
+    "eslint-plugin-unicorn": {
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-22.0.0.tgz",
+      "integrity": "sha512-jXPOauNiVFYLr+AeU3l21Ao+iDl/G08vUWui21RCI2L1TJIIoJvAMjMR6I+QPKr8FgIumzuR6gzDKCtEx2IkzA==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^2.0.0",
+        "clean-regexp": "^1.0.0",
+        "eslint-ast-utils": "^1.1.0",
+        "eslint-template-visitor": "^2.2.1",
+        "eslint-utils": "^2.1.0",
+        "import-modules": "^2.0.0",
+        "lodash": "^4.17.20",
+        "pluralize": "^8.0.0",
+        "read-pkg-up": "^7.0.1",
+        "regexp-tree": "^0.1.21",
+        "reserved-words": "^0.1.2",
+        "safe-regex": "^2.1.1",
+        "semver": "^7.3.2"
+      }
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint-template-visitor": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-template-visitor/-/eslint-template-visitor-2.2.1.tgz",
+      "integrity": "sha512-q3SxoBXz0XjPGkUpwGVAwIwIPIxzCAJX1uwfVc8tW3v7u/zS7WXNH3I2Mu2MDz2NgSITAyKLRaQFPHu/iyKxDQ==",
+      "dev": true,
+      "requires": {
+        "babel-eslint": "^10.1.0",
+        "eslint-visitor-keys": "^1.3.0",
+        "esquery": "^1.3.1",
+        "multimap": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "dev": true
+    },
+    "espree": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz",
+      "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "estree-walker": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+          "dev": true
+        }
+      }
+    },
+    "executable": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+      "dev": true,
+      "requires": {
+        "pify": "^2.2.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "expect": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+      "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^25.5.0",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^25.2.6",
+        "jest-matcher-utils": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-regex-util": "^25.2.6"
+      }
+    },
+    "ext-list": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+      "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+      "dev": true,
+      "requires": {
+        "mime-db": "^1.28.0"
+      }
+    },
+    "ext-name": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+      "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+      "dev": true,
+      "requires": {
+        "ext-list": "^2.0.0",
+        "sort-keys-length": "^1.0.0"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
+    "fast-glob": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      }
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastq": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
+      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
+      }
+    },
+    "file-type": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
+      "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+      "dev": true
+    },
+    "filename-reserved-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+      "dev": true
+    },
+    "filenamify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+      "dev": true,
+      "requires": {
+        "filename-reserved-regex": "^2.0.0",
+        "strip-outer": "^1.0.0",
+        "trim-repeated": "^1.0.0"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "dev": true,
+      "requires": {
+        "array-back": "^3.0.1"
+      }
+    },
+    "find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "requires": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      }
+    },
+    "find-versions": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
+      "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
+      "dev": true,
+      "requires": {
+        "semver-regex": "^2.0.0"
+      }
+    },
+    "flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
+    },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "form-data": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "^1.0.0"
+      }
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
+    "fs-extra": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+      "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+      "dev": true,
+      "requires": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz",
+      "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-pkg-repo": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
+      "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "meow": "^3.3.0",
+        "normalize-package-data": "^2.3.0",
+        "parse-github-repo-url": "^1.3.0",
+        "through2": "^2.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        },
+        "camelcase-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^2.0.0",
+            "map-obj": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "get-stdin": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+          "dev": true
+        },
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "indent-string": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+          "dev": true,
+          "requires": {
+            "repeating": "^2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "strip-bom": "^2.0.0"
+          }
+        },
+        "map-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "dev": true
+        },
+        "meow": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^2.0.0",
+            "decamelize": "^1.1.2",
+            "loud-rejection": "^1.0.0",
+            "map-obj": "^1.0.1",
+            "minimist": "^1.1.3",
+            "normalize-package-data": "^2.3.4",
+            "object-assign": "^4.0.1",
+            "read-pkg-up": "^1.0.1",
+            "redent": "^1.0.0",
+            "trim-newlines": "^1.0.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^1.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^1.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+          "dev": true,
+          "requires": {
+            "find-up": "^1.0.0",
+            "read-pkg": "^1.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "redent": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^2.1.0",
+            "strip-indent": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "dev": true,
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        },
+        "strip-indent": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+          "dev": true,
+          "requires": {
+            "get-stdin": "^4.0.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
+        "trim-newlines": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+          "dev": true
+        }
+      }
+    },
+    "get-proxy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+      "dev": true,
+      "requires": {
+        "npm-conf": "^1.1.0"
+      }
+    },
+    "get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "git-raw-commits": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.8.tgz",
+      "integrity": "sha512-6Gk7tQHGMLEL1bSnrMJTCVt2AQl4EmCcJDtzs/JJacCb2+TNEyHM67Gp7Ri9faF7OcGpjGGRjHLvs/AG7QKZ2Q==",
+      "dev": true,
+      "requires": {
+        "dargs": "^7.0.0",
+        "lodash.template": "^4.0.2",
+        "meow": "^8.0.0",
+        "split2": "^2.0.0",
+        "through2": "^4.0.0"
+      }
+    },
+    "git-remote-origin-url": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz",
+      "integrity": "sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=",
+      "dev": true,
+      "requires": {
+        "gitconfiglocal": "^1.0.0",
+        "pify": "^2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "git-semver-tags": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz",
+      "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==",
+      "dev": true,
+      "requires": {
+        "meow": "^8.0.0",
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "gitconfiglocal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz",
+      "integrity": "sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.2"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
+    "globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.8.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        }
+      }
+    },
+    "globby": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
+      }
+    },
+    "got": {
+      "version": "11.8.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.0.tgz",
+      "integrity": "sha512-k9noyoIIY9EejuhaBNLyZ31D5328LeqnyPNXJQb2XlJZcKakLqN5m6O/ikhq/0lw56kUYS54fVm+D1x57YC9oQ==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.1",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "dependencies": {
+        "@sindresorhus/is": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz",
+          "integrity": "sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==",
+          "dev": true
+        },
+        "cacheable-request": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz",
+          "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==",
+          "dev": true,
+          "requires": {
+            "clone-response": "^1.0.2",
+            "get-stream": "^5.1.0",
+            "http-cache-semantics": "^4.0.0",
+            "keyv": "^4.0.0",
+            "lowercase-keys": "^2.0.0",
+            "normalize-url": "^4.1.0",
+            "responselike": "^2.0.0"
+          }
+        },
+        "decompress-response": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+          "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+          "dev": true,
+          "requires": {
+            "mimic-response": "^3.1.0"
+          }
+        },
+        "http-cache-semantics": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+          "dev": true
+        },
+        "json-buffer": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+          "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+          "dev": true
+        },
+        "keyv": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
+          "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
+          "dev": true,
+          "requires": {
+            "json-buffer": "3.0.1"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        },
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+          "dev": true
+        },
+        "p-cancelable": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
+          "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==",
+          "dev": true
+        },
+        "responselike": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
+          "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
+          "dev": true,
+          "requires": {
+            "lowercase-keys": "^2.0.0"
+          }
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
+    "handlebars": {
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
+      }
+    },
+    "hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
+    },
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+      "dev": true,
+      "requires": {
+        "has-symbol-support-x": "^1.4.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
+    },
+    "header-case": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.3.tgz",
+      "integrity": "sha512-LChe/V32mnUQnTwTxd3aAlNMk8ia9tjCDb/LjYtoMrdAPApxLB+azejUk5ERZIZdIqvinwv6BAUuFXH/tQPdZA==",
+      "dev": true,
+      "requires": {
+        "capital-case": "^1.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz",
+      "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "http-assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz",
+      "integrity": "sha512-rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==",
+      "dev": true,
+      "requires": {
+        "deep-equal": "~1.0.1",
+        "http-errors": "~1.7.2"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        }
+      }
+    },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz",
+      "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+          "dev": true
+        }
+      }
+    },
+    "http2-wrapper": {
+      "version": "1.0.0-beta.5.2",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz",
+      "integrity": "sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==",
+      "dev": true,
+      "requires": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "dependencies": {
+        "quick-lru": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+          "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+          "dev": true
+        }
+      }
+    },
+    "https-proxy-agent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "requires": {
+        "agent-base": "5",
+        "debug": "4"
+      }
+    },
+    "husky": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz",
+      "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0",
+        "ci-info": "^2.0.0",
+        "compare-versions": "^3.6.0",
+        "cosmiconfig": "^7.0.0",
+        "find-versions": "^3.2.0",
+        "opencollective-postinstall": "^2.0.2",
+        "pkg-dir": "^4.2.0",
+        "please-upgrade-node": "^3.2.0",
+        "slash": "^3.0.0",
+        "which-pm-runs": "^1.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true
+    },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz",
+      "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
+      }
+    },
+    "import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true
+    },
+    "import-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-modules/-/import-modules-2.0.0.tgz",
+      "integrity": "sha512-iczM/v9drffdNnABOKwj0f9G3cFDon99VcG1mxeBsdqnbd+vnQ5c2uAiCHNQITqFTOPaEvwg3VjoWCur0uHLEw==",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflation": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz",
+      "integrity": "sha1-i0F+R8KPklpFEz2RTKH9OJEH8w8=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true
+    },
+    "into-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+      "dev": true,
+      "requires": {
+        "from2": "^2.1.1",
+        "p-is-promise": "^1.1.0"
+      }
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
+      "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+      "dev": true
+    },
+    "is-docker": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-generator-function": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz",
+      "integrity": "sha512-YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
+      "dev": true
+    },
+    "is-natural-number": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true
+    },
+    "is-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "dev": true
+    },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "is-text-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz",
+      "integrity": "sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=",
+      "dev": true,
+      "requires": {
+        "text-extensions": "^1.0.0"
+      }
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
+      "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "isurl": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
+      "requires": {
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
+      }
+    },
+    "jest-diff": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "dev": true,
+      "requires": {
+        "chalk": "^3.0.0",
+        "diff-sequences": "^25.2.6",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
+      }
+    },
+    "jest-get-type": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "dev": true
+    },
+    "jest-matcher-utils": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+      "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^3.0.0",
+        "jest-diff": "^25.5.0",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
+      }
+    },
+    "jest-message-util": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+      "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^25.5.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
+      }
+    },
+    "jest-regex-util": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
+      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
+      "dev": true
+    },
+    "jju": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz",
+      "integrity": "sha1-o6vicYryQaKykE+EpiWXDzia4yo=",
+      "dev": true
+    },
+    "jpeg-js": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz",
+      "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "dev": true
+        }
+      }
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
+    "jszip": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz",
+      "integrity": "sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==",
+      "dev": true,
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "just-extend": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz",
+      "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==",
+      "dev": true
+    },
+    "keygrip": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+      "dev": true,
+      "requires": {
+        "tsscmp": "1.0.6"
+      }
+    },
+    "keyv": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
+      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "koa": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/koa/-/koa-2.13.0.tgz",
+      "integrity": "sha512-i/XJVOfPw7npbMv67+bOeXr3gPqOAw6uh5wFyNs3QvJ47tUx3M3V9rIE0//WytY42MKz4l/MXKyGkQ2LQTfLUQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "^1.3.5",
+        "cache-content-type": "^1.0.0",
+        "content-disposition": "~0.5.2",
+        "content-type": "^1.0.4",
+        "cookies": "~0.8.0",
+        "debug": "~3.1.0",
+        "delegates": "^1.0.0",
+        "depd": "^1.1.2",
+        "destroy": "^1.0.4",
+        "encodeurl": "^1.0.2",
+        "escape-html": "^1.0.3",
+        "fresh": "~0.5.2",
+        "http-assert": "^1.3.0",
+        "http-errors": "^1.6.3",
+        "is-generator-function": "^1.0.7",
+        "koa-compose": "^4.1.0",
+        "koa-convert": "^1.2.0",
+        "on-finished": "^2.3.0",
+        "only": "~0.0.2",
+        "parseurl": "^1.3.2",
+        "statuses": "^1.5.0",
+        "type-is": "^1.6.16",
+        "vary": "^1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "koa-compose": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
+      "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
+      "dev": true
+    },
+    "koa-convert": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz",
+      "integrity": "sha1-2kCHXfSd4FOQmNFwC1CCDOvNIdA=",
+      "dev": true,
+      "requires": {
+        "co": "^4.6.0",
+        "koa-compose": "^3.0.0"
+      },
+      "dependencies": {
+        "koa-compose": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz",
+          "integrity": "sha1-qFzLQLfZhtjlo0Wzoazo6rz1Tec=",
+          "dev": true,
+          "requires": {
+            "any-promise": "^1.1.0"
+          }
+        }
+      }
+    },
+    "koa-etag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/koa-etag/-/koa-etag-3.0.0.tgz",
+      "integrity": "sha1-nvc4Ld1agqsN6xU0FckVg293HT8=",
+      "dev": true,
+      "requires": {
+        "etag": "^1.3.0",
+        "mz": "^2.1.0"
+      }
+    },
+    "koa-send": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz",
+      "integrity": "sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "http-errors": "^1.7.3",
+        "resolve-path": "^1.4.0"
+      }
+    },
+    "koa-static": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz",
+      "integrity": "sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.1.0",
+        "koa-send": "^5.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "lighthouse-logger": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz",
+      "integrity": "sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.8",
+        "marky": "^1.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.2.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "dev": true
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
+      "dev": true
+    },
+    "lodash.ismatch": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz",
+      "integrity": "sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=",
+      "dev": true
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "lodash.zip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz",
+      "integrity": "sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.0.0"
+      }
+    },
+    "log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
+      "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.10.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
+      "integrity": "sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==",
+      "dev": true
+    },
+    "marky": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz",
+      "integrity": "sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==",
+      "dev": true
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "meow": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz",
+      "integrity": "sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==",
+      "dev": true,
+      "requires": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      }
+    },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.0.5"
+      }
+    },
+    "mime": {
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.44.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "mocha": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz",
+      "integrity": "sha512-cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w==",
+      "dev": true,
+      "requires": {
+        "@ungap/promise-all-settled": "1.1.2",
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.4.3",
+        "debug": "4.2.0",
+        "diff": "4.0.2",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.1.6",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.14.0",
+        "log-symbols": "4.0.0",
+        "minimatch": "3.0.4",
+        "ms": "2.1.2",
+        "nanoid": "3.1.12",
+        "serialize-javascript": "5.0.1",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "7.2.0",
+        "which": "2.0.2",
+        "wide-align": "1.1.3",
+        "workerpool": "6.0.2",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "3.14.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+          "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+          "dev": true,
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz",
+          "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          },
+          "dependencies": {
+            "find-up": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+              "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+              "dev": true,
+              "requires": {
+                "locate-path": "^3.0.0"
+              }
+            },
+            "locate-path": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+              "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+              "dev": true,
+              "requires": {
+                "p-locate": "^3.0.0",
+                "path-exists": "^3.0.0"
+              }
+            },
+            "p-limit": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+              "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+              "dev": true,
+              "requires": {
+                "p-try": "^2.0.0"
+              }
+            },
+            "p-locate": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+              "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+              "dev": true,
+              "requires": {
+                "p-limit": "^2.0.0"
+              }
+            },
+            "path-exists": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+              "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+              "dev": true
+            }
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "modify-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz",
+      "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "multimap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+      "integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==",
+      "dev": true
+    },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "nanoid": {
+      "version": "3.1.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
+      "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "nise": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz",
+      "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.7.0",
+        "@sinonjs/fake-timers": "^6.0.0",
+        "@sinonjs/text-encoding": "^0.7.1",
+        "just-extend": "^4.0.2",
+        "path-to-regexp": "^1.7.0"
+      }
+    },
+    "no-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
+      "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^2.0.1",
+        "tslib": "^1.10.0"
+      }
+    },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+    },
+    "normalize-package-data": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz",
+      "integrity": "sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^3.0.6",
+        "resolve": "^1.17.0",
+        "semver": "^7.3.2",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0",
+        "query-string": "^5.0.1",
+        "sort-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "sort-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+          "dev": true,
+          "requires": {
+            "is-plain-obj": "^1.0.0"
+          }
+        }
+      }
+    },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "requires": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "only": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
+      "integrity": "sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=",
+      "dev": true
+    },
+    "open": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
+      "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      }
+    },
+    "opencollective-postinstall": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
+      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
+      "dev": true
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "os-filter-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
+      "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
+      "dev": true,
+      "requires": {
+        "arch": "^2.1.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-cancelable": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+      "dev": true
+    },
+    "p-event": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
+      "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+      "dev": true,
+      "requires": {
+        "p-timeout": "^2.0.1"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "requires": {
+        "p-limit": "^2.2.0"
+      }
+    },
+    "p-timeout": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "param-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
+      "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
+      "dev": true,
+      "requires": {
+        "dot-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-github-repo-url": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
+      "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
+      "dev": true
+    },
+    "parse-json": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+      "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascal-case": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz",
+      "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "path-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.3.tgz",
+      "integrity": "sha512-UMFU6UETFpCNWbIWNczshPrnK/7JAXBP2NYw80ojElbQ2+JYxdqWDBkvvqM93u4u6oLmuJ/tPOf2tM8KtXv4eg==",
+      "dev": true,
+      "requires": {
+        "dot-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+      "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+      "dev": true,
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pixelmatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
+      "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=",
+      "dev": true,
+      "requires": {
+        "pngjs": "^3.0.0"
+      },
+      "dependencies": {
+        "pngjs": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+          "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+          "dev": true
+        }
+      }
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "please-upgrade-node": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+      "dev": true,
+      "requires": {
+        "semver-compare": "^1.0.0"
+      }
+    },
+    "pluralize": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "dev": true
+    },
+    "pngjs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+      "dev": true
+    },
+    "portfinder": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+      "dev": true
+    },
+    "prettier": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz",
+      "integrity": "sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
+    "pretty-format": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^25.5.0",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^16.12.0"
+      }
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "puppeteer-core": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
+      "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.818844",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^4.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      }
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
+      "dev": true
+    },
+    "query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true
+    },
+    "ramda": {
+      "version": "0.27.1",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
+      "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "raw-body": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz",
+      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.3",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
+          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        }
+      }
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
+    "read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "requires": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "2.8.8",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+          "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+          "dev": true
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "requires": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      }
+    },
+    "reduce-flatten": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
+      "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "dev": true
+    },
+    "regexp-tree": {
+      "version": "0.1.21",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.21.tgz",
+      "integrity": "sha512-kUUXjX4AnqnR8KRTCrayAo9PzYMRKmVoGgaz2tBuz0MF3g1ZbGebmtW0yFHfFK9CmBjQKeYIgoL22pFLBJY7sw==",
+      "dev": true
+    },
+    "regexpp": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "reserved-words": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
+      "integrity": "sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.1.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-alpn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
+      "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==",
+      "dev": true
+    },
+    "resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true
+    },
+    "resolve-global": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz",
+      "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==",
+      "dev": true,
+      "requires": {
+        "global-dirs": "^0.1.1"
+      }
+    },
+    "resolve-path": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz",
+      "integrity": "sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=",
+      "dev": true,
+      "requires": {
+        "http-errors": "~1.6.2",
+        "path-is-absolute": "1.0.1"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
+      }
+    },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "rollup": {
+      "version": "2.33.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz",
+      "integrity": "sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==",
+      "dev": true,
+      "requires": {
+        "fsevents": "~2.1.2"
+      }
+    },
+    "run-parallel": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+      "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-2.1.1.tgz",
+      "integrity": "sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==",
+      "dev": true,
+      "requires": {
+        "regexp-tree": "~0.1.1"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "saucelabs": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-4.5.2.tgz",
+      "integrity": "sha512-D5T+KMFMi2PFS64Qhsjc/ibO9hSGRTC2VDi0D4MXvuNkbEc9vT8yx+l7PwrLlnDoN8jfJdpKiCrTe4Of3FpRvw==",
+      "dev": true,
+      "requires": {
+        "bin-wrapper": "^4.1.0",
+        "change-case": "^4.1.1",
+        "form-data": "^3.0.0",
+        "got": "^11.7.0",
+        "hash.js": "^1.1.7",
+        "tunnel": "0.0.6",
+        "yargs": "^16.0.3"
+      },
+      "dependencies": {
+        "cliui": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "5.0.5",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
+          "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "16.1.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz",
+          "integrity": "sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==",
+          "dev": true,
+          "requires": {
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
+          }
+        }
+      }
+    },
+    "seek-bzip": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
+      "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.8.1"
+      }
+    },
+    "selenium-webdriver": {
+      "version": "4.0.0-alpha.7",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.7.tgz",
+      "integrity": "sha512-D4qnTsyTr91jT8f7MfN+OwY0IlU5+5FmlO5xlgRUV6hDEV8JyYx2NerdTEqDDkNq7RZDYc4VoPALk8l578RBHw==",
+      "dev": true,
+      "requires": {
+        "jszip": "^3.2.2",
+        "rimraf": "^2.7.1",
+        "tmp": "0.0.30"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "dev": true
+    },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+      "dev": true
+    },
+    "semver-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
+      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
+      "dev": true
+    },
+    "semver-truncate": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
+      "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "sentence-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.3.tgz",
+      "integrity": "sha512-ZPr4dgTcNkEfcGOMFQyDdJrTU9uQO1nb1cjf+nuzb6FxgMDgKddZOM29qEsB7jvsZSMruLRcL2KfM4ypKpa0LA==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.3",
+        "tslib": "^1.10.0",
+        "upper-case-first": "^2.0.1"
+      }
+    },
+    "serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "sinon": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz",
+      "integrity": "sha512-naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.8.1",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@sinonjs/formatio": "^5.0.1",
+        "@sinonjs/samsam": "^5.2.0",
+        "diff": "^4.0.2",
+        "nise": "^4.0.4",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      }
+    },
+    "snake-case": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.3.tgz",
+      "integrity": "sha512-WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q==",
+      "dev": true,
+      "requires": {
+        "dot-case": "^3.0.3",
+        "tslib": "^1.10.0"
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "sort-keys-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+      "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+      "dev": true,
+      "requires": {
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
+      "dev": true
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "dev": true,
+      "requires": {
+        "through": "2"
+      }
+    },
+    "split2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
+      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
+      "dev": true,
+      "requires": {
+        "through2": "^2.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "stack-utils": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.3.tgz",
+      "integrity": "sha512-WldO+YmqhEpjp23eHZRhOT1NQF51STsbxZ+/AdpFD+EhheFxAe5d0WoK4DQVJkSHacPrJJX3OqRAl9CgHf78pg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
+    },
+    "standard-version": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.0.0.tgz",
+      "integrity": "sha512-eRR04IscMP3xW9MJTykwz13HFNYs8jS33AGuDiBKgfo5YrO0qX0Nxb4rjupVwT5HDYL/aR+MBEVLjlmVFmFEDQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "conventional-changelog": "3.1.23",
+        "conventional-changelog-config-spec": "2.1.0",
+        "conventional-changelog-conventionalcommits": "4.4.0",
+        "conventional-recommended-bump": "6.0.10",
+        "detect-indent": "^6.0.0",
+        "detect-newline": "^3.1.0",
+        "dotgitignore": "^2.1.0",
+        "figures": "^3.1.0",
+        "find-up": "^4.1.0",
+        "fs-access": "^1.0.1",
+        "git-semver-tags": "^4.0.0",
+        "semver": "^7.1.1",
+        "stringify-package": "^1.0.1",
+        "yargs": "^15.3.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "conventional-changelog-conventionalcommits": {
+          "version": "4.4.0",
+          "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.4.0.tgz",
+          "integrity": "sha512-ybvx76jTh08tpaYrYn/yd0uJNLt5yMrb1BphDe4WBredMlvPisvMghfpnJb6RmRNcqXeuhR6LfGZGewbkRm9yA==",
+          "dev": true,
+          "requires": {
+            "compare-func": "^2.0.0",
+            "lodash": "^4.17.15",
+            "q": "^1.5.1"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "string.prototype.repeat": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
+      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=",
+      "dev": true
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.18.0-next.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+          "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-negative-zero": "^2.0.0",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "stringify-package": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz",
+      "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
+    "strip-dirs": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+      "dev": true,
+      "requires": {
+        "is-natural-number": "^4.0.1"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "requires": {
+        "min-indent": "^1.0.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
+    },
+    "strip-outer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
+      "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "astral-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+          "dev": true
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+          "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "astral-regex": "^1.0.0",
+            "is-fullwidth-code-point": "^2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "table-layout": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz",
+      "integrity": "sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==",
+      "dev": true,
+      "requires": {
+        "array-back": "^4.0.1",
+        "deep-extend": "~0.6.0",
+        "typical": "^5.2.0",
+        "wordwrapjs": "^4.0.0"
+      },
+      "dependencies": {
+        "array-back": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz",
+          "integrity": "sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==",
+          "dev": true
+        },
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+          "dev": true
+        }
+      }
+    },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
+      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
+    "text-diff": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/text-diff/-/text-diff-1.0.1.tgz",
+      "integrity": "sha1-bBBZBUNeM3hXN1ydL2ymPkU/9WU=",
+      "dev": true
+    },
+    "text-extensions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz",
+      "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==",
+      "dev": true
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": ">= 3.1.0 < 4"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "3"
+      }
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+      "dev": true
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.30",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+      "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.1"
+      }
+    },
+    "to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
+    "tr46": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
+      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz",
+      "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
+      "dev": true
+    },
+    "trim-off-newlines": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
+      "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=",
+      "dev": true
+    },
+    "trim-repeated": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
+      "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.2"
+      }
+    },
+    "ts-node": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.0.0.tgz",
+      "integrity": "sha512-/TqB4SnererCDR/vb4S/QvSZvzQMJN8daAslg7MeaiHvD8rDZsSfXmNeNumyZZzMned72Xoq/isQljYSt8Ynfg==",
+      "dev": true,
+      "requires": {
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
+      }
+    },
+    "tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
+      "dev": true
+    },
+    "tsutils": {
+      "version": "3.17.1",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
+      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "3.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
+      "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
+      "dev": true
+    },
+    "typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "dev": true
+    },
+    "ua-parser-js": {
+      "version": "0.7.22",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
+      "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.11.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz",
+      "integrity": "sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g==",
+      "dev": true,
+      "optional": true
+    },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "upper-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.1.tgz",
+      "integrity": "sha512-laAsbea9SY5osxrv7S99vH9xAaJKrw5Qpdh4ENRLcaxipjKsiaBwiAsxfa8X5mObKNTQPsupSq0J/VIxsSJe3A==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.10.0"
+      }
+    },
+    "upper-case-first": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.1.tgz",
+      "integrity": "sha512-105J8XqQ+9RxW3l9gHZtgve5oaiR9TIwvmZAMAIZWRHe00T21cdvewKORTlOJf/zXW6VukuTshM+HXZNWz7N5w==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.10.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "url-to-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
+      "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
+      "dev": true
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "uuid": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz",
+      "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+      "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+      "dev": true
+    },
+    "v8-to-istanbul": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz",
+      "integrity": "sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "validator": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-8.2.0.tgz",
+      "integrity": "sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true
+    },
+    "whatwg-url": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
+      "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+      "dev": true,
+      "requires": {
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^2.0.2",
+        "webidl-conversions": "^6.1.0"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "which-pm-runs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "wordwrapjs": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz",
+      "integrity": "sha512-Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ==",
+      "dev": true,
+      "requires": {
+        "reduce-flatten": "^2.0.0",
+        "typical": "^5.0.0"
+      },
+      "dependencies": {
+        "typical": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
+          "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==",
+          "dev": true
+        }
+      }
+    },
+    "workerpool": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz",
+      "integrity": "sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz",
+      "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "yaml": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
+      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "requires": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "dependencies": {
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "dev": true
+    },
+    "yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+          "dev": true
+        },
+        "decamelize": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+          "dev": true
+        },
+        "is-plain-obj": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+          "dev": true
+        }
+      }
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
+    "ylru": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz",
+      "integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==",
+      "dev": true
+    },
+    "yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true
+    },
+    "z-schema": {
+      "version": "3.18.4",
+      "resolved": "https://registry.npmjs.org/z-schema/-/z-schema-3.18.4.tgz",
+      "integrity": "sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.7.1",
+        "lodash.get": "^4.0.0",
+        "lodash.isequal": "^4.0.0",
+        "validator": "^8.0.0"
+      }
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/README.md firefox-85.0+build1/remote/test/puppeteer/README.md
--- firefox-84.0.2+build1/remote/test/puppeteer/README.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/README.md	2021-01-18 19:58:18.000000000 +0000
@@ -6,7 +6,7 @@
 
 <img src="https://user-images.githubusercontent.com/10379601/29446482-04f7036a-841f-11e7-9872-91d1fc2ea683.png" height="200" align="right">
 
-###### [API](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md) | [FAQ](#faq) | [Contributing](https://github.com/puppeteer/puppeteer/blob/main/CONTRIBUTING.md) | [Troubleshooting](https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md)
+###### [API](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md) | [FAQ](#faq) | [Contributing](https://github.com/puppeteer/puppeteer/blob/main/CONTRIBUTING.md) | [Troubleshooting](https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md)
 
 > Puppeteer is a Node library which provides a high-level API to control Chrome or Chromium over the [DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/). Puppeteer runs [headless](https://developers.google.com/web/updates/2017/04/headless-chrome) by default, but can be configured to run full (non-headless) Chrome or Chromium.
 
@@ -37,7 +37,7 @@
 # or "yarn add puppeteer"
 ```
 
-Note: When you install Puppeteer, it downloads a recent version of Chromium (~170MB Mac, ~282MB Linux, ~280MB Win) that is guaranteed to work with the API. To skip the download, or to download a different browser, see [Environment variables](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#environment-variables).
+Note: When you install Puppeteer, it downloads a recent version of Chromium (~170MB Mac, ~282MB Linux, ~280MB Win) that is guaranteed to work with the API. To skip the download, or to download a different browser, see [Environment variables](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#environment-variables).
 
 
 ### puppeteer-core
@@ -63,7 +63,7 @@
 Node 8.9.0+. Starting from v3.0.0 Puppeteer starts to rely on Node 10.18.1+. All examples below use async/await which is only supported in Node v7.6.0 or greater.
 
 Puppeteer will be familiar to people using other browser testing frameworks. You create an instance
-of `Browser`, open pages, and then manipulate them with [Puppeteer's API](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#).
+of `Browser`, open pages, and then manipulate them with [Puppeteer's API](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#).
 
 **Example** - navigating to https://example.com and saving a screenshot as *example.png*:
 
@@ -88,7 +88,7 @@
 node example.js
 ```
 
-Puppeteer sets an initial page size to 800×600px, which defines the screenshot size. The page size can be customized  with [`Page.setViewport()`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#pagesetviewportviewport).
+Puppeteer sets an initial page size to 800×600px, which defines the screenshot size. The page size can be customized  with [`Page.setViewport()`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#pagesetviewportviewport).
 
 **Example** - create a PDF.
 
@@ -113,7 +113,7 @@
 node hn.js
 ```
 
-See [`Page.pdf()`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#pagepdfoptions) for more information about creating pdfs.
+See [`Page.pdf()`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#pagepdfoptions) for more information about creating pdfs.
 
 **Example** - evaluate script in the context of the page
 
@@ -148,7 +148,7 @@
 node get-dimensions.js
 ```
 
-See [`Page.evaluate()`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#pageevaluatepagefunction-args) for more information on `evaluate` and related methods like `evaluateOnNewDocument` and `exposeFunction`.
+See [`Page.evaluate()`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#pageevaluatepagefunction-args) for more information on `evaluate` and related methods like `evaluateOnNewDocument` and `exposeFunction`.
 
 <!-- [END getstarted] -->
 
@@ -157,7 +157,7 @@
 
 **1. Uses Headless mode**
 
-Puppeteer launches Chromium in [headless mode](https://developers.google.com/web/updates/2017/04/headless-chrome). To launch a full version of Chromium, set the [`headless` option](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#puppeteerlaunchoptions) when launching a browser:
+Puppeteer launches Chromium in [headless mode](https://developers.google.com/web/updates/2017/04/headless-chrome). To launch a full version of Chromium, set the [`headless` option](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#puppeteerlaunchoptions) when launching a browser:
 
 ```js
 const browser = await puppeteer.launch({headless: false}); // default is true
@@ -173,7 +173,7 @@
 const browser = await puppeteer.launch({executablePath: '/path/to/Chrome'});
 ```
 
-You can also use Puppeteer with Firefox Nightly (experimental support). See [`Puppeteer.launch()`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#puppeteerlaunchoptions) for more information.
+You can also use Puppeteer with Firefox Nightly (experimental support). See [`Puppeteer.launch()`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#puppeteerlaunchoptions) for more information.
 
 See [`this article`](https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/) for a description of the differences between Chromium and Chrome. [`This article`](https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md) describes some differences for Linux users.
 
@@ -185,7 +185,7 @@
 
 ## Resources
 
-- [API Documentation](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md)
+- [API Documentation](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md)
 - [Examples](https://github.com/puppeteer/puppeteer/tree/main/examples/)
 - [Community list of Puppeteer resources](https://github.com/transitive-bullshit/awesome-puppeteer)
 
@@ -328,7 +328,7 @@
 
 Official Firefox support is currently experimental. The ongoing collaboration with Mozilla aims to support common end-to-end testing use cases, for which developers expect cross-browser coverage. The Puppeteer team needs input from users to stabilize Firefox support and to bring missing APIs to our attention.
 
-From Puppeteer v2.1.0 onwards you can specify [`puppeteer.launch({product: 'firefox'})`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#puppeteerlaunchoptions) to run your Puppeteer scripts in Firefox Nightly, without any additional custom patches. While [an older experiment](https://www.npmjs.com/package/puppeteer-firefox) required a patched version of Firefox, [the current approach](https://wiki.mozilla.org/Remote) works with “stock� Firefox.
+From Puppeteer v2.1.0 onwards you can specify [`puppeteer.launch({product: 'firefox'})`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#puppeteerlaunchoptions) to run your Puppeteer scripts in Firefox Nightly, without any additional custom patches. While [an older experiment](https://www.npmjs.com/package/puppeteer-firefox) required a patched version of Firefox, [the current approach](https://wiki.mozilla.org/Remote) works with “stock� Firefox.
 
 We will continue to collaborate with other browser vendors to bring Puppeteer support to browsers such as Safari.
 This effort includes exploration of a standard for executing cross-browser commands (instead of relying on the non-standard DevTools Protocol used by Chrome).
@@ -424,7 +424,7 @@
 
 You may find that Puppeteer does not behave as expected when controlling pages that incorporate audio and video. (For example, [video playback/screenshots is likely to fail](https://github.com/puppeteer/puppeteer/issues/291).) There are two reasons for this:
 
-* Puppeteer is bundled with Chromium — not Chrome — and so by default, it inherits all of [Chromium's media-related limitations](https://www.chromium.org/audio-video). This means that Puppeteer does not support licensed formats such as AAC or H.264. (However, it is possible to force Puppeteer to use a separately-installed version Chrome instead of Chromium via the [`executablePath` option to `puppeteer.launch`](https://github.com/puppeteer/puppeteer/blob/v5.0.0/docs/api.md#puppeteerlaunchoptions). You should only use this configuration if you need an official release of Chrome that supports these media formats.)
+* Puppeteer is bundled with Chromium — not Chrome — and so by default, it inherits all of [Chromium's media-related limitations](https://www.chromium.org/audio-video). This means that Puppeteer does not support licensed formats such as AAC or H.264. (However, it is possible to force Puppeteer to use a separately-installed version Chrome instead of Chromium via the [`executablePath` option to `puppeteer.launch`](https://github.com/puppeteer/puppeteer/blob/v5.5.0/docs/api.md#puppeteerlaunchoptions). You should only use this configuration if you need an official release of Chrome that supports these media formats.)
 * Since Puppeteer (in all configurations) controls a desktop version of Chromium/Chrome, features that are only supported by the mobile version of Chrome are not supported. This means that Puppeteer [does not support HTTP Live Streaming (HLS)](https://caniuse.com/#feat=http-live-streaming).
 
 #### Q: I am having trouble installing / running Puppeteer in my test environment. Where should I look for help?
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/scripts/ensure-correct-devtools-protocol-package.ts firefox-85.0+build1/remote/test/puppeteer/scripts/ensure-correct-devtools-protocol-package.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/scripts/ensure-correct-devtools-protocol-package.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/scripts/ensure-correct-devtools-protocol-package.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,84 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This script ensures that the pinned version of devtools-protocol in
+ * package.json is the right version for the current revision of Chromium that
+ * Puppeteer ships with.
+ *
+ * The devtools-protocol package publisher runs every hour and checks if there
+ * are protocol changes. If there are, it will be versioned with the revision
+ * number of the commit that last changed the .pdl files.
+ *
+ * Chromium branches/releases are figured out at a later point in time, so it's
+ * not true that each Chromium revision will have an exact matching revision
+ * version of devtools-protocol. To ensure we're using a devtools-protocol that
+ * is aligned with our revision, we want to find the largest package number
+ * that's <= the revision that Puppeteer is using.
+ *
+ * This script uses npm's `view` function to list all versions in a range and
+ * find the one closest to our Chromium revision.
+ */
+
+// eslint-disable-next-line import/extensions
+import { PUPPETEER_REVISIONS } from '../src/revisions';
+import { execSync } from 'child_process';
+
+import packageJson from '../package.json';
+
+const currentProtocolPackageInstalledVersion =
+  packageJson.dependencies['devtools-protocol'];
+
+/**
+ * Ensure that the devtools-protocol version is pinned.
+ */
+if (/^[^0-9]/.test(currentProtocolPackageInstalledVersion)) {
+  console.log(
+    `ERROR: devtools-protocol package is not pinned to a specific version.\n`
+  );
+  process.exit(1);
+}
+
+// find the right revision for our Chromium revision
+
+const command = `npm view "devtools-protocol@<=0.0.${PUPPETEER_REVISIONS.chromium}" version | tail -1`;
+
+console.log(
+  'Checking npm for devtools-protocol revisions:\n',
+  `'${command}'`,
+  '\n'
+);
+
+const output = execSync(command, {
+  encoding: 'utf8',
+});
+
+const bestRevisionFromNpm = output.split(' ')[1].replace(/'|\n/g, '');
+
+if (currentProtocolPackageInstalledVersion !== bestRevisionFromNpm) {
+  console.log(`ERROR: bad devtools-protocol revision detected:
+
+    Current Puppeteer Chromium revision: ${PUPPETEER_REVISIONS.chromium}
+    Current devtools-protocol version in package.json: ${currentProtocolPackageInstalledVersion}
+    Expected devtools-protocol version:                ${bestRevisionFromNpm}`);
+
+  process.exit(1);
+}
+
+console.log(
+  `Correct devtools-protocol version found (${bestRevisionFromNpm}).`
+);
+process.exit(0);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/scripts/test-install.sh firefox-85.0+build1/remote/test/puppeteer/scripts/test-install.sh
--- firefox-84.0.2+build1/remote/test/puppeteer/scripts/test-install.sh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/scripts/test-install.sh	2021-01-18 19:58:18.000000000 +0000
@@ -22,7 +22,7 @@
 PUPPETEER_PRODUCT=firefox npm install --loglevel silent "${tarball}"
 node --eval="require('puppeteer')"
 rm "${tarball}"
-ls $TMPDIR/node_modules/puppeteer/.local-firefox/
+ls $TMPDIR/node_modules/puppeteer/.local-firefox/linux-*/firefox/firefox
 
 # Again for puppeteer-core
 cd $ROOTDIR
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/scripts/tsconfig.json firefox-85.0+build1/remote/test/puppeteer/scripts/tsconfig.json
--- firefox-84.0.2+build1/remote/test/puppeteer/scripts/tsconfig.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/scripts/tsconfig.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS"
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/api-docs-entry.ts firefox-85.0+build1/remote/test/puppeteer/src/api-docs-entry.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/api-docs-entry.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/api-docs-entry.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,36 +19,47 @@
  * for. It is used by API Extractor to determine what parts of the system to
  * document.
  *
- * We also have src/api.ts. This is used in `index.js` and by the legacy DocLint
- * system. src/api-docs-entry.ts is ONLY used by API Extractor.
+ * The legacy DocLint system and the unit test coverage system use the list of
+ * modules defined in coverage-utils.js. src/api-docs-entry.ts is ONLY used by
+ * API Extractor.
  *
  * Once we have migrated to API Extractor and removed DocLint we can remove the
  * duplication and use this file.
  */
-export * from './common/Accessibility';
-export * from './common/Browser';
-export * from './node/BrowserFetcher';
-export * from './common/Connection';
-export * from './common/ConsoleMessage';
-export * from './common/Coverage';
-export * from './common/DeviceDescriptors';
-export * from './common/Dialog';
-export * from './common/JSHandle';
-export * from './common/ExecutionContext';
-export * from './common/EventEmitter';
-export * from './common/FileChooser';
-export * from './common/FrameManager';
-export * from './common/Input';
-export * from './common/Page';
-export * from './common/Puppeteer';
-export * from './node/LaunchOptions';
-export * from './node/Launcher';
-export * from './common/HTTPRequest';
-export * from './common/HTTPResponse';
-export * from './common/SecurityDetails';
-export * from './common/Target';
-export * from './common/Errors';
-export * from './common/Tracing';
-export * from './common/WebWorker';
-export * from './common/USKeyboardLayout';
-export * from './common/EvalTypes';
+export * from './common/Accessibility.js';
+export * from './common/Browser.js';
+export * from './node/BrowserFetcher.js';
+export * from './node/Puppeteer.js';
+export * from './common/Connection.js';
+export * from './common/ConsoleMessage.js';
+export * from './common/Coverage.js';
+export * from './common/DeviceDescriptors.js';
+export * from './common/Dialog.js';
+export * from './common/DOMWorld.js';
+export * from './common/JSHandle.js';
+export * from './common/ExecutionContext.js';
+export * from './common/EventEmitter.js';
+export * from './common/FileChooser.js';
+export * from './common/FrameManager.js';
+export * from './common/Input.js';
+export * from './common/Page.js';
+export * from './common/Product.js';
+export * from './common/Puppeteer.js';
+export * from './common/BrowserConnector.js';
+export * from './node/Launcher.js';
+export * from './node/LaunchOptions.js';
+export * from './common/HTTPRequest.js';
+export * from './common/HTTPResponse.js';
+export * from './common/SecurityDetails.js';
+export * from './common/Target.js';
+export * from './common/Errors.js';
+export * from './common/Tracing.js';
+export * from './common/NetworkManager.js';
+export * from './common/WebWorker.js';
+export * from './common/USKeyboardLayout.js';
+export * from './common/EvalTypes.js';
+export * from './common/PDFOptions.js';
+export * from './common/TimeoutSettings.js';
+export * from './common/LifecycleWatcher.js';
+export * from './common/QueryHandler.js';
+export * from 'devtools-protocol/types/protocol';
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/api.ts firefox-85.0+build1/remote/test/puppeteer/src/api.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/api.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/api.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/**
- * Copyright 2019 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-// @ts-nocheck
-
-/* This file is used in two places:
- * 1) the coverage-utils use it to gain a list of all methods we check for test
- *    coverage on
- * 2) index.js uses it to iterate through all methods and call
- *    helper.installAsyncStackHooks on
- */
-module.exports = {
-  Accessibility: require('./common/Accessibility').Accessibility,
-  Browser: require('./common/Browser').Browser,
-  BrowserContext: require('./common/Browser').BrowserContext,
-  BrowserFetcher: require('./node/BrowserFetcher').BrowserFetcher,
-  CDPSession: require('./common/Connection').CDPSession,
-  ConsoleMessage: require('./common/ConsoleMessage').ConsoleMessage,
-  Coverage: require('./common/Coverage').Coverage,
-  Dialog: require('./common/Dialog').Dialog,
-  ElementHandle: require('./common/JSHandle').ElementHandle,
-  ExecutionContext: require('./common/ExecutionContext').ExecutionContext,
-  EventEmitter: require('./common/EventEmitter').EventEmitter,
-  FileChooser: require('./common/FileChooser').FileChooser,
-  Frame: require('./common/FrameManager').Frame,
-  JSHandle: require('./common/JSHandle').JSHandle,
-  Keyboard: require('./common/Input').Keyboard,
-  Mouse: require('./common/Input').Mouse,
-  Page: require('./common/Page').Page,
-  Puppeteer: require('./common/Puppeteer').Puppeteer,
-  HTTPRequest: require('./common/HTTPRequest').HTTPRequest,
-  HTTPResponse: require('./common/HTTPResponse').HTTPResponse,
-  SecurityDetails: require('./common/SecurityDetails').SecurityDetails,
-  Target: require('./common/Target').Target,
-  TimeoutError: require('./common/Errors').TimeoutError,
-  Touchscreen: require('./common/Input').Touchscreen,
-  Tracing: require('./common/Tracing').Tracing,
-  WebWorker: require('./common/WebWorker').WebWorker,
-};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Accessibility.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Accessibility.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Accessibility.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Accessibility.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { CDPSession } from './Connection';
-import { ElementHandle } from './JSHandle';
-import Protocol from '../protocol';
+import { CDPSession } from './Connection.js';
+import { ElementHandle } from './JSHandle.js';
+import { Protocol } from 'devtools-protocol';
 
 /**
  * Represents a Node and the properties of it that are relevant to Accessibility.
@@ -96,12 +96,12 @@
  */
 export interface SnapshotOptions {
   /**
-   * Prune unintersting nodes from the tree.
+   * Prune uninteresting nodes from the tree.
    * @defaultValue true
    */
   interestingOnly?: boolean;
   /**
-   * Prune unintersting nodes from the tree.
+   * Root node to get the accessibility tree for
    * @defaultValue The root node of the entire page.
    */
   root?: ElementHandle;
@@ -208,13 +208,13 @@
 
   private serializeTree(
     node: AXNode,
-    whitelistedNodes?: Set<AXNode>
+    interestingNodes?: Set<AXNode>
   ): SerializedAXNode[] {
     const children: SerializedAXNode[] = [];
     for (const child of node.children)
-      children.push(...this.serializeTree(child, whitelistedNodes));
+      children.push(...this.serializeTree(child, interestingNodes));
 
-    if (whitelistedNodes && !whitelistedNodes.has(node)) return children;
+    if (interestingNodes && !interestingNodes.has(node)) return children;
 
     const serializedNode = node.serialize();
     if (children.length) serializedNode.children = children;
@@ -244,12 +244,14 @@
   private _hidden = false;
   private _name: string;
   private _role: string;
+  private _ignored: boolean;
   private _cachedHasFocusableChild?: boolean;
 
   constructor(payload: Protocol.Accessibility.AXNode) {
     this.payload = payload;
     this._name = this.payload.name ? this.payload.name.value : '';
     this._role = this.payload.role ? this.payload.role.value : 'Unknown';
+    this._ignored = this.payload.ignored;
 
     for (const property of this.payload.properties || []) {
       if (property.name === 'editable') {
@@ -264,11 +266,7 @@
   private _isPlainTextField(): boolean {
     if (this._richlyEditable) return false;
     if (this._editable) return true;
-    return (
-      this._role === 'textbox' ||
-      this._role === 'ComboBox' ||
-      this._role === 'searchbox'
-    );
+    return this._role === 'textbox' || this._role === 'searchbox';
   }
 
   private _isTextOnlyObject(): boolean {
@@ -354,6 +352,7 @@
       case 'tab':
       case 'textbox':
       case 'tree':
+      case 'treeitem':
         return true;
       default:
         return false;
@@ -362,7 +361,7 @@
 
   public isInteresting(insideControl: boolean): boolean {
     const role = this._role;
-    if (role === 'Ignored' || this._hidden) return false;
+    if (role === 'Ignored' || this._hidden || this._ignored) return false;
 
     if (this._focusable || this._richlyEditable) return true;
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/AriaQueryHandler.ts firefox-85.0+build1/remote/test/puppeteer/src/common/AriaQueryHandler.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/AriaQueryHandler.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/AriaQueryHandler.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,140 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { InternalQueryHandler } from './QueryHandler.js';
+import { ElementHandle, JSHandle } from './JSHandle.js';
+import { Protocol } from 'devtools-protocol';
+import { CDPSession } from './Connection.js';
+import { DOMWorld, PageBinding, WaitForSelectorOptions } from './DOMWorld.js';
+
+async function queryAXTree(
+  client: CDPSession,
+  element: ElementHandle,
+  accessibleName?: string,
+  role?: string
+): Promise<Protocol.Accessibility.AXNode[]> {
+  const { nodes } = await client.send('Accessibility.queryAXTree', {
+    objectId: element._remoteObject.objectId,
+    accessibleName,
+    role,
+  });
+  const filteredNodes: Protocol.Accessibility.AXNode[] = nodes.filter(
+    (node: Protocol.Accessibility.AXNode) => node.role.value !== 'text'
+  );
+  return filteredNodes;
+}
+
+/*
+ * The selectors consist of an accessible name to query for and optionally
+ * further aria attributes on the form `[<attribute>=<value>]`.
+ * Currently, we only support the `name` and `role` attribute.
+ * The following examples showcase how the syntax works wrt. querying:
+ * - 'title[role="heading"]' queries for elements with name 'title' and role 'heading'.
+ * - '[role="img"]' queries for elements with role 'img' and any name.
+ * - 'label' queries for elements with name 'label' and any role.
+ * - '[name=""][role="button"]' queries for elements with no name and role 'button'.
+ */
+type ariaQueryOption = { name?: string; role?: string };
+function parseAriaSelector(selector: string): ariaQueryOption {
+  const normalize = (value: string): string => value.replace(/ +/g, ' ').trim();
+  const knownAttributes = new Set(['name', 'role']);
+  const queryOptions: ariaQueryOption = {};
+  const attributeRegexp = /\[\s*(?<attribute>\w+)\s*=\s*"(?<value>\\.|[^"\\]*)"\s*\]/;
+  const defaultName = selector.replace(
+    attributeRegexp,
+    (_, attribute: string, value: string) => {
+      attribute = attribute.trim();
+      if (!knownAttributes.has(attribute))
+        throw new Error(
+          'Unkown aria attribute "${groups.attribute}" in selector'
+        );
+      queryOptions[attribute] = normalize(value);
+      return '';
+    }
+  );
+  if (defaultName && !queryOptions.name)
+    queryOptions.name = normalize(defaultName);
+  return queryOptions;
+}
+
+const queryOne = async (
+  element: ElementHandle,
+  selector: string
+): Promise<ElementHandle | null> => {
+  const exeCtx = element.executionContext();
+  const { name, role } = parseAriaSelector(selector);
+  const res = await queryAXTree(exeCtx._client, element, name, role);
+  if (res.length < 1) {
+    return null;
+  }
+  return exeCtx._adoptBackendNodeId(res[0].backendDOMNodeId);
+};
+
+const waitFor = async (
+  domWorld: DOMWorld,
+  selector: string,
+  options: WaitForSelectorOptions
+): Promise<ElementHandle<Element>> => {
+  const binding: PageBinding = {
+    name: 'ariaQuerySelector',
+    pptrFunction: async (selector: string) => {
+      const document = await domWorld._document();
+      const element = await queryOne(document, selector);
+      return element;
+    },
+  };
+  return domWorld.waitForSelectorInPage(
+    (_: Element, selector: string) => globalThis.ariaQuerySelector(selector),
+    selector,
+    options,
+    binding
+  );
+};
+
+const queryAll = async (
+  element: ElementHandle,
+  selector: string
+): Promise<ElementHandle[]> => {
+  const exeCtx = element.executionContext();
+  const { name, role } = parseAriaSelector(selector);
+  const res = await queryAXTree(exeCtx._client, element, name, role);
+  return Promise.all(
+    res.map((axNode) => exeCtx._adoptBackendNodeId(axNode.backendDOMNodeId))
+  );
+};
+
+const queryAllArray = async (
+  element: ElementHandle,
+  selector: string
+): Promise<JSHandle> => {
+  const elementHandles = await queryAll(element, selector);
+  const exeCtx = element.executionContext();
+  const jsHandle = exeCtx.evaluateHandle(
+    (...elements) => elements,
+    ...elementHandles
+  );
+  return jsHandle;
+};
+
+/**
+ * @internal
+ */
+export const ariaHandler: InternalQueryHandler = {
+  queryOne,
+  waitFor,
+  queryAll,
+  queryAllArray,
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/BrowserConnector.ts firefox-85.0+build1/remote/test/puppeteer/src/common/BrowserConnector.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/BrowserConnector.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/BrowserConnector.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,120 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConnectionTransport } from './ConnectionTransport.js';
+import { Browser } from './Browser.js';
+import { assert } from './assert.js';
+import { debugError } from '../common/helper.js';
+import { Connection } from './Connection.js';
+import { getFetch } from './fetch.js';
+import { Viewport } from './PuppeteerViewport.js';
+import { isNode } from '../environment.js';
+
+/**
+ * Generic browser options that can be passed when launching any browser.
+ * @public
+ */
+export interface BrowserOptions {
+  ignoreHTTPSErrors?: boolean;
+  defaultViewport?: Viewport;
+  slowMo?: number;
+}
+
+const getWebSocketTransportClass = async () => {
+  return isNode
+    ? (await import('../node/NodeWebSocketTransport.js')).NodeWebSocketTransport
+    : (await import('./BrowserWebSocketTransport.js'))
+        .BrowserWebSocketTransport;
+};
+
+/**
+ * Users should never call this directly; it's called when calling
+ * `puppeteer.connect`.
+ * @internal
+ */
+export const connectToBrowser = async (
+  options: BrowserOptions & {
+    browserWSEndpoint?: string;
+    browserURL?: string;
+    transport?: ConnectionTransport;
+  }
+): Promise<Browser> => {
+  const {
+    browserWSEndpoint,
+    browserURL,
+    ignoreHTTPSErrors = false,
+    defaultViewport = { width: 800, height: 600 },
+    transport,
+    slowMo = 0,
+  } = options;
+
+  assert(
+    Number(!!browserWSEndpoint) + Number(!!browserURL) + Number(!!transport) ===
+      1,
+    'Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect'
+  );
+
+  let connection = null;
+  if (transport) {
+    connection = new Connection('', transport, slowMo);
+  } else if (browserWSEndpoint) {
+    const WebSocketClass = await getWebSocketTransportClass();
+    const connectionTransport: ConnectionTransport = await WebSocketClass.create(
+      browserWSEndpoint
+    );
+    connection = new Connection(browserWSEndpoint, connectionTransport, slowMo);
+  } else if (browserURL) {
+    const connectionURL = await getWSEndpoint(browserURL);
+    const WebSocketClass = await getWebSocketTransportClass();
+    const connectionTransport: ConnectionTransport = await WebSocketClass.create(
+      connectionURL
+    );
+    connection = new Connection(connectionURL, connectionTransport, slowMo);
+  }
+
+  const { browserContextIds } = await connection.send(
+    'Target.getBrowserContexts'
+  );
+  return Browser.create(
+    connection,
+    browserContextIds,
+    ignoreHTTPSErrors,
+    defaultViewport,
+    null,
+    () => connection.send('Browser.close').catch(debugError)
+  );
+};
+
+async function getWSEndpoint(browserURL: string): Promise<string> {
+  const endpointURL = new URL('/json/version', browserURL);
+
+  const fetch = await getFetch();
+  try {
+    const result = await fetch(endpointURL.toString(), {
+      method: 'GET',
+    });
+    if (!result.ok) {
+      throw new Error(`HTTP ${result.statusText}`);
+    }
+    const data = await result.json();
+    return data.webSocketDebuggerUrl;
+  } catch (error) {
+    error.message =
+      `Failed to fetch browser webSocket URL from ${endpointURL}: ` +
+      error.message;
+    throw error;
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Browser.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Browser.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Browser.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Browser.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper } from './helper';
-import { Target } from './Target';
-import { EventEmitter } from './EventEmitter';
-import { Events } from './Events';
-import Protocol from '../protocol';
-import { Connection } from './Connection';
-import { Page } from './Page';
+import { assert } from './assert.js';
+import { helper } from './helper.js';
+import { Target } from './Target.js';
+import { EventEmitter } from './EventEmitter.js';
+import { Connection, ConnectionEmittedEvents } from './Connection.js';
+import { Protocol } from 'devtools-protocol';
+import { Page } from './Page.js';
 import { ChildProcess } from 'child_process';
-import { Viewport } from './PuppeteerViewport';
+import { Viewport } from './PuppeteerViewport.js';
 
 type BrowserCloseCallback = () => Promise<void> | void;
 
@@ -39,8 +38,61 @@
 }
 
 /**
+ * All the events a {@link Browser | browser instance} may emit.
+ *
+ * @public
+ */
+export const enum BrowserEmittedEvents {
+  /**
+   * Emitted when Puppeteer gets disconnected from the Chromium instance. This
+   * might happen because of one of the following:
+   *
+   * - Chromium is closed or crashed
+   *
+   * - The {@link Browser.disconnect | browser.disconnect } method was called.
+   */
+  Disconnected = 'disconnected',
+
+  /**
+   * Emitted when the url of a target changes. Contains a {@link Target} instance.
+   *
+   * @remarks
+   *
+   * Note that this includes target changes in incognito browser contexts.
+   */
+  TargetChanged = 'targetchanged',
+
+  /**
+   * Emitted when a target is created, for example when a new page is opened by
+   * {@link https://developer.mozilla.org/en-US/docs/Web/API/Window/open | window.open}
+   * or by {@link Browser.newPage | browser.newPage}
+   *
+   * Contains a {@link Target} instance.
+   *
+   * @remarks
+   *
+   * Note that this includes target creations in incognito browser contexts.
+   */
+  TargetCreated = 'targetcreated',
+  /**
+   * Emitted when a target is destroyed, for example when a page is closed.
+   * Contains a {@link Target} instance.
+   *
+   * @remarks
+   *
+   * Note that this includes target destructions in incognito browser contexts.
+   */
+  TargetDestroyed = 'targetdestroyed',
+}
+
+/**
  * A Browser is created when Puppeteer connects to a Chromium instance, either through
- * {@link Puppeteer.launch} or {@link Puppeteer.connect}.
+ * {@link PuppeteerNode.launch} or {@link Puppeteer.connect}.
+ *
+ * @remarks
+ *
+ * The Browser class extends from Puppeteer's {@link EventEmitter} class and will
+ * emit various events which are documented in the {@link BrowserEmittedEvents} enum.
  *
  * @example
  *
@@ -141,8 +193,8 @@
       );
 
     this._targets = new Map();
-    this._connection.on(Events.Connection.Disconnected, () =>
-      this.emit(Events.Browser.Disconnected)
+    this._connection.on(ConnectionEmittedEvents.Disconnected, () =>
+      this.emit(BrowserEmittedEvents.Disconnected)
     );
     this._connection.on('Target.targetCreated', this._targetCreated.bind(this));
     this._connection.on(
@@ -220,7 +272,7 @@
   }
 
   private async _targetCreated(
-    event: Protocol.Target.targetCreatedPayload
+    event: Protocol.Target.TargetCreatedEvent
   ): Promise<void> {
     const targetInfo = event.targetInfo;
     const { browserContextId } = targetInfo;
@@ -243,8 +295,8 @@
     this._targets.set(event.targetInfo.targetId, target);
 
     if (await target._initializedPromise) {
-      this.emit(Events.Browser.TargetCreated, target);
-      context.emit(Events.BrowserContext.TargetCreated, target);
+      this.emit(BrowserEmittedEvents.TargetCreated, target);
+      context.emit(BrowserContextEmittedEvents.TargetCreated, target);
     }
   }
 
@@ -254,15 +306,15 @@
     this._targets.delete(event.targetId);
     target._closedCallback();
     if (await target._initializedPromise) {
-      this.emit(Events.Browser.TargetDestroyed, target);
+      this.emit(BrowserEmittedEvents.TargetDestroyed, target);
       target
         .browserContext()
-        .emit(Events.BrowserContext.TargetDestroyed, target);
+        .emit(BrowserContextEmittedEvents.TargetDestroyed, target);
     }
   }
 
   private _targetInfoChanged(
-    event: Protocol.Target.targetInfoChangedPayload
+    event: Protocol.Target.TargetInfoChangedEvent
   ): void {
     const target = this._targets.get(event.targetInfo.targetId);
     assert(target, 'target should exist before targetInfoChanged');
@@ -270,8 +322,10 @@
     const wasInitialized = target._isInitialized;
     target._targetInfoChanged(event.targetInfo);
     if (wasInitialized && previousURL !== target.url()) {
-      this.emit(Events.Browser.TargetChanged, target);
-      target.browserContext().emit(Events.BrowserContext.TargetChanged, target);
+      this.emit(BrowserEmittedEvents.TargetChanged, target);
+      target
+        .browserContext()
+        .emit(BrowserContextEmittedEvents.TargetChanged, target);
     }
   }
 
@@ -361,8 +415,8 @@
     if (existingTarget) return existingTarget;
     let resolve;
     const targetPromise = new Promise<Target>((x) => (resolve = x));
-    this.on(Events.Browser.TargetCreated, check);
-    this.on(Events.Browser.TargetChanged, check);
+    this.on(BrowserEmittedEvents.TargetCreated, check);
+    this.on(BrowserEmittedEvents.TargetChanged, check);
     try {
       if (!timeout) return await targetPromise;
       return await helper.waitWithTimeout<Target>(
@@ -371,8 +425,8 @@
         timeout
       );
     } finally {
-      this.removeListener(Events.Browser.TargetCreated, check);
-      this.removeListener(Events.Browser.TargetChanged, check);
+      this.removeListener(BrowserEmittedEvents.TargetCreated, check);
+      this.removeListener(BrowserEmittedEvents.TargetChanged, check);
     }
 
     function check(target: Target): void {
@@ -446,21 +500,48 @@
     return !this._connection._closed;
   }
 
-  private _getVersion(): Promise<Protocol.Browser.getVersionReturnValue> {
+  private _getVersion(): Promise<Protocol.Browser.GetVersionResponse> {
     return this._connection.send('Browser.getVersion');
   }
 }
 
+export const enum BrowserContextEmittedEvents {
+  /**
+   * Emitted when the url of a target inside the browser context changes.
+   * Contains a {@link Target} instance.
+   */
+  TargetChanged = 'targetchanged',
+
+  /**
+   * Emitted when a target is created within the browser context, for example
+   * when a new page is opened by
+   * {@link https://developer.mozilla.org/en-US/docs/Web/API/Window/open | window.open}
+   * or by {@link BrowserContext.newPage | browserContext.newPage}
+   *
+   * Contains a {@link Target} instance.
+   */
+  TargetCreated = 'targetcreated',
+  /**
+   * Emitted when a target is destroyed within the browser context, for example
+   * when a page is closed. Contains a {@link Target} instance.
+   */
+  TargetDestroyed = 'targetdestroyed',
+}
+
 /**
- * BrowserContexts provide a way to operate multiple independent browser sessions.
- * When a browser is launched, it has a single BrowserContext used by default.
- * The method {@link Browser.newPage | Browser.newPage} creates a page
+ * BrowserContexts provide a way to operate multiple independent browser
+ * sessions. When a browser is launched, it has a single BrowserContext used by
+ * default. The method {@link Browser.newPage | Browser.newPage} creates a page
  * in the default browser context.
  *
  * @remarks
  *
- * If a page opens another page, e.g. with a `window.open` call,
- * the popup will belong to the parent page's browser context.
+ * The Browser class extends from Puppeteer's {@link EventEmitter} class and
+ * will emit various events which are documented in the
+ * {@link BrowserContextEmittedEvents} enum.
+ *
+ * If a page opens another page, e.g. with a `window.open` call, the popup will
+ * belong to the parent page's browser context.
  *
  * Puppeteer allows creation of "incognito" browser contexts with
  * {@link Browser.createIncognitoBrowserContext | Browser.createIncognitoBrowserContext}
@@ -569,7 +650,7 @@
    */
   async overridePermissions(
     origin: string,
-    permissions: Protocol.Browser.PermissionType[]
+    permissions: string[]
   ): Promise<void> {
     const webPermissionToProtocol = new Map<
       string,
@@ -591,10 +672,11 @@
       ['clipboard-read', 'clipboardReadWrite'],
       ['clipboard-write', 'clipboardReadWrite'],
       ['payment-handler', 'paymentHandler'],
+      ['idle-detection', 'idleDetection'],
       // chrome-specific permissions we have.
       ['midi-sysex', 'midiSysex'],
     ]);
-    permissions = permissions.map((permission) => {
+    const protocolPermissions = permissions.map((permission) => {
       const protocolPermission = webPermissionToProtocol.get(permission);
       if (!protocolPermission)
         throw new Error('Unknown permission: ' + permission);
@@ -603,7 +685,7 @@
     await this._connection.send('Browser.grantPermissions', {
       origin,
       browserContextId: this._id || undefined,
-      permissions,
+      permissions: protocolPermissions,
     });
   }
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/BrowserWebSocketTransport.ts firefox-85.0+build1/remote/test/puppeteer/src/common/BrowserWebSocketTransport.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/BrowserWebSocketTransport.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/BrowserWebSocketTransport.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConnectionTransport } from './ConnectionTransport.js';
+
+export class BrowserWebSocketTransport implements ConnectionTransport {
+  static create(url: string): Promise<BrowserWebSocketTransport> {
+    return new Promise((resolve, reject) => {
+      const ws = new WebSocket(url);
+
+      ws.addEventListener('open', () =>
+        resolve(new BrowserWebSocketTransport(ws))
+      );
+      ws.addEventListener('error', reject);
+    });
+  }
+
+  private _ws: WebSocket;
+  onmessage?: (message: string) => void;
+  onclose?: () => void;
+
+  constructor(ws: WebSocket) {
+    this._ws = ws;
+    this._ws.addEventListener('message', (event) => {
+      if (this.onmessage) this.onmessage.call(null, event.data);
+    });
+    this._ws.addEventListener('close', () => {
+      if (this.onclose) this.onclose.call(null);
+    });
+    // Silently ignore all errors - we don't know what to do with them.
+    this._ws.addEventListener('error', () => {});
+    this.onmessage = null;
+    this.onclose = null;
+  }
+
+  send(message: string): void {
+    this._ws.send(message);
+  }
+
+  close(): void {
+    this._ws.close();
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Connection.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Connection.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Connection.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Connection.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assert } from './assert';
-import { Events } from './Events';
-import { debug } from './Debug';
+import { assert } from './assert.js';
+import { debug } from './Debug.js';
 const debugProtocolSend = debug('puppeteer:protocol:SEND â–º');
 const debugProtocolReceive = debug('puppeteer:protocol:RECV â—€');
 
-import Protocol from '../protocol';
-import { ConnectionTransport } from './ConnectionTransport';
-import { EventEmitter } from './EventEmitter';
+import { Protocol } from 'devtools-protocol';
+import { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping.js';
+import { ConnectionTransport } from './ConnectionTransport.js';
+import { EventEmitter } from './EventEmitter.js';
 
 interface ConnectionCallback {
   resolve: Function;
@@ -30,6 +30,18 @@
   method: string;
 }
 
+/**
+ * Internal events that the Connection class emits.
+ *
+ * @internal
+ */
+export const ConnectionEmittedEvents = {
+  Disconnected: Symbol('Connection.Disconnected'),
+} as const;
+
+/**
+ * @internal
+ */
 export class Connection extends EventEmitter {
   _url: string;
   _transport: ConnectionTransport;
@@ -66,21 +78,30 @@
     return this._url;
   }
 
-  send<T extends keyof Protocol.CommandParameters>(
+  send<T extends keyof ProtocolMapping.Commands>(
     method: T,
-    params?: Protocol.CommandParameters[T]
-  ): Promise<Protocol.CommandReturnValues[T]> {
+    ...paramArgs: ProtocolMapping.Commands[T]['paramsType']
+  ): Promise<ProtocolMapping.Commands[T]['returnType']> {
+    // There is only ever 1 param arg passed, but the Protocol defines it as an
+    // array of 0 or 1 items See this comment:
+    // https://github.com/ChromeDevTools/devtools-protocol/pull/113#issuecomment-412603285
+    // which explains why the protocol defines the params this way for better
+    // type-inference.
+    // So now we check if there are any params or not and deal with them accordingly.
+    const params = paramArgs.length ? paramArgs[0] : undefined;
     const id = this._rawSend({ method, params });
     return new Promise((resolve, reject) => {
       this._callbacks.set(id, { resolve, reject, error: new Error(), method });
     });
   }
 
-  _rawSend(message: {}): number {
+  _rawSend(message: Record<string, unknown>): number {
     const id = ++this._lastId;
-    message = JSON.stringify(Object.assign({}, message, { id }));
-    debugProtocolSend(message);
-    this._transport.send(message);
+    const stringifiedMessage = JSON.stringify(
+      Object.assign({}, message, { id })
+    );
+    debugProtocolSend(stringifiedMessage);
+    this._transport.send(stringifiedMessage);
     return id;
   }
 
@@ -137,7 +158,7 @@
     this._callbacks.clear();
     for (const session of this._sessions.values()) session._onClosed();
     this._sessions.clear();
-    this.emit(Events.Connection.Disconnected);
+    this.emit(ConnectionEmittedEvents.Disconnected);
   }
 
   dispose(): void {
@@ -163,12 +184,21 @@
 interface CDPSessionOnMessageObject {
   id?: number;
   method: string;
-  params: {};
+  params: Record<string, unknown>;
   error: { message: string; data: any };
   result?: any;
 }
 
 /**
+ * Internal events that the CDPSession class emits.
+ *
+ * @internal
+ */
+export const CDPSessionEmittedEvents = {
+  Disconnected: Symbol('CDPSession.Disconnected'),
+} as const;
+
+/**
  * The `CDPSession` instances are used to talk raw Chrome Devtools Protocol.
  *
  * @remarks
@@ -212,10 +242,10 @@
     this._sessionId = sessionId;
   }
 
-  send<T extends keyof Protocol.CommandParameters>(
+  send<T extends keyof ProtocolMapping.Commands>(
     method: T,
-    params?: Protocol.CommandParameters[T]
-  ): Promise<Protocol.CommandReturnValues[T]> {
+    ...paramArgs: ProtocolMapping.Commands[T]['paramsType']
+  ): Promise<ProtocolMapping.Commands[T]['returnType']> {
     if (!this._connection)
       return Promise.reject(
         new Error(
@@ -223,6 +253,9 @@
         )
       );
 
+    // See the comment in Connection#send explaining why we do this.
+    const params = paramArgs.length ? paramArgs[0] : undefined;
+
     const id = this._connection._rawSend({
       sessionId: this._sessionId,
       method,
@@ -283,7 +316,7 @@
       );
     this._callbacks.clear();
     this._connection = null;
-    this.emit(Events.CDPSession.Disconnected);
+    this.emit(CDPSessionEmittedEvents.Disconnected);
   }
 }
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/ConsoleMessage.ts firefox-85.0+build1/remote/test/puppeteer/src/common/ConsoleMessage.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/ConsoleMessage.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/ConsoleMessage.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { JSHandle } from './JSHandle';
+import { JSHandle } from './JSHandle.js';
 
 /**
  * @public
@@ -68,7 +68,7 @@
   private _type: ConsoleMessageType;
   private _text: string;
   private _args: JSHandle[];
-  private _location: ConsoleMessageLocation;
+  private _stackTraceLocations: ConsoleMessageLocation[];
 
   /**
    * @public
@@ -77,12 +77,12 @@
     type: ConsoleMessageType,
     text: string,
     args: JSHandle[],
-    location: ConsoleMessageLocation = {}
+    stackTraceLocations: ConsoleMessageLocation[]
   ) {
     this._type = type;
     this._text = text;
     this._args = args;
-    this._location = location;
+    this._stackTraceLocations = stackTraceLocations;
   }
 
   /**
@@ -110,6 +110,13 @@
    * @returns The location of the console message.
    */
   location(): ConsoleMessageLocation {
-    return this._location;
+    return this._stackTraceLocations.length ? this._stackTraceLocations[0] : {};
+  }
+
+  /**
+   * @returns The array of locations on the stack of the console message.
+   */
+  stackTrace(): ConsoleMessageLocation[] {
+    return this._stackTraceLocations;
   }
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Coverage.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Coverage.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Coverage.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Coverage.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper, debugError, PuppeteerEventListener } from './helper';
-import Protocol from '../protocol';
-import { CDPSession } from './Connection';
+import { assert } from './assert.js';
+import { helper, debugError, PuppeteerEventListener } from './helper.js';
+import { Protocol } from 'devtools-protocol';
+import { CDPSession } from './Connection.js';
 
-import { EVALUATION_SCRIPT_URL } from './ExecutionContext';
+import { EVALUATION_SCRIPT_URL } from './ExecutionContext.js';
 
 /**
  * The CoverageEntry class represents one entry of the coverage report.
@@ -223,7 +223,7 @@
   }
 
   async _onScriptParsed(
-    event: Protocol.Debugger.scriptParsedPayload
+    event: Protocol.Debugger.ScriptParsedEvent
   ): Promise<void> {
     // Ignore puppeteer-injected scripts
     if (event.url === EVALUATION_SCRIPT_URL) return;
@@ -246,10 +246,10 @@
     this._enabled = false;
 
     const result = await Promise.all<
-      Protocol.Profiler.takePreciseCoverageReturnValue,
-      Protocol.Profiler.stopPreciseCoverageReturnValue,
-      Protocol.Profiler.disableReturnValue,
-      Protocol.Debugger.disableReturnValue
+      Protocol.Profiler.TakePreciseCoverageResponse,
+      void,
+      void,
+      void
     >([
       this._client.send('Profiler.takePreciseCoverage'),
       this._client.send('Profiler.stopPreciseCoverage'),
@@ -322,9 +322,7 @@
     this._stylesheetSources.clear();
   }
 
-  async _onStyleSheet(
-    event: Protocol.CSS.styleSheetAddedPayload
-  ): Promise<void> {
+  async _onStyleSheet(event: Protocol.CSS.StyleSheetAddedEvent): Promise<void> {
     const header = event.header;
     // Ignore anonymous scripts
     if (!header.sourceURL) return;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Debug.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Debug.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Debug.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Debug.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import { isNode } from '../environment';
+import { isNode } from '../environment.js';
 
 /**
  * A debug function that can be used in any environment.
  *
+ * @remarks
+ *
  * If used in Node, it falls back to the
  * {@link https://www.npmjs.com/package/debug | debug module}. In the browser it
  * uses `console.log`.
@@ -26,6 +28,22 @@
  * @param prefix - this will be prefixed to each log.
  * @returns a function that can be called to log to that debug channel.
  *
+ * In Node, use the `DEBUG` environment variable to control logging:
+ *
+ * ```
+ * DEBUG=* // logs all channels
+ * DEBUG=foo // logs the `foo` channel
+ * DEBUG=foo* // logs any channels starting with `foo`
+ * ```
+ *
+ * In the browser, set `window.__PUPPETEER_DEBUG` to a string:
+ *
+ * ```
+ * window.__PUPPETEER_DEBUG='*'; // logs all channels
+ * window.__PUPPETEER_DEBUG='foo'; // logs the `foo` channel
+ * window.__PUPPETEER_DEBUG='foo*'; // logs any channels starting with `foo`
+ * ```
+ *
  * @example
  * ```
  * const log = debug('Page');
@@ -40,6 +58,26 @@
     return require('debug')(prefix);
   }
 
-  // eslint-disable-next-line no-console
-  return (...logArgs: unknown[]): void => console.log(`${prefix}:`, ...logArgs);
+  return (...logArgs: unknown[]): void => {
+    const debugLevel = globalThis.__PUPPETEER_DEBUG as string;
+    if (!debugLevel) return;
+
+    const everythingShouldBeLogged = debugLevel === '*';
+
+    const prefixMatchesDebugLevel =
+      everythingShouldBeLogged ||
+      /**
+       * If the debug level is `foo*`, that means we match any prefix that
+       * starts with `foo`. If the level is `foo`, we match only the prefix
+       * `foo`.
+       */
+      (debugLevel.endsWith('*')
+        ? prefix.startsWith(debugLevel)
+        : prefix === debugLevel);
+
+    if (!prefixMatchesDebugLevel) return;
+
+    // eslint-disable-next-line no-console
+    console.log(`${prefix}:`, ...logArgs);
+  };
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Dialog.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Dialog.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Dialog.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Dialog.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { CDPSession } from './Connection';
-import Protocol from '../protocol';
+import { assert } from './assert.js';
+import { CDPSession } from './Connection.js';
+import { Protocol } from 'devtools-protocol';
 
 /**
  * Dialog instances are dispatched by the {@link Page} via the `dialog` event.
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/DOMWorld.ts firefox-85.0+build1/remote/test/puppeteer/src/common/DOMWorld.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/DOMWorld.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/DOMWorld.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,46 +14,87 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper } from './helper';
-import { LifecycleWatcher, PuppeteerLifeCycleEvent } from './LifecycleWatcher';
-import { TimeoutError } from './Errors';
-import { JSHandle, ElementHandle } from './JSHandle';
-import { ExecutionContext } from './ExecutionContext';
-import { TimeoutSettings } from './TimeoutSettings';
-import { MouseButton } from './Input';
-import { FrameManager, Frame } from './FrameManager';
-import { getQueryHandlerAndSelector, QueryHandler } from './QueryHandler';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import {
+  LifecycleWatcher,
+  PuppeteerLifeCycleEvent,
+} from './LifecycleWatcher.js';
+import { TimeoutError } from './Errors.js';
+import { JSHandle, ElementHandle } from './JSHandle.js';
+import { ExecutionContext } from './ExecutionContext.js';
+import { TimeoutSettings } from './TimeoutSettings.js';
+import { MouseButton } from './Input.js';
+import { FrameManager, Frame } from './FrameManager.js';
+import { getQueryHandlerAndSelector } from './QueryHandler.js';
 import {
-  EvaluateFn,
   SerializableOrJSHandle,
   EvaluateHandleFn,
   WrapElementHandle,
-} from './EvalTypes';
-import { isNode } from '../environment';
-
-// This predicateQueryHandler is declared here so that TypeScript knows about it
-// when it is used in the predicate function below.
-declare const predicateQueryHandler: QueryHandler;
+  EvaluateFn,
+  EvaluateFnReturnType,
+  UnwrapPromiseLike,
+} from './EvalTypes.js';
+import { isNode } from '../environment.js';
+import { Protocol } from 'devtools-protocol';
+
+// predicateQueryHandler and checkWaitForOptions are declared here so that
+// TypeScript knows about them when used in the predicate function below.
+declare const predicateQueryHandler: (
+  element: Element | Document,
+  selector: string
+) => Promise<Element | Element[] | NodeListOf<Element>>;
+declare const checkWaitForOptions: (
+  node: Node,
+  waitForVisible: boolean,
+  waitForHidden: boolean
+) => Element | null | boolean;
 
+/**
+ * @public
+ */
 export interface WaitForSelectorOptions {
   visible?: boolean;
   hidden?: boolean;
   timeout?: number;
 }
 
+/**
+ * @internal
+ */
+export interface PageBinding {
+  name: string;
+  pptrFunction: Function;
+}
+
+/**
+ * @internal
+ */
 export class DOMWorld {
-  _frameManager: FrameManager;
-  _frame: Frame;
-  _timeoutSettings: TimeoutSettings;
-  _documentPromise?: Promise<ElementHandle> = null;
-  _contextPromise?: Promise<ExecutionContext> = null;
+  private _frameManager: FrameManager;
+  private _frame: Frame;
+  private _timeoutSettings: TimeoutSettings;
+  private _documentPromise?: Promise<ElementHandle> = null;
+  private _contextPromise?: Promise<ExecutionContext> = null;
 
-  _contextResolveCallback?: (x?: ExecutionContext) => void = null;
+  private _contextResolveCallback?: (x?: ExecutionContext) => void = null;
 
-  _detached = false;
+  private _detached = false;
+  /**
+   * @internal
+   */
   _waitTasks = new Set<WaitTask>();
 
+  /**
+   * @internal
+   * Contains mapping from functions that should be bound to Puppeteer functions.
+   */
+  _boundFunctions = new Map<string, Function>();
+  // Set of bindings that have been registered in the current context.
+  private _ctxBindings = new Set<string>();
+  private static bindingIdentifier = (name: string, contextId: number) =>
+    `${name}_${contextId}`;
+
   constructor(
     frameManager: FrameManager,
     frame: Frame,
@@ -63,16 +104,16 @@
     this._frame = frame;
     this._timeoutSettings = timeoutSettings;
     this._setContext(null);
+    frameManager._client.on('Runtime.bindingCalled', (event) =>
+      this._onBindingCalled(event)
+    );
   }
 
   frame(): Frame {
     return this._frame;
   }
 
-  /**
-   * @param {?ExecutionContext} context
-   */
-  _setContext(context?: ExecutionContext): void {
+  async _setContext(context?: ExecutionContext): Promise<void> {
     if (context) {
       this._contextResolveCallback.call(null, context);
       this._contextResolveCallback = null;
@@ -97,13 +138,10 @@
       );
   }
 
-  /**
-   * @returns {!Promise<!ExecutionContext>}
-   */
   executionContext(): Promise<ExecutionContext> {
     if (this._detached)
       throw new Error(
-        `Execution Context is not available in detached frame "${this._frame.url()}" (are you trying to evaluate?)`
+        `Execution context is not available in detached frame "${this._frame.url()}" (are you trying to evaluate?)`
       );
     return this._contextPromise;
   }
@@ -116,23 +154,17 @@
     return context.evaluateHandle(pageFunction, ...args);
   }
 
-  /**
-   * @param {Function|string} pageFunction
-   * @param {!Array<*>} args
-   * @returns {!Promise<*>}
-   */
-  async evaluate<ReturnType extends any>(
-    pageFunction: Function | string,
-    ...args: unknown[]
-  ): Promise<ReturnType> {
+  async evaluate<T extends EvaluateFn>(
+    pageFunction: T,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>> {
     const context = await this.executionContext();
-    return context.evaluate<ReturnType>(pageFunction, ...args);
+    return context.evaluate<UnwrapPromiseLike<EvaluateFnReturnType<T>>>(
+      pageFunction,
+      ...args
+    );
   }
 
-  /**
-   * @param {string} selector
-   * @returns {!Promise<?ElementHandle>}
-   */
   async $(selector: string): Promise<ElementHandle | null> {
     const document = await this._document();
     const value = await document.$(selector);
@@ -166,11 +198,14 @@
     return document.$eval<ReturnType>(selector, pageFunction, ...args);
   }
 
-  async $$eval<ReturnType extends any>(
+  async $$eval<ReturnType>(
     selector: string,
-    pageFunction: EvaluateFn | string,
+    pageFunction: (
+      elements: Element[],
+      ...args: unknown[]
+    ) => ReturnType | Promise<ReturnType>,
     ...args: SerializableOrJSHandle[]
-  ): Promise<ReturnType> {
+  ): Promise<WrapElementHandle<ReturnType>> {
     const document = await this._document();
     const value = await document.$$eval<ReturnType>(
       selector,
@@ -180,10 +215,6 @@
     return value;
   }
 
-  /**
-   * @param {string} selector
-   * @returns {!Promise<!Array<!ElementHandle>>}
-   */
   async $$(selector: string): Promise<ElementHandle[]> {
     const document = await this._document();
     const value = await document.$$(selector);
@@ -214,7 +245,7 @@
     } = options;
     // We rely upon the fact that document.open() will reset frame lifecycle with "init"
     // lifecycle event. @see https://crrev.com/608658
-    await this.evaluate((html) => {
+    await this.evaluate<(x: string) => void>((html) => {
       document.open();
       document.write(html);
       document.close();
@@ -241,8 +272,6 @@
    * You can pass a URL, filepath or string of contents. Note that when running Puppeteer
    * in a browser environment you cannot pass a filepath and should use either
    * `url` or `content`.
-   *
-   * @param options
    */
   async addScriptTag(options: {
     url?: string;
@@ -268,12 +297,8 @@
           'Cannot pass a filepath to addScriptTag in the browser environment.'
         );
       }
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const fs = require('fs');
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { promisify } = require('util');
-      const readFileAsync = promisify(fs.readFile);
-      let contents = await readFileAsync(path, 'utf8');
+      const fs = await helper.importFSModule();
+      let contents = await fs.promises.readFile(path, 'utf8');
       contents += '//# sourceURL=' + path.replace(/\n/g, '');
       const context = await this.executionContext();
       return (
@@ -332,7 +357,6 @@
    * in a browser environment you cannot pass a filepath and should use either
    * `url` or `content`.
    *
-   * @param options
    */
   async addStyleTag(options: {
     url?: string;
@@ -355,12 +379,8 @@
           'Cannot pass a filepath to addStyleTag in the browser environment.'
         );
       }
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const fs = require('fs');
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { promisify } = require('util');
-      const readFileAsync = promisify(fs.readFile);
-      let contents = await readFileAsync(path, 'utf8');
+      const fs = await helper.importFSModule();
+      let contents = await fs.promises.readFile(path, 'utf8');
       contents += '/*# sourceURL=' + path.replace(/\n/g, '') + '*/';
       const context = await this.executionContext();
       return (
@@ -440,7 +460,6 @@
 
   async tap(selector: string): Promise<void> {
     const handle = await this.$(selector);
-    assert(handle, 'No node found for selector: ' + selector);
     await handle.tap();
     await handle.dispose();
   }
@@ -456,48 +475,123 @@
     await handle.dispose();
   }
 
-  waitForSelector(
+  async waitForSelector(
     selector: string,
     options: WaitForSelectorOptions
   ): Promise<ElementHandle | null> {
-    return this._waitForSelectorOrXPath(selector, false, options);
+    const { updatedSelector, queryHandler } = getQueryHandlerAndSelector(
+      selector
+    );
+    return queryHandler.waitFor(this, updatedSelector, options);
   }
 
-  waitForXPath(
-    xpath: string,
-    options: WaitForSelectorOptions
-  ): Promise<ElementHandle | null> {
-    return this._waitForSelectorOrXPath(xpath, true, options);
-  }
+  // If multiple waitFor are set up asynchronously, we need to wait for the
+  // first one to set up the binding in the page before running the others.
+  private _settingUpBinding: Promise<void> | null = null;
+  /**
+   * @internal
+   */
+  async addBindingToContext(
+    context: ExecutionContext,
+    name: string
+  ): Promise<void> {
+    // Previous operation added the binding so we are done.
+    if (
+      this._ctxBindings.has(
+        DOMWorld.bindingIdentifier(name, context._contextId)
+      )
+    ) {
+      return;
+    }
+    // Wait for other operation to finish
+    if (this._settingUpBinding) {
+      await this._settingUpBinding;
+      return this.addBindingToContext(context, name);
+    }
 
-  waitForFunction(
-    pageFunction: Function | string,
-    options: { polling?: string | number; timeout?: number } = {},
-    ...args: SerializableOrJSHandle[]
-  ): Promise<JSHandle> {
-    const {
-      polling = 'raf',
-      timeout = this._timeoutSettings.timeout(),
-    } = options;
-    return new WaitTask(
-      this,
-      pageFunction,
-      undefined,
-      'function',
-      polling,
-      timeout,
-      ...args
-    ).promise;
+    const bind = async (name: string) => {
+      const expression = helper.pageBindingInitString('internal', name);
+      try {
+        await context._client.send('Runtime.addBinding', {
+          name,
+          executionContextId: context._contextId,
+        });
+        await context.evaluate(expression);
+      } catch (error) {
+        // We could have tried to evaluate in a context which was already
+        // destroyed. This happens, for example, if the page is navigated while
+        // we are trying to add the binding
+        const ctxDestroyed = error.message.includes(
+          'Execution context was destroyed'
+        );
+        const ctxNotFound = error.message.includes(
+          'Cannot find context with specified id'
+        );
+        if (ctxDestroyed || ctxNotFound) {
+          return;
+        } else {
+          debugError(error);
+          return;
+        }
+      }
+      this._ctxBindings.add(
+        DOMWorld.bindingIdentifier(name, context._contextId)
+      );
+    };
+
+    this._settingUpBinding = bind(name);
+    await this._settingUpBinding;
+    this._settingUpBinding = null;
   }
 
-  async title(): Promise<string> {
-    return this.evaluate(() => document.title);
+  private async _onBindingCalled(
+    event: Protocol.Runtime.BindingCalledEvent
+  ): Promise<void> {
+    let payload: { type: string; name: string; seq: number; args: unknown[] };
+    if (!this._hasContext()) return;
+    const context = await this.executionContext();
+    try {
+      payload = JSON.parse(event.payload);
+    } catch {
+      // The binding was either called by something in the page or it was
+      // called before our wrapper was initialized.
+      return;
+    }
+    const { type, name, seq, args } = payload;
+    if (
+      type !== 'internal' ||
+      !this._ctxBindings.has(
+        DOMWorld.bindingIdentifier(name, context._contextId)
+      )
+    )
+      return;
+    if (context._contextId !== event.executionContextId) return;
+    try {
+      const result = await this._boundFunctions.get(name)(...args);
+      await context.evaluate(deliverResult, name, seq, result);
+    } catch (error) {
+      // The WaitTask may already have been resolved by timing out, or the
+      // exection context may have been destroyed.
+      // In both caes, the promises above are rejected with a protocol error.
+      // We can safely ignores these, as the WaitTask is re-installed in
+      // the next execution context if needed.
+      if (error.message.includes('Protocol error')) return;
+      debugError(error);
+    }
+    function deliverResult(name: string, seq: number, result: unknown): void {
+      globalThis[name].callbacks.get(seq).resolve(result);
+      globalThis[name].callbacks.delete(seq);
+    }
   }
 
-  private async _waitForSelectorOrXPath(
-    selectorOrXPath: string,
-    isXPath: boolean,
-    options: WaitForSelectorOptions = {}
+  /**
+   * @internal
+   */
+  async waitForSelectorInPage(
+    queryOne: Function,
+    selector: string,
+    options: WaitForSelectorOptions,
+    binding?: PageBinding
   ): Promise<ElementHandle | null> {
     const {
       visible: waitForVisible = false,
@@ -505,86 +599,130 @@
       timeout = this._timeoutSettings.timeout(),
     } = options;
     const polling = waitForVisible || waitForHidden ? 'raf' : 'mutation';
-    const title = `${isXPath ? 'XPath' : 'selector'} "${selectorOrXPath}"${
+    const title = `selector \`${selector}\`${
       waitForHidden ? ' to be hidden' : ''
     }`;
-    const {
-      updatedSelector,
-      queryHandler,
-    } = getQueryHandlerAndSelector(selectorOrXPath, (element, selector) =>
-      document.querySelector(selector)
-    );
-    const waitTask = new WaitTask(
-      this,
-      predicate,
-      queryHandler,
+    async function predicate(
+      selector: string,
+      waitForVisible: boolean,
+      waitForHidden: boolean
+    ): Promise<Node | null | boolean> {
+      const node = predicateQueryHandler
+        ? ((await predicateQueryHandler(document, selector)) as Element)
+        : document.querySelector(selector);
+      return checkWaitForOptions(node, waitForVisible, waitForHidden);
+    }
+    const waitTaskOptions: WaitTaskOptions = {
+      domWorld: this,
+      predicateBody: helper.makePredicateString(predicate, queryOne),
       title,
       polling,
       timeout,
-      updatedSelector,
-      isXPath,
-      waitForVisible,
-      waitForHidden
-    );
-    const handle = await waitTask.promise;
-    if (!handle.asElement()) {
-      await handle.dispose();
+      args: [selector, waitForVisible, waitForHidden],
+      binding,
+    };
+    const waitTask = new WaitTask(waitTaskOptions);
+    const jsHandle = await waitTask.promise;
+    const elementHandle = jsHandle.asElement();
+    if (!elementHandle) {
+      await jsHandle.dispose();
       return null;
     }
-    return handle.asElement();
+    return elementHandle;
+  }
 
-    /**
-     * @param {string} selectorOrXPath
-     * @param {boolean} isXPath
-     * @param {boolean} waitForVisible
-     * @param {boolean} waitForHidden
-     * @returns {?Node|boolean}
-     */
+  async waitForXPath(
+    xpath: string,
+    options: WaitForSelectorOptions
+  ): Promise<ElementHandle | null> {
+    const {
+      visible: waitForVisible = false,
+      hidden: waitForHidden = false,
+      timeout = this._timeoutSettings.timeout(),
+    } = options;
+    const polling = waitForVisible || waitForHidden ? 'raf' : 'mutation';
+    const title = `XPath \`${xpath}\`${waitForHidden ? ' to be hidden' : ''}`;
     function predicate(
-      selectorOrXPath: string,
-      isXPath: boolean,
+      xpath: string,
       waitForVisible: boolean,
       waitForHidden: boolean
     ): Node | null | boolean {
-      const node = isXPath
-        ? document.evaluate(
-            selectorOrXPath,
-            document,
-            null,
-            XPathResult.FIRST_ORDERED_NODE_TYPE,
-            null
-          ).singleNodeValue
-        : predicateQueryHandler
-        ? (predicateQueryHandler(document, selectorOrXPath) as Element)
-        : document.querySelector(selectorOrXPath);
-      if (!node) return waitForHidden;
-      if (!waitForVisible && !waitForHidden) return node;
-      const element =
-        node.nodeType === Node.TEXT_NODE
-          ? node.parentElement
-          : (node as Element);
-
-      const style = window.getComputedStyle(element);
-      const isVisible =
-        style && style.visibility !== 'hidden' && hasVisibleBoundingBox();
-      const success =
-        waitForVisible === isVisible || waitForHidden === !isVisible;
-      return success ? node : null;
-
-      function hasVisibleBoundingBox(): boolean {
-        const rect = element.getBoundingClientRect();
-        return !!(rect.top || rect.bottom || rect.width || rect.height);
-      }
+      const node = document.evaluate(
+        xpath,
+        document,
+        null,
+        XPathResult.FIRST_ORDERED_NODE_TYPE,
+        null
+      ).singleNodeValue;
+      return checkWaitForOptions(node, waitForVisible, waitForHidden);
+    }
+    const waitTaskOptions: WaitTaskOptions = {
+      domWorld: this,
+      predicateBody: helper.makePredicateString(predicate),
+      title,
+      polling,
+      timeout,
+      args: [xpath, waitForVisible, waitForHidden],
+    };
+    const waitTask = new WaitTask(waitTaskOptions);
+    const jsHandle = await waitTask.promise;
+    const elementHandle = jsHandle.asElement();
+    if (!elementHandle) {
+      await jsHandle.dispose();
+      return null;
     }
+    return elementHandle;
+  }
+
+  waitForFunction(
+    pageFunction: Function | string,
+    options: { polling?: string | number; timeout?: number } = {},
+    ...args: SerializableOrJSHandle[]
+  ): Promise<JSHandle> {
+    const {
+      polling = 'raf',
+      timeout = this._timeoutSettings.timeout(),
+    } = options;
+    const waitTaskOptions: WaitTaskOptions = {
+      domWorld: this,
+      predicateBody: pageFunction,
+      title: 'function',
+      polling,
+      timeout,
+      args,
+    };
+    const waitTask = new WaitTask(waitTaskOptions);
+    return waitTask.promise;
+  }
+
+  async title(): Promise<string> {
+    return this.evaluate(() => document.title);
   }
 }
 
-class WaitTask {
+/**
+ * @internal
+ */
+export interface WaitTaskOptions {
+  domWorld: DOMWorld;
+  predicateBody: Function | string;
+  title: string;
+  polling: string | number;
+  timeout: number;
+  binding?: PageBinding;
+  args: SerializableOrJSHandle[];
+}
+
+/**
+ * @internal
+ */
+export class WaitTask {
   _domWorld: DOMWorld;
   _polling: string | number;
   _timeout: number;
   _predicateBody: string;
   _args: SerializableOrJSHandle[];
+  _binding: PageBinding;
   _runCount = 0;
   promise: Promise<JSHandle>;
   _resolve: (x: JSHandle) => void;
@@ -592,62 +730,51 @@
   _timeoutTimer?: NodeJS.Timeout;
   _terminated = false;
 
-  constructor(
-    domWorld: DOMWorld,
-    predicateBody: Function | string,
-    predicateQueryHandlerBody: Function | string | undefined,
-    title: string,
-    polling: string | number,
-    timeout: number,
-    ...args: SerializableOrJSHandle[]
-  ) {
-    if (helper.isString(polling))
+  constructor(options: WaitTaskOptions) {
+    if (helper.isString(options.polling))
       assert(
-        polling === 'raf' || polling === 'mutation',
-        'Unknown polling option: ' + polling
+        options.polling === 'raf' || options.polling === 'mutation',
+        'Unknown polling option: ' + options.polling
       );
-    else if (helper.isNumber(polling))
-      assert(polling > 0, 'Cannot poll with non-positive interval: ' + polling);
-    else throw new Error('Unknown polling options: ' + polling);
-
-    function getPredicateBody(
-      predicateBody: Function | string,
-      predicateQueryHandlerBody: Function | string
-    ) {
+    else if (helper.isNumber(options.polling))
+      assert(
+        options.polling > 0,
+        'Cannot poll with non-positive interval: ' + options.polling
+      );
+    else throw new Error('Unknown polling options: ' + options.polling);
+
+    function getPredicateBody(predicateBody: Function | string) {
       if (helper.isString(predicateBody)) return `return (${predicateBody});`;
-      if (predicateQueryHandlerBody) {
-        return `
-          return (function wrapper(args) {
-            const predicateQueryHandler = ${predicateQueryHandlerBody};
-            return (${predicateBody})(...args);
-          })(args);`;
-      }
       return `return (${predicateBody})(...args);`;
     }
 
-    this._domWorld = domWorld;
-    this._polling = polling;
-    this._timeout = timeout;
-    this._predicateBody = getPredicateBody(
-      predicateBody,
-      predicateQueryHandlerBody
-    );
-    this._args = args;
+    this._domWorld = options.domWorld;
+    this._polling = options.polling;
+    this._timeout = options.timeout;
+    this._predicateBody = getPredicateBody(options.predicateBody);
+    this._args = options.args;
+    this._binding = options.binding;
     this._runCount = 0;
-    domWorld._waitTasks.add(this);
+    this._domWorld._waitTasks.add(this);
+    if (this._binding) {
+      this._domWorld._boundFunctions.set(
+        this._binding.name,
+        this._binding.pptrFunction
+      );
+    }
     this.promise = new Promise<JSHandle>((resolve, reject) => {
       this._resolve = resolve;
       this._reject = reject;
     });
     // Since page navigation requires us to re-install the pageScript, we should track
     // timeout on our end.
-    if (timeout) {
+    if (options.timeout) {
       const timeoutError = new TimeoutError(
-        `waiting for ${title} failed: timeout ${timeout}ms exceeded`
+        `waiting for ${options.title} failed: timeout ${options.timeout}ms exceeded`
       );
       this._timeoutTimer = setTimeout(
         () => this.terminate(timeoutError),
-        timeout
+        options.timeout
       );
     }
     this.rerun();
@@ -661,11 +788,16 @@
 
   async rerun(): Promise<void> {
     const runCount = ++this._runCount;
-    /** @type {?JSHandle} */
-    let success = null;
-    let error = null;
+    let success: JSHandle = null;
+    let error: Error = null;
+    const context = await this._domWorld.executionContext();
+    if (this._terminated || runCount !== this._runCount) return;
+    if (this._binding) {
+      await this._domWorld.addBindingToContext(context, this._binding.name);
+    }
+    if (this._terminated || runCount !== this._runCount) return;
     try {
-      success = await (await this._domWorld.executionContext()).evaluateHandle(
+      success = await context.evaluateHandle(
         waitForPredicatePageFunction,
         this._predicateBody,
         this._polling,
@@ -691,23 +823,37 @@
       await success.dispose();
       return;
     }
+    if (error) {
+      if (error.message.includes('TypeError: binding is not a function')) {
+        return this.rerun();
+      }
+      // When frame is detached the task should have been terminated by the DOMWorld.
+      // This can fail if we were adding this task while the frame was detached,
+      // so we terminate here instead.
+      if (
+        error.message.includes(
+          'Execution context is not available in detached frame'
+        )
+      ) {
+        this.terminate(
+          new Error('waitForFunction failed: frame got detached.')
+        );
+        return;
+      }
 
-    // When the page is navigated, the promise is rejected.
-    // We will try again in the new execution context.
-    if (error && error.message.includes('Execution context was destroyed'))
-      return;
-
-    // We could have tried to evaluate in a context which was already
-    // destroyed.
-    if (
-      error &&
-      error.message.includes('Cannot find context with specified id')
-    )
-      return;
-
-    if (error) this._reject(error);
-    else this._resolve(success);
+      // When the page is navigated, the promise is rejected.
+      // We will try again in the new execution context.
+      if (error.message.includes('Execution context was destroyed')) return;
+
+      // We could have tried to evaluate in a context which was already
+      // destroyed.
+      if (error.message.includes('Cannot find context with specified id'))
+        return;
 
+      this._reject(error);
+    } else {
+      this._resolve(success);
+    }
     this._cleanup();
   }
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/EmulationManager.ts firefox-85.0+build1/remote/test/puppeteer/src/common/EmulationManager.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/EmulationManager.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/EmulationManager.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CDPSession } from './Connection';
-import { Viewport } from './PuppeteerViewport';
-import Protocol from '../protocol';
+import { CDPSession } from './Connection.js';
+import { Viewport } from './PuppeteerViewport.js';
+import { Protocol } from 'devtools-protocol';
 
 export class EmulationManager {
   _client: CDPSession;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Errors.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Errors.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Errors.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Errors.ts	2021-01-18 19:58:18.000000000 +0000
@@ -28,7 +28,7 @@
  * @remarks
  *
  * Example operations are {@link Page.waitForSelector | page.waitForSelector}
- * or {@link Puppeteer.launch | puppeteer.launch}.
+ * or {@link PuppeteerNode.launch | puppeteer.launch}.
  *
  * @public
  */
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/EvalTypes.ts firefox-85.0+build1/remote/test/puppeteer/src/common/EvalTypes.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/EvalTypes.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/EvalTypes.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,17 +14,22 @@
  * limitations under the License.
  */
 
-import { JSHandle, ElementHandle } from './JSHandle';
+import { JSHandle, ElementHandle } from './JSHandle.js';
 
 /**
  * @public
  */
-export type EvaluateFn<T = any> = string | ((arg1: T, ...args: any[]) => any);
+export type EvaluateFn<T = unknown> =
+  | string
+  | ((arg1: T, ...args: unknown[]) => unknown);
+
+export type UnwrapPromiseLike<T> = T extends PromiseLike<infer U> ? U : T;
+
 /**
  * @public
  */
 export type EvaluateFnReturnType<T extends EvaluateFn> = T extends (
-  ...args: any[]
+  ...args: unknown[]
 ) => infer R
   ? R
   : unknown;
@@ -42,6 +47,7 @@
   | string
   | boolean
   | null
+  | BigInt
   | JSONArray
   | JSONObject;
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/EventEmitter.ts firefox-85.0+build1/remote/test/puppeteer/src/common/EventEmitter.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/EventEmitter.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/EventEmitter.ts	2021-01-18 19:58:18.000000000 +0000
@@ -1,4 +1,8 @@
-import mitt, { Emitter, EventType, Handler } from 'mitt';
+import mitt, {
+  Emitter,
+  EventType,
+  Handler,
+} from '../../vendor/mitt/src/index.js';
 
 /**
  * @internal
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Events.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Events.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Events.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Events.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,6 +14,19 @@
  * limitations under the License.
  */
 
+/**
+ * IMPORTANT: we are mid-way through migrating away from this Events.ts file
+ * in favour of defining events next to the class that emits them.
+ *
+ * However we need to maintain this file for now because the legacy DocLint
+ * system relies on them. Be aware in the mean time if you make a change here
+ * you probably need to replicate it in the relevant class. For example if you
+ * add a new Page event, you should update the PageEmittedEvents enum in
+ * src/common/Page.ts.
+ *
+ * Chat to @jackfranklin if you're unsure.
+ */
+
 export const Events = {
   Page: {
     Close: 'close',
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/ExecutionContext.ts firefox-85.0+build1/remote/test/puppeteer/src/common/ExecutionContext.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/ExecutionContext.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/ExecutionContext.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper } from './helper';
-import { createJSHandle, JSHandle, ElementHandle } from './JSHandle';
-import { CDPSession } from './Connection';
-import { DOMWorld } from './DOMWorld';
-import { Frame } from './FrameManager';
-import Protocol from '../protocol';
-import { EvaluateHandleFn, SerializableOrJSHandle } from './EvalTypes';
+import { assert } from './assert.js';
+import { helper } from './helper.js';
+import { createJSHandle, JSHandle, ElementHandle } from './JSHandle.js';
+import { CDPSession } from './Connection.js';
+import { DOMWorld } from './DOMWorld.js';
+import { Frame } from './FrameManager.js';
+import { Protocol } from 'devtools-protocol';
+import { EvaluateHandleFn, SerializableOrJSHandle } from './EvalTypes.js';
 
 export const EVALUATION_SCRIPT_URL = '__puppeteer_evaluation_script__';
 const SOURCE_URL_REGEX = /^[\040\t]*\/\/[@#] sourceURL=\s*(\S*?)\s*$/m;
@@ -52,7 +52,10 @@
    * @internal
    */
   _world: DOMWorld;
-  private _contextId: number;
+  /**
+   * @internal
+   */
+  _contextId: number;
 
   /**
    * @internal
@@ -301,7 +304,7 @@
       return { value: arg };
     }
 
-    function rewriteError(error: Error): Protocol.Runtime.evaluateReturnValue {
+    function rewriteError(error: Error): Protocol.Runtime.EvaluateResponse {
       if (error.message.includes('Object reference chain is too long'))
         return { result: { type: 'undefined' } };
       if (error.message.includes("Object couldn't be returned by value"))
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/fetch.ts firefox-85.0+build1/remote/test/puppeteer/src/common/fetch.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/fetch.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/fetch.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { isNode } from '../environment.js';
+
+/* Use the global version if we're in the browser, else load the node-fetch module. */
+export const getFetch = async (): Promise<typeof fetch> => {
+  return isNode ? await import('node-fetch') : globalThis.fetch;
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/FileChooser.ts firefox-85.0+build1/remote/test/puppeteer/src/common/FileChooser.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/FileChooser.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/FileChooser.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { ElementHandle } from './JSHandle';
-import Protocol from '../protocol';
-import { assert } from './assert';
+import { ElementHandle } from './JSHandle.js';
+import { Protocol } from 'devtools-protocol';
+import { assert } from './assert.js';
 
 /**
  * File choosers let you react to the page requesting for a file.
@@ -45,7 +45,7 @@
    */
   constructor(
     element: ElementHandle,
-    event: Protocol.Page.fileChooserOpenedPayload
+    event: Protocol.Page.FileChooserOpenedEvent
   ) {
     this._element = element;
     this._multiple = event.mode !== 'selectSingle';
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/FrameManager.ts firefox-85.0+build1/remote/test/puppeteer/src/common/FrameManager.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/FrameManager.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/FrameManager.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,39 +14,66 @@
  * limitations under the License.
  */
 
-import { EventEmitter } from './EventEmitter';
-import { assert } from './assert';
-import { helper, debugError } from './helper';
-import { Events } from './Events';
-import { ExecutionContext, EVALUATION_SCRIPT_URL } from './ExecutionContext';
-import { LifecycleWatcher, PuppeteerLifeCycleEvent } from './LifecycleWatcher';
-import { DOMWorld, WaitForSelectorOptions } from './DOMWorld';
-import { NetworkManager } from './NetworkManager';
-import { TimeoutSettings } from './TimeoutSettings';
-import { CDPSession } from './Connection';
-import { JSHandle, ElementHandle } from './JSHandle';
-import { MouseButton } from './Input';
-import { Page } from './Page';
-import { HTTPResponse } from './HTTPResponse';
-import Protocol from '../protocol';
+import { debug } from '../common/Debug.js';
+
+import { EventEmitter } from './EventEmitter.js';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import { ExecutionContext, EVALUATION_SCRIPT_URL } from './ExecutionContext.js';
+import {
+  LifecycleWatcher,
+  PuppeteerLifeCycleEvent,
+} from './LifecycleWatcher.js';
+import { DOMWorld, WaitForSelectorOptions } from './DOMWorld.js';
+import { NetworkManager } from './NetworkManager.js';
+import { TimeoutSettings } from './TimeoutSettings.js';
+import { CDPSession } from './Connection.js';
+import { JSHandle, ElementHandle } from './JSHandle.js';
+import { MouseButton } from './Input.js';
+import { Page } from './Page.js';
+import { HTTPResponse } from './HTTPResponse.js';
+import { Protocol } from 'devtools-protocol';
 import {
-  EvaluateFn,
   SerializableOrJSHandle,
   EvaluateHandleFn,
   WrapElementHandle,
-} from './EvalTypes';
+  EvaluateFn,
+  EvaluateFnReturnType,
+  UnwrapPromiseLike,
+} from './EvalTypes.js';
 
 const UTILITY_WORLD_NAME = '__puppeteer_utility_world__';
 
+/**
+ * We use symbols to prevent external parties listening to these events.
+ * They are internal to Puppeteer.
+ *
+ * @internal
+ */
+export const FrameManagerEmittedEvents = {
+  FrameAttached: Symbol('FrameManager.FrameAttached'),
+  FrameNavigated: Symbol('FrameManager.FrameNavigated'),
+  FrameDetached: Symbol('FrameManager.FrameDetached'),
+  LifecycleEvent: Symbol('FrameManager.LifecycleEvent'),
+  FrameNavigatedWithinDocument: Symbol(
+    'FrameManager.FrameNavigatedWithinDocument'
+  ),
+  ExecutionContextCreated: Symbol('FrameManager.ExecutionContextCreated'),
+  ExecutionContextDestroyed: Symbol('FrameManager.ExecutionContextDestroyed'),
+};
+
+/**
+ * @internal
+ */
 export class FrameManager extends EventEmitter {
   _client: CDPSession;
-  _page: Page;
-  _networkManager: NetworkManager;
+  private _page: Page;
+  private _networkManager: NetworkManager;
   _timeoutSettings: TimeoutSettings;
-  _frames = new Map<string, Frame>();
-  _contextIdToContext = new Map<number, ExecutionContext>();
-  _isolatedWorlds = new Set<string>();
-  _mainFrame: Frame;
+  private _frames = new Map<string, Frame>();
+  private _contextIdToContext = new Map<number, ExecutionContext>();
+  private _isolatedWorlds = new Set<string>();
+  private _mainFrame: Frame;
 
   constructor(
     client: CDPSession,
@@ -86,13 +113,13 @@
     this._client.on('Page.lifecycleEvent', (event) =>
       this._onLifecycleEvent(event)
     );
+    this._client.on('Target.attachedToTarget', async (event) =>
+      this._onFrameMoved(event)
+    );
   }
 
   async initialize(): Promise<void> {
-    const result = await Promise.all<
-      Protocol.Page.enableReturnValue,
-      Protocol.Page.getFrameTreeReturnValue
-    >([
+    const result = await Promise.all([
       this._client.send('Page.enable'),
       this._client.send('Page.getFrameTree'),
     ]);
@@ -102,7 +129,7 @@
     await Promise.all([
       this._client.send('Page.setLifecycleEventsEnabled', { enabled: true }),
       this._client
-        .send('Runtime.enable', {})
+        .send('Runtime.enable')
         .then(() => this._ensureIsolatedWorld(UTILITY_WORLD_NAME)),
       this._networkManager.initialize(),
     ]);
@@ -191,18 +218,32 @@
     return watcher.navigationResponse();
   }
 
-  _onLifecycleEvent(event: Protocol.Page.lifecycleEventPayload): void {
+  private async _onFrameMoved(event: Protocol.Target.AttachedToTargetEvent) {
+    if (event.targetInfo.type !== 'iframe') {
+      return;
+    }
+
+    // TODO(sadym): Remove debug message once proper OOPIF support is
+    // implemented: https://github.com/puppeteer/puppeteer/issues/2548
+    debug('puppeteer:frame')(
+      `The frame '${event.targetInfo.targetId}' moved to another session. ` +
+        `Out-of-process iframes (OOPIF) are not supported by Puppeteer yet. ` +
+        `https://github.com/puppeteer/puppeteer/issues/2548`
+    );
+  }
+
+  _onLifecycleEvent(event: Protocol.Page.LifecycleEventEvent): void {
     const frame = this._frames.get(event.frameId);
     if (!frame) return;
     frame._onLifecycleEvent(event.loaderId, event.name);
-    this.emit(Events.FrameManager.LifecycleEvent, frame);
+    this.emit(FrameManagerEmittedEvents.LifecycleEvent, frame);
   }
 
   _onFrameStoppedLoading(frameId: string): void {
     const frame = this._frames.get(frameId);
     if (!frame) return;
     frame._onLoadingStopped();
-    this.emit(Events.FrameManager.LifecycleEvent, frame);
+    this.emit(FrameManagerEmittedEvents.LifecycleEvent, frame);
   }
 
   _handleFrameTree(frameTree: Protocol.Page.FrameTree): void {
@@ -234,9 +275,9 @@
     if (this._frames.has(frameId)) return;
     assert(parentFrameId);
     const parentFrame = this._frames.get(parentFrameId);
-    const frame = new Frame(this, this._client, parentFrame, frameId);
+    const frame = new Frame(this, parentFrame, frameId);
     this._frames.set(frame._id, frame);
-    this.emit(Events.FrameManager.FrameAttached, frame);
+    this.emit(FrameManagerEmittedEvents.FrameAttached, frame);
   }
 
   _onFrameNavigated(framePayload: Protocol.Page.Frame): void {
@@ -263,7 +304,7 @@
         frame._id = framePayload.id;
       } else {
         // Initial main frame navigation.
-        frame = new Frame(this, this._client, null, framePayload.id);
+        frame = new Frame(this, null, framePayload.id);
       }
       this._frames.set(framePayload.id, frame);
       this._mainFrame = frame;
@@ -272,7 +313,7 @@
     // Update frame payload.
     frame._navigated(framePayload);
 
-    this.emit(Events.FrameManager.FrameNavigated, frame);
+    this.emit(FrameManagerEmittedEvents.FrameNavigated, frame);
   }
 
   async _ensureIsolatedWorld(name: string): Promise<void> {
@@ -299,8 +340,8 @@
     const frame = this._frames.get(frameId);
     if (!frame) return;
     frame._navigatedWithinDocument(url);
-    this.emit(Events.FrameManager.FrameNavigatedWithinDocument, frame);
-    this.emit(Events.FrameManager.FrameNavigated, frame);
+    this.emit(FrameManagerEmittedEvents.FrameNavigatedWithinDocument, frame);
+    this.emit(FrameManagerEmittedEvents.FrameNavigated, frame);
   }
 
   _onFrameDetached(frameId: string): void {
@@ -335,17 +376,14 @@
     this._contextIdToContext.set(contextPayload.id, context);
   }
 
-  /**
-   * @param {number} executionContextId
-   */
-  _onExecutionContextDestroyed(executionContextId: number): void {
+  private _onExecutionContextDestroyed(executionContextId: number): void {
     const context = this._contextIdToContext.get(executionContextId);
     if (!context) return;
     this._contextIdToContext.delete(executionContextId);
     if (context._world) context._world._setContext(null);
   }
 
-  _onExecutionContextsCleared(): void {
+  private _onExecutionContextsCleared(): void {
     for (const context of this._contextIdToContext.values()) {
       if (context._world) context._world._setContext(null);
     }
@@ -358,39 +396,183 @@
     return context;
   }
 
-  _removeFramesRecursively(frame: Frame): void {
+  private _removeFramesRecursively(frame: Frame): void {
     for (const child of frame.childFrames())
       this._removeFramesRecursively(child);
     frame._detach();
     this._frames.delete(frame._id);
-    this.emit(Events.FrameManager.FrameDetached, frame);
+    this.emit(FrameManagerEmittedEvents.FrameDetached, frame);
   }
 }
 
+/**
+ * @public
+ */
+export interface FrameWaitForFunctionOptions {
+  /**
+   * An interval at which the `pageFunction` is executed, defaults to `raf`. If
+   * `polling` is a number, then it is treated as an interval in milliseconds at
+   * which the function would be executed. If `polling` is a string, then it can
+   * be one of the following values:
+   *
+   * - `raf` - to constantly execute `pageFunction` in `requestAnimationFrame`
+   *   callback. This is the tightest polling mode which is suitable to observe
+   *   styling changes.
+   *
+   * - `mutation` - to execute `pageFunction` on every DOM mutation.
+   */
+  polling?: string | number;
+  /**
+   * Maximum time to wait in milliseconds. Defaults to `30000` (30 seconds).
+   * Pass `0` to disable the timeout. Puppeteer's default timeout can be changed
+   * using {@link Page.setDefaultTimeout}.
+   */
+  timeout?: number;
+}
+
+/**
+ * @public
+ */
+export interface FrameAddScriptTagOptions {
+  /**
+   * the URL of the script to be added.
+   */
+  url?: string;
+  /**
+   * The path to a JavaScript file to be injected into the frame.
+   * @remarks
+   * If `path` is a relative path, it is resolved relative to the current
+   * working directory (`process.cwd()` in Node.js).
+   */
+  path?: string;
+  /**
+   * Raw JavaScript content to be injected into the frame.
+   */
+  content?: string;
+  /**
+   * Set the script's `type`. Use `module` in order to load an ES2015 module.
+   */
+  type?: string;
+}
+
+/**
+ * @public
+ */
+export interface FrameAddStyleTagOptions {
+  /**
+   * the URL of the CSS file to be added.
+   */
+  url?: string;
+  /**
+   * The path to a CSS file to be injected into the frame.
+   * @remarks
+   * If `path` is a relative path, it is resolved relative to the current
+   * working directory (`process.cwd()` in Node.js).
+   */
+  path?: string;
+  /**
+   * Raw CSS content to be injected into the frame.
+   */
+  content?: string;
+}
+
+/**
+ * At every point of time, page exposes its current frame tree via the
+ * {@link Page.mainFrame | page.mainFrame} and
+ * {@link Frame.childFrames | frame.childFrames} methods.
+ *
+ * @remarks
+ *
+ * `Frame` object lifecycles are controlled by three events that are all
+ * dispatched on the page object:
+ *
+ * - {@link PageEmittedEvents.FrameAttached}
+ *
+ * - {@link PageEmittedEvents.FrameNavigated}
+ *
+ * - {@link PageEmittedEvents.FrameDetached}
+ *
+ * @Example
+ * An example of dumping frame tree:
+ *
+ * ```js
+ * const puppeteer = require('puppeteer');
+ *
+ * (async () => {
+ *   const browser = await puppeteer.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://www.google.com/chrome/browser/canary.html');
+ *   dumpFrameTree(page.mainFrame(), '');
+ *   await browser.close();
+ *
+ *   function dumpFrameTree(frame, indent) {
+ *     console.log(indent + frame.url());
+ *     for (const child of frame.childFrames()) {
+ *     dumpFrameTree(child, indent + '  ');
+ *     }
+ *   }
+ * })();
+ * ```
+ *
+ * @Example
+ * An example of getting text from an iframe element:
+ *
+ * ```js
+ * const frame = page.frames().find(frame => frame.name() === 'myframe');
+ * const text = await frame.$eval('.selector', element => element.textContent);
+ * console.log(text);
+ * ```
+ *
+ * @public
+ */
 export class Frame {
+  /**
+   * @internal
+   */
   _frameManager: FrameManager;
-  _client: CDPSession;
-  _parentFrame?: Frame;
+  private _parentFrame?: Frame;
+  /**
+   * @internal
+   */
   _id: string;
 
-  _url = '';
-  _detached = false;
+  private _url = '';
+  private _detached = false;
+  /**
+   * @internal
+   */
   _loaderId = '';
+  /**
+   * @internal
+   */
   _name?: string;
 
+  /**
+   * @internal
+   */
   _lifecycleEvents = new Set<string>();
+  /**
+   * @internal
+   */
   _mainWorld: DOMWorld;
+  /**
+   * @internal
+   */
   _secondaryWorld: DOMWorld;
+  /**
+   * @internal
+   */
   _childFrames: Set<Frame>;
 
+  /**
+   * @internal
+   */
   constructor(
     frameManager: FrameManager,
-    client: CDPSession,
     parentFrame: Frame | null,
     frameId: string
   ) {
     this._frameManager = frameManager;
-    this._client = client;
     this._parentFrame = parentFrame;
     this._url = '';
     this._id = frameId;
@@ -412,6 +594,44 @@
     if (this._parentFrame) this._parentFrame._childFrames.add(this);
   }
 
+  /**
+   * @remarks
+   *
+   * `frame.goto` will throw an error if:
+   * - there's an SSL error (e.g. in case of self-signed certificates).
+   *
+   * - target URL is invalid.
+   *
+   * - the `timeout` is exceeded during navigation.
+   *
+   * - the remote server does not respond or is unreachable.
+   *
+   * - the main resource failed to load.
+   *
+   * `frame.goto` will not throw an error when any valid HTTP status code is
+   * returned by the remote server, including 404 "Not Found" and 500 "Internal
+   * Server Error".  The status code for such responses can be retrieved by
+   * calling {@link HTTPResponse.status}.
+   *
+   * NOTE: `frame.goto` either throws an error or returns a main resource
+   * response. The only exceptions are navigation to `about:blank` or
+   * navigation to the same URL with a different hash, which would succeed and
+   * return `null`.
+   *
+   * NOTE: Headless mode doesn't support navigation to a PDF document. See
+   * the {@link https://bugs.chromium.org/p/chromium/issues/detail?id=761295 | upstream
+   * issue}.
+   *
+   * @param url - the URL to navigate the frame to. This should include the
+   * scheme, e.g. `https://`.
+   * @param options - navigation options. `waitUntil` is useful to define when
+   * the navigation should be considered successful - see the docs for
+   * {@link PuppeteerLifeCycleEvent} for more details.
+   *
+   * @returns A promise which resolves to the main resource response. In case of
+   * multiple redirects, the navigation will resolve with the response of the
+   * last redirect.
+   */
   async goto(
     url: string,
     options: {
@@ -423,6 +643,27 @@
     return await this._frameManager.navigateFrame(this, url, options);
   }
 
+  /**
+   * @remarks
+   *
+   * This resolves when the frame navigates to a new URL. It is useful for when
+   * you run code which will indirectly cause the frame to navigate. Consider
+   * this example:
+   *
+   * ```js
+   * const [response] = await Promise.all([
+   *   // The navigation promise resolves after navigation has finished
+   *   frame.waitForNavigation(),
+   *   // Clicking the link will indirectly cause a navigation
+   *   frame.click('a.my-link'),
+   * ]);
+   * ```
+   *
+   * Usage of the {@link https://developer.mozilla.org/en-US/docs/Web/API/History_API | History API} to change the URL is considered a navigation.
+   *
+   * @param options - options to configure when the navigation is consided finished.
+   * @returns a promise that resolves when the frame navigates to a new URL.
+   */
   async waitForNavigation(
     options: {
       timeout?: number;
@@ -432,10 +673,26 @@
     return await this._frameManager.waitForFrameNavigation(this, options);
   }
 
+  /**
+   * @returns a promise that resolves to the frame's default execution context.
+   */
   executionContext(): Promise<ExecutionContext> {
     return this._mainWorld.executionContext();
   }
 
+  /**
+   * @remarks
+   *
+   * The only difference between {@link Frame.evaluate} and
+   * `frame.evaluateHandle` is that `evaluateHandle` will return the value
+   * wrapped in an in-page object.
+   *
+   * This method behaves identically to {@link Page.evaluateHandle} except it's
+   * run within the context of the `frame`, rather than the entire page.
+   *
+   * @param pageFunction - a function that is run within the frame
+   * @param args - arguments to be passed to the pageFunction
+   */
   async evaluateHandle<HandlerType extends JSHandle = JSHandle>(
     pageFunction: EvaluateHandleFn,
     ...args: SerializableOrJSHandle[]
@@ -443,21 +700,61 @@
     return this._mainWorld.evaluateHandle<HandlerType>(pageFunction, ...args);
   }
 
-  async evaluate<ReturnType extends any>(
-    pageFunction: Function | string,
-    ...args: unknown[]
-  ): Promise<ReturnType> {
-    return this._mainWorld.evaluate<ReturnType>(pageFunction, ...args);
+  /**
+   * @remarks
+   *
+   * This method behaves identically to {@link Page.evaluate} except it's run
+   * within the context of the `frame`, rather than the entire page.
+   *
+   * @param pageFunction - a function that is run within the frame
+   * @param args - arguments to be passed to the pageFunction
+   */
+  async evaluate<T extends EvaluateFn>(
+    pageFunction: T,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>> {
+    return this._mainWorld.evaluate<T>(pageFunction, ...args);
   }
 
+  /**
+   * This method queries the frame for the given selector.
+   *
+   * @param selector - a selector to query for.
+   * @returns A promise which resolves to an `ElementHandle` pointing at the
+   * element, or `null` if it was not found.
+   */
   async $(selector: string): Promise<ElementHandle | null> {
     return this._mainWorld.$(selector);
   }
 
+  /**
+   * This method evaluates the given XPath expression and returns the results.
+   *
+   * @param expression - the XPath expression to evaluate.
+   */
   async $x(expression: string): Promise<ElementHandle[]> {
     return this._mainWorld.$x(expression);
   }
 
+  /**
+   * @remarks
+   *
+   * This method runs `document.querySelector` within
+   * the frame and passes it as the first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `frame.$eval` would wait for
+   * the promise to resolve and return its value.
+   *
+   * @example
+   *
+   * ```js
+   * const searchValue = await frame.$eval('#search', el => el.value);
+   * ```
+   *
+   * @param selector - the selector to query for
+   * @param pageFunction - the function to be evaluated in the frame's context
+   * @param args - additional arguments to pass to `pageFuncton`
+   */
   async $eval<ReturnType>(
     selector: string,
     pageFunction: (
@@ -469,22 +766,60 @@
     return this._mainWorld.$eval<ReturnType>(selector, pageFunction, ...args);
   }
 
-  async $$eval<ReturnType extends any>(
+  /**
+   * @remarks
+   *
+   * This method runs `Array.from(document.querySelectorAll(selector))` within
+   * the frame and passes it as the first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `frame.$$eval` would wait for
+   * the promise to resolve and return its value.
+   *
+   * @example
+   *
+   * ```js
+   * const divsCounts = await frame.$$eval('div', divs => divs.length);
+   * ```
+   *
+   * @param selector - the selector to query for
+   * @param pageFunction - the function to be evaluated in the frame's context
+   * @param args - additional arguments to pass to `pageFuncton`
+   */
+  async $$eval<ReturnType>(
     selector: string,
-    pageFunction: EvaluateFn | string,
+    pageFunction: (
+      elements: Element[],
+      ...args: unknown[]
+    ) => ReturnType | Promise<ReturnType>,
     ...args: SerializableOrJSHandle[]
-  ): Promise<ReturnType> {
+  ): Promise<WrapElementHandle<ReturnType>> {
     return this._mainWorld.$$eval<ReturnType>(selector, pageFunction, ...args);
   }
 
+  /**
+   * This runs `document.querySelectorAll` in the frame and returns the result.
+   *
+   * @param selector - a selector to search for
+   * @returns An array of element handles pointing to the found frame elements.
+   */
   async $$(selector: string): Promise<ElementHandle[]> {
     return this._mainWorld.$$(selector);
   }
 
+  /**
+   * @returns the full HTML contents of the frame, including the doctype.
+   */
   async content(): Promise<string> {
     return this._secondaryWorld.content();
   }
 
+  /**
+   * Set the content of the frame.
+   *
+   * @param html - HTML markup to assign to the page.
+   * @param options - options to configure how long before timing out and at
+   * what point to consider the content setting successful.
+   */
   async setContent(
     html: string,
     options: {
@@ -495,43 +830,101 @@
     return this._secondaryWorld.setContent(html, options);
   }
 
+  /**
+   * @remarks
+   *
+   * If the name is empty, it returns the `id` attribute instead.
+   *
+   * Note: This value is calculated once when the frame is created, and will not
+   * update if the attribute is changed later.
+   *
+   * @returns the frame's `name` attribute as specified in the tag.
+   */
   name(): string {
     return this._name || '';
   }
 
+  /**
+   * @returns the frame's URL.
+   */
   url(): string {
     return this._url;
   }
 
+  /**
+   * @returns the parent `Frame`, if any. Detached and main frames return `null`.
+   */
   parentFrame(): Frame | null {
     return this._parentFrame;
   }
 
+  /**
+   * @returns an array of child frames.
+   */
   childFrames(): Frame[] {
     return Array.from(this._childFrames);
   }
 
+  /**
+   * @returns `true` if the frame has been detached, or `false` otherwise.
+   */
   isDetached(): boolean {
     return this._detached;
   }
 
-  async addScriptTag(options: {
-    url?: string;
-    path?: string;
-    content?: string;
-    type?: string;
-  }): Promise<ElementHandle> {
+  /**
+   * Adds a `<script>` tag into the page with the desired url or content.
+   *
+   * @param options - configure the script to add to the page.
+   *
+   * @returns a promise that resolves to the added tag when the script's
+   * `onload` event fires or when the script content was injected into the
+   * frame.
+   */
+  async addScriptTag(
+    options: FrameAddScriptTagOptions
+  ): Promise<ElementHandle> {
     return this._mainWorld.addScriptTag(options);
   }
 
-  async addStyleTag(options: {
-    url?: string;
-    path?: string;
-    content?: string;
-  }): Promise<ElementHandle> {
+  /**
+   * Adds a `<link rel="stylesheet">` tag into the page with the desired url or
+   * a `<style type="text/css">` tag with the content.
+   *
+   * @param options - configure the CSS to add to the page.
+   *
+   * @returns a promise that resolves to the added tag when the stylesheets's
+   * `onload` event fires or when the CSS content was injected into the
+   * frame.
+   */
+  async addStyleTag(options: FrameAddStyleTagOptions): Promise<ElementHandle> {
     return this._mainWorld.addStyleTag(options);
   }
 
+  /**
+   *
+   * This method clicks the first element found that matches `selector`.
+   *
+   * @remarks
+   *
+   * This method scrolls the element into view if needed, and then uses
+   * {@link Page.mouse} to click in the center of the element. If there's no
+   * element matching `selector`, the method throws an error.
+   *
+   * Bear in mind that if `click()` triggers a navigation event and there's a
+   * separate `page.waitForNavigation()` promise to be resolved, you may end up
+   * with a race condition that yields unexpected results. The correct pattern
+   * for click and wait for navigation is the following:
+   *
+   * ```javascript
+   * const [response] = await Promise.all([
+   *   page.waitForNavigation(waitOptions),
+   *   frame.click(selector, clickOptions),
+   * ]);
+   * ```
+   * @param selector - the selector to search for to click. If there are
+   * multiple elements, the first will be clicked.
+   */
   async click(
     selector: string,
     options: {
@@ -543,22 +936,97 @@
     return this._secondaryWorld.click(selector, options);
   }
 
+  /**
+   * This method fetches an element with `selector` and focuses it.
+   *
+   * @remarks
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * @param selector - the selector for the element to focus. If there are
+   * multiple elements, the first will be focused.
+   */
   async focus(selector: string): Promise<void> {
     return this._secondaryWorld.focus(selector);
   }
 
+  /**
+   * This method fetches an element with `selector`, scrolls it into view if
+   * needed, and then uses {@link Page.mouse} to hover over the center of the
+   * element.
+   *
+   * @remarks
+   * If there's no element matching `selector`, the method throws an
+   *
+   * @param selector - the selector for the element to hover. If there are
+   * multiple elements, the first will be hovered.
+   */
   async hover(selector: string): Promise<void> {
     return this._secondaryWorld.hover(selector);
   }
 
+  /**
+   * Triggers a `change` and `input` event once all the provided options have
+   * been selected.
+   *
+   * @remarks
+   *
+   * If there's no `<select>` element matching `selector`, the
+   * method throws an error.
+   *
+   * @example
+   * ```js
+   * frame.select('select#colors', 'blue'); // single selection
+   * frame.select('select#colors', 'red', 'green', 'blue'); // multiple selections
+   * ```
+   *
+   * @param selector - a selector to query the frame for
+   * @param values - an array of values to select. If the `<select>` has the
+   * `multiple` attribute, all values are considered, otherwise only the first
+   * one is taken into account.
+   * @returns the list of values that were successfully selected.
+   */
   select(selector: string, ...values: string[]): Promise<string[]> {
     return this._secondaryWorld.select(selector, ...values);
   }
 
+  /**
+   * This method fetches an element with `selector`, scrolls it into view if
+   * needed, and then uses {@link Page.touchscreen} to tap in the center of the
+   * element.
+   *
+   * @remarks
+   *
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * @param selector - the selector to tap.
+   * @returns a promise that resolves when the element has been tapped.
+   */
   async tap(selector: string): Promise<void> {
     return this._secondaryWorld.tap(selector);
   }
 
+  /**
+   * Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character
+   * in the text.
+   *
+   * @remarks
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * {@link Keyboard.press}.
+   *
+   * @example
+   * ```js
+   * await frame.type('#mytextarea', 'Hello'); // Types instantly
+   * await frame.type('#mytextarea', 'World', {delay: 100}); // Types slower, like a user
+   * ```
+   *
+   * @param selector - the selector for the element to type into. If there are
+   * multiple the first will be used.
+   * @param text - text to type into the element
+   * @param options - takes one option, `delay`, which sets the time to wait
+   * between key presses in milliseconds. Defaults to `0`.
+   *
+   * @returns a promise that resolves when the typing is complete.
+   */
   async type(
     selector: string,
     text: string,
@@ -567,13 +1035,42 @@
     return this._mainWorld.type(selector, text, options);
   }
 
+  /**
+   * @remarks
+   *
+   * This method behaves differently depending on the first parameter. If it's a
+   * `string`, it will be treated as a `selector` or `xpath` (if the string
+   * starts with `//`). This method then is a shortcut for
+   * {@link Frame.waitForSelector} or {@link Frame.waitForXPath}.
+   *
+   * If the first argument is a function this method is a shortcut for
+   * {@link Frame.waitForFunction}.
+   *
+   * If the first argument is a `number`, it's treated as a timeout in
+   * milliseconds and the method returns a promise which resolves after the
+   * timeout.
+   *
+   * @param selectorOrFunctionOrTimeout - a selector, predicate or timeout to
+   * wait for.
+   * @param options - optional waiting parameters.
+   * @param args - arguments to pass to `pageFunction`.
+   *
+   * @deprecated Don't use this method directly. Instead use the more explicit
+   * methods available: {@link Frame.waitForSelector},
+   * {@link Frame.waitForXPath}, {@link Frame.waitForFunction} or
+   * {@link Frame.waitForTimeout}.
+   */
   waitFor(
     selectorOrFunctionOrTimeout: string | number | Function,
-    options: {} = {},
+    options: Record<string, unknown> = {},
     ...args: SerializableOrJSHandle[]
   ): Promise<JSHandle | null> {
     const xPathPattern = '//';
 
+    console.warn(
+      'waitFor is deprecated and will be removed in a future release. See https://github.com/puppeteer/puppeteer/issues/6214 for details and how to migrate your code.'
+    );
+
     if (helper.isString(selectorOrFunctionOrTimeout)) {
       const string = selectorOrFunctionOrTimeout;
       if (string.startsWith(xPathPattern))
@@ -597,6 +1094,65 @@
     );
   }
 
+  /**
+   * Causes your script to wait for the given number of milliseconds.
+   *
+   * @remarks
+   * It's generally recommended to not wait for a number of seconds, but instead
+   * use {@link Frame.waitForSelector}, {@link Frame.waitForXPath} or
+   * {@link Frame.waitForFunction} to wait for exactly the conditions you want.
+   *
+   * @example
+   *
+   * Wait for 1 second:
+   *
+   * ```
+   * await frame.waitForTimeout(1000);
+   * ```
+   *
+   * @param milliseconds - the number of milliseconds to wait.
+   */
+  waitForTimeout(milliseconds: number): Promise<void> {
+    return new Promise((resolve) => {
+      setTimeout(resolve, milliseconds);
+    });
+  }
+
+  /**
+   * @remarks
+   *
+   *
+   * Wait for the `selector` to appear in page. If at the moment of calling the
+   * method the `selector` already exists, the method will return immediately.
+   * If the selector doesn't appear after the `timeout` milliseconds of waiting,
+   * the function will throw.
+   *
+   * This method works across navigations.
+   *
+   * @example
+   * ```js
+   * const puppeteer = require('puppeteer');
+   *
+   * (async () => {
+   *   const browser = await puppeteer.launch();
+   *   const page = await browser.newPage();
+   *   let currentURL;
+   *   page.mainFrame()
+   *   .waitForSelector('img')
+   *   .then(() => console.log('First URL with image: ' + currentURL));
+   *
+   *   for (currentURL of ['https://example.com', 'https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   * @param selector - the selector to wait for.
+   * @param options - options to define if the element should be visible and how
+   * long to wait before timing out.
+   * @returns a promise which resolves when an element matching the selector
+   * string is added to the DOM.
+   */
   async waitForSelector(
     selector: string,
     options: WaitForSelectorOptions = {}
@@ -612,6 +1168,21 @@
     return result;
   }
 
+  /**
+   * @remarks
+   * Wait for the `xpath` to appear in page. If at the moment of calling the
+   * method the `xpath` already exists, the method will return immediately. If
+   * the xpath doesn't appear after the `timeout` milliseconds of waiting, the
+   * function will throw.
+   *
+   * For a code example, see the example for {@link Frame.waitForSelector}. That
+   * function behaves identically other than taking a CSS selector rather than
+   * an XPath.
+   *
+   * @param xpath - the XPath expression to wait for.
+   * @param options  - options to configure the visiblity of the element and how
+   * long to wait before timing out.
+   */
   async waitForXPath(
     xpath: string,
     options: WaitForSelectorOptions = {}
@@ -624,27 +1195,74 @@
     return result;
   }
 
+  /**
+   * @remarks
+   *
+   * @example
+   *
+   * The `waitForFunction` can be used to observe viewport size change:
+   * ```js
+   * const puppeteer = require('puppeteer');
+   *
+   * (async () => {
+   * .  const browser = await puppeteer.launch();
+   * .  const page = await browser.newPage();
+   * .  const watchDog = page.mainFrame().waitForFunction('window.innerWidth < 100');
+   * .  page.setViewport({width: 50, height: 50});
+   * .  await watchDog;
+   * .  await browser.close();
+   * })();
+   * ```
+   *
+   * To pass arguments from Node.js to the predicate of `page.waitForFunction` function:
+   *
+   * ```js
+   * const selector = '.foo';
+   * await frame.waitForFunction(
+   *   selector => !!document.querySelector(selector),
+   *   {}, // empty options object
+   *   selector
+   *);
+   * ```
+   *
+   * @param pageFunction - the function to evaluate in the frame context.
+   * @param options - options to configure the polling method and timeout.
+   * @param args - arguments to pass to the `pageFunction`.
+   * @returns the promise which resolve when the `pageFunction` returns a truthy value.
+   */
   waitForFunction(
     pageFunction: Function | string,
-    options: { polling?: string | number; timeout?: number } = {},
+    options: FrameWaitForFunctionOptions = {},
     ...args: SerializableOrJSHandle[]
   ): Promise<JSHandle> {
     return this._mainWorld.waitForFunction(pageFunction, options, ...args);
   }
 
+  /**
+   * @returns the frame's title.
+   */
   async title(): Promise<string> {
     return this._secondaryWorld.title();
   }
 
+  /**
+   * @internal
+   */
   _navigated(framePayload: Protocol.Page.Frame): void {
     this._name = framePayload.name;
-    this._url = framePayload.url;
+    this._url = `${framePayload.url}${framePayload.urlFragment || ''}`;
   }
 
+  /**
+   * @internal
+   */
   _navigatedWithinDocument(url: string): void {
     this._url = url;
   }
 
+  /**
+   * @internal
+   */
   _onLifecycleEvent(loaderId: string, name: string): void {
     if (name === 'init') {
       this._loaderId = loaderId;
@@ -653,11 +1271,17 @@
     this._lifecycleEvents.add(name);
   }
 
+  /**
+   * @internal
+   */
   _onLoadingStopped(): void {
     this._lifecycleEvents.add('DOMContentLoaded');
     this._lifecycleEvents.add('load');
   }
 
+  /**
+   * @internal
+   */
   _detach(): void {
     this._detached = true;
     this._mainWorld._detach();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/helper.ts firefox-85.0+build1/remote/test/puppeteer/src/common/helper.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/helper.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/helper.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,25 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { TimeoutError } from './Errors';
-import { debug } from './Debug';
-import * as fs from 'fs';
-import { CDPSession } from './Connection';
-import { promisify } from 'util';
-import Protocol from '../protocol';
-import { CommonEventEmitter } from './EventEmitter';
-import { assert } from './assert';
-
-const openAsync = promisify(fs.open);
-const writeAsync = promisify(fs.write);
-const closeAsync = promisify(fs.close);
+import { TimeoutError } from './Errors.js';
+import { debug } from './Debug.js';
+import { CDPSession } from './Connection.js';
+import { Protocol } from 'devtools-protocol';
+import { CommonEventEmitter } from './EventEmitter.js';
+import { assert } from './assert.js';
+import { isNode } from '../environment.js';
 
 export const debugError = debug('puppeteer:error');
 
-interface AnyClass {
-  prototype: object;
-}
-
 function getExceptionMessage(
   exceptionDetails: Protocol.Runtime.ExceptionDetails
 ): string {
@@ -95,39 +86,6 @@
     });
 }
 
-function installAsyncStackHooks(classType: AnyClass): void {
-  for (const methodName of Reflect.ownKeys(classType.prototype)) {
-    const method = Reflect.get(classType.prototype, methodName);
-    if (
-      methodName === 'constructor' ||
-      typeof methodName !== 'string' ||
-      methodName.startsWith('_') ||
-      typeof method !== 'function' ||
-      method.constructor.name !== 'AsyncFunction'
-    )
-      continue;
-    Reflect.set(classType.prototype, methodName, function (...args) {
-      const syncStack = {
-        stack: '',
-      };
-      Error.captureStackTrace(syncStack);
-      return method.call(this, ...args).catch((error) => {
-        const stack = syncStack.stack.substring(
-          syncStack.stack.indexOf('\n') + 1
-        );
-        const clientStack = stack.substring(stack.indexOf('\n'));
-        if (
-          error instanceof Error &&
-          error.stack &&
-          !error.stack.includes(clientStack)
-        )
-          error.stack += '\n  -- ASYNC --\n' + stack;
-        throw error;
-      });
-    });
-  }
-}
-
 export interface PuppeteerEventListener {
   emitter: CommonEventEmitter;
   eventName: string | symbol;
@@ -219,6 +177,114 @@
   return `(${fun})(${args.map(serializeArgument).join(',')})`;
 }
 
+function pageBindingInitString(type: string, name: string): string {
+  function addPageBinding(type: string, bindingName: string): void {
+    /* Cast window to any here as we're about to add properties to it
+     * via win[bindingName] which TypeScript doesn't like.
+     */
+    const win = window as any;
+    const binding = win[bindingName];
+
+    win[bindingName] = (...args: unknown[]): Promise<unknown> => {
+      const me = window[bindingName];
+      let callbacks = me.callbacks;
+      if (!callbacks) {
+        callbacks = new Map();
+        me.callbacks = callbacks;
+      }
+      const seq = (me.lastSeq || 0) + 1;
+      me.lastSeq = seq;
+      const promise = new Promise((resolve, reject) =>
+        callbacks.set(seq, { resolve, reject })
+      );
+      binding(JSON.stringify({ type, name: bindingName, seq, args }));
+      return promise;
+    };
+  }
+  return evaluationString(addPageBinding, type, name);
+}
+
+function pageBindingDeliverResultString(
+  name: string,
+  seq: number,
+  result: unknown
+): string {
+  function deliverResult(name: string, seq: number, result: unknown): void {
+    window[name].callbacks.get(seq).resolve(result);
+    window[name].callbacks.delete(seq);
+  }
+  return evaluationString(deliverResult, name, seq, result);
+}
+
+function pageBindingDeliverErrorString(
+  name: string,
+  seq: number,
+  message: string,
+  stack: string
+): string {
+  function deliverError(
+    name: string,
+    seq: number,
+    message: string,
+    stack: string
+  ): void {
+    const error = new Error(message);
+    error.stack = stack;
+    window[name].callbacks.get(seq).reject(error);
+    window[name].callbacks.delete(seq);
+  }
+  return evaluationString(deliverError, name, seq, message, stack);
+}
+
+function pageBindingDeliverErrorValueString(
+  name: string,
+  seq: number,
+  value: unknown
+): string {
+  function deliverErrorValue(name: string, seq: number, value: unknown): void {
+    window[name].callbacks.get(seq).reject(value);
+    window[name].callbacks.delete(seq);
+  }
+  return evaluationString(deliverErrorValue, name, seq, value);
+}
+
+function makePredicateString(
+  predicate: Function,
+  predicateQueryHandler?: Function
+): string {
+  function checkWaitForOptions(
+    node: Node,
+    waitForVisible: boolean,
+    waitForHidden: boolean
+  ): Node | null | boolean {
+    if (!node) return waitForHidden;
+    if (!waitForVisible && !waitForHidden) return node;
+    const element =
+      node.nodeType === Node.TEXT_NODE ? node.parentElement : (node as Element);
+
+    const style = window.getComputedStyle(element);
+    const isVisible =
+      style && style.visibility !== 'hidden' && hasVisibleBoundingBox();
+    const success =
+      waitForVisible === isVisible || waitForHidden === !isVisible;
+    return success ? node : null;
+
+    function hasVisibleBoundingBox(): boolean {
+      const rect = element.getBoundingClientRect();
+      return !!(rect.top || rect.bottom || rect.width || rect.height);
+    }
+  }
+  const predicateQueryHandlerDef = predicateQueryHandler
+    ? `const predicateQueryHandler = ${predicateQueryHandler};`
+    : '';
+  return `
+    (() => {
+      ${predicateQueryHandlerDef}
+      const checkWaitForOptions = ${checkWaitForOptions};
+      return (${predicate})(...args)
+    })() `;
+}
+
 async function waitWithTimeout<T extends any>(
   promise: Promise<T>,
   taskName: string,
@@ -243,9 +309,18 @@
   handle: string,
   path?: string
 ): Promise<Buffer> {
+  if (!isNode && path) {
+    throw new Error('Cannot write to a path outside of Node.js environment.');
+  }
+
+  const fs = isNode ? await importFSModule() : null;
+
   let eof = false;
-  let file;
-  if (path) file = await openAsync(path, 'w');
+  let fileHandle: import('fs').promises.FileHandle;
+
+  if (path && fs) {
+    fileHandle = await fs.promises.open(path, 'w');
+  }
   const bufs = [];
   while (!eof) {
     const response = await client.send('IO.read', { handle });
@@ -255,9 +330,11 @@
       response.base64Encoded ? 'base64' : undefined
     );
     bufs.push(buf);
-    if (path) await writeAsync(file, buf);
+    if (path && fs) {
+      await fs.promises.writeFile(fileHandle, buf);
+    }
   }
-  if (path) await closeAsync(file);
+  if (path) await fileHandle.close();
   await client.send('IO.close', { handle });
   let resultBuffer = null;
   try {
@@ -267,17 +344,46 @@
   }
 }
 
+/**
+ * Loads the Node fs promises API. Needed because on Node 10.17 and below,
+ * fs.promises is experimental, and therefore not marked as enumerable. That
+ * means when TypeScript compiles an `import('fs')`, its helper doesn't spot the
+ * promises declaration and therefore on Node <10.17 you get an error as
+ * fs.promises is undefined in compiled TypeScript land.
+ *
+ * See https://github.com/puppeteer/puppeteer/issues/6548 for more details.
+ *
+ * Once Node 10 is no longer supported (April 2021) we can remove this and use
+ * `(await import('fs')).promises`.
+ */
+async function importFSModule(): Promise<typeof import('fs')> {
+  if (!isNode) {
+    throw new Error('Cannot load the fs module API outside of Node.');
+  }
+
+  const fs = await import('fs');
+  if (fs.promises) {
+    return fs;
+  }
+  return fs.default;
+}
+
 export const helper = {
   evaluationString,
+  pageBindingInitString,
+  pageBindingDeliverResultString,
+  pageBindingDeliverErrorString,
+  pageBindingDeliverErrorValueString,
+  makePredicateString,
   readProtocolStream,
   waitWithTimeout,
   waitForEvent,
   isString,
   isNumber,
+  importFSModule,
   addEventListener,
   removeEventListeners,
   valueFromRemoteObject,
-  installAsyncStackHooks,
   getExceptionMessage,
   releaseObject,
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/HTTPRequest.ts firefox-85.0+build1/remote/test/puppeteer/src/common/HTTPRequest.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/HTTPRequest.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/HTTPRequest.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,20 +13,94 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CDPSession } from './Connection';
-import { Frame } from './FrameManager';
-import { HTTPResponse } from './HTTPResponse';
-import { assert } from './assert';
-import { helper, debugError } from './helper';
-import Protocol from '../protocol';
+import { CDPSession } from './Connection.js';
+import { Frame } from './FrameManager.js';
+import { HTTPResponse } from './HTTPResponse.js';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import { Protocol } from 'devtools-protocol';
 
+/**
+ * @public
+ */
+export interface ContinueRequestOverrides {
+  /**
+   * If set, the request URL will change. This is not a redirect.
+   */
+  url?: string;
+  method?: string;
+  postData?: string;
+  headers?: Record<string, string>;
+}
+
+/**
+ * Required response data to fulfill a request with.
+ *
+ * @public
+ */
+export interface ResponseForRequest {
+  status: number;
+  headers: Record<string, string>;
+  contentType: string;
+  body: string | Buffer;
+}
+
+/**
+ *
+ * Represents an HTTP request sent by a page.
+ * @remarks
+ *
+ * Whenever the page sends a request, such as for a network resource, the
+ * following events are emitted by Puppeteer's `page`:
+ *
+ * - `request`:  emitted when the request is issued by the page.
+ * - `requestfinished` - emitted when the response body is downloaded and the
+ *   request is complete.
+ *
+ * If request fails at some point, then instead of `requestfinished` event the
+ * `requestfailed` event is emitted.
+ *
+ * All of these events provide an instance of `HTTPRequest` representing the
+ * request that occurred:
+ *
+ * ```
+ * page.on('request', request => ...)
+ * ```
+ *
+ * NOTE: HTTP Error responses, such as 404 or 503, are still successful
+ * responses from HTTP standpoint, so request will complete with
+ * `requestfinished` event.
+ *
+ * If request gets a 'redirect' response, the request is successfully finished
+ * with the `requestfinished` event, and a new request is issued to a
+ * redirected url.
+ *
+ * @public
+ */
 export class HTTPRequest {
+  /**
+   * @internal
+   */
   _requestId: string;
+  /**
+   * @internal
+   */
   _interceptionId: string;
+  /**
+   * @internal
+   */
   _failureText = null;
+  /**
+   * @internal
+   */
   _response: HTTPResponse | null = null;
-
+  /**
+   * @internal
+   */
   _fromMemoryCache = false;
+  /**
+   * @internal
+   */
   _redirectChain: HTTPRequest[];
 
   private _client: CDPSession;
@@ -41,12 +115,15 @@
   private _headers: Record<string, string> = {};
   private _frame: Frame;
 
+  /**
+   * @internal
+   */
   constructor(
     client: CDPSession,
     frame: Frame,
     interceptionId: string,
     allowInterception: boolean,
-    event: Protocol.Network.requestWillBeSentPayload,
+    event: Protocol.Network.RequestWillBeSentEvent,
     redirectChain: HTTPRequest[]
   ) {
     this._client = client;
@@ -66,44 +143,122 @@
       this._headers[key.toLowerCase()] = event.request.headers[key];
   }
 
+  /**
+   * @returns the URL of the request
+   */
   url(): string {
     return this._url;
   }
 
+  /**
+   * Contains the request's resource type as it was perceived by the rendering
+   * engine.
+   * @remarks
+   * @returns one of the following: `document`, `stylesheet`, `image`, `media`,
+   * `font`, `script`, `texttrack`, `xhr`, `fetch`, `eventsource`, `websocket`,
+   * `manifest`, `other`.
+   */
   resourceType(): string {
+    // TODO (@jackfranklin): protocol.d.ts has a type for this, but all the
+    // string values are uppercase. The Puppeteer docs explicitly say the
+    // potential values are all lower case, and the constructor takes the event
+    // type and calls toLowerCase() on it, so we can't reuse the type from the
+    // protocol.d.ts. Why do we lower case?
     return this._resourceType;
   }
 
+  /**
+   * @returns the method used (`GET`, `POST`, etc.)
+   */
   method(): string {
     return this._method;
   }
 
+  /**
+   * @returns the request's post body, if any.
+   */
   postData(): string | undefined {
     return this._postData;
   }
 
+  /**
+   * @returns an object with HTTP headers associated with the request. All
+   * header names are lower-case.
+   */
   headers(): Record<string, string> {
     return this._headers;
   }
 
+  /**
+   * @returns the response for this request, if a response has been received.
+   */
   response(): HTTPResponse | null {
     return this._response;
   }
 
+  /**
+   * @returns the frame that initiated the request.
+   */
   frame(): Frame | null {
     return this._frame;
   }
 
+  /**
+   * @returns true if the request is the driver of the current frame's navigation.
+   */
   isNavigationRequest(): boolean {
     return this._isNavigationRequest;
   }
 
+  /**
+   * @remarks
+   *
+   * `redirectChain` is shared between all the requests of the same chain.
+   *
+   * For example, if the website `http://example.com` has a single redirect to
+   * `https://example.com`, then the chain will contain one request:
+   *
+   * ```js
+   * const response = await page.goto('http://example.com');
+   * const chain = response.request().redirectChain();
+   * console.log(chain.length); // 1
+   * console.log(chain[0].url()); // 'http://example.com'
+   * ```
+   *
+   * If the website `https://google.com` has no redirects, then the chain will be empty:
+   *
+   * ```js
+   * const response = await page.goto('https://google.com');
+   * const chain = response.request().redirectChain();
+   * console.log(chain.length); // 0
+   * ```
+   *
+   * @returns the chain of requests - if a server responds with at least a
+   * single redirect, this chain will contain all requests that were redirected.
+   */
   redirectChain(): HTTPRequest[] {
     return this._redirectChain.slice();
   }
 
   /**
-   * @returns {?{errorText: string}}
+   * Access information about the request's failure.
+   *
+   * @remarks
+   *
+   * @example
+   *
+   * Example of logging all failed requests:
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   * @returns `null` unless the request failed. If the request fails this can
+   * return an object with `errorText` containing a human-readable error
+   * message, e.g. `net::ERR_FAILED`. It is not guaranteeded that there will be
+   * failure text if the request fails.
    */
   failure(): { errorText: string } | null {
     if (!this._failureText) return null;
@@ -112,26 +267,49 @@
     };
   }
 
-  async continue(
-    overrides: {
-      url?: string;
-      method?: string;
-      postData?: string;
-      headers?: Record<string, string>;
-    } = {}
-  ): Promise<void> {
+  /**
+   * Continues request with optional request overrides.
+   *
+   * @remarks
+   *
+   * To use this, request
+   * interception should be enabled with {@link Page.setRequestInterception}.
+   *
+   * Exception is immediately thrown if the request interception is not enabled.
+   *
+   * @example
+   * ```js
+   * await page.setRequestInterception(true);
+   * page.on('request', request => {
+   *   // Override headers
+   *   const headers = Object.assign({}, request.headers(), {
+   *     foo: 'bar', // set "foo" header
+   *     origin: undefined, // remove "origin" header
+   *   });
+   *   request.continue({headers});
+   * });
+   * ```
+   *
+   * @param overrides - optional overrides to apply to the request.
+   */
+  async continue(overrides: ContinueRequestOverrides = {}): Promise<void> {
     // Request interception is not supported for data: urls.
     if (this._url.startsWith('data:')) return;
     assert(this._allowInterception, 'Request Interception is not enabled!');
     assert(!this._interceptionHandled, 'Request is already handled!');
     const { url, method, postData, headers } = overrides;
     this._interceptionHandled = true;
+
+    const postDataBinaryBase64 = postData
+      ? Buffer.from(postData).toString('base64')
+      : undefined;
+
     await this._client
       .send('Fetch.continueRequest', {
         requestId: this._interceptionId,
         url,
         method,
-        postData,
+        postData: postDataBinaryBase64,
         headers: headers ? headersArray(headers) : undefined,
       })
       .catch((error) => {
@@ -142,12 +320,35 @@
       });
   }
 
-  async respond(response: {
-    status: number;
-    headers: Record<string, string>;
-    contentType: string;
-    body: string | Buffer;
-  }): Promise<void> {
+  /**
+   * Fulfills a request with the given response.
+   *
+   * @remarks
+   *
+   * To use this, request
+   * interception should be enabled with {@link Page.setRequestInterception}.
+   *
+   * Exception is immediately thrown if the request interception is not enabled.
+   *
+   * @example
+   * An example of fulfilling all requests with 404 responses:
+   * ```js
+   * await page.setRequestInterception(true);
+   * page.on('request', request => {
+   *   request.respond({
+   *     status: 404,
+   *     contentType: 'text/plain',
+   *     body: 'Not Found!'
+   *   });
+   * });
+   * ```
+   *
+   * NOTE: Mocking responses for dataURL requests is not supported.
+   * Calling `request.respond` for a dataURL request is a noop.
+   *
+   * @param response - the response to fulfill the request with.
+   */
+  async respond(response: ResponseForRequest): Promise<void> {
     // Mocking responses for dataURL requests is not currently supported.
     if (this._url.startsWith('data:')) return;
     assert(this._allowInterception, 'Request Interception is not enabled!');
@@ -187,6 +388,16 @@
       });
   }
 
+  /**
+   * Aborts a request.
+   *
+   * @remarks
+   * To use this, request interception should be enabled with
+   * {@link Page.setRequestInterception}. If it is not enabled, this method will
+   * throw an exception immediately.
+   *
+   * @param errorCode - optional error code to provide.
+   */
   async abort(errorCode: ErrorCode = 'failed'): Promise<void> {
     // Request interception is not supported for data: urls.
     if (this._url.startsWith('data:')) return;
@@ -209,7 +420,10 @@
   }
 }
 
-type ErrorCode =
+/**
+ * @public
+ */
+export type ErrorCode =
   | 'aborted'
   | 'accessdenied'
   | 'addressunreachable'
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/HTTPResponse.ts firefox-85.0+build1/remote/test/puppeteer/src/common/HTTPResponse.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/HTTPResponse.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/HTTPResponse.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CDPSession } from './Connection';
-import { Frame } from './FrameManager';
-import { HTTPRequest } from './HTTPRequest';
-import { SecurityDetails } from './SecurityDetails';
-import Protocol from '../protocol';
+import { CDPSession } from './Connection.js';
+import { Frame } from './FrameManager.js';
+import { HTTPRequest } from './HTTPRequest.js';
+import { SecurityDetails } from './SecurityDetails.js';
+import { Protocol } from 'devtools-protocol';
 
 /**
  * @public
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Input.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Input.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Input.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Input.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { CDPSession } from './Connection';
-import { keyDefinitions, KeyDefinition, KeyInput } from './USKeyboardLayout';
+import { assert } from './assert.js';
+import { CDPSession } from './Connection.js';
+import { keyDefinitions, KeyDefinition, KeyInput } from './USKeyboardLayout.js';
 
 type KeyDescription = Required<
   Pick<KeyDefinition, 'keyCode' | 'key' | 'text' | 'code' | 'location'>
@@ -289,6 +289,14 @@
 }
 
 /**
+ * @public
+ */
+export interface MouseWheelOptions {
+  deltaX?: number;
+  deltaY?: number;
+}
+
+/**
  * The Mouse class operates in main-frame CSS pixels
  * relative to the top-left corner of the viewport.
  * @remarks
@@ -446,6 +454,38 @@
       clickCount,
     });
   }
+
+  /**
+   * Dispatches a `mousewheel` event.
+   * @param options - Optional: `MouseWheelOptions`.
+   *
+   * @example
+   * An example of zooming into an element:
+   * ```js
+   * await page.goto('https://mdn.mozillademos.org/en-US/docs/Web/API/Element/wheel_event$samples/Scaling_an_element_via_the_wheel?revision=1587366');
+   *
+   * const elem = await page.$('div');
+   * const boundingBox = await elem.boundingBox();
+   * await page.mouse.move(
+   *   boundingBox.x + boundingBox.width / 2,
+   *   boundingBox.y + boundingBox.height / 2
+   * );
+   *
+   * await page.mouse.wheel({ deltaY: -100 })
+   * ```
+   */
+  async wheel(options: MouseWheelOptions = {}): Promise<void> {
+    const { deltaX = 0, deltaY = 0 } = options;
+    await this._client.send('Input.dispatchMouseEvent', {
+      type: 'mouseWheel',
+      x: this._x,
+      y: this._y,
+      deltaX,
+      deltaY,
+      modifiers: this._keyboard._modifiers,
+      pointerType: 'mouse',
+    });
+  }
 }
 
 /**
@@ -470,15 +510,6 @@
    * @param y - Vertical position of the tap.
    */
   async tap(x: number, y: number): Promise<void> {
-    // Touches appear to be lost during the first frame after navigation.
-    // This waits a frame before sending the tap.
-    // @see https://crbug.com/613219
-    await this._client.send('Runtime.evaluate', {
-      expression:
-        'new Promise(x => requestAnimationFrame(() => requestAnimationFrame(x)))',
-      awaitPromise: true,
-    });
-
     const touchPoints = [{ x: Math.round(x), y: Math.round(y) }];
     await this._client.send('Input.dispatchTouchEvent', {
       type: 'touchStart',
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/JSHandle.ts firefox-85.0+build1/remote/test/puppeteer/src/common/JSHandle.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/JSHandle.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/JSHandle.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,22 +14,24 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper, debugError } from './helper';
-import { ExecutionContext } from './ExecutionContext';
-import { Page } from './Page';
-import { CDPSession } from './Connection';
-import { KeyInput } from './USKeyboardLayout';
-import { FrameManager, Frame } from './FrameManager';
-import { getQueryHandlerAndSelector } from './QueryHandler';
-import Protocol from '../protocol';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import { ExecutionContext } from './ExecutionContext.js';
+import { Page } from './Page.js';
+import { CDPSession } from './Connection.js';
+import { KeyInput } from './USKeyboardLayout.js';
+import { FrameManager, Frame } from './FrameManager.js';
+import { getQueryHandlerAndSelector } from './QueryHandler.js';
+import { Protocol } from 'devtools-protocol';
 import {
   EvaluateFn,
   SerializableOrJSHandle,
   EvaluateFnReturnType,
   EvaluateHandleFn,
   WrapElementHandle,
-} from './EvalTypes';
+  UnwrapPromiseLike,
+} from './EvalTypes.js';
+import { isNode } from '../environment.js';
 
 export interface BoxModel {
   content: Array<{ x: number; y: number }>;
@@ -153,12 +155,10 @@
   async evaluate<T extends EvaluateFn>(
     pageFunction: T | string,
     ...args: SerializableOrJSHandle[]
-  ): Promise<EvaluateFnReturnType<T>> {
-    return await this.executionContext().evaluate<EvaluateFnReturnType<T>>(
-      pageFunction,
-      this,
-      ...args
-    );
+  ): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>> {
+    return await this.executionContext().evaluate<
+      UnwrapPromiseLike<EvaluateFnReturnType<T>>
+    >(pageFunction, this, ...args);
   }
 
   /**
@@ -243,7 +243,7 @@
    * on the object in page and consequent {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse | JSON.parse} in puppeteer.
    * **NOTE** The method throws if the referenced object is not stringifiable.
    */
-  async jsonValue(): Promise<{}> {
+  async jsonValue(): Promise<Record<string, unknown>> {
     if (this._remoteObject.objectId) {
       const response = await this._client.send('Runtime.callFunctionOn', {
         functionDeclaration: 'function() { return this; }',
@@ -378,10 +378,9 @@
         element.scrollIntoView({
           block: 'center',
           inline: 'center',
-          // Chrome still supports behavior: instant but it's not in the spec
-          // so TS shouts We don't want to make this breaking change in
-          // Puppeteer yet so we'll ignore the line.
-          // @ts-ignore
+          // @ts-expect-error Chrome still supports behavior: instant but
+          // it's not in the spec so TS shouts We don't want to make this
+          // breaking change in Puppeteer yet so we'll ignore the line.
           behavior: 'instant',
         });
         return false;
@@ -397,10 +396,9 @@
         element.scrollIntoView({
           block: 'center',
           inline: 'center',
-          // Chrome still supports behavior: instant but it's not in the spec
-          // so TS shouts We don't want to make this breaking change in
-          // Puppeteer yet so we'll ignore the line.
-          // @ts-ignore
+          // @ts-expect-error Chrome still supports behavior: instant but
+          // it's not in the spec so TS shouts We don't want to make this
+          // breaking change in Puppeteer yet so we'll ignore the line.
           behavior: 'instant',
         });
       }
@@ -445,11 +443,12 @@
     };
   }
 
-  private _getBoxModel(): Promise<void | Protocol.DOM.getBoxModelReturnValue> {
+  private _getBoxModel(): Promise<void | Protocol.DOM.GetBoxModelResponse> {
+    const params: Protocol.DOM.GetBoxModelRequest = {
+      objectId: this._remoteObject.objectId,
+    };
     return this._client
-      .send('DOM.getBoxModel', {
-        objectId: this._remoteObject.objectId,
-      })
+      .send('DOM.getBoxModel', params)
       .catch((error) => debugError(error));
   }
 
@@ -556,22 +555,21 @@
       'Multiple file uploads only work with <input type=file multiple>'
     );
 
+    if (!isNode) {
+      throw new Error(
+        `JSHandle#uploadFile can only be used in Node environments.`
+      );
+    }
     // This import is only needed for `uploadFile`, so keep it scoped here to avoid paying
     // the cost unnecessarily.
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const path = require('path');
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const fs = require('fs');
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { promisify } = require('util');
-    const access = promisify(fs.access);
-
+    const path = await import('path');
+    const fs = await helper.importFSModule();
     // Locate all files and confirm that they exist.
     const files = await Promise.all(
       filePaths.map(async (filePath) => {
         const resolvedPath: string = path.resolve(filePath);
         try {
-          await access(resolvedPath, fs.constants.R_OK);
+          await fs.promises.access(resolvedPath, fs.constants.R_OK);
         } catch (error) {
           if (error.code === 'ENOENT')
             throw new Error(`${filePath} does not exist or is not readable`);
@@ -619,7 +617,9 @@
    * Calls {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus | focus} on the element.
    */
   async focus(): Promise<void> {
-    await this.evaluate((element) => element.focus());
+    await this.evaluate<(element: HTMLElement) => void>((element) =>
+      element.focus()
+    );
   }
 
   /**
@@ -772,18 +772,10 @@
    * the return value resolves to `null`.
    */
   async $(selector: string): Promise<ElementHandle | null> {
-    const defaultHandler = (element: Element, selector: string) =>
-      element.querySelector(selector);
     const { updatedSelector, queryHandler } = getQueryHandlerAndSelector(
-      selector,
-      defaultHandler
+      selector
     );
-
-    const handle = await this.evaluateHandle(queryHandler, updatedSelector);
-    const element = handle.asElement();
-    if (element) return element;
-    await handle.dispose();
-    return null;
+    return queryHandler.queryOne(this, updatedSelector);
   }
 
   /**
@@ -791,25 +783,10 @@
    * the return value resolves to `[]`.
    */
   async $$(selector: string): Promise<ElementHandle[]> {
-    const defaultHandler = (element: Element, selector: string) =>
-      element.querySelectorAll(selector);
     const { updatedSelector, queryHandler } = getQueryHandlerAndSelector(
-      selector,
-      defaultHandler
-    );
-
-    const arrayHandle = await this.evaluateHandle(
-      queryHandler,
-      updatedSelector
+      selector
     );
-    const properties = await arrayHandle.getProperties();
-    await arrayHandle.dispose();
-    const result = [];
-    for (const property of properties.values()) {
-      const elementHandle = property.asElement();
-      if (elementHandle) result.push(elementHandle);
-    }
-    return result;
+    return queryHandler.queryAll(this, updatedSelector);
   }
 
   /**
@@ -849,8 +826,8 @@
     await elementHandle.dispose();
 
     /**
-     * This as is a little unfortunate but helps TS understand the behavour of
-     * `elementHandle.evaluate`. If evalute returns an element it will return an
+     * This `as` is a little unfortunate but helps TS understand the behavior of
+     * `elementHandle.evaluate`. If evaluate returns an element it will return an
      * ElementHandle instance, rather than the plain object. All the
      * WrapElementHandle type does is wrap ReturnType into
      * ElementHandle<ReturnType> if it is an ElementHandle, or leave it alone as
@@ -882,28 +859,29 @@
    *  .toEqual(['Hello!', 'Hi!']);
    * ```
    */
-  async $$eval<ReturnType extends any>(
+  async $$eval<ReturnType>(
     selector: string,
-    pageFunction: EvaluateFn | string,
+    pageFunction: (
+      elements: Element[],
+      ...args: unknown[]
+    ) => ReturnType | Promise<ReturnType>,
     ...args: SerializableOrJSHandle[]
-  ): Promise<ReturnType> {
-    const defaultHandler = (element: Element, selector: string) =>
-      Array.from(element.querySelectorAll(selector));
+  ): Promise<WrapElementHandle<ReturnType>> {
     const { updatedSelector, queryHandler } = getQueryHandlerAndSelector(
-      selector,
-      defaultHandler
-    );
-
-    const arrayHandle = await this.evaluateHandle(
-      queryHandler,
-      updatedSelector
-    );
-    const result = await arrayHandle.evaluate<(...args: any[]) => ReturnType>(
-      pageFunction,
-      ...args
+      selector
     );
+    const arrayHandle = await queryHandler.queryAllArray(this, updatedSelector);
+    const result = await arrayHandle.evaluate<
+      (
+        elements: Element[],
+        ...args: unknown[]
+      ) => ReturnType | Promise<ReturnType>
+    >(pageFunction, ...args);
     await arrayHandle.dispose();
-    return result;
+    /* This `as` exists for the same reason as the `as` in $eval above.
+     * See the comment there for a full explanation.
+     */
+    return result as WrapElementHandle<ReturnType>;
   }
 
   /**
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/LifecycleWatcher.ts firefox-85.0+build1/remote/test/puppeteer/src/common/LifecycleWatcher.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/LifecycleWatcher.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/LifecycleWatcher.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,13 +14,18 @@
  * limitations under the License.
  */
 
-import { assert } from './assert';
-import { helper, PuppeteerEventListener } from './helper';
-import { Events } from './Events';
-import { TimeoutError } from './Errors';
-import { FrameManager, Frame } from './FrameManager';
-import { HTTPRequest } from './HTTPRequest';
-import { HTTPResponse } from './HTTPResponse';
+import { assert } from './assert.js';
+import { helper, PuppeteerEventListener } from './helper.js';
+import { TimeoutError } from './Errors.js';
+import {
+  FrameManager,
+  Frame,
+  FrameManagerEmittedEvents,
+} from './FrameManager.js';
+import { HTTPRequest } from './HTTPRequest.js';
+import { HTTPResponse } from './HTTPResponse.js';
+import { NetworkManagerEmittedEvents } from './NetworkManager.js';
+import { CDPSessionEmittedEvents } from './Connection.js';
 
 export type PuppeteerLifeCycleEvent =
   | 'load'
@@ -43,6 +48,9 @@
   ['networkidle2', 'networkAlmostIdle'],
 ]);
 
+/**
+ * @internal
+ */
 export class LifecycleWatcher {
   _expectedLifecycle: ProtocolLifeCycleEvent[];
   _frameManager: FrameManager;
@@ -91,7 +99,7 @@
     this._eventListeners = [
       helper.addEventListener(
         frameManager._client,
-        Events.CDPSession.Disconnected,
+        CDPSessionEmittedEvents.Disconnected,
         () =>
           this._terminate(
             new Error('Navigation failed because browser has disconnected!')
@@ -99,22 +107,22 @@
       ),
       helper.addEventListener(
         this._frameManager,
-        Events.FrameManager.LifecycleEvent,
+        FrameManagerEmittedEvents.LifecycleEvent,
         this._checkLifecycleComplete.bind(this)
       ),
       helper.addEventListener(
         this._frameManager,
-        Events.FrameManager.FrameNavigatedWithinDocument,
+        FrameManagerEmittedEvents.FrameNavigatedWithinDocument,
         this._navigatedWithinDocument.bind(this)
       ),
       helper.addEventListener(
         this._frameManager,
-        Events.FrameManager.FrameDetached,
+        FrameManagerEmittedEvents.FrameDetached,
         this._onFrameDetached.bind(this)
       ),
       helper.addEventListener(
         this._frameManager.networkManager(),
-        Events.NetworkManager.Request,
+        NetworkManagerEmittedEvents.Request,
         this._onRequest.bind(this)
       ),
     ];
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/NetworkManager.ts firefox-85.0+build1/remote/test/puppeteer/src/common/NetworkManager.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/NetworkManager.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/NetworkManager.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,21 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventEmitter } from './EventEmitter';
-import { assert } from './assert';
-import { helper, debugError } from './helper';
-import Protocol from '../protocol';
-import { Events } from './Events';
-import { CDPSession } from './Connection';
-import { FrameManager } from './FrameManager';
-import { HTTPRequest } from './HTTPRequest';
-import { HTTPResponse } from './HTTPResponse';
+import { EventEmitter } from './EventEmitter.js';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import { Protocol } from 'devtools-protocol';
+import { CDPSession } from './Connection.js';
+import { FrameManager } from './FrameManager.js';
+import { HTTPRequest } from './HTTPRequest.js';
+import { HTTPResponse } from './HTTPResponse.js';
 
+/**
+ * @public
+ */
 export interface Credentials {
   username: string;
   password: string;
 }
 
+/**
+ * We use symbols to prevent any external parties listening to these events.
+ * They are internal to Puppeteer.
+ *
+ * @internal
+ */
+export const NetworkManagerEmittedEvents = {
+  Request: Symbol('NetworkManager.Request'),
+  Response: Symbol('NetworkManager.Response'),
+  RequestFailed: Symbol('NetworkManager.RequestFailed'),
+  RequestFinished: Symbol('NetworkManager.RequestFinished'),
+} as const;
+
+/**
+ * @internal
+ */
 export class NetworkManager extends EventEmitter {
   _client: CDPSession;
   _ignoreHTTPSErrors: boolean;
@@ -35,7 +53,7 @@
   _requestIdToRequest = new Map<string, HTTPRequest>();
   _requestIdToRequestWillBeSentEvent = new Map<
     string,
-    Protocol.Network.requestWillBeSentPayload
+    Protocol.Network.RequestWillBeSentEvent
   >();
   _extraHTTPHeaders: Record<string, string> = {};
   _offline = false;
@@ -164,7 +182,7 @@
     });
   }
 
-  _onRequestWillBeSent(event: Protocol.Network.requestWillBeSentPayload): void {
+  _onRequestWillBeSent(event: Protocol.Network.RequestWillBeSentEvent): void {
     // Request interception doesn't happen for data URLs with Network Service.
     if (
       this._protocolRequestInterceptionEnabled &&
@@ -183,10 +201,7 @@
     this._onRequest(event, null);
   }
 
-  /**
-   * @param {!Protocol.Fetch.authRequiredPayload} event
-   */
-  _onAuthRequired(event: Protocol.Fetch.authRequiredPayload): void {
+  _onAuthRequired(event: Protocol.Fetch.AuthRequiredEvent): void {
     /* TODO(jacktfranklin): This is defined in protocol.d.ts but not
      * in an easily referrable way - we should look at exposing it.
      */
@@ -210,7 +225,7 @@
       .catch(debugError);
   }
 
-  _onRequestPaused(event: Protocol.Fetch.requestPausedPayload): void {
+  _onRequestPaused(event: Protocol.Fetch.RequestPausedEvent): void {
     if (
       !this._userRequestInterceptionEnabled &&
       this._protocolRequestInterceptionEnabled
@@ -236,7 +251,7 @@
   }
 
   _onRequest(
-    event: Protocol.Network.requestWillBeSentPayload,
+    event: Protocol.Network.RequestWillBeSentEvent,
     interceptionId?: string
   ): void {
     let redirectChain = [];
@@ -261,11 +276,11 @@
       redirectChain
     );
     this._requestIdToRequest.set(event.requestId, request);
-    this.emit(Events.NetworkManager.Request, request);
+    this.emit(NetworkManagerEmittedEvents.Request, request);
   }
 
   _onRequestServedFromCache(
-    event: Protocol.Network.requestServedFromCachePayload
+    event: Protocol.Network.RequestServedFromCacheEvent
   ): void {
     const request = this._requestIdToRequest.get(event.requestId);
     if (request) request._fromMemoryCache = true;
@@ -283,20 +298,20 @@
     );
     this._requestIdToRequest.delete(request._requestId);
     this._attemptedAuthentications.delete(request._interceptionId);
-    this.emit(Events.NetworkManager.Response, response);
-    this.emit(Events.NetworkManager.RequestFinished, request);
+    this.emit(NetworkManagerEmittedEvents.Response, response);
+    this.emit(NetworkManagerEmittedEvents.RequestFinished, request);
   }
 
-  _onResponseReceived(event: Protocol.Network.responseReceivedPayload): void {
+  _onResponseReceived(event: Protocol.Network.ResponseReceivedEvent): void {
     const request = this._requestIdToRequest.get(event.requestId);
     // FileUpload sends a response without a matching request.
     if (!request) return;
     const response = new HTTPResponse(this._client, request, event.response);
     request._response = response;
-    this.emit(Events.NetworkManager.Response, response);
+    this.emit(NetworkManagerEmittedEvents.Response, response);
   }
 
-  _onLoadingFinished(event: Protocol.Network.loadingFinishedPayload): void {
+  _onLoadingFinished(event: Protocol.Network.LoadingFinishedEvent): void {
     const request = this._requestIdToRequest.get(event.requestId);
     // For certain requestIds we never receive requestWillBeSent event.
     // @see https://crbug.com/750469
@@ -307,10 +322,10 @@
     if (request.response()) request.response()._resolveBody(null);
     this._requestIdToRequest.delete(request._requestId);
     this._attemptedAuthentications.delete(request._interceptionId);
-    this.emit(Events.NetworkManager.RequestFinished, request);
+    this.emit(NetworkManagerEmittedEvents.RequestFinished, request);
   }
 
-  _onLoadingFailed(event: Protocol.Network.loadingFailedPayload): void {
+  _onLoadingFailed(event: Protocol.Network.LoadingFailedEvent): void {
     const request = this._requestIdToRequest.get(event.requestId);
     // For certain requestIds we never receive requestWillBeSent event.
     // @see https://crbug.com/750469
@@ -320,6 +335,6 @@
     if (response) response._resolveBody(null);
     this._requestIdToRequest.delete(request._requestId);
     this._attemptedAuthentications.delete(request._interceptionId);
-    this.emit(Events.NetworkManager.RequestFailed, request);
+    this.emit(NetworkManagerEmittedEvents.RequestFailed, request);
   }
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Page.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Page.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Page.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Page.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,42 +14,48 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import { promisify } from 'util';
-import { EventEmitter } from './EventEmitter';
-import * as mime from 'mime';
-import { Events } from './Events';
-import { Connection, CDPSession } from './Connection';
-import { Dialog } from './Dialog';
-import { EmulationManager } from './EmulationManager';
-import { Frame, FrameManager } from './FrameManager';
-import { Keyboard, Mouse, Touchscreen, MouseButton } from './Input';
-import { Tracing } from './Tracing';
-import { assert } from './assert';
-import { helper, debugError } from './helper';
-import { Coverage } from './Coverage';
-import { WebWorker } from './WebWorker';
-import { Browser, BrowserContext } from './Browser';
-import { Target } from './Target';
-import { createJSHandle, JSHandle, ElementHandle } from './JSHandle';
-import { Viewport } from './PuppeteerViewport';
-import { Credentials } from './NetworkManager';
-import { HTTPRequest } from './HTTPRequest';
-import { HTTPResponse } from './HTTPResponse';
-import { Accessibility } from './Accessibility';
-import { TimeoutSettings } from './TimeoutSettings';
-import { FileChooser } from './FileChooser';
-import { ConsoleMessage, ConsoleMessageType } from './ConsoleMessage';
-import { PuppeteerLifeCycleEvent } from './LifecycleWatcher';
-import Protocol from '../protocol';
+import { EventEmitter } from './EventEmitter.js';
+import {
+  Connection,
+  CDPSession,
+  CDPSessionEmittedEvents,
+} from './Connection.js';
+import { Dialog } from './Dialog.js';
+import { EmulationManager } from './EmulationManager.js';
+import {
+  Frame,
+  FrameManager,
+  FrameManagerEmittedEvents,
+} from './FrameManager.js';
+import { Keyboard, Mouse, Touchscreen, MouseButton } from './Input.js';
+import { Tracing } from './Tracing.js';
+import { assert } from './assert.js';
+import { helper, debugError } from './helper.js';
+import { Coverage } from './Coverage.js';
+import { WebWorker } from './WebWorker.js';
+import { Browser, BrowserContext } from './Browser.js';
+import { Target } from './Target.js';
+import { createJSHandle, JSHandle, ElementHandle } from './JSHandle.js';
+import { Viewport } from './PuppeteerViewport.js';
+import { Credentials, NetworkManagerEmittedEvents } from './NetworkManager.js';
+import { HTTPRequest } from './HTTPRequest.js';
+import { HTTPResponse } from './HTTPResponse.js';
+import { Accessibility } from './Accessibility.js';
+import { TimeoutSettings } from './TimeoutSettings.js';
+import { FileChooser } from './FileChooser.js';
+import { ConsoleMessage, ConsoleMessageType } from './ConsoleMessage.js';
+import { PuppeteerLifeCycleEvent } from './LifecycleWatcher.js';
+import { Protocol } from 'devtools-protocol';
 import {
-  EvaluateFn,
   SerializableOrJSHandle,
   EvaluateHandleFn,
   WrapElementHandle,
-} from './EvalTypes';
-
-const writeFileAsync = promisify(fs.writeFile);
+  EvaluateFn,
+  EvaluateFnReturnType,
+  UnwrapPromiseLike,
+} from './EvalTypes.js';
+import { PDFOptions, paperFormats } from './PDFOptions.js';
+import { isNode } from '../environment.js';
 
 /**
  * @public
@@ -142,69 +148,140 @@
   encoding?: string;
 }
 
-interface PDFMargin {
-  top?: string | number;
-  bottom?: string | number;
-  left?: string | number;
-  right?: string | number;
-}
-
-interface PDFOptions {
-  scale?: number;
-  displayHeaderFooter?: boolean;
-  headerTemplate?: string;
-  footerTemplate?: string;
-  printBackground?: boolean;
-  landscape?: boolean;
-  pageRanges?: string;
-  format?: string;
-  width?: string | number;
-  height?: string | number;
-  preferCSSPageSize?: boolean;
-  margin?: PDFMargin;
-  path?: string;
-}
-
-interface PaperFormat {
-  width: number;
-  height: number;
-}
-
-const paperFormats: Record<string, PaperFormat> = {
-  letter: { width: 8.5, height: 11 },
-  legal: { width: 8.5, height: 14 },
-  tabloid: { width: 11, height: 17 },
-  ledger: { width: 17, height: 11 },
-  a0: { width: 33.1, height: 46.8 },
-  a1: { width: 23.4, height: 33.1 },
-  a2: { width: 16.54, height: 23.4 },
-  a3: { width: 11.7, height: 16.54 },
-  a4: { width: 8.27, height: 11.7 },
-  a5: { width: 5.83, height: 8.27 },
-  a6: { width: 4.13, height: 5.83 },
-} as const;
-
-type VisionDeficiency =
-  | 'none'
-  | 'achromatopsia'
-  | 'blurredVision'
-  | 'deuteranopia'
-  | 'protanopia'
-  | 'tritanopia';
-
 /**
  * All the events that a page instance may emit.
  *
  * @public
  */
 export const enum PageEmittedEvents {
+  /** Emitted when the page closes. */
+  Close = 'close',
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods,
+   * e.g. `console.log` or `console.dir`. Also emitted if the page throws an
+   * error or a warning.
+   *
+   * @remarks
+   *
+   * A `console` event provides a {@link ConsoleMessage} representing the
+   * console message that was logged.
+   *
+   * @example
+   * An example of handling `console` event:
+   * ```js
+   * page.on('console', msg => {
+   *   for (let i = 0; i < msg.args().length; ++i)
+   *    console.log(`${i}: ${msg.args()[i]}`);
+   *  });
+   *  page.evaluate(() => console.log('hello', 5, {foo: 'bar'}));
+   * ```
+   */
+  Console = 'console',
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`,
+   * `confirm` or `beforeunload`. Puppeteer can respond to the dialog via
+   * {@link Dialog.accept} or {@link Dialog.dismiss}.
+   */
+  Dialog = 'dialog',
+  /**
+   * Emitted when the JavaScript
+   * {@link https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded | DOMContentLoaded } event is dispatched.
+   */
+  DOMContentLoaded = 'domcontentloaded',
+  /**
+   * Emitted when the page crashes. Will contain an `Error`.
+   */
+  Error = 'error',
+  /** Emitted when a frame is attached. Will contain a {@link Frame}. */
+  FrameAttached = 'frameattached',
+  /** Emitted when a frame is detached. Will contain a {@link Frame}. */
+  FrameDetached = 'framedetached',
+  /** Emitted when a frame is navigated to a new URL. Will contain a {@link Frame}. */
+  FrameNavigated = 'framenavigated',
+  /**
+   * Emitted when the JavaScript
+   * {@link https://developer.mozilla.org/en-US/docs/Web/Events/load | load}
+   * event is dispatched.
+   */
+  Load = 'load',
+  /**
+   * Emitted when the JavaScript code makes a call to `console.timeStamp`. For
+   * the list of metrics see {@link Page.metrics | page.metrics}.
+   *
+   * @remarks
+   * Contains an object with two properties:
+   * - `title`: the title passed to `console.timeStamp`
+   * - `metrics`: objec containing metrics as key/value pairs. The values will
+   *   be `number`s.
+   */
+  Metrics = 'metrics',
+  /**
+   * Emitted when an uncaught exception happens within the page.
+   * Contains an `Error`.
+   */
+  PageError = 'pageerror',
+  /**
+   * Emitted when the page opens a new tab or window.
+   *
+   * Contains a {@link Page} corresponding to the popup window.
+   *
+   * @example
+   *
+   * ```js
+   * const [popup] = await Promise.all([
+   *   new Promise(resolve => page.once('popup', resolve)),
+   *   page.click('a[target=_blank]'),
+   * ]);
+   * ```
+   *
+   * ```js
+   * const [popup] = await Promise.all([
+   *   new Promise(resolve => page.once('popup', resolve)),
+   *   page.evaluate(() => window.open('https://example.com')),
+   * ]);
+   * ```
+   */
+  Popup = 'popup',
+  /**
+   * Emitted when a page issues a request and contains a {@link HTTPRequest}.
+   *
+   * @remarks
+   * The object is readonly. See {@Page.setRequestInterception} for intercepting
+   * and mutating requests.
+   */
+  Request = 'request',
+  /**
+   * Emitted when a request fails, for example by timing out.
+   *
+   * Contains a {@link HTTPRequest}.
+   *
+   * @remarks
+   *
+   * NOTE: HTTP Error responses, such as 404 or 503, are still successful
+   * responses from HTTP standpoint, so request will complete with
+   * `requestfinished` event and not with `requestfailed`.
+   */
+  RequestFailed = 'requestfailed',
+  /**
+   * Emitted when a request finishes successfully. Contains a {@link HTTPRequest}.
+   */
+  RequestFinished = 'requestfinished',
+  /**
+   * Emitted when a response is received. Contains a {@link HTTPResponse}.
+   */
+  Response = 'response',
   /**
    * Emitted when a dedicated
    * {@link https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API | WebWorker}
    * is spawned by the page.
-   * @eventProperty
    */
   WorkerCreated = 'workercreated',
+  /**
+   * Emitted when a dedicated
+   * {@link https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API | WebWorker}
+   * is destroyed by the page.
+   */
+  WorkerDestroyed = 'workerdestroyed',
 }
 
 class ScreenshotTaskQueue {
@@ -224,12 +301,13 @@
 }
 
 /**
- * Page provides methods to interact with a single tab or [extension background
- * page](https://developer.chrome.com/extensions/background_pages) in Chromium.
- * One [Browser] instance might have multiple [Page] instances.
+ * Page provides methods to interact with a single tab or
+ * {@link https://developer.chrome.com/extensions/background_pages | extension background page} in Chromium.
  *
  * @remarks
  *
+ * One Browser instance might have multiple Page instances.
+ *
  * @example
  * This example creates a page, navigates it to a URL, and then * saves a screenshot:
  * ```js
@@ -244,7 +322,7 @@
  * })();
  * ```
  *
- * The Page class extends from Puppeteer's {@link EventEmitter } class and will
+ * The Page class extends from Puppeteer's {@link EventEmitter} class and will
  * emit various events which are documented in the {@link PageEmittedEvents} enum.
  *
  * @example
@@ -350,39 +428,39 @@
     client.on('Target.detachedFromTarget', (event) => {
       const worker = this._workers.get(event.sessionId);
       if (!worker) return;
-      this.emit(Events.Page.WorkerDestroyed, worker);
+      this.emit(PageEmittedEvents.WorkerDestroyed, worker);
       this._workers.delete(event.sessionId);
     });
 
-    this._frameManager.on(Events.FrameManager.FrameAttached, (event) =>
-      this.emit(Events.Page.FrameAttached, event)
+    this._frameManager.on(FrameManagerEmittedEvents.FrameAttached, (event) =>
+      this.emit(PageEmittedEvents.FrameAttached, event)
     );
-    this._frameManager.on(Events.FrameManager.FrameDetached, (event) =>
-      this.emit(Events.Page.FrameDetached, event)
+    this._frameManager.on(FrameManagerEmittedEvents.FrameDetached, (event) =>
+      this.emit(PageEmittedEvents.FrameDetached, event)
     );
-    this._frameManager.on(Events.FrameManager.FrameNavigated, (event) =>
-      this.emit(Events.Page.FrameNavigated, event)
+    this._frameManager.on(FrameManagerEmittedEvents.FrameNavigated, (event) =>
+      this.emit(PageEmittedEvents.FrameNavigated, event)
     );
 
     const networkManager = this._frameManager.networkManager();
-    networkManager.on(Events.NetworkManager.Request, (event) =>
-      this.emit(Events.Page.Request, event)
+    networkManager.on(NetworkManagerEmittedEvents.Request, (event) =>
+      this.emit(PageEmittedEvents.Request, event)
     );
-    networkManager.on(Events.NetworkManager.Response, (event) =>
-      this.emit(Events.Page.Response, event)
+    networkManager.on(NetworkManagerEmittedEvents.Response, (event) =>
+      this.emit(PageEmittedEvents.Response, event)
     );
-    networkManager.on(Events.NetworkManager.RequestFailed, (event) =>
-      this.emit(Events.Page.RequestFailed, event)
+    networkManager.on(NetworkManagerEmittedEvents.RequestFailed, (event) =>
+      this.emit(PageEmittedEvents.RequestFailed, event)
     );
-    networkManager.on(Events.NetworkManager.RequestFinished, (event) =>
-      this.emit(Events.Page.RequestFinished, event)
+    networkManager.on(NetworkManagerEmittedEvents.RequestFinished, (event) =>
+      this.emit(PageEmittedEvents.RequestFinished, event)
     );
     this._fileChooserInterceptors = new Set();
 
     client.on('Page.domContentEventFired', () =>
-      this.emit(Events.Page.DOMContentLoaded)
+      this.emit(PageEmittedEvents.DOMContentLoaded)
     );
-    client.on('Page.loadEventFired', () => this.emit(Events.Page.Load));
+    client.on('Page.loadEventFired', () => this.emit(PageEmittedEvents.Load));
     client.on('Runtime.consoleAPICalled', (event) => this._onConsoleAPI(event));
     client.on('Runtime.bindingCalled', (event) => this._onBindingCalled(event));
     client.on('Page.javascriptDialogOpening', (event) => this._onDialog(event));
@@ -394,7 +472,7 @@
     client.on('Log.entryAdded', (event) => this._onLogEntryAdded(event));
     client.on('Page.fileChooserOpened', (event) => this._onFileChooser(event));
     this._target._isClosedPromise.then(() => {
-      this.emit(Events.Page.Close);
+      this.emit(PageEmittedEvents.Close);
       this._closed = true;
     });
   }
@@ -407,13 +485,13 @@
         waitForDebuggerOnStart: false,
         flatten: true,
       }),
-      this._client.send('Performance.enable', {}),
-      this._client.send('Log.enable', {}),
+      this._client.send('Performance.enable'),
+      this._client.send('Log.enable'),
     ]);
   }
 
   private async _onFileChooser(
-    event: Protocol.Page.fileChooserOpenedPayload
+    event: Protocol.Page.FileChooserOpenedEvent
   ): Promise<void> {
     if (!this._fileChooserInterceptors.size) return;
     const frame = this._frameManager.frame(event.frameId);
@@ -518,13 +596,13 @@
     this.emit('error', new Error('Page crashed!'));
   }
 
-  private _onLogEntryAdded(event: Protocol.Log.entryAddedPayload): void {
+  private _onLogEntryAdded(event: Protocol.Log.EntryAddedEvent): void {
     const { level, text, args, source, url, lineNumber } = event.entry;
     if (args) args.map((arg) => helper.releaseObject(this._client, arg));
     if (source !== 'worker')
       this.emit(
-        Events.Page.Console,
-        new ConsoleMessage(level, text, [], { url, lineNumber })
+        PageEmittedEvents.Console,
+        new ConsoleMessage(level, text, [], [{ url, lineNumber }])
       );
   }
 
@@ -701,6 +779,28 @@
     return context.evaluateHandle<HandlerType>(pageFunction, ...args);
   }
 
+  /**
+   * This method iterates the JavaScript heap and finds all objects with the
+   * given prototype.
+   *
+   * @remarks
+   *
+   * @example
+   *
+   * ```js
+   * // Create a Map object
+   * await page.evaluate(() => window.map = new Map());
+   * // Get a handle to the Map object prototype
+   * const mapPrototype = await page.evaluateHandle(() => Map.prototype);
+   * // Query all map instances into an array
+   * const mapInstances = await page.queryObjects(mapPrototype);
+   * // Count amount of map objects in heap
+   * const count = await page.evaluate(maps => maps.length, mapInstances);
+   * await mapInstances.dispose();
+   * await mapPrototype.dispose();
+   * ```
+   * @param prototypeHandle - a handle to the object prototype.
+   */
   async queryObjects(prototypeHandle: JSHandle): Promise<JSHandle> {
     const context = await this.mainFrame().executionContext();
     return context.queryObjects(prototypeHandle);
@@ -752,13 +852,13 @@
    * );
    * ```
    *
-   * @param selector the
+   * @param selector - the
    * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors | selector}
    * to query for
-   * @param pageFunction the function to be evaluated in the page context. Will
-   * be passed the result of `document.querySelector(selector)` as its first
-   * argument.
-   * @param args any additional arguments to pass through to `pageFunction`.
+   * @param pageFunction - the function to be evaluated in the page context.
+   * Will be passed the result of `document.querySelector(selector)` as its
+   * first argument.
+   * @param args - any additional arguments to pass through to `pageFunction`.
    *
    * @returns The result of calling `pageFunction`. If it returns an element it
    * is wrapped in an {@link ElementHandle}, else the raw value itself is
@@ -785,11 +885,80 @@
     return this.mainFrame().$eval<ReturnType>(selector, pageFunction, ...args);
   }
 
-  async $$eval<ReturnType extends any>(
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within
+   * the page and passes the result as the first argument to the `pageFunction`.
+   *
+   * @remarks
+   *
+   * If `pageFunction` returns a promise `$$eval` will wait for the promise to
+   * resolve and then return its value.
+   *
+   * @example
+   *
+   * ```
+   * // get the amount of divs on the page
+   * const divCount = await page.$$eval('div', divs => divs.length);
+   *
+   * // get the text content of all the `.options` elements:
+   * const options = await page.$$eval('div > span.options', options => {
+   *   return options.map(option => option.textContent)
+   * });
+   * ```
+   *
+   * If you are using TypeScript, you may have to provide an explicit type to the
+   * first argument of the `pageFunction`.
+   * By default it is typed as `Element[]`, but you may need to provide a more
+   * specific sub-type:
+   *
+   * @example
+   *
+   * ```
+   * // if you don't provide HTMLInputElement here, TS will error
+   * // as `value` is not on `Element`
+   * await page.$$eval('input', (elements: HTMLInputElement[]) => {
+   *   return elements.map(e => e.value);
+   * });
+   * ```
+   *
+   * The compiler should be able to infer the return type
+   * from the `pageFunction` you provide. If it is unable to, you can use the generic
+   * type to tell the compiler what return type you expect from `$$eval`:
+   *
+   * @example
+   *
+   * ```
+   * // The compiler can infer the return type in this case, but if it can't
+   * // or if you want to be more explicit, provide it as the generic type.
+   * const allInputValues = await page.$$eval<string[]>(
+   *  'input', (elements: HTMLInputElement[]) => elements.map(e => e.textContent)
+   * );
+   * ```
+   *
+   * @param selector the
+   * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors | selector}
+   * to query for
+   * @param pageFunction the function to be evaluated in the page context. Will
+   * be passed the result of `Array.from(document.querySelectorAll(selector))`
+   * as its first argument.
+   * @param args any additional arguments to pass through to `pageFunction`.
+   *
+   * @returns The result of calling `pageFunction`. If it returns an element it
+   * is wrapped in an {@link ElementHandle}, else the raw value itself is
+   * returned.
+   */
+  async $$eval<ReturnType>(
     selector: string,
-    pageFunction: EvaluateFn | string,
+    pageFunction: (
+      elements: Element[],
+      /* These have to be typed as unknown[] for the same reason as the $eval
+       * definition above, please see that comment for more details and the TODO
+       * that will improve things.
+       */
+      ...args: unknown[]
+    ) => ReturnType | Promise<ReturnType>,
     ...args: SerializableOrJSHandle[]
-  ): Promise<ReturnType> {
+  ): Promise<WrapElementHandle<ReturnType>> {
     return this.mainFrame().$$eval<ReturnType>(selector, pageFunction, ...args);
   }
 
@@ -801,6 +970,10 @@
     return this.mainFrame().$x(expression);
   }
 
+  /**
+   * If no URLs are specified, this method returns cookies for the current page
+   * URL. If URLs are specified, only cookies for those URLs are returned.
+   */
   async cookies(...urls: string[]): Promise<Protocol.Network.Cookie[]> {
     const originalCookies = (
       await this._client.send('Network.getCookies', {
@@ -819,7 +992,7 @@
   }
 
   async deleteCookie(
-    ...cookies: Protocol.Network.deleteCookiesParameters[]
+    ...cookies: Protocol.Network.DeleteCookiesRequest[]
   ): Promise<void> {
     const pageURL = this.url();
     for (const cookie of cookies) {
@@ -877,7 +1050,7 @@
       );
     this._pageBindings.set(name, puppeteerFunction);
 
-    const expression = helper.evaluationString(addPageBinding, name);
+    const expression = helper.pageBindingInitString('exposedFun', name);
     await this._client.send('Runtime.addBinding', { name: name });
     await this._client.send('Page.addScriptToEvaluateOnNewDocument', {
       source: expression,
@@ -885,30 +1058,6 @@
     await Promise.all(
       this.frames().map((frame) => frame.evaluate(expression).catch(debugError))
     );
-
-    function addPageBinding(bindingName): void {
-      /* Cast window to any here as we're about to add properties to it
-       * via win[bindingName] which TypeScript doesn't like.
-       */
-      const win = window as any;
-      const binding = win[bindingName];
-
-      win[bindingName] = (...args: unknown[]): Promise<unknown> => {
-        const me = window[bindingName];
-        let callbacks = me['callbacks'];
-        if (!callbacks) {
-          callbacks = new Map();
-          me['callbacks'] = callbacks;
-        }
-        const seq = (me['lastSeq'] || 0) + 1;
-        me['lastSeq'] = seq;
-        const promise = new Promise((resolve, reject) =>
-          callbacks.set(seq, { resolve, reject })
-        );
-        binding(JSON.stringify({ name: bindingName, seq, args }));
-        return promise;
-      };
-    }
   }
 
   async authenticate(credentials: Credentials): Promise<void> {
@@ -928,8 +1077,8 @@
     return this._buildMetricsObject(response.metrics);
   }
 
-  private _emitMetrics(event: Protocol.Performance.metricsPayload): void {
-    this.emit(Events.Page.Metrics, {
+  private _emitMetrics(event: Protocol.Performance.MetricsEvent): void {
+    this.emit(PageEmittedEvents.Metrics, {
       title: event.title,
       metrics: this._buildMetricsObject(event.metrics),
     });
@@ -951,11 +1100,11 @@
     const message = helper.getExceptionMessage(exceptionDetails);
     const err = new Error(message);
     err.stack = ''; // Don't report clientside error with a node stack attached
-    this.emit(Events.Page.PageError, err);
+    this.emit(PageEmittedEvents.PageError, err);
   }
 
   private async _onConsoleAPI(
-    event: Protocol.Runtime.consoleAPICalledPayload
+    event: Protocol.Runtime.ConsoleAPICalledEvent
   ): Promise<void> {
     if (event.executionContextId === 0) {
       // DevTools protocol stores the last 1000 console messages. These
@@ -981,25 +1130,32 @@
   }
 
   private async _onBindingCalled(
-    event: Protocol.Runtime.bindingCalledPayload
+    event: Protocol.Runtime.BindingCalledEvent
   ): Promise<void> {
-    const { name, seq, args } = JSON.parse(event.payload);
+    let payload: { type: string; name: string; seq: number; args: unknown[] };
+    try {
+      payload = JSON.parse(event.payload);
+    } catch {
+      // The binding was either called by something in the page or it was
+      // called before our wrapper was initialized.
+      return;
+    }
+    const { type, name, seq, args } = payload;
+    if (type !== 'exposedFun' || !this._pageBindings.has(name)) return;
     let expression = null;
     try {
       const result = await this._pageBindings.get(name)(...args);
-      expression = helper.evaluationString(deliverResult, name, seq, result);
+      expression = helper.pageBindingDeliverResultString(name, seq, result);
     } catch (error) {
       if (error instanceof Error)
-        expression = helper.evaluationString(
-          deliverError,
+        expression = helper.pageBindingDeliverErrorString(
           name,
           seq,
           error.message,
           error.stack
         );
       else
-        expression = helper.evaluationString(
-          deliverErrorValue,
+        expression = helper.pageBindingDeliverErrorValueString(
           name,
           seq,
           error
@@ -1011,32 +1167,6 @@
         contextId: event.executionContextId,
       })
       .catch(debugError);
-
-    function deliverResult(name: string, seq: number, result: unknown): void {
-      window[name]['callbacks'].get(seq).resolve(result);
-      window[name]['callbacks'].delete(seq);
-    }
-
-    function deliverError(
-      name: string,
-      seq: number,
-      message: string,
-      stack: string
-    ): void {
-      const error = new Error(message);
-      error.stack = stack;
-      window[name]['callbacks'].get(seq).reject(error);
-      window[name]['callbacks'].delete(seq);
-    }
-
-    function deliverErrorValue(
-      name: string,
-      seq: number,
-      value: unknown
-    ): void {
-      window[name]['callbacks'].get(seq).reject(value);
-      window[name]['callbacks'].delete(seq);
-    }
   }
 
   private _addConsoleMessage(
@@ -1044,7 +1174,7 @@
     args: JSHandle[],
     stackTrace?: Protocol.Runtime.StackTrace
   ): void {
-    if (!this.listenerCount(Events.Page.Console)) {
+    if (!this.listenerCount(PageEmittedEvents.Console)) {
       args.forEach((arg) => arg.dispose());
       return;
     }
@@ -1054,24 +1184,26 @@
       if (remoteObject.objectId) textTokens.push(arg.toString());
       else textTokens.push(helper.valueFromRemoteObject(remoteObject));
     }
-    const location =
-      stackTrace && stackTrace.callFrames.length
-        ? {
-            url: stackTrace.callFrames[0].url,
-            lineNumber: stackTrace.callFrames[0].lineNumber,
-            columnNumber: stackTrace.callFrames[0].columnNumber,
-          }
-        : {};
+    const stackTraceLocations = [];
+    if (stackTrace) {
+      for (const callFrame of stackTrace.callFrames) {
+        stackTraceLocations.push({
+          url: callFrame.url,
+          lineNumber: callFrame.lineNumber,
+          columnNumber: callFrame.columnNumber,
+        });
+      }
+    }
     const message = new ConsoleMessage(
       type,
       textTokens.join(' '),
       args,
-      location
+      stackTraceLocations
     );
-    this.emit(Events.Page.Console, message);
+    this.emit(PageEmittedEvents.Console, message);
   }
 
-  private _onDialog(event: Protocol.Page.javascriptDialogOpeningPayload): void {
+  private _onDialog(event: Protocol.Page.JavascriptDialogOpeningEvent): void {
     let dialogType = null;
     const validDialogTypes = new Set<Protocol.Page.DialogType>([
       'alert',
@@ -1091,7 +1223,7 @@
       event.message,
       event.defaultPrompt
     );
-    this.emit(Events.Page.Dialog, dialog);
+    this.emit(PageEmittedEvents.Dialog, dialog);
   }
 
   url(): string {
@@ -1114,10 +1246,10 @@
   }
 
   async reload(options?: WaitForOptions): Promise<HTTPResponse | null> {
-    const result = await Promise.all<
-      HTTPResponse,
-      Protocol.Page.reloadReturnValue
-    >([this.waitForNavigation(options), this._client.send('Page.reload')]);
+    const result = await Promise.all<HTTPResponse, void>([
+      this.waitForNavigation(options),
+      this._client.send('Page.reload'),
+    ]);
 
     return result[0];
   }
@@ -1131,7 +1263,7 @@
   private _sessionClosePromise(): Promise<Error> {
     if (!this._disconnectPromise)
       this._disconnectPromise = new Promise((fulfill) =>
-        this._client.once(Events.CDPSession.Disconnected, () =>
+        this._client.once(CDPSessionEmittedEvents.Disconnected, () =>
           fulfill(new Error('Target closed'))
         )
       );
@@ -1145,7 +1277,7 @@
     const { timeout = this._timeoutSettings.timeout() } = options;
     return helper.waitForEvent(
       this._frameManager.networkManager(),
-      Events.NetworkManager.Request,
+      NetworkManagerEmittedEvents.Request,
       (request) => {
         if (helper.isString(urlOrPredicate))
           return urlOrPredicate === request.url();
@@ -1165,7 +1297,7 @@
     const { timeout = this._timeoutSettings.timeout() } = options;
     return helper.waitForEvent(
       this._frameManager.networkManager(),
-      Events.NetworkManager.Response,
+      NetworkManagerEmittedEvents.Response,
       (response) => {
         if (helper.isString(urlOrPredicate))
           return urlOrPredicate === response.url();
@@ -1193,10 +1325,7 @@
     const history = await this._client.send('Page.getNavigationHistory');
     const entry = history.entries[history.currentIndex + delta];
     if (!entry) return null;
-    const result = await Promise.all<
-      HTTPResponse,
-      Protocol.Page.navigateToHistoryEntryReturnValue
-    >([
+    const result = await Promise.all([
       this.waitForNavigation(options),
       this._client.send('Page.navigateToHistoryEntry', { entryId: entry.id }),
     ]);
@@ -1269,8 +1398,73 @@
     }
   }
 
-  async emulateVisionDeficiency(type?: VisionDeficiency): Promise<void> {
-    const visionDeficiencies = new Set([
+  /**
+   * Emulates the idle state.
+   * If no arguments set, clears idle state emulation.
+   *
+   * @example
+   * ```js
+   * // set idle emulation
+   * await page.emulateIdleState({isUserActive: true, isScreenUnlocked: false});
+   *
+   * // do some checks here
+   * ...
+   *
+   * // clear idle emulation
+   * await page.emulateIdleState();
+   * ```
+   *
+   * @param overrides Mock idle state. If not set, clears idle overrides
+   * @param isUserActive Mock isUserActive
+   * @param isScreenUnlocked Mock isScreenUnlocked
+   */
+  async emulateIdleState(overrides?: {
+    isUserActive: boolean;
+    isScreenUnlocked: boolean;
+  }): Promise<void> {
+    if (overrides) {
+      await this._client.send('Emulation.setIdleOverride', {
+        isUserActive: overrides.isUserActive,
+        isScreenUnlocked: overrides.isScreenUnlocked,
+      });
+    } else {
+      await this._client.send('Emulation.clearIdleOverride');
+    }
+  }
+
+  /**
+   * Simulates the given vision deficiency on the page.
+   *
+   * @example
+   * ```js
+   * const puppeteer = require('puppeteer');
+   *
+   * (async () => {
+   *   const browser = await puppeteer.launch();
+   *   const page = await browser.newPage();
+   *   await page.goto('https://v8.dev/blog/10-years');
+   *
+   *   await page.emulateVisionDeficiency('achromatopsia');
+   *   await page.screenshot({ path: 'achromatopsia.png' });
+   *
+   *   await page.emulateVisionDeficiency('deuteranopia');
+   *   await page.screenshot({ path: 'deuteranopia.png' });
+   *
+   *   await page.emulateVisionDeficiency('blurredVision');
+   *   await page.screenshot({ path: 'blurred-vision.png' });
+   *
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param type - the type of deficiency to simulate, or `'none'` to reset.
+   */
+  async emulateVisionDeficiency(
+    type?: Protocol.Emulation.SetEmulatedVisionDeficiencyRequest['type']
+  ): Promise<void> {
+    const visionDeficiencies = new Set<
+      Protocol.Emulation.SetEmulatedVisionDeficiencyRequest['type']
+    >([
       'none',
       'achromatopsia',
       'blurredVision',
@@ -1301,13 +1495,59 @@
     return this._viewport;
   }
 
-  async evaluate<ReturnType extends any>(
-    pageFunction: Function | string,
-    ...args: unknown[]
-  ): Promise<ReturnType> {
-    return this._frameManager
-      .mainFrame()
-      .evaluate<ReturnType>(pageFunction, ...args);
+  /**
+   * @remarks
+   *
+   * Evaluates a function in the page's context and returns the result.
+   *
+   * If the function passed to `page.evaluteHandle` returns a Promise, the
+   * function will wait for the promise to resolve and return its value.
+   *
+   * @example
+   *
+   * ```js
+   * const result = await frame.evaluate(() => {
+   *   return Promise.resolve(8 * 7);
+   * });
+   * console.log(result); // prints "56"
+   * ```
+   *
+   * You can pass a string instead of a function (although functions are
+   * recommended as they are easier to debug and use with TypeScript):
+   *
+   * @example
+   * ```
+   * const aHandle = await page.evaluate('1 + 2');
+   * ```
+   *
+   * To get the best TypeScript experience, you should pass in as the
+   * generic the type of `pageFunction`:
+   *
+   * ```
+   * const aHandle = await page.evaluate<() => number>(() => 2);
+   * ```
+   *
+   * @example
+   *
+   * {@link ElementHandle} instances (including {@link JSHandle}s) can be passed
+   * as arguments to the `pageFunction`:
+   *
+   * ```
+   * const bodyHandle = await page.$('body');
+   * const html = await page.evaluate(body => body.innerHTML, bodyHandle);
+   * await bodyHandle.dispose();
+   * ```
+   *
+   * @param pageFunction - a function that is run within the page
+   * @param args - arguments to be passed to the pageFunction
+   *
+   * @returns the return value of `pageFunction`.
+   */
+  async evaluate<T extends EvaluateFn>(
+    pageFunction: T,
+    ...args: SerializableOrJSHandle[]
+  ): Promise<UnwrapPromiseLike<EvaluateFnReturnType<T>>> {
+    return this._frameManager.mainFrame().evaluate<T>(pageFunction, ...args);
   }
 
   async evaluateOnNewDocument(
@@ -1338,10 +1578,17 @@
       );
       screenshotType = options.type;
     } else if (options.path) {
-      const mimeType = mime.getType(options.path);
-      if (mimeType === 'image/png') screenshotType = 'png';
-      else if (mimeType === 'image/jpeg') screenshotType = 'jpeg';
-      assert(screenshotType, 'Unsupported screenshot mime type: ' + mimeType);
+      const filePath = options.path;
+      const extension = filePath
+        .slice(filePath.lastIndexOf('.') + 1)
+        .toLowerCase();
+      if (extension === 'png') screenshotType = 'png';
+      else if (extension === 'jpg' || extension === 'jpeg')
+        screenshotType = 'jpeg';
+      assert(
+        screenshotType,
+        `Unsupported screenshot type for extension \`.${extension}\``
+      );
     }
 
     if (!screenshotType) screenshotType = 'png';
@@ -1457,7 +1704,13 @@
       options.encoding === 'base64'
         ? result.data
         : Buffer.from(result.data, 'base64');
-    if (options.path) await writeFileAsync(options.path, buffer);
+    if (!isNode && options.path) {
+      throw new Error(
+        'Screenshots can only be written to a file path in a Node environment.'
+      );
+    }
+    const fs = await helper.importFSModule();
+    if (options.path) await fs.promises.writeFile(options.path, buffer);
     return buffer;
 
     function processClip(
@@ -1471,6 +1724,24 @@
     }
   }
 
+  /**
+   * Generatees a PDF of the page with the `print` CSS media type.
+   * @remarks
+   *
+   * IMPORTANT: PDF generation is only supported in Chrome headless mode.
+   *
+   * To generate a PDF with the `screen` media type, call
+   * {@link Page.emulateMediaType | `page.emulateMediaType('screen')`} before
+   * calling `page.pdf()`.
+   *
+   * By default, `page.pdf()` generates a pdf with modified colors for printing.
+   * Use the
+   * {@link https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-print-color-adjust | `-webkit-print-color-adjust`}
+   * property to force rendering of exact colors.
+   *
+   *
+   * @param options - options for generating the PDF.
+   */
   async pdf(options: PDFOptions = {}): Promise<Buffer> {
     const {
       scale = 1,
@@ -1588,6 +1859,31 @@
     return this.mainFrame().type(selector, text, options);
   }
 
+  /**
+   * @remarks
+   *
+   * This method behaves differently depending on the first parameter. If it's a
+   * `string`, it will be treated as a `selector` or `xpath` (if the string
+   * starts with `//`). This method then is a shortcut for
+   * {@link Page.waitForSelector} or {@link Page.waitForXPath}.
+   *
+   * If the first argument is a function this method is a shortcut for
+   * {@link Page.waitForFunction}.
+   *
+   * If the first argument is a `number`, it's treated as a timeout in
+   * milliseconds and the method returns a promise which resolves after the
+   * timeout.
+   *
+   * @param selectorOrFunctionOrTimeout - a selector, predicate or timeout to
+   * wait for.
+   * @param options - optional waiting parameters.
+   * @param args - arguments to pass to `pageFunction`.
+   *
+   * @deprecated Don't use this method directly. Instead use the more explicit
+   * methods available: {@link Page.waitForSelector},
+   * {@link Page.waitForXPath}, {@link Page.waitForFunction} or
+   * {@link Page.waitForTimeout}.
+   */
   waitFor(
     selectorOrFunctionOrTimeout: string | number | Function,
     options: {
@@ -1605,6 +1901,29 @@
     );
   }
 
+  /**
+   * Causes your script to wait for the given number of milliseconds.
+   *
+   * @remarks
+   *
+   * It's generally recommended to not wait for a number of seconds, but instead
+   * use {@link Page.waitForSelector}, {@link Page.waitForXPath} or
+   * {@link Page.waitForFunction} to wait for exactly the conditions you want.
+   *
+   * @example
+   *
+   * Wait for 1 second:
+   *
+   * ```
+   * await page.waitForTimeout(1000);
+   * ```
+   *
+   * @param milliseconds - the number of milliseconds to wait.
+   */
+  waitForTimeout(milliseconds: number): Promise<void> {
+    return this.mainFrame().waitForTimeout(milliseconds);
+  }
+
   waitForSelector(
     selector: string,
     options: {
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/PDFOptions.ts firefox-85.0+build1/remote/test/puppeteer/src/common/PDFOptions.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/PDFOptions.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/PDFOptions.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,179 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @public
+ */
+export interface PDFMargin {
+  top?: string | number;
+  bottom?: string | number;
+  left?: string | number;
+  right?: string | number;
+}
+
+/**
+ * All the valid paper format types when printing a PDF.
+ *
+ * @remarks
+ *
+ * The sizes of each format are as follows:
+ * - `Letter`: 8.5in x 11in
+ *
+ * - `Legal`: 8.5in x 14in
+ *
+ * - `Tabloid`: 11in x 17in
+ *
+ * - `Ledger`: 17in x 11in
+ *
+ * - `A0`: 33.1in x 46.8in
+ *
+ * - `A1`: 23.4in x 33.1in
+ *
+ * - `A2`: 16.54in x 23.4in
+ *
+ * - `A3`: 11.7in x 16.54in
+ *
+ * - `A4`: 8.27in x 11.7in
+ *
+ * - `A5`: 5.83in x 8.27in
+ *
+ * - `A6`: 4.13in x 5.83in
+ *
+ * @public
+ */
+export type PaperFormat =
+  | 'letter'
+  | 'legal'
+  | 'tabloid'
+  | 'ledger'
+  | 'a0'
+  | 'a1'
+  | 'a2'
+  | 'a3'
+  | 'a4'
+  | 'a5'
+  | 'a6';
+
+/**
+ * Valid options to configure PDF generation via {@link Page.pdf}.
+ * @public
+ */
+export interface PDFOptions {
+  /**
+   * Scales the rendering of the web page. Amount must be between `0.1` and `2`.
+   * @defaultValue 1
+   */
+  scale?: number;
+  /**
+   * Whether to show the header and footer.
+   * @defaultValue false
+   */
+  displayHeaderFooter?: boolean;
+  /**
+   * HTML template for the print header. Should be valid HTML with the following
+   * classes used to inject values into them:
+   * - `date` formatted print date
+   *
+   * - `title` document title
+   *
+   * - `url` document location
+   *
+   * - `pageNumber` current page number
+   *
+   * - `totalPages` total pages in the document
+   */
+  headerTemplate?: string;
+  /**
+   * HTML template for the print footer. Has the same constraints and support
+   * for special classes as {@link PDFOptions.headerTemplate}.
+   */
+  footerTemplate?: string;
+  /**
+   * Set to `true` to print background graphics.
+   * @defaultValue false
+   */
+  printBackground?: boolean;
+  /**
+   * Whether to print in landscape orientation.
+   * @defaultValue = false
+   */
+  landscape?: boolean;
+  /**
+   * Paper ranges to print, e.g. `1-5, 8, 11-13`.
+   * @defaultValue The empty string, which means all pages are printed.
+   */
+  pageRanges?: string;
+  /**
+   * @remarks
+   * If set, this takes priority over the `width` and `height` options.
+   * @defaultValue `letter`.
+   */
+  format?: PaperFormat;
+  /**
+   * Sets the width of paper. You can pass in a number or a string with a unit.
+   */
+  width?: string | number;
+  /**
+   * Sets the height of paper. You can pass in a number or a string with a unit.
+   */
+  height?: string | number;
+  /**
+   * Give any CSS `@page` size declared in the page priority over what is
+   * declared in the `width` or `height` or `format` option.
+   * @defaultValue `false`, which will scale the content to fit the paper size.
+   */
+  preferCSSPageSize?: boolean;
+  /**
+   * Set the PDF margins.
+   * @defaultValue no margins are set.
+   */
+  margin?: PDFMargin;
+  /**
+   * The path to save the file to.
+   *
+   * @remarks
+   *
+   * If the path is relative, it's resolved relative to the current working directory.
+   *
+   * @defaultValue the empty string, which means the PDF will not be written to disk.
+   */
+  path?: string;
+}
+
+/**
+ * @internal
+ */
+export interface PaperFormatDimensions {
+  width: number;
+  height: number;
+}
+
+/**
+ * @internal
+ */
+export const paperFormats: Record<PaperFormat, PaperFormatDimensions> = {
+  letter: { width: 8.5, height: 11 },
+  legal: { width: 8.5, height: 14 },
+  tabloid: { width: 11, height: 17 },
+  ledger: { width: 17, height: 11 },
+  a0: { width: 33.1, height: 46.8 },
+  a1: { width: 23.4, height: 33.1 },
+  a2: { width: 16.54, height: 23.4 },
+  a3: { width: 11.7, height: 16.54 },
+  a4: { width: 8.27, height: 11.7 },
+  a5: { width: 5.83, height: 8.27 },
+  a6: { width: 4.13, height: 5.83 },
+} as const;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Product.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Product.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Product.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Product.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Supported products.
+ * @public
+ */
+export type Product = 'chrome' | 'firefox';
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Puppeteer.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Puppeteer.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Puppeteer.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Puppeteer.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,104 +13,53 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Launcher from '../node/Launcher';
-import {
-  LaunchOptions,
-  ChromeArgOptions,
-  BrowserOptions,
-} from '../node/LaunchOptions';
-import { ProductLauncher } from '../node/Launcher';
-import { BrowserFetcher, BrowserFetcherOptions } from '../node/BrowserFetcher';
-import { puppeteerErrors, PuppeteerErrors } from './Errors';
-import { ConnectionTransport } from './ConnectionTransport';
-import { devicesMap, DevicesMap } from './DeviceDescriptors';
-import { Browser } from './Browser';
+import { puppeteerErrors, PuppeteerErrors } from './Errors.js';
+import { ConnectionTransport } from './ConnectionTransport.js';
+import { devicesMap, DevicesMap } from './DeviceDescriptors.js';
+import { Browser } from './Browser.js';
 import {
   registerCustomQueryHandler,
   unregisterCustomQueryHandler,
-  customQueryHandlers,
-  clearQueryHandlers,
-  QueryHandler,
-} from './QueryHandler';
-import { PUPPETEER_REVISIONS } from '../revisions';
+  customQueryHandlerNames,
+  clearCustomQueryHandlers,
+  CustomQueryHandler,
+} from './QueryHandler.js';
+import { Product } from './Product.js';
+import { connectToBrowser, BrowserOptions } from './BrowserConnector.js';
 
 /**
- * The main Puppeteer class
- * Puppeteer module provides a method to launch a browser instance.
- *
- * @remarks
- *
- * @example
- * The following is a typical example of using Puppeteer to drive automation:
- * ```js
- * const puppeteer = require('puppeteer');
+ * Settings that are common to the Puppeteer class, regardless of enviroment.
+ * @internal
+ */
+export interface CommonPuppeteerSettings {
+  isPuppeteerCore: boolean;
+}
+
+export interface ConnectOptions extends BrowserOptions {
+  browserWSEndpoint?: string;
+  browserURL?: string;
+  transport?: ConnectionTransport;
+  product?: Product;
+}
+
+/**
+ * The main Puppeteer class.
  *
- * (async () => {
- *   const browser = await puppeteer.launch();
- *   const page = await browser.newPage();
- *   await page.goto('https://www.google.com');
- *   // other actions...
- *   await browser.close();
- * })();
- * ```
+ * IMPORTANT: if you are using Puppeteer in a Node environment, you will get an
+ * instance of {@link PuppeteerNode} when you import or require `puppeteer`.
+ * That class extends `Puppeteer`, so has all the methods documented below as
+ * well as all that are defined on {@link PuppeteerNode}.
  * @public
  */
 export class Puppeteer {
-  private _projectRoot: string;
-  _preferredRevision: string;
-  _isPuppeteerCore: boolean;
-  _changedProduct = false;
-  __productName: string;
-  _lazyLauncher: ProductLauncher;
+  protected _isPuppeteerCore: boolean;
+  protected _changedProduct = false;
 
   /**
    * @internal
    */
-  constructor(
-    projectRoot: string,
-    preferredRevision: string,
-    isPuppeteerCore: boolean,
-    productName: string
-  ) {
-    this._projectRoot = projectRoot;
-    this._preferredRevision = preferredRevision;
-    this._isPuppeteerCore = isPuppeteerCore;
-    // track changes to Launcher configuration via options or environment variables
-    this.__productName = productName;
-  }
-
-  /**
-   * Launches puppeteer and launches a browser instance with given arguments
-   * and options when specified.
-   *
-   * @remarks
-   *
-   * @example
-   * You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
-   * ```js
-   * const browser = await puppeteer.launch({
-   *   ignoreDefaultArgs: ['--mute-audio']
-   * });
-   * ```
-   *
-   * **NOTE** Puppeteer can also be used to control the Chrome browser,
-   * but it works best with the version of Chromium it is bundled with.
-   * There is no guarantee it will work with any other version.
-   * Use `executablePath` option with extreme caution.
-   * If Google Chrome (rather than Chromium) is preferred, a {@link https://www.google.com/chrome/browser/canary.html | Chrome Canary} or {@link https://www.chromium.org/getting-involved/dev-channel | Dev Channel} build is suggested.
-   * In `puppeteer.launch([options])`, any mention of Chromium also applies to Chrome.
-   * See {@link https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/ | this article} for a description of the differences between Chromium and Chrome. {@link https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md | This article} describes some differences for Linux users.
-   *
-   * @param options - Set of configurable options to set on the browser.
-   * @returns Promise which resolves to browser instance.
-   */
-  launch(
-    options: LaunchOptions &
-      ChromeArgOptions &
-      BrowserOptions & { product?: string; extraPrefsFirefox?: {} } = {}
-  ): Promise<Browser> {
-    if (options.product) this._productName = options.product;
-    return this._launcher.launch(options);
+  constructor(settings: CommonPuppeteerSettings) {
+    this._isPuppeteerCore = settings.isPuppeteerCore;
   }
 
   /**
@@ -121,87 +70,14 @@
    * @param options - Set of configurable options to set on the browser.
    * @returns Promise which resolves to browser instance.
    */
-  connect(
-    options: BrowserOptions & {
-      browserWSEndpoint?: string;
-      browserURL?: string;
-      transport?: ConnectionTransport;
-      product?: string;
-    }
-  ): Promise<Browser> {
-    if (options.product) this._productName = options.product;
-    return this._launcher.connect(options);
-  }
-
-  /**
-   * @internal
-   */
-  get _productName(): string {
-    return this.__productName;
-  }
-
-  // don't need any TSDoc here - because the getter is internal the setter is too.
-  set _productName(name: string) {
-    if (this.__productName !== name) this._changedProduct = true;
-    this.__productName = name;
+  connect(options: ConnectOptions): Promise<Browser> {
+    return connectToBrowser(options);
   }
 
   /**
    * @remarks
+   * A list of devices to be used with `page.emulate(options)`. Actual list of devices can be found in {@link https://github.com/puppeteer/puppeteer/blob/main/src/common/DeviceDescriptors.ts | src/common/DeviceDescriptors.ts}.
    *
-   * **NOTE** `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH`
-   * and `PUPPETEER_CHROMIUM_REVISION` environment variables.
-   *
-   * @returns A path where Puppeteer expects to find the bundled browser.
-   * The browser binary might not be there if the download was skipped with
-   * the `PUPPETEER_SKIP_DOWNLOAD` environment variable.
-   */
-  executablePath(): string {
-    return this._launcher.executablePath();
-  }
-
-  /**
-   * @internal
-   */
-  get _launcher(): ProductLauncher {
-    if (
-      !this._lazyLauncher ||
-      this._lazyLauncher.product !== this._productName ||
-      this._changedProduct
-    ) {
-      switch (this._productName) {
-        case 'firefox':
-          this._preferredRevision = PUPPETEER_REVISIONS.firefox;
-          break;
-        case 'chrome':
-        default:
-          this._preferredRevision = PUPPETEER_REVISIONS.chromium;
-      }
-      this._changedProduct = false;
-      this._lazyLauncher = Launcher(
-        this._projectRoot,
-        this._preferredRevision,
-        this._isPuppeteerCore,
-        this._productName
-      );
-    }
-    return this._lazyLauncher;
-  }
-
-  /**
-   * @returns The name of the browser that is under automation (`"chrome"` or `"firefox"`)
-   *
-   * @remarks
-   * The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product`
-   * option in `puppeteer.launch([options])` and defaults to `chrome`.
-   * Firefox support is experimental.
-   */
-  get product(): string {
-    return this._launcher.product;
-  }
-
-  /**
-   * @remarks
    * @example
    *
    * ```js
@@ -218,7 +94,6 @@
    * })();
    * ```
    *
-   * @returns a list of devices to be used with `page.emulate(options)`. Actual list of devices can be found in {@link https://github.com/puppeteer/puppeteer/blob/main/src/DeviceDescriptors.ts | src/DeviceDescriptors.ts}.
    */
   get devices(): DevicesMap {
     return devicesMap;
@@ -232,7 +107,8 @@
    * the selector doesn't match any nodes during the given timeframe.
    *
    * For certain types of errors Puppeteer uses specific error classes.
-   * These classes are available via `puppeteer.errors`
+   * These classes are available via `puppeteer.errors`.
+   *
    * @example
    * An example of handling a timeout error:
    * ```js
@@ -250,56 +126,44 @@
   }
 
   /**
-   *
-   * @param options - Set of configurable options to set on the browser.
-   * @returns The default flags that Chromium will be launched with.
-   */
-  defaultArgs(options: ChromeArgOptions = {}): string[] {
-    return this._launcher.defaultArgs(options);
-  }
-
-  /**
-   *
-   * @param options - Set of configurable options to specify the settings
-   * of the BrowserFetcher.
-   * @returns A new BrowserFetcher instance.
-   */
-  createBrowserFetcher(options: BrowserFetcherOptions): BrowserFetcher {
-    return new BrowserFetcher(this._projectRoot, options);
-  }
-
-  /**
-   * @internal
+   * Registers a {@link CustomQueryHandler | custom query handler}. After
+   * registration, the handler can be used everywhere where a selector is
+   * expected by prepending the selection string with `<name>/`. The name is
+   * only allowed to consist of lower- and upper case latin letters.
+   * @example
+   * ```
+   * puppeteer.registerCustomQueryHandler('text', { … });
+   * const aHandle = await page.$('text/…');
+   * ```
+   * @param name - The name that the custom query handler will be registered under.
+   * @param queryHandler - The {@link CustomQueryHandler | custom query handler} to
+   * register.
    */
-  // eslint-disable-next-line @typescript-eslint/camelcase
-  __experimental_registerCustomQueryHandler(
+  registerCustomQueryHandler(
     name: string,
-    queryHandler: QueryHandler
+    queryHandler: CustomQueryHandler
   ): void {
     registerCustomQueryHandler(name, queryHandler);
   }
 
   /**
-   * @internal
+   * @param name - The name of the query handler to unregistered.
    */
-  // eslint-disable-next-line @typescript-eslint/camelcase
-  __experimental_unregisterCustomQueryHandler(name: string): void {
+  unregisterCustomQueryHandler(name: string): void {
     unregisterCustomQueryHandler(name);
   }
 
   /**
-   * @internal
+   * @returns a list with the names of all registered custom query handlers.
    */
-  // eslint-disable-next-line @typescript-eslint/camelcase
-  __experimental_customQueryHandlers(): Map<string, QueryHandler> {
-    return customQueryHandlers();
+  customQueryHandlerNames(): string[] {
+    return customQueryHandlerNames();
   }
 
   /**
-   * @internal
+   * Clears all registered handlers.
    */
-  // eslint-disable-next-line @typescript-eslint/camelcase
-  __experimental_clearQueryHandlers(): void {
-    clearQueryHandlers();
+  clearCustomQueryHandlers(): void {
+    clearCustomQueryHandlers();
   }
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/QueryHandler.ts firefox-85.0+build1/remote/test/puppeteer/src/common/QueryHandler.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/QueryHandler.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/QueryHandler.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,56 +14,218 @@
  * limitations under the License.
  */
 
-export interface QueryHandler {
-  (element: Element | Document, selector: string):
-    | Element
-    | Element[]
-    | NodeListOf<Element>;
+import { WaitForSelectorOptions, DOMWorld } from './DOMWorld.js';
+import { ElementHandle, JSHandle } from './JSHandle.js';
+import { ariaHandler } from './AriaQueryHandler.js';
+
+/**
+ * @internal
+ */
+export interface InternalQueryHandler {
+  queryOne?: (
+    element: ElementHandle,
+    selector: string
+  ) => Promise<ElementHandle | null>;
+  waitFor?: (
+    domWorld: DOMWorld,
+    selector: string,
+    options: WaitForSelectorOptions
+  ) => Promise<ElementHandle | null>;
+  queryAll?: (
+    element: ElementHandle,
+    selector: string
+  ) => Promise<ElementHandle[]>;
+  queryAllArray?: (
+    element: ElementHandle,
+    selector: string
+  ) => Promise<JSHandle>;
+}
+
+/**
+ * Contains two functions `queryOne` and `queryAll` that can
+ * be {@link Puppeteer.registerCustomQueryHandler | registered}
+ * as alternative querying strategies. The functions `queryOne` and `queryAll`
+ * are executed in the page context.  `queryOne` should take an `Element` and a
+ * selector string as argument and return a single `Element` or `null` if no
+ * element is found. `queryAll` takes the same arguments but should instead
+ * return a `NodeListOf<Element>` or `Array<Element>` with all the elements
+ * that match the given query selector.
+ * @public
+ */
+export interface CustomQueryHandler {
+  queryOne?: (element: Element | Document, selector: string) => Element | null;
+  queryAll?: (
+    element: Element | Document,
+    selector: string
+  ) => Element[] | NodeListOf<Element>;
+}
+
+function makeQueryHandler(handler: CustomQueryHandler): InternalQueryHandler {
+  const internalHandler: InternalQueryHandler = {};
+
+  if (handler.queryOne) {
+    internalHandler.queryOne = async (element, selector) => {
+      const jsHandle = await element.evaluateHandle(handler.queryOne, selector);
+      const elementHandle = jsHandle.asElement();
+      if (elementHandle) return elementHandle;
+      await jsHandle.dispose();
+      return null;
+    };
+    internalHandler.waitFor = (
+      domWorld: DOMWorld,
+      selector: string,
+      options: WaitForSelectorOptions
+    ) => domWorld.waitForSelectorInPage(handler.queryOne, selector, options);
+  }
+
+  if (handler.queryAll) {
+    internalHandler.queryAll = async (element, selector) => {
+      const jsHandle = await element.evaluateHandle(handler.queryAll, selector);
+      const properties = await jsHandle.getProperties();
+      await jsHandle.dispose();
+      const result = [];
+      for (const property of properties.values()) {
+        const elementHandle = property.asElement();
+        if (elementHandle) result.push(elementHandle);
+      }
+      return result;
+    };
+    internalHandler.queryAllArray = async (element, selector) => {
+      const resultHandle = await element.evaluateHandle(
+        handler.queryAll,
+        selector
+      );
+      const arrayHandle = await resultHandle.evaluateHandle(
+        (res: Element[] | NodeListOf<Element>) => Array.from(res)
+      );
+      return arrayHandle;
+    };
+  }
+
+  return internalHandler;
 }
 
-const _customQueryHandlers = new Map<string, QueryHandler>();
+const _defaultHandler = makeQueryHandler({
+  queryOne: (element: Element, selector: string) =>
+    element.querySelector(selector),
+  queryAll: (element: Element, selector: string) =>
+    element.querySelectorAll(selector),
+});
+
+const pierceHandler = makeQueryHandler({
+  queryOne: (element, selector) => {
+    let found: Element | null = null;
+    const search = (root: Element | ShadowRoot) => {
+      const iter = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
+      do {
+        const currentNode = iter.currentNode as HTMLElement;
+        if (currentNode.shadowRoot) {
+          search(currentNode.shadowRoot);
+        }
+        if (currentNode instanceof ShadowRoot) {
+          continue;
+        }
+        if (!found && currentNode.matches(selector)) {
+          found = currentNode;
+        }
+      } while (!found && iter.nextNode());
+    };
+    if (element instanceof Document) {
+      element = element.documentElement;
+    }
+    search(element);
+    return found;
+  },
+
+  queryAll: (element, selector) => {
+    const result: Element[] = [];
+    const collect = (root: Element | ShadowRoot) => {
+      const iter = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
+      do {
+        const currentNode = iter.currentNode as HTMLElement;
+        if (currentNode.shadowRoot) {
+          collect(currentNode.shadowRoot);
+        }
+        if (currentNode instanceof ShadowRoot) {
+          continue;
+        }
+        if (currentNode.matches(selector)) {
+          result.push(currentNode);
+        }
+      } while (iter.nextNode());
+    };
+    if (element instanceof Document) {
+      element = element.documentElement;
+    }
+    collect(element);
+    return result;
+  },
+});
+
+const _builtInHandlers = new Map([
+  ['aria', ariaHandler],
+  ['pierce', pierceHandler],
+]);
+const _queryHandlers = new Map(_builtInHandlers);
 
+/**
+ * @internal
+ */
 export function registerCustomQueryHandler(
   name: string,
-  handler: Function
+  handler: CustomQueryHandler
 ): void {
-  if (_customQueryHandlers.get(name))
+  if (_queryHandlers.get(name))
     throw new Error(`A custom query handler named "${name}" already exists`);
 
   const isValidName = /^[a-zA-Z]+$/.test(name);
   if (!isValidName)
     throw new Error(`Custom query handler names may only contain [a-zA-Z]`);
 
-  _customQueryHandlers.set(name, handler as QueryHandler);
+  const internalHandler = makeQueryHandler(handler);
+
+  _queryHandlers.set(name, internalHandler);
 }
 
 /**
- * @param {string} name
+ * @internal
  */
 export function unregisterCustomQueryHandler(name: string): void {
-  _customQueryHandlers.delete(name);
+  if (_queryHandlers.has(name) && !_builtInHandlers.has(name)) {
+    _queryHandlers.delete(name);
+  }
 }
 
-export function customQueryHandlers(): Map<string, QueryHandler> {
-  return _customQueryHandlers;
+/**
+ * @internal
+ */
+export function customQueryHandlerNames(): string[] {
+  return [..._queryHandlers.keys()].filter(
+    (name) => !_builtInHandlers.has(name)
+  );
 }
 
-export function clearQueryHandlers(): void {
-  _customQueryHandlers.clear();
+/**
+ * @internal
+ */
+export function clearCustomQueryHandlers(): void {
+  customQueryHandlerNames().forEach(unregisterCustomQueryHandler);
 }
 
+/**
+ * @internal
+ */
 export function getQueryHandlerAndSelector(
-  selector: string,
-  defaultQueryHandler: QueryHandler
-): { updatedSelector: string; queryHandler: QueryHandler } {
+  selector: string
+): { updatedSelector: string; queryHandler: InternalQueryHandler } {
   const hasCustomQueryHandler = /^[a-zA-Z]+\//.test(selector);
   if (!hasCustomQueryHandler)
-    return { updatedSelector: selector, queryHandler: defaultQueryHandler };
+    return { updatedSelector: selector, queryHandler: _defaultHandler };
 
   const index = selector.indexOf('/');
   const name = selector.slice(0, index);
   const updatedSelector = selector.slice(index + 1);
-  const queryHandler = customQueryHandlers().get(name);
+  const queryHandler = _queryHandlers.get(name);
   if (!queryHandler)
     throw new Error(
       `Query set to use "${name}", but no query handler of that name was found`
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/SecurityDetails.ts firefox-85.0+build1/remote/test/puppeteer/src/common/SecurityDetails.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/SecurityDetails.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/SecurityDetails.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import Protocol from '../protocol';
+import { Protocol } from 'devtools-protocol';
 
 /**
  * The SecurityDetails class represents the security details of a
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Target.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Target.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Target.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Target.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import { Events } from './Events';
-import { Page } from './Page';
-import { WebWorker } from './WebWorker';
-import { CDPSession } from './Connection';
-import { Browser, BrowserContext } from './Browser';
-import { Viewport } from './PuppeteerViewport';
-import Protocol from '../protocol';
+import { Page, PageEmittedEvents } from './Page.js';
+import { WebWorker } from './WebWorker.js';
+import { CDPSession } from './Connection.js';
+import { Browser, BrowserContext } from './Browser.js';
+import { Viewport } from './PuppeteerViewport.js';
+import { Protocol } from 'devtools-protocol';
 
 /**
  * @public
@@ -45,7 +44,7 @@
   /**
    * @internal
    */
-  _isClosedPromise: Promise<boolean>;
+  _isClosedPromise: Promise<void>;
   /**
    * @internal
    */
@@ -87,12 +86,12 @@
       if (!opener || !opener._pagePromise || this.type() !== 'page')
         return true;
       const openerPage = await opener._pagePromise;
-      if (!openerPage.listenerCount(Events.Page.Popup)) return true;
+      if (!openerPage.listenerCount(PageEmittedEvents.Popup)) return true;
       const popupPage = await this.page();
-      openerPage.emit(Events.Page.Popup, popupPage);
+      openerPage.emit(PageEmittedEvents.Popup, popupPage);
       return true;
     });
-    this._isClosedPromise = new Promise<boolean>(
+    this._isClosedPromise = new Promise<void>(
       (fulfill) => (this._closedCallback = fulfill)
     );
     this._isInitialized =
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/TimeoutSettings.ts firefox-85.0+build1/remote/test/puppeteer/src/common/TimeoutSettings.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/TimeoutSettings.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/TimeoutSettings.ts	2021-01-18 19:58:18.000000000 +0000
@@ -16,6 +16,9 @@
 
 const DEFAULT_TIMEOUT = 30000;
 
+/**
+ * @internal
+ */
 export class TimeoutSettings {
   _defaultTimeout: number | null;
   _defaultNavigationTimeout: number | null;
@@ -29,9 +32,6 @@
     this._defaultTimeout = timeout;
   }
 
-  /**
-   * @param {number} timeout
-   */
   setDefaultNavigationTimeout(timeout: number): void {
     this._defaultNavigationTimeout = timeout;
   }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/Tracing.ts firefox-85.0+build1/remote/test/puppeteer/src/common/Tracing.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/Tracing.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/Tracing.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assert } from './assert';
-import { helper } from './helper';
-import { CDPSession } from './Connection';
+import { assert } from './assert.js';
+import { helper } from './helper.js';
+import { CDPSession } from './Connection.js';
 
 /**
  * @public
@@ -101,11 +101,15 @@
    */
   async stop(): Promise<Buffer> {
     let fulfill: (value: Buffer) => void;
-    const contentPromise = new Promise<Buffer>((x) => (fulfill = x));
+    let reject: (err: Error) => void;
+    const contentPromise = new Promise<Buffer>((x, y) => {
+      fulfill = x;
+      reject = y;
+    });
     this._client.once('Tracing.tracingComplete', (event) => {
       helper
         .readProtocolStream(this._client, event.stream, this._path)
-        .then(fulfill);
+        .then(fulfill, reject);
     });
     await this._client.send('Tracing.end');
     this._recording = false;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/WebSocketTransport.ts firefox-85.0+build1/remote/test/puppeteer/src/common/WebSocketTransport.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/WebSocketTransport.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/WebSocketTransport.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/**
- * Copyright 2018 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { ConnectionTransport } from './ConnectionTransport';
-import NodeWebSocket from 'ws';
-
-export class WebSocketTransport implements ConnectionTransport {
-  static create(url: string): Promise<WebSocketTransport> {
-    return new Promise((resolve, reject) => {
-      const ws = new NodeWebSocket(url, [], {
-        perMessageDeflate: false,
-        maxPayload: 256 * 1024 * 1024, // 256Mb
-      });
-
-      ws.addEventListener('open', () => resolve(new WebSocketTransport(ws)));
-      ws.addEventListener('error', reject);
-    });
-  }
-
-  _ws: NodeWebSocket;
-  onmessage?: (message: string) => void;
-  onclose?: () => void;
-
-  constructor(ws: NodeWebSocket) {
-    this._ws = ws;
-    this._ws.addEventListener('message', (event) => {
-      if (this.onmessage) this.onmessage.call(null, event.data);
-    });
-    this._ws.addEventListener('close', () => {
-      if (this.onclose) this.onclose.call(null);
-    });
-    // Silently ignore all errors - we don't know what to do with them.
-    this._ws.addEventListener('error', () => {});
-    this.onmessage = null;
-    this.onclose = null;
-  }
-
-  send(message): void {
-    this._ws.send(message);
-  }
-
-  close(): void {
-    this._ws.close();
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/common/WebWorker.ts firefox-85.0+build1/remote/test/puppeteer/src/common/WebWorker.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/common/WebWorker.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/common/WebWorker.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventEmitter } from './EventEmitter';
-import { debugError } from './helper';
-import { ExecutionContext } from './ExecutionContext';
-import { JSHandle } from './JSHandle';
-import { CDPSession } from './Connection';
-import Protocol from '../protocol';
-import { EvaluateHandleFn, SerializableOrJSHandle } from './EvalTypes';
+import { EventEmitter } from './EventEmitter.js';
+import { debugError } from './helper.js';
+import { ExecutionContext } from './ExecutionContext.js';
+import { JSHandle } from './JSHandle.js';
+import { CDPSession } from './Connection.js';
+import { Protocol } from 'devtools-protocol';
+import { EvaluateHandleFn, SerializableOrJSHandle } from './EvalTypes.js';
 
 /**
  * @internal
@@ -96,7 +96,7 @@
     });
 
     // This might fail if the target is closed before we recieve all execution contexts.
-    this._client.send('Runtime.enable', {}).catch(debugError);
+    this._client.send('Runtime.enable').catch(debugError);
     this._client.on('Runtime.consoleAPICalled', (event) =>
       consoleAPICalled(
         event.type,
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/environment.ts firefox-85.0+build1/remote/test/puppeteer/src/environment.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/environment.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/environment.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export const isNode = typeof document === 'undefined';
+export const isNode = !!(typeof process !== 'undefined' && process.version);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/.eslintrc.js firefox-85.0+build1/remote/test/puppeteer/src/.eslintrc.js
--- firefox-84.0.2+build1/remote/test/puppeteer/src/.eslintrc.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/.eslintrc.js	2021-01-18 19:58:18.000000000 +0000
@@ -1,16 +1,19 @@
 module.exports = {
-    "extends": "../.eslintrc.js",
-    /**
-     * ESLint rules
-     *
-     * All available rules: http://eslint.org/docs/rules/
-     *
-     * Rules take the following form:
-     *   "rule-name", [severity, { opts }]
-     * Severity: 2 == error, 1 == warning, 0 == off.
-     */
-    "rules": {
-        "no-console": [2, { "allow": ["warn", "error", "assert", "timeStamp", "time", "timeEnd"] }],
-        "no-debugger": 0,
-    }
+  extends: '../.eslintrc.js',
+  /**
+   * ESLint rules
+   *
+   * All available rules: http://eslint.org/docs/rules/
+   *
+   * Rules take the following form:
+   *   "rule-name", [severity, { opts }]
+   * Severity: 2 == error, 1 == warning, 0 == off.
+   */
+  rules: {
+    'no-console': [
+      2,
+      { allow: ['warn', 'error', 'assert', 'timeStamp', 'time', 'timeEnd'] },
+    ],
+    'no-debugger': 0,
+  },
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/index-core.ts firefox-85.0+build1/remote/test/puppeteer/src/index-core.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/index-core.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/index-core.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { initializePuppeteer } from './initialize';
-
-const puppeteer = initializePuppeteer('puppeteer-core');
-export default puppeteer;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/index.ts firefox-85.0+build1/remote/test/puppeteer/src/index.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/index.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/index.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { initializePuppeteer } from './initialize';
-
-const puppeteer = initializePuppeteer('puppeteer');
-export default puppeteer;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/initialize-node.ts firefox-85.0+build1/remote/test/puppeteer/src/initialize-node.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/initialize-node.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/initialize-node.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { PuppeteerNode } from './node/Puppeteer.js';
+import { PUPPETEER_REVISIONS } from './revisions.js';
+import pkgDir from 'pkg-dir';
+import { Product } from './common/Product.js';
+
+export const initializePuppeteerNode = (packageName: string): PuppeteerNode => {
+  const puppeteerRootDirectory = pkgDir.sync(__dirname);
+
+  let preferredRevision = PUPPETEER_REVISIONS.chromium;
+  const isPuppeteerCore = packageName === 'puppeteer-core';
+  // puppeteer-core ignores environment variables
+  const productName = isPuppeteerCore
+    ? undefined
+    : process.env.PUPPETEER_PRODUCT ||
+      process.env.npm_config_puppeteer_product ||
+      process.env.npm_package_config_puppeteer_product;
+
+  if (!isPuppeteerCore && productName === 'firefox')
+    preferredRevision = PUPPETEER_REVISIONS.firefox;
+
+  return new PuppeteerNode({
+    projectRoot: puppeteerRootDirectory,
+    preferredRevision,
+    isPuppeteerCore,
+    productName: productName as Product,
+  });
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/initialize.ts firefox-85.0+build1/remote/test/puppeteer/src/initialize.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/initialize.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/initialize.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// api.ts has to use module.exports as it's also consumed by DocLint which runs
-// on Node.
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const api = require('./api');
-
-import { helper } from './common/helper';
-import { Puppeteer } from './common/Puppeteer';
-import { PUPPETEER_REVISIONS } from './revisions';
-import pkgDir from 'pkg-dir';
-
-export const initializePuppeteer = (packageName: string): Puppeteer => {
-  const puppeteerRootDirectory = pkgDir.sync(__dirname);
-
-  for (const className in api) {
-    if (typeof api[className] === 'function')
-      helper.installAsyncStackHooks(api[className]);
-  }
-
-  let preferredRevision = PUPPETEER_REVISIONS.chromium;
-  const isPuppeteerCore = packageName === 'puppeteer-core';
-  // puppeteer-core ignores environment variables
-  const product = isPuppeteerCore
-    ? undefined
-    : process.env.PUPPETEER_PRODUCT ||
-      process.env.npm_config_puppeteer_product ||
-      process.env.npm_package_config_puppeteer_product;
-  if (!isPuppeteerCore && product === 'firefox')
-    preferredRevision = PUPPETEER_REVISIONS.firefox;
-
-  const puppeteer = new Puppeteer(
-    puppeteerRootDirectory,
-    preferredRevision,
-    isPuppeteerCore,
-    product
-  );
-
-  // The introspection in `Helper.installAsyncStackHooks` references
-  // `Puppeteer._launcher` before the Puppeteer ctor is called, such that an
-  // invalid Launcher is selected at import, so we reset it.
-  puppeteer._lazyLauncher = undefined;
-  return puppeteer;
-};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/initialize-web.ts firefox-85.0+build1/remote/test/puppeteer/src/initialize-web.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/initialize-web.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/initialize-web.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,24 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Puppeteer } from './common/Puppeteer.js';
+
+export const initializePuppeteerWeb = (packageName: string): Puppeteer => {
+  const isPuppeteerCore = packageName === 'puppeteer-core';
+  return new Puppeteer({
+    isPuppeteerCore,
+  });
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/install.ts firefox-85.0+build1/remote/test/puppeteer/src/install.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/install.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/install.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import os from 'os';
-import https from 'https';
-import ProgressBar from 'progress';
-import puppeteer from './index';
-import { PUPPETEER_REVISIONS } from './revisions';
-
-const firefoxVersions =
-  'https://product-details.mozilla.org/1.0/firefox_versions.json';
-
-const supportedProducts = {
-  chrome: 'Chromium',
-  firefox: 'Firefox Nightly',
-} as const;
-
-export async function downloadBrowser() {
-  const downloadHost =
-    process.env.PUPPETEER_DOWNLOAD_HOST ||
-    process.env.npm_config_puppeteer_download_host ||
-    process.env.npm_package_config_puppeteer_download_host;
-  const product =
-    process.env.PUPPETEER_PRODUCT ||
-    process.env.npm_config_puppeteer_product ||
-    process.env.npm_package_config_puppeteer_product ||
-    'chrome';
-  const browserFetcher = puppeteer.createBrowserFetcher({
-    product,
-    host: downloadHost,
-  });
-  const revision = await getRevision();
-  await fetchBinary(revision);
-
-  function getRevision() {
-    if (product === 'chrome') {
-      return (
-        process.env.PUPPETEER_CHROMIUM_REVISION ||
-        process.env.npm_config_puppeteer_chromium_revision ||
-        PUPPETEER_REVISIONS.chromium
-      );
-    } else if (product === 'firefox') {
-      puppeteer._preferredRevision = PUPPETEER_REVISIONS.firefox;
-      return getFirefoxNightlyVersion(browserFetcher.host()).catch((error) => {
-        console.error(error);
-        process.exit(1);
-      });
-    } else {
-      throw new Error(`Unsupported product ${product}`);
-    }
-  }
-
-  function fetchBinary(revision) {
-    const revisionInfo = browserFetcher.revisionInfo(revision);
-
-    // Do nothing if the revision is already downloaded.
-    if (revisionInfo.local) {
-      logPolitely(
-        `${supportedProducts[product]} is already in ${revisionInfo.folderPath}; skipping download.`
-      );
-      return;
-    }
-
-    // Override current environment proxy settings with npm configuration, if any.
-    const NPM_HTTPS_PROXY =
-      process.env.npm_config_https_proxy || process.env.npm_config_proxy;
-    const NPM_HTTP_PROXY =
-      process.env.npm_config_http_proxy || process.env.npm_config_proxy;
-    const NPM_NO_PROXY = process.env.npm_config_no_proxy;
-
-    if (NPM_HTTPS_PROXY) process.env.HTTPS_PROXY = NPM_HTTPS_PROXY;
-    if (NPM_HTTP_PROXY) process.env.HTTP_PROXY = NPM_HTTP_PROXY;
-    if (NPM_NO_PROXY) process.env.NO_PROXY = NPM_NO_PROXY;
-
-    function onSuccess(localRevisions: string[]): void {
-      if (os.arch() !== 'arm64') {
-        logPolitely(
-          `${supportedProducts[product]} (${revisionInfo.revision}) downloaded to ${revisionInfo.folderPath}`
-        );
-      }
-      localRevisions = localRevisions.filter(
-        (revision) => revision !== revisionInfo.revision
-      );
-      const cleanupOldVersions = localRevisions.map((revision) =>
-        browserFetcher.remove(revision)
-      );
-      Promise.all([...cleanupOldVersions]);
-    }
-
-    function onError(error: Error) {
-      console.error(
-        `ERROR: Failed to set up ${supportedProducts[product]} r${revision}! Set "PUPPETEER_SKIP_DOWNLOAD" env variable to skip download.`
-      );
-      console.error(error);
-      process.exit(1);
-    }
-
-    let progressBar = null;
-    let lastDownloadedBytes = 0;
-    function onProgress(downloadedBytes, totalBytes) {
-      if (!progressBar) {
-        progressBar = new ProgressBar(
-          `Downloading ${
-            supportedProducts[product]
-          } r${revision} - ${toMegabytes(totalBytes)} [:bar] :percent :etas `,
-          {
-            complete: '=',
-            incomplete: ' ',
-            width: 20,
-            total: totalBytes,
-          }
-        );
-      }
-      const delta = downloadedBytes - lastDownloadedBytes;
-      lastDownloadedBytes = downloadedBytes;
-      progressBar.tick(delta);
-    }
-
-    return browserFetcher
-      .download(revisionInfo.revision, onProgress)
-      .then(() => browserFetcher.localRevisions())
-      .then(onSuccess)
-      .catch(onError);
-  }
-
-  function toMegabytes(bytes) {
-    const mb = bytes / 1024 / 1024;
-    return `${Math.round(mb * 10) / 10} Mb`;
-  }
-
-  function getFirefoxNightlyVersion(host) {
-    const promise = new Promise((resolve, reject) => {
-      let data = '';
-      logPolitely(`Requesting latest Firefox Nightly version from ${host}`);
-      https
-        .get(firefoxVersions, (r) => {
-          if (r.statusCode >= 400)
-            return reject(new Error(`Got status code ${r.statusCode}`));
-          r.on('data', (chunk) => {
-            data += chunk;
-          });
-          r.on('end', () => {
-            try {
-              const versions = JSON.parse(data);
-              return resolve(versions.FIREFOX_NIGHTLY);
-            } catch {
-              return reject(new Error('Firefox version not found'));
-            }
-          });
-        })
-        .on('error', reject);
-    });
-    return promise;
-  }
-}
-
-export function logPolitely(toBeLogged) {
-  const logLevel = process.env.npm_config_loglevel;
-  const logLevelDisplay = ['silent', 'error', 'warn'].indexOf(logLevel) > -1;
-
-  // eslint-disable-next-line no-console
-  if (!logLevelDisplay) console.log(toBeLogged);
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/BrowserFetcher.ts firefox-85.0+build1/remote/test/puppeteer/src/node/BrowserFetcher.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/BrowserFetcher.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/BrowserFetcher.ts	2021-01-18 19:58:18.000000000 +0000
@@ -22,14 +22,15 @@
 import * as https from 'https';
 import * as http from 'http';
 
+import { Product } from '../common/Product.js';
 import extractZip from 'extract-zip';
-import { debug } from '../common/Debug';
+import { debug } from '../common/Debug.js';
 import { promisify } from 'util';
 import removeRecursive from 'rimraf';
 import * as URL from 'url';
 import ProxyAgent from 'https-proxy-agent';
 import { getProxyForUrl } from 'proxy-from-env';
-import { assert } from '../common/assert';
+import { assert } from '../common/assert.js';
 
 const debugFetcher = debug(`puppeteer:fetcher`);
 
@@ -65,11 +66,6 @@
  * @public
  */
 export type Platform = 'linux' | 'mac' | 'win32' | 'win64';
-/**
- * Supported products.
- * @public
- */
-export type Product = 'chrome' | 'firefox';
 
 function archiveName(
   product: Product,
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/BrowserRunner.ts firefox-85.0+build1/remote/test/puppeteer/src/node/BrowserRunner.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/BrowserRunner.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/BrowserRunner.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import { debug } from '../common/Debug';
+import { debug } from '../common/Debug.js';
 
 import removeFolder from 'rimraf';
 import * as childProcess from 'child_process';
-import { assert } from '../common/assert';
-import { helper, debugError } from '../common/helper';
-import { LaunchOptions } from './LaunchOptions';
-import { Connection } from '../common/Connection';
-import { WebSocketTransport } from '../common/WebSocketTransport';
-import { PipeTransport } from './PipeTransport';
+import { assert } from '../common/assert.js';
+import { helper, debugError } from '../common/helper.js';
+import { LaunchOptions } from './LaunchOptions.js';
+import { Connection } from '../common/Connection.js';
+import { NodeWebSocketTransport as WebSocketTransport } from '../node/NodeWebSocketTransport.js';
+import { PipeTransport } from './PipeTransport.js';
 import * as readline from 'readline';
-import { TimeoutError } from '../common/Errors';
+import { TimeoutError } from '../common/Errors.js';
 import { promisify } from 'util';
 
 const removeFolderAsync = promisify(removeFolder);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/install.ts firefox-85.0+build1/remote/test/puppeteer/src/node/install.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/install.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/install.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,185 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import os from 'os';
+import https from 'https';
+import ProgressBar from 'progress';
+import puppeteer from '../node.js';
+import { PUPPETEER_REVISIONS } from '../revisions.js';
+import { PuppeteerNode } from './Puppeteer.js';
+
+const supportedProducts = {
+  chrome: 'Chromium',
+  firefox: 'Firefox Nightly',
+} as const;
+
+export async function downloadBrowser() {
+  const downloadHost =
+    process.env.PUPPETEER_DOWNLOAD_HOST ||
+    process.env.npm_config_puppeteer_download_host ||
+    process.env.npm_package_config_puppeteer_download_host;
+  const product =
+    process.env.PUPPETEER_PRODUCT ||
+    process.env.npm_config_puppeteer_product ||
+    process.env.npm_package_config_puppeteer_product ||
+    'chrome';
+  const downloadPath =
+    process.env.PUPPETEER_DOWNLOAD_PATH ||
+    process.env.npm_config_puppeteer_download_path ||
+    process.env.npm_package_config_puppeteer_download_path;
+  const browserFetcher = (puppeteer as PuppeteerNode).createBrowserFetcher({
+    product,
+    host: downloadHost,
+    path: downloadPath,
+  });
+  const revision = await getRevision();
+  await fetchBinary(revision);
+
+  function getRevision() {
+    if (product === 'chrome') {
+      return (
+        process.env.PUPPETEER_CHROMIUM_REVISION ||
+        process.env.npm_config_puppeteer_chromium_revision ||
+        PUPPETEER_REVISIONS.chromium
+      );
+    } else if (product === 'firefox') {
+      (puppeteer as PuppeteerNode)._preferredRevision =
+        PUPPETEER_REVISIONS.firefox;
+      return getFirefoxNightlyVersion().catch((error) => {
+        console.error(error);
+        process.exit(1);
+      });
+    } else {
+      throw new Error(`Unsupported product ${product}`);
+    }
+  }
+
+  function fetchBinary(revision) {
+    const revisionInfo = browserFetcher.revisionInfo(revision);
+
+    // Do nothing if the revision is already downloaded.
+    if (revisionInfo.local) {
+      logPolitely(
+        `${supportedProducts[product]} is already in ${revisionInfo.folderPath}; skipping download.`
+      );
+      return;
+    }
+
+    // Override current environment proxy settings with npm configuration, if any.
+    const NPM_HTTPS_PROXY =
+      process.env.npm_config_https_proxy || process.env.npm_config_proxy;
+    const NPM_HTTP_PROXY =
+      process.env.npm_config_http_proxy || process.env.npm_config_proxy;
+    const NPM_NO_PROXY = process.env.npm_config_no_proxy;
+
+    if (NPM_HTTPS_PROXY) process.env.HTTPS_PROXY = NPM_HTTPS_PROXY;
+    if (NPM_HTTP_PROXY) process.env.HTTP_PROXY = NPM_HTTP_PROXY;
+    if (NPM_NO_PROXY) process.env.NO_PROXY = NPM_NO_PROXY;
+
+    function onSuccess(localRevisions: string[]): void {
+      if (os.arch() !== 'arm64') {
+        logPolitely(
+          `${supportedProducts[product]} (${revisionInfo.revision}) downloaded to ${revisionInfo.folderPath}`
+        );
+      }
+      localRevisions = localRevisions.filter(
+        (revision) => revision !== revisionInfo.revision
+      );
+      const cleanupOldVersions = localRevisions.map((revision) =>
+        browserFetcher.remove(revision)
+      );
+      Promise.all([...cleanupOldVersions]);
+    }
+
+    function onError(error: Error) {
+      console.error(
+        `ERROR: Failed to set up ${supportedProducts[product]} r${revision}! Set "PUPPETEER_SKIP_DOWNLOAD" env variable to skip download.`
+      );
+      console.error(error);
+      process.exit(1);
+    }
+
+    let progressBar = null;
+    let lastDownloadedBytes = 0;
+    function onProgress(downloadedBytes, totalBytes) {
+      if (!progressBar) {
+        progressBar = new ProgressBar(
+          `Downloading ${
+            supportedProducts[product]
+          } r${revision} - ${toMegabytes(totalBytes)} [:bar] :percent :etas `,
+          {
+            complete: '=',
+            incomplete: ' ',
+            width: 20,
+            total: totalBytes,
+          }
+        );
+      }
+      const delta = downloadedBytes - lastDownloadedBytes;
+      lastDownloadedBytes = downloadedBytes;
+      progressBar.tick(delta);
+    }
+
+    return browserFetcher
+      .download(revisionInfo.revision, onProgress)
+      .then(() => browserFetcher.localRevisions())
+      .then(onSuccess)
+      .catch(onError);
+  }
+
+  function toMegabytes(bytes) {
+    const mb = bytes / 1024 / 1024;
+    return `${Math.round(mb * 10) / 10} Mb`;
+  }
+
+  function getFirefoxNightlyVersion() {
+    const firefoxVersions =
+      'https://product-details.mozilla.org/1.0/firefox_versions.json';
+
+    const promise = new Promise((resolve, reject) => {
+      let data = '';
+      logPolitely(
+        `Requesting latest Firefox Nightly version from ${firefoxVersions}`
+      );
+      https
+        .get(firefoxVersions, (r) => {
+          if (r.statusCode >= 400)
+            return reject(new Error(`Got status code ${r.statusCode}`));
+          r.on('data', (chunk) => {
+            data += chunk;
+          });
+          r.on('end', () => {
+            try {
+              const versions = JSON.parse(data);
+              return resolve(versions.FIREFOX_NIGHTLY);
+            } catch {
+              return reject(new Error('Firefox version not found'));
+            }
+          });
+        })
+        .on('error', reject);
+    });
+    return promise;
+  }
+}
+
+export function logPolitely(toBeLogged) {
+  const logLevel = process.env.npm_config_loglevel;
+  const logLevelDisplay = ['silent', 'error', 'warn'].indexOf(logLevel) > -1;
+
+  // eslint-disable-next-line no-console
+  if (!logLevelDisplay) console.log(toBeLogged);
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/Launcher.ts firefox-85.0+build1/remote/test/puppeteer/src/node/Launcher.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/Launcher.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/Launcher.ts	2021-01-18 19:58:18.000000000 +0000
@@ -15,29 +15,19 @@
  */
 import * as os from 'os';
 import * as path from 'path';
-import * as http from 'http';
-import * as https from 'https';
-import * as URL from 'url';
 import * as fs from 'fs';
 
-import { BrowserFetcher } from './BrowserFetcher';
-import { Connection } from '../common/Connection';
-import { Browser } from '../common/Browser';
-import { assert } from '../common/assert';
-import { debugError } from '../common/helper';
-import { ConnectionTransport } from '../common/ConnectionTransport';
-import { WebSocketTransport } from '../common/WebSocketTransport';
-import { BrowserRunner } from './BrowserRunner';
+import { BrowserFetcher } from './BrowserFetcher.js';
+import { Browser } from '../common/Browser.js';
+import { BrowserRunner } from './BrowserRunner.js';
 import { promisify } from 'util';
 
 const mkdtempAsync = promisify(fs.mkdtemp);
 const writeFileAsync = promisify(fs.writeFile);
 
-import {
-  ChromeArgOptions,
-  LaunchOptions,
-  BrowserOptions,
-} from './LaunchOptions';
+import { ChromeArgOptions, LaunchOptions } from './LaunchOptions.js';
+import { BrowserOptions } from '../common/BrowserConnector.js';
+import { Product } from '../common/Product.js';
 
 /**
  * Describes a launcher - a class that is able to create and launch a browser instance.
@@ -45,10 +35,9 @@
  */
 export interface ProductLauncher {
   launch(object);
-  connect(object);
   executablePath: () => string;
   defaultArgs(object);
-  product: string;
+  product: Product;
 }
 
 /**
@@ -190,6 +179,9 @@
       '--enable-automation',
       '--password-store=basic',
       '--use-mock-keychain',
+      // TODO(sadym): remove '--enable-blink-features=IdleDetection'
+      // once IdleDetection is turned on by default.
+      '--enable-blink-features=IdleDetection',
     ];
     const {
       devtools = false,
@@ -197,7 +189,8 @@
       args = [],
       userDataDir = null,
     } = options;
-    if (userDataDir) chromeArguments.push(`--user-data-dir=${userDataDir}`);
+    if (userDataDir)
+      chromeArguments.push(`--user-data-dir=${path.resolve(userDataDir)}`);
     if (devtools) chromeArguments.push('--auto-open-devtools-for-tabs');
     if (headless) {
       chromeArguments.push('--headless', '--hide-scrollbars', '--mute-audio');
@@ -212,66 +205,9 @@
     return resolveExecutablePath(this).executablePath;
   }
 
-  get product(): string {
+  get product(): Product {
     return 'chrome';
   }
-
-  async connect(
-    options: BrowserOptions & {
-      browserWSEndpoint?: string;
-      browserURL?: string;
-      transport?: ConnectionTransport;
-    }
-  ): Promise<Browser> {
-    const {
-      browserWSEndpoint,
-      browserURL,
-      ignoreHTTPSErrors = false,
-      defaultViewport = { width: 800, height: 600 },
-      transport,
-      slowMo = 0,
-    } = options;
-
-    assert(
-      Number(!!browserWSEndpoint) +
-        Number(!!browserURL) +
-        Number(!!transport) ===
-        1,
-      'Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect'
-    );
-
-    let connection = null;
-    if (transport) {
-      connection = new Connection('', transport, slowMo);
-    } else if (browserWSEndpoint) {
-      const connectionTransport = await WebSocketTransport.create(
-        browserWSEndpoint
-      );
-      connection = new Connection(
-        browserWSEndpoint,
-        connectionTransport,
-        slowMo
-      );
-    } else if (browserURL) {
-      const connectionURL = await getWSEndpoint(browserURL);
-      const connectionTransport = await WebSocketTransport.create(
-        connectionURL
-      );
-      connection = new Connection(connectionURL, connectionTransport, slowMo);
-    }
-
-    const { browserContextIds } = await connection.send(
-      'Target.getBrowserContexts'
-    );
-    return Browser.create(
-      connection,
-      browserContextIds,
-      ignoreHTTPSErrors,
-      defaultViewport,
-      null,
-      () => connection.send('Browser.close').catch(debugError)
-    );
-  }
 }
 
 /**
@@ -389,63 +325,6 @@
     }
   }
 
-  async connect(
-    options: BrowserOptions & {
-      browserWSEndpoint?: string;
-      browserURL?: string;
-      transport?: ConnectionTransport;
-    }
-  ): Promise<Browser> {
-    const {
-      browserWSEndpoint,
-      browserURL,
-      ignoreHTTPSErrors = false,
-      defaultViewport = { width: 800, height: 600 },
-      transport,
-      slowMo = 0,
-    } = options;
-
-    assert(
-      Number(!!browserWSEndpoint) +
-        Number(!!browserURL) +
-        Number(!!transport) ===
-        1,
-      'Exactly one of browserWSEndpoint, browserURL or transport must be passed to puppeteer.connect'
-    );
-
-    let connection = null;
-    if (transport) {
-      connection = new Connection('', transport, slowMo);
-    } else if (browserWSEndpoint) {
-      const connectionTransport = await WebSocketTransport.create(
-        browserWSEndpoint
-      );
-      connection = new Connection(
-        browserWSEndpoint,
-        connectionTransport,
-        slowMo
-      );
-    } else if (browserURL) {
-      const connectionURL = await getWSEndpoint(browserURL);
-      const connectionTransport = await WebSocketTransport.create(
-        connectionURL
-      );
-      connection = new Connection(connectionURL, connectionTransport, slowMo);
-    }
-
-    const { browserContextIds } = await connection.send(
-      'Target.getBrowserContexts'
-    );
-    return Browser.create(
-      connection,
-      browserContextIds,
-      ignoreHTTPSErrors,
-      defaultViewport,
-      null,
-      () => connection.send('Browser.close').catch(debugError)
-    );
-  }
-
   executablePath(): string {
     return resolveExecutablePath(this).executablePath;
   }
@@ -461,12 +340,15 @@
     }
   }
 
-  get product(): string {
+  get product(): Product {
     return 'firefox';
   }
 
   defaultArgs(options: ChromeArgOptions = {}): string[] {
     const firefoxArguments = ['--no-remote', '--foreground'];
+    if (os.platform().startsWith('win')) {
+      firefoxArguments.push('--wait-for-browser');
+    }
     const {
       devtools = false,
       headless = !devtools,
@@ -612,6 +494,9 @@
       // Make sure opening about:addons will not hit the network
       'extensions.webservice.discoverURL': `http://${server}/dummy/discoveryURL`,
 
+      // Force disable Fission until the Remote Agent is compatible
+      'fission.autostart': false,
+
       // Allow the application to have focus even it runs in the background
       'focusmanager.testmode': true,
       // Disable useragent updates
@@ -699,45 +584,10 @@
   }
 }
 
-function getWSEndpoint(browserURL: string): Promise<string> {
-  let resolve, reject;
-  const promise = new Promise<string>((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-
-  const endpointURL = URL.resolve(browserURL, '/json/version');
-  const protocol = endpointURL.startsWith('https') ? https : http;
-  const requestOptions = Object.assign(URL.parse(endpointURL), {
-    method: 'GET',
-  });
-  const request = protocol.request(requestOptions, (res) => {
-    let data = '';
-    if (res.statusCode !== 200) {
-      // Consume response data to free up memory.
-      res.resume();
-      reject(new Error('HTTP ' + res.statusCode));
-      return;
-    }
-    res.setEncoding('utf8');
-    res.on('data', (chunk) => (data += chunk));
-    res.on('end', () => resolve(JSON.parse(data).webSocketDebuggerUrl));
-  });
-
-  request.on('error', reject);
-  request.end();
-
-  return promise.catch((error) => {
-    error.message =
-      `Failed to fetch browser webSocket url from ${endpointURL}: ` +
-      error.message;
-    throw error;
-  });
-}
-
 function resolveExecutablePath(
   launcher: ChromeLauncher | FirefoxLauncher
 ): { executablePath: string; missingText?: string } {
+  let downloadPath: string;
   // puppeteer-core doesn't take into account PUPPETEER_* env variables.
   if (!launcher._isPuppeteerCore) {
     const executablePath =
@@ -751,9 +601,14 @@
         : null;
       return { executablePath, missingText };
     }
+    downloadPath =
+      process.env.PUPPETEER_DOWNLOAD_PATH ||
+      process.env.npm_config_puppeteer_download_path ||
+      process.env.npm_package_config_puppeteer_download_path;
   }
   const browserFetcher = new BrowserFetcher(launcher._projectRoot, {
     product: launcher.product,
+    path: downloadPath,
   });
   if (!launcher._isPuppeteerCore && launcher.product === 'chrome') {
     const revision = process.env['PUPPETEER_CHROMIUM_REVISION'];
@@ -768,7 +623,7 @@
   }
   const revisionInfo = browserFetcher.revisionInfo(launcher._preferredRevision);
   const missingText = !revisionInfo.local
-    ? `Could not find browser revision ${launcher._preferredRevision}. Run "npm install" or "yarn install" to download a browser binary.`
+    ? `Could not find browser revision ${launcher._preferredRevision}. Run "PUPPETEER_PRODUCT=firefox npm install" or "PUPPETEER_PRODUCT=firefox yarn install" to download a supported Firefox browser binary.`
     : null;
   return { executablePath: revisionInfo.executablePath, missingText };
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/LaunchOptions.ts firefox-85.0+build1/remote/test/puppeteer/src/node/LaunchOptions.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/LaunchOptions.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/LaunchOptions.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import { Viewport } from '../common/PuppeteerViewport';
-
 /**
  * Launcher options that only apply to Chrome.
  *
@@ -43,13 +40,3 @@
   env?: Record<string, string | undefined>;
   pipe?: boolean;
 }
-
-/**
- * Generic browser options that can be passed when launching any browser.
- * @public
- */
-export interface BrowserOptions {
-  ignoreHTTPSErrors?: boolean;
-  defaultViewport?: Viewport;
-  slowMo?: number;
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/NodeWebSocketTransport.ts firefox-85.0+build1/remote/test/puppeteer/src/node/NodeWebSocketTransport.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/NodeWebSocketTransport.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/NodeWebSocketTransport.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ConnectionTransport } from '../common/ConnectionTransport.js';
+import NodeWebSocket from 'ws';
+
+export class NodeWebSocketTransport implements ConnectionTransport {
+  static create(url: string): Promise<NodeWebSocketTransport> {
+    return new Promise((resolve, reject) => {
+      const ws = new NodeWebSocket(url, [], {
+        perMessageDeflate: false,
+        maxPayload: 256 * 1024 * 1024, // 256Mb
+      });
+
+      ws.addEventListener('open', () =>
+        resolve(new NodeWebSocketTransport(ws))
+      );
+      ws.addEventListener('error', reject);
+    });
+  }
+
+  private _ws: NodeWebSocket;
+  onmessage?: (message: string) => void;
+  onclose?: () => void;
+
+  constructor(ws: NodeWebSocket) {
+    this._ws = ws;
+    this._ws.addEventListener('message', (event) => {
+      if (this.onmessage) this.onmessage.call(null, event.data);
+    });
+    this._ws.addEventListener('close', () => {
+      if (this.onclose) this.onclose.call(null);
+    });
+    // Silently ignore all errors - we don't know what to do with them.
+    this._ws.addEventListener('error', () => {});
+    this.onmessage = null;
+    this.onclose = null;
+  }
+
+  send(message: string): void {
+    this._ws.send(message);
+  }
+
+  close(): void {
+    this._ws.close();
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/PipeTransport.ts firefox-85.0+build1/remote/test/puppeteer/src/node/PipeTransport.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/PipeTransport.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/PipeTransport.ts	2021-01-18 19:58:18.000000000 +0000
@@ -13,8 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { helper, debugError, PuppeteerEventListener } from '../common/helper';
-import { ConnectionTransport } from '../common/ConnectionTransport';
+import {
+  helper,
+  debugError,
+  PuppeteerEventListener,
+} from '../common/helper.js';
+import { ConnectionTransport } from '../common/ConnectionTransport.js';
 
 export class PipeTransport implements ConnectionTransport {
   _pipeWrite: NodeJS.WritableStream;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node/Puppeteer.ts firefox-85.0+build1/remote/test/puppeteer/src/node/Puppeteer.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node/Puppeteer.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node/Puppeteer.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,230 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  Puppeteer,
+  CommonPuppeteerSettings,
+  ConnectOptions,
+} from '../common/Puppeteer.js';
+import { BrowserFetcher, BrowserFetcherOptions } from './BrowserFetcher.js';
+import { LaunchOptions, ChromeArgOptions } from './LaunchOptions.js';
+import { BrowserOptions } from '../common/BrowserConnector.js';
+import { Browser } from '../common/Browser.js';
+import Launcher, { ProductLauncher } from './Launcher.js';
+import { PUPPETEER_REVISIONS } from '../revisions.js';
+import { Product } from '../common/Product.js';
+
+/**
+ * Extends the main {@link Puppeteer} class with Node specific behaviour for fetching and
+ * downloading browsers.
+ *
+ * If you're using Puppeteer in a Node environment, this is the class you'll get
+ * when you run `require('puppeteer')` (or the equivalent ES `import`).
+ *
+ * @remarks
+ *
+ * The most common method to use is {@link PuppeteerNode.launch | launch}, which
+ * is used to launch and connect to a new browser instance.
+ *
+ * See {@link Puppeteer | the main Puppeteer class} for methods common to all
+ * environments, such as {@link Puppeteer.connect}.
+ *
+ * @example
+ * The following is a typical example of using Puppeteer to drive automation:
+ * ```js
+ * const puppeteer = require('puppeteer');
+ *
+ * (async () => {
+ *   const browser = await puppeteer.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://www.google.com');
+ *   // other actions...
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ * Once you have created a `page` you have access to a large API to interact
+ * with the page, navigate, or find certain elements in that page.
+ * The {@link Page | `page` documentation} lists all the available methods.
+ *
+ * @public
+ */
+export class PuppeteerNode extends Puppeteer {
+  private _lazyLauncher: ProductLauncher;
+  private _projectRoot: string;
+  private __productName?: Product;
+  /**
+   * @internal
+   */
+  _preferredRevision: string;
+
+  /**
+   * @internal
+   */
+  constructor(
+    settings: {
+      projectRoot: string;
+      preferredRevision: string;
+      productName?: Product;
+    } & CommonPuppeteerSettings
+  ) {
+    const {
+      projectRoot,
+      preferredRevision,
+      productName,
+      ...commonSettings
+    } = settings;
+    super(commonSettings);
+    this._projectRoot = projectRoot;
+    this.__productName = productName;
+    this._preferredRevision = preferredRevision;
+  }
+
+  /**
+   * This method attaches Puppeteer to an existing browser instance.
+   *
+   * @remarks
+   *
+   * @param options - Set of configurable options to set on the browser.
+   * @returns Promise which resolves to browser instance.
+   */
+  connect(options: ConnectOptions): Promise<Browser> {
+    if (options.product) this._productName = options.product;
+    return super.connect(options);
+  }
+
+  /**
+   * @internal
+   */
+  get _productName(): Product {
+    return this.__productName;
+  }
+
+  // don't need any TSDoc here - because the getter is internal the setter is too.
+  set _productName(name: Product) {
+    if (this.__productName !== name) this._changedProduct = true;
+    this.__productName = name;
+  }
+
+  /**
+   * Launches puppeteer and launches a browser instance with given arguments
+   * and options when specified.
+   *
+   * @remarks
+   *
+   * @example
+   * You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
+   * ```js
+   * const browser = await puppeteer.launch({
+   *   ignoreDefaultArgs: ['--mute-audio']
+   * });
+   * ```
+   *
+   * **NOTE** Puppeteer can also be used to control the Chrome browser,
+   * but it works best with the version of Chromium it is bundled with.
+   * There is no guarantee it will work with any other version.
+   * Use `executablePath` option with extreme caution.
+   * If Google Chrome (rather than Chromium) is preferred, a {@link https://www.google.com/chrome/browser/canary.html | Chrome Canary} or {@link https://www.chromium.org/getting-involved/dev-channel | Dev Channel} build is suggested.
+   * In `puppeteer.launch([options])`, any mention of Chromium also applies to Chrome.
+   * See {@link https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/ | this article} for a description of the differences between Chromium and Chrome. {@link https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md | This article} describes some differences for Linux users.
+   *
+   * @param options - Set of configurable options to set on the browser.
+   * @returns Promise which resolves to browser instance.
+   */
+  launch(
+    options: LaunchOptions &
+      ChromeArgOptions &
+      BrowserOptions & {
+        product?: Product;
+        extraPrefsFirefox?: Record<string, unknown>;
+      } = {}
+  ): Promise<Browser> {
+    if (options.product) this._productName = options.product;
+    return this._launcher.launch(options);
+  }
+
+  /**
+   * @remarks
+   *
+   * **NOTE** `puppeteer.executablePath()` is affected by the `PUPPETEER_EXECUTABLE_PATH`
+   * and `PUPPETEER_CHROMIUM_REVISION` environment variables.
+   *
+   * @returns A path where Puppeteer expects to find the bundled browser.
+   * The browser binary might not be there if the download was skipped with
+   * the `PUPPETEER_SKIP_DOWNLOAD` environment variable.
+   */
+  executablePath(): string {
+    return this._launcher.executablePath();
+  }
+
+  /**
+   * @internal
+   */
+  get _launcher(): ProductLauncher {
+    if (
+      !this._lazyLauncher ||
+      this._lazyLauncher.product !== this._productName ||
+      this._changedProduct
+    ) {
+      switch (this._productName) {
+        case 'firefox':
+          this._preferredRevision = PUPPETEER_REVISIONS.firefox;
+          break;
+        case 'chrome':
+        default:
+          this._preferredRevision = PUPPETEER_REVISIONS.chromium;
+      }
+      this._changedProduct = false;
+      this._lazyLauncher = Launcher(
+        this._projectRoot,
+        this._preferredRevision,
+        this._isPuppeteerCore,
+        this._productName
+      );
+    }
+    return this._lazyLauncher;
+  }
+
+  /**
+   * The name of the browser that is under automation (`"chrome"` or `"firefox"`)
+   *
+   * @remarks
+   * The product is set by the `PUPPETEER_PRODUCT` environment variable or the `product`
+   * option in `puppeteer.launch([options])` and defaults to `chrome`.
+   * Firefox support is experimental.
+   */
+  get product(): string {
+    return this._launcher.product;
+  }
+
+  /**
+   *
+   * @param options - Set of configurable options to set on the browser.
+   * @returns The default flags that Chromium will be launched with.
+   */
+  defaultArgs(options: ChromeArgOptions = {}): string[] {
+    return this._launcher.defaultArgs(options);
+  }
+
+  /**
+   * @param options - Set of configurable options to specify the settings
+   * of the BrowserFetcher.
+   * @returns A new BrowserFetcher instance.
+   */
+  createBrowserFetcher(options: BrowserFetcherOptions): BrowserFetcher {
+    return new BrowserFetcher(this._projectRoot, options);
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node-puppeteer-core.ts firefox-85.0+build1/remote/test/puppeteer/src/node-puppeteer-core.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node-puppeteer-core.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node-puppeteer-core.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { initializePuppeteerNode } from './initialize-node.js';
+import { isNode } from './environment.js';
+
+if (!isNode) {
+  throw new Error('Cannot run puppeteer-core outside of Node.js');
+}
+
+const puppeteer = initializePuppeteerNode('puppeteer-core');
+export default puppeteer;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/node.ts firefox-85.0+build1/remote/test/puppeteer/src/node.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/node.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/node.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { initializePuppeteerNode } from './initialize-node.js';
+import { isNode } from './environment.js';
+
+if (!isNode) {
+  throw new Error('Trying to run Puppeteer-Node in a web environment.');
+}
+export default initializePuppeteerNode('puppeteer');
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/protocol.d.ts firefox-85.0+build1/remote/test/puppeteer/src/protocol.d.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/protocol.d.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/protocol.d.ts	1970-01-01 00:00:00.000000000 +0000
@@ -1,15503 +0,0 @@
-// This is generated from /utils/protocol-types-generator/index.js
-  type binary = string;
-
-declare module Protocol {
-    export module Accessibility {
-        /**
-         * Unique accessibility node identifier.
-         */
-        export type AXNodeId = string;
-        /**
-         * Enum of possible property types.
-         */
-        export type AXValueType = "boolean"|"tristate"|"booleanOrUndefined"|"idref"|"idrefList"|"integer"|"node"|"nodeList"|"number"|"string"|"computedString"|"token"|"tokenList"|"domRelation"|"role"|"internalRole"|"valueUndefined";
-        /**
-         * Enum of possible property sources.
-         */
-        export type AXValueSourceType = "attribute"|"implicit"|"style"|"contents"|"placeholder"|"relatedElement";
-        /**
-         * Enum of possible native property sources (as a subtype of a particular AXValueSourceType).
-         */
-        export type AXValueNativeSourceType = "figcaption"|"label"|"labelfor"|"labelwrapped"|"legend"|"tablecaption"|"title"|"other";
-        /**
-         * A single source for a computed AX property.
-         */
-        export interface AXValueSource {
-            /**
-             * What type of source this is.
-             */
-            type: AXValueSourceType;
-            /**
-             * The value of this property source.
-             */
-            value?: AXValue;
-            /**
-             * The name of the relevant attribute, if any.
-             */
-            attribute?: string;
-            /**
-             * The value of the relevant attribute, if any.
-             */
-            attributeValue?: AXValue;
-            /**
-             * Whether this source is superseded by a higher priority source.
-             */
-            superseded?: boolean;
-            /**
-             * The native markup source for this value, e.g. a <label> element.
-             */
-            nativeSource?: AXValueNativeSourceType;
-            /**
-             * The value, such as a node or node list, of the native source.
-             */
-            nativeSourceValue?: AXValue;
-            /**
-             * Whether the value for this property is invalid.
-             */
-            invalid?: boolean;
-            /**
-             * Reason for the value being invalid, if it is.
-             */
-            invalidReason?: string;
-        }
-        export interface AXRelatedNode {
-            /**
-             * The BackendNodeId of the related DOM node.
-             */
-            backendDOMNodeId: DOM.BackendNodeId;
-            /**
-             * The IDRef value provided, if any.
-             */
-            idref?: string;
-            /**
-             * The text alternative of this node in the current context.
-             */
-            text?: string;
-        }
-        export interface AXProperty {
-            /**
-             * The name of this property.
-             */
-            name: AXPropertyName;
-            /**
-             * The value of this property.
-             */
-            value: AXValue;
-        }
-        /**
-         * A single computed AX property.
-         */
-        export interface AXValue {
-            /**
-             * The type of this value.
-             */
-            type: AXValueType;
-            /**
-             * The computed value of this property.
-             */
-            value?: any;
-            /**
-             * One or more related nodes, if applicable.
-             */
-            relatedNodes?: AXRelatedNode[];
-            /**
-             * The sources which contributed to the computation of this property.
-             */
-            sources?: AXValueSource[];
-        }
-        /**
-         * Values of AXProperty name:
-- from 'busy' to 'roledescription': states which apply to every AX node
-- from 'live' to 'root': attributes which apply to nodes in live regions
-- from 'autocomplete' to 'valuetext': attributes which apply to widgets
-- from 'checked' to 'selected': states which apply to widgets
-- from 'activedescendant' to 'owns' - relationships between elements other than parent/child/sibling.
-         */
-        export type AXPropertyName = "busy"|"disabled"|"editable"|"focusable"|"focused"|"hidden"|"hiddenRoot"|"invalid"|"keyshortcuts"|"settable"|"roledescription"|"live"|"atomic"|"relevant"|"root"|"autocomplete"|"hasPopup"|"level"|"multiselectable"|"orientation"|"multiline"|"readonly"|"required"|"valuemin"|"valuemax"|"valuetext"|"checked"|"expanded"|"modal"|"pressed"|"selected"|"activedescendant"|"controls"|"describedby"|"details"|"errormessage"|"flowto"|"labelledby"|"owns";
-        /**
-         * A node in the accessibility tree.
-         */
-        export interface AXNode {
-            /**
-             * Unique identifier for this node.
-             */
-            nodeId: AXNodeId;
-            /**
-             * Whether this node is ignored for accessibility
-             */
-            ignored: boolean;
-            /**
-             * Collection of reasons why this node is hidden.
-             */
-            ignoredReasons?: AXProperty[];
-            /**
-             * This `Node`'s role, whether explicit or implicit.
-             */
-            role?: AXValue;
-            /**
-             * The accessible name for this `Node`.
-             */
-            name?: AXValue;
-            /**
-             * The accessible description for this `Node`.
-             */
-            description?: AXValue;
-            /**
-             * The value for this `Node`.
-             */
-            value?: AXValue;
-            /**
-             * All other properties
-             */
-            properties?: AXProperty[];
-            /**
-             * IDs for each of this node's child nodes.
-             */
-            childIds?: AXNodeId[];
-            /**
-             * The backend ID for the associated DOM node, if any.
-             */
-            backendDOMNodeId?: DOM.BackendNodeId;
-        }
-        
-        
-        /**
-         * Disables the accessibility domain.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables the accessibility domain which causes `AXNodeId`s to remain consistent between method calls.
-This turns on accessibility for the page, which can impact performance until accessibility is disabled.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Fetches the accessibility node and partial accessibility tree for this DOM node, if it exists.
-         */
-        export type getPartialAXTreeParameters = {
-            /**
-             * Identifier of the node to get the partial accessibility tree for.
-             */
-            nodeId?: DOM.NodeId;
-            /**
-             * Identifier of the backend node to get the partial accessibility tree for.
-             */
-            backendNodeId?: DOM.BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper to get the partial accessibility tree for.
-             */
-            objectId?: Runtime.RemoteObjectId;
-            /**
-             * Whether to fetch this nodes ancestors, siblings and children. Defaults to true.
-             */
-            fetchRelatives?: boolean;
-        }
-        export type getPartialAXTreeReturnValue = {
-            /**
-             * The `Accessibility.AXNode` for this DOM node, if it exists, plus its ancestors, siblings and
-children, if requested.
-             */
-            nodes: AXNode[];
-        }
-        /**
-         * Fetches the entire accessibility tree
-         */
-        export type getFullAXTreeParameters = {
-        }
-        export type getFullAXTreeReturnValue = {
-            nodes: AXNode[];
-        }
-    }
-    
-    export module Animation {
-        /**
-         * Animation instance.
-         */
-        export interface Animation {
-            /**
-             * `Animation`'s id.
-             */
-            id: string;
-            /**
-             * `Animation`'s name.
-             */
-            name: string;
-            /**
-             * `Animation`'s internal paused state.
-             */
-            pausedState: boolean;
-            /**
-             * `Animation`'s play state.
-             */
-            playState: string;
-            /**
-             * `Animation`'s playback rate.
-             */
-            playbackRate: number;
-            /**
-             * `Animation`'s start time.
-             */
-            startTime: number;
-            /**
-             * `Animation`'s current time.
-             */
-            currentTime: number;
-            /**
-             * Animation type of `Animation`.
-             */
-            type: "CSSTransition"|"CSSAnimation"|"WebAnimation";
-            /**
-             * `Animation`'s source animation node.
-             */
-            source?: AnimationEffect;
-            /**
-             * A unique ID for `Animation` representing the sources that triggered this CSS
-animation/transition.
-             */
-            cssId?: string;
-        }
-        /**
-         * AnimationEffect instance
-         */
-        export interface AnimationEffect {
-            /**
-             * `AnimationEffect`'s delay.
-             */
-            delay: number;
-            /**
-             * `AnimationEffect`'s end delay.
-             */
-            endDelay: number;
-            /**
-             * `AnimationEffect`'s iteration start.
-             */
-            iterationStart: number;
-            /**
-             * `AnimationEffect`'s iterations.
-             */
-            iterations: number;
-            /**
-             * `AnimationEffect`'s iteration duration.
-             */
-            duration: number;
-            /**
-             * `AnimationEffect`'s playback direction.
-             */
-            direction: string;
-            /**
-             * `AnimationEffect`'s fill mode.
-             */
-            fill: string;
-            /**
-             * `AnimationEffect`'s target node.
-             */
-            backendNodeId?: DOM.BackendNodeId;
-            /**
-             * `AnimationEffect`'s keyframes.
-             */
-            keyframesRule?: KeyframesRule;
-            /**
-             * `AnimationEffect`'s timing function.
-             */
-            easing: string;
-        }
-        /**
-         * Keyframes Rule
-         */
-        export interface KeyframesRule {
-            /**
-             * CSS keyframed animation's name.
-             */
-            name?: string;
-            /**
-             * List of animation keyframes.
-             */
-            keyframes: KeyframeStyle[];
-        }
-        /**
-         * Keyframe Style
-         */
-        export interface KeyframeStyle {
-            /**
-             * Keyframe's time offset.
-             */
-            offset: string;
-            /**
-             * `AnimationEffect`'s timing function.
-             */
-            easing: string;
-        }
-        
-        /**
-         * Event for when an animation has been cancelled.
-         */
-        export type animationCanceledPayload = {
-            /**
-             * Id of the animation that was cancelled.
-             */
-            id: string;
-        }
-        /**
-         * Event for each animation that has been created.
-         */
-        export type animationCreatedPayload = {
-            /**
-             * Id of the animation that was created.
-             */
-            id: string;
-        }
-        /**
-         * Event for animation that has been started.
-         */
-        export type animationStartedPayload = {
-            /**
-             * Animation that was started.
-             */
-            animation: Animation;
-        }
-        
-        /**
-         * Disables animation domain notifications.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables animation domain notifications.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Returns the current time of the an animation.
-         */
-        export type getCurrentTimeParameters = {
-            /**
-             * Id of animation.
-             */
-            id: string;
-        }
-        export type getCurrentTimeReturnValue = {
-            /**
-             * Current time of the page.
-             */
-            currentTime: number;
-        }
-        /**
-         * Gets the playback rate of the document timeline.
-         */
-        export type getPlaybackRateParameters = {
-        }
-        export type getPlaybackRateReturnValue = {
-            /**
-             * Playback rate for animations on page.
-             */
-            playbackRate: number;
-        }
-        /**
-         * Releases a set of animations to no longer be manipulated.
-         */
-        export type releaseAnimationsParameters = {
-            /**
-             * List of animation ids to seek.
-             */
-            animations: string[];
-        }
-        export type releaseAnimationsReturnValue = {
-        }
-        /**
-         * Gets the remote object of the Animation.
-         */
-        export type resolveAnimationParameters = {
-            /**
-             * Animation id.
-             */
-            animationId: string;
-        }
-        export type resolveAnimationReturnValue = {
-            /**
-             * Corresponding remote object.
-             */
-            remoteObject: Runtime.RemoteObject;
-        }
-        /**
-         * Seek a set of animations to a particular time within each animation.
-         */
-        export type seekAnimationsParameters = {
-            /**
-             * List of animation ids to seek.
-             */
-            animations: string[];
-            /**
-             * Set the current time of each animation.
-             */
-            currentTime: number;
-        }
-        export type seekAnimationsReturnValue = {
-        }
-        /**
-         * Sets the paused state of a set of animations.
-         */
-        export type setPausedParameters = {
-            /**
-             * Animations to set the pause state of.
-             */
-            animations: string[];
-            /**
-             * Paused state to set to.
-             */
-            paused: boolean;
-        }
-        export type setPausedReturnValue = {
-        }
-        /**
-         * Sets the playback rate of the document timeline.
-         */
-        export type setPlaybackRateParameters = {
-            /**
-             * Playback rate for animations on page
-             */
-            playbackRate: number;
-        }
-        export type setPlaybackRateReturnValue = {
-        }
-        /**
-         * Sets the timing of an animation node.
-         */
-        export type setTimingParameters = {
-            /**
-             * Animation id.
-             */
-            animationId: string;
-            /**
-             * Duration of the animation.
-             */
-            duration: number;
-            /**
-             * Delay of the animation.
-             */
-            delay: number;
-        }
-        export type setTimingReturnValue = {
-        }
-    }
-    
-    export module ApplicationCache {
-        /**
-         * Detailed application cache resource information.
-         */
-        export interface ApplicationCacheResource {
-            /**
-             * Resource url.
-             */
-            url: string;
-            /**
-             * Resource size.
-             */
-            size: number;
-            /**
-             * Resource type.
-             */
-            type: string;
-        }
-        /**
-         * Detailed application cache information.
-         */
-        export interface ApplicationCache {
-            /**
-             * Manifest URL.
-             */
-            manifestURL: string;
-            /**
-             * Application cache size.
-             */
-            size: number;
-            /**
-             * Application cache creation time.
-             */
-            creationTime: number;
-            /**
-             * Application cache update time.
-             */
-            updateTime: number;
-            /**
-             * Application cache resources.
-             */
-            resources: ApplicationCacheResource[];
-        }
-        /**
-         * Frame identifier - manifest URL pair.
-         */
-        export interface FrameWithManifest {
-            /**
-             * Frame identifier.
-             */
-            frameId: Page.FrameId;
-            /**
-             * Manifest URL.
-             */
-            manifestURL: string;
-            /**
-             * Application cache status.
-             */
-            status: number;
-        }
-        
-        export type applicationCacheStatusUpdatedPayload = {
-            /**
-             * Identifier of the frame containing document whose application cache updated status.
-             */
-            frameId: Page.FrameId;
-            /**
-             * Manifest URL.
-             */
-            manifestURL: string;
-            /**
-             * Updated application cache status.
-             */
-            status: number;
-        }
-        export type networkStateUpdatedPayload = {
-            isNowOnline: boolean;
-        }
-        
-        /**
-         * Enables application cache domain notifications.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Returns relevant application cache data for the document in given frame.
-         */
-        export type getApplicationCacheForFrameParameters = {
-            /**
-             * Identifier of the frame containing document whose application cache is retrieved.
-             */
-            frameId: Page.FrameId;
-        }
-        export type getApplicationCacheForFrameReturnValue = {
-            /**
-             * Relevant application cache data for the document in given frame.
-             */
-            applicationCache: ApplicationCache;
-        }
-        /**
-         * Returns array of frame identifiers with manifest urls for each frame containing a document
-associated with some application cache.
-         */
-        export type getFramesWithManifestsParameters = {
-        }
-        export type getFramesWithManifestsReturnValue = {
-            /**
-             * Array of frame identifiers with manifest urls for each frame containing a document
-associated with some application cache.
-             */
-            frameIds: FrameWithManifest[];
-        }
-        /**
-         * Returns manifest URL for document in the given frame.
-         */
-        export type getManifestForFrameParameters = {
-            /**
-             * Identifier of the frame containing document whose manifest is retrieved.
-             */
-            frameId: Page.FrameId;
-        }
-        export type getManifestForFrameReturnValue = {
-            /**
-             * Manifest URL for document in the given frame.
-             */
-            manifestURL: string;
-        }
-    }
-    
-    /**
-     * Audits domain allows investigation of page violations and possible improvements.
-     */
-    export module Audits {
-        /**
-         * Information about a cookie that is affected by an inspector issue.
-         */
-        export interface AffectedCookie {
-            /**
-             * The following three properties uniquely identify a cookie
-             */
-            name: string;
-            path: string;
-            domain: string;
-            /**
-             * Optionally identifies the site-for-cookies, which may be used by the
-front-end as additional context.
-             */
-            siteForCookies?: string;
-        }
-        export type SameSiteCookieExclusionReason = "ExcludeSameSiteUnspecifiedTreatedAsLax"|"ExcludeSameSiteNoneInsecure";
-        export type SameSiteCookieWarningReason = "WarnSameSiteUnspecifiedCrossSiteContext"|"WarnSameSiteNoneInsecure"|"WarnSameSiteUnspecifiedLaxAllowUnsafe"|"WarnSameSiteCrossSchemeSecureUrlMethodUnsafe"|"WarnSameSiteCrossSchemeSecureUrlLax"|"WarnSameSiteCrossSchemeSecureUrlStrict"|"WarnSameSiteCrossSchemeInsecureUrlMethodUnsafe"|"WarnSameSiteCrossSchemeInsecureUrlLax"|"WarnSameSiteCrossSchemeInsecureUrlStrict";
-        /**
-         * This information is currently necessary, as the front-end has a difficult
-time finding a specific cookie. With this, we can convey specific error
-information without the cookie.
-         */
-        export interface SameSiteCookieIssueDetails {
-            cookieWarningReasons: SameSiteCookieWarningReason[];
-            cookieExclusionReasons: SameSiteCookieExclusionReason[];
-        }
-        export interface AffectedResources {
-            cookies?: AffectedCookie[];
-        }
-        /**
-         * A unique identifier for the type of issue. Each type may use one of the
-optional fields in InspectorIssueDetails to convey more specific
-information about the kind of issue, and AffectedResources to identify
-resources that are affected by this issue.
-         */
-        export type InspectorIssueCode = "SameSiteCookieIssue";
-        /**
-         * This struct holds a list of optional fields with additional information
-pertaining to the kind of issue. This is useful if there is a number of
-very similar issues that only differ in details.
-         */
-        export interface InspectorIssueDetails {
-            sameSiteCookieIssueDetails?: SameSiteCookieIssueDetails;
-        }
-        /**
-         * An inspector issue reported from the back-end.
-         */
-        export interface InspectorIssue {
-            code: InspectorIssueCode;
-            details: InspectorIssueDetails;
-            resources: AffectedResources;
-        }
-        
-        export type issueAddedPayload = {
-            issue: InspectorIssue;
-        }
-        
-        /**
-         * Returns the response body and size if it were re-encoded with the specified settings. Only
-applies to images.
-         */
-        export type getEncodedResponseParameters = {
-            /**
-             * Identifier of the network request to get content for.
-             */
-            requestId: Network.RequestId;
-            /**
-             * The encoding to use.
-             */
-            encoding: "webp"|"jpeg"|"png";
-            /**
-             * The quality of the encoding (0-1). (defaults to 1)
-             */
-            quality?: number;
-            /**
-             * Whether to only return the size information (defaults to false).
-             */
-            sizeOnly?: boolean;
-        }
-        export type getEncodedResponseReturnValue = {
-            /**
-             * The encoded body as a base64 string. Omitted if sizeOnly is true.
-             */
-            body?: binary;
-            /**
-             * Size before re-encoding.
-             */
-            originalSize: number;
-            /**
-             * Size after re-encoding.
-             */
-            encodedSize: number;
-        }
-        /**
-         * Disables issues domain, prevents further issues from being reported to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables issues domain, sends the issues collected so far to the client by means of the
-`issueAdded` event.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-    }
-    
-    /**
-     * Defines events for background web platform features.
-     */
-    export module BackgroundService {
-        /**
-         * The Background Service that will be associated with the commands/events.
-Every Background Service operates independently, but they share the same
-API.
-         */
-        export type ServiceName = "backgroundFetch"|"backgroundSync"|"pushMessaging"|"notifications"|"paymentHandler"|"periodicBackgroundSync";
-        /**
-         * A key-value pair for additional event information to pass along.
-         */
-        export interface EventMetadata {
-            key: string;
-            value: string;
-        }
-        export interface BackgroundServiceEvent {
-            /**
-             * Timestamp of the event (in seconds).
-             */
-            timestamp: Network.TimeSinceEpoch;
-            /**
-             * The origin this event belongs to.
-             */
-            origin: string;
-            /**
-             * The Service Worker ID that initiated the event.
-             */
-            serviceWorkerRegistrationId: ServiceWorker.RegistrationID;
-            /**
-             * The Background Service this event belongs to.
-             */
-            service: ServiceName;
-            /**
-             * A description of the event.
-             */
-            eventName: string;
-            /**
-             * An identifier that groups related events together.
-             */
-            instanceId: string;
-            /**
-             * A list of event-specific information.
-             */
-            eventMetadata: EventMetadata[];
-        }
-        
-        /**
-         * Called when the recording state for the service has been updated.
-         */
-        export type recordingStateChangedPayload = {
-            isRecording: boolean;
-            service: ServiceName;
-        }
-        /**
-         * Called with all existing backgroundServiceEvents when enabled, and all new
-events afterwards if enabled and recording.
-         */
-        export type backgroundServiceEventReceivedPayload = {
-            backgroundServiceEvent: BackgroundServiceEvent;
-        }
-        
-        /**
-         * Enables event updates for the service.
-         */
-        export type startObservingParameters = {
-            service: ServiceName;
-        }
-        export type startObservingReturnValue = {
-        }
-        /**
-         * Disables event updates for the service.
-         */
-        export type stopObservingParameters = {
-            service: ServiceName;
-        }
-        export type stopObservingReturnValue = {
-        }
-        /**
-         * Set the recording state for the service.
-         */
-        export type setRecordingParameters = {
-            shouldRecord: boolean;
-            service: ServiceName;
-        }
-        export type setRecordingReturnValue = {
-        }
-        /**
-         * Clears all stored data for the service.
-         */
-        export type clearEventsParameters = {
-            service: ServiceName;
-        }
-        export type clearEventsReturnValue = {
-        }
-    }
-    
-    /**
-     * The Browser domain defines methods and events for browser managing.
-     */
-    export module Browser {
-        export type BrowserContextID = string;
-        export type WindowID = number;
-        /**
-         * The state of the browser window.
-         */
-        export type WindowState = "normal"|"minimized"|"maximized"|"fullscreen";
-        /**
-         * Browser window bounds information
-         */
-        export interface Bounds {
-            /**
-             * The offset from the left edge of the screen to the window in pixels.
-             */
-            left?: number;
-            /**
-             * The offset from the top edge of the screen to the window in pixels.
-             */
-            top?: number;
-            /**
-             * The window width in pixels.
-             */
-            width?: number;
-            /**
-             * The window height in pixels.
-             */
-            height?: number;
-            /**
-             * The window state. Default to normal.
-             */
-            windowState?: WindowState;
-        }
-        export type PermissionType = "accessibilityEvents"|"audioCapture"|"backgroundSync"|"backgroundFetch"|"clipboardReadWrite"|"clipboardSanitizedWrite"|"durableStorage"|"flash"|"geolocation"|"midi"|"midiSysex"|"nfc"|"notifications"|"paymentHandler"|"periodicBackgroundSync"|"protectedMediaIdentifier"|"sensors"|"videoCapture"|"idleDetection"|"wakeLockScreen"|"wakeLockSystem";
-        export type PermissionSetting = "granted"|"denied"|"prompt";
-        /**
-         * Definition of PermissionDescriptor defined in the Permissions API:
-https://w3c.github.io/permissions/#dictdef-permissiondescriptor.
-         */
-        export interface PermissionDescriptor {
-            /**
-             * Name of permission.
-See https://cs.chromium.org/chromium/src/third_party/blink/renderer/modules/permissions/permission_descriptor.idl for valid permission names.
-             */
-            name: string;
-            /**
-             * For "midi" permission, may also specify sysex control.
-             */
-            sysex?: boolean;
-            /**
-             * For "push" permission, may specify userVisibleOnly.
-Note that userVisibleOnly = true is the only currently supported type.
-             */
-            userVisibleOnly?: boolean;
-            /**
-             * For "wake-lock" permission, must specify type as either "screen" or "system".
-             */
-            type?: string;
-            /**
-             * For "clipboard" permission, may specify allowWithoutSanitization.
-             */
-            allowWithoutSanitization?: boolean;
-        }
-        /**
-         * Chrome histogram bucket.
-         */
-        export interface Bucket {
-            /**
-             * Minimum value (inclusive).
-             */
-            low: number;
-            /**
-             * Maximum value (exclusive).
-             */
-            high: number;
-            /**
-             * Number of samples.
-             */
-            count: number;
-        }
-        /**
-         * Chrome histogram.
-         */
-        export interface Histogram {
-            /**
-             * Name.
-             */
-            name: string;
-            /**
-             * Sum of sample values.
-             */
-            sum: number;
-            /**
-             * Total number of samples.
-             */
-            count: number;
-            /**
-             * Buckets.
-             */
-            buckets: Bucket[];
-        }
-        
-        
-        /**
-         * Set permission settings for given origin.
-         */
-        export type setPermissionParameters = {
-            /**
-             * Origin the permission applies to, all origins if not specified.
-             */
-            origin?: string;
-            /**
-             * Descriptor of permission to override.
-             */
-            permission: PermissionDescriptor;
-            /**
-             * Setting of the permission.
-             */
-            setting: PermissionSetting;
-            /**
-             * Context to override. When omitted, default browser context is used.
-             */
-            browserContextId?: BrowserContextID;
-        }
-        export type setPermissionReturnValue = {
-        }
-        /**
-         * Grant specific permissions to the given origin and reject all others.
-         */
-        export type grantPermissionsParameters = {
-            /**
-             * Origin the permission applies to, all origins if not specified.
-             */
-            origin?: string;
-            permissions: PermissionType[];
-            /**
-             * BrowserContext to override permissions. When omitted, default browser context is used.
-             */
-            browserContextId?: BrowserContextID;
-        }
-        export type grantPermissionsReturnValue = {
-        }
-        /**
-         * Reset all permission management for all origins.
-         */
-        export type resetPermissionsParameters = {
-            /**
-             * BrowserContext to reset permissions. When omitted, default browser context is used.
-             */
-            browserContextId?: BrowserContextID;
-        }
-        export type resetPermissionsReturnValue = {
-        }
-        /**
-         * Set the behavior when downloading a file.
-         */
-        export type setDownloadBehaviorParameters = {
-            /**
-             * Whether to allow all or deny all download requests, or use default Chrome behavior if
-available (otherwise deny). |allowAndName| allows download and names files according to
-their dowmload guids.
-             */
-            behavior: "deny"|"allow"|"allowAndName"|"default";
-            /**
-             * BrowserContext to set download behavior. When omitted, default browser context is used.
-             */
-            browserContextId?: BrowserContextID;
-            /**
-             * The default path to save downloaded files to. This is requred if behavior is set to 'allow'
-or 'allowAndName'.
-             */
-            downloadPath?: string;
-        }
-        export type setDownloadBehaviorReturnValue = {
-        }
-        /**
-         * Close browser gracefully.
-         */
-        export type closeParameters = {
-        }
-        export type closeReturnValue = {
-        }
-        /**
-         * Crashes browser on the main thread.
-         */
-        export type crashParameters = {
-        }
-        export type crashReturnValue = {
-        }
-        /**
-         * Crashes GPU process.
-         */
-        export type crashGpuProcessParameters = {
-        }
-        export type crashGpuProcessReturnValue = {
-        }
-        /**
-         * Returns version information.
-         */
-        export type getVersionParameters = {
-        }
-        export type getVersionReturnValue = {
-            /**
-             * Protocol version.
-             */
-            protocolVersion: string;
-            /**
-             * Product name.
-             */
-            product: string;
-            /**
-             * Product revision.
-             */
-            revision: string;
-            /**
-             * User-Agent.
-             */
-            userAgent: string;
-            /**
-             * V8 version.
-             */
-            jsVersion: string;
-        }
-        /**
-         * Returns the command line switches for the browser process if, and only if
---enable-automation is on the commandline.
-         */
-        export type getBrowserCommandLineParameters = {
-        }
-        export type getBrowserCommandLineReturnValue = {
-            /**
-             * Commandline parameters
-             */
-            arguments: string[];
-        }
-        /**
-         * Get Chrome histograms.
-         */
-        export type getHistogramsParameters = {
-            /**
-             * Requested substring in name. Only histograms which have query as a
-substring in their name are extracted. An empty or absent query returns
-all histograms.
-             */
-            query?: string;
-            /**
-             * If true, retrieve delta since last call.
-             */
-            delta?: boolean;
-        }
-        export type getHistogramsReturnValue = {
-            /**
-             * Histograms.
-             */
-            histograms: Histogram[];
-        }
-        /**
-         * Get a Chrome histogram by name.
-         */
-        export type getHistogramParameters = {
-            /**
-             * Requested histogram name.
-             */
-            name: string;
-            /**
-             * If true, retrieve delta since last call.
-             */
-            delta?: boolean;
-        }
-        export type getHistogramReturnValue = {
-            /**
-             * Histogram.
-             */
-            histogram: Histogram;
-        }
-        /**
-         * Get position and size of the browser window.
-         */
-        export type getWindowBoundsParameters = {
-            /**
-             * Browser window id.
-             */
-            windowId: WindowID;
-        }
-        export type getWindowBoundsReturnValue = {
-            /**
-             * Bounds information of the window. When window state is 'minimized', the restored window
-position and size are returned.
-             */
-            bounds: Bounds;
-        }
-        /**
-         * Get the browser window that contains the devtools target.
-         */
-        export type getWindowForTargetParameters = {
-            /**
-             * Devtools agent host id. If called as a part of the session, associated targetId is used.
-             */
-            targetId?: Target.TargetID;
-        }
-        export type getWindowForTargetReturnValue = {
-            /**
-             * Browser window id.
-             */
-            windowId: WindowID;
-            /**
-             * Bounds information of the window. When window state is 'minimized', the restored window
-position and size are returned.
-             */
-            bounds: Bounds;
-        }
-        /**
-         * Set position and/or size of the browser window.
-         */
-        export type setWindowBoundsParameters = {
-            /**
-             * Browser window id.
-             */
-            windowId: WindowID;
-            /**
-             * New window bounds. The 'minimized', 'maximized' and 'fullscreen' states cannot be combined
-with 'left', 'top', 'width' or 'height'. Leaves unspecified fields unchanged.
-             */
-            bounds: Bounds;
-        }
-        export type setWindowBoundsReturnValue = {
-        }
-        /**
-         * Set dock tile details, platform-specific.
-         */
-        export type setDockTileParameters = {
-            badgeLabel?: string;
-            /**
-             * Png encoded image.
-             */
-            image?: binary;
-        }
-        export type setDockTileReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain exposes CSS read/write operations. All CSS objects (stylesheets, rules, and styles)
-have an associated `id` used in subsequent operations on the related object. Each object type has
-a specific `id` structure, and those are not interchangeable between objects of different kinds.
-CSS objects can be loaded using the `get*ForNode()` calls (which accept a DOM node id). A client
-can also keep track of stylesheets via the `styleSheetAdded`/`styleSheetRemoved` events and
-subsequently load the required stylesheet contents using the `getStyleSheet[Text]()` methods.
-     */
-    export module CSS {
-        export type StyleSheetId = string;
-        /**
-         * Stylesheet type: "injected" for stylesheets injected via extension, "user-agent" for user-agent
-stylesheets, "inspector" for stylesheets created by the inspector (i.e. those holding the "via
-inspector" rules), "regular" for regular stylesheets.
-         */
-        export type StyleSheetOrigin = "injected"|"user-agent"|"inspector"|"regular";
-        /**
-         * CSS rule collection for a single pseudo style.
-         */
-        export interface PseudoElementMatches {
-            /**
-             * Pseudo element type.
-             */
-            pseudoType: DOM.PseudoType;
-            /**
-             * Matches of CSS rules applicable to the pseudo style.
-             */
-            matches: RuleMatch[];
-        }
-        /**
-         * Inherited CSS rule collection from ancestor node.
-         */
-        export interface InheritedStyleEntry {
-            /**
-             * The ancestor node's inline style, if any, in the style inheritance chain.
-             */
-            inlineStyle?: CSSStyle;
-            /**
-             * Matches of CSS rules matching the ancestor node in the style inheritance chain.
-             */
-            matchedCSSRules: RuleMatch[];
-        }
-        /**
-         * Match data for a CSS rule.
-         */
-        export interface RuleMatch {
-            /**
-             * CSS rule in the match.
-             */
-            rule: CSSRule;
-            /**
-             * Matching selector indices in the rule's selectorList selectors (0-based).
-             */
-            matchingSelectors: number[];
-        }
-        /**
-         * Data for a simple selector (these are delimited by commas in a selector list).
-         */
-        export interface Value {
-            /**
-             * Value text.
-             */
-            text: string;
-            /**
-             * Value range in the underlying resource (if available).
-             */
-            range?: SourceRange;
-        }
-        /**
-         * Selector list data.
-         */
-        export interface SelectorList {
-            /**
-             * Selectors in the list.
-             */
-            selectors: Value[];
-            /**
-             * Rule selector text.
-             */
-            text: string;
-        }
-        /**
-         * CSS stylesheet metainformation.
-         */
-        export interface CSSStyleSheetHeader {
-            /**
-             * The stylesheet identifier.
-             */
-            styleSheetId: StyleSheetId;
-            /**
-             * Owner frame identifier.
-             */
-            frameId: Page.FrameId;
-            /**
-             * Stylesheet resource URL.
-             */
-            sourceURL: string;
-            /**
-             * URL of source map associated with the stylesheet (if any).
-             */
-            sourceMapURL?: string;
-            /**
-             * Stylesheet origin.
-             */
-            origin: StyleSheetOrigin;
-            /**
-             * Stylesheet title.
-             */
-            title: string;
-            /**
-             * The backend id for the owner node of the stylesheet.
-             */
-            ownerNode?: DOM.BackendNodeId;
-            /**
-             * Denotes whether the stylesheet is disabled.
-             */
-            disabled: boolean;
-            /**
-             * Whether the sourceURL field value comes from the sourceURL comment.
-             */
-            hasSourceURL?: boolean;
-            /**
-             * Whether this stylesheet is created for STYLE tag by parser. This flag is not set for
-document.written STYLE tags.
-             */
-            isInline: boolean;
-            /**
-             * Line offset of the stylesheet within the resource (zero based).
-             */
-            startLine: number;
-            /**
-             * Column offset of the stylesheet within the resource (zero based).
-             */
-            startColumn: number;
-            /**
-             * Size of the content (in characters).
-             */
-            length: number;
-            /**
-             * Line offset of the end of the stylesheet within the resource (zero based).
-             */
-            endLine: number;
-            /**
-             * Column offset of the end of the stylesheet within the resource (zero based).
-             */
-            endColumn: number;
-        }
-        /**
-         * CSS rule representation.
-         */
-        export interface CSSRule {
-            /**
-             * The css style sheet identifier (absent for user agent stylesheet and user-specified
-stylesheet rules) this rule came from.
-             */
-            styleSheetId?: StyleSheetId;
-            /**
-             * Rule selector data.
-             */
-            selectorList: SelectorList;
-            /**
-             * Parent stylesheet's origin.
-             */
-            origin: StyleSheetOrigin;
-            /**
-             * Associated style declaration.
-             */
-            style: CSSStyle;
-            /**
-             * Media list array (for rules involving media queries). The array enumerates media queries
-starting with the innermost one, going outwards.
-             */
-            media?: CSSMedia[];
-        }
-        /**
-         * CSS coverage information.
-         */
-        export interface RuleUsage {
-            /**
-             * The css style sheet identifier (absent for user agent stylesheet and user-specified
-stylesheet rules) this rule came from.
-             */
-            styleSheetId: StyleSheetId;
-            /**
-             * Offset of the start of the rule (including selector) from the beginning of the stylesheet.
-             */
-            startOffset: number;
-            /**
-             * Offset of the end of the rule body from the beginning of the stylesheet.
-             */
-            endOffset: number;
-            /**
-             * Indicates whether the rule was actually used by some element in the page.
-             */
-            used: boolean;
-        }
-        /**
-         * Text range within a resource. All numbers are zero-based.
-         */
-        export interface SourceRange {
-            /**
-             * Start line of range.
-             */
-            startLine: number;
-            /**
-             * Start column of range (inclusive).
-             */
-            startColumn: number;
-            /**
-             * End line of range
-             */
-            endLine: number;
-            /**
-             * End column of range (exclusive).
-             */
-            endColumn: number;
-        }
-        export interface ShorthandEntry {
-            /**
-             * Shorthand name.
-             */
-            name: string;
-            /**
-             * Shorthand value.
-             */
-            value: string;
-            /**
-             * Whether the property has "!important" annotation (implies `false` if absent).
-             */
-            important?: boolean;
-        }
-        export interface CSSComputedStyleProperty {
-            /**
-             * Computed style property name.
-             */
-            name: string;
-            /**
-             * Computed style property value.
-             */
-            value: string;
-        }
-        /**
-         * CSS style representation.
-         */
-        export interface CSSStyle {
-            /**
-             * The css style sheet identifier (absent for user agent stylesheet and user-specified
-stylesheet rules) this rule came from.
-             */
-            styleSheetId?: StyleSheetId;
-            /**
-             * CSS properties in the style.
-             */
-            cssProperties: CSSProperty[];
-            /**
-             * Computed values for all shorthands found in the style.
-             */
-            shorthandEntries: ShorthandEntry[];
-            /**
-             * Style declaration text (if available).
-             */
-            cssText?: string;
-            /**
-             * Style declaration range in the enclosing stylesheet (if available).
-             */
-            range?: SourceRange;
-        }
-        /**
-         * CSS property declaration data.
-         */
-        export interface CSSProperty {
-            /**
-             * The property name.
-             */
-            name: string;
-            /**
-             * The property value.
-             */
-            value: string;
-            /**
-             * Whether the property has "!important" annotation (implies `false` if absent).
-             */
-            important?: boolean;
-            /**
-             * Whether the property is implicit (implies `false` if absent).
-             */
-            implicit?: boolean;
-            /**
-             * The full property text as specified in the style.
-             */
-            text?: string;
-            /**
-             * Whether the property is understood by the browser (implies `true` if absent).
-             */
-            parsedOk?: boolean;
-            /**
-             * Whether the property is disabled by the user (present for source-based properties only).
-             */
-            disabled?: boolean;
-            /**
-             * The entire property range in the enclosing style declaration (if available).
-             */
-            range?: SourceRange;
-        }
-        /**
-         * CSS media rule descriptor.
-         */
-        export interface CSSMedia {
-            /**
-             * Media query text.
-             */
-            text: string;
-            /**
-             * Source of the media query: "mediaRule" if specified by a @media rule, "importRule" if
-specified by an @import rule, "linkedSheet" if specified by a "media" attribute in a linked
-stylesheet's LINK tag, "inlineSheet" if specified by a "media" attribute in an inline
-stylesheet's STYLE tag.
-             */
-            source: "mediaRule"|"importRule"|"linkedSheet"|"inlineSheet";
-            /**
-             * URL of the document containing the media query description.
-             */
-            sourceURL?: string;
-            /**
-             * The associated rule (@media or @import) header range in the enclosing stylesheet (if
-available).
-             */
-            range?: SourceRange;
-            /**
-             * Identifier of the stylesheet containing this object (if exists).
-             */
-            styleSheetId?: StyleSheetId;
-            /**
-             * Array of media queries.
-             */
-            mediaList?: MediaQuery[];
-        }
-        /**
-         * Media query descriptor.
-         */
-        export interface MediaQuery {
-            /**
-             * Array of media query expressions.
-             */
-            expressions: MediaQueryExpression[];
-            /**
-             * Whether the media query condition is satisfied.
-             */
-            active: boolean;
-        }
-        /**
-         * Media query expression descriptor.
-         */
-        export interface MediaQueryExpression {
-            /**
-             * Media query expression value.
-             */
-            value: number;
-            /**
-             * Media query expression units.
-             */
-            unit: string;
-            /**
-             * Media query expression feature.
-             */
-            feature: string;
-            /**
-             * The associated range of the value text in the enclosing stylesheet (if available).
-             */
-            valueRange?: SourceRange;
-            /**
-             * Computed length of media query expression (if applicable).
-             */
-            computedLength?: number;
-        }
-        /**
-         * Information about amount of glyphs that were rendered with given font.
-         */
-        export interface PlatformFontUsage {
-            /**
-             * Font's family name reported by platform.
-             */
-            familyName: string;
-            /**
-             * Indicates if the font was downloaded or resolved locally.
-             */
-            isCustomFont: boolean;
-            /**
-             * Amount of glyphs that were rendered with this font.
-             */
-            glyphCount: number;
-        }
-        /**
-         * Properties of a web font: https://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#font-descriptions
-         */
-        export interface FontFace {
-            /**
-             * The font-family.
-             */
-            fontFamily: string;
-            /**
-             * The font-style.
-             */
-            fontStyle: string;
-            /**
-             * The font-variant.
-             */
-            fontVariant: string;
-            /**
-             * The font-weight.
-             */
-            fontWeight: string;
-            /**
-             * The font-stretch.
-             */
-            fontStretch: string;
-            /**
-             * The unicode-range.
-             */
-            unicodeRange: string;
-            /**
-             * The src.
-             */
-            src: string;
-            /**
-             * The resolved platform font family
-             */
-            platformFontFamily: string;
-        }
-        /**
-         * CSS keyframes rule representation.
-         */
-        export interface CSSKeyframesRule {
-            /**
-             * Animation name.
-             */
-            animationName: Value;
-            /**
-             * List of keyframes.
-             */
-            keyframes: CSSKeyframeRule[];
-        }
-        /**
-         * CSS keyframe rule representation.
-         */
-        export interface CSSKeyframeRule {
-            /**
-             * The css style sheet identifier (absent for user agent stylesheet and user-specified
-stylesheet rules) this rule came from.
-             */
-            styleSheetId?: StyleSheetId;
-            /**
-             * Parent stylesheet's origin.
-             */
-            origin: StyleSheetOrigin;
-            /**
-             * Associated key text.
-             */
-            keyText: Value;
-            /**
-             * Associated style declaration.
-             */
-            style: CSSStyle;
-        }
-        /**
-         * A descriptor of operation to mutate style declaration text.
-         */
-        export interface StyleDeclarationEdit {
-            /**
-             * The css style sheet identifier.
-             */
-            styleSheetId: StyleSheetId;
-            /**
-             * The range of the style text in the enclosing stylesheet.
-             */
-            range: SourceRange;
-            /**
-             * New style text.
-             */
-            text: string;
-        }
-        
-        /**
-         * Fires whenever a web font is updated.  A non-empty font parameter indicates a successfully loaded
-web font
-         */
-        export type fontsUpdatedPayload = {
-            /**
-             * The web font that has loaded.
-             */
-            font?: FontFace;
-        }
-        /**
-         * Fires whenever a MediaQuery result changes (for example, after a browser window has been
-resized.) The current implementation considers only viewport-dependent media features.
-         */
-        export type mediaQueryResultChangedPayload = void;
-        /**
-         * Fired whenever an active document stylesheet is added.
-         */
-        export type styleSheetAddedPayload = {
-            /**
-             * Added stylesheet metainfo.
-             */
-            header: CSSStyleSheetHeader;
-        }
-        /**
-         * Fired whenever a stylesheet is changed as a result of the client operation.
-         */
-        export type styleSheetChangedPayload = {
-            styleSheetId: StyleSheetId;
-        }
-        /**
-         * Fired whenever an active document stylesheet is removed.
-         */
-        export type styleSheetRemovedPayload = {
-            /**
-             * Identifier of the removed stylesheet.
-             */
-            styleSheetId: StyleSheetId;
-        }
-        
-        /**
-         * Inserts a new rule with the given `ruleText` in a stylesheet with given `styleSheetId`, at the
-position specified by `location`.
-         */
-        export type addRuleParameters = {
-            /**
-             * The css style sheet identifier where a new rule should be inserted.
-             */
-            styleSheetId: StyleSheetId;
-            /**
-             * The text of a new rule.
-             */
-            ruleText: string;
-            /**
-             * Text position of a new rule in the target style sheet.
-             */
-            location: SourceRange;
-        }
-        export type addRuleReturnValue = {
-            /**
-             * The newly created rule.
-             */
-            rule: CSSRule;
-        }
-        /**
-         * Returns all class names from specified stylesheet.
-         */
-        export type collectClassNamesParameters = {
-            styleSheetId: StyleSheetId;
-        }
-        export type collectClassNamesReturnValue = {
-            /**
-             * Class name list.
-             */
-            classNames: string[];
-        }
-        /**
-         * Creates a new special "via-inspector" stylesheet in the frame with given `frameId`.
-         */
-        export type createStyleSheetParameters = {
-            /**
-             * Identifier of the frame where "via-inspector" stylesheet should be created.
-             */
-            frameId: Page.FrameId;
-        }
-        export type createStyleSheetReturnValue = {
-            /**
-             * Identifier of the created "via-inspector" stylesheet.
-             */
-            styleSheetId: StyleSheetId;
-        }
-        /**
-         * Disables the CSS agent for the given page.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables the CSS agent for the given page. Clients should not assume that the CSS agent has been
-enabled until the result of this command is received.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Ensures that the given node will have specified pseudo-classes whenever its style is computed by
-the browser.
-         */
-        export type forcePseudoStateParameters = {
-            /**
-             * The element id for which to force the pseudo state.
-             */
-            nodeId: DOM.NodeId;
-            /**
-             * Element pseudo classes to force when computing the element's style.
-             */
-            forcedPseudoClasses: string[];
-        }
-        export type forcePseudoStateReturnValue = {
-        }
-        export type getBackgroundColorsParameters = {
-            /**
-             * Id of the node to get background colors for.
-             */
-            nodeId: DOM.NodeId;
-        }
-        export type getBackgroundColorsReturnValue = {
-            /**
-             * The range of background colors behind this element, if it contains any visible text. If no
-visible text is present, this will be undefined. In the case of a flat background color,
-this will consist of simply that color. In the case of a gradient, this will consist of each
-of the color stops. For anything more complicated, this will be an empty array. Images will
-be ignored (as if the image had failed to load).
-             */
-            backgroundColors?: string[];
-            /**
-             * The computed font size for this node, as a CSS computed value string (e.g. '12px').
-             */
-            computedFontSize?: string;
-            /**
-             * The computed font weight for this node, as a CSS computed value string (e.g. 'normal' or
-'100').
-             */
-            computedFontWeight?: string;
-        }
-        /**
-         * Returns the computed style for a DOM node identified by `nodeId`.
-         */
-        export type getComputedStyleForNodeParameters = {
-            nodeId: DOM.NodeId;
-        }
-        export type getComputedStyleForNodeReturnValue = {
-            /**
-             * Computed style for the specified DOM node.
-             */
-            computedStyle: CSSComputedStyleProperty[];
-        }
-        /**
-         * Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM
-attributes) for a DOM node identified by `nodeId`.
-         */
-        export type getInlineStylesForNodeParameters = {
-            nodeId: DOM.NodeId;
-        }
-        export type getInlineStylesForNodeReturnValue = {
-            /**
-             * Inline style for the specified DOM node.
-             */
-            inlineStyle?: CSSStyle;
-            /**
-             * Attribute-defined element style (e.g. resulting from "width=20 height=100%").
-             */
-            attributesStyle?: CSSStyle;
-        }
-        /**
-         * Returns requested styles for a DOM node identified by `nodeId`.
-         */
-        export type getMatchedStylesForNodeParameters = {
-            nodeId: DOM.NodeId;
-        }
-        export type getMatchedStylesForNodeReturnValue = {
-            /**
-             * Inline style for the specified DOM node.
-             */
-            inlineStyle?: CSSStyle;
-            /**
-             * Attribute-defined element style (e.g. resulting from "width=20 height=100%").
-             */
-            attributesStyle?: CSSStyle;
-            /**
-             * CSS rules matching this node, from all applicable stylesheets.
-             */
-            matchedCSSRules?: RuleMatch[];
-            /**
-             * Pseudo style matches for this node.
-             */
-            pseudoElements?: PseudoElementMatches[];
-            /**
-             * A chain of inherited styles (from the immediate node parent up to the DOM tree root).
-             */
-            inherited?: InheritedStyleEntry[];
-            /**
-             * A list of CSS keyframed animations matching this node.
-             */
-            cssKeyframesRules?: CSSKeyframesRule[];
-        }
-        /**
-         * Returns all media queries parsed by the rendering engine.
-         */
-        export type getMediaQueriesParameters = {
-        }
-        export type getMediaQueriesReturnValue = {
-            medias: CSSMedia[];
-        }
-        /**
-         * Requests information about platform fonts which we used to render child TextNodes in the given
-node.
-         */
-        export type getPlatformFontsForNodeParameters = {
-            nodeId: DOM.NodeId;
-        }
-        export type getPlatformFontsForNodeReturnValue = {
-            /**
-             * Usage statistics for every employed platform font.
-             */
-            fonts: PlatformFontUsage[];
-        }
-        /**
-         * Returns the current textual content for a stylesheet.
-         */
-        export type getStyleSheetTextParameters = {
-            styleSheetId: StyleSheetId;
-        }
-        export type getStyleSheetTextReturnValue = {
-            /**
-             * The stylesheet text.
-             */
-            text: string;
-        }
-        /**
-         * Find a rule with the given active property for the given node and set the new value for this
-property
-         */
-        export type setEffectivePropertyValueForNodeParameters = {
-            /**
-             * The element id for which to set property.
-             */
-            nodeId: DOM.NodeId;
-            propertyName: string;
-            value: string;
-        }
-        export type setEffectivePropertyValueForNodeReturnValue = {
-        }
-        /**
-         * Modifies the keyframe rule key text.
-         */
-        export type setKeyframeKeyParameters = {
-            styleSheetId: StyleSheetId;
-            range: SourceRange;
-            keyText: string;
-        }
-        export type setKeyframeKeyReturnValue = {
-            /**
-             * The resulting key text after modification.
-             */
-            keyText: Value;
-        }
-        /**
-         * Modifies the rule selector.
-         */
-        export type setMediaTextParameters = {
-            styleSheetId: StyleSheetId;
-            range: SourceRange;
-            text: string;
-        }
-        export type setMediaTextReturnValue = {
-            /**
-             * The resulting CSS media rule after modification.
-             */
-            media: CSSMedia;
-        }
-        /**
-         * Modifies the rule selector.
-         */
-        export type setRuleSelectorParameters = {
-            styleSheetId: StyleSheetId;
-            range: SourceRange;
-            selector: string;
-        }
-        export type setRuleSelectorReturnValue = {
-            /**
-             * The resulting selector list after modification.
-             */
-            selectorList: SelectorList;
-        }
-        /**
-         * Sets the new stylesheet text.
-         */
-        export type setStyleSheetTextParameters = {
-            styleSheetId: StyleSheetId;
-            text: string;
-        }
-        export type setStyleSheetTextReturnValue = {
-            /**
-             * URL of source map associated with script (if any).
-             */
-            sourceMapURL?: string;
-        }
-        /**
-         * Applies specified style edits one after another in the given order.
-         */
-        export type setStyleTextsParameters = {
-            edits: StyleDeclarationEdit[];
-        }
-        export type setStyleTextsReturnValue = {
-            /**
-             * The resulting styles after modification.
-             */
-            styles: CSSStyle[];
-        }
-        /**
-         * Enables the selector recording.
-         */
-        export type startRuleUsageTrackingParameters = {
-        }
-        export type startRuleUsageTrackingReturnValue = {
-        }
-        /**
-         * Stop tracking rule usage and return the list of rules that were used since last call to
-`takeCoverageDelta` (or since start of coverage instrumentation)
-         */
-        export type stopRuleUsageTrackingParameters = {
-        }
-        export type stopRuleUsageTrackingReturnValue = {
-            ruleUsage: RuleUsage[];
-        }
-        /**
-         * Obtain list of rules that became used since last call to this method (or since start of coverage
-instrumentation)
-         */
-        export type takeCoverageDeltaParameters = {
-        }
-        export type takeCoverageDeltaReturnValue = {
-            coverage: RuleUsage[];
-            /**
-             * Monotonically increasing time, in seconds.
-             */
-            timestamp: number;
-        }
-    }
-    
-    export module CacheStorage {
-        /**
-         * Unique identifier of the Cache object.
-         */
-        export type CacheId = string;
-        /**
-         * type of HTTP response cached
-         */
-        export type CachedResponseType = "basic"|"cors"|"default"|"error"|"opaqueResponse"|"opaqueRedirect";
-        /**
-         * Data entry.
-         */
-        export interface DataEntry {
-            /**
-             * Request URL.
-             */
-            requestURL: string;
-            /**
-             * Request method.
-             */
-            requestMethod: string;
-            /**
-             * Request headers
-             */
-            requestHeaders: Header[];
-            /**
-             * Number of seconds since epoch.
-             */
-            responseTime: number;
-            /**
-             * HTTP response status code.
-             */
-            responseStatus: number;
-            /**
-             * HTTP response status text.
-             */
-            responseStatusText: string;
-            /**
-             * HTTP response type
-             */
-            responseType: CachedResponseType;
-            /**
-             * Response headers
-             */
-            responseHeaders: Header[];
-        }
-        /**
-         * Cache identifier.
-         */
-        export interface Cache {
-            /**
-             * An opaque unique id of the cache.
-             */
-            cacheId: CacheId;
-            /**
-             * Security origin of the cache.
-             */
-            securityOrigin: string;
-            /**
-             * The name of the cache.
-             */
-            cacheName: string;
-        }
-        export interface Header {
-            name: string;
-            value: string;
-        }
-        /**
-         * Cached response
-         */
-        export interface CachedResponse {
-            /**
-             * Entry content, base64-encoded.
-             */
-            body: binary;
-        }
-        
-        
-        /**
-         * Deletes a cache.
-         */
-        export type deleteCacheParameters = {
-            /**
-             * Id of cache for deletion.
-             */
-            cacheId: CacheId;
-        }
-        export type deleteCacheReturnValue = {
-        }
-        /**
-         * Deletes a cache entry.
-         */
-        export type deleteEntryParameters = {
-            /**
-             * Id of cache where the entry will be deleted.
-             */
-            cacheId: CacheId;
-            /**
-             * URL spec of the request.
-             */
-            request: string;
-        }
-        export type deleteEntryReturnValue = {
-        }
-        /**
-         * Requests cache names.
-         */
-        export type requestCacheNamesParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-        }
-        export type requestCacheNamesReturnValue = {
-            /**
-             * Caches for the security origin.
-             */
-            caches: Cache[];
-        }
-        /**
-         * Fetches cache entry.
-         */
-        export type requestCachedResponseParameters = {
-            /**
-             * Id of cache that contains the entry.
-             */
-            cacheId: CacheId;
-            /**
-             * URL spec of the request.
-             */
-            requestURL: string;
-            /**
-             * headers of the request.
-             */
-            requestHeaders: Header[];
-        }
-        export type requestCachedResponseReturnValue = {
-            /**
-             * Response read from the cache.
-             */
-            response: CachedResponse;
-        }
-        /**
-         * Requests data from cache.
-         */
-        export type requestEntriesParameters = {
-            /**
-             * ID of cache to get entries from.
-             */
-            cacheId: CacheId;
-            /**
-             * Number of records to skip.
-             */
-            skipCount?: number;
-            /**
-             * Number of records to fetch.
-             */
-            pageSize?: number;
-            /**
-             * If present, only return the entries containing this substring in the path
-             */
-            pathFilter?: string;
-        }
-        export type requestEntriesReturnValue = {
-            /**
-             * Array of object store data entries.
-             */
-            cacheDataEntries: DataEntry[];
-            /**
-             * Count of returned entries from this storage. If pathFilter is empty, it
-is the count of all entries from this storage.
-             */
-            returnCount: number;
-        }
-    }
-    
-    /**
-     * A domain for interacting with Cast, Presentation API, and Remote Playback API
-functionalities.
-     */
-    export module Cast {
-        export interface Sink {
-            name: string;
-            id: string;
-            /**
-             * Text describing the current session. Present only if there is an active
-session on the sink.
-             */
-            session?: string;
-        }
-        
-        /**
-         * This is fired whenever the list of available sinks changes. A sink is a
-device or a software surface that you can cast to.
-         */
-        export type sinksUpdatedPayload = {
-            sinks: Sink[];
-        }
-        /**
-         * This is fired whenever the outstanding issue/error message changes.
-|issueMessage| is empty if there is no issue.
-         */
-        export type issueUpdatedPayload = {
-            issueMessage: string;
-        }
-        
-        /**
-         * Starts observing for sinks that can be used for tab mirroring, and if set,
-sinks compatible with |presentationUrl| as well. When sinks are found, a
-|sinksUpdated| event is fired.
-Also starts observing for issue messages. When an issue is added or removed,
-an |issueUpdated| event is fired.
-         */
-        export type enableParameters = {
-            presentationUrl?: string;
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Stops observing for sinks and issues.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Sets a sink to be used when the web page requests the browser to choose a
-sink via Presentation API, Remote Playback API, or Cast SDK.
-         */
-        export type setSinkToUseParameters = {
-            sinkName: string;
-        }
-        export type setSinkToUseReturnValue = {
-        }
-        /**
-         * Starts mirroring the tab to the sink.
-         */
-        export type startTabMirroringParameters = {
-            sinkName: string;
-        }
-        export type startTabMirroringReturnValue = {
-        }
-        /**
-         * Stops the active Cast session on the sink.
-         */
-        export type stopCastingParameters = {
-            sinkName: string;
-        }
-        export type stopCastingReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain exposes DOM read/write operations. Each DOM Node is represented with its mirror object
-that has an `id`. This `id` can be used to get additional information on the Node, resolve it into
-the JavaScript object wrapper, etc. It is important that client receives DOM events only for the
-nodes that are known to the client. Backend keeps track of the nodes that were sent to the client
-and never sends the same node twice. It is client's responsibility to collect information about
-the nodes that were sent to the client.<p>Note that `iframe` owner elements will return
-corresponding document elements as their child nodes.</p>
-     */
-    export module DOM {
-        /**
-         * Unique DOM node identifier.
-         */
-        export type NodeId = number;
-        /**
-         * Unique DOM node identifier used to reference a node that may not have been pushed to the
-front-end.
-         */
-        export type BackendNodeId = number;
-        /**
-         * Backend node with a friendly name.
-         */
-        export interface BackendNode {
-            /**
-             * `Node`'s nodeType.
-             */
-            nodeType: number;
-            /**
-             * `Node`'s nodeName.
-             */
-            nodeName: string;
-            backendNodeId: BackendNodeId;
-        }
-        /**
-         * Pseudo element type.
-         */
-        export type PseudoType = "first-line"|"first-letter"|"before"|"after"|"marker"|"backdrop"|"selection"|"first-line-inherited"|"scrollbar"|"scrollbar-thumb"|"scrollbar-button"|"scrollbar-track"|"scrollbar-track-piece"|"scrollbar-corner"|"resizer"|"input-list-button";
-        /**
-         * Shadow root type.
-         */
-        export type ShadowRootType = "user-agent"|"open"|"closed";
-        /**
-         * DOM interaction is implemented in terms of mirror objects that represent the actual DOM nodes.
-DOMNode is a base node mirror type.
-         */
-        export interface Node {
-            /**
-             * Node identifier that is passed into the rest of the DOM messages as the `nodeId`. Backend
-will only push node with given `id` once. It is aware of all requested nodes and will only
-fire DOM events for nodes known to the client.
-             */
-            nodeId: NodeId;
-            /**
-             * The id of the parent node if any.
-             */
-            parentId?: NodeId;
-            /**
-             * The BackendNodeId for this node.
-             */
-            backendNodeId: BackendNodeId;
-            /**
-             * `Node`'s nodeType.
-             */
-            nodeType: number;
-            /**
-             * `Node`'s nodeName.
-             */
-            nodeName: string;
-            /**
-             * `Node`'s localName.
-             */
-            localName: string;
-            /**
-             * `Node`'s nodeValue.
-             */
-            nodeValue: string;
-            /**
-             * Child count for `Container` nodes.
-             */
-            childNodeCount?: number;
-            /**
-             * Child nodes of this node when requested with children.
-             */
-            children?: Node[];
-            /**
-             * Attributes of the `Element` node in the form of flat array `[name1, value1, name2, value2]`.
-             */
-            attributes?: string[];
-            /**
-             * Document URL that `Document` or `FrameOwner` node points to.
-             */
-            documentURL?: string;
-            /**
-             * Base URL that `Document` or `FrameOwner` node uses for URL completion.
-             */
-            baseURL?: string;
-            /**
-             * `DocumentType`'s publicId.
-             */
-            publicId?: string;
-            /**
-             * `DocumentType`'s systemId.
-             */
-            systemId?: string;
-            /**
-             * `DocumentType`'s internalSubset.
-             */
-            internalSubset?: string;
-            /**
-             * `Document`'s XML version in case of XML documents.
-             */
-            xmlVersion?: string;
-            /**
-             * `Attr`'s name.
-             */
-            name?: string;
-            /**
-             * `Attr`'s value.
-             */
-            value?: string;
-            /**
-             * Pseudo element type for this node.
-             */
-            pseudoType?: PseudoType;
-            /**
-             * Shadow root type.
-             */
-            shadowRootType?: ShadowRootType;
-            /**
-             * Frame ID for frame owner elements.
-             */
-            frameId?: Page.FrameId;
-            /**
-             * Content document for frame owner elements.
-             */
-            contentDocument?: Node;
-            /**
-             * Shadow root list for given element host.
-             */
-            shadowRoots?: Node[];
-            /**
-             * Content document fragment for template elements.
-             */
-            templateContent?: Node;
-            /**
-             * Pseudo elements associated with this node.
-             */
-            pseudoElements?: Node[];
-            /**
-             * Import document for the HTMLImport links.
-             */
-            importedDocument?: Node;
-            /**
-             * Distributed nodes for given insertion point.
-             */
-            distributedNodes?: BackendNode[];
-            /**
-             * Whether the node is SVG.
-             */
-            isSVG?: boolean;
-        }
-        /**
-         * A structure holding an RGBA color.
-         */
-        export interface RGBA {
-            /**
-             * The red component, in the [0-255] range.
-             */
-            r: number;
-            /**
-             * The green component, in the [0-255] range.
-             */
-            g: number;
-            /**
-             * The blue component, in the [0-255] range.
-             */
-            b: number;
-            /**
-             * The alpha component, in the [0-1] range (default: 1).
-             */
-            a?: number;
-        }
-        /**
-         * An array of quad vertices, x immediately followed by y for each point, points clock-wise.
-         */
-        export type Quad = number[];
-        /**
-         * Box model.
-         */
-        export interface BoxModel {
-            /**
-             * Content box
-             */
-            content: Quad;
-            /**
-             * Padding box
-             */
-            padding: Quad;
-            /**
-             * Border box
-             */
-            border: Quad;
-            /**
-             * Margin box
-             */
-            margin: Quad;
-            /**
-             * Node width
-             */
-            width: number;
-            /**
-             * Node height
-             */
-            height: number;
-            /**
-             * Shape outside coordinates
-             */
-            shapeOutside?: ShapeOutsideInfo;
-        }
-        /**
-         * CSS Shape Outside details.
-         */
-        export interface ShapeOutsideInfo {
-            /**
-             * Shape bounds
-             */
-            bounds: Quad;
-            /**
-             * Shape coordinate details
-             */
-            shape: any[];
-            /**
-             * Margin shape bounds
-             */
-            marginShape: any[];
-        }
-        /**
-         * Rectangle.
-         */
-        export interface Rect {
-            /**
-             * X coordinate
-             */
-            x: number;
-            /**
-             * Y coordinate
-             */
-            y: number;
-            /**
-             * Rectangle width
-             */
-            width: number;
-            /**
-             * Rectangle height
-             */
-            height: number;
-        }
-        
-        /**
-         * Fired when `Element`'s attribute is modified.
-         */
-        export type attributeModifiedPayload = {
-            /**
-             * Id of the node that has changed.
-             */
-            nodeId: NodeId;
-            /**
-             * Attribute name.
-             */
-            name: string;
-            /**
-             * Attribute value.
-             */
-            value: string;
-        }
-        /**
-         * Fired when `Element`'s attribute is removed.
-         */
-        export type attributeRemovedPayload = {
-            /**
-             * Id of the node that has changed.
-             */
-            nodeId: NodeId;
-            /**
-             * A ttribute name.
-             */
-            name: string;
-        }
-        /**
-         * Mirrors `DOMCharacterDataModified` event.
-         */
-        export type characterDataModifiedPayload = {
-            /**
-             * Id of the node that has changed.
-             */
-            nodeId: NodeId;
-            /**
-             * New text value.
-             */
-            characterData: string;
-        }
-        /**
-         * Fired when `Container`'s child node count has changed.
-         */
-        export type childNodeCountUpdatedPayload = {
-            /**
-             * Id of the node that has changed.
-             */
-            nodeId: NodeId;
-            /**
-             * New node count.
-             */
-            childNodeCount: number;
-        }
-        /**
-         * Mirrors `DOMNodeInserted` event.
-         */
-        export type childNodeInsertedPayload = {
-            /**
-             * Id of the node that has changed.
-             */
-            parentNodeId: NodeId;
-            /**
-             * If of the previous siblint.
-             */
-            previousNodeId: NodeId;
-            /**
-             * Inserted node data.
-             */
-            node: Node;
-        }
-        /**
-         * Mirrors `DOMNodeRemoved` event.
-         */
-        export type childNodeRemovedPayload = {
-            /**
-             * Parent id.
-             */
-            parentNodeId: NodeId;
-            /**
-             * Id of the node that has been removed.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Called when distrubution is changed.
-         */
-        export type distributedNodesUpdatedPayload = {
-            /**
-             * Insertion point where distrubuted nodes were updated.
-             */
-            insertionPointId: NodeId;
-            /**
-             * Distributed nodes for given insertion point.
-             */
-            distributedNodes: BackendNode[];
-        }
-        /**
-         * Fired when `Document` has been totally updated. Node ids are no longer valid.
-         */
-        export type documentUpdatedPayload = void;
-        /**
-         * Fired when `Element`'s inline style is modified via a CSS property modification.
-         */
-        export type inlineStyleInvalidatedPayload = {
-            /**
-             * Ids of the nodes for which the inline styles have been invalidated.
-             */
-            nodeIds: NodeId[];
-        }
-        /**
-         * Called when a pseudo element is added to an element.
-         */
-        export type pseudoElementAddedPayload = {
-            /**
-             * Pseudo element's parent element id.
-             */
-            parentId: NodeId;
-            /**
-             * The added pseudo element.
-             */
-            pseudoElement: Node;
-        }
-        /**
-         * Called when a pseudo element is removed from an element.
-         */
-        export type pseudoElementRemovedPayload = {
-            /**
-             * Pseudo element's parent element id.
-             */
-            parentId: NodeId;
-            /**
-             * The removed pseudo element id.
-             */
-            pseudoElementId: NodeId;
-        }
-        /**
-         * Fired when backend wants to provide client with the missing DOM structure. This happens upon
-most of the calls requesting node ids.
-         */
-        export type setChildNodesPayload = {
-            /**
-             * Parent node id to populate with children.
-             */
-            parentId: NodeId;
-            /**
-             * Child nodes array.
-             */
-            nodes: Node[];
-        }
-        /**
-         * Called when shadow root is popped from the element.
-         */
-        export type shadowRootPoppedPayload = {
-            /**
-             * Host element id.
-             */
-            hostId: NodeId;
-            /**
-             * Shadow root id.
-             */
-            rootId: NodeId;
-        }
-        /**
-         * Called when shadow root is pushed into the element.
-         */
-        export type shadowRootPushedPayload = {
-            /**
-             * Host element id.
-             */
-            hostId: NodeId;
-            /**
-             * Shadow root.
-             */
-            root: Node;
-        }
-        
-        /**
-         * Collects class names for the node with given id and all of it's child nodes.
-         */
-        export type collectClassNamesFromSubtreeParameters = {
-            /**
-             * Id of the node to collect class names.
-             */
-            nodeId: NodeId;
-        }
-        export type collectClassNamesFromSubtreeReturnValue = {
-            /**
-             * Class name list.
-             */
-            classNames: string[];
-        }
-        /**
-         * Creates a deep copy of the specified node and places it into the target container before the
-given anchor.
-         */
-        export type copyToParameters = {
-            /**
-             * Id of the node to copy.
-             */
-            nodeId: NodeId;
-            /**
-             * Id of the element to drop the copy into.
-             */
-            targetNodeId: NodeId;
-            /**
-             * Drop the copy before this node (if absent, the copy becomes the last child of
-`targetNodeId`).
-             */
-            insertBeforeNodeId?: NodeId;
-        }
-        export type copyToReturnValue = {
-            /**
-             * Id of the node clone.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Describes node given its id, does not require domain to be enabled. Does not start tracking any
-objects, can be used for automation.
-         */
-        export type describeNodeParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-            /**
-             * The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the
-entire subtree or provide an integer larger than 0.
-             */
-            depth?: number;
-            /**
-             * Whether or not iframes and shadow roots should be traversed when returning the subtree
-(default is false).
-             */
-            pierce?: boolean;
-        }
-        export type describeNodeReturnValue = {
-            /**
-             * Node description.
-             */
-            node: Node;
-        }
-        /**
-         * Scrolls the specified rect of the given node into view if not already visible.
-Note: exactly one between nodeId, backendNodeId and objectId should be passed
-to identify the node.
-         */
-        export type scrollIntoViewIfNeededParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-            /**
-             * The rect to be scrolled into view, relative to the node's border box, in CSS pixels.
-When omitted, center of the node will be used, similar to Element.scrollIntoView.
-             */
-            rect?: Rect;
-        }
-        export type scrollIntoViewIfNeededReturnValue = {
-        }
-        /**
-         * Disables DOM agent for the given page.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Discards search results from the session with the given id. `getSearchResults` should no longer
-be called for that search.
-         */
-        export type discardSearchResultsParameters = {
-            /**
-             * Unique search session identifier.
-             */
-            searchId: string;
-        }
-        export type discardSearchResultsReturnValue = {
-        }
-        /**
-         * Enables DOM agent for the given page.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Focuses the given element.
-         */
-        export type focusParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-        }
-        export type focusReturnValue = {
-        }
-        /**
-         * Returns attributes for the specified node.
-         */
-        export type getAttributesParameters = {
-            /**
-             * Id of the node to retrieve attibutes for.
-             */
-            nodeId: NodeId;
-        }
-        export type getAttributesReturnValue = {
-            /**
-             * An interleaved array of node attribute names and values.
-             */
-            attributes: string[];
-        }
-        /**
-         * Returns boxes for the given node.
-         */
-        export type getBoxModelParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-        }
-        export type getBoxModelReturnValue = {
-            /**
-             * Box model for the node.
-             */
-            model: BoxModel;
-        }
-        /**
-         * Returns quads that describe node position on the page. This method
-might return multiple quads for inline nodes.
-         */
-        export type getContentQuadsParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-        }
-        export type getContentQuadsReturnValue = {
-            /**
-             * Quads that describe node layout relative to viewport.
-             */
-            quads: Quad[];
-        }
-        /**
-         * Returns the root DOM node (and optionally the subtree) to the caller.
-         */
-        export type getDocumentParameters = {
-            /**
-             * The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the
-entire subtree or provide an integer larger than 0.
-             */
-            depth?: number;
-            /**
-             * Whether or not iframes and shadow roots should be traversed when returning the subtree
-(default is false).
-             */
-            pierce?: boolean;
-        }
-        export type getDocumentReturnValue = {
-            /**
-             * Resulting node.
-             */
-            root: Node;
-        }
-        /**
-         * Returns the root DOM node (and optionally the subtree) to the caller.
-         */
-        export type getFlattenedDocumentParameters = {
-            /**
-             * The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the
-entire subtree or provide an integer larger than 0.
-             */
-            depth?: number;
-            /**
-             * Whether or not iframes and shadow roots should be traversed when returning the subtree
-(default is false).
-             */
-            pierce?: boolean;
-        }
-        export type getFlattenedDocumentReturnValue = {
-            /**
-             * Resulting node.
-             */
-            nodes: Node[];
-        }
-        /**
-         * Returns node id at given location. Depending on whether DOM domain is enabled, nodeId is
-either returned or not.
-         */
-        export type getNodeForLocationParameters = {
-            /**
-             * X coordinate.
-             */
-            x: number;
-            /**
-             * Y coordinate.
-             */
-            y: number;
-            /**
-             * False to skip to the nearest non-UA shadow root ancestor (default: false).
-             */
-            includeUserAgentShadowDOM?: boolean;
-            /**
-             * Whether to ignore pointer-events: none on elements and hit test them.
-             */
-            ignorePointerEventsNone?: boolean;
-        }
-        export type getNodeForLocationReturnValue = {
-            /**
-             * Resulting node.
-             */
-            backendNodeId: BackendNodeId;
-            /**
-             * Frame this node belongs to.
-             */
-            frameId: Page.FrameId;
-            /**
-             * Id of the node at given coordinates, only when enabled and requested document.
-             */
-            nodeId?: NodeId;
-        }
-        /**
-         * Returns node's HTML markup.
-         */
-        export type getOuterHTMLParameters = {
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-        }
-        export type getOuterHTMLReturnValue = {
-            /**
-             * Outer HTML markup.
-             */
-            outerHTML: string;
-        }
-        /**
-         * Returns the id of the nearest ancestor that is a relayout boundary.
-         */
-        export type getRelayoutBoundaryParameters = {
-            /**
-             * Id of the node.
-             */
-            nodeId: NodeId;
-        }
-        export type getRelayoutBoundaryReturnValue = {
-            /**
-             * Relayout boundary node id for the given node.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Returns search results from given `fromIndex` to given `toIndex` from the search with the given
-identifier.
-         */
-        export type getSearchResultsParameters = {
-            /**
-             * Unique search session identifier.
-             */
-            searchId: string;
-            /**
-             * Start index of the search result to be returned.
-             */
-            fromIndex: number;
-            /**
-             * End index of the search result to be returned.
-             */
-            toIndex: number;
-        }
-        export type getSearchResultsReturnValue = {
-            /**
-             * Ids of the search result nodes.
-             */
-            nodeIds: NodeId[];
-        }
-        /**
-         * Hides any highlight.
-         */
-        export type hideHighlightParameters = {
-        }
-        export type hideHighlightReturnValue = {
-        }
-        /**
-         * Highlights DOM node.
-         */
-        export type highlightNodeParameters = {
-        }
-        export type highlightNodeReturnValue = {
-        }
-        /**
-         * Highlights given rectangle.
-         */
-        export type highlightRectParameters = {
-        }
-        export type highlightRectReturnValue = {
-        }
-        /**
-         * Marks last undoable state.
-         */
-        export type markUndoableStateParameters = {
-        }
-        export type markUndoableStateReturnValue = {
-        }
-        /**
-         * Moves node into the new container, places it before the given anchor.
-         */
-        export type moveToParameters = {
-            /**
-             * Id of the node to move.
-             */
-            nodeId: NodeId;
-            /**
-             * Id of the element to drop the moved node into.
-             */
-            targetNodeId: NodeId;
-            /**
-             * Drop node before this one (if absent, the moved node becomes the last child of
-`targetNodeId`).
-             */
-            insertBeforeNodeId?: NodeId;
-        }
-        export type moveToReturnValue = {
-            /**
-             * New id of the moved node.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Searches for a given string in the DOM tree. Use `getSearchResults` to access search results or
-`cancelSearch` to end this search session.
-         */
-        export type performSearchParameters = {
-            /**
-             * Plain text or query selector or XPath search query.
-             */
-            query: string;
-            /**
-             * True to search in user agent shadow DOM.
-             */
-            includeUserAgentShadowDOM?: boolean;
-        }
-        export type performSearchReturnValue = {
-            /**
-             * Unique search session identifier.
-             */
-            searchId: string;
-            /**
-             * Number of search results.
-             */
-            resultCount: number;
-        }
-        /**
-         * Requests that the node is sent to the caller given its path. // FIXME, use XPath
-         */
-        export type pushNodeByPathToFrontendParameters = {
-            /**
-             * Path to node in the proprietary format.
-             */
-            path: string;
-        }
-        export type pushNodeByPathToFrontendReturnValue = {
-            /**
-             * Id of the node for given path.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Requests that a batch of nodes is sent to the caller given their backend node ids.
-         */
-        export type pushNodesByBackendIdsToFrontendParameters = {
-            /**
-             * The array of backend node ids.
-             */
-            backendNodeIds: BackendNodeId[];
-        }
-        export type pushNodesByBackendIdsToFrontendReturnValue = {
-            /**
-             * The array of ids of pushed nodes that correspond to the backend ids specified in
-backendNodeIds.
-             */
-            nodeIds: NodeId[];
-        }
-        /**
-         * Executes `querySelector` on a given node.
-         */
-        export type querySelectorParameters = {
-            /**
-             * Id of the node to query upon.
-             */
-            nodeId: NodeId;
-            /**
-             * Selector string.
-             */
-            selector: string;
-        }
-        export type querySelectorReturnValue = {
-            /**
-             * Query selector result.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Executes `querySelectorAll` on a given node.
-         */
-        export type querySelectorAllParameters = {
-            /**
-             * Id of the node to query upon.
-             */
-            nodeId: NodeId;
-            /**
-             * Selector string.
-             */
-            selector: string;
-        }
-        export type querySelectorAllReturnValue = {
-            /**
-             * Query selector result.
-             */
-            nodeIds: NodeId[];
-        }
-        /**
-         * Re-does the last undone action.
-         */
-        export type redoParameters = {
-        }
-        export type redoReturnValue = {
-        }
-        /**
-         * Removes attribute with given name from an element with given id.
-         */
-        export type removeAttributeParameters = {
-            /**
-             * Id of the element to remove attribute from.
-             */
-            nodeId: NodeId;
-            /**
-             * Name of the attribute to remove.
-             */
-            name: string;
-        }
-        export type removeAttributeReturnValue = {
-        }
-        /**
-         * Removes node with given id.
-         */
-        export type removeNodeParameters = {
-            /**
-             * Id of the node to remove.
-             */
-            nodeId: NodeId;
-        }
-        export type removeNodeReturnValue = {
-        }
-        /**
-         * Requests that children of the node with given id are returned to the caller in form of
-`setChildNodes` events where not only immediate children are retrieved, but all children down to
-the specified depth.
-         */
-        export type requestChildNodesParameters = {
-            /**
-             * Id of the node to get children for.
-             */
-            nodeId: NodeId;
-            /**
-             * The maximum depth at which children should be retrieved, defaults to 1. Use -1 for the
-entire subtree or provide an integer larger than 0.
-             */
-            depth?: number;
-            /**
-             * Whether or not iframes and shadow roots should be traversed when returning the sub-tree
-(default is false).
-             */
-            pierce?: boolean;
-        }
-        export type requestChildNodesReturnValue = {
-        }
-        /**
-         * Requests that the node is sent to the caller given the JavaScript node object reference. All
-nodes that form the path from the node to the root are also sent to the client as a series of
-`setChildNodes` notifications.
-         */
-        export type requestNodeParameters = {
-            /**
-             * JavaScript object id to convert into node.
-             */
-            objectId: Runtime.RemoteObjectId;
-        }
-        export type requestNodeReturnValue = {
-            /**
-             * Node id for given object.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Resolves the JavaScript node object for a given NodeId or BackendNodeId.
-         */
-        export type resolveNodeParameters = {
-            /**
-             * Id of the node to resolve.
-             */
-            nodeId?: NodeId;
-            /**
-             * Backend identifier of the node to resolve.
-             */
-            backendNodeId?: DOM.BackendNodeId;
-            /**
-             * Symbolic group name that can be used to release multiple objects.
-             */
-            objectGroup?: string;
-            /**
-             * Execution context in which to resolve the node.
-             */
-            executionContextId?: Runtime.ExecutionContextId;
-        }
-        export type resolveNodeReturnValue = {
-            /**
-             * JavaScript object wrapper for given node.
-             */
-            object: Runtime.RemoteObject;
-        }
-        /**
-         * Sets attribute for an element with given id.
-         */
-        export type setAttributeValueParameters = {
-            /**
-             * Id of the element to set attribute for.
-             */
-            nodeId: NodeId;
-            /**
-             * Attribute name.
-             */
-            name: string;
-            /**
-             * Attribute value.
-             */
-            value: string;
-        }
-        export type setAttributeValueReturnValue = {
-        }
-        /**
-         * Sets attributes on element with given id. This method is useful when user edits some existing
-attribute value and types in several attribute name/value pairs.
-         */
-        export type setAttributesAsTextParameters = {
-            /**
-             * Id of the element to set attributes for.
-             */
-            nodeId: NodeId;
-            /**
-             * Text with a number of attributes. Will parse this text using HTML parser.
-             */
-            text: string;
-            /**
-             * Attribute name to replace with new attributes derived from text in case text parsed
-successfully.
-             */
-            name?: string;
-        }
-        export type setAttributesAsTextReturnValue = {
-        }
-        /**
-         * Sets files for the given file input element.
-         */
-        export type setFileInputFilesParameters = {
-            /**
-             * Array of file paths to set.
-             */
-            files: string[];
-            /**
-             * Identifier of the node.
-             */
-            nodeId?: NodeId;
-            /**
-             * Identifier of the backend node.
-             */
-            backendNodeId?: BackendNodeId;
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId?: Runtime.RemoteObjectId;
-        }
-        export type setFileInputFilesReturnValue = {
-        }
-        /**
-         * Sets if stack traces should be captured for Nodes. See `Node.getNodeStackTraces`. Default is disabled.
-         */
-        export type setNodeStackTracesEnabledParameters = {
-            /**
-             * Enable or disable.
-             */
-            enable: boolean;
-        }
-        export type setNodeStackTracesEnabledReturnValue = {
-        }
-        /**
-         * Gets stack traces associated with a Node. As of now, only provides stack trace for Node creation.
-         */
-        export type getNodeStackTracesParameters = {
-            /**
-             * Id of the node to get stack traces for.
-             */
-            nodeId: NodeId;
-        }
-        export type getNodeStackTracesReturnValue = {
-            /**
-             * Creation stack trace, if available.
-             */
-            creation?: Runtime.StackTrace;
-        }
-        /**
-         * Returns file information for the given
-File wrapper.
-         */
-        export type getFileInfoParameters = {
-            /**
-             * JavaScript object id of the node wrapper.
-             */
-            objectId: Runtime.RemoteObjectId;
-        }
-        export type getFileInfoReturnValue = {
-            path: string;
-        }
-        /**
-         * Enables console to refer to the node with given id via $x (see Command Line API for more details
-$x functions).
-         */
-        export type setInspectedNodeParameters = {
-            /**
-             * DOM node id to be accessible by means of $x command line API.
-             */
-            nodeId: NodeId;
-        }
-        export type setInspectedNodeReturnValue = {
-        }
-        /**
-         * Sets node name for a node with given id.
-         */
-        export type setNodeNameParameters = {
-            /**
-             * Id of the node to set name for.
-             */
-            nodeId: NodeId;
-            /**
-             * New node's name.
-             */
-            name: string;
-        }
-        export type setNodeNameReturnValue = {
-            /**
-             * New node's id.
-             */
-            nodeId: NodeId;
-        }
-        /**
-         * Sets node value for a node with given id.
-         */
-        export type setNodeValueParameters = {
-            /**
-             * Id of the node to set value for.
-             */
-            nodeId: NodeId;
-            /**
-             * New node's value.
-             */
-            value: string;
-        }
-        export type setNodeValueReturnValue = {
-        }
-        /**
-         * Sets node HTML markup, returns new node id.
-         */
-        export type setOuterHTMLParameters = {
-            /**
-             * Id of the node to set markup for.
-             */
-            nodeId: NodeId;
-            /**
-             * Outer HTML markup to set.
-             */
-            outerHTML: string;
-        }
-        export type setOuterHTMLReturnValue = {
-        }
-        /**
-         * Undoes the last performed action.
-         */
-        export type undoParameters = {
-        }
-        export type undoReturnValue = {
-        }
-        /**
-         * Returns iframe node that owns iframe with the given domain.
-         */
-        export type getFrameOwnerParameters = {
-            frameId: Page.FrameId;
-        }
-        export type getFrameOwnerReturnValue = {
-            /**
-             * Resulting node.
-             */
-            backendNodeId: BackendNodeId;
-            /**
-             * Id of the node at given coordinates, only when enabled and requested document.
-             */
-            nodeId?: NodeId;
-        }
-    }
-    
-    /**
-     * DOM debugging allows setting breakpoints on particular DOM operations and events. JavaScript
-execution will stop on these operations as if there was a regular breakpoint set.
-     */
-    export module DOMDebugger {
-        /**
-         * DOM breakpoint type.
-         */
-        export type DOMBreakpointType = "subtree-modified"|"attribute-modified"|"node-removed";
-        /**
-         * Object event listener.
-         */
-        export interface EventListener {
-            /**
-             * `EventListener`'s type.
-             */
-            type: string;
-            /**
-             * `EventListener`'s useCapture.
-             */
-            useCapture: boolean;
-            /**
-             * `EventListener`'s passive flag.
-             */
-            passive: boolean;
-            /**
-             * `EventListener`'s once flag.
-             */
-            once: boolean;
-            /**
-             * Script id of the handler code.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * Line number in the script (0-based).
-             */
-            lineNumber: number;
-            /**
-             * Column number in the script (0-based).
-             */
-            columnNumber: number;
-            /**
-             * Event handler function value.
-             */
-            handler?: Runtime.RemoteObject;
-            /**
-             * Event original handler function value.
-             */
-            originalHandler?: Runtime.RemoteObject;
-            /**
-             * Node the listener is added to (if any).
-             */
-            backendNodeId?: DOM.BackendNodeId;
-        }
-        
-        
-        /**
-         * Returns event listeners of the given object.
-         */
-        export type getEventListenersParameters = {
-            /**
-             * Identifier of the object to return listeners for.
-             */
-            objectId: Runtime.RemoteObjectId;
-            /**
-             * The maximum depth at which Node children should be retrieved, defaults to 1. Use -1 for the
-entire subtree or provide an integer larger than 0.
-             */
-            depth?: number;
-            /**
-             * Whether or not iframes and shadow roots should be traversed when returning the subtree
-(default is false). Reports listeners for all contexts if pierce is enabled.
-             */
-            pierce?: boolean;
-        }
-        export type getEventListenersReturnValue = {
-            /**
-             * Array of relevant listeners.
-             */
-            listeners: EventListener[];
-        }
-        /**
-         * Removes DOM breakpoint that was set using `setDOMBreakpoint`.
-         */
-        export type removeDOMBreakpointParameters = {
-            /**
-             * Identifier of the node to remove breakpoint from.
-             */
-            nodeId: DOM.NodeId;
-            /**
-             * Type of the breakpoint to remove.
-             */
-            type: DOMBreakpointType;
-        }
-        export type removeDOMBreakpointReturnValue = {
-        }
-        /**
-         * Removes breakpoint on particular DOM event.
-         */
-        export type removeEventListenerBreakpointParameters = {
-            /**
-             * Event name.
-             */
-            eventName: string;
-            /**
-             * EventTarget interface name.
-             */
-            targetName?: string;
-        }
-        export type removeEventListenerBreakpointReturnValue = {
-        }
-        /**
-         * Removes breakpoint on particular native event.
-         */
-        export type removeInstrumentationBreakpointParameters = {
-            /**
-             * Instrumentation name to stop on.
-             */
-            eventName: string;
-        }
-        export type removeInstrumentationBreakpointReturnValue = {
-        }
-        /**
-         * Removes breakpoint from XMLHttpRequest.
-         */
-        export type removeXHRBreakpointParameters = {
-            /**
-             * Resource URL substring.
-             */
-            url: string;
-        }
-        export type removeXHRBreakpointReturnValue = {
-        }
-        /**
-         * Sets breakpoint on particular operation with DOM.
-         */
-        export type setDOMBreakpointParameters = {
-            /**
-             * Identifier of the node to set breakpoint on.
-             */
-            nodeId: DOM.NodeId;
-            /**
-             * Type of the operation to stop upon.
-             */
-            type: DOMBreakpointType;
-        }
-        export type setDOMBreakpointReturnValue = {
-        }
-        /**
-         * Sets breakpoint on particular DOM event.
-         */
-        export type setEventListenerBreakpointParameters = {
-            /**
-             * DOM Event name to stop on (any DOM event will do).
-             */
-            eventName: string;
-            /**
-             * EventTarget interface name to stop on. If equal to `"*"` or not provided, will stop on any
-EventTarget.
-             */
-            targetName?: string;
-        }
-        export type setEventListenerBreakpointReturnValue = {
-        }
-        /**
-         * Sets breakpoint on particular native event.
-         */
-        export type setInstrumentationBreakpointParameters = {
-            /**
-             * Instrumentation name to stop on.
-             */
-            eventName: string;
-        }
-        export type setInstrumentationBreakpointReturnValue = {
-        }
-        /**
-         * Sets breakpoint on XMLHttpRequest.
-         */
-        export type setXHRBreakpointParameters = {
-            /**
-             * Resource URL substring. All XHRs having this substring in the URL will get stopped upon.
-             */
-            url: string;
-        }
-        export type setXHRBreakpointReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain facilitates obtaining document snapshots with DOM, layout, and style information.
-     */
-    export module DOMSnapshot {
-        /**
-         * A Node in the DOM tree.
-         */
-        export interface DOMNode {
-            /**
-             * `Node`'s nodeType.
-             */
-            nodeType: number;
-            /**
-             * `Node`'s nodeName.
-             */
-            nodeName: string;
-            /**
-             * `Node`'s nodeValue.
-             */
-            nodeValue: string;
-            /**
-             * Only set for textarea elements, contains the text value.
-             */
-            textValue?: string;
-            /**
-             * Only set for input elements, contains the input's associated text value.
-             */
-            inputValue?: string;
-            /**
-             * Only set for radio and checkbox input elements, indicates if the element has been checked
-             */
-            inputChecked?: boolean;
-            /**
-             * Only set for option elements, indicates if the element has been selected
-             */
-            optionSelected?: boolean;
-            /**
-             * `Node`'s id, corresponds to DOM.Node.backendNodeId.
-             */
-            backendNodeId: DOM.BackendNodeId;
-            /**
-             * The indexes of the node's child nodes in the `domNodes` array returned by `getSnapshot`, if
-any.
-             */
-            childNodeIndexes?: number[];
-            /**
-             * Attributes of an `Element` node.
-             */
-            attributes?: NameValue[];
-            /**
-             * Indexes of pseudo elements associated with this node in the `domNodes` array returned by
-`getSnapshot`, if any.
-             */
-            pseudoElementIndexes?: number[];
-            /**
-             * The index of the node's related layout tree node in the `layoutTreeNodes` array returned by
-`getSnapshot`, if any.
-             */
-            layoutNodeIndex?: number;
-            /**
-             * Document URL that `Document` or `FrameOwner` node points to.
-             */
-            documentURL?: string;
-            /**
-             * Base URL that `Document` or `FrameOwner` node uses for URL completion.
-             */
-            baseURL?: string;
-            /**
-             * Only set for documents, contains the document's content language.
-             */
-            contentLanguage?: string;
-            /**
-             * Only set for documents, contains the document's character set encoding.
-             */
-            documentEncoding?: string;
-            /**
-             * `DocumentType` node's publicId.
-             */
-            publicId?: string;
-            /**
-             * `DocumentType` node's systemId.
-             */
-            systemId?: string;
-            /**
-             * Frame ID for frame owner elements and also for the document node.
-             */
-            frameId?: Page.FrameId;
-            /**
-             * The index of a frame owner element's content document in the `domNodes` array returned by
-`getSnapshot`, if any.
-             */
-            contentDocumentIndex?: number;
-            /**
-             * Type of a pseudo element node.
-             */
-            pseudoType?: DOM.PseudoType;
-            /**
-             * Shadow root type.
-             */
-            shadowRootType?: DOM.ShadowRootType;
-            /**
-             * Whether this DOM node responds to mouse clicks. This includes nodes that have had click
-event listeners attached via JavaScript as well as anchor tags that naturally navigate when
-clicked.
-             */
-            isClickable?: boolean;
-            /**
-             * Details of the node's event listeners, if any.
-             */
-            eventListeners?: DOMDebugger.EventListener[];
-            /**
-             * The selected url for nodes with a srcset attribute.
-             */
-            currentSourceURL?: string;
-            /**
-             * The url of the script (if any) that generates this node.
-             */
-            originURL?: string;
-            /**
-             * Scroll offsets, set when this node is a Document.
-             */
-            scrollOffsetX?: number;
-            scrollOffsetY?: number;
-        }
-        /**
-         * Details of post layout rendered text positions. The exact layout should not be regarded as
-stable and may change between versions.
-         */
-        export interface InlineTextBox {
-            /**
-             * The bounding box in document coordinates. Note that scroll offset of the document is ignored.
-             */
-            boundingBox: DOM.Rect;
-            /**
-             * The starting index in characters, for this post layout textbox substring. Characters that
-would be represented as a surrogate pair in UTF-16 have length 2.
-             */
-            startCharacterIndex: number;
-            /**
-             * The number of characters in this post layout textbox substring. Characters that would be
-represented as a surrogate pair in UTF-16 have length 2.
-             */
-            numCharacters: number;
-        }
-        /**
-         * Details of an element in the DOM tree with a LayoutObject.
-         */
-        export interface LayoutTreeNode {
-            /**
-             * The index of the related DOM node in the `domNodes` array returned by `getSnapshot`.
-             */
-            domNodeIndex: number;
-            /**
-             * The bounding box in document coordinates. Note that scroll offset of the document is ignored.
-             */
-            boundingBox: DOM.Rect;
-            /**
-             * Contents of the LayoutText, if any.
-             */
-            layoutText?: string;
-            /**
-             * The post-layout inline text nodes, if any.
-             */
-            inlineTextNodes?: InlineTextBox[];
-            /**
-             * Index into the `computedStyles` array returned by `getSnapshot`.
-             */
-            styleIndex?: number;
-            /**
-             * Global paint order index, which is determined by the stacking order of the nodes. Nodes
-that are painted together will have the same index. Only provided if includePaintOrder in
-getSnapshot was true.
-             */
-            paintOrder?: number;
-            /**
-             * Set to true to indicate the element begins a new stacking context.
-             */
-            isStackingContext?: boolean;
-        }
-        /**
-         * A subset of the full ComputedStyle as defined by the request whitelist.
-         */
-        export interface ComputedStyle {
-            /**
-             * Name/value pairs of computed style properties.
-             */
-            properties: NameValue[];
-        }
-        /**
-         * A name/value pair.
-         */
-        export interface NameValue {
-            /**
-             * Attribute/property name.
-             */
-            name: string;
-            /**
-             * Attribute/property value.
-             */
-            value: string;
-        }
-        /**
-         * Index of the string in the strings table.
-         */
-        export type StringIndex = number;
-        /**
-         * Index of the string in the strings table.
-         */
-        export type ArrayOfStrings = StringIndex[];
-        /**
-         * Data that is only present on rare nodes.
-         */
-        export interface RareStringData {
-            index: number[];
-            value: StringIndex[];
-        }
-        export interface RareBooleanData {
-            index: number[];
-        }
-        export interface RareIntegerData {
-            index: number[];
-            value: number[];
-        }
-        export type Rectangle = number[];
-        /**
-         * Document snapshot.
-         */
-        export interface DocumentSnapshot {
-            /**
-             * Document URL that `Document` or `FrameOwner` node points to.
-             */
-            documentURL: StringIndex;
-            /**
-             * Document title.
-             */
-            title: StringIndex;
-            /**
-             * Base URL that `Document` or `FrameOwner` node uses for URL completion.
-             */
-            baseURL: StringIndex;
-            /**
-             * Contains the document's content language.
-             */
-            contentLanguage: StringIndex;
-            /**
-             * Contains the document's character set encoding.
-             */
-            encodingName: StringIndex;
-            /**
-             * `DocumentType` node's publicId.
-             */
-            publicId: StringIndex;
-            /**
-             * `DocumentType` node's systemId.
-             */
-            systemId: StringIndex;
-            /**
-             * Frame ID for frame owner elements and also for the document node.
-             */
-            frameId: StringIndex;
-            /**
-             * A table with dom nodes.
-             */
-            nodes: NodeTreeSnapshot;
-            /**
-             * The nodes in the layout tree.
-             */
-            layout: LayoutTreeSnapshot;
-            /**
-             * The post-layout inline text nodes.
-             */
-            textBoxes: TextBoxSnapshot;
-            /**
-             * Horizontal scroll offset.
-             */
-            scrollOffsetX?: number;
-            /**
-             * Vertical scroll offset.
-             */
-            scrollOffsetY?: number;
-            /**
-             * Document content width.
-             */
-            contentWidth?: number;
-            /**
-             * Document content height.
-             */
-            contentHeight?: number;
-        }
-        /**
-         * Table containing nodes.
-         */
-        export interface NodeTreeSnapshot {
-            /**
-             * Parent node index.
-             */
-            parentIndex?: number[];
-            /**
-             * `Node`'s nodeType.
-             */
-            nodeType?: number[];
-            /**
-             * `Node`'s nodeName.
-             */
-            nodeName?: StringIndex[];
-            /**
-             * `Node`'s nodeValue.
-             */
-            nodeValue?: StringIndex[];
-            /**
-             * `Node`'s id, corresponds to DOM.Node.backendNodeId.
-             */
-            backendNodeId?: DOM.BackendNodeId[];
-            /**
-             * Attributes of an `Element` node. Flatten name, value pairs.
-             */
-            attributes?: ArrayOfStrings[];
-            /**
-             * Only set for textarea elements, contains the text value.
-             */
-            textValue?: RareStringData;
-            /**
-             * Only set for input elements, contains the input's associated text value.
-             */
-            inputValue?: RareStringData;
-            /**
-             * Only set for radio and checkbox input elements, indicates if the element has been checked
-             */
-            inputChecked?: RareBooleanData;
-            /**
-             * Only set for option elements, indicates if the element has been selected
-             */
-            optionSelected?: RareBooleanData;
-            /**
-             * The index of the document in the list of the snapshot documents.
-             */
-            contentDocumentIndex?: RareIntegerData;
-            /**
-             * Type of a pseudo element node.
-             */
-            pseudoType?: RareStringData;
-            /**
-             * Whether this DOM node responds to mouse clicks. This includes nodes that have had click
-event listeners attached via JavaScript as well as anchor tags that naturally navigate when
-clicked.
-             */
-            isClickable?: RareBooleanData;
-            /**
-             * The selected url for nodes with a srcset attribute.
-             */
-            currentSourceURL?: RareStringData;
-            /**
-             * The url of the script (if any) that generates this node.
-             */
-            originURL?: RareStringData;
-        }
-        /**
-         * Table of details of an element in the DOM tree with a LayoutObject.
-         */
-        export interface LayoutTreeSnapshot {
-            /**
-             * Index of the corresponding node in the `NodeTreeSnapshot` array returned by `captureSnapshot`.
-             */
-            nodeIndex: number[];
-            /**
-             * Array of indexes specifying computed style strings, filtered according to the `computedStyles` parameter passed to `captureSnapshot`.
-             */
-            styles: ArrayOfStrings[];
-            /**
-             * The absolute position bounding box.
-             */
-            bounds: Rectangle[];
-            /**
-             * Contents of the LayoutText, if any.
-             */
-            text: StringIndex[];
-            /**
-             * Stacking context information.
-             */
-            stackingContexts: RareBooleanData;
-            /**
-             * Global paint order index, which is determined by the stacking order of the nodes. Nodes
-that are painted together will have the same index. Only provided if includePaintOrder in
-captureSnapshot was true.
-             */
-            paintOrders?: number[];
-            /**
-             * The offset rect of nodes. Only available when includeDOMRects is set to true
-             */
-            offsetRects?: Rectangle[];
-            /**
-             * The scroll rect of nodes. Only available when includeDOMRects is set to true
-             */
-            scrollRects?: Rectangle[];
-            /**
-             * The client rect of nodes. Only available when includeDOMRects is set to true
-             */
-            clientRects?: Rectangle[];
-        }
-        /**
-         * Table of details of the post layout rendered text positions. The exact layout should not be regarded as
-stable and may change between versions.
-         */
-        export interface TextBoxSnapshot {
-            /**
-             * Index of the layout tree node that owns this box collection.
-             */
-            layoutIndex: number[];
-            /**
-             * The absolute position bounding box.
-             */
-            bounds: Rectangle[];
-            /**
-             * The starting index in characters, for this post layout textbox substring. Characters that
-would be represented as a surrogate pair in UTF-16 have length 2.
-             */
-            start: number[];
-            /**
-             * The number of characters in this post layout textbox substring. Characters that would be
-represented as a surrogate pair in UTF-16 have length 2.
-             */
-            length: number[];
-        }
-        
-        
-        /**
-         * Disables DOM snapshot agent for the given page.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables DOM snapshot agent for the given page.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Returns a document snapshot, including the full DOM tree of the root node (including iframes,
-template contents, and imported documents) in a flattened array, as well as layout and
-white-listed computed style information for the nodes. Shadow DOM in the returned DOM tree is
-flattened.
-         */
-        export type getSnapshotParameters = {
-            /**
-             * Whitelist of computed styles to return.
-             */
-            computedStyleWhitelist: string[];
-            /**
-             * Whether or not to retrieve details of DOM listeners (default false).
-             */
-            includeEventListeners?: boolean;
-            /**
-             * Whether to determine and include the paint order index of LayoutTreeNodes (default false).
-             */
-            includePaintOrder?: boolean;
-            /**
-             * Whether to include UA shadow tree in the snapshot (default false).
-             */
-            includeUserAgentShadowTree?: boolean;
-        }
-        export type getSnapshotReturnValue = {
-            /**
-             * The nodes in the DOM tree. The DOMNode at index 0 corresponds to the root document.
-             */
-            domNodes: DOMNode[];
-            /**
-             * The nodes in the layout tree.
-             */
-            layoutTreeNodes: LayoutTreeNode[];
-            /**
-             * Whitelisted ComputedStyle properties for each node in the layout tree.
-             */
-            computedStyles: ComputedStyle[];
-        }
-        /**
-         * Returns a document snapshot, including the full DOM tree of the root node (including iframes,
-template contents, and imported documents) in a flattened array, as well as layout and
-white-listed computed style information for the nodes. Shadow DOM in the returned DOM tree is
-flattened.
-         */
-        export type captureSnapshotParameters = {
-            /**
-             * Whitelist of computed styles to return.
-             */
-            computedStyles: string[];
-            /**
-             * Whether to include layout object paint orders into the snapshot.
-             */
-            includePaintOrder?: boolean;
-            /**
-             * Whether to include DOM rectangles (offsetRects, clientRects, scrollRects) into the snapshot
-             */
-            includeDOMRects?: boolean;
-        }
-        export type captureSnapshotReturnValue = {
-            /**
-             * The nodes in the DOM tree. The DOMNode at index 0 corresponds to the root document.
-             */
-            documents: DocumentSnapshot[];
-            /**
-             * Shared string table that all string properties refer to with indexes.
-             */
-            strings: string[];
-        }
-    }
-    
-    /**
-     * Query and modify DOM storage.
-     */
-    export module DOMStorage {
-        /**
-         * DOM Storage identifier.
-         */
-        export interface StorageId {
-            /**
-             * Security origin for the storage.
-             */
-            securityOrigin: string;
-            /**
-             * Whether the storage is local storage (not session storage).
-             */
-            isLocalStorage: boolean;
-        }
-        /**
-         * DOM Storage item.
-         */
-        export type Item = string[];
-        
-        export type domStorageItemAddedPayload = {
-            storageId: StorageId;
-            key: string;
-            newValue: string;
-        }
-        export type domStorageItemRemovedPayload = {
-            storageId: StorageId;
-            key: string;
-        }
-        export type domStorageItemUpdatedPayload = {
-            storageId: StorageId;
-            key: string;
-            oldValue: string;
-            newValue: string;
-        }
-        export type domStorageItemsClearedPayload = {
-            storageId: StorageId;
-        }
-        
-        export type clearParameters = {
-            storageId: StorageId;
-        }
-        export type clearReturnValue = {
-        }
-        /**
-         * Disables storage tracking, prevents storage events from being sent to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables storage tracking, storage events will now be delivered to the client.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        export type getDOMStorageItemsParameters = {
-            storageId: StorageId;
-        }
-        export type getDOMStorageItemsReturnValue = {
-            entries: Item[];
-        }
-        export type removeDOMStorageItemParameters = {
-            storageId: StorageId;
-            key: string;
-        }
-        export type removeDOMStorageItemReturnValue = {
-        }
-        export type setDOMStorageItemParameters = {
-            storageId: StorageId;
-            key: string;
-            value: string;
-        }
-        export type setDOMStorageItemReturnValue = {
-        }
-    }
-    
-    export module Database {
-        /**
-         * Unique identifier of Database object.
-         */
-        export type DatabaseId = string;
-        /**
-         * Database object.
-         */
-        export interface Database {
-            /**
-             * Database ID.
-             */
-            id: DatabaseId;
-            /**
-             * Database domain.
-             */
-            domain: string;
-            /**
-             * Database name.
-             */
-            name: string;
-            /**
-             * Database version.
-             */
-            version: string;
-        }
-        /**
-         * Database error.
-         */
-        export interface Error {
-            /**
-             * Error message.
-             */
-            message: string;
-            /**
-             * Error code.
-             */
-            code: number;
-        }
-        
-        export type addDatabasePayload = {
-            database: Database;
-        }
-        
-        /**
-         * Disables database tracking, prevents database events from being sent to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables database tracking, database events will now be delivered to the client.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        export type executeSQLParameters = {
-            databaseId: DatabaseId;
-            query: string;
-        }
-        export type executeSQLReturnValue = {
-            columnNames?: string[];
-            values?: any[];
-            sqlError?: Error;
-        }
-        export type getDatabaseTableNamesParameters = {
-            databaseId: DatabaseId;
-        }
-        export type getDatabaseTableNamesReturnValue = {
-            tableNames: string[];
-        }
-    }
-    
-    export module DeviceOrientation {
-        
-        
-        /**
-         * Clears the overridden Device Orientation.
-         */
-        export type clearDeviceOrientationOverrideParameters = {
-        }
-        export type clearDeviceOrientationOverrideReturnValue = {
-        }
-        /**
-         * Overrides the Device Orientation.
-         */
-        export type setDeviceOrientationOverrideParameters = {
-            /**
-             * Mock alpha
-             */
-            alpha: number;
-            /**
-             * Mock beta
-             */
-            beta: number;
-            /**
-             * Mock gamma
-             */
-            gamma: number;
-        }
-        export type setDeviceOrientationOverrideReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain emulates different environments for the page.
-     */
-    export module Emulation {
-        /**
-         * Screen orientation.
-         */
-        export interface ScreenOrientation {
-            /**
-             * Orientation type.
-             */
-            type: "portraitPrimary"|"portraitSecondary"|"landscapePrimary"|"landscapeSecondary";
-            /**
-             * Orientation angle.
-             */
-            angle: number;
-        }
-        export interface MediaFeature {
-            name: string;
-            value: string;
-        }
-        /**
-         * advance: If the scheduler runs out of immediate work, the virtual time base may fast forward to
-allow the next delayed task (if any) to run; pause: The virtual time base may not advance;
-pauseIfNetworkFetchesPending: The virtual time base may not advance if there are any pending
-resource fetches.
-         */
-        export type VirtualTimePolicy = "advance"|"pause"|"pauseIfNetworkFetchesPending";
-        
-        /**
-         * Notification sent after the virtual time budget for the current VirtualTimePolicy has run out.
-         */
-        export type virtualTimeBudgetExpiredPayload = void;
-        
-        /**
-         * Tells whether emulation is supported.
-         */
-        export type canEmulateParameters = {
-        }
-        export type canEmulateReturnValue = {
-            /**
-             * True if emulation is supported.
-             */
-            result: boolean;
-        }
-        /**
-         * Clears the overriden device metrics.
-         */
-        export type clearDeviceMetricsOverrideParameters = {
-        }
-        export type clearDeviceMetricsOverrideReturnValue = {
-        }
-        /**
-         * Clears the overriden Geolocation Position and Error.
-         */
-        export type clearGeolocationOverrideParameters = {
-        }
-        export type clearGeolocationOverrideReturnValue = {
-        }
-        /**
-         * Requests that page scale factor is reset to initial values.
-         */
-        export type resetPageScaleFactorParameters = {
-        }
-        export type resetPageScaleFactorReturnValue = {
-        }
-        /**
-         * Enables or disables simulating a focused and active page.
-         */
-        export type setFocusEmulationEnabledParameters = {
-            /**
-             * Whether to enable to disable focus emulation.
-             */
-            enabled: boolean;
-        }
-        export type setFocusEmulationEnabledReturnValue = {
-        }
-        /**
-         * Enables CPU throttling to emulate slow CPUs.
-         */
-        export type setCPUThrottlingRateParameters = {
-            /**
-             * Throttling rate as a slowdown factor (1 is no throttle, 2 is 2x slowdown, etc).
-             */
-            rate: number;
-        }
-        export type setCPUThrottlingRateReturnValue = {
-        }
-        /**
-         * Sets or clears an override of the default background color of the frame. This override is used
-if the content does not specify one.
-         */
-        export type setDefaultBackgroundColorOverrideParameters = {
-            /**
-             * RGBA of the default background color. If not specified, any existing override will be
-cleared.
-             */
-            color?: DOM.RGBA;
-        }
-        export type setDefaultBackgroundColorOverrideReturnValue = {
-        }
-        /**
-         * Overrides the values of device screen dimensions (window.screen.width, window.screen.height,
-window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media
-query results).
-         */
-        export type setDeviceMetricsOverrideParameters = {
-            /**
-             * Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override.
-             */
-            width: number;
-            /**
-             * Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override.
-             */
-            height: number;
-            /**
-             * Overriding device scale factor value. 0 disables the override.
-             */
-            deviceScaleFactor: number;
-            /**
-             * Whether to emulate mobile device. This includes viewport meta tag, overlay scrollbars, text
-autosizing and more.
-             */
-            mobile: boolean;
-            /**
-             * Scale to apply to resulting view image.
-             */
-            scale?: number;
-            /**
-             * Overriding screen width value in pixels (minimum 0, maximum 10000000).
-             */
-            screenWidth?: number;
-            /**
-             * Overriding screen height value in pixels (minimum 0, maximum 10000000).
-             */
-            screenHeight?: number;
-            /**
-             * Overriding view X position on screen in pixels (minimum 0, maximum 10000000).
-             */
-            positionX?: number;
-            /**
-             * Overriding view Y position on screen in pixels (minimum 0, maximum 10000000).
-             */
-            positionY?: number;
-            /**
-             * Do not set visible view size, rely upon explicit setVisibleSize call.
-             */
-            dontSetVisibleSize?: boolean;
-            /**
-             * Screen orientation override.
-             */
-            screenOrientation?: ScreenOrientation;
-            /**
-             * If set, the visible area of the page will be overridden to this viewport. This viewport
-change is not observed by the page, e.g. viewport-relative elements do not change positions.
-             */
-            viewport?: Page.Viewport;
-        }
-        export type setDeviceMetricsOverrideReturnValue = {
-        }
-        export type setScrollbarsHiddenParameters = {
-            /**
-             * Whether scrollbars should be always hidden.
-             */
-            hidden: boolean;
-        }
-        export type setScrollbarsHiddenReturnValue = {
-        }
-        export type setDocumentCookieDisabledParameters = {
-            /**
-             * Whether document.coookie API should be disabled.
-             */
-            disabled: boolean;
-        }
-        export type setDocumentCookieDisabledReturnValue = {
-        }
-        export type setEmitTouchEventsForMouseParameters = {
-            /**
-             * Whether touch emulation based on mouse input should be enabled.
-             */
-            enabled: boolean;
-            /**
-             * Touch/gesture events configuration. Default: current platform.
-             */
-            configuration?: "mobile"|"desktop";
-        }
-        export type setEmitTouchEventsForMouseReturnValue = {
-        }
-        /**
-         * Emulates the given media type or media feature for CSS media queries.
-         */
-        export type setEmulatedMediaParameters = {
-            /**
-             * Media type to emulate. Empty string disables the override.
-             */
-            media?: string;
-            /**
-             * Media features to emulate.
-             */
-            features?: MediaFeature[];
-        }
-        export type setEmulatedMediaReturnValue = {
-        }
-        /**
-         * Emulates the given vision deficiency.
-         */
-        export type setEmulatedVisionDeficiencyParameters = {
-            /**
-             * Vision deficiency to emulate.
-             */
-            type: "none"|"achromatopsia"|"blurredVision"|"deuteranopia"|"protanopia"|"tritanopia";
-        }
-        export type setEmulatedVisionDeficiencyReturnValue = {
-        }
-        /**
-         * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position
-unavailable.
-         */
-        export type setGeolocationOverrideParameters = {
-            /**
-             * Mock latitude
-             */
-            latitude?: number;
-            /**
-             * Mock longitude
-             */
-            longitude?: number;
-            /**
-             * Mock accuracy
-             */
-            accuracy?: number;
-        }
-        export type setGeolocationOverrideReturnValue = {
-        }
-        /**
-         * Overrides value returned by the javascript navigator object.
-         */
-        export type setNavigatorOverridesParameters = {
-            /**
-             * The platform navigator.platform should return.
-             */
-            platform: string;
-        }
-        export type setNavigatorOverridesReturnValue = {
-        }
-        /**
-         * Sets a specified page scale factor.
-         */
-        export type setPageScaleFactorParameters = {
-            /**
-             * Page scale factor.
-             */
-            pageScaleFactor: number;
-        }
-        export type setPageScaleFactorReturnValue = {
-        }
-        /**
-         * Switches script execution in the page.
-         */
-        export type setScriptExecutionDisabledParameters = {
-            /**
-             * Whether script execution should be disabled in the page.
-             */
-            value: boolean;
-        }
-        export type setScriptExecutionDisabledReturnValue = {
-        }
-        /**
-         * Enables touch on platforms which do not support them.
-         */
-        export type setTouchEmulationEnabledParameters = {
-            /**
-             * Whether the touch event emulation should be enabled.
-             */
-            enabled: boolean;
-            /**
-             * Maximum touch points supported. Defaults to one.
-             */
-            maxTouchPoints?: number;
-        }
-        export type setTouchEmulationEnabledReturnValue = {
-        }
-        /**
-         * Turns on virtual time for all frames (replacing real-time with a synthetic time source) and sets
-the current virtual time policy.  Note this supersedes any previous time budget.
-         */
-        export type setVirtualTimePolicyParameters = {
-            policy: VirtualTimePolicy;
-            /**
-             * If set, after this many virtual milliseconds have elapsed virtual time will be paused and a
-virtualTimeBudgetExpired event is sent.
-             */
-            budget?: number;
-            /**
-             * If set this specifies the maximum number of tasks that can be run before virtual is forced
-forwards to prevent deadlock.
-             */
-            maxVirtualTimeTaskStarvationCount?: number;
-            /**
-             * If set the virtual time policy change should be deferred until any frame starts navigating.
-Note any previous deferred policy change is superseded.
-             */
-            waitForNavigation?: boolean;
-            /**
-             * If set, base::Time::Now will be overriden to initially return this value.
-             */
-            initialVirtualTime?: Network.TimeSinceEpoch;
-        }
-        export type setVirtualTimePolicyReturnValue = {
-            /**
-             * Absolute timestamp at which virtual time was first enabled (up time in milliseconds).
-             */
-            virtualTimeTicksBase: number;
-        }
-        /**
-         * Overrides default host system locale with the specified one.
-         */
-        export type setLocaleOverrideParameters = {
-            /**
-             * ICU style C locale (e.g. "en_US"). If not specified or empty, disables the override and
-restores default host system locale.
-             */
-            locale?: string;
-        }
-        export type setLocaleOverrideReturnValue = {
-        }
-        /**
-         * Overrides default host system timezone with the specified one.
-         */
-        export type setTimezoneOverrideParameters = {
-            /**
-             * The timezone identifier. If empty, disables the override and
-restores default host system timezone.
-             */
-            timezoneId: string;
-        }
-        export type setTimezoneOverrideReturnValue = {
-        }
-        /**
-         * Resizes the frame/viewport of the page. Note that this does not affect the frame's container
-(e.g. browser window). Can be used to produce screenshots of the specified size. Not supported
-on Android.
-         */
-        export type setVisibleSizeParameters = {
-            /**
-             * Frame width (DIP).
-             */
-            width: number;
-            /**
-             * Frame height (DIP).
-             */
-            height: number;
-        }
-        export type setVisibleSizeReturnValue = {
-        }
-        /**
-         * Allows overriding user agent with the given string.
-         */
-        export type setUserAgentOverrideParameters = {
-            /**
-             * User agent to use.
-             */
-            userAgent: string;
-            /**
-             * Browser langugage to emulate.
-             */
-            acceptLanguage?: string;
-            /**
-             * The platform navigator.platform should return.
-             */
-            platform?: string;
-        }
-        export type setUserAgentOverrideReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain provides experimental commands only supported in headless mode.
-     */
-    export module HeadlessExperimental {
-        /**
-         * Encoding options for a screenshot.
-         */
-        export interface ScreenshotParams {
-            /**
-             * Image compression format (defaults to png).
-             */
-            format?: "jpeg"|"png";
-            /**
-             * Compression quality from range [0..100] (jpeg only).
-             */
-            quality?: number;
-        }
-        
-        /**
-         * Issued when the target starts or stops needing BeginFrames.
-Deprecated. Issue beginFrame unconditionally instead and use result from
-beginFrame to detect whether the frames were suppressed.
-         */
-        export type needsBeginFramesChangedPayload = {
-            /**
-             * True if BeginFrames are needed, false otherwise.
-             */
-            needsBeginFrames: boolean;
-        }
-        
-        /**
-         * Sends a BeginFrame to the target and returns when the frame was completed. Optionally captures a
-screenshot from the resulting frame. Requires that the target was created with enabled
-BeginFrameControl. Designed for use with --run-all-compositor-stages-before-draw, see also
-https://goo.gl/3zHXhB for more background.
-         */
-        export type beginFrameParameters = {
-            /**
-             * Timestamp of this BeginFrame in Renderer TimeTicks (milliseconds of uptime). If not set,
-the current time will be used.
-             */
-            frameTimeTicks?: number;
-            /**
-             * The interval between BeginFrames that is reported to the compositor, in milliseconds.
-Defaults to a 60 frames/second interval, i.e. about 16.666 milliseconds.
-             */
-            interval?: number;
-            /**
-             * Whether updates should not be committed and drawn onto the display. False by default. If
-true, only side effects of the BeginFrame will be run, such as layout and animations, but
-any visual updates may not be visible on the display or in screenshots.
-             */
-            noDisplayUpdates?: boolean;
-            /**
-             * If set, a screenshot of the frame will be captured and returned in the response. Otherwise,
-no screenshot will be captured. Note that capturing a screenshot can fail, for example,
-during renderer initialization. In such a case, no screenshot data will be returned.
-             */
-            screenshot?: ScreenshotParams;
-        }
-        export type beginFrameReturnValue = {
-            /**
-             * Whether the BeginFrame resulted in damage and, thus, a new frame was committed to the
-display. Reported for diagnostic uses, may be removed in the future.
-             */
-            hasDamage: boolean;
-            /**
-             * Base64-encoded image data of the screenshot, if one was requested and successfully taken.
-             */
-            screenshotData?: binary;
-        }
-        /**
-         * Disables headless events for the target.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables headless events for the target.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-    }
-    
-    /**
-     * Input/Output operations for streams produced by DevTools.
-     */
-    export module IO {
-        /**
-         * This is either obtained from another method or specifed as `blob:&lt;uuid&gt;` where
-`&lt;uuid&gt` is an UUID of a Blob.
-         */
-        export type StreamHandle = string;
-        
-        
-        /**
-         * Close the stream, discard any temporary backing storage.
-         */
-        export type closeParameters = {
-            /**
-             * Handle of the stream to close.
-             */
-            handle: StreamHandle;
-        }
-        export type closeReturnValue = {
-        }
-        /**
-         * Read a chunk of the stream
-         */
-        export type readParameters = {
-            /**
-             * Handle of the stream to read.
-             */
-            handle: StreamHandle;
-            /**
-             * Seek to the specified offset before reading (if not specificed, proceed with offset
-following the last read). Some types of streams may only support sequential reads.
-             */
-            offset?: number;
-            /**
-             * Maximum number of bytes to read (left upon the agent discretion if not specified).
-             */
-            size?: number;
-        }
-        export type readReturnValue = {
-            /**
-             * Set if the data is base64-encoded
-             */
-            base64Encoded?: boolean;
-            /**
-             * Data that were read.
-             */
-            data: string;
-            /**
-             * Set if the end-of-file condition occured while reading.
-             */
-            eof: boolean;
-        }
-        /**
-         * Return UUID of Blob object specified by a remote object id.
-         */
-        export type resolveBlobParameters = {
-            /**
-             * Object id of a Blob object wrapper.
-             */
-            objectId: Runtime.RemoteObjectId;
-        }
-        export type resolveBlobReturnValue = {
-            /**
-             * UUID of the specified Blob.
-             */
-            uuid: string;
-        }
-    }
-    
-    export module IndexedDB {
-        /**
-         * Database with an array of object stores.
-         */
-        export interface DatabaseWithObjectStores {
-            /**
-             * Database name.
-             */
-            name: string;
-            /**
-             * Database version (type is not 'integer', as the standard
-requires the version number to be 'unsigned long long')
-             */
-            version: number;
-            /**
-             * Object stores in this database.
-             */
-            objectStores: ObjectStore[];
-        }
-        /**
-         * Object store.
-         */
-        export interface ObjectStore {
-            /**
-             * Object store name.
-             */
-            name: string;
-            /**
-             * Object store key path.
-             */
-            keyPath: KeyPath;
-            /**
-             * If true, object store has auto increment flag set.
-             */
-            autoIncrement: boolean;
-            /**
-             * Indexes in this object store.
-             */
-            indexes: ObjectStoreIndex[];
-        }
-        /**
-         * Object store index.
-         */
-        export interface ObjectStoreIndex {
-            /**
-             * Index name.
-             */
-            name: string;
-            /**
-             * Index key path.
-             */
-            keyPath: KeyPath;
-            /**
-             * If true, index is unique.
-             */
-            unique: boolean;
-            /**
-             * If true, index allows multiple entries for a key.
-             */
-            multiEntry: boolean;
-        }
-        /**
-         * Key.
-         */
-        export interface Key {
-            /**
-             * Key type.
-             */
-            type: "number"|"string"|"date"|"array";
-            /**
-             * Number value.
-             */
-            number?: number;
-            /**
-             * String value.
-             */
-            string?: string;
-            /**
-             * Date value.
-             */
-            date?: number;
-            /**
-             * Array value.
-             */
-            array?: Key[];
-        }
-        /**
-         * Key range.
-         */
-        export interface KeyRange {
-            /**
-             * Lower bound.
-             */
-            lower?: Key;
-            /**
-             * Upper bound.
-             */
-            upper?: Key;
-            /**
-             * If true lower bound is open.
-             */
-            lowerOpen: boolean;
-            /**
-             * If true upper bound is open.
-             */
-            upperOpen: boolean;
-        }
-        /**
-         * Data entry.
-         */
-        export interface DataEntry {
-            /**
-             * Key object.
-             */
-            key: Runtime.RemoteObject;
-            /**
-             * Primary key object.
-             */
-            primaryKey: Runtime.RemoteObject;
-            /**
-             * Value object.
-             */
-            value: Runtime.RemoteObject;
-        }
-        /**
-         * Key path.
-         */
-        export interface KeyPath {
-            /**
-             * Key path type.
-             */
-            type: "null"|"string"|"array";
-            /**
-             * String value.
-             */
-            string?: string;
-            /**
-             * Array value.
-             */
-            array?: string[];
-        }
-        
-        
-        /**
-         * Clears all entries from an object store.
-         */
-        export type clearObjectStoreParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Database name.
-             */
-            databaseName: string;
-            /**
-             * Object store name.
-             */
-            objectStoreName: string;
-        }
-        export type clearObjectStoreReturnValue = {
-        }
-        /**
-         * Deletes a database.
-         */
-        export type deleteDatabaseParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Database name.
-             */
-            databaseName: string;
-        }
-        export type deleteDatabaseReturnValue = {
-        }
-        /**
-         * Delete a range of entries from an object store
-         */
-        export type deleteObjectStoreEntriesParameters = {
-            securityOrigin: string;
-            databaseName: string;
-            objectStoreName: string;
-            /**
-             * Range of entry keys to delete
-             */
-            keyRange: KeyRange;
-        }
-        export type deleteObjectStoreEntriesReturnValue = {
-        }
-        /**
-         * Disables events from backend.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables events from backend.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Requests data from object store or index.
-         */
-        export type requestDataParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Database name.
-             */
-            databaseName: string;
-            /**
-             * Object store name.
-             */
-            objectStoreName: string;
-            /**
-             * Index name, empty string for object store data requests.
-             */
-            indexName: string;
-            /**
-             * Number of records to skip.
-             */
-            skipCount: number;
-            /**
-             * Number of records to fetch.
-             */
-            pageSize: number;
-            /**
-             * Key range.
-             */
-            keyRange?: KeyRange;
-        }
-        export type requestDataReturnValue = {
-            /**
-             * Array of object store data entries.
-             */
-            objectStoreDataEntries: DataEntry[];
-            /**
-             * If true, there are more entries to fetch in the given range.
-             */
-            hasMore: boolean;
-        }
-        /**
-         * Gets metadata of an object store
-         */
-        export type getMetadataParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Database name.
-             */
-            databaseName: string;
-            /**
-             * Object store name.
-             */
-            objectStoreName: string;
-        }
-        export type getMetadataReturnValue = {
-            /**
-             * the entries count
-             */
-            entriesCount: number;
-            /**
-             * the current value of key generator, to become the next inserted
-key into the object store. Valid if objectStore.autoIncrement
-is true.
-             */
-            keyGeneratorValue: number;
-        }
-        /**
-         * Requests database with given name in given frame.
-         */
-        export type requestDatabaseParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Database name.
-             */
-            databaseName: string;
-        }
-        export type requestDatabaseReturnValue = {
-            /**
-             * Database with an array of object stores.
-             */
-            databaseWithObjectStores: DatabaseWithObjectStores;
-        }
-        /**
-         * Requests database names for given security origin.
-         */
-        export type requestDatabaseNamesParameters = {
-            /**
-             * Security origin.
-             */
-            securityOrigin: string;
-        }
-        export type requestDatabaseNamesReturnValue = {
-            /**
-             * Database names for origin.
-             */
-            databaseNames: string[];
-        }
-    }
-    
-    export module Input {
-        export interface TouchPoint {
-            /**
-             * X coordinate of the event relative to the main frame's viewport in CSS pixels.
-             */
-            x: number;
-            /**
-             * Y coordinate of the event relative to the main frame's viewport in CSS pixels. 0 refers to
-the top of the viewport and Y increases as it proceeds towards the bottom of the viewport.
-             */
-            y: number;
-            /**
-             * X radius of the touch area (default: 1.0).
-             */
-            radiusX?: number;
-            /**
-             * Y radius of the touch area (default: 1.0).
-             */
-            radiusY?: number;
-            /**
-             * Rotation angle (default: 0.0).
-             */
-            rotationAngle?: number;
-            /**
-             * Force (default: 1.0).
-             */
-            force?: number;
-            /**
-             * Identifier used to track touch sources between events, must be unique within an event.
-             */
-            id?: number;
-        }
-        export type GestureSourceType = "default"|"touch"|"mouse";
-        export type MouseButton = "none"|"left"|"middle"|"right"|"back"|"forward";
-        /**
-         * UTC time in seconds, counted from January 1, 1970.
-         */
-        export type TimeSinceEpoch = number;
-        
-        
-        /**
-         * Dispatches a key event to the page.
-         */
-        export type dispatchKeyEventParameters = {
-            /**
-             * Type of the key event.
-             */
-            type: "keyDown"|"keyUp"|"rawKeyDown"|"char";
-            /**
-             * Bit field representing pressed modifier keys. Alt=1, Ctrl=2, Meta/Command=4, Shift=8
-(default: 0).
-             */
-            modifiers?: number;
-            /**
-             * Time at which the event occurred.
-             */
-            timestamp?: TimeSinceEpoch;
-            /**
-             * Text as generated by processing a virtual key code with a keyboard layout. Not needed for
-for `keyUp` and `rawKeyDown` events (default: "")
-             */
-            text?: string;
-            /**
-             * Text that would have been generated by the keyboard if no modifiers were pressed (except for
-shift). Useful for shortcut (accelerator) key handling (default: "").
-             */
-            unmodifiedText?: string;
-            /**
-             * Unique key identifier (e.g., 'U+0041') (default: "").
-             */
-            keyIdentifier?: string;
-            /**
-             * Unique DOM defined string value for each physical key (e.g., 'KeyA') (default: "").
-             */
-            code?: string;
-            /**
-             * Unique DOM defined string value describing the meaning of the key in the context of active
-modifiers, keyboard layout, etc (e.g., 'AltGr') (default: "").
-             */
-            key?: string;
-            /**
-             * Windows virtual key code (default: 0).
-             */
-            windowsVirtualKeyCode?: number;
-            /**
-             * Native virtual key code (default: 0).
-             */
-            nativeVirtualKeyCode?: number;
-            /**
-             * Whether the event was generated from auto repeat (default: false).
-             */
-            autoRepeat?: boolean;
-            /**
-             * Whether the event was generated from the keypad (default: false).
-             */
-            isKeypad?: boolean;
-            /**
-             * Whether the event was a system key event (default: false).
-             */
-            isSystemKey?: boolean;
-            /**
-             * Whether the event was from the left or right side of the keyboard. 1=Left, 2=Right (default:
-0).
-             */
-            location?: number;
-        }
-        export type dispatchKeyEventReturnValue = {
-        }
-        /**
-         * This method emulates inserting text that doesn't come from a key press,
-for example an emoji keyboard or an IME.
-         */
-        export type insertTextParameters = {
-            /**
-             * The text to insert.
-             */
-            text: string;
-        }
-        export type insertTextReturnValue = {
-        }
-        /**
-         * Dispatches a mouse event to the page.
-         */
-        export type dispatchMouseEventParameters = {
-            /**
-             * Type of the mouse event.
-             */
-            type: "mousePressed"|"mouseReleased"|"mouseMoved"|"mouseWheel";
-            /**
-             * X coordinate of the event relative to the main frame's viewport in CSS pixels.
-             */
-            x: number;
-            /**
-             * Y coordinate of the event relative to the main frame's viewport in CSS pixels. 0 refers to
-the top of the viewport and Y increases as it proceeds towards the bottom of the viewport.
-             */
-            y: number;
-            /**
-             * Bit field representing pressed modifier keys. Alt=1, Ctrl=2, Meta/Command=4, Shift=8
-(default: 0).
-             */
-            modifiers?: number;
-            /**
-             * Time at which the event occurred.
-             */
-            timestamp?: TimeSinceEpoch;
-            /**
-             * Mouse button (default: "none").
-             */
-            button?: MouseButton;
-            /**
-             * A number indicating which buttons are pressed on the mouse when a mouse event is triggered.
-Left=1, Right=2, Middle=4, Back=8, Forward=16, None=0.
-             */
-            buttons?: number;
-            /**
-             * Number of times the mouse button was clicked (default: 0).
-             */
-            clickCount?: number;
-            /**
-             * X delta in CSS pixels for mouse wheel event (default: 0).
-             */
-            deltaX?: number;
-            /**
-             * Y delta in CSS pixels for mouse wheel event (default: 0).
-             */
-            deltaY?: number;
-            /**
-             * Pointer type (default: "mouse").
-             */
-            pointerType?: "mouse"|"pen";
-        }
-        export type dispatchMouseEventReturnValue = {
-        }
-        /**
-         * Dispatches a touch event to the page.
-         */
-        export type dispatchTouchEventParameters = {
-            /**
-             * Type of the touch event. TouchEnd and TouchCancel must not contain any touch points, while
-TouchStart and TouchMove must contains at least one.
-             */
-            type: "touchStart"|"touchEnd"|"touchMove"|"touchCancel";
-            /**
-             * Active touch points on the touch device. One event per any changed point (compared to
-previous touch event in a sequence) is generated, emulating pressing/moving/releasing points
-one by one.
-             */
-            touchPoints: TouchPoint[];
-            /**
-             * Bit field representing pressed modifier keys. Alt=1, Ctrl=2, Meta/Command=4, Shift=8
-(default: 0).
-             */
-            modifiers?: number;
-            /**
-             * Time at which the event occurred.
-             */
-            timestamp?: TimeSinceEpoch;
-        }
-        export type dispatchTouchEventReturnValue = {
-        }
-        /**
-         * Emulates touch event from the mouse event parameters.
-         */
-        export type emulateTouchFromMouseEventParameters = {
-            /**
-             * Type of the mouse event.
-             */
-            type: "mousePressed"|"mouseReleased"|"mouseMoved"|"mouseWheel";
-            /**
-             * X coordinate of the mouse pointer in DIP.
-             */
-            x: number;
-            /**
-             * Y coordinate of the mouse pointer in DIP.
-             */
-            y: number;
-            /**
-             * Mouse button. Only "none", "left", "right" are supported.
-             */
-            button: MouseButton;
-            /**
-             * Time at which the event occurred (default: current time).
-             */
-            timestamp?: TimeSinceEpoch;
-            /**
-             * X delta in DIP for mouse wheel event (default: 0).
-             */
-            deltaX?: number;
-            /**
-             * Y delta in DIP for mouse wheel event (default: 0).
-             */
-            deltaY?: number;
-            /**
-             * Bit field representing pressed modifier keys. Alt=1, Ctrl=2, Meta/Command=4, Shift=8
-(default: 0).
-             */
-            modifiers?: number;
-            /**
-             * Number of times the mouse button was clicked (default: 0).
-             */
-            clickCount?: number;
-        }
-        export type emulateTouchFromMouseEventReturnValue = {
-        }
-        /**
-         * Ignores input events (useful while auditing page).
-         */
-        export type setIgnoreInputEventsParameters = {
-            /**
-             * Ignores input events processing when set to true.
-             */
-            ignore: boolean;
-        }
-        export type setIgnoreInputEventsReturnValue = {
-        }
-        /**
-         * Synthesizes a pinch gesture over a time period by issuing appropriate touch events.
-         */
-        export type synthesizePinchGestureParameters = {
-            /**
-             * X coordinate of the start of the gesture in CSS pixels.
-             */
-            x: number;
-            /**
-             * Y coordinate of the start of the gesture in CSS pixels.
-             */
-            y: number;
-            /**
-             * Relative scale factor after zooming (>1.0 zooms in, <1.0 zooms out).
-             */
-            scaleFactor: number;
-            /**
-             * Relative pointer speed in pixels per second (default: 800).
-             */
-            relativeSpeed?: number;
-            /**
-             * Which type of input events to be generated (default: 'default', which queries the platform
-for the preferred input type).
-             */
-            gestureSourceType?: GestureSourceType;
-        }
-        export type synthesizePinchGestureReturnValue = {
-        }
-        /**
-         * Synthesizes a scroll gesture over a time period by issuing appropriate touch events.
-         */
-        export type synthesizeScrollGestureParameters = {
-            /**
-             * X coordinate of the start of the gesture in CSS pixels.
-             */
-            x: number;
-            /**
-             * Y coordinate of the start of the gesture in CSS pixels.
-             */
-            y: number;
-            /**
-             * The distance to scroll along the X axis (positive to scroll left).
-             */
-            xDistance?: number;
-            /**
-             * The distance to scroll along the Y axis (positive to scroll up).
-             */
-            yDistance?: number;
-            /**
-             * The number of additional pixels to scroll back along the X axis, in addition to the given
-distance.
-             */
-            xOverscroll?: number;
-            /**
-             * The number of additional pixels to scroll back along the Y axis, in addition to the given
-distance.
-             */
-            yOverscroll?: number;
-            /**
-             * Prevent fling (default: true).
-             */
-            preventFling?: boolean;
-            /**
-             * Swipe speed in pixels per second (default: 800).
-             */
-            speed?: number;
-            /**
-             * Which type of input events to be generated (default: 'default', which queries the platform
-for the preferred input type).
-             */
-            gestureSourceType?: GestureSourceType;
-            /**
-             * The number of times to repeat the gesture (default: 0).
-             */
-            repeatCount?: number;
-            /**
-             * The number of milliseconds delay between each repeat. (default: 250).
-             */
-            repeatDelayMs?: number;
-            /**
-             * The name of the interaction markers to generate, if not empty (default: "").
-             */
-            interactionMarkerName?: string;
-        }
-        export type synthesizeScrollGestureReturnValue = {
-        }
-        /**
-         * Synthesizes a tap gesture over a time period by issuing appropriate touch events.
-         */
-        export type synthesizeTapGestureParameters = {
-            /**
-             * X coordinate of the start of the gesture in CSS pixels.
-             */
-            x: number;
-            /**
-             * Y coordinate of the start of the gesture in CSS pixels.
-             */
-            y: number;
-            /**
-             * Duration between touchdown and touchup events in ms (default: 50).
-             */
-            duration?: number;
-            /**
-             * Number of times to perform the tap (e.g. 2 for double tap, default: 1).
-             */
-            tapCount?: number;
-            /**
-             * Which type of input events to be generated (default: 'default', which queries the platform
-for the preferred input type).
-             */
-            gestureSourceType?: GestureSourceType;
-        }
-        export type synthesizeTapGestureReturnValue = {
-        }
-    }
-    
-    export module Inspector {
-        
-        /**
-         * Fired when remote debugging connection is about to be terminated. Contains detach reason.
-         */
-        export type detachedPayload = {
-            /**
-             * The reason why connection has been terminated.
-             */
-            reason: string;
-        }
-        /**
-         * Fired when debugging target has crashed
-         */
-        export type targetCrashedPayload = void;
-        /**
-         * Fired when debugging target has reloaded after crash
-         */
-        export type targetReloadedAfterCrashPayload = void;
-        
-        /**
-         * Disables inspector domain notifications.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables inspector domain notifications.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-    }
-    
-    export module LayerTree {
-        /**
-         * Unique Layer identifier.
-         */
-        export type LayerId = string;
-        /**
-         * Unique snapshot identifier.
-         */
-        export type SnapshotId = string;
-        /**
-         * Rectangle where scrolling happens on the main thread.
-         */
-        export interface ScrollRect {
-            /**
-             * Rectangle itself.
-             */
-            rect: DOM.Rect;
-            /**
-             * Reason for rectangle to force scrolling on the main thread
-             */
-            type: "RepaintsOnScroll"|"TouchEventHandler"|"WheelEventHandler";
-        }
-        /**
-         * Sticky position constraints.
-         */
-        export interface StickyPositionConstraint {
-            /**
-             * Layout rectangle of the sticky element before being shifted
-             */
-            stickyBoxRect: DOM.Rect;
-            /**
-             * Layout rectangle of the containing block of the sticky element
-             */
-            containingBlockRect: DOM.Rect;
-            /**
-             * The nearest sticky layer that shifts the sticky box
-             */
-            nearestLayerShiftingStickyBox?: LayerId;
-            /**
-             * The nearest sticky layer that shifts the containing block
-             */
-            nearestLayerShiftingContainingBlock?: LayerId;
-        }
-        /**
-         * Serialized fragment of layer picture along with its offset within the layer.
-         */
-        export interface PictureTile {
-            /**
-             * Offset from owning layer left boundary
-             */
-            x: number;
-            /**
-             * Offset from owning layer top boundary
-             */
-            y: number;
-            /**
-             * Base64-encoded snapshot data.
-             */
-            picture: binary;
-        }
-        /**
-         * Information about a compositing layer.
-         */
-        export interface Layer {
-            /**
-             * The unique id for this layer.
-             */
-            layerId: LayerId;
-            /**
-             * The id of parent (not present for root).
-             */
-            parentLayerId?: LayerId;
-            /**
-             * The backend id for the node associated with this layer.
-             */
-            backendNodeId?: DOM.BackendNodeId;
-            /**
-             * Offset from parent layer, X coordinate.
-             */
-            offsetX: number;
-            /**
-             * Offset from parent layer, Y coordinate.
-             */
-            offsetY: number;
-            /**
-             * Layer width.
-             */
-            width: number;
-            /**
-             * Layer height.
-             */
-            height: number;
-            /**
-             * Transformation matrix for layer, default is identity matrix
-             */
-            transform?: number[];
-            /**
-             * Transform anchor point X, absent if no transform specified
-             */
-            anchorX?: number;
-            /**
-             * Transform anchor point Y, absent if no transform specified
-             */
-            anchorY?: number;
-            /**
-             * Transform anchor point Z, absent if no transform specified
-             */
-            anchorZ?: number;
-            /**
-             * Indicates how many time this layer has painted.
-             */
-            paintCount: number;
-            /**
-             * Indicates whether this layer hosts any content, rather than being used for
-transform/scrolling purposes only.
-             */
-            drawsContent: boolean;
-            /**
-             * Set if layer is not visible.
-             */
-            invisible?: boolean;
-            /**
-             * Rectangles scrolling on main thread only.
-             */
-            scrollRects?: ScrollRect[];
-            /**
-             * Sticky position constraint information
-             */
-            stickyPositionConstraint?: StickyPositionConstraint;
-        }
-        /**
-         * Array of timings, one per paint step.
-         */
-        export type PaintProfile = number[];
-        
-        export type layerPaintedPayload = {
-            /**
-             * The id of the painted layer.
-             */
-            layerId: LayerId;
-            /**
-             * Clip rectangle.
-             */
-            clip: DOM.Rect;
-        }
-        export type layerTreeDidChangePayload = {
-            /**
-             * Layer tree, absent if not in the comspositing mode.
-             */
-            layers?: Layer[];
-        }
-        
-        /**
-         * Provides the reasons why the given layer was composited.
-         */
-        export type compositingReasonsParameters = {
-            /**
-             * The id of the layer for which we want to get the reasons it was composited.
-             */
-            layerId: LayerId;
-        }
-        export type compositingReasonsReturnValue = {
-            /**
-             * A list of strings specifying reasons for the given layer to become composited.
-             */
-            compositingReasons: string[];
-            /**
-             * A list of strings specifying reason IDs for the given layer to become composited.
-             */
-            compositingReasonIds: string[];
-        }
-        /**
-         * Disables compositing tree inspection.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables compositing tree inspection.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Returns the snapshot identifier.
-         */
-        export type loadSnapshotParameters = {
-            /**
-             * An array of tiles composing the snapshot.
-             */
-            tiles: PictureTile[];
-        }
-        export type loadSnapshotReturnValue = {
-            /**
-             * The id of the snapshot.
-             */
-            snapshotId: SnapshotId;
-        }
-        /**
-         * Returns the layer snapshot identifier.
-         */
-        export type makeSnapshotParameters = {
-            /**
-             * The id of the layer.
-             */
-            layerId: LayerId;
-        }
-        export type makeSnapshotReturnValue = {
-            /**
-             * The id of the layer snapshot.
-             */
-            snapshotId: SnapshotId;
-        }
-        export type profileSnapshotParameters = {
-            /**
-             * The id of the layer snapshot.
-             */
-            snapshotId: SnapshotId;
-            /**
-             * The maximum number of times to replay the snapshot (1, if not specified).
-             */
-            minRepeatCount?: number;
-            /**
-             * The minimum duration (in seconds) to replay the snapshot.
-             */
-            minDuration?: number;
-            /**
-             * The clip rectangle to apply when replaying the snapshot.
-             */
-            clipRect?: DOM.Rect;
-        }
-        export type profileSnapshotReturnValue = {
-            /**
-             * The array of paint profiles, one per run.
-             */
-            timings: PaintProfile[];
-        }
-        /**
-         * Releases layer snapshot captured by the back-end.
-         */
-        export type releaseSnapshotParameters = {
-            /**
-             * The id of the layer snapshot.
-             */
-            snapshotId: SnapshotId;
-        }
-        export type releaseSnapshotReturnValue = {
-        }
-        /**
-         * Replays the layer snapshot and returns the resulting bitmap.
-         */
-        export type replaySnapshotParameters = {
-            /**
-             * The id of the layer snapshot.
-             */
-            snapshotId: SnapshotId;
-            /**
-             * The first step to replay from (replay from the very start if not specified).
-             */
-            fromStep?: number;
-            /**
-             * The last step to replay to (replay till the end if not specified).
-             */
-            toStep?: number;
-            /**
-             * The scale to apply while replaying (defaults to 1).
-             */
-            scale?: number;
-        }
-        export type replaySnapshotReturnValue = {
-            /**
-             * A data: URL for resulting image.
-             */
-            dataURL: string;
-        }
-        /**
-         * Replays the layer snapshot and returns canvas log.
-         */
-        export type snapshotCommandLogParameters = {
-            /**
-             * The id of the layer snapshot.
-             */
-            snapshotId: SnapshotId;
-        }
-        export type snapshotCommandLogReturnValue = {
-            /**
-             * The array of canvas function calls.
-             */
-            commandLog: object[];
-        }
-    }
-    
-    /**
-     * Provides access to log entries.
-     */
-    export module Log {
-        /**
-         * Log entry.
-         */
-        export interface LogEntry {
-            /**
-             * Log entry source.
-             */
-            source: "xml"|"javascript"|"network"|"storage"|"appcache"|"rendering"|"security"|"deprecation"|"worker"|"violation"|"intervention"|"recommendation"|"other";
-            /**
-             * Log entry severity.
-             */
-            level: "verbose"|"info"|"warning"|"error";
-            /**
-             * Logged text.
-             */
-            text: string;
-            /**
-             * Timestamp when this entry was added.
-             */
-            timestamp: Runtime.Timestamp;
-            /**
-             * URL of the resource if known.
-             */
-            url?: string;
-            /**
-             * Line number in the resource.
-             */
-            lineNumber?: number;
-            /**
-             * JavaScript stack trace.
-             */
-            stackTrace?: Runtime.StackTrace;
-            /**
-             * Identifier of the network request associated with this entry.
-             */
-            networkRequestId?: Network.RequestId;
-            /**
-             * Identifier of the worker associated with this entry.
-             */
-            workerId?: string;
-            /**
-             * Call arguments.
-             */
-            args?: Runtime.RemoteObject[];
-        }
-        /**
-         * Violation configuration setting.
-         */
-        export interface ViolationSetting {
-            /**
-             * Violation type.
-             */
-            name: "longTask"|"longLayout"|"blockedEvent"|"blockedParser"|"discouragedAPIUse"|"handler"|"recurringHandler";
-            /**
-             * Time threshold to trigger upon.
-             */
-            threshold: number;
-        }
-        
-        /**
-         * Issued when new message was logged.
-         */
-        export type entryAddedPayload = {
-            /**
-             * The entry.
-             */
-            entry: LogEntry;
-        }
-        
-        /**
-         * Clears the log.
-         */
-        export type clearParameters = {
-        }
-        export type clearReturnValue = {
-        }
-        /**
-         * Disables log domain, prevents further log entries from being reported to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables log domain, sends the entries collected so far to the client by means of the
-`entryAdded` notification.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * start violation reporting.
-         */
-        export type startViolationsReportParameters = {
-            /**
-             * Configuration for violations.
-             */
-            config: ViolationSetting[];
-        }
-        export type startViolationsReportReturnValue = {
-        }
-        /**
-         * Stop violation reporting.
-         */
-        export type stopViolationsReportParameters = {
-        }
-        export type stopViolationsReportReturnValue = {
-        }
-    }
-    
-    export module Memory {
-        /**
-         * Memory pressure level.
-         */
-        export type PressureLevel = "moderate"|"critical";
-        /**
-         * Heap profile sample.
-         */
-        export interface SamplingProfileNode {
-            /**
-             * Size of the sampled allocation.
-             */
-            size: number;
-            /**
-             * Total bytes attributed to this sample.
-             */
-            total: number;
-            /**
-             * Execution stack at the point of allocation.
-             */
-            stack: string[];
-        }
-        /**
-         * Array of heap profile samples.
-         */
-        export interface SamplingProfile {
-            samples: SamplingProfileNode[];
-            modules: Module[];
-        }
-        /**
-         * Executable module information
-         */
-        export interface Module {
-            /**
-             * Name of the module.
-             */
-            name: string;
-            /**
-             * UUID of the module.
-             */
-            uuid: string;
-            /**
-             * Base address where the module is loaded into memory. Encoded as a decimal
-or hexadecimal (0x prefixed) string.
-             */
-            baseAddress: string;
-            /**
-             * Size of the module in bytes.
-             */
-            size: number;
-        }
-        
-        
-        export type getDOMCountersParameters = {
-        }
-        export type getDOMCountersReturnValue = {
-            documents: number;
-            nodes: number;
-            jsEventListeners: number;
-        }
-        export type prepareForLeakDetectionParameters = {
-        }
-        export type prepareForLeakDetectionReturnValue = {
-        }
-        /**
-         * Simulate OomIntervention by purging V8 memory.
-         */
-        export type forciblyPurgeJavaScriptMemoryParameters = {
-        }
-        export type forciblyPurgeJavaScriptMemoryReturnValue = {
-        }
-        /**
-         * Enable/disable suppressing memory pressure notifications in all processes.
-         */
-        export type setPressureNotificationsSuppressedParameters = {
-            /**
-             * If true, memory pressure notifications will be suppressed.
-             */
-            suppressed: boolean;
-        }
-        export type setPressureNotificationsSuppressedReturnValue = {
-        }
-        /**
-         * Simulate a memory pressure notification in all processes.
-         */
-        export type simulatePressureNotificationParameters = {
-            /**
-             * Memory pressure level of the notification.
-             */
-            level: PressureLevel;
-        }
-        export type simulatePressureNotificationReturnValue = {
-        }
-        /**
-         * Start collecting native memory profile.
-         */
-        export type startSamplingParameters = {
-            /**
-             * Average number of bytes between samples.
-             */
-            samplingInterval?: number;
-            /**
-             * Do not randomize intervals between samples.
-             */
-            suppressRandomness?: boolean;
-        }
-        export type startSamplingReturnValue = {
-        }
-        /**
-         * Stop collecting native memory profile.
-         */
-        export type stopSamplingParameters = {
-        }
-        export type stopSamplingReturnValue = {
-        }
-        /**
-         * Retrieve native memory allocations profile
-collected since renderer process startup.
-         */
-        export type getAllTimeSamplingProfileParameters = {
-        }
-        export type getAllTimeSamplingProfileReturnValue = {
-            profile: SamplingProfile;
-        }
-        /**
-         * Retrieve native memory allocations profile
-collected since browser process startup.
-         */
-        export type getBrowserSamplingProfileParameters = {
-        }
-        export type getBrowserSamplingProfileReturnValue = {
-            profile: SamplingProfile;
-        }
-        /**
-         * Retrieve native memory allocations profile collected since last
-`startSampling` call.
-         */
-        export type getSamplingProfileParameters = {
-        }
-        export type getSamplingProfileReturnValue = {
-            profile: SamplingProfile;
-        }
-    }
-    
-    /**
-     * Network domain allows tracking network activities of the page. It exposes information about http,
-file, data and other requests and responses, their headers, bodies, timing, etc.
-     */
-    export module Network {
-        /**
-         * Resource type as it was perceived by the rendering engine.
-         */
-        export type ResourceType = "Document"|"Stylesheet"|"Image"|"Media"|"Font"|"Script"|"TextTrack"|"XHR"|"Fetch"|"EventSource"|"WebSocket"|"Manifest"|"SignedExchange"|"Ping"|"CSPViolationReport"|"Other";
-        /**
-         * Unique loader identifier.
-         */
-        export type LoaderId = string;
-        /**
-         * Unique request identifier.
-         */
-        export type RequestId = string;
-        /**
-         * Unique intercepted request identifier.
-         */
-        export type InterceptionId = string;
-        /**
-         * Network level fetch failure reason.
-         */
-        export type ErrorReason = "Failed"|"Aborted"|"TimedOut"|"AccessDenied"|"ConnectionClosed"|"ConnectionReset"|"ConnectionRefused"|"ConnectionAborted"|"ConnectionFailed"|"NameNotResolved"|"InternetDisconnected"|"AddressUnreachable"|"BlockedByClient"|"BlockedByResponse";
-        /**
-         * UTC time in seconds, counted from January 1, 1970.
-         */
-        export type TimeSinceEpoch = number;
-        /**
-         * Monotonically increasing time in seconds since an arbitrary point in the past.
-         */
-        export type MonotonicTime = number;
-        /**
-         * Request / response headers as keys / values of JSON object.
-         */
-        export type Headers = object;
-        /**
-         * The underlying connection technology that the browser is supposedly using.
-         */
-        export type ConnectionType = "none"|"cellular2g"|"cellular3g"|"cellular4g"|"bluetooth"|"ethernet"|"wifi"|"wimax"|"other";
-        /**
-         * Represents the cookie's 'SameSite' status:
-https://tools.ietf.org/html/draft-west-first-party-cookies
-         */
-        export type CookieSameSite = "Strict"|"Lax"|"None";
-        /**
-         * Represents the cookie's 'Priority' status:
-https://tools.ietf.org/html/draft-west-cookie-priority-00
-         */
-        export type CookiePriority = "Low"|"Medium"|"High";
-        /**
-         * Timing information for the request.
-         */
-        export interface ResourceTiming {
-            /**
-             * Timing's requestTime is a baseline in seconds, while the other numbers are ticks in
-milliseconds relatively to this requestTime.
-             */
-            requestTime: number;
-            /**
-             * Started resolving proxy.
-             */
-            proxyStart: number;
-            /**
-             * Finished resolving proxy.
-             */
-            proxyEnd: number;
-            /**
-             * Started DNS address resolve.
-             */
-            dnsStart: number;
-            /**
-             * Finished DNS address resolve.
-             */
-            dnsEnd: number;
-            /**
-             * Started connecting to the remote host.
-             */
-            connectStart: number;
-            /**
-             * Connected to the remote host.
-             */
-            connectEnd: number;
-            /**
-             * Started SSL handshake.
-             */
-            sslStart: number;
-            /**
-             * Finished SSL handshake.
-             */
-            sslEnd: number;
-            /**
-             * Started running ServiceWorker.
-             */
-            workerStart: number;
-            /**
-             * Finished Starting ServiceWorker.
-             */
-            workerReady: number;
-            /**
-             * Started sending request.
-             */
-            sendStart: number;
-            /**
-             * Finished sending request.
-             */
-            sendEnd: number;
-            /**
-             * Time the server started pushing request.
-             */
-            pushStart: number;
-            /**
-             * Time the server finished pushing request.
-             */
-            pushEnd: number;
-            /**
-             * Finished receiving response headers.
-             */
-            receiveHeadersEnd: number;
-        }
-        /**
-         * Loading priority of a resource request.
-         */
-        export type ResourcePriority = "VeryLow"|"Low"|"Medium"|"High"|"VeryHigh";
-        /**
-         * HTTP request data.
-         */
-        export interface Request {
-            /**
-             * Request URL (without fragment).
-             */
-            url: string;
-            /**
-             * Fragment of the requested URL starting with hash, if present.
-             */
-            urlFragment?: string;
-            /**
-             * HTTP request method.
-             */
-            method: string;
-            /**
-             * HTTP request headers.
-             */
-            headers: Headers;
-            /**
-             * HTTP POST request data.
-             */
-            postData?: string;
-            /**
-             * True when the request has POST data. Note that postData might still be omitted when this flag is true when the data is too long.
-             */
-            hasPostData?: boolean;
-            /**
-             * The mixed content type of the request.
-             */
-            mixedContentType?: Security.MixedContentType;
-            /**
-             * Priority of the resource request at the time request is sent.
-             */
-            initialPriority: ResourcePriority;
-            /**
-             * The referrer policy of the request, as defined in https://www.w3.org/TR/referrer-policy/
-             */
-            referrerPolicy: "unsafe-url"|"no-referrer-when-downgrade"|"no-referrer"|"origin"|"origin-when-cross-origin"|"same-origin"|"strict-origin"|"strict-origin-when-cross-origin";
-            /**
-             * Whether is loaded via link preload.
-             */
-            isLinkPreload?: boolean;
-        }
-        /**
-         * Details of a signed certificate timestamp (SCT).
-         */
-        export interface SignedCertificateTimestamp {
-            /**
-             * Validation status.
-             */
-            status: string;
-            /**
-             * Origin.
-             */
-            origin: string;
-            /**
-             * Log name / description.
-             */
-            logDescription: string;
-            /**
-             * Log ID.
-             */
-            logId: string;
-            /**
-             * Issuance date.
-             */
-            timestamp: TimeSinceEpoch;
-            /**
-             * Hash algorithm.
-             */
-            hashAlgorithm: string;
-            /**
-             * Signature algorithm.
-             */
-            signatureAlgorithm: string;
-            /**
-             * Signature data.
-             */
-            signatureData: string;
-        }
-        /**
-         * Security details about a request.
-         */
-        export interface SecurityDetails {
-            /**
-             * Protocol name (e.g. "TLS 1.2" or "QUIC").
-             */
-            protocol: string;
-            /**
-             * Key Exchange used by the connection, or the empty string if not applicable.
-             */
-            keyExchange: string;
-            /**
-             * (EC)DH group used by the connection, if applicable.
-             */
-            keyExchangeGroup?: string;
-            /**
-             * Cipher name.
-             */
-            cipher: string;
-            /**
-             * TLS MAC. Note that AEAD ciphers do not have separate MACs.
-             */
-            mac?: string;
-            /**
-             * Certificate ID value.
-             */
-            certificateId: Security.CertificateId;
-            /**
-             * Certificate subject name.
-             */
-            subjectName: string;
-            /**
-             * Subject Alternative Name (SAN) DNS names and IP addresses.
-             */
-            sanList: string[];
-            /**
-             * Name of the issuing CA.
-             */
-            issuer: string;
-            /**
-             * Certificate valid from date.
-             */
-            validFrom: TimeSinceEpoch;
-            /**
-             * Certificate valid to (expiration) date
-             */
-            validTo: TimeSinceEpoch;
-            /**
-             * List of signed certificate timestamps (SCTs).
-             */
-            signedCertificateTimestampList: SignedCertificateTimestamp[];
-            /**
-             * Whether the request complied with Certificate Transparency policy
-             */
-            certificateTransparencyCompliance: CertificateTransparencyCompliance;
-        }
-        /**
-         * Whether the request complied with Certificate Transparency policy.
-         */
-        export type CertificateTransparencyCompliance = "unknown"|"not-compliant"|"compliant";
-        /**
-         * The reason why request was blocked.
-         */
-        export type BlockedReason = "other"|"csp"|"mixed-content"|"origin"|"inspector"|"subresource-filter"|"content-type"|"collapsed-by-client"|"coep-frame-resource-needs-coep-header"|"coop-sandboxed-iframe-cannot-navigate-to-coop-page"|"corp-not-same-origin"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep"|"corp-not-same-site";
-        /**
-         * HTTP response data.
-         */
-        export interface Response {
-            /**
-             * Response URL. This URL can be different from CachedResource.url in case of redirect.
-             */
-            url: string;
-            /**
-             * HTTP response status code.
-             */
-            status: number;
-            /**
-             * HTTP response status text.
-             */
-            statusText: string;
-            /**
-             * HTTP response headers.
-             */
-            headers: Headers;
-            /**
-             * HTTP response headers text.
-             */
-            headersText?: string;
-            /**
-             * Resource mimeType as determined by the browser.
-             */
-            mimeType: string;
-            /**
-             * Refined HTTP request headers that were actually transmitted over the network.
-             */
-            requestHeaders?: Headers;
-            /**
-             * HTTP request headers text.
-             */
-            requestHeadersText?: string;
-            /**
-             * Specifies whether physical connection was actually reused for this request.
-             */
-            connectionReused: boolean;
-            /**
-             * Physical connection id that was actually used for this request.
-             */
-            connectionId: number;
-            /**
-             * Remote IP address.
-             */
-            remoteIPAddress?: string;
-            /**
-             * Remote port.
-             */
-            remotePort?: number;
-            /**
-             * Specifies that the request was served from the disk cache.
-             */
-            fromDiskCache?: boolean;
-            /**
-             * Specifies that the request was served from the ServiceWorker.
-             */
-            fromServiceWorker?: boolean;
-            /**
-             * Specifies that the request was served from the prefetch cache.
-             */
-            fromPrefetchCache?: boolean;
-            /**
-             * Total number of bytes received for this request so far.
-             */
-            encodedDataLength: number;
-            /**
-             * Timing information for the given request.
-             */
-            timing?: ResourceTiming;
-            /**
-             * Protocol used to fetch this request.
-             */
-            protocol?: string;
-            /**
-             * Security state of the request resource.
-             */
-            securityState: Security.SecurityState;
-            /**
-             * Security details for the request.
-             */
-            securityDetails?: SecurityDetails;
-        }
-        /**
-         * WebSocket request data.
-         */
-        export interface WebSocketRequest {
-            /**
-             * HTTP request headers.
-             */
-            headers: Headers;
-        }
-        /**
-         * WebSocket response data.
-         */
-        export interface WebSocketResponse {
-            /**
-             * HTTP response status code.
-             */
-            status: number;
-            /**
-             * HTTP response status text.
-             */
-            statusText: string;
-            /**
-             * HTTP response headers.
-             */
-            headers: Headers;
-            /**
-             * HTTP response headers text.
-             */
-            headersText?: string;
-            /**
-             * HTTP request headers.
-             */
-            requestHeaders?: Headers;
-            /**
-             * HTTP request headers text.
-             */
-            requestHeadersText?: string;
-        }
-        /**
-         * WebSocket message data. This represents an entire WebSocket message, not just a fragmented frame as the name suggests.
-         */
-        export interface WebSocketFrame {
-            /**
-             * WebSocket message opcode.
-             */
-            opcode: number;
-            /**
-             * WebSocket message mask.
-             */
-            mask: boolean;
-            /**
-             * WebSocket message payload data.
-If the opcode is 1, this is a text message and payloadData is a UTF-8 string.
-If the opcode isn't 1, then payloadData is a base64 encoded string representing binary data.
-             */
-            payloadData: string;
-        }
-        /**
-         * Information about the cached resource.
-         */
-        export interface CachedResource {
-            /**
-             * Resource URL. This is the url of the original network request.
-             */
-            url: string;
-            /**
-             * Type of this resource.
-             */
-            type: ResourceType;
-            /**
-             * Cached response data.
-             */
-            response?: Response;
-            /**
-             * Cached response body size.
-             */
-            bodySize: number;
-        }
-        /**
-         * Information about the request initiator.
-         */
-        export interface Initiator {
-            /**
-             * Type of this initiator.
-             */
-            type: "parser"|"script"|"preload"|"SignedExchange"|"other";
-            /**
-             * Initiator JavaScript stack trace, set for Script only.
-             */
-            stack?: Runtime.StackTrace;
-            /**
-             * Initiator URL, set for Parser type or for Script type (when script is importing module) or for SignedExchange type.
-             */
-            url?: string;
-            /**
-             * Initiator line number, set for Parser type or for Script type (when script is importing
-module) (0-based).
-             */
-            lineNumber?: number;
-        }
-        /**
-         * Cookie object
-         */
-        export interface Cookie {
-            /**
-             * Cookie name.
-             */
-            name: string;
-            /**
-             * Cookie value.
-             */
-            value: string;
-            /**
-             * Cookie domain.
-             */
-            domain: string;
-            /**
-             * Cookie path.
-             */
-            path: string;
-            /**
-             * Cookie expiration date as the number of seconds since the UNIX epoch.
-             */
-            expires: number;
-            /**
-             * Cookie size.
-             */
-            size: number;
-            /**
-             * True if cookie is http-only.
-             */
-            httpOnly: boolean;
-            /**
-             * True if cookie is secure.
-             */
-            secure: boolean;
-            /**
-             * True in case of session cookie.
-             */
-            session: boolean;
-            /**
-             * Cookie SameSite type.
-             */
-            sameSite?: CookieSameSite;
-            /**
-             * Cookie Priority
-             */
-            priority: CookiePriority;
-        }
-        /**
-         * Types of reasons why a cookie may not be stored from a response.
-         */
-        export type SetCookieBlockedReason = "SecureOnly"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"SyntaxError"|"SchemeNotSupported"|"OverwriteSecure"|"InvalidDomain"|"InvalidPrefix"|"UnknownError";
-        /**
-         * Types of reasons why a cookie may not be sent with a request.
-         */
-        export type CookieBlockedReason = "SecureOnly"|"NotOnPath"|"DomainMismatch"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"UnknownError";
-        /**
-         * A cookie which was not stored from a response with the corresponding reason.
-         */
-        export interface BlockedSetCookieWithReason {
-            /**
-             * The reason(s) this cookie was blocked.
-             */
-            blockedReasons: SetCookieBlockedReason[];
-            /**
-             * The string representing this individual cookie as it would appear in the header.
-This is not the entire "cookie" or "set-cookie" header which could have multiple cookies.
-             */
-            cookieLine: string;
-            /**
-             * The cookie object which represents the cookie which was not stored. It is optional because
-sometimes complete cookie information is not available, such as in the case of parsing
-errors.
-             */
-            cookie?: Cookie;
-        }
-        /**
-         * A cookie with was not sent with a request with the corresponding reason.
-         */
-        export interface BlockedCookieWithReason {
-            /**
-             * The reason(s) the cookie was blocked.
-             */
-            blockedReasons: CookieBlockedReason[];
-            /**
-             * The cookie object representing the cookie which was not sent.
-             */
-            cookie: Cookie;
-        }
-        /**
-         * Cookie parameter object
-         */
-        export interface CookieParam {
-            /**
-             * Cookie name.
-             */
-            name: string;
-            /**
-             * Cookie value.
-             */
-            value: string;
-            /**
-             * The request-URI to associate with the setting of the cookie. This value can affect the
-default domain and path values of the created cookie.
-             */
-            url?: string;
-            /**
-             * Cookie domain.
-             */
-            domain?: string;
-            /**
-             * Cookie path.
-             */
-            path?: string;
-            /**
-             * True if cookie is secure.
-             */
-            secure?: boolean;
-            /**
-             * True if cookie is http-only.
-             */
-            httpOnly?: boolean;
-            /**
-             * Cookie SameSite type.
-             */
-            sameSite?: CookieSameSite;
-            /**
-             * Cookie expiration date, session cookie if not set
-             */
-            expires?: TimeSinceEpoch;
-            /**
-             * Cookie Priority.
-             */
-            priority?: CookiePriority;
-        }
-        /**
-         * Authorization challenge for HTTP status code 401 or 407.
-         */
-        export interface AuthChallenge {
-            /**
-             * Source of the authentication challenge.
-             */
-            source?: "Server"|"Proxy";
-            /**
-             * Origin of the challenger.
-             */
-            origin: string;
-            /**
-             * The authentication scheme used, such as basic or digest
-             */
-            scheme: string;
-            /**
-             * The realm of the challenge. May be empty.
-             */
-            realm: string;
-        }
-        /**
-         * Response to an AuthChallenge.
-         */
-        export interface AuthChallengeResponse {
-            /**
-             * The decision on what to do in response to the authorization challenge.  Default means
-deferring to the default behavior of the net stack, which will likely either the Cancel
-authentication or display a popup dialog box.
-             */
-            response: "Default"|"CancelAuth"|"ProvideCredentials";
-            /**
-             * The username to provide, possibly empty. Should only be set if response is
-ProvideCredentials.
-             */
-            username?: string;
-            /**
-             * The password to provide, possibly empty. Should only be set if response is
-ProvideCredentials.
-             */
-            password?: string;
-        }
-        /**
-         * Stages of the interception to begin intercepting. Request will intercept before the request is
-sent. Response will intercept after the response is received.
-         */
-        export type InterceptionStage = "Request"|"HeadersReceived";
-        /**
-         * Request pattern for interception.
-         */
-        export interface RequestPattern {
-            /**
-             * Wildcards ('*' -> zero or more, '?' -> exactly one) are allowed. Escape character is
-backslash. Omitting is equivalent to "*".
-             */
-            urlPattern?: string;
-            /**
-             * If set, only requests for matching resource types will be intercepted.
-             */
-            resourceType?: ResourceType;
-            /**
-             * Stage at wich to begin intercepting requests. Default is Request.
-             */
-            interceptionStage?: InterceptionStage;
-        }
-        /**
-         * Information about a signed exchange signature.
-https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-impl.html#rfc.section.3.1
-         */
-        export interface SignedExchangeSignature {
-            /**
-             * Signed exchange signature label.
-             */
-            label: string;
-            /**
-             * The hex string of signed exchange signature.
-             */
-            signature: string;
-            /**
-             * Signed exchange signature integrity.
-             */
-            integrity: string;
-            /**
-             * Signed exchange signature cert Url.
-             */
-            certUrl?: string;
-            /**
-             * The hex string of signed exchange signature cert sha256.
-             */
-            certSha256?: string;
-            /**
-             * Signed exchange signature validity Url.
-             */
-            validityUrl: string;
-            /**
-             * Signed exchange signature date.
-             */
-            date: number;
-            /**
-             * Signed exchange signature expires.
-             */
-            expires: number;
-            /**
-             * The encoded certificates.
-             */
-            certificates?: string[];
-        }
-        /**
-         * Information about a signed exchange header.
-https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-impl.html#cbor-representation
-         */
-        export interface SignedExchangeHeader {
-            /**
-             * Signed exchange request URL.
-             */
-            requestUrl: string;
-            /**
-             * Signed exchange response code.
-             */
-            responseCode: number;
-            /**
-             * Signed exchange response headers.
-             */
-            responseHeaders: Headers;
-            /**
-             * Signed exchange response signature.
-             */
-            signatures: SignedExchangeSignature[];
-            /**
-             * Signed exchange header integrity hash in the form of "sha256-<base64-hash-value>".
-             */
-            headerIntegrity: string;
-        }
-        /**
-         * Field type for a signed exchange related error.
-         */
-        export type SignedExchangeErrorField = "signatureSig"|"signatureIntegrity"|"signatureCertUrl"|"signatureCertSha256"|"signatureValidityUrl"|"signatureTimestamps";
-        /**
-         * Information about a signed exchange response.
-         */
-        export interface SignedExchangeError {
-            /**
-             * Error message.
-             */
-            message: string;
-            /**
-             * The index of the signature which caused the error.
-             */
-            signatureIndex?: number;
-            /**
-             * The field which caused the error.
-             */
-            errorField?: SignedExchangeErrorField;
-        }
-        /**
-         * Information about a signed exchange response.
-         */
-        export interface SignedExchangeInfo {
-            /**
-             * The outer response of signed HTTP exchange which was received from network.
-             */
-            outerResponse: Response;
-            /**
-             * Information about the signed exchange header.
-             */
-            header?: SignedExchangeHeader;
-            /**
-             * Security details for the signed exchange header.
-             */
-            securityDetails?: SecurityDetails;
-            /**
-             * Errors occurred while handling the signed exchagne.
-             */
-            errors?: SignedExchangeError[];
-        }
-        
-        /**
-         * Fired when data chunk was received over the network.
-         */
-        export type dataReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Data chunk length.
-             */
-            dataLength: number;
-            /**
-             * Actual bytes received (might be less than dataLength for compressed encodings).
-             */
-            encodedDataLength: number;
-        }
-        /**
-         * Fired when EventSource message is received.
-         */
-        export type eventSourceMessageReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Message type.
-             */
-            eventName: string;
-            /**
-             * Message identifier.
-             */
-            eventId: string;
-            /**
-             * Message content.
-             */
-            data: string;
-        }
-        /**
-         * Fired when HTTP request has failed to load.
-         */
-        export type loadingFailedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Resource type.
-             */
-            type: ResourceType;
-            /**
-             * User friendly error message.
-             */
-            errorText: string;
-            /**
-             * True if loading was canceled.
-             */
-            canceled?: boolean;
-            /**
-             * The reason why loading was blocked, if any.
-             */
-            blockedReason?: BlockedReason;
-        }
-        /**
-         * Fired when HTTP request has finished loading.
-         */
-        export type loadingFinishedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Total number of bytes received for this request.
-             */
-            encodedDataLength: number;
-            /**
-             * Set when 1) response was blocked by Cross-Origin Read Blocking and also
-2) this needs to be reported to the DevTools console.
-             */
-            shouldReportCorbBlocking?: boolean;
-        }
-        /**
-         * Details of an intercepted HTTP request, which must be either allowed, blocked, modified or
-mocked.
-Deprecated, use Fetch.requestPaused instead.
-         */
-        export type requestInterceptedPayload = {
-            /**
-             * Each request the page makes will have a unique id, however if any redirects are encountered
-while processing that fetch, they will be reported with the same id as the original fetch.
-Likewise if HTTP authentication is needed then the same fetch id will be used.
-             */
-            interceptionId: InterceptionId;
-            request: Request;
-            /**
-             * The id of the frame that initiated the request.
-             */
-            frameId: Page.FrameId;
-            /**
-             * How the requested resource will be used.
-             */
-            resourceType: ResourceType;
-            /**
-             * Whether this is a navigation request, which can abort the navigation completely.
-             */
-            isNavigationRequest: boolean;
-            /**
-             * Set if the request is a navigation that will result in a download.
-Only present after response is received from the server (i.e. HeadersReceived stage).
-             */
-            isDownload?: boolean;
-            /**
-             * Redirect location, only sent if a redirect was intercepted.
-             */
-            redirectUrl?: string;
-            /**
-             * Details of the Authorization Challenge encountered. If this is set then
-continueInterceptedRequest must contain an authChallengeResponse.
-             */
-            authChallenge?: AuthChallenge;
-            /**
-             * Response error if intercepted at response stage or if redirect occurred while intercepting
-request.
-             */
-            responseErrorReason?: ErrorReason;
-            /**
-             * Response code if intercepted at response stage or if redirect occurred while intercepting
-request or auth retry occurred.
-             */
-            responseStatusCode?: number;
-            /**
-             * Response headers if intercepted at the response stage or if redirect occurred while
-intercepting request or auth retry occurred.
-             */
-            responseHeaders?: Headers;
-            /**
-             * If the intercepted request had a corresponding requestWillBeSent event fired for it, then
-this requestId will be the same as the requestId present in the requestWillBeSent event.
-             */
-            requestId?: RequestId;
-        }
-        /**
-         * Fired if request ended up loading from cache.
-         */
-        export type requestServedFromCachePayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-        }
-        /**
-         * Fired when page is about to send HTTP request.
-         */
-        export type requestWillBeSentPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Loader identifier. Empty string if the request is fetched from worker.
-             */
-            loaderId: LoaderId;
-            /**
-             * URL of the document this request is loaded for.
-             */
-            documentURL: string;
-            /**
-             * Request data.
-             */
-            request: Request;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Timestamp.
-             */
-            wallTime: TimeSinceEpoch;
-            /**
-             * Request initiator.
-             */
-            initiator: Initiator;
-            /**
-             * Redirect response data.
-             */
-            redirectResponse?: Response;
-            /**
-             * Type of this resource.
-             */
-            type?: ResourceType;
-            /**
-             * Frame identifier.
-             */
-            frameId?: Page.FrameId;
-            /**
-             * Whether the request is initiated by a user gesture. Defaults to false.
-             */
-            hasUserGesture?: boolean;
-        }
-        /**
-         * Fired when resource loading priority is changed
-         */
-        export type resourceChangedPriorityPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * New priority
-             */
-            newPriority: ResourcePriority;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-        }
-        /**
-         * Fired when a signed exchange was received over the network
-         */
-        export type signedExchangeReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Information about the signed exchange response.
-             */
-            info: SignedExchangeInfo;
-        }
-        /**
-         * Fired when HTTP response is available.
-         */
-        export type responseReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Loader identifier. Empty string if the request is fetched from worker.
-             */
-            loaderId: LoaderId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * Resource type.
-             */
-            type: ResourceType;
-            /**
-             * Response data.
-             */
-            response: Response;
-            /**
-             * Frame identifier.
-             */
-            frameId?: Page.FrameId;
-        }
-        /**
-         * Fired when WebSocket is closed.
-         */
-        export type webSocketClosedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-        }
-        /**
-         * Fired upon WebSocket creation.
-         */
-        export type webSocketCreatedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * WebSocket request URL.
-             */
-            url: string;
-            /**
-             * Request initiator.
-             */
-            initiator?: Initiator;
-        }
-        /**
-         * Fired when WebSocket message error occurs.
-         */
-        export type webSocketFrameErrorPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * WebSocket error message.
-             */
-            errorMessage: string;
-        }
-        /**
-         * Fired when WebSocket message is received.
-         */
-        export type webSocketFrameReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * WebSocket response data.
-             */
-            response: WebSocketFrame;
-        }
-        /**
-         * Fired when WebSocket message is sent.
-         */
-        export type webSocketFrameSentPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * WebSocket response data.
-             */
-            response: WebSocketFrame;
-        }
-        /**
-         * Fired when WebSocket handshake response becomes available.
-         */
-        export type webSocketHandshakeResponseReceivedPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * WebSocket response data.
-             */
-            response: WebSocketResponse;
-        }
-        /**
-         * Fired when WebSocket is about to initiate handshake.
-         */
-        export type webSocketWillSendHandshakeRequestPayload = {
-            /**
-             * Request identifier.
-             */
-            requestId: RequestId;
-            /**
-             * Timestamp.
-             */
-            timestamp: MonotonicTime;
-            /**
-             * UTC Timestamp.
-             */
-            wallTime: TimeSinceEpoch;
-            /**
-             * WebSocket request data.
-             */
-            request: WebSocketRequest;
-        }
-        /**
-         * Fired when additional information about a requestWillBeSent event is available from the
-network stack. Not every requestWillBeSent event will have an additional
-requestWillBeSentExtraInfo fired for it, and there is no guarantee whether requestWillBeSent
-or requestWillBeSentExtraInfo will be fired first for the same request.
-         */
-        export type requestWillBeSentExtraInfoPayload = {
-            /**
-             * Request identifier. Used to match this information to an existing requestWillBeSent event.
-             */
-            requestId: RequestId;
-            /**
-             * A list of cookies which will not be sent with this request along with corresponding reasons
-for blocking.
-             */
-            blockedCookies: BlockedCookieWithReason[];
-            /**
-             * Raw request headers as they will be sent over the wire.
-             */
-            headers: Headers;
-        }
-        /**
-         * Fired when additional information about a responseReceived event is available from the network
-stack. Not every responseReceived event will have an additional responseReceivedExtraInfo for
-it, and responseReceivedExtraInfo may be fired before or after responseReceived.
-         */
-        export type responseReceivedExtraInfoPayload = {
-            /**
-             * Request identifier. Used to match this information to another responseReceived event.
-             */
-            requestId: RequestId;
-            /**
-             * A list of cookies which were not stored from the response along with the corresponding
-reasons for blocking. The cookies here may not be valid due to syntax errors, which
-are represented by the invalid cookie line string instead of a proper cookie.
-             */
-            blockedCookies: BlockedSetCookieWithReason[];
-            /**
-             * Raw response headers as they were received over the wire.
-             */
-            headers: Headers;
-            /**
-             * Raw response header text as it was received over the wire. The raw text may not always be
-available, such as in the case of HTTP/2 or QUIC.
-             */
-            headersText?: string;
-        }
-        
-        /**
-         * Tells whether clearing browser cache is supported.
-         */
-        export type canClearBrowserCacheParameters = {
-        }
-        export type canClearBrowserCacheReturnValue = {
-            /**
-             * True if browser cache can be cleared.
-             */
-            result: boolean;
-        }
-        /**
-         * Tells whether clearing browser cookies is supported.
-         */
-        export type canClearBrowserCookiesParameters = {
-        }
-        export type canClearBrowserCookiesReturnValue = {
-            /**
-             * True if browser cookies can be cleared.
-             */
-            result: boolean;
-        }
-        /**
-         * Tells whether emulation of network conditions is supported.
-         */
-        export type canEmulateNetworkConditionsParameters = {
-        }
-        export type canEmulateNetworkConditionsReturnValue = {
-            /**
-             * True if emulation of network conditions is supported.
-             */
-            result: boolean;
-        }
-        /**
-         * Clears browser cache.
-         */
-        export type clearBrowserCacheParameters = {
-        }
-        export type clearBrowserCacheReturnValue = {
-        }
-        /**
-         * Clears browser cookies.
-         */
-        export type clearBrowserCookiesParameters = {
-        }
-        export type clearBrowserCookiesReturnValue = {
-        }
-        /**
-         * Response to Network.requestIntercepted which either modifies the request to continue with any
-modifications, or blocks it, or completes it with the provided response bytes. If a network
-fetch occurs as a result which encounters a redirect an additional Network.requestIntercepted
-event will be sent with the same InterceptionId.
-Deprecated, use Fetch.continueRequest, Fetch.fulfillRequest and Fetch.failRequest instead.
-         */
-        export type continueInterceptedRequestParameters = {
-            interceptionId: InterceptionId;
-            /**
-             * If set this causes the request to fail with the given reason. Passing `Aborted` for requests
-marked with `isNavigationRequest` also cancels the navigation. Must not be set in response
-to an authChallenge.
-             */
-            errorReason?: ErrorReason;
-            /**
-             * If set the requests completes using with the provided base64 encoded raw response, including
-HTTP status line and headers etc... Must not be set in response to an authChallenge.
-             */
-            rawResponse?: binary;
-            /**
-             * If set the request url will be modified in a way that's not observable by page. Must not be
-set in response to an authChallenge.
-             */
-            url?: string;
-            /**
-             * If set this allows the request method to be overridden. Must not be set in response to an
-authChallenge.
-             */
-            method?: string;
-            /**
-             * If set this allows postData to be set. Must not be set in response to an authChallenge.
-             */
-            postData?: string;
-            /**
-             * If set this allows the request headers to be changed. Must not be set in response to an
-authChallenge.
-             */
-            headers?: Headers;
-            /**
-             * Response to a requestIntercepted with an authChallenge. Must not be set otherwise.
-             */
-            authChallengeResponse?: AuthChallengeResponse;
-        }
-        export type continueInterceptedRequestReturnValue = {
-        }
-        /**
-         * Deletes browser cookies with matching name and url or domain/path pair.
-         */
-        export type deleteCookiesParameters = {
-            /**
-             * Name of the cookies to remove.
-             */
-            name: string;
-            /**
-             * If specified, deletes all the cookies with the given name where domain and path match
-provided URL.
-             */
-            url?: string;
-            /**
-             * If specified, deletes only cookies with the exact domain.
-             */
-            domain?: string;
-            /**
-             * If specified, deletes only cookies with the exact path.
-             */
-            path?: string;
-        }
-        export type deleteCookiesReturnValue = {
-        }
-        /**
-         * Disables network tracking, prevents network events from being sent to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Activates emulation of network conditions.
-         */
-        export type emulateNetworkConditionsParameters = {
-            /**
-             * True to emulate internet disconnection.
-             */
-            offline: boolean;
-            /**
-             * Minimum latency from request sent to response headers received (ms).
-             */
-            latency: number;
-            /**
-             * Maximal aggregated download throughput (bytes/sec). -1 disables download throttling.
-             */
-            downloadThroughput: number;
-            /**
-             * Maximal aggregated upload throughput (bytes/sec).  -1 disables upload throttling.
-             */
-            uploadThroughput: number;
-            /**
-             * Connection type if known.
-             */
-            connectionType?: ConnectionType;
-        }
-        export type emulateNetworkConditionsReturnValue = {
-        }
-        /**
-         * Enables network tracking, network events will now be delivered to the client.
-         */
-        export type enableParameters = {
-            /**
-             * Buffer size in bytes to use when preserving network payloads (XHRs, etc).
-             */
-            maxTotalBufferSize?: number;
-            /**
-             * Per-resource buffer size in bytes to use when preserving network payloads (XHRs, etc).
-             */
-            maxResourceBufferSize?: number;
-            /**
-             * Longest post body size (in bytes) that would be included in requestWillBeSent notification
-             */
-            maxPostDataSize?: number;
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Returns all browser cookies. Depending on the backend support, will return detailed cookie
-information in the `cookies` field.
-         */
-        export type getAllCookiesParameters = {
-        }
-        export type getAllCookiesReturnValue = {
-            /**
-             * Array of cookie objects.
-             */
-            cookies: Cookie[];
-        }
-        /**
-         * Returns the DER-encoded certificate.
-         */
-        export type getCertificateParameters = {
-            /**
-             * Origin to get certificate for.
-             */
-            origin: string;
-        }
-        export type getCertificateReturnValue = {
-            tableNames: string[];
-        }
-        /**
-         * Returns all browser cookies for the current URL. Depending on the backend support, will return
-detailed cookie information in the `cookies` field.
-         */
-        export type getCookiesParameters = {
-            /**
-             * The list of URLs for which applicable cookies will be fetched
-             */
-            urls?: string[];
-        }
-        export type getCookiesReturnValue = {
-            /**
-             * Array of cookie objects.
-             */
-            cookies: Cookie[];
-        }
-        /**
-         * Returns content served for the given request.
-         */
-        export type getResponseBodyParameters = {
-            /**
-             * Identifier of the network request to get content for.
-             */
-            requestId: RequestId;
-        }
-        export type getResponseBodyReturnValue = {
-            /**
-             * Response body.
-             */
-            body: string;
-            /**
-             * True, if content was sent as base64.
-             */
-            base64Encoded: boolean;
-        }
-        /**
-         * Returns post data sent with the request. Returns an error when no data was sent with the request.
-         */
-        export type getRequestPostDataParameters = {
-            /**
-             * Identifier of the network request to get content for.
-             */
-            requestId: RequestId;
-        }
-        export type getRequestPostDataReturnValue = {
-            /**
-             * Request body string, omitting files from multipart requests
-             */
-            postData: string;
-        }
-        /**
-         * Returns content served for the given currently intercepted request.
-         */
-        export type getResponseBodyForInterceptionParameters = {
-            /**
-             * Identifier for the intercepted request to get body for.
-             */
-            interceptionId: InterceptionId;
-        }
-        export type getResponseBodyForInterceptionReturnValue = {
-            /**
-             * Response body.
-             */
-            body: string;
-            /**
-             * True, if content was sent as base64.
-             */
-            base64Encoded: boolean;
-        }
-        /**
-         * Returns a handle to the stream representing the response body. Note that after this command,
-the intercepted request can't be continued as is -- you either need to cancel it or to provide
-the response body. The stream only supports sequential read, IO.read will fail if the position
-is specified.
-         */
-        export type takeResponseBodyForInterceptionAsStreamParameters = {
-            interceptionId: InterceptionId;
-        }
-        export type takeResponseBodyForInterceptionAsStreamReturnValue = {
-            stream: IO.StreamHandle;
-        }
-        /**
-         * This method sends a new XMLHttpRequest which is identical to the original one. The following
-parameters should be identical: method, url, async, request body, extra headers, withCredentials
-attribute, user, password.
-         */
-        export type replayXHRParameters = {
-            /**
-             * Identifier of XHR to replay.
-             */
-            requestId: RequestId;
-        }
-        export type replayXHRReturnValue = {
-        }
-        /**
-         * Searches for given string in response content.
-         */
-        export type searchInResponseBodyParameters = {
-            /**
-             * Identifier of the network response to search.
-             */
-            requestId: RequestId;
-            /**
-             * String to search for.
-             */
-            query: string;
-            /**
-             * If true, search is case sensitive.
-             */
-            caseSensitive?: boolean;
-            /**
-             * If true, treats string parameter as regex.
-             */
-            isRegex?: boolean;
-        }
-        export type searchInResponseBodyReturnValue = {
-            /**
-             * List of search matches.
-             */
-            result: Debugger.SearchMatch[];
-        }
-        /**
-         * Blocks URLs from loading.
-         */
-        export type setBlockedURLsParameters = {
-            /**
-             * URL patterns to block. Wildcards ('*') are allowed.
-             */
-            urls: string[];
-        }
-        export type setBlockedURLsReturnValue = {
-        }
-        /**
-         * Toggles ignoring of service worker for each request.
-         */
-        export type setBypassServiceWorkerParameters = {
-            /**
-             * Bypass service worker and load from network.
-             */
-            bypass: boolean;
-        }
-        export type setBypassServiceWorkerReturnValue = {
-        }
-        /**
-         * Toggles ignoring cache for each request. If `true`, cache will not be used.
-         */
-        export type setCacheDisabledParameters = {
-            /**
-             * Cache disabled state.
-             */
-            cacheDisabled: boolean;
-        }
-        export type setCacheDisabledReturnValue = {
-        }
-        /**
-         * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
-         */
-        export type setCookieParameters = {
-            /**
-             * Cookie name.
-             */
-            name: string;
-            /**
-             * Cookie value.
-             */
-            value: string;
-            /**
-             * The request-URI to associate with the setting of the cookie. This value can affect the
-default domain and path values of the created cookie.
-             */
-            url?: string;
-            /**
-             * Cookie domain.
-             */
-            domain?: string;
-            /**
-             * Cookie path.
-             */
-            path?: string;
-            /**
-             * True if cookie is secure.
-             */
-            secure?: boolean;
-            /**
-             * True if cookie is http-only.
-             */
-            httpOnly?: boolean;
-            /**
-             * Cookie SameSite type.
-             */
-            sameSite?: CookieSameSite;
-            /**
-             * Cookie expiration date, session cookie if not set
-             */
-            expires?: TimeSinceEpoch;
-            /**
-             * Cookie Priority type.
-             */
-            priority?: CookiePriority;
-        }
-        export type setCookieReturnValue = {
-            /**
-             * True if successfully set cookie.
-             */
-            success: boolean;
-        }
-        /**
-         * Sets given cookies.
-         */
-        export type setCookiesParameters = {
-            /**
-             * Cookies to be set.
-             */
-            cookies: CookieParam[];
-        }
-        export type setCookiesReturnValue = {
-        }
-        /**
-         * For testing.
-         */
-        export type setDataSizeLimitsForTestParameters = {
-            /**
-             * Maximum total buffer size.
-             */
-            maxTotalSize: number;
-            /**
-             * Maximum per-resource size.
-             */
-            maxResourceSize: number;
-        }
-        export type setDataSizeLimitsForTestReturnValue = {
-        }
-        /**
-         * Specifies whether to always send extra HTTP headers with the requests from this page.
-         */
-        export type setExtraHTTPHeadersParameters = {
-            /**
-             * Map with extra HTTP headers.
-             */
-            headers: Headers;
-        }
-        export type setExtraHTTPHeadersReturnValue = {
-        }
-        /**
-         * Sets the requests to intercept that match the provided patterns and optionally resource types.
-Deprecated, please use Fetch.enable instead.
-         */
-        export type setRequestInterceptionParameters = {
-            /**
-             * Requests matching any of these patterns will be forwarded and wait for the corresponding
-continueInterceptedRequest call.
-             */
-            patterns: RequestPattern[];
-        }
-        export type setRequestInterceptionReturnValue = {
-        }
-        /**
-         * Allows overriding user agent with the given string.
-         */
-        export type setUserAgentOverrideParameters = {
-            /**
-             * User agent to use.
-             */
-            userAgent: string;
-            /**
-             * Browser langugage to emulate.
-             */
-            acceptLanguage?: string;
-            /**
-             * The platform navigator.platform should return.
-             */
-            platform?: string;
-        }
-        export type setUserAgentOverrideReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain provides various functionality related to drawing atop the inspected page.
-     */
-    export module Overlay {
-        /**
-         * Configuration data for the highlighting of page elements.
-         */
-        export interface HighlightConfig {
-            /**
-             * Whether the node info tooltip should be shown (default: false).
-             */
-            showInfo?: boolean;
-            /**
-             * Whether the node styles in the tooltip (default: false).
-             */
-            showStyles?: boolean;
-            /**
-             * Whether the rulers should be shown (default: false).
-             */
-            showRulers?: boolean;
-            /**
-             * Whether the extension lines from node to the rulers should be shown (default: false).
-             */
-            showExtensionLines?: boolean;
-            /**
-             * The content box highlight fill color (default: transparent).
-             */
-            contentColor?: DOM.RGBA;
-            /**
-             * The padding highlight fill color (default: transparent).
-             */
-            paddingColor?: DOM.RGBA;
-            /**
-             * The border highlight fill color (default: transparent).
-             */
-            borderColor?: DOM.RGBA;
-            /**
-             * The margin highlight fill color (default: transparent).
-             */
-            marginColor?: DOM.RGBA;
-            /**
-             * The event target element highlight fill color (default: transparent).
-             */
-            eventTargetColor?: DOM.RGBA;
-            /**
-             * The shape outside fill color (default: transparent).
-             */
-            shapeColor?: DOM.RGBA;
-            /**
-             * The shape margin fill color (default: transparent).
-             */
-            shapeMarginColor?: DOM.RGBA;
-            /**
-             * The grid layout color (default: transparent).
-             */
-            cssGridColor?: DOM.RGBA;
-        }
-        export type InspectMode = "searchForNode"|"searchForUAShadowDOM"|"captureAreaScreenshot"|"showDistances"|"none";
-        
-        /**
-         * Fired when the node should be inspected. This happens after call to `setInspectMode` or when
-user manually inspects an element.
-         */
-        export type inspectNodeRequestedPayload = {
-            /**
-             * Id of the node to inspect.
-             */
-            backendNodeId: DOM.BackendNodeId;
-        }
-        /**
-         * Fired when the node should be highlighted. This happens after call to `setInspectMode`.
-         */
-        export type nodeHighlightRequestedPayload = {
-            nodeId: DOM.NodeId;
-        }
-        /**
-         * Fired when user asks to capture screenshot of some area on the page.
-         */
-        export type screenshotRequestedPayload = {
-            /**
-             * Viewport to capture, in device independent pixels (dip).
-             */
-            viewport: Page.Viewport;
-        }
-        /**
-         * Fired when user cancels the inspect mode.
-         */
-        export type inspectModeCanceledPayload = void;
-        
-        /**
-         * Disables domain notifications.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables domain notifications.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * For testing.
-         */
-        export type getHighlightObjectForTestParameters = {
-            /**
-             * Id of the node to get highlight object for.
-             */
-            nodeId: DOM.NodeId;
-            /**
-             * Whether to include distance info.
-             */
-            includeDistance?: boolean;
-            /**
-             * Whether to include style info.
-             */
-            includeStyle?: boolean;
-        }
-        export type getHighlightObjectForTestReturnValue = {
-            /**
-             * Highlight data for the node.
-             */
-            highlight: object;
-        }
-        /**
-         * Hides any highlight.
-         */
-        export type hideHighlightParameters = {
-        }
-        export type hideHighlightReturnValue = {
-        }
-        /**
-         * Highlights owner element of the frame with given id.
-         */
-        export type highlightFrameParameters = {
-            /**
-             * Identifier of the frame to highlight.
-             */
-            frameId: Page.FrameId;
-            /**
-             * The content box highlight fill color (default: transparent).
-             */
-            contentColor?: DOM.RGBA;
-            /**
-             * The content box highlight outline color (default: transparent).
-             */
-            contentOutlineColor?: DOM.RGBA;
-        }
-        export type highlightFrameReturnValue = {
-        }
-        /**
-         * Highlights DOM node with given id or with the given JavaScript object wrapper. Either nodeId or
-objectId must be specified.
-         */
-        export type highlightNodeParameters = {
-            /**
-             * A descriptor for the highlight appearance.
-             */
-            highlightConfig: HighlightConfig;
-            /**
-             * Identifier of the node to highlight.
-             */
-            nodeId?: DOM.NodeId;
-            /**
-             * Identifier of the backend node to highlight.
-             */
-            backendNodeId?: DOM.BackendNodeId;
-            /**
-             * JavaScript object id of the node to be highlighted.
-             */
-            objectId?: Runtime.RemoteObjectId;
-            /**
-             * Selectors to highlight relevant nodes.
-             */
-            selector?: string;
-        }
-        export type highlightNodeReturnValue = {
-        }
-        /**
-         * Highlights given quad. Coordinates are absolute with respect to the main frame viewport.
-         */
-        export type highlightQuadParameters = {
-            /**
-             * Quad to highlight
-             */
-            quad: DOM.Quad;
-            /**
-             * The highlight fill color (default: transparent).
-             */
-            color?: DOM.RGBA;
-            /**
-             * The highlight outline color (default: transparent).
-             */
-            outlineColor?: DOM.RGBA;
-        }
-        export type highlightQuadReturnValue = {
-        }
-        /**
-         * Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport.
-         */
-        export type highlightRectParameters = {
-            /**
-             * X coordinate
-             */
-            x: number;
-            /**
-             * Y coordinate
-             */
-            y: number;
-            /**
-             * Rectangle width
-             */
-            width: number;
-            /**
-             * Rectangle height
-             */
-            height: number;
-            /**
-             * The highlight fill color (default: transparent).
-             */
-            color?: DOM.RGBA;
-            /**
-             * The highlight outline color (default: transparent).
-             */
-            outlineColor?: DOM.RGBA;
-        }
-        export type highlightRectReturnValue = {
-        }
-        /**
-         * Enters the 'inspect' mode. In this mode, elements that user is hovering over are highlighted.
-Backend then generates 'inspectNodeRequested' event upon element selection.
-         */
-        export type setInspectModeParameters = {
-            /**
-             * Set an inspection mode.
-             */
-            mode: InspectMode;
-            /**
-             * A descriptor for the highlight appearance of hovered-over nodes. May be omitted if `enabled
-== false`.
-             */
-            highlightConfig?: HighlightConfig;
-        }
-        export type setInspectModeReturnValue = {
-        }
-        /**
-         * Highlights owner element of all frames detected to be ads.
-         */
-        export type setShowAdHighlightsParameters = {
-            /**
-             * True for showing ad highlights
-             */
-            show: boolean;
-        }
-        export type setShowAdHighlightsReturnValue = {
-        }
-        export type setPausedInDebuggerMessageParameters = {
-            /**
-             * The message to display, also triggers resume and step over controls.
-             */
-            message?: string;
-        }
-        export type setPausedInDebuggerMessageReturnValue = {
-        }
-        /**
-         * Requests that backend shows debug borders on layers
-         */
-        export type setShowDebugBordersParameters = {
-            /**
-             * True for showing debug borders
-             */
-            show: boolean;
-        }
-        export type setShowDebugBordersReturnValue = {
-        }
-        /**
-         * Requests that backend shows the FPS counter
-         */
-        export type setShowFPSCounterParameters = {
-            /**
-             * True for showing the FPS counter
-             */
-            show: boolean;
-        }
-        export type setShowFPSCounterReturnValue = {
-        }
-        /**
-         * Requests that backend shows paint rectangles
-         */
-        export type setShowPaintRectsParameters = {
-            /**
-             * True for showing paint rectangles
-             */
-            result: boolean;
-        }
-        export type setShowPaintRectsReturnValue = {
-        }
-        /**
-         * Requests that backend shows layout shift regions
-         */
-        export type setShowLayoutShiftRegionsParameters = {
-            /**
-             * True for showing layout shift regions
-             */
-            result: boolean;
-        }
-        export type setShowLayoutShiftRegionsReturnValue = {
-        }
-        /**
-         * Requests that backend shows scroll bottleneck rects
-         */
-        export type setShowScrollBottleneckRectsParameters = {
-            /**
-             * True for showing scroll bottleneck rects
-             */
-            show: boolean;
-        }
-        export type setShowScrollBottleneckRectsReturnValue = {
-        }
-        /**
-         * Requests that backend shows hit-test borders on layers
-         */
-        export type setShowHitTestBordersParameters = {
-            /**
-             * True for showing hit-test borders
-             */
-            show: boolean;
-        }
-        export type setShowHitTestBordersReturnValue = {
-        }
-        /**
-         * Paints viewport size upon main frame resize.
-         */
-        export type setShowViewportSizeOnResizeParameters = {
-            /**
-             * Whether to paint size or not.
-             */
-            show: boolean;
-        }
-        export type setShowViewportSizeOnResizeReturnValue = {
-        }
-    }
-    
-    /**
-     * Actions and events related to the inspected page belong to the page domain.
-     */
-    export module Page {
-        /**
-         * Unique frame identifier.
-         */
-        export type FrameId = string;
-        /**
-         * Information about the Frame on the page.
-         */
-        export interface Frame {
-            /**
-             * Frame unique identifier.
-             */
-            id: FrameId;
-            /**
-             * Parent frame identifier.
-             */
-            parentId?: string;
-            /**
-             * Identifier of the loader associated with this frame.
-             */
-            loaderId: Network.LoaderId;
-            /**
-             * Frame's name as specified in the tag.
-             */
-            name?: string;
-            /**
-             * Frame document's URL without fragment.
-             */
-            url: string;
-            /**
-             * Frame document's URL fragment including the '#'.
-             */
-            urlFragment?: string;
-            /**
-             * Frame document's security origin.
-             */
-            securityOrigin: string;
-            /**
-             * Frame document's mimeType as determined by the browser.
-             */
-            mimeType: string;
-            /**
-             * If the frame failed to load, this contains the URL that could not be loaded. Note that unlike url above, this URL may contain a fragment.
-             */
-            unreachableUrl?: string;
-        }
-        /**
-         * Information about the Resource on the page.
-         */
-        export interface FrameResource {
-            /**
-             * Resource URL.
-             */
-            url: string;
-            /**
-             * Type of this resource.
-             */
-            type: Network.ResourceType;
-            /**
-             * Resource mimeType as determined by the browser.
-             */
-            mimeType: string;
-            /**
-             * last-modified timestamp as reported by server.
-             */
-            lastModified?: Network.TimeSinceEpoch;
-            /**
-             * Resource content size.
-             */
-            contentSize?: number;
-            /**
-             * True if the resource failed to load.
-             */
-            failed?: boolean;
-            /**
-             * True if the resource was canceled during loading.
-             */
-            canceled?: boolean;
-        }
-        /**
-         * Information about the Frame hierarchy along with their cached resources.
-         */
-        export interface FrameResourceTree {
-            /**
-             * Frame information for this tree item.
-             */
-            frame: Frame;
-            /**
-             * Child frames.
-             */
-            childFrames?: FrameResourceTree[];
-            /**
-             * Information about frame resources.
-             */
-            resources: FrameResource[];
-        }
-        /**
-         * Information about the Frame hierarchy.
-         */
-        export interface FrameTree {
-            /**
-             * Frame information for this tree item.
-             */
-            frame: Frame;
-            /**
-             * Child frames.
-             */
-            childFrames?: FrameTree[];
-        }
-        /**
-         * Unique script identifier.
-         */
-        export type ScriptIdentifier = string;
-        /**
-         * Transition type.
-         */
-        export type TransitionType = "link"|"typed"|"address_bar"|"auto_bookmark"|"auto_subframe"|"manual_subframe"|"generated"|"auto_toplevel"|"form_submit"|"reload"|"keyword"|"keyword_generated"|"other";
-        /**
-         * Navigation history entry.
-         */
-        export interface NavigationEntry {
-            /**
-             * Unique id of the navigation history entry.
-             */
-            id: number;
-            /**
-             * URL of the navigation history entry.
-             */
-            url: string;
-            /**
-             * URL that the user typed in the url bar.
-             */
-            userTypedURL: string;
-            /**
-             * Title of the navigation history entry.
-             */
-            title: string;
-            /**
-             * Transition type.
-             */
-            transitionType: TransitionType;
-        }
-        /**
-         * Screencast frame metadata.
-         */
-        export interface ScreencastFrameMetadata {
-            /**
-             * Top offset in DIP.
-             */
-            offsetTop: number;
-            /**
-             * Page scale factor.
-             */
-            pageScaleFactor: number;
-            /**
-             * Device screen width in DIP.
-             */
-            deviceWidth: number;
-            /**
-             * Device screen height in DIP.
-             */
-            deviceHeight: number;
-            /**
-             * Position of horizontal scroll in CSS pixels.
-             */
-            scrollOffsetX: number;
-            /**
-             * Position of vertical scroll in CSS pixels.
-             */
-            scrollOffsetY: number;
-            /**
-             * Frame swap timestamp.
-             */
-            timestamp?: Network.TimeSinceEpoch;
-        }
-        /**
-         * Javascript dialog type.
-         */
-        export type DialogType = "alert"|"confirm"|"prompt"|"beforeunload";
-        /**
-         * Error while paring app manifest.
-         */
-        export interface AppManifestError {
-            /**
-             * Error message.
-             */
-            message: string;
-            /**
-             * If criticial, this is a non-recoverable parse error.
-             */
-            critical: number;
-            /**
-             * Error line.
-             */
-            line: number;
-            /**
-             * Error column.
-             */
-            column: number;
-        }
-        /**
-         * Parsed app manifest properties.
-         */
-        export interface AppManifestParsedProperties {
-            /**
-             * Computed scope value
-             */
-            scope: string;
-        }
-        /**
-         * Layout viewport position and dimensions.
-         */
-        export interface LayoutViewport {
-            /**
-             * Horizontal offset relative to the document (CSS pixels).
-             */
-            pageX: number;
-            /**
-             * Vertical offset relative to the document (CSS pixels).
-             */
-            pageY: number;
-            /**
-             * Width (CSS pixels), excludes scrollbar if present.
-             */
-            clientWidth: number;
-            /**
-             * Height (CSS pixels), excludes scrollbar if present.
-             */
-            clientHeight: number;
-        }
-        /**
-         * Visual viewport position, dimensions, and scale.
-         */
-        export interface VisualViewport {
-            /**
-             * Horizontal offset relative to the layout viewport (CSS pixels).
-             */
-            offsetX: number;
-            /**
-             * Vertical offset relative to the layout viewport (CSS pixels).
-             */
-            offsetY: number;
-            /**
-             * Horizontal offset relative to the document (CSS pixels).
-             */
-            pageX: number;
-            /**
-             * Vertical offset relative to the document (CSS pixels).
-             */
-            pageY: number;
-            /**
-             * Width (CSS pixels), excludes scrollbar if present.
-             */
-            clientWidth: number;
-            /**
-             * Height (CSS pixels), excludes scrollbar if present.
-             */
-            clientHeight: number;
-            /**
-             * Scale relative to the ideal viewport (size at width=device-width).
-             */
-            scale: number;
-            /**
-             * Page zoom factor (CSS to device independent pixels ratio).
-             */
-            zoom?: number;
-        }
-        /**
-         * Viewport for capturing screenshot.
-         */
-        export interface Viewport {
-            /**
-             * X offset in device independent pixels (dip).
-             */
-            x: number;
-            /**
-             * Y offset in device independent pixels (dip).
-             */
-            y: number;
-            /**
-             * Rectangle width in device independent pixels (dip).
-             */
-            width: number;
-            /**
-             * Rectangle height in device independent pixels (dip).
-             */
-            height: number;
-            /**
-             * Page scale factor.
-             */
-            scale: number;
-        }
-        /**
-         * Generic font families collection.
-         */
-        export interface FontFamilies {
-            /**
-             * The standard font-family.
-             */
-            standard?: string;
-            /**
-             * The fixed font-family.
-             */
-            fixed?: string;
-            /**
-             * The serif font-family.
-             */
-            serif?: string;
-            /**
-             * The sansSerif font-family.
-             */
-            sansSerif?: string;
-            /**
-             * The cursive font-family.
-             */
-            cursive?: string;
-            /**
-             * The fantasy font-family.
-             */
-            fantasy?: string;
-            /**
-             * The pictograph font-family.
-             */
-            pictograph?: string;
-        }
-        /**
-         * Default font sizes.
-         */
-        export interface FontSizes {
-            /**
-             * Default standard font size.
-             */
-            standard?: number;
-            /**
-             * Default fixed font size.
-             */
-            fixed?: number;
-        }
-        export type ClientNavigationReason = "formSubmissionGet"|"formSubmissionPost"|"httpHeaderRefresh"|"scriptInitiated"|"metaTagRefresh"|"pageBlockInterstitial"|"reload"|"anchorClick";
-        export interface InstallabilityErrorArgument {
-            /**
-             * Argument name (e.g. name:'minimum-icon-size-in-pixels').
-             */
-            name: string;
-            /**
-             * Argument value (e.g. value:'64').
-             */
-            value: string;
-        }
-        /**
-         * The installability error
-         */
-        export interface InstallabilityError {
-            /**
-             * The error id (e.g. 'manifest-missing-suitable-icon').
-             */
-            errorId: string;
-            /**
-             * The list of error arguments (e.g. {name:'minimum-icon-size-in-pixels', value:'64'}).
-             */
-            errorArguments: InstallabilityErrorArgument[];
-        }
-        /**
-         * The referring-policy used for the navigation.
-         */
-        export type ReferrerPolicy = "noReferrer"|"noReferrerWhenDowngrade"|"origin"|"originWhenCrossOrigin"|"sameOrigin"|"strictOrigin"|"strictOriginWhenCrossOrigin"|"unsafeUrl";
-        
-        export type domContentEventFiredPayload = {
-            timestamp: Network.MonotonicTime;
-        }
-        /**
-         * Emitted only when `page.interceptFileChooser` is enabled.
-         */
-        export type fileChooserOpenedPayload = {
-            /**
-             * Id of the frame containing input node.
-             */
-            frameId: FrameId;
-            /**
-             * Input node id.
-             */
-            backendNodeId: DOM.BackendNodeId;
-            /**
-             * Input mode.
-             */
-            mode: "selectSingle"|"selectMultiple";
-        }
-        /**
-         * Fired when frame has been attached to its parent.
-         */
-        export type frameAttachedPayload = {
-            /**
-             * Id of the frame that has been attached.
-             */
-            frameId: FrameId;
-            /**
-             * Parent frame identifier.
-             */
-            parentFrameId: FrameId;
-            /**
-             * JavaScript stack trace of when frame was attached, only set if frame initiated from script.
-             */
-            stack?: Runtime.StackTrace;
-        }
-        /**
-         * Fired when frame no longer has a scheduled navigation.
-         */
-        export type frameClearedScheduledNavigationPayload = {
-            /**
-             * Id of the frame that has cleared its scheduled navigation.
-             */
-            frameId: FrameId;
-        }
-        /**
-         * Fired when frame has been detached from its parent.
-         */
-        export type frameDetachedPayload = {
-            /**
-             * Id of the frame that has been detached.
-             */
-            frameId: FrameId;
-        }
-        /**
-         * Fired once navigation of the frame has completed. Frame is now associated with the new loader.
-         */
-        export type frameNavigatedPayload = {
-            /**
-             * Frame object.
-             */
-            frame: Frame;
-        }
-        export type frameResizedPayload = void;
-        /**
-         * Fired when a renderer-initiated navigation is requested.
-Navigation may still be cancelled after the event is issued.
-         */
-        export type frameRequestedNavigationPayload = {
-            /**
-             * Id of the frame that is being navigated.
-             */
-            frameId: FrameId;
-            /**
-             * The reason for the navigation.
-             */
-            reason: ClientNavigationReason;
-            /**
-             * The destination URL for the requested navigation.
-             */
-            url: string;
-        }
-        /**
-         * Fired when frame schedules a potential navigation.
-         */
-        export type frameScheduledNavigationPayload = {
-            /**
-             * Id of the frame that has scheduled a navigation.
-             */
-            frameId: FrameId;
-            /**
-             * Delay (in seconds) until the navigation is scheduled to begin. The navigation is not
-guaranteed to start.
-             */
-            delay: number;
-            /**
-             * The reason for the navigation.
-             */
-            reason: ClientNavigationReason;
-            /**
-             * The destination URL for the scheduled navigation.
-             */
-            url: string;
-        }
-        /**
-         * Fired when frame has started loading.
-         */
-        export type frameStartedLoadingPayload = {
-            /**
-             * Id of the frame that has started loading.
-             */
-            frameId: FrameId;
-        }
-        /**
-         * Fired when frame has stopped loading.
-         */
-        export type frameStoppedLoadingPayload = {
-            /**
-             * Id of the frame that has stopped loading.
-             */
-            frameId: FrameId;
-        }
-        /**
-         * Fired when page is about to start a download.
-         */
-        export type downloadWillBeginPayload = {
-            /**
-             * Id of the frame that caused download to begin.
-             */
-            frameId: FrameId;
-            /**
-             * Global unique identifier of the download.
-             */
-            guid: string;
-            /**
-             * URL of the resource being downloaded.
-             */
-            url: string;
-        }
-        /**
-         * Fired when download makes progress. Last call has |done| == true.
-         */
-        export type downloadProgressPayload = {
-            /**
-             * Global unique identifier of the download.
-             */
-            guid: string;
-            /**
-             * Total expected bytes to download.
-             */
-            totalBytes: number;
-            /**
-             * Total bytes received.
-             */
-            receivedBytes: number;
-            /**
-             * Download status.
-             */
-            state: "inProgress"|"completed"|"canceled";
-        }
-        /**
-         * Fired when interstitial page was hidden
-         */
-        export type interstitialHiddenPayload = void;
-        /**
-         * Fired when interstitial page was shown
-         */
-        export type interstitialShownPayload = void;
-        /**
-         * Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) has been
-closed.
-         */
-        export type javascriptDialogClosedPayload = {
-            /**
-             * Whether dialog was confirmed.
-             */
-            result: boolean;
-            /**
-             * User input in case of prompt.
-             */
-            userInput: string;
-        }
-        /**
-         * Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) is about to
-open.
-         */
-        export type javascriptDialogOpeningPayload = {
-            /**
-             * Frame url.
-             */
-            url: string;
-            /**
-             * Message that will be displayed by the dialog.
-             */
-            message: string;
-            /**
-             * Dialog type.
-             */
-            type: DialogType;
-            /**
-             * True iff browser is capable showing or acting on the given dialog. When browser has no
-dialog handler for given target, calling alert while Page domain is engaged will stall
-the page execution. Execution can be resumed via calling Page.handleJavaScriptDialog.
-             */
-            hasBrowserHandler: boolean;
-            /**
-             * Default dialog prompt.
-             */
-            defaultPrompt?: string;
-        }
-        /**
-         * Fired for top level page lifecycle events such as navigation, load, paint, etc.
-         */
-        export type lifecycleEventPayload = {
-            /**
-             * Id of the frame.
-             */
-            frameId: FrameId;
-            /**
-             * Loader identifier. Empty string if the request is fetched from worker.
-             */
-            loaderId: Network.LoaderId;
-            name: string;
-            timestamp: Network.MonotonicTime;
-        }
-        export type loadEventFiredPayload = {
-            timestamp: Network.MonotonicTime;
-        }
-        /**
-         * Fired when same-document navigation happens, e.g. due to history API usage or anchor navigation.
-         */
-        export type navigatedWithinDocumentPayload = {
-            /**
-             * Id of the frame.
-             */
-            frameId: FrameId;
-            /**
-             * Frame's new url.
-             */
-            url: string;
-        }
-        /**
-         * Compressed image data requested by the `startScreencast`.
-         */
-        export type screencastFramePayload = {
-            /**
-             * Base64-encoded compressed image.
-             */
-            data: binary;
-            /**
-             * Screencast frame metadata.
-             */
-            metadata: ScreencastFrameMetadata;
-            /**
-             * Frame number.
-             */
-            sessionId: number;
-        }
-        /**
-         * Fired when the page with currently enabled screencast was shown or hidden `.
-         */
-        export type screencastVisibilityChangedPayload = {
-            /**
-             * True if the page is visible.
-             */
-            visible: boolean;
-        }
-        /**
-         * Fired when a new window is going to be opened, via window.open(), link click, form submission,
-etc.
-         */
-        export type windowOpenPayload = {
-            /**
-             * The URL for the new window.
-             */
-            url: string;
-            /**
-             * Window name.
-             */
-            windowName: string;
-            /**
-             * An array of enabled window features.
-             */
-            windowFeatures: string[];
-            /**
-             * Whether or not it was triggered by user gesture.
-             */
-            userGesture: boolean;
-        }
-        /**
-         * Issued for every compilation cache generated. Is only available
-if Page.setGenerateCompilationCache is enabled.
-         */
-        export type compilationCacheProducedPayload = {
-            url: string;
-            /**
-             * Base64-encoded data
-             */
-            data: binary;
-        }
-        
-        /**
-         * Deprecated, please use addScriptToEvaluateOnNewDocument instead.
-         */
-        export type addScriptToEvaluateOnLoadParameters = {
-            scriptSource: string;
-        }
-        export type addScriptToEvaluateOnLoadReturnValue = {
-            /**
-             * Identifier of the added script.
-             */
-            identifier: ScriptIdentifier;
-        }
-        /**
-         * Evaluates given script in every frame upon creation (before loading frame's scripts).
-         */
-        export type addScriptToEvaluateOnNewDocumentParameters = {
-            source: string;
-            /**
-             * If specified, creates an isolated world with the given name and evaluates given script in it.
-This world name will be used as the ExecutionContextDescription::name when the corresponding
-event is emitted.
-             */
-            worldName?: string;
-        }
-        export type addScriptToEvaluateOnNewDocumentReturnValue = {
-            /**
-             * Identifier of the added script.
-             */
-            identifier: ScriptIdentifier;
-        }
-        /**
-         * Brings page to front (activates tab).
-         */
-        export type bringToFrontParameters = {
-        }
-        export type bringToFrontReturnValue = {
-        }
-        /**
-         * Capture page screenshot.
-         */
-        export type captureScreenshotParameters = {
-            /**
-             * Image compression format (defaults to png).
-             */
-            format?: "jpeg"|"png";
-            /**
-             * Compression quality from range [0..100] (jpeg only).
-             */
-            quality?: number;
-            /**
-             * Capture the screenshot of a given region only.
-             */
-            clip?: Viewport;
-            /**
-             * Capture the screenshot from the surface, rather than the view. Defaults to true.
-             */
-            fromSurface?: boolean;
-        }
-        export type captureScreenshotReturnValue = {
-            /**
-             * Base64-encoded image data.
-             */
-            data: binary;
-        }
-        /**
-         * Returns a snapshot of the page as a string. For MHTML format, the serialization includes
-iframes, shadow DOM, external resources, and element-inline styles.
-         */
-        export type captureSnapshotParameters = {
-            /**
-             * Format (defaults to mhtml).
-             */
-            format?: "mhtml";
-        }
-        export type captureSnapshotReturnValue = {
-            /**
-             * Serialized page data.
-             */
-            data: string;
-        }
-        /**
-         * Clears the overriden device metrics.
-         */
-        export type clearDeviceMetricsOverrideParameters = {
-        }
-        export type clearDeviceMetricsOverrideReturnValue = {
-        }
-        /**
-         * Clears the overridden Device Orientation.
-         */
-        export type clearDeviceOrientationOverrideParameters = {
-        }
-        export type clearDeviceOrientationOverrideReturnValue = {
-        }
-        /**
-         * Clears the overriden Geolocation Position and Error.
-         */
-        export type clearGeolocationOverrideParameters = {
-        }
-        export type clearGeolocationOverrideReturnValue = {
-        }
-        /**
-         * Creates an isolated world for the given frame.
-         */
-        export type createIsolatedWorldParameters = {
-            /**
-             * Id of the frame in which the isolated world should be created.
-             */
-            frameId: FrameId;
-            /**
-             * An optional name which is reported in the Execution Context.
-             */
-            worldName?: string;
-            /**
-             * Whether or not universal access should be granted to the isolated world. This is a powerful
-option, use with caution.
-             */
-            grantUniveralAccess?: boolean;
-        }
-        export type createIsolatedWorldReturnValue = {
-            /**
-             * Execution context of the isolated world.
-             */
-            executionContextId: Runtime.ExecutionContextId;
-        }
-        /**
-         * Deletes browser cookie with given name, domain and path.
-         */
-        export type deleteCookieParameters = {
-            /**
-             * Name of the cookie to remove.
-             */
-            cookieName: string;
-            /**
-             * URL to match cooke domain and path.
-             */
-            url: string;
-        }
-        export type deleteCookieReturnValue = {
-        }
-        /**
-         * Disables page domain notifications.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables page domain notifications.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        export type getAppManifestParameters = {
-        }
-        export type getAppManifestReturnValue = {
-            /**
-             * Manifest location.
-             */
-            url: string;
-            errors: AppManifestError[];
-            /**
-             * Manifest content.
-             */
-            data?: string;
-            /**
-             * Parsed manifest properties
-             */
-            parsed?: AppManifestParsedProperties;
-        }
-        export type getInstallabilityErrorsParameters = {
-        }
-        export type getInstallabilityErrorsReturnValue = {
-            installabilityErrors: InstallabilityError[];
-        }
-        export type getManifestIconsParameters = {
-        }
-        export type getManifestIconsReturnValue = {
-            primaryIcon?: binary;
-        }
-        /**
-         * Returns all browser cookies. Depending on the backend support, will return detailed cookie
-information in the `cookies` field.
-         */
-        export type getCookiesParameters = {
-        }
-        export type getCookiesReturnValue = {
-            /**
-             * Array of cookie objects.
-             */
-            cookies: Network.Cookie[];
-        }
-        /**
-         * Returns present frame tree structure.
-         */
-        export type getFrameTreeParameters = {
-        }
-        export type getFrameTreeReturnValue = {
-            /**
-             * Present frame tree structure.
-             */
-            frameTree: FrameTree;
-        }
-        /**
-         * Returns metrics relating to the layouting of the page, such as viewport bounds/scale.
-         */
-        export type getLayoutMetricsParameters = {
-        }
-        export type getLayoutMetricsReturnValue = {
-            /**
-             * Metrics relating to the layout viewport.
-             */
-            layoutViewport: LayoutViewport;
-            /**
-             * Metrics relating to the visual viewport.
-             */
-            visualViewport: VisualViewport;
-            /**
-             * Size of scrollable area.
-             */
-            contentSize: DOM.Rect;
-        }
-        /**
-         * Returns navigation history for the current page.
-         */
-        export type getNavigationHistoryParameters = {
-        }
-        export type getNavigationHistoryReturnValue = {
-            /**
-             * Index of the current navigation history entry.
-             */
-            currentIndex: number;
-            /**
-             * Array of navigation history entries.
-             */
-            entries: NavigationEntry[];
-        }
-        /**
-         * Resets navigation history for the current page.
-         */
-        export type resetNavigationHistoryParameters = {
-        }
-        export type resetNavigationHistoryReturnValue = {
-        }
-        /**
-         * Returns content of the given resource.
-         */
-        export type getResourceContentParameters = {
-            /**
-             * Frame id to get resource for.
-             */
-            frameId: FrameId;
-            /**
-             * URL of the resource to get content for.
-             */
-            url: string;
-        }
-        export type getResourceContentReturnValue = {
-            /**
-             * Resource content.
-             */
-            content: string;
-            /**
-             * True, if content was served as base64.
-             */
-            base64Encoded: boolean;
-        }
-        /**
-         * Returns present frame / resource tree structure.
-         */
-        export type getResourceTreeParameters = {
-        }
-        export type getResourceTreeReturnValue = {
-            /**
-             * Present frame / resource tree structure.
-             */
-            frameTree: FrameResourceTree;
-        }
-        /**
-         * Accepts or dismisses a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload).
-         */
-        export type handleJavaScriptDialogParameters = {
-            /**
-             * Whether to accept or dismiss the dialog.
-             */
-            accept: boolean;
-            /**
-             * The text to enter into the dialog prompt before accepting. Used only if this is a prompt
-dialog.
-             */
-            promptText?: string;
-        }
-        export type handleJavaScriptDialogReturnValue = {
-        }
-        /**
-         * Navigates current page to the given URL.
-         */
-        export type navigateParameters = {
-            /**
-             * URL to navigate the page to.
-             */
-            url: string;
-            /**
-             * Referrer URL.
-             */
-            referrer?: string;
-            /**
-             * Intended transition type.
-             */
-            transitionType?: TransitionType;
-            /**
-             * Frame id to navigate, if not specified navigates the top frame.
-             */
-            frameId?: FrameId;
-            /**
-             * Referrer-policy used for the navigation.
-             */
-            referrerPolicy?: ReferrerPolicy;
-        }
-        export type navigateReturnValue = {
-            /**
-             * Frame id that has navigated (or failed to navigate)
-             */
-            frameId: FrameId;
-            /**
-             * Loader identifier.
-             */
-            loaderId?: Network.LoaderId;
-            /**
-             * User friendly error message, present if and only if navigation has failed.
-             */
-            errorText?: string;
-        }
-        /**
-         * Navigates current page to the given history entry.
-         */
-        export type navigateToHistoryEntryParameters = {
-            /**
-             * Unique id of the entry to navigate to.
-             */
-            entryId: number;
-        }
-        export type navigateToHistoryEntryReturnValue = {
-        }
-        /**
-         * Print page as PDF.
-         */
-        export type printToPDFParameters = {
-            /**
-             * Paper orientation. Defaults to false.
-             */
-            landscape?: boolean;
-            /**
-             * Display header and footer. Defaults to false.
-             */
-            displayHeaderFooter?: boolean;
-            /**
-             * Print background graphics. Defaults to false.
-             */
-            printBackground?: boolean;
-            /**
-             * Scale of the webpage rendering. Defaults to 1.
-             */
-            scale?: number;
-            /**
-             * Paper width in inches. Defaults to 8.5 inches.
-             */
-            paperWidth?: number;
-            /**
-             * Paper height in inches. Defaults to 11 inches.
-             */
-            paperHeight?: number;
-            /**
-             * Top margin in inches. Defaults to 1cm (~0.4 inches).
-             */
-            marginTop?: number;
-            /**
-             * Bottom margin in inches. Defaults to 1cm (~0.4 inches).
-             */
-            marginBottom?: number;
-            /**
-             * Left margin in inches. Defaults to 1cm (~0.4 inches).
-             */
-            marginLeft?: number;
-            /**
-             * Right margin in inches. Defaults to 1cm (~0.4 inches).
-             */
-            marginRight?: number;
-            /**
-             * Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means
-print all pages.
-             */
-            pageRanges?: string;
-            /**
-             * Whether to silently ignore invalid but successfully parsed page ranges, such as '3-2'.
-Defaults to false.
-             */
-            ignoreInvalidPageRanges?: boolean;
-            /**
-             * HTML template for the print header. Should be valid HTML markup with following
-classes used to inject printing values into them:
-- `date`: formatted print date
-- `title`: document title
-- `url`: document location
-- `pageNumber`: current page number
-- `totalPages`: total pages in the document
-
-For example, `<span class=title></span>` would generate span containing the title.
-             */
-            headerTemplate?: string;
-            /**
-             * HTML template for the print footer. Should use the same format as the `headerTemplate`.
-             */
-            footerTemplate?: string;
-            /**
-             * Whether or not to prefer page size as defined by css. Defaults to false,
-in which case the content will be scaled to fit the paper size.
-             */
-            preferCSSPageSize?: boolean;
-            /**
-             * return as stream
-             */
-            transferMode?: "ReturnAsBase64"|"ReturnAsStream";
-        }
-        export type printToPDFReturnValue = {
-            /**
-             * Base64-encoded pdf data. Empty if |returnAsStream| is specified.
-             */
-            data: binary;
-            /**
-             * A handle of the stream that holds resulting PDF data.
-             */
-            stream?: IO.StreamHandle;
-        }
-        /**
-         * Reloads given page optionally ignoring the cache.
-         */
-        export type reloadParameters = {
-            /**
-             * If true, browser cache is ignored (as if the user pressed Shift+refresh).
-             */
-            ignoreCache?: boolean;
-            /**
-             * If set, the script will be injected into all frames of the inspected page after reload.
-Argument will be ignored if reloading dataURL origin.
-             */
-            scriptToEvaluateOnLoad?: string;
-        }
-        export type reloadReturnValue = {
-        }
-        /**
-         * Deprecated, please use removeScriptToEvaluateOnNewDocument instead.
-         */
-        export type removeScriptToEvaluateOnLoadParameters = {
-            identifier: ScriptIdentifier;
-        }
-        export type removeScriptToEvaluateOnLoadReturnValue = {
-        }
-        /**
-         * Removes given script from the list.
-         */
-        export type removeScriptToEvaluateOnNewDocumentParameters = {
-            identifier: ScriptIdentifier;
-        }
-        export type removeScriptToEvaluateOnNewDocumentReturnValue = {
-        }
-        /**
-         * Acknowledges that a screencast frame has been received by the frontend.
-         */
-        export type screencastFrameAckParameters = {
-            /**
-             * Frame number.
-             */
-            sessionId: number;
-        }
-        export type screencastFrameAckReturnValue = {
-        }
-        /**
-         * Searches for given string in resource content.
-         */
-        export type searchInResourceParameters = {
-            /**
-             * Frame id for resource to search in.
-             */
-            frameId: FrameId;
-            /**
-             * URL of the resource to search in.
-             */
-            url: string;
-            /**
-             * String to search for.
-             */
-            query: string;
-            /**
-             * If true, search is case sensitive.
-             */
-            caseSensitive?: boolean;
-            /**
-             * If true, treats string parameter as regex.
-             */
-            isRegex?: boolean;
-        }
-        export type searchInResourceReturnValue = {
-            /**
-             * List of search matches.
-             */
-            result: Debugger.SearchMatch[];
-        }
-        /**
-         * Enable Chrome's experimental ad filter on all sites.
-         */
-        export type setAdBlockingEnabledParameters = {
-            /**
-             * Whether to block ads.
-             */
-            enabled: boolean;
-        }
-        export type setAdBlockingEnabledReturnValue = {
-        }
-        /**
-         * Enable page Content Security Policy by-passing.
-         */
-        export type setBypassCSPParameters = {
-            /**
-             * Whether to bypass page CSP.
-             */
-            enabled: boolean;
-        }
-        export type setBypassCSPReturnValue = {
-        }
-        /**
-         * Overrides the values of device screen dimensions (window.screen.width, window.screen.height,
-window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media
-query results).
-         */
-        export type setDeviceMetricsOverrideParameters = {
-            /**
-             * Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override.
-             */
-            width: number;
-            /**
-             * Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override.
-             */
-            height: number;
-            /**
-             * Overriding device scale factor value. 0 disables the override.
-             */
-            deviceScaleFactor: number;
-            /**
-             * Whether to emulate mobile device. This includes viewport meta tag, overlay scrollbars, text
-autosizing and more.
-             */
-            mobile: boolean;
-            /**
-             * Scale to apply to resulting view image.
-             */
-            scale?: number;
-            /**
-             * Overriding screen width value in pixels (minimum 0, maximum 10000000).
-             */
-            screenWidth?: number;
-            /**
-             * Overriding screen height value in pixels (minimum 0, maximum 10000000).
-             */
-            screenHeight?: number;
-            /**
-             * Overriding view X position on screen in pixels (minimum 0, maximum 10000000).
-             */
-            positionX?: number;
-            /**
-             * Overriding view Y position on screen in pixels (minimum 0, maximum 10000000).
-             */
-            positionY?: number;
-            /**
-             * Do not set visible view size, rely upon explicit setVisibleSize call.
-             */
-            dontSetVisibleSize?: boolean;
-            /**
-             * Screen orientation override.
-             */
-            screenOrientation?: Emulation.ScreenOrientation;
-            /**
-             * The viewport dimensions and scale. If not set, the override is cleared.
-             */
-            viewport?: Viewport;
-        }
-        export type setDeviceMetricsOverrideReturnValue = {
-        }
-        /**
-         * Overrides the Device Orientation.
-         */
-        export type setDeviceOrientationOverrideParameters = {
-            /**
-             * Mock alpha
-             */
-            alpha: number;
-            /**
-             * Mock beta
-             */
-            beta: number;
-            /**
-             * Mock gamma
-             */
-            gamma: number;
-        }
-        export type setDeviceOrientationOverrideReturnValue = {
-        }
-        /**
-         * Set generic font families.
-         */
-        export type setFontFamiliesParameters = {
-            /**
-             * Specifies font families to set. If a font family is not specified, it won't be changed.
-             */
-            fontFamilies: FontFamilies;
-        }
-        export type setFontFamiliesReturnValue = {
-        }
-        /**
-         * Set default font sizes.
-         */
-        export type setFontSizesParameters = {
-            /**
-             * Specifies font sizes to set. If a font size is not specified, it won't be changed.
-             */
-            fontSizes: FontSizes;
-        }
-        export type setFontSizesReturnValue = {
-        }
-        /**
-         * Sets given markup as the document's HTML.
-         */
-        export type setDocumentContentParameters = {
-            /**
-             * Frame id to set HTML for.
-             */
-            frameId: FrameId;
-            /**
-             * HTML content to set.
-             */
-            html: string;
-        }
-        export type setDocumentContentReturnValue = {
-        }
-        /**
-         * Set the behavior when downloading a file.
-         */
-        export type setDownloadBehaviorParameters = {
-            /**
-             * Whether to allow all or deny all download requests, or use default Chrome behavior if
-available (otherwise deny).
-             */
-            behavior: "deny"|"allow"|"default";
-            /**
-             * The default path to save downloaded files to. This is requred if behavior is set to 'allow'
-             */
-            downloadPath?: string;
-        }
-        export type setDownloadBehaviorReturnValue = {
-        }
-        /**
-         * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position
-unavailable.
-         */
-        export type setGeolocationOverrideParameters = {
-            /**
-             * Mock latitude
-             */
-            latitude?: number;
-            /**
-             * Mock longitude
-             */
-            longitude?: number;
-            /**
-             * Mock accuracy
-             */
-            accuracy?: number;
-        }
-        export type setGeolocationOverrideReturnValue = {
-        }
-        /**
-         * Controls whether page will emit lifecycle events.
-         */
-        export type setLifecycleEventsEnabledParameters = {
-            /**
-             * If true, starts emitting lifecycle events.
-             */
-            enabled: boolean;
-        }
-        export type setLifecycleEventsEnabledReturnValue = {
-        }
-        /**
-         * Toggles mouse event-based touch event emulation.
-         */
-        export type setTouchEmulationEnabledParameters = {
-            /**
-             * Whether the touch event emulation should be enabled.
-             */
-            enabled: boolean;
-            /**
-             * Touch/gesture events configuration. Default: current platform.
-             */
-            configuration?: "mobile"|"desktop";
-        }
-        export type setTouchEmulationEnabledReturnValue = {
-        }
-        /**
-         * Starts sending each frame using the `screencastFrame` event.
-         */
-        export type startScreencastParameters = {
-            /**
-             * Image compression format.
-             */
-            format?: "jpeg"|"png";
-            /**
-             * Compression quality from range [0..100].
-             */
-            quality?: number;
-            /**
-             * Maximum screenshot width.
-             */
-            maxWidth?: number;
-            /**
-             * Maximum screenshot height.
-             */
-            maxHeight?: number;
-            /**
-             * Send every n-th frame.
-             */
-            everyNthFrame?: number;
-        }
-        export type startScreencastReturnValue = {
-        }
-        /**
-         * Force the page stop all navigations and pending resource fetches.
-         */
-        export type stopLoadingParameters = {
-        }
-        export type stopLoadingReturnValue = {
-        }
-        /**
-         * Crashes renderer on the IO thread, generates minidumps.
-         */
-        export type crashParameters = {
-        }
-        export type crashReturnValue = {
-        }
-        /**
-         * Tries to close page, running its beforeunload hooks, if any.
-         */
-        export type closeParameters = {
-        }
-        export type closeReturnValue = {
-        }
-        /**
-         * Tries to update the web lifecycle state of the page.
-It will transition the page to the given state according to:
-https://github.com/WICG/web-lifecycle/
-         */
-        export type setWebLifecycleStateParameters = {
-            /**
-             * Target lifecycle state
-             */
-            state: "frozen"|"active";
-        }
-        export type setWebLifecycleStateReturnValue = {
-        }
-        /**
-         * Stops sending each frame in the `screencastFrame`.
-         */
-        export type stopScreencastParameters = {
-        }
-        export type stopScreencastReturnValue = {
-        }
-        /**
-         * Forces compilation cache to be generated for every subresource script.
-         */
-        export type setProduceCompilationCacheParameters = {
-            enabled: boolean;
-        }
-        export type setProduceCompilationCacheReturnValue = {
-        }
-        /**
-         * Seeds compilation cache for given url. Compilation cache does not survive
-cross-process navigation.
-         */
-        export type addCompilationCacheParameters = {
-            url: string;
-            /**
-             * Base64-encoded data
-             */
-            data: binary;
-        }
-        export type addCompilationCacheReturnValue = {
-        }
-        /**
-         * Clears seeded compilation cache.
-         */
-        export type clearCompilationCacheParameters = {
-        }
-        export type clearCompilationCacheReturnValue = {
-        }
-        /**
-         * Generates a report for testing.
-         */
-        export type generateTestReportParameters = {
-            /**
-             * Message to be displayed in the report.
-             */
-            message: string;
-            /**
-             * Specifies the endpoint group to deliver the report to.
-             */
-            group?: string;
-        }
-        export type generateTestReportReturnValue = {
-        }
-        /**
-         * Pauses page execution. Can be resumed using generic Runtime.runIfWaitingForDebugger.
-         */
-        export type waitForDebuggerParameters = {
-        }
-        export type waitForDebuggerReturnValue = {
-        }
-        /**
-         * Intercept file chooser requests and transfer control to protocol clients.
-When file chooser interception is enabled, native file chooser dialog is not shown.
-Instead, a protocol event `Page.fileChooserOpened` is emitted.
-         */
-        export type setInterceptFileChooserDialogParameters = {
-            enabled: boolean;
-        }
-        export type setInterceptFileChooserDialogReturnValue = {
-        }
-    }
-    
-    export module Performance {
-        /**
-         * Run-time execution metric.
-         */
-        export interface Metric {
-            /**
-             * Metric name.
-             */
-            name: string;
-            /**
-             * Metric value.
-             */
-            value: number;
-        }
-        
-        /**
-         * Current values of the metrics.
-         */
-        export type metricsPayload = {
-            /**
-             * Current values of the metrics.
-             */
-            metrics: Metric[];
-            /**
-             * Timestamp title.
-             */
-            title: string;
-        }
-        
-        /**
-         * Disable collecting and reporting metrics.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enable collecting and reporting metrics.
-         */
-        export type enableParameters = {
-            /**
-             * Time domain to use for collecting and reporting duration metrics.
-             */
-            timeDomain?: "timeTicks"|"threadTicks";
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Sets time domain to use for collecting and reporting duration metrics.
-Note that this must be called before enabling metrics collection. Calling
-this method while metrics collection is enabled returns an error.
-         */
-        export type setTimeDomainParameters = {
-            /**
-             * Time domain
-             */
-            timeDomain: "timeTicks"|"threadTicks";
-        }
-        export type setTimeDomainReturnValue = {
-        }
-        /**
-         * Retrieve current values of run-time metrics.
-         */
-        export type getMetricsParameters = {
-        }
-        export type getMetricsReturnValue = {
-            /**
-             * Current values for run-time metrics.
-             */
-            metrics: Metric[];
-        }
-    }
-    
-    /**
-     * Security
-     */
-    export module Security {
-        /**
-         * An internal certificate ID value.
-         */
-        export type CertificateId = number;
-        /**
-         * A description of mixed content (HTTP resources on HTTPS pages), as defined by
-https://www.w3.org/TR/mixed-content/#categories
-         */
-        export type MixedContentType = "blockable"|"optionally-blockable"|"none";
-        /**
-         * The security level of a page or resource.
-         */
-        export type SecurityState = "unknown"|"neutral"|"insecure"|"secure"|"info"|"insecure-broken";
-        /**
-         * Details about the security state of the page certificate.
-         */
-        export interface CertificateSecurityState {
-            /**
-             * Protocol name (e.g. "TLS 1.2" or "QUIC").
-             */
-            protocol: string;
-            /**
-             * Key Exchange used by the connection, or the empty string if not applicable.
-             */
-            keyExchange: string;
-            /**
-             * (EC)DH group used by the connection, if applicable.
-             */
-            keyExchangeGroup?: string;
-            /**
-             * Cipher name.
-             */
-            cipher: string;
-            /**
-             * TLS MAC. Note that AEAD ciphers do not have separate MACs.
-             */
-            mac?: string;
-            /**
-             * Page certificate.
-             */
-            certificate: string[];
-            /**
-             * Certificate subject name.
-             */
-            subjectName: string;
-            /**
-             * Name of the issuing CA.
-             */
-            issuer: string;
-            /**
-             * Certificate valid from date.
-             */
-            validFrom: Network.TimeSinceEpoch;
-            /**
-             * Certificate valid to (expiration) date
-             */
-            validTo: Network.TimeSinceEpoch;
-            /**
-             * The highest priority network error code, if the certificate has an error.
-             */
-            certificateNetworkError?: string;
-            /**
-             * True if the certificate uses a weak signature aglorithm.
-             */
-            certificateHasWeakSignature: boolean;
-            /**
-             * True if the certificate has a SHA1 signature in the chain.
-             */
-            certificateHasSha1Signature: boolean;
-            /**
-             * True if modern SSL
-             */
-            modernSSL: boolean;
-            /**
-             * True if the connection is using an obsolete SSL protocol.
-             */
-            obsoleteSslProtocol: boolean;
-            /**
-             * True if the connection is using an obsolete SSL key exchange.
-             */
-            obsoleteSslKeyExchange: boolean;
-            /**
-             * True if the connection is using an obsolete SSL cipher.
-             */
-            obsoleteSslCipher: boolean;
-            /**
-             * True if the connection is using an obsolete SSL signature.
-             */
-            obsoleteSslSignature: boolean;
-        }
-        export type SafetyTipStatus = "badReputation"|"lookalike";
-        export interface SafetyTipInfo {
-            /**
-             * Describes whether the page triggers any safety tips or reputation warnings. Default is unknown.
-             */
-            safetyTipStatus: SafetyTipStatus;
-            /**
-             * The URL the safety tip suggested ("Did you mean?"). Only filled in for lookalike matches.
-             */
-            safeUrl?: string;
-        }
-        /**
-         * Security state information about the page.
-         */
-        export interface VisibleSecurityState {
-            /**
-             * The security level of the page.
-             */
-            securityState: SecurityState;
-            /**
-             * Security state details about the page certificate.
-             */
-            certificateSecurityState?: CertificateSecurityState;
-            /**
-             * The type of Safety Tip triggered on the page. Note that this field will be set even if the Safety Tip UI was not actually shown.
-             */
-            safetyTipInfo?: SafetyTipInfo;
-            /**
-             * Array of security state issues ids.
-             */
-            securityStateIssueIds: string[];
-        }
-        /**
-         * An explanation of an factor contributing to the security state.
-         */
-        export interface SecurityStateExplanation {
-            /**
-             * Security state representing the severity of the factor being explained.
-             */
-            securityState: SecurityState;
-            /**
-             * Title describing the type of factor.
-             */
-            title: string;
-            /**
-             * Short phrase describing the type of factor.
-             */
-            summary: string;
-            /**
-             * Full text explanation of the factor.
-             */
-            description: string;
-            /**
-             * The type of mixed content described by the explanation.
-             */
-            mixedContentType: MixedContentType;
-            /**
-             * Page certificate.
-             */
-            certificate: string[];
-            /**
-             * Recommendations to fix any issues.
-             */
-            recommendations?: string[];
-        }
-        /**
-         * Information about insecure content on the page.
-         */
-        export interface InsecureContentStatus {
-            /**
-             * Always false.
-             */
-            ranMixedContent: boolean;
-            /**
-             * Always false.
-             */
-            displayedMixedContent: boolean;
-            /**
-             * Always false.
-             */
-            containedMixedForm: boolean;
-            /**
-             * Always false.
-             */
-            ranContentWithCertErrors: boolean;
-            /**
-             * Always false.
-             */
-            displayedContentWithCertErrors: boolean;
-            /**
-             * Always set to unknown.
-             */
-            ranInsecureContentStyle: SecurityState;
-            /**
-             * Always set to unknown.
-             */
-            displayedInsecureContentStyle: SecurityState;
-        }
-        /**
-         * The action to take when a certificate error occurs. continue will continue processing the
-request and cancel will cancel the request.
-         */
-        export type CertificateErrorAction = "continue"|"cancel";
-        
-        /**
-         * There is a certificate error. If overriding certificate errors is enabled, then it should be
-handled with the `handleCertificateError` command. Note: this event does not fire if the
-certificate error has been allowed internally. Only one client per target should override
-certificate errors at the same time.
-         */
-        export type certificateErrorPayload = {
-            /**
-             * The ID of the event.
-             */
-            eventId: number;
-            /**
-             * The type of the error.
-             */
-            errorType: string;
-            /**
-             * The url that was requested.
-             */
-            requestURL: string;
-        }
-        /**
-         * The security state of the page changed.
-         */
-        export type visibleSecurityStateChangedPayload = {
-            /**
-             * Security state information about the page.
-             */
-            visibleSecurityState: VisibleSecurityState;
-        }
-        /**
-         * The security state of the page changed.
-         */
-        export type securityStateChangedPayload = {
-            /**
-             * Security state.
-             */
-            securityState: SecurityState;
-            /**
-             * True if the page was loaded over cryptographic transport such as HTTPS.
-             */
-            schemeIsCryptographic: boolean;
-            /**
-             * List of explanations for the security state. If the overall security state is `insecure` or
-`warning`, at least one corresponding explanation should be included.
-             */
-            explanations: SecurityStateExplanation[];
-            /**
-             * Information about insecure content on the page.
-             */
-            insecureContentStatus: InsecureContentStatus;
-            /**
-             * Overrides user-visible description of the state.
-             */
-            summary?: string;
-        }
-        
-        /**
-         * Disables tracking security state changes.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables tracking security state changes.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Enable/disable whether all certificate errors should be ignored.
-         */
-        export type setIgnoreCertificateErrorsParameters = {
-            /**
-             * If true, all certificate errors will be ignored.
-             */
-            ignore: boolean;
-        }
-        export type setIgnoreCertificateErrorsReturnValue = {
-        }
-        /**
-         * Handles a certificate error that fired a certificateError event.
-         */
-        export type handleCertificateErrorParameters = {
-            /**
-             * The ID of the event.
-             */
-            eventId: number;
-            /**
-             * The action to take on the certificate error.
-             */
-            action: CertificateErrorAction;
-        }
-        export type handleCertificateErrorReturnValue = {
-        }
-        /**
-         * Enable/disable overriding certificate errors. If enabled, all certificate error events need to
-be handled by the DevTools client and should be answered with `handleCertificateError` commands.
-         */
-        export type setOverrideCertificateErrorsParameters = {
-            /**
-             * If true, certificate errors will be overridden.
-             */
-            override: boolean;
-        }
-        export type setOverrideCertificateErrorsReturnValue = {
-        }
-    }
-    
-    export module ServiceWorker {
-        export type RegistrationID = string;
-        /**
-         * ServiceWorker registration.
-         */
-        export interface ServiceWorkerRegistration {
-            registrationId: RegistrationID;
-            scopeURL: string;
-            isDeleted: boolean;
-        }
-        export type ServiceWorkerVersionRunningStatus = "stopped"|"starting"|"running"|"stopping";
-        export type ServiceWorkerVersionStatus = "new"|"installing"|"installed"|"activating"|"activated"|"redundant";
-        /**
-         * ServiceWorker version.
-         */
-        export interface ServiceWorkerVersion {
-            versionId: string;
-            registrationId: RegistrationID;
-            scriptURL: string;
-            runningStatus: ServiceWorkerVersionRunningStatus;
-            status: ServiceWorkerVersionStatus;
-            /**
-             * The Last-Modified header value of the main script.
-             */
-            scriptLastModified?: number;
-            /**
-             * The time at which the response headers of the main script were received from the server.
-For cached script it is the last time the cache entry was validated.
-             */
-            scriptResponseTime?: number;
-            controlledClients?: Target.TargetID[];
-            targetId?: Target.TargetID;
-        }
-        /**
-         * ServiceWorker error message.
-         */
-        export interface ServiceWorkerErrorMessage {
-            errorMessage: string;
-            registrationId: RegistrationID;
-            versionId: string;
-            sourceURL: string;
-            lineNumber: number;
-            columnNumber: number;
-        }
-        
-        export type workerErrorReportedPayload = {
-            errorMessage: ServiceWorkerErrorMessage;
-        }
-        export type workerRegistrationUpdatedPayload = {
-            registrations: ServiceWorkerRegistration[];
-        }
-        export type workerVersionUpdatedPayload = {
-            versions: ServiceWorkerVersion[];
-        }
-        
-        export type deliverPushMessageParameters = {
-            origin: string;
-            registrationId: RegistrationID;
-            data: string;
-        }
-        export type deliverPushMessageReturnValue = {
-        }
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        export type dispatchSyncEventParameters = {
-            origin: string;
-            registrationId: RegistrationID;
-            tag: string;
-            lastChance: boolean;
-        }
-        export type dispatchSyncEventReturnValue = {
-        }
-        export type dispatchPeriodicSyncEventParameters = {
-            origin: string;
-            registrationId: RegistrationID;
-            tag: string;
-        }
-        export type dispatchPeriodicSyncEventReturnValue = {
-        }
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        export type inspectWorkerParameters = {
-            versionId: string;
-        }
-        export type inspectWorkerReturnValue = {
-        }
-        export type setForceUpdateOnPageLoadParameters = {
-            forceUpdateOnPageLoad: boolean;
-        }
-        export type setForceUpdateOnPageLoadReturnValue = {
-        }
-        export type skipWaitingParameters = {
-            scopeURL: string;
-        }
-        export type skipWaitingReturnValue = {
-        }
-        export type startWorkerParameters = {
-            scopeURL: string;
-        }
-        export type startWorkerReturnValue = {
-        }
-        export type stopAllWorkersParameters = {
-        }
-        export type stopAllWorkersReturnValue = {
-        }
-        export type stopWorkerParameters = {
-            versionId: string;
-        }
-        export type stopWorkerReturnValue = {
-        }
-        export type unregisterParameters = {
-            scopeURL: string;
-        }
-        export type unregisterReturnValue = {
-        }
-        export type updateRegistrationParameters = {
-            scopeURL: string;
-        }
-        export type updateRegistrationReturnValue = {
-        }
-    }
-    
-    export module Storage {
-        /**
-         * Enum of possible storage types.
-         */
-        export type StorageType = "appcache"|"cookies"|"file_systems"|"indexeddb"|"local_storage"|"shader_cache"|"websql"|"service_workers"|"cache_storage"|"all"|"other";
-        /**
-         * Usage for a storage type.
-         */
-        export interface UsageForType {
-            /**
-             * Name of storage type.
-             */
-            storageType: StorageType;
-            /**
-             * Storage usage (bytes).
-             */
-            usage: number;
-        }
-        
-        /**
-         * A cache's contents have been modified.
-         */
-        export type cacheStorageContentUpdatedPayload = {
-            /**
-             * Origin to update.
-             */
-            origin: string;
-            /**
-             * Name of cache in origin.
-             */
-            cacheName: string;
-        }
-        /**
-         * A cache has been added/deleted.
-         */
-        export type cacheStorageListUpdatedPayload = {
-            /**
-             * Origin to update.
-             */
-            origin: string;
-        }
-        /**
-         * The origin's IndexedDB object store has been modified.
-         */
-        export type indexedDBContentUpdatedPayload = {
-            /**
-             * Origin to update.
-             */
-            origin: string;
-            /**
-             * Database to update.
-             */
-            databaseName: string;
-            /**
-             * ObjectStore to update.
-             */
-            objectStoreName: string;
-        }
-        /**
-         * The origin's IndexedDB database list has been modified.
-         */
-        export type indexedDBListUpdatedPayload = {
-            /**
-             * Origin to update.
-             */
-            origin: string;
-        }
-        
-        /**
-         * Clears storage for origin.
-         */
-        export type clearDataForOriginParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-            /**
-             * Comma separated list of StorageType to clear.
-             */
-            storageTypes: string;
-        }
-        export type clearDataForOriginReturnValue = {
-        }
-        /**
-         * Returns all browser cookies.
-         */
-        export type getCookiesParameters = {
-            /**
-             * Browser context to use when called on the browser endpoint.
-             */
-            browserContextId?: Browser.BrowserContextID;
-        }
-        export type getCookiesReturnValue = {
-            /**
-             * Array of cookie objects.
-             */
-            cookies: Network.Cookie[];
-        }
-        /**
-         * Sets given cookies.
-         */
-        export type setCookiesParameters = {
-            /**
-             * Cookies to be set.
-             */
-            cookies: Network.CookieParam[];
-            /**
-             * Browser context to use when called on the browser endpoint.
-             */
-            browserContextId?: Browser.BrowserContextID;
-        }
-        export type setCookiesReturnValue = {
-        }
-        /**
-         * Clears cookies.
-         */
-        export type clearCookiesParameters = {
-            /**
-             * Browser context to use when called on the browser endpoint.
-             */
-            browserContextId?: Browser.BrowserContextID;
-        }
-        export type clearCookiesReturnValue = {
-        }
-        /**
-         * Returns usage and quota in bytes.
-         */
-        export type getUsageAndQuotaParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-        }
-        export type getUsageAndQuotaReturnValue = {
-            /**
-             * Storage usage (bytes).
-             */
-            usage: number;
-            /**
-             * Storage quota (bytes).
-             */
-            quota: number;
-            /**
-             * Storage usage per type (bytes).
-             */
-            usageBreakdown: UsageForType[];
-        }
-        /**
-         * Registers origin to be notified when an update occurs to its cache storage list.
-         */
-        export type trackCacheStorageForOriginParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-        }
-        export type trackCacheStorageForOriginReturnValue = {
-        }
-        /**
-         * Registers origin to be notified when an update occurs to its IndexedDB.
-         */
-        export type trackIndexedDBForOriginParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-        }
-        export type trackIndexedDBForOriginReturnValue = {
-        }
-        /**
-         * Unregisters origin from receiving notifications for cache storage.
-         */
-        export type untrackCacheStorageForOriginParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-        }
-        export type untrackCacheStorageForOriginReturnValue = {
-        }
-        /**
-         * Unregisters origin from receiving notifications for IndexedDB.
-         */
-        export type untrackIndexedDBForOriginParameters = {
-            /**
-             * Security origin.
-             */
-            origin: string;
-        }
-        export type untrackIndexedDBForOriginReturnValue = {
-        }
-    }
-    
-    /**
-     * The SystemInfo domain defines methods and events for querying low-level system information.
-     */
-    export module SystemInfo {
-        /**
-         * Describes a single graphics processor (GPU).
-         */
-        export interface GPUDevice {
-            /**
-             * PCI ID of the GPU vendor, if available; 0 otherwise.
-             */
-            vendorId: number;
-            /**
-             * PCI ID of the GPU device, if available; 0 otherwise.
-             */
-            deviceId: number;
-            /**
-             * Sub sys ID of the GPU, only available on Windows.
-             */
-            subSysId?: number;
-            /**
-             * Revision of the GPU, only available on Windows.
-             */
-            revision?: number;
-            /**
-             * String description of the GPU vendor, if the PCI ID is not available.
-             */
-            vendorString: string;
-            /**
-             * String description of the GPU device, if the PCI ID is not available.
-             */
-            deviceString: string;
-            /**
-             * String description of the GPU driver vendor.
-             */
-            driverVendor: string;
-            /**
-             * String description of the GPU driver version.
-             */
-            driverVersion: string;
-        }
-        /**
-         * Describes the width and height dimensions of an entity.
-         */
-        export interface Size {
-            /**
-             * Width in pixels.
-             */
-            width: number;
-            /**
-             * Height in pixels.
-             */
-            height: number;
-        }
-        /**
-         * Describes a supported video decoding profile with its associated minimum and
-maximum resolutions.
-         */
-        export interface VideoDecodeAcceleratorCapability {
-            /**
-             * Video codec profile that is supported, e.g. VP9 Profile 2.
-             */
-            profile: string;
-            /**
-             * Maximum video dimensions in pixels supported for this |profile|.
-             */
-            maxResolution: Size;
-            /**
-             * Minimum video dimensions in pixels supported for this |profile|.
-             */
-            minResolution: Size;
-        }
-        /**
-         * Describes a supported video encoding profile with its associated maximum
-resolution and maximum framerate.
-         */
-        export interface VideoEncodeAcceleratorCapability {
-            /**
-             * Video codec profile that is supported, e.g H264 Main.
-             */
-            profile: string;
-            /**
-             * Maximum video dimensions in pixels supported for this |profile|.
-             */
-            maxResolution: Size;
-            /**
-             * Maximum encoding framerate in frames per second supported for this
-|profile|, as fraction's numerator and denominator, e.g. 24/1 fps,
-24000/1001 fps, etc.
-             */
-            maxFramerateNumerator: number;
-            maxFramerateDenominator: number;
-        }
-        /**
-         * YUV subsampling type of the pixels of a given image.
-         */
-        export type SubsamplingFormat = "yuv420"|"yuv422"|"yuv444";
-        /**
-         * Image format of a given image.
-         */
-        export type ImageType = "jpeg"|"webp"|"unknown";
-        /**
-         * Describes a supported image decoding profile with its associated minimum and
-maximum resolutions and subsampling.
-         */
-        export interface ImageDecodeAcceleratorCapability {
-            /**
-             * Image coded, e.g. Jpeg.
-             */
-            imageType: ImageType;
-            /**
-             * Maximum supported dimensions of the image in pixels.
-             */
-            maxDimensions: Size;
-            /**
-             * Minimum supported dimensions of the image in pixels.
-             */
-            minDimensions: Size;
-            /**
-             * Optional array of supported subsampling formats, e.g. 4:2:0, if known.
-             */
-            subsamplings: SubsamplingFormat[];
-        }
-        /**
-         * Provides information about the GPU(s) on the system.
-         */
-        export interface GPUInfo {
-            /**
-             * The graphics devices on the system. Element 0 is the primary GPU.
-             */
-            devices: GPUDevice[];
-            /**
-             * An optional dictionary of additional GPU related attributes.
-             */
-            auxAttributes?: object;
-            /**
-             * An optional dictionary of graphics features and their status.
-             */
-            featureStatus?: object;
-            /**
-             * An optional array of GPU driver bug workarounds.
-             */
-            driverBugWorkarounds: string[];
-            /**
-             * Supported accelerated video decoding capabilities.
-             */
-            videoDecoding: VideoDecodeAcceleratorCapability[];
-            /**
-             * Supported accelerated video encoding capabilities.
-             */
-            videoEncoding: VideoEncodeAcceleratorCapability[];
-            /**
-             * Supported accelerated image decoding capabilities.
-             */
-            imageDecoding: ImageDecodeAcceleratorCapability[];
-        }
-        /**
-         * Represents process info.
-         */
-        export interface ProcessInfo {
-            /**
-             * Specifies process type.
-             */
-            type: string;
-            /**
-             * Specifies process id.
-             */
-            id: number;
-            /**
-             * Specifies cumulative CPU usage in seconds across all threads of the
-process since the process start.
-             */
-            cpuTime: number;
-        }
-        
-        
-        /**
-         * Returns information about the system.
-         */
-        export type getInfoParameters = {
-        }
-        export type getInfoReturnValue = {
-            /**
-             * Information about the GPUs on the system.
-             */
-            gpu: GPUInfo;
-            /**
-             * A platform-dependent description of the model of the machine. On Mac OS, this is, for
-example, 'MacBookPro'. Will be the empty string if not supported.
-             */
-            modelName: string;
-            /**
-             * A platform-dependent description of the version of the machine. On Mac OS, this is, for
-example, '10.1'. Will be the empty string if not supported.
-             */
-            modelVersion: string;
-            /**
-             * The command line string used to launch the browser. Will be the empty string if not
-supported.
-             */
-            commandLine: string;
-        }
-        /**
-         * Returns information about all running processes.
-         */
-        export type getProcessInfoParameters = {
-        }
-        export type getProcessInfoReturnValue = {
-            /**
-             * An array of process info blocks.
-             */
-            processInfo: ProcessInfo[];
-        }
-    }
-    
-    /**
-     * Supports additional targets discovery and allows to attach to them.
-     */
-    export module Target {
-        export type TargetID = string;
-        /**
-         * Unique identifier of attached debugging session.
-         */
-        export type SessionID = string;
-        export interface TargetInfo {
-            targetId: TargetID;
-            type: string;
-            title: string;
-            url: string;
-            /**
-             * Whether the target has an attached client.
-             */
-            attached: boolean;
-            /**
-             * Opener target Id
-             */
-            openerId?: TargetID;
-            browserContextId?: Browser.BrowserContextID;
-        }
-        export interface RemoteLocation {
-            host: string;
-            port: number;
-        }
-        
-        /**
-         * Issued when attached to target because of auto-attach or `attachToTarget` command.
-         */
-        export type attachedToTargetPayload = {
-            /**
-             * Identifier assigned to the session used to send/receive messages.
-             */
-            sessionId: SessionID;
-            targetInfo: TargetInfo;
-            waitingForDebugger: boolean;
-        }
-        /**
-         * Issued when detached from target for any reason (including `detachFromTarget` command). Can be
-issued multiple times per target if multiple sessions have been attached to it.
-         */
-        export type detachedFromTargetPayload = {
-            /**
-             * Detached session identifier.
-             */
-            sessionId: SessionID;
-            /**
-             * Deprecated.
-             */
-            targetId?: TargetID;
-        }
-        /**
-         * Notifies about a new protocol message received from the session (as reported in
-`attachedToTarget` event).
-         */
-        export type receivedMessageFromTargetPayload = {
-            /**
-             * Identifier of a session which sends a message.
-             */
-            sessionId: SessionID;
-            message: string;
-            /**
-             * Deprecated.
-             */
-            targetId?: TargetID;
-        }
-        /**
-         * Issued when a possible inspection target is created.
-         */
-        export type targetCreatedPayload = {
-            targetInfo: TargetInfo;
-        }
-        /**
-         * Issued when a target is destroyed.
-         */
-        export type targetDestroyedPayload = {
-            targetId: TargetID;
-        }
-        /**
-         * Issued when a target has crashed.
-         */
-        export type targetCrashedPayload = {
-            targetId: TargetID;
-            /**
-             * Termination status type.
-             */
-            status: string;
-            /**
-             * Termination error code.
-             */
-            errorCode: number;
-        }
-        /**
-         * Issued when some information about a target has changed. This only happens between
-`targetCreated` and `targetDestroyed`.
-         */
-        export type targetInfoChangedPayload = {
-            targetInfo: TargetInfo;
-        }
-        
-        /**
-         * Activates (focuses) the target.
-         */
-        export type activateTargetParameters = {
-            targetId: TargetID;
-        }
-        export type activateTargetReturnValue = {
-        }
-        /**
-         * Attaches to the target with given id.
-         */
-        export type attachToTargetParameters = {
-            targetId: TargetID;
-            /**
-             * Enables "flat" access to the session via specifying sessionId attribute in the commands.
-We plan to make this the default, deprecate non-flattened mode,
-and eventually retire it. See crbug.com/991325.
-             */
-            flatten?: boolean;
-        }
-        export type attachToTargetReturnValue = {
-            /**
-             * Id assigned to the session.
-             */
-            sessionId: SessionID;
-        }
-        /**
-         * Attaches to the browser target, only uses flat sessionId mode.
-         */
-        export type attachToBrowserTargetParameters = {
-        }
-        export type attachToBrowserTargetReturnValue = {
-            /**
-             * Id assigned to the session.
-             */
-            sessionId: SessionID;
-        }
-        /**
-         * Closes the target. If the target is a page that gets closed too.
-         */
-        export type closeTargetParameters = {
-            targetId: TargetID;
-        }
-        export type closeTargetReturnValue = {
-            success: boolean;
-        }
-        /**
-         * Inject object to the target's main frame that provides a communication
-channel with browser target.
-
-Injected object will be available as `window[bindingName]`.
-
-The object has the follwing API:
-- `binding.send(json)` - a method to send messages over the remote debugging protocol
-- `binding.onmessage = json => handleMessage(json)` - a callback that will be called for the protocol notifications and command responses.
-         */
-        export type exposeDevToolsProtocolParameters = {
-            targetId: TargetID;
-            /**
-             * Binding name, 'cdp' if not specified.
-             */
-            bindingName?: string;
-        }
-        export type exposeDevToolsProtocolReturnValue = {
-        }
-        /**
-         * Creates a new empty BrowserContext. Similar to an incognito profile but you can have more than
-one.
-         */
-        export type createBrowserContextParameters = {
-            /**
-             * If specified, disposes this context when debugging session disconnects.
-             */
-            disposeOnDetach?: boolean;
-        }
-        export type createBrowserContextReturnValue = {
-            /**
-             * The id of the context created.
-             */
-            browserContextId: Browser.BrowserContextID;
-        }
-        /**
-         * Returns all browser contexts created with `Target.createBrowserContext` method.
-         */
-        export type getBrowserContextsParameters = {
-        }
-        export type getBrowserContextsReturnValue = {
-            /**
-             * An array of browser context ids.
-             */
-            browserContextIds: Browser.BrowserContextID[];
-        }
-        /**
-         * Creates a new page.
-         */
-        export type createTargetParameters = {
-            /**
-             * The initial URL the page will be navigated to.
-             */
-            url: string;
-            /**
-             * Frame width in DIP (headless chrome only).
-             */
-            width?: number;
-            /**
-             * Frame height in DIP (headless chrome only).
-             */
-            height?: number;
-            /**
-             * The browser context to create the page in.
-             */
-            browserContextId?: Browser.BrowserContextID;
-            /**
-             * Whether BeginFrames for this target will be controlled via DevTools (headless chrome only,
-not supported on MacOS yet, false by default).
-             */
-            enableBeginFrameControl?: boolean;
-            /**
-             * Whether to create a new Window or Tab (chrome-only, false by default).
-             */
-            newWindow?: boolean;
-            /**
-             * Whether to create the target in background or foreground (chrome-only,
-false by default).
-             */
-            background?: boolean;
-        }
-        export type createTargetReturnValue = {
-            /**
-             * The id of the page opened.
-             */
-            targetId: TargetID;
-        }
-        /**
-         * Detaches session with given id.
-         */
-        export type detachFromTargetParameters = {
-            /**
-             * Session to detach.
-             */
-            sessionId?: SessionID;
-            /**
-             * Deprecated.
-             */
-            targetId?: TargetID;
-        }
-        export type detachFromTargetReturnValue = {
-        }
-        /**
-         * Deletes a BrowserContext. All the belonging pages will be closed without calling their
-beforeunload hooks.
-         */
-        export type disposeBrowserContextParameters = {
-            browserContextId: Browser.BrowserContextID;
-        }
-        export type disposeBrowserContextReturnValue = {
-        }
-        /**
-         * Returns information about a target.
-         */
-        export type getTargetInfoParameters = {
-            targetId?: TargetID;
-        }
-        export type getTargetInfoReturnValue = {
-            targetInfo: TargetInfo;
-        }
-        /**
-         * Retrieves a list of available targets.
-         */
-        export type getTargetsParameters = {
-        }
-        export type getTargetsReturnValue = {
-            /**
-             * The list of targets.
-             */
-            targetInfos: TargetInfo[];
-        }
-        /**
-         * Sends protocol message over session with given id.
-Consider using flat mode instead; see commands attachToTarget, setAutoAttach,
-and crbug.com/991325.
-         */
-        export type sendMessageToTargetParameters = {
-            message: string;
-            /**
-             * Identifier of the session.
-             */
-            sessionId?: SessionID;
-            /**
-             * Deprecated.
-             */
-            targetId?: TargetID;
-        }
-        export type sendMessageToTargetReturnValue = {
-        }
-        /**
-         * Controls whether to automatically attach to new targets which are considered to be related to
-this one. When turned on, attaches to all existing related targets as well. When turned off,
-automatically detaches from all currently attached targets.
-         */
-        export type setAutoAttachParameters = {
-            /**
-             * Whether to auto-attach to related targets.
-             */
-            autoAttach: boolean;
-            /**
-             * Whether to pause new targets when attaching to them. Use `Runtime.runIfWaitingForDebugger`
-to run paused targets.
-             */
-            waitForDebuggerOnStart: boolean;
-            /**
-             * Enables "flat" access to the session via specifying sessionId attribute in the commands.
-We plan to make this the default, deprecate non-flattened mode,
-and eventually retire it. See crbug.com/991325.
-             */
-            flatten?: boolean;
-        }
-        export type setAutoAttachReturnValue = {
-        }
-        /**
-         * Controls whether to discover available targets and notify via
-`targetCreated/targetInfoChanged/targetDestroyed` events.
-         */
-        export type setDiscoverTargetsParameters = {
-            /**
-             * Whether to discover available targets.
-             */
-            discover: boolean;
-        }
-        export type setDiscoverTargetsReturnValue = {
-        }
-        /**
-         * Enables target discovery for the specified locations, when `setDiscoverTargets` was set to
-`true`.
-         */
-        export type setRemoteLocationsParameters = {
-            /**
-             * List of remote locations.
-             */
-            locations: RemoteLocation[];
-        }
-        export type setRemoteLocationsReturnValue = {
-        }
-    }
-    
-    /**
-     * The Tethering domain defines methods and events for browser port binding.
-     */
-    export module Tethering {
-        
-        /**
-         * Informs that port was successfully bound and got a specified connection id.
-         */
-        export type acceptedPayload = {
-            /**
-             * Port number that was successfully bound.
-             */
-            port: number;
-            /**
-             * Connection id to be used.
-             */
-            connectionId: string;
-        }
-        
-        /**
-         * Request browser port binding.
-         */
-        export type bindParameters = {
-            /**
-             * Port number to bind.
-             */
-            port: number;
-        }
-        export type bindReturnValue = {
-        }
-        /**
-         * Request browser port unbinding.
-         */
-        export type unbindParameters = {
-            /**
-             * Port number to unbind.
-             */
-            port: number;
-        }
-        export type unbindReturnValue = {
-        }
-    }
-    
-    export module Tracing {
-        /**
-         * Configuration for memory dump. Used only when "memory-infra" category is enabled.
-         */
-        export type MemoryDumpConfig = object;
-        export interface TraceConfig {
-            /**
-             * Controls how the trace buffer stores data.
-             */
-            recordMode?: "recordUntilFull"|"recordContinuously"|"recordAsMuchAsPossible"|"echoToConsole";
-            /**
-             * Turns on JavaScript stack sampling.
-             */
-            enableSampling?: boolean;
-            /**
-             * Turns on system tracing.
-             */
-            enableSystrace?: boolean;
-            /**
-             * Turns on argument filter.
-             */
-            enableArgumentFilter?: boolean;
-            /**
-             * Included category filters.
-             */
-            includedCategories?: string[];
-            /**
-             * Excluded category filters.
-             */
-            excludedCategories?: string[];
-            /**
-             * Configuration to synthesize the delays in tracing.
-             */
-            syntheticDelays?: string[];
-            /**
-             * Configuration for memory dump triggers. Used only when "memory-infra" category is enabled.
-             */
-            memoryDumpConfig?: MemoryDumpConfig;
-        }
-        /**
-         * Data format of a trace. Can be either the legacy JSON format or the
-protocol buffer format. Note that the JSON format will be deprecated soon.
-         */
-        export type StreamFormat = "json"|"proto";
-        /**
-         * Compression type to use for traces returned via streams.
-         */
-        export type StreamCompression = "none"|"gzip";
-        
-        export type bufferUsagePayload = {
-            /**
-             * A number in range [0..1] that indicates the used size of event buffer as a fraction of its
-total size.
-             */
-            percentFull?: number;
-            /**
-             * An approximate number of events in the trace log.
-             */
-            eventCount?: number;
-            /**
-             * A number in range [0..1] that indicates the used size of event buffer as a fraction of its
-total size.
-             */
-            value?: number;
-        }
-        /**
-         * Contains an bucket of collected trace events. When tracing is stopped collected events will be
-send as a sequence of dataCollected events followed by tracingComplete event.
-         */
-        export type dataCollectedPayload = {
-            value: object[];
-        }
-        /**
-         * Signals that tracing is stopped and there is no trace buffers pending flush, all data were
-delivered via dataCollected events.
-         */
-        export type tracingCompletePayload = {
-            /**
-             * Indicates whether some trace data is known to have been lost, e.g. because the trace ring
-buffer wrapped around.
-             */
-            dataLossOccurred: boolean;
-            /**
-             * A handle of the stream that holds resulting trace data.
-             */
-            stream?: IO.StreamHandle;
-            /**
-             * Trace data format of returned stream.
-             */
-            traceFormat?: StreamFormat;
-            /**
-             * Compression format of returned stream.
-             */
-            streamCompression?: StreamCompression;
-        }
-        
-        /**
-         * Stop trace events collection.
-         */
-        export type endParameters = {
-        }
-        export type endReturnValue = {
-        }
-        /**
-         * Gets supported tracing categories.
-         */
-        export type getCategoriesParameters = {
-        }
-        export type getCategoriesReturnValue = {
-            /**
-             * A list of supported tracing categories.
-             */
-            categories: string[];
-        }
-        /**
-         * Record a clock sync marker in the trace.
-         */
-        export type recordClockSyncMarkerParameters = {
-            /**
-             * The ID of this clock sync marker
-             */
-            syncId: string;
-        }
-        export type recordClockSyncMarkerReturnValue = {
-        }
-        /**
-         * Request a global memory dump.
-         */
-        export type requestMemoryDumpParameters = {
-            /**
-             * Enables more deterministic results by forcing garbage collection
-             */
-            deterministic?: boolean;
-        }
-        export type requestMemoryDumpReturnValue = {
-            /**
-             * GUID of the resulting global memory dump.
-             */
-            dumpGuid: string;
-            /**
-             * True iff the global memory dump succeeded.
-             */
-            success: boolean;
-        }
-        /**
-         * Start trace events collection.
-         */
-        export type startParameters = {
-            /**
-             * Category/tag filter
-             */
-            categories?: string;
-            /**
-             * Tracing options
-             */
-            options?: string;
-            /**
-             * If set, the agent will issue bufferUsage events at this interval, specified in milliseconds
-             */
-            bufferUsageReportingInterval?: number;
-            /**
-             * Whether to report trace events as series of dataCollected events or to save trace to a
-stream (defaults to `ReportEvents`).
-             */
-            transferMode?: "ReportEvents"|"ReturnAsStream";
-            /**
-             * Trace data format to use. This only applies when using `ReturnAsStream`
-transfer mode (defaults to `json`).
-             */
-            streamFormat?: StreamFormat;
-            /**
-             * Compression format to use. This only applies when using `ReturnAsStream`
-transfer mode (defaults to `none`)
-             */
-            streamCompression?: StreamCompression;
-            traceConfig?: TraceConfig;
-        }
-        export type startReturnValue = {
-        }
-    }
-    
-    /**
-     * A domain for letting clients substitute browser's network layer with client code.
-     */
-    export module Fetch {
-        /**
-         * Unique request identifier.
-         */
-        export type RequestId = string;
-        /**
-         * Stages of the request to handle. Request will intercept before the request is
-sent. Response will intercept after the response is received (but before response
-body is received.
-         */
-        export type RequestStage = "Request"|"Response";
-        export interface RequestPattern {
-            /**
-             * Wildcards ('*' -> zero or more, '?' -> exactly one) are allowed. Escape character is
-backslash. Omitting is equivalent to "*".
-             */
-            urlPattern?: string;
-            /**
-             * If set, only requests for matching resource types will be intercepted.
-             */
-            resourceType?: Network.ResourceType;
-            /**
-             * Stage at wich to begin intercepting requests. Default is Request.
-             */
-            requestStage?: RequestStage;
-        }
-        /**
-         * Response HTTP header entry
-         */
-        export interface HeaderEntry {
-            name: string;
-            value: string;
-        }
-        /**
-         * Authorization challenge for HTTP status code 401 or 407.
-         */
-        export interface AuthChallenge {
-            /**
-             * Source of the authentication challenge.
-             */
-            source?: "Server"|"Proxy";
-            /**
-             * Origin of the challenger.
-             */
-            origin: string;
-            /**
-             * The authentication scheme used, such as basic or digest
-             */
-            scheme: string;
-            /**
-             * The realm of the challenge. May be empty.
-             */
-            realm: string;
-        }
-        /**
-         * Response to an AuthChallenge.
-         */
-        export interface AuthChallengeResponse {
-            /**
-             * The decision on what to do in response to the authorization challenge.  Default means
-deferring to the default behavior of the net stack, which will likely either the Cancel
-authentication or display a popup dialog box.
-             */
-            response: "Default"|"CancelAuth"|"ProvideCredentials";
-            /**
-             * The username to provide, possibly empty. Should only be set if response is
-ProvideCredentials.
-             */
-            username?: string;
-            /**
-             * The password to provide, possibly empty. Should only be set if response is
-ProvideCredentials.
-             */
-            password?: string;
-        }
-        
-        /**
-         * Issued when the domain is enabled and the request URL matches the
-specified filter. The request is paused until the client responds
-with one of continueRequest, failRequest or fulfillRequest.
-The stage of the request can be determined by presence of responseErrorReason
-and responseStatusCode -- the request is at the response stage if either
-of these fields is present and in the request stage otherwise.
-         */
-        export type requestPausedPayload = {
-            /**
-             * Each request the page makes will have a unique id.
-             */
-            requestId: RequestId;
-            /**
-             * The details of the request.
-             */
-            request: Network.Request;
-            /**
-             * The id of the frame that initiated the request.
-             */
-            frameId: Page.FrameId;
-            /**
-             * How the requested resource will be used.
-             */
-            resourceType: Network.ResourceType;
-            /**
-             * Response error if intercepted at response stage.
-             */
-            responseErrorReason?: Network.ErrorReason;
-            /**
-             * Response code if intercepted at response stage.
-             */
-            responseStatusCode?: number;
-            /**
-             * Response headers if intercepted at the response stage.
-             */
-            responseHeaders?: HeaderEntry[];
-            /**
-             * If the intercepted request had a corresponding Network.requestWillBeSent event fired for it,
-then this networkId will be the same as the requestId present in the requestWillBeSent event.
-             */
-            networkId?: RequestId;
-        }
-        /**
-         * Issued when the domain is enabled with handleAuthRequests set to true.
-The request is paused until client responds with continueWithAuth.
-         */
-        export type authRequiredPayload = {
-            /**
-             * Each request the page makes will have a unique id.
-             */
-            requestId: RequestId;
-            /**
-             * The details of the request.
-             */
-            request: Network.Request;
-            /**
-             * The id of the frame that initiated the request.
-             */
-            frameId: Page.FrameId;
-            /**
-             * How the requested resource will be used.
-             */
-            resourceType: Network.ResourceType;
-            /**
-             * Details of the Authorization Challenge encountered.
-If this is set, client should respond with continueRequest that
-contains AuthChallengeResponse.
-             */
-            authChallenge: AuthChallenge;
-        }
-        
-        /**
-         * Disables the fetch domain.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables issuing of requestPaused events. A request will be paused until client
-calls one of failRequest, fulfillRequest or continueRequest/continueWithAuth.
-         */
-        export type enableParameters = {
-            /**
-             * If specified, only requests matching any of these patterns will produce
-fetchRequested event and will be paused until clients response. If not set,
-all requests will be affected.
-             */
-            patterns?: RequestPattern[];
-            /**
-             * If true, authRequired events will be issued and requests will be paused
-expecting a call to continueWithAuth.
-             */
-            handleAuthRequests?: boolean;
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Causes the request to fail with specified reason.
-         */
-        export type failRequestParameters = {
-            /**
-             * An id the client received in requestPaused event.
-             */
-            requestId: RequestId;
-            /**
-             * Causes the request to fail with the given reason.
-             */
-            errorReason: Network.ErrorReason;
-        }
-        export type failRequestReturnValue = {
-        }
-        /**
-         * Provides response to the request.
-         */
-        export type fulfillRequestParameters = {
-            /**
-             * An id the client received in requestPaused event.
-             */
-            requestId: RequestId;
-            /**
-             * An HTTP response code.
-             */
-            responseCode: number;
-            /**
-             * Response headers.
-             */
-            responseHeaders?: HeaderEntry[];
-            /**
-             * Alternative way of specifying response headers as a \0-separated
-series of name: value pairs. Prefer the above method unless you
-need to represent some non-UTF8 values that can't be transmitted
-over the protocol as text.
-             */
-            binaryResponseHeaders?: binary;
-            /**
-             * A response body.
-             */
-            body?: binary;
-            /**
-             * A textual representation of responseCode.
-If absent, a standard phrase matching responseCode is used.
-             */
-            responsePhrase?: string;
-        }
-        export type fulfillRequestReturnValue = {
-        }
-        /**
-         * Continues the request, optionally modifying some of its parameters.
-         */
-        export type continueRequestParameters = {
-            /**
-             * An id the client received in requestPaused event.
-             */
-            requestId: RequestId;
-            /**
-             * If set, the request url will be modified in a way that's not observable by page.
-             */
-            url?: string;
-            /**
-             * If set, the request method is overridden.
-             */
-            method?: string;
-            /**
-             * If set, overrides the post data in the request.
-             */
-            postData?: string;
-            /**
-             * If set, overrides the request headers.
-             */
-            headers?: HeaderEntry[];
-        }
-        export type continueRequestReturnValue = {
-        }
-        /**
-         * Continues a request supplying authChallengeResponse following authRequired event.
-         */
-        export type continueWithAuthParameters = {
-            /**
-             * An id the client received in authRequired event.
-             */
-            requestId: RequestId;
-            /**
-             * Response to  with an authChallenge.
-             */
-            authChallengeResponse: AuthChallengeResponse;
-        }
-        export type continueWithAuthReturnValue = {
-        }
-        /**
-         * Causes the body of the response to be received from the server and
-returned as a single string. May only be issued for a request that
-is paused in the Response stage and is mutually exclusive with
-takeResponseBodyForInterceptionAsStream. Calling other methods that
-affect the request or disabling fetch domain before body is received
-results in an undefined behavior.
-         */
-        export type getResponseBodyParameters = {
-            /**
-             * Identifier for the intercepted request to get body for.
-             */
-            requestId: RequestId;
-        }
-        export type getResponseBodyReturnValue = {
-            /**
-             * Response body.
-             */
-            body: string;
-            /**
-             * True, if content was sent as base64.
-             */
-            base64Encoded: boolean;
-        }
-        /**
-         * Returns a handle to the stream representing the response body.
-The request must be paused in the HeadersReceived stage.
-Note that after this command the request can't be continued
-as is -- client either needs to cancel it or to provide the
-response body.
-The stream only supports sequential read, IO.read will fail if the position
-is specified.
-This method is mutually exclusive with getResponseBody.
-Calling other methods that affect the request or disabling fetch
-domain before body is received results in an undefined behavior.
-         */
-        export type takeResponseBodyAsStreamParameters = {
-            requestId: RequestId;
-        }
-        export type takeResponseBodyAsStreamReturnValue = {
-            stream: IO.StreamHandle;
-        }
-    }
-    
-    /**
-     * This domain allows inspection of Web Audio API.
-https://webaudio.github.io/web-audio-api/
-     */
-    export module WebAudio {
-        /**
-         * An unique ID for a graph object (AudioContext, AudioNode, AudioParam) in Web Audio API
-         */
-        export type GraphObjectId = string;
-        /**
-         * Enum of BaseAudioContext types
-         */
-        export type ContextType = "realtime"|"offline";
-        /**
-         * Enum of AudioContextState from the spec
-         */
-        export type ContextState = "suspended"|"running"|"closed";
-        /**
-         * Enum of AudioNode types
-         */
-        export type NodeType = string;
-        /**
-         * Enum of AudioNode::ChannelCountMode from the spec
-         */
-        export type ChannelCountMode = "clamped-max"|"explicit"|"max";
-        /**
-         * Enum of AudioNode::ChannelInterpretation from the spec
-         */
-        export type ChannelInterpretation = "discrete"|"speakers";
-        /**
-         * Enum of AudioParam types
-         */
-        export type ParamType = string;
-        /**
-         * Enum of AudioParam::AutomationRate from the spec
-         */
-        export type AutomationRate = "a-rate"|"k-rate";
-        /**
-         * Fields in AudioContext that change in real-time.
-         */
-        export interface ContextRealtimeData {
-            /**
-             * The current context time in second in BaseAudioContext.
-             */
-            currentTime: number;
-            /**
-             * The time spent on rendering graph divided by render qunatum duration,
-and multiplied by 100. 100 means the audio renderer reached the full
-capacity and glitch may occur.
-             */
-            renderCapacity: number;
-            /**
-             * A running mean of callback interval.
-             */
-            callbackIntervalMean: number;
-            /**
-             * A running variance of callback interval.
-             */
-            callbackIntervalVariance: number;
-        }
-        /**
-         * Protocol object for BaseAudioContext
-         */
-        export interface BaseAudioContext {
-            contextId: GraphObjectId;
-            contextType: ContextType;
-            contextState: ContextState;
-            realtimeData?: ContextRealtimeData;
-            /**
-             * Platform-dependent callback buffer size.
-             */
-            callbackBufferSize: number;
-            /**
-             * Number of output channels supported by audio hardware in use.
-             */
-            maxOutputChannelCount: number;
-            /**
-             * Context sample rate.
-             */
-            sampleRate: number;
-        }
-        /**
-         * Protocol object for AudioListner
-         */
-        export interface AudioListener {
-            listenerId: GraphObjectId;
-            contextId: GraphObjectId;
-        }
-        /**
-         * Protocol object for AudioNode
-         */
-        export interface AudioNode {
-            nodeId: GraphObjectId;
-            contextId: GraphObjectId;
-            nodeType: NodeType;
-            numberOfInputs: number;
-            numberOfOutputs: number;
-            channelCount: number;
-            channelCountMode: ChannelCountMode;
-            channelInterpretation: ChannelInterpretation;
-        }
-        /**
-         * Protocol object for AudioParam
-         */
-        export interface AudioParam {
-            paramId: GraphObjectId;
-            nodeId: GraphObjectId;
-            contextId: GraphObjectId;
-            paramType: ParamType;
-            rate: AutomationRate;
-            defaultValue: number;
-            minValue: number;
-            maxValue: number;
-        }
-        
-        /**
-         * Notifies that a new BaseAudioContext has been created.
-         */
-        export type contextCreatedPayload = {
-            context: BaseAudioContext;
-        }
-        /**
-         * Notifies that an existing BaseAudioContext will be destroyed.
-         */
-        export type contextWillBeDestroyedPayload = {
-            contextId: GraphObjectId;
-        }
-        /**
-         * Notifies that existing BaseAudioContext has changed some properties (id stays the same)..
-         */
-        export type contextChangedPayload = {
-            context: BaseAudioContext;
-        }
-        /**
-         * Notifies that the construction of an AudioListener has finished.
-         */
-        export type audioListenerCreatedPayload = {
-            listener: AudioListener;
-        }
-        /**
-         * Notifies that a new AudioListener has been created.
-         */
-        export type audioListenerWillBeDestroyedPayload = {
-            contextId: GraphObjectId;
-            listenerId: GraphObjectId;
-        }
-        /**
-         * Notifies that a new AudioNode has been created.
-         */
-        export type audioNodeCreatedPayload = {
-            node: AudioNode;
-        }
-        /**
-         * Notifies that an existing AudioNode has been destroyed.
-         */
-        export type audioNodeWillBeDestroyedPayload = {
-            contextId: GraphObjectId;
-            nodeId: GraphObjectId;
-        }
-        /**
-         * Notifies that a new AudioParam has been created.
-         */
-        export type audioParamCreatedPayload = {
-            param: AudioParam;
-        }
-        /**
-         * Notifies that an existing AudioParam has been destroyed.
-         */
-        export type audioParamWillBeDestroyedPayload = {
-            contextId: GraphObjectId;
-            nodeId: GraphObjectId;
-            paramId: GraphObjectId;
-        }
-        /**
-         * Notifies that two AudioNodes are connected.
-         */
-        export type nodesConnectedPayload = {
-            contextId: GraphObjectId;
-            sourceId: GraphObjectId;
-            destinationId: GraphObjectId;
-            sourceOutputIndex?: number;
-            destinationInputIndex?: number;
-        }
-        /**
-         * Notifies that AudioNodes are disconnected. The destination can be null, and it means all the outgoing connections from the source are disconnected.
-         */
-        export type nodesDisconnectedPayload = {
-            contextId: GraphObjectId;
-            sourceId: GraphObjectId;
-            destinationId: GraphObjectId;
-            sourceOutputIndex?: number;
-            destinationInputIndex?: number;
-        }
-        /**
-         * Notifies that an AudioNode is connected to an AudioParam.
-         */
-        export type nodeParamConnectedPayload = {
-            contextId: GraphObjectId;
-            sourceId: GraphObjectId;
-            destinationId: GraphObjectId;
-            sourceOutputIndex?: number;
-        }
-        /**
-         * Notifies that an AudioNode is disconnected to an AudioParam.
-         */
-        export type nodeParamDisconnectedPayload = {
-            contextId: GraphObjectId;
-            sourceId: GraphObjectId;
-            destinationId: GraphObjectId;
-            sourceOutputIndex?: number;
-        }
-        
-        /**
-         * Enables the WebAudio domain and starts sending context lifetime events.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Disables the WebAudio domain.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Fetch the realtime data from the registered contexts.
-         */
-        export type getRealtimeDataParameters = {
-            contextId: GraphObjectId;
-        }
-        export type getRealtimeDataReturnValue = {
-            realtimeData: ContextRealtimeData;
-        }
-    }
-    
-    /**
-     * This domain allows configuring virtual authenticators to test the WebAuthn
-API.
-     */
-    export module WebAuthn {
-        export type AuthenticatorId = string;
-        export type AuthenticatorProtocol = "u2f"|"ctap2";
-        export type AuthenticatorTransport = "usb"|"nfc"|"ble"|"cable"|"internal";
-        export interface VirtualAuthenticatorOptions {
-            protocol: AuthenticatorProtocol;
-            transport: AuthenticatorTransport;
-            /**
-             * Defaults to false.
-             */
-            hasResidentKey?: boolean;
-            /**
-             * Defaults to false.
-             */
-            hasUserVerification?: boolean;
-            /**
-             * If set to true, tests of user presence will succeed immediately.
-Otherwise, they will not be resolved. Defaults to true.
-             */
-            automaticPresenceSimulation?: boolean;
-            /**
-             * Sets whether User Verification succeeds or fails for an authenticator.
-Defaults to false.
-             */
-            isUserVerified?: boolean;
-        }
-        export interface Credential {
-            credentialId: binary;
-            isResidentCredential: boolean;
-            /**
-             * Relying Party ID the credential is scoped to. Must be set when adding a
-credential.
-             */
-            rpId?: string;
-            /**
-             * The ECDSA P-256 private key in PKCS#8 format.
-             */
-            privateKey: binary;
-            /**
-             * An opaque byte sequence with a maximum size of 64 bytes mapping the
-credential to a specific user.
-             */
-            userHandle?: binary;
-            /**
-             * Signature counter. This is incremented by one for each successful
-assertion.
-See https://w3c.github.io/webauthn/#signature-counter
-             */
-            signCount: number;
-        }
-        
-        
-        /**
-         * Enable the WebAuthn domain and start intercepting credential storage and
-retrieval with a virtual authenticator.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Disable the WebAuthn domain.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Creates and adds a virtual authenticator.
-         */
-        export type addVirtualAuthenticatorParameters = {
-            options: VirtualAuthenticatorOptions;
-        }
-        export type addVirtualAuthenticatorReturnValue = {
-            authenticatorId: AuthenticatorId;
-        }
-        /**
-         * Removes the given authenticator.
-         */
-        export type removeVirtualAuthenticatorParameters = {
-            authenticatorId: AuthenticatorId;
-        }
-        export type removeVirtualAuthenticatorReturnValue = {
-        }
-        /**
-         * Adds the credential to the specified authenticator.
-         */
-        export type addCredentialParameters = {
-            authenticatorId: AuthenticatorId;
-            credential: Credential;
-        }
-        export type addCredentialReturnValue = {
-        }
-        /**
-         * Returns a single credential stored in the given virtual authenticator that
-matches the credential ID.
-         */
-        export type getCredentialParameters = {
-            authenticatorId: AuthenticatorId;
-            credentialId: binary;
-        }
-        export type getCredentialReturnValue = {
-            credential: Credential;
-        }
-        /**
-         * Returns all the credentials stored in the given virtual authenticator.
-         */
-        export type getCredentialsParameters = {
-            authenticatorId: AuthenticatorId;
-        }
-        export type getCredentialsReturnValue = {
-            credentials: Credential[];
-        }
-        /**
-         * Removes a credential from the authenticator.
-         */
-        export type removeCredentialParameters = {
-            authenticatorId: AuthenticatorId;
-            credentialId: binary;
-        }
-        export type removeCredentialReturnValue = {
-        }
-        /**
-         * Clears all the credentials from the specified device.
-         */
-        export type clearCredentialsParameters = {
-            authenticatorId: AuthenticatorId;
-        }
-        export type clearCredentialsReturnValue = {
-        }
-        /**
-         * Sets whether User Verification succeeds or fails for an authenticator.
-The default is true.
-         */
-        export type setUserVerifiedParameters = {
-            authenticatorId: AuthenticatorId;
-            isUserVerified: boolean;
-        }
-        export type setUserVerifiedReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain allows detailed inspection of media elements
-     */
-    export module Media {
-        /**
-         * Players will get an ID that is unique within the agent context.
-         */
-        export type PlayerId = string;
-        export type Timestamp = number;
-        /**
-         * Player Property type
-         */
-        export interface PlayerProperty {
-            name: string;
-            value?: string;
-        }
-        /**
-         * Break out events into different types
-         */
-        export type PlayerEventType = "errorEvent"|"triggeredEvent"|"messageEvent";
-        export interface PlayerEvent {
-            type: PlayerEventType;
-            /**
-             * Events are timestamped relative to the start of the player creation
-not relative to the start of playback.
-             */
-            timestamp: Timestamp;
-            name: string;
-            value: string;
-        }
-        
-        /**
-         * This can be called multiple times, and can be used to set / override /
-remove player properties. A null propValue indicates removal.
-         */
-        export type playerPropertiesChangedPayload = {
-            playerId: PlayerId;
-            properties: PlayerProperty[];
-        }
-        /**
-         * Send events as a list, allowing them to be batched on the browser for less
-congestion. If batched, events must ALWAYS be in chronological order.
-         */
-        export type playerEventsAddedPayload = {
-            playerId: PlayerId;
-            events: PlayerEvent[];
-        }
-        /**
-         * Called whenever a player is created, or when a new agent joins and recieves
-a list of active players. If an agent is restored, it will recieve the full
-list of player ids and all events again.
-         */
-        export type playersCreatedPayload = {
-            players: PlayerId[];
-        }
-        
-        /**
-         * Enables the Media domain
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Disables the Media domain.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain is deprecated - use Runtime or Log instead.
-     */
-    export module Console {
-        /**
-         * Console message.
-         */
-        export interface ConsoleMessage {
-            /**
-             * Message source.
-             */
-            source: "xml"|"javascript"|"network"|"console-api"|"storage"|"appcache"|"rendering"|"security"|"other"|"deprecation"|"worker";
-            /**
-             * Message severity.
-             */
-            level: "log"|"warning"|"error"|"debug"|"info";
-            /**
-             * Message text.
-             */
-            text: string;
-            /**
-             * URL of the message origin.
-             */
-            url?: string;
-            /**
-             * Line number in the resource that generated this message (1-based).
-             */
-            line?: number;
-            /**
-             * Column number in the resource that generated this message (1-based).
-             */
-            column?: number;
-        }
-        
-        /**
-         * Issued when new console message is added.
-         */
-        export type messageAddedPayload = {
-            /**
-             * Console message that has been added.
-             */
-            message: ConsoleMessage;
-        }
-        
-        /**
-         * Does nothing.
-         */
-        export type clearMessagesParameters = {
-        }
-        export type clearMessagesReturnValue = {
-        }
-        /**
-         * Disables console domain, prevents further console messages from being reported to the client.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables console domain, sends the messages collected so far to the client by means of the
-`messageAdded` notification.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-    }
-    
-    /**
-     * Debugger domain exposes JavaScript debugging capabilities. It allows setting and removing
-breakpoints, stepping through execution, exploring stack traces, etc.
-     */
-    export module Debugger {
-        /**
-         * Breakpoint identifier.
-         */
-        export type BreakpointId = string;
-        /**
-         * Call frame identifier.
-         */
-        export type CallFrameId = string;
-        /**
-         * Location in the source code.
-         */
-        export interface Location {
-            /**
-             * Script identifier as reported in the `Debugger.scriptParsed`.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * Line number in the script (0-based).
-             */
-            lineNumber: number;
-            /**
-             * Column number in the script (0-based).
-             */
-            columnNumber?: number;
-        }
-        /**
-         * Location in the source code.
-         */
-        export interface ScriptPosition {
-            lineNumber: number;
-            columnNumber: number;
-        }
-        /**
-         * JavaScript call frame. Array of call frames form the call stack.
-         */
-        export interface CallFrame {
-            /**
-             * Call frame identifier. This identifier is only valid while the virtual machine is paused.
-             */
-            callFrameId: CallFrameId;
-            /**
-             * Name of the JavaScript function called on this call frame.
-             */
-            functionName: string;
-            /**
-             * Location in the source code.
-             */
-            functionLocation?: Location;
-            /**
-             * Location in the source code.
-             */
-            location: Location;
-            /**
-             * JavaScript script name or url.
-             */
-            url: string;
-            /**
-             * Scope chain for this call frame.
-             */
-            scopeChain: Scope[];
-            /**
-             * `this` object for this call frame.
-             */
-            this: Runtime.RemoteObject;
-            /**
-             * The value being returned, if the function is at return point.
-             */
-            returnValue?: Runtime.RemoteObject;
-        }
-        /**
-         * Scope description.
-         */
-        export interface Scope {
-            /**
-             * Scope type.
-             */
-            type: "global"|"local"|"with"|"closure"|"catch"|"block"|"script"|"eval"|"module"|"wasm-expression-stack";
-            /**
-             * Object representing the scope. For `global` and `with` scopes it represents the actual
-object; for the rest of the scopes, it is artificial transient object enumerating scope
-variables as its properties.
-             */
-            object: Runtime.RemoteObject;
-            name?: string;
-            /**
-             * Location in the source code where scope starts
-             */
-            startLocation?: Location;
-            /**
-             * Location in the source code where scope ends
-             */
-            endLocation?: Location;
-        }
-        /**
-         * Search match for resource.
-         */
-        export interface SearchMatch {
-            /**
-             * Line number in resource content.
-             */
-            lineNumber: number;
-            /**
-             * Line with match content.
-             */
-            lineContent: string;
-        }
-        export interface BreakLocation {
-            /**
-             * Script identifier as reported in the `Debugger.scriptParsed`.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * Line number in the script (0-based).
-             */
-            lineNumber: number;
-            /**
-             * Column number in the script (0-based).
-             */
-            columnNumber?: number;
-            type?: "debuggerStatement"|"call"|"return";
-        }
-        /**
-         * Enum of possible script languages.
-         */
-        export type ScriptLanguage = "JavaScript"|"WebAssembly";
-        
-        /**
-         * Fired when breakpoint is resolved to an actual script and location.
-         */
-        export type breakpointResolvedPayload = {
-            /**
-             * Breakpoint unique identifier.
-             */
-            breakpointId: BreakpointId;
-            /**
-             * Actual breakpoint location.
-             */
-            location: Location;
-        }
-        /**
-         * Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
-         */
-        export type pausedPayload = {
-            /**
-             * Call stack the virtual machine stopped on.
-             */
-            callFrames: CallFrame[];
-            /**
-             * Pause reason.
-             */
-            reason: "ambiguous"|"assert"|"debugCommand"|"DOM"|"EventListener"|"exception"|"instrumentation"|"OOM"|"other"|"promiseRejection"|"XHR";
-            /**
-             * Object containing break-specific auxiliary properties.
-             */
-            data?: object;
-            /**
-             * Hit breakpoints IDs
-             */
-            hitBreakpoints?: string[];
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTrace?: Runtime.StackTrace;
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTraceId?: Runtime.StackTraceId;
-            /**
-             * Never present, will be removed.
-             */
-            asyncCallStackTraceId?: Runtime.StackTraceId;
-        }
-        /**
-         * Fired when the virtual machine resumed execution.
-         */
-        export type resumedPayload = void;
-        /**
-         * Fired when virtual machine fails to parse the script.
-         */
-        export type scriptFailedToParsePayload = {
-            /**
-             * Identifier of the script parsed.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * URL or name of the script parsed (if any).
-             */
-            url: string;
-            /**
-             * Line offset of the script within the resource with given URL (for script tags).
-             */
-            startLine: number;
-            /**
-             * Column offset of the script within the resource with given URL.
-             */
-            startColumn: number;
-            /**
-             * Last line of the script.
-             */
-            endLine: number;
-            /**
-             * Length of the last line of the script.
-             */
-            endColumn: number;
-            /**
-             * Specifies script creation context.
-             */
-            executionContextId: Runtime.ExecutionContextId;
-            /**
-             * Content hash of the script.
-             */
-            hash: string;
-            /**
-             * Embedder-specific auxiliary data.
-             */
-            executionContextAuxData?: object;
-            /**
-             * URL of source map associated with script (if any).
-             */
-            sourceMapURL?: string;
-            /**
-             * True, if this script has sourceURL.
-             */
-            hasSourceURL?: boolean;
-            /**
-             * True, if this script is ES6 module.
-             */
-            isModule?: boolean;
-            /**
-             * This script length.
-             */
-            length?: number;
-            /**
-             * JavaScript top stack frame of where the script parsed event was triggered if available.
-             */
-            stackTrace?: Runtime.StackTrace;
-            /**
-             * If the scriptLanguage is WebAssembly, the code section offset in the module.
-             */
-            codeOffset?: number;
-            /**
-             * The language of the script.
-             */
-            scriptLanguage?: Debugger.ScriptLanguage;
-        }
-        /**
-         * Fired when virtual machine parses script. This event is also fired for all known and uncollected
-scripts upon enabling debugger.
-         */
-        export type scriptParsedPayload = {
-            /**
-             * Identifier of the script parsed.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * URL or name of the script parsed (if any).
-             */
-            url: string;
-            /**
-             * Line offset of the script within the resource with given URL (for script tags).
-             */
-            startLine: number;
-            /**
-             * Column offset of the script within the resource with given URL.
-             */
-            startColumn: number;
-            /**
-             * Last line of the script.
-             */
-            endLine: number;
-            /**
-             * Length of the last line of the script.
-             */
-            endColumn: number;
-            /**
-             * Specifies script creation context.
-             */
-            executionContextId: Runtime.ExecutionContextId;
-            /**
-             * Content hash of the script.
-             */
-            hash: string;
-            /**
-             * Embedder-specific auxiliary data.
-             */
-            executionContextAuxData?: object;
-            /**
-             * True, if this script is generated as a result of the live edit operation.
-             */
-            isLiveEdit?: boolean;
-            /**
-             * URL of source map associated with script (if any).
-             */
-            sourceMapURL?: string;
-            /**
-             * True, if this script has sourceURL.
-             */
-            hasSourceURL?: boolean;
-            /**
-             * True, if this script is ES6 module.
-             */
-            isModule?: boolean;
-            /**
-             * This script length.
-             */
-            length?: number;
-            /**
-             * JavaScript top stack frame of where the script parsed event was triggered if available.
-             */
-            stackTrace?: Runtime.StackTrace;
-            /**
-             * If the scriptLanguage is WebAssembly, the code section offset in the module.
-             */
-            codeOffset?: number;
-            /**
-             * The language of the script.
-             */
-            scriptLanguage?: Debugger.ScriptLanguage;
-        }
-        
-        /**
-         * Continues execution until specific location is reached.
-         */
-        export type continueToLocationParameters = {
-            /**
-             * Location to continue to.
-             */
-            location: Location;
-            targetCallFrames?: "any"|"current";
-        }
-        export type continueToLocationReturnValue = {
-        }
-        /**
-         * Disables debugger for given page.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Enables debugger for the given page. Clients should not assume that the debugging has been
-enabled until the result for this command is received.
-         */
-        export type enableParameters = {
-            /**
-             * The maximum size in bytes of collected scripts (not referenced by other heap objects)
-the debugger can hold. Puts no limit if paramter is omitted.
-             */
-            maxScriptsCacheSize?: number;
-        }
-        export type enableReturnValue = {
-            /**
-             * Unique identifier of the debugger.
-             */
-            debuggerId: Runtime.UniqueDebuggerId;
-        }
-        /**
-         * Evaluates expression on a given call frame.
-         */
-        export type evaluateOnCallFrameParameters = {
-            /**
-             * Call frame identifier to evaluate on.
-             */
-            callFrameId: CallFrameId;
-            /**
-             * Expression to evaluate.
-             */
-            expression: string;
-            /**
-             * String object group name to put result into (allows rapid releasing resulting object handles
-using `releaseObjectGroup`).
-             */
-            objectGroup?: string;
-            /**
-             * Specifies whether command line API should be available to the evaluated expression, defaults
-to false.
-             */
-            includeCommandLineAPI?: boolean;
-            /**
-             * In silent mode exceptions thrown during evaluation are not reported and do not pause
-execution. Overrides `setPauseOnException` state.
-             */
-            silent?: boolean;
-            /**
-             * Whether the result is expected to be a JSON object that should be sent by value.
-             */
-            returnByValue?: boolean;
-            /**
-             * Whether preview should be generated for the result.
-             */
-            generatePreview?: boolean;
-            /**
-             * Whether to throw an exception if side effect cannot be ruled out during evaluation.
-             */
-            throwOnSideEffect?: boolean;
-            /**
-             * Terminate execution after timing out (number of milliseconds).
-             */
-            timeout?: Runtime.TimeDelta;
-        }
-        export type evaluateOnCallFrameReturnValue = {
-            /**
-             * Object wrapper for the evaluation result.
-             */
-            result: Runtime.RemoteObject;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: Runtime.ExceptionDetails;
-        }
-        /**
-         * Returns possible locations for breakpoint. scriptId in start and end range locations should be
-the same.
-         */
-        export type getPossibleBreakpointsParameters = {
-            /**
-             * Start of range to search possible breakpoint locations in.
-             */
-            start: Location;
-            /**
-             * End of range to search possible breakpoint locations in (excluding). When not specified, end
-of scripts is used as end of range.
-             */
-            end?: Location;
-            /**
-             * Only consider locations which are in the same (non-nested) function as start.
-             */
-            restrictToFunction?: boolean;
-        }
-        export type getPossibleBreakpointsReturnValue = {
-            /**
-             * List of the possible breakpoint locations.
-             */
-            locations: BreakLocation[];
-        }
-        /**
-         * Returns source for the script with given id.
-         */
-        export type getScriptSourceParameters = {
-            /**
-             * Id of the script to get source for.
-             */
-            scriptId: Runtime.ScriptId;
-        }
-        export type getScriptSourceReturnValue = {
-            /**
-             * Script source (empty in case of Wasm bytecode).
-             */
-            scriptSource: string;
-            /**
-             * Wasm bytecode.
-             */
-            bytecode?: binary;
-        }
-        /**
-         * This command is deprecated. Use getScriptSource instead.
-         */
-        export type getWasmBytecodeParameters = {
-            /**
-             * Id of the Wasm script to get source for.
-             */
-            scriptId: Runtime.ScriptId;
-        }
-        export type getWasmBytecodeReturnValue = {
-            /**
-             * Script source.
-             */
-            bytecode: binary;
-        }
-        /**
-         * Returns stack trace with given `stackTraceId`.
-         */
-        export type getStackTraceParameters = {
-            stackTraceId: Runtime.StackTraceId;
-        }
-        export type getStackTraceReturnValue = {
-            stackTrace: Runtime.StackTrace;
-        }
-        /**
-         * Stops on the next JavaScript statement.
-         */
-        export type pauseParameters = {
-        }
-        export type pauseReturnValue = {
-        }
-        export type pauseOnAsyncCallParameters = {
-            /**
-             * Debugger will pause when async call with given stack trace is started.
-             */
-            parentStackTraceId: Runtime.StackTraceId;
-        }
-        export type pauseOnAsyncCallReturnValue = {
-        }
-        /**
-         * Removes JavaScript breakpoint.
-         */
-        export type removeBreakpointParameters = {
-            breakpointId: BreakpointId;
-        }
-        export type removeBreakpointReturnValue = {
-        }
-        /**
-         * Restarts particular call frame from the beginning.
-         */
-        export type restartFrameParameters = {
-            /**
-             * Call frame identifier to evaluate on.
-             */
-            callFrameId: CallFrameId;
-        }
-        export type restartFrameReturnValue = {
-            /**
-             * New stack trace.
-             */
-            callFrames: CallFrame[];
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTrace?: Runtime.StackTrace;
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTraceId?: Runtime.StackTraceId;
-        }
-        /**
-         * Resumes JavaScript execution.
-         */
-        export type resumeParameters = {
-            /**
-             * Set to true to terminate execution upon resuming execution. In contrast
-to Runtime.terminateExecution, this will allows to execute further
-JavaScript (i.e. via evaluation) until execution of the paused code
-is actually resumed, at which point termination is triggered.
-If execution is currently not paused, this parameter has no effect.
-             */
-            terminateOnResume?: boolean;
-        }
-        export type resumeReturnValue = {
-        }
-        /**
-         * Searches for given string in script content.
-         */
-        export type searchInContentParameters = {
-            /**
-             * Id of the script to search in.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * String to search for.
-             */
-            query: string;
-            /**
-             * If true, search is case sensitive.
-             */
-            caseSensitive?: boolean;
-            /**
-             * If true, treats string parameter as regex.
-             */
-            isRegex?: boolean;
-        }
-        export type searchInContentReturnValue = {
-            /**
-             * List of search matches.
-             */
-            result: SearchMatch[];
-        }
-        /**
-         * Enables or disables async call stacks tracking.
-         */
-        export type setAsyncCallStackDepthParameters = {
-            /**
-             * Maximum depth of async call stacks. Setting to `0` will effectively disable collecting async
-call stacks (default).
-             */
-            maxDepth: number;
-        }
-        export type setAsyncCallStackDepthReturnValue = {
-        }
-        /**
-         * Replace previous blackbox patterns with passed ones. Forces backend to skip stepping/pausing in
-scripts with url matching one of the patterns. VM will try to leave blackboxed script by
-performing 'step in' several times, finally resorting to 'step out' if unsuccessful.
-         */
-        export type setBlackboxPatternsParameters = {
-            /**
-             * Array of regexps that will be used to check script url for blackbox state.
-             */
-            patterns: string[];
-        }
-        export type setBlackboxPatternsReturnValue = {
-        }
-        /**
-         * Makes backend skip steps in the script in blackboxed ranges. VM will try leave blacklisted
-scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.
-Positions array contains positions where blackbox state is changed. First interval isn't
-blackboxed. Array should be sorted.
-         */
-        export type setBlackboxedRangesParameters = {
-            /**
-             * Id of the script.
-             */
-            scriptId: Runtime.ScriptId;
-            positions: ScriptPosition[];
-        }
-        export type setBlackboxedRangesReturnValue = {
-        }
-        /**
-         * Sets JavaScript breakpoint at a given location.
-         */
-        export type setBreakpointParameters = {
-            /**
-             * Location to set breakpoint in.
-             */
-            location: Location;
-            /**
-             * Expression to use as a breakpoint condition. When specified, debugger will only stop on the
-breakpoint if this expression evaluates to true.
-             */
-            condition?: string;
-        }
-        export type setBreakpointReturnValue = {
-            /**
-             * Id of the created breakpoint for further reference.
-             */
-            breakpointId: BreakpointId;
-            /**
-             * Location this breakpoint resolved into.
-             */
-            actualLocation: Location;
-        }
-        /**
-         * Sets instrumentation breakpoint.
-         */
-        export type setInstrumentationBreakpointParameters = {
-            /**
-             * Instrumentation name.
-             */
-            instrumentation: "beforeScriptExecution"|"beforeScriptWithSourceMapExecution";
-        }
-        export type setInstrumentationBreakpointReturnValue = {
-            /**
-             * Id of the created breakpoint for further reference.
-             */
-            breakpointId: BreakpointId;
-        }
-        /**
-         * Sets JavaScript breakpoint at given location specified either by URL or URL regex. Once this
-command is issued, all existing parsed scripts will have breakpoints resolved and returned in
-`locations` property. Further matching script parsing will result in subsequent
-`breakpointResolved` events issued. This logical breakpoint will survive page reloads.
-         */
-        export type setBreakpointByUrlParameters = {
-            /**
-             * Line number to set breakpoint at.
-             */
-            lineNumber: number;
-            /**
-             * URL of the resources to set breakpoint on.
-             */
-            url?: string;
-            /**
-             * Regex pattern for the URLs of the resources to set breakpoints on. Either `url` or
-`urlRegex` must be specified.
-             */
-            urlRegex?: string;
-            /**
-             * Script hash of the resources to set breakpoint on.
-             */
-            scriptHash?: string;
-            /**
-             * Offset in the line to set breakpoint at.
-             */
-            columnNumber?: number;
-            /**
-             * Expression to use as a breakpoint condition. When specified, debugger will only stop on the
-breakpoint if this expression evaluates to true.
-             */
-            condition?: string;
-        }
-        export type setBreakpointByUrlReturnValue = {
-            /**
-             * Id of the created breakpoint for further reference.
-             */
-            breakpointId: BreakpointId;
-            /**
-             * List of the locations this breakpoint resolved into upon addition.
-             */
-            locations: Location[];
-        }
-        /**
-         * Sets JavaScript breakpoint before each call to the given function.
-If another function was created from the same source as a given one,
-calling it will also trigger the breakpoint.
-         */
-        export type setBreakpointOnFunctionCallParameters = {
-            /**
-             * Function object id.
-             */
-            objectId: Runtime.RemoteObjectId;
-            /**
-             * Expression to use as a breakpoint condition. When specified, debugger will
-stop on the breakpoint if this expression evaluates to true.
-             */
-            condition?: string;
-        }
-        export type setBreakpointOnFunctionCallReturnValue = {
-            /**
-             * Id of the created breakpoint for further reference.
-             */
-            breakpointId: BreakpointId;
-        }
-        /**
-         * Activates / deactivates all breakpoints on the page.
-         */
-        export type setBreakpointsActiveParameters = {
-            /**
-             * New value for breakpoints active state.
-             */
-            active: boolean;
-        }
-        export type setBreakpointsActiveReturnValue = {
-        }
-        /**
-         * Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or
-no exceptions. Initial pause on exceptions state is `none`.
-         */
-        export type setPauseOnExceptionsParameters = {
-            /**
-             * Pause on exceptions mode.
-             */
-            state: "none"|"uncaught"|"all";
-        }
-        export type setPauseOnExceptionsReturnValue = {
-        }
-        /**
-         * Changes return value in top frame. Available only at return break position.
-         */
-        export type setReturnValueParameters = {
-            /**
-             * New return value.
-             */
-            newValue: Runtime.CallArgument;
-        }
-        export type setReturnValueReturnValue = {
-        }
-        /**
-         * Edits JavaScript source live.
-         */
-        export type setScriptSourceParameters = {
-            /**
-             * Id of the script to edit.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * New content of the script.
-             */
-            scriptSource: string;
-            /**
-             * If true the change will not actually be applied. Dry run may be used to get result
-description without actually modifying the code.
-             */
-            dryRun?: boolean;
-        }
-        export type setScriptSourceReturnValue = {
-            /**
-             * New stack trace in case editing has happened while VM was stopped.
-             */
-            callFrames?: CallFrame[];
-            /**
-             * Whether current call stack  was modified after applying the changes.
-             */
-            stackChanged?: boolean;
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTrace?: Runtime.StackTrace;
-            /**
-             * Async stack trace, if any.
-             */
-            asyncStackTraceId?: Runtime.StackTraceId;
-            /**
-             * Exception details if any.
-             */
-            exceptionDetails?: Runtime.ExceptionDetails;
-        }
-        /**
-         * Makes page not interrupt on any pauses (breakpoint, exception, dom exception etc).
-         */
-        export type setSkipAllPausesParameters = {
-            /**
-             * New value for skip pauses state.
-             */
-            skip: boolean;
-        }
-        export type setSkipAllPausesReturnValue = {
-        }
-        /**
-         * Changes value of variable in a callframe. Object-based scopes are not supported and must be
-mutated manually.
-         */
-        export type setVariableValueParameters = {
-            /**
-             * 0-based number of scope as was listed in scope chain. Only 'local', 'closure' and 'catch'
-scope types are allowed. Other scopes could be manipulated manually.
-             */
-            scopeNumber: number;
-            /**
-             * Variable name.
-             */
-            variableName: string;
-            /**
-             * New variable value.
-             */
-            newValue: Runtime.CallArgument;
-            /**
-             * Id of callframe that holds variable.
-             */
-            callFrameId: CallFrameId;
-        }
-        export type setVariableValueReturnValue = {
-        }
-        /**
-         * Steps into the function call.
-         */
-        export type stepIntoParameters = {
-            /**
-             * Debugger will pause on the execution of the first async task which was scheduled
-before next pause.
-             */
-            breakOnAsyncCall?: boolean;
-        }
-        export type stepIntoReturnValue = {
-        }
-        /**
-         * Steps out of the function call.
-         */
-        export type stepOutParameters = {
-        }
-        export type stepOutReturnValue = {
-        }
-        /**
-         * Steps over the statement.
-         */
-        export type stepOverParameters = {
-        }
-        export type stepOverReturnValue = {
-        }
-    }
-    
-    export module HeapProfiler {
-        /**
-         * Heap snapshot object id.
-         */
-        export type HeapSnapshotObjectId = string;
-        /**
-         * Sampling Heap Profile node. Holds callsite information, allocation statistics and child nodes.
-         */
-        export interface SamplingHeapProfileNode {
-            /**
-             * Function location.
-             */
-            callFrame: Runtime.CallFrame;
-            /**
-             * Allocations size in bytes for the node excluding children.
-             */
-            selfSize: number;
-            /**
-             * Node id. Ids are unique across all profiles collected between startSampling and stopSampling.
-             */
-            id: number;
-            /**
-             * Child nodes.
-             */
-            children: SamplingHeapProfileNode[];
-        }
-        /**
-         * A single sample from a sampling profile.
-         */
-        export interface SamplingHeapProfileSample {
-            /**
-             * Allocation size in bytes attributed to the sample.
-             */
-            size: number;
-            /**
-             * Id of the corresponding profile tree node.
-             */
-            nodeId: number;
-            /**
-             * Time-ordered sample ordinal number. It is unique across all profiles retrieved
-between startSampling and stopSampling.
-             */
-            ordinal: number;
-        }
-        /**
-         * Sampling profile.
-         */
-        export interface SamplingHeapProfile {
-            head: SamplingHeapProfileNode;
-            samples: SamplingHeapProfileSample[];
-        }
-        
-        export type addHeapSnapshotChunkPayload = {
-            chunk: string;
-        }
-        /**
-         * If heap objects tracking has been started then backend may send update for one or more fragments
-         */
-        export type heapStatsUpdatePayload = {
-            /**
-             * An array of triplets. Each triplet describes a fragment. The first integer is the fragment
-index, the second integer is a total count of objects for the fragment, the third integer is
-a total size of the objects for the fragment.
-             */
-            statsUpdate: number[];
-        }
-        /**
-         * If heap objects tracking has been started then backend regularly sends a current value for last
-seen object id and corresponding timestamp. If the were changes in the heap since last event
-then one or more heapStatsUpdate events will be sent before a new lastSeenObjectId event.
-         */
-        export type lastSeenObjectIdPayload = {
-            lastSeenObjectId: number;
-            timestamp: number;
-        }
-        export type reportHeapSnapshotProgressPayload = {
-            done: number;
-            total: number;
-            finished?: boolean;
-        }
-        export type resetProfilesPayload = void;
-        
-        /**
-         * Enables console to refer to the node with given id via $x (see Command Line API for more details
-$x functions).
-         */
-        export type addInspectedHeapObjectParameters = {
-            /**
-             * Heap snapshot object id to be accessible by means of $x command line API.
-             */
-            heapObjectId: HeapSnapshotObjectId;
-        }
-        export type addInspectedHeapObjectReturnValue = {
-        }
-        export type collectGarbageParameters = {
-        }
-        export type collectGarbageReturnValue = {
-        }
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        export type getHeapObjectIdParameters = {
-            /**
-             * Identifier of the object to get heap object id for.
-             */
-            objectId: Runtime.RemoteObjectId;
-        }
-        export type getHeapObjectIdReturnValue = {
-            /**
-             * Id of the heap snapshot object corresponding to the passed remote object id.
-             */
-            heapSnapshotObjectId: HeapSnapshotObjectId;
-        }
-        export type getObjectByHeapObjectIdParameters = {
-            objectId: HeapSnapshotObjectId;
-            /**
-             * Symbolic group name that can be used to release multiple objects.
-             */
-            objectGroup?: string;
-        }
-        export type getObjectByHeapObjectIdReturnValue = {
-            /**
-             * Evaluation result.
-             */
-            result: Runtime.RemoteObject;
-        }
-        export type getSamplingProfileParameters = {
-        }
-        export type getSamplingProfileReturnValue = {
-            /**
-             * Return the sampling profile being collected.
-             */
-            profile: SamplingHeapProfile;
-        }
-        export type startSamplingParameters = {
-            /**
-             * Average sample interval in bytes. Poisson distribution is used for the intervals. The
-default value is 32768 bytes.
-             */
-            samplingInterval?: number;
-        }
-        export type startSamplingReturnValue = {
-        }
-        export type startTrackingHeapObjectsParameters = {
-            trackAllocations?: boolean;
-        }
-        export type startTrackingHeapObjectsReturnValue = {
-        }
-        export type stopSamplingParameters = {
-        }
-        export type stopSamplingReturnValue = {
-            /**
-             * Recorded sampling heap profile.
-             */
-            profile: SamplingHeapProfile;
-        }
-        export type stopTrackingHeapObjectsParameters = {
-            /**
-             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken
-when the tracking is stopped.
-             */
-            reportProgress?: boolean;
-            treatGlobalObjectsAsRoots?: boolean;
-        }
-        export type stopTrackingHeapObjectsReturnValue = {
-        }
-        export type takeHeapSnapshotParameters = {
-            /**
-             * If true 'reportHeapSnapshotProgress' events will be generated while snapshot is being taken.
-             */
-            reportProgress?: boolean;
-            /**
-             * If true, a raw snapshot without artifical roots will be generated
-             */
-            treatGlobalObjectsAsRoots?: boolean;
-        }
-        export type takeHeapSnapshotReturnValue = {
-        }
-    }
-    
-    export module Profiler {
-        /**
-         * Profile node. Holds callsite information, execution statistics and child nodes.
-         */
-        export interface ProfileNode {
-            /**
-             * Unique id of the node.
-             */
-            id: number;
-            /**
-             * Function location.
-             */
-            callFrame: Runtime.CallFrame;
-            /**
-             * Number of samples where this node was on top of the call stack.
-             */
-            hitCount?: number;
-            /**
-             * Child node ids.
-             */
-            children?: number[];
-            /**
-             * The reason of being not optimized. The function may be deoptimized or marked as don't
-optimize.
-             */
-            deoptReason?: string;
-            /**
-             * An array of source position ticks.
-             */
-            positionTicks?: PositionTickInfo[];
-        }
-        /**
-         * Profile.
-         */
-        export interface Profile {
-            /**
-             * The list of profile nodes. First item is the root node.
-             */
-            nodes: ProfileNode[];
-            /**
-             * Profiling start timestamp in microseconds.
-             */
-            startTime: number;
-            /**
-             * Profiling end timestamp in microseconds.
-             */
-            endTime: number;
-            /**
-             * Ids of samples top nodes.
-             */
-            samples?: number[];
-            /**
-             * Time intervals between adjacent samples in microseconds. The first delta is relative to the
-profile startTime.
-             */
-            timeDeltas?: number[];
-        }
-        /**
-         * Specifies a number of samples attributed to a certain source position.
-         */
-        export interface PositionTickInfo {
-            /**
-             * Source line number (1-based).
-             */
-            line: number;
-            /**
-             * Number of samples attributed to the source line.
-             */
-            ticks: number;
-        }
-        /**
-         * Coverage data for a source range.
-         */
-        export interface CoverageRange {
-            /**
-             * JavaScript script source offset for the range start.
-             */
-            startOffset: number;
-            /**
-             * JavaScript script source offset for the range end.
-             */
-            endOffset: number;
-            /**
-             * Collected execution count of the source range.
-             */
-            count: number;
-        }
-        /**
-         * Coverage data for a JavaScript function.
-         */
-        export interface FunctionCoverage {
-            /**
-             * JavaScript function name.
-             */
-            functionName: string;
-            /**
-             * Source ranges inside the function with coverage data.
-             */
-            ranges: CoverageRange[];
-            /**
-             * Whether coverage data for this function has block granularity.
-             */
-            isBlockCoverage: boolean;
-        }
-        /**
-         * Coverage data for a JavaScript script.
-         */
-        export interface ScriptCoverage {
-            /**
-             * JavaScript script id.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * JavaScript script name or url.
-             */
-            url: string;
-            /**
-             * Functions contained in the script that has coverage data.
-             */
-            functions: FunctionCoverage[];
-        }
-        /**
-         * Describes a type collected during runtime.
-         */
-        export interface TypeObject {
-            /**
-             * Name of a type collected with type profiling.
-             */
-            name: string;
-        }
-        /**
-         * Source offset and types for a parameter or return value.
-         */
-        export interface TypeProfileEntry {
-            /**
-             * Source offset of the parameter or end of function for return values.
-             */
-            offset: number;
-            /**
-             * The types for this parameter or return value.
-             */
-            types: TypeObject[];
-        }
-        /**
-         * Type profile data collected during runtime for a JavaScript script.
-         */
-        export interface ScriptTypeProfile {
-            /**
-             * JavaScript script id.
-             */
-            scriptId: Runtime.ScriptId;
-            /**
-             * JavaScript script name or url.
-             */
-            url: string;
-            /**
-             * Type profile entries for parameters and return values of the functions in the script.
-             */
-            entries: TypeProfileEntry[];
-        }
-        /**
-         * Collected counter information.
-         */
-        export interface CounterInfo {
-            /**
-             * Counter name.
-             */
-            name: string;
-            /**
-             * Counter value.
-             */
-            value: number;
-        }
-        
-        export type consoleProfileFinishedPayload = {
-            id: string;
-            /**
-             * Location of console.profileEnd().
-             */
-            location: Debugger.Location;
-            profile: Profile;
-            /**
-             * Profile title passed as an argument to console.profile().
-             */
-            title?: string;
-        }
-        /**
-         * Sent when new profile recording is started using console.profile() call.
-         */
-        export type consoleProfileStartedPayload = {
-            id: string;
-            /**
-             * Location of console.profile().
-             */
-            location: Debugger.Location;
-            /**
-             * Profile title passed as an argument to console.profile().
-             */
-            title?: string;
-        }
-        /**
-         * Reports coverage delta since the last poll (either from an event like this, or from
-`takePreciseCoverage` for the current isolate. May only be sent if precise code
-coverage has been started. This event can be trigged by the embedder to, for example,
-trigger collection of coverage data immediatelly at a certain point in time.
-         */
-        export type preciseCoverageDeltaUpdatePayload = {
-            /**
-             * Monotonically increasing time (in seconds) when the coverage update was taken in the backend.
-             */
-            timestamp: number;
-            /**
-             * Identifier for distinguishing coverage events.
-             */
-            occassion: string;
-            /**
-             * Coverage data for the current isolate.
-             */
-            result: ScriptCoverage[];
-        }
-        
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Collect coverage data for the current isolate. The coverage data may be incomplete due to
-garbage collection.
-         */
-        export type getBestEffortCoverageParameters = {
-        }
-        export type getBestEffortCoverageReturnValue = {
-            /**
-             * Coverage data for the current isolate.
-             */
-            result: ScriptCoverage[];
-        }
-        /**
-         * Changes CPU profiler sampling interval. Must be called before CPU profiles recording started.
-         */
-        export type setSamplingIntervalParameters = {
-            /**
-             * New sampling interval in microseconds.
-             */
-            interval: number;
-        }
-        export type setSamplingIntervalReturnValue = {
-        }
-        export type startParameters = {
-        }
-        export type startReturnValue = {
-        }
-        /**
-         * Enable precise code coverage. Coverage data for JavaScript executed before enabling precise code
-coverage may be incomplete. Enabling prevents running optimized code and resets execution
-counters.
-         */
-        export type startPreciseCoverageParameters = {
-            /**
-             * Collect accurate call counts beyond simple 'covered' or 'not covered'.
-             */
-            callCount?: boolean;
-            /**
-             * Collect block-based coverage.
-             */
-            detailed?: boolean;
-            /**
-             * Allow the backend to send updates on its own initiative
-             */
-            allowTriggeredUpdates?: boolean;
-        }
-        export type startPreciseCoverageReturnValue = {
-            /**
-             * Monotonically increasing time (in seconds) when the coverage update was taken in the backend.
-             */
-            timestamp: number;
-        }
-        /**
-         * Enable type profile.
-         */
-        export type startTypeProfileParameters = {
-        }
-        export type startTypeProfileReturnValue = {
-        }
-        export type stopParameters = {
-        }
-        export type stopReturnValue = {
-            /**
-             * Recorded profile.
-             */
-            profile: Profile;
-        }
-        /**
-         * Disable precise code coverage. Disabling releases unnecessary execution count records and allows
-executing optimized code.
-         */
-        export type stopPreciseCoverageParameters = {
-        }
-        export type stopPreciseCoverageReturnValue = {
-        }
-        /**
-         * Disable type profile. Disabling releases type profile data collected so far.
-         */
-        export type stopTypeProfileParameters = {
-        }
-        export type stopTypeProfileReturnValue = {
-        }
-        /**
-         * Collect coverage data for the current isolate, and resets execution counters. Precise code
-coverage needs to have started.
-         */
-        export type takePreciseCoverageParameters = {
-        }
-        export type takePreciseCoverageReturnValue = {
-            /**
-             * Coverage data for the current isolate.
-             */
-            result: ScriptCoverage[];
-            /**
-             * Monotonically increasing time (in seconds) when the coverage update was taken in the backend.
-             */
-            timestamp: number;
-        }
-        /**
-         * Collect type profile.
-         */
-        export type takeTypeProfileParameters = {
-        }
-        export type takeTypeProfileReturnValue = {
-            /**
-             * Type profile for all scripts since startTypeProfile() was turned on.
-             */
-            result: ScriptTypeProfile[];
-        }
-        /**
-         * Enable run time call stats collection.
-         */
-        export type enableRuntimeCallStatsParameters = {
-        }
-        export type enableRuntimeCallStatsReturnValue = {
-        }
-        /**
-         * Disable run time call stats collection.
-         */
-        export type disableRuntimeCallStatsParameters = {
-        }
-        export type disableRuntimeCallStatsReturnValue = {
-        }
-        /**
-         * Retrieve run time call stats.
-         */
-        export type getRuntimeCallStatsParameters = {
-        }
-        export type getRuntimeCallStatsReturnValue = {
-            /**
-             * Collected counter information.
-             */
-            result: CounterInfo[];
-        }
-    }
-    
-    /**
-     * Runtime domain exposes JavaScript runtime by means of remote evaluation and mirror objects.
-Evaluation results are returned as mirror object that expose object type, string representation
-and unique identifier that can be used for further object reference. Original objects are
-maintained in memory unless they are either explicitly released or are released along with the
-other objects in their object group.
-     */
-    export module Runtime {
-        /**
-         * Unique script identifier.
-         */
-        export type ScriptId = string;
-        /**
-         * Unique object identifier.
-         */
-        export type RemoteObjectId = string;
-        /**
-         * Primitive value which cannot be JSON-stringified. Includes values `-0`, `NaN`, `Infinity`,
-`-Infinity`, and bigint literals.
-         */
-        export type UnserializableValue = string;
-        /**
-         * Mirror object referencing original JavaScript object.
-         */
-        export interface RemoteObject {
-            /**
-             * Object type.
-             */
-            type: "object"|"function"|"undefined"|"string"|"number"|"boolean"|"symbol"|"bigint"|"wasm";
-            /**
-             * Object subtype hint. Specified for `object` or `wasm` type values only.
-             */
-            subtype?: "array"|"null"|"node"|"regexp"|"date"|"map"|"set"|"weakmap"|"weakset"|"iterator"|"generator"|"error"|"proxy"|"promise"|"typedarray"|"arraybuffer"|"dataview"|"i32"|"i64"|"f32"|"f64"|"v128";
-            /**
-             * Object class (constructor) name. Specified for `object` type values only.
-             */
-            className?: string;
-            /**
-             * Remote object value in case of primitive values or JSON values (if it was requested).
-             */
-            value?: any;
-            /**
-             * Primitive value which can not be JSON-stringified does not have `value`, but gets this
-property.
-             */
-            unserializableValue?: UnserializableValue;
-            /**
-             * String representation of the object.
-             */
-            description?: string;
-            /**
-             * Unique object identifier (for non-primitive values).
-             */
-            objectId?: RemoteObjectId;
-            /**
-             * Preview containing abbreviated property values. Specified for `object` type values only.
-             */
-            preview?: ObjectPreview;
-            customPreview?: CustomPreview;
-        }
-        export interface CustomPreview {
-            /**
-             * The JSON-stringified result of formatter.header(object, config) call.
-It contains json ML array that represents RemoteObject.
-             */
-            header: string;
-            /**
-             * If formatter returns true as a result of formatter.hasBody call then bodyGetterId will
-contain RemoteObjectId for the function that returns result of formatter.body(object, config) call.
-The result value is json ML array.
-             */
-            bodyGetterId?: RemoteObjectId;
-        }
-        /**
-         * Object containing abbreviated remote object value.
-         */
-        export interface ObjectPreview {
-            /**
-             * Object type.
-             */
-            type: "object"|"function"|"undefined"|"string"|"number"|"boolean"|"symbol"|"bigint";
-            /**
-             * Object subtype hint. Specified for `object` type values only.
-             */
-            subtype?: "array"|"null"|"node"|"regexp"|"date"|"map"|"set"|"weakmap"|"weakset"|"iterator"|"generator"|"error";
-            /**
-             * String representation of the object.
-             */
-            description?: string;
-            /**
-             * True iff some of the properties or entries of the original object did not fit.
-             */
-            overflow: boolean;
-            /**
-             * List of the properties.
-             */
-            properties: PropertyPreview[];
-            /**
-             * List of the entries. Specified for `map` and `set` subtype values only.
-             */
-            entries?: EntryPreview[];
-        }
-        export interface PropertyPreview {
-            /**
-             * Property name.
-             */
-            name: string;
-            /**
-             * Object type. Accessor means that the property itself is an accessor property.
-             */
-            type: "object"|"function"|"undefined"|"string"|"number"|"boolean"|"symbol"|"accessor"|"bigint";
-            /**
-             * User-friendly property value string.
-             */
-            value?: string;
-            /**
-             * Nested value preview.
-             */
-            valuePreview?: ObjectPreview;
-            /**
-             * Object subtype hint. Specified for `object` type values only.
-             */
-            subtype?: "array"|"null"|"node"|"regexp"|"date"|"map"|"set"|"weakmap"|"weakset"|"iterator"|"generator"|"error";
-        }
-        export interface EntryPreview {
-            /**
-             * Preview of the key. Specified for map-like collection entries.
-             */
-            key?: ObjectPreview;
-            /**
-             * Preview of the value.
-             */
-            value: ObjectPreview;
-        }
-        /**
-         * Object property descriptor.
-         */
-        export interface PropertyDescriptor {
-            /**
-             * Property name or symbol description.
-             */
-            name: string;
-            /**
-             * The value associated with the property.
-             */
-            value?: RemoteObject;
-            /**
-             * True if the value associated with the property may be changed (data descriptors only).
-             */
-            writable?: boolean;
-            /**
-             * A function which serves as a getter for the property, or `undefined` if there is no getter
-(accessor descriptors only).
-             */
-            get?: RemoteObject;
-            /**
-             * A function which serves as a setter for the property, or `undefined` if there is no setter
-(accessor descriptors only).
-             */
-            set?: RemoteObject;
-            /**
-             * True if the type of this property descriptor may be changed and if the property may be
-deleted from the corresponding object.
-             */
-            configurable: boolean;
-            /**
-             * True if this property shows up during enumeration of the properties on the corresponding
-object.
-             */
-            enumerable: boolean;
-            /**
-             * True if the result was thrown during the evaluation.
-             */
-            wasThrown?: boolean;
-            /**
-             * True if the property is owned for the object.
-             */
-            isOwn?: boolean;
-            /**
-             * Property symbol object, if the property is of the `symbol` type.
-             */
-            symbol?: RemoteObject;
-        }
-        /**
-         * Object internal property descriptor. This property isn't normally visible in JavaScript code.
-         */
-        export interface InternalPropertyDescriptor {
-            /**
-             * Conventional property name.
-             */
-            name: string;
-            /**
-             * The value associated with the property.
-             */
-            value?: RemoteObject;
-        }
-        /**
-         * Object private field descriptor.
-         */
-        export interface PrivatePropertyDescriptor {
-            /**
-             * Private property name.
-             */
-            name: string;
-            /**
-             * The value associated with the private property.
-             */
-            value?: RemoteObject;
-            /**
-             * A function which serves as a getter for the private property,
-or `undefined` if there is no getter (accessor descriptors only).
-             */
-            get?: RemoteObject;
-            /**
-             * A function which serves as a setter for the private property,
-or `undefined` if there is no setter (accessor descriptors only).
-             */
-            set?: RemoteObject;
-        }
-        /**
-         * Represents function call argument. Either remote object id `objectId`, primitive `value`,
-unserializable primitive value or neither of (for undefined) them should be specified.
-         */
-        export interface CallArgument {
-            /**
-             * Primitive value or serializable javascript object.
-             */
-            value?: any;
-            /**
-             * Primitive value which can not be JSON-stringified.
-             */
-            unserializableValue?: UnserializableValue;
-            /**
-             * Remote object handle.
-             */
-            objectId?: RemoteObjectId;
-        }
-        /**
-         * Id of an execution context.
-         */
-        export type ExecutionContextId = number;
-        /**
-         * Description of an isolated world.
-         */
-        export interface ExecutionContextDescription {
-            /**
-             * Unique id of the execution context. It can be used to specify in which execution context
-script evaluation should be performed.
-             */
-            id: ExecutionContextId;
-            /**
-             * Execution context origin.
-             */
-            origin: string;
-            /**
-             * Human readable name describing given context.
-             */
-            name: string;
-            /**
-             * Embedder-specific auxiliary data.
-             */
-            auxData?: object;
-        }
-        /**
-         * Detailed information about exception (or error) that was thrown during script compilation or
-execution.
-         */
-        export interface ExceptionDetails {
-            /**
-             * Exception id.
-             */
-            exceptionId: number;
-            /**
-             * Exception text, which should be used together with exception object when available.
-             */
-            text: string;
-            /**
-             * Line number of the exception location (0-based).
-             */
-            lineNumber: number;
-            /**
-             * Column number of the exception location (0-based).
-             */
-            columnNumber: number;
-            /**
-             * Script ID of the exception location.
-             */
-            scriptId?: ScriptId;
-            /**
-             * URL of the exception location, to be used when the script was not reported.
-             */
-            url?: string;
-            /**
-             * JavaScript stack trace if available.
-             */
-            stackTrace?: StackTrace;
-            /**
-             * Exception object if available.
-             */
-            exception?: RemoteObject;
-            /**
-             * Identifier of the context where exception happened.
-             */
-            executionContextId?: ExecutionContextId;
-        }
-        /**
-         * Number of milliseconds since epoch.
-         */
-        export type Timestamp = number;
-        /**
-         * Number of milliseconds.
-         */
-        export type TimeDelta = number;
-        /**
-         * Stack entry for runtime errors and assertions.
-         */
-        export interface CallFrame {
-            /**
-             * JavaScript function name.
-             */
-            functionName: string;
-            /**
-             * JavaScript script id.
-             */
-            scriptId: ScriptId;
-            /**
-             * JavaScript script name or url.
-             */
-            url: string;
-            /**
-             * JavaScript script line number (0-based).
-             */
-            lineNumber: number;
-            /**
-             * JavaScript script column number (0-based).
-             */
-            columnNumber: number;
-        }
-        /**
-         * Call frames for assertions or error messages.
-         */
-        export interface StackTrace {
-            /**
-             * String label of this stack trace. For async traces this may be a name of the function that
-initiated the async call.
-             */
-            description?: string;
-            /**
-             * JavaScript function name.
-             */
-            callFrames: CallFrame[];
-            /**
-             * Asynchronous JavaScript stack trace that preceded this stack, if available.
-             */
-            parent?: StackTrace;
-            /**
-             * Asynchronous JavaScript stack trace that preceded this stack, if available.
-             */
-            parentId?: StackTraceId;
-        }
-        /**
-         * Unique identifier of current debugger.
-         */
-        export type UniqueDebuggerId = string;
-        /**
-         * If `debuggerId` is set stack trace comes from another debugger and can be resolved there. This
-allows to track cross-debugger calls. See `Runtime.StackTrace` and `Debugger.paused` for usages.
-         */
-        export interface StackTraceId {
-            id: string;
-            debuggerId?: UniqueDebuggerId;
-        }
-        
-        /**
-         * Notification is issued every time when binding is called.
-         */
-        export type bindingCalledPayload = {
-            name: string;
-            payload: string;
-            /**
-             * Identifier of the context where the call was made.
-             */
-            executionContextId: ExecutionContextId;
-        }
-        /**
-         * Issued when console API was called.
-         */
-        export type consoleAPICalledPayload = {
-            /**
-             * Type of the call.
-             */
-            type: "log"|"debug"|"info"|"error"|"warning"|"dir"|"dirxml"|"table"|"trace"|"clear"|"startGroup"|"startGroupCollapsed"|"endGroup"|"assert"|"profile"|"profileEnd"|"count"|"timeEnd";
-            /**
-             * Call arguments.
-             */
-            args: RemoteObject[];
-            /**
-             * Identifier of the context where the call was made.
-             */
-            executionContextId: ExecutionContextId;
-            /**
-             * Call timestamp.
-             */
-            timestamp: Timestamp;
-            /**
-             * Stack trace captured when the call was made. The async stack chain is automatically reported for
-the following call types: `assert`, `error`, `trace`, `warning`. For other types the async call
-chain can be retrieved using `Debugger.getStackTrace` and `stackTrace.parentId` field.
-             */
-            stackTrace?: StackTrace;
-            /**
-             * Console context descriptor for calls on non-default console context (not console.*):
-'anonymous#unique-logger-id' for call on unnamed context, 'name#unique-logger-id' for call
-on named context.
-             */
-            context?: string;
-        }
-        /**
-         * Issued when unhandled exception was revoked.
-         */
-        export type exceptionRevokedPayload = {
-            /**
-             * Reason describing why exception was revoked.
-             */
-            reason: string;
-            /**
-             * The id of revoked exception, as reported in `exceptionThrown`.
-             */
-            exceptionId: number;
-        }
-        /**
-         * Issued when exception was thrown and unhandled.
-         */
-        export type exceptionThrownPayload = {
-            /**
-             * Timestamp of the exception.
-             */
-            timestamp: Timestamp;
-            exceptionDetails: ExceptionDetails;
-        }
-        /**
-         * Issued when new execution context is created.
-         */
-        export type executionContextCreatedPayload = {
-            /**
-             * A newly created execution context.
-             */
-            context: ExecutionContextDescription;
-        }
-        /**
-         * Issued when execution context is destroyed.
-         */
-        export type executionContextDestroyedPayload = {
-            /**
-             * Id of the destroyed context
-             */
-            executionContextId: ExecutionContextId;
-        }
-        /**
-         * Issued when all executionContexts were cleared in browser
-         */
-        export type executionContextsClearedPayload = void;
-        /**
-         * Issued when object should be inspected (for example, as a result of inspect() command line API
-call).
-         */
-        export type inspectRequestedPayload = {
-            object: RemoteObject;
-            hints: object;
-        }
-        
-        /**
-         * Add handler to promise with given promise object id.
-         */
-        export type awaitPromiseParameters = {
-            /**
-             * Identifier of the promise.
-             */
-            promiseObjectId: RemoteObjectId;
-            /**
-             * Whether the result is expected to be a JSON object that should be sent by value.
-             */
-            returnByValue?: boolean;
-            /**
-             * Whether preview should be generated for the result.
-             */
-            generatePreview?: boolean;
-        }
-        export type awaitPromiseReturnValue = {
-            /**
-             * Promise result. Will contain rejected value if promise was rejected.
-             */
-            result: RemoteObject;
-            /**
-             * Exception details if stack strace is available.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Calls function with given declaration on the given object. Object group of the result is
-inherited from the target object.
-         */
-        export type callFunctionOnParameters = {
-            /**
-             * Declaration of the function to call.
-             */
-            functionDeclaration: string;
-            /**
-             * Identifier of the object to call function on. Either objectId or executionContextId should
-be specified.
-             */
-            objectId?: RemoteObjectId;
-            /**
-             * Call arguments. All call arguments must belong to the same JavaScript world as the target
-object.
-             */
-            arguments?: CallArgument[];
-            /**
-             * In silent mode exceptions thrown during evaluation are not reported and do not pause
-execution. Overrides `setPauseOnException` state.
-             */
-            silent?: boolean;
-            /**
-             * Whether the result is expected to be a JSON object which should be sent by value.
-             */
-            returnByValue?: boolean;
-            /**
-             * Whether preview should be generated for the result.
-             */
-            generatePreview?: boolean;
-            /**
-             * Whether execution should be treated as initiated by user in the UI.
-             */
-            userGesture?: boolean;
-            /**
-             * Whether execution should `await` for resulting value and return once awaited promise is
-resolved.
-             */
-            awaitPromise?: boolean;
-            /**
-             * Specifies execution context which global object will be used to call function on. Either
-executionContextId or objectId should be specified.
-             */
-            executionContextId?: ExecutionContextId;
-            /**
-             * Symbolic group name that can be used to release multiple objects. If objectGroup is not
-specified and objectId is, objectGroup will be inherited from object.
-             */
-            objectGroup?: string;
-        }
-        export type callFunctionOnReturnValue = {
-            /**
-             * Call result.
-             */
-            result: RemoteObject;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Compiles expression.
-         */
-        export type compileScriptParameters = {
-            /**
-             * Expression to compile.
-             */
-            expression: string;
-            /**
-             * Source url to be set for the script.
-             */
-            sourceURL: string;
-            /**
-             * Specifies whether the compiled script should be persisted.
-             */
-            persistScript: boolean;
-            /**
-             * Specifies in which execution context to perform script run. If the parameter is omitted the
-evaluation will be performed in the context of the inspected page.
-             */
-            executionContextId?: ExecutionContextId;
-        }
-        export type compileScriptReturnValue = {
-            /**
-             * Id of the script.
-             */
-            scriptId?: ScriptId;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Disables reporting of execution contexts creation.
-         */
-        export type disableParameters = {
-        }
-        export type disableReturnValue = {
-        }
-        /**
-         * Discards collected exceptions and console API calls.
-         */
-        export type discardConsoleEntriesParameters = {
-        }
-        export type discardConsoleEntriesReturnValue = {
-        }
-        /**
-         * Enables reporting of execution contexts creation by means of `executionContextCreated` event.
-When the reporting gets enabled the event will be sent immediately for each existing execution
-context.
-         */
-        export type enableParameters = {
-        }
-        export type enableReturnValue = {
-        }
-        /**
-         * Evaluates expression on global object.
-         */
-        export type evaluateParameters = {
-            /**
-             * Expression to evaluate.
-             */
-            expression: string;
-            /**
-             * Symbolic group name that can be used to release multiple objects.
-             */
-            objectGroup?: string;
-            /**
-             * Determines whether Command Line API should be available during the evaluation.
-             */
-            includeCommandLineAPI?: boolean;
-            /**
-             * In silent mode exceptions thrown during evaluation are not reported and do not pause
-execution. Overrides `setPauseOnException` state.
-             */
-            silent?: boolean;
-            /**
-             * Specifies in which execution context to perform evaluation. If the parameter is omitted the
-evaluation will be performed in the context of the inspected page.
-             */
-            contextId?: ExecutionContextId;
-            /**
-             * Whether the result is expected to be a JSON object that should be sent by value.
-             */
-            returnByValue?: boolean;
-            /**
-             * Whether preview should be generated for the result.
-             */
-            generatePreview?: boolean;
-            /**
-             * Whether execution should be treated as initiated by user in the UI.
-             */
-            userGesture?: boolean;
-            /**
-             * Whether execution should `await` for resulting value and return once awaited promise is
-resolved.
-             */
-            awaitPromise?: boolean;
-            /**
-             * Whether to throw an exception if side effect cannot be ruled out during evaluation.
-This implies `disableBreaks` below.
-             */
-            throwOnSideEffect?: boolean;
-            /**
-             * Terminate execution after timing out (number of milliseconds).
-             */
-            timeout?: TimeDelta;
-            /**
-             * Disable breakpoints during execution.
-             */
-            disableBreaks?: boolean;
-            /**
-             * Setting this flag to true enables `let` re-declaration and top-level `await`.
-Note that `let` variables can only be re-declared if they originate from
-`replMode` themselves.
-             */
-            replMode?: boolean;
-        }
-        export type evaluateReturnValue = {
-            /**
-             * Evaluation result.
-             */
-            result: RemoteObject;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Returns the isolate id.
-         */
-        export type getIsolateIdParameters = {
-        }
-        export type getIsolateIdReturnValue = {
-            /**
-             * The isolate id.
-             */
-            id: string;
-        }
-        /**
-         * Returns the JavaScript heap usage.
-It is the total usage of the corresponding isolate not scoped to a particular Runtime.
-         */
-        export type getHeapUsageParameters = {
-        }
-        export type getHeapUsageReturnValue = {
-            /**
-             * Used heap size in bytes.
-             */
-            usedSize: number;
-            /**
-             * Allocated heap size in bytes.
-             */
-            totalSize: number;
-        }
-        /**
-         * Returns properties of a given object. Object group of the result is inherited from the target
-object.
-         */
-        export type getPropertiesParameters = {
-            /**
-             * Identifier of the object to return properties for.
-             */
-            objectId: RemoteObjectId;
-            /**
-             * If true, returns properties belonging only to the element itself, not to its prototype
-chain.
-             */
-            ownProperties?: boolean;
-            /**
-             * If true, returns accessor properties (with getter/setter) only; internal properties are not
-returned either.
-             */
-            accessorPropertiesOnly?: boolean;
-            /**
-             * Whether preview should be generated for the results.
-             */
-            generatePreview?: boolean;
-        }
-        export type getPropertiesReturnValue = {
-            /**
-             * Object properties.
-             */
-            result: PropertyDescriptor[];
-            /**
-             * Internal object properties (only of the element itself).
-             */
-            internalProperties?: InternalPropertyDescriptor[];
-            /**
-             * Object private properties.
-             */
-            privateProperties?: PrivatePropertyDescriptor[];
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Returns all let, const and class variables from global scope.
-         */
-        export type globalLexicalScopeNamesParameters = {
-            /**
-             * Specifies in which execution context to lookup global scope variables.
-             */
-            executionContextId?: ExecutionContextId;
-        }
-        export type globalLexicalScopeNamesReturnValue = {
-            names: string[];
-        }
-        export type queryObjectsParameters = {
-            /**
-             * Identifier of the prototype to return objects for.
-             */
-            prototypeObjectId: RemoteObjectId;
-            /**
-             * Symbolic group name that can be used to release the results.
-             */
-            objectGroup?: string;
-        }
-        export type queryObjectsReturnValue = {
-            /**
-             * Array with objects.
-             */
-            objects: RemoteObject;
-        }
-        /**
-         * Releases remote object with given id.
-         */
-        export type releaseObjectParameters = {
-            /**
-             * Identifier of the object to release.
-             */
-            objectId: RemoteObjectId;
-        }
-        export type releaseObjectReturnValue = {
-        }
-        /**
-         * Releases all remote objects that belong to a given group.
-         */
-        export type releaseObjectGroupParameters = {
-            /**
-             * Symbolic object group name.
-             */
-            objectGroup: string;
-        }
-        export type releaseObjectGroupReturnValue = {
-        }
-        /**
-         * Tells inspected instance to run if it was waiting for debugger to attach.
-         */
-        export type runIfWaitingForDebuggerParameters = {
-        }
-        export type runIfWaitingForDebuggerReturnValue = {
-        }
-        /**
-         * Runs script with given id in a given context.
-         */
-        export type runScriptParameters = {
-            /**
-             * Id of the script to run.
-             */
-            scriptId: ScriptId;
-            /**
-             * Specifies in which execution context to perform script run. If the parameter is omitted the
-evaluation will be performed in the context of the inspected page.
-             */
-            executionContextId?: ExecutionContextId;
-            /**
-             * Symbolic group name that can be used to release multiple objects.
-             */
-            objectGroup?: string;
-            /**
-             * In silent mode exceptions thrown during evaluation are not reported and do not pause
-execution. Overrides `setPauseOnException` state.
-             */
-            silent?: boolean;
-            /**
-             * Determines whether Command Line API should be available during the evaluation.
-             */
-            includeCommandLineAPI?: boolean;
-            /**
-             * Whether the result is expected to be a JSON object which should be sent by value.
-             */
-            returnByValue?: boolean;
-            /**
-             * Whether preview should be generated for the result.
-             */
-            generatePreview?: boolean;
-            /**
-             * Whether execution should `await` for resulting value and return once awaited promise is
-resolved.
-             */
-            awaitPromise?: boolean;
-        }
-        export type runScriptReturnValue = {
-            /**
-             * Run result.
-             */
-            result: RemoteObject;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: ExceptionDetails;
-        }
-        /**
-         * Enables or disables async call stacks tracking.
-         */
-        export type setAsyncCallStackDepthParameters = {
-            /**
-             * Maximum depth of async call stacks. Setting to `0` will effectively disable collecting async
-call stacks (default).
-             */
-            maxDepth: number;
-        }
-        export type setAsyncCallStackDepthReturnValue = {
-        }
-        export type setCustomObjectFormatterEnabledParameters = {
-            enabled: boolean;
-        }
-        export type setCustomObjectFormatterEnabledReturnValue = {
-        }
-        export type setMaxCallStackSizeToCaptureParameters = {
-            size: number;
-        }
-        export type setMaxCallStackSizeToCaptureReturnValue = {
-        }
-        /**
-         * Terminate current or next JavaScript execution.
-Will cancel the termination when the outer-most script execution ends.
-         */
-        export type terminateExecutionParameters = {
-        }
-        export type terminateExecutionReturnValue = {
-        }
-        /**
-         * If executionContextId is empty, adds binding with the given name on the
-global objects of all inspected contexts, including those created later,
-bindings survive reloads.
-If executionContextId is specified, adds binding only on global object of
-given execution context.
-Binding function takes exactly one argument, this argument should be string,
-in case of any other input, function throws an exception.
-Each binding function call produces Runtime.bindingCalled notification.
-         */
-        export type addBindingParameters = {
-            name: string;
-            executionContextId?: ExecutionContextId;
-        }
-        export type addBindingReturnValue = {
-        }
-        /**
-         * This method does not remove binding function from global object but
-unsubscribes current runtime agent from Runtime.bindingCalled notifications.
-         */
-        export type removeBindingParameters = {
-            name: string;
-        }
-        export type removeBindingReturnValue = {
-        }
-    }
-    
-    /**
-     * This domain is deprecated.
-     */
-    export module Schema {
-        /**
-         * Description of the protocol domain.
-         */
-        export interface Domain {
-            /**
-             * Domain name.
-             */
-            name: string;
-            /**
-             * Domain version.
-             */
-            version: string;
-        }
-        
-        
-        /**
-         * Returns supported domains.
-         */
-        export type getDomainsParameters = {
-        }
-        export type getDomainsReturnValue = {
-            /**
-             * List of supported domains.
-             */
-            domains: Domain[];
-        }
-    }
-    
-    export interface Events {
-      "Animation.animationCanceled": Animation.animationCanceledPayload;
-      "Animation.animationCreated": Animation.animationCreatedPayload;
-      "Animation.animationStarted": Animation.animationStartedPayload;
-      "ApplicationCache.applicationCacheStatusUpdated": ApplicationCache.applicationCacheStatusUpdatedPayload;
-      "ApplicationCache.networkStateUpdated": ApplicationCache.networkStateUpdatedPayload;
-      "Audits.issueAdded": Audits.issueAddedPayload;
-      "BackgroundService.recordingStateChanged": BackgroundService.recordingStateChangedPayload;
-      "BackgroundService.backgroundServiceEventReceived": BackgroundService.backgroundServiceEventReceivedPayload;
-      "CSS.fontsUpdated": CSS.fontsUpdatedPayload;
-      "CSS.mediaQueryResultChanged": CSS.mediaQueryResultChangedPayload;
-      "CSS.styleSheetAdded": CSS.styleSheetAddedPayload;
-      "CSS.styleSheetChanged": CSS.styleSheetChangedPayload;
-      "CSS.styleSheetRemoved": CSS.styleSheetRemovedPayload;
-      "Cast.sinksUpdated": Cast.sinksUpdatedPayload;
-      "Cast.issueUpdated": Cast.issueUpdatedPayload;
-      "DOM.attributeModified": DOM.attributeModifiedPayload;
-      "DOM.attributeRemoved": DOM.attributeRemovedPayload;
-      "DOM.characterDataModified": DOM.characterDataModifiedPayload;
-      "DOM.childNodeCountUpdated": DOM.childNodeCountUpdatedPayload;
-      "DOM.childNodeInserted": DOM.childNodeInsertedPayload;
-      "DOM.childNodeRemoved": DOM.childNodeRemovedPayload;
-      "DOM.distributedNodesUpdated": DOM.distributedNodesUpdatedPayload;
-      "DOM.documentUpdated": DOM.documentUpdatedPayload;
-      "DOM.inlineStyleInvalidated": DOM.inlineStyleInvalidatedPayload;
-      "DOM.pseudoElementAdded": DOM.pseudoElementAddedPayload;
-      "DOM.pseudoElementRemoved": DOM.pseudoElementRemovedPayload;
-      "DOM.setChildNodes": DOM.setChildNodesPayload;
-      "DOM.shadowRootPopped": DOM.shadowRootPoppedPayload;
-      "DOM.shadowRootPushed": DOM.shadowRootPushedPayload;
-      "DOMStorage.domStorageItemAdded": DOMStorage.domStorageItemAddedPayload;
-      "DOMStorage.domStorageItemRemoved": DOMStorage.domStorageItemRemovedPayload;
-      "DOMStorage.domStorageItemUpdated": DOMStorage.domStorageItemUpdatedPayload;
-      "DOMStorage.domStorageItemsCleared": DOMStorage.domStorageItemsClearedPayload;
-      "Database.addDatabase": Database.addDatabasePayload;
-      "Emulation.virtualTimeBudgetExpired": Emulation.virtualTimeBudgetExpiredPayload;
-      "HeadlessExperimental.needsBeginFramesChanged": HeadlessExperimental.needsBeginFramesChangedPayload;
-      "Inspector.detached": Inspector.detachedPayload;
-      "Inspector.targetCrashed": Inspector.targetCrashedPayload;
-      "Inspector.targetReloadedAfterCrash": Inspector.targetReloadedAfterCrashPayload;
-      "LayerTree.layerPainted": LayerTree.layerPaintedPayload;
-      "LayerTree.layerTreeDidChange": LayerTree.layerTreeDidChangePayload;
-      "Log.entryAdded": Log.entryAddedPayload;
-      "Network.dataReceived": Network.dataReceivedPayload;
-      "Network.eventSourceMessageReceived": Network.eventSourceMessageReceivedPayload;
-      "Network.loadingFailed": Network.loadingFailedPayload;
-      "Network.loadingFinished": Network.loadingFinishedPayload;
-      "Network.requestIntercepted": Network.requestInterceptedPayload;
-      "Network.requestServedFromCache": Network.requestServedFromCachePayload;
-      "Network.requestWillBeSent": Network.requestWillBeSentPayload;
-      "Network.resourceChangedPriority": Network.resourceChangedPriorityPayload;
-      "Network.signedExchangeReceived": Network.signedExchangeReceivedPayload;
-      "Network.responseReceived": Network.responseReceivedPayload;
-      "Network.webSocketClosed": Network.webSocketClosedPayload;
-      "Network.webSocketCreated": Network.webSocketCreatedPayload;
-      "Network.webSocketFrameError": Network.webSocketFrameErrorPayload;
-      "Network.webSocketFrameReceived": Network.webSocketFrameReceivedPayload;
-      "Network.webSocketFrameSent": Network.webSocketFrameSentPayload;
-      "Network.webSocketHandshakeResponseReceived": Network.webSocketHandshakeResponseReceivedPayload;
-      "Network.webSocketWillSendHandshakeRequest": Network.webSocketWillSendHandshakeRequestPayload;
-      "Network.requestWillBeSentExtraInfo": Network.requestWillBeSentExtraInfoPayload;
-      "Network.responseReceivedExtraInfo": Network.responseReceivedExtraInfoPayload;
-      "Overlay.inspectNodeRequested": Overlay.inspectNodeRequestedPayload;
-      "Overlay.nodeHighlightRequested": Overlay.nodeHighlightRequestedPayload;
-      "Overlay.screenshotRequested": Overlay.screenshotRequestedPayload;
-      "Overlay.inspectModeCanceled": Overlay.inspectModeCanceledPayload;
-      "Page.domContentEventFired": Page.domContentEventFiredPayload;
-      "Page.fileChooserOpened": Page.fileChooserOpenedPayload;
-      "Page.frameAttached": Page.frameAttachedPayload;
-      "Page.frameClearedScheduledNavigation": Page.frameClearedScheduledNavigationPayload;
-      "Page.frameDetached": Page.frameDetachedPayload;
-      "Page.frameNavigated": Page.frameNavigatedPayload;
-      "Page.frameResized": Page.frameResizedPayload;
-      "Page.frameRequestedNavigation": Page.frameRequestedNavigationPayload;
-      "Page.frameScheduledNavigation": Page.frameScheduledNavigationPayload;
-      "Page.frameStartedLoading": Page.frameStartedLoadingPayload;
-      "Page.frameStoppedLoading": Page.frameStoppedLoadingPayload;
-      "Page.downloadWillBegin": Page.downloadWillBeginPayload;
-      "Page.downloadProgress": Page.downloadProgressPayload;
-      "Page.interstitialHidden": Page.interstitialHiddenPayload;
-      "Page.interstitialShown": Page.interstitialShownPayload;
-      "Page.javascriptDialogClosed": Page.javascriptDialogClosedPayload;
-      "Page.javascriptDialogOpening": Page.javascriptDialogOpeningPayload;
-      "Page.lifecycleEvent": Page.lifecycleEventPayload;
-      "Page.loadEventFired": Page.loadEventFiredPayload;
-      "Page.navigatedWithinDocument": Page.navigatedWithinDocumentPayload;
-      "Page.screencastFrame": Page.screencastFramePayload;
-      "Page.screencastVisibilityChanged": Page.screencastVisibilityChangedPayload;
-      "Page.windowOpen": Page.windowOpenPayload;
-      "Page.compilationCacheProduced": Page.compilationCacheProducedPayload;
-      "Performance.metrics": Performance.metricsPayload;
-      "Security.certificateError": Security.certificateErrorPayload;
-      "Security.visibleSecurityStateChanged": Security.visibleSecurityStateChangedPayload;
-      "Security.securityStateChanged": Security.securityStateChangedPayload;
-      "ServiceWorker.workerErrorReported": ServiceWorker.workerErrorReportedPayload;
-      "ServiceWorker.workerRegistrationUpdated": ServiceWorker.workerRegistrationUpdatedPayload;
-      "ServiceWorker.workerVersionUpdated": ServiceWorker.workerVersionUpdatedPayload;
-      "Storage.cacheStorageContentUpdated": Storage.cacheStorageContentUpdatedPayload;
-      "Storage.cacheStorageListUpdated": Storage.cacheStorageListUpdatedPayload;
-      "Storage.indexedDBContentUpdated": Storage.indexedDBContentUpdatedPayload;
-      "Storage.indexedDBListUpdated": Storage.indexedDBListUpdatedPayload;
-      "Target.attachedToTarget": Target.attachedToTargetPayload;
-      "Target.detachedFromTarget": Target.detachedFromTargetPayload;
-      "Target.receivedMessageFromTarget": Target.receivedMessageFromTargetPayload;
-      "Target.targetCreated": Target.targetCreatedPayload;
-      "Target.targetDestroyed": Target.targetDestroyedPayload;
-      "Target.targetCrashed": Target.targetCrashedPayload;
-      "Target.targetInfoChanged": Target.targetInfoChangedPayload;
-      "Tethering.accepted": Tethering.acceptedPayload;
-      "Tracing.bufferUsage": Tracing.bufferUsagePayload;
-      "Tracing.dataCollected": Tracing.dataCollectedPayload;
-      "Tracing.tracingComplete": Tracing.tracingCompletePayload;
-      "Fetch.requestPaused": Fetch.requestPausedPayload;
-      "Fetch.authRequired": Fetch.authRequiredPayload;
-      "WebAudio.contextCreated": WebAudio.contextCreatedPayload;
-      "WebAudio.contextWillBeDestroyed": WebAudio.contextWillBeDestroyedPayload;
-      "WebAudio.contextChanged": WebAudio.contextChangedPayload;
-      "WebAudio.audioListenerCreated": WebAudio.audioListenerCreatedPayload;
-      "WebAudio.audioListenerWillBeDestroyed": WebAudio.audioListenerWillBeDestroyedPayload;
-      "WebAudio.audioNodeCreated": WebAudio.audioNodeCreatedPayload;
-      "WebAudio.audioNodeWillBeDestroyed": WebAudio.audioNodeWillBeDestroyedPayload;
-      "WebAudio.audioParamCreated": WebAudio.audioParamCreatedPayload;
-      "WebAudio.audioParamWillBeDestroyed": WebAudio.audioParamWillBeDestroyedPayload;
-      "WebAudio.nodesConnected": WebAudio.nodesConnectedPayload;
-      "WebAudio.nodesDisconnected": WebAudio.nodesDisconnectedPayload;
-      "WebAudio.nodeParamConnected": WebAudio.nodeParamConnectedPayload;
-      "WebAudio.nodeParamDisconnected": WebAudio.nodeParamDisconnectedPayload;
-      "Media.playerPropertiesChanged": Media.playerPropertiesChangedPayload;
-      "Media.playerEventsAdded": Media.playerEventsAddedPayload;
-      "Media.playersCreated": Media.playersCreatedPayload;
-      "Console.messageAdded": Console.messageAddedPayload;
-      "Debugger.breakpointResolved": Debugger.breakpointResolvedPayload;
-      "Debugger.paused": Debugger.pausedPayload;
-      "Debugger.resumed": Debugger.resumedPayload;
-      "Debugger.scriptFailedToParse": Debugger.scriptFailedToParsePayload;
-      "Debugger.scriptParsed": Debugger.scriptParsedPayload;
-      "HeapProfiler.addHeapSnapshotChunk": HeapProfiler.addHeapSnapshotChunkPayload;
-      "HeapProfiler.heapStatsUpdate": HeapProfiler.heapStatsUpdatePayload;
-      "HeapProfiler.lastSeenObjectId": HeapProfiler.lastSeenObjectIdPayload;
-      "HeapProfiler.reportHeapSnapshotProgress": HeapProfiler.reportHeapSnapshotProgressPayload;
-      "HeapProfiler.resetProfiles": HeapProfiler.resetProfilesPayload;
-      "Profiler.consoleProfileFinished": Profiler.consoleProfileFinishedPayload;
-      "Profiler.consoleProfileStarted": Profiler.consoleProfileStartedPayload;
-      "Profiler.preciseCoverageDeltaUpdate": Profiler.preciseCoverageDeltaUpdatePayload;
-      "Runtime.bindingCalled": Runtime.bindingCalledPayload;
-      "Runtime.consoleAPICalled": Runtime.consoleAPICalledPayload;
-      "Runtime.exceptionRevoked": Runtime.exceptionRevokedPayload;
-      "Runtime.exceptionThrown": Runtime.exceptionThrownPayload;
-      "Runtime.executionContextCreated": Runtime.executionContextCreatedPayload;
-      "Runtime.executionContextDestroyed": Runtime.executionContextDestroyedPayload;
-      "Runtime.executionContextsCleared": Runtime.executionContextsClearedPayload;
-      "Runtime.inspectRequested": Runtime.inspectRequestedPayload;
-    }
-    export interface CommandParameters {
-      "Accessibility.disable": Accessibility.disableParameters;
-      "Accessibility.enable": Accessibility.enableParameters;
-      "Accessibility.getPartialAXTree": Accessibility.getPartialAXTreeParameters;
-      "Accessibility.getFullAXTree": Accessibility.getFullAXTreeParameters;
-      "Animation.disable": Animation.disableParameters;
-      "Animation.enable": Animation.enableParameters;
-      "Animation.getCurrentTime": Animation.getCurrentTimeParameters;
-      "Animation.getPlaybackRate": Animation.getPlaybackRateParameters;
-      "Animation.releaseAnimations": Animation.releaseAnimationsParameters;
-      "Animation.resolveAnimation": Animation.resolveAnimationParameters;
-      "Animation.seekAnimations": Animation.seekAnimationsParameters;
-      "Animation.setPaused": Animation.setPausedParameters;
-      "Animation.setPlaybackRate": Animation.setPlaybackRateParameters;
-      "Animation.setTiming": Animation.setTimingParameters;
-      "ApplicationCache.enable": ApplicationCache.enableParameters;
-      "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameParameters;
-      "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsParameters;
-      "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameParameters;
-      "Audits.getEncodedResponse": Audits.getEncodedResponseParameters;
-      "Audits.disable": Audits.disableParameters;
-      "Audits.enable": Audits.enableParameters;
-      "BackgroundService.startObserving": BackgroundService.startObservingParameters;
-      "BackgroundService.stopObserving": BackgroundService.stopObservingParameters;
-      "BackgroundService.setRecording": BackgroundService.setRecordingParameters;
-      "BackgroundService.clearEvents": BackgroundService.clearEventsParameters;
-      "Browser.setPermission": Browser.setPermissionParameters;
-      "Browser.grantPermissions": Browser.grantPermissionsParameters;
-      "Browser.resetPermissions": Browser.resetPermissionsParameters;
-      "Browser.setDownloadBehavior": Browser.setDownloadBehaviorParameters;
-      "Browser.close": Browser.closeParameters;
-      "Browser.crash": Browser.crashParameters;
-      "Browser.crashGpuProcess": Browser.crashGpuProcessParameters;
-      "Browser.getVersion": Browser.getVersionParameters;
-      "Browser.getBrowserCommandLine": Browser.getBrowserCommandLineParameters;
-      "Browser.getHistograms": Browser.getHistogramsParameters;
-      "Browser.getHistogram": Browser.getHistogramParameters;
-      "Browser.getWindowBounds": Browser.getWindowBoundsParameters;
-      "Browser.getWindowForTarget": Browser.getWindowForTargetParameters;
-      "Browser.setWindowBounds": Browser.setWindowBoundsParameters;
-      "Browser.setDockTile": Browser.setDockTileParameters;
-      "CSS.addRule": CSS.addRuleParameters;
-      "CSS.collectClassNames": CSS.collectClassNamesParameters;
-      "CSS.createStyleSheet": CSS.createStyleSheetParameters;
-      "CSS.disable": CSS.disableParameters;
-      "CSS.enable": CSS.enableParameters;
-      "CSS.forcePseudoState": CSS.forcePseudoStateParameters;
-      "CSS.getBackgroundColors": CSS.getBackgroundColorsParameters;
-      "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeParameters;
-      "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeParameters;
-      "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeParameters;
-      "CSS.getMediaQueries": CSS.getMediaQueriesParameters;
-      "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeParameters;
-      "CSS.getStyleSheetText": CSS.getStyleSheetTextParameters;
-      "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeParameters;
-      "CSS.setKeyframeKey": CSS.setKeyframeKeyParameters;
-      "CSS.setMediaText": CSS.setMediaTextParameters;
-      "CSS.setRuleSelector": CSS.setRuleSelectorParameters;
-      "CSS.setStyleSheetText": CSS.setStyleSheetTextParameters;
-      "CSS.setStyleTexts": CSS.setStyleTextsParameters;
-      "CSS.startRuleUsageTracking": CSS.startRuleUsageTrackingParameters;
-      "CSS.stopRuleUsageTracking": CSS.stopRuleUsageTrackingParameters;
-      "CSS.takeCoverageDelta": CSS.takeCoverageDeltaParameters;
-      "CacheStorage.deleteCache": CacheStorage.deleteCacheParameters;
-      "CacheStorage.deleteEntry": CacheStorage.deleteEntryParameters;
-      "CacheStorage.requestCacheNames": CacheStorage.requestCacheNamesParameters;
-      "CacheStorage.requestCachedResponse": CacheStorage.requestCachedResponseParameters;
-      "CacheStorage.requestEntries": CacheStorage.requestEntriesParameters;
-      "Cast.enable": Cast.enableParameters;
-      "Cast.disable": Cast.disableParameters;
-      "Cast.setSinkToUse": Cast.setSinkToUseParameters;
-      "Cast.startTabMirroring": Cast.startTabMirroringParameters;
-      "Cast.stopCasting": Cast.stopCastingParameters;
-      "DOM.collectClassNamesFromSubtree": DOM.collectClassNamesFromSubtreeParameters;
-      "DOM.copyTo": DOM.copyToParameters;
-      "DOM.describeNode": DOM.describeNodeParameters;
-      "DOM.scrollIntoViewIfNeeded": DOM.scrollIntoViewIfNeededParameters;
-      "DOM.disable": DOM.disableParameters;
-      "DOM.discardSearchResults": DOM.discardSearchResultsParameters;
-      "DOM.enable": DOM.enableParameters;
-      "DOM.focus": DOM.focusParameters;
-      "DOM.getAttributes": DOM.getAttributesParameters;
-      "DOM.getBoxModel": DOM.getBoxModelParameters;
-      "DOM.getContentQuads": DOM.getContentQuadsParameters;
-      "DOM.getDocument": DOM.getDocumentParameters;
-      "DOM.getFlattenedDocument": DOM.getFlattenedDocumentParameters;
-      "DOM.getNodeForLocation": DOM.getNodeForLocationParameters;
-      "DOM.getOuterHTML": DOM.getOuterHTMLParameters;
-      "DOM.getRelayoutBoundary": DOM.getRelayoutBoundaryParameters;
-      "DOM.getSearchResults": DOM.getSearchResultsParameters;
-      "DOM.hideHighlight": DOM.hideHighlightParameters;
-      "DOM.highlightNode": DOM.highlightNodeParameters;
-      "DOM.highlightRect": DOM.highlightRectParameters;
-      "DOM.markUndoableState": DOM.markUndoableStateParameters;
-      "DOM.moveTo": DOM.moveToParameters;
-      "DOM.performSearch": DOM.performSearchParameters;
-      "DOM.pushNodeByPathToFrontend": DOM.pushNodeByPathToFrontendParameters;
-      "DOM.pushNodesByBackendIdsToFrontend": DOM.pushNodesByBackendIdsToFrontendParameters;
-      "DOM.querySelector": DOM.querySelectorParameters;
-      "DOM.querySelectorAll": DOM.querySelectorAllParameters;
-      "DOM.redo": DOM.redoParameters;
-      "DOM.removeAttribute": DOM.removeAttributeParameters;
-      "DOM.removeNode": DOM.removeNodeParameters;
-      "DOM.requestChildNodes": DOM.requestChildNodesParameters;
-      "DOM.requestNode": DOM.requestNodeParameters;
-      "DOM.resolveNode": DOM.resolveNodeParameters;
-      "DOM.setAttributeValue": DOM.setAttributeValueParameters;
-      "DOM.setAttributesAsText": DOM.setAttributesAsTextParameters;
-      "DOM.setFileInputFiles": DOM.setFileInputFilesParameters;
-      "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledParameters;
-      "DOM.getNodeStackTraces": DOM.getNodeStackTracesParameters;
-      "DOM.getFileInfo": DOM.getFileInfoParameters;
-      "DOM.setInspectedNode": DOM.setInspectedNodeParameters;
-      "DOM.setNodeName": DOM.setNodeNameParameters;
-      "DOM.setNodeValue": DOM.setNodeValueParameters;
-      "DOM.setOuterHTML": DOM.setOuterHTMLParameters;
-      "DOM.undo": DOM.undoParameters;
-      "DOM.getFrameOwner": DOM.getFrameOwnerParameters;
-      "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersParameters;
-      "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointParameters;
-      "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointParameters;
-      "DOMDebugger.removeInstrumentationBreakpoint": DOMDebugger.removeInstrumentationBreakpointParameters;
-      "DOMDebugger.removeXHRBreakpoint": DOMDebugger.removeXHRBreakpointParameters;
-      "DOMDebugger.setDOMBreakpoint": DOMDebugger.setDOMBreakpointParameters;
-      "DOMDebugger.setEventListenerBreakpoint": DOMDebugger.setEventListenerBreakpointParameters;
-      "DOMDebugger.setInstrumentationBreakpoint": DOMDebugger.setInstrumentationBreakpointParameters;
-      "DOMDebugger.setXHRBreakpoint": DOMDebugger.setXHRBreakpointParameters;
-      "DOMSnapshot.disable": DOMSnapshot.disableParameters;
-      "DOMSnapshot.enable": DOMSnapshot.enableParameters;
-      "DOMSnapshot.getSnapshot": DOMSnapshot.getSnapshotParameters;
-      "DOMSnapshot.captureSnapshot": DOMSnapshot.captureSnapshotParameters;
-      "DOMStorage.clear": DOMStorage.clearParameters;
-      "DOMStorage.disable": DOMStorage.disableParameters;
-      "DOMStorage.enable": DOMStorage.enableParameters;
-      "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsParameters;
-      "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemParameters;
-      "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemParameters;
-      "Database.disable": Database.disableParameters;
-      "Database.enable": Database.enableParameters;
-      "Database.executeSQL": Database.executeSQLParameters;
-      "Database.getDatabaseTableNames": Database.getDatabaseTableNamesParameters;
-      "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideParameters;
-      "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideParameters;
-      "Emulation.canEmulate": Emulation.canEmulateParameters;
-      "Emulation.clearDeviceMetricsOverride": Emulation.clearDeviceMetricsOverrideParameters;
-      "Emulation.clearGeolocationOverride": Emulation.clearGeolocationOverrideParameters;
-      "Emulation.resetPageScaleFactor": Emulation.resetPageScaleFactorParameters;
-      "Emulation.setFocusEmulationEnabled": Emulation.setFocusEmulationEnabledParameters;
-      "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateParameters;
-      "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideParameters;
-      "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideParameters;
-      "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenParameters;
-      "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledParameters;
-      "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseParameters;
-      "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaParameters;
-      "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyParameters;
-      "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideParameters;
-      "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesParameters;
-      "Emulation.setPageScaleFactor": Emulation.setPageScaleFactorParameters;
-      "Emulation.setScriptExecutionDisabled": Emulation.setScriptExecutionDisabledParameters;
-      "Emulation.setTouchEmulationEnabled": Emulation.setTouchEmulationEnabledParameters;
-      "Emulation.setVirtualTimePolicy": Emulation.setVirtualTimePolicyParameters;
-      "Emulation.setLocaleOverride": Emulation.setLocaleOverrideParameters;
-      "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideParameters;
-      "Emulation.setVisibleSize": Emulation.setVisibleSizeParameters;
-      "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideParameters;
-      "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameParameters;
-      "HeadlessExperimental.disable": HeadlessExperimental.disableParameters;
-      "HeadlessExperimental.enable": HeadlessExperimental.enableParameters;
-      "IO.close": IO.closeParameters;
-      "IO.read": IO.readParameters;
-      "IO.resolveBlob": IO.resolveBlobParameters;
-      "IndexedDB.clearObjectStore": IndexedDB.clearObjectStoreParameters;
-      "IndexedDB.deleteDatabase": IndexedDB.deleteDatabaseParameters;
-      "IndexedDB.deleteObjectStoreEntries": IndexedDB.deleteObjectStoreEntriesParameters;
-      "IndexedDB.disable": IndexedDB.disableParameters;
-      "IndexedDB.enable": IndexedDB.enableParameters;
-      "IndexedDB.requestData": IndexedDB.requestDataParameters;
-      "IndexedDB.getMetadata": IndexedDB.getMetadataParameters;
-      "IndexedDB.requestDatabase": IndexedDB.requestDatabaseParameters;
-      "IndexedDB.requestDatabaseNames": IndexedDB.requestDatabaseNamesParameters;
-      "Input.dispatchKeyEvent": Input.dispatchKeyEventParameters;
-      "Input.insertText": Input.insertTextParameters;
-      "Input.dispatchMouseEvent": Input.dispatchMouseEventParameters;
-      "Input.dispatchTouchEvent": Input.dispatchTouchEventParameters;
-      "Input.emulateTouchFromMouseEvent": Input.emulateTouchFromMouseEventParameters;
-      "Input.setIgnoreInputEvents": Input.setIgnoreInputEventsParameters;
-      "Input.synthesizePinchGesture": Input.synthesizePinchGestureParameters;
-      "Input.synthesizeScrollGesture": Input.synthesizeScrollGestureParameters;
-      "Input.synthesizeTapGesture": Input.synthesizeTapGestureParameters;
-      "Inspector.disable": Inspector.disableParameters;
-      "Inspector.enable": Inspector.enableParameters;
-      "LayerTree.compositingReasons": LayerTree.compositingReasonsParameters;
-      "LayerTree.disable": LayerTree.disableParameters;
-      "LayerTree.enable": LayerTree.enableParameters;
-      "LayerTree.loadSnapshot": LayerTree.loadSnapshotParameters;
-      "LayerTree.makeSnapshot": LayerTree.makeSnapshotParameters;
-      "LayerTree.profileSnapshot": LayerTree.profileSnapshotParameters;
-      "LayerTree.releaseSnapshot": LayerTree.releaseSnapshotParameters;
-      "LayerTree.replaySnapshot": LayerTree.replaySnapshotParameters;
-      "LayerTree.snapshotCommandLog": LayerTree.snapshotCommandLogParameters;
-      "Log.clear": Log.clearParameters;
-      "Log.disable": Log.disableParameters;
-      "Log.enable": Log.enableParameters;
-      "Log.startViolationsReport": Log.startViolationsReportParameters;
-      "Log.stopViolationsReport": Log.stopViolationsReportParameters;
-      "Memory.getDOMCounters": Memory.getDOMCountersParameters;
-      "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionParameters;
-      "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryParameters;
-      "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedParameters;
-      "Memory.simulatePressureNotification": Memory.simulatePressureNotificationParameters;
-      "Memory.startSampling": Memory.startSamplingParameters;
-      "Memory.stopSampling": Memory.stopSamplingParameters;
-      "Memory.getAllTimeSamplingProfile": Memory.getAllTimeSamplingProfileParameters;
-      "Memory.getBrowserSamplingProfile": Memory.getBrowserSamplingProfileParameters;
-      "Memory.getSamplingProfile": Memory.getSamplingProfileParameters;
-      "Network.canClearBrowserCache": Network.canClearBrowserCacheParameters;
-      "Network.canClearBrowserCookies": Network.canClearBrowserCookiesParameters;
-      "Network.canEmulateNetworkConditions": Network.canEmulateNetworkConditionsParameters;
-      "Network.clearBrowserCache": Network.clearBrowserCacheParameters;
-      "Network.clearBrowserCookies": Network.clearBrowserCookiesParameters;
-      "Network.continueInterceptedRequest": Network.continueInterceptedRequestParameters;
-      "Network.deleteCookies": Network.deleteCookiesParameters;
-      "Network.disable": Network.disableParameters;
-      "Network.emulateNetworkConditions": Network.emulateNetworkConditionsParameters;
-      "Network.enable": Network.enableParameters;
-      "Network.getAllCookies": Network.getAllCookiesParameters;
-      "Network.getCertificate": Network.getCertificateParameters;
-      "Network.getCookies": Network.getCookiesParameters;
-      "Network.getResponseBody": Network.getResponseBodyParameters;
-      "Network.getRequestPostData": Network.getRequestPostDataParameters;
-      "Network.getResponseBodyForInterception": Network.getResponseBodyForInterceptionParameters;
-      "Network.takeResponseBodyForInterceptionAsStream": Network.takeResponseBodyForInterceptionAsStreamParameters;
-      "Network.replayXHR": Network.replayXHRParameters;
-      "Network.searchInResponseBody": Network.searchInResponseBodyParameters;
-      "Network.setBlockedURLs": Network.setBlockedURLsParameters;
-      "Network.setBypassServiceWorker": Network.setBypassServiceWorkerParameters;
-      "Network.setCacheDisabled": Network.setCacheDisabledParameters;
-      "Network.setCookie": Network.setCookieParameters;
-      "Network.setCookies": Network.setCookiesParameters;
-      "Network.setDataSizeLimitsForTest": Network.setDataSizeLimitsForTestParameters;
-      "Network.setExtraHTTPHeaders": Network.setExtraHTTPHeadersParameters;
-      "Network.setRequestInterception": Network.setRequestInterceptionParameters;
-      "Network.setUserAgentOverride": Network.setUserAgentOverrideParameters;
-      "Overlay.disable": Overlay.disableParameters;
-      "Overlay.enable": Overlay.enableParameters;
-      "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestParameters;
-      "Overlay.hideHighlight": Overlay.hideHighlightParameters;
-      "Overlay.highlightFrame": Overlay.highlightFrameParameters;
-      "Overlay.highlightNode": Overlay.highlightNodeParameters;
-      "Overlay.highlightQuad": Overlay.highlightQuadParameters;
-      "Overlay.highlightRect": Overlay.highlightRectParameters;
-      "Overlay.setInspectMode": Overlay.setInspectModeParameters;
-      "Overlay.setShowAdHighlights": Overlay.setShowAdHighlightsParameters;
-      "Overlay.setPausedInDebuggerMessage": Overlay.setPausedInDebuggerMessageParameters;
-      "Overlay.setShowDebugBorders": Overlay.setShowDebugBordersParameters;
-      "Overlay.setShowFPSCounter": Overlay.setShowFPSCounterParameters;
-      "Overlay.setShowPaintRects": Overlay.setShowPaintRectsParameters;
-      "Overlay.setShowLayoutShiftRegions": Overlay.setShowLayoutShiftRegionsParameters;
-      "Overlay.setShowScrollBottleneckRects": Overlay.setShowScrollBottleneckRectsParameters;
-      "Overlay.setShowHitTestBorders": Overlay.setShowHitTestBordersParameters;
-      "Overlay.setShowViewportSizeOnResize": Overlay.setShowViewportSizeOnResizeParameters;
-      "Page.addScriptToEvaluateOnLoad": Page.addScriptToEvaluateOnLoadParameters;
-      "Page.addScriptToEvaluateOnNewDocument": Page.addScriptToEvaluateOnNewDocumentParameters;
-      "Page.bringToFront": Page.bringToFrontParameters;
-      "Page.captureScreenshot": Page.captureScreenshotParameters;
-      "Page.captureSnapshot": Page.captureSnapshotParameters;
-      "Page.clearDeviceMetricsOverride": Page.clearDeviceMetricsOverrideParameters;
-      "Page.clearDeviceOrientationOverride": Page.clearDeviceOrientationOverrideParameters;
-      "Page.clearGeolocationOverride": Page.clearGeolocationOverrideParameters;
-      "Page.createIsolatedWorld": Page.createIsolatedWorldParameters;
-      "Page.deleteCookie": Page.deleteCookieParameters;
-      "Page.disable": Page.disableParameters;
-      "Page.enable": Page.enableParameters;
-      "Page.getAppManifest": Page.getAppManifestParameters;
-      "Page.getInstallabilityErrors": Page.getInstallabilityErrorsParameters;
-      "Page.getManifestIcons": Page.getManifestIconsParameters;
-      "Page.getCookies": Page.getCookiesParameters;
-      "Page.getFrameTree": Page.getFrameTreeParameters;
-      "Page.getLayoutMetrics": Page.getLayoutMetricsParameters;
-      "Page.getNavigationHistory": Page.getNavigationHistoryParameters;
-      "Page.resetNavigationHistory": Page.resetNavigationHistoryParameters;
-      "Page.getResourceContent": Page.getResourceContentParameters;
-      "Page.getResourceTree": Page.getResourceTreeParameters;
-      "Page.handleJavaScriptDialog": Page.handleJavaScriptDialogParameters;
-      "Page.navigate": Page.navigateParameters;
-      "Page.navigateToHistoryEntry": Page.navigateToHistoryEntryParameters;
-      "Page.printToPDF": Page.printToPDFParameters;
-      "Page.reload": Page.reloadParameters;
-      "Page.removeScriptToEvaluateOnLoad": Page.removeScriptToEvaluateOnLoadParameters;
-      "Page.removeScriptToEvaluateOnNewDocument": Page.removeScriptToEvaluateOnNewDocumentParameters;
-      "Page.screencastFrameAck": Page.screencastFrameAckParameters;
-      "Page.searchInResource": Page.searchInResourceParameters;
-      "Page.setAdBlockingEnabled": Page.setAdBlockingEnabledParameters;
-      "Page.setBypassCSP": Page.setBypassCSPParameters;
-      "Page.setDeviceMetricsOverride": Page.setDeviceMetricsOverrideParameters;
-      "Page.setDeviceOrientationOverride": Page.setDeviceOrientationOverrideParameters;
-      "Page.setFontFamilies": Page.setFontFamiliesParameters;
-      "Page.setFontSizes": Page.setFontSizesParameters;
-      "Page.setDocumentContent": Page.setDocumentContentParameters;
-      "Page.setDownloadBehavior": Page.setDownloadBehaviorParameters;
-      "Page.setGeolocationOverride": Page.setGeolocationOverrideParameters;
-      "Page.setLifecycleEventsEnabled": Page.setLifecycleEventsEnabledParameters;
-      "Page.setTouchEmulationEnabled": Page.setTouchEmulationEnabledParameters;
-      "Page.startScreencast": Page.startScreencastParameters;
-      "Page.stopLoading": Page.stopLoadingParameters;
-      "Page.crash": Page.crashParameters;
-      "Page.close": Page.closeParameters;
-      "Page.setWebLifecycleState": Page.setWebLifecycleStateParameters;
-      "Page.stopScreencast": Page.stopScreencastParameters;
-      "Page.setProduceCompilationCache": Page.setProduceCompilationCacheParameters;
-      "Page.addCompilationCache": Page.addCompilationCacheParameters;
-      "Page.clearCompilationCache": Page.clearCompilationCacheParameters;
-      "Page.generateTestReport": Page.generateTestReportParameters;
-      "Page.waitForDebugger": Page.waitForDebuggerParameters;
-      "Page.setInterceptFileChooserDialog": Page.setInterceptFileChooserDialogParameters;
-      "Performance.disable": Performance.disableParameters;
-      "Performance.enable": Performance.enableParameters;
-      "Performance.setTimeDomain": Performance.setTimeDomainParameters;
-      "Performance.getMetrics": Performance.getMetricsParameters;
-      "Security.disable": Security.disableParameters;
-      "Security.enable": Security.enableParameters;
-      "Security.setIgnoreCertificateErrors": Security.setIgnoreCertificateErrorsParameters;
-      "Security.handleCertificateError": Security.handleCertificateErrorParameters;
-      "Security.setOverrideCertificateErrors": Security.setOverrideCertificateErrorsParameters;
-      "ServiceWorker.deliverPushMessage": ServiceWorker.deliverPushMessageParameters;
-      "ServiceWorker.disable": ServiceWorker.disableParameters;
-      "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventParameters;
-      "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventParameters;
-      "ServiceWorker.enable": ServiceWorker.enableParameters;
-      "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerParameters;
-      "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadParameters;
-      "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingParameters;
-      "ServiceWorker.startWorker": ServiceWorker.startWorkerParameters;
-      "ServiceWorker.stopAllWorkers": ServiceWorker.stopAllWorkersParameters;
-      "ServiceWorker.stopWorker": ServiceWorker.stopWorkerParameters;
-      "ServiceWorker.unregister": ServiceWorker.unregisterParameters;
-      "ServiceWorker.updateRegistration": ServiceWorker.updateRegistrationParameters;
-      "Storage.clearDataForOrigin": Storage.clearDataForOriginParameters;
-      "Storage.getCookies": Storage.getCookiesParameters;
-      "Storage.setCookies": Storage.setCookiesParameters;
-      "Storage.clearCookies": Storage.clearCookiesParameters;
-      "Storage.getUsageAndQuota": Storage.getUsageAndQuotaParameters;
-      "Storage.trackCacheStorageForOrigin": Storage.trackCacheStorageForOriginParameters;
-      "Storage.trackIndexedDBForOrigin": Storage.trackIndexedDBForOriginParameters;
-      "Storage.untrackCacheStorageForOrigin": Storage.untrackCacheStorageForOriginParameters;
-      "Storage.untrackIndexedDBForOrigin": Storage.untrackIndexedDBForOriginParameters;
-      "SystemInfo.getInfo": SystemInfo.getInfoParameters;
-      "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoParameters;
-      "Target.activateTarget": Target.activateTargetParameters;
-      "Target.attachToTarget": Target.attachToTargetParameters;
-      "Target.attachToBrowserTarget": Target.attachToBrowserTargetParameters;
-      "Target.closeTarget": Target.closeTargetParameters;
-      "Target.exposeDevToolsProtocol": Target.exposeDevToolsProtocolParameters;
-      "Target.createBrowserContext": Target.createBrowserContextParameters;
-      "Target.getBrowserContexts": Target.getBrowserContextsParameters;
-      "Target.createTarget": Target.createTargetParameters;
-      "Target.detachFromTarget": Target.detachFromTargetParameters;
-      "Target.disposeBrowserContext": Target.disposeBrowserContextParameters;
-      "Target.getTargetInfo": Target.getTargetInfoParameters;
-      "Target.getTargets": Target.getTargetsParameters;
-      "Target.sendMessageToTarget": Target.sendMessageToTargetParameters;
-      "Target.setAutoAttach": Target.setAutoAttachParameters;
-      "Target.setDiscoverTargets": Target.setDiscoverTargetsParameters;
-      "Target.setRemoteLocations": Target.setRemoteLocationsParameters;
-      "Tethering.bind": Tethering.bindParameters;
-      "Tethering.unbind": Tethering.unbindParameters;
-      "Tracing.end": Tracing.endParameters;
-      "Tracing.getCategories": Tracing.getCategoriesParameters;
-      "Tracing.recordClockSyncMarker": Tracing.recordClockSyncMarkerParameters;
-      "Tracing.requestMemoryDump": Tracing.requestMemoryDumpParameters;
-      "Tracing.start": Tracing.startParameters;
-      "Fetch.disable": Fetch.disableParameters;
-      "Fetch.enable": Fetch.enableParameters;
-      "Fetch.failRequest": Fetch.failRequestParameters;
-      "Fetch.fulfillRequest": Fetch.fulfillRequestParameters;
-      "Fetch.continueRequest": Fetch.continueRequestParameters;
-      "Fetch.continueWithAuth": Fetch.continueWithAuthParameters;
-      "Fetch.getResponseBody": Fetch.getResponseBodyParameters;
-      "Fetch.takeResponseBodyAsStream": Fetch.takeResponseBodyAsStreamParameters;
-      "WebAudio.enable": WebAudio.enableParameters;
-      "WebAudio.disable": WebAudio.disableParameters;
-      "WebAudio.getRealtimeData": WebAudio.getRealtimeDataParameters;
-      "WebAuthn.enable": WebAuthn.enableParameters;
-      "WebAuthn.disable": WebAuthn.disableParameters;
-      "WebAuthn.addVirtualAuthenticator": WebAuthn.addVirtualAuthenticatorParameters;
-      "WebAuthn.removeVirtualAuthenticator": WebAuthn.removeVirtualAuthenticatorParameters;
-      "WebAuthn.addCredential": WebAuthn.addCredentialParameters;
-      "WebAuthn.getCredential": WebAuthn.getCredentialParameters;
-      "WebAuthn.getCredentials": WebAuthn.getCredentialsParameters;
-      "WebAuthn.removeCredential": WebAuthn.removeCredentialParameters;
-      "WebAuthn.clearCredentials": WebAuthn.clearCredentialsParameters;
-      "WebAuthn.setUserVerified": WebAuthn.setUserVerifiedParameters;
-      "Media.enable": Media.enableParameters;
-      "Media.disable": Media.disableParameters;
-      "Console.clearMessages": Console.clearMessagesParameters;
-      "Console.disable": Console.disableParameters;
-      "Console.enable": Console.enableParameters;
-      "Debugger.continueToLocation": Debugger.continueToLocationParameters;
-      "Debugger.disable": Debugger.disableParameters;
-      "Debugger.enable": Debugger.enableParameters;
-      "Debugger.evaluateOnCallFrame": Debugger.evaluateOnCallFrameParameters;
-      "Debugger.getPossibleBreakpoints": Debugger.getPossibleBreakpointsParameters;
-      "Debugger.getScriptSource": Debugger.getScriptSourceParameters;
-      "Debugger.getWasmBytecode": Debugger.getWasmBytecodeParameters;
-      "Debugger.getStackTrace": Debugger.getStackTraceParameters;
-      "Debugger.pause": Debugger.pauseParameters;
-      "Debugger.pauseOnAsyncCall": Debugger.pauseOnAsyncCallParameters;
-      "Debugger.removeBreakpoint": Debugger.removeBreakpointParameters;
-      "Debugger.restartFrame": Debugger.restartFrameParameters;
-      "Debugger.resume": Debugger.resumeParameters;
-      "Debugger.searchInContent": Debugger.searchInContentParameters;
-      "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthParameters;
-      "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsParameters;
-      "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesParameters;
-      "Debugger.setBreakpoint": Debugger.setBreakpointParameters;
-      "Debugger.setInstrumentationBreakpoint": Debugger.setInstrumentationBreakpointParameters;
-      "Debugger.setBreakpointByUrl": Debugger.setBreakpointByUrlParameters;
-      "Debugger.setBreakpointOnFunctionCall": Debugger.setBreakpointOnFunctionCallParameters;
-      "Debugger.setBreakpointsActive": Debugger.setBreakpointsActiveParameters;
-      "Debugger.setPauseOnExceptions": Debugger.setPauseOnExceptionsParameters;
-      "Debugger.setReturnValue": Debugger.setReturnValueParameters;
-      "Debugger.setScriptSource": Debugger.setScriptSourceParameters;
-      "Debugger.setSkipAllPauses": Debugger.setSkipAllPausesParameters;
-      "Debugger.setVariableValue": Debugger.setVariableValueParameters;
-      "Debugger.stepInto": Debugger.stepIntoParameters;
-      "Debugger.stepOut": Debugger.stepOutParameters;
-      "Debugger.stepOver": Debugger.stepOverParameters;
-      "HeapProfiler.addInspectedHeapObject": HeapProfiler.addInspectedHeapObjectParameters;
-      "HeapProfiler.collectGarbage": HeapProfiler.collectGarbageParameters;
-      "HeapProfiler.disable": HeapProfiler.disableParameters;
-      "HeapProfiler.enable": HeapProfiler.enableParameters;
-      "HeapProfiler.getHeapObjectId": HeapProfiler.getHeapObjectIdParameters;
-      "HeapProfiler.getObjectByHeapObjectId": HeapProfiler.getObjectByHeapObjectIdParameters;
-      "HeapProfiler.getSamplingProfile": HeapProfiler.getSamplingProfileParameters;
-      "HeapProfiler.startSampling": HeapProfiler.startSamplingParameters;
-      "HeapProfiler.startTrackingHeapObjects": HeapProfiler.startTrackingHeapObjectsParameters;
-      "HeapProfiler.stopSampling": HeapProfiler.stopSamplingParameters;
-      "HeapProfiler.stopTrackingHeapObjects": HeapProfiler.stopTrackingHeapObjectsParameters;
-      "HeapProfiler.takeHeapSnapshot": HeapProfiler.takeHeapSnapshotParameters;
-      "Profiler.disable": Profiler.disableParameters;
-      "Profiler.enable": Profiler.enableParameters;
-      "Profiler.getBestEffortCoverage": Profiler.getBestEffortCoverageParameters;
-      "Profiler.setSamplingInterval": Profiler.setSamplingIntervalParameters;
-      "Profiler.start": Profiler.startParameters;
-      "Profiler.startPreciseCoverage": Profiler.startPreciseCoverageParameters;
-      "Profiler.startTypeProfile": Profiler.startTypeProfileParameters;
-      "Profiler.stop": Profiler.stopParameters;
-      "Profiler.stopPreciseCoverage": Profiler.stopPreciseCoverageParameters;
-      "Profiler.stopTypeProfile": Profiler.stopTypeProfileParameters;
-      "Profiler.takePreciseCoverage": Profiler.takePreciseCoverageParameters;
-      "Profiler.takeTypeProfile": Profiler.takeTypeProfileParameters;
-      "Profiler.enableRuntimeCallStats": Profiler.enableRuntimeCallStatsParameters;
-      "Profiler.disableRuntimeCallStats": Profiler.disableRuntimeCallStatsParameters;
-      "Profiler.getRuntimeCallStats": Profiler.getRuntimeCallStatsParameters;
-      "Runtime.awaitPromise": Runtime.awaitPromiseParameters;
-      "Runtime.callFunctionOn": Runtime.callFunctionOnParameters;
-      "Runtime.compileScript": Runtime.compileScriptParameters;
-      "Runtime.disable": Runtime.disableParameters;
-      "Runtime.discardConsoleEntries": Runtime.discardConsoleEntriesParameters;
-      "Runtime.enable": Runtime.enableParameters;
-      "Runtime.evaluate": Runtime.evaluateParameters;
-      "Runtime.getIsolateId": Runtime.getIsolateIdParameters;
-      "Runtime.getHeapUsage": Runtime.getHeapUsageParameters;
-      "Runtime.getProperties": Runtime.getPropertiesParameters;
-      "Runtime.globalLexicalScopeNames": Runtime.globalLexicalScopeNamesParameters;
-      "Runtime.queryObjects": Runtime.queryObjectsParameters;
-      "Runtime.releaseObject": Runtime.releaseObjectParameters;
-      "Runtime.releaseObjectGroup": Runtime.releaseObjectGroupParameters;
-      "Runtime.runIfWaitingForDebugger": Runtime.runIfWaitingForDebuggerParameters;
-      "Runtime.runScript": Runtime.runScriptParameters;
-      "Runtime.setAsyncCallStackDepth": Runtime.setAsyncCallStackDepthParameters;
-      "Runtime.setCustomObjectFormatterEnabled": Runtime.setCustomObjectFormatterEnabledParameters;
-      "Runtime.setMaxCallStackSizeToCapture": Runtime.setMaxCallStackSizeToCaptureParameters;
-      "Runtime.terminateExecution": Runtime.terminateExecutionParameters;
-      "Runtime.addBinding": Runtime.addBindingParameters;
-      "Runtime.removeBinding": Runtime.removeBindingParameters;
-      "Schema.getDomains": Schema.getDomainsParameters;
-    }
-    export interface CommandReturnValues {
-      "Accessibility.disable": Accessibility.disableReturnValue;
-      "Accessibility.enable": Accessibility.enableReturnValue;
-      "Accessibility.getPartialAXTree": Accessibility.getPartialAXTreeReturnValue;
-      "Accessibility.getFullAXTree": Accessibility.getFullAXTreeReturnValue;
-      "Animation.disable": Animation.disableReturnValue;
-      "Animation.enable": Animation.enableReturnValue;
-      "Animation.getCurrentTime": Animation.getCurrentTimeReturnValue;
-      "Animation.getPlaybackRate": Animation.getPlaybackRateReturnValue;
-      "Animation.releaseAnimations": Animation.releaseAnimationsReturnValue;
-      "Animation.resolveAnimation": Animation.resolveAnimationReturnValue;
-      "Animation.seekAnimations": Animation.seekAnimationsReturnValue;
-      "Animation.setPaused": Animation.setPausedReturnValue;
-      "Animation.setPlaybackRate": Animation.setPlaybackRateReturnValue;
-      "Animation.setTiming": Animation.setTimingReturnValue;
-      "ApplicationCache.enable": ApplicationCache.enableReturnValue;
-      "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameReturnValue;
-      "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsReturnValue;
-      "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameReturnValue;
-      "Audits.getEncodedResponse": Audits.getEncodedResponseReturnValue;
-      "Audits.disable": Audits.disableReturnValue;
-      "Audits.enable": Audits.enableReturnValue;
-      "BackgroundService.startObserving": BackgroundService.startObservingReturnValue;
-      "BackgroundService.stopObserving": BackgroundService.stopObservingReturnValue;
-      "BackgroundService.setRecording": BackgroundService.setRecordingReturnValue;
-      "BackgroundService.clearEvents": BackgroundService.clearEventsReturnValue;
-      "Browser.setPermission": Browser.setPermissionReturnValue;
-      "Browser.grantPermissions": Browser.grantPermissionsReturnValue;
-      "Browser.resetPermissions": Browser.resetPermissionsReturnValue;
-      "Browser.setDownloadBehavior": Browser.setDownloadBehaviorReturnValue;
-      "Browser.close": Browser.closeReturnValue;
-      "Browser.crash": Browser.crashReturnValue;
-      "Browser.crashGpuProcess": Browser.crashGpuProcessReturnValue;
-      "Browser.getVersion": Browser.getVersionReturnValue;
-      "Browser.getBrowserCommandLine": Browser.getBrowserCommandLineReturnValue;
-      "Browser.getHistograms": Browser.getHistogramsReturnValue;
-      "Browser.getHistogram": Browser.getHistogramReturnValue;
-      "Browser.getWindowBounds": Browser.getWindowBoundsReturnValue;
-      "Browser.getWindowForTarget": Browser.getWindowForTargetReturnValue;
-      "Browser.setWindowBounds": Browser.setWindowBoundsReturnValue;
-      "Browser.setDockTile": Browser.setDockTileReturnValue;
-      "CSS.addRule": CSS.addRuleReturnValue;
-      "CSS.collectClassNames": CSS.collectClassNamesReturnValue;
-      "CSS.createStyleSheet": CSS.createStyleSheetReturnValue;
-      "CSS.disable": CSS.disableReturnValue;
-      "CSS.enable": CSS.enableReturnValue;
-      "CSS.forcePseudoState": CSS.forcePseudoStateReturnValue;
-      "CSS.getBackgroundColors": CSS.getBackgroundColorsReturnValue;
-      "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeReturnValue;
-      "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeReturnValue;
-      "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeReturnValue;
-      "CSS.getMediaQueries": CSS.getMediaQueriesReturnValue;
-      "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeReturnValue;
-      "CSS.getStyleSheetText": CSS.getStyleSheetTextReturnValue;
-      "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeReturnValue;
-      "CSS.setKeyframeKey": CSS.setKeyframeKeyReturnValue;
-      "CSS.setMediaText": CSS.setMediaTextReturnValue;
-      "CSS.setRuleSelector": CSS.setRuleSelectorReturnValue;
-      "CSS.setStyleSheetText": CSS.setStyleSheetTextReturnValue;
-      "CSS.setStyleTexts": CSS.setStyleTextsReturnValue;
-      "CSS.startRuleUsageTracking": CSS.startRuleUsageTrackingReturnValue;
-      "CSS.stopRuleUsageTracking": CSS.stopRuleUsageTrackingReturnValue;
-      "CSS.takeCoverageDelta": CSS.takeCoverageDeltaReturnValue;
-      "CacheStorage.deleteCache": CacheStorage.deleteCacheReturnValue;
-      "CacheStorage.deleteEntry": CacheStorage.deleteEntryReturnValue;
-      "CacheStorage.requestCacheNames": CacheStorage.requestCacheNamesReturnValue;
-      "CacheStorage.requestCachedResponse": CacheStorage.requestCachedResponseReturnValue;
-      "CacheStorage.requestEntries": CacheStorage.requestEntriesReturnValue;
-      "Cast.enable": Cast.enableReturnValue;
-      "Cast.disable": Cast.disableReturnValue;
-      "Cast.setSinkToUse": Cast.setSinkToUseReturnValue;
-      "Cast.startTabMirroring": Cast.startTabMirroringReturnValue;
-      "Cast.stopCasting": Cast.stopCastingReturnValue;
-      "DOM.collectClassNamesFromSubtree": DOM.collectClassNamesFromSubtreeReturnValue;
-      "DOM.copyTo": DOM.copyToReturnValue;
-      "DOM.describeNode": DOM.describeNodeReturnValue;
-      "DOM.scrollIntoViewIfNeeded": DOM.scrollIntoViewIfNeededReturnValue;
-      "DOM.disable": DOM.disableReturnValue;
-      "DOM.discardSearchResults": DOM.discardSearchResultsReturnValue;
-      "DOM.enable": DOM.enableReturnValue;
-      "DOM.focus": DOM.focusReturnValue;
-      "DOM.getAttributes": DOM.getAttributesReturnValue;
-      "DOM.getBoxModel": DOM.getBoxModelReturnValue;
-      "DOM.getContentQuads": DOM.getContentQuadsReturnValue;
-      "DOM.getDocument": DOM.getDocumentReturnValue;
-      "DOM.getFlattenedDocument": DOM.getFlattenedDocumentReturnValue;
-      "DOM.getNodeForLocation": DOM.getNodeForLocationReturnValue;
-      "DOM.getOuterHTML": DOM.getOuterHTMLReturnValue;
-      "DOM.getRelayoutBoundary": DOM.getRelayoutBoundaryReturnValue;
-      "DOM.getSearchResults": DOM.getSearchResultsReturnValue;
-      "DOM.hideHighlight": DOM.hideHighlightReturnValue;
-      "DOM.highlightNode": DOM.highlightNodeReturnValue;
-      "DOM.highlightRect": DOM.highlightRectReturnValue;
-      "DOM.markUndoableState": DOM.markUndoableStateReturnValue;
-      "DOM.moveTo": DOM.moveToReturnValue;
-      "DOM.performSearch": DOM.performSearchReturnValue;
-      "DOM.pushNodeByPathToFrontend": DOM.pushNodeByPathToFrontendReturnValue;
-      "DOM.pushNodesByBackendIdsToFrontend": DOM.pushNodesByBackendIdsToFrontendReturnValue;
-      "DOM.querySelector": DOM.querySelectorReturnValue;
-      "DOM.querySelectorAll": DOM.querySelectorAllReturnValue;
-      "DOM.redo": DOM.redoReturnValue;
-      "DOM.removeAttribute": DOM.removeAttributeReturnValue;
-      "DOM.removeNode": DOM.removeNodeReturnValue;
-      "DOM.requestChildNodes": DOM.requestChildNodesReturnValue;
-      "DOM.requestNode": DOM.requestNodeReturnValue;
-      "DOM.resolveNode": DOM.resolveNodeReturnValue;
-      "DOM.setAttributeValue": DOM.setAttributeValueReturnValue;
-      "DOM.setAttributesAsText": DOM.setAttributesAsTextReturnValue;
-      "DOM.setFileInputFiles": DOM.setFileInputFilesReturnValue;
-      "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledReturnValue;
-      "DOM.getNodeStackTraces": DOM.getNodeStackTracesReturnValue;
-      "DOM.getFileInfo": DOM.getFileInfoReturnValue;
-      "DOM.setInspectedNode": DOM.setInspectedNodeReturnValue;
-      "DOM.setNodeName": DOM.setNodeNameReturnValue;
-      "DOM.setNodeValue": DOM.setNodeValueReturnValue;
-      "DOM.setOuterHTML": DOM.setOuterHTMLReturnValue;
-      "DOM.undo": DOM.undoReturnValue;
-      "DOM.getFrameOwner": DOM.getFrameOwnerReturnValue;
-      "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersReturnValue;
-      "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointReturnValue;
-      "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointReturnValue;
-      "DOMDebugger.removeInstrumentationBreakpoint": DOMDebugger.removeInstrumentationBreakpointReturnValue;
-      "DOMDebugger.removeXHRBreakpoint": DOMDebugger.removeXHRBreakpointReturnValue;
-      "DOMDebugger.setDOMBreakpoint": DOMDebugger.setDOMBreakpointReturnValue;
-      "DOMDebugger.setEventListenerBreakpoint": DOMDebugger.setEventListenerBreakpointReturnValue;
-      "DOMDebugger.setInstrumentationBreakpoint": DOMDebugger.setInstrumentationBreakpointReturnValue;
-      "DOMDebugger.setXHRBreakpoint": DOMDebugger.setXHRBreakpointReturnValue;
-      "DOMSnapshot.disable": DOMSnapshot.disableReturnValue;
-      "DOMSnapshot.enable": DOMSnapshot.enableReturnValue;
-      "DOMSnapshot.getSnapshot": DOMSnapshot.getSnapshotReturnValue;
-      "DOMSnapshot.captureSnapshot": DOMSnapshot.captureSnapshotReturnValue;
-      "DOMStorage.clear": DOMStorage.clearReturnValue;
-      "DOMStorage.disable": DOMStorage.disableReturnValue;
-      "DOMStorage.enable": DOMStorage.enableReturnValue;
-      "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsReturnValue;
-      "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemReturnValue;
-      "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemReturnValue;
-      "Database.disable": Database.disableReturnValue;
-      "Database.enable": Database.enableReturnValue;
-      "Database.executeSQL": Database.executeSQLReturnValue;
-      "Database.getDatabaseTableNames": Database.getDatabaseTableNamesReturnValue;
-      "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideReturnValue;
-      "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideReturnValue;
-      "Emulation.canEmulate": Emulation.canEmulateReturnValue;
-      "Emulation.clearDeviceMetricsOverride": Emulation.clearDeviceMetricsOverrideReturnValue;
-      "Emulation.clearGeolocationOverride": Emulation.clearGeolocationOverrideReturnValue;
-      "Emulation.resetPageScaleFactor": Emulation.resetPageScaleFactorReturnValue;
-      "Emulation.setFocusEmulationEnabled": Emulation.setFocusEmulationEnabledReturnValue;
-      "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateReturnValue;
-      "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideReturnValue;
-      "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideReturnValue;
-      "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenReturnValue;
-      "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledReturnValue;
-      "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseReturnValue;
-      "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaReturnValue;
-      "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyReturnValue;
-      "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideReturnValue;
-      "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesReturnValue;
-      "Emulation.setPageScaleFactor": Emulation.setPageScaleFactorReturnValue;
-      "Emulation.setScriptExecutionDisabled": Emulation.setScriptExecutionDisabledReturnValue;
-      "Emulation.setTouchEmulationEnabled": Emulation.setTouchEmulationEnabledReturnValue;
-      "Emulation.setVirtualTimePolicy": Emulation.setVirtualTimePolicyReturnValue;
-      "Emulation.setLocaleOverride": Emulation.setLocaleOverrideReturnValue;
-      "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideReturnValue;
-      "Emulation.setVisibleSize": Emulation.setVisibleSizeReturnValue;
-      "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideReturnValue;
-      "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameReturnValue;
-      "HeadlessExperimental.disable": HeadlessExperimental.disableReturnValue;
-      "HeadlessExperimental.enable": HeadlessExperimental.enableReturnValue;
-      "IO.close": IO.closeReturnValue;
-      "IO.read": IO.readReturnValue;
-      "IO.resolveBlob": IO.resolveBlobReturnValue;
-      "IndexedDB.clearObjectStore": IndexedDB.clearObjectStoreReturnValue;
-      "IndexedDB.deleteDatabase": IndexedDB.deleteDatabaseReturnValue;
-      "IndexedDB.deleteObjectStoreEntries": IndexedDB.deleteObjectStoreEntriesReturnValue;
-      "IndexedDB.disable": IndexedDB.disableReturnValue;
-      "IndexedDB.enable": IndexedDB.enableReturnValue;
-      "IndexedDB.requestData": IndexedDB.requestDataReturnValue;
-      "IndexedDB.getMetadata": IndexedDB.getMetadataReturnValue;
-      "IndexedDB.requestDatabase": IndexedDB.requestDatabaseReturnValue;
-      "IndexedDB.requestDatabaseNames": IndexedDB.requestDatabaseNamesReturnValue;
-      "Input.dispatchKeyEvent": Input.dispatchKeyEventReturnValue;
-      "Input.insertText": Input.insertTextReturnValue;
-      "Input.dispatchMouseEvent": Input.dispatchMouseEventReturnValue;
-      "Input.dispatchTouchEvent": Input.dispatchTouchEventReturnValue;
-      "Input.emulateTouchFromMouseEvent": Input.emulateTouchFromMouseEventReturnValue;
-      "Input.setIgnoreInputEvents": Input.setIgnoreInputEventsReturnValue;
-      "Input.synthesizePinchGesture": Input.synthesizePinchGestureReturnValue;
-      "Input.synthesizeScrollGesture": Input.synthesizeScrollGestureReturnValue;
-      "Input.synthesizeTapGesture": Input.synthesizeTapGestureReturnValue;
-      "Inspector.disable": Inspector.disableReturnValue;
-      "Inspector.enable": Inspector.enableReturnValue;
-      "LayerTree.compositingReasons": LayerTree.compositingReasonsReturnValue;
-      "LayerTree.disable": LayerTree.disableReturnValue;
-      "LayerTree.enable": LayerTree.enableReturnValue;
-      "LayerTree.loadSnapshot": LayerTree.loadSnapshotReturnValue;
-      "LayerTree.makeSnapshot": LayerTree.makeSnapshotReturnValue;
-      "LayerTree.profileSnapshot": LayerTree.profileSnapshotReturnValue;
-      "LayerTree.releaseSnapshot": LayerTree.releaseSnapshotReturnValue;
-      "LayerTree.replaySnapshot": LayerTree.replaySnapshotReturnValue;
-      "LayerTree.snapshotCommandLog": LayerTree.snapshotCommandLogReturnValue;
-      "Log.clear": Log.clearReturnValue;
-      "Log.disable": Log.disableReturnValue;
-      "Log.enable": Log.enableReturnValue;
-      "Log.startViolationsReport": Log.startViolationsReportReturnValue;
-      "Log.stopViolationsReport": Log.stopViolationsReportReturnValue;
-      "Memory.getDOMCounters": Memory.getDOMCountersReturnValue;
-      "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionReturnValue;
-      "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryReturnValue;
-      "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedReturnValue;
-      "Memory.simulatePressureNotification": Memory.simulatePressureNotificationReturnValue;
-      "Memory.startSampling": Memory.startSamplingReturnValue;
-      "Memory.stopSampling": Memory.stopSamplingReturnValue;
-      "Memory.getAllTimeSamplingProfile": Memory.getAllTimeSamplingProfileReturnValue;
-      "Memory.getBrowserSamplingProfile": Memory.getBrowserSamplingProfileReturnValue;
-      "Memory.getSamplingProfile": Memory.getSamplingProfileReturnValue;
-      "Network.canClearBrowserCache": Network.canClearBrowserCacheReturnValue;
-      "Network.canClearBrowserCookies": Network.canClearBrowserCookiesReturnValue;
-      "Network.canEmulateNetworkConditions": Network.canEmulateNetworkConditionsReturnValue;
-      "Network.clearBrowserCache": Network.clearBrowserCacheReturnValue;
-      "Network.clearBrowserCookies": Network.clearBrowserCookiesReturnValue;
-      "Network.continueInterceptedRequest": Network.continueInterceptedRequestReturnValue;
-      "Network.deleteCookies": Network.deleteCookiesReturnValue;
-      "Network.disable": Network.disableReturnValue;
-      "Network.emulateNetworkConditions": Network.emulateNetworkConditionsReturnValue;
-      "Network.enable": Network.enableReturnValue;
-      "Network.getAllCookies": Network.getAllCookiesReturnValue;
-      "Network.getCertificate": Network.getCertificateReturnValue;
-      "Network.getCookies": Network.getCookiesReturnValue;
-      "Network.getResponseBody": Network.getResponseBodyReturnValue;
-      "Network.getRequestPostData": Network.getRequestPostDataReturnValue;
-      "Network.getResponseBodyForInterception": Network.getResponseBodyForInterceptionReturnValue;
-      "Network.takeResponseBodyForInterceptionAsStream": Network.takeResponseBodyForInterceptionAsStreamReturnValue;
-      "Network.replayXHR": Network.replayXHRReturnValue;
-      "Network.searchInResponseBody": Network.searchInResponseBodyReturnValue;
-      "Network.setBlockedURLs": Network.setBlockedURLsReturnValue;
-      "Network.setBypassServiceWorker": Network.setBypassServiceWorkerReturnValue;
-      "Network.setCacheDisabled": Network.setCacheDisabledReturnValue;
-      "Network.setCookie": Network.setCookieReturnValue;
-      "Network.setCookies": Network.setCookiesReturnValue;
-      "Network.setDataSizeLimitsForTest": Network.setDataSizeLimitsForTestReturnValue;
-      "Network.setExtraHTTPHeaders": Network.setExtraHTTPHeadersReturnValue;
-      "Network.setRequestInterception": Network.setRequestInterceptionReturnValue;
-      "Network.setUserAgentOverride": Network.setUserAgentOverrideReturnValue;
-      "Overlay.disable": Overlay.disableReturnValue;
-      "Overlay.enable": Overlay.enableReturnValue;
-      "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestReturnValue;
-      "Overlay.hideHighlight": Overlay.hideHighlightReturnValue;
-      "Overlay.highlightFrame": Overlay.highlightFrameReturnValue;
-      "Overlay.highlightNode": Overlay.highlightNodeReturnValue;
-      "Overlay.highlightQuad": Overlay.highlightQuadReturnValue;
-      "Overlay.highlightRect": Overlay.highlightRectReturnValue;
-      "Overlay.setInspectMode": Overlay.setInspectModeReturnValue;
-      "Overlay.setShowAdHighlights": Overlay.setShowAdHighlightsReturnValue;
-      "Overlay.setPausedInDebuggerMessage": Overlay.setPausedInDebuggerMessageReturnValue;
-      "Overlay.setShowDebugBorders": Overlay.setShowDebugBordersReturnValue;
-      "Overlay.setShowFPSCounter": Overlay.setShowFPSCounterReturnValue;
-      "Overlay.setShowPaintRects": Overlay.setShowPaintRectsReturnValue;
-      "Overlay.setShowLayoutShiftRegions": Overlay.setShowLayoutShiftRegionsReturnValue;
-      "Overlay.setShowScrollBottleneckRects": Overlay.setShowScrollBottleneckRectsReturnValue;
-      "Overlay.setShowHitTestBorders": Overlay.setShowHitTestBordersReturnValue;
-      "Overlay.setShowViewportSizeOnResize": Overlay.setShowViewportSizeOnResizeReturnValue;
-      "Page.addScriptToEvaluateOnLoad": Page.addScriptToEvaluateOnLoadReturnValue;
-      "Page.addScriptToEvaluateOnNewDocument": Page.addScriptToEvaluateOnNewDocumentReturnValue;
-      "Page.bringToFront": Page.bringToFrontReturnValue;
-      "Page.captureScreenshot": Page.captureScreenshotReturnValue;
-      "Page.captureSnapshot": Page.captureSnapshotReturnValue;
-      "Page.clearDeviceMetricsOverride": Page.clearDeviceMetricsOverrideReturnValue;
-      "Page.clearDeviceOrientationOverride": Page.clearDeviceOrientationOverrideReturnValue;
-      "Page.clearGeolocationOverride": Page.clearGeolocationOverrideReturnValue;
-      "Page.createIsolatedWorld": Page.createIsolatedWorldReturnValue;
-      "Page.deleteCookie": Page.deleteCookieReturnValue;
-      "Page.disable": Page.disableReturnValue;
-      "Page.enable": Page.enableReturnValue;
-      "Page.getAppManifest": Page.getAppManifestReturnValue;
-      "Page.getInstallabilityErrors": Page.getInstallabilityErrorsReturnValue;
-      "Page.getManifestIcons": Page.getManifestIconsReturnValue;
-      "Page.getCookies": Page.getCookiesReturnValue;
-      "Page.getFrameTree": Page.getFrameTreeReturnValue;
-      "Page.getLayoutMetrics": Page.getLayoutMetricsReturnValue;
-      "Page.getNavigationHistory": Page.getNavigationHistoryReturnValue;
-      "Page.resetNavigationHistory": Page.resetNavigationHistoryReturnValue;
-      "Page.getResourceContent": Page.getResourceContentReturnValue;
-      "Page.getResourceTree": Page.getResourceTreeReturnValue;
-      "Page.handleJavaScriptDialog": Page.handleJavaScriptDialogReturnValue;
-      "Page.navigate": Page.navigateReturnValue;
-      "Page.navigateToHistoryEntry": Page.navigateToHistoryEntryReturnValue;
-      "Page.printToPDF": Page.printToPDFReturnValue;
-      "Page.reload": Page.reloadReturnValue;
-      "Page.removeScriptToEvaluateOnLoad": Page.removeScriptToEvaluateOnLoadReturnValue;
-      "Page.removeScriptToEvaluateOnNewDocument": Page.removeScriptToEvaluateOnNewDocumentReturnValue;
-      "Page.screencastFrameAck": Page.screencastFrameAckReturnValue;
-      "Page.searchInResource": Page.searchInResourceReturnValue;
-      "Page.setAdBlockingEnabled": Page.setAdBlockingEnabledReturnValue;
-      "Page.setBypassCSP": Page.setBypassCSPReturnValue;
-      "Page.setDeviceMetricsOverride": Page.setDeviceMetricsOverrideReturnValue;
-      "Page.setDeviceOrientationOverride": Page.setDeviceOrientationOverrideReturnValue;
-      "Page.setFontFamilies": Page.setFontFamiliesReturnValue;
-      "Page.setFontSizes": Page.setFontSizesReturnValue;
-      "Page.setDocumentContent": Page.setDocumentContentReturnValue;
-      "Page.setDownloadBehavior": Page.setDownloadBehaviorReturnValue;
-      "Page.setGeolocationOverride": Page.setGeolocationOverrideReturnValue;
-      "Page.setLifecycleEventsEnabled": Page.setLifecycleEventsEnabledReturnValue;
-      "Page.setTouchEmulationEnabled": Page.setTouchEmulationEnabledReturnValue;
-      "Page.startScreencast": Page.startScreencastReturnValue;
-      "Page.stopLoading": Page.stopLoadingReturnValue;
-      "Page.crash": Page.crashReturnValue;
-      "Page.close": Page.closeReturnValue;
-      "Page.setWebLifecycleState": Page.setWebLifecycleStateReturnValue;
-      "Page.stopScreencast": Page.stopScreencastReturnValue;
-      "Page.setProduceCompilationCache": Page.setProduceCompilationCacheReturnValue;
-      "Page.addCompilationCache": Page.addCompilationCacheReturnValue;
-      "Page.clearCompilationCache": Page.clearCompilationCacheReturnValue;
-      "Page.generateTestReport": Page.generateTestReportReturnValue;
-      "Page.waitForDebugger": Page.waitForDebuggerReturnValue;
-      "Page.setInterceptFileChooserDialog": Page.setInterceptFileChooserDialogReturnValue;
-      "Performance.disable": Performance.disableReturnValue;
-      "Performance.enable": Performance.enableReturnValue;
-      "Performance.setTimeDomain": Performance.setTimeDomainReturnValue;
-      "Performance.getMetrics": Performance.getMetricsReturnValue;
-      "Security.disable": Security.disableReturnValue;
-      "Security.enable": Security.enableReturnValue;
-      "Security.setIgnoreCertificateErrors": Security.setIgnoreCertificateErrorsReturnValue;
-      "Security.handleCertificateError": Security.handleCertificateErrorReturnValue;
-      "Security.setOverrideCertificateErrors": Security.setOverrideCertificateErrorsReturnValue;
-      "ServiceWorker.deliverPushMessage": ServiceWorker.deliverPushMessageReturnValue;
-      "ServiceWorker.disable": ServiceWorker.disableReturnValue;
-      "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventReturnValue;
-      "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventReturnValue;
-      "ServiceWorker.enable": ServiceWorker.enableReturnValue;
-      "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerReturnValue;
-      "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadReturnValue;
-      "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingReturnValue;
-      "ServiceWorker.startWorker": ServiceWorker.startWorkerReturnValue;
-      "ServiceWorker.stopAllWorkers": ServiceWorker.stopAllWorkersReturnValue;
-      "ServiceWorker.stopWorker": ServiceWorker.stopWorkerReturnValue;
-      "ServiceWorker.unregister": ServiceWorker.unregisterReturnValue;
-      "ServiceWorker.updateRegistration": ServiceWorker.updateRegistrationReturnValue;
-      "Storage.clearDataForOrigin": Storage.clearDataForOriginReturnValue;
-      "Storage.getCookies": Storage.getCookiesReturnValue;
-      "Storage.setCookies": Storage.setCookiesReturnValue;
-      "Storage.clearCookies": Storage.clearCookiesReturnValue;
-      "Storage.getUsageAndQuota": Storage.getUsageAndQuotaReturnValue;
-      "Storage.trackCacheStorageForOrigin": Storage.trackCacheStorageForOriginReturnValue;
-      "Storage.trackIndexedDBForOrigin": Storage.trackIndexedDBForOriginReturnValue;
-      "Storage.untrackCacheStorageForOrigin": Storage.untrackCacheStorageForOriginReturnValue;
-      "Storage.untrackIndexedDBForOrigin": Storage.untrackIndexedDBForOriginReturnValue;
-      "SystemInfo.getInfo": SystemInfo.getInfoReturnValue;
-      "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoReturnValue;
-      "Target.activateTarget": Target.activateTargetReturnValue;
-      "Target.attachToTarget": Target.attachToTargetReturnValue;
-      "Target.attachToBrowserTarget": Target.attachToBrowserTargetReturnValue;
-      "Target.closeTarget": Target.closeTargetReturnValue;
-      "Target.exposeDevToolsProtocol": Target.exposeDevToolsProtocolReturnValue;
-      "Target.createBrowserContext": Target.createBrowserContextReturnValue;
-      "Target.getBrowserContexts": Target.getBrowserContextsReturnValue;
-      "Target.createTarget": Target.createTargetReturnValue;
-      "Target.detachFromTarget": Target.detachFromTargetReturnValue;
-      "Target.disposeBrowserContext": Target.disposeBrowserContextReturnValue;
-      "Target.getTargetInfo": Target.getTargetInfoReturnValue;
-      "Target.getTargets": Target.getTargetsReturnValue;
-      "Target.sendMessageToTarget": Target.sendMessageToTargetReturnValue;
-      "Target.setAutoAttach": Target.setAutoAttachReturnValue;
-      "Target.setDiscoverTargets": Target.setDiscoverTargetsReturnValue;
-      "Target.setRemoteLocations": Target.setRemoteLocationsReturnValue;
-      "Tethering.bind": Tethering.bindReturnValue;
-      "Tethering.unbind": Tethering.unbindReturnValue;
-      "Tracing.end": Tracing.endReturnValue;
-      "Tracing.getCategories": Tracing.getCategoriesReturnValue;
-      "Tracing.recordClockSyncMarker": Tracing.recordClockSyncMarkerReturnValue;
-      "Tracing.requestMemoryDump": Tracing.requestMemoryDumpReturnValue;
-      "Tracing.start": Tracing.startReturnValue;
-      "Fetch.disable": Fetch.disableReturnValue;
-      "Fetch.enable": Fetch.enableReturnValue;
-      "Fetch.failRequest": Fetch.failRequestReturnValue;
-      "Fetch.fulfillRequest": Fetch.fulfillRequestReturnValue;
-      "Fetch.continueRequest": Fetch.continueRequestReturnValue;
-      "Fetch.continueWithAuth": Fetch.continueWithAuthReturnValue;
-      "Fetch.getResponseBody": Fetch.getResponseBodyReturnValue;
-      "Fetch.takeResponseBodyAsStream": Fetch.takeResponseBodyAsStreamReturnValue;
-      "WebAudio.enable": WebAudio.enableReturnValue;
-      "WebAudio.disable": WebAudio.disableReturnValue;
-      "WebAudio.getRealtimeData": WebAudio.getRealtimeDataReturnValue;
-      "WebAuthn.enable": WebAuthn.enableReturnValue;
-      "WebAuthn.disable": WebAuthn.disableReturnValue;
-      "WebAuthn.addVirtualAuthenticator": WebAuthn.addVirtualAuthenticatorReturnValue;
-      "WebAuthn.removeVirtualAuthenticator": WebAuthn.removeVirtualAuthenticatorReturnValue;
-      "WebAuthn.addCredential": WebAuthn.addCredentialReturnValue;
-      "WebAuthn.getCredential": WebAuthn.getCredentialReturnValue;
-      "WebAuthn.getCredentials": WebAuthn.getCredentialsReturnValue;
-      "WebAuthn.removeCredential": WebAuthn.removeCredentialReturnValue;
-      "WebAuthn.clearCredentials": WebAuthn.clearCredentialsReturnValue;
-      "WebAuthn.setUserVerified": WebAuthn.setUserVerifiedReturnValue;
-      "Media.enable": Media.enableReturnValue;
-      "Media.disable": Media.disableReturnValue;
-      "Console.clearMessages": Console.clearMessagesReturnValue;
-      "Console.disable": Console.disableReturnValue;
-      "Console.enable": Console.enableReturnValue;
-      "Debugger.continueToLocation": Debugger.continueToLocationReturnValue;
-      "Debugger.disable": Debugger.disableReturnValue;
-      "Debugger.enable": Debugger.enableReturnValue;
-      "Debugger.evaluateOnCallFrame": Debugger.evaluateOnCallFrameReturnValue;
-      "Debugger.getPossibleBreakpoints": Debugger.getPossibleBreakpointsReturnValue;
-      "Debugger.getScriptSource": Debugger.getScriptSourceReturnValue;
-      "Debugger.getWasmBytecode": Debugger.getWasmBytecodeReturnValue;
-      "Debugger.getStackTrace": Debugger.getStackTraceReturnValue;
-      "Debugger.pause": Debugger.pauseReturnValue;
-      "Debugger.pauseOnAsyncCall": Debugger.pauseOnAsyncCallReturnValue;
-      "Debugger.removeBreakpoint": Debugger.removeBreakpointReturnValue;
-      "Debugger.restartFrame": Debugger.restartFrameReturnValue;
-      "Debugger.resume": Debugger.resumeReturnValue;
-      "Debugger.searchInContent": Debugger.searchInContentReturnValue;
-      "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthReturnValue;
-      "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsReturnValue;
-      "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesReturnValue;
-      "Debugger.setBreakpoint": Debugger.setBreakpointReturnValue;
-      "Debugger.setInstrumentationBreakpoint": Debugger.setInstrumentationBreakpointReturnValue;
-      "Debugger.setBreakpointByUrl": Debugger.setBreakpointByUrlReturnValue;
-      "Debugger.setBreakpointOnFunctionCall": Debugger.setBreakpointOnFunctionCallReturnValue;
-      "Debugger.setBreakpointsActive": Debugger.setBreakpointsActiveReturnValue;
-      "Debugger.setPauseOnExceptions": Debugger.setPauseOnExceptionsReturnValue;
-      "Debugger.setReturnValue": Debugger.setReturnValueReturnValue;
-      "Debugger.setScriptSource": Debugger.setScriptSourceReturnValue;
-      "Debugger.setSkipAllPauses": Debugger.setSkipAllPausesReturnValue;
-      "Debugger.setVariableValue": Debugger.setVariableValueReturnValue;
-      "Debugger.stepInto": Debugger.stepIntoReturnValue;
-      "Debugger.stepOut": Debugger.stepOutReturnValue;
-      "Debugger.stepOver": Debugger.stepOverReturnValue;
-      "HeapProfiler.addInspectedHeapObject": HeapProfiler.addInspectedHeapObjectReturnValue;
-      "HeapProfiler.collectGarbage": HeapProfiler.collectGarbageReturnValue;
-      "HeapProfiler.disable": HeapProfiler.disableReturnValue;
-      "HeapProfiler.enable": HeapProfiler.enableReturnValue;
-      "HeapProfiler.getHeapObjectId": HeapProfiler.getHeapObjectIdReturnValue;
-      "HeapProfiler.getObjectByHeapObjectId": HeapProfiler.getObjectByHeapObjectIdReturnValue;
-      "HeapProfiler.getSamplingProfile": HeapProfiler.getSamplingProfileReturnValue;
-      "HeapProfiler.startSampling": HeapProfiler.startSamplingReturnValue;
-      "HeapProfiler.startTrackingHeapObjects": HeapProfiler.startTrackingHeapObjectsReturnValue;
-      "HeapProfiler.stopSampling": HeapProfiler.stopSamplingReturnValue;
-      "HeapProfiler.stopTrackingHeapObjects": HeapProfiler.stopTrackingHeapObjectsReturnValue;
-      "HeapProfiler.takeHeapSnapshot": HeapProfiler.takeHeapSnapshotReturnValue;
-      "Profiler.disable": Profiler.disableReturnValue;
-      "Profiler.enable": Profiler.enableReturnValue;
-      "Profiler.getBestEffortCoverage": Profiler.getBestEffortCoverageReturnValue;
-      "Profiler.setSamplingInterval": Profiler.setSamplingIntervalReturnValue;
-      "Profiler.start": Profiler.startReturnValue;
-      "Profiler.startPreciseCoverage": Profiler.startPreciseCoverageReturnValue;
-      "Profiler.startTypeProfile": Profiler.startTypeProfileReturnValue;
-      "Profiler.stop": Profiler.stopReturnValue;
-      "Profiler.stopPreciseCoverage": Profiler.stopPreciseCoverageReturnValue;
-      "Profiler.stopTypeProfile": Profiler.stopTypeProfileReturnValue;
-      "Profiler.takePreciseCoverage": Profiler.takePreciseCoverageReturnValue;
-      "Profiler.takeTypeProfile": Profiler.takeTypeProfileReturnValue;
-      "Profiler.enableRuntimeCallStats": Profiler.enableRuntimeCallStatsReturnValue;
-      "Profiler.disableRuntimeCallStats": Profiler.disableRuntimeCallStatsReturnValue;
-      "Profiler.getRuntimeCallStats": Profiler.getRuntimeCallStatsReturnValue;
-      "Runtime.awaitPromise": Runtime.awaitPromiseReturnValue;
-      "Runtime.callFunctionOn": Runtime.callFunctionOnReturnValue;
-      "Runtime.compileScript": Runtime.compileScriptReturnValue;
-      "Runtime.disable": Runtime.disableReturnValue;
-      "Runtime.discardConsoleEntries": Runtime.discardConsoleEntriesReturnValue;
-      "Runtime.enable": Runtime.enableReturnValue;
-      "Runtime.evaluate": Runtime.evaluateReturnValue;
-      "Runtime.getIsolateId": Runtime.getIsolateIdReturnValue;
-      "Runtime.getHeapUsage": Runtime.getHeapUsageReturnValue;
-      "Runtime.getProperties": Runtime.getPropertiesReturnValue;
-      "Runtime.globalLexicalScopeNames": Runtime.globalLexicalScopeNamesReturnValue;
-      "Runtime.queryObjects": Runtime.queryObjectsReturnValue;
-      "Runtime.releaseObject": Runtime.releaseObjectReturnValue;
-      "Runtime.releaseObjectGroup": Runtime.releaseObjectGroupReturnValue;
-      "Runtime.runIfWaitingForDebugger": Runtime.runIfWaitingForDebuggerReturnValue;
-      "Runtime.runScript": Runtime.runScriptReturnValue;
-      "Runtime.setAsyncCallStackDepth": Runtime.setAsyncCallStackDepthReturnValue;
-      "Runtime.setCustomObjectFormatterEnabled": Runtime.setCustomObjectFormatterEnabledReturnValue;
-      "Runtime.setMaxCallStackSizeToCapture": Runtime.setMaxCallStackSizeToCaptureReturnValue;
-      "Runtime.terminateExecution": Runtime.terminateExecutionReturnValue;
-      "Runtime.addBinding": Runtime.addBindingReturnValue;
-      "Runtime.removeBinding": Runtime.removeBindingReturnValue;
-      "Schema.getDomains": Schema.getDomainsReturnValue;
-    }
-  }
-
-export default Protocol;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/revisions.ts firefox-85.0+build1/remote/test/puppeteer/src/revisions.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/revisions.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/revisions.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,6 +20,6 @@
 }>;
 
 export const PUPPETEER_REVISIONS: Revisions = {
-  chromium: '756035',
+  chromium: '818858',
   firefox: 'latest',
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/tsconfig.cjs.json firefox-85.0+build1/remote/test/puppeteer/src/tsconfig.cjs.json
--- firefox-84.0.2+build1/remote/test/puppeteer/src/tsconfig.cjs.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/tsconfig.cjs.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "../lib/cjs/puppeteer",
+    "module": "CommonJS"
+  },
+  "references": [
+    { "path": "../vendor/tsconfig.cjs.json"}
+  ]
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/tsconfig.esm.json firefox-85.0+build1/remote/test/puppeteer/src/tsconfig.esm.json
--- firefox-84.0.2+build1/remote/test/puppeteer/src/tsconfig.esm.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/tsconfig.esm.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "../lib/esm/puppeteer",
+    "module": "esnext"
+  },
+  "references": [
+    { "path": "../vendor/tsconfig.esm.json"}
+  ]
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/src/web.ts firefox-85.0+build1/remote/test/puppeteer/src/web.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/src/web.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/src/web.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,24 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { initializePuppeteerWeb } from './initialize-web.js';
+import { isNode } from './environment.js';
+
+if (isNode) {
+  throw new Error('Trying to run Puppeteer-Web in a Node environment');
+}
+
+export default initializePuppeteerWeb('puppeteer');
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/accessibility.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/accessibility.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/accessibility.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/accessibility.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,7 +20,7 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   describeFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describeFailsFirefox('Accessibility', function () {
   setupTestBrowserHooks();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/ariaqueryhandler.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/ariaqueryhandler.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/ariaqueryhandler.spec.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/ariaqueryhandler.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,565 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import expect from 'expect';
+import {
+  getTestState,
+  setupTestBrowserHooks,
+  setupTestPageAndContextHooks,
+  describeChromeOnly,
+} from './mocha-utils'; // eslint-disable-line import/extensions
+
+import { ElementHandle } from '../lib/cjs/puppeteer/common/JSHandle.js';
+import utils from './utils.js';
+
+describeChromeOnly('AriaQueryHandler', () => {
+  setupTestBrowserHooks();
+  setupTestPageAndContextHooks();
+
+  describe('parseAriaSelector', () => {
+    beforeEach(async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<button id="btn" role="button"> Submit  button   and some spaces  </button>'
+      );
+    });
+    it('should find button', async () => {
+      const { page } = getTestState();
+      const expectFound = async (button: ElementHandle) => {
+        const id = await button.evaluate((button: Element) => button.id);
+        expect(id).toBe('btn');
+      };
+      let button = await page.$(
+        'aria/Submit button and some spaces[role="button"]'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/  Submit button and some spaces[role="button"]'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/Submit button and some spaces  [role="button"]'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/Submit  button   and  some  spaces   [  role  =  "button" ] '
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/[role="button"]Submit button and some spaces'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/Submit button [role="button"]and some spaces'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/[name="  Submit  button and some  spaces"][role="button"]'
+      );
+      await expectFound(button);
+      button = await page.$(
+        'aria/ignored[name="Submit  button and some  spaces"][role="button"]'
+      );
+      await expectFound(button);
+    });
+  });
+
+  describe('queryOne', () => {
+    it('should find button by role', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<div id="div"><button id="btn" role="button">Submit</button></div>'
+      );
+      const button = await page.$('aria/[role="button"]');
+      const id = await button.evaluate((button: Element) => button.id);
+      expect(id).toBe('btn');
+    });
+
+    it('should find button by name and role', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<div id="div"><button id="btn" role="button">Submit</button></div>'
+      );
+      const button = await page.$('aria/Submit[role="button"]');
+      const id = await button.evaluate((button: Element) => button.id);
+      expect(id).toBe('btn');
+    });
+
+    it('should find first matching element', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `
+        <div role="menu" id="mnu1" aria-label="menu div"></div>
+        <div role="menu" id="mnu2" aria-label="menu div"></div>
+        `
+      );
+      const div = await page.$('aria/menu div');
+      const id = await div.evaluate((div: Element) => div.id);
+      expect(id).toBe('mnu1');
+    });
+
+    it('should find by name', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `
+        <div role="menu" id="mnu1" aria-label="menu-label1">menu div</div>
+        <div role="menu" id="mnu2" aria-label="menu-label2">menu div</div>
+        `
+      );
+      const menu = await page.$('aria/menu-label1');
+      const id = await menu.evaluate((div: Element) => div.id);
+      expect(id).toBe('mnu1');
+    });
+
+    it('should find by name', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `
+        <div role="menu" id="mnu1" aria-label="menu-label1">menu div</div>
+        <div role="menu" id="mnu2" aria-label="menu-label2">menu div</div>
+        `
+      );
+      const menu = await page.$('aria/menu-label2');
+      const id = await menu.evaluate((div: Element) => div.id);
+      expect(id).toBe('mnu2');
+    });
+  });
+
+  describe('queryAll', () => {
+    it('should find menu by name', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `
+        <div role="menu" id="mnu1" aria-label="menu div"></div>
+        <div role="menu" id="mnu2" aria-label="menu div"></div>
+        `
+      );
+      const divs = await page.$$('aria/menu div');
+      const ids = await Promise.all(
+        divs.map((n) => n.evaluate((div: Element) => div.id))
+      );
+      expect(ids.join(', ')).toBe('mnu1, mnu2');
+    });
+  });
+  describe('queryAllArray', () => {
+    it('$$eval should handle many elements', async () => {
+      const { page } = getTestState();
+      await page.setContent('');
+      await page.evaluate(
+        `
+        for (var i = 0; i <= 10000; i++) {
+            const button = document.createElement('button');
+            button.textContent = i;
+            document.body.appendChild(button);
+        }
+        `
+      );
+      const sum = await page.$$eval('aria/[role="button"]', (buttons) =>
+        buttons.reduce((acc, button) => acc + Number(button.textContent), 0)
+      );
+      expect(sum).toBe(50005000);
+    });
+  });
+
+  describe('waitForSelector (aria)', function () {
+    const addElement = (tag) =>
+      document.body.appendChild(document.createElement(tag));
+
+    it('should immediately resolve promise if node exists', async () => {
+      const { page, server } = getTestState();
+      await page.goto(server.EMPTY_PAGE);
+      await page.evaluate(addElement, 'button');
+      await page.waitForSelector('aria/[role="button"]');
+    });
+
+    it('should work independently of `exposeFunction`', async () => {
+      const { page, server } = getTestState();
+      await page.goto(server.EMPTY_PAGE);
+      await page.exposeFunction('ariaQuerySelector', (a, b) => a + b);
+      await page.evaluate(addElement, 'button');
+      await page.waitForSelector('aria/[role="button"]');
+      const result = await page.evaluate('globalThis.ariaQuerySelector(2,8)');
+      expect(result).toBe(10);
+    });
+
+    it('should work with removed MutationObserver', async () => {
+      const { page } = getTestState();
+
+      await page.evaluate(() => delete window.MutationObserver);
+      const [handle] = await Promise.all([
+        page.waitForSelector('aria/anything'),
+        page.setContent(`<h1>anything</h1>`),
+      ]);
+      expect(
+        await page.evaluate((x: HTMLElement) => x.textContent, handle)
+      ).toBe('anything');
+    });
+
+    it('should resolve promise when node is added', async () => {
+      const { page, server } = getTestState();
+
+      await page.goto(server.EMPTY_PAGE);
+      const frame = page.mainFrame();
+      const watchdog = frame.waitForSelector('aria/[role="heading"]');
+      await frame.evaluate(addElement, 'br');
+      await frame.evaluate(addElement, 'h1');
+      const elementHandle = await watchdog;
+      const tagName = await elementHandle
+        .getProperty('tagName')
+        .then((element) => element.jsonValue());
+      expect(tagName).toBe('H1');
+    });
+
+    it('should work when node is added through innerHTML', async () => {
+      const { page, server } = getTestState();
+
+      await page.goto(server.EMPTY_PAGE);
+      const watchdog = page.waitForSelector('aria/name');
+      await page.evaluate(addElement, 'span');
+      await page.evaluate(
+        () =>
+          (document.querySelector('span').innerHTML =
+            '<h3><div aria-label="name"></div></h3>')
+      );
+      await watchdog;
+    });
+
+    it('Page.waitForSelector is shortcut for main frame', async () => {
+      const { page, server } = getTestState();
+
+      await page.goto(server.EMPTY_PAGE);
+      await utils.attachFrame(page, 'frame1', server.EMPTY_PAGE);
+      const otherFrame = page.frames()[1];
+      const watchdog = page.waitForSelector('aria/[role="button"]');
+      await otherFrame.evaluate(addElement, 'button');
+      await page.evaluate(addElement, 'button');
+      const elementHandle = await watchdog;
+      expect(elementHandle.executionContext().frame()).toBe(page.mainFrame());
+    });
+
+    it('should run in specified frame', async () => {
+      const { page, server } = getTestState();
+
+      await utils.attachFrame(page, 'frame1', server.EMPTY_PAGE);
+      await utils.attachFrame(page, 'frame2', server.EMPTY_PAGE);
+      const frame1 = page.frames()[1];
+      const frame2 = page.frames()[2];
+      const waitForSelectorPromise = frame2.waitForSelector(
+        'aria/[role="button"]'
+      );
+      await frame1.evaluate(addElement, 'button');
+      await frame2.evaluate(addElement, 'button');
+      const elementHandle = await waitForSelectorPromise;
+      expect(elementHandle.executionContext().frame()).toBe(frame2);
+    });
+
+    it('should throw when frame is detached', async () => {
+      const { page, server } = getTestState();
+
+      await utils.attachFrame(page, 'frame1', server.EMPTY_PAGE);
+      const frame = page.frames()[1];
+      let waitError = null;
+      const waitPromise = frame
+        .waitForSelector('aria/does-not-exist')
+        .catch((error) => (waitError = error));
+      await utils.detachFrame(page, 'frame1');
+      await waitPromise;
+      expect(waitError).toBeTruthy();
+      expect(waitError.message).toContain(
+        'waitForFunction failed: frame got detached.'
+      );
+    });
+
+    it('should survive cross-process navigation', async () => {
+      const { page, server } = getTestState();
+
+      let imgFound = false;
+      const waitForSelector = page
+        .waitForSelector('aria/[role="img"]')
+        .then(() => (imgFound = true));
+      await page.goto(server.EMPTY_PAGE);
+      expect(imgFound).toBe(false);
+      await page.reload();
+      expect(imgFound).toBe(false);
+      await page.goto(server.CROSS_PROCESS_PREFIX + '/grid.html');
+      await waitForSelector;
+      expect(imgFound).toBe(true);
+    });
+
+    it('should wait for visible', async () => {
+      const { page } = getTestState();
+
+      let divFound = false;
+      const waitForSelector = page
+        .waitForSelector('aria/name', { visible: true })
+        .then(() => (divFound = true));
+      await page.setContent(
+        `<div aria-label='name' style='display: none; visibility: hidden;'>1</div>`
+      );
+      expect(divFound).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.removeProperty('display')
+      );
+      expect(divFound).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.removeProperty('visibility')
+      );
+      expect(await waitForSelector).toBe(true);
+      expect(divFound).toBe(true);
+    });
+
+    it('should wait for visible recursively', async () => {
+      const { page } = getTestState();
+
+      let divVisible = false;
+      const waitForSelector = page
+        .waitForSelector('aria/inner', { visible: true })
+        .then(() => (divVisible = true));
+      await page.setContent(
+        `<div style='display: none; visibility: hidden;'><div aria-label="inner">hi</div></div>`
+      );
+      expect(divVisible).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.removeProperty('display')
+      );
+      expect(divVisible).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.removeProperty('visibility')
+      );
+      expect(await waitForSelector).toBe(true);
+      expect(divVisible).toBe(true);
+    });
+
+    it('hidden should wait for visibility: hidden', async () => {
+      const { page } = getTestState();
+
+      let divHidden = false;
+      await page.setContent(
+        `<div role='button' style='display: block;'></div>`
+      );
+      const waitForSelector = page
+        .waitForSelector('aria/[role="button"]', { hidden: true })
+        .then(() => (divHidden = true));
+      await page.waitForSelector('aria/[role="button"]'); // do a round trip
+      expect(divHidden).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.setProperty('visibility', 'hidden')
+      );
+      expect(await waitForSelector).toBe(true);
+      expect(divHidden).toBe(true);
+    });
+
+    it('hidden should wait for display: none', async () => {
+      const { page } = getTestState();
+
+      let divHidden = false;
+      await page.setContent(`<div role='main' style='display: block;'></div>`);
+      const waitForSelector = page
+        .waitForSelector('aria/[role="main"]', { hidden: true })
+        .then(() => (divHidden = true));
+      await page.waitForSelector('aria/[role="main"]'); // do a round trip
+      expect(divHidden).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').style.setProperty('display', 'none')
+      );
+      expect(await waitForSelector).toBe(true);
+      expect(divHidden).toBe(true);
+    });
+
+    it('hidden should wait for removal', async () => {
+      const { page } = getTestState();
+
+      await page.setContent(`<div role='main'></div>`);
+      let divRemoved = false;
+      const waitForSelector = page
+        .waitForSelector('aria/[role="main"]', { hidden: true })
+        .then(() => (divRemoved = true));
+      await page.waitForSelector('aria/[role="main"]'); // do a round trip
+      expect(divRemoved).toBe(false);
+      await page.evaluate(() => document.querySelector('div').remove());
+      expect(await waitForSelector).toBe(true);
+      expect(divRemoved).toBe(true);
+    });
+
+    it('should return null if waiting to hide non-existing element', async () => {
+      const { page } = getTestState();
+
+      const handle = await page.waitForSelector('aria/non-existing', {
+        hidden: true,
+      });
+      expect(handle).toBe(null);
+    });
+
+    it('should respect timeout', async () => {
+      const { page, puppeteer } = getTestState();
+
+      let error = null;
+      await page
+        .waitForSelector('aria/[role="button"]', { timeout: 10 })
+        .catch((error_) => (error = error_));
+      expect(error).toBeTruthy();
+      expect(error.message).toContain(
+        'waiting for selector `[role="button"]` failed: timeout'
+      );
+      expect(error).toBeInstanceOf(puppeteer.errors.TimeoutError);
+    });
+
+    it('should have an error message specifically for awaiting an element to be hidden', async () => {
+      const { page } = getTestState();
+
+      await page.setContent(`<div role='main'></div>`);
+      let error = null;
+      await page
+        .waitForSelector('aria/[role="main"]', { hidden: true, timeout: 10 })
+        .catch((error_) => (error = error_));
+      expect(error).toBeTruthy();
+      expect(error.message).toContain(
+        'waiting for selector `[role="main"]` to be hidden failed: timeout'
+      );
+    });
+
+    it('should respond to node attribute mutation', async () => {
+      const { page } = getTestState();
+
+      let divFound = false;
+      const waitForSelector = page
+        .waitForSelector('aria/zombo')
+        .then(() => (divFound = true));
+      await page.setContent(`<div aria-label='notZombo'></div>`);
+      expect(divFound).toBe(false);
+      await page.evaluate(() =>
+        document.querySelector('div').setAttribute('aria-label', 'zombo')
+      );
+      expect(await waitForSelector).toBe(true);
+    });
+
+    it('should return the element handle', async () => {
+      const { page } = getTestState();
+
+      const waitForSelector = page.waitForSelector('aria/zombo');
+      await page.setContent(`<div aria-label='zombo'>anything</div>`);
+      expect(
+        await page.evaluate(
+          (x: HTMLElement) => x.textContent,
+          await waitForSelector
+        )
+      ).toBe('anything');
+    });
+
+    it('should have correct stack trace for timeout', async () => {
+      const { page } = getTestState();
+
+      let error;
+      await page
+        .waitForSelector('aria/zombo', { timeout: 10 })
+        .catch((error_) => (error = error_));
+      expect(error.stack).toContain('waiting for selector `zombo` failed');
+    });
+  });
+
+  describe('queryOne (Chromium web test)', async () => {
+    beforeEach(async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `
+          <h2 id="shown">title</h2>
+          <h2 id="hidden" aria-hidden="true">title</h2>
+          <div id="node1" aria-labeledby="node2"></div>
+          <div id="node2" aria-label="bar"></div>
+          <div id="node3" aria-label="foo"></div>
+          <div id="node4" class="container">
+          <div id="node5" role="button" aria-label="foo"></div>
+          <div id="node6" role="button" aria-label="foo"></div>
+          <!-- Accessible name not available when element is hidden -->
+          <div id="node7" hidden role="button" aria-label="foo"></div>
+          <div id="node8" role="button" aria-label="bar"></div>
+          </div>
+          <button id="node10">text content</button>
+          <h1 id="node11">text content</h1>
+          <!-- Accessible name not available when role is "presentation" -->
+          <h1 id="node12" role="presentation">text content</h1>
+          <!-- Elements inside shadow dom should be found -->
+          <script>
+          const div = document.createElement('div');
+          const shadowRoot = div.attachShadow({mode: 'open'});
+          const h1 = document.createElement('h1');
+          h1.textContent = 'text content';
+          h1.id = 'node13';
+          shadowRoot.appendChild(h1);
+          document.documentElement.appendChild(div);
+          </script>
+          <img id="node20" src="" alt="Accessible Name">
+          <input id="node21" type="submit" value="Accessible Name">
+          <label id="node22" for="node23">Accessible Name</label>
+          <!-- Accessible name for the <input> is "Accessible Name" -->
+          <input id="node23">
+          <div id="node24" title="Accessible Name"></div>
+          <div role="treeitem" id="node30">
+          <div role="treeitem" id="node31">
+          <div role="treeitem" id="node32">item1</div>
+          <div role="treeitem" id="node33">item2</div>
+          </div>
+          <div role="treeitem" id="node34">item3</div>
+          </div>
+          <!-- Accessible name for the <div> is "item1 item2 item3" -->
+          <div aria-describedby="node30"></div>
+          `
+      );
+    });
+    const getIds = async (elements: ElementHandle[]) =>
+      Promise.all(
+        elements.map((element) =>
+          element.evaluate((element: Element) => element.id)
+        )
+      );
+    it('should find by name "foo"', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/foo');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['node3', 'node5', 'node6']);
+    });
+    it('should find by name "bar"', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/bar');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['node1', 'node2', 'node8']);
+    });
+    it('should find treeitem by name', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/item1 item2 item3');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['node30']);
+    });
+    it('should find by role "button"', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/[role="button"]');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['node5', 'node6', 'node8', 'node10', 'node21']);
+    });
+    it('should find by role "heading"', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/[role="heading"]');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['shown', 'hidden', 'node11', 'node13']);
+    });
+    it('should find both ignored and unignored', async () => {
+      const { page } = getTestState();
+      const found = await page.$$('aria/title');
+      const ids = await getIds(found);
+      expect(ids).toEqual(['shown', 'hidden']);
+    });
+  });
+});
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/assets/consolelog.html firefox-85.0+build1/remote/test/puppeteer/test/assets/consolelog.html
--- firefox-84.0.2+build1/remote/test/puppeteer/test/assets/consolelog.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/assets/consolelog.html	2021-01-18 19:58:18.000000000 +0000
@@ -5,7 +5,13 @@
   </head>
   <body>
     <script>
-      console.log('yellow')
+      function foo() {
+        console.log('yellow')
+      }
+      function bar() {
+        foo();
+      }
+      bar();
     </script>
   </body>
 </html>
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/assets/frames/one-frame-url-fragment.html firefox-85.0+build1/remote/test/puppeteer/test/assets/frames/one-frame-url-fragment.html
--- firefox-84.0.2+build1/remote/test/puppeteer/test/assets/frames/one-frame-url-fragment.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/assets/frames/one-frame-url-fragment.html	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+<iframe src='./frame.html?param=value#fragment'></iframe>
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/assets/idle-detector.html firefox-85.0+build1/remote/test/puppeteer/test/assets/idle-detector.html
--- firefox-84.0.2+build1/remote/test/puppeteer/test/assets/idle-detector.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/assets/idle-detector.html	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<div id="state"></div>
+<script>
+  const elState = document.querySelector('#state');
+  function setState(msg) {
+    elState.textContent = msg;
+  }
+  async function main() {
+    const controller = new AbortController();
+    const signal = controller.signal;
+    const idleDetector = new IdleDetector({
+      threshold: 60000,
+      signal,
+    });
+    idleDetector.addEventListener('change', () => {
+      const userState = idleDetector.userState;
+      const screenState = idleDetector.screenState;
+      setState(`Idle state: ${userState}, ${screenState}.`);
+    });
+    idleDetector.start();
+  }
+  main();
+</script>
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/assets/input/wheel.html firefox-85.0+build1/remote/test/puppeteer/test/assets/input/wheel.html
--- firefox-84.0.2+build1/remote/test/puppeteer/test/assets/input/wheel.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/assets/input/wheel.html	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+      body {
+        min-height: 100vh;
+        margin: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      div {
+        width: 105px;
+        height: 105px;
+        background: #cdf;
+        padding: 5px;
+      }
+    </style>
+    <title>Element: wheel event - Scaling_an_element_via_the_wheel - code sample</title>
+  </head>
+  <body>
+    <div>Scale me with your mouse wheel.</div>
+    <script>
+      function zoom(event) {
+        event.preventDefault();
+
+        scale += event.deltaY * -0.01;
+
+        // Restrict scale
+        scale = Math.min(Math.max(.125, scale), 4);
+
+        // Apply scale transform
+        el.style.transform = `scale(${scale})`;
+      }
+
+      let scale = 1;
+      const el = document.querySelector('div');
+      el.onwheel = zoom;
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/browsercontext.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/browsercontext.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/browsercontext.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/browsercontext.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -18,9 +18,8 @@
 import {
   getTestState,
   setupTestBrowserHooks,
-  itFailsFirefox,
-} from './mocha-utils';
-import utils from './utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import utils from './utils.js';
 
 describe('BrowserContext', function () {
   setupTestBrowserHooks();
@@ -66,7 +65,10 @@
     await page.goto(server.EMPTY_PAGE);
     const [popupTarget] = await Promise.all([
       utils.waitEvent(browser, 'targetcreated'),
-      page.evaluate((url) => window.open(url), server.EMPTY_PAGE),
+      page.evaluate<(url: string) => void>(
+        (url) => window.open(url),
+        server.EMPTY_PAGE
+      ),
     ]);
     expect(popupTarget.browserContext()).toBe(context);
     await context.close();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/browser.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/browser.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/browser.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/browser.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -15,7 +15,7 @@
  */
 
 import expect from 'expect';
-import { getTestState, setupTestBrowserHooks } from './mocha-utils';
+import { getTestState, setupTestBrowserHooks } from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Browser specs', function () {
   setupTestBrowserHooks();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/CDPSession.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/CDPSession.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/CDPSession.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/CDPSession.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import { waitEvent } from './utils';
+import { waitEvent } from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   describeChromeOnly,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describeChromeOnly('Target.createCDPSession', function () {
   setupTestBrowserHooks();
@@ -97,9 +97,9 @@
     expect(error.message).toContain('ThisCommand.DoesNotExist');
 
     async function theSourceOfTheProblems() {
-      // This fails in TS as it knows that command does not exist but we want to
-      // have this tests for our users who consume in JS not TS.
-      // @ts-expect-error
+      // @ts-expect-error This fails in TS as it knows that command does not
+      // exist but we want to have this tests for our users who consume in JS
+      // not TS.
       await client.send('ThisCommand.DoesNotExist');
     }
   });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/chromiumonly.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/chromiumonly.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/chromiumonly.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/chromiumonly.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   describeChromeOnly,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describeChromeOnly('Chromium-Specific Launcher tests', function () {
   describe('Puppeteer.launch |browserURL| option', function () {
@@ -84,7 +84,7 @@
         .connect({ browserURL })
         .catch((error_) => (error = error_));
       expect(error.message).toContain(
-        'Failed to fetch browser webSocket url from'
+        'Failed to fetch browser webSocket URL from'
       );
       originalBrowser.close();
     });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/click.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/click.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/click.spec.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/click.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,8 +20,8 @@
   setupTestPageAndContextHooks,
   setupTestBrowserHooks,
   itFailsFirefox,
-} from './mocha-utils';
-import utils from './utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import utils from './utils.js';
 
 describe('Page.click', function () {
   setupTestBrowserHooks();
@@ -328,7 +328,8 @@
     await frame.click('button');
     expect(await frame.evaluate(() => globalThis.result)).toBe('Clicked');
   });
-  it('should click the button with deviceScaleFactor set',
+  it(
+    'should click the button with deviceScaleFactor set',
     async () => {
       const { page, server } = getTestState();
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/cookies.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/cookies.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/cookies.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/cookies.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   itFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Cookie specs', () => {
   setupTestBrowserHooks();
@@ -389,9 +389,9 @@
 
       await page.goto(server.PREFIX + '/grid.html');
       await page.setCookie({ name: 'localhost-cookie', value: 'best' });
-      await page.evaluate((src) => {
+      await page.evaluate<(src: string) => Promise<void>>((src) => {
         let fulfill;
-        const promise = new Promise((x) => (fulfill = x));
+        const promise = new Promise<void>((x) => (fulfill = x));
         const iframe = document.createElement('iframe');
         document.body.appendChild(iframe);
         iframe.onload = fulfill;
@@ -454,9 +454,9 @@
 
         try {
           await page.goto(httpsServer.PREFIX + '/grid.html');
-          await page.evaluate((src) => {
+          await page.evaluate<(src: string) => Promise<void>>((src) => {
             let fulfill;
-            const promise = new Promise((x) => (fulfill = x));
+            const promise = new Promise<void>((x) => (fulfill = x));
             const iframe = document.createElement('iframe');
             document.body.appendChild(iframe);
             iframe.onload = fulfill;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/coverage.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/coverage.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/coverage.spec.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/coverage.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,7 +20,7 @@
   setupTestPageAndContextHooks,
   setupTestBrowserHooks,
   describeChromeOnly,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Coverage specs', function () {
   describeChromeOnly('JSCoverage', function () {
@@ -264,7 +264,7 @@
       const { page, server } = getTestState();
 
       await page.coverage.startCSSCoverage();
-      await page.evaluate(async (url) => {
+      await page.evaluate<(url: string) => Promise<void>>(async (url) => {
         document.body.textContent = 'hello, world';
 
         const link = document.createElement('link');
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/coverage-utils.js firefox-85.0+build1/remote/test/puppeteer/test/coverage-utils.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test/coverage-utils.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/coverage-utils.js	2021-01-18 19:58:18.000000000 +0000
@@ -34,13 +34,44 @@
 const fs = require('fs');
 
 /**
- * @param {Map<string, boolean>} apiCoverage
- * @param {Object} events
- * @param {string} className
- * @param {!Object} classType
+ * This object is also used by DocLint to know which classes to check are
+ * documented. It's a pretty hacky solution but DocLint is going away soon as
+ * part of the TSDoc migration.
  */
-function traceAPICoverage(apiCoverage, events, className, classType) {
-  className = className.substring(0, 1).toLowerCase() + className.substring(1);
+const MODULES_TO_CHECK_FOR_COVERAGE = {
+  Accessibility: '../lib/cjs/puppeteer/common/Accessibility',
+  Browser: '../lib/cjs/puppeteer/common/Browser',
+  BrowserContext: '../lib/cjs/puppeteer/common/Browser',
+  BrowserFetcher: '../lib/cjs/puppeteer/node/BrowserFetcher',
+  CDPSession: '../lib/cjs/puppeteer/common/Connection',
+  ConsoleMessage: '../lib/cjs/puppeteer/common/ConsoleMessage',
+  Coverage: '../lib/cjs/puppeteer/common/Coverage',
+  Dialog: '../lib/cjs/puppeteer/common/Dialog',
+  ElementHandle: '../lib/cjs/puppeteer/common/JSHandle',
+  ExecutionContext: '../lib/cjs/puppeteer/common/ExecutionContext',
+  EventEmitter: '../lib/cjs/puppeteer/common/EventEmitter',
+  FileChooser: '../lib/cjs/puppeteer/common/FileChooser',
+  Frame: '../lib/cjs/puppeteer/common/FrameManager',
+  JSHandle: '../lib/cjs/puppeteer/common/JSHandle',
+  Keyboard: '../lib/cjs/puppeteer/common/Input',
+  Mouse: '../lib/cjs/puppeteer/common/Input',
+  Page: '../lib/cjs/puppeteer/common/Page',
+  Puppeteer: '../lib/cjs/puppeteer/common/Puppeteer',
+  PuppeteerNode: '../lib/cjs/puppeteer/node/Puppeteer',
+  HTTPRequest: '../lib/cjs/puppeteer/common/HTTPRequest',
+  HTTPResponse: '../lib/cjs/puppeteer/common/HTTPResponse',
+  SecurityDetails: '../lib/cjs/puppeteer/common/SecurityDetails',
+  Target: '../lib/cjs/puppeteer/common/Target',
+  TimeoutError: '../lib/cjs/puppeteer/common/Errors',
+  Touchscreen: '../lib/cjs/puppeteer/common/Input',
+  Tracing: '../lib/cjs/puppeteer/common/Tracing',
+  WebWorker: '../lib/cjs/puppeteer/common/WebWorker',
+};
+
+function traceAPICoverage(apiCoverage, className, modulePath) {
+  const loadedModule = require(modulePath);
+  const classType = loadedModule[className];
+
   if (!classType || !classType.prototype) {
     console.error(
       `Coverage error: could not find class for ${className}. Is src/api.ts up to date?`
@@ -63,8 +94,14 @@
     });
   }
 
-  if (events[classType.name]) {
-    for (const event of Object.values(events[classType.name])) {
+  /**
+   * If classes emit events, those events are exposed via an object in the same
+   * module named XEmittedEvents, where X is the name of the class. For example,
+   * the Page module exposes PageEmittedEvents.
+   */
+  const eventsName = `${className}EmittedEvents`;
+  if (loadedModule[eventsName]) {
+    for (const event of Object.values(loadedModule[eventsName])) {
       if (typeof event !== 'symbol')
         apiCoverage.set(`${className}.emit(${JSON.stringify(event)})`, false);
     }
@@ -108,10 +145,11 @@
 
   return {
     beforeAll: () => {
-      const api = require('../src/api');
-      const events = require('../src/common/Events');
-      for (const [className, classType] of Object.entries(api))
-        traceAPICoverage(coverageMap, events, className, classType);
+      for (const [className, moduleFilePath] of Object.entries(
+        MODULES_TO_CHECK_FOR_COVERAGE
+      )) {
+        traceAPICoverage(coverageMap, className, moduleFilePath);
+      }
     },
     afterAll: () => {
       writeCoverage(coverageMap);
@@ -122,4 +160,5 @@
 module.exports = {
   trackCoverage,
   getCoverageResults,
+  MODULES_TO_CHECK_FOR_COVERAGE,
 };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/defaultbrowsercontext.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/defaultbrowsercontext.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/defaultbrowsercontext.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/defaultbrowsercontext.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   itFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('DefaultBrowserContext', function () {
   setupTestBrowserHooks();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/dialog.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/dialog.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/dialog.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/dialog.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,8 +20,7 @@
   getTestState,
   setupTestPageAndContextHooks,
   setupTestBrowserHooks,
-  itFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Page.Events.Dialog', function () {
   setupTestBrowserHooks();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/elementhandle.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/elementhandle.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/elementhandle.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/elementhandle.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -15,16 +15,15 @@
  */
 
 import expect from 'expect';
+import sinon from 'sinon';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-  describeFailsFirefox,
-  itFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
-import utils from './utils';
-import { ElementHandle } from '../src/common/JSHandle';
+import utils from './utils.js';
+import { ElementHandle } from '../lib/cjs/puppeteer/common/JSHandle.js';
 
 describe('ElementHandle specs', function () {
   setupTestBrowserHooks();
@@ -49,7 +48,7 @@
       const elementHandle = await nestedFrame.$('div');
       const box = await elementHandle.boundingBox();
       if (isChrome)
-        expect(box).toEqual({ x: 28, y: 260, width: 264, height: 18 });
+        expect(box).toEqual({ x: 28, y: 182, width: 264, height: 18 });
       else expect(box).toEqual({ x: 28, y: 182, width: 254, height: 18 });
     });
     it('should return null for invisible elements', async () => {
@@ -67,7 +66,7 @@
         '<div style="width: 100px; height: 100px">hello</div>'
       );
       const elementHandle = await page.$('div');
-      await page.evaluate(
+      await page.evaluate<(element: HTMLElement) => void>(
         (element) => (element.style.height = '200px'),
         elementHandle
       );
@@ -84,7 +83,7 @@
       `);
       const element = await page.$('#therect');
       const pptrBoundingBox = await element.boundingBox();
-      const webBoundingBox = await page.evaluate((e) => {
+      const webBoundingBox = await page.evaluate((e: HTMLElement) => {
         const rect = e.getBoundingClientRect();
         return { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
       }, element);
@@ -198,11 +197,10 @@
       const { page, server } = getTestState();
 
       await page.goto(server.PREFIX + '/input/button.html');
-      const buttonTextNode = await page.evaluateHandle(
+      const buttonTextNode = await page.evaluateHandle<ElementHandle>(
         () => document.querySelector('button').firstChild
       );
       let error = null;
-      // @ts-expect-error
       await buttonTextNode.click().catch((error_) => (error = error_));
       expect(error.message).toBe('Node is not of type HTMLElement');
     });
@@ -211,7 +209,7 @@
 
       await page.goto(server.PREFIX + '/input/button.html');
       const button = await page.$('button');
-      await page.evaluate((button) => button.remove(), button);
+      await page.evaluate((button: HTMLElement) => button.remove(), button);
       let error = null;
       await button.click().catch((error_) => (error = error_));
       expect(error.message).toBe('Node is detached from document');
@@ -221,7 +219,10 @@
 
       await page.goto(server.PREFIX + '/input/button.html');
       const button = await page.$('button');
-      await page.evaluate((button) => (button.style.display = 'none'), button);
+      await page.evaluate(
+        (button: HTMLElement) => (button.style.display = 'none'),
+        button
+      );
       const error = await button.click().catch((error_) => error_);
       expect(error.message).toBe(
         'Node is either not visible or not an HTMLElement'
@@ -233,7 +234,7 @@
       await page.goto(server.PREFIX + '/input/button.html');
       const button = await page.$('button');
       await page.evaluate(
-        (button) => (button.parentElement.style.display = 'none'),
+        (button: HTMLElement) => (button.parentElement.style.display = 'none'),
         button
       );
       const error = await button.click().catch((error_) => error_);
@@ -283,22 +284,29 @@
   describe('Custom queries', function () {
     this.afterEach(() => {
       const { puppeteer } = getTestState();
-      puppeteer.__experimental_clearQueryHandlers();
+      puppeteer.clearCustomQueryHandlers();
     });
     it('should register and unregister', async () => {
       const { page, puppeteer } = getTestState();
       await page.setContent('<div id="not-foo"></div><div id="foo"></div>');
 
       // Register.
-      puppeteer.__experimental_registerCustomQueryHandler(
-        'getById',
-        (element, selector) => document.querySelector(`[id="${selector}"]`)
-      );
+      puppeteer.registerCustomQueryHandler('getById', {
+        queryOne: (element, selector) =>
+          document.querySelector(`[id="${selector}"]`),
+      });
       const element = await page.$('getById/foo');
-      expect(await page.evaluate((element) => element.id, element)).toBe('foo');
+      expect(
+        await page.evaluate<(element: HTMLElement) => string>(
+          (element) => element.id,
+          element
+        )
+      ).toBe('foo');
+      const handlerNamesAfterRegistering = puppeteer.customQueryHandlerNames();
+      expect(handlerNamesAfterRegistering.includes('getById')).toBeTruthy();
 
       // Unregister.
-      puppeteer.__experimental_unregisterCustomQueryHandler('getById');
+      puppeteer.unregisterCustomQueryHandler('getById');
       try {
         await page.$('getById/foo');
         throw new Error('Custom query handler name not set - throw expected');
@@ -309,15 +317,15 @@
           )
         );
       }
+      const handlerNamesAfterUnregistering = puppeteer.customQueryHandlerNames();
+      expect(handlerNamesAfterUnregistering.includes('getById')).toBeFalsy();
     });
     it('should throw with invalid query names', () => {
       try {
         const { puppeteer } = getTestState();
-        puppeteer.__experimental_registerCustomQueryHandler(
-          '1/2/3',
-          // @ts-expect-error
-          () => {}
-        );
+        puppeteer.registerCustomQueryHandler('1/2/3', {
+          queryOne: () => document.querySelector('foo'),
+        });
         throw new Error(
           'Custom query handler name was invalid - throw expected'
         );
@@ -332,15 +340,18 @@
       await page.setContent(
         '<div id="not-foo"></div><div class="foo">Foo1</div><div class="foo baz">Foo2</div>'
       );
-      puppeteer.__experimental_registerCustomQueryHandler(
-        'getByClass',
-        (element, selector) => document.querySelectorAll(`.${selector}`)
-      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryAll: (element, selector) =>
+          document.querySelectorAll(`.${selector}`),
+      });
       const elements = await page.$$('getByClass/foo');
       const classNames = await Promise.all(
         elements.map(
           async (element) =>
-            await page.evaluate((element) => element.className, element)
+            await page.evaluate<(element: HTMLElement) => string>(
+              (element) => element.className,
+              element
+            )
         )
       );
 
@@ -351,10 +362,10 @@
       await page.setContent(
         '<div id="not-foo"></div><div class="foo">Foo1</div><div class="foo baz">Foo2</div>'
       );
-      puppeteer.__experimental_registerCustomQueryHandler(
-        'getByClass',
-        (element, selector) => document.querySelectorAll(`.${selector}`)
-      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryAll: (element, selector) =>
+          document.querySelectorAll(`.${selector}`),
+      });
       const elements = await page.$$eval(
         'getByClass/foo',
         (divs) => divs.length
@@ -364,10 +375,9 @@
     });
     it('should wait correctly with waitForSelector', async () => {
       const { page, puppeteer } = getTestState();
-      puppeteer.__experimental_registerCustomQueryHandler(
-        'getByClass',
-        (element, selector) => element.querySelector(`.${selector}`)
-      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryOne: (element, selector) => element.querySelector(`.${selector}`),
+      });
       const waitFor = page.waitForSelector('getByClass/foo');
 
       // Set the page content after the waitFor has been started.
@@ -378,12 +388,14 @@
 
       expect(element).toBeDefined();
     });
+
     it('should wait correctly with waitFor', async () => {
+      /* page.waitFor is deprecated so we silence the warning to avoid test noise */
+      sinon.stub(console, 'warn').callsFake(() => {});
       const { page, puppeteer } = getTestState();
-      puppeteer.__experimental_registerCustomQueryHandler(
-        'getByClass',
-        (element, selector) => element.querySelector(`.${selector}`)
-      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryOne: (element, selector) => element.querySelector(`.${selector}`),
+      });
       const waitFor = page.waitFor('getByClass/foo');
 
       // Set the page content after the waitFor has been started.
@@ -394,5 +406,44 @@
 
       expect(element).toBeDefined();
     });
+    it('should work when both queryOne and queryAll are registered', async () => {
+      const { page, puppeteer } = getTestState();
+      await page.setContent(
+        '<div id="not-foo"></div><div class="foo"><div id="nested-foo" class="foo"/></div><div class="foo baz">Foo2</div>'
+      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryOne: (element, selector) => element.querySelector(`.${selector}`),
+        queryAll: (element, selector) =>
+          element.querySelectorAll(`.${selector}`),
+      });
+
+      const element = await page.$('getByClass/foo');
+      expect(element).toBeDefined();
+
+      const elements = await page.$$('getByClass/foo');
+      expect(elements.length).toBe(3);
+    });
+    it('should eval when both queryOne and queryAll are registered', async () => {
+      const { page, puppeteer } = getTestState();
+      await page.setContent(
+        '<div id="not-foo"></div><div class="foo">text</div><div class="foo baz">content</div>'
+      );
+      puppeteer.registerCustomQueryHandler('getByClass', {
+        queryOne: (element, selector) => element.querySelector(`.${selector}`),
+        queryAll: (element, selector) =>
+          element.querySelectorAll(`.${selector}`),
+      });
+
+      const txtContent = await page.$eval(
+        'getByClass/foo',
+        (div) => div.textContent
+      );
+      expect(txtContent).toBe('text');
+
+      const txtContents = await page.$$eval('getByClass/foo', (divs) =>
+        divs.map((d) => d.textContent).join('')
+      );
+      expect(txtContents).toBe('textcontent');
+    });
   });
 });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/emulation.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/emulation.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/emulation.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/emulation.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Emulation', () => {
   setupTestBrowserHooks();
@@ -88,18 +88,15 @@
         'YES'
       );
     });
-    it(
-      'should detect touch when applying viewport with touches',
-      async () => {
-        const { page, server } = getTestState();
-
-        await page.setViewport({ width: 800, height: 600, hasTouch: true });
-        await page.addScriptTag({ url: server.PREFIX + '/modernizr.js' });
-        expect(
-          await page.evaluate(() => globalThis.Modernizr.touchevents)
-        ).toBe(true);
-      }
-    );
+    it('should detect touch when applying viewport with touches', async () => {
+      const { page, server } = getTestState();
+
+      await page.setViewport({ width: 800, height: 600, hasTouch: true });
+      await page.addScriptTag({ url: server.PREFIX + '/modernizr.js' });
+      expect(await page.evaluate(() => globalThis.Modernizr.touchevents)).toBe(
+        true
+      );
+    });
     it('should support landscape emulation', async () => {
       const { page, server } = getTestState();
 
@@ -136,7 +133,7 @@
       await page.goto(server.PREFIX + '/input/button.html');
       const button = await page.$('button');
       await page.evaluate(
-        (button) => (button.style.marginTop = '200px'),
+        (button: HTMLElement) => (button.style.marginTop = '200px'),
         button
       );
       await button.click();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/.eslintrc.js firefox-85.0+build1/remote/test/puppeteer/test/.eslintrc.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test/.eslintrc.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/.eslintrc.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,13 @@
+module.exports = {
+  rules: {
+    'no-restricted-imports': [
+      'error',
+      {
+        /** The mocha tests run on the compiled output in the /lib directory
+         * so we should avoid importing from src.
+         */
+        patterns: ['*src*'],
+      },
+    ],
+  },
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/evaluation.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/evaluation.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/evaluation.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/evaluation.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 const bigint = typeof BigInt !== 'undefined';
 
@@ -38,7 +38,7 @@
     (bigint ? it : xit)('should transfer BigInt', async () => {
       const { page } = getTestState();
 
-      const result = await page.evaluate((a) => a, BigInt(42));
+      const result = await page.evaluate((a: BigInt) => a, BigInt(42));
       expect(result).toBe(BigInt(42));
     });
     it('should transfer NaN', async () => {
@@ -153,7 +153,11 @@
 
       // Setup inpage callback, which calls Page.evaluate
       await page.exposeFunction('callController', async function (a, b) {
-        return await page.evaluate((a, b) => a * b, a, b);
+        return await page.evaluate<(a: number, b: number) => number>(
+          (a, b) => a * b,
+          a,
+          b
+        );
       });
       const result = await page.evaluate(async function () {
         return await globalThis.callController(9, 3);
@@ -275,7 +279,7 @@
         .jsonValue()
         .catch((error_) => error_.message);
       const error = await page
-        .evaluate<Error>((errorText) => {
+        .evaluate<(errorText: string) => Error>((errorText) => {
           throw new Error(errorText);
         }, errorText)
         .catch((error_) => error_);
@@ -304,7 +308,10 @@
 
       await page.setContent('<section>42</section>');
       const element = await page.$('section');
-      const text = await page.evaluate((e) => e.textContent, element);
+      const text = await page.evaluate<(e: HTMLElement) => string>(
+        (e) => e.textContent,
+        element
+      );
       expect(text).toBe('42');
     });
     it('should throw if underlying element was disposed', async () => {
@@ -316,7 +323,7 @@
       await element.dispose();
       let error = null;
       await page
-        .evaluate((e) => e.textContent, element)
+        .evaluate((e: HTMLElement) => e.textContent, element)
         .catch((error_) => (error = error_));
       expect(error.message).toContain('JSHandle is disposed');
     });
@@ -329,7 +336,7 @@
         const bodyHandle = await page.frames()[1].$('body');
         let error = null;
         await page
-          .evaluate((body) => body.innerHTML, bodyHandle)
+          .evaluate((body: HTMLElement) => body.innerHTML, bodyHandle)
           .catch((error_) => (error = error_));
         expect(error).toBeTruthy();
         expect(error.message).toContain(
@@ -377,7 +384,7 @@
     it('should transfer 100Mb of data from page to node.js', async function () {
       const { page } = getTestState();
 
-      const a = await page.evaluate<any[]>(() =>
+      const a = await page.evaluate<() => string>(() =>
         Array(100 * 1024 * 1024 + 1).join('a')
       );
       expect(a.length).toBe(100 * 1024 * 1024);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/EventEmitter.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/EventEmitter.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/EventEmitter.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/EventEmitter.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { EventEmitter } from '../src/common/EventEmitter';
+import { EventEmitter } from '../lib/cjs/puppeteer/common/EventEmitter.js';
 import sinon from 'sinon';
 import expect from 'expect';
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/fixtures.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/fixtures.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/fixtures.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/fixtures.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -17,7 +17,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
 import expect from 'expect';
-import { getTestState, itChromeOnly } from './mocha-utils';
+import { getTestState, itChromeOnly } from './mocha-utils'; // eslint-disable-line import/extensions
 
 import path from 'path';
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/frame.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/frame.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/frame.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/frame.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Frame specs', function () {
   setupTestBrowserHooks();
@@ -75,7 +75,7 @@
       let error = null;
       await frame1.evaluate(() => 7 * 8).catch((error_) => (error = error_));
       expect(error.message).toContain(
-        'Execution Context is not available in detached frame'
+        'Execution context is not available in detached frame'
       );
     });
   });
@@ -199,7 +199,7 @@
       const { page, server } = getTestState();
 
       await page.goto(server.PREFIX + '/shadow.html');
-      await page.evaluate(async (url) => {
+      await page.evaluate(async (url: string) => {
         const frame = document.createElement('iframe');
         frame.src = url;
         document.body.shadowRoot.appendChild(frame);
@@ -212,7 +212,7 @@
       const { page, server } = getTestState();
 
       await utils.attachFrame(page, 'theFrameId', server.EMPTY_PAGE);
-      await page.evaluate((url) => {
+      await page.evaluate((url: string) => {
         const frame = document.createElement('iframe');
         frame.name = 'theFrameName';
         frame.src = url;
@@ -255,5 +255,15 @@
         expect(frame1).not.toBe(frame2);
       }
     );
+    it('should support url fragment', async () => {
+      const { page, server } = getTestState();
+
+      await page.goto(server.PREFIX + '/frames/one-frame-url-fragment.html');
+
+      expect(page.frames().length).toBe(2);
+      expect(page.frames()[1].url()).toBe(
+        server.PREFIX + '/frames/frame.html?param=value#fragment'
+      );
+    });
   });
 });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/headful.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/headful.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/headful.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/headful.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -23,7 +23,7 @@
   getTestState,
   describeChromeOnly,
   itFailsWindows,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 import rimraf from 'rimraf';
 
 const rmAsync = promisify(rimraf);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/idle_override.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/idle_override.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/idle_override.spec.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/idle_override.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,93 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import expect from 'expect';
+import {
+  getTestState,
+  setupTestBrowserHooks,
+  setupTestPageAndContextHooks,
+} from './mocha-utils'; // eslint-disable-line import/extensions
+
+describe('Emulate idle state', () => {
+  setupTestBrowserHooks();
+  setupTestPageAndContextHooks();
+
+  async function getIdleState() {
+    const { page } = getTestState();
+
+    const stateElement = await page.$('#state');
+    return await page.evaluate((element: HTMLElement) => {
+      return element.innerText;
+    }, stateElement);
+  }
+
+  async function verifyState(expectedState: string) {
+    const actualState = await getIdleState();
+    expect(actualState).toEqual(expectedState);
+  }
+
+  it('changing idle state emulation causes change of the IdleDetector state', async () => {
+    const { page, server, context } = getTestState();
+    await context.overridePermissions(server.PREFIX + '/idle-detector.html', [
+      'idle-detection',
+    ]);
+
+    await page.goto(server.PREFIX + '/idle-detector.html');
+
+    // Store initial state, as soon as it is not guaranteed to be `active, unlocked`.
+    const initialState = await getIdleState();
+
+    // Emulate Idle states and verify IdleDetector updates state accordingly.
+    await page.emulateIdleState({
+      isUserActive: false,
+      isScreenUnlocked: false,
+    });
+    await verifyState('Idle state: idle, locked.');
+
+    await page.emulateIdleState({
+      isUserActive: true,
+      isScreenUnlocked: false,
+    });
+    await verifyState('Idle state: active, locked.');
+
+    await page.emulateIdleState({
+      isUserActive: true,
+      isScreenUnlocked: true,
+    });
+    await verifyState('Idle state: active, unlocked.');
+
+    await page.emulateIdleState({
+      isUserActive: false,
+      isScreenUnlocked: true,
+    });
+    await verifyState('Idle state: idle, unlocked.');
+
+    // Remove Idle emulation and verify IdleDetector is in initial state.
+    await page.emulateIdleState();
+    await verifyState(initialState);
+
+    // Emulate idle state again after removing emulation.
+    await page.emulateIdleState({
+      isUserActive: false,
+      isScreenUnlocked: false,
+    });
+    await verifyState('Idle state: idle, locked.');
+
+    // Remove emulation second time.
+    await page.emulateIdleState();
+    await verifyState(initialState);
+  });
+});
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/ignorehttpserrors.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/ignorehttpserrors.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/ignorehttpserrors.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/ignorehttpserrors.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -17,7 +17,7 @@
 import expect from 'expect';
 import {
   getTestState,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('ignoreHTTPSErrors', function () {
   /* Note that this test creates its own browser rather than use
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/input.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/input.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/input.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/input.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -21,7 +21,7 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   describeFailsFirefox,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 const FILE_TO_UPLOAD = path.join(__dirname, '/assets/file-to-upload.txt');
 
@@ -36,7 +36,7 @@
       await page.goto(server.PREFIX + '/input/fileupload.html');
       const filePath = path.relative(process.cwd(), FILE_TO_UPLOAD);
       const input = await page.$('input');
-      await page.evaluate((e) => {
+      await page.evaluate((e: HTMLElement) => {
         globalThis._inputEvents = [];
         e.addEventListener('change', (ev) =>
           globalThis._inputEvents.push(ev.type)
@@ -46,18 +46,18 @@
         );
       }, input);
       await input.uploadFile(filePath);
-      expect(await page.evaluate((e) => e.files[0].name, input)).toBe(
-        'file-to-upload.txt'
-      );
-      expect(await page.evaluate((e) => e.files[0].type, input)).toBe(
-        'text/plain'
-      );
+      expect(
+        await page.evaluate((e: HTMLInputElement) => e.files[0].name, input)
+      ).toBe('file-to-upload.txt');
+      expect(
+        await page.evaluate((e: HTMLInputElement) => e.files[0].type, input)
+      ).toBe('text/plain');
       expect(await page.evaluate(() => globalThis._inputEvents)).toEqual([
         'input',
         'change',
       ]);
       expect(
-        await page.evaluate((e) => {
+        await page.evaluate((e: HTMLInputElement) => {
           const reader = new FileReader();
           const promise = new Promise((fulfill) => (reader.onload = fulfill));
           reader.readAsText(e.files[0]);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/jshandle.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/jshandle.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/jshandle.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/jshandle.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('JSHandle', function () {
   setupTestBrowserHooks();
@@ -36,7 +36,10 @@
       const { page } = getTestState();
 
       const navigatorHandle = await page.evaluateHandle(() => navigator);
-      const text = await page.evaluate((e) => e.userAgent, navigatorHandle);
+      const text = await page.evaluate(
+        (e: Navigator) => e.userAgent,
+        navigatorHandle
+      );
       expect(text).toContain('Mozilla');
     });
     it('should accept object handle to primitive types', async () => {
@@ -74,7 +77,9 @@
         globalThis.FOO = 123;
         return window;
       });
-      expect(await page.evaluate((e) => e.FOO, aHandle)).toBe(123);
+      expect(await page.evaluate((e: { FOO: number }) => e.FOO, aHandle)).toBe(
+        123
+      );
     });
     it('should work with primitives', async () => {
       const { page } = getTestState();
@@ -83,7 +88,9 @@
         globalThis.FOO = 123;
         return window;
       });
-      expect(await page.evaluate((e) => e.FOO, aHandle)).toBe(123);
+      expect(await page.evaluate((e: { FOO: number }) => e.FOO, aHandle)).toBe(
+        123
+      );
     });
   });
 
@@ -192,7 +199,10 @@
       const element = aHandle.asElement();
       expect(element).toBeTruthy();
       expect(
-        await page.evaluate((e) => e.nodeType === Node.TEXT_NODE, element)
+        await page.evaluate(
+          (e: HTMLElement) => e.nodeType === Node.TEXT_NODE,
+          element
+        )
       );
     });
   });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/keyboard.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/keyboard.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/keyboard.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/keyboard.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
 import os from 'os';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
-import { KeyInput } from '../src/common/USKeyboardLayout';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import { KeyInput } from '../lib/cjs/puppeteer/common/USKeyboardLayout.js';
 
 describe('Keyboard', function () {
   setupTestBrowserHooks();
@@ -332,16 +332,16 @@
     const { page } = getTestState();
 
     let error = await page.keyboard
-      // @ts-expect-error
+      // @ts-expect-error bad input
       .press('NotARealKey')
       .catch((error_) => error_);
     expect(error.message).toBe('Unknown key: "NotARealKey"');
 
-    // @ts-expect-error
+    // @ts-expect-error bad input
     error = await page.keyboard.press('Ñ‘').catch((error_) => error_);
     expect(error && error.message).toBe('Unknown key: "Ñ‘"');
 
-    // @ts-expect-error
+    // @ts-expect-error bad input
     error = await page.keyboard.press('😊').catch((error_) => error_);
     expect(error && error.message).toBe('Unknown key: "😊"');
   });
@@ -386,7 +386,15 @@
       });
     });
     await page.keyboard.press('Meta');
-    const [key, code, metaKey] = await page.evaluate('result');
+    // Have to do this because we lose a lot of type info when evaluating a
+    // string not a function. This is why functions are recommended rather than
+    // using strings (although we'll leave this test so we have coverage of both
+    // approaches.)
+    const [key, code, metaKey] = (await page.evaluate('result')) as [
+      string,
+      string,
+      boolean
+    ];
     if (isFirefox && os.platform() !== 'darwin') expect(key).toBe('OS');
     else expect(key).toBe('Meta');
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/launcher.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/launcher.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/launcher.spec.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/launcher.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -21,21 +21,21 @@
 import {
   getTestState,
   itOnlyRegularInstall,
-  itFailsWindowsUntilDate,
-} from './mocha-utils';
-import utils from './utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import utils from './utils.js';
 import expect from 'expect';
 import rimraf from 'rimraf';
-import { Page } from '../src/common/Page';
+import { Page } from '../lib/cjs/puppeteer/common/Page.js';
 
 const rmAsync = promisify(rimraf);
 const mkdtempAsync = promisify(fs.mkdtemp);
 const readFileAsync = promisify(fs.readFile);
 const statAsync = promisify(fs.stat);
 const TMP_FOLDER = path.join(os.tmpdir(), 'pptr_tmp_folder-');
+const FIREFOX_TIMEOUT = 30 * 1000;
 
 describe('Launcher specs', function () {
-  if (getTestState().isFirefox) this.timeout(30 * 1000);
+  if (getTestState().isFirefox) this.timeout(FIREFOX_TIMEOUT);
 
   describe('Puppeteer', function () {
     describe('BrowserFetcher', function () {
@@ -304,7 +304,7 @@
             '--headless'
           );
           expect(puppeteer.defaultArgs({ userDataDir: 'foo' })).toContain(
-            '--user-data-dir=foo'
+            `--user-data-dir=${path.resolve('foo')}`
           );
         } else if (isFirefox) {
           expect(puppeteer.defaultArgs()).toContain('--headless');
@@ -328,7 +328,7 @@
             '-profile'
           );
           expect(puppeteer.defaultArgs({ userDataDir: 'foo' })).toContain(
-            'foo'
+            path.resolve('foo')
           );
         }
       });
@@ -440,6 +440,8 @@
 
       after(async () => {
         const { puppeteer } = getTestState();
+        // @ts-expect-error launcher is a private property that users can't
+        // touch, but for testing purposes we need to reset it.
         puppeteer._lazyLauncher = undefined;
         puppeteer._productName = productName;
       });
@@ -455,6 +457,7 @@
       it('falls back to launching chrome if there is an unknown product but logs a warning', async () => {
         const { puppeteer } = getTestState();
         const consoleStub = sinon.stub(console, 'warn');
+        // @ts-expect-error purposeful bad input
         const browser = await puppeteer.launch({ product: 'SO_NOT_A_PRODUCT' });
         const userAgent = await browser.userAgent();
         await browser.close();
@@ -466,19 +469,17 @@
       });
 
       /* We think there's a bug in the FF Windows launcher, or some
-       * combo of that plus it running on CI, but we're deferring fixing
-       * this so we can get Windows CI stable and then dig into this
-       * properly with help from the Mozilla folks.
+       * combo of that plus it running on CI, but it's hard to track down.
+       * See comment here: https://github.com/puppeteer/puppeteer/issues/5673#issuecomment-670141377.
        */
-      itOnlyRegularInstall('should be able to launch Firefox',
-        async () => {
-          const { puppeteer } = getTestState();
-          const browser = await puppeteer.launch({ product: 'firefox' });
-          const userAgent = await browser.userAgent();
-          await browser.close();
-          expect(userAgent).toContain('Firefox');
-        }
-      );
+      itOnlyRegularInstall('should be able to launch Firefox', async function () {
+        this.timeout(FIREFOX_TIMEOUT);
+        const { puppeteer } = getTestState();
+        const browser = await puppeteer.launch({ product: 'firefox' });
+        const userAgent = await browser.userAgent();
+        await browser.close();
+        expect(userAgent).toContain('Firefox');
+      });
     });
 
     describe('Puppeteer.connect', function () {
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/mocha-ts-require.js firefox-85.0+build1/remote/test/puppeteer/test/mocha-ts-require.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test/mocha-ts-require.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/mocha-ts-require.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+const path = require('path');
+
+require('ts-node').register({
+  /**
+   * We ignore the lib/ directory because that's already been TypeScript
+   * compiled and checked. So we don't want to check it again as part of running
+   * the unit tests.
+   */
+  ignore: ['lib/*', 'node_modules'],
+  project: path.join(__dirname, 'tsconfig.test.json'),
+});
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/mocha-utils.ts firefox-85.0+build1/remote/test/puppeteer/test/mocha-utils.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/mocha-utils.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/mocha-utils.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
-import { TestServer } from '../utils/testserver/index';
+import { TestServer } from '../utils/testserver/index.js';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as os from 'os';
 import sinon from 'sinon';
-import puppeteer from '../src/index';
-import { Browser, BrowserContext } from '../src/common/Browser';
-import { Page } from '../src/common/Page';
-import { Puppeteer } from '../src/common/Puppeteer';
-import utils from './utils';
+import puppeteer from '../lib/cjs/puppeteer/node.js';
+import {
+  Browser,
+  BrowserContext,
+} from '../lib/cjs/puppeteer/common/Browser.js';
+import { Page } from '../lib/cjs/puppeteer/common/Page.js';
+import { PuppeteerNode } from '../lib/cjs/puppeteer/node/Puppeteer.js';
+import utils from './utils.js';
 import rimraf from 'rimraf';
 
-import { trackCoverage } from './coverage-utils';
+import { trackCoverage } from './coverage-utils.js';
 
 const setupServer = async () => {
   const assetsPath = path.join(__dirname, 'assets');
@@ -89,8 +92,11 @@
       `WARN: running ${product} tests with ${defaultBrowserOptions.executablePath}`
     );
   } else {
-    // TODO(jackfranklin): declare updateRevision in some form for the Firefox launcher.
-    // @ts-expect-error
+    // TODO(jackfranklin): declare updateRevision in some form for the Firefox
+    // launcher.
+    // @ts-expect-error _updateRevision is defined on the FF launcher
+    // but not the Chrome one. The types need tidying so that TS can infer that
+    // properly and not error here.
     if (product === 'firefox') await puppeteer._launcher._updateRevision();
     const executablePath = puppeteer.executablePath();
     if (!fs.existsSync(executablePath))
@@ -120,7 +126,7 @@
   browser: Browser;
   context: BrowserContext;
   page: Page;
-  puppeteer: Puppeteer;
+  puppeteer: PuppeteerNode;
   defaultBrowserOptions: {
     [x: string]: any;
   };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/mouse.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/mouse.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/mouse.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/mouse.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,8 +19,8 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
-import { KeyInput } from '../src/common/USKeyboardLayout';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import { KeyInput } from '../lib/cjs/puppeteer/common/USKeyboardLayout.js';
 
 interface Dimensions {
   x: number;
@@ -60,7 +60,7 @@
       });
     });
     await page.mouse.click(50, 60);
-    const event = await page.evaluate<MouseEvent>(
+    const event = await page.evaluate<() => MouseEvent>(
       () => globalThis.clickPromise
     );
     expect(event.type).toBe('click');
@@ -74,13 +74,15 @@
     const { page, server } = getTestState();
 
     await page.goto(server.PREFIX + '/input/textarea.html');
-    const { x, y, width, height } = await page.evaluate<Dimensions>(dimensions);
+    const { x, y, width, height } = await page.evaluate<() => Dimensions>(
+      dimensions
+    );
     const mouse = page.mouse;
     await mouse.move(x + width - 4, y + height - 4);
     await mouse.down();
     await mouse.move(x + width + 100, y + height + 100);
     await mouse.up();
-    const newDimensions = await page.evaluate<Dimensions>(dimensions);
+    const newDimensions = await page.evaluate<() => Dimensions>(dimensions);
     expect(newDimensions.width).toBe(Math.round(width + 104));
     expect(newDimensions.height).toBe(Math.round(height + 104));
   });
@@ -162,16 +164,41 @@
     for (const [modifier, key] of modifiers) {
       await page.keyboard.down(modifier);
       await page.click('#button-3');
-      if (!(await page.evaluate((mod) => globalThis.lastEvent[mod], key)))
+      if (
+        !(await page.evaluate((mod: string) => globalThis.lastEvent[mod], key))
+      )
         throw new Error(key + ' should be true');
       await page.keyboard.up(modifier);
     }
     await page.click('#button-3');
     for (const [modifier, key] of modifiers) {
-      if (await page.evaluate((mod) => globalThis.lastEvent[mod], key))
+      if (await page.evaluate((mod: string) => globalThis.lastEvent[mod], key))
         throw new Error(modifiers[modifier] + ' should be false');
     }
   });
+  it('should send mouse wheel events', async () => {
+    const { page, server } = getTestState();
+
+    await page.goto(server.PREFIX + '/input/wheel.html');
+    const elem = await page.$('div');
+    const boundingBoxBefore = await elem.boundingBox();
+    expect(boundingBoxBefore).toMatchObject({
+      width: 115,
+      height: 115,
+    });
+
+    await page.mouse.move(
+      boundingBoxBefore.x + boundingBoxBefore.width / 2,
+      boundingBoxBefore.y + boundingBoxBefore.height / 2
+    );
+
+    await page.mouse.wheel({ deltaY: -100 });
+    const boundingBoxAfter = await elem.boundingBox();
+    expect(boundingBoxAfter).toMatchObject({
+      width: 230,
+      height: 230,
+    });
+  });
   it('should tween mouse movement', async () => {
     const { page } = getTestState();
 
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/navigation.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/navigation.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/navigation.spec.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/navigation.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 import os from 'os';
 
 describe('navigation', function () {
@@ -191,7 +191,7 @@
 
       let error = null;
       await page
-        // @ts-expect-error
+        // @ts-expect-error purposefully passing an old option
         .goto(server.EMPTY_PAGE, { waitUntil: 'networkidle' })
         .catch((error_) => (error = error_));
       expect(error.message).toContain(
@@ -493,7 +493,7 @@
       const [response] = await Promise.all([
         page.waitForNavigation(),
         page.evaluate(
-          (url) => (window.location.href = url),
+          (url: string) => (window.location.href = url),
           server.PREFIX + '/grid.html'
         ),
       ]);
@@ -731,7 +731,7 @@
       const [response] = await Promise.all([
         frame.waitForNavigation(),
         frame.evaluate(
-          (url) => (window.location.href = url),
+          (url: string) => (window.location.href = url),
           server.PREFIX + '/grid.html'
         ),
       ]);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/network.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/network.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/network.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/network.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -16,13 +16,13 @@
 
 import fs from 'fs';
 import path from 'path';
-import utils from './utils';
+import utils from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('network', function () {
   setupTestBrowserHooks();
@@ -514,7 +514,7 @@
 
       let error = null;
       try {
-        // @ts-expect-error
+        // @ts-expect-error purposeful bad input
         await page.setExtraHTTPHeaders({ foo: 1 });
       } catch (error_) {
         error = error_;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/oopif.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/oopif.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/oopif.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/oopif.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -15,7 +15,7 @@
  */
 
 import expect from 'expect';
-import { getTestState, describeChromeOnly } from './mocha-utils';
+import { getTestState, describeChromeOnly } from './mocha-utils'; // eslint-disable-line import/extensions
 
 describeChromeOnly('OOPIF', function () {
   /* We use a special browser for this test as we need the --site-per-process flag */
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/page.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/page.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/page.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/page.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -15,7 +15,7 @@
  */
 import fs from 'fs';
 import path from 'path';
-import utils from './utils';
+import utils from './utils.js';
 const { waitEvent } = utils;
 import expect from 'expect';
 import sinon from 'sinon';
@@ -24,8 +24,9 @@
   itFailsFirefox,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
-import { Page, Metrics } from '../src/common/Page';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import { Page, Metrics } from '../lib/cjs/puppeteer/common/Page.js';
+import { JSHandle } from '../lib/cjs/puppeteer/common/JSHandle.js';
 
 describe('Page', function () {
   setupTestBrowserHooks();
@@ -118,21 +119,6 @@
     });
   });
 
-  describe('Async stacks', () => {
-    it('should work', async () => {
-      const { page, server } = getTestState();
-
-      server.setRoute('/empty.html', (req, res) => {
-        res.statusCode = 204;
-        res.end();
-      });
-      let error = null;
-      await page.goto(server.EMPTY_PAGE).catch((error_) => (error = error_));
-      expect(error).not.toBe(null);
-      expect(error.stack).toContain(__filename);
-    });
-  });
-
   // This test fails on Firefox on CI consistently but cannot be replicated
   // locally. Skipping for now to unblock the Mitt release and given FF support
   // isn't fully done yet but raising an issue to ask the FF folks to have a
@@ -259,7 +245,6 @@
       await page.goto(server.EMPTY_PAGE);
       let error = null;
       await context
-        // @ts-expect-error
         .overridePermissions(server.EMPTY_PAGE, ['foo'])
         .catch((error_) => (error = error_));
       expect(error.message).toBe('Unknown permission: foo');
@@ -411,7 +396,7 @@
       const prototypeHandle = await page.evaluateHandle(() => Set.prototype);
       const objectsHandle = await page.queryObjects(prototypeHandle);
       const count = await page.evaluate(
-        (objects) => objects.length,
+        (objects: JSHandle[]) => objects.length,
         objectsHandle
       );
       expect(count).toBe(1);
@@ -430,7 +415,7 @@
       const prototypeHandle = await page.evaluateHandle(() => Set.prototype);
       const objectsHandle = await page.queryObjects(prototypeHandle);
       const count = await page.evaluate(
-        (objects) => objects.length,
+        (objects: JSHandle[]) => objects.length,
         objectsHandle
       );
       expect(count).toBe(1);
@@ -474,6 +459,13 @@
       ]);
       expect(message.text()).toEqual('hello 5 JSHandle@object');
       expect(message.type()).toEqual('log');
+      expect(message.args()).toHaveLength(3);
+      expect(message.location()).toEqual({
+        url: expect.any(String),
+        lineNumber: expect.any(Number),
+        columnNumber: expect.any(Number),
+      });
+
       expect(await message.args()[0].jsonValue()).toEqual('hello');
       expect(await message.args()[1].jsonValue()).toEqual(5);
       expect(await message.args()[2].jsonValue()).toEqual({ foo: 'bar' });
@@ -529,7 +521,7 @@
       const [message] = await Promise.all([
         waitEvent(page, 'console'),
         page.evaluate(
-          async (url) => fetch(url).catch(() => {}),
+          async (url: string) => fetch(url).catch(() => {}),
           server.EMPTY_PAGE
         ),
       ]);
@@ -554,7 +546,7 @@
         lineNumber: undefined,
       });
     });
-    it('should have location for console API calls', async () => {
+    it('should have location and stack trace for console API calls', async () => {
       const { page, server, isChrome } = getTestState();
 
       await page.goto(server.EMPTY_PAGE);
@@ -566,9 +558,26 @@
       expect(message.type()).toBe('log');
       expect(message.location()).toEqual({
         url: server.PREFIX + '/consolelog.html',
-        lineNumber: 7,
-        columnNumber: isChrome ? 14 : 6, // console.|log vs |console.log
+        lineNumber: 8,
+        columnNumber: isChrome ? 16 : 8, // console.|log vs |console.log
       });
+      expect(message.stackTrace()).toEqual([
+        {
+          url: server.PREFIX + '/consolelog.html',
+          lineNumber: 8,
+          columnNumber: isChrome ? 16 : 8, // console.|log vs |console.log
+        },
+        {
+          url: server.PREFIX + '/consolelog.html',
+          lineNumber: 11,
+          columnNumber: 8,
+        },
+        {
+          url: server.PREFIX + '/consolelog.html',
+          lineNumber: 13,
+          columnNumber: 6,
+        },
+      ]);
     });
     // @see https://github.com/puppeteer/puppeteer/issues/3865
     it('should not throw when there are console messages in detached iframes', async () => {
@@ -901,8 +910,8 @@
       await page.exposeFunction('complexObject', function (a, b) {
         return { x: a.x + b.x };
       });
-      const result = await page.evaluate<{ x: number }>(async () =>
-        globalThis.complexObject({ x: 5 }, { x: 2 })
+      const result = await page.evaluate<() => Promise<{ x: number }>>(
+        async () => globalThis.complexObject({ x: 5 }, { x: 2 })
       );
       expect(result.x).toBe(7);
     });
@@ -1159,7 +1168,7 @@
 
       let error = null;
       try {
-        // @ts-expect-error
+        // @ts-expect-error purposefully passing bad options
         await page.addScriptTag('/injectedfile.js');
       } catch (error_) {
         error = error_;
@@ -1288,7 +1297,7 @@
 
       let error = null;
       try {
-        // @ts-expect-error
+        // @ts-expect-error purposefully passing bad input
         await page.addStyleTag('/injectedstyle.css');
       } catch (error_) {
         error = error_;
@@ -1348,7 +1357,7 @@
       });
       const styleHandle = await page.$('style');
       const styleContent = await page.evaluate(
-        (style) => style.innerHTML,
+        (style: HTMLStyleElement) => style.innerHTML,
         styleHandle
       );
       expect(styleContent).toContain(path.join('assets', 'injectedstyle.css'));
@@ -1642,7 +1651,7 @@
       await page.setContent('<select><option value="12"/></select>');
       let error = null;
       try {
-        // @ts-expect-error
+        // @ts-expect-error purposefully passing bad input
         await page.select('select', 12);
       } catch (error_) {
         error = error_;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/queryselector.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/queryselector.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/queryselector.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/queryselector.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -18,7 +18,8 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import { CustomQueryHandler } from '../lib/cjs/puppeteer/common/QueryHandler.js';
 
 describe('querySelector', function () {
   setupTestBrowserHooks();
@@ -67,6 +68,48 @@
     });
   });
 
+  describe('pierceHandler', function () {
+    beforeEach(async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        `<script>
+        const div = document.createElement('div');
+        const shadowRoot = div.attachShadow({mode: 'open'});
+        const div1 = document.createElement('div');
+        div1.textContent = 'Hello';
+        div1.className = 'foo';
+        const div2 = document.createElement('div');
+        div2.textContent = 'World';
+        div2.className = 'foo';
+        shadowRoot.appendChild(div1);
+        shadowRoot.appendChild(div2);
+        document.documentElement.appendChild(div);
+        </script>`
+      );
+    });
+    it('should find first element in shadow', async () => {
+      const { page } = getTestState();
+      const div = await page.$('pierce/.foo');
+      const text = await div.evaluate(
+        (element: Element) => element.textContent
+      );
+      expect(text).toBe('Hello');
+    });
+    it('should find all elements in shadow', async () => {
+      const { page } = getTestState();
+      const divs = await page.$$('pierce/.foo');
+      const text = await Promise.all(
+        divs.map((div) =>
+          div.evaluate((element: Element) => element.textContent)
+        )
+      );
+      expect(text.join(' ')).toBe('Hello World');
+    });
+  });
+
+  // The tests for $$eval are repeated later in this file in the test group 'QueryAll'.
+  // This is done to also test a query handler where QueryAll returns an Element[]
+  // as opposed to NodeListOf<Element>.
   describe('Page.$$eval', function () {
     it('should work', async () => {
       const { page } = getTestState();
@@ -77,6 +120,52 @@
       const divsCount = await page.$$eval('div', (divs) => divs.length);
       expect(divsCount).toBe(3);
     });
+    it('should accept extra arguments', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<div>hello</div><div>beautiful</div><div>world!</div>'
+      );
+      const divsCountPlus5 = await page.$$eval(
+        'div',
+        (divs, two: number, three: number) => divs.length + two + three,
+        2,
+        3
+      );
+      expect(divsCountPlus5).toBe(8);
+    });
+    it('should accept ElementHandles as arguments', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<section>2</section><section>2</section><section>1</section><div>3</div>'
+      );
+      const divHandle = await page.$('div');
+      const sum = await page.$$eval(
+        'section',
+        (sections, div: HTMLElement) =>
+          sections.reduce(
+            (acc, section) => acc + Number(section.textContent),
+            0
+          ) + Number(div.textContent),
+        divHandle
+      );
+      expect(sum).toBe(8);
+    });
+    it('should handle many elements', async () => {
+      const { page } = getTestState();
+      await page.evaluate(
+        `
+        for (var i = 0; i <= 1000; i++) {
+            const section = document.createElement('section');
+            section.textContent = i;
+            document.body.appendChild(section);
+        }
+        `
+      );
+      const sum = await page.$$eval('section', (sections) =>
+        sections.reduce((acc, section) => acc + Number(section.textContent), 0)
+      );
+      expect(sum).toBe(500500);
+    });
   });
 
   describe('Page.$', function () {
@@ -103,7 +192,7 @@
       const elements = await page.$$('div');
       expect(elements.length).toBe(2);
       const promises = elements.map((element) =>
-        page.evaluate((e) => e.textContent, element)
+        page.evaluate((e: HTMLElement) => e.textContent, element)
       );
       expect(await Promise.all(promises)).toEqual(['A', 'B']);
     });
@@ -151,7 +240,10 @@
       const html = await page.$('html');
       const second = await html.$('.second');
       const inner = await second.$('.inner');
-      const content = await page.evaluate((e) => e.textContent, inner);
+      const content = await page.evaluate(
+        (e: HTMLElement) => e.textContent,
+        inner
+      );
       expect(content).toBe('A');
     });
 
@@ -218,7 +310,7 @@
         '<html><body><div class="tweet"><div class="like">100</div><div class="like">10</div></div></body></html>'
       );
       const tweet = await page.$('.tweet');
-      const content = await tweet.$$eval('.like', (nodes) =>
+      const content = await tweet.$$eval('.like', (nodes: HTMLElement[]) =>
         nodes.map((n) => n.innerText)
       );
       expect(content).toEqual(['100', '10']);
@@ -231,7 +323,7 @@
         '<div class="a">not-a-child-div</div><div id="myId"><div class="a">a1-child-div</div><div class="a">a2-child-div</div></div>';
       await page.setContent(htmlContent);
       const elementHandle = await page.$('#myId');
-      const content = await elementHandle.$$eval('.a', (nodes) =>
+      const content = await elementHandle.$$eval('.a', (nodes: HTMLElement[]) =>
         nodes.map((n) => n.innerText)
       );
       expect(content).toEqual(['a1-child-div', 'a2-child-div']);
@@ -263,7 +355,7 @@
       const elements = await html.$$('div');
       expect(elements.length).toBe(2);
       const promises = elements.map((element) =>
-        page.evaluate((e) => e.textContent, element)
+        page.evaluate((e: HTMLElement) => e.textContent, element)
       );
       expect(await Promise.all(promises)).toEqual(['A', 'B']);
     });
@@ -291,7 +383,10 @@
       const html = await page.$('html');
       const second = await html.$x(`./body/div[contains(@class, 'second')]`);
       const inner = await second[0].$x(`./div[contains(@class, 'inner')]`);
-      const content = await page.evaluate((e) => e.textContent, inner[0]);
+      const content = await page.evaluate(
+        (e: HTMLElement) => e.textContent,
+        inner[0]
+      );
       expect(content).toBe('A');
     });
 
@@ -306,4 +401,107 @@
       expect(second).toEqual([]);
     });
   });
+
+  // This is the same tests for `$$eval` and `$$` as above, but with a queryAll
+  // handler that returns an array instead of a list of nodes.
+  describe('QueryAll', function () {
+    const handler: CustomQueryHandler = {
+      queryAll: (element: Element, selector: string) =>
+        Array.from(element.querySelectorAll(selector)),
+    };
+    before(() => {
+      const { puppeteer } = getTestState();
+      puppeteer.registerCustomQueryHandler('allArray', handler);
+    });
+
+    it('should have registered handler', async () => {
+      const { puppeteer } = getTestState();
+      expect(
+        puppeteer.customQueryHandlerNames().includes('allArray')
+      ).toBeTruthy();
+    });
+    it('$$ should query existing elements', async () => {
+      const { page } = getTestState();
+
+      await page.setContent(
+        '<html><body><div>A</div><br/><div>B</div></body></html>'
+      );
+      const html = await page.$('html');
+      const elements = await html.$$('allArray/div');
+      expect(elements.length).toBe(2);
+      const promises = elements.map((element) =>
+        page.evaluate((e: HTMLElement) => e.textContent, element)
+      );
+      expect(await Promise.all(promises)).toEqual(['A', 'B']);
+    });
+
+    it('$$ should return empty array for non-existing elements', async () => {
+      const { page } = getTestState();
+
+      await page.setContent(
+        '<html><body><span>A</span><br/><span>B</span></body></html>'
+      );
+      const html = await page.$('html');
+      const elements = await html.$$('allArray/div');
+      expect(elements.length).toBe(0);
+    });
+    it('$$eval should work', async () => {
+      const { page } = getTestState();
+
+      await page.setContent(
+        '<div>hello</div><div>beautiful</div><div>world!</div>'
+      );
+      const divsCount = await page.$$eval(
+        'allArray/div',
+        (divs) => divs.length
+      );
+      expect(divsCount).toBe(3);
+    });
+    it('$$eval should accept extra arguments', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<div>hello</div><div>beautiful</div><div>world!</div>'
+      );
+      const divsCountPlus5 = await page.$$eval(
+        'allArray/div',
+        (divs, two: number, three: number) => divs.length + two + three,
+        2,
+        3
+      );
+      expect(divsCountPlus5).toBe(8);
+    });
+    it('$$eval should accept ElementHandles as arguments', async () => {
+      const { page } = getTestState();
+      await page.setContent(
+        '<section>2</section><section>2</section><section>1</section><div>3</div>'
+      );
+      const divHandle = await page.$('div');
+      const sum = await page.$$eval(
+        'allArray/section',
+        (sections, div: HTMLElement) =>
+          sections.reduce(
+            (acc, section) => acc + Number(section.textContent),
+            0
+          ) + Number(div.textContent),
+        divHandle
+      );
+      expect(sum).toBe(8);
+    });
+    it('$$eval should handle many elements', async () => {
+      const { page } = getTestState();
+      await page.evaluate(
+        `
+        for (var i = 0; i <= 1000; i++) {
+            const section = document.createElement('section');
+            section.textContent = i;
+            document.body.appendChild(section);
+        }
+        `
+      );
+      const sum = await page.$$eval('allArray/section', (sections) =>
+        sections.reduce((acc, section) => acc + Number(section.textContent), 0)
+      );
+      expect(sum).toBe(500500);
+    });
+  });
 });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/requestinterception.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/requestinterception.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/requestinterception.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/requestinterception.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -16,13 +16,13 @@
 
 import fs from 'fs';
 import path from 'path';
-import utils from './utils';
+import utils from './utils.js';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('request interception', function () {
   setupTestBrowserHooks();
@@ -383,14 +383,14 @@
       });
       const dataURL = 'data:text/html,<div>yo</div>';
       const text = await page.evaluate(
-        (url) => fetch(url).then((r) => r.text()),
+        (url: string) => fetch(url).then((r) => r.text()),
         dataURL
       );
       expect(text).toBe('<div>yo</div>');
       expect(requests.length).toBe(1);
       expect(requests[0].url()).toBe(dataURL);
     });
-    it('should navigate to URL with hash and and fire requests without hash', async () => {
+    it('should navigate to URL with hash and fire requests without hash', async () => {
       const { page, server } = getTestState();
 
       await page.setRequestInterception(true);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/screenshot.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/screenshot.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/screenshot.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/screenshot.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Screenshots', function () {
   setupTestBrowserHooks();
@@ -280,7 +280,10 @@
 
       await page.setContent('<h1>remove this</h1>');
       const elementHandle = await page.$('h1');
-      await page.evaluate((element) => element.remove(), elementHandle);
+      await page.evaluate(
+        (element: HTMLElement) => element.remove(),
+        elementHandle
+      );
       const screenshotError = await elementHandle
         .screenshot()
         .catch((error) => error);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/target.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/target.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/target.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/target.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
 const { waitEvent } = utils;
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
-import { Target } from '../src/common/Target';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import { Target } from '../lib/cjs/puppeteer/common/Target.js';
 
 describe('Target', function () {
   setupTestBrowserHooks();
@@ -80,7 +80,7 @@
           )
           .then((target) => target.page()),
         page.evaluate(
-          (url) => window.open(url),
+          (url: string) => window.open(url),
           server.CROSS_PROCESS_PREFIX + '/empty.html'
         ),
       ]);
@@ -214,7 +214,7 @@
       // Open a new page. Use window.open to connect to the page later.
       await Promise.all([
         page.evaluate(
-          (url) => window.open(url),
+          (url: string) => window.open(url),
           server.PREFIX + '/one-style.html'
         ),
         server.waitForRequest('/one-style.css'),
@@ -259,13 +259,13 @@
         (target) => target.url() === server.EMPTY_PAGE
       );
       targetPromise
-      .then(() => (resolved = true))
-      .catch((error) => {
-        resolved = true;
-        if (error instanceof puppeteer.errors.TimeoutError) {
-          console.error(error);
-        } else throw error;
-      });
+        .then(() => (resolved = true))
+        .catch((error) => {
+          resolved = true;
+          if (error instanceof puppeteer.errors.TimeoutError) {
+            console.error(error);
+          } else throw error;
+        });
       const page = await browser.newPage();
       expect(resolved).toBe(false);
       await page.goto(server.EMPTY_PAGE);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/touchscreen.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/touchscreen.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/touchscreen.spec.ts	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/touchscreen.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -19,7 +19,7 @@
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('Touchscreen', function () {
   setupTestBrowserHooks();
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/tracing.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/tracing.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/tracing.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/tracing.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -17,7 +17,7 @@
 import fs from 'fs';
 import path from 'path';
 import expect from 'expect';
-import { getTestState, describeChromeOnly } from './mocha-utils';
+import { getTestState, describeChromeOnly } from './mocha-utils'; // eslint-disable-line import/extensions
 
 describeChromeOnly('Tracing', function () {
   let outputFile;
@@ -118,4 +118,16 @@
     const trace = await page.tracing.stop();
     expect(trace.toString()).toContain('screenshot');
   });
+
+  it('should properly fail if readProtocolStream errors out', async () => {
+    await page.tracing.start({ path: __dirname });
+
+    let error: Error = null;
+    try {
+      await page.tracing.stop();
+    } catch (error_) {
+      error = error_;
+    }
+    expect(error).toBeDefined();
+  });
 });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/tsconfig.test.json firefox-85.0+build1/remote/test/puppeteer/test/tsconfig.test.json
--- firefox-84.0.2+build1/remote/test/puppeteer/test/tsconfig.test.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/tsconfig.test.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "CommonJS"
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/waittask.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/waittask.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/waittask.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/waittask.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -14,19 +14,26 @@
  * limitations under the License.
  */
 
-import utils from './utils';
+import utils from './utils.js';
+import sinon from 'sinon';
 import expect from 'expect';
 import {
   getTestState,
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
-} from './mocha-utils';
+} from './mocha-utils'; // eslint-disable-line import/extensions
 
 describe('waittask specs', function () {
   setupTestBrowserHooks();
   setupTestPageAndContextHooks();
 
   describe('Page.waitFor', function () {
+    /* This method is deprecated but we don't want the warnings showing up in
+     * tests. Until we remove this method we still want to ensure we don't break
+     * it.
+     */
+    beforeEach(() => sinon.stub(console, 'warn').callsFake(() => {}));
+
     it('should wait for selector', async () => {
       const { page, server } = getTestState();
 
@@ -86,7 +93,7 @@
       const { page } = getTestState();
 
       let error = null;
-      // @ts-expect-error
+      // @ts-expect-error purposefully passing bad type for test
       await page.waitFor({ foo: 'bar' }).catch((error_) => (error = error_));
       expect(error.message).toContain('Unsupported target type');
     });
@@ -95,6 +102,22 @@
 
       await page.waitFor((arg1, arg2) => arg1 !== arg2, {}, 1, 2);
     });
+
+    it('should log a deprecation warning', async () => {
+      const { page } = getTestState();
+
+      await page.waitFor(() => true);
+
+      const consoleWarnStub = console.warn as sinon.SinonSpy;
+
+      expect(consoleWarnStub.calledOnce).toBe(true);
+      expect(
+        consoleWarnStub.firstCall.calledWith(
+          'waitFor is deprecated and will be removed in a future release. See https://github.com/puppeteer/puppeteer/issues/6214 for details and how to migrate your code.'
+        )
+      ).toBe(true);
+      expect((console.warn as sinon.SinonSpy).calledOnce).toBe(true);
+    });
   });
 
   describe('Frame.waitForFunction', function () {
@@ -105,18 +128,15 @@
       await page.evaluate(() => (globalThis.__FOO = 1));
       await watchdog;
     });
-    it(
-      'should work when resolved right before execution context disposal',
-      async () => {
-        const { page } = getTestState();
+    it('should work when resolved right before execution context disposal', async () => {
+      const { page } = getTestState();
 
-        await page.evaluateOnNewDocument(() => (globalThis.__RELOADED = true));
-        await page.waitForFunction(() => {
-          if (!globalThis.__RELOADED) window.location.reload();
-          return true;
-        });
-      }
-    );
+      await page.evaluateOnNewDocument(() => (globalThis.__RELOADED = true));
+      await page.waitForFunction(() => {
+        if (!globalThis.__RELOADED) window.location.reload();
+        return true;
+      });
+    });
     it('should poll on interval', async () => {
       const { page } = getTestState();
 
@@ -263,7 +283,7 @@
         .waitForFunction((element) => !element.parentElement, {}, div)
         .then(() => (resolved = true));
       expect(resolved).toBe(false);
-      await page.evaluate((element) => element.remove(), div);
+      await page.evaluate((element: HTMLElement) => element.remove(), div);
       await waitForFunction;
     });
     it('should respect timeout', async () => {
@@ -328,6 +348,41 @@
     });
   });
 
+  describe('Page.waitForTimeout', () => {
+    it('waits for the given timeout before resolving', async () => {
+      const { page, server } = getTestState();
+      await page.goto(server.EMPTY_PAGE);
+      const startTime = Date.now();
+      await page.waitForTimeout(1000);
+      const endTime = Date.now();
+      /* In a perfect world endTime - startTime would be exactly 1000 but we
+       * expect some fluctuations and for it to be off by a little bit. So to
+       * avoid a flaky test we'll make sure it waited for roughly 1 second by
+       * ensuring 900 < endTime - startTime < 1100
+       */
+      expect(endTime - startTime).toBeGreaterThan(900);
+      expect(endTime - startTime).toBeLessThan(1100);
+    });
+  });
+
+  describe('Frame.waitForTimeout', () => {
+    it('waits for the given timeout before resolving', async () => {
+      const { page, server } = getTestState();
+      await page.goto(server.EMPTY_PAGE);
+      const frame = page.mainFrame();
+      const startTime = Date.now();
+      await frame.waitForTimeout(1000);
+      const endTime = Date.now();
+      /* In a perfect world endTime - startTime would be exactly 1000 but we
+       * expect some fluctuations and for it to be off by a little bit. So to
+       * avoid a flaky test we'll make sure it waited for roughly 1 second by
+       * ensuring 900 < endTime - startTime < 1100
+       */
+      expect(endTime - startTime).toBeGreaterThan(900);
+      expect(endTime - startTime).toBeLessThan(1100);
+    });
+  });
+
   describe('Frame.waitForSelector', function () {
     const addElement = (tag) =>
       document.body.appendChild(document.createElement(tag));
@@ -350,9 +405,9 @@
         page.waitForSelector('.zombo'),
         page.setContent(`<div class='zombo'>anything</div>`),
       ]);
-      expect(await page.evaluate((x) => x.textContent, handle)).toBe(
-        'anything'
-      );
+      expect(
+        await page.evaluate((x: HTMLElement) => x.textContent, handle)
+      ).toBe('anything');
     });
 
     it('should resolve promise when node is added', async () => {
@@ -549,7 +604,7 @@
         .catch((error_) => (error = error_));
       expect(error).toBeTruthy();
       expect(error.message).toContain(
-        'waiting for selector "div" failed: timeout'
+        'waiting for selector `div` failed: timeout'
       );
       expect(error).toBeInstanceOf(puppeteer.errors.TimeoutError);
     });
@@ -563,7 +618,7 @@
         .catch((error_) => (error = error_));
       expect(error).toBeTruthy();
       expect(error.message).toContain(
-        'waiting for selector "div" to be hidden failed: timeout'
+        'waiting for selector `div` to be hidden failed: timeout'
       );
     });
 
@@ -587,7 +642,10 @@
       const waitForSelector = page.waitForSelector('.zombo');
       await page.setContent(`<div class='zombo'>anything</div>`);
       expect(
-        await page.evaluate((x) => x.textContent, await waitForSelector)
+        await page.evaluate(
+          (x: HTMLElement) => x.textContent,
+          await waitForSelector
+        )
       ).toBe('anything');
     });
     it('should have correct stack trace for timeout', async () => {
@@ -597,7 +655,7 @@
       await page
         .waitForSelector('.zombo', { timeout: 10 })
         .catch((error_) => (error = error_));
-      expect(error.stack).toContain('waiting for selector ".zombo" failed');
+      expect(error.stack).toContain('waiting for selector `.zombo` failed');
       // The extension is ts here as Mocha maps back via sourcemaps.
       expect(error.stack).toContain('waittask.spec.ts');
     });
@@ -615,7 +673,10 @@
         '//p[normalize-space(.)="hello world"]'
       );
       expect(
-        await page.evaluate((x) => x.textContent, await waitForXPath)
+        await page.evaluate(
+          (x: HTMLElement) => x.textContent,
+          await waitForXPath
+        )
       ).toBe('hello  world  ');
     });
     it('should respect timeout', async () => {
@@ -627,7 +688,7 @@
         .catch((error_) => (error = error_));
       expect(error).toBeTruthy();
       expect(error.message).toContain(
-        'waiting for XPath "//div" failed: timeout'
+        'waiting for XPath `//div` failed: timeout'
       );
       expect(error).toBeInstanceOf(puppeteer.errors.TimeoutError);
     });
@@ -682,7 +743,10 @@
       const waitForXPath = page.waitForXPath('//*[@class="zombo"]');
       await page.setContent(`<div class='zombo'>anything</div>`);
       expect(
-        await page.evaluate((x) => x.textContent, await waitForXPath)
+        await page.evaluate(
+          (x: HTMLElement) => x.textContent,
+          await waitForXPath
+        )
       ).toBe('anything');
     });
     it('should allow you to select a text node', async () => {
@@ -700,7 +764,10 @@
       await page.setContent(`<div>some text</div>`);
       const waitForXPath = page.waitForXPath('/html/body/div');
       expect(
-        await page.evaluate((x) => x.textContent, await waitForXPath)
+        await page.evaluate(
+          (x: HTMLElement) => x.textContent,
+          await waitForXPath
+        )
       ).toBe('some text');
     });
   });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test/worker.spec.ts firefox-85.0+build1/remote/test/puppeteer/test/worker.spec.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/test/worker.spec.ts	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test/worker.spec.ts	2021-01-18 19:58:18.000000000 +0000
@@ -20,10 +20,10 @@
   setupTestBrowserHooks,
   setupTestPageAndContextHooks,
   describeFailsFirefox,
-} from './mocha-utils';
-import utils from './utils';
-import { WebWorker } from '../src/common/WebWorker';
-import { ConsoleMessage } from '../src/common/ConsoleMessage';
+} from './mocha-utils'; // eslint-disable-line import/extensions
+import utils from './utils.js';
+import { WebWorker } from '../lib/cjs/puppeteer/common/WebWorker.js';
+import { ConsoleMessage } from '../lib/cjs/puppeteer/common/ConsoleMessage.js';
 const { waitEvent } = utils;
 
 describeFailsFirefox('Workers', function () {
@@ -60,7 +60,10 @@
     const workerDestroyedPromise = new Promise((x) =>
       page.once('workerdestroyed', x)
     );
-    await page.evaluate((workerObj) => workerObj.terminate(), workerObj);
+    await page.evaluate(
+      (workerObj: Worker) => workerObj.terminate(),
+      workerObj
+    );
     expect(await workerDestroyedPromise).toBe(worker);
     const error = await workerThisObj
       .getProperty('self')
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test-browser/connection.spec.js firefox-85.0+build1/remote/test/puppeteer/test-browser/connection.spec.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test-browser/connection.spec.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test-browser/connection.spec.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,55 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Connection } from '../lib/esm/puppeteer/common/Connection.js';
+import { BrowserWebSocketTransport } from '../lib/esm/puppeteer/common/BrowserWebSocketTransport.js';
+import puppeteer from '../lib/esm/puppeteer/web.js';
+import expect from '../node_modules/expect/build-es5/index.js';
+import { getWebSocketEndpoint } from './helper.js';
+
+describe('creating a Connection', () => {
+  it('can create a real connection to the backend and send messages', async () => {
+    const wsUrl = getWebSocketEndpoint();
+    const transport = await BrowserWebSocketTransport.create(wsUrl);
+
+    const connection = new Connection(wsUrl, transport);
+    const result = await connection.send('Browser.getVersion');
+    /* We can't expect exact results as the version of Chrome/CDP might change
+     * and we don't want flakey tests, so let's assert the structure, which is
+     * enough to confirm the result was recieved successfully.
+     */
+    expect(result).toEqual({
+      protocolVersion: expect.any(String),
+      jsVersion: expect.any(String),
+      revision: expect.any(String),
+      userAgent: expect.any(String),
+      product: expect.any(String),
+    });
+  });
+});
+
+describe('puppeteer.connect', () => {
+  it('can connect over websocket and make requests to the backend', async () => {
+    const wsUrl = getWebSocketEndpoint();
+    const browser = await puppeteer.connect({
+      browserWSEndpoint: wsUrl,
+    });
+
+    const version = await browser.version();
+    const versionLooksCorrect = /.+Chrome\/\d{2}/.test(version);
+    expect(version).toEqual(expect.any(String));
+    expect(versionLooksCorrect).toEqual(true);
+  });
+});
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test-browser/debug.spec.js firefox-85.0+build1/remote/test/puppeteer/test-browser/debug.spec.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test-browser/debug.spec.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test-browser/debug.spec.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { debug } from '../lib/esm/puppeteer/common/Debug.js';
+import expect from '../node_modules/expect/build-es5/index.js';
+
+describe('debug', () => {
+  let originalLog;
+  let logs;
+  beforeEach(() => {
+    originalLog = console.log;
+    logs = [];
+    console.log = (...args) => {
+      logs.push(args);
+    };
+  });
+
+  afterEach(() => {
+    console.log = originalLog;
+  });
+
+  it('should return a function', async () => {
+    expect(debug('foo')).toBeInstanceOf(Function);
+  });
+
+  it('does not log to the console if __PUPPETEER_DEBUG global is not set', async () => {
+    const debugFn = debug('foo');
+    debugFn('lorem', 'ipsum');
+
+    expect(logs.length).toEqual(0);
+  });
+
+  it('logs to the console if __PUPPETEER_DEBUG global is set to *', async () => {
+    globalThis.__PUPPETEER_DEBUG = '*';
+    const debugFn = debug('foo');
+    debugFn('lorem', 'ipsum');
+
+    expect(logs.length).toEqual(1);
+    expect(logs).toEqual([['foo:', 'lorem', 'ipsum']]);
+  });
+
+  it('logs only messages matching the __PUPPETEER_DEBUG prefix', async () => {
+    globalThis.__PUPPETEER_DEBUG = 'foo';
+    const debugFoo = debug('foo');
+    const debugBar = debug('bar');
+    debugFoo('a');
+    debugBar('b');
+
+    expect(logs.length).toEqual(1);
+    expect(logs).toEqual([['foo:', 'a']]);
+  });
+});
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/test-browser/helper.js firefox-85.0+build1/remote/test/puppeteer/test-browser/helper.js
--- firefox-84.0.2+build1/remote/test/puppeteer/test-browser/helper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/test-browser/helper.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Returns the web socket endpoint for the backend of the browser the tests run
+ * in. Used to create connections to that browser in Puppeteer for unit tests.
+ *
+ * It's available on window.__ENV__ because setup code in
+ * web-test-runner.config.js puts it there. If you're changing this code (or
+ * that code), make sure the other is updated accordingly.
+ */
+export function getWebSocketEndpoint() {
+  return window.__ENV__.wsEndpoint;
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.travis.yml firefox-85.0+build1/remote/test/puppeteer/.travis.yml
--- firefox-84.0.2+build1/remote/test/puppeteer/.travis.yml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.travis.yml	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,17 @@
 language: node_js
 services: xvfb
 
+# Throughout this file, the following `node_js` versions are being used:
+#
+# - node_js: '10' # The maintenance LTS version.
+# - node_js: '12' # The oldest major active LTS version.
+# - node_js: '14' # The newest major active LTS version.
+
 jobs:
   include:
-    - os: "osx"
+    - os: 'osx'
       name: 'Unit tests: macOS/Chromium'
-      node_js: "10.19.0"
+      node_js: '10' # The maintenance LTS version.
       osx_image: xcode11.4
       env:
         - CHROMIUM=true
@@ -14,11 +20,11 @@
       script:
         - ls .local-chromium .local-firefox
         - npm run tsc
-        - travis_retry npm run unit
+        - npm run unit
 
-    - os: "windows"
+    - os: 'windows'
       name: 'Unit tests: Windows/Chromium'
-      node_js: "10.19.0"
+      node_js: '10' # The maintenance LTS version.
       env:
         - CHROMIUM=true
       before_install:
@@ -28,8 +34,21 @@
         - npm run tsc
         - travis_retry npm run unit
 
-    # Runs unit tests on Linux + Chromium
-    - node_js: "10.19.0"
+    # Node <10.17's fs.promises module was experimental and doesn't behave as
+    # expected. This problem was fixed in Node 10.19, but we run the unit tests
+    # through on 10.15 to make sure we don't cause any regressions when using
+    # fs.promises. See https://github.com/puppeteer/puppeteer/issues/6548 for an
+    # example.
+    - node_js: '10.15.0'
+      name: 'Node 10.15 Unit tests: Linux/Chromium'
+      env:
+        - CHROMIUM=true
+      before_install:
+        - PUPPETEER_PRODUCT=firefox npm install
+      script:
+        - npm run unit
+
+    - node_js: '10' # The maintenance LTS version.
       name: 'Unit tests [with coverage]: Linux/Chromium'
       env:
         - CHROMIUM=true
@@ -39,53 +58,61 @@
         - travis_retry npm run unit-with-coverage
         - npm run assert-unit-coverage
 
-    - node_js: "12.16.3"
+    - node_js: '12' # The oldest major active LTS version.
       name: 'Unit tests [Node 12]: Linux/Chromium'
       env:
         - CHROMIUM=true
       before_install:
         - PUPPETEER_PRODUCT=firefox npm install
       script:
-        - travis_retry npm run unit
+        - npm run unit
 
-    - node_js: "14.2.0"
+    - node_js: '14' # The newest major active LTS version.
       name: 'Unit tests [Node 14]: Linux/Chromium'
       env:
         - CHROMIUM=true
       before_install:
         - PUPPETEER_PRODUCT=firefox npm install
       script:
-        - travis_retry npm run unit
+        - npm run unit
+
+    - node_js: '12' # The oldest major active LTS version.
+      name: 'Browser tests: Linux/Chromium'
+      addons:
+        chrome: stable
+      env:
+        - CHROMIUM=true
+      script:
+        - npm run test-browser
 
-    # This bot runs all the extra checks that aren't the main Puppeteer unit tests
-    - node_js: "10.19.0"
+    # This bot runs all the extra checks that aren't the main Puppeteer unit tests.
+    - node_js: '10' # The maintenance LTS version.
       name: 'Extra tests: Linux/Chromium'
       env:
         - CHROMIUM=true
       script:
-        - npm run compare-protocol-d-ts
         - npm run lint
-        - npm run test-doclint
-        - npm run ensure-new-docs-up-to-date
+        # Ensure that we can generate the new docs without erroring
+        - npm run generate-docs
+        - npm run ensure-correct-devtools-protocol-revision
 
     # This bot runs separately as it changes package.json to test puppeteer-core
     # and we don't want that leaking into other bots and causing issues.
-    - node_js: "10.19.0"
+    - node_js: '10' # The maintenance LTS version.
       name: 'Test bundling and install of packages'
       env:
         - CHROMIUM=true
       script:
         - npm run test-install
 
-    # Runs unit tests on Linux + Firefox
-    - node_js: "10.19.0"
+    - node_js: '10' # The maintenance LTS version.
       name: 'Unit tests: Linux/Firefox'
       env:
         - FIREFOX=true
       before_install:
         - PUPPETEER_PRODUCT=firefox npm install
       script:
-        - travis_retry npm run funit
+        - npm run funit
 
 notifications:
   email: false
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/tsconfig.base.json firefox-85.0+build1/remote/test/puppeteer/tsconfig.base.json
--- firefox-84.0.2+build1/remote/test/puppeteer/tsconfig.base.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/tsconfig.base.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "allowJs": true,
+    "checkJs": true,
+    "target": "ESNext",
+    "moduleResolution": "node",
+    "module": "ESNext",
+    "declaration": true,
+    "declarationMap": true,
+    "resolveJsonModule": true
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/tsconfig.json firefox-85.0+build1/remote/test/puppeteer/tsconfig.json
--- firefox-84.0.2+build1/remote/test/puppeteer/tsconfig.json	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/tsconfig.json	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,11 @@
+/**
+ * This configuration only exists for the API Extractor tool. See the details in
+ * CONTRIBUTING.md that describes our TypeScript setup.
+*/
 {
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "allowJs": true,
-    "checkJs": true,
-    "outDir": "./lib/cjs",
-    "target": "ESNext",
-    "moduleResolution": "node",
-    "module": "CommonJS",
-    "declaration": true,
-    "declarationMap": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true
+    "noEmit": true
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/apply_next_version.js firefox-85.0+build1/remote/test/puppeteer/utils/apply_next_version.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/apply_next_version.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/apply_next_version.js	2021-01-18 19:58:18.000000000 +0000
@@ -26,3 +26,7 @@
   path.join(__dirname, '..', 'package.json'),
   JSON.stringify(package, undefined, 2) + '\n'
 );
+
+console.log(
+  'IMPORTANT: you should update the pinned version of devtools-protocol to match the new revision.'
+);
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/check_availability.js firefox-85.0+build1/remote/test/puppeteer/utils/check_availability.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/check_availability.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/check_availability.js	2021-01-18 19:58:18.000000000 +0000
@@ -17,7 +17,9 @@
 
 const assert = require('assert');
 const https = require('https');
-const BrowserFetcher = require('../lib/BrowserFetcher').BrowserFetcher;
+// run `npm run dev-install` if lib dir is missing
+const BrowserFetcher = require('../lib/cjs/puppeteer/node/BrowserFetcher.js')
+  .BrowserFetcher;
 
 const SUPPORTER_PLATFORMS = ['linux', 'mac', 'win32', 'win64'];
 const fetchers = SUPPORTER_PLATFORMS.map(
@@ -58,7 +60,9 @@
 
 options
     -f          full mode checks availability of all the platforms, default mode
-    -r          roll mode checks for the most recent Chromium roll candidate
+    -r          roll mode checks for the most recent stable Chromium roll candidate
+    -rb         roll mode checks for the most recent beta Chromium roll candidate
+    -rd         roll mode checks for the most recent dev Chromium roll candidate
     -h          show this help
 
 browser version(s)
@@ -69,8 +73,9 @@
   To check Chromium availability of a certain revision
     node check_availability.js [revision]
 
-  To find a Chromium roll candidate for current Stable Linux version
+  To find a Chromium roll candidate for current stable Linux version
     node check_availability.js -r
+  use -rb for beta and -rd for dev versions.
 
   To check Chromium availability from the latest revision in a descending order
     node check_availability.js
@@ -95,7 +100,13 @@
       case 'f':
         break;
       case 'r':
-        checkRollCandidate();
+        checkRollCandidate('stable');
+        return;
+      case 'rb':
+        checkRollCandidate('beta');
+        return;
+      case 'rd':
+        checkRollCandidate('dev');
         return;
       default:
         console.log(helpMessage);
@@ -146,28 +157,27 @@
     stopWhenAllAvailable: false,
   });
 }
-
-async function checkRollCandidate() {
+async function checkRollCandidate(channel) {
   const omahaResponse = await fetch(
-    'https://omahaproxy.appspot.com/all.json?channel=stable&os=linux'
+    `https://omahaproxy.appspot.com/all.json?channel=${channel}&os=linux`
   );
-  const stableLinuxInfo = JSON.parse(omahaResponse)[0];
-  if (!stableLinuxInfo) {
-    console.error('no stable linux information available from omahaproxy');
+  const linuxInfo = JSON.parse(omahaResponse)[0];
+  if (!linuxInfo) {
+    console.error(`no ${channel} linux information available from omahaproxy`);
     return;
   }
 
-  const stableLinuxRevision = parseInt(
-    stableLinuxInfo.versions[0].branch_base_position,
+  const linuxRevision = parseInt(
+    linuxInfo.versions[0].branch_base_position,
     10
   );
   const currentRevision = parseInt(
-    require('../lib/cjs/revisions').PUPPETEER_REVISIONS.chromium,
+    require('../lib/cjs/puppeteer/revisions').PUPPETEER_REVISIONS.chromium,
     10
   );
 
   checkRangeAvailability({
-    fromRevision: stableLinuxRevision,
+    fromRevision: linuxRevision,
     toRevision: currentRevision,
     stopWhenAllAvailable: true,
   });
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/index.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/index.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/index.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/index.js	2021-01-18 19:58:18.000000000 +0000
@@ -18,6 +18,9 @@
 const mdBuilder = require('./MDBuilder');
 const Documentation = require('./Documentation');
 const Message = require('../Message');
+const {
+  MODULES_TO_CHECK_FOR_COVERAGE,
+} = require('../../../test/coverage-utils');
 
 const EXCLUDE_PROPERTIES = new Set([
   'Browser.create',
@@ -39,10 +42,7 @@
 module.exports = async function lint(page, mdSources, jsSources) {
   const mdResult = await mdBuilder(page, mdSources);
   const jsResult = await jsBuilder(jsSources);
-  const jsDocumentation = filterJSDocumentation(
-    jsSources,
-    jsResult.documentation
-  );
+  const jsDocumentation = filterJSDocumentation(jsResult.documentation);
   const mdDocumentation = mdResult.documentation;
 
   const jsErrors = jsResult.errors;
@@ -124,14 +124,11 @@
 }
 
 /**
- * @param {!Array<!Source>} jsSources
  * @param {!Documentation} jsDocumentation
  * @returns {!Documentation}
  */
-function filterJSDocumentation(jsSources, jsDocumentation) {
-  const apijs = jsSources.find((source) => source.name() === 'api.js');
-  let includedClasses = null;
-  if (apijs) includedClasses = new Set(Object.keys(require(apijs.filePath())));
+function filterJSDocumentation(jsDocumentation) {
+  const includedClasses = new Set(Object.keys(MODULES_TO_CHECK_FOR_COVERAGE));
   // Filter private classes and methods.
   const classes = [];
   for (const cls of jsDocumentation.classesArray) {
@@ -209,10 +206,25 @@
   const expectedClasses = Array.from(expected.classes.keys()).sort();
   const classesDiff = diff(actualClasses, expectedClasses);
 
+  /* These have been moved onto PuppeteerNode but we want to document them under
+   * Puppeteer. See https://github.com/puppeteer/puppeteer/pull/6504 for details.
+   */
+  const expectedPuppeteerClassMissingMethods = new Set([
+    'createBrowserFetcher',
+    'defaultArgs',
+    'executablePath',
+    'launch',
+  ]);
+
   for (const className of classesDiff.extra)
     errors.push(`Non-existing class found: ${className}`);
-  for (const className of classesDiff.missing)
+
+  for (const className of classesDiff.missing) {
+    if (className === 'PuppeteerNode') {
+      continue;
+    }
     errors.push(`Class not found: ${className}`);
+  }
 
   for (const className of classesDiff.equal) {
     const actualClass = actual.classes.get(className);
@@ -222,6 +234,12 @@
     const methodDiff = diff(actualMethods, expectedMethods);
 
     for (const methodName of methodDiff.extra) {
+      if (
+        expectedPuppeteerClassMissingMethods.has(methodName) &&
+        actualClass.name === 'Puppeteer'
+      ) {
+        continue;
+      }
       errors.push(`Non-existing method found: ${className}.${methodName}()`);
     }
 
@@ -254,15 +272,23 @@
       const actualArgs = Array.from(actualMethod.args.keys());
       const expectedArgs = Array.from(expectedMethod.args.keys());
       const argsDiff = diff(actualArgs, expectedArgs);
+
       if (argsDiff.extra.length || argsDiff.missing.length) {
-        const text = [
-          `Method ${className}.${methodName}() fails to describe its parameters:`,
-        ];
-        for (const arg of argsDiff.missing)
-          text.push(`- Argument not found: ${arg}`);
-        for (const arg of argsDiff.extra)
-          text.push(`- Non-existing argument found: ${arg}`);
-        errors.push(text.join('\n'));
+        /* Doclint cannot handle the parameter type of the CDPSession send method.
+         * so we just ignore it.
+         */
+        const isCdpSessionSend =
+          className === 'CDPSession' && methodName === 'send';
+        if (!isCdpSessionSend) {
+          const text = [
+            `Method ${className}.${methodName}() fails to describe its parameters:`,
+          ];
+          for (const arg of argsDiff.missing)
+            text.push(`- Argument not found: ${arg}`);
+          for (const arg of argsDiff.extra)
+            text.push(`- Non-existing argument found: ${arg}`);
+          errors.push(text.join('\n'));
+        }
       }
 
       for (const arg of argsDiff.equal)
@@ -277,8 +303,12 @@
       expectedClass.properties.keys()
     ).sort();
     const propertyDiff = diff(actualProperties, expectedProperties);
-    for (const propertyName of propertyDiff.extra)
+    for (const propertyName of propertyDiff.extra) {
+      if (className === 'Puppeteer' && propertyName === 'product') {
+        continue;
+      }
       errors.push(`Non-existing property found: ${className}.${propertyName}`);
+    }
     for (const propertyName of propertyDiff.missing)
       errors.push(`Property not found: ${className}.${propertyName}`);
 
@@ -389,6 +419,13 @@
         },
       ],
       [
+        'Method Mouse.wheel() options',
+        {
+          actualName: 'Object',
+          expectedName: 'MouseWheelOptions',
+        },
+      ],
+      [
         'Method Tracing.start() options',
         {
           actualName: 'Object',
@@ -641,7 +678,7 @@
         'Method Page.emulateVisionDeficiency() type',
         {
           actualName: 'string',
-          expectedName: 'VisionDeficiency',
+          expectedName: 'Object',
         },
       ],
       [
@@ -662,56 +699,56 @@
         'Method EventEmitter.emit() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.listenerCount() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.off() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.on() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.once() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.removeListener() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.addListener() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
         'Method EventEmitter.removeAllListeners() event',
         {
           actualName: 'string|symbol',
-          expectedName: 'Object',
+          expectedName: 'EventType',
         },
       ],
       [
@@ -749,6 +786,55 @@
           expectedName: 'MouseButton',
         },
       ],
+      [
+        'Method HTTPRequest.continue() overrides',
+        {
+          actualName: 'Object',
+          expectedName: 'ContinueRequestOverrides',
+        },
+      ],
+      [
+        'Method HTTPRequest.respond() response',
+        {
+          actualName: 'Object',
+          expectedName: 'ResponseForRequest',
+        },
+      ],
+      [
+        'Method Frame.addScriptTag() options',
+        {
+          actualName: 'Object',
+          expectedName: 'FrameAddScriptTagOptions',
+        },
+      ],
+      [
+        'Method Frame.addStyleTag() options',
+        {
+          actualName: 'Object',
+          expectedName: 'FrameAddStyleTagOptions',
+        },
+      ],
+      [
+        'Method Frame.waitForFunction() options',
+        {
+          actualName: 'Object',
+          expectedName: 'FrameWaitForFunctionOptions',
+        },
+      ],
+      [
+        'Method BrowserContext.overridePermissions() permissions',
+        {
+          actualName: 'Array<string>',
+          expectedName: 'Array<Object>',
+        },
+      ],
+      [
+        'Method Puppeteer.connect() options',
+        {
+          actualName: 'Object',
+          expectedName: 'ConnectOptions',
+        },
+      ],
     ]);
 
     const expectedForSource = expectedNamingMismatches.get(source);
@@ -786,6 +872,17 @@
      * as they will likely be considered "wrong" by DocLint too.
      */
     if (namingMismatchIsExpected) return;
+
+    /* Some methods cause errors in the property checks for an unknown reason
+     * so we support a list of methods whose parameters are not checked.
+     */
+    const skipPropertyChecksOnMethods = new Set([
+      'Method Page.deleteCookie() ...cookies',
+      'Method Page.setCookie() ...cookies',
+      'Method Puppeteer.connect() options',
+    ]);
+    if (skipPropertyChecksOnMethods.has(source)) return;
+
     const actualPropertiesMap = new Map(
       actual.properties.map((property) => [property.name, property.type])
     );
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/JSBuilder.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/JSBuilder.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/JSBuilder.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/JSBuilder.js	2021-01-18 19:58:18.000000000 +0000
@@ -128,9 +128,19 @@
     );
     const name = symbol.getName();
     if (symbol.valueDeclaration && symbol.valueDeclaration.dotDotDotToken) {
-      const innerType = serializeType(type.typeArguments[0], circular);
-      innerType.name = '...' + innerType.name;
-      return Documentation.Member.createProperty('...' + name, innerType);
+      try {
+        const innerType = serializeType(type.typeArguments[0], circular);
+        innerType.name = '...' + innerType.name;
+        return Documentation.Member.createProperty('...' + name, innerType);
+      } catch (error) {
+        /**
+         * DocLint struggles with the paramArgs type on CDPSession.send because
+         * it uses a complex type from the devtools-protocol method. Doclint
+         * isn't going to be here for much longer so we'll just silence this
+         * warning than try to add support which would warrant a huge rewrite.
+         */
+        if (name !== 'paramArgs') throw error;
+      }
     }
     return Documentation.Member.createProperty(
       name,
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-### class: Bar
-
-### class: Foo
-
-#### foo.test()
-
-#### foo.test()
-
-#### foo.title(arg, arg)
-- `arg` <[number]>
-- `arg` <[number]>
-
-### class: Bar
-
-[number]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type "Number"
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-class Foo {
-  test() {
-  }
-
-  /**
-   * @param {number} arg
-   */
-  title(arg) {
-  }
-}
-
-class Bar {
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/result.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-duplicates/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[MarkDown] Duplicate declaration of method Foo.test()
-[MarkDown] Duplicate declaration of argument Foo.title "arg"
-[MarkDown] Duplicate declaration of class Bar
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-### class: Foo
-
-#### foo.asyncFunction()
-
-#### foo.return42()
-
-#### foo.returnNothing()
-- returns: <[number]>
-
-#### foo.www()
-- returns <[string]>
-
-[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
-[number]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Number_type "Number"
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-class Foo {
-  return42() {
-    return 42;
-  }
-
-  returnNothing() {
-    let e = () => {
-      return 10;
-    }
-    e();
-  }
-
-  www() {
-    if (1 === 1)
-      return 'df';
-  }
-
-  async asyncFunction() {
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/result.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-returns/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[MarkDown] foo.www() has mistyped 'return' type declaration: expected exactly 'returns: ', found 'returns '.
-[MarkDown] Method Foo.asyncFunction is missing return type description
-[MarkDown] Method Foo.return42 is missing return type description
-[MarkDown] Method Foo.returnNothing has unneeded description of return type
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-### class: Foo
-
-#### event: 'c'
-
-#### event: 'a'
-
-#### foo.aaa()
-
-#### event: 'b'
-
-#### foo.ddd
-
-#### foo.ccc()
-
-#### foo.bbb()
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/Events.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/Events.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/Events.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/Events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-const Events = {
-  Foo: {
-    a: 'a',
-    b: 'b',
-    c: 'c',
-  },
-};
-module.exports = {Events};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-class Foo {
-  constructor() {
-    this.ddd = 10;
-  }
-
-  aaa() {}
-
-  bbb() {}
-
-  ccc() {}
-}
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/check-sorting/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[MarkDown] Events should go first. Event 'b' in class Foo breaks order
-[MarkDown] Event 'c' in class Foo breaks alphabetic ordering of events
-[MarkDown] Bad alphabetic ordering of Foo members: Foo.ddd should go after Foo.ccc()
-[MarkDown] Bad alphabetic ordering of Foo members: Foo.ccc() should go after Foo.bbb()
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-### class: Foo
-#### foo.bar(options)
-- `options` <[Object]>
-  - `visibility` <[boolean]>
-#### foo.foo(arg1, arg2)
-- `arg1` <[string]>
-- `arg2` <[string]>
-
-#### foo.test(...files)
-- `...filePaths` <...[string]>
-
-[Object]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object "Object"
-[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
-[boolean]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type "Boolean"
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-class Foo {
-  /**
-   * @param {string} arg1
-   */
-  foo(arg1, arg3 = {}) {
-  }
-
-  /**
-   * @param  {...string} filePaths
-   */
-  test(...filePaths) {
-  }
-
-  /**
-   * @param {{visibility?: boolean}} options
-   */
-  bar(options) {
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-arguments/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[MarkDown] Heading arguments for "foo.test(...files)" do not match described ones, i.e. "...files" != "...filePaths"
-[MarkDown] Method Foo.foo() fails to describe its parameters:
-- Argument not found: arg3
-- Non-existing argument found: arg2
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-### class: Foo
-
-### class: Bar
-
-### class: Baz
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/foo.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-class Foo {
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/other.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/other.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/other.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/other.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-class Other {
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-classes/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[MarkDown] Non-existing class found: Bar
-[MarkDown] Non-existing class found: Baz
-[MarkDown] Class not found: Other
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-### class: Foo
-
-#### event: 'start'
-
-#### event: 'stop'
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/Events.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/Events.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/Events.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/Events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-const Events = {
-  Foo: {
-    Start: 'start',
-    Finish: 'finish',
-  },
-};
-
-module.exports = {Events};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-class Foo {
-}
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-events/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[MarkDown] Non-existing event found in class Foo: 'stop'
-[MarkDown] Event not found in class Foo: 'finish'
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-### class: Foo
-
-#### foo.$()
-
-#### foo.money$$money()
-
-#### foo.proceed()
-
-#### foo.start()
-
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-class Foo {
-  start() {
-  }
-
-  stop() {
-  }
-
-  get zzz() {
-  }
-
-  $() {
-  }
-
-  money$$money() {
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-methods/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[MarkDown] Non-existing method found: Foo.proceed()
-[MarkDown] Method not found: Foo.stop()
-[MarkDown] Property not found: Foo.zzz
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-### class: Foo
-
-#### foo.a
-
-#### foo.c
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-class Foo {
-  constructor() {
-    this.a = 42;
-    this.b = 'hello';
-    this.emit('done');
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/result.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/diff-properties/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[MarkDown] Non-existing property found: Foo.c
-[MarkDown] Property not found: Foo.b
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/.gitignore firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/.gitignore
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/.gitignore	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-result-actual.txt
-result-diff.html
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/Events.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/Events.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/Events.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/Events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-const Events = {
-  A: {
-    AnEvent: 'anevent'
-  },
-};
-module.exports = { Events };
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-class A {
-  constructor(delegate) {
-    this.property1 = 1;
-    this._property2 = 2;
-  }
-
-  get getter() {
-    return null;
-  }
-
-  async method(foo, bar) {
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/result.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-common/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-{
-  "classes": [
-    {
-      "name": "A",
-      "members": [
-        {
-          "name": "anevent",
-          "kind": "event"
-        },
-        {
-          "name": "property1",
-          "type": {
-            "name": "number"
-          },
-          "kind": "property"
-        },
-        {
-          "name": "getter",
-          "type": {
-            "name": "Object"
-          },
-          "kind": "property"
-        },
-        {
-          "name": "method",
-          "type": {
-            "name": "Promise"
-          },
-          "kind": "method",
-          "args": [
-            {
-              "name": "foo",
-              "type": {
-                "name": "Object"
-              },
-              "kind": "property"
-            },
-            {
-              "name": "bar",
-              "type": {
-                "name": "Object"
-              },
-              "kind": "property"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/Events.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/Events.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/Events.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/Events.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-const Events = {
-  B: {
-    // Event with the same name as a super class method.
-    foo: 'foo',
-  },
-};
-
-module.exports = {Events};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/foo.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/foo.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/foo.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/foo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-class A {
-  constructor() {
-  }
-
-  foo(a) {
-  }
-
-  bar() {
-  }
-}
-
-class B extends A {
-  bar(override) {
-  }
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/js-builder-inheritance/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-{
-  "classes": [
-    {
-      "name": "A",
-      "members": [
-        {
-          "name": "foo",
-          "kind": "method",
-          "args": [
-            {
-              "name": "a",
-              "type": {
-                "name": "Object"
-              },
-              "kind": "property"
-            }
-          ]
-        },
-        {
-          "name": "bar",
-          "kind": "method"
-        }
-      ]
-    },
-    {
-      "name": "B",
-      "members": [
-        {
-          "name": "foo",
-          "kind": "event"
-        },
-        {
-          "name": "bar",
-          "kind": "method",
-          "args": [
-            {
-              "name": "override",
-              "type": {
-                "name": "Object"
-              },
-              "kind": "property"
-            }
-          ]
-        },
-        {
-          "name": "foo",
-          "kind": "method",
-          "args": [
-            {
-              "name": "a",
-              "type": {
-                "name": "Object"
-              },
-              "kind": "property"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/doc.md firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/doc.md
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/doc.md	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/doc.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-### class: Foo
-
-This is a class.
-
-#### event: 'frame'
-- <[Frame]>
-
-This event is dispatched.
-
-#### foo.$(selector)
-- `selector` <[string]> A selector to query page for
-- returns: <[Promise]<[ElementHandle]>>
-
-The method runs document.querySelector.
-
-#### foo.url
-- <[string]>
-
-Contains the URL of the request.
-
-[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
-[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise"
-[ElementHandle]: # "ElementHandle"
-[ElementHandle]: # "Frame"
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/result.txt firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/result.txt
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/result.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/md-builder-common/result.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-{
-  "classes": [
-    {
-      "name": "Foo",
-      "members": [
-        {
-          "name": "frame",
-          "type": {
-            "name": "[Frame]"
-          },
-          "kind": "event"
-        },
-        {
-          "name": "$",
-          "type": {
-            "name": "Promise<ElementHandle>"
-          },
-          "kind": "method",
-          "args": [
-            {
-              "name": "selector",
-              "type": {
-                "name": "string"
-              },
-              "kind": "property"
-            }
-          ]
-        },
-        {
-          "name": "url",
-          "type": {
-            "name": "string"
-          },
-          "kind": "property"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/public-api.spec.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/public-api.spec.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/public-api.spec.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/check_public_api/test/public-api.spec.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const path = require('path');
-const puppeteer = require('../../../..');
-const checkPublicAPI = require('..');
-const Source = require('../../Source');
-const mdBuilder = require('../MDBuilder');
-const jsBuilder = require('../JSBuilder');
-const expect = require('expect')
-const GoldenUtils = require('../../../../test/golden-utils');
-
-const testUtils = require('../../../../test/utils')
-
-
-describe('DocLint Public API', function() {
-  let browser;
-  let page;
-
-  before(async function() {
-    browser = await puppeteer.launch();
-    page = await browser.newPage();
-  });
-
-  after(async function() {
-    await browser.close();
-  });
-
-  describe('checkPublicAPI', function() {
-    it('diff-classes', testLint('diff-classes'));
-    it('diff-methods', testLint('diff-methods'));
-    it('diff-properties', testLint('diff-properties'));
-    it('diff-arguments', testLint('diff-arguments'));
-    it('diff-events', testLint('diff-events'));
-    it('check-duplicates', testLint('check-duplicates'));
-    it('check-sorting', testLint('check-sorting'));
-    it('check-returns', testLint('check-returns'));
-    it('js-builder-common', testJSBuilder('js-builder-common'));
-    it('js-builder-inheritance', testJSBuilder('js-builder-inheritance'));
-    it('md-builder-common', testMDBuilder('md-builder-common'));
-  });
-
-  function testLint(testName) {
-    return async () => {
-      const dirPath = path.join(__dirname, testName);
-      testUtils.extendExpectWithToBeGolden(dirPath, dirPath)
-
-      const mdSources = await Source.readdir(dirPath, '.md');
-      const jsSources = await Source.readdir(dirPath, '.js');
-      const messages = await checkPublicAPI(page, mdSources, jsSources);
-      const errors = messages.map(message => message.text);
-      expect(errors.join('\n')).toBeGolden('result.txt');
-    }
-  }
-
-  function testMDBuilder(testName) {
-    return async () => {
-      const dirPath = path.join(__dirname, testName);
-      testUtils.extendExpectWithToBeGolden(dirPath, dirPath);
-
-      const sources = await Source.readdir(dirPath, '.md');
-      const { documentation } = await mdBuilder(page, sources);
-      expect(serialize(documentation)).toBeGolden('result.txt');
-    }
-  }
-
-  function testJSBuilder(testName) {
-    return async () => {
-      const dirPath = path.join(__dirname, testName);
-      testUtils.extendExpectWithToBeGolden(dirPath, dirPath);
-
-      const sources = await Source.readdir(dirPath, '.js');
-      const { documentation } = await jsBuilder(sources);
-      expect(serialize(documentation)).toBeGolden('result.txt');
-    }
-  }
-
-  /**
-  * @param {import('../Documentation')} doc
-  */
-  function serialize(doc) {
-    const result = {
-      classes: doc.classesArray.map(cls => ({
-        name: cls.name,
-        members: cls.membersArray.map(serializeMember)
-      }))
-    };
-    return JSON.stringify(result, null, 2);
-  }
-  /**
-  * @param {import('../Documentation').Member} member
-  */
-  function serializeMember(member) {
-    return {
-      name: member.name,
-      type: serializeType(member.type),
-      kind: member.kind,
-      args: member.argsArray.length ? member.argsArray.map(serializeMember) : undefined
-    }
-  }
-  /**
-  * @param {import('../Documentation').Type} type
-  */
-  function serializeType(type) {
-    if (!type)
-      return undefined;
-    return {
-      name: type.name,
-      properties: type.properties.length ? type.properties.map(serializeMember) : undefined
-    }
-  }
-  })
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/cli.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/cli.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/cli.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/cli.js	2021-01-18 19:58:18.000000000 +0000
@@ -35,6 +35,14 @@
   const messages = [];
   let changedFiles = false;
 
+  if (!VERSION.endsWith('-post')) {
+    const versions = await Source.readFile(
+      path.join(PROJECT_DIR, 'versions.js')
+    );
+    versions.setText(versions.text().replace(`, 'NEXT'],`, `, '${VERSION}'],`));
+    await versions.save();
+  }
+
   // Documentation checks.
   const readme = await Source.readFile(path.join(PROJECT_DIR, 'README.md'));
   const contributing = await Source.readFile(
@@ -72,8 +80,12 @@
   const jsSources = [
     ...(await Source.readdir(path.join(PROJECT_DIR, 'lib'))),
     ...(await Source.readdir(path.join(PROJECT_DIR, 'lib', 'cjs'))),
-    ...(await Source.readdir(path.join(PROJECT_DIR, 'lib', 'cjs', 'common'))),
-    ...(await Source.readdir(path.join(PROJECT_DIR, 'lib', 'cjs', 'node'))),
+    ...(await Source.readdir(
+      path.join(PROJECT_DIR, 'lib', 'cjs', 'puppeteer', 'common')
+    )),
+    ...(await Source.readdir(
+      path.join(PROJECT_DIR, 'lib', 'cjs', 'puppeteer', 'node')
+    )),
   ];
   const allSrcCode = [...jsSources, ...tsSourcesNoDefinitions];
   messages.push(...(await checkPublicAPI(page, mdSources, allSrcCode)));
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/preprocessor/index.js firefox-85.0+build1/remote/test/puppeteer/utils/doclint/preprocessor/index.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/doclint/preprocessor/index.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/doclint/preprocessor/index.js	2021-01-18 19:58:18.000000000 +0000
@@ -77,6 +77,8 @@
       newText = generateTableOfContents(
         command.source.text().substring(command.to)
       );
+    else if (command.name === 'versions-per-release')
+      newText = generateVersionsPerRelease();
     if (newText === null)
       messages.push(Message.error(`Unknown command 'gen:${command.name}'`));
     else if (applyCommand(command, newText)) changedSources.add(command.source);
@@ -144,3 +146,20 @@
     '\n'
   );
 }
+
+const generateVersionsPerRelease = () => {
+  const versionsPerRelease = require('../../../versions.js');
+  const buffer = ['- Releases per Chromium version:'];
+  for (const [chromiumVersion, puppeteerVersion] of versionsPerRelease) {
+    if (puppeteerVersion === 'NEXT') continue;
+    buffer.push(
+      `  * Chromium ${chromiumVersion} - [Puppeteer ${puppeteerVersion}](https://github.com/puppeteer/puppeteer/blob/${puppeteerVersion}/docs/api.md)`
+    );
+  }
+  buffer.push(
+    `  * [All releases](https://github.com/puppeteer/puppeteer/releases)`
+  );
+
+  const output = '\n' + buffer.join('\n') + '\n';
+  return output;
+};
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/utils/protocol-types-generator/index.js firefox-85.0+build1/remote/test/puppeteer/utils/protocol-types-generator/index.js
--- firefox-84.0.2+build1/remote/test/puppeteer/utils/protocol-types-generator/index.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/utils/protocol-types-generator/index.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-// @ts-check
-const path = require('path');
-const puppeteer = require('../..');
-const { execSync } = require('child_process');
-
-const fetchAndGenerateProtocolDefinitions = () =>
-  puppeteer
-    .launch({
-      pipe: false,
-      executablePath: process.env.BINARY,
-    })
-    .then(async (browser) => {
-      const origin = browser
-        .wsEndpoint()
-        .match(/ws:\/\/([0-9A-Za-z:\.]*)\//)[1];
-      const page = await browser.newPage();
-      await page.goto(`http://${origin}/json/protocol`);
-      const json = JSON.parse(
-        await page.evaluate(() => document.documentElement.innerText)
-      );
-      const version = await browser.version();
-      await browser.close();
-      const output = `// This is generated from /utils/protocol-types-generator/index.js
-  type binary = string;
-
-declare module Protocol {${json.domains
-        .map(
-          (domain) => `${
-            domain.description
-              ? `
-    /**
-     * ${domain.description}
-     */`
-              : ''
-          }
-    export module ${domain.domain} {${(domain.types || [])
-            .map(
-              (type) =>
-                `${
-                  type.description
-                    ? `
-        /**
-         * ${type.description}
-         */`
-                    : ''
-                }${
-                  type.properties
-                    ? `
-        export interface ${type.id} {${(type.properties || [])
-                        .map(
-                          (property) => `${
-                            property.description
-                              ? `
-            /**
-             * ${property.description}
-             */`
-                              : ''
-                          }
-            ${property.name}${property.optional ? '?' : ''}: ${typeOfProperty(
-                            property
-                          )};`
-                        )
-                        .join(``)}
-        }`
-                    : `
-        export type ${type.id} = ${typeOfProperty(type)};`
-                }`
-            )
-            .join('')}
-        ${(domain.events || [])
-          .map(
-            (event) =>
-              `${
-                event.description
-                  ? `
-        /**
-         * ${event.description}
-         */`
-                  : ''
-              }${
-                event.parameters
-                  ? `
-        export type ${event.name}Payload = {${event.parameters
-                      .map(
-                        (parameter) => `${
-                          parameter.description
-                            ? `
-            /**
-             * ${parameter.description}
-             */`
-                            : ''
-                        }
-            ${parameter.name}${parameter.optional ? '?' : ''}: ${typeOfProperty(
-                          parameter
-                        )};`
-                      )
-                      .join(``)}
-        }`
-                  : `
-        export type ${event.name}Payload = void;`
-              }`
-          )
-          .join('')}
-        ${(domain.commands || [])
-          .map(
-            (command) => `${
-              command.description
-                ? `
-        /**
-         * ${command.description}
-         */`
-                : ''
-            }
-        export type ${command.name}Parameters = {${(command.parameters || [])
-              .map(
-                (parameter) => `${
-                  parameter.description
-                    ? `
-            /**
-             * ${parameter.description}
-             */`
-                    : ''
-                }
-            ${parameter.name}${parameter.optional ? '?' : ''}: ${typeOfProperty(
-                  parameter
-                )};`
-              )
-              .join(``)}
-        }
-        export type ${command.name}ReturnValue = {${(command.returns || [])
-              .map(
-                (retVal) => `${
-                  retVal.description
-                    ? `
-            /**
-             * ${retVal.description}
-             */`
-                    : ''
-                }
-            ${retVal.name}${retVal.optional ? '?' : ''}: ${typeOfProperty(
-                  retVal
-                )};`
-              )
-              .join(``)}
-        }`
-          )
-          .join('')}
-    }
-    `
-        )
-        .join('')}
-    export interface Events {${json.domains
-      .map((domain) =>
-        (domain.events || [])
-          .map(
-            (event) => `
-      "${domain.domain}.${event.name}": ${domain.domain}.${event.name}Payload;`
-          )
-          .join('')
-      )
-      .join('')}
-    }
-    export interface CommandParameters {${json.domains
-      .map((domain) =>
-        (domain.commands || [])
-          .map(
-            (command) => `
-      "${domain.domain}.${command.name}": ${domain.domain}.${command.name}Parameters;`
-          )
-          .join('')
-      )
-      .join('')}
-    }
-    export interface CommandReturnValues {${json.domains
-      .map((domain) =>
-        (domain.commands || [])
-          .map(
-            (command) => `
-      "${domain.domain}.${command.name}": ${domain.domain}.${command.name}ReturnValue;`
-          )
-          .join('')
-      )
-      .join('')}
-    }
-  }
-
-export default Protocol;
-`;
-
-      return { output, version };
-    });
-
-const protocolOutputPath = path.join(__dirname, '../../src/protocol.d.ts');
-const relativeProtocolOutputPath = path.relative(
-  process.cwd(),
-  protocolOutputPath
-);
-
-const writeOutputToDisk = ({ output, version }) => {
-  require('fs').writeFileSync(protocolOutputPath, output);
-  console.log(
-    `Wrote protocol.d.ts for ${version} to ${relativeProtocolOutputPath}`
-  );
-  console.log(`You should commit the changes.`);
-};
-
-const lastCommitMessage = () => {
-  return execSync('git log --no-merges -n 1', { encoding: 'utf8' });
-};
-
-const cli = async () => {
-  const scriptToRun = process.argv[2];
-  const changeExpected = lastCommitMessage().includes('EXPECTED_PROTOCOL_DIFF');
-
-  if (scriptToRun === 'update') {
-    writeOutputToDisk(await fetchAndGenerateProtocolDefinitions());
-  } else if (scriptToRun === 'compare') {
-    const { output } = await fetchAndGenerateProtocolDefinitions();
-    const outputOnDisk = require('fs').readFileSync(protocolOutputPath, {
-      encoding: 'utf8',
-    });
-    if (output === outputOnDisk) {
-      console.log(`Success: ${relativeProtocolOutputPath} is up to date.`);
-    } else if (changeExpected) {
-      console.log(`Warning: ${relativeProtocolOutputPath} is out of date`);
-
-      console.log(
-        '  continuing because EXPECTED_PROTOCOL_DIFF was found in the last commit message.'
-      );
-    } else {
-      console.log(`Error: ${relativeProtocolOutputPath} is out of date.`);
-      console.log(
-        'You should run `npm run update-protocol-d-ts` and commit the changes.'
-      );
-      process.exit(1);
-    }
-  } else {
-    console.log(`Unknown protocol script ${scriptToRun}.`);
-    console.log(`Valid scripts are:
-    - update: fetch and update ${relativeProtocolOutputPath}
-    - compare: check ${relativeProtocolOutputPath} is up to date with the latest CDP.
-    `);
-    process.exit(1);
-  }
-};
-
-cli();
-
-/**
- * @typedef {Object} Property
- * @property {string=} $ref
- * @property {!Array=} enum
- * @property {string=} type
- * @property {!Property=} items
- * @property {string=} description
- */
-
-/**
- * @param {!Property} property
- * @param {string=} domain
- */
-function typeOfProperty(property, domain) {
-  if (property.$ref)
-    return property.$ref.includes('.') || !domain
-      ? property.$ref
-      : domain + '.' + property.$ref;
-  if (property.enum)
-    return property.enum.map((value) => JSON.stringify(value)).join('|');
-  switch (property.type) {
-    case 'array':
-      return typeOfProperty(property.items, domain) + '[]';
-    case 'integer':
-      return 'number';
-  }
-  return property.type;
-}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+export default function(n){return{all:n=n||new Map,on:function(t,e){var i=n.get(t);i&&i.push(e)||n.set(t,[e])},off:function(t,e){var i=n.get(t);i&&i.splice(i.indexOf(e)>>>0,1)},emit:function(t,e){(n.get(t)||[]).slice().map(function(n){n(e)}),(n.get("*")||[]).slice().map(function(n){n(t,e)})}}}
+//# sourceMappingURL=mitt.es.js.map
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js.map firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js.map
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js.map	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.es.js.map	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+{"version":3,"file":"mitt.es.js","sources":["../src/index.ts"],"sourcesContent":["export type EventType = string | symbol;\n\n// An event handler can take an optional event argument\n// and should not return a value\nexport type Handler<T = any> = (event?: T) => void;\nexport type WildcardHandler = (type: EventType, event?: any) => void;\n\n// An array of all currently registered event handlers for a type\nexport type EventHandlerList = Array<Handler>;\nexport type WildCardEventHandlerList = Array<WildcardHandler>;\n\n// A map of event types and their corresponding event handlers.\nexport type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;\n\nexport interface Emitter {\n\tall: EventHandlerMap;\n\n\ton<T = any>(type: EventType, handler: Handler<T>): void;\n\ton(type: '*', handler: WildcardHandler): void;\n\n\toff<T = any>(type: EventType, handler: Handler<T>): void;\n\toff(type: '*', handler: WildcardHandler): void;\n\n\temit<T = any>(type: EventType, event?: T): void;\n\temit(type: '*', event?: any): void;\n}\n\n/**\n * Mitt: Tiny (~200b) functional event emitter / pubsub.\n * @name mitt\n * @returns {Mitt}\n */\nexport default function mitt(all?: EventHandlerMap): Emitter {\n\tall = all || new Map();\n\n\treturn {\n\n\t\t/**\n\t\t * A Map of event names to registered handler functions.\n\t\t */\n\t\tall,\n\n\t\t/**\n\t\t * Register an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to listen for, or `\"*\"` for all events\n\t\t * @param {Function} handler Function to call in response to given event\n\t\t * @memberOf mitt\n\t\t */\n\t\ton<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tconst added = handlers && handlers.push(handler);\n\t\t\tif (!added) {\n\t\t\t\tall.set(type, [handler]);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Remove an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to unregister `handler` from, or `\"*\"`\n\t\t * @param {Function} handler Handler function to remove\n\t\t * @memberOf mitt\n\t\t */\n\t\toff<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tif (handlers) {\n\t\t\t\thandlers.splice(handlers.indexOf(handler) >>> 0, 1);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Invoke all handlers for the given type.\n\t\t * If present, `\"*\"` handlers are invoked after type-matched handlers.\n\t\t *\n\t\t * Note: Manually firing \"*\" handlers is not supported.\n\t\t *\n\t\t * @param {string|symbol} type The event type to invoke\n\t\t * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler\n\t\t * @memberOf mitt\n\t\t */\n\t\temit<T = any>(type: EventType, evt: T) {\n\t\t\t((all.get(type) || []) as EventHandlerList).slice().map((handler) => { handler(evt); });\n\t\t\t((all.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => { handler(type, evt); });\n\t\t}\n\t};\n}\n"],"names":["all","Map","on","type","handler","handlers","get","push","set","off","splice","indexOf","emit","evt","slice","map"],"mappings":"wBAgC6BA,GAG5B,MAAO,CAKNA,IAPDA,EAAMA,GAAO,IAAIC,IAehBC,YAAYC,EAAiBC,GAC5B,IAAMC,EAAWL,EAAIM,IAAIH,GACXE,GAAYA,EAASE,KAAKH,IAEvCJ,EAAIQ,IAAIL,EAAM,CAACC,KAUjBK,aAAaN,EAAiBC,GAC7B,IAAMC,EAAWL,EAAIM,IAAIH,GACrBE,GACHA,EAASK,OAAOL,EAASM,QAAQP,KAAa,EAAG,IAcnDQ,cAAcT,EAAiBU,IAC5Bb,EAAIM,IAAIH,IAAS,IAAyBW,QAAQC,IAAI,SAACX,GAAcA,EAAQS,MAC7Eb,EAAIM,IAAI,MAAQ,IAAiCQ,QAAQC,IAAI,SAACX,GAAcA,EAAQD,EAAMU"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+module.exports=function(n){return{all:n=n||new Map,on:function(e,t){var i=n.get(e);i&&i.push(t)||n.set(e,[t])},off:function(e,t){var i=n.get(e);i&&i.splice(i.indexOf(t)>>>0,1)},emit:function(e,t){(n.get(e)||[]).slice().map(function(n){n(t)}),(n.get("*")||[]).slice().map(function(n){n(e,t)})}}};
+//# sourceMappingURL=mitt.js.map
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js.map firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js.map
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js.map	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.js.map	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+{"version":3,"file":"mitt.js","sources":["../src/index.ts"],"sourcesContent":["export type EventType = string | symbol;\n\n// An event handler can take an optional event argument\n// and should not return a value\nexport type Handler<T = any> = (event?: T) => void;\nexport type WildcardHandler = (type: EventType, event?: any) => void;\n\n// An array of all currently registered event handlers for a type\nexport type EventHandlerList = Array<Handler>;\nexport type WildCardEventHandlerList = Array<WildcardHandler>;\n\n// A map of event types and their corresponding event handlers.\nexport type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;\n\nexport interface Emitter {\n\tall: EventHandlerMap;\n\n\ton<T = any>(type: EventType, handler: Handler<T>): void;\n\ton(type: '*', handler: WildcardHandler): void;\n\n\toff<T = any>(type: EventType, handler: Handler<T>): void;\n\toff(type: '*', handler: WildcardHandler): void;\n\n\temit<T = any>(type: EventType, event?: T): void;\n\temit(type: '*', event?: any): void;\n}\n\n/**\n * Mitt: Tiny (~200b) functional event emitter / pubsub.\n * @name mitt\n * @returns {Mitt}\n */\nexport default function mitt(all?: EventHandlerMap): Emitter {\n\tall = all || new Map();\n\n\treturn {\n\n\t\t/**\n\t\t * A Map of event names to registered handler functions.\n\t\t */\n\t\tall,\n\n\t\t/**\n\t\t * Register an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to listen for, or `\"*\"` for all events\n\t\t * @param {Function} handler Function to call in response to given event\n\t\t * @memberOf mitt\n\t\t */\n\t\ton<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tconst added = handlers && handlers.push(handler);\n\t\t\tif (!added) {\n\t\t\t\tall.set(type, [handler]);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Remove an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to unregister `handler` from, or `\"*\"`\n\t\t * @param {Function} handler Handler function to remove\n\t\t * @memberOf mitt\n\t\t */\n\t\toff<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tif (handlers) {\n\t\t\t\thandlers.splice(handlers.indexOf(handler) >>> 0, 1);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Invoke all handlers for the given type.\n\t\t * If present, `\"*\"` handlers are invoked after type-matched handlers.\n\t\t *\n\t\t * Note: Manually firing \"*\" handlers is not supported.\n\t\t *\n\t\t * @param {string|symbol} type The event type to invoke\n\t\t * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler\n\t\t * @memberOf mitt\n\t\t */\n\t\temit<T = any>(type: EventType, evt: T) {\n\t\t\t((all.get(type) || []) as EventHandlerList).slice().map((handler) => { handler(evt); });\n\t\t\t((all.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => { handler(type, evt); });\n\t\t}\n\t};\n}\n"],"names":["all","Map","on","type","handler","handlers","get","push","set","off","splice","indexOf","emit","evt","slice","map"],"mappings":"wBAgC6BA,GAG5B,MAAO,CAKNA,IAPDA,EAAMA,GAAO,IAAIC,IAehBC,YAAYC,EAAiBC,GAC5B,IAAMC,EAAWL,EAAIM,IAAIH,GACXE,GAAYA,EAASE,KAAKH,IAEvCJ,EAAIQ,IAAIL,EAAM,CAACC,KAUjBK,aAAaN,EAAiBC,GAC7B,IAAMC,EAAWL,EAAIM,IAAIH,GACrBE,GACHA,EAASK,OAAOL,EAASM,QAAQP,KAAa,EAAG,IAcnDQ,cAAcT,EAAiBU,IAC5Bb,EAAIM,IAAIH,IAAS,IAAyBW,QAAQC,IAAI,SAACX,GAAcA,EAAQS,MAC7Eb,EAAIM,IAAI,MAAQ,IAAiCQ,QAAQC,IAAI,SAACX,GAAcA,EAAQD,EAAMU"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+export default function(e){return{all:e=e||new Map,on(t,n){const s=e.get(t);s&&s.push(n)||e.set(t,[n])},off(t,n){const s=e.get(t);s&&s.splice(s.indexOf(n)>>>0,1)},emit(t,n){(e.get(t)||[]).slice().map(e=>{e(n)}),(e.get("*")||[]).slice().map(e=>{e(t,n)})}}}
+//# sourceMappingURL=mitt.modern.js.map
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js.map firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js.map
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js.map	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.modern.js.map	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1 @@
+{"version":3,"file":"mitt.modern.js","sources":["../src/index.ts"],"sourcesContent":["export type EventType = string | symbol;\n\n// An event handler can take an optional event argument\n// and should not return a value\nexport type Handler<T = any> = (event?: T) => void;\nexport type WildcardHandler = (type: EventType, event?: any) => void;\n\n// An array of all currently registered event handlers for a type\nexport type EventHandlerList = Array<Handler>;\nexport type WildCardEventHandlerList = Array<WildcardHandler>;\n\n// A map of event types and their corresponding event handlers.\nexport type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;\n\nexport interface Emitter {\n\tall: EventHandlerMap;\n\n\ton<T = any>(type: EventType, handler: Handler<T>): void;\n\ton(type: '*', handler: WildcardHandler): void;\n\n\toff<T = any>(type: EventType, handler: Handler<T>): void;\n\toff(type: '*', handler: WildcardHandler): void;\n\n\temit<T = any>(type: EventType, event?: T): void;\n\temit(type: '*', event?: any): void;\n}\n\n/**\n * Mitt: Tiny (~200b) functional event emitter / pubsub.\n * @name mitt\n * @returns {Mitt}\n */\nexport default function mitt(all?: EventHandlerMap): Emitter {\n\tall = all || new Map();\n\n\treturn {\n\n\t\t/**\n\t\t * A Map of event names to registered handler functions.\n\t\t */\n\t\tall,\n\n\t\t/**\n\t\t * Register an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to listen for, or `\"*\"` for all events\n\t\t * @param {Function} handler Function to call in response to given event\n\t\t * @memberOf mitt\n\t\t */\n\t\ton<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tconst added = handlers && handlers.push(handler);\n\t\t\tif (!added) {\n\t\t\t\tall.set(type, [handler]);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Remove an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to unregister `handler` from, or `\"*\"`\n\t\t * @param {Function} handler Handler function to remove\n\t\t * @memberOf mitt\n\t\t */\n\t\toff<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tif (handlers) {\n\t\t\t\thandlers.splice(handlers.indexOf(handler) >>> 0, 1);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Invoke all handlers for the given type.\n\t\t * If present, `\"*\"` handlers are invoked after type-matched handlers.\n\t\t *\n\t\t * Note: Manually firing \"*\" handlers is not supported.\n\t\t *\n\t\t * @param {string|symbol} type The event type to invoke\n\t\t * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler\n\t\t * @memberOf mitt\n\t\t */\n\t\temit<T = any>(type: EventType, evt: T) {\n\t\t\t((all.get(type) || []) as EventHandlerList).slice().map((handler) => { handler(evt); });\n\t\t\t((all.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => { handler(type, evt); });\n\t\t}\n\t};\n}\n"],"names":["all","Map","on","type","handler","handlers","get","push","set","off","splice","indexOf","emit","evt","slice","map"],"mappings":"wBAgC6BA,GAG5B,MAAO,CAKNA,IAPDA,EAAMA,GAAO,IAAIC,IAehBC,GAAYC,EAAiBC,GAC5B,MAAMC,EAAWL,EAAIM,IAAIH,GACXE,GAAYA,EAASE,KAAKH,IAEvCJ,EAAIQ,IAAIL,EAAM,CAACC,KAUjBK,IAAaN,EAAiBC,GAC7B,MAAMC,EAAWL,EAAIM,IAAIH,GACrBE,GACHA,EAASK,OAAOL,EAASM,QAAQP,KAAa,EAAG,IAcnDQ,KAAcT,EAAiBU,IAC5Bb,EAAIM,IAAIH,IAAS,IAAyBW,QAAQC,IAAKX,IAAcA,EAAQS,MAC7Eb,EAAIM,IAAI,MAAQ,IAAiCQ,QAAQC,IAAKX,IAAcA,EAAQD,EAAMU"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,2 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).mitt=n()}(this,function(){return function(e){return{all:e=e||new Map,on:function(n,t){var f=e.get(n);f&&f.push(t)||e.set(n,[t])},off:function(n,t){var f=e.get(n);f&&f.splice(f.indexOf(t)>>>0,1)},emit:function(n,t){(e.get(n)||[]).slice().map(function(e){e(t)}),(e.get("*")||[]).slice().map(function(e){e(n,t)})}}}});
+//# sourceMappingURL=mitt.umd.js.map
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js.map firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js.map
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js.map	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/dist/mitt.umd.js.map	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+{"version":3,"file":"mitt.umd.js","sources":["../src/index.ts"],"sourcesContent":["export type EventType = string | symbol;\n\n// An event handler can take an optional event argument\n// and should not return a value\nexport type Handler<T = any> = (event?: T) => void;\nexport type WildcardHandler = (type: EventType, event?: any) => void;\n\n// An array of all currently registered event handlers for a type\nexport type EventHandlerList = Array<Handler>;\nexport type WildCardEventHandlerList = Array<WildcardHandler>;\n\n// A map of event types and their corresponding event handlers.\nexport type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;\n\nexport interface Emitter {\n\tall: EventHandlerMap;\n\n\ton<T = any>(type: EventType, handler: Handler<T>): void;\n\ton(type: '*', handler: WildcardHandler): void;\n\n\toff<T = any>(type: EventType, handler: Handler<T>): void;\n\toff(type: '*', handler: WildcardHandler): void;\n\n\temit<T = any>(type: EventType, event?: T): void;\n\temit(type: '*', event?: any): void;\n}\n\n/**\n * Mitt: Tiny (~200b) functional event emitter / pubsub.\n * @name mitt\n * @returns {Mitt}\n */\nexport default function mitt(all?: EventHandlerMap): Emitter {\n\tall = all || new Map();\n\n\treturn {\n\n\t\t/**\n\t\t * A Map of event names to registered handler functions.\n\t\t */\n\t\tall,\n\n\t\t/**\n\t\t * Register an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to listen for, or `\"*\"` for all events\n\t\t * @param {Function} handler Function to call in response to given event\n\t\t * @memberOf mitt\n\t\t */\n\t\ton<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tconst added = handlers && handlers.push(handler);\n\t\t\tif (!added) {\n\t\t\t\tall.set(type, [handler]);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Remove an event handler for the given type.\n\t\t * @param {string|symbol} type Type of event to unregister `handler` from, or `\"*\"`\n\t\t * @param {Function} handler Handler function to remove\n\t\t * @memberOf mitt\n\t\t */\n\t\toff<T = any>(type: EventType, handler: Handler<T>) {\n\t\t\tconst handlers = all.get(type);\n\t\t\tif (handlers) {\n\t\t\t\thandlers.splice(handlers.indexOf(handler) >>> 0, 1);\n\t\t\t}\n\t\t},\n\n\t\t/**\n\t\t * Invoke all handlers for the given type.\n\t\t * If present, `\"*\"` handlers are invoked after type-matched handlers.\n\t\t *\n\t\t * Note: Manually firing \"*\" handlers is not supported.\n\t\t *\n\t\t * @param {string|symbol} type The event type to invoke\n\t\t * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler\n\t\t * @memberOf mitt\n\t\t */\n\t\temit<T = any>(type: EventType, evt: T) {\n\t\t\t((all.get(type) || []) as EventHandlerList).slice().map((handler) => { handler(evt); });\n\t\t\t((all.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => { handler(type, evt); });\n\t\t}\n\t};\n}\n"],"names":["all","Map","on","type","handler","handlers","get","push","set","off","splice","indexOf","emit","evt","slice","map"],"mappings":"6LAgC6BA,GAG5B,MAAO,CAKNA,IAPDA,EAAMA,GAAO,IAAIC,IAehBC,YAAYC,EAAiBC,GAC5B,IAAMC,EAAWL,EAAIM,IAAIH,GACXE,GAAYA,EAASE,KAAKH,IAEvCJ,EAAIQ,IAAIL,EAAM,CAACC,KAUjBK,aAAaN,EAAiBC,GAC7B,IAAMC,EAAWL,EAAIM,IAAIH,GACrBE,GACHA,EAASK,OAAOL,EAASM,QAAQP,KAAa,EAAG,IAcnDQ,cAAcT,EAAiBU,IAC5Bb,EAAIM,IAAIH,IAAS,IAAyBW,QAAQC,IAAI,SAACX,GAAcA,EAAQS,MAC7Eb,EAAIM,IAAI,MAAQ,IAAiCQ,QAAQC,IAAI,SAACX,GAAcA,EAAQD,EAAMU"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/index.d.ts firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/index.d.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/index.d.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/index.d.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,21 @@
+export declare type EventType = string | symbol;
+export declare type Handler<T = any> = (event?: T) => void;
+export declare type WildcardHandler = (type: EventType, event?: any) => void;
+export declare type EventHandlerList = Array<Handler>;
+export declare type WildCardEventHandlerList = Array<WildcardHandler>;
+export declare type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;
+export interface Emitter {
+    all: EventHandlerMap;
+    on<T = any>(type: EventType, handler: Handler<T>): void;
+    on(type: '*', handler: WildcardHandler): void;
+    off<T = any>(type: EventType, handler: Handler<T>): void;
+    off(type: '*', handler: WildcardHandler): void;
+    emit<T = any>(type: EventType, event?: T): void;
+    emit(type: '*', event?: any): void;
+}
+/**
+ * Mitt: Tiny (~200b) functional event emitter / pubsub.
+ * @name mitt
+ * @returns {Mitt}
+ */
+export default function mitt(all?: EventHandlerMap): Emitter;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/package.json firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/package.json
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/package.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/package.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,141 @@
+{
+  "_from": "mitt@latest",
+  "_id": "mitt@2.1.0",
+  "_inBundle": false,
+  "_integrity": "sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==",
+  "_location": "/mitt",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "mitt@latest",
+    "name": "mitt",
+    "escapedName": "mitt",
+    "rawSpec": "latest",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/mitt/-/mitt-2.1.0.tgz",
+  "_shasum": "f740577c23176c6205b121b2973514eade1b2230",
+  "_spec": "mitt@latest",
+  "_where": "/Users/jacktfranklin/src/puppeteer",
+  "authors": [
+    "Jason Miller <jason@developit.ca>"
+  ],
+  "bugs": {
+    "url": "https://github.com/developit/mitt/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "Tiny 200b functional Event Emitter / pubsub.",
+  "devDependencies": {
+    "@types/chai": "^4.2.11",
+    "@types/mocha": "^7.0.2",
+    "@types/sinon": "^9.0.4",
+    "@types/sinon-chai": "^3.2.4",
+    "@typescript-eslint/eslint-plugin": "^3.0.1",
+    "@typescript-eslint/parser": "^3.0.1",
+    "chai": "^4.2.0",
+    "documentation": "^13.0.0",
+    "eslint": "^7.1.0",
+    "eslint-config-developit": "^1.2.0",
+    "esm": "^3.2.25",
+    "microbundle": "^0.12.3",
+    "mocha": "^8.0.1",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^3.0.2",
+    "sinon": "^9.0.2",
+    "sinon-chai": "^3.5.0",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.9.3"
+  },
+  "eslintConfig": {
+    "extends": [
+      "developit",
+      "plugin:@typescript-eslint/eslint-recommended",
+      "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+      "sourceType": "module"
+    },
+    "env": {
+      "browser": true,
+      "mocha": true,
+      "jest": false,
+      "es6": true
+    },
+    "globals": {
+      "expect": true
+    },
+    "rules": {
+      "semi": [
+        2,
+        "always"
+      ],
+      "jest/valid-expect": 0,
+      "@typescript-eslint/no-explicit-any": 0,
+      "@typescript-eslint/explicit-function-return-type": 0,
+      "@typescript-eslint/explicit-module-boundary-types": 0,
+      "@typescript-eslint/no-empty-function": 0
+    }
+  },
+  "eslintIgnore": [
+    "dist",
+    "index.d.ts"
+  ],
+  "esmodules": "dist/mitt.modern.js",
+  "files": [
+    "src",
+    "dist",
+    "index.d.ts"
+  ],
+  "homepage": "https://github.com/developit/mitt",
+  "jsnext:main": "dist/mitt.es.js",
+  "keywords": [
+    "events",
+    "eventemitter",
+    "emitter",
+    "pubsub"
+  ],
+  "license": "MIT",
+  "main": "dist/mitt.js",
+  "mocha": {
+    "extension": [
+      "ts"
+    ],
+    "require": [
+      "ts-node/register",
+      "esm"
+    ],
+    "spec": [
+      "test/*_test.ts"
+    ]
+  },
+  "module": "dist/mitt.es.js",
+  "name": "mitt",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/developit/mitt.git"
+  },
+  "scripts": {
+    "build": "npm-run-all --silent clean -p bundle -s docs",
+    "bundle": "microbundle",
+    "clean": "rimraf dist",
+    "docs": "documentation readme src/index.ts --section API -q --parse-extension ts",
+    "lint": "eslint src test --ext ts --ext js",
+    "mocha": "mocha test",
+    "release": "npm run -s build -s && npm t && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish",
+    "test": "npm-run-all --silent typecheck lint mocha test-types",
+    "test-types": "tsc test/test-types-compilation.ts --noEmit",
+    "typecheck": "tsc --noEmit"
+  },
+  "source": "src/index.ts",
+  "typings": "index.d.ts",
+  "umd:main": "dist/mitt.umd.js",
+  "version": "2.1.0"
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/README.md firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/README.md
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/README.md	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,179 @@
+<p align="center">
+  <img src="https://i.imgur.com/BqsX9NT.png" width="300" height="300" alt="mitt">
+  <br>
+  <a href="https://www.npmjs.org/package/mitt"><img src="https://img.shields.io/npm/v/mitt.svg" alt="npm"></a>
+  <img src="https://github.com/developit/mitt/workflows/CI/badge.svg" alt="build status">
+  <a href="https://unpkg.com/mitt/dist/mitt.js"><img src="https://img.badgesize.io/https://unpkg.com/mitt/dist/mitt.js?compression=gzip" alt="gzip size"></a>
+</p>
+
+# Mitt
+
+> Tiny 200b functional event emitter / pubsub.
+
+-   **Microscopic:** weighs less than 200 bytes gzipped
+-   **Useful:** a wildcard `"*"` event type listens to all events
+-   **Familiar:** same names & ideas as [Node's EventEmitter](https://nodejs.org/api/events.html#events_class_eventemitter)
+-   **Functional:** methods don't rely on `this`
+-   **Great Name:** somehow [mitt](https://npm.im/mitt) wasn't taken
+
+Mitt was made for the browser, but works in any JavaScript runtime. It has no dependencies and supports IE9+.
+
+## Table of Contents
+
+-   [Install](#install)
+-   [Usage](#usage)
+-   [Examples & Demos](#examples--demos)
+-   [API](#api)
+-   [Contribute](#contribute)
+-   [License](#license)
+
+## Install
+
+This project uses [node](http://nodejs.org) and [npm](https://npmjs.com). Go check them out if you don't have them locally installed.
+
+```sh
+$ npm install --save mitt
+```
+
+Then with a module bundler like [rollup](http://rollupjs.org/) or [webpack](https://webpack.js.org/), use as you would anything else:
+
+```javascript
+// using ES6 modules
+import mitt from 'mitt'
+
+// using CommonJS modules
+var mitt = require('mitt')
+```
+
+The [UMD](https://github.com/umdjs/umd) build is also available on [unpkg](https://unpkg.com):
+
+```html
+<script src="https://unpkg.com/mitt/dist/mitt.umd.js"></script>
+```
+
+You can find the library on `window.mitt`.
+
+## Usage
+
+```js
+import mitt from 'mitt'
+
+const emitter = mitt()
+
+// listen to an event
+emitter.on('foo', e => console.log('foo', e) )
+
+// listen to all events
+emitter.on('*', (type, e) => console.log(type, e) )
+
+// fire an event
+emitter.emit('foo', { a: 'b' })
+
+// clearing all events
+emitter.all.clear()
+
+// working with handler references:
+function onFoo() {}
+emitter.on('foo', onFoo)   // listen
+emitter.off('foo', onFoo)  // unlisten
+```
+
+### Typescript
+
+```ts
+import mitt from 'mitt';
+const emitter: mitt.Emitter = mitt();
+```
+
+## Examples & Demos
+
+<a href="http://codepen.io/developit/pen/rjMEwW?editors=0110">
+  <b>Preact + Mitt Codepen Demo</b>
+  <br>
+  <img src="https://i.imgur.com/CjBgOfJ.png" width="278" alt="preact + mitt preview">
+</a>
+
+* * *
+
+## API
+
+<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
+
+#### Table of Contents
+
+-   [mitt](#mitt)
+-   [all](#all)
+-   [on](#on)
+    -   [Parameters](#parameters)
+-   [off](#off)
+    -   [Parameters](#parameters-1)
+-   [emit](#emit)
+    -   [Parameters](#parameters-2)
+
+### mitt
+
+Mitt: Tiny (~200b) functional event emitter / pubsub.
+
+Returns **Mitt** 
+
+### all
+
+A Map of event names to registered handler functions.
+
+### on
+
+Register an event handler for the given type.
+
+#### Parameters
+
+-   `type` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) \| [symbol](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Symbol))** Type of event to listen for, or `"*"` for all events
+-   `handler` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** Function to call in response to given event
+
+### off
+
+Remove an event handler for the given type.
+
+#### Parameters
+
+-   `type` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) \| [symbol](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Symbol))** Type of event to unregister `handler` from, or `"*"`
+-   `handler` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** Handler function to remove
+
+### emit
+
+Invoke all handlers for the given type.
+If present, `"*"` handlers are invoked after type-matched handlers.
+
+Note: Manually firing "\*" handlers is not supported.
+
+#### Parameters
+
+-   `type` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) \| [symbol](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Symbol))** The event type to invoke
+-   `evt` **Any?** Any value (object is recommended and powerful), passed to each handler
+
+## Contribute
+
+First off, thanks for taking the time to contribute!
+Now, take a moment to be sure your contributions make sense to everyone else.
+
+### Reporting Issues
+
+Found a problem? Want a new feature? First of all see if your issue or idea has [already been reported](../../issues).
+If don't, just open a [new clear and descriptive issue](../../issues/new).
+
+### Submitting pull requests
+
+Pull requests are the greatest contributions, so be sure they are focused in scope, and do avoid unrelated commits.
+
+-   Fork it!
+-   Clone your fork: `git clone https://github.com/<your-username>/mitt`
+-   Navigate to the newly cloned directory: `cd mitt`
+-   Create a new branch for the new feature: `git checkout -b my-new-feature`
+-   Install the tools necessary for development: `npm install`
+-   Make your changes.
+-   Commit your changes: `git commit -am 'Add some feature'`
+-   Push to the branch: `git push origin my-new-feature`
+-   Submit a pull request with full remarks documenting your changes.
+
+## License
+
+[MIT License](https://opensource.org/licenses/MIT) © [Jason Miller](https://jasonformat.com/)
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/src/index.ts firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/src/index.ts
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/mitt/src/index.ts	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/mitt/src/index.ts	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,85 @@
+export type EventType = string | symbol;
+
+// An event handler can take an optional event argument
+// and should not return a value
+export type Handler<T = any> = (event?: T) => void;
+export type WildcardHandler = (type: EventType, event?: any) => void;
+
+// An array of all currently registered event handlers for a type
+export type EventHandlerList = Array<Handler>;
+export type WildCardEventHandlerList = Array<WildcardHandler>;
+
+// A map of event types and their corresponding event handlers.
+export type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>;
+
+export interface Emitter {
+	all: EventHandlerMap;
+
+	on<T = any>(type: EventType, handler: Handler<T>): void;
+	on(type: '*', handler: WildcardHandler): void;
+
+	off<T = any>(type: EventType, handler: Handler<T>): void;
+	off(type: '*', handler: WildcardHandler): void;
+
+	emit<T = any>(type: EventType, event?: T): void;
+	emit(type: '*', event?: any): void;
+}
+
+/**
+ * Mitt: Tiny (~200b) functional event emitter / pubsub.
+ * @name mitt
+ * @returns {Mitt}
+ */
+export default function mitt(all?: EventHandlerMap): Emitter {
+	all = all || new Map();
+
+	return {
+
+		/**
+		 * A Map of event names to registered handler functions.
+		 */
+		all,
+
+		/**
+		 * Register an event handler for the given type.
+		 * @param {string|symbol} type Type of event to listen for, or `"*"` for all events
+		 * @param {Function} handler Function to call in response to given event
+		 * @memberOf mitt
+		 */
+		on<T = any>(type: EventType, handler: Handler<T>) {
+			const handlers = all.get(type);
+			const added = handlers && handlers.push(handler);
+			if (!added) {
+				all.set(type, [handler]);
+			}
+		},
+
+		/**
+		 * Remove an event handler for the given type.
+		 * @param {string|symbol} type Type of event to unregister `handler` from, or `"*"`
+		 * @param {Function} handler Handler function to remove
+		 * @memberOf mitt
+		 */
+		off<T = any>(type: EventType, handler: Handler<T>) {
+			const handlers = all.get(type);
+			if (handlers) {
+				handlers.splice(handlers.indexOf(handler) >>> 0, 1);
+			}
+		},
+
+		/**
+		 * Invoke all handlers for the given type.
+		 * If present, `"*"` handlers are invoked after type-matched handlers.
+		 *
+		 * Note: Manually firing "*" handlers is not supported.
+		 *
+		 * @param {string|symbol} type The event type to invoke
+		 * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler
+		 * @memberOf mitt
+		 */
+		emit<T = any>(type: EventType, evt: T) {
+			((all.get(type) || []) as EventHandlerList).slice().map((handler) => { handler(evt); });
+			((all.get('*') || []) as WildCardEventHandlerList).slice().map((handler) => { handler(type, evt); });
+		}
+	};
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/README.md firefox-85.0+build1/remote/test/puppeteer/vendor/README.md
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/README.md	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,13 @@
+# Vendoring third party dependencies
+
+Because we are working towards an agnostic Puppeteer that can run in any environment (see [#6125](https://github.com/puppeteer/puppeteer/issues/6125)) we cannot import common dependencies in a way that relies on Node's resolution to find them. For example, `import mitt from 'mitt'` works fine in Node, but in an ESM build running in the browser, the browser has no idea where to find `'mitt'`.
+
+Therefore we put all common dependencies into this directory, `vendor`. This means there are extra criteria for these dependencies; ideally they will not depend on any other modules. If they do, we should consider an alternative way of managing our dependencies.
+
+The process for updating a vendored dependency is:
+
+1. `npm install {DEP NAME HERE}`
+2. `cp -r node_modules/DEP vendor`
+3. Update `eslintrc.js` to forbid importing DEP directly (see the `Mitt` rule already defined in there).
+4. Use the new DEP, and run `npm run tsc` to check everything compiles successfully.
+5. If the dep ships as compiled JS, you may need to disable TypeScript checking the file. Add an entry to the `excludes` property of the TSConfig files in `vendor`. (again, see the entry that's already there for Mitt as an example). Don't forget to update both the ESM and CJS config files.
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/tsconfig.cjs.json firefox-85.0+build1/remote/test/puppeteer/vendor/tsconfig.cjs.json
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/tsconfig.cjs.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/tsconfig.cjs.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.base.json",
+  "exclude": [
+    "mitt/dist"
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "../lib/cjs/vendor",
+    "module": "CommonJS"
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/vendor/tsconfig.esm.json firefox-85.0+build1/remote/test/puppeteer/vendor/tsconfig.esm.json
--- firefox-84.0.2+build1/remote/test/puppeteer/vendor/tsconfig.esm.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/vendor/tsconfig.esm.json	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.base.json",
+  "exclude": [
+    "mitt/dist"
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "../lib/esm/vendor",
+    "module": "esnext"
+  }
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/.versionrc firefox-85.0+build1/remote/test/puppeteer/.versionrc
--- firefox-84.0.2+build1/remote/test/puppeteer/.versionrc	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/.versionrc	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,3 @@
+{
+  "releaseCommitMessageFormat": "chore(release): mark v{{currentTag}}"
+}
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/versions.js firefox-85.0+build1/remote/test/puppeteer/versions.js
--- firefox-84.0.2+build1/remote/test/puppeteer/versions.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/versions.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const versionsPerRelease = new Map([
+  // This is a mapping from Chromium version => Puppeteer version.
+  // In Chromium roll patches, use 'NEXT' for the Puppeteer version.
+  ['88.0.4298.0', '5.5.0'],
+  ['87.0.4272.0', 'v5.4.0'],
+  ['86.0.4240.0', 'v5.3.0'],
+  ['85.0.4182.0', 'v5.2.1'],
+  ['84.0.4147.0', 'v5.1.0'],
+  ['83.0.4103.0', 'v3.1.0'],
+  ['81.0.4044.0', 'v3.0.0'],
+  ['80.0.3987.0', 'v2.1.0'],
+  ['79.0.3942.0', 'v2.0.0'],
+  ['78.0.3882.0', 'v1.20.0'],
+  ['77.0.3803.0', 'v1.19.0'],
+  ['76.0.3803.0', 'v1.17.0'],
+  ['75.0.3765.0', 'v1.15.0'],
+  ['74.0.3723.0', 'v1.13.0'],
+  ['73.0.3679.0', 'v1.12.2'],
+]);
+
+module.exports = versionsPerRelease;
diff -Nru firefox-84.0.2+build1/remote/test/puppeteer/web-test-runner.config.js firefox-85.0+build1/remote/test/puppeteer/web-test-runner.config.js
--- firefox-84.0.2+build1/remote/test/puppeteer/web-test-runner.config.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/remote/test/puppeteer/web-test-runner.config.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2020 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const { chromeLauncher } = require('@web/test-runner-chrome');
+
+module.exports = {
+  files: ['test-browser/**/*.spec.js'],
+  browsers: [
+    chromeLauncher({
+      async createPage({ browser }) {
+        const page = await browser.newPage();
+        page.evaluateOnNewDocument((wsEndpoint) => {
+          window.__ENV__ = { wsEndpoint };
+        }, browser.wsEndpoint());
+
+        return page;
+      },
+    }),
+  ],
+  plugins: [
+    {
+      // turn expect UMD into an es module
+      name: 'esmify-expect',
+      transform(context) {
+        if (context.path === '/node_modules/expect/build-es5/index.js') {
+          return `const module = {}; const exports = {};\n${context.body};\n export default module.exports;`;
+        }
+      },
+    },
+  ],
+};
diff -Nru firefox-84.0.2+build1/security/certverifier/CertVerifier.cpp firefox-85.0+build1/security/certverifier/CertVerifier.cpp
--- firefox-84.0.2+build1/security/certverifier/CertVerifier.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/certverifier/CertVerifier.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -11,6 +11,7 @@
 #include "CTDiversityPolicy.h"
 #include "CTKnownLogs.h"
 #include "CTLogVerifier.h"
+#include "CSTrustDomain.h"
 #include "ExtendedValidation.h"
 #include "MultiLogCTVerifier.h"
 #include "NSSCertDBTrustDomain.h"
@@ -19,12 +20,14 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Casting.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/Logging.h"
 #include "nsNSSComponent.h"
 #include "nsPromiseFlatString.h"
 #include "nsServiceManagerUtils.h"
 #include "pk11pub.h"
 #include "mozpkix/pkix.h"
 #include "mozpkix/pkixnss.h"
+#include "mozpkix/pkixutil.h"
 #include "secmod.h"
 
 using namespace mozilla::ct;
@@ -90,7 +93,6 @@
                            BRNameMatchingPolicy::Mode nameMatchingMode,
                            NetscapeStepUpPolicy netscapeStepUpPolicy,
                            CertificateTransparencyMode ctMode,
-                           DistrustedCAPolicy distrustedCAPolicy,
                            CRLiteMode crliteMode,
                            uint64_t crliteCTMergeDelaySeconds,
                            const Vector<EnterpriseCert>& thirdPartyCerts)
@@ -104,7 +106,6 @@
       mNameMatchingMode(nameMatchingMode),
       mNetscapeStepUpPolicy(netscapeStepUpPolicy),
       mCTMode(ctMode),
-      mDistrustedCAPolicy(distrustedCAPolicy),
       mCRLiteMode(crliteMode),
       mCRLiteCTMergeDelaySeconds(crliteCTMergeDelaySeconds) {
   LoadKnownCTLogs();
@@ -480,7 +481,7 @@
     /*optional out*/ SHA1ModeResult* sha1ModeResult,
     /*optional out*/ PinningTelemetryInfo* pinningTelemetryInfo,
     /*optional out*/ CertificateTransparencyInfo* ctInfo,
-    /*optional out*/ CRLiteTelemetryInfo* crliteInfo) {
+    /*optional out*/ CRLiteLookupResult* crliteLookupResult) {
   MOZ_LOG(gCertVerifierLog, LogLevel::Debug, ("Top of VerifyCert\n"));
 
   MOZ_ASSERT(cert);
@@ -536,8 +537,8 @@
       (mOCSPDownloadConfig == ocspOff) || (mOCSPDownloadConfig == ocspEVOnly) ||
               (flags & FLAG_LOCAL_ONLY)
           ? NSSCertDBTrustDomain::NeverFetchOCSP
-          : !mOCSPStrict ? NSSCertDBTrustDomain::FetchOCSPForDVSoftFail
-                         : NSSCertDBTrustDomain::FetchOCSPForDVHardFail;
+      : !mOCSPStrict ? NSSCertDBTrustDomain::FetchOCSPForDVSoftFail
+                     : NSSCertDBTrustDomain::FetchOCSPForDVHardFail;
 
   Input stapledOCSPResponseInput;
   const Input* stapledOCSPResponse = nullptr;
@@ -567,9 +568,8 @@
           trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, mOCSPTimeoutSoft,
           mOCSPTimeoutHard, mCertShortLifetimeInDays, pinningDisabled,
           MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff,
-          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch,
-          mDistrustedCAPolicy, mCRLiteMode, mCRLiteCTMergeDelaySeconds,
-          originAttributes, mThirdPartyRootInputs,
+          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, mCRLiteMode,
+          mCRLiteCTMergeDelaySeconds, originAttributes, mThirdPartyRootInputs,
           mThirdPartyIntermediateInputs, extraCertificates, builtChain, nullptr,
           nullptr);
       rv = BuildCertChain(
@@ -637,19 +637,18 @@
         if (pinningTelemetryInfo) {
           pinningTelemetryInfo->Reset();
         }
-        if (crliteInfo) {
-          crliteInfo->Reset();
+        if (crliteLookupResult) {
+          *crliteLookupResult = CRLiteLookupResult::NeverChecked;
         }
 
         NSSCertDBTrustDomain trustDomain(
             trustSSL, evOCSPFetching, mOCSPCache, pinArg, mOCSPTimeoutSoft,
             mOCSPTimeoutHard, mCertShortLifetimeInDays, mPinningMode,
             MIN_RSA_BITS, ValidityCheckingMode::CheckForEV,
-            sha1ModeConfigurations[i], mNetscapeStepUpPolicy,
-            mDistrustedCAPolicy, mCRLiteMode, mCRLiteCTMergeDelaySeconds,
-            originAttributes, mThirdPartyRootInputs,
+            sha1ModeConfigurations[i], mNetscapeStepUpPolicy, mCRLiteMode,
+            mCRLiteCTMergeDelaySeconds, originAttributes, mThirdPartyRootInputs,
             mThirdPartyIntermediateInputs, extraCertificates, builtChain,
-            pinningTelemetryInfo, crliteInfo, hostname);
+            pinningTelemetryInfo, crliteLookupResult, hostname);
         rv = BuildCertChainForOneKeyUsage(
             trustDomain, certDER, time,
             KeyUsage::digitalSignature,  // (EC)DHE
@@ -723,8 +722,8 @@
           if (pinningTelemetryInfo) {
             pinningTelemetryInfo->Reset();
           }
-          if (crliteInfo) {
-            crliteInfo->Reset();
+          if (crliteLookupResult) {
+            *crliteLookupResult = CRLiteLookupResult::NeverChecked;
           }
 
           NSSCertDBTrustDomain trustDomain(
@@ -732,11 +731,10 @@
               mOCSPTimeoutSoft, mOCSPTimeoutHard, mCertShortLifetimeInDays,
               mPinningMode, keySizeOptions[i],
               ValidityCheckingMode::CheckingOff, sha1ModeConfigurations[j],
-              mNetscapeStepUpPolicy, mDistrustedCAPolicy, mCRLiteMode,
-              mCRLiteCTMergeDelaySeconds, originAttributes,
-              mThirdPartyRootInputs, mThirdPartyIntermediateInputs,
-              extraCertificates, builtChain, pinningTelemetryInfo, crliteInfo,
-              hostname);
+              mNetscapeStepUpPolicy, mCRLiteMode, mCRLiteCTMergeDelaySeconds,
+              originAttributes, mThirdPartyRootInputs,
+              mThirdPartyIntermediateInputs, extraCertificates, builtChain,
+              pinningTelemetryInfo, crliteLookupResult, hostname);
           rv = BuildCertChainForOneKeyUsage(
               trustDomain, certDER, time,
               KeyUsage::digitalSignature,  //(EC)DHE
@@ -803,10 +801,10 @@
           trustSSL, defaultOCSPFetching, mOCSPCache, pinArg, mOCSPTimeoutSoft,
           mOCSPTimeoutHard, mCertShortLifetimeInDays, pinningDisabled,
           MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff,
-          SHA1Mode::Allowed, mNetscapeStepUpPolicy, mDistrustedCAPolicy,
-          mCRLiteMode, mCRLiteCTMergeDelaySeconds, originAttributes,
-          mThirdPartyRootInputs, mThirdPartyIntermediateInputs,
-          extraCertificates, builtChain, nullptr, nullptr);
+          SHA1Mode::Allowed, mNetscapeStepUpPolicy, mCRLiteMode,
+          mCRLiteCTMergeDelaySeconds, originAttributes, mThirdPartyRootInputs,
+          mThirdPartyIntermediateInputs, extraCertificates, builtChain, nullptr,
+          nullptr);
       rv = BuildCertChain(trustDomain, certDER, time, EndEntityOrCA::MustBeCA,
                           KeyUsage::keyCertSign, KeyPurposeId::id_kp_serverAuth,
                           CertPolicyId::anyPolicy, stapledOCSPResponse);
@@ -818,9 +816,8 @@
           trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, mOCSPTimeoutSoft,
           mOCSPTimeoutHard, mCertShortLifetimeInDays, pinningDisabled,
           MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff,
-          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch,
-          mDistrustedCAPolicy, mCRLiteMode, mCRLiteCTMergeDelaySeconds,
-          originAttributes, mThirdPartyRootInputs,
+          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, mCRLiteMode,
+          mCRLiteCTMergeDelaySeconds, originAttributes, mThirdPartyRootInputs,
           mThirdPartyIntermediateInputs, extraCertificates, builtChain, nullptr,
           nullptr);
       rv = BuildCertChain(
@@ -844,9 +841,8 @@
           trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, mOCSPTimeoutSoft,
           mOCSPTimeoutHard, mCertShortLifetimeInDays, pinningDisabled,
           MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff,
-          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch,
-          mDistrustedCAPolicy, mCRLiteMode, mCRLiteCTMergeDelaySeconds,
-          originAttributes, mThirdPartyRootInputs,
+          SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, mCRLiteMode,
+          mCRLiteCTMergeDelaySeconds, originAttributes, mThirdPartyRootInputs,
           mThirdPartyIntermediateInputs, extraCertificates, builtChain, nullptr,
           nullptr);
       rv = BuildCertChain(trustDomain, certDER, time,
@@ -876,20 +872,29 @@
 }
 
 static bool CertIsSelfSigned(const UniqueCERTCertificate& cert, void* pinarg) {
-  if (!SECITEM_ItemsAreEqual(&cert->derIssuer, &cert->derSubject)) {
+  Input certInput;
+  Result rv = certInput.Init(cert->derCert.data, cert->derCert.len);
+  if (rv != Success) {
     return false;
   }
-
-  // Check that the certificate is signed with the cert's spki.
-  SECStatus rv = CERT_VerifySignedDataWithPublicKeyInfo(
-      const_cast<CERTSignedData*>(&cert->signatureWrap),
-      const_cast<CERTSubjectPublicKeyInfo*>(&cert->subjectPublicKeyInfo),
-      pinarg);
-  if (rv != SECSuccess) {
+  // we don't use the certificate for path building, so this parameter doesn't
+  // matter
+  EndEntityOrCA notUsedForPaths = EndEntityOrCA::MustBeEndEntity;
+  BackCert backCert(certInput, notUsedForPaths, nullptr);
+  rv = backCert.Init();
+  if (rv != Success) {
+    return false;
+  }
+  if (!InputsAreEqual(backCert.GetIssuer(), backCert.GetSubject())) {
     return false;
   }
 
-  return true;
+  nsTArray<nsTArray<uint8_t>> emptyCertList;
+  // CSTrustDomain is only used for the signature verification callbacks
+  mozilla::psm::CSTrustDomain trustDomain(emptyCertList);
+  rv = VerifySignedData(trustDomain, backCert.GetSignedData(),
+                        backCert.GetSubjectPublicKeyInfo());
+  return rv == Success;
 }
 
 Result CertVerifier::VerifySSLServerCert(
@@ -909,7 +914,7 @@
     /*optional out*/ SHA1ModeResult* sha1ModeResult,
     /*optional out*/ PinningTelemetryInfo* pinningTelemetryInfo,
     /*optional out*/ CertificateTransparencyInfo* ctInfo,
-    /*optional out*/ CRLiteTelemetryInfo* crliteInfo,
+    /*optional out*/ CRLiteLookupResult* crliteLookupResult,
     /*optional out*/ bool* isBuiltCertChainRootBuiltInRoot) {
   MOZ_ASSERT(peerCert);
   // XXX: MOZ_ASSERT(pinarg);
@@ -936,7 +941,7 @@
                          flags, extraCertificates, stapledOCSPResponse,
                          sctsFromTLS, originAttributes, &evPolicyOidTag,
                          ocspStaplingStatus, keySizeStatus, sha1ModeResult,
-                         pinningTelemetryInfo, ctInfo, crliteInfo);
+                         pinningTelemetryInfo, ctInfo, crliteLookupResult);
   if (rv != Success) {
     if (rv == Result::ERROR_UNKNOWN_ISSUER &&
         CertIsSelfSigned(peerCert, pinarg)) {
diff -Nru firefox-84.0.2+build1/security/certverifier/CertVerifier.h firefox-85.0+build1/security/certverifier/CertVerifier.h
--- firefox-84.0.2+build1/security/certverifier/CertVerifier.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/certverifier/CertVerifier.h	2021-01-18 19:58:18.000000000 +0000
@@ -67,18 +67,6 @@
   Failed = 5,
 };
 
-// Whether or not we are enforcing one of our CA distrust policies. For context,
-// see Bug 1437754 and Bug 1409257.
-enum DistrustedCAPolicy : uint32_t {
-  Permit = 0b0000,
-  DistrustSymantecRoots = 0b0001,
-  DistrustSymantecRootsRegardlessOfDate = 0b0010,
-};
-
-// Bitmask by nsNSSComponent to check for wholly-invalid values; be sure to
-// update this to account for new entries in DistrustedCAPolicy.
-const uint32_t DistrustedCAPolicyMaxAllowedValueMask = 0b0011;
-
 enum class CRLiteMode {
   Disabled = 0,
   TelemetryOnly = 1,
@@ -151,21 +139,6 @@
   CertRevokedByStash = 7,
 };
 
-class CRLiteTelemetryInfo {
- public:
-  CRLiteTelemetryInfo() : mLookupResult(CRLiteLookupResult::NeverChecked) {}
-
-  void Reset() {
-    mLookupResult = CRLiteLookupResult::NeverChecked;
-    mCRLiteFasterThanOCSPMillis.reset();
-    mOCSPFasterThanCRLiteMillis.reset();
-  }
-
-  CRLiteLookupResult mLookupResult;
-  Maybe<double> mCRLiteFasterThanOCSPMillis;
-  Maybe<double> mOCSPFasterThanCRLiteMillis;
-};
-
 class NSSCertDBTrustDomain;
 
 class CertVerifier {
@@ -206,7 +179,7 @@
       /*optional out*/ SHA1ModeResult* sha1ModeResult = nullptr,
       /*optional out*/ PinningTelemetryInfo* pinningTelemetryInfo = nullptr,
       /*optional out*/ CertificateTransparencyInfo* ctInfo = nullptr,
-      /*optional out*/ CRLiteTelemetryInfo* crliteInfo = nullptr);
+      /*optional out*/ CRLiteLookupResult* crliteLookupResult = nullptr);
 
   mozilla::pkix::Result VerifySSLServerCert(
       const UniqueCERTCertificate& peerCert, mozilla::pkix::Time time,
@@ -228,7 +201,7 @@
       /*optional out*/ SHA1ModeResult* sha1ModeResult = nullptr,
       /*optional out*/ PinningTelemetryInfo* pinningTelemetryInfo = nullptr,
       /*optional out*/ CertificateTransparencyInfo* ctInfo = nullptr,
-      /*optional out*/ CRLiteTelemetryInfo* crliteInfo = nullptr,
+      /*optional out*/ CRLiteLookupResult* crliteLookupResult = nullptr,
       /*optional out*/ bool* isBuiltCertChainRootBuiltInRoot = nullptr);
 
   enum PinningMode {
@@ -263,8 +236,7 @@
                uint32_t certShortLifetimeInDays, PinningMode pinningMode,
                SHA1Mode sha1Mode, BRNameMatchingPolicy::Mode nameMatchingMode,
                NetscapeStepUpPolicy netscapeStepUpPolicy,
-               CertificateTransparencyMode ctMode,
-               DistrustedCAPolicy distrustedCAPolicy, CRLiteMode crliteMode,
+               CertificateTransparencyMode ctMode, CRLiteMode crliteMode,
                uint64_t crliteCTMergeDelaySeconds,
                const Vector<EnterpriseCert>& thirdPartyCerts);
   ~CertVerifier();
@@ -281,7 +253,6 @@
   const BRNameMatchingPolicy::Mode mNameMatchingMode;
   const NetscapeStepUpPolicy mNetscapeStepUpPolicy;
   const CertificateTransparencyMode mCTMode;
-  const DistrustedCAPolicy mDistrustedCAPolicy;
   const CRLiteMode mCRLiteMode;
   const uint64_t mCRLiteCTMergeDelaySeconds;
 
diff -Nru firefox-84.0.2+build1/security/certverifier/NSSCertDBTrustDomain.cpp firefox-85.0+build1/security/certverifier/NSSCertDBTrustDomain.cpp
--- firefox-84.0.2+build1/security/certverifier/NSSCertDBTrustDomain.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/certverifier/NSSCertDBTrustDomain.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -72,8 +72,7 @@
     TimeDuration ocspTimeoutHard, uint32_t certShortLifetimeInDays,
     CertVerifier::PinningMode pinningMode, unsigned int minRSABits,
     ValidityCheckingMode validityCheckingMode, CertVerifier::SHA1Mode sha1Mode,
-    NetscapeStepUpPolicy netscapeStepUpPolicy,
-    DistrustedCAPolicy distrustedCAPolicy, CRLiteMode crliteMode,
+    NetscapeStepUpPolicy netscapeStepUpPolicy, CRLiteMode crliteMode,
     uint64_t crliteCTMergeDelaySeconds,
     const OriginAttributes& originAttributes,
     const Vector<Input>& thirdPartyRootInputs,
@@ -81,7 +80,7 @@
     const Maybe<nsTArray<nsTArray<uint8_t>>>& extraCertificates,
     /*out*/ UniqueCERTCertList& builtChain,
     /*optional*/ PinningTelemetryInfo* pinningTelemetryInfo,
-    /*optional*/ CRLiteTelemetryInfo* crliteTelemetryInfo,
+    /*optional*/ CRLiteLookupResult* crliteLookupResult,
     /*optional*/ const char* hostname)
     : mCertDBTrustType(certDBTrustType),
       mOCSPFetching(ocspFetching),
@@ -95,7 +94,6 @@
       mValidityCheckingMode(validityCheckingMode),
       mSHA1Mode(sha1Mode),
       mNetscapeStepUpPolicy(netscapeStepUpPolicy),
-      mDistrustedCAPolicy(distrustedCAPolicy),
       mCRLiteMode(crliteMode),
       mCRLiteCTMergeDelaySeconds(crliteCTMergeDelaySeconds),
       mSawDistrustedCAByPolicyError(false),
@@ -105,7 +103,7 @@
       mExtraCertificates(extraCertificates),
       mBuiltChain(builtChain),
       mPinningTelemetryInfo(pinningTelemetryInfo),
-      mCRLiteTelemetryInfo(crliteTelemetryInfo),
+      mCRLiteLookupResult(crliteLookupResult),
       mHostname(hostname),
 #ifdef MOZ_NEW_CERT_STORAGE
       mCertStorage(do_GetService(NS_CERT_STORAGE_CID)),
@@ -656,7 +654,6 @@
     }
   }
 
-  Maybe<TimeDuration> crliteLookupDuration;
 #ifdef MOZ_NEW_CERT_STORAGE
   if (endEntityOrCA == EndEntityOrCA::MustBeEndEntity &&
       mCRLiteMode != CRLiteMode::Disabled && earliestSCTTimestamp.isSome()) {
@@ -674,18 +671,15 @@
                                      certID.serialNumber.GetLength());
     uint64_t filterTimestamp;
     int16_t crliteRevocationState;
-    TimeStamp crliteLookupBefore = TimeStamp::Now();
     nsresult rv = mCertStorage->GetCRLiteRevocationState(
         issuerBytes, issuerSubjectPublicKeyInfoBytes, serialNumberBytes,
         &filterTimestamp, &crliteRevocationState);
-    TimeStamp crliteLookupAfter = TimeStamp::Now();
     bool certificateFoundValidInCRLiteFilter = false;
     if (NS_FAILED(rv)) {
       MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
               ("NSSCertDBTrustDomain::CheckRevocation: CRLite call failed"));
-      if (mCRLiteTelemetryInfo) {
-        mCRLiteTelemetryInfo->mLookupResult =
-            CRLiteLookupResult::LibraryFailure;
+      if (mCRLiteLookupResult) {
+        *mCRLiteLookupResult = CRLiteLookupResult::LibraryFailure;
       }
       if (mCRLiteMode == CRLiteMode::Enforce) {
         return Result::FATAL_ERROR_LIBRARY_FAILURE;
@@ -698,13 +692,6 @@
                // The cast is to silence warnings on compilers where uint64_t is
                // an unsigned long as opposed to an unsigned long long.
                static_cast<unsigned long long>(filterTimestamp)));
-      // If and only if the filter timestamp is non-zero and we didn't get a
-      // "not enrolled" result, we performed a full CRLite lookup.
-      // We only want to note the lookup duration when we actually did a lookup.
-      if (filterTimestamp != 0 &&
-          crliteRevocationState != nsICertStorage::STATE_NOT_ENROLLED) {
-        crliteLookupDuration.emplace(crliteLookupAfter - crliteLookupBefore);
-      }
       Time filterTimestampTime(TimeFromEpochInSeconds(filterTimestamp));
       // We can only use this result if the earliest embedded signed
       // certificate timestamp from the certificate is older than what cert
@@ -737,9 +724,8 @@
       }
       if (earliestCertificateTimestamp <= filterTimestampTime &&
           crliteRevocationState == nsICertStorage::STATE_ENFORCE) {
-        if (mCRLiteTelemetryInfo) {
-          mCRLiteTelemetryInfo->mLookupResult =
-              CRLiteLookupResult::CertificateRevoked;
+        if (mCRLiteLookupResult) {
+          *mCRLiteLookupResult = CRLiteLookupResult::CertificateRevoked;
         }
         if (mCRLiteMode == CRLiteMode::Enforce) {
           MOZ_LOG(
@@ -755,9 +741,8 @@
       }
 
       if (crliteRevocationState == nsICertStorage::STATE_NOT_ENROLLED) {
-        if (mCRLiteTelemetryInfo) {
-          mCRLiteTelemetryInfo->mLookupResult =
-              CRLiteLookupResult::IssuerNotEnrolled;
+        if (mCRLiteLookupResult) {
+          *mCRLiteLookupResult = CRLiteLookupResult::IssuerNotEnrolled;
         }
         MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
                 ("NSSCertDBTrustDomain::CheckRevocation: issuer not enrolled"));
@@ -765,22 +750,19 @@
       if (filterTimestamp == 0) {
         MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
                 ("NSSCertDBTrustDomain::CheckRevocation: no timestamp"));
-        if (mCRLiteTelemetryInfo) {
-          mCRLiteTelemetryInfo->mLookupResult =
-              CRLiteLookupResult::FilterNotAvailable;
+        if (mCRLiteLookupResult) {
+          *mCRLiteLookupResult = CRLiteLookupResult::FilterNotAvailable;
         }
       } else if (earliestCertificateTimestamp > filterTimestampTime) {
         MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
                 ("NSSCertDBTrustDomain::CheckRevocation: cert too new"));
-        if (mCRLiteTelemetryInfo) {
-          mCRLiteTelemetryInfo->mLookupResult =
-              CRLiteLookupResult::CertificateTooNew;
+        if (mCRLiteLookupResult) {
+          *mCRLiteLookupResult = CRLiteLookupResult::CertificateTooNew;
         }
       } else if (crliteRevocationState == nsICertStorage::STATE_UNSET) {
         certificateFoundValidInCRLiteFilter = true;
-        if (mCRLiteTelemetryInfo) {
-          mCRLiteTelemetryInfo->mLookupResult =
-              CRLiteLookupResult::CertificateValid;
+        if (mCRLiteLookupResult) {
+          *mCRLiteLookupResult = CRLiteLookupResult::CertificateValid;
         }
       }
     }
@@ -796,9 +778,8 @@
       MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
               ("NSSCertDBTrustDomain::CheckRevocation: IsCertRevokedByStash "
                "failed"));
-      if (mCRLiteTelemetryInfo) {
-        mCRLiteTelemetryInfo->mLookupResult =
-            CRLiteLookupResult::LibraryFailure;
+      if (mCRLiteLookupResult) {
+        *mCRLiteLookupResult = CRLiteLookupResult::LibraryFailure;
       }
       if (mCRLiteMode == CRLiteMode::Enforce) {
         return Result::FATAL_ERROR_LIBRARY_FAILURE;
@@ -807,9 +788,8 @@
       MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
               ("NSSCertDBTrustDomain::CheckRevocation: IsCertRevokedByStash "
                "returned true"));
-      if (mCRLiteTelemetryInfo) {
-        mCRLiteTelemetryInfo->mLookupResult =
-            CRLiteLookupResult::CertRevokedByStash;
+      if (mCRLiteLookupResult) {
+        *mCRLiteLookupResult = CRLiteLookupResult::CertRevokedByStash;
       }
       if (mCRLiteMode == CRLiteMode::Enforce) {
         return Result::ERROR_REVOKED_CERTIFICATE;
@@ -826,7 +806,7 @@
   // "use" these fields to stop the compiler from complaining when
   // MOZ_NEW_CERT_STORAGE is disabled.
   Unused << mCRLiteMode;
-  Unused << mCRLiteTelemetryInfo;
+  Unused << mCRLiteLookupResult;
 #endif
 
   // Bug 991815: The BR allow OCSP for intermediates to be up to one year old.
@@ -878,7 +858,7 @@
       mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_INVALID;
       MOZ_LOG(gCertVerifierLog, LogLevel::Debug,
               ("NSSCertDBTrustDomain: stapled OCSP response: "
-               "failure (whitelisted for compatibility)"));
+               "failure (allowed for compatibility)"));
     } else {
       // stapled OCSP response present but invalid for some reason
       mOCSPStaplingStatus = CertVerifier::OCSP_STAPLING_INVALID;
@@ -1026,7 +1006,7 @@
     // responses from a failing server.
     return SynchronousCheckRevocationWithServer(
         certID, aiaLocation, time, maxOCSPLifetimeInDays, cachedResponseResult,
-        stapledOCSPResponseResult, crliteLookupDuration);
+        stapledOCSPResponseResult);
   }
 
   return HandleOCSPFailure(cachedResponseResult, stapledOCSPResponseResult,
@@ -1036,8 +1016,7 @@
 Result NSSCertDBTrustDomain::SynchronousCheckRevocationWithServer(
     const CertID& certID, const nsCString& aiaLocation, Time time,
     uint16_t maxOCSPLifetimeInDays, const Result cachedResponseResult,
-    const Result stapledOCSPResponseResult,
-    const Maybe<TimeDuration>& crliteLookupDuration) {
+    const Result stapledOCSPResponseResult) {
   uint8_t ocspRequestBytes[OCSP_REQUEST_MAX_LENGTH];
   size_t ocspRequestLength;
 
@@ -1049,20 +1028,8 @@
 
   Vector<uint8_t> ocspResponse;
   Input response;
-  TimeStamp ocspRequestBefore = TimeStamp::Now();
   rv = DoOCSPRequest(aiaLocation, mOriginAttributes, ocspRequestBytes,
                      ocspRequestLength, GetOCSPTimeout(), ocspResponse);
-  TimeDuration ocspRequestDuration = TimeStamp::Now() - ocspRequestBefore;
-  if (mCRLiteMode != CRLiteMode::Disabled && crliteLookupDuration.isSome() &&
-      mCRLiteTelemetryInfo) {
-    if (*crliteLookupDuration < ocspRequestDuration) {
-      mCRLiteTelemetryInfo->mCRLiteFasterThanOCSPMillis.emplace(
-          (ocspRequestDuration - *crliteLookupDuration).ToMilliseconds());
-    } else {
-      mCRLiteTelemetryInfo->mOCSPFasterThanCRLiteMillis.emplace(
-          (*crliteLookupDuration - ocspRequestDuration).ToMilliseconds());
-    }
-  }
   if (rv == Success &&
       response.Init(ocspResponse.begin(), ocspResponse.length()) != Success) {
     rv = Result::ERROR_OCSP_MALFORMED_RESPONSE;  // too big
@@ -1369,10 +1336,7 @@
   // This algorithm only applies if we are verifying in the context of a TLS
   // handshake. To determine this, we check mHostname: If it isn't set, this is
   // not TLS, so don't run the algorithm.
-  if (mHostname && CertDNIsInList(root.get(), RootSymantecDNs) &&
-      ((mDistrustedCAPolicy & DistrustedCAPolicy::DistrustSymantecRoots) ||
-       (mDistrustedCAPolicy &
-        DistrustedCAPolicy::DistrustSymantecRootsRegardlessOfDate))) {
+  if (mHostname && CertDNIsInList(root.get(), RootSymantecDNs)) {
     rootCert = nullptr;  // Clear the state for Segment...
     nsTArray<RefPtr<nsIX509Cert>> intCerts;
     nsCOMPtr<nsIX509Cert> eeCert;
@@ -1384,19 +1348,9 @@
       return Result::ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED;
     }
 
-    // PRTime is microseconds since the epoch, whereas JS time is milliseconds.
-    // (new Date("2016-06-01T00:00:00Z")).getTime() * 1000
-    static const PRTime JUNE_1_2016 = 1464739200000000;
-
-    PRTime permitAfterDate = JUNE_1_2016;
-    if (mDistrustedCAPolicy &
-        DistrustedCAPolicy::DistrustSymantecRootsRegardlessOfDate) {
-      permitAfterDate = 0;  // 0 indicates there is no permitAfterDate
-    }
-
     bool isDistrusted = false;
-    nsrv = CheckForSymantecDistrust(intCerts, eeCert, permitAfterDate,
-                                    RootAppleAndGoogleSPKIs, isDistrusted);
+    nsrv = CheckForSymantecDistrust(intCerts, RootAppleAndGoogleSPKIs,
+                                    isDistrusted);
     if (NS_FAILED(nsrv)) {
       return Result::FATAL_ERROR_LIBRARY_FAILURE;
     }
diff -Nru firefox-84.0.2+build1/security/certverifier/NSSCertDBTrustDomain.h firefox-85.0+build1/security/certverifier/NSSCertDBTrustDomain.h
--- firefox-84.0.2+build1/security/certverifier/NSSCertDBTrustDomain.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/certverifier/NSSCertDBTrustDomain.h	2021-01-18 19:58:18.000000000 +0000
@@ -164,8 +164,7 @@
       CertVerifier::PinningMode pinningMode, unsigned int minRSABits,
       ValidityCheckingMode validityCheckingMode,
       CertVerifier::SHA1Mode sha1Mode,
-      NetscapeStepUpPolicy netscapeStepUpPolicy,
-      DistrustedCAPolicy distrustedCAPolicy, CRLiteMode crliteMode,
+      NetscapeStepUpPolicy netscapeStepUpPolicy, CRLiteMode crliteMode,
       uint64_t crliteCTMergeDelaySeconds,
       const OriginAttributes& originAttributes,
       const Vector<mozilla::pkix::Input>& thirdPartyRootInputs,
@@ -173,7 +172,7 @@
       const Maybe<nsTArray<nsTArray<uint8_t>>>& extraCertificates,
       /*out*/ UniqueCERTCertList& builtChain,
       /*optional*/ PinningTelemetryInfo* pinningTelemetryInfo = nullptr,
-      /*optional*/ CRLiteTelemetryInfo* crliteTelemetryInfo = nullptr,
+      /*optional*/ CRLiteLookupResult* crliteLookupResult = nullptr,
       /*optional*/ const char* hostname = nullptr);
 
   virtual Result FindIssuer(mozilla::pkix::Input encodedIssuerName,
@@ -269,8 +268,8 @@
   Result SynchronousCheckRevocationWithServer(
       const mozilla::pkix::CertID& certID, const nsCString& aiaLocation,
       mozilla::pkix::Time time, uint16_t maxOCSPLifetimeInDays,
-      const Result cachedResponseResult, const Result stapledOCSPResponseResult,
-      const Maybe<TimeDuration>& crliteLookupDuration);
+      const Result cachedResponseResult,
+      const Result stapledOCSPResponseResult);
   Result HandleOCSPFailure(const Result cachedResponseResult,
                            const Result stapledOCSPResponseResult,
                            const Result error);
@@ -287,7 +286,6 @@
   ValidityCheckingMode mValidityCheckingMode;
   CertVerifier::SHA1Mode mSHA1Mode;
   NetscapeStepUpPolicy mNetscapeStepUpPolicy;
-  DistrustedCAPolicy mDistrustedCAPolicy;
   CRLiteMode mCRLiteMode;
   uint64_t mCRLiteCTMergeDelaySeconds;
   bool mSawDistrustedCAByPolicyError;
@@ -298,7 +296,7 @@
   const Maybe<nsTArray<nsTArray<uint8_t>>>& mExtraCertificates;  // non-owning
   UniqueCERTCertList& mBuiltChain;                               // non-owning
   PinningTelemetryInfo* mPinningTelemetryInfo;
-  CRLiteTelemetryInfo* mCRLiteTelemetryInfo;
+  CRLiteLookupResult* mCRLiteLookupResult;
   const char* mHostname;  // non-owning - only used for pinning checks
 #ifdef MOZ_NEW_CERT_STORAGE
   nsCOMPtr<nsICertStorage> mCertStorage;
diff -Nru firefox-84.0.2+build1/security/certverifier/TrustOverrideUtils.h firefox-85.0+build1/security/certverifier/TrustOverrideUtils.h
--- firefox-84.0.2+build1/security/certverifier/TrustOverrideUtils.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/certverifier/TrustOverrideUtils.h	2021-01-18 19:58:18.000000000 +0000
@@ -68,54 +68,25 @@
 
 // Implements the graduated Symantec distrust algorithm from Bug 1409257.
 // This accepts a pre-segmented certificate chain (e.g. SegmentCertificateChain)
-// as |intCerts| and |eeCert|, and pre-assumes that the root has been identified
+// as |intCerts|, and pre-assumes that the root has been identified
 // as being affected (this is to avoid duplicate Segment operations in the
-// NSSCertDBTrustDomain). If |permitAfterDate| is non-zero, this algorithm
-// returns "not distrusted" if the NotBefore date of |eeCert| is after
-// the |permitAfterDate|. Then each of the |intCerts| is evaluated against a
-// |whitelist| of SPKI entries, and if a match is found, then this returns
+// NSSCertDBTrustDomain). Each of the |intCerts| is evaluated against a
+// |allowlist| of SPKI entries, and if a match is found, then this returns
 // "not distrusted." Otherwise, due to the precondition holding, the chain is
 // "distrusted."
 template <size_t T>
 static nsresult CheckForSymantecDistrust(
     const nsTArray<RefPtr<nsIX509Cert>>& intCerts,
-    const nsCOMPtr<nsIX509Cert>& eeCert, const PRTime& permitAfterDate,
-    const DataAndLength (&whitelist)[T],
+    const DataAndLength (&allowlist)[T],
     /* out */ bool& isDistrusted) {
   // PRECONDITION: The rootCert is already verified as being one of the
   // affected Symantec roots
 
-  // Check the preference to see if this is enabled before proceeding.
-  // TODO in Bug 1437754
-
   isDistrusted = true;
 
-  // Only check the validity period if we're asked
-  if (permitAfterDate > 0) {
-    // We need to verify the age of the end entity
-    nsCOMPtr<nsIX509CertValidity> validity;
-    nsresult rv = eeCert->GetValidity(getter_AddRefs(validity));
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    PRTime notBefore;
-    rv = validity->GetNotBefore(&notBefore);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    // If the end entity's notBefore date is after the permitAfter date, this
-    // algorithm doesn't apply, so exit false before we do any iterating.
-    if (notBefore >= permitAfterDate) {
-      isDistrusted = false;
-      return NS_OK;
-    }
-  }
-
   for (const auto& cert : intCerts) {
     UniqueCERTCertificate nssCert(cert->GetCert());
-    if (CertSPKIIsInList(nssCert.get(), whitelist)) {
+    if (CertSPKIIsInList(nssCert.get(), allowlist)) {
       isDistrusted = false;
       break;
     }
diff -Nru firefox-84.0.2+build1/security/manager/pki/resources/content/resetpassword.js firefox-85.0+build1/security/manager/pki/resources/content/resetpassword.js
--- firefox-84.0.2+build1/security/manager/pki/resources/content/resetpassword.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/pki/resources/content/resetpassword.js	2021-01-18 19:58:18.000000000 +0000
@@ -14,7 +14,7 @@
   token.reset();
 
   try {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   } catch (e) {}
 
   let l10n = new Localization(["security/pippki/pippki.ftl"], true);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/cert_storage/Cargo.toml firefox-85.0+build1/security/manager/ssl/cert_storage/Cargo.toml
--- firefox-84.0.2+build1/security/manager/ssl/cert_storage/Cargo.toml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/cert_storage/Cargo.toml	2021-01-18 19:58:18.000000000 +0000
@@ -7,14 +7,14 @@
 base64 = "0.10"
 byteorder = "1.2.7"
 crossbeam-utils = "0.6.3"
-cstr = "0.1"
+cstr = "0.2"
 log = "0.4"
 memmap = "0.7"
 moz_task = { path = "../../../../xpcom/rust/moz_task" }
 nserror = { path = "../../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../../xpcom/rust/nsstring" }
 rental = "0.5.5"
-rkv = { version = "0.15.0", default-features = false }
+rkv = { version = "0.16.1", default-features = false }
 rust_cascade = "0.6.0"
 sha2 = "^0.8"
 storage_variant = { path = "../../../../storage/variant" }
diff -Nru firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/cert_storage.cpp firefox-85.0+build1/security/manager/ssl/cert_storage/src/cert_storage.cpp
--- firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/cert_storage.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/cert_storage/src/cert_storage.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "cert_storage.h"
-
-nsresult construct_cert_storage(nsISupports* outer, REFNSIID iid,
-                                void** result) {
-  // Forward to the main thread synchronously.
-  nsCOMPtr<nsIThread> mainThread;
-  nsresult rv = NS_GetMainThread(getter_AddRefs(mainThread));
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  mozilla::SyncRunnable::DispatchToThread(
-      mainThread, new mozilla::SyncRunnable(
-                      NS_NewRunnableFunction("psm::Constructor", [&]() {
-                        rv = cert_storage_constructor(outer, iid, result);
-                      })));
-  return rv;
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/cert_storage.h firefox-85.0+build1/security/manager/ssl/cert_storage/src/cert_storage.h
--- firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/cert_storage.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/cert_storage/src/cert_storage.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,7 +8,6 @@
 #define _cert_storage_h_
 
 #include "nsISupportsUtils.h"  // for nsresult, etc.
-#include "mozilla/SyncRunnable.h"
 
 // {16e5c837-f877-4e23-9c64-eddf905e30e6}
 #define NS_CERT_STORAGE_CID                          \
@@ -23,7 +22,4 @@
                                   void** result);
 };
 
-nsresult construct_cert_storage(nsISupports* outer, REFNSIID iid,
-                                void** result);
-
-#endif  // _cert_storage_h_
\ No newline at end of file
+#endif  // _cert_storage_h_
diff -Nru firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/lib.rs firefox-85.0+build1/security/manager/ssl/cert_storage/src/lib.rs
--- firefox-84.0.2+build1/security/manager/ssl/cert_storage/src/lib.rs	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/cert_storage/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -300,7 +300,7 @@
 
     pub fn set_batch_state(
         &mut self,
-        entries: &[(Vec<u8>, i16)],
+        entries: &[EncodedSecurityState],
         typ: u8,
     ) -> Result<(), SecurityStateError> {
         let env_and_store = match self.env_and_store.as_mut() {
@@ -316,9 +316,16 @@
         )?;
 
         for entry in entries {
+            let key = match entry.key() {
+                Ok(key) => key,
+                Err(e) => {
+                    warn!("error base64-decoding key parts - ignoring: {}", e.message);
+                    continue;
+                }
+            };
             env_and_store
                 .store
-                .put(&mut writer, &entry.0, &Value::I64(entry.1 as i64))?;
+                .put(&mut writer, &key, &Value::I64(entry.state() as i64))?;
         }
 
         writer.commit()?;
@@ -631,7 +638,7 @@
     // not a security issue.
     pub fn add_certs(
         &mut self,
-        certs: &[(Vec<u8>, Vec<u8>, i16)],
+        certs: &[(nsCString, nsCString, i16)],
     ) -> Result<(), SecurityStateError> {
         let env_and_store = match self.env_and_store.as_mut() {
             Some(env_and_store) => env_and_store,
@@ -648,16 +655,30 @@
             &Value::Bool(true),
         )?;
 
-        for (cert_der, subject, trust) in certs {
+        for (cert_der_base64, subject_base64, trust) in certs {
+            let cert_der = match base64::decode(&cert_der_base64) {
+                Ok(cert_der) => cert_der,
+                Err(e) => {
+                    warn!("error base64-decoding cert - skipping: {}", e);
+                    continue;
+                }
+            };
+            let subject = match base64::decode(&subject_base64) {
+                Ok(subject) => subject,
+                Err(e) => {
+                    warn!("error base64-decoding subject - skipping: {}", e);
+                    continue;
+                }
+            };
             let mut digest = Sha256::default();
-            digest.input(cert_der);
+            digest.input(&cert_der);
             let cert_hash = digest.result();
             let cert_key = make_key!(PREFIX_CERT, &cert_hash);
-            let cert = Cert::new(cert_der, subject, *trust)?;
+            let cert = Cert::new(&cert_der, &subject, *trust)?;
             env_and_store
                 .store
                 .put(&mut writer, &cert_key, &Value::Blob(&cert.to_bytes()?))?;
-            let subject_key = make_key!(PREFIX_SUBJECT, subject);
+            let subject_key = make_key!(PREFIX_SUBJECT, &subject);
             let empty_vec = Vec::new();
             let old_cert_hash_list = match env_and_store.store.get(&writer, &subject_key)? {
                 Some(Value::Blob(hashes)) => hashes.to_owned(),
@@ -682,7 +703,10 @@
     // We use this to find the corresponding subject so we can look up the CertHashList it should
     // appear in. If that list contains the given hash, we remove it and update the CertHashList.
     // Finally we delete the Cert entry.
-    pub fn remove_certs_by_hashes(&mut self, hashes: &[Vec<u8>]) -> Result<(), SecurityStateError> {
+    pub fn remove_certs_by_hashes(
+        &mut self,
+        hashes_base64: &[nsCString],
+    ) -> Result<(), SecurityStateError> {
         let env_and_store = match self.env_and_store.as_mut() {
             Some(env_and_store) => env_and_store,
             None => return Err(SecurityStateError::from("env and store not initialized?")),
@@ -690,8 +714,15 @@
         let mut writer = env_and_store.env.write()?;
         let reader = env_and_store.env.read()?;
 
-        for hash in hashes {
-            let cert_key = make_key!(PREFIX_CERT, hash);
+        for hash in hashes_base64 {
+            let hash = match base64::decode(&hash) {
+                Ok(hash) => hash,
+                Err(e) => {
+                    warn!("error decoding hash - ignoring: {}", e);
+                    continue;
+                }
+            };
+            let cert_key = make_key!(PREFIX_CERT, &hash);
             if let Some(Value::Blob(cert_bytes)) = env_and_store.store.get(&reader, &cert_key)? {
                 if let Ok(cert) = Cert::from_bytes(cert_bytes) {
                     let subject_key = make_key!(PREFIX_SUBJECT, &cert.subject);
@@ -703,7 +734,7 @@
                         Some(_) => empty_vec,
                         None => empty_vec,
                     };
-                    let new_cert_hash_list = CertHashList::remove(&old_cert_hash_list, hash)?;
+                    let new_cert_hash_list = CertHashList::remove(&old_cert_hash_list, &hash)?;
                     if new_cert_hash_list.len() != old_cert_hash_list.len() {
                         env_and_store.store.put(
                             &mut writer,
@@ -925,6 +956,41 @@
     }
 }
 
+// Helper struct for set_batch_state. Takes a prefix, two base64-encoded key
+// parts, and a security state value.
+struct EncodedSecurityState {
+    prefix: &'static str,
+    key_part_1_base64: nsCString,
+    key_part_2_base64: nsCString,
+    state: i16,
+}
+
+impl EncodedSecurityState {
+    fn new(
+        prefix: &'static str,
+        key_part_1_base64: nsCString,
+        key_part_2_base64: nsCString,
+        state: i16,
+    ) -> EncodedSecurityState {
+        EncodedSecurityState {
+            prefix,
+            key_part_1_base64,
+            key_part_2_base64,
+            state,
+        }
+    }
+
+    fn key(&self) -> Result<Vec<u8>, SecurityStateError> {
+        let key_part_1 = base64::decode(&self.key_part_1_base64)?;
+        let key_part_2 = base64::decode(&self.key_part_2_base64)?;
+        Ok(make_key!(self.prefix, &key_part_1, &key_part_2))
+    }
+
+    fn state(&self) -> i16 {
+        self.state
+    }
+}
+
 fn get_path_from_directory_service(key: &str) -> Result<PathBuf, SecurityStateError> {
     let directory_service = match xpcom::services::get_DirectoryService() {
         Some(ds) => ds,
@@ -1161,6 +1227,10 @@
         return NS_ERROR_NO_AGGREGATION;
     }
 
+    if !is_main_thread() {
+        return NS_ERROR_NOT_SAME_THREAD;
+    }
+
     match do_construct_cert_storage(outer, iid, result) {
         Ok(_) => NS_OK,
         Err(_) => {
@@ -1321,25 +1391,31 @@
             {
                 let mut issuer = nsCString::new();
                 try_ns!(revocation.GetIssuer(&mut *issuer).to_result(), or continue);
-                let issuer = try_ns!(base64::decode(&issuer), or continue);
 
                 let mut serial = nsCString::new();
                 try_ns!(revocation.GetSerial(&mut *serial).to_result(), or continue);
-                let serial = try_ns!(base64::decode(&serial), or continue);
 
-                entries.push((make_key!(PREFIX_REV_IS, &issuer, &serial), state));
+                entries.push(EncodedSecurityState::new(
+                    PREFIX_REV_IS,
+                    issuer,
+                    serial,
+                    state,
+                ));
             } else if let Some(revocation) =
                 (*revocation).query_interface::<nsISubjectAndPubKeyRevocationState>()
             {
                 let mut subject = nsCString::new();
                 try_ns!(revocation.GetSubject(&mut *subject).to_result(), or continue);
-                let subject = try_ns!(base64::decode(&subject), or continue);
 
                 let mut pub_key_hash = nsCString::new();
                 try_ns!(revocation.GetPubKey(&mut *pub_key_hash).to_result(), or continue);
-                let pub_key_hash = try_ns!(base64::decode(&pub_key_hash), or continue);
 
-                entries.push((make_key!(PREFIX_REV_SPK, &subject, &pub_key_hash), state));
+                entries.push(EncodedSecurityState::new(
+                    PREFIX_REV_SPK,
+                    subject,
+                    pub_key_hash,
+                    state,
+                ));
             }
         }
 
@@ -1412,13 +1488,16 @@
 
             let mut subject = nsCString::new();
             try_ns!(crlite_entry.GetSubject(&mut *subject).to_result(), or continue);
-            let subject = try_ns!(base64::decode(&subject), or continue);
 
             let mut pub_key_hash = nsCString::new();
             try_ns!(crlite_entry.GetSpkiHash(&mut *pub_key_hash).to_result(), or continue);
-            let pub_key_hash = try_ns!(base64::decode(&pub_key_hash), or continue);
 
-            crlite_entries.push((make_key!(PREFIX_CRLITE, &subject, &pub_key_hash), state));
+            crlite_entries.push(EncodedSecurityState::new(
+                PREFIX_CRLITE,
+                subject,
+                pub_key_hash,
+                state,
+            ));
         }
 
         let task = Box::new(try_ns!(SecurityStateTask::new(
@@ -1562,10 +1641,8 @@
         for cert in certs {
             let mut der = nsCString::new();
             try_ns!((*cert).GetCert(&mut *der).to_result(), or continue);
-            let der = try_ns!(base64::decode(&der), or continue);
             let mut subject = nsCString::new();
             try_ns!((*cert).GetSubject(&mut *subject).to_result(), or continue);
-            let subject = try_ns!(base64::decode(&subject), or continue);
             let mut trust: i16 = 0;
             try_ns!((*cert).GetTrust(&mut trust).to_result(), or continue);
             cert_entries.push((der, subject, trust));
@@ -1591,16 +1668,11 @@
         if hashes.is_null() || callback.is_null() {
             return NS_ERROR_NULL_POINTER;
         }
-        let hashes = &*hashes;
-        let mut hash_entries = Vec::with_capacity(hashes.len());
-        for hash in hashes {
-            let hash_decoded = try_ns!(base64::decode(&*hash), or continue);
-            hash_entries.push(hash_decoded);
-        }
+        let hashes = (*hashes).to_vec();
         let task = Box::new(try_ns!(SecurityStateTask::new(
             &*callback,
             &self.security_state,
-            move |ss| ss.remove_certs_by_hashes(&hash_entries),
+            move |ss| ss.remove_certs_by_hashes(&hashes),
         )));
         let runnable = try_ns!(TaskRunnable::new("RemoveCertsByHashes", task));
         try_ns!(TaskRunnable::dispatch(runnable, self.queue.coerce()));
diff -Nru firefox-84.0.2+build1/security/manager/ssl/components.conf firefox-85.0+build1/security/manager/ssl/components.conf
--- firefox-84.0.2+build1/security/manager/ssl/components.conf	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/components.conf	2021-01-18 19:58:18.000000000 +0000
@@ -106,7 +106,8 @@
         'cid': '{67ba681d-5485-4fff-952c-2ee337ffdcd6}',
         'contract_ids': ['@mozilla.org/security/certoverride;1'],
         'type': 'nsCertOverrideService',
-        'legacy_constructor': 'mozilla::psm::NSSConstructor<nsCertOverrideService>',
+        'headers': ['/security/manager/ssl/nsCertOverrideService.h'],
+        'init_method': 'Init',
     },
     {
         'cid': '{be65e2b7-fe46-4e0f-88e0-4b385db4d68a}',
@@ -125,7 +126,8 @@
         'cid': '{16955eee-6c48-4152-9309-c42a465138a1}',
         'contract_ids': ['@mozilla.org/ssservice;1'],
         'type': 'nsSiteSecurityService',
-        'legacy_constructor': 'mozilla::psm::NSSConstructor<nsSiteSecurityService>',
+        'headers': ['/security/manager/ssl/nsSiteSecurityService.h'],
+        'init_method': 'Init',
     },
     {
         'cid': '{57972956-5718-42d2-8070-b3fc72212eaf}',
@@ -157,7 +159,7 @@
             'cid': '{16e5c837-f877-4e23-9c64-eddf905e30e6}',
             'contract_ids': ['@mozilla.org/security/certstorage;1'],
             'headers': ['/security/manager/ssl/cert_storage/src/cert_storage.h'],
-            'legacy_constructor': 'construct_cert_storage',
+            'legacy_constructor': 'cert_storage_constructor',
         },
     ]
 else:
diff -Nru firefox-84.0.2+build1/security/manager/ssl/CSTrustDomain.h firefox-85.0+build1/security/manager/ssl/CSTrustDomain.h
--- firefox-84.0.2+build1/security/manager/ssl/CSTrustDomain.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/CSTrustDomain.h	2021-01-18 19:58:18.000000000 +0000
@@ -8,12 +8,14 @@
 #define CSTrustDomain_h
 
 #include "mozpkix/pkixtypes.h"
+#include "nsCOMPtr.h"
+#include "nsTArray.h"
+
 #ifdef MOZ_NEW_CERT_STORAGE
 #  include "nsICertStorage.h"
 #else
 #  include "nsICertBlocklist.h"
 #endif
-#include "nsTArray.h"
 
 namespace mozilla {
 namespace psm {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/DataStorage.cpp firefox-85.0+build1/security/manager/ssl/DataStorage.cpp
--- firefox-84.0.2+build1/security/manager/ssl/DataStorage.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/DataStorage.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/TaskQueue.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "nsAppDirectoryServiceDefs.h"
@@ -25,6 +26,7 @@
 #endif
 #include "nsIMemoryReporter.h"
 #include "nsIObserverService.h"
+#include "nsISerialEventTarget.h"
 #include "nsITimer.h"
 #include "nsIThread.h"
 #include "nsNetUtil.h"
@@ -48,108 +50,6 @@
 static const int64_t sOneDayInMicroseconds =
     int64_t(24 * 60 * 60) * PR_USEC_PER_SEC;
 
-namespace {
-
-// DataStorageSharedThread provides one shared thread that every DataStorage
-// instance can use to do background work (reading/writing files and scheduling
-// timers). This means we don't have to have one thread per DataStorage
-// instance. The shared thread is initialized when the first DataStorage
-// instance is initialized (Initialize is idempotent, so it's safe to call
-// multiple times in any case).
-// When Gecko shuts down, it will send a "profile-before-change" notification.
-// The first DataStorage instance to observe the notification will dispatch an
-// event for each known DataStorage (as tracked by sDataStorages) to write out
-// their backing data. That instance will then shut down the shared thread,
-// which ensures those events actually run. At that point sDataStorages is
-// cleared and any subsequent attempt to create a DataStorage will fail because
-// the shared thread will refuse to be instantiated again.
-// In some cases (e.g. xpcshell), no profile notification will be sent, so
-// instead we rely on the notification "xpcom-shutdown-threads".
-class DataStorageSharedThread final {
- public:
-  static nsresult Initialize();
-  static nsresult Shutdown();
-  static nsresult Dispatch(nsIRunnable* event);
-
-  virtual ~DataStorageSharedThread() = default;
-
- private:
-  DataStorageSharedThread() : mThread(nullptr) {}
-
-  nsCOMPtr<nsIThread> mThread;
-};
-
-mozilla::StaticMutex sDataStorageSharedThreadMutex;
-static mozilla::StaticAutoPtr<DataStorageSharedThread> gDataStorageSharedThread;
-static bool gDataStorageSharedThreadShutDown = false;
-
-nsresult DataStorageSharedThread::Initialize() {
-  MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-  mozilla::StaticMutexAutoLock lock(sDataStorageSharedThreadMutex);
-
-  // If this happens, we initialized a DataStorage after shutdown notifications
-  // were sent, so don't re-initialize the shared thread.
-  if (gDataStorageSharedThreadShutDown) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!gDataStorageSharedThread) {
-    gDataStorageSharedThread = new DataStorageSharedThread();
-    nsresult rv = NS_NewNamedThread(
-        "DataStorage", getter_AddRefs(gDataStorageSharedThread->mThread));
-    if (NS_FAILED(rv)) {
-      gDataStorageSharedThread = nullptr;
-      return rv;
-    }
-  }
-
-  return NS_OK;
-}
-
-nsresult DataStorageSharedThread::Shutdown() {
-  MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-  mozilla::StaticMutexAutoLock lock(sDataStorageSharedThreadMutex);
-
-  if (!gDataStorageSharedThread || gDataStorageSharedThreadShutDown) {
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(gDataStorageSharedThread->mThread);
-  if (!gDataStorageSharedThread->mThread) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // We can't hold sDataStorageSharedThreadMutex while shutting down the thread,
-  // because we might process events that try to acquire it (e.g. via
-  // DataStorage::GetAllChildProcessData). So, we set our shutdown sentinel
-  // boolean to true, get a handle on the thread, release the lock, shut down
-  // the thread (thus processing all pending events on it), and re-acquire the
-  // lock.
-  gDataStorageSharedThreadShutDown = true;
-  nsCOMPtr<nsIThread> threadHandle = gDataStorageSharedThread->mThread;
-  nsresult rv;
-  {
-    mozilla::StaticMutexAutoUnlock unlock(sDataStorageSharedThreadMutex);
-    rv = threadHandle->Shutdown();
-  }
-  gDataStorageSharedThread->mThread = nullptr;
-  gDataStorageSharedThread = nullptr;
-
-  return rv;
-}
-
-nsresult DataStorageSharedThread::Dispatch(nsIRunnable* event) {
-  MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-  mozilla::StaticMutexAutoLock lock(sDataStorageSharedThreadMutex);
-  if (gDataStorageSharedThreadShutDown || !gDataStorageSharedThread ||
-      !gDataStorageSharedThread->mThread) {
-    return NS_ERROR_FAILURE;
-  }
-  return gDataStorageSharedThread->mThread->Dispatch(event, NS_DISPATCH_NORMAL);
-}
-
-}  // unnamed namespace
-
 namespace mozilla {
 
 class DataStorageMemoryReporter final : public nsIMemoryReporter {
@@ -184,7 +84,6 @@
 
 DataStorage::DataStorage(const nsString& aFilename)
     : mMutex("DataStorage::mMutex"),
-      mTimerDelay(sDataStorageDefaultTimerDelay),
       mPendingWrite(false),
       mShuttingDown(false),
       mInitCalled(false),
@@ -192,11 +91,6 @@
       mReady(false),
       mFilename(aFilename) {}
 
-DataStorage::~DataStorage() {
-  Preferences::UnregisterCallback(DataStorage::PrefChanged,
-                                  "test.datastorage.write_timer_ms", this);
-}
-
 // static
 already_AddRefed<DataStorage> DataStorage::Get(DataStorageClass aFilename) {
   switch (aFilename) {
@@ -341,16 +235,31 @@
     memoryReporterRegistered = true;
   }
 
-  nsresult rv;
-  if (XRE_IsParentProcess()) {
-    MOZ_ASSERT(!aItems);
+  if (XRE_IsParentProcess() || XRE_IsSocketProcess()) {
+    nsCOMPtr<nsISerialEventTarget> target;
+    nsresult rv = NS_CreateBackgroundTaskQueue(
+        "DataStorage::mBackgroundTaskQueue", getter_AddRefs(target));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return rv;
+    }
+    mBackgroundTaskQueue = new TaskQueue(target.forget());
 
-    rv = DataStorageSharedThread::Initialize();
+    // For test purposes, we can set the write timer to be very fast.
+    uint32_t timerDelayMS = Preferences::GetInt(
+        "test.datastorage.write_timer_ms", sDataStorageDefaultTimerDelay);
+    rv = NS_NewTimerWithFuncCallback(
+        getter_AddRefs(mTimer), DataStorage::TimerCallback, this, timerDelayMS,
+        nsITimer::TYPE_REPEATING_SLACK_LOW_PRIORITY, "DataStorageTimer",
+        mBackgroundTaskQueue);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
+  }
+
+  if (XRE_IsParentProcess()) {
+    MOZ_ASSERT(!aItems);
 
-    rv = AsyncReadData(lock);
+    nsresult rv = AsyncReadData(lock);
     if (NS_FAILED(rv)) {
       return rv;
     }
@@ -361,18 +270,13 @@
     MOZ_ASSERT(aItems);
 
     if (XRE_IsSocketProcess() && aWriteFd.IsValid()) {
-      rv = DataStorageSharedThread::Initialize();
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-
       mWriteFd = aWriteFd;
     }
 
     for (auto& item : *aItems) {
       Entry entry;
       entry.mValue = item.value();
-      rv = PutInternal(item.key(), entry, item.type(), lock);
+      nsresult rv = PutInternal(item.key(), entry, item.type(), lock);
       if (NS_FAILED(rv)) {
         return rv;
       }
@@ -387,24 +291,16 @@
   }
   // Clear private data as appropriate.
   os->AddObserver(this, "last-pb-context-exited", false);
-  // Observe shutdown; save data and prevent any further writes.
-  // In the parent process, we need to write to the profile directory, so
-  // we should listen for profile-before-change so that we can safely write to
-  // the profile. In the content process however we
-  // don't have access to the profile directory and profile notifications are
-  // not dispatched, so we need to clean up on xpcom-shutdown-threads.
-  if (XRE_IsParentProcess()) {
+  if (XRE_IsParentProcess() || XRE_IsSocketProcess()) {
+    // Observe shutdown; save data and prevent any further writes.
+    // In the parent process, we need to write to the profile directory, so
+    // we should listen for profile-before-change so that we can safely write to
+    // the profile.
     os->AddObserver(this, "profile-before-change", false);
+    // In the Parent process, this is a backstop for xpcshell and other cases
+    // where profile-before-change might not get sent.
+    os->AddObserver(this, "xpcom-shutdown-threads", false);
   }
-  // In the Parent process, this is a backstop for xpcshell and other cases
-  // where profile-before-change might not get sent.
-  os->AddObserver(this, "xpcom-shutdown-threads", false);
-
-  // For test purposes, we can set the write timer to be very fast.
-  mTimerDelay = Preferences::GetInt("test.datastorage.write_timer_ms",
-                                    sDataStorageDefaultTimerDelay);
-  Preferences::RegisterCallback(DataStorage::PrefChanged,
-                                "test.datastorage.write_timer_ms", this);
 
   return NS_OK;
 }
@@ -480,8 +376,8 @@
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  RefPtr<Opener> job(new Opener(mBackingFile, std::move(aResolver)));
-  nsresult rv = DataStorageSharedThread::Dispatch(job);
+  nsCOMPtr<nsIRunnable> job(new Opener(mBackingFile, std::move(aResolver)));
+  nsresult rv = mBackgroundTaskQueue->Dispatch(job.forget());
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -707,7 +603,7 @@
   // Allocate a Reader so that even if it isn't dispatched,
   // the data-storage-ready notification will be fired and Get
   // will be able to proceed (this happens in its destructor).
-  RefPtr<Reader> job(new Reader(this));
+  nsCOMPtr<nsIRunnable> job(new Reader(this));
   nsresult rv;
   // If we don't have a profile directory, this will fail.
   // That's okay - it just means there is no persistent state.
@@ -723,7 +619,7 @@
     return rv;
   }
 
-  rv = DataStorageSharedThread::Dispatch(job);
+  rv = mBackgroundTaskQueue->Dispatch(job.forget());
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -907,8 +803,8 @@
   DataStorageTable& table = GetTableForType(aType, aProofOfLock);
   table.Put(aKey, aEntry);
 
-  if (aType == DataStorage_Persistent && !mPendingWrite) {
-    return AsyncSetTimer(aProofOfLock);
+  if (aType == DataStorage_Persistent) {
+    mPendingWrite = true;
   }
 
   return NS_OK;
@@ -921,8 +817,8 @@
   DataStorageTable& table = GetTableForType(aType, lock);
   table.Remove(aKey);
 
-  if (aType == DataStorage_Persistent && !mPendingWrite) {
-    Unused << AsyncSetTimer(lock);
+  if (aType == DataStorage_Persistent) {
+    mPendingWrite = true;
   }
 
   nsString filename(mFilename);
@@ -1025,7 +921,8 @@
 nsresult DataStorage::AsyncWriteData(const MutexAutoLock& /*aProofOfLock*/) {
   MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
 
-  if (mShuttingDown || (!mBackingFile && !mWriteFd.IsValid())) {
+  if (!mPendingWrite || mShuttingDown ||
+      (!mBackingFile && !mWriteFd.IsValid())) {
     return NS_OK;
   }
 
@@ -1042,8 +939,8 @@
     output.Append('\n');
   }
 
-  RefPtr<Writer> job(new Writer(output, this));
-  nsresult rv = DataStorageSharedThread::Dispatch(job);
+  nsCOMPtr<nsIRunnable> job(new Writer(output, this));
+  nsresult rv = mBackgroundTaskQueue->Dispatch(job.forget());
   mPendingWrite = false;
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
@@ -1058,6 +955,7 @@
   mPersistentDataTable.Clear();
   mTemporaryDataTable.Clear();
   mPrivateDataTable.Clear();
+  mPendingWrite = true;
 
   if (XRE_IsParentProcess() || XRE_IsSocketProcess()) {
     // Asynchronously clear the file. This is similar to the permission manager
@@ -1086,43 +984,6 @@
   Unused << aDataStorage->AsyncWriteData(lock);
 }
 
-// We only initialize the timer on the worker thread because it's not safe
-// to mix what threads are operating on the timer.
-nsresult DataStorage::AsyncSetTimer(const MutexAutoLock& /*aProofOfLock*/) {
-  if (mShuttingDown || (!XRE_IsParentProcess() && !XRE_IsSocketProcess())) {
-    return NS_OK;
-  }
-
-  mPendingWrite = true;
-  nsCOMPtr<nsIRunnable> job =
-      NewRunnableMethod("DataStorage::SetTimer", this, &DataStorage::SetTimer);
-  nsresult rv = DataStorageSharedThread::Dispatch(job);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
-}
-
-void DataStorage::SetTimer() {
-  MOZ_ASSERT(!NS_IsMainThread());
-  MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-
-  MutexAutoLock lock(mMutex);
-
-  nsresult rv;
-  if (!mTimer) {
-    mTimer = NS_NewTimer();
-    if (NS_WARN_IF(!mTimer)) {
-      return;
-    }
-  }
-
-  rv = mTimer->InitWithNamedFuncCallback(TimerCallback, this, mTimerDelay,
-                                         nsITimer::TYPE_ONE_SHOT,
-                                         "DataStorage::SetTimer");
-  Unused << NS_WARN_IF(NS_FAILED(rv));
-}
-
 void DataStorage::NotifyObservers(const char* aTopic) {
   // Don't access the observer service off the main thread.
   if (!NS_IsMainThread()) {
@@ -1137,26 +998,14 @@
   }
 }
 
-nsresult DataStorage::DispatchShutdownTimer(
-    const MutexAutoLock& /*aProofOfLock*/) {
-  MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-
-  nsCOMPtr<nsIRunnable> job = NewRunnableMethod(
-      "DataStorage::ShutdownTimer", this, &DataStorage::ShutdownTimer);
-  nsresult rv = DataStorageSharedThread::Dispatch(job);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
-}
-
 void DataStorage::ShutdownTimer() {
   MOZ_ASSERT(XRE_IsParentProcess() || XRE_IsSocketProcess());
-  MOZ_ASSERT(!NS_IsMainThread());
-  MutexAutoLock lock(mMutex);
-  nsresult rv = mTimer->Cancel();
-  Unused << NS_WARN_IF(NS_FAILED(rv));
-  mTimer = nullptr;
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mTimer) {
+    nsresult rv = mTimer->Cancel();
+    Unused << NS_WARN_IF(NS_FAILED(rv));
+    mTimer = nullptr;
+  }
 }
 
 //------------------------------------------------------------
@@ -1166,7 +1015,6 @@
 NS_IMETHODIMP
 DataStorage::Observe(nsISupports* /*aSubject*/, const char* aTopic,
                      const char16_t* /*aData*/) {
-  // Don't access preferences off the main thread.
   if (!NS_IsMainThread()) {
     MOZ_ASSERT_UNREACHABLE("DataStorage::Observe called off main thread");
     return NS_ERROR_NOT_SAME_THREAD;
@@ -1175,52 +1023,38 @@
   if (strcmp(aTopic, "last-pb-context-exited") == 0) {
     MutexAutoLock lock(mMutex);
     mPrivateDataTable.Clear();
+    return NS_OK;
   }
 
   if (!XRE_IsParentProcess() && !XRE_IsSocketProcess()) {
-    if (strcmp(aTopic, "xpcom-shutdown-threads") == 0) {
-      sDataStorages->Clear();
-    }
-    return NS_OK;
+    MOZ_ASSERT_UNREACHABLE("unexpected observation topic for content proces");
+    return NS_ERROR_UNEXPECTED;
   }
 
-  // The first DataStorage to observe a shutdown notification will dispatch
-  // events for all DataStorages to write their data out. It will then shut down
-  // the shared background thread, which actually runs those events. The table
-  // of DataStorages is then cleared, turning further observations by any other
-  // DataStorages into no-ops.
   if (strcmp(aTopic, "profile-before-change") == 0 ||
       strcmp(aTopic, "xpcom-shutdown-threads") == 0) {
-    for (auto iter = sDataStorages->Iter(); !iter.Done(); iter.Next()) {
-      RefPtr<DataStorage> storage = iter.UserData();
-      MutexAutoLock lock(storage->mMutex);
-      if (!storage->mShuttingDown) {
-        nsresult rv = storage->AsyncWriteData(lock);
-        storage->mShuttingDown = true;
+    RefPtr<TaskQueue> taskQueueToAwait;
+    {
+      MutexAutoLock lock(mMutex);
+      if (!mShuttingDown) {
+        nsresult rv = AsyncWriteData(lock);
         Unused << NS_WARN_IF(NS_FAILED(rv));
-        if (storage->mTimer) {
-          Unused << storage->DispatchShutdownTimer(lock);
-        }
+        mShuttingDown = true;
+        mBackgroundTaskQueue->BeginShutdown();
+        taskQueueToAwait = mBackgroundTaskQueue;
       }
     }
-    sDataStorages->Clear();
-    DataStorageSharedThread::Shutdown();
+    // Tasks on the background queue may take the lock, so it can't be held
+    // while waiting for them to finish.
+    if (taskQueueToAwait) {
+      taskQueueToAwait->AwaitShutdownAndIdle();
+    }
+    ShutdownTimer();
   }
 
   return NS_OK;
 }
 
-// static
-void DataStorage::PrefChanged(const char* aPref, void* aSelf) {
-  static_cast<DataStorage*>(aSelf)->PrefChanged(aPref);
-}
-
-void DataStorage::PrefChanged(const char* aPref) {
-  MutexAutoLock lock(mMutex);
-  mTimerDelay = Preferences::GetInt("test.datastorage.write_timer_ms",
-                                    sDataStorageDefaultTimerDelay);
-}
-
 DataStorage::Entry::Entry()
     : mScore(0), mLastAccessed((int32_t)(PR_Now() / sOneDayInMicroseconds)) {}
 
diff -Nru firefox-84.0.2+build1/security/manager/ssl/DataStorage.h firefox-85.0+build1/security/manager/ssl/DataStorage.h
--- firefox-84.0.2+build1/security/manager/ssl/DataStorage.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/DataStorage.h	2021-01-18 19:58:18.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_DataStorage_h
 #define mozilla_DataStorage_h
 
+#include <functional>
 #include "mozilla/Atomics.h"
 #include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/MemoryReporting.h"
@@ -24,6 +25,7 @@
 
 namespace mozilla {
 class DataStorageMemoryReporter;
+class TaskQueue;
 
 namespace dom {
 class ContentChild;
@@ -51,24 +53,24 @@
  * - Should the profile directory not be available, (e.g. in xpcshell),
  *   DataStorage will not initially read any persistent data. The
  *   "data-storage-ready" event will still be emitted. This follows semantics
- *   similar to the permission manager and allows tests that test
- *   unrelated components to proceed without a profile.
- * - When any persistent data changes, a timer is initialized that will
- *   eventually asynchronously write all persistent data to the backing file.
- *   When this happens, observers will be notified with the topic
- *   "data-storage-written" and the backing filename as the data.
+ *   similar to the permission manager and allows tests that test unrelated
+ *   components to proceed without a profile.
+ * - A timer periodically fires on a background thread that checks if any
+ *   persistent data has changed, and if so writes all persistent data to the
+ *   backing file. When this happens, observers will be notified with the
+ *   topic "data-storage-written" and the backing filename as the data.
  *   It is possible to receive a "data-storage-written" event while there exist
- *   pending persistent data changes. However, those changes will cause the
- *   timer to be reinitialized and another "data-storage-written" event will
- *   be sent.
- * - When any DataStorage observes the topic "profile-before-change" in
- *   anticipation of shutdown, all persistent data for all DataStorage instances
- *   is synchronously written to the appropriate backing file. The worker thread
- *   responsible for these writes is then disabled to prevent further writes to
- *   that file (the delayed-write timer is cancelled when this happens). Note
- *   that the "worker thread" is actually a single thread shared between all
- *   DataStorage instances. If "profile-before-change" is not observed, this
- *   happens upon observing "xpcom-shutdown-threads".
+ *   pending persistent data changes. However, those changes will eventually be
+ *   written when the timer fires again, and eventually another
+ *   "data-storage-written" event will be sent.
+ * - When a DataStorage instance observes the topic "profile-before-change" in
+ *   anticipation of shutdown, all persistent data for that DataStorage is
+ *   written to the backing file (this blocks the main thread). In the process
+ *   of doing this, the background serial event target responsible for these
+ *   writes is then shut down to prevent further writes to that file (the
+ *   background timer is also cancelled when this happens).
+ *   If "profile-before-change" is not observed, this happens upon observing
+ *   "xpcom-shutdown-threads".
  * - For testing purposes, the preference "test.datastorage.write_timer_ms" can
  *   be set to cause the asynchronous writing of data to happen more quickly.
  * - To prevent unbounded memory and disk use, the number of entries in each
@@ -166,9 +168,11 @@
   // Return true if this data storage is ready to be used.
   bool IsReady();
 
+  void ShutdownTimer();
+
  private:
   explicit DataStorage(const nsString& aFilename);
-  virtual ~DataStorage();
+  virtual ~DataStorage() = default;
 
   static already_AddRefed<DataStorage> GetFromRawFileName(
       const nsString& aFilename);
@@ -204,19 +208,12 @@
   void WaitForReady();
   nsresult AsyncWriteData(const MutexAutoLock& aProofOfLock);
   nsresult AsyncReadData(const MutexAutoLock& aProofOfLock);
-  nsresult AsyncSetTimer(const MutexAutoLock& aProofOfLock);
-  nsresult DispatchShutdownTimer(const MutexAutoLock& aProofOfLock);
 
   static nsresult ValidateKeyAndValue(const nsCString& aKey,
                                       const nsCString& aValue);
   static void TimerCallback(nsITimer* aTimer, void* aClosure);
-  void SetTimer();
-  void ShutdownTimer();
   void NotifyObservers(const char* aTopic);
 
-  static void PrefChanged(const char* aPref, void* aSelf);
-  void PrefChanged(const char* aPref);
-
   bool GetInternal(const nsCString& aKey, Entry* aEntry, DataStorageType aType,
                    const MutexAutoLock& aProofOfLock);
   nsresult PutInternal(const nsCString& aKey, Entry& aEntry,
@@ -236,13 +233,13 @@
   DataStorageTable mTemporaryDataTable;
   DataStorageTable mPrivateDataTable;
   nsCOMPtr<nsIFile> mBackingFile;
-  nsCOMPtr<nsITimer>
-      mTimer;            // All uses after init must be on the worker thread
-  uint32_t mTimerDelay;  // in milliseconds
-  bool mPendingWrite;    // true if a write is needed but hasn't been dispatched
+  bool mPendingWrite;  // true if a write is needed but hasn't been dispatched
   bool mShuttingDown;
+  RefPtr<TaskQueue> mBackgroundTaskQueue;
   // (End list of members protected by mMutex)
 
+  nsCOMPtr<nsITimer> mTimer;  // Must only be accessed on the main thread
+
   mozilla::Atomic<bool> mInitCalled;  // Indicates that Init() has been called.
 
   Monitor mReadyMonitor;  // Do not acquire this at the same time as mMutex.
diff -Nru firefox-84.0.2+build1/security/manager/ssl/DataStorageIPCUtils.h firefox-85.0+build1/security/manager/ssl/DataStorageIPCUtils.h
--- firefox-84.0.2+build1/security/manager/ssl/DataStorageIPCUtils.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/DataStorageIPCUtils.h	2021-01-18 19:58:18.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef ipc_DataStorageIPCUtils_h
 #define ipc_DataStorageIPCUtils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 #include "mozilla/DataStorage.h"
 
 namespace IPC {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/moz.build firefox-85.0+build1/security/manager/ssl/moz.build
--- firefox-84.0.2+build1/security/manager/ssl/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -203,9 +203,6 @@
     XPIDL_SOURCES += [
         "nsICertStorage.idl",
     ]
-    UNIFIED_SOURCES += [
-        "cert_storage/src/cert_storage.cpp",
-    ]
 else:
     XPIDL_SOURCES += [
         "nsICertBlocklist.idl",
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsCertOverrideService.cpp firefox-85.0+build1/security/manager/ssl/nsCertOverrideService.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsCertOverrideService.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsCertOverrideService.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -424,13 +424,15 @@
   return NS_OK;
 }
 
-static nsresult GetCertFingerprintByOidTag(nsIX509Cert* aCert,
-                                           SECOidTag aOidTag, nsCString& fp) {
-  UniqueCERTCertificate nsscert(aCert->GetCert());
-  if (!nsscert) {
-    return NS_ERROR_FAILURE;
+static nsresult GetCertSha256Fingerprint(nsIX509Cert* aCert,
+                                         nsCString& aResult) {
+  nsAutoString fpStrUTF16;
+  nsresult rv = aCert->GetSha256Fingerprint(fpStrUTF16);
+  if (NS_FAILED(rv)) {
+    return rv;
   }
-  return GetCertFingerprintByOidTag(nsscert.get(), aOidTag, fp);
+  aResult.Assign(NS_ConvertUTF16toUTF8(fpStrUTF16));
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -473,8 +475,10 @@
   }
 
   nsAutoCString fpStr;
-  rv = GetCertFingerprintByOidTag(nsscert.get(), SEC_OID_SHA256, fpStr);
-  if (NS_FAILED(rv)) return rv;
+  rv = GetCertSha256Fingerprint(aCert, fpStr);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
 
   nsAutoCString dbkey;
   rv = aCert->GetDbKey(dbkey);
@@ -565,9 +569,7 @@
   *aIsTemporary = settings->mIsTemporary;
 
   nsAutoCString fpStr;
-  nsresult rv;
-
-  rv = GetCertFingerprintByOidTag(aCert, SEC_OID_SHA256, fpStr);
+  nsresult rv = GetCertSha256Fingerprint(aCert, fpStr);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -704,11 +706,10 @@
       }
 
       if (matchesDBKey(aCert, settings->mDBKey)) {
-        nsAutoCString cert_fingerprint;
-        nsresult rv =
-            GetCertFingerprintByOidTag(aCert, SEC_OID_SHA256, cert_fingerprint);
+        nsAutoCString certFingerprint;
+        nsresult rv = GetCertSha256Fingerprint(aCert, certFingerprint);
         if (NS_SUCCEEDED(rv) &&
-            settings->mFingerprint.Equals(cert_fingerprint)) {
+            settings->mFingerprint.Equals(certFingerprint)) {
           counter++;
         }
       }
@@ -759,11 +760,10 @@
       aEnumerator(settings, aUserData);
     } else {
       if (matchesDBKey(aCert, settings->mDBKey)) {
-        nsAutoCString cert_fingerprint;
-        nsresult rv =
-            GetCertFingerprintByOidTag(aCert, SEC_OID_SHA256, cert_fingerprint);
+        nsAutoCString certFingerprint;
+        nsresult rv = GetCertSha256Fingerprint(aCert, certFingerprint);
         if (NS_SUCCEEDED(rv) &&
-            settings->mFingerprint.Equals(cert_fingerprint)) {
+            settings->mFingerprint.Equals(certFingerprint)) {
           aEnumerator(settings, aUserData);
         }
       }
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsCertOverrideService.h firefox-85.0+build1/security/manager/ssl/nsCertOverrideService.h
--- firefox-84.0.2+build1/security/manager/ssl/nsCertOverrideService.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsCertOverrideService.h	2021-01-18 19:58:18.000000000 +0000
@@ -153,7 +153,7 @@
                           const nsACString& dbKey,
                           const mozilla::MutexAutoLock& aProofOfLock);
 
-  RefPtr<TaskQueue> mWriterTaskQueue;
+  RefPtr<mozilla::TaskQueue> mWriterTaskQueue;
 
   // Only accessed on the main thread
   uint64_t mPendingWriteCount;
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsClientAuthRemember.cpp firefox-85.0+build1/security/manager/ssl/nsClientAuthRemember.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsClientAuthRemember.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsClientAuthRemember.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -80,8 +80,11 @@
   mClientAuthRememberList->Remove(PromiseFlatCString(key),
                                   mozilla::DataStorage_Persistent);
 
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
-  return NS_OK;
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(NS_NSSCOMPONENT_CID));
+  if (!nssComponent) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  return nssComponent->ClearSSLExternalAndInternalSessionCache();
 }
 
 NS_IMETHODIMP
@@ -105,8 +108,11 @@
 NS_IMETHODIMP
 nsClientAuthRememberService::ClearRememberedDecisions() {
   mClientAuthRememberList->Clear();
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
-  return NS_OK;
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(NS_NSSCOMPONENT_CID));
+  if (!nssComponent) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  return nssComponent->ClearSSLExternalAndInternalSessionCache();
 }
 
 NS_IMETHODIMP
@@ -133,7 +139,22 @@
       }
     }
   }
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(NS_NSSCOMPONENT_CID));
+  if (!nssComponent) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  return nssComponent->ClearSSLExternalAndInternalSessionCache();
+}
+
+static nsresult GetCertSha256Fingerprint(CERTCertificate* aNssCert,
+                                         nsCString& aResult) {
+  nsCOMPtr<nsIX509Cert> cert(nsNSSCertificate::Create(aNssCert));
+  nsAutoString fpStrUTF16;
+  nsresult rv = cert->GetSha256Fingerprint(fpStrUTF16);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+  aResult.Assign(NS_ConvertUTF16toUTF8(fpStrUTF16));
   return NS_OK;
 }
 
@@ -149,7 +170,7 @@
   }
 
   nsAutoCString fpStr;
-  nsresult rv = GetCertFingerprintByOidTag(aServerCert, SEC_OID_SHA256, fpStr);
+  nsresult rv = GetCertSha256Fingerprint(aServerCert, fpStr);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -180,10 +201,11 @@
   *aRetVal = false;
   aCertDBKey.Truncate();
 
-  nsresult rv;
   nsAutoCString fpStr;
-  rv = GetCertFingerprintByOidTag(aCert, SEC_OID_SHA256, fpStr);
-  if (NS_FAILED(rv)) return rv;
+  nsresult rv = GetCertSha256Fingerprint(aCert, fpStr);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
 
   nsAutoCString entryKey;
   GetEntryKey(aHostName, aOriginAttributes, fpStr, entryKey);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsIX509CertDB.idl firefox-85.0+build1/security/manager/ssl/nsIX509CertDB.idl
--- firefox-84.0.2+build1/security/manager/ssl/nsIX509CertDB.idl	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsIX509CertDB.idl	2021-01-18 19:58:18.000000000 +0000
@@ -27,6 +27,12 @@
                                  in nsIX509Cert aSignerCert);
 };
 
+[scriptable, function, uuid(07c08655-8b11-4650-b6c4-0c145595ceb5)]
+interface nsIAsyncBoolCallback : nsISupports
+{
+    void onResult(in bool result);
+};
+
 /**
  * Callback type for use with asyncVerifyCertAtTime.
  * If aPRErrorCode is PRErrorCodeSuccess (i.e. 0), aVerifiedChain represents the
@@ -335,4 +341,11 @@
    */
   [must_use]
   ACString asPKCS7Blob(in Array<nsIX509Cert> certList);
+
+  /**
+   * Iterates through all the certs and returns false if any of the trusted
+   * CA certs are not built-in roots; and true otherwise.
+   */
+  [must_use]
+  void asyncHasThirdPartyRoots(in nsIAsyncBoolCallback callback);
 };
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSCallbacks.cpp firefox-85.0+build1/security/manager/ssl/nsNSSCallbacks.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSCallbacks.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSCallbacks.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -18,6 +18,8 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
+#include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIPrompt.h"
 #include "nsIProtocolProxyService.h"
@@ -720,6 +722,7 @@
       infoObject->SetKEAKeyBits(channelInfo.keaKeyBits);
       infoObject->SetMACAlgorithmUsed(cipherInfo.macAlgorithm);
       infoObject->mIsDelegatedCredential = channelInfo.peerDelegCred;
+      infoObject->mIsAcceptedEch = channelInfo.echAccepted;
 
       if (infoObject->mIsDelegatedCredential) {
         Telemetry::ScalarAdd(
@@ -839,48 +842,27 @@
 
 static void AccumulateNonECCKeySize(Telemetry::HistogramID probe,
                                     uint32_t bits) {
-  unsigned int value =
-      bits < 512
-          ? 1
-          : bits == 512
-                ? 2
-                : bits < 768
-                      ? 3
-                      : bits == 768
-                            ? 4
-                            : bits < 1024
-                                  ? 5
-                                  : bits == 1024
-                                        ? 6
-                                        : bits < 1280
-                                              ? 7
-                                              : bits == 1280
-                                                    ? 8
-                                                    : bits < 1536
-                                                          ? 9
-                                                          : bits == 1536
-                                                                ? 10
-                                                                : bits < 2048
-                                                                      ? 11
-                                                                      : bits == 2048
-                                                                            ? 12
-                                                                            : bits < 3072
-                                                                                  ? 13
-                                                                                  : bits == 3072
-                                                                                        ? 14
-                                                                                        : bits < 4096
-                                                                                              ? 15
-                                                                                              : bits == 4096
-                                                                                                    ? 16
-                                                                                                    : bits < 8192
-                                                                                                          ? 17
-                                                                                                          : bits == 8192
-                                                                                                                ? 18
-                                                                                                                : bits < 16384
-                                                                                                                      ? 19
-                                                                                                                      : bits == 16384
-                                                                                                                            ? 20
-                                                                                                                            : 0;
+  unsigned int value = bits < 512      ? 1
+                       : bits == 512   ? 2
+                       : bits < 768    ? 3
+                       : bits == 768   ? 4
+                       : bits < 1024   ? 5
+                       : bits == 1024  ? 6
+                       : bits < 1280   ? 7
+                       : bits == 1280  ? 8
+                       : bits < 1536   ? 9
+                       : bits == 1536  ? 10
+                       : bits < 2048   ? 11
+                       : bits == 2048  ? 12
+                       : bits < 3072   ? 13
+                       : bits == 3072  ? 14
+                       : bits < 4096   ? 15
+                       : bits == 4096  ? 16
+                       : bits < 8192   ? 17
+                       : bits == 8192  ? 18
+                       : bits < 16384  ? 19
+                       : bits == 16384 ? 20
+                                       : 0;
   Telemetry::Accumulate(probe, value);
 }
 
@@ -891,12 +873,11 @@
 // named curves for a given size (e.g. secp256k1 vs. secp256r1). We punt on
 // that for now. See also NSS bug 323674.
 static void AccumulateECCCurve(Telemetry::HistogramID probe, uint32_t bits) {
-  unsigned int value =
-      bits == 255 ? 29                                            // Curve25519
-                  : bits == 256 ? 23                              // P-256
-                                : bits == 384 ? 24                // P-384
-                                              : bits == 521 ? 25  // P-521
-                                                            : 0;  // Unknown
+  unsigned int value = bits == 255   ? 29  // Curve25519
+                       : bits == 256 ? 23  // P-256
+                       : bits == 384 ? 24  // P-384
+                       : bits == 521 ? 25  // P-521
+                                     : 0;  // Unknown
   Telemetry::Accumulate(probe, value);
 }
 
@@ -1205,10 +1186,8 @@
   // to be removed in Firefox 63, when the validity period check will also be
   // removed from the code in NSSCertDBTrustDomain.
   if (CertDNIsInList(nssRootCert.get(), RootSymantecDNs)) {
-    static const PRTime NULL_TIME = 0;
-
-    rv = CheckForSymantecDistrust(intCerts, eeCert, NULL_TIME,
-                                  RootAppleAndGoogleSPKIs, isDistrusted);
+    rv = CheckForSymantecDistrust(intCerts, RootAppleAndGoogleSPKIs,
+                                  isDistrusted);
     if (NS_FAILED(rv)) {
       return rv;
     }
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSCertHelper.cpp firefox-85.0+build1/security/manager/ssl/nsNSSCertHelper.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSCertHelper.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSCertHelper.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -98,20 +98,3 @@
     CopyASCIItoUTF16(span, result);
   }
 }
-
-nsresult GetCertFingerprintByOidTag(CERTCertificate* nsscert, SECOidTag aOidTag,
-                                    nsCString& fp) {
-  nsTArray<uint8_t> digestArray;
-  nsresult rv = Digest::DigestBuf(aOidTag, nsscert->derCert.data,
-                                  nsscert->derCert.len, digestArray);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  SECItem digestItem = {siBuffer, digestArray.Elements(),
-                        static_cast<unsigned int>(digestArray.Length())};
-
-  UniquePORTString tmpstr(CERT_Hexify(&digestItem, 1));
-  NS_ENSURE_TRUE(tmpstr, NS_ERROR_OUT_OF_MEMORY);
-
-  fp.Assign(tmpstr.get());
-  return NS_OK;
-}
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSCertHelper.h firefox-85.0+build1/security/manager/ssl/nsNSSCertHelper.h
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSCertHelper.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSCertHelper.h	2021-01-18 19:58:18.000000000 +0000
@@ -15,8 +15,7 @@
 extern const char* kRootModuleName;
 extern const size_t kRootModuleNameLen;
 
-nsresult GetCertFingerprintByOidTag(CERTCertificate* nsscert, SECOidTag aOidTag,
-                                    nsCString& fp);
+class nsIX509Cert;
 
 // If input is valid UTF-8, converts from UTF-8 to UTF-16. Otherwise,
 // converts from Latin1 to UTF-16.
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSCertificate.cpp firefox-85.0+build1/security/manager/ssl/nsNSSCertificate.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSCertificate.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSCertificate.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -651,7 +651,7 @@
   pkix::Input derPublicKey = cert.GetSubjectPublicKeyInfo();
   nsTArray<uint8_t> digestArray;
   nsresult rv = Digest::DigestBuf(SEC_OID_SHA256, derPublicKey.UnsafeGetData(),
-                                 derPublicKey.GetLength(), digestArray);
+                                  derPublicKey.GetLength(), digestArray);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSCertificateDB.cpp firefox-85.0+build1/security/manager/ssl/nsNSSCertificateDB.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSCertificateDB.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSCertificateDB.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
 #include "mozilla/Casting.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Services.h"
 #include "mozilla/Unused.h"
 #include "mozpkix/Time.h"
@@ -1179,6 +1180,62 @@
                                                                   _retval);
 }
 
+NS_IMETHODIMP
+nsNSSCertificateDB::AsyncHasThirdPartyRoots(nsIAsyncBoolCallback* aCallback) {
+  NS_ENSURE_ARG_POINTER(aCallback);
+  nsMainThreadPtrHandle<nsIAsyncBoolCallback> callback(
+      new nsMainThreadPtrHolder<nsIAsyncBoolCallback>("AsyncHasThirdPartyRoots",
+                                                      aCallback));
+
+  return NS_DispatchBackgroundTask(
+      NS_NewRunnableFunction(
+          "nsNSSCertificateDB::AsyncHasThirdPartyRoots",
+          [cb = std::move(callback), self = RefPtr{this}] {
+            bool hasThirdPartyRoots = [self]() -> bool {
+              nsTArray<RefPtr<nsIX509Cert>> certs;
+              nsresult rv = self->GetCerts(certs);
+              if (NS_FAILED(rv)) {
+                return false;
+              }
+
+              for (const auto& cert : certs) {
+                bool isTrusted = false;
+                nsresult rv =
+                    self->IsCertTrusted(cert, nsIX509Cert::CA_CERT,
+                                        nsIX509CertDB::TRUSTED_SSL, &isTrusted);
+                if (NS_FAILED(rv)) {
+                  return false;
+                }
+
+                if (!isTrusted) {
+                  continue;
+                }
+
+                bool isBuiltInRoot = false;
+                rv = cert->GetIsBuiltInRoot(&isBuiltInRoot);
+                if (NS_FAILED(rv)) {
+                  return false;
+                }
+
+                if (!isBuiltInRoot) {
+                  return true;
+                }
+              }
+
+              return false;
+            }();
+
+            NS_DispatchToMainThread(NS_NewRunnableFunction(
+                "nsNSSCertificateDB::AsyncHasThirdPartyRoots callback",
+                [cb, hasThirdPartyRoots]() {
+                  cb->OnResult(hasThirdPartyRoots);
+                }));
+          }),
+      NS_DISPATCH_EVENT_MAY_BLOCK);
+
+  return NS_OK;
+}
+
 nsresult VerifyCertAtTime(nsIX509Cert* aCert,
                           int64_t /*SECCertificateUsage*/ aUsage,
                           uint32_t aFlags, const nsACString& aHostname,
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSComponent.cpp firefox-85.0+build1/security/manager/ssl/nsNSSComponent.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSComponent.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSComponent.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -43,6 +43,7 @@
 #include "nsIPrompt.h"
 #include "nsIProperties.h"
 #include "nsISerialEventTarget.h"
+#include "nsISiteSecurityService.h"
 #include "nsITimer.h"
 #include "nsITokenPasswordDialogs.h"
 #include "nsIWindowWatcher.h"
@@ -167,7 +168,7 @@
 static const uint32_t OCSP_TIMEOUT_MILLISECONDS_HARD_DEFAULT = 10000;
 static const uint32_t OCSP_TIMEOUT_MILLISECONDS_HARD_MAX = 20000;
 
-static void GetRevocationBehaviorFromPrefs(
+void nsNSSComponent::GetRevocationBehaviorFromPrefs(
     /*out*/ CertVerifier::OcspDownloadConfig* odc,
     /*out*/ CertVerifier::OcspStrictConfig* osc,
     /*out*/ uint32_t* certShortLifetimeInDays,
@@ -218,7 +219,7 @@
       std::min(hardTimeoutMillis, OCSP_TIMEOUT_MILLISECONDS_HARD_MAX);
   hardTimeout = TimeDuration::FromMilliseconds(hardTimeoutMillis);
 
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
+  ClearSSLExternalAndInternalSessionCache();
 }
 
 nsNSSComponent::nsNSSComponent()
@@ -1475,17 +1476,6 @@
       break;
   }
 
-  DistrustedCAPolicy defaultCAPolicyMode =
-      DistrustedCAPolicy::DistrustSymantecRoots;
-  DistrustedCAPolicy distrustedCAPolicy = static_cast<DistrustedCAPolicy>(
-      Preferences::GetUint("security.pki.distrust_ca_policy",
-                           static_cast<uint32_t>(defaultCAPolicyMode)));
-  // If distrustedCAPolicy sets any bits larger than the maximum mask, fall back
-  // to the default.
-  if (distrustedCAPolicy & ~DistrustedCAPolicyMaxAllowedValueMask) {
-    distrustedCAPolicy = defaultCAPolicyMode;
-  }
-
   CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;
   CRLiteMode crliteMode = static_cast<CRLiteMode>(Preferences::GetUint(
       "security.pki.crlite_mode", static_cast<uint32_t>(defaultCRLiteMode)));
@@ -1522,8 +1512,7 @@
       odc, osc, softTimeout, hardTimeout, certShortLifetimeInDays,
       PublicSSLState()->PinningMode(), sha1Mode,
       PublicSSLState()->NameMatchingMode(), netscapeStepUpPolicy, ctMode,
-      distrustedCAPolicy, crliteMode, crliteCTMergeDelaySeconds,
-      mEnterpriseCerts);
+      crliteMode, crliteCTMergeDelaySeconds, mEnterpriseCerts);
 }
 
 void nsNSSComponent::UpdateCertVerifierWithEnterpriseRoots() {
@@ -1542,8 +1531,8 @@
       oldCertVerifier->mCertShortLifetimeInDays, oldCertVerifier->mPinningMode,
       oldCertVerifier->mSHA1Mode, oldCertVerifier->mNameMatchingMode,
       oldCertVerifier->mNetscapeStepUpPolicy, oldCertVerifier->mCTMode,
-      oldCertVerifier->mDistrustedCAPolicy, oldCertVerifier->mCRLiteMode,
-      oldCertVerifier->mCRLiteCTMergeDelaySeconds, mEnterpriseCerts);
+      oldCertVerifier->mCRLiteMode, oldCertVerifier->mCRLiteCTMergeDelaySeconds,
+      mEnterpriseCerts);
 }
 
 // Enable the TLS versions given in the prefs, defaulting to TLS 1.0 (min) and
@@ -2045,8 +2034,16 @@
     return NS_ERROR_UNEXPECTED;
   }
 
-  nsCOMPtr<nsIClientAuthRememberService> cars =
-      do_GetService(NS_CLIENTAUTHREMEMBERSERVICE_CONTRACTID);
+  nsCOMPtr<nsICertOverrideService> certOverrideService(
+      do_GetService(NS_CERTOVERRIDE_CONTRACTID));
+  nsCOMPtr<nsIClientAuthRememberService> clientAuthRememberService(
+      do_GetService(NS_CLIENTAUTHREMEMBERSERVICE_CONTRACTID));
+  nsCOMPtr<nsISiteSecurityService> siteSecurityService(
+      do_GetService(NS_SSSERVICE_CONTRACTID));
+
+#ifdef MOZ_NEW_CERT_STORAGE
+  nsCOMPtr<nsICertStorage> certStorage(do_GetService(NS_CERT_STORAGE_CID));
+#endif
 
   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("NSS Initialization done\n"));
 
@@ -2419,7 +2416,6 @@
                    "security.OCSP.timeoutMilliseconds.soft") ||
                prefName.EqualsLiteral(
                    "security.OCSP.timeoutMilliseconds.hard") ||
-               prefName.EqualsLiteral("security.pki.distrust_ca_policy") ||
                prefName.EqualsLiteral("security.pki.crlite_mode") ||
                prefName.EqualsLiteral(
                    "security.pki.crlite_ct_merge_delay_seconds")) {
@@ -2459,7 +2455,7 @@
       clearSessionCache = false;
     }
     if (clearSessionCache) {
-      ClearSSLExternalAndInternalSessionCacheNative();
+      ClearSSLExternalAndInternalSessionCache();
     }
 
     // Preferences that don't affect certificate verification.
@@ -2501,7 +2497,7 @@
     icos->ClearValidityOverride("all:temporary-certificates"_ns, 0);
   }
 
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
+  ClearSSLExternalAndInternalSessionCache();
 
   nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
   if (os) {
@@ -2611,8 +2607,17 @@
 }
 
 // static
-void nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative() {
+void nsNSSComponent::DoClearSSLExternalAndInternalSessionCache() {
+  SSL_ClearSessionCache();
+  mozilla::net::SSLTokensCache::Clear();
+}
+
+NS_IMETHODIMP
+nsNSSComponent::ClearSSLExternalAndInternalSessionCache() {
   MOZ_ASSERT(XRE_IsParentProcess());
+  if (!XRE_IsParentProcess()) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
 
   if (mozilla::net::nsIOService::UseSocketProcess()) {
     if (mozilla::net::gIOService) {
@@ -2623,17 +2628,6 @@
     }
   }
   DoClearSSLExternalAndInternalSessionCache();
-}
-
-// static
-void nsNSSComponent::DoClearSSLExternalAndInternalSessionCache() {
-  SSL_ClearSessionCache();
-  mozilla::net::SSLTokensCache::Clear();
-}
-
-NS_IMETHODIMP
-nsNSSComponent::ClearSSLExternalAndInternalSessionCache() {
-  ClearSSLExternalAndInternalSessionCacheNative();
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSComponent.h firefox-85.0+build1/security/manager/ssl/nsNSSComponent.h
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSComponent.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSComponent.h	2021-01-18 19:58:18.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsNSSCallbacks.h"
+#include "nsServiceManagerUtils.h"
 #include "prerror.h"
 #include "sslt.h"
 
@@ -79,12 +80,10 @@
 
   static nsresult SetEnabledTLSVersions();
 
-  // This function should be only called on parent process.
-  // When socket process is enabled, this function sends an IPC to clear the
-  // SSLTokensCache in socket process. If not,
-  // DoClearSSLExternalAndInternalSessionCache() will be called.
-  static void ClearSSLExternalAndInternalSessionCacheNative();
-  // This function does the actual work of clearing the session cache.
+  // This function does the actual work of clearing the session cache. It is to
+  // be used by the socket process (where there is no nsINSSComponent) and
+  // internally by nsNSSComponent.
+  // NB: NSS must have already been initialized before this is called.
   static void DoClearSSLExternalAndInternalSessionCache();
 
  protected:
@@ -96,6 +95,13 @@
 
   void setValidationOptions(bool isInitialSetting,
                             const mozilla::MutexAutoLock& proofOfLock);
+  void GetRevocationBehaviorFromPrefs(
+      /*out*/ mozilla::psm::CertVerifier::OcspDownloadConfig* odc,
+      /*out*/ mozilla::psm::CertVerifier::OcspStrictConfig* osc,
+      /*out*/ uint32_t* certShortLifetimeInDays,
+      /*out*/ TimeDuration& softTimeout,
+      /*out*/ TimeDuration& hardTimeout,
+      const mozilla::MutexAutoLock& proofOfLock);
   void UpdateCertVerifierWithEnterpriseRoots();
   nsresult RegisterObservers();
 
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSIOLayer.cpp firefox-85.0+build1/security/manager/ssl/nsNSSIOLayer.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSIOLayer.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSIOLayer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -218,12 +218,11 @@
       NotAllowedToFalseStart = 4,
     };
 
-    HandshakeType handshakeType =
-        !IsFullHandshake() ? Resumption
-                           : mFalseStarted ? FalseStarted
-                                           : mFalseStartCallbackCalled
-                                                 ? ChoseNotToFalseStart
-                                                 : NotAllowedToFalseStart;
+    HandshakeType handshakeType = !IsFullHandshake() ? Resumption
+                                  : mFalseStarted    ? FalseStarted
+                                  : mFalseStartCallbackCalled
+                                      ? ChoseNotToFalseStart
+                                      : NotAllowedToFalseStart;
 
     // This will include TCP and proxy tunnel wait time
     Telemetry::AccumulateTimeDelta(
@@ -738,45 +737,33 @@
 nsNSSSocketInfo::SetEchConfig(const nsACString& aEchConfig) {
   mEchConfig = aEchConfig;
 
-#if 0
   if (mEchConfig.Length()) {
-    nsAutoCString echBin;
-    if (NS_OK != Base64Decode(mEchConfig, echBin)) {
-      MOZ_LOG(gPIPNSSLog, LogLevel::Error,
-              ("[%p] Invalid EchConfig record. Couldn't base64 decode\n",
-               (void*)mFd));
-      return NS_OK;
-    }
-
-    if (SECSuccess != SSL_SetClientEchConfigs(
-                          mFd, reinterpret_cast<const PRUint8*>(echBin.get()),
-                          echBin.Length())) {
+    if (SECSuccess !=
+        SSL_SetClientEchConfigs(
+            mFd, reinterpret_cast<const PRUint8*>(aEchConfig.BeginReading()),
+            aEchConfig.Length())) {
       MOZ_LOG(gPIPNSSLog, LogLevel::Error,
               ("[%p] Invalid EchConfig record %s\n", (void*)mFd,
                PR_ErrorToName(PR_GetError())));
       return NS_OK;
     }
   }
-#endif
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNSSSocketInfo::GetRetryEchConfig(nsACString& aEchConfig) {
-#if 0
   if (!mFd) {
     return NS_ERROR_FAILURE;
   }
 
-  SECItem* item = nullptr;
-  SECStatus rv = SSL_GetEchRetryConfigs(mFd, &item);
+  ScopedAutoSECItem retryConfigItem;
+  SECStatus rv = SSL_GetEchRetryConfigs(mFd, &retryConfigItem);
   if (rv != SECSuccess) {
     return NS_ERROR_FAILURE;
   }
-
-  UniqueSECItem retryConfigItem(item);
-  memcpy(aEchConfig.BeginWriting(), retryConfigItem->data, retryConfigItem->len);
-#endif
+  aEchConfig = nsCString(reinterpret_cast<const char*>(retryConfigItem.data),
+                         retryConfigItem.len);
   return NS_OK;
 }
 
@@ -1438,7 +1425,7 @@
     } else if (prefName.EqualsLiteral("security.tls.version.fallback-limit")) {
       mOwner->loadVersionFallbackLimit();
     } else if (prefName.EqualsLiteral("security.tls.insecure_fallback_hosts")) {
-      // Changes to the whitelist on the public side will update the pref.
+      // Changes to the allowlist on the public side will update the pref.
       // Don't propagate the changes to the private side.
       if (mOwner->isPublic()) {
         mOwner->initInsecureFallbackSites();
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsNSSModule.cpp firefox-85.0+build1/security/manager/ssl/nsNSSModule.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsNSSModule.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsNSSModule.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -20,7 +20,6 @@
 #include "mozilla/ModuleUtils.h"
 #include "mozilla/SyncRunnable.h"
 #include "nsCURILoader.h"
-#include "nsCertOverrideService.h"
 #include "nsCryptoHash.h"
 #include "nsKeyModule.h"
 #include "nsNSSCertificate.h"
@@ -32,7 +31,6 @@
 #include "nsPKCS11Slot.h"
 #include "nsRandomGenerator.h"
 #include "nsSecureBrowserUI.h"
-#include "nsSiteSecurityService.h"
 #include "nsXULAppAPI.h"
 
 #ifdef MOZ_XUL
@@ -97,20 +95,7 @@
 
   if (threadRestriction == ThreadRestriction::MainThreadOnly &&
       !NS_IsMainThread()) {
-    nsCOMPtr<nsIThread> mainThread;
-    nsresult rv = NS_GetMainThread(getter_AddRefs(mainThread));
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    // Forward to the main thread synchronously.
-    mozilla::SyncRunnable::DispatchToThread(
-        mainThread,
-        new SyncRunnable(NS_NewRunnableFunction("psm::Constructor", [&]() {
-          rv = Instantiate<InstanceClass, InitMethod>(aIID, aResult);
-        })));
-
-    return rv;
+    return NS_ERROR_NOT_SAME_THREAD;
   }
 
   return Instantiate<InstanceClass, InitMethod>(aIID, aResult);
@@ -140,12 +125,8 @@
 IMPL(nsKeyObject, nullptr, ProcessRestriction::AnyProcess)
 IMPL(nsKeyObjectFactory, nullptr, ProcessRestriction::AnyProcess)
 IMPL(ContentSignatureVerifier, nullptr)
-IMPL(nsCertOverrideService, &nsCertOverrideService::Init,
-     ProcessRestriction::ParentProcessOnly, ThreadRestriction::MainThreadOnly)
 IMPL(nsRandomGenerator, nullptr, ProcessRestriction::AnyProcess)
 IMPL(TransportSecurityInfo, nullptr, ProcessRestriction::AnyProcess)
-IMPL(nsSiteSecurityService, &nsSiteSecurityService::Init,
-     ProcessRestriction::AnyProcess, ThreadRestriction::MainThreadOnly)
 #ifndef MOZ_NEW_CERT_STORAGE
 IMPL(CertBlocklist, &CertBlocklist::Init, ProcessRestriction::ParentProcessOnly,
      ThreadRestriction::MainThreadOnly)
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsSiteSecurityService.cpp firefox-85.0+build1/security/manager/ssl/nsSiteSecurityService.cpp
--- firefox-84.0.2+build1/security/manager/ssl/nsSiteSecurityService.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsSiteSecurityService.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -5,7 +5,6 @@
 #include "nsSiteSecurityService.h"
 
 #include "PublicKeyPinningService.h"
-#include "ScopedNSSTypes.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
 #include "mozilla/LinkedList.h"
@@ -20,8 +19,6 @@
 #include "nsISocketProvider.h"
 #include "nsITransportSecurityInfo.h"
 #include "nsIURI.h"
-#include "nsIX509Cert.h"
-#include "nsNSSCertificateDB.h"
 #include "nsNSSComponent.h"
 #include "nsNetUtil.h"
 #include "nsPromiseFlatString.h"
diff -Nru firefox-84.0.2+build1/security/manager/ssl/nsSTSPreloadList.inc firefox-85.0+build1/security/manager/ssl/nsSTSPreloadList.inc
--- firefox-84.0.2+build1/security/manager/ssl/nsSTSPreloadList.inc	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/nsSTSPreloadList.inc	2021-01-18 19:58:18.000000000 +0000
@@ -8,14 +8,13 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1618237115447000);
+const PRTime gPreloadListExpirationTime = INT64_C(1621521227584000);
 %%
 0--1.de, 1
 0-1.party, 1
 0-24.com, 1
 0-24.net, 1
 00000000-0000-0000-0000-000000000000.xyz, 1
-00004048.com, 1
 0007552.com, 1
 000a1.com, 1
 000a2.com, 1
@@ -29,14 +28,20 @@
 000g.ru, 1
 000x2.com, 1
 000x3.com, 1
+00100010.net, 1
 0010100.net, 1
 0011011.xyz, 1
 00120012.net, 1
+00130013.net, 1
 00140014.net, 1
+00150015.net, 1
+00160016.net, 1
 00168365.com, 1
 0017552.com, 1
 0017d88.com, 1
+00180018.net, 1
 0018d88.com, 1
+00190019.net, 1
 001yapan.com, 1
 002.ro, 1
 00220022.net, 1
@@ -61,8 +66,10 @@
 00365t.com, 1
 0037552.com, 1
 003d88.com, 1
+00440044.net, 1
 0047552.com, 1
 004d88.com, 1
+00550055.net, 1
 0057552.com, 1
 00660066.net, 1
 0067552.com, 1
@@ -85,6 +92,7 @@
 00d88.com, 1
 00dani.me, 1
 00f.net, 1
+00s.io, 1
 00wbf.com, 1
 01.org, 1
 01011970.xyz, 1
@@ -94,10 +102,10 @@
 010ks.net, 1
 01100010011001010111001101110100.com, 1
 01110000011100110111001001100111.com, 1
+011101.xyz, 1
 0116288.com, 1
 0117552.com, 1
 011ks.com, 1
-01234048.com, 1
 012345678365.com, 1
 0123456789365.com, 1
 0123movies.sx, 1
@@ -115,7 +123,6 @@
 016328.com, 1
 0175365.com, 0
 018663.com, 1
-0188z6.com, 1
 018zl.com, 1
 01918.net, 1
 019328.com, 1
@@ -153,7 +160,6 @@
 02638.net, 1
 026ks.com, 1
 028718.com, 1
-0288z6.com, 1
 029978.com, 1
 02d88.net, 1
 02smh.com, 1
@@ -171,11 +177,9 @@
 035ks.com, 1
 03637.com, 0
 036ks.com, 1
-0373z6.com, 1
 0376z6.com, 1
 0377z6.com, 1
 038663.com, 1
-038899.com, 1
 0391315.com, 1
 03d88.com, 1
 03d88.net, 1
@@ -191,6 +195,7 @@
 04d.co, 1
 04d88.com, 1
 04d88.net, 1
+04dco.tk, 1
 04sun.com, 1
 050.ca, 1
 050a1.com, 1
@@ -214,15 +219,10 @@
 055268.com, 1
 0553z6.com, 1
 0555z6.com, 1
-0556z6.com, 1
-0572z6.com, 1
 0573wk.com, 1
-0573z6.com, 1
 0575z6.com, 1
-0576z6.com, 1
 058kb.com, 1
 0597z6.com, 1
-0599z6.com, 1
 05am8.com, 1
 060258.com, 1
 060579.com, 1
@@ -239,46 +239,23 @@
 066938.com, 1
 06804.com, 1
 0681a.com, 1
-0681b.com, 1
-0681c.com, 1
-0681d.com, 1
-0681e.com, 1
-0681f.com, 1
-0681g.com, 1
 0681h.com, 1
-0681i.com, 1
-0681j.com, 1
-0681l.com, 1
-0681m.com, 1
-0681o.com, 1
-0681p.com, 1
-0681q.com, 1
-0681s.com, 1
-0681t.com, 1
-0681u.com, 1
-0681w.com, 1
-0681x.com, 1
-0681y.com, 1
-0681z.com, 1
 068552.com, 0
 06918.net, 1
 06d88.com, 1
 06d88.net, 1
 0707.agency, 1
 070709.net, 1
-0711z6.com, 1
 0712z6.com, 1
 071552.com, 0
 0717z6.com, 1
 071k8.com, 1
-0728z6.com, 1
 07365t.com, 1
 0737399.com, 1
 075k8.com, 1
 0760ks.com, 1
 076k8.com, 1
 0771z6.com, 1
-0772z6.com, 1
 077768.net, 1
 077969.com, 1
 077k8.com, 1
@@ -332,6 +309,7 @@
 08detaxe.fr, 1
 08lc.net, 1
 09000113.nl, 1
+0906-clan.tk, 1
 091k8.com, 1
 092k8.com, 1
 09365t.com, 1
@@ -352,6 +330,7 @@
 0chan.pl, 1
 0chanru.net, 1
 0cp8778.com, 1
+0culus.tk, 1
 0d111.com, 1
 0day.agency, 1
 0dayexploits.gq, 1
@@ -421,10 +400,12 @@
 100-downloads.com, 1
 10000hits.tk, 1
 10000rub.gq, 1
+10000spoons.tk, 1
 10000v.ru, 1
 1000cp4.cc, 1
 1000cp5.cc, 1
 1000cp6.cc, 1
+1000inf.ru, 1
 1000minds.com, 1
 1000serien.com, 1
 1000wordsevents.com, 1
@@ -465,11 +446,10 @@
 10101.io, 1
 101010.pl, 1
 1011100.com, 1
+101gen.com, 1
 101st-airborne.tk, 1
 101st.tk, 1
-1020301.com, 1
 1020307.com, 1
-1020309.com, 1
 1020310.com, 1
 1020311.com, 1
 1020312.com, 1
@@ -514,8 +494,11 @@
 10x.to, 1
 10xnation.com, 1
 1100.so, 1
+1100110.xyz, 1
+110110110.net, 1
 11018vip.com, 1
 11018xpj.com, 1
+11046.com, 1
 110692.com, 1
 110ae.com, 1
 110al.com, 1
@@ -580,9 +563,7 @@
 111111.plus, 1
 1111365t.com, 1
 1111k8.com, 1
-1112z6.com, 1
 111365t.com, 1
-1113z6.com, 1
 11168365.com, 1
 111b58.com, 1
 111bet86.com, 1
@@ -632,13 +613,14 @@
 1120348.com, 1
 1120349.com, 1
 1120350.com, 1
+112112112.net, 1
 11221jz.com, 1
 11223837.com, 1
-1122z6.com, 1
 112app.nl, 1
 112fryslan.nl, 1
 112hz.com, 1
 112it.ro, 0
+113113113.net, 1
 11321365.com, 1
 11333837.com, 1
 11335835.com, 1
@@ -656,6 +638,7 @@
 11773837.com, 1
 11775835.com, 1
 1177z6.com, 1
+118118118.net, 1
 11883837.com, 1
 11885835.com, 1
 118btt.com, 1
@@ -806,7 +789,6 @@
 11ssrr.com, 1
 11sstt.com, 1
 11thstreetcoffee.com, 1
-11traders.com, 1
 11ttbb.com, 1
 11ttdd.com, 1
 11ttee.com, 1
@@ -845,16 +827,6 @@
 1212873467.rsc.cdn77.org, 1
 1218641649.rsc.cdn77.org, 1
 1220310.com, 1
-1220311.com, 1
-1220312.com, 1
-1220313.com, 1
-1220314.com, 1
-1220315.com, 1
-1220316.com, 1
-1220317.com, 1
-1220318.com, 1
-1220319.com, 1
-1220320.com, 1
 1220321.com, 1
 1220322.com, 1
 1220323.com, 1
@@ -917,7 +889,6 @@
 1234365w.com, 1
 1234365x.com, 1
 1234365y.com, 1
-12344048.com, 1
 12345.lv, 1
 12345678365.com, 1
 123456789365.com, 1
@@ -966,6 +937,7 @@
 12grid.co.jp, 1
 12l.nl, 1
 12nomos.tk, 1
+12socialsmansa.tk, 1
 12thmanrising.com, 1
 12train.com, 1
 130.ua, 1
@@ -1025,10 +997,20 @@
 146533.com, 1
 146552.com, 1
 146733.com, 1
+1481481.com, 1
+1481481.net, 1
+1481482.com, 1
+1481482.net, 1
+1481483.com, 1
+1481483.net, 1
+1481485.com, 1
+1481485.net, 1
+1481486.com, 1
 1481486.net, 1
 148663.com, 1
 149433.com, 1
 149733.com, 1
+14e.ch, 1
 14er.games, 1
 14er.jp, 1
 14er.net, 1
@@ -1045,7 +1027,6 @@
 1517883.com, 1
 1517886.com, 1
 1517889.com, 1
-151z6.com, 1
 1520301.com, 1
 1520302.com, 1
 1520303.com, 1
@@ -1207,6 +1188,8 @@
 16836599.com, 1
 168365t.com, 1
 168bet9.com, 1
+168bo9.com, 1
+168bo9.net, 1
 168esb.com, 1
 168fff.cc, 1
 168z6.com, 1
@@ -1299,7 +1282,6 @@
 175ks.com, 1
 1768calc.com.au, 1
 176f88.com, 1
-177603.com, 1
 178ks.net, 1
 178spb.com, 1
 17avolemsaberlaveritat.cat, 1
@@ -1308,6 +1290,7 @@
 17kpw.com, 1
 17th-airborne.tk, 1
 17xile.com, 1
+1800shutters.com, 1
 180btt.com, 1
 180k8.com, 1
 1811559.com, 1
@@ -1370,27 +1353,23 @@
 1832365.com, 1
 1834365.com, 1
 1837365.com, 1
-183z6.com, 1
+183cm.tk, 1
 183zlong.com, 1
 1844329061.rsc.cdn77.org, 1
 185k8.com, 1
-185z6.com, 1
 186526.club, 1
 186526.top, 1
 186526.xyz, 1
 1869365.com, 1
 186kb.com, 1
 186ks.com, 1
-186z6.com, 1
 1876365.com, 1
 1876996.com, 1
-187z6.com, 1
 188cn-sb.com, 1
 188da.com, 1
 188wei.com, 1
 189dv.com, 1
 189fc.com, 1
-189z6.com, 1
 18celebration.com, 1
 18f.gov, 1
 18f.gsa.gov, 0
@@ -1419,10 +1398,11 @@
 1981365.com, 1
 1981612088.rsc.cdn77.org, 1
 1989-bmw-e30-forsale-in-norcal.com, 1
+1989studio.tk, 1
 198ks.net, 1
 198wei.com, 1
 1994.io, 1
-19990b.com, 1
+19990b.com, 0
 19990bb.com, 1
 19990c.com, 1
 19990cc.com, 1
@@ -1473,11 +1453,13 @@
 1ag777.com, 1
 1ag88.com, 1
 1android.de, 1
-1b1.pl, 1
+1b1.pl, 0
 1baks.tk, 1
 1bis.ru, 1
 1bitcoinprice.com, 1
 1blazing.cf, 1
+1breadcrumb.com, 1
+1breadcrumb.com.au, 1
 1c-power.ru, 1
 1chan.pl, 1
 1codex.online, 1
@@ -1496,16 +1478,19 @@
 1europlan.nl, 1
 1f123.net, 1
 1fach-digital.de, 1
+1fastcourse.com, 1
 1fax.com, 1
 1fc0.org, 1
 1gp.us, 1
 1hc.be, 1
+1hfree.tk, 1
 1huiszoeken.nl, 1
 1ii.im, 1
 1in9.net, 1
 1it.click, 1
-1js.de, 0
+1js.de, 1
 1kando.com, 0
+1kdui.com, 1
 1ki174.com, 1
 1kmi.co, 1
 1lc1.com, 1
@@ -1513,6 +1498,7 @@
 1lord1faith.com, 1
 1m.duckdns.org, 1
 1malaysian.tk, 1
+1mall.shop, 1
 1masquepourtous.com, 1
 1me.cz, 1
 1minutoomenos.com, 1
@@ -1533,6 +1519,7 @@
 1picture.hu, 1
 1pieces.com, 1
 1plus.red, 1
+1pluss.ee, 1
 1pw.ca, 1
 1px.tv, 1
 1q2w.nl, 1
@@ -1549,7 +1536,6 @@
 1st-online-academy.com, 1
 1st2bounce.com, 1
 1stav.dk, 1
-1stcarpetcleaning.co.uk, 1
 1stchoicelandscapingwa.com, 1
 1stchoicemoney.com, 1
 1stclassbouncycastles.co.uk, 1
@@ -1558,6 +1544,7 @@
 1ststop.co.uk, 1
 1ticks.com, 1
 1u0m.com, 1
+1up.it, 1
 1v1.xyz, 1
 1v9.im, 1
 1v9.io, 1
@@ -1566,6 +1553,7 @@
 1vpns.com, 1
 1way.faith, 1
 1whw.co.uk, 1
+1whw.uk, 1
 1wirelog.de, 1
 1wl.uk, 1
 1xbet.by, 1
@@ -1619,6 +1607,7 @@
 2015review.tk, 1
 2016.tk, 1
 2017c.com, 1
+2018-frisuren.tk, 1
 2018.wales, 1
 2018fifaworldcup.tk, 1
 2018j95.com, 1
@@ -1663,7 +1652,6 @@
 2113.ch, 1
 211hh.com, 1
 2122bet.com, 1
-2132hd.com, 1
 213k8.com, 1
 21566365.com, 0
 215dy.net, 1
@@ -1732,6 +1720,7 @@
 22bbii.com, 1
 22bbjj.com, 1
 22bbtt.com, 1
+22bet.com, 1
 22bet.ng, 1
 22bet86.com, 1
 22ccaa.com, 1
@@ -1837,6 +1826,7 @@
 233vps.com, 1
 233yes.com, 1
 2340365.com, 0
+23436565.com, 1
 2345666365.com, 1
 234567365.com, 1
 2345678365.com, 1
@@ -1864,10 +1854,11 @@
 246060.ru, 1
 246773.com, 1
 247a.co.uk, 1
+247able.com, 1
 247healthshop.com, 1
 247medplan.com, 1
 247megamart.com.au, 1
-247naijabuzz.com, 0
+247naijabuzz.com, 1
 247xchanger.com, 1
 2484811.com, 1
 24848168.com, 1
@@ -1932,6 +1923,7 @@
 24ip.fr, 1
 24kbet.com, 1
 24ohrana.com, 1
+24onlain.tk, 1
 24onlinereview.com, 1
 24seven.com.np, 1
 24seven.pk, 0
@@ -1986,25 +1978,17 @@
 26uuu.us, 1
 27000.best, 1
 2718282.net, 1
+272live.com, 1
 276771.com, 1
 27728522.com, 1
 277z6.com, 1
 27878dd.com, 1
 27878gg.com, 1
 27878hh.com, 1
-27878ii.com, 1
-27878jj.com, 1
-27878ll.com, 1
-27878nn.com, 1
-27878oo.com, 1
 27878pp.com, 1
 27878qq.com, 1
-27878rr.com, 1
-27878ss.com, 1
 27878tt.com, 1
-27878vv.com, 1
 27878ww.com, 1
-27878xx.com, 1
 27878yy.com, 1
 27878zz.com, 1
 28-industries.com, 1
@@ -2017,6 +2001,7 @@
 284365.com, 1
 285551.com, 1
 2858958.com, 1
+2881dh.com, 1
 288cn-563.com, 1
 288game.net, 1
 288k8.com, 1
@@ -2052,6 +2037,7 @@
 2chan.jp, 1
 2cv-fahrer.de, 1
 2dk.info, 1
+2driver-ok.ml, 1
 2earn-online.com, 0
 2fm.ie, 1
 2fm.radio, 1
@@ -2084,6 +2070,7 @@
 2nerds1bit.com, 1
 2nics.net, 1
 2nimpresores.es, 1
+2of.me, 1
 2pay.fr, 1
 2q.ru, 1
 2rsc.com, 1
@@ -2133,12 +2120,12 @@
 3033888.com, 1
 303422.com, 1
 30375500.com, 1
-30375511.com, 1
+30375511.com, 0
 30375533.com, 1
-30375544.com, 1
-30375555.com, 1
-30375566.com, 1
-30375577.com, 1
+30375544.com, 0
+30375555.com, 0
+30375566.com, 0
+30375577.com, 0
 3040519.com, 1
 304122.com, 1
 304322.com, 1
@@ -2244,7 +2231,6 @@
 32bet365.com, 1
 32h.de, 1
 33-km.ru, 1
-3311.com.cn, 1
 33168365.com, 1
 33321365.com, 1
 3333365t.com, 1
@@ -2447,7 +2433,6 @@
 365.systems, 1
 36506088.com, 1
 36506099.com, 1
-3651143.com, 1
 3651145.com, 1
 3651146.com, 1
 3651147.com, 1
@@ -2505,6 +2490,7 @@
 36565678.com, 1
 36565789.com, 1
 36565b.com, 1
+36565f.com, 1
 3656701.com, 0
 3656712.com, 0
 3656723.com, 0
@@ -2539,6 +2525,7 @@
 365q01.com, 1
 365r.co, 0
 365sb-cn.com, 1
+365securitymg.com, 1
 365skulls.com, 1
 365y0.com, 1
 365y00.com, 1
@@ -2620,7 +2607,7 @@
 377817.com, 1
 377ks.com, 1
 377zzz.com, 1
-37879.com, 1
+37879.com, 0
 37889658.com, 0
 378901.com, 1
 378902.com, 1
@@ -2635,31 +2622,31 @@
 37zk.com, 1
 37zw.com, 1
 380111000.com, 1
-380111111.com, 1
-380111222.com, 1
-380111333.com, 1
-380111444.com, 1
-380111555.com, 1
-380111666.com, 1
+380111111.com, 0
+380111222.com, 0
+380111333.com, 0
+380111444.com, 0
+380111555.com, 0
+380111666.com, 0
 380111777.com, 1
-380111888.com, 1
-380222000.com, 1
-380222111.com, 1
-380222222.com, 1
-380222333.com, 1
-380222444.com, 1
-380222555.com, 1
-380222666.com, 1
-380222777.com, 1
-380222888.com, 1
-380222999.com, 1
-3803300.com, 1
+380111888.com, 0
+380222000.com, 0
+380222111.com, 0
+380222222.com, 0
+380222333.com, 0
+380222444.com, 0
+380222555.com, 0
+380222666.com, 0
+380222777.com, 0
+380222888.com, 0
+380222999.com, 0
+3803300.com, 0
 380422.com, 1
-3806600.com, 1
-3807722.com, 1
+3806600.com, 0
+3807722.com, 0
 380805.com, 1
-3808833.com, 1
-3809955.com, 1
+3808833.com, 0
+3809955.com, 0
 381115.com, 1
 38138938.com, 1
 382225.com, 1
@@ -2821,6 +2808,7 @@
 3degreedesign.co.uk, 1
 3deni.com, 1
 3dexpose.tk, 1
+3dflat.tk, 1
 3dgep.com, 1
 3dissue.com, 1
 3djuegos.com, 1
@@ -2830,8 +2818,11 @@
 3dmetalprinting.tk, 1
 3dmusiclab.nl, 1
 3dn-modell.hu, 1
+3dnchu.com, 1
 3do3dont.com, 1
 3dprintsondemand.eu, 1
+3dranger.com, 1
+3dreal.tk, 1
 3dsmarket.com, 1
 3dstore.dk, 1
 3dsupplies.be, 1
@@ -2841,6 +2832,7 @@
 3ecpa.com.sg, 1
 3ee365.com, 1
 3elife.vn, 0
+3em1.pt, 1
 3ff365.com, 1
 3gdu.tk, 1
 3gg365.com, 1
@@ -2848,11 +2840,13 @@
 3haueserprojekt.org, 1
 3hh365.com, 1
 3hl0.net, 1
+3i-infotech.com, 1
 3ii365.com, 1
 3james.com, 1
 3jj365.com, 1
 3logic.ru, 1
 3lot.ru, 1
+3mediaweb.com, 1
 3n5b.com, 1
 3niu10.com, 1
 3niu12.com, 1
@@ -2886,6 +2880,8 @@
 3plusdesign.gr, 1
 3pm.tw, 1
 3prn.com, 1
+3proxy.org, 1
+3proxy.ru, 1
 3queens.cz, 1
 3queens.io, 1
 3r.org.uk, 1
@@ -2908,8 +2904,8 @@
 3sixtydutyfree.com, 1
 3smail.de, 1
 3speak.co, 1
+3techjournal.cf, 1
 3trees.tk, 1
-3typen.tv, 1
 3v4l.org, 1
 3vlnaeet.cz, 1
 3w-solutions.fr, 1
@@ -2950,47 +2946,8 @@
 403.ch, 1
 403page.com, 1
 404.guide, 1
-4048.co, 1
-40481234.com, 1
-40482345.com, 1
-40484567.com, 1
-40485678.com, 1
-40486789.com, 1
-4048aaa.com, 1
-4048b.com, 1
-4048ccc.com, 1
-4048ddd.com, 1
-4048e.com, 1
-4048eee.com, 1
-4048fff.com, 1
-4048ggg.com, 1
-4048hhh.com, 1
-4048i.com, 1
-4048iii.com, 1
-4048jjj.com, 1
 4048kkk.com, 1
-4048lll.com, 1
-4048mmm.com, 1
-4048ooo.com, 1
-4048p.com, 1
-4048ppp.com, 1
-4048q.com, 1
-4048qqq.com, 1
-4048r.com, 1
-4048rrr.com, 1
-4048s.com, 1
-4048sss.com, 1
-4048t.com, 1
-4048ttt.com, 1
 4048v.com, 1
-4048vvv.com, 1
-4048www.com, 1
-4048x.com, 1
-4048xxx.com, 1
-4048y.com, 1
-4048yyy.com, 1
-4048z.com, 1
-4048zzz.com, 1
 404group.tk, 1
 404notfound.com.br, 1
 406811.com, 1
@@ -3009,7 +2966,6 @@
 4144bet.com, 1
 414553.com, 1
 4151365.com, 1
-41844.de, 0
 418663.com, 1
 41where.com, 1
 420.nerdpol.ovh, 1
@@ -3040,6 +2996,7 @@
 42l.fr, 1
 42t.ru, 1
 42usd.com, 1
+4305design.com.au, 1
 432666365.com, 1
 432web.net, 1
 434365.com, 1
@@ -3085,7 +3042,6 @@
 456365t.com, 1
 4566321.com, 1
 456666365.com, 1
-45674048.com, 1
 4567666365.com, 1
 457552.com, 1
 458663.com, 1
@@ -3307,6 +3263,7 @@
 4997777.com, 1
 499ks.net, 1
 49dollaridahoregisteredagent.com, 1
+4am.click, 1
 4baby.com.br, 1
 4best.tk, 1
 4bet86.com, 1
@@ -3321,7 +3278,6 @@
 4dlatest.com, 1
 4dpredict.com, 1
 4driver.eu, 1
-4dropping.com, 1
 4everproxy.com, 1
 4eyes.ch, 1
 4fit.ro, 1
@@ -3342,13 +3298,13 @@
 4kprojektory.cz, 1
 4kvids.com, 1
 4lephants.tk, 1
+4list.ml, 1
 4loc.us, 1
 4lock.com.br, 1
 4mama.ua, 1
 4maniacos.tk, 1
 4meizu.ru, 1
 4mm.org, 1
-4monar.com, 1
 4nikola.de, 1
 4o5.xyz, 1
 4obgyne.com, 1
@@ -3358,6 +3314,7 @@
 4played.vip, 1
 4plebs.moe, 1
 4project.co.il, 1
+4ree.tk, 1
 4screens.net, 1
 4seo.ml, 1
 4share.tv, 1
@@ -3384,6 +3341,7 @@
 4xiaomi.ru, 1
 4xlabs.co, 1
 4y4a-arts.space, 1
+4yuz.net, 1
 50-ottenkov.tk, 1
 50.gy, 1
 50.pe, 1
@@ -3449,7 +3407,6 @@
 50plusmusikfestival.ch, 1
 50plusnet.nl, 1
 50ten40.com, 1
-5132hd.com, 1
 513651.com, 1
 51365a.com, 1
 51365aa.com, 1
@@ -3558,6 +3515,7 @@
 5206365.com, 0
 5209365.com, 0
 520xpjxpj.com, 1
+5214889.com, 1
 5219.ml, 1
 521keyvista.com, 1
 5225sf.com, 1
@@ -3579,6 +3537,9 @@
 52kb365.com, 0
 52ncp.net, 1
 52sykb.com, 0
+52weekspodcast.com, 1
+5310899.com, 1
+5310899.net, 1
 531422.com, 1
 531k8.com, 1
 533sss.com, 1
@@ -3618,8 +3579,6 @@
 55365t.com, 1
 5536z.com, 1
 555321365.com, 1
-55554048.com, 1
-5556321.com, 1
 5557552.com, 1
 555bet86.com, 1
 555btt.com, 1
@@ -3652,7 +3611,6 @@
 5676321.com, 1
 567666365.com, 1
 567667.cc, 1
-56784048.com, 1
 5678666365.com, 1
 56877.com, 1
 572kb.com, 1
@@ -3679,7 +3637,6 @@
 5898657.com, 1
 589ks.com, 1
 58d88.com, 1
-58nav.com, 1
 58w66.com, 1
 591380.com, 1
 591422.com, 1
@@ -3741,6 +3698,7 @@
 5981x.com, 1
 5981y.com, 0
 5981z.com, 1
+598598598.net, 1
 59859h.vip, 1
 59859j.vip, 1
 59859k.vip, 1
@@ -3816,8 +3774,6 @@
 611135.com, 1
 611165.com, 1
 611195.com, 1
-6132-hd.com, 1
-6132hd.com, 1
 614022.com, 1
 614322.com, 1
 614922.com, 1
@@ -3829,6 +3785,7 @@
 616btt.net, 1
 616f88.com, 1
 61730123.com, 1
+618034.xyz, 1
 619kb.com, 1
 61ag8.com, 1
 61d88.com, 1
@@ -3906,6 +3863,7 @@
 639688888.com, 1
 63969999.com, 1
 6396aaa.com, 1
+6396bbb.com, 1
 6396ccc.com, 1
 6396fff.com, 1
 6396ggg.com, 1
@@ -3915,7 +3873,6 @@
 6396ooo.com, 1
 6396qqq.com, 1
 6396rrr.com, 1
-6396sss.com, 1
 6396ttt.com, 1
 6396vvv.com, 1
 6396www.com, 1
@@ -4056,15 +4013,8 @@
 65131h.com, 1
 65131i.com, 1
 65131j.com, 1
-65131k.com, 1
-65131l.com, 1
 65131m.com, 1
-65131n.com, 1
 65131o.com, 1
-65131p.com, 1
-65131q.com, 1
-65131r.com, 1
-65131s.com, 1
 65131t.com, 1
 65131u.com, 1
 65131v.com, 1
@@ -4135,7 +4085,6 @@
 663365y.com, 1
 663365z.com, 1
 663651.com, 1
-6639s.com, 1
 664048.com, 1
 6652566.com, 1
 6660111.ru, 1
@@ -4149,7 +4098,6 @@
 666365t.com, 1
 6664553.com, 1
 666555bet.com, 1
-66664048.com, 1
 666668722.com, 1
 666689999.xyz, 1
 6666sb.com, 1
@@ -4167,7 +4115,6 @@
 668k8.com, 1
 668k8.net, 1
 668z6.com, 1
-66ag9.com, 1
 66b.com, 1
 66b58.com, 1
 66bet86.com, 1
@@ -4182,68 +4129,118 @@
 672422.com, 1
 6728365.com, 1
 6729.co, 0
-672990.com, 1
+672990.com, 0
 6729a.co, 1
 6729aa.co, 1
+6729aa.com, 1
 6729apk.com, 1
 6729app.com, 1
 6729b.co, 1
 6729bb.co, 1
+6729bb.com, 1
 6729c.co, 1
+6729c.com, 1
 6729cc.co, 1
+6729cc.com, 1
 6729d.co, 1
+6729d.com, 1
 6729dd.co, 1
+6729dd.com, 1
 6729dh.co, 1
 6729dns.com, 1
 6729e.co, 1
+6729e.com, 1
 6729ee.co, 1
+6729ee.com, 1
 6729f.co, 1
+6729f.com, 1
 6729ff.co, 1
+6729ff.com, 1
 6729g.co, 1
+6729g.com, 1
 6729gg.co, 1
+6729gg.com, 1
 6729h.co, 1
+6729h.com, 1
 6729hb.com, 0
 6729hd.com, 1
 6729hh.co, 1
+6729hh.com, 1
 6729i.co, 1
+6729i.com, 1
 6729ii.co, 1
+6729ii.com, 1
 6729ipa.com, 1
 6729j.co, 1
+6729j.com, 1
 6729jj.co, 1
+6729jj.com, 1
 6729k.co, 1
+6729k.com, 1
 6729kk.co, 1
+6729kk.com, 1
 6729l.co, 1
+6729l.com, 1
 6729ll.co, 1
+6729ll.com, 1
 6729m.co, 1
+6729m.com, 1
 6729mm.co, 1
+6729mm.com, 1
 6729n.co, 1
+6729n.com, 1
 6729nn.co, 1
+6729nn.com, 1
 6729o.co, 1
+6729o.com, 1
 6729oo.co, 1
+6729oo.com, 1
 6729p.co, 1
+6729p.com, 1
 6729pp.co, 1
+6729pp.com, 1
 6729q.co, 1
+6729q.com, 1
 6729qq.co, 1
+6729qq.com, 1
 6729r.co, 1
+6729r.com, 1
 6729rr.co, 1
+6729rr.com, 1
 6729s.co, 1
+6729s.com, 1
 6729ss.co, 1
+6729ss.com, 1
 6729sx.com, 1
 6729t.co, 1
+6729t.com, 1
 6729tt.co, 1
+6729tt.com, 1
 6729u.co, 1
+6729u.com, 1
 6729uu.co, 1
+6729uu.com, 1
 6729v.co, 1
+6729v.com, 1
 6729vv.co, 1
+6729vv.com, 1
 6729w.co, 1
+6729w.com, 1
 6729ww.co, 1
+6729ww.com, 1
 6729x.co, 1
+6729x.com, 1
 6729xx.co, 1
+6729xx.com, 1
 6729xy.com, 0
 6729y.co, 1
+6729y.com, 1
 6729yy.co, 1
+6729yy.com, 1
 6729z.co, 1
+6729z.com, 1
 6729zz.co, 1
+6729zz.com, 1
 672bbb.com, 1
 673422.com, 1
 673569.com, 1
@@ -4265,7 +4262,6 @@
 678365t.com, 1
 678678365.com, 1
 67877777.com, 1
-67894048.com, 1
 6789666365.com, 1
 679422.com, 1
 679660.com, 0
@@ -4359,7 +4355,6 @@
 695990.com, 1
 6997896.com, 1
 69butterfly.com, 1
-69fps.gg, 1
 69games.xxx, 1
 69level.com, 1
 69mentor.com, 1
@@ -4369,6 +4364,7 @@
 6bet86.com, 1
 6bwcp.com, 1
 6dec.gc.ca, 1
+6ird.com, 0
 6lo.zgora.pl, 1
 6meter.tk, 1
 6qubedirectory.com, 1
@@ -4377,7 +4373,6 @@
 6upagent.com, 1
 6wbz.com, 1
 6yue.org, 1
-6z0.cn, 0
 7-it.ml, 1
 700.az, 1
 700bbbb.com, 1
@@ -4393,11 +4388,13 @@
 700zzzz.com, 1
 701135.com, 1
 701605.com, 1
+701squad.tk, 1
 70365365.com, 1
 704233.com, 1
 704533.com, 1
 704633.com, 1
 705994.com, 1
+708090.ru, 1
 70872.com, 0
 709129.com, 1
 70mpg.org, 1
@@ -4599,13 +4596,11 @@
 762.ch, 0
 763365.com, 1
 76365365.com, 1
-7652.cc, 1
 765666365.com, 1
 7666321.com, 1
 76668.com, 1
 7666898.com, 1
 76669.com, 1
-7670076.ru, 1
 76956.com, 1
 769k.com, 1
 76networks.tk, 1
@@ -4624,7 +4619,6 @@
 777365t.com, 1
 7776321.com, 0
 7776365.com, 1
-77774048.com, 1
 7777k8.com, 1
 777bet86.com, 1
 777coin.com, 1
@@ -4649,7 +4643,6 @@
 7888815.com, 1
 7888821.com, 1
 788zzz.com, 1
-78904048.com, 1
 7891553.com, 1
 7891997.com, 1
 7893.net, 1
@@ -4745,7 +4738,7 @@
 8078d.com, 1
 8081d.com, 1
 8086.cf, 1
-808hao.com, 0
+808cleanups.org, 1
 808phone.net, 1
 809088.cc, 1
 8092d88.com, 1
@@ -4800,7 +4793,6 @@
 81365w.com, 1
 81365x.com, 1
 81365y.com, 1
-81365z.com, 1
 8139d.com, 1
 814022.com, 1
 8151d.com, 1
@@ -4939,6 +4931,7 @@
 847773.com, 1
 848663.com, 1
 848jz.com, 1
+848sf.com, 1
 84ag.com, 1
 84aj.com, 1
 84al.com, 1
@@ -5122,7 +5115,7 @@
 86btt.com, 1
 86kb88.com, 1
 86metro.ru, 1
-86z66.com, 1
+870.cc, 1
 8722am.com, 1
 8722cn.com, 1
 8722hk.com, 1
@@ -5143,7 +5136,6 @@
 878989.com, 1
 8796.jp, 1
 8799bet.com, 1
-87ag9.com, 1
 87kb88.com, 1
 88-line.com, 1
 88-line.net, 1
@@ -5176,6 +5168,7 @@
 8835365.com, 1
 88365.net, 1
 88365t.com, 1
+88518.com, 1
 88522am.com, 1
 885287.com, 1
 8852ks.com, 1
@@ -5186,7 +5179,6 @@
 885z6.com, 1
 8860d.com, 1
 8861ks.com, 1
-8862d.com, 1
 886666f.com, 1
 886666h.com, 1
 886666l.com, 1
@@ -5229,8 +5221,6 @@
 88740x.com, 1
 88740z.com, 1
 8876d.com, 1
-8879d.com, 1
-887d.com, 1
 8881234j.com, 1
 8881ks.com, 1
 888234j.com, 1
@@ -5240,7 +5230,7 @@
 8884553.com, 1
 8884567j.com, 1
 888456j.com, 1
-888567j.com, 1
+888567j.com, 0
 8885asknick.com, 1
 8885ks.com, 1
 888666pj.com, 1
@@ -5249,6 +5239,7 @@
 88884048.com, 1
 888888722.com, 1
 88889822.com, 1
+8888esb.com, 1
 8888yule8888.com, 1
 8889ks.com, 1
 888am8.com, 1
@@ -5282,10 +5273,10 @@
 889w889.net, 1
 88bet86.com, 1
 88cakescorner.com, 1
+88creative.ca, 1
 88d.com, 1
 88djl.cc, 1
 88home9.com, 1
-88kash.com, 1
 88kb88.com, 1
 88laohu.cc, 1
 88laohu.com, 1
@@ -5305,10 +5296,18 @@
 88yule7.com, 1
 88yule9.com, 1
 8900d.com, 1
+8901178.com, 1
+8901178.net, 1
 890238.com, 1
 8906d.com, 1
 8907d.com, 1
 8908d.com, 1
+8910899.com, 1
+8910899.net, 1
+8917168.com, 1
+8917168.net, 1
+8917818.com, 1
+8917818.net, 1
 8919d.com, 1
 8920d.com, 1
 8921d.com, 1
@@ -5327,10 +5326,13 @@
 89386e.com, 1
 89386l.com, 1
 8938885.com, 1
+8951889.net, 1
 8966bet.com, 1
 897774.com, 1
 8977bet.com, 1
 8989k3.com, 1
+8992088.com, 1
+8992088.net, 1
 899ks.com, 1
 89btt.com, 1
 89ca.com, 1
@@ -5365,7 +5367,6 @@
 8xx888.com, 1
 8xxxxxxx.com, 1
 8y.network, 1
-8yabo.com, 1
 8yun.cf, 1
 8yun.ga, 0
 9-11commission.gov, 1
@@ -5546,19 +5547,16 @@
 918ejj.com, 1
 918emm.com, 1
 918epp.com, 1
-918err.com, 1
 918ess.com, 1
 918euu.com, 1
 918ev.com, 1
 918fdd.com, 1
-918fee.com, 1
 918ffa.com, 1
 918ffb.com, 1
 918ffc.com, 1
 918ffe.com, 1
 918ffh.com, 1
 918ffk.com, 1
-918ffn.com, 1
 918fq.com, 1
 918fr.com, 1
 918fv.com, 1
@@ -5617,7 +5615,6 @@
 918ww.com, 1
 918xe.com, 1
 918xn.com, 1
-918yy.net, 1
 918ze.com, 1
 918zm.com, 1
 918zv.com, 1
@@ -5711,6 +5708,7 @@
 933325.com, 1
 934122.com, 1
 934365.com, 1
+93644.com, 0
 93644a.com, 1
 93644b.com, 1
 93644c.com, 1
@@ -5774,7 +5772,6 @@
 93cq.com, 1
 93jc.cn, 1
 940365.com, 1
-941618.xyz, 1
 941988.cn, 1
 943022.com, 1
 9449-27a1-22a1-e0d9-4237-dd99-e75e-ac85-2f47-9d34.de, 1
@@ -5838,6 +5835,8 @@
 9679693.com, 1
 967you.com, 1
 9681909.com, 1
+9696178.com, 1
+9696178.net, 1
 9721.com, 1
 9721a.com, 1
 9721aa.com, 1
@@ -5946,7 +5945,6 @@
 9728yy.co, 1
 9728z.co, 1
 9728zz.co, 1
-97735.com, 1
 97736.com, 1
 97737.com, 1
 97738.com, 1
@@ -6068,6 +6066,7 @@
 9ag88.com, 1
 9articles.org, 1
 9bet86.com, 1
+9bingo.net, 1
 9box.jp, 1
 9dragonstea.com, 1
 9elements.com, 1
@@ -6205,6 +6204,7 @@
 9riddles.com, 1
 9saves.com, 1
 9to5linux.com, 1
+9to5notes.in, 1
 9u.no, 1
 9uelle.jp, 1
 9ungnir.xyz, 1
@@ -6229,9 +6229,9 @@
 a-msystems.com, 1
 a-oben.org, 1
 a-players.team, 1
+a-pradana.net, 1
 a-r-t-house.jp, 1
 a-shirouto.com, 1
-a-sparks.com, 1
 a-starbouncycastles.co.uk, 1
 a-up.info, 1
 a-wife.net, 1
@@ -6246,8 +6246,8 @@
 a122.cc, 1
 a163.top, 1
 a1bouncycastlehire.com, 1
-a1cashforcar.com.au, 1
 a1demolitionhauling.com, 1
+a1expresscarremoval.com.au, 1
 a1jumpandbounce.co.uk, 1
 a1moldsolutions.com, 1
 a1post.bg, 1
@@ -6297,8 +6297,10 @@
 a6692.com, 1
 a6695.com, 1
 a6729.co, 1
+a6729.com, 1
 a6957.co, 1
 a77018.com, 1
+a789.top, 1
 a7m2.me, 1
 a81365.com, 1
 a82365.com, 1
@@ -6316,6 +6318,7 @@
 aa5197.co, 1
 aa6688.net, 0
 aa6729.co, 1
+aa6729.com, 1
 aa6957.co, 1
 aa793.com, 1
 aa9297.co, 1
@@ -6331,6 +6334,7 @@
 aaainfosystems.com, 1
 aaapl.com, 1
 aaapo.com.br, 1
+aaaportaserve.com, 1
 aabanet.com.br, 1
 aabeltech.com, 1
 aaben-bank.dk, 1
@@ -6342,18 +6346,21 @@
 aaex.uk, 1
 aaflalo.me, 1
 aagetransport.no, 1
+aajkakavi.in, 1
 aakf.org.pk, 1
 aalalbayt.com, 1
 aalalbayt.net, 1
+aalamey.com, 1
 aalstmotors-usedcars.be, 0
 aaltocapital.com, 1
 aalvarezs.cl, 1
 aalvarezs.com, 1
-aamwa.com, 1
 aan-shop.co.il, 1
 aanbieders.ga, 1
 aandachtsmeditatie.nl, 1
 aandkevents.co.uk, 1
+aandocontracting.com, 1
+aanhuisgebakken.tk, 1
 aanlynskool.co.za, 1
 aanmeldensecundairescholen.gent, 1
 aanmpc.com, 1
@@ -6391,13 +6398,17 @@
 aati.be, 1
 aati.info, 1
 aattrans.com, 1
+aautoline.tk, 1
 aavienna.com, 1
+aavstudio.com, 1
 aawt.net.au, 1
 ab-mfbnigeria.com, 1
+ab-pflege.de, 1
 ab-photography.nl, 1
 ab288.com, 1
 ab2888.cn, 1
 ab28s.com, 1
+ab2web.com, 1
 ab91corp.com, 1
 abaapplianceservice.com, 1
 abaaustin.com, 1
@@ -6430,13 +6441,16 @@
 abbeyok.com, 1
 abbeyvetspets.co.uk, 1
 abbottscastles.co.uk, 1
+abbreviated-adult-course.com, 1
 abbruch-star.de, 1
 abbtw.com, 1
 abbyairsoft.tk, 1
 abbyvangrinsven.co.nz, 1
 abc-kinderbetreuung.at, 1
+abc-people.tk, 1
 abc-rz.de, 1
 abc-solutions.cf, 1
+abc-sport-klin.nl, 1
 abc.li, 1
 abc001.ga, 1
 abcbouncycastlessurrey.co.uk, 1
@@ -6456,6 +6470,7 @@
 abcpartyhire.com, 1
 abcrcm.com, 1
 abcstudio.com.au, 1
+abcsystem.ml, 1
 abdel.me, 1
 abdelali.tk, 1
 abdelaliezzyn.tk, 1
@@ -6507,6 +6522,7 @@
 abi-fvs.de, 1
 abi95oha.de, 1
 abiapp.net, 1
+abibliasagrada.tk, 1
 abibruce.co.uk, 1
 abidinginhesed.com, 1
 abierta.cr, 1
@@ -6545,10 +6561,10 @@
 abnehmen.com, 1
 abnobapetstore.co.uk, 1
 abnradiofm.tk, 1
-abobuch.de, 1
 aboces.org, 1
 aboderenovation.co.uk, 0
 abogadamediadora.es, 1
+abogadocriminalorlando.com, 1
 abogadoperu.com, 1
 abogadophd.com, 1
 abogadoscav.com, 1
@@ -6582,11 +6598,14 @@
 aboticaprodutosnaturais.com, 1
 abouncycastleman.co.uk, 1
 about-bangladesh.tk, 1
+about-jewelry.tk, 1
 about-sects-and-cults.tk, 1
 about-ti.me, 1
+aboutamit.com, 1
 aboutassistedliving.org, 0
 aboutdelphi.tk, 1
 aboutdiabetesinfo.gq, 1
+aboutgrills.tk, 1
 abouthrm.nl, 1
 aboutict.nl, 1
 aboutlegal.nl, 1
@@ -6597,9 +6616,13 @@
 aboutmyproperty.ca, 1
 aboutpakistan.com, 1
 aboutpublishers.nl, 1
+aboutrom.tk, 1
+aboutshakil.cf, 1
 aboutshakil.tk, 1
+aboutsleep.com.ua, 1
 aboutspice.com, 1
 abouttime.gq, 1
+aboutwealthcreation.tk, 1
 aboutyou.at, 1
 aboutyou.be, 1
 aboutyou.ch, 1
@@ -6612,6 +6635,7 @@
 abpis.hr, 1
 abplive.com, 1
 abracadabra.co.jp, 0
+abracadabra.com, 1
 abrah.am, 1
 abrahametalero.tk, 1
 abram-lab.ir, 1
@@ -6625,6 +6649,8 @@
 abrilect.com, 1
 abristolgeek.co.uk, 1
 abrition.com, 1
+abroferlendo.tk, 1
+absat.tk, 1
 absb.ca, 1
 abseits.org, 0
 absolem.cc, 0
@@ -6639,8 +6665,10 @@
 absolutebritney.com, 1
 absolutedouble.co.uk, 1
 absoluterush.net, 1
+absolutezero.tk, 1
 absolutperm.tk, 1
 absolutviajes.com, 1
+absolutweb.tk, 1
 abstechs.ae, 1
 abstimmen.online, 1
 abstractbarista.com, 1
@@ -6650,8 +6678,9 @@
 absurdia.tk, 1
 absurdopedia.wiki, 1
 absynthe-inquisition.fr, 1
+absyscyborg.com, 1
 abth.tk, 1
-abthorpe.org, 1
+abthorpe.org, 0
 abtinheydari.tk, 1
 abtinsh.com, 1
 abu-auftrag.ch, 1
@@ -6660,15 +6689,18 @@
 abulanov.com, 1
 abundanteconomy.com, 1
 abundent.com, 1
+abusamraphotography.tk, 1
 abuse.ch, 1
 abuse.fi, 1
 abuse.io, 1
+abusinessinabox.ca, 1
 abusive-host.tk, 1
-abvent.net, 1
+abvent.net, 0
 abvlbasketviganello.ch, 0
 abwatches.net, 1
 abyssiniankitty.com, 1
 abyssproject.net, 1
+abyzebyzek.tk, 1
 abzarweb.com, 1
 ac-admin.pl, 1
 ac-booster.net, 1
@@ -6679,9 +6711,12 @@
 ac0g.dyndns.org, 1
 aca-creative.co.uk, 1
 acacia-gardens.co.uk, 1
+academiacivilbalonmano.tk, 1
 academiadebomberosonline.com, 1
 academiaelizart.ro, 1
+academiaeureka.tk, 1
 academiaoposicionescorreos.com, 1
+academiasdemodelos.com, 1
 academica.nl, 1
 academichealthscience.net, 1
 academichelp.gq, 1
@@ -6699,6 +6734,7 @@
 acaonegocios.com.br, 1
 acapadena.co, 1
 acapellalanguage.tk, 1
+acapetahua.tk, 1
 acaptureservices.com, 1
 acara-yoga.de, 1
 acareer.in, 1
@@ -6711,12 +6747,15 @@
 accademiaprati.tk, 1
 accademiapugilistica.it, 1
 accadia.academy, 1
+acccnyc.org, 0
 accelaway.com, 1
 acceldigital.com.au, 1
 acceleranda.com, 1
 acceleratedpayments.com, 1
+acceleratedreading.cf, 1
 acceleratethesale.com, 1
 accelerateyourworld.org, 1
+accelerator.tk, 1
 accelsnow.com, 1
 accentthailand.com, 1
 acceptancerecoverycenter.com, 1
@@ -6731,22 +6770,27 @@
 accessibility.gov, 1
 accessibilityguidelines.com, 1
 accessibletravelclub.com, 1
+accessiware.com, 1
 accesskeycloning.com, 1
 accesslogisticgroup.com, 1
 accessmania.com, 1
 accessnetworks.com, 1
 accessoirescheveuxchic.com, 1
+accessories-for-women.tk, 1
 accessoriesautoparts.tk, 1
 accessoripersmartphone.it, 1
 acchan-fun.com, 1
+accioninmobiliaria.tk, 1
 accionistaprincipiante.com, 1
 acclivity.pro, 1
 accme.co, 1
+accniitmash.ru, 1
 accolade.com.br, 1
 accoladescreens.com.au, 1
 accord-application.com, 1
 accordable.gq, 1
 accordiondoor.com, 1
+accordproject.tk, 1
 account.bbc.com, 1
 accountmover.io, 1
 accounts.firefox.com, 1
@@ -6760,6 +6804,7 @@
 accurateautobodywa.com, 1
 accurateinfosolutions.in, 1
 accuritconsulting.com, 1
+accustomedicals.ga, 1
 accutint.com, 1
 accutone.com.mx, 1
 accwing.com, 1
@@ -6767,18 +6812,22 @@
 acdk2.de, 1
 ace-aegon.cloud, 1
 ace-clan.tk, 1
+ace-familydental.com, 1
 ace.one, 1
 ace360.org, 1
 acealters.com, 0
 aceanswering.com, 1
+acebovirtual.tk, 1
 acecerts.co.uk, 1
 acecolleges.edu.au, 1
 acedstudy.com, 1
+acefishing.tk, 1
 acefreightco.com, 1
 aceinflatables.com, 1
 aceinstituteonline.com, 1
 aceitedelcampo.com, 1
 aceleraguria.com.br, 1
+aceleratuweb.com, 1
 acelpb.com, 1
 acem.org.au, 1
 acemadeira.pt, 1
@@ -6794,6 +6843,7 @@
 acerosfortuna.com.mx, 1
 aceshop702.com, 1
 acessoeducacao.com, 1
+acftienda.tk, 1
 acfun.eu.org, 1
 acg.mn, 1
 acgaudio.com, 1
@@ -6804,6 +6854,7 @@
 acgqwq.gq, 1
 acgtalktw.com, 1
 achalay.org, 0
+acharin.org, 1
 achat-de-lead.com, 1
 achat-volets-roulants.fr, 1
 acheconcursos.com.br, 1
@@ -6812,6 +6863,7 @@
 achievenewsfrance.tk, 1
 achievingheightsacademy.com, 1
 achiksongs.tk, 1
+achill.org, 1
 achinsk.tk, 1
 achkandiro.ml, 1
 achmadfamily.com, 1
@@ -6845,6 +6897,7 @@
 acnh.info, 1
 acodess.com, 1
 acolicy.com, 1
+acolle.co.jp, 1
 acomerygozar.cam, 1
 acomplia20mg.cf, 1
 aconnor.xyz, 1
@@ -6854,15 +6907,16 @@
 acourse.io, 0
 acousti-tech.com, 1
 acousticalsolutions.com, 1
+acousticbiotech.com, 1
 acoustics.network, 1
 acoustics.tech, 1
 acousticsoundrecords.com, 1
 acoustique-tardy.com, 0
+acp-integrative.fr, 1
 acpa-ancenis.fr, 1
 acperu.ch, 0
 acpica.org, 1
 acpinformatique.fr, 1
-acprail.com.vn, 1
 acquadiparma.kr, 1
 acquaparrucchieri.it, 1
 acquire.co.nz, 1
@@ -6875,6 +6929,7 @@
 acrhnc2020.dedyn.io, 1
 acriticismlab.org, 1
 acrobatic.tk, 1
+acronaline.com, 1
 acronis.org, 1
 acronym24.com, 1
 acropolis.edu.mx, 1
@@ -6900,13 +6955,11 @@
 acticu.com, 1
 actiefgeld.nl, 0
 actilove.ch, 1
+actimap.ga, 1
 acting.by, 1
 actingcxo.com, 1
 action-biosphere.org, 1
 action-verite.fr, 1
-action21paca.com, 1
-action21paca.fr, 1
-action21paca.net, 1
 actioncameraaccessories.ga, 1
 actioncleaningnd.com, 1
 actioncoachignite.co.za, 1
@@ -6916,7 +6969,6 @@
 actionmadagascar.ch, 0
 actionminecraft.tk, 1
 actionsack.com, 1
-actionverb.com, 1
 activatemyiphone.com, 1
 activateudid.com, 1
 active-english.tk, 1
@@ -6941,18 +6993,20 @@
 activiti.alfresco.com, 1
 activityhub.cloud, 1
 activityhub.xyz, 1
+activohotels.com, 1
 activs.ru, 1
 actom.cc, 1
 actom.org, 1
 actonwoodworks.com, 1
+actoralcareprofessional.com, 1
 actors-cafe.net, 1
 actorsanthosh.tk, 1
 actorshop.co.uk, 1
 actorsroom.com, 1
 actrices.tk, 1
+actris.ac.cy, 1
 actserv.co.ke, 1
 actualadmins.com, 1
-actualapp.com, 1
 actualidadblog.com, 1
 actualidadecommerce.com, 1
 actualidadgadget.com, 1
@@ -6981,12 +7035,14 @@
 acupunturavalencia.xyz, 1
 acus.gov, 1
 acusticocoffeehouse.com, 1
+acutane.ga, 1
 acutehoest.nl, 1
 acutewealthadvisors.com, 1
 acuvate.com, 1
 acvan.net, 1
 acwcerts.co.uk, 1
 acwi.gov, 1
+acy.com, 1
 acyclovir-cream.cf, 1
 acyclovir400mg.ml, 1
 acytec.cl, 1
@@ -7012,6 +7068,7 @@
 adaio.es, 1
 adaio.eu, 1
 adaio.net, 1
+adala.com.kw, 1
 adalis.org, 1
 adalite-staging-testnet.herokuapp.com, 1
 adalite.io, 1
@@ -7034,10 +7091,12 @@
 adamjoycegames.co.uk, 1
 adamkostecki.de, 1
 adamlee.com, 0
+adamlevine.ga, 1
 adamliu.net, 0
 adamoutler.com, 1
 adamov.tk, 1
 adamradocz.com, 1
+adamraoof.tk, 1
 adamricheimer.com, 1
 adams.dk, 1
 adamsasphaltpaving.com, 1
@@ -7052,6 +7111,7 @@
 adaptationplatform.ca, 1
 adapti.de, 1
 adaptiv.ltd, 1
+adaptivecenter.net, 1
 adaptiveequipment.com.au, 1
 adaptivehedge.com, 1
 adaptiveicons.com, 1
@@ -7060,6 +7120,9 @@
 adaptiveu.io, 1
 adarixconsultores.com, 1
 adarshcloud.in, 1
+adarshthapa.in, 1
+adarshthapa.net, 1
+adarsvidler.me, 1
 adasbench.com, 1
 adata.kz, 1
 adativos.com.br, 1
@@ -7076,8 +7139,8 @@
 adceuta.tk, 1
 adcnvs.com, 1
 addag.de, 1
+addbonus.ml, 1
 addcrazy.com, 1
-addendum.co.za, 1
 adder.ml, 1
 adderall.ml, 1
 adderall.space, 1
@@ -7090,6 +7153,7 @@
 addiko.net, 1
 addiko.rs, 1
 addisoncrump.info, 1
+addmefast.tk, 1
 addnewsite.tk, 1
 addnine.com, 1
 addo-addo.com, 1
@@ -7106,12 +7170,16 @@
 adec-emsa.ae, 1
 adeccoquickmatch.fr, 1
 adelaidecc.com.au, 0
+adelaidecoldlaser.com.au, 1
 adelebeals.com, 1
 adelgace.top, 1
 adelgazaperu.pe, 1
 adelicious.co, 1
 adelightfulglow.com, 1
+adelina.com.br, 0
 adeline.mobi, 1
+adelonline.tk, 1
+ademaulana.tk, 1
 ademy.ml, 1
 adenopatia.com, 1
 adenos.in, 1
@@ -7127,11 +7195,13 @@
 adevel.eu, 1
 adevo.be, 1
 adex.network, 1
+adextremadurafs.tk, 1
 adf-safetytools.com, 1
 adf.rocks, 1
 adfisicateca.org, 1
 adftrasporti.it, 1
 adfxllc.com, 1
+adgift.ro, 1
 adhd-explained.com, 1
 adhd-inattentive.com, 1
 adhdyogi.ca, 1
@@ -7141,12 +7211,15 @@
 adhocracy.plus, 1
 adhyayanclasses.com, 1
 adi.com.au, 1
+adi.company, 1
 adi.net.au, 1
 adib.family, 1
 adidas-2020-spring.com, 1
 adiehard.party, 0
+adiesyndrome.tk, 1
 adilahibrahim.com, 1
 adilgraphics.com, 1
+adimaja.com, 1
 adimplere.com.br, 1
 adinfinitum.gq, 1
 adingenierie.fr, 1
@@ -7185,8 +7258,10 @@
 adminless.ovh, 1
 adminlinux.pl, 1
 admino.cz, 1
-adminrezo.fr, 0
+adminova.tk, 1
+adminrezo.fr, 1
 adminton.eu, 1
+admiralshipsupplier.com, 0
 admody.com, 1
 admongo.gov, 1
 adn-recrutement.fr, 1
@@ -7201,6 +7276,7 @@
 adomani-italia.com, 1
 adomicilio.com.gt, 1
 adomicilio.gt, 1
+adon.is, 1
 adonai.eti.br, 1
 adonis.media, 1
 adonisgrup.ro, 1
@@ -7212,7 +7288,6 @@
 adoptabeehive.com, 1
 adoptabeehive.org, 1
 adoptabeehive.org.uk, 1
-adoptionlink.co.uk, 1
 adoptionpregnancycenter.com, 1
 adoptionpregnancycenter.net, 1
 adorade.ro, 1
@@ -7220,6 +7295,7 @@
 adoran.ga, 1
 adorecricket.com, 1
 adores.gq, 1
+adorewe.co.uk, 1
 adorewe.com, 1
 adorez.tk, 1
 adoric.com, 1
@@ -7238,10 +7314,12 @@
 adregain.ru, 1
 adrenalin.od.ua, 1
 adrenaline-gaming.ru, 1
+adrenalinhunters.tk, 1
 adresults.com, 1
 adresults.nl, 1
 adrian-riemer.tk, 1
 adrian.web.id, 1
+adrian2023.com, 1
 adrianajewelry.my, 1
 adrianasantos.me, 1
 adrianbechtold.de, 1
@@ -7254,6 +7332,7 @@
 adrianmejias.com, 1
 adrianobarbosa.xyz, 1
 adrianpetcu.tk, 1
+adrianpole.tk, 1
 adrianseo.ro, 0
 adrianwalls.tk, 1
 adrianweb.ml, 1
@@ -7267,8 +7346,9 @@
 adrino.ml, 1
 adrup.com, 1
 adsbouncycastles.co.uk, 1
-adsbtc.org, 1
+adscambodia.com, 1
 adsense-arbitrage.com, 1
+adserve.works, 1
 adsforcash.ga, 1
 adsib.gob.bo, 1
 adsl2meg.fr, 1
@@ -7290,7 +7370,6 @@
 adultwebcams1.com, 1
 adurra.com, 1
 adutoras.com.br, 1
-aduvi.de, 1
 adv.cr, 1
 advair-generic.ga, 1
 advairprice.ga, 1
@@ -7332,6 +7411,7 @@
 advantis.tk, 1
 advara.com, 1
 advasa.jp, 1
+advasa.net, 1
 advbizintel.com, 1
 advenacs.com, 1
 advenacs.com.au, 1
@@ -7341,7 +7421,6 @@
 advens.fr, 1
 adventaholdings.com, 1
 adventistai.lt, 1
-adventistdeploy.org, 1
 advento.bg, 1
 adventry.tk, 1
 adventure-inn.com, 1
@@ -7363,9 +7442,11 @@
 adventuringup.com, 1
 adventurousway.com, 1
 adventus.space, 1
+advercarte.com, 1
 adversus-test.tk, 0
 adversus-web-staging.tk, 0
 advertis.biz, 1
+advertising-design.tk, 1
 advertisingcompany.tk, 1
 adveszker.hu, 1
 advirk.tk, 1
@@ -7384,7 +7465,6 @@
 advokat-dtp.ml, 1
 advokat-dtp.tk, 1
 advokat-malinovskii.ml, 1
-advokat-romanov.com, 1
 advokat-vvp.com.ua, 1
 advokat73.gq, 1
 advokati-ceva.cz, 1
@@ -7402,8 +7482,9 @@
 advokaty.cf, 1
 advokaty.gq, 1
 advst.uk, 1
-advtran.com, 1
+advtran.com, 0
 adware.pl, 0
+adwokatkosterka.pl, 1
 adwokatzdunek.pl, 1
 adws.io, 1
 adxperience.com, 1
@@ -7438,15 +7519,22 @@
 ae86c.com, 1
 ae86dj.com, 1
 ae86dy.com, 1
+ae86f.com, 1
 ae86k.com, 1
 ae86m.com, 1
 ae86nb.com, 1
+ae86t.com, 1
+ae86tt.com, 1
 ae86u.com, 1
 ae86uu.com, 1
 ae86v.com, 1
 ae86x.com, 0
+ae86y.com, 1
+ae86yy.com, 1
 ae86zx.net, 1
+ae86zy.com, 1
 aeb.io, 1
+aebba.org, 1
 aebian.org, 1
 aebleskoven.dk, 1
 aecexpert.fr, 1
@@ -7464,6 +7552,7 @@
 aegrel.ee, 1
 aeh5134.cc, 1
 aeksistem.com, 1
+aelieve.com, 1
 aelisya.net, 0
 aenterprise.info, 1
 aeolservice.es, 1
@@ -7486,6 +7575,7 @@
 aerobasegroup.com, 1
 aerobatt.com, 1
 aerobotz.com, 1
+aeroflot.gq, 1
 aeroframe.tk, 1
 aerolineasvenezolanas.net, 1
 aeronautix.com, 1
@@ -7495,6 +7585,7 @@
 aerorecords.net, 1
 aerosoul.tk, 1
 aerospace-schools.com, 1
+aerospacearchives.tk, 1
 aerotechcoatings.com, 1
 aerowillys.tk, 1
 aertel.ie, 1
@@ -7512,6 +7603,7 @@
 aethereahealth.com, 1
 aetherlink.de, 1
 aethonan.pro, 1
+aethopy.ga, 1
 aevar.io, 1
 aevpn.org, 1
 aextron.com, 1
@@ -7567,13 +7659,16 @@
 affsquare.com, 1
 affumico.it, 1
 affvps.net, 1
+afg-team.tk, 1
 afganistan.cf, 1
-afgarish.com, 1
 afghan.dating, 1
+afghan.gq, 1
 afghandonia.tk, 1
 afgn.com.ua, 1
 afgphotographers.com, 1
+afgraphic.tk, 1
 afi-business-consulting.com, 1
+afiador.com.br, 1
 aficards.com, 1
 aficionados.com.br, 1
 afiliadosganadores.com, 1
@@ -7608,10 +7703,10 @@
 africaone-publishing.com, 1
 afrikmag.com, 1
 afrique.buzz, 1
-afrocave.com, 1
 afrodigital.uk, 1
 afrodisiac.tk, 1
-afrohub.se, 1
+afrodita.tk, 1
+afroditafirm.tk, 1
 afroto.com, 1
 afslankspecialist.nl, 1
 aftab-alam.de, 0
@@ -7620,6 +7715,7 @@
 afterdwi.info, 1
 afterfostercare.tk, 1
 afterhate.fr, 1
+afterhaven.com, 1
 afternoonhereyes.tk, 1
 afterpay.com, 1
 afterschoolprogramsoflancaster.org, 1
@@ -7628,6 +7724,7 @@
 aftodioikisi.gr, 1
 afva.net, 1
 afwd.international, 1
+afxsoft.ml, 1
 ag-33.net, 1
 ag-55.net, 1
 ag-777.com, 1
@@ -7656,9 +7753,6 @@
 ag173168.com, 1
 ag2.app, 1
 ag2017.cc, 1
-ag2722.com, 1
-ag2786.com, 1
-ag2855.com, 1
 ag288.vip, 1
 ag2886.com, 1
 ag2911.com, 1
@@ -7770,7 +7864,6 @@
 ag81867.com, 1
 ag81881.com, 1
 ag818818.com, 1
-ag818818.net, 1
 ag81886.com, 1
 ag819.tv, 1
 ag81912.com, 1
@@ -7815,6 +7908,7 @@
 ag88098.com, 1
 ag88110.com, 1
 ag88158.com, 1
+ag8819-livechat.com, 1
 ag88220.com, 1
 ag8829.com, 1
 ag8850.com, 1
@@ -7822,7 +7916,6 @@
 ag8856.com, 1
 ag8859.com, 1
 ag88618.com, 1
-ag887.com, 1
 ag8876.com, 1
 ag88777.com, 1
 ag8879.com, 1
@@ -7872,7 +7965,6 @@
 ag9ks.com, 1
 ag9vip.com, 1
 aga-eiken.tk, 1
-agaa35.com, 1
 agaclinicaltrials.com, 1
 agagent.vip, 1
 agalloch.tk, 1
@@ -7883,6 +7975,7 @@
 agari-mj.com, 1
 agarioforum.ga, 1
 agasaya.com, 1
+agasport.nl, 1
 agatajanik.de, 1
 agate.pw, 1
 agateh.com.au, 1
@@ -7911,12 +8004,16 @@
 agenciacorujadesign.com.br, 1
 agenciadeempregosdourados.com.br, 1
 agenciadigitalbolivia.com, 1
+agenciaempleo.tk, 1
 agenciafiscal.pe, 1
+agenciagriff.com, 1
+agenciaingenium.cl, 1
+agenciaplanner.com.br, 1
+agencxy.ga, 1
 agencyalacarte.com, 1
 agencybeam.com, 1
 agencyinmotion.com, 1
 agencymanager.be, 1
-agencytsunami.com, 1
 agenda-loto.net, 0
 agenda21senden.de, 1
 agendas.tk, 1
@@ -7928,7 +8025,7 @@
 agentfirewall.com, 1
 agentpoint.website, 1
 agentprocessing.com, 1
-agentrisk.com, 1
+agentrisk.com, 0
 agentur-circumplex.de, 1
 agentur-pottkinder.de, 1
 agenux.org, 1
@@ -7941,6 +8038,7 @@
 agg66.com, 1
 agg77.com, 1
 agg88.com, 1
+aggielandtutoring.com, 1
 agglo-sion.ch, 1
 aggression.tk, 1
 aggressivecarwraps.com, 1
@@ -7956,16 +8054,19 @@
 agilecraft.com, 1
 agilecyber.com, 1
 agilee.io, 1
+agileecommerce.com.br, 1
 agileui.com, 1
 agiley.se, 1
 agilicus.ca, 1
 agilicus.com, 1
+agility-westvlaanderen.tk, 1
 aging.gov, 1
 agingstats.gov, 1
 agingstop.net, 1
 aginion.net, 1
 agiosthomas.tk, 1
 agiserv.fr, 1
+agitmedia.ru, 1
 agk.co.com, 1
 agks02.com, 1
 agks1.com, 1
@@ -8024,11 +8125,15 @@
 aglucky.com, 1
 agm4545.com, 1
 agnesk.blog, 1
+agnesmatilda.tk, 1
+agnosia.tk, 1
 agnosticism.tk, 1
+agonpro.ch, 1
 agonswim.com, 1
 agonworks.com, 1
 agora-soft.cf, 1
 agora.ru, 1
+agoradanza.tk, 1
 agoravm.tk, 1
 agoravox.fr, 1
 agoravox.it, 1
@@ -8052,7 +8157,9 @@
 agpnepal.com, 1
 agproducts.co.uk, 1
 agpsn.com, 1
+agptco.com, 1
 agr.asia, 1
+agralines.tk, 1
 agrargruppe.tk, 1
 agrekov.ru, 1
 agremo.com, 0
@@ -8060,24 +8167,31 @@
 agri-meet.com, 1
 agrichamber.com.ua, 1
 agricult.tk, 1
+agricultural-technology.tk, 1
 agriculture-schools.com, 1
 agrikulturchic.com, 1
 agripartner.fr, 1
 agrippa.tk, 1
 agriprofocus.com, 1
+agrish.tk, 1
 agro-dom.solutions, 1
 agro-ferma.tk, 1
 agro-forestry.net, 1
+agroclefic.com, 1
 agroconsultoraplus.com, 1
+agrodoki.hu, 1
 agrodronechile.cl, 1
+agroexp.com.ua, 0
 agrolab.dk, 1
 agromotorsburzaco.com, 1
+agron.tk, 1
 agronomi.tk, 1
 agronomict.tk, 1
 agroplas.cf, 1
 agropool.tk, 1
 agropotter.com.ua, 1
 agrotek.lt, 1
+agrotender.com.ua, 1
 agroxxi.ru, 0
 agroyard.com.ua, 1
 agrus-wow.tk, 1
@@ -8090,9 +8204,13 @@
 agsun6.com, 1
 aguantepimpinero.tk, 1
 aguarani.com.br, 1
+aguaviva.tk, 1
 aguiascarecas.org, 1
+aguidetolovelossanddesperation.com, 1
 aguilarsoluciones.com, 1
+agujetas.tk, 1
 agung-furniture.com, 1
+agustinperalt.es, 1
 agviet88.com, 1
 agvip1000.com, 1
 agvip168.com, 1
@@ -8150,6 +8268,7 @@
 ahsyg.com, 1
 ahtuxpk.ru, 1
 ahughes03.com, 1
+ahvassociates.com, 1
 ahwah.net, 1
 ahxxm.com, 0
 ai-english.jp, 1
@@ -8165,7 +8284,10 @@
 aiasesoriainmobiliaria.com, 1
 aiat.net, 1
 aibaoyou.com, 1
+aibenzi.com, 1
 aibiying.com, 1
+aibolit-apteka.tk, 1
+aibolitik.tk, 1
 aibsoftware.mx, 1
 aicamilwaukee.com, 1
 aicevote.com, 1
@@ -8173,8 +8295,10 @@
 aicial.co.uk, 1
 aicv.club, 1
 aid-web.ch, 1
+aidablanco.tk, 1
 aidaccess.org, 1
 aidanamavi.com, 1
+aidanapple.com, 1
 aidanmitchell.co.uk, 1
 aidanmitchell.uk, 1
 aidanmontare.net, 1
@@ -8185,6 +8309,7 @@
 aiden.cool, 0
 aiden.link, 0
 aidenlx.top, 1
+aidez-moi.ca, 1
 aidhan.net, 1
 aidi-ahmi.com, 1
 aidmycomputer.com, 1
@@ -8226,6 +8351,7 @@
 ailitonia.xyz, 1
 aim-port.com, 1
 aim.org.pt, 1
+aimanance.com, 1
 aimare-web.tk, 1
 aimax.com, 1
 aimd.tech, 1
@@ -8234,6 +8360,7 @@
 aimgroup.co.tz, 1
 aimi-salon.com, 1
 aimias.in, 1
+aimlessempire.tk, 1
 aimmail.info, 1
 aimotive.com, 1
 aimrom.org, 1
@@ -8253,6 +8380,8 @@
 aiprecipecollection.com, 1
 air-craftglass.com, 1
 air-flot.tk, 1
+air-planning.co.jp, 1
+air-rishon.tk, 1
 air-shots.ch, 0
 air-techniques.fr, 1
 air-we-go.co.uk, 1
@@ -8327,17 +8456,16 @@
 airbnb.tools, 1
 airbnbchina.cn, 1
 airbnbcupom.com, 1
+airborne-clan.tk, 1
 airborne-inflatables.co.uk, 1
 aircheapfare.com, 1
 aircheapfares.com, 1
 aircomet.tk, 1
-airconditioning-sandton.co.za, 1
 airconditioning.tk, 1
 airconrandburg.co.za, 1
 airconsalberton.co.za, 1
 airconsandton.co.za, 1
 airconsboksburg.co.za, 1
-airconsfourways.co.za, 1
 airconsmidrand.co.za, 1
 airconsrandburg.co.za, 1
 airconssandton.co.za, 1
@@ -8368,12 +8496,16 @@
 airfareshotels.com, 1
 airfield.gq, 1
 airfocused.com, 1
+airfoto.tk, 1
 airhart.me, 1
 airhelp.com, 1
+airhorn.de, 1
 airi-tabei.com, 1
+airi.ga, 1
 airicy.com, 1
 airikai.com, 1
 airit.de, 1
+airjordanpascher.tk, 1
 airlibre-parachutisme.com, 1
 airline-rabota.tk, 1
 airlinefarescompare.com, 1
@@ -8384,9 +8516,12 @@
 airmash.online, 0
 airmaxinflatables.com, 1
 airnow.gov, 1
+airpark-roissy.fr, 1
 airpbx.com, 1
 airplay-inflatable-hire.co.uk, 1
 airplayradio.nl, 1
+airpoint-compressors.nl, 1
+airport-car-rental.tk, 1
 airport-charlotte.com, 1
 airportal.cn, 1
 airportstuttgart.com, 1
@@ -8399,6 +8534,7 @@
 airslate.com, 1
 airsnore.com, 1
 airsoft.ch, 1
+airsoftpinoso.tk, 1
 airstrike.tk, 1
 airswap.io, 1
 airtable.com, 1
@@ -8416,17 +8552,19 @@
 airwolfthemes.com, 1
 airwrenchei.com, 1
 airy.host, 0
+airzone.tk, 1
 ais.fashion, 1
 aisanity.com, 1
 aisedomains.ga, 1
 aisi316l.net, 1
 aissel.com, 1
+aisthesthai.tk, 1
 aistockcharts.com, 1
 aistrope.com, 1
 ait.com.ar, 1
-aitci.com.ph, 1
 aiticon.com, 1
 aitosoftware.com, 1
+aitrading.uk, 1
 aitrust.ro, 1
 aiui10.cn, 1
 aiutodomestico.ch, 0
@@ -8434,17 +8572,20 @@
 aivan.ai, 1
 aivd.lol, 1
 aiwosq.cn, 1
-aizxxs.com, 1
+aixamfinancialservices.nl, 1
 aizxxs.net, 1
 aj-foster.com, 1
 aja.de, 1
 ajarope.com, 1
 ajaxed.net, 1
+ajaxforever.tk, 1
+ajaxtime.tk, 1
 ajces.com, 1
 ajel.sa, 1
 ajetaci.cz, 1
 ajeventhire.co.uk, 1
 ajfite.com, 0
+ajforum.tk, 1
 ajhstamps.co.uk, 1
 ajiboye.com, 1
 ajitp.com, 1
@@ -8464,7 +8605,9 @@
 aka.ms, 1
 akaal.pw, 1
 akachanikuji.com, 1
+akachanwebsite.tk, 1
 akademiaantykorupcyjna.pl, 1
+akademiawawer.pl, 1
 akademie-frankfurt.de, 1
 akagiauto.net, 1
 akalashnikov.ru, 1
@@ -8480,12 +8623,15 @@
 akbarsempoi.tk, 1
 akbas.tk, 1
 akbtv.ru, 1
+akdenizim.tk, 1
 akdigitalegesellschaft.de, 0
 akdusekbudil.cz, 1
 akeenext.com, 1
 akerboom.family, 1
 akerboom.me, 1
 akerboom.org, 1
+aketzasantacoloma.tk, 1
+akf-plastics.com, 1
 akfoundationindia.com, 1
 akhabar.tk, 1
 akhealthconnection.com, 0
@@ -8502,6 +8648,7 @@
 akinix.com, 1
 akinlau.com, 1
 akinokae.de, 1
+akiranet.tk, 1
 akita-boutique.com, 1
 akita-stream.com, 1
 akitoy.mx, 1
@@ -8526,13 +8673,13 @@
 akr.io, 1
 akr.services, 1
 akracing.se, 1
-akrep.com, 1
 akrilikhavuz.com, 1
 akritikos.info, 1
 akropolis-ravensburg.de, 1
+aksaramedia.com, 1
 aksehir.bel.tr, 1
-akselinurmio.fi, 1
 aksert.com, 1
+akses.co, 1
 akshay.in.eu.org, 1
 akshi.in, 1
 aksot.com, 1
@@ -8557,18 +8704,19 @@
 akuislam.com, 1
 akukas.com, 0
 akul.co.in, 1
+akumat.com.pl, 1
+akumat.eu, 1
+akumat.pl, 1
 akuntansilengkap.com, 1
 akupunktur-akupunktoer.dk, 1
 akura.cf, 1
 akuseorangtraveler.com, 1
-akustik.tech, 1
 akuston.eu, 1
 akutun.cl, 1
 akvorrat.at, 1
 al-capone.ga, 1
 al-capone.tk, 1
 al-f.net, 1
-al3366.tech, 1
 al3xpro.com, 1
 alab.space, 1
 alabalaporto.tk, 1
@@ -8578,6 +8726,7 @@
 alabn.com, 1
 alaboard.com, 1
 alabordage.fr, 1
+alabuena.com, 1
 alacriti.com, 1
 alacritylaw.com, 1
 aladdin.ie, 1
@@ -8593,6 +8742,7 @@
 alair.cn, 0
 alalivre.cf, 1
 alamad.cf, 1
+alamalsahara.co, 1
 alamanceconstruction.com, 1
 alamani.tk, 1
 alamo-analytics.com, 1
@@ -8601,18 +8751,19 @@
 alanberger.me.uk, 1
 alanbleiweiss.com, 1
 alancabrera.com, 1
-aland.co.uk, 1
 alandoyle.com, 1
 alanhua.ng, 1
 alanhuang.name, 1
 alanina.com, 1
 alaninkenya.org, 1
+alaniz-law.com, 1
+alankardresswalla.tk, 1
 alanonsantabarbara.info, 1
+alansilson.tk, 1
 alantica.ga, 1
 alapetite.fr, 1
 alarbnet.tk, 1
 alarelleimpresiones.com, 1
-alargarlavida.com, 1
 alaricfavier.eu, 0
 alarko-carrier.com.tr, 1
 alarmat.pl, 1
@@ -8632,19 +8783,21 @@
 alaundeil.xyz, 1
 alaunus.com, 1
 alb-flirt.de, 1
+albagold.tk, 1
 albagora.nl, 1
 albakos.tk, 1
 albaladejodelcuende.tk, 1
-albalat.cat, 1
-albalat.info, 1
 albalatedelarzobispo.tk, 1
+albalew.is, 1
 albalinks.tk, 1
 albamusic.tk, 1
 albanesi.it, 1
+albaniachat.tk, 1
 albaniaonline.tk, 1
 albanildedios.tk, 1
 albanyca.gov, 1
 albanycountydems.com, 1
+albarugby.tk, 1
 albayan.ae, 1
 albbounce.co.uk, 1
 albendazole.ml, 1
@@ -8653,12 +8806,16 @@
 albertathome.org, 1
 albertcuyp-markt.amsterdam, 1
 alberteinsteinbiography.tk, 1
+albertforfuture.de, 1
+albertgibb.tk, 1
 albertify.xyz, 1
 albertohurtado.fyi, 1
 albertovr.com, 1
 alberts-blatt.de, 1
+albhof-wasserfall.de, 1
 albilaga.id, 1
 albinma.com, 1
+albinvega.tk, 1
 albion2.org, 1
 albionfaeries.org.uk, 1
 albourne.com, 1
@@ -8672,24 +8829,32 @@
 alcaldia.info, 1
 alcamilo.cloudns.cc, 1
 alcantara.cf, 1
+alcapalis.tk, 1
+alcar.tk, 1
+alcaralifusi.tk, 1
 alcasan.de, 1
 alcatelonetouch.us, 1
+alchemisten.tk, 1
 alchemiya.ru, 1
 alchemy-media-marketing.com, 1
 alchemy.gr, 1
 alchemyvfx.com, 1
 alchimic.ch, 0
+alcionesakugawa.com, 1
 alcites.com, 1
 alcnutrition.com, 1
 alcobendas.tk, 1
 alcoholapi.com, 1
 alcoholia.tk, 1
+alcoholicbeverages.tk, 1
+alcoholismtreatment.tk, 1
 alcoleadetajo.tk, 1
 alcolecapital.com, 1
 alcouponest.com, 1
 alcove.cf, 1
 alcubillas.tk, 1
 aldeal.gq, 1
+aldealices.tk, 1
 aldersgate.cf, 1
 aldersgate.ga, 1
 aldersgate.gq, 1
@@ -8718,12 +8883,13 @@
 alecrimacessorios.com.br, 1
 alecrust.com, 1
 aleftinka.tk, 1
-alejandrocruz.es, 1
+alegromania.tk, 1
 alejandrophones.com.mx, 1
 alek.in, 1
 aleks.com, 1
 aleksandar-vukmirovic.tk, 1
 aleksanders.tk, 1
+alekseevski.tk, 1
 aleksejjocic.tk, 1
 aleksib.fi, 1
 alela.fr, 1
@@ -8757,6 +8923,7 @@
 alexander-cameron.com, 1
 alexander-van-nieuwenhoven.tk, 1
 alexanderb.info, 1
+alexanderg.tk, 1
 alexanderjshapiro.com, 1
 alexanderkhen.tk, 1
 alexanderlau.ga, 1
@@ -8765,6 +8932,7 @@
 alexanderpiatigorsky.tk, 1
 alexanderpopov.tk, 1
 alexanderschimpf.de, 1
+alexandertutoring.com, 1
 alexandra-schulze.de, 1
 alexandraandnicolay.com, 1
 alexandraschmidt.coach, 1
@@ -8776,7 +8944,6 @@
 alexbaker.org, 1
 alexberts.ch, 1
 alexbresnahan.com, 1
-alexcl.com, 1
 alexcoman.com, 1
 alexcpp.tk, 1
 alexdaniel.org, 1
@@ -8788,6 +8955,7 @@
 alexgaynor.net, 1
 alexgebhard.com, 1
 alexglover.co.uk, 1
+alexgonzalez-online.tk, 1
 alexgsites.co.il, 1
 alexguti.com, 1
 alexhd.de, 1
@@ -8801,6 +8969,7 @@
 alexismeza.dk, 1
 alexismeza.es, 1
 alexismeza.nl, 1
+alexispoficial.tk, 1
 alexitor.com, 1
 alexjett.com, 1
 alexkushner.com, 1
@@ -8808,8 +8977,6 @@
 alexlombardo.tk, 1
 alexlouden.com, 1
 alexmainz.com, 1
-alexmainz.de, 1
-alexmainz.eu, 1
 alexmerkel.com, 1
 alexmerkel.me, 1
 alexmerkel.xyz, 1
@@ -8829,6 +8996,7 @@
 alexthayne.co.uk, 1
 alextjam.es, 1
 alextsang.net, 1
+alextweewielers.tk, 1
 alexustinoff.cf, 1
 alexvdveen.nl, 1
 alexvetter.de, 0
@@ -8839,26 +9007,29 @@
 alfa-host.ml, 1
 alfa-tech.su, 1
 alfaair.aero, 1
+alfabank-info.ru, 1
 alfacharlie.co, 1
 alfadlmedical.com, 1
 alfadlmedical.net, 1
-alfaei.com.br, 1
 alfalasteenyia.cf, 1
 alfambra.tk, 1
 alfamx.com, 1
 alfaperfumes.com.br, 1
 alfaproweb.fr, 1
+alfarisnet.com, 0
 alfastone.com.ua, 1
 alfavideocirurgica.com.br, 1
 alfavit.cf, 1
 alfawedding.com, 1
 alfiebarker.com, 1
+alfonso-baya.tk, 1
 alforto.nl, 1
 alfransiacademy.com, 0
 alfratehotelcampiglio.it, 1
 alfred-figge.de, 1
 alfredapp.com, 1
 alfredlin015.com, 1
+alfst.com, 1
 alftrain.com, 1
 algarmatic-automatismos.pt, 1
 algbee.com, 1
@@ -8866,14 +9037,15 @@
 algercounty.gov, 1
 algerianportal.tk, 1
 algeriaweb.tk, 1
+algerie-music.tk, 1
 alghadpowersolutions.com, 1
 alghanimcatering.com, 1
 algoarmada.com, 1
-algodoncotton.com, 1
 algoentremanos.com, 1
 algofactory.de, 1
 algolia.com, 1
 algopix.com, 1
+algorista.tk, 1
 algorithmic.ml, 1
 algorithmofsuccess.com, 1
 algoritmus-uspechu.cz, 1
@@ -8885,6 +9057,7 @@
 aliamex.com, 1
 alianet.org, 1
 aliantsoft.pl, 1
+aliasinfoforums.tk, 1
 aliaswp.com, 1
 alibabau.tk, 1
 alibip.de, 1
@@ -8894,13 +9067,13 @@
 alice.tw, 1
 alicebaldenegro.tk, 1
 alicedepret.com, 1
+alicemag.ng, 1
 alicemaywebdesign.com.au, 1
 alicestudio.it, 1
 alicetone.net, 1
 alicialab.org, 1
 aliefirfany.com, 1
 alieke.design, 1
-alien.bz, 1
 alienation.biz, 0
 alienflight.com, 1
 alieninvasion.fun, 1
@@ -8909,6 +9082,7 @@
 aliexfantaisies.com, 1
 alifeadjacent.com, 1
 alighierirescaldina.it, 1
+alignminds.com, 1
 alignrs.com, 1
 alignthoughts.com, 1
 aliim.gdn, 1
@@ -8953,6 +9127,7 @@
 aljaspod.hu, 1
 aljaspod.net, 1
 aljaspod.org, 1
+aljullusims.tk, 1
 aljweb.com, 1
 alkacoin.net, 1
 alkami.com, 1
@@ -8968,10 +9143,12 @@
 all-bronza.ru, 1
 all-connect.net, 0
 all-fashion-schools.com, 1
+all-for-u.tk, 1
 all-gsm-solutions.tk, 1
 all-markup-news.com, 1
 all-things.tk, 1
 all4hardware4u.de, 1
+all4web.tk, 1
 all878.com, 1
 allaboutfunuk.com, 1
 allaboutgreg.net, 1
@@ -8989,6 +9166,7 @@
 allangirvan.net, 1
 allanta.be, 1
 allarmi.roma.it, 1
+allarticles.tk, 1
 allbenjoy.de, 1
 allbestcbdoil.com, 1
 allbetgame.cn, 1
@@ -8998,6 +9176,7 @@
 allbouncesurrey.co.uk, 1
 allbrestby.tk, 1
 allbrestorg.tk, 1
+allbridges.tk, 1
 allbusiness.com, 1
 allcapa.org, 1
 allcarecorrectionalpharmacy.com, 1
@@ -9013,37 +9192,46 @@
 alldm.ru, 1
 alle-zonvakanties.nl, 1
 alle.bg, 1
+allegorymetal.tk, 1
 allegra.ga, 1
 allegra180mg.ga, 1
 allegrapark.ga, 1
 allemoz.com, 1
 allemoz.fr, 1
+allenacampbell.tk, 1
 allenarchive.com, 1
 allensun.org, 1
 allenturley.com, 1
 allenwillis.ga, 1
 allergento.shop, 1
+allergento.store, 1
+allergictoidiots.tk, 1
 allergyweb.ga, 1
 allerlei-havelte.nl, 1
 allerstorfer.at, 1
 alles-kan.be, 1
 alles-nur-ge.cloud, 1
-alles.cx, 1
+alles.cx, 0
 alleskan.gent, 1
 alleskomtgoed.org, 1
 allesuitdekast.be, 1
+allevamentoticinella.tk, 1
 allfashionews.tk, 1
 allfaucet.ml, 1
 allfoodrecipes.ga, 1
 allforex.ml, 1
+allforhon.tk, 1
+allformsweden.com, 1
 allfundsconnect.com, 1
 allgadgetsfree.tk, 1
 allgaragefloors.com, 1
 allgemeinarzt-wenta-bralla.de, 1
 allgolfreviews.com, 1
+allgooddeedshomes.com, 1
 allgosts.ru, 1
 allgrass.net, 1
 allgreenturf.com.au, 1
+allhallows.tk, 1
 allhard.org, 1
 allhits.ml, 1
 allhomemueble.com, 1
@@ -9052,11 +9240,11 @@
 alliance-clan.tk, 1
 alliance-immobilier-service-neuf.fr, 1
 alliance-psychiatry.com, 1
-allianceexpressmail.com, 1
 allianceforafreesociety.com, 1
 allianceforafreesociety.net, 1
 allianceforafreesociety.org, 1
 alliances-globalsolutions.com, 0
+allianskyrkan.se, 1
 alliedfrozenstorage.com, 1
 alliedpavers.com, 1
 allinagency.com, 1
@@ -9075,6 +9263,7 @@
 alllaboutchickens.tk, 1
 allladyboys.com, 1
 allline.shop, 1
+allmagic.tk, 1
 allmajestic.com, 1
 allmaps.tk, 1
 allmba.cf, 1
@@ -9095,7 +9284,6 @@
 alloutofgum.com, 1
 alloutsec.com, 1
 alloverthehill.com, 1
-allpaperworld.com, 1
 allpedia.tk, 1
 allphaseclean.com, 1
 allplayer.tk, 1
@@ -9108,6 +9296,7 @@
 allpussynow.com, 1
 allrad-buck.de, 1
 allram.info, 1
+allrepair.gr, 1
 allright.tk, 1
 allroundtechnology.com, 1
 allroundtechnology.nl, 1
@@ -9117,6 +9306,7 @@
 allsearch.io, 1
 allseasons-cleaning.co.uk, 1
 allseasonswaterproofing.com, 1
+allsoftfree.com, 1
 allsoulinc.com, 1
 allsoulmobile.com, 1
 allsoultech.com, 1
@@ -9124,6 +9314,7 @@
 allstakesupply.com.au, 1
 allstarautokiaparts.com, 1
 allstarcashforcars.com, 1
+allstarcustompools.com, 1
 allstarpartyinflatables.co.uk, 1
 allstarquilts.com, 1
 allsun.online, 1
@@ -9132,9 +9323,13 @@
 allsync.nl, 0
 alltape.eu, 1
 allterrainfence.com, 1
+alltherapies.tk, 1
 alltherooms.com, 1
 alltherooms.es, 1
+allthestuff.com, 1
 allthethings.co.nz, 1
+allthetopnews.com, 1
+allthewaynorth.xyz, 1
 allthings.me, 1
 allthingsfpl.com, 1
 allthingssquared.com, 1
@@ -9148,6 +9343,7 @@
 allureonparkway.com, 1
 allurescarves.com, 1
 alluvion.studio, 1
+allvideofoot.tk, 1
 allvips.ru, 0
 allvitalconstruction.com, 1
 allweatherlandscaping.net, 1
@@ -9159,7 +9355,9 @@
 almanassa.com, 1
 almanassa.net, 1
 almanassa.run, 1
+almanea.org, 1
 almanssur.com, 1
+almarail.tk, 1
 almargen.ga, 1
 almasoft.ga, 1
 almasteb.com, 1
@@ -9185,13 +9383,17 @@
 alnitech.com, 0
 alocato.com, 1
 alodokita.com, 1
+aloe-vera-info.tk, 1
 aloemeda.de, 1
 aloesoluciones.com.ar, 1
 alofone.vn, 1
 alohapartyevents.co.uk, 1
+alojamientos-cuba.com, 1
 alolabor.org, 1
 alomch.gq, 1
+alonely.place, 1
 alonetone.com, 1
+along.org, 1
 alonsoluzgas.es, 1
 aloo.ga, 1
 alov.blog, 1
@@ -9266,9 +9468,12 @@
 alplogopedia.it, 1
 alquds.edu, 1
 alquilerps5.com, 1
+alquran-online.tk, 1
 alrait.com, 1
 alre-outillage.fr, 1
+alrobotics.net, 1
 alroniks.com, 1
+alsaagency.tk, 1
 alsace-boutique.fr, 1
 alsaceboutique-peluches-bukowski.fr, 1
 alsops.cf, 1
@@ -9280,8 +9485,10 @@
 altabash.tk, 1
 altabib.me, 1
 altabooks.ga, 1
+altacomunicazione.tk, 1
 altaekwondo.club, 1
 altahrim.net, 1
+altai-info.ga, 1
 altai-voyage.tk, 1
 altai-zemlya.cf, 1
 altai-zemlya.ga, 1
@@ -9295,7 +9502,6 @@
 altaizemlya.tk, 1
 altapina.com, 0
 altaplana.be, 1
-altawfer.com, 1
 altdforyou.tk, 1
 alteah.com, 1
 altecgmbh.de, 1
@@ -9309,13 +9515,14 @@
 altered.si, 1
 alterego.tk, 1
 altergalaxy.tk, 1
-alteria.xyz, 1
 alteringit.com, 1
 alterlinks.com, 1
 alterlinks.fr, 1
 alterlinks.it, 1
 alterlinks.nl, 1
 alternador.com.br, 1
+alternativagospel.tk, 1
+alternative-e-energy.tk, 1
 alternative-reussite.org, 1
 alternative.bike, 1
 alternative.hosting, 1
@@ -9350,14 +9557,15 @@
 altmaestrat.es, 1
 altmann-systems.de, 1
 altoa.cz, 1
-altonblom.com, 1
 altonkey.com, 1
 altopartners.com, 1
 altopia.com, 1
 altorise.com, 1
 altos.tk, 1
 altospam.com, 1
+altovoltaggio.tk, 1
 altphotos.com, 1
+altralamezia.tk, 1
 altramarsala.tk, 1
 altrasoluzione.com, 1
 altratella.tk, 1
@@ -9371,6 +9579,7 @@
 altweb.ro, 1
 aluchta.tk, 1
 aluguer-rodagigante.pt, 0
+alukard.ml, 1
 aluminium-express.ru, 1
 aluminium-giesserei.de, 1
 aluminumfencestlouis.com, 1
@@ -9389,6 +9598,7 @@
 alvaiazere.net, 1
 alvarezmorales.tk, 1
 alvarojacome.com, 1
+alvarovega.tk, 1
 alvastonauto.fi, 1
 alvcs.com, 1
 alviano.com, 0
@@ -9403,6 +9613,7 @@
 alwaysmine.fi, 1
 alwaysonssl.com, 1
 alwayswanderlust.com, 1
+alxclub.tk, 1
 alxlegal.com, 1
 alxu.ca, 1
 alykkelife.com, 1
@@ -9415,6 +9626,7 @@
 alza.sk, 1
 alzashop.com, 1
 alziamoiltetto.it, 1
+alzon.cf, 1
 alzulej.pt, 1
 am-39.com, 1
 am-dd.com, 1
@@ -9423,6 +9635,8 @@
 am-i-on-drugs.com, 1
 am-liaotian.com, 0
 am-schlossgarten.haus, 1
+am-sonnenblick.de, 1
+am-sonnengarten.de, 1
 am156.com, 1
 am22i6xaf1m2a5m9k.xyz, 1
 am2digital.com, 1
@@ -9440,7 +9654,6 @@
 am85168.com, 1
 am8811.net, 1
 am8833.net, 1
-am8866m.com, 1
 am8898.net, 1
 am8info.com, 1
 am9588.com, 1
@@ -9488,7 +9701,9 @@
 amartaramitramandal.tk, 1
 amaruddinmufid.com, 1
 amasea.yachts, 1
+amasing.tk, 1
 amateri.com, 1
+amateur-ham-rad.io, 1
 amateur.cf, 1
 amateurpornhours.com, 1
 amateurradionotes.com, 1
@@ -9509,8 +9724,10 @@
 amazing-castles.co.uk, 1
 amazinginflatables.co.uk, 1
 amazingmalang.id, 1
+amazingpetshere.com, 1
 amazingraymond.com, 1
 amazingraymond.com.au, 1
+amazonemotions.com, 1
 amazoniacoffees.com, 1
 amb.tf, 1
 amb8.net, 1
@@ -9527,6 +9744,7 @@
 ambicorpenergy.com, 1
 ambicorprealestate.com, 1
 ambiente.one, 1
+ambigramasdecarmela.tk, 1
 ambion.am, 1
 ambiq.nl, 1
 ambouncyhire.com, 1
@@ -9545,6 +9763,7 @@
 amdm.ru, 1
 amdouglas.uk, 1
 amdrumors.com, 1
+amdukis-bordercollies.tk, 1
 amechancez.work, 1
 amedtest.org, 1
 ameego.com, 1
@@ -9565,6 +9784,7 @@
 america.gov, 1
 america250.gov, 1
 americafamilylawcenter.org, 1
+americafc.tk, 1
 americagambles.com, 1
 americahealthcare.tk, 1
 americamilitar.com, 1
@@ -9580,6 +9800,7 @@
 americanfootball.ml, 1
 americanfootball.tk, 1
 americanfoundationbr.com, 1
+americangods.tk, 1
 americanhoneyproducers.org, 1
 americanindiancoc.org, 0
 americanindiannursing.com, 1
@@ -9600,7 +9821,6 @@
 americkykongres.cz, 1
 americoadvogados.com.br, 1
 americolorcorp.com, 1
-americorps.gov, 1
 ameriikanpoijat.org, 1
 amerika-forum.de, 1
 amerikanloto.tk, 1
@@ -9608,7 +9828,6 @@
 amerimex.org, 1
 amerion.nl, 1
 ameriondental.nl, 1
-ames.gq, 1
 amesgen.de, 1
 amesvacuumrepair.com, 1
 amethystbodyart.co.za, 1
@@ -9634,6 +9853,9 @@
 amiciperlatesta.it, 1
 amielle.com, 1
 amifoundation.net, 1
+amigodeltoro.tk, 1
+amigosdelvalenciadeastorga.tk, 1
+amigosdivecenter.com, 1
 amigosencanada.com, 1
 amigucrochet.com, 1
 amikootours.com, 1
@@ -9643,8 +9865,10 @@
 amilum.org, 1
 amin.one, 1
 aminafrance.com, 1
+amindset.hk, 1
 amineamellouk.com, 1
 amineptine.com, 1
+aminfarhoodi.tk, 1
 aminko.ga, 1
 aminorth.com, 1
 aminovega.com, 1
@@ -9664,6 +9888,7 @@
 amissing.link, 1
 amithvijayan.in, 1
 amitpatra.com, 0
+amitriptyline-hydrochloride.ga, 1
 amitt.ga, 1
 amj74-informatique.fr, 1
 amjaadabdullah.com, 1
@@ -9688,6 +9913,7 @@
 amokinio.com, 1
 amolaccum.tk, 1
 amolador.com.br, 1
+amolare.com.br, 1
 amollare.com.br, 1
 amongus-guru.ru, 1
 amoozesh98.com, 1
@@ -9698,7 +9924,9 @@
 amorgosrentandgo.gr, 1
 amorim.ca, 1
 amorphis.tk, 1
+amortyzator.tk, 1
 amorxyoga.com, 1
+amorymerced.tk, 1
 amoryurgentcare.com, 1
 amoursucre.com, 1
 amoxicillin-500mg.ga, 1
@@ -9728,10 +9956,12 @@
 ampleinfographics.com, 1
 ampleitsolutions.com.au, 1
 ampleroads.com, 1
+amplifier-technics.tk, 1
 ampproject.com, 1
 ampproject.org, 1
 ampullen.tk, 1
 amputated.tk, 1
+amputatedgenitals.tk, 1
 amrcaustin.com, 1
 amrcla.com, 1
 amrff.com, 1
@@ -9743,6 +9973,8 @@
 amsconnectapp.com, 1
 amsel305nc.ddnss.de, 1
 amsfoodhk.com, 1
+amstelland.com, 1
+amstelradio.tk, 1
 amstelveentje.nl, 1
 amsterdamian.com, 1
 amsuisse.com, 1
@@ -9780,7 +10012,6 @@
 anabolic.co, 1
 anabolickdieta.ga, 1
 anabolics.tk, 1
-anabolitics.com, 1
 anachristinarodriguez.com, 1
 anachronis.gq, 1
 anacom.pt, 1
@@ -9799,8 +10030,11 @@
 analgesia.ga, 1
 analgesia.net, 1
 analinsting.tk, 1
+analisi-grammaticale.biz, 1
 analisi-logica.it, 1
+analisi-periodo.it, 1
 analisilaica.it, 1
+analogical.ga, 1
 analogist.net, 1
 analpantyhose.org, 1
 analteengirls.net, 1
@@ -9815,11 +10049,12 @@
 analyze-ed.com, 1
 analyzemyfriends.com, 1
 anamelikian.com, 1
+anamterminal.tk, 1
+ananas.gq, 1
 anandchowdhary.com, 1
 anangeix.tk, 1
 ananiev.ml, 1
 anankecosmetics.com, 1
-ananswer.org, 1
 anantshri.info, 1
 ananyagupta.tk, 1
 anapsi.tk, 1
@@ -9829,15 +10064,18 @@
 anarchistischegroepnijmegen.nl, 0
 anarchistos.tk, 1
 anarchyrp.life, 1
+anarchyweb.tk, 1
 anarhija.tk, 1
 anarka.org, 1
 anarkhe.net, 1
+anarshist.tk, 1
 anarticle.gq, 1
 anasaci.com, 1
 anasahr.be, 1
 anasibrahim.com, 1
 anassiriphotography.com, 0
 anastasia-shamara.ru, 0
+anatomized.tk, 1
 anatoray.com, 1
 anaxios.ga, 1
 anayarealm.com, 1
@@ -9845,6 +10083,7 @@
 ancarda.net, 1
 ance.lv, 0
 ancel.io, 1
+ancentury.com, 1
 ancestramil.fr, 1
 anchev.net, 1
 anchorit.gov, 1
@@ -9855,14 +10094,16 @@
 anciens.org, 1
 ancient-gates.de, 1
 ancientnorth.com, 1
-ancientwars.ru, 1
 ancolies-andre.com, 0
+anconaswine.com, 1
 ancroma.ro, 1
 and-stuff.nl, 1
 and.com, 0
+andaluciaboard.tk, 1
 andalusierondreizen.nl, 1
 andariegocusco.com, 1
 andarpersassi.it, 1
+andcable.com, 1
 andel.info, 0
 anders.hamburg, 1
 anderskp.dk, 0
@@ -9870,6 +10111,7 @@
 andersonshatch.com, 1
 anderstornkvist.se, 1
 andesnevadotours.com, 1
+andhaniawan.my.id, 1
 andibo.net, 1
 andiplusben.com, 1
 andisadhdspot.com, 1
@@ -9878,9 +10120,12 @@
 andnet.tk, 1
 andoms.fi, 1
 andorraimperial.tk, 1
+andos.tk, 1
+andr-mobile.tk, 1
 andradealbuquerque.pt, 1
 andre-ballensiefen.de, 1
 andre-otto.com, 1
+andre-schlichting.de, 1
 andrea-kiaora.de, 1
 andrea-m.me, 1
 andrea-wirthensohn.at, 0
@@ -9894,10 +10139,11 @@
 andreahruby.it, 1
 andreamcnett.com, 1
 andreamonicahug.com, 1
+andreapalermo.tk, 1
 andreapavone.com, 1
 andreariccitraduzioni.it, 1
 andreasfeusi.ch, 1
-andreasjanker.de, 1
+andreasjanker.de, 0
 andreaskluge.eu, 1
 andreaskrasa.com, 1
 andreaslicht.nl, 1
@@ -9912,12 +10158,13 @@
 andrejbenz.com, 1
 andrejstefanovski.com, 1
 andrelauzier.com, 1
+andremaciel.pt, 1
 andreoliveira.io, 1
 andrepicard.de, 1
 andrescuartas.tk, 1
 andresgarzon.net, 1
 andrespaz.com, 1
-andresrios.nl, 1
+andresrosa.es, 1
 andressaflores.com.br, 1
 andreundnina.de, 1
 andrew.fi, 1
@@ -9946,10 +10193,10 @@
 andrewrdaws.com, 1
 andrewrgoss.com, 1
 andrewryno.com, 1
+andrewsandford.com, 1
 andrewsoutar.com, 1
 andrewsun.com, 1
 andrewtasso.com, 1
-andrewtaylor.eu, 1
 andrewtchin.com, 1
 andrewtran.xyz, 1
 andrewwiggins.ca, 1
@@ -9960,16 +10207,19 @@
 andreyjuravlev.ga, 1
 andreypopp.com, 1
 andreysmirnov.tk, 1
+andrianova.ml, 1
 andriraharjo.com, 1
 andrisilberschmidt.ch, 1
 andro4all.com, 1
 android, 1
 android-10-inch-tablets.tk, 1
+android-it.cf, 1
 android-tv.3utilities.com, 1
 android.re, 1
 android1.co.id, 1
 android1pro.com, 1
 androide.com, 1
+androidgadgematic.com, 1
 androidgaming.tk, 1
 androidhry.cz, 1
 androidhub.ru, 1
@@ -9988,6 +10238,8 @@
 andromedacenter.com, 1
 andropia-online.fr, 1
 androtix.com, 1
+androtiyas.com, 1
+andrush.eu, 1
 andruvision.cz, 1
 andsat.org, 1
 andschwa.com, 0
@@ -9997,6 +10249,7 @@
 andy-hagans.tk, 1
 andybrett.com, 1
 andyc.cc, 1
+andycatteceur.tk, 1
 andycraftz.eu, 1
 andycrockett.io, 1
 andys-place.co.uk, 1
@@ -10004,6 +10257,7 @@
 andyson.at, 1
 andysroom.dynu.net, 1
 andyt.eu, 1
+andythomasonline.tk, 1
 andywalkeronline.tk, 1
 andywilliamsonline.tk, 1
 andzia.art.pl, 1
@@ -10015,18 +10269,19 @@
 anedot.xyz, 1
 aneducationuto.tk, 1
 aneebahmed.com, 1
-anekatempatwisata.com, 1
 anekdot-pr.tk, 1
 anekdotiki.tk, 1
 anelik.tk, 1
 aneslix.com, 0
 anetaben.nl, 1
+anetteolzon.tk, 1
 aneutrallife.com, 1
 anex.us, 1
 anextraordinaryday.net, 1
 ange-de-bonheur444.com, 1
 angel-body.com, 1
 angelalombardo.it, 1
+angelarellano.tk, 1
 angelbulldog.tk, 1
 angelcorpus.tk, 1
 angelefloramendy.org, 1
@@ -10037,12 +10292,13 @@
 angelicare.co.uk, 1
 angelicsphynx.tk, 1
 angelikaclothing.com, 1
-angelikasolorzano.cloud, 1
 angelinafilipski.tk, 1
 angelishansen.se, 1
 angeljmadrid.com, 1
 angelo4ek.tk, 1
 angeloanan.xyz, 0
+angelok.ru, 1
+angeloreyes.com, 1
 angelremigene.com, 0
 angelsanctum.tk, 1
 angelsandairwaves.tk, 1
@@ -10051,13 +10307,16 @@
 angelsoft.com, 1
 angelspabeauty.co.uk, 1
 angelswar.ga, 1
+angeltorri.tk, 1
 angelzapien.com, 1
 angepsychedelices.tk, 1
+angermanalvorna.tk, 1
 angiejones.com, 1
 angievancise.com, 1
 angiewickes.com, 1
 anginf.de, 1
 angione.ca, 1
+angione.se, 1
 angkasa.net.id, 1
 anglersconservation.net, 1
 anglertanke.de, 1
@@ -10075,9 +10334,10 @@
 angristan.xyz, 1
 angry-monk.com, 1
 angry.im, 1
+angrybear.tk, 1
 angrydragonproductions.com, 1
 angrysnarl.com, 1
-angryteeth.net, 1
+angryteeth.net, 0
 angular-js.ga, 1
 angular-software.at, 1
 angularjs.org, 0
@@ -10086,16 +10346,21 @@
 anhaffen.lu, 1
 anhcuti.com, 1
 anhdvboot.com, 1
+anhdvshop.com, 1
 anhqv.es, 1
 anhui30019.com, 1
 ani-man.de, 1
 aniaimichal.eu, 1
+aniblizzard.tk, 1
 anicam.fr, 1
 aniforprez.net, 1
 anihilated.tk, 1
 anihonetwallpaper.com, 1
 anilasansor.com, 1
+anillosdecompromiso.co, 1
 anim.ee, 1
+anima.digital, 1
+animaalternative.it, 1
 animaemundi.be, 0
 animal-liberation.com, 1
 animal-rights.com, 1
@@ -10105,7 +10370,6 @@
 animalcrossingwiki.de, 1
 animaletnous.be, 1
 animalliberation.tk, 1
-animalplanet.tech, 1
 animalstropic.com, 1
 animaltesting.fr, 1
 animalworld.club, 1
@@ -10115,11 +10379,13 @@
 animan.ca, 1
 animanganetwork.tk, 1
 anime-culture.com, 1
+anime-dragoon.tk, 1
 anime-drift.tk, 1
 anime-tip.com, 1
 anime.my, 0
 anime1.me, 1
 anime1.moe, 1
+anime1.pw, 1
 anime1.top, 1
 animeai.com, 1
 animebase.me, 1
@@ -10127,6 +10393,7 @@
 animeclub.in.ua, 1
 animecracks.com, 1
 animecreed.ga, 1
+animeday.ml, 1
 animedescarga.ml, 1
 animedon.tk, 1
 animeelite.tk, 1
@@ -10140,6 +10407,7 @@
 animemotivation.com, 1
 animepahe.com, 1
 animeplus1.tk, 1
+animeronews.tk, 1
 animes-portal.info, 1
 animesbrasil.tk, 1
 animesconsteemplee.tk, 1
@@ -10153,6 +10421,8 @@
 aninews.tk, 1
 anip.icu, 1
 anipassion.com, 0
+aniplus.cf, 1
+aniplus.gq, 1
 anirvalle.com, 1
 anisimov.ml, 1
 anitaalbersen.nl, 1
@@ -10170,6 +10440,7 @@
 anjocerdena.com, 1
 anjoola.com, 1
 ankane.org, 1
+ankaradaozelders.tk, 1
 ankaraevdenevenakliyat.name.tr, 1
 ankarakurumsalwebtasarim.com, 1
 ankaraotokiralama.tk, 1
@@ -10196,16 +10467,19 @@
 anmolnayyar.com, 1
 anna-beauty.gq, 1
 anna-dance.ru, 1
+anna-mai.net, 1
 anna.info, 1
 annabelcinemas.com, 1
 annadebrux.cf, 1
 annaenemma.nl, 1
 annafiore.com.br, 1
 annalaudel.gallery, 1
+annalisefashion.ga, 1
 annalitvinova.pro, 1
 annangela.moe, 1
 annarborplasticsurgery.com, 1
 annarokina.com, 1
+annasadzik.art, 1
 annawagner.pl, 1
 anne-marie.tk, 1
 annebacarat.fr, 1
@@ -10234,20 +10508,20 @@
 annu.tk, 1
 annuaire-auto-ecole.com, 1
 annuaire-express.tk, 1
-annuaire-jcb.com, 1
 annuaire-photographe.fr, 0
 annual.ga, 1
 annuitycommunity.com, 1
+annulleret.tk, 1
 annunciationbvmchurch.org, 1
 annynantasiri.com, 1
 anodas.lt, 1
 anohana.org, 1
 anojan.com, 1
+anomalous.eu, 1
 anomaly.tk, 1
 anon-next.de, 1
 anonaddy.com, 1
 anonaddy.me, 1
-anonboards.com, 1
 anoncrypto.org, 1
 anoneko.com, 1
 anongoth.pl, 0
@@ -10257,7 +10531,6 @@
 anonrea.ch, 1
 anons.fr, 0
 anonser.tk, 1
-anontekno.com, 1
 anonym-surfen.de, 1
 anonym-surfen.online, 1
 anonyme-spieler.at, 1
@@ -10278,6 +10551,7 @@
 anouncer.ga, 1
 anowicki.pl, 1
 anpaju.gq, 1
+anpigabon.ga, 1
 anquankongjian.com, 1
 ans-ge.ch, 0
 ans-solutions.com, 1
@@ -10384,6 +10658,7 @@
 antidott.fr, 1
 antiekboerderijgraafland.nl, 1
 antifa.sh, 0
+antifake-funko.fr, 1
 antifaschistisch-reisen.tk, 1
 antifaschistische-linke.tk, 1
 antifaschistischeaktioncelle.tk, 1
@@ -10400,11 +10675,13 @@
 antikfloors.ga, 1
 antikfloors.gq, 1
 antikfloors.ml, 1
+antikvar-i-ya.tk, 1
 antikvar-net.tk, 1
 antikvarius.ro, 1
 antikvarshop.tk, 1
 antilaserpriority.com, 1
 antiled.by, 1
+antimateri.com, 1
 antimaterie.tk, 1
 antimine.me, 1
 antincendio.it, 1
@@ -10425,6 +10702,7 @@
 antitabak.tk, 1
 antiuser.tk, 1
 antivirus.directory, 1
+antivirusnet.tk, 1
 antivirusprotection.reviews, 1
 antizon.net, 1
 antocom.com, 1
@@ -10432,6 +10710,7 @@
 antoinedeschenes.com, 1
 antoineelizabe.com, 1
 antoineschaller.ch, 0
+anton-media.tk, 1
 antonchen.com, 1
 antonellabb.eu, 1
 antoni.xyz, 1
@@ -10442,18 +10721,20 @@
 antonio-gartenbau.de, 0
 antoniojr.adv.br, 1
 antonioordonez.es, 1
-antoniotirado.com, 1
 antonjuulnaber.dk, 1
+antonmcclure.com, 1
 antonoff.tk, 1
 antonok.com, 1
 antonygeorge.tk, 1
 antonyraz.de, 1
 antopie.org, 1
+antoshka-net.tk, 1
 antota.lt, 1
 antragsgruen.de, 1
 antraxx.ee, 1
 antroposboutique.it, 1
 antroposofica.com.br, 1
+ants-carte-grise.fr, 1
 antstoolbox.com, 1
 anttitenhunen.com, 1
 antvklik.com, 1
@@ -10461,11 +10742,15 @@
 antyblokada.pl, 1
 antyfake.pl, 1
 antykilion.pl, 1
+anubislinux.tk, 1
 anubisz.tk, 1
 anukaweb.com, 1
 anulowano.pl, 1
 anunciosbolivia.com, 1
 anunturitv.ro, 1
+anvagro.com, 1
+anvilmetal.tk, 1
+anvilsales.tk, 1
 anwalt.us, 1
 anwarverdict.ml, 1
 anxietydisorderexplained.com, 1
@@ -10488,9 +10773,11 @@
 anypeer.net, 1
 anyprime.net, 1
 anyquestions.govt.nz, 1
+anyshapemusic.com, 1
 anystack.xyz, 1
 anytimeoffices.ga, 1
 anytimesewerrepair.com, 1
+anyuta-mebel.tk, 1
 anyways.at, 1
 anywhereworks.com, 1
 anzacparkeast.com, 1
@@ -10509,6 +10796,7 @@
 aoaprograms.net, 1
 aobeauty.com.au, 1
 aobogo.com, 1
+aodnovel.com, 1
 aoe9.com, 1
 aoeuaoeu.com, 1
 aofusa.net, 1
@@ -10525,8 +10813,9 @@
 aopedeure.nl, 1
 aopsy.de, 1
 aori.com, 1
-aorosora.com, 1
+aorosora.com, 0
 aosc.io, 0
+aosclan.tk, 1
 aostacarnavals.it, 1
 aotearoa.maori.nz, 1
 aotearoafreepress.com, 1
@@ -10541,7 +10830,9 @@
 apachelounge.com, 1
 apadmi.com, 1
 apadvantage.com, 1
+apalachicolaboatslips.com, 1
 apalancamiento.trade, 1
+aparistravel.com, 1
 apart-hotel-weimar.de, 1
 apartamentscalpatoi.cat, 1
 apartbook.co.uk, 1
@@ -10557,7 +10848,6 @@
 apasaja.tech, 1
 apbforum.tk, 1
 apbox.de, 1
-apc.ec, 1
 apcemporium.co.uk, 1
 apcpky.com, 1
 apcube.com, 1
@@ -10572,13 +10862,17 @@
 aperto-nota.eu, 1
 aperto-nota.fr, 1
 aperto.de, 1
+apertura.tk, 1
 aperture-science.net, 1
 aperture.gr, 1
 apertureimaging.com, 1
 aperturelabs.tk, 1
+aperturescience.cf, 1
 aperturesciencelabs.de, 1
+apertvre.tk, 1
 apervita.net, 1
 apex-parts.com, 1
+apex-promotion.com, 1
 apex.ac, 1
 apex.to, 1
 apexconsulting.io, 1
@@ -10633,6 +10927,7 @@
 apkfame.com, 1
 apkmaze.com, 1
 apkmody.io, 1
+apkoc.com, 1
 apkoyunlar.club, 1
 apkpokemongo.ga, 1
 apkpokemongo.gq, 1
@@ -10642,6 +10937,7 @@
 aplikaceproandroid.cz, 1
 aplis-online.de, 0
 aplpackaging.co.uk, 1
+aplteam.tk, 1
 aplu.fr, 1
 aplusdownload.com, 1
 apluswaterservices.com, 1
@@ -10649,15 +10945,15 @@
 apmg-certified.com, 1
 apn-dz.org, 1
 apn-einstellungen.de, 1
-apo-deutschland.biz, 1
+apo-deutschland.biz, 0
 apobot.de, 1
+apocalipsisdot.tk, 1
 apocalypseboard.tk, 1
 apocalypseclan.tk, 1
 apod.com.au, 1
 apod.ml, 1
 apogaea.com, 1
 apogeephoto.com, 1
-apoiocoletivo.com, 1
 apokalipsis.tk, 1
 apollochiropractor.com, 1
 apollonas.tk, 1
@@ -10671,6 +10967,7 @@
 aponkral.net, 1
 aponkral.org, 1
 aponte-systems.com, 1
+apopov.tk, 1
 aporia.io, 1
 aposke.com, 1
 aposke.net, 1
@@ -10683,13 +10980,17 @@
 apotheke.market, 1
 apotheke55.de, 1
 apothekeonline.tk, 1
+apotom.tk, 1
 app, 1
 app-at.work, 1
 app-cinveninfostream-qa.azurewebsites.net, 1
+app-online.cloud, 1
 app-scantech.com, 1
 app-scope.com, 1
+app.do, 1
 app.gp, 1
 app.lookout.com, 1
+app.ps, 1
 app.recurly.com, 1
 app.yinxiang.com, 0
 app00228.com, 1
@@ -10712,6 +11013,7 @@
 appbot.co, 1
 appbydl.com, 1
 appcitor.com, 1
+appcoins.io, 1
 appcuarium.com, 1
 appdrinks.com, 1
 appel-aide.ch, 1
@@ -10721,7 +11023,6 @@
 appengine.google.com, 1
 appers.co, 1
 appfarm.io, 1
-appfolio.tech, 1
 appgeek.com.br, 1
 appharbor.com, 1
 appify.org, 1
@@ -10745,6 +11046,7 @@
 applewatch.co.nz, 1
 applian.jp, 1
 appliancepronwi.com, 1
+appliances-for-home.tk, 1
 appliancesrepairservice.ca, 1
 applic8.com, 0
 application-travel.us.com, 1
@@ -10756,10 +11058,9 @@
 apply-visa.us.com, 1
 apply.eu, 1
 apply55gx.com, 1
-applytofaceblog.com, 1
+applydirect.org, 1
 appmeas.co.uk, 1
 appmeucredito.com.br, 1
-appmobi.com, 1
 appmobile.io, 1
 appninjas.com, 1
 appointment.ga, 1
@@ -10806,7 +11107,9 @@
 aprendendoengalego.gal, 1
 aprenderjuntos.cl, 1
 aprendiendoforexhoy.com, 1
+apresski-pictures.tk, 1
 apretatuercas.es, 1
+aprilagentur.de, 1
 aprofunda.art.br, 1
 aproposcomputing.com, 1
 aprovpn.com, 1
@@ -10818,15 +11121,18 @@
 apse.ga, 1
 apsnewcastle.com, 1
 apsrustandtint.com, 1
+apstats.tk, 1
 apstudynotes.org, 1
+apsua.tk, 1
 apt-one.com, 1
-aptctg.com, 0
 apteka38.com, 1
 aptekakolska.pl, 1
+aptekas.tk, 1
 aptitudetests.org, 1
 aptive.co.uk, 1
 aptumseguros.mx, 1
 apu-board.de, 1
+apuestalegal.pe, 1
 apunkt.dk, 1
 apur.org, 1
 apuraytravel.com, 1
@@ -10838,17 +11144,21 @@
 aqarategypt.com, 1
 aqarbab.com, 1
 aqdun.com, 1
+aqiqahpremium.com, 1
 aqlami.net, 1
 aqlivia.com, 1
 aqqrate.com, 1
 aqsiq.net, 1
 aqua-ferra.co.uk, 1
 aqua-fitness-nacht.de, 1
+aqua-fm.tk, 1
 aqua-fotowelt.de, 1
 aqua-print.com.ua, 1
 aquabio.ch, 0
+aquabotanic.tk, 1
 aquacapsule.cf, 1
 aquacitylands.com, 1
+aquadarts.tk, 1
 aquadecor.cf, 1
 aquadonis.ch, 0
 aquadrom.cz, 1
@@ -10870,6 +11180,7 @@
 aquaselect.eu, 1
 aquastech.in, 1
 aquasun.pl, 1
+aquatherm72.ru, 1
 aquaviaspa.es, 1
 aquavisor.eu, 1
 aquavitaedayspa.com.au, 1
@@ -10880,7 +11191,10 @@
 aquivardenafilo.gq, 1
 aqwire.io, 1
 aqworlds.cf, 1
+ar-android.com, 1
 ar-informatique.ch, 0
+ar-oma.tk, 1
+ar-vernet.fr, 1
 ar.al, 1
 arab.dating, 1
 arab1info.cf, 1
@@ -10893,8 +11207,10 @@
 arabi-online.net, 1
 arabia-news.gq, 1
 arabic-shirts.com, 1
+arabicclass.tk, 1
 arabictranslation.tk, 1
 arabicxz.com, 1
+arabmusic.tk, 1
 arabska.tk, 1
 arabskills.tk, 1
 arabwomen.ml, 1
@@ -10903,11 +11219,11 @@
 aradiantlife.org, 1
 aradiantlyhealthylife.com, 1
 arados.de, 1
-aragon.fun, 1
 arai21.net, 1
 arakanis.tk, 1
 aral.ml, 1
 araleeniken.com, 1
+araluenvalleyhotel.ga, 1
 aralys.com, 1
 aramido.de, 1
 aramloebmd.com, 1
@@ -10915,12 +11231,14 @@
 arandomsite.tk, 1
 aranel.me, 1
 aranycsillag.net, 1
+aranym.com, 1
 araqnid.org, 1
 araratour.com, 1
 arargo.cf, 1
 araro.ch, 0
 ararrl.com, 1
 ararrl.net, 1
+ararrl.org, 1
 araseifudousan.com, 1
 aratz.rocks, 1
 aravo.com, 1
@@ -10935,6 +11253,7 @@
 arbejdsdag.dk, 1
 arbitrarion.com, 1
 arbitrary.ch, 1
+arbobille.es, 1
 arboleda-hurtado.com, 1
 arbolesdenavidad.site, 1
 arboworks.com, 1
@@ -10948,6 +11267,8 @@
 arcadia.com.ph, 1
 arcadiaca.gov, 1
 arcaik.net, 1
+arcandadults.org, 1
+arcanefrost.de, 1
 arcanehardware.com, 1
 arcanetides.com, 1
 arcbouncycastles.co.uk, 1
@@ -10960,6 +11281,7 @@
 archbishop.ga, 1
 archeologicatoscana.it, 1
 archeologiegorinchem.com, 1
+archerconsulting.llc, 1
 archerlong.com, 1
 archerlongx.com, 1
 archerxlong.com, 1
@@ -10973,6 +11295,8 @@
 archispace.com.cn, 1
 archit.in, 1
 architectryan.com, 1
+architectsecurity.org, 1
+architecturaldesignschool.com, 1
 architecture-colleges.com, 1
 architectus.ga, 1
 architekten.tk, 1
@@ -10994,6 +11318,7 @@
 archmirror.it, 1
 archoit.org, 0
 archsec.info, 1
+archwaypromotions.com, 1
 archwomen.org, 1
 arcinapoli.it, 1
 arckr.com, 1
@@ -11002,6 +11327,7 @@
 arco.lu, 1
 arcobalabs.ca, 1
 arcogb.co, 1
+arcoiriscastellon.tk, 1
 arcosdelallana.tk, 1
 arcosdequejana.com, 1
 arcovix.com, 1
@@ -11014,8 +11340,6 @@
 arcticwolf.com, 1
 arctus-security.com, 1
 arcueil-cachan.fr, 0
-arcza.com, 1
-arcza.net, 1
 ardabil.tk, 1
 ardakannews.tk, 1
 ardania.de, 1
@@ -11042,6 +11366,8 @@
 areminder.co, 1
 arena-lemgo.de, 1
 arena-news.tk, 1
+arenadagon.tk, 1
+arenas-architecte.com, 1
 arenatennis.ga, 1
 arenda-bez-agenta.ml, 1
 arenda247.by, 0
@@ -11054,7 +11380,7 @@
 arenzanaphotography.com, 1
 areqgaming.com, 1
 ares-trading.de, 1
-aresanel.com, 1
+aresproject.org, 1
 arest.web.id, 1
 arete.net, 1
 arex-corp.com, 1
@@ -11070,7 +11396,9 @@
 argentinachat.tk, 1
 argentinatrabaja.org, 1
 argentinaxp.com, 1
+argentumonline.tk, 1
 argh.io, 1
+argon2.online, 1
 argonium.com.au, 1
 argovpay.com, 1
 argovpn.com, 1
@@ -11111,12 +11439,12 @@
 arinde.ee, 1
 arinflatablefun.co.uk, 1
 arionta.com, 1
+aripiprazolee.gq, 1
 arirabinowitz.com, 1
 arise19.com, 1
 arisechurch.com, 1
 ariseconference.org.nz, 1
 arisevendor.net, 1
-aristilabs.com, 1
 aristocrates.co, 1
 aristokratia.tk, 1
 ariston-center.gq, 1
@@ -11130,7 +11458,6 @@
 arjan.nl, 1
 arjandejong.eu, 1
 arjanenthijs.nl, 1
-arjanhofmann.nl, 1
 arjansteevels.nl, 1
 arjanvaartjes.net, 1
 arjasmaa.fi, 1
@@ -11145,6 +11472,7 @@
 arkenco.cl, 1
 arkenstone.ml, 1
 arkfoundationrepair.com, 1
+arkhamasylum.tk, 1
 arkhangelsk.cf, 1
 arkhangelsk.gq, 1
 arkhangelsk.tk, 1
@@ -11153,6 +11481,7 @@
 arkitextonico.com, 1
 arknights.work, 0
 arknodejs.com, 1
+arkrowd.eu.com, 1
 arksan.com.tr, 1
 arktalentsolutions.com.mx, 1
 arkulagunak.com, 0
@@ -11180,6 +11509,7 @@
 armaringross.com, 1
 armarinhovirtual.com.br, 1
 armazemdaminiatura.com.br, 1
+armazemdeminasmg.com.br, 1
 armazemwarenhaus.com.br, 1
 armbrust.me, 1
 armcar.ga, 1
@@ -11236,12 +11566,14 @@
 arnoldkontz-occasions.lu, 0
 arnonerba.com, 1
 arnor.org, 1
+arnottindustries.ga, 1
 arnoudraeven.nl, 1
 arnoudvandalen.nl, 1
 arnove.fr, 1
 arnove.net, 1
 arnoweterings.nl, 1
 arnsmedia.nl, 0
+arny.ru, 1
 arobaz-informatique.org, 1
 arockets.ru, 1
 arod.tk, 1
@@ -11272,9 +11604,9 @@
 arpnet.co.jp, 1
 arqueo-ecuatoriana.ec, 1
 arquidigital.com, 1
+arquipielago.tk, 1
 arquitectura-ilimitada.tk, 1
 arquitet.com.br, 1
-arquitetura.pt, 1
 arrakis.se, 1
 arrangeyour.com, 1
 arraudi.be, 1
@@ -11287,9 +11619,11 @@
 arrmaforum.com, 1
 arroba.digital, 1
 arrow-api.nl, 1
+arrowduty.ml, 1
 arrowfastener.com, 1
 arrowgrove.com, 0
 arrowheadaddict.com, 1
+arrowit.net, 1
 arroyoins.com, 1
 ars-online.pl, 1
 arsake.cf, 1
@@ -11298,7 +11632,9 @@
 arsenal-trans.tk, 1
 arsenalestate.tk, 1
 arsenalzae.com, 1
+arsenideas.ga, 1
 arsenyan.cf, 1
+arshia.cf, 1
 arshispana.com, 1
 arsindecor.com, 1
 arsk1.com, 1
@@ -11314,6 +11650,7 @@
 art-et-culture.ch, 0
 art-et-tonneaux.fr, 1
 art-illustration.tk, 1
+art-khotyn.tk, 1
 art-news.tk, 1
 art-okno.com, 1
 art-pix.com, 1
@@ -11324,12 +11661,15 @@
 art-voronov.tk, 1
 art21tv-armenian.tk, 1
 artacadia.org, 1
+artadagroup.com, 1
 artane.gq, 1
 artbalsam.com, 1
 artboja.com, 1
 artc.at, 1
 artcenter.tk, 1
+artcommunity.tk, 1
 artdeco-photo.com, 0
+artdecoration.tk, 1
 artea.ga, 1
 arteaga.co.uk, 1
 arteaga.eu, 1
@@ -11342,9 +11682,12 @@
 artedellavetrina.it, 1
 artedona.com, 1
 arteinstudio.it, 1
+artelignum.tk, 1
 artelista.com, 1
 artelt.com, 1
 artembusiness.tk, 1
+artemida-dot.tk, 1
+arteproducciones.tk, 1
 artera.spb.ru, 1
 arteriamagazine.tk, 1
 arterienundvenen.ch, 1
@@ -11354,8 +11697,12 @@
 artesaniaselmagodeoz.com, 1
 artesaniastonalaytlaquepaque.com, 1
 arteseideias.com.pt, 1
+arteshesorkh.tk, 1
 arteshow.ch, 0
+artesial.com, 1
+artetculture.tk, 1
 artexhibition.jp, 1
+artextasia.com, 1
 artfabrics.com, 1
 artfullyelegant.com, 1
 artgranit.tk, 1
@@ -11371,17 +11718,19 @@
 arthurlewis.me, 1
 arthurmelo.com, 0
 arthuryidi.com, 1
+arti-group.ml, 1
 arti-islam.tk, 1
 artia.live, 1
 articaexports.com, 1
+articlesplanet.tk, 1
 articlestack.tk, 1
 articlesutiles.cf, 1
-articole.casa, 1
 articu.no, 1
 artifact.spb.ru, 1
 artifexnet.com, 1
 artificethefilm.com, 1
 artificial.army, 1
+artificiala.gq, 1
 artificialgrassandlandscaping.com, 1
 artificialplants.tk, 1
 artifuse.ch, 1
@@ -11389,7 +11738,6 @@
 artigoagency.com, 1
 artigoos.com, 1
 artikel9.com, 1
-artikelpendidikan.id, 1
 artimpact.ch, 1
 artinfo.tk, 1
 artintend.com, 1
@@ -11405,7 +11753,7 @@
 artistagenda.com, 1
 artistcorporation.com, 1
 artistedeparis.fr, 1
-artisticedgegranite.net, 1
+artisticedgegranite.net, 0
 artistrunwebsite.com, 1
 artitbe.net, 1
 artiwear.com.tw, 1
@@ -11414,6 +11762,7 @@
 artlabdentistry.com, 1
 artlantis.nl, 1
 artleading.ru, 1
+artlhere.com, 1
 artlifeisgood.com, 1
 artlinestix.com.au, 1
 artlogo.biz, 1
@@ -11431,11 +11780,11 @@
 artofwhere.com, 1
 artozoul.fr, 1
 artplaneta-leto.by, 1
-artplasticsurgeons.com, 1
 artprojectsforkids.org, 1
 artransparency.gov, 1
 artrapid.com, 1
 artratio.net, 1
+artrofisio.com.br, 1
 artroot.jp, 1
 artroscopiaperlosport.it, 1
 arts.gov, 1
@@ -11444,13 +11793,16 @@
 artschmidtoptical.com, 1
 artsmarket.ca, 1
 artspac.es, 1
+artspark.tk, 1
 arttel-media.ru, 1
 arturgaweda.de, 1
 arturopinto.com.mx, 1
 arturrossa.de, 1
 arturszalak.com, 1
 arturweb.tk, 1
+artvaastu.ru, 1
 artvertising.tk, 1
+artvinhaberleri.tk, 1
 artweby.cz, 1
 artworks.gd, 1
 artworksthatlookgood.com, 0
@@ -11462,6 +11814,7 @@
 arubasunsetbeach.com, 1
 arunjoshua.com, 1
 aruo.net, 1
+arveex.eu, 1
 arveron.ch, 0
 arvid.io, 1
 arviksa.co.uk, 1
@@ -11477,7 +11830,6 @@
 arxcs.com, 1
 aryabusines.com, 1
 aryacollege.me, 1
-aryacollege.tech, 1
 aryalaroca.de, 1
 aryan-nation.com, 1
 aryani-fitriana.tk, 1
@@ -11487,16 +11839,11 @@
 arzid.com, 1
 arzinfo.pw, 1
 arztpraxis-kubalok.de, 1
-arztrading.ir, 1
 as-kapmea-mark-swissbear.azurewebsites.net, 1
 as200753.com, 1
 as200753.net, 1
 as204982.net, 1
-as395.com, 1
-as396.com, 1
 as397.com, 1
-as397444.net, 0
-as398.com, 1
 as41073.net, 1
 as41405.net, 1
 as44222.net, 0
@@ -11505,7 +11852,6 @@
 asaabforever.com, 1
 asaacai.com.br, 1
 asabacortoscaseros.tk, 1
-asabharwal.com, 1
 asadatec.de, 1
 asaduddinowaisi.tk, 1
 asafaweb.com, 1
@@ -11516,8 +11862,10 @@
 asana.com, 1
 asana.plus, 1
 asananutrition.co.uk, 1
+asancharge.tk, 1
 asandu.eu, 1
 asanger.biz, 1
+asankomara.tk, 1
 asansol.tk, 1
 asantosdev.com, 1
 asanuma-clinic.jp, 1
@@ -11526,7 +11874,6 @@
 asasesoria.cl, 1
 asato-jewelry.com, 1
 asatys-partners.com, 1
-asatys.com, 1
 asbestos-awareness.ml, 1
 asbestosthedarkarts.com, 1
 asbito.de, 1
@@ -11540,12 +11887,15 @@
 aschismatic.com, 1
 asciitable.tips, 1
 asciiwwdc.com, 1
+ascolympia.nl, 1
 ascormovies.com, 1
 ascpaphilatelie.eu, 1
 asd.gov.au, 0
 asdainfomanager.co.uk, 1
 asdchieti.tk, 1
+asdesk.nl, 1
 asdf.one, 1
+asdunumerique.fr, 1
 asdwfwqd.com, 1
 asdyx.de, 1
 asean-wen.org, 1
@@ -11597,6 +11947,7 @@
 asia-gazette.com, 1
 asia-global-risk.com, 1
 asia.dating, 1
+asiacommerce.id, 1
 asiaflash.com, 1
 asiafood-curator.com, 1
 asiaheavens.com, 1
@@ -11619,6 +11970,7 @@
 asiba.com.au, 1
 asiesvenezuela.com, 1
 asiinc-tex.com, 1
+asikqq.id, 1
 asile-colis.fr, 1
 asilo.roma.it, 1
 asinetasima.com, 1
@@ -11652,6 +12004,7 @@
 askwhy.cz, 1
 askwhy.eu, 1
 asla.info, 1
+aslamazyan.tk, 1
 aslinfinity.com, 1
 asm.io, 1
 asm802.com, 1
@@ -11662,12 +12015,15 @@
 asmeets.nl, 1
 asmm.cc, 0
 asmood.net, 1
+asmui.ml, 1
+asmuncandle.com, 1
 asngear.biz, 1
 asniereslesdijon.fr, 1
 asoagroca.com, 1
 asoccu.ga, 1
 asocedune.com, 1
 asokan.org, 1
+asonaderi2002.tk, 1
 asoul.tw, 1
 asoziales-netzwerk.net, 1
 asoziales-wiki.de, 1
@@ -11680,6 +12036,7 @@
 asperatechnology.com, 1
 asperatechnology.cz, 1
 asperatechnology.de, 1
+asperox.com.tr, 1
 asperti.com, 1
 aspformacion.com, 1
 asphaltfruehling.de, 1
@@ -11708,27 +12065,36 @@
 asr9k.de, 1
 asra.gr, 1
 asral7.com, 1
+asrilankangift.com, 1
+asriyatno.tk, 1
 asrob.eu, 0
 assaabloygaragedoors.ca, 1
 assamtenders.gov.in, 1
+assana.dk, 1
+assars.se, 1
 assassinasian.tk, 1
 assdecoeur.org, 1
+assedo.tk, 1
 asseenfromthesidecar.org, 1
 assemblage.gq, 1
 assemble-together.org, 1
 assemblytechnicianjobs.com, 1
 assemblywithoutthewalls.org, 1
+assentooriginal.com.br, 1
 assertion.de, 1
 assessoriati.com.br, 1
+assessorindie.tk, 1
 assetbacked.capital, 0
 assetsec.io, 1
 assetsman-assetsvalue.com, 1
+assetvault.co.za, 1
 assguidesporrentruy.ch, 0
 assid.com, 1
 assign-it.co.uk, 1
 assignacii.ml, 1
 assignmentshelp.co.ke, 1
 assikerujked.tk, 1
+assinecontrole4g.com.br, 0
 assis.partners, 1
 assistance-personnes-agees.ch, 1
 assistel.com, 1
@@ -11740,11 +12106,11 @@
 associatedwomenshealthcare.com, 1
 associationguillaume.com, 1
 associationhorizon.tk, 1
-associazionelbn.it, 0
 associazionerimborsi.it, 1
 assodigitale.it, 1
 assomydesk.fr, 1
 asspinter.me, 1
+asspoop.com, 1
 assta.ga, 1
 assumptionpj.org, 1
 assured.se, 1
@@ -11754,10 +12120,10 @@
 astanainform.tk, 1
 astanakz.tk, 1
 astaninki.com, 1
+astaoffshore.com.au, 1
 astarbouncycastles.co.uk, 1
 astarforu.com, 1
 astarfrommosul.cf, 1
-astarmathsandphysics.com, 1
 astateoftrance.tk, 1
 astaxanthin-sport.de, 1
 astaxanthin.de, 1
@@ -11802,13 +12168,14 @@
 astrojunkies.com, 1
 astrolab.tk, 1
 astroloeches.tk, 1
+astrologiatarocchi.tk, 1
+astrologic.cf, 1
 astrologie12.tk, 1
 astrologjia.com, 1
 astrology-for-beginners.com, 1
 astrology.stream, 1
 astrology42.com, 1
 astrologywizard.com, 1
-astrolojiyorumcusu.com, 1
 astroluxe.io, 1
 astrong.pl, 1
 astronomija.cf, 1
@@ -11818,10 +12185,12 @@
 astroscopy.ch, 0
 astrosnail.pt.eu.org, 1
 astrosoc.ml, 1
+astrostart.tk, 1
 astroteam.tk, 1
 astrovandalistas.cc, 1
 astrumadvies.nl, 1
 astsummer.tk, 1
+astucedirecte.tk, 1
 astucewebmaster.com, 1
 astural.org, 0
 astutikhonda.com, 1
@@ -11858,7 +12227,6 @@
 atacadocervejeiro.com.br, 1
 atacadodesandalias.com.br, 1
 atafu-village.tk, 1
-atah-s.com, 1
 atahualpa.com, 1
 atakac.com, 1
 atallo.com, 1
@@ -11887,7 +12255,6 @@
 atelier-coiffure.ch, 0
 atelier-des-apprentissages.com, 1
 atelier-naruby.cz, 1
-atelier-tecna.cz, 1
 atelier-viennois-cannes.fr, 1
 atelieracbaby.com.br, 1
 atelieraphelion.com, 1
@@ -11904,6 +12271,7 @@
 atelierssud.swiss, 1
 atelierverbeelding.nl, 1
 atenasconservadora.com.br, 1
+atencionbimbo.com, 0
 ateneucomercialporto.pt, 0
 ateneumontbui.tk, 1
 atenolol50mg.ga, 1
@@ -11924,7 +12292,11 @@
 athekiu.com, 1
 athemis.de, 1
 athena-garage.co.uk, 1
+athena-security.net, 1
 athenacle.xyz, 1
+athenainvestmentsystems.com, 1
+athenainvsys.com, 1
+athenaspark.com, 1
 athenstn.gov, 1
 athensvantours.com, 1
 athensvantours.gr, 1
@@ -11937,7 +12309,6 @@
 atigerseye.com, 1
 atik.kr, 1
 atilo.sh, 1
-atimbertownservices.com, 1
 atinylittle.space, 1
 atis-ars.ru, 1
 atishchenko.com, 1
@@ -11957,7 +12328,6 @@
 atkstore.com, 1
 atl-paas.net, 1
 atlantabethelaci.org, 1
-atlantacompa-international.co.uk, 1
 atlantacustomfab.com, 0
 atlantahealthcare.tk, 1
 atlantareroof.com, 1
@@ -12005,10 +12375,12 @@
 atmmantenimiento.co, 1
 atmocdn.com, 1
 atmondigital.com, 0
+atmos.tk, 1
 atmosferno.cf, 1
 atmox.eu, 1
 atmydesk.tech, 1
 atnis.com, 1
+atnteam.tk, 1
 ato4sound.com, 1
 atolm.net, 1
 atom-china.org, 1
@@ -12029,8 +12401,6 @@
 atorcidabrasileira.com.br, 1
 atozblinds.net, 1
 atozeventrentalsofpa.com, 1
-atpeacerealty.com, 1
-atplastics.vn, 1
 atplonline.co, 1
 atrafloor.com, 1
 atraining.ru, 1
@@ -12062,8 +12432,10 @@
 attinderdhillon.com, 1
 attiremr.tk, 1
 attitudes-bureaux.fr, 1
+attlane.fr, 1
 attoch.org, 1
 attogtech.com, 1
+attorneystrialgroup.com, 1
 attosoft.tk, 1
 attractant.com, 1
 attractieparken.tk, 1
@@ -12086,6 +12458,7 @@
 atypicom.fr, 1
 atypicom.it, 1
 atypicom.pt, 1
+atyuan.me, 1
 atzenchefin.de, 1
 atzzz.com, 1
 au-be.net, 1
@@ -12105,7 +12478,9 @@
 aucielrose.com, 1
 aucklandcastles.co.uk, 1
 aucospa.com, 1
+auctionbv.tk, 1
 aucubin.de, 0
+aude-mdb-hypnose.fr, 1
 audian.com, 1
 audiclubbahrain.com, 1
 audiencedefolie.com, 1
@@ -12115,6 +12490,7 @@
 audiobookboo.com, 1
 audiobookstudio.com, 1
 audioboom.com, 1
+audioboomers.ga, 1
 audiocd.tk, 1
 audioconspiracy.tk, 1
 audiohub.com, 1
@@ -12126,6 +12502,7 @@
 audiomaze.com, 1
 audiomedica.com, 1
 audiomind.tk, 1
+audiomir.tk, 1
 audion.cc, 1
 audionames.com, 1
 audionamix.com, 1
@@ -12137,11 +12514,14 @@
 audiorecording.me, 1
 audiorental.net, 1
 audioschoolonline.com, 1
+audiotrace.tk, 1
+audiovisualmurciano.tk, 1
 audiovoodoo.pl, 0
 audirsq3.de, 1
 audisto.com, 1
 audit.ovh, 1
 audite.de, 1
+auditingfirm.tk, 1
 audition-radio.tk, 1
 auditmatrix.com, 1
 auditore-host.tk, 1
@@ -12155,6 +12535,7 @@
 auf-feindgebiet.de, 1
 auf-nach-mallorca.info, 1
 aufmerksamkeitsstudie.com, 1
+aufprise.de, 1
 aufwecken.dynu.net, 1
 augehost.com, 1
 augen-seite.de, 1
@@ -12174,6 +12555,7 @@
 augur.us, 1
 august-don.site, 1
 august-hoegn.tk, 1
+augustanews.tk, 1
 augustian-life.cz, 1
 augustiner-kantorei-erfurt.de, 1
 augustiner-kantorei.de, 1
@@ -12203,6 +12585,7 @@
 aura7chakr.com, 1
 auralinna.blog, 1
 aurbrowser.tk, 1
+aurea.bg, 1
 aurelieburn.fr, 1
 aurelienaltarriba.fr, 1
 aureus.pw, 1
@@ -12216,8 +12599,8 @@
 aurorarecordings.com, 1
 aurorasa-coaching.com, 1
 aurorasa.com, 1
-auroz.tech, 1
-auroz.video, 1
+auscanalliancecorp.com, 1
+auscube.tk, 1
 ausec.ch, 0
 auskunftsbegehren.at, 1
 ausmwoid.de, 1
@@ -12231,6 +12614,7 @@
 aussieseobrisbane.com.au, 1
 aussieservicedown.com, 1
 aussiestoresonline.com, 1
+aussiestories.dk, 1
 austenplumbing.com, 1
 austin-pearce.com, 1
 austin-security-cameras.com, 1
@@ -12261,6 +12645,7 @@
 australiantemporarytattoos.com.au, 1
 australien-tipps.info, 1
 austriaguide.tk, 1
+austriahikingtours.tk, 1
 austriantekken.tk, 1
 austriatravel.tk, 1
 austromorph.space, 1
@@ -12268,11 +12653,13 @@
 auszeit-walsrode.de, 1
 auszeit.bio, 1
 autek.com.br, 1
+autenticismo.tk, 1
 autenticoperfumes.com.br, 1
 auth.adult, 1
 auth.mail.ru, 1
 authanet.ga, 1
 authcom.ca, 1
+authenticate.be, 1
 authenticate.computer, 1
 authenticationhub.io, 1
 authentictrucks.com.br, 1
@@ -12298,6 +12685,7 @@
 auto-i-dat.ch, 1
 auto-motor-i-sport.pl, 1
 auto-none.com, 1
+auto-parts-store.tk, 1
 auto-plus.tn, 1
 auto-reklame.tk, 1
 auto-res.ru, 1
@@ -12313,12 +12701,14 @@
 autobella-hurtownia.pl, 1
 autobelle.it, 1
 autobiz.tk, 1
+autoblok.com.ua, 1
+autobot.com.ua, 1
 autobourcier.com, 1
 autobraga.ru, 1
 autocadperfmon.azurewebsites.net, 1
 autocartruck.com, 1
 autocashmachine.tk, 1
-autoccaz.fr, 1
+autoccaz.fr, 0
 autoclassics.com, 1
 autocmall.com, 1
 autocontrol.online, 1
@@ -12334,13 +12724,17 @@
 autodidacticstudios.net, 1
 autodidacticstudios.org, 1
 autodius.com, 1
+autodocument.tk, 1
 autoecoledumontblanc.com, 1
 autoelettricaperbambini.com, 1
 autoentrepreneurinfo.com, 1
 autoepc.ro, 1
 autofficina.roma.it, 1
 autofinancing.ga, 1
+autogarant.sk, 1
 autoglass.com.my, 1
+autohausmf-nord.de, 1
+autohit.ro, 1
 autohomehub.com, 1
 autohut.ca, 1
 autoi.ch, 1
@@ -12355,18 +12749,18 @@
 autoleaders.gr, 1
 autoledky.sk, 1
 autolet.tk, 1
-autolider.org, 1
 autoliga.net.ua, 1
 automaatic.com, 1
 automacity.com, 1
-automagischeberegening.nl, 1
 automatethis.com.au, 1
 automaticgrowth.com, 1
 automationpro.me, 1
 automationsmarthome.com, 1
 automekano.com, 0
-automentesszolnok.hu, 1
+automir.online, 1
 automobile-gadgets.ru, 1
+automosanto.pt, 1
+automotive.org.ua, 1
 automotivegroup-usedcars.be, 0
 automotivemechanic.org, 0
 automotiveunlimited.net, 1
@@ -12380,6 +12774,7 @@
 autopapa.wien, 1
 autopapo.com.br, 1
 autopark-ost-fichtner.de, 1
+autoparts-for-foreigncars.tk, 1
 autoparts.im, 1
 autoparts.sh, 1
 autoparts.wf, 1
@@ -12389,6 +12784,7 @@
 autoprice.info, 0
 autoprogconsortium.ga, 1
 autoproshouston.com, 1
+autopsyhouston.com, 1
 autorai.nl, 1
 autorama.cf, 1
 autorando.com, 1
@@ -12411,11 +12807,12 @@
 autosecurityfinance.com, 1
 autoshinka72.ru, 1
 autoshopsolutions.com, 1
-autoshun.org, 1
 autosiero.nl, 1
 autoskola.hr, 1
 autoskolaplzen.cz, 1
 autoskole.hr, 1
+autosneed.com, 1
+autosprint.tk, 1
 autospurghi.milano.it, 1
 autospurgo.com, 1
 autospurgo.it, 1
@@ -12446,7 +12843,7 @@
 autouncle.pt, 1
 autouncle.ro, 1
 autouncle.se, 1
-autoverhuur-tilburg.nl, 1
+autoverhuur-tilburg.nl, 0
 autovesti.cf, 1
 autowerkstatt-puchheim.de, 1
 autowise.dk, 1
@@ -12472,14 +12869,18 @@
 avaaz.org, 1
 avabouncehire.co.uk, 1
 avacariu.me, 1
+avacatossiu.tk, 1
 avaemr-development-environment.ca, 1
 avaeon.com, 1
 available.direct, 1
 availablecastles.com, 1
+avalancha.tk, 1
+avaland.tk, 1
 avalon-ami.tk, 1
 avalon-island.ru, 1
 avalon-rpg.com, 1
 avalon-studios.de, 1
+avalonaardoom.nl, 1
 avalonbelltown.com, 1
 avalondevelopment.tk, 1
 avalontechsv.com, 1
@@ -12491,17 +12892,19 @@
 avanet.com, 1
 avangard-tovar.tk, 1
 avangard.tk, 1
+avanguardia.tk, 1
 avangvpn.ga, 1
 avanovum.de, 1
 avanpost.co, 1
 avantitualatin.com, 1
+avaralar.tk, 1
 avarcom.tk, 1
 avariya.tk, 1
 avarty.com, 1
 avastantivirus.ro, 1
 avatardiffusion.com, 1
 avatype.ir, 1
-avcafe.ru, 1
+avcafe.ru, 0
 avcilarescort.com, 1
 avclub.com, 1
 avdagic.net, 1
@@ -12520,7 +12923,6 @@
 averageinspired.com, 1
 averen.co.uk, 1
 avernis.de, 1
-averste.com, 1
 avertoni.ru, 1
 avestawebbtjanst.se, 0
 avexon.com, 1
@@ -12528,11 +12930,9 @@
 avg7.de, 1
 avgeeksunited.com, 1
 avgindiantech.com, 1
-avhwelding.com, 1
 avi12.com, 0
 avi9526.pp.ua, 1
-avia-krasnoyarsk.ru, 1
-avia-ufa.ru, 1
+aviaphoto.tk, 1
 aviapic.com, 1
 aviapic.eu, 1
 aviapic.fr, 1
@@ -12553,16 +12953,20 @@
 avidmode-staging.com, 1
 avidmode.com, 1
 avidthink.com, 0
+avinguard.com, 1
 avinilo.com, 1
 avionicbooks.tk, 1
 avions.ga, 1
 avionschool.com, 1
 aviruptribedi.com, 1
+avisbabes.com, 1
 avisofi-credit-immobilier.fr, 1
 aviteng.cloud, 1
 avito.ooo, 1
 avitus.hu, 1
 avivaplasticsurgery.com, 1
+aviweisfogel.co, 1
+aviweisfogelinfo.org, 1
 avlhostel.com, 1
 avm-multimedia.com, 1
 avmemo.com, 1
@@ -12571,6 +12975,7 @@
 avmup.com, 1
 avn-buses.tk, 1
 avnet.ws, 1
+avoandco.com, 1
 avocad.studio, 1
 avocadooo.stream, 1
 avocode.com, 1
@@ -12589,24 +12994,28 @@
 avogelusa.com, 1
 avoids-troops.gq, 1
 avoinna24.fi, 1
+avoka.do, 1
 avonlearningcampus.com, 1
 avonture.be, 1
 avonvets.co.uk, 1
 avova.de, 1
 avpres.net, 0
 avptp.org, 1
-avqueen.cn, 1
+avqueen.cn, 0
 avra.co, 1
+avrilshine.tk, 1
 avrora-nov.ru, 1
 avsox.com, 1
 avspot.net, 1
 avtecmedia.com, 0
 avtek.pl, 1
 avticket.ru, 0
+avto-bazar.tk, 1
 avto-signal.ga, 1
 avto-signal.gq, 1
 avto-signal.ml, 1
 avtobania.pro, 1
+avtochip.tk, 1
 avtodoki.tk, 1
 avtodot.tk, 1
 avtoforex.ru, 1
@@ -12616,7 +13025,7 @@
 avtomarket.ru, 1
 avtoobzor.tk, 1
 avtorlab.ru, 1
-avtosept.by, 1
+avtosept.by, 0
 avtostolica.tk, 1
 avtoucheba.tk, 1
 avtoveles.by, 1
@@ -12635,7 +13044,6 @@
 aw.net, 1
 awakengr.com, 1
 awakenwow.ga, 1
-awan.tech, 1
 awangardaszkola.pl, 1
 awanteverde.tk, 1
 awarenessadvisor.ga, 1
@@ -12643,11 +13051,11 @@
 awaresec.no, 1
 awarify.io, 1
 awarify.me, 1
-awarner.co.uk, 1
 awaro.net, 1
 awaybot.com, 1
 awaygroundguide.com, 1
 awe130.com, 1
+awebsome.fr, 1
 awedience.tv, 1
 awei.pub, 1
 awersomecreatorfromrussia.tk, 1
@@ -12659,6 +13067,7 @@
 awesomesit.es, 0
 awf0.xyz, 1
 awfulsport-news.tk, 1
+awh.ink, 1
 awic.ca, 1
 awinninghabit.com, 1
 awk.tw, 1
@@ -12680,7 +13089,6 @@
 awsome-books.co.uk, 1
 awsumchan.org, 1
 awtogid.com, 1
-awutar.com, 1
 awxg.com, 1
 awxg.eu.org, 1
 awxg.org, 1
@@ -12688,6 +13096,7 @@
 axa-middleeast.com, 1
 axa.de, 1
 axamansard.com, 1
+axavalon.tk, 1
 axchap.ir, 1
 axearrow.nl, 1
 axel-fischer.net, 1
@@ -12698,7 +13107,6 @@
 axelr.me, 1
 axelteichmann.net, 1
 axelvoss.eu, 0
-axesslab.com, 1
 axin888.vip, 1
 axiodl.com, 1
 axiomeosteopathie.ca, 1
@@ -12709,7 +13117,6 @@
 axis-stralis.co.uk, 1
 axisdesignarchitects.co.uk, 1
 axisdesignarchitects.com, 1
-axisfleetmanagement.co.uk, 1
 axishw.com, 1
 axisins.com, 1
 axispara-bg.com, 1
@@ -12727,16 +13134,18 @@
 axxial.tk, 1
 axxis.co.jp, 1
 ay-net.jp, 1
+ayahuasca.info, 1
 ayahya.me, 0
 ayamchikchik.com, 1
 ayanomimi.com, 1
 ayatosuzuki.com, 1
 aycasac.com, 1
 aycomba.de, 1
+aydacosmetics.com, 1
 aydesignco.com, 1
 ayecode.ca, 1
-ayesh.me, 1
 ayesh.win, 1
+ayhankaraman.com, 1
 ayj.solutions, 1
 aykonet.de, 1
 aykutcevik.com, 1
@@ -12746,6 +13155,7 @@
 aymerick-dupouey.fr, 1
 aymerick.fr, 1
 aymericlagier.com, 1
+ayon-games.tk, 1
 ayon.group, 1
 ayothemes.com, 1
 ayouiv.com, 1
@@ -12777,7 +13187,6 @@
 azaria.blog, 1
 azarus.ch, 1
 azarweb.tk, 1
-azazy.net, 0
 azcensus2020.gov, 1
 azeriland.tk, 1
 azerinews.ga, 1
@@ -12821,6 +13230,7 @@
 azu-l.jp, 1
 azuki.cloud, 1
 azukie.com, 1
+azula.tk, 1
 azulimparcial.pt, 1
 azur.ovh, 1
 azurecraft.ga, 1
@@ -12832,6 +13242,7 @@
 azurlane.cool, 1
 azuxul.fr, 1
 azvpn.tk, 1
+azzaroarancebio.it, 1
 azzorti.com, 1
 azzurrapelletterie.it, 1
 b-angel.info, 1
@@ -12859,6 +13270,10 @@
 b03aa.com, 1
 b03bb.com, 1
 b03cc.com, 1
+b0618.com, 1
+b0618.net, 1
+b0868.com, 1
+b0868.net, 1
 b0hr.ai, 1
 b0k.org, 1
 b0rk.com, 1
@@ -12867,18 +13282,24 @@
 b131000.com, 1
 b144.co.il, 1
 b1758.com, 1
+b1758.net, 1
+b1768.com, 1
+b1768.net, 1
+b1788.com, 1
+b1788.net, 1
 b1c1l1.com, 1
 b1nzy-pinged.me, 1
 b1rd.tk, 1
 b2222.co, 1
 b23-tv.tk, 1
 b24.pt, 1
+b2486.com, 1
+b2486.net, 1
 b2b-leads.nl, 1
 b2b-nestle.com.br, 1
 b2bmuzikbank.com, 1
 b3.nu, 1
 b303.me, 1
-b30365.com, 1
 b3101.com, 1
 b3103.com, 1
 b31aa.com, 1
@@ -12899,9 +13320,12 @@
 b4ckbone.de, 1
 b4lint.hu, 1
 b4r7.de, 1
-b4tech.eu, 1
+b4tech.eu, 0
 b4z.eu, 1
+b5189.com, 1
+b5189.net, 1
 b5197.co, 1
+b5289.com, 1
 b5289.net, 1
 b58365.com, 1
 b58appb58app.com, 1
@@ -12916,6 +13340,7 @@
 b5909.com, 1
 b5910.com, 1
 b5989.com, 1
+b5989.net, 1
 b5dev.com, 1
 b61688.com, 1
 b62102.com, 1
@@ -12935,8 +13360,6 @@
 b62g.com, 1
 b62h.com, 1
 b64.club, 1
-b6530.com, 0
-b6531.com, 0
 b6701.com, 1
 b6703.com, 1
 b6704.com, 1
@@ -12997,9 +13420,10 @@
 b789.co, 1
 b81365.com, 1
 b82365.com, 1
+b8591.com, 1
+b8591.net, 1
 b86255.com, 1
 b8831.com, 1
-b889b.com, 1
 b88vip1.com, 1
 b88vip10.com, 1
 b88vip2.com, 1
@@ -13010,28 +13434,72 @@
 b88vip7.com, 1
 b88vip8.com, 1
 b88vip9.com, 1
+b8979.com, 1
+b8979.net, 1
 b899365.com, 1
 b89ff.com, 1
 b89gg.com, 1
 b89hh.com, 1
 b8a.me, 1
+b9018.net, 1
+b9108.com, 1
+b9108.net, 1
+b9110.com, 1
+b9110.net, 1
+b9112.com, 1
+b9112.net, 1
+b911gt.com, 1
+b911gt.net, 1
 b9168.com, 1
 b91688.com, 1
+b91688.info, 1
+b91688.net, 1
+b91688.org, 1
+b9175.com, 1
+b9175.net, 1
+b9258.com, 1
+b9258.net, 1
 b9297.co, 1
+b9318.com, 1
+b9318.net, 1
+b9418.com, 1
+b9418.net, 1
+b9428.com, 1
+b9428.net, 1
+b9453.com, 1
+b9453.net, 1
+b9468.com, 1
+b9468.net, 1
+b9488.com, 1
+b9488.net, 1
 b9498.com, 1
+b9498.net, 1
+b9518.info, 1
+b9518.org, 1
+b9528.com, 1
 b9528.net, 1
+b9538.com, 1
+b9538.net, 1
 b9586.net, 1
 b9588.net, 1
 b95888.net, 1
 b9589.net, 1
+b9598.net, 1
 b960.com, 1
 b9658.com, 1
+b9658.net, 1
 b96899.com, 1
 b9728.co, 1
+b9758.com, 1
+b9758.net, 1
 b979333.com, 1
 b979555.com, 1
 b979666.com, 1
 b979999.com, 1
+b9818.com, 1
+b9818.net, 1
+b9858.com, 1
+b9858.net, 1
 b9883.net, 1
 b9884.net, 1
 b9885.net, 1
@@ -13058,6 +13526,7 @@
 b9930.com, 1
 b99318.com, 1
 b99418.com, 1
+b9948.com, 1
 b9948.net, 1
 b9951.com, 1
 b99518.com, 1
@@ -13077,17 +13546,29 @@
 b99885.com, 1
 b99886.com, 1
 b99918.com, 1
+b9999ff.com, 1
+b9999hh.com, 1
 b9999ii.com, 1
 b9999jj.com, 1
 b9999ll.com, 1
+b9999mm.com, 1
+b9999nn.com, 1
 b9999oo.com, 1
 b9999pp.com, 1
+b9999qq.com, 1
 b9999tt.com, 1
 b9999uu.com, 1
 b9999vv.com, 1
+b9999ww.com, 1
 b9999yy.com, 1
 b9999zz.com, 1
 b99iosapp.com, 1
+b9best.cc, 1
+b9best.net, 1
+b9king.cc, 1
+b9king.com, 1
+b9king.net, 1
+b9winner.cc, 1
 b9winner.com, 1
 ba47.net, 1
 baac-dewellmed.com, 1
@@ -13098,6 +13579,7 @@
 baazee.de, 1
 babacasino.net, 1
 babacloud.ddns.net, 1
+babacuhocica.tk, 1
 babaei.net, 1
 babaei.org, 1
 babaganousha.net, 1
@@ -13118,6 +13600,7 @@
 babkitut.ga, 1
 bablodel.biz, 1
 bablodel.com, 1
+babo.tk, 1
 babounet.com, 1
 babsbibs.com, 1
 babursahvizeofisi.com, 1
@@ -13127,8 +13610,8 @@
 baby-digne.com, 0
 baby-massage.tk, 1
 baby-skin-care.ga, 1
+baby-tester.tk, 1
 babyandchild.ae, 1
-babyanywhere.com, 1
 babyappear.com, 1
 babyatacado.com.br, 1
 babybauch-shooting-muenchen.de, 1
@@ -13157,6 +13640,7 @@
 babytan.tk, 1
 babyvillagegt.com, 1
 babyzen.tk, 1
+bac-fiches.tk, 1
 bacahorror.com, 1
 bacaneriahlg.com, 1
 bacanora.tk, 1
@@ -13205,6 +13689,7 @@
 backschues.net, 1
 backseatbandits.com, 1
 backsideverbier.ch, 0
+backsliderz.uk, 1
 backspace.dev, 1
 backspace.rocks, 1
 backterris.com, 1
@@ -13213,6 +13698,7 @@
 backup-kurumsal.com, 1
 backupassist.de, 1
 backupcloud.ru, 1
+backwardsalphabet.tk, 1
 bacom1.com, 1
 baconismagic.ca, 0
 bacoux.com, 1
@@ -13221,6 +13707,7 @@
 bactrim-antibiotic.ml, 1
 bactrim-ds.ga, 1
 bactrim-medicine.ml, 1
+bactrim.gq, 1
 bactrimds.cf, 1
 bactrimprice.tk, 1
 bacula.jp, 1
@@ -13232,6 +13719,7 @@
 badam.co, 1
 badanteinfamiglia.it, 1
 badaparda.com, 1
+badassfantastico.tk, 1
 badbee.cc, 1
 badbird.tk, 1
 badblock.fr, 1
@@ -13249,11 +13737,11 @@
 badkamermarkt.com, 1
 badkamermarkt.net, 1
 badkamermarkt.nl, 1
-badmania.fr, 1
 badmessage.tk, 1
 badmice.tk, 1
 badmintonargentina.tk, 1
 badmintonbible.com, 1
+badmintonoverdag.tk, 1
 badmusic.tk, 1
 badnails.tk, 1
 badnjar.rs, 1
@@ -13262,6 +13750,7 @@
 badoo.de, 1
 badoo.eu, 1
 badoo.us, 1
+badpreachers.tk, 1
 badrequest.me, 1
 badrock.tk, 1
 badseacoffee.com, 1
@@ -13271,6 +13760,7 @@
 baecker-know-how.de, 1
 baeder-luboss.de, 1
 baehost.com, 1
+baenoticias.com.ar, 1
 baer.one, 1
 baer.space, 1
 bafus.ru, 1
@@ -13318,9 +13808,9 @@
 baildonbouncycastles.co.uk, 1
 baildonhottubs.co.uk, 1
 baileebee.com, 1
-bailleux.be, 1
 bailonga.com, 1
 baindayman.com, 1
+baircentral.com, 1
 bairrosonline.com, 1
 bairuo.top, 0
 bait55.ru, 1
@@ -13347,10 +13837,11 @@
 bakanin.ru, 1
 bakaproxy.moe, 1
 bakerbasements.com, 1
+bakerranchdentistry.com, 1
+bakersafari.co, 1
 bakersfieldhomeoffer.com, 1
 bakerviewdentalcentre.com, 1
 bakeup.be, 1
-bakhansen.com, 1
 bakibal.com, 1
 bakkerij-janschrieks.nl, 1
 bakkerinjebuurt.be, 1
@@ -13359,6 +13850,7 @@
 baksclub.cf, 1
 baksclub.gq, 1
 bakubest.tk, 1
+bakuze.net, 1
 bakxnet.com, 1
 balade-commune.ch, 0
 baladecommune.ch, 0
@@ -13366,6 +13858,10 @@
 balaganlimited.cf, 1
 balakovo-news.tk, 1
 balancascia.com.br, 1
+balance.courses, 1
+balance.education, 1
+balance.equipment, 1
+balance.technology, 1
 balance7.jp, 1
 balancedbrawl.net, 1
 balancehits.com.br, 1
@@ -13380,9 +13876,9 @@
 balcarek.pl, 1
 balconnr.com, 1
 balconsverdun.com, 0
+balcony.cf, 1
 baldvinringsted.com, 1
 baldwin-mania.tk, 1
-balearicholidu.com, 1
 baleen.us, 1
 balerma.tk, 1
 balesetvedelem.hu, 1
@@ -13407,28 +13903,35 @@
 balkonien.org, 1
 ball-bizarr.de, 1
 ball4training.com, 1
+ballaratcapital.com, 1
+ballaratcapital.com.au, 1
 ballarin.cc, 1
 ballast.tk, 1
 ballbusting-cbt.com, 1
 ballejaune.com, 1
 ballensiefen.net, 1
+ballerkneipe.com, 1
 ballettstudio-ost.de, 1
 ballinw.com, 1
 ballisticbrass.tk, 1
 ballisticdetailing.com, 1
 ballitolocksmith.com, 1
 ballmerpeak.org, 1
+ballon-ballon.de, 1
 ballonella.de, 1
+ballonnenopdakpannen.tk, 1
 ballonsportclub-erlangen.de, 1
 ballotapi.com, 1
 ballothero.com, 1
 ballparkbuns.com, 0
 ballpythonsaspets.com, 1
 ballroom.info, 1
+ballyhacksmokehouse.com, 1
 balmeo.co.uk, 1
 balmofgilead.org.uk, 1
 baloch-intelligence.tk, 1
 baloncestoarqueros.tk, 1
+baloncestolliria.tk, 1
 balonmano.co, 1
 balosport.com, 1
 balp.com, 1
@@ -13454,6 +13957,7 @@
 bambumania.com.br, 1
 bambusushibar.com, 0
 bamily.rocks, 1
+bamoza.com, 1
 bampers.tk, 1
 bampizza.com, 1
 bamsmackpow.com, 1
@@ -13477,7 +13981,6 @@
 bancor.network, 1
 bancosdominicanos.net, 1
 bancoserfinanza.com, 1
-bandagastrica.es, 1
 bandally.net, 1
 bandamirandadeebro.tk, 1
 bandarifamily.com, 1
@@ -13489,11 +13992,14 @@
 banderasdelmundo.xyz, 1
 bandiere-mondo.it, 1
 bandiga.it, 1
+bandirmaevdenevenakliyat.tk, 1
 bandito.re, 1
 bandnames.tk, 1
 bandolino-bewind.nl, 1
 bandolino.nl, 1
+bandures.tk, 1
 bandvideos.tk, 1
+bandwagon.tk, 1
 bandymasarna.tk, 1
 baneh-academic.com, 1
 banerka.tk, 1
@@ -13501,6 +14007,7 @@
 banffcanmorespeedskating.ca, 1
 banfieldtravel.it, 1
 banfun.org, 1
+bangcompras.com, 1
 bangdream.ga, 1
 bangim.co.il, 1
 bangkok-dark-night.com, 1
@@ -13516,7 +14023,6 @@
 bangumi.co, 1
 bangun.in, 1
 bangyu.wang, 1
-bangzhu88.com, 1
 banham.co.uk, 0
 banham.com, 1
 banhphongtomquangtran.com, 1
@@ -13554,10 +14060,10 @@
 banksiaparkcottages.com.au, 1
 bankstownapartments.com.au, 1
 bankvanbreda.be, 1
+bankwebinars.com, 1
 banland.net, 1
 banlinhdanong.com, 1
-banmapvn.com, 1
-banned-bitches.tk, 1
+banned-bitches.tk, 0
 banner-design.tk, 1
 bannermarquees.ie, 1
 bannerworld.co.uk, 1
@@ -13570,6 +14076,8 @@
 bantaihost.com, 1
 banter.city, 1
 banzay.ml, 1
+banzhuti.com, 1
+bao-in.net, 1
 baobaoquming.net, 1
 baocaosuhp.com, 1
 baocheng.tech, 1
@@ -13577,7 +14085,6 @@
 baogiathicongnoithat.com, 1
 baogougou.com, 1
 baokhangfood.com, 1
-bap-consult.at, 1
 bapeel.tk, 1
 bapha.be, 0
 baptiste-peugnez.fr, 1
@@ -13590,6 +14097,7 @@
 baranmovie.tk, 1
 baranyavar.hu, 1
 barao.tk, 1
+barataeletrica.tk, 1
 baravalle.com, 1
 baraxolka.ml, 1
 baraxolka.ru, 1
@@ -13600,6 +14108,7 @@
 barbarafabbri.com, 1
 barbarafeldman.com, 1
 barbarians.com, 0
+barbaros.info, 1
 barbate.fr, 1
 barbe-n-blues.fr, 1
 barbershop-harmony.org, 0
@@ -13619,7 +14128,9 @@
 barcelonapremium.es, 1
 barcelonapremiummini.es, 1
 barcelonawinewalk.com, 1
+barcelosnanet.com, 1
 barclays.net, 1
+barcoder.tk, 1
 bardes.org, 1
 bardiharborow.com, 1
 bardiharborow.tk, 1
@@ -13628,7 +14139,7 @@
 bargainsettelement.com, 1
 barganhanaweb.ml, 1
 bargest.su, 1
-bariatrica.es, 1
+bariatricsurgerynewjersey.com, 1
 bariatricsurgerysmg.com, 1
 barihandin.tk, 1
 baripedia.org, 0
@@ -13664,15 +14175,20 @@
 barracuda.blog, 1
 barracuda.com.tr, 1
 barrancos.tk, 1
+barratennis.com.br, 1
 barrenwuffett.com, 1
 barrera.io, 1
+barrierefreie-medien.info, 1
+barrikade.tk, 1
 barriofut.com, 1
 barrioitalia.com, 1
 barriotoboardroom.com, 1
+barruntos.tk, 1
 barrydenicola.com, 1
 barrymarkus.tk, 1
 bars.kh.ua, 1
 barsashop.com.br, 1
+barsgroup.com, 1
 barslecht.com, 1
 barss.io, 1
 barsukas.net, 1
@@ -13680,6 +14196,7 @@
 barta.me, 1
 bartavi.nl, 1
 bartbania.com, 1
+bartcoppens.be, 1
 bartdaelman.tk, 1
 bartdesign.tk, 1
 bartel.ws, 1
@@ -13708,6 +14225,7 @@
 base-n.ru, 1
 base-radio.cf, 1
 basebalance.net, 1
+baseballpitchingmachine.tk, 1
 baseballsavings.com, 1
 basebyte.nl, 1
 baseconvert.com, 1
@@ -13730,11 +14248,14 @@
 basementwaterproofingsaintlouis.com, 1
 basementwaterproofingwi.com, 1
 baserverz.ga, 1
+basetruck.cn, 1
 baseweb.design, 0
 bashc.at, 1
 bashhack.cf, 1
 bashing-battlecats.com, 1
 bashkiri.cf, 1
+bashkiria.cf, 1
+bashkiria.ga, 1
 bashkirlife.tk, 1
 bashsoftware.tk, 1
 bashstreetband.co.uk, 1
@@ -13744,6 +14265,7 @@
 basicapparel.de, 1
 basicattentiontoken.org, 1
 basicguitarlessons.com, 1
+basiclimits.tk, 1
 basicports.com, 1
 basicports.eu, 1
 basicports.net, 1
@@ -13751,6 +14273,7 @@
 basics.domains, 1
 basics.net, 1
 basictools.tk, 1
+basicwallpapers.tk, 1
 basilicaknights.org, 1
 basilm.co, 1
 basilsys.com, 1
@@ -13773,6 +14296,7 @@
 bassrhymeposse.tk, 1
 bassrider.eu, 1
 bassys.com.co, 1
+bastardator.tk, 1
 bastawholesale.com, 1
 bastelstu.be, 1
 bastelzauberwelt.de, 0
@@ -13788,12 +14312,15 @@
 baswetter.photography, 1
 basyrova.ml, 1
 basyspro.net, 1
+bat909.com, 1
+bat909.net, 1
+bat9vip.com, 1
+bat9vip.net, 1
 batailleros.tk, 1
 batcave.tech, 1
 batch.com, 1
 batchewanabingo.com, 1
 baterioverolety.cz, 1
-bath.men, 1
 bathbodyshop.tk, 1
 bathrobes.tk, 1
 bathroomremodelinggeorgia.com, 1
@@ -13803,6 +14330,7 @@
 batipresta.ch, 0
 batiskaf.ua, 1
 batistareisfloresonline.com.br, 1
+batitrakya.org, 0
 batmanvsupermanfullmovie.ga, 1
 batoit.gq, 1
 batolis.com, 1
@@ -13810,19 +14338,27 @@
 batook.org, 1
 batschu.de, 1
 batten.eu.org, 1
+batterijeshop.com, 0
 batteryboys.ca, 1
 batteryboys.com, 1
 batteryreconditioning.ml, 1
 batterystaple.pw, 1
 battle-game.com, 1
 battleboxx.com, 0
+battlefield1942.tk, 1
 battleforkhashuri.tk, 1
 battlefrontoldschool.cf, 1
 battleguard.net, 1
 battleofthegridiron.com, 1
+battlepetsonline.com, 1
 battlerealms.cc, 1
 battlerite.tk, 1
+battletech.tk, 1
 battreil.tk, 1
+batucadastore.nl, 1
+batukhan.tk, 1
+batvip9.net, 1
+batwatt.com, 1
 bauer-reininghorses.com, 1
 bauer.network, 1
 bauernmarkt-fernitz.at, 1
@@ -13844,6 +14380,7 @@
 bautied.de, 1
 bautizodelucia.com, 1
 bauunternehmen-herr.de, 1
+bavaria-feuerloeschershop.de, 1
 bavarian-firebird.de, 1
 bavaroparadise.com, 1
 bavaropuntacanahotels.com, 1
@@ -13866,7 +14403,6 @@
 bayerstefan.eu, 1
 bayherbalist.com, 1
 bayilelakiku.com, 1
-bayltd.com, 1
 bayly.eu, 1
 baymard.com, 1
 bayportbotswana.com, 1
@@ -13874,6 +14410,7 @@
 bayportuganda.com, 1
 bayraklar.info, 1
 bayramov.tk, 1
+bayscollisionrepairs.co.nz, 1
 baysideaba.com, 1
 baysidefamilydentist.com.au, 1
 baystreet.com.mt, 1
@@ -13915,6 +14452,7 @@
 bb37roma.it, 1
 bb5197.co, 1
 bb6729.co, 1
+bb6729.com, 1
 bb6957.co, 1
 bb882.com, 1
 bb9297.co, 1
@@ -13923,6 +14461,7 @@
 bbagramante.it, 1
 bbalposticino.it, 1
 bbamsch.com, 1
+bbaovanc.com, 1
 bbb1991.me, 0
 bbbasicspodcast.com, 1
 bbbff.net, 1
@@ -13944,6 +14483,7 @@
 bbkanews.com, 1
 bbkanews.org, 1
 bbkanews.uk, 1
+bbkl.org, 1
 bbkworldwide.jp, 1
 bbld.de, 1
 bblove.me, 1
@@ -13956,7 +14496,7 @@
 bbs8080.com, 1
 bbschat.tk, 1
 bbsec.xyz, 1
-bbsgood.com, 1
+bbswin9.cc, 1
 bbuio.com, 0
 bbunits.de, 1
 bbw-wrestling.com, 1
@@ -13965,6 +14505,7 @@
 bbwfacesitting.us, 1
 bbwsexclips.com, 1
 bbwteens.org, 1
+bbxin9.com, 1
 bbxin9.net, 1
 bc-bd.org, 0
 bc-diffusion.com, 1
@@ -14006,11 +14547,13 @@
 bdbxml.net, 1
 bdd.fi, 1
 bdeshi.space, 1
+bdfriends.tk, 1
 bdikaros-network.net, 1
 bdmusic25.us, 1
 bdpachicago.tech, 1
 bdpestsolutionsstlouis.com, 1
 bdsmcontrol.com, 1
+bdsmdating.tk, 1
 bdsmwiki.hu, 1
 bdtc.com.bd, 1
 bdtopshop.com, 0
@@ -14029,10 +14572,12 @@
 be9418.info, 1
 be9418.net, 1
 be9418.org, 1
+be9458.com, 1
 be9458.info, 1
 be9458.net, 1
 be9458.org, 1
 be958.info, 1
+be958.net, 1
 be958.org, 1
 be9966.com, 1
 bea.expert, 0
@@ -14042,6 +14587,7 @@
 beachcitycastles.com, 1
 beachmarketing.co.uk, 1
 beachpoint.tk, 1
+beachsoccer.tk, 1
 beachwayhomes.com, 1
 beachworldchampion.tk, 1
 beacinsight.com, 1
@@ -14056,6 +14602,7 @@
 bealpha.pl, 1
 beam-life.tk, 1
 beam-to.me, 1
+beama.org, 1
 beambdi.com, 1
 beamitaly.tk, 1
 beamitapp.com, 1
@@ -14065,11 +14612,11 @@
 beancount.io, 1
 beanilla.com, 1
 beanjuice.me, 1
-beans-one.com, 0
 beansgalore.com.au, 1
 beaquarium.com, 1
 bearcms.com, 1
 bearcosports.com.br, 1
+beardboys.co.za, 1
 bearded.sexy, 1
 bearden.io, 1
 beardic.cn, 1
@@ -14083,16 +14630,18 @@
 bearrecords.tk, 1
 bearskin-rugs.com, 1
 beasel.biz, 1
+beashandmade.com, 1
 beastiejob.com, 1
 beastlog.tk, 1
 beastowner.li, 1
 beastshirt.com, 1
 beatfeld.de, 1
+beatfreaks.tk, 1
 beatmaker.ml, 1
 beatquantum.com, 1
 beatrice-nightscout.herokuapp.com, 1
-beatrice-raws.org, 1
 beatrizaebischer.ch, 0
+beatsdope.com, 1
 beatsearch.net, 1
 beatthebastards.tk, 1
 beatthecpa.com, 1
@@ -14101,8 +14650,10 @@
 beaulieu.ch, 1
 beaute-eternelle.ch, 0
 beautifulsouth.tk, 1
+beauty-blog.gq, 1
 beauty-form.ir, 1
 beauty-italy.ru, 1
+beauty-mens.com, 1
 beauty-salon-lino.com, 1
 beauty-stories.tk, 1
 beauty-style.ml, 1
@@ -14124,6 +14675,7 @@
 beautyeyewear.ga, 1
 beautyinfos.de, 1
 beautyinweb.net, 1
+beautyisfine.tk, 1
 beautyland.com.co, 1
 beautyseasons.ru, 1
 beautyspot.tk, 1
@@ -14148,9 +14700,11 @@
 beccaanne.photography, 1
 beccajoshwedding.com, 1
 bech32.net, 1
+beckdesign.tk, 1
 beckerantiques.com, 1
 beckijayes.family, 1
 becklove.cn, 1
+beckylicious.tk, 1
 beclan.tk, 1
 becleverwithyourcash.com, 1
 becollective.com, 1
@@ -14160,13 +14714,15 @@
 becs.ch, 0
 becubed.co, 1
 becydog.cz, 1
-bedacdn.com, 1
 bedamedia.com, 1
 bedandbreakfasthoekvanholland.com, 1
 bedding.ro, 1
 bedels.nl, 1
+bedez.pl, 1
 bedfordnissanparts.com, 1
+bedinsi.com.br, 1
 bedlingtonterrier.com.br, 1
+bedofcorpses.tk, 1
 bedouille.com, 1
 bedrijfsfotoreportages.nl, 1
 bedrijfsportaal.nl, 1
@@ -14182,8 +14738,11 @@
 bee.clothing, 1
 bee.supply, 1
 bee.tools, 1
+beebeads.ga, 1
 beecare.ch, 0
 beedsolyjas.tk, 1
+beefclan.tk, 1
+beehealthyllc.com, 1
 beehive.govt.nz, 1
 beehive42.com, 1
 beehive42.eu, 1
@@ -14207,9 +14766,11 @@
 beeming.net, 1
 beer-sheva.city, 1
 beer9.com, 1
+beerarchy.tk, 1
 beercandle.com, 1
 beercast.co.uk, 1
 beeremovalspretoria.co.za, 1
+beergifts.tk, 1
 beerglasses.tk, 1
 beerians.com, 1
 beerians.info, 1
@@ -14225,12 +14786,14 @@
 beers.my, 1
 beersandco.ch, 1
 beersconf.com, 1
+beersheba.co.il, 1
 beersheva.city, 1
 beerview.ga, 1
 beerxa.cz, 1
 beestation13.com, 1
 beeswarmrehoming.com.au, 1
 beeswax-orgone.com, 1
+beesweethoney.co.za, 1
 beetgroup.id, 1
 beethoveninlove.com, 1
 beetman.net, 1
@@ -14246,10 +14809,8 @@
 befundonline.de, 1
 bega-dc.gov, 1
 begabungsfoerderung.info, 1
-begbie.com, 1
 begethost.cf, 1
 begin-motorcycling.co.uk, 1
-beginner.nl, 1
 begovel.shop, 1
 begravningsbyranhumana.se, 1
 behamepresrdce.sk, 1
@@ -14258,6 +14819,7 @@
 behavhealth.ml, 1
 behaviorchangeimpact.org, 1
 behead.de, 1
+behemoth.cf, 1
 beherit.pl, 1
 behinam.co.il, 1
 behind-the-mask.tk, 1
@@ -14268,7 +14830,6 @@
 behoerden-online-dienste.de, 1
 behold.gq, 1
 behoreal.cz, 1
-behtarin10.com, 1
 bei18.com, 1
 beichtgenerator.de, 1
 beijing30019.com, 1
@@ -14277,6 +14838,7 @@
 beinad.com, 1
 beinad.ru, 1
 beingmad.org, 0
+beinsports.pro, 1
 beinteractive.pl, 1
 beirutclis.com, 1
 beitmidrashrambam.com, 1
@@ -14311,7 +14873,6 @@
 belezadateresa.com.br, 1
 belezashopping.com.br, 1
 belf.ml, 1
-belfa.in, 1
 belfastbounce.co.uk, 1
 belfastlocks.com, 1
 belfasttechservices.co.uk, 1
@@ -14324,6 +14885,7 @@
 belgian-swimmers-united.tk, 1
 belgianfilipinolovers.be, 1
 belgiantennis.tk, 1
+belgianwesthoekclassic.tk, 1
 belgicaservices.be, 1
 belgie-postcodes.be, 1
 belgischerijpony.tk, 1
@@ -14352,19 +14914,19 @@
 bella.network, 1
 bellaaroma.com.tw, 1
 bellabrowbydesign.com, 1
-bellaireroofinginc.com, 1
+bellafashion.tk, 1
 bellamodeling.com, 1
 bellamy.cloud, 1
 bellanews.tk, 1
 bellapierre.ee, 1
-bellaplanta.hr, 1
 bellavistaoutdoor.com, 1
 belle-lingerie.co.uk, 0
 bellebakes.blog, 1
 bellecarmen.tk, 1
+bellesetrebelles.tk, 1
 bellevuechiropracticassociates.com, 1
 bellevueduilawyers.com, 1
-bellevueowners.tk, 1
+bellevueowners.tk, 0
 bellezademujeres.com, 1
 bellezanatural.life, 1
 bellezzasenzalimiti.it, 1
@@ -14383,8 +14945,10 @@
 beloevino.ml, 1
 belos.at, 1
 belouga.org, 1
+belowzero.tk, 1
 belpbleibtbelp.ch, 1
 belquant.cf, 1
+belrosstrakh.tk, 1
 belrybalka.cf, 1
 belt.black, 1
 beltar.nl, 1
@@ -14403,9 +14967,9 @@
 ben-stock.de, 1
 ben.ninja, 1
 ben2.co.il, 1
-bena.world, 1
 benabbott.nz, 1
 benabrams.it, 1
+benadesign.fr, 1
 benadryl.ml, 1
 benadryld.tk, 1
 benary.org, 1
@@ -14427,6 +14991,7 @@
 bendigoland.com.au, 1
 bendingtheending.com, 1
 bendix.co, 1
+bendminding.com, 1
 bendyworks.com, 1
 beneathvt.com, 1
 beneazy.cf, 1
@@ -14434,6 +14999,7 @@
 benedict-balzer.de, 1
 benedict.tk, 1
 benedictoaguilar.tech, 1
+benee-awraham.nl, 1
 benefits.gov, 1
 benefitsbookcase.com, 1
 benepiscinas.com.br, 1
@@ -14445,9 +15011,12 @@
 benevita.live, 1
 benevita.organic, 1
 benewpro.com, 1
+bengalcat.tk, 1
 bengalcatscare.com, 1
 bengalurugifts.com, 1
 bengisureklam.com, 1
+bengkelkeramik.tk, 1
+bengkle.id, 1
 benhamplateau.tk, 1
 benhaney.com, 1
 benhartmann.de, 0
@@ -14473,6 +15042,7 @@
 benjamorphism.com, 1
 benjii.me, 1
 benjijaldoner.nl, 1
+benjonline.tk, 1
 benkelmed.com, 1
 benleb.de, 0
 benleemd.com, 1
@@ -14495,6 +15065,7 @@
 benohrbrill.com, 1
 benoitchantre.com, 1
 benoniplumber24-7.co.za, 1
+benpro.fr, 1
 bensbouncycastles.co.uk, 1
 benschnarr.com, 1
 benscobie.com, 1
@@ -14507,16 +15078,17 @@
 bent-nails.com, 1
 bentcreekvineyards.com.au, 1
 bentertain.de, 1
-benthanhtourist.com, 1
 bentley.blog, 1
 bentley.link, 1
 bentoncountyia.gov, 1
 bentongroup.co.uk, 1
 bentonweatherstone.co.uk, 1
+bentpunk.tk, 1
 bentrask.com, 1
 benu.cz, 1
 benulekaren.sk, 1
 benz-hikaku.com, 1
+benzblog.tk, 1
 benzi.io, 1
 benzou-space.com, 1
 beonas.ddns.net, 1
@@ -14526,7 +15098,8 @@
 bep.gov, 1
 bepayd.com, 1
 bephoenix.org.uk, 0
-bepsvpt.me, 1
+bepositive.ml, 1
+bepzi.com, 1
 bequ1ck.com, 1
 bequiia.com, 1
 beranovi.com, 1
@@ -14541,9 +15114,11 @@
 bereelcorporation.com, 1
 bereginy.com.ua, 1
 bereginya-lada.ru, 1
+beregusha.com, 1
 bereikbaargent.be, 1
 berela.com.pl, 1
 berend.tk, 1
+beresbalazs.tk, 1
 bergelevrad.tk, 1
 bergenson.nl, 0
 berger-chiro.com, 1
@@ -14563,6 +15138,7 @@
 berightthere.eu, 1
 berikod.ru, 1
 beris.us, 1
+berita.press, 1
 beritalima.com, 1
 beritanow.tk, 1
 beritatopbanten.com, 1
@@ -14570,6 +15146,7 @@
 berk.tk, 1
 berkat-luqs.ddns.net, 1
 berkbrands.com, 1
+berkkalkan.com.tr, 1
 berksabstract.com, 1
 berksestateplanning.com, 1
 berksnetworking.com, 1
@@ -14581,6 +15158,7 @@
 berlingeriresort.it, 1
 berluga.com, 1
 berluskoni.tk, 1
+bermellar.tk, 1
 bermos.net, 1
 bermytraq.bm, 1
 bern.bz, 1
@@ -14592,7 +15170,6 @@
 bernar.do, 1
 bernardcontainers.be, 0
 bernardez-photo.com, 1
-bernardgo.com, 1
 bernarditadiaz.tk, 1
 bernardo.fm, 1
 bernat.ch, 1
@@ -14622,6 +15199,7 @@
 berruezoabogados.com, 1
 berrus.com, 1
 berry.cat, 1
+berrywan.com, 1
 berserk.tk, 1
 bersierservices.ch, 0
 bersotavocats.fr, 0
@@ -14660,6 +15238,7 @@
 bespokemortgages.co.uk, 1
 bespokestraps.com, 1
 bespredel.tk, 1
+bessels.tk, 1
 bessems.com, 1
 bessems.eu, 1
 besser-golfen.tk, 1
@@ -14672,8 +15251,10 @@
 best-book.gq, 1
 best-business-colleges.com, 1
 best-buyessaysonline.com, 1
+best-cat.tk, 1
 best-catholic-colleges.com, 1
 best-cats.tk, 1
+best-chiter.tk, 1
 best-community-colleges.com, 1
 best-credit.de, 0
 best-culinary-colleges.com, 1
@@ -14700,6 +15281,7 @@
 best10websitebuilders.com, 1
 best2pay.net, 1
 best66.me, 1
+bestanswer.tech, 1
 bestantidandruffshampoo.net, 1
 bestappliancedoctor.com, 1
 bestasquadradas.org, 1
@@ -14729,6 +15311,7 @@
 bestdeal.co.in, 1
 bestdietpillss.com, 1
 bestdownloadscenter.com, 1
+bestdslrcameras.tk, 1
 bestecbdolie.com, 1
 bestechgadgets.tk, 1
 bestedeal.nl, 1
@@ -14739,9 +15322,12 @@
 bestellipticalmachinereview.info, 1
 bestelsportprijzen.nl, 1
 bestemailmarketingsoftware.org, 1
+bestesb.com, 1
 bestesb.net, 1
 bestessayhelp.com, 1
+bestestofzuiger.com, 1
 bestestquote.com, 1
+besteuitvaartverzekering.com, 1
 bestfacts.ru, 1
 bestfitnesswatchreview.info, 1
 bestfornutrition.com, 1
@@ -14749,12 +15335,16 @@
 bestfriendsequality.org, 1
 bestgiftever.ca, 1
 bestglobalpayments.com, 1
+bestgriefbooks.com, 1
+besthairsale.com, 1
 besthemes.tk, 1
+besthomescents.com, 1
 besthost.cz, 1
 besthotsales.com, 1
 besti.it, 1
 bestiahosting.com, 1
 bestidea.io, 1
+besties4life.ml, 1
 bestinbarter.com, 1
 bestinductioncooktop.us, 1
 bestinfo.com.au, 1
@@ -14765,6 +15355,7 @@
 bestitwork.tk, 1
 bestjumptrampolines.be, 1
 bestkenmoredentists.com, 1
+bestkeys.ga, 1
 bestkitchenbuy.com, 1
 bestladyshaver.co.uk, 0
 bestlawyernear.com, 1
@@ -14784,13 +15375,13 @@
 bestpartyhire.com, 1
 bestperfumebrands.com, 1
 bestpig.fr, 1
-bestplumbing.com, 1
 bestplus.ml, 1
 bestplus.tk, 1
 bestpornclip.com, 1
 bestporngirls.com, 1
 bestpractice.domains, 1
 bestproductsaudit.com, 1
+bestreleases.tk, 1
 bestremote.io, 1
 bestrevs.com, 1
 bestsatoshifaucet.ga, 1
@@ -14798,19 +15389,21 @@
 bestsellers.co, 1
 bestseo4u.co.uk, 1
 bestseries.tv, 1
+bestsextoys.com, 1
 bestsgadgets.com, 1
 bestshoesmix.com, 1
 bestsingingbowls.com, 1
 bestsiteporn.com, 1
+besttipsntricks.tk, 1
 besttrade.tk, 1
 bestvpnservice.com.au, 1
 bestwap2.in, 1
-bestwarezone.com, 1
 bestwebcams.ml, 1
 bestwebsite.gallery, 1
 bestweleenbeetje.nl, 1
 bestwirelessdoorbell.ml, 1
 bestzoo.tk, 1
+bet-99.cc, 1
 bet-platform.com, 1
 bet031.com, 1
 bet03vip.com, 0
@@ -14837,6 +15430,8 @@
 bet166ww.com, 1
 bet166xx.com, 1
 bet166yy.com, 1
+bet168wy.com, 1
+bet168wy.net, 1
 bet338c.com, 1
 bet365bc.net, 1
 bet365bet2020.com, 1
@@ -14952,6 +15547,7 @@
 bet86yn.com, 1
 bet86zj.com, 1
 bet909.com, 1
+bet9bet9.net, 1
 bet9ja.com, 1
 beta-site-staging.azurewebsites.net, 1
 betaa0.com, 1
@@ -14972,6 +15568,7 @@
 betantt.com, 1
 betaoptimize.com, 1
 betaprofiles.com, 1
+betatester.ml, 1
 betawi.com, 1
 betaworx.de, 1
 betaworx.eu, 1
@@ -14980,8 +15577,11 @@
 betbed.ml, 1
 betbravo.et, 1
 betcn-mart.com, 1
+betecnet.de, 1
+betemyja.tk, 1
 betexperts.tk, 1
 betformular.com, 1
+betgo9.cc, 1
 bethanyhome.org, 1
 bethematch.org, 1
 bethematchclinical.org, 1
@@ -14995,6 +15595,7 @@
 betolerant.fr, 1
 betonbit.com, 1
 betonmarkets.info, 1
+betonsport.ga, 1
 betor.cz, 1
 betpamm.com, 1
 betrifft-mich-dsgvo.ch, 1
@@ -15012,6 +15613,7 @@
 bett1.pl, 1
 bettaline.com.au, 1
 bettashoerepairs.com.au, 1
+bettehochberger.com, 1
 better.com, 1
 better.fyi, 1
 betterbabyshop.com.au, 1
@@ -15040,6 +15642,7 @@
 bettflaschen.ch, 1
 bettie.tk, 1
 bettingbusiness.ru, 1
+bettingonaverage.com, 1
 bettingsider.dk, 1
 bettmer.at, 1
 bettmer.de, 1
@@ -15048,10 +15651,14 @@
 bettyweber.com, 1
 betulashop.ch, 1
 betweenthehills.be, 1
+betwin9.com, 1
 betwin9.net, 1
 betwinner-zerkalo.ru, 1
 betwinner.cm, 1
+betwinner.de.com, 1
 betwinnergiris.org, 1
+betwinnerlive.com, 1
+betwinnerportugal.com, 1
 betxx1.com, 1
 betxx2.com, 1
 betza.online, 1
@@ -15067,6 +15674,7 @@
 bevelbeer.com, 1
 bevelpix.com, 1
 beverhof.nl, 1
+beverley.tk, 1
 beverleycounselling.co.uk, 1
 beverlyinternational.com, 1
 bevif.com, 1
@@ -15100,12 +15708,14 @@
 beykozmekan.com, 1
 beyond-infinity.org, 0
 beyond-rational.com, 1
+beyond360view.com, 1
+beyond3dview.com, 1
+beyond3dviews.com, 1
 beyondalderaan.net, 1
 beyondauth.io, 1
 beyondbounce.co.uk, 1
 beyondboxgifts.com, 1
 beyondgameplay.com, 1
-beyondordinarylife.com, 1
 beyondpricing.com, 1
 beyondthecode.io, 1
 beyondthecreek.com, 1
@@ -15146,17 +15756,20 @@
 bgemi.net, 1
 bgeo.io, 1
 bgfashion.net, 1
+bghddevelopment.com, 1
 bghope.com, 1
 bghost.xyz, 1
 bgjargon.com, 1
 bgkoleda.bg, 1
 bglsingles.de, 1
 bgm.bg, 1
+bgmall.tk, 1
 bgmn.me, 1
 bgp.space, 1
 bgr34.cz, 1
 bgs-game.com, 1
 bgtoyou.com, 1
+bgtraffic.tk, 1
 bguidinger.com, 1
 bh-oberland.de, 1
 bh.sb, 1
@@ -15176,7 +15789,6 @@
 bhosted.nl, 1
 bhrenovations.com, 1
 bhserralheria.com.br, 1
-bhtelecom.ba, 1
 bhthome.com, 1
 bhub.tk, 1
 bhuntr.com, 1
@@ -15202,13 +15814,17 @@
 biasmath.es, 1
 biathloncup.ru, 1
 biaxin.cf, 1
+biaxin.ml, 1
 bibet365.com, 1
 bibhub.org, 1
+bibi-xxx.com, 1
 bibica.net, 1
 bibisbootypalace.de, 1
 bibitbunga.com, 1
 bible-maroc.com, 1
+bible.ru, 1
 bible4u.net, 1
+bibleonline.ru, 1
 biblesignposts.com, 1
 bibleversesfordailyliving.com, 1
 biblia.es, 1
@@ -15236,15 +15852,20 @@
 bichonmaltes.com.br, 1
 bicicletassym.com, 1
 bicicletassym.com.co, 1
+bicignet.ga, 1
 bicommarketing.com, 1
 bicromoestudio.com, 1
+bicstone.me, 1
 bicubic.tk, 1
 bicycle-events.com, 1
+bicycle-works.com, 1
 bicycleframeiz.com, 1
 bidaah.tk, 1
 bidadari.my, 1
 biddl.com, 1
 biddle.co, 1
+bideninaugural.org, 1
+bidgreat.co.uk, 1
 bidman.cz, 1
 bidman.eu, 1
 bidonline.tk, 1
@@ -15261,18 +15882,20 @@
 bienestarinmobiliarioyaliadas.com, 1
 bienhacerlimpiezas.es, 1
 bienici.com, 1
-biennale.cn, 0
 bienoubien.org, 1
 biensenvue.com, 1
 bienstar.tv, 1
 bienvenidoamerica.com, 1
+bienvenue.tk, 1
 bierbaumer.net, 1
 bierochs.org, 1
 bierwebshop.be, 1
 bieser.ch, 1
 biester.pro, 1
 bietinidesign.be, 1
+bietthudangcap.vn, 1
 bieville-beuville.fr, 1
+biflosgknm.tk, 1
 bifm.de, 1
 bifrost.cz, 1
 biftin.net, 1
@@ -15281,12 +15904,15 @@
 big-file.tk, 1
 big-market.co.il, 1
 big-music.tk, 1
+big-papa.tk, 1
 big-tits-video.ru, 1
 bigalba.ga, 1
 bigambitions.co.za, 1
 bigband.tk, 1
 bigbank.ee, 1
+bigbearkh.com, 0
 bigbeats.tk, 1
+bigbendcoffeeroasters.com, 0
 bigbendguide.com, 1
 bigbenny.tk, 1
 bigbluedoor.net, 1
@@ -15306,9 +15932,11 @@
 bigdatatop.cf, 1
 bigdinosaur.org, 1
 bigdiscounts.tk, 1
+bigeaglesacademy.gq, 1
 bigeasyfences.com, 1
 bigeasygrille.com, 1
 bigfatbetty.com, 1
+bigfreebielist.tk, 1
 bigfuckin.rocks, 1
 biggernews.gq, 1
 biggerpicture.agency, 1
@@ -15318,15 +15946,17 @@
 bigideasnetwork.com, 1
 bigio.com.br, 1
 biglagoonrentals.com, 1
+biglistofporn.com, 1
 biglu.eu.org, 1
-bigmama.travel, 1
 bigmoney.nu, 1
 bigmountainmail.com, 1
 bigone.com, 1
 bigorbitgallery.org, 1
+bigpage.tk, 1
 bigpicture-learning.com, 1
 bigprintinglasvegas.com, 1
 bigpurse.tk, 1
+bigrender.tk, 1
 bigsam.us, 1
 bigserp.com, 1
 bigshopper.com, 1
@@ -15336,7 +15966,6 @@
 bigsisterchannel.com, 1
 bigskylifestylerealestate.com, 1
 bigskymontanalandforsale.com, 1
-bigtexasbeerfest.com, 1
 bigthunder.ca, 1
 bigtimeiq.com, 1
 bigtrucker.co.uk, 1
@@ -15346,10 +15975,13 @@
 bijlesbart.nl, 1
 bijlesportal.nl, 1
 bijloke.gent, 1
+bijlokesite.be, 1
+bijlokesite.gent, 1
 bijou.be, 1
 bijoulux.co.uk, 1
 bijouxcherie.com, 1
 bijuteriicualint.ro, 1
+bijzonderekiekjes.nl, 1
 bijzonderekoorprojecten.nl, 1
 bike-kurse.ch, 1
 bike-liptov.tk, 1
@@ -15361,16 +15993,21 @@
 bikehistory.org, 1
 bikemod.de, 1
 biker.dating, 1
+bikerebel.com, 0
 bikersclub.tk, 1
+bikesandbits.tk, 1
 bikeshopitalia.com, 1
-bikesquadron.com, 0
+bikesquadron.com, 1
 bikestream.tk, 1
+biketrainer.tk, 1
 bikhof.com, 1
 biki.com, 1
+bikini-shop.tk, 1
+bikinibich.tk, 1
+bikinis.tk, 1
 bikiniseli.com, 1
 bikkelbroeders.com, 0
 bikkelbroeders.nl, 0
-bikriads.com, 0
 bikyaku.fun, 1
 bilalic.com, 1
 bilalkilic.de, 1
@@ -15385,6 +16022,7 @@
 biletvkrym.ga, 1
 biletyplus.com, 1
 biletyplus.ua, 1
+bilgiliksel.com, 1
 bilgo.com, 1
 bilibili.link, 1
 bilibili.ooo, 1
@@ -15397,8 +16035,9 @@
 billaud.eu.org, 1
 billboard-panama.ml, 1
 billbuddy.co.uk, 1
-billchen.win, 0
 billcompare.ga, 1
+billcomparison.ga, 1
+billets-avion.tk, 1
 billfazz.com, 1
 billgoldstein.name, 1
 billgradywebdesign.com, 1
@@ -15446,6 +16085,7 @@
 billrobinson.io, 1
 billy.pictures, 1
 billy.wales, 1
+billybob.tk, 1
 billyoh.com, 1
 billywig.stream, 1
 biloxihistoricalsociety.org, 1
@@ -15496,11 +16136,12 @@
 binarystud.io, 1
 binaryvision.tk, 1
 binbin9.com, 1
+binbin9.net, 1
 bind.ch, 1
 binding-problem.com, 1
 bing.com, 1
 bingcheung.com, 1
-bingchunmoli.com, 1
+bingchunmoli.com, 0
 bingedb.com, 1
 bingle.nu, 1
 bingo-wear.com, 1
@@ -15532,6 +16173,8 @@
 bintooshoots.com, 1
 bintube.com, 1
 bio-disinfestazione.it, 1
+bio-farma.net, 1
+bio-feed.org, 1
 bio-place.com, 1
 bio24.si, 0
 bioamtw.com, 1
@@ -15541,12 +16184,9 @@
 biobuttons.ch, 1
 biocal.eu, 1
 biocal.nl, 1
-biocbd.hr, 1
-biocbdolej.pl, 1
-biocbdolio.it, 1
-biocbdolja.se, 1
 biocheminee.com, 1
 bioclaudia.it, 1
+bioconus.com, 1
 biocrafting.net, 1
 biodiagnostiki.clinic, 1
 biodieselbr.com, 1
@@ -15575,6 +16215,7 @@
 biohappiness.com, 1
 bioharmony.ca, 1
 biohazardland.tk, 1
+biohazardonline.tk, 1
 biohazardous.tk, 1
 biointelligence-explosion.com, 1
 biokal-labsystems.eu, 1
@@ -15589,14 +16230,15 @@
 biolack.cf, 1
 biolact.tk, 1
 bioleev.sklep.pl, 1
+biolegsanonims.tk, 1
 bioligo.ch, 0
 biolika.ua, 1
 biolmarket.ru, 1
-biologichemp.com, 1
 biologis.ch, 1
 biologo.club, 1
 biology-colleges.com, 1
 biomag.it, 1
+biomassinfo.jp, 1
 biomathalliance.org, 1
 biomax-mep.com.br, 1
 biomechanics.tk, 1
@@ -15626,7 +16268,9 @@
 biospeak.solutions, 1
 biosphere.cc, 1
 biospw.com, 1
+biotal.ua, 1
 biotanquesbts.com, 1
+biotec.tk, 1
 biotecommunity.com, 1
 bioteebook.com, 1
 biotin.ch, 1
@@ -15647,15 +16291,16 @@
 birdiehosting.nl, 1
 birdslabel.com, 1
 birdsnow.com, 1
+birdygaia.com, 1
 birdymanbestreviews.com, 1
 birgit-rydlewski.de, 1
 birgitandmerlin.com, 1
 birjdid.tk, 1
 birkengarten.ch, 1
 birkenstab.de, 1
-birkenwasser.de, 1
 birkhoff.me, 1
 birlikdayanisma.com, 1
+birmans.tk, 1
 birminghamal911.gov, 1
 birminghamsunset.com, 1
 birosuli.hu, 1
@@ -15666,7 +16311,6 @@
 birthright.host, 1
 birzan.org, 1
 birzman.ga, 1
-bisa-sis.net, 1
 bischoff-mathey.family, 1
 biscuit.town, 1
 biscuitcute.com.br, 1
@@ -15690,6 +16334,7 @@
 bisrockonline.tk, 1
 bissalama.org, 1
 bisschopssteeg.nl, 1
+bistro-dengi.ml, 1
 bistrocean.com, 1
 bistrodeminas.com, 1
 bistroservice.de, 1
@@ -15719,6 +16364,7 @@
 bitcalt.eu.org, 1
 bitcalt.ga, 1
 bitclusive.de, 1
+bitcoin-casino-no-deposit-bonus.com, 1
 bitcoin-casino.monster, 1
 bitcoin-class.com, 1
 bitcoin-daijin.com, 1
@@ -15735,7 +16381,6 @@
 bitcoin.de, 1
 bitcoin.im, 1
 bitcoin.info, 1
-bitcoin.ninja, 1
 bitcoin.org, 1
 bitcoin.us, 1
 bitcoinbitcoin.com, 1
@@ -15762,7 +16407,6 @@
 bitcoinkaufen.me, 1
 bitcoinkaufen.news, 1
 bitcoinkurs.world, 1
-bitcoinlatestnews.today, 1
 bitcoinmakesense.com, 1
 bitcoinnews.digital, 1
 bitcoinnews.guru, 1
@@ -15782,6 +16426,7 @@
 bitcointhefts.com, 1
 bitcoinwalletscript.tk, 1
 bitcoinx.ro, 1
+bitcoinyab.com, 0
 bitcork.io, 1
 bitcqr.io, 1
 bitcrazy.org, 1
@@ -15809,6 +16454,8 @@
 bititrain.com, 1
 bitjunkiehosting.com, 1
 bitking-trading.com, 1
+bitkub-app.com, 1
+bitkub-invest.com, 1
 bitljettnu.gq, 1
 bitlo.com, 1
 bitlo.com.tr, 1
@@ -15826,6 +16473,7 @@
 bitmessage.ch, 1
 bitmexin.com, 1
 bitmidi.com, 1
+bitminer.com.br, 1
 bitminter.com, 1
 bitmix.biz, 1
 bitmoji.com, 1
@@ -15852,7 +16500,6 @@
 bitsandpc.co.za, 1
 bitsellx.com, 1
 bitsight.net, 1
-bitsignal.biz, 1
 bitsite.com, 1
 bitski.com, 1
 bitskins.co, 1
@@ -15865,6 +16512,7 @@
 bitstep.ca, 1
 bitstorm.nl, 1
 bitstorm.org, 1
+bitsum.com, 1
 bitsync.nl, 1
 bitten.pw, 1
 bitterspringscabins.com.au, 1
@@ -15881,28 +16529,25 @@
 bitvps.com, 1
 bitwarden.com, 1
 bitwoci.pt, 1
+bitwok.es, 1
 bitwolk.nl, 1
 bitwrought.net, 1
 bitxel.com.co, 0
 bityes.org, 1
-biuaxia.cn, 1
 biupay.com.br, 1
 biurokarier.edu.pl, 1
-biuromowcow.pl, 1
 biuropulawy.pl, 1
-bivi.us, 1
+bivi.us, 0
 bixbasement.com, 1
 bixbydevelopers.com, 1
 bixmaster.tk, 1
 bixservice.com, 1
-biyou-homme.com, 1
 biysk.ml, 1
 biz-architect.com, 1
 biz-pak.ml, 1
 biz-secrety.gq, 1
 biz-secrety.ml, 1
 biz-seecrets.gq, 1
-biz4x.com, 1
 bizbelarus.tk, 1
 bizeasesupport.com, 1
 bizeau.ch, 1
@@ -15929,18 +16574,23 @@
 biztok.eu, 1
 biztouch.work, 1
 bizzdesign.com, 1
-bizzvisor.site, 1
+bizzit.se, 0
+bizzvisor.site, 0
+bizzybee.buzz, 1
 bjarnerest.de, 1
 bjarno.xyz, 1
 bjc.hu, 1
 bjecard.buzz, 1
 bjelimici.com, 1
 bjfuli.com, 1
+bjl5689.com, 1
+bjl5689.net, 1
 bjl688.cc, 1
 bjmgeek.science, 1
 bjmun.cn, 1
 bjoe2k4.de, 1
 bjolanta.pl, 1
+bjordanov.com, 1
 bjornhelmersson.se, 1
 bjornjohansen.no, 1
 bjrn.io, 1
@@ -15956,7 +16606,6 @@
 bkentertainments.co.uk, 1
 bkgatl.com, 1
 bkhpilates.co.uk, 1
-bkkf.at, 1
 bkkposn.com, 1
 bklaindia.com, 1
 bklynsoap.com, 1
@@ -15965,6 +16614,7 @@
 bkramericas.com, 1
 bkt.to, 1
 bkulup.com, 1
+bl-builder.tk, 1
 bl00.se, 1
 bl4ckb0x.biz, 1
 bl4ckb0x.com, 1
@@ -15975,7 +16625,6 @@
 bl4ckb0x.org, 1
 blaarmeersen.be, 1
 blaauwgeers.pro, 1
-blaauwgeers.travel, 1
 blaauwgeers.wiki, 1
 blabber.im, 1
 blablacar.co.uk, 1
@@ -15996,6 +16645,8 @@
 blablacar.ro, 1
 blablacar.rs, 1
 blablacar.ru, 1
+black-air-rpg.com, 1
+black-blog.com, 1
 black-diamonds.cf, 1
 black-friday.org.il, 1
 black-gay-porn.biz, 1
@@ -16016,9 +16667,9 @@
 blackbam.at, 1
 blackbbwvideos.com, 1
 blackberrycentral.com, 1
-blackberryforums.be, 1
 blackbird-whitebird.com, 1
 blackbirdproperties.tk, 1
+blackboxcity.tk, 1
 blackboxconnections.com, 1
 blackburn.link, 0
 blackbyte.it, 1
@@ -16028,16 +16679,21 @@
 blackchristmas.tk, 1
 blackcicada.com, 1
 blackdiam.net, 1
+blackdot.casa, 1
 blackdown.de, 1
 blackdragoninc.org, 1
+blackeaglenet.tk, 1
 blackedbyte.com, 1
 blackevent.be, 1
 blackfire.io, 1
+blackfirecrew.tk, 1
 blackforeststheoriginal.cf, 1
 blackforlife.me, 1
+blackfridaynew.com, 1
 blackgamelp.de, 1
 blackgate.org, 1
 blackhat.dk, 1
+blackhat.nz, 0
 blackhawkup.com, 1
 blackhealthwealth.com, 1
 blackhelicopters.net, 1
@@ -16049,6 +16705,7 @@
 blackl.net, 1
 blacklane.com, 1
 blacklightparty.be, 1
+blacklodge.tk, 1
 blackmafia.tk, 1
 blackmagic.sk, 1
 blackmagickwitch.com, 1
@@ -16074,6 +16731,7 @@
 blacksheepsw.com, 1
 blacksniffer.tk, 1
 blackspark.tk, 1
+blacksport.ru, 1
 blackstonepress.tk, 1
 blackstrapsecurity.com, 1
 blackstump.xyz, 1
@@ -16094,7 +16752,7 @@
 blackyau.cc, 0
 blackys-chamber.de, 0
 blackzebra.audio, 1
-bladebotlist.xyz, 1
+bladebotlist.xyz, 0
 bladesofteal.com, 1
 blago-sostoyanie.ml, 1
 blago.tk, 1
@@ -16103,6 +16761,7 @@
 blainecosheriff-ok.gov, 1
 blairmitchelmore.com, 1
 blaise.io, 1
+blaizer.tk, 1
 blakecoin.org, 1
 blakekhan.com, 1
 blakezone.com, 1
@@ -16111,13 +16770,13 @@
 blaming.me, 1
 blanboom.org, 1
 blancamartinez.com, 1
-blancodent.com, 1
 blanickymanifest.eu, 1
 blankersfamily.com, 1
 blanket.technology, 1
 blankhang.com, 1
 blankpage.link, 1
 blankpagebiz.com, 1
+blankstore.com.pe, 1
 blankstyle.com, 1
 blantik.net, 1
 blantr.com, 1
@@ -16149,14 +16808,17 @@
 blavaty.tk, 1
 blayne.me, 0
 blayneallan.com, 0
+blazebd.com, 1
 blazeit.io, 1
 blazing.cz, 1
 blazingsaddles.ga, 1
+blazingsuns.tk, 1
 blazor.nl, 1
 blbcleaningservices.com.au, 1
 blbet365.com, 1
 blblblblbl.fr, 1
 bleaching-tipps.de, 1
+bleaklyrics.tk, 1
 bleatingsheep.org, 0
 blechbuexn.de, 1
 bleche-onlineshop.at, 1
@@ -16166,7 +16828,6 @@
 bleepplc.co.uk, 1
 blender.io, 1
 blenderinsider.com, 1
-blenderman.org, 1
 blenderrecipereviews.com, 1
 blenderwallet.io, 1
 blending.kr, 1
@@ -16204,6 +16865,10 @@
 blinds-unlimited.com, 1
 blindscribblings.com, 1
 blindsjoburg.com, 1
+bling9.com, 1
+bling999.cc, 1
+bling999.com, 1
+bling999.net, 1
 blingsparkleshine.com, 1
 blingwang.cn, 0
 blink-security.com, 1
@@ -16214,6 +16879,8 @@
 blinking.link, 1
 blinking.ml, 1
 blinkspeed.eu, 1
+blinniza.tk, 1
+blint.nl, 1
 blio.tk, 1
 bliss.id, 1
 blissbox.com, 1
@@ -16225,6 +16892,7 @@
 blitzarena.io, 1
 blitzga.me, 1
 blitzkrieg.tk, 1
+blitzlotto.tk, 1
 blitzpaintball.net, 1
 blitzvendor.com, 1
 blivawesome.dk, 1
@@ -16272,7 +16940,6 @@
 blockxit.de, 1
 bloemenbesteld.nl, 1
 bloemendal.me, 1
-blog-cannabis.com, 1
 blog-garage.com, 1
 blog-investimenti.it, 1
 blog-ludmily.ml, 1
@@ -16295,13 +16962,12 @@
 blogconcours.net, 1
 blogcosmeticsurgeon.ga, 1
 blogcuaviet.com, 1
+blogdelgloton.com, 1
 blogdelosjuguetes.com, 1
 blogdeyugioh.com, 1
 blogdieconomia.it, 1
 blogdimoda.com, 1
 blogdimotori.it, 1
-blogdolago.com.br, 1
-blogexpert.ca, 1
 bloggermumofthreeboys.com, 1
 bloggersonlinetrainings.tk, 1
 blogging-life.com, 1
@@ -16312,13 +16978,11 @@
 bloginbeeld.nl, 1
 blogit.fi, 1
 bloglogistics.com, 1
-bloglyric.com, 1
 blognews.cf, 1
 blognone.com, 1
 blogofant.de, 1
 blogofapps.com, 1
 blogom.at, 1
-blogomoll.ru, 1
 blogonblogspot.com, 0
 blogpress.co.il, 1
 blogpronto.com.br, 1
@@ -16327,7 +16991,7 @@
 blogsdna.com, 1
 blogsked.com, 1
 blogsnote.xyz, 1
-blogtechnologiczny.pl, 1
+blogtechvn.com, 1
 blogthetindung.com, 1
 blogtroterzy.pl, 1
 bloguser.ru, 1
@@ -16337,13 +17001,16 @@
 blomberg.name, 1
 blomberguk.com, 1
 bloms.de, 1
+blood-kirsche.tk, 1
 blood4pets.tk, 1
+bloodandbones.tk, 1
 bloodhunt.eu, 1
 bloodhunt.pl, 1
 bloodpop.tk, 1
 bloodsports.org, 1
 bloody-hosting.tk, 1
 bloody.pw, 1
+bloodybiz-news.tk, 1
 bloodycraft.ml, 1
 bloom-avenue.com, 1
 bloom.sh, 1
@@ -16361,7 +17028,6 @@
 bltc.net, 1
 bltc.org, 1
 bltc.org.uk, 1
-bltdirect.com, 1
 bluavido.ml, 1
 blubbablasen.de, 1
 blubop.fr, 1
@@ -16373,16 +17039,23 @@
 blue-leaf81.net, 1
 blue-nijmegen.nl, 0
 blue-olive.co.za, 1
+blue-python.tk, 1
 blue42.net, 1
 blueangel.org.tw, 1
 bluebahari.gq, 1
 blueberrywinery.com.au, 0
 bluebie.com, 1
+bluebill.net, 1
+bluebirdjc.com, 1
 bluebirdservice.us, 1
 blueblou.com, 1
 bluebnc.com, 1
 bluecanvas.io, 1
+bluecat.tk, 1
+bluecherry.tk, 1
+bluecoastelectric.com, 1
 bluecoatnetflowsupport.com, 1
+bluecollarfetishwear.com, 1
 bluecrazii.nl, 1
 blued.moe, 1
 bluedeck.org, 1
@@ -16393,11 +17066,13 @@
 bluefuzz.nl, 1
 bluegifts.ro, 1
 bluegrasscleaning.com, 1
+bluegrottoscuba.com, 1
 bluehillhosting.com, 1
 blueimp.net, 1
 bluekrypt.com, 1
 blueliquiddesigns.com.au, 1
 bluemail24.com, 1
+bluemango-studios.com, 1
 bluemanhoop.com, 1
 bluemoonrescue.org, 1
 bluemoonroleplaying.com, 1
@@ -16420,6 +17095,8 @@
 bluerootsmarketing.com, 1
 blues-and-pictures.com, 1
 blues.at, 1
+bluesbarn.tk, 1
+bluesheep.cool, 1
 blueshouse.ro, 1
 blueskybrokerage.tk, 1
 blueskycoverage.com, 1
@@ -16433,6 +17110,7 @@
 bluesunhotels.com, 1
 blueswandaily.com, 1
 bluesync.co, 1
+bluesystem.tk, 1
 bluetexservice.com, 1
 bluetomatographics.com, 1
 bluetoothspecialist.ga, 1
@@ -16454,7 +17132,7 @@
 blumando.de, 1
 blumen-garage.de, 1
 blumenfeldart.com, 1
-blumenreviews.com, 1
+blumenversand.tk, 1
 blumiges-fischbachtal.de, 0
 blummedia.de, 1
 blundell.wedding, 1
@@ -16490,7 +17168,7 @@
 bmros.com.ar, 1
 bmw-motorradclub-seefeld.de, 1
 bmwcolors.com, 1
-bmyjacks.cn, 1
+bmyjacks.cn, 0
 bmzm.nl, 0
 bn4t.me, 1
 bnb-buddy.nl, 1
@@ -16508,7 +17186,16 @@
 bnzblowermotors.com, 1
 bo-rad.de, 1
 bo1689.com, 0
+bo1689.net, 1
 bo4tracker.com, 1
+bo9club.cc, 1
+bo9club.com, 1
+bo9club.net, 1
+bo9fun.com, 1
+bo9fun.net, 1
+bo9game.com, 1
+bo9game.net, 1
+bo9king.net, 1
 boanastudio.com, 1
 boardfree.tk, 1
 boardgameforces.com, 1
@@ -16529,6 +17216,7 @@
 bobazar.com, 0
 bobbleheads.com, 1
 bobbyblueplumbing.com, 1
+bobbyfischer.tk, 1
 bobbyhensley.com, 1
 bobbyrobinson.tk, 1
 bobcoffee.com.br, 1
@@ -16581,8 +17269,8 @@
 bodybuildingworld.com, 1
 bodyconshop.com, 1
 bodygearguide.com, 1
+bodymod.tk, 1
 bodymusclejournal.com, 1
-bodypainter.pl, 1
 bodypainting.waw.pl, 1
 bodyshaping.ml, 1
 bodyshopnews.net, 1
@@ -16601,7 +17289,7 @@
 boevik.ml, 1
 bofashion.site, 1
 boffin.tk, 1
-bofoxdesign.com, 1
+bofoxdesign.com, 0
 bogazreflusu.com, 1
 bogdanbiris.com, 1
 bogdancornianu.com, 1
@@ -16624,15 +17312,16 @@
 boip.in, 1
 boiseonlinemall.com, 1
 boizeau.fr, 1
+bojan.tk, 1
 bojanowskiszkolka.pl, 1
 bojiu99.cc, 1
 bokadoktorn-test.net, 1
 bokadoktorn.se, 1
 boke112.com, 1
+bokhylle.eu, 1
 bokka.com, 1
 bokkeriders.com, 1
 boksburgplumber24-7.co.za, 1
-boksburgplumbing.co.za, 1
 bokutake.com, 1
 bol.io, 1
 bolalocobrews.co.uk, 1
@@ -16655,8 +17344,11 @@
 bollywoodgk.tk, 1
 bollywoodstrot.tk, 1
 bologna-disinfestazioni.it, 1
+bologoe.tk, 1
 bololo.fun, 1
 bololo.online, 1
+bolosbatiente.tk, 1
+bolotnaya.online, 1
 bolovegna.it, 1
 bolsa.tk, 1
 bolsashidrosolubles.com, 1
@@ -16672,6 +17364,7 @@
 bomb.codes, 1
 bombard.ga, 1
 bombe-lacrymogene.fr, 1
+bomberosceuta.tk, 1
 bomberus.de, 1
 bombgame.tk, 1
 bombgirls.cf, 1
@@ -16682,7 +17375,6 @@
 bomhard.net, 1
 bomhard.org, 1
 bompus.com, 1
-bomull.co, 1
 bonaccorso.eu, 1
 bonaemi.ga, 1
 bonami.cz, 1
@@ -16694,6 +17386,7 @@
 bonawehouse.co.uk, 1
 bonbini.ga, 1
 bonbonmania.com, 0
+bonbonshop.ro, 1
 bonchaboncha.com.tw, 1
 bondagefetishstore.com, 1
 bondank.com, 1
@@ -16702,6 +17395,7 @@
 bondpro.gov, 1
 bondscript.tk, 1
 bondskampeerder.nl, 1
+bonebreakers.tk, 1
 bonebunny.de, 1
 boneko.de, 1
 bonesserver.com, 1
@@ -16713,11 +17407,12 @@
 bongloy.com, 1
 bongo.cat, 1
 bongocams.webcam, 1
+bongoland.tk, 1
 bongoo.fr, 1
-bongproperty.com, 1
 bonic.tk, 1
 bonifatius-friedrich.de, 1
 bonita.com.br, 1
+bonitamacas.tk, 1
 bonito.pl, 1
 bonkleagues.ml, 1
 bonn.digital, 1
@@ -16737,11 +17432,10 @@
 bonsaiclubsanvi.tk, 1
 bonsaimedia.nl, 1
 bonsi.net, 1
+bonukset.cf, 1
 bonus-kran.tk, 1
 bonus.ca, 1
 bonus.net.nz, 1
-bonus.pl, 1
-bonusdigital.id, 1
 bonusov.tk, 1
 bonusup.tk, 1
 bonux.co, 1
@@ -16761,6 +17455,7 @@
 bookingworldspeakers.com, 1
 bookkeepingsolutions.com.au, 1
 bookluk.com, 1
+bookmark.gq, 1
 bookofdenim.com, 1
 bookourdjs.com, 1
 bookreport.ga, 1
@@ -16776,7 +17471,6 @@
 bookstores.gq, 1
 bookstrap.ga, 1
 booktoan.com, 1
-booktracker-org.appspot.com, 1
 bookworld.gr, 1
 bookzaga.com, 1
 bool.be, 1
@@ -16810,12 +17504,12 @@
 boostdesign.tk, 1
 boostgame.win, 1
 boostplm.com, 1
-boostrpro.pl, 1
 booter.pw, 1
 bootina.com, 1
 bootjp.me, 0
 bootlesshacker.com, 1
 bootspropertycentral.co.uk, 1
+bootswinter.tk, 1
 boozinyan.com, 1
 bopiweb.com, 1
 bopyx.com, 0
@@ -16862,15 +17556,12 @@
 borriquillacuenca.tk, 1
 borsodsakk.hu, 1
 bortebest.no, 1
-boryanaruse.eu, 1
 borysek.net, 1
 borysenko.se, 1
 borza.blog, 0
-borza.ro, 1
-borza.us, 1
 borzaresearch.com, 1
 borzov.tk, 1
-bosabosa.org, 1
+bosabosa.org, 0
 bosattondskap.tk, 1
 boscbooks.com, 1
 boschee.net, 1
@@ -16884,6 +17575,7 @@
 boskeopolis-stories.com, 1
 bosnia-online.tk, 1
 bospor.tk, 1
+bosquedelasimagenes.tk, 1
 boss.az, 1
 bossbabe.com, 1
 boston-sailing.com, 1
@@ -16897,6 +17589,7 @@
 bosun.io, 1
 bot-manager.pl, 1
 bot-socket.tk, 1
+botanical-design.nl, 1
 botbrother.ml, 1
 botcamp.org, 1
 botcop.de, 1
@@ -16905,7 +17598,6 @@
 botelegram.tk, 1
 botezdepoveste.ro, 1
 botguard.net, 1
-bothellwaygarage.net, 1
 bothive.io, 1
 boticadiservicio.com, 1
 botikadiservisio.com, 1
@@ -16986,7 +17678,6 @@
 bouncewrightcastles.co.uk, 1
 bouncincastles.co.uk, 1
 bouncing4joy.co.uk, 1
-bouncingbairnsinflatables.co.uk, 1
 bouncingbeansinflatables.co.uk, 1
 bouncingbuddiesleicester.co.uk, 1
 bouncingbuzzybees.co.uk, 1
@@ -17043,6 +17734,8 @@
 bounty.fund, 1
 bounty.software, 1
 bountyfactory.io, 1
+bountyhuntermetaldetector.tk, 1
+bountyx.com, 1
 bourasse.fr, 1
 bourbo.net, 1
 bourestonmedia.com, 1
@@ -17059,6 +17752,7 @@
 bouvier-des-flanders.com, 1
 bouville.fr, 1
 bouw.live, 1
+bouwbedrijfdevor.nl, 1
 bouwhuisman.nl, 1
 bouzouada.com, 1
 bouzouks.net, 1
@@ -17076,8 +17770,10 @@
 boxcryptor.com, 0
 boxdevigneron.fr, 1
 boxdropcc.com, 1
+boxeomexicano.tk, 1
 boxerdogsaspets.com, 1
 boxethaishop.com, 1
+boxing-kangaroo.ga, 1
 boxintense.com, 1
 boxlink.de, 1
 boxlitepackaging.com, 1
@@ -17102,6 +17798,7 @@
 boz.nl, 0
 bozdech.eu, 1
 bozdoz.com, 1
+bozenadusseau.tk, 1
 bozhok.tk, 1
 bozit.com.au, 1
 bp-wahl.at, 1
@@ -17112,6 +17809,7 @@
 bpedia.org, 1
 bphostels.com, 1
 bpisites.eu, 1
+bplan.tk, 1
 bpo.ovh, 1
 bpol-forum.de, 1
 bpreguica.com.br, 1
@@ -17136,9 +17834,11 @@
 brabank.no, 1
 brabank.se, 1
 bracebridgechiro.com, 1
+braceletcuivre.com, 1
 braces-supports.tk, 1
 bracho.xyz, 1
 brachotelborak.com, 1
+bracken.jp, 1
 brackets-salad.com, 1
 bracknellvets.co.uk, 1
 bradbrockmeyer.com, 1
@@ -17150,6 +17850,7 @@
 bradler.net, 0
 bradleyeaton.com, 1
 bradlinder.org, 1
+bradstafford.com, 1
 bradypatterson.com, 1
 braemer-it-consulting.de, 1
 braeunlich-gmbh.com, 1
@@ -17168,6 +17869,7 @@
 braindiamond.com, 1
 braindiamonds.com, 1
 braineet.com, 1
+brainfork.org, 1
 brainhealth.gov, 1
 brainhub.nl, 1
 brainit.at, 1
@@ -17184,7 +17886,6 @@
 braintensive.com, 1
 braintonus.tk, 1
 brainvation.de, 1
-brainvoyagermusic.com, 1
 brainwav.es, 1
 brainwork.space, 1
 brajenovic.com, 1
@@ -17227,6 +17928,7 @@
 brando753.xyz, 1
 brandon-manilow.tk, 1
 brandon.so, 0
+brandoncricket.tk, 1
 brandondivorcelawyer.com, 1
 brandongomez.me, 1
 brandonhaynesmd.com, 1
@@ -17239,18 +17941,22 @@
 brandonwalker.me, 1
 brandpit.nl, 1
 brandrocket.dk, 1
+brands-clothings.tk, 1
+brandsclub.tk, 1
 brandstead.com, 1
 brandt.tech, 1
 brandtechdesign.co.uk, 1
 brandtrapselfie.nl, 1
 brandweer-sgravendeel.tk, 1
 brandweerbarboek.nl, 1
+brandweerfraneker.nl, 1
 brandweergent.be, 1
 brandweertrainingen.nl, 1
 brandweeruitgeest.nl, 1
 brandweerweb.tk, 1
 brandweerzonecentrum.be, 1
-brandwidth.com, 1
+branefive.com, 1
+braniebananie.nl, 1
 brank.as, 1
 branno.org, 1
 bransive.com.au, 1
@@ -17267,6 +17973,8 @@
 brasilmobi.cf, 1
 brasiltopnews.tk, 1
 brasilwear.biz, 1
+brasilweb.tk, 1
+braslet-bianshi.tk, 1
 brasserie-mino.fr, 1
 brasspipedreams.org, 1
 bratan.ga, 1
@@ -17287,6 +17995,7 @@
 brave-foods.com, 0
 brave.com, 1
 bravebaby.com.au, 1
+bravebiz-news.tk, 1
 bravebooks.berlin, 1
 bravehearts.org.au, 1
 bravelittlesquirrel.com, 1
@@ -17297,6 +18006,7 @@
 bravobet.et, 1
 brawny.com, 1
 braxtonehle.com, 1
+braychappell.com, 1
 brazenfol.io, 1
 brazilhealth.com.br, 1
 brazilian.dating, 1
@@ -17313,9 +18023,13 @@
 breadofgod.org, 1
 breadpirates.chat, 1
 breakberlin.tk, 1
+breakcraft.tk, 1
 breakerlink.com, 1
+breakeven.tk, 1
+breakfree.tk, 1
 breaking-security.net, 1
 breakingnewskenya.tk, 1
+breakingsfnews.com, 1
 breakingtech.fr, 0
 breakingvap.fr, 1
 breakout.careers, 1
@@ -17327,8 +18041,11 @@
 breathedreamgo.com, 0
 breathfinder.io, 1
 breathingblanket.com, 1
+breathingsound.ml, 1
+breathlesssheranda.tk, 1
 brechadigital.tk, 1
 brecht.ch, 1
+brechtheldens.xyz, 1
 breckle.com.ua, 1
 brecknell.biz, 1
 brecknell.com, 1
@@ -17356,17 +18073,23 @@
 bremermaschinenbau.de, 1
 brenbarnes.com, 1
 brenbarnes.com.au, 1
+brendabecker.com, 1
 brendansbits.com, 0
 brendanscherer.com, 1
+brenden.net.au, 0
 brentacampbell.com, 1
+brentalbright.tk, 1
 brentnewbury.com, 1
 breonart.com, 1
 breshka.be, 1
 bressier.fr, 1
 brest-bel.tk, 1
+brest-biz-belarus.tk, 1
+brest-brest.tk, 1
 brest-master.tk, 1
 brest-news.tk, 1
 brest-region.tk, 1
+brest24.tk, 1
 brestnews.tk, 1
 brestradio.tk, 1
 brestshop.tk, 1
@@ -17417,8 +18140,10 @@
 brianwesaala.com, 0
 brianwilson.tk, 1
 briarproject.org, 1
+bribriescolawfirm.com, 1
 brickadia.com, 1
-brickftp.com, 1
+brickland.tk, 1
+bricks-clicks.com, 1
 bricks4kidzelearn.com, 1
 bricksandmotor.co.uk, 1
 brickstreettrio.com, 1
@@ -17430,6 +18155,7 @@
 bricolea.fr, 1
 bricomium.com, 1
 brid.gy, 0
+bridal.tk, 1
 bridalfabrics.co.uk, 1
 bridalfabrics.com, 1
 bridalfabrics.fr, 1
@@ -17460,13 +18186,16 @@
 bridltaceng.com, 1
 brie.tech, 1
 briefassistant.com, 1
+briefbiz-news.tk, 1
 briefvorlagen-papierformat.de, 1
 briellenj.gov, 1
 briffoud.fr, 1
+brigadasazules.tk, 1
 brigade-electronics.com, 1
 brigantinebeachguide.com, 1
 briggsleroux.com, 1
 brighouse-leisure.co.uk, 1
+brightbiz-news.tk, 1
 brightday.bz, 1
 brightendofleasecleaning.com.au, 1
 brighterimagelab.com, 1
@@ -17476,6 +18205,7 @@
 brightonbank.com, 0
 brightonbouncycastles.net, 1
 brightonchilli.org.uk, 1
+brightonfc.tk, 1
 brightonhoney.com, 1
 brightpool-markets.com, 1
 brightside.com, 1
@@ -17484,6 +18214,8 @@
 brightview.net.cn, 1
 brightwhiz.com, 1
 brightworkcreative.com, 1
+brightzonecleaning.com.au, 1
+brightzoneofficecleaning.com.au, 1
 brigidaarie.com, 1
 brigittaseasons.com, 1
 brigitte.nyc, 1
@@ -17491,6 +18223,7 @@
 brigittefontaine.tk, 1
 brilalux.pe, 1
 briliant.tk, 1
+brilliant-minds.tk, 1
 brilliantbouncyfun.co.uk, 1
 brilliantproductions.co.nz, 1
 brillio.com, 1
@@ -17503,6 +18236,7 @@
 brinkbem.com, 1
 brinkhu.is, 1
 brinksurl.com, 1
+brinokidzonline.tk, 1
 brio-shop.ch, 1
 brio-ukraine.store, 1
 brio.news, 1
@@ -17519,7 +18253,6 @@
 bristolandwestonsuperbounce.com, 1
 brit-thoracic.org.uk, 1
 britania.tk, 1
-britanniacateringyeovil.co.uk, 1
 britanniapandi.com, 1
 britelocate.com, 1
 britishbee.org.uk, 1
@@ -17543,6 +18276,7 @@
 britishsnoring.co.uk, 1
 britney-galaxy.com, 1
 britneyclause.com, 1
+britneymanias.tk, 1
 britneyuniverse.com, 1
 britofootball.com, 1
 brittanyferriesnewsroom.com, 1
@@ -17562,9 +18296,11 @@
 broadbandchoices.co.uk, 1
 broadbandforum.co, 1
 broadbandnd.com, 1
+broadbiz-news.tk, 1
 broadleft.org, 1
 broadmooroutfitters.com, 1
 broadsheet.com.au, 1
+broadwayfamilydentalpc.com, 1
 broadwayvets.co.uk, 1
 broadyexpress.com.au, 1
 broca.io, 0
@@ -17581,13 +18317,16 @@
 broeselei.at, 0
 broilertrade.com, 1
 brojagraphics.de, 1
+brokenbiz-news.tk, 1
 brokenhands.io, 1
 brokenminds.tk, 1
+brokentoaster.tk, 1
 brokerdecredite.ro, 1
 brokernet.ie, 0
 brokernotes.co, 1
 brokerstalk.com, 1
 brokgency.com, 1
+broland.ca, 1
 brols.eu, 1
 bromo.cf, 1
 brompton-cocktail.com, 1
@@ -17595,18 +18334,22 @@
 bronevichok.ru, 1
 bronn.ee, 1
 bronwynlewis.com, 1
+bronx-ny-dentist.com, 1
 broodbesteld.nl, 1
 broodingblogger.com, 1
 brookes.xyz, 1
 brookframework.org, 1
+brooklynabortionclinic.nyc, 1
 brooklynboyblues.cf, 1
 brooklyncosmetics.net, 1
 brooklynentdoc.com, 1
+brooklyngynplace.com, 1
 brooklynrealestateblog.com, 1
 brooklyntheborough.com, 1
 brookscountyga.gov, 1
 brookworth.com, 0
 brosay-legko.ml, 1
+brosephstalin.com, 1
 brossman.it, 1
 brossmanit.com, 1
 brouillard.ch, 0
@@ -17626,6 +18369,7 @@
 brownrice-life.com, 1
 brownsgroup.com, 1
 brownsprinkler.com, 1
+browntiger.tk, 1
 browntowncountryclub.com, 1
 brownwolfstudio.com, 1
 browsbybecca.ca, 1
@@ -17642,8 +18386,8 @@
 bruce-springsteen.tk, 1
 brucebenes.com, 1
 brucekovner.com, 1
+bruceleeitems.com, 1
 brucemartin.net, 1
-brucherlaw.lu, 1
 bruckmuehler-kanu-club.de, 1
 bruckner.li, 1
 brudkista.nu, 1
@@ -17656,6 +18400,7 @@
 brujonegroperuano.com, 1
 brun.rocks, 1
 bruna-cdn.nl, 1
+brunamarquezine.tk, 1
 brunanet.tk, 1
 brunchandmatch.be, 1
 brunetderochebrune.com, 0
@@ -17666,6 +18411,7 @@
 brunner.ninja, 1
 brunoamaral.eu, 1
 brunoarruda.com.br, 0
+brunocesarlima.com.br, 1
 brunodomingos.com, 1
 brunolt.nl, 1
 brunoproduit.ch, 0
@@ -17703,7 +18449,6 @@
 brzy-svoji.cz, 1
 bs-network.net, 1
 bs-security.com, 1
-bs.sb, 1
 bs.to, 1
 bs3xy.com, 1
 bsa-dom.ru, 1
@@ -17720,6 +18465,7 @@
 bscquimicos.com.br, 1
 bscyb.ch, 1
 bsd-box.net, 1
+bsd-sec.com, 1
 bsd.com.ro, 1
 bsdes.net, 1
 bsdfreak.dk, 1
@@ -17728,7 +18474,7 @@
 bsdug.org, 1
 bsdunix.xyz, 1
 bsee.gov, 1
-bserved.de, 1
+bserved.de, 0
 bsf-knowledgecity.com, 1
 bsg.ro, 1
 bsgamanet.ro, 1
@@ -17761,6 +18507,7 @@
 bsuess.de, 1
 bsurfcr.com, 1
 bsuru.xyz, 1
+bsvfincorp.com, 1
 bsw-solution.de, 1
 bsystem.net, 1
 bszoft.hu, 1
@@ -17773,8 +18520,6 @@
 bt3658.com, 1
 bt780.com, 1
 bta.lv, 0
-bta00.com, 1
-bta55.com, 1
 btc-alpha.com, 1
 btc-doge.ga, 1
 btc-wallet.tk, 1
@@ -17785,8 +18530,6 @@
 btcp.space, 1
 btcpop.co, 1
 btcshower.com, 1
-btdays.com, 1
-btddd.com, 1
 btdproductions.tk, 1
 bth.wtf, 1
 bthub.site, 1
@@ -17794,6 +18537,7 @@
 btine.tk, 1
 btio.pw, 0
 btku.org, 1
+btln.cloud, 1
 btln.de, 1
 btmstore.com.br, 1
 btnissanparts.com, 1
@@ -17802,6 +18546,7 @@
 btraviswright.com, 1
 btraviswrightmps.com, 1
 btrb.ml, 1
+btrfs.no, 1
 btsapem.com, 1
 btshe.net, 1
 btslr.co, 1
@@ -17810,23 +18555,20 @@
 btsource.tk, 1
 btsous.org, 1
 btsow.com, 0
+btssiou.xyz, 1
 btsybt.com, 0
 btt-39.com, 1
 btt-59.com, 1
 btt2020.com, 1
-btt2121.com, 1
 btt217.com, 1
-btt2525.com, 1
 btt3311.com, 1
 btt381g.com, 1
 btt686.com, 1
-btt7676.com, 1
 btt8.me, 1
 btt88.net, 1
 btt882.com, 1
 btt88818.com, 1
 btt907.com, 1
-btt9090.com, 1
 btt918958.com, 1
 btta13.com, 1
 btta16.com, 1
@@ -17847,15 +18589,16 @@
 bubba.cc, 1
 bubbelwafel.nl, 1
 bubblegumblog.com, 1
+bubblelist.tk, 1
 bubblespetspa.com, 1
 bubblin.io, 1
 bubblinghottubs.co.uk, 1
 bubblybouncers.co.uk, 1
 bubet365.com, 1
 bubhub.io, 1
+bubnovsky.org, 1
 bubsngrubs.com.au, 1
 bubu1.eu, 1
-bubucmoi.dynu.net, 1
 bubulazi.com, 0
 bubulazy.com, 1
 bucek.cz, 1
@@ -17864,12 +18607,14 @@
 buchhaltung-muehelos.de, 1
 buchwegweiser.com, 1
 buck-hydro.de, 1
+buck.com, 1
 buckanddoe.farm, 1
 buckdoeand.co, 1
 bucket.tk, 1
 buckethead.tk, 1
 bucketlist.co.ke, 1
 buckfast.tk, 1
+buckthorn.ml, 1
 buckypaper.com, 1
 buda.com, 1
 budaev-shop.ru, 1
@@ -17909,6 +18654,7 @@
 budowle.pl, 1
 buena-vista.cz, 1
 buena.me, 1
+buenosproductos.net, 1
 bueny.com, 1
 bueny.net, 1
 buerger-lenke.de, 1
@@ -17927,6 +18673,7 @@
 buffup.media, 1
 buffus.cz, 1
 bufla.net, 1
+bufo.tk, 1
 bug.blue, 1
 bug.ee, 1
 bug321.com, 1
@@ -17941,7 +18688,6 @@
 bugreader.com, 1
 bugs.chromium.org, 1
 bugsmashed.com, 1
-bugu.org, 1
 buguardian.com, 1
 bugwie.com, 1
 bugzil.la, 1
@@ -17949,12 +18695,15 @@
 buhayguro.com, 1
 buhayprincipal.com, 1
 buhonline.ru, 1
+buick1958.tk, 1
 build.chromium.org, 1
 buildbackbetter.com, 1
+buildbackbetter.gov, 1
 buildbytes.com, 1
+buildconcierge.ga, 1
+builderrentals.com, 1
 buildhoscaletraingi.com, 1
 building-cost-estimators.com, 1
-buildingbitcoin.org, 1
 buildingclouds.de, 1
 buildingcostestimators.co.uk, 1
 buildingmaterials.tk, 1
@@ -17967,6 +18716,7 @@
 buildmorebuslanes.com, 1
 buildnews.tk, 1
 buildplease.com, 1
+buildpriceoption.com, 1
 builds.gg, 1
 buileo.com, 1
 builterra2.azurewebsites.net, 1
@@ -18002,10 +18752,13 @@
 bulktshirtsjohannesburg.co.za, 1
 bull.id.au, 0
 bulldog-hosting.de, 0
+bulldogkennel.tk, 1
+bulldogscuba.com, 1
 bulledair-savons.ch, 0
 bulletbabu.com, 0
 bulletpoint.cz, 1
 bullettags.com, 1
+bullfitta.tk, 1
 bullpendaily.com, 1
 bullseyemetrics.com, 1
 bullterrier.nu, 1
@@ -18035,11 +18788,12 @@
 bungabuket.com, 1
 bungaspa.com, 1
 bungee.pw, 1
-bungus.space, 1
 bunix.de, 0
+bunker307.tk, 1
 bunkyo-life.com, 1
-bunniesoflasvegas.com, 1
+bunniesoflasvegas.com, 0
 bunny-rabbits.com, 1
+bunnybloythost.com, 1
 bunnycarenotes.com, 1
 bunnydiamond.de, 1
 bunnymud.com, 1
@@ -18053,6 +18807,7 @@
 bupropion.com, 1
 bupropionhclsr.ga, 1
 buqi.cc, 1
+buquesdeguerra.tk, 1
 buradangonder.com, 1
 burakogun.com, 0
 burakogun.com.tr, 0
@@ -18066,7 +18821,9 @@
 burcevo.info, 1
 burchfabrics.com, 1
 burdine-andersoninc.com, 1
+burdurhaber.tk, 1
 bureaugoodwork.nl, 1
+bureauscript.nl, 1
 bureaux-entrepots.fr, 1
 bureniemoscow.ru, 1
 burenvoorburen.gent, 1
@@ -18075,10 +18832,12 @@
 burg-hohnstein.info, 1
 burgawnc.gov, 1
 burgerbites.be, 1
+burgerbudget.gent, 1
 burgernet.nl, 1
 burgers.io, 1
 burghardt.pl, 1
 burghtstam.tk, 1
+burgoslacrosse.tk, 1
 burgundia.pl, 1
 buri.be, 1
 burialinsurancenetwork.com, 1
@@ -18091,12 +18850,14 @@
 burkow.ru, 1
 burlapsac.ca, 1
 burling.cz, 1
+burmania.tk, 1
 burmeister-gmbh.de, 1
 burmesecatscare.com, 1
 burmesepythonpet.com, 1
 burncorp.org, 1
 burnerfitness.com, 1
 burnimage.co.uk, 1
+burning-wheels.tk, 1
 burningbird.net, 1
 burningflame.tk, 1
 burningflipside.com, 0
@@ -18108,6 +18869,7 @@
 burreli.tk, 1
 burroughsid.com, 1
 bursamusik.tk, 1
+burtai.com, 1
 burtrum.family, 1
 burtrum.me, 1
 burtrum.name, 1
@@ -18115,6 +18877,7 @@
 burunucu.ga, 1
 buryat-mongol.cf, 1
 buryatia.tk, 1
+burz.media, 1
 burz.net, 1
 burz.one, 1
 burzcast.media, 1
@@ -18126,9 +18889,12 @@
 burzum.ch, 1
 busanhs.bid, 1
 buscacpf.se, 1
+buscaebooks.tk, 1
 buscalotodo.com, 1
 buscandolosmejores.com, 1
+buscarcarros.com.br, 1
 buscasimple.com, 1
+buscatodo.tk, 1
 buscolu.tk, 1
 buscoop.co, 1
 buselefante.tk, 1
@@ -18150,6 +18916,7 @@
 business.facebook.com, 0
 business.gov, 0
 businessamongus.com, 1
+businessanalytics24.com, 1
 businesscentermarin.ch, 0
 businesscircle.com.my, 0
 businessconnect.ml, 1
@@ -18161,10 +18928,12 @@
 businessfurs.info, 1
 businessgram.eu, 1
 businessgrants.gov.sg, 1
+businessgrowthleaders.com, 1
 businesshub.cz, 0
 businessimmigration-eu.com, 1
 businessimmigration-eu.ru, 1
 businessinvest.cf, 1
+businessjaunt.com, 1
 businessk.ml, 1
 businessloanconnection.org, 0
 businessmarketingblog.org, 1
@@ -18182,6 +18951,7 @@
 buspark.com, 1
 buspark.cz, 1
 busphotos.tk, 1
+busstation.tk, 1
 bustabit.com, 1
 bustadice.com, 1
 bustany.org, 1
@@ -18196,6 +18966,7 @@
 busyon.cloud, 1
 butarque.es, 1
 butcherpaxtattoo.com, 1
+butik-mechty.tk, 1
 butikvip.ru, 1
 butlercountyhistory.org, 1
 butlerdisposal.com, 1
@@ -18217,6 +18988,7 @@
 butzies.ddnss.org, 1
 buurtgenotencollectief.nl, 1
 buurtkeukens.nl, 1
+buurtpreventiefraneker.nl, 1
 buxum-communication.ch, 0
 buy-aleve.gq, 1
 buy-amitriptyline.tk, 1
@@ -18231,6 +19003,7 @@
 buy-indocin.cf, 1
 buy-jeansbiz.tk, 1
 buy-lasix-without-a-doctor-s-prescription.ga, 1
+buy-lingerie.tk, 1
 buy-lipitor.tk, 1
 buy-los-angeles-auto-insurance.com, 1
 buy-out.jp, 1
@@ -18266,8 +19039,10 @@
 buycafergot.ml, 1
 buycarpet.shop, 1
 buycbd.store, 1
+buycccam.tv, 1
 buycheapandlow.tk, 1
 buycialissmx.tk, 1
+buycitalopram.ga, 1
 buyclaritin.ml, 1
 buycompanyname.com, 1
 buycook.shop, 1
@@ -18277,6 +19052,7 @@
 buydeltasone.ga, 1
 buydeltasone.ml, 1
 buydiamox.cf, 1
+buydiflucan.ga, 1
 buydiflucan.ml, 1
 buydissertations.com, 1
 buyebook.xyz, 1
@@ -18311,6 +19087,7 @@
 buyprilosec.tk, 1
 buyprofessional.shop, 1
 buypropecia.cf, 1
+buyproperty.az, 1
 buyproscaronlinecanada.ga, 1
 buyprovera.tk, 1
 buyprozac.cf, 1
@@ -18348,7 +19125,7 @@
 buzzhub.tk, 1
 buzzkuri.com, 1
 buzzmedianetworks.com, 1
-buzzpop.tv, 1
+buzzpop.tv, 0
 buzzprint.it, 1
 buzzword24.de, 1
 bv-driver.tk, 1
@@ -18387,6 +19164,7 @@
 bwin369.cc, 1
 bwin58.cc, 1
 bwl-earth.club, 1
+bwm.ro, 1
 bwmcnc.com, 1
 bws16.de, 1
 bwserhoscaletrainaz.com, 1
@@ -18433,6 +19211,7 @@
 byootify.com, 1
 bypass.kr, 1
 bypass.sh, 1
+bypassgfw.tk, 1
 bypetula.cz, 1
 byraje.com, 1
 byrddogpaving.com, 1
@@ -18476,11 +19255,14 @@
 bytheglass.gr, 1
 bythen.cn, 0
 bytheswordinc.com, 1
+bytovetextilie.cz, 1
 bytrain.net, 1
 bytwork.com, 1
 byuro.org, 1
+byvdev.com, 1
 byvshie.com, 1
 byw.cymru, 1
+bywin9.com, 1
 byxong.com, 1
 bzbet365.com, 1
 bzh.tf, 1
@@ -18496,6 +19278,7 @@
 c-3po.fr, 1
 c-aeroconsult.com, 1
 c-c-europeen.org, 1
+c-chaud.com, 1
 c-g-h.net, 1
 c-ma-copro.com, 1
 c-netsys.fr, 1
@@ -18505,8 +19288,8 @@
 c-style.net, 1
 c-world.co.uk, 1
 c.cc, 1
+c.im, 1
 c00ke.com, 1
-c01webapp.com, 1
 c057cl7.com, 1
 c0rn3j.com, 1
 c0rporation.com, 1
@@ -18517,7 +19300,6 @@
 c2o2.xyz, 1
 c3.pm, 1
 c30019.com, 1
-c30365.com, 1
 c35.design, 1
 c36533.com, 1
 c3boc.com, 1
@@ -18534,7 +19316,6 @@
 c3vo.de, 0
 c3w.at, 1
 c3wien.at, 1
-c3woc.de, 0
 c4539.com, 1
 c4dstudio.com, 1
 c4k3.net, 1
@@ -18543,9 +19324,9 @@
 c52iv.com, 1
 c5h8no4na.net, 1
 c6729.co, 1
+c6729.com, 1
 c6957.co, 1
 c7dn.com, 1
-c7n.ch, 1
 c7ra.com, 1
 c81365.com, 1
 c82365.com, 1
@@ -18555,6 +19336,7 @@
 c9397.com, 1
 c9721.com, 1
 c9728.co, 1
+ca-canovelles.tk, 1
 ca-key.de, 1
 ca-saintdie.fr, 1
 ca.gparent.org, 1
@@ -18579,6 +19361,7 @@
 cabezadeframontanos.tk, 1
 cabezadelcaballo.tk, 1
 cabina-photobooth.ro, 1
+cabincrewcareercenter.com, 1
 cabineritten.nl, 1
 cabinet-life.fr, 0
 cabinetfurnituree.com, 1
@@ -18590,13 +19373,13 @@
 caboodle-technology.co.uk, 1
 cabooneconstruction.com, 1
 cabosaferide.com, 1
+caboverde.tk, 1
 cabrachicagritona.tk, 1
 cacao-chocolate.com, 1
 cacao.supply, 1
 cacaogenomedb.org, 1
 cacaolalina.com, 1
 cacaumidade.com.br, 1
-cacavazamentomillclean.com, 1
 cachacacha.com, 1
 cachacasantaterezinha.com.br, 1
 cache-checker.com, 1
@@ -18604,6 +19387,8 @@
 cachethome.com, 1
 cachetur.no, 1
 cackette.com, 1
+cacombos.com, 1
+cacoriccionline.tk, 1
 cacr.pw, 1
 cacrm.com, 1
 cactusarium.tk, 1
@@ -18628,15 +19413,14 @@
 cadmanlaw.com, 1
 cadmax.pro, 1
 cadmechanic.com, 1
+cadonet.tk, 1
 cadooz.com, 1
 cadoth.net, 1
 cadovod.tk, 1
 cadra.nl, 1
 cadre.com, 1
 cadsys.net, 1
-cadusilva.com, 1
 cadventura.com, 1
-caeas.com.mx, 1
 caerostris.com, 1
 caesarkabalan.com, 1
 caetanobenet.es, 1
@@ -18651,6 +19435,7 @@
 cafe-musica.org, 1
 cafe-pauline.de, 1
 cafe-service.ru, 0
+cafeamazon.tk, 1
 cafechesscourt.com, 1
 cafedelcielo.co, 1
 cafedupont.be, 1
@@ -18671,13 +19456,15 @@
 cafeterasbaratas.net, 1
 cafethevibes.com, 1
 caffe.ga, 1
-caffegalleria.com, 1
+caffeinate.co.uk, 1
 caffeinatedengineers.com, 1
 caffeinefiend.org, 1
 caffewasyl.pl, 1
 cafled.org, 1
+cagivaclub.tk, 1
 caglarcakici.com, 1
 cahfee.com, 1
+cai4cai.ml, 1
 caiben.org, 1
 caibi.io, 1
 caijunyi.net, 0
@@ -18690,11 +19477,13 @@
 cairogyms.com, 1
 cairohost.ml, 1
 cais.de, 1
+caise.tk, 1
 caivps.com, 1
 caiwenjian.xyz, 1
 caizx.com, 0
 caja-pdf.es, 1
 cajadecoloreshome.com, 1
+cajadelparque.tk, 1
 cajamarca.blog, 1
 cajio.ru, 1
 cajunuk.co.uk, 1
@@ -18707,6 +19496,7 @@
 cakestart.net, 1
 caketoindia.com, 1
 cakingandbaking.com, 1
+cakirlarshipyard.com, 0
 cal.goip.de, 1
 cal9000.com, 1
 calaad.net, 1
@@ -18720,15 +19510,14 @@
 calaborlawnews.com, 1
 calafont.cat, 0
 calaix.click, 1
-calancamassages.ch, 1
 calandrahosting.tk, 1
 calaverasmedicalcannabis.com, 1
-calbertsen.dk, 1
 calcasieuparish.gov, 1
 calcedge.com, 1
 calcettomania.com, 1
 calcinacci.com, 1
 calcioragusa.tk, 1
+calconcontractors.com, 1
 calcoolator.pl, 1
 calculadoraconversor.com, 1
 calcularis.ch, 1
@@ -18756,6 +19545,7 @@
 caletka.cz, 1
 caletka.nl, 1
 calgoty.com, 1
+calgraf.com, 1
 calibra.com, 1
 calibracionhd.com, 1
 calibreapp.com, 1
@@ -18784,6 +19574,7 @@
 callear.org, 1
 callerstrom.se, 1
 calleveryday.com, 1
+callfordataspeakers.com, 1
 callfunc.com, 1
 callhub.io, 1
 callidus-vulpes.de, 1
@@ -18791,10 +19582,8 @@
 callisabel.fr, 1
 callmebetty.com, 1
 callmewhatever.com, 1
-callofdutybr.com, 1
 callsign.com, 1
 callsigns.ca, 1
-calltoar.ms, 1
 calltothepen.com, 1
 callumgroeger.com, 1
 callumsilcock.me, 1
@@ -18813,6 +19602,7 @@
 calvario.tk, 1
 calverleyparish.church, 1
 calvin.my, 1
+calwildgarden.com, 1
 calypso-tour.net, 1
 calypsohost.net, 1
 calyxengineers.com, 1
@@ -18862,6 +19652,7 @@
 cameos.bo, 1
 camera-podvod.tk, 1
 camerahire.com.au, 1
+cameraman.tk, 1
 cameramark.nl, 1
 camerashot.tk, 1
 cameraslyphotography.tk, 1
@@ -18869,14 +19660,19 @@
 cameronstar.tk, 1
 cameroonlounge.com, 1
 camerweb.es, 1
+camfire.team, 1
 camilalima.adv.br, 1
+camilamoreno.tk, 1
 camilaporto.tk, 1
 camileonline.tk, 1
-camilia.io, 1
+camilia.io, 0
 camilomodzz.net, 1
+caminoneocatecumenal.tk, 1
 caminreal.tk, 1
+camionerosdecoslada.tk, 1
 camipress.ga, 1
 camisado.tk, 1
+camisantiago.tk, 1
 camisetas4fun.com.br, 1
 camisetasbichopreguica.com.br, 1
 camisetasmalwee.com.br, 1
@@ -18887,7 +19683,6 @@
 camouflaged.tk, 1
 camp-pleinsoleil.ch, 0
 campaign-ad.com, 1
-campaignhelpdesk.org, 1
 campaignlake.com, 1
 campaignwiki.org, 1
 campamentos.info, 1
@@ -18909,6 +19704,7 @@
 campingshop.pl, 1
 campingskyhooks.com, 1
 campistry.net, 1
+camplaza.tk, 1
 campmackinaw.com, 1
 campo-salado.com, 1
 campona.hu, 1
@@ -18918,11 +19714,14 @@
 campus-discounts.com, 1
 campus-finance.com, 1
 campusdrugprevention.gov, 1
+campushelloworld.com, 1
 campuswire.com, 1
 campvana.com, 1
 campwabashi.org, 1
+campwaltblog.com, 1
 camrecord.ml, 1
 camrn.wtf, 1
+camrosewebservices.com, 1
 camshowdir.com, 1
 camshowdir.to, 1
 camshowhive.com, 1
@@ -18941,13 +19740,15 @@
 can7.fr, 1
 canada-tourisme.ch, 0
 canada.ind.br, 1
-canadaabroad.com, 1
+canadaabroad.com, 0
 canadabread.com, 0
 canadaradon.com, 1
 canadasmotorcycle.ca, 1
 canadian.dating, 1
 canadianatheists.ca, 1
 canadianatheists.com, 1
+canadianchristianity.com, 1
+canadianmilitaryspouse.tk, 1
 canadianoutdoorequipment.com, 1
 canadianpointerclub.tk, 1
 canadiansrit.tk, 1
@@ -18965,6 +19766,7 @@
 canariculturacolor.com, 1
 canaryaspets.com, 1
 canarymod.net, 1
+canarypower.tk, 1
 canarys.cf, 1
 canavilage.com, 1
 canavillage.net, 1
@@ -18974,9 +19776,12 @@
 cancan.ml, 1
 cancerdata.nhs.uk, 1
 cancersintomas.com, 1
+cancertherapy.tk, 1
 cancunsouvenirs.com, 1
 candaceplayforth.com, 1
+candados.store, 1
 candalgic.com.tr, 1
+candas.tk, 1
 candelaguatemala.tk, 1
 candelec.com, 0
 candeo-books.nl, 1
@@ -18996,6 +19801,7 @@
 candytip.ru, 1
 canekeiros.com.br, 1
 canellayachts.com, 1
+canetelareal.tk, 1
 canfazz.com, 1
 canfield.gov, 1
 cangku.in, 1
@@ -19005,15 +19811,14 @@
 canhazip.com, 1
 canhq.tk, 1
 cani-compostelle.fr, 1
-canibeoutside.com, 1
 canihavesome.coffee, 0
 caniuse.email, 1
-canivacbd.com, 1
 canker.org, 1
 canliradyodinle.life, 1
 canlom.tk, 1
 canmipai.com, 1
 cannabis-marijuana.com, 1
+cannabis.pe, 1
 cannabiscare.ca, 1
 cannabislegality.info, 1
 cannabismd.com, 1
@@ -19037,6 +19842,8 @@
 canperclinicaveterinaria.com, 1
 cansworld.com, 1
 cant.at, 1
+cantarefacile.com, 1
+cantarella.tk, 1
 cantatio.ch, 0
 canterburybouncycastlehire.co.uk, 1
 cantical.com, 1
@@ -19044,6 +19851,7 @@
 cantonroadjewelry.com, 1
 cantor.cloud, 1
 cantosdisidentes.tk, 1
+cantstopart.com, 1
 canttboardpachmarhi.org, 1
 canukseeds.com, 1
 canva-dev.com, 1
@@ -19054,7 +19862,7 @@
 canyoupwn.me, 1
 cao.gov, 1
 cao.la, 1
-caodecristachines.com.br, 1
+caodecristachines.com.br, 0
 caodesantohumberto.com.br, 1
 caodo.cf, 1
 caoliu.tech, 1
@@ -19063,13 +19871,14 @@
 cap73.fr, 1
 capachitos.cl, 0
 capacityproject.org, 1
-capbig.com, 1
 capctury.com, 1
 capeannpediatrics.com, 1
+capehipandknee.co.za, 1
 capekeen.com, 1
 capellan.pe, 1
 capellen.tk, 1
 caph.info, 1
+caphane.com, 1
 caphefin.com, 1
 capike.cf, 1
 capila.com.br, 1
@@ -19082,6 +19891,7 @@
 capitalbay.news, 1
 capitalcap.com, 1
 capitalcollections.org.uk, 1
+capitalgrio.com, 1
 capitalibre.com, 1
 capitalism.party, 1
 capitalism.rip, 1
@@ -19093,6 +19903,8 @@
 capitalonecardservice.com, 1
 capitalp.jp, 1
 capitalpay.ml, 1
+capitalquadatv.org.nz, 1
+capitalscum.tk, 1
 capitalstakepool.info, 1
 capitan.ml, 1
 capitanbeilinson.tk, 1
@@ -19111,12 +19923,17 @@
 caprichosdevicky.com, 1
 caprigo.ru, 1
 caps-hats.tk, 1
+caps.equipment, 1
 caps.is, 1
+caps.solutions, 1
+caps.systems, 1
 capsicle.tk, 1
 capsogusto.com, 1
 capssouthafrica.co.za, 1
+capsstudios.com, 1
 capstansecurity.co.uk, 1
 capstansecurity.com, 1
+capsuladigital.tk, 1
 capsule.org, 0
 capsulecorp.org, 1
 capsulekitchen.co, 1
@@ -19127,7 +19944,9 @@
 captaindmarc.com, 1
 captainfit.in, 1
 captainjanks.tk, 1
+captainscarlet.tk, 1
 captainsfarm.in, 1
+captainsunshine.tk, 1
 captalize.com, 1
 captivationscience.com, 1
 captivationtheory.com, 1
@@ -19140,11 +19959,14 @@
 caputo.com, 1
 caputodesign.com, 1
 capybaraowner.com, 1
+car-alarm.tk, 1
 car-clean-nord.de, 1
 car-forums.com, 1
+car-market.tk, 1
 car-seats-store.ga, 1
 car-spaw-rac.fr, 1
 car-speed.tk, 1
+car-touch.tk, 1
 car.info, 1
 car24.de, 1
 car24portal.de, 1
@@ -19162,7 +19984,9 @@
 carauctionsgeorgia.com, 1
 carauctionsillinois.com, 1
 caravaca.tk, 1
+caravansciences.tk, 1
 caravanserail.info, 1
+caravelairclub.tk, 1
 carberra.io, 1
 carberra.xyz, 1
 carbon-designz.com, 1
@@ -19214,6 +20038,7 @@
 cardmart.tk, 1
 cardoneshop.it, 1
 cardoni.net, 1
+cardpaymentoptions.com, 1
 cardranking.jp, 1
 cardrecovery.fr, 1
 cardsbymaria.com, 1
@@ -19234,13 +20059,14 @@
 careerpower.co.in, 1
 careerprep101.com, 1
 careertransformed.com, 1
+careerwatchlist.com, 1
 carefy.ph, 1
-caregiverva.org, 1
 careify.org, 1
 caremad.io, 1
 carepan.ga, 1
 carepassport.com, 1
 carespan.clinic, 1
+carespanclinic.ph, 1
 carespot.biz, 1
 carespot.co, 1
 carespot.mobi, 1
@@ -19259,7 +20085,6 @@
 caretta.co.uk, 1
 carevo.id, 1
 careyshop.cn, 1
-carezone.com, 0
 carezzaperu.com, 1
 carfinancehelp.com, 1
 carfinans.ru, 1
@@ -19294,6 +20119,8 @@
 carisenda.com, 1
 carium.com, 1
 carkeysanantonio.com, 1
+carkeysystem.com, 1
+carl-blum-haus.tk, 1
 carl.land, 1
 carlaschiavone.tk, 1
 carlcsaposs.com, 1
@@ -19301,6 +20128,7 @@
 carlgo11.com, 1
 carlife-at.jp, 1
 carlingfordapartments.com.au, 1
+carlingforddental.com.au, 1
 carlinmack.com, 1
 carlislepassionplay.org, 1
 carlitoxxpro.com, 1
@@ -19323,6 +20151,7 @@
 carloscar.com, 1
 carloscar.se, 1
 carlosfelic.io, 1
+carlosguadian.tk, 1
 carloshmm.com, 1
 carloshmm.stream, 1
 carloshmoreira.com, 1
@@ -19338,6 +20167,7 @@
 carmageddon.tk, 1
 carmarthenradiocontrolledcarclub.tk, 1
 carmatworld.co.uk, 1
+carmela.tk, 1
 carmelglenane.com, 1
 carmelrise.co.uk, 1
 carmelss.edu.hk, 1
@@ -19351,13 +20181,16 @@
 carnavales.tk, 1
 carnet-du-voyageur.com, 1
 carnetdeconducir.club, 1
+carnica.tk, 1
 carnildo.com, 1
+carnivalcostumes.tk, 1
 carnivorousplants.co.uk, 1
 caroes.be, 1
 caroffer.ch, 1
 carol-lambert.com, 1
 carolcappelletti.com, 1
 carolcestas.com, 1
+carolcoleventures.com, 1
 carolcollv.com, 1
 caroletolila.com, 1
 caroli.biz, 1
@@ -19384,12 +20217,16 @@
 carontetouristisoleminori.it, 1
 carousel.ga, 1
 carp4life.tk, 1
+carparo.net, 1
+carpentrybyallen.com, 1
 carpet---cleaning.com, 1
 carpetandhardwoodflooringpros.com, 1
 carpetcleaning-cypress.com, 1
 carpetcleaningtomball.com, 1
+carpio.tk, 1
 carplus.es, 1
 carplus.net, 1
+carpticon.tk, 1
 carpuya.ga, 1
 carrabiners.tk, 1
 carrando.com, 1
@@ -19400,6 +20237,8 @@
 carriedin.com, 1
 carrierplatform.com, 1
 carringtonrealtygroup.com, 1
+carrion.tk, 1
+carroattrezzi.roma.it, 1
 carroattrezzimilanodaluiso.it, 1
 carroceriascarluis.com, 1
 carrolcountyohioelections.gov, 1
@@ -19407,18 +20246,19 @@
 carrolltontx.gov, 1
 carrouselcompany.fr, 1
 carry.luxe, 1
+carryvanbruggen.tk, 1
 cars4salecy.com, 1
 carseatchecks.ca, 1
 carshippingcarriers.com, 1
 carsinsuranceis.com, 1
 carskil.com, 1
-carson-aviation-adventures.com, 1
 carson-matthews.co.uk, 1
 carsonca.gov, 1
 carsonkoziol.com, 1
 carsoug.com, 1
 carspicture.tk, 1
 carspneu.cz, 1
+carsworld.cf, 1
 cartadeviajes.cl, 1
 cartadeviajes.co, 1
 cartadeviajes.com, 1
@@ -19442,15 +20282,20 @@
 cartertonscouts.org.nz, 0
 cartes-voyance.fr, 1
 cartfilm.tk, 1
+cartft.com, 1
 carthedral.com, 1
 cartierplan.ga, 0
 carto.la, 1
+cartomancieperso.tk, 1
 cartongesso.roma.it, 1
 cartooncastles.ie, 1
+cartoservice.tk, 1
 cartouche24.eu, 1
 cartridge.gq, 1
+cartridgesave.co.uk, 1
 cartucce24.it, 1
 cartuchoonline.com.br, 1
+cartunings.tk, 1
 cartwrightrealestate.com, 1
 carusorealestate.com, 1
 carwashdruten.nl, 1
@@ -19460,10 +20305,12 @@
 casa-app.de, 1
 casa-brel.ml, 1
 casa-familia.com, 1
+casa-indigo.com, 1
 casa-laguna.net, 1
 casa-lunch-break.de, 1
 casa-lunchbreak.de, 1
 casa-mea-inteligenta.ro, 1
+casa-prince.tk, 1
 casaanastasia.ro, 0
 casaasia.cat, 1
 casaasia.es, 1
@@ -19472,37 +20319,46 @@
 casacazoleiro.com, 1
 casachameleonhotels.com, 1
 casacochecurro.com, 1
+casadasmolas.tk, 1
 casadasportasejanelas.com, 1
+casadedios.tk, 1
 casadegomes.com, 1
 casadilanga.com, 1
 casadoarbitro.com.br, 1
+casadomus.de, 1
 casadopulpo.com, 1
 casaessencias.com.br, 1
+casafina.tk, 1
 casalborgo.it, 1
 casaledibuccole.it, 1
 casalindamex.com, 1
 casalinghedisperate.ga, 1
+casalopez.tk, 1
 casalor.ro, 1
 casalribeiro.com, 1
 casalunchbreak.de, 1
-casamariposaspi.com, 1
 casamarrom.com.br, 1
 casamentos.com.br, 1
 casamentos.pt, 1
 casamiento.com.uy, 1
 casamientos.com.ar, 1
+casandraemge.tk, 1
 casanonnaida.it, 1
 casanovafishtacos.com, 1
+casanuova.tk, 1
 casapalla.com.br, 1
+casapedra.tk, 1
 casasincreibles.com, 1
 casasparaperross.com, 1
 casasuara.com, 1
 casasuleletrodomesticos.com.br, 1
+casatendeiro.tk, 1
 casavacanze.estate, 1
 casavaleria.tk, 1
 casbia.info, 0
 casbuijs.nl, 1
 casc.cz, 1
+casca.tk, 1
 cascadesjobcorpscca.com, 1
 cascavelle.fr, 1
 cascavelle.nl, 1
@@ -19519,6 +20375,7 @@
 caseycapitalpartners.com, 1
 casgp.com, 0
 cash-bot.tk, 1
+cash-pos.com, 1
 cash.app, 1
 cash.me, 1
 cash.nyc, 1
@@ -19528,7 +20385,6 @@
 cashbot.cz, 1
 cashbot.sk, 1
 cashenvoy.com, 1
-cashewfinancing.com, 1
 cashfazz.com, 1
 cashflowstrategist.com, 1
 cashforcarremovalsipswich.com.au, 1
@@ -19542,9 +20398,9 @@
 cashplk.com, 1
 cashsector.ga, 1
 cashworks.ga, 1
+cashyourcar.sydney, 1
 casian.ir, 1
 casillasdecoria.tk, 1
-casinhapratica.com.br, 1
 casino-cash-flow.com, 1
 casino-cash-flow.com.ru, 1
 casino-cash-flow.info, 1
@@ -19562,12 +20418,14 @@
 casinocashflow.su, 1
 casinocashflow.xyz, 1
 casinochecking.com, 1
+casinoexpress.cz, 1
 casinolegal.pt, 1
 casinolistings.com, 1
 casinomiami.net, 1
 casinomucho.com, 1
 casinomucho.org, 1
 casinomucho.se, 1
+casinoonlineprova.com, 1
 casinoonlinesicuri.com, 1
 casinoportugal.pt, 1
 casinoreal.com, 1
@@ -19594,6 +20452,8 @@
 casscountyia.gov, 1
 cassies.com.au, 1
 cassimo.com, 0
+cassini.ro, 1
+castagnola.tk, 1
 castalie.tk, 1
 castaneda.tk, 1
 castelannenberg.com, 1
@@ -19610,7 +20470,6 @@
 castings.tk, 1
 castlabs.com, 0
 castle-engine.io, 1
-castle.network, 1
 castlecapers.com.au, 1
 castlehack.ga, 1
 castlekingdomstockport.co.uk, 1
@@ -19620,6 +20479,7 @@
 castles-in-the-sky.co.uk, 1
 castlesrus-kent.com, 1
 castleswa.com.au, 1
+castorio.tk, 1
 castrillodelavalduerna.tk, 1
 castrillodelavega.tk, 1
 castrillodevillavega.tk, 1
@@ -19633,14 +20493,19 @@
 cat.net, 1
 cat1solution.com, 1
 cat73.org, 1
+catalog-clothing.tk, 1
+catalog-lingerie.tk, 1
+catalog-lingeries.tk, 1
 catalog-serverov.ml, 1
 catalog-underwear.tk, 1
 catalog.beer, 1
 catalogador.ml, 1
+catalogcomputerhardware.tk, 1
 catalogobiblioteca.com, 1
 catalogobiblioteca.net, 1
 catalogosvirtualesonline.com, 1
 catalojic.tk, 1
+catalonia.tk, 1
 catalyconv.com, 1
 catalyst-ecommerce.com, 1
 catalystapp.co, 1
@@ -19665,7 +20530,6 @@
 catfood.ga, 1
 catgarden.tk, 1
 catharinesomerville.com, 1
-catharisme.eu, 0
 catharisme.net, 1
 catharisme.org, 1
 catharsist.com, 1
@@ -19682,6 +20546,7 @@
 cathosa.nl, 1
 cathosting.org, 1
 cathouse.me, 1
+cathrine.tk, 1
 cathy.best, 1
 cathy.guru, 1
 cathy.legal, 1
@@ -19710,12 +20575,15 @@
 catsmagic.pp.ua, 1
 catsnow.com, 1
 catsoft.me, 1
+catstv.tk, 1
 cattery.work, 1
+catterydelmoria.tk, 1
 cattsgym.co.uk, 1
 catuniverse.org, 1
 catus.moe, 1
 catveteran.com, 1
 catvsmice.com, 1
+catwilliford.com, 1
 catz-productions.tk, 1
 caucasusandmercury.com, 1
 caucus.fr, 1
@@ -19734,8 +20602,12 @@
 cave-reynard.ch, 1
 cave-vet-specialists.co.uk, 1
 cavecreekaz.gov, 1
+cavediverharry.com, 1
+cavediving.com, 1
+cavemax.com, 1
 cavenderhill.com, 1
 cavern.tv, 1
+cavinesswealth.com, 1
 cavisson.com, 1
 cavistenancy.fr, 1
 cavzodiaco.com.br, 1
@@ -19754,8 +20626,8 @@
 cbc-hire.co.uk, 1
 cbca.gov, 1
 cbcentelles.tk, 1
-cbcf.info, 1
-cbd-oil.ro, 1
+cbcf.info, 0
+cbd-specialty.com, 1
 cbd.casa, 1
 cbd.supply, 1
 cbd181.com, 1
@@ -19767,7 +20639,6 @@
 cbdev.de, 1
 cbdlession.com, 1
 cbdmarket.space, 1
-cbdnews.me, 1
 cbdoilcures.co, 1
 cbdoils.llc, 1
 cbdtelegram.com, 1
@@ -19789,6 +20660,7 @@
 cbsdeheidevlinder.nl, 1
 cbt.tj, 1
 cbw.sh, 1
+cbws.nl, 1
 cbxp.in, 1
 cc-customer.de, 1
 cc.hn, 1
@@ -19797,6 +20669,7 @@
 cc3m.com, 1
 cc5197.co, 1
 cc6729.co, 1
+cc6729.com, 1
 cc6957.co, 1
 cc8822.cc, 1
 cc8833.cc, 1
@@ -19805,7 +20678,7 @@
 cc9721.com, 1
 cc9728.co, 1
 cc98.eu.org, 1
-ccaag.net, 1
+ccaag.net, 0
 ccac.gov, 1
 ccaguavivadonaciones.org, 1
 ccaj.io, 1
@@ -19816,6 +20689,7 @@
 ccbin.tk, 1
 ccc-ch.ch, 1
 ccc-cloud.de, 1
+cccams.tv, 1
 cccanna.co, 1
 cccp-o.tk, 1
 cccwien.at, 1
@@ -19842,6 +20716,7 @@
 ccprwebsite.org, 1
 ccr.ovh, 1
 ccriderlosangeles.com, 1
+ccrun.tk, 1
 ccsae.org, 1
 ccsaposs.com, 1
 ccsistema.com, 1
@@ -19855,8 +20730,8 @@
 cctvview.info, 0
 ccu.in.ua, 1
 ccu.plus, 1
-ccuuu.com, 0
 ccwebdevelopment.com, 1
+ccxsta.com, 1
 cd-shopware.de, 1
 cd-sport.com, 1
 cd.search.yahoo.com, 0
@@ -19876,6 +20751,7 @@
 cdf.wiki, 1
 cdfnature2019.fr, 1
 cdhome.ga, 1
+cdhqt.com, 1
 cdigitale.com, 1
 cdirectory.tk, 1
 cdkeyprices.com, 1
@@ -19924,11 +20800,13 @@
 ceciledekock.tk, 1
 cecilga.gov, 1
 cecilgreens.org, 1
+cecilia-online.nl, 1
 ceciliacolombara.com, 1
 cecilwalker.com.au, 0
 ceco.cf, 1
 ced-services.nl, 1
 cedarcitydining.com, 1
+cedric-garcia.tk, 1
 cedricbonhomme.org, 1
 cedriccassimo.ch, 0
 cedriccassimo.com, 0
@@ -19958,12 +20836,14 @@
 celebrate-creativity.com, 1
 celebratingloveministry.com, 1
 celebrationoflifeplanning.co.uk, 1
+celebratoday.com, 1
 celebraze.tk, 1
 celebrex.ga, 1
 celebrex100mg.cf, 1
 celebrities.pictures, 1
 celebritiesblog.tk, 1
 celebritydailynews.ml, 1
+celebrityfakes.tk, 1
 celebrityhealthcritic.com, 1
 celebrityphotos.blog, 1
 celebritypics.club, 1
@@ -19974,7 +20854,9 @@
 celebxx.com, 1
 celectro-pro.com, 1
 celeirorural.com.br, 0
+celeraindustries.tk, 1
 celestebonito.pt, 1
+celestia.tk, 1
 celestialenergies.com.au, 1
 celestialisms.com, 1
 celex-machinery.tk, 1
@@ -19991,12 +20873,15 @@
 celltesequ.com, 1
 celltick.com, 1
 cellufit.ga, 1
+cellulare.tk, 1
 celluliteorangeskin.com, 1
 celluliteremovaldiet.com, 1
 cellypso.com, 1
+celmetro.com, 0
 celseven.com, 1
 celsoazevedo.com, 1
 celsusnicosia.com, 1
+celtacad.tk, 1
 celtadigital.com, 1
 celti.ie.eu.org, 1
 celti.name, 1
@@ -20005,6 +20890,7 @@
 celuliteonline.com, 1
 cemcerkez.com, 1
 cementscience.com, 1
+cemetary.tk, 1
 ceml.ch, 1
 cenatorium.pl, 1
 cencalvia.org, 1
@@ -20014,6 +20900,8 @@
 cenfo.dk, 1
 cennelley.com, 1
 cennelly.com, 1
+cennetfm.tk, 1
+cennetforum.tk, 1
 censored.ml, 1
 censurfridns.dk, 1
 censurfridns.nu, 1
@@ -20036,6 +20924,8 @@
 centr.dn.ua, 1
 central-apartman.tk, 1
 central4.me, 1
+centralcityjuniorkindergarten.com, 1
+centralcoasthomeloans.com.au, 1
 centralconvergence.com, 1
 centraldelbebe.com, 1
 centraldoencanador.com.br, 1
@@ -20044,6 +20934,7 @@
 centralegedimat.eu, 1
 centralex.io, 1
 centralfor.me, 1
+centralhq.tk, 1
 centralitasbaratas.es, 1
 centraljerseyrcca.com, 1
 centrallead.net, 1
@@ -20079,7 +20970,6 @@
 centroperugia.gr, 1
 centrosocialferrel.pt, 1
 centrum-edukacji.tk, 1
-centrumbastiaanbosch.nl, 1
 centrumhodinek.cz, 1
 centrumpieknairelaksu.pl, 1
 centruvechisv.ro, 1
@@ -20094,6 +20984,7 @@
 centura.de, 1
 centurialeonina.com, 1
 centurion-consulting-cie.eu, 1
+centurion-consulting.eu, 1
 centurion-consulting.net, 1
 centurion-consulting.tech, 1
 centurion-it.site, 1
@@ -20106,12 +20997,14 @@
 centuryforum.tk, 1
 centurykiaparts.com, 1
 centurylink.cf, 1
+centurymedicaldental.com, 1
 centurystonedental.com, 1
 ceopedia.org, 1
 cepek4d.com, 1
 cephalexin.ga, 1
 cephalexincapsules.ml, 1
 cephalexincapsules.tk, 1
+cepsychologie.com, 1
 cepxuo.tk, 1
 ceramic-glazes.com, 1
 ceramica.roma.it, 1
@@ -20124,6 +21017,7 @@
 cerberusecurity.com, 1
 cerberusinformatica.it, 1
 cerbottana.duckdns.org, 1
+cerda-avocats.com, 1
 cerebelo.info, 1
 cerebrosano.gov, 1
 cerecup.com, 0
@@ -20136,6 +21030,8 @@
 cermak.photos, 1
 cernac.cz, 1
 cernakova.eu, 1
+cernybureau.com, 1
+cerocosto.com, 1
 cerovica.tk, 1
 cerpus-course.com, 1
 cerrajeriaamericadelquindio.com, 1
@@ -20146,6 +21042,7 @@
 cert.govt.nz, 1
 cert.or.id, 1
 cert.se, 1
+certainbiz-news.tk, 1
 certaintelligence.com, 1
 certbus.com, 1
 certcenter.com, 1
@@ -20155,6 +21052,7 @@
 certificacaoiso.com.br, 1
 certificatedetails.com, 1
 certificateoflogistics.ga, 1
+certificateofpurchasing.ga, 1
 certificatespending.com, 1
 certificatetools.com, 0
 certificato-prevenzione-incendi.it, 1
@@ -20170,6 +21068,7 @@
 certspotter.com, 1
 certspotter.org, 1
 cervejista.com, 1
+cervenyjezek.eu, 1
 cervera.com.br, 1
 ces-ltd.co.uk, 1
 cesar-hector.tk, 1
@@ -20189,6 +21088,7 @@
 cestaswmonline.com.br, 1
 cestpasviolent.com, 1
 cetamol.com, 1
+cetelon.tk, 1
 ceu.edu, 0
 ceverett.io, 1
 cevin.at, 1
@@ -20199,6 +21099,7 @@
 ceyizlikelisleri.com, 1
 cf-ide.de, 1
 cf-tm.net, 1
+cfa.gov, 1
 cfan.space, 1
 cfc-swc.gc.ca, 1
 cfda.gov, 1
@@ -20231,8 +21132,10 @@
 cgelves.com, 1
 cges.xyz, 1
 cgf-charcuterie.com, 1
+cgglobalservices.com.es, 1
+cgha.us, 1
 cgionline.tk, 1
-cgirb.com, 1
+cgknieuwpoort.nl, 1
 cglib.xyz, 1
 cgmagonline.com, 1
 cgmbacklot.com, 1
@@ -20255,6 +21158,7 @@
 ch47f.com, 1
 ch4bb.org, 1
 cha-ta.com, 1
+chaacker.tk, 1
 chabad360.me, 1
 chabadmyanmar.com, 1
 chabakainfo.com, 1
@@ -20272,6 +21176,10 @@
 chadpugsley.com, 1
 chadstoneapartments.com.au, 1
 chadtaljaardt.com, 1
+chagahq.com, 1
+chaghi.tk, 1
+chahal.blog, 1
+chai-che.com, 1
 chaifeng.com, 1
 chaikaclub.tk, 1
 chainedunion.info, 1
@@ -20280,12 +21188,12 @@
 chainlinkfencestlouis.com, 1
 chainz.tk, 1
 chaip.org, 1
-chaise-de-gamer.fr, 1
 chaisystems.net, 1
 chaitanyapandit.com, 1
 chaitradings.com.my, 1
 chaizhikang.com, 1
 chalanbiltv.net, 1
+chalet-maubuisson.tk, 1
 chaletdemontagne.org, 1
 chaletmanager.com, 1
 chaletpierrot.ch, 0
@@ -20294,7 +21202,6 @@
 challenges.gov, 1
 challengeskins.com, 1
 challstrom.com, 1
-chalu.ru, 1
 chamartin.tk, 1
 chamber.sa, 1
 chamberlainpropertygroup.ca, 1
@@ -20323,13 +21230,13 @@
 chamsochoa.com, 1
 chanakyanewz.com, 1
 chancekorte.com, 1
-chancekorte.net, 1
 chancekorte.org, 1
 chanddriving.co.uk, 1
 chanderson.com.au, 1
 chandr1000.ga, 1
 chandramani.tk, 1
 chang-feng.info, 0
+changan.com.co, 1
 change-coaching-gmbh.ch, 1
 changeanalytics.us, 1
 changemywifipassword.com, 1
@@ -20347,11 +21254,9 @@
 channingmotorsport.tk, 1
 chantalguggenbuhl.ch, 0
 chantuong.org, 1
-chanuwah.com, 1
 chanz.com, 1
 chaonengsou.com, 1
 chaos-darmstadt.de, 1
-chaos-games.org, 1
 chaos.run, 1
 chaoschemnitz.de, 1
 chaoscommunication.camp, 1
@@ -20364,7 +21269,6 @@
 chaoticonline.tk, 1
 chaouby.com, 0
 chaoxi.co, 1
-chaoxi.io, 1
 chaoxi.link, 1
 chapek9.com, 1
 chapelaria.tf, 1
@@ -20374,6 +21278,7 @@
 chapiteauxduleman.fr, 1
 chapmanstreeservice.com, 1
 chapstick.life, 1
+chaqueteros.tk, 1
 charbonnel.eu, 1
 charcoal-se.org, 1
 charcoalvenice.com, 1
@@ -20395,9 +21300,11 @@
 charlesbwise.com, 1
 charlescwcooke.com, 1
 charlesdickens.tk, 1
+charlesdouglastec.com, 1
 charlespitonltd.com, 1
 charlesrogers.co.uk, 1
 charlestonfacialplastic.com, 1
+charley.tk, 1
 charlie-liveshow.com, 1
 charlie.im, 1
 charlie4change.com, 1
@@ -20406,6 +21313,12 @@
 charliehr.com, 1
 charlierogers.co.uk, 1
 charlierogers.com, 1
+charliez0.cf, 1
+charliez0.ga, 1
+charliez0.gq, 1
+charliez0.js.org, 1
+charliez0.ml, 1
+charliez0.tk, 1
 charlotte-touati.ch, 1
 charlottecountyva.gov, 1
 charlotteomnes.com, 1
@@ -20418,9 +21331,11 @@
 charmanterelefant.at, 1
 charmcitytech.com, 1
 charmingsaul.com, 1
+charnego.tk, 1
 charolopezatelier.com, 1
 charon.tk, 1
 charonsecurity.com, 1
+charqawi.tk, 1
 charr.xyz, 1
 chars.ga, 0
 charset.org, 1
@@ -20434,8 +21349,10 @@
 chascrazycreations.com, 1
 chaseandzoey.de, 1
 chasetrails.co.uk, 1
+chasing-coins.com, 1
 chasoslov.tk, 1
 chastitybelts.tk, 1
+chat-cam.tk, 1
 chat-house-adell.com, 1
 chat-porc.eu, 1
 chat.cz, 1
@@ -20448,7 +21365,6 @@
 chatbotclic.com, 1
 chatbotclick.com, 1
 chatbots.email, 1
-chatbots.systems, 1
 chatdoguaxinim.tk, 1
 chateau-belvoir.com, 1
 chateau-de-lisle.fr, 1
@@ -20477,6 +21393,7 @@
 chatu.io, 1
 chatu.me, 1
 chatucomputers.com, 1
+chatup.cf, 1
 chaturbate.com, 1
 chaturbate.com.tw, 1
 chaturbate.global, 1
@@ -20512,6 +21429,7 @@
 cheap-life-insurance-quote.com, 1
 cheap-mattresses.co.uk, 1
 cheapacyclovir.ml, 1
+cheapalarmparts.com.au, 0
 cheapautoinsuranceblog.com, 1
 cheapessay.net, 1
 cheapestgamecards.at, 1
@@ -20543,8 +21461,8 @@
 cheapwritingservice.com, 1
 cheat-files.ml, 1
 cheatengine.pro, 1
-cheater.best, 1
 cheaterbios.ga, 1
+cheatmasters.tk, 1
 cheatsupreme.com, 1
 cheazey.co, 1
 cheazey.net, 1
@@ -20552,6 +21470,7 @@
 chebotarevkk.tk, 1
 chebwebb.com, 1
 checalaweb.com, 1
+chechencity.tk, 1
 check.torproject.org, 0
 checkandreportlive.com, 1
 checkblau.de, 1
@@ -20598,6 +21517,8 @@
 chefpablito.tk, 1
 chehalemgroup.com, 1
 cheholchik.tk, 1
+cheibegaudi.ch, 1
+cheiloplasty.tk, 1
 chekhov.gq, 1
 chel.ga, 1
 cheladmin.ru, 1
@@ -20622,6 +21543,8 @@
 chemolak.pl, 1
 chenapartment.com, 1
 cheneypartners.com, 1
+chenfengmedical.com, 1
+cheng.ink, 1
 cheng.pet, 0
 chengarda.com, 1
 chengfayun.com, 1
@@ -20658,7 +21581,9 @@
 cherryonit.com, 0
 cherrywoodtech.com, 1
 chertseybouncycastles.co.uk, 1
+cherylbelber.com, 1
 cherysunzhang.com, 1
+chesapeakebank.com, 1
 chesapeakebaychristmas.com, 1
 chess.com, 1
 chessboardao.com, 1
@@ -20673,6 +21598,7 @@
 chestnut.cf, 1
 chetanrana.me, 1
 cheto.io, 1
+chetori.tk, 1
 chetwood.se, 1
 chevy37.com, 1
 chevymotor-occasions.be, 0
@@ -20690,6 +21616,7 @@
 chhy.at, 1
 chiakhoakhoinghiep.vn, 1
 chiamami.online, 1
+chiamatehot.com, 1
 chiangmaimontessori.com, 1
 chianti2002.jp, 1
 chiapasfutbol.com, 1
@@ -20719,15 +21646,16 @@
 chicjewelryla.com, 1
 chick-goo-ewe-farm.com, 1
 chickencoop.ml, 1
+chickteam.tk, 1
 chicofc.tk, 1
 chicolawfirm.com, 1
 chicospanico.tk, 1
 chicourologist.com, 1
 chicurrichi.com, 1
+chielonline.tk, 1
 chiemgauflirt.de, 1
 chif16.at, 1
 chifumi.net, 1
-chihirev.ru, 1
 chijb.cc, 1
 chika.kr, 0
 chikan-beacon.net, 1
@@ -20735,7 +21663,9 @@
 chiki.tk, 1
 chikory.com, 1
 chilbert.co, 1
+child-theater-bs.co.il, 1
 childcare.gov, 1
+childcaremanagementcompany.ga, 1
 childcaresolutionscny.org, 1
 childcounseling.org, 1
 childcustodylegalaid.org, 1
@@ -20747,6 +21677,7 @@
 childrenschoicepearland.com, 1
 childrensentertainmentleicester.co.uk, 1
 childrensfurniture.co.uk, 1
+childrensrecipes.tk, 1
 childstats.gov, 1
 childswear.tk, 1
 childvisitationassistance.org, 1
@@ -20761,11 +21692,15 @@
 chilipy.ga, 1
 chill-house.ga, 1
 chillebever.nl, 1
+chillipadi.tk, 1
 chilliwackchurchofgod.com, 1
 chiloesinpuente.tk, 1
 chilternfarming.com, 1
 chima.net, 1
 chima.us, 1
+chimcanhcut.tk, 1
+chime.com, 1
+chimebank.com, 1
 chimeratool.com, 1
 chimerity.com, 1
 chimm.cc, 1
@@ -20810,13 +21745,17 @@
 chipset.no, 1
 chiralsoftware.com, 1
 chirkunov.tk, 1
+chiro-merksplas.tk, 1
 chiro-neuchatel.ch, 0
+chiroherne.tk, 1
 chirojap.tk, 1
 chirolokalenfonteintjekoersel.be, 1
+chiromeisjes-boxberg.tk, 1
 chiron.care, 0
 chiropractic.gr, 1
 chiropracticwpb.com, 1
 chiropraktik-riemann.de, 1
+chiropraktik-wildner.de, 1
 chiropraticien-neuchatel.ch, 0
 chiropratique-neuchatel.ch, 0
 chirosphere.ch, 0
@@ -20824,6 +21763,7 @@
 chiru.no, 1
 chirurgoplastico.roma.it, 1
 chisago-isantidfl.com, 1
+chiselgems.com, 1
 chispita.tk, 1
 chistesdesebas.tk, 1
 chit.search.yahoo.com, 0
@@ -20834,6 +21774,8 @@
 chitinfo.tk, 1
 chitlar.ml, 1
 chittagongtextile.tk, 1
+chizouworld.tk, 1
+chjeco.com, 1
 chk-ccs.com, 1
 chkserv.com, 1
 chksite.com, 1
@@ -20878,6 +21820,7 @@
 chokladfantasi.net, 1
 cholleria.es, 1
 chollima.pro, 1
+chollospain.cf, 1
 chomp.life, 1
 chonghe.org, 1
 chongming.tk, 1
@@ -20901,13 +21844,14 @@
 chorkley.uk, 1
 chornobyl.tk, 1
 chorpinkpoemps.de, 1
+chosenos.tk, 1
 chosenplaintext.org, 1
 choservices.com, 1
 chou-chinois.com, 1
-chouette-assurance.fr, 1
 chourishi-shigoto.com, 1
 chovancova.sk, 1
 chowchowugo.com, 1
+chownie.com, 1
 choylifut.tk, 1
 choyri.com, 1
 chpwmedicare.org, 1
@@ -20918,6 +21862,7 @@
 chris.land, 1
 chrisahrweileryoga.com, 1
 chrisaitch.com, 1
+chrisbrockdiving.com, 1
 chrisbryant.me.uk, 1
 chrisburnell.com, 1
 chriscampdesigns.com, 1
@@ -20941,7 +21886,6 @@
 chrispaul.ml, 1
 chrisplankhomes.com, 1
 chrispontius.tk, 1
-chrispstreet.com, 1
 chrisseoguy.com, 1
 chrisshort.net, 0
 chrissmiley.co.uk, 1
@@ -20954,6 +21898,7 @@
 christadelphians.eu, 1
 christchurchbouncycastles.co.uk, 1
 christec.net, 1
+christengroei.tk, 1
 christensenplace.us, 1
 christerwaren.fi, 1
 christiaanconover.com, 1
@@ -20981,6 +21926,7 @@
 christianitas.gq, 1
 christianitas.tk, 1
 christianjens.com, 1
+christianleedunn.tk, 1
 christianliebel.com, 1
 christianlis.org.uk, 1
 christianlis.uk, 1
@@ -21001,14 +21947,17 @@
 christineandcie.fr, 1
 christineblachford.com, 1
 christinecloma.com, 1
+christinehameline.com, 1
 christineprayon.de, 1
 christmasinelmhurst.org, 1
 christmaspages.tk, 1
 christmaspartyhire.co.uk, 1
+christmasrecipe.tk, 1
 christo.ga, 1
 christoph-gadow.de, 1
 christoph.media, 1
 christophbartschat.com, 1
+christophe-dubois.tk, 1
 christophebarbezat.ch, 1
 christopher-simon.de, 1
 christopher-wright.com, 1
@@ -21032,6 +21981,7 @@
 chrisupjohn.xyz, 1
 chrisvannooten.tk, 1
 chriswald.com, 1
+chriswarbo.tk, 1
 chriswarrick.com, 1
 chriswells.io, 1
 chriswiggin.cf, 1
@@ -21055,6 +22005,7 @@
 chromopho.be, 1
 chronic101.xyz, 1
 chronicals.de, 1
+chronicles.tk, 1
 chroniclesofgeorge.com, 1
 chronikdanceclub.com, 1
 chronocarpe.com, 1
@@ -21076,34 +22027,43 @@
 chshouyu.com, 1
 chsterz.de, 1
 chstrategies.com.au, 1
+chto-posmotretj.ru, 1
 chtodelat.ga, 1
 chtyvo.tk, 1
+chubr.cf, 1
+chuckval.tk, 1
 chudnov.tk, 1
+chukcha.ru, 1
 chukotka.ml, 1
+chukwunyere-chambers.org, 1
 chun.pro, 1
 chun.si, 0
 chundelac.com, 1
 chunga.tk, 1
 chungsir.com.pa, 1
 chunk.science, 1
-chuongle.com, 1
 chupadelfrasco.com, 1
 chupanhcotrang.com, 1
 chuppa.com.au, 1
 churakov.tk, 1
 churchaid.ml, 1
+churchforum.tk, 1
 churchill.co.za, 1
 churchillcountynv.gov, 1
 churchlinkpro.com, 1
 churchlw.tk, 1
+churchofchrist.tk, 1
 churchofpop.net, 1
 churchofsaintbenedict.com, 1
 churchofsaintrocco.org, 1
 churchofscb.org, 1
+churchplaza.com, 1
+churchssja.org, 1
 churchthemes.com, 1
 churchwebcanada.ca, 1
 churchwebsupport.com, 1
 chus-plongee.fr, 1
+chuskocity.tk, 1
 chuvash-republic.tk, 1
 chuvash.tk, 1
 chuvashia.tk, 1
@@ -21134,6 +22094,7 @@
 ciblogin.com, 1
 cibus.ba, 1
 cica.es, 1
+cicavkleci.cz, 1
 cicery.com, 1
 cichol.com, 1
 ciclimattio.com, 1
@@ -21162,6 +22123,7 @@
 ciftlikesintisi.com, 1
 cig-dem.com, 0
 cigar-cartel.com, 1
+cigarette-electronique.tk, 1
 cigarterminal.com, 0
 cigdelivery.com, 1
 ciginsurance.com, 1
@@ -21172,7 +22134,9 @@
 ciicutini.ro, 1
 cikeblog.com, 1
 cilacapnews.ml, 1
+cile.tk, 1
 cilloc.be, 1
+cilt.tk, 1
 ciltskillnet.ie, 1
 cim.pe, 1
 cima-idf.fr, 1
@@ -21187,15 +22151,19 @@
 cindey.io, 1
 cindydudley.com, 1
 cine-music.de, 1
+cine.to, 1
 cinefilia.tk, 1
 cinefilzonen.se, 1
 cinefun.net, 1
 cinema-rulem.tk, 1
 cinemaclub.co, 1
 cinemadoma.tk, 1
+cinemaperto.tk, 1
 cinemarxism.com, 1
 cinemaschool.by, 1
+cinemasetfree.com, 1
 cinematherapy.org, 1
+cinematic.asia, 1
 cinematictouch.com, 1
 cinemaz.to, 1
 cinemotion.by, 1
@@ -21203,9 +22171,12 @@
 cinenote.link, 1
 cineping.com, 1
 cineplex.my, 1
+cineterror.tk, 1
 cineworld.co.in, 1
+cinexilio.tk, 1
 cinexmachina.com, 1
 cinicloud.com, 1
+cinicsystems.tk, 1
 ciniticket.com, 1
 cink.hu, 1
 cinkciarz.pl, 1
@@ -21213,6 +22184,7 @@
 cinq-elements.com, 0
 cinq-elements.fr, 1
 cinq-elements.net, 1
+cinquecentoclubholland.tk, 1
 cinqueportsvets.co.uk, 1
 cinsects.de, 1
 cint.com, 1
@@ -21224,6 +22196,7 @@
 cio-cisointerchange.org, 1
 cio.go.jp, 0
 cio.gov, 0
+ciordigital.com, 1
 cioscloud.com, 1
 cip.md, 1
 cipartyhire.co.uk, 1
@@ -21255,6 +22228,7 @@
 circlebox.rocks, 1
 circlelytics.com, 1
 circleofhealthlongmont.com, 1
+circleofleastconfusion.com, 1
 circlepluscircle.me, 1
 circu.ml, 1
 circuitcityelectricaladelaide.com.au, 1
@@ -21266,6 +22240,7 @@
 circuses.tk, 1
 cirfi.com, 1
 ciris.info, 1
+cirocunato.tk, 1
 cirope.com, 1
 cirruslab.ch, 1
 cirruslabs.ch, 0
@@ -21279,12 +22254,13 @@
 cisa.gov, 1
 ciscoasanetflow.com, 1
 ciscocyberthreatdefense.com, 1
-ciscodude.net, 1
+ciscodude.net, 0
 cisconetflowleader.com, 1
 cisconetflowpartners.com, 1
 cisconetflowreporting.com, 1
 cisconetflowsupport.com, 1
 cisin.com, 1
+cisincometax.ca, 1
 cisindia.tk, 1
 cisinlabs.com, 1
 cisinlive.com, 1
@@ -21297,21 +22273,24 @@
 cistenikoberculiberec.net, 1
 cistit.tk, 1
 cistitguru.ru, 0
-cistus-tee.de, 1
 cisum-cycling.com, 1
 cisy.me, 1
 cisylik.gq, 1
 citace.com, 1
 citacepro.com, 1
 citadelpark.be, 1
+citae.ga, 1
 citafun.tk, 1
 citakon.cz, 1
 citalopram-20-mg.ml, 1
 citalopram20.ga, 1
 citalopramgeneric.ga, 1
 citalopramhbr.ga, 1
+citans.tk, 1
 citas-adultas.com, 1
 citationgurus.com, 1
+citations.tk, 1
+citazine.fr, 1
 citazioni.tk, 1
 citcuit.in, 1
 citfin.cz, 1
@@ -21319,7 +22298,7 @@
 cities.mx, 1
 citimarinestore.com, 1
 citizen-cam.de, 1
-citizenkevin.com, 1
+citizenkevin.com, 0
 citizensbankal.com, 1
 citizenscience.gov, 0
 citizenscience.org, 1
@@ -21338,15 +22317,19 @@
 city-walks.info, 1
 cityacademyslc.org, 1
 citybeat.de, 1
+citybusexpress.com, 0
 citycalculator.ml, 1
+citycardgand.com, 1
 citycardgante.com, 1
 citycardgent.be, 1
 citycardgent.com, 1
 citycardghent.com, 1
 citycreek.studio, 1
 citycricket.tk, 1
+cityfacialplastics.com, 1
 cityfish.com, 1
 cityfloorsupply.com, 1
+cityhide.tk, 1
 citykohviteek.ee, 1
 citylift.com.ua, 1
 citylights.eu, 1
@@ -21382,6 +22365,8 @@
 ciubotaru.tk, 1
 ciuciucadou.ro, 1
 ciudadanosbo.com, 1
+ciudadrealtrabaja.com, 1
+ciulea.ro, 1
 ciurcasdan.eu, 1
 civey.com, 1
 civic-europe.eu, 1
@@ -21400,6 +22385,7 @@
 cj-espace-vert.fr, 1
 cj-jackson.com, 1
 cj26.club, 1
+cj8.de, 1
 cjbeckert.com, 1
 cjdby.net, 1
 cjdpenterprises.com, 1
@@ -21419,6 +22405,8 @@
 ck.cx, 1
 ck0.eu, 1
 ck1020.cc, 1
+ckcg.tk, 1
+ckdemo.herokuapp.com, 1
 ckenel.com, 1
 ckenell.com, 1
 ckenelley.com, 1
@@ -21460,14 +22448,17 @@
 claimflights.it, 0
 claimflights.pl, 0
 claimflights.ro, 0
+claimit.ml, 1
 claimnote.com, 1
 claimspharmacy.services, 1
 clairegold.com, 1
 clairelefort-architectes.com, 1
 clairescastles.co.uk, 1
 clairette-de-die-lantheaume.fr, 1
+clairevoyance.tk, 1
 claitec.com, 1
 clam.network, 1
+clamatohalloffame.com, 1
 clan-destin.tk, 1
 clan-finaldestination.tk, 1
 clan-hosting.tk, 1
@@ -21478,15 +22469,20 @@
 clan-zone.dk, 1
 clanebouncycastles.com, 1
 clanlaw.tk, 1
+clanlegends.tk, 1
 clanrose.org.uk, 1
+clantemplates.tk, 1
+clanto.shop, 1
 clanwarz.com, 1
 clapbacks.com, 1
 clapping-rhymes.com, 1
 claptrap.tk, 1
 clara.de, 1
 clarasegura.tk, 1
+clare-landmark.com, 1
 clare3dx.com, 1
 claremontyachtclub.org.au, 1
+claresderibota.tk, 1
 claretandbluearmy.tk, 1
 claretvillans.com, 1
 clarinet.ga, 1
@@ -21507,6 +22503,7 @@
 clase3.tk, 1
 clashersrepublic.com, 1
 clashoflights.ga, 1
+class-zone.tk, 1
 class.com.au, 1
 classdesignhome.com, 1
 classdojo.com, 1
@@ -21556,12 +22553,14 @@
 claypenblanks.com, 1
 clayprints.com, 1
 claytoncondon.com, 1
+claytonjunior.tk, 1
 clazzrooms.com, 1
 cldejessey.com, 1
 cldfile.com, 1
 cldinc.com, 1
 cldly.com, 1
 clean-mailbox.com, 1
+clean-water-and-sanitation.tk, 1
 cleanapproachnw.com, 1
 cleanbrowsing.org, 1
 cleanclearwater.co.uk, 1
@@ -21574,17 +22573,19 @@
 cleaningservicejulai.com, 1
 cleaningsquad.ca, 0
 cleankey.jp, 1
+cleanmysolarpanels.com, 1
 cleanplanet.co.jp, 1
 cleansewellness.com, 1
 cleanshield99.com, 1
-cleanvision.space, 1
+cleanvision.space, 0
 cleanway.dk, 1
+clear-concise.com, 1
 clearance365.co.uk, 1
 clearbooks.co.uk, 1
 clearbookscdn.uk, 1
 clearchatsandbox.com, 1
-clearcomm.org, 1
 clearcreekcountyco.gov, 1
+clearcreekcountydronepilot.com, 1
 clearer.cloud, 1
 clearhumor.tk, 1
 clearip.com, 1
@@ -21592,14 +22593,15 @@
 clearlinux.org, 1
 clearmaxx.ch, 1
 clearpay.co.uk, 1
+clearsafetalk.com, 1
 clearsense.com, 1
 clearspringinsurance.com, 1
 clearstep.health, 1
 clearview-creative.com, 1
 clearviewsecurity.com.au, 1
 clearviewwealthprojector.com.au, 1
-clearvisiontea.com.ng, 1
 clearvoice.com, 1
+clearvoice.org, 1
 clearvoice1.com, 1
 clearwaterbidets.com, 0
 clearwatersexhealth.com, 1
@@ -21611,6 +22613,7 @@
 clemensbartz.de, 1
 clemenscompanies.com, 1
 clementfevrier.fr, 1
+clementsfamily.co, 1
 clemovementlaw.com, 1
 cleocinonline.gq, 1
 cleova.com, 1
@@ -21621,6 +22624,7 @@
 clever-fit.com, 1
 cleverdarts.com, 1
 cleverdeal.tk, 1
+cleverinsert.com, 1
 clevermatch.com, 1
 cleveroad.com, 1
 clevertarget.ru, 1
@@ -21660,6 +22664,7 @@
 clica.net, 1
 clicandfioul.com, 1
 clicheshishalounge.co.uk, 1
+click-cat.tk, 1
 click-generator.com, 1
 click2order.co.uk, 1
 click4click.ga, 1
@@ -21671,12 +22676,16 @@
 clickclickphish.com, 1
 clickclickvirus.com, 1
 clickclock.cc, 1
+clickcollect.boutique, 1
 clickenergy.com.au, 1
 clickforum.cf, 1
 clickheretobegin.tk, 1
 clickhouse.tech, 1
+clickinfo.tk, 1
 clickingmad.com, 1
 clickphobia.ga, 1
+clickpool-server.de, 1
+clickpress.tk, 1
 clickrising.com, 1
 clickthebucket.com, 1
 clicktolinkb.gq, 1
@@ -21695,6 +22704,7 @@
 clik.ga, 1
 cliksource.com, 1
 climaencusco.com, 1
+climatecooperation.org, 1
 climatecrafters.com, 1
 climateinteractive.org, 1
 climatgate.tk, 1
@@ -21709,6 +22719,7 @@
 clindamycinprice.tk, 1
 clindoeilmontagne.com, 0
 clingout.com, 1
+clinica.zapto.org, 1
 clinicaarques.es, 1
 clinicadeesteticacontagem.com.br, 1
 clinicadentalacacias.com, 1
@@ -21716,11 +22727,13 @@
 clinicadentalayomunoz.com, 1
 clinicadentalmunoz.es, 1
 clinicaeliana.com, 1
+clinicafollicles.com.br, 1
 clinicalrehabilitation.info, 1
 clinicalstats.ga, 1
 clinicaltrialpodcast.com, 1
 clinicaltrials.gov, 1
 clinicamiracueto.com, 1
+clinicarayanelacerda.com.br, 1
 clinicaschirmer.com, 1
 clinicasesteticas.com.br, 1
 clinicasmedicas.com.br, 1
@@ -21731,6 +22744,7 @@
 clinique-ser.ca, 1
 cliniquecomplementaire.com, 1
 cliniquevethuy.be, 1
+clinlife.com, 1
 clintburnett.com, 1
 clinteam.dk, 1
 clintonbloodworth.com, 1
@@ -21745,6 +22759,7 @@
 clipchamp.com, 1
 clipclip.com, 1
 clippings.com, 1
+clips.ga, 1
 cliqz.com, 1
 clive.io, 1
 clixa.com, 1
@@ -21760,15 +22775,18 @@
 clocklab.design, 1
 clockworksms.com, 1
 clodo.it, 1
+clodoteam.ga, 1
 clojurescript.ru, 1
 clomid100mg.ga, 1
 clomid50mg.cf, 1
 clomid50mg.ml, 1
 clomidonline.tk, 1
 clomiphene.gq, 1
+cloneprint.com, 1
 cloneuniverse.com, 1
 clonidine-hydrochloride.ga, 1
 clonix.tk, 1
+clonyitaly.tk, 1
 cloppenburg-autmobil.com, 1
 cloppenburg-automobil.com, 1
 clorik.com, 1
@@ -21776,15 +22794,19 @@
 clorophilla.net, 1
 closecross.com, 1
 closeli.cn, 1
-closeli.com, 0
+closeli.com, 1
 closelinksecurity.co.uk, 1
 closelinksecurity.com, 1
+closernow.tk, 1
 closetemail.com, 1
+closets-cheap.tk, 1
 closingholding.com, 1
+clothes-for-school.tk, 1
+clothing-2010.tk, 1
 clothing-for-women.tk, 1
+clothingjeans.tk, 1
 cloud-hair.jp, 1
 cloud-screen.com, 1
-cloud-surfer.net, 0
 cloud.bugatti, 1
 cloud.fail, 1
 cloud.google.com, 1
@@ -21828,8 +22850,10 @@
 cloudflare.com, 1
 cloudflareonazure.com, 1
 cloudfree.online, 1
+cloudfree.shop, 1
 cloudfree.site, 1
 cloudfree.top, 1
+cloudfudge.com, 1
 cloudhoreca.com, 1
 cloudia.org, 1
 cloudibee.com, 1
@@ -21865,6 +22889,7 @@
 cloudpipes.com, 1
 cloudplan.nl, 1
 cloudpole.de, 1
+cloudprints.ru, 1
 cloudpublic.pro, 1
 cloudrive.cf, 1
 cloudsavvyit.com, 1
@@ -21880,6 +22905,7 @@
 cloudservice.io, 1
 cloudsharp.io, 1
 cloudsign.jp, 1
+cloudsmart.tech, 1
 cloudspace-analytics.com, 1
 cloudspeedy.net, 1
 cloudspire.net, 1
@@ -21901,10 +22927,12 @@
 cloudzentechnologies.com, 1
 cloutcloset.ga, 1
 clouz.de, 1
+clover-sendai.com, 1
 cloveros.ga, 1
 cloverpc.co.uk, 1
 clovertwo.com, 1
 clovisplumbingservices.com, 1
+clowd.haus, 1
 clowd.ovh, 1
 clownday.co.uk, 1
 clownindeklas.nl, 1
@@ -21940,8 +22968,7 @@
 clubdeportivocieza.tk, 1
 clubdeslecteurs.net, 1
 clubedegeografia.tk, 1
-clubedoberloque.com.br, 1
-clubefiel.com.br, 1
+clubedoberloque.com.br, 0
 clubegolfpt.com, 1
 clubeighteen.tk, 1
 clubempleos.com, 1
@@ -21965,6 +22992,8 @@
 clubpes.tk, 1
 clubsuccessjapan.com, 1
 clubtamarugal.tk, 1
+clubtecknocore.tk, 1
+clubvttlesloupsdemaixe.tk, 1
 cluj.apartments, 1
 cluj.help, 1
 clush.pw, 1
@@ -22004,6 +23033,7 @@
 cmitao.com, 1
 cmlachapelle.ch, 1
 cmlancy.ch, 1
+cmlcpa.ca, 1
 cmlignon.ch, 1
 cmn-group.com, 1
 cmn-groupe.com, 1
@@ -22013,6 +23043,7 @@
 cmpsc.uk, 1
 cmrconstructions.com.au, 1
 cmrss.com, 1
+cms-mania.tk, 1
 cms-service24.de, 1
 cms-weble.jp, 1
 cms-world.co.jp, 1
@@ -22070,6 +23101,7 @@
 co50.com, 1
 coa.one, 1
 coach-immobilier-neuf.fr, 1
+coach.org.uk, 0
 coachapp-ipass.herokuapp.com, 1
 coachbakery.com, 1
 coachezmoi.ch, 0
@@ -22078,11 +23110,14 @@
 coaching-park.fr, 1
 coachingmillenium.com, 1
 coachjehond.nl, 1
+coachoutlettvb.net, 1
 coactive.com, 1
+coag.gov.au, 1
 coalitionministries.org, 0
 coalmen.ga, 1
 coalpointcottage.com, 1
 coalvillebasketball.tk, 1
+coastalphysie.com, 1
 coastalpowder.com.au, 1
 coastalurgentcarebatonrouge.com, 1
 coastalurgentcarebossier.com, 1
@@ -22097,9 +23132,10 @@
 coathangerstrangla.com, 1
 coathangerstrangler.com, 1
 coatl-industries.com, 1
+coats-and-jackets.tk, 1
 coatsandcocktails.org, 1
 cobalt.io, 1
-cobbm.com, 1
+cobbcountygeorgia.ml, 1
 cobracastles.co.uk, 1
 cobranzasimg.com, 1
 coc.de, 1
@@ -22122,6 +23158,8 @@
 cockerspanielamericano.com.br, 1
 cockerspanielingles.com.br, 1
 cockfile.com, 1
+cockmonkey.tk, 1
+cocktails-club.com, 1
 cockybot.com, 1
 coco-cool.fr, 1
 coco-line.ch, 1
@@ -22137,15 +23175,17 @@
 coconutoil24.com, 1
 cocoscastles.co.uk, 1
 cocounty.org, 1
+cocowine.com, 1
 cocquyt-usedcars.be, 0
 cocreaciones.net, 1
 cocresa.tk, 1
+cocservice.top, 1
 cocukhekimim.com, 0
+cocukluaile.com, 1
 cocula.net, 1
 cocyou.ooo, 1
 cod-ggw.ml, 1
 cod88.cc, 1
-coda.io, 1
 coda.moe, 1
 coda.today, 1
 coda.world, 1
@@ -22178,6 +23218,7 @@
 codebrew.com.au, 1
 codeclub.gq, 1
 codecommunity.io, 1
+codecrew.us, 1
 codectron.com, 1
 codedbyjim.nl, 1
 codedelarouteenligne.fr, 1
@@ -22193,6 +23234,7 @@
 codefoundry.it, 0
 codehangar.io, 1
 codehelper.ml, 1
+codeheroes.fr, 1
 codeidea.ga, 1
 codein.ca, 1
 codeine.co.uk, 1
@@ -22230,12 +23272,10 @@
 coderjesus.com, 1
 codersatlas.co, 1
 codersatlas.xyz, 1
-coderslight.com, 1
 codes.pk, 1
 codesgroup.tk, 1
 codesplain.in, 1
 codesport.io, 1
-codespromo.be, 1
 codesquad.com.au, 1
 codestats.net, 1
 codestep.io, 1
@@ -22294,12 +23334,14 @@
 coffeeciel.com.tr, 1
 coffeeinvestigator.com, 1
 coffeemoment.nl, 1
+coffeeonlinemagazine.com, 1
 coffeeshopsandman.nl, 1
 coffeestain.ltd, 1
 coffeetime.fun, 0
 coffeeweb.online, 1
 coffeist.com, 1
 cofinco.nl, 1
+cofradiaqueimada.tk, 1
 cogeneration-energy.com, 1
 cogent.cc, 1
 coggin.church, 1
@@ -22319,12 +23361,15 @@
 coignieresentransition.fr, 1
 coimmvest.com, 1
 coin-exchange.cz, 1
+coin-group.com, 1
 coin-money.tk, 1
 coin-quest.net, 1
 coin.dance, 1
+coin.space, 1
 coinapult.com, 1
 coinbase.com, 1
 coinbit.trade, 0
+coincalc.tk, 1
 coinchat.im, 1
 coincircle.com, 1
 coinclickz.fun, 1
@@ -22347,7 +23392,6 @@
 coins2001.ru, 1
 coinsconnect.co.uk, 1
 coinsmat.com, 1
-coinsubtle.com, 1
 coinsuggest.com, 1
 cointosh.jp, 1
 coinvex.org, 1
@@ -22367,6 +23411,7 @@
 colah.com.au, 1
 colapsys.net, 0
 colarelli.ch, 1
+colarose.tk, 1
 colbert.ml, 1
 colbonews.co.il, 1
 colchesterglobal.com, 1
@@ -22418,7 +23463,6 @@
 collaboraoffice.co.uk, 1
 collaboraoffice.com, 1
 collaborativehealthpsychology.com, 1
-collabornation.net, 1
 collacott.org, 1
 collaction.hk, 1
 collada.org, 1
@@ -22434,8 +23478,8 @@
 collectfood.com, 1
 collectiblebeans.com, 1
 collectif85.com, 1
-collectifitness.fr, 1
 collective-incubator.de, 1
+collectivedg.com, 1
 collectivesupply.com, 1
 collector.cf, 1
 collectorknives.net, 1
@@ -22464,10 +23508,12 @@
 collinmbarrett.com, 1
 collins.kg, 1
 collinselectricco.com, 1
+colloquio.tk, 1
 colloquy.mobi, 1
 colmena.biz, 1
 colo-tech.com, 1
 colocation-rennes.com, 1
+colocerin.com, 1
 colocolochile.tk, 1
 cololi.moe, 1
 colombiaemprendedora.org, 1
@@ -22482,12 +23528,12 @@
 coloppe.com, 1
 color01.net, 1
 coloradobluebook.gov, 1
+coloradoer.tk, 1
 coloradolottery.com, 1
 coloradoroofingservice.com, 1
 coloradoseodesign.com, 1
 coloradosos.gov, 1
 coloraid.net, 1
-colorbitor.com, 1
 colorblindfilms.com, 1
 colorblindprogramming.com, 1
 colorbrush.ru, 0
@@ -22502,19 +23548,23 @@
 coloringnotebook.com, 0
 coloristcafe.com, 1
 colorlib.com, 0
+colorpalette.org, 1
 colorpicker.fr, 1
 colorsbycarin.com, 1
 colorwow.ga, 1
 colossalfoods.com, 1
+colossalit.com.au, 1
 colosseumticket.cz, 1
 colostral.com, 1
 colotimes.com, 1
 colourfulcastles.co.uk, 1
 colourmanagementpro.com, 1
+colourmeren.com, 1
 colpatriaws.azurewebsites.net, 1
 colson-occasions.be, 0
 coltellisurvival.com, 1
 coltonrb.com, 1
+columbiaboatalarms.com, 1
 columbiacountyor.gov, 1
 columbiaproemergencymovers.com, 1
 columbiascaffolding.com, 1
@@ -22543,7 +23593,6 @@
 comchezmeme.com, 1
 comcol.nl, 1
 comdotgame.com, 1
-comdurav.com, 1
 come.ga, 1
 come2cook.com, 1
 comealong.org, 1
@@ -22554,6 +23603,7 @@
 comefollowme2016.com, 0
 comenc.ddns.net, 1
 comeoishii.com, 1
+comeoneileen.tk, 1
 comercialbelzunces.com, 1
 comercialcolombia.tk, 1
 comercialmattos.com, 1
@@ -22566,6 +23616,7 @@
 comestoarra.com, 1
 cometbot.cf, 1
 cometcache.com, 1
+cometonovascotia.ca, 1
 comevius.com, 1
 comevius.org, 1
 comevius.xyz, 1
@@ -22579,7 +23630,9 @@
 comfortsolutionsair.com, 1
 comfriesland.tk, 1
 comfun.net, 1
+comfuzztible.tk, 1
 comfy.cafe, 0
+comfy.gay, 1
 comfypc.com, 1
 comhack.com, 1
 comicbank.org, 1
@@ -22600,6 +23653,7 @@
 commania.co.kr, 1
 commco.nl, 1
 commechezvous.ch, 0
+commencepayments.com, 1
 commentjaichangedevie.fr, 1
 comments.app, 1
 commerce.gov, 1
@@ -22609,6 +23663,7 @@
 commercial-academy.fr, 1
 commercialzone.cf, 1
 commeunamour.com, 1
+commfortchat.tk, 1
 commissaris-vraagbaak.nl, 1
 commissionagenda.com, 1
 commitsandrebases.com, 1
@@ -22620,7 +23675,9 @@
 commons-mayflower.tk, 1
 commonsenseamericanpolitics.com, 1
 commonsensedivorce.ca, 1
+commonsenseinactie.nl, 1
 communalconsulting.org, 1
+communication-services.tk, 1
 communiques.info, 1
 communiquons.org, 1
 communist-party.tk, 1
@@ -22630,6 +23687,7 @@
 communityaligned.com, 1
 communitybangladesh.tk, 1
 communitycodeofconduct.com, 1
+communitydirectory.tk, 1
 communitymanagertorrejon.com, 1
 communote.net, 1
 commure.com, 1
@@ -22652,6 +23710,7 @@
 comoseduzir.net, 1
 comosefazisto.com.br, 1
 comoviajarcontumascota.com, 1
+comoyoko.com, 1
 comp.kiev.ua, 1
 compactador-vendetta.tk, 1
 compactchess.cc, 1
@@ -22662,6 +23721,7 @@
 compalliance.com, 1
 companion-web.net, 1
 company-info-plugins.nl, 1
+companyaneksta.tk, 1
 comparatif-moto.fr, 1
 compare-energie.fr, 1
 compareandrecycle.co.uk, 1
@@ -22689,7 +23749,6 @@
 competencyassessment.ca, 1
 competitor.com, 1
 compeuphoria.com, 1
-comphare.nl, 1
 compibus.fr, 1
 compilenix.org, 1
 complaint.tk, 1
@@ -22729,7 +23788,6 @@
 comprarparaguas.online, 1
 comprauncelular.com, 1
 comprax.nl, 1
-compreair.com, 1
 compreautomacao.com.br, 1
 compree.com, 1
 comprefitasadere.com.br, 1
@@ -22744,11 +23802,13 @@
 compuplast.cz, 1
 compusolve.nl, 1
 compustore.pe, 1
+compustuff.tk, 1
 computec.ch, 1
 computehealth.com, 1
 computer-acquisti.com, 1
 computer-menschen.de, 1
 computer-science-schools.com, 1
+computer-worlds.tk, 1
 computer4me.tk, 1
 computeradvance.tk, 1
 computerassistance.co.uk, 1
@@ -22756,6 +23816,8 @@
 computerbase.de, 1
 computercamaccgi.com, 1
 computeremergency.com.au, 0
+computerforum.tk, 1
+computerhelpbutton.com, 1
 computerhilfe-feucht.de, 1
 computerinfobits.com, 1
 computernetwerkwestland.nl, 1
@@ -22764,7 +23826,8 @@
 computersforlearning.gov, 1
 computersoftware.tk, 1
 computersystems.guru, 0
-computerz.solutions, 0
+computertech-ut.com, 1
+computerz.solutions, 1
 computingaustralia.com.au, 1
 computingaustralia.group, 1
 computingsociety.co.uk, 1
@@ -22784,6 +23847,7 @@
 comunidadciclismo.com, 1
 comunidadmontepinar.es, 1
 comuniondelucia.com, 1
+comunistas.tk, 1
 comunitateonline.tk, 1
 comvos.de, 1
 comw.cc, 1
@@ -22794,6 +23858,7 @@
 concellodoparamo.tk, 1
 concepcion-futbol-club.tk, 1
 concept-web.ch, 0
+concept5.co.il, 1
 conceptatelier.de, 1
 conceptcompany.com, 1
 conceptground.com, 1
@@ -22818,6 +23883,7 @@
 concretedreamsoftexas.com, 1
 concretehermit.com, 0
 concreterepairatlanta.com, 1
+concreterepairconcreteleveling.com, 1
 concreterepairconcreteraising.com, 1
 concursopublico.com.br, 1
 concursos.com.br, 1
@@ -22828,6 +23894,7 @@
 condepenalba.com, 0
 condesaelectronics.com, 1
 condictor.pl, 1
+condit.ml, 1
 condolencemessages.net, 1
 condomania.com, 1
 condominiosi.it, 1
@@ -22835,7 +23902,6 @@
 condonescadistas.tk, 1
 condosforcash.com, 1
 condroz-motors.be, 0
-conduitzw.com, 1
 conecta.team, 1
 conectadev.com, 1
 conectumfinanse.pl, 1
@@ -22848,9 +23914,10 @@
 coneser2gl.com, 1
 conesin.com, 1
 conexaotecidos.com.br, 1
-conexionfit.com, 1
 conexionok.com, 1
 conexiontransporte.com, 1
+conexstudios.online, 1
+conf.tn, 1
 conference-expert.eu, 1
 conference.dnsfor.me, 1
 confia.io, 1
@@ -22860,10 +23927,12 @@
 confidentliving.tk, 1
 config.schokokeks.org, 0
 configwizard.xyz, 1
+confio.pt, 1
 confirmit.ca, 0
 confirmit.com.au, 1
 confirmit.de, 1
 confiscate.ga, 1
+confiscation.tk, 1
 confiwall.de, 1
 conflicting.tk, 1
 conformal.com, 0
@@ -22877,13 +23946,14 @@
 confygo.com, 1
 congafasdesol.com, 1
 congdongnhatviet.com, 1
+congelado.tk, 1
 congenio.com, 0
 congenio.de, 0
 congineer.com, 1
 congnghe.so, 1
 congregacionmitacol.org, 1
+congresistas-ap.tk, 1
 congressmankirk.com, 1
-conhecendocosmeticos.com.br, 1
 coniectoinvestments.com, 1
 conju.cat, 1
 conjugacao.com.br, 1
@@ -22907,16 +23977,14 @@
 connectingdevonandsomerset.co.uk, 1
 connectingrentals.com, 1
 connectingrentalsofbethel.com, 1
-connectionjapan.com, 1
 connectionplanet.nl, 1
 connectionstrings.com, 1
+connective.com.au, 1
 connectivia.it, 1
 connectmath.com, 1
 connectme.com.mx, 1
 connectmy.car, 1
-connectnet247.com, 1
 connecto-data.com, 1
-connecto.digital, 1
 connectum.eu, 1
 connelink.fr, 1
 conner.work, 1
@@ -22934,9 +24002,11 @@
 conocchialidasole.it, 1
 conocedordigital.com, 1
 conociendosalama.com, 1
+conoha.vip, 1
 conorboyd.info, 1
 conory.com, 1
 conotoxia.com, 1
+conpath.net, 1
 conphungtourist.com, 1
 conpins.nl, 1
 conpulpademanzana.es, 1
@@ -22948,6 +24018,7 @@
 conradsautotransmissionrepair.com, 1
 conrail.blue, 1
 conrasd.tk, 1
+conrazon.me, 1
 cons.one, 1
 consagracionamariasantisima.org, 1
 consciente.ch, 1
@@ -22980,6 +24051,7 @@
 consommation-locale.fr, 1
 consonare.de, 1
 consorcionacionalideal.com.br, 1
+conspectstudios.com, 1
 conspiracionweb.tk, 1
 constant-rough.de, 1
 constant.ga, 1
@@ -22989,7 +24061,6 @@
 constexpr.org, 1
 constinit.org, 1
 constituenttracker.com, 1
-constitution.website, 1
 constru-vegas.com.mx, 1
 construccionesceyve.com, 1
 construct.net, 1
@@ -22998,6 +24069,7 @@
 construction-colleges.com, 1
 construction-digitale.fr, 0
 construction-student.co.uk, 1
+constructionstudent.uk, 1
 constructive.men, 1
 construred.tk, 1
 construyetuempresa.com, 1
@@ -23012,9 +24084,11 @@
 consultcelerity.com, 1
 consultimator.com, 1
 consultimedia.de, 1
+consulting-brokerage.tk, 1
 consulting-cloud.com, 1
 consultingconnection.co, 1
 consultinghero.es, 1
+consultinghousenet.tk, 1
 consultoresrey.cl, 1
 consultoriadeseguranca.com.br, 1
 consultoriadigital.pt, 1
@@ -23024,7 +24098,6 @@
 consumer.ee, 1
 consumer.gq, 1
 consumeraction.gov, 1
-consumeractionlawgroup.com, 1
 consumerfiles.com, 1
 consumersentinel.gov, 1
 consuwijzer.nl, 1
@@ -23032,6 +24105,9 @@
 contabilidadebrooklin.com.br, 1
 contact.inc, 1
 contact.xyz, 0
+contactelus88.fr, 1
+contactsolo.tk, 1
+contagiousaf.com, 1
 contailor.de, 1
 containerbeveiliging.nl, 1
 containerspace.com.au, 1
@@ -23039,7 +24115,6 @@
 contato.vip, 1
 conteelegant.ro, 1
 contemplativeeducation.org, 1
-contemplativelens.com, 1
 contenedoresdereciclaje.online, 1
 content-api-dev.azurewebsites.net, 0
 content-hub-1.com, 1
@@ -23047,23 +24122,27 @@
 contentmarathon.com, 1
 contentpass.net, 1
 contentq.nl, 1
+contents.ga, 1
 contessa32experience.com, 1
 contextolog.cf, 1
 conti-profitlink.co.uk, 1
 continuation.io, 1
 continuernom.tk, 1
 continuitycenters.com, 0
-continuum.memorial, 1
+continuum.memorial, 0
 continuumrecoverycenter.com, 1
 contrabass.net, 1
 contractdigital.co.uk, 0
+contractdirectory.gov, 1
 contractormountain.com, 1
 contractorswestga.com, 1
 contractstore.com, 1
 contractwriters.com, 1
+contralaespeculacioninmobiliaria.tk, 1
 contralegem.it, 1
 contrarreforma.tk, 1
 contraspin.co.nz, 1
+contrastchecker.online, 1
 contrastecolombia.com, 1
 contratatupoliza.com, 1
 contratti.it, 1
@@ -23077,8 +24156,10 @@
 controllertech.com, 1
 controlshiftlabs.com, 1
 controlvoltage.cc, 1
+controlyourwifi.com, 1
 controversialrisks.com, 1
 controversialrisks.se, 1
+contuestilo.tk, 1
 contunda.de, 1
 conungranodesal.com, 1
 conv2pdf.com, 1
@@ -23088,6 +24169,7 @@
 conversatis.cf, 1
 conversiepartners.nl, 1
 conversionsciences.com, 1
+convert.im, 1
 convert.zone, 1
 convert2sql.com, 1
 converter.ml, 1
@@ -23109,6 +24191,7 @@
 cookieandkate.com, 1
 cookiecorner.com, 1
 cookiecrook.com, 1
+cookiehulp.nl, 1
 cookiepedia.co.uk, 1
 cookiepro.com, 1
 cookiesoft.de, 1
@@ -23123,6 +24206,7 @@
 cookinsumos.com, 1
 cookmedical.com, 0
 cooko.at, 1
+cooks.house, 1
 cooktoprepairaustin.com, 1
 cookwithmanali.com, 1
 cool-parties.co.uk, 1
@@ -23133,7 +24217,6 @@
 coolattractions.co.uk, 1
 coolbitx.com, 1
 coolcamping.com, 1
-coolcomputers.info, 1
 cooldan.com, 1
 coole-fete.de, 1
 coolerssr.space, 1
@@ -23154,6 +24237,7 @@
 cooltang.ooo, 1
 cooltrades.co.za, 1
 coolvox.com, 1
+coolwaterevergreendrilling.com, 1
 coolweirdfacts.ga, 1
 coomer.me, 0
 coomonte.tk, 1
@@ -23165,12 +24249,15 @@
 coore.jp, 1
 coorpacademy.com, 1
 copa.cf, 1
-copan.com.br, 1
+copan.com.br, 0
 copdfoundation.org, 1
 copedeportes.tk, 1
+copenhagenleadtech.org, 1
+copewithdata.com, 1
 cophumouraustralia.com, 1
 copleylawfirm.com, 1
 copperandtileroofing.com, 1
+copperexports.tk, 1
 copperheados.com, 1
 coppermein.co.za, 1
 copplaw.com, 1
@@ -23192,6 +24279,7 @@
 copyshrug.ca, 1
 copytext.ml, 1
 copywriting-on-demand.tk, 1
+coqiptv.com, 1
 coral-study.eu, 1
 coralcanticorumbarcelona.tk, 1
 coralreef.blue, 1
@@ -23200,13 +24288,16 @@
 corazoncaliente.tk, 1
 corazondemelon.es, 1
 corbi.net.au, 1
+corbusier.gq, 1
 corcoranmn.gov, 1
 cordejong.nl, 1
 cordemar.info, 1
+cordenka.com, 1
 corder.tech, 1
 cordeydesign.ch, 0
 cordis.io, 1
 cordlessdog.com, 1
+corduroyproducts-velvetjackets.tk, 1
 core-collective.co.uk, 1
 core-concepts.de, 0
 core-networks.de, 1
@@ -23218,8 +24309,10 @@
 corecdn.org, 1
 coredns.rocks, 1
 corehealthberks.com, 1
+coreless-initiative.net, 1
 coreless-stretchfilm.com, 1
 coremcnetwork.ml, 1
+coremicro.com, 1
 coremove.tk, 1
 corepartners.com.ua, 1
 coresos.com, 1
@@ -23227,6 +24320,7 @@
 coreum.ca, 1
 coreup.de, 1
 corevetconnect.co.uk, 1
+corexpert.com, 1
 coreyjmahler.com, 1
 coreylmartin.com, 1
 corgei.com, 1
@@ -23243,12 +24337,14 @@
 corkcityfc.tk, 1
 corkedwinebar.com, 1
 corksoncolumbus.com, 1
+corky.tk, 1
 corl3ss.com, 1
 corleoncatering.com, 1
 corlija.com, 1
 corlinde.nl, 1
 corneerasmus.com, 1
 cornelia-schiemann.de, 1
+corner-cabinets.tk, 1
 cornercircle.co.uk, 1
 cornergarage.coop, 1
 cornerstone.network, 1
@@ -23267,10 +24363,12 @@
 coromade.com, 1
 corona-academy.com, 1
 corona-data.eu, 1
+corona-less.tk, 1
 corona-renderer.cloud, 1
 corona-renderer.com, 1
 corona-stats.online, 1
 coronasafe.network, 1
+coronastationphotography.com, 1
 coronavirus-19.es, 1
 coronavirus.de, 1
 coronavirus.gov, 1
@@ -23287,7 +24385,6 @@
 corporacionprodigy.tech, 1
 corporateclash.net, 1
 corporatecomputingsolutions.com, 1
-corporatehitech.com.au, 1
 corporateinbound.com, 1
 corporateinfluencers.com, 1
 corporatesubscriptions.com.au, 0
@@ -23307,11 +24404,11 @@
 correcthorse.pw, 1
 correctiv.org, 1
 correctlydesign.com, 1
-correctpaardbatterijnietje.nl, 1
 correo.club, 1
 correoscorporativos.com, 1
 correotemporal.org, 1
 correspond.gq, 1
+correspondent.ga, 1
 corrick.io, 1
 corriere.roma.it, 1
 corrupted.io, 1
@@ -23319,24 +24416,27 @@
 corsa-b.uk, 1
 corsectra.com, 1
 corsetacademy.tk, 1
+corsi.tk, 1
 corsicalaw.com, 1
 corsihaccpsicurezzalavoro.it, 1
 corsisicurezza.it, 1
 corsorspp.roma.it, 1
+cortadoradeplasma.online, 1
 cortapelos.site, 1
 cortealcastello.it, 1
 cortege.cf, 1
 cortesparapelo.com, 1
 cortex-development.de, 1
-cortexitrecruitment.com, 1
 cortexx.nl, 1
 cortino.ga, 1
 cortis-consulting.ch, 1
 cortizo.com.ar, 1
+cortonaeranieri.com.br, 1
 corum.fr, 1
 corvaglia.com, 1
 corvax.kiev.ua, 1
 corvettesalvage.com, 1
+corvetto.tk, 1
 corvus.eu.org, 1
 coryadum.com, 1
 coryluba.com, 1
@@ -23352,6 +24452,7 @@
 cosmekaitori.jp, 1
 cosmetic-surgery-prices.co.uk, 1
 cosmeticappraisal.com, 1
+cosmeticasimple.com, 1
 cosmeticosnet.com.br, 1
 cosmetify.com, 1
 cosmetiq.tk, 1
@@ -23365,23 +24466,25 @@
 cosmicworlds.mobi, 1
 cosmodacollection.com, 1
 cosmohit.ua, 1
+cosmohosting.site, 1
 cosmos-ink.net, 1
 cosmos-software.tk, 1
 cosmoschaos.net, 1
 cosmosearch-azerbaijan.tk, 1
 cosmosenalerta.tk, 1
 cosmosmkt.com.mx, 1
-cosmoswaterdamagerestoration.com, 1
 cosmundi.de, 1
 cosni.co, 1
 cospi.net, 1
 cosplayer.com, 1
 cospol.ch, 0
 cosset.com.tw, 1
+costa-ballena.tk, 1
 costablanca.villas, 1
 costablancavoorjou.com, 1
 costantinogaming.it, 1
 costarellos.com, 1
+costazulinmobiliaria.com, 1
 costco.co.jp, 1
 costco.co.kr, 1
 costco.co.uk, 1
@@ -23397,6 +24500,8 @@
 costreportdata.com, 0
 costruzioni.milano.it, 1
 costulessdirect.com, 1
+costum-for-men.tk, 1
+cosummitconstruction.com, 1
 cotandoseguro.com, 1
 coteax.com, 1
 coteax.nl, 1
@@ -23420,6 +24525,7 @@
 couetteduvet.fr, 1
 cougar-bordeaux.fr, 1
 cougar.dating, 1
+cougarlyon.fr, 1
 coughlan.de, 1
 could.jp, 1
 coumoul.fr, 1
@@ -23455,7 +24561,6 @@
 couponbates.com, 1
 couponchief.com, 1
 couponcodesme.com, 1
-couponlo.net, 1
 coupy.net, 1
 cour4g3.me, 1
 couragefound.org, 1
@@ -23469,15 +24574,19 @@
 courseorbit.com, 1
 coursera.org, 1
 courses.nl, 1
-courseworkbank.info, 1
+coursingweb.tk, 1
+courtlistener.com, 1
 courtneybearse.com, 1
 courtsunlimitedut.com, 1
 courttranscriptontario.ca, 1
 couscous.recipes, 1
+cousins.tk, 1
 couvreur-hinault.fr, 1
 covbounce.co.uk, 1
+coventry.com, 1
 coveragecareservices.co.uk, 1
 coveredinspiders.com, 1
+coverful.io, 1
 covermytrip.com.au, 1
 covershousing.nl, 1
 covert.sh, 1
@@ -23489,6 +24598,7 @@
 covid19.govt.nz, 1
 covid19.melbourne, 1
 covid19dataportal.si, 1
+covid19details.com, 1
 covid19resilience.org, 1
 covid19responsepod.com, 1
 covid19scotland.co.uk, 0
@@ -23516,11 +24626,11 @@
 coxxs.me, 1
 coxxs.moe, 1
 coya.tw, 1
-cozmaadrian.ro, 1
 cozmoapp.com, 1
 cozmoyachts.com, 1
 cozo.me, 1
 cozumel-activities.com, 1
+cozy.town, 1
 cozyeggdesigns.com, 1
 cozzack.com, 1
 cp-st-martin.be, 1
@@ -23530,6 +24640,7 @@
 cp061.com, 1
 cpad.org.pk, 1
 cpaexamguy.com, 1
+cpafirmnyc.com, 1
 cpanels.us, 1
 cpaneltips.com, 1
 cpap.com, 1
@@ -23543,14 +24654,9 @@
 cpd-education.co.uk, 1
 cpdhealthcare.com, 1
 cpe-colleg.de, 1
-cpe-registry.com, 1
-cpe-registry.net, 1
-cpe-registry.org, 1
 cpegypt.tk, 1
-cperegistry.com, 1
-cperegistry.net, 1
-cperegistry.org, 1
 cpfrancophonie.org, 1
+cpfs-group.com, 1
 cpgiiaragon.es, 1
 cphollywoodproduct.ml, 1
 cphpvb.net, 1
@@ -23563,6 +24669,7 @@
 cppaste.org, 1
 cppressinc.com, 1
 cpqcol.gov.co, 1
+cprewritten.net, 1
 cpro.pt, 1
 cps-sante.ml, 1
 cpsa.co.uk, 1
@@ -23578,6 +24685,7 @@
 cpy.pt, 1
 cqn.ch, 0
 cqr.pt, 1
+cqswxx.com, 1
 cqvradio.ddns.net, 1
 cr-it.net, 1
 cr.search.yahoo.com, 0
@@ -23590,6 +24698,7 @@
 craazzyman21.at, 1
 crabfactory.com.my, 1
 crabrave.space, 1
+crabtreestore.nl, 1
 crackajack.cf, 1
 crackcat.de, 1
 crackedsoftware.cf, 1
@@ -23629,7 +24738,7 @@
 craftyproducts.co.za, 1
 crag.com.tw, 1
 craig-mullins.com, 1
-craigary.net, 0
+craigary.net, 1
 craigbates.co.uk, 0
 craigdavis.ga, 1
 craigfrancis.co.uk, 1
@@ -23642,7 +24751,6 @@
 cralarm.de, 1
 cramersoft.com, 1
 cran-automobiles.fr, 1
-cranberry-tee.de, 1
 crandall.io, 1
 cranems.com.ua, 1
 cranenburgh.nl, 1
@@ -23652,6 +24760,7 @@
 cranshafengin.com, 1
 cranstonri.gov, 1
 craphound.com, 1
+crapitalism.biz, 1
 crapmail.tk, 1
 crapouill.es, 1
 crash-de-1929-et-grande-depression.tk, 1
@@ -23659,7 +24768,13 @@
 crashbolsa.com, 1
 crashboy.ws, 1
 crashcoursecenter.com, 1
+crashcrafter.de, 1
+crashdebug.fr, 1
 crashedata.tk, 1
+cratedb-dev.cloud, 1
+cratedb.cloud, 1
+cratedb.net, 1
+crates-io.cn, 1
 cratss.co.uk, 1
 craveativemedia.com, 0
 cravecraftonline.com, 1
@@ -23676,7 +24791,6 @@
 crazy-coders.com, 1
 crazybear-underground.tk, 1
 crazybulk.co.uk, 1
-crazybulk.com, 1
 crazybulk.de, 1
 crazybulk.fr, 1
 crazycastles.ie, 1
@@ -23684,6 +24798,7 @@
 crazycouple.ml, 1
 crazycraftland.net, 1
 crazycube.fr, 1
+crazycube.tk, 1
 crazydrivers.tk, 1
 crazyfoodninja.com, 1
 crazygifts.cf, 1
@@ -23691,15 +24806,19 @@
 crazyhost.tk, 1
 crazymarvin.com, 1
 crazymeeshu.com, 1
+crazymonkey.gq, 1
 crazynoisybizarre.town, 0
 crazypaul.com, 1
 crazypete.ga, 1
+crazypotato.tk, 1
 crazypowered.com, 1
 crazysavings.ga, 1
 crazystories.tk, 1
 crbug.com, 1
 crc-bank.com, 1
 crc-search.com, 1
+crc32.online, 1
+crc64.online, 1
 crdmendoza.net, 1
 crea-etc.net, 0
 crea-shops.ch, 0
@@ -23720,7 +24839,9 @@
 creamyfox.com, 1
 creandoydesarrollando.com, 1
 creared.edu.co, 1
+crearesiteweb.tk, 1
 creareup.com, 1
+creartcol.tk, 1
 creartcompany.com, 1
 create-ls.jp, 1
 create-website.ga, 1
@@ -23730,10 +24851,13 @@
 createcos.com, 0
 createcpanama.com, 1
 creategyx.ga, 1
+createwithcynthia.com, 1
 creati.me, 1
 creatic.co, 1
 creatieven.com, 1
+creatieverd.nl, 1
 creatingchange.us, 1
+creation-photos.com, 1
 creations-edita.com, 1
 creationsgate.com, 1
 creative-thinking.ro, 1
@@ -23746,6 +24870,7 @@
 creativecommons.org, 0
 creativecommonscatpictures.com, 1
 creativeconceptsvernon.com, 1
+creativedesign.pt, 1
 creativedigital.co.nz, 1
 creativeground.com.au, 1
 creativeideasagency.com, 1
@@ -23767,7 +24892,6 @@
 creatixx-network.de, 0
 creators-design.com, 1
 creators.direct, 1
-creatorswave.com, 1
 creatujoya.com, 1
 creature-comforts.co.za, 1
 crebita.de, 1
@@ -23778,6 +24902,7 @@
 credigo.se, 1
 credit-10.com, 1
 credit-default-swaps.tk, 1
+creditcard52.com, 1
 creditdigital.uk, 1
 creditif.tk, 1
 creditkarma.ca, 1
@@ -23788,7 +24913,6 @@
 creditos-rapidos.com, 1
 creditozen.es, 1
 creditozen.mx, 1
-creditscoretalk.com, 1
 creditsense.com.au, 1
 creditshop.com, 1
 credittoken.io, 1
@@ -23808,6 +24932,8 @@
 cremepassion.de, 1
 crena.ch, 1
 crepa.ch, 0
+crepusculofansmexico.tk, 1
+cresoweb.it, 1
 cresserons.fr, 1
 crest.com, 1
 crestasantos.com, 1
@@ -23827,14 +24953,17 @@
 crgalvin.com, 1
 crgm.net, 1
 criandosites.com.br, 1
+criativedesign.com.br, 1
 cribcore.com, 1
+cricketnmore.com, 1
 crickey.eu, 1
 cricklewood.condos, 1
 cricoff.com, 1
 criena.com, 1
-criena.net, 0
+criena.net, 1
 crimean-wines.tk, 1
 crimebarta.com, 1
+crimefire.in, 1
 crimefreeliving.com, 1
 crimesolutions.gov, 1
 crimethincx.tk, 1
@@ -23845,12 +24974,15 @@
 criminal.enterprises, 1
 criminalcasecheats.ml, 1
 criminallawyerjobdescription.gq, 1
+criminalminds.tk, 1
 crimsonconnect.co.uk, 1
+crimsondragoncosplay.tk, 1
 crimsoninators.ga, 1
 crimsonlettersmusic.com, 1
 crimsonmedia.co.uk, 1
 crinesdanzantes.be, 1
 crip-usk.ba, 1
+criptex.tk, 1
 criptocert.com, 1
 criptofy.com, 1
 criptoinvest.pt, 1
@@ -23859,10 +24991,13 @@
 criptomonedaz.com, 1
 criptomoneylite.tk, 1
 criptozoologia.tk, 1
+crisantacademy.com, 1
 criscitos.it, 1
 criscond.co.uk, 1
 crisisactual.com, 1
+crisisdelos40.tk, 1
 crisisnextdoor.gov, 1
+crismar-flora.tk, 1
 crismatthews.com, 1
 crisp.chat, 1
 crisp.email, 1
@@ -23873,9 +25008,9 @@
 crispinusphotography.com, 1
 crispybacon.ml, 1
 criss.com.ua, 1
+crisssmanmix.tk, 1
 cristaleslitios.com.mx, 1
 cristals.ga, 1
-cristalstandards.com, 0
 cristarta.com, 1
 cristau.org, 1
 cristenberens.tk, 1
@@ -23883,12 +25018,16 @@
 cristiandumitru.tk, 1
 cristianhares.com, 1
 cristianonascimento.ml, 1
+cristiengoller.ga, 1
+cristina.tk, 1
+cristnasar.tk, 1
 cristomoradocusco.tk, 1
 critcola.com, 1
 criterion.ga, 1
 critical-result.com, 1
 critical.software, 1
 critical.today, 0
+criticalcaredvm.com, 1
 criticalculture.cf, 1
 criticalgenesis.tk, 1
 criticalsurveys.co.uk, 1
@@ -23907,8 +25046,10 @@
 crocop.tk, 1
 crocuscoaching.co.uk, 1
 croeder.net, 1
+cromefire.de, 1
 cromefire.myds.me, 1
 cromosomax.com, 1
+cromwell-intl.com, 1
 cromwellvets.co.uk, 1
 cronberg.ch, 1
 croncron.io, 1
@@ -23919,6 +25060,7 @@
 cronologie.de, 1
 cronometer.com, 1
 cronoscentral.be, 1
+crookedcru.tk, 1
 crop-alert.com, 1
 cropdiagnosis.com, 1
 crosbug.com, 1
@@ -23933,14 +25075,12 @@
 crossedwires.net, 1
 crossfiremovies.tk, 1
 crossfitblackwater.com, 1
-crossfitvenegono.it, 1
 crossformer.com, 1
 crossfunctional.com, 1
 crossfw.com, 1
 crossingna.com, 1
 crosslifenutrition.co.uk, 0
 crosslimit.ga, 1
-crossnet.io, 1
 crossorange.jp, 1
 crossorig.in, 1
 crossoverit.com, 1
@@ -23949,6 +25089,7 @@
 crossway.nl, 1
 crosswords123.com, 1
 crosty.tk, 1
+crotchrockets.tk, 1
 crow.tw, 1
 crowcloud.com, 1
 crowd.supply, 1
@@ -23958,7 +25099,7 @@
 crowdfundinggent.be, 1
 crowdliminal.com, 1
 crowdpress.it, 1
-crowds.host, 0
+crowds.host, 1
 crowdsim3d.com, 1
 crowdstack.com, 1
 crowdstack.io, 1
@@ -23982,6 +25123,7 @@
 crsserviceogkloak.dk, 1
 crstat.ru, 1
 crt.cloud, 1
+crt.sh, 1
 crt2014-2024review.gov, 1
 crtalleres.com, 1
 cruceroadicto.com, 1
@@ -24001,6 +25143,7 @@
 crustytoothpaste.net, 1
 crute.me, 1
 cruzadamorada.tk, 1
+cruzitoproducciones.gq, 1
 crvegas.com, 1
 crvenikrst.tk, 1
 crvv.me, 1
@@ -24010,6 +25153,8 @@
 cryoit.com, 1
 cryothanasia.com, 1
 cryp.no, 1
+crypkit.com, 1
+cryps.pl, 1
 crypt-app.net, 1
 crypt.is-by.us, 1
 cryptcheck.fr, 1
@@ -24018,11 +25163,14 @@
 crypted.chat, 1
 crypteianetworks.com, 1
 cryptex.net, 1
+crypticstench.tk, 1
 cryptizy.com, 1
 crypto-clix.xyz, 1
 crypto-gaming.tk, 1
 crypto.graphics, 1
 crypto.is, 0
+cryptoafternoon.com, 1
+cryptoanarchist.tk, 1
 cryptobin.co, 1
 cryptobonus.tk, 1
 cryptocaseproject.com, 1
@@ -24045,6 +25193,7 @@
 cryptojacks.io, 1
 cryptojourney.com, 1
 cryptoki.fr, 1
+cryptolab.tk, 1
 cryptoleed.com, 1
 cryptolocalatm.com, 1
 cryptology.ch, 1
@@ -24053,6 +25202,8 @@
 cryptomixer.io, 1
 cryptomkt.com, 1
 crypton.vercel.app, 1
+cryptonaire.ga, 1
+cryptonetlife.com, 1
 cryptonewsz.com, 1
 cryptonit.cf, 1
 cryptonom.org, 1
@@ -24070,6 +25221,7 @@
 cryptorival.com, 1
 cryptoseb.pw, 1
 cryptoshot.pw, 1
+cryptosolicitations.com, 1
 cryptotrendclub.com, 1
 cryptoya.io, 1
 cryptozoologyguide.com, 1
@@ -24088,6 +25240,7 @@
 crystalcave.nl, 0
 crystalchandelierservices.com, 1
 crystalcherryonline.tk, 1
+crystalcube.tk, 1
 crystaldown.de, 1
 crystalgrid.net, 1
 crystaloscillat.com, 1
@@ -24098,19 +25251,15 @@
 cs-colorscreed-betongulve.dk, 1
 cs-kurnik.pl, 1
 cs.money, 1
-csa-library.org, 1
 csaapac.com, 1
 csaapac.org, 1
 csabg.org, 1
 csacongress.com, 1
 csacongress.org, 1
 csacongress.us, 1
-csadc.org, 1
 csaerotherm.com, 1
 csaposs.com, 1
 csarchispace.com, 1
-csasummit.net, 1
-csasummit.org, 1
 csbya.com, 1
 csca.me, 1
 cscdn.net, 1
@@ -24126,7 +25275,6 @@
 csengle.de, 1
 csfcloud.com, 1
 csfd.cz, 1
-csfloors.co.uk, 1
 csfm.com, 1
 csgf.fun, 1
 csgf.ru, 1
@@ -24160,6 +25308,7 @@
 cslaboralistas.pe, 1
 cslbuild.com, 1
 csmainframe.com, 1
+csnet.live, 1
 csodaorszagovoda.hu, 1
 csokolade.hu, 1
 csosa.gov, 1
@@ -24195,7 +25344,9 @@
 csy.hu, 1
 ct-watches.dk, 1
 ct.search.yahoo.com, 0
+ctbiotech.com, 1
 ctc-transportation.com, 1
+ctchosting.net.au, 1
 ctcloud.ml, 1
 ctcom-peru.com, 1
 ctcp.pt, 1
@@ -24218,7 +25369,6 @@
 ctnguyen.net, 1
 ctnigeria.com, 1
 ctns.de, 0
-ctoforhire.com.au, 1
 ctoin.tw, 1
 ctonovenkogo.tk, 1
 ctor.ch, 1
@@ -24230,11 +25380,13 @@
 ctrlcvz.tk, 1
 ctrld.me, 1
 ctsl.net, 1
+ctt.global, 1
 cttso.gov, 1
 cturpoc.com, 1
 ctyrisinkneri.cz, 1
 cu247secure.ie, 1
 cuartetocontinental.tk, 1
+cuartob.tk, 1
 cuatroymedia.com, 1
 cub-bouncingcastles.co.uk, 1
 cubaal.com, 1
@@ -24288,6 +25440,7 @@
 cuentamecomopaso.es, 1
 cuentas-gratis.ga, 1
 cuentasmutualamr.org.ar, 1
+cues.org.uk, 1
 cuestiondegustos.es, 1
 cuetoems.com, 1
 cuevafelina.tk, 1
@@ -24297,6 +25450,8 @@
 cuir-lipari.fr, 1
 cuisine-ultime.fr, 1
 cuisinecastle.com, 1
+cuitrau.tk, 1
+cukrinelape.com, 1
 culan.dk, 0
 culha.net, 1
 culinary.ga, 1
@@ -24311,6 +25466,7 @@
 cultura10.com, 1
 culturabrasilia.tk, 1
 culturaldiversity.tk, 1
+culturalmaninhos.tk, 1
 culturalparadiso.tk, 1
 culturalsabotage.cf, 1
 culturedcode.com, 1
@@ -24325,6 +25481,7 @@
 culturoquiz.com, 1
 cultuurinonderwijs.be, 1
 cumberlandrivertales.com, 1
+cumbiaperuana.tk, 1
 cumbredelamaternidad.com, 1
 cuminas.com, 1
 cuminas.jp, 1
@@ -24341,7 +25498,6 @@
 cuntflaps.me, 1
 cuoc.org.uk, 1
 cuongthach.com, 0
-cup-keeper.com, 1
 cup.al, 1
 cupcake.pt, 1
 cupcao.gov, 1
@@ -24357,6 +25513,7 @@
 curacao-license.com, 1
 curacaodiveguide.com, 1
 curamail.co.uk, 1
+curamcare.ml, 1
 curaprox.co.th, 1
 curareldolordeespalda.com, 1
 curatedtaste.com, 0
@@ -24373,6 +25530,9 @@
 curontwerptoolgroenbeton.nl, 1
 currency-one.com, 1
 currency-strength.com, 1
+currencyfreaks.com, 1
+current-usa.com, 1
+current.com, 1
 currentbitcoin.news, 1
 currentchaos.tk, 1
 currentcryptocurrency.news, 1
@@ -24381,8 +25541,11 @@
 currentlystreaming.com, 1
 currentlyusa.com, 1
 currynissanmaparts.com, 1
+curseria.com, 1
 curseus.com, 1
 cursive.io, 1
+cursoalia.com, 1
+cursoandroid.com, 1
 cursocatolico.com, 1
 cursodememorizacao.ml, 1
 cursointeractivo.com, 1
@@ -24394,13 +25557,14 @@
 cursosforex.com, 1
 cursosgratuitos.pe, 1
 cursosingles.com, 1
+cursosprogramacion.online, 1
 cursossena.co, 1
-cursosypostgrados.com, 1
 cursuri-de-actorie.ro, 1
 curtacircuitos.com.br, 0
 curtis-smith.me.uk, 1
 curtis-smith.uk, 1
 curtislinville.net, 1
+curtisplumstone.com, 1
 curtispope.com, 1
 curtissmith.me.uk, 1
 curtissmith.uk, 1
@@ -24423,13 +25587,14 @@
 custodiamobili.roma.it, 1
 custodian.nl, 1
 custodyxchange.com, 1
+custom-wear.ua, 1
 custombobbleheads.com, 1
+custombuttonco.com, 1
 customcodeit.com.au, 1
 customdissertation.com, 1
 customerbox.ir, 1
 customerfocus.co.za, 1
 customessaystation.gq, 1
-customfilmworks.com, 1
 customfitbymj.net, 1
 customgear.com.au, 1
 customhash.com, 1
@@ -24442,6 +25607,7 @@
 customsandals.tk, 1
 customshort.link, 1
 customsportsocks.com, 1
+customssupport.com, 1
 customwebsitesplus.com, 1
 customwritings.com, 1
 customwritten.com, 1
@@ -24449,6 +25615,7 @@
 custosd.io, 1
 custosd.net, 1
 custosd.org, 1
+cute2u.com, 1
 cutehost.ga, 1
 cutemodel.ml, 1
 cutephil.com, 1
@@ -24472,10 +25639,10 @@
 cuvva.org, 1
 cuvva.uk, 1
 cuvva.us, 1
+cuwebinars.com, 1
 cuxpool.club, 1
 cuxpool.net, 1
 cuyahogacountyvotesoh.gov, 1
-cv-developpeur-web.fr, 1
 cvazquez.es, 1
 cvc.digital, 1
 cvdeexpo.com, 1
@@ -24507,6 +25674,7 @@
 cwbrtrust.ca, 1
 cwc.gov, 1
 cwgaming.co.uk, 1
+cwgpllc.com, 1
 cwilson.ga, 1
 cwinfo.fi, 1
 cwinfo.net, 1
@@ -24524,12 +25692,15 @@
 cwrcoding.com, 1
 cwwise.com, 1
 cx100.io, 1
+cxbmystore.com, 1
 cxologic.com, 1
 cy.ax, 1
 cy.technology, 1
+cy01.ch, 1
 cyanghost.com, 1
 cyanhexagon.com, 1
 cybbh.space, 1
+cybcryption.org, 1
 cybeautiful.com.br, 1
 cyber-computer.club, 1
 cyber-core.co.uk, 1
@@ -24538,6 +25709,7 @@
 cyber-m.net, 1
 cyber-mech.tk, 1
 cyber-shield.de, 0
+cyber-sikkerhed.dk, 1
 cyber-travel.com, 1
 cyber-world.tk, 1
 cyber-yaroslavl.tk, 1
@@ -24550,6 +25722,7 @@
 cyberarmy.cc, 1
 cyberatlantis.com, 1
 cyberattackincidentresponse.com, 1
+cyberbotx.com, 1
 cyberburek.tk, 1
 cybercareers.gov, 1
 cybercat-tver.tk, 1
@@ -24595,9 +25768,11 @@
 cyberpcforum.com, 1
 cyberphaze.com, 1
 cyberphoenix.tk, 1
+cyberplus.net.id, 1
 cyberprogramming.tk, 1
 cyberpubonline.com, 1
 cyberpunk.guru, 1
+cyberquest.cf, 1
 cyberregister.nl, 1
 cyberregister.org, 1
 cyberrepair.de, 1
@@ -24631,9 +25806,11 @@
 cyberspect.com, 1
 cyberspect.io, 1
 cyberstatus.de, 1
+cyberthreatdata.com, 1
 cybertik.net, 1
 cybertorsk.org, 1
 cybertrash.xyz, 0
+cybertronics.tk, 1
 cybertu.be, 1
 cyberweightloss.com, 1
 cyberwire.nl, 1
@@ -24644,14 +25821,18 @@
 cyborgtheory.tk, 1
 cybozu.cn, 1
 cybozu.com, 1
+cyclamen.tk, 1
 cycledownunder.com, 1
 cyclehackluxembourgcity.lu, 1
+cycleshop.com.ua, 1
 cycleterrace.jp, 1
 cycling74.com, 1
+cyclingbiker.com, 1
 cyclinggoodso.com, 1
 cyclisjumper.gallery, 1
 cyclonedesign.ca, 1
 cyclop-editorial.fr, 1
+cycomm.ro, 1
 cydetec.com, 1
 cyelint.com, 1
 cyfly.org, 1
@@ -24666,7 +25847,7 @@
 cylindehea.com, 1
 cylindricity.com, 1
 cyllos.me, 1
-cynicaloptimist.me, 1
+cynop.me, 1
 cynthiacherry.com, 1
 cyon.ch, 1
 cype.dedyn.io, 1
@@ -24730,35 +25911,37 @@
 d-parts.de, 1
 d-parts24.de, 1
 d-solutions.com.au, 1
+d-systems.tk, 1
 d-taube.de, 1
 d-tousei.co.jp, 1
 d-toys.com.ua, 1
 d-training.de, 1
 d-va.cf, 1
 d-vision-create.com, 1
-d-vision-web.com, 1
+d.nf, 1
 d.nr, 1
 d00228.com, 1
 d00d.de, 1
 d0g.cc, 1
 d0xq.net, 1
 d166.net, 1
+d1k1dblh0pghv8.cloudfront.net, 1
 d1pyhxxwnnp9rt.cloudfront.net, 1
 d1qvlbepn0kduz.cloudfront.net, 1
 d1v7neu4o1h4vp.cloudfront.net, 1
 d2.gg, 1
 d21laxujm54z8h.cloudfront.net, 1
+d24.net, 1
 d24zgh0u05bzjw.cloudfront.net, 1
 d25sxbgdpzj1st.cloudfront.net, 1
 d2ph.com, 1
+d2woj1dt0tk6sn.cloudfront.net, 1
 d30019.com, 1
-d30365.com, 1
 d36533.com, 1
 d36594.com, 1
 d3a.xyz, 1
 d3dev.cf, 1
 d3lab.net, 1
-d3x.pw, 1
 d3xt3r01.tk, 1
 d42.no, 1
 d4b.in.ua, 1
@@ -24771,6 +25954,7 @@
 d58beu28.com, 1
 d64.nl, 1
 d6729.co, 1
+d6729.com, 1
 d6957.co, 1
 d6c5yfulmsbv6.cloudfront.net, 1
 d8.io, 1
@@ -24780,7 +25964,7 @@
 d8228.com, 1
 d82365.com, 1
 d8787.net, 1
-d88-livechat.com, 1
+d88-livechat.com, 0
 d88.ag, 1
 d88.cc, 1
 d88.cn.com, 1
@@ -24842,8 +26026,6 @@
 d88b.vip, 1
 d88c.vip, 1
 d88d99.com, 1
-d88dc08.com, 1
-d88dc24.com, 1
 d88e.vip, 1
 d88md03.com, 1
 d88siteintro.com, 1
@@ -24865,7 +26047,6 @@
 dabbingtee.com, 1
 dabblegoat.com, 0
 dabhand.studio, 1
-dabneydriveanimalhospital.com, 1
 dabstairs.com, 1
 dabuzz.tk, 1
 daceurope.co.uk, 1
@@ -24875,12 +26056,14 @@
 dachdecker-ranzenberger.de, 1
 dachdeckerei-hagen.de, 1
 dachdeckermeister-egon-weiss.de, 1
+dachengquan.ca, 1
 dachshundsaspets.com, 1
 dachshundtalk.com, 1
 daciamodellen.nl, 1
 dada.is, 1
 dadadani.xyz, 1
 dadafterforty.be, 1
+dadcentral.ca, 1
 daddybio.com, 1
 daddyfinger.me, 1
 dado.fr, 1
@@ -24904,6 +26087,7 @@
 dafassl.com, 1
 dafater.sa, 1
 dafe2021.ee, 1
+dafnik.me, 1
 dafont.com, 1
 dafricapress.com, 1
 daftarhajiumroh.com, 1
@@ -24938,6 +26122,7 @@
 daikoz.com, 1
 daily-city.com, 1
 daily-exps.herokuapp.com, 1
+daily-puzzle.tk, 1
 dailyalerts.ga, 1
 dailybihar.com, 1
 dailybits.be, 1
@@ -24946,11 +26131,13 @@
 dailychristianpodcast.com, 1
 dailycricnews.tk, 1
 dailydealika.com, 1
+dailydosehealth.com, 1
 dailydote.com, 1
 dailyemailinboxing.com, 1
 dailyenglishchallenge.com, 1
 dailyhealthylife.ml, 1
 dailykos.com, 1
+dailylime.kr, 1
 dailynewsclubs.ga, 1
 dailynewsfrommedjugorje.ml, 1
 dailyphototips.com, 1
@@ -24963,6 +26150,7 @@
 dailyw88.com, 1
 dailyw88.net, 1
 dailyxenang.com, 1
+daim-avtoelektrika.ru, 1
 daimafengzi.com, 1
 daimonikos.com, 1
 dairikab.go.id, 1
@@ -24973,8 +26161,10 @@
 daisy-peanut.com, 1
 daisyindia.org, 1
 daisypeanut.com, 1
+daisypeel.com, 1
 daisyscars.cf, 1
 daiwa-union.jp, 1
+dajiadu.net, 0
 dajiale.org, 1
 dajjal.org, 1
 dak.org, 1
@@ -24989,11 +26179,10 @@
 dakotasjoint.com, 1
 daktarisys.com, 1
 daktariwildlife.org, 1
+dal-loop.xyz, 1
 dal.net.sa, 1
 dalaran.city, 1
-dalat.blog, 1
 dalb.in, 1
-dalbitresb.me, 1
 dalcomseo.com, 1
 dale-bancruz.tk, 1
 dale-west.com, 1
@@ -25009,6 +26198,7 @@
 dallas.lu, 1
 dallaslu.com, 1
 dallasmenshealth.com, 1
+dallasretiredff.com, 1
 dallastxdivorce.com, 1
 dallaswestinternational.ga, 1
 dalliard.ch, 1
@@ -25016,9 +26206,11 @@
 dalmatiersheusden.be, 1
 daltcore.com, 1
 daltonedwards.me, 1
+daltonlabs.tk, 1
 dam74.com.ar, 1
 damadam.pk, 1
 damaged.org, 1
+damarsarkilar.tk, 1
 damasexpress.com, 1
 damebe.com.br, 1
 damedrogy.cz, 1
@@ -25037,13 +26229,16 @@
 damjanovic.it, 1
 damjanovic.work, 1
 dammekens.be, 1
+damnation.tk, 1
 damngoodpepper.com, 0
 damonline.dk, 1
 dampedia.com, 1
 dampferchef.ch, 1
+damuhan.tk, 1
 damvdolg.gq, 1
 dan-bureau.com, 1
 dan-informacijske-varnosti.si, 1
+dan-maskiner.tk, 1
 dan.me.uk, 1
 dan124.com, 1
 danadameson.tk, 1
@@ -25061,13 +26256,15 @@
 danbergen.com, 1
 danca.com, 1
 dance-colleges.com, 1
+dance-school.tk, 1
+dancefm.tk, 1
+danceonline.fi, 1
 danceproducciones.com, 1
 dancesafe.org, 1
 danceylove.net, 1
 danchen.org, 1
 danchestertonphoto.co.uk, 1
 dancingcubs.co.uk, 1
-danclassroom.com, 1
 dandan101.com, 1
 dandelikaliadventure.com, 1
 dandenongroadapartments.com.au, 1
@@ -25100,8 +26297,10 @@
 daniel-stahl.net, 1
 daniel-wildhaber.ch, 1
 daniel.sb, 1
+danielacocco.it, 1
 danieladentista.com, 1
 danielaeichberger.com, 1
+danielaferpe.tk, 1
 danielalvarez.net, 1
 danielas.boutique, 1
 danieldavies.co.uk, 1
@@ -25110,6 +26309,7 @@
 daniele.tech, 1
 danielehniss.de, 0
 danieleluttazzi.tk, 1
+danieleoneta.it, 1
 danielepestilli.com, 1
 danielesalatti.com, 1
 danielgaughan.com, 1
@@ -25132,7 +26332,6 @@
 danielives.co.uk, 1
 danieljamesscott.org, 1
 danieljstevens.com, 1
-danielkanchev.com, 1
 danielkeppler.com, 1
 danielkoster.nl, 1
 daniellecavazos.com, 1
@@ -25143,7 +26342,6 @@
 danielmoch.com, 1
 danielmorales917.com, 1
 danielmorell.com, 1
-danielnaaman.com, 1
 danielnaaman.net, 1
 danielnaaman.org, 1
 danielparker.com.au, 1
@@ -25153,12 +26351,12 @@
 danielsblog.org, 1
 danielsfirm.com, 1
 danielshaw.co.nz, 1
+danielsinsuranceinc.com, 1
 danielstach.cz, 1
 danielsteiner.net, 1
 danielstiner.me, 1
 danielt.co.uk, 0
 danielthompson.info, 1
-danieltollot.de, 1
 danielve.ga, 1
 danielverlaan.nl, 1
 danielwellington.com, 1
@@ -25185,7 +26383,9 @@
 danndorf.com, 0
 dannhanks.com, 1
 dannicholas.net, 1
+danniellealbrechtdesigns.com, 1
 danny-tittel.de, 1
+danny.fm, 1
 dannycairns.com, 1
 dannycavanagh.tk, 1
 dannygaidateraelgar.com, 1
@@ -25196,6 +26396,7 @@
 dannys.space, 1
 dannyscloud.tk, 1
 dannystevens.co.uk, 1
+dannytemming.tk, 1
 dannywall.com.au, 1
 danoji.cf, 1
 danonsecurity.com, 1
@@ -25220,10 +26421,12 @@
 danstoncu.be, 1
 dantana.de, 1
 dantelistan.com, 1
+dantesinferno.tk, 1
 dantransports.fr, 1
 danusyakti.com, 1
 danux.co.uk, 1
 danw.io, 1
+danwaibel.com, 1
 danwelty.co, 1
 danwelty.me, 1
 danwelty.net, 1
@@ -25279,8 +26482,10 @@
 dark-crystal.tk, 1
 dark-infection.de, 1
 dark-lake.com, 1
+dark-legion.tk, 1
 dark-nova.me, 1
 dark-nova.tk, 1
+dark-programs.com, 1
 dark-vision.cz, 1
 dark.fail, 1
 dark.ninja, 1
@@ -25290,6 +26495,7 @@
 darkcelebration.tk, 1
 darkcores.net, 1
 darkct.com, 1
+darkcure.tk, 1
 darkdestiny.ch, 1
 darkengine.io, 1
 darkengine.net, 1
@@ -25300,6 +26506,7 @@
 darkeststar.org, 1
 darkfilm.tk, 1
 darkfire.ch, 1
+darkfirestudios.tk, 1
 darkforceofhappiness.tk, 1
 darkgames.cf, 1
 darkgrid.eu, 1
@@ -25313,9 +26520,11 @@
 darkleia.com, 1
 darklite.ml, 1
 darkmail.cf, 1
+darkmanthra.tk, 1
 darkmemo.com, 1
 darkmilknyeremeny.hu, 1
 darknessflickers.com, 0
+darknessinme.tk, 1
 darknetlive.com, 1
 darknight.blog, 1
 darkoff.tk, 1
@@ -25323,6 +26532,7 @@
 darkpassionsite.tk, 1
 darkperu.tk, 1
 darkrisks.com, 1
+darksecret.dk, 1
 darkserver.fedoraproject.org, 1
 darkserver.stg.fedoraproject.org, 1
 darkshop.nl, 1
@@ -25330,13 +26540,16 @@
 darkspacelab.com, 1
 darkthreat.ai, 1
 darktime.ru, 1
-darkwater.info, 1
+darkwater.info, 0
 darkwebkittens.xyz, 0
 darkx.me, 1
 darlene.hu, 1
 darlo.co.uk, 0
 darnashop.fr, 1
 darom.jp, 1
+daroozone.ir, 1
+darpa.mil, 1
+darraghbr.co.uk, 1
 darrenellis.xyz, 1
 darrenlines.uk, 1
 darrenm.net, 1
@@ -25359,6 +26572,7 @@
 das-clanpage.tk, 1
 das-forum24.de, 1
 das-mediale-haus.de, 1
+das-quiz-plugin.com, 1
 das-sommercamp.de, 1
 dasgeestig.nl, 1
 dashadmit123.com, 1
@@ -25374,10 +26588,11 @@
 dashwebconsulting.com, 1
 dasignsource.com, 1
 dasinternetluegt.at, 1
+daskirschhaus.com, 1
 dasolindustrialpark.tk, 1
 dassolutions.eu, 1
+dastannevis.com, 1
 daste2kala.ir, 1
-dasteichwerk.at, 1
 dastelefonbuch.de, 1
 dasug.de, 1
 dat4u.de, 1
@@ -25386,6 +26601,7 @@
 data-detox.de, 1
 data-jt.de, 1
 data-loader.com, 1
+data-mail.tk, 1
 data-mining.co.uk, 1
 data-reader.de, 1
 data-replicator.cloud, 1
@@ -25418,7 +26634,6 @@
 datacenternews.us, 1
 datacentrenews.eu, 1
 datacommissioner.gov.au, 1
-datacool.host, 0
 datacool.tk, 1
 datadit.hu, 1
 datadorf.de, 1
@@ -25449,8 +26664,10 @@
 datapun.ch, 1
 dataregister.info, 1
 datasafeassurance.co.uk, 1
+datasat.solutions, 1
 datascience.cafe, 1
 datascience.ch, 0
+datascientest.com, 1
 dataspace.pl, 1
 datastream.org, 1
 datastream.re, 0
@@ -25473,6 +26690,7 @@
 datatypes.net, 1
 datavizable.org, 1
 datax-cloud.de, 1
+datazoo.com, 1
 date-chi.world, 1
 date-hijri.net, 1
 datecougarslocal.com, 1
@@ -25487,7 +26705,6 @@
 dateno1.com, 1
 datenreiter.cf, 1
 datenreiter.org, 1
-datensalat.info, 1
 datenschutz-consult.de, 1
 datenschutz-gruenwald.de, 1
 datenschutz-individuell.de, 1
@@ -25508,10 +26725,12 @@
 dating.wedding, 1
 datingadvice.gq, 1
 datingfakecheck.com, 1
+datinglocalgirls.com, 1
 datingonlinecheck.com, 1
 datingso.com, 1
 datingsrit.tk, 1
 datingticino.ch, 0
+datingyourmate.ga, 1
 datisstom.nl, 1
 datmancrm.com, 1
 datnenhamiltongarden.com, 1
@@ -25521,10 +26740,12 @@
 datorhjalp-stockholm.se, 1
 datorhjalptaby.se, 1
 datorservice-stockholm.se, 1
+datosfreak.tk, 1
 datovyaudit.cz, 1
 datumou-osusume.com, 1
 datumplus.co.uk, 1
 datumstudio.jp, 1
+datutoday.tk, 1
 datutorials.tk, 1
 daubecity.de, 1
 daubehosting.de, 1
@@ -25536,12 +26757,14 @@
 dave-pearce.com, 1
 davecardwell.com, 1
 davedevries.nl, 1
-daveedave.de, 1
+daveedave.de, 0
+davefuller.com.au, 1
 davelage.com, 1
 daveoc64.co.uk, 1
 daveops.net, 1
 davepage.me.uk, 1
 davepearce.com, 1
+davepermen.net, 1
 davepullig.co.uk, 1
 daverandom.com, 1
 daveroverts.nl, 1
@@ -25552,7 +26775,6 @@
 davethom.net, 1
 davevelopment.net, 1
 davewardle.com, 1
-davewood.com.au, 1
 daveyconstructions.com, 1
 david-clarke.id.au, 1
 david-corry.com, 1
@@ -25576,6 +26798,7 @@
 davidbyrne.tk, 1
 davidelstob.com, 1
 davidereinato.tk, 1
+davidetmagali.fr, 1
 davidfetveit.com, 1
 davidfindlay.org, 1
 davidforward.net, 1
@@ -25619,7 +26842,6 @@
 davidzarza.tk, 1
 davidzeegers.nl, 1
 davidzimmerman3.com, 1
-davie3.com, 1
 davimun.org, 1
 davinamccall.tk, 1
 davisdieselandautorepair.com, 1
@@ -25632,6 +26854,7 @@
 davyatletiek.tk, 1
 davyjones.com.br, 1
 davypropper.com, 1
+davys.com.br, 1
 dawgs.ga, 1
 dawidpotocki.com, 1
 dawnbringer.eu, 1
@@ -25655,6 +26878,7 @@
 dayman.net, 1
 daymarksi.com, 1
 daymprove.life, 1
+daynia.net, 1
 dayofdays.be, 1
 dayofthegirl.gc.ca, 1
 days.one, 1
@@ -25680,6 +26904,7 @@
 dazzit.net, 1
 dazzit.org, 1
 dazzit.xyz, 1
+dazzlestart.com, 1
 db-sanity.com, 1
 db-works.nl, 1
 db.ci, 1
@@ -25687,6 +26912,7 @@
 dbapress.org, 1
 dbaron.org, 1
 dbas.cz, 1
+dbase.cf, 1
 dbb.wtf, 1
 dbcartography.com, 1
 dbdc.co.za, 1
@@ -25712,12 +26938,14 @@
 dbtsai.com, 0
 dbw678.com, 1
 dc-acupuncture.com, 0
+dc-design.tk, 1
 dc-elektro.com, 1
 dc-elektro.de, 1
 dc-elektro.eu, 1
 dc-occasies.be, 0
 dc-service.by, 1
 dc-solution.de, 0
+dc-texas.com, 1
 dc562.org, 1
 dc585.info, 1
 dc9.me, 1
@@ -25767,6 +26995,7 @@
 dd44d.net, 1
 dd5197.co, 1
 dd6729.co, 1
+dd6729.com, 1
 dd6957.co, 1
 dd9297.co, 1
 dd9397.com, 1
@@ -25778,12 +27007,14 @@
 ddel.de, 1
 dden.ca, 0
 dden.website, 1
-dden.xyz, 1
 ddepot.us, 1
+dderyce.com, 1
 ddi.one, 1
 ddjia.com, 0
 ddjlawtampa.com, 1
+ddk.dn.ua, 1
 ddkkitchens.com, 1
+ddlcmods.com, 1
 ddmeportal.com, 1
 ddns-anbieter.de, 1
 ddns-test.de, 1
@@ -25820,16 +27051,19 @@
 deadbeef.ninja, 1
 deadboyskilling.tk, 1
 deadc0de.re, 1
+deadhead.tk, 1
 deadmann.com, 1
 deadmorose.ru, 1
 deadpoolonline.ga, 1
 deadpulse.com, 1
+deadpvp.eu, 1
 deadroot.tk, 1
 deadsea.tk, 1
 deadshortaudio.com, 1
 deadspin.com, 1
 deaf.dating, 1
 deaf.eu.org, 1
+deafsound.tk, 1
 deai-life.biz, 1
 deaktualisierung.org, 0
 deal-runners.cf, 1
@@ -25849,14 +27083,18 @@
 dealproject.org.au, 1
 dealroom.co, 1
 dealsammler.de, 1
+dealsbythebay.com, 1
 dealsfromheaven.com, 1
 dealspotr.com, 1
 dealstream.com, 1
+dealstreet.fr, 1
+dealwithstatistics.com, 1
 deamonmail.tk, 1
 deamsterdam.ml, 1
 deamuseum.org, 1
 deanandnatalia.co.za, 1
 deanbank.com, 1
+deanconsultancy.co.uk, 1
 deane.li, 1
 deanjerkovich.com, 1
 deano-s.co.uk, 1
@@ -25877,8 +27115,8 @@
 deathorglory.cc, 1
 deathrockstar.tk, 1
 deathsdomain.com, 1
+deathwarrior.tk, 1
 deathy.ro, 1
-deautomaat.nl, 1
 deavel.com, 1
 deavel.fr, 1
 deavel.net, 1
@@ -25895,6 +27133,7 @@
 debattinnlegg.no, 1
 debauchery.ml, 1
 debbyefurd.com, 1
+debeer.tech, 1
 debie-usedcars.be, 0
 debierhandel.nl, 1
 debigare.com, 1
@@ -25903,6 +27142,7 @@
 debitterballetjes.tk, 1
 deblocking.ga, 1
 debora-singkreis.de, 1
+debora.com.au, 1
 deborahmarinelli.eu, 1
 debostero.tk, 1
 debraydesign.com.au, 1
@@ -25923,6 +27163,7 @@
 decay24.de, 0
 dechat.nl, 1
 dechetor.fr, 1
+decibelnewmusic.com, 1
 decidetreatment.org, 1
 decidio.cc, 1
 decimatechnologies.eu, 1
@@ -25933,7 +27174,6 @@
 decisiontime.online, 0
 decisivetactics.com, 1
 deck.academy, 1
-deckenplatten.org, 1
 deckersheaven.com, 1
 declarationlocationmeublee.com, 1
 declarativ.ga, 1
@@ -25943,6 +27183,7 @@
 decock-usedcars.be, 0
 decode.ga, 1
 decodeanddestroy.com, 1
+decohome.ee, 1
 decompiled.de, 1
 deconsolas.tk, 1
 deconstructind.ro, 1
@@ -25957,6 +27198,7 @@
 decorativeconcretewa.com.au, 1
 decorativecosmetics.tk, 1
 decorativeflooring.com, 1
+decorator.uk, 1
 decoratore.roma.it, 1
 decorestilo.com.br, 1
 decorincasa.com.br, 1
@@ -25970,6 +27212,7 @@
 decrypt.co, 1
 decrypto.net, 1
 decs.es, 1
+decsys.work, 1
 dedelta.net, 1
 dedetizacaoinsetan.com.br, 1
 dedg3.com, 1
@@ -26021,10 +27264,10 @@
 deepl.xyz, 1
 deeplink-medical.com, 1
 deepnet.cc, 1
-deepnote.com, 1
 deeps.cat, 1
 deeps.me, 1
 deepserve.info, 1
+deepsky.tk, 1
 deepsoulutions.cf, 1
 deepspace.dedyn.io, 1
 deepu-mathew.tk, 1
@@ -26049,6 +27292,7 @@
 defendinnovation.org, 1
 defendtheweb.net, 1
 defenestrazionedipra.ga, 1
+defenseweapon.tk, 1
 defensivefirearmsinstruction.org, 1
 defensoresunidos.tk, 1
 defero.io, 1
@@ -26068,7 +27312,7 @@
 defineatheism.com, 1
 defineatheist.com, 1
 definingterms.com, 1
-definitely.cn, 1
+definitely.cn, 0
 definitions360.com, 1
 defis-franciliens.fr, 1
 deflect.ca, 1
@@ -26107,17 +27351,19 @@
 degradarium.com, 1
 degrasboom.nl, 1
 degrasboom.org, 1
+degravel.net, 1
 degreeducation.tk, 1
 degressif.com, 1
 degroupage.info, 1
+dehaanadvocatenkantoor.nl, 1
 dehopre.com, 1
 deiamodas.com.br, 1
 deidee.nl, 1
+deimist.ru, 1
 deimos.gq, 1
 dein-baumdienst.de, 1
 dein-trueffel.de, 1
 deinballon.de, 1
-deine-gitarre.com, 1
 deine-politik.de, 1
 deinelakaien.tk, 1
 deinfoto.ch, 1
@@ -26129,6 +27375,7 @@
 dejandayoff.com, 1
 dejavu.ml, 1
 dejected.ga, 1
+dejfcold.cz, 1
 dejongonline.eu, 1
 dejting-sidor.com, 1
 dejure.org, 0
@@ -26141,6 +27388,7 @@
 dekeurslagers.nl, 1
 dekko.io, 1
 dekonix.ru, 1
+dekoration.tk, 1
 dekulk.nl, 1
 del-ex.de, 1
 delahrzolder.nl, 1
@@ -26155,6 +27403,7 @@
 deleenheir.be, 1
 delegao.moe, 1
 deleidscheflesch.nl, 1
+delennerd.de, 1
 delete.cf, 1
 delfi.lt, 1
 delfic.org, 1
@@ -26164,11 +27413,13 @@
 deliandiver.org, 1
 deliberatedigital.com, 0
 delicatewonders.com, 1
+deliciascomercial.com, 1
 deliciousmedia.co.uk, 1
 delicioustable.com, 1
 delicon.jp, 1
 delid.cz, 1
 delijan24.ir, 1
+delika.io, 1
 delikodu.com, 1
 delikom.de, 1
 delio.tk, 1
@@ -26194,6 +27445,7 @@
 delphine.dance, 1
 delpilarrungue.cl, 1
 delta-data.ch, 1
+delta-games.tk, 1
 delta-host.ml, 1
 delta-smart.ch, 1
 delta-wings.net, 1
@@ -26201,8 +27453,9 @@
 delta8.one, 1
 deltaacademy.org, 1
 deltabadger.com, 1
+deltacountymi.org, 1
 deltafinanceiro.com, 1
-deltafinanceiro.com.br, 1
+deltafinanceiro.com.br, 0
 deltaloja.com.br, 1
 deltamusik.tk, 1
 deltanio.nl, 1
@@ -26222,8 +27475,10 @@
 deluxeblogtips.com, 1
 delvinoadegas.com.br, 1
 delycate.com, 1
+delzottolink.com, 1
 demaison.pro, 1
 demand.io, 1
+demandbase.com, 1
 demarit.fi, 1
 demarle.ch, 0
 demastglazenwasserij.nl, 1
@@ -26235,6 +27490,7 @@
 dementievriendelijk.gent, 1
 dementievriendelijkgent.be, 1
 demeraallergy.com, 1
+demes.tk, 1
 demesos.tk, 1
 demeyere-usedcars.be, 0
 demfloro.ru, 1
@@ -26268,13 +27524,16 @@
 demonforums.tk, 1
 demoniak.ch, 0
 demonicresurrection.tk, 1
+demonmassacre.tk, 1
 demonologyfieldguide.com, 1
+demontage.tk, 1
 demonwav.com, 1
 demonwithin.tk, 1
 demonwolfdev.com, 1
 demopanel.tk, 1
 demostweb.ga, 1
 demotivatorbi.ru, 1
+demoweb.pro, 1
 dempsters.ca, 0
 demsh.org, 1
 demuzere.be, 1
@@ -26282,7 +27541,6 @@
 demuzere.net, 1
 demuzere.org, 1
 demxausa.com, 1
-den-ka.jp, 1
 den.taxi, 1
 denabot.pw, 1
 denaehula.com, 1
@@ -26304,6 +27562,7 @@
 dengisrazu.tk, 1
 dengivdolg.ml, 1
 dengivdom.tk, 1
+denhartogracing.com, 1
 denhotels.com, 1
 denika.com, 1
 denimtoday.com, 1
@@ -26323,6 +27582,7 @@
 denizsartdiary.com, 1
 denizuydur.nl, 1
 denkeandersblog.de, 1
+denken-durchdenken.de, 1
 denkmalagentur.ch, 1
 denkmalsetzung.at, 1
 denkubator.de, 1
@@ -26335,6 +27595,8 @@
 denniskoot.nl, 1
 dennislicht.tk, 1
 dennismurphy.biz, 1
+dennisswiers.tk, 1
+dennistyfus.tk, 1
 dennisvandenbos.nl, 1
 dennmart.me, 1
 dennogumi.org, 1
@@ -26343,6 +27605,7 @@
 densocean.net, 1
 dent.uy, 1
 denta-ua.com, 1
+dentad.com.ua, 1
 dental-colleges.com, 1
 dental-reboot.com, 1
 dental.gq, 1
@@ -26352,6 +27615,7 @@
 dentallaborgeraeteservice.de, 1
 dentaloptimizer.com, 1
 dentals.cf, 1
+dentalscams.org, 1
 dentaltalent.nl, 1
 dentalturism.com, 1
 dentechnica.co.uk, 1
@@ -26361,6 +27625,7 @@
 dentistalagoasanta.com.br, 1
 dentistesdarveauetrioux.com, 1
 dentistglasgow.com, 1
+dentistinbrooklyn.com, 1
 dentistsgainesvillega.com, 1
 dentistslilburnga.com, 1
 dentoncounty.gov, 1
@@ -26368,17 +27633,20 @@
 dentystabirmingham.co.uk, 1
 denuevestore.com, 1
 denugka-vezde.gq, 1
+denunzieren.tk, 1
 denver-design.cf, 1
 denverbph.com, 1
 denverilluminations.com, 1
 denvernews.ml, 1
 denwauranailab.com, 1
 denydarko.tk, 1
+deonlineassistente.nl, 1
 deonlinedrogist.nl, 1
 deonlinespecialist.nl, 1
 deontology.com, 1
 depaco.com, 1
 depannage-traceur.fr, 1
+depapboeren.tk, 1
 deparis.me, 1
 departmentofdefense.tk, 1
 departmentofoncology.com, 1
@@ -26398,6 +27666,7 @@
 dependablehvacrefrigeration.com, 1
 deperewi.gov, 1
 depilacioncon.com, 1
+depilestil.es, 1
 depistage-bejune.ch, 1
 depleteduranium.tk, 1
 deplorablesdaily.com, 1
@@ -26409,7 +27678,7 @@
 depositart.com, 1
 depositomerci.it, 1
 depositomobili.it, 1
-depot24.nl, 1
+depot24.nl, 0
 depotsquarekerrville.com, 1
 depotter-usedcars.be, 0
 deprecate.de, 1
@@ -26422,7 +27691,6 @@
 der-lan.de, 1
 der-rohrstock.club, 1
 der-rudi.eu, 1
-der-windows-papst.de, 0
 derango.tk, 1
 derattizzazione.name, 1
 derattizzazioni.biz, 1
@@ -26448,12 +27716,11 @@
 derf.fr, 1
 derf.red, 1
 derf.us, 1
-dergeilstestammderwelt.de, 1
 derguns.town, 1
 derhil.de, 1
+derinsular.tk, 1
 derival.co.za, 1
 derivativeshub.pro, 1
-derive.cc, 1
 derive.cf, 1
 derivedata.com, 1
 derk-jan.com, 0
@@ -26489,11 +27756,12 @@
 desagaz.com, 1
 desalas.org, 1
 desanctispro.com, 1
-desanta.top, 1
 desapego.com.br, 1
 desarrollando.web.ve, 1
 descargar-apk.org, 1
 descargarwhatsappplusgratis.net, 1
+descobrim.com, 1
+desconfiats.tk, 1
 desec.io, 1
 desentupidorademais.com.br, 1
 deseosvip.tk, 1
@@ -26502,7 +27770,10 @@
 desertbluffs.com, 1
 desertedisland.name, 1
 desertfiredesigns.com, 1
+desertfury.tk, 1
 deserti.tk, 1
+desertlinealuminium.com, 1
+desertlinegroup.com, 1
 desertmedaesthetics.com, 1
 desertsounds.org, 1
 desgenst.ch, 1
@@ -26512,6 +27783,7 @@
 design-in-bad.eu, 1
 design-production.jp, 1
 design-tooning.de, 1
+design-total.com, 1
 design-your-life.info, 1
 design2u.eu, 1
 designanyware.com.br, 1
@@ -26520,8 +27792,8 @@
 designcanada.com, 1
 designconformitylibrary.com, 1
 designed-cybersecurity.com, 1
-designedbygeniuses.com, 1
 designedcybersecurity.com, 1
+designeline.com, 1
 designepublicidade.com.br, 1
 designer-drug.com, 1
 designera.se, 1
@@ -26533,16 +27805,19 @@
 designrhome.com, 1
 designs.codes, 1
 designsbyjanith.com, 1
+designschmiede-oberlausitz.de, 1
+designsite.tk, 1
 designskin.ch, 0
 designsociety.tk, 1
 designtrc.com, 1
 designville.cz, 1
 designville.sk, 1
-desila.jp, 1
 desimpelaere.eu, 1
+desingslash.tk, 1
 desire-host.tk, 1
 desish.cf, 1
 desiskinscience.com, 0
+desivideos.tk, 1
 deskaservices.com, 1
 deskdesign.nl, 1
 deskeen.fr, 1
@@ -26555,10 +27830,12 @@
 desmaakvanplanten.be, 1
 desmo.gg, 1
 desmu.fr, 1
+desonnemannen.tk, 1
 desormiers.com, 1
 despachomariscal.com, 1
 despachomartinyasociados.com, 1
 desperate.solutions, 1
+desperatesailors.com, 1
 despertadoronline.com.es, 1
 despinavandi.gr, 1
 desplats.com.ar, 1
@@ -26574,6 +27851,7 @@
 destiney-arkaden.de, 1
 destinfloor.com, 1
 destinyofthephoenix.me, 0
+destroymc.net, 1
 destroysilence.cf, 1
 destructive-revolution.tk, 1
 destyntek.com, 1
@@ -26582,10 +27860,10 @@
 desuchan.org, 1
 desucla.com, 1
 desveja.com.br, 1
+deswaffelaars.tk, 1
 desyatnichenko.ml, 1
 desynced.rocks, 1
 det-te.ch, 1
-detakhukum.com, 1
 detalhecomercio.com.br, 1
 detali-if.com, 1
 detalika.ru, 1
@@ -26602,6 +27880,7 @@
 detectro.cc, 1
 deteken.be, 1
 detekenmuze.nl, 1
+detenterprise.com, 1
 determapp.de, 1
 dethemium.com, 1
 deti-online.com, 1
@@ -26627,13 +27906,14 @@
 detskie-avto-kresla.tk, 1
 detskysad.com, 1
 detuinmuze.nl, 1
+detulado.com, 1
 detusmascotas.com, 1
+detyamobuv.tk, 1
 detyobuv.tk, 1
 detype.nl, 1
 deu.sh, 1
 deuchnord.fr, 1
 deude.de, 1
-deukie.nl, 1
 deurenfabriek.nl, 1
 deustech-media.tk, 1
 deustech.tk, 1
@@ -26645,6 +27925,7 @@
 deutscher-bericht.de, 1
 deutscher-rollenspielpreis.de, 1
 deutsches-schulportal.de, 1
+deutsches-schutzportal.de, 1
 deutscheshoponline.com, 1
 deutschland-dsl.de, 1
 deux.solutions, 1
@@ -26660,6 +27941,7 @@
 dev-redwood.azurewebsites.net, 1
 dev-sev-web.pantheonsite.io, 1
 dev-tek.de, 1
+dev-test.nl, 1
 dev.moe, 1
 dev.vu, 1
 devafterdark.com, 1
@@ -26678,9 +27960,9 @@
 devdesco.com, 1
 devdomain.cf, 1
 devdoodle.net, 1
+deve.software, 1
 devel.cz, 1
 develify.co, 1
-develop.cool, 1
 develope.cz, 1
 developer.android.com, 1
 developer.moe, 1
@@ -26699,20 +27981,24 @@
 devensys.com, 1
 deventersysteem.nl, 1
 devenv.ml, 1
+devflop.fr, 1
 devh.de, 1
 devh.net, 1
 deviant.email, 1
+devicesgadget.com, 1
 devicom.mx, 1
 devignstudios.co.uk, 1
+devilbyte.tk, 1
 devildog.tk, 1
 devillers-occasions.be, 0
+devilrecords.tk, 1
 devils-co.tk, 1
 devils-point.de, 1
 devilshakerz.com, 1
-devin.bg, 1
 devinfo.net, 0
 devinite.com, 1
 devinslick.com, 1
+devirc.net, 1
 devisnow.fr, 1
 devkid.net, 1
 devkit.cc, 0
@@ -26729,14 +28015,18 @@
 devolution.ws, 1
 devonsawatzky.ca, 1
 devonvintagechina.co.uk, 1
+devopedia.org, 1
 devopers.com.br, 1
 devops.moe, 1
 devops.pf, 1
+devopsbookmarks.org, 1
 devopsish.com, 0
 devos.ml, 1
+devpage.lv, 1
 devpost.com, 1
 devpp.com.br, 1
 devpsy.info, 1
+devr.nl, 1
 devragu.com, 1
 devrandom.net, 1
 devries.one, 1
@@ -26771,6 +28061,7 @@
 dewereldwerktthuis.net, 1
 dewereldwerktthuis.nl, 1
 dewereldwerktthuis.org, 1
+dewerveling.tk, 1
 dewingerdfreinet.be, 1
 dewinter.com, 0
 dewitjes.nl, 1
@@ -26780,9 +28071,11 @@
 dexcellentesidees.tk, 1
 dexign.ro, 1
 dexigner.com, 1
+dexmedio.com, 1
 dexonrest.azurewebsites.net, 1
 dexonservicedeskws.azurewebsites.net, 1
 dexonsoftware.com, 1
+dextra.tk, 1
 deyanadeco.com, 1
 deyute.com, 1
 dez-online.de, 1
@@ -26820,14 +28113,17 @@
 dfepharma.com, 1
 dflcares.com, 1
 dfmn.berlin, 1
+dfmvf.org, 1
 dfranke.com, 1
 dfstoryteller.com, 1
 dfwm.vote, 1
 dfwmv.com, 1
 dfwmv.org, 1
 dfwmv.us, 1
+dfwmv.vote, 1
 dfwwp.com, 1
 dg-1.jp, 1
+dg-pic.tk, 1
 dg1-test.com, 1
 dg1.com, 1
 dg1.services, 1
@@ -26837,6 +28133,7 @@
 dgangsta.net, 1
 dgblaw.com.au, 0
 dgbouncycastlehire.com, 1
+dgeex.eu, 1
 dgitup.com, 1
 dgl-24.de, 1
 dgmedia.tk, 1
@@ -26909,6 +28206,7 @@
 dialect-agency.eu.org, 1
 dialectic-og.com, 1
 dialoegue.com, 1
+dialupnerdstech.com, 1
 diamant.family, 1
 diamant.nyc, 1
 diamante.ro, 1
@@ -26918,17 +28216,16 @@
 diamondcontent.com, 1
 diamondhead-umc.org, 1
 diamondpkg.org, 1
-diamondsleepsolutions.com, 1
 diamondyacca.co.uk, 1
 diamondyze.nl, 1
 diamorphine.com, 1
 diamsmedia.ch, 0
 dianadrive.com, 1
 dianafaraj.de, 1
+dianakaarina.tk, 1
 diananeves.pt, 0
 dianas.sk, 1
 dianefriedli.ch, 0
-diannaobos.com, 0
 dianurse.com, 1
 diare-na-miru.cz, 1
 diario-egipto.com, 1
@@ -26939,9 +28236,9 @@
 diariosurnoticias.com, 1
 diaroma.it, 1
 diarynote.jp, 1
+diaryspace.tk, 1
 diasdasemana.com, 1
 diasp.org, 1
-diasporadialogues.com, 1
 diasporan.cf, 1
 diaspordc.com, 1
 diatrofi-ygeia.gr, 1
@@ -26953,6 +28250,7 @@
 dicaprio.tk, 1
 diccionarioabierto.com, 1
 diccionariodedudas.com, 1
+diccionariomexico.com, 1
 diccionarqui.com, 1
 dice.tokyo, 1
 dicelab-rhul.org, 1
@@ -26980,8 +28278,10 @@
 diclofenaconline.gq, 1
 diclofenactopical.ga, 1
 dicoeste.com, 1
+dictatronics.com, 1
 dictionarypro.net, 1
 dictzone.com, 1
+dida.xin, 1
 didacte.com, 1
 didakeanimaciones.es, 1
 didaktik4you.de, 1
@@ -27023,19 +28323,24 @@
 diegerbers.de, 1
 diegobarrosmaia.com.br, 1
 diegocoy.com, 1
+diegoforlan.tk, 1
 diegogelin.com, 0
 diegogonzalez.com.co, 1
 diegogranada.tk, 1
 diegoisla.ga, 1
 diegorbaquero.com, 1
+diegosalgado.tk, 1
 diegovasconcelos.com.br, 1
 diehildebrands.de, 1
 diehl.io, 1
 diekperaiwseis.gr, 1
 diem-project.org, 1
 diemattels.at, 1
+diemperu.com, 1
+dienaturbinderei.at, 1
 dienchaninstitute.com, 1
 diendorfer.space, 1
+diengiolachoa.com, 1
 dienmattroichonthanh.com, 1
 dienmay88.vn, 1
 diennhienshop.com, 1
@@ -27100,9 +28405,12 @@
 digiaika.com, 1
 digiaika.fi, 1
 digiarc.net, 1
+digibean.com.au, 1
 digibull.email, 1
 digibull.link, 1
+digicami.co.uk, 1
 digicasso.nl, 1
+digicelidgy.com, 1
 digicert-support.com, 1
 digicoca.com, 1
 digicode.hu, 1
@@ -27112,12 +28420,15 @@
 digifloat.io, 1
 digikohan.com, 1
 digikol.net, 1
+digiland.tk, 1
 digilicious.com, 1
+digiloop.co, 1
 digimaat.agency, 1
 digimagical.com, 1
 digimedia.cd, 0
 digimoncard.io, 1
 digino.co.uk, 1
+digino.jp, 1
 digino.us, 1
 digino.xyz, 1
 digipaste.com, 1
@@ -27142,6 +28453,7 @@
 digital-insure.fr, 1
 digital-liberal.ch, 1
 digital-sculpture.org, 1
+digital-techs.com, 1
 digital-workshop.at, 1
 digital.gov, 1
 digital.govt.nz, 1
@@ -27150,6 +28462,7 @@
 digitalagedeals.com, 1
 digitalagencynetwork.com, 1
 digitalakatsuki.com, 1
+digitalalektioner.se, 1
 digitalallies.co.uk, 1
 digitalandsocialmediaacademy.com, 1
 digitalarchitecture.com, 1
@@ -27180,6 +28493,7 @@
 digitale-oekonomie.ch, 1
 digitalecom.ga, 1
 digitalehandtekeningen.nl, 1
+digitalentertainmentnews.com, 1
 digitaleplus.fr, 1
 digitalerror.net, 1
 digitaletanker.com, 1
@@ -27190,14 +28504,17 @@
 digitalforensicsdubai.com, 1
 digitalfoster.org, 1
 digitalframe.nl, 1
+digitalfury.co.uk, 1
 digitalfuturenow.com, 1
 digitalgeckos.com, 1
 digitalgeek.social, 1
 digitalgov.gov, 1
 digitalgymnastics.tk, 1
+digitalhands.tk, 1
 digitalhealth.gov.au, 1
 digitalheart.tk, 1
 digitalhurricane.io, 0
+digitaliandm.com, 1
 digitalid-sandbox.com, 1
 digitalid.com, 1
 digitalid.com.au, 1
@@ -27209,14 +28526,17 @@
 digitalmaniac.co.uk, 1
 digitalmarketingindallas.com, 1
 digitalninja.tk, 1
+digitalnomadsunderground.com, 1
 digitalphoto.group, 1
 digitalphoto.tech, 1
 digitalpiloten.org, 1
 digitalponsel.com, 1
 digitalposition.com, 1
 digitalprimate.my, 1
+digitalprofilers.com, 1
 digitalproj.com, 1
 digitalradio.ie, 1
+digitalreborn.com, 1
 digitalredshirts.com, 1
 digitalrights.center, 1
 digitalrights.fund, 1
@@ -27225,6 +28545,7 @@
 digitalservices.lk, 1
 digitalsignagedisplay.com, 1
 digitalskillswap.com, 1
+digitalsphere.tk, 1
 digitalsurge.io, 1
 digitaltcertifikat.dk, 1
 digitalupcoming.tk, 1
@@ -27252,15 +28573,19 @@
 dijitalzade.com, 1
 dijkmanmuziek.nl, 0
 dijks.com, 1
+dik-manusch.tk, 1
 dikant.eu, 1
 dikiaap.id, 1
+dikkevettescania.tk, 1
 dilation.party, 1
 dilberkebab.co.uk, 0
 dildoexperten.se, 1
 diletec.com.br, 1
 dilibel.be, 1
+diligenciasprime.com.br, 1
 diligo.ch, 0
 dillewijnzwapak.nl, 1
+dillon-mcnamara.com, 1
 dilmarames.com, 1
 dimagrimentoincorso.it, 1
 dimanet.fr, 1
@@ -27270,12 +28595,14 @@
 dime.io, 1
 dimeponline.com.br, 1
 dimequebuscas.cl, 1
+dimesanmedical.com, 1
 dimez.ru, 1
 dimi-inside.com, 1
 dimigo.codes, 1
 dimiskovska.de, 1
 dimism.eu, 1
 dimitrihomes.com, 1
+dimitris.tk, 1
 dimitrovi.tk, 1
 dimmersagourahills.com, 1
 dimmerscalabasas.com, 1
@@ -27301,6 +28628,9 @@
 dimosoftware.fr, 1
 dimseklubben.dk, 1
 dinamikarosta.ml, 1
+dinamofilms.cl, 1
+dinda.tk, 1
+dinderllc.com, 1
 dinepont.fr, 1
 dinero4all.xyz, 1
 dinerroboticurology.com, 1
@@ -27312,14 +28642,14 @@
 dinheirolucrar.com, 1
 dinkommunikasjon.no, 1
 dinmtb.dk, 1
+dinnerclub.tk, 1
 dino.lol, 1
 dinocarrozzeria.com, 1
 dinotv.at, 1
-dinstec.cl, 1
+dinposition.nu, 1
 dintillat.fr, 1
 dintrafic.net, 1
 dinube.com, 1
-diodeled.com, 1
 diodo.me, 1
 dioesfoto.com, 1
 diogeneshoy.com, 1
@@ -27335,6 +28665,7 @@
 diplomatcruises.co.uk, 1
 diplomatiegabon.ga, 1
 diplona.de, 1
+dippydyes.com, 1
 dipro.id, 1
 dipulse.it, 1
 dir2epub.com, 1
@@ -27357,12 +28688,15 @@
 directme.ga, 1
 directnews.be, 1
 directoriostelefonicos.com, 1
+directorseries.com, 1
 directory-aldo.tk, 1
 directory-ecco.tk, 1
+directory-sunglasses.tk, 1
 directorydashboard.ga, 1
 directorydisc.ga, 1
 directoryhub.io, 1
 directorylib.com, 1
+directoryworld.tk, 1
 directpaydayloansonline.ga, 1
 directreal.sk, 1
 directspa.fr, 1
@@ -27370,6 +28704,7 @@
 directtwosolutions.org, 0
 directvacations.com, 1
 directveilig.nl, 1
+directverify.in, 1
 direktvermarktung-schmitzberger.at, 1
 direwolfsoftware.ca, 1
 diriya.lk, 1
@@ -27399,7 +28734,7 @@
 disabuse.cf, 1
 disadattamentolavorativo.it, 1
 disanteimpianti.com, 0
-disboard.org, 1
+disbug.io, 1
 disc.uz, 1
 discarica.bari.it, 1
 discarica.bologna.it, 1
@@ -27416,7 +28751,7 @@
 disco-crazy-world.de, 1
 discodery.com, 1
 discofitta.com, 1
-discohook.org, 1
+discohook.org, 0
 disconformity.net, 1
 disconnect.tk, 1
 discord-chan.net, 1
@@ -27432,10 +28767,12 @@
 discordservers.com, 1
 discordsworld.tk, 1
 discotheque.tk, 1
+discount-course.com, 1
 discount24.de, 1
 discountforelectronics.tk, 1
 discountlumberspokane.com, 1
 discounto.de, 1
+discountpark.fr, 1
 discountpokale.at, 1
 discountpokale.de, 1
 discover-mercure.com, 1
@@ -27444,6 +28781,7 @@
 discoveraustralia.tk, 1
 discoverchinanow.gq, 1
 discoverelement.com, 1
+discoverfloridasprings.com, 1
 discoverhealthage.com, 0
 discoveringdocker.com, 1
 discoverthreejs.com, 1
@@ -27451,17 +28789,28 @@
 discoveryaima.com, 1
 discoveryballoon.org, 1
 discoveryottawa.ca, 1
+discrede.tk, 1
 discrete-passion.com, 1
 discrypt.ca, 1
+discshop.co.nz, 1
+disctranulis.gq, 1
 discus-communications.dk, 1
 discuss-data.net, 1
 discuzindo.net, 1
 dise-online.de, 1
+disengaged.tk, 1
+disenialia.com, 1
 disenowebakus.net, 1
 diseyst.com.ar, 1
+dishwashermagic.tk, 1
 dishwasherrepair-austin.com, 1
 disinclined.org, 1
+disinfectingassociation.com, 1
+disinfectingassociation.org, 1
+disinfectingdoctor.com, 1
+disinfectingdoctors.com, 1
 disinfectiondoctor.com, 1
+disinfectiondoctors.com, 1
 disinfesta.it, 1
 disinfestando.info, 1
 disinfestatore.roma.it, 1
@@ -27516,6 +28865,7 @@
 dismail.de, 1
 disneywallpapers.tk, 1
 disougstroy.com.ua, 1
+dispatchitsolutions.com, 1
 dispatchitsolutions.io, 1
 dispemec.com, 1
 displayenergycertificate.co.uk, 1
@@ -27525,7 +28875,6 @@
 disposable.link, 1
 disproweb.com, 1
 dispur.nic.in, 1
-disroot.org, 1
 disrupters.ch, 0
 dissectcyber.com, 1
 dissectix.io, 1
@@ -27539,12 +28888,15 @@
 distelbentelo.nl, 1
 disti.com, 1
 distiduffer.org, 1
+distilleren.tk, 1
 distillery.com, 1
 distinctdesign2009.com, 1
 distinguishedprisoner.com, 1
+distortmotion.com, 1
 distracteddriving.gov, 1
 distraction.gov, 1
 distratus.com, 1
+distri.com.ua, 1
 distribuidoradecierres.com, 1
 distribuidoraplus.com, 1
 distribuidorveterinario.es, 1
@@ -27553,7 +28905,10 @@
 distributedsystems.science, 1
 distributore.it, 1
 distributori.roma.it, 1
+district09.be, 1
+district09.gent, 1
 districtcapital.com, 1
+distrilentes.com.br, 1
 distrilogservices.com, 1
 distrim.pt, 1
 distrim2.pt, 1
@@ -27562,6 +28917,7 @@
 ditdot.hr, 1
 ditec.sk, 1
 diterzafra.tk, 1
+ditex.ddns.net, 1
 ditfiorinicamargo.com.ar, 1
 diti.me, 1
 dities.tk, 1
@@ -27569,6 +28925,7 @@
 div12.org, 1
 diva.nl, 1
 divari.nl, 1
+divarjonob.ir, 1
 divcoder.com, 1
 dive-japan.com, 1
 divegearexpress.com, 1
@@ -27578,14 +28935,17 @@
 divelyon.fr, 1
 diveplan.org, 1
 diver-equipment.eu, 1
+diveretailing.com, 1
+diverscott.com, 1
 diversificarte.com, 1
-diversityflags.com, 1
+diversity-otherwise.tk, 1
 diversityflags.com.au, 1
 diversityflags.nz, 1
 diversitywatch.asia, 1
 diversitywatch.co.nz, 1
 diversitywatch.com.au, 1
 divewithfrank.com, 1
+divfinsolutions.com, 1
 divi-experte.de, 1
 dividedstates.tk, 1
 dividendz.net, 1
@@ -27595,18 +28955,22 @@
 divinegames.studio, 1
 divineglowinghealth.com, 0
 divinemercyparishvld.com, 1
+divinitas.tk, 1
 divisuite.com, 1
 divjak.at, 1
 divo-remont.tk, 1
-divorciosmurcia.com, 1
+divorcelawyer365.com, 1
 divup.com, 1
 diwei.vip, 1
 dixibox.com, 1
 dixie.com, 1
+dixieweld.com, 1
 dixmag.com, 1
 diyanet.nl, 1
 diycc.org, 1
+diyeat.com, 1
 diyeta.cf, 1
+diyeventhire.co.nz, 1
 diygeek.com, 1
 diyibo.com, 1
 diymediahome.org, 1
@@ -27623,8 +28987,11 @@
 dizzieforums.com, 1
 dizzyskills.tk, 1
 dizzythewizard.co.uk, 1
+dj-ac.com, 1
+dj-iliri.tk, 1
 dj-kupidon.gq, 1
 dj-leszwolle.nl, 1
+dj-morfu.tk, 1
 dj-phil.fr, 1
 dj-x.info, 1
 dj16888.com, 1
@@ -27632,7 +28999,12 @@
 dj16888b.com, 1
 dj16888c.com, 1
 dj16888d.com, 1
+dj62.tk, 1
+djaad.tk, 1
+djakuza.tk, 1
+djalberto.tk, 1
 djamiroquai.tk, 1
+djang.tk, 1
 django-lessons.com, 1
 django.city, 1
 djangobirthday.com, 1
@@ -27642,10 +29014,12 @@
 djangosnippets.org, 1
 djanpana.com, 1
 djazair.ml, 1
-djbbouncycastles.co.uk, 1
+djazair.tk, 1
+djbell.tk, 1
 djbessi.tk, 1
 djbobbytables.com, 1
 djboekingskantoor.nl, 1
+djboomarang.tk, 1
 djc.me, 1
 djcezar.tk, 1
 djconker.tk, 1
@@ -27653,37 +29027,64 @@
 djcursuszwolle.nl, 1
 djdarkz.tk, 1
 djdavid98.art, 0
+djddt.tk, 1
 djdebodas.com, 1
 djdeepstate.com, 1
+djefsane.tk, 1
+djembeforum.tk, 1
 djerba-tunisie.tk, 1
 djfafafa.com, 1
 djfantum.com, 1
+djfelix.tk, 1
+djfilms.tk, 1
 djfrenchy.com, 1
 djfunkyju.de, 1
+djgarcia.tk, 1
 djh-nordmark.de, 1
+djhypnoticstate.tk, 1
 djieno.com, 1
 djinstinct.tk, 1
 djipanov.com, 1
+djjonimix.tk, 1
+djkhalid.tk, 1
+djkonor.tk, 1
 djl188.cc, 1
 djl63.com, 1
 djl63001.com, 1
 djleon.net, 1
+djlifemusic.tk, 1
 djlinux.cz, 1
+djlmk.tk, 1
 djlnetworks.co.uk, 1
+djlogic.tk, 1
 djlove.tk, 1
+djluca.tk, 1
 djmarian.com, 1
-djmoremusic.ng, 1
+djmetrix.tk, 1
+djmilad.tk, 1
+djmoremusic.ng, 0
+djmullet.tk, 1
 djnandoalmenara.tk, 1
+djnasvatbuzlin.cz, 1
 djnext.tk, 1
+djosu.tk, 1
+djpiere.tk, 1
+djrider.tk, 1
+djrizwan.tk, 1
 djroynomden.nl, 1
 djsbouncycastlehire.com, 1
 djsciencecollege.tk, 1
+djsearch.tk, 1
 djshivbabu.tk, 1
+djshox.tk, 1
 djsk.nl, 1
+djskippy.tk, 1
 djslash.tk, 1
 djt-vom-chausseehaus.de, 1
+djtavo.tk, 1
 djul.net, 1
 djurklinikenangelholm.se, 1
+djursland-psykologen.dk, 1
 djvintagevinyl.com, 1
 djvintagevinyl.de, 1
 djvintagevinyl.nl, 1
@@ -27699,6 +29100,7 @@
 dkids.com.br, 1
 dkim-validator.com, 1
 dkn.go.id, 1
+dknoops.xyz, 1
 dko-steiermark.ml, 1
 dkonline.tk, 1
 dkravchenko.su, 0
@@ -27715,6 +29117,7 @@
 dldl.fr, 1
 dleet.com, 1
 dleger.space, 1
+dlepavilion.com, 1
 dlf.exchange, 1
 dlfsymposium.nl, 1
 dlitz.net, 1
@@ -27726,11 +29129,13 @@
 dlmit.be, 1
 dlmixcloud.com, 1
 dlouwrink.nl, 1
+dlp-demo.com, 1
 dlrg-cux-ohz.de, 1
 dlrsp.org, 1
 dlscomputers.com.au, 1
 dlsolutions-inc.com, 1
 dluxelab.com, 1
+dlyabega.tk, 1
 dlyaribalki.tk, 1
 dlyatepla.ml, 1
 dlyl888.com, 1
@@ -27751,6 +29156,7 @@
 dmehub.com, 1
 dmerkel.de, 1
 dmess.ru, 1
+dmesure.xyz, 1
 dmfd.net, 1
 dmfj.io, 1
 dmhtwebordering.com, 1
@@ -27759,6 +29165,7 @@
 dmilb.org, 1
 dmitriid.com, 1
 dmix.ca, 1
+dmliving.nl, 1
 dmlogic.com, 1
 dmmedya.com, 1
 dmmkenya.co.ke, 0
@@ -27766,6 +29173,7 @@
 dmn.sh, 1
 dmni.my, 1
 dmoj.ca, 1
+dmoutlet.com.br, 1
 dmparish.com, 1
 dmramp.com, 1
 dmwall.cn, 1
@@ -27791,6 +29199,7 @@
 dnepropetrovck.tk, 1
 dneprovski.tk, 1
 dnfc.rocks, 1
+dngrexplorer.cf, 1
 dnmlab.it, 1
 dnns.no, 1
 dnoid.to, 1
@@ -27802,10 +29211,10 @@
 dns.expert, 1
 dns.google.com, 1
 dns.sb, 1
-dns8.online, 1
 dnsaio.com, 1
 dnsbird.org, 1
 dnscrawler.com, 1
+dnscrypt-blacklist.tk, 1
 dnscrypt.info, 1
 dnscrypt.nl, 1
 dnscurve.io, 1
@@ -27826,6 +29235,7 @@
 dnsvrfy.net, 1
 dnsvrfy.org, 1
 dnt1egh97ehxx.cloudfront.net, 1
+dnzz123.com, 0
 do-do.tk, 1
 do-prod.com, 0
 do.gd, 1
@@ -27854,17 +29264,16 @@
 doc.new, 1
 doc.python.org, 1
 doc.to, 0
-doc8643.com, 1
 docabo.ch, 1
 docassure.de, 1
 docbox.ch, 1
+docbrown.dk, 1
 docdoc.ru, 1
 docdoc.tel, 1
 docedic.es, 1
 docemeldoces.com, 1
 docesmartini.com.br, 1
 dochimera.com, 1
-dochoitreem.website, 1
 dochub.com, 1
 dockerbook.com, 0
 dockerm.com, 1
@@ -27878,6 +29287,7 @@
 docline.gov, 1
 docloudu.info, 1
 docmed360.com, 1
+docpc86.fr, 1
 docpile.cloud, 1
 docplexus.com, 1
 docs.google.com, 1
@@ -27886,22 +29296,26 @@
 docsend.com, 1
 docskiff.ai, 1
 docsrev-aws.io, 1
+docswallet.com, 1
 doctabaila.com, 1
 doctafit.com, 1
 docteurcardin.com, 0
 doctor-locks.co.uk, 1
 doctor.dating, 1
 doctor360.com.au, 1
-doctorat.site, 0
 doctorbini.com, 1
 doctorcalefon.com, 1
 doctorebonie.com, 1
 doctorfox.co.uk, 1
+doctoriko.tk, 1
 doctoripfix.com, 1
 doctormahamudul.tk, 1
+doctormartinclavo.tk, 1
 doctornaima.ml, 1
 doctorperu.com, 1
+doctorpluss.com, 1
 doctorpower.ga, 1
+doctorpup.com, 1
 doctorwho.cz, 1
 doctour.eu, 1
 doctour.fr, 1
@@ -27918,6 +29332,7 @@
 documods.com, 1
 docupaymentuat.xyz, 1
 docusearch.com, 1
+docusend.biz, 1
 docusign.ca, 1
 docusign.co.uk, 1
 docusign.com, 1
@@ -27934,13 +29349,16 @@
 doczlo.tk, 1
 doda.space, 1
 dodacommunity.tk, 1
+dodard.link, 1
 dodds.cc, 1
 doddy.tk, 1
+dodi-alhelo.tk, 1
 dodikod.tk, 1
 dodolle.co.uk, 1
 dodomy.com.ua, 1
 dodopri.com, 1
 dodotek.digital, 1
+doejedansvereniging.nl, 1
 doeleman.nl, 1
 doencadobeijo.com, 1
 doener-curator.com, 1
@@ -27958,6 +29376,7 @@
 dogadayiz.net, 1
 dogan.ch, 0
 doganoglu.net, 1
+dogcam.tk, 1
 dogcontrol.ca, 1
 dogcratereview.info, 1
 dogday.tk, 1
@@ -27967,6 +29386,7 @@
 dogecoinnews.org, 1
 dogespeed.gq, 1
 dogespeed.tk, 1
+dogfights.tk, 1
 dogforum.de, 1
 dogfriendly.co.uk, 1
 dogft.com, 1
@@ -27978,6 +29398,8 @@
 doggroomingcourse.com, 0
 doginaflat.com, 1
 dogma.it, 1
+dogma2000.tk, 1
+dogmagic.tk, 1
 dogmap.jp, 1
 dogodki.today, 1
 dogoo.com, 1
@@ -27986,6 +29408,7 @@
 dogsdailylife.com, 1
 dogsnaturallymagazine.com, 1
 dogsnow.com, 1
+dogtowneastpowell.com, 1
 dogtrack.tk, 1
 dogvolution.com, 1
 dogwithblog.in, 1
@@ -27993,7 +29416,6 @@
 dogworld.com.br, 1
 doi.org, 1
 doihavetoputonpants.com, 1
-doinaruscior.eu, 1
 doitauto.de, 1
 dojifish.space, 1
 dojin.nagoya, 1
@@ -28006,11 +29428,14 @@
 doki.space, 0
 dokidokimodding.org, 1
 dokipy.no, 1
+dokonline.tk, 1
 dokspot.cf, 1
 dokspot.ga, 1
+dokterkelaminjakarta.com, 1
 doktorplyusheva.ml, 1
 doku-gilde.de, 1
 dokuboard.com, 1
+dokument.tk, 1
 dokuraum.de, 1
 dokutech.fr, 1
 dolarenmexico.com, 1
@@ -28021,6 +29446,7 @@
 dolci-delizie.de, 1
 dolciariasimonini.com, 1
 dolciterapie.com, 1
+doldersumenzoon.tk, 1
 dolg.cf, 1
 dolg.ga, 1
 dolg.gq, 1
@@ -28038,7 +29464,9 @@
 dollarweb.cf, 1
 dolle-shop.com.ua, 1
 dollemore.com, 1
+dollhouseaustralia.com, 1
 dollhousetoyo.com, 1
+dolliesauce.com, 1
 dolly.ga, 1
 dolmencleanroom.com, 1
 dolmenejecutores.com, 1
@@ -28049,6 +29477,9 @@
 dolphin-hosting.com, 1
 dolphin-it.de, 1
 dolys.fr, 1
+dom-byt.tk, 1
+dom-desertov.tk, 1
+dom-riviere.tk, 1
 dom.blog, 1
 dom2news.tk, 1
 dom2seychelles.tk, 1
@@ -28080,10 +29511,13 @@
 domainspeicher.com, 1
 domainspeicher.one, 1
 domainstaff.com, 1
+domainvoider.cf, 1
 domakidis.com, 1
 domarkperu.com, 1
+domashnie-zhiwotnye.ru, 1
 domashnij-pk.ru, 1
 domashnijpk.ru, 1
+domashniy-server.tk, 1
 domaxpoker.com, 1
 domeconseil.fr, 1
 domein-direct.com, 1
@@ -28098,9 +29532,11 @@
 domhaase.me, 1
 domhos.tk, 1
 domian.cz, 1
+domicile-clean.fr, 1
 dominationgame.co.uk, 1
 dominctheroofguy.com, 1
 dominicandfelixroco.tk, 1
+dominicanisimo.tk, 1
 dominicanosenpr.com, 1
 dominicjackson.ga, 1
 dominicself.co.uk, 1
@@ -28112,23 +29548,26 @@
 dominik.st, 1
 dominikaner-vechta.de, 1
 dominioanimal.com.br, 1
+dominiopruebados.ml, 1
 dominique-haas.fr, 0
 dominobot.ir, 1
 dominobreaker.ml, 1
 dominoknihy.cz, 1
 dominolessons.ga, 1
 dominomatrix.com, 1
+domitori.tk, 1
 domix.fun, 1
 domizx.de, 1
 domjh.com, 1
 domlist.tk, 1
 dommascate.com.br, 1
+dommod.tk, 1
 domob.eu, 1
 domodeco.fr, 1
-domodedovo.travel, 1
 domop.net, 1
 domop.org, 1
 domostroiy.tk, 1
+domoticzfaq.ru, 1
 domovitae.io, 1
 domovitae.nl, 1
 domowe-potrawy.pl, 1
@@ -28168,6 +29607,7 @@
 donaldjenkins.com, 1
 donaldm.co.uk, 1
 donaldtrump.ga, 1
+donaldwarner.com, 1
 donamflor.com, 1
 donarmany.online, 1
 donateabox.org, 1
@@ -28177,6 +29617,7 @@
 dondepiso.shop, 1
 dondiabolo.com, 1
 dondibogusky.com, 1
+donera.tk, 1
 donewhen.email, 1
 donewhen.eu, 1
 donewhen.net, 1
@@ -28201,12 +29642,14 @@
 donnachie.net, 1
 donnapepe.tk, 1
 donner-reuschel.de, 1
+donngle.com, 1
 donnons.org, 0
 donnoval.ru, 0
 donostiweb.tk, 1
 donotcallgov.com, 1
 donotlink.it, 1
 donpanda.cz, 1
+donpietraos.tk, 1
 donpomodoro.com.co, 1
 donsremovals.com.au, 1
 dont.re, 1
@@ -28235,6 +29678,7 @@
 dontfwithmyvote.us, 1
 donthedragonwilson.com, 1
 dontkeylog.me, 1
+dontkillspike.tk, 1
 dontlistentoruss.com, 1
 dontpayfull.com, 1
 dontstopcoffee.com, 1
@@ -28250,22 +29694,25 @@
 doodle.com, 1
 dookhtaniha.ir, 1
 dooleylabs.com, 1
+doomsdaymag.tk, 1
 doomsworld.com, 1
 doomtech.net, 1
 doomus.me, 1
 doooooops.com, 1
 doop.im, 1
-door.cards, 1
+doordash.com, 1
 doordash.red, 1
 doordecor.bg, 1
 doorflow.com, 1
 doorgate.pt, 0
 doorhandlese.com, 1
 doorlinekktc.tk, 1
+doors-and-windows.tk, 1
 doorservice.ml, 1
 doorshingekit.com, 1
 doorswest.net, 1
 doortim.nl, 1
+doottrucks.com.au, 1
 dopesoft.de, 1
 dophys.top, 1
 dopiatku.pl, 1
@@ -28295,6 +29742,7 @@
 doridian.de, 1
 doridian.net, 1
 doridian.org, 1
+dorisdeluxe.com, 1
 dorizonline.tk, 1
 dorkface.tk, 1
 dorly.blog, 1
@@ -28309,8 +29757,10 @@
 dorogaminina.tk, 1
 dorpshuis-dwarsgracht.nl, 1
 dorpshuiskesteren.nl, 1
+dorpsparade.tk, 1
 dorquelle.com, 1
 dorsavi.com, 1
+dorsaycreative.com, 1
 dorsetentertainments.co.uk, 1
 dorth.nl, 1
 dortmund.directory, 1
@@ -28362,6 +29812,7 @@
 dotcomtest02-single.azurewebsites.net, 1
 doterrashop.ec, 1
 dotesports.com, 1
+dotfile.tk, 1
 dotgov.gov, 1
 dothebangthingsalon.com, 1
 dothegangnamstyle.tk, 1
@@ -28391,6 +29842,7 @@
 dotyk-snov.tk, 1
 dotyk.me, 1
 douai.me, 1
+douban.city, 1
 double20.gg, 1
 doubleaste.com, 1
 doubleavineyards.com, 1
@@ -28399,12 +29851,14 @@
 doubleness.gq, 1
 doublestat.me, 1
 doubleup.com.au, 1
+doublewood.tk, 1
 doubly.tk, 1
 doubtaboutwill.org, 1
 douceurcarlet.com, 1
 doucheba.gs, 0
 doughseeker.com, 1
 douglas-ma.gov, 1
+douglascuddletoy.com, 1
 douglegomovie.tk, 1
 dougley.com, 1
 dougsautobody.com, 1
@@ -28416,14 +29870,17 @@
 douzer.earth, 1
 douzer.industries, 1
 dovecraft.com.ua, 1
+doveholesband.co.uk, 1
 dovemoe.com, 1
 dovenzorgmalawi.nl, 1
 dovermotion.com, 1
 doverye.tk, 1
+dovetailapp.com, 1
 dovizborsa.com, 1
 dowell.media, 1
 dowellconsulting.com, 1
 dowhatmakegood.de, 1
+dowhatyoucannow.com, 1
 dowling.nz, 1
 down-load.dynu.net, 1
 downandouts.tk, 1
@@ -28436,6 +29893,7 @@
 downloadaja.com, 1
 downloadapk.co.id, 1
 downloadapkpokemongo.ga, 1
+downloadasik.com, 1
 downloadbestapps.com, 1
 downloadfiles.cf, 1
 downloadforum.ml, 1
@@ -28459,12 +29917,13 @@
 downunderporn.com, 1
 downwithchina.com, 1
 dox-box.eu, 1
-doxal.ro, 1
 doxcelerate.com, 1
 doxepin1.gq, 1
 doxepinonline.gq, 1
+doxtex.com, 1
 doxyciclin.tk, 1
 doxycyclin.gq, 1
+doxycycline-online.cf, 1
 doxycycline1.gq, 1
 doxycyclinehyclate100mgcap.cf, 1
 doxycyclineprices.cf, 1
@@ -28492,6 +29951,7 @@
 dpim.org.my, 1
 dpisecuretests.com, 1
 dpk.es, 1
+dplpmtud.com, 1
 dpm-ident.de, 0
 dpmc.govt.nz, 1
 dponetwork.nl, 0
@@ -28511,6 +29971,7 @@
 dr-becarelli-philippe.chirurgiens-dentistes.fr, 1
 dr-beyer.de, 1
 dr-detailing.com, 1
+dr-diffusion.fr, 1
 dr-ermilov.com, 1
 dr-it.co.uk, 0
 dr-kissler.de, 1
@@ -28542,6 +30003,7 @@
 draftguru.com.au, 1
 drafton.com, 1
 dragcave.net, 1
+dragdroplearning.com, 1
 dragfiles.com, 1
 draghetti.it, 1
 draghive.asia, 1
@@ -28552,6 +30014,7 @@
 draghive.org, 1
 draghive.tv, 1
 dragon-aspect.com, 1
+dragon-ballz.tk, 1
 dragon-chem.eu, 1
 dragon-craft.tk, 1
 dragon-hearts.co.uk, 1
@@ -28562,6 +30025,7 @@
 dragon26.com, 1
 dragon95.com, 1
 dragon98.com, 1
+dragonballzfigures.com, 1
 dragonboatfestival.tk, 1
 dragoncave.me, 1
 dragoncityhack.tips, 1
@@ -28578,6 +30042,8 @@
 dragonreal.estate, 1
 dragonroost.tk, 1
 dragonscale.tk, 1
+dragonshare.tk, 1
+dragonsorcerers.tk, 1
 dragonsunited.at, 1
 dragonsunited.ch, 1
 dragonsunited.de, 1
@@ -28599,6 +30065,7 @@
 drakeluce.com, 1
 drakencan.gq, 1
 drakenprospero.com, 0
+drakensberg-tourism.com, 1
 drakenson.de, 1
 drakfot.se, 1
 drakiada.tk, 1
@@ -28620,6 +30087,7 @@
 drastik.cz, 1
 drathaisdentista.com.br, 1
 dratini0.hu, 1
+draughts64.org, 1
 draugr.de, 1
 draw.uy, 1
 drawchan.org, 1
@@ -28647,6 +30115,7 @@
 drdipilla.com, 1
 drdripplumbingsydney.com.au, 1
 dreadd.org, 1
+dreadlocks.tk, 1
 dreadlord.tk, 1
 dream-design.tk, 1
 dream-domain.tk, 1
@@ -28670,6 +30139,7 @@
 dreaming.solutions, 1
 dreamingwolf.sk, 1
 dreaminjewelz.tk, 1
+dreamlab.co.jp, 1
 dreamlandmagic.com, 1
 dreamlifeproperty.cf, 1
 dreamlinks.tk, 1
@@ -28680,9 +30150,10 @@
 dreamof.net, 0
 dreamotis.com, 1
 dreampages.tk, 1
+dreampointech.com, 1
 dreamreality.tk, 1
+dreams-2-reality.com, 1
 dreamsea.tk, 1
-dreamseo.eu, 1
 dreamsforabetterworld.com.au, 1
 dreamsinbits.com, 1
 dreamsjob.cf, 1
@@ -28692,8 +30163,10 @@
 dreamstream.video, 1
 dreamstudio.com, 1
 dreamstudios.tk, 1
+dreamsubmitting.tk, 1
 dreamswelcome.com, 1
 dreamsxxl.com, 1
+dreamworldstudio.tk, 1
 dreamytheatre.com, 1
 dreamz-staging.zone, 1
 dreamz.com, 1
@@ -28722,9 +30195,12 @@
 dresdner-stollen-von-reimann.de, 0
 dresdner-stollen.shop, 1
 dress-cons.com, 1
-dressify.in, 1
+dressabelle.tk, 1
+dressesbal.tk, 1
+dressestore.tk, 1
 dressingmaternity.fr, 1
 dreumesshakira.tk, 1
+drevenevyrobkyprovas.cz, 1
 drevo-door.cz, 0
 drevoline.com.ua, 1
 drew.beer, 1
@@ -28800,11 +30276,15 @@
 drivesly.in, 1
 drivestarfreight.com, 1
 drivetonortheast.com, 1
+driveyouradblockcounterup.com, 1
 driving-lessons.co.uk, 1
 drivingacademy.tk, 1
 drivingcalculator.ga, 1
 drivinghorror.com, 1
+drivinginstruction.tk, 1
 drivinhors.com, 1
+drivio.co.uk, 1
+drivio.uk, 1
 drivya.be, 1
 drivya.ch, 1
 drivya.com, 1
@@ -28820,13 +30300,17 @@
 drjungspine.com, 1
 drkansal.com, 1
 drkashany.ir, 1
+drkathrynhall.com, 1
 drkhsh.at, 0
 drkmtrx.xyz, 1
 drlandis.com, 1
 drlangsdon.com, 1
+drlevi.cf, 1
+drlevi.ga, 1
 drlinkcheck.com, 1
 drmayakato.com, 1
 drmcdaniel.com, 1
+drmonicatadros.com, 1
 drms.us, 1
 drmtransit.com, 1
 drnjewels.com, 1
@@ -28868,6 +30352,7 @@
 dropboxer.net, 1
 dropcop.com, 1
 droperplus.com, 1
+dropeverythingrecords.com, 1
 dropfeedback.to, 1
 dropistic.com, 1
 droplen.com, 1
@@ -28878,6 +30363,8 @@
 dropscloud.spdns.de, 1
 dropshare.cloud, 1
 dropshell.net, 1
+dropshipp.site, 1
+dropshippers.gq, 1
 dropsite.com.au, 1
 droso.dk, 1
 drosophila.tk, 1
@@ -28901,8 +30388,8 @@
 drryanstanton.com, 1
 drsajjadian.com, 1
 drsamuelkoo.com, 1
-drschlarb.eu, 1
 drsejf.cz, 1
+drserena.com, 1
 drshadankabiri.com, 1
 drslawfirm.com, 1
 drstevenwarnock.com, 1
@@ -28922,19 +30409,23 @@
 drturner.com.au, 1
 drubn.de, 1
 druckerei-huesgen.de, 1
+druggist.uk, 1
 drugs.com, 1
 drugstore4you.net, 1
+drugtestingcourses.com, 1
 drugwars.tk, 1
 drugzone.tk, 1
 druides.tk, 1
 druko.cf, 1
 druko.ga, 1
 druko.gq, 1
+drum-majo-ijsselstrand.tk, 1
 drum.tk, 1
 drumbe.at, 1
 drumlines.org, 1
 drummachines.ga, 1
 drummondframing.com, 1
+drumnbass.tk, 1
 drunkcalc.com, 1
 drunkendropkes.tk, 1
 drupal-expert.it, 1
@@ -28955,6 +30446,7 @@
 drybysuperior.com, 1
 drycleancoalition.org, 1
 drycreekphoto.com, 1
+drydensfairfax.com, 1
 drydor.com, 1
 drydrydry.com, 1
 dryerrepairaustin.com, 1
@@ -29004,18 +30496,18 @@
 dsm5.com, 1
 dsmjs.com, 1
 dsmnet.org, 1
+dsn-it.com, 1
 dsn-k.com, 1
 dso-izlake.si, 1
 dsol.hu, 1
-dsorter.com.ng, 1
 dsouzamusic.com, 1
 dspace.pl, 1
+dspnor.com, 1
 dspretoria.co.za, 1
 dspropertyservicesltd.co.uk, 1
 dsreal.de, 1
 dsswise.org, 1
 dstamou.de, 1
-dstat.cc, 1
 dsteiner.at, 1
 dstvinstallkemptonpark.co.za, 1
 dsuinnovation.com, 1
@@ -29057,6 +30549,7 @@
 dual-universe.ga, 1
 dual.pw, 0
 dualascent.com, 1
+dualbix.com, 1
 dualias.xyz, 0
 duama.top, 1
 duan.li, 0
@@ -29067,7 +30560,7 @@
 dubaizone.cf, 1
 dubaosheng.com, 1
 dubbingkursus.dk, 1
-dubious-website.com, 1
+dubl.tk, 1
 dublinrail.tk, 1
 duboisinternational.com, 1
 duboisinvestissements.com, 1
@@ -29091,20 +30584,25 @@
 duckduckstart.com, 1
 duckfam.us, 1
 duckinc.net, 1
+duckman.tk, 1
+duckonthepond.com, 1
 ducksify.com, 1
 ducksoft.fi, 1
+duckstad.net, 1
 duckyubuntu.tk, 1
-duct.me, 1
 ductcare.com, 1
 dudedood.tk, 1
 dudesunderwear.com.br, 0
 due-diligence-security.com, 1
 duelingaces.com, 1
+duellin.tv, 1
 duelsow.eu, 1
 duenas.cat, 1
 duerlund-falkenberg.dk, 1
+duernberg.at, 0
 dues-eckert.com, 1
 duesee.org, 1
+duesseldorf.tk, 1
 duesseldorferheineburschenschaft.tk, 1
 duesterhus.eu, 1
 duffau.net, 1
@@ -29130,8 +30628,10 @@
 dukeandduchessdrivingschool.co.uk, 1
 dukegat.de, 0
 dukeipai.org, 1
+dukeofmetal.tk, 1
 dukers-baelemans.nl, 0
 dukun.de, 1
+dulanic.com, 1
 dulcinea.tk, 1
 dulcinela.es, 1
 dulei.si, 1
@@ -29139,7 +30639,6 @@
 duloxetinbestellen.gq, 1
 duloxetine.gq, 1
 dum.moe, 1
-dumaurier.be, 1
 dumax.fr, 1
 dumax.xyz, 1
 dumb-laws.net.ru, 1
@@ -29151,6 +30650,8 @@
 dumino.bg, 1
 dumpper.ch, 1
 dumpper.com, 1
+dumptrumpets.com, 1
+dumspiro.ch, 1
 duna.com.co, 1
 dunamiscommunity.com, 1
 dunangel.com, 1
@@ -29167,6 +30668,7 @@
 dundeerecycling.ca, 1
 dunedot.tk, 1
 dunesadventure.net, 1
+dunescorporation.tk, 1
 dungbui.co, 0
 dungbui.net, 1
 dungeon-bbs.de, 1
@@ -29180,6 +30682,8 @@
 dunyahalleri.com, 1
 duo.com, 1
 duobus.nl, 1
+duodeno.tk, 1
+duohao.xyz, 1
 duoluodeyu.com, 1
 duonganhtuan.com, 1
 duoqichina.cn, 1
@@ -29196,7 +30700,10 @@
 dura.si, 1
 durabletravailler.tk, 1
 duraes.pt, 0
+duramaximportaciones.com, 1
+duranceofhate.com, 1
 durand.tf, 1
+durand.tk, 1
 durangoenergyllc.com, 1
 duranthon.eu, 1
 durbanlocksmiths.co.za, 1
@@ -29217,6 +30724,8 @@
 durulezzetler.com, 1
 durys.be, 1
 dushu.cat, 1
+duskraven.tk, 1
+dusmomente.com, 1
 dusnan.com, 1
 dust.bio, 1
 dust4you.tk, 1
@@ -29224,6 +30733,7 @@
 dustpla.net, 1
 dustplanet.de, 1
 dustri.org, 0
+dustshop.tk, 1
 dusty.gr, 1
 dustycloth.com, 1
 dustygroove.com, 1
@@ -29234,10 +30744,12 @@
 dutch.desi, 1
 dutch1.nl, 1
 dutchassistancedogs.nl, 1
+dutchcariblaw.nl, 1
 dutchconcreations.com, 1
 dutchfoodie.nl, 1
 dutchforkrunners.com, 1
 dutchpentathlon.nl, 1
+dutchperformanceproducts.nl, 1
 dutchplayers.com, 1
 dutchsailors.com, 1
 dutchwanderers.nl, 1
@@ -29259,13 +30771,15 @@
 duvalo.net, 1
 duvalo.org, 1
 duvalo.sk, 1
-duxbow.de, 1
+duxbow.de, 0
 duxi-s-feromonami.ga, 1
 duyao.de, 0
 duysondang.name.vn, 1
+duzavo.cz, 1
 dv189.com, 1
 dvbris.co.uk, 1
 dvbris.com, 1
+dvclub.tk, 1
 dvdinmotion.com, 1
 dvdland.com.au, 1
 dveri-lugansk.tk, 1
@@ -29280,9 +30794,12 @@
 dvotx.org, 1
 dvprogram.us, 1
 dvwc.org, 1
+dvx.cloud, 1
 dw-loewe.de, 0
+dwaallicht.tk, 1
 dwarf.com.tw, 1
 dweb.link, 1
+dweilorkest-frederikshaven.tk, 1
 dwgf.xyz, 1
 dwhightmolina.com, 1
 dwi-sued.de, 1
@@ -29290,6 +30807,7 @@
 dwood.store, 1
 dworzak.ch, 1
 dwscdv3.com, 1
+dwt-inc.com, 1
 dwtf.de, 1
 dwtm.ch, 1
 dwword.com, 0
@@ -29306,6 +30824,7 @@
 dxgl.info, 1
 dxgl.org, 1
 dxm.no-ip.biz, 1
+dxtours.com, 1
 dxzsj.cn, 1
 dy.express, 1
 dy1d.com, 1
@@ -29322,12 +30841,14 @@
 dyktig.as, 1
 dyktig.no, 1
 dylan-motorcross.tk, 1
+dylan-park.com, 1
 dylandeconinck.cf, 1
 dylangattey.com, 1
 dylanhansch.net, 1
 dylankatz.com, 1
 dylanknoll.ca, 1
 dylanscott.com.au, 1
+dylansevier.com, 1
 dylanspcrepairs.com, 1
 dylanuwr.pl, 1
 dylanwise.net, 1
@@ -29348,6 +30869,7 @@
 dyn-dnhensel.de, 1
 dyn-nserve.net, 1
 dyn.im, 1
+dynabob.tk, 1
 dynacrop.space, 1
 dynadns.de, 1
 dynaloop.net, 0
@@ -29357,7 +30879,6 @@
 dynamicbusinessconsultants.ga, 1
 dynamicconsultantsgroup.com, 1
 dynamicdesignuk.com, 1
-dynamicnet.net, 1
 dynamicpl.us, 1
 dynamicplus.it, 1
 dynamicsdays.info, 1
@@ -29372,13 +30893,16 @@
 dynastic.co, 1
 dynasty-warriors.net, 1
 dynastyredzone.com, 1
+dynatos-cloud.com, 1
 dyncdn.me, 1
 dyneco.io, 1
+dynet.ru, 1
 dynn.be, 0
 dynocc.xyz, 1
 dynorphin.com, 1
 dynorphins.com, 1
 dynsoundmax.tk, 1
+dynts.pro, 1
 dynx.pl, 1
 dypromed.com, 1
 dyregrave.dk, 1
@@ -29411,7 +30935,7 @@
 dzndk.net, 1
 dzndk.org, 1
 dznn.nl, 1
-dzomo.org, 1
+dzomo.org, 0
 dzsi.bi, 0
 dzsibi.com, 1
 dzsula.hu, 1
@@ -29421,13 +30945,14 @@
 dzworld.com, 1
 dzyabchenko.com, 1
 dzyszla.pl, 1
+dzytdl.com, 1
 dzz.by, 1
 e-account.by, 1
 e-alink.com, 1
 e-alive.com, 1
 e-antikvar.tk, 1
+e-bags.tk, 1
 e-balloons.tk, 1
-e-bap.net, 1
 e-baraxolka.ru, 1
 e-belgia.tk, 1
 e-beyond.de, 1
@@ -29436,46 +30961,62 @@
 e-boekhouden.nl, 1
 e-bookshelf.de, 1
 e-borneoshop.com, 1
+e-boss.tk, 1
 e-branchekoden.dk, 1
+e-buro.tk, 1
 e-classroom.tk, 1
 e-coexist.com, 1
 e-colle.info, 1
+e-copys.com, 1
 e-cottage.com.br, 1
 e-daftar.com, 1
 e-dengi.tk, 1
 e-diabolo.tk, 1
 e-diapers.tk, 1
-e-diasporan.cf, 1
 e-emploi.be, 1
 e-enterprise.gov, 1
 e-estonia.com, 1
 e-facture.net, 1
 e-fishing.tk, 1
+e-fitnes.tk, 1
+e-games-board.tk, 1
 e-gemeinde.at, 1
 e-geologia.tk, 1
-e-global.pt, 1
+e-global.pt, 0
 e-guardian.com.br, 1
+e-hair.tk, 1
+e-havenotime.tk, 1
 e-id.ee, 1
 e-informatyk.tk, 1
+e-interactivenet.tk, 1
+e-interview.tk, 1
 e-islam.tk, 1
+e-jackets.tk, 1
+e-jewelrys.tk, 1
 e-kartinki.tk, 1
 e-klempir.cz, 1
 e-knitting.tk, 1
+e-knitwear.tk, 1
 e-lambre.com, 1
+e-lamp.tk, 1
 e-learningbs.com, 1
 e-lifetechnology.com, 1
+e-loshadka.tk, 1
 e-mak.eu, 1
-e-mandataires.fr, 1
+e-massage.tk, 1
+e-medicines.tk, 1
 e-michiganinsurance.com, 1
 e-migration.ch, 1
-e-motionagency.com, 1
+e-nail.tk, 1
 e-nanum.kr, 1
 e-nature.tk, 1
 e-node.net, 1
 e-node.ru, 1
 e-osago.ru, 1
+e-otdyx.tk, 1
 e-peeling.tk, 1
 e-peets.tk, 1
+e-placement.tk, 1
 e-planshet.tk, 1
 e-pokupki.eu, 1
 e-polygraphy.tk, 1
@@ -29485,15 +31026,23 @@
 e-receta.cl, 1
 e-recruitment.tk, 1
 e-referendum.cz, 1
+e-repairs.tk, 1
 e-resident.gov.ee, 1
+e-rest.tk, 1
+e-sauna.tk, 1
 e-servicerms.com, 1
+e-shonai.com, 1
 e-shopdirect.co.za, 1
+e-slots.tk, 1
+e-sneakers.tk, 1
 e-standardstore.org, 1
-e-streams.tv, 1
 e-student.tk, 1
+e-styling.tk, 1
 e-surety.net, 1
 e-sushi.net, 1
 e-sweaters.tk, 1
+e-tables.tk, 1
+e-tablets.tk, 1
 e-teacher.pl, 1
 e-teachers.me, 1
 e-tech-solution.com, 1
@@ -29505,10 +31054,13 @@
 e-tonery.cz, 1
 e-top.uz, 1
 e-traceur-france.fr, 1
+e-transformer.tk, 1
 e-tresor.at, 1
+e-trucking.tk, 1
 e-tune-mt.net, 1
 e-typ.eu, 1
 e-umbrellas.tk, 1
+e-underwear.tk, 1
 e-vau.de, 0
 e-verify.gov, 1
 e-webos.com, 0
@@ -29522,11 +31074,11 @@
 e15r.co, 1
 e27.co, 1
 e2ebrindes.com.br, 1
+e2electric.ir, 1
 e2essentialelements.com, 0
 e2feed.com, 1
 e30.ee, 1
 e30019.com, 1
-e30365.com, 1
 e30gruppe.com, 1
 e365.vip, 1
 e36533.com, 1
@@ -29535,11 +31087,17 @@
 e42.org, 1
 e4work.com.br, 1
 e5197.co, 1
+e52888.com, 1
+e52888.net, 1
+e59888.com, 1
+e59888.net, 1
 e5tv.hu, 1
 e5xbps.com, 1
 e6729.co, 1
+e6729.com, 1
 e6957.co, 1
 e6e.io, 1
+e6web.com, 1
 e7180.com, 1
 e7d.io, 1
 e7fun.net, 1
@@ -29881,9 +31439,12 @@
 eames-clayton.us, 1
 eamigo.com, 1
 eamproperties.com, 1
+eanraig.top, 1
+eapcounselling.com.au, 1
 earfolds.com, 1
 earlybetter.com, 1
 earlyimage.com.au, 1
+earlyvoting.gq, 1
 earlyyearshub.com, 1
 earmarks.gov, 1
 earn.wiki, 1
@@ -29907,8 +31468,9 @@
 eastarm.net, 1
 eastbaycontractor.com, 1
 eastblue.org, 1
-eastcairo-egypt.com, 1
+eastbourne-eip.org, 1
 eastcoastbubbleandbounce.co.uk, 1
+eastcoastexports.tk, 1
 eastdream.tk, 1
 eastendonline.tk, 1
 eastheaven.ml, 1
@@ -29919,26 +31481,29 @@
 eastpeoria-il.gov, 1
 eastping.com, 1
 eastplan.co.kr, 1
+eastportcorp.tk, 1
 eastprovidenceri.gov, 1
 eastside.tk, 1
 eastsidecottages.co.uk, 1
 eastsideroofingcontractor.com, 1
 eaststudios.net, 1
 eastwesttmc.com.au, 1
-eastwind.cloud, 1
 eastyorkshirebuses.co.uk, 1
+easy-affiliations.tk, 1
 easy-company.tk, 1
 easy-design.tk, 1
 easy-factures.fr, 1
 easy-katka.ga, 1
 easy-rpg.org, 0
-easy2bathe.co.uk, 1
 easyadsnbanners.tk, 0
+easybot.tk, 1
 easybrazilianrecipes.com, 1
 easycoding.org, 1
 easyconstat.com, 1
 easycontentplan.com, 1
 easycredit.se, 1
+easycrochet.tk, 1
+easydoityourself.com, 1
 easydumpsterrental.com, 0
 easyeditcms.com, 1
 easyenrollment.net, 1
@@ -29952,6 +31517,7 @@
 easymun.com, 1
 easynm.cn, 1
 easyocm.hu, 1
+easyonlinetest.tk, 1
 easypay.bg, 1
 easypayment.cf, 1
 easypaymentnow.com, 1
@@ -29968,6 +31534,8 @@
 easystore.co, 1
 easysubmit.tk, 1
 easytechguides.com, 1
+easytestonline.tk, 1
+easytrackghana.com, 1
 easytube.ga, 1
 easyweenies.com, 1
 easywin.ml, 1
@@ -29977,6 +31545,7 @@
 eatery.co.il, 1
 eatfitoutlet.com.br, 1
 eatinghouz.com, 1
+eatinglinks.tk, 1
 eatingonions.com, 1
 eatmebudapest.hu, 1
 eaton-works.com, 1
@@ -29986,14 +31555,15 @@
 eatson.com, 1
 eatz-and-treatz.com, 1
 eaucube.com, 1
+eaugalliediscountpharmacy.com, 1
 eaugenethomas.cf, 1
+eautocollision.com, 1
+eautolease.com, 1
 eauxdespleiades.ch, 0
-eazydokan.com, 1
 eazyfreight.co.uk, 1
 eazyg.tk, 1
 eazyproject.net, 1
 eb-net.de, 1
-eb12.de, 1
 eb7.jp, 1
 ebabis.cz, 1
 ebaby.bg, 1
@@ -30040,18 +31610,20 @@
 ebooks4all.tk, 1
 ebooksa.com, 1
 ebooksbag.com, 1
+ebooksgratis.tk, 1
 ebooksgratuits.org, 1
 ebooksinfocus.com, 1
 ebookspy.tk, 1
 ebooktoan.com, 1
+ebookweb.gq, 1
 ebop.ch, 1
-eboutic.ch, 1
 ebpgateway.com, 1
 ebpglobal.com, 0
 ebrnd.de, 1
 ebrowz.com, 1
 ebuha.ga, 1
 ebuku.tk, 1
+eburg.ml, 1
 ec-baran.de, 1
 ec-current.com, 1
 ec.mine.nu, 1
@@ -30064,6 +31636,7 @@
 ecardoo.de, 1
 ecardoo.net, 1
 ecardoo.org, 1
+ecarscash.com, 1
 ecaterina.tk, 1
 ecbt.co.il, 1
 ecchidreams.com, 1
@@ -30090,7 +31663,6 @@
 echoanalytics.com, 1
 echobridgepartners.com, 1
 echodio.com, 1
-echoesfromantiquity.com, 1
 echofoxtrot.co, 1
 echoit.net, 1
 echoit.net.au, 1
@@ -30103,6 +31675,7 @@
 echosystem.fr, 1
 echotango.fr, 1
 echoteam.gq, 1
+echoteam.ml, 1
 echoworld.ch, 0
 echtebewertungen.com, 1
 echternach-immobilien.de, 1
@@ -30128,12 +31701,11 @@
 eco-wiki.com, 1
 eco-work.it, 1
 eco2u.ru, 1
-ecobagsmauritius.com, 1
 ecobin.nl, 1
 ecobrotherss.com, 1
+ecoc2021.org, 1
 ecoccinelles.ch, 0
 ecoccinelles.com, 0
-ecocleanpower.com, 1
 ecoconut.org, 1
 ecocreativity.org, 1
 ecocuisinedesign.com, 1
@@ -30145,15 +31717,20 @@
 ecodigital.social, 1
 ecoeuropa.cf, 1
 ecofac-bs.com, 1
+ecoforel.ru, 1
 ecoformeurope.com, 1
+ecofriendlytravels.com, 1
+ecogarden.design, 1
 ecogen.com.au, 1
 ecogen.net.au, 1
+ecohaus-wongwaen-lumlukka.com, 1
 ecoheatcool.co.uk, 1
 ecohimdv.tk, 1
 ecohomebuild.org, 1
 ecohostingservices.uk, 1
 ecohousejapan.com, 1
 ecolala.my, 1
+ecolan37.ru, 1
 ecole-attalens.ch, 0
 ecole-iaf.fr, 0
 ecoledusabbat.org, 0
@@ -30169,7 +31746,6 @@
 ecomonline.ru, 1
 ecomoov.com, 1
 ecompen.co.za, 1
-ecomuuu.com, 1
 ecomycie.com, 1
 econativa.pt, 1
 econmarketingdigital.com, 1
@@ -30210,8 +31786,10 @@
 ecoupakovka.ga, 1
 ecovetawindoors.com, 1
 ecovision.com.br, 1
+ecowoman-armenian.tk, 1
 ecowoman-bengalian.tk, 1
 ecowoman-indonezian.tk, 1
+ecowoman-turkey.tk, 1
 ecowoman-ukraine.tk, 1
 ecozona.tk, 1
 ecpannualmeeting.com, 1
@@ -30230,10 +31808,9 @@
 ecuadorextremo.com, 1
 ecuadorlibrered.tk, 1
 ecuapaginas.com, 1
+ecubr.com, 1
 ecup.mx, 1
-ecuteam.com, 1
 ecxforum.com, 1
-eczanemheryerde.com, 1
 ed-studios.tk, 1
 ed.gs, 1
 eda.gov, 1
@@ -30249,20 +31826,23 @@
 eddokloosterman.com, 1
 eddsworld.tk, 1
 eddyn.net, 0
+eddysystem.tk, 1
 edeals.co, 1
 edeals.co.com, 1
 edeals.com.co, 1
 edeca.net, 1
 edefrutos.me, 1
-edefrutos2020.com, 1
 edegulkoyu.tk, 1
 edehsa.com, 1
 edeka-jbl-treueaktion.de, 1
+edelveiys.tk, 1
 edelweiss-pinzolo.com, 1
 eden-project-insight.tk, 1
 eden.bz, 1
 eden.co.uk, 1
+edenfactory.tk, 1
 edenming.info, 1
+edenvaleplumber24-7.co.za, 1
 edenvalerubbleremovals.co.za, 1
 eder-steiner.at, 1
 edesseglabor.hu, 1
@@ -30281,7 +31861,9 @@
 edi-gate.com, 1
 edi-gate.de, 1
 edibarcode.com, 1
+edibleforest.co, 1
 edicct.com, 1
+edicionescrimentales.tk, 1
 edihair.com, 1
 edik.tk, 1
 edilane.com, 1
@@ -30290,6 +31872,7 @@
 edilservizivco.it, 1
 edinburghsportsandoutdoorlearning.com, 1
 edincmovie.com, 1
+edirnehaber.tk, 1
 edisa.xyz, 1
 ediscomp.sk, 1
 edisonchee.com, 1
@@ -30311,7 +31894,7 @@
 editorweb360.com, 1
 edlinger.at, 1
 edlinger.mobi, 1
-edlinus.cn, 1
+edlinus.cn, 0
 edman007.com, 1
 edmedications.tk, 1
 edmm.jp, 1
@@ -30331,6 +31914,7 @@
 edservicing.com, 1
 edshogg.co.uk, 1
 edsm.net, 1
+edstem.org, 1
 edstep.com, 1
 edtech-hub.com, 1
 edtech.ee, 1
@@ -30368,11 +31952,11 @@
 educnum.fr, 1
 eductf.org, 1
 edufrog.it, 1
-edugundavetiyesi.com, 1
 eduid.se, 1
 eduif.nl, 0
 edulinks.ml, 1
 edumaritime.net, 1
+edumaster.pro, 1
 edunaut.com.au, 1
 edunet.gq, 1
 edupedia.vn, 0
@@ -30391,6 +31975,7 @@
 edvgarbe.de, 1
 edvmesstec.de, 1
 edward-tagle.tk, 1
+edwardbrowninvestment.tk, 1
 edwardkong.top, 1
 edwards.me.uk, 1
 edwardscommercialcleaning.com, 1
@@ -30402,12 +31987,12 @@
 edwellbrook.com, 1
 edwinlugo.gq, 1
 edwinmattiacci.com, 1
+edwinroelvink.tk, 1
 edwinyrkuniversity.de, 1
 edxg.de, 0
 edxn.de, 1
 edyhenry.tk, 1
 edyou.eu, 1
-edyou.org, 1
 edzilla.info, 1
 ee-terminals.com, 1
 ee00228.com, 1
@@ -30424,6 +32009,7 @@
 ee631.com, 1
 ee632.com, 1
 ee6729.co, 1
+ee6729.com, 1
 ee6957.co, 1
 ee736.com, 1
 ee9297.co, 1
@@ -30454,9 +32040,11 @@
 eeqj.com, 1
 eer.io, 1
 eerstejaarsweekend.nl, 1
+eerstemaanlanding.tk, 1
 eery.de, 1
 eesti.xyz, 1
 eet.nu, 1
+eetestingcenter.com, 1
 eewna.org, 1
 eez.ee, 1
 ef.gy, 1
@@ -30477,6 +32065,7 @@
 effex.ru, 1
 effexorgeneric.ml, 1
 effiasoft.com, 0
+efficientsolutions.tk, 1
 effinfun.com, 1
 efflam.net, 1
 effortlesshr.com, 1
@@ -30484,6 +32073,7 @@
 eficsolar.com, 1
 efinity.io, 1
 efipsactiva.com, 1
+efleetcare.com.au, 1
 eflorashop.be, 1
 eflorashop.ch, 1
 eflorashop.co.uk, 1
@@ -30496,23 +32086,28 @@
 eflorashop.net, 1
 eflorashop.us, 1
 efmcredentialing.org, 1
+efmo.de, 1
 efoood.org, 1
+eforw.com, 1
 efp.nl, 1
+efs-auto.com, 1
 eft.boutique, 1
 eftcorp.biz, 0
 eftelingcraft.net, 1
 eftopia.org, 1
+efutbol.tk, 1
 eg7.co.jp, 1
 eg7.jp, 1
 egablo.black, 1
+egabroaventuras.tk, 1
 egarden.it, 1
 egb.at, 0
 egbc.ca, 1
 egbert.net, 1
 egdigital.com.au, 1
 egedebirgun.com, 1
+egegesh.ru, 1
 egeozcan.com, 1
-eges.eu, 1
 egevpare.tk, 1
 egfl.org.uk, 1
 egg-ortho.ch, 1
@@ -30540,12 +32135,12 @@
 egglestonyouthcenter.org, 1
 eggman.tk, 1
 eggqvq.com, 1
-eggs.gold, 0
+eggs.gold, 1
 eggzr.com, 1
 egh.ir, 1
 egiftcards.be, 1
 egilopaseryh.tk, 1
-egitimetkinlikleri.net, 1
+egittophilia.tk, 1
 egles.eu, 1
 eglisedenantes.fr, 1
 egm-sakura.com, 1
@@ -30557,8 +32152,11 @@
 egonews.ga, 1
 egonix.de, 1
 egorka.ml, 1
+egoroskope.tk, 1
+egoscolumn.tk, 1
 egov4.ch, 1
 egovernment-podcast.com, 1
+egregius.be, 1
 egres.xyz, 1
 egretail.no, 0
 egrojsoft.info, 1
@@ -30574,7 +32172,6 @@
 egypteweb.tk, 1
 egyptexposed.tk, 1
 egyptian.gq, 1
-egypttimetravel.com, 1
 egypttravelz.com, 0
 egzekucija.tk, 1
 ehaccp.it, 1
@@ -30586,6 +32183,7 @@
 ehealth.gov.au, 1
 eheliche-disziplin.schule, 1
 ehipaa.com, 1
+ehlersdanlos.tk, 1
 ehmsen.nu, 1
 ehmtheblueline.com, 1
 ehne.de, 1
@@ -30596,7 +32194,9 @@
 ehr.gov, 1
 ehrenburg.info, 1
 ehrlichesbier.de, 1
+ehtgov.org, 1
 ehtp.pt, 1
+ehtpd.com, 1
 ehtu.tk, 1
 ehub.cz, 1
 ehub.hu, 1
@@ -30618,9 +32218,11 @@
 eidelpes.info, 1
 eifel.website, 1
 eigenbubi.de, 1
+eigenetiket.tk, 1
 eigenpul.se, 1
 eigenpulse.com, 1
 eightballde.luxe, 1
+eightvirtues.tk, 1
 eighty-aid.com, 1
 eightyfour.ca, 1
 eightyfour.pictures, 1
@@ -30637,6 +32239,7 @@
 ein-erbe-fuer-jeden.de, 1
 einaros.is, 1
 eine-andere-welt.org, 1
+einfach-fitz.at, 1
 einfachbahn.de, 1
 einheft.info, 1
 einheizpreis.de, 1
@@ -30644,13 +32247,14 @@
 einkaufi.de, 1
 einmonolog.de, 1
 einomanner.com, 1
+einreiseanmeldung.de, 1
 einrichtwerk.de, 1
-einsatzstellenverwaltung.de, 1
 einsatzstiefel.info, 1
 einscube.com, 1
 einser.com, 1
 einsteinathome.org, 1
 einsteincapital.ca, 1
+einsteins.tk, 1
 eintageinzug.de, 1
 eipione.com, 1
 eirastudios.co.uk, 0
@@ -30662,7 +32266,7 @@
 eisen-biomed.ch, 1
 eisenbahnfreunde-lengerich.de, 1
 eisenhowerlibrary.gov, 1
-eiskratzer-bedrucken.de, 1
+eiskratzer-bedrucken.de, 0
 eit-web.de, 0
 eiti.online, 1
 eiyoushi-shigoto.com, 1
@@ -30703,6 +32307,7 @@
 ekologija.tk, 1
 ekonbenefits.com, 1
 ekong366.com, 1
+ekonomska.tk, 1
 ekostecki.de, 1
 ekouniejow.pl, 1
 ekowibowo.com, 1
@@ -30716,6 +32321,8 @@
 ekspoint-mods.ru, 1
 eku.com.tr, 1
 ekvastra.in, 1
+ekwgroup.co.uk, 1
+ekwilliamsaccountants.co.uk, 1
 ekyu.moe, 1
 ekz-crosstour.ch, 1
 ekzarta.ru, 0
@@ -30736,11 +32343,12 @@
 elainerock.com, 1
 elakiri.cf, 1
 elalmibar.com, 1
-elaon.de, 1
+elaon.de, 0
 elarmariodelucia.com, 1
 elars.de, 1
 elartedelapaz.org, 1
 elarvee.xyz, 1
+elastiekschieten.tk, 1
 elaxy-online.de, 1
 elb500ttl.nl, 1
 elbaal.gov, 1
@@ -30749,9 +32357,10 @@
 elbiaadmin.sk, 1
 elbohlyart.com, 1
 elboogieboutique.com, 1
+elbrus.ooo, 1
 elbrus360.ru, 1
 elburgozagalicos.com, 1
-elcambiador.es, 1
+elbvision.de, 1
 elchamandelaprosperidad.org, 1
 elcin.tk, 1
 elcirculo.mx, 1
@@ -30759,6 +32368,7 @@
 eldenelesat.com, 1
 eldercare.gov, 1
 elderjustice.gov, 1
+elderscrolls.tk, 1
 eldertons.co.uk, 1
 eldevo.com, 1
 eldiariodemof.com, 0
@@ -30767,6 +32377,7 @@
 eldoradocylinders.com, 1
 eldrid.ge, 1
 ele-sm.com, 1
+elecpromo.com, 1
 electerious.com, 1
 electicofficial.com, 0
 electionpresidentiellegabon2009.ga, 1
@@ -30800,6 +32411,7 @@
 electricalsimivalley.com, 1
 electricalthousandoaks.com, 1
 electricalwestlakevillage.com, 1
+electricannihilation.tk, 1
 electricbeast.co, 1
 electriccalabasas.com, 1
 electriccamarillo.com, 1
@@ -30807,8 +32419,10 @@
 electricconejovalley.com, 1
 electricdosvientos.com, 1
 electricfencebenoni.co.za, 1
-electricgatemotorrandburg.co.za, 1
+electricfireplaces.tk, 1
 electricgatemotorsalberton.co.za, 1
+electricgatemotorsberea.co.za, 1
+electricgatemotorsbluff.co.za, 1
 electricgatemotorskemptonpark.co.za, 1
 electricgypsies.nl, 1
 electrichiddenhills.com, 1
@@ -30844,6 +32458,7 @@
 electricmalibu.com, 1
 electricmoorpark.com, 1
 electricnewburypark.com, 1
+electrico.tk, 1
 electricoakpark.com, 1
 electricpower.tk, 1
 electricsimivalley.com, 1
@@ -30851,10 +32466,13 @@
 electricwestlakevillage.com, 1
 electro-pak.com.pk, 1
 electrocomplect.com.ua, 1
+electrodomesticos.tk, 1
 electrodomesticosmiro.com, 1
+electrodvig.ru, 1
 electroforum.tk, 1
 electrolivefest.spb.ru, 1
 electromagnetism.gq, 1
+electromotor.tk, 1
 electronic-ignition-system.com, 1
 electronicafacil.net, 1
 electronicayseguridadmonserrate.com, 1
@@ -30863,6 +32481,7 @@
 electronictucuman.com, 1
 electroniko.cf, 1
 electronis.ru, 1
+electronmag.tk, 1
 electroservice.co.za, 1
 electrosoftcloud.com, 1
 electrostatics.com, 1
@@ -30874,17 +32493,18 @@
 elefantevoador.com, 1
 elegance-lingerie.com, 1
 elegance-sm.com, 1
+elegancecement.com, 1
 eleganceperfumes.com.br, 1
 elegant-design.tk, 1
 elegantlatex.tk, 1
 elegantly-clean.co.uk, 1
+elegro.cz, 1
 eleicoes2014.com.br, 1
 eleicoes2016.com.br, 1
 eleicoes2018.com, 1
 elejordemarketingconsultancy.com, 1
 eleken.jp, 1
 elekharris.com, 1
-elektrische-zahnbuerste24.de, 1
 elektro-adam.de, 1
 elektro-diehm.de, 1
 elektro-doerr.com, 1
@@ -30906,7 +32526,10 @@
 elektroistrument.tk, 1
 elektrokarges.de, 1
 elektrolang.com, 1
+elektrolety.com, 1
+elektrolety.cz, 1
 elektrometz.de, 1
+elektromont.tk, 1
 elektromotor.tk, 1
 elektronickakancelar.cz, 1
 elektronische-post.org, 1
@@ -30934,8 +32557,10 @@
 elementblend.com, 1
 elementbookings.com, 1
 elementoraddons.com, 1
+elements-space-time.com, 1
 elements.guide, 1
 elementshop.co.uk, 1
+elementsoftware.tk, 1
 elena-baykova.ru, 1
 elena-paparizou.tk, 1
 elena-risteska.tk, 1
@@ -30990,15 +32615,16 @@
 elevenpaths.com, 1
 elexel.ru, 1
 elexprimidor.com, 1
+elexxos.com, 1
 elfe.de, 1
 elforno.gr, 1
+elfranco.tk, 1
 elfring.eu, 1
 elftoy.com, 1
 elfuerteclamor.org, 1
 elgalponazo.com.ar, 1
 elgenero.com, 1
 elgin.tk, 1
-elglobo.com.mx, 0
 elgoog.im, 1
 elgosblanc.com, 1
 elgrecohotel.gr, 1
@@ -31021,7 +32647,6 @@
 elicite.com, 1
 elie.net, 1
 elielaloum.com, 1
-eliezermarcano.com, 1
 elifesciences.org, 1
 eligasht.com, 1
 eligibilis.com, 1
@@ -31032,12 +32657,12 @@
 elijahzawesome.casa, 1
 elikers.ml, 1
 elimidrol.com, 1
+eliminations.tk, 1
 eliminercellulite.com, 1
 elimitecreamforsale.ga, 1
-elimperiolatino.com, 1
 eline168.com, 1
-elinetv.com, 1
 elinevanhaaften.nl, 1
+elinformatico.tk, 1
 elink.io, 1
 elinvention.ovh, 1
 eliolita.com, 1
@@ -31048,6 +32673,7 @@
 elisabeth-raendel.de, 1
 elisabeth-strunz.de, 1
 elisabethbegle.at, 1
+elisabethborgermans.com, 1
 elisabethcasanova.ch, 1
 elisabethkostecki.de, 1
 elisabethrene.com, 1
@@ -31055,19 +32681,26 @@
 elit-fitnes.tk, 1
 elit-host.tk, 1
 elite-design.tk, 1
+elite-forums.tk, 1
 elite-nakhodka.tk, 1
 elite-porno.ru, 1
 elite-tools.tk, 1
+elite-units.tk, 1
 elite12.de, 1
 eliteaudiovideohomes.com, 1
 elitebasementsohio.com, 1
 elitebike.com.co, 1
+eliteco.tk, 1
 elitedns.info, 1
 elitegameservers.net, 1
+elitehouse.tk, 1
 elitel.nl, 1
 elitelatinas.com, 1
+elitelounge.tk, 1
 elitemud.tk, 1
+elitepainmanagement.com, 1
 elitephysiotherapy.com.au, 1
+eliterequestboard.tk, 1
 elitesidingandgutters.com, 1
 elithub.com, 1
 elitsa.gr, 1
@@ -31086,7 +32719,6 @@
 elkgroveil.gov, 1
 elkhalillaw.com, 1
 elkim.cz, 1
-elkoy.org, 1
 elkvalley-nsn.gov, 1
 ell-net.tokyo, 1
 ella-kwikmed.com, 0
@@ -31097,10 +32729,12 @@
 elle-weine.de, 1
 ellegaard.dk, 1
 ellemental.me, 1
+ellemo.net, 1
 ellencorddry.com, 1
 ellesoft-freeware.tk, 1
 ellevit.ch, 0
 ellhofen-peccioli.de, 1
+elliboettcher.de, 1
 elligre.tk, 1
 ellinaras.tk, 1
 elliot.cat, 1
@@ -31111,12 +32745,16 @@
 ellisamusements.co.uk, 1
 ellisleisure.co.uk, 1
 ellisvanlaarhoven.tk, 1
+elloadingjr.ga, 1
 ellsinger.me, 1
 elmahost.net, 1
 elmarchive.ir, 1
 elmenreich.tk, 1
+elmeson.tk, 1
 elmresan.ir, 1
+elmundoconpenelope.es, 1
 elnan.do, 1
+elnegocioperfecto.tk, 1
 elo-forum.org, 1
 elo-rocket.com, 1
 elobservadordiario.com, 1
@@ -31132,23 +32770,25 @@
 elonm.ru, 0
 elonma.gov, 1
 elontime.de, 1
-elopsys.fr, 1
 elosoavila.tk, 1
 elosuite.com, 1
 elovip.com.br, 1
 eloxt.com, 1
 elpaseadordeperros.com, 1
+elperiodicodeycodendaute.es, 1
 elphnt.io, 1
 elpo.net, 1
 elpoderdelespiritu.org, 1
 elpreciosostud.com, 1
 elpreparacionista.com, 1
+elprofeshows.com, 1
 elpueblo.com.do, 1
 elradiobuffet.tk, 1
 elradix.be, 1
 elradix.eu, 1
 elranchofeliz.org, 1
 elri.blog, 1
+elrincondeltrabajo.com, 1
 elrinconderovica.com, 1
 elsadonaire.tk, 1
 elsemanariodesalamanca.tk, 1
@@ -31174,6 +32814,7 @@
 eltlaw.com, 1
 elto.ch, 0
 eltonpastilha.me, 1
+eltormo.tk, 1
 eltransportquevolem.org, 1
 eltron.com.ua, 1
 eltuito.tk, 1
@@ -31182,7 +32823,11 @@
 eluvio.com, 1
 elvcino.com, 0
 elvendrim.xyz, 1
+elverdaderoamor.tk, 1
+elvikom.co.uk, 1
+elvikom.pl, 1
 elviraszabo.com, 1
+elvis-presley.tk, 1
 elvismania.tk, 1
 elvispresley.net, 1
 elvn.tokyo, 0
@@ -31205,6 +32850,7 @@
 email-pipeline.xyz, 1
 email-verifier.tk, 1
 email.repair, 0
+email24.cf, 1
 emailadressen.nl, 1
 emailalaperformance.fr, 1
 emailexpress.ga, 1
@@ -31227,6 +32873,7 @@
 emaratalyoum.com, 1
 emarketingmatters.com, 1
 emasex.es, 1
+emavending.club, 1
 emavok.eu, 1
 embarkboathire.com.au, 1
 embassycargo.eu, 1
@@ -31247,10 +32894,11 @@
 emby.cloud, 1
 emby.live, 1
 emcentrix-com-site-mvc.azurewebsites.net, 1
-emcomart.com, 1
 emcspotlight.com, 1
 emdadkhodrokaraj.ir, 1
 emdrupholm.dk, 1
+emdyn.com, 1
+emdynint.io, 1
 emecew.com, 1
 emedos.es, 1
 emeetattd.ddns.net, 1
@@ -31260,15 +32908,18 @@
 emeraldcbdshop.com, 0
 emeraldcityswagger.com, 1
 emeraldcoasturgentcare.com, 1
+emeraldheights.tk, 1
 emeraldislerealty.com, 1
 emeraldshield.com, 1
+emergency-broadcast-system.tk, 1
 emergency-federal-register.gov, 1
 emergencycommand.us, 1
 emergencyshutoff.com, 1
+emergentvisiontec.com, 1
 emergenzaduepuntozero.it, 1
-emergesydney.com.au, 1
 emero.de, 1
 emersoncanada.ca, 1
+emersonreview.tk, 1
 emex.ro, 1
 emgroup.co, 1
 emi.im, 1
@@ -31305,6 +32956,7 @@
 emilymarques.ga, 1
 emilypennock.com, 1
 emilywufaith.tk, 1
+emina-arapovic.tk, 1
 eminem.kim, 1
 emirabiz.com, 0
 emirates247.com, 1
@@ -31316,12 +32968,12 @@
 emkanrecords.com, 1
 emkode.pl, 1
 emkrivoy.com, 1
-emlyn.xyz, 1
 emma-o.com, 1
 emma.ly, 0
 emmababy420.com, 1
 emmagarland.com, 1
 emmagraystore.com, 1
+emmagullstrand.se, 1
 emmaliddell.com, 1
 emmamillernovels.com, 1
 emmanuelle-et-julien.ch, 1
@@ -31344,13 +32996,17 @@
 emote.bot, 1
 emotebank.com, 1
 emotebot.com, 1
+emotionalonlinestorytelling.com, 1
+emotionsgroup.kz, 1
 emotive.productions, 1
 emoxie.com, 0
 empathogen.com, 1
 empathogens.com, 1
 empathy.ca, 1
+empathyband.tk, 1
 empatico.org, 1
 empatico.xyz, 1
+empatos.cf, 1
 emperola.com, 1
 emperor-penguin.com, 1
 emperor-penguins.com, 1
@@ -31361,20 +33017,22 @@
 empherino.net, 1
 empingbalado.com, 1
 empire-forum.tk, 1
+empire-group.co.nz, 1
 empire-univ.com, 1
 empire24.co, 1
 empireauto-2000.com, 1
+empiredenham.ga, 1
 empirehive.com, 1
 empiria.site, 1
+emplealis.com, 1
 empleandon0s.com, 1
-empleosdorita.com, 1
 empleosearch.com, 1
 emploi-collectivites.fr, 0
 employeeexpress.gov, 1
 employeemanual.com.au, 1
 employer.gov, 1
-employer.guru, 1
 employer411.com, 1
+employerlawresource.com, 1
 employersupport.co.uk, 1
 employmax.co.za, 1
 employmaxetd.co.za, 1
@@ -31382,6 +33040,7 @@
 employment.uk.com, 1
 employmentlawworldview.com, 1
 emporikonathenshotel.com, 1
+emporioarchitect.com, 1
 emporiodascalcinhas.com.br, 1
 emporiodosperfumes.com.br, 1
 emporioonline.com.br, 1
@@ -31389,10 +33048,9 @@
 empowerdb.com, 1
 empoweren.com, 0
 empowernation.org, 1
-empowersimcoe.ca, 1
 emprechtinger.com, 1
+empreex.com, 1
 emprego.pt, 1
-empregopraontem.com.br, 1
 empregosrj.com, 1
 empreinte.ca, 1
 emprendeconchrisfx.com, 1
@@ -31406,7 +33064,6 @@
 emptyarcade.com, 1
 emptybox.org, 1
 empyrean-advisors.com, 1
-emradc.xyz, 1
 emrah.io, 1
 emreaydinfan.tk, 1
 emrenovation.com, 1
@@ -31422,6 +33079,8 @@
 emulefans.com, 1
 emulovers.com, 1
 emulsifier.ga, 1
+emunahstudio.com, 1
+emunet.net, 1
 emusicuz.tk, 1
 emvitals.com, 1
 emvoiceapp.com, 1
@@ -31429,17 +33088,21 @@
 emxvn.co.za, 1
 emyr.net, 1
 emyself.org, 1
+emystars.tk, 1
 emzi0767.com, 1
 emzy.de, 1
 en-booster.jp, 1
 en-este.link, 1
 en-maktoob.search.yahoo.com, 0
+en-wp.com, 1
+en-wp.org, 1
 en0.io, 1
 en4rab.co.uk, 1
 en4u.org, 1
 enaah.de, 1
 enabling.ga, 1
 enactusteesside.org, 1
+enakari.com, 1
 enalean.com, 1
 enamae.net, 1
 enbecom.net, 1
@@ -31448,10 +33111,10 @@
 encfs.win, 1
 encircleapp.com, 1
 encircled.org, 1
+encode.agency, 1
 encode.host, 1
 encode.training, 1
 encodecloud.net, 1
-encoderx.uk, 1
 encontra-me.org, 1
 encontro.online, 1
 encontroespiritadeinverno.com.br, 1
@@ -31474,6 +33137,7 @@
 encuentrabajo.net, 1
 encycarpedia.com, 1
 endangeredwatch.com, 1
+endbegins.tk, 1
 endbox.email, 1
 ende-x.com, 1
 endeal.nl, 1
@@ -31486,6 +33150,7 @@
 enderhost.tk, 1
 enderle.cloud, 1
 enderszone.com, 0
+endgame-economics.com, 1
 endiana.cf, 1
 endingthedocumentgame.gov, 1
 endlessdiy.ca, 1
@@ -31497,6 +33162,9 @@
 endofodo.goip.de, 1
 endoftenancycleaninglondon.co.uk, 1
 endohaus.us, 1
+endometriu.ml, 1
+endondehay.com, 1
+endpaydayloandebt.net, 1
 endspamwith.us, 1
 enduranceday.be, 1
 enduranceseries.ca, 1
@@ -31511,7 +33179,9 @@
 enemyofman.com, 1
 enemyterritory.tk, 1
 energaia.de, 1
+energetiquetraditionnellechinoise.be, 1
 energie-sante.ch, 0
+energiebesparingsexpert.nl, 1
 energiecentrale.gent, 1
 energiekeurplus.nl, 1
 energija-visiems.lt, 1
@@ -31528,8 +33198,10 @@
 energyefficientservices.com, 1
 energyelephant.com, 1
 energygenie.com.au, 1
+energygroup.gq, 1
 energygroup.tk, 1
 energyguru.tk, 1
+energylocals.com, 1
 energylocals.com.au, 1
 energymedia.tk, 1
 energysaveroregon.com, 1
@@ -31558,10 +33230,12 @@
 enforcement-trends.azurewebsites.net, 1
 enfu.se, 1
 eng-erlangen.de, 1
+eng3corp.com, 1
 eng4arab.tk, 1
 engagelogic.com, 1
 engagewell.com, 1
 enganches.es, 1
+enganchesevilla.es, 1
 engaugetools.com, 1
 engelke-optik.de, 0
 engelmann.com, 0
@@ -31570,13 +33244,14 @@
 engelundlicht.ch, 1
 engelwerbung.com, 1
 engelwerbung.de, 1
+engen.co.za, 1
 engg.ca, 1
 enghero.com, 1
 engi.fyi, 1
 engie-laadpalen.nl, 1
-engiedev.net, 1
 engima.nl, 1
 engineeringbigdata.com, 1
+enginefirefighter.com, 1
 engineowning.com, 1
 enginepit.com, 1
 enginsight.com, 1
@@ -31612,7 +33287,7 @@
 enia.com, 1
 enigheten.tk, 1
 enigma.swiss, 0
-enigmadark.com, 1
+enigmacpt.com, 0
 enigmadjradio.com, 1
 enijew.com, 1
 enitso.de, 1
@@ -31634,14 +33309,12 @@
 enlace.vip, 1
 enlacesgranotas.tk, 1
 enlamochiladeadri.com, 1
-enlight.no, 1
 enlightenedhr.com, 1
 enlightsec.se, 1
 enlnf.link, 1
 enloestatebank.com, 1
 enlyft.com, 0
 enmieux.be, 1
-ennea-mediation.fr, 1
 ennori.jp, 1
 enns-photography.com, 1
 enodais.gr, 1
@@ -31668,6 +33341,7 @@
 enriqueferreira.com, 1
 enriquepiraces.com, 1
 enrollapp.com, 1
+enroo-tech.com, 1
 enroutemalaysia.com, 1
 ensage.io, 1
 ensaladasvinagreta.com, 1
@@ -31675,6 +33349,8 @@
 enscosupply.com, 1
 ensemble-rubato.de, 1
 ensembling.com, 1
+enshin-karate.tk, 1
+ensilencio.tk, 1
 enskat.de, 1
 enskatson-sippe.de, 1
 ensley.tech, 1
@@ -31713,7 +33389,6 @@
 enthusiaformazione.com, 1
 entomobolivia.com, 1
 entorangecounty.com, 1
-entouchgo.com, 1
 entradaweb.cl, 1
 entrainr.com, 1
 entrecieletpierres.com, 0
@@ -31733,10 +33408,12 @@
 entwickler.land, 1
 enuchi.jp, 1
 enuygun.com, 1
+envaldemoro.com, 1
 envant.co.uk, 1
 enveloppenopmaat.nl, 1
 envescent.com, 1
 enviam.de, 1
+enviarcurriculumvitae.com, 1
 enviartucurriculumvitae.com, 1
 enviatufoto.com, 1
 enviro-umweltservice.de, 1
@@ -31751,17 +33428,22 @@
 envirotecstructures.com.au, 1
 envisionsproperty.com, 1
 envisolarvind.tk, 1
+enviyatar.tk, 1
 envman.io, 1
 envoie.moi, 1
 envoyez.moi, 1
 envoypresents.com, 1
+envydesigns.tk, 1
 envygeeks.io, 1
+envysmile.com, 1
+envywe.com, 1
 enweb.ml, 1
 enwikipedia.tk, 1
 enxadahost.com, 1
 eocservices.co.uk, 1
 eod-dissemination-uat.azurewebsites.net, 1
 eod-dissemination.com, 1
+eod.su, 1
 eoitek.com, 1
 eola.co, 1
 eolme.ml, 1
@@ -31775,7 +33457,9 @@
 eopugetsound.org, 0
 eos-classic.io, 1
 eos-utvalget.no, 1
+eoscryptocurrency.com, 1
 eosinofilos.com, 1
+eoskoch.com, 1
 eosol.de, 1
 eosol.net, 1
 eosol.services, 1
@@ -31792,6 +33476,7 @@
 epay.bg, 1
 epaygateway.net, 1
 epcomputacion.com.ar, 1
+epcreation.nl, 1
 epcreport.net, 1
 epdeveloperchallenge.com, 1
 eperformax.com, 1
@@ -31799,10 +33484,13 @@
 ephesusbreeze.com, 1
 ephraim-medical.com, 1
 epi-lichtblick.de, 1
+epi.no, 1
 epi.one, 0
 epic-vistas.com, 1
 epic-vistas.de, 1
+epic.gl, 1
 epicapos.cz, 1
+epicauth.azurewebsites.net, 1
 epicbouncycastles.co.uk, 1
 epiccdn.net, 1
 epiccraft-mc.de, 1
@@ -31833,7 +33521,7 @@
 epidastudio.com, 1
 epidauros.be, 1
 epigrafes-led-farmakeia.gr, 1
-epikomagazine.com, 0
+epikomagazine.com, 1
 epilepsiyle.com, 1
 epilino.jp, 1
 epilis.gr, 1
@@ -31884,6 +33572,7 @@
 epostplus.li, 1
 eposwales.co.uk, 1
 eposyork.co.uk, 1
+eposzilos.nl, 1
 eppelblei.lu, 1
 eppelduerferjugend.lu, 1
 eppelpress.lu, 1
@@ -31891,6 +33580,7 @@
 epreskripce.cz, 1
 eprezto.com, 1
 eprojectfreetv.com, 1
+eprosto.cf, 1
 epsamsg.com, 1
 epsi.io, 1
 epsilonone.me, 1
@@ -31898,12 +33588,10 @@
 epspolymer.com, 1
 eptreviewer.com, 1
 epublibre.org, 1
-epvin.com, 1
 epyonsuniverse.net, 1
 eq-serve.com, 1
 eqab.net, 1
 eqassociates.com, 1
-eqibank.com, 1
 eqtravel.us, 1
 equabanking.cz, 1
 equalcloud.com, 1
@@ -31921,19 +33609,24 @@
 equipamentosparapostos.com.br, 1
 equipandoloja.net.br, 1
 equipedefrance.tv, 0
+equipedefrente.tk, 1
 equipeferramentas.com.br, 1
+equipment-pool.tk, 1
 equipoweb.info, 1
 equippers.de, 1
 equisecu.com, 1
 equisoft.io, 1
+equitazionepertutti.it, 1
 equityelevate.com, 1
 equityflows.com, 1
 equityloupe.com, 1
+equityloupe.org, 1
 equityloupe.ru, 1
 equityset.com, 1
 equitytrack.co, 1
 er-mgmt.com, 1
 er-music.com, 1
+er.pl, 1
 er.tl, 1
 er1s.xyz, 1
 era.fi, 1
@@ -31942,6 +33635,7 @@
 erandymoreira.ga, 1
 erapotensia.com, 1
 erasmo.info, 1
+erasmusantoine.tk, 1
 erasmusplusrooms.com, 1
 erasure.tk, 1
 erasyou.com, 1
@@ -31965,7 +33659,6 @@
 erenvakfi.org, 1
 erethon.com, 1
 erevan-news.tk, 1
-erf-neuilly.com, 1
 erfolgsmaschine.ch, 1
 ergaomnes.cz, 1
 ergo-open.de, 1
@@ -31993,6 +33686,7 @@
 ericjohnltd.com, 1
 erick.blog, 1
 ericksonvasquez.com, 1
+ericktello.tk, 1
 ericleuthardt.com, 1
 ericleuthardtphotography.club, 1
 ericlight.com, 1
@@ -32057,8 +33751,11 @@
 erosofia.tk, 1
 eroticgirlfriend.com, 1
 eroticlist.com, 1
+eroticsexy.com.br, 1
+eroticsochi.com, 1
 erotikstahrtseite.gq, 1
 erotycznehistorie.pl, 1
+erozine.jp, 1
 erp-band.ru, 1
 erp.band, 1
 erpax.com, 1
@@ -32067,7 +33764,6 @@
 erpelstolz.at, 1
 erperium.com, 1
 erperium.nl, 1
-erpiv.com, 1
 erpollo.com, 1
 erpsolutionsmart.com, 1
 errietta.me, 1
@@ -32081,6 +33777,7 @@
 ers35.com, 1
 ersa-shop.com, 1
 ersdfaredsaeem.tk, 1
+erseni.net, 1
 ershiwo.com, 1
 ersinbiltekin.tk, 1
 ersinerce.com, 1
@@ -32089,7 +33786,6 @@
 ert.ovh, 1
 ertebatatjelve.ir, 1
 eru.im, 0
-eru.me, 0
 eru.moe, 1
 erudicia.com, 1
 erudicia.de, 1
@@ -32105,7 +33801,10 @@
 ervaarjapan.nl, 1
 ervirmaison.tk, 1
 erwanlepape.com, 1
+erwannlaflute.tk, 1
+erwerbslosenforum.de, 1
 erwin.saarland, 1
+erwinonline.tk, 1
 erwinpaal.nl, 1
 erwinschmaeh.ch, 1
 erwinwensveen.nl, 1
@@ -32118,12 +33817,15 @@
 es-tools.at, 1
 es-tools.com, 1
 es-tools.de, 1
+es-trade.biz, 1
 es-vps.eu, 1
 es.ax, 1
 es.search.yahoo.com, 0
+es888.net, 1
 es8888.net, 1
 es888999.com, 1
 es999.net, 1
+es9999.net, 1
 esaborit.ddns.net, 0
 esagente.com, 1
 esajokinen.net, 1
@@ -32133,10 +33835,36 @@
 esample.info, 1
 esatn.gov, 1
 esauth.xyz, 1
+esb-in.net, 1
+esb-top.com, 1
+esb-top.net, 1
 esb1314.net, 1
 esb1668.com, 1
+esb168168.com, 1
+esb168168.info, 1
+esb168168.net, 1
+esb168168.org, 1
+esb1688.biz, 1
+esb1688.com, 1
+esb1688.info, 1
+esb1688.net, 1
+esb1688.org, 1
 esb16888.com, 1
+esb1711.com, 1
+esb1711.net, 1
+esb1788.com, 1
+esb1788.net, 1
+esb1788.org, 1
+esb2013.com, 1
+esb2013.net, 1
+esb325.com, 1
+esb325.net, 1
+esb336.com, 1
 esb369.com, 0
+esb518.com, 1
+esb553.com, 1
+esb555.biz, 1
+esb555.cc, 1
 esb555.com, 1
 esb556.com, 1
 esb5889.com, 1
@@ -32145,21 +33873,52 @@
 esb688.com, 1
 esb68888.com, 1
 esb775.net, 0
+esb777.biz, 1
 esb777.cc, 1
 esb777.com, 1
 esb777.me, 1
 esb777.net, 1
+esb777.org, 1
 esb777.us, 1
+esb886.com, 1
+esb888.net, 1
 esb8886.com, 1
+esb9527.com, 1
+esb9588.com, 1
+esb9588.info, 1
+esb9588.net, 1
+esb9588.org, 1
 esb999.com, 1
 esb999.info, 1
+esb999.org, 1
 esb999.us, 1
 esba11.cc, 1
+esba11.com, 1
 esba11.in, 1
 esba11.net, 1
+esball.bz, 1
+esball.cc, 1
 esball.in, 1
+esball.mx, 1
+esball.online, 1
+esball.org, 1
+esball.ws, 1
+esball518.info, 1
+esball518.net, 1
+esball518.org, 1
 esball888.com, 1
 esball888.net, 1
+esballs.com, 1
+esbbon.com, 1
+esbbon.net, 1
+esbfun.com, 1
+esbfun.net, 1
+esbgood.com, 1
+esbin.net, 1
+esbjon.com, 1
+esbjon.net, 1
+esbm4.net, 1
+esbm5.net, 1
 esc-romania.tk, 1
 esc-turkey.tk, 1
 esc.gov, 1
@@ -32171,9 +33930,11 @@
 escaperoomdoctor.com, 1
 escaperoomsolutions.com, 1
 escapetalk.nl, 1
-escapeup.es, 1
+escapeup.es, 0
 escavador.com, 1
+escg.digital, 1
 esclear.de, 1
+escmatrix.com, 1
 escobarservice7000.com, 1
 escobpb.com.br, 1
 escogitasrls.com, 1
@@ -32182,6 +33943,7 @@
 escolamais.com.br, 1
 escolibri.com, 1
 escontact.ch, 0
+escordilla.tk, 1
 escort-fashion.com, 1
 escortaccess.net, 1
 escortbee.com, 1
@@ -32199,12 +33961,14 @@
 escortslittleblackbook.com, 1
 escortsontop.co.uk, 1
 escovator-records.tk, 1
+escritoresdelcomahue.tk, 1
 escritoriodearte.com, 0
 escrocratie.tk, 1
 escrowalliance.com, 1
 escuelabiblica.com, 1
 escueladego.tk, 1
 escueladelsabor.com, 1
+escuelaelae.org, 1
 escuelaelretamo.cl, 1
 escuelagobierno.org, 1
 escuelainfantilpizcas.com, 1
@@ -32255,6 +34019,7 @@
 eskimosboards.ga, 1
 eskola.cc, 1
 eskriett.com, 0
+eslamahmed.tk, 1
 eslint.org, 0
 eslove.jp, 1
 esm.run, 1
@@ -32263,7 +34028,9 @@
 esmejor.tk, 1
 esmibot.com, 1
 esmincg2t1.com, 1
+esnekkaucuk.com, 1
 esoa.net, 1
+esocite.la, 1
 esoko.eu, 1
 esolcourses.com, 1
 esolitos.com, 1
@@ -32271,16 +34038,18 @@
 eson.eu, 1
 esono.de, 1
 esoteric.website, 1
+esotericcosmos.com, 1
 esoterik.link, 1
 esoterikerforum.de, 1
 esovita.de, 1
 espace-caen.fr, 0
-espace-finance.fr, 1
 espace-gestion.fr, 1
 espace-habitat-francais.fr, 1
+espace-orenda.ch, 0
 espace-tech.ru, 0
 espace.network, 1
 espace.spb.ru, 0
+espacejabugo.com, 1
 espacelanguetokyo.fr, 1
 espaceroseauteinturiers.fr, 1
 espacetemps.ch, 0
@@ -32302,6 +34071,8 @@
 espectrocrom.com, 1
 espectrometria.com, 1
 espehus.dk, 1
+espejo.tk, 1
+espeleogel.tk, 1
 espenandersen.no, 1
 esperantio.tk, 1
 esperanto.co, 1
@@ -32324,7 +34095,6 @@
 esra.gq, 1
 esrhd.com, 1
 esrinfo.com, 1
-esroradio.com, 1
 esrs.gov, 1
 essay-writing-topics-fce.tk, 1
 essaybrand.com, 1
@@ -32348,14 +34118,15 @@
 essencesdeprana.org, 0
 essencespresso.es, 1
 essenciasparis.com.br, 1
-essenerbaeder.de, 1
 essential12.com, 1
 essentialinteriors.ga, 1
+essentialoils.nl, 1
 essentialoilsimports.com, 1
 essentialstudiomanager.com, 1
 essentiel-physique.com, 1
 essentielsduweb.ca, 1
 essentta.com, 1
+essenttamarketplace-essenttamarketplaceqa.azurewebsites.net, 1
 esseriumani.com, 1
 essex.cc, 1
 essexcosmeticdentists.co.uk, 0
@@ -32379,6 +34150,7 @@
 estaryshop.com.br, 1
 estate360.co.tz, 1
 estateczech-eu.ru, 1
+estateways.com, 1
 estcequonmetenprodaujourdhui.info, 1
 esteam.se, 1
 esteban-abadahs.tk, 1
@@ -32404,9 +34176,12 @@
 estonoentraenelexamen.com, 1
 estoppels.com, 1
 estradiolbestellen.gq, 1
+estreetshuffle.com, 1
+estremeconseguenze.it, 1
 estrietoit.com, 0
 estrogenonline.gq, 1
 estrogens.gq, 1
+estruendo.tk, 1
 estudarfora.org.br, 1
 estudiaenrusia.com, 1
 estudiarparaser.com, 1
@@ -32416,17 +34191,17 @@
 estudioaguiar.com.br, 1
 estudiogarcia-rada.com, 1
 estudiomantis.tk, 1
+estudios-biblicos.tk, 1
 estudiosalmogavares.tk, 1
 estudosnacionais.com, 1
 estufitas.com, 1
 estumarca.com, 1
-esturadio.net, 1
+estver.ru, 1
 esu.moe, 1
 esu.wiki, 1
 esu.zone, 1
 esuretynew.azurewebsites.net, 1
 esvaco.cf, 1
-eswap.cz, 1
 esyoil.com, 1
 esys.ga, 1
 esystems.tk, 1
@@ -32451,7 +34226,6 @@
 etdonline.co.za, 1
 etdp.co.za, 1
 etduvindemoselle.fr, 1
-eteachbd.com, 1
 etech-solution.com, 1
 etech-solution.net, 1
 etech-solutions.com, 1
@@ -32485,7 +34259,9 @@
 ethelbrooks.com, 1
 ethelbrooks.es, 1
 ether.school, 1
+etherandir.com, 1
 etherderbies.com, 1
+ethereal-skies.tk, 1
 ethereal.games, 1
 ethereum-news.info, 1
 ethereumnews.best, 1
@@ -32496,6 +34272,7 @@
 ethereumnews.online, 1
 ethereumnews.site, 1
 ethereumnews.xyz, 1
+etheria-software.tk, 1
 etherium.org, 1
 ethermine.org, 1
 ethernia.fr, 1
@@ -32529,6 +34306,7 @@
 etiquetaunica.com.br, 1
 etkaddict.com, 1
 etkarle.de, 1
+etl-it.co.uk, 1
 etnis.id, 1
 etnoria.com, 1
 etny.nl, 1
@@ -32536,11 +34314,11 @@
 etoile-usedcars.com, 0
 etororeview.net, 1
 etororeviews.com, 1
+etrades.tk, 1
 etre-soi.ch, 0
 etre-vivant.fr, 0
 etrecosmeticderm.com, 1
 etrolleybizstore.com, 1
-ets2mp.de, 1
 etskinner.com, 0
 etssquare.com, 1
 etsu.edu, 1
@@ -32578,6 +34356,7 @@
 eugenetech.org, 1
 eugeniaferreira.com, 1
 eugeniocorso.com, 1
+eugenioperez.tk, 1
 eujuicers.bg, 1
 eujuicers.com, 1
 eujuicers.com.hr, 1
@@ -32606,15 +34385,18 @@
 eung.ga, 1
 eupay.de, 1
 euph.eu, 1
+eurasierwelpen.tk, 1
 eurban.life, 1
 eureka.archi, 1
 eurekaarchi.com, 1
 eurekaarchitecture.com, 1
 eurmarketing.com, 1
 euro-construction.co.uk, 1
+euro-issues.tk, 1
 euro-servers.de, 1
 euro.se, 1
 euroalter.com, 1
+eurobadmaasbracht.nl, 1
 eurobilltracker.tk, 1
 eurocars2000.es, 1
 eurocenterobuda.hu, 1
@@ -32638,12 +34420,14 @@
 eurolocarno.es, 1
 euroman.ga, 1
 euronic.fi, 1
+europack.kiev.ua, 1
 europainchemnitz.de, 1
 europapier.net, 1
 europareise2010.de, 1
 europarts-sd.com, 1
 europastudien-chemnitz.de, 1
 europastudien.de, 1
+europatour2005.tk, 1
 european-agency.org, 1
 european-hospital.ga, 1
 european-hospital.ml, 1
@@ -32656,10 +34440,11 @@
 europeanstudies-chemnitz.de, 1
 europeantimberconnectors.ca, 1
 europeantransportmanagement.com, 1
-europeanwineresource.com, 1
-europeluxuryweddings.com, 1
+europeonline.tk, 1
 europeos.es, 1
+europesearbeiders.be, 1
 europesrit.tk, 1
+europetourism.ga, 1
 europetraveler.tk, 1
 europetravelservice.co.uk, 1
 europop.com, 1
@@ -32705,6 +34490,7 @@
 evailoil.eu, 1
 evaisanta-mariaalmudever.tk, 1
 evaisanta.tk, 1
+evakuator.services, 1
 evalesc.com, 1
 evaluate.jp, 1
 evamachkova.cz, 0
@@ -32713,11 +34499,12 @@
 evanavevan.me, 1
 evandevizio.com, 1
 evanescencenorge.tk, 1
+evanescenceturkey.tk, 1
 evanfiddes.com, 1
 evange.co.jp, 1
 evangelicalmagazine.com, 1
+evangelionmagi.tk, 1
 evangelise.asia, 1
-evangelosm.com, 1
 evanreev.es, 1
 evansdesignstudio.com, 0
 evansville-wy.gov, 1
@@ -32739,6 +34526,7 @@
 eve-skilltracker.com, 1
 eve-ua.com, 1
 eve.pub, 1
+eve0s.com, 1
 eveaz.com, 0
 eveco-mebel.ga, 1
 evedanjailbreak.com, 1
@@ -32747,7 +34535,9 @@
 evelienzorgt.nl, 1
 evelyndayman.com, 1
 evemarketer.com, 1
+evendesign.gq, 1
 evenementenhoekvanholland.nl, 1
+evenfall.tk, 1
 evenstar-gaming.com, 1
 evenstargames.com, 1
 event-blick.de, 1
@@ -32762,27 +34552,32 @@
 eventim-business.com, 1
 eventim-business.de, 1
 eventive.org, 0
+eventjams.com, 1
 eventmake.es, 1
 eventnexus.co.uk, 1
 eventosbgp.com, 1
 eventosenmendoza.com.ar, 1
 eventosformativos.tk, 1
 eventprazdnik.ru, 1
+events12.com, 1
+eventsatthefarm.com, 1
 eventservicestockholm.se, 1
 eventsframe.com, 1
 eventtech.com, 0
 eventticketscenter.com, 1
+eventusgc.ru, 1
 eveonline.com, 1
 ever.sale, 1
 everaerts.eu, 1
 everain.me, 1
 everberg.tk, 1
 everettduiattorneys.com, 1
-everettsautorepair.com, 1
+everettsautorepair.com, 0
 everfine.com.tw, 1
 evergarden.cn, 1
 evergladesrestoration.gov, 1
 everglow.co.jp, 1
+evergreenilder.tk, 1
 evergreenmichigan.com, 1
 evergreennewsonline.com, 1
 everhome.de, 1
@@ -32792,6 +34587,7 @@
 everling.lu, 1
 everlong.org, 1
 everly.market, 1
+evermade.fi, 1
 evermarkstudios.com, 1
 evernaut.com, 1
 everpcpc.com, 1
@@ -32800,8 +34596,12 @@
 evertradeelectronics.com, 1
 evertus.com, 1
 everwaking.com, 0
+everwinter.tk, 1
 every-day-life.com, 0
 everyarti.st, 1
+everycorneroftheworld.cf, 1
+everycorneroftheworld.ml, 1
+everycorneroftheworld.tk, 1
 everyday.eu.org, 1
 everydaygary.com, 1
 everydaymarts.com, 1
@@ -32821,6 +34621,8 @@
 everysaving.com.au, 1
 everysaving.ph, 1
 everysaving.sg, 1
+everystudent.bg, 1
+everystudent.com.tw, 1
 everysync.co.jp, 1
 everything-everywhere.com, 1
 everythingaccess.com, 1
@@ -32848,7 +34650,7 @@
 evilbeasts.ru, 1
 evilbrood.tk, 1
 evilbunnyfufu.com, 1
-evileden.com, 1
+evilduck.tk, 1
 evilla.ru, 0
 evilmartians.com, 1
 evilnerd.de, 1
@@ -32887,6 +34689,7 @@
 evolvingthoughts.net, 1
 evonet.co.za, 1
 evony.eu, 1
+evopack.net, 1
 evoplay.gq, 1
 evosyn.com, 1
 evote-ch.ch, 1
@@ -32927,6 +34730,7 @@
 ewok.io, 1
 eworkflow.ca, 1
 eworksmedia.com, 0
+eworldmedia.ml, 1
 eworldmedia.tk, 1
 ewoutpool.tk, 1
 ewritingservice.com, 1
@@ -32949,16 +34753,18 @@
 examedge.com, 1
 examesrush.com, 1
 examesrush.com.br, 1
+examlab.tk, 1
 example.sc, 1
 exampleessays.com, 1
 examroll.fr, 1
 examroll.io, 1
+examroo.nl, 1
 examsexpert.in, 0
 examsite.tk, 1
 examsmate.in, 1
 examticket.tk, 1
 exaplac.com, 1
-exarcheia.online, 1
+exarcheia.link, 1
 exarcheia.ru, 1
 exashop.tn, 1
 exatmiseis.net, 0
@@ -32970,6 +34776,7 @@
 excel-mechanical.com, 1
 excel-utbildning.nu, 1
 excelbroadcast.com, 1
+excelglobalpartners.com, 1
 excelhot.com, 1
 excelkurs.one, 1
 excelkursdirekt.eu, 1
@@ -32992,14 +34799,18 @@
 excite.co.id, 1
 exciters.tk, 1
 excitoninteractive.com, 1
+exclusive-okno.ru, 1
 exclusive-world.tk, 1
 exclusivebeautystudio.com.au, 1
 exclusivebouncycastles.co.uk, 1
 exclusivedesignz.com, 1
+exclusivemarket.net, 1
 exclusivityglobal.tech, 1
 excluzive.ml, 1
+excomm.io, 1
 excursionescaribe.com, 1
 exdamo.de, 1
+exdev.nl, 1
 exe-boss.tech, 1
 execbar.com, 1
 exechip.com, 1
@@ -33011,7 +34822,6 @@
 exegol.co.uk, 1
 exehack.net, 1
 exeintel.com, 1
-exekutori.com, 1
 exemples-de-stands.com, 1
 exentio.sexy, 1
 exerforge.com, 1
@@ -33021,15 +34831,17 @@
 exexcarriers.com, 1
 exeypanteleev.com, 1
 exforo.tk, 1
-exgaywatch.com, 1
 exiled.land, 1
 exiled.world, 1
 existest.com, 1
 exit9wineandliquor.com, 1
 exitooutdoor.com, 1
+exitoseguro.tk, 1
+exitreality.tk, 1
 exmart.ng, 1
 exmoe.com, 1
 exnce.com, 1
+exo136.com, 1
 exocen.com, 0
 exodiac.ph, 1
 exodium.tk, 1
@@ -33069,6 +34881,7 @@
 experimentrak.com, 1
 experimetrix.com, 1
 experise.fr, 1
+experpento.tk, 1
 expert-korovin.ru, 1
 expert-voronezh.tk, 1
 expert.cz, 1
@@ -33077,6 +34890,7 @@
 experteasy.com.au, 1
 expertisematrix.com, 1
 expertly.com, 1
+expertmarktrg.com, 1
 expertofficefitouts.com.au, 1
 expertpaintersvt.com, 1
 expertpanel.gc.ca, 1
@@ -33092,6 +34906,7 @@
 explodingcamera.com, 1
 explodingearths.com, 1
 exploflex.com.br, 1
+exploit-db.com, 1
 exploit.cz, 0
 exploit.party, 1
 exploit.ph, 1
@@ -33100,11 +34915,13 @@
 exploitit.com.au, 1
 exploodo.rocks, 1
 exploravacations.in, 1
+explore-malaysia.ga, 1
 explore-visions.com, 1
 explorea1a.com, 1
 explorebigideas.com, 1
 explorecams.com, 1
 exploretsp.gov, 1
+exploring-memory.org, 1
 exploringmorocco.tours, 1
 explorium.tk, 1
 explosionstereo.tk, 1
@@ -33116,6 +34933,7 @@
 expoline.ua, 1
 exponentialnews.net, 1
 exponentialsoft.gq, 1
+exponline.ga, 1
 exponline.tk, 1
 expoort.co.uk, 1
 expoort.com, 1
@@ -33127,29 +34945,34 @@
 expopro24.ru, 1
 exporta.cz, 1
 exposurecompensation.co.uk, 1
+expouniverse.cf, 1
 expouniverse.tk, 1
 expovivienda.com.mx, 1
 express-hosting.org, 1
 express-shina.ru, 1
 express-shop.tk, 1
-express-vpn.com, 1
 express-vyvoz.ru, 1
 express1040.com, 1
 expressemotion.net, 1
 expresshosting.org, 1
+expressinfo.cz, 1
+expressinfo.sk, 1
 expressmarket.ru, 1
 expressrepair.ca, 1
 expresstinte.de, 1
 expressvpn.com, 1
 expresvpn-private-analytics.net, 1
+exprimo.tk, 1
 expromo.eu, 1
 expxkcd.com, 1
 exquisique.tk, 1
+exquisito.tk, 1
 exs.lv, 1
 exsanio.de, 1
 exside.com, 1
 exsora.com, 1
 extantsoft.biz, 1
+extendet.tk, 1
 extendwings.com, 1
 extensia.it, 1
 extensibility.biz.tr, 1
@@ -33186,6 +35009,8 @@
 extradesktops.com, 0
 extradiely.sk, 1
 extradivers-worldwide.com, 1
+extraefficiency.tk, 1
+extraefficient.tk, 1
 extrafrei.at, 1
 extranetplus.nl, 0
 extrapagetab.com, 1
@@ -33204,7 +35029,9 @@
 extremesports.tk, 1
 extremfrank.tk, 1
 extrolife.ml, 1
+extromail.de, 1
 exum.tk, 1
+exvisits.tk, 1
 exvs.org, 1
 exxelmedia.de, 1
 exxoncannabis.com, 1
@@ -33218,7 +35045,6 @@
 eyal-dvorkin.com, 1
 eyasc.nl, 1
 eye-encounters.com, 1
-eye-move.nl, 1
 eyeandfire.com, 1
 eyeball.ml, 1
 eyebrowsmicroblading.co.uk, 1
@@ -33229,6 +35055,7 @@
 eyejobs.com.au, 0
 eyelash-mc.com, 1
 eyelash-navi.com, 1
+eyelash.tk, 1
 eyelashconcept.com, 1
 eyelashextensions.tk, 1
 eyemagic.net, 1
@@ -33242,12 +35069,15 @@
 eyeshield-informatique.tech, 0
 eyespecialistsofla.com, 1
 eyestrainexplained.com, 1
+eyesurgery.tk, 1
 eyetooth.ga, 1
+eyfari.com, 1
 eyfconsultores.com, 1
 eyktasarim.tk, 1
 eynio.com, 1
 eyona.com, 1
 eyps.net, 1
+eyrelles-tissus.com, 1
 eyrid.com, 1
 eytosh.net, 1
 eyy.co, 1
@@ -33255,6 +35085,7 @@
 eyyubyilmaz.com, 1
 ez3d.eu, 1
 ezakazivanje.rs, 1
+ezcourseonline.com, 1
 ezdog.press, 1
 eze-buy.com, 1
 ezelukwu-chambers.org, 1
@@ -33265,10 +35096,12 @@
 ezgif.com, 1
 ezguamal.com, 1
 ezhub.de, 1
+ezifund.com, 1
 ezik-ido.tk, 1
 ezinternet.com.au, 1
 eziwine.com, 1
 ezmembershipscript.com, 0
+ezmoddingz.tk, 1
 eznetworks.com.br, 1
 ezone57.com, 1
 ezorgportaal.nl, 1
@@ -33278,6 +35111,7 @@
 ezshopper.co.uk, 1
 eztvtorrent.com, 1
 ezwritingservice.com, 1
+ezytrade.africa, 1
 ezz-drops.tk, 1
 ezzhole.net, 1
 f-401.com, 1
@@ -33300,10 +35134,12 @@
 f1distribution.com, 1
 f1fever.co.uk, 1
 f1fever.net, 1
+f1grandprix.tk, 1
 f1iran.com, 1
 f1minute.com, 1
 f1nal-lap.be, 1
 f1simulator.tk, 1
+f1sport.tk, 1
 f1tv-streams.live, 1
 f1worldwide.tk, 1
 f2h.io, 1
@@ -33315,9 +35151,11 @@
 f3r.xyz, 1
 f42.net, 1
 f43.me, 1
+f4bkv.net, 1
 f51365.com, 1
 f5197.co, 1
 f6729.co, 1
+f6729.com, 1
 f6957.co, 1
 f8003.com, 1
 f8007.com, 1
@@ -33381,7 +35219,6 @@
 f88vip7.com, 1
 f88vip8.com, 1
 f88vip9.com, 1
-f88yule1.com, 1
 f88yule111.com, 1
 f88yule122.com, 1
 f88yule3.com, 1
@@ -33407,7 +35244,7 @@
 f9883.com, 1
 f9884.com, 1
 f9885.com, 1
-f9digital.com, 1
+fa-fa.tk, 1
 fa-works.com, 1
 faapart107certifiedpilot.com, 1
 faazmusic.com, 1
@@ -33416,6 +35253,7 @@
 fabdiz.com, 1
 fabelturen.tk, 1
 faber.org.ru, 0
+faberoclub.tk, 1
 fabfrugals.com, 1
 fabian-fingerle.de, 1
 fabian-klose.com, 1
@@ -33443,11 +35281,12 @@
 fabiocicerchia.it, 1
 fableforge.nl, 1
 fableheartmedia.com, 1
+faboolus.com, 1
 fabricadeobsequiosimpresores.com, 1
 fabriceleroux.com, 0
 fabriciomoreira.ga, 1
-fabrika.com.br, 1
 fabrikafilmes.com.br, 1
+fabrilec.tk, 1
 fabriziofaniello.tk, 1
 fabriziorocca.it, 1
 fabse.net, 1
@@ -33456,6 +35295,7 @@
 fabulosa.com.br, 1
 fabulouslyyouthfulskin.com, 1
 fabulouslyyouthfulskineyeserum.com, 1
+faburocks.com, 1
 fac.fi, 1
 faca.gov, 1
 facan-godollo.hu, 1
@@ -33465,12 +35305,13 @@
 facarospauls.com, 1
 facchinaggio.milano.it, 1
 facchinaggio.roma.it, 1
+facchino.it, 1
 facciadastile.it, 1
 face-fashion.de, 1
 face-mania.com, 1
 face-recognition-cctv.co.uk, 1
+face.yoga, 1
 face2faith-vechta.de, 1
-facealacrise.fr, 1
 facebook-atom.appspot.com, 1
 facebook-program.com, 1
 facebook.ax, 1
@@ -33502,12 +35343,15 @@
 fachschaftslisten.at, 1
 fachschaftslisten.org, 1
 fachversand-hennes.de, 1
+facialcare.tk, 1
 facialexercising.com, 1
 facialparalysisnetwork.ga, 1
+facialplasticsurgeryofaustin.com, 1
 facil.services, 0
 facilecommebonjour.com, 1
 faciledireto.com.br, 1
 facileway.com, 1
+facilit-info.fr, 1
 facilities.fr, 1
 facilitiessurvey.org, 1
 facilitobet.com, 1
@@ -33538,8 +35382,10 @@
 factoryalimentos.com.br, 1
 factorypartsdirect.com, 1
 factozia.tk, 1
+facts-about-bees.ml, 1
 factslider.tk, 1
 factsvision.sr, 1
+factum-info.net, 1
 facturama.pt, 1
 factureenlinea.com, 0
 factuur.pro, 1
@@ -33551,11 +35397,14 @@
 facua.org, 1
 facucosta.com.ar, 1
 fadednet.com, 0
+fademusic.tk, 1
 fadenmeer.net, 1
 fadergs.edu.br, 1
 faderweb.de, 1
 fads-center.online, 1
+fadusongs.com, 1
 fady.vn, 1
+fae.watch, 1
 faehler.de, 1
 faelix.net, 1
 faerb.it, 1
@@ -33569,6 +35418,7 @@
 fafatiger.com, 1
 fafscloud.com, 0
 fag.wtf, 1
+fagdag.dk, 1
 faggut.gg, 1
 fagus.hopto.org, 1
 fahadbook.com, 1
@@ -33596,6 +35446,7 @@
 fairbot.tk, 1
 fairedeseconomies.info, 1
 fairelements.net, 1
+fairfieldschool.tk, 1
 fairgolfteams.com, 1
 fairgreenlimited.com, 1
 fairleighcrafty.com, 1
@@ -33622,6 +35473,7 @@
 faizan.net, 1
 faizan.xyz, 1
 faizanullah.com, 1
+fajita.party, 1
 fajode.net, 1
 fake-show.ga, 1
 fakeapple.nl, 1
@@ -33629,6 +35481,7 @@
 faked.org, 1
 fakeemergency.com, 1
 fakel.ga, 1
+fakemoney.ga, 1
 fakerli.com, 1
 fakes-ru.tk, 1
 fakinga.tk, 1
@@ -33649,6 +35502,7 @@
 falcon-forex.com, 1
 falcona.io, 1
 falconfrag.com, 1
+falconventures.ca, 1
 falconvintners.com, 1
 falcoz.co, 1
 faldoria.de, 1
@@ -33670,7 +35524,9 @@
 fallin.space, 1
 falling.se, 1
 fallofthecitadel.com, 1
+fallonarrocho.tk, 1
 fallout-craft.ru, 1
+fallriverbiblechapel.tk, 1
 fallvegermdfharder.gq, 1
 false.in.net, 1
 falsesecurity.org, 1
@@ -33681,7 +35537,6 @@
 fam-kreibich.de, 1
 fam-roos.com, 1
 fam-stemmer.de, 0
-fam-weyer.de, 1
 famcloud.de, 1
 famdouma.nl, 1
 fameng.nl, 1
@@ -33724,14 +35579,14 @@
 familylawhotline.org, 1
 familyparties.co.uk, 1
 familyrecipe.co.uk, 1
-familytravelmagazine.com, 1
 familytreehq.com, 1
 familytrees.net, 1
 familytron.com, 1
 familyworld.gr, 1
-famion.eu, 0
+famion.eu, 1
 famlefeber.nl, 1
 fammamtl.com, 1
+famonitor.com, 1
 famosas.cf, 1
 famous-models.tk, 1
 famousbirthdays.com, 1
@@ -33744,7 +35599,6 @@
 famvsomeren.nl, 1
 fan.gov, 1
 fan4all.de, 1
-fan8hd.com, 1
 fanactu.com, 1
 fanatical.com, 1
 fanaticamandafans.tk, 1
@@ -33752,6 +35606,7 @@
 fanatka.tk, 1
 fanboi.ch, 1
 fanclubblackhills.tk, 1
+fanclubmariaciobanu.tk, 1
 fanclubrbdmaniaromania.tk, 1
 fancy-bridge.com, 1
 fancy.org.uk, 1
@@ -33773,6 +35628,7 @@
 fanohus.dk, 1
 fans-lily-allen.tk, 1
 fansale.de, 1
+fanschic.com, 1
 fansided.com, 1
 fantacast.it, 1
 fantasiapainter.com, 1
@@ -33805,6 +35661,8 @@
 fantom.foundation, 1
 fantraxhq.com, 1
 fanvoice.com, 1
+fanyina.cn, 1
+fanyina.com, 1
 fanysehy-prof.com, 1
 fanyue123.tk, 1
 fanz.pro, 1
@@ -33826,6 +35684,7 @@
 faradome.ws, 1
 faradrive.ir, 1
 farallonesrentacar.com, 1
+faraloda.tk, 1
 faramashin.com, 1
 faraonplay5.com, 1
 faraonplay7.com, 1
@@ -33840,6 +35699,7 @@
 fareast.gq, 1
 fareast.tk, 1
 fareinternational.com, 1
+faresgame.com, 1
 faretravel.co.uk, 1
 faretrotter.com, 1
 farfallapets.com.br, 1
@@ -33848,21 +35708,25 @@
 farhadexchange.com, 1
 farhanaditya.com, 1
 farhood.org, 1
+farian.tk, 1
 farid.is, 1
 farinatorace.es, 1
 farizhan.com, 0
 farizizhan.com, 0
 farleybrass.com.au, 1
+farleymetals.com.au, 1
 farleysworlds.com, 1
 farm-catalog.ga, 1
 farm-dogecoin.tk, 1
 farm-vacations.com, 1
 farm24.co.uk, 1
+farmacia.pt, 1
 farmaciacomunalelacchiarella.it, 1
 farmaciacorvi.it, 1
 farmaciadejaime.es, 1
 farmaspeed.it, 1
 farmaweb.be, 1
+farmer-miniaturen.tk, 1
 farmer.dating, 1
 farmers.gov, 1
 farmkazuto.com, 1
@@ -33872,6 +35736,7 @@
 faroes.net, 1
 faroes.org, 1
 faroit.tk, 1
+farol.cz, 1
 farrel-f.cf, 1
 farrel-f.id, 1
 farrel-f.tk, 1
@@ -33883,6 +35748,8 @@
 fascat.com, 1
 faschingmd.com, 1
 fascia.fit, 1
+fasea.gov.au, 1
+fashion-buttons.tk, 1
 fashion-family.cf, 1
 fashion-stoff.de, 1
 fashion-swimwear.tk, 1
@@ -33890,6 +35757,8 @@
 fashion.bg, 1
 fashion.net, 1
 fashion24.de, 1
+fashionandbeautystyle.com, 1
+fashioncatalogues.tk, 1
 fashiondays.bg, 1
 fashiondays.hu, 1
 fashiondays.ro, 1
@@ -33899,6 +35768,8 @@
 fashionhijabers.com, 1
 fashionlistify.tk, 1
 fashionmasala.tk, 1
+fashionmovie.tk, 1
+fashionrecovery.co.nz, 1
 fashionsuits.tk, 1
 fashiontrendsetter.com, 1
 fashionunited.be, 0
@@ -33949,18 +35820,19 @@
 fastconfirm.com, 1
 fastconv.com, 1
 fastcp.top, 1
-fastercaretx.com, 1
 fastesp.net, 1
 fastforwardsociety.nl, 1
 fastforwardthemes.com, 1
+fastfox.tk, 1
 fasthost.com.br, 1
-fastighetsekonomi.com, 1
+fastighetsekonomi.com, 0
 fastinviter.com, 1
 fastknighki.ga, 1
 fastknigi.ml, 1
 fastlike.co, 1
 fastmail.com, 0
 fastonline.ro, 1
+fastopen.ml, 1
 fastos.com, 1
 fastos.de, 1
 fastpeoplesearch.com, 1
@@ -33969,12 +35841,14 @@
 fastserv.pl, 1
 faststage.ch, 1
 fasturl.ml, 1
+fastvisit.tk, 1
 fastvistorias.com.br, 1
 fastworx.com, 1
 fatcat.tk, 1
 fatecdevday.com.br, 1
 fateitalia.it, 1
 fatfueled.com, 1
+fathalla.com, 1
 fathers4equalrights.org, 1
 fatidique.com, 1
 fatiguefree.com, 1
@@ -34008,6 +35882,7 @@
 favedog.com, 1
 favorai.com, 1
 favorit-stroy-snab.ru, 1
+favoritestudent.ml, 1
 fawong.com, 1
 fawter.online, 1
 faxitron.com, 1
@@ -34057,7 +35932,6 @@
 fcbarcelona.cz, 1
 fcburk.de, 1
 fccarbon.com, 0
-fcdn.nl, 1
 fcforum.net, 1
 fcgmd.gov, 1
 fcic.gov, 1
@@ -34071,6 +35945,7 @@
 fcts.ml, 1
 fdalawboston.com, 1
 fdaregs.com, 1
+fdereplace.tk, 1
 fdevs.ch, 1
 fdfz.edu.cn, 1
 fdicig.gov, 1
@@ -34079,7 +35954,6 @@
 fdis.net.cn, 1
 fdlibre.eu, 1
 fdlpl.org, 1
-fdm.ddns.net, 1
 fdms.gov, 1
 fdn.one, 1
 fdp-alsdorf.de, 1
@@ -34101,6 +35975,7 @@
 feastr.de, 1
 feastr.io, 1
 feat.agency, 1
+feathersbtq.com, 1
 featherweightlabs.com, 1
 featuredmen.com, 1
 feb.gov, 1
@@ -34135,6 +36010,7 @@
 fedshirevets.gov, 1
 fedux.com.ar, 1
 feecreativity.com, 1
+feedbackproduction.tk, 1
 feedbin.com, 0
 feedclean.co, 1
 feedfall.com, 1
@@ -34160,6 +36036,7 @@
 feelmom.com, 1
 feelnet.top, 1
 feeltennis.net, 1
+feelya.com, 1
 feen.us, 1
 feepod.com, 1
 feeriedesign-event.com, 1
@@ -34172,6 +36049,7 @@
 fegc-wgec.gc.ca, 1
 fegli.gov, 1
 fehngarten.de, 1
+fehr-online.eu, 1
 feigling.net, 0
 feignandfolly.tk, 1
 feildel.fr, 1
@@ -34205,6 +36083,7 @@
 felipesuri.com, 1
 feliscatus.tk, 1
 felistirnavia.sk, 1
+felitecn.com, 1
 felix-hirner.de, 1
 felixaufreisen.de, 1
 felixbarta.de, 1
@@ -34213,11 +36092,12 @@
 felixc.at, 1
 felixcrux.com, 1
 felixgerschau.com, 1
+felixharo.es, 1
 felixkauer.de, 1
-felixklein.com, 0
 felixklenner.de, 1
 felixmendez.com, 1
 felixqu.com, 1
+felixsanchez.tk, 1
 felixsanz.com, 1
 felixseele.de, 1
 felixsworld.tk, 1
@@ -34228,12 +36108,14 @@
 felton.network, 1
 feltons.me, 1
 feluck.de, 1
+female-costumes.tk, 1
 femalefoodie.com, 1
 femarelle.is, 1
 femastudios.com, 1
 femcompany.nl, 1
 femdombbw.com, 1
 femiluna.com, 1
+feminina.eu, 1
 feminina.pt, 1
 feministreview.cf, 1
 feministspectrum.org, 1
@@ -34248,26 +36130,34 @@
 fena.jp, 1
 fenagav.ga, 1
 fence-stlouis.com, 1
+fencekirkwood.com, 1
 feng-hhcm.com, 1
+feng-in.com, 1
+feng-in.net, 1
 feng.si, 1
 fengchuiyudaqu.ml, 1
 fengyadi.com, 1
 fengyi.tel, 1
+fengying.co, 1
 fenhl.net, 1
 fenichelar.com, 1
 fenitriatnica.tk, 1
+fenix-site.tk, 1
 fenixhost.com.br, 1
 fenixmetal.tk, 1
 fenn.moe, 1
+fennet.rentals, 1
 fenom.ga, 1
 fenotipo.com, 1
+fenriragic.com, 1
+fenschui.ru, 1
 fenster-bank.at, 1
 fenster-bank.de, 1
 fensterbau-mutscheller.de, 1
+fenus.com.ar, 1
 fenyks.net, 1
 feodosiya.cf, 1
 feodosiya.tk, 1
-fer.pw, 1
 ferad.net, 1
 feras-alhajjaji.com, 1
 feraz.com.mx, 1
@@ -34288,6 +36178,7 @@
 ferienhaus-urlaub-danemark.de, 1
 ferienhausprovence.ch, 1
 ferienstpeter.de, 1
+ferienwohnung-becks.de, 1
 ferienwohnung-hafeninsel-stralsund.de, 1
 ferienwohnung-wiesengrund.eu, 1
 ferienwohnungen-lastminute.de, 1
@@ -34295,11 +36186,11 @@
 ferieservice.dk, 1
 feriespotter.dk, 1
 ferlc.org, 1
-ferm-rotterdam.nl, 1
 fermabel.com.br, 1
 fermanacuratampaparts.com, 1
 fermanaghomagh.com, 1
 fermastore.cf, 1
+fermateh.com.ua, 1
 fermier-mag.ro, 1
 fernandes.org, 1
 fernandezvilar.es, 1
@@ -34336,7 +36227,6 @@
 festaprylar.se, 1
 festerculiacan.com, 1
 festesuniversitaries.tk, 1
-festicle.com, 1
 festival-tipps.com, 1
 festival-transform.com, 1
 festival365.ml, 1
@@ -34351,6 +36241,7 @@
 festivalpopayan.tk, 1
 festivalsalmondeoro.tk, 1
 festivalsrit.tk, 1
+festivitas.tk, 1
 festrentcar.pl, 1
 festx.co.za, 1
 fetawerelddans.tk, 1
@@ -34392,7 +36283,6 @@
 ff-bg.xyz, 1
 ff-koenigstein-opf.de, 1
 ff-obersunzing-niedersunzing.de, 1
-ff00228.com, 1
 ff14-mstdn.xyz, 0
 ff18.cc, 1
 ff2k.net, 1
@@ -34400,8 +36290,10 @@
 ff326.com, 1
 ff396.com, 1
 ff5197.co, 1
+ff5g.com, 1
 ff612.com, 1
 ff6729.co, 1
+ff6729.com, 1
 ff675.com, 1
 ff6957.co, 1
 ff9297.co, 1
@@ -34413,7 +36305,6 @@
 ff976.com, 1
 ffb.gov, 1
 ffbans.org, 1
-ffbsee.de, 1
 ffbsee.net, 0
 fff-du.de, 1
 ffg.berlin, 1
@@ -34462,8 +36353,10 @@
 fhyl789.com, 1
 fhyl888.com, 1
 fi.google.com, 1
+fi.se, 1
 fi.search.yahoo.com, 0
 fiam.me, 1
+fianna.tk, 1
 fiareapp.red, 0
 fiasgo.com, 1
 fiasgo.dk, 1
@@ -34496,6 +36389,7 @@
 fidesic.com, 1
 fidhouriet.ch, 1
 fidias.com.br, 1
+fidonet.io, 1
 fidoniagara.ca, 1
 fidoo.com, 1
 fiduciaire-azur.com, 0
@@ -34504,6 +36398,7 @@
 fieggen.net, 1
 fieldexpert.eu, 1
 fieldsgynroboticsurgery.com, 1
+fierce-escarpment-59441.herokuapp.com, 1
 fiercerunning.com, 1
 fierman.eu, 0
 fierman.net, 0
@@ -34511,6 +36406,7 @@
 fierscleaning.nl, 1
 fiery.me, 1
 fierykitchen.pl, 1
+fietsambassade.be, 1
 fietsambassadegent.be, 1
 fietsherstel.gent, 1
 fietskr.at, 1
@@ -34523,7 +36419,6 @@
 fifautstore.com, 1
 fifei.de, 1
 fifemedicalgroup.co.uk, 1
-fifichachnil.paris, 1
 fifieldtech.com, 1
 fifr.nl, 1
 fiftynorth.eu, 1
@@ -34542,6 +36437,7 @@
 figliasons.com, 1
 figshare.com, 1
 figura.cz, 1
+figuras.tk, 1
 figurasdelinguagem.com.br, 1
 figure.nz, 1
 figuurzagers.nl, 0
@@ -34550,6 +36446,7 @@
 fiix.io, 1
 fijnefeestdageneneengelukkignieuwjaar.nl, 1
 fijnewoensdag.nl, 1
+fikavirtual.com, 1
 fiken.no, 1
 fikriwildannugraha.com, 1
 fiksem-it.nl, 1
@@ -34565,6 +36462,7 @@
 file24.tk, 1
 filebox.one, 1
 filebox.space, 1
+filecatchers.com, 1
 filecloud.fun, 1
 filecopa.com, 1
 filedesc.com, 1
@@ -34577,7 +36475,6 @@
 filek.ga, 1
 fileon.com, 1
 filequit.xyz, 1
-files.com, 1
 files.from-me.org, 1
 files.to, 1
 filesense.com, 1
@@ -34596,6 +36493,7 @@
 filingsmadeeasy.com, 1
 filip-prochazka.com, 0
 filipdima.ro, 1
+filipi.no, 1
 filipinadating.online, 1
 filipinasdailynews.tk, 1
 filipinochinese.tk, 1
@@ -34611,24 +36509,31 @@
 film-colleges.com, 1
 film-op-tv.nl, 1
 film-storyboards.com, 0
-film-storyboards.fr, 1
 film-tutorial.com, 1
 filmarchiv-sachsen.de, 1
 filmatiporno.xxx, 1
 filmbasar.com, 1
 filmbest.tk, 1
+filmcorner.tk, 1
 filmcrewdb.com, 1
 filmdirectingtips.com, 1
 filme-onlines.com, 1
+filmedonstage.com, 1
+filmero.tk, 1
 filmers.net, 1
+filmisfun.com, 1
+filmisfun.net, 1
 filmitis.com, 1
 filmizleindir.tk, 1
+filmnetz.tk, 1
 filmphotograph.com, 1
 filmpronet.in, 1
 filmreviewonline.com, 1
 filmsearch.tk, 1
 filmserver.de, 1
+filmsidan.tk, 1
 filmsite-studio.com, 1
+filmtheaternieuwegein.tk, 1
 filmwallpapers.ml, 1
 filobot.xyz, 1
 filokiralama.name.tr, 1
@@ -34641,13 +36546,18 @@
 fimozin.ga, 1
 fimp.pt, 1
 fimsquad.com, 1
+fina-foxy.com, 1
 final-expense-quotes.com, 1
+finalfate.tk, 1
 finalfourstream.tk, 1
+finalgambit.band, 1
+finalonline.tk, 1
 finalprice.net, 1
 finalrewind.org, 1
 finalworkdriesstef.tk, 1
 finalx.nl, 1
 finance-colleges.com, 1
+finance-consulting.ga, 1
 finance-devils.com, 1
 finance-equation.co.uk, 1
 finance-news.ga, 1
@@ -34655,6 +36565,7 @@
 financedepth.com, 1
 financedraft.com, 1
 financeguest.com, 1
+financeinterface.tk, 1
 financejobs.ch, 1
 financeknown.com, 1
 financelong.com, 1
@@ -34669,6 +36580,7 @@
 financetwenty.com, 1
 financewhile.com, 1
 financewithcromulent.com, 1
+financial-law.tk, 1
 financialfreedomaus.com, 1
 financialhost.org, 1
 financialnews.today, 1
@@ -34676,7 +36588,9 @@
 financniexperti.sk, 1
 finansa.no, 1
 finanskredirehberi.com, 0
+finanssaati.com, 1
 finanstilsynet.dk, 1
+finansy.tk, 1
 finanzasydinero.com, 1
 finapi.io, 1
 finax.eu, 1
@@ -34686,6 +36600,7 @@
 finch.ga, 1
 finchi.de, 1
 finchnest.co.uk, 1
+fincitegroup.com, 1
 fincities.tk, 1
 find-job-in.com, 1
 find-mba.com, 1
@@ -34712,6 +36627,7 @@
 findmespot.com, 1
 findmybottleshop.com.au, 1
 findmynudes.com, 1
+findmytricks.com, 1
 findolino.at, 1
 findom.network, 1
 findoon.de, 1
@@ -34761,13 +36677,14 @@
 finn.io, 1
 finnclass.cz, 1
 finneas.net, 1
+finnishclothing.tk, 1
 finnkupongkoder.no, 1
 finnwea.com, 0
+finom.co, 1
 finpomosh.gq, 1
 finprison.net, 1
 finpt.com, 0
 fins.money, 1
-finsall.co.in, 1
 finsecurity.eu, 1
 finsify.in, 1
 finsprings.org, 1
@@ -34792,7 +36709,9 @@
 fioulmarket.fr, 1
 fipackaging.com, 1
 fipq.tk, 1
+fir.ch, 1
 fir3net.com, 1
+firatofm.tk, 1
 firc.de, 1
 fire-places.tk, 1
 fire-schools.com, 1
@@ -34809,6 +36728,7 @@
 firefart.at, 0
 firefense.com, 1
 firefighters.dating, 1
+firefish.com.au, 1
 firegeisha.com, 1
 fireglow.de, 1
 firegore.com, 1
@@ -34829,11 +36749,14 @@
 firesofheaven.org, 1
 firestuff.org, 1
 firetotheprisons.org, 1
+fireurboss.tk, 1
 firevap.org, 1
-firewall.zone, 1
+firewallremoval.cf, 1
+fireware.tk, 1
 fireworksshowvr.com, 1
 firexarxa.de, 1
 firexfly.com, 1
+firexp.tk, 1
 firma-cerny.cz, 1
 firma-offshore.com, 1
 firmador.cloud, 1
@@ -34842,10 +36765,10 @@
 firmajulegaver.dk, 1
 firmale.com, 1
 firmament.space, 1
+firmament.tk, 1
 firmapi.com, 1
 firmen-assekuranz.de, 1
 firmenwerbung-vermarktung.de, 1
-firmfunding.com, 1
 firmground.nl, 1
 firmware.science, 1
 firouz.tk, 1
@@ -34872,6 +36795,7 @@
 firstderm.com, 1
 firstdorsal.eu, 1
 firstdry.com.br, 1
+firstechpayments.com, 1
 firstfinca.de, 1
 firstgov.gov, 1
 firstgradeframeofmind.com, 1
@@ -34890,7 +36814,8 @@
 firstversionist.com, 1
 firstwebring.tk, 1
 firtreetechnology.co.uk, 1
-fisch-club.de, 1
+fisaplay.com, 1
+fisarmonica.com.br, 1
 fischer-immoteam.de, 1
 fischer-its.com, 0
 fischer-kundendienst.de, 1
@@ -34907,16 +36832,20 @@
 fishbattle.io, 1
 fishbattle.net, 1
 fishcorp.dk, 1
+fishergo.ml, 1
 fishermailbox.net, 1
 fisherman-union.ml, 1
 fishermansbend.apartments, 1
 fishermansbendcorporation.com.au, 1
 fishermansbendtownhouses.com.au, 1
 fishexport.eu, 1
+fishfish.tk, 1
 fishgen.no, 1
 fishingplaces.net, 1
+fishingworld.tk, 1
 fishlanestudios.com, 1
 fishme.in, 1
+fishoftheday.tv, 1
 fishoilsafety.com, 1
 fishserver.net, 1
 fishtacos.blog, 1
@@ -34927,6 +36856,7 @@
 fishystuff.cf, 1
 fisinfomanagerdr.com, 1
 fisiobox.eu, 1
+fisiolunges.it, 1
 fisioterapista.roma.it, 1
 fisiotohome.com, 1
 fiskalnepretor.pl, 1
@@ -34958,8 +36888,10 @@
 fitnesskarate.club, 1
 fitnessplanet.best, 1
 fitnessunder50.com, 1
+fitnessup.fr, 1
 fitnhot.com, 1
 fito.tk, 1
+fitplus.tk, 1
 fitrecepty.info, 1
 fittelo.cz, 1
 fittingperfetto.it, 1
@@ -34969,6 +36901,7 @@
 fiveboosts.xyz, 1
 fivefortheroad.com, 1
 fiveloaves.life, 1
+fivepedia.tk, 1
 fiveslice.pizza, 1
 fivestartrader.com, 1
 fivetecnologia.com, 1
@@ -34987,6 +36920,7 @@
 fixfix.ch, 1
 fixfm.tk, 1
 fixforce.nl, 1
+fixingcountrybridges.com.au, 1
 fixingscrews.co.uk, 1
 fixlasvegas.com, 1
 fixmyalarmpanel.co.uk, 1
@@ -35034,8 +36968,8 @@
 fl.ru, 1
 fl0w.fr, 1
 flacandmp3.ml, 1
+flacon.tk, 1
 flaemig42.de, 0
-flag3force.com, 1
 flagburningworld.com, 1
 flagcdn.com, 1
 flagfox.net, 1
@@ -35059,6 +36993,7 @@
 flam3d.nl, 1
 flam3d.org, 1
 flamencoexplained.com, 0
+flamencoshoes.tk, 1
 flamentecnic.tk, 1
 flamero.fi, 1
 flamet.eu, 1
@@ -35106,8 +37041,10 @@
 flatpackmates.co.uk, 1
 flatsomestudio.ir, 1
 flatsurfers.eu, 1
+flattie.cz, 1
 flauschig.net, 1
 flavelappliances.com, 1
+flavinha.tk, 1
 flavinus.fr, 1
 flavio.click, 1
 flaviu.co.uk, 1
@@ -35137,6 +37074,7 @@
 fleetcor.pl, 1
 fleetcor.sk, 1
 fleetcorcards.be, 1
+fleetpal.io, 1
 fleetsmith.com, 1
 fleetssl.com, 1
 fleetster.es, 1
@@ -35146,6 +37084,7 @@
 flehm.de, 1
 fleisch.club, 1
 fleischkaes.de, 1
+flemingmccullagh.com, 1
 flemingtonaudiparts.com, 1
 flens.dance, 1
 flensburg-hilft-flensburg.de, 1
@@ -35181,12 +37120,11 @@
 flfl.de, 1
 fliacuello.com.ar, 1
 flibanserina.com, 1
-flibusta.appspot.com, 1
 flicerdowneh.cf, 1
 flickor.tk, 1
 flieger-funk-runde.de, 1
 fliesen-waldschmidt.de, 1
-flight.school, 1
+flight.school, 0
 flightdeckfriend.com, 1
 flightdiary.gq, 1
 flightjackets.tk, 1
@@ -35201,6 +37139,7 @@
 fliino.info, 1
 fliino.net, 1
 fliino.org, 1
+fliio.com, 1
 flikmsg.co, 1
 flimnet.tk, 1
 flinch.io, 1
@@ -35210,7 +37149,6 @@
 flip.lease, 1
 flipmusic.tk, 1
 flipneus.net, 1
-flippednotes.com, 0
 flippery-wynajem.pl, 1
 flipphotography.ga, 1
 flipsidevr.com, 1
@@ -35218,6 +37156,7 @@
 fliptracker.io, 1
 flipweb.tk, 1
 flirt-norden.de, 1
+flirtbox.tk, 1
 flirtee.net, 1
 flirtfaces.de, 1
 flirtportalcheck24.de, 1
@@ -35229,6 +37168,7 @@
 flixports.com, 1
 flixsave.com, 1
 flixstats.com, 1
+floart.tk, 1
 floaternet.com, 1
 floatifnghotel.cf, 1
 floating-holidays.co.uk, 1
@@ -35297,6 +37237,7 @@
 floridafx.gov, 1
 floridahealthcareconnections.gov, 1
 floridahomesinvest.com, 1
+floridaimigracao.com, 1
 floridamainmovers.com, 1
 floridapowermanagement.com, 1
 floridasexhealth.com, 1
@@ -35305,6 +37246,7 @@
 florinlungu.it, 1
 floris.tk, 1
 florismouwen.com, 0
+floristics.info, 1
 floristik-online.com, 1
 florisvdk.net, 1
 floriswesterman.nl, 1
@@ -35329,6 +37271,8 @@
 flowcount.xyz, 1
 flowcrypt.com, 1
 flowdise.com, 1
+flowercare.tk, 1
+flowerdelivery.tk, 1
 flowerdesign.tk, 1
 flowersandplantsco.com, 1
 flowersbylegacy.com, 1
@@ -35339,10 +37283,13 @@
 flowinity.com, 1
 flowinvoice.com, 1
 flowlytics.host, 1
+flownonfiction.com, 1
 flowpro.info, 1
 flowreader.com, 1
 flowreplicator.com, 1
 flowscale.com, 1
+flowstars.tk, 1
+flowstudios.com, 1
 flox.io, 1
 floy.dk, 1
 flp-pushkar.info, 1
@@ -35375,6 +37322,7 @@
 flushlife.com, 1
 flusszs.tk, 1
 fluteandpianoteaching.co.uk, 1
+flutterappdev.com, 1
 flux.healthcare, 1
 fluxforge.com, 1
 fluxi.fi, 1
@@ -35401,6 +37349,7 @@
 flyingdoggy.net, 1
 flyingdutchman.tk, 1
 flyinghigh.co.jp, 1
+flyinglions.tk, 1
 flyinglocksmiths.com, 1
 flyingpackets.net, 1
 flyingrub.me, 1
@@ -35419,6 +37368,7 @@
 flystar.immo, 1
 flyswoop.com, 1
 flyt.online, 1
+flythecopter.tk, 1
 flytoadventures.com, 1
 flytrap.in, 1
 flywind.ml, 1
@@ -35426,15 +37376,15 @@
 flyxll.com, 1
 fm-online.tk, 1
 fm.ie, 1
-fmapplication.com, 1
 fmbilder.se, 1
 fmc.gov, 1
 fmcs.gov, 1
-fmdance.cl, 1
+fmdance.cl, 0
 fmi.gov, 1
 fminsight.net, 1
 fmjd64.com, 1
 fmjd64.org, 1
+fmlife.tk, 1
 fmm-creative.com, 1
 fmodoux.biz, 0
 fmorales.com, 1
@@ -35454,8 +37404,10 @@
 fnordserver.eu, 1
 fnpro.eu, 1
 fnscatania.tk, 1
+foair.me, 1
 foairbus.fr, 0
 foairbussas.fr, 0
+foamfortress.tk, 1
 focalforest.com, 1
 focalpoint.tk, 1
 focanamoda.com.br, 1
@@ -35471,6 +37423,7 @@
 foej-aktiv.de, 1
 foej.net, 1
 foerster.gmbh, 1
+fof-clan.tk, 1
 fognini-depablo.eu, 1
 fogu.com, 1
 foguest.com.br, 1
@@ -35491,6 +37444,7 @@
 fol.tf, 1
 folar.ga, 1
 folclore.tk, 1
+folianti.com, 1
 folio.no, 1
 foliumbiosciences.com, 1
 foliumfinance.com, 1
@@ -35500,6 +37454,7 @@
 folkdance.tk, 1
 folkfests.org, 0
 folkofolk.se, 1
+folktalerecords.tk, 1
 follandviolins.com, 1
 follow-the-leader.tk, 1
 followboost.fr, 1
@@ -35509,13 +37464,15 @@
 followmystaff.com, 1
 followthatpage.com, 1
 foluomeng.net, 1
-folwark.krakow.pl, 1
-folwarkwiazy.pl, 1
+folwark.krakow.pl, 0
+folwarkwiazy.pl, 0
 fomo.af, 1
 fomo.exposed, 1
 fomo.trading, 1
 fomopop.com, 1
 fonamperu.org.pe, 1
+fonbet-zerkalo.ru, 1
+fondation-machpal.org, 1
 fondationo2.ch, 1
 fondationwiggli.ch, 1
 fondy.ru, 1
@@ -35527,12 +37484,10 @@
 fono.jp, 0
 fonolo.com, 1
 fonseguin.ca, 1
-font-converter.net, 1
 fontanaseiyo.jp, 1
 fontawesome.com, 1
 fonte-trading.com, 1
 fontein.de, 1
-fontela.es, 1
 fontnegar.ir, 1
 fonts2u.com, 1
 fonts4free.net, 1
@@ -35546,23 +37501,29 @@
 foodblogger.club, 1
 foodboy.com, 1
 foodcowgirls.com, 1
+foodcraft.ae, 1
 foodev.de, 1
 foodfriek.nl, 1
 foodlist.net, 1
 foodloader.net, 1
 foodlustkitchen.com, 1
+foodphotographyblog.com, 1
 foodplantengineering.com, 1
 foodsafety.gov, 1
 foodsafetyjobs.gov, 1
 foodsavers.gent, 1
 foodsaversgent.be, 1
+foodseurope.com, 1
 foodsoul.pro, 1
+foodsreborn.com, 1
 foodtable.at, 1
 foodtrekker.tk, 1
 foodwise.marketing, 1
+foodylab.it, 1
 foodyshoody.com, 1
 fooishbar.org, 0
 foolip.org, 1
+foolproofcomics.tk, 1
 foolwealth.com, 1
 foonly.fi, 1
 foorack.com, 1
@@ -35576,6 +37537,7 @@
 footballsrit.tk, 1
 footbolka.tk, 1
 footbolki.ml, 1
+footdoctorpodiatristnyc.com, 1
 footmercato.net, 1
 footwear-catalogue.tk, 1
 for-testing.tk, 1
@@ -35598,12 +37560,13 @@
 forcelinkamerica.nl, 1
 forcemasonry.net, 1
 forcemasonryinc.com, 1
-forcerakodo.hu, 1
+forcemat.fr, 1
 forces.army, 1
 forcewaterproofing.com, 1
 forcewave.com, 1
 ford-mustang.tk, 1
 ford-shop.by, 1
+fordeetv.com, 1
 fordlibrarymuseum.gov, 1
 fordshop.by, 0
 fordtrac.com.br, 1
@@ -35612,8 +37575,8 @@
 forecastcity.com, 1
 foreclosureattorneyhouston.com, 1
 forefrontcloud.com, 1
-foregroundweb.com, 1
 foreign-language-colleges.com, 1
+foreignpharmacydirectory.com, 1
 foreignxchange.com.au, 1
 forellenpark.com, 1
 foremail.tk, 1
@@ -35621,6 +37584,7 @@
 forensicsciencecentral.tk, 1
 forensicsinfo.ga, 1
 forensicsoftware.biz, 1
+forensischepsychiatrie.tk, 1
 forento.be, 1
 forers.com, 1
 foresdon.jp, 1
@@ -35640,17 +37604,20 @@
 forex-arabia.tk, 1
 forex-giants.com, 1
 forex-opinie.pl, 1
+forex-site.com, 1
 forex-trading-tutorial.tk, 1
 forex-up.cf, 1
 forex.ee, 1
 forexarby.com, 1
 forexchef.de, 1
 forexcity.cf, 1
+forexclubteam.com, 1
 forexcomreview.co, 1
 forexee.com, 1
 forexinthai.com, 0
 forexmarketsm.tk, 1
 forexnew.org, 1
+forexox.com, 1
 forexpattern.tk, 1
 forexplay.com, 1
 forexsignals7.com, 1
@@ -35669,7 +37636,9 @@
 formalgrammar.tk, 1
 formality.one, 1
 forman.store, 1
+formand.ru, 1
 formapi.io, 1
+formar-contract.it, 1
 format-paysage.ch, 0
 formation-assureur.com, 1
 formation-hauteur.com, 1
@@ -35696,11 +37665,15 @@
 fornwall.net, 0
 foro.io, 0
 foro.red, 1
+foroaranda.com, 1
 forobachiller.com, 1
 forodeespanol.com, 1
 forodieta.com, 0
+foroenguera.tk, 1
 forojovensanfernando.tk, 1
 forologikidilosi.com.gr, 1
+forosdelmisterio.tk, 1
+forourselves.com, 1
 forowarhammer.tk, 1
 forpreneur.com, 0
 forrestheller.com, 1
@@ -35734,6 +37707,16 @@
 forthetoys.com, 1
 forthewin.rocks, 1
 forthvalleykeswick.co.uk, 1
+forti1.com, 1
+fortifydiy.com, 1
+fortipartner.co.uk, 1
+fortipartner.com, 1
+fortipartner.dk, 1
+fortipartner.net, 1
+fortipartner.nl, 1
+fortipartner.pl, 1
+fortipartner.se, 1
+fortipartner.uk, 1
 fortisadhesives.com.au, 1
 fortistci.com, 1
 fortmatic.com, 1
@@ -35744,15 +37727,16 @@
 fortress.sk, 1
 fortresslinux.com, 1
 fortresslinux.nl, 1
-fortresslinux.org, 1
 fortricks.in, 1
 fortsecure.com.br, 1
 fortuna-apotheke-lahnstein.de, 1
 fortuna-loessnitz.de, 1
 fortuna-s.com, 1
 fortuna.co.ua, 1
+fortunabuilders.tk, 1
 fortunacigarettes.tk, 1
 fortunahamburg.tk, 1
+fortuneinvestments.ga, 1
 forty-two.ml, 1
 forty-two.nl, 1
 forty8creates.com, 1
@@ -35762,9 +37746,9 @@
 forum-4.com, 1
 forum-batteries.com, 1
 forum-egypte.tk, 1
+forum-expert.tk, 1
 forum-gilee.cf, 1
 forum-kinozal-tv.appspot.com, 1
-forum-kinozal.appspot.com, 1
 forum-noginska.tk, 1
 forum-reklamowe.cf, 1
 forum-tutorapide.ml, 1
@@ -35774,21 +37758,26 @@
 forumcarriocity.tk, 1
 forumdimo.fr, 1
 forumirc.net, 1
+forumistudentore.tk, 1
 forumoff.com, 1
 forumofld.in, 1
 forumotion.cf, 1
 forumotomobil.com, 1
 forumpakistan.tk, 1
+forumpenaguru.com, 1
 forumrussia.tk, 1
 forums4everyone.tk, 1
 forumsampdoria.tk, 1
 forumsrussia.ga, 1
 forumstandaardisatie.nl, 1
 forumu.net, 1
+forumvardbyggnad.se, 1
 forvisualdesign.com, 0
 forward-fly-fishing.ch, 0
 forward.com, 1
 forwardemail.net, 1
+forwardfever.tk, 1
+forwardtogether.org, 1
 foryourhealthybody.com, 1
 forzamotorsport.net, 1
 fos-apps.org, 1
@@ -35819,7 +37808,6 @@
 foto-janvanaefst.nl, 1
 foto-leitner.com, 1
 foto-leitner.de, 1
-foto-mario.de, 1
 foto-robitsch.at, 1
 foto-roma.ru, 1
 foto-znakomstva.ml, 1
@@ -35848,6 +37836,7 @@
 fotomodel.cf, 1
 fotomodels.tk, 1
 fotonjan.com, 1
+fotontechnik.pl, 1
 fotonza.ru, 1
 fotopalacedigitalstudio.tk, 1
 fotopremium.cz, 1
@@ -35864,6 +37853,7 @@
 foudufafa.de, 0
 fougner.co, 1
 found.website, 1
+foundationassure.com, 1
 foundationmaintenance.com, 1
 foundationrepairannarbor.com, 1
 foundationrepairasheville.com, 1
@@ -35881,6 +37871,7 @@
 foundsounds.me, 1
 fourashesgolfcentre.co.uk, 1
 fourashesgolfcentre.uk, 1
+fourcask.com, 1
 fourchetteverte.ch, 1
 fourcornerscb.com, 1
 fourdesignstudio.com, 1
@@ -35961,10 +37952,12 @@
 fractionclub.com, 1
 fracturedperspective.com, 1
 fragdenstaat.de, 1
+frageboegen-martini-klinik.de, 1
 fragilesolar.cf, 1
 fragmentation.ml, 1
 fragments.ga, 1
 fragmentspuren.de, 1
+fragmentus.tk, 1
 fragstore.net, 1
 fraho.eu, 1
 frahub.com, 1
@@ -36017,7 +38010,6 @@
 framastory.org, 1
 framatalk.org, 1
 framateam.org, 1
-framatube.org, 1
 framavectoriel.org, 1
 framavox.org, 1
 framawiki.org, 1
@@ -36026,16 +38018,20 @@
 framedpaws.com, 1
 framemo.org, 1
 framer.com, 1
+frames-eyelash.com, 1
+frames-hair-design.com, 1
 framindmap.org, 1
 framinetest.org, 1
 fran.cr, 1
 france-hotellerie-restauration.com, 1
 france-news.cf, 1
 franceactivetravel.cf, 1
+francebattery.com, 1
 francepandi.fr, 1
 francesca-and-lucas.com, 1
 francescopalazzo.com, 1
 francescopandolfibalbi.it, 1
+francescosiciliano.tk, 1
 francescoyatesfansite.com, 1
 francesfluente.cf, 1
 francetraceur.fr, 1
@@ -36045,6 +38041,8 @@
 franchisehive.com, 1
 francinebelanger.network, 1
 francis.ph, 1
+francisbaconnet.com, 1
+franciscadelasllagasvirtual.com, 1
 franciscoalpendre.com.br, 1
 francisli.net, 1
 francisplaza.com, 1
@@ -36072,19 +38070,24 @@
 frankierprofi.de, 1
 frankierstar.de, 1
 frankieruiz.tk, 1
+frankieylosmatadores.tk, 1
+frankland.tk, 1
 franklincountyflorida.gov, 1
 franklincountyny.gov, 1
 franklinhua.com, 1
 frankopol-sklep.pl, 1
 frankslaughterinsurance.com, 1
 frankyan.com, 1
+frankydo.com, 1
 franqois.id, 1
+fransallen.com, 1
 franta.biz, 1
 franta.email, 1
 frantic1048.com, 1
 frantorregrosa.me, 1
 franz-vatter.de, 1
 franz.beer, 1
+franzen.tk, 1
 franziska-pascal.de, 1
 franziskaherbert.de, 1
 franzknoll.de, 1
@@ -36094,7 +38097,7 @@
 frappant.cc, 1
 frappant.net, 1
 fraselab.ru, 1
-fraserengineco.com, 1
+fraser-hann.co.uk, 1
 frasermurray.scot, 1
 fraservalleyhotdog.com, 1
 frasesconemocion.com, 1
@@ -36103,6 +38106,7 @@
 frasestop.com.br, 1
 frasesytarjetas.com, 1
 fratelliscarrone.com, 1
+fraterbolivia.tk, 1
 fratiicazanoi.ro, 1
 frattaroli.org, 1
 frau-pusteblu.me, 1
@@ -36145,6 +38149,7 @@
 freakyawesome.solutions, 1
 freakyawesome.world, 1
 freakyawesome.yoga, 1
+freakyhappenings.tk, 1
 frebi.org, 1
 frebib.co.uk, 1
 frebib.com, 1
@@ -36161,10 +38166,10 @@
 fredericcote.com, 1
 frederickearlstein.com, 1
 frederickmd.gov, 1
-frederikschoell.de, 0
 frederikshavn.net, 1
 frederikugarte.tk, 1
 fredhook.tk, 1
+fredjanssen.tk, 1
 fredliang.cn, 0
 frednet.tk, 1
 fredriksslaktforskning.se, 1
@@ -36176,6 +38181,7 @@
 fredvoyage.fr, 1
 free-barcode-generator.net, 1
 free-bitco.ml, 1
+free-cms.tk, 1
 free-generate.tk, 1
 free-lancer.ml, 1
 free-obmen.ml, 1
@@ -36184,14 +38190,16 @@
 free-sql-query-tool.com, 1
 free-ss.site, 1
 free-traff.cf, 1
+free-vectors.com, 1
 free-watching.ga, 1
+free-webtv.tk, 1
 free.ac.cn, 1
 free.com.tw, 1
 free6to12yo.gq, 1
 free8.cloud, 1
 free8.xyz, 1
-free8hd.com, 1
 freeaf.gq, 1
+freeagent.tk, 1
 freeartico.ga, 1
 freeassange.net, 1
 freeauroraoperations.tk, 1
@@ -36203,7 +38211,6 @@
 freeben666.fr, 1
 freebetoffers.co.uk, 1
 freebitcoinfaucet.org, 1
-freebonusmembership.site, 0
 freebookdomain.tk, 1
 freebookmakersbetsandbonuses.com.au, 1
 freebookslibrary.gq, 1
@@ -36214,8 +38221,10 @@
 freecam2cam.site, 1
 freecloud.at, 1
 freecn.xyz, 1
+freecookies.nl, 1
 freecoursehunt.in, 1
 freecrypt.ga, 1
+freedatingonline.ml, 1
 freedeals4u.ga, 1
 freedev.cz, 1
 freedgb.com, 1
@@ -36234,14 +38243,17 @@
 freedomonline.bg, 1
 freedomrahoitus.fi, 1
 freedomtoolkit.com, 1
+freedomtwp-pc.org, 1
 freedomvote.nl, 1
 freedomwill.tk, 1
+freeebooksblog.com, 1
 freeenglishhelp.com, 1
-freeexampapers.com, 1
 freefallproductions.tk, 1
 freefilesync.org, 1
-freefinancialhelp.net, 0
+freefinancialhelp.net, 1
 freefincal.com, 1
+freeflarum.com, 1
+freefonts.ga, 1
 freeform4u.de, 1
 freegame-mugen.jp, 1
 freegamesmac.com, 1
@@ -36317,11 +38329,13 @@
 freeshkre.li, 1
 freeskateparks.com, 1
 freeslots.guru, 1
+freesmile.tk, 1
 freesms-online.de, 1
 freesnowden.is, 1
 freesoft-board.to, 1
 freesoftlab.com, 1
 freesolitaire.win, 1
+freesoul-deactivate-plugins.com, 1
 freesourcestl.org, 1
 freespace.info, 1
 freespanlift.com, 1
@@ -36330,6 +38344,7 @@
 freesquare.net, 1
 freessl.tech, 1
 freesslcertificate.me, 1
+freestylemartialarts.tk, 1
 freestylesolutions.com, 1
 freetagboards.tk, 1
 freetaxusa.com, 1
@@ -36338,6 +38353,7 @@
 freethehustle.com, 0
 freethetv.ie, 1
 freeths.co.uk, 1
+freetimefun.tk, 1
 freetrial.tech, 1
 freetrung.tk, 1
 freetsa.org, 1
@@ -36365,7 +38381,6 @@
 freifunk-essen.de, 1
 freifunk-in-solingen.de, 1
 freifunk-lindlar.net, 1
-freifunk-luenen.de, 1
 freifunk-remscheid.de, 1
 freimeldungen.de, 1
 freims.cc, 1
@@ -36373,6 +38388,7 @@
 freitasul.io, 1
 freiwurst.net, 1
 freizeitbad-riff.de, 1
+freizeitpark.tk, 1
 freizeitplaza.de, 1
 frejasdal.dk, 1
 frekat.tk, 1
@@ -36381,6 +38397,7 @@
 frenchcreekcog.org, 1
 frenchmac.com, 1
 frenchmusic.fr, 1
+frenchvandal.com, 0
 frendamos-roleplay.ml, 1
 frenetic.lv, 1
 frenzel.dk, 1
@@ -36408,6 +38425,7 @@
 freshhosting.tk, 1
 freshinsport.fr, 1
 freshmail.com, 1
+freshman.com.tw, 1
 freshmans-pizza.de, 1
 freshplus62.com, 1
 freshpounds.com, 1
@@ -36416,9 +38434,10 @@
 freston.eu, 1
 fretscha.com, 1
 frettboard.com, 0
+frettennet.tk, 1
 frettirnar.is, 1
 fretworksec.com, 1
-freundeskreis-tarjan.de, 1
+freudedurchmachen.de, 1
 freundinnen-ausflug.de, 1
 freundinnen-kurzurlaub.de, 1
 freundinnen-urlaub.de, 1
@@ -36432,10 +38451,12 @@
 frickenate.com, 1
 frickybeats.com, 1
 fridarestaurantemexicano.com, 1
+fridaybridge.tk, 1
 fridayfoucoud.ma, 1
 fridaypulse.com, 1
 fridaysforfuture-bremen.de, 1
 fridolinka.cz, 1
+fried.tk, 1
 friedberg2020.de, 1
 friedcoffee.com, 1
 friederes.lu, 1
@@ -36450,6 +38471,7 @@
 friedzombie.com, 1
 friedzombie.nl, 1
 friedzombie.online, 1
+friendly.pe, 1
 friendlydabs.com, 1
 friendlysiberia.com, 1
 friendlytennisclub.com.ua, 1
@@ -36457,23 +38479,25 @@
 friendofthehoneybee.org, 1
 friendofthehoneybee.org.uk, 1
 friendowment.us, 1
-friends24.cz, 1
+friends-online.tk, 1
 friendsforeverrecords.tk, 1
-friendship-quotes.co.uk, 1
 friendshipismagicsquad.com, 1
 friendsinfilm.com, 0
 friendsnew.com, 1
 friendsofgfwpc.org, 1
+friendsofmagnacarta.tk, 1
 friendsofoldstthomas.org, 1
 friendsofthehoneybee.co.uk, 1
 friendsofthehoneybee.com, 1
 friendsofthehoneybee.org, 1
 friendsofthehoneybee.org.uk, 1
 friendsofthehoneybee.uk, 1
+friendsonline.tk, 1
 friet.org, 1
 frietbesteld.nl, 1
 frietzombie.nl, 1
 friezy.ru, 1
+frightmare.tk, 1
 frigi.ch, 0
 frign.de, 1
 frigochaco.com.py, 1
@@ -36490,14 +38514,21 @@
 frino.de, 1
 friplay.host, 1
 fripper.tk, 1
+frisaga.com, 1
+frisaga.me, 1
+frisaga.net, 1
+frisaga.org, 1
 frisaga.travel, 1
 friseur-foerder.de, 1
 friss.com, 1
+frisuren.tk, 1
 fritteli.ch, 1
 fritz-koehne-schule.de, 1
+fritzbox-forum.tk, 1
 fritzrepair.com, 1
 friv-2018.ga, 1
 frizo.com, 1
+fro.ge, 1
 fro.se, 1
 frob.nl, 1
 frode.win, 1
@@ -36515,6 +38546,7 @@
 from.ga, 1
 from.network, 1
 fromager.net, 1
+fromages-freres-marchand.fr, 1
 fromix.de, 1
 fromlemaytoz.com, 1
 fromm-projects.de, 1
@@ -36535,6 +38567,7 @@
 frontierbrasil.tk, 1
 frontierdiscount.com, 1
 frontiers.nl, 1
+frontigate.com, 1
 frontline.cloud, 1
 frontlinemessenger.com, 1
 frontrowshoppe.com, 0
@@ -36579,6 +38612,7 @@
 fruit.ml, 1
 fruition.co.jp, 1
 fruitscale.com, 1
+fruityloop.tk, 1
 fruityten.co.uk, 1
 frusky.de, 1
 frutasyvejetales.com, 1
@@ -36623,6 +38657,7 @@
 fsstyle.com, 1
 fstatic.io, 1
 fsty.uk, 1
+fsub.de, 1
 fsvoboda.cz, 1
 fsvt.ch, 0
 ft.com, 0
@@ -36637,11 +38672,10 @@
 ftl13.com, 1
 ftmc.tk, 1
 ftng.se, 1
-ftnpower.com, 1
 ftpmovement.tk, 1
 ftptest.net, 1
 ftrac.com.br, 1
-ftrucks.com.au, 1
+ftrucks.com.au, 0
 ftv.re, 1
 ftworthhousekeeper.com, 1
 ftx.com, 1
@@ -36649,14 +38683,19 @@
 ftx.io, 1
 ftx.tech, 1
 ftx.us, 1
+fu-li88.com, 1
+fu-li88.net, 1
 fu898.top, 1
 fuantaishenhaimuli.net, 1
 fucajz.cz, 1
 fuchsy.com, 1
 fuciam.com.co, 1
 fuck-your-false-positive.de, 1
+fuckar.ch, 1
 fuckav.ru, 1
 fuckcf.cf, 1
+fucknazis.cf, 1
+fucknazis.tk, 1
 fuckobr.com, 1
 fuckobr.net, 1
 fuckobr.org, 1
@@ -36667,10 +38706,12 @@
 fuckxichina.com, 1
 fuckyoupaypal.me, 1
 fuckz.net, 1
+fuddittu.tk, 1
 fudie.net, 1
 fudubank.vn, 1
 fuechschen.org, 1
 fuego.tech, 1
+fuegosalsapower.tk, 1
 fuelfirebrand.com, 1
 fuelingyourdreams.com, 0
 fuembellida.tk, 1
@@ -36679,7 +38720,7 @@
 fuer-gerechte-steuern.at, 1
 fuerstenfelder-immobilien.de, 1
 fuerzaazul.tk, 1
-fugioninc.com, 1
+fugioninc.com, 0
 fugle.de, 1
 fuglede.dk, 1
 fuite.ch, 0
@@ -36690,8 +38731,10 @@
 fujianshipbuilding.com, 1
 fujieb.com, 1
 fujijin.co.jp, 1
+fujikochan.tk, 1
 fujiyakimono.com, 1
 fukakukeiba.com, 1
+fukase-seed.com, 1
 fukata.org, 1
 fukikaeru.com, 1
 fukt.ca, 1
@@ -36708,18 +38751,18 @@
 fuliwang.us, 1
 full-race.com, 1
 full-stack.ninja, 1
+fullalt.com, 1
 fullautomotivo.com.br, 1
 fullaw.in, 1
 fullbundle.com, 1
 fullcirclestudio.nl, 1
 fullerlife.org.uk, 1
-fullfilez.com, 1
 fullhost.com, 1
 fullhub.ru, 1
 fullmetalconsulting.tk, 1
 fullmoondesignhouse.tk, 1
 fullsize.ml, 1
-fullstacknotes.com, 0
+fullspace.com.br, 1
 fulltextarchive.com, 1
 fulltxt.ml, 1
 fully-hair.tk, 1
@@ -36732,7 +38775,6 @@
 fun-fan.biz, 1
 fun-life.com.tw, 1
 fun-tasia.co.uk, 1
-fun4kidzbouncycastles.co.uk, 1
 fun4ubouncycastles.co.uk, 1
 fun888city.com, 1
 fun888city.net, 1
@@ -36744,6 +38786,7 @@
 funandbounce.com, 1
 funatic.nl, 1
 funatic.tk, 1
+funboat.tk, 1
 funbuynet.com.br, 1
 funcabinrentals.com, 1
 funchal.ga, 1
@@ -36763,19 +38806,21 @@
 fundmyfuture.info, 1
 fundmylegalclaim.co.uk, 1
 fundort.ch, 1
-fundpress.org, 1
+fundpress.org, 0
 funds.ddns.net, 1
 funeraire-365.com, 1
 funeral-365.com, 1
 funeral-doom.tk, 1
 funerare-cazacu.com, 1
+funerare24.ro, 1
 funfactorleeds.co.uk, 1
-funfair.io, 1
+funfacts.cz, 1
 funfun.com.br, 1
 funfunmstdn.tokyo, 1
 fungalforager.com, 1
 fungame.eu, 1
 fungomoscow.cf, 1
+funhotdate.com, 1
 funhouse-inflatables.co.uk, 1
 funhunt.es, 1
 funideas.org, 1
@@ -36835,12 +38880,15 @@
 funkfernbedienung-industrie.de, 1
 funkner.ru, 1
 funknotaus.de, 1
+funkogames.com, 1
 funksteckdosen24.de, 0
 funktdesign.dk, 1
 funktdesign.eu, 1
 funktionel.co, 1
 funktionevents.co.uk, 1
 funkydealz.no, 1
+funkyflo.tk, 1
+funloaded.org.ng, 1
 funmountaincanyon.com, 1
 funniestclip.com, 1
 funny-rates.tk, 1
@@ -36856,6 +38904,8 @@
 funnytimes.cf, 1
 funoverip.net, 1
 funpakistan.tk, 1
+funphone.tk, 1
+funplaza.tk, 1
 funprode.org, 1
 funprogramming.tk, 1
 funreaktor.com, 1
@@ -36872,6 +38922,7 @@
 funtimeusabiloxi.com, 1
 funyirotraktor.hu, 1
 funzack.cf, 1
+fur-shop.tk, 1
 fur.red, 1
 furancheiro.com, 1
 furca.ca, 1
@@ -36884,6 +38935,7 @@
 furisode-yamaguchiya.com, 1
 furiya.tk, 1
 furkancaliskan.com, 1
+furkankose.ml, 1
 furkot.com, 1
 furkot.de, 1
 furkot.es, 1
@@ -36892,10 +38944,11 @@
 furkot.pl, 1
 furlan.co, 0
 furlan.tk, 1
-furlog.it, 0
+furlog.it, 1
 furnfurs.com, 1
 furnishedproperty.com.au, 1
 furnitureconcept.co.uk, 1
+furnitureproduction.tk, 1
 furniturezoneboone.com, 1
 furorcanario.tk, 1
 furosemide-lasix.tk, 1
@@ -36907,6 +38960,7 @@
 furry.dk, 1
 furrycraft.ga, 1
 furrytech.network, 1
+fursandfur.tk, 1
 fursuitbutts.com, 1
 furtodo.com, 1
 furworks.de, 1
@@ -36914,6 +38968,7 @@
 fusacity.tk, 1
 fusacovi.cf, 1
 fusechange.org, 1
+fuselight.nl, 1
 fuseos.net, 1
 fuseyahoken.com, 1
 fushee.com, 1
@@ -36934,7 +38989,6 @@
 futa.wiki, 1
 futaba-works.com, 1
 futarara.ga, 1
-futb0l.com, 1
 futbito.com, 1
 futbol-tv.tk, 1
 futbolcba.com, 1
@@ -36946,7 +39000,6 @@
 futrou.com, 1
 futurama-il.tk, 1
 futureaudiographics.com, 1
-futurefastforward.com, 1
 futurefire.de, 1
 futurefive.asia, 1
 futurefive.co.nz, 1
@@ -36958,7 +39011,7 @@
 futureindia.tech, 1
 futurenda.com, 1
 futureofyoucdc.sg, 1
-futureshock7130.com, 1
+futureplanet.tk, 1
 futuresonline.com, 1
 futuressm.com, 1
 futurestyletiling.com.au, 1
@@ -36973,6 +39026,7 @@
 fuzenet.net, 1
 fuzoku-sodan.com, 1
 fuzoku.jp, 1
+fuzzbucket.tk, 1
 fuzzing-project.org, 1
 fuzzlemann.de, 1
 fuzzylogic.tk, 1
@@ -36995,6 +39049,7 @@
 fx-rk.com, 1
 fx110.com, 1
 fx5.de, 1
+fxbrokerreview.org, 1
 fxe.pt, 1
 fxeuropa.com, 1
 fxgame.online, 1
@@ -37034,7 +39089,6 @@
 fyn.software, 1
 fynbo.io, 1
 fyol.pw, 1
-fyol.xyz, 1
 fyphb.com, 1
 fyretrine.com, 1
 fyroeo.fr, 0
@@ -37047,12 +39101,10 @@
 fysuite.com, 1
 fytcart.com, 1
 fytorio-pasxalis.gr, 1
-fyziotomi.sk, 1
 fzbrweb.cz, 1
 fzdm.com, 1
 fzhyzamt.com, 1
 fzoske.de, 1
-fztopsec.com, 1
 fzx750.ru, 1
 g-center.tk, 1
 g-ds.de, 1
@@ -37102,7 +39154,6 @@
 g7campdavid.gov, 1
 g7usa.gov, 1
 g81365.com, 1
-g818city.com, 1
 g82365.com, 1
 g8energysolutions.co.uk, 1
 g9297.co, 1
@@ -37112,6 +39163,7 @@
 ga-part.ru, 1
 gaasuper6.com, 1
 gaaz.fr, 1
+gabairealestate.com, 1
 gabaldon.eu, 1
 gabaldon.nl, 1
 gabapentin.gq, 1
@@ -37128,12 +39180,12 @@
 gabecook.com, 1
 gabethebabetv.com, 1
 gabinet-okulistyczny.tk, 1
-gabinetejuridicotecnologicojuandemeseguer.es, 1
-gabinetpsychoterapii.krakow.pl, 1
+gabinetpsychoterapii.krakow.pl, 0
 gabiocs.com, 1
 gablesportsga.com, 1
 gably.net, 1
 gabnotes.org, 1
+gabonactu.com, 1
 gabriel.to, 1
 gabrielaebruno.cf, 1
 gabrielafriasfanclub.tk, 1
@@ -37150,6 +39202,7 @@
 gabrielyin.com, 0
 gabryjeluk.tk, 1
 gabyminneboo.tk, 1
+gabysoft.tk, 1
 gachimuchi.ru, 1
 gachiyase.com, 1
 gachter.name, 0
@@ -37160,6 +39213,7 @@
 gadanie.cf, 1
 gadatel.ml, 1
 gaddini.it, 1
+gadecs.com, 1
 gadget-freak.cf, 1
 gadget-tips.com, 1
 gadgetadvisor.net, 1
@@ -37172,6 +39226,7 @@
 gadgetputeh.com, 1
 gadgets-cars.com.es, 1
 gadgetstock.ir, 1
+gadingpromosindo.tk, 1
 gadkiy-farm.tk, 1
 gadse.games, 1
 gadzilla.tk, 1
@@ -37183,6 +39238,7 @@
 gaestehaus-monika.com, 1
 gaetanosonline.com, 1
 gafachi.com, 1
+gafan.cf, 1
 gaff-rig.co.uk, 1
 gaflooring.com, 1
 gaga-debki.pl, 1
@@ -37194,11 +39250,13 @@
 gagnerenfant.tk, 1
 gagnerplusdargent.info, 1
 gagniard.org, 1
-gagor.pl, 1
+gagor.pl, 0
 gagramore.cf, 1
 gagygnole.ch, 0
 gaiafood.co, 1
 gaiavanderzeyp.com, 0
+gaigai.com, 1
+gaijin.network, 1
 gaijin.systems, 1
 gaijinsystems.com, 1
 gailfellowsphotography.com, 1
@@ -37221,6 +39279,7 @@
 gala.kiev.ua, 0
 galacg.me, 1
 galacticaos.tk, 1
+galacticfederation.eu, 1
 galaksidot.tk, 1
 galaktika-znakomstv.tk, 1
 galaltosalento.it, 1
@@ -37240,7 +39299,7 @@
 galaxyplex.tk, 1
 galaxyscientific.com, 1
 galefacialplastics.com, 1
-galenguyer.com, 1
+galenguyer.com, 0
 galenreasoner.com, 1
 galeria42.com, 1
 galeriabunkers.tk, 1
@@ -37258,10 +39317,9 @@
 gali.review, 1
 galilahiskye.com, 1
 galileanhome.org, 1
-galilel.cloud, 1
 galileo.io, 1
-galileoart.com, 1
 galileohealth.com, 1
+galina.ga, 1
 galinas-blog.de, 1
 galinos.gr, 1
 galive.ga, 1
@@ -37275,20 +39333,24 @@
 galleryinfo.ga, 1
 gallest.cf, 1
 gallest.ga, 1
-galletasgabi.com.mx, 0
 galleyfoods.com, 1
 gallicrooster.com, 1
+gallifreyan-koala.tech, 1
 gallifreyapp.co.uk, 1
 gallifreypermaculture.com.au, 1
 gallmeyer-consulting.com, 1
+gallolineabagno.it, 1
 gallun-shop.com, 1
 galoserver.org, 1
 galpaoap.com.br, 1
+galpsafetytalks-portal-preprod.azurewebsites.net, 1
+galpsafetytalks-portal-production.azurewebsites.net, 1
 galtelligence.com, 1
 galvincdn.com, 1
 galvingao.com, 1
 galvinism.ink, 1
 gamagam.gq, 1
+gamalawadforum.tk, 1
 gamanlu.com, 1
 gamberorosso.menu, 1
 gamberorotto.com, 1
@@ -37307,6 +39369,7 @@
 gamburger.tk, 1
 gamcore.com, 1
 game-club.me, 1
+game-dominion.tk, 1
 game-files.net, 0
 game-garage.com, 1
 game-gentle.com, 1
@@ -37321,8 +39384,11 @@
 game88play.com, 1
 game88yule.com, 1
 gameanalytics.com, 1
+gameapexlegends.com, 1
 gamebase.tk, 1
 gameblabla.nl, 1
+gamebrott.com, 1
+gamecarddelivery.com, 1
 gamecentercity.fr, 1
 gamechefpummarola.eu, 1
 gamechurch.de, 1
@@ -37350,13 +39416,14 @@
 gamekiller.ga, 1
 gameloft.ga, 1
 gamelok.ga, 1
-gamelus.com, 1
 gamemakers.tk, 1
 gamemodding.com, 1
 gamenerd.net, 1
 gameofbooks.de, 1
+gameonespirit.tk, 1
 gamepad.com.br, 1
 gameplaysforkids.com, 1
+gamepower.tk, 1
 gamepreorders.com, 1
 gamepres.org, 1
 gamer-portal.com, 1
@@ -37384,6 +39451,7 @@
 gamerspawn.net, 1
 gamersplace.tk, 1
 gamerspost.ga, 1
+gamerstudiozinc.tk, 1
 gamersuniverse.tk, 1
 gamertelligence.com, 1
 gamerwelfare.com, 1
@@ -37391,26 +39459,34 @@
 games-station.tk, 1
 games2kids.net, 1
 games4theworld.org, 1
+gamesalia.com, 1
 gamesaviour.com, 1
 gamesdepartment.co.uk, 1
 gameserver-admin.ga, 1
 gameserver-sponsor.me, 1
+gamesgate.tk, 1
 gameshack.io, 1
 gameship.ga, 1
 gameshogun.xyz, 1
+gameshopsrbija.com, 1
 gameshowchallenge.ie, 1
 gamesided.com, 1
 gamesmagic.tk, 1
+gamespark.tk, 1
+gamespider.tk, 1
 gamesplanet.com, 1
 gamesputnik.ru, 1
+gamestoplayfree.com, 1
 gameswitchers.uk, 1
-gametilt.com, 1
 gametium.com, 1
 gametium.es, 1
 gametube.website, 1
+gameview.tk, 1
 gamewayz.online, 1
 gamewinninggoal.com, 1
+gameworldcdr.tk, 1
 gamexperts.ga, 1
+gamezon.tk, 1
 gamhealth.net, 1
 gamilab.com, 1
 gamilab.no, 1
@@ -37425,6 +39501,7 @@
 gamingph.com, 1
 gamingterritory.com, 1
 gamingtilltheend.cf, 1
+gamingtoday.ga, 1
 gamingtopbox.ga, 1
 gamingwithcromulent.com, 1
 gamingx.tk, 1
@@ -37434,7 +39511,6 @@
 gamishou.fr, 1
 gamivo.com, 1
 gammaphibeta.tk, 1
-gampa.be, 1
 gamster.tv, 1
 gan.wtf, 1
 ganado.org, 1
@@ -37446,11 +39522,13 @@
 gandalfservice.com, 1
 gandalfthefeline.com, 1
 gandgliquors.com, 1
+gangbangs.tk, 1
 ganggalbichler.at, 1
 ganglioslinfaticos.com, 1
 gangnam-club.com, 1
 gangnamcool.com, 1
 gangrulz.tk, 1
+gangstaflow.tk, 1
 ganjinedanesh.com, 1
 ganodermatiendaonline.com, 1
 gansu30019.com, 1
@@ -37476,6 +39554,7 @@
 gaponov.tk, 1
 garage-leone.com, 0
 garage.click, 1
+garagechief.com, 1
 garagedejan.ch, 1
 garagedoorrepaircedarhilltx.com, 1
 garagedoorrepairingsanjose.com, 1
@@ -37497,6 +39576,7 @@
 garciam.gt, 1
 garciaortiz.com, 1
 garda-see.mobi, 1
+gardarika.tk, 1
 gardedenfantspourtous.fr, 1
 garden-land.ga, 1
 garden-life.org, 1
@@ -37504,7 +39584,6 @@
 gardencentreshopping.co.uk, 1
 gardengameshireuk.com, 1
 gardensquaredental.co.uk, 1
-gardenstate.tech, 1
 gardikagigih.com, 1
 gardis.ua, 0
 gardonslecap-covid19.ch, 1
@@ -37521,10 +39600,11 @@
 garmonia.ml, 1
 garnertree.com, 1
 garnuchbau.de, 1
-garo.host, 1
+garo.network, 1
 garonna.com.ua, 1
 garotastop10.tk, 1
 garotos.gq, 1
+garotos.tk, 1
 garrettcornwell.tk, 1
 garriganenterprises.com, 1
 garriganenterprises.net, 1
@@ -37534,12 +39614,15 @@
 garrow.se, 1
 garrowdigitalmedia.com, 1
 garrowmediallc.com, 1
+garrulousgrimoire.com, 1
 garryserver.de, 1
 garsio.com, 1
 gartanien.de, 1
 garten-diy.de, 1
+gartenbau-rostock.de, 1
 gartenbaur.de, 1
 gartenforsenate.com, 1
+gartenplan-saar.de, 1
 gartenplanung-brendes.de, 1
 garwoh.de, 1
 gary.gov, 1
@@ -37559,12 +39642,13 @@
 gaspard-ulliel.tk, 1
 gasparesganga.com, 1
 gasscc.id, 1
-gassero.com, 1
 gassouthkenticoqa.azurewebsites.net, 1
 gassyukumenkyoguide.com, 1
 gastonvietto.tk, 1
 gastoudererenda.nl, 1
+gastrailer.com, 1
 gastrobox.com.co, 1
+gastrolab.tk, 1
 gastromedicalcenter.com.br, 1
 gastronom.ga, 1
 gastrotiger.at, 1
@@ -37574,10 +39658,7 @@
 gate2home.com, 1
 gateaucreation.fr, 1
 gatehub.net, 1
-gatekiller.co.uk, 1
 gatemaster.ga, 1
-gatemotorsmidrand.co.za, 1
-gatemotorssandton.co.za, 1
 gatemoves.com, 1
 gatesstlouis.com, 1
 gatewaybridal.com, 1
@@ -37589,15 +39670,17 @@
 gatilagata.com.br, 1
 gatlink.tk, 1
 gatomix.net, 1
+gattomatto.tk, 1
+gattschan.tk, 1
 gauche.com, 1
 gaudeamus-folklor.cz, 1
 gaudere.co.jp, 1
 gaumenverfuehrer.de, 1
 gauravtiwari.org, 0
-gaussianwaves.com, 1
 gautam-iiith.tk, 1
 gautam-k.tk, 1
 gauthier.dk, 1
+gauthier.tel, 1
 gavanstore.ir, 1
 gavilanz.ddnsfree.com, 1
 gavin.sh, 1
@@ -37626,9 +39709,11 @@
 gaysexpositions.guide, 1
 gaytorrent.ru, 1
 gaytubec.com, 1
+gayubo.com, 1
 gayukai.net, 1
 gayxsite.com, 1
 gazachallenge.org, 1
+gazaryan.tk, 1
 gazellegames.net, 0
 gazete.org, 1
 gazetekarinca.com, 1
@@ -37649,10 +39734,12 @@
 gbs-uk.com, 1
 gbsapri.it, 1
 gbusercontent.com, 1
+gc-hartberg.tk, 1
 gc-mc.de, 1
 gc.de, 1
 gc.gy, 1
 gc.ru.net, 1
+gcb.org.au, 1
 gcbit.dk, 1
 gcfadvisors.com, 1
 gcgeeks.com.au, 1
@@ -37662,6 +39749,7 @@
 gchq.wtf, 1
 gcode.space, 1
 gcoded.de, 1
+gconcept.tk, 1
 gconstruction.org, 1
 gcs-ventures.com, 1
 gcschool.tk, 1
@@ -37671,6 +39759,7 @@
 gda.fr, 1
 gdax.com, 1
 gdb-tutorial.net, 1
+gde-kupyt.ru, 1
 gdesemena.ru, 1
 gdevpenze.ru, 1
 gdhzcgs.com, 1
@@ -37695,6 +39784,7 @@
 gearev.net, 1
 gearfinder.nl, 1
 gearnews.tk, 1
+gearnify.com, 1
 gearset.com, 1
 geartips.club, 1
 gearwise.se, 1
@@ -37748,8 +39838,10 @@
 geeks.one, 0
 geeksforrent.com, 1
 geekshirts.cz, 1
+geeksquadforums.tk, 1
 geekstreet.fr, 1
 geekstuff.tk, 1
+geekstyle.cz, 1
 geektarven.com, 1
 geektechypro.tk, 1
 geektopia.es, 1
@@ -37771,7 +39863,6 @@
 geentsefeesten.be, 1
 geeq.ch, 1
 geerdsen.net, 1
-geertdegraaf.nl, 1
 geertswei.nl, 1
 geestelijkgezondgent.be, 1
 gefeuert.de, 1
@@ -37781,6 +39872,7 @@
 gehas-wein-shop.de, 0
 gehirn.co.jp, 1
 gehirn.jp, 1
+gehirnapis.jp, 1
 gehopft.de, 1
 gehreslaw.com, 1
 gehrke.cloud, 1
@@ -37802,12 +39894,14 @@
 geld-im-blick.de, 1
 geld24.nl, 0
 geldimblick.de, 1
+geldoderleben.tk, 1
 geldteveel.eu, 1
 geleenbeekdal.nl, 1
 geleia-real.com, 1
 geli-graphics.com, 1
 gelijk.cf, 1
 gellis12.com, 1
+gelmostop.tk, 1
 gelog-software.de, 0
 gelonghui.com, 1
 geloofindemocratie.nl, 1
@@ -37823,17 +39917,19 @@
 gemails.eu, 1
 gemax-online.de, 1
 gembet99.com, 1
-gemeentestein.nl, 1
 gemeinde-steinhoering.de, 1
 gemeinderatswahl2020.de, 1
+gemeinfreie-lieder.de, 1
 gemeinsam-ideen-verwirklichen.de, 1
 gemelen.net, 1
 gemforex.pro, 1
 gemforex.top, 1
 gemgroups.in, 1
+gemini.com, 1
 gemmy.cf, 1
 gemonite.com, 1
 gemquery.com, 1
+gemsforeveryone.com, 1
 gemstn.com, 1
 gemwire.uk, 1
 gen53.org, 1
@@ -37867,6 +39963,8 @@
 general-anaesthesia.com, 1
 general-anaesthetics.com, 1
 general-anesthesia.com, 1
+general-insurance.tk, 1
+generalautocheck.com, 1
 generalcustomshop.com.br, 1
 generali-worldwide.com, 1
 generalinsuranceagencies.com.au, 1
@@ -37875,11 +39973,14 @@
 generalservice.eu, 1
 generaly.ga, 1
 generateur-thot.fr, 1
+generateurdesmiley.tk, 1
 generationgoat.com, 1
 generationnext.pl, 0
 generationsweldom.com, 1
 generator.creditcard, 1
 generatorkodowkreskowych.pl, 1
+generatormag.com, 1
+generatormusic.tk, 1
 generic-plavix.ga, 1
 generic-sildenafil-citrate.cf, 1
 generic-tenormin.gq, 1
@@ -37911,7 +40012,7 @@
 genesisgrade.com, 1
 genesismachina.ca, 1
 genesisplay.tk, 1
-genesistrading.com, 1
+genesistrading.com, 0
 genesysmi.com, 1
 genetargetsolutions.com.au, 1
 geneticvisions.com, 1
@@ -37935,9 +40036,11 @@
 geniusmarketing.ro, 1
 geniusteacher.in, 1
 geniuszone.biz, 0
+genjer.com, 1
 genkihub.com, 1
 genkiwork.com, 1
 genlack.com, 1
+genmab.co.jp, 1
 gennaroabete.duckdns.org, 1
 gennerator.com, 1
 genocidediary.org, 1
@@ -37979,11 +40082,15 @@
 gentevenement.be, 1
 gentfietst.be, 1
 gentgezondestad.be, 1
+gentgreenkey.be, 1
 gentianes.ch, 0
+gentinvest.be, 1
 gentklimaatstad.be, 1
+gentlecollies.tk, 1
 gentledance.ch, 1
 gentledance.net, 1
-gentlemens-life.de, 1
+gentledentalcaregroup.co.uk, 1
+gentleentuit.be, 1
 gentlent.biz, 1
 gentlent.blog, 1
 gentlent.co, 1
@@ -38005,6 +40112,7 @@
 gentlichtfestival.be, 1
 gentlichtfestival.com, 1
 gentlivinglab.be, 1
+gentmuziekstad.be, 1
 gentoo-blog.de, 0
 gentooblog.de, 1
 gentse-ondernemersdagen.be, 1
@@ -38015,7 +40123,6 @@
 gentslimopweg.be, 1
 genttegenarmoede.be, 1
 gentverwent.be, 1
-genuinebackup.email, 1
 genunlimited.ga, 1
 genusbag.com, 1
 genzi.win, 1
@@ -38043,6 +40150,7 @@
 geoip.stg.fedoraproject.org, 1
 geojs.io, 1
 geokeys.cf, 1
+geolex.tk, 1
 geologist.tk, 1
 geology-schools.com, 1
 geomac.gov, 1
@@ -38061,9 +40169,11 @@
 georg-ledermann.de, 1
 george-brighton.co.uk, 1
 george-orwell.com, 1
+george.com.tw, 1
 georgebeverlysheamemorial.org, 1
 georgebrighton.co.uk, 1
 georgeclaghorn.com, 1
+georgeclooney.tk, 1
 georgecolgrove.com, 1
 georgedesign.ch, 1
 georgekaraoglanis.tk, 1
@@ -38105,6 +40215,9 @@
 geotech.tk, 1
 geothermalproducts.info, 1
 geourl.me, 1
+geowest.tk, 1
+geowithmaps.com, 1
+gep.ch, 1
 gep.com, 1
 gepe.ch, 1
 gepgroup.gr, 1
@@ -38113,6 +40226,7 @@
 gerald-zojer.com, 1
 geraldoazevedo.com.br, 1
 geraldsonrealty.com, 1
+geraldzavod.ru, 1
 gerardinden.nl, 1
 gerardozamudio.mx, 1
 gerbang-singkolo.ga, 1
@@ -38139,6 +40253,7 @@
 germfr.ee, 1
 germinalekeren.tk, 1
 germistonrubbleremovals.co.za, 1
+germistry.com, 1
 gernert-server.de, 1
 gero.io, 1
 geroiplavska.tk, 1
@@ -38149,7 +40264,6 @@
 ges-bo.de, 1
 gesamenvat.nl, 1
 gesath.com, 1
-geschaeftsideen-ebook.de, 1
 geschenkly.de, 0
 geschichtscheck.de, 1
 geschmacksache.online, 1
@@ -38157,6 +40271,7 @@
 geschwinder.net, 1
 gesditel.es, 1
 geseduc.cl, 1
+gesentorno.tk, 1
 gesevi.com, 1
 gesica.cloud, 1
 gesmav-trier.de, 1
@@ -38195,8 +40310,10 @@
 get.how, 1
 getacrane.co.uk, 1
 getalitools.ru, 1
+getanresources.com, 1
 getanswer.ga, 1
 getapps.review, 1
+getasecondlife.net, 1
 getbestbooks.com, 1
 getbookked.com, 1
 getbooks.co.il, 1
@@ -38216,6 +40333,7 @@
 getdash.io, 1
 getdeclutter.com, 1
 getdinghy.com, 1
+getdishnow.tk, 1
 getdoges.tk, 1
 getdownon.it, 1
 geteduroam.no, 1
@@ -38225,6 +40343,7 @@
 getfirstalert.com, 1
 getfithtx.biz, 1
 getflorence.co.uk, 1
+getfreeelectricity.tk, 1
 getfreeltc.ml, 1
 getgeek.dk, 1
 getgeek.ee, 1
@@ -38248,11 +40367,15 @@
 getintra.org, 1
 getitlive.de, 1
 getitpeople.com, 1
+getjadedlocal.com, 1
 getjms.com, 1
+getjobtoday.net, 1
 getlatka.com, 1
 getlawnbuddy.com, 1
 getlawyered.com.au, 1
 getleanflorida.gov, 1
+getlibrary.com, 1
+getlostforever.com, 1
 getmango.com, 1
 getmarksvoice.com, 1
 getmdl.io, 1
@@ -38261,6 +40384,7 @@
 getmonero.cz, 1
 getmovil.com, 1
 getnetset.com, 1
+getnew.tk, 1
 getnib.com, 1
 getnikola.com, 1
 getonyx.com, 1
@@ -38292,6 +40416,7 @@
 getsus.com, 1
 getswadeshi.com, 1
 getteamninja.com, 1
+gettext.tk, 1
 getthefriendsyouwant.com, 1
 getthegoat.com, 1
 getticker.com, 1
@@ -38355,11 +40480,13 @@
 gfronline.tk, 1
 gfw.ro, 1
 gfxbench.com, 1
+gfxload.com, 1
 gfxworld.tk, 1
 gg.ax, 1
 gg30019.com, 1
 gg5197.co, 1
 gg6729.co, 1
+gg6729.com, 1
 gg6957.co, 1
 gg9297.co, 1
 gg9397.com, 1
@@ -38382,7 +40509,6 @@
 ggs-marschallstrasse.de, 1
 ggs.jp, 1
 ggservers.com, 1
-ggsolutions.pl, 0
 ggss.cf, 1
 ggworld.ga, 1
 ggx.us, 1
@@ -38399,14 +40525,17 @@
 ghcpl.in, 1
 ghd.com, 1
 gheestore.in, 1
+ghentcityofmusic.be, 1
 ghentcreativecityofmusic.be, 1
 ghentfilmoffice.be, 1
 ghentholidayland.be, 1
 ghentlichtfestival.be, 1
+ghentlichtfestival.com, 1
 ghentlightfestival.be, 1
 ghentlightfestival.com, 1
 ghentlivinglab.be, 1
 gheorghe-sarcov.ga, 1
+gheorghesarcov.ga, 1
 gheorghesarcov.tk, 1
 ghettonetflix.de, 1
 ghfip.com.au, 1
@@ -38415,11 +40544,13 @@
 ghienlamdep.com, 1
 ghini.com, 1
 ghislainphu.fr, 1
+ghkim.net, 0
 ghobcars.com, 1
 ghobot.ai, 1
 ghobusers.com, 1
 ghostblog.info, 0
 ghostbusters.tk, 1
+ghostbustersuk.tk, 1
 ghostcir.com, 1
 ghostdog.ga, 1
 ghostdragon.tk, 1
@@ -38427,18 +40558,20 @@
 ghostnight.ga, 1
 ghostpin.ga, 1
 ghostruler.com, 1
+ghosts-to-you.tk, 1
 ghostsquad.tk, 1
-ghostsupreme.eu, 1
 ghostutils.tk, 1
 ghostwritershigh.com, 1
 ghou.me, 1
 ghowell.io, 1
 ghuntley.com, 0
+ghwconline.org, 1
 ghyvelde.fr, 1
 giac.net, 1
 giac.org, 1
 giacchettaauto.it, 1
 giacomopelagatti.it, 1
+giacomorosaldi.com, 1
 giakki.eu, 0
 giaminh.com, 0
 giancarlomarino.com, 1
@@ -38460,14 +40593,15 @@
 giardinoperfetto.com, 1
 giaydantuonghanhphuc.com, 1
 gibberfish.org, 1
+gibbon.tk, 1
 gibraltarwi.gov, 1
 gibranhernandez.tk, 1
 gibreel.tk, 1
-gibsondunn.com, 1
 gichigamigames.com, 1
 gidapgs.cf, 1
 giddyaunt.net, 1
 gidea.nu, 0
+gideonbot.com, 1
 gidive.com, 1
 gidroponica.ml, 1
 giebel.it, 1
@@ -38484,13 +40618,16 @@
 giftedconsortium.com, 1
 giftedhealthcare.com, 1
 giftedmodels.com, 1
+giftex.cz, 1
 giftlist.guru, 1
+giftnix.com, 1
 giftofsquare.net, 1
 giftofsquare.org, 1
 gifts.best, 1
 gifts365.co.uk, 1
 giftsera.in, 1
 giftsforaspecialoccasion.com, 1
+giftsholidays.tk, 1
 giftsn.com.sg, 1
 giftsofsquare.com, 1
 giftsofsquare.net, 1
@@ -38501,6 +40638,7 @@
 gifzilla.net, 0
 gig-raiffeisen.de, 1
 gig.ru, 0
+gig40.com, 1
 giga.is, 1
 giga.nl, 1
 gigabitz.pw, 1
@@ -38509,6 +40647,7 @@
 giganet.tk, 1
 gigantism.com, 1
 gigasoft.tk, 1
+gigatags.tk, 1
 gigatop.ga, 1
 gigawa.lt, 1
 gigawattz.com, 1
@@ -38530,6 +40669,7 @@
 gilescountytn.gov, 1
 gilgaz.com, 0
 giliamor.com, 1
+gilion.tk, 1
 gilium.com, 1
 gillesmorelle.com, 0
 gillettechampions.it, 1
@@ -38540,6 +40680,7 @@
 gilme.net, 1
 gilmourluna.com, 1
 gilnet.be, 0
+gilpincountydronepilot.com, 1
 gilsum-nh.gov, 1
 gim-app.tk, 1
 gimbal.ca, 1
@@ -38547,15 +40688,18 @@
 gimnazija-skofjaloka.si, 1
 gimnazijapg.me, 1
 gimnazjum-miloslaw.tk, 1
+gimpware.tk, 1
 gina-architektur.design, 1
 ginabaum.com, 1
 ginasiovirtual.com, 1
 ginen.xyz, 1
 ginionusedcars.be, 0
 ginitaly.it, 1
+ginn.press, 1
 ginnegappen.nl, 1
 ginniemae.gov, 1
 gino-gelati.de, 1
+gintonic.tk, 1
 ginza-viola.com, 1
 ginzadelunch.jp, 1
 ginzaj.com, 1
@@ -38567,6 +40711,7 @@
 giovannarossi.tk, 1
 giovannibattistadagnino.eu, 1
 giovannisantini.tk, 1
+giovinco.tk, 1
 gip-carif-idf.net, 1
 gip-carif-idf.org, 1
 gipelpsb.fr, 1
@@ -38606,11 +40751,12 @@
 gisher.video, 1
 gishiko.net, 1
 gisma.tk, 1
+gistportal.com, 1
 gistr.io, 1
 git-stuff.tk, 1
 git.ac.cn, 1
 git.co, 1
-git.market, 0
+git.market, 1
 git.org.il, 0
 git.sb, 1
 git.tt, 1
@@ -38638,6 +40784,8 @@
 gittigidiyor.com, 1
 gittr.ch, 1
 giuem.com, 1
+giuliabonati.com, 1
+giuliawylde.com, 1
 giulliamodas.com.br, 1
 giunchi.net, 1
 giuseppemacario.men, 1
@@ -38652,6 +40800,7 @@
 giveattheoffice.org, 0
 giveme.online, 1
 givemeaverse.com, 1
+givemebeer.tk, 1
 givemeyour.cc, 1
 givemylife.cf, 1
 givemylife.ga, 1
@@ -38673,6 +40822,7 @@
 gixtools.com, 1
 gixtools.net, 1
 gixtools.uk, 1
+giyav.org.tr, 1
 gizitalk.com, 1
 gizmo.ovh, 1
 gizmocrazed.com, 1
@@ -38694,6 +40844,7 @@
 gkmusicindia.tk, 1
 gkoenig-innenausbau.de, 1
 gkralik.eu, 1
+gksokol.com, 1
 gkstyle.net, 1
 gku-winterling.de, 1
 gkv-gorinchem.nl, 1
@@ -38702,10 +40853,12 @@
 glabiatoren-kst.de, 1
 glaciernursery.com, 1
 gladdy.co.uk, 1
+gladdy.uk, 1
 gladdymedia.co.uk, 1
 gladdymedia.com, 1
 gladdymedia.uk, 1
 gladiac.duckdns.org, 1
+gladiators-clan.tk, 1
 gladiatorshop.nl, 1
 gladiium.store, 1
 gladwellentertainments.co.uk, 1
@@ -38732,6 +40885,7 @@
 glasner.photo, 1
 glaspe.com, 1
 glass.google.com, 1
+glassact.com, 1
 glasschmuck-millefiori.de, 1
 glassemployees.com, 1
 glassexpertswa.com, 1
@@ -38740,13 +40894,17 @@
 glassofgrape.com, 1
 glassrainbowtrust.org.je, 1
 glassrom.pw, 1
+glasstechnics.be, 1
 glassweb.com.mx, 1
+glaswolsite.tk, 1
+glavfundament.ru, 1
 glavsudexpertiza.ru, 1
 glazedmag.fr, 1
 glazkova.ga, 1
 glcastlekings.co.uk, 1
 gld.re, 1
 gle, 1
+gleam.tk, 1
 gleanview.com, 1
 glebov.tk, 1
 gleich-aluminium-shop.de, 1
@@ -38762,6 +40920,7 @@
 glenwhitememorial.com, 1
 glevolution.com, 1
 glexia.com, 1
+glgclan.tk, 1
 gliagrumi.it, 1
 glickman-consulting.com, 1
 glidestep.com, 1
@@ -38785,6 +40944,7 @@
 gloalerts.com, 1
 global-adult-webcams.com, 1
 global-business-solutions.cf, 1
+global-electronic-music.tk, 1
 global-monitoring.com, 1
 global-office.com, 0
 global-qanoon.gq, 1
@@ -38794,10 +40954,10 @@
 global1.gg, 1
 globalaccountservice.com, 1
 globalautomation.com.co, 1
-globalbix.com, 1
 globalbridge-japan.com, 1
 globalbusinessnews.tk, 1
 globalbusinessrisk.com, 1
+globalcancer.tk, 1
 globalcanineregistry.com, 1
 globalcomix.com, 1
 globalconsulting.ml, 1
@@ -38805,6 +40965,7 @@
 globalenergyinterconnection.com, 1
 globalentertainment.ga, 1
 globalepsilon.com, 1
+globalexcelsummit.com, 1
 globalformat.de, 1
 globalfuture.eu, 1
 globalgivingtime.com, 1
@@ -38815,6 +40976,7 @@
 globalhealthstrategiesnetwork.net, 1
 globalhealthstrategiesnetwork.org, 1
 globalhorses.de, 1
+globalhubb.ro, 1
 globalinvestigations.co.uk, 1
 globalipaction.ch, 1
 globalisierung-fakten.de, 1
@@ -38828,7 +40990,8 @@
 globalnewssystems.tk, 1
 globalno.me, 1
 globalnomadvintage.com, 1
-globalonetechnology.com, 1
+globalobuv.tk, 1
+globalopsgame.tk, 1
 globalpandemictools.com, 1
 globalperspectivescanada.com, 1
 globalpolarbear.com, 1
@@ -38845,10 +41008,12 @@
 globalventil.com, 0
 globalvisions-events.ch, 1
 globalvisions-events.com, 1
+globalvoice.ga, 1
 globalwarmingis.science, 1
 globalwidemedia.com, 1
 globalwitness.org, 0
 globalzone.tk, 1
+globe-brasil.tk, 1
 globeinform.com, 0
 globelink-group.com, 1
 globemusic.es, 1
@@ -38884,7 +41049,6 @@
 glow8000.jp, 1
 glowfic.com, 1
 glowstone.net, 1
-glpepper.com, 1
 glpreparation.com, 1
 glueck-im-norden.de, 1
 gluecksgriff-taschen.de, 1
@@ -38893,6 +41057,7 @@
 gluedtomusic.com, 1
 gluhov-ss.ru, 1
 gluit.de, 1
+glutenfreeandtasty.com, 1
 glutenfreehomemaker.com, 1
 glutenfreelife.co.nz, 1
 glutenfreeonashoestring.com, 1
@@ -38919,18 +41084,20 @@
 gmcbm.net, 1
 gmccar.it, 1
 gmcd.co, 1
+gmcpe.com, 1
 gmdu.net, 1
 gme.one, 1
-gmeet.at, 1
 gmeet.io, 1
 gmenhq.com, 1
 gmgard.com, 1
 gmind.ovh, 1
+gml4d2.ml, 1
 gmod.de, 1
 gmpark.dk, 1
 gmpartsdb.com, 1
 gmslparking.co.uk, 1
 gmsociety.tk, 1
+gmsurveyingms.com, 1
 gmta.nl, 1
 gmtplus.co.za, 1
 gmuh.fr, 1
@@ -38949,6 +41116,7 @@
 gnaucke.com, 1
 gnax.jp, 0
 gncsuplementos.com.br, 1
+gndmillwork.com, 1
 gnetion.com, 1
 gnetwork.eu, 1
 gnezdo.tk, 1
@@ -38961,6 +41129,7 @@
 gnom.me, 1
 gnomania.ml, 1
 gnous.eu, 1
+gnrinfo.tk, 1
 gntfy.us, 1
 gnu.style, 1
 gnuand.me, 1
@@ -38976,6 +41145,7 @@
 go-datasecurity.de, 1
 go-embedded.de, 1
 go-girlonly.shop, 1
+go-go.link, 1
 go-kuwait.tk, 1
 go-life.com.tw, 1
 go-mail.me, 1
@@ -38989,6 +41159,7 @@
 go2archive.nl, 1
 go2people-websites.nl, 1
 go2ubl.nl, 1
+go350.com, 1
 go4golfreizen.nl, 1
 go6.si, 1
 go6lab.si, 0
@@ -39021,16 +41192,19 @@
 goclix.ml, 1
 gocphongthuy.net, 1
 god-clan.hu, 1
+god-esb.com, 1
 godalivetpalandet.tk, 1
 godall.tk, 1
 godan.tech, 1
 godating.tk, 1
 godattributes.com, 1
 godaxen.tv, 1
+godbo9.cc, 1
 godbo9.com, 0
 godclan.hu, 1
 goddard.id.au, 1
 goddg.com, 1
+godesb.com, 1
 godesigner.ru, 1
 godfilm.tk, 1
 godles.pl, 1
@@ -39057,7 +41231,6 @@
 goerdeler-alumni-club.de, 1
 goerres2014.de, 1
 goetemp.de, 1
-goetheschule-giessen.de, 1
 goetic.space, 1
 goettinger-biergarten.de, 1
 goettinger-katzenschutz.de, 1
@@ -39083,13 +41256,15 @@
 gogs.ca, 1
 gogsat.com, 1
 gohanrecords.tk, 1
+gohelixit.com, 1
 gohon.org, 1
+going-dutch.tk, 1
 goingawesomeplaces.com, 1
 goingreen.com.au, 1
 goiymua.com, 1
 goizalde.tk, 1
 gokazakhstan.com, 1
-gokhana.com, 1
+gokhana.com, 0
 gokhankesici.com, 1
 gokmenguresci.com, 1
 goktoday.com, 1
@@ -39114,6 +41289,7 @@
 goldcoaststumpbusters.com, 1
 goldcreek.tk, 1
 golden-kamuy.com, 1
+golden-sea.tk, 1
 golden-squad.com, 0
 goldenage.tk, 1
 goldenagefoundation.tk, 1
@@ -39138,6 +41314,8 @@
 goldenwolrd.tk, 1
 goldenworldec.com, 1
 goldenyacca.co.uk, 1
+goldenyacca.net, 1
+goldenyacca.org, 1
 goldfelt.com, 1
 goldfingermusic.tk, 1
 goldfm1031.tk, 1
@@ -39147,10 +41325,10 @@
 goldnbraces.com, 1
 goldnull.com, 1
 goldpreisfinder.at, 1
-goldships.com, 1
 goldsilver.org.ua, 1
 goldskysecurity.com, 1
 goldstandardtrust.tk, 1
+goldstein.rs, 1
 goldstein.tel, 1
 goldsteingloves.com, 1
 goldwater.gov, 1
@@ -39162,6 +41340,7 @@
 golearn.gov, 1
 golestanehali.com, 1
 golestanehali.ir, 1
+golf-supplies.tk, 1
 golf18staging.com, 1
 golfburn.com, 1
 golfhausmallorca.com, 1
@@ -39170,6 +41349,7 @@
 golfscape.com, 1
 golighthouse.com, 1
 golik.net.pl, 0
+golink.co, 1
 goloaninsurance.tk, 1
 golosok.ml, 1
 golosovanye4you.tk, 1
@@ -39201,6 +41381,8 @@
 gondawa.com, 1
 gondelvaartdwarsgracht.nl, 1
 gondon.tk, 1
+gonebald.tk, 1
+gonenli.com, 1
 gonepal.com, 1
 gongjianwei.com, 1
 gongjuhao.com, 1
@@ -39221,16 +41403,18 @@
 goodenglish.ga, 1
 goodfeels.net, 1
 goodgame.lt, 1
-goodhealthgateway.com, 1
+goodgaminggear.com, 1
 goodhealthtv.com, 1
 goodhotel.co, 1
 goodiesnet.ca, 0
 goodiesoft.hu, 1
+goodkitchendesign.com, 1
 goodleads.co.za, 1
 goodlink.ml, 1
 goodmood.co.uk, 1
 goodmood.fr, 1
 goodmoodsocken.de, 1
+goodmorningapril.com, 1
 goodontop.com, 1
 goodopportunity.ga, 1
 goodpeople.tk, 1
@@ -39239,7 +41423,7 @@
 goodsex4all.com.br, 1
 goodshepherdmv.com, 1
 goodsite.ga, 1
-goodsleep.pet, 1
+goodsync.com, 1
 goodth.ink, 1
 goodtrip.kr, 1
 goodvibesblog.com, 1
@@ -39249,6 +41433,7 @@
 google, 1
 google-analytics.com, 1
 google.ax, 1
+googleadvies.nl, 1
 googleandroid.cz, 1
 googlehits.com, 1
 googlemail.com, 0
@@ -39278,7 +41463,8 @@
 gopass-dev.com, 1
 gopass.health, 1
 gopayz.com.my, 1
-gopher.tk, 0
+gopet.shop, 1
+gopher.tk, 1
 gophoto.it, 1
 gopkg.link, 1
 gopnikman.cf, 1
@@ -39287,19 +41473,19 @@
 goproallaccess.com, 1
 gopronow.ga, 1
 gopuntaisla.com, 1
-gopuramcinemas.com, 1
 gopwhip.gov, 1
 goquiq.com, 1
 goquiqstatus.com, 1
 gorakhpurclassifieds.tk, 1
 goranrango.ch, 1
+gorbatschow.tk, 1
 gorby.tk, 1
 gordas.cf, 1
 gordeijnsbouw.nl, 1
 gordion.tk, 1
 gordon-reid.com, 1
 gordonbeeming.xyz, 1
-gordonscouts.com.au, 1
+gordonhamilton.com, 1
 gordvorets.tk, 1
 gordyf.com, 1
 gorealya.com, 1
@@ -39318,6 +41504,7 @@
 gorod74.ru, 0
 gorodabakan.cf, 1
 gorodabakan.ga, 1
+gorodabakan.gq, 1
 gorodabakan.ml, 1
 gorodabakan.tk, 1
 gorodivanovo.tk, 1
@@ -39329,19 +41516,23 @@
 goroskop-sovmestimosti-znakov.tk, 1
 goroskop-sovmestimosti.ml, 1
 goroskop.gq, 1
+goroskopnew.tk, 1
 gorpg.club, 1
 gorschenin.com, 1
 gorstom.ml, 1
 gosaavd.tk, 1
 gosarh.tk, 1
+gosarhiv.tk, 1
 goshawkdb.io, 1
 goshin-group.co.jp, 1
 goshow.tv, 1
+gosia-banaszkiewicz.com, 1
 gosiberia.ru, 1
 goskills.com, 1
 gosnipe.com, 1
 gosolockpicks.com, 1
 gospelites.com, 1
+gospellifewc.com, 1
 gospelstreamingsermons.com, 1
 gospelvestcination.de, 1
 gospicers.ca, 1
@@ -39363,8 +41554,11 @@
 gotgeeks.nl, 1
 gotgenes.com, 0
 gothic.dating, 1
+gothiclandscape.com, 1
+gothicmarketing.tk, 1
 gothicsite.tk, 1
 gotirupati.com, 0
+gotit.com.tw, 1
 goto.google.com, 1
 goto.msk.ru, 1
 goto.rip, 1
@@ -39443,7 +41637,10 @@
 goweraesthetics.co.uk, 1
 gowervets.co.uk, 1
 gowildrodeo.co.uk, 1
+gowin9.com, 1
+gowin9.net, 1
 gowithflo.de, 1
+gozadera.es, 1
 gpalabs.com, 1
 gpastore.com.br, 1
 gpbdev.ru, 1
@@ -39452,14 +41649,12 @@
 gpcs.ml, 1
 gpcsolutions.fr, 1
 gpdp.it, 1
-gpereira.tk, 1
 gpfclan.de, 1
 gpfitness.com.br, 1
 gpga.cf, 1
 gpgscoins.com, 1
 gpio.gq, 1
 gpl25.ml, 1
-gplah.com, 1
 gplans.us, 1
 gplclubbd.com, 1
 gplintegratedit.com, 1
@@ -39477,7 +41672,8 @@
 gpscamera.nl, 0
 gpsfix.cz, 1
 gpsmith.tech, 1
-gpsolarpanels.com, 1
+gpsnavigator.tk, 1
+gpsolarpanels.com, 0
 gpspolis.nl, 1
 gpsvideocanada.com, 1
 gpswebsoft.ml, 1
@@ -39490,6 +41686,7 @@
 gqyyy.cc, 1
 gr.search.yahoo.com, 0
 gr8engineer2b.com, 1
+gr8ness.com, 1
 gra2.com, 1
 graandco.com, 0
 graasp.net, 0
@@ -39506,6 +41703,7 @@
 graceful-project.eu, 1
 gracegensets.com, 1
 graceikahu.com, 1
+graceq.com, 1
 gracethrufaith.com, 1
 gracetini.com, 1
 gracia-club.tk, 1
@@ -39517,6 +41715,7 @@
 gradenotify.com, 1
 gradienthosting.co.uk, 1
 gradients.com, 1
+gradinacufluturi.ro, 1
 gradingcontractornc.com, 1
 gradle.com, 1
 gradle.org, 1
@@ -39529,10 +41728,10 @@
 graf-igor.ch, 1
 graf.re, 1
 grafcaps.com, 1
-grafe.com, 1
 grafenberg.tk, 1
 graffen.dk, 1
 graffitinetwerk.nl, 1
+graffitiwall.tk, 1
 grafia.ink, 1
 graficasantana.com.br, 1
 grafik.gq, 1
@@ -39542,10 +41741,12 @@
 grafmag.pl, 1
 grafmurr.de, 1
 grafologia.tk, 1
+grafos.ml, 1
 grafoteka.pl, 1
 grafoterapia.tk, 1
 graft.community, 1
 graft.spb.ru, 1
+graftonglobe.tk, 1
 graftworld.pw, 1
 grahamarthur.com, 1
 grahambaker.ca, 1
@@ -39555,10 +41756,14 @@
 grahamsgifts.com, 1
 grahamsmith.tech, 1
 grailify.com, 1
+grain-feature-branch.co, 1
+grain-staging.co, 1
+grain.co, 1
 graingert.co.uk, 1
 gralhaazulcondominio.com.br, 1
 graliv.net, 0
 grallersdegegants.tk, 1
+gram.tips, 0
 gramati.com.br, 1
 grammar.co.id, 1
 grammarhouse.co.za, 1
@@ -39568,6 +41773,7 @@
 grancellconsulting.com, 1
 grancordobahoy.com.ar, 1
 grand-books.cf, 1
+grand-house.gq, 1
 grand-knighki.gq, 1
 grand-sity.ru, 1
 grandcafeatpark.nl, 1
@@ -39578,6 +41784,7 @@
 grandcapital.net, 1
 grandcapital.ru, 1
 grandchene.ch, 0
+grandcountydronepilot.com, 1
 grande.coffee, 1
 grandepresion.com, 1
 grandesign.pt, 1
@@ -39586,6 +41793,7 @@
 grandisco.tk, 1
 grandmasfridge.org, 0
 grandmusiccentral.com.au, 1
+grandpad.net, 1
 grandpadusercontent.com, 1
 grandstarcourier.ml, 1
 grandviewheights.gov, 1
@@ -39606,11 +41814,11 @@
 grantmorrison.net, 1
 grantpark.org, 1
 grantsmasters.com, 1
+grantsolutions.gov, 1
 graonatural.com.br, 1
 grapee.jp, 1
 grapeintentions.com, 1
 grapevine.is, 1
-graph.games, 1
 graph.org, 1
 graphcommons.com, 1
 graphe.gq, 1
@@ -39629,6 +41837,7 @@
 grapholio.net, 1
 graphotism.com, 1
 graphpaper.studio, 1
+graphviewer.tk, 1
 grappes.co, 1
 grappy.net, 1
 grasboom35plus.nl, 1
@@ -39637,6 +41846,7 @@
 grasboombunschoten.nl, 1
 grasboomclophaemer.nl, 1
 grasboomderoos.nl, 1
+grasboomharmelen.nl, 1
 grasboomleusden.nl, 1
 grasboommax.nl, 1
 grasboommeerbalans.nl, 1
@@ -39656,19 +41866,24 @@
 gratis-hosting.cf, 1
 gratis.market, 1
 gratisgamecards.nl, 1
+gratishandy.tk, 1
 gratisonlinespel.tk, 1
+gratisparati.tk, 1
 gratisrollenspieltag.de, 1
 gratitudeabundancepassion.com, 1
 grattan.co.uk, 1
 gratuitweb.tk, 1
 graumeier.de, 1
+gravedigger.tk, 1
 gravelshooters.com, 1
+gravelshooters.net, 1
+gravelshooters.org, 1
 gravensteengent.be, 1
 gravescountyky.gov, 1
 gravilink.com, 1
+gravirovshik.ru, 1
 gravitascreative.net, 1
 gravitlauncher.ml, 1
-gravito.nl, 1
 gravity-inc.net, 1
 gravityformspdfextended.com, 1
 gravitypdf.com, 1
@@ -39692,6 +41907,7 @@
 great.nagoya, 1
 greatagain.gov, 1
 greataltrock.tk, 1
+greatepier.tk, 1
 greatergood.com, 0
 greaterreadingyp.org, 1
 greaterswissmountaindogs.com, 1
@@ -39703,14 +41919,15 @@
 greatislandarts.ca, 1
 greatlifeinsurancegroup.com, 1
 greatlms.com, 1
+greatmazes.tk, 1
 greatnetsolutions.com, 1
+greatpages.com.br, 1
 greatplainsaustralia.com.au, 1
 greatrenumbering.tk, 1
 greatscholars.tk, 1
 greatscott.media, 1
 greatsoftwares.com.br, 1
 greatwebdesign.uk, 1
-greavessports.com, 1
 greciahora.com, 1
 greditsoft.com, 1
 greek.dating, 1
@@ -39769,6 +41986,7 @@
 greenliv.pl, 1
 greenlungs.net, 1
 greenoutdoor.dk, 0
+greenpal.jp, 1
 greenpanda.de, 1
 greenpark.uz, 1
 greenpartyofnewmilford.org, 1
@@ -39776,6 +41994,7 @@
 greenpeace.berlin, 1
 greenponik.com, 1
 greenroach.ru, 1
+greenroom.tk, 1
 greenrushdaily.com, 1
 greensad36.ru, 1
 greensborosecuritycameras.com, 1
@@ -39787,11 +42006,15 @@
 greenstreethammers.com, 1
 greentea.ml, 1
 greenteamtwente.nl, 1
+greenturtledev.net, 1
+greenway-moskva.ru, 1
 greenway-moving.com, 1
 greenwaylog.net, 1
 greenwiki.ca, 1
 greenwithdecor.com, 1
+greenyflowers.co.uk, 1
 greenytimes.com, 1
+greenyway.com, 1
 greenzved.tk, 1
 greer.ru, 1
 greg.red, 1
@@ -39800,6 +42023,7 @@
 gregbrimble.com, 1
 greger.me, 1
 greggsfoundation.org.uk, 1
+greghouse.tk, 1
 gregmartyn.com, 1
 gregmarziomedia.com, 1
 gregmc.ru, 1
@@ -39849,12 +42073,14 @@
 greyhash.se, 1
 greymattertechs.com, 1
 greyrectangle.com, 1
-greysky.me, 1
 greyskymedia.com, 1
 greysolutions.it, 1
+greystonesmovement.com, 1
 greystonesscouts.tk, 1
+greywalker.tk, 1
 greywolf.cz, 1
 grh.am, 1
+grhhosting.com, 1
 griassdi-reseller.de, 1
 gricargo.com, 1
 grickle.org, 1
@@ -39880,6 +42106,7 @@
 griesser2.de, 1
 griffinli.com, 0
 griffinsrfc.tk, 1
+griffioenconsulting.com, 1
 grifomarchetti.com, 1
 grigorev.tk, 1
 grijpskerk500.tk, 1
@@ -39890,12 +42117,14 @@
 grimcalc.com, 1
 grimm-gastrobedarf.de, 1
 grimm.cz, 1
+grimmhome.com, 1
 grimms-schuhe.de, 1
 grimstveit.no, 1
 grinday.tk, 1
 grindgore.tk, 1
 grinnellplanes.com, 1
 grinnellplans.com, 1
+grinpis.tk, 1
 gripcoat.jp, 1
 gripeh1n1.com, 1
 gripencrossfit.gq, 1
@@ -39903,6 +42132,7 @@
 gripwenab.cf, 1
 grishavirus.cf, 1
 gritte.ch, 1
+grittherapeutic.com, 1
 griyo.online, 1
 grizz.gdn, 1
 grizzlead.com, 1
@@ -39911,10 +42141,12 @@
 groben-itsolutions.de, 1
 grocock.me.uk, 1
 groenaquasolutions.nl, 1
+groenemoskeeen.nl, 1
 groentebesteld.nl, 1
 groenteclub.nl, 0
 groentefruitzeep.com, 1
 groentefruitzeep.nl, 1
+groep20.nl, 1
 groepjam-usedcars.be, 0
 grog.pw, 1
 grokandtonic.com, 1
@@ -39924,13 +42156,14 @@
 gromovphotography.tk, 1
 gronau-it-cloud-computing.de, 1
 grondius.com, 1
+groningerkustvaart.tk, 1
 groomershop.ru, 0
 groomlake.tk, 1
 groomscroft.co.uk, 1
 groomscroft.com, 1
 grootinadvies.nl, 1
+groots.com, 1
 groots.ngo, 1
-groovefetish.com, 1
 groover.com.br, 1
 groovydisk.com, 1
 groovygoldfish.org, 1
@@ -39939,6 +42172,7 @@
 grossberger-ge.org, 0
 grossell.ru, 1
 grosser.io, 1
+grossiste-marcassite.com, 1
 grossmisconduct.news, 1
 groszek.pl, 1
 grotesk.tk, 1
@@ -39973,11 +42207,13 @@
 groupx.tk, 1
 grove-archiv.de, 1
 grovecity.ml, 1
+grovesales.co.uk, 1
 growebmarketing.com, 1
 growik.com, 1
 growingallthings.co.uk, 1
 growinghumankindness.com, 1
 growingmetrics.com, 1
+growingsearch.com, 1
 growingsmiles.co.uk, 1
 growme.gq, 1
 growth-rocket.com, 1
@@ -40020,6 +42256,7 @@
 grundskoleboken.tk, 1
 grundycountyiowa.gov, 1
 grunex.com, 0
+grunlab.net, 1
 grunwaldzki.center, 1
 grunwasser.com, 1
 grunwasser.fr, 1
@@ -40031,6 +42268,8 @@
 grupoauxteclic.com, 1
 grupocata.com, 1
 grupodatco.com, 1
+grupodepasajeros.tk, 1
+grupoellatu.tk, 1
 grupoenelcolombia.com, 1
 grupogabinet.es, 1
 grupoharbour.com, 1
@@ -40039,9 +42278,11 @@
 grupoparco.com, 1
 grupoproabienesraices.com.mx, 1
 grupos.cf, 1
+gruposanjose.tk, 1
 gruposiit.com.mx, 1
-grupotbs.com, 1
 gruppa.ml, 1
+gruppakolibri.ml, 1
+grurez.com, 1
 gruslic.org.mx, 1
 gruveo.com, 1
 gruver.de, 1
@@ -40076,6 +42317,7 @@
 gsiw.gent, 1
 gslabnet.org, 1
 gslink.me, 1
+gsm-info.tk, 1
 gsmbrick.com, 1
 gsmkungen.com, 1
 gsmnext.com, 1
@@ -40100,6 +42342,7 @@
 gtcprojects.com, 1
 gtd.cloud, 1
 gtdgo.com, 0
+gtestepourvous.fr, 1
 gti.cx, 1
 gtlaun.ch, 1
 gtlfsonlinepay.com, 1
@@ -40109,10 +42352,11 @@
 gtnh.ru, 1
 gtoepfer.de, 1
 gtonline.ml, 1
-gtopala.com, 1
 gtopala.net, 1
 gtour.info, 0
 gtravers-basketmaker.co.uk, 1
+gtrwebdesign.nl, 1
+gtsoftware.gr, 1
 gtupgrade.eu, 1
 gtxbbs.com, 1
 gtxmail.de, 1
@@ -40121,16 +42365,21 @@
 guadaluperoses.co, 1
 guajars.cl, 1
 guangdong30019.com, 1
-guanggaonet.com, 1
+guangjiangk.com, 1
 guanyu.ml, 1
 guanzhong.ca, 1
+guaranteedfitdanceshoes.com, 1
+guaranteedfittangoshoes.com, 1
 guaranteedservice.company, 1
+guardando.tk, 1
 guardedbox.com, 1
 guardedbox.es, 1
+guarderiajackson.tk, 1
 guardian-codex.tk, 1
 guardian360.nl, 1
 guardianportal.us, 1
 guardiansoftheearth.org, 1
+guardiapretoriana.tk, 1
 guarrato.tk, 1
 guategmala.ga, 1
 guayaquil-consort.tk, 1
@@ -40155,10 +42404,12 @@
 guernica1913.tk, 1
 guernseycounty.gov, 1
 guerra24.net, 1
+guerrasgalacticas.tk, 1
 guerrillaradio.tk, 1
 guessmatch.com, 1
 guestby.tk, 1
 guesthouse-namaste.com, 1
+guesthouse.tk, 1
 guestnetscript.tk, 1
 guestofhonor.tk, 1
 guevener.de, 1
@@ -40179,6 +42430,7 @@
 guiaextra.com, 1
 guiaminhasaude.net, 1
 guiascliente.com, 1
+guiasdemexico.tk, 1
 guiasescapate.tk, 1
 guiaswow.com, 1
 guiaturismovallarta.com, 1
@@ -40202,7 +42454,6 @@
 guidethailande.tk, 1
 guidetoiceland.is, 1
 guidopedia.ga, 1
-guilde-dissection.com, 1
 guildgearscore.cf, 0
 guillaume-briand.fr, 1
 guillaumecote.me, 1
@@ -40215,9 +42466,12 @@
 guim.co.uk, 1
 guineapig101.com, 1
 guineapigmustach.es, 1
+guinguetteclovis.com, 1
 guitar-strings-online.tk, 1
 guitarangel.tk, 1
+guitards.tk, 1
 guitarfreak.tk, 1
+guitarraclasica.tk, 1
 guitarreria.tk, 1
 guitarristaluisquintero.com, 1
 guitarvolume.com, 1
@@ -40230,10 +42484,12 @@
 gulfcoastwaterauthoritytx.gov, 1
 gulfstream.ru, 1
 gulfvestors.com, 1
+gulfwings.com, 1
 gulleyperformancecenter.com, 1
 gulliwer.tk, 1
 gulshankumar.net, 1
 gulsot.tk, 1
+gumbles.tk, 1
 gumbo-millennium.nl, 1
 gumbo.gq, 1
 gumbo.nu, 1
@@ -40258,15 +42514,16 @@
 gunwatch.co.uk, 1
 gunworld.com.au, 1
 gunz.net, 1
+gunzreplays.com, 1
 guochang.fun, 1
 guochang.xyz, 1
 guogetv.com, 1
 guohuageng.com, 1
 guoke.com, 1
+guolaoban.xyz, 1
 guolaw.ca, 1
 guoliang.me, 1
 guoliangwu.com, 1
-guozeyu.com, 1
 gupfen.ch, 1
 gurkenberry.ddns.net, 0
 gurleyal.gov, 1
@@ -40288,6 +42545,7 @@
 guso.gq, 1
 gustaff.de, 1
 gustarfsberg.tk, 1
+gustavapp.com, 1
 gustavo-lima.ml, 1
 gustavovelasco.ml, 1
 gustavscelmins.tk, 1
@@ -40340,6 +42598,7 @@
 gvitiming.ch, 0
 gvobgyn.ca, 1
 gvoetbaldagenalcides.nl, 1
+gvp.co.in, 1
 gvt2.com, 1
 gvt3.com, 1
 gvwgroup.cloud, 1
@@ -40353,7 +42612,6 @@
 gwerder.net, 1
 gwg-march.ch, 1
 gwhois.org, 1
-gwilken.com, 1
 gwo24.pl, 1
 gworld.cf, 1
 gwrtech.com, 1
@@ -40365,6 +42623,7 @@
 gxlrx.net, 1
 gxm5.com, 1
 gxmyqy.net, 1
+gyannews.ga, 1
 gyas.nl, 1
 gybol.com, 1
 gyefund.com, 1
@@ -40404,7 +42663,9 @@
 gzitech.com, 1
 gzitech.net, 1
 gzitech.org, 1
+gzlivre.org, 1
 gzom.ru, 1
+gzonemu.ga, 1
 h-jo.net, 1
 h-maxton.de, 1
 h-server.myfirewall.org, 1
@@ -40419,6 +42680,7 @@
 h11.moe, 1
 h1ctf.com, 1
 h1z1swap.com, 1
+h2020faros.eu, 1
 h24.org, 1
 h2b.me, 1
 h2cclipboard.com, 1
@@ -40426,7 +42688,6 @@
 h2orto.it, 1
 h2ox.io, 1
 h2rul.eu, 1
-h2ssafety.com, 1
 h2u.tv, 1
 h30019.com, 1
 h30365.com, 1
@@ -40440,6 +42701,7 @@
 h5197.co, 1
 h5q.net, 1
 h6729.co, 1
+h6729.com, 1
 h6852.com, 1
 h6853.com, 1
 h6913.com, 1
@@ -40471,15 +42733,17 @@
 habarovsk.ml, 1
 habbig.cc, 1
 habbixed.tk, 1
+habbolibres.tk, 1
 habboz.com.br, 1
-habbplay.fr, 1
 habbstars.org, 1
 habeo.si, 1
 haberer.me, 1
 habernet.tk, 1
+haberton.com, 1
 haberver.me, 1
 habesha.bet, 1
 habeychlab.com, 1
+habibhidayat.com, 1
 habitable.ga, 1
 habitat-domotique.fr, 1
 habitatetbatiment.fr, 1
@@ -40500,6 +42764,7 @@
 hacettepeteknokent.com.tr, 1
 hachimijiogan.info, 1
 hachre.de, 0
+hacifadilogullari.com.tr, 1
 hack-bang.com, 1
 hack.club, 1
 hack.fi, 1
@@ -40513,8 +42778,12 @@
 hackbarth.guru, 1
 hackbeil.name, 1
 hackbubble.me, 1
+hackclubmauritius.nl, 1
 hackcraft.net, 1
+hackdown.tech, 1
+hackeado.tk, 1
 hacked.com, 1
+hackedaf.com, 1
 hackendoz.com, 1
 hackengine.ga, 1
 hackenkunjeleren.nl, 1
@@ -40529,6 +42798,7 @@
 hacker8.cn, 0
 hackerchai.com, 0
 hackerco.com, 1
+hackercommunity.org, 1
 hackereyes.com, 1
 hackerflare.com, 1
 hackergateway.com, 1
@@ -40547,7 +42817,6 @@
 hackers-networks.tk, 1
 hackerschat.net, 1
 hackerspace.rocks, 1
-hackerstxt.org, 1
 hackersw0rld.tk, 1
 hackerzbug.tk, 1
 hackettrecipes.com, 1
@@ -40562,6 +42831,7 @@
 hackmd.io, 1
 hackmeifyoucan.site, 1
 hackney.tk, 1
+hackops.tk, 1
 hackreone.com, 1
 hacksecu.re, 1
 hacksoc.co.uk, 1
@@ -40576,12 +42846,13 @@
 hackyourfaceoff.com, 1
 hackzogtum-coburg.de, 0
 hadaly.fr, 1
+hadelandgjestegard.no, 1
 haderecker.me, 1
 hadibut.fr, 1
 hadika.tk, 1
-hadleighswimmingclub.co.uk, 1
 hadleyluker.com, 1
 hadouk.in, 1
+hadouken.tk, 1
 hadrons.org, 1
 hady.fr, 1
 hae.sh, 1
@@ -40608,21 +42879,23 @@
 hagueaustralia.com.au, 1
 haha-raku.com, 1
 haha.nl, 1
-haibara.top, 1
+haibara.top, 0
 haiboxu.com, 1
 haidtechnology.com, 1
 haigekassa.ee, 1
+haigle.com, 1
 hails.info, 1
 hailstorm.nl, 1
-haim.bio, 1
 haimablog.ooo, 1
 hainan30019.com, 1
 hainanstar.cc, 1
-haindlmuehle.eu, 1
+haindlmuehle.eu, 0
 haineshilton.com, 1
-hainoni.com, 1
+hainoni.com, 0
+hainstr.de, 1
 hair-care-guide.com, 1
 hair-carekit.tk, 1
+hair-dressing.tk, 1
 hair-extension.tk, 1
 hair-extensions.tk, 1
 hairbrushes.tk, 1
@@ -40636,7 +42909,9 @@
 hairphoto.tk, 1
 hairpins.tk, 1
 hairsalon-wish.com, 1
+hairstyles-salon.tk, 1
 haitaka.cc, 1
+haititransfert.com, 1
 haitou.tk, 1
 haiwaiyingyuan.net, 1
 haixingyun.com, 1
@@ -40667,6 +42942,7 @@
 hakurei.moe, 0
 hal-9th.space, 1
 halacs.hu, 1
+halageorgia.com, 1
 halbbit.eu, 1
 halbich.design, 1
 halcraft.tk, 1
@@ -40693,14 +42969,17 @@
 hallettxn.com, 1
 hallhireforevents.co.uk, 1
 halliday.work, 1
+halligan.tk, 1
 hallighof.de, 1
 halligladen.de, 1
 hallmarkestates.ca, 1
 hallme.com, 1
+hallofoddities.tk, 1
 hallopstyling.com, 1
 hallspumpandwellservice.net, 1
 hallucinogen.com, 1
 hallucinogens.org, 1
+hallways.tk, 1
 halneff.ga, 1
 halo.fr, 1
 halocredit.pl, 1
@@ -40711,7 +42990,9 @@
 halongbaybackpackertour.com, 1
 haloobaloo.com, 1
 halospawns.com, 1
+halotours.rs, 1
 halovanic.org, 1
+halsokost4life.se, 1
 haltegame.com, 1
 haluan.co, 1
 halyul.com, 1
@@ -40722,6 +43003,7 @@
 hamartrophy.cf, 1
 hamburg40grad.de, 1
 hamburgerbesteld.nl, 1
+hamburgerland.tk, 1
 hamburgobgyn.com, 1
 hamcram.io, 1
 hamiltonlinen.com, 1
@@ -40732,15 +43014,20 @@
 hamking.tk, 1
 hamletstudio.tk, 1
 hammamsayad.com, 1
+hammed.tk, 1
 hammer-schnaps.com, 1
 hammer-sms.com, 1
+hammeracademy.co.za, 1
 hammercast.fm, 1
 hammernews.tk, 1
-hammerpondkennels.co.uk, 1
+hammerofdamnation.tk, 1
 hammerstorm.ga, 1
 hamminga.nl, 1
 hampl.tv, 1
 hampshiretechservices.co.uk, 1
+hamsternetwork.com, 1
+hamstersenanos.tk, 1
+hamsterworld.tk, 1
 hamsystems.eu, 1
 hamu.blue, 1
 hana-groupsac.com, 1
@@ -40755,10 +43042,10 @@
 hancockcountyia.gov, 1
 hancockcountyohioelections.gov, 1
 hancocklawfl.com, 1
+hand-made-business.com, 1
 hand2h.com, 1
 handbrake.fr, 1
 handcraft.eu.org, 1
-handgelenkbandage-test.de, 1
 handlecoin.com, 1
 handleidingkwijt.com, 1
 handmade-club.tk, 1
@@ -40767,9 +43054,12 @@
 handmadehechoamano.com, 1
 handmadetutorials.ro, 1
 handmadeweb.org, 1
+handrollschile.cl, 1
 handsaccounting.com, 1
+handstandstudio.ga, 1
 handwerk-digital-steinfurt.de, 1
 handwerkwebseiten.de, 0
+handy-page.tk, 1
 handy.lc, 1
 handyglas.com, 1
 handymanbypolli.com, 1
@@ -40797,11 +43087,13 @@
 hanisirfan.cf, 1
 hanjl.com, 1
 hanjuapp.com, 1
+hanke.se, 1
 hankoreas.com, 1
 hankr.com, 1
 hanksacservice.com, 1
 hanksservice.com, 1
 hannah.link, 1
+hannaljungberg.tk, 1
 hannasecret.de, 1
 hannde.com, 1
 hannehovi.fi, 1
@@ -40840,6 +43132,7 @@
 hanzcollection.online, 1
 hanzubon.jp, 1
 hao-zhang.com, 1
+hao.gay, 1
 haocq3.com, 1
 haogoodair.ca, 1
 haosygt.com, 1
@@ -40858,8 +43151,9 @@
 happy-end-shukatsu.com, 1
 happy-face.tk, 1
 happy-finance.tk, 1
-happy-life-food.de, 1
+happy-herd.com, 1
 happy-space.tk, 1
+happy-wans.com, 1
 happyagain.de, 1
 happyagain.se, 1
 happyandrelaxeddogs.com, 1
@@ -40879,8 +43173,10 @@
 happycore.ml, 1
 happydad.tk, 1
 happydietplan.com, 1
+happydoghosting.net, 1
 happydoq.ch, 0
 happydota.ga, 1
+happydreamsz.com, 1
 happyexwife.ga, 1
 happyfeet-dordrecht.nl, 1
 happyfuture.tk, 1
@@ -40891,7 +43187,6 @@
 happyheartsabode.com, 1
 happyhumans.com, 1
 happyindia.ml, 1
-happykidscastles.co.uk, 1
 happyland.link, 1
 happylearning.com, 1
 happylifestyle.com, 1
@@ -40928,10 +43223,11 @@
 harbor-light.net, 1
 harbourunderwriting.com, 1
 harcourt.site, 1
+hard-drive-recovery-blog.tk, 1
 hard.email, 1
 hardcoen.com, 1
 hardcore-bodybuilding.com, 1
-hardcore-bodybuilding.nl, 1
+hardcore-bodybuilding.nl, 0
 hardcore-hooligans.tk, 1
 hardeman.nu, 1
 hardenize.com, 1
@@ -40950,9 +43246,11 @@
 hardnode.org, 1
 hardrain980.com, 1
 hardrock.tk, 1
+hardtec.tk, 1
 hardtfrieden.de, 1
 hardtime.ru, 1
 hardtime.tk, 1
+hardtimeszine.tk, 1
 hardwareforum.ga, 1
 hardwarelog.in, 1
 hardwarelogin.com, 1
@@ -40962,6 +43260,7 @@
 hardy.bz, 1
 harelmallac.com, 1
 harelmallacglobal.com, 1
+harery.com, 1
 hargaindo.com, 1
 hargamobilmu.com, 1
 hargrovefirm.com, 1
@@ -40988,6 +43287,7 @@
 harms.io, 1
 harmsboone.org, 1
 harnov.dk, 1
+haroldkip.nl, 1
 haroldsharpe.com, 1
 harp.gov, 1
 harpersvilleal.gov, 1
@@ -41008,11 +43308,13 @@
 harrisonswebsites.com, 1
 harry-baker.com, 1
 harryagustiana.tk, 1
+harrychristensen.tk, 1
 harrygerritstransport.nl, 1
 harrymclaren.co.uk, 1
 harrypotterclan.tk, 1
 harrypottereditor.com, 1
 harrypottereditor.net, 1
+harrysdiveshop.com, 1
 harrysmallbones.co.uk, 1
 harrysqnc.co.uk, 1
 harshee.ml, 1
@@ -41023,7 +43325,10 @@
 hartlep.email, 1
 hartlieb.me, 1
 hartmancpa.com, 1
+hartsfieldrock.tk, 1
+hartvannike.tk, 1
 hartzer.com, 1
+haru-restaurant.tk, 1
 haruhi.org.ua, 1
 harukakikuchi.com, 1
 harukawa.moe, 1
@@ -41061,19 +43366,21 @@
 hashiura.jp, 1
 hashplex.com, 1
 hashru.nl, 1
-hashtagpatriot.com, 1
 hashworks.net, 1
 hashxp.org, 1
 hasilkeluaransgp.com, 1
 hasilocke.de, 1
 haskovec.com, 1
 hassan-kuordish.tk, 1
+hassclan.tk, 1
 hasselbach-dellwig.de, 1
 hassellunden.ga, 1
 hasseplatslageri.se, 1
 hassmelden.de, 1
 hassra.org.uk, 1
 hastavem.com, 1
+hastingssecondarycollege.com.au, 1
+hastmassage.tk, 1
 hastyllc.com, 1
 hatachan.site, 1
 hataonline.tk, 1
@@ -41160,6 +43467,7 @@
 hay.email, 1
 hayai.space, 1
 hayashi-rin.net, 1
+hayda-haki.com, 1
 hayden.ru, 1
 haydenbleasel.com, 0
 haydenjames.io, 1
@@ -41170,7 +43478,9 @@
 haystackrenovation.com.au, 1
 hayvid.com, 1
 haz.cat, 1
+hazan.eu, 1
 hazana.ovh, 1
+hazara-online.tk, 1
 haze-productions.com, 1
 haze.productions, 1
 hazelglow.com, 1
@@ -41181,6 +43491,8 @@
 hazit.co.il, 1
 hazloconlapix.com, 1
 hazyhosting.tk, 1
+hb2132.com, 0
+hb5132.com, 0
 hb5197.com, 0
 hb6729.com, 1
 hb8522.com, 1
@@ -41191,6 +43503,7 @@
 hbcu-colleges.com, 1
 hbeiliny.com, 1
 hbelectricsolutions.com, 1
+hbfisioeesthetic.com.br, 1
 hbgshop.cf, 1
 hboeck.de, 1
 hbomaxaustralia.com, 1
@@ -41199,6 +43512,7 @@
 hbudd.com, 1
 hbvip.com, 1
 hbweb.io, 1
+hbxianghang.com, 0
 hby.cx, 1
 hcaz.io, 1
 hcbj.io, 1
@@ -41206,23 +43520,20 @@
 hcfoodpantry.org, 1
 hcie.pl, 0
 hclsrilanka.com, 1
+hclu.co, 1
 hco4.com, 1
 hcr2bot.com, 1
 hcs.land, 1
 hcsbk.kz, 1
 hcscrusaders.com, 1
 hcsoffshore.com, 1
+hctegelhandel.tk, 1
 hcv.cz, 1
 hcv.ind.in, 1
-hd-6132.com, 1
-hd-gaming.com, 1
 hd-iptv.co, 1
 hd-offensive.at, 0
 hd-only.org, 1
 hd-outillage.com, 1
-hd2132.com, 1
-hd5132.com, 1
-hd6132.com, 1
 hd6729.com, 1
 hd6957.com, 1
 hd9397.com, 1
@@ -41245,31 +43556,38 @@
 hdnastudio.com, 1
 hdpornose.com, 1
 hdrezka2018.tk, 1
+hdritalyphotos.com, 1
 hdrsource.com, 1
 hdrtranscon.com, 1
 hds-lan.de, 1
+hds-rx.com, 1
 hdsexxx.net, 1
 hdtwinks.com, 1
 hdv.paris, 1
+hdv12.horse, 1
 hdview.co.uk, 1
 hdwallpapers.net, 1
 hdy.nz, 1
 he.kg, 1
 heaaart.com, 1
+head-hunters.tk, 1
 head.org, 1
 head.ru, 1
 heade.cf, 1
 headforcloud.com, 1
 headfullofdynamite.com, 1
+heading2australia.ga, 1
 headjapan.com, 1
 headlinenews.co, 1
 headlinepublishing.be, 1
+headofhair.pl, 1
 headphonesinear.tk, 1
 healike.hk, 0
 healingourskin.com, 1
 healmyhearttoday.ga, 1
 healtbeautyturkey.tk, 1
 health-and-beauty-news.net, 1
+health-balance-plus.com, 1
 health-booster.com, 1
 health-iq.com.au, 1
 health-match.com.au, 1
@@ -41294,6 +43612,7 @@
 healthdata.gov, 1
 healtheals.com, 0
 healtheffectsofasbestos.com, 1
+healthekids.tk, 1
 healthequity.com, 1
 healthfinder.gov, 1
 healthfitapp.com, 1
@@ -41315,13 +43634,19 @@
 healthy-map.com, 1
 healthy-shoko.com, 1
 healthy1lifestyle.com, 1
+healthyaging-digital.com, 1
 healthybeterlife.click, 1
 healthyfitfood.com, 1
 healthyfoodster.com, 1
+healthyhabitswellness.net, 1
+healthyhomeventilation.com.au, 1
 healthykitchen101.com, 1
 healthylifeelite.com, 1
+healthyliving-healthnetwork.com, 1
 healthymen.ml, 1
 healthynutritionguide.info, 1
+healthyprinciples.co.uk, 1
+healthyrun.tk, 1
 healthyspirituality.org, 1
 healthystyle.tk, 1
 healthysuperhuman.com, 1
@@ -41329,7 +43654,6 @@
 healthyweblife.tk, 1
 heanbian.com, 1
 heap.zone, 1
-heapkeeper.org, 1
 heardcountyathletics.com, 1
 hearfool.cc, 1
 hearingshofar.com, 1
@@ -41354,6 +43678,7 @@
 hearty.edu.pl, 1
 hearty.eu.org, 1
 hearty.ga, 1
+hearty.gift, 1
 hearty.gq, 1
 hearty.ink, 1
 hearty.me, 1
@@ -41371,6 +43696,7 @@
 heat-ua.pt, 1
 heatershop.co.uk, 1
 heatherbells.tk, 1
+heatherleysephotography.com, 1
 heathersmithcommercial.com, 1
 heatingandairconditioningdallastx.com, 1
 heatingequipment.tk, 1
@@ -41387,6 +43713,7 @@
 hebbelabi.tk, 1
 hebbet.de, 1
 hebei30019.com, 1
+heber.tk, 1
 heberut.gov, 1
 hebikhiv.nl, 1
 hebrew.ga, 1
@@ -41399,8 +43726,10 @@
 hectorfiorini.com.ar, 1
 heddoun.com, 1
 hedge.fi, 1
+hedgedoc.org, 1
 hedgehogdigital.co.uk, 1
 hedgeschool.ie, 1
+hedman.tk, 1
 hedonics.org, 1
 hedonism.org, 1
 hedonistic-imperative.com, 1
@@ -41434,7 +43763,6 @@
 heidifuller.com, 1
 heidisheroes.org, 1
 heightselectrical.com.au, 1
-heijblok.com, 1
 heijdel.nl, 1
 heijmans.blog, 1
 heijmans.cloud, 0
@@ -41453,6 +43781,7 @@
 heilkraft.online, 1
 heilmandeckandfence.com, 1
 heilongjiang30019.com, 1
+heimansschildersbedrijf.nl, 1
 heimatverein-eitensheim.de, 1
 heimdall-home.com, 1
 heimdallr.nl, 1
@@ -41478,20 +43807,26 @@
 hekat.sk, 1
 hekate.com.mx, 1
 hekeki.com, 1
+hekimim.tk, 1
 hekoro.ml, 1
 hektenkairez.com, 1
+helagotaland.gq, 1
+helali.me, 1
 helbreath.tk, 1
 helco.xyz, 1
 helden-spielen.de, 1
 heldenhalde.de, 1
+helder.tk, 1
 helderneves.pt, 1
 heldtech.services, 1
 heldundsexgott.de, 1
 heleendebruyne.be, 1
 helenaknowledge.com, 1
+helenapaparizouspainfanclub.tk, 1
 helendoron.fr, 1
 helenekurtz.com, 1
 helenelefauconnier.com, 1
+helenevanwunnik.tk, 1
 helenkellersimulator.org, 1
 helensmithpr.co.uk, 1
 helenssjoholm.cf, 1
@@ -41508,18 +43843,19 @@
 helikopters.tk, 1
 helios4.com, 1
 heliosnet.com, 1
-heliosvoting.org, 1
 helix.am, 1
 helix.social, 1
 helkyn.eu, 1
 helkyn.fr, 1
 helkyn.org, 1
 hell.sh, 1
+hellblast.tk, 1
 hellboundhackers.org, 1
 hellenicagora.co.uk, 1
 hellenicmusicacademy.com, 1
 hellerarko.de, 1
 hellersgas.com, 1
+hellhavens.tk, 1
 hello-design.fr, 1
 helloacm.com, 1
 helloafrica.ga, 1
@@ -41544,11 +43880,14 @@
 hellorussia.ga, 1
 hellosalmon.com, 1
 hellotandem.com, 1
+helloteen.tk, 1
 hellothought.net, 1
 hellovillam.com, 1
 helloworldhost.com, 0
+hellpc.net, 1
 hellsgamers.pw, 1
 hellsh.com, 1
+hellsoldiers.tk, 1
 hellven.net, 1
 helm-pokale.at, 1
 helm-pokale.de, 1
@@ -41558,7 +43897,10 @@
 help207.me, 1
 help207.xyz, 0
 helpantiaging.com, 1
+helpcalculator.tk, 1
+helpcapital.ru, 1
 helpcentral.ng, 1
+helpcomp.tk, 1
 helpconnect.com.au, 1
 helpekwendenihospital.com, 1
 helpfulhealthinsurance.com, 1
@@ -41566,6 +43908,8 @@
 helpmij.cf, 1
 helpnet.ro, 1
 helppc.com.ua, 1
+helprb.ru, 1
+helprf.ru, 1
 helpscoutdocs.com, 1
 helptasker.com, 1
 helptasker.net, 1
@@ -41580,16 +43924,18 @@
 helsinki.dating, 1
 helvella.de, 1
 hemant.net, 1
+hemaroids.tk, 1
 hematoonkologia.pl, 1
 hemdal.se, 1
-hementaze.com, 1
+hemdian.com, 1
+hemelgaard.nl, 1
 hemingwayfp.co.uk, 1
-hemkoll.nu, 1
 hemnet.se, 1
 hemorroi.ga, 1
 hemp.com, 1
+hempseedhealth.com, 1
 hems.si, 1
-hemtest.com, 1
+hen.ee, 1
 hen.ne.ke, 1
 henan30019.com, 1
 hendersonvalleyautomotive.co.nz, 1
@@ -41622,6 +43968,8 @@
 henningkerstan.org, 1
 hennymerkel.com, 1
 henri-feuillade.tk, 1
+henri.moe, 1
+henrieta-nagyova.tk, 1
 henrik-bondtofte.dk, 1
 henrikjuvonen.fi, 1
 henriknoerr.com, 1
@@ -41631,8 +43979,10 @@
 henry.gg, 1
 henrybelk.com, 1
 henrybrown0.com, 1
+henryclub.tk, 1
 henrycountyohio.gov, 1
 henryishax.com, 1
+henryluker.com, 1
 henrymercado.tk, 1
 henryocallaghan.com, 1
 henryphan.com, 0
@@ -41650,6 +44000,7 @@
 hentschke-bau.de, 1
 hentschke-betonfertigteilwerk.de, 1
 hentschke-invest.de, 1
+henzenhoning.nl, 1
 hepha.ch, 1
 hepla.de, 0
 heppler.net, 1
@@ -41666,7 +44017,9 @@
 herbers.tk, 1
 herbert.io, 1
 herbertjanvandinther.nl, 1
+herbiez.com, 1
 herbolarigranvida.com, 1
+herbreathonglass.tk, 1
 herbsupplements.co.uk, 1
 herbweb.net, 1
 herbweb.org, 1
@@ -41683,11 +44036,16 @@
 heren.fashion, 1
 heretic-guild.com, 1
 hereticle.com, 1
+hereticmaniacs.tk, 1
+hereticofficial.com, 1
+hereticpreist.tk, 1
+herewomentell.com, 1
 hergeandtintin.tk, 1
 herila.ml, 1
 heritagebaptistchurch.com.ph, 1
 heritagecoffee.co.uk, 0
 heritagemachining.ca, 1
+heritagereformed.tk, 1
 herkam.pl, 1
 herkel.email, 1
 herkel.media, 1
@@ -41695,8 +44053,10 @@
 herkelmedia.de, 1
 hermanbrouwer.nl, 1
 hermann.in, 1
+hermanoscarrera.tk, 1
 hermes-net.de, 1
 hermes-servizi.it, 1
+hermetien.tk, 1
 hermietkreeft.site, 0
 herminghaus24.de, 1
 hermitant.fr, 1
@@ -41704,6 +44064,7 @@
 herndl.org, 1
 herni-kupony.cz, 1
 hernn.com, 1
+heroblog.info, 1
 herocentral.de, 1
 heroco.xyz, 1
 heroes3stat.tk, 1
@@ -41718,6 +44079,7 @@
 herold.space, 1
 heromuster.com, 1
 heroningenieria.com, 1
+heroxin.com, 1
 herpes-no.com, 1
 herr-webdesign.de, 1
 herrald-skeeleren.tk, 1
@@ -41730,7 +44092,7 @@
 herringadvancemachine.com, 1
 herringboneeats.com, 1
 herringsresidence.be, 1
-herrkaschke.com, 1
+herritage.ga, 1
 herrschaftlich-durch-dresden.de, 1
 herrsmith.com, 1
 herrtxbias.net, 0
@@ -41764,6 +44126,7 @@
 hestia-systeme.eu, 1
 hestia-systeme.fr, 1
 hesyifei.com, 1
+hetdebat.tk, 1
 hetene.nl, 1
 hetfundament.team, 1
 hetgetouw.be, 1
@@ -41780,6 +44143,7 @@
 hevrishut.cf, 1
 hewany.com, 1
 hex.nl, 1
+hex2rgb.online, 1
 hexacon.io, 1
 hexagon-e.com, 1
 hexagon.io, 1
@@ -41805,13 +44169,16 @@
 hexstreamsoft.com, 1
 hexxagon.com, 1
 hey.com, 1
+hey.pw, 0
 heyapakabar.com, 1
 heyboldface.com, 1
+heybritney.tk, 1
 heybyrdie.com, 1
 heyfringe.com, 1
 heyitgirl.com, 1
 heyitsfree.net, 1
 heyjournal.com, 1
+heymx.wtf, 1
 heyrockerproductions.com, 1
 heysora.net, 1
 heywise.com, 1
@@ -41834,6 +44201,7 @@
 hg71839.com, 1
 hg881.com, 1
 hgbcms.ca, 1
+hgc.solutions, 1
 hgc369.com, 1
 hgfa.fi, 1
 hghanbarimd.com, 1
@@ -41852,6 +44220,7 @@
 hh30019.com, 1
 hh5197.co, 1
 hh6729.co, 1
+hh6729.com, 1
 hh6957.co, 1
 hh9297.co, 1
 hh9397.com, 1
@@ -41865,7 +44234,9 @@
 hhtoners.com.br, 1
 hhxiaozhan.ml, 1
 hi-million.ml, 1
+hi-res.cloud, 1
 hi-res.vip, 1
+hi-science.com, 1
 hi.team, 1
 hialatv.com, 1
 hibanaworld.com, 1
@@ -41919,14 +44290,15 @@
 higgsboson.tk, 1
 higgstools.org, 1
 high-flying.co.uk, 1
+high-heels.se, 1
 high-school-atka.ga, 1
-highair.net, 1
 highaltitudearchery.com, 1
 highcorkett.com, 1
 highdaseo.ml, 1
 highdesertroboticsurgery.com, 1
 highdeserttinyhomes.com, 1
 higheducation.ml, 1
+highenergy.ro, 1
 higherpress.org, 1
 highgatejoinery.co.uk, 1
 highintegrity.tk, 1
@@ -41945,20 +44317,24 @@
 highqappliance.com, 1
 highriskpay.com, 1
 highspeed-arnsberg.de, 1
+highspenfc.tk, 1
+hightech.construction, 1
 hightechbasementsystems.com, 1
-hightechgadgets.net, 1
 hightechone.cf, 1
 hightechreviews.ga, 1
-hightest.co.uk, 1
 hightimes.com, 1
+highway11north.tk, 1
+highway54.tk, 1
 highwaytohoell.de, 1
 highwayzen.org, 1
 higilopocht.li, 1
 higleyarts.org, 1
+higueras.tk, 1
 hik-cloud.com, 1
 hikagestudios.com, 1
 hikawa.top, 1
 hike.pics, 1
+hikeinrio.com, 1
 hiker.cool, 1
 hikerone.com, 1
 hikikomori-sos.site, 1
@@ -41972,13 +44348,14 @@
 hilden.ws, 1
 hiledge.com, 1
 hilfe-bei-krebs-vechta.de, 1
-hilfreiche-server.tips, 1
+hilfreiche-server.tips, 0
 hill.selfip.net, 1
 hillcountryoralsurgery.com, 1
 hillcrestplumber.co.za, 1
 hillcrestswimclub.com, 1
 hillexplorer.com, 1
 hillier-swift.co.uk, 1
+hillner.eu, 1
 hillroadgarage.tk, 1
 hillsandsaunders.co.uk, 1
 hillsandsaunders.com, 1
@@ -42000,14 +44377,16 @@
 himecorazon.com, 1
 himekomi.com, 1
 himg.eu, 1
+himgdz.ru, 1
 himiku.com, 1
+himlamcorp.vn, 1
 himpler.com, 0
 hin10.com, 1
 hinaryazan.com, 1
 hinata-hidetoshi.com, 1
-hinderlider.de, 1
 hindibaba.tk, 1
 hindigalaxy.com, 1
+hindimeinjankari.com, 1
 hindimoviedownload.net, 1
 hindimovieonline.net, 1
 hindu-temple.tk, 1
@@ -42016,19 +44395,20 @@
 hingehealth.com, 1
 hingle.me, 1
 hinksonlabs.com, 1
-hinota.com, 1
 hintergrundbewegung.de, 1
 hinterposemuckel.de, 1
 hintss.pw, 0
 hinyari.net, 1
 hiparish.org, 1
 hipeople.com.br, 1
+hiper-humor.tk, 1
 hiperbusinessblog.hu, 1
 hipercultura.com, 1
 hipermenu.com, 1
 hipersuli.hu, 1
 hiperusera.es, 1
 hiphop.ren, 1
+hiphopfashion.tk, 1
 hipnos.net, 1
 hipo.pt, 1
 hippiekiller.net, 1
@@ -42060,6 +44440,8 @@
 hiromuogawa.com, 1
 hirosehp.jp, 1
 hirotaka.org, 1
+hirsch-lawyer.tk, 1
+hirschl.eu, 1
 hirte-digital.de, 0
 hirtz.pm, 1
 hirtzfr.eu, 1
@@ -42073,6 +44455,7 @@
 hispania-valencia.com, 1
 hispania.ml, 1
 hispanic.dating, 1
+hispasat.es, 1
 hispasys.com, 1
 hisregistries.com, 1
 hisregistries.net, 1
@@ -42089,6 +44472,7 @@
 historiaeculturaguarani.org, 1
 historiageneral.com, 1
 historiasdepueblo.es, 1
+historiasyrelatos.tk, 1
 historichousesghent.be, 1
 historicizam.tk, 1
 historischehuizengent.be, 1
@@ -42098,7 +44482,7 @@
 history.gov, 1
 history.pe, 1
 historymuseumsb.org, 0
-hiszpanskiesmaki.pl, 1
+hitafterhitentertainment.com, 1
 hitandhealth.nl, 1
 hitchpin.com, 1
 hitchunion.org, 1
@@ -42116,6 +44500,7 @@
 hithouse.tk, 1
 hititgunesi-tr.com, 1
 hitleap.com, 1
+hitmaker.tk, 1
 hitmanstat.us, 1
 hitmyheart.tk, 1
 hitn.at, 1
@@ -42138,16 +44523,17 @@
 hiv.gov, 1
 hivatal-info.hu, 1
 hivault.cf, 1
+hive101.info, 1
 hivehub.no, 1
 hivekey.eu, 1
 hivekey.io, 1
 hiveopolis.eu, 1
-hiverlune.net, 1
+hiverlune.net, 0
 hivesigner.com, 1
 hiwannz.com, 1
 hiwiki.tk, 1
 hiyacar.co.uk, 1
-hiyoko-shokutaku.com, 1
+hiyobi.me, 1
 hizzacked.xxx, 1
 hj-mosaiques.be, 1
 hj.rs, 1
@@ -42169,10 +44555,12 @@
 hjallboscoutkar.se, 1
 hjartasmarta.se, 1
 hjdiaz.com, 1
+hjelmqvist-it.se, 1
 hjelpemiddeldatabasen.no, 1
 hjertingfysioterapi.dk, 1
 hjes.com.ve, 1
 hjkbm.cn, 1
+hjmag.com, 1
 hjort.land, 1
 hjosh.com, 1
 hjphoto.co.uk, 1
@@ -42220,6 +44608,7 @@
 hlsblog.com, 1
 hlsjgw.com, 1
 hlsmandarincentre.com, 1
+hltk.fi, 1
 hlucas.de, 1
 hlx66.cc, 1
 hlx86.cc, 1
@@ -42244,6 +44633,7 @@
 hnonline.sk, 1
 hnrk.io, 1
 hnsseed.com, 1
+hntuin.nl, 1
 hnyp.hu, 1
 ho18.net, 1
 ho188.net, 1
@@ -42262,6 +44652,7 @@
 hobby-freizeit.de, 1
 hoberg.ch, 1
 hobindesign.com, 1
+hobokenrecords.tk, 1
 hochhaus.us, 1
 hochoukikikiraku.com, 1
 hochstift-party.de, 1
@@ -42276,6 +44667,7 @@
 hockeyapp.ch, 1
 hockeycircles.com, 1
 hockeymotion.ch, 0
+hockeypartner.no, 1
 hocoma.eu, 1
 hocoma.net, 1
 hocoma.org, 1
@@ -42297,11 +44689,9 @@
 hoewler.ch, 0
 hof-imbiss-lieske.de, 1
 hof-mulin.ch, 1
-hof-rijnland.nl, 1
 hofapp.de, 1
 hofauer.de, 1
 hoffmancorporation.com, 1
-hoffmann-fliesen-design.de, 1
 hoffmeyer.me, 1
 hoffnungberlin.de, 1
 hoffnungdeutschland.de, 1
@@ -42312,6 +44702,7 @@
 hogarthdavieslloyd.com, 1
 hoge.se, 1
 hogepad.com, 0
+hogerduinen.tk, 1
 hogl.dk, 1
 hogrebe.de, 1
 hogvorts.tk, 1
@@ -42344,10 +44735,12 @@
 holgerlehner.com, 1
 holi-coresdaindia.com.br, 1
 holidayclub.tk, 1
+holidayexcess.com, 1
 holidayincotswolds.co.uk, 1
 holidaylocal.ga, 1
 holidays-info.com, 1
 holidaysportugal.eu, 1
+holidaytable.tk, 1
 holine.studio, 1
 holini.com, 1
 holisticacupuncture.com.au, 1
@@ -42358,6 +44751,7 @@
 holland-sailing.de, 1
 hollandsewolken.nl, 1
 hollermann.eu, 1
+hollidays.tk, 1
 hollowpoint.xyz, 1
 hollowrap.com, 1
 hollowwinds.xyz, 1
@@ -42369,6 +44763,8 @@
 holmesworkholding.co.uk, 1
 holmq.dk, 1
 holo.ovh, 1
+holocron.one, 1
+holod-servis777.tk, 1
 holofono.com, 1
 holofox.ru, 1
 holostyak.tk, 1
@@ -42378,14 +44774,12 @@
 holtackersleather.be, 1
 holtslander.ca, 1
 holubowski.com, 1
-holunderbluetentee.de, 1
 holundersberg.de, 1
 holvonix.com, 1
+holycrosscatholics.org, 1
 holycrossphl.org, 1
 holycrossverobeach.org, 1
 holydragoon.jp, 1
-holyfamilychurch.org, 1
-holyfamilyphilly.org, 1
 holyfamilyrussell.org, 1
 holyghost-church.org, 1
 holygrail.games, 0
@@ -42411,7 +44805,10 @@
 hombresconestilo.com, 1
 home-cloud.online, 1
 home-insurance-quotes.tk, 1
+home-ncj.com, 1
 home-page.xyz, 1
+home-portal.tk, 1
+home-style.hu, 1
 home-sud-renovation.com, 0
 home-v.ind.in, 1
 homeable.io, 1
@@ -42445,6 +44842,7 @@
 homegreenmark.com, 1
 homehunting.pt, 1
 homeimagician.com.au, 1
+homeimprovement.ga, 1
 homeinet.tk, 1
 homeinformation.tk, 1
 homelab.farm, 1
@@ -42452,6 +44850,8 @@
 homelandsecurity.gov, 1
 homeloanprequalify.com, 1
 homem-viril.com, 1
+homemadetips.ga, 1
+homemediadb.org, 1
 homen.in, 1
 homeodynamics.com, 1
 homeoesp.org, 1
@@ -42462,15 +44862,18 @@
 homeownersinsurancenv.com, 1
 homepage.shiga.jp, 1
 homepal.ga, 1
+homeplace.in, 1
 homeporn.stream, 1
 homeportal.cz, 1
 homeprivate.de, 1
 homeprivate.net, 1
 homequipment.com, 1
+homero.tk, 1
 homeschoolinkorea.tk, 1
 homeseeds.nl, 1
 homeseller.com, 1
 homeserver-kp.de, 1
+homesforaustralia.ga, 1
 homeshowoff.com, 1
 homestead-honey.com, 1
 homesteadfarm.org, 1
@@ -42481,10 +44884,10 @@
 homewatt.co.uk, 1
 homeworkacers.com, 1
 homeworld.ga, 1
-homey-app.online, 1
 homeyou.com, 1
 homeyx.cf, 1
 hommeatoutfaire.be, 0
+homnest.fr, 1
 homo.ga, 1
 homofo.tk, 1
 homoglyph.net, 1
@@ -42497,13 +44900,16 @@
 homs.design, 1
 homunyan.com, 1
 homyak.gq, 1
+homyneeds.com, 1
 homyremedies.com, 1
 honda-centrum.cz, 1
 hondart.cz, 1
+hondenoppasfraneker.nl, 1
 honey.beer, 1
 honey.is, 1
 honeybadger.io, 0
 honeybhealthyliving.com, 1
+honeycomb.io, 1
 honeycombcreative.com, 1
 honeycome-recruit.com, 1
 honeycome.net, 1
@@ -42515,7 +44921,6 @@
 hong.io, 0
 hongbomiao.com, 1
 hongfumall88.com, 1
-honggian.com, 1
 hongki.tk, 1
 hongkongliberate.com, 1
 hongkongwillwin.com, 1
@@ -42528,6 +44933,7 @@
 honigconte.com, 1
 honkhonk.net, 1
 honkion.net, 1
+honnedechuju.com, 1
 honoka-seitai.jp, 1
 honoka.tech, 1
 honor.ru, 1
@@ -42541,11 +44947,13 @@
 hoogelandzorg.nl, 1
 hoogeveen.nl, 0
 hooghiemstrazelf.nl, 1
+hoogstraatseschaakclub.tk, 1
+hoogveen.tk, 1
 hookahfoil.ru, 1
 hookahshop.lt, 1
 hookbin.com, 1
 hookshotdesign.com, 1
-hookupndate.com, 1
+hooliganka.tk, 1
 hooliganz.tk, 1
 hoon.tk, 1
 hoooc.com, 1
@@ -42556,7 +44964,6 @@
 hooplessinseattle.com, 1
 hoopshabit.com, 1
 hooray.beer, 1
-hoorgold.com, 1
 hoorig.de, 1
 hoosa.de, 1
 hoosierstateofmind.com, 1
@@ -42565,6 +44972,7 @@
 hopconseils.ch, 0
 hopconseils.com, 0
 hope21.ch, 1
+hopefultexas.com, 1
 hopeland.com.br, 1
 hopemeet.info, 1
 hopemeet.me, 1
@@ -42599,6 +45007,7 @@
 horeco.com, 1
 horeizai.net, 1
 horgenberg.com, 1
+horizon-surf.ru, 1
 horizon.ne.jp, 1
 horizonlawncare.tk, 1
 horizonmail.ga, 1
@@ -42607,21 +45016,29 @@
 horizontalsystems.io, 1
 horkel.cf, 1
 horn.co, 1
+hornblower.tk, 1
 hornburg.io, 1
 hornertranslations.com, 1
+horny-gay-dragons.com, 1
 hornyforhanzo.com, 1
 horo.me, 0
 horoca.net, 1
 horochx.org, 1
 horodance.dk, 1
 horos.es, 1
+horoscopimages.tk, 1
+horozo.com, 1
 horrell.ca, 1
 horrendous-servers.com, 1
 horror-forum.de, 1
 horrormovies.gr, 1
 horrorserv.com, 1
 horrycountysc.gov, 1
+horseboxheaven.uk, 1
+horsebreeding.tk, 1
+horseconsult.com, 1
 horsegateway.com, 1
+horsehead.tk, 1
 horsehunter.co.uk, 1
 horseplanet.tk, 1
 horsky.me, 1
@@ -42648,7 +45065,6 @@
 host4us.cc, 1
 hostadvice.com, 1
 hostalbarelgato.es, 1
-hostam.link, 1
 hostarea51.com, 1
 hostathome.fr, 1
 hostatic.com, 1
@@ -42669,6 +45085,7 @@
 hosteleriauno.es, 1
 hostelxaxid.si, 1
 hosteons.com, 1
+hostfact.nl, 1
 hostfission.com, 1
 hostfree12.tk, 1
 hostiberi.com, 0
@@ -42690,21 +45107,24 @@
 hostingsvizzera.com, 1
 hostingtg.com, 1
 hostingtipps.eu, 1
+hostinkos.com, 1
 hostinvest.tk, 1
 hostix.de, 1
 hostker.com, 1
-hostlayer.ro, 1
 hostma.ma, 1
 hostmijnpagina.nl, 1
 hostmodern.com.au, 1
 hostonssd.ga, 1
+hostpoint-static.ch, 1
 hostpoint.ch, 1
 hostreputation.com, 1
 hostwinds.com, 1
 hosuto.nl, 1
 hot-and-new.gr, 1
+hot-models.tk, 1
 hot-spa.ch, 0
 hot100.ug, 1
+hot101fm.tk, 1
 hotbabe.ml, 1
 hotcandlestick.com, 1
 hotcars.com, 1
@@ -42739,12 +45159,11 @@
 hoteldvorik.ml, 1
 hotelelaphusabrac.com, 1
 hoteles4you.com, 1
-hotelevergrandpalace.in, 1
 hotelevershine.com, 1
+hotelfloresta.tk, 1
 hotelfloridachaco.com, 1
 hotelflow.com.br, 1
 hotelident.de, 1
-hotelindraprasth.biz, 1
 hotelitalia.tk, 1
 hotelkaj.hr, 1
 hotello.io, 1
@@ -42752,7 +45171,6 @@
 hotelmap.com, 1
 hotelmarinaadria.com, 1
 hotelmonal.in, 1
-hotelnatrajp.com, 1
 hotelneptundalmatien.com, 1
 hotelpostaorvieto.it, 1
 hotelpresident.co.in, 1
@@ -42764,7 +45182,6 @@
 hotelsalzberg.ml, 1
 hotelsantalibera.tk, 1
 hotelsfares.com, 1
-hotelsinbuxton.com, 1
 hotelsinformer.com, 1
 hotelsinncoventry.com, 1
 hotelsolinebrela.com, 1
@@ -42774,6 +45191,7 @@
 hotelsupport.one, 1
 hotelv.ru, 1
 hotelvalena.com, 1
+hotesb.com, 1
 hotesb.net, 1
 hothbricks.com, 1
 hothiphopmusic.com, 1
@@ -42801,20 +45219,23 @@
 hottestwebcamgirls.org, 1
 hottheme.net, 1
 hotting.nl, 1
+hottoys.tk, 1
 hottubspasnewcastle.co.uk, 1
 hotvideosgalleries.com, 1
 hotwifer.com, 1
 houby-studio.eu, 1
-houdremont-la-courneuve.info, 1
 houhuayuan.com, 1
 houlang.ac.cn, 1
 hourai.gg, 1
 houraiteahouse.net, 1
+house-cleaning-howtos.com, 1
 house-scape.com, 1
 house-sparrow.com, 1
 houseandgarden.co.uk, 1
 houseboydesigns.com, 1
+housedesigninfo.tk, 1
 houseepropiedadraiz.com, 1
+household-appliances.tk, 1
 householdheroes.com.au, 1
 housekeeperlondon.co.uk, 1
 houselocal.co.uk, 1
@@ -42822,19 +45243,20 @@
 housemates.uk.com, 1
 housemouse.tk, 1
 houseofaceonline.com, 1
+houseofannubis.com, 1
 houseofhouston.com, 1
 houseofpertijs.com, 1
 houseofyee.com, 1
 houser.lu, 1
 housese.at, 1
 housingloan.jp, 1
-housingneedz.com, 1
 houstonapartmentinsiders.com, 1
 houstonauthorizedrepair.com, 1
 houstoncreditlaw.com, 1
 houstondiabetesinstitute.org, 1
 houstonendodontics.com, 1
 houstongaragedoorsrepair.com, 1
+houstonhomerevival.com, 1
 houstonlockout.com, 1
 houthandelbunskoek.nl, 1
 houthandeljacobs.nl, 1
@@ -42846,6 +45268,7 @@
 how-to-build-computer.tk, 1
 how-to-simply.com, 1
 how-to-write-a-book.gq, 1
+how10.com, 1
 how2dev.tools, 1
 how2fsbo.com, 1
 how2recycle.info, 1
@@ -42859,8 +45282,10 @@
 howesky.com, 1
 howgoodwasmysex.com, 1
 howieisawesome.com, 1
+howinsider.com, 1
 howlers.tk, 1
 howlingbasset.co.uk, 1
+howlinhawk.tk, 1
 howlongtobeatsteam.com, 1
 howmanymilesfrom.com, 1
 howmanypeoplearethereinthe.world, 1
@@ -42872,15 +45297,19 @@
 howonce.com.cn, 1
 howonce.net, 1
 howonce.org, 1
+howsecureismypassword.net, 1
 howsmyssl.com, 1
 howsmytls.com, 1
 howsyourhealth.org, 1
+howtobehealthy.tk, 1
 howtocurekennelcough.com, 1
 howtodesignwebsite.com, 1
+howtofixwindows.com, 1
 howtofreelance.com, 1
 howtogeek.com, 1
 howtogeekpro.com, 1
-howtogosolar.org, 1
+howtogosolar.org, 0
+howtohomepage.tk, 1
 howtoinstall.co, 1
 howtolaser.com, 1
 howtomovetheneedle.com, 1
@@ -42897,6 +45326,7 @@
 howtutu.link, 1
 howtutu.net, 1
 howtutu.org, 1
+howudoin.tk, 1
 howunadeydoam.ng, 1
 hoxo.fr, 1
 hoymedivorcio.com, 1
@@ -42915,6 +45345,7 @@
 hpisavageforum.com, 1
 hpkp-faq.de, 1
 hplace.com.br, 1
+hpneo-conseil.com, 1
 hps.digital, 1
 hps.hu, 1
 hpsdigital.hu, 1
@@ -42927,7 +45358,9 @@
 hqteas.com, 1
 hquest.pro.br, 1
 hqwebhosting.tk, 0
+hqy.moe, 1
 hr-automation.eu, 1
+hr-clan.tk, 1
 hr-praemien-santander.de, 1
 hr-tech.shop, 1
 hr-tech.store, 1
@@ -42946,18 +45379,21 @@
 hrebecek.cz, 1
 href.one, 1
 hreflang.info, 1
+hristijanspirovski.tk, 1
 hrjfeedstock.com, 1
 hrjfeedstock.org, 1
 hrjob.ml, 1
-hrkenterprise.com, 1
 hrkfamilylaw.com, 1
 hrlab.de, 1
 hrlive.ga, 1
 hrmafia.ga, 1
 hrmg.agency, 1
+hrmn.xyz, 1
+hrmny.sh, 1
 hrna.moe, 1
 hrndz.io, 1
 hro.to, 1
+hrobert.hu, 1
 hroling.nl, 1
 hroschyk.cz, 1
 hrpage.ml, 1
@@ -42974,13 +45410,13 @@
 hs-arbeitsschutz.de, 1
 hs-flensburg.de, 1
 hs-group.net, 1
+hs7imports.com.br, 1
 hsappstatic.net, 1
 hschen.top, 0
 hscorp.de, 1
 hse-dev.com, 1
 hse-online.com, 1
 hsex.tv, 0
-hsg-lumdatal.de, 1
 hsimrall.com, 1
 hsivonen.com, 1
 hsivonen.fi, 1
@@ -42995,6 +45431,7 @@
 hspinc.ca, 1
 hsr.gov, 0
 hsreformas.es, 1
+hsrm.cz, 1
 hst.tc, 1
 hsts-preload-test.xyz, 1
 hsts.eu, 1
@@ -43021,7 +45458,6 @@
 htbemail.com, 1
 htbemail.net, 1
 htbemail.org, 1
-htc.com, 1
 htcvina.com, 1
 htdcomputer.vn, 1
 hte.ovh, 1
@@ -43030,6 +45466,7 @@
 htlball.at, 1
 htmanager.fr, 1
 htmdom.com, 1
+html-css.tk, 1
 html5.org, 1
 html5media.info, 1
 htmlacademy.ru, 1
@@ -43048,6 +45485,7 @@
 htsure.ma, 0
 http-2.com, 1
 http2.pro, 1
+http3-hosting.de, 1
 http3.ch, 1
 http3.pro, 1
 httpd.gq, 1
@@ -43075,10 +45513,13 @@
 hu-a-u.com, 1
 hu.search.yahoo.com, 0
 hu2ty.net, 1
+hua-in.com, 1
+hua-in.net, 1
+hua-li88.com, 1
+hua-li88.net, 1
 huabanxs.com, 1
 huagati.com, 1
 huahinpropertylisting.com, 1
-huai123.org, 1
 huang.nu, 1
 huangguancq.com, 1
 huanggulin.net, 1
@@ -43097,8 +45538,8 @@
 huangqifu.com, 1
 huangzenghao.cn, 0
 huangzenghao.com, 1
+huanqiu1988.com, 1
 huaqian.art, 1
-huashan.co.uk, 1
 huastecanetwork.com, 1
 huawenyy.com, 1
 huaxingui.com, 1
@@ -43116,6 +45557,7 @@
 hubchain.org, 1
 hubei30019.com, 1
 huber-informatik.de, 1
+hubloy.com, 1
 hubok.net, 1
 hubovra.nl, 1
 hubrecht.at, 1
@@ -43124,7 +45566,6 @@
 hubspot.es, 1
 hubspot.fr, 1
 hubspot.jp, 1
-hubtrinova.com, 0
 huchet.me, 1
 hucklebucks.com, 1
 huckletree.com, 1
@@ -43137,11 +45578,11 @@
 huduser.gov, 1
 huelvatrabaja.com, 1
 huemul.studio, 1
-huendeleskopfhuette.de, 1
 huersch.com, 1
 huertoydesamparados.tk, 1
 hues-in-lee.de, 1
 huesers.de, 1
+huesitos.tk, 1
 huffduffer.com, 1
 hugh-dancy.com, 1
 hughfitzgerald.com, 1
@@ -43153,11 +45594,17 @@
 hugofs.com, 1
 hugolegrand.fr, 1
 hugolynx.fr, 0
+hugonote.cf, 1
+hugonote.ga, 1
+hugonote.gq, 1
 hugonote.ml, 1
 hugonote.ovh, 1
+hugonote.tk, 1
 huguesblanchard.paris, 1
 huguesditciles.com, 0
 huh.gdn, 1
+hui-in.com, 1
+hui-in.net, 1
 huihui.moe, 1
 huininga.com, 1
 huininga.nl, 1
@@ -43192,6 +45639,7 @@
 hulsoft.co.uk, 1
 human-clone.com, 1
 human-shinri.com, 1
+humanafterall.studio, 1
 humanenrich.com, 1
 humanesdemadrid.tk, 1
 humanewolf.com, 1
@@ -43233,6 +45681,7 @@
 humboldtcountynv.gov, 1
 humboldthomeguide.com, 1
 humboldtmfg.com, 1
+humdruma-recordingz.tk, 1
 humexe.com, 1
 humio.com, 1
 hummel.tk, 1
@@ -43240,10 +45689,12 @@
 hummy.tv, 1
 humor-web.tk, 1
 humor.ga, 1
+humorcheck.ga, 1
 humored.gq, 1
 humpchies.com, 1
 humpen.se, 1
 humppakone.com, 1
+humus.tk, 1
 hunan30019.com, 1
 hund.io, 1
 hundeformel.de, 1
@@ -43251,9 +45702,11 @@
 hundhausen.de, 1
 hundimiento.com, 1
 hundter.com, 1
+hundur.tk, 1
 hungarian-united-church.tk, 1
 hungaryz.ml, 1
 hunger.im, 1
+hungryas.tk, 1
 huniverse.co, 1
 hunngard.com, 1
 hunqz.com, 1
@@ -43265,7 +45718,7 @@
 hunterjohnson.io, 1
 hunterkehoe.com, 1
 hunterscrolls.tk, 1
-huntexpired.com, 1
+huntexpired.com, 0
 huntingdonbouncers.co.uk, 1
 huntingdonlifesciences.com, 1
 huntingtonestateproperties.com, 1
@@ -43280,11 +45733,13 @@
 huotuyouxi.com, 1
 huoyankan.com, 1
 hup.hu, 0
+hupsa-kindermode.be, 1
 huracanvillegas.com, 1
 hurbascooter.com, 1
 hurd.is, 1
 hurleyhomestead.com, 1
 huroji.com, 0
+huron.tk, 1
 hurricanecarroll.com, 1
 hurricanelabs.com, 0
 hurrikane.us, 1
@@ -43297,12 +45752,14 @@
 husk.house, 1
 huskyeye.de, 1
 huskyinc.us, 0
+husmann.tech, 1
 husqvarnamoped.se, 1
 hussam.eu.org, 1
 hustl.nl, 1
 hustlehope.com, 1
 hustlerstate.tk, 1
 huto.ml, 1
+hutson-foods.com, 1
 huureensite.com, 1
 huurwoordenaar.nl, 1
 huutonauru.net, 1
@@ -43336,19 +45793,21 @@
 hvtuananh.com, 1
 hvylya.net, 1
 hw8.eu, 1
+hw923.com, 1
 hwag-pb.de, 1
 hwholdsworth.com.au, 1
 hwjkk.com, 1
 hwlibre.com, 1
 hwsw.io, 1
+hwx8.com, 0
 hx-sun.com, 1
-hx36.net, 1
 hx56.cc, 1
 hx678.cc, 1
 hx77.cc, 1
 hxkvm.com, 1
 hxkvm.net, 1
 hxp.io, 1
+hxr404.cf, 1
 hxsf.me, 1
 hxying.com, 1
 hy1.com, 1
@@ -43373,12 +45832,17 @@
 hydrazin.pw, 1
 hydro17.com, 1
 hydroagro.pl, 1
+hydrochlorothiazide.gq, 1
 hydrochlorothiazide125.ga, 1
 hydrocloud.net, 1
 hydrocontrolsystems-janssenwaterproofing.com, 1
+hydrogenplatform.com, 1
 hydrographicsocietybenelux.eu, 1
+hydroid.tk, 1
 hydrolyze.tk, 1
+hydronicheatingaustralia.com.au, 1
 hydronium.cf, 1
+hydronium.ga, 1
 hydronium.ml, 1
 hydroponicglobal.com.au, 1
 hydroturbine.info, 0
@@ -43404,6 +45868,7 @@
 hyncice.com, 1
 hyndax.com.ar, 1
 hynek.me, 1
+hynerd.it, 1
 hyodyntamaton.site, 0
 hyparia.fr, 1
 hyparia.org, 1
@@ -43414,15 +45879,18 @@
 hyper.ai, 1
 hyper.lol, 1
 hyperalgesia.com, 1
-hyperaonline.com.br, 1
 hyperautomotive.com.au, 1
+hyperblast-universe.tk, 1
 hyperbolic-mayonnaise-interceptor.ovh, 1
+hypercdn.de, 1
 hypercompetitions.com, 1
 hyperd.sh, 1
+hyperhidrose.tk, 1
 hyperian.net, 1
 hyperion.io, 1
 hyperlocal.co.za, 1
 hyperreal.biz, 1
+hypershell.tk, 1
 hypersomnia.com, 1
 hyperspace.tk, 1
 hyperstack.org, 1
@@ -43437,20 +45905,19 @@
 hypno-thera.fr, 1
 hypnobb.com, 1
 hypnose-hennigsdorf.de, 1
+hypnose-mieux-etre.com, 1
 hypnoseduction.tk, 1
 hypnotic-reviews.com, 1
 hypnotized.org, 1
 hypnotizedgirls.ml, 1
 hypnovir.us, 1
 hypolineweb.de, 1
-hypotecnicentrum.cz, 1
 hypotheca.ca, 1
 hypothecairelening.net, 1
 hypotheekbond.nl, 1
 hypotheques24.ch, 1
 hypothermia.tk, 1
 hypothes.is, 1
-hypothesis.link, 1
 hypothyroidmom.com, 1
 hypr.ee, 1
 hyr.mn, 0
@@ -43458,6 +45925,7 @@
 hysemmarket.com, 1
 hysh.jp, 1
 hysolate.com, 1
+hysquad.it, 1
 hystats.net, 1
 hysupchile.cl, 1
 hytale.com, 1
@@ -43471,7 +45939,7 @@
 hyychat.com, 1
 hyyen.com, 1
 hyyperchat.com, 1
-hzbk.org, 1
+hzbk.org, 0
 hztgzz.com, 1
 hzwc.nl, 1
 i--b.com, 1
@@ -43485,13 +45953,16 @@
 i-house.gq, 1
 i-hoz.ru, 1
 i-lab.ml, 1
+i-like-hits.tk, 1
 i-logic.co.jp, 0
 i-make-love.tk, 1
 i-make.com, 1
 i-make.fr, 1
 i-model.org, 1
+i-motor.nl, 1
 i-office.com.vn, 1
 i-on.by, 1
+i-panic.com, 1
 i-pinged-everyone.today, 1
 i-port-voice.com, 1
 i-prince.tk, 1
@@ -43499,6 +45970,7 @@
 i-r-a.tk, 1
 i-red.info, 1
 i-scream.space, 1
+i-so.ru, 1
 i-sports.cz, 1
 i-stats.net, 1
 i-tm.com.tw, 1
@@ -43509,6 +45981,7 @@
 i00228.com, 1
 i0day.com, 1
 i1314.gdn, 1
+i24.host, 1
 i2capmark.com, 1
 i2gether.org.uk, 1
 i2verify.com, 0
@@ -43517,17 +45990,18 @@
 i36533.com, 1
 i365365.com, 1
 i36588.com, 1
-i4m1k0su.com, 1
 i51365.com, 1
 i5197.co, 1
 i5y.co.uk, 1
 i5y.org, 1
 i6729.co, 1
+i6729.com, 1
 i6957.co, 1
 i7.io, 1
 i7sas.tk, 1
 i81365.com, 1
 i82365.com, 1
+i86666.com, 1
 i879.com, 1
 i88i.gq, 1
 i8cp.com, 1
@@ -43540,6 +46014,7 @@
 ia.cafe, 1
 ia.net, 1
 ia1000.com, 1
+iabot.tk, 1
 iacitywebdesigner.com, 1
 iaco.li, 1
 iactu.info, 1
@@ -43590,13 +46065,17 @@
 ianmooreis.me, 1
 ianmoriarty.com.au, 1
 iansyst.co.uk, 1
+ianthompsonbooks.com, 1
 ianwalsh.org, 0
 iap.network, 0
+iapro.com, 1
 iapws.com, 1
 ias-gruppe.net, 1
 ias.ua, 1
 iassess.eu, 1
+iaswc.org, 1
 iatfei.com, 1
+iawx.net, 1
 ib-wedler.de, 0
 iba.community, 1
 iba.gov.au, 1
@@ -43684,6 +46163,7 @@
 icecars.net, 1
 icecodenew.tk, 1
 icecontrol.ro, 1
+icecreamandclara.co.uk, 1
 icecreamika.tk, 1
 icecutethings.com, 1
 icedream.tech, 1
@@ -43695,6 +46175,7 @@
 iceloch.com, 1
 icemakerrepairaustin.com, 1
 icemedia.com.au, 0
+icentury.ca, 1
 icepharmaceuticals.com, 1
 icerinkwarehouse.com, 1
 icesemulator.com, 1
@@ -43734,6 +46215,7 @@
 icollezionisti.com, 1
 icolorpalette.com, 1
 icon-programming.tk, 1
+iconecoiffure.ca, 1
 iconintegration.com.au, 1
 iconomi.net, 1
 icons4free.tk, 1
@@ -43760,6 +46242,7 @@
 icterra.com, 1
 ictindia.in, 1
 ictinforensics.org, 1
+ictmjc.com, 1
 ictoniolopisa.it, 1
 ictradar.com, 1
 ictussistemas.com.br, 1
@@ -43776,6 +46259,7 @@
 icze4r.net, 1
 icze4r.online, 1
 icze4r.org, 1
+iczelion.tk, 1
 iczer.org, 1
 id-blog.ch, 0
 id.atlassian.com, 0
@@ -43794,11 +46278,11 @@
 idarv.com, 1
 idaspis.com, 1
 idatalabs.com, 0
-idatha.de, 1
 idblab.tk, 1
 idbs.com, 1
 idc-business.be, 0
 idc.yn.cn, 1
+idc95.com, 1
 idcrane.com, 1
 iddconnect.com, 1
 iddconnect.org, 1
@@ -43811,7 +46295,6 @@
 ideagenpentana.com, 1
 ideagenqpulse.com, 1
 ideahub.tk, 1
-ideal-envelopes.co.uk, 0
 ideal.shop, 1
 idealabs.tk, 1
 idealadvogadosbh.com.br, 1
@@ -43832,6 +46315,7 @@
 ideaweb.de, 1
 ideaweblab.com, 0
 ideditorial.com, 1
+idee-geschenk.eu, 1
 idee-lq.at, 1
 idee-lq.ch, 1
 idee-lq.com, 1
@@ -43857,6 +46341,7 @@
 identitykrisis.com, 1
 identitysandbox.gov, 1
 identitytheft.gov, 1
+ideorealm.tk, 1
 idered.net, 1
 idesoft.cloud, 1
 idesoft.com, 1
@@ -43893,12 +46378,15 @@
 idndx.com, 1
 idoc24.com, 1
 idodiandina.com, 1
+idohost.cf, 1
 idohost.tk, 1
 idol-bikes.ru, 1
 idolf.dk, 1
 idolish7.fun, 0
 idontexist.me, 0
+idonthaveawebsite.tk, 1
 idontplaydarts.com, 1
+idoo24.com, 0
 idoparadoxon.hu, 1
 idouying.com, 1
 idp.onl, 1
@@ -43916,6 +46404,7 @@
 idunno.org, 1
 idvl.de, 1
 idweblog.com, 1
+idwebtools.tk, 1
 idxforza.com, 1
 idyl.fr, 1
 idysse.com, 1
@@ -43964,6 +46453,7 @@
 ifconfig.se, 1
 ifederalland.com, 1
 ifelse.io, 1
+ifengge.cn, 1
 ifgcdn.com, 1
 ifibe.com, 1
 ifisher.xyz, 1
@@ -43974,6 +46464,7 @@
 ifnet.fr, 1
 ifoa.it, 1
 ifolder.ga, 1
+iforced.net, 1
 iformbuilder.com, 0
 ifort.fr, 1
 ifosep.fr, 0
@@ -44004,12 +46495,14 @@
 igechile.cl, 1
 igeh-immo.at, 1
 igenuinebeauty.co.jp, 1
+igforum.tk, 1
 igfwd.email, 1
 iggies.tk, 1
 igglabs.com, 1
 iggprivate.com, 1
 iggsoft.com, 1
 iggsoftware.com, 1
+ighl.de, 1
 igi-2.com, 1
 igi.codes, 0
 igiftcards.de, 1
@@ -44021,6 +46514,9 @@
 igkabel.gq, 1
 igkabel.ml, 1
 igkabel.tk, 1
+iglesiabelen.tk, 1
+iglesiadesalvacion.org, 1
+iglesiapentecostal.net, 1
 iglobus.cz, 0
 igloocommunities.com, 1
 igloodigitalworkplace.ca, 1
@@ -44055,6 +46551,7 @@
 igramfollower.com, 1
 igramming.com, 1
 igranit.md, 1
+igraonicalara.tk, 1
 igrarium.com.ua, 0
 igrivi.com, 1
 igrodrom-kvest.tk, 1
@@ -44087,6 +46584,7 @@
 ihorvorotnov.com, 1
 ihost.md, 1
 ihostup.net, 1
+ihouseu.com, 1
 ihre-pflege-sachsen.de, 1
 ihredls.de, 1
 ihrhost.com, 1
@@ -44100,6 +46598,7 @@
 ii30019.com, 1
 ii5197.co, 1
 ii6729.co, 1
+ii6729.com, 1
 ii6957.co, 1
 ii74.com, 1
 ii918.com, 1
@@ -44116,16 +46615,16 @@
 iiij.ml, 1
 iiit.pl, 1
 iimarckus.org, 1
-iin.fm, 1
 iinf.in, 1
 iinfin.org, 0
 iinix.com, 1
 iiong.com, 1
 iipvapi.com, 1
 iis.net, 1
+iisuss.gq, 1
 iitala.fi, 1
 iitneetprep.com, 1
-iitowns.ir, 0
+iitowns.ir, 1
 iitstartups.org, 1
 iix.se, 1
 ijinus.com, 1
@@ -44169,6 +46668,7 @@
 iklive.org, 0
 ikmx.net, 1
 iknet.top, 1
+iknowd.org, 1
 ikonenmuseumkampen.nl, 1
 ikools.com, 1
 ikparis.com, 1
@@ -44179,6 +46679,7 @@
 ikulist.me, 1
 ikumi.us, 1
 ikvts.de, 1
+ikwileendomein.tk, 1
 ikx.me, 1
 ikzoekeengoedkopeauto.nl, 1
 ikzoektim.nl, 1
@@ -44204,6 +46705,7 @@
 ileci.de, 1
 ilektronika-farmakeia-online.gr, 1
 ilemonrain.com, 1
+ileonidze.tk, 1
 ilericikadinlar.org, 1
 iletisimmakinesi.com, 1
 ilformichiere.com, 1
@@ -44263,12 +46765,17 @@
 ilmiobusinessonline.it, 1
 ilmiogiardiniere.it, 1
 ilmuk.org, 0
+ilneminis.com, 1
 iloft.xyz, 1
 iloli.name, 1
+ilona-france.tk, 1
 ilondres.es, 1
 ilonewolfs.com, 1
+ilouis.cn, 1
 ilove.fish, 1
 ilovecomputering.com, 1
+ilovefanyi.win, 1
+ilovefun.tk, 1
 iloveherb.ru, 1
 ilovelwy.com, 1
 iloveporn.ml, 1
@@ -44279,7 +46786,10 @@
 iloveviral.org, 1
 iloveyoutoo.tk, 1
 ilovias-farm.fr, 1
+ilpl.me, 0
+ilquintoseitu.it, 1
 ilrg.com, 1
+ils-savaient.fr, 1
 iltec-prom.ru, 1
 iltec.ru, 1
 iltisim.ch, 0
@@ -44287,6 +46797,7 @@
 ilug-ktm.tk, 1
 ilumantio.tk, 1
 ilusionesopticas.net, 1
+ilusionistas.tk, 1
 ilusionphoto.com, 1
 ilusoesopticas.com, 1
 ilya.pp.ua, 1
@@ -44301,24 +46812,31 @@
 im4h.eu, 1
 im4h.info, 1
 im66.net, 1
-imacs.org, 1
+ima-solutions.fr, 1
+ima-tourcoing.fr, 1
+imacs.org, 0
 imadalin.ro, 1
 image-cdn.co.uk, 1
 image-drive.de, 1
 image.hosting, 1
 image.tf, 0
+image2base64.online, 1
+image4arab.tk, 1
 imagealbums.tk, 1
 imagebin.ca, 1
 imagecom.tk, 1
 imagecurl.com, 1
 imagecurl.org, 1
-imageessentialsweightloss.com, 1
+imageessentialsweightloss.com, 0
 imagefu.com, 1
 imagen891.tk, 1
 imagenesdedibujosalapizfacilesdehacer.com, 1
+imageproductions.ga, 1
 imagerive.ch, 0
+images99.com, 1
 imageshare.web.id, 1
 imagevillage.ir, 1
+imageworld.tk, 1
 imaginair.es, 1
 imaginary.ca, 1
 imaginary.stream, 1
@@ -44333,7 +46851,6 @@
 imakash.gq, 1
 imamenu.com, 1
 imanageproducts.co.uk, 1
-imanageproducts.com, 1
 imanageproducts.uk, 1
 imanet.cl, 1
 imanolbarba.net, 1
@@ -44363,10 +46880,12 @@
 imed.pt, 1
 imedi.it, 1
 imediafly.com, 1
+imediato.pt, 1
 imedikament.de, 1
 imeds.pl, 1
 imenfarazalvand.com, 1
 imeria.tk, 1
+imerit.net, 1
 imex-dtp.com, 1
 imexmed.com.gt, 1
 imf-online.com, 1
@@ -44383,11 +46902,11 @@
 imgo.ga, 1
 imgo.tk, 1
 imgup.co, 1
-imguploaden.nl, 1
 imgx.eu.org, 1
 imhotx.com, 0
 imhua.com, 1
 imi-rhapsody.eu, 0
+imig.ru, 1
 imiku.cn, 1
 imin.co, 1
 imine.ru, 1
@@ -44408,7 +46927,6 @@
 imlinan.net, 1
 imlloyd.yt, 1
 imlonghao.com, 1
-imls.gov, 1
 immanuellutheranmedia.org, 1
 immarypoppinsyall.tk, 1
 immaterium.de, 1
@@ -44418,6 +46936,7 @@
 immense.ly, 1
 immersa.co.uk, 1
 immersion-pictures.com, 1
+immersionclub.tk, 1
 immersionwealth.com, 1
 immersivewebportal.com, 1
 immigrantdad.com, 1
@@ -44446,6 +46965,7 @@
 immortal.run, 1
 immortalcorporation.tech, 1
 immortol.tech, 1
+immovisual.be, 1
 immune.cf, 1
 imobile3.com, 1
 imoe.ac.cn, 0
@@ -44461,30 +46981,36 @@
 imoxin.net, 1
 impact-fluids.com, 1
 impact.health.nz, 1
+impactartstudy.com, 1
 impacter.eu, 1
 impactingsports.com, 1
 impactparcels.co.uk, 1
 impactparcels.com, 1
 impactpub.ch, 0
 impakho.com, 1
+impaqservices.org, 1
 impartesco.com, 1
 impas.se, 1
 impay.one, 1
+impec-cable.com, 1
 impelup.com, 1
 impendulo.org, 1
-impera.at, 1
 imperdin.com, 1
 imperdintechnologies.com, 1
 imperial-legrand.com, 1
 imperialfenceinc.com, 1
 imperialism.rip, 1
 imperialmiami.com, 1
+imperialteam.tk, 1
 imperiocursospro.com.br, 1
 imperiodigital.online, 1
 imperioth.com, 1
 imperiumglass.com.au, 1
 imperiumnova.info, 1
 imperiyashop.tk, 1
+impf.site, 1
+impfung.cf, 1
+impfung.site, 1
 imphotep.net, 1
 impiantistica.org, 1
 implantesdentalestopete.com.mx, 1
@@ -44498,7 +47024,6 @@
 imposingoods.com, 1
 impossible.org, 1
 impossiblechoisir.tk, 1
-impossiblefitness.com, 1
 impossiblehq.com, 1
 impossiblenutrition.com, 1
 impossiblex.com, 1
@@ -44539,11 +47064,12 @@
 improvision.eu, 1
 impudence.tk, 1
 impulse-clan.de, 1
-impulsionsa.com, 1
+impulsionsa.com, 0
 impulsocristiano.com, 1
 imququ.com, 1
 imqyw.com, 1
 imransarwar.com, 1
+imrbq.com, 1
 imreh.net, 1
 imro.ie, 1
 imrunner.com, 1
@@ -44555,6 +47081,7 @@
 imtikaib.ml, 1
 imwalking.de, 1
 imy.rs, 1
+imychic.com, 1
 imydl.tech, 1
 imyjy.cn, 1
 imyrs.cn, 1
@@ -44581,7 +47108,7 @@
 inanec.gq, 1
 inaned.ga, 1
 inanyevent.london, 1
-inares.org, 1
+inares.org, 0
 inarizona.tk, 1
 inbitcoin.it, 1
 inblank.tk, 1
@@ -44620,10 +47147,10 @@
 incore.nl, 1
 incotive.com, 1
 incowrimo.org, 1
-incpak.com, 1
 incparadise.net, 1
 increasetestosteronelevels.org, 1
 incrediblenews.tk, 1
+incrediblez.tk, 1
 incrementation.net, 0
 incrom.com, 0
 incurvy.de, 1
@@ -44632,10 +47159,16 @@
 indeika.ml, 1
 independencerecovery.com, 1
 independent-operators.com, 1
+independentadvicefinancial.ga, 1
+independentfinancial.ga, 1
+independentmoneyadvice.ga, 1
 independentpartyofamerica.tk, 1
 independenttravelcats.com, 1
+independenza.tk, 1
+indevelopment.tk, 1
 index-games.com, 1
 index-mp3.com, 1
+index-of.ml, 1
 index.law, 1
 indexcesmad.cz, 1
 indexhost.tk, 1
@@ -44643,6 +47176,7 @@
 indexsalaire.be, 1
 indexyz.me, 1
 india-ennenga.ga, 1
+indiaexamresult.in, 1
 indiaflowermall.com, 1
 indiafm.tk, 1
 indialocaltours.com, 1
@@ -44652,13 +47186,14 @@
 indianafoundationpros.com, 1
 indianamoldrepairpros.com, 1
 indianapolisnews.ml, 1
+indianapolisrestorations.com, 1
 indianareflux.com, 1
-indianarmy.me, 1
 indianawaterdamagerepairpros.com, 1
 indiandramasonline.tk, 1
-indianerschmuck24.de, 1
 indianhelpline.in, 1
 indianporn2.xxx, 1
+indianstorestuttgart.com, 1
+indianwarriors.tk, 1
 indiatechblogger.cf, 1
 indiatrademarkwatch.com, 1
 indiaviral.ga, 1
@@ -44670,12 +47205,11 @@
 indievelopment.nl, 1
 indigartbeading.ca, 1
 indigartbeading.com, 1
-indigitalagency.com, 1
+indigestiblesuppuration.tk, 1
 indignes-strasbourg.tk, 1
 indigoblack.com.au, 1
 indigobooks.gq, 1
 indigojewelers.com, 1
-indigolawnscape.net, 1
 indigopaints.be, 1
 indigosakura.com, 1
 indigostudios.com, 0
@@ -44691,6 +47225,7 @@
 indiya-kino.gq, 1
 indlish.ga, 1
 indnews.ga, 1
+indo4life.tk, 1
 indobo.com, 1
 indochina.io, 1
 indodax.com, 1
@@ -44699,18 +47234,19 @@
 indogermantrade.de, 1
 indoidnews.ga, 1
 indoittraining.com, 0
-indomanila.com, 1
 indonesiakaya.com, 1
 indonesian-news.tk, 1
 indonesiatrip.tk, 1
 indoor-kletterwald.de, 1
 indoorpaintball.co.uk, 1
+indopress.tk, 1
 indorsie.com, 1
 indospot.tk, 1
 indota.hu, 1
 indotravels.tk, 1
 indovinabank.com.vn, 1
 indramas.tk, 1
+indramdhani.net, 1
 indusap.com, 1
 indusfastremit-ca.com, 1
 indusfastremit-us.com, 1
@@ -44723,8 +47259,8 @@
 industrialcalibration.co.uk, 1
 industriascruzcentro.com, 1
 industriemeister.io, 1
-industryperspectives.com, 1
 indybay.org, 1
+indyroom.tk, 1
 ineardisplay.com, 0
 inebula.it, 1
 ineedweb.net, 1
@@ -44735,7 +47271,6 @@
 inesnutricion.com, 1
 inessoftsec.be, 1
 inesta.nl, 1
-inet.se, 1
 inethost.eu, 1
 inetserver.eu, 1
 inetsoftware.de, 1
@@ -44753,6 +47288,7 @@
 infantry.org.ua, 1
 infcloud.com, 1
 infectedg.com, 1
+infectedvoice.tk, 1
 infectingthe.world, 1
 infelko.ru, 1
 inference.biz.tr, 1
@@ -44762,11 +47298,13 @@
 inffin-portal.de, 1
 inffin-tec.de, 1
 inficom.org, 1
+infidia.tk, 1
 infiernoalgecireno.tk, 1
 infihow.com, 1
 infinether.net, 1
 infinifour.com, 1
 infinipharm.com, 1
+infinita.com.co, 1
 infinite.com, 1
 infinitenews.cf, 1
 infinitescript.com, 1
@@ -44782,12 +47320,15 @@
 infinitybooksindia.in, 1
 infinityengine.org, 1
 infinityepos.co.uk, 1
+infinityfaces.tk, 1
 infinityrecruitinggroup.com, 1
+infinitysearch.co, 1
 infinitysportsandfitness.in, 1
 infinityvr.net, 1
 infintechdesigns.com, 1
 infirmiere-canadienne.com, 1
 infirmieredevie.ch, 0
+infirmiers-montpellier.fr, 1
 infivalle.gov.co, 1
 inflatablehire-scotland.co.uk, 1
 inflatablesny.com, 1
@@ -44808,13 +47349,18 @@
 info-days.tk, 1
 info-free.ml, 1
 info-it.tk, 1
+info-kiwi.tk, 1
 info-o-zbozi.cz, 1
 info-obzor.ml, 1
+info-reason.cf, 1
 info-screen.me, 1
 info-screw.com, 1
 info-sell.ml, 1
+info-sys.tk, 1
 info.gov, 1
+infoaboutlawyers.com, 1
 infoamin.com, 1
+infoarenales.com, 1
 infobae.com, 1
 infobasquet.tk, 1
 infobip.com, 1
@@ -44825,6 +47371,7 @@
 infobrain.net, 1
 infobrest.tk, 1
 infocanada.tk, 1
+infocanicatti.tk, 1
 infoclub.club, 1
 infocoin.es, 1
 infocom.bg, 1
@@ -44865,7 +47412,6 @@
 infopaperiguatemi.com.br, 1
 infopico.com, 1
 infopier.sg, 1
-infopool.org.uk, 1
 infopreneur.blog, 1
 infoprofuse.com, 1
 infopronetwork.com, 1
@@ -44877,12 +47423,16 @@
 inforge.tk, 1
 informace-zbozi.cz, 1
 informaciondeciclismo.com, 1
+informasi-teknologi.com, 1
 informat.ga, 1
 informaticapremium.com, 0
+informaticmousset.tk, 1
 informatiger.net, 1
 informatik-handwerk.de, 1
+informationdoor.ga, 1
 informationrx.org, 1
 informations-echafaudages.com, 1
+informelles.tk, 1
 informhealth.com, 1
 informnapalm.org, 1
 informspb.tk, 1
@@ -44897,6 +47447,8 @@
 infosec.pizza, 1
 infosec.wiki, 1
 infosecchicago.com, 1
+infosecdecompress.com, 1
+infosecmates.com, 1
 infosecsw.ca, 1
 infosectalks.com, 1
 infosectekniques.com, 1
@@ -44906,6 +47458,7 @@
 infosoph.org, 1
 infosubasta.es, 1
 infosystem.cf, 1
+infotabla.si, 1
 infotainworld.com, 1
 infotectsecurity.com, 1
 infoteka.cf, 1
@@ -44918,6 +47471,7 @@
 infoweb.ee, 1
 infowheels.tk, 1
 infoworm.org, 1
+infra-apparel.com, 1
 infra-se.com, 1
 infra.beer, 1
 infra.land, 1
@@ -44983,6 +47537,7 @@
 infrarot-thermometer.info, 1
 infrasend.com, 1
 infraspin.com, 1
+infrastat.com, 1
 infratank.com, 1
 infratask.com, 1
 infrathink.com, 1
@@ -44996,6 +47551,8 @@
 infstudios.nl, 1
 infuse-mn.gov, 1
 ing-buero-junk.de, 1
+ing89.cc, 1
+ing89.com, 1
 ingadesign.it, 1
 ingalabs.hu, 1
 ingatlanjogaszok.hu, 1
@@ -45024,6 +47581,7 @@
 ingo-schlueter.de, 1
 ingolonde.pw, 1
 ingoschlueter.de, 1
+ingresomedicina.com, 1
 ingresospasivosyafiliados.online, 1
 ingressfs.pl, 1
 ingridbai.me, 1
@@ -45042,7 +47600,6 @@
 inishbofin.ie, 1
 init.blog, 1
 init3.cn, 1
-initblogger.com, 1
 initialization.tech, 1
 initiative-3d.org, 1
 initiative-digitalisierung-kmu.de, 1
@@ -45054,6 +47611,7 @@
 ink.horse, 1
 inkable.com.au, 1
 inkandtonerni.co.uk, 1
+inkbotdesign.com, 1
 inkbunny.net, 1
 inkeliz.com, 1
 inkerotic.com, 1
@@ -45068,12 +47626,12 @@
 inkomensafhankelijkehuurverhoging.nl, 1
 inkopers.org, 1
 inkor.tk, 1
-inkosova.com, 1
 inksay.com, 1
 inkteeshop.com, 1
 inkthemes.com, 1
 inkthreadable.co.uk, 1
 inkurz.de, 1
+inkvisual.tk, 1
 inkwall.co, 1
 inlabo.de, 1
 inline-online.tk, 1
@@ -45088,9 +47646,10 @@
 inmaps.xyz, 1
 inmatefinancial.com, 1
 inmateintake.com, 1
-inmatesupport.org, 1
 inmedic.pl, 1
 inmedsm.com, 1
+inmemorium.tk, 1
+inmemoryofdaniella.com, 1
 inmigracion-florida.com, 1
 inmobiliaria-sanpablo.cl, 1
 inmobillium.fr, 1
@@ -45102,6 +47661,7 @@
 inmusicfestival.com, 1
 innabilawgroup.com, 1
 innatocol.com, 1
+inncoaching.nl, 1
 inner-vision.tk, 1
 innerfence.com, 1
 innerlife.company, 1
@@ -45109,6 +47669,7 @@
 innermostparts.org, 1
 innersafe.com, 1
 innico.cf, 1
+innio.com, 1
 inno.ch, 0
 innocence.org.cn, 1
 innocenceseekers.net, 1
@@ -45119,14 +47680,12 @@
 innolabfribourg.ch, 1
 innopharmaeducation.com, 1
 innophate-security.com, 1
-innoraft.com, 1
 innot.net, 1
 innoteil.com, 1
 innoteknology.com, 1
 innotel.com.au, 1
 innova360.com.mx, 1
 innovacoachgroup.com, 1
-innovadis.com, 1
 innovairservices.ch, 0
 innovamag.com, 1
 innovaptor.at, 1
@@ -45137,7 +47696,6 @@
 innovation-photography.co.uk, 1
 innovation-workshop.ro, 1
 innovation.gov, 1
-innovationacademy.uk, 1
 innovationbranding.ga, 1
 innovationgarage.it, 1
 innovationrealtygrp.com, 1
@@ -45161,11 +47719,11 @@
 inondation.ch, 0
 inorder.website, 1
 inoreader.com, 1
+inoruhana.com, 1
 inovasirumahku.tk, 1
 inovatec.com, 1
 inovatecsystems.com, 1
 inovigo.ro, 1
-inovitec.eu, 1
 inoxandco.com, 1
 inoxdesign.fr, 1
 inoxdesign.pro, 1
@@ -45173,6 +47731,7 @@
 inpdp.tk, 1
 inpector.de, 1
 inphi.com, 1
+inprint.id, 1
 inprosy.com, 1
 inprotec.com.co, 1
 input.club, 1
@@ -45189,6 +47748,7 @@
 ins1gn1a.com, 1
 insanb.com, 1
 insane.zone, 1
+insanedevs.com, 1
 insanepyro.tk, 1
 insblauehinein.nl, 1
 inschrijfformulier.com, 1
@@ -45200,13 +47760,13 @@
 insecret.trade, 1
 insecure.org.je, 1
 insegne.roma.it, 1
+inserta.tk, 1
 insertcoins.net, 1
 insertface.com, 1
 inserzioniticino.ch, 1
 insgesamt.net, 1
 inshapenutrition.com.br, 1
 inshared.nl, 1
-insho.fashion, 1
 inshop.hu, 1
 insiberia.tk, 1
 inside19.com, 1
@@ -45215,16 +47775,21 @@
 insidebedroom.com, 0
 insidebitcoins.de, 1
 insideevs.com, 1
+insideevs.de, 1
 insideevs.fr, 1
 insideevs.ru, 1
 insidehook.com, 1
+insideofgaming.de, 1
 insideoutfuel.com, 1
 insideperu.tk, 1
+insideprisonbreak.tk, 1
 insider-invest.tk, 1
 insidergazette.com, 1
 insiders.ga, 1
 insidesolutions.nl, 1
+insidethefirewall.tk, 1
 insidetheigloo.com, 1
+insidevice.com, 1
 insighti.com, 0
 insighti.eu, 1
 insighti.org, 1
@@ -45243,12 +47808,14 @@
 inspas.net, 1
 inspiratienodig.nl, 1
 inspiration.gr, 1
+inspirationalstories.tk, 1
 inspiratorysolutions.com, 1
 inspired-creations.co.za, 1
 inspired-lua.org, 1
 inspiredlife.fun, 1
 inspiredrealtyinc.com, 1
 inspiresurgery.com, 1
+inspireteenhealth.com, 1
 inspirez-vous-sophro.com, 1
 insside.net, 1
 insta-drive.com, 1
@@ -45256,9 +47823,12 @@
 instachina.ru, 1
 instacredito.pt, 1
 instafind.nl, 1
+instaforex.com.ng, 1
 instafrases.net, 1
 instafuckfriend.com, 1
 instagc.com, 1
+instagfy.com, 1
+instagrabber.ru, 1
 instagram-atom.appspot.com, 1
 instagram.com, 0
 instagrammernews.com, 1
@@ -45266,18 +47836,16 @@
 instagraph.cn, 1
 instahub.net, 1
 instalamosyreformamos.es, 1
-installatietechniekgresnigt.nl, 1
 installgentoo.net, 1
 instamod.io, 1
 instamojo.com, 1
+instances.social, 1
 instanse.nl, 1
 instant-clearance-sale.co.uk, 1
 instant-thinking.de, 0
 instant.io, 1
 instantdomainsearch.com, 1
 instantkhabar.com, 1
-instantluxe.cn, 1
-instantluxe.co.uk, 1
 instantluxe.com, 1
 instantluxe.de, 1
 instantmoron.com, 1
@@ -45293,16 +47861,13 @@
 instax.pl, 1
 instead.com.au, 1
 insteagle.com, 1
-instela.com, 1
 instelikes.com.br, 1
 instics.com, 1
-instinctive.io, 0
 institut-coiffureetnature.fr, 1
 institut-confucius-montpellier.org, 1
 institut-uthyl.com, 1
 institutogiuseppe.com, 1
 institutogiuseppe.com.ar, 1
-institutointersistemico.com.br, 1
 institutolancaster.com, 1
 institutomaritimocolombiano.com, 1
 institutosparroquiales.com, 1
@@ -45314,6 +47879,8 @@
 insurance, 1
 insurance-companies.tk, 1
 insurance24.online, 1
+insurancebonzer.ga, 1
+insuranceclassic.ga, 1
 insurancecompanylive.tk, 1
 insuranceleep.ga, 1
 insurancenews.gq, 1
@@ -45322,13 +47889,16 @@
 insurancesaman.tk, 1
 insuranceweb.ga, 1
 insuredcloud.ga, 1
-insurediy.com.sg, 1
 insuremyworkcomp.com, 1
 insureon.com, 1
-inszu.com, 1
+insurethebox.tk, 1
+insurrectosdelbosque.tk, 1
+insytesecurity.nl, 1
+inszu.com, 0
 int-ext-design.fr, 1
 int.icu, 1
 int64software.com, 1
+inta-aivn.org, 1
 intafe.co.jp, 1
 intakesync.com, 1
 intal.info, 1
@@ -45347,15 +47917,18 @@
 integralkk.com, 1
 integralsalud.xyz, 1
 integrata.de, 1
+integratedhealth21.com, 1
 integratedintegrations.xyz, 1
 integratedmedicalonline.com, 1
 integratemyschool.com, 1
 integration-mouvements-oculaires.com, 1
+integrativewellnessny.com, 1
 integritet.com.se, 1
 integritree.ca, 1
 integrity.gov, 1
 integrityglobal.com, 1
 integrityingovernmentidaho.com, 1
+integritymedicalwaste.com, 1
 integrityokc.com, 1
 integrityoklahoma.com, 1
 integromat.com, 1
@@ -45363,6 +47936,7 @@
 integsystem.com, 1
 intel.gov, 1
 intel69.cf, 1
+intelalumni.org, 1
 intelhost.cl, 1
 intelhost.com, 1
 intelhost.com.ar, 1
@@ -45385,6 +47959,7 @@
 intellimatica.se, 1
 intellimax.ir, 1
 intellinetixvibration.com, 1
+intellio.pl, 1
 intelly.nl, 1
 intelly365.nl, 1
 intelrealsense.com, 1
@@ -45417,6 +47992,8 @@
 intercomp-cbu.ru, 1
 interconlarp.org, 1
 intercrosse.tk, 1
+interdc.com, 1
+interdc.nl, 1
 interesnyimir.com, 1
 interessengemeinschaft-pregelstrasse.tk, 1
 interesting.ac.cn, 1
@@ -45437,6 +48014,7 @@
 interior-design-colleges.com, 1
 interior16.cf, 1
 interiorcheapo.com, 1
+interiorcolors.tk, 1
 interiordesignsconcept.com, 1
 interisaudit.com, 1
 interlecwa.com, 1
@@ -45444,11 +48022,13 @@
 interlingvo.biz, 1
 interlinked.us, 1
 intermax.nl, 1
+intermediapub.com, 1
 intermedinet.nl, 1
 intermezzo-emmerich.de, 1
 interminsk.tk, 1
 intern-base.com, 1
 intern.tax, 1
+internacional.tech, 1
 internacionalista.tk, 1
 internalfb.com, 1
 internalframebackpack.tk, 1
@@ -45472,11 +48052,11 @@
 internet-israel.com, 1
 internet-meesters.nl, 0
 internet-pornografie.de, 0
-internet-software.eu, 1
 internet-tv4u.tk, 1
 internet.org, 1
 internet42.tk, 1
 internetaanbieders.eu, 1
+internetauction.tk, 1
 internetbank.swedbank.se, 1
 internetbloger.tk, 1
 internetbugbounty.com, 1
@@ -45487,6 +48067,7 @@
 internetinhetbuitengebied.nl, 1
 internetional.nl, 1
 internetk.tk, 1
+internetline.tk, 1
 internetmagaz.tk, 1
 internetmarketingprofitscenter.com, 1
 internetmarkets.net, 1
@@ -45497,6 +48078,7 @@
 internetofdon.gs, 1
 internetoffensive.fail, 1
 internetofinsecurethings.com, 1
+internetoskol.tk, 1
 internetovehazardnihry.cz, 1
 internetowykantor.pl, 1
 internetpoem.com, 1
@@ -45530,14 +48112,17 @@
 interstateremovalists.sydney, 1
 intersumka.ua, 1
 intertime.services, 1
+intertrans.tk, 1
 interval-training-timer.ru, 1
 interview-suite.com, 0
 interviewme.pl, 1
 interviewpipeline.co.uk, 1
 interways.de, 1
 interwebz.nz, 1
+intestclub.tk, 1
 intheater.de, 1
 intheevent.com, 1
+inthemixstyle.com, 1
 inthepicture.com, 1
 inthouse.cloud, 1
 intim-24.tk, 1
@@ -45605,6 +48190,8 @@
 invantive.net, 1
 invantive.nl, 1
 invantive.org, 1
+invariant.cn, 1
+invariant.me, 1
 invasion.com, 1
 invasivespeciesinfo.gov, 1
 invasmani.com, 1
@@ -45629,6 +48216,7 @@
 investactiv.tk, 1
 investarholding.nl, 1
 investarter.nl, 1
+investasipasti.tk, 1
 investforum.net, 1
 investgold.ml, 1
 investigatemalware.com, 1
@@ -45641,14 +48229,17 @@
 investigazione.roma.it, 1
 investinestonia.com, 1
 investingdiary.cn, 1
+investingent.be, 1
 investingent.com, 1
 investinghent.be, 1
+investingindiscovery.com, 1
 investingtrader.net, 1
 investinturkey.com.tr, 1
 investinweed.com, 1
 investion.cf, 1
 investir.ch, 0
 investirenisrael.fr, 1
+investirsolidaire.fr, 1
 investissementimmobilier.be, 1
 investisseur-or-matieres.com, 1
 investlatam.com, 1
@@ -45670,7 +48261,6 @@
 invidio.us, 1
 invinoaustria.com, 1
 invinoaustria.cz, 1
-invioinc.com, 1
 invisible-college.com, 1
 invisibles.ch, 0
 invisitone.com, 1
@@ -45683,7 +48273,9 @@
 invito.tk, 1
 invkao.com, 1
 invoiced.com, 1
+invokingspirits.tk, 1
 involic.com, 1
+involve.ai, 1
 invuite.com, 1
 invuite.com.au, 1
 inwao.com, 1
@@ -45727,6 +48319,7 @@
 iondrey.fr, 1
 ione.net.nz, 1
 ionlabs.kr, 1
+ionline.ml, 1
 ionnex.com, 1
 ionovia.de, 1
 ionplesalexandru.com, 1
@@ -45759,10 +48352,12 @@
 iowacolonytx.gov, 1
 iowaent.com, 1
 iowaschoolofbeauty.com, 1
+iowawx.com, 1
 iowen.cn, 1
 iowxy.com, 1
 iox.is, 1
 ip-addr.es, 1
+ip-address.me, 1
 ip-hahn.de, 1
 ip-life.net, 1
 ip-tanz.com, 1
@@ -45779,7 +48374,6 @@
 ipadshowroom.com, 1
 ipal.im, 1
 ipal.name, 1
-ipal.pl, 1
 ipal.tel, 1
 ipanchev.com, 1
 iparenda.tk, 1
@@ -45793,6 +48387,9 @@
 ipcuyuni.net, 1
 ipemcomodoro.com.ar, 1
 iperconnessi.it, 1
+iperon.net, 1
+iperon.org, 1
+iperon.ru, 1
 ipfire.org, 1
 ipfirebox.de, 1
 ipfixcalculator.com, 1
@@ -45874,7 +48471,6 @@
 ipv6vpn.net, 1
 ipv6wallofshame.com, 1
 ipvbook.com, 1
-iqbalmauludy.com, 1
 iqboxy.com, 1
 iqos.com.ua, 1
 iqos.ml, 1
@@ -45895,9 +48491,12 @@
 irancenter.tk, 1
 iranconnect.tk, 1
 irandex.ga, 1
+irandm.club, 1
+irando.co.id, 1
 irandroid.ml, 1
 iranfilmcity.tk, 1
 iranfreshfruit.cf, 1
+irangeodesy.tk, 1
 iranian.lgbt, 1
 iranianholiday.com, 1
 iranjeunesse.com, 1
@@ -45913,8 +48512,8 @@
 iranvisa24.com, 1
 iranwiki.ovh, 1
 iraq2u.tk, 1
+iraq4u.tk, 1
 iraqinews.ga, 1
-irasandi.com, 1
 irayo.net, 1
 irc-results.com, 1
 ircica.org, 1
@@ -45922,6 +48521,7 @@
 ircnow.org, 1
 ircoholik.ml, 1
 ircsapiklari.tk, 1
+irdll.com, 1
 ireaco.com, 1
 iready.ro, 1
 ireef.tv, 1
@@ -45957,6 +48557,7 @@
 irisdesign.com, 1
 irish.dating, 1
 irish.radio, 1
+irishdenetwork.org, 1
 irishmusic.nu, 0
 irishradioplayer.radio, 1
 irisinclusiva.pt, 0
@@ -45968,6 +48569,7 @@
 irkutsk38.tk, 1
 irland-firma.com, 1
 irlfp.com, 1
+irlprable.tk, 1
 irma-gadalka.tk, 1
 irmag.ru, 1
 irmgard-woelfle.de, 1
@@ -45979,6 +48581,8 @@
 ironbow.com, 1
 ironbowhealthcare.com, 1
 ironcarnival.com, 1
+ironcladapp.com, 1
+ironcross.tk, 1
 ironfistdesign.com, 1
 ironfittings.com.br, 1
 ironhide.de, 0
@@ -45988,6 +48592,8 @@
 ironraven.ch, 1
 ironraven.ml, 1
 ironscales.com, 1
+ironsidelubricants.com, 1
+ironsidemfg.com, 1
 irontigers.ml, 1
 ironwind.ga, 1
 ironycats.net, 1
@@ -46002,11 +48608,13 @@
 irwinvalera.com, 1
 iryodatumoguide.com, 1
 is-a-furry.org, 1
+is-for-you.com, 1
 is-in-hyper.space, 1
 is-news.today, 1
 is-rocket.science, 0
 is-socket.tk, 1
 isa357.com, 1
+isa4310.com, 1
 isa5417.com, 1
 isaaccomputerscience.org, 1
 isaaccs.org, 1
@@ -46046,6 +48654,7 @@
 iscert.org, 1
 ischool.co.jp, 1
 iscontrol.com.mx, 1
+iscro.cn, 1
 isdecolaop.nl, 1
 isdmgroup.in, 1
 isdn.jp, 1
@@ -46055,11 +48664,13 @@
 iservicio.com.mx, 1
 iservicio.mx, 1
 iseulde.com, 1
+isex-anal.com, 1
 isf.fi, 1
-isfriday.com, 1
 isg-tech.com, 1
 isgp-studies.com, 0
+ishamf.com, 1
 ishangirdhar.com, 1
+isharryworking.today, 1
 ishet.al, 1
 ishhaara.in, 1
 ishigurodo.com, 1
@@ -46087,7 +48698,7 @@
 isitnuclearwaryet.com, 1
 isitpatchtuesday.com, 1
 isitrest.info, 1
-iska.plus, 1
+iska.plus, 0
 iskanderbroere.nl, 1
 iskariot.info, 1
 iskaron.de, 1
@@ -46107,9 +48718,12 @@
 islambolivia.tk, 1
 islamdersi.tk, 1
 islamerkantho.com, 1
+islamicacademy.tk, 1
 islamicarchitecturalheritage.com, 1
 islamicmarkets.com, 1
 islamicnews.tk, 1
+islamicsolution.tk, 1
+islaminbremen.de, 0
 islamisgreat.tk, 1
 islamnews.ga, 1
 islamnewss.tk, 1
@@ -46141,6 +48755,7 @@
 isn.cz, 1
 iso27032.com, 1
 isocom.eu, 1
+isognattori.com, 1
 isoindonesiacenter.com, 1
 isoip.org, 1
 isolde.com, 1
@@ -46180,6 +48795,7 @@
 isreedyinthe.us, 1
 isreedyintheuk.com, 1
 issa.org.pl, 0
+issaias.net, 0
 issasfrissa.se, 1
 isscouncil.com, 1
 isseenterprises.com, 1
@@ -46216,12 +48832,12 @@
 istitutoricci.it, 1
 istitutovivaldi.it, 1
 istogether.com, 1
+istorija-balkana.tk, 1
 istormsolutions.co.uk, 1
 istorrent.is, 1
 istschonsolangeinrente.de, 1
 istsi.org, 1
 istudentpro.ml, 1
-isusemasa.com, 0
 isustain.com.au, 1
 isutils.com, 1
 isv.online, 1
@@ -46232,7 +48848,6 @@
 isyu.xyz, 1
 isz.no, 1
 iszy.cc, 1
-iszy.wtf, 1
 iszy.xyz, 1
 it-academy.sk, 1
 it-actual.ru, 1
@@ -46246,7 +48861,6 @@
 it-fernau.com, 1
 it-inside.ch, 1
 it-jobbank.dk, 1
-it-journal.de, 1
 it-kron.de, 1
 it-maker.eu, 1
 it-meneer.nl, 0
@@ -46277,6 +48891,7 @@
 it.search.yahoo.com, 0
 it1b.com, 1
 it4sure.nl, 1
+it82.com, 1
 itabi.de, 1
 itactiq.com, 1
 itactiq.info, 1
@@ -46285,6 +48900,7 @@
 itajvi.com, 1
 ital-gamma.be, 0
 italbavaro.com, 1
+italentado.ml, 1
 italia-store.com, 1
 italiachegioca.com, 1
 italiamour.com, 1
@@ -46311,6 +48927,7 @@
 itaro.ee, 1
 itaro.eu, 1
 itb-online.co.uk, 1
+itbasic.net, 1
 itbog.org, 1
 itbox.cl, 1
 itbrief.asia, 1
@@ -46321,6 +48938,7 @@
 itchy.nl, 1
 itchybrainscentral.com, 1
 itconsulting-wolfinger.de, 1
+itconvergence.com, 1
 itcoolie.in, 1
 itcreative.ro, 1
 itcs.services, 1
@@ -46332,12 +48950,14 @@
 itds-consulting.eu, 1
 itdutchie.com, 1
 ite.st, 1
+itechpros.com.au, 1
 itecor.net, 0
 iteecafe.hu, 1
 iteha.de, 1
 iteke.ml, 1
 iteke.tk, 1
 iteksys.ru, 1
+iteli.eu, 1
 itemcreator.tk, 1
 itemmc.com, 1
 itemorder.com, 1
@@ -46347,6 +48967,7 @@
 iterror.co, 1
 itexpress.cloud, 1
 itezu.ml, 1
+itfall.tk, 1
 itfh.eu, 1
 itfix.cz, 1
 itgeeks.nl, 1
@@ -46361,7 +48982,6 @@
 ithinc.net, 1
 ithink.cf, 1
 ithjalpforetag.se, 1
-ithot.ro, 1
 itidying.com, 1
 itikon.com, 1
 itilo.de, 1
@@ -46373,22 +48993,25 @@
 itjobsineurope.eu, 1
 itkaufmann.at, 1
 itkonsultstockholm.se, 1
+itleaked.gq, 1
 itlitera.com, 1
 itlog.tk, 1
+itlogic.com.au, 1
 itludens.com, 1
 itm-c.de, 1
 itmax.ua, 1
 itmedicinai.lt, 1
 itmindscape.com, 1
-itmix.cz, 1
 itmustbee.com, 1
 itmx.cc, 1
 itn.co.uk, 1
 itneeds.tech, 1
 itnota.com, 1
 itnow.ng, 1
+itnrd.com, 1
 itochan.jp, 1
 itogoyomi.com, 1
+itoma.tech, 1
 itooky.com, 1
 itotalaccess.net, 1
 itouriria.com, 1
@@ -46404,10 +49027,10 @@
 itreallyaddsup.com, 1
 itreboot.co.nz, 1
 itrendbuzz.com, 1
+itrew.ru, 1
 itrezzo.com, 1
 itring.pl, 0
 itrodeo.com, 1
-itron.com, 1
 itruss.com.tw, 1
 itruth.tk, 1
 its-gutachten.de, 1
@@ -46430,7 +49053,6 @@
 itsblue.de, 1
 itsburning.nl, 1
 itsca.net, 1
-itschromeos.com, 1
 itsdcdn.com, 1
 itsec.link, 1
 itsecblog.de, 1
@@ -46439,6 +49061,7 @@
 itservis.org, 1
 itsevident.com, 1
 itsfitlab.com, 1
+itsforu.de, 1
 itsgreener.com, 1
 itshealthtea.com, 1
 itshealthymoms.com, 0
@@ -46446,8 +49069,11 @@
 itsig-faq.de, 1
 itsm.tools, 1
 itsmejohn.org, 1
+itsmohitchahal.com, 1
 itsmyparty.ie, 1
+itsnotnot.tk, 1
 itsnotquitethehilton.com, 0
+itsnudi.com.br, 1
 itsoft.ru, 1
 itsok.de, 1
 itsok.link, 1
@@ -46474,6 +49100,7 @@
 itvia.org, 1
 itwebentwicklung.de, 1
 itworks.nyc, 1
+itxcjm.top, 1
 itzap.com.au, 1
 itzer.de, 1
 itzine.ru, 1
@@ -46483,24 +49110,26 @@
 iurisnovagestion.es, 1
 iurisnow.com, 1
 iuspenal.com, 1
-iuup.menu, 1
 iuyos.com, 1
 iv-vr.com, 1
+iv2.com, 1
 ivahbbiz.tk, 1
 ivampiresp.com, 1
+ivan-tadej.tk, 1
 ivan1874.cf, 1
 ivan1874.dynu.net, 1
 ivanaleksandrov.com, 1
 ivanbenito.com, 1
-ivanboi.com, 1
 ivancacic.com, 0
 ivanderevianko.com, 1
 ivanilla.org, 1
+ivankuchin.tk, 1
 ivanmeade.com, 1
 ivanovka.ga, 1
 ivanovocity.tk, 1
 ivanovolive.ru, 1
 ivanpolchenko.com, 1
+ivanzorin.cf, 1
 ivaoru.org, 1
 ivd-sued.net, 1
 ivelop.me, 1
@@ -46514,6 +49143,7 @@
 ivisa.ga, 1
 ivisitorinsurance.com, 1
 ivixor.space, 1
+ivjose.com, 1
 ivkymppi.fi, 1
 ivnext.org, 1
 ivo.co.za, 1
@@ -46537,12 +49167,15 @@
 ivselena.ru, 1
 ivsign.net, 1
 ivvl.ru, 1
+ivx.gallery, 1
 ivxv.ee, 1
 ivy-league-colleges.com, 1
+ivyandrose.co, 1
 ivyhelpers.com, 1
 ivyis.org, 1
 ivyrose.shop, 1
 ivyways.com, 0
+iw.net.sa, 1
 iwader.co.uk, 1
 iwalton.com, 1
 iwantexchange.com, 1
@@ -46554,6 +49187,7 @@
 iwashealthy.com, 1
 iwatchcops.com, 1
 iwatchcops.org, 1
+iwatchla.net, 1
 iwatt.sk, 1
 iwch.tk, 1
 iwd.gc.ca, 1
@@ -46584,15 +49218,17 @@
 iyn.me, 1
 iyouewo.com, 1
 iyoumu.top, 1
-iyume.top, 1
+iyume.top, 0
 iz8mbw.net, 1
 izamulhakeem.tk, 1
 izanah.com, 1
 izavel.com, 1
 izdaher.com, 1
+izecubz.me, 1
 izevg.ru, 1
 izipik.gq, 1
 izmir-media.gq, 1
+izmir-organizasyon.tk, 1
 izmirescort.tk, 1
 izmireskortlari.tk, 1
 izmirtemizlik.tk, 1
@@ -46606,10 +49242,8 @@
 izuba.info, 0
 izumi-ryokan.com, 1
 izumi.tv, 1
-izuna.info, 1
 izxxs.com, 1
 izxxs.net, 1
-izxzw.net, 1
 izzardink.com, 1
 izzyontour.tk, 1
 izzys.casa, 1
@@ -46650,6 +49284,7 @@
 j36533.com, 1
 j3e.de, 1
 j4e.name, 1
+j4m.xyz, 1
 j5197.co, 1
 j5lx.de, 1
 j5lx.eu, 1
@@ -46657,8 +49292,14 @@
 j5y.de, 1
 j605.tk, 1
 j6729.co, 1
+j6729.com, 1
 j6957.co, 1
 j6957.com, 1
+j70101.com, 0
+j70102.com, 0
+j70103.com, 0
+j70104.com, 0
+j70105.com, 0
 j70111.com, 0
 j70222.com, 0
 j70333.com, 0
@@ -46716,7 +49357,9 @@
 jabber.at, 1
 jabber.uk, 1
 jabberd.org, 1
+jabberdog.tk, 1
 jabberfr.org, 1
+jabberster.tk, 1
 jabberzac.org, 1
 jabboworld.tk, 1
 jaberg-rutschi.ch, 1
@@ -46737,9 +49380,12 @@
 jackandrascals.com, 1
 jackassofalltrades.org, 1
 jackdawphoto.co.uk, 1
+jacket-coat.tk, 1
+jackets-coats.tk, 1
 jackets-coatsplus.tk, 1
+jackets-for-men.tk, 1
 jackf.me, 1
-jackgreenrealty.com, 1
+jackgreiner.ca, 1
 jackhammerinteractive.com, 1
 jackhoodtransportation.com, 1
 jackingramnissanparts.com, 1
@@ -46760,6 +49406,7 @@
 jacksonhu.com, 1
 jacksorrell.com, 1
 jackspub.net, 1
+jackstone.tk, 1
 jacksutton.info, 1
 jackvaley.com, 1
 jackvalley.com, 1
@@ -46793,6 +49440,7 @@
 jadehotel.nl, 1
 jadesong.net, 1
 jadidgroup.com, 1
+jadox.com, 1
 jaduniv.cf, 1
 jaeger.link, 1
 jaegerlacke.de, 1
@@ -46814,7 +49462,6 @@
 jahit.tk, 1
 jahner.xyz, 1
 jahofmann.de, 0
-jaideeyoga.com, 1
 jaiestate.com, 1
 jailbreakingisnotacrime.org, 1
 jailfood.ga, 1
@@ -46830,7 +49477,6 @@
 jaispirit.com, 1
 jaiyen.com, 1
 jakarta.dating, 1
-jakartacloudhosting.com, 1
 jakdelatseo.cz, 1
 jake.eu.org, 1
 jake.ml, 1
@@ -46839,9 +49485,11 @@
 jakecurtis.de, 1
 jakegyllenhaal.ga, 1
 jakejnx.com, 0
+jakemansfield.com, 1
 jakereynolds.co, 1
 jakerullman.com, 1
 jakeslab.tech, 1
+jaketremper.com, 0
 jakewales.com, 1
 jakincode.army, 1
 jako.tk, 1
@@ -46857,7 +49505,6 @@
 jakubarbet.eu, 1
 jakubboucek.cz, 1
 jakubklimek.com, 1
-jakubsindelar.cz, 1
 jakubtopic.cz, 1
 jakubvrba.cz, 1
 jala.co.jp, 1
@@ -46872,6 +49519,7 @@
 jamaica.gq, 1
 jamalfi.bio, 1
 jamberry.com.mx, 1
+jambihackerlink.tk, 1
 jamcyberinc.com, 1
 jameh.net, 1
 jamelhammoud.com, 1
@@ -46895,13 +49543,14 @@
 jamesj.me, 0
 jamesjboyer.com, 1
 jamesknd.uk, 0
+jamesl.tk, 1
 jameslahey.com, 1
 jamesmarsh.net, 1
 jamesmcdonald.com, 0
 jamesmilazzo.com, 1
 jamesmorrison.me, 1
+jamesnowlin.com, 1
 jamesonmelbye.com, 1
-jamesplumbingcompanypasadenatx.com, 1
 jamesredmond.tk, 1
 jamesrobertson.sh, 1
 jamesross.name, 1
@@ -46931,7 +49580,6 @@
 jamon.ca, 1
 jamstallt.se, 1
 jamstatic.fr, 1
-jamyeprice.com, 0
 jan-and-maaret.de, 1
 jan-becker.com, 1
 jan-bretschneider.de, 1
@@ -46965,6 +49613,7 @@
 janelauhomes.com, 1
 janelle-jamer.tk, 1
 janellequintana.tk, 1
+janetandjohns.tk, 1
 janeweeber.com, 1
 janey.cf, 1
 janeymac.com, 1
@@ -46973,13 +49622,13 @@
 janhermann.cz, 1
 janhuelsmann.com, 1
 jani.media, 1
-janiat.com, 1
 janik.xyz, 0
 janikrabe.com, 1
 janine-und-johannes.de, 1
 janitorutah.com, 0
+janjoris.nl, 1
 jankamp.com, 1
-janker.me, 1
+janker.me, 0
 jann.is, 1
 jannehonkonen.tk, 1
 jannekekaasjager.nl, 1
@@ -46992,6 +49641,7 @@
 janome.com.ua, 1
 janostheil.de, 1
 janschaumann.de, 1
+janservfl.com, 1
 janssen.fm, 1
 janterpstra.eu, 1
 jantinaboelens.nl, 1
@@ -47011,7 +49661,6 @@
 japaneseacupuncture.london, 1
 japanesemotorsports.net, 1
 japanesque.ru, 1
-japanesque.su, 1
 japangids.nl, 1
 japaniac.de, 1
 japanphilosophy.com, 0
@@ -47060,11 +49709,14 @@
 jarsater.com, 0
 jas-team.net, 1
 jasalokal.id, 1
+jasawebbisnis.com, 1
 jashvaidya.com, 1
+jasik.xyz, 1
 jasl.works, 1
 jasmijnwagenaar.nl, 1
 jasminedirectory.com, 1
 jasminefields.net, 1
+jasminlive.cam, 1
 jasmyn.tk, 1
 jasnowidzkajowi.pl, 1
 jason.re, 1
@@ -47099,10 +49751,11 @@
 jav0x.com, 1
 java-fan.tk, 1
 javabot.ml, 1
+javaexpert.tk, 1
+javafiles.tk, 1
 javamilk.com, 1
 javanguiano.mx, 1
 javanie.com, 1
-javara-atlantik.com, 1
 javascriptlab.fr, 1
 javaweb.site, 1
 javaxxz.com, 1
@@ -47122,6 +49775,7 @@
 javmobile.net, 1
 javocean.com, 1
 javorina.tk, 1
+javsod.top, 1
 jawn.ca, 1
 jawo2008.pl, 1
 jawwad.tk, 1
@@ -47141,7 +49795,6 @@
 jayhost.cf, 1
 jayjardine.cf, 1
 jaylee.us, 1
-jaylineko.com, 1
 jaymecd.rocks, 1
 jaynestephenson.com, 1
 jaypandit.me, 1
@@ -47166,6 +49819,7 @@
 jazzy.id.au, 1
 jazzy.pro, 1
 jazzysumi.com, 1
+jb-pixel.tk, 1
 jb0.de, 1
 jb138.cc, 1
 jbah.info.vn, 1
@@ -47189,10 +49843,10 @@
 jcaicedo.com, 1
 jcaicedo.tk, 1
 jcb.com, 1
-jcbfshr.com, 1
 jcbgolfandcountryclub.com, 1
 jccars-occasions.be, 1
 jccrew.org, 1
+jcde.xyz, 1
 jcelectronics.com.au, 1
 jcg.re, 1
 jchn.be, 1
@@ -47204,11 +49858,11 @@
 jcinet.net, 1
 jcit.xyz, 1
 jclynne.com, 1
-jcolideles.com, 0
 jcontspoord.nl, 1
 jcor.me, 0
 jcphotography.dk, 1
 jcra.net, 1
+jcse.mil, 1
 jcsesecuneta.com, 1
 jcus.co, 1
 jcwodan.nl, 1
@@ -47225,8 +49879,10 @@
 jdecommastermind.com, 1
 jdefreitas.com, 1
 jdegbau.com, 1
+jdelgado.fr, 1
 jdheysupplies.co.uk, 1
 jdieselmusic.com, 1
+jdinjury.com, 1
 jdjohnsonmedia.com, 1
 jdjohnsonwaterproofing.com, 1
 jdm.elk.pl, 1
@@ -47246,6 +49902,7 @@
 jean-luc.org, 1
 jean-remy.ch, 1
 jeancafe.ddns.net, 1
+jeancampa.com, 1
 jeancardeno.com, 1
 jeancarlos.tk, 1
 jeandanielfaessler.ch, 1
@@ -47256,13 +49913,16 @@
 jeannecalment.com, 1
 jeannelucienne.fr, 1
 jeanneret-combustibles.ch, 0
+jeanniegraefe.tk, 1
 jeannotbel.tk, 1
 jeanphilippe.io, 1
 jeans-butik.tk, 1
 jeans-moda.tk, 1
 jeans-shopping.tk, 1
-jeansdiscounter.de, 1
+jeans-stores.tk, 1
+jeansbutik.tk, 1
 jeanslee.tk, 1
+jeansstyle.tk, 1
 jec-dekrone.be, 1
 jecho.cn, 1
 jecjacshop.com, 1
@@ -47280,12 +49940,14 @@
 jedepannetonordi.fr, 1
 jedi-master.tk, 1
 jedi-online.tk, 1
+jedilukmas.tk, 1
 jedipedia.net, 1
 jedmud.com, 1
 jedwarddurrett.com, 1
 jeec.ist, 1
 jeek.jp, 1
 jeemain.org, 1
+jeep-diagnost.ml, 1
 jeep4ik.com, 1
 jeepeg.com, 1
 jeeptourpocos.com.br, 1
@@ -47323,7 +49985,6 @@
 jel-tech.com, 1
 jelena-adeli.com, 1
 jelenkovic.rs, 1
-jelewa.de, 1
 jell.ie, 1
 jellebo.dk, 1
 jellebuitenhuis.nl, 1
@@ -47337,17 +49998,16 @@
 jellyfin.spdns.eu, 1
 jellyfishlivewire.co.uk, 1
 jellypepper.com, 1
-jellysquid.me, 1
 jelmer.co.uk, 1
 jelmer.uk, 1
 jelmoli-shop.ch, 1
 jem.gov, 1
-jemangeducheval.com, 1
 jembatankarir.com, 1
 jemefaisdesamis.com, 1
 jemezsprings-nm.gov, 1
 jena.space, 0
 jencor.de, 1
+jencshiny-org.tk, 1
 jendialmeditation.com, 1
 jenelle.ml, 1
 jeneratorkiralama.name.tr, 1
@@ -47395,15 +50055,17 @@
 jering.tech, 1
 jerisandoval.tk, 1
 jermann.biz, 1
-jerodslay.com, 0
+jerodslay.com, 1
 jeroendeneef.com, 1
 jeroendev.one, 1
 jeroenensanne.wedding, 1
 jeroldirvin.com, 1
+jerome-r.tk, 1
 jerome.to, 1
 jerret.de, 1
+jerridoswell.tk, 1
+jerrybustillo.tk, 1
 jerrysretailstores.com, 1
-jerrywang.website, 1
 jerryweb.org, 1
 jerryyu.ca, 1
 jerseybikehire.co.uk, 1
@@ -47415,7 +50077,7 @@
 jesec.cn, 1
 jesiensredniowiecza.pl, 1
 jesmh.de, 1
-jesse3.com, 1
+jesperandersson.tk, 1
 jesseblum.com, 1
 jessecharley.com, 1
 jessecharli.com, 1
@@ -47438,6 +50100,7 @@
 jessica-weller.de, 1
 jessicabarends.nl, 1
 jessicabenedictus.nl, 0
+jessicaevrard.com, 1
 jessicahrehor.com, 1
 jessicharlie.com, 1
 jessieabraham.tk, 1
@@ -47462,10 +50125,11 @@
 jetcraft.tk, 1
 jetfirenetworks.com, 1
 jetflex.de, 1
+jetixclub.tk, 1
 jetkittens.co.uk, 1
-jetlaggroup.co.il, 1
 jetmirshatri.com, 0
 jetpack.com.ar, 1
+jetsadabetchoke77.com, 1
 jetsieswerda.nl, 1
 jetstudio.ch, 1
 jetswhiteout.com, 1
@@ -47474,12 +50138,12 @@
 jettlarue.com, 1
 jettravel.com.mt, 1
 jettshome.org, 1
-jetular.com, 1
-jetular.net, 1
 jetwhiz.com, 1
 jetzt-elektromobil.de, 1
+jeugdclubjia.tk, 1
 jeugdkans.nl, 1
 jeugdraad.gent, 1
+jeugdwmo.nl, 1
 jeurissen.co, 1
 jeuxerotiques.net, 1
 jeuxetcodes.fr, 1
@@ -47491,8 +50155,10 @@
 jewellerymarvels.com, 0
 jewelleryoutlook.com, 1
 jewelleryrack.com, 1
+jewelry-directories.tk, 1
 jewish.ee, 1
 jewishboyscouts.com, 1
+jewishinseattle.org, 1
 jewishquotations.com, 1
 jexler.net, 1
 jez.nl, 1
@@ -47504,6 +50170,7 @@
 jf-projects.de, 0
 jf886.cc, 1
 jfbst.net, 1
+jfcare.dk, 1
 jfgselbitztal.tk, 1
 jfhr.de, 1
 jfjtransport.com, 1
@@ -47533,6 +50200,7 @@
 jhof.jp, 1
 jhollandtranslations.com, 1
 jhoncampos.com, 1
+jhonesmarcos.tk, 1
 jhonmurillo.ml, 1
 jhost.gq, 1
 jhuang.me, 1
@@ -47542,6 +50210,7 @@
 jiahao.codes, 1
 jialinwu.com, 1
 jian.spb.ru, 1
+jiangmei.ml, 1
 jiangmen.tk, 1
 jiangshiart.com, 1
 jiangsu30019.com, 1
@@ -47583,6 +50252,7 @@
 jikarentalcar.com, 1
 jikegu.com, 1
 jilin30019.com, 1
+jilworldwide.org, 1
 jimautoservice.pl, 1
 jimbiproducts.com, 1
 jimbutlerkiaparts.com, 1
@@ -47602,6 +50272,8 @@
 jimshaver.net, 1
 jimsheatandcool.com, 1
 jimslop.nl, 1
+jimwoodrealty.com, 1
+jimwoodrealty.help, 1
 jinancy.fr, 1
 jinanshen.com, 1
 jinbijin.nl, 1
@@ -47610,6 +50282,8 @@
 jinduoduo369.com, 1
 jinduoduo666.com, 1
 jinduoduo888.com, 1
+jing-in.com, 1
+jing-in.net, 1
 jing.su, 1
 jingbo.fan, 1
 jingjo.com.au, 1
@@ -47620,9 +50294,8 @@
 jino-jossy.appspot.com, 1
 jino.gq, 1
 jinshuju.net, 1
-jinybeh.cz, 1
 jiogo.com, 1
-jirav.com, 1
+jiotvdth.com, 1
 jiretvariedades.com, 1
 jiripik.com, 1
 jisai.net.cn, 1
@@ -47631,7 +50304,6 @@
 jitprod.com, 1
 jitterbit.com, 1
 jittruckparts.com, 1
-jivanplastics.com, 1
 jiweadventure.com, 1
 jix.im, 1
 jixun.eu, 1
@@ -47644,6 +50316,7 @@
 jj30019.com, 1
 jj5197.co, 1
 jj6729.co, 1
+jj6729.com, 1
 jj6957.co, 1
 jj9297.co, 1
 jj9397.com, 1
@@ -47657,7 +50330,6 @@
 jjvanoorschot.nl, 1
 jk-entertainment.biz, 1
 jk-rjevka.gq, 1
-jka.io, 1
 jkbfabrics.com, 1
 jkbizsolutions.org, 1
 jkdhn.me, 1
@@ -47684,6 +50356,7 @@
 jldrenergysaver.com, 1
 jlink.nl, 1
 jlkhosting.com, 1
+jlmunn.com, 1
 jloh.co, 1
 jloh.codes, 1
 jlot.org, 1
@@ -47699,7 +50372,9 @@
 jmb.lc, 1
 jmbeautystudio.se, 1
 jmbmexico.com, 1
+jmbproject.ga, 1
 jmcashngold.com.au, 1
+jmcataffo.com, 1
 jmce.eu, 1
 jmcleaning.services, 1
 jmdekker.it, 1
@@ -47720,6 +50395,8 @@
 jmsjms.me, 1
 jmsjms.org, 1
 jmsjms.xyz, 1
+jmsmarcelo.tk, 1
+jmsole.cl, 1
 jmsolodesigns.com, 1
 jmssg.jp, 1
 jmstfv.com, 1
@@ -47729,21 +50406,20 @@
 jmzo.nl, 1
 jn1.me, 1
 jncie.eu, 1
-jndl.fr, 1
 jnjdj.com, 1
 jnm-art.com, 1
 jnordell.com, 1
 jnshome.com, 1
 jnssnfotografie.nl, 1
 jnsz.hu, 1
+jo3-w3b-d3v.com, 1
 joa-ebert.com, 1
 joanjensen.net, 1
-joannajankowska.pl, 1
 joanofarcmtcarmel.org, 1
+joansoy.com, 1
 joaoaugusto.net, 0
 joaobautista.com, 1
 joaojunior.com, 1
-joaopenteado.com, 1
 joaosampaio.com.br, 1
 job-chocolat.jp, 1
 job-uber.com, 1
@@ -47763,6 +50439,7 @@
 jobcorpsy2y.com, 1
 jobfresh.ga, 1
 jobfury.com, 1
+jobgenic.com, 1
 jobhouse.jp, 1
 jobify.in, 1
 jobig.co.il, 1
@@ -47774,7 +50451,9 @@
 joblife.co.za, 1
 jobmi.com, 1
 jobmiplayground.com, 1
+jobrus.ga, 1
 jobrus.ml, 1
+jobs-it.tk, 1
 jobs.at, 1
 jobs.ch, 1
 jobs.schwarz, 1
@@ -47786,6 +50465,7 @@
 jobsjj.com, 1
 jobskilled.co.za, 1
 jobsnet.eu, 1
+jobsocity.com, 1
 jobsoid.com, 1
 jobsportalbookmarking.tk, 1
 jobsuchmaschine.ch, 1
@@ -47799,9 +50479,6 @@
 jocata.com, 1
 jocelynjenkins.com, 1
 jochem.pro, 0
-jockbusuttil.co.uk, 1
-jockbusuttil.com, 1
-jockbusuttil.uk, 1
 jodaniels.photography, 1
 jodbush.com, 1
 jodlajodla.si, 1
@@ -47852,6 +50529,7 @@
 joeysmith.com, 1
 joeyvanvenrooij.nl, 1
 joeyvilaro.com, 1
+jofel-kinderkleding.tk, 1
 jogi-server.de, 1
 jogjacar.com, 1
 jogorama.com.br, 0
@@ -47881,6 +50559,7 @@
 johnberan.com, 1
 johnblackbourn.com, 1
 johnblackwell.net, 1
+johnblotsky.tk, 1
 johncam.tk, 1
 johncook.co.uk, 1
 johncook.ltd.uk, 1
@@ -47897,6 +50576,7 @@
 johngreatwood.com, 1
 johnguant.com, 1
 johnhgaunt.com, 1
+johninwood.com, 1
 johnjayro.com, 1
 johnkastler.net, 1
 johnkraal.com, 1
@@ -47905,12 +50585,13 @@
 johnmcc.net, 1
 johnmcintosh.pro, 1
 johnmichel.org, 1
+johnmillerdesign.com, 1
 johnno.be, 1
 johnnybegood.tk, 1
 johnnybet.com, 1
 johnnybetstaging.com, 1
 johnnybsecure.com, 1
-johnnywan.net, 1
+johnnydoe.tk, 1
 johnopdenakker.com, 1
 johnroach.io, 1
 johnroberts.me, 1
@@ -47921,6 +50602,7 @@
 johnsongenealogy.net, 1
 johnsonho.net, 1
 johnsonran.cn, 1
+johnstrad.com, 1
 johntomasowa.com, 1
 johnvanhese.nl, 1
 johnwinter.tk, 1
@@ -47939,11 +50621,12 @@
 jojo.sg, 1
 jojosplaycentreandcafeteria.co.uk, 1
 jokedalderup.nl, 1
-jokequebec.com, 1
+jokersro.tk, 1
 jokertv.ovh, 1
 jokesbykids.com, 1
 jokewignand.nl, 1
-jolee.ro, 1
+joksara.tk, 1
+joky.io, 1
 jolette-hernandez.tk, 1
 joletteperu.tk, 1
 jolfamarket.com, 1
@@ -47964,6 +50647,7 @@
 jon8rfc.homeip.net, 1
 jonahburke.com, 1
 jonahperez.com, 1
+jonahtheprophet.tk, 1
 jonale.net, 1
 jonandnoraswedding.com, 1
 jonas-thelemann.de, 1
@@ -47990,6 +50674,7 @@
 jonathanrobichaud.gq, 1
 jonathansanchez.pro, 1
 jonathanselea.se, 1
+jonathantaylorthomas.tk, 1
 jonathanwisdom.com, 1
 jonathonkimmel.com, 1
 jonbarron.cf, 1
@@ -48038,6 +50723,7 @@
 joomla-leipzig.com, 1
 joomlaclub.ch, 1
 joomladeveloper.ru, 1
+joomlaguru.pl, 1
 joomlon.com, 0
 joompress.biz, 1
 joona.pw, 1
@@ -48054,7 +50740,7 @@
 jordan-jungk.de, 1
 jordandevelopment.com, 1
 jordandirections.com, 1
-jordanhamilton.me, 0
+jordanhamilton.me, 1
 jordankmportal.com, 1
 jordanp.engineer, 1
 jordanprice.ml, 1
@@ -48080,6 +50766,7 @@
 jornalaquidf.com.br, 1
 jorritstollman.com, 0
 jorsev.com, 1
+jos-verstappen-fan.tk, 1
 josc.com.au, 1
 joscares.com, 1
 jose-alexand.re, 1
@@ -48095,25 +50782,27 @@
 josefottosson.se, 1
 josefranca.pt, 0
 josejimenezgonzalez.es, 1
+josemortellaro.com, 1
 josepbel.com, 1
 josephalexander.media, 1
 josephbarela.com, 1
-josephcz.win, 1
-josephcz.xyz, 1
+josephcz.win, 0
+josephcz.xyz, 0
 josephgeorge.com.au, 1
 josephmarino.net, 1
 josephpinder.com, 1
-josephquinaucho.com, 1
 josephrichard.com, 1
 josephsniderman.com, 1
 josephsniderman.net, 1
 josephsniderman.org, 1
 josephv.website, 1
+josephziegler.com, 1
 josericaurte.com, 1
 joshdiamant.com, 1
 joshfoley.co.uk, 1
 joshgilson.com, 1
 joshgrancell.com, 1
+joshgroban.tk, 1
 joshharkema.com, 1
 joshharmon.me, 1
 joshhoffer.com, 1
@@ -48142,6 +50831,7 @@
 josien.net, 1
 josmith.co.za, 1
 josoansi.de, 1
+jossandmain.com, 1
 jotes-creations.de, 1
 joubinkhorsandmd.com, 1
 jouetspetitechanson.com, 1
@@ -48151,6 +50841,7 @@
 journaldufumeur.ch, 1
 journales.com, 1
 journalism-schools.com, 1
+journaliste.tk, 1
 journalof.tech, 0
 journeedesfilles.gc.ca, 1
 journeyfriday.rocks, 1
@@ -48163,6 +50854,7 @@
 joustsec.ca, 1
 joustsec.com, 1
 joustsecurity.com, 1
+jouwbuis.nl, 1
 jouwpaardenbak.nl, 1
 jouwtechnischecoach.nl, 1
 jovani.com, 0
@@ -48174,6 +50866,7 @@
 joy-ride.yokohama, 1
 joyacorp.com, 1
 joychetry.com, 1
+joydivision.tk, 1
 joyful.house, 1
 joyfulevents.tk, 1
 joyfulexpressions.gallery, 1
@@ -48238,6 +50931,7 @@
 jrfortune.com, 1
 jrjuristen.nl, 1
 jrlopezoficial.com, 1
+jrock.tk, 1
 jrock.us, 1
 jross.me, 1
 jrstehlik.com, 1
@@ -48270,9 +50964,11 @@
 jsg.hk, 1
 jsh918.com, 1
 jsheekeyatlanticbar.co.uk, 1
+jshub.com, 1
 jsidefox.de, 1
 jsjfact.com, 1
 jsjohnsononline.com, 1
+jsjs.net, 1
 jsk26.ru, 1
 jskarzin.org, 0
 jskier.com, 0
@@ -48287,8 +50983,10 @@
 jsteward.moe, 1
 jstore.ch, 1
 jsvr.tk, 0
+jswc.de, 1
 jswebbdevelopment.com, 1
 jsxc.ch, 1
+jt-evolution.tk, 1
 jtcat.com, 1
 jtconsultancy.sg, 1
 jtg-inc.com, 1
@@ -48354,6 +51052,7 @@
 jukovka.tk, 1
 juku-wing.jp, 1
 jule-spil.dk, 1
+julenetxaniz.eus, 1
 julenlanda.com, 0
 julesroovers.nl, 1
 julestern.com, 1
@@ -48368,6 +51067,7 @@
 julianickel.de, 1
 julianmeyer.de, 1
 juliannorton.com, 1
+julianporras.com, 1
 juliansimioni.com, 1
 julianskitchen.ch, 0
 julianvmodesto.com, 1
@@ -48444,8 +51144,7 @@
 jungleducks.ca, 0
 junglejackscastles.co.uk, 1
 junglememories.co.uk, 1
-junglevet.fr, 1
-jungleviewresort.com, 0
+junglevet.fr, 0
 jungleworks.com, 1
 junglist.org, 1
 jungschuetzen.tk, 1
@@ -48466,7 +51165,6 @@
 junodownload.com, 1
 junomessenger.cf, 1
 junshinkai.ed.jp, 1
-junta.pl, 1
 juntosfmc.com.br, 1
 juozasveza.lt, 1
 jupiterchiropractic.com, 1
@@ -48487,17 +51185,20 @@
 jurnalilmiah.com, 1
 jurojin.net, 1
 jurposluga.tk, 1
+jurquestion.tk, 1
 jurriaan.ninja, 1
 jusfitness.com.au, 1
 just-a-clanpage.de, 1
 just-bees.de, 1
 just-heberg.fr, 1
 just-keep-swimming.tk, 1
+just-muh.de, 1
 just-pools.co.za, 1
 just-vet-and-drive.fr, 1
 just-webdesign-berlin.de, 1
 just2trade.com, 1
 just3preety.com, 1
+just6f.com, 1
 justacoupleofclarkes.co.uk, 1
 justanothercompany.name, 1
 justanotherday.tk, 1
@@ -48508,8 +51209,10 @@
 justcalm.tk, 1
 justchunks.net, 1
 justeducationonline.com, 1
+justfoodfordogs.com, 1
 justforschools.co.uk, 1
 justforsunn.com, 1
+justfresh.com, 1
 justgalak.com, 1
 justgalak.org, 1
 justgamblers.com, 1
@@ -48523,6 +51226,7 @@
 justinfreid.com, 1
 justinharrison.ca, 1
 justinho.com, 1
+justinmanders.nl, 1
 justinsinkula.com, 1
 justinstandring.com, 1
 justknigi.gq, 1
@@ -48535,6 +51239,7 @@
 justninja.com, 1
 justnu.se, 0
 justonce.net, 1
+justor.ru, 1
 justpaste.it, 1
 justpdf.cf, 1
 justpractice.ca, 1
@@ -48559,7 +51264,6 @@
 juventusmania1897.com, 1
 juwelierstoopman.nl, 1
 juweliervanwillegen.nl, 1
-juxin08.com, 1
 jvanerp.nl, 1
 jvbouncycastlehire.co.uk, 1
 jvdham.nl, 1
@@ -48589,13 +51293,13 @@
 jwmmarketing.com, 1
 jwod.gov, 1
 jwolt-lx.com, 1
-jwompa.com, 1
 jwplay.ml, 1
 jwpoore.com, 1
 jwr.me, 1
 jwschuepfheim.ch, 1
 jwz.org, 1
 jxcad.com.cn, 1
+jxdsp.com, 1
 jxir.de, 1
 jxltom.com, 1
 jxm.in, 1
@@ -48616,6 +51320,7 @@
 k-bone.com, 1
 k-homes.net, 1
 k-jtan.ca, 1
+k-labs.be, 1
 k-linkcarecenter.com, 1
 k-matsudaclinic.com, 1
 k-netz.de, 1
@@ -48634,10 +51339,10 @@
 k234234.com, 1
 k258059.net, 1
 k2mts.org, 1
-k2s-efficience.com, 1
 k30365.com, 1
 k3508.com, 1
 k36533.com, 1
+k38.cc, 1
 k3nny.fr, 1
 k3t.net, 1
 k4law.com, 1
@@ -48651,6 +51356,7 @@
 k666.ag, 1
 k6666.ag, 1
 k6729.co, 1
+k6729.com, 1
 k6957.co, 1
 k6957.com, 1
 k7azx.com, 1
@@ -48705,19 +51411,8 @@
 k86855.com, 1
 k86869.com, 1
 k869.co, 1
-k86913.com, 1
-k86914.com, 1
-k86915.com, 1
-k86916.com, 1
-k86917.com, 1
 k86918.com, 1
-k86920.com, 1
 k86921.com, 1
-k86924.com, 1
-k86925.com, 1
-k86926.com, 1
-k86927.com, 1
-k86928.com, 1
 k86929.com, 1
 k86930.com, 1
 k86966.com, 1
@@ -48759,7 +51454,6 @@
 k87183.com, 1
 k87210.com, 1
 k873.co, 1
-k873.com, 1
 k875.co, 1
 k87777.com, 1
 k8804.com, 1
@@ -48850,6 +51544,7 @@
 kaagsebc.nl, 1
 kaamoscreations.com, 1
 kaanhaa.com, 1
+kaaniche.xyz, 1
 kaany.io, 1
 kaas.wtf, 1
 kaasbesteld.nl, 1
@@ -48858,6 +51553,7 @@
 kab-s.de, 1
 kabachok.tk, 1
 kabal-invasion.com, 1
+kabal.tk, 1
 kabardinka.ga, 1
 kabardino-balkariya.ml, 1
 kabarlinux.id, 1
@@ -48893,18 +51589,23 @@
 kadenba.ch, 1
 kadeshfoundation.org, 1
 kadet.net.ru, 1
+kadett-c-club-limburg.tk, 1
+kadhal-kirukkan.tk, 1
 kadhambam.in, 1
 kado-ya.jp, 1
+kadolis.com, 1
 kadooonline.ir, 1
 kadro.com.pl, 1
 kadvi.tk, 1
 kadykchanskiy.ml, 1
 kaeme.com, 1
+kaesehagen.nl, 1
 kafeh-jazan.com, 1
 kafel-ufa.tk, 1
 kaffad.site, 1
 kaffeepflanze-pflege.de, 1
 kaffeeringe.de, 1
+kaffeklubben.tk, 1
 kafoom.de, 1
 kagawa-net.org, 1
 kagelmacher.ch, 1
@@ -48913,6 +51614,7 @@
 kagitreklam.com, 1
 kagomesashi.tk, 1
 kagucho.net, 1
+kagutech.com, 1
 kahane.org, 1
 kahootkings.works, 1
 kai-ratzeburg.de, 1
@@ -48937,6 +51639,7 @@
 kaioken.bar, 1
 kairion.de, 0
 kais08.com, 1
+kaiseraerospace.tk, 1
 kaisev.net, 1
 kaishi009.com, 1
 kaishi05.com, 1
@@ -48961,7 +51664,11 @@
 kajamaakool.ee, 1
 kajirakuda.com, 1
 kajlovo.cz, 1
+kak-pishetsa.ru, 1
 kak-pohudet-legko.ml, 1
+kak-prygotovyt.ru, 1
+kak-sarabotatj.ru, 1
+kak-sdelatj.ru, 1
 kaka.farm, 1
 kakacon.nz, 1
 kakao-karten.de, 1
@@ -48989,6 +51696,7 @@
 kakvzyatzaim.cf, 1
 kakvzyatzaim.gq, 1
 kakvzyatzaim.tk, 1
+kaladarb.com, 1
 kalafard.com, 1
 kalakarclub.com, 1
 kalambur.gq, 1
@@ -48999,7 +51707,6 @@
 kalashnikov.ml, 1
 kalaskvintetten.tk, 1
 kalastus.com, 1
-kaleidlink.com, 1
 kaleidomarketing.com, 0
 kaleidoscope.co.uk, 1
 kalek.eu, 1
@@ -49014,10 +51721,12 @@
 kaliaa.fi, 1
 kalian.cz, 1
 kaliboairport.tk, 1
+kaliforniya.tk, 1
 kalilinux.tech, 1
 kalina.ml, 1
 kaliningrad.gq, 1
 kaliningrad.ml, 1
+kalinka-shop.tk, 1
 kaliocommerce.com, 1
 kalisch.eu, 1
 kalk-shop.nl, 1
@@ -49039,6 +51748,7 @@
 kalsbouncies.com, 1
 kaltenbrunner.it, 1
 kalterersee.ch, 1
+kaltoft.net, 1
 kaluga.cf, 1
 kaluga.gq, 1
 kalugadeti.ru, 1
@@ -49049,6 +51759,8 @@
 kalyazin-online.tk, 1
 kam-serwis.pl, 1
 kamalame.co, 1
+kamandula.tk, 1
+kamareddine.tk, 1
 kamasutra-training.gq, 1
 kamata-saisyuusyou.com, 1
 kamata-shinkyu-seikotsu.jp, 1
@@ -49065,15 +51777,19 @@
 kamikatse.net, 1
 kamildrozd.tk, 1
 kamilla.ml, 1
+kamilmagdziak.pl, 1
 kamin-island.ru, 1
 kaminastudios.com, 1
 kaminbau-laub.de, 1
 kaminoke.info, 1
 kaminoweb.com, 1
+kaminy-msk.ru, 1
 kamisato-ent.com, 1
 kamitech.ch, 1
 kamixa.se, 1
 kamiyo.tk, 1
+kamp-kisten.nl, 1
+kampffische.tk, 1
 kamppailusali.fi, 1
 kampunginggris-ue.com, 1
 kamranmirhazar.com, 1
@@ -49090,15 +51806,16 @@
 kanalasal.id, 1
 kanapa.gq, 1
 kanar.nl, 1
+kanatsuki.tk, 1
 kancolle.me, 1
 kanctovary.tk, 1
 kandalife.com, 1
+kandelaberi.tk, 1
 kandhamal.org, 1
 kandianshang.com, 1
 kandofu.com, 1
 kandra.com.br, 1
 kandrahechiceravudu.com, 1
-kandwliquor.com, 1
 kanecastles.com, 1
 kanehusky.com, 0
 kanetix.ca, 1
@@ -49114,10 +51831,11 @@
 kangkai.me, 1
 kangkang.net, 1
 kangkang.org, 1
-kangutingo.com, 0
+kangoeroeteam.tk, 1
 kangzaber.com, 1
 kanis.ag, 1
 kanis.me, 1
+kanitha.sk, 1
 kanivatonga.nz, 1
 kanker.nl, 1
 kankerpannekoek.nl, 1
@@ -49152,13 +51870,16 @@
 kapilarya.com, 1
 kapiorr.duckdns.org, 1
 kapital-kredit.cf, 1
+kapitalsprung.com, 1
+kapitany.tk, 1
+kapiteintje.tk, 1
 kaplan.se, 1
 kaplanco.com, 1
-kaplatzis.com, 1
 kapler.family, 0
 kapparhokappa.tk, 1
 kappawingman.com, 1
 kappenstein.org, 0
+kappershuis-meppel.nl, 1
 kappharn.com, 1
 kappit.dk, 1
 kapri.dn.ua, 1
@@ -49166,6 +51887,7 @@
 kapsalonlinds.nl, 1
 kapseli.net, 1
 kaptadata.com, 1
+kapulakennel.tk, 1
 kapusta.if.ua, 1
 kaputt.com, 0
 kaputtendorf.tk, 1
@@ -49176,6 +51898,7 @@
 karabah.tk, 1
 karabas.com, 1
 karabijnhaken.nl, 0
+karabukhaber.tk, 1
 karachay.tk, 1
 karachi.dating, 1
 karalane.com, 1
@@ -49198,13 +51921,15 @@
 karateka.org, 1
 karateka.ru, 1
 karatekit.co.uk, 1
+karatepunkslaroca.tk, 1
 karatesamurai.tk, 1
 karawane.tk, 1
-karawanken-tunnel.de, 1
 karbox.de, 1
 kardize24.pl, 1
 kardjali.bg, 1
 kareenaworld.tk, 1
+karel-dingeldey.de, 1
+karel-it.be, 1
 karelia.cf, 1
 karelia.ga, 1
 karelia.ml, 1
@@ -49218,6 +51943,7 @@
 kargas.cf, 1
 karger.com, 1
 kargl.net, 1
+kargosuben.com, 1
 karguine.in, 1
 karhukamera.com, 1
 karimova.tk, 1
@@ -49246,7 +51972,9 @@
 karmalighting.com, 1
 karmaspa.se, 1
 karmatrend.cf, 1
+karmelava.tk, 1
 karn.nu, 1
+karnage.eu, 1
 karneid.info, 1
 karniz.ml, 1
 karo.pc.pl, 1
@@ -49257,23 +51985,28 @@
 karoverwaltung.de, 1
 karpanhellas.com, 0
 karpat.space, 1
+karpets.gq, 1
+karpo.tk, 1
 karr.ga, 1
 karramba.tk, 1
 karriharju.tk, 1
 karrot.world, 1
 karsofsystems.com, 1
 karsten-voigt.de, 1
+karstjewellery.co.uk, 1
 karstransport.tk, 1
 karta-baikala.ml, 1
 karta-paliwowa.pl, 1
 kartacha.com, 1
 kartar.net, 0
-kartatopia.com, 1
 kartbird.com, 1
 kartec.com, 1
 karten-verlag.de, 1
+kartenmarie.de, 1
+kartenplanet.ch, 1
 kartikmohta.com, 1
 karting-normandie.fr, 1
+kartoffel-stampfer.com, 1
 kartoffel-tobi.de, 1
 kartonki.tk, 1
 kartonmodellbau.org, 1
@@ -49285,6 +52018,7 @@
 karupp-did.net, 1
 kas.ie, 1
 kasasaprotect.com, 1
+kasaysayan.tk, 1
 kaseban.com, 1
 kasei.im, 1
 kasemsantaec.com, 1
@@ -49309,8 +52043,8 @@
 kaskodev.com, 1
 kaskojs.com, 1
 kaskoqa.com, 1
-kasnoffskinclinic.com, 1
 kasparovru.tk, 1
+kasper-team.tk, 1
 kasperstad.dk, 1
 kassa.com, 1
 kassa.expert, 1
@@ -49325,6 +52059,7 @@
 kat.marketing, 1
 kat4at.tk, 1
 kataiszilveszter.hu, 1
+katalog-parfyum.tk, 1
 katalog-serverov.ga, 1
 katalog-tovarov.tk, 1
 katalogbajugamismu.com, 1
@@ -49334,6 +52069,7 @@
 katan-stroi.tk, 1
 katapult-impuls.com, 1
 katapult.es, 1
+katapult.tk, 1
 katarsisuib.no, 1
 katazuketai.net, 1
 kate-beckinsale.tk, 1
@@ -49344,7 +52080,6 @@
 katenka.tk, 1
 katericke.com, 1
 katerinastudio.com, 1
-katerinaverbovskaya.com, 0
 kateryan.tk, 1
 kateryantv.tk, 1
 katewrightmba.com, 1
@@ -49356,6 +52091,7 @@
 kathleendeisher.com, 1
 kathmandupost.com, 1
 kathrin-maren-enders.de, 1
+kathrynbernardo.tk, 1
 kathy.best, 1
 kathy.lgbt, 1
 kathy.link, 1
@@ -49386,6 +52122,7 @@
 kattelans.eu, 1
 katushka.cf, 1
 katushka.ga, 1
+katycomputer.com, 1
 katyl.info, 0
 katyusha.net, 1
 katzei.fr, 1
@@ -49399,12 +52136,16 @@
 kauperwood.ovh, 1
 kausta.me, 1
 kaustubhalandkar.com, 1
+kavalasite.gr, 1
 kavatasygarety.tk, 1
 kaverti.com, 0
 kavik.no, 1
 kavin.rocks, 1
+kavithai.tk, 1
+kavkaz-info.tk, 1
 kavkaz.cf, 1
 kavovary-kava.cz, 1
+kawabeest.tk, 1
 kawaii-dollies.tk, 1
 kawaii.su, 1
 kawaiicon.org, 1
@@ -49414,6 +52155,8 @@
 kawamura-inc.jp, 1
 kay.la, 1
 kay.moe, 1
+kayakcastro.tk, 1
+kayakpolouniversidades.tk, 1
 kayant-server.space, 1
 kaydan.io, 1
 kayit.co.uk, 1
@@ -49424,6 +52167,7 @@
 kaypasocks.com, 1
 kayscs.com, 1
 kaysis.gov.tr, 1
+kaysvillechurch.com, 1
 kazakov.lt, 1
 kazan-tury.ml, 1
 kazanasolutions.de, 1
@@ -49449,6 +52193,7 @@
 kb0606.com, 1
 kb0707.com, 1
 kb096.com, 1
+kb10uy.org, 1
 kb1313.com, 1
 kb1515.com, 1
 kb2121.com, 1
@@ -49505,6 +52250,7 @@
 kbsinflatablekingdom.co.uk, 1
 kbst.se, 1
 kbterapicenter.se, 1
+kbz.fr, 1
 kc-holzfaeller.de, 1
 kc1hbk.com, 1
 kc3.moe, 1
@@ -49520,6 +52266,7 @@
 kcshipping.co.uk, 1
 kcsonline.biz, 1
 kcsordparticipation.org, 1
+kcsprayfoam.com, 1
 kd.net.nz, 1
 kdcinfo.com, 1
 kdcp.pw, 1
@@ -49540,6 +52287,7 @@
 kebabbesteld.nl, 1
 kebabbruce.com, 0
 kebhanamyanmar.com, 1
+kebidanan.id, 1
 kebo.xyz, 1
 kecht.at, 1
 kedarastudios.com, 1
@@ -49552,6 +52300,7 @@
 kee.pm, 1
 keechain.io, 1
 keeckee.ml, 1
+keekmix.nl, 1
 keeley.net, 1
 keeleysam.com, 1
 keelove.net, 1
@@ -49565,6 +52314,7 @@
 keeperklan.com, 0
 keepersecurity.com, 1
 keepingitheel.com, 1
+keepingitsimpleblog.com, 1
 keepingtheplot.co.uk, 1
 keepiteasy.eu, 1
 keepitsecure24.com, 1
@@ -49572,6 +52322,8 @@
 keepitweedy.com, 1
 keepleft.gr, 1
 keepsight.org.au, 1
+keepwatchprayer.org, 1
+keesmartens.tk, 1
 keesslop.nl, 1
 keestalkstech.com, 1
 keevault.pm, 1
@@ -49588,12 +52340,16 @@
 keilycosmetics.com, 1
 kein-design.de, 1
 kein-fidget-spinner-werden.de, 1
+kein-vergessen.tk, 1
 keinanung.nl, 1
 keinefilterblase.de, 1
+keinnerd.net, 1
+keiralewis.co.uk, 1
 keisaku.org, 1
 keisepulveda.com, 1
 keishiando.com, 1
 keisinger.name, 1
+keith.pro, 1
 keithazzopardi.tk, 1
 keithcwood.com, 1
 keithlomax.com, 1
@@ -49609,18 +52365,33 @@
 kekz.org, 1
 kela.jp, 1
 kelamanproduction.tk, 1
+kelantan.tk, 1
 kelantanmudah.com, 0
+kelastrade.co, 1
+kelax.tk, 1
 keldan.fo, 1
+kelder.tk, 1
 kelgtermans-usedcars.be, 0
 kelheor.space, 1
+kelinda.tk, 1
 kelis.fr, 1
 keller-aarau.ch, 1
 keller-sports.at, 1
 keller-sports.be, 1
+keller-sports.ch, 1
+keller-sports.co.uk, 1
+keller-sports.com, 1
+keller-sports.de, 1
+keller-sports.dk, 1
 keller-sports.es, 1
 keller-sports.fr, 1
 keller-sports.it, 1
+keller-sports.nl, 1
+keller-sports.se, 1
 keller-x.at, 1
+keller-x.ch, 1
+keller-x.com, 1
+keller-x.de, 1
 keller-x.fr, 1
 keller-x.nl, 1
 keller-x.se, 1
@@ -49639,8 +52410,8 @@
 kelmarsafety.com, 1
 kelsa.io, 0
 kelsall39.com, 1
+kelvinchung.tk, 1
 kelvinfichter.com, 0
-kemand.com, 1
 kemerovo.gq, 1
 kemerovo.ml, 1
 kemerovo.tk, 1
@@ -49661,6 +52432,7 @@
 kenbonny.net, 1
 kendermore.it, 1
 kendernet.com, 1
+kendle.tk, 1
 kendrick.tk, 1
 kendu.si, 0
 kengilmour.com, 0
@@ -49690,6 +52462,7 @@
 kens.pics, 1
 kensbouncycastles.co.uk, 1
 kenscustomfloors.com, 1
+kensparkesphotography.com, 1
 kentdalevets.co.uk, 1
 kentec.net, 0
 kenterlis.gr, 1
@@ -49698,6 +52471,7 @@
 kenx5.eu.org, 1
 kenyattaachinkle1.com, 1
 kenyons.info, 1
+kenzelmann.name, 1
 keops-spine.fr, 1
 keops-spine.us, 1
 kepkonyvtar.hu, 1
@@ -49729,7 +52503,6 @@
 kerstkaart.nl, 1
 kersvers.agency, 1
 kertis.tk, 1
-keru.su, 1
 kerus.net, 1
 kescher.at, 1
 kescher.site, 1
@@ -49739,7 +52512,7 @@
 keshankang.com, 1
 keshausconsulting.com, 1
 keskeces.com, 1
-keskikorpimotorsport.fi, 1
+keskikorpimotorsport.fi, 0
 kessawear.com, 1
 kessel-runners.com, 1
 kesslerandsons.com, 1
@@ -49749,11 +52522,13 @@
 ketemulagi.com, 1
 ketgioisu.tk, 1
 ketoconazole.gq, 1
+ketoliv.dk, 1
 ketopower.club, 1
 kett.email, 1
 kettinggeleider.be, 1
 kettlebellkrusher.com, 1
 kettlemetalbbq.com, 1
+kettmail.com, 1
 kettner.com, 1
 ketty-voyance.com, 0
 keutel.net, 1
@@ -49762,6 +52537,7 @@
 kevchia.com, 1
 kevertje.net, 1
 kevhosting.com, 1
+kevin-emo.com, 1
 kevin-ta.com, 1
 kevin.tw, 1
 kevinapease.com, 1
@@ -49809,6 +52585,7 @@
 keyhomechecker.com, 1
 keyihao.cn, 1
 keyinfo.io, 1
+keykong.io, 1
 keylaserinstitute.com, 1
 keylength.com, 1
 keymaster.lookout.com, 0
@@ -49829,13 +52606,12 @@
 keywebdesign.nl, 1
 keyworth-meadow.tk, 1
 keyyek.com, 0
+kezmanweb.tk, 1
 kf-59.com, 1
 kf-slot.com, 1
 kf005.com, 1
 kf020.com, 1
-kf0606g.com, 1
 kf068.com, 1
-kf0909g.com, 1
 kf099.com, 1
 kf1288.com, 1
 kf196.com, 1
@@ -49851,7 +52627,6 @@
 kf848.com, 1
 kf8686.com, 1
 kf88666.com, 1
-kf8896.com, 1
 kf8897.com, 1
 kf8954.com, 1
 kf8955.com, 1
@@ -49860,11 +52635,13 @@
 kf908.com, 1
 kf909.com, 1
 kfassessment.eu, 1
+kfbl.cc, 1
 kffs.ru, 1
 kfirba.me, 1
 kfispiff.com, 1
 kfkf999.com, 1
 kfm.ink, 1
+kfmhf.ca, 1
 kfo.com.br, 1
 kforesund.se, 1
 kfoundation.org, 1
@@ -49875,6 +52652,7 @@
 kfz.nl, 1
 kfzjeugd.nl, 1
 kg7.pl, 1
+kga-rathaustreptow.de, 1
 kgcarpetandupholsterycleaning.com, 1
 kgky.cc, 1
 kgm-irm.be, 1
@@ -49897,25 +52675,25 @@
 khalidalnajjar.com, 1
 khalidmail.tk, 1
 khalti.com, 1
+khanacademy.org, 1
+khankandi.tk, 1
 khanovaskola.cz, 1
 khaotipthai.se, 1
 kharatinoil.ml, 1
 kharkiv.tk, 1
 kharkov.tk, 1
 khas.co.uk, 1
-khazarvila.com, 1
 khedmatazma.com, 1
 kheshtar.pl, 1
 khetmaal.com, 1
 khetzal.info, 1
-kheyrabady.com, 1
 khg-orchester.de, 1
+khimaira.com, 1
 khimno.com, 1
 khipu.com, 1
 khmb.ru, 0
 khmerlive.cf, 1
 khmrynok.com.ua, 1
-khohangmadeinvietnam.com, 1
 khojhealth.com, 1
 khokey.com, 1
 khorne.me, 1
@@ -49930,6 +52708,7 @@
 khudothiswanpark.vn, 1
 khukhrain.tk, 1
 khushiandjoel.com, 1
+khwezifinancialservices.co.za, 1
 ki-management.ch, 1
 kiadoapartman.hu, 1
 kiahalchemy.com, 1
@@ -49943,10 +52722,11 @@
 kibersalon.com, 1
 kibibit.net, 1
 kibickas.lt, 1
+kibizoid.tk, 1
 kibriscicek.net, 1
+kibrisdoktor.com, 1
 kicirdekorasyon.com, 1
 kick-in.nl, 1
-kickassblogger.com, 1
 kickasscanadians.ca, 1
 kickedmycat.com, 1
 kickex.com, 1
@@ -49958,9 +52738,11 @@
 kidbacker.com, 1
 kiddieschristian.academy, 1
 kiddyboom.ua, 1
+kidify.co.uk, 1
 kidneydonation.com, 1
 kido-dc.jp, 1
 kidonng.me, 1
+kids-at-home.ch, 1
 kids-castles.com, 1
 kids-ok.com, 1
 kids-world.dk, 1
@@ -49979,6 +52761,7 @@
 kidsphysiotherapy.co.uk, 1
 kidsplay-plymouth.co.uk, 1
 kidsplaybouncycastles.co.uk, 1
+kidswithguns.tk, 1
 kidtoyshop.ru, 1
 kidzpartiesllp.co.uk, 1
 kidzsmile.co.uk, 1
@@ -49997,14 +52780,15 @@
 kieran.ie, 1
 kieranjones.uk, 1
 kieranweightman.me, 1
+kierweb.co.uk, 1
 kieskundig.nl, 1
 kiesmedia.com, 1
 kiesuwarbeidsrechtadvocaat.nl, 1
 kiesuwkerstkaart.nl, 1
 kietblog.tk, 1
 kiev-live.tk, 1
-kievantico.com, 1
 kievkiralikotel.com, 1
+kievlove.tk, 1
 kiffmarks.com, 1
 kifid.nl, 1
 kigurumi-party.ru, 1
@@ -50025,12 +52809,14 @@
 kilkimzaibu.tk, 1
 kill.trade, 1
 killaraapartments.com.au, 1
+killborn.tk, 1
 killdeer.com, 0
 killedbynlp.com, 1
 killerkink.net, 1
 killerpixel.me, 1
 killerrobots.com, 1
 killerwebsites.com.au, 1
+killharmonic.tk, 1
 killme.rocks, 1
 killmebaby.ml, 1
 killmenow.tk, 1
@@ -50043,6 +52829,7 @@
 kimamass.com, 1
 kimbal.co.uk, 1
 kimberleythomson.tk, 1
+kimdotcom.tk, 1
 kimdumaine.com, 1
 kimiadaro.ir, 1
 kimicar.de, 1
@@ -50068,6 +52855,7 @@
 kinanbudotenero.tk, 1
 kinautas.com, 1
 kindbear.pl, 1
+kinder-garten.tk, 1
 kinderarzt-berlin-zia.de, 1
 kinderbasar-luhe.de, 1
 kinderchor-bayreuth.de, 1
@@ -50090,6 +52878,7 @@
 kine-duthil.fr, 1
 kine.co.il, 1
 kinepolis-studio.ga, 1
+kinesiologie.tk, 1
 kinesiologikerteminde.dk, 1
 kinesiologiodense.dk, 1
 kinesiologiskolen-syd.dk, 1
@@ -50112,6 +52901,7 @@
 kingfast.cc, 1
 kingfast.eu.org, 1
 kingfin.com, 1
+kingfirmware.com, 0
 kingforex.co, 1
 kingiescastles.co.uk, 1
 kingjamesbibleonline.org, 1
@@ -50133,6 +52923,7 @@
 kingsgateseptic.com, 1
 kingsley.cc, 1
 kingsofkauffman.com, 1
+kingsol.hu, 1
 kingsound.tk, 1
 kingspalacepainting.com, 1
 kingstake.network, 1
@@ -50147,6 +52938,7 @@
 kinkenonline.com, 1
 kinkily.se, 1
 kinklist.me, 1
+kinksecrets.ga, 1
 kinkyhookup.com, 1
 kinmunity.com, 1
 kinnikinnick.com, 0
@@ -50157,7 +52949,6 @@
 kino.ma, 1
 kinobag.tk, 1
 kinobarashka.ga, 1
-kinocheck.de, 1
 kinodrom.kiev.ua, 1
 kinodrom.tk, 1
 kinofest.tk, 1
@@ -50171,15 +52962,14 @@
 kinolex.ml, 1
 kinology.tk, 1
 kinomagia.cf, 1
+kinomaniac.tk, 1
 kinomoto.ovh, 0
-kinos.nl, 1
 kinoscope.tk, 1
 kinoserver.ml, 1
 kinosha.tk, 1
 kinoshki.ga, 1
 kinothek.at, 1
 kinovsem.ml, 1
-kinozal-tv.appspot.com, 1
 kinozone.tk, 1
 kinschots.eu, 1
 kinsei.jp, 1
@@ -50200,10 +52990,12 @@
 kiousis.me, 1
 kip-ribbetjes-bestellen.be, 1
 kipa.at, 1
+kipcrepair.com, 1
 kipiradio.com, 1
 kiplelive.com, 1
 kippenbart.gq, 1
 kipriakipita.gr, 1
+kiprinform.com, 1
 kipsu.com, 1
 kipwells32.com, 1
 kiraboshi.xyz, 1
@@ -50211,6 +53003,7 @@
 kirainmoe.com, 1
 kiraku.co, 1
 kirbear.com, 1
+kirby.eu.org, 1
 kirche-sankt-augustin.de, 1
 kirchen-im-web.de, 0
 kirchenchor-olzheim.de, 1
@@ -50218,6 +53011,7 @@
 kircp.com, 1
 kirei.se, 1
 kirgistan.tk, 1
+kirie-photos.tk, 1
 kirig.ph, 1
 kirikira.moe, 1
 kirillaristov.com, 1
@@ -50234,6 +53028,8 @@
 kirkovsky.com, 1
 kirkwood-smith.com, 1
 kirkwoodfence.com, 1
+kirkwoodfencing.com, 1
+kirkwoodoutdoors.com, 1
 kiro-ku.com, 1
 kiropraktorvard.se, 1
 kirov.ml, 1
@@ -50246,8 +53042,8 @@
 kirslis.com, 1
 kirstenbos.ca, 1
 kirstin-peters.de, 1
+kirstygreenwoodartist.ga, 1
 kirwandigital.com, 1
-kisallatorvos.hu, 1
 kisaragihayato.com, 1
 kiseimarriage.com, 1
 kiseki.xyz, 1
@@ -50259,6 +53055,7 @@
 kismy.tk, 1
 kismyder.tk, 1
 kisser.name, 1
+kissesb.com, 1
 kissesb.net, 1
 kissgyms.com, 1
 kissimmee.gov, 1
@@ -50278,7 +53075,6 @@
 kitabnamabayi.com, 1
 kitacoffee.com, 1
 kitagawa-internal-medicine-clinic.com, 1
-kitaplus.de, 0
 kitchenlove.tk, 1
 kitchenpad.biz, 1
 kitchenpad.co.uk, 1
@@ -50291,7 +53087,9 @@
 kitchenware.tk, 1
 kitchenwarestore.xyz, 1
 kite-surf.tk, 1
+kite-surfen.tk, 1
 kiteadventure.nl, 1
+kiteboard-selbstbau.tk, 1
 kitebowl.ru, 1
 kiteschoolamsterdam.nl, 1
 kiteschooledam.nl, 1
@@ -50303,6 +53101,7 @@
 kiteschoolzandvoort.nl, 1
 kitevalley.tk, 1
 kitke.de, 1
+kits-graphiques-shop.tk, 1
 kits-graphiques.tk, 1
 kitsapsolutions.com, 1
 kitscan.com, 1
@@ -50310,13 +53109,13 @@
 kitsquid.de, 1
 kitsuna.eu, 1
 kitten-advice-forum.cf, 1
-kittmedia.com, 0
 kittpress.com, 0
 kittyhacker101.tk, 0
 kittymagician.com, 1
 kivitelezesbiztositas.hu, 1
 kiwee.eu, 1
 kiweeagentur.de, 1
+kiwetech.com, 1
 kiwi-bird.xyz, 1
 kiwi-pics.nz, 0
 kiwi.com, 1
@@ -50329,7 +53128,6 @@
 kiwiflowershop.com.ua, 1
 kiwing.ddns.net, 1
 kiwipayment.com, 1
-kiwipayments.com, 1
 kiwiplace.com, 1
 kiwistreamer.co.nz, 1
 kiwitastic.com, 1
@@ -50364,6 +53162,7 @@
 kk5197.co, 1
 kk575757.com, 1
 kk6729.co, 1
+kk6729.com, 1
 kk6957.co, 1
 kk9297.co, 1
 kk9721.com, 1
@@ -50373,7 +53172,6 @@
 kkc.com, 1
 kkcinemas.in, 1
 kkcsc.co.jp, 1
-kkeun.net, 1
 kki.org, 1
 kkicreative.com, 1
 kkk0011.com, 0
@@ -50388,16 +53186,17 @@
 kkk204.com, 0
 kkk208.com, 0
 kkk209.com, 0
+kknapredak-rubin.tk, 1
 kkovacs.eu, 1
 kkr-bridal.net, 1
 kkren.me, 0
 kks-karlstadt.de, 0
 kks.ch, 1
-kksg.com, 1
+kksg.com, 0
 kkull.tv, 1
 kkutu.us, 0
 kkws.co, 1
-kkyy.me, 1
+kkyy.me, 0
 kkzxak47.com, 1
 kl008888.com, 1
 klabnik.cz, 1
@@ -50408,11 +53207,12 @@
 klanggut.at, 1
 klankenkast.nl, 1
 klapib.ee, 1
-klappgeschichten.de, 1
 klapty.com, 1
 klares-licht.de, 1
 klarika.com, 1
 klarmobil-empfehlen.de, 1
+klassenlos.tk, 1
+klassiekballet.tk, 1
 klassika.tk, 1
 klaudialeszczynska.pl, 1
 klauke-enterprises.com, 1
@@ -50425,13 +53225,14 @@
 klaxon.me, 1
 klaxon.ml, 1
 kle.cz, 1
+klea.tk, 1
 kleaning.by, 1
 kleankonshiens.com, 1
 klebeband.eu, 1
 kleberstoff.xyz, 1
 klebetape.de, 1
 kleebauerhof.com, 1
-kleidermarkt-vintage.de, 1
+kleen.tk, 1
 kleidertauschpartys.de, 1
 kleim.fr, 1
 kleinblogje.nl, 0
@@ -50461,16 +53262,21 @@
 klempin.network, 1
 klempin.se, 1
 klen.ua, 1
+klenc.eu, 1
 kleor.com, 1
 kleppe.co, 1
 kleteckova.cz, 1
+kleurbkennen.nl, 1
 klev.su, 1
+klever.com.mk, 1
+kleverltd.ru, 1
 kli.is, 1
 klickinvite.com, 1
 klickstdu.com, 1
 kliemann.me, 1
 klikacc.com, 0
 kliki.tk, 1
+kliklinks.tk, 1
 klikmanga.com, 1
 klikmarket.tk, 1
 klil.co.il, 1
@@ -50479,7 +53285,6 @@
 klimaloven.no, 1
 klimapartner.de, 1
 klimapartner.net, 1
-klimmzugstange-fitness.de, 1
 klingeletest.de, 1
 klingenundmesser.com, 1
 klinik-fuer-aesthetische-zahnheilkunde.de, 1
@@ -50494,12 +53299,14 @@
 klitmoeller.de, 1
 klitmoeller.dk, 1
 kliu.io, 1
+klj-beveren.tk, 1
+klj-walshoutem.tk, 1
 klm-huisjes.nl, 1
 klmgewinnspiel.de, 1
 klmhouses.com, 1
 klocast.com, 1
 klocker-ausserlechner.com, 1
-klocksnack.se, 0
+klocksnack.se, 1
 kloclabs.com, 1
 klogeschichten.net, 1
 kloia.com, 1
@@ -50528,6 +53335,7 @@
 kmkz.jp, 1
 kmrgroup.com, 1
 kms60.fr, 1
+kmsk.tk, 1
 kmtechnology.com, 1
 kmzs123.cn, 1
 kn007.net, 1
@@ -50542,6 +53350,7 @@
 knapp.pro, 1
 knapp.servehttp.com, 1
 knarcraft.net, 1
+knarkkorven.tk, 1
 knautiluz.net, 0
 kncg.pw, 1
 kndrd.io, 1
@@ -50565,6 +53374,7 @@
 knightsbr1dge.red, 0
 knightsbridge.net, 1
 knightsbridgewine.com, 1
+knightsofcolumbus867.com, 1
 knightsweep.com, 1
 knighulki.cf, 1
 knigi-free.cf, 1
@@ -50575,16 +53385,20 @@
 knip.ch, 1
 knispel-online.de, 1
 knitfarious.com, 1
+knitted-hats.tk, 1
 knitting.cz, 1
 kniwweler.com, 1
+knize.tech, 1
 knjazevac.tk, 1
 knjizevic.at, 1
 knmv.nl, 1
 knnet.ch, 1
+knobboutheftrucks.nl, 1
 knoji.com, 1
 knop.info, 0
 knorrnet.de, 1
 knovator.com, 1
+know.cf, 1
 knowarth.com, 1
 knowit-now.com, 1
 knowledge-base.info, 1
@@ -50630,9 +53444,11 @@
 kochcommunity.com, 1
 kocherev.org, 1
 kochereva.com, 1
+kocheshkov.cf, 1
 kochhar.net, 1
 kochinke.com, 1
 kochinke.us, 1
+kochura.tk, 1
 kocka.cf, 1
 kocka.tech, 1
 kockanakocko.si, 1
@@ -50642,12 +53458,14 @@
 kodama-dorayaki.co.jp, 1
 kodamail.com, 1
 kodden.com.br, 1
+koddsson.com, 1
 kode-it.de, 1
 kode.ch, 0
 kodexplorer.ml, 1
 kodifirestick.info, 1
 kodify.net, 1
 kodikom.de, 1
+kodineuerleben.eu, 0
 kodioso.com, 1
 kodkollen.com, 1
 kodkollen.se, 1
@@ -50683,6 +53501,7 @@
 koetjesenkanker.nl, 1
 koez-mangal.ch, 1
 koffie-enzo.com, 1
+koffiekoeken.tk, 1
 kofler.info, 1
 kogak.ninja, 1
 kogax.com, 1
@@ -50692,6 +53511,7 @@
 kogro.de, 1
 kogudesi.com, 1
 kohaku.love, 1
+kohlchan.net, 1
 kohlistkool.tk, 1
 kohoutsautomotive.com, 1
 kohparadise.com, 1
@@ -50724,10 +53544,13 @@
 kokomu.com, 1
 kokona.ch, 1
 kokoro-singsong.com, 1
-kokosnusswasser.de, 1
+kokoroheart.cf, 1
 kokotaru.com, 1
+kokteili.tk, 1
 kokumoto.com, 1
 kokyu-caba.com, 1
+kolaci.tech, 1
+kolaczek.cz, 1
 koladeogunleye.com, 1
 kolakweb.com, 1
 kolania.com, 1
@@ -50760,11 +53583,11 @@
 kolorwell.tk, 1
 kolpingsfamilie-vechta-maria-frieden.de, 1
 kolrami.com, 1
-koltiva.com, 1
 koltsov.email, 1
 koluke.co, 1
 koluke.com, 1
 kolyapetrov.tk, 1
+kom.pe, 1
 komall.net, 1
 komarh.tk, 1
 komehyo.co.jp, 1
@@ -50794,45 +53617,54 @@
 kommx.de, 1
 komoju.com, 1
 komok.co.uk, 1
+komp-plus.tk, 1
 komp247.pl, 1
+kompaniya-vasya.tk, 1
 kompetenzkurs.de, 1
-kompjoeter.net, 1
 komplekt.gq, 1
+komplektmarket.ru, 1
 komplet.sk, 1
 komplexlysimple.com, 1
+komputer-net.tk, 1
 komputersat.pl, 1
+komun.me, 1
 kon-sil.de, 1
 konaqua.com, 1
 konarentals.net, 1
 konata.tech, 1
+konbantsan.com.tr, 1
 koncertbooking.com, 1
 kondi.net, 1
-kondomshop.org, 1
 kondou-butsudan.com, 1
 konducars.nl, 1
 konf.ga, 1
 konfekcjonowanie.com, 1
 konflikte-als-chance.de, 1
 konflikthaus.de, 1
+konfliktklaerer.de, 1
 kong.ink, 1
 kongar.org, 1
 kongress-hostessen.de, 1
 konicaprinterdriver.com, 0
 koniecfica.sk, 0
+konijnen-knaagdieren.tk, 1
 konijntjes.nl, 1
 konings.it, 0
 koningskwartiertje.nl, 1
+koningslust.tk, 1
 koninkrijk.net, 1
+konjunktion.tk, 1
 konkai.store, 1
 konklone.com, 1
 konkurs.ba, 1
-konkursita.ru, 0
+konkursita.ru, 1
 konnai.jp, 1
 konoe.studio, 0
 kononenko.ml, 1
 konosuke.jp, 1
 konpyuta.nl, 1
 konsertoversikt.no, 1
+konservy.tk, 1
 konst.se, 1
 konstanz.tk, 1
 konstructdigital.com, 1
@@ -50843,6 +53675,7 @@
 konsultaciya-astrologa.gq, 1
 konsultaciya-astrologa.ml, 1
 konsultaciya-astrologa.tk, 1
+kontabilitet.tk, 1
 kontantfinans.se, 1
 kontaxis.org, 1
 kontenido.net, 1
@@ -50855,13 +53688,15 @@
 kontrapolis.info, 1
 kontrastonline.tk, 1
 kontrolapovinnosti.cz, 1
+kontum.in, 1
 kontur-buhta.ru, 1
 kontur-extern.ru, 1
 kontur.tk, 1
 konturconference.ru, 1
-konuhaber.com, 1
+konuhaber.com, 0
 konut-projeleri.com, 1
 konventa.net, 1
+konyahaber.tk, 1
 konyalian.com, 1
 konyvbazar.ro, 1
 konzepttreu.de, 1
@@ -50885,14 +53720,18 @@
 koolisw.tk, 1
 koolitee.ee, 1
 kooliveeb.ee, 1
+koolkool.tk, 1
+koomaldreaming.com.au, 1
 koood13.com, 1
 koop-bremen.de, 1
 kooplokaal.gent, 1
 kooponline.eu, 1
+kooratalk.ga, 1
 koot.nl, 1
 kooxdiving.com, 1
 koozal.de, 1
 kopany.tk, 1
+kopb.tk, 1
 kopeechka.ml, 1
 koperek.pl, 1
 kopeyka.cf, 1
@@ -50929,6 +53768,7 @@
 koreaninhd.com, 1
 koreanpearls.tk, 1
 koreanrandom.com, 1
+koreanure.tk, 1
 koredia.com, 1
 korespondent.tk, 1
 koretech.nl, 1
@@ -50951,6 +53791,7 @@
 kortgebyr.dk, 1
 kortic.com, 1
 korund.tk, 1
+korusautos.com, 1
 koryfi.com, 1
 kos4all.com, 1
 kos9078.com, 1
@@ -50979,6 +53820,7 @@
 kostroma.tk, 1
 kosturanov.com, 1
 kostya.ws, 1
+kostyumi.tk, 1
 kosuzu.moe, 1
 kotaartsklan.com, 1
 kotaev.tk, 1
@@ -50986,6 +53828,7 @@
 kotakoo.id, 1
 kotaku.com, 1
 kotaraanglican.org.au, 1
+kotatgent.be, 1
 kotausaha.com, 1
 koten-bu.com, 1
 kother.org, 1
@@ -50997,14 +53840,17 @@
 kotmale.com, 1
 kotobox.net, 1
 kotois.com, 1
+kotoishihear.tk, 1
 kotomei.moe, 1
 kotonozaka.xyz, 1
 kotoopros.tk, 1
 kotori.love, 1
+kotori.style, 1
 kotorimusic.ga, 1
 kottbulle.net, 1
 kottur.is, 1
 kotuwa.tk, 1
+koujo-soukohonpo.com, 1
 kouki-food.com, 1
 koumakan.cc, 1
 koumuwin.com, 1
@@ -51019,6 +53865,7 @@
 kovered.net, 1
 kovnsk.net, 1
 kovspace.com, 1
+kovu.es, 1
 kovuthehusky.com, 1
 kowalmik.tk, 1
 kowalski7cc.xyz, 1
@@ -51026,7 +53873,7 @@
 kowarschick.de, 1
 kowshiksundararajan.com, 1
 koyaanis.com, 0
-koylusemra.com, 1
+koyaanisqatsi.tk, 1
 koyo.kr, 1
 kozackibazar.pl, 1
 kozak.cloud, 1
@@ -51034,7 +53881,6 @@
 kozentic.com, 1
 kozlekedes.info, 1
 kozlov.cf, 1
-kozossegireklamozas.hu, 1
 kozuch.biz, 1
 kp-walsh.com, 1
 kp0808.cc, 1
@@ -51046,11 +53892,11 @@
 kplnet.net, 1
 kpmgclientcollab.co.nz, 1
 kpntdolive.nl, 1
-kpnthings.com, 1
 kpop.events, 1
 kpop.re, 1
 kpopsource.com, 1
 kprem.com, 1
+kprf-school74.tk, 1
 kpumuk.info, 1
 kpvpn.com, 1
 kpx1.de, 1
@@ -51060,7 +53906,6 @@
 krabathor.tk, 1
 krachtinverbinding.nl, 1
 kradalby.no, 1
-kraeuterland.de, 1
 kraft.blog, 1
 kraft.im, 1
 kraftek.cf, 1
@@ -51085,6 +53930,7 @@
 kralovstvimap.cz, 1
 kram.nz, 1
 krambeutel.de, 1
+kramersworld.tk, 1
 kramsj.uk, 1
 kran.ga, 1
 krang.org.uk, 1
@@ -51094,6 +53940,7 @@
 kranservice-alzey.tk, 1
 krasa.tk, 1
 krasavchik.by, 1
+krasivye-foto.ru, 1
 kraski.tk, 1
 krasnaya-nit.ga, 1
 krasnodar-pravoved.ru, 1
@@ -51111,7 +53958,6 @@
 krautomat.com, 1
 kravmagaangers.fr, 1
 kraynik.com, 1
-krayx.com, 1
 krazy.net.au, 1
 krazykastles.co.uk, 1
 krazykoolkastles.com, 1
@@ -51126,10 +53972,11 @@
 kreativoweb.tk, 1
 kreativstrecke.de, 1
 kreatywni.co, 1
+krechka.ru, 1
 kredigram.com, 1
 kredit-abzocke.com, 1
+kredit24.de, 1
 kredita.dk, 1
-kreditkacs.cz, 1
 kreditkarten-forum.de, 1
 kreditkoll.nu, 1
 kreditonline.ml, 1
@@ -51140,8 +53987,8 @@
 kredytzen.pl, 1
 kreen.org, 1
 krehak.com, 1
-krehl.io, 1
 kreidl.org, 1
+kreidlernet.tk, 1
 kremalicious.com, 1
 kreno.tech, 1
 krenstetter.at, 1
@@ -51157,6 +54004,7 @@
 kreyolgym.fr, 1
 kreza.de, 1
 krezimizik.com, 1
+kridtvejsplanter.dk, 1
 kriechel.de, 1
 kriegskindernothilfe.de, 1
 krikorianconstruction.com, 1
@@ -51193,6 +54041,7 @@
 kristenpaigejohnson.com, 1
 kristiehill.com, 1
 kristikala.nl, 1
+kristina-lari.ru, 1
 kristinbailey.com, 1
 kristineskitchenblog.com, 1
 kristjanrang.eu, 0
@@ -51211,6 +54060,8 @@
 kroell.net, 1
 krok.gq, 1
 krokedil.se, 1
+kroliczki.tk, 1
+kroll.tk, 1
 kromamoveis.com.br, 1
 kromax.it, 1
 kromciri.gq, 1
@@ -51220,6 +54071,7 @@
 kronopolo.com, 1
 kronos-crm.com, 1
 kronos-web.com, 1
+kronosproject.tk, 1
 kronych.cz, 1
 kroon.email, 1
 kropkait.pl, 1
@@ -51227,17 +54079,19 @@
 krossakorven.tk, 1
 krouzkyliduska.cz, 0
 krovatka.tk, 1
+krozilla.tk, 1
 krsaustralia.com.au, 1
 krsn.de, 1
 krsvrs.nl, 1
 krti.com.ua, 1
 krubik.tk, 1
+kruemels-kleine-kinderwuensche.de, 1
 krug-munroe.wedding, 1
+krugermillions.org, 1
 krugernationalpark.org.za, 1
 krugersdorpplumber24-7.co.za, 1
 kruin.net, 1
 kruk.co, 1
-krukhmer.com, 1
 krumberconsulting.com, 1
 krumpf.de, 1
 kruno.ooo, 1
@@ -51257,6 +54111,7 @@
 kryptera.se, 1
 kryptix.eu, 1
 kryptix.net, 1
+kryptlock.com, 1
 krypto-geld.eu, 1
 kryptoforce.com, 1
 kryptologie.tk, 1
@@ -51265,6 +54120,7 @@
 kryptux.xyz, 1
 kryshodel.ml, 1
 krystal-framework.ml, 1
+krystalrsimpson.com, 1
 krytykawszystkiego.com, 1
 krytykawszystkiego.pl, 1
 kryx.de, 1
@@ -51412,8 +54268,6 @@
 ks8836.com, 1
 ks8851.com, 1
 ks8862.com, 1
-ks8881.com, 1
-ks8882.com, 1
 ks8883.com, 1
 ks8886.com, 1
 ks89.net, 1
@@ -51440,10 +54294,12 @@
 ksenomorf.tk, 1
 ksero.center, 1
 ksero.wroclaw.pl, 1
+kserownia.eu, 1
 ksham.net, 1
 ksk-raduga.tk, 1
 ksm.co.in, 1
 ksoc.com, 1
+ksoftware.tk, 1
 ksopp.si, 1
 ksp-spb.com, 1
 ksradio.it, 1
@@ -51471,6 +54327,7 @@
 ktmclubitalia.it, 1
 kts-thueringen.de, 1
 ktsee.eu.org, 1
+ktstreams.live, 1
 ktube.yt, 1
 ktuluweb.tk, 1
 ktw.lv, 0
@@ -51499,6 +54356,7 @@
 kubota.com.au, 1
 kubotagear.com.au, 1
 kubotapower.com.au, 1
+kubrick.tk, 1
 kubusadvocaten.nl, 1
 kuchen-am-stiel.de, 1
 kucingmania.net, 1
@@ -51506,6 +54364,7 @@
 kucnibudzet.com, 1
 kucukayvaz.com, 0
 kucukkaymakli.tk, 1
+kuda-poexatj.ru, 1
 kudinilam.tk, 1
 kuditel.net, 1
 kudoran.tk, 1
@@ -51535,6 +54394,7 @@
 kulde.net, 1
 kuliahbahasainggris.com, 1
 kuliahpendidikan.com, 1
+kulinarika.net, 1
 kulinaristi.fi, 1
 kulinariya.tk, 1
 kulivps.com, 1
@@ -51546,15 +54406,14 @@
 kultur1.se, 1
 kulturistika.tk, 1
 kulturmel.ch, 1
-kuma.es, 1
 kumachan.biz, 1
 kumalog.com, 1
 kumaraguruparan.tk, 1
 kumasanda.jp, 1
 kumilasvegas.com, 1
 kumpulannamabayi.com, 1
-kunaldesai.blog, 1
 kunashir.tk, 1
+kunden-webseite.de, 1
 kundenerreichen.com, 1
 kundenerreichen.de, 1
 kundenvertrag.de, 1
@@ -51575,16 +54434,16 @@
 kupibilet.ru, 1
 kupiclub.com, 1
 kupid.com, 1
-kupidom2.com, 1
 kupiewszystkieauta.pl, 1
+kupil.ru, 1
 kupimlot.ru, 1
 kupinska.pl, 1
 kupipled.cf, 1
 kupislivki.tk, 1
+kupitnedorogo.com, 1
 kupleno.com, 1
 kuponmail.tk, 1
 kuponydoher.cz, 1
-kupriy-coach.ru, 1
 kupschke.net, 1
 kupsluzbu.cz, 1
 kupu.maori.nz, 1
@@ -51593,6 +54452,7 @@
 kurashinohinto.com, 1
 kurd-online.tk, 1
 kurd-yogurt.tk, 1
+kurdigrafya.com, 1
 kurdishphotography.tk, 1
 kurenivka.tk, 1
 kuretru.com, 1
@@ -51604,6 +54464,7 @@
 kurierwilenski.lt, 1
 kurirplus.tk, 1
 kurition.eu, 1
+kuritsa.tk, 1
 kurniadwin.to, 1
 kurniasihmandiri.com, 1
 kurofuku.me, 1
@@ -51626,7 +54487,6 @@
 kurtschlatzer.com, 0
 kurungkurawal.id, 1
 kuruppa.xyz, 1
-kusasa.biz, 1
 kuscheln.com, 1
 kuschku.de, 1
 kuscu.de, 1
@@ -51635,10 +54495,13 @@
 kushfest.net, 1
 kushner-cpa.co.il, 0
 kushtikidsparties.co.uk, 1
+kushwanthreddy.com, 1
 kusochi.eu, 1
+kustarnik.tk, 1
 kustod.io, 1
 kustom-kitchens.com, 1
 kustosija.tk, 1
+kutaisi.it, 1
 kutalek.cz, 1
 kutamo.com, 1
 kutekeiki.com, 1
@@ -51659,13 +54522,17 @@
 kuzmiks.com, 1
 kuznica.tk, 1
 kuzov-plus.tk, 1
+kv-genebos.tk, 1
 kvadratnimeter.si, 1
 kvadru.cz, 1
 kvalitetsaktiepodden.se, 1
 kvalitnitesneni.cz, 1
-kvantel.no, 1
+kvarta.tk, 1
+kvartira-grad.tk, 1
+kvartiragrad.tk, 1
 kvateka.ru, 1
 kvcc.com.au, 1
+kvdekolk.tk, 1
 kvest-v-moskve.ga, 1
 kvestiks.ru, 1
 kvetinymilt.cz, 1
@@ -51683,6 +54550,7 @@
 kvt.berlin, 0
 kw.gt, 1
 kwadraadtevredenheid.nl, 1
+kwartel.online, 1
 kwat.chat, 1
 kwbresidential.com, 1
 kwcolville.com, 1
@@ -51709,16 +54577,13 @@
 kyj322.com, 1
 kyj33.com, 1
 kyj35.com, 1
-kyj355.com, 1
 kyj36.com, 1
 kyj369.com, 1
 kyj377.com, 1
-kyj39.com, 1
 kyj4.com, 1
 kyj44.com, 1
 kyj511.com, 1
 kyj522.com, 1
-kyj533.com, 1
 kyj544.com, 1
 kyj55.com, 1
 kyj56.com, 1
@@ -51735,6 +54600,7 @@
 kyj67.com, 1
 kyj677.com, 1
 kyj76.com, 1
+kylby.com, 1
 kyle-s.com, 1
 kyle.place, 1
 kylebaldw.in, 0
@@ -51754,6 +54620,7 @@
 kyn.be, 1
 kynaston.org.uk, 1
 kynastonwedding.co.uk, 1
+kynd.com.au, 1
 kyobostory-events.com, 1
 kyochon.fr, 1
 kyoko.org, 1
@@ -51763,12 +54630,14 @@
 kyoto-tomoshibi.jp, 1
 kyotokitsune.com, 1
 kyprexxo.com, 1
+kypride.com, 1
 kyras-castles.co.uk, 1
 kyrgizion.tk, 1
 kyriakidisship.gr, 1
 kyrylych.tk, 1
 kys.host, 1
 kysil.org, 1
+kysounds.com, 1
 kysseo.fr, 1
 kyujin-office.net, 1
 kyunyuki.com, 1
@@ -51781,10 +54650,12 @@
 kzsdabas.hu, 1
 l-atelier-c.com, 1
 l-lab.org, 1
+l-poya.ch, 1
 l0re.com, 1
 l10n.site, 1
 l17r.eu, 1
 l18.io, 1
+l2.ai, 1
 l214.com, 1
 l2guru.ru, 1
 l2l.vn, 1
@@ -51793,6 +54664,7 @@
 l3.ee, 1
 l30019.com, 1
 l30365.com, 1
+l33te.net, 1
 l36533.com, 1
 l3j.net, 1
 l4s.me, 1
@@ -51800,6 +54672,7 @@
 l5197.co, 1
 l66.io, 1
 l6729.co, 1
+l6729.com, 1
 l6957.co, 1
 l7plumbing.com.au, 1
 l7world.com, 1
@@ -51822,10 +54695,11 @@
 la-manufacture-du-nettoyage.com, 1
 la-paco.tk, 1
 la-tourmaline.ch, 1
+la-verite.tk, 1
+la-ville-aux-dames-auto-ecole.com, 1
 la-vraie-histoire.fr, 1
 laab.gv.at, 1
 laac.io, 1
-laan247.dk, 1
 laanius.dk, 1
 laarroceriacolombiana.com, 1
 laassari.me, 0
@@ -51849,7 +54723,6 @@
 label-octopus.org, 1
 labeled.vn, 1
 labelfactory.nl, 1
-labequipvn.com, 1
 labiblioafronebrulepas.com, 0
 labirint.cf, 1
 lablic-beta.work, 1
@@ -51857,9 +54730,9 @@
 labms.com.au, 1
 labobooks.com, 1
 laboiteanem.fr, 1
-laboiteare.fr, 1
 laboiteasous.com, 1
 laboratoriodemarketingb3.com, 1
+laborriquita.tk, 1
 labortogether.com, 1
 labouncycastlehire.co.uk, 1
 labourreedevergheas.fr, 1
@@ -51868,19 +54741,25 @@
 laboutiquemarocaineduconvoyeur.ma, 1
 laboxfaitsoncinema.com, 1
 labrat.mobi, 0
+labroma.tk, 1
+labs-is.com, 1
 labs.ro, 1
+labsender.com, 1
 labsitserviss.lv, 1
-labspack.com, 1
 labsys.xyz, 1
-labtechsupplyco.com, 1
 labtest.ltd, 1
+labussola.site, 1
 labworks.com, 0
 labworks.org, 1
 laby.link, 1
 laby.me, 1
+labyrinth-technologies.com, 1
 lacaey.se, 1
+lacalderera.tk, 1
+lacallas.tk, 1
 lacantine.xyz, 1
 lacarna.com, 1
+lacarniceria.tk, 1
 lacasa.fr, 1
 lacasadelmaniqui.net, 1
 lacasadelours.fr, 1
@@ -51889,6 +54768,7 @@
 lacatta.com, 1
 lacatta.es, 1
 lacaveducinquantenaire.com, 1
+lacazadora.tk, 1
 laceleste.it, 1
 lacentral.com, 0
 lacetsfun.com, 1
@@ -51916,6 +54796,7 @@
 lacocinadelila.com, 1
 lacoquette.gr, 1
 lacoste.net, 1
+lacuerba.com, 1
 lacuna-vermoegen.de, 1
 lacyc3.eu, 1
 lad-china.com, 0
@@ -51929,11 +54810,15 @@
 ladbroke.net, 0
 ladeboks.dk, 1
 ladedu.com, 1
+ladelicateparenthese.com, 1
 ladenzeile.at, 1
 ladenzeile.de, 1
+ladies-shoes.tk, 1
+ladiescode.tk, 1
 ladiesofvietnam.net, 1
 ladiesrapide.tk, 1
 ladige.it, 1
+ladisko.tk, 1
 ladislavbrezovnik.com, 1
 lado.ltd, 1
 lado.site, 1
@@ -51944,20 +54829,25 @@
 ladotech.com, 1
 ladraiglaan.com, 1
 ladrilleraeldiamante.co, 1
+ladrones.tk, 1
+lady-blog.ga, 1
 lady-len.com, 1
 lady-wishlist.my.id, 1
 ladyanna.de, 1
 ladybugjam.com, 1
+ladyjanitor.com, 1
 ladyklub.ru, 1
 ladyleeshome.com, 1
 ladylikeit.com, 1
 ladymakeup.com.ua, 1
 ladymakeup.eu, 1
+ladymakeup.ru, 1
 ladymayonline.tk, 1
 ladyofhopeparish.org, 1
 ladyofsongstv.com, 1
 ladysecrets.cf, 1
 ladysecrets.ga, 1
+ladytron.tk, 1
 ladywishlist.my.id, 1
 laembajadamexico.com, 1
 laemen.com, 0
@@ -51965,9 +54855,9 @@
 laemiliafutbol.tk, 1
 laencina.tk, 1
 laermschmiede.de, 1
-laeryn.com, 1
 laesisvefurinn.is, 1
 laextra.mx, 1
+lafamiliallc.com, 1
 lafansite.tk, 1
 lafayette-rushford.com, 1
 lafayetteco.gov, 1
@@ -51977,26 +54867,32 @@
 lafillepolyvalente.ca, 1
 lafillepolyvalente.com, 1
 lafka.org, 1
+laflanelle.fr, 1
 laflash.com, 1
 lafr4nc3.xyz, 1
 lafsc.co.uk, 1
 lafyne.eu, 1
+lag-fan.tk, 1
 lag-gbr.gq, 1
 lagaia.com.br, 1
 lagaleria-ag.com, 1
+lagavach.com, 1
 lagazzettadigitale.it, 1
+lagendijk.org, 1
 lagerauftrag.info, 1
 lagier.xyz, 1
 laginghanda.gov.ph, 1
 lagit.in, 1
 laglab.org, 0
 lagloriadehuampani.com, 1
+lagodny.eu, 1
 lagoonrealty.com, 1
 lagout.org, 1
 lagracia.com.br, 1
 lagrange.cloud, 1
 lagranmasade.info, 1
 lagriffeduservice.fr, 1
+lagriot.com, 1
 lagrotta.pizza, 1
 lagsoftware.com, 1
 laguiadelocioenuruguay.com, 1
@@ -52009,6 +54905,7 @@
 laharilais.fr, 1
 lahipotesisgaia.com, 1
 lahirusblog.tk, 1
+lahmer.ma, 1
 lahora.com.ec, 1
 lai.is, 1
 lai.zone, 1
@@ -52058,12 +54955,14 @@
 lakewoodcomputerservices.com, 1
 lakewylietax.com, 1
 lakichat.fi, 1
+lakiernictwo.auto.pl, 1
 lakkt.de, 1
 lakonia.com.br, 1
-lakorntoday.com, 1
 lakorona.tk, 1
+lalagunachalate.tk, 1
 lalalab.com, 1
 lalaloe.be, 1
+lalaserniagara.ca, 1
 lalaya.fr, 1
 laled.ch, 0
 lalegria.tk, 1
@@ -52071,7 +54970,6 @@
 lallybroch.com.au, 1
 lalucepulsata.it, 1
 lalucioledigitale.com, 1
-lalunaonlinebr.com, 1
 lalyre-corcelles.ch, 0
 lamafioso.com, 1
 lamai-crochets.fr, 1
@@ -52079,6 +54977,9 @@
 lamakat.de, 1
 lamalapalabra.tk, 1
 lamaletarural.es, 1
+lamaline.tk, 1
+lamalleauxsaveurs-aubigny.com, 1
+lamanufacturedebaches.fr, 1
 lamapoll.de, 1
 lamargheritalruoto.it, 1
 lamarieealhonneur.com, 0
@@ -52101,6 +55002,7 @@
 laminine.info, 1
 laminsaho.tk, 1
 lamiradaacr.com, 1
+lamisionband.tk, 1
 lammersmarketing.com, 1
 lammertbies.com, 1
 lammertbies.nl, 1
@@ -52122,19 +55024,20 @@
 lampenwelt.ch, 1
 lampenwelt.de, 1
 lamper-design.nl, 1
-lampiaoluz.com.br, 1
 lampl.info, 0
 lampposthomeschool.com, 1
 lamppostpublishing.com, 1
 lampsh.ml, 1
 lampy.pl, 1
 lamujerquesoy.com, 0
+lan-der.de, 1
 lan-der.net, 1
 lan-divy.com, 1
 lan-divy.fr, 1
 lan.biz.tr, 1
 lan4.life, 1
 lana.swedbank.se, 1
+lanaengel.com, 1
 lanahallen.com, 1
 lanasomething.com, 1
 lanbroa.eu, 1
@@ -52146,6 +55049,7 @@
 lancemanion.com, 1
 lancers.jp, 1
 lanceyip.com, 1
+lanchong.tk, 1
 lancork.net, 1
 lancyvbc.ch, 0
 land.nrw, 0
@@ -52188,6 +55092,7 @@
 landscaping-montreal.com, 1
 landscaping.gq, 1
 landsforsale.co.il, 1
+landslide.tk, 1
 landware.cf, 1
 landyhome-register.com, 1
 landyparts.nl, 1
@@ -52219,9 +55124,11 @@
 lanhhuyet510.tk, 1
 lanierlaw.com, 1
 lankana.tk, 1
+lankarkivet.tk, 1
 lanna.io, 1
 lannainnovation.com, 1
 lannamontessori.com, 1
+lannatefl.com, 1
 lanny.ga, 1
 lanodan.eu, 1
 lanostrasalute.it, 1
@@ -52235,6 +55142,7 @@
 lansing.ninja, 1
 lansink.it, 1
 lansoftware.eu, 1
+lantern.digital, 1
 lanternalauth.com, 1
 lanternhealth.org, 1
 lanthanum.me, 1
@@ -52242,21 +55150,21 @@
 lanturtle.com, 1
 lanuovariviera.it, 1
 lanyang.tk, 1
+lanyards.com.au, 1
 lanzalex.com, 1
 lanzamientovirtual.es, 1
 lanziego.com, 1
 laobayy.com, 1
 laodongkynghi.info, 1
+laolaweb.tk, 1
 laoliang.ml, 1
 laoriginalfm.com, 1
 laos.dating, 1
 laospage.com, 1
 laoudit.com, 1
 laozhu.me, 1
-lapacho-tee.de, 1
 lapageamelkor.org, 1
 lapakus.com, 1
-laparoscopic-urology.gr, 1
 laparoscopyhospital.com, 1
 lapassiondutrading.com, 0
 lapatio.dk, 1
@@ -52281,12 +55189,13 @@
 lapotagere.ch, 0
 lapparente-aise.ch, 0
 lappari.com, 0
+lappersfort.tk, 1
 lapps.es, 1
 laprensadelasagradafamilia.org, 1
 lapseofsanity.net, 1
 lapshore.com, 1
-laptop98.com, 0
 laptopcloseout.ca, 1
+laptopdropoff.com, 1
 laptopnewbie.eu.org, 1
 lapulgaflamenco.com, 1
 laqueuedevache.be, 1
@@ -52320,13 +55229,14 @@
 larifari.ch, 1
 larimarhomes.ca, 1
 larimercolorado.gq, 1
-lariposte.org, 1
 lariscus.eu, 1
 lark.pw, 1
 larmenta.tk, 1
 larobba.ddns.net, 1
+laromlab.tk, 1
 larondenet.tk, 1
 larondinedisinfestazione.com, 1
+larosadelosvientos.tk, 1
 larousse-edu.fr, 1
 larpkalender.ch, 1
 larplibrary.org, 1
@@ -52335,6 +55245,7 @@
 larrutan.shop, 1
 larry.buzz, 1
 larryandprisca.it, 1
+larryklug.com, 1
 larryli.cn, 1
 larrysalibra.com, 1
 lars-kusch.de, 1
@@ -52366,6 +55277,7 @@
 laser-toners.tk, 1
 lasercareestetica.com.br, 1
 lasercloud.ml, 1
+laserena.tk, 1
 lasereyess.net, 1
 laserhealthsolutions.com, 1
 laserpc.net, 1
@@ -52381,6 +55293,9 @@
 lasmesas.tk, 1
 lasmoarquitectos.com, 1
 lasmorfianapoletana.com, 1
+lasourisglobe-trotteuse.tk, 1
+laspeligrosas.tk, 1
+laspeludas.tk, 1
 laspequenassemillas.com, 1
 lasranas.es, 1
 lasrecetascocina.com, 1
@@ -52391,6 +55306,7 @@
 lasseleegaard.dk, 1
 lasseleegaard.net, 1
 lasseleegaard.org, 1
+lassemakela.fi, 1
 lassesworld.com, 1
 lassesworld.se, 1
 lassovideos.com, 1
@@ -52405,6 +55321,7 @@
 lastpass.com, 0
 lastrik.ch, 1
 lastrourbanismo.com.br, 1
+lastsunset.tk, 1
 lasuzefc.fr, 1
 lasvegascasinonews.com, 1
 lasvegasescortmagazine.com, 1
@@ -52445,8 +55362,10 @@
 latinphone.com, 1
 latinred.com, 1
 latitudesign.com, 0
+latka.tk, 1
 latour-managedcare.ch, 1
 latremebunda.com, 1
+latrynchera.tk, 1
 lattyware.co.uk, 1
 lattyware.com, 1
 latviaonline.tk, 1
@@ -52476,7 +55395,7 @@
 launchpad-app2.com, 1
 launchpadder2.com, 1
 launchyourcareer.com, 1
-laupv.online, 1
+laundrydidi.com, 1
 laura.network, 1
 lauraandwill.wedding, 0
 laurabailo.com, 1
@@ -52505,7 +55424,6 @@
 lauriuc.sk, 1
 lausannedentiste.ch, 0
 lausannelovers.ch, 0
-lausitzer-widerstand.de, 1
 laussat.de, 1
 laut.digital, 1
 lautremode.com, 1
@@ -52522,7 +55440,6 @@
 lavarex.co.jp, 1
 lavasing.eu.org, 1
 lavaux.lv, 0
-lavendeloel.de, 1
 lavenderx.org, 1
 laventura.tk, 1
 laveriebyk.com, 1
@@ -52552,11 +55469,11 @@
 law.co.il, 1
 law22.com, 1
 lawabidingcactus.com, 1
-laways.cl, 1
-lawclinic-hsg.ch, 1
 lawda.ml, 1
+lawebnobasta.tk, 1
 lawlessenglish.com, 1
 lawlessfrench.com, 1
+lawlessitalian.com, 1
 lawlessrepublic.com, 1
 lawlessspanish.com, 1
 lawn-seeds.com, 1
@@ -52570,20 +55487,25 @@
 lawrenceklepinger.com, 1
 lawrencemurgatroyd.com, 1
 lawrencewhiteside.com, 1
+lawsoner.tk, 1
 lawtap.com, 1
 lawtreeclub.com, 1
 lawyer.cf, 1
 lawyerboksburg.co.za, 1
 lawyerdigital.co.bw, 1
+lawyeredenvale.co.za, 1
 lawyermidrand.co.za, 1
 lawyersofmissouri.com, 1
 lawzakon.tk, 1
+lawzana.com, 1
 lawzava.com, 1
 laxaf.com, 1
 laxxl.com, 1
 layan-luxurylighting.com, 1
-layar.my.id, 1
+layarsosial.com, 0
 layazc.com, 1
+layermesh.net, 1
+layermesh.se, 1
 layers.media, 1
 layflamso.tk, 1
 laylo.io, 1
@@ -52595,6 +55517,7 @@
 lazer.cf, 1
 lazerengravingpros.com, 1
 lazerus.net, 1
+lazerus.pw, 1
 lazibeach.tk, 1
 lazistance.com, 1
 laziz24.com, 0
@@ -52604,12 +55527,13 @@
 lazoscollection.com, 1
 lazowik.pl, 1
 lazownik.pl, 1
+lazudi.com, 1
 lazulu.com, 1
 lazurit.com, 1
 lazyboston.com, 1
-lazyclock.com, 1
 lazyframe.com, 1
 lazyhelp.com, 1
+lazysoftware.fr, 1
 lazytux.org, 1
 lazywaves.tk, 1
 lazzzy.com, 1
@@ -52632,6 +55556,7 @@
 lbrls.tk, 1
 lbs-logics.com, 1
 lbsgroup.co.uk, 1
+lbt-russia.ru, 1
 lbux.org, 1
 lc-8.com, 1
 lc-cs.com, 0
@@ -52664,6 +55589,7 @@
 lc3742.com, 1
 lc3743.com, 1
 lc3744.com, 1
+lc3745.com, 1
 lc3751.com, 1
 lc3757.com, 1
 lc3759.com, 1
@@ -52705,8 +55631,7 @@
 lc7.fun, 1
 lc8.com, 1
 lc8.fun, 1
-lc8.live, 1
-lc8.vc, 1
+lc8.life, 1
 lc80000.com, 1
 lc80801.com, 1
 lc80802.com, 1
@@ -52754,7 +55679,11 @@
 lc891.com, 1
 lc8912.com, 1
 lc892.com, 1
+lc8924.com, 1
+lc8925.com, 1
+lc8926.com, 1
 lc8928.com, 1
+lc8929.com, 1
 lc893.com, 1
 lc8930.com, 1
 lc8931.com, 1
@@ -52764,7 +55693,6 @@
 lc897.com, 1
 lc8a.com, 1
 lc8guidance.com, 1
-lc8md03.com, 1
 lc9158.com, 1
 lc9256.com, 1
 lc98.net, 1
@@ -52823,6 +55751,7 @@
 le-controle-parental.fr, 1
 le-creux-du-van.ch, 0
 le-drive-de-just-vet.fr, 1
+le-forum.tk, 1
 le-fumoir.com, 1
 le-h.de, 0
 le-marais.be, 1
@@ -52871,6 +55800,7 @@
 leanclub.org, 1
 leandre.cn, 1
 leandrebergeron.com, 1
+leandri-campana-avocat.fr, 1
 leandromarcolino.tk, 1
 leandromoreno.co, 1
 leanplando.com, 1
@@ -52910,6 +55840,7 @@
 leastsignificantbit.de, 1
 leatam.fr, 1
 leatherfurnitureexpo.com, 1
+leathergoods.tk, 1
 leathership.co, 1
 leathersofacleaning.co.uk, 1
 leatherstreet.tk, 1
@@ -52931,12 +55862,14 @@
 lebensinselparaguay.tk, 1
 lebensraum-fitness-toenisvorst.de, 1
 lebensraum-kurse.ch, 1
+lebesis.tk, 1
 lebihan.pl, 1
 leblanc.io, 1
 leblancq.ca, 1
 lebourgeo.is, 1
 lebozec.org, 1
 lecafedugeek.fr, 1
+lecannabis.at, 1
 lecannabis.com, 1
 lecannabiste.com, 1
 lecannabiste.fr, 1
@@ -52950,6 +55883,7 @@
 lecheng08.com, 1
 lecheng3.com, 1
 lecheng5288.com, 1
+lecheng7.com, 1
 lecheng8.net, 1
 lecheng88.com, 1
 lecheng88.net, 1
@@ -52964,9 +55898,11 @@
 leclubnestleantillesguyane.fr, 1
 leclubnestlereunion.re, 1
 lecoinchocolat.com, 1
+leconnecteur-biarritz.fr, 1
 lecoquelicot.info, 1
 lecreative.tk, 1
 lectricecorrectrice.com, 1
+lecul.site, 1
 led-jihlava.cz, 1
 led.xyz, 0
 ledburyvets.co.uk, 1
@@ -52995,11 +55931,13 @@
 leebiblestudycentre.net, 1
 leebiblestudycentre.org, 1
 leech.ga, 1
+leech.tk, 1
 leeclemens.net, 0
 leefindlow.com, 1
 leekspin.ml, 1
 leelaylay.com, 1
 leelou.wedding, 1
+leeman.nl, 1
 leemankuiper.nl, 1
 leenaluhtanen.net, 1
 leendebroekertfonds.nl, 1
@@ -53015,6 +55953,7 @@
 leetcode.com, 1
 leetcode.net, 1
 leetgamers.asia, 1
+leetsaber.com, 1
 leevealdc.com, 1
 leeyoungaeph.tk, 1
 lefarsankids.com.br, 1
@@ -53022,6 +55961,7 @@
 lefebvristes.com, 1
 lefebvristes.fr, 1
 lefilradio.fr, 1
+leflibustier.ru, 1
 leflox.cf, 1
 lefonddeloeil.com, 0
 lefroyee.com, 1
@@ -53041,12 +55981,12 @@
 legacyiohs.org, 1
 legadental.com, 1
 legaillart.fr, 1
+legal-aid.tk, 1
 legal.farm, 1
 legal.today, 1
 legalatlanta.com, 1
 legaleus.co.uk, 1
-legalforms.ng, 1
-legalinmotion.es, 1
+legalisierung.tk, 1
 legaliz.ml, 1
 legalnews.ml, 1
 legalplace.fr, 1
@@ -53063,6 +56003,7 @@
 legatofmrc.fr, 1
 legba.in, 1
 legen.sk, 1
+legend-of-pirates.tk, 1
 legend-v.life, 1
 legendary-royale.net, 1
 legendcatz.com, 1
@@ -53076,6 +56017,7 @@
 legible.es, 1
 legilimens.de, 1
 legion.ge, 1
+legionisci.com, 1
 legioniv.org, 1
 legionminecraft.com, 1
 legiscontabilidade.com.br, 1
@@ -53098,12 +56040,11 @@
 lehighvalleypeds.com, 1
 lehmitz-weinstuben.de, 1
 lehnen.xyz, 1
-lehouerou.net, 1
+lehokolo.eu, 1
 lehti-tarjous.net, 1
 lehvyn.org, 1
 leibniz-gymnasium-altdorf.de, 1
 leideninternationalreview.com, 1
-leifdreizler.com, 0
 leighneithardt.com, 1
 leignier.org, 1
 leilautourdumon.de, 1
@@ -53115,7 +56056,6 @@
 leisure-supplies-show.co.uk, 1
 leisurecooker.co.uk, 1
 leisurecooker.ie, 1
-leisurepools.com.au, 1
 leivadi.com, 1
 leiyinan.com, 1
 lejade.fr, 1
@@ -53126,6 +56066,7 @@
 lekota.co.uk, 1
 lektier.cf, 1
 lelac-capfrance.com, 0
+leladesign.it, 1
 lele13.cn, 1
 lelehei.com, 1
 leleimports.store, 1
@@ -53134,6 +56075,7 @@
 leliveld.org, 1
 lellek.at, 1
 lelo.com.pl, 1
+lelocaldrive.com, 1
 lelubre.info, 1
 lelux.fi, 1
 lelux.net, 1
@@ -53147,6 +56089,7 @@
 lemilane.it, 1
 leminhduong.com, 1
 lemmi.no, 1
+lemmy.ca, 1
 lemni.top, 1
 lemoine.at, 1
 lemonardo.ga, 1
@@ -53168,6 +56111,7 @@
 lendingclub.com, 1
 lendingmate.ca, 1
 lenemes.tk, 1
+lenergietoutcompris.fr, 1
 lengow.com, 1
 lengua-alemana.tk, 1
 lenguajecoloquial.com, 1
@@ -53181,6 +56125,7 @@
 lenina72.tk, 1
 leninalbertop.com.ve, 1
 lenit.nl, 1
+lenkeran.tk, 1
 lenkunz.me, 1
 lenn-blaschke.com, 1
 lennar.com, 1
@@ -53189,13 +56134,16 @@
 lennox.cf, 1
 lennyendewespen.tk, 1
 lennyobez.be, 1
+lenoblpech.ru, 1
 lenoirnc.gov, 1
 lenorefan.tk, 1
 lenostech.gr, 1
 lenou.nl, 1
 lenovovietnam.net, 1
+lenqiue.com, 1
 lenr-forum.com, 1
 lensdoctor.com, 1
+lenseshop.tk, 1
 lenspirations.com, 1
 lensual.space, 1
 lentanews.ml, 1
@@ -53203,6 +56151,7 @@
 lenuagebauche.org, 1
 lenyip.com, 1
 lenyip.works, 1
+leo-music.tk, 1
 leo.co.ke, 1
 leoandpeto.com, 1
 leochedibracchio.com, 1
@@ -53215,16 +56164,20 @@
 leon-tec.co.jp, 1
 leon-tech.com, 1
 leon.wtf, 1
+leonalonso.com, 1
 leonard.io, 0
 leonardcamacho.me, 1
+leonardlorenz.de, 1
 leonardocremonesi.it, 1
 leonardofavio.tk, 1
+leonardoneiva.com.br, 1
 leonauto.de, 1
 leonbuitendam.nl, 1
 leondenard.com, 1
+leongalin.tk, 1
 leonhooijer.nl, 0
+leonidas-dovido.tk, 1
 leonklingele.de, 1
-leonmahler.consulting, 1
 leonplast.tk, 1
 leontic.es, 1
 leontiekoetter.de, 1
@@ -53254,18 +56207,20 @@
 lepenis.fr, 1
 leper.ga, 1
 lepetitkids.com.br, 1
+lepetitsavoyardbio.fr, 1
 lephilnet.tk, 1
 lepidum.jp, 1
 lepkov.ru, 1
 leporem.com.br, 1
 leppis-it.de, 1
+leprado.com, 1
 leprekon.tk, 1
+leps.fr, 1
 lepsos.com, 0
 lequerceagriturismo.com, 1
 lequest.dk, 1
 lequocthai.com, 1
 lerasenglish.com, 1
-lerefugedujambon.com, 1
 lereporter.ma, 1
 leretour.ch, 0
 lerika.tk, 1
@@ -53278,9 +56233,11 @@
 lernorteuropa.de, 1
 lernorteuropa.eu, 1
 lernplattform-akademie.de, 1
+lertsiritravel.net, 1
 leruevintage.com, 1
 les-ateliers-de-melineo.be, 0
 les-explos.com, 1
+les-formations.fr, 1
 les-inoxydables.com, 1
 les-pipelettes-de-narbonne.com, 1
 lesa.boutique, 1
@@ -53288,11 +56245,13 @@
 lesaffre.es, 1
 lesalpinistes.com, 1
 lesamisdelaroumanie.com, 1
+lesamoureuxdangelique.ovh, 1
 lesancheslibres.fr, 1
 lesargentinas.tk, 1
 lesatelierskosto.com, 1
 lesberger.ch, 0
 lesbi-porno-video.ru, 1
+lesbianfacesitting.com, 1
 lesbianlovers.tk, 1
 lesbiansslaves.com, 1
 lesblogueuses.fr, 1
@@ -53301,11 +56260,10 @@
 lesbrillantsdaristide.com, 1
 lescommunes.com, 1
 lescomptoirsdepierrot.com, 1
-lesconteursavis.org, 1
+lesconcours.tk, 1
 lescrapdesfilles.fr, 1
 lesdouceursdeliyana.com, 1
 leseditionsbraquage.com, 1
-lesfilmsavivre.com, 1
 lesfouines.com, 1
 lesgarianes.com, 1
 lesgitesdusapey.fr, 0
@@ -53320,6 +56278,8 @@
 lesjardinsdemathieu.net, 0
 lesjardinsdubanchet.fr, 1
 leskoalasenvoyage.com, 1
+lesley.xyz, 1
+leslie.horse, 1
 leslyandyana.com, 1
 lesmamy.ch, 0
 lesmontagne.net, 1
@@ -53333,15 +56293,18 @@
 lesprofsplacotent.com, 1
 lesptitspasdelyne.fr, 1
 lesptitstutos.fr, 1
+lesquerda.cat, 0
 lesscloud.com, 1
 lessentieldanthony.fr, 1
 lessets-graphiques.com, 1
 lessis.moe, 1
+lesspass.com, 1
 lestanzedelgattopardo.it, 1
 lesterchan.net, 1
 lesterrassesdusoleil.ch, 0
 lestrokeofgenius.com, 1
 lesummeira.is, 1
+lesy.eu, 1
 lesy.online, 1
 lesyndicat.info, 0
 leszonderstress.nl, 1
@@ -53413,6 +56376,7 @@
 leumi-how-to.co.il, 1
 leutgeb.xyz, 1
 leuthardtfamily.com, 1
+leuvensefilmclub.tk, 1
 lev103.com, 1
 levabilligt.com, 1
 levans.fr, 0
@@ -53421,6 +56385,7 @@
 levapsych.com, 1
 levaquin750.ga, 1
 level-10.de, 1
+level5-drywall.com, 1
 level6.me, 1
 level9hvac.com, 1
 levelaccordingly.com, 1
@@ -53429,7 +56394,6 @@
 levelninehvac.com, 1
 levels.one, 1
 levels3d.com, 1
-levelshoes.com, 1
 levelsoft.ml, 1
 leveluplv.com, 1
 leveluprankings.com, 1
@@ -53443,14 +56407,13 @@
 levermann.eu, 1
 leviaan.nl, 1
 leviathan-studio.com, 1
+leviathanfan.tk, 1
 levico.tk, 1
 levidromelist.com, 1
 levineteamestates.com, 1
 levinus.de, 1
 leviobery.com, 1
 levis.fun, 1
-levis.name, 1
-leviscop.com, 1
 levisenlaw.com, 1
 levothyroxineonline.gq, 1
 levs.tk, 1
@@ -53458,6 +56421,7 @@
 lew.im, 1
 lewdawson.com, 1
 lewdgamer.com, 1
+leweslivingstreets.tk, 1
 lewiatan.opole.pl, 1
 lewiscollard.com, 1
 lewisdatasecurity.com, 1
@@ -53469,6 +56433,7 @@
 lexautoservice.nl, 1
 lexblog.com, 1
 lexdigital.pl, 1
+lexe.club, 1
 lexic.co, 1
 lexico.pt, 1
 lexicography.online, 1
@@ -53476,6 +56441,7 @@
 lexifax.ga, 1
 lexikon24.tk, 1
 lexis.ml, 1
+lexitravels.com, 1
 lexpartsofac.com, 1
 lexreception.com, 1
 lexway.pk, 1
@@ -53483,6 +56449,7 @@
 leybold.co.id, 1
 leyendaluzrenacer.com, 1
 leymaritima.com, 1
+lez.gent, 1
 lez2020.be, 1
 lez2020.gent, 1
 lezdomsm.com, 1
@@ -53496,8 +56463,11 @@
 lforum.tk, 1
 lfrconseil.com, 1
 lfyhokk.tk, 1
+lg-obchod.cz, 1
+lg-store.sk, 1
 lg-waps.go.jp, 1
-lg-waps.jp, 1
+lg-world.cz, 1
+lg.com.br, 1
 lg.gz.cn, 1
 lg0.site, 1
 lg2.com, 1
@@ -53512,11 +56482,16 @@
 lghfinancialstrategy.ch, 0
 lgiswa.com.au, 1
 lgnsh.fr, 1
+lgobchod.cz, 1
 lgpecasoriginais.com.br, 1
 lgrs.com.au, 1
+lgscripts.com.br, 1
 lgsg.us, 1
+lgshop.cz, 1
 lgshop.sk, 1
+lgstore.cz, 1
 lgstore.sk, 1
+lgworld.cz, 1
 lhajn.cz, 1
 lhakustik.se, 1
 lhalbert.xyz, 1
@@ -53543,15 +56518,13 @@
 liamlin.me, 1
 lian-in.net, 1
 liandongyoupin.com, 1
+liang-li88.com, 1
+liang-li88.net, 1
 lianglongcredit.com, 1
 liangxingai.com, 1
+lianhe.art, 1
 lianwen.kim, 1
 lianye1.cc, 1
-lianye2.cc, 1
-lianye3.cc, 1
-lianye4.cc, 1
-lianye5.cc, 1
-lianye6.cc, 1
 liaoning30019.com, 1
 liaozheqi.cn, 1
 liaronce.com, 1
@@ -53575,6 +56548,7 @@
 libertarian-party.com, 1
 libertas-tech.com, 1
 libertas.co.jp, 1
+liberte-toujours.tk, 1
 libertis.ga, 1
 liberty-city.tk, 1
 liberty-host.tk, 1
@@ -53585,13 +56559,13 @@
 libertyvault.us, 1
 libertywines.co.uk, 1
 libertywines.ie, 1
+libertyxpress.tk, 1
 libfins.org, 1
 libgame.com, 1
 libget.com, 1
 libhttp.org, 1
 libmpq.org, 1
 libnull.com, 1
-liborburda.cz, 1
 libpdf.org, 1
 libportal.cf, 1
 libr.ee, 1
@@ -53665,10 +56639,13 @@
 lichtsturm.net, 1
 lichttechnik-tumler.com, 1
 lichttraeumer.de, 1
+lick.link, 1
 lickingcounty.gov, 1
 lickthesalt.com, 1
 licloud.homeip.net, 1
 licx.cf, 1
+licx.ml, 1
+licx.ru, 1
 lida-vets.co.uk, 1
 lidavidm.me, 1
 lidel.org, 1
@@ -53720,11 +56697,11 @@
 life-emotions.pt, 1
 life-experiment.com, 1
 life-in-hell.tk, 1
+life-is-riddle.tk, 1
 life-tec.tk, 1
 life-time.nl, 1
 life29.com, 1
 lifeandhealthtips.tk, 1
-lifeandhome.bg, 1
 lifeartstudios.net, 1
 lifeasgame.tk, 1
 lifebetweenlives.com.au, 1
@@ -53740,6 +56717,8 @@
 lifefoto.de, 1
 lifeguatemala.com, 1
 lifehacker.com, 1
+lifehouseliving.com, 0
+lifeinhellfansite.tk, 1
 lifeinhex.com, 1
 lifeinsurancepro.org, 1
 lifeisabug.com, 1
@@ -53756,9 +56735,12 @@
 lifeqa.net, 1
 lifereset.it, 1
 lifesafety.com.br, 1
+lifesaver.tk, 1
+lifesaverhindi.tk, 1
 lifesavvy.com, 1
 lifesavvymedia.com, 1
 lifeset.pp.ua, 1
+lifesettlements.com, 1
 lifesharing.gr, 1
 lifesignals.com, 1
 lifeskills-education.co.uk, 0
@@ -53790,14 +56772,14 @@
 ligadosgames.com, 1
 ligare-fp.com, 1
 light-vision.com.ua, 1
-light.blue, 1
 light.mail.ru, 1
 lightanddarkgame.com, 1
 lightbluelearning.com, 1
 lightbox.co, 1
 lightcraftmc.tk, 1
 lightdark.xyz, 1
-lightdream.tech, 1
+lightfestivalghent.be, 1
+lightfestivalghent.com, 1
 lightfoot.co.uk, 1
 lighthouseglobal.com, 1
 lighthouseinstruments.com, 1
@@ -53826,6 +56808,7 @@
 lightography.com, 1
 lightquantum.me, 0
 lights.co.uk, 1
+lights0123.com, 1
 lightscale.com, 1
 lightsfromspace.com, 1
 lightsheep.no, 0
@@ -53852,12 +56835,14 @@
 lijncoaching.nl, 1
 lijstje.be, 1
 lijstje.nl, 1
+like-boss.ga, 1
 like-rabota.tk, 1
 like.lgbt, 1
 likeablehub.com, 1
 likeabox.de, 1
 likeany.com, 1
 likebee.gr, 1
+likefast.tk, 1
 likefluence.com, 1
 likegeeks.com, 1
 likehifi.de, 1
@@ -53866,7 +56851,6 @@
 likenosis.com, 1
 likeometer.co, 1
 likere.com, 1
-likesforinsta.com, 1
 likestudio.com.ua, 1
 likui.me, 1
 lil88.com, 1
@@ -53878,6 +56862,7 @@
 lilai520.com, 1
 lilai5566.com, 1
 lilai634.com, 1
+lilai6616.com, 1
 lilai6677.com, 1
 lilai6688.com, 1
 lilai777.com, 1
@@ -53890,10 +56875,11 @@
 lilianejuchli.ch, 1
 liliang.moe, 1
 liliang13.com, 1
+lilidarcek.sk, 1
+lilie.fr, 1
 lilievabien.fr, 1
 lilisg.tk, 1
 lilith-magic.com, 1
-liliya-salon.ru, 1
 liljohnsanitary.net, 1
 lillbrothers.com, 1
 lille.ml, 1
@@ -53908,6 +56894,7 @@
 lily-inn.com, 1
 lily.flowers, 1
 lilylasvegas.com, 1
+lilypadwikisecret.tk, 1
 lilysbouncycastles.com, 1
 lilysgrill.com, 1
 lilyvet.com, 1
@@ -53917,10 +56904,11 @@
 limbaido.tk, 1
 limberg.me, 1
 limbo-online.tk, 1
-limc.cloud, 0
+limc.cloud, 1
 lime-host.cf, 1
 lime-host.tk, 1
 lime.rocks, 1
+limecho.net, 1
 limehost.com, 1
 limit.xyz, 1
 limitededitioncomputers.com, 1
@@ -53934,11 +56922,13 @@
 limoforsale.com, 1
 limoshka.ru, 1
 limouzines.cf, 1
+limpens.net, 1
 limpiadordeporos.online, 1
 limpid.nl, 1
 limportemps.fr, 1
 limsia.co, 1
 limsia.com, 1
+limstash.com, 1
 limstash.me, 1
 limules.ch, 0
 limx.win, 1
@@ -53971,6 +56961,7 @@
 lindbladcruises.com, 1
 linden-nj.gov, 1
 linden.me, 0
+lindependant.ml, 1
 lindeskar.se, 1
 lindgrenracing.tk, 1
 lindnerhof-taktik.de, 1
@@ -53984,10 +56975,10 @@
 lindsaygorski.com, 1
 lindseyfansite.tk, 1
 lindskogen.se, 1
+line-magazine.com, 1
 line.biz, 1
 line.co.nz, 0
 lineaesse5.it, 1
-lineageos.org, 1
 linearaudio.net, 1
 linearmap.com, 1
 linebooks.cf, 1
@@ -54000,6 +56991,7 @@
 linge-ma.ro, 1
 lingerie.com.br, 1
 lingeriecollect.ga, 1
+lingeries.boutique, 1
 lingeriesilhouette.com, 1
 lingolia.com, 0
 lingotaxi.com, 1
@@ -54021,6 +57013,7 @@
 link2link.tk, 1
 link2serve.com, 1
 link9.net, 1
+linkagemag.com, 1
 linkages.org, 1
 linkat4.cz, 1
 linkbooks.ga, 1
@@ -54036,8 +57029,8 @@
 linkinparkoutpost.tk, 1
 linkinsta.com, 1
 linklocker.co, 1
-linkmaker.co.uk, 1
 linkmauve.fr, 1
+linknaarlinux.tk, 1
 linko-pomoika.tk, 1
 linkonaut.net, 1
 linkopia.com, 1
@@ -54045,6 +57038,7 @@
 linkposts.tk, 1
 linksafe.ga, 1
 linksanitizer.com, 1
+linksbridge.com, 1
 linkscloud.org, 1
 linksextremist.at, 1
 linksgruenejugend.de, 1
@@ -54059,6 +57053,7 @@
 linktio.com, 1
 linkto.cf, 1
 linkuva.tk, 1
+linkview.tk, 1
 linkwater.org, 1
 linkwheel.tk, 1
 linky.tk, 1
@@ -54099,8 +57094,6 @@
 linpx.com, 1
 linqhost.nl, 1
 linss.com, 1
-lintelliftdks.com, 1
-lintelliftusa.com, 1
 lintmx.com, 1
 linuq.org, 1
 linusdrop.tips, 1
@@ -54111,9 +57104,10 @@
 linux-help.org, 1
 linux-mint-czech.cz, 1
 linux-pc.ml, 1
+linux-share.tk, 1
 linux-taganrog.tk, 1
 linux-vme.org, 1
-linux.cn, 1
+linux.cn, 0
 linux.conf.au, 1
 linux.farm, 1
 linux.fi, 1
@@ -54140,6 +57134,7 @@
 linuxhilux.com, 1
 linuxhostsupport.com, 1
 linuxhub.ro, 0
+linuxincluded.com, 1
 linuxiuvat.de, 1
 linuxkompis.se, 1
 linuxlounge.net, 1
@@ -54157,7 +57152,6 @@
 lion7.de, 1
 lionchita.tk, 1
 lionelsfarm.com, 1
-liongueststudios.com, 1
 lionhosting.nl, 1
 lionland.tk, 1
 lionlyrics.com, 1
@@ -54169,14 +57163,18 @@
 lipaslovanska.cz, 1
 lipeck.ga, 1
 lipeck.tk, 1
+lipetsk-centralniy.cf, 1
 lipetsk48.tk, 1
 lipex.com, 1
 lipighor.com, 1
 lipighor.xyz, 1
 lipo.lol, 1
 lipoabaltimore.org, 1
+lipovka.tk, 1
 lippu1.fi, 1
+lipsumtech.com, 1
 lipthink.com, 1
+lipturess.tk, 1
 liqd.net, 1
 liqueur.wiki, 1
 liquid.cz, 1
@@ -54199,11 +57197,13 @@
 lirion.de, 1
 lirlandais.ch, 0
 lirnberger.com, 1
+lis-na-plasty.cz, 1
 lis.koeln, 1
 lisa-mainz.tk, 1
 lisadelbo.tk, 1
 lisahh-jayne.com, 0
 lisahutson.co.uk, 1
+lisamaffia.tk, 1
 lisamccorrie.com, 1
 lisanzauomo.com, 1
 lisapo.info, 1
@@ -54211,7 +57211,9 @@
 lisasc.gq, 1
 lisasworkshop.co.uk, 1
 lisavrobinson.tk, 1
+lisbon-pre-1755-earthquake.org, 1
 lisburnhottubnbounce.co.uk, 1
+liscieperfetti.com, 1
 lishayut-prav.cf, 1
 lishayut-prav.ga, 1
 lishayut-prav.gq, 1
@@ -54258,8 +57260,10 @@
 litebits.com, 1
 litebooks.gq, 1
 litecache.de, 1
+litecloud.ml, 1
 litecoinnews.info, 1
 litehost24.tk, 1
+litemere.com, 1
 litemind.com, 0
 liteminer.cf, 1
 litepanels-parts.com, 1
@@ -54271,6 +57275,10 @@
 literatura-portal.cf, 1
 literature-schools.com, 1
 literaturka.ga, 1
+literie06.com, 1
+litespeed-webserver.de, 1
+litespeedwebserver.com, 1
+litespeedwebserver.de, 1
 litfin.name, 1
 litfl.com, 1
 lithan.com, 1
@@ -54296,6 +57304,8 @@
 littledev.nl, 1
 littlefamilyadventure.com, 1
 littlefingersindia.com, 1
+littlehide.gq, 1
+littleindia.ca, 1
 littlelife.co.uk, 1
 littlelucifercafe.tk, 1
 littlemaster.tk, 1
@@ -54343,10 +57353,8 @@
 liuqiaolovecaonali.ml, 1
 liushuyu.tk, 1
 liuwenxuan.com, 1
-liv3d.stream, 1
 livada.fr, 1
 livadm.ml, 1
-livaniaccesorios.com, 1
 live-knigi.cf, 1
 live-news.gq, 1
 live-z-rejstejna.cz, 1
@@ -54403,10 +57411,12 @@
 livemomentum.ml, 1
 livenewsrussia.tk, 1
 liveperformersmeeting.net, 1
+livepl.eu, 1
 liveregistratie.nl, 1
 liverider.co.jp, 1
 liverobot8.com, 1
 liverobot888.com, 1
+livesexcalls.co.uk, 1
 livesheep.com, 1
 liveskype.com, 1
 liveslides.com, 1
@@ -54416,8 +57426,6 @@
 liveteachers.in, 1
 livetopknigi.gq, 1
 livetoride.co.za, 1
-livetv.tube, 1
-livewell-counseling.com, 1
 livezrejstejna.cz, 1
 livfcshop.com, 1
 livhao.com, 1
@@ -54435,6 +57443,9 @@
 livinginhimalone.com, 1
 livinglab.be, 1
 livinglifesecurely.com, 1
+livinglink.be, 1
+livingorganicnews.com, 1
+livingthegreenlife.com, 1
 livingtohearsix.com, 1
 livingworduk.org, 1
 livinkitchen.tk, 1
@@ -54442,8 +57453,8 @@
 livnev.me, 1
 livnev.xyz, 1
 livogeva.dk, 1
-livolett.de, 1
 livrariacoad.com.br, 1
+livrariause.com, 1
 livresetmanuscrits.com, 1
 livroseuniformes.com.br, 1
 livv168.com, 1
@@ -54463,6 +57474,7 @@
 lizhi.io, 1
 lizhi123.net, 1
 lizhuogui.ga, 1
+lizmccaughey.com, 1
 lizmooredestinationweddings.com, 1
 liznewton.com.au, 1
 liztattoo.se, 1
@@ -54471,6 +57483,7 @@
 lizzian.uk, 1
 lizzwood.com, 1
 lizzythepooch.com, 1
+lj-creation.com, 1
 ljason.cn, 1
 ljc.ro, 1
 ljoonal.xyz, 1
@@ -54493,12 +57506,14 @@
 ll30019.com, 1
 ll5197.co, 1
 ll6729.co, 1
+ll6729.com, 1
 ll6957.co, 1
 ll8819.com, 1
 ll9297.co, 1
 ll9397.com, 1
 ll9728.co, 1
 llamadordeangeles.online, 1
+llamerapido.com, 1
 llandudnochristmasfayre.co.uk, 1
 llanelli-radio-club.tk, 1
 llanowar.tk, 1
@@ -54515,7 +57530,6 @@
 lloyd-day.me, 1
 lloydrogerspencer.com, 1
 llredac.fr, 1
-llslb.com, 0
 llvm.us, 1
 llyq8866.com, 1
 llyq9988.com, 1
@@ -54546,10 +57560,12 @@
 lndrive.space, 1
 lnhydy.cn, 1
 lnk.bio, 1
+lnk.dk, 1
 lnoldan.com, 1
 lnx.li, 1
 lnyltx.cn, 1
 lo-li.icu, 1
+loa.land, 1
 loackerbusiness.it, 1
 load-ev.de, 1
 load.pm, 0
@@ -54578,10 +57594,12 @@
 lobevert.com, 1
 lobin21.com, 1
 lobivia.de, 1
+lobocapoeira.tk, 1
 lobosdomain.ddns.net, 1
 lobosdomain.hopto.org, 1
 lobosdomain.no-ip.info, 1
 lobsangstudio.com, 1
+lobste.rs, 1
 lobstr.co, 1
 loca-voiture.fr, 1
 locabir.cf, 1
@@ -54631,6 +57649,8 @@
 locapos.com, 1
 location-appartement-dakar.com, 1
 location-fichier-email.com, 1
+location-groix.com, 1
+location-vacances-croatie.tk, 1
 locationkaraokemontreal.com, 1
 locationkaraokeottawa.com, 1
 locationkaraokequebec.com, 1
@@ -54652,6 +57672,7 @@
 locatorplus.gov, 1
 locauxrama.fr, 1
 locchat.com, 1
+lock-expert.de, 1
 lock.me, 1
 lock23.ca, 1
 lockaby.org, 1
@@ -54660,6 +57681,7 @@
 locker3.com, 1
 lockerroomstories.com, 1
 lockify.com, 1
+lockless.tk, 1
 locklock.com.br, 1
 locklockbrasil.com.br, 1
 lockme.at, 1
@@ -54670,9 +57692,7 @@
 locknlockbrasil.com.br, 1
 lockoutgroup.com, 1
 lockpick.nl, 1
-lockpicks.se, 1
 lockr.jp, 1
-locksmith--richmond.com, 1
 locksmith--sanantoniotx.com, 1
 locksmith-durbannorth.co.za, 1
 locksmith-pasadenatx.com, 1
@@ -54736,21 +57756,30 @@
 lodash.com, 0
 loddeke.eu, 1
 lode.li, 1
+lode.tk, 1
+lodewijkict.nl, 1
 lodewillems.com, 1
 lodger.cf, 1
 lodki-pvh.com, 1
+lodni.site, 1
+lodosswar.tk, 1
 lodus.io, 1
+loeklommers.nl, 1
 loenshotel.de, 1
 loew.de, 1
 loforo.com, 1
 lofttravel.com, 1
 loftyideas.ml, 1
+loftymedia.ca, 1
+lofw.tk, 1
 logactiond.org, 1
+logal.media, 1
 logalot.com, 1
 logancooper.jp, 1
 logancountyky.gov, 1
 loganmarchione.com, 1
 loganparkneighborhood.org, 1
+logart.tk, 1
 logay.com.br, 1
 logbook.ch, 1
 logbot.info, 1
@@ -54758,6 +57787,7 @@
 logement-saisonnier.com, 1
 logement.com, 1
 logentries.com, 0
+logevou-immobilier.tk, 1
 logexplorer.net, 1
 logfile.at, 1
 logfile.ch, 1
@@ -54812,13 +57842,11 @@
 logze.nl, 1
 lohanaflores.com.br, 1
 loheprobado.com, 1
-lohkoketju.fi, 1
 lohmeyer.cc, 1
 lohnsteuerhilfe-essen.de, 1
 loichot.ch, 0
 loiit.ga, 1
 loire-en-bateau.fr, 1
-loisircreatif.net, 1
 loisirsdouville.com, 1
 lojaapoio.com.br, 1
 lojacorbuccieats.com.br, 1
@@ -54833,6 +57861,7 @@
 lojadosirmaos.com.br, 1
 lojadosomautomotivo.com.br, 1
 lojafazendoarte.com.br, 1
+lojahaus.com.br, 1
 lojahunamarcenaria.com.br, 1
 lojak2.com.br, 1
 lojal19.com.br, 1
@@ -54864,6 +57893,7 @@
 lola.by, 1
 lolas-vip.com, 1
 lolaseuropeancafe.com, 1
+lolcats.tk, 1
 lolcloud.ru, 1
 lolcorp.pl, 1
 lolcosplay.ga, 1
@@ -54890,6 +57920,7 @@
 lolifamily.gq, 1
 lolifamily.js.org, 1
 lolifamily.ml, 1
+lolifamily.tk, 1
 lolio.tw, 1
 lolipops.ga, 1
 lolis.stream, 1
@@ -54900,10 +57931,10 @@
 lollybrown.com, 1
 lollypop.tk, 1
 lollyteam.tk, 1
+lolmania.tk, 1
 lolnames.gg, 1
-lolpatrol.de, 1
-lolpatrol.wtf, 1
 loma.ml, 1
+lomaster.tk, 1
 lomayko.ml, 1
 lombri-agro.com, 1
 lomerhouse.com, 1
@@ -54915,6 +57946,7 @@
 lona.io, 1
 lonavla.tk, 1
 lonay.me, 0
+london-mafia.tk, 1
 london-transfers.com, 1
 london.dating, 1
 londonbridge.pl, 1
@@ -54927,6 +57959,7 @@
 londonlegaltranslation.ae, 1
 londonpropertymatch.com, 1
 londonseedcentre.co.uk, 1
+londontrivia.gq, 1
 londresdecouverte.fr, 1
 londynelliot.com, 1
 lone-gunman.be, 1
@@ -54936,6 +57969,7 @@
 lonelystoner.design, 0
 lonelytweets.com, 1
 lonelyworld.co.uk, 1
+loneronin.tk, 1
 lonerwolf.com, 0
 lonesomecosmonaut.com, 1
 lonestarlandandcommercial.com, 1
@@ -55010,6 +58044,9 @@
 longma168.cn, 1
 longma168.com, 1
 longstride.net, 1
+longtermrentalsportugal.com, 1
+lonleymoon.tk, 1
+lonlomba.com, 1
 lonniec.com, 1
 lonniemason.net, 1
 lonny.ee, 1
@@ -55024,14 +58061,15 @@
 lookastic.fr, 1
 lookastic.ru, 1
 lookatmysco.re, 1
-lookbetweenthelines.com, 1
+lookbetweenthelines.com, 0
+looker.com, 1
 looker.wang, 0
 lookgadgets.com, 1
 lookingstores.fr, 0
 lookup-dns.net, 1
+loomis.center, 1
 loonbedrijfdenboer.nl, 1
 looneymooney.com, 1
-looneytunesdashgame.com, 1
 loony.info, 0
 loonylatke.com, 1
 loopback.kr, 1
@@ -55041,6 +58079,7 @@
 looseleafsecurity.com, 1
 loothole.com, 1
 loots.eu, 1
+lopendvuurtje.tk, 1
 lopezmanzano.com, 1
 loposchokk.com, 1
 lopp.net, 1
@@ -55049,7 +58088,9 @@
 loqyu.co, 1
 loqyu.com, 1
 lor.kharkov.ua, 1
+loratadine10mg.gq, 1
 lorbooks.tk, 1
+lord-of-forex.tk, 1
 lord.sh, 1
 lordbyron.tk, 1
 lorddominion.tk, 1
@@ -55079,6 +58120,7 @@
 loritaboegl.de, 1
 lorn.tk, 1
 lornabenes.com, 1
+lorqui.tk, 1
 los-diablos.tk, 1
 losangelesescorts.net, 1
 losangelestown.com, 1
@@ -55091,7 +58133,10 @@
 loseweightbaby.tk, 1
 loseweightin5days.tk, 1
 losflamers.tk, 1
+losgringos.tk, 1
 loshogares.mx, 1
+losinterrogantes.com, 1
+losjuegosdemesa.online, 1
 loslegendarios.tk, 1
 losless.fr, 1
 losmedicamentos.net, 0
@@ -55101,6 +58146,7 @@
 losreyesdeldescanso.com.ar, 1
 loss.no, 1
 lossaicos.tk, 1
+lost-bit.tk, 1
 lost-illusions.tk, 1
 lost-in-place.com, 1
 lost.report, 1
@@ -55137,6 +58183,8 @@
 lottoland.pt, 1
 lottosonline.com, 1
 lottospielen24.org, 0
+lottothaipro.com, 1
+lotuselise.tk, 1
 lotustreasurechest.com, 1
 lotusweb.tk, 1
 lotw.de, 1
@@ -55224,6 +58272,7 @@
 lovelyanimal.de, 1
 lovelybook4u.gq, 1
 lovelyfamilymm.com, 1
+lovelyflavor.com, 1
 lovelylanguedoc.com, 1
 lovelytimes.net, 1
 lovemanagementaccounts.co.uk, 1
@@ -55239,6 +58288,7 @@
 loveni.me, 1
 lovenwishes.com, 1
 loveph.one, 1
+loveplanets.tk, 1
 lover-bg.com, 1
 loverepublic.ru, 1
 loverngifts.com, 1
@@ -55255,6 +58305,7 @@
 lovink.net, 1
 lovizaim.ru, 1
 lovlyhorses.tk, 1
+low-battery.tk, 1
 low-diets.com, 1
 lowbidders.com, 1
 lowcarbdietmealsmsk.ga, 1
@@ -55263,12 +58314,12 @@
 lowcostivf.net, 1
 lowcostwire.com.au, 1
 lowerpricefinder.com, 1
+lowerthetone.com, 1
 lowmagnitude.com, 1
 lowsec.space, 1
 lowsidetna.com, 1
 lowson.ca, 1
 lowt.us, 1
-loxal.org, 1
 loxdonmarkets.com, 1
 loyaleco.it, 1
 loyaltech.ch, 1
@@ -55286,14 +58337,15 @@
 lpcdops-lafla.gov, 1
 lpchemicalsolution.tk, 1
 lpdp.photo, 1
+lpfan.tk, 1
 lpgaclub.jp, 1
 lph.saarland, 1
+lphispano.tk, 1
 lpkosovo.tk, 1
 lpmkonji.cf, 1
 lprr.fr, 1
 lpt-nebreziny.eu, 1
 lq.hr, 1
-lqshu.net, 1
 lra-cloud.de, 1
 lrdo.net, 1
 lriese.ch, 1
@@ -55307,8 +58359,10 @@
 lsbricks.com, 1
 lsc-dillingen.de, 1
 lsc.ee, 1
-lsc.gov, 1
 lsc.moe, 1
+lscache.com, 1
+lscache.de, 1
+lsesteticaavancada.com.br, 1
 lshiy.com, 1
 lsj.world, 1
 lsl.eu, 1
@@ -55320,6 +58374,7 @@
 lstma.com, 1
 lstu.tk, 1
 lsv-tech.com, 1
+lswim.com, 1
 lsy.cn, 1
 lsys.ac, 1
 lszj.com, 1
@@ -55336,7 +58391,7 @@
 ltlec.cn, 1
 ltlec.com, 0
 ltlec.net, 1
-ltlec.org, 1
+ltlec.org, 0
 ltlec.services, 1
 ltls.org, 1
 ltmw.xyz, 1
@@ -55347,15 +58402,18 @@
 lts-tec.de, 1
 ltservers.net, 1
 lty.space, 1
+lu-rp.es, 1
 lu.search.yahoo.com, 0
 lu2343.com, 1
 lual.tk, 1
 luan.ma, 1
 luanvancaohoc.com, 1
+luanxt.tk, 1
 lubar.me, 1
 lubbockyounglawyers.org, 1
 lubersacr.com, 1
 lubot.net, 1
+luc-nutrition.tk, 1
 luc-oberson.ch, 0
 luca-steeb.com, 1
 lucacastelnuovo.nl, 1
@@ -55376,14 +58434,18 @@
 lucasgymnastics.com, 1
 lucasit.com, 1
 lucaslarson.net, 1
+lucasrl.fr, 1
 lucassoler.com.ar, 0
 lucasuwadi.com, 1
 lucciolachile.com, 1
+lucdethier.be, 1
 luce.life, 1
 lucentioluo.space, 1
 lucerin.ga, 1
 lucesledsbaratas.shop, 1
+luchalibre.tk, 1
 luchscheider.de, 0
+luchshie-experty.top, 1
 luchthavenmaastricht.nl, 1
 lucia-art.cf, 1
 lucia-riemer.de, 1
@@ -55400,9 +58462,11 @@
 luciferblog.tk, 1
 luciferianism.tk, 1
 lucille-thomas.fr, 1
+lucillewillemsen.tk, 1
 luciobarcellona.it, 1
 luciogelsi.com, 1
 lucklesslovelocks.com, 1
+lucky-bul.tk, 1
 lucky-frog.co.uk, 1
 lucky-time.tk, 1
 luckyabonent.ml, 1
@@ -55431,6 +58495,7 @@
 ludek.biz, 1
 luden.tk, 1
 ludikovsky.name, 1
+ludivine-viguie.com, 1
 ludmilla.tk, 1
 ludmillaewagner.ga, 1
 ludo-giuly.tk, 1
@@ -55458,11 +58523,12 @@
 luftreiniger.biz, 1
 lufu.io, 1
 luggagecare.com, 1
-luggagechoices.com, 1
+luggagechoices.com, 0
 luggagehero.com, 1
 lugimax.com, 1
 luginbuehl.be, 1
 luginbuehl.eu, 1
+lugobama.tk, 1
 lugros.tk, 1
 lugui.in, 1
 luhn.be, 1
@@ -55478,6 +58544,7 @@
 luissotodesign.com, 1
 luisv.me, 1
 luisyr.com, 1
+luiza.ga, 1
 luizkowalski.net, 1
 luje.net, 1
 luje.nl, 1
@@ -55494,6 +58561,7 @@
 lukasfelder.tk, 1
 lukasfunk.com, 1
 lukaskollmer.de, 1
+lukasldc.com, 1
 lukasmatuska.cz, 1
 lukasrod.cz, 1
 lukasschauer.de, 1
@@ -55507,19 +58575,29 @@
 luke.ch, 1
 luke6887.me, 1
 lukeistschuld.de, 1
+lukekuza.com, 1
+lukekuza.me, 1
 lukem.net, 1
 lukeng.net, 1
+luker.org, 1
 lukersallamericanstorage.com, 1
+lukersstorage.com, 1
+lukerstorage.com, 1
+lukertech.net, 1
 lukesbouncycastlehire.com, 1
 lukestebbing.com, 1
 lukesutton.info, 1
 lukezweb.tk, 1
 lukin.ga, 1
+lukka.tk, 1
 lukmanulhakim.id, 1
 lukonet.com, 1
 luksusy.pl, 1
 lukull-pizza.de, 1
+lule-kendo.tk, 1
+luls.tk, 1
 lumbercartel.ca, 1
+lumberjackman.tk, 1
 lumbre-encendedores.com, 1
 lumchan.tk, 1
 lumen.sh, 1
@@ -55532,6 +58610,7 @@
 lumien.net, 1
 lumieredesoy.com, 1
 lumierewithinspirato.com, 1
+luminaire-mobilier-design.be, 1
 luminaire.fr, 1
 luminaproject.ml, 1
 luminary.pl, 1
@@ -55545,6 +58624,7 @@
 lumpov.com, 1
 lumpy.ga, 1
 lums.se, 1
+luna-corazon.net, 1
 luna-zen.fr, 1
 lunaballoonclub.com.au, 1
 lunademiel.org, 1
@@ -55558,6 +58638,7 @@
 lunaretna.com, 1
 lunarflake.com, 1
 lunarhost.cf, 1
+lunaribes.ch, 0
 lunarlog.com, 1
 lunarshark.com, 1
 lunarsoft.net, 1
@@ -55568,6 +58649,7 @@
 lundlist.net, 1
 lune-indigo.ch, 0
 lunepieters.co.za, 1
+lunextd.com, 1
 lungta.pro, 1
 lunidea.ch, 0
 lunight.ml, 1
@@ -55588,6 +58670,7 @@
 luongvu.com, 1
 luoshifeng.com, 1
 luosonghao.com, 1
+luotbike.vn, 1
 luowu.cc, 1
 luoxingyu.ml, 1
 lupa.cz, 1
@@ -55597,14 +58680,14 @@
 lupinenorthamerica.com, 1
 luqsus.pl, 1
 luripump.se, 1
-lushan.me, 1
+lurishop.com.br, 1
 lushersolutions.com, 1
 lushnikov-alex.ru, 1
 lushnja.tk, 1
 lusis.fr, 1
 lusitec.pt, 1
 lusitom.com, 1
-luso-livros.net, 1
+luska.cz, 1
 lust.works, 1
 lusteniny.cz, 1
 lustin.fr, 1
@@ -55612,10 +58695,12 @@
 lusynth.com, 1
 lut.im, 1
 luteijn.biz, 1
+lutesite.tk, 1
 lutherus.tk, 1
 lutify.me, 1
 lutizi.com, 0
 lutoma.org, 1
+lutricia.tk, 1
 luu.moe, 1
 luukdebruincv.nl, 0
 luukklene.nl, 1
@@ -55631,9 +58716,8 @@
 lux-house.tk, 1
 luxarchive.tk, 1
 luxcraft.eng.br, 1
-luxe.digital, 1
+luxden.com, 1
 luxeblades.com, 1
-luxecalendar.com, 1
 luxedentalfl.com, 1
 luxedition.ru, 1
 luxegram.co, 1
@@ -55643,6 +58727,7 @@
 luxeturf.com.au, 1
 luxfosdecoenterprise.com, 1
 luxhome.tk, 1
+luxmare.hr, 1
 luxosemimos.com.br, 1
 luxplay.com.tw, 1
 luxsci.com, 1
@@ -55650,6 +58735,7 @@
 luxur.is, 1
 luxury-inside.vn, 1
 luxurydistribution.cz, 1
+luxurygifts.tk, 1
 luxuryhome.co.id, 1
 luxuryislandtrips.com, 1
 luxuryitaly.co.id, 1
@@ -55674,13 +58760,17 @@
 lvfc.co, 1
 lvftw.com, 1
 lvguitars.com, 1
+lvmoo.com, 1
 lvna.capital, 1
 lvnacapital.com, 1
 lvrsystems.com, 1
 lvtrafficticketguy.com, 1
 lw-addons.net, 1
+lw1.at, 1
 lwis.me, 1
+lwisa.ma, 1
 lwl-foej-bewerbung.de, 1
+lwnlh.com, 1
 lwsl.ink, 1
 lx-blog.cn, 1
 lxai.net, 1
@@ -55699,9 +58789,10 @@
 lydiawebfans.tk, 1
 lydudlejning.net, 1
 lyfbits.com, 1
-lyfebotanicals.com, 1
+lyfstylorganix.com, 1
 lyftrideestimate.com, 1
 lykope.com, 1
+lyla-pressing.com, 1
 lyme-regis-accommodation.co.uk, 1
 lymia.moe, 1
 lyna.ml, 1
@@ -55711,6 +58802,7 @@
 lyness.uk, 1
 lyngvaer.no, 1
 lynkmi.com, 1
+lynndye.com, 1
 lynnejeancleaning.com, 1
 lynnellneri.com, 1
 lynnesbian.space, 1
@@ -55719,6 +58811,9 @@
 lynsec.com, 1
 lynthium.com, 1
 lynx.nl, 1
+lynxbroker.cz, 1
+lynxbroker.pl, 1
+lynxbroker.sk, 1
 lynxpro.nl, 1
 lynxriskmanager.com, 1
 lyon-interactive.com, 1
@@ -55740,11 +58835,12 @@
 lysel.net, 1
 lysergion.com, 1
 lyst.co.uk, 1
-lyteclinic.com, 1
+lyteclinic.com, 0
 lytemedical.com, 1
 lyubov-sovmestimost.cf, 1
 lyuda.tk, 1
 lyukaacom.ru, 1
+lyuks-parfyum.tk, 1
 lyuly.com, 1
 lyx.dk, 1
 lz.sb, 1
@@ -55758,6 +58854,7 @@
 m-22.com, 1
 m-ast.de, 1
 m-beshr.tk, 1
+m-ch.ml, 1
 m-chemical.com.hk, 1
 m-epigrafes.gr, 1
 m-exchange.ml, 1
@@ -55772,6 +58869,7 @@
 m-net.de, 1
 m-office.pl, 1
 m-team.cc, 1
+m.directory, 1
 m.facebook.com, 1
 m.mail.ru, 1
 m.me, 1
@@ -55792,14 +58890,16 @@
 m2tm.fr, 1
 m3-gmbh.de, 1
 m30365.com, 1
+m365.co, 1
 m36533.com, 1
-m3e30.com, 1
+m42-gmbh.de, 1
 m4570.xyz, 1
 m4all.gr, 1
 m4g.ru, 1
 m4rcus.de, 1
 m5197.co, 1
 m6729.co, 1
+m6729.com, 1
 m6957.co, 1
 m6pub.fr, 0
 m7rxx.com, 1
@@ -55816,6 +58916,9 @@
 ma-ze-linux.tk, 1
 ma2t.com, 1
 maagdesigns.com.uy, 1
+maahchepen.tk, 1
+maailm.tk, 1
+maaldrift.tk, 1
 maalexi.com, 1
 maaret.de, 1
 maarivpn.com, 1
@@ -55823,6 +58926,7 @@
 maartenvandekamp.nl, 1
 maasstaddinerexpres.nl, 1
 maatwerkopruimcoaching.nl, 1
+maatwerkzorgcoaching.nl, 1
 maavicorp.com, 0
 maaya.jp, 1
 mabankonline.com, 1
@@ -55839,6 +58943,7 @@
 macabacus.com, 1
 macangus-wainwright.com, 1
 macaos.com, 1
+macapflag.com, 1
 macappstudio.com, 1
 macappstudiobridge.com, 1
 macaque.io, 0
@@ -55849,12 +58954,12 @@
 macautocouture.gq, 1
 macawos.com, 1
 macaws.org, 1
-macbay.net, 0
 macbook.es, 1
 macc.org.my, 1
 maccabi-dent.com, 1
 macedonian-hotels.com.mk, 1
 macedonian-hotels.mk, 1
+macehead.tk, 1
 maceinturecuir.com, 1
 maces-net.de, 1
 macgeneral.de, 1
@@ -55869,9 +58974,9 @@
 machin.email, 1
 machinatio.ga, 1
 machine.email, 1
+machineaecrire.fr, 1
 machinebazar.com, 1
 machineidle.com, 1
-machinerysafety101.com, 1
 machinetransport.com, 1
 machissenefre.ga, 1
 macho-i-botan.tk, 1
@@ -55913,6 +59018,7 @@
 macreports.com, 1
 macros.co.jp, 1
 macroseo.tk, 1
+macslure.com, 1
 macsupportnacka.se, 1
 macsupportstockholm.se, 1
 macupdate.com, 1
@@ -55929,6 +59035,7 @@
 madbicicletas.com, 1
 madbin.com, 1
 madbouncycastles.co.uk, 1
+madcs.nl, 1
 maddi.biz, 1
 maddin.ga, 1
 maddistonevangelical.co.uk, 1
@@ -55945,13 +59052,13 @@
 madebyvasilis.site, 1
 madeconsultingsrl.it, 1
 madedwell.com, 1
+madeglobal.com, 1
 madeincana.com, 1
 madeinolive.com, 0
 madeinrussia.com, 1
 madeinstudio3.com, 1
 madeintucson.org, 1
 madeira.link, 1
-madeloc.com, 1
 mademoe.com, 1
 maden.com, 1
 madepalestine.com, 1
@@ -55962,11 +59069,15 @@
 madhyrecords.com, 1
 madian.tk, 1
 madin.ru, 1
+madinina.tk, 1
 madirc.net, 1
 madisoncountyhelps.com, 1
 madisonent-facialplasticsurgery.com, 1
+madisonivy.space, 1
 madisonprocaccini.tk, 1
+madisonsjewelersorlando.com, 1
 madisonsquarerealestate.com, 1
+madlandezboard.tk, 1
 madler.com.ua, 1
 madluging.tk, 1
 madmar.ee, 1
@@ -55977,6 +59088,7 @@
 madokami.net, 1
 madokami.pw, 1
 madonnadellafibra.gq, 1
+madprod.tk, 1
 madpsy.uk, 1
 madrants.net, 1
 madrasareforms.cf, 1
@@ -55992,6 +59104,7 @@
 madsstorm.dk, 1
 madteam.tk, 1
 madtec.de, 1
+madtown.tk, 1
 maduracion.com, 1
 maduradas.info, 1
 maduradas.net, 1
@@ -56014,12 +59127,15 @@
 maff.co.uk, 1
 maff.scot, 1
 mafia-penguin.club, 1
+mafia-web.tk, 1
 mafia.network, 1
 mafiaclan.tk, 1
 mafiaclub.ml, 1
 mafiaforum.de, 1
+mafiamohaa.tk, 1
 mafiapenguin.club, 1
 mafiasi.de, 1
+mafondue.ch, 0
 mafy.fi, 1
 mag-led.com, 1
 magaconnection.com, 1
@@ -56043,9 +59159,11 @@
 magazone.ml, 1
 magbt.net, 1
 magdafornal.pl, 1
+magdalenatransa.tk, 1
 magdeburg.directory, 1
 magdic.eu, 1
 magebit.com, 1
+magebrawl.com, 1
 magellan-met.ru, 1
 magenbrot.net, 0
 magenda.sk, 1
@@ -56053,7 +59171,7 @@
 magentaize.net, 1
 magentoeesti.eu, 1
 magepro.fr, 1
-magetsi.co.zw, 1
+magescobd.com, 1
 magewell.nl, 1
 maggie-shaw.co.uk, 0
 maggie.com, 1
@@ -56078,6 +59196,7 @@
 magicdaysomagh.co.uk, 1
 magicdlp.com, 1
 magiciansofchaos.tk, 1
+magicitaca.com, 1
 magicjudges.org, 1
 magiclen.org, 1
 magicline.com, 1
@@ -56088,7 +59207,29 @@
 magicspaceninjapirates.de, 1
 magicstay.com, 1
 magictable.com, 1
+magicvaporizers.at, 1
+magicvaporizers.be, 1
+magicvaporizers.co.uk, 1
 magicvaporizers.com, 1
+magicvaporizers.cz, 1
+magicvaporizers.de, 1
+magicvaporizers.dk, 1
+magicvaporizers.ee, 1
+magicvaporizers.es, 1
+magicvaporizers.fi, 1
+magicvaporizers.fr, 1
+magicvaporizers.gr, 1
+magicvaporizers.hr, 1
+magicvaporizers.hu, 1
+magicvaporizers.ie, 1
+magicvaporizers.it, 1
+magicvaporizers.lu, 1
+magicvaporizers.nl, 1
+magicvaporizers.pl, 1
+magicvaporizers.pt, 1
+magicvaporizers.se, 1
+magicvaporizers.si, 1
+magicvaporizers.sk, 1
 magicvodi.at, 1
 magikbyte.com, 1
 magilio.com, 1
@@ -56115,17 +59256,21 @@
 magneticarrow.com, 1
 magneticarrowdev.com, 1
 magneticattraction.com.au, 1
+magneticmoney.de, 1
 magnetoscopio.tk, 1
 magnetoterapiapertutti.com, 1
 magnetpass.uk, 1
 magnets.jp, 1
+magnetto.ga, 1
 magnettracker.com, 1
+magnewsblog.com, 1
+magnewspress.com, 1
+magniezetassocies.fr, 1
 magnificentdata.com, 1
 magniflood.com, 1
 magnitola.ml, 1
 magnoliadoulas.com, 1
 magnoliastrong.com, 1
-magnumwallet.co, 1
 magnunbaterias.com.br, 1
 magodasredes.com.br, 1
 magonote-nk.com, 1
@@ -56141,6 +59286,7 @@
 magwin.co.uk, 1
 magyarepitok.hu, 1
 mah-nig.ga, 1
+mahabharat.tk, 1
 mahadihasan.cf, 1
 mahadsunnah.com, 1
 mahadulmuneer.org, 1
@@ -56150,6 +59296,7 @@
 mahaskacountyia.gov, 1
 mahatmayoga.org, 1
 mahawi.sk, 1
+mahayana.tk, 1
 mahealthsurveys.gov, 1
 mahgu.com, 1
 mahjong-navi.com, 1
@@ -56167,6 +59314,7 @@
 maichun.info, 1
 maid.tk, 1
 maidenliput.fi, 1
+maidenworld.tk, 1
 maidoty.net, 1
 maiebanatulfruncea.com, 1
 maiet.net, 1
@@ -56178,6 +59326,7 @@
 maikoloc.com, 1
 mail-de.jp, 1
 mail-delivery.ga, 1
+mail-ink.com, 1
 mail-rotter.de, 1
 mail-settings.google.com, 1
 mail.ac, 1
@@ -56185,6 +59334,7 @@
 mail.de, 1
 mail.google.com, 1
 mail.storage, 1
+mail.tm, 1
 mail.yahoo.com, 0
 mail180.com, 1
 mail4you.in, 1
@@ -56195,7 +59345,6 @@
 mailboy.ml, 1
 mailcubexs.tk, 1
 maildrops.tk, 1
-mailer.site, 1
 mailex.cf, 1
 mailexpresso.tk, 1
 mailexx.ga, 1
@@ -56215,6 +59364,7 @@
 maillady-susume.com, 1
 mailmaid.de, 1
 mailman.ml, 1
+mailmaster.tk, 1
 mailmerc.com, 1
 mailmum.io, 1
 mailnara.co.kr, 1
@@ -56228,9 +59378,10 @@
 mailto.space, 1
 mailtobiz.tk, 1
 mailtracker.ml, 1
-mailtrap.io, 0
+mailtrap.io, 1
 mailum.org, 0
 mailwala.tk, 1
+mailway.io, 1
 mailxpress.ga, 1
 main-freedom.ru, 1
 main1.host, 1
@@ -56241,6 +59392,8 @@
 mainhattan-handwerker.de, 1
 mainlined.org, 1
 mainquest.org, 1
+mainstreetartisans.com, 1
+maintainyourwebsite.help, 1
 maintenance-traceur-hp.fr, 1
 maintenancemtp.fr, 1
 mainzelmaennchen.net, 1
@@ -56248,9 +59401,9 @@
 mairie-landry.com, 1
 mairie-sornay.fr, 1
 mairiedemoncelsurseille.com, 1
+mairimcosmetics.com, 1
 maisallianz.com, 1
 maisapanama.com, 1
-maisbrazucas.com.br, 1
 maiscelular.com.br, 1
 maiscuidar.com, 1
 maisecom.com.br, 1
@@ -56261,6 +59414,7 @@
 maison-haimard.fr, 1
 maisonanimale.com.br, 1
 maisondoree.be, 1
+maisondureau.fr, 1
 maisonmere.group, 1
 maisonpaulmier.fr, 1
 maisretorno.com, 1
@@ -56290,14 +59444,15 @@
 majkyto.cz, 1
 majlovesreg.one, 1
 majolka.com, 1
+majorpaintingco.com, 1
 majorpussycum.com, 1
 makaleci.com, 1
 makalu.me, 1
 makangratis.id, 1
-makanin.com, 1
 makariza.com.co, 1
 makasetesan.com, 1
 make-your-own-song.com, 1
+make.org, 1
 makeagif.com, 1
 makechanges.com.au, 1
 makecharcoal.com, 1
@@ -56327,6 +59482,7 @@
 makeuplove.nl, 1
 makeurbiz.com, 1
 makewebbetter.com, 1
+makfra.com, 1
 makhmudov.net, 1
 maki-chan.de, 1
 makinen.ru, 1
@@ -56334,16 +59490,19 @@
 makingmoneyathome.tk, 1
 makingmoves.gq, 1
 makita-online.kz, 1
+makkiyaz.tk, 1
 makkusu.photo, 1
 makkyon.com, 1
 maklerinfo.biz, 1
 makmasks.com, 1
 makocontrols.com, 1
 makohu.tk, 1
+makonet.com.au, 1
 makos.jp, 1
 makowitz.cz, 1
 maksa.ga, 1
 maksatmoda.com, 1
+maksimmrvica.tk, 1
 maksimyugai.com, 1
 maksmedia.tk, 1
 maksonshop.ga, 1
@@ -56353,6 +59512,7 @@
 maktoob.search.yahoo.com, 0
 makuonline.tk, 1
 makura.fun, 1
+malabarismo.tk, 1
 malachiteauth.com, 1
 maladie-autoimmune.fr, 1
 malahov.tk, 1
@@ -56376,7 +59536,6 @@
 maldives-showing.cf, 1
 maldives.cx, 1
 male-cats-spray.ml, 1
-malediven.biz, 1
 maleevcues.com, 1
 malek3d.com.br, 1
 malenaamatomd.com, 1
@@ -56395,12 +59554,14 @@
 malibuexteriorlighting.com, 1
 malibulingerie.com, 1
 malibumodas.com.br, 1
+maliciousdeath.tk, 1
 malie.it, 1
 malik.holdings, 1
 malik.id, 1
 malikdeenarislamicacademy.tk, 1
 malikussa.id, 1
 malikussaid.com, 1
+malimusavirler.tk, 1
 malinaclub.com, 1
 malinheadview.ie, 1
 malisheva-blog.ga, 1
@@ -56424,6 +59585,7 @@
 malrox.com, 1
 malscan.com, 0
 malsignature.com, 1
+malsoftware.com, 1
 malta-firma.com, 1
 maltasite.tk, 1
 maltaultrastifo.tk, 1
@@ -56444,6 +59606,7 @@
 malwr.ee, 1
 malypiesekzuzi.pl, 1
 malysvet.net, 0
+mamabali-spa.com, 1
 mamabatataya.com, 1
 mamabepo.com, 1
 mamadoma.com.ua, 1
@@ -56460,28 +59623,31 @@
 mambos.tk, 1
 mamburao.tk, 1
 mame.cl, 1
+mameymiami.com, 1
+mamijaclean.tk, 1
 mammabelly.com.br, 1
+mammaklader.tk, 1
 mammal-taxonomy.tk, 1
 mammals.net, 1
 mammaw.com, 1
 mammooc.org, 1
 mammothlakesmls.net, 1
 mamochka.org.ua, 0
+mamodsteam.tk, 1
 mamohe.de, 1
 mamoni.co, 1
 mamospienas.lt, 1
-mamot.fr, 0
 mamradost.sk, 1
 mamsds.com, 1
 mamtapark.tk, 1
 mamuko.nl, 1
 mamunlyric.tk, 1
 man-stuff.co.uk, 1
+man-trailer.com, 1
 man3s.jp, 0
 mana.ee, 1
 manach.net, 1
 manage.cm, 1
-manage.com, 1
 manageathome.co.uk, 1
 managedhosting.de, 1
 managedserver.it, 1
@@ -56506,6 +59672,7 @@
 manawill.jp, 1
 manawithtea.com, 1
 manbetx1998.live, 1
+manboy.tk, 1
 manchestertechservices.co.uk, 1
 mancrates.com, 1
 mandai-f.jp, 1
@@ -56531,6 +59698,8 @@
 mandrill.fr, 1
 manducoshop.com, 1
 mandynamic.gr, 1
+mandzak.com, 1
+manegehenriet.tk, 1
 maneggio.milano.it, 1
 manelli.fr, 1
 maneql.co.jp, 1
@@ -56552,6 +59721,9 @@
 mangapoi.com, 1
 mangareactor.tk, 1
 mangarosa.pt, 1
+mangaworld.gq, 1
+mangeur-de-cigogne.tk, 1
+mangga.cloud, 1
 mangnhuapvc.com.vn, 1
 mango-zajm.gq, 1
 mangomercado.com, 1
@@ -56559,7 +59731,11 @@
 mangotwoke.co.uk, 1
 manguyen.de, 1
 manhassetparkdistrictny.gov, 1
+manhattan-college.com, 1
 manhattanchoralensemble.org, 1
+manhattandermatologistsnyc.com, 1
+manhattangastroenterology.com, 1
+manhattanprimarycaredoctorsnyc.com, 1
 manhole.club, 1
 manhuagui.com, 1
 mani.tw, 1
@@ -56573,6 +59749,7 @@
 manicur-salon.tk, 1
 manicuradegel.com, 1
 manicuradegel.es, 1
+manikinuk.tk, 1
 manilacrawl.com, 1
 manilaprinciples.org, 1
 maniorpedi.com, 1
@@ -56596,6 +59773,7 @@
 manoha-proservices.fr, 1
 manoirdecontres.com, 1
 manojsharan.me, 1
+manolitodarts.tk, 1
 manonandre-avocat.fr, 1
 manopause.com, 1
 manoro.de, 1
@@ -56620,7 +59798,6 @@
 manti.by, 1
 mantor.org, 0
 mantra.pictures, 1
-mantri-chat.com, 1
 mantul.top, 1
 manualidadeson.com, 1
 manualidadespararegalar.online, 1
@@ -56657,8 +59834,10 @@
 manuelraimo.cf, 1
 manuelrueger.de, 0
 manufacturedhomemoving.com, 1
+manufacturing.gov, 1
 manufacturinginmexico.org, 1
 manufacturingsupportgroup.co.uk, 1
+manufacturingusa.com, 1
 manulife.ca, 1
 manuscripteditorial.com, 1
 manuscriptlink.com, 1
@@ -56692,6 +59871,7 @@
 maplegate.info, 1
 maplehome.tk, 1
 mapletime.com, 1
+maplewood.tk, 1
 mappingfutures.org, 1
 mappingspaceperu.com, 1
 mapresidentielle.fr, 1
@@ -56701,12 +59881,15 @@
 maquinariaspesadas.org, 0
 maquinasdecoserplus.com, 1
 maquinasperfectas.tk, 1
+maquinasquepiensan.tk, 1
 mar-eco.no, 1
+mar.pt, 1
+marabumadrid.com, 1
 marabunta.io, 1
 maracarlinicourses.com, 1
 maracit.tk, 1
 maransurology.com, 1
-maratondeclics.com, 1
+marasma.tk, 1
 marauderos.tk, 1
 marble.com, 1
 marbledentalcentre.ca, 1
@@ -56718,7 +59901,7 @@
 marc-beninca.fr, 1
 marc-hammer.de, 1
 marc-hoffrichter.de, 1
-marc-schlagenhauf.de, 1
+marc-schlagenhauf.de, 0
 marc.info, 1
 marcaixala.me, 1
 marcanhoury.com, 1
@@ -56732,6 +59915,7 @@
 marcel-veronetzki.de, 1
 marcel-waldvogel.ch, 1
 marcelabarrozo.tk, 1
+marcelino.cf, 1
 marcelinofranchini.com, 1
 marcelinofranchini.eu, 1
 marcelinofranchini.info, 1
@@ -56769,10 +59953,11 @@
 marcohager.de, 1
 marcoherten.com, 1
 marcoklomp.nl, 1
+marcomooij.net, 1
+marcopierrard.fr, 1
 marcopolo-restaurant.com, 1
 marcoreitmeier.de, 1
 marcositaliandeli.co.uk, 1
-marcoslater.com, 1
 marcosocio.com, 0
 marcosteixeira.tk, 1
 marcotics.nl, 1
@@ -56780,13 +59965,14 @@
 marcus.pw, 0
 marcusburghardt.tk, 1
 marcusds.ca, 1
+marcuskoh.com, 1
+marcusporter.tk, 1
 marcusstafford.com, 1
 marcyacademiademusica.com.ar, 1
 mardelcupon.com, 1
 mardigrasnapkins.com, 1
 mare-sylt.de, 1
 mare92.cz, 1
-mareamoda.com, 1
 marechal-company.com, 1
 marek.su, 1
 marekherel.cz, 1
@@ -56795,6 +59981,7 @@
 maresencial.com, 1
 marex.host, 1
 marga-marga.tk, 1
+marga.tech, 1
 margagriesser.de, 1
 margan.ch, 1
 margaret.land, 1
@@ -56813,6 +60000,8 @@
 margots.life, 1
 margots.tech, 1
 marguerite-maison.fr, 1
+marhobateren.tk, 1
+maria-blanco.tk, 1
 maria-galland.cz, 1
 maria-kirilenko.tk, 1
 mariafernanda.com.br, 1
@@ -56838,13 +60027,13 @@
 maridonlaw.com, 1
 marie-pettenbeck-schule.de, 1
 marie.club, 1
+mariecurie.tk, 1
 mariehane.com, 1
 mariejulien.com, 1
 marielinepitre.com, 1
 marielouise-oliwkiewicz.nl, 1
 marielouise.tk, 1
 mariemiramont.fr, 1
-mariendistel-tee.de, 1
 mariereichl.cz, 1
 mariescountymo.gov, 1
 marietrap.ch, 1
@@ -56860,6 +60049,7 @@
 marin-business-center.ch, 0
 marin-dom.ru, 0
 marin-tullet.com, 0
+marina-group.tk, 1
 marina-tsvetaeva.ml, 1
 marinapetruzio.it, 1
 marinapozzoli.tk, 1
@@ -56876,13 +60066,13 @@
 marinelife.store, 1
 marinella.tk, 1
 marinershousecalstock.com, 1
-marinersins.com, 1
 marinettecountywi.gov, 1
 maringalazer.com.br, 1
 mario-ancic.tk, 1
 marioabela.com, 1
 marioberluchi.by, 0
 mariogarcia.tk, 1
+mariogb.com, 1
 mariogeckler.de, 0
 marioncountyohio.gov, 1
 marioserver.ml, 1
@@ -56919,12 +60109,14 @@
 markdaine.com, 1
 markdaine.net, 1
 markdown.help, 1
+markecubanos.com, 1
 markellos-olive.gr, 1
 markenet.co, 1
 markentier.tech, 1
 markepps.com, 1
 market-vanna.ru, 1
 market.android.com, 1
+marketbasket.tk, 1
 marketcavalli.it, 1
 marketespace.fr, 0
 marketfeed.news, 1
@@ -57022,6 +60214,7 @@
 markuskeppeler.de, 1
 markuskeppeler.no-ip.biz, 1
 markuslintula.fi, 1
+markusribs.com, 1
 markusritzmann.ch, 1
 markusueberallassetmanagement.de, 1
 markusueberallconsulting.de, 1
@@ -57029,19 +60222,22 @@
 markxpdesign.ga, 1
 marl.fr, 1
 marleenjacobi.de, 1
+marlenefavela.tk, 1
 marliesfens.nl, 1
 marliesslomp.nl, 1
 marloncommunications.com, 1
 marlonlosurdopictures.com, 1
 marlosoft.net, 1
+marmaladetoast.co.za, 1
 marmaluot.com, 1
 marmista.roma.it, 1
+marmo.tk, 1
 marmolesromero.com, 1
-marmor-resmini.de, 1
 marmotte.love, 1
-marmuif.fr, 1
 marny.eu, 1
 marocmail.ma, 1
+marocweb.tk, 1
+marokkaansearganolie.nl, 1
 marolu.one, 1
 maroquineriepirlot.be, 0
 maroshionline.tk, 1
@@ -57050,6 +60246,7 @@
 marqperso.ch, 1
 marquepersonnelle.ch, 1
 marqueswines.co.uk, 1
+marquisepools.com, 1
 marrai.de, 1
 marriage-shrine.jp, 1
 marrickvilleapartments.com.au, 1
@@ -57068,6 +60265,8 @@
 marshmallow.com, 1
 marshop.tk, 1
 marsikelektro.cz, 1
+marsilioblack.tk, 1
+marsmediavideo.com, 1
 marsoftyazilim.com, 1
 marta.uz, 0
 martasibaja.com, 1
@@ -57085,11 +60284,14 @@
 marthus.com.br, 1
 marti201.ga, 1
 martialarts-wels.at, 1
+martialartsbrownsplains.ga, 1
 martian.community, 1
 martian.tk, 1
 martide.com, 1
+martijnschreuders.tk, 1
 martijnvanderzande.nl, 1
 martijnvdputten.tk, 1
+martin-burger.net, 1
 martin-loewer.de, 1
 martin-mattel.com, 1
 martin-prell.de, 1
@@ -57102,10 +60304,13 @@
 martinboerhof.nl, 1
 martincernac.cz, 1
 martindales.ltd.uk, 1
+martindano.com, 1
 martindoe.pl, 1
 martine.nu, 1
 martinelias.cz, 1
 martineweitweg.de, 1
+martinhal.pl, 1
+martinhalresidences.com, 1
 martinhaunschmid.com, 1
 martinho.tk, 1
 martinishotpodcast.com, 1
@@ -57117,6 +60322,8 @@
 martinschulze.org, 1
 martinsfamilyappliance.com, 1
 martinsferryoh.gov, 1
+martinus.cafe, 1
+martinverkerkonline.tk, 1
 martinvillalba.com, 1
 martinvillalba.com.ar, 1
 martinvillalba.info, 1
@@ -57124,6 +60331,8 @@
 martinvillalba.org, 1
 martonmihaly.hu, 1
 martonveronika.tk, 1
+martstroy.ru, 1
+marturet.com, 0
 martvila.com, 1
 marufmusic.tk, 1
 maruhoi.com, 1
@@ -57136,6 +60345,7 @@
 marvin-elsen.com, 1
 marvin.rocks, 1
 marvingazibaric.io, 1
+marvinkeller.de, 0
 marvnet.cf, 1
 marvnet.design, 1
 marvnet.ga, 1
@@ -57152,11 +60362,13 @@
 marvnetforum.gq, 1
 marvnetforum.ml, 1
 marvnetforum.tk, 1
+marw.org, 1
 marxist.party, 1
 marxists.org, 1
 marxmyths.org, 1
 marxpark.tk, 1
 marycliffpress.com, 1
+marycowanceramics.com, 1
 maryeclark.com, 1
 maryeileen90.party, 1
 maryhaze.net, 1
@@ -57164,6 +60376,7 @@
 marylandbasementandcrawlspacewaterproofing.com, 1
 marylandtraditions.org, 1
 maryluzturismo.co, 1
+marymaloney.tk, 1
 marypatriotnews.com, 1
 marzio.co.za, 1
 masajeadorespremium.com, 1
@@ -57185,6 +60398,7 @@
 masdemariette.com, 1
 masdemexico.com, 1
 masduta.co, 1
+masdzub.com, 1
 maservant.net, 1
 mashairi.co.ke, 1
 mashandco.it, 1
@@ -57195,16 +60409,18 @@
 mashonkavortu.tk, 1
 masiniunelte.store.ro, 1
 masiul.is, 1
+mask-skin.tk, 1
 maskerking.com, 1
 maskim.fr, 1
 maskinkultur.com, 1
+maskova.net, 1
 maskpol.com.pl, 1
 maskssouthafrica.co.za, 1
 maskssouthafrica.com, 1
 maslenka.tk, 1
 maslife365.com, 1
 maslin.io, 1
-maslows.ru, 1
+masmusica.tk, 1
 masmusicaradio.tk, 1
 masonicangelfund.org, 1
 masquerade.site, 0
@@ -57214,6 +60430,7 @@
 mass.pt, 1
 massaboutique.com, 1
 massage-colleges.com, 1
+massage-technique.tk, 1
 massage-vitalite.fr, 1
 massage-well.ch, 1
 massageandwellbeing.com, 1
@@ -57228,7 +60445,6 @@
 massflix.com, 1
 massfone.com, 1
 masshost.tk, 1
-masshvac.com, 1
 massive.tk, 1
 massotherapeutique.com, 1
 masstercurssos.com, 1
@@ -57254,6 +60470,7 @@
 masterdigitale.com, 1
 masterdrilling.com, 1
 masterhelenaroma.com, 1
+masterhoteis.com.br, 1
 masterin.it, 1
 masterminer.tk, 1
 masternetix.ga, 1
@@ -57263,12 +60480,15 @@
 masterpieceitaly.co.id, 1
 masterplc.com, 1
 masterplumber.coach, 1
-masterpro1.ru, 1
+masterquest.tk, 1
 masters-burrell.co.uk, 1
 masters.black, 1
 mastersadistancia.com, 1
+mastersofmedia.nl, 1
 mastersthesiswriting.com, 1
+masterstruckingacademy.com, 1
 masterstuff.de, 1
+mastersystem.ro, 1
 mastervision.tk, 1
 masterwank.com, 1
 masterwayhealth.com, 1
@@ -57283,6 +60503,7 @@
 mastodon.top, 1
 mastodon.uno, 1
 mastpartners.com, 1
+maswali.com, 1
 mat-ras.com, 1
 mat.com.vn, 1
 mat.tt, 1
@@ -57300,6 +60521,7 @@
 matchupmagic.com, 1
 matdesign-prod.com, 1
 matebalazs.hu, 1
+mateball.io, 0
 matega.hu, 1
 matehierba.cl, 1
 mateidibu.org, 1
@@ -57315,17 +60537,18 @@
 materiaischiquinho.com.br, 1
 material-ui.com, 1
 material-world-fuyouhin.com, 1
+materialflow.com, 1
 materialism.com, 1
 materialyinzynierskie.pl, 1
 materiel-grand-format.fr, 1
 maternum.com, 1
 mateu.us, 1
-mateusmeyer.com.br, 1
 mateuszchyla.pl, 1
 mateuszkopytko.pl, 1
 mateuszmajewski.com, 1
 mateuszpilszek.pl, 1
 matex-tokyo.co.jp, 1
+matgauthanky.com, 1
 matglobal.tech, 1
 matgodt.no, 1
 math-coaching.com, 1
@@ -57334,11 +60557,14 @@
 mathalexservice.info, 1
 mathavuzteknolojileri.com.tr, 1
 mathchall.net, 1
+matheball.de, 1
+mathebau.de, 1
 mathematik.rocks, 1
 matheo-schefczyk.de, 1
 mathers.ovh, 1
 mathes.berlin, 1
 matheusmacedo.ddns.net, 1
+mathewlane.com, 1
 mathfinder.org, 0
 mathhire.org, 1
 mathias.is, 1
@@ -57347,10 +60573,10 @@
 mathiasgarbe.de, 1
 mathiasheise.de, 1
 mathiaswagner.org, 1
-mathieuescos.fr, 1
 mathieuguimond.com, 1
 mathieui.net, 1
 mathijskingma.nl, 1
+mathilderegis.fr, 1
 mathis.com.tr, 1
 mathiteia.com, 1
 mathiveri.tk, 1
@@ -57366,6 +60592,7 @@
 matijakolaric.com, 1
 matildajaneclothing.com, 1
 matildeferreira.co.uk, 1
+matinataskincare.com, 1
 matipl.pl, 1
 matjaz.it, 1
 matkuling.no, 1
@@ -57375,6 +60602,7 @@
 matok.me.uk, 1
 matome-surume.com, 1
 matoutepetiteboutique.com, 1
+matov.tk, 1
 matovaya-pomada.ml, 1
 matozone.com, 1
 matpools.com, 1
@@ -57393,11 +60621,12 @@
 matrix.co, 1
 matrix.org, 1
 matrixbricks.com, 1
+matrixfm.tk, 1
 matrixglobalsms.com, 1
 matrixmedia.ro, 1
 matrixread.com, 1
 matrixreq.com, 1
-matronal.ru, 0
+matronal.ru, 1
 matsu-semi.com, 1
 matsushima-kosodate.com, 1
 matt-brooks.com, 1
@@ -57432,12 +60661,15 @@
 matthecat.com, 1
 matthew-carson.info, 1
 matthew-cash.com, 1
+matthewbenchimol.com, 1
+matthewberry.co.za, 1
 matthewburket.com, 1
 matthewchapman.co.uk, 1
 matthewcollins.me, 1
 matthewfells.com, 1
 matthewgallagher.co.uk, 1
 matthewgrow.com, 1
+matthewimaniphotography.ga, 1
 matthewj.ca, 1
 matthewkenny.co.uk, 1
 matthewkerley.com, 1
@@ -57447,6 +60679,7 @@
 matthewprenger.com, 1
 matthewsaeger.com, 1
 matthewsetter.com, 1
+matthewsfuneralhome.com, 1
 matthewthode.com, 1
 matthewthode.net, 1
 matthewthode.org, 1
@@ -57474,6 +60707,7 @@
 mattmcshane.com, 1
 mattmoorcroft.com, 1
 mattmorrissound.co.uk, 1
+mattnetwork83.com, 1
 matton-ict.nl, 1
 mattonline.me, 1
 mattprojects.com, 1
@@ -57494,13 +60728,16 @@
 mau.photos, 1
 maubot.xyz, 1
 mauditeboisson.tk, 1
-mauerwerk.online, 1
 mauerwerkstag.info, 1
+mauhalito.tk, 1
 mauldincookfence.com, 1
+mauletsmallorca.tk, 1
+maumovie.ml, 1
 maunium.net, 1
 mauracher.cc, 1
 mauran.me, 0
 maurice-walker.com, 0
+mauricechavez.tk, 1
 mauricedb.nl, 1
 mauriceje.ga, 1
 mauricio-ochmann.tk, 1
@@ -57509,12 +60746,14 @@
 mauricioquadradoconsultor.com.br, 1
 mauricioquadradocontador.com.br, 1
 mauriciosilva.tk, 1
+mauriziomoretti.com, 1
 mauroalejandro.co, 1
 maurovacca.com, 1
 maury-moteurs.com, 1
+mausmani.tk, 1
 mausoleum.ga, 1
-mauwis.ro, 1
 maveeranpasupathi.tk, 1
+maven.ng, 1
 mavenclinic.com, 1
 mavensecurity.com, 1
 mavenvets.co.uk, 1
@@ -57534,23 +60773,23 @@
 max-went.pl, 1
 max.gov, 1
 max00365.com, 1
-max0365.com, 1
-max11365.com, 1
-max1365.com, 1
-max22365.com, 1
-max2365.com, 1
-max33365.com, 1
-max3365.com, 1
-max4365.com, 1
-max44365.com, 1
-max5365.com, 1
-max55365.com, 1
-max6365.com, 1
-max66365.com, 1
-max77365.com, 1
-max8365.com, 1
-max88365.com, 1
-max9365.com, 1
+max0365.com, 0
+max11365.com, 0
+max1365.com, 0
+max22365.com, 0
+max2365.com, 0
+max33365.com, 0
+max3365.com, 0
+max4365.com, 0
+max44365.com, 0
+max5365.com, 0
+max55365.com, 0
+max6365.com, 0
+max66365.com, 0
+max77365.com, 0
+max8365.com, 0
+max88365.com, 0
+max9365.com, 0
 maxb.fm, 1
 maxbeenen.de, 1
 maxbruckner.de, 1
@@ -57558,17 +60797,21 @@
 maxbuelk.de, 1
 maxbytes.nl, 0
 maxchan.info, 1
+maxclean.ml, 1
 maxcleaning.be, 1
 maxclers.com, 1
 maxdargent.com, 1
 maxedgymequipment.com, 1
+maxgamez.tk, 1
 maxh.me.uk, 1
 maxhamon.ovh, 1
 maxhoechtl.at, 1
 maxhorvath.com, 1
 maxibanki.ovh, 1
+maxico.tk, 1
 maxiglobal.net, 1
 maxiglobal.pt, 1
+maxihide.tk, 1
 maximarket.info, 1
 maximbaz.com, 1
 maximdeboiserie.be, 1
@@ -57608,7 +60851,6 @@
 maxr1998.de, 1
 maxrandolph.com, 1
 maxrider.tk, 1
-maxscripts.com, 1
 maxtruxa.com, 1
 maxundlara.at, 1
 maxundlara.com, 1
@@ -57647,7 +60889,6 @@
 maynesoftware.co.uk, 1
 mayomarquees.com, 1
 mayopartyhire.com, 1
-mayorcahill.com, 1
 mayorscouncil.ca, 1
 mayre-idol.tk, 1
 mayrhofer.eu.org, 0
@@ -57665,11 +60906,11 @@
 maze.fr, 0
 mazenjobs.com, 1
 mazepa.ml, 1
-mazi.io, 1
 mazloum.adv.br, 1
 mazternet.ru, 1
 mazurlabs.tk, 1
 mazury-invest.pl, 1
+mazzettigroup.com, 1
 mazzotta.me, 1
 mb-demo.net, 1
 mb-is.info, 1
@@ -57715,16 +60956,18 @@
 mburns.duckdns.org, 1
 mbwemmel-usedcars.be, 1
 mc-auth.com, 1
+mc-dos.ru, 1
 mc-jobs.net, 1
 mc-revolution.ru, 1
 mc-teemocraft.tk, 1
-mc-venture.net, 0
 mc-web.se, 1
 mc.ax, 1
 mc007.xyz, 1
 mc4free.cc, 1
 mc5zvezd.ru, 0
+mc81.com, 1
 mcadmin.net, 1
+mcagon.tk, 1
 mcatnnlo.org, 1
 mcblain.ca, 1
 mcblain.com, 1
@@ -57737,6 +60980,7 @@
 mccordsvillelocksmith.com, 1
 mccrackon.com, 1
 mcculloughjchris.com, 1
+mcculloughsgolf.com, 1
 mccurtainems.gov, 1
 mcdanieldevelopmentservices.com, 1
 mcdeed.net, 1
@@ -57756,8 +61000,10 @@
 mcfi.mu, 1
 mcfipvt.com, 1
 mcfx.us, 1
+mcg4loans.com, 1
 mcgaccountancy.co.uk, 1
 mcgavocknissanwichitaparts.com, 1
+mcgifreestore.com, 1
 mcgovernance.com, 1
 mcgrp.ru, 1
 mchaelkordomain.tk, 1
@@ -57776,6 +61022,8 @@
 mckay-bednar.net, 1
 mckendry.com, 1
 mckendry.consulting, 1
+mckenna.academy, 1
+mckeownshvac.com, 1
 mckernan.in, 0
 mckinley1.com, 1
 mckinleytk.com, 1
@@ -57788,7 +61036,6 @@
 mclinflatables.co.uk, 1
 mclmotors.co.uk, 1
 mclouds.ru, 1
-mcmillansedationdentistry.com, 0
 mcmillanskiclub.com.au, 1
 mcmk.in, 1
 mcnb.top, 1
@@ -57809,6 +61056,7 @@
 mcrn.jp, 1
 mcsa-usa.org, 1
 mcsdatum.co.uk, 1
+mcsidan.tk, 1
 mcsinflatables.co.uk, 1
 mcsmart.ru, 1
 mcsnovatamabayan.com, 1
@@ -57851,6 +61099,7 @@
 mditsa.de, 1
 mdiv.pl, 1
 mdlayher.com, 1
+mdleom.com, 1
 mdma.net, 1
 mdmed.clinic, 1
 mdns.eu, 1
@@ -57872,6 +61121,7 @@
 mdxn.org, 1
 mdzservers.com, 1
 me-center.com, 1
+me-dc.com, 0
 me-groups.com, 1
 me-news.tk, 1
 me-soft.nl, 1
@@ -57909,6 +61159,7 @@
 mebaneattorney.com, 1
 mebanesteakhouse.com, 1
 mebel-voronezh.cf, 1
+mebelconcept.tk, 1
 mebelisk.com.br, 1
 mebelshik.tk, 1
 mec010.com, 1
@@ -58230,11 +61481,13 @@
 mechanics-schools.com, 1
 mechanicweb.com, 1
 mechanixdirect.co.uk, 0
+mechanus.io, 1
 mechaspartans6648.com, 1
 mechbattlegrounds.com, 1
 mechmk1.me, 1
 mechok.ru, 1
 mechta.gq, 1
+mechtateli.eu, 1
 mecp.de, 1
 med-colleges.com, 1
 med-line.cf, 1
@@ -58265,11 +61518,11 @@
 medcartoon.com, 1
 medcenter.online, 1
 medcentr.online, 1
+medcentrnadezhda.ru, 1
 medcir.com.br, 1
 medcorfu.gr, 1
 medcrowd.com, 1
 meddatix.com, 1
-meddelare.com, 1
 meddigital.com, 0
 meddin.com, 1
 mede-handover.azurewebsites.net, 1
@@ -58278,7 +61531,7 @@
 medecinsdumonde.lu, 1
 medeinos.lt, 0
 medellinapartamentos.com, 1
-medeurope.info, 1
+medeurope.info, 0
 medexpress.co.uk, 1
 medfinancial.com, 1
 medguide-bg.com, 1
@@ -58294,6 +61547,7 @@
 media-valko.hu, 1
 media4u.tk, 1
 mediaarea.net, 1
+mediaareplural.ca, 1
 mediabackoffice.co.jp, 1
 mediablaster.com, 1
 mediabola.net, 1
@@ -58301,13 +61555,16 @@
 mediabooks.ml, 1
 mediabrandgroup.com, 1
 mediaburst.co.uk, 1
+mediacenter.dynv6.net, 1
 mediacloud.me, 1
+mediacluster.de, 1
 mediacritik.com, 1
 mediadex.be, 1
 mediafart.fr, 1
 mediafly.com, 1
 mediafocus.biz, 1
 mediaforkids.org, 1
+mediafresco.com, 1
 mediagenic.ch, 0
 mediagetnews.tk, 1
 mediagold.it, 1
@@ -58318,6 +61575,7 @@
 medialys.ca, 1
 mediamarket42.tk, 1
 mediamonitors.net, 1
+medianbases.ga, 1
 mediapart.fr, 1
 mediapath.gr, 1
 mediaplaytv.com.br, 1
@@ -58336,34 +61594,42 @@
 mediaweb.com.ve, 1
 mediawijsheid.nl, 1
 mediawijzer.net, 1
+mediawiki.com, 1
 mediawiki.org, 1
 mediawin.pl, 1
+mediawizards.co, 1
 mediayourway.ie, 1
 medibasket.co.in, 1
 medic-world.com, 1
-medicairsolutions.com, 1
 medical-assistant-colleges.com, 1
 medical-centr.tk, 1
+medical-safety-system.com, 1
 medicalabroad.org, 0
 medicalassistantadvice.com, 1
 medicalauction.ga, 1
 medicalcountermeasures.gov, 1
 medicallicensing.com, 1
+medicalonliner.tk, 1
 medicalpeople.tk, 1
 medicalphysicistservices.com, 1
+medicals-i.com, 1
 medicalsite.tk, 1
 medicaltools.de, 1
-medicano.site, 1
+medicano.site, 0
 medicardlimited.com, 1
 medicare-providers.net, 1
 medicarecoveragefinder.com, 1
 medicareful.com, 1
 medicareinfo.org, 1
+medicenteritalia.it, 1
 medichat.ml, 1
+medicina-antiage.com, 1
 medicina-news.tk, 1
 medicinae.solutions, 1
 medicinaesolutions.com, 1
 medicinaesolutions.com.br, 1
+medicinalflora.com.br, 1
+medicine-consultant.com, 1
 medicine.com, 1
 medicinesfast.com, 0
 medicinia.com.br, 1
@@ -58373,6 +61639,7 @@
 medicm.jp, 1
 medicocompetente.it, 1
 medicoleads.com, 1
+medicompany.tk, 1
 medicoresponde.com.br, 1
 medicosrecomendados.com, 1
 medicoway.ru, 1
@@ -58388,6 +61655,7 @@
 medik8.com.cy, 1
 medikalakademi.com.tr, 1
 medikuma.com, 1
+medimush.co.uk, 1
 medinacountyohio.gov, 1
 medinc.tk, 1
 medino.com, 1
@@ -58402,7 +61670,6 @@
 meditadvisors.com, 1
 meditarenargentina.org, 1
 meditateinolympia.org, 1
-meditation-kompass.de, 1
 meditation-rennes.org, 1
 meditel.nl, 1
 meditez.ca, 1
@@ -58449,11 +61716,11 @@
 medpostwalkincare.com, 1
 medpostwellness.com, 1
 medprozone.com, 1
-medradar.net, 1
 medrol.cf, 1
 medsanuk.co.uk, 1
 medsblalabs.com, 1
 medschat.com, 1
+medscope.tk, 1
 medservis.online, 1
 medsister.tk, 1
 medsourcelabs.com, 1
@@ -58475,6 +61742,7 @@
 medvet.com.es, 1
 medwaybouncycastlehire.co.uk, 1
 medy-me.com, 1
+medyascope.tv, 1
 medyotan.ga, 1
 medzinenews.com, 0
 meedoenhartvanwestbrabant.nl, 0
@@ -58500,10 +61768,11 @@
 meetingapplication.com, 1
 meetingmanage.nl, 1
 meetingmanager.ovh, 1
+meetjeslandsetriathlon.tk, 1
 meetmibaby.co.uk, 1
 meetmygoods.com, 1
 meetmyown.ga, 1
-meetscompany.jp, 1
+meetpoint.education, 1
 meetsummer.org, 1
 meeusen-usedcars.be, 0
 meevo.ca, 1
@@ -58554,9 +61823,13 @@
 megaron.at, 1
 megasslstore.com, 1
 megasupportcr.com, 1
+megateam.tk, 1
 megatravel.com.mx, 1
+megatyumen.ru, 1
 megauction.tk, 1
+megavasoc.com.ar, 1
 megawarez.org, 1
+megawebsite.tk, 1
 megawhat.energy, 1
 megaxchange.cash, 1
 megayachts.world, 1
@@ -58572,6 +61845,7 @@
 meh.is, 1
 mehalick.com, 1
 meharossii.ru, 1
+mehdavia.tk, 1
 mehdibouchema.be, 1
 mehdimassage.com, 1
 meherbaba.sk, 1
@@ -58606,7 +61880,7 @@
 mein-gehalt.at, 1
 mein-kuechenhelfer.de, 1
 mein-muehlhausen.bayern, 1
-mein-tortenladen.de, 1
+mein-neuer-garten.de, 1
 mein-webportal.de, 0
 meinbetriebsrat24.de, 1
 meincenter-meinemeinung.de, 1
@@ -58627,6 +61901,7 @@
 meinstartinsleben.de, 1
 meintragebaby.de, 1
 meinv.asia, 1
+meiqia.cn, 1
 meiqia.com, 1
 meisterlabs.com, 1
 meistertask.com, 1
@@ -58646,7 +61921,9 @@
 mejorespatineteselectricos.es, 1
 mejorwork.com, 1
 mejovonakowogov.gq, 1
+mekajen.com, 1
 mekaleskirit.tk, 1
+mekanagadde.com, 1
 mekanika.com.my, 1
 mekanismo.tk, 1
 mekanova.art, 1
@@ -58660,7 +61937,6 @@
 meklon.net, 1
 mekongmontessori.com, 1
 melagenina.tk, 1
-melaldesign.com, 1
 melanfengshui.com, 1
 melania-voyance.fr, 0
 melanie-guy.fr, 1
@@ -58683,15 +61959,14 @@
 meldcode-assistent.nl, 1
 meldjeaan.be, 1
 meldpuntemma.nl, 1
+meldsluikstort.gent, 1
 meldwekker.nl, 1
 mele.ro, 1
 meledia.com, 0
 melenchatsmelenchiens.fr, 1
-melerpaine.com, 1
 melhoresdominios.com, 1
 melhoresmarcasdenotebook.com.br, 1
 melhorproduto.com.br, 1
-meliggemert.nl, 1
 melihacar.com.tr, 1
 melikoff.es, 1
 melina-may.com, 1
@@ -58700,6 +61975,7 @@
 melissaadkins.com, 1
 melissaauclaire.com, 1
 melissageorge.tk, 1
+melissalb.tk, 1
 melissameuwszen.nl, 0
 melissaofficial.tk, 1
 meliyb.ga, 1
@@ -58715,6 +61991,7 @@
 melodiouscode.net, 1
 melodiouscode.uk, 1
 melody-lyrics.com, 1
+melodycenter.de, 1
 melonhub.com, 1
 meloniecharm.com, 1
 melonstudios.net, 1
@@ -58768,6 +62045,7 @@
 menaraannonces.com, 1
 menchez.me, 1
 mendel.tk, 1
+mendelsphotography.tk, 1
 menden.com, 1
 mendipbouncycastles.co.uk, 1
 mendix-apps.com, 1
@@ -58785,11 +62063,16 @@
 menfisonline.com, 1
 menfisonline.es, 1
 mengliangyun.xyz, 1
+menglong.me, 1
 mengma.pub, 1
+mengqingzhong.cn, 1
+mengqingzhong.com, 1
+mengqingzhong.com.cn, 1
 mengxin.life, 1
 menh.vn, 1
 menhera.org, 0
 menielias.com, 1
+menlosecurity.com, 1
 menn.tk, 1
 mennace.com, 1
 menno.me, 1
@@ -58801,26 +62084,30 @@
 mens-health.com.my, 1
 mens-qzin.jp, 1
 mens-v.com, 1
+mens-watch.tk, 1
 mensagemaniversario.com.br, 1
 mensagemdaluz.com, 1
 mensagensaniversario.com.br, 1
 mensagensdeconforto.com.br, 1
+mensajitos.tk, 1
 mensarena.gr, 1
 mensch-peter.me, 1
 menselijkembryo.tk, 1
 menshealthinsurance.com, 1
+menspeak.ga, 1
 menswear.tk, 1
 mental-check.jp, 1
 mentalcalculations.tk, 1
 mentalcraft.tk, 1
-mentalhealth.gov, 1
 mentalhealthmn.org, 1
 mentalproblems.tk, 1
 mentaltraining-fuer-musiker.ch, 1
 mentecuriosa.net, 1
+mentesinquietas.tk, 1
 menthiere.fr, 1
 mentiq.az, 1
 mentita.de, 1
+mentorbizlist.com, 1
 mentorbuk.com, 1
 mentoringauchan.es, 1
 mentors4stem.org, 1
@@ -58828,10 +62115,10 @@
 menu.fyi, 1
 menuel.me, 1
 menufree.org, 1
+menupay.com, 1
 menureader.ml, 1
 menurutparaahli.com, 1
 menzel4you.tk, 1
-meo.de, 1
 meodihoang.com, 1
 meow.plus, 1
 mepambalaj.com, 1
@@ -58904,6 +62191,7 @@
 merdacz.pl, 1
 mereni.cz, 1
 merenita.com, 1
+mergellina.tk, 1
 meric-graphisme.info, 1
 meridanas.me, 1
 meridianenvironmental.com, 1
@@ -58913,13 +62201,17 @@
 merikserver.tk, 1
 merimatka.fi, 1
 merkattumaa.tk, 1
+merkchest.tk, 1
+merke.tk, 1
 merkel.li, 1
 merkel.me, 1
 merkleforest.xyz, 1
 merlet.eu, 1
 merlin-memorial.de, 1
+merlin.dk, 1
 merlinsoap.com, 1
 merloaded.rocks, 1
+mermaidboattrips.com, 1
 mermakov.info, 1
 mero.co, 0
 merojob.com, 1
@@ -58937,8 +62229,10 @@
 merzai.co.uk, 1
 mes-bouquins.fr, 1
 mes-courriers.fr, 1
+mes-vacances.tk, 1
 mes10doigts.ovh, 1
 mesabi.ga, 1
+mesamoving.com, 1
 mesappros.com, 1
 mesareal.com.br, 1
 mesasysillas.site, 1
@@ -58947,6 +62241,7 @@
 mesec.cz, 1
 mesh.gov, 1
 mesh.org.ua, 1
+meshekard.co.il, 1
 meshintranet.com, 1
 meshok.info, 1
 meshok.ru, 1
@@ -58970,6 +62265,7 @@
 messengerwebbrands.com, 1
 messengerwebdesign.com, 1
 messer24.ch, 1
+messifan.tk, 1
 messymom.com, 1
 mestazitrka.cz, 1
 mesvision.com, 1
@@ -59027,6 +62323,7 @@
 metasyntactic.xyz, 1
 metasysteminfo.com, 1
 metaurl.io, 1
+metavr.ru, 1
 metaword.com, 1
 metaword.net, 1
 metaword.org, 1
@@ -59046,6 +62343,7 @@
 meteobox.tk, 1
 meteocat.net, 1
 meteocuenca.tk, 1
+meteohuertamur.tk, 1
 meteonederbetuwe.nl, 1
 meteoradar.ch, 1
 meteorapp.space, 1
@@ -59062,9 +62360,11 @@
 methodfactory.com, 1
 methotrexatee.gq, 1
 methotrexates.gq, 1
+methusalem.tk, 1
 methylone.com, 1
 metin2blog.de, 1
 metin2sepeti.com, 1
+metkos.pl, 1
 metod.photo, 1
 metop.de, 1
 metric.ai, 1
@@ -59074,10 +62374,12 @@
 metrix.design, 0
 metro-detroit.com, 1
 metro-lawn-care.com, 1
+metro-vet.co.uk, 1
 metro-web.net, 1
 metroairvirtual.com, 1
 metrobriefs.com, 0
 metrocarremovals.com, 1
+metrocraft2033.tk, 1
 metrodemaracaibo.tk, 1
 metrodetroitmommy.com, 1
 metrolaut.de, 1
@@ -59093,6 +62395,7 @@
 metroplex.me, 1
 metropole.com.au, 1
 metropolis.ga, 1
+metropolis5000.tk, 1
 metropolisil.gov, 1
 metropop.ch, 0
 metrorealestatepros.com, 1
@@ -59102,6 +62405,7 @@
 mettekopp.dk, 1
 mettelenejohansson.dk, 1
 mettin.org, 1
+mettle.co.uk, 1
 metube.icu, 1
 metyweb.ga, 0
 metz-metropolitain.fr, 1
@@ -59110,6 +62414,7 @@
 meubanco7.com.br, 1
 meugamer.com, 1
 meuhfolle.com, 1
+meulenerkes.tk, 1
 meulk.co.uk, 1
 meulocal.ml, 1
 meupatrocinio.com, 1
@@ -59118,6 +62423,7 @@
 meusigno.com, 1
 mevanshop.com, 0
 mevo.xyz, 1
+mevrouwtjepeper.nl, 1
 mevs.cz, 1
 mevsim.com, 1
 mew.build, 1
@@ -59144,10 +62450,12 @@
 mf-fischer.de, 1
 mf-natuurfotografie.nl, 1
 mf58.de, 1
+mfatravaux.fr, 1
 mfedderke.com, 1
 mfen.de, 1
 mfg-forex.com, 1
 mfg-fx.com, 1
+mfgo.link, 1
 mfgusa.com, 1
 mfiles.pl, 1
 mfin.services, 1
@@ -59160,6 +62468,7 @@
 mft.global, 1
 mfxbe.de, 1
 mfxer.com, 1
+mfzkl.com, 0
 mgae.com, 1
 mgcraft.net, 1
 mgdigitalmarketing.com.au, 1
@@ -59184,6 +62493,7 @@
 mgtbaas.eu, 1
 mgvideo.com.au, 1
 mh.com.fj, 1
+mh2.at, 1
 mhabdullah.tk, 1
 mhadot.com, 1
 mhalfter.de, 1
@@ -59208,13 +62518,18 @@
 mi92.ru, 0
 mia-manager.dk, 1
 mia.ac, 1
+mia.gent, 1
 mia.tw, 1
 miacordeonstereo.com, 1
+miacuario.cl, 1
 miadennees.com, 1
 miagexport.com, 1
 miah.top, 1
 mialma.live, 1
 mialquilerdecoches.com, 1
+miamibeachcommunitychurch.com, 1
+miamifl.casa, 1
+miamifl.homes, 1
 miamimosque.org, 1
 miamiobgyndreams.com, 1
 mianbao.ga, 1
@@ -59238,13 +62553,14 @@
 micalodeal.ch, 0
 micamisetaestampada.com, 1
 micasayestilo.com, 1
+micase.info, 1
 micbase.com, 1
 michadenheijer.com, 1
-michael-glaser.de, 0
+michael-glaser.de, 1
 michael-r.ddns.net, 1
+michael-r.dynv6.net, 1
 michael-rigart.be, 1
 michael-schefczyk.de, 1
-michael-schilling.de, 1
 michael-simon.de, 1
 michael-steinhauer.eu, 1
 michael.band, 1
@@ -59256,12 +62572,16 @@
 michaelbeer.co.uk, 1
 michaelbondar.tk, 1
 michaelcullen.name, 1
-michaelglaser.de, 0
+michaelglaser.de, 1
+michaelgroves.tk, 1
+michaelgwynn.tk, 1
+michaelhayes.tk, 1
 michaelhrehor.com, 1
 michaeliannetta.tk, 1
 michaelismold.com, 1
 michaelizquierdo.com, 1
 michaeljdennis.com, 0
+michaeljohnsrestaurant.com, 1
 michaelklos.nl, 1
 michaelkorsgill.tk, 1
 michaelkosiba.com, 1
@@ -59288,6 +62608,7 @@
 michaeltjeuw.com.au, 1
 michaeltroger.com, 1
 michaeltruskowski.com, 1
+michaelvician.me, 0
 michaelwermeester.com, 1
 michaelwmckinney.com, 1
 michal-klabnik.com, 1
@@ -59318,18 +62639,22 @@
 micheleandkeith.com, 1
 michelgolfier.ml, 1
 michellavat.com, 1
+michellelowery.com, 1
 michelletmc.com, 1
 michelletrachtenberg.tk, 1
 michelskovbo.dk, 1
 michelwolf.ch, 1
+michey.tk, 1
 michibeck.eu, 1
 michielbijland.nl, 1
 michielvanfastenhout.nl, 1
+michig.tk, 1
 michiganstateuniversityonline.com, 1
 michiganunionoptout.com, 1
 michilaw.com, 1
 michmexguides.com.mx, 1
 michu.pl, 1
+mickel.tk, 1
 mickelvaessen.com, 1
 mickybottenberg.com, 1
 micluz.shop, 1
@@ -59340,16 +62665,19 @@
 micospa.gq, 1
 micr0lab.org, 1
 micra.org.uk, 1
+micredito-ok.com, 1
 micro-credit.tk, 1
 microbiologist.tk, 1
 microbiote-insectes-vecteurs.group, 1
 microbird.club, 1
 microblading.pe, 1
+microcert.cn, 1
 microco.sm, 1
 microcomploja.com.br, 1
 microdesic.com, 1
 microdots.de, 1
 microfusion.tw, 1
+microgreensworld.com, 1
 microjournal.xyz, 1
 microjovem.pt, 1
 microl.ink, 1
@@ -59376,6 +62704,7 @@
 midcarolinaregionalairport.com, 1
 midcarolinaregionalairport.org, 1
 middle.io, 1
+middlesexwoodpigeonclub.co.uk, 1
 middletonshoppingcentre.co.uk, 1
 middletowndelcopa.gov, 1
 mide.gob.do, 1
@@ -59395,7 +62724,6 @@
 midlandslotus.co.uk, 1
 midlandsphotobooths.co.uk, 1
 midnight-gaming-community.tk, 1
-midnightcity.cz, 1
 midnightmango.co.uk, 1
 midnightmango.de, 1
 midnightmechanism.com, 1
@@ -59403,9 +62731,9 @@
 midrandplumber24-7.co.za, 1
 midress.club, 1
 midriversmotorsllc.com, 0
-midsouthcon.org, 1
 midstatebasement.com, 1
 midterm.us, 1
+midtnorskvask.com, 1
 midwayrecovery.com, 1
 midwestbloggers.org, 1
 midwestplus.com, 1
@@ -59427,11 +62755,11 @@
 mig5.net, 1
 miggy.org, 1
 mightful-noobs.de, 1
-mightymillionsraffle.com, 1
 mightytext-ios.tk, 1
 migrainereliefplan.com, 1
 migrantskillsregister.org.uk, 1
 migrations.tk, 1
+miguel-platteel.fr, 1
 miguel.pw, 1
 miguelcolmenares.com, 1
 migueldemoura.com, 1
@@ -59446,6 +62774,8 @@
 miguelpallardo.tk, 1
 miguia.tv, 1
 mihanwebtest.tk, 1
+mihealth.link, 1
+mihealthl.ink, 1
 mihgroup.eu.org, 1
 mihgroup.net, 1
 mihnea.net, 1
@@ -59456,6 +62786,7 @@
 mijam.xyz, 1
 mijcorijneveld.nl, 1
 mijn.computer, 0
+mijnadviseur.shop, 1
 mijncloud.space, 1
 mijngeldcoach.nl, 1
 mijngent.be, 1
@@ -59464,12 +62795,12 @@
 mijnkinderkleding.com, 1
 mijnkwadraad.nl, 1
 mijnnaamdag.nl, 1
-mijnpartijhandel.nl, 1
 mijnreisoverzicht.nl, 1
 mijnsite.ovh, 1
 mijnstembureau.nl, 1
 mijntelefoonboek.com, 1
 mijntransacties.nl, 0
+mijnwefact.nl, 1
 mika.cat, 1
 mika.moe, 1
 mikadoe.nl, 1
@@ -59477,6 +62808,7 @@
 mikaeljansson.net, 1
 mikaelk.tk, 1
 mikaelvesavuori.se, 1
+mikaila.tk, 1
 mikakalathil.ca, 1
 mikakalevi.com, 1
 mikaknuutila.fi, 1
@@ -59488,7 +62820,6 @@
 mikeandersondj.com, 1
 mikebelanger.ca, 1
 mikeblog.site, 1
-mikeborowskigroup.com, 1
 mikebutcher.ca, 1
 mikecameronyyc.com, 1
 mikecapson.com, 1
@@ -59506,11 +62837,11 @@
 mikemooresales.com, 1
 mikeowens.us, 1
 mikeprocopio.com, 1
-mikerichards.gallery, 1
-mikerichards.photography, 1
-mikerichards.photos, 1
-mikerichards.pictures, 1
-mikerichardsphotography.com, 1
+mikerichards.gallery, 0
+mikerichards.photography, 0
+mikerichards.photos, 0
+mikerichards.pictures, 0
+mikerichardsphotography.com, 0
 mikesplumbingswfl.com, 1
 mikesystems.tk, 1
 miketabor.com, 1
@@ -59521,7 +62852,9 @@
 mikewrites.online, 1
 mikewritesstuff.com, 1
 mikeybot.com, 1
+mikeylab.com, 1
 mikeyroxtravels.com, 1
+mikhailkolesnikov.tk, 1
 mikhirev.ru, 1
 mikhlevich.ru, 1
 miki-boras.de, 1
@@ -59565,15 +62898,16 @@
 milanpala.cz, 0
 milanstephan.de, 0
 milanvit.net, 1
-milarelectrodomesticos.com, 1
 milavica.tk, 1
 milbournequine.co.uk, 1
 milcahsmusings.com, 1
 milcarteles.com, 1
 milchweg.com, 1
+mildridesua.com, 1
 milehighmaniac.com, 1
 mileme.com, 1
 milenaria.es, 1
+milesaddict.com, 1
 milesapart.dating, 1
 milesdewitt.com, 1
 mileyweasel.de, 1
@@ -59581,16 +62915,17 @@
 milhistwiki.tk, 1
 milhoazul.com.br, 1
 milieuland.com, 1
+military-equipment.tk, 1
 militaryaviationsafety.gov, 1
 militaryconsumer.gov, 1
 militaryfetish.tk, 1
 militaryonesource.mil, 1
 militarysrit.tk, 1
+miljotankar.se, 1
 milkaalpesiutazas.hu, 1
 milkagyengedseg.hu, 1
 milkaholic.ml, 1
 milkameglepetes.hu, 1
-milkandcookies.ca, 1
 milkingit.co.uk, 1
 milkingit.net, 1
 milkmoovement.io, 1
@@ -59600,6 +62935,7 @@
 millbrookbedandbreakfast.co.uk, 1
 millefleurs.eu, 1
 millennium-thisiswhoweare.net, 1
+millenniumfalcon.org, 1
 millenniumstem.org, 1
 millenniumweb.com, 0
 miller-shop.cf, 1
@@ -59607,9 +62943,9 @@
 milleron.xyz, 1
 millerpaving.com, 1
 millersminibarns.com, 1
-millersprofessionalsco.com, 1
 millersprolandscape.com, 0
 millerwalker.com, 1
+millesime-communication.fr, 1
 millettable.com, 1
 milliarden-liste.de, 1
 millibitcoin.jp, 1
@@ -59620,11 +62956,15 @@
 millistream.com, 1
 millonario.tk, 1
 millscountyiowa.gov, 1
+millsidecentre.org, 1
 millwoodwa.gov, 1
 milmiedos.tk, 1
 milon-apps.com, 0
 milr.dk, 1
 miltau.de, 1
+miltor.by, 1
+miltor.com.ua, 1
+miltor.ru, 1
 milwaukee-webdesigner.com, 1
 milwaukeecreative.com, 1
 mim.am, 1
@@ -59634,6 +62974,7 @@
 mimemoriadepez.com, 1
 mimeo.digital, 1
 mimgnj.com, 1
+mimisi.ru, 1
 mimithedog.com, 1
 mimm.gov, 1
 mimmog.it, 1
@@ -59667,14 +63008,17 @@
 mind-farma.com, 1
 mind-hochschul-netzwerk.de, 1
 mind-moves.es, 1
+mindandfull.ga, 1
 mindask.tk, 1
 mindatasupport.nu, 1
 mindatasupport.se, 1
+mindatorsupport.se, 1
 mindbounce.com, 1
 mindbuild.com, 1
 mindcms.nl, 1
 mindcoding.ro, 1
 mindcraft.ga, 1
+minddistortion.tk, 1
 minddrive.cf, 1
 mindera.com, 1
 mindercasso.nl, 1
@@ -59689,11 +63033,13 @@
 mindofmedia.dk, 1
 mindoktor.se, 0
 mindomo.com, 1
+mindonmymoney.nl, 1
 mindorbs.com, 1
 mindox.com.br, 1
 mindresti.tk, 1
 mindthe5.com, 1
 mindthe5.org, 1
+mindvsmind.tk, 1
 mindwork.space, 1
 mine-craftlife.com, 1
 mine-pixl.de, 1
@@ -59712,6 +63058,7 @@
 minecraftgoldwar.tk, 1
 minecraftjson.com, 0
 minecraftjustone.ga, 1
+minecraftonlinesfull.tk, 1
 minecraftrealgold.gq, 1
 minecraftrealgold.ml, 1
 minecraftruns.ml, 1
@@ -59729,6 +63076,7 @@
 minelight.ml, 1
 minepack.net, 1
 minepic.org, 0
+mineralky.com, 1
 mineralnibani.bg, 1
 minered.org, 1
 minermonitoring.com, 1
@@ -59776,11 +63124,12 @@
 minikidz.es, 1
 minikin.tk, 1
 minikneet.com, 1
+minikumbaradergisi.com, 1
 minilions.fr, 1
 minilov.fr, 0
 minimal-apps.de, 1
 minimal-nothing.ml, 1
-minimal-website.ch, 1
+minimal-website.ch, 0
 minimalistbaker.com, 1
 minimalistmenu.com, 1
 minimaliston.com, 1
@@ -59792,12 +63141,15 @@
 mining-club.tk, 1
 mining.diamonds, 1
 miningtronics.com, 0
+minintendo.tk, 1
+minipc.de, 1
 minipigscare.com, 1
 minirizhi.com, 1
 miniskipper.at, 1
 miniso.me, 1
 minisoft4u.ir, 1
 ministeriumfuerinternet.de, 1
+ministory.tk, 1
 ministranten-sankt-ge.org, 1
 ministryofinternet.eu, 1
 minitruckin.net, 1
@@ -59813,6 +63165,7 @@
 minkymoon.jp, 1
 minload.com, 1
 minmaxgame.com, 1
+minna.tk, 1
 minndak.net, 1
 minnesotakinkyyouth.org, 1
 minnesotareadingcorps.org, 1
@@ -59825,6 +63178,8 @@
 minorisa.tk, 1
 minoritywhip.gov, 1
 minorshadows.net, 1
+minotauro.com.ar, 1
+minoxbahia.com.br, 1
 minpex.nl, 1
 minpingvin.dk, 1
 minschuns.ch, 1
@@ -59833,7 +63188,9 @@
 minsk-music.tk, 1
 mintclass.com, 1
 mintea-noua.ro, 1
+mintecc.com, 1
 minternals.com, 1
+mintert.net, 1
 minto.cc, 1
 minton.systems, 1
 mintosherbs.com, 1
@@ -59854,18 +63211,24 @@
 mipasevip.com, 1
 mipnet.cl, 1
 miproximopaso.org, 1
+miprudelafi.ga, 1
 mips.co.in, 1
 mipymesenlinea.com, 1
 mir-faktov.tk, 1
+mir-koji.tk, 1
 mir-multimedia.tk, 1
 mir-pressy.ga, 1
+mir-torgovli.tk, 1
+mir.do, 1
 mir.pe, 1
+mir24.tk, 1
 miraclesformya.org, 1
 mirador.co.uk, 1
 miragenews.com, 1
 miragg.cf, 1
 miraggiostudio.com, 1
 miraheze.org, 1
+mirai-coupon.com, 1
 miraidenshi.com, 1
 miraiex.com, 0
 miramar-obgyn.com, 1
@@ -59886,6 +63249,7 @@
 mireservaonline.es, 1
 mirfire.com, 0
 miriamgamburd.com, 1
+mirinfonews.tk, 1
 mirjamderijk.nl, 1
 mirkino.tk, 1
 mirknighechek.tk, 1
@@ -59907,10 +63271,12 @@
 mirrorwood.com, 1
 mirs.ky, 1
 mirshak.com, 0
+mirstroy.su, 1
 mirtazapine.gq, 1
 mirtes.cz, 1
 mirtouf.fr, 1
 mirumhongkong.com, 1
+mirvent.site, 1
 mirvolgograda.ml, 1
 mirwild.cf, 1
 mirwild.gq, 1
@@ -59929,6 +63295,7 @@
 misfit-media.com, 1
 mishavayner.com, 1
 mishkan-israel.net, 1
+mishkinn.ru, 1
 mishkovskyi.net, 1
 misini.fr, 1
 misinstrumentos.com, 1
@@ -59940,12 +63307,14 @@
 miss-inventory.co.uk, 1
 miss-platinum.net, 1
 miss.com.tw, 1
+missakari.com, 1
 missaocadastrobv.com.br, 1
 missbitcoin.nl, 1
 missblisshair.com.au, 1
 missdream.org, 1
 missevent.pl, 1
 missguidedus.com, 1
+missilovely.tk, 1
 missinicial.com, 1
 mission-gesundheit.online, 1
 mission-orange.de, 1
@@ -59965,11 +63334,11 @@
 misstika-bijoux.com, 1
 misstress.cf, 1
 missualready.com, 1
-missyapartman.hu, 1
 missycosmeticos.com.br, 1
 missycraindance.com, 1
 missyjay.tk, 1
 missyou.link, 1
+missyou.ro, 1
 mist79.ru, 1
 mistacms.com, 1
 mister-matthew.de, 1
@@ -59977,11 +63346,13 @@
 misterboddy.com, 1
 misterd.ml, 1
 mistergout.com, 1
+misterkeltic.com, 1
 misterl.net, 1
-misterorion.com, 1
+misterorion.com, 0
 misterseguros.com.br, 1
 mistlake.net, 1
 mistreaded.com, 1
+mistressofbeads.tk, 1
 mistybox.com, 1
 misumasu.com, 1
 misupport.dk, 1
@@ -59993,12 +63364,14 @@
 mita.me, 1
 mitaines.ch, 0
 mitarbeitermotivation-anleitungen.de, 1
+mitchell.id, 1
 mitchellhandymanservices.co.uk, 1
 mitchelmore.ca, 1
 mitchkalf.nl, 1
 mitchkiah.com, 1
 mitdip-mit-group-ch.azurewebsites.net, 1
 mite3.nl, 1
+mitegra.herokuapp.com, 1
 mitevi.com, 1
 mitfx.com, 1
 mithgol.tk, 1
@@ -60017,7 +63390,6 @@
 mitsign.com, 1
 mitsonnenbrillen.de, 1
 mitstek.com, 1
-mitsubishi-club.ge, 1
 mitsubishielectric-rce.eu, 1
 mitsuvictory.com, 1
 mittagonggardencentre.com.au, 1
@@ -60028,7 +63400,6 @@
 mittenofficesystems.com, 1
 mittikimonos.com.br, 1
 mittwoch-nacht.net, 1
-mitya.cz, 1
 mitzpettel.com, 1
 miui-germany.de, 1
 miukimodafeminina.com, 1
@@ -60056,7 +63427,6 @@
 mixedreality.football, 1
 mixedrecipe.com, 1
 mixes.cloud, 1
-mixify.ga, 1
 mixinglight.com, 1
 mixmastermitch.com, 1
 mixmister.com, 1
@@ -60103,6 +63473,7 @@
 mjsacco-dwi.com, 1
 mjsacco.com, 1
 mjscustomcreations.com.au, 1
+mjstudios.tk, 1
 mjt.me.uk, 1
 mk-dizajn.com, 1
 mk.gov.tr, 1
@@ -60154,6 +63525,7 @@
 ml-academy.org, 1
 mlada-moda.cz, 1
 mladamoda.sk, 1
+mladenovac.tk, 1
 mlarte.com, 1
 mlathrom.com, 1
 mlcnfriends.com, 1
@@ -60165,7 +63537,9 @@
 mlirb.com, 1
 mllz.com, 1
 mlmjam.com, 1
+mlmjunction.tk, 1
 mlnews.ml, 1
+mlo.no, 1
 mlohr.com, 1
 mlonline.com.mx, 1
 mloska.tk, 1
@@ -60174,6 +63548,7 @@
 mlsrv.de, 1
 mlstav.sk, 1
 mlsvallarta.com, 1
+mlum.net, 1
 mlundberg.se, 1
 mlwr.ee, 1
 mlytics.com, 1
@@ -60182,6 +63557,7 @@
 mm404.com, 1
 mm5197.co, 1
 mm6729.co, 1
+mm6729.com, 1
 mm6957.co, 1
 mm88game.com, 1
 mm9297.co, 1
@@ -60201,14 +63577,18 @@
 mmcase.ml, 1
 mmcwholesale.com, 1
 mmgal.com, 1
+mmgtx.com, 1
 mmhome.fr, 1
 mmichaelb.pw, 1
 mmilog.hu, 1
 mminsco.com, 1
+mmkstudio-digital.com, 1
 mml.cx, 0
 mmlebanon.com, 1
 mmmarco.com, 1
 mmmaximaliselmeny.hu, 1
+mmmm.mn, 1
+mmmonk.net, 1
 mmogah.com, 1
 mmoneko.com, 1
 mmonit.com, 1
@@ -60218,13 +63598,16 @@
 mmphub.com, 1
 mmprojects.nl, 0
 mms.is, 1
+mmscy.com, 0
 mmsmotor.com.hk, 1
+mmstick.tk, 1
 mmucha.de, 1
 mmuclassifieds.tk, 1
 mmwb.nl, 1
 mmxblog.com, 1
 mmzztt.com, 1
 mnatechnologies.com.au, 0
+mnbg.tk, 1
 mnciitbhu.me, 1
 mncloud.de, 1
 mncr.nl, 1
@@ -60241,11 +63624,14 @@
 mnitro.com, 1
 mnium.de, 1
 mnjg123.de, 1
+mnkt.site, 1
 mnlfnet.com, 1
 mnml.art, 1
 mnml.blog, 1
 mnml.top, 1
+mnn.tw, 1
 mnnknz.de, 1
+mnogodetey.ru, 1
 mnogoknighek.gq, 1
 mnogoknighek.ml, 1
 mnogoknighek.tk, 1
@@ -60263,6 +63649,7 @@
 mo-en-karim.tk, 1
 mo-journal.com, 1
 mo-mochizuki.com, 1
+mo-vvs.dk, 1
 mo.nl, 1
 mo2021.de, 1
 mo3.club, 1
@@ -60276,6 +63663,7 @@
 moas.photos, 1
 mobal.com, 1
 mobeforlife.com, 0
+mobi-katalog.tk, 1
 mobi2go.com, 1
 mobi4.tk, 1
 mobidesigns.org, 1
@@ -60296,6 +63684,7 @@
 mobilecasinoclub.co.uk, 1
 mobilecontractcomparison.com, 1
 mobilecraftingco.com, 1
+mobilegoldcoastelectrical.ga, 1
 mobileinternetbanking.com, 1
 mobilelooper.com, 1
 mobilemedics.com, 1
@@ -60313,18 +63702,21 @@
 mobiletry.com, 1
 mobilewikiserver.com, 1
 mobilhaber.ga, 1
+mobilhondatangsel.com, 1
 mobilinnov.it, 1
 mobilisation-generale.org, 0
 mobiliteit.gent, 1
 mobiliteitgent.be, 1
 mobiliteitsbedrijf-gent.be, 1
 mobiliteitsbedrijf.be, 1
+mobiliteitsbedrijfgent.be, 1
 mobiliteitsbedrijfstadgent.be, 1
 mobiliteitstadgent.be, 1
 mobility-events.ch, 1
 mobilize.us, 1
+mobilizon.fr, 1
 mobilizon.org, 1
-mobilmobil.co, 1
+mobilni.site, 1
 mobilux.lv, 1
 mobimsua.com, 1
 mobincube.com, 1
@@ -60332,12 +63724,14 @@
 mobincube.mobi, 1
 mobincube.net, 1
 mobinst.ml, 1
+mobinstore.com, 0
 mobio.net, 1
 mobiproj.com, 1
 mobisaar-cloud.de, 1
 mobistartv.ml, 1
 mobitracker.co, 1
 mobius.network, 1
+mobizat.com, 1
 mobizma.com, 1
 mobl.io, 1
 moblkar.com, 1
@@ -60355,6 +63749,7 @@
 moca-2081.com, 1
 moca-2082.com, 1
 moca-2083.com, 1
+moca-kinder.de, 1
 mochasoft.jp, 1
 mochilerostailandia.com, 1
 mochiyuki.net, 1
@@ -60362,8 +63757,10 @@
 mochoko.com, 1
 mockerel.com, 1
 mocking-bird.org, 1
+mocking.top, 1
 mocknen.net, 1
 mockups.com.co, 1
+mocloud.eu, 1
 mococo.co.uk, 1
 mod.af, 1
 moda-donna.cf, 1
@@ -60382,6 +63779,7 @@
 modbom.com.tw, 1
 modcover.com, 1
 modded-minecraft-server-list.com, 1
+modded.club, 1
 moddedphones.com, 1
 modderday.com, 0
 modding-forum.com, 1
@@ -60399,6 +63797,7 @@
 modelcube.com, 1
 modeldimension.com, 1
 modeldoll.tk, 1
+modelflight.com, 1
 modeli.tk, 1
 modelisme-rc.net, 1
 modelisme-voiture-rc.fr, 1
@@ -60411,9 +63810,11 @@
 modem.cf, 1
 modemaille.com, 0
 modemchild.net, 1
+modenuit.fr, 1
 moderatoren.org, 1
 modern-family.tv, 1
 modern-gaming.ga, 1
+modernagritec.com, 1
 modernapprenticeships.org, 1
 modernautorepairs.com, 1
 moderncommercialrealestate.com, 1
@@ -60435,7 +63836,6 @@
 modmountain.com, 1
 modnitsa.info, 1
 mods-community.de, 1
-mods.in.th, 1
 modscrew.com, 1
 modsrigs.com, 1
 modul-metal-habitat.fr, 1
@@ -60471,20 +63871,24 @@
 moens.tech, 1
 moepass.com, 1
 moeqing.net, 1
+moer.tel, 1
 moescat.xyz, 0
 moesif.com, 1
 moetrack.com, 1
 moeyi.xyz, 0
 mof.gov.ws, 1
 mofohome.dyndns.org, 1
+mogamugi.com, 1
 mogica.tk, 1
 mogilev-forum.tk, 1
 mogomix.cf, 1
 moha-swiss.com, 0
+mohaabobclan.tk, 1
 mohabatein1.tk, 1
 mohamedalibenammarmaba.tk, 1
 mohamedhamuda.com, 1
 mohamedhosting.tk, 1
+mohamedsherif.ml, 1
 mohammad-yarahmadi.tk, 1
 mohammadreza-bakhtiari.tk, 1
 mohammedalrifai.tk, 1
@@ -60522,6 +63926,7 @@
 mojnet.net, 1
 mojo.az, 1
 mojoco.co.za, 1
+mojome.co.za, 1
 mojt.net, 1
 mojzis.com, 1
 mojzis.cz, 1
@@ -60560,7 +63965,7 @@
 molpek.com, 1
 moltapor.tk, 1
 molti.hu, 1
-molun.net, 1
+molun.net, 0
 molunerfinn.com, 1
 molusk.ml, 1
 molwick.com, 1
@@ -60572,7 +63977,6 @@
 momentumdash.com, 1
 momentumdesign.website, 1
 momi-chura.com, 1
-momirfarooq.com, 1
 momit.eu, 1
 momjoyas.com, 1
 mommydigest.ga, 1
@@ -60594,6 +63998,7 @@
 mon-agora.com, 1
 mon-butin.fr, 1
 mon-dolibarr.fr, 1
+mon-lab-digital.com, 1
 mon-partage.fr, 1
 mon-trafic.com, 0
 mon22.ch, 0
@@ -60604,17 +64009,20 @@
 monacoexpress.tk, 1
 monad.io, 1
 monakasatmasr.com, 1
+monakinolandscape.com, 1
 monalisa.wtf, 1
 monalyse.com, 1
 monamurlite.ru, 1
 monarch.security, 1
 monarchelectric.com, 1
+monarchisc.com, 1
 monarchpartnersgroup.com, 1
 monarcjuexpo.ch, 1
 monays.ga, 1
 monbudget.org, 0
 moncarnetdesante.fr, 1
 moncoach.ch, 0
+monconcoursdgfip.fr, 1
 monde-oriental.tk, 1
 mondechenoafrance.tk, 1
 mondedie.fr, 1
@@ -60622,6 +64030,7 @@
 mondo-it.ch, 1
 mondocellulari.tk, 1
 mondonet.org, 0
+mondpo.pro, 1
 mondsee-psychotherapie.at, 1
 mondzorgaanzee.nl, 1
 monelephantapois.com, 1
@@ -60638,7 +64047,9 @@
 money-spell.com, 1
 money-transfers.tk, 1
 moneybird.com, 1
+moneybird.de, 1
 moneybird.nl, 1
+moneybirdstorage.com, 1
 moneycredit.eu, 1
 moneyfactory.gov, 1
 moneyformybeer.com, 1
@@ -60652,6 +64063,7 @@
 moneysmart.gov.au, 1
 moneytamer.com, 1
 moneytoday.se, 1
+monfilm.tk, 1
 monforte.tk, 1
 mongla168.net, 1
 mongla88.net, 1
@@ -60662,6 +64074,7 @@
 mongooselock.com.ua, 1
 monicahq.com, 1
 monicajean.photography, 1
+monicanaranjo.tk, 1
 monicapotter.tk, 1
 monicz.pl, 1
 monidenum.fr, 1
@@ -60682,6 +64095,7 @@
 monix.io, 1
 monjardin.tk, 1
 monjo.io, 1
+monjob.tk, 1
 monkeybusiness.agency, 1
 monkeyfaqs.com, 1
 monkeyhill.us, 1
@@ -60690,15 +64104,17 @@
 monkeytek.ca, 1
 monkieteel.com, 1
 monlissagebresilien.com, 1
-monmiel.it, 1
+monloyer.quebec, 1
+monnaiecourante.tk, 1
 monnyonle.hu, 1
 mono0x.net, 1
 monoblu.com, 1
 monobunt.at, 1
 monochrometoys.com, 1
-monocles.de, 1
+monocl.com, 1
 monodejuegos.shop, 1
 monohost.ml, 1
+monokli.tk, 1
 monolithapps.com, 1
 monolithic.tk, 1
 monolithindustries.com, 1
@@ -60720,15 +64136,17 @@
 monsterandfox.co.uk, 1
 monstermashentertainments.co.uk, 1
 monsterminigames.de, 1
+monsterminus.tk, 1
 monstermoney.tk, 1
 monsterx.cn, 1
 mont-thabor.fr, 1
 montack.de, 1
-montagetravel.com, 1
+montanabiack.de, 1
 montanasky.tv, 1
 montanteaesthetics.com, 1
 montanwerk.de, 1
 montarfotoaki.com, 1
+montarosa.tk, 1
 montas.io, 1
 montazer.net, 1
 montco.today, 1
@@ -60741,8 +64159,8 @@
 montgomerycountyia.gov, 1
 montgomeryfirm.com, 1
 montgomerysoccer.net, 1
-monthlyfukuoka.com, 1
 monticelloky.gov, 1
+montillafarm.com, 1
 montoan.com, 1
 montoneros.tk, 1
 montpreveyres.ch, 0
@@ -60755,7 +64173,8 @@
 montserratoptics.com, 1
 montychristie.com, 1
 monveilleuretmoi.com, 1
-monwarez.ovh, 1
+monweb.tk, 1
+monzaradio.tk, 1
 monzo.com, 1
 monzo.me, 1
 monzo.tk, 1
@@ -60790,6 +64209,7 @@
 moonlighttheatre.tk, 1
 moonlit.cloud, 1
 moonmelo.com, 1
+moonpay.com, 1
 moonpay.io, 1
 moonracer.ga, 1
 moonraptor.co.uk, 0
@@ -60801,6 +64221,7 @@
 moontaj.com, 0
 moonvpn.org, 1
 moonwolfwiccanschool.tk, 1
+moonzerotwo.tk, 1
 mooregreen.nl, 1
 moorelawfirmaz.com, 1
 mooretownrancheria-nsn.gov, 1
@@ -60817,7 +64238,7 @@
 moosikapp.ml, 1
 moosikapp.tk, 1
 moosmann-moehrle.de, 1
-moot-info.co.za, 1
+moot-info.co.za, 0
 moovablestorage.com, 1
 moove-it.com, 1
 mooveo.co, 1
@@ -60837,9 +64258,11 @@
 mople71.cz, 1
 mopliangxing.com, 1
 moppeleinhorn.de, 1
+moppenfactory.tk, 1
 moppy.org, 1
 mopxing.com, 1
 moqo.de, 1
+moqtmatrak.com, 1
 mora.pl, 1
 moraffpritchard.com, 1
 moralcompass.ga, 1
@@ -60855,9 +64278,12 @@
 morc.me, 1
 morchino.ch, 0
 morchstore.com, 1
+mord-ost.de, 1
+mordovia.cf, 1
+mordovia.ga, 1
+mordovia.gq, 1
 mordovia.tk, 1
 mordoviya.tk, 1
-mordrum.com, 1
 more-hikkoshi.com, 1
 more-terrain.de, 1
 moreal.co, 1
@@ -60874,11 +64300,11 @@
 morepay.cn, 1
 moreserviceleads.com, 0
 moreshop.pl, 1
-morespacestorage.co.uk, 1
 moresw.com, 1
 moretesting.tk, 1
 morethanautodealers.com, 1
 morethancode.be, 1
+morethandigital.info, 1
 moretti.camp, 1
 morgan-insurance.com, 1
 morgan.solutions, 1
@@ -60907,17 +64333,18 @@
 mormonleaks.io, 1
 morningbhai.com, 1
 morningbird.eu, 1
+morningchew.com, 1
 morningcurve.com, 0
 morningtime.cloud, 1
 moroccanews.tk, 1
 moroccomiami.com, 1
 moroccotodaynews.ga, 1
 moromsmile.com, 1
+morooi.cn, 1
 morox.top, 1
 morozko.gq, 1
 morozyaka.tk, 1
 morrellllc.com, 0
-morriganbe.com, 1
 morris.computer, 1
 morritosfelices.com, 1
 morrowind-finland.tk, 1
@@ -60926,10 +64353,12 @@
 mortengamstpedersen.tk, 1
 mortgagecalculator.biz, 1
 mortgagetranslations.gov, 1
+mortgagewebinars.com, 1
 mortis.eu, 1
 morus.tk, 1
 morvo.mx, 1
 morz.org, 1
+mos-camin.ru, 1
 mosaic-design.ru, 1
 mosaicmarble.com, 1
 mosaicot.com, 1
@@ -60977,8 +64406,11 @@
 mostfamousbirthdays.com, 1
 mostlyharmless.at, 1
 mostlyoverhead.com, 1
+mostmost.tk, 1
 mostqbalwatanalqahirah.com, 1
 mosttaza.com, 1
+mosurist.tk, 1
+motastore.com.br, 1
 motchirotchi.com, 1
 motd.ch, 0
 motekforce.link, 1
@@ -60997,6 +64429,8 @@
 motherbrain.tk, 1
 motherearth.cf, 1
 mothereff.in, 0
+motherguru.ca, 1
+motherhoodinblack.com, 1
 mothership.de, 1
 motichi.cf, 1
 motifstudio.com.ua, 1
@@ -61016,34 +64450,40 @@
 motodb.net, 1
 motodb.uk, 1
 motoforce.lt, 1
+motofoto.tk, 1
 motogb.net, 1
 motohell.com, 1
 motojato.com.br, 1
 motoland.ml, 1
+motolife.tk, 1
 motolinesupply.com, 1
 motomorgen.com, 1
+motopoland.com.ua, 1
 motor-agro.com, 1
 motor-agro.com.ua, 1
 motor-agro.kz, 1
 motor-agro.ru, 1
+motor-cycles.tk, 1
 motor-forum.nl, 0
 motor1.com, 1
 motorbiketourhanoi.com, 1
 motorcyclesafer.com, 1
 motorialab.com, 0
+motoridiricerca.tk, 1
 motornaolja.com, 1
 motorpointarenacardiff.co.uk, 1
 motorrijschoolgul.nl, 1
 motorring.ru, 1
 motorsplus.com, 0
-motorsportdiesel.com, 0
 motortecbrasil.com.br, 1
+motortrend.com, 1
 motoryachtclub-radolfzell.de, 1
 motorzone.od.ua, 1
 motoscascos.com, 1
 motospaya.com, 1
 motostorie.blog, 1
 mototax.ch, 1
+mototeam.com.ua, 1
 motovated.co.nz, 0
 motovio.de, 1
 motowilliams.com, 1
@@ -61064,7 +64504,6 @@
 mountain-rock.ru, 1
 mountainactivitysection.org.uk, 1
 mountainairandheating.com, 1
-mountainbatchers.de, 1
 mountainbell.net, 1
 mountaincastle.store, 1
 mountainchalet.blue, 1
@@ -61080,7 +64519,7 @@
 mouracloset.com.br, 1
 mousepotato.uk, 1
 mousetravelmatters.com, 1
-moustream.com, 0
+moushed.tk, 1
 moutiezhaller.com, 1
 mova.club, 1
 movacare.de, 1
@@ -61136,6 +64575,7 @@
 mozartgroup.hu, 1
 mozektevidi.net, 1
 mozgb.ru, 1
+mozgovoy.tk, 1
 mozilla-hispano.org, 1
 mozilla.cz, 1
 mozzak.tk, 1
@@ -61164,9 +64604,11 @@
 mpodraza.eu, 1
 mpodraza.pl, 1
 mpoonamchandpearls.com, 1
+mpornoindir.tk, 1
 mprsco.eu, 1
 mpserver12.org, 1
 mpsoundcraft.com, 1
+mpu-beratungsstellen.com, 1
 mpu-giessen.com, 1
 mpu-ibbi.de, 1
 mpu-vorbereitung.com.de, 1
@@ -61190,6 +64632,7 @@
 mrandmrsparrot.gr, 1
 mrandyyp.com, 1
 mranimal.tk, 1
+mrautomazioni.it, 1
 mrazek.biz, 1
 mrbounce.com, 1
 mrbouncescrazycastles.co.uk, 1
@@ -61208,7 +64651,8 @@
 mrdayman.com, 1
 mredsanders.net, 1
 mrevolution.eu, 1
-mrfd.nl, 0
+mrfd.nl, 1
+mrfinka.ml, 1
 mrguider.org, 1
 mrhc.ru, 1
 mrhookupsd.com, 1
@@ -61221,13 +64665,12 @@
 mrjo.sh, 1
 mrjooz.com, 0
 mrjunior.ga, 1
-mrkapowski.com, 1
+mrkapowski.com, 0
 mrknee.gr, 1
 mrkrabat.de, 1
 mrliu.me, 1
 mrlove.tk, 1
 mrmad.com.tw, 1
-mrmanner.eu, 1
 mrmanson.tk, 1
 mrmemory.co.uk, 1
 mrmn.nl, 1
@@ -61247,6 +64690,7 @@
 mrs-shop.com, 1
 mrsbairds.com, 0
 mrschristine.com, 1
+mrshahin.cf, 1
 mrsheep.win, 1
 mrsiding.net, 1
 mrsjinthelibrary.com, 1
@@ -61263,11 +64707,13 @@
 mruczek.ga, 1
 mruganiepodspacja.pl, 1
 mrupert.com, 1
+mrupp.eu, 1
 mrv.li, 1
 mrvnt.co, 1
 mrwacky.com, 1
 mrx.one, 0
 mrxn.net, 1
+mrzauto.com, 1
 ms-australia.de, 1
 ms-ch.ch, 1
 ms295.com, 1
@@ -61283,11 +64729,14 @@
 msch.pw, 1
 msdprojectclearmo.gov, 1
 msebera.cz, 1
+mselectronique.tk, 1
 mserve.ddns.net, 1
 mservers.cz, 1
 msfishingcharter.com, 1
 msgallery.tk, 1
+msgmon.com, 1
 msgspoof.com, 1
+msh100.uk, 1
 msha.gov, 1
 mshemailmarketer.com.au, 1
 mshgame.ga, 1
@@ -61295,12 +64744,14 @@
 msiegmund.com, 1
 msieursvp.fr, 1
 msize48.ch, 1
+msl.org, 1
 mslivros.com.br, 1
 msmails.de, 1
 msnarzedzia.pl, 1
 msngr.com, 1
 msnhdd.info, 1
 msnr.net, 1
+msoffice-inc.net, 1
 msoida.me, 1
 msoll.de, 1
 msoll.eu, 1
@@ -61313,6 +64764,7 @@
 msrohkwrstock.com, 1
 msroot.de, 1
 mssa.jp, 1
+mssm-portal.com, 1
 mssora.com, 1
 mstazakka.com, 1
 mstdn.blue, 1
@@ -61380,13 +64832,14 @@
 mtr123.cn, 0
 mtran.co, 1
 mtravelers.net, 1
-mtrip.com, 1
 mtrock.ru, 1
+mtrx.tech, 1
 mts-energia.eu, 1
 mtservicescorp.com, 1
 mtsn3padang.sch.id, 1
 mtsoftware.com.au, 1
 mtsolar.es, 1
+mtthwbrd.com, 1
 mtv.re, 1
 mtvroadies.tk, 1
 mu-thunder.online, 1
@@ -61399,6 +64852,7 @@
 mub-tomsk.ru, 1
 mubase.dk, 1
 mubiflex.nl, 1
+mubo.com.mx, 1
 muceniece.tk, 1
 muchbetterthancash.com, 1
 muchohentai.com, 1
@@ -61406,7 +64860,6 @@
 muckingabout.eu, 1
 muckrack.com, 1
 mucmail.de, 1
-muctool.de, 1
 mudanzasacuna.com.co, 1
 mudanzasjuniorh.com, 1
 mudanzasuiza.com.ec, 1
@@ -61419,6 +64872,8 @@
 mudcrab.us, 0
 mudgezero.one, 1
 mudit.xyz, 0
+mudramagik.com, 1
+mudrc.net, 1
 mueblescuerolorca.cl, 1
 muel.io, 1
 muelhau.pt, 1
@@ -61426,6 +64881,7 @@
 muellapp.com, 0
 muellerurology.com, 1
 muenchberger.com, 0
+muennich-coll.de, 1
 muffs.ru, 1
 mufibot.net, 1
 mufid.tk, 1
@@ -61433,6 +64889,7 @@
 muga.space, 1
 muganworld.com, 1
 mugen.technology, 1
+mugrabyhostel.tk, 1
 muguayuan.com, 1
 muh.io, 1
 muhabarishaji.com, 0
@@ -61467,7 +64924,9 @@
 mullens-usedcars.be, 0
 mullerkappers.nl, 1
 mullinsfarms.com, 1
+muloft.com, 1
 multi-fruit.tk, 1
+multi-soudures.fr, 1
 multi-tool.ml, 1
 multibomasm.com.br, 1
 multichange.net, 1
@@ -61485,11 +64944,12 @@
 multilogik.com, 1
 multimatte.com, 1
 multimed-solutions.com, 1
-multimed.krakow.pl, 1
+multimed.krakow.pl, 0
 multimedia-pool.com, 1
 multimediapc.de, 1
 multimediaworld.tk, 1
 multimediosmonti.com, 1
+multinationalforce.com, 1
 multipassword.com, 1
 multipleservers.com, 1
 multiplex.tk, 1
@@ -61530,6 +64990,7 @@
 munakata-cl.jp, 1
 munch.me, 1
 munchcorp.com, 1
+mundanegears.com, 1
 mundismart.com, 1
 mundo-otaku.tk, 1
 mundoamatista.online, 1
@@ -61538,6 +64999,7 @@
 mundodapoesia.com, 1
 mundodasfechaduras.com.br, 1
 mundodasmensagens.com, 1
+mundodosagapornis.tk, 1
 mundofoto.tk, 1
 mundogamers.top, 1
 mundokinderland.com.br, 1
@@ -61563,6 +65025,7 @@
 munirajiwa.com, 1
 munki.org, 1
 munkibuilds.org, 1
+munndialarts.com, 1
 muntajati-om.com, 0
 muntproever.nl, 1
 munwr.com, 1
@@ -61575,6 +65038,7 @@
 mur-vegetal-interieur.fr, 1
 murakami-sah.com, 1
 mural.co, 1
+mural.com, 1
 muralart.ga, 1
 muralswallpaper.co.uk, 1
 muralswallpaper.com, 1
@@ -61587,12 +65051,12 @@
 murfy.kiwi, 1
 murfy.nz, 1
 murgi.de, 1
+murksbreider.tk, 1
 murmansk.cf, 1
 murmanskforum24x7.tk, 1
 murmashi.ru, 1
 murof.com.br, 1
 murphy-law.net.ru, 1
-murphycraftbeerfest.com, 1
 murray.xyz, 1
 murraya.cn, 1
 murraycoin.org, 1
@@ -61609,6 +65073,7 @@
 muscatinecountyiowa.gov, 1
 muscle-tg.com, 1
 musclecarresearch.com, 1
+musclecarsillustrated.com, 1
 muscolinomusic.com, 1
 muscularbabes.net, 1
 muscuolisq.cf, 1
@@ -61628,6 +65093,7 @@
 mush-room.co.jp, 1
 mushel.ddns.net, 1
 mushikabu.net, 1
+mushino.com, 1
 mushka.ga, 1
 mushman.tk, 1
 music-is-my-life.de, 1
@@ -61661,11 +65127,14 @@
 musicnotesroom.com, 1
 musicompare.com, 1
 musicradar.co.il, 1
+musicradio.ga, 1
 musicrainbow.tk, 1
 musicschoolonline.com, 1
 musicsense.cf, 1
 musicstudio.pro, 1
+musicupdate.de, 1
 musicvideo.club, 1
+musicvietnam.tk, 1
 musicwear.cz, 1
 musicworkout.de, 1
 musigama.tk, 1
@@ -61673,9 +65142,9 @@
 musiker.tk, 1
 musikerkontakt.dk, 1
 musikhaus-korn.de, 1
-musikholics.com, 1
 musikidersi.tk, 1
 musiktag2020.ch, 1
+musikverein-elten.de, 1
 musikzentrale.net, 0
 musings.tech, 1
 musingsatmidnight.com, 1
@@ -61707,6 +65176,8 @@
 mustexist.tk, 1
 musthavesforreal.com, 1
 musthinsider.com, 1
+mustika.cf, 1
+mustketing.com, 1
 musttest.com, 1
 musttest.email, 1
 musttest.eu, 1
@@ -61720,7 +65191,6 @@
 mutext.com, 1
 mutfakyolu.com, 1
 muthai.in.th, 1
-mutsumikai8989.com, 1
 mutual.ga, 1
 mutualmoney.ml, 1
 mutuals.cool, 1
@@ -61728,15 +65198,15 @@
 mutuocasafacile.it, 1
 muuglu.es, 1
 muunnin.net, 1
-muurlingoogzorg.nl, 1
 muusika.fun, 1
 muwatenraqamy.org, 1
 muy.ooo, 1
 muydelgada.com, 1
 muz2u.ru, 1
 muzeumkomiksu.eu, 1
-muzgra.in, 1
+muzi-tips.tk, 1
 muzi.cz, 1
+muzicari.tk, 1
 muziekcentrumdebijloke.gent, 1
 muziektermen.tk, 1
 muzikanews.tk, 1
@@ -61744,13 +65214,13 @@
 muzike.tk, 1
 muzprosvet.tk, 1
 muzykanawesele.info, 1
+muzzmusic.com, 1
 mv-schnuppertage.de, 1
 mv-wohnen.de, 1
 mvandek.nl, 1
 mvarsamis.com, 1
 mvbits.com, 1
 mvbug.com, 1
-mvcconstruction.co.za, 1
 mvccp.co.za, 1
 mvisioncorp.com, 1
 mvistatic.com, 1
@@ -61772,13 +65242,19 @@
 mware-staging.azurewebsites.net, 1
 mwavuli.co.ke, 1
 mwba.org, 1
+mwcwallet.com, 1
+mwd.world, 1
 mwe.st, 1
 mwinds.tk, 1
+mwine.sk, 1
 mwlcouriers.com, 1
 mwms.nl, 1
 mwnonline.net, 1
+mwork.tech, 1
 mwr.team, 1
+mwstrategicservices.com, 1
 mwtdev.se, 1
+mwteh.ru, 1
 mwtj.com, 1
 mww.moe, 1
 mx-quad.fr, 1
@@ -61791,6 +65267,7 @@
 mxdvl.com, 1
 mxes.net, 1
 mxihan.xyz, 1
+mxii.eu.org, 1
 mxin.ltd, 1
 mxn8.com, 1
 my-aftershave-store.co.uk, 1
@@ -61810,10 +65287,12 @@
 my-gode.fr, 1
 my-goldfinger.com, 1
 my-gps-tracker.co.uk, 1
+my-health-homes.com, 1
 my-host.ovh, 1
 my-hps.de, 1
 my-ifms.com, 1
 my-ip.work, 1
+my-mobile-apps.com, 1
 my-montenegro.tk, 1
 my-new-bikini.de, 1
 my-nextcloud.at, 1
@@ -61825,6 +65304,7 @@
 my-static-live-808795.c.cdn77.org, 1
 my-story.ml, 1
 my-stuff-online.com, 1
+my-town.tk, 1
 my-tunisia.tk, 1
 my-web.xyz, 1
 my-webcloud.at, 1
@@ -61834,7 +65314,6 @@
 my4g.net, 1
 my4thtelco.com.sg, 1
 my4thtelco.sg, 1
-my77.vip, 1
 myabcm.com, 1
 myaccount.google.com, 1
 myactivity.google.com, 1
@@ -61850,6 +65329,8 @@
 myanimelist.net, 1
 myapexcard.com, 1
 myartsjournal.com, 1
+myathena.ai, 1
+myauto.ml, 1
 mybakkupakku.com, 1
 mybarcelona.tk, 1
 mybasementdoctor.com, 1
@@ -61876,6 +65357,7 @@
 mybokx.co, 1
 mybon.at, 0
 mybon.online, 1
+mybookkeeper-perth.com.au, 1
 myboothang.com, 1
 myborder.ru, 1
 mybottle.ch, 1
@@ -61884,6 +65366,7 @@
 mybpstar.com, 1
 mybritney.tk, 1
 mybsms.gr, 1
+mybuddycare.com, 1
 mybuddytheplumbertooele.com, 1
 mybuildingcertifier.com.au, 1
 mycaelis.fr, 1
@@ -61892,10 +65375,11 @@
 mycamshowhub.to, 1
 mycard.moe, 1
 mycardplace.com, 1
-mycarinsurance123.com, 1
+mycarinsurance123.com, 0
 mycarwashers.com, 1
 mycbils.uk, 1
 mycc.be, 1
+mycdn.xyz, 1
 mychamberlain.co.nz, 1
 mychamberlain.com, 1
 mychamberlain.com.au, 1
@@ -61905,6 +65389,8 @@
 mychicken.info, 1
 mychicken.nl, 1
 mychildatschool.com, 1
+mychunky.design, 1
+mychurchisalive.org, 1
 mycinema.pro, 1
 mycircleworks.com, 1
 myclimate.com, 1
@@ -61951,8 +65437,8 @@
 mycrowdstack.com, 1
 mycrypnet.io, 1
 mycrypto.com, 1
-mycrystalgrove.com, 1
 mycustomwriting.com, 1
+mycutebee.com, 1
 mydais.org, 1
 mydarkness.cf, 1
 mydarksite.tk, 1
@@ -61964,7 +65450,6 @@
 mydaywebapp.com, 1
 mydeardreams.com, 1
 mydebian.in.ua, 1
-mydentalhealth.com.au, 1
 mydentalplan.gr, 1
 mydenverhomesource.com, 1
 mydevolo.com, 1
@@ -61988,6 +65473,7 @@
 mydroneservices.ca, 1
 mydroneservices.com, 1
 mydslwebstats.co.uk, 1
+mydsomanager.com, 1
 myduffyfamily.com, 1
 myeasybooking.de, 1
 myeberspaecher.com, 1
@@ -62006,6 +65492,7 @@
 myemailsender.tk, 1
 myeml.net, 0
 myempire.com.au, 1
+myenemy.tk, 1
 myepass.bg, 1
 myepass.de, 1
 myeriri.com, 1
@@ -62016,10 +65503,12 @@
 myessaygeek.com, 1
 myetherwallet.com, 1
 myethvault.com, 1
+myeventstation.com, 1
 myevive.com, 1
 myexams.nl, 1
 myf.cloud, 1
 myfae.eu, 1
+myfamilyancestry.tk, 1
 myfancyurl.tk, 1
 myfantasysportstalk.com, 1
 myfavmessage.cf, 1
@@ -62120,11 +65609,11 @@
 myke.website, 1
 myki.co, 1
 mykolhoz.tk, 1
+mykonos-island.tk, 1
 mykontool.de, 1
 mykumedir.com, 1
 mykurgan.tk, 1
 mykursumlija.tk, 1
-mylahcollection.com.br, 1
 mylatestnews.org, 0
 mylawer.ga, 1
 mylawyer.be, 1
@@ -62132,10 +65621,12 @@
 myled.ml, 1
 mylegacyvip.com, 1
 mylene-chandelier.me, 1
+myles.digital, 1
 mylever.com, 1
 mylfca.com, 1
 mylife360mag.com, 1
 mylifeabundant.com, 1
+mylifesphotograph.com, 1
 myliftmaster.com, 1
 myliftmaster.eu, 1
 mylight.tk, 1
@@ -62180,10 +65671,12 @@
 mymusique.tk, 1
 mymx.lu, 0
 myna.go.jp, 1
+mynak.se, 1
 mynameistavis.com, 1
 mynas.ovh, 1
 mynaturalhairstyles.com, 1
 mynaturalmood.es, 1
+mynavi-kaigo.jp, 1
 myndcoin.com, 1
 myndcoins.com, 1
 myndcommunication.com, 1
@@ -62191,6 +65684,7 @@
 myndighetermedipv6.se, 1
 mynerva.io, 1
 mynetflow.com, 1
+mynetpay.be, 1
 mynetworkingbuddy.com, 1
 mynewsspot.com, 1
 mynext.events, 1
@@ -62199,11 +65693,13 @@
 mynimo.com, 1
 mynn.io, 0
 mynook.info, 1
+mynoveltyshop.com, 1
 mynovus.de, 1
 mynutrientcloud.com, 1
 myoddlittleworld.com, 1
 myodysi.com, 1
 myofficeconnect.co.uk, 1
+myofficerenovation.com, 1
 myonline.hu, 1
 myonline.store, 1
 myonlinedating.club, 1
@@ -62245,12 +65741,14 @@
 mypfp.co.uk, 1
 myphamaplus.org, 1
 mypharmjar.com, 1
+myphotographytips.com, 1
 myphotonics.ml, 1
 myphotos.ga, 1
 myphotoshopbrushes.com, 1
 mypillcard.com, 1
 mypiloteis.com, 1
 mypinasale.com, 0
+mypivcard.com, 1
 mypizza-bremen.de, 1
 myplaceonline.com, 1
 myplaystation.nl, 0
@@ -62284,6 +65782,7 @@
 myrekber.co.id, 1
 myremont.tk, 1
 myremotelogin.ddns.net, 1
+myrent.quebec, 1
 myrepubic.net, 1
 myrepubiic.net, 1
 myrepublc.net, 1
@@ -62352,6 +65851,7 @@
 myrvogna.net, 1
 mysad.de, 1
 mysafetygear.co.za, 1
+mysaldo.info, 1
 mysasiedzi.bialystok.pl, 1
 mysaymk.tk, 1
 mysbaccoach.com, 1
@@ -62381,6 +65881,7 @@
 mysoundtalks.com, 0
 mysouschef.herokuapp.com, 1
 myspicer.com, 1
+mysports.com, 1
 mysql-real-escape-string.xyz, 1
 mysqldump-secure.org, 1
 myssl.com, 1
@@ -62402,7 +65903,6 @@
 mysticconsult.com, 1
 mystickphysick.com, 1
 mysticmedia.net, 1
-mystik-voyance.com, 1
 mystore24.eu, 1
 mystore24.us, 1
 mystorymonster.com, 1
@@ -62477,7 +65977,6 @@
 mywetpussycams.com, 1
 mywindscreen.my, 1
 mywiwe.com.au, 1
-mywoodbridgedentist.com, 1
 myworkinfo.com, 0
 myworth.com.au, 1
 mywrecklawyer.com, 1
@@ -62486,7 +65985,6 @@
 myyubikey.net, 1
 myyubikey.org, 1
 myzarabot.tk, 1
-myzhili.com, 1
 myzina.cz, 0
 mz-mz.net, 1
 mza.com, 1
@@ -62529,9 +66027,11 @@
 n37.co, 1
 n3oxid.fr, 1
 n3rd0rama.tk, 1
+n4zm.com, 1
 n5118.com, 1
 n5197.co, 1
 n6729.co, 1
+n6729.com, 1
 n6957.co, 1
 n6a.net, 1
 n7.education, 1
@@ -62575,19 +66075,22 @@
 nabeez.cf, 1
 nabidkydnes.cz, 1
 nabiev.tk, 1
+nabitrix.tk, 1
 nabokov.tk, 1
+nabosoft.tk, 1
 nabytek-valmo.cz, 1
 nabytokalva.sk, 1
 nacfit.com, 1
+nachalosbog.bg, 1
 nachalova.tk, 1
 nachbar.chat, 1
 nachovni.org, 1
-nachrichten-heute.net, 1
 nachsendeauftrag.net, 1
 nachsenden.info, 1
 nachtmuziek.info, 1
 nacin.com, 1
 nacktetatsachen.at, 0
+nacktwanderfreunde.de, 1
 nacnkabiltrim.cf, 1
 nacocu.cf, 1
 nacoree.ga, 1
@@ -62601,7 +66104,6 @@
 nadex.com, 1
 nadezhda.ml, 1
 nadiafourcade-photographie.fr, 1
-nadim.computer, 1
 nadine-birkner.de, 1
 nadine-chaudier.net, 1
 nadjabenaissa.tk, 1
@@ -62626,8 +66128,11 @@
 nagel-dentaltechnik.de, 1
 nageler.org, 1
 nagelfam.com, 0
+nagelideeen.ml, 1
 naggie.net, 1
 nagoonline.com, 1
+nagoya.tk, 1
+nagrad.tk, 1
 nah.nz, 1
 nah.re, 1
 nahman.tk, 1
@@ -62655,7 +66160,6 @@
 nailtodayminneapolis.com, 1
 nairobibusinessreview.com, 1
 nais0ne.com, 1
-naive.network, 1
 naivetube.com, 0
 najafpour-stone.com, 1
 najany.de, 1
@@ -62667,6 +66171,7 @@
 naji-astier.com, 1
 najiflix.fr, 1
 najmacademy.com, 1
+najprzepis.pl, 1
 najrecept.sk, 1
 naka.io, 1
 nakada4610.com, 1
@@ -62687,7 +66192,6 @@
 nakedfacts.co.uk, 0
 nakedinkas.com, 1
 nakedtruthbeauty.com, 1
-nakene.com, 1
 nakenmodell.tk, 1
 nakhtalla.ir, 1
 nakim.cf, 1
@@ -62700,6 +66204,8 @@
 nakluky.cz, 1
 nako.kr, 1
 nako.no, 1
+nakupi.online, 1
+nakvartiru.com, 1
 nale-hosting.tk, 1
 nalenders.com, 1
 nalepky-na-zed.cz, 1
@@ -62708,11 +66214,13 @@
 nalresearch.com, 1
 naltrexon.gq, 1
 nalukfitness.com.br, 1
+namaanak.net, 1
 namaanakperempuan.net, 1
 namacindia.com, 1
 namalelaki.com, 1
 namaperempuan.com, 1
 namazon.org, 1
+namdak.com, 1
 namedaemon.com, 1
 namegrep.com, 1
 nameid.org, 1
@@ -62731,7 +66239,6 @@
 namiejscu.pl, 1
 namikawatetsuji.jp, 1
 naminam.de, 1
-namisens.de, 1
 namrs.net, 1
 namsbaekur.is, 1
 namskra.is, 1
@@ -62742,7 +66249,7 @@
 namu.news, 1
 namu.wiki, 1
 namus.gov, 1
-nan.ge, 1
+nan.ge, 0
 nan0.cloud, 1
 nanaimo.ca, 1
 nanaimoneighbourhoods.ca, 1
@@ -62750,9 +66257,13 @@
 nanamovies.com, 1
 nanarose.ch, 0
 nanch.com, 1
+nanco.co.jp, 1
+nanco.jp, 1
 nancytelford.com, 1
+nancytutors.com, 1
 nancyzone.tk, 1
 nandedbazar.tk, 1
+nandemo.tk, 1
 nanderson.me, 1
 nandito.tk, 1
 nandonoire.de, 1
@@ -62761,6 +66272,8 @@
 nangluongxanhbinhphuoc.com, 1
 naninossoftware.tk, 1
 nanisiyou.com, 1
+nanji123.com, 1
+nanjiys.com, 1
 nanjiyy.com, 1
 nankiseamansclub.com, 1
 nanmu.me, 1
@@ -62777,7 +66290,6 @@
 nanopixel.ch, 1
 nanoport.jp, 1
 nanosealcreto.com, 1
-nanosector.nl, 1
 nanoshop.ml, 1
 nanotechnologist.com, 1
 nanotechnologysolutions.com.au, 1
@@ -62806,16 +66318,19 @@
 napkins-wholesale.nz, 1
 napkins-wholesale.uk, 1
 naplata.mk, 1
+naples.tk, 1
 naplestotalgarage.com, 1
 napoleonexclusievesieraden.nl, 1
 napoleonoutlawed.tk, 1
 napolinissanctparts.com, 1
 napominanie.ml, 1
 napoveda.online, 1
+nappkassen.se, 1
 nappylaundry.ga, 1
 nappywashing.ga, 1
 napych.com, 1
 naql.om, 1
+naquebec.tk, 1
 naraboty.ga, 1
 narada.com.ua, 1
 naradiebosch.sk, 1
@@ -62875,6 +66390,7 @@
 naseehah.ga, 1
 nasehyar.ir, 1
 nash-dom.tk, 1
+nash-megagid.tk, 1
 nash-server.tk, 1
 nash-shishtavec.tk, 1
 nasha-kahovka.tk, 1
@@ -62891,7 +66407,7 @@
 nashzhou.me, 1
 nasimblog.tk, 1
 naslovi.net, 1
-nasmocopati.com, 1
+nasospromsnab.ru, 1
 nasosvdom.com.ua, 1
 nasr.mobi, 1
 nasrabady.tk, 1
@@ -62902,7 +66418,7 @@
 nast.tk, 1
 nastrojka-pianino.spb.ru, 1
 nastunya.tk, 1
-nastycomics.eu, 1
+nastycomics.eu, 0
 nastysclaw.com, 1
 naszymzdaniem.pl, 1
 nat-neocron.tk, 1
@@ -62934,11 +66450,13 @@
 natenom.com, 1
 natenom.de, 1
 natenom.name, 1
+nates.tk, 1
 natevolker.com, 1
 natextruck.com, 1
 nathaliedijkxhoorn.com, 1
 nathaliedijkxhoorn.nl, 1
 nathaliesadventure.eu, 1
+nathalyb.com, 1
 nathan.ovh, 1
 nathanaeldawe.com, 1
 nathanbarry.com, 1
@@ -62971,6 +66489,8 @@
 nationaltrails.ru, 1
 nationsecurity.com, 1
 nationslending.com, 1
+nationx.tk, 1
+native2ascii.net, 1
 nativeindonesia.com, 1
 nativeonestop.gov, 1
 nativereach.tv, 1
@@ -62986,17 +66506,22 @@
 natsar.com, 1
 nattiam.com, 1
 natuerlichabnehmen.ch, 1
+natunion.ga, 1
 natur-care.com, 1
+natur-plus.tk, 1
 natur-udvar.hu, 1
 natur.com, 1
 natura-sense.com, 1
 natura2000.tk, 1
 naturalbeautyhacks.com, 1
 naturalbijou.com, 1
+naturalbladdercontrol.tk, 1
 naturalcosmetics.cf, 1
 naturaldisasters.tk, 1
 naturalezafengshui.com, 1
 naturalfit.co.uk, 1
+naturalflowerpower.com, 1
+naturalhealthcures.net, 1
 naturalkitchen.co.uk, 1
 naturallyvegan.de, 1
 naturalspacesdomes.com, 1
@@ -63018,7 +66543,6 @@
 naturtint.co.uk, 1
 natusvita.com, 1
 natusvita.com.br, 1
-natuterra.com.br, 1
 natuurlijk.tk, 1
 natuurlijkmooi-meppel.nl, 1
 natverkstekniker.se, 1
@@ -63032,10 +66556,15 @@
 naut.ca, 1
 nautiljon.com, 1
 nautsch.de, 1
+nauz-art.com, 1
 navadebejar.tk, 1
 navalarchitect.tk, 1
+navalkejigo.tk, 1
 navaneethnagesh.com, 1
+navarralanparty.org, 1
 navdeep.ca, 1
+naveengranites.com, 1
+navegarea.tk, 1
 naveka.ga, 1
 navenlle.com, 1
 naviaddress.io, 1
@@ -63047,14 +66576,16 @@
 navigo.cc, 1
 navigo.global, 1
 navinka.com, 1
+navionhcs.com, 1
 naviteq.eu, 1
+navkor.tk, 1
 navlnachekg.cz, 1
 navnet.ml, 1
 navot.co.il, 1
 navroopsahdev.in, 1
 navstevnik.sk, 1
 navycs.com, 1
-nawaqees.com, 1
+nawaf-blog.com, 1
 nawarasa.com, 1
 nawdar.tk, 1
 nawir.de, 1
@@ -63066,6 +66597,7 @@
 nayami64.xyz, 1
 nayanaas.com, 1
 nayapakistan.tk, 1
+nayapixel.com, 1
 nayefalebrahim.com, 1
 nayr.us, 1
 nazarenohuelva.tk, 1
@@ -63115,6 +66647,8 @@
 nba2konlinex.com, 1
 nba2kqq.com, 1
 nba2kx.com, 1
+nba669.com, 1
+nba686.com, 1
 nbad.al, 1
 nbadancers.com, 1
 nbade.com, 1
@@ -63177,9 +66711,11 @@
 ncloud.nl, 1
 ncmedicaidplan.gov, 1
 ncmedicaidplans.gov, 1
+ncommenuptial.tk, 1
 ncpimd001.spdns.de, 1
 ncpublichealth.info, 1
 ncrypt.at, 1
+ncs-cleaning.dk, 1
 ncsadministraties.nl, 1
 ncsc.gov.uk, 1
 ncsccs.com, 1
@@ -63201,6 +66737,7 @@
 ndpbrn-research.org, 1
 ndphp.org, 1
 ndpigskin.com, 1
+ndrew.me, 1
 nds-helicopter.de, 1
 nds-online.ru, 1
 ndtblog.com, 1
@@ -63214,12 +66751,10 @@
 nealvorusphd.com, 1
 neanderthalia.tk, 1
 neapi.com, 0
-near.sh, 1
 nearbi.com.mx, 1
 nearby.in.th, 1
 nearbyprinter.com, 1
 neartothesky.com, 1
-neasahourigan.com, 0
 neat-patch.de, 1
 neatlife.co.uk, 1
 neatnestsdesign.com, 1
@@ -63238,6 +66773,7 @@
 nebra.io, 1
 nebracy.com, 1
 nebucadnezzer.tk, 1
+nebuchadnezzar.codes, 1
 nebul.at, 0
 nebulae.co, 1
 nebulise.com, 1
@@ -63268,6 +66804,7 @@
 nedviga.tk, 1
 nedvizhimost.tk, 1
 nedvizhimostthailand.ml, 1
+nedvrf.ru, 1
 nedworks.net, 1
 nedzadalibegovic.com, 1
 neecist.org, 1
@@ -63285,7 +66822,6 @@
 neemdetijd.nl, 1
 neemo.nz, 1
 neemzy.org, 1
-neer.io, 1
 neesousunebonneetoile.ca, 1
 neet-investor.biz, 1
 neev.tech, 1
@@ -63305,7 +66841,9 @@
 negociosurbanos.net, 1
 negoya-shokai.info, 1
 negr.gay, 1
+negr.link, 1
 negr.tv, 1
+negrete.tk, 1
 negril.com, 0
 negroes.forsale, 1
 nehalem.gov, 1
@@ -63339,6 +66877,7 @@
 neko-nyan-nuko.com, 1
 neko-nyan.org, 1
 neko.am, 1
+nekoart.net, 1
 nekochan.blog, 1
 nekoku.io, 1
 nekolove.jp, 1
@@ -63366,6 +66905,7 @@
 nellen.it, 1
 nellyarias.com, 1
 nellydallois.fr, 1
+nelnetbank.com, 1
 nelson-marine.com, 1
 nelty.be, 1
 nemagiya.tk, 1
@@ -63395,17 +66935,18 @@
 neniu.gr, 1
 nenkin-kikin.jp, 1
 neno.io, 1
-neo-novarion.com, 1
 neo1.com, 1
 neo2k.dk, 1
 neo2shyalien.eu, 0
 neobits.nl, 1
+neoblog.tk, 1
 neocenter.org, 1
 neochan.net, 1
 neochan.ru, 1
 neocharge.net, 1
 neocities.org, 1
 neocyd.com, 1
+neodaedalus.com.au, 1
 neodigital.bg, 1
 neodrive.ch, 1
 neoedresources.org, 1
@@ -63419,6 +66960,7 @@
 neolaudia.es, 1
 neonataleducationalresources.org, 1
 neonatalgoldenhours.org, 1
+neoni.me, 1
 neonknight.ch, 1
 neons.org, 1
 neophilus.net, 1
@@ -63426,11 +66968,12 @@
 neos.co.jp, 1
 neosdesignstudio.co.uk, 1
 neoseo.com.ua, 1
-neosey.com, 0
 neostralis.com, 1
 neosys.com, 1
 neosys.eu, 1
+neotiv-care.com, 1
 neotiv.com, 1
+neotlojka25.ru, 1
 neotracker.io, 1
 neovapo.com, 1
 neoverso.tk, 1
@@ -63441,6 +66984,7 @@
 neoz.com.br, 1
 nepal-evolution.org, 0
 nepal.ga, 1
+nepalese.tk, 1
 nepali-fonts.tk, 1
 nepalsnews.tk, 1
 nepdtp.in, 1
@@ -63448,6 +66992,7 @@
 nephelion.org, 1
 nephology.net.au, 1
 nephos.xyz, 1
+nephrolog.lt, 1
 nephy.jp, 1
 nepovolenainternetovahazardnihra.cz, 1
 nepozitkova.cz, 1
@@ -63456,13 +67001,15 @@
 nepremicnine-lidl.si, 1
 nepremicnine.click, 1
 nepremicnine.net, 1
-neptuna.hu, 0
+neptun-rio.tk, 1
+neptuna.hu, 1
 neptuneliveaboards.com, 1
 neptunescubadiving.com, 1
 neptunosrefugio.tk, 1
 nerba.net, 1
 nerd.gallery, 1
 nerdaristocracy.com, 1
+nerdbox.cc, 1
 nerdca.st, 1
 nerdgift.ml, 1
 nerdherd.fun, 1
@@ -63487,6 +67034,7 @@
 nereustech.com, 1
 nerfroute.com, 1
 neriumrx.com, 1
+neropiceno.tk, 1
 neroshana.com, 1
 nerot.eu, 1
 nert.gq, 1
@@ -63496,6 +67044,7 @@
 nerven.se, 1
 nervi.ga, 1
 nerwa.vic.gov.au, 1
+nes-watch.de, 1
 nesabamedia.com, 1
 nesbase.com, 1
 nesez.com, 1
@@ -63504,6 +67053,7 @@
 neskins.com, 1
 nesolabs.com, 1
 nesolabs.de, 1
+ness.sh, 1
 nesscitycatholic.org, 1
 nesta.ie, 1
 nestedquotes.ca, 0
@@ -63517,14 +67067,15 @@
 net-provider.cloud, 1
 net-safe.info, 1
 net-script.tk, 1
-net-vilag.hu, 1
 netamia.com, 1
 netapps.de, 1
 netassessor.nl, 1
 netba.net, 1
 netbank.com.au, 1
+netbeacon.de, 1
 netbears.com, 1
 netbears.ro, 1
+netbeyond.de, 1
 netbows.com, 1
 netbows.es, 1
 netbox.org, 1
@@ -63532,11 +67083,13 @@
 netbrief.ml, 1
 netbulls.io, 1
 netbuzz.ru, 1
+netcenteret.tk, 1
 netchameleon.com, 1
 netcials.in, 1
 netconnect.at, 1
 netcoolusers.org, 1
 netcrew.de, 1
+netculturejokes.tk, 1
 netd.at, 1
 netdego.jp, 1
 netdex.co, 1
@@ -63547,6 +67100,7 @@
 netdisk.io, 1
 netducks.com, 1
 netducks.space, 1
+netdude.tk, 1
 netelite.tk, 1
 netera.se, 1
 neteraser.de, 1
@@ -63627,10 +67181,11 @@
 netrewrite.com, 1
 netrider.net.au, 0
 netrino.be, 1
+netrino.info, 1
 netrino.io, 1
 netrogue.ninja, 1
 netronix.be, 1
-netrustcontractor.com, 1
+netrustcontractor.com, 0
 netscaler.expert, 1
 netschool.tk, 1
 netsearch.ga, 1
@@ -63672,6 +67227,7 @@
 netwarc.nl, 1
 netweaver.uk, 1
 netwerkmanager.nl, 0
+netwiseprofits.com, 1
 networds.ro, 1
 networg.com, 1
 networg.cz, 1
@@ -63685,6 +67241,7 @@
 networkdiode.eu, 1
 networkdiode.net, 1
 networkdiode.org, 1
+networker.dk, 1
 networkersdiary.com, 1
 networking-groups.co.uk, 1
 networking4all.com, 1
@@ -63711,6 +67268,7 @@
 networx-online.de, 1
 netz0.com, 1
 netzabfragen.de, 1
+netzer-stuttgart.de, 1
 netzer.ml, 1
 netzfabrik.com, 1
 netzfrauen.org, 1
@@ -63724,6 +67282,7 @@
 netzwerkwerk.de, 1
 neuber.uno, 1
 neuch.info, 0
+neuelandschaft-welzow.de, 1
 neuflizeobc.net, 1
 neuhaus-city.de, 1
 neumarkcb.com, 1
@@ -63743,6 +67302,8 @@
 neurontinprice.ga, 1
 neuronus.com.br, 1
 neuropharmacology.com, 1
+neuropsychexams.com, 1
+neuropsychologisthouston.com, 1
 neurostimtms.com, 1
 neurosurgeryinmexico.com, 1
 neuroticosanonimos.tk, 1
@@ -63751,42 +67312,48 @@
 neutralox.com, 1
 neutron.ch, 1
 neuwal.com, 1
+nev.si, 1
 neva-star.ml, 1
 neva.li, 1
 nevadafiber.com, 1
 nevadafiber.net, 1
 nevalogic.com, 1
 nevam.cf, 1
+neve.in.ua, 1
 never-afk.de, 0
+never-more.tk, 1
 never.pet, 1
 nevergirl.tk, 1
 nevergreen.io, 1
 neverguess.ca, 1
 nevermore.fi, 1
 neverwasinparis.com, 1
-neverwetturkey.com, 1
 nevim-co-varit.cz, 1
 nevivur.net, 1
 nevntech.com, 1
 nevolution.me, 1
 nevoxo.com, 1
+nevrodiversitet.no, 1
 nevychova.cz, 1
 new, 1
 new-black-order.com, 1
 new-boiler-prices.co.uk, 1
 new-jersey-online-casinos.com, 1
+new-medic.com, 1
 new-ms.com, 1
+new-mvp.com, 1
 new-process.ch, 1
 new-process.com, 1
 new-process.de, 1
 new-process.eu, 1
 new-smile.cf, 1
+new-standart.tk, 1
 new-tuning.tk, 1
 new-vip.com, 1
 new-web-studio.com, 1
 new10.com, 1
-newaccess.ch, 1
 newagehoops.com, 1
+newajshoes.com, 1
 newantiagingcreams.com, 1
 newbackup.ml, 1
 newbasemedia.us, 1
@@ -63798,8 +67365,10 @@
 newblogr.com, 1
 newborncryptocoin.com, 1
 newbownerton.xyz, 1
+newbrest.tk, 1
 newbrunswick.today, 1
 newbrunswicktoday.com, 1
+newbuilding.tk, 1
 newburybouncycastles.co.uk, 1
 newburyparkelectric.com, 1
 newburyparkelectrical.com, 1
@@ -63807,6 +67376,7 @@
 newburyparkexteriorlighting.com, 1
 newburyparklandscapelighting.com, 1
 newburyparkoutdoorlighting.com, 1
+newcars.tk, 1
 newchance.store, 1
 newchoicesspb.ru, 1
 newcitygas.ca, 1
@@ -63818,6 +67388,7 @@
 newcontext.com, 1
 newcreamforface.com, 1
 newday.host, 1
+newdenversurvivors.tk, 1
 newdimensioninterlock.com, 1
 newdirectionsolar.com.au, 1
 newearth.press, 1
@@ -63837,8 +67408,9 @@
 newgle.xyz, 1
 newgrowbook.com, 1
 newguidance.ch, 0
-newhamyoungbloods.co.uk, 0
+newhamyoungbloods.co.uk, 1
 newhomedesign.tk, 1
+newhope.org.au, 1
 newhopeofindiana.org, 1
 newikis.com, 1
 newillusion.tk, 1
@@ -63847,6 +67419,7 @@
 newinternet.media, 1
 newissuesmagazine.com.ng, 1
 newizv.ru, 0
+newjerseyvideography.com, 1
 newknd.com, 1
 newlegalsteroid.com, 1
 newlifehempoil.com, 1
@@ -63855,11 +67428,12 @@
 newlovers.gq, 1
 newlynamed.com, 1
 newlytricks.ml, 1
-newmanwebsolutions.com, 1
 newmarketbouncycastlehire.co.uk, 1
+newmatworld.com, 1
 newmed.com.br, 1
 newmediaone.net, 1
 newmeproducts.com, 1
+newmusic.org, 1
 newmusicjackson.org, 1
 newmuslims.tk, 1
 newodesign.com, 1
@@ -63870,6 +67444,8 @@
 newquilters.com, 1
 newreleases.io, 1
 newreop.com, 1
+news-big.com, 1
+news-club.tk, 1
 news-novoros.cf, 1
 news-of-russia.gq, 1
 news-police.tk, 1
@@ -63893,11 +67469,13 @@
 newsall.gr, 1
 newsarmenia.tk, 1
 newsarticle.ml, 1
+newsasia7.com, 1
 newsbali.tk, 1
 newsbay.gr, 1
 newsbomba.ml, 1
 newsbusiness.cf, 1
 newsbytesapp.com, 1
+newscheck.tk, 1
 newscultural.tk, 1
 newsdiff.eu, 1
 newsdiff.nl, 1
@@ -63906,6 +67484,7 @@
 newsforum.ml, 1
 newsforyou.cf, 1
 newsgroups.io, 1
+newsgrowing.com, 1
 newshell.it, 1
 newshome.tk, 1
 newshour.media, 1
@@ -63915,6 +67494,7 @@
 newsireland.tk, 1
 newslanka.tk, 1
 newsletteralerts.com, 1
+newsletters.gq, 1
 newsmotor.info, 1
 newsound.vn, 1
 newspaper-myapp.herokuapp.com, 1
@@ -63932,6 +67512,7 @@
 newsvideo.tk, 1
 newsvoice.com, 1
 newsworld247.tk, 1
+newsxp.tk, 1
 newsyclub.tk, 1
 newsyslog.org, 1
 newtambov.gq, 1
@@ -63941,15 +67522,16 @@
 newtnote.com, 1
 newtoncountymo.gov, 1
 newtonhaus.com, 1
-newtonproject.org, 1
 newtons-erben.space, 1
 newtrackon.com, 1
 newusatoday.ga, 1
 newvehicle.com, 1
 newway.ie, 1
+newwind.tk, 1
 newworldnewlife.tk, 1
 newxit.tk, 1
 newyearsdishes.tk, 1
+newyorkcardiac.com, 1
 newyorkcoffeejobs.com, 1
 newyorkhiltonmidtown.com, 1
 newyorkhipknee.com, 1
@@ -63959,6 +67541,7 @@
 newzealandadventure.tk, 1
 nex.li, 1
 nex.sx, 1
+nexalis.co.za, 1
 nexcoda.io, 1
 nexd.com, 1
 nexgeneration-solutions.com, 1
@@ -63969,7 +67552,6 @@
 next-idea.co, 1
 next-log.ru, 0
 next-web.ad.jp, 0
-next176.sk, 1
 next24.io, 1
 next47.com, 1
 nextads.ch, 1
@@ -64002,12 +67584,12 @@
 nextnely.com, 1
 nextnet.cc, 1
 nextos.com, 1
-nextrader.guru, 1
 nextrasp.it, 1
 nextrec.site, 1
 nextrend.co, 1
 nextright.tk, 1
 nextsfd.co.uk, 1
+nextsound.tk, 1
 nextstart-staging.azurewebsites.net, 1
 nextstart.azurewebsites.net, 1
 nextstep-labs.gr, 1
@@ -64024,6 +67606,9 @@
 nexxus-sistemas.net.br, 1
 nexzcore.com, 1
 neyer-lorenz.de, 1
+neyjens.com, 1
+nezis.tk, 1
+nezkakukec.si, 1
 nezrouge-est-vaudois.ch, 0
 nezrouge-geneve.ch, 0
 nf4.net, 1
@@ -64039,16 +67624,17 @@
 nfl.zapto.org, 1
 nflchan.org, 1
 nflmocks.com, 1
+nfls.io, 1
 nflsic.org, 1
 nfltshirt.com, 1
 nfluence.io, 1
 nfluence.org, 1
-nfmovies.com, 1
 nframe.io, 1
 nfrost.me, 1
 nfsec.pl, 1
 ng-musique.com, 1
 ngarate.com, 1
+ngatikuri.tk, 1
 ngawa-avocat-paris.fr, 1
 ngc.gov, 0
 ngetik.id, 1
@@ -64059,22 +67645,20 @@
 nginxconfig.com, 1
 nginxtest.ml, 1
 nginxyii.tk, 1
-ngkusnd.com, 1
 ngla.gov, 1
 ngmx.com, 1
 ngmx.net, 1
 ngmx.org, 1
 ngndn.jp, 1
 ngo-online.de, 1
-ngo4ngo.org, 0
 ngorod.tk, 1
 ngospelmedia.net, 1
 ngpest.com, 1
-ngt.gr, 1
 nguru.net, 1
 ngutek.com, 1
 nguyencucthanh.com, 1
 nguyendiep.com, 1
+nguyenfamily.tk, 1
 nguyenminhhung.com, 1
 ngvf.de, 1
 ngx.hk, 1
@@ -64082,9 +67666,10 @@
 nhakhoabella.com, 1
 nhakhoangocanh.net, 1
 nhanlucnhatban.com, 1
-nhaoi.com, 1
+nhaoi.com, 0
 nhasicuibap.com, 1
 nhatrang.tk, 1
+nhatrangbooks.com, 1
 nhbp-nsn.gov, 1
 nhccnews.org, 1
 nhchalton.com, 1
@@ -64103,13 +67688,13 @@
 ni-mate.com, 1
 ni.sb, 1
 ni.search.yahoo.com, 0
-niacinreviews.com, 1
 niadd.com, 1
 niagara.ru, 0
 niagarafalls.ca, 1
 niagaraschoice.org, 1
 niallator.com, 1
 nianubo.net, 1
+nibadesign.nl, 1
 nibb13.tech, 0
 nibbler.ai, 1
 nibiru.com.uy, 1
@@ -64163,15 +67748,19 @@
 nicapollo.com, 1
 nicastrosalvatore.tk, 1
 nicat.cf, 1
+nicava.com.mx, 1
 nice-autosurf.com, 1
+nice-germany.tk, 1
 nice-links.tk, 1
 nice.ch, 1
 nice.com, 1
 niceb5y.net, 0
 nicecockb.ro, 1
 niceguyit.biz, 1
+nicekicks.com, 1
 nicesco.re, 1
-nicestudio.co.il, 0
+nicesleepo.com, 1
+nicestudio.co.il, 1
 nicesurf.tk, 1
 nicetaninaka.com, 1
 nicheosala.tk, 1
@@ -64180,7 +67769,7 @@
 nichijou.com, 1
 nicholasperkins.io, 1
 nicholasquigley.com, 1
-nicholasrhodes.co.uk, 1
+nicholasruddick.com, 1
 nicholaswilliams.net, 1
 nicht-blau.de, 1
 nichteinschalten.de, 0
@@ -64194,6 +67783,7 @@
 nickdekruijk.nl, 1
 nickfoerster.io, 1
 nickfrost.rocks, 1
+nickgenom.com, 1
 nickguyver.com, 1
 nickhitch.co.uk, 1
 nickhowell.co.uk, 0
@@ -64207,6 +67797,7 @@
 nickmorris.name, 0
 nickplotnek.co.uk, 1
 nickrickard.co.uk, 1
+nickrickard.uk, 1
 nicks-autos.com, 1
 nickscomputers.nl, 1
 nickserv.eu, 1
@@ -64219,12 +67810,15 @@
 nicktheitguy.com, 1
 nickwasused.cf, 1
 nickwasused.de, 1
+nickwasused.ga, 1
+nickwasused.gq, 1
+nickwasused.ml, 1
 nickymoore.com, 1
-niclasreich.de, 1
 nicn.me, 1
 nico.st, 1
 nicochinese.com, 1
 nicoknibbe.nl, 1
+nicola-bertini.com, 1
 nicoladixonrealestate.com, 1
 nicolaeiotcu.ro, 1
 nicolaiteglskov.dk, 1
@@ -64235,7 +67829,6 @@
 nicolas-hoizey.com, 1
 nicolas-simond.ch, 1
 nicolas-simond.com, 1
-nicolascornet.com, 1
 nicolasfriedli.ch, 0
 nicolasiung.me, 1
 nicolaszambetti.ch, 1
@@ -64260,6 +67853,7 @@
 niederalt.com, 1
 niederohmig.de, 1
 niekbrekelmans.nl, 1
+niels-modeltog.tk, 1
 nielsbohr.ai, 1
 niemaler.de, 1
 niemandmussirgendwas.de, 1
@@ -64285,7 +67879,7 @@
 nieuwebroek.com, 1
 nieuwebroek.nl, 1
 nieuwpoort.tk, 1
-nieuwsberichten.eu, 1
+nieuwsberichten.eu, 0
 nieuwsfiets.nu, 1
 nieuwslagmaat.nl, 1
 nifc.gov, 1
@@ -64308,6 +67902,7 @@
 nightdreamer.me, 1
 nightfirec.at, 1
 nightfirecat.com, 1
+nighthawkstrategies.com, 1
 nightline.ie, 0
 nightmareabyss.top, 0
 nightmarejoker2.com, 1
@@ -64319,6 +67914,7 @@
 nightstar-online.tk, 1
 nightvisionguys.com, 1
 nightwinds.tk, 1
+nightwishchile.tk, 1
 nightwood.cf, 1
 nihaarpstars.com, 1
 nihad.dk, 1
@@ -64336,8 +67932,10 @@
 nijimama-life.com, 1
 nijm.nl, 1
 nijniy-novgorod.tk, 1
+nijzoon.nl, 1
 nika-travel.ga, 1
 nikahplus.com, 1
+nikahsekeri.tk, 1
 nikandcara.com, 1
 nikant.tk, 1
 nikavandenbos.nl, 1
@@ -64347,7 +67945,6 @@
 nikest.tk, 1
 nikhilnimiya.love, 1
 nikhilramakrishnan.tk, 1
-nikifoth.io, 1
 nikimix.com, 0
 nikitenko.tk, 1
 nikitina.ml, 1
@@ -64357,6 +67954,7 @@
 niklas.pw, 1
 niklasbabel.com, 1
 niklasstinkt.com, 1
+niko-mapping-studio.tk, 1
 niko-vfx.com, 1
 nikolahost.tk, 1
 nikolai-schmidt.tk, 1
@@ -64379,13 +67977,15 @@
 niles.xyz, 1
 nilgirispice.co.uk, 1
 nilianwo.com, 1
-nillarayeshi.com, 1
 nilosoft.com, 1
 niloxy.com, 1
 nilpointer.com, 1
 nilrem.org, 0
 nils.ch, 1
+nilsanenglish.com, 1
 nimanranch.com, 1
+nimbl.nz, 1
+nimble.com.br, 1
 nimbo.com.au, 1
 nimbus-net.tk, 1
 nimelainsurance.com, 1
@@ -64429,6 +68029,8 @@
 ninpang.com, 1
 ninreiei.jp, 1
 ninsin-akachan.com, 1
+nintendocarddelivery.com, 1
+nintendocollectionsystem.com, 1
 nintendohill.com, 1
 nintendoreporters.com, 1
 ninth.cat, 1
@@ -64441,6 +68043,7 @@
 nipit.biz, 1
 nippangift.com, 1
 nippel.tk, 1
+nipplefucking.com, 1
 nipponkempoph.tk, 1
 nipponnews.tk, 1
 nipponprinting.co.jp, 1
@@ -64453,7 +68056,6 @@
 nirudo.me, 1
 nirvana-esport.fr, 1
 nirvanashop.com, 1
-niscats.com, 1
 niscemi.tk, 1
 nishikino-maki.com, 1
 nishimebistro.cz, 1
@@ -64476,8 +68078,8 @@
 nitropur.com, 1
 nitropur.de, 1
 nitrous-networks.com, 1
+nitroxpowerpc.com, 1
 nitschinger.at, 1
-nitter.net, 1
 niunaimilk.cn, 1
 nivalandemarit.fi, 1
 nivarussia.ml, 1
@@ -64531,11 +68133,11 @@
 nkp.bg, 1
 nksky.cn, 1
 nksmart.ru, 1
+nktsee.com, 1
 nkvd-farm.ru, 1
 nkx4sjyrk4tcv0sluhwajyc-n6icja9gchqxmhp.com, 0
 nl-comunistas.tk, 1
 nl-ix.net, 1
-nl.ci, 1
 nl.search.yahoo.com, 0
 nl3ehv.nl, 1
 nlagstage.in, 1
@@ -64548,6 +68150,7 @@
 nlm.gov, 1
 nlpdiscovery.ro, 1
 nlponline.com.ua, 1
+nm.cx, 1
 nm2d.nl, 1
 nmb.gov, 1
 nmcep.net, 1
@@ -64568,17 +68171,20 @@
 nn30019.com, 1
 nn5197.co, 1
 nn6729.co, 1
+nn6729.com, 1
 nn6957.co, 1
 nn9297.co, 1
 nn9397.com, 1
 nn9721.com, 1
 nn9728.co, 1
 nna774.net, 1
+nndfn.com, 1
 nnews.tk, 1
 nnkkserver02.ddns.net, 1
 nnnow.com, 1
 nnov.ru, 0
 nnsa-ecp.org, 1
+no-andishan.ir, 1
 no-data.tk, 1
 no-ice.be, 1
 no-ice.nl, 1
@@ -64588,6 +68194,7 @@
 no-war-on-iraq.tk, 1
 no-xice.com, 0
 no.search.yahoo.com, 0
+noaccess.tk, 1
 noachgilor.co.il, 1
 noagendahr.org, 1
 noah-witt.com, 1
@@ -64617,6 +68224,8 @@
 nocoffeetech.de, 1
 nocommentsallowed.com, 1
 nocrm.io, 1
+noctinus.tk, 1
+noctisphoto.tk, 1
 nocturnos.tk, 1
 nocturnus.tk, 1
 nodde.cf, 1
@@ -64631,7 +68240,6 @@
 nodepositcasinouk.com, 1
 nodesonic.com, 1
 nodespin.com, 1
-nodevops.com, 1
 nodi.at, 0
 nodi.cloud, 1
 nodist.club, 1
@@ -64663,16 +68271,17 @@
 nohungerfoodbank.org, 1
 nohup.se, 1
 nohup.xyz, 1
+noideas.tk, 1
 noiglosujemy.com.pl, 1
 noiglosujemy.pl, 1
 noincludesubdomains.preloaded.test, 0
 noirpvp.com, 1
 noiseandheat.com, 1
 noisebridge.social, 1
-noiseexplorer.com, 1
 noisetrap.cz, 1
-noisky.cn, 0
+noisky.cn, 1
 noisyfox.cn, 1
+noisyfox.io, 1
 noites.pt, 1
 noj.ac, 1
 nojok.es, 1
@@ -64692,7 +68301,9 @@
 noleggiobagnichimici.perugia.it, 1
 noleggioimbarcazioni.it, 1
 noleggiolimousine.roma.it, 1
+nolinobaby.pl, 1
 nolische.com, 1
+nolte-tver.ru, 1
 nolz.cloud, 1
 noma-film.com, 1
 nomadaregalos.com, 1
@@ -64740,9 +68351,11 @@
 noobit.org, 1
 noobow.me, 1
 noobsrus.co.uk, 1
+noobsunited.de, 1
 noobswhatelse.net, 1
 noobunbox.net, 1
 noodles.net.nz, 0
+noodles.wtf, 1
 noodplan.co.za, 1
 noodweer.be, 1
 noom.com, 1
@@ -64775,7 +68388,6 @@
 noradevot.com, 1
 noradrenalina.com, 1
 norala.tk, 1
-norapiero.com, 1
 norbert-wollheim-platz.tk, 1
 norbertorabinovichblog.com, 1
 nord-sud.be, 1
@@ -64814,6 +68426,7 @@
 norichanmama.com, 1
 noriel.ro, 1
 noris.de, 0
+noriskit.nl, 1
 normaculta.com.br, 1
 normalady.com, 1
 normalized.ga, 1
@@ -64823,11 +68436,13 @@
 normanbauer.com, 1
 normandcyr.com, 1
 normandgascon.com, 1
+normandy.tk, 1
 normankranich.de, 1
 normanschwaneberg.de, 1
 normapro.es, 1
 norml.fr, 1
 norouzi-jeep.ir, 1
+norrishome.tk, 1
 norrkemi.se, 1
 norrlandsbilverkstad.se, 1
 norrliden.de, 1
@@ -64856,6 +68471,7 @@
 northernmuscle.ca, 1
 northernpowertrain.com, 1
 northernselfstorage.co.za, 1
+northfinance.dk, 1
 northhampton-nh-pd.gov, 1
 northkoreainsider.tk, 1
 northliner.tk, 1
@@ -64877,6 +68493,7 @@
 northwoodstudios.org, 1
 northzone.ml, 1
 norway.ml, 1
+norwestpodiatry.co.nz, 1
 norys-escape.de, 1
 nos-medias.fr, 1
 nos-oignons.net, 1
@@ -64900,6 +68517,7 @@
 nostalgiktv.ml, 1
 nostalgimidi.se, 1
 nostalgische-attracties.nl, 1
+nostaljicicekcilik.com, 1
 nostoautomaatti.fi, 1
 nostosh.eu.org, 1
 nostradansacornella.tk, 1
@@ -64909,7 +68527,6 @@
 nosuch.website, 1
 noswap.com, 1
 nosyu.pe.kr, 1
-not-a.link, 1
 not4me.ga, 1
 nota-web.com, 1
 nota.moe, 1
@@ -64927,9 +68544,9 @@
 notarkrauss.de, 1
 notary24.ru, 1
 notaryassistant.com, 1
-notasipartiturlagu.com, 1
 notbolaget.se, 1
 notboring.co.uk, 1
+notbot.es, 1
 notcompletelycorrect.com, 1
 notcurses.com, 1
 note.wf, 1
@@ -64963,10 +68580,12 @@
 notigatos.es, 1
 notilus.fr, 1
 notilus.it, 1
+notime.tk, 1
 notimesupport.com, 1
 notinglife.com, 1
 notisec.hu, 1
 notisecit.hu, 1
+notizie.ai, 1
 notizieh24.eu, 1
 notjustvacs.com, 1
 notliriklagu.com, 1
@@ -64983,6 +68602,7 @@
 notre-planete.info, 1
 notrefuse.tk, 1
 notrero13.com, 1
+notresiteduvercors.tk, 1
 notsafefor.work, 1
 nottres.com, 1
 notube.net, 1
@@ -64991,6 +68611,7 @@
 noudjalink.nl, 1
 nougat-anduze.fr, 1
 nourishandnestle.com, 1
+nourishbyfrida.com, 1
 noussommesluniversite.org, 1
 noustique.com, 1
 noustramits.com, 1
@@ -64999,23 +68620,25 @@
 nouvelle.net.au, 1
 nova-dess.ch, 0
 nova-eq.com, 1
+nova-host.ml, 1
 nova-kultura.org, 1
 nova.live, 1
 nova.moe, 1
 novabench.com, 1
 novacleaning.ru, 1
 novacoaching.nl, 1
-novacoast.com, 0
+novacoast.com, 1
 novadermis.es, 1
 novafreixo.pt, 1
 novak.cf, 1
 novalite.rs, 1
 novanetwork.ml, 1
+novarock.tk, 1
 novascan.net, 1
 novasprint.tk, 1
 novawatch.de, 1
+novaway.ca, 1
 nove.city, 1
-nove.news, 1
 noveciti.com, 1
 novecity.cloud, 1
 novecity.com, 1
@@ -65030,7 +68653,6 @@
 novengi.mu, 1
 novenopiso.tk, 1
 novezamky.tk, 1
-novgorod-avia.ru, 1
 novgorod24.tk, 1
 novgorodinfo.tk, 1
 novi.com, 1
@@ -65059,6 +68681,7 @@
 novoresume.com, 0
 novorossiysk.tk, 1
 novorussiya.tk, 1
+novosad-kom.tk, 1
 novosel.ga, 1
 novoselie.ga, 1
 novosti-novorossii.ml, 1
@@ -65071,15 +68694,17 @@
 novostroyki.ml, 1
 novotoznanie.com, 1
 novsti.cf, 1
+novu.com, 1
 novurania.com, 1
 novye-kuhni.ml, 1
 novysvit.com.ua, 1
 now.sh, 1
 now101atm.tk, 1
 nowarning.cc, 1
+nowbb.tk, 1
 nowcomplete.com.br, 1
-nowcost.com, 1
 nowebsite.tk, 1
+nowecor.de, 1
 noweigh.co.uk, 1
 nowhere.dk, 1
 nowitzki.me, 1
@@ -65087,12 +68712,14 @@
 nowlas.org, 0
 nowloading.co, 1
 nowremindme.com, 1
+nowtime.cc, 1
 nowzarimd.com, 1
 nowzuwan.org, 0
 noxi.ga, 1
 noxlogic.nl, 1
 noxx.global, 1
 noxx.solutions, 1
+noxx.uk, 1
 noydeen.com, 1
 noyocenter.org, 1
 nozaka-k.com, 1
@@ -65105,6 +68732,7 @@
 npbeta.com, 1
 npc-ts.org, 1
 npc.org.au, 1
+npcradio.tk, 1
 npcrcss.org, 1
 npdigital.com, 1
 npgateway.com, 1
@@ -65113,7 +68741,6 @@
 npiconsultoria.com.br, 1
 npm.li, 1
 npmcdn.com, 1
-npod.me, 1
 npregion.org, 1
 npsas.org, 1
 nptn.tk, 1
@@ -65122,11 +68749,13 @@
 nqeshreviewer.com, 1
 nr-sputnik.ru, 1
 nr1hosting.com, 1
+nrail.eu, 1
 nrbpublishing.com, 1
 nrd.gov, 1
 nrd.li, 1
 nrdigitalbranding.com, 1
 nrdstd.io, 1
+nrealsport.com, 1
 nrev.ch, 0
 nriol.net, 1
 nrkn.fr, 1
@@ -65151,6 +68780,7 @@
 nscai.gov, 1
 nscnet.jp, 1
 nscondominios.pt, 1
+nsdcprayerforce.com, 1
 nsep.gov, 1
 nsfw-story.com, 1
 nshipster.cn, 1
@@ -65192,6 +68822,7 @@
 ntcp.ph, 1
 nte.email, 1
 ntechp.com, 1
+ntgltema.ml, 1
 ntgvision.com, 1
 nth.sh, 0
 nti.de, 1
@@ -65201,22 +68832,24 @@
 ntppool.org, 0
 ntut.net, 1
 ntx360grad-fallakte.de, 1
-ntz.im, 1
 ntzlaw.com, 1
 ntzwrk.org, 1
 nu-pogodi.net, 1
+nu-spine.com, 1
 nu3tion.com, 1
 nu3tion.cz, 1
 nu3vex.com, 1
 nuacht.ie, 1
 nualgiponds.com, 1
 nubehogar.nsupdate.info, 1
+nubilum.noip.me, 1
 nubium.net, 1
 nubu.at, 1
 nubunk.com.ng, 1
 nucameratoezicht.nl, 1
 nuclea.id, 1
 nuclea.site, 1
+nuclearcake.de, 1
 nuclearcat.com, 1
 nuclearforum.tk, 1
 nuclearhell.tk, 1
@@ -65226,6 +68859,7 @@
 nucleosynth.space, 1
 nucleuscore.org, 1
 nucleuspanel.com, 1
+nudaveritas.tk, 1
 nudeandfresh.tk, 1
 nudel.ninja, 1
 nudes.ovh, 1
@@ -65234,6 +68868,7 @@
 nudge.ai, 1
 nuel.cl, 1
 nuestratecnologia.com, 1
+nuevacombarbala.tk, 1
 nuevaimagenpublicidad.es, 1
 nuffield.nl, 1
 nugdev.co, 0
@@ -65243,6 +68878,7 @@
 nuipogoda.ru, 1
 nuitec.com.br, 1
 nuits-franciliennes.fr, 1
+nuke-masters.tk, 1
 nukeportal.ml, 1
 nukeportal.tk, 1
 nukeshop.tk, 1
@@ -65260,7 +68896,6 @@
 nullscripts.tk, 1
 nullshare.tk, 1
 nulltime.net, 0
-nullwebscripts.com, 1
 nullxsec.net, 1
 nully.xyz, 1
 numancia.tk, 1
@@ -65277,7 +68912,6 @@
 numero1.ch, 0
 numerologist.com, 1
 numerouno.ml, 1
-numis.tech, 1
 numismatica.info.ve, 0
 numismed-seniorcare.de, 1
 numista.com, 1
@@ -65292,11 +68926,13 @@
 nunoleiria.com, 1
 nunomoura.com, 1
 nunoprospero.com, 1
+nunsarean.tk, 1
 nuntiicaelo.in.ua, 1
 nuoha.com, 1
 nuos.org, 1
 nuovaelle.it, 1
 nuovavetro.com, 1
+nuovicasino.it, 1
 nupef.org.br, 0
 nuquery.com, 1
 nuquery.org, 1
@@ -65308,7 +68944,6 @@
 nuriaamat.com, 1
 nuriacamaras.com, 1
 nurlyn.com, 0
-nurmio.fi, 1
 nursejj.com, 1
 nursemom.ca, 1
 nurseregistry.com, 1
@@ -65327,21 +68962,21 @@
 nutleyarchives.org, 1
 nutleyeducationalfoundation.org, 1
 nutleyef.org, 1
-nutpanda.com, 1
+nutmeg.com, 1
 nutra-creations.com, 1
 nutradian.com, 1
-nutralivbio.com, 1
 nutrashop.fr, 1
 nutri-spec.me, 1
 nutriciametabolics-shop.de, 1
 nutriclub.co.id, 1
-nutricuerpo.com, 1
 nutridieta.com, 1
 nutrienti.eu, 1
 nutrifyyourself.com, 1
+nutrimedcn.com, 1
 nutrindoideias.com, 1
 nutripedia.gr, 1
 nutrishop.com, 1
+nutrisidangym.com, 1
 nutrislice.com, 1
 nutristories.gr, 1
 nutrition.gov, 1
@@ -65398,7 +69033,7 @@
 nxtgenbroadband.in, 1
 nxtgensn.com, 1
 nxth.io, 1
-nya-cloud.com, 1
+nya-cloud.com, 0
 nya.as, 1
 nya.one, 1
 nyaa.am, 1
@@ -65418,6 +69053,7 @@
 nyatane.com, 1
 nyawork.com, 1
 nybcreative.com, 1
+nycdentalimplantscenter.com, 1
 nycfilmcrew.com, 1
 nyconcretelifting.com, 1
 nycoyote.org, 1
@@ -65430,6 +69066,7 @@
 nyerjenaheraval.hu, 1
 nyfurnitureoutlets.com, 1
 nyhaoyuan.net, 1
+nyhemsgarden.se, 1
 nyiarlumar.tk, 1
 nyip.co.uk, 1
 nylasercenter.com.pl, 1
@@ -65446,6 +69083,7 @@
 nysis.net, 1
 nysis.org, 1
 nysteak5.com, 1
+nystrom.tk, 1
 nystudio107.com, 1
 nytrafficticket.com, 1
 nyyu.tk, 1
@@ -65505,6 +69143,7 @@
 o5.vc, 1
 o5197.co, 1
 o6729.co, 1
+o6729.com, 1
 o6957.co, 1
 o6asan.com, 1
 o81365.com, 1
@@ -65517,9 +69156,11 @@
 o98.net, 1
 oacloud.nl, 1
 oadeo.com, 1
+oadpoaw.xyz, 1
 oahpmdata.net, 1
 oaic.gov.au, 1
 oakbarnvets.com, 1
+oakbarnwellness.com, 1
 oaken.duckdns.org, 1
 oakesfam.net, 1
 oakface.club, 1
@@ -65562,26 +69203,32 @@
 obclub.tk, 1
 obdchekautomotriz.co, 1
 obdinvest.ru, 1
+obdlink.com, 1
 obdolbacca.ru, 1
 obec-krakovany.cz, 1
 obecvinodol.tk, 1
 obed-doma.tk, 1
 oberam.de, 1
+oberg.us, 1
 oberhofdrinks.com, 1
 oberhofjuice.com, 1
 obermeiers.eu, 1
 oberoi.de, 1
 obery.com, 1
 obesidadlavega.com, 1
+obet901vip.com, 1
 obfuscate.xyz, 1
 obg-global.com, 1
-obg.ceo, 1
 obgalslancaster.com, 1
+obgynecologistnyc.com, 1
 obgynmiamifl.com, 1
+obgynqueensnyc.com, 1
+obi-betriebsrat.tk, 1
 obioncountytn.gov, 1
 object.earth, 1
 objectif-securite.ch, 1
 objectif-terre.ch, 0
+objectif-vancouver-2010.fr, 1
 objectifs-fitness.com, 1
 objectorientedsolutions.com, 1
 objekt-textil.ch, 0
@@ -65589,11 +69236,14 @@
 objexunlimited.com, 1
 oblast45.ru, 0
 obligacjekk.pl, 1
+oblik.pp.ua, 1
+oblik.press, 1
+oblinvest.org, 1
 oblitsov.ru, 1
-obliviate.io, 1
 oblivious.ml, 1
 oblojka.tk, 1
 oblondata.io, 0
+obmen-viz.tk, 1
 obmen-vizitami.ml, 1
 obnalichka.ga, 1
 obnalichka.gq, 1
@@ -65611,6 +69261,7 @@
 obscur.us, 1
 obscureware.xyz, 1
 observass.com, 1
+observednews.com, 1
 observer.com, 1
 observer.name, 1
 obsessedwithknives.ru, 1
@@ -65618,14 +69269,14 @@
 obsessivecompulsiveexplained.com, 1
 obsidianirc.net, 1
 obsproject.com, 1
+obsuzhday.com, 1
+obsydian.org, 0
 obtima.org, 1
 obuchowicz.pl, 1
 obve.nl, 1
 obxlistings.com, 1
 obyvateleceska.cz, 1
 obzor-znakomstv.tk, 1
-obzoroff.asia, 1
-obzoroff.shop, 1
 obzory-evgeny.tk, 1
 oc-minecraft.com, 1
 oc-sa.ch, 0
@@ -65644,6 +69295,7 @@
 occult-magick.ml, 1
 occultism.tk, 1
 occultisme.tk, 1
+occultumproductions.tk, 1
 occupational-therapy-colleges.com, 1
 occupations.org.ru, 1
 occupybakersfield.tk, 1
@@ -65655,6 +69307,7 @@
 oceanbeauty.ir, 1
 oceanborn.tk, 1
 oceanbreezehomes.com, 1
+oceancrew.org, 1
 oceandns.eu, 1
 oceandns.net, 1
 oceandns.nl, 1
@@ -65665,7 +69318,7 @@
 oceanofapk.com, 1
 oceanofpdf.com, 1
 oceanshaman.cf, 1
-oceanspraymiami.com, 0
+oceanspraymiami.com, 1
 oceanspringsarchives.net, 1
 oceansurplus.tk, 1
 oceanviewde.gov, 1
@@ -65675,6 +69328,7 @@
 ocenovani-inspekce.cz, 1
 ocf.io, 1
 ocg-card.com, 1
+ochki-linzi.tk, 1
 ochrebridge.com, 1
 ochrepoint.com.au, 1
 ochsenfeld.co, 1
@@ -65698,9 +69352,6 @@
 ocrn.nl, 1
 ocsamochodu.pl, 1
 ocsan.gov, 1
-ocsr.nl, 1
-octagon.institute, 1
-octagongroup.co, 1
 octane.net.au, 1
 octanio.com, 1
 octarineparrot.com, 1
@@ -65724,10 +69375,12 @@
 octovpn.com, 1
 oculta.ml, 1
 oculus.com, 1
+ocupat.ro, 1
 ocwr.gov, 1
 odabilocal.com, 1
 odacyeux.fr, 1
 odatakao.com, 1
+oddba.cn, 0
 oddlama.org, 1
 oddmouse.com, 0
 oddmuse.org, 1
@@ -65736,6 +69389,7 @@
 oddsandevensbookkeeping.ca, 1
 oddtime.net, 1
 ode.red, 1
+odedigitale.marketing, 1
 odegua.com, 1
 odejdamoda.tk, 1
 odensc.com, 1
@@ -65743,15 +69397,21 @@
 odenvilleal.gov, 1
 odeonentertainment.co.uk, 1
 odessalove.tk, 1
+odezdaotto.tk, 1
 odhosc.ca, 1
+odiall.co, 1
+odiall.tk, 1
+odigitalmarketing.com.br, 1
 odijmond.nl, 1
 odinraz.ga, 1
 odinseye.net, 1
 odinson.tk, 1
 odiris.lk, 1
+odlicomul.ga, 1
 odnostranichnik.tk, 1
 odo-pro.ru, 1
 odolbeau.fr, 1
+odonoghue.kiwi, 1
 odontologia-online.com, 0
 odontologiawilliampizarro.com, 1
 odoo.co.th, 1
@@ -65762,6 +69422,7 @@
 oducs.org, 1
 odxin.com, 1
 odysea.cat, 1
+odyssee-animation.tk, 1
 odyssey44.com, 1
 odysseyofthemind.eu, 1
 odysseytraining.com.au, 1
@@ -65785,6 +69446,7 @@
 oemwolf.com, 1
 oenings.eu, 1
 oeno.link, 1
+oenolab-vidalies.com, 1
 oepsbanaan.nl, 1
 oermen.com, 1
 oessi.eu, 1
@@ -65792,8 +69454,10 @@
 oettig.xyz, 1
 oetzies-quiz.com, 1
 oevenezolano.org, 1
+of-sound-mind.com, 1
 of2106.dnsalias.org, 1
 of2m.fr, 1
+ofaqim.city, 1
 ofasoft.com, 1
 ofcampuslausanne.ch, 0
 ofertasadsl.com, 1
@@ -65815,7 +69479,6 @@
 offersgame.com, 1
 offertegiuste.com, 1
 offertemodule.com, 1
-offeryep.info, 1
 offgames.io, 1
 offgridauto.com, 1
 offgridbound.com, 1
@@ -65843,13 +69506,13 @@
 official-sensitive.com, 1
 officina.roma.it, 1
 officium.tech, 1
-offlimo.com, 1
 offpageseopro.tk, 1
 offroadhoverboard.net, 1
 offsetservices.co.uk, 1
 offshoot.ie, 1
 offshoot.rentals, 0
 offshore.digital, 1
+offshoreclamp.com, 1
 offshoremoney.tk, 1
 offtherails.ie, 1
 offtherayles.com, 1
@@ -65866,10 +69529,10 @@
 ofrion.lu, 1
 ofsetas.lt, 1
 oftamedic.com, 0
+ofthethorn.be, 1
 oftn.org, 1
 oga.fit, 0
 ogamerezine.tk, 1
-ogaprinta.com, 1
 ogarkovo.ml, 1
 ogatsu-cho.com, 1
 oge.ch, 0
@@ -65882,7 +69545,6 @@
 ognemet.net, 1
 ognyan.tk, 1
 ogo-knigi.ml, 1
-ogocare.com, 1
 ogogo-knigi.ml, 1
 ogorod-money.tk, 1
 ogretmenimsanat.com, 0
@@ -65900,6 +69562,7 @@
 ohd.dk, 1
 oheila.com, 1
 ohentpay.com, 1
+ohhappy.win, 1
 ohhere.xyz, 1
 ohioag.gov, 1
 ohioago.gov, 1
@@ -65922,9 +69585,11 @@
 ohmanager.kr, 1
 ohmayonnaise.com, 1
 ohmy.ca, 1
+ohmydish.nl, 1
 ohmyunix.com, 1
 ohne-name.de, 1
 ohnonotme.com, 1
+ohokbd.tk, 1
 ohol.se, 1
 ohome.io, 1
 ohoreviews.com, 1
@@ -65934,10 +69599,13 @@
 ohsohairy.co.uk, 1
 ohsweetart.com, 1
 ohyooo.com, 1
+ohype.ga, 1
 oi-wiki.org, 1
 oiahe.org.uk, 1
 oic-ci.gc.ca, 1
 oidrava.tk, 1
+oikontroloi.tk, 1
+oikosweb.com, 1
 oil-ecn.ru, 1
 oil-heaters.tk, 1
 oilfieldinjury.attorney, 1
@@ -65950,7 +69618,7 @@
 oiseaux-mania.com, 1
 oita-homes.com, 1
 ojaioliveoil.com, 1
-ojeremy.com, 1
+ojeremy.com, 0
 ojk.ee, 1
 ojp.gov, 1
 ok-ex.io, 1
@@ -66002,6 +69670,7 @@
 okna-vek.com.ua, 1
 okna.ua, 1
 oknarating.ru, 1
+oknavdom-rf.ru, 1
 oknavdom.tk, 1
 oknopvh.ml, 1
 okobojitech.com, 1
@@ -66026,7 +69695,6 @@
 okviz.com, 1
 okweb.mx, 1
 okwu.cz, 1
-ola-xyma.com, 1
 olacatlitter.com, 1
 olafnorge.de, 1
 olafvantol.nl, 1
@@ -66044,15 +69712,17 @@
 olcbrookhaven.org, 1
 old-times.ga, 1
 old-tomsk.tk, 1
+old-wheelers.tk, 1
 oldaine.tk, 1
 oldbkcom.tk, 1
 oldbrookinflatables.co.uk, 1
 oldbrookmarqueehire.co.uk, 1
-oldchaphome.nl, 1
+oldcars.tk, 1
 oldcity.tk, 1
-oldcraft-mc.ru, 1
+oldcitysmokehouse.com, 1
 olddisk.ml, 1
 oldenglishsheepdog.com.br, 1
+oldenzaal.tk, 1
 older-racer.com, 1
 oldfieldmusic.tk, 1
 oldfriends.tk, 1
@@ -66070,11 +69740,13 @@
 oldrun.is, 1
 oldscans.tk, 1
 oldschool-criminal.com, 1
+oldskoolreviews.tk, 1
 oldsticker.com, 1
 oldstmary.com, 1
 oldtavern.tk, 1
 oldtimerparts.de, 1
 oldtimerreifen-moeller.de, 1
+oldvaliken.tk, 1
 olecoin.io, 1
 olegchursin.com, 1
 olegon.ru, 1
@@ -66124,6 +69796,7 @@
 oliverdunk.com, 0
 olivereats.ca, 1
 oliverfaircliff.com, 1
+oliverjoss.com, 1
 olivernaraki.com, 1
 oliverniebuhr.de, 0
 oliverschmid.space, 1
@@ -66132,9 +69805,11 @@
 olivetbgc.org, 1
 olivia.cf, 1
 olivialufkin.tk, 1
+olivier-giroud.tk, 1
 olivier-rochet.com, 1
 olivierberardphotographe.com, 0
 oliviercreation.tk, 1
+olivierdurand.tk, 1
 olivierpieters.be, 1
 oliviers-co.no, 1
 oliviervaillancourt.com, 1
@@ -66171,7 +69846,6 @@
 olsh-hilltown.com, 1
 olson25.org, 1
 olsonproperties.com, 1
-oluchiedmundmusic.com, 1
 olydemy.com, 1
 olyfed.com, 1
 olygazoo.com, 1
@@ -66184,6 +69858,7 @@
 olympiamanzanilla.tk, 1
 olympic-research.com, 1
 olympicfitness.com.mx, 1
+olymptrade.com, 1
 om.yoga, 1
 om1.com, 1
 omachi.top, 1
@@ -66208,11 +69883,13 @@
 omega-marijuana.com, 1
 omegachess.tk, 1
 omegahosting.net, 1
+omegalan.tk, 1
 omegarazer.ca, 1
 omegathermoproducts.nl, 1
 omegletalk.com, 1
 omenprinting.com.au, 1
 omeopatiadinamica.it, 1
+omerta.tk, 1
 omertabeyond.com, 1
 omertabeyond.net, 1
 omestudios.tk, 1
@@ -66227,9 +69904,10 @@
 omgvaneyckwashere.eu, 1
 omgvaneyckwashere.gent, 1
 omicron3069.com, 1
-omintmais.azurewebsites.net, 0
+omintmais.azurewebsites.net, 1
 omitech.co.uk, 1
 ommcitalflex.com, 1
+omnel.ml, 1
 omniaclubs.com, 1
 omniasig.ro, 1
 omniasl.com, 1
@@ -66260,14 +69938,15 @@
 omsknews.tk, 1
 omskrock.com, 1
 omskweb.tk, 1
+omtcloud.jp, 1
 omtleden.nl, 1
 omveda.org, 1
 on-air.today, 1
 on-targettrainingcourses.com, 1
 on-tech.co.uk, 1
 on-the-wave.com, 1
+on-tv.tk, 1
 on2it.net, 1
-on9.link, 1
 ona.io, 1
 onaboat.se, 1
 onahonavi.com, 1
@@ -66284,11 +69963,13 @@
 ondcp.gov, 1
 onde.xyz, 1
 ondeapostar.pt, 1
+ondemandassociate.com, 1
 onderwijscentrum.gent, 1
 onderwijscentrumgent.be, 1
 onderwijstransparant.nl, 1
 ondevamosjantar.com, 1
 ondiet.biz, 1
+ondoorgrond.tk, 1
 ondrej.org, 1
 ondrejbudin.cz, 1
 ondrejhoralek.cz, 1
@@ -66296,17 +69977,20 @@
 one---line.com, 1
 one-clue.com, 1
 one-host.ga, 1
-one-million-places.com, 1
 one-news.net, 0
 one-promise.org, 1
 one-resource.com, 1
 one-s.co.jp, 1
 one-tab.com, 1
+one-two.ro, 1
 one6688.com, 1
 oneartyminute.com, 1
 oneazcu.com, 0
 onebigcow.com, 1
 onebookstore.ml, 1
+onebreadcrumb.com, 1
+onebreadcrumb.com.au, 1
+onechoice.co.nz, 1
 onechronos.com, 1
 oneclic.ch, 0
 oneclick2books.cf, 1
@@ -66321,13 +70005,13 @@
 onedrive.com, 0
 onedrive.live.com, 0
 onee3.org, 1
-oneearthapp.com, 0
 oneearthsacredarts.com, 1
 onefour.ga, 0
 oneheartbali.church, 0
 onehost.kz, 1
 oneidentity.me, 1
 oneindex.tk, 1
+oneirosociety.tk, 1
 oneless.tk, 1
 onelifenutrition.co.uk, 1
 onelinkmmp.net, 1
@@ -66347,6 +70031,7 @@
 onepointzero.com, 1
 oneprediction.com, 1
 onereview.in, 1
+ones.buzz, 1
 oneshotmediakc.com, 1
 oneso.win, 1
 onesourceit.nl, 1
@@ -66358,6 +70043,7 @@
 onestopshop.ml, 1
 onestoptown.com, 1
 onestpasdesanges.fr, 1
+onetakeonehit.tk, 1
 onetap.com, 1
 onetcenter.org, 1
 onetcodeconnector.org, 1
@@ -66373,6 +70059,7 @@
 onetwentyseven001.com, 1
 onetwo-vermietung.de, 1
 onetwosweetatelier.com, 1
+onevpn.com, 1
 oneway.ga, 1
 onewaymail.com, 1
 oneweb.hu, 1
@@ -66386,8 +70073,9 @@
 oni.nl, 1
 onice.ch, 1
 onidesign.tk, 1
+onionbot.ga, 1
 onionbot.me, 1
-onionplay.eu, 1
+onionplay.is, 1
 onionscan.org, 1
 onionsocial.com, 1
 onionyst.com, 1
@@ -66398,24 +70086,30 @@
 onkentessegertdij.hu, 1
 onkfaktor.de, 1
 onkologiya.ga, 1
+onlanka.com, 1
 onlfait.ch, 0
 online-backup.se, 1
 online-biblio.tk, 1
-online-bookmakers.ru, 1
+online-bookmakers.ru, 0
 online-calculator.com, 1
+online-car-show.com, 1
 online-carhire.tk, 1
+online-clothing-store.tk, 1
 online-consulting-corp.com, 1
 online-divorce.co.za, 1
 online-eikaiwa-guide.com, 1
 online-health-insurance.com, 1
 online-jobs.cf, 1
 online-lernprogramme.de, 1
+online-mobile-phone-shop.tk, 1
 online-news-usa.tk, 1
 online-pochta.ml, 1
 online-pr.at, 1
 online-scene.com, 1
+online-shop-equipment.tk, 1
 online-sql-editor.com, 1
 online-stopwatch.com, 1
+online-store-phones.tk, 1
 online-taxes.tk, 1
 online-textil.com, 1
 online-textil.cz, 1
@@ -66425,17 +70119,24 @@
 online.swedbank.se, 1
 online24.pt, 1
 onlinebiller.com, 1
+onlinebookmarks.tk, 1
 onlinebupropion.gq, 1
 onlinebusiness.law, 1
 onlinecasinobluebook.com, 1
+onlinecasinosportugal.pt, 1
 onlinecensorship.org, 1
 onlinecollegeessay.com, 1
 onlinecorners.com, 1
+onlinecosmeticsstore.tk, 1
+onlinecrafts.tk, 1
 onlinedapoxetina.gq, 1
 onlinedemo.hu, 1
 onlinedivorce.com, 1
+onlinedoctors24.com, 1
 onlinefashion.it, 1
+onlineformatter.net, 1
 onlinefurniture.us, 1
+onlinegallery.cf, 1
 onlinegamesforgirls.tk, 1
 onlinehaircuts.com, 1
 onlinehartha.com, 1
@@ -66450,27 +70151,34 @@
 onlinemagento.com, 1
 onlinemarketingmuscle.com, 1
 onlinemarketingtraining.co.uk, 1
+onlineosago.pro, 1
 onlinepaydayloans365.tk, 1
-onlinepokerspelen.be, 1
 onlineporno.cc, 1
 onlineprofecional.com, 1
+onlineprogrammingbooks.com, 1
+onlineradio.com.pl, 1
 onlineradio.pp.ua, 1
 onlineradiobr.com, 1
+onlineradious.com, 1
+onlineschipaanpak.nl, 1
 onlinesorusor.cf, 1
+onlinesports.cf, 1
 onlinesports.tk, 1
 onlinestoresite.com.au, 1
-onlinesuccessin90days.com, 1
 onlinesystem.jp, 1
 onlinetadacip.gq, 1
 onlinetextil.cz, 1
 onlineth.com, 0
 onlinetravelmoney.co.uk, 1
+onlineunitedcountry.com, 1
 onlinevardenafil.gq, 1
 onlinevergidanismani.com, 1
 onlineviewers.tk, 1
 onlinevisa.ru, 1
 onlinevoting.tk, 1
+onlinewallpapers.tk, 1
 onlineweblearning.com, 1
+onlineworkshops.tk, 1
 onlinewot.ru, 1
 onlinews.ml, 1
 onlinexl.nl, 1
@@ -66482,17 +70190,21 @@
 only.sh, 1
 only4free.tk, 1
 onlybooks.gq, 1
+onlyesb.com, 1
 onlyesb.net, 1
 onlyfans.com, 1
+onlyinfotech.com, 1
 onlylithiumhere.gq, 1
 onlylovastatin.gq, 1
+onlymammoths.com, 1
 onlysim.nl, 1
+onlysmoker.com, 1
+onlyssd.com, 1
+onlyu.eu, 1
 onlyveg.tk, 1
 onmaps.de, 1
 onmarketbookbuilds.com, 1
 onmed.com, 1
-onmyside.com, 1
-onnaguse.com, 1
 onnee.ch, 1
 onnext.cc, 1
 onodera.com.br, 1
@@ -66509,8 +70221,8 @@
 onqproductions.com, 1
 onrealt.ru, 0
 onrr.gov, 1
-ons.ca, 1
 onsgenoegen-waz.nl, 1
+onshuistrust.co.za, 1
 onsinscrit.com, 1
 onsite4u.de, 1
 onsitemower.com, 1
@@ -66554,6 +70266,7 @@
 oo30019.com, 1
 oo5197.co, 1
 oo6729.co, 1
+oo6729.com, 1
 oo6957.co, 1
 oo918.com, 1
 oo9297.co, 1
@@ -66566,6 +70279,7 @@
 oog-osaka.jp, 1
 oogami.name, 1
 oogartsennet.nl, 1
+oogent.be, 1
 ooharttemplates.com, 1
 ookinhetpaars.nl, 1
 ookjesprookje.nl, 1
@@ -66591,6 +70305,7 @@
 opadaily.com, 1
 opale-concept.com, 1
 opalesurfcasting.net, 1
+opalhunter.at, 1
 oparamo.tk, 1
 oparl.org, 1
 opatut.de, 0
@@ -66605,12 +70320,10 @@
 open-banking-access.uk, 1
 open-bs.com, 1
 open-bs.ru, 1
-open-ctp.com, 1
-open-ctp.net, 1
-open-ctp.org, 1
 open-desk.org, 1
 open-domotics.info, 1
 open-fixture-library.org, 1
+open-future.be, 1
 open-gaming.net, 1
 open-infrastructure.net, 1
 open-letters.de, 1
@@ -66654,17 +70367,16 @@
 opencpes.net, 1
 opencpes.org, 1
 opencrm.co.uk, 1
-openctp.com, 1
-openctp.net, 1
-openctp.org, 1
 opendata.cz, 1
 opendataincubator.eu, 1
 opendecide.com, 1
+opendolls.com, 1
 opendoorcounselingpa.com, 1
 opendoorsnsh.org, 1
 openevic.info, 1
 openfir.st, 1
 openfitapi-falke.azurewebsites.net, 1
+openfuture.digital, 1
 opengg.me, 1
 opengovpartnership.de, 1
 openhistory.de, 1
@@ -66678,6 +70390,7 @@
 openmail.ml, 1
 openmetals.com, 1
 openmind.ga, 1
+openmirrors.cf, 1
 openmirrors.ml, 1
 opennippon.com, 1
 opennippon.ru, 1
@@ -66709,6 +70422,7 @@
 openstackid.org, 1
 openstandia.jp, 1
 openstem.com.au, 1
+openstorage.io, 1
 openstreetmap.is, 1
 openstreetmap.org, 1
 opentable.com, 1
@@ -66716,6 +70430,7 @@
 opentrack.info, 1
 opentrash.org, 1
 openverse.com, 1
+openvision.tk, 1
 openvz.org, 1
 openwaveguide.de, 1
 openwifi.gr, 1
@@ -66735,12 +70450,14 @@
 opiates.ca, 1
 opiates.net, 0
 opic.gov, 1
+opikini.com, 1
 opil.no, 1
 opin.me, 1
 opinio.fr, 1
 opinionipannolini.it, 1
 opinionitech.com, 1
 opinionmodel.it, 1
+opinionproduct.com, 1
 opioids.co.uk, 1
 opioids.com, 1
 opioids.gov, 1
@@ -66776,6 +70493,7 @@
 opposer.me, 1
 oppositionsecurity.com, 1
 oppress.life, 1
+oppressed.news, 1
 oppwa.com, 1
 opq.pw, 1
 opraab.ga, 1
@@ -66800,6 +70518,7 @@
 optigear.nl, 1
 optik-trosdorff.de, 1
 optiker-gilde.de, 1
+optim-ease.fr, 1
 optimal-e.com, 0
 optimale.co.uk, 1
 optimalforlife.com, 1
@@ -66817,6 +70536,7 @@
 optimisedlabs.uk, 1
 optimism.ru, 1
 optimist.bg, 1
+optimize-jpeg.com, 1
 optimize-jpg.com, 1
 optimizedlabs.co.uk, 1
 optimizedlabs.info, 1
@@ -66852,7 +70572,6 @@
 oqrqtn7ynmgc7qrgwd-ubhdvfiymfbjrh5ethdti8.com, 0
 oqwebdesign.com, 1
 orablanket.co.nz, 1
-oraclecode.com, 1
 oraculobrasil.com.br, 1
 oralb-prestazioni-odontoiatriche.it, 1
 oralbregalaoralb.it, 1
@@ -66864,6 +70583,7 @@
 orangecomputers.com, 1
 orangefab.asia, 1
 orangefinanse.com.pl, 1
+orangehome.ga, 1
 orangejetpack.com, 1
 orangekey.tk, 1
 orangenbaum.at, 1
@@ -66874,14 +70594,15 @@
 orangesquirrelevents.co.uk, 1
 orangewombat.com, 1
 orangtua.tk, 1
-orangutan-appeal.org.uk, 1
 orangutan.org, 1
 oranjee.net, 0
 orano.vn, 1
 oratto.co.uk, 1
 orazen.it, 1
 orbeimaginario.com, 1
+orbik.com, 1
 orbisbi.com, 1
+orbitabaja.com, 1
 orbitaclub.cf, 1
 orbital3.com, 1
 orbitalcommerce.com.br, 1
@@ -66906,15 +70627,17 @@
 orcsnet.com, 1
 orcz.cz, 1
 ordbokpro.se, 1
+ordenmutantes.tk, 1
 order-ftw.de, 1
 ordercipro.gq, 1
 orderdiflucan.ga, 1
 ordermore.cloud, 1
-ordermsg.tk, 1
 ordermygear.com, 1
 orderomnicef.gq, 1
+orderpizza.tk, 1
 ordervaltrexonlines.ga, 1
 ordevanoranjenassau.nl, 1
+ordigame.com, 1
 ordina.tk, 1
 ordoh.com, 1
 ordoro.com, 1
@@ -66923,6 +70646,7 @@
 ordr.no, 1
 oregon2020census.gov, 1
 oregonenergysaver.com, 1
+orehoreh.ru, 1
 oreka.online, 1
 orel-city.ml, 1
 orel-sait.tk, 1
@@ -66942,15 +70666,15 @@
 orfeo-engineering.ch, 1
 org-css.tk, 1
 organdonor.gov, 1
-organic-cbdoil.co.uk, 1
 organicae.com, 1
+organicpoint.in, 1
 organicrootsfestival.tk, 1
 organicseo4u.com, 1
 organicstraw.vn, 1
 organisatieteam.nl, 1
 organisationsberatung-jacobi.de, 0
 organise.earth, 1
-organizacaosaojoao.com.br, 1
+organization-of-holidays.tk, 1
 orgasmium.com, 1
 orged.de, 1
 orgoniteindonesia.com, 1
@@ -66964,6 +70688,7 @@
 oricejoc.com, 0
 oriental-events.net, 1
 orientalart.nl, 1
+orientalcollege.tk, 1
 orientalcuisine.tk, 1
 orientalgadgets.tk, 1
 orientravelmacas.com, 1
@@ -66991,6 +70716,7 @@
 orion-universe.com, 1
 orionadvisor.com, 1
 orioneclipse.com, 1
+orionfcu.com, 1
 orionfinancialservices.com, 1
 orionleasing.com, 1
 oriontravel.co, 1
@@ -67012,10 +70738,10 @@
 ornua.com, 1
 oro.roma.it, 1
 orocojuco.com, 1
+oroconews.com.br, 1
 orodelsalento.com, 1
 orologeria.roma.it, 1
 oromolido.org, 1
-oroscopodelmese.it, 1
 orovillelaw.com, 1
 oroygrana.com, 1
 orpf.ir, 1
@@ -67031,7 +70757,6 @@
 ortho-europe.com, 1
 ortho-graz.at, 1
 orthocop.cz, 1
-orthodocspro.com, 1
 orthodontiste-geneve-docteur-rioux.com, 0
 orthodoxy.lt, 0
 orthogennix.com, 1
@@ -67041,7 +70766,7 @@
 orthosportiv.de, 1
 orthotictransfers.com, 1
 ortizmario.com, 1
-ortlepp.eu, 1
+ortocraft.tk, 1
 ortoemangiato.it, 1
 ortoinnovapanama.com, 1
 ortopertutti.it, 1
@@ -67061,12 +70786,14 @@
 osagokasko.ga, 1
 osaka-hero-project.com, 1
 osakeannit.fi, 1
+osaki.fr, 1
 osamabook.tk, 1
 osamakhalid.com, 1
 osamatoon.ml, 1
 osankj.tk, 1
 osano.com, 1
 osau.com, 1
+osbeck.com, 1
 osbi.pl, 1
 osborn.io, 1
 osborneinn.com, 1
@@ -67105,9 +70832,9 @@
 oskrba.online, 1
 oskuro.net, 1
 osla.org, 1
-oslinux.net, 1
 osm.is, 1
 osm.ovh, 1
+osmaniyehaber.tk, 1
 osmanlitorunu.com, 1
 osmarks.tk, 1
 osmdroid.net, 1
@@ -67122,7 +70849,6 @@
 osomagicmountain.com, 1
 osomjournal.org, 1
 osorio.io, 0
-ospf.sk, 1
 ospree.me, 1
 osrs.news, 1
 osszekotatermeszettel.hu, 1
@@ -67142,6 +70868,8 @@
 ostimwebyazilim.com, 1
 osto.us, 1
 ostr.io, 1
+ostra.me, 1
+ostracize.net, 1
 ostrov8.com, 1
 ostrovseocitra.ml, 1
 ostylelimo.com, 1
@@ -67165,23 +70893,27 @@
 otakurumi.de, 1
 otchecker.com, 1
 otdelka56.ml, 1
+otdelka76.tk, 1
 otdelochnik.tk, 1
+otdih-krim.tk, 1
 otdyh-v-abhazii.tk, 1
 otg-drives.tk, 1
 other98.com, 1
 otherkinforum.com, 1
 otherlandlabs.com, 1
 oticasvisao.net.br, 1
+otimismoemrede.tk, 1
 otinane.eu, 1
 otisko.com, 1
 otiumtech.com, 1
 otixz.com, 1
-otmo7.com, 0
+otoblok.com, 1
 otocenterfelix.com.br, 1
 otokirala.com, 1
 otokiralama.name.tr, 1
 otoma.tk, 1
-otomobilforumu.com, 0
+otomania.tk, 1
+otomobilforumu.com, 1
 otooil.com, 1
 otopan.com, 1
 otoplastik.ml, 1
@@ -67190,6 +70922,7 @@
 otoy.com, 1
 otprema.hr, 1
 otpsmart.com.ua, 1
+otptikforum.cf, 1
 otpusk.com, 1
 otr.ie, 1
 otrm.de, 1
@@ -67200,7 +70933,6 @@
 otterupdate.com, 1
 ottervillemo.gov, 1
 ottmarliebert.tk, 1
-ottoduarte.com, 1
 ottomanbedsuk.tk, 1
 ottoproject.io, 0
 ottoversand.at, 1
@@ -67212,12 +70944,17 @@
 ouaibe.qc.ca, 1
 ouattara.ch, 1
 oudedokken.be, 1
-ouderamstelbridge.nl, 1
 ouestacro.fr, 1
 ouestfrance-auto.pro, 1
 ouestsolutions.com, 1
 ouin.land, 0
 oulunjujutsu.com, 1
+oumactive.com, 1
+oumorienteering.com, 1
+oumpower.com, 1
+oumrace.com, 1
+oumsnatch.com, 1
+oumsport.com, 1
 ounage.de, 1
 ouowo.gq, 1
 our-box.de, 1
@@ -67228,7 +70965,6 @@
 ourchoice2016.com, 1
 ourcloud.at, 1
 ourcnc.com, 1
-ourcoast.com.au, 1
 ourcodinglives.com, 1
 ourcreolesoul.com, 1
 ourdataprotected.com, 1
@@ -67246,6 +70982,7 @@
 ournewsindia.ga, 1
 ouroboros.world, 1
 ourocg.cn, 1
+ouronyx.com, 1
 ours-tudio.com, 1
 oursiteupdates.com, 1
 ourstory.rip, 1
@@ -67256,6 +70993,7 @@
 ourworldspeaks.com, 1
 out-of-england.cf, 1
 out-of-scope.de, 1
+outbound.tk, 1
 outbreak.games, 1
 outdoorfurniture.ie, 1
 outdoorhaber.com, 1
@@ -67275,6 +71013,7 @@
 outdoorlightingsimivalley.com, 1
 outdoorlightingthousandoaks.com, 1
 outdoorlightingwestlakevillage.com, 1
+outdoormanufaktur.com, 1
 outdoortrip.com, 1
 outerface.net, 1
 outerlimitsdigital.com, 1
@@ -67306,22 +71045,28 @@
 outsourcingnominabogota.com, 1
 outstack.vote, 1
 outstandingpromotion.com, 1
+outstandingwebsitedesign.com, 1
 outurnate.com, 0
 outwesthunts.com, 1
+outwoodz.co.uk, 1
 ouvindo.com.br, 1
 ouwerling.tk, 1
 ouxiang.me, 1
 ov-chipkaart.nl, 1
 ovabastecedoraindustrial.com, 1
 ovago.com, 1
+ovalle.tk, 1
+ovallevirtual.tk, 1
 ovedy.com, 1
 ovelhaostra.com, 1
+oven.media, 1
 ovenapp.io, 1
 ovenrepairaustin.com, 1
 overallscanners.tk, 1
 overcached.com, 1
 overcame.cf, 1
 overcasthq.com, 1
+overclockers.ga, 1
 overclockers.ge, 1
 overdrive-usedcars.be, 0
 overframe.gg, 1
@@ -67332,6 +71077,7 @@
 overnightglasses.com, 1
 overpb.gq, 1
 overps.cf, 1
+overrated.ga, 1
 overs.jp, 1
 overs.top, 1
 oversea.com.br, 1
@@ -67340,10 +71086,13 @@
 oversight.garden, 1
 oversight.gov, 1
 oversightboard.com, 1
+oversimplifiedeconomics.com, 1
+oversimplifiedstatistics.com, 1
 overstap.deals, 1
 overstemmen.nl, 1
 overstockpromote.com, 1
 overthecloud.it, 1
+overthegate.tk, 1
 overtunes.tk, 1
 overwall.org, 1
 overwatchss.club, 1
@@ -67351,10 +71100,12 @@
 overzicht.ws, 1
 oveweddings.com, 1
 ovez.ga, 1
+ovianca.com, 1
 ovidro.pt, 0
 ovirt.org, 1
 ovisy.com, 1
 ovix.co, 1
+ovkerk-avezaath.nl, 1
 ovnrain.com, 1
 ovodakadarkut.tk, 1
 ovpn.com, 1
@@ -67367,11 +71118,13 @@
 owennelson.co.uk, 1
 owensmith.website, 1
 owid.cloud, 1
+owl-media.pl, 1
+owl-media.ru, 1
+owl-media.us, 1
 owl-square.com, 1
 owl-stat.ch, 0
 owl.net, 1
 owlandrabbitgallery.com, 1
-owlazy.com, 1
 owljumpstart.com, 1
 owlscrap.ru, 1
 owmobility.com, 1
@@ -67381,9 +71134,11 @@
 owncloud.ml, 0
 owner.pw, 1
 ownian.com, 1
+owningless.fr, 1
 ownmay.com, 0
 ownspec.com, 1
 owntournament.org, 1
+ownwolke.de, 1
 oxalato.com, 1
 oxaliz.gq, 1
 oxanababy.com, 1
@@ -67399,12 +71154,14 @@
 oxigenoinformatica.tk, 1
 oximedia.ga, 1
 oximo.lviv.ua, 1
+oximoron.tk, 1
 oxinails.salon, 1
 oxlab.com.ar, 1
 oxo.cloud, 1
 oxsec.co.uk, 1
 oxt.co, 1
 oxygenated.cf, 1
+oxygenserv.com, 1
 oxygin.net, 0
 oxymail.ru, 1
 oxynux.xyz, 1
@@ -67432,6 +71189,7 @@
 ozli.ga, 1
 oznamovacipovinnost.cz, 1
 ozon.ru, 1
+ozone-medical.fr, 1
 ozonitron.com, 1
 ozonitron.de, 1
 ozonitron.eu, 1
@@ -67452,7 +71210,6 @@
 p-soc.com.br, 1
 p-store.net, 1
 p-t.io, 1
-p-vegas.com, 1
 p02.de, 1
 p10.ru, 1
 p1984.nl, 0
@@ -67461,14 +71218,17 @@
 p1ratrulezzz.me, 1
 p22.co, 1
 p2p-tv.tk, 1
+p2phearthealth.com, 1
 p3.marketing, 1
 p30365.com, 1
+p30mororgar.ir, 1
 p333aa.com, 1
 p333b.net, 1
 p333e.net, 1
 p333hhh.com, 1
 p333j.net, 1
 p36533.com, 1
+p4030.ir, 1
 p4chivtac.com, 1
 p5197.co, 1
 p58101.com, 1
@@ -67545,11 +71305,13 @@
 pabloarteaga.xyz, 1
 pablocamino.tk, 1
 pablofain.com, 1
+pablofonta.es, 1
 pablonadiecomotu.tk, 1
 pabloroblesminister.com, 1
 pablosaraiva.com, 1
 pabpunk.tk, 1
 pabuzo.vn, 1
+pac-muenchen.de, 1
 pacaom.com, 1
 pacatlantic.com, 1
 pacch.io, 1
@@ -67559,10 +71321,13 @@
 pacecounsel.com, 1
 paced.me, 1
 paceda.nl, 1
+paceinvestmentclub.com, 1
 pacelink.de, 1
 pacemakers.ml, 1
 pachaiyappas.org, 1
+pachalingo.tk, 1
 pachamamaproduct.com, 1
+pacharmi.org, 1
 pachinstyle.com, 1
 pacificaent.net, 1
 pacificarperu.com, 1
@@ -67572,8 +71337,10 @@
 pacificcycling.ga, 1
 pacificgynsurgicalgroup.com, 1
 pacificintegration.ca, 0
+pacificocooler.com, 1
 pacificpalisadeselectric.com, 1
 pacificpalisadeselectrical.com, 1
+pacificpalisadeselectrician.com, 1
 pacificpalisadeslandscapelighting.com, 1
 pacificpalisadeslighting.com, 1
 pacificpuke.com, 1
@@ -67592,16 +71359,21 @@
 packetlinux.com, 1
 packetoverflow.com, 1
 packliberte.org, 1
+packov.cz, 1
 packservice.es, 1
 paclease.com.my, 1
+pacobarbera.tk, 1
 pacoda.de, 0
 pact2017.nl, 1
 pactf-flag-4boxdpa21ogonzkcrs9p.com, 1
 pactf.com, 1
+pactrol.com, 1
 pacxodka.ru, 1
 pad.wf, 1
 padam-group.com, 1
 padberx-marketing-consultants.de, 1
+padderne.tk, 1
+paddestoelen-encyclopedie.tk, 1
 paddy.rocks, 1
 padelbox.de, 1
 pader-deko.de, 0
@@ -67618,12 +71390,12 @@
 paella-service.net, 1
 paesi.info, 1
 paf-events.ch, 0
+paff.xyz, 1
 paga.red, 1
 pagalofacil.com, 1
 pagalsongs.club, 1
 pagalsongs.com, 1
 pagalsongs.live, 1
-pagalsongs.world, 1
 pagalworld.com, 1
 pagalworld.info, 1
 pagalworld.la, 1
@@ -67631,6 +71403,7 @@
 pagalworld.org, 1
 pagalworld.wiki, 1
 paganismguide.com, 1
+paganistisch-forum.tk, 1
 pagatuarriendo.cl, 1
 pagbitcoin.com, 1
 page, 1
@@ -67649,6 +71422,7 @@
 pages-tocaven.com, 1
 pagespeedtweaks.com, 1
 pageuppeople.com, 1
+pagevitals.com, 1
 pagewizz.com, 1
 pagexl.com, 1
 pagiamtzis.com, 1
@@ -67669,17 +71443,20 @@
 paidtocode.com, 1
 paidtodesign.com, 1
 paidtodev.com, 1
+paidtohavesex.com, 1
 paiementdp.com, 1
 paigeglass.com, 1
 paigethegeek.com, 1
 paikkatietokanta.net, 1
 painart.ru, 1
 paincareehr.com, 1
+painclinic.tk, 1
 paindata.dk, 1
 painefamily.co.uk, 1
+painfreenyc.com, 1
 painful.fun, 1
+painmanagementnyc.com, 1
 painosso.org, 1
-painso.com, 0
 paint-it.pink, 1
 paint4.life, 1
 paintball-ljubljana.si, 1
@@ -67729,6 +71506,7 @@
 pakremit.com, 1
 paktolos.net, 1
 palabr.as, 1
+palaceitalia.tk, 1
 palant.info, 1
 palariviera.com, 1
 palary.work, 1
@@ -67773,10 +71551,13 @@
 palmbeachwebsitehosting.com, 1
 palmen-apotheke.de, 1
 palmiye.tk, 1
+palmoilpledge.id, 1
+palmosradio.gr, 1
 palner.eu, 1
 palomalopez.tk, 1
 palomardisplays.com, 1
 palucamoveis.com.br, 1
+palucms.de, 1
 pama.fun, 1
 pamaniqu.nl, 1
 pamashield.com, 1
@@ -67788,6 +71569,7 @@
 pamsorel.co.za, 1
 pamvo.com, 1
 pan-lleveme.com, 1
+pan-portugal.com, 1
 pan-therra.ru, 1
 pan.digital, 1
 panamatravel.tk, 1
@@ -67845,6 +71627,7 @@
 panel-stroy.cf, 1
 paneldewelopera.pl, 1
 paneldoorsolutions.com, 1
+panele-fotowoltaiczne.pl, 1
 paneu.de, 1
 panevo.com, 1
 panezai.tk, 1
@@ -67853,7 +71636,9 @@
 panghu.me, 1
 pangoly.com, 1
 panhandlemenshealth.com, 1
+panheelstraat.tk, 1
 panic.tk, 1
+panicrev.co, 1
 panier-legumes.bio, 1
 panino.gr, 1
 paninohome.com, 1
@@ -67868,6 +71653,7 @@
 panoramacambios.com, 1
 panoramahurtowni.pl, 1
 panoramaphoto.cf, 1
+panoramaresidence-moesern.at, 1
 panoramichq.com, 1
 panoramiquesorganya.tk, 1
 panoti.com, 0
@@ -67877,23 +71663,29 @@
 pansino.net, 1
 pantai.com.my, 1
 pantallasled.mx, 1
+pantallasparalamparas.es, 1
 pantallasyescenarios.com, 0
+pantera.tk, 1
 panthenolplus.co.uk, 1
 panthenolplus.com, 1
 pantheoncrafters.com, 1
 pantherage.co.uk, 1
+pantherscore.com, 1
 panthi.lk, 1
 pantingly.tk, 1
 pantographe.info, 0
 pantou.org, 0
 pants-off.xyz, 1
 pantsu.club, 1
+pantypit.com, 1
 panzdravi.cz, 1
 panzer72.ru, 1
 panzers.tk, 1
 pao.moe, 1
 paocaibang.net, 1
+paocloud.co.th, 1
 paolodemichele.it, 1
+paolomargari.tk, 1
 paolotagliaferri.com, 1
 pap.la, 0
 papa---mama.tk, 1
@@ -67917,14 +71709,15 @@
 paper-republic.org, 1
 paper.sc, 1
 paper.wf, 1
-papercard.co.uk, 1
 papergamer.co.uk, 1
 paperhoney.by, 1
 paperlesssolutionsltd.com.ng, 1
+papermasters.com, 1
 papermuseum.jp, 1
 paperopedia.com, 1
 paperplatefun.com, 1
 paperplus.com.au, 1
+paperpress.gq, 1
 papersmart.net, 1
 papertracker.net, 1
 paperwallets.io, 1
@@ -67941,7 +71734,9 @@
 papillon-events.be, 1
 papini.fr, 1
 papion.it, 1
+papkinadochka.ru, 1
 papotage.net, 1
+pappacoda.it, 1
 pappasappar.se, 1
 paprikas.fr, 1
 par-allel.ru, 1
@@ -67951,11 +71746,11 @@
 parachute70.com, 0
 parachuteteam.co.uk, 1
 paracomer.es, 1
-paradais-sphynx.com, 1
 paradaux.io, 1
 paradies-baar.ch, 1
 paradiesgirls.ch, 1
 paradigma-med.ru, 1
+paradigmas.tk, 1
 paradigmshift.com.pk, 1
 paradiscapacitados.site, 1
 paradise-engineer.com, 1
@@ -67965,12 +71760,12 @@
 paradise-world.ml, 1
 paradiselost.com, 1
 paradiseprivatehospital.com, 1
+paradiserydes.com, 1
 paradisestore.org, 1
+paradisim.tk, 1
 paradordelgitano.com, 1
 paradoxdesigns.org, 1
-paragon-consult.ru, 1
 paragonie.com, 0
-paragonremodeling.com, 1
 paragonsigns.tk, 1
 paragontasarim.com, 1
 paragreen.net, 1
@@ -67978,18 +71773,22 @@
 parallel-worlds.tk, 1
 paraluman.be, 1
 paralysis.ga, 1
+paramapa.com.py, 1
 paramaquetas.com, 1
 paramo-pineiro.tk, 1
 paramo.me, 1
+paramountdentalcenter.com, 1
 paramountelectronics.co.uk, 1
 paranoid.network, 1
 paranoidandroid.tk, 1
 paranoidcrypto.com, 1
 paranoidpenguin.net, 1
 paranoxer.hu, 1
+parapenteciconia.tk, 1
 paraplyen.tk, 1
 parapsihologia.tk, 1
 parareflex.fr, 1
+paras.tk, 1
 parasitologyclub.org, 1
 parasol.fi, 1
 parasomnia.tk, 1
@@ -67997,6 +71796,7 @@
 parastaran.tk, 1
 paratlan.hu, 1
 paratlantalalkozas.hu, 1
+parattusdecora.com.br, 1
 paratxt.org, 1
 parcbotanique.com, 1
 parcelbroker.co.uk, 0
@@ -68018,6 +71818,7 @@
 parentingalpha.com, 1
 parentinterview.com, 1
 parentmail.co.uk, 1
+parentpayments.com.au, 1
 parentsandzebrasunited.com, 1
 parentsguidetotheworld.com, 1
 parentsintouch.co.uk, 1
@@ -68026,6 +71827,7 @@
 parfum-best.ml, 1
 parfumer.tk, 1
 parfumerie-de-grasse.fr, 0
+parfumersha.by, 1
 parfumi.tk, 1
 pari.cz, 1
 pariga.co.uk, 1
@@ -68041,6 +71843,8 @@
 parisfranceparking.nl, 1
 parishome.jp, 1
 parisprovincedemenagements.fr, 1
+paritexpressions.com, 1
+parizhanka.tk, 1
 parkbee.com.br, 1
 parkcitycu.org, 1
 parkeerbordenhuren.be, 1
@@ -68065,11 +71869,11 @@
 parkersbarbershop.com, 1
 parket.gq, 1
 parketdoska.ua, 0
-parkettdielen.net, 1
 parki.cloud, 1
-parking4less.com, 1
+parking4less.com, 0
 parkinginparis.fr, 1
 parkingparisnord.fr, 1
+parkngo.com.au, 1
 parkr.io, 1
 parkrocker.com, 1
 parkrunstats.servehttp.com, 1
@@ -68085,9 +71889,10 @@
 parleamonluc.fr, 1
 parleu2016.nl, 1
 parleur.net, 1
-parltrack.org, 1
+parltrack.org, 0
 parmels.com.br, 1
 parnassys.net, 1
+parniplus.com, 1
 parnizaziteksasko.cz, 1
 parodesigns.com, 0
 paroisses-theix-surzur.com, 1
@@ -68106,7 +71911,6 @@
 parrotbook.cf, 1
 parry.org, 1
 pars.work, 1
-parsdev.com, 1
 parsemail.org, 1
 parser.nu, 1
 parsonsfamilyhomes.com, 1
@@ -68138,7 +71942,6 @@
 partnersofprc.com, 1
 partnerwerk.de, 0
 partofthequeue.ml, 1
-partou.de, 1
 partridge.tech, 1
 parts4phone.com, 0
 partsbox.com, 1
@@ -68148,13 +71951,17 @@
 partshop.be, 1
 partusedtyres.net, 1
 party-kneipe-bar.com, 1
+party-produkte.eu, 1
 party-time-inflatables-durham.co.uk, 1
 partyausstatter24.de, 1
 partybounceplay.co.uk, 1
+partyclub.tk, 1
 partycoin.ga, 1
+partydesign.vn, 1
 partydj.be, 1
 partyhireliverpool.co.uk, 1
 partypearl.de, 1
+partyphoto.tk, 1
 partyrocksbounce.co.uk, 1
 partyschnaps.com, 1
 partyshop.ge, 1
@@ -68169,6 +71976,7 @@
 pasadenapooch.org, 1
 pasalt.com, 1
 pasarella.eu, 1
+pasaruang.id, 1
 pascal-bourhis.com, 1
 pascal-koelsch.de, 1
 pascal-ua.tk, 1
@@ -68181,6 +71989,8 @@
 pascalmathis.me, 1
 pascalmathis.net, 1
 pascoaselecta.com, 1
+pascopresents.com, 1
+pascosystems.com, 1
 pascovotes.gov, 1
 pascualberniz.tk, 1
 pascualinmuebles.com, 1
@@ -68192,6 +72002,7 @@
 pasnederland.tk, 1
 pasnyburiat.pl, 1
 pasportaservo.org, 1
+pasquarellointeriors.com, 1
 pasquinelli-truebag.ch, 1
 pass.org.my, 1
 passa.org, 1
@@ -68219,10 +72030,11 @@
 passionateracers.com, 1
 passiondesigns.web.id, 1
 passionebenessere.com, 1
-passionfiat.fr, 1
+passionegriglia.com, 1
 passionpictures.eu, 1
 passions-art.com, 1
 passive-work.gq, 1
+passiveseinkommen.tk, 1
 passivhaus.tk, 1
 passmefaster.net, 1
 passover-fun.com, 1
@@ -68271,7 +72083,6 @@
 pasternok.org, 1
 pasteros.io, 1
 pasticcerialorenzetti.com, 1
-pastie.se, 1
 pastillased.gq, 1
 pastimeproject.com, 1
 pastorbelgagroenendael.com.br, 1
@@ -68284,6 +72095,10 @@
 pastorsuico.com.br, 1
 paszkowski.tk, 1
 pasztor.at, 1
+patanegra-jambon.fr, 1
+patanegra-prosciutto.it, 1
+patanegra-schinken.ch, 1
+patanegra-schinken.de, 1
 patapwn.com, 1
 patatbesteld.nl, 1
 patbatesremodeling.com, 0
@@ -68299,6 +72114,7 @@
 patentmanufaktur.video, 1
 paterno-gaming.com, 1
 pathagoras.com, 1
+pathfindergeo.com, 1
 pathogen.nl, 1
 pathsha.re, 1
 pathwaytofaith.com, 1
@@ -68313,6 +72129,7 @@
 patralos.at, 0
 patric-lenhart.de, 1
 patrice-carriere.tk, 1
+patricefyffe.gq, 1
 patriceonline.tk, 1
 patriciaandpaul.com, 1
 patriciaramos.pt, 1
@@ -68327,11 +72144,12 @@
 patrickaudley.com, 1
 patrickbrosi.de, 1
 patrickbusch.net, 1
-patrickcurl.com, 1
+patrickdankers.nl, 1
 patrickhoefler.net, 1
 patricklustigmediation.com, 1
 patricklynch.xyz, 1
 patrickneuro.de, 1
+patrickpeeters.com, 0
 patrickschneider.me, 1
 patricksymmes.com, 1
 patrikjohan.cf, 1
@@ -68374,10 +72192,12 @@
 pauld.digital, 1
 paulevers.nl, 1
 paulgerberrealtors.com, 1
+paulibean.tk, 1
 paulinewesterman.nl, 1
 paulini.ga, 1
 pauljackson.ga, 1
 pauljmartinez.com, 1
+pauljonathan.dk, 1
 paullinmakeup.com, 1
 paullockaby.com, 1
 paulmarc.org, 1
@@ -68405,6 +72225,7 @@
 paulward.net, 1
 paulwatabe.com, 1
 paulwendelboe.com, 1
+paulwilhelm.de, 1
 pauly-stahlhandel.com, 1
 pauly-stahlhandel.de, 1
 pautadiaria.com, 1
@@ -68426,15 +72247,19 @@
 pavernosmatao.tk, 1
 paviformas.es, 1
 pavlic.se, 1
+pavoterrights.com, 1
 paw.cloud, 1
 paw.pt, 1
 pawchewgo.com, 1
 pawel-international.com, 1
+pawelgo.pl, 1
 pawelnazaruk.com, 1
 pawelurbanek.com, 1
+pawelurbanski.com, 1
 pawgearlab.com, 1
 pawnsoft.tk, 1
 pawpatrol.tk, 1
+pawson.tk, 1
 pawspuppy.com, 1
 pawsr.us, 1
 pawsru.org, 1
@@ -68450,6 +72275,7 @@
 payboy.biz, 1
 payboy.rocks, 1
 paybro.eu, 1
+paycardtech.com, 1
 payclock.com, 1
 paydigital.pt, 1
 payexpresse.com, 1
@@ -68459,6 +72285,7 @@
 paylabs.co.id, 1
 paylike.io, 1
 paylike.se, 1
+payme.plus, 1
 payment-express.net, 1
 payment.ac.cn, 1
 paymentaccuracy.gov, 0
@@ -68487,10 +72314,10 @@
 payslipview.com, 1
 payssaintgilles.fr, 0
 paystack.com, 1
+paystarkagency.com, 1
 paytm.in, 1
 payupay.ru, 1
 paywait.com, 1
-pazerandepstein.com, 1
 pazyarmonia.tk, 1
 pb-design.ch, 1
 pb-eatz.com, 1
@@ -68501,11 +72328,11 @@
 pbcables.tk, 1
 pbcknd.ml, 1
 pbdigital.org, 1
+pbern.xyz, 0
 pbest.tk, 1
 pbf.earth, 1
 pblandscapesolutions.com, 1
 pborn.eu, 1
-pbosquet.com, 0
 pbourhis.me, 1
 pbqs.site, 1
 pbr.so, 1
@@ -68518,6 +72345,7 @@
 pbytes.com, 1
 pbz.im, 1
 pc-master.pl, 1
+pc-reanimator.ru, 0
 pc-rescue.me, 0
 pc-servis-brno.com, 1
 pc-soft.gq, 1
@@ -68526,10 +72354,11 @@
 pc-tweak.de, 1
 pc-warriors.com, 1
 pc28yc.com, 1
-pcatv.org, 1
+pcbarchitect.com, 1
 pcbfl.gov, 1
 pcbmarketing.gq, 1
 pcbmodel.com, 1
+pcbooks.in, 1
 pcbricole.fr, 1
 pcccthicongcungcap.com, 1
 pcdbank.com, 1
@@ -68550,10 +72379,11 @@
 pciconcursos.com.br, 1
 pcisecuritystandards.org, 1
 pcissc.org, 1
+pckartel.biz, 1
 pckurzypd.sk, 1
 pclaeuft.de, 1
-pclasp.com, 1
 pcloud.com, 1
+pcmasters.ml, 1
 pcmkrembangan.or.id, 1
 pcmobile.tech, 1
 pcmr.info, 1
@@ -68568,6 +72398,7 @@
 pcsbrasil.ml, 1
 pcsetting.com, 1
 pcsremodel.com, 1
+pcstoronto.ca, 1
 pctonic.net, 1
 pctravel.ca, 1
 pctrouble.net, 1
@@ -68600,10 +72431,10 @@
 pdkrawczyk.com, 1
 pdox.net, 1
 pdpa.ai, 1
+pds.uy, 1
 pdtech.ltd, 1
 pdthings.net, 1
 pdvsaargentina.com.ar, 1
-pdxtowncar.net, 1
 pe-bank.jp, 1
 pe.search.yahoo.com, 0
 peabodytile.com, 1
@@ -68614,15 +72445,17 @@
 peaceispossible.cc, 1
 peacekeeper.tk, 1
 peacepiperanch.com, 1
+peachbuildingproducts.com, 1
 peakd.com, 1
 peakdealershipperformance.com, 1
-peakhomeloan.com, 1
+peakseoservices.co.uk, 1
 peakslead.com, 1
 peaksloth.com, 1
+peaksports.com, 1
 peakvets.co.uk, 1
 peanutbase.org, 1
+peanutpay.de, 1
 peanutproductionsnyc.com, 1
-pear2pear.de, 1
 pearbloom.com, 1
 pearlbridal.com.au, 1
 pearlsonly.ca, 1
@@ -68633,14 +72466,15 @@
 peatsbeast.com, 0
 peatsuki.com, 1
 peawo.com, 1
-pebbleparents.com, 0
 pebblepointapartmentsstl.com, 1
 pebbles.net.in, 1
 pebkac.gr, 0
 pebmarketing.nl, 1
 pebook.tk, 1
+pecadis.de, 1
 pecheneg.tk, 1
 pechibani.by, 1
+pechnik-negara.ru, 1
 pechonova.com, 1
 pecker-johnson.com, 1
 pect.com.pk, 1
@@ -68656,6 +72490,7 @@
 peddy.dyndns.org, 1
 peddyland.tk, 1
 pediatersucha.sk, 1
+pediatricdentistrycenter.com, 1
 pediatricdentistsdaculaga.com, 1
 pediatricdentistslilburnga.com, 1
 pedicure-stadspolders.nl, 1
@@ -68666,6 +72501,7 @@
 pedimanie.cz, 1
 pedimoda.com.br, 1
 pedradatattoo.com, 1
+pedrazanoticias.tk, 1
 pedro.com.es, 1
 pedrobotias.tk, 1
 pedrolamas.com, 1
@@ -68711,6 +72547,7 @@
 peerweb.com, 1
 peetah.com, 1
 peew.de, 1
+pefile.tk, 1
 pefricea.com, 1
 pegas-studio.net, 1
 pegfer.com.br, 1
@@ -68721,10 +72558,10 @@
 pekarstvivetvrzi.cz, 1
 pekinet.com, 1
 peklostroj.cz, 1
+peklostroj.eu, 1
 peklostroj.sk, 1
-pekoe.se, 1
+peko.pro, 1
 pelachim.com.br, 1
-pelakefun.com, 1
 pelanucto.cz, 1
 pelevin.gq, 1
 pelhamalrecreation.gov, 1
@@ -68733,16 +72570,20 @@
 pelican.ie, 1
 peliculaonline.tk, 1
 peliculasviejas.net, 1
+pellegrino.ar, 1
 pellet.pordenone.it, 1
+pelletgrillreviews.com, 1
 pelletizermill.com, 1
 pelletsprice.com, 1
 pelmeni.cf, 1
+pelmeniuralskie.tk, 1
 pelopogrund.com, 0
 pelopoplot.com, 0
 pelosanimais.org, 1
 pelotonimports.com, 1
 peluqueriaalcobendas.com, 1
 peluqueriaalcobendas.es, 1
+peluqueriacanina.tk, 1
 pelviclinic.pt, 1
 pem-jp.co.uk, 1
 pemagrid.org, 1
@@ -68765,7 +72606,6 @@
 penetrationstest.se, 1
 penfold.fr, 1
 pengajar.co.id, 1
-pengdows.com, 1
 pengepung.com, 1
 pengi.me, 1
 pengisatelier.net, 1
@@ -68775,14 +72615,17 @@
 penguindrum.moe, 1
 penguinos.tk, 1
 penguinprotocols.com, 1
+penguinshome.tk, 1
 penholder.ga, 1
 peniarth.cymru, 1
+peninsulaadvancedurology.com, 1
 peninsuladoctor.com, 1
 penisenlargementpro.com, 1
 penispumpen.se, 1
 pennergold.net, 1
 pennington.io, 1
 pennymail.ga, 1
+pennywise.tk, 1
 penopoly.cf, 1
 penopoly.ga, 1
 penosa.ga, 1
@@ -68803,11 +72646,13 @@
 pension-veldzigt.nl, 1
 pensionecani.roma.it, 1
 pensioner-1000.tk, 1
+pensionpilot.ca, 1
 pensiun.ga, 1
 pensiunea-maria.tk, 1
 pensiunea-paco.ro, 1
 pensiunealido.ro, 1
 penslabyrinth.com, 1
+pentagram.cf, 1
 pentagram.me, 1
 pentamexicali.tk, 1
 pentandra.com, 1
@@ -68824,6 +72669,7 @@
 pentools.org, 1
 pentruprieteni.com, 1
 penuelaspr.gov, 1
+penyavictorhernani.tk, 1
 penz.media, 1
 penza-on-line.tk, 1
 penza-today.tk, 1
@@ -68834,6 +72680,7 @@
 peoplescu.com, 1
 peoplesdecade.org, 1
 peoplesguardian.org, 1
+peoplesliberationfront.tk, 1
 peoplesrepublicofchinasucks.com, 1
 peoplesrights.org, 1
 pepechkov.com, 1
@@ -68844,6 +72691,7 @@
 pepfar.gov, 0
 pepgrid.net, 1
 pepkey.net, 1
+peplex.ddns.net, 1
 pepme.net, 1
 peppelmedi.fi, 1
 pepperandpartner.com, 1
@@ -68858,19 +72706,21 @@
 perakampus.com, 1
 peral.ua, 1
 perala.me, 1
-perantiguru.com, 0
+perantiguru.com, 1
 peraparker.cz, 1
+perberestja.gq, 1
 perceptionsaestheticspa.com, 1
 perceptivemeded.com, 1
+perceptyx.com, 1
 percherosdepared.online, 1
 percolate.com, 1
 percraft.com, 1
 percy.io, 1
-percyflix.com, 1
 percymagic.tk, 1
 perd.re, 1
 perdanabagus.tk, 1
 perdita-capelli.tk, 1
+perdterm.com, 1
 pereceh.eu.org, 1
 perecraft.com, 1
 peredovaya.tk, 1
@@ -68901,8 +72751,10 @@
 perfectme.tk, 1
 perfectoparty.co.uk, 1
 perfectosidiotaspunk.tk, 1
+perfectsize.pl, 1
 perfectsmilesdentistry.net, 1
 perfectsnap.co.uk, 1
+perfectsoft.tk, 1
 perfectstreaming.systems, 1
 perfectworldbot.tk, 1
 perfektesgewicht.com, 1
@@ -68913,6 +72765,8 @@
 performancehealth.com, 0
 performancematters.ie, 1
 performancepiers.com, 1
+performancerunningsolutions.com, 1
+performancetransmission.net, 1
 performetric.net, 1
 performing-art-schools.com, 1
 perfumes.com.br, 1
@@ -68920,9 +72774,12 @@
 perfumesweb.com.br, 1
 pericsope.gq, 1
 peridotcapitalpartners.com, 1
+perigold.com, 1
 perini.com.au, 1
 periodex.co, 1
 periodismoactual.com, 1
+periodista.tk, 1
+periony.com, 1
 perisani.com, 1
 periscope.tv, 1
 perishablepress.com, 1
@@ -68968,6 +72825,7 @@
 perrybook.tk, 1
 pers-hr.tk, 1
 perscore.tk, 1
+perseo.tk, 1
 persephone.gr, 1
 persiart.shop, 1
 persiennexperten.se, 1
@@ -68981,9 +72839,11 @@
 personalidadmagnetica.com, 1
 personalityjunkie.com, 1
 personaljokes.ml, 1
+personaljourneys.co.nz, 1
 personalnames.net.ru, 1
 personalrecreationaltourguides.com, 1
 personaltrainer-senti.de, 1
+personalwebsite.services, 1
 personcar.com.br, 1
 persondatakonsulenterne.dk, 1
 personlookup.com.au, 1
@@ -68992,10 +72852,12 @@
 perspectivum.com, 1
 perspektivwechsel-coaching.de, 1
 persson.im, 1
+persson.me, 1
 persuasionmatters.com, 1
 perth-seo-agency.com.au, 0
 perthhillsarmadale.com.au, 1
 perthtrains.net, 1
+perthunicyclists.tk, 1
 pertukaranpemudaasia.com, 1
 pertwarp.tk, 1
 perubusca.nl, 1
@@ -69014,6 +72876,7 @@
 pervoklass.cf, 1
 pervomaysk-city.ml, 1
 perzeidi.hr, 1
+pesandansampai.tk, 1
 pescadorcomunicacao.com, 1
 pescanetworks.tk, 1
 pescco.com.br, 1
@@ -69037,6 +72900,7 @@
 petalkr.com, 1
 petalsoft.tk, 1
 petaouchnok.ch, 1
+petar.fyi, 1
 petaxolotl.com, 1
 petbirds.gr, 1
 petbooking.it, 1
@@ -69049,6 +72913,7 @@
 peter-hurtenbach.de, 0
 peter-r.co.uk, 1
 peter.org.ua, 1
+peterackermans.tk, 1
 peterandjoelle.co.uk, 1
 peterbarrett.ca, 1
 peterboers.info, 1
@@ -69061,6 +72926,7 @@
 peterfiorella.com, 1
 peterfolta.net, 1
 petergudo.tk, 1
+peterheery.me, 0
 peterhennes.de, 1
 peterhome.cn, 1
 peterhome.tk, 1
@@ -69069,6 +72935,7 @@
 peterhuetz.com, 1
 peterjin.org, 1
 peterjohnson.io, 1
+peterkoren.org, 1
 peterkotula.tk, 1
 peterkrivanek.com, 1
 peterkshultz.com, 0
@@ -69081,8 +72948,9 @@
 peters.consulting, 1
 peterslavik.com, 1
 petersonchiropractic.net, 1
-petersontoscano.com, 1
+petertrevor.com, 1
 petervaldesii.com, 0
+petervantriet.nl, 1
 petevagabond.com, 1
 petfoundation.pet, 1
 petherwick.co.uk, 1
@@ -69091,6 +72959,7 @@
 petherwicks.com, 1
 peticion.tk, 1
 petit-archer.com, 1
+petite-annonce.tk, 1
 petite-maison.ch, 0
 petiteframes.com, 1
 petitsfrenchies.com, 1
@@ -69108,6 +72977,7 @@
 petpower.eu, 1
 petpuppy.tk, 1
 petr.as, 1
+petr22shcool.tk, 1
 petrachuk.ru, 1
 petrarca.tk, 1
 petrasestakova.cz, 1
@@ -69124,6 +72994,7 @@
 petrovitch.tk, 1
 petrozavodsk.ga, 1
 petruzz.net, 1
+pets-health.com, 1
 petscams.com, 1
 petschnighof.at, 1
 petsnews.ga, 1
@@ -69161,7 +73032,6 @@
 pfdevroye.com, 1
 pfefferkuchen-shop.de, 1
 pfefferkuchenprinzessin-dresden.de, 1
-pfefferminzoel.de, 1
 pfeifferszilard.hu, 1
 pferdesportclub-chiemgau.de, 1
 pfernandes.com, 1
@@ -69178,7 +73048,8 @@
 pfotentour-berlin.de, 1
 pfp.works, 1
 pfrost.me, 1
-pfteprofessionals.com, 1
+pfsquad.blog, 1
+pfsquad.nu, 1
 pfudor.tk, 1
 pg-forum.de, 0
 pg-mana.net, 1
@@ -69194,7 +73065,6 @@
 pgnetwork.net, 1
 pgp.guru, 1
 pgp.lol, 1
-pgp.network, 1
 pgpaintanddesign.com, 1
 pgpmail.cc, 1
 pgregg.com, 1
@@ -69202,17 +73072,21 @@
 pgsec.cz, 1
 pgsec.eu, 1
 pgsek.cz, 1
+pgsindustries.com.au, 1
 pgui.com, 1
 pgwap.com, 1
 ph.search.yahoo.com, 0
 ph3r3tz.net, 1
 pha.pub, 1
+phannuoc.net, 1
 phantasie.cc, 1
 phantasmag.gq, 1
 phantastikon.de, 1
 phantomfund.ml, 1
+phantomlord.tk, 1
 phantomphans.tk, 1
 pharma-display.com, 1
+pharma24.de, 1
 pharmaabsoluta.com.br, 1
 pharmaboard.de, 1
 pharmaboard.org, 1
@@ -69249,9 +73123,8 @@
 phen-garcinia.info, 1
 phenergan.ga, 1
 phenixairsoft.com, 1
-phenonline.com, 1
-phenq.com, 1
 phenq.es, 1
+phenriques.com, 1
 pheramoan.com, 1
 pheramoans.com, 1
 phero.com, 1
@@ -69282,6 +73155,7 @@
 philadelphia.com.mx, 1
 philanima.com, 1
 philarmonic-abaza.tk, 1
+phildevient.tk, 1
 phildonaldson.com, 1
 phileas-psychiatrie.be, 1
 philia-sa.com, 0
@@ -69292,24 +73166,26 @@
 philiperiksson.se, 1
 philipkdick.tk, 1
 philipkobelt.ch, 1
+philiplowran.tk, 1
 philipmordue.co.uk, 1
 philipp-trulson.de, 0
 philippa.cool, 1
 philippbirkholz.com, 1
 philippbirkholz.de, 1
-philippe-metayer-platrier.fr, 1
 philippe-mignotte.fr, 1
 philippebonnard.fr, 1
 philippegoffin.be, 1
 philippehannes.fr, 1
+philippekhau.tk, 1
+philippemunn.photo, 1
 philipperoose.be, 0
-philippestudiopro.com, 1
 philippheenen.de, 0
 philippinedroneassociation.org, 1
 philippinegreenparty.tk, 1
 philippinenewsvanguard.tk, 1
 philippkaindl.de, 1
 philippkeschl.at, 1
+philipprouhet.com, 1
 philipslater.cf, 1
 philipsmanythougths.cf, 1
 philipssupportforum.com, 1
@@ -69318,6 +73194,7 @@
 phillipgoldfarb.com, 1
 phillippe-lemarc.ch, 1
 phillippi.me, 1
+phillips66virtualexperience.com, 1
 phillipskaiser.com, 1
 phillipspediatricsoxford.com, 1
 phillprice.com, 0
@@ -69325,6 +73202,7 @@
 phillyinjurylawyer.com, 1
 philna.sh, 1
 philo.shop, 1
+philographie.com, 1
 philology.tk, 1
 philomathiclife.com, 1
 philosoftware.com.br, 1
@@ -69339,6 +73217,7 @@
 philux.ch, 0
 philwilson-green.cf, 1
 phimsexjav.top, 0
+phimtor.com, 1
 phinphanatic.com, 1
 phiomegachi.tk, 1
 phishing-studie.org, 1
@@ -69368,8 +73247,14 @@
 phonemore.com, 1
 phonenumber-info.co.uk, 1
 phonenumberfind.tk, 1
+phonesexchat.com, 1
+phonesexnumbers.com, 1
+phonet.tk, 1
 phonetikos.com, 1
+phonetrace.tk, 1
+phongthuygo.com, 1
 phonix-company.fr, 1
+phonosynthese.tk, 1
 phonosynthesis.tk, 1
 phormance.com, 1
 phosagro.biz, 0
@@ -69394,15 +73279,18 @@
 photobooth.id, 1
 photobosco.tk, 1
 photochka.tk, 1
+photoclothing.tk, 1
 photocode.co.rs, 1
 photodeal.fr, 1
 photodyna.tk, 1
 photographe-reims.com, 0
 photographerforwedding.tk, 1
 photographersdaydream.com, 1
+photography-edu.com, 1
 photography-workshops.net, 1
 photographyforchange.com, 1
 photographyforchange.org, 1
+photolakeview.com, 1
 photolessya.by, 1
 photomaniastore.com, 1
 photomizer.com, 0
@@ -69414,10 +73302,12 @@
 photoshop-tipps-und-tricks.de, 1
 photosight.ru, 1
 photosoftware.nl, 1
+phototechnique.tk, 1
 phototravel.uk, 1
-phototrio.com, 1
+phototrio.com, 0
 photoutils.com, 1
 photowall.tk, 1
+photowhimsybymegan.com, 1
 phoxden.net, 1
 phoxmeh.com, 1
 php-developer.org, 1
@@ -69427,6 +73317,8 @@
 phpartners.org, 1
 phpbb-tutorials.cf, 1
 phpbbchinese.com, 0
+phpcrudgenerator.com, 1
+phpdevlabs.tk, 1
 phpdorset.co.uk, 1
 phpfashion.com, 1
 phpinfo.in.th, 1
@@ -69434,8 +73326,8 @@
 phpkoru.com, 1
 phpliteadmin.org, 1
 phpmyadmin.net, 1
+phpmydirectory.ru, 1
 phpmynewsletter.com, 1
-phpower.com, 1
 phpprime.com, 1
 phpsecure.info, 1
 phpstan.com, 1
@@ -69500,11 +73392,13 @@
 pianojockl.org, 1
 pianoplast.com, 1
 pianos.de, 0
+pianostemmer.eu, 1
 pianotuning.cn, 0
 pianyigou.com, 1
 piaohong.tk, 1
 piastaola.com, 1
 piasto.com.cy, 1
+piata-imobiliara.tk, 1
 piata.com.br, 1
 piataborrachas.com.br, 1
 piatabrasil.com.br, 1
@@ -69543,6 +73437,7 @@
 pickupenc.ru, 1
 piclect.com, 1
 picme.tk, 1
+picobellos.tk, 1
 picom365.com, 1
 picone.com.au, 1
 piconepress.com, 1
@@ -69550,6 +73445,7 @@
 picr.ws, 1
 picsastock.com, 1
 picshare.nz, 1
+picstar.tk, 1
 picsto.re, 0
 pictopat.com, 1
 pictopat.nl, 1
@@ -69561,6 +73457,7 @@
 pictureguy.de, 1
 picturevictoria.vic.gov.au, 1
 picturingjordan.com, 1
+picturoftheday.tk, 1
 pidelo-peru.com, 1
 pidginhost.com, 1
 pidjipi.com, 1
@@ -69583,11 +73480,11 @@
 piening.ddns.net, 1
 piensa-escribe.tk, 1
 piepermail.nl, 1
+piepschuimlogo.nl, 1
 pieq.eu, 1
 pieq.eu.org, 1
 pier1url.com, 1
 pier28.com, 1
-piercing.hu, 1
 piercingnagykereskedes.hu, 1
 piercingpiac.hu, 1
 piercraft.com, 1
@@ -69634,6 +73531,7 @@
 pikimusic.moe, 1
 pikio.pl, 1
 pikker.ee, 1
+pikkuegypti.tk, 1
 pikmy.com, 1
 piknichok.ml, 1
 pilani.ch, 0
@@ -69643,6 +73541,7 @@
 pilatescenteraz.com, 1
 pilatespt.nl, 1
 pilatesstation.co.th, 1
+pilatesstudiozutphen.nl, 1
 pildat.org, 1
 pileofgarbage.net, 1
 pilesyk.tk, 1
@@ -69660,6 +73559,7 @@
 pilotcareercentre.com, 1
 pilotgrowth.com, 1
 pilotpov.com, 1
+pilotproject.tk, 1
 pilsen.fun, 1
 pilvi.pw, 1
 pilvi.space, 1
@@ -69667,17 +73567,21 @@
 pimanta.com, 1
 pimastoneaz.com, 1
 pimbletree.com, 1
+pimentokinderboeken.nl, 1
 pimhaarsma.nl, 1
 pimhaarsmamedia.nl, 1
 pimichi.com, 1
+pimoid.fr, 1
 pimpmymac.ru, 1
 pimpmypaper.com, 1
 pimpmyperf.fr, 0
 pimpstack.com, 1
 pimylifeup.com, 1
 pin.net.au, 1
+pinale.es, 1
 pinceaux.org, 1
 pincha.com.tw, 0
+pinchoparados.tk, 1
 pinchuk.tk, 1
 pincodehome.com, 1
 pincodeit.com, 1
@@ -69688,10 +73592,12 @@
 pinebaylibrary.org, 1
 pinebrook.tk, 1
 pinedadegiguela.tk, 1
+pineko.com.au, 1
 pinellaslaser.com, 1
 pinemountainnursery.com.au, 1
 pinemountbaptistchurch.org, 1
 pinetopazrealestate.com, 1
+pinflux2.com, 1
 ping-books.cf, 1
 pingandsue.us, 1
 pingrc.net, 1
@@ -69706,6 +73612,7 @@
 pinkbike.com, 1
 pinkbikecycle.com, 1
 pinkerton.io, 1
+pinkitalia.tk, 1
 pinklecfest.org, 1
 pinklittlenotebook.com, 1
 pinkoi.com, 1
@@ -69718,8 +73625,8 @@
 pinnaclelife.co.nz, 0
 pinnaclelife.nz, 1
 pinnacleraffles.com, 1
-pinnacleroofingsolutions.com, 1
 pinnakl.com, 1
+pinnoto.org, 1
 pinot.it, 1
 pinoydailytvshow.net, 1
 pinoyreal.com, 1
@@ -69729,7 +73636,6 @@
 pinpayments.com, 1
 pinpointengineer.co.uk, 1
 pinskupakki.fi, 1
-pinster.com, 1
 pinterest.at, 1
 pinterest.ca, 1
 pinterest.co.uk, 1
@@ -69743,7 +73649,6 @@
 pinterest.nz, 1
 pinterest.ph, 1
 pinterest.ru, 1
-pinterest100.com, 1
 pinterjann.is, 1
 pintiaux.com, 1
 pintosbeeremovals.co.za, 1
@@ -69764,10 +73669,12 @@
 pipenny.net, 1
 pipeuro.com, 1
 pipfrosch.com, 0
+piplwize.com, 1
 pippenainteasy.com, 1
 piprotec.com, 1
 pipscprd.ca, 1
 piraeuspress.gr, 1
+piraino.fr, 1
 piramalglassusa.com, 1
 piranhaattack.tk, 1
 piranja-cola.de, 1
@@ -69777,8 +73684,10 @@
 piratebayproxy.tf, 1
 piraten-basel.ch, 1
 piraten-kleinbasel.ch, 1
+piraten-recording.tk, 1
 pirateparty.org.uk, 1
 piratepay.io, 0
+piratepcs.com, 1
 pirateproxy.bet, 1
 pirateproxy.blue, 1
 pirateproxy.buzz, 1
@@ -69798,6 +73707,7 @@
 pirateproxy.pw, 1
 pirateproxy.red, 1
 pirateproxy.sh, 1
+pirateproxy.tube, 1
 pirateproxy.tv, 1
 pirateproxy.uno, 1
 pirateproxy.vc, 1
@@ -69806,6 +73716,7 @@
 pirates-comic.com, 1
 piratesbrewcoffee.net, 1
 piratesforums.co, 1
+pirateship.com, 1
 piratesofthewadden.tk, 1
 pircher.co.uk, 1
 pircher.tk, 1
@@ -69817,7 +73728,6 @@
 pirogi.ga, 1
 piroleikki.co.jp, 1
 pirscapital.com, 1
-piruchita.com, 1
 pirxpilot.me, 1
 pis.eu.com, 1
 pisaggni.ch, 1
@@ -69847,8 +73757,10 @@
 pitchup.com, 1
 pitchupp.com, 1
 piter-print.tk, 1
+piter178.tk, 1
 pitfire.io, 1
 pitius.tk, 1
+pitman.tk, 1
 pitomec.tk, 1
 pitot-rs.org, 1
 pitoufi.fr, 1
@@ -69858,6 +73770,7 @@
 pittmancentertn.gov, 1
 piu.moe, 1
 piucellulare.it, 1
+piuincontri.com, 1
 piurvolium.tk, 1
 pivbar.tk, 1
 pivnica.gq, 1
@@ -69877,6 +73790,7 @@
 pixelabs.fr, 1
 pixelcatproductions.net, 1
 pixelcomunicacion.com, 1
+pixelcrayons.com, 1
 pixelcubed.com, 1
 pixelecommerce.com, 1
 pixelesque.uk, 1
@@ -69914,7 +73828,9 @@
 pizponim.co.il, 1
 pizza-calzone.com, 1
 pizza-curator.com, 1
-pizza-show.fr, 1
+pizza-house.tk, 1
+pizza-odessa.com.ua, 1
+pizza-soprano.pl, 1
 pizzabesteld.nl, 1
 pizzafest.ddns.net, 1
 pizzagigant.hu, 1
@@ -69922,6 +73838,7 @@
 pizzahut.co.in, 1
 pizzahut.ru, 1
 pizzamc.eu, 1
+pizzaplus.tk, 1
 pizzariapartiupizza.com.br, 1
 pizzariaroma.cf, 1
 pizzaspaghettiemandolino.com, 1
@@ -69990,6 +73907,7 @@
 plagiarismcheck.org, 1
 plainbulktshirts.co.za, 1
 plainjs.com, 1
+plainlanguage.gov, 1
 plaintech.net.au, 1
 plaintextpledge.com, 1
 plaintextpledge.email, 1
@@ -70017,8 +73935,11 @@
 planeta-remontika.ga, 1
 planeta-tierra.cl, 1
 planetadeti.org, 1
+planetalife.com, 1
+planetamusik.tk, 1
 planetanim.fr, 1
 planetapolska.com, 1
+planetaprogramas.tk, 1
 planetarian.moe, 1
 planetasuboficial.com.br, 1
 planetau2.com, 1
@@ -70031,7 +73952,10 @@
 planeteroliste.fr, 1
 planetknauer.net, 1
 planetmath.org, 1
+planetmetroidprime.tk, 1
+planetofsound.tk, 1
 planetofthegames.tv, 1
+planetonline.tk, 1
 planetpowershell.com, 1
 planetromeo.com, 1
 planetromeofoundation.org, 1
@@ -70057,6 +73981,7 @@
 planningsagenda.nl, 1
 plano.gq, 1
 planolowcarb.com, 1
+planosvivointernet.com.br, 0
 planosylicencias.de, 1
 planovivofibra.com.br, 1
 planrow.com, 1
@@ -70083,14 +74008,17 @@
 plaque-immatriculation-auto.com, 1
 plaredo.tk, 1
 plaros.ml, 1
+plasapulsa.tk, 1
 plashenkov.com, 1
 plaskiewicz.pl, 1
 plassmann.ws, 1
 plast.bg, 1
+plast.design, 1
 plastdesign.com.ua, 1
+plastex.tk, 1
 plastic-id.com, 1
 plastic2print.com, 1
-plasticbags.co.uk, 1
+plasticobiodegradable.com, 1
 plasticosbiobasados.com, 1
 plasticstare.com, 1
 plasticsurgerynola.com, 1
@@ -70124,6 +74052,7 @@
 play-telochki.tk, 1
 play.cash, 1
 play.google.com, 1
+playabalares.ga, 1
 playandwin.co.uk, 1
 playanka.com, 1
 playasmiles.com, 1
@@ -70131,6 +74060,7 @@
 playblightnight.com, 1
 playcollect.net, 1
 playdaysparties.co.uk, 1
+playdlawosp.pl, 1
 playdrop.ml, 1
 playelephant.com, 1
 player.me, 1
@@ -70141,7 +74071,6 @@
 playinfinity.com, 1
 playinfinityvr.com, 1
 playit.rs, 1
-playitsafe.eu, 0
 playlisten.radio.br, 1
 playmei.com, 1
 playmfe.com, 1
@@ -70157,10 +74086,10 @@
 playsoftware.tk, 1
 playsprout.industries, 1
 playstation-network.ga, 1
-playstation.com, 1
 playstationplus.es, 1
 playstationtrophies.org, 1
 playtictactoe.org, 1
+playtoearn.net, 1
 playtopia.com, 1
 playtopia.fr, 1
 playtopia.nl, 1
@@ -70178,6 +74107,7 @@
 plcgurus.net, 1
 plchardware.com, 1
 pldx.org, 1
+ple-conseil.fr, 1
 pleasantonca.gov, 1
 pleasantonmobilenotary.com, 1
 please-uwu.me, 1
@@ -70223,6 +74153,7 @@
 ploi.io, 1
 plokigames.com, 1
 plokko.com, 1
+plomberie-rivesud.ca, 1
 plongee-phuket.fr, 1
 plotbubble.com, 1
 plothost.com, 1
@@ -70246,14 +74177,17 @@
 plumbingcentral.com.au, 1
 plumbingglenvista.co.za, 1
 plumbingkingsllc.com, 1
+plumbingshop.tk, 1
 plumlocosoft.com, 1
 plumnet.ch, 1
 plumpie.net, 0
 plumplat.com, 1
+plumtreelaw.com, 1
 plumz.me, 1
 plur.com.au, 1
 plural.cafe, 1
 pluralistic.net, 1
+pluricosmetica.com, 1
 plus-5.com, 1
 plus-aliance.ru, 1
 plus-imobiliare.ro, 1
@@ -70263,7 +74197,6 @@
 plus1s.site, 1
 plus36.hu, 1
 plusbot.tk, 1
-plushev.com, 1
 pluslink.co.jp, 1
 plusmobile.fr, 1
 plusreed.com, 1
@@ -70271,7 +74204,6 @@
 plustream.com, 1
 pluta.net, 1
 plutiedev.com, 1
-pluto.life, 1
 plutokorea.com, 1
 plutopia.ch, 1
 plymouthbouncycastles.co.uk, 1
@@ -70345,6 +74277,8 @@
 pnp.ac.id, 1
 pnsc.is, 1
 pnut.io, 0
+po-krasivi.bg, 1
+po-sha-go-vo.ru, 1
 po.net, 1
 po0k.ie, 1
 poc060.com, 1
@@ -70461,6 +74395,7 @@
 pochaneko.com, 1
 pochoden-praha.cz, 1
 pocitacezababku.cz, 1
+pocketbookdot.tk, 1
 pocketcraft.io, 1
 pocketdeer.cc, 1
 pocketfruity.com, 1
@@ -70471,13 +74406,20 @@
 pockets.jp, 1
 pocobelli.ch, 0
 pocze.ch, 1
+podari-radost.tk, 1
 podari.tk, 1
 podarki-deda-moroza.tk, 1
+podarkiboss.tk, 1
 podarky.gq, 1
+podarochek.tk, 1
+podarochkki.tk, 1
+podatrans.com, 1
 podcast.style, 1
+podcastmusic.com, 1
 podcrto.si, 1
 podd.xyz, 1
 podemos.info, 1
+poder.tech, 1
 poderesdanatureza.com.br, 1
 podia.com.gr, 0
 podia.gq, 1
@@ -70499,25 +74441,32 @@
 poemerx.net, 1
 poemindia.cf, 1
 poemlife.com, 1
+poems-bodywear.store, 1
 poemwall.ml, 1
 poenhub.xyz, 1
+poesiafm.tk, 1
+poetasmenores.tk, 1
 poetenblog.tk, 1
 poetka.tk, 1
 poetry.ge, 1
 poetryinmusic.tk, 1
+poetsjeboot.nl, 1
 poezja.art, 1
 poezja.com.pl, 1
 poezjagala.pl, 1
 poffenhouse.ddns.net, 1
 pogera.com, 1
 pogetback.pl, 1
+pogljad-brest.tk, 1
 pogodavolgograd.tk, 1
 pogodok.tk, 1
 pogomate.com, 1
+pogoswine.com, 1
 pogotowiekomputeroweolsztyn.pl, 1
 pogrebisky.net, 1
 pogs.us, 1
 pohatta.com, 1
+pohica.com, 1
 pohlmann.io, 1
 pohoron.ru, 1
 poi-radary.eu, 1
@@ -70581,6 +74530,7 @@
 pokerking.club, 1
 pokermix.ca, 1
 pokerslab.com, 1
+pokerventure.ga, 1
 pokkareindeermeat.com, 1
 pokl.cz, 1
 pokon548.ink, 1
@@ -70625,6 +74575,7 @@
 polis812.ru, 1
 polisanaraka.pl, 1
 polisanarciarska.pl, 1
+poliscursos.com.br, 1
 polish-dictionary.com, 1
 polish-flag.com, 1
 polish-translations.com, 1
@@ -70639,6 +74590,7 @@
 polishtranslation.com, 1
 polishwomen.com, 1
 polisipati.tk, 1
+polisport.tk, 1
 polisynazycie.com.pl, 1
 polit-it.pro, 1
 polit.im, 1
@@ -70671,11 +74623,11 @@
 polleverywhere.com, 1
 polliconstruction.com, 1
 pollies.nl, 1
+polliga.tk, 1
 pollingplace.uk, 1
 pollpodium.nl, 1
 polly.spdns.org, 1
 pollybarks.com, 1
-pollyundpaule.de, 1
 polmods.com, 1
 polog.tk, 1
 pologalileo.eu, 1
@@ -70686,6 +74638,7 @@
 polskiemalzenstwo.org, 1
 polskienewsy.tk, 1
 poly-fast.com, 0
+polyairepricebook.com.au, 1
 polybius.io, 1
 polycoise.com, 1
 polycraftual.co.uk, 1
@@ -70695,6 +74648,7 @@
 polymake.org, 1
 polymathian.com, 1
 polymerclay.de, 1
+polymtl.ca, 1
 polynomapp.com, 1
 polypane.rocks, 1
 polypet.com.sg, 1
@@ -70703,11 +74657,11 @@
 polytechecosystem.vc, 1
 polytekniskforening.dk, 1
 pomadgw.xyz, 1
+pomba.pl, 1
 pomdoc.com, 1
 pomelo-paradigm.com, 1
 pomfeed.fr, 1
 pommedepain.fr, 1
-pommetelecom.fr, 1
 pomockypredeti.sk, 1
 pomocniczy.eu.org, 1
 pomogidrugu.tk, 1
@@ -70717,11 +74671,12 @@
 pompefunebrilariviera.it, 0
 pompeii.tickets, 1
 pompiers-martigny.ch, 0
+pompo.com.br, 1
 pompoco.info, 1
 pomsinoz.com, 1
 pomtom.co.nz, 1
 ponca-nsn.gov, 1
-poncho-bedrucken.de, 1
+poncho-bedrucken.de, 0
 pondof.fish, 1
 poneypourtous.com, 0
 ponga.se, 1
@@ -70731,12 +74686,11 @@
 ponnohaat.com, 1
 ponpon.tk, 1
 ponpon05.com, 1
-ponselgue.com, 1
 ponselsoak.com, 1
+ponsot.cloud, 1
 ponte-camp.de, 1
 pontiwerx.com.au, 1
 pontodogame.com.br, 1
-pontupagina.com, 1
 ponxel.com, 1
 pony-cl.co.jp, 1
 pony.tf, 1
@@ -70745,6 +74699,7 @@
 ponycyclepals.co.uk, 1
 ponydesignclub.nl, 1
 ponyfoo.com, 1
+ponyhof-muensterland.de, 1
 ponzi.life, 1
 poobert.tk, 1
 poodleassassin.com, 1
@@ -70777,6 +74732,7 @@
 popcornpalacefundraising.com, 1
 popcultureshack.com, 1
 popecountyar.gov, 1
+popflow.gq, 1
 popimed.com, 1
 popinga.it, 1
 popitsnack.com, 1
@@ -70786,9 +74742,10 @@
 popkins.cf, 1
 popkins.ga, 1
 popkins.gq, 1
+popkins.ml, 1
 popkins.tk, 1
 popkultura.info.pl, 1
-poplarbarn.com, 1
+popl.uz, 1
 poplavok77.tk, 1
 popmagz.com, 1
 popmundoforum.tk, 1
@@ -70823,8 +74780,8 @@
 pork.org.uk, 1
 porka.gq, 1
 porkbun.com, 1
-porkel.de, 1
 porkmart.ga, 1
+porkpiesonline.co.nz, 1
 porkyx.com, 1
 porm.club, 1
 porn2019.tk, 1
@@ -70836,18 +74793,20 @@
 pornblog.org, 1
 pornbot.co, 1
 porncompanions.com, 1
+porndoe.com, 1
 porndragon.net, 1
 pornfacefinder.com, 0
 pornflare.net, 1
 pornforwomentube.com, 1
 pornfreesites.com, 1
+pornfriends.tk, 1
 porngay.co, 1
 pornhib.xyz, 1
 pornhubhd.biz, 1
 pornhun.xyz, 1
 pornimg.net, 1
 porniwi.com, 1
-pornjunkiesxxx.com, 1
+pornleg.com, 0
 pornless.biz, 1
 pornline.porn, 1
 pornline.sex, 1
@@ -70858,6 +74817,7 @@
 porno-geschichten.com, 1
 porno-gif.ru, 1
 porno-stars-video.ru, 1
+porno.watch, 1
 pornoclips.net, 1
 pornodvdkopen.nl, 1
 pornofilme.top, 1
@@ -70877,6 +74837,7 @@
 pornopark.nl, 1
 pornotexte.com, 1
 pornovk.xxx, 1
+pornoxxx.online, 1
 pornport.org, 1
 pornshop.biz, 1
 pornsocket.com, 1
@@ -70897,6 +74858,7 @@
 porsiaedenora.it, 1
 porsolt.com, 1
 port.gdynia.pl, 1
+port.im, 1
 port.social, 1
 port443.hamburg, 0
 port443.se, 1
@@ -70907,7 +74869,6 @@
 portablespeakers.tk, 1
 portablespeakersfinder.com, 1
 portaequipajes.online, 1
-portafoliodenegocios.com.mx, 1
 portagecounty-oh.gov, 1
 portagein.gov, 1
 portal-books.ga, 1
@@ -70922,15 +74883,17 @@
 portalmundo.xyz, 1
 portalmv.com, 1
 portalpandalandia.tk, 1
-portalpower.com.br, 1
 portalz.xyz, 1
 portamiinpista.it, 0
 portatiles-baratos.net, 1
+portativ-mobi.tk, 1
 portchesterny.gov, 1
 porte.roma.it, 1
 portefeuillesignalen.nl, 0
+porterpeds.com, 1
 porterranchelectrical.com, 1
 portesmagistral.com, 1
+portfolio-alberto.es, 1
 portfoliobox.net, 1
 portfreezone.com, 1
 porthos.com.ar, 1
@@ -70949,6 +74912,7 @@
 portsmouthohpd.gov, 1
 portsmouthsheriffsofficeva.gov, 1
 portsolent.com, 1
+portstal.ru, 1
 portugal-a-programar.pt, 1
 portugal-reisetipps.de, 1
 portugalivre.tk, 1
@@ -70959,6 +74923,7 @@
 porybox.com, 1
 porzellantreff.de, 1
 posadalasalbarcas.es, 1
+posaunenchor-senden.de, 1
 posbank.co.uk, 1
 posbich.net, 1
 poseidonwaterproofing.com, 1
@@ -70967,6 +74932,7 @@
 poshlashes.se, 1
 poshsecurity.com, 1
 poshvine.com, 0
+posicioncero.com, 1
 posied.ga, 1
 posijson.stream, 1
 positionus.io, 1
@@ -70979,10 +74945,13 @@
 positiverbeitrag.org, 1
 positivos.tk, 1
 positronicmoron.tk, 1
+poskok.info, 1
 posobota.cz, 1
 posoco.in, 1
 posoiu.net, 1
+posowetuite.ru, 1
 pospisilik.eu, 1
+pospisilikovi.cz, 1
 post-anon.tk, 1
 post-darwinian.com, 1
 post-darwinism.com, 1
@@ -70993,10 +74962,11 @@
 postal.dk, 1
 postal3.es, 1
 postandfly.com, 1
+postari.ro, 1
 postat.com, 1
 postawnasiebie.pl, 1
 postback.io, 0
-postblue.info, 0
+postblue.info, 1
 postbox.life, 1
 postcardpayment.com, 1
 postcode.nl, 1
@@ -71017,27 +74987,38 @@
 postfree.gr, 1
 postimages.org, 1
 postimg.cc, 1
+postlogistic.tk, 1
 postman.ga, 1
 postmarka.tk, 1
 postmart.vn, 1
-postmatescode.com, 1
 postmistress.email, 1
 postmoderns.info, 1
 postmusicologia.tk, 1
 postn.eu, 1
 postofficenear.com, 1
-postoffices.co.in, 1
 postoyanstvo.cf, 1
 postpot.co.kr, 1
+postroim.tk, 1
 postsubmeta.net, 1
 posttigo.com, 1
+posturografia.info, 1
+posturographie.info, 1
+posturography.courses, 1
+posturography.education, 1
+posturography.equipment, 1
+posturography.info, 1
+posturography.science, 1
+posturography.software, 1
+posturography.solutions, 1
+posturography.systems, 1
+posturography.training, 1
+posturologie.info, 1
 posukovskaschola.cz, 1
 posutochno.ml, 1
 posyperfume.com, 1
 potatiz.com, 1
 potato.im, 1
 potatodiet.ca, 1
-potatofrom.space, 1
 potatotee.com, 1
 potatron.tech, 1
 potature.it, 1
@@ -71072,6 +75053,7 @@
 pottershouse.tk, 1
 potterybroker.ga, 1
 pottshome.co.uk, 1
+potwin.tk, 1
 potworowski.de, 1
 potz.tk, 1
 potzwonen.nl, 1
@@ -71088,7 +75070,6 @@
 povareshka.tk, 1
 povesham.tk, 1
 povmacrostabiliteit.nl, 1
-povzetki-knjig.si, 1
 pow-s.com, 1
 pow.jp, 1
 powch.com, 1
@@ -71113,10 +75094,13 @@
 powerforpeople.tk, 1
 powerfortunes.com, 1
 powergridess.com, 0
+powerhockey.info, 1
 powerinboxperformance.com, 1
 powerlifting.tk, 1
 powermeter.at, 1
+powerofsocialtech.com, 1
 powerpadel.com, 1
+powerplanter.com, 1
 powerplantmall.com, 1
 powerplayer.tk, 1
 powerpointschool.com, 1
@@ -71128,6 +75112,7 @@
 powersergfeds.com, 1
 powersergholdings.com, 1
 powersergisrc.com, 1
+powersergsis.com, 1
 powersergthisisthetunnelfuckyouscott.com, 1
 powersergthisisthewebsitefuckyouchris.com, 1
 powersergthisisthewebsitefuckyouscott.com, 1
@@ -71146,6 +75131,7 @@
 poynter.net, 1
 pozarevac.tk, 1
 pozd.tk, 1
+pozega.eu, 1
 pozemedicale.org, 1
 pozharnyi.tk, 1
 pozitiffchik.cf, 1
@@ -71158,12 +75144,14 @@
 pozlife.net, 1
 poznaj-siebie.pl, 1
 poznajrynek.pl, 1
+poznannoe-nepoznannoe.ru, 1
 poznavatelno.ml, 1
 pozzitiv.ro, 1
 pp30019.com, 1
 pp3345.net, 1
 pp5197.co, 1
 pp6729.co, 1
+pp6729.com, 1
 pp6957.co, 1
 pp9297.co, 1
 pp9397.com, 1
@@ -71185,20 +75173,22 @@
 ppoozl.com, 1
 pppo.gov, 1
 ppro.com, 1
-ppsmedical.com.mx, 1
 pptavmdata.org, 1
+ppweb.pro, 1
 ppy.la, 1
 ppy.sh, 1
 pqd.ru, 1
 pqgruber.com, 1
 pqscript.com, 1
 pr-news.spb.ru, 1
+pr-project.tk, 1
 pr-release.top, 1
 pr.search.yahoo.com, 0
 pr1sm.com, 1
 pr2studio.com, 1
 pr3-space-staging.ga, 1
 pr3.space, 1
+pra.rip, 1
 prac.to, 1
 pracevjihlave.cz, 1
 practicalbytes.de, 1
@@ -71211,7 +75201,6 @@
 practo.com, 1
 practodev.com, 1
 pradeek.tk, 1
-praderarestaurant.co.uk, 1
 pradersystems.ch, 1
 pradmin.ru, 1
 prado.it, 1
@@ -71219,7 +75208,6 @@
 praeparation-keppner.de, 1
 praerien-racing.com, 1
 praetzlich-hamburg.de, 1
-pragata.id, 1
 pragatiparasguesthouse.co.in, 1
 prageeth-niranjan.tk, 1
 pragma-solution.com, 1
@@ -71230,6 +75218,9 @@
 praguepsychology.cz, 1
 pragueswim.cz, 1
 praha-9.eu, 1
+praha-kominictvi.cz, 1
+praha.tk, 1
+praiagrande.tk, 1
 praiss.net, 1
 praizeej.com, 1
 prajwal-koirala.com, 1
@@ -71241,16 +75232,19 @@
 praktijkpassepartout.nl, 1
 praktijktian.be, 1
 praktiker.hu, 1
+praktikum.tk, 1
 praleria.com, 1
 pranafilms.tk, 1
 prancor.ru, 1
 pranita-schals.de, 1
 pranita.cz, 1
 pranita.sk, 1
+prankawards.ga, 1
 pranksearch.ml, 1
 prankstercompany.com, 1
 prashantcafe.tk, 1
 prasos.fi, 1
+prasso.se, 1
 prateep.io, 1
 pratemarkets.com, 1
 praticienmedecinechinoise.be, 1
@@ -71270,6 +75264,7 @@
 praxis-familienglueck.de, 1
 praxis-kobiella.de, 1
 praxis-liebner.de, 1
+praxis-waedicity.ch, 1
 praxistipp24.com, 1
 prayag.tk, 1
 prayercentric.com, 1
@@ -71280,6 +75275,8 @@
 prazdniktost.tk, 1
 prazeresdavida.com.br, 1
 prc.gov, 1
+prcarrier.tk, 1
+prdashboard.tk, 1
 prdelka.eu, 1
 pre-renewal.com, 1
 pread.fr, 1
@@ -71287,6 +75284,7 @@
 precambridge.tk, 1
 precedecaritas.com.br, 1
 precedencemedia.com, 1
+precedenceum.com, 1
 precept.uk.com, 1
 preci0.com, 1
 preciadictos.tk, 1
@@ -71297,11 +75295,12 @@
 precision.st, 1
 precisionclan.com, 1
 precisioncoolingco.com, 1
+precisiondentalnyc.com, 1
 precisiondigital-llc.com, 1
 precisionhealthpilot.org, 1
 precisionhockey.net, 1
 precisionicerinks.com, 1
-precisionlender.com, 1
+precisionlender.com, 0
 precisionmachineservice.com, 1
 precisionsportsonline.com, 1
 precisionstocks.com, 1
@@ -71311,6 +75310,7 @@
 predatorworld.tk, 1
 predckazanie.ru, 1
 predkosci.pl, 1
+predmetnyj-fotograf.by, 1
 prednisolone1.gq, 1
 predoiu.ro, 1
 predskazanie.cf, 1
@@ -71321,7 +75321,6 @@
 prefabrik-ev.co, 1
 prefabrik-ev.com, 1
 preference.ga, 1
-preferidaseguros.com, 1
 preferredreverse.com, 1
 prefix.eu, 1
 prefontaine.name, 1
@@ -71353,6 +75352,7 @@
 prelved.se, 1
 prematureacceleration.club, 1
 preme.name, 1
+premier-podiatry.com, 1
 premierbb.com, 1
 premierbouncycastles.co.uk, 1
 premierdisco.co.uk, 1
@@ -71364,12 +75364,16 @@
 premierleague.gq, 1
 premiermaldives.com, 1
 premiermortgageservices.com, 1
+premierpups.com, 1
+premierrisksolutions.com, 1
 premiership-predictors.co.uk, 1
+premierwebservice.com, 1
 premierwomensrobotic.com, 1
 premioambiente.it, 1
 premiovapozicovna.sk, 1
 premised.land, 1
 premium-computer.fr, 1
+premium-job.ru, 1
 premiumcbd.cz, 1
 premiumcredit.am, 1
 premiumdeal.org, 1
@@ -71396,6 +75400,7 @@
 prepperswill.com, 1
 preppertactics.com, 1
 preprodfan.gov, 1
+prepscouts.tk, 1
 prepsiedy.cf, 1
 prepz.es, 1
 presbee.com, 1
@@ -71410,8 +75415,10 @@
 present-m.com, 1
 presentacionesweb.com, 1
 presentationmedia.com, 1
+preservegrandcountyhistory.org, 1
 preserveourhillcountry.org, 1
 preserverollinspass.org, 1
+preserving.tk, 1
 president.bg, 1
 presidentdirectory.ga, 1
 presidentialinnovationfellows.gov, 1
@@ -71432,8 +75439,8 @@
 presses.ch, 0
 pressfreedomtracker.us, 1
 pressnetwork.tk, 1
+pressnewscafe.gq, 1
 pressography.org, 0
-pressplayandrelax.com, 1
 pressrush.com, 1
 pressspace2hack.com, 1
 pressspacetohack.com, 1
@@ -71466,7 +75473,7 @@
 prettygirlcheats.com, 1
 prettynode.com, 0
 prettytunesapp.com, 1
-pretzelhands.com, 1
+pretzelhands.com, 0
 pretzelx.com, 1
 prevenir.ch, 0
 preventfalls.com, 1
@@ -71475,6 +75482,7 @@
 previh.eu, 1
 previous.one, 1
 previousmagazine.com, 1
+previsiemens.com.br, 1
 previsora.gov.co, 0
 previstart.com, 1
 prexxorvita.com, 1
@@ -71483,10 +75491,13 @@
 priboutiquedasflores.com.br, 0
 price-tracker.duckdns.org, 1
 price.bond, 1
+pricedaily.pk, 1
 pricegg.com, 1
 priceholic.com, 1
 priceless-jewelry.com, 1
+pricelesspics.tk, 1
 pricelistforbxmodules.ga, 1
+pricelooper.com, 0
 priceofdollar.com, 1
 priceremoval.net, 1
 pricesdoors.com, 1
@@ -71496,11 +75507,13 @@
 prideindomination.com, 1
 pridnestrovye.gq, 1
 prielwurmjaeger.de, 1
+priestess.tk, 1
 priestessbali.com, 1
 prifo.se, 1
 prij.fr, 1
 prijmeni.eu, 1
 prijsvergelijken.ml, 1
+prima-assol.com, 1
 primaconsulting.net, 1
 primaflorafloristaccrington.co.uk, 1
 primakeysmarketingsolutions.com, 1
@@ -71512,22 +75525,27 @@
 primark.guru, 1
 primary.fit, 1
 primates.com, 1
+primaveradesign.com.br, 1
 primbit.ru, 1
 prime-host.ml, 1
 primecursos.com.br, 1
 primeequityproperties.com, 1
 primegiftindia.com, 1
 primekinoshita.com, 1
+primelendingdallasfw.com, 1
 primelogistics.cf, 1
 primeops.co, 1
+primerdeal.com, 1
+primeview.com, 1
 primglaz.ru, 1
 primitiv.tk, 1
+primitivehuman.com, 1
 primoloyalty.com, 1
 primopan.org, 1
 primordialsnooze.com, 1
 primorus.lt, 1
 primos-tech.com, 1
-prims.cl, 1
+princedavidlodge.org.uk, 1
 princefamilylaw.co.uk, 1
 princelishan.com, 1
 princelishan.com.tw, 1
@@ -71536,6 +75554,7 @@
 princess-vip-escort.com, 1
 princessbackpack.de, 1
 princessefoulard.com, 1
+princesspawg.tk, 1
 princetonnassaupediatrics.com, 1
 princetonradiationoncology.com, 1
 princezna.club, 1
@@ -71555,10 +75574,10 @@
 printerinks.ie, 1
 printerinktoutlet.nl, 1
 printerleasing.be, 1
-printerpoint.co.in, 1
 printertonerkopen.nl, 1
 printexpress.cloud, 1
 printfn.com, 0
+printguru.dk, 1
 printler.com, 1
 println.org, 1
 printmet.com, 1
@@ -71566,10 +75585,13 @@
 printmijn3dmodel.be, 1
 printmydesigns.ml, 1
 printpoint.tk, 1
+printserverpa.com, 1
 printus.de, 1
 printus.pro, 1
 printwasteminimizer.com, 1
+prinzoka.com.br, 1
 prior-it.be, 1
+prior.cloud, 1
 priorite-education.com, 1
 priorityelectric-agourahills.com, 1
 priorityelectric-calabasas.com, 1
@@ -71600,6 +75622,7 @@
 prismalite.com.br, 1
 prismapixel.studio, 1
 prisminfosys.com, 1
+prismosystems.com, 1
 prisonerresource.com, 1
 pristal.eu, 1
 pristinepotty.com, 1
@@ -71616,6 +75639,7 @@
 privacybydesign.foundation, 1
 privacychick.com, 1
 privacychick.io, 1
+privacycloud.nl, 1
 privacyculture.com, 1
 privacyend.com, 1
 privacyforjournalists.org.au, 1
@@ -71623,6 +75647,7 @@
 privacyinternational.org, 1
 privacymanatee.com, 1
 privacynow.eu, 1
+privacysavvy.com, 1
 privacyscore.org, 1
 privacysecuritybrainiacs.com, 1
 privacysvcs.net, 1
@@ -71633,7 +75658,6 @@
 privacyweek.wien, 1
 privacyweekvienna.at, 1
 privaday.de, 0
-privanza.com.co, 1
 privasphere.com, 1
 private-diary-taka.com, 1
 private-mail-for.me, 1
@@ -71641,7 +75665,6 @@
 privatebanks.uk, 1
 privatebin.info, 1
 privatecapsecurity.org, 1
-privatecollection.ae, 1
 privatedns.nl, 0
 privateger.me, 1
 privategiant.com, 1
@@ -71658,6 +75681,7 @@
 privateservice.cz, 1
 privatetrainingonline.se, 1
 privatevoid.net, 1
+privatewolke.com, 0
 privatfrei.de, 1
 privatislauga.lt, 1
 privatmeet.com, 1
@@ -71676,7 +75700,6 @@
 privy-staging.com, 1
 privy.com, 1
 prix-pneus.fr, 1
-prixpictet.com, 1
 prizehometickets.com.au, 1
 prizelink.com.au, 1
 prizesnapper.com, 1
@@ -71692,6 +75715,7 @@
 pro-ben.sk, 1
 pro-clean.org, 1
 pro-co.at, 1
+pro-esb.com, 1
 pro-esb.net, 1
 pro-ing.com, 0
 pro-kemerovo.ml, 1
@@ -71741,6 +75765,7 @@
 procar-rheinland.de, 1
 procarservices.com, 1
 procarswoking.com, 1
+proceed.tk, 1
 procens.us, 0
 procensus.com, 1
 procert.ch, 0
@@ -71757,9 +75782,11 @@
 procode.gq, 1
 proconnectengenharia.com.br, 1
 procore.space, 1
+procountorsolo.com, 1
 procrastinatingengineer.co.uk, 1
 procrastinatingengineer.uk, 1
 procrastinationland.com, 1
+procreditbank-kos.com, 0
 procsec.top, 1
 proctorauth.com, 1
 proctorial.cf, 1
@@ -71777,11 +75804,13 @@
 prodhealthcare.org, 1
 prodietix.cz, 1
 prodigious.work, 1
+prodigyhacking.com, 1
 prodigyhq.io, 1
 prodinger.com, 1
 prodottitipicidellatoscana.it, 1
 prodottogiusto.com, 1
 produccioneskm.cl, 1
+producemybook.com, 1
 producentbalustrad.pl, 1
 producepromotions.com, 1
 producertools.io, 1
@@ -71795,7 +75824,7 @@
 productivemachine.net, 1
 productlondon.com, 1
 productmarketingalliance.com, 1
-productpeo.pl, 1
+products-for-health.tk, 1
 products88.com, 1
 productsblockbuster.com, 1
 productsbrandleader.com, 1
@@ -71817,6 +75846,7 @@
 proesb.net, 1
 proeski.com, 1
 proevlifecycle.eu, 1
+proextenderindia.com, 1
 prof-toplivo.ru, 1
 profarm.top, 1
 profection.biz, 1
@@ -71834,6 +75864,7 @@
 proficiodigital.sk, 1
 profidea.cz, 1
 profielektrik.tk, 1
+profil-doors.spb.ru, 1
 profile.ooo, 1
 profile.tf, 1
 profiles.google.com, 1
@@ -71854,6 +75885,7 @@
 profloorstl.com, 1
 profmetod.com, 1
 proformer.io, 1
+proformi.com, 1
 profritual.ru, 1
 profsaranya.com, 1
 proft.eu, 1
@@ -71878,6 +75910,7 @@
 proggersession.com, 1
 proggersession.de, 1
 progiscad.com, 0
+prognozis.cf, 1
 progolfjourney.com, 1
 progolfnow.com, 1
 progon.cf, 1
@@ -71893,9 +75926,11 @@
 programme-launch28-code854-com.ml, 1
 programmes-neufs-corse.fr, 1
 programming-solutions.tk, 1
+programnews.tk, 1
 programsareproofs.com, 1
 programsupport300procent.com, 1
 programtracker.net, 1
+programvaruexperten.se, 1
 progresivoptic.ro, 1
 progreso.pl, 1
 progress-linux.org, 1
@@ -71904,6 +75939,7 @@
 progressivecfo.co.nz, 1
 progressiveplanning.com, 1
 progressivepurchasing.com.au, 1
+progressivestreetdance.tk, 1
 progressm.tk, 1
 progressnet.nl, 1
 progresswww.nl, 1
@@ -71919,6 +75955,7 @@
 proj.org.cn, 1
 proj3ct.me, 1
 proj6.site, 1
+project-forum.tk, 1
 project-merlin.co.uk, 1
 project-novis.org, 1
 project-rune.tech, 1
@@ -71933,9 +75970,9 @@
 projectemail.co, 1
 projectforge.org, 1
 projectfreehosting.ga, 1
-projectgrimoire.com, 1
 projectguru.in, 1
 projecthelius.com, 1
+projecthopeless.tk, 1
 projectinnovation.org, 1
 projection.gq, 1
 projectl1b1t1na.tk, 1
@@ -71953,7 +75990,9 @@
 projectxyz.eu, 1
 projekt-allianz.de, 1
 projekt-umbriel.de, 1
+projekt-wild.tk, 1
 projektarbeit-projektplanung.de, 1
+projektentwicklung-westfalen.de, 1
 projektzentrisch.de, 1
 projest.ch, 0
 projet-fly.ch, 1
@@ -71976,9 +76015,9 @@
 promisesaplus.com, 1
 promislovik.tk, 1
 prommontag.com, 1
-promo-brille.at, 1
-promo-brille.ch, 1
-promo-brille.de, 1
+promo-brille.at, 0
+promo-brille.ch, 0
+promo-brille.de, 0
 promo-code.tk, 1
 promo-kodi.tk, 1
 promo-matelas.com, 1
@@ -72003,6 +76042,7 @@
 promopony.com, 1
 promorder.ru, 1
 promoscuola.net, 1
+promosjungle.com, 1
 promospg.es, 1
 promotech.pro, 1
 promoterms.com.au, 1
@@ -72019,11 +76059,12 @@
 prontocleaners.co.uk, 1
 prontointerventofognature.roma.it, 1
 prontointerventoimmediato.it, 1
+prontolight.com, 1
 prontossl.com, 1
 proofwiki.org, 1
 proos.nl, 1
 proovn.com, 1
-propagandablog.de, 1
+propagandablog.de, 0
 propagationtools.com, 1
 propanesale.cf, 1
 propcierge.in, 1
@@ -72033,6 +76074,7 @@
 propershave.com, 1
 propertech.com.br, 1
 properticons.com, 1
+propertiesmiami.com, 1
 property-catalogue.eu, 1
 property-tax.cf, 1
 property-tax.ga, 1
@@ -72048,8 +76090,10 @@
 propertyselling.ga, 1
 propertysold.ca, 1
 propertyupdate.com.au, 1
+prophitt.me, 1
 propipesystem.com, 1
 propiteer.com, 1
+propiteercapitalplc.com, 1
 propolisturkiye.tk, 1
 proporcer.tk, 1
 proposalonline.com, 1
@@ -72069,6 +76113,7 @@
 proservices.vip, 1
 prosharp.com.au, 1
 proshnotori.com, 1
+proshop.pl, 1
 proshow.com.ua, 1
 proslimdiets.com, 1
 prosocialmachines.com, 1
@@ -72076,6 +76121,7 @@
 prosoft.es, 1
 prosoft.pe, 1
 prosony.es, 1
+prospa.digital, 1
 prospect1838.com.au, 1
 prospecto.com.au, 1
 prospecto.ee, 1
@@ -72089,7 +76135,6 @@
 prosperity-textile.com, 1
 prosperontheweb.com, 1
 prosperops.com, 1
-prosperos-services.com, 1
 prosperstack.com, 1
 prosperus.ru, 1
 prospo.co, 1
@@ -72111,7 +76156,6 @@
 prostoporno.love, 1
 prostoporno.net, 1
 prostoporno.sexy, 1
-prostoporno.video, 1
 prostoporno.vip, 1
 prostoporno.zone, 1
 prostor.cf, 1
@@ -72119,6 +76163,7 @@
 prostozaim.ml, 1
 prostye-recepty.com, 1
 prosurveillancegear.com, 1
+prosyscom.tech, 1
 protanki.ml, 1
 protanki.tk, 1
 protapnews.tk, 1
@@ -72131,12 +76176,12 @@
 protection-plexi.fr, 1
 protection.ga, 1
 protectionformula.com.ua, 1
-protectoraanimalesalicante.org, 1
 protectwrap.ml, 1
 protectyourspeech.org, 1
 protege.moi, 1
 proteh.com.ua, 1
 protein-riegel-test.de, 1
+proteinreport.org, 1
 protek.tk, 1
 proteogenix-products.com, 1
 proteogenix.science, 1
@@ -72155,6 +76200,7 @@
 protocol.ai, 1
 protocol.co.il, 1
 protogenbrainbooster.tk, 1
+protok.tk, 1
 protonmail.ch, 1
 protonmail.com, 1
 protonpix.com, 1
@@ -72184,6 +76230,7 @@
 provereno-rabotaet.tk, 1
 proverochka.tk, 1
 provide-your-image.de, 1
+providence.org, 1
 providencecmc.com, 1
 providentfireplus.com, 1
 providential.be, 1
@@ -72211,6 +76258,7 @@
 proximoconcurso.com.br, 1
 proxirealtime.com, 1
 proxybay.bet, 1
+proxybay.buzz, 1
 proxybay.bz, 1
 proxybay.cc, 1
 proxybay.co, 1
@@ -72236,6 +76284,7 @@
 prozorlivec.tk, 1
 prpferrara.it, 1
 prpr.cloud, 1
+prsg.tk, 1
 prsnlafk.com, 1
 prstatic.com, 1
 prt.in.th, 1
@@ -72249,6 +76298,7 @@
 pruma.com.br, 1
 pruna.org, 1
 prushka.gq, 1
+prushka.ml, 1
 prushka.tk, 1
 prvcy.one, 1
 prvnirodinna.cz, 1
@@ -72264,13 +76314,14 @@
 ps-provider.co.jp, 1
 ps-sale.ru, 1
 ps-w.ru, 1
+ps.energy, 1
 ps2911.com, 1
 ps2online.tk, 1
 ps3419.org, 1
 ps4all.nl, 1
 ps5ssd.com, 1
+ps8318.com, 1
 psa-travel-care.com, 1
-psabrowse.com, 1
 psalmer.tk, 1
 psasines.pt, 1
 psau.edu.sa, 1
@@ -72302,6 +76353,7 @@
 psg.bg, 1
 pshostpk.com, 1
 pshweb.tk, 1
+psi-tv.tk, 1
 psicanalista.milano.it, 1
 psici.eu, 1
 psicoexpansao.com.br, 1
@@ -72355,12 +76407,14 @@
 psw-training.de, 1
 psw.net, 1
 pswatcher.com, 1
+psyart.tk, 1
 psycenter.tk, 1
 psychedelia.com, 1
 psychedelics.org, 1
 psychiatrie-ricany.cz, 1
 psychiatriepapezova.net, 1
 psychic-healer-mariya-i-petrova-boyankinska-b-borovan-bg.com, 1
+psychic-parapsychologist.com, 1
 psychicfairnetwork.gq, 1
 psychiq.com, 1
 psycho-lobby.fr, 1
@@ -72375,6 +76429,7 @@
 psychologist.ga, 1
 psychologue-a-paris.com, 1
 psychologue-grenoble.org, 1
+psychology-ifk.com, 1
 psychologytests.tk, 1
 psychometrictest.ca, 1
 psychometrictest.co.il, 1
@@ -72386,13 +76441,14 @@
 psychonews.tk, 1
 psychopathtest.com, 1
 psychopersonnalite.com, 1
+psychosis.tk, 1
 psychotechnique.africa, 1
 psychotechnique.be, 1
 psychotechnique.ch, 1
 psychotechnique.com, 1
 psychotechniquetest.fr, 1
 psychotel.tk, 1
-psychotherapie-kp.de, 1
+psychotherapie-kp.de, 0
 psychotherapie1220wien.at, 0
 psychotherapy-vienna.com, 1
 psychotiq.tk, 1
@@ -72406,6 +76462,7 @@
 psylab.cc, 0
 psylab.re, 1
 psylab.vip, 1
+psylliums.com, 1
 psynapse.net.au, 1
 psyshell.tk, 1
 psytrance-pro.com, 1
@@ -72426,13 +76483,16 @@
 pteceng.com, 1
 pterodactyl.org.cn, 1
 pterodactylus.cz, 1
+pteroforge.com, 1
 ptfiber.com, 1
 ptfiber.ru, 1
 ptfiber.spb.ru, 1
 ptgoldensun.com, 1
+ptheophanidis.com, 1
 pthsec.com, 1
 ptk-svarka.ru, 0
 ptlibrary.ml, 1
+ptltrade.com, 1
 ptlync.com.au, 1
 ptm.ro, 1
 ptmarquees.ie, 1
@@ -72459,12 +76519,14 @@
 public-projects.com, 1
 public-projects.de, 1
 public-vocals.de, 1
+public-welfare.com, 1
 publiccarauctionscalifornia.com, 1
 publicintegrity.org, 1
 publicintelligence.net, 1
 publicrea.com, 1
 publicspeakingcamps.com, 1
 publicsuffix.org, 1
+publik.ml, 1
 publimepa.it, 0
 publiq.space, 1
 publish.ga, 1
@@ -72475,6 +76537,7 @@
 pubreview.com.au, 1
 pubsasiedzi.pl, 1
 pubsavoy.tk, 1
+puckcreations.com, 1
 pucogid.ga, 1
 pucsr.tech, 1
 pudding.tk, 1
@@ -72520,6 +76583,7 @@
 pulsnitzer-pfefferkuchen-shop.de, 1
 pulsnitzer-pfefferkuchen.shop, 1
 pulsr.ml, 1
+pumarin.tk, 1
 pump19.eu, 1
 pumpandcash.com, 1
 pumperszene.com, 1
@@ -72558,7 +76622,6 @@
 pupok.gq, 1
 puppet.pl, 1
 puppo.space, 1
-pupset.net, 1
 pupsikstudio.com, 1
 puq.moe, 1
 pura-ponia.gq, 1
@@ -72573,13 +76636,16 @@
 purecbdvapors.com, 1
 puredayshop.com.tw, 1
 puredisinfecting.com, 1
+puredisinfection.com, 1
 purefoot.jp, 1
 purefreefrom.co.uk, 0
 pureindoorair.com, 1
 pureitsolutionsllp.com, 1
 purejewels.com, 1
 purelunch.co.uk, 1
+purelypestcontrol.com, 1
 puremosquito.com, 1
+purenhd.com, 1
 purenvi.ca, 0
 purepest.com, 1
 purepestandlawn.com, 1
@@ -72589,7 +76655,6 @@
 purewaterguide.net, 1
 purexis.ch, 1
 purikore.com, 1
-puripia.com, 1
 purityclothing.co.uk, 1
 purple.tech, 1
 purplebooth.co.uk, 0
@@ -72597,11 +76662,13 @@
 purplebricks.com, 1
 purplebricks.com.au, 1
 purplebricksplc.com, 1
+purplehotel.cf, 1
 purplemet.com, 1
 purplemoon.ch, 1
 purplemoon.mobi, 1
 purpleplains.net, 1
 purplepr.bg, 1
+purples.cf, 1
 purplestar.ch, 1
 purplestar.com, 1
 purplestar.mobi, 1
@@ -72643,6 +76710,7 @@
 putany.tk, 1
 putanypitera.ml, 1
 putasdelporno.com, 1
+putasenvalencia.es, 1
 putatara.net, 1
 puteulanus.xyz, 1
 puthenthope.tk, 1
@@ -72665,6 +76733,7 @@
 puzzleetc.com, 1
 puzzlegames.com, 1
 puzzlepoint.ch, 1
+puzzles-to-print.com, 1
 pv-golf.com, 1
 pv-paderborn-now.de, 1
 pvalaw.com, 1
@@ -72673,6 +76742,7 @@
 pvc-stolarija.co, 0
 pvcvoordeel.nl, 0
 pvda.nl, 1
+pvdplanet.tk, 1
 pvhe.pl, 1
 pvideo.cz, 1
 pvmotorco.com, 1
@@ -72688,7 +76758,9 @@
 pvtschlag.com, 0
 pvv-vermietung.de, 1
 pwaiwm.site, 1
+pwaresume.com, 1
 pwcva.gov, 1
+pwd.az, 1
 pwdgen.net, 0
 pwdsafe.com, 0
 pwe.vision, 1
@@ -72696,6 +76768,7 @@
 pwgenerator.net, 1
 pwned.life, 1
 pwnedpass.tk, 1
+pwneo.com, 1
 pwnies.dk, 1
 pwolk.com, 1
 pwoss.org, 1
@@ -72723,6 +76796,7 @@
 pyjiaoyi.cc, 1
 pylad.se, 1
 pylon.bot, 1
+pymebi.cl, 1
 pymescentro.net, 1
 pymesvalencia.es, 1
 pymeup.org, 1
@@ -72746,6 +76820,7 @@
 pythonatrix.com, 1
 pythonhosted.org, 1
 pytradebot.com.br, 1
+pywikibot.org, 1
 pyxo.net, 0
 pyzlnar.com, 1
 pzpittsburgh.com, 1
@@ -72767,6 +76842,7 @@
 q5118.com, 1
 q5197.co, 1
 q6729.co, 1
+q6729.com, 1
 q6957.co, 1
 q81365.com, 1
 q82365.com, 1
@@ -72794,22 +76870,22 @@
 qani.me, 1
 qaq.cloud, 1
 qaq.sh, 1
+qarea.com, 1
 qarto.com, 1
 qask.ml, 1
 qatartimes.tk, 1
 qaz.cloud, 1
-qaz.link, 1
 qbasicsite.tk, 1
 qbd.eu, 1
 qbiju.com.br, 1
 qbiltrade.com, 1
+qbit.website, 1
 qbtechs.com, 1
 qc.immo, 1
 qc.search.yahoo.com, 0
 qcbrna.qa, 1
 qccareerschool.com, 0
 qcdesignschool.com, 0
-qceventplanning.com, 0
 qclean.com.au, 1
 qclt.com, 1
 qcmakeupacademy.com, 0
@@ -72849,12 +76925,12 @@
 qicsystems.com, 1
 qifu.me, 1
 qifu.org.cn, 1
-qigehl.com, 1
 qihl.gg, 1
 qike.tk, 1
 qikify.com, 1
 qikroof.com, 1
 qiliang.wang, 1
+qingan.ca, 1
 qinghai30019.com, 1
 qingly.me, 1
 qingniantuzhai.com, 1
@@ -72880,7 +76956,7 @@
 ql.tc, 1
 qlares.nl, 1
 qlarititech.io, 1
-qlcvea.com, 1
+qlcvea.com, 0
 qlcvea.it, 1
 qldcarwreckers.com.au, 1
 qldconservation.org.au, 1
@@ -72888,11 +76964,10 @@
 qliving.com, 1
 qlix.pl, 1
 qlrace.com, 0
-qlulife.com, 1
 qm-marzahnnordwest.de, 1
+qmarket.tk, 1
 qmee.com, 1
 qmeriaux.fr, 1
-qnid.cc, 0
 qnixon.com, 1
 qnotafm.com.co, 1
 qnq.moe, 1
@@ -72913,6 +76988,7 @@
 qq52o.me, 1
 qq6177.net, 1
 qq6729.co, 1
+qq6729.com, 1
 qq6957.co, 1
 qq885.com, 1
 qq9297.co, 1
@@ -72940,20 +77016,32 @@
 qrlfinancial.com, 0
 qrpatrol.com, 1
 qrpth.eu, 1
-qrsecuriteanimal.com, 1
 qruiser.com, 1
 qryo.nl, 1
 qrz.one, 1
+qscco.com, 1
 qscloud.de, 1
 qseek.cf, 1
 qslstudio.tk, 1
+qt.to, 1
 qtacairsoft.com, 1
 qtl.me, 1
 qtmsheep.com, 1
 qtn.net, 1
+qto.chat, 1
+qto.cloud, 1
+qto.co, 1
 qto.com, 1
+qto.com.hk, 1
+qto.de, 1
+qto.fr, 1
+qto.info, 1
+qto.name, 1
 qto.net, 1
 qto.org, 1
+qto.support, 1
+qto.to, 1
+qto.wiki, 1
 qtpass.org, 1
 qtpower.co.uk, 1
 qtpower.net, 1
@@ -72967,14 +77055,16 @@
 quackquack.in, 1
 quadcityjuggalos.tk, 1
 quadomania.tk, 1
+quadratimkreis.tk, 1
 quaedam.org, 1
 quafe.tech, 1
 quagga.me, 1
 quaggan.co, 1
+quakeworld.tk, 1
 qualbe.com, 1
+qualebroker.com, 1
 qualiacomputers.com, 0
 qualidesign.com.br, 1
-qualiride.ml, 1
 qualite-ecole-et-formation.ch, 0
 qualith.tk, 1
 quality-life.gr, 1
@@ -72986,6 +77076,7 @@
 qualityhomesystems.com, 1
 qualitymark.com.br, 1
 qualityofcourse.com, 0
+qualityoflife.tk, 1
 qualitypropertycare.co.uk, 1
 qualitytools.com, 1
 qualitywaterproofing.com, 1
@@ -72995,6 +77086,7 @@
 qualyven.com, 1
 quant-labs.de, 0
 quantaloupe.tech, 1
+quantalytics.com, 1
 quantatec.com.br, 1
 quanterra.ch, 0
 quanticlab.com, 1
@@ -73013,6 +77105,7 @@
 quantum2.xyz, 1
 quantumcrypto.nl, 1
 quantumfinance.com.au, 1
+quantumfurball.net, 1
 quantumlink.tk, 1
 quantumpair.net, 1
 quantweb.tk, 1
@@ -73022,6 +77115,7 @@
 quarim.cz, 1
 quarkcore.pt, 1
 quarkdose.de, 1
+quarrymill.com, 1
 quarterfull.com, 1
 quarterhorses.es, 1
 quarticon.com, 1
@@ -73033,8 +77127,11 @@
 quasetio.ml, 1
 quasiproxy.com, 1
 quasseldroid.info, 1
+quassowski.de, 1
 quatermass.tk, 1
+quaternion.tk, 1
 quatrefoiscent.fr, 1
+quattro.tk, 1
 quaxio.com, 1
 quay.net, 1
 quayhudanhbai.com, 1
@@ -73042,14 +77139,13 @@
 qubhockey.tk, 1
 qubyte.codes, 1
 quchao.com, 1
-que-debo-regalar.es, 1
 quebajelagasolina.com, 1
-quebec.casa, 1
 quedos.com.au, 1
 queenbeer.com, 1
 queencomplex.net, 1
 queencreekaz.gov, 1
 queene.eu, 1
+queenkedi.net, 1
 queenmargaret.ddns.net, 1
 queensbotanical.org, 1
 queensfactory.it, 1
@@ -73061,7 +77157,9 @@
 queer.party, 1
 queerativity.art, 1
 queercinema.ch, 1
+queersin.space, 1
 queextensiones.com, 1
+quehay.de, 1
 queirozmiotto.adv.br, 1
 queirozmiotto.com.br, 1
 quellarotondasembrafi.ga, 1
@@ -73079,6 +77177,7 @@
 quentar.tk, 1
 quentin-sauvetre.fr, 1
 quentinchevre.ch, 1
+quepourlesjuristes.fr, 1
 quera.ir, 1
 querenciavirtual.com.br, 1
 query-massage.com, 0
@@ -73088,6 +77187,7 @@
 questbars.cf, 1
 questbars.ga, 1
 questdairy.com, 1
+questforgaming.com, 1
 question.cf, 1
 question.com, 1
 questionable.host, 1
@@ -73100,6 +77200,7 @@
 quezmedia.com, 1
 quezoncity.ml, 1
 quhyu.xyz, 1
+quic-hosting.de, 1
 quic.cf, 1
 quic.fr, 1
 quic.stream, 1
@@ -73108,16 +77209,19 @@
 quichost.com, 1
 quickassortments.com, 1
 quickboysvrouwen2.nl, 1
+quickcashcarremovals.com.au, 1
 quickerticker.tk, 1
 quickformspro.com, 1
 quickinfosystem.com, 1
 quickjobsfinder.com, 1
 quicklinkz.tk, 1
 quickq.nu, 1
+quickrate.de, 1
 quickrelations.de, 1
 quicksell.store, 1
 quickshops.ga, 1
 quicksupplies.us, 1
+quickudpinternetconnections.com, 1
 quickvideo.tk, 1
 quickyshare.com, 1
 quieoltre.it, 1
@@ -73132,6 +77236,8 @@
 quiet-waters.org, 1
 quietapple.com, 1
 quietapple.org, 1
+quietlife.tk, 1
+quietplace.tk, 1
 quietstudyactivities.tk, 1
 quietus.gq, 1
 quik.legal, 1
@@ -73176,6 +77282,7 @@
 quizinn.live, 1
 quizogames.com, 1
 quizz.biz, 1
+quizzard.tk, 1
 quizzen.tk, 1
 qul.link, 1
 qunix.net, 1
@@ -73192,12 +77299,10 @@
 quovadisaustria.com, 1
 qupom.com.br, 1
 quppa.net, 1
-quprop.com, 1
 quranliveonline.com, 1
 quranpdf.cf, 1
+qurium.org, 1
 qurplus.nl, 1
-quuck.eu, 1
-quuck.nl, 1
 quuz.org, 1
 qvady.com, 0
 qvg.company, 1
@@ -73209,12 +77314,10 @@
 qwant.com, 1
 qwantjunior.com, 1
 qwantrank.eu, 1
-qwas.ch, 1
 qwaser.fr, 1
 qwd.no, 1
 qwdqwd.de, 1
 qwe7002.com, 1
-qweertryrblog.cn, 1
 qwertee.com, 1
 qwerty.work, 1
 qwertyatom100.me, 1
@@ -73232,6 +77335,7 @@
 qzhou.ddns.net, 1
 qzin.jp, 1
 r-ay.cn, 1
+r-baruth.de, 1
 r-core.org, 1
 r-cut.fr, 1
 r-ix.de, 1
@@ -73244,6 +77348,8 @@
 r0t.co, 1
 r0uzic.net, 1
 r102.ch, 1
+r15cookie.com, 1
+r16.ru, 1
 r18.moe, 1
 r1a.eu, 1
 r1ch.net, 1
@@ -73257,8 +77363,10 @@
 r3s1stanc3.me, 1
 r3t.io, 1
 r40.us, 1
+r4g3baby.com, 1
 r5197.co, 1
 r6729.co, 1
+r6729.com, 1
 r6957.co, 1
 r7.com.au, 1
 r72w.com, 1
@@ -73279,7 +77387,7 @@
 raadgiverborsen.com, 1
 raadvanstate.nl, 1
 raafat.ninja, 1
-raah.co, 1
+raafwelfaretrustfund.gov.au, 1
 raailto.com, 1
 raamattuopisto.fi, 1
 raaynk.com, 1
@@ -73293,7 +77401,7 @@
 rabbitfinance.com, 1
 rabbitinternet.com, 1
 rabbitsstore.com, 1
-rabec.com.sa, 1
+rabenkralle.tk, 1
 rabica.de, 1
 rabinson2005.tk, 1
 rabota-online.tk, 1
@@ -73302,15 +77410,15 @@
 rabotaemdoma.tk, 1
 rabotanet.tk, 1
 rabotaprofily.tk, 1
-rabotayes.ru, 1
+rabotayte.tk, 1
+rabotenkadot.tk, 1
 rabynska.eu, 1
 racaliz.tk, 1
+racamera.com, 1
 racasdecachorro.org, 1
 raccoltarifiuti.com, 1
 raccoon.fun, 1
 raccoon.io, 1
-raccoonsociety.org, 1
-raceevents.live, 1
 racermaster.xyz, 1
 racesimscoring.com, 1
 rachaeltaylor.tk, 1
@@ -73319,6 +77427,7 @@
 rachelmoorelaw.com, 1
 rachelreagan.com, 1
 rachelsbouncycastles.co.uk, 1
+racheltinniswood.ie, 1
 rachnacollege.tk, 1
 racing-planet.cz, 1
 racingfanclub.tk, 1
@@ -73369,11 +77478,14 @@
 radicaloptimism.org, 1
 radicalsub.com.br, 1
 radicalwebdesign.co.uk, 1
+radio-angelos.tk, 1
 radio-az.tk, 1
 radio-bandit.ml, 1
 radio-brest.tk, 1
 radio-club.ml, 1
+radio-delmare.tk, 1
 radio-mix.ml, 1
+radio-mouse.tk, 1
 radio-one.ml, 1
 radio-online.tk, 1
 radio-pulsar.com, 1
@@ -73381,35 +77493,45 @@
 radio-utopie.de, 1
 radio-valois-multien.fr, 1
 radio1.ie, 1
+radio404.tk, 1
+radio99.tk, 1
 radioactivenetwork.xyz, 1
 radioafibra.com.br, 1
 radioaltamar.tk, 1
+radiobandung.tk, 1
 radioborges.tk, 1
-radiobox.net, 1
+radiobox.net, 0
 radiocappissima.tk, 1
 radiocartel.tk, 1
 radiocommande-industrielle.fr, 1
 radiocommg.com.br, 1
 radiocomsaocarlos.com.br, 1
+radiocrash.tk, 1
 radiocrazy.ml, 1
+radioculture.tk, 1
+radiodance.tk, 1
 radiodeluxe.ml, 1
 radiodeutsch.com, 1
 radiodiagonal.tk, 1
 radiodoblen.tk, 1
 radioduepuntozero.it, 1
+radiodxguatemala.tk, 1
 radioelectronic.tk, 1
 radioenam.tk, 1
 radiofmimagen.net, 1
+radiogaga.ga, 1
 radiogear.ru, 1
 radiogomezone.tk, 1
 radioharrastus.tk, 1
 radioheaven.co.kr, 1
+radioheikrekel.tk, 1
 radioheteroglossia.com, 1
 radiohlam.ga, 1
 radiohouse.tk, 1
 radiohub.ru, 1
 radioibiapina.tk, 1
 radioilusion.es, 1
+radioilusiones.tk, 1
 radiojackienorth.tk, 1
 radioknop.nl, 1
 radiokukesi.tk, 1
@@ -73417,6 +77539,7 @@
 radiolla.com, 1
 radiom.fr, 1
 radiomacuto.gq, 1
+radiomagicafm.tk, 1
 radiomercure.net, 1
 radiomikelerentxun.tk, 1
 radiomodem.dk, 1
@@ -73435,11 +77558,16 @@
 radiorainbow.tk, 1
 radiorecord.ml, 1
 radioremix80.tk, 1
+radioricardo.tk, 1
+radios-associatives.tk, 1
 radiosatbolivia.com, 1
 radiosdeguate.com, 0
+radioseda.ca, 1
 radiosimba.ug, 1
 radiosuperplus.tk, 1
 radiotataouine.tk, 1
+radiotelephoni.tk, 1
+radiotv.tk, 1
 radioumbrella.ga, 1
 radiounofm.tk, 1
 radiounost.tk, 1
@@ -73464,7 +77592,6 @@
 radyabkhodro.net, 1
 radyn.com, 1
 radyodinle.mobi, 1
-radyodinle.us, 1
 radzikow.ski, 1
 raeder-test.azurewebsites.net, 1
 raeu.me, 1
@@ -73491,9 +77618,11 @@
 ragingserenity.com, 1
 ragnaroktop.com.br, 1
 ragprint.com, 1
+ragrosstudios.com, 1
 ragu.co.uk, 1
 rahayi.tk, 1
 rahedm.ir, 1
+raheel.tk, 1
 rahilworld.tk, 1
 rahulpnath.com, 1
 raiceshebreas.org, 1
@@ -73502,9 +77631,11 @@
 raidensnakesden.co.uk, 1
 raidensnakesden.com, 1
 raidensnakesden.net, 1
+raiderhacks.com, 1
 raidstone.net, 1
 raidstone.rocks, 1
 raiffeisen-kosovo.com, 1
+raiffeisen-lune.de, 1
 raiffeisenleasing-kosovo.com, 1
 raiilto.com, 1
 raiito.com, 1
@@ -73535,7 +77666,6 @@
 railtocom.com, 1
 railtoexchange.com, 1
 railtollc.com, 1
-railtoo.com, 1
 railtosucks.com, 1
 railtto.com, 1
 railvideo.co.uk, 1
@@ -73552,11 +77682,11 @@
 rainbowinflatables.co.uk, 1
 rainbowloompattern.com, 1
 rainbowloompatterns.com, 1
+rainbowmath.tk, 1
 rainbowpvtech.com, 1
 rainbowsmoothies.win, 1
 rainbowstore.com.au, 1
 rainbowstore.com.ua, 1
-rainbowswingers.net, 1
 raincoat.systems, 1
 rainel.at, 1
 rainer-knappe.de, 1
@@ -73593,6 +77723,9 @@
 raketa.travel, 1
 raketaro.de, 1
 raketenwolke.de, 1
+rakipro.com, 1
+rakom.tk, 1
+rakovec.hr, 1
 raksha-bandhanwish.ga, 1
 raku.bzh, 1
 rakugaki.cn, 1
@@ -73609,7 +77742,6 @@
 rallybase.cz, 1
 rallybase.eu, 1
 rallycycling.com, 1
-rallypodium.be, 1
 rallytrophy.tk, 1
 ralphbisschops.com, 1
 raltha.com, 1
@@ -73617,10 +77749,11 @@
 ram-it.nl, 1
 ram.nl, 1
 rama.ovh, 1
-ramarka.de, 1
 ramatola.uk, 0
 ramblingrf.tech, 1
 rambo.codes, 1
+ramdigital.xyz, 1
+ramen-dealer.de, 1
 rametrix.com, 1
 ramiabusalah.tk, 1
 ramieres.cf, 1
@@ -73639,16 +77772,19 @@
 ramsdensforcash.co.uk, 1
 ramsdensplc.com, 1
 ramsor-gaming.de, 1
+ramt.tk, 1
 ramtechmodular.com, 1
 ramuel.com, 0
 ramydent.no, 1
 ramynetwork.tk, 1
 ran-drunken.tk, 1
+ran-sama.ddns.net, 1
 ranalawassociates.com, 1
 ranasinha.com, 1
 rancowar.com, 1
 randc.org, 1
 randolf.ca, 1
+randolphcareertech.com, 1
 random-samplings.org, 1
 random.org, 1
 randomadversary.com, 1
@@ -73681,16 +77817,18 @@
 rangersloyalsite.tk, 1
 rangsmo.se, 1
 rangzol.now.sh, 1
+ranikaart.com, 1
 raniwan.com, 1
 ranjanbiswas.com, 1
 ranjanbiswas.in, 1
 rank-net.de, 1
-rankankan.com, 1
 rankgiants.com, 1
+rankgrowup.com, 1
 rankia.ga, 1
 ranking-deli.jp, 1
 ranking-mensesthe.jp, 1
 ranking10hits.tk, 1
+rankingide.tk, 1
 rankingofe.com.pl, 1
 rankingubezpieczeniowy.pl, 1
 rankingubezpieczennazycie.pl, 1
@@ -73704,11 +77842,11 @@
 rantamplan.tk, 1
 rantanda.com, 1
 ranters.nl, 1
-ranthambhorenationalpark.net, 1
 ranwest.com, 1
 rany.eu.org, 1
 ranyeh.co, 1
 ranzbak.nl, 1
+raoliveoil.ga, 1
 raoul-kieffer.net, 1
 rap4ever.org, 1
 rapanui.tk, 1
@@ -73738,9 +77876,11 @@
 rapport.link, 1
 rapportdecoracoes.com.br, 1
 raps.org, 1
+raptechpk.com, 1
 raptorsrapture.com, 1
 rapu.nz, 1
 rapwoyska.tk, 1
+raqm1.com, 1
 raqoo.jp, 1
 raquelmolinacases.tk, 1
 raraflora.com.au, 1
@@ -73761,14 +77901,17 @@
 rascalscastles.co.uk, 1
 rascalscastlesdoncaster.co.uk, 1
 rascript.tk, 1
+rascvet.tk, 1
 rase.rocks, 1
 rasebo.ro, 1
 raserbajs.tk, 1
 rashbogota.tk, 1
 rasheed-nuss.tk, 1
+rashmipandit.com, 1
 raskruti.ml, 1
 raskrutka.cf, 1
 rasmushaslund.com, 1
+raspberryultradrops.com, 1
 raspii.tech, 1
 raspitec.ddns.net, 1
 rassadacvetov.com, 0
@@ -73788,7 +77931,6 @@
 ratelimited.me, 1
 ratelsec.com, 1
 ratepayeralliance.org, 1
-ratgeber-guide.de, 1
 rathbonesonline.com, 1
 rathgeb.org, 1
 rathorian.fr, 1
@@ -73812,20 +77954,23 @@
 raumzeitlabor.de, 0
 rauros.net, 1
 rauschenbach.de, 1
+rautarutto.tk, 1
 ravada-vdi.com, 1
+ravagers.tk, 1
+ravages.tk, 1
 ravasco-football-team.herokuapp.com, 1
-ravchat.com, 1
 raveboy.dyndns.org, 1
 ravelin.com, 1
 raven.dog, 1
 raven.express, 1
 ravencoin.com, 1
 ravencoin.org, 1
-ravenger.net, 1
 ravengergaming.net, 1
 ravenrockrp.com, 1
 ravensbuch.de, 1
+ravenstonejeweler.com, 1
 ravenx.me, 1
+raveseguros.com, 1
 ravhaaglanden.org, 1
 ravihotel.com, 0
 ravijuhend.ee, 1
@@ -73842,6 +77987,7 @@
 rawdamental.com, 1
 rawdutch.nl, 1
 rawfitco.com.au, 1
+rawforce.tk, 1
 rawinfosec.com, 1
 rawpearls.com, 1
 rawr.sexy, 1
@@ -73855,6 +78001,7 @@
 raycon.io, 1
 raydius.de, 1
 rayfalling.com, 1
+rayhanshop.online, 1
 rayiris.com, 1
 raykitchenware.com, 1
 raym.ml, 1
@@ -73864,6 +78011,7 @@
 raymondha.ca, 1
 raymondha.com, 1
 raymundo.doctor, 1
+raynbo.ai, 1
 raynersorchard.com.au, 1
 raynis.net, 1
 raynoonanwindows.ie, 1
@@ -73872,9 +78020,13 @@
 raysolutions.tk, 1
 raystark.com, 1
 raywardapparel.com, 1
+raywin168.com, 1
+raywin168.net, 1
+raywin88.net, 1
 raywisdom.tk, 1
 rayworks.de, 1
 raza.gr, 1
+razajewellers.com, 1
 razalabs.gr, 1
 razberry.kr, 1
 razborpoletov.cf, 1
@@ -73886,7 +78038,6 @@
 razgon.ga, 1
 razrabo.tk, 1
 razrsec.uk, 1
-razvanburz.net, 1
 razvanburz.ro, 1
 razvanvatamanu.ro, 1
 razvlekuha.cf, 1
@@ -73920,6 +78071,7 @@
 rbx.com, 1
 rbx.gg, 1
 rbxcatalog.com, 1
+rbzl.hu, 1
 rc-offi.net, 1
 rc-shop.ch, 1
 rc21x.com, 1
@@ -73958,6 +78110,7 @@
 rdap.co.il, 1
 rdcdesign.com, 1
 rddjapan.info, 1
+rded.nl, 1
 rdesigner.tk, 1
 rdfencingandgates.co.uk, 1
 rdfmapped.com, 1
@@ -73967,9 +78120,12 @@
 rdienclosures.com, 1
 rdimedical.com, 1
 rdjb2b.com, 1
+rdkf.de, 1
 rdl.at, 1
 rdmc.fr, 1
 rdmc.io, 1
+rdmc.network, 1
+rdmc.support, 1
 rdmrotterdam.nl, 1
 rdmshit.net, 1
 rdmtaxservice.com, 1
@@ -73982,6 +78138,7 @@
 rdwh.tech, 0
 rdxbioscience.com, 1
 rdxsattamatka.mobi, 1
+rdzenie.pl, 1
 re-crawl.com, 1
 re-engines.com, 1
 re-inspect.com, 1
@@ -73992,12 +78149,14 @@
 reach-on.de, 1
 reach.gov, 1
 reachhead.com, 1
+reachley.net, 1
 reachrss.com, 1
 reaconverter.com, 1
 react-db.com, 1
 reactions.ai, 1
 reactive-press.com, 1
 reactivemarkets.com, 1
+reactor-family.tk, 1
 reactpwa.com, 1
 read.mk, 1
 readabilitychecker.com, 1
@@ -74030,7 +78189,6 @@
 readytongue.com, 0
 readytowear.es, 1
 readywithresourcestn.gov, 1
-reaff.com, 0
 reaganlibrary.gov, 1
 reakcjonista.tk, 1
 reaksi.id, 1
@@ -74040,6 +78198,7 @@
 real-neo.me, 1
 real-srebrenica-genocide.cf, 1
 real-work.tk, 1
+real360show.com, 1
 realbiz.ml, 1
 realcanada.com.gt, 1
 realcapoeira.ru, 1
@@ -74085,6 +78244,7 @@
 realkeywords.ga, 1
 reall.uk, 1
 reallifeforums.com, 1
+reallivingcc.com, 1
 realloc.me, 1
 reallovetab.ga, 1
 really-simple-ssl.com, 1
@@ -74108,6 +78268,7 @@
 realtime1.com.br, 1
 realtoraidan.com, 1
 realty-pochta.tk, 1
+realty.tatar, 1
 realtygroup-virginia.com, 1
 realtyink.net, 1
 realum.com, 1
@@ -74126,6 +78287,7 @@
 reavaninc.com, 1
 reaven.nl, 1
 rebajasoferta.com, 1
+rebalancenyc.com, 1
 rebane2001.com, 1
 rebeagle.com, 1
 rebeccawendlandt.com, 1
@@ -74136,7 +78298,6 @@
 rebellecare.com, 1
 rebellion.scot, 1
 rebelonline.nl, 1
-rebelrebel.com.au, 1
 rebelsewerservices.com, 1
 rebelz.se, 1
 rebirthia.me, 1
@@ -74151,15 +78312,15 @@
 recaptcha-demo.appspot.com, 1
 recardio.info, 0
 recebersms.com, 1
+receitas.tk, 1
 receptenwebsite.com, 1
 receptenwebsite.nl, 1
 receptionpoint.com, 1
 receptionsbook.com, 1
-recepty.fun, 1
 recessmonkeyz.tk, 1
 recetasboricuas.com, 1
 recetin.com, 1
-recettemedievale.fr, 1
+recettemedievale.fr, 0
 rechenknaecht.de, 1
 rechenwerk.net, 1
 recherchegruppe.tk, 1
@@ -74180,7 +78341,6 @@
 reckoning.gq, 1
 reckontalk.com, 1
 reclaimmysparkle.com, 1
-reclamebureau-ultrax.nl, 0
 reclametoolz.nl, 1
 reclusiam.net, 1
 recmon.hu, 1
@@ -74189,12 +78349,12 @@
 recolic.net, 1
 recolic.org, 1
 recolor.ml, 1
+recomendador.cl, 1
 recommend.pro, 1
 recommended.reviews, 1
 recommends.ml, 1
 recompiled.org, 0
 recon-networks.com, 1
-reconexion.life, 1
 recordexpressllc.com, 1
 recordmeeting.jp, 1
 recordmeeting.net, 1
@@ -74221,6 +78381,7 @@
 recuperatufigura.com, 1
 recupero.it, 1
 recuperodatiraidfastec.it, 1
+recurly.com, 1
 recurrentmeningitis.org, 1
 recursionrecursion.co.uk, 1
 recursos.vip, 1
@@ -74234,6 +78395,7 @@
 recycling.tk, 1
 recyclingisland.com, 1
 red-button.hu, 1
+red-dragon.tk, 1
 red-eyed-tree-frogs.com, 1
 red-lightning.tk, 1
 red-planet.tk, 1
@@ -74248,18 +78410,21 @@
 redactedmedia.org, 1
 redactieco.nl, 1
 redballoonsecurity.com, 1
+redbarnwoodwork.com, 1
 redburn.com, 1
 redcabbage.tk, 1
 redcanary.co, 1
 redcapital.cl, 1
 redcardinal.tk, 1
 redcarpetmonday.com, 1
+redcat.tk, 1
 redcatrampageforum.com, 1
 redchat.cz, 1
 redchip.com.au, 1
 redcoded.com, 1
 redcone.net, 1
 redcorus.com, 1
+redcross.com.ph, 1
 redcupit.com, 1
 redd.it, 1
 reddcrypt.com, 1
@@ -74293,6 +78458,8 @@
 redecsirt.pt, 1
 redeemingbeautyminerals.com, 1
 redelectrical.co.uk, 0
+redemption.gq, 1
+redes-neuronales.tk, 1
 redeshoprural.com.br, 1
 redessantaluzia.com.br, 1
 redeyeguatemala.tk, 1
@@ -74311,6 +78478,7 @@
 redhottube.ga, 1
 redhottube.gq, 1
 redhottube.ml, 1
+redi.tk, 1
 rediazauthor.com, 1
 redicare.ml, 1
 redion.me, 1
@@ -74357,6 +78525,7 @@
 redriverhealthandwellness.com, 1
 redrivernm.gov, 1
 redrowcareers.co.uk, 1
+reds-dev.ga, 1
 redsequence.com, 1
 redshiftcybersecurity.co.za, 1
 redshoeswalking.net, 1
@@ -74367,6 +78536,7 @@
 redstack.tk, 1
 redstarpictures.tk, 1
 redstarsurf.com, 1
+redstoner.com, 1
 redtails.tk, 1
 redteam-pentesting.de, 1
 redtomato.ga, 1
@@ -74413,6 +78583,7 @@
 referati-ru.tk, 1
 referati.tk, 1
 referdell.com, 1
+refertimacuan.com, 1
 refillthecity.eu, 1
 refinansiering.no, 1
 refinedlightingaz.com, 1
@@ -74420,7 +78591,6 @@
 refinery29.com, 1
 refjob.jp, 1
 reflectiondentallasvegas.com, 1
-reflectivecoaching.net, 1
 reflecton.io, 1
 refletindosaude.com.br, 1
 reflets.info, 1
@@ -74437,6 +78607,7 @@
 refreshcartridges.co.uk, 1
 refreshingserum.com, 1
 refreshliving.us, 1
+refrigeracion2hermanos.com.mx, 1
 refrigeratorrepair-austin.com, 1
 refu.net, 1
 refuelcreative.com.au, 1
@@ -74497,19 +78668,25 @@
 registerforhappywellth.com, 1
 registerra.nl, 1
 registr.io, 1
-registriakashicimanuela.it, 1
 registry.google, 1
 regmyr.se, 1
 regnix.net, 1
 regnr.info, 1
 regolithmedia.com, 1
 regon.hu, 1
+regospel.tk, 1
 regraph.de, 1
 regsec.com, 1
 regtech.tk, 1
+regtify.co.uk, 1
 regtify.com, 1
+regtify.com.cy, 1
+regtify.eu, 1
+regtify.org, 1
+regtify.uk, 1
 regularizaeudora.com.br, 1
 regulations.gov, 1
+regulative.gq, 1
 reha-honpo.jp, 1
 rehabili-shigoto.com, 1
 rehabphilippines.com, 1
@@ -74530,14 +78707,15 @@
 reidrice.com, 1
 reiff-schlauchkonfigurator.de, 1
 reifr.net, 1
-reignoftroy.com, 1
 reignsphere.net, 1
 reiki-coaching.nl, 0
 reiki-france.fr, 1
+reikimaster.tk, 1
 reikimontreal.org, 1
 reilly.io, 1
 reimaginebelonging.de, 1
 reimaginebelonging.org, 0
+reimann.me, 1
 reimers.de, 1
 rein.kr, 1
 reinaertvandecruys.com, 1
@@ -74554,6 +78732,7 @@
 reinheft.de, 1
 reinierjonker.nl, 1
 reinisch.io, 1
+reinodemurcia.tk, 1
 reinoldus.ddns.net, 1
 reinotools.com, 1
 reinout.nu, 1
@@ -74564,6 +78743,7 @@
 reisenbauer.at, 1
 reisenbauer.ee, 1
 reiseversicherung-werner-hahn.de, 1
+reiseziel-hiddensee.de, 1
 reishunger.de, 1
 reismil.ch, 1
 reisslittle.com, 1
@@ -74595,6 +78775,7 @@
 rekkurtechnology.com, 1
 reklamaandroid.pp.ua, 1
 reklamaios.pp.ua, 1
+reklamirui.tk, 1
 reklamjog.hu, 1
 reklammaster.ru, 1
 reklamy-led.tk, 1
@@ -74605,7 +78786,9 @@
 relatic.net, 1
 relations-business.com, 1
 relatory.nl, 1
+relatosypoesias.tk, 1
 relax.hn, 1
+relaxcenternederland.nl, 1
 relaxdom.net, 1
 relaxhavefun.com, 1
 relaxpointhyncice.cz, 1
@@ -74614,7 +78797,9 @@
 release-monitoring.org, 1
 release.monster, 0
 releasepoint.com, 1
+releases.live, 1
 releasetimes.io, 1
+relentlessroofing.com, 1
 relevanttomyinterests.com, 1
 reley.me, 1
 reliabledegree.com, 1
@@ -74626,10 +78811,10 @@
 reliant3sixty.com, 1
 reliantfundservices.com, 1
 relic.gq, 1
+relieftn.com, 1
 religiya.tk, 1
 relijon.com, 1
 relitas.cz, 1
-rellmusic.com, 1
 reloading.ml, 1
 relocatefeds.gov, 1
 relojeriajoyeria.com, 1
@@ -74644,7 +78829,9 @@
 remake-projects.tk, 1
 remambo.jp, 1
 remarketable.org, 1
+remateszarate.cl, 1
 remax.at, 1
+remcuavilla.com, 1
 remeb.de, 1
 remedi.tokyo, 1
 remediohalkiparaladiabetes.org, 1
@@ -74664,6 +78851,7 @@
 remifajardo.cf, 1
 remigius-michael.de, 1
 remilner.co.uk, 1
+reminded.tk, 1
 remini.cz, 1
 reminisceaudio.com, 1
 remirampin.com, 1
@@ -74682,8 +78870,14 @@
 remont-p.com, 1
 remont-rollet-izgotovlenie.cf, 1
 remont-rukami.tk, 1
+remontdot.tk, 1
+remontfirm.tk, 1
 remonti.info, 1
+remontmebliv.lviv.ua, 1
+remontpc.cf, 1
 remontportal.tk, 1
+remora.tk, 1
+remorse.ga, 1
 remotedesktop.corp.google.com, 1
 remoteham.com, 1
 remoteoffice.ga, 1
@@ -74700,6 +78894,7 @@
 remptmotors.com, 1
 remrol.ru, 1
 remwhile.com, 1
+remy-daillet-wiedemann.fr, 1
 remy.codes, 1
 rena.am, 1
 rena.cloud, 1
@@ -74713,18 +78908,21 @@
 rendall.tv, 1
 render.com, 1
 renderloop.com, 1
+renderworld.tk, 1
 rendez-vous.gq, 1
 rendre-service.ch, 0
 rene-eizenhoefer.de, 1
 rene-schwarz.com, 1
 rene-stolp.de, 1
 renearends.nl, 1
+renedekoeijer.com, 1
 renee.today, 1
 renehsz.com, 1
 reneleu.ch, 1
 renem.net, 0
 renemayrhofer.com, 0
 reneschmidt.de, 1
+renet.tk, 1
 renewablefreedom.org, 1
 renewablemaine.org, 1
 renewablepedia.com, 0
@@ -74757,14 +78955,16 @@
 rennes-yoga.com, 1
 rennes-zumba.com, 1
 rennfire.org, 1
+renoproject.org, 1
 renov8sa.co.za, 1
 renovablesverdes.com, 1
 renovandoingresos.com, 1
 renovationsf.ga, 1
-renovomedispa.com, 1
 renovum.es, 1
+renrenche.com, 0
 rens.nu, 1
 rensa-datorn.se, 1
+renscreations.com, 1
 rent-a-c.io, 1
 rent-a-coder.de, 1
 rent-to-own-home.ga, 1
@@ -74790,9 +78990,12 @@
 reorz.com, 0
 reox.at, 1
 repaik.com, 1
+repairdriveshafts.tk, 1
 repairgeniuses.com, 1
 repairguy.dk, 1
+repairingmobile.tk, 1
 repairit.support, 1
+repairmysolarpanels.com, 1
 repairtly.com, 0
 repalanca.com, 1
 repalcateia.com.br, 1
@@ -74812,10 +79015,12 @@
 replacementrate.ga, 1
 replay.ga, 1
 replica.plus, 1
+replicacoin.ga, 1
 replicagold.ml, 1
 replicaswiss.nl, 1
 replikatelefon.tk, 1
 repliksword.com, 1
+replyua.net, 1
 repo.ml, 1
 repology.org, 1
 report-incident.de, 1
@@ -74824,6 +79029,7 @@
 reportband.gov, 1
 reportercareer.ga, 1
 reporting.gov, 1
+reportkey.ru, 1
 reportoid.tk, 1
 reposaarenkuva.fi, 1
 reposeed.dev, 1
@@ -74836,6 +79042,7 @@
 reprozip.org, 1
 repsltd.co.uk, 1
 repsomelt.com, 1
+reptieleninfo.tk, 1
 reptrax.com, 1
 reptv.online, 1
 republic.gg, 1
@@ -74853,6 +79060,7 @@
 repugnant-conclusion.com, 1
 repugnantconclusion.com, 1
 reputationweaver.com, 1
+requesthymn.com, 1
 requestr.co.uk, 1
 requeue.ga, 1
 reregu.cf, 1
@@ -74885,6 +79093,8 @@
 residence-donatello.be, 1
 residence-simoncelli.com, 1
 residencedesign.net, 1
+residencesatthebluffs.com, 1
+resident-evil.tk, 1
 residentiallocksmithdallas.com, 1
 residentialmortgageholdings.com, 1
 resilience-france.org, 1
@@ -74896,7 +79106,6 @@
 resistav.com, 1
 resize2fs.de, 1
 resju21.ch, 1
-reslv.io, 1
 resmigazete.gov.tr, 1
 resnickandnash.com, 1
 resolute.com, 1
@@ -74922,7 +79131,9 @@
 respectmyprivacy.net, 1
 respectmyprivacy.nl, 1
 respecttheflame.com, 1
+respiradores.tk, 1
 respiranto.de, 1
+respire-yoga.fr, 1
 respon.jp, 1
 responer.com, 1
 respons.je, 1
@@ -74945,6 +79156,7 @@
 ressl.ch, 1
 resslovaci.net, 1
 ressupply.com, 1
+rest-in-moscow.tk, 1
 restartperm.ml, 1
 restashorecleaning.co.uk, 1
 restaurant-de-notenkraker.be, 1
@@ -74958,6 +79170,7 @@
 restaurantesimonetti.com.br, 1
 restauranthugo.nl, 1
 restauranttester.at, 1
+restauratorin-maubach-dresden.de, 1
 restauriedili.roma.it, 1
 rester-a-domicile.ch, 1
 rester-autonome-chez-soi.ch, 1
@@ -74966,6 +79179,7 @@
 resto-renaissance.be, 1
 restoran-radovce.me, 1
 restoran.cf, 1
+restorationphotos.tk, 1
 restorethegulf.gov, 1
 restoringhopeberks.org, 1
 restoruns.com, 1
@@ -74986,6 +79200,7 @@
 resumic.net, 1
 resumic.org, 1
 resursedigitale.ro, 1
+resurspartner.tk, 1
 resveratrolsupplement.co.uk, 1
 retailcybersolutions.com, 1
 retailing.cf, 1
@@ -74996,13 +79211,13 @@
 retetenoi.net, 1
 retetop95.it, 1
 reth.ch, 1
+rethymnorooms.tk, 1
 reticket.me, 1
 reticle.cf, 1
 reticon.de, 1
 retics.cf, 1
 retinacv.es, 1
 retireearlyandtravel.com, 1
-retirementsolutionva.com, 0
 retirest.com, 1
 retireyourpassword.org, 1
 retmig.dk, 1
@@ -75028,6 +79243,8 @@
 retrofitlab.com, 0
 retroity.net, 1
 retrojar.top, 1
+retrojugo.tk, 1
+retrokuchynka.sk, 1
 retronet.nl, 1
 retropack.org, 1
 retroride.cz, 1
@@ -75045,20 +79262,20 @@
 reueljohnk.com, 1
 reulitz.de, 0
 reuna.me, 1
+reunion.tk, 1
 reupo.com, 1
 reussirsavie.info, 1
 reut42.de, 1
 reuter-profishop.de, 1
 reuter.de, 1
-reva.edu.in, 1
 revaloriza.cf, 1
-revamed.com, 0
 revapost.fr, 1
 revayd.net, 1
 revconnect.tk, 1
 revcord.com, 1
 reveal-sound.com, 1
 revealdata.com, 1
+revellio.tk, 1
 revenge-spells.com, 1
 reverenceglobal.com, 1
 reverencestudios.com, 1
@@ -75068,6 +79285,7 @@
 reverseloansolutions.com, 1
 reverselookupphone.us, 1
 reversesouthafrica.com, 1
+reviderm-skinmedics-rheinbach.de, 1
 review.jp, 1
 reviewbestseller.com, 1
 reviewcenter.in, 1
@@ -75105,6 +79323,7 @@
 revizor.ml, 1
 revizoronline.tk, 1
 revlect.com, 1
+revoluciondelacuchara-fusa.tk, 1
 revoluruguay.com, 1
 revolutionaryaim-vienna.tk, 1
 revolutionaryireland.cf, 1
@@ -75121,12 +79340,14 @@
 rewrite3.com, 1
 rex.st, 1
 rex.tc, 1
+rexbaumgartnerdds.com, 1
 rexcutty.com, 1
 rexdf.net, 1
 rexfinland.fi, 1
 rexled.fi, 1
 rexskz.info, 1
 rexxworld.com, 1
+reyborg.com, 1
 reykjavik.guide, 1
 reyna.cc, 1
 rez.ee, 1
@@ -75143,23 +79364,17 @@
 rf.studio, 1
 rfbcnet.tk, 1
 rfeif.org, 1
-rfid-basis.de, 1
-rfid-grundlagen.de, 1
-rfid-schutz.de, 1
-rfid-schutz.org, 1
-rfid-sicherheit.com, 1
 rfnews.tk, 1
 rfomega.ga, 1
 rfp-rechtsanwaelte.de, 1
 rfs-zbpe.net, 1
 rftoon.com, 1
 rfxanalyst.com, 1
-rga.sh, 1
+rgb2hex.online, 1
 rgbinnovation.com, 1
 rgbpty.com, 1
 rgcomportement.fr, 0
 rgdt.tk, 1
-rgf.be, 1
 rggraphics.mx, 1
 rghost.net, 1
 rgiohio.com, 1
@@ -75186,8 +79401,11 @@
 rhetorical.ml, 0
 rhetthenckel.com, 1
 rheuma-online.de, 1
+rhevelo.com, 0
+rhforum.tk, 1
 rhhfoamsystems.com, 1
 rhinelander.ca, 1
+rhino.co.tz, 1
 rhinobase.net, 0
 rhinoceroses.org, 1
 rhiskiapril.com, 0
@@ -75217,7 +79435,9 @@
 riba-lov.ga, 1
 ribafs.tk, 1
 ribdigital.com, 1
+ribeirostore.com.br, 0
 ribella.net, 1
+ribes.design, 0
 ribolov.tk, 1
 ribtours.co, 1
 ricardo.nu, 1
@@ -75239,17 +79459,19 @@
 richardb.me, 0
 richardbloomfield.blog, 1
 richardbowey.co.uk, 1
+richardbulley.com.au, 1
 richardcrosby.co.uk, 1
 richardharpur.com, 1
+richardhouts.tk, 1
 richardinesrolltop.com, 1
 richardjgreen.net, 1
 richardlangham.plumbing, 1
 richardlangworth.com, 1
 richardlevinmd.com, 1
-richardlugten.nl, 1
 richardrblocker.net, 1
 richardsandsterling.com, 1
 richardschut.nl, 1
+richardsdebt.com, 1
 richardson.cam, 1
 richardson.engineering, 1
 richardson.pictures, 1
@@ -75285,12 +79507,14 @@
 richmondsunlight.com, 1
 richmtdriver.com, 1
 richviajero.com, 1
+richwayfun.com, 1
 ricketyspace.net, 1
 ricki-z.com, 1
 rickmakes.com, 1
 rickmartensen.nl, 0
 rickrongen.nl, 1
 rickscastles.co.uk, 1
+ricksdailytips.com, 1
 ricksfamilycarpetcleaning.com, 1
 rickvanderzwet.nl, 1
 rickweijers.nl, 1
@@ -75308,7 +79532,6 @@
 ricreare.com, 1
 ridayu.jp, 1
 riddickthemovie.tk, 1
-riddims.co, 1
 riddimsworld.com, 1
 riddler.com.ar, 1
 rideapart.com, 1
@@ -75319,6 +79542,7 @@
 riderchris.com, 1
 riders.ga, 1
 rides-japan.jp, 1
+ridgelandchurch.org, 1
 ridingoklahoma.com, 1
 rido.ml, 1
 ridvan-vllasaliu.tk, 1
@@ -75342,6 +79566,7 @@
 riggosrag.com, 1
 righettod.eu, 1
 righini.ch, 0
+right-to-love.name, 1
 rightblog.tk, 1
 rightbrain.training, 1
 rightducks.com, 1
@@ -75349,7 +79574,6 @@
 rightlaw.nz, 1
 rightmovecanada.com, 1
 rightnetworks.com, 1
-rightoncorpus.com, 1
 rightrasta.com, 1
 rightreview.co.uk, 1
 rights.ninja, 1
@@ -75384,12 +79608,14 @@
 rimax.vn, 1
 rimcountrymuseum.org, 1
 rime.com.hr, 1
+rimeto.io, 1
 rimkereso.hu, 1
 rimo.site, 1
 rimonhwang.com, 1
 rimorrecherche.nl, 1
 rincon-nsn.gov, 1
 rincondenoticas.com, 1
+rindlerwahn.de, 1
 ring.com, 0
 ringgitplus.com, 1
 ringingliberty.com, 1
@@ -75405,12 +79631,12 @@
 rinton.ru, 1
 rinvex.com, 1
 rio-weimar.de, 1
-riograndesurgeons.com, 1
 rioinbox.com.br, 1
 riosoil.co.uk, 1
 riosoil.com, 1
 riosoils.co.uk, 1
 riosoils.com, 1
+riostones.com, 1
 rioxmarketing.com, 1
 rioxmarketing.pt, 1
 rioxmarketing.us, 1
@@ -75438,13 +79664,13 @@
 riproduzionichiavi.it, 1
 riptidetech.io, 1
 ripuree.com, 1
-riqy86.nl, 1
 ris-bad-wurzach.de, 1
 ris.fi, 1
 risada.nl, 1
 risalatconsultants.com, 1
 risaphuketproperty.com, 0
 riscascape.net, 1
+risco.ro, 1
 riscoshardware.tk, 1
 rise-technologies.com, 1
 rise.com, 1
@@ -75454,6 +79680,7 @@
 risecstate.gov, 1
 riselab.com.ua, 1
 riseofthewildwoman.com, 1
+riseshost.ml, 1
 riseup.net, 1
 rishabh.me, 1
 risheriffs.gov, 1
@@ -75477,6 +79704,7 @@
 ritaohio.gov, 1
 riteboost.com, 1
 ritel.nl, 1
+ritense.nl, 1
 riteway.rocks, 1
 ritirocalcinacci.viterbo.it, 1
 ritoner.it, 1
@@ -75493,6 +79721,7 @@
 rivalsa.net, 1
 rivastation.de, 1
 rivennero.com, 1
+riveraurology.com, 1
 riverbanktearooms.co.uk, 1
 riverbednetflowsupport.com, 1
 riverbendroofingnd.com, 1
@@ -75504,6 +79733,7 @@
 riverotravel.cl, 1
 riverridgecc.com, 1
 rivers.gov, 1
+riverschool.net, 1
 riversideiowa.gov, 1
 riversideradio.nl, 1
 riversmeet.co.uk, 1
@@ -75515,13 +79745,14 @@
 riviere.pro, 1
 rivingtongreenwich.co.uk, 1
 rivoflor.it, 1
+rivolta.tk, 1
 rivus.net, 1
 riweco.ga, 1
 riwick.com, 0
 rix.ninja, 1
 rixcloud.moe, 1
 rixzz.ovh, 1
-riyadbankacademy.com, 0
+riyadbankacademy.com, 1
 riyono.com, 1
 rizalpalawan.gov.ph, 1
 rizikaockovani.cz, 1
@@ -75530,9 +79761,11 @@
 rj-onderneemt.nl, 1
 rjan.nl, 1
 rje-hub.net, 1
+rjfedor.ddns.net, 1
 rjicpas.com, 1
 rk-box.ru, 1
 rk-links.ml, 1
+rk-mediawork.de, 1
 rk.mk, 1
 rk12.de, 1
 rkabworks.uk, 1
@@ -75553,8 +79786,7 @@
 rleh.de, 1
 rlove.org, 1
 rm-it.de, 1
-rmb.li, 0
-rmc.edu, 1
+rmb.li, 1
 rmcbs.de, 1
 rmdb.tk, 1
 rmdscreen.com, 1
@@ -75565,21 +79797,26 @@
 rmit.me, 1
 rmm-i.com, 1
 rmmanfredi.com, 1
+rmol.tk, 1
 rmp-gebaeudedienste.de, 1
 rmrig.org, 1
 rms.sexy, 1
 rmshg.com, 1
+rmsk.tk, 1
 rmstudio.tw, 1
 rmsupply.nl, 1
 rmtconstruction.co.za, 1
+rmvalues.com, 1
 rmyachting.com, 1
 rn29.me, 1
 rnag.ie, 1
 rnb-storenbau.ch, 1
+rnbjunk.com, 1
 rncc.mx, 1
 rndtool.info, 1
 rnews.tk, 1
 rngmeme.com, 1
+rnoax.com, 1
 ro.co, 1
 ro.exchange, 1
 ro.search.yahoo.com, 0
@@ -75604,7 +79841,9 @@
 robaxin750mg.ml, 1
 robben.io, 1
 robbertt.com, 0
+robbiebird.tk, 1
 robbiecrash.me, 1
+robbielowe.co, 1
 robbievasquez.com, 1
 robbinsgaragedoorwenatchee.com, 1
 robbysmets.be, 1
@@ -75629,6 +79868,7 @@
 robertlysik.com, 1
 robertmusil.ml, 1
 robertnemec.com, 1
+robertobilic.com, 1
 robertocasares.no-ip.biz, 0
 robertoentringer.com, 0
 robertof.ovh, 1
@@ -75650,6 +79890,7 @@
 robin-novotny.com, 1
 robin.co.kr, 1
 robin.info, 1
+robindeheer.nl, 1
 robinevandenbos.nl, 1
 robinflikkema.nl, 1
 robinfrancq.ml, 1
@@ -75668,6 +79909,7 @@
 robnicholls.co.uk, 1
 robocop.no, 1
 robodeidentidad.gov, 1
+roboform.com, 1
 robohash.org, 1
 robokits.co.in, 1
 robomonkey.org, 1
@@ -75692,6 +79934,7 @@
 robu.in, 1
 robust.ga, 1
 robustac.com, 1
+robuststory.com, 1
 robuxemporium.com, 1
 robuxkingz.ml, 1
 rocabot.ddns.net, 1
@@ -75711,17 +79954,18 @@
 rockernj.com, 1
 rocket-resume.com, 1
 rocketdashboard.com, 1
+rocketeer.tk, 1
 rocketevents.com.au, 1
 rocketgnomes.com, 1
 rocketmill.co.uk, 1
 rocketnet.ml, 1
-rocketonlineshopping.com, 0
 rocketr.net, 1
 rocketsandtutus.com, 1
 rocketsworld.tk, 1
 rockfax.com, 1
 rockfordtow.com, 1
 rockfs.ml, 1
+rockhounds.co.za, 1
 rockinronniescastles.co.uk, 1
 rockitinflatables.co.uk, 1
 rocklabs.xyz, 1
@@ -75729,6 +79973,7 @@
 rocknwater.com, 1
 rockpesado.com.br, 1
 rockset.com, 1
+rockshooters.com, 1
 rockslideengineering.com, 1
 rockstargame.su, 1
 rockthebabybump.com, 1
@@ -75778,6 +80023,7 @@
 roelhollander.eu, 1
 roeljoyas.com, 1
 roellcapital.com, 1
+roelmagdaleno.com, 1
 roelof.io, 1
 roelonline.tk, 1
 roelsworld.eu, 1
@@ -75833,9 +80079,10 @@
 rointe.online, 1
 roishopper.com, 1
 roisu.org, 0
+rojiblancos.tk, 1
 roka9.de, 1
 rokass.nl, 1
-rokcupusa.com, 0
+rokcupusa.com, 1
 rokki.ch, 1
 roko-foto.de, 1
 rokort.dk, 1
@@ -75864,11 +80111,13 @@
 rolleyes.org, 1
 rollforadventure.com.au, 1
 rollingbarge.com, 1
+rollingshuttle.org, 1
 rollingstocks.tk, 1
 rollinspass.org, 1
 rolluplab.it, 1
 rolodato.com, 0
 rolstoelappartementen.tk, 1
+rolzzandik.cf, 1
 roma-servizi.it, 1
 romab.com, 1
 romacoffee.co.nz, 1
@@ -75903,6 +80152,7 @@
 romastantra.com, 1
 romatours.pt, 0
 romatrip.it, 1
+romeoijulio.tk, 1
 rometoptentravel.com, 1
 rommelhuntermusic.tk, 1
 rommelmark.nl, 1
@@ -75915,16 +80165,19 @@
 romy.tw, 1
 ron2k.za.net, 1
 ronaldguevara.com, 1
+ronaldleite.tk, 1
 ronan-hello.fr, 1
 ronan.cf, 1
 ronbongamis.com, 1
 ronbyrne.com, 1
+roncoutilities.com, 1
 rondommen.nl, 1
 rondouin.fr, 1
 rondreis-amerika.be, 1
 rondreis-schotland.nl, 1
 ronem.com.au, 1
 ronghexx.com, 1
+rongreenbaum.com, 1
 ronhose.com, 1
 roninf.ch, 1
 roninitconsulting.com, 1
@@ -75939,6 +80192,7 @@
 roodfruit.nl, 1
 roodfruit.studio, 1
 roodhealth.co.uk, 1
+roodjongindesp.nl, 1
 roof.ai, 0
 roofconsultants-inc.com, 1
 roofdoctorutah.com, 1
@@ -75959,6 +80213,7 @@
 room208.org, 1
 room362.com, 1
 room3b.eu, 1
+room45.tk, 1
 roombase.nl, 1
 roomcube.tk, 1
 roomee.tk, 1
@@ -76000,12 +80255,14 @@
 rootsbar.fr, 0
 rootscope.co.uk, 0
 rootsh3ll.com, 1
+rootsmusicmanagement.tk, 1
 rootsskininstitute.com, 1
 rootstation.de, 1
 rootswitch.com, 1
 roottsquare.com, 1
 rootusers.com, 1
 rootze.com, 1
+roozaneh.net, 1
 ropd.info, 1
 roppit.nl, 1
 roques.tk, 1
@@ -76047,8 +80304,12 @@
 roseparkhouse.com, 1
 rosesciences.com, 1
 rosetiger.life, 1
+rosetwig.ca, 1
+rosetwig.systems, 1
 rosevillefacialplasticsurgery.com, 1
 rosewater.me, 1
+rosewebdesignstudio.co.uk, 1
+rosewebdesignstudio.uk, 1
 roshhashanahfun.com, 1
 roshiya.co.in, 1
 roshiya.pw, 1
@@ -76069,6 +80330,7 @@
 rossome.org, 1
 rosspecstroy.ru, 1
 rosstroj-balashiha.ml, 1
+rosswilson.co.uk, 1
 rost.tv, 1
 rostclub.ro, 1
 rostirolla.se, 0
@@ -76105,6 +80367,7 @@
 rottweilerdogcare.com, 1
 rotunneling.net, 1
 rouair.com, 1
+rouamatfashion.gr, 1
 rougechocolat.fr, 1
 rougeetblanc.tk, 1
 roughcopy.com.au, 1
@@ -76130,8 +80393,11 @@
 routetracker.co, 1
 rouwcentrumterheide.be, 1
 rouxh.com, 1
+rovatronic.tk, 1
 rove3d.com, 1
 roverglobal.ga, 1
+rovezzano.tk, 1
+rovian.ua, 1
 rovity.io, 1
 rovohout.nl, 1
 rovota.com, 1
@@ -76140,7 +80406,6 @@
 rowancounty911.com, 1
 rowancounty911.org, 1
 rowancountyairport.com, 1
-rowancountync.gov, 1
 rowankaag.nl, 1
 rowanpubliclibrary.com, 1
 rowansheriff.com, 1
@@ -76151,6 +80416,7 @@
 rowery.org, 1
 rowingsa.asn.au, 1
 rowlog.com, 1
+rowra.org, 1
 roxanaherguz.com, 1
 roxburytech.tk, 1
 roxiesbouncycastlehire.co.uk, 1
@@ -76209,6 +80475,7 @@
 royalcavaliers.tk, 1
 royalcitystudios.ca, 1
 royalcitytaxi.ca, 1
+royalcrowns.tk, 1
 royalfitnesschennai.in, 1
 royalhosting.ch, 1
 royalkitchensandfurniture.co.ug, 1
@@ -76218,15 +80485,16 @@
 royaloz.ma, 1
 royalpainters.co, 1
 royalpalacenogent.fr, 1
-royalpratapniwas.com, 1
 royalrace.tk, 1
 royalstylefit.com, 1
+royalteam.fr, 1
 royaltube.net, 1
 royalty-market.com, 1
 royaltyexchange.com, 1
 royalvortex.co, 1
 royalyule.com, 1
 royalz.ro, 1
+royaume-smoke.com, 1
 roycampbell.tk, 1
 royceandsteph.com, 1
 roycewilliams.net, 1
@@ -76243,6 +80511,7 @@
 rozar.eu, 1
 rozar.sk, 1
 rozhodce.cz, 1
+rozprodat.cz, 1
 rp-megapolis.tk, 1
 rp-murk.tk, 1
 rpadonline.com, 1
@@ -76252,6 +80521,7 @@
 rpg-maker.net, 1
 rpg-maker.org, 1
 rpgchan.cf, 1
+rpgfactory.tk, 1
 rpgmaker.es, 1
 rpguru.com, 1
 rpherbig.com, 1
@@ -76261,7 +80531,6 @@
 rpine.net, 0
 rpj.life, 1
 rpmdrivingschool.com.au, 1
-rpoplus.nl, 1
 rpora.co, 1
 rps-auto.com, 1
 rpschultz.de, 1
@@ -76271,12 +80540,12 @@
 rr30019.com, 1
 rr5197.co, 1
 rr6729.co, 1
+rr6729.com, 1
 rr6957.co, 1
 rr9297.co, 1
 rr9397.com, 1
 rr9721.com, 1
 rr9728.co, 1
-rraesthetics.com, 1
 rrailto.com, 1
 rrbt.eu, 1
 rrbt.net, 1
@@ -76339,7 +80608,6 @@
 rswebsols.com, 1
 rswow.ru, 1
 rsync.eu, 0
-rszm.com.br, 1
 rt22.ch, 1
 rtate.ca, 1
 rtate.se, 1
@@ -76368,7 +80636,6 @@
 rtesport.eu, 1
 rtestore.eu, 1
 rteworld.com, 1
-rtfm.online, 1
 rtgnews.cf, 1
 rtho.me, 1
 rths.tk, 0
@@ -76415,20 +80682,20 @@
 rubenbaer.ch, 1
 rubenbrito.net, 1
 rubenmamo.com, 1
+rubenpeeters.ml, 1
 rubenruiz.org, 1
 rubens.cloud, 1
 rubenschulz.nl, 1
 rubenslikkarchive.com, 1
 rubia.ca, 1
 rubiales.tk, 1
+rubic.tk, 1
 rubidium.ml, 1
-rubixstudios.com.au, 1
 rublacklist.net, 1
 rublev.tk, 1
 rubooks.gq, 1
 rubreklama.tk, 1
 ruby-auf-schienen.de, 1
-rubydatum.com, 1
 rubyist.today, 1
 rubylabs.am, 1
 rubymartin.com.au, 1
@@ -76447,6 +80714,7 @@
 ruddick.org.uk, 1
 ruddick.uk, 1
 rudewiki.com, 1
+rudibora.ml, 1
 rudimart.com, 1
 rudimeds.com, 1
 rudimentalconsolidated.com, 1
@@ -76459,6 +80727,7 @@
 rudnikas.com, 1
 rudolf.gq, 1
 rudolph.life, 1
+rudovasky.com, 1
 rudrastyh.com, 1
 rudy.ga, 1
 rudymendoza.tk, 1
@@ -76471,7 +80740,6 @@
 ruedirrenggli.ch, 0
 rueduparticulier.tk, 0
 rueduverre.com, 1
-rueegger.me, 1
 rueg.eu, 1
 ruerte.net, 1
 ruexpert.cf, 1
@@ -76481,11 +80749,13 @@
 ruffinstorage.com, 1
 ruffnecks.tk, 1
 ruflay.ru, 1
+rugadgets.tk, 1
 rugbugecoflooring.com, 1
 rugby.tk, 1
 rugby.video, 1
 rugcleaninglondon.co.uk, 1
 rugeley-vets.co.uk, 1
+rugged-cctv.com, 1
 rugk.dedyn.io, 1
 ruha.co.in, 1
 ruhigehand.de, 1
@@ -76496,7 +80766,6 @@
 ruhrnalist.de, 1
 ruicore.cn, 1
 ruifu.tech, 1
-ruika.ru, 1
 ruimoreira.co.uk, 1
 ruimtevoor.gent, 1
 ruimtevoorgent.be, 1
@@ -76516,6 +80785,7 @@
 rumartinez.es, 1
 rumbasguayaquil.com, 1
 rumbies.co.uk, 1
+rumble.com, 1
 rumenka.tk, 1
 ruminecraftru.tk, 1
 rumix.tk, 1
@@ -76545,6 +80815,7 @@
 runescape.wiki, 1
 runescapelordsconquest.tk, 1
 runesforbeginners.com, 1
+runet.cf, 1
 runetracker.org, 1
 runeworldforums.tk, 1
 runews.cf, 1
@@ -76584,7 +80855,6 @@
 ruralsuppliesdirect.co.uk, 1
 ruri.io, 1
 rurian-gyohen.com, 1
-rurup.dk, 1
 rus-blog.tk, 1
 rus-manual.tk, 1
 rus-trip.ru, 0
@@ -76593,6 +80863,7 @@
 rusenemas.tk, 1
 rusexmany.ml, 1
 rushashkyfond.com, 1
+rushesflorist.co.uk, 1
 rushmix.com, 1
 rushmyessay.gq, 1
 rushpoppershop.co.uk, 1
@@ -76613,9 +80884,11 @@
 russandol.eu, 1
 russchooljordan.tk, 1
 russell-tech.co.uk, 1
+russellenvy.com, 1
 russelljohn.net, 1
 russellupevents.co.uk, 1
 russenes.com, 1
+russia-furniture.tk, 1
 russia-knigi.ga, 1
 russia-rp.tk, 1
 russia.dating, 1
@@ -76625,23 +80898,23 @@
 russiahunting.tk, 1
 russialife.gq, 1
 russian-artist.tk, 1
+russian-fur.tk, 1
 russian-knights.ru, 1
 russian-page.tk, 1
 russianbearsmotorsport.tk, 1
 russianbluecatsguide.com, 1
 russianbristol.tk, 1
-russiancms.ru, 1
 russianews.cf, 1
 russianpunkrock.tk, 1
 russianrandom.ru, 1
 russisch.tk, 1
 russograffix.tk, 1
-russtekh.com, 1
 rust.cf, 1
 rust.mn, 1
 rust.pm, 1
 rustable.com, 1
 rustambek.tk, 1
+rustamkhanko.gq, 1
 rustfu.rs, 1
 rusticpathways.com.au, 1
 rustikalwallis.ch, 1
@@ -76653,9 +80926,12 @@
 rut2.tk, 1
 rutalimon.com, 1
 rutar.org, 1
+rutasypostales.com, 1
+rutavietnam.com, 1
 rutgerschimmel.nl, 1
 ruthbarrettmusic.com, 1
 ruthbellgrahammemorial.org, 1
+ruthmontenegro.com, 0
 rutiger.com, 1
 rutika.ru, 1
 rutracker-zerkalo.appspot.com, 1
@@ -76686,10 +80962,12 @@
 rvsa2bevestigingen.nl, 1
 rvsa4bevestigingen.nl, 1
 rvsbevestigingen.nl, 1
+rvvc.im, 1
 rw-invest.com, 1
 rw.search.yahoo.com, 0
 rw2.de, 1
 rwalch.at, 1
+rway.pro, 1
 rwbstuff.com, 1
 rwgamernl.ml, 1
 rwky.net, 1
@@ -76718,14 +80996,17 @@
 ryanrichardwalker.com, 1
 ryansmithphotography.com, 0
 ryanteck.uk, 1
+ryazagro.ru, 1
 ryazan-region.ru, 1
 ryazancity.tk, 1
+rybalku.ru, 1
 rybinsk.ga, 1
 rybnitsa.cf, 1
 rybox.info, 1
 rychlikoderi.cz, 0
 rydeify.com, 1
 ryejuice.sytes.net, 1
+rygy.com.br, 1
 ryland.consulting, 1
 rylore.com, 1
 rymanow.tk, 1
@@ -76738,7 +81019,6 @@
 rythm.es, 1
 ryu22e.org, 1
 ryuanerin.kr, 1
-ryuu.es, 1
 ryzen.cz, 1
 ryzex.de, 1
 ryzhov.me, 1
@@ -76758,7 +81038,7 @@
 s-mainte.com, 1
 s-mall.com.sg, 1
 s-on.li, 1
-s-pegasus.com, 1
+s-pira.games, 1
 s-pro.io, 1
 s-s-paint.com, 1
 s-u.pw, 1
@@ -76785,6 +81065,7 @@
 s3gfault.com, 1
 s3lph.me, 1
 s3n.se, 1
+s402.de, 1
 s404.de, 1
 s44.eu, 1
 s4db.net, 1
@@ -76806,9 +81087,9 @@
 s5g8.com, 1
 s64.cz, 1
 s6729.co, 1
+s6729.com, 1
 s6957.co, 1
 s6jl.com, 1
-s6o.de, 1
 s81365.com, 1
 s82365.com, 1
 s88.com, 1
@@ -76838,12 +81119,14 @@
 sab.id, 1
 saba-piserver.info, 1
 saba-shop.tk, 1
+sabachat.tk, 1
 sabahattin-gucukoglu.com, 1
 sabaikonotes.com, 1
 sabaland.tk, 1
 sabatikirooms.com, 1
 sabbat-wildfire.tk, 1
 sabbottlabs.com, 1
+sabbry.com, 1
 sabedinovski.tk, 1
 saberhortifruti.com.br, 1
 sabghijewelers.com, 1
@@ -76851,14 +81134,16 @@
 sabians.tk, 1
 sabine-forschbach.de, 1
 sabineforschbach.de, 1
-sabinespielberg.de, 1
 sabkappers.nl, 1
 sable.gq, 1
+sablyrics.com, 1
 sabmobile.pk, 1
 saborcaribe.tk, 1
 sabrinajoias.com.br, 1
 sabrinajoiasprontaentrega.com.br, 1
 sabrinajoiasvarejo.com.br, 1
+sabrinamiskiewicz.tk, 1
+sabrinarus.tk, 1
 sabrine.tk, 1
 sabworldtricks.tk, 1
 sacademica.tk, 1
@@ -76866,11 +81151,13 @@
 saccani.net, 1
 saccounty.gov, 1
 sacharidovejednotky.eu, 1
+sachk.com, 1
 sachse.info, 1
 sacians.tk, 1
 sacibo.ga, 1
 sackmesser.ch, 1
 saclier.at, 1
+sacodealegria.com, 1
 sacodecuentos.com, 1
 sacprincesse.com, 1
 sacramentocounty.gov, 1
@@ -76901,6 +81188,7 @@
 sadsu.com, 0
 saechsischer-christstollen.shop, 1
 saeder-krupp.de, 1
+saeedvaladbaygi.info, 1
 saenforcement.agency, 1
 saengsook.com, 1
 saengsuk.com, 1
@@ -76923,6 +81211,7 @@
 safebasementsofindiana.com, 1
 safebasementswaterproofing.com, 1
 safeboard.ml, 1
+safebuyerscheme.co.uk, 1
 safecar.gov, 1
 safecash.id, 1
 safecoin.tech, 1
@@ -76958,6 +81247,7 @@
 safertruck.gov, 1
 safescan.com, 1
 safescif.com, 1
+safesearchs.com, 1
 safesoundcounselingllc.com, 1
 safestore.io, 1
 safestreets.cf, 1
@@ -76994,9 +81284,11 @@
 saghekin.com, 1
 sagitta.hr, 1
 saglikhaber.tk, 1
+sagliklidegisim.com, 1
 sagnette.xyz, 1
 sagomedia.tk, 1
 sagracefarms.com, 1
+sagrande.ru, 1
 sahajbooks.com, 1
 sahalin.tk, 1
 sahalinskiy.gq, 1
@@ -77007,7 +81299,7 @@
 sahccareers.com, 1
 sahibinden.com, 1
 sahkotyot.eu, 1
-saibacademy.com, 0
+saibacademy.com, 1
 saibotk.de, 1
 said.id, 1
 said.it, 1
@@ -77034,6 +81326,7 @@
 saimoe.org, 1
 sainetworks.net, 1
 sainokuni-eng.jp, 1
+sainshand.tk, 1
 saint-aubin-sur-scie.fr, 1
 saint-cyril.com, 1
 saint-leonard.fr, 1
@@ -77041,6 +81334,7 @@
 saint-petersburg.cf, 1
 saint-petersburg.gq, 1
 saint-petersburg.ml, 1
+saint-ssd.org, 1
 saintaardvarkthecarpeted.com, 1
 saintanne.net, 1
 saintanthonylakin.org, 1
@@ -77051,8 +81345,7 @@
 sainteugenechurch.net, 1
 sainteugeneschurch.com, 1
 saintfrancescabrini.net, 1
-saintfrancisdesales.net, 1
-sainth.de, 1
+sainth.de, 0
 sainthedwig-saintmary.org, 1
 sainthelena-centersquare.net, 1
 sainthelenas.org, 1
@@ -77061,6 +81354,7 @@
 saintjohn-bocaraton.com, 1
 saintjosephschurch.net, 1
 saintleochurch.net, 1
+saintlouisfence.com, 1
 saintmarkchurch.net, 1
 saintmaryna.com, 1
 saintmaryscathedral-trenton.org, 1
@@ -77082,6 +81376,7 @@
 sairadio.net, 1
 sairadio.net.in, 1
 sairai.bid, 1
+sairlerimiz.tk, 1
 sairus.fr, 1
 saisecure.net, 1
 saisyuusyou-ikebukuro.com, 1
@@ -77089,10 +81384,12 @@
 saisyuusyou-takasaki.com, 1
 saisyuusyou-utsunomiya.com, 1
 saitapovan.com, 1
+saitas.net, 1
 saitechgroups.com, 1
 saito-koken.co.jp, 1
 saitrance.com, 1
 saitschool.ml, 1
+saitv.org.in, 1
 saityvkaluge.ru, 1
 saiyans.com.ve, 1
 sajamstudija.info, 1
@@ -77111,6 +81408,7 @@
 saksonski-szlak-parowozow.pl, 1
 sakura-paris.org, 1
 sakura.zone, 1
+sakuraakino.cyou, 0
 sakuracdn.com, 1
 sakuracommunity.com, 1
 sakuradata.com, 1
@@ -77122,12 +81420,13 @@
 salaervergleich.com, 0
 salaire-minimum.com, 1
 salalfoundation.ca, 1
+salamanders.tk, 1
 salaminos.no-ip.org, 1
-salamon-it.de, 0
 salandalairconditioning.com, 1
 salariominimo.com.co, 1
 salarycalculatoruk.co.uk, 1
 salas.cf, 1
+salas.tk, 1
 salasbanquetes.cl, 1
 salati.tk, 1
 salatiga.com, 1
@@ -77154,14 +81453,18 @@
 salekaz.ru, 1
 salemedia.pro, 1
 salensmotors-usedcars.be, 0
+salento-nostro.tk, 1
 salentocab.com, 1
+saleproductsoffer.com, 1
 salery.ga, 1
 salesflare.com, 1
 salesoutcomes.com, 1
+salestaxspecialists.com, 1
 saletodo.com, 1
 saleturs.tk, 1
 saletzki.de, 1
 salexy.kz, 1
+salibandy.tk, 1
 salidaswap.com, 1
 salilab.org, 1
 salkield.uk, 1
@@ -77187,6 +81490,7 @@
 salon-hinata.biz, 1
 salon-largo.com, 1
 salon-minipli.de, 1
+salon-svadbi.tk, 1
 salon.io, 0
 salonasymetria.com, 1
 salonasymetria.pl, 1
@@ -77196,12 +81500,15 @@
 salsa-straubing.de, 1
 salt-documentary.blog, 1
 salt-travel.cf, 1
+salt.fish, 1
 saltbythesea.com, 1
 saltcave.gq, 1
 saltedfish.network, 1
 saltercane.com, 0
 saltlakedjcompany.com, 1
+saltlakepediatricdentist.com, 1
 saltnsauce.cf, 1
+saltosaltos.eu, 1
 saltrecovery.com.au, 1
 saltro.nl, 0
 saltstack.cz, 1
@@ -77217,13 +81524,14 @@
 saludmas.site, 1
 saludnutrivida.com, 1
 saludsis.mil.co, 1
+saludsuperior.com, 1
 saluels.servemp3.com, 1
 salukinet.tk, 1
 salut-butovo.cf, 1
 salutenaturale.com.br, 1
+salutes.tk, 1
 salutethefish.com, 1
 salutethegrains.com, 1
-salutethepig.com, 1
 salva.re, 1
 salvaalocombia.com, 1
 salvadoralevin.tk, 1
@@ -77254,8 +81562,9 @@
 samara-avia.ru, 1
 samara-hosting.tk, 1
 samaresane.com, 1
+samariafar.com, 0
 samaritainsmeyrin.ch, 0
-samaritan.tech, 1
+samarth.edu.in, 1
 samatva-yogalaya.com, 1
 samba.org, 1
 sambaash.com, 1
@@ -77269,8 +81578,11 @@
 samegoal.com, 1
 samegoal.org, 1
 samel.de, 1
+samentest.tk, 1
+samenuitsamenthuis.tk, 1
 samenwerkingsportaal.nl, 1
 samenwerkingsportaal.tk, 1
+samepage.io, 1
 samesound.ru, 1
 sametimetomorrow.tk, 1
 sameworks.com, 1
@@ -77283,6 +81595,7 @@
 samifar.in, 1
 samin.tk, 1
 samindgroup.com, 1
+samir-software.tk, 1
 samiratv.tk, 1
 samisoft.ir, 1
 samiysok.cf, 1
@@ -77319,9 +81632,12 @@
 samtalen.nl, 1
 samuel-brown.com, 1
 samuel-philipp.de, 1
+samuelbeckett.tk, 1
 samuelbramley.com, 1
 samuelcoles.co.uk, 1
+samueletoo.tk, 1
 samuelkeeley.com, 1
+samuelkyalo.tk, 1
 samuellaulhau.fr, 0
 samui-samui.de, 0
 samuidiving.net, 1
@@ -77340,6 +81656,7 @@
 sana-store.cz, 1
 sana-store.sk, 1
 sanalaile.tk, 1
+sanalsergi.com, 1
 sanantoniolocksmithinc.com, 1
 sanantoniolocksmithtx.com, 1
 sanantoniourologygroup.com, 1
@@ -77370,7 +81687,8 @@
 sandbox.mydigipass.com, 0
 sandboxstationchildcare.com, 1
 sandburner.net, 1
-sandelholzoel.de, 1
+sandeepjinagal.com, 1
+sandelduggal.com, 1
 sander.sh, 1
 sanderdorigo.nl, 1
 sanderkoenders.eu, 1
@@ -77386,6 +81704,7 @@
 sandiuno.ml, 1
 sandmanintel.com, 1
 sandmarc.cz, 1
+sandokan.tk, 1
 sandor.wtf, 1
 sandr0.tk, 1
 sandra-perlbach.de, 1
@@ -77393,6 +81712,7 @@
 sandrainden.nl, 1
 sandraindenfotografie.nl, 1
 sandramorrone.tk, 1
+sandras-hobbystueble.de, 1
 sandrinesite.tk, 1
 sandrolittke.de, 1
 sandrproperty.com, 1
@@ -77402,10 +81722,11 @@
 sandtohand.com, 1
 sandton-plumbing.co.za, 1
 sandtonescorts.com, 1
-sandtonplumber24-7.co.za, 1
 sandtonplumbing.co.za, 1
 sanduskycountyoh.gov, 1
+sandwichclub.tk, 1
 sandwichcouncil.tk, 1
+sandwoman.tk, 1
 sandyrobison.org, 1
 sandyrobsonhypnotherapy.co.uk, 1
 sanemind.de, 1
@@ -77416,6 +81737,7 @@
 sangiovannilipioni.tk, 1
 sangitafoodmess.com, 1
 sanglierhurlant.fr, 1
+sangoandmiroku.tk, 1
 sangobion.com, 0
 sangobion.com.my, 1
 sangowen.xyz, 1
@@ -77440,15 +81762,19 @@
 sanjosecolorectal.com, 1
 sanjosecostarica.org, 1
 sanjuandeabajo.tk, 1
+sanjuanerita.com, 1
 sanketsu.ml, 0
 sankovitzmediation.com, 1
 sanktpetriskole.dk, 1
+sanluisdequillota.tk, 1
+sanmarcovecchio.tk, 1
 sanmonjiya-kimono.com, 1
 sanmuding.com, 1
 sannefoltz.com, 1
 sannesfotklinikk.no, 1
 sannikfk.gq, 1
 sanodent.com.ua, 1
+sanogueiraazulejaria.com, 1
 sanogym.com, 1
 sanook69.com, 1
 sanooktiew.com, 0
@@ -77492,6 +81818,7 @@
 santimb.photos, 1
 santing.net, 1
 santippolito-borgo.tk, 1
+santjoandevilassar.tk, 1
 santmark.com, 1
 santmark.eu, 1
 santmark.fi, 1
@@ -77499,8 +81826,11 @@
 santmark.net, 1
 santmark.org, 1
 santo.fi, 1
+santong.tk, 1
+santoscarmelitas.tk, 1
 santoshpandit.com, 1
 santugon.tk, 1
+sanukarlos.tk, 1
 sanweb.info, 1
 sanych-msk.ru, 1
 saol.eu, 1
@@ -77521,6 +81851,8 @@
 sapibatam.com, 1
 sapien-ci.com, 1
 sapience.com, 1
+sapiensmedicus.org, 0
+sapienz.tk, 1
 sapienza-eclipse.com, 1
 sapienzaconsulting.com, 1
 sapindus.pl, 1
@@ -77540,6 +81872,7 @@
 sapuseven.com, 1
 saputra.org, 1
 saq.com, 0
+sarafanchiki.tk, 1
 sarafani.tk, 1
 sarafshop.tk, 1
 sarah-brown.tk, 1
@@ -77565,6 +81898,7 @@
 saratovlive.tk, 1
 saratovnews.ml, 1
 saratovtime.tk, 1
+sarayeirani.com, 1
 sarbash.ee, 1
 sard.ro, 1
 sardacompost.it, 1
@@ -77581,6 +81915,8 @@
 sarhua.tk, 1
 sarink.eu, 1
 sarjakuvakauppa.fi, 1
+sarkaribabu.in, 1
+sarkarijobindian.com, 1
 sarkarinaukriworld.net, 1
 sarkisianbuilders.com, 1
 sarmpel.tk, 1
@@ -77597,6 +81933,7 @@
 sartoria.roma.it, 1
 sarumtechnologies.com, 1
 sarv.com, 1
+sarvaappstage.com, 1
 sas-snowboarding.sk, 1
 sasakala.tk, 1
 sasapost.co, 1
@@ -77612,7 +81949,6 @@
 sashka.com.ua, 1
 sashleighaust.com, 1
 sasioglu.co.uk, 1
-saskadoodle.com, 1
 sasrobotics.xyz, 1
 sasroli.tk, 1
 sastd.com, 1
@@ -77623,9 +81959,13 @@
 satai.dk, 1
 satal.in, 1
 satania.moe, 1
+satanindito.tk, 1
 satanspowers.tk, 1
 satario.vn, 1
+satellite-equipment.tk, 1
 satellite-prof.com, 1
+satellite-shop.tk, 1
+satellite-top.com, 1
 satellites.hopto.me, 1
 satena.com, 1
 satimagingcorp.com, 1
@@ -77647,6 +81987,7 @@
 sattamatka420.mobi, 0
 sattaresult.in, 1
 sattaresult.net, 1
+saturdayenterprises.ga, 1
 satyamshivamsundaram.in, 1
 sauber.dk, 1
 saucelabs.com, 1
@@ -77678,6 +82019,7 @@
 sauvagebridge.nl, 1
 sauve-tes-euros.com, 1
 savaari.com, 1
+savage-harmony.tk, 1
 savagecore.eu, 1
 savageorgiev.com, 1
 savanna.io, 1
@@ -77687,7 +82029,7 @@
 savbus.com, 1
 savbus.net, 1
 savbus.ws, 1
-savchenko.net, 1
+savchenko.net, 0
 save-me-aachen.de, 1
 save-me-koeln.de, 1
 savebees.org, 1
@@ -77698,6 +82040,7 @@
 saveora.shop, 1
 savethedogfishfoundation.org, 1
 savetheinternet.eu, 1
+savetomp3.net, 1
 saveusfromavril.tk, 1
 savewildcats.eu, 1
 savewildcats.foundation, 1
@@ -77712,7 +82055,9 @@
 savingsbondwizard.gov, 1
 savingsoftheyear.com, 1
 savingsomegreen.com, 1
+savoir.fr, 1
 savonsuuntaporaus.fi, 1
+saw249.de, 1
 sawiday.at, 1
 sawiday.be, 1
 sawiday.com, 1
@@ -77741,13 +82086,14 @@
 saxotex.de, 1
 say-it-loud.com, 1
 saybecraft.ru, 1
+sayeghonline.com, 1
 saygoodbyetoie.com, 1
 sayilarmuhendislik.com, 1
 sayprepay.com, 1
 sayrodigital.com, 1
 says.lol, 1
 sayura.net, 1
-sayurstock.com, 1
+sayurstock.com, 0
 sayver22.com, 1
 saz.sh, 1
 sazuz.cz, 1
@@ -77782,7 +82128,9 @@
 sbm.cloud, 1
 sbmenedzsment.hu, 1
 sbmsitelist.tk, 1
+sbmt.cc, 1
 sbo-dresden.de, 1
+sbodewissel.tk, 1
 sborka.ml, 1
 sbox-servers.com, 1
 sbpropman.co.uk, 1
@@ -77797,11 +82145,11 @@
 sbytes.info, 1
 sc-artworks.co.uk, 0
 sc019.com, 1
+sc2pte.eu, 1
 sc5.jp, 1
 scabieslice.com, 1
 scaffalature.roma.it, 1
 scaffoldhireeastrand.co.za, 1
-scaffoldhirefourways.co.za, 1
 scaffoldhiremidrand.co.za, 1
 scaffoldhirerandburg.co.za, 1
 scaffoldhiresandton.co.za, 1
@@ -77836,15 +82184,20 @@
 scangeo.net, 1
 scanmailx.com, 1
 scanmy.email, 1
+scanpassword.com, 1
 scanpay.dk, 1
+scansearchtravel.com, 1
 scanutracker.com, 1
 scarabcoder.com, 1
 scaracloud.ddns.net, 1
+scarafaggio.it, 1
 scarboroughscrapcars.com, 1
+scaricamusica.tk, 1
 scarinex.tk, 1
 scartazzini.com, 1
 scatgirls.net, 1
 scatsbouncingcastles.ie, 1
+scatteredcode.net, 1
 scatters.com, 1
 scatterscasino.com, 1
 scavalentenx.duckdns.org, 1
@@ -77873,11 +82226,9 @@
 sch44r0n.de, 1
 schaafenstrasse.koeln, 1
 schachburg.de, 1
-schachtelhalm-tee.de, 1
 schack.dk, 1
 schadevergoedingen.eu, 1
 schaffensdrang.at, 1
-schafgarbe-tee.de, 1
 schallert.com, 0
 schambereich.org, 1
 schamlosharmlos.de, 1
@@ -77885,11 +82236,11 @@
 schastie.ml, 1
 schat.top, 1
 schatzibaers.de, 1
+schauraum.tk, 1
 schausteller.de, 1
 schawe.me, 1
 schbebtv.fr, 1
 scheduleme.io, 1
-scheemadigital.com, 1
 scheervergelijker.nl, 1
 schefczyk.com, 1
 schefczyk.de, 1
@@ -77906,6 +82257,8 @@
 schellenberger.biz, 1
 schellevis.net, 0
 schemingmind.com, 1
+schenkel.tk, 1
+schenkelimoveis.com.br, 1
 schenkes.de, 0
 scherfke.de, 1
 schermkapot.nl, 1
@@ -77923,19 +82276,20 @@
 schipholwatch.nl, 1
 schippendale.de, 1
 schippers-it.nl, 1
+schirmer.io, 1
 schizoids.net, 1
 schizomatrix.tk, 1
 schlachter.ca, 1
 schlaf.guru, 1
 schlafteq.com, 1
-schlagenhauf.info, 1
+schlagenhauf.info, 0
 schlagma.de, 0
 schlarb.eu, 1
 schlarp.com, 1
 schlechtewitze.com, 1
 schleifenbaum.org, 1
-schlick.network, 1
 schlick.wedding, 1
+schlitzbergers.com, 1
 schlossereieder.at, 1
 schlossfuchs.de, 1
 schluesseldienst-berlin.de, 1
@@ -77950,6 +82304,7 @@
 schmitt-etienne.fr, 1
 schmitt-max.com, 1
 schmitt.ws, 0
+schmitzvertalingen.nl, 1
 schmuggelware.de, 0
 schnapke.name, 1
 schnaube.de, 1
@@ -77986,6 +82341,7 @@
 scholarnet.cn, 1
 scholarsclub.club, 1
 scholarships.link, 1
+scholarships.tech, 1
 scholarstyle.com, 0
 scholenlijst.tk, 1
 scholieren.com, 1
@@ -77996,12 +82352,13 @@
 scholz-kallies.de, 1
 schonstedt.com, 1
 schont.org, 1
+schonversichert.tk, 1
 school-22.tk, 1
 school-27-lpr.tk, 1
 school-33.tk, 1
 school-adventures.tk, 1
 school-project.tk, 1
-school-register.co.za, 1
+school-register.co.za, 0
 school.in.th, 1
 school16-tob.tk, 1
 school173.tk, 1
@@ -78009,6 +82366,8 @@
 school43.tk, 1
 schoolantwoorden.tk, 1
 schoolbuddy.ch, 1
+schoolbytes.com.au, 1
+schoolbytes.education, 1
 schoolcafe.com, 1
 schooldatasquad.com, 1
 schoolheads.ph, 1
@@ -78024,7 +82383,7 @@
 schorel.eu, 1
 schorel.ovh, 1
 schorelweb.nl, 1
-schorers.org, 1
+schorers.org, 0
 schottenland.de, 1
 schoutenseo.com, 1
 schrader-institute.de, 1
@@ -78035,6 +82394,7 @@
 schrauger.run, 1
 schraugerrun.com, 1
 schreibers.ca, 1
+schreilechner.tk, 1
 schreinerei-jahreis.de, 1
 schreinerei-schweikl.de, 1
 schreinerei-schwenk.com, 1
@@ -78047,17 +82407,18 @@
 schrok.eu, 1
 schrolm.de, 1
 schsrch.org, 1
-schsrch.xyz, 1
 schtiehve.duckdns.org, 1
 schu.be, 1
 schubergphilis.com, 1
 schubertgmbh-ingelheim.de, 1
+schubertnest.at, 1
 schuelerzeitung-ideenlos.de, 1
 schuetzen-ehrenbreitstein.de, 1
 schuhbeck.tk, 1
 schuhbedarf.de, 1
 schuhwerkstatt.at, 1
 schuhzoo.de, 1
+schulden.tk, 1
 schulderinsky.de, 1
 schule.wtf, 1
 schuler.st, 1
@@ -78112,7 +82473,9 @@
 sciencebase.gov, 1
 scienceminnesota.com, 1
 sciencemonster.co.uk, 1
+sciencenews.gq, 1
 scienceofpeople.com, 0
+sciences-world.com, 1
 sciencesolutions.eu, 1
 sciencetechworld.tk, 1
 sciencetram.tk, 1
@@ -78120,6 +82483,7 @@
 sciencex.com, 1
 scientia.ga, 1
 scientific-socialism.cf, 1
+scientificallytalking.com, 1
 scientificwomen.net, 1
 scif.com, 1
 scifplus.com, 1
@@ -78150,14 +82514,15 @@
 scooter-experts.com, 1
 scooterinaustralia.tk, 1
 scooterservis.com, 1
+scootertechnofrance.tk, 1
 scootfleet.com, 1
 scope.studio, 1
 scopea.fr, 0
 scorb.com.br, 1
-scoresensei.com, 0
 scorobudem.ru, 1
 scorp13.com, 1
 scorpioncomputers.nl, 1
+scorpions.tk, 1
 scott.cm, 1
 scott.st, 1
 scottainslie.me.uk, 1
@@ -78183,7 +82548,9 @@
 scottseditaacting.com, 1
 scottshorter.com.au, 1
 scottspainting.com, 1
+scottyspot.tk, 1
 scour.cc, 1
+scourgesofcarpathia.tk, 1
 scoutbee.com, 1
 scoutbee.io, 1
 scouting-kontiki.nl, 1
@@ -78238,7 +82605,6 @@
 screenfox.eu, 1
 screenfox.info, 1
 screenfox.net, 1
-screenlight.tv, 1
 screenmachine.com, 1
 screenpublisher.com, 1
 screensizemap.com, 1
@@ -78255,7 +82621,7 @@
 scriptolab.com, 1
 scriptomania.tk, 1
 scriptslug.com, 1
-scriptum.gr, 1
+scriptsrus.tk, 1
 scrod.me, 1
 scroll-to-top-button.com, 1
 scroll.in, 1
@@ -78269,12 +82635,14 @@
 scryfall.com, 1
 scs-simulatoren.de, 1
 scsd.si, 1
+scstg.net, 1
 scswam.com, 0
 sctiger.me, 1
 sctiger.men, 1
 sctiger.ml, 1
 sctm.at, 1
 sctrainingllc.com, 1
+scubadavediving.com, 1
 scubadiving-phuket.com, 1
 scubaland.hu, 1
 scul.net, 1
@@ -78294,19 +82662,24 @@
 scwildflours.com, 1
 scwilliams.co.uk, 1
 scwilliams.uk, 1
+scylla.live, 1
 sd.af, 1
 sd4u.be, 1
 sda.one, 1
+sdare.ru, 1
 sdcardrecovery.de, 1
 sdebitati.it, 1
-sdelatmrt.spb.ru, 1
 sdeu.fr, 1
+sdfamilycare.org, 1
 sdg-tracker.org, 1
 sdgllc.com, 1
 sdguitdagingen.be, 1
 sdguitdagingen.gent, 1
 sdhb.cz, 1
+sdhb.eu, 1
 sdhblatnice.cz, 1
+sdhblatnice.eu, 1
+sdhda.org, 1
 sdho.org, 1
 sdipolanight.co.uk, 1
 sdis-trib.fr, 1
@@ -78318,6 +82691,7 @@
 sdsi.us, 1
 sdsite.tk, 1
 sdsk.one, 1
+sdsmanagement.me, 0
 sdsmt.engineering, 1
 sduconnect.nl, 1
 sduoxminty.cn, 1
@@ -78338,7 +82712,6 @@
 seabehind.me, 1
 seabooty.com, 1
 seabrooklocksmith.com, 1
-seac.me, 1
 seachef.it, 1
 seadrive.cc, 1
 seadus.ee, 1
@@ -78352,6 +82725,7 @@
 seamoo.se, 1
 sean-wright.com, 1
 seanchaidh.org, 1
+seanchristian.tk, 1
 seandawson.info, 1
 seanholcroft.co.uk, 1
 seankilgarriff.com, 1
@@ -78366,6 +82740,7 @@
 search.gov, 1
 search.yahoo.com, 0
 searchable.ml, 1
+searchandfilter.com, 1
 searchcandy.nl, 1
 searchcandy.uk, 1
 searchdatalogy.com, 1
@@ -78395,6 +82770,7 @@
 season.moe, 1
 seasons-vintage.com, 1
 seasons.nu, 0
+seaspiration.com, 1
 seatbeltpledge.com, 1
 seatinglane2u.com, 1
 seatsurfing.de, 1
@@ -78411,7 +82787,6 @@
 seaview.gq, 1
 seaviewkohchang.com, 1
 seb-mgl.de, 1
-seb-net.com, 1
 seb8iaan.com, 1
 sebald.com, 1
 sebald.org, 1
@@ -78438,6 +82813,7 @@
 sebastiaperis.com, 1
 sebastien-meric.com, 1
 sebasveeke.nl, 1
+sebeobrana.ml, 1
 sebepoznani.eu, 1
 seberova.cz, 1
 sebi.org, 1
@@ -78481,6 +82857,7 @@
 secondmileservice.com, 1
 secondnature.bio, 1
 seconfig.sytes.net, 1
+secong.tk, 1
 secopsolution.com, 1
 secoseal.de, 1
 secpatrol.de, 1
@@ -78491,6 +82868,7 @@
 secretagentclub.tk, 1
 secretar.is, 1
 secretary-schools.com, 1
+secretdeals.ga, 1
 secrethub.io, 1
 secretimports.com.br, 1
 secretmolodosti.ga, 1
@@ -78518,12 +82896,12 @@
 sectest.ml, 1
 secthirty.com, 1
 sectio-aurea.org, 1
-section-31.org, 1
 section.io, 1
 section215.com, 1
 section77.de, 1
 sector.zone, 1
 sector5.xyz, 1
+sectrans.tk, 1
 sectun.com, 1
 secumailer.com, 1
 secumailer.nl, 1
@@ -78541,7 +82919,6 @@
 secure.facebook.com, 0
 securecheck360.com, 1
 securecloudplatform.nl, 1
-securecomms.cz, 1
 secureddocumentshredding.com, 1
 securedrop.org, 1
 secureenduserconnection.se, 1
@@ -78549,6 +82926,7 @@
 securefiletransfer.nl, 1
 securegovernment.us, 1
 secureheaders.com, 1
+securehealth.care, 1
 securehugs.com, 1
 secureim.de, 1
 secureinfo.pl, 1
@@ -78597,7 +82975,7 @@
 securitybrief.com.au, 1
 securitybrief.eu, 1
 securitybsides.pl, 0
-securitydriver.com, 1
+securitydriver.com, 0
 securityescrownews.com, 1
 securityfest.com, 1
 securitygladiators.com, 1
@@ -78625,13 +83003,15 @@
 securocloud.com, 1
 securon.io, 1
 securoswiss.ch, 1
+securot.eu, 1
 securview.ch, 0
 secutorcloud.com, 1
 secutrans.com, 1
 secuvera.de, 0
 secvault.io, 0
 secwall.me, 1
-secyourity.se, 0
+secyourity.se, 1
+sedico.mx, 1
 sedirector.net, 1
 seditious.games, 1
 sedlakovalegal.com, 1
@@ -78649,8 +83029,10 @@
 seedisclaimers.com, 1
 seedno.de, 1
 seednode.co, 1
+seedspark.com, 1
 seehimnaked.com, 0
 seehisnudes.com, 0
+seeinred.tk, 1
 seeker.co.za, 1
 seekfirstthekingdom.ca, 1
 seeks.ru, 1
@@ -78695,10 +83077,12 @@
 seguridadconsumidor.gov, 1
 seguridadsistem.tech, 1
 seguridadsistemtienda.tech, 1
+seguridadyredes.tk, 1
 segurosmaurobracchieri.com, 1
 segurosocial.gov, 0
 segurosproteccion.com, 1
 seguroviagem.srv.br, 0
+sehat-solusi-makmur.com, 1
 sehd.top, 1
 sehnenweh.org, 1
 sei-yu.net, 1
@@ -78710,12 +83094,15 @@
 seifried.org, 1
 seikatu-navi.com, 1
 seiko-dojo.com, 1
+seilgold.de, 1
 seincojavea.es, 1
 seinfeldquote.com, 1
 seira.tk, 1
+seirdy.one, 1
 seirei.ne.jp, 1
 seiryokuzai-ch.com, 1
 seisansei.net, 1
+seishinan.xyz, 1
 seishinchuo-lawoffice.com, 1
 seismas1.com, 1
 seitai-nabejun.jp, 1
@@ -78767,6 +83154,8 @@
 self-signed.com, 1
 selfassess.govt.nz, 1
 selfbattery.ga, 1
+selfcaregate.com, 1
+selfdevelopment.com.au, 1
 selfemployed.ga, 1
 selfhosted.eu, 1
 selfici.com, 1
@@ -78778,10 +83167,12 @@
 selfrealize.ga, 1
 selfretire.cf, 1
 selfserverx.com, 0
+selftech.tk, 1
 selfycheck.it, 1
 selimcerkezi.tk, 1
 selkiemckatrick.com, 1
 sellajoch.com, 1
+sellbit.io, 1
 sellcoins.top, 1
 selldorado.com, 1
 selldurango.com, 1
@@ -78810,20 +83201,19 @@
 sembyotic.com, 1
 semenov.ml, 1
 semenov.su, 1
-semenserang.com, 1
 sementes.gratis, 1
 semesur.com, 1
 semianalog.com, 1
 semicvetik.tk, 1
 semillainfinita.com, 1
 semillasdelucha.com, 1
-seminariosvip.com, 1
 seminariruum.ee, 1
 seminarraum-isny.de, 1
 seminolecountyoklahoma.gov, 1
 semiocast.com, 1
 semiotical.com, 0
 semiotika.tk, 1
+semira.tk, 1
 semiread.com, 1
 semiretire.ga, 1
 semiweb.ca, 1
@@ -78832,9 +83222,11 @@
 semops.gq, 1
 semox.de, 1
 semplicementelight.com, 1
+sempoctet.ca, 1
 semps-2fa.de, 1
 semps-threema.de, 1
 semps.de, 1
+semrush.com, 1
 semsec.net, 1
 semtinde.com, 1
 semyonov.su, 1
@@ -78866,6 +83258,7 @@
 senditvia.email, 1
 sendmeback.de, 0
 sendonce.io, 1
+sendpulse.com, 1
 sendthisfile.com, 1
 sendtrix.nl, 1
 sendway.com, 1
@@ -78874,11 +83267,9 @@
 senekalstorageman.co.za, 1
 senergiya.tk, 1
 senergyconsultants.com, 1
-senfcall.de, 1
 senhorst.com, 1
 senhost.tk, 1
 senior-sigan.ml, 1
-senior2senior.org, 1
 seniorem.eu, 1
 seniorhomexchange.com, 1
 seniorhost.net, 1
@@ -78900,6 +83291,7 @@
 sensebridge.net, 1
 senseful-online.eu, 0
 senseful-online.info, 1
+senseiclassroom.tk, 1
 senseict.com.au, 1
 sensepixel.com, 1
 senshot.com, 1
@@ -78924,21 +83316,22 @@
 sentiments.io, 1
 sentinel.gov, 1
 sentinelnet.tk, 1
+sentinelpeakmedia.com, 1
 sentinelproject.io, 1
 sentirmebien.org, 1
 sentitvia.email, 1
 sentmail.ga, 1
+sentrafield.com, 1
 sentry.io, 1
 sentry.nu, 1
 sentrybay.com, 1
 sentworks.com, 1
-senu.pro, 1
 senzaparole.de, 1
 seo-analyse.com, 1
 seo-blog12.tk, 1
 seo-dr-it.com, 0
 seo-en-barcelona.es, 1
-seo-forum.nu, 1
+seo-forum.nu, 0
 seo-linz.at, 1
 seo-obmen.tk, 1
 seo-phpbb.cf, 1
@@ -78970,13 +83363,11 @@
 seoenmexico.com.mx, 1
 seoexpert.com.br, 1
 seogeek.nl, 1
-seogo.com.br, 1
 seogood.cf, 1
 seohackers.fr, 1
 seohouston.com, 1
 seoified.com, 1
 seoinc.com, 1
-seoium.com, 1
 seojames.com, 1
 seokatka.tk, 1
 seolabuitest.azurewebsites.net, 1
@@ -78989,6 +83380,7 @@
 seomarketing.bg, 1
 seomaton.com, 1
 seomaton.org, 1
+seomaxion.com, 1
 seomen.biz, 1
 seomik.dk, 1
 seon.me, 1
@@ -79016,17 +83408,20 @@
 seosprint.gq, 1
 seostrit.cf, 1
 seoteam.tk, 1
+seotip.top, 1
 seotoolset.tk, 1
-seoulista.vn, 1
+seoulartcollective.tk, 1
 seovision.se, 1
 seovisits.tk, 1
 seoviziti50.tk, 1
 seowebexpert.co.uk, 0
 seowerkz.com, 1
+seowordpress.pl, 1
 seowork.tk, 1
 seoz.com.au, 1
 seozel.tk, 1
 sepakbola.id, 1
+sepenggal.info, 1
 seproco.com, 0
 septakkordeon.de, 1
 septentrionalist.org, 1
@@ -79056,6 +83451,7 @@
 serele.fr, 1
 serenaden.at, 1
 serenascreations.com, 1
+serenata.tk, 1
 serenavilage.net, 1
 serenavillage.net, 1
 serenavillageresidence.com, 1
@@ -79063,6 +83459,8 @@
 serenitygwinnett.com, 1
 serf.io, 1
 serfas.gr, 1
+sergal.club, 1
+sergal.de, 1
 sergal.gay, 1
 serge-design.ch, 1
 sergeemond.ca, 1
@@ -79086,7 +83484,6 @@
 seriousclimbing.com, 1
 seriouss.am, 1
 serkanceyhan.com, 1
-serkaneles.com, 1
 serkanyarbas.com, 1
 serkanyarbas.com.tr, 1
 sermasvital.com, 1
@@ -79096,6 +83493,7 @@
 serpenteq.com, 1
 serphost.ml, 1
 serpic.photo, 1
+serptoolsuite.com, 1
 serrande.roma.it, 1
 serrano-chris.ch, 0
 serrature.roma.it, 1
@@ -79104,7 +83502,6 @@
 sertasimmons.com, 1
 sertkayagroup.com, 1
 seru.eu, 1
-servcom.net.au, 1
 serve-a.com.au, 1
 serve.work, 1
 servea.com.au, 1
@@ -79128,7 +83525,6 @@
 serverd.de, 1
 serverdensity.io, 1
 serverexpose.com, 1
-serverfile.ml, 1
 serverfix.net, 1
 serverfrog.de, 1
 serverhost.no, 1
@@ -79148,23 +83544,28 @@
 serversuit.com, 1
 servertastic.com, 1
 servertutorial.eu, 1
+serveru.us, 1
 servetten-groothandel.nl, 1
 serveur.nl, 1
 serveursminecraft.org, 1
 servfefe.com, 1
 servgate.jp, 1
 servi-tek.net, 1
+service-centre.cf, 1
 service-wueste-vodafone.tk, 1
 service.gov.uk, 1
 serviceair.com.ar, 1
 servicebeaute.fr, 1
 serviceboss.de, 1
+serviceflow.co.za, 1
 serviceinconstanta.ro, 1
 servicemagicusa.com, 1
+servicemaxgreencleaning.com, 1
 servicemembers.gov, 1
 serviceparts.nl, 1
 serviceslotenmaker.nl, 0
 servicestechnologiquesam.ca, 1
+servicesurgence24h.ca, 1
 servicevie.com, 1
 serviciales.com, 1
 servicii-funerare.tk, 1
@@ -79180,6 +83581,8 @@
 servilletas-de-papel.es, 1
 servilletas-de-papel.mx, 1
 servingbaby.com, 1
+servingroddick.tk, 1
+servingupsouthern.com, 1
 servis-azd.cz, 1
 servisna.com, 1
 servispocitacov.com, 1
@@ -79246,10 +83649,14 @@
 seutens.be, 1
 seutens.eu, 1
 seva.fashion, 1
+sevasmos.gr, 1
 sevastopol.tk, 1
 sevathian.com, 1
 seve7.com.br, 1
+seveiller-simplement.fr, 1
 seven-purple.com, 1
+seven-seas.ml, 1
+seven.social, 1
 sevenartzpublicidad.com, 1
 sevenhillsapartments.com.au, 1
 sevenicealimentos.com.br, 1
@@ -79257,9 +83664,11 @@
 seventwentynine.com, 1
 sevenwizes.com, 1
 severine-trousselard.com, 1
+severing.cf, 1
 severntrentinsuranceportal.com, 1
 sevilinux.es, 1
 sevillalinces.tk, 1
+sevillanazarena.tk, 1
 sevinci.ch, 1
 sevocomm.com, 1
 sevsey.ru, 1
@@ -79267,7 +83676,7 @@
 sewa.nu, 1
 sewafineseam.com, 1
 sewamobilperdana.com, 0
-sewatec.com, 0
+sewatec.com, 1
 sewavillamurah.tk, 1
 sewfarsewgood.co.uk, 1
 sewfarsewgood.uk, 1
@@ -79277,17 +83686,19 @@
 sewoo.co.uk, 1
 seworld.ml, 1
 sex-education.com, 1
+sex-sex-cam.com, 1
 sex5.com, 1
 sexaki.com, 1
+sexandthecitty.tk, 1
 sexar.info, 1
 sexara.co, 1
 sexdocka.nu, 1
 sexedquickies.com, 1
 sexedrescue.com, 1
-sexfactory.es, 1
 sexflare.net, 1
 sexgarage.de, 1
 sexhab.guru, 1
+sexi-model.ru, 1
 sexlounge.pw, 1
 sexminister.tk, 1
 sexmobil.de, 1
@@ -79296,10 +83707,14 @@
 sexonv.mobi, 1
 sexoyrelax.com, 1
 sexpay.net, 1
+sexpdf.com, 1
+sexruby.com, 1
 sexshopfacil.com.br, 1
 sexshopnet.com.br, 1
+sexswing.com, 1
 sextacy.tk, 1
 sextop.net, 1
+sextoysproductstore.com, 1
 sextreffendeutschland.com, 1
 sexualdiversity.org, 1
 sexvideos.tel, 1
@@ -79313,6 +83728,7 @@
 seyr.me, 1
 seyrederiz.com, 1
 seyv.io, 1
+sezon.ua, 1
 sf3223.com, 1
 sfa.sk, 1
 sfaparish.org, 1
@@ -79348,13 +83764,11 @@
 sgcy.vip, 0
 sgdementia.ca, 1
 sggame990.com, 1
-sgh.ovh, 1
 sgi.org, 1
 sgitc.de, 1
 sgj0.net, 1
 sglazov.ru, 1
 sglibellen.de, 1
-sglorch.me, 0
 sgombero.it, 1
 sgrmreproduccionapp.azurewebsites.net, 1
 sgrossi.it, 1
@@ -79373,7 +83787,6 @@
 sgutranscripts.org, 1
 sh-heppelmann.de, 1
 sh-network.de, 1
-sh.com.tr, 1
 sh0rt.in, 1
 sh0rt.zone, 1
 sh0uld.net, 1
@@ -79382,8 +83795,11 @@
 sh68.cc, 1
 sha.bi, 1
 sha2017.org, 1
+sha512.online, 1
 shaadithailand.com, 1
+shabashka.ml, 1
 shabiwangyou.com, 1
+shacall.com, 1
 shad.waw.pl, 1
 shade.cash, 1
 shadedesign.cz, 1
@@ -79397,10 +83813,12 @@
 shadowcp.eu, 1
 shadowdomain.ml, 1
 shadowfight2.tk, 1
+shadowfox.tk, 1
 shadowkingdomrecords.com, 1
 shadowkitsune.net, 1
 shadowlurker.com.au, 1
 shadowmorph.info, 1
+shadownet.tk, 1
 shadowping.com, 1
 shadowplus.net, 1
 shadowrocket.net, 1
@@ -79415,6 +83833,7 @@
 shadowsocks.software, 1
 shadowsocks.to, 1
 shadowsproject.ru, 1
+shadowstalkers.tk, 1
 shadowvolt.net, 1
 shadwe.com, 1
 shadynook.net, 1
@@ -79426,7 +83845,7 @@
 shahidafkar.tk, 1
 shahidfakih.com, 1
 shahidhashmi.net, 1
-shahinclub.com, 1
+shahinclub.com, 0
 shahpurjat.xyz, 1
 shahrsazan.tk, 1
 shahrvand.ga, 1
@@ -79436,7 +83855,7 @@
 shaimensonline.com, 1
 shainessim.com, 1
 shaitan.eu, 1
-shaiyaevolved.com, 1
+shajiangchang.cn, 1
 shakalaka.co.za, 1
 shakan.ch, 0
 shaken-kyoto.jp, 1
@@ -79445,6 +83864,7 @@
 shakespeareans.net, 1
 shakespearesolutions.com.au, 0
 shakespearevet.com, 1
+shakesprimer.tk, 1
 shakingthehabitual.com, 1
 shaknews.tk, 1
 shakthifacility.com, 1
@@ -79473,6 +83893,7 @@
 shanhay.tk, 1
 shanju.tk, 1
 shankangke.com, 1
+shanli.tk, 1
 shannapeeples.com, 1
 shanoviyam.in, 1
 shansen-online.de, 1
@@ -79494,9 +83915,11 @@
 sharanyamunsi.net, 1
 shard.vc, 1
 share-io.com, 1
-share-links.eu, 1
+share.la, 1
 share2act-dev.io, 1
 share2act-test.io, 1
+share2x.com, 1
+share4brain.org, 1
 shareasale-analytics.com, 1
 sharebee.space, 1
 sharebot.ga, 1
@@ -79509,6 +83932,7 @@
 shareiva.com, 1
 sharejoy.cn, 0
 sharekey.com, 0
+sharelinks.tk, 1
 sharelovenotsecrets.com, 1
 sharemessage.net, 1
 sharenergy.com.br, 1
@@ -79550,15 +83974,18 @@
 sharu.me, 1
 sharvey.ca, 1
 shashlik.tk, 1
+shaumine.ml, 1
 shaun.net, 1
 shaunallen.co.uk, 1
 shaunandamyswedding.com, 1
 shaunc.com, 1
 shaundanielz.com, 1
+shavegazette.com, 1
 shavingks.com, 1
 shavit.space, 1
 shawcentral.ca, 0
 shawclan.id.au, 1
+shawfactor.com, 1
 shawfamily.id.au, 1
 shawiah.tk, 1
 shawnalucey.com, 1
@@ -79566,7 +83993,6 @@
 shawnhogan.com, 1
 shawnow.com, 1
 shawnwilkerson.com, 1
-shawnwilson.info, 1
 shawnz.org, 1
 shawty.tk, 1
 shaytan.tk, 1
@@ -79575,6 +84001,7 @@
 shazzlepro.com, 1
 shc.gov.sa, 1
 shcode.de, 1
+shd.one, 1
 shdw.cc, 1
 she.run, 0
 she.tw, 1
@@ -79582,7 +84009,6 @@
 shearcomfort.com, 1
 shearin.pro, 1
 shearwaterdental.com, 1
-sheaspire.com, 1
 shechipin.cf, 1
 shechipin.ga, 1
 shechipin.gq, 1
@@ -79638,12 +84064,12 @@
 shemsconseils.ma, 1
 shemsharples.co.uk, 1
 shena.co.uk, 1
+shenannigans.tk, 1
 shenderman.ml, 1
 shenghaiautoparts.com, 1
 shengrenyu.com, 1
-shenming.net, 0
-shenol.info, 1
 shenpei.net, 1
+shenqi.com, 1
 shens.ai, 1
 shentengtu.idv.tw, 1
 shepherdsfriendly.co.uk, 1
@@ -79663,9 +84089,12 @@
 sherrikelley.com, 1
 sherut.net, 1
 shethbox.com, 1
+shevans.com, 1
 shevelev.design, 1
 shevet-achim.tk, 1
+sheweek.ml, 1
 shft.cl, 1
+shfzzz.org, 1
 shg-pornographieabhaengigkeit.de, 0
 shgroup.xyz, 1
 shgt.jp, 1
@@ -79693,13 +84122,13 @@
 shiftdevices.com, 1
 shiftj.is, 1
 shiftleft.org, 1
-shiftpsych.com, 0
 shiftsixth.com, 1
 shiga1.jp, 1
 shigaben.or.jp, 1
 shiganmartialarts.com, 1
 shigotoba.com, 1
 shih-tzu-dogs.com, 1
+shihabuddin.tk, 1
 shihadwiki.com, 1
 shiji.info, 1
 shijij.com, 1
@@ -79718,6 +84147,7 @@
 shin-yo.de, 1
 shincastella.com, 1
 shindocuba.tk, 1
+shineleds.ga, 1
 shines.ml, 1
 shinetsuamerica.com, 1
 shinetsusilicones.com, 1
@@ -79725,6 +84155,7 @@
 shinglereplacementlv.com, 1
 shinice.net, 1
 shining.gifts, 1
+shiningbright.co.id, 1
 shinko-osaka.jp, 1
 shinnyosangha.org, 0
 shinobayderm.com, 1
@@ -79753,6 +84184,7 @@
 shipping24h.com, 0
 shippingbo.com, 1
 shippinglabel.de, 1
+shiptek.co, 1
 shiqi.ca, 1
 shiqi.lol, 1
 shiqi.one, 1
@@ -79783,12 +84215,12 @@
 shirtsofholland.com, 1
 shishadenbosch.nl, 1
 shishamania.de, 1
-shishkin.us, 0
 shishlik.net, 1
 shit.software, 1
 shitagi-shop.com, 1
 shitbeast.institute, 1
 shitcountries.org, 1
+shitdick.tk, 1
 shitmybradsays.com, 0
 shitnikovo.tk, 1
 shitposter.io, 1
@@ -79805,6 +84237,7 @@
 shivamohanam.com, 1
 shivering-isles.com, 1
 shivkrupanandfoundation.org, 1
+shivyogphysiotherapy.in, 1
 shixuen.com, 1
 shiyouqkl.com, 1
 shkolladigjitale.com, 1
@@ -79819,31 +84252,39 @@
 shlmail.info, 1
 shlupka.ml, 1
 shlupka.tk, 1
+shlyapa-com.tk, 1
+shlyhi.tk, 1
 shmotki.ml, 1
+shmulvad.com, 1
 shoarq.com, 1
+shochikubai.tk, 1
 shock.ee, 1
 shockercityservices.com, 1
 shockerdragon.tk, 1
 shockproof.systems, 1
 shodan.io, 1
-shodanian.com, 1
 shoejitsu.co, 1
 shoemakerywc.com, 1
 shoeracks.uk, 1
 shoes4gentlemen.de, 1
 shoesoutlet.tk, 1
+shoestorebiz.tk, 1
+shoestorenet.tk, 1
 shoestringeventing.co.uk, 1
 shokofarehab.ir, 1
 shokureach.jp, 1
 shola.ga, 1
 sholtowu.com, 1
+shontakleinpeter.tk, 1
 shooba.net, 1
 shoobacreations.com, 1
 shooter.dog, 1
 shootpooloklahoma.com, 1
 shop-cosmetic.tk, 1
+shop-cosmetics.tk, 1
 shop-eldorado.tk, 1
 shop-hellsheadbangers.com, 1
+shop-lingerie.tk, 1
 shop-links.co, 1
 shop-s.net, 1
 shop-slivki.tk, 1
@@ -79864,16 +84305,20 @@
 shopandworld.net, 1
 shopapi.cz, 1
 shoparbonne.co.uk, 1
+shopasa.de, 1
 shopatkei.com, 1
 shopazmoon.ir, 1
 shopbabymonitors.gq, 1
 shopbakersnook.com, 1
 shopcceputnam.com, 1
+shopcom.tk, 1
 shopcon.vn, 1
 shopcoupons.co.id, 1
 shopcoupons.my, 1
 shopcoupons.ph, 1
 shopcoupons.sg, 1
+shopcrocs.in, 1
+shopee6.com, 1
 shopexo.in, 1
 shopfazz.com, 1
 shopfinale.com, 1
@@ -79892,6 +84337,8 @@
 shopmalinka.cf, 1
 shopminut.com, 1
 shopmonitor.tech, 1
+shopocratic.com, 1
+shopofturkey.com, 1
 shoponlinedeals.tk, 1
 shoposal.com, 1
 shoppencph.dk, 1
@@ -79914,12 +84361,14 @@
 shopteq.hu, 1
 shoptio.cz, 1
 shoptupperware.in, 1
+shopunderwear.tk, 1
 shopunilever.com, 1
 shopwebhue.com, 1
 shore.co.il, 1
 shorebreaksecurity.com, 1
 shorehamfort.co.uk, 1
 shorewoodmn.gov, 1
+shorinkarate.tk, 1
 short-games.gq, 1
 short-term-plans.com, 1
 short.io, 1
@@ -79935,6 +84384,7 @@
 shorten.ninja, 1
 shortr.li, 1
 shortshadows.band, 1
+shoruihokan.com, 1
 shoshin-aikido.de, 1
 shoshin.technology, 1
 shossain.tk, 1
@@ -79965,8 +84415,8 @@
 showgirls.ga, 1
 showmax.com, 1
 showmeengland.co.uk, 1
-showmethemoney.ru, 1
 shownet.tk, 1
+showno.me, 1
 showpassword.net, 0
 showroom.co.uk, 1
 showroom.de, 0
@@ -79989,10 +84439,12 @@
 shreyansh26.me, 1
 shrike.me, 0
 shrimpcam.pw, 1
+shrines.ga, 1
 shrines.tk, 1
 shrinidhiclinic.in, 1
 shrinker.tk, 1
 shrinkhub.com, 1
+shrovetide.tv, 1
 shrsl.com, 1
 shrt.tv, 1
 shrturl.io, 1
@@ -80000,6 +84452,7 @@
 shrug.ml, 0
 shsh.host, 1
 shssl.vip, 1
+sht-vr-player.cf, 1
 sht.life, 1
 shtaiman.com, 1
 shtaiman.net, 1
@@ -80015,6 +84468,8 @@
 shuang.us, 1
 shuax.com, 1
 shucheng.li, 1
+shufflecube.tk, 1
+shufflemix.tk, 1
 shuffleradio.nl, 1
 shuffleware.tk, 1
 shuftipro.com, 1
@@ -80023,17 +84478,21 @@
 shuhacksoc.co.uk, 1
 shui.ga, 1
 shulan.moe, 1
+shuletime.ml, 1
 shulker.store, 1
 shulman.tk, 1
 shumnyj-istochnik.tk, 1
 shunliandongli.cn, 1
 shunliandongli.com, 1
 shunmei-hari.com, 1
-shuo.li, 1
+shunter.tk, 1
+shunzi.tk, 1
+shuo.li, 0
 shuomingshu88.com, 1
 shura.eu.org, 1
 shurita.org, 1
 shuset.dk, 1
+shuttelservices.nl, 1
 shutter-shower.com, 1
 shutterstreetblog.com, 1
 shutupbabyiknowit.party, 1
@@ -80070,6 +84529,7 @@
 siberiactiva.com, 1
 siberiancatsinformation.com, 1
 siberianhuskypets.com, 1
+siberianhuskytraining.net, 1
 siberkulupler.com, 1
 sibernet.tk, 1
 sibertakvim.com, 0
@@ -80079,6 +84539,7 @@
 siccardisport.it, 1
 sice-si.org, 1
 sich-fight.club, 1
+sich-positionieren.net, 1
 sichuang30019.com, 1
 siciliadisinfestazioni.it, 1
 siciliamconsulting.com, 1
@@ -80093,7 +84554,6 @@
 sicurezzalavoro24.com, 1
 sicurled.com, 1
 sicz.de, 1
-sid-giessen.de, 1
 siddigsami.com, 1
 sidecredit.ga, 1
 sideleau.com, 1
@@ -80125,6 +84585,7 @@
 siel.nl, 1
 sielsystems.nl, 1
 siemens.co.uk, 1
+siemens.de, 1
 sientemendoza.com.ar, 1
 siepomaga.net, 1
 sierpinska.co, 1
@@ -80133,8 +84594,8 @@
 sierramusic.tk, 1
 sietejefes.com.ar, 1
 sieulog.com, 1
-sieuthithangmay.com, 1
 sifasharing.tk, 1
+sifecs.ml, 1
 sift-tool.org, 0
 sift.com, 1
 sifuondemand.com, 1
@@ -80143,9 +84604,11 @@
 sigabrt.org, 1
 sigcafe.net, 1
 siggi.io, 1
+sight-restoration.tk, 1
 sight-sound.com, 1
 sightcure.jp, 1
 sighup.nz, 1
+sigi.tk, 1
 sigil.lt, 1
 sigint.pw, 1
 sigismonda.ch, 0
@@ -80163,6 +84626,7 @@
 sigmalux.nz, 1
 sigmalux.sarl, 1
 sigmalux.uk, 1
+sigmaomeganu.tk, 1
 sigmasensors.com.br, 1
 sigmateca.tk, 1
 sigmaweb.co.uk, 1
@@ -80176,6 +84640,7 @@
 signaltransmitter.de, 1
 signalxtech.com, 1
 signature.in.th, 1
+signature365.com, 1
 signaturechannel.com, 1
 signaturecityllc.com, 1
 signaturecountertops.com, 1
@@ -80196,6 +84661,7 @@
 signtul.com, 0
 signup.ly, 1
 signupgenius.com, 1
+sigobierno.com, 1
 sigparser.com, 1
 sigridcrm.com, 1
 sigriderp.com, 1
@@ -80213,13 +84679,13 @@
 sikaranbrotherhood.tk, 1
 sikayetvar.com, 0
 sike.org, 1
-sikecikcomel.com, 1
 sikevux.se, 1
 sikkind.com, 0
 sikko.biz, 1
 siku-shop.ch, 1
 siku.pro, 1
 silagra.ml, 1
+silasborowy.de, 1
 silashes.com, 1
 silashes.ru, 1
 silaslova-ekb.ru, 1
@@ -80228,9 +84694,13 @@
 silensky.com, 1
 silent-clean.de, 1
 silent-yachts.com, 1
+silentdream.tk, 1
 silentexplosion.de, 1
 silentinstaller.com, 1
 silentneko.ga, 1
+silentsky.tk, 1
+silentsystem.com, 1
+silentsystem.it, 1
 silentundo.org, 1
 silesianus.pl, 1
 silica-project.com, 1
@@ -80240,9 +84710,9 @@
 silicon-north.com, 1
 silicon-vision.com, 1
 silina.tk, 1
+silindir-taslama.tk, 1
 silkebaekken.no, 1
 silken-madame.tk, 1
-silkon.net, 1
 silkproducts.tk, 1
 sillisalaatti.fi, 1
 sillysnapz.co.uk, 1
@@ -80279,13 +84749,11 @@
 silvergoldbull.com, 1
 silvergoldbull.com.ar, 1
 silvergoldbull.com.au, 1
-silvergoldbull.com.eg, 1
 silvergoldbull.com.gh, 1
 silvergoldbull.com.mt, 1
 silvergoldbull.cr, 1
 silvergoldbull.cz, 1
 silvergoldbull.de, 1
-silvergoldbull.dj, 1
 silvergoldbull.do, 1
 silvergoldbull.ec, 1
 silvergoldbull.ee, 1
@@ -80313,9 +84781,7 @@
 silvergoldbull.lv, 1
 silvergoldbull.ma, 1
 silvergoldbull.md, 1
-silvergoldbull.mk, 1
 silvergoldbull.ml, 1
-silvergoldbull.mw, 1
 silvergoldbull.my, 1
 silvergoldbull.nz, 1
 silvergoldbull.ph, 1
@@ -80348,8 +84814,9 @@
 silvertorrents.cf, 1
 silverwind.io, 1
 silvesrom.ro, 1
-silvester-mitterschida.de, 1
+silvester-mitterschida.de, 0
 silviacataldi.com, 1
+silvianavarro.tk, 1
 silviaroddey.tk, 1
 silvine.xyz, 1
 silviorodriguez.tk, 1
@@ -80377,6 +84844,7 @@
 simeonoff.ninja, 1
 simetal.ch, 0
 simetria.org, 1
+simex.tk, 1
 simfdr.com, 1
 simha.online, 1
 simhaf.cf, 1
@@ -80386,6 +84854,7 @@
 simivalleylandscapelighting.com, 1
 simivalleylighting.com, 1
 simivalleyoutdoorlighting.com, 1
+simkartya.hu, 1
 simkin.tk, 1
 simkova-reality.cz, 1
 simlau.net, 0
@@ -80398,6 +84867,7 @@
 simon-mueller.de, 1
 simon.butcher.name, 0
 simon3k.moe, 1
+simonagancia.com, 1
 simonastallone.com, 1
 simonberard.garden, 1
 simonbondo.dk, 1
@@ -80412,6 +84882,7 @@
 simonkjellberg.se, 1
 simonmaddox.com, 1
 simonmanuel.com, 1
+simonoener.com, 1
 simonreich.de, 1
 simonreynoldsfavesunfaves.cf, 1
 simonschmitt.ch, 1
@@ -80427,6 +84898,7 @@
 simotrescu.ro, 1
 simpbx.net, 1
 simpel.be, 1
+simpelkoken.be, 1
 simpelkoken.com, 1
 simpelkoken.net, 1
 simpelkoken.nl, 1
@@ -80483,6 +84955,7 @@
 simplixos.org, 1
 simplonevents.ch, 1
 simplosoft.co.uk, 1
+simply-pattinson.tk, 1
 simply.black, 1
 simply.com, 1
 simply.scot, 1
@@ -80496,6 +84969,7 @@
 simplyfixit.co.uk, 1
 simplyheadwear.com.au, 1
 simplyhelen.de, 1
+simplyjet.tk, 1
 simplyml.com, 1
 simplymozzo.se, 1
 simplyowners.net, 1
@@ -80509,10 +84983,12 @@
 simrail.nl, 1
 sims4hub.ga, 1
 simsalafresh.de, 1
+simscale.com, 1
 simsimi.ml, 1
 simsnieuws.nl, 1
 simstarstyle.tk, 1
-simulfund.com, 1
+simulfund.com, 0
+simulise.cloud, 1
 simulise.com, 1
 simulping.com, 1
 simumiehet.com, 1
@@ -80521,7 +84997,9 @@
 sin-el-fil.com, 0
 sin-nombre-alleria.de, 1
 sin.swiss, 0
+sin4psi77.tk, 1
 sinalizeweb.com.br, 0
+sinan.mobi, 0
 sinanaydemir.com.tr, 1
 sinapuros.tk, 1
 sinaryuda.web.id, 1
@@ -80543,6 +85021,7 @@
 sindlerova.cz, 1
 sindominio.net, 1
 sindromebenjamin.tk, 1
+sineafoods.com, 1
 sinefili.com, 1
 sinergy.ch, 0
 sinergylabs.com, 1
@@ -80566,6 +85045,7 @@
 singhania.in, 1
 singharora.de, 1
 singhpackersmovers.com, 0
+singingblackbird.tk, 1
 single-in-stuttgart.de, 1
 singlehandedsailing.tk, 1
 singlenine.gq, 1
@@ -80576,6 +85056,7 @@
 singlu10.org, 0
 singluten.tk, 1
 sinhnhatbaby.com, 1
+sinistragiovanile.tk, 1
 sinkhole-florida.com, 1
 sinkholerepairsflorida.com, 1
 sinkip.com, 1
@@ -80583,7 +85064,7 @@
 sinluzvenezuela.tk, 1
 sinmik.com, 1
 sinnersprojects.ro, 1
-sinnvoll-online.de, 0
+sinnvoll-online.de, 1
 sinnvoll-online.info, 1
 sinog.si, 1
 sinok.tk, 1
@@ -80594,6 +85075,7 @@
 sinoscandinavia.se, 1
 sinquin.eu, 1
 sinronet.com, 1
+sinsalida.tk, 1
 sinsastudio.com, 1
 sint-joris.nl, 1
 sintas.lt, 1
@@ -80619,17 +85101,18 @@
 siongseafood.com, 1
 sipa.nc, 1
 sipa.pf, 1
+sipadmin.ru, 1
 sipc.org, 1
 sipd.go.id, 1
 sipede.tk, 1
 sipln.com, 1
+sipo.tk, 1
 sipstix.co.za, 1
 sipyuru.com, 1
 sipyuru.lk, 1
 siqi.wang, 1
 siranap.com, 1
 sirandorung.tk, 1
-siratalmustaqim.com, 1
 siraweb.org, 1
 sirbouncealotcastles.co.uk, 1
 sirbouncelot.co.uk, 1
@@ -80640,8 +85123,10 @@
 sirenslove.com, 1
 siri.cc, 1
 sirihouse.com, 1
+siriuspro.pl, 1
 siriuspup.com, 1
 siro.gq, 1
+sirpsycho.tk, 1
 sirtaptap.com, 1
 sirtuins.com, 1
 sirvio.eu, 1
@@ -80661,7 +85146,6 @@
 sirvoy.nl, 1
 sirvoy.no, 1
 sirvoy.se, 1
-sis.net.sa, 1
 sisadmin21.tk, 1
 siscompbolivia.tk, 1
 siscompt.com, 1
@@ -80681,16 +85165,21 @@
 sistemasarquitectonicos.com, 1
 sistemasespecializados.com, 1
 sistimiki-anaparastasi.gr, 1
+sistonenfranco.tk, 1
 sisu.ai, 1
 sisv.eu, 1
+sisver.host, 1
 sit-brn.ru, 1
 sit.ec, 1
-sit.moe, 1
+sit.moe, 0
 sitak.fi, 1
 sitanleta.de, 1
 sitatravel.gr, 1
 sitc.sk, 1
+site-development.tk, 1
 site-helper.com, 1
+site-oficial-inicio.com, 1
+site-oflcial.com, 1
 site-remont.ml, 1
 site-romania.tk, 1
 site-ua.tk, 1
@@ -80698,6 +85187,7 @@
 site.pictures, 1
 site2002.tk, 1
 siteadvokat.cf, 1
+sitebiz.com, 1
 sitebrass.ru, 1
 sitebuilderreport.com, 0
 sitecentre.com.au, 1
@@ -80707,6 +85197,7 @@
 sitedebelezaemoda.com.br, 1
 sitedrive.fi, 1
 sitefactory.com.br, 1
+siteheft.com, 1
 sitehoster.org, 1
 sitekatalog.tk, 1
 sitelinks.ml, 1
@@ -80716,6 +85207,7 @@
 sitemydesk.fr, 1
 sitenv.org, 1
 siterencontre.me, 1
+siteru.tk, 1
 sites.google.com, 1
 sitesdesign.tk, 1
 sitesforward.com, 1
@@ -80724,11 +85216,16 @@
 sitesweb.gq, 1
 siteweb-seo.fr, 1
 sithijaya.tk, 1
+sithmanifest.com, 1
+sithr.com, 1
+sithr.life, 1
+sithr.net, 1
+sithr.org, 1
+sithr.site, 1
 sitinjau.com, 1
 sitiosantaangela.com.br, 1
 sitischu.com, 1
 sito-online.ch, 1
-sits-eg.com, 1
 sittogether.club, 1
 sittogether.tw, 1
 siulam-wingchun.org, 1
@@ -80741,7 +85238,6 @@
 siwek.xyz, 1
 siwyd.com, 1
 six-o-one.com, 1
-sixcolors.lu, 1
 sixe.es, 1
 sixpackband.tk, 1
 sixpackholubice.cz, 1
@@ -80755,8 +85251,10 @@
 sjd.is, 0
 sjlegacy.com, 1
 sjleisure.co.uk, 1
+sjm-hamburg.de, 1
 sjnp.org, 1
 sjoelen.tk, 1
+sjoelsport.nl, 1
 sjoorm.com, 1
 sjorsvanweert.nl, 1
 sjout.nl, 1
@@ -80772,9 +85270,11 @@
 skagen-feriebolig.dk, 1
 skaginn.tv, 1
 skaiman.ga, 1
+skaitliukas.tk, 1
 skalar.sk, 1
 skalec.org, 1
 skalis-portage.com, 1
+skamper.tk, 1
 skante.tk, 1
 skarox.com, 1
 skarox.ee, 1
@@ -80786,13 +85286,15 @@
 skatclub-beratzhausen.de, 1
 skateaustria.at, 1
 skateaustria.events, 1
+skateparkmontbriz.tk, 1
+skaterangels.tk, 1
 skateschoolkostroma.ru, 1
 skatesins.ch, 1
+skatesliide.tk, 1
 skateswagger.com, 1
 skatingchina.com, 1
 skatn.de, 1
 skattesjekk.no, 1
-skautibrno.cz, 1
 skazka.ml, 1
 skazka.ru, 1
 skazochnyj-sait.tk, 1
@@ -80803,6 +85305,7 @@
 skeeley.com, 1
 skei.org, 1
 skepneklaw.com, 1
+skeppsbrons.se, 1
 skepticalsports.com, 1
 skeptik.tk, 1
 skeriv.com, 1
@@ -80816,6 +85319,7 @@
 skibikers.tk, 1
 skid.church, 1
 skiddle.com, 1
+skidka.by, 0
 skidki-ru.cf, 1
 skidzun.de, 1
 skifairview.com, 1
@@ -80829,6 +85333,9 @@
 skiley.net, 1
 skilift-quellenwiese.at, 1
 skill.moe, 1
+skill.tk, 1
+skillablers.com, 1
+skillatwill.com, 1
 skilldetector.com, 1
 skillled.com, 1
 skillmoe.at, 1
@@ -80869,7 +85376,7 @@
 skitecsh.com, 1
 skizzen-zeichnungen.de, 1
 skjt.co.jp, 1
-skk.moe, 1
+skk-krovlya.ru, 1
 sklep-majster.pl, 1
 sklepvoip.tel, 1
 sklepwielobranzowymd.com, 1
@@ -80894,7 +85401,6 @@
 skoolergraph.azurewebsites.net, 1
 skorbord.tk, 1
 skorepova.info, 1
-skoroff.com, 1
 skoropolnolunie.gq, 1
 skorovsud.ru, 1
 skorpil.cz, 1
@@ -80910,21 +85416,26 @@
 skram.de, 1
 skreutz.com, 1
 skripta.tk, 1
+skrivebeskyttet.dk, 1
 skrivebordet.tk, 1
 skrooter.com, 1
+skrprojects.com.au, 1
 skrsv.net, 1
 sksdrivingschool.com.au, 1
+sksongs.com, 1
 sktan.com, 1
 sktsolution.com, 0
 sku-partei.de, 1
 skuizy.ddns.net, 1
 skulblaka.ch, 1
+skulblaka.cloud, 1
 skuldwyrm.no, 1
 skullnet.co.uk, 1
 skunkapeservers.net, 1
 skutry-levne.cz, 1
 skutry.cz, 1
 skux.ch, 1
+skvelecesko.cz, 1
 skvty.com, 0
 skwile-cafe.com, 1
 skwitko.com, 1
@@ -80956,8 +85467,8 @@
 skygates.tk, 1
 skyger.cz, 1
 skyhigh-mizell.tk, 1
-skyhighescaperoom.nl, 1
 skyhooks.tk, 1
+skyla.tk, 1
 skylair.info, 1
 skylander.cf, 1
 skylarker.org, 1
@@ -80982,11 +85493,11 @@
 skyntalent.com, 1
 skyoy.com, 0
 skype.com, 1
-skypech.com, 1
 skypefr.com, 1
 skyportcloud.com, 1
 skyquid.co.uk, 1
 skyra.pw, 1
+skyrieptravel.com, 1
 skyros.us, 1
 skys-entertainment.com, 1
 skyscanner.com, 1
@@ -81001,9 +85512,11 @@
 skyterraathome.com, 1
 skyterraembrace.com, 1
 skyterrawellness.com, 1
+skytickets.ga, 1
 skytown.ga, 1
 skyvault.io, 1
 skywalkersa.ga, 1
+skywindowsnj.com, 1
 skyworldserver.ddns.net, 1
 skywt.cn, 1
 skyynet.de, 1
@@ -81025,10 +85538,10 @@
 slalix.pw, 1
 slalix.xyz, 1
 slamdjapan.com, 1
+slamdunkdedication.tk, 1
 slamix.nl, 1
 slan.fr, 1
 slane.cn, 0
-slangbellor.com, 1
 slanterns.net, 1
 slapen17.nl, 1
 slaps.be, 1
@@ -81055,7 +85568,7 @@
 slayingqueen.com, 1
 slbknives.com, 1
 sldev.ovh, 1
-sldlcdn.com, 1
+sledgeroofing.com, 1
 sleeker.es, 1
 sleeklounge.com, 0
 sleep-go.info, 1
@@ -81064,6 +85577,7 @@
 sleepet.tw, 1
 sleepig.com, 1
 sleepingbaghub.com, 0
+sleepingmattressreview.com, 1
 sleeplessbeastie.eu, 1
 sleepmap.de, 1
 sleepo.ga, 1
@@ -81073,11 +85587,13 @@
 sleio.com, 1
 slemen.tk, 1
 slepsluzbabeograd.org, 1
+sletaem.ml, 1
 sletat.ru, 1
 slev.tk, 1
 slever.cz, 1
 slevermann.de, 1
 slevomat.cz, 1
+slew.gq, 1
 sliceone.com, 1
 slicklines.co.uk, 1
 slicss.com, 1
@@ -81088,6 +85604,7 @@
 slim-planet.com, 1
 slim-slender.com, 1
 slimblogger.com, 1
+slimetutorial.com, 1
 slimk1nd.nl, 1
 slimmarkets.com, 1
 slimopweg.be, 1
@@ -81113,9 +85630,9 @@
 sloancom.com, 1
 sloanestreetdeli.com, 1
 sloanrealtygroup.com, 1
+sloboda.tk, 1
 slobrowink.com, 1
 slogan.tk, 1
-sloganfarm.info, 1
 sloneczni.pl, 1
 slonep.net, 1
 slopeedge.com, 1
@@ -81127,16 +85644,22 @@
 slothless.com, 1
 sloths.org, 1
 slothy.cloud, 1
+slothy.win, 1
+slotjava.com.br, 1
+slotjava.es, 1
+slotjava.it, 1
 slotlist.info, 1
 slotmad.com, 1
 slotsmegacasino.com, 1
 slouching.ga, 1
 slovenia-trip.tk, 1
 slovenskycestovatel.sk, 1
+slow-coaching.fr, 1
 slow.social, 1
 slow.zone, 0
 slowcookingperfected.com, 1
 slowgames.xyz, 1
+slowinski.tk, 1
 slownik123.pl, 1
 slowsocial.email, 1
 slowsocial.eu, 1
@@ -81145,10 +85668,13 @@
 slpm.com, 1
 slpower.com, 0
 slrd-isperih.com, 1
+slrie.de, 1
 slrshoppee.com, 1
 slt24.de, 1
 sluciaconstruccion.com, 1
+slugify.online, 1
 sluhockey.com, 1
+sluimann.de, 1
 sluitkampzeist.nl, 0
 slunecnice.cz, 1
 slunyavchik.tk, 1
@@ -81175,11 +85701,12 @@
 smakassen.no, 1
 smakoszwegrzynka.pl, 1
 smaksbanken.no, 1
+smalandscountryclub.tk, 1
 small-blog.cf, 1
-small-panda.com, 1
 smallbytedesign.co, 1
 smallchat.nl, 1
 smallcloudsolutions.co.za, 1
+smallcloudsolutions.com, 1
 smallcraftadvisory.tk, 1
 smalldata.tech, 1
 smalle-voet.de, 1
@@ -81188,7 +85715,9 @@
 smalls-world.tk, 1
 smallsites.eu, 1
 smalltalkconsulting.com, 1
+smalltunepress.tk, 1
 smallville.tk, 1
+smallville25.tk, 1
 smallwhitebear.ga, 1
 smaltimento-rifiuti.com, 1
 smaltimento-rifiuti.org, 1
@@ -81211,6 +85740,7 @@
 smanson.duckdns.org, 1
 smaragderna.ga, 1
 smares.de, 1
+smarketingbusiness.ca, 1
 smarpshare.com, 1
 smart-cloud.store, 1
 smart-cp.jp, 1
@@ -81224,13 +85754,13 @@
 smart-zona.tk, 1
 smart.gov, 1
 smartacademy.ge, 1
-smartacademy.pro, 1
 smartandcom.ch, 1
 smartandhappychild.ro, 0
 smartart.gr, 1
 smartass.space, 1
 smartass0027.com, 1
 smartassembly.tk, 1
+smartb2balgeria.com, 1
 smartbiz.vn, 1
 smartblock.cloud, 1
 smartboleta.com, 1
@@ -81242,7 +85772,7 @@
 smartdb.jp, 1
 smartdigital.ga, 1
 smartdigitech.co.za, 1
-smartech.co.id, 1
+smarteco.tk, 1
 smartedukasi.co.id, 1
 smarterskies.gov, 1
 smartest-trading.com, 1
@@ -81251,10 +85781,9 @@
 smartfons.tk, 1
 smartftp.com, 1
 smartgrid.gov, 1
-smartgridsecurity.com, 1
-smartgridsecurity.org, 1
 smarthdd.com, 1
 smarthealthinnovationlab.com, 1
+smarthome365.nl, 1
 smarthrms.com, 1
 smartime.com.ar, 1
 smartit.gr, 1
@@ -81263,9 +85792,9 @@
 smartlend.se, 1
 smartlink.sk, 1
 smartlocksmith.com, 1
-smartlogreturns.com, 1
-smartlogstock.com, 1
-smartlogtower.com, 1
+smartlogreturns.com, 0
+smartlogstock.com, 0
+smartlogtower.com, 0
 smartlybuy.com, 1
 smartmachine.com, 1
 smartmail24.de, 1
@@ -81277,19 +85806,17 @@
 smartpanelsmm.com, 1
 smartpatika.hu, 1
 smartpheromones.com, 1
-smartphone-blog.de, 1
 smartphone-pliable.wtf, 1
 smartphonecases.tk, 1
 smartphonechecker.co.uk, 1
 smartphones-baratos.com, 1
 smartphonesolution.tk, 1
-smartplace.ro, 1
 smartpolicingplatform.com, 1
 smartpos.net.br, 1
-smartproductguide.com, 1
 smartpti.net, 1
 smartrecruit.ro, 1
 smartrentacar.ro, 1
+smartriotour.com.br, 1
 smartrise.us, 1
 smartroofingandsheetmetal.com, 1
 smartservices.nl, 1
@@ -81303,7 +85830,6 @@
 smartstep.pt, 1
 smartthursday.hu, 1
 smartvideo.io, 1
-smartviewing.com, 1
 smartwank.com, 1
 smartweb.ge, 1
 smartwoodczech.cz, 1
@@ -81313,10 +85839,13 @@
 smash-gg.club, 1
 smashbros-chile.tk, 1
 smashnl.tk, 1
+smashno.ru, 1
 smatch.com, 1
 smb-analytics.pw, 1
 smb445.com, 1
 smbeermen.tk, 1
+smcconsulting.be, 1
+smcconsulting.eu, 1
 smcj.xyz, 1
 smcquistin.uk, 1
 smd-tlt.ru, 1
@@ -81330,11 +85859,14 @@
 smesitel-online.ru, 1
 smeso.it, 1
 smeta.ml, 1
+smetak.cz, 1
 smexpt.com, 1
 smh.me, 1
 smi-a.me, 1
+smialnumenor.tk, 1
 smiatek.name, 1
 smiblog.tk, 1
+smicenter.tk, 1
 smicompact.com, 1
 smictecniservi.com, 1
 smikom.ru, 1
@@ -81342,6 +85874,7 @@
 smilecon.cf, 1
 smiledirectsales.com, 1
 smilegenerator.tk, 1
+smilemantra.clinic, 1
 smilemantradental.com, 1
 smilenwa.com, 1
 smilesondemand.com, 1
@@ -81353,11 +85886,12 @@
 smimea.info, 1
 smipty.cn, 1
 smipty.com, 1
+smiraus.cz, 1
 smishnik.tk, 1
 smit.com.ua, 1
+smith-tech.ga, 1
 smith.bz, 1
 smith.co, 0
-smith.is, 1
 smithandellis.com, 1
 smithandnoble.com, 0
 smithchung.eu, 1
@@ -81383,7 +85917,6 @@
 smokefree.gov, 1
 smokefreerowan.org, 1
 smokeping.pl, 1
-smokeus.dk, 1
 smokingblendoils.com, 1
 smokinghunks.com, 1
 smokingtapes.ga, 1
@@ -81410,6 +85943,7 @@
 smplr.uk, 1
 smppcenter.com, 1
 smprecords.nl, 1
+smprime.com, 1
 smrdim.cz, 1
 smries.com, 1
 smrtrpck.com, 1
@@ -81420,7 +85954,6 @@
 sms72.tk, 1
 smsappointment.com, 0
 smsbrana.cz, 0
-smsfa.ir, 1
 smsg-dev.ch, 0
 smsinger.com, 1
 smsk.email, 1
@@ -81429,7 +85962,7 @@
 smskmail.com, 1
 smslodging.com, 1
 smsprivacy.org, 1
-smspujcka24.eu, 1
+smsstock.tk, 1
 smstoreoficial.com.br, 1
 smszone.tk, 1
 smtchahal.com, 1
@@ -81457,10 +85990,13 @@
 snacdata.com, 1
 snack-online.com, 1
 snackbesteld.nl, 1
+snacky.nl, 1
 snafarms.com, 1
 snafu.cz, 1
 snajdr.online, 1
+snajdrova.eu, 1
 snakafya.com, 1
+snake.dog, 0
 snakeanarchy.tk, 1
 snakesandladders.tk, 1
 snap.com, 1
@@ -81513,10 +86049,12 @@
 snelwegzen.nl, 1
 snem.tk, 1
 snerith.com, 1
+snetts.com, 1
 snfdata.com, 0
 sngallery.co.uk, 1
 sngeo.com, 1
 sngnews.tk, 1
+sngukrainatv.tk, 1
 snh48live.org, 1
 snic.website, 1
 sniderman.eu.org, 1
@@ -81546,7 +86084,6 @@
 snortfroken.net, 1
 snote.io, 1
 snoupon.com, 1
-snoutsandpaws.com, 1
 snow-online.com, 1
 snow-online.de, 1
 snow-service.it, 1
@@ -81554,12 +86091,14 @@
 snowalerts.nl, 1
 snowatka.com, 1
 snowboard-break.tk, 1
+snowboardforum.tk, 1
 snowchamps.nl, 1
 snowcrestdesign.com, 1
 snowdon.io, 1
 snowdy.dk, 1
 snowdy.eu, 1
 snowdy.link, 1
+snowhana.com, 1
 snowhaze.ch, 1
 snowhaze.com, 1
 snoworld.one, 1
@@ -81578,6 +86117,7 @@
 snowyluma.me, 1
 snperformance.gr, 1
 snrat.com, 1
+snrd.de, 1
 snroth.de, 1
 snrub.co, 1
 sns.med.sa, 1
@@ -81585,6 +86125,7 @@
 snsirius.cf, 1
 sntial.co.za, 1
 snuff.porn, 1
+snukep.kr, 1
 snuverma.com, 1
 snwsjz.com, 1
 so-buff.com, 1
@@ -81615,27 +86156,32 @@
 soc.net, 1
 socal-babes.com, 1
 socaliente.fr, 1
+socatel.cf, 1
 soccernews.id, 1
 soccers.fr, 1
 soccorso-stradale.org, 1
+socheap.win, 1
 sochi-sochno.ru, 1
-sochi.tatar, 1
+sochi.ooo, 1
 sochic.in, 1
 sochidostavka.com, 1
 sochionline.tk, 1
+sochisan.com, 1
 sochiss.ru, 1
 soci.ml, 1
 sociability.dk, 1
 social-directory-list.tk, 1
 social-events.net, 0
+social-line.tk, 1
 social-media-strategies.it, 1
 social-media-strategy.org.uk, 1
 social-network.tk, 1
 social-work-colleges.com, 1
-socialabstracto.website, 1
+social-work.tk, 1
 socialair.tk, 1
 socialblaze.com.au, 1
 socialclimb.com, 1
+socialdemo.ga, 1
 socialdevelop.biz, 0
 socialeyesthailand.com, 1
 socialhams.net, 1
@@ -81653,15 +86199,20 @@
 socialplanet.pl, 1
 socialproject.ml, 1
 socialrank.com, 1
+socials.gq, 1
+socialsecrets-coaching.de, 1
 socialsecurity.gov, 0
 socialstrata.com, 1
 socialtactics.cf, 1
 socialtranslation.ga, 1
-socialtrends.pl, 1
+socialtrends.pl, 0
+socialwave.tk, 1
 socialworkout.com, 1
 socialworkout.net, 1
 socialworkout.org, 1
 socialworkout.tv, 1
+sociedadcivil.tk, 1
+sociedadecologica.tk, 1
 sociedadsostenible.tk, 1
 societe-chablaisienne-de-revetements.com, 1
 societe-chablaisienne-de-revetements.fr, 1
@@ -81692,9 +86243,12 @@
 sodermans.com, 1
 soderparr.com, 1
 sodexam.pro, 1
+sodi.gent, 1
 sodi.nl, 1
 sodiao.cc, 1
+sodigent.be, 1
 sodigent.gent, 1
+sodiummedia.com, 1
 sodo.top, 1
 sodomojo.com, 1
 sodsouthernindiana.com, 1
@@ -81702,6 +86256,7 @@
 soeasy.co.za, 1
 soegi-haru.com, 1
 soepvork.nl, 1
+sofa-bed.tk, 1
 sofa-rockers.org, 1
 sofabedshop.de, 1
 sofaclean.co.uk, 1
@@ -81720,13 +86275,16 @@
 sofpedia.ro, 0
 soft-key.tk, 1
 soft-office.tk, 1
+soft-search-system.tk, 1
 soft-valley.net, 1
 soft41.ru, 1
 softandbouncy.co.uk, 1
 softanka.com, 1
+softbabyducks.com, 1
 softbit.pt, 1
 softblinds.co.uk, 1
 softchin.ir, 1
+softconcept.pt, 1
 softcreatr.com, 1
 softcreatr.de, 1
 softfay.com, 1
@@ -81749,12 +86307,15 @@
 softskills.tech, 1
 softstack.ru, 1
 softtennis-zenei.com, 1
+softview.tk, 1
 softw.net, 1
 software-search.com, 1
 software-tech.tk, 1
+software-voor-projecten.nl, 1
 software.rocks, 1
 softwarebeveiligingtestdomein.be, 1
 softwarecloud.ml, 1
+softwareclub.tk, 1
 softwaredesign.foundation, 0
 softwarepara.net, 1
 softwarepatenten.tk, 1
@@ -81766,6 +86327,7 @@
 softwing.de, 1
 softwsabri.be, 1
 softyak.com, 1
+sog-gilde.tk, 1
 sogo.com.my, 1
 sogola.com, 1
 sogravatas.com.br, 1
@@ -81781,16 +86343,19 @@
 soinvett.com, 0
 soji.io, 1
 sokak-sanati.tk, 1
+sokenconstruction.com, 1
 soket.ee, 1
 sokkenhoek.nl, 1
 soko.nl, 1
 sokolkarvina.cz, 1
 sokolovskyi.ml, 1
+sokosport.com, 1
 sokouchousa.net, 1
 sokrabatt.se, 1
 sol-3.de, 0
 sol-computers.es, 1
 sol-design.jp, 1
+sol-negro.tk, 1
 sol24.net, 1
 solace.com, 1
 solacyre.ch, 0
@@ -81807,7 +86372,6 @@
 solarhome.ml, 1
 solariilacheie.ro, 1
 solarium.gov, 1
-solarlider.com.br, 1
 solarloon.com, 1
 solaronics.tk, 1
 solarpanels.tk, 1
@@ -81824,6 +86388,7 @@
 solbjer.se, 1
 soldamontanhabeachwear.com.br, 1
 soldarizona.ga, 1
+soldaten-genealogie.tk, 1
 solden.be, 1
 soldesduck.be, 1
 soldesduck.ch, 1
@@ -81841,6 +86406,7 @@
 solicafe.at, 1
 solidariedadecultura.pt, 1
 solidarita-kosovo.net, 1
+solidarityzone.org, 1
 solidform.ml, 1
 solidhost.cf, 1
 solidimage.com.br, 1
@@ -81851,6 +86417,7 @@
 solidshield.com, 1
 solidsteel.tk, 1
 solidtuesday.com, 1
+soliftstore.com, 1
 solihullcarnival.co.uk, 1
 solihullinflatables.com, 1
 solihulllionsclub.org.uk, 1
@@ -81877,6 +86444,8 @@
 sologstrand.no, 1
 sologstrand.se, 1
 soloinfo.it, 1
+soloingenieria.tk, 1
+sololabs.com, 1
 solomisael.com, 1
 solomo.pt, 1
 solomonsklash.io, 1
@@ -81912,11 +86481,13 @@
 solutiontestbank.com, 1
 soluzionifightlist.cf, 1
 solvation.de, 1
+solvaybank.com, 1
 solve-it-sol.com, 1
 solve.co.uk, 1
 solved.tips, 1
 solvemethod.com, 1
 solvewebmedia.com, 1
+solviejo.tk, 1
 solvin.com, 1
 solvingforu.com, 1
 solvingproblems.com.au, 1
@@ -81936,12 +86507,15 @@
 somefe.pt, 1
 somehowsomeday.com, 1
 somehsara.tk, 1
+somerm.com, 1
 somersetdev.com, 1
 somersetscr.nhs.uk, 1
 somersetwellbeing.nhs.uk, 1
 someserver.cf, 1
+something-else.cf, 1
 somethingsimilar.com, 1
 somethingsketchy.net, 1
+somewherein.jp, 1
 somewherenews.cf, 1
 sominemo.com, 1
 somix.com, 1
@@ -81952,6 +86526,7 @@
 sommerhusudlejning.com, 1
 somnam.tk, 1
 somnomedics.eu, 1
+somnusoft.com, 1
 somogyivar.hu, 1
 somom.com, 1
 somosbrujas.com, 1
@@ -81960,11 +86535,13 @@
 somoshuemul.cl, 1
 somoslaarmenia.com, 1
 somosti.cl, 1
+somosweb.cf, 1
 somoyorkies.com, 1
 sompani.com, 1
 somuchbetterwithage.com, 1
 somweyr.de, 1
 son-onlajn.tk, 1
+son-tolkovatel.gq, 1
 sona-gaming.com, 1
 sona-systems.cn, 1
 sona-systems.jp, 1
@@ -81973,6 +86550,7 @@
 sonar.ga, 1
 sonaraamat.com, 1
 sonarqube.com, 0
+sonarweb.ir, 1
 sonate.jetzt, 1
 sonavankova.cz, 1
 sondebase.com, 1
@@ -82014,6 +86592,7 @@
 sonixonline.com, 1
 sonja-daniels.com, 1
 sonja-kowa.de, 1
+sonmark.ru, 1
 sonnenbergharrison.law, 1
 sonnenta.de, 1
 sonneundstrand.de, 1
@@ -82033,7 +86612,6 @@
 sonyashappenings.com, 1
 sonyunlock.nu, 1
 soohealthy.nl, 1
-soolid.tech, 1
 soomee.be, 1
 soomee1.be, 1
 soontm.de, 1
@@ -82045,14 +86623,18 @@
 soph.tk, 1
 soph.us, 1
 sopheos.com, 0
+sopher.io, 1
 sophi.online, 1
 sophiaandmatt.co.uk, 1
 sophiahatstudio.com, 1
 sophiakligys.com, 1
+sophias-haarmanufaktur.de, 1
 sophiefrutti.gr, 1
+sopira.ru, 1
 sopo.me, 1
 sopra.tk, 1
 soprabalao.com.br, 1
+sopronforras.tk, 1
 soquee.net, 1
 sor.so, 1
 soraharu.com, 1
@@ -82082,17 +86664,20 @@
 sos-idraulico.it, 1
 sos-loodgieter.com, 1
 sos-muratore.it, 1
+sos-zimmerpflanzen.de, 1
 sos.sk, 0
 sos.vg, 1
 sos.yt, 1
 sosaka.ml, 1
+sosaka.tk, 1
 sosecu.red, 1
+sosedisetka.tk, 1
 sosesh.shop, 1
 sosgate.com, 1
-sosinfotech.com, 1
 sosisuka.ga, 1
 sosko.in.rs, 1
 soslsd.org, 1
+sosmicro.tk, 1
 sosnovka.ga, 1
 sosoftplay.co.uk, 1
 sosok.tk, 1
@@ -82112,9 +86697,12 @@
 sotaytienganh.com, 1
 soterdev.com, 1
 sotermic.cl, 1
+sotin-hr.tk, 1
 sotnya.cf, 1
 sotnyk.ml, 1
 sotoasobi.net, 1
+sotocine.tk, 1
+sotolar.net, 1
 sottilealimentos.com.br, 1
 sottm.com.au, 1
 sotypicallydutch.nl, 1
@@ -82133,11 +86721,13 @@
 souletter.com, 1
 souleymanecamara.com, 1
 soulike.tech, 1
+soulinbusiness.ga, 1
 soulla.tk, 1
 soulmate.dating, 1
 soulmating.de, 1
 soulplay.com, 1
 soulpowercoaching.ga, 1
+soulshinecreators.com, 1
 soulsinner.tk, 1
 soulsteer.com, 0
 soulveda.com, 1
@@ -82150,6 +86740,7 @@
 sound-recording.org, 1
 sound.as, 1
 soundabout.nl, 1
+soundar.eu.org, 1
 soundblast.tk, 1
 soundclick.com, 1
 soundcloud.com, 1
@@ -82159,6 +86750,7 @@
 soundforsound.co.uk, 1
 soundgasm.net, 1
 soundhunter.xyz, 0
+soundinthesignals.tk, 1
 soundlight.tk, 1
 soundman.ga, 1
 soundmoney.club, 1
@@ -82177,12 +86769,13 @@
 soungui.cm, 1
 soungui.com, 1
 soungui.net, 1
-sounm.com, 0
+sounm.com, 1
 soupbuahtaza.id, 1
 soupcafe.org, 1
 souqtajmeel.com, 1
 sour.is, 1
 souravbhor.gq, 1
+souravbhor.ml, 1
 sourcebox.be, 1
 sourcecode.hosting, 1
 sourcecode.love, 1
@@ -82210,6 +86803,7 @@
 southeastvalleyurology.com, 1
 southernforge.com, 1
 southernlights.cf, 1
+southernlights.club, 1
 southernlights.gq, 1
 southernmost.us, 1
 southernsurgicalga.com, 1
@@ -82239,6 +86833,7 @@
 southwindsor-ct.gov, 1
 soutien-naissance.com, 1
 souzanabellydance.com, 1
+sova.cc, 1
 sova.st, 1
 sovendus.com, 1
 sovendus.de, 1
@@ -82256,6 +86851,7 @@
 sovxoz.gq, 1
 sowhat.dk, 1
 sowncloud.de, 1
+sowtarabiya.com, 1
 soya.com.ua, 1
 soybase.org, 1
 soychef.today, 1
@@ -82264,6 +86860,7 @@
 soydxn.com, 1
 soykaf.eu, 1
 soyladani.com, 1
+soytusitio.com, 1
 soyuznik.ml, 1
 soyvigilante.com, 1
 sozai-good.com, 1
@@ -82280,6 +86877,7 @@
 sp.com.pl, 1
 sp.rw, 1
 sp8ce.co, 1
+spa-center.tk, 1
 spabellabolivia.com, 1
 space-inc.co.jp, 1
 space-it.de, 1
@@ -82299,6 +86897,7 @@
 spacehost.de, 1
 spacelabs.io, 1
 spacelandpark.ga, 1
+spaceon.tk, 1
 spacepage.be, 1
 spacepirates.tk, 1
 spaceshells.tk, 1
@@ -82317,9 +86916,9 @@
 spahireleeds.co.uk, 1
 spaid.xyz, 0
 spainpol.es, 1
-spakhmer.com, 1
 spakurort.eu, 1
 spalnobelyo.com, 1
+spaltron.net, 1
 spam.lol, 1
 spamasaurus.com, 1
 spamdrain.com, 1
@@ -82369,6 +86968,7 @@
 sparklewindowcleaners.co.za, 1
 sparklingessentials.ga, 1
 sparklingloungecampiglio.it, 1
+sparkplug.tk, 1
 sparkresearch.net, 1
 sparkweb.com.au, 1
 sparkwood.org, 1
@@ -82378,6 +86978,7 @@
 sparqmedia.nl, 1
 sparta-en.org, 1
 sparta-szczekociny.tk, 1
+sparta-upice.tk, 1
 spartac.be, 1
 spartacuslife.com, 1
 spartaermelo.nl, 1
@@ -82386,8 +86987,10 @@
 spartanis.tk, 1
 spartantheatre.org, 1
 sparumzuege.de, 1
+spasem-park.tk, 1
 spasicilia.it, 1
 spatiugratis.tk, 1
+spatter.cf, 1
 spatzenwerkstatt.de, 1
 spawn.cz, 1
 spaysy.com, 1
@@ -82396,14 +86999,18 @@
 spazturtle.co.uk, 1
 spazzacamino.roma.it, 1
 spb-xiaomi.ru, 1
+spb.ooo, 1
 spbet99.com, 1
 spcollege.edu, 1
 spd-porta-westfalica.eu, 1
 spdepartamentos.com.br, 1
 spdf.net, 1
+spdi.com.cn, 1
 spdillini.com, 1
 spe.org.co, 1
 speac.jp, 1
+speacock.co.uk, 1
+speacock.uk, 1
 speak-polish.com, 1
 speakeasy.co, 1
 speaker-animateur.com, 1
@@ -82422,6 +87029,7 @@
 specialofficesupplies.tk, 1
 specialprojectsdesk.com, 1
 specialproperties.com, 1
+specialtechnique.tk, 1
 specialtyalloys.ca, 1
 specialtyjets.ca, 1
 specialtyrigging.com, 1
@@ -82429,6 +87037,7 @@
 speciauxquebec.com, 1
 speciesism.com, 1
 specificenergy.com, 1
+speckrot.ru, 1
 specks.tk, 1
 spectre-network.tk, 1
 spectre.com.br, 1
@@ -82444,10 +87053,13 @@
 speechmate.com, 1
 speechmore.ml, 1
 speechndraw.com, 0
+speed-bonus.tk, 1
+speed-strike.tk, 1
 speedcam.tk, 1
 speeddate.it, 0
 speeder-vpn.tk, 1
 speeder.best, 1
+speeder.cf, 1
 speeder.im, 1
 speeders.cf, 1
 speeders.ga, 1
@@ -82479,15 +87091,18 @@
 spellic.com, 1
 spendable.money, 1
 spendleex.com, 1
+spendo.gq, 1
 spendwise.com.au, 1
 spenglerei-shop.de, 1
 spenny.tf, 1
 sperandii.it, 1
+spermosens.com, 1
 spero.solutions, 1
 sperrstun.de, 1
 spertto.com, 1
 spesys-services.fr, 1
 spetsialist.cf, 1
+spettacolocame.ga, 1
 speventos.es, 1
 spewingmews.moe, 1
 speww.com, 1
@@ -82542,11 +87157,13 @@
 spinal.ga, 1
 spind.energy, 1
 spindle.com.ph, 1
+spinecomms.com, 1
 spinner.dnshome.de, 1
 spinning-portugal.com, 1
 spinpay.com.br, 1
 spins.fedoraproject.org, 1
 spira.kiev.ua, 1
+spiralstabilization.com, 1
 spirella-shop.ch, 1
 spirit-hunters-germany.de, 0
 spirit55555.dk, 1
@@ -82566,7 +87183,7 @@
 spit.com.au, 1
 spitfiredialers.com, 1
 spitfireuav.com, 1
-spittank.info, 1
+spithoven.tk, 1
 spittersberger.recipes, 1
 spjaet.dk, 1
 splashily.gq, 1
@@ -82577,6 +87194,7 @@
 spli.co, 1
 splibrary.tk, 1
 splikity.com, 1
+splintercake.tk, 1
 splintermail.com, 1
 splinternews.com, 1
 splitdna.com, 1
@@ -82597,12 +87215,12 @@
 spokanepolebuildings.com, 1
 spokeo.com, 1
 spokesly.com, 1
+spolshy.com.ua, 1
 spoluck.ca, 1
 spolwind.de, 1
 spom.net, 1
 sponc.de, 1
 sponec.com, 1
-sponecstructure.com, 1
 spongepowered.org, 1
 sponsor.software, 1
 spoofhaus.com, 1
@@ -82615,6 +87233,7 @@
 spornkuller.de, 1
 sport-51.ru, 1
 sport-in-sundern.de, 1
+sport-news.ml, 1
 sport-obzor.tk, 1
 sport-online-ru.cf, 1
 sport-potreby.cz, 1
@@ -82625,6 +87244,7 @@
 sportakrobatik.at, 1
 sportboot.mobi, 1
 sportchirp.com, 1
+sportda.tk, 1
 sporter.com, 1
 sportify-design.fr, 1
 sportinfon.cf, 1
@@ -82632,10 +87252,10 @@
 sportingpontenova.es, 1
 sportllux.com.br, 1
 sportmedia.ga, 1
-sportmerchandise.hu, 1
 sportmultimedia.pt, 1
 sportmundschutz-info.de, 1
 sportnesia.com, 1
+sportovni.site, 1
 sportovnidum.cz, 1
 sportparks.com, 1
 sportparks.org, 1
@@ -82649,10 +87269,12 @@
 sports-wear.tk, 1
 sports.dating, 1
 sportschoolgeelhoed.nl, 1
+sportsdeck.tk, 1
 sportsdrobe.com, 1
 sportsjaw.com, 1
 sportsmansblog.com, 1
 sportsmashup.com, 1
+sportspainmanagementnyc.com, 1
 sportspassbremen.de, 1
 sportstreetstyle.com, 1
 sportswear.by, 1
@@ -82663,8 +87285,8 @@
 sportugalia.ru, 1
 sportvereine.online, 1
 sportverzorging.tk, 1
-sportwetten-anbieter.de, 0
-sportxt.ru, 1
+sportxt.ru, 0
+sportygirlsjewels.ga, 1
 spot-cleaner.tk, 1
 spot-lumiere-led.com, 1
 spot.su, 1
@@ -82680,14 +87302,15 @@
 spotsylvaniacounty-va.gov, 1
 spotsylvaniacountyva.gov, 1
 spottedpenguin.co.uk, 1
-spotty.tech, 1
 spotupload.com, 1
 spotworld.co, 1
 spotypal.com, 1
+spotzlight.tk, 1
 sppin.fr, 1
 spr.id.au, 1
 sprachenlernen24.org, 1
 sprachfreudehoch3.de, 1
+sprashivalka.com, 1
 spravka-internet.tk, 1
 spravka.tk, 1
 spravki.cf, 1
@@ -82696,9 +87319,11 @@
 sprayontv.com, 1
 spreadsheetgear.com, 1
 spreadsheets.google.com, 1
+spreadthejam.tk, 1
 spreadthenews.eu, 1
 spreed.me, 1
 spricknet.de, 1
+sprillerer.tk, 1
 springerundpartner.de, 1
 springfieldbricks.com, 0
 springhillmaine.com, 1
@@ -82715,8 +87340,11 @@
 sproutways.com, 1
 sprucecreekclubs.com, 1
 sprucecreekgcc.com, 1
+spruces.gq, 1
 sprueche-zum-valentinstag.de, 1
 sprueche-zur-geburt.info, 1
+sprueche-zur-hochzeit.de, 1
+sprueche-zur-konfirmation.de, 1
 spruijtparket.nl, 1
 sprutech.de, 1
 sps-lehrgang.de, 1
@@ -82725,7 +87353,6 @@
 spsnewengland.org, 1
 spstaticfiles.com, 1
 spt.tf, 1
-spteam.net, 1
 sptk.org, 1
 spuffin.com, 1
 spufpowered.com, 1
@@ -82785,6 +87412,7 @@
 square.site, 1
 squarecat.io, 1
 squaredancedance.tk, 1
+squaredseven.com, 1
 squaregift.com, 1
 squaregift.net, 1
 squaregift.org, 1
@@ -82805,9 +87433,9 @@
 squareupsandbox.com, 1
 squarewave.cloud, 1
 squattra.com, 1
-squawk.cc, 0
 squeakie.club, 1
 squeaky.services, 1
+squealing-filth.tk, 1
 squeezemetrics.com, 1
 squelcher.cf, 1
 squidnovels.tk, 1
@@ -82832,6 +87460,7 @@
 srchicmodas.com.br, 1
 srchub.org, 1
 srcprivatesecurity.com, 1
+srdinnovativedesigns.com, 1
 srdmarketingservice.com, 1
 sreeharis.tk, 1
 sreenadh.in, 1
@@ -82898,10 +87527,10 @@
 ss64.com, 1
 ss64.org, 1
 ss6729.co, 1
+ss6729.com, 1
 ss6957.co, 1
 ss88.uk, 1
 ss9188.com, 1
-ss9288.com, 1
 ss9297.co, 1
 ss9397.com, 1
 ss9728.co, 1
@@ -82912,10 +87541,13 @@
 ssbkk.ru, 0
 ssbrm.ch, 1
 ssc.vg, 0
+ssc8689.com, 1
+ssc8689.net, 1
 ssccp.in, 0
 sscd.no, 1
 sschd.cc, 0
 ssconn.com, 1
+ssd.today, 1
 ssdax.com, 1
 ssdpalermo.it, 1
 ssenberg.nl, 1
@@ -82927,14 +87559,15 @@
 sshcrack.com, 1
 sshd.site, 1
 sshool.at, 1
+sshwiki.tk, 1
 sshx.top, 1
 ssk.ovh, 1
+sskb-ey.tech, 1
 ssky.cn, 1
 ssl-zertifikate.de, 1
 ssl.google-analytics.com, 1
+ssl.kim, 1
 ssl.md, 1
-ssl.pink, 1
-ssl.red, 1
 ssl24.pl, 1
 ssl247.co.uk, 1
 ssl247.com.mx, 1
@@ -82947,6 +87580,7 @@
 sslcheck.nl, 1
 ssld.at, 1
 ssldev.net, 1
+sslle.eu, 1
 sslmate.com, 1
 sslmonkey.net, 1
 sslok.com, 0
@@ -82985,6 +87619,7 @@
 ssuc.net, 1
 ssuiteoffice.com, 1
 ssuitesoft.com, 1
+st-andrews.org.au, 1
 st-bede.org, 1
 st-kilian-markt-erlbach.de, 1
 st-li.com, 1
@@ -83037,6 +87672,7 @@
 staff.direct, 1
 staffglass.io, 1
 staffi.tk, 1
+staffingnation.com, 1
 staffordlabour.org.uk, 1
 stage-props-blank-guns.com, 1
 stage-recuperation-points-bordeaux.com, 1
@@ -83066,10 +87702,11 @@
 stahlfors.com, 1
 stail.eu, 1
 stainedglass.net.au, 1
-stainhaufen.de, 0
+stainhaufen.de, 1
+stainless-steel-cookware.tk, 1
 stainternational.com, 1
 stair.ch, 1
-stairlin.com, 1
+stairlin.com, 0
 stairmaster.tk, 1
 stajka.tk, 1
 stakestrategy.com, 1
@@ -83081,18 +87718,21 @@
 staljedevledder.nl, 1
 stalker-eyes.ga, 1
 stalker-shop.com, 1
+stalker-source.tk, 1
 stalkerteam.pl, 1
 stalkr.net, 1
 stalkthe.net, 1
 stall-frei.de, 1
 stallardjw.me, 1
 stallionsnow.com, 1
+stalphonsusks.org, 1
 stalplus.ml, 1
 stalstroi.ml, 1
 stalworld.tk, 1
 stamboomforum.nl, 1
 stamboomgids.nl, 1
 stameystreet.com, 1
+stamforddentalarts.com, 1
 stamgent.be, 1
 stamit.nl, 1
 stamkassa.nl, 1
@@ -83116,7 +87756,6 @@
 standoff-magic.ru, 1
 standoffdrop.com, 1
 standoffdrop.ru, 1
-standoffhub.com, 1
 stang.moe, 1
 stangeland.tk, 1
 stanglwirt.com, 1
@@ -83157,6 +87796,7 @@
 starease.com, 1
 starease.net, 1
 stareplanymiast.pl, 1
+starfall.systems, 1
 starfield.ai, 1
 starfishconstruction.com, 1
 starflix.uk, 1
@@ -83178,6 +87818,7 @@
 starkvilleurgentcareclinic.com, 1
 starlim.co.in, 1
 starlim.org, 1
+starlinks.tk, 1
 starlux.cz, 1
 starmtech.fr, 1
 starmyworld.ga, 1
@@ -83200,6 +87841,7 @@
 starseersprophecy.com, 1
 starsguru.com, 1
 starsing.bid, 1
+starskim.cn, 1
 starsoft.io, 1
 starsub.com.au, 1
 start-knighki.gq, 1
@@ -83207,24 +87849,23 @@
 startablog.tv, 1
 startaninflatablebusiness.com, 1
 startbetter.tk, 1
-startbiz.id, 1
 startersiteweb.com, 1
 startgeophysical.ga, 1
 starthubs.uk, 1
+starti.com.ua, 1
 startingent.be, 1
 startinop.com, 1
 startlab.sk, 1
 startlap.es, 1
 startle.cloud, 1
 startle.studio, 1
-startlemusic.com, 1
 startliste.info, 1
 startmail.com, 1
 startner.com, 1
-startnowmakingmoneyonline.com, 0
 startpage.com, 1
 startpage.info, 1
 startplats.tk, 1
+startpoint.tk, 1
 startrek.in, 1
 starts.sh, 1
 startstack.tech, 1
@@ -83238,6 +87879,7 @@
 startupbros.com, 1
 startupisland.tw, 1
 startuplevel.com, 1
+startupstack.cloud, 1
 startupstack.llc, 1
 startupstack.net, 1
 startupstack.online, 1
@@ -83245,6 +87887,7 @@
 startupstack.services, 1
 startupstack.site, 1
 startupstack.software, 1
+startupstack.systems, 1
 startupstack.tech, 1
 startupstack.technology, 1
 startupstacksandbox.com, 1
@@ -83255,6 +87898,7 @@
 startw.cf, 1
 starvizyon.com, 1
 starwatches.eu, 1
+stasia.ml, 1
 stasiniewicz.com, 1
 stastka.ch, 1
 staszic.waw.pl, 1
@@ -83303,7 +87947,6 @@
 statuscode.ch, 1
 statusmachine.com, 1
 statuswatch.io, 1
-stau-a.de, 1
 stavanger.kommune.no, 1
 stavinchains.tk, 1
 stavnager.net, 1
@@ -83314,10 +87957,10 @@
 staycurrent.nl, 1
 staydryohio.com, 1
 staygold.blog, 1
-stayingurgaon.com, 1
 stayme.cz, 1
 stayokay.com, 1
 stayschemingco.com, 1
+staytokei.com, 1
 stb-lemke.de, 1
 stb-schefczyk.de, 1
 stb-timmler.de, 1
@@ -83325,7 +87968,6 @@
 stbartholomewmanchester.org, 1
 stbennett.org, 1
 stbl.org, 1
-stbridgeteastfalls.org, 1
 stc-istok.com.ua, 1
 stcable.net, 1
 stcatharine-stmargaret.org, 1
@@ -83337,6 +87979,7 @@
 stclementreligioused.org, 1
 stcplasticsurgery.com, 1
 std-home-test.com, 1
+stdavidparish.org, 1
 stderr.cc, 1
 stderr.ch, 1
 stdev.org, 1
@@ -83351,6 +87994,8 @@
 stealthvape.co.uk, 1
 steam-rewards.tk, 1
 steam-route-saxony.com, 1
+steamcarddelivery.com, 1
+steamcars.be, 1
 steamcleaning.expert, 1
 steamcrack.ga, 1
 steamdb.info, 1
@@ -83370,8 +88015,11 @@
 stebet.net, 1
 steborio.pw, 1
 steckel.cc, 1
+stecos.co.uk, 1
 stedb.eu, 1
 stedbg.net, 1
+steebel.com.au, 1
+steeble.com.au, 1
 steef389.eu, 1
 steel-roses.de, 1
 steelbeasts.org, 1
@@ -83403,14 +88051,17 @@
 stefandepooter.com, 1
 stefanengineering.com, 1
 stefanfriedli.ch, 1
+stefania.tk, 1
 stefaniepetermann.eu, 1
+stefaniharvilla.tk, 1
 stefanknobel.ch, 1
 stefanolsdal.tk, 1
-stefanorossi.it, 1
+stefanorossi.it, 0
 stefanovski.io, 1
 stefanvanburen.xyz, 0
 stefanvd.net, 1
 stefanviehbacher.de, 1
+stefany.cloud, 1
 stefany.eu, 1
 stefchapman.tk, 1
 steffenmeister.com, 1
@@ -83437,6 +88088,7 @@
 steklein.de, 1
 stekosouthamerica.com, 1
 stelfox.net, 1
+stelga.ca, 1
 steliosmanousakis.gr, 1
 stella-artis-ensemble.at, 1
 stella-shop.eu, 1
@@ -83451,6 +88103,7 @@
 stellatusstudios.com, 1
 stelleninserate.de, 1
 stellenticket.de, 1
+stelletjeafgebeuktemongolen.tk, 1
 stellmacher.name, 1
 stels.ml, 1
 stels.tk, 1
@@ -83465,20 +88118,24 @@
 stemcellclinic.tech, 1
 stemcellclinic.vip, 1
 stemcellclinic.world, 1
+stemcellstherapynyc.com, 1
 stemgirls.co.za, 1
 stemkit4kids.com, 1
 stemklank.tk, 1
 stemmayhem.com, 1
 stempel-lobenhofer.at, 1
+stempelspirale.eu, 1
 stenaro.ch, 1
 stenhojmedia.dk, 1
 stening.co, 1
 steno.nl, 1
+stensund.se, 1
+stenvallmcclain.tk, 1
 stenzhorn-cloud.de, 1
 step2web-cms.info, 1
 stepanvanek.cz, 1
 steparovi.cz, 1
-steph.ninja, 1
+steph.ninja, 0
 steph3n.me, 1
 stephan-matthiesen.de, 1
 stephanao.tk, 1
@@ -83486,9 +88143,9 @@
 stephaniedeady.ie, 1
 stephanieleonidasfan.tk, 1
 stephanieschreiber.com, 1
+stephencorp.com, 1
 stephencreilly.com, 1
 stephenhaunts.com, 1
-stephenhorler.com.au, 1
 stephenj.co.uk, 1
 stephenjvoiceovers.com, 1
 stephenlam.ca, 1
@@ -83511,7 +88168,6 @@
 steponedanceclub.uk, 1
 steppingoutinstyleonline.com, 1
 stepstone.dk, 1
-stepsweb.com, 1
 stepupforeurope.eu, 1
 ster-enzo.nl, 1
 sterchi-fromages.ch, 0
@@ -83530,7 +88186,6 @@
 sternplastic.com, 1
 sternsinus.com, 1
 sterohouse.com, 1
-steroidninja.com, 1
 sterva.mobi, 1
 sterydki.pl, 1
 sterz.io, 1
@@ -83545,7 +88200,6 @@
 steuertipps-sonderausgaben.de, 1
 steve-mason.tk, 1
 steve.kiwi, 1
-steve1673.com, 1
 steveborba.com, 1
 stevebuck.tk, 1
 stevecostar.com, 1
@@ -83560,7 +88214,7 @@
 stevemason.tk, 1
 stevemonteyne.be, 1
 steven-bennett.com, 1
-steven-klix.de, 1
+steven-klix.de, 0
 steven.photos, 1
 stevenapate.com, 1
 stevenavaldez.tk, 1
@@ -83607,12 +88261,14 @@
 sthelen.eu, 1
 sthelensoregon.gov, 1
 sthenryrc.org, 1
+sthetix.info, 1
 sthpr.gr, 1
 stian.net, 1
 stichtingdemuziekkamer.nl, 1
 stichtingliab.nl, 1
 stichtingscholierenvervoerzeeland.nl, 1
 stichtingsticky.nl, 0
+stichtingvlinders.nl, 1
 stick2bike.de, 1
 stickandpoketattookit.com, 1
 stickeramoi.com, 1
@@ -83622,6 +88278,7 @@
 stickies.io, 1
 stickme.be, 1
 stickmy.cn, 1
+stickstone.co, 1
 stickstueb.de, 1
 stickswag.cf, 1
 stickswag.eu, 1
@@ -83631,8 +88288,14 @@
 stickyricelove.com, 1
 stiebel-eltron.co.nz, 1
 stiebel-eltron.com.au, 1
+stiebel.co.nz, 1
+stiebel.com.au, 1
 stiebelmedia.co.nz, 1
 stiebelmedia.com.au, 1
+stiebelrewards.com.au, 1
+stiebelservice.com.au, 1
+stiebelstore.com.au, 1
+stiehler-leipzig.tk, 1
 stiff.wang, 1
 stifflersmom.ga, 1
 stift-kremsmuenster.at, 1
@@ -83650,13 +88313,14 @@
 stikic.me, 1
 stikkie.me, 1
 stikonas.eu, 0
+stil.dk, 1
 stileapp.com, 1
 stiliankasimov.com, 1
 stilida.com, 1
 stilingavonia.lt, 1
 stillsnfilms.com, 1
 stillwell.me, 1
-stilmobil.se, 1
+stilnaya-odezhda.tk, 1
 stilsvadba.tk, 1
 stiltmedia.com, 1
 stiltnerelectric.com, 1
@@ -83666,10 +88330,11 @@
 stina-vino.hr, 1
 stinaspiegelberg.com, 1
 stingraybook.com, 1
+stinici.site, 1
 stinkefingereinhorn.de, 1
 stinsky.com, 1
 stinter.cf, 1
-stintup.com, 1
+stintup.com, 0
 stipsan.me, 1
 stirblaut.de, 1
 stirling.co, 1
@@ -83695,11 +88360,12 @@
 stkeverneparishcouncil.org.uk, 1
 stkevin-stbenedict.org, 1
 stkildaosteopathy.com.au, 1
-stl.news, 0
 stla.net, 1
 stleonardmn.org, 1
 stlfamilyattorney.com, 1
+stlfence.com, 1
 stln.ml, 1
+stlouisfence.com, 1
 stlouisinsuranceco.com, 1
 stlouisnativeflute.com, 1
 stlouisstabilizing.com, 1
@@ -83730,7 +88396,6 @@
 stnguyen.net, 1
 stnl.de, 0
 sto-avtovo.com, 1
-sto500.com.ua, 1
 stock-ai.com, 1
 stock-solution.de, 1
 stockanalysis.com, 1
@@ -83742,6 +88407,7 @@
 stockslam.ga, 1
 stocksnews.tk, 1
 stockstuck.com, 1
+stockt-shirtdesigns.com, 1
 stocktonengineering.co.uk, 1
 stocktout.info, 1
 stocktrader.com, 1
@@ -83760,7 +88426,6 @@
 stokl.com.au, 0
 stokvistrading.nl, 1
 stolarka.tk, 1
-stolarstvi-jiriholy.cz, 1
 stolbart.com, 1
 stolensheep.tk, 1
 stolensun.tk, 1
@@ -83773,12 +88438,13 @@
 stolpersteine-dithmarschen.tk, 1
 stolpi.is, 0
 stoltz-it.de, 1
+stomaline.com.ua, 1
 stomatolog.cf, 1
 stomatolog.ga, 1
 stomatologiya.gq, 1
 stomatologiya.ml, 1
+stomproced.ro, 1
 stomt.com, 1
-stomwhite.com, 1
 stoneagehealth.com.au, 1
 stonechatjewellers.ie, 1
 stonecutgods.com, 1
@@ -83836,7 +88502,7 @@
 stopthinkconnect.jp, 1
 stoptrading.co.uk, 1
 stopves.tk, 1
-stopvirus.in, 0
+stopvirus.in, 1
 stopyhrdinu.cz, 1
 storage-base.de, 1
 storage-books.gq, 1
@@ -83848,6 +88514,7 @@
 storeandforward.nl, 1
 storebusy.nz, 1
 storecove.com, 0
+storedaway.co.uk, 1
 storedieu.com, 1
 storedsafe.com, 1
 storeforward.email, 1
@@ -83876,6 +88543,7 @@
 stormhub.ml, 1
 stormi.io, 1
 stormingbrain.com, 1
+stormrider.tk, 1
 stormwatcher.org, 1
 stormylegions.tk, 1
 stormyyd.com, 1
@@ -83893,13 +88561,14 @@
 storytell.com, 1
 storytellingforbusiness.com.au, 1
 storytime.hu, 1
+stoutassociates.com, 1
 stouter.nl, 1
-stove-server.cn, 1
 stoverepairaustin.com, 1
 stoxford.com, 1
 stp-ip.com, 1
 stp-ip.net, 1
 stp.dev, 1
+stpatrick.tk, 1
 stpatrickbayshore.org, 1
 stpatrickkennettsquare.org, 1
 stpatrickri.org, 1
@@ -83907,6 +88576,7 @@
 stpatsschool.org, 1
 stpaulcatholicchurcheastnorriton.net, 1
 stperseo.tk, 1
+stpetersresidence.org, 0
 stphilipneripreschool.com, 1
 stpioparish.com, 1
 stpip.com, 1
@@ -83916,10 +88586,12 @@
 straalatelier.com, 1
 straat.net, 1
 straatderzotten.nl, 1
+stradsolutions.ga, 1
 strafe-muss-sein.at, 1
 strafensau.de, 1
 strafvollzugsgesetze.de, 1
 strahlende-augen.info, 1
+strahovanienet.tk, 1
 straightedgebarbers.ca, 0
 straightlinetutoring.com, 1
 straightnude.com, 1
@@ -83944,18 +88616,22 @@
 strangelandsoundstage.com, 1
 strangelane.com, 1
 strangelanerecords.com, 1
+strangelittlecovers.tk, 1
 strangemusicbox.com, 1
 strangemusichollywood.com, 1
 strangemusicinc.com, 1
 strangemusicinc.net, 1
 strangeonline.tk, 1
+strangerthanusual.de, 1
 strangevip.com, 1
 strangeways.ca, 0
 strangeworksinc.com, 1
 strangeworldmerch.com, 1
 strangeworldmerchandising.com, 1
+straniero.net, 1
 straphael-holyangels.com, 1
 strappazzon.xyz, 1
+strass-sur-mesure.fr, 1
 strassberger.tk, 1
 strate.io, 1
 strategic9.se, 1
@@ -83969,8 +88645,12 @@
 stratforge.com, 1
 strathspeycrown.com, 1
 stratik.com.co, 1
+stratlibs.org.uk, 1
 stratmann-b.de, 1
+stratocumulus.legal, 1
 stratreg.com, 1
+stratsoftware.com, 1
+strattonhats.com, 1
 stratuscloud.co.za, 1
 stratuscloudconsulting.net, 1
 stratussc.com, 1
@@ -83979,6 +88659,7 @@
 stravers.shoes, 1
 strawberries.tk, 1
 strawberry-laser.gr, 1
+strawberrydreadlocks.tk, 1
 straydio.co.uk, 1
 straylight.tk, 1
 strd.co, 1
@@ -83987,9 +88668,11 @@
 streamchan.org, 1
 streamelements.com, 1
 streamgato.com, 1
+streamgoalandres.ml, 1
 streaming-download.net, 1
 streamlineverify.com, 1
 streamodz.com, 1
+streamonline.fi, 1
 streampanel.net, 1
 streampleasure.xyz, 1
 streamrite.com, 1
@@ -84004,7 +88687,9 @@
 street-medics.fr, 1
 street-tek.com, 1
 streetdancecenter.com, 1
+streetforceteam.tk, 1
 streetlightdata.com, 1
+streetmaderecordz.tk, 1
 streetmarket.ru, 1
 streets.mn, 1
 streetshirts.co.uk, 1
@@ -84016,7 +88701,9 @@
 strehl.tk, 1
 strelnicesmirice.cz, 1
 stremio.com, 1
+strengthennd.com, 1
 strengthinyoufitness.com, 1
+strengthnutrition.es, 1
 strengthroots.com, 1
 stress-mess-punkte.de, 1
 stressexplained.com, 1
@@ -84028,13 +88715,16 @@
 striata.org, 1
 striatadev.com, 1
 strick-welt.de, 1
+stricken.gq, 1
 stricted.net, 1
 strictlyguitar.de, 1
 strictlynormal.com, 1
 strijdmeevoorvrede.gent, 1
 strijkshop.be, 1
 strikeout.ga, 1
+strikers.cf, 1
 strikers.futbol, 1
+strikevectorex.com, 1
 strings.cf, 1
 stringtoolbox.com, 1
 stringvox.com, 0
@@ -84047,7 +88737,6 @@
 striptizer.tk, 1
 strivephysmed.com, 0
 strl-tunis.tk, 1
-strm.hu, 1
 strm.pl, 1
 strmgt.com, 1
 strobe.cool, 1
@@ -84062,6 +88751,7 @@
 strogova.me, 1
 stroifenix.ru, 1
 stroimsami.tk, 1
+stroimvse.ml, 1
 stroiproect.tk, 1
 strojmaster.tk, 1
 stroke-of-luck.com, 1
@@ -84082,6 +88772,8 @@
 strongtowerpc.com, 1
 stroomacties.nl, 1
 stroopwafel.ch, 1
+stropek.eu, 1
+stropkova.eu, 1
 strosemausoleum.com, 1
 stroseoflima.com, 1
 strotmann.de, 1
@@ -84090,6 +88782,7 @@
 stroydvor.tk, 1
 stroyka-iz-brusa.ru, 1
 stroynet.ml, 1
+stroyservice-tver.ru, 1
 strozik.de, 1
 strrl.com, 1
 strtrade.com, 1
@@ -84100,6 +88793,7 @@
 strunecka.cz, 1
 struxureon.com, 1
 strydom.me.uk, 1
+sts-consulting.it, 1
 stsolarenerji.com, 1
 ststanislaus.com, 1
 stt.wiki, 1
@@ -84118,6 +88812,9 @@
 stuartmorris.name, 1
 stuartmorris.tel, 1
 stuartparsons.com, 1
+stubbings.de, 1
+stubbingsmail.de, 1
+stubbmail.de, 1
 stubentiga.de, 1
 stuckateur-bruno.de, 0
 stucki-bagger.ch, 1
@@ -84126,12 +88823,11 @@
 stucydee.nl, 1
 stud-lib.ml, 1
 studay.fr, 1
+studboo.com, 1
 student.andover.edu, 1
 studentaid.gov, 1
 studentenmobiliteit.be, 1
 studenterguiden.dk, 1
-studentfinancecountdown.com, 1
-studentforums.biz, 1
 studenti.tk, 1
 studentingent.be, 1
 studentite.bg, 0
@@ -84150,6 +88846,7 @@
 studiekortet.org, 1
 studiekortet.se, 1
 studienportal.eu, 1
+studierttomnoch.de, 1
 studio-637.com, 1
 studio-abok.com, 1
 studio-architetto.com, 1
@@ -84198,7 +88895,6 @@
 studiostudio.net, 1
 studiosuracidenunzio.it, 1
 studiosus-gruppenreisen.com, 1
-studiosus.com, 1
 studiotheatrestains.fr, 1
 studiotres.com.br, 1
 studiovaud.com, 0
@@ -84239,6 +88935,7 @@
 stumf.si, 1
 stuntman.ga, 1
 stuntmen.xyz, 1
+stupendo.ec, 1
 stuphid.tk, 1
 stupidest.org, 1
 stupidstatetricks.com, 1
@@ -84258,6 +88955,7 @@
 stuvel.eu, 1
 stuvus.de, 1
 stuvus.uni-stuttgart.de, 1
+stuyvesantoutdoor.com, 1
 stview.me, 1
 stx.ie, 1
 stygium.net, 0
@@ -84271,6 +88969,7 @@
 styledbysally.com.au, 1
 styleelite.tk, 1
 styleetvieperfumes.com, 1
+styleflow.nl, 1
 stylemall.tk, 1
 styletheweb.cf, 1
 styletron.org, 1
@@ -84312,6 +89011,7 @@
 sublimebits.com, 1
 sublimesecurity.com, 1
 sublimetours.com, 1
+sublimm.fr, 1
 sublocale.com, 0
 submedia.tv, 0
 submeet.vet, 1
@@ -84321,17 +89021,21 @@
 submityour-link.tk, 1
 subohm.com, 1
 suborbital.io, 1
+subpage.tk, 1
 subrad.io, 1
-subrosr.com, 1
 subsistence.wiki, 1
 substitutealert.com, 1
+substore.co.il, 1
 subteen.gq, 1
 subtitry.ru, 1
+subtlelonging.com, 0
 suburban-landscape.net, 1
 suburbaninfinitioftroyparts.com, 1
+suburbanprojects.com.au, 1
 suburbanpsych.org, 1
 suburbansites.com, 1
-suburbservice.net, 1
+suburbanweldingandsteel.com, 1
+suburbservice.net, 0
 subversionnews.tk, 1
 subversive-tech.com, 1
 subwaysurfers.tk, 1
@@ -84345,12 +89049,14 @@
 successemails.ml, 1
 successful-online-business.com, 1
 successminds.com, 1
+succorfish.net, 1
 succubus.network, 1
 succubus.xxx, 1
 sucessclick.gq, 1
 suceveanca.ro, 1
 suche.org, 1
 suchem.com, 1
+suchhire.com, 1
 suchmaschinen-werkstatt.de, 1
 suckmyan.us, 0
 sucretown.net, 1
@@ -84371,6 +89077,7 @@
 suecaunitedfc.tk, 1
 suelyonjones.com, 1
 suempresa.cloud, 1
+sueno.ro, 1
 suenotek.com, 1
 suerteloteria.com, 1
 suessdeko.de, 1
@@ -84380,6 +89087,7 @@
 sufleu.ro, 1
 sufleuri.ro, 1
 sugarbrother.com, 0
+sugarcube.ml, 1
 sugardaddy.network, 1
 sugardating.network, 1
 sugarhillsfarm.com, 1
@@ -84410,6 +89118,7 @@
 suitocracy.com, 1
 sujal.com, 1
 sujatadev.in, 1
+sujiao.de, 1
 sujoydhar.in, 1
 sukamusik.tk, 1
 suke3.jp, 1
@@ -84448,6 +89157,7 @@
 sumit.me, 1
 sumit.sh, 1
 sumitbot.ga, 1
+sumitchahal.blog, 1
 sumitchahal.com, 1
 summa.eu, 0
 summarized.gq, 1
@@ -84464,9 +89174,9 @@
 summitcountyboe.gov, 1
 summiteyekc.com, 1
 summitlighthousela.org, 1
+summus.jp, 1
 summusglobal.com, 1
 sumochki.tk, 1
-sumopages.com, 1
 sumppumpchicagoil.com, 1
 sumthing.com, 1
 sumutoday.com, 1
@@ -84483,6 +89193,7 @@
 sun668.co, 1
 sunbit.com, 1
 sunblind.tk, 1
+sunboxstore.jp, 0
 sunbritetv.com, 0
 sunbury.xyz, 1
 sunchasercats.com, 1
@@ -84501,6 +89212,7 @@
 suncity8668.com, 1
 suncity8998.com, 1
 suncitycinemas.com, 1
+suncloud.ch, 1
 sundanceusa.com, 1
 sunday.pm, 1
 sundayfundayjapan.com, 1
@@ -84518,6 +89230,7 @@
 sungreen.info, 1
 sunhaoxiang.net, 1
 sunjiutuo.com, 1
+sunkar.tk, 1
 sunlit.cloud, 1
 sunn.ie, 1
 sunny.co.uk, 1
@@ -84542,6 +89255,7 @@
 sunroomschicagoil.com, 1
 sunsdesign.net, 1
 sunsetdentalhenderson.com, 1
+sunsetfire.de, 1
 sunsetnelson.com, 1
 sunsetwx.com, 1
 sunshilin.tk, 1
@@ -84549,14 +89263,15 @@
 sunshinecoastplumbingcompany.com.au, 1
 sunshinefrontier.tk, 1
 sunshinelife.tk, 1
+sunshinerequest.com, 1
 sunshinesf.org, 1
 sunsong.org, 1
 sunsquare.cz, 1
 sunstar.bg, 1
 suntzuparadirectivos.com, 1
 sunwolf.studio, 1
+sunyanzi.cf, 1
 sunyanzi.tk, 1
-suomenkielisetnettikasinot.com, 1
 suomiheraa.com, 1
 suomika.pl, 1
 suourl.com, 1
@@ -84566,6 +89281,7 @@
 supedio.com, 1
 supedium.com, 1
 supel.gq, 1
+super-baik.tk, 1
 super-boy.tk, 1
 super-erotica.ru, 1
 super-knighki.gq, 1
@@ -84601,7 +89317,11 @@
 superdroni.com, 1
 superenduro.net, 1
 superfaktura.at, 1
+superfaktura.cz, 1
+superfaktura.sk, 1
 superfastpress.com, 1
+superfly.tk, 1
+superfoods.org.pe, 1
 superfoodsexplained.com, 1
 superfury.tk, 1
 superglidewardrobes.co.uk, 1
@@ -84624,7 +89344,9 @@
 superkonsult.se, 1
 superkrasota.tk, 1
 superlandnetwork.de, 1
+superlight.tk, 1
 superlisa.nl, 1
+superlog.tk, 1
 superlol.tk, 1
 supermae.pt, 1
 supermagna.tk, 1
@@ -84644,7 +89366,6 @@
 superpi.noip.me, 1
 superraclette.fr, 1
 supersahnetorten.de, 1
-supersandro.de, 1
 superservers.ml, 1
 supershrooms.nl, 1
 supersisi.cf, 1
@@ -84667,19 +89388,14 @@
 supertrade.tk, 1
 supertutorial.com.br, 1
 supervets.com.au, 1
-supervisionassist.com, 1
 superway.es, 1
+superweb.design, 1
 superzaim.ga, 1
 supeuro.com, 1
+supfood.cz, 1
 supioka.com, 1
 suplementasi.com, 1
 suplementosmarket.com, 1
-suplments.co.uk, 0
-suplments.com, 0
-suplments.de, 0
-suplments.fr, 0
-suplments.it, 0
-suplments.pt, 0
 supmil.net, 1
 supperclub.net, 1
 supplement.cf, 1
@@ -84687,27 +89403,29 @@
 supplementswatch.com, 0
 supplies24.at, 1
 supplies24.es, 1
+supplycore.com, 1
 supplynation.org.au, 1
 support-ticino.ch, 1
 support.mayfirst.org, 0
-support96.ru, 1
 supportadvantage.co.uk, 1
 supportal.one, 1
 supportericking.org, 1
 supportfan.gov, 1
-supportmeindia.com, 0
+supportmeindia.com, 1
 supra.tf, 1
 supracube.com, 1
 suprax365.tk, 1
 suprem.biz, 0
 suprem.ch, 0
+supremaa.com, 1
+supremaquimica.com.br, 1
+supreme-council.me, 1
 supreme-court.tk, 1
 supremestandards.com, 1
 supriville.com.br, 1
 supweb.ovh, 1
 sur-v.com, 1
 suranganet.tk, 1
-surasak.net, 1
 surasak.org, 1
 surasak.tk, 1
 suraya.online, 1
@@ -84715,6 +89433,8 @@
 sure-it.de, 1
 surefit-oms.com, 1
 surefleet.com.au, 1
+surf1969.tk, 1
+surfingnash.com, 1
 surfnetkids.com, 1
 surfnetparents.com, 1
 surfocal.com, 1
@@ -84726,13 +89446,16 @@
 surgerylifeenhancement.com, 1
 surgicalassociateswny.com, 1
 surgispa.net, 1
+surialternat.tk, 1
 suricate.ru, 1
 suriname.tk, 1
 surnet.io, 1
 surnganet.tk, 1
 suroil.com, 1
 surpreem.com, 1
+surpriz-net.tk, 1
 surrealcoder.com, 0
+surrealismocantabria.tk, 1
 surrealistas.tk, 1
 surreyheathyc.org.uk, 0
 surthriveak.com, 1
@@ -84742,6 +89465,7 @@
 surveer.com, 1
 surveyhealthcare.com, 1
 surveymill.co.uk, 1
+surveyorcloud.com, 1
 survivalfitnessplan.com, 1
 survivebox.fr, 1
 survivebox.net, 1
@@ -84750,13 +89474,13 @@
 susanagomez.tk, 1
 susanbpilates.co, 1
 susanbpilates.com, 1
+susanmmeyersauthor.com, 1
 susann-kerk.de, 0
 susanna-komischke.de, 1
 susanvelez.com, 1
 susconam.org, 1
 suseki.ga, 1
 sushi-sakura.tk, 1
-sushi.restaurant, 1
 sushi.roma.it, 1
 sushibesteld.nl, 1
 sushifrick.de, 1
@@ -84772,6 +89496,7 @@
 sustainability.gov, 1
 sustainabilityknowledgegroup.com, 1
 sustainabilitysociety.hk, 1
+sustained.tk, 1
 sustainimum.com, 1
 sustainimum.email, 1
 sustainimum.eu, 1
@@ -84783,6 +89508,7 @@
 susthx.com, 1
 sutabi.tk, 1
 sutas.market, 1
+sutinenmatthews.tk, 1
 suts.co.uk, 1
 suttacentral.net, 1
 suttonbouncycastles.co.uk, 1
@@ -84812,7 +89538,6 @@
 svanstrom.org, 1
 svantner.sk, 1
 svarka22.ml, 1
-svarnyjunak.cz, 1
 svarovani.tk, 1
 svatba.cf, 1
 svatbamisiaviti.tk, 1
@@ -84847,12 +89572,14 @@
 svenpeter.org, 1
 svenskakyrkansunga.tk, 1
 svenskapsalmer.se, 1
+svenskarnaochinternet.se, 1
 svenskmediabevakning.se, 1
 svensson-generators.be, 1
 sverdlov.spb.ru, 1
 sverdlovsk.gq, 1
 sverdlovsk.ml, 1
 sverdlovsk.tk, 1
+sverigeringen.se, 1
 sverlo.cf, 1
 svet.tk, 1
 svetandroida.cz, 1
@@ -84864,6 +89591,8 @@
 svetoch.ga, 1
 svetodiod.gq, 1
 svetonaushniki.tk, 1
+svetplast.msk.ru, 1
+svetplast.spb.ru, 1
 svg-board.ml, 1
 svgzone.tk, 1
 svhni.nl, 1
@@ -84876,14 +89605,17 @@
 svjvn.cz, 1
 svm-basketball.de, 1
 svo-intranet.de, 1
+svobodny.fr, 1
 svobodnyblog.cz, 1
 svodjapan.info, 1
+svoi-ugolok.tk, 1
 svoimi-slovami.tk, 1
 svorcikova.cz, 1
 svorkmofotball.tk, 1
 svpe.de, 1
 svpe.eu, 1
 svpoa.org.uk, 1
+svrtechnologies.com, 1
 svrx.one, 1
 svse.global, 1
 svseglobal.com, 1
@@ -84903,16 +89635,18 @@
 swallowgateway.com, 1
 swallsoft.co.uk, 1
 swallsoft.com, 1
+swamiclub.ru, 1
 swanbitcoin.com, 1
 swankism.com, 1
 swansdoor.org, 1
 swap.gg, 1
 swap.ly, 1
+swapbox.tk, 1
 swapfin.com, 1
-swaptaxdata.com, 1
 swarfarm.com, 1
 swarlys-server.de, 1
 swarmation.com, 1
+swarmdrone.services, 1
 swat.io, 1
 swat4stats.com, 1
 swatee.com, 1
@@ -84923,8 +89657,6 @@
 swc-cfc.gc.ca, 1
 swcloud.io, 1
 swd.agency, 1
-swd.media, 1
-swdiscount.ru, 1
 swe77.com, 1
 swe777.com, 1
 sweak.net, 1
@@ -84962,7 +89694,9 @@
 sweetydecor.ru, 1
 sweharris.org, 1
 swerve-media-testbed-03.co.uk, 1
+swet.com.ua, 1
 swetrust.com, 1
+swevenstays.com, 1
 swey.net, 0
 swfmax.com, 1
 swgenetx.com, 1
@@ -84981,10 +89715,11 @@
 swiftirc.net, 1
 swiftpak.co.uk, 1
 swiftqueue.com, 1
+swiftrecharge.com, 1
 swilly.org, 1
+swim-smart.com, 1
 swimmingpoolaccidentattorney.net, 1
 swimmingpoolpumpsbassonia.co.za, 1
-swimmingpoolshop.co.za, 1
 swimpool.co.il, 1
 swimpools.co.il, 1
 swimready.net, 1
@@ -85004,6 +89739,7 @@
 swish-ict.com, 0
 swiss-apartments.com, 0
 swiss-connection.net, 0
+swiss-sale.ch, 1
 swiss-vanilla.ch, 1
 swiss-vanilla.com, 1
 swissbearfoodservices.com, 1
@@ -85042,6 +89778,7 @@
 switchur.com, 1
 swivells.com, 1
 swjtu.today, 1
+swjz.art, 1
 swkdevserver.tk, 1
 swktestserver.tk, 1
 swmcfcu.org, 1
@@ -85057,6 +89794,7 @@
 swrelay.net, 1
 swrelay.xyz, 1
 swrpgitems.com, 1
+swtrayssq.gq, 1
 swtun.com, 1
 swvaux.com, 1
 swxtd.com, 1
@@ -85069,10 +89807,10 @@
 sxistolithos.gr, 1
 sy-anduril.de, 1
 sy24.ru, 1
-syajvo.if.ua, 0
 syakeapps.net, 1
 syakonavi.com, 1
 syazli7.me, 1
+syc-rotterdam.tk, 1
 sycamorememphis.org, 1
 sycca.com, 1
 sychov.pro, 1
@@ -85113,7 +89851,7 @@
 symbiose-immobilier.ch, 0
 symbiose.com, 1
 symbiosecom.ch, 0
-symbolic.software, 1
+symbolics.digital, 1
 symdevinc.com, 1
 symeda.de, 1
 symeonchen.com, 1
@@ -85122,12 +89860,15 @@
 symlink.io, 1
 symlnk.de, 1
 symoteb.ir, 1
+symphonise.consulting, 1
 sympletrade.com, 1
 symplexia.com.br, 1
 symplyos.tk, 1
 sympmarc.com, 1
 symposium.beer, 1
 symptome-erklaert.de, 1
+symstar.co.uk, 1
+symvolik.ru, 1
 syna.dev, 1
 syna.site, 1
 synabi.com, 0
@@ -85150,6 +89891,7 @@
 syncmindglobal.com, 1
 syncmylife.net, 0
 syncplay.pl, 1
+syncresis.com, 1
 syncrise.co.jp, 1
 synd.io, 1
 syndic-discount.fr, 0
@@ -85166,6 +89908,7 @@
 synergyzone.tk, 1
 synerionagile.com, 1
 synfin.org, 1
+synicalsyntax.com, 1
 synitsa.tk, 1
 synobook.com, 1
 synology.com, 0
@@ -85176,11 +89919,13 @@
 synrestaccounting.com, 1
 syntaxnightmare.com, 1
 synth.style, 1
+synthesisorganics.com, 1
 syntheticgrassliving.com.au, 1
 synthetictrading.com, 1
 synthetik.com, 1
 synthv.fun, 0
 syntia.tk, 1
+syo-ryuga.jp, 1
 syobon.org, 1
 syogainenkin119.com, 1
 syoier.com, 1
@@ -85206,6 +89951,7 @@
 sysclouds.de, 1
 syscoon.com, 1
 sysctl.se, 1
+syscurve.com, 1
 sysdb.io, 1
 sysert.tv, 0
 sysgap-gsci.com, 1
@@ -85214,6 +89960,9 @@
 syslogic.io, 1
 sysmike.de, 1
 sysmike.net, 1
+sysoon.com, 1
+sysoon.net, 1
+sysoons.com, 1
 sysrq.tech, 0
 systea.fr, 1
 systea.net, 1
@@ -85239,20 +89988,20 @@
 systemisbusy.info, 1
 systemlead.pl, 1
 systemli.org, 1
+systemofabrown.com, 1
 systemonthego.com, 1
 systemplust.com, 1
 systemspace.link, 1
 systemtoto.ml, 1
 systemzeit.info, 1
-systime.dk, 1
 systoolbox.net, 1
 systrax.com, 1
-sysv-consult.de, 1
 syswiki.org, 1
 sysystems.cz, 1
 syt3.net, 1
 syuez.com, 1
 syunpay.cn, 1
+syuumi.me, 1
 sywnthkrawft.tk, 1
 syzdev.com, 1
 syzygy-tables.info, 1
@@ -85266,13 +90015,13 @@
 szclsya.me, 0
 szczury.org, 1
 szechenyi2020.hu, 1
+szelagnes.hu, 1
 szentistvanpt.sk, 1
 szepsegbennedrejlik.hu, 1
 szeptylasu.eu, 1
 szerbnyelvkonyv.hu, 1
 szerelem.love, 1
-szetowah.org.hk, 1
-szkolajazdykaleta.pl, 1
+szkolajazdykaleta.pl, 0
 szlovaknyelv.hu, 1
 szlovennyelv.hu, 1
 szotkowski.info, 1
@@ -85293,7 +90042,9 @@
 t-network.nl, 1
 t-nice.com, 1
 t-pc.org, 1
+t-shirt-template.com, 1
 t-shirts4less.nl, 1
+t-shirty.tk, 1
 t-stonegroup.com, 1
 t-tz.com, 0
 t-unit.ru, 1
@@ -85302,7 +90053,6 @@
 t00ts.com, 0
 t060.com, 1
 t070.com, 1
-t0ne.net, 0
 t0ny.name, 1
 t12u.com, 1
 t1everydaymagic.com, 1
@@ -85333,13 +90083,9 @@
 t6957.co, 1
 t776633.com, 1
 t7802.com, 1
-t7803.com, 1
-t7804.com, 1
 t7805.com, 1
 t7807.com, 1
 t7808.com, 1
-t7809.com, 1
-t7810.com, 1
 t7880.com, 1
 t7e.de, 0
 t81365.com, 1
@@ -85395,9 +90141,11 @@
 tabclassics.tk, 1
 tabegamisama.com, 1
 tabelekaloryczne.waw.pl, 1
+tabernaalibaba.tk, 1
 tabernastudios.pe, 1
 tabi-news.com, 1
 tabi-runrun.com, 1
+tabi-time.com, 1
 tabira.tk, 1
 tabisuta.com, 1
 tablamatica.tk, 1
@@ -85411,12 +90159,14 @@
 tablet.facebook.com, 0
 tabletd.com, 1
 tabletennis-tt.tk, 1
+tabletsandlaptops.com, 1
 tabletsbaratasya.com, 1
 tablettes-tactiles.tk, 1
 tableturnrms.com, 1
 tablondeempleo.com, 1
 tablotv.com, 0
 tablyrics.com, 1
+tabordaadvogados.ga, 1
 taborsky.cz, 1
 tabpanelwidget.com, 1
 tabtap.shop, 1
@@ -85428,8 +90178,11 @@
 tachoplus.pl, 1
 tachyonapp.com, 1
 taciso.com, 1
+tackle.io, 1
 tackleyourfeelings.com, 1
+tacoma-anesthesia.com, 1
 tacoma-dui-attorneys.com, 1
+tacoma-massage.com, 1
 tacomafia.net, 1
 tacotown.tk, 1
 tacticalavocado.com, 1
@@ -85452,10 +90205,12 @@
 tafusu-support.com, 1
 tagabrand.co.uk, 1
 tagalliances.com, 1
+tagalog.com, 1
 tagana-anindustrialpark.tk, 1
 tagarelaskidseteens.com.br, 1
 tagat.top, 1
 tagaytayhighlands.com, 1
+tagboards.tk, 1
 tagderinspiration.ch, 1
 tagdocumentary.com, 1
 taggedpdf.com, 0
@@ -85477,20 +90232,23 @@
 tagungsraum-zinnowitz.de, 1
 tagungsstaette-usedom.de, 1
 tagungsstaette-zinnowitz.de, 1
-tahakomlearning.com, 0
-taherian.me, 1
+tahakomlearning.com, 1
+tahaonline.tk, 1
 tahmintr.com, 1
 tahosa.co, 0
 tahrirbazar.com, 1
 tahugocilebut.com, 1
 tahvienovin.ir, 1
+tai-in.com, 1
+tai-in.net, 1
 taiaro.tk, 1
 taibachicken.com, 1
 taibafarms.com, 1
 taichi-jade.com, 1
-taichichuanyang.com, 1
 taidu.news, 1
+taiga-aikidojo.tk, 1
 taihesy.tk, 1
+taijutsubudo.com.au, 1
 taikhoanfree.com, 1
 taikodom.tk, 1
 tail.id.lv, 1
@@ -85517,6 +90275,7 @@
 taiwanteama.com.tw, 1
 taiwantechtrek.tk, 1
 taiwantour.info, 0
+taiyou-planning.com, 1
 taiyouko-hatuden.net, 1
 taizegroep.nl, 1
 taj-portal.tk, 1
@@ -85542,6 +90301,7 @@
 takeshifujimoto.com, 0
 takestars.tk, 1
 takethatspainfanclub.tk, 1
+takhfifeirani.ir, 1
 taki.sh, 1
 taki.sk, 1
 taki.to, 1
@@ -85558,6 +90318,7 @@
 takumi-s.net, 1
 takusan.ru, 1
 takuto.de, 0
+takzetak.sk, 1
 talado.gr, 0
 taleintwo.com, 1
 talendipank.ee, 1
@@ -85580,11 +90341,12 @@
 talk.google.com, 1
 talk.xyz, 1
 talkaboutdesign.com, 1
+talkbasket.net, 1
 talkgadget.google.com, 1
 talking12.com, 1
 talkingband.org, 1
+talkingbittersweet.com, 1
 talkingmoose.net, 1
-talkmojang.club, 1
 talknetwork.ru, 1
 talkreal.net, 1
 talkscope.ml, 1
@@ -85593,8 +90355,10 @@
 talktwincities.com, 1
 talkwithyourbaby.org, 1
 talkx.de, 1
+tallac.tk, 1
 tallcraft.com, 1
 talldude.net, 1
+tallercs.tk, 1
 tallgrasslegal.com, 1
 tallinnsec.ee, 1
 tallinnsex.ee, 1
@@ -85610,6 +90374,7 @@
 tam-safe.com, 1
 tam7t.com, 0
 tamada.expert, 1
+tamamo.cat, 1
 tamareverson.tk, 1
 tamatoyaku.com, 1
 tambayology.com, 1
@@ -85622,9 +90387,11 @@
 tamchunho.com, 1
 tamdidpay.tk, 1
 tamersunion.org, 0
+tamilentertainment.tk, 1
 tamilsms.blog, 1
 tamiltax.tk, 1
 tamindir.com, 1
+tammelin.org, 1
 tammie.ga, 1
 tammy.pro, 1
 tamoxifen-citrate.ml, 1
@@ -85635,6 +90402,7 @@
 tampacific.net, 1
 tampacific.vn, 1
 tampaexplorer.ml, 1
+tampereenliberaalit.tk, 1
 tamriel-rebuilt.org, 1
 tamronhallshow.com, 1
 tamsulosin.gq, 1
@@ -85652,6 +90420,7 @@
 tandarts-ict.nl, 1
 tandartsen-ict.nl, 1
 tandartspraktijkreddingius.nl, 1
+tandartsvanos.nl, 1
 tandartsvanvliet.nl, 1
 tandartszilverschoon.nl, 1
 tandblekningidag.com, 1
@@ -85680,15 +90449,18 @@
 taniafitness.com, 1
 tanie-uslugi-ksiegowe.pl, 1
 taniku-succulent.com, 1
+tanjaradovic.tk, 1
 tanjasavicmusic.tk, 1
 tank-scorecard.herokuapp.com, 1
 tankpassen-vergelijken.nl, 1
 tanks.je, 1
+tanks.ml, 1
 tankski.co.uk, 1
 tanned.tk, 1
 tannenhof-moelln.de, 1
 tanner.sh, 1
 tanneradvisorysolutions.com.au, 1
+tannercorporation.com, 1
 tannerdewitt.com, 1
 tannerryan.ca, 1
 tannerwilliamson.com, 1
@@ -85698,9 +90470,9 @@
 tanovar.com, 1
 tansuya.jp, 1
 tantalos.nl, 1
-tantei100.net, 1
 tantetilli.de, 0
 tanto259.name, 1
+tantrabali.tk, 1
 tantravoorlichting.nl, 1
 tantrum-rocks.tk, 1
 tanushka.tk, 1
@@ -85715,7 +90487,7 @@
 tanzo.io, 1
 tao-energie.tk, 1
 taoaworld.com, 1
-taoburee.com, 1
+taoburee.com, 0
 taokystrong.com, 1
 taoofbeauty.tk, 1
 taotic.eu, 1
@@ -85725,6 +90497,7 @@
 taozgt.xyz, 1
 tapbutdao.com, 1
 tapchiphaidep.info, 1
+tapcloud.com, 1
 tapestries.tk, 1
 tapestryjournal.com, 1
 tapesvip.xyz, 1
@@ -85765,8 +90538,10 @@
 tardis.io, 1
 tarek.link, 1
 tarek.wtf, 1
+tarfandgram.com, 1
 targaryen.house, 1
 targetbuilding.com, 1
+targetlonglife.tk, 1
 targetx.pl, 1
 targimieszkaniowe.net, 1
 tarife.at, 1
@@ -85785,6 +90560,7 @@
 tarot.vn, 1
 tarotreadingexplained.com, 1
 tarotsgratuits.com, 1
+tarper24.net, 1
 tarrasque.io, 1
 tarsan.cz, 1
 tarsashaz-biztositas.hu, 1
@@ -85813,11 +90589,14 @@
 taskseller.com, 1
 taskulu.com, 1
 taskulu.ir, 1
+taskussa.net, 1
 taskutark.ee, 1
+taskwise.cf, 1
 taskworld.com, 1
 tasogarenoinori.net, 1
-tass.nu, 1
+tasswoq.com, 1
 tastenewwines.com, 1
+tasteofadventure.nl, 1
 tasteville.com.au, 1
 tastic.com, 1
 tastycake.net, 0
@@ -85836,12 +90615,12 @@
 tatarworld.tk, 1
 tatary.cf, 1
 tatary.tk, 1
-tatastudi.com, 1
 tateishi-ip.com, 1
 tathanhson.com, 1
 tatiana-kpb.tk, 1
 tatildekirala.com, 1
 tatildukkani.com, 1
+tatjana-young.net, 1
 tatler.com, 1
 tato.noip.me, 1
 tatort-fanpage.de, 1
@@ -85857,19 +90636,22 @@
 tatuantes.com, 1
 taturukav.tk, 1
 taubin.cc, 1
-tauedu.org, 1
+tauedu.org, 0
 tauflight.com, 1
 taunusstein.net, 1
 tauran.net, 1
 tauriscia.tk, 1
 tauschen.info, 1
+tavelbutiken.com, 1
 tavolaquadrada.com.br, 1
 tavoseimai.lt, 1
 tavsiyeforumu.com, 1
 tavsys.net, 1
 tax-brain.net, 1
 tax-guard.com, 1
+taxadvantagellc.com, 1
 taxationweb.co.uk, 0
+taxborn.com, 1
 taxdispute.win, 1
 taxedesejour-airbnb.fr, 1
 taxhawk.com, 1
@@ -85877,6 +90659,7 @@
 taxi-chamonix.fr, 1
 taxi-collectif.ch, 0
 taxi-domzale.tk, 1
+taxi-doudoune.fr, 1
 taxi-edessas.gr, 1
 taxi-jihlava.cz, 1
 taxi-legroux.com, 1
@@ -85900,6 +90683,7 @@
 taxo.fi, 1
 taxpackagesupport.com, 1
 taxteam.co.il, 1
+tayanasolutions.com, 1
 taybee.net, 1
 tayebbayri.com, 1
 taylored.ga, 1
@@ -85920,10 +90704,12 @@
 tb-bolshevik.tk, 1
 tb-devel.de, 1
 tb-itf.de, 1
-tbb2020.com, 1
-tbbvip1.com, 1
+tbb2020.com, 0
+tbbvip1.com, 0
 tbejos.com, 1
 tbfocus.com, 1
+tbi.equipment, 1
+tbi.systems, 1
 tbird-q.com, 1
 tbitc.ch, 1
 tbonejs.org, 1
@@ -85938,12 +90724,14 @@
 tbun.de, 1
 tbys.us, 1
 tc-st-leonard.ch, 0
+tc-triathlon.com, 1
 tc.nz, 1
 tcacademy.co.uk, 1
 tcade.co, 1
 tcb-a.org, 1
 tcb-b.org, 1
 tccb.gov.tr, 1
+tccc.org.tw, 1
 tcckonsult.com, 1
 tccmb.com, 1
 tccportal.com, 1
@@ -85985,6 +90773,7 @@
 tcybert.com, 1
 tcyoung.co.uk, 1
 td-bambini.ru, 1
+td-olymp.ru, 1
 tdchrom.com, 0
 tddos.pw, 1
 tdeaqua.com, 1
@@ -86012,9 +90801,11 @@
 teachbiz.net, 1
 teachercall.kr, 1
 teachercreatedmaterials.com, 1
+teacherfrancis.com, 1
 teacherph.com, 1
 teacherph.review, 1
 teacherpowered.org, 1
+teacherquinten.com, 1
 teachersasap.info, 1
 teachmeplease.ru, 1
 teachoo.com, 1
@@ -86022,10 +90813,14 @@
 teachwithouttears.com, 1
 teacuppersiancats.com, 1
 teacupyorkiespets.com, 1
+teahawaii.ga, 1
+teahou.se, 1
 teahouse.gq, 1
 teahut.net, 1
 teaks.nl, 1
 tealdotsinanorangeworld.com, 1
+teallhaycock.com, 1
+team-17.tk, 1
 team-a.tk, 1
 team-azerty.com, 1
 team-bbd.com, 1
@@ -86046,9 +90841,10 @@
 teambim.eu, 1
 teambition.com, 1
 teamcode.tk, 1
+teamconf.ru, 1
+teamdarko.tk, 1
 teamdaylo.xyz, 1
 teamdevelopers.ga, 1
-teamfilm.tk, 1
 teamfriet.nl, 1
 teamhinkleyc.com, 1
 teamhybrid.com, 1
@@ -86060,6 +90856,7 @@
 teamlightning.tk, 1
 teamliquid.com, 1
 teamliquidpro.com, 1
+teamliquidstarleague.com, 1
 teammateworld.com, 1
 teammojo.org, 1
 teamninjaapp.com, 1
@@ -86068,6 +90865,8 @@
 teampaddymurphy.ie, 1
 teampages.com, 1
 teampatat.nl, 1
+teampoison.tk, 1
+teamredfox.tk, 1
 teamrevolution.tk, 1
 teams.microsoft.us, 1
 teamsass.ca, 1
@@ -86082,7 +90881,7 @@
 teamupturn.org, 1
 teamusec.de, 1
 teamwpsekure.com, 1
-teamx-gaming.de, 1
+teamx-gaming.de, 0
 teaparty.id, 1
 tearoomlints.be, 1
 tease.email, 1
@@ -86105,6 +90904,7 @@
 tebokidsstore.com, 1
 teboorthodontics.com, 1
 tebothetooth.com, 1
+tebuscotrabajo.com, 1
 tec24.ga, 1
 tec3000.ch, 0
 tecart-cloud.de, 1
@@ -86114,7 +90914,9 @@
 teccozed.com, 1
 tecfleet.com, 1
 tech-clips.com, 0
+tech-doc.tk, 1
 tech-essential.com, 1
+tech-ideas.tk, 1
 tech-info.jp, 1
 tech-leaders.jp, 1
 tech-ninja.de, 1
@@ -86131,6 +90933,7 @@
 techableme.com, 1
 techacad.net, 1
 techace.jp, 1
+techangel.tk, 1
 techanit.de, 1
 techarea.fr, 1
 techask.it, 1
@@ -86140,12 +90943,14 @@
 techbonaza.info, 1
 techbrawl.org, 1
 techbumper.info, 1
+techcavern.ml, 1
 techcentral.ml, 1
 techcenturion.com, 1
 techchip.com, 1
 techclan.ga, 1
 techcluster.tk, 1
 techcody.com, 1
+techcompany.tk, 1
 techcracky.com, 1
 techcu.lt, 1
 techcult.com, 1
@@ -86161,15 +90966,14 @@
 techdirt.com, 1
 techdost.com, 1
 techdroid.eu, 1
+teched-creations.com, 1
 techendeavors.com, 1
 techexplorist.com, 1
 techfibian.tk, 1
 techfishnews.com, 1
-techformator.pl, 1
-techgarage.blog, 1
+techgarage.blog, 0
 techgo.re, 1
 techguidereview.com, 1
-techguides.com.ng, 1
 techhappy.ca, 1
 techie-show.com, 0
 techiecomputers.com, 1
@@ -86178,6 +90982,9 @@
 techindo.cf, 1
 techinet.pl, 1
 techinsurance.com, 1
+techisfake.ga, 1
+techitsol.tk, 1
+techiwant.com, 1
 techjobplaybook.nyc, 1
 techjoe.co, 1
 techlearningcollective.com, 1
@@ -86195,6 +91002,7 @@
 technic3000.com, 1
 technicabv.nl, 1
 technicalbikrammalati.tk, 1
+technicalbrothers.cf, 1
 technicalforensic.com, 1
 technicalhelps.org, 1
 technicallyeasy.net, 1
@@ -86212,17 +91020,21 @@
 technogrand.gq, 1
 technogroup.cz, 1
 technoholod.tk, 1
+technohram.tk, 1
+technoids.tk, 1
 technokicks.com, 1
 technoledge.jp, 1
 technologie-innovation.fr, 1
+technology-shopping.com, 1
 technology.cx, 1
 technologyhound.org, 1
 technologysi.com, 1
+technologywatchpost.com, 1
 technolution.tk, 1
 technolux.net, 1
+technomagia.tk, 1
 technomix.tk, 1
 technopedia.gq, 1
-technopost.net, 1
 technorely.com, 1
 technosapien.ml, 1
 technosorcery.net, 1
@@ -86248,12 +91060,12 @@
 techserve.ml, 1
 techsharetx.gov, 1
 techshift.eu, 1
-techshift.nl, 1
 techshift.se, 1
 techsmartstore.com, 1
 techsna.com, 1
 techsocial.nl, 1
 techsolvency.com, 1
+techstackjournal.com, 1
 techstartup.tech, 1
 techsys.cz, 1
 techsystemsa.com, 1
@@ -86275,6 +91087,7 @@
 techzhou.com, 1
 techzjc.com, 0
 tecit.ch, 1
+tecke.tk, 1
 teckgeekz.com, 1
 teckids.org, 1
 tecknobox.fr, 1
@@ -86283,6 +91096,7 @@
 tecmarkdig.com, 1
 tecnaa.com, 1
 tecne.ws, 1
+tecnewsnow.com, 1
 tecnicapotiguar.com.br, 1
 tecnick.com, 1
 tecnicoelettrodomestici.roma.it, 1
@@ -86305,10 +91119,13 @@
 tecnomagazine.net, 1
 tecnopiniones.com, 1
 tecon.co.at, 1
+tecscipro.de, 1
 tecwolf.com.br, 1
 tecyt.com, 1
 tedb.us, 0
 teddax.com, 1
+tedder.cc, 1
+teddie.eu, 1
 teddy.ch, 1
 teddybradford.com, 1
 teddykatz.com, 1
@@ -86318,7 +91135,6 @@
 tederomero.com, 1
 tedsdivingsystem.com, 1
 tedxyalesecondaryschool.com, 1
-teeautomat-teemaschine.de, 1
 teedb.de, 1
 teehaus-shila.de, 1
 teektalk.org, 1
@@ -86332,6 +91148,7 @@
 teensexgo.com, 1
 teensybows.hu, 1
 teenwebcams.ml, 1
+teenwolfturkey.tk, 1
 teenworlds.tk, 1
 teepak.ml, 1
 teeqq.com, 1
@@ -86349,13 +91166,13 @@
 teganlaw.com, 1
 tege-elektronik.hu, 1
 tegel-schoonmaken.nl, 1
-tehden.com, 1
 tehniss.rs, 1
 tehplace.club, 1
 tehrabbitt.com, 0
 tehrankey.ir, 1
 tehranlittmann.com, 1
 teichroeb.net, 1
+teiseken.tk, 1
 teixobactin.com, 1
 teka.ro, 1
 tekanswer.com, 1
@@ -86373,20 +91190,22 @@
 teknodaim.com, 1
 teknoforums.com, 1
 teknogeek.id, 1
+teknoharekat.com, 1
 teknolama.com, 1
 teknologiia.com, 1
 teknorix.com, 1
 teknoroit.com, 1
 teknotiq.com, 1
+teknow.tk, 1
 teknozone.id, 1
 tekstover.tk, 1
 tekstpesni.tk, 1
-tektoria.de, 1
 tektouch.net, 1
 tektuts.com, 1
 tela-tatis.com, 1
 telamon.eu, 1
 telangananews.ml, 1
+telani.net, 1
 telcar.cz, 1
 telco.at, 1
 telco.si, 1
@@ -86423,6 +91242,7 @@
 telegram-sms.com, 1
 telegram.org, 1
 telegram.poker, 1
+telegramseen.com, 1
 telehealthventures.com, 0
 telekollektiv.org, 1
 telekothonbd.com, 1
@@ -86432,6 +91252,7 @@
 telenco-networks.com, 1
 telenovelas-france.tk, 1
 teleogistic.net, 1
+telepedia.pl, 1
 telephonedirectories.us, 1
 telephoni-cdma.tk, 1
 telepok.com, 1
@@ -86449,13 +91270,16 @@
 teletexto.com, 1
 teletxt.me, 1
 televisioncontests.ga, 1
+televisionesendirecto.tk, 1
 televisionsrit.tk, 1
 televizeseznam.cz, 1
 televotia.ch, 1
 telework.gov, 1
+teleworkouts.com, 1
 teleyal.blog, 1
 telford.codes, 1
 telhabrasil.com.br, 1
+telka-online.tk, 1
 tellall.com, 1
 tellerify.com, 1
 tellet.tel, 1
@@ -86472,7 +91296,6 @@
 teloo.pl, 1
 telos-analytics.com, 1
 telosglobal.io, 1
-telosotec.com, 1
 telsu.fi, 1
 teltru.com, 1
 telugu4u.net, 1
@@ -86494,7 +91317,7 @@
 tempflix.com, 1
 templars.army, 1
 template-parks.com, 1
-templateinvaders.com, 1
+templeandalucia.tk, 1
 templete.tk, 1
 tempmail.ninja, 1
 tempo.co, 1
@@ -86504,6 +91327,7 @@
 temporaris.com, 1
 temporarysanity.tk, 1
 tempotem.com.br, 1
+tempsoundsolutions.tk, 1
 temptraining.ru, 1
 tempus-aquilae.de, 1
 tempus.tf, 1
@@ -86515,14 +91339,17 @@
 tencar.ru, 1
 tencent.xn--vuq861b, 1
 tende.roma.it, 1
+tendergrupp.ru, 1
 tendermaster.com.ua, 1
 tenderplan.ru, 1
 tendersoft.pl, 1
 tenderstem.co.uk, 1
 tendiestown.com, 1
 tendinite.org, 1
+tendmed.com.br, 1
 tendomag.com, 0
 tendoryu-aikido.org, 1
+tendure.tk, 1
 tenelco.net, 1
 tenens.ru, 1
 tenenz.com, 1
@@ -86538,14 +91365,18 @@
 tenma.pro, 1
 tennis-altai.tk, 1
 tennisadmin.com, 1
+tennisapp.de, 1
 tenniscourtsjoburg.com, 1
+tenniscritic.ga, 1
 tennismindgame.com, 1
+tennisnyi-stol.tk, 1
 tennispensacola.com, 1
 tennisportal.com.ua, 1
 tennistalk.tk, 1
 tennisweb.cf, 1
 tenno.tools, 1
 tenshoku-hanashi.com, 1
+tenshoku-manabu.com, 1
 tenshokudo.com, 1
 tenshokufair.jp, 1
 tent.io, 1
@@ -86564,6 +91395,7 @@
 teodorpravicky.com, 1
 teodw.com, 1
 teodw.net, 1
+teogramm.xyz, 1
 teoleonie.com, 0
 teoletextsq.tk, 1
 teologia.promo, 1
@@ -86603,21 +91435,26 @@
 terme.viterbo.it, 1
 termee.com, 1
 termeh-store.com, 1
+termi.tk, 1
 termin-online.com, 1
 terminalhrd.com, 1
+terminationsremembered.com, 1
 termino.eu, 1
 terminsrakning.se, 1
 termitinitus.org, 1
 termografiranje.si, 1
 termoidraulica.roma.it, 1
 termoidraulico.roma.it, 1
+termopares.tk, 1
 termux.com, 1
+ternex.ru, 1
 teronia.net, 1
 terovania.de, 1
 terpotiz.net, 1
 terra-24.ru, 1
 terra-x.net, 1
 terra.fitness, 1
+terra7.net, 1
 terrab.de, 1
 terracloud.de, 0
 terraco.ga, 1
@@ -86626,7 +91463,6 @@
 terrafinanz.de, 1
 terraform.io, 1
 terragni-sarasin.ch, 1
-terrainator.com, 1
 terralimno.com, 1
 terralimno.eu, 1
 terraluna.space, 1
@@ -86635,6 +91471,7 @@
 terranova.fi, 1
 terrapay.com, 1
 terrapinstationmd.com, 1
+terrarium.tk, 1
 terrasoverkappingvillage.be, 1
 terrasoverkappingvillage.nl, 1
 terrastaffinggroup.com, 0
@@ -86644,6 +91481,7 @@
 terres-et-territoires.com, 1
 terresmagiques.com, 0
 territoriocuchero.tk, 1
+territoriya.tk, 1
 territory.cf, 1
 terrorbilly.com, 1
 terrorblast.tk, 1
@@ -86665,6 +91503,7 @@
 tesdrole.tk, 1
 teskalabs.com, 1
 tesla-tula.tk, 1
+tesladrive.ca, 1
 teslamagician.com, 1
 teslasuit.io, 0
 tespent.cn, 1
@@ -86672,8 +91511,10 @@
 tessierashpool.de, 1
 test-iq.gq, 1
 test-my.tk, 1
+test-na-beremennost.tk, 1
 test-online.tk, 1
 test-school.ml, 1
+test-sev-web.pantheonsite.io, 1
 test-textbooks.com, 1
 test.de, 1
 test.support, 1
@@ -86697,6 +91538,7 @@
 testing-server.tk, 1
 testingben.com, 1
 testingbot.com, 1
+testingtask.tk, 1
 testispdomain.ml, 1
 testkinja.com, 1
 testlabs.tk, 1
@@ -86730,6 +91572,7 @@
 testyonline.tk, 1
 tetedelacourse.ch, 1
 teto.nu, 1
+tetovaweb.tk, 1
 tetrabyte.tk, 1
 tetracycline500mg.ga, 1
 tetraetc.com, 1
@@ -86748,9 +91591,9 @@
 tewarilab.co.uk, 1
 tewkesburybouncycastles.co.uk, 1
 tewkesburyyoga.com, 1
-tex-salon.ru, 1
 texasabrasiveblasting.com, 1
 texasbluesalley.com, 1
+texascharterbuscompany.com, 1
 texascommunitypropane.azurewebsites.net, 1
 texascountymo911.gov, 1
 texasgynecomastia.com, 1
@@ -86775,12 +91618,15 @@
 texican.nl, 1
 texier.mx, 1
 texnogu.ru, 1
+texnoguru.tk, 1
+texnotroniks.tk, 1
 texosmotr.tk, 1
 text-shirt.com, 0
 textbrawlers.com, 1
 textburst.com, 1
 textcleaner.net, 1
 textcounter.tk, 1
+textecnologia.com.br, 1
 texteditor.co, 1
 texter-linz.at, 1
 texter.at, 1
@@ -86789,6 +91635,7 @@
 textil-kyoto.tk, 1
 textinmate.com, 1
 textonly.email, 1
+textpages.tk, 1
 textpattern.com, 1
 textsite.tk, 1
 textualapp.com, 1
@@ -86829,8 +91676,8 @@
 tgb.org.uk, 1
 tgbabyzoo.com, 1
 tgbyte.de, 1
+tgcgrain.com, 1
 tgexport.eu, 1
-tgisoftech.com, 1
 tgmarketingusa.com, 1
 tgo1111.com, 1
 tgo6688.com, 1
@@ -86853,6 +91700,8 @@
 thackert.myfirewall.org, 1
 thaedal.net, 1
 thai-kacha.com, 1
+thai-massage.tk, 1
+thai-ridgeback.tk, 1
 thai.dating, 1
 thai.land, 1
 thai369.com, 1
@@ -86861,6 +91710,7 @@
 thaicyberpoint.com, 1
 thaiforest.ch, 0
 thaiforexfamily.com, 1
+thaigirls.cf, 1
 thaihomecooking.com, 1
 thaihong.co.th, 1
 thaihotmodels.tk, 1
@@ -86870,8 +91720,8 @@
 thailandvariety.cf, 1
 thaimega.club, 1
 thaipbspodcast.com, 1
+thaiportal.gq, 1
 thais.tk, 1
-thaiteaw.com, 1
 thaiwaterbirds.com, 1
 thajskyraj.com, 1
 thalan.fr, 1
@@ -86880,7 +91730,6 @@
 thalhammer.it, 1
 thalia.nu, 1
 thalita-reload.com, 1
-thallgordleyrealtor.com, 1
 thalliman.com, 1
 thallinger.me, 1
 thalmann.fr, 0
@@ -86893,9 +91742,9 @@
 tharuka.com, 1
 tharuka.de, 1
 thaserv.de, 1
+thassos.tk, 1
 thatdaria.com, 1
 thatdarkplace.com, 1
-thatlooksreallygood.com, 1
 thatshayini-sivananthan.fr, 1
 thaumaturgian-national-university.tk, 1
 thavmacode.gr, 1
@@ -86917,7 +91766,9 @@
 the-busbys.com, 1
 the-deep.tk, 1
 the-digitale.com, 0
+the-dream.tk, 1
 the-earth-yui.net, 0
+the-farm.tk, 1
 the-fermenter.com, 1
 the-finance-blog.com, 1
 the-forgotten.net, 1
@@ -86926,21 +91777,25 @@
 the-hemingway-code.de, 1
 the-jeuxflash.com, 1
 the-kuusatu.com, 1
+the-little-home.com, 1
 the-medium-dolphore.com, 0
 the-metropolitans.tk, 1
+the-morpheus.de, 1
+the-muddy-trophy-team.tk, 1
 the-mystery.org, 1
 the-naked.com, 1
 the-nash-education-program.com, 1
 the-pack.nl, 1
 the-pcca.org, 1
-the-race.com, 1
 the-rates.ru, 1
 the-red.pp.ua, 1
 the-spellcaster.com, 1
 the-spoonfeed.club, 1
+the-storm.tk, 1
 the-train.de, 1
 the-trophy-company.com, 1
 the-woods.org.uk, 1
+the-world.tk, 1
 the-zenti.de, 1
 the13thtribe.tk, 1
 the1way.net, 1
@@ -86966,6 +91821,7 @@
 theangelgivingtree.net, 1
 theangelgivingtree.org, 1
 theankhlife.com, 1
+theanswerexperts.com, 1
 theantarcticx.com, 1
 theantarticx.com, 1
 theantisocialengineer.com, 1
@@ -86982,10 +91838,12 @@
 theater-8.ch, 1
 theater.cf, 1
 theaterfrederik.tk, 1
+theatergroep-o.nl, 1
 theaterreichenhall.tk, 1
 theatheistbook.com, 1
 theatre-schools.com, 1
 theatrepremol.com, 1
+theatresocietyguts.tk, 1
 theatresuite.tk, 1
 theaustinsevenworkshop.com, 1
 theauthenticdad.com, 1
@@ -87002,6 +91860,7 @@
 thebarrypatch.com, 1
 thebasebk.org, 1
 thebasicstudio.com, 1
+thebathroomexchange.ga, 1
 thebcm.co.uk, 1
 thebearcanread.com, 1
 thebeardedrapscallion.com, 1
@@ -87012,8 +91871,8 @@
 thebestnews.ga, 1
 thebestofthesprings.com, 1
 thebestpersonin.ml, 1
-thebestproducts.info, 1
 thebestshopping.tk, 1
+thebestshuk.com, 1
 thebigbigworld.tk, 1
 thebigbitch.nl, 1
 thebigdatacompany.com, 1
@@ -87028,6 +91887,7 @@
 thebirthdaysite.co.uk, 1
 thebismarckmarathon.com, 1
 thebit.link, 1
+thebitchneyfiles.tk, 1
 theblackboard.gr, 1
 theblacklock.com, 1
 theblondeabroad.com, 1
@@ -87049,7 +91909,6 @@
 thebonerking.com, 1
 thebookiejoint.net, 1
 thebookietrials.com, 1
-thebotanicalstore.com.au, 1
 theboulders.com, 1
 thebouncedepartment.co.uk, 1
 thebouncyman.co.uk, 1
@@ -87057,48 +91916,60 @@
 theboysrepublic.tk, 1
 thebrainfactory.eu, 1
 thebreakroom.org, 1
+thebrewingtonfamily.net, 1
 thebridalcollection.com, 1
 thebrightons.co.uk, 1
 thebrightons.uk, 1
 thebroadcastknowledge.com, 1
 thebrookeb.com, 1
 thebrushcreekdistillery.com, 1
+thebsclub.com, 1
 thebss.tk, 1
 thebte.com, 1
+thebucklandreligion.tk, 1
 thebucknetwork.com, 1
 thebuffalotavern.com, 1
 thebulletin.io, 1
 thebusinessofgoodfilm.com, 1
+thebutterflyencounters.com, 1
 thebuttongame.io, 1
+thecalmnessofblankspace.tk, 1
 thecamels.org, 1
 thecameradivision.com, 1
 thecandidforum.com, 1
+thecardcloset.com, 1
 thecarolingconnection.com, 1
 thecarpenters.tk, 1
+thecarphunter.tk, 1
 thecatbowl.com.au, 1
 thecedarsbb.co.za, 1
+thecelticfiles.tk, 1
 thechallenge.fit, 1
 thechandigarhcity.com, 1
 thechargertimes.com, 1
 thechavs.xyz, 1
 thecheat.tk, 1
 thecheese.co.nz, 1
+thechefsgear.uk, 1
 thecherryship.ch, 0
+thechicanos.tk, 1
+thechoice.tk, 1
 thecigarlibrary.com, 1
 theciso.com, 0
 thecitywarehouse.clothing, 1
 theclearingnw.com, 1
 theclonker.de, 1
 thecloudadmin.eu, 1
-thecloudshelter.com, 1
 thecluster.xyz, 1
 thecodeninja.net, 1
 thecoffeecamp.com, 1
 thecollegequiz.com, 1
 thecolorrun.hu, 1
 thecolourcloset.ca, 1
+thecombustionway.com, 1
 thecompany.pl, 1
 thecompanysheffield.co.uk, 1
+thecompanysheffield.uk, 1
 thecomparativist.com, 1
 theconcordbridge.azurewebsites.net, 1
 thecondemned.tk, 1
@@ -87107,7 +91978,7 @@
 thecontentcloud.com, 1
 theconversation.com, 1
 theconverter.net, 1
-thecoorgfoundation.org, 1
+thecook.com.co, 1
 thecorianderkitchen.com, 1
 thecowquerie.tk, 1
 thecr3ative.tk, 1
@@ -87125,7 +91996,7 @@
 thecuriousdev.com, 1
 thecurvyfashionista.com, 1
 thecustomdroid.com, 1
-thecustomerinstitute.org, 1
+thecustomizewindows.com, 1
 theda.co.za, 1
 thedailyprosper.com, 0
 thedailyshirts.com, 1
@@ -87136,43 +92007,47 @@
 thedarkartsandcrafts.com, 1
 thedarkcolonyfansite.tk, 1
 thedarkfusion.tk, 1
+thedeathofannakarina.tk, 1
 thedebug.life, 1
 thedentalstudiomiami.com, 1
 thederminstitute.com, 1
-thedetail.org, 0
+thedetail.org, 1
 thedevilsbrigade.com, 1
 thedevilwearswibra.nl, 1
 thedevrycommonsbrasil.com, 0
-thedhs.com, 1
 thediabetesnews.com, 1
 thediamondcenter.com, 1
 thediaryofadam.com, 1
 thedietsolutionprog.tk, 1
 thedigitalparadox.tk, 1
 thedimebank.com, 1
-thedinnerdetective.com, 0
+thedinnerdetective.com, 1
 thediscforum.tk, 1
 thediscovine.com, 1
 thedistance.co.uk, 1
+thedivesource.com, 1
+thedjhookup.com, 1
 thedoc.eu.org, 1
 thedocumentrefinery.com, 1
 thedom.site, 1
 thedonaldarchive.tk, 1
+thedrawbacks.tk, 1
 thedreamtravelgroup.co.uk, 1
 thedrizzle.tk, 1
 thedronechart.com, 1
 thedroneely.com, 1
 thedword.xyz, 1
 thedysfunctionalangel.cf, 1
-theeducationchannel.info, 1
-theeducationdirectory.org, 1
+theebookkeepers.co.za, 1
 theeffingyogablog.com, 1
 theeighthbit.com, 0
 theel0ja.info, 1
 theel0ja.ovh, 1
 theeldritchhounds.cf, 1
+theelephant.info, 1
 theeliteneet.com, 1
 theemasphere.com, 1
+theenchantedannex.co.uk, 1
 theender.net, 1
 theentertainmentcontractor.com, 1
 theentropyofdelicatewonders.com, 1
@@ -87194,15 +92069,14 @@
 thefashionpolos.com, 1
 thefastmode.com, 1
 thefbstalker.com, 1
-thefengshuioffice.com, 1
 theferrarista.com, 0
 thefestivals.uk, 1
 thefireandthefreaks.com, 1
-thefireflygrill.com, 1
+thefireflygrill.com, 0
 thefishshop.ga, 1
 thefitcareerist.com, 1
-thefizz.uk, 1
 theflowershopdeddington.com, 1
+theflowstudios.com, 1
 theflyingbear.net, 0
 thefnafarchive.org, 1
 thefoodellers.com, 1
@@ -87211,6 +92085,7 @@
 theforkedspoon.com, 1
 theformtool.com, 1
 thefox.com.fr, 1
+thefoxtalk.com, 0
 thefreebay.tk, 1
 thefreemail.com, 1
 thefreethinker.tk, 1
@@ -87226,32 +92101,36 @@
 thefurniturefamily.com, 1
 thefusion.net.in, 1
 thefussyeater.ie, 1
+thegadget.tk, 1
 thegarrowcompany.com, 1
 thegatewaytoanewworld.com, 1
 thegatheringocala.com, 1
-thegaucompany.healthcare, 1
 thegeekdiary.com, 1
 thegemriverside.com.vn, 1
 thegenesisshop.com, 1
 thegeniusdz.tk, 1
+thegentleman.tk, 1
 thegerwingroup.com, 1
 thegetaway.com, 1
 theghostlytavern.com, 1
 thegingersnapbaker.co.za, 1
+theginnylee.com, 1
 thegioidulich.com.vn, 1
 thegioinano.com, 1
-theglobalreport.org, 1
 thegolden.com, 1
 thegoodheartedwoman.com, 1
 thegospell.tk, 1
+thegrandtour.tk, 1
 thegreatcommissionpodcast.com, 1
+thegreatgonzo.uk, 1
 thegreatplains.com, 1
 thegreenfields.se, 1
+thegreenlivingsolution.com, 1
 thegreenmanpottery.com, 1
-thegreenpark.co.uk, 1
 thegreens.us, 1
 thegrio.com, 1
 thegroovecartel.com, 1
+thegrotto.tk, 1
 thegrowhouse.ca, 1
 thegrs.com, 1
 theguerrilla.agency, 1
@@ -87261,6 +92140,7 @@
 thehairrepublic.net, 1
 thehairstandard.com, 1
 thehamiltoncoblog.com, 1
+thehappeny.com, 1
 thehappyxwife.ga, 1
 thehasanyildirim.tk, 1
 thehassanmusic.tk, 1
@@ -87285,18 +92165,18 @@
 thehotfix.net, 1
 thehotness.tech, 1
 thehotrocks.tk, 1
+thehouseofchronic.com, 1
 thehouseofcode.com, 1
+thehowlinwolfcafe.ga, 1
 thehub.ai, 1
 thehumanjoint.com, 1
-thehunky.com, 1
+thehumorist.tk, 1
 thehuskyhaul.com, 1
 theideaskitchen.com.au, 1
 theidiotboard.com, 1
-theig.co, 1
 theilluminatisociety.org, 1
 theillustrationstudio.com.au, 1
 theimaginationagency.com, 1
-theimmortal.tech, 1
 theinboxpros.com, 1
 theindiangraph.tk, 1
 theinflatables-ni.co.uk, 1
@@ -87323,14 +92203,12 @@
 thekeytobusiness.co.uk, 1
 thekickassvirtualassistant.nl, 1
 thekiddz.com, 1
-thekidneyexperts.com, 1
 thekidszone.in, 1
 thekillertoxin.de, 1
 thekingofhate.com, 0
 thekitchenfarnborough.co.uk, 1
 thekliniquehotdeal.com, 1
 theknockout.tk, 1
-thekokuin.com, 1
 thekonsulthub.tk, 1
 thekovnerfoundation.org, 1
 thekuwayama.net, 1
@@ -87339,13 +92217,16 @@
 thelanscape.com, 1
 thelapine.ca, 1
 thelastsurprise.com, 1
+thelastvikings.tk, 1
 thelaurelchiropractor.com, 1
 thelbc.io, 0
 thelearningenterprise.co.uk, 1
 thelegionshirley.co.uk, 1
 thelencystore.com, 1
 thelevelman.com, 1
+thelibertinephilosophy.ga, 1
 thelifeofmala.com, 1
+thelightpoints.eu, 1
 thelimitededition.in, 1
 thelimitlessman.co.uk, 1
 thelinuxspace.com, 1
@@ -87358,6 +92239,7 @@
 theloop.ai, 1
 theloop.build, 1
 thelordofthewing.cf, 1
+thelostfreighter.com, 1
 thelostyankee.com, 1
 thelotter.club, 1
 thelounge.chat, 1
@@ -87365,11 +92247,13 @@
 thelwallrangers.tk, 1
 themadlabengineer.co.uk, 1
 themagazine.my, 1
+themagician.tk, 1
 themallards.info, 1
 themandogs.tk, 1
 themarkup.org, 1
 themarshallproject.org, 1
 themaster.site, 1
+themaster.tk, 1
 themasterplan.com.au, 1
 themathbehindthe.science, 1
 themathscentre.com, 1
@@ -87379,6 +92263,7 @@
 themecraft.studio, 1
 themedicalmedia.com, 1
 themegteam.com, 1
+thementornetwork.com, 1
 themenzentrisch.de, 1
 themerchandiser.net, 0
 themeridianway.com, 1
@@ -87398,11 +92283,14 @@
 themusecollaborative.org, 1
 themusic.cloud, 1
 themusicalsafari.com, 1
-themusicinnoise.net, 1
+themusicthatnobodylikes.tk, 1
 themusthaves.de, 1
 themusthaves.nl, 1
+then.icu, 1
+thenappylaundry.ga, 1
 thenathanmethod.com, 1
 thenational.academy, 1
+thenaturalpath.co.nz, 1
 theneatgadgets.com, 1
 thenerdic.com, 1
 thenest.se, 1
@@ -87420,14 +92308,13 @@
 thenrdhrd.nl, 1
 theo-andreou.org, 1
 theo.me, 1
-theobg.co, 1
 theobora.fr, 1
 theobromos.fr, 0
-theoc.co, 1
 theocharis.org, 1
 theocjournal.tk, 1
 theocoffee.com, 1
 theocratic.cf, 1
+theocrazzolara.tk, 1
 theodeboer.nl, 1
 theodorahome.co, 1
 theodorahome.com.br, 1
@@ -87439,15 +92326,15 @@
 theoldmill.tk, 1
 theoldnews.net, 1
 theoldsewingfactory.com, 1
+theolodewijk.nl, 1
 theologique.ch, 0
 theomegagroup.co.uk, 1
-theomg.co, 1
-theonegroup.co.uk, 1
 theonethaimassage.de, 1
 theonion.com, 1
 theonlinecentre.com, 1
 theonyxzone.com, 1
 theoosmetalart.nl, 1
+theopaphitissbs.com, 1
 theophil.tk, 1
 theoriginalassistant.com, 1
 theoriginalmarkz.com, 1
@@ -87473,7 +92360,6 @@
 theparticipants.tk, 1
 thepartner.co.uk, 1
 thepartydoctors.co.uk, 1
-thepasteb.in, 1
 thepathsofdiscovery.com, 1
 thepaulagcompany.com, 0
 thepavilionbanbury.co.uk, 1
@@ -87481,6 +92367,7 @@
 thepcweb.tk, 1
 thepeoplesdata.com, 1
 thepeoplesdata.org, 1
+theperry.group, 1
 thepetsmedia.com, 1
 thepharm.co.nz, 1
 thephp.cc, 1
@@ -87491,6 +92378,7 @@
 thepiratebay.cf, 1
 thepiratesociety.org, 1
 thepitsurfhire.co.uk, 1
+thepixel.tk, 1
 theplasticsurgerycenterofnashville.com, 1
 theplaydaysbus.co.uk, 1
 theploughharborne.co.uk, 1
@@ -87499,6 +92387,7 @@
 theposhfudgecompany.co.uk, 1
 thepowerboys.tk, 1
 thepricewatcher.co.uk, 1
+theprimetalks.com, 1
 theprincegame.com, 1
 theprinceshort.tk, 1
 thepriorybandbsyresham.co.uk, 1
@@ -87509,16 +92398,16 @@
 thepromisemusic.com, 1
 theptclist.tk, 1
 theptpractitioner.com.au, 1
+thepulpit.tk, 1
+thepureplan.com, 1
 thepurplemaids.com, 1
 thepxhubclientportal.co.uk, 1
-thequalitycleaning.com, 1
 thequillmagazine.org, 1
 theracismforum.com, 1
 theragran.co.id, 1
 theralino.de, 1
 therandombits.com, 0
 therankkings.org, 1
-therapiemi.ch, 1
 therapistresources.net, 1
 therapyconnects.co.uk, 1
 therapyglobe.com, 1
@@ -87529,6 +92418,7 @@
 therasmusgt.tk, 1
 therasmusperu.tk, 1
 therattrick.com, 1
+thereadingresidence.com, 1
 thereafter.ga, 1
 therealchamps.com, 1
 therealcost.gov, 1
@@ -87538,6 +92428,7 @@
 thereisnocloud.fr, 1
 therenderingmachine.com, 1
 therenegade.tk, 1
+thereptiles.tk, 1
 therepublicofliverpool.com, 1
 theresa-mayer.eu, 1
 theresabrant.com, 1
@@ -87560,6 +92451,7 @@
 thermostat.gq, 1
 thermowood-bkh.ru, 1
 therniakov.tk, 1
+theroadrunners.tk, 1
 therockawaysny.com, 0
 theroguestormtrooper.com, 1
 therokasshow.tk, 1
@@ -87589,6 +92481,7 @@
 thescienceofdeduction.tk, 1
 thescientists.nl, 1
 theseal.tk, 1
+thesearch.com.tw, 1
 thesecondsposts.com, 0
 thesecurityvault.com, 1
 theseed.io, 1
@@ -87598,7 +92491,9 @@
 theselfcarenook.com, 1
 thesemperfibeard.com, 1
 theseoframework.com, 1
+theseonoob.com, 1
 theseosystem.com, 1
+theserpent.tk, 1
 theserver201.tk, 1
 theserviceyouneed.com, 1
 thesession.org, 0
@@ -87607,15 +92502,16 @@
 thesharedbrain.ch, 0
 thesharedbrain.com, 0
 theshine.pl, 1
-theshivrajofficial.in, 1
+theshivrajofficial.in, 0
 theshopally.com, 1
 theshots.cz, 1
 thesignacademy.co.uk, 1
 thesignalco.com.au, 1
 thesilentfew.tk, 1
 thesimarchitect.com, 1
-thesimons.family, 1
 thesimplewebcompany.com, 1
+thesingaporelawyer.com, 1
+thesipher.tk, 1
 thesisgeek.com, 1
 thesishelp.net, 1
 theskingym.co.uk, 1
@@ -87624,8 +92520,8 @@
 thesmallbusinesswebsiteguy.com, 1
 thesmokingcuban.com, 1
 thesmokypoet.com, 1
-thesnellvilledentist.com, 0
 thesocialmediacentral.com, 1
+thesomepeople.org, 1
 thesoundstageatstrangeland.com, 1
 thespacegame.tk, 1
 thespiritfm.tk, 1
@@ -87656,6 +92552,7 @@
 theswimdoctors.com, 0
 theswissbay.ch, 1
 theswitch.club, 1
+theta.eu.org, 1
 thetakeout.com, 1
 thetapirsmouth.com, 1
 thetassos.com, 1
@@ -87667,11 +92564,12 @@
 thetfordvt.gov, 1
 thetherapist.tk, 1
 thethinktankpodcast.co, 1
-thethoughttrainer.com, 1
+thethirdroad.com, 0
 thethreadsmiths.com.tw, 1
 thethreepercent.marketing, 1
 thetiedyelab.com, 1
 thetinylife.com, 1
+thetinymom.com, 1
 thetipo01.cf, 1
 thetipo01.tk, 1
 thetomharling.com, 1
@@ -87691,22 +92589,24 @@
 thetrendspotter.net, 1
 thetrove.is, 1
 thetrove.net, 1
-thetrustedzone.com, 1
+thetrustedzone.com, 0
 thetuxkeeper.de, 0
 thetvtraveler.com, 1
 thetwistedrabbit.com, 1
 theunbox.com, 1
+theunconventionalconventionists.tk, 1
 theundefeated.com, 1
 theunitehistoryproject.org, 1
 theuniversallover.tk, 1
 theuniversitiesofasia.ga, 1
 theunleashedpet.com, 1
-theunwrittenletters.tk, 1
 thevacweb.com, 1
 thevalentineconstitution.com, 1
 thevanishedvoyager.ml, 1
 thevapeasylum.co.uk, 1
+theveggietable.com, 1
 theveils.net, 1
+thevelvetlove.tk, 1
 thevenueofhollywood.com, 1
 thevern.co.za, 1
 theverticaljumpzone.com, 1
@@ -87719,6 +92619,7 @@
 thevirtuousdog.com, 1
 thevisasofoz.com, 1
 thevitpro.com, 1
+thevoice4you.tk, 1
 thevoid.one, 1
 thevoya.ga, 0
 thewagesroom.co.uk, 1
@@ -87735,6 +92636,7 @@
 thewebdexter.com, 1
 thewebflash.com, 1
 thewebguru.net, 1
+thewebhut.com.au, 1
 thewebsitedoctors.co.uk, 1
 thewebsitemarketingagency.com, 1
 theweed.tk, 1
@@ -87746,9 +92648,11 @@
 thewindowcleaningexperts.com, 1
 thewindowcleaningexperts.net, 1
 thewinedelivery.ga, 1
+thewomenschoice.com, 1
 thewoodkid.com.au, 1
 thewoolroom.com.au, 1
 theworkingeye.nl, 1
+theworld.tk, 1
 theworldbattle.com, 1
 theworldexchange.com, 1
 theworldexchange.net, 1
@@ -87776,7 +92680,6 @@
 thhost.tk, 1
 thiagohersan.com, 1
 thiagoribeiro.ml, 1
-thiagovarella.com.br, 1
 thiasil.com, 1
 thibaultchristin.fr, 1
 thibaultwalle.com, 1
@@ -87791,6 +92694,8 @@
 thierrymazue.fr, 1
 thietbithoathiem.net, 1
 thietkegianhangtttm.com, 1
+thietkenamcuong.com, 1
+thietkenhatho.com.vn, 1
 thietkenoithatshop.com, 1
 thijmen.xyz, 1
 thijmendevalk.nl, 1
@@ -87804,6 +92709,7 @@
 thijsslop.eu, 1
 thijsslop.nl, 1
 thijsvanderveen.net, 1
+thilko.com, 1
 thilobuchholz.de, 1
 thimbros.tk, 1
 thinair.co, 1
@@ -87827,9 +92733,7 @@
 thinkindifferent.net, 1
 thinkingandcomputing.com, 1
 thinkingliberty.com, 1
-thinkingplanet.net, 1
 thinkmarketing.ca, 1
-thinktac.com, 1
 thinktankofthree.com, 1
 thinktux.net, 1
 thinxtream.com, 1
@@ -87848,7 +92752,7 @@
 thisdayinhockey.tk, 1
 thisdot.site, 1
 thisfreelife.gov, 1
-thisgrowth.com, 1
+thisisart.ie, 1
 thisishugo.com, 1
 thisismit.ch, 1
 thisisrapt.com.au, 1
@@ -87861,11 +92765,11 @@
 thisoldearth.com, 1
 thisserver.dontexist.net, 1
 thistleandleaves.com, 1
+thisuniverse.tk, 1
 thmail.ml, 1
 thmpartners.com, 1
 thn.la, 1
 thoe.xyz, 1
-thoitrangsikimanh.com, 1
 tholcomb.com, 1
 thole.org, 1
 thom4s.info, 1
@@ -87885,6 +92789,7 @@
 thomasduerlund.com, 1
 thomasduerlund.dk, 1
 thomasebenrett.de, 1
+thomasecookedds.com, 1
 thomaseyck.com, 1
 thomasfoster.co, 1
 thomasgriffin.io, 1
@@ -87896,6 +92801,7 @@
 thomaspluschris.com, 1
 thomassen.sh, 1
 thomasstevensmusic.com, 0
+thomassynekmd.com, 1
 thomastestor.tk, 1
 thomastimepieces.com.au, 1
 thomastonmaine.gov, 1
@@ -87903,7 +92809,7 @@
 thomasvochten.com, 1
 thomaswoo.com, 1
 thomien.de, 1
-thomkrom.com, 1
+thompsonfamily.cloud, 1
 thompsonfunerals.com, 1
 thomsonscleaning.co.uk, 1
 thomspooren.nl, 0
@@ -87913,11 +92819,13 @@
 thor.edu, 1
 thor.re, 1
 thorbiswebsitedesign.com, 1
+thoreau.tk, 1
 thoroquel.org, 1
 thoroughbreddiesel.com, 1
 thorsten-schaefer.com, 1
 thorstenschaefer.name, 1
 thotpublicidad.com, 1
+thoughtfullife.org, 1
 thoughtlessleaders.online, 1
 thoughtsynth.com, 1
 thoughtsynth.net, 1
@@ -87938,12 +92846,16 @@
 threatcon.io, 1
 threatdetection.info, 1
 threatmonitor.io, 1
+threatnix.io, 1
 threatworking.com, 1
+three-wheels.cf, 1
 threedpro.me, 1
 threefantasy.com, 1
 threefours.net, 0
 threelions.ch, 1
 threema.ch, 1
+threeringdev.com, 1
+threerivers.edu, 1
 threeshipswhisky.co.za, 1
 threexxx.ch, 1
 threit.de, 1
@@ -87991,10 +92903,12 @@
 thvideo.tv, 1
 thw-bernburg.de, 1
 thwebdesigns.com, 1
+thweis.com, 1
 thwiki.cc, 1
 thxandbye.de, 1
 thycotic.ru, 1
 thynx.io, 1
+thzone.net, 1
 ti-js.com, 1
 ti-pla.net, 1
 ti-planet.org, 1
@@ -88010,10 +92924,11 @@
 tianbaobo05.com, 1
 tianbaobo06.com, 1
 tianbaobo07.com, 1
-tianbaobo08.com, 1
+tianbaobo08.com, 0
 tianbaobo09.com, 1
 tianbo1088.com, 1
 tianbo1988.com, 1
+tianbo1998.com, 1
 tiance.me, 1
 tiandixing.org, 1
 tianeptine.com, 1
@@ -88038,6 +92953,7 @@
 tichieru.pw, 1
 ticinoscout.ch, 1
 ticketassist.nl, 1
+ticketbahia.com, 1
 ticketcity.com, 1
 ticketdriver.com, 1
 ticketpro.ca, 0
@@ -88087,8 +93003,10 @@
 tidycustoms.net, 1
 tiekoetter.com, 1
 tielectric.ch, 1
+tielsebakkers.tk, 1
 tiempoalegria.com, 1
 tiempolibre.nl, 1
+tiendabna.com.ar, 1
 tiendacanper.com, 1
 tiendadeperros.com, 1
 tiendadolca.com, 1
@@ -88110,6 +93028,7 @@
 tierra-indomables.tk, 1
 tierracenter.com, 1
 tierradeayala.com, 1
+tierrahost.com, 1
 tierschutz-niederrhein.de, 1
 ties.com, 1
 tietotori.fi, 1
@@ -88119,16 +93038,21 @@
 tifaware.com, 1
 tifenn.eu, 1
 tifenn.nl, 1
+tiffanitooley.tk, 1
 tiffany-remixed.tk, 1
 tiffany.life, 1
 tiffany.moe, 1
 tiffanywatson.xyz, 1
 tiffnix.com, 1
 tifile.ir, 1
+tiflonet.tk, 1
+tifokaos.tk, 1
 tiga-design.com, 1
+tigerads.digital, 1
 tigerdile.com, 1
 tigerfm.tk, 1
 tigerforce.tk, 1
+tigergroup.tk, 1
 tigernero.duckdns.org, 1
 tigernode.com, 1
 tigernode.net, 1
@@ -88140,6 +93064,7 @@
 tigit.co.nz, 1
 tiglitub.com, 1
 tigreblanco.tk, 1
+tihvin.tk, 1
 tiihosen.fi, 1
 tiim.technology, 1
 tijden.nu, 1
@@ -88149,7 +93074,9 @@
 tik.help, 1
 tiki-god.co.uk, 1
 tikona.ga, 1
+tiktak.su, 1
 tiktok.com, 1
+tiktokgenie.ru, 1
 tiktokoff.com, 1
 tilcra.de, 1
 tilde.institute, 1
@@ -88168,6 +93095,7 @@
 till.im, 1
 tillberg.us, 1
 tilleysbouncycastles.co.uk, 1
+tillmanassociates.com, 1
 tillseasyscore.com, 1
 tillwalldrug.com, 1
 tilosp.de, 1
@@ -88219,6 +93147,7 @@
 timefor.tk, 1
 timeforcoffe.eu, 1
 timeglass.de, 1
+timeharmony.pl, 1
 timelapsetv.tk, 1
 timeless-photostudio.com, 1
 timeless-spirit.com, 1
@@ -88240,7 +93169,6 @@
 timespace.eu.org, 1
 timespowerofprint.com, 1
 timespreader.com, 1
-timestamp.uk, 1
 timetab.org, 1
 timetastic.co.uk, 1
 timetotrade.com, 1
@@ -88248,7 +93176,6 @@
 timewasters.nl, 1
 timfiedler.net, 1
 timgame.tk, 1
-timhbw.com, 1
 timhieuthuoc.com, 1
 timi-matik.hu, 1
 timich.ga, 1
@@ -88274,6 +93201,7 @@
 timqueen.com, 1
 timroes.de, 1
 timsayedmd.com, 1
+timscheuermann.ddns.net, 1
 timseverien.com, 1
 timstoffel.net, 0
 timtaubert.de, 1
@@ -88288,6 +93216,7 @@
 tina.media, 1
 tinaarenaweb.tk, 1
 tinakay-photography.com, 1
+tinandthyme.uk, 1
 tinapoethe.com, 0
 tinastahlschmidt.de, 1
 tinclip.com, 1
@@ -88322,6 +93251,7 @@
 tintoria.roma.it, 1
 tinturanaturale.it, 1
 tiny-house.ro, 1
+tiny-img.com, 1
 tiny-tattoos.tk, 1
 tiny.ee, 1
 tiny777.com, 1
@@ -88348,6 +93278,7 @@
 tipe.io, 0
 tipiakers.club, 1
 tiplanet.org, 1
+tipnews.tk, 1
 tipo01.tk, 1
 tipocloud.cf, 1
 tipoftheday.tips, 1
@@ -88366,6 +93297,7 @@
 tipslifetimefitness.ga, 1
 tipsmake.com, 1
 tipsoftech.tk, 1
+tipsplants.com, 1
 tipstersweb.com, 1
 tipsypresent.com, 1
 tiptoptransmissions.com, 1
@@ -88377,6 +93309,7 @@
 tirandoalplato.tk, 1
 tiraspol.tk, 1
 tircentrale.net, 0
+tirebichon.eu, 1
 tirgul-vertiujeni.tk, 1
 tirion.network, 0
 tirion.org, 0
@@ -88386,6 +93319,7 @@
 tirs4ne.ch, 0
 tirteafuera.tk, 1
 tirupatinightwear.co.in, 1
+tis-mark.ru, 1
 tis.ph, 1
 tischlerei-geher.at, 1
 tischlerei-klettke.de, 1
@@ -88395,14 +93329,17 @@
 tisparking.com, 1
 tissot-mayenfisch.com, 0
 tissus-paris.com, 1
+tisvapo.it, 1
 tit-cdn.de, 1
 tit-dev.de, 1
 tit-dns.de, 1
 tit-mail.de, 1
 tit.systems, 1
+titan-clinic.ru, 1
 titanandco.com, 1
 titandirect.co.uk, 1
 titanforged.net, 0
+titanicauto.ro, 1
 titaniumangel.com, 1
 titansized.com, 1
 titantax.com, 1
@@ -88457,6 +93394,7 @@
 tkwhongkong.tk, 1
 tl.gg, 1
 tlach.cz, 1
+tlanyan.pp.ua, 1
 tlca.org, 1
 tlcbynature.com.au, 1
 tlcnet.info, 1
@@ -88467,6 +93405,7 @@
 tlehseasyads.com, 1
 tleng.de, 1
 tlesptyltd.com.au, 1
+tlicycling.com, 1
 tlo.xyz, 1
 tloschinski.de, 1
 tloxygen.com, 1
@@ -88478,7 +93417,6 @@
 tlthings.net, 1
 tlumaczenie.com, 1
 tlys.de, 0
-tm-autohandel.pl, 1
 tm-t.ca, 1
 tm80plus.com, 1
 tmachinery.cz, 1
@@ -88500,6 +93438,7 @@
 tmcjobs.com, 1
 tmcreationweb.com, 1
 tmdb.biz, 1
+tmechen.me, 1
 tmf.ru, 1
 tmf22.ru, 1
 tmhanoi.com, 1
@@ -88509,7 +93448,6 @@
 tmi-produkter.se, 1
 tmi.news, 1
 tmin.cf, 1
-tmindfresh.com, 1
 tmm.cx, 1
 tmp.sx, 1
 tmpraider.net, 1
@@ -88533,6 +93471,7 @@
 tntware.com, 1
 tnusedoil.gov, 1
 tnutoys.com, 1
+tnved2013-narod.tk, 1
 tnwgrc.com, 1
 tnwildlandfire.gov, 1
 tnwioa.gov, 1
@@ -88541,7 +93480,6 @@
 to.gt, 1
 to.md, 1
 toad.ga, 1
-toanz.net, 0
 toast.al, 0
 toastmasters.tk, 1
 tob-rulez.de, 1
@@ -88578,6 +93516,7 @@
 tobiashorvath.de, 1
 tobiaskorf.de, 1
 tobiaspahlings.de, 1
+tobiassachs.cf, 1
 tobiassachs.de, 1
 tobiassachs.tk, 1
 tobiassattler.com, 1
@@ -88636,6 +93575,7 @@
 todocracy.com, 1
 todocruces.com, 1
 todoereaders.com, 1
+todoescaperooms.com, 1
 todoescine.com, 1
 todoist.com, 1
 todoist.net, 1
@@ -88660,6 +93600,7 @@
 tofa-koeln.de, 1
 tofe.io, 1
 tofilmhub.com, 1
+tofinovacationrentals.ca, 1
 tofliving.nl, 1
 tofu.cf, 1
 tofuixi.com, 1
@@ -88680,11 +93621,11 @@
 tokaido-kun.jp, 1
 tokaido.com, 1
 tokainafb.net, 1
-tokainakurasi.net, 1
 tokelaunso.tk, 1
 tokenmarket.net, 1
 tokens.net, 1
 tokfun.com, 1
+toki-doki.tk, 1
 tokic.hr, 0
 tokimeko.jp, 1
 tokinoha.net, 1
@@ -88694,13 +93635,11 @@
 tokitover.com, 1
 tokka.com, 1
 tokke.dk, 1
-tokkee.org, 1
 tokky.be, 1
 tokky.eu, 1
 tokky.fr, 1
 tokobungadilampung.com, 1
 tokoindo.top, 1
-tokolisensi.com, 1
 tokopedia.ga, 1
 tokoplugin.com, 1
 tokugai.com, 1
@@ -88708,6 +93647,7 @@
 tokyo-powerstation.com, 1
 tokyo.dating, 1
 tokyoadultguide.com, 1
+tokyodenmarkweek.com, 1
 tokyomakino.com, 1
 tokyotimeline.com, 1
 tokyotoptentravel.com, 1
@@ -88715,11 +93655,14 @@
 tolbertmgmt.com, 1
 tolboe.com, 1
 toldositajuba.com, 0
+toledo.tk, 1
+toledotrabaja.com, 1
 toledotrainday.org, 1
 tolerance-zero.tk, 1
 toleressea.fr, 1
 toles-sur-mesure.fr, 1
 tolkienfans.tk, 1
+tolkienmusic.tk, 1
 tolkienwiki.ml, 1
 tolkovanie-sna.tk, 1
 tolle-wolke.de, 1
@@ -88727,12 +93670,16 @@
 tollfreeproxy.com, 1
 tollmanz.com, 0
 tolmaidis.com, 1
+tolman.nl, 1
 tolmandrywall.com, 1
 tolnavar.hu, 1
 tolstoevsky.tk, 1
+tolucreaciones.com, 1
 tom-geiger.de, 1
+tom-hanks.tk, 1
 tom-kunze.de, 1
 tom-kurka.cz, 1
+tom.center, 1
 tom.horse, 1
 tom.je, 1
 tom.ro, 1
@@ -88740,6 +93687,7 @@
 tomabrafix.de, 1
 tomacino.de, 1
 tomahawk.ca, 1
+toman-vzv.cz, 1
 tomandmara.com, 1
 tomandshirley.com, 1
 tomandsonya.net, 1
@@ -88787,7 +93735,6 @@
 tomikoyco.com, 1
 tomiler.com, 1
 tomiubezpiecz.pl, 1
-tomjans.nl, 1
 tomjepp.uk, 1
 tomjn.com, 1
 tomkempers.nl, 1
@@ -88807,6 +93754,7 @@
 tomnatt.com, 1
 tomo.gr, 0
 tomodachi.tk, 1
+tomoko-clinic.jp, 1
 tomoradexpert.ro, 1
 tomorrow-traxx.tk, 1
 tomorrowhealth.com, 1
@@ -88888,8 +93836,6 @@
 tono.us, 1
 tonorosario.tk, 1
 tonshaiza.tk, 1
-tonsit.com, 1
-tonsit.org, 0
 tontonnews.net, 1
 tontonroger.org, 1
 tonyandskye.com, 1
@@ -88897,6 +93843,7 @@
 tonyburns.xyz, 1
 tonyhagerlund.tk, 1
 tonymanning.com, 1
+tonysantos.tk, 1
 tonytan.cn, 1
 tonytan.io, 1
 tonytron.com.br, 1
@@ -88904,10 +93851,13 @@
 tonywebster.com, 1
 tonyzhao.xyz, 1
 too.com.ua, 1
+too.tl, 1
 toobug.net, 1
+tookhan.tk, 1
 tool.lu, 1
 toolbox-bodensee.de, 1
 toolbox.ninja, 0
+toolboxsoftware.tk, 1
 toolineo.de, 1
 toolip.gr, 1
 toolkits.design, 1
@@ -88941,18 +93891,24 @@
 toothdoc.ca, 1
 toothless.tk, 1
 toothpique.tk, 1
-tooti.biz, 1
+tootl.org, 1
+top-avis.fr, 1
 top-beauty.cf, 1
+top-cena.ru, 1
 top-credit.tk, 1
 top-drop.tk, 1
 top-electronics.ru, 1
+top-esb.com, 1
 top-frog.com, 1
+top-info.ga, 1
+top-kuwait.com, 1
 top-mining.tk, 1
 top-obaly.cz, 1
 top-opakowania.pl, 1
 top-rensner.de, 1
 top-rezepte.de, 1
 top-russian.tk, 1
+top-schools.tk, 1
 top-secret.tk, 1
 top-service.ml, 1
 top-skins.ml, 1
@@ -88963,7 +93919,6 @@
 top10antivirus.review, 1
 top10media.tk, 1
 top10mountainbikes.info, 1
-top2servers.tv, 1
 top4c.com, 1
 top4shop.de, 1
 top6casinos.com, 1
@@ -88979,6 +93934,8 @@
 topbestsellerproduct.com, 1
 topbookmarking.cf, 1
 topbouncycastles.co.uk, 1
+topbrainscience.com, 1
+topbrasilnews.tk, 1
 topbrunchspots.com, 1
 topbusinessnews.today, 1
 topbussines.tk, 1
@@ -88999,6 +93956,7 @@
 topeducationhelp.co, 1
 topekafoundationpros.com, 1
 toperadigital.com, 1
+topesb.com, 1
 topferta.com, 1
 topfivepercent.co.uk, 1
 topgallant.gq, 1
@@ -89008,10 +93966,12 @@
 tophat.studio, 1
 tophatpuffin.com, 0
 tophighnorldiet.gq, 1
-tophr.kz, 1
+tophr.kz, 0
 topicalnet.de, 1
 topicdesk.com, 1
 topicit.net, 1
+topicpoint.tk, 1
+topicpulse.tk, 1
 topicv.com, 1
 topideipodarkov.ru, 1
 topinjust.com, 0
@@ -89029,11 +93989,15 @@
 toplist.sk, 1
 toplistforum.tk, 1
 toplockshop.com, 1
+topmagazinewire.com, 1
 topmarketplace.com.br, 1
 topmejores.org, 1
 topmmogames.org, 1
+topmoods.com, 1
 topmuzic.tk, 1
+topnaz.com, 1
 topnet.tk, 1
+topnewsscoop.com, 1
 topnlist.com, 1
 topnotchendings.com, 1
 topnotchhomepros.com, 1
@@ -89041,7 +94005,9 @@
 topnotepad.com, 1
 topo.com.ro, 1
 topodin.com, 1
+topofertas.tk, 1
 topofficesupplies.tk, 1
+topographic.tk, 1
 toponlinecasinosites.co.uk, 1
 toponlinemarketing.tk, 1
 topophile.net, 1
@@ -89065,12 +94031,14 @@
 topshelfcommercial.com, 1
 topshop.tk, 1
 topshoptools.com, 1
-topsnow.ru, 0
+topspace.tk, 1
 topspani.cz, 1
 topspin.tk, 1
 topsteroidsonline.com, 1
+topsvet.ru, 1
 toptec.net.br, 1
 toptechs.com.br, 1
+topteen.tk, 1
 topten.com.co, 1
 toptenthebest.com, 1
 toptexture.com, 1
@@ -89081,6 +94049,7 @@
 topupandearn.com, 1
 topurls.tk, 1
 topvertimai.lt, 1
+topviet.ga, 1
 topvision.es, 1
 topvision.se, 1
 topwin.la, 1
@@ -89093,6 +94062,7 @@
 toquechic.com, 1
 tor2web.org, 1
 toracon.org, 1
+toranjchap.com, 1
 torba.tk, 1
 torbay.ga, 1
 torbe.es, 1
@@ -89101,8 +94071,8 @@
 toreni.us, 1
 toretame.jp, 1
 toretfaction.net, 1
-torfbahn.de, 1
 torg-room.ru, 1
+torgopt.tk, 1
 tork.news, 1
 torkware.com, 1
 torlinnhe.com, 1
@@ -89114,8 +94084,6 @@
 tormakristof.eu, 1
 tormentedradio.com, 0
 tormox.ml, 1
-torn1.se, 1
-tornado-map.de, 1
 tornadodetector.ga, 1
 tornadotwistar.com, 1
 torngalaxy.com, 1
@@ -89138,6 +94106,7 @@
 torrba.tk, 1
 torrecilladelaabadesa.tk, 1
 torreconta.pt, 1
+torrededonmiguel.tk, 1
 torremarsalou.com, 1
 torrent.fedoraproject.org, 1
 torrent.is, 1
@@ -89152,6 +94121,7 @@
 torrentfunk.pw, 1
 torrentfunk2.com, 1
 torrentgalaxy.to, 1
+torrenttop100.net, 1
 torrentz2.al, 1
 torresdealbanchez.tk, 1
 torresdocaribe.com.br, 1
@@ -89179,10 +94149,12 @@
 toscer.me, 0
 toschool.com.br, 1
 toshen.com, 1
+toshik.tk, 1
 toshkov.com, 1
 tosolini.info, 1
 tosostav.cz, 1
 tosshi-life.com, 1
+tossitaway.tk, 1
 tosteberg.se, 1
 tostu.de, 1
 totaku.ru, 0
@@ -89212,6 +94184,7 @@
 totallemaiildelivery.com, 1
 totallemaildelivery.com, 1
 totallovingcareservice.com, 1
+totally-awesome.xyz, 1
 totally-dakota.tk, 1
 totallylegitimatehosting.ru, 1
 totallynotaserver.com, 1
@@ -89228,12 +94201,12 @@
 totalzen.ga, 1
 totch.de, 1
 totem-international.com, 1
+totemgames.tk, 1
 tothetopmentoring.com, 1
 totkamassage.com, 1
 totobetty.com, 1
 totodil.es, 1
 totolabs.com, 1
-totoland.xyz, 1
 totoro.pub, 1
 tottoya.com, 1
 totvs.com, 1
@@ -89255,8 +94228,10 @@
 touchwoodtrees.com.au, 1
 tougetu.com, 1
 tough.email, 1
+toughcodes.com, 1
 toughvps.com, 1
 touhou.ac.cn, 1
+touhou.cc, 1
 touhou.fm, 1
 touhou.tw, 1
 touhouwiki.net, 1
@@ -89272,6 +94247,7 @@
 tourdewestwoud.nl, 1
 tourfunnels.com, 1
 tourgest.net, 1
+tourguideagent.com, 1
 tourism-exegetai.tk, 1
 tourismpskov.tk, 1
 tourismtrain.tk, 1
@@ -89293,6 +94269,7 @@
 touslesdrivers.com, 1
 tout-a-fait.fr, 1
 tout-art.ch, 1
+toutankamon.tk, 1
 toutart.ch, 1
 toutelathailande.fr, 1
 toutenmusic.fr, 1
@@ -89306,6 +94283,7 @@
 toutvendre.pics, 1
 toutvendre.uk, 1
 toutvendre.us, 1
+touwhalster.tk, 1
 tovaglioli-di-carta.it, 1
 tovare.com, 1
 tovari-rukodeliya.tk, 1
@@ -89318,10 +94296,13 @@
 towellconstruction.ca, 1
 tower.land, 1
 towerdefence.tk, 1
+towers-kolomna.tk, 1
 towessi.tk, 1
 town-night.jp, 1
 townforge.net, 1
 townhouseregister.com.au, 1
+townifi.ga, 1
+townofgoldenmeadow-la.gov, 1
 townofhulbertok.gov, 1
 townofmineral.net, 1
 townofpolk-wi.gov, 1
@@ -89354,13 +94335,13 @@
 toypoodlepet.com, 1
 toypro.com, 1
 toys-robots.cf, 1
+toys4education.com.au, 1
 toyschina.cf, 1
 toysearcher.ml, 1
 toysperiod.com, 1
 toysplace.ml, 1
 toystory3.ga, 1
 tozdev.com, 1
-tozein.com, 1
 tp-iryuubun.com, 1
 tp-kabushiki.com, 1
 tp-kyouyufudousan.com, 1
@@ -89394,6 +94375,7 @@
 trabajarenremoto.com, 1
 trabajarytrabajar.com, 1
 trabajoenmx.com, 1
+trabajouniversitario.tk, 1
 trabbel.org, 1
 trabia.com, 1
 trace.guru, 1
@@ -89412,7 +94394,6 @@
 track.plus, 1
 trackchair.com, 1
 trackdays4fun.com, 1
-trackdomains.com, 1
 tracker-knigi.gq, 1
 tracker.com.ar, 1
 trackerx.ga, 1
@@ -89427,10 +94408,12 @@
 trackrecordpro.co.uk, 1
 trackulo.us, 1
 trackyourlogs.com, 1
+tractarimvbcluj.ro, 1
 tractor-pulling.fr, 1
 tractorfan.nl, 1
 tractorpumps.com, 1
 trad-n-vo.com, 1
+tradagars.se, 1
 tradavenue.com, 1
 trade-arcade.com, 1
 trade-bot.cf, 1
@@ -89452,6 +94435,7 @@
 traderjoe-cloud.de, 1
 tradersclub.com.br, 1
 tradersport.tk, 1
+tradersrank.ga, 1
 tradeshift.com, 1
 tradeshowfreightservices.com, 1
 tradesrenovations.ca, 1
@@ -89477,7 +94461,7 @@
 trafarm.ro, 1
 trafas.nl, 1
 traff1k.net, 1
-trafficexchange.club, 1
+trafficgenerator.ga, 1
 trafficmanager.com, 1
 trafficmanager.ltd, 1
 trafficmanager.xxx, 1
@@ -89486,7 +94470,7 @@
 trafficologyblueprint.com, 1
 trafficpixel.tk, 0
 trafficsafetymarketing.gov, 1
-trafficticketsnola.com, 1
+trafficsale.cf, 1
 traffixdevices.com, 1
 trafic-wap.tk, 1
 traficmusik.net, 1
@@ -89497,6 +94481,7 @@
 tragmi.ch, 1
 traha.org, 1
 trahnisoseda.tk, 1
+traiectum.es, 1
 trail.pink, 1
 trailblazercommunitygroups.com, 1
 trailblazers.tk, 1
@@ -89514,6 +94499,7 @@
 trainingminds.nl, 1
 trainingproviderresults.gov, 1
 trainings-handschuhe-test.de, 1
+trainingsalicante.tk, 1
 trainingsecke.de, 1
 trainingswiese.at, 1
 trainline.at, 0
@@ -89561,6 +94547,8 @@
 trajectvideo.nl, 1
 trakid.com, 1
 trakkr.tk, 0
+trakteren.tk, 1
+traktor-troubadour.tk, 1
 tralios.de, 1
 tramadol.ga, 1
 tramadolhcl.ga, 1
@@ -89571,6 +94559,7 @@
 trance-heal.de, 1
 trance-heal.me, 1
 trance-zone.tk, 1
+tranceattic.com, 1
 tranceheal.com, 1
 tranceheal.me, 1
 trancehost.com, 1
@@ -89581,6 +94570,8 @@
 trangcongnghe.com, 1
 trangell.com, 1
 tranquillity.se, 1
+tranquilpet.com, 1
+trans-aliyans.tk, 1
 transacid.de, 1
 transaminasas.com, 1
 transappealrights.com, 1
@@ -89609,7 +94600,7 @@
 transformations-magazin.com, 1
 transformersmmdb.tk, 1
 transforumation.com, 1
-transfur.online, 1
+transfur.online, 0
 transfurrmation.town, 1
 transgendergedenkdag.nl, 1
 transgenderinfo.nl, 1
@@ -89629,13 +94620,13 @@
 translate.googleapis.com, 1
 translation-services.ga, 1
 translationge.com, 1
+translatorall.tk, 1
 translatoruk.co.uk, 0
 translit-net.tk, 1
 translit.ga, 1
 translit.ru, 1
 transmarttouring.com, 1
 transmisjeonline.pl, 1
-transmithe.net, 1
 transmitit.pl, 1
 transmoni.vn, 1
 transmutatie.nl, 1
@@ -89645,6 +94636,7 @@
 transparency.cf, 1
 transparencyinadmissions.org, 1
 transparencynj.com, 1
+transparent.cf, 1
 transparentpng.com, 1
 transport-gura-portitei.com, 1
 transporta.it, 1
@@ -89662,11 +94654,13 @@
 tranzron.ga, 1
 trapkitchen.ml, 1
 trappednerve.org, 1
+trappersoutfitters.tk, 1
 trapz.xyz, 1
 trarch.com, 1
 trasandino.tk, 1
 trasatsatelital.com.ar, 1
 trash2treasurecreations.co.za, 1
+trashcraft.tk, 1
 trashexpert.ru, 1
 trashnothing.com, 1
 trashwagon.club, 1
@@ -89676,8 +94670,6 @@
 traslocatore.roma.it, 1
 traslochi-trasporti-facchinaggio.it, 1
 trasloco.milano.it, 1
-trastornoevitacion.com, 1
-trastornolimite.com, 1
 tratamentoparacelulite.net, 1
 tratamientodelvitiligo.es, 1
 trattamenti.biz, 1
@@ -89687,7 +94679,9 @@
 trauerbegleitung-kudla.de, 1
 trauertexte.info, 1
 traumaheilung.net, 1
+traumarecoverysupport.com, 1
 traumfaenger.tk, 1
+traumschwingen.de, 1
 traumwerker.com, 1
 traut.cloud, 1
 travador.com, 1
@@ -89731,11 +94725,13 @@
 travelix.io, 1
 traveljunkie.tips, 1
 travellers.dating, 1
+travellets.tk, 1
 travellovers.fr, 1
 travelmexico42.com, 1
 travelmontenegro.tk, 1
 travelnews.cf, 1
 travelogue.jp, 1
+travelongravel.tk, 1
 travelook.ml, 1
 travelphilippines.tk, 1
 travelphoto.cc, 1
@@ -89762,6 +94758,7 @@
 travelzoneshop.com, 1
 traverse.com.ua, 1
 travi.org, 1
+travin.tk, 1
 travis.nl, 1
 travisec.com, 1
 travisf.net, 1
@@ -89776,6 +94773,7 @@
 trazodononline.gq, 1
 trbanka.com, 1
 treaslockbox.gov, 1
+treasureislandbeads.ga, 1
 treasurydirect.gov, 1
 treasuryhunt.gov, 1
 treasuryscams.gov, 1
@@ -89794,13 +94792,15 @@
 treehorn.nl, 1
 treehousebydesign.com, 1
 treehouseresort.nl, 1
-treeline.tech, 1
 treemadeiras.com.br, 1
+treemhalong.vn, 1
+treeremovalsboksburg.co.za, 1
 treeremovalspretoria.co.za, 1
 treering.com, 1
 treeschat.com, 1
 treestarmarketing.com, 1
 treestumpgrindingnearme.com, 1
+treevectors.com, 1
 treeworkbyjtec.com, 1
 treezone.net, 1
 trefcon.cz, 1
@@ -89829,9 +94829,9 @@
 trendparty.net, 1
 trendreportdeals.com, 1
 trends-news.tk, 1
+trends2day.com, 1
 trendsettersre.com, 1
 trendsuites.co, 1
-trendsupplements.com, 1
 trendus.no, 1
 trendycrowds.com, 1
 trendydips.com, 1
@@ -89886,12 +94886,14 @@
 tribaljusticeandsafety.gov, 1
 triballi.com.br, 1
 tribalwarsstyles.tk, 1
-tribe.rs, 0
+tribalzone.tk, 1
+tribe.rs, 1
 tribealive.com, 1
 tribeoftomorrow.co, 1
 tribetrails.com, 1
 tribistovo.tk, 1
 tribly.de, 1
+tribunalinternacional.tk, 1
 tribut.de, 1
 tributh.cf, 1
 tributh.ga, 1
@@ -89908,6 +94910,7 @@
 tricityhelpline.com, 1
 trickedguys.com, 1
 trickle.works, 1
+tricksforgreeks.com, 1
 trico-pigmentazione.it, 1
 tricolortotal.tk, 1
 tricordmedia.ca, 1
@@ -89923,7 +94926,6 @@
 triefenbach.com, 1
 triefenbach.eu, 1
 trietment.com, 1
-trifence.ch, 1
 trigardon-rg.de, 1
 trigate.io, 1
 triggeredpaintz.com, 1
@@ -89931,6 +94933,8 @@
 trigraph.net, 1
 trigular.de, 1
 trihedron.tk, 1
+trihunter6000.com, 1
+trik-komputer.tk, 1
 trik.es, 0
 triker.tk, 1
 trilhasdeconhecimentos.etc.br, 1
@@ -89945,15 +94949,18 @@
 trimental.de, 1
 trimtone.com, 1
 trinary.ca, 0
+trinary.tk, 1
 trindonball.com, 1
 trineco.cloud, 1
 trineco.com, 1
 trineco.fi, 1
 trinetus.com, 1
 tringavillasyala.com, 1
+trinhtrongson.tk, 1
 trinitasgyor.hu, 1
 trinitycore.org, 1
 trinitycorporateservices.com, 1
+trinityny.org, 1
 trinityradioandvideo.org, 1
 trinitysurfaces.com, 1
 trink-und-partyspiele.de, 1
@@ -89970,6 +94977,7 @@
 triploqal.com, 1
 tripolinews.tk, 1
 tripolistars.com, 1
+tripomanija.tk, 1
 tripoutside.com, 1
 tripp.xyz, 1
 trippen.travel, 1
@@ -89977,7 +94985,7 @@
 tripsinc.com, 1
 tripsvia.com, 1
 tripsweet.com, 1
-triptovietnam.com.vn, 1
+triptnyc.com, 1
 trisect.uk, 1
 trish-mcevoy.ru, 1
 trisha.tk, 1
@@ -89988,7 +94996,6 @@
 tritium.cf, 1
 tritiumdisposal.com, 1
 trixati.org.ua, 1
-trixexpressweb.nl, 1
 trixiebooru.org, 1
 triz.co.uk, 1
 trkhosting.ga, 1
@@ -90034,6 +95041,7 @@
 troomcafe.com, 1
 troop89medfield.org, 1
 troopaid.info, 1
+trophcomplewin.ml, 1
 trophee-discount.com, 1
 trophies.de, 1
 trophy-discount.com, 1
@@ -90043,6 +95051,7 @@
 tropicalticket.ml, 1
 tropicaltravelco.com, 1
 tropikdeniz.com.tr, 1
+tropiweb.tk, 1
 troplo.com, 1
 troqueladoras.online, 1
 trosell.net, 1
@@ -90072,9 +95081,11 @@
 trpl.host, 1
 trs.tn, 1
 tru.ltd, 1
+trubmet.tk, 1
 trucchibellezza.com, 1
 trucchibellezza.it, 1
 truccoshop.com, 1
+truckerjobusa.com, 1
 truckersmp.com, 1
 truckscout24.at, 1
 truckscout24.be, 1
@@ -90089,7 +95100,6 @@
 truckscout24.pl, 1
 truckscout24.ru, 1
 truckshina-plus.com.ua, 1
-truckstop-magazin.de, 0
 trucosdescargas.com, 1
 true-360.com, 1
 true-itk.de, 1
@@ -90100,6 +95110,7 @@
 truecosmos.com, 1
 truedarkness.tk, 1
 trueduality.net, 1
+truehealthreport.com, 1
 truekey.com, 1
 truelovesakuya.info, 1
 trueminecraft.com, 1
@@ -90119,7 +95130,9 @@
 trueweb.es, 1
 trufflemonkey.co.uk, 1
 trufflepig-forensics.com, 1
+trugears.com, 1
 truhlarstvi-fise.cz, 1
+trulock.tk, 1
 truly-madly-happiness.de, 1
 trulycharmed.tk, 1
 trumanlibrary.gov, 1
@@ -90148,13 +95161,14 @@
 trustee.deals, 1
 trustfield.ch, 0
 trusthook.tk, 1
-trustkennedy.com, 1
 trustnet.co.il, 1
 trustology.io, 1
 trustserv.de, 1
+trustvox.com.br, 1
 truten.tk, 1
 truth.tk, 1
 truthdancer.com, 1
+truthlost.com, 1
 truthmessages.pw, 1
 truthsayer.tk, 1
 truthserum.co, 1
@@ -90162,7 +95176,6 @@
 truvayangin.tk, 1
 truvisory.com, 1
 truxton.tk, 1
-truyenfull.net, 1
 truyenfull.vn, 1
 trw-reseller.com, 1
 trxnews.today, 1
@@ -90173,6 +95186,7 @@
 trybabyschoice.com, 1
 trybooking.com, 1
 trycaviar.com, 1
+trychameleon.com, 1
 trydoggo.com, 1
 tryfabulousdiet.com, 1
 tryfabulousskincream.com, 1
@@ -90192,8 +95206,8 @@
 trynta.com, 1
 trynta.net, 1
 tryonnc.gov, 1
+trypathnow.com, 1
 trypenspinning.com, 1
-trypheromones.com, 1
 tryplo.ca, 1
 tryplo.com, 1
 tryplo.io, 1
@@ -90201,6 +95215,7 @@
 tryplo.org, 1
 tryplo.xyz, 1
 trypt.am, 1
+tryptamine.tk, 1
 tryreason.com, 1
 tryti.me, 1
 tryupdates.com, 0
@@ -90226,11 +95241,15 @@
 tschuermans.be, 0
 tscinsurance.com, 1
 tscomputers.net.pe, 1
+tscripts.com, 1
 tsdom.net, 1
 tsedryk.ca, 1
+tsentrobuv.tk, 1
 tsenv.net, 1
 tsgbit.net, 1
 tsgkc1.com, 1
+tshirtgenerator.ga, 1
+tshirtmemoryquilts.com, 1
 tshirtscapetown.com, 1
 tsicons.com, 1
 tsigaradiko.com, 1
@@ -90241,7 +95260,6 @@
 tsla.nu, 1
 tslcontractors.co.uk, 1
 tsmgroup2.biz, 1
-tsmn.com.au, 1
 tsmost.cz, 1
 tsontes.online, 1
 tsp.gov, 1
@@ -90283,6 +95301,7 @@
 tt3999.com, 1
 tt5197.co, 1
 tt6729.co, 1
+tt6729.com, 1
 tt6957.co, 1
 tt7199.com, 1
 tt7299.com, 1
@@ -90312,12 +95331,15 @@
 ttr-home.com, 1
 ttrade.ga, 1
 tts-assessments.com, 1
+tts.co.nz, 0
+ttscompliancesuite.com, 1
 ttsoft.pl, 1
 ttspttsp.com, 1
+ttsuaevisas.com, 1
 ttsweb.org, 1
+ttt-networks.com, 1
 ttuwiki.ee, 1
 ttuwiki.org, 1
-ttvhoensbroek.nl, 1
 ttwoee.com, 1
 ttwt.com, 1
 tty.space, 1
@@ -90344,6 +95366,7 @@
 tubing.cf, 1
 tubs4fun.co.uk, 1
 tubul.net, 1
+tubus.tk, 1
 tubuscadordeempleo.com, 1
 tucarora.tk, 1
 tucepihotelalga.com, 1
@@ -90372,7 +95395,6 @@
 tuffsruffs.se, 1
 tufilo.com, 0
 tugafm.eu.org, 1
-tugers.com, 1
 tugesha.com, 1
 tuimprenta.com.ar, 1
 tuinaportugal.com, 1
@@ -90394,6 +95416,7 @@
 tulippublishing.com.au, 1
 tuller.tk, 1
 tully.co.uk, 1
+tulocura.tk, 1
 tulsameetingroom.com, 1
 tulsaworkshop.org, 1
 tulumplayarealestate.com, 1
@@ -90409,6 +95432,7 @@
 tumen.tk, 1
 tumentorweb.com.mx, 1
 tumult-productions.tk, 1
+tun.bible, 1
 tunaut.com, 1
 tune-web.de, 1
 tunefish-entertainment.de, 1
@@ -90422,6 +95446,7 @@
 tuning.energy, 1
 tuningblog.eu, 0
 tunisiadefnews.ga, 1
+tunisiangamers.tk, 1
 tunisiapress.tk, 1
 tunnelbear.com, 1
 tunnelblick.net, 1
@@ -90429,6 +95454,7 @@
 tunnelstore.net, 1
 tunnelventilation.pro, 1
 tunnelwatch.com, 1
+tunningcars.tk, 1
 tunochebuena.com, 1
 tuntitili.fi, 1
 tuotteet.org, 1
@@ -90445,18 +95471,18 @@
 tupperwaresalamanca.com, 1
 turadionline.cf, 1
 turalt.com, 1
+turanga.tk, 1
 turbaza.tk, 1
 turbinelectricity.ga, 1
 turbo24.com, 1
-turbohost.co.mz, 1
 turbohostingcolombia.com, 1
 turbomag.pl, 1
 turbotube.ga, 1
 turboworld.tk, 1
 turciya.cf, 1
 turdnagel.com, 1
-tureceta.net, 1
 turf-experts.com, 1
+turfirm.tk, 1
 turi.space, 1
 turigum.com, 1
 turiscar.pt, 1
@@ -90468,6 +95494,7 @@
 turizm.gq, 1
 turizm.tk, 1
 turizmsektoru.tk, 1
+turkana.tk, 1
 turkcechat.tk, 1
 turkey-portal.tk, 1
 turkeyfiles.tk, 1
@@ -90490,6 +95517,8 @@
 turkrap.tk, 1
 turkreno.com, 1
 turkrock.com, 1
+turksite.tk, 1
+turksiteleri.tk, 1
 turkteam.tk, 1
 turktelekomarenagolleri.tk, 1
 turkup.ml, 1
@@ -90500,12 +95529,14 @@
 turncircles.com, 1
 turnet.tk, 1
 turnierplanung.com, 1
+turnningpoint.xyz, 1
 turnoffthelights.com, 1
 turnoffthelights.video, 1
 turnonsocial.com, 1
 turnosinscripcionchascomus.site, 1
 turnout.rocks, 1
 turnover.cf, 1
+turobot.casa, 1
 turpinpesage.fr, 1
 tursiae.org, 1
 turteka.com, 1
@@ -90528,6 +95559,7 @@
 tusksol.com, 1
 tusmedicamentos.com, 1
 tusociofinanciero.com, 1
+tusoluciondeempleo.com, 1
 tuspiscinas.com, 1
 tusupermercado.pe, 1
 tut-kino.tk, 1
@@ -90537,9 +95569,9 @@
 tutanota.de, 1
 tutdevki.tk, 1
 tutiendadebdsm.com, 1
+tutierra.net, 1
 tutima.com, 1
 tuto-craft.com, 1
-tutoragency.org, 1
 tutorcruncher.com, 1
 tutorialcoding.ga, 1
 tutorialcoding.tk, 1
@@ -90553,10 +95585,13 @@
 tutorio.ga, 1
 tutorme.com, 1
 tutormedia.net, 1
+tutorsheetstore.com, 1
 tuts4you.com, 1
 tuttimundi.org, 0
+tuttonotizie.eu, 1
 tutu.green, 1
 tutu.ro, 1
+tuulialaine.com, 1
 tuvankinhdoanhonline.com, 1
 tuversionplus.com, 1
 tuvingaynay.com, 1
@@ -90592,7 +95627,6 @@
 tvaerialsmanchester.com, 1
 tvbaratas.net, 1
 tvbracketman.co.uk, 1
-tvc.red, 1
 tvcal.net, 1
 tvchannelslive.tk, 1
 tvcmarketing.com, 1
@@ -90645,6 +95679,7 @@
 tweakersbadge.nl, 1
 tweaktown.com, 1
 tweaktownforum.com, 1
+tweekshow.tk, 1
 tweeple.ga, 1
 tweetfinity.com, 1
 tweetfinityapp.com, 1
@@ -90669,7 +95704,6 @@
 twilo.de, 1
 twincitynissantxparts.com, 1
 twinfield-apps.nl, 1
-twingolfer.com, 1
 twinkseason.com, 1
 twinztech.com, 1
 twiri.net, 1
@@ -90691,12 +95725,12 @@
 twitterdriver.io, 1
 twitteroauth.com, 1
 twizzle.net, 1
+twjeih.com, 1
 twl-clan.tk, 1
 twlan.org, 1
 twlitek.com.tw, 1
 twmartin.codes, 1
 two-step-verification.solutions, 1
-two.cm, 1
 twoandahalfvan.eu, 1
 twobitbusker.com, 1
 twocatsinacaravan.xyz, 1
@@ -90704,12 +95738,11 @@
 twodadsgames.com, 1
 twodrinksaway.com, 1
 twoef.co.uk, 1
-twofactorauth.org, 1
-twoguyswhoblog.com, 1
 twohuo.com, 1
 twojajurata.pl, 1
 twojapogoda.pl, 1
 twojfaktum.pl, 1
+twolinesmedia.eu, 1
 twonodes.games, 0
 tworaz.net, 1
 twotube.ie, 1
@@ -90735,6 +95768,7 @@
 txtdirect.link, 1
 txtdirect.me, 1
 txtdirect.org, 1
+txtentertainment.ga, 1
 txtfile.eu, 1
 txurologist.com, 1
 txwriterstudio.com, 1
@@ -90781,21 +95815,26 @@
 tyche.io, 1
 tycho.org, 1
 tycho.tk, 1
+tychoverstraete.be, 1
 tycom.cz, 1
 tycyc88.com, 1
 tycycles.co.uk, 1
+tygochrum.se, 1
+tyinnovations.com, 1
 tykeplay.com, 1
 tykoon.com, 1
 tyl.io, 1
 tyler.rs, 1
 tylerdavies.net, 1
+tylerdurden.ml, 1
 tylerharcourt.ca, 1
+tylerharcourt.com, 1
 tylerharcourt.net, 1
 tylerharcourt.org, 1
 tylermade.net, 1
 tyleromeara.com, 1
 tylerschmidtke.com, 1
-tylertysdal.org, 1
+tylertysdal.com, 1
 tylervigario.com, 1
 tylko-wazne.tk, 1
 tymoch.pl, 1
@@ -90847,6 +95886,7 @@
 tytixazo.tk, 1
 tytod.com, 1
 tyumen.ga, 1
+tyuning-avto.tk, 1
 tyva.gq, 1
 tyva.ml, 1
 tyva.tk, 1
@@ -90885,6 +95925,7 @@
 u5b.de, 0
 u5r.nl, 1
 u6729.co, 1
+u6729.com, 1
 u6957.co, 1
 u6957.com, 1
 u81365.com, 1
@@ -90894,7 +95935,7 @@
 u9721.com, 1
 u9728.co, 1
 u9yy.net, 1
-ua-blacklist.info, 1
+ua-autonews.tk, 1
 ua-news.tk, 1
 ua.search.yahoo.com, 0
 uachemlabs.com, 1
@@ -90914,11 +95955,15 @@
 uawoptout.com, 1
 ub3rk1tten.com, 0
 ub889.com, 1
+uba-tra.tk, 1
+ubanks.com.ua, 1
 ubanquity.com, 0
+ubberup.dk, 1
 ubcani.com, 1
 ubcutah.com, 1
 uber-work.tk, 1
 uberactivist.com, 1
+uberalles.live, 1
 uberboxen.net, 1
 ubereatsprinters.com, 1
 uberestimator.com, 1
@@ -90947,6 +95992,7 @@
 ubicaciones-vitamina.cl, 1
 ubicv.com, 1
 ubis.group, 1
+ubits.mx, 1
 ubiurbe.com, 1
 ublaboo.org, 1
 ubntleaks.com, 1
@@ -90990,7 +96036,6 @@
 ucstrike.com, 1
 uctarna.online, 1
 ucybodyinc.com, 1
-udachnika.ru, 1
 udancy.com, 1
 udbhav.me, 1
 udbina.tk, 1
@@ -91013,6 +96058,7 @@
 udruga-point.hr, 1
 udsocial.com, 1
 udvoukocek.eu, 1
+ue30.fun, 1
 ueba1085.jp, 1
 ueberdosis.io, 1
 uebersetzungscenter.ch, 1
@@ -91025,6 +96071,7 @@
 uestc.icu, 1
 uevan.com, 1
 uf-ace.com, 1
+ufa-soft.tk, 1
 ufacesign.in, 1
 ufanisi.mx, 1
 uffserver.ml, 1
@@ -91034,6 +96081,7 @@
 ufob.edu.br, 1
 ufocentre.com, 1
 ufoch.com, 0
+ufologiahistorica.tk, 1
 ufologiaweb.tk, 1
 ufone.com, 1
 ufone.net, 1
@@ -91041,6 +96089,7 @@
 ufplanets.com, 1
 ufroo.com, 1
 ufuq.de, 1
+ugameclub.com, 1
 ugb-verlag.de, 0
 ugcdn.com, 1
 ugeek.tk, 1
@@ -91050,7 +96099,6 @@
 uglycat.net, 1
 uglycat.org, 1
 ugmtc.org, 1
-ugodeal.md, 1
 ugolovnyj-advokat.cf, 1
 ugolsibiri.ru, 1
 ugrod.ru, 1
@@ -91066,8 +96114,10 @@
 uhcuhcas.gq, 1
 uhcuhcas.ml, 1
 uhcuhcas.tk, 1
+uhl.site, 1
 uhlhosting.ch, 1
 uhlturf.com, 1
+uhm.io, 0
 uhost.cyou, 1
 uhrenlux.de, 1
 uhuc.de, 1
@@ -91076,11 +96126,13 @@
 uiberlay.cz, 1
 uicchy.com, 1
 uid0.pl, 1
+uidrafter.com, 1
 uiharu.top, 1
 uinst.tk, 1
 uiop.link, 1
 uiterwijk.org, 1
 uitingent.be, 1
+uitliefde.shop, 1
 uitvaartvrouwenfriesland.nl, 1
 uj2008.com, 1
 ujiyasu.com, 1
@@ -91093,9 +96145,10 @@
 ukas.com, 0
 ukb.sch.id, 0
 ukbc.london, 1
+ukc2.com, 1
 ukcarers.tk, 1
 ukdefencejournal.org.uk, 1
-ukeuniverse.co.uk, 1
+ukfoodbox.co.nz, 1
 ukhas.net, 1
 ukimmigration.law, 1
 ukitbs.com, 1
@@ -91107,6 +96160,7 @@
 ukozliku.cz, 1
 ukpr.group, 1
 ukpropertyrescue.com, 1
+ukr.media, 1
 ukrainians.ch, 1
 ukrainskie-konstrukcii.com.ua, 1
 ukrapak.com.ua, 1
@@ -91129,12 +96183,16 @@
 uleenucks.de, 1
 ulement.com, 1
 ulen.me, 1
+ulezcar.com, 1
+ulfsciences.com, 1
+ulgaipbox.online, 1
 uli-eckhardt.de, 1
 ulickaprozivot.cz, 1
 ulike123.com, 1
 ulitroyo.com, 1
 ullah.se, 1
 ulli.ml, 1
+uloztoasdilej.cz, 1
 ulrik.moe, 1
 ulrike-sichert-schuster.de, 1
 ulsters.cf, 1
@@ -91147,6 +96205,7 @@
 ultimatebabyshowergifts.ga, 1
 ultimatebattle.tk, 1
 ultimatefilmpromotion.com, 1
+ultimategaming.tk, 1
 ultimatehalo.tk, 1
 ultimatelifesupport.ga, 1
 ultimatemafia.net, 1
@@ -91164,18 +96223,21 @@
 ultraly.com.au, 1
 ultraman.tk, 1
 ultramax.biz, 1
+ultramcworld.ml, 1
 ultramookie.com, 1
 ultraonline.ml, 1
 ultraporn.biz, 1
+ultras-venlo.tk, 1
 ultrasdesign.co.uk, 1
 ultrasite.tk, 1
 ultrasocial.ml, 1
 ultrasteam.net, 1
+ultrasvargon.tk, 1
 ultratechlp.com, 1
 ultravendas.com.br, 1
 ultravip.com.br, 1
+ultreya.tk, 1
 ultrixus.rocks, 1
-ulyamuhendislik.com, 1
 ulyanovsk-73.tk, 1
 ulyanovsk73.tk, 1
 ulyanovskcity.tk, 1
@@ -91183,12 +96245,15 @@
 ulyssesenergy.it, 1
 um-sachsen-pictures.de, 1
 um.es, 0
+umagoyal.com, 1
+umaimagazine.com, 1
 umanews.net, 1
 umanityracing.com, 1
+umanupszn.gov.ua, 1
 umartina.eu, 1
+umaru.gq, 1
 umas.tk, 1
 umasstransit.org, 1
-umaykan.com, 1
 umbertheprussianblue.com, 1
 umbrellaye.online, 1
 umbricht.li, 1
@@ -91199,30 +96264,34 @@
 umlcode.com, 1
 ummati.com, 1
 ummiabi.id, 1
-umniah.com, 1
+umniah.com, 0
 umniy-dom.tk, 1
 umnugobi.tk, 1
 umo.ci, 1
 umount.net, 1
 umsapi.com, 1
+umton.cz, 1
 umwandeln-online.de, 1
+umwelt-galerie.de, 1
+umweltgalerie.de, 1
 umzuege-berlin.com, 1
 umzuege-hannover.net, 1
 umzug-fuer-muenchen.de, 1
 umzugsunternehmenberlin.eu, 1
 un-framed.co.za, 1
-un-instantpoursoi.com, 0
 un-zero-un.fr, 1
 unadonna.it, 1
 unae.fr, 1
 unaffectedsound.tk, 1
 unai-yus.tk, 1
+unanaciounaseleccio.tk, 1
 unapp.me, 1
 unasim.gq, 1
 unataly.gq, 1
 unataz.tk, 1
 unatco.noip.me, 1
 unausa.com.br, 1
+unautreregard.tk, 1
 unbelievableplaces.de, 1
 unblock-zh.org, 1
 unblocked.at, 1
@@ -91270,39 +96339,48 @@
 unboundmoney.com, 1
 unboxed.cf, 1
 unboxforteams.work, 1
+unboxinspector.com, 1
 unboxrobotics.com, 1
 unboxyou.com, 1
+uncadeaupour.fr, 1
 uncarved.com, 1
 uncensoreddns.dk, 1
 uncensoreddns.org, 1
 uncinema.cf, 1
 unclebens-specials.gr, 1
 uncorporate.cf, 1
+uncuteyes.tk, 1
 undeadbrains.de, 1
 undeadwalking.com, 1
 undecidable.de, 1
 undeductive.media, 1
 undef.in, 0
 undemocracy.cf, 1
+under-wears.tk, 1
 underbridgeleisure.co.uk, 1
 undercovercondoms.com, 1
 undercoverxp.tk, 1
 underfloorheating-uk.co.uk, 1
 undergrounder.ga, 1
-undergroundremains.de, 1
+undergroundmusic.tk, 1
 underlined.fr, 1
 undernet.uy, 0
 underskatten.tk, 1
 understandmaths.co.za, 1
 understrap.com, 1
 undertow.ga, 1
+underwaterasia.info, 1
 underwearoffer.com, 1
+underwood.tk, 1
 underwoodpatents.com, 1
+underworlds.tk, 1
+underwriting.ai, 1
 undev.co, 1
 undiepatrol.tk, 1
 undo.co.il, 1
 undp.lt, 1
 une-bonne-nouvelle.fr, 1
+une-femme-dhonneur.tk, 1
 unearaigneeauplafond.fr, 1
 unece-deta.eu, 1
 unefleur.be, 1
@@ -91316,6 +96394,8 @@
 unexplored-moscow.tk, 1
 unfallrechtler.de, 1
 unfamousrecords.tk, 1
+unfathomable.blue, 1
+unfc.nl, 1
 unferno.tech, 1
 unfettered.net, 0
 unfollow.today, 1
@@ -91335,7 +96415,6 @@
 unibev.net, 1
 unibo.com, 1
 unibolsit.com, 1
-unibusreputation.com, 1
 unicef.pl, 1
 unicefcards.cz, 1
 unicefcards.gr, 1
@@ -91357,7 +96436,7 @@
 unicorn.li, 1
 unicorn.melbourne, 1
 unicorncloud.org, 1
-unicorndesign.ninja, 1
+unicorndesign.ninja, 0
 unicorntooling.eu, 1
 unicrack.cf, 1
 unicredit.ba, 1
@@ -91366,6 +96445,7 @@
 unicreditbank.rs, 1
 unicreditbank.ru, 0
 unicreditbulbank.info, 1
+unicycle.ga, 1
 unidevgroup.ru, 1
 unidostransportes.com.br, 1
 unieducar.org.br, 1
@@ -91393,6 +96473,7 @@
 uniondeterapeutas.com, 1
 unionhoster.ml, 1
 unionlife-net.com, 1
+unionmagdalena.tk, 1
 unionplat.ru, 1
 unionreports.gov, 1
 unionstreetskateboards.com, 1
@@ -91407,6 +96488,7 @@
 unique-tutorials.info, 1
 uniquepathways.ch, 0
 uniqueworks.tk, 1
+uniresbajdas.ml, 1
 uniritter.edu.br, 1
 unis-pour-la-planete.com, 1
 unis-pour-le-climat.com, 1
@@ -91430,10 +96512,12 @@
 unitedcyberdevelopment.com, 1
 unitedfitness.com.au, 1
 unitedkingdoms-guild.com, 1
+unitedlisbon.school, 1
 unitedmethodistchurch.tk, 1
 unitedpsychological.com, 1
 unitedrestorationfl.com, 1
 unitedsafetynet.com, 1
+unitedstables.tk, 1
 uniteforrecovery.govt.nz, 1
 unitefortherecovery.govt.nz, 1
 unitehelivy.be, 1
@@ -91444,12 +96528,14 @@
 unityconsciousnessbooks.com, 1
 unityvox.com, 1
 uniuni.info, 1
+univ-segou.ml, 1
 univaservizi.academy, 1
 univate.berlin, 1
 univercite.ch, 0
 univeril.com, 0
 univerkeys.com, 1
 univerpack.net, 1
+universal-credit.com, 1
 universal-edge.com, 1
 universal-happiness.com, 1
 universal-mail.ml, 1
@@ -91457,6 +96543,8 @@
 universal-tutorial.com, 1
 universal-village.org, 1
 universal.at, 1
+universalcircus.tk, 1
+universalcredit.com, 1
 universalmedia.tk, 1
 universalpaymentgateway.com, 1
 universalspf.org, 1
@@ -91472,11 +96560,13 @@
 universiteplatformu.com, 1
 universityhousemates.co.uk, 1
 universityhousemates.uk, 1
+universityofedinburgh.org.uk, 1
 universitywafer.com, 1
 universocaballo.top, 1
 universogay.com, 1
 universoscuola.it, 1
 universrumbacongolaise.com, 1
+universus.tk, 1
 univet-veterinaire.com, 0
 univetnature.org, 0
 univitale.fr, 0
@@ -91485,6 +96575,7 @@
 unixadm.org, 1
 unixapp.ml, 1
 unixattic.com, 1
+unixer.tk, 1
 unixforum.org, 1
 unixfox.eu, 1
 unixhost.ga, 1
@@ -91496,10 +96587,15 @@
 unknown.kyoto, 0
 unknownbreakup.com, 0
 unknownhacks.tk, 1
+unknownmasses.tk, 1
+unknownnet.tk, 1
+unko.cz, 1
 unkrn.com, 1
 unlax.com, 1
 unleashyouridentity.com, 1
 unli.xyz, 1
+unlimiteddsl.ga, 1
+unlimitedheatingcooling.com, 1
 unlisted.co, 1
 unlock-my-sprint.mobi, 1
 unlockauthority.com, 1
@@ -91508,17 +96604,16 @@
 unlocken.nl, 1
 unlockerboss.com, 1
 unlocks.co.uk, 1
-unlockscheveningen.nl, 1
 unlocktalent.gov, 1
 unlocktechs.com, 1
 unluco.com, 1
-unmade.com, 1
 unmarkdocs.co, 1
 unmonito.red, 1
 unn-edu.info, 1
 unnamed.download, 1
 uno.fi, 1
 uno.uk, 1
+unobet-partners.com, 1
 unobrindes.com.br, 1
 unoccupyabq.org, 1
 unofficialbpb.tk, 1
@@ -91544,11 +96639,12 @@
 unruh.fr, 0
 uns.vn, 1
 unsee.cc, 1
+unseeliefilms.com, 1
+unseeliepress.com, 1
 unseen.is, 1
 unseen.tw, 1
 unser-gartenforum.de, 1
 unsereins.me, 1
-unsiteweb.fr, 1
 unsourirealecole.fr, 1
 unstable.network, 1
 unstablewormhole.ltd, 1
@@ -91566,18 +96662,18 @@
 unterschicht.tv, 0
 untethereddog.com, 1
 unti.me, 1
+untvweb.com, 1
 unusedrooms.com, 1
 unusualhatclub.com, 1
 unusualworldd.com, 1
 unveiledgnosis.com, 1
 unvoyageenvelo.com, 1
 unwa.tk, 1
+unworthy.ml, 1
 unx.dk, 1
-unxicdellum.cat, 1
 uoe.com, 1
 up-ai.com, 1
 up-obmen.ml, 1
-up-stage.info, 1
 up-stage.jp, 1
 up.com.au, 1
 up2mark.com, 0
@@ -91611,6 +96707,7 @@
 update-linthdcp-567app1.com, 1
 updoze.com, 1
 upengo.com, 1
+upfurniture.tk, 1
 upgamerengine.com, 1
 upgamerengine.com.br, 1
 upgamerengine.net, 1
@@ -91619,7 +96716,6 @@
 uphabit.io, 1
 upholsterycleanerslondon.co.uk, 1
 upholsterydesign.com.au, 1
-uphuntingland.com, 1
 upitnik.rs, 1
 uplaqui.com.br, 1
 uplead.com, 1
@@ -91631,20 +96727,22 @@
 uploadcare.com, 1
 uploadscript.tk, 1
 uploadyourtestament.com, 1
-uplotnitel.online, 1
 uplr.it, 1
 upmail.ml, 1
 upmchealthsecurity.us, 1
 upmon.com, 1
 upnext.io, 1
 upnext.tk, 1
+uportal.tk, 1
 upperbeaconsfield.org.au, 1
 uppercloud.cf, 1
+upperlimbco.com, 1
 upperroommission.ca, 1
 upperskagittribe-nsn.gov, 1
 uppfinnarenc.tk, 1
 upplevelse.com, 1
 upr.com.ua, 1
+upr.llc, 1
 upr.si, 1
 uprint.it, 1
 upropay.com, 1
@@ -91652,13 +96750,14 @@
 upscope.io, 1
 upsdelperu.com.pe, 1
 upsettunnel.com, 1
-upsihologa.com.ua, 1
+upsihologa.com.ua, 0
 upsilonsigmaphi.us, 1
 upskilllearning.ml, 1
 upskirtmania.tk, 1
 upstairs.one, 1
 upstart.com, 1
 uptech.biz.id, 1
+uptech.vn, 1
 uptechbrasil.com.br, 1
 uptimed.com, 1
 uptional.gq, 1
@@ -91667,7 +96766,6 @@
 uptoplay.ovh, 1
 uptownbabe.com, 1
 uptownlocators.com, 1
-uptownvintagecafe.com, 1
 uptrends.com, 1
 uptrends.de, 1
 uptrex.co.uk, 1
@@ -91709,6 +96807,7 @@
 urban-news.tk, 1
 urban.melbourne, 1
 urbanagriculturesummit.cf, 1
+urbanarcana.tk, 1
 urbanbageecha.com, 1
 urbanbikeweamr.ga, 1
 urbanbooks.tk, 1
@@ -91721,6 +96820,7 @@
 urbangymfirenze.com, 1
 urbanhotbed.eu, 1
 urbanietz-immobilien.de, 1
+urbanility.com, 1
 urbanindustriecoiffure-auray.fr, 1
 urbanism.xyz, 1
 urbanlounge.tk, 1
@@ -91750,6 +96850,7 @@
 ureka.org, 1
 urep.us, 1
 urfayazar.com, 1
+urfreecon.tk, 1
 urge55.com, 1
 urgences-valais.ch, 1
 urgent-notice.ml, 1
@@ -91759,7 +96860,10 @@
 uriports.com, 1
 uripura.de, 1
 urist1011.ru, 1
+urka.tk, 1
+urke.tk, 1
 urko.shop, 1
+urkonsultant.tk, 1
 urkult.se, 0
 url.fi, 1
 url.fm, 1
@@ -91770,6 +96874,7 @@
 urlaub-leitner.at, 1
 urlendecoder.tk, 1
 urlfly.tk, 1
+urlgoo.ga, 1
 urljournal.tk, 1
 urlscan.io, 1
 urlsimple.tk, 1
@@ -91780,6 +96885,7 @@
 urnes.org, 1
 urocentre.ga, 1
 uroki.tk, 1
+urokoff.net, 1
 urology.wiki, 1
 urologyoklahoma.com, 1
 urologyspecialistspc.com, 1
@@ -91796,6 +96902,7 @@
 uruguay-experience.com, 1
 uruharushia.com, 1
 urukproject.org, 1
+uruslugi.tk, 1
 us-10.cc, 1
 us-10.com, 1
 us-igloopreview.com, 1
@@ -91826,6 +96933,7 @@
 usagi-ku.ga, 1
 usagm.gov, 1
 usagov.gov, 1
+usahealthwebapps.com, 1
 usajobs.com, 1
 usajobs.gov, 1
 usalearning.gov, 1
@@ -91857,10 +96965,12 @@
 usdoj.gov, 1
 usdoscloud.gov, 1
 usds.gov, 1
+usdwellhouse.com, 1
 use.be, 1
 usecamisetas.com, 1
 used255.xyz, 1
 usedu.us, 1
+usenet.tk, 1
 usenetpirate.co.uk, 1
 useon.com, 1
 useon.ru, 1
@@ -91875,14 +96985,13 @@
 userstation.de, 1
 usespetaculo.com.br, 1
 usetypo3.com, 1
-useworkshop.com, 1
 useyourloaf.com, 1
 usgande.com, 1
 ushandbookapp.com, 1
 ushare.ch, 1
 ushealthpharma.com, 1
-usher.cn, 0
 usherwoodexecutivetravel.com, 1
+ushi808.com, 1
 usicecenter.gov, 1
 usidfc.gov, 1
 usimmigration.us, 1
@@ -91903,6 +97012,7 @@
 usninosnikrcni.eu, 1
 usnti.com, 1
 uspaacc.com, 1
+usparklodging.com, 1
 uspeli.ml, 1
 uspesnyprvnacek-demo.herokuapp.com, 1
 uspesnyprvnacek-staging.herokuapp.com, 1
@@ -91917,6 +97027,7 @@
 ussm.gov, 0
 ussm.tk, 1
 ussst.org, 1
+ussst.org.in, 1
 ustaywell.com, 1
 ustensiles-cuisine.boutique, 1
 ustr.gov, 0
@@ -91927,6 +97038,7 @@
 usuan.net, 1
 usweme.info, 1
 uswitch.com, 1
+usyfawovad.gq, 1
 ut-jobs.net, 1
 ut5s.com, 1
 utahblackplate.com, 1
@@ -91937,7 +97049,6 @@
 utahhydrographics.com, 1
 utahrealestatepodcast.com, 1
 utahtravelcenter.com, 1
-utahtriallawyers.com, 1
 utaowan.com, 0
 utavatu.mk, 1
 utazas-nyaralas.info, 1
@@ -91963,6 +97074,7 @@
 utilityapi.com, 1
 utitreatment.com, 1
 utleg.gov, 1
+utloperadora.com.br, 1
 utodyg.ga, 1
 utonia.ch, 1
 utopialgb.org.uk, 1
@@ -91971,7 +97083,6 @@
 utopianrealms.org, 1
 utopicestudios.com, 1
 utopique.net, 1
-utorg.com.ua, 1
 utrace.me, 1
 utrantor.org, 1
 utterberry.io, 1
@@ -91983,6 +97094,7 @@
 uu30019.com, 1
 uu5197.co, 1
 uu6729.co, 1
+uu6729.com, 1
 uu6957.co, 1
 uu9297.co, 1
 uu939.com, 1
@@ -91993,12 +97105,14 @@
 uurl.ga, 1
 uuzsama.me, 1
 uv.uy, 1
+uvc.com.ua, 1
 uvcleanfrance.com, 1
 uvenuse.cz, 1
 uvlamp.ee, 1
 uvocorp.com, 1
 uvpress.com, 1
 uvseh.com, 1
+uvt.com.co, 1
 uvtcinemas.com, 1
 uvx.io, 1
 uwac.co.uk, 0
@@ -92006,7 +97120,6 @@
 uwat.cf, 1
 uwe-r.com, 1
 uwe.training, 1
-uwelilienthal.de, 1
 uwesander.de, 1
 uwfreelanceopticien.nl, 1
 uwsalonboot.nl, 1
@@ -92033,7 +97146,6 @@
 uzagmozemunk.ml, 1
 uzay.org, 1
 uzayliyiz.biz, 1
-uzaymedya.com.tr, 1
 uzbaza.tk, 1
 uzbek-soft.tk, 1
 uzbekistan24.tk, 1
@@ -92060,23 +97172,28 @@
 uzidesign.com, 1
 uziregister.nl, 0
 uzmansorusu.com, 1
+uzone.uk, 1
 uzsvm.cz, 1
 uztop.ml, 1
 uzzamari.com, 1
-v-bokhorst.eu, 1
 v-d-p.net, 1
 v-gornom.ga, 1
+v-horus.cloud, 1
+v-horus.com, 0
 v-jo.com, 1
 v-kurgane.tk, 1
+v-m-shop.ru, 1
 v-media.tk, 1
 v-news.tk, 1
 v-novosibirske.tk, 1
+v-phoenix.tk, 1
 v-spin.cz, 1
 v-tek.fi, 1
 v-u-z.ru, 1
 v.pn, 1
 v.ps, 1
 v0ctor.me, 1
+v0i.de, 1
 v0v.cc, 1
 v1.dk, 1
 v10006.com, 1
@@ -92089,6 +97206,7 @@
 v2bv.win, 1
 v2ex.com, 1
 v2mcdev.com, 1
+v2raytech.com, 1
 v2x.sk, 1
 v2xxoo.com, 1
 v30019.com, 1
@@ -92141,6 +97259,7 @@
 va-reitartikel.com, 1
 va.gov, 0
 va11hal.la, 1
+va11halla.ddns.net, 1
 va1der.ca, 1
 vaabogados.legal, 1
 vaaddress.co, 1
@@ -92150,14 +97269,15 @@
 vaat.io, 1
 vabusinesses.org, 1
 vacacionesenlinea.com, 1
+vacacionestours.com, 1
 vacancyfiller.com, 1
 vacati0n.tk, 1
 vacation-croatia.com, 1
 vacation-in-pisak.tk, 1
 vacationfund.co, 1
-vacationscostarica.com, 1
 vaccineskill.biz, 1
 vaccinestats.net, 1
+vackor.tk, 1
 vaclan.tk, 1
 vaclavambroz.eu, 1
 vacpas.com, 1
@@ -92178,6 +97298,7 @@
 vagaerg.com, 1
 vagaerg.net, 1
 vaganciatechnology.com, 0
+vagasdeempregos.ga, 1
 vaginalrejuvenationkentucky.com, 1
 vagmour.eu, 1
 vagpartsdb.com, 1
@@ -92195,8 +97316,8 @@
 vak-pobeda.ru, 1
 vakantiedetective.nl, 1
 vakantiehuisschellinkhout.nl, 1
-vakantiehuizen-denemarken.nl, 1
 vakantieinfo.tk, 1
+vakita.fi, 0
 vakuutuskanava.fi, 1
 vakwinkeldemo.nl, 1
 val-sec.com, 1
@@ -92205,8 +97326,8 @@
 valasi.eu, 1
 valcano-krd.ru, 1
 valcano.ru, 1
-valcansell.com, 1
 valdecaballeros.tk, 1
+valdelcubo.tk, 1
 valdicass.com, 1
 valecnatechnika.cz, 1
 valek.net, 1
@@ -92216,13 +97337,15 @@
 valenciaescatala.tk, 1
 valencianisme.tk, 1
 valencianistas.tk, 1
+valencraft.ca, 1
+valencraft.com, 1
 valenhub.com, 1
 valenhub.es, 1
 valeniidemunte.tk, 1
 valentin-dederer.de, 1
 valentin-ochs.de, 1
 valentin.app, 1
-valentin.ml, 1
+valentinaquino.com, 1
 valentinarosamilia.ch, 1
 valentinarosamilia.com, 1
 valentinberclaz.com, 0
@@ -92232,10 +97355,14 @@
 valentinog.com, 1
 valentinritz.com, 0
 valentinstag.ga, 1
+valentinvesa.ro, 1
 valeravi.tk, 1
+valerian.tk, 1
 valeriansaliou.name, 1
+valerieadolff.com, 1
 valerieorsoni.com, 1
 valescaind.com.br, 1
+valhallastrengthsthbne.com.au, 1
 valiakhmetov.tk, 1
 valiant.finance, 1
 validatis.com, 1
@@ -92253,7 +97380,6 @@
 valkova.net, 1
 valkyriecloud.com, 1
 valledeleresma.tk, 1
-valledeloso.com, 1
 vallei-veluwe.nl, 1
 vallenar.tk, 1
 valleyautofair.com, 1
@@ -92321,6 +97447,8 @@
 vampyrium.net, 0
 van-brandevoort.tk, 1
 van11y.net, 1
+vanadrighem.eu, 1
+vanasperenschoenen.nl, 1
 vanbalen.be, 1
 vanboven.nl, 1
 vanbruchem.tk, 1
@@ -92329,13 +97457,14 @@
 vancoevents.com, 1
 vancouverchess.com, 1
 vancouvercosmeticsurgery.ca, 1
-vancouverwatowncar.com, 1
 vancouverwebsitedesigns.com, 1
 vandalfsen.me, 1
 vandals.ml, 1
 vandam.io, 1
 vandemeent.eu, 1
 vandenbroeck-usedcars.be, 0
+vander-vegt.nl, 1
+vanderbeekonline.nl, 1
 vanderbiltcisa.org, 1
 vanderkley.it, 1
 vanderkrieken.org, 1
@@ -92357,8 +97486,10 @@
 vanetv.com, 1
 vaneurology.com, 1
 vaneyckexpo.be, 1
+vaneyckwashere.be, 1
 vaneyckwashere.com, 1
 vaneyckwashere.eu, 1
+vaneyckwashere.gent, 1
 vangest.pt, 1
 vangoghcoaching.nl, 1
 vanhaos.com, 1
@@ -92372,11 +97503,12 @@
 vanisha.co, 1
 vanityfairnapkins.com, 1
 vanmalland.com, 1
+vanna-mechti.tk, 1
 vannaos.com, 1
 vannaos.net, 1
 vannoordgouda.nl, 1
-vanohaker.ru, 1
 vanouwerkerk.net, 1
+vanquish.tk, 1
 vanspa.vn, 1
 vanss.org, 1
 vanstoftotleven.nl, 1
@@ -92386,6 +97518,7 @@
 vantru.is, 1
 vanuithartenziel.nl, 1
 vanvanlines.com, 1
+vanveenendaaladvies.info, 1
 vanwa.ch, 1
 vanwertcountyohio.gov, 1
 vanwoensei.xyz, 1
@@ -92394,7 +97527,8 @@
 vanwoensel.xyz, 1
 vanwort.de, 1
 vanwunnik.com, 1
-vap.llc, 1
+vanzoestheftrucks.nl, 1
+vap.llc, 0
 vapecom-shop.com, 1
 vapecrunch.com, 1
 vapehour.com, 1
@@ -92422,7 +97556,6 @@
 vareillefoundation.fr, 0
 vareillefoundation.org, 0
 varela-electricite.fr, 1
-vargaslatten.se, 1
 varghese.de, 1
 variable.agency, 0
 variable.dk, 1
@@ -92436,13 +97569,13 @@
 varjo.tk, 1
 varlex.cl, 1
 varna-airport.bg, 1
+varney.tk, 1
 varnish.ga, 1
 varonahairrestoration.com, 1
 varoscak.de, 1
 varshathacker.com, 1
 varun-rajeshwari.tk, 1
 varvitra20mg.ga, 1
-varvy.com, 1
 varyrentacar.com, 1
 varztupasaulis.com, 1
 varztupasaulis.eu, 1
@@ -92455,9 +97588,9 @@
 vascomm.co.id, 1
 vasconcellos.xyz, 1
 vase-eroticke-povidky.cz, 1
+vasectomias.cl, 1
 vasel.de, 1
 vasel.eu, 1
-vaselineoel.de, 1
 vash-doctor.tk, 1
 vash-dom.tk, 1
 vashdohod.ml, 1
@@ -92478,6 +97611,8 @@
 vastenotaris.nl, 1
 vastgoed-lidl.nl, 1
 vasthe.in, 1
+vasya-com.tk, 1
+vasya-odyag.tk, 1
 vasyaka.ga, 1
 vasyharan.com, 1
 vat-eu.com, 1
@@ -92511,7 +97646,7 @@
 vazgaming.com, 0
 vazovia.com, 1
 vb.media, 1
-vbabe.tube, 1
+vbabe.tube, 0
 vbazile.com, 1
 vbelgorode.tk, 1
 vbestproduct.com, 1
@@ -92570,6 +97705,7 @@
 vdw-instruments.com, 1
 ve.search.yahoo.com, 0
 ve3oat.ca, 1
+ve3zsh.ca, 0
 vebbankir-zajm-onlajn.gq, 1
 vebdengi.tk, 1
 veblr.com, 1
@@ -92589,12 +97725,14 @@
 vecturagames.com, 1
 vedatkarabacak.av.tr, 1
 vedev.io, 1
+vedika.site, 1
 vedma-praktik.com, 1
 vedshastradata.in, 1
 veeculinary.com, 1
 veegish.com, 1
+veessen.tk, 1
 veg-leiden.nl, 1
-veg.lv, 1
+veg.lv, 0
 vega-diva.com, 1
 vega-rumia.pl, 0
 vegalitarian.org, 1
@@ -92608,6 +97746,7 @@
 veganmasterrace.com, 1
 veganoos.com, 1
 veganrecipereviews.com, 1
+vegardit.com, 1
 vegascasino.news, 1
 vegasluxuryestates.com, 1
 vegavio.com, 1
@@ -92615,6 +97754,7 @@
 vege-tables.fr, 1
 vegekoszyk.pl, 1
 vegepa.com, 1
+vegetabio.com, 0
 vegetariantokyo.net, 1
 vegetarier-sind-moerder.tk, 1
 veggie-einhorn.de, 1
@@ -92636,6 +97776,7 @@
 vejersferie.dk, 1
 vekenz.com, 1
 vektlofting.tk, 1
+vektor.tk, 1
 vektorparts.ru, 1
 velacartagena.tk, 1
 velasense.com, 1
@@ -92650,19 +97791,23 @@
 velobar.plus, 1
 velocitycu.com, 1
 velocityfiber.com, 1
+velocitygames.tk, 1
 velocompany.com, 1
 velocompany.de, 1
 velonustraduction.com, 1
 velorail01.fr, 1
 veloroute.hamburg, 1
 velosipedi.tk, 1
+veluwerally2002.tk, 1
 velvet-tarantula.tk, 1
 velvetempire.tk, 1
 velvetia.no, 1
 venacifuentes.tk, 1
+venali.tk, 1
 venalytics.com, 1
 venbraca.com, 1
 vendasdealbunsbrasil.tk, 1
+vendela.tk, 1
 vendermicasarapido.com.mx, 1
 vendi.it, 1
 vendigital.com, 1
@@ -92674,13 +97819,15 @@
 vendserve.eu, 1
 veneerssandiego.com, 1
 venenum.org, 1
+venera-magik.tk, 1
 venesuela.cf, 1
 venetkaarsenovart.com, 1
+venev.com, 1
 venev.name, 1
 venezia.ga, 1
-venezianischemasken.com, 1
 venezuelachat.tk, 1
 venezuelalibre.tk, 1
+venga.tk, 1
 vengriya.tk, 1
 venicecomputerrepair.com, 1
 venicefl.gov, 1
@@ -92723,6 +97870,7 @@
 verberne.nu, 1
 verbier-lechable.com, 1
 verbierfestival.com, 0
+verbio.com, 1
 verbmaestro.com, 1
 verboom.co.nz, 1
 verbzilla.com, 1
@@ -92732,6 +97880,7 @@
 vercel.org, 1
 vercel.sh, 1
 vercettipropiedades.cl, 1
+vercopy.com, 1
 verdeandco.co.uk, 1
 verdensflag.dk, 1
 verdeplus.net, 1
@@ -92744,11 +97893,13 @@
 vereinlandwege.de, 1
 vereinscheck.de, 1
 vereinswahl.online, 1
+verepeliculashd.com, 1
 vereshagino.tk, 1
 verfassungsklage.at, 1
 verge.capital, 1
 vergeaccessories.com, 1
 vergelijksimonly.nl, 1
+vergelijkwitgoed.nl, 1
 vergessen.cn, 1
 vergraal.tk, 1
 verhaltenstherapie-weiden.de, 1
@@ -92758,9 +97909,9 @@
 verified.eu, 1
 verifiedjoseph.com, 1
 verifiny.com, 1
-verifpal.com, 1
 verifyos.com, 1
 verifyyourip.com, 1
+veriny.tf, 0
 veriomed.com, 1
 veripn.com, 1
 veritafineviolins.com, 1
@@ -92773,6 +97924,8 @@
 verkeer.gent, 1
 verkeersschoolrichardschut.nl, 1
 verkiezingsuitslagen.nl, 1
+verkkovalmentajat.fi, 1
+verkossa.tk, 1
 verlag-lq.at, 1
 verlag-lq.ch, 1
 verlag-lq.com, 1
@@ -92780,6 +97933,7 @@
 verlag-lq.net, 1
 verlagdrkovac.de, 0
 verlaglq.com, 1
+verlete.com, 1
 verliebt-in-bw.de, 1
 verliebt-in-niedersachsen.de, 1
 verliefde-jongens.nl, 1
@@ -92803,6 +97957,7 @@
 veronic.hu, 1
 veronique-huon-photographe.fr, 1
 veronique-schmitz.de, 1
+veros-volejbal.tk, 1
 verrerie-mousseline.org, 0
 verry.org, 1
 vers.one, 1
@@ -92816,7 +97971,6 @@
 versfin.net, 1
 versicherungen-werner-hahn.de, 1
 verso.money, 1
-versolslapeyre.fr, 1
 verspai.de, 1
 verstaanwiskunde.co.za, 1
 verstka.cf, 1
@@ -92829,13 +97983,15 @@
 verticesedge.com, 1
 verticrew.com, 1
 vertigo.name, 0
+vertikal.tk, 1
+vertrauen.site, 1
 vertretungsplan.io, 1
 vertrieb-strategie.de, 1
 verustracking.com, 1
 vervewellness.co.nz, 1
 verwandlung.org, 1
 verwayen.com, 1
-verwimp.org, 1
+verwer-infra.nl, 1
 veryapt.com, 1
 verybin.com, 1
 verygoodwebsite.ca, 1
@@ -92854,7 +98010,9 @@
 vesaviljanen.fi, 1
 vescudero.net, 1
 veseleruska.sk, 1
+veselka.tk, 1
 veselyjpovar.gq, 1
+vesinhcongnghiepttchome.com, 1
 vespacascadia.com, 1
 vestacp.top, 1
 vestakassa-online.cf, 1
@@ -92862,10 +98020,13 @@
 vestberry.com, 1
 vestd.com, 1
 vestibtech.com, 1
+vestibular.science, 1
+vestibulartechnologies.com, 1
 vestiizhevska.cf, 1
 vestingbar.nl, 1
 vestlundbolargen.tk, 1
 vestum.ru, 1
+vesuvio.tk, 1
 vet4life.co.uk, 1
 vetapp.net, 1
 vetbits.com, 0
@@ -92881,6 +98042,7 @@
 veterinarioaltea.com, 1
 veterinary-colleges.com, 1
 veterinaryhelp.cf, 1
+veterinarylabsupply.com, 1
 veterinaryvision.co.uk, 1
 veteriner.name.tr, 1
 vetinte.eu, 1
@@ -92895,6 +98057,7 @@
 vetsmarketing.co.za, 1
 vettenburg.eu, 1
 vetustainversion.com, 1
+vetvim.com, 1
 vetwebsuccess.com, 1
 veules-les-roses.fr, 1
 veverusak.cz, 1
@@ -92908,10 +98071,10 @@
 vgatest.nl, 1
 vgchat.us, 1
 vgcheat.com, 1
-vgeek.guru, 1
 vgerak.com, 1
 vglist.co, 1
 vgolos.zt.ua, 1
+vgopilot.azurewebsites.net, 1
 vgorcum.com, 1
 vgpu.vladimir.ru, 1
 vgropp.de, 1
@@ -92929,11 +98092,13 @@
 viagratop.tk, 1
 viagusto.pl, 1
 viajandoporelmundo.com.ar, 1
+viajantesturismo.com, 1
 viajaramsterdam.com, 1
 viaje-a-china.com, 1
 vialibido.com.br, 1
 viamilitaris.net, 1
 viaprinto.de, 1
+vias-ferratas.tk, 1
 viasinc.com, 0
 viasun.ru, 1
 viato.fr, 1
@@ -92943,14 +98108,18 @@
 vibgyorhigh.com, 1
 vibgyorrise.com, 1
 vibgyyor.com, 1
+vibraagenciadigital.com.br, 1
 vibramycin100mg.tk, 1
 vibrant-america.com, 1
 vibrato1-kutikomi.com, 1
 vicarious.cf, 1
 vicenage.com, 1
+vicentaburon.tk, 1
 vicentediaz.mx, 1
 vicentejr.com.br, 1
 vicenterodriguez81.tk, 1
+vicentico.tk, 1
+vicescorts.ga, 1
 vicesetcaprices.com, 1
 vichama.pe, 1
 vichiya.com, 1
@@ -92965,7 +98134,9 @@
 victora.com, 1
 victorblomberg.se, 1
 victorbuch.cf, 1
+victorcalvez.com, 1
 victorcanera.com, 1
+victorcarrasco.tk, 1
 victorcarwasher.com, 1
 victoreriksson.ch, 1
 victoreriksson.co, 1
@@ -92984,6 +98155,7 @@
 victoria-legis.ru, 1
 victoria.associates, 1
 victoriaartist.ru, 1
+victorianosaez.tk, 1
 victoriastudio.ru, 1
 victorique.moe, 1
 victorjacobs.com, 0
@@ -92996,13 +98168,16 @@
 victorunix.com, 1
 victory.radio, 1
 victoryalliance.us, 1
+victorychurch.org.tw, 1
 victusrp.gq, 1
 vicugna.nl, 1
 vicyu.com, 1
+vid-eo.click, 1
 vid.me, 0
 vidadu.com, 1
 vidaforanea.com.mx, 1
 vidanuevaparaelmundo.net, 1
+vidapositiva.tk, 1
 vidarity.com, 1
 vidasanayfitness.com, 1
 vidassemfronteiras.com, 1
@@ -93036,6 +98211,7 @@
 videopornoitaliana.com, 1
 videoprikol.cf, 1
 videoprikoly.ga, 1
+videoremote.tk, 1
 videosdiversosdatv.com, 1
 videoseriesbiblicas.com, 1
 videoseyredin.net, 1
@@ -93044,6 +98220,7 @@
 videosparatodos.com, 1
 videosporno.life, 1
 videosqr.com, 1
+videostop.asia, 1
 videot.tk, 1
 videotehnika.tk, 1
 videoueberwachung-set.de, 1
@@ -93062,7 +98239,6 @@
 vidkovaomara.si, 1
 vidlyoficial.com, 1
 vidmia.com, 1
-vidnoe50.ru, 1
 vidracariaespelhosbh.com.br, 1
 vidyabhavanam.org, 1
 vidyamonk.com, 1
@@ -93083,7 +98259,6 @@
 vietnam-lifer.com, 1
 vietnam-tours.tk, 1
 vietnamese.dating, 1
-vietnamguide.co.kr, 1
 vietnamhairs.com, 1
 vietnamhost.vn, 0
 vietnamluxurytravelagency.com, 1
@@ -93120,6 +98295,7 @@
 vigorspa.it, 1
 vigoxatelier.tech, 0
 vigrey.com, 1
+vigridpartiet.tk, 1
 vihotar.com, 1
 viikko.cf, 1
 viikko.eu, 1
@@ -93158,12 +98334,12 @@
 viktorchinkonsung.nl, 1
 viktorchinkonsung.online, 1
 viktorchinkonsung.site, 1
+viktoria-goo.com, 1
 viktorovi.cz, 1
 viktorprevaric.eu, 1
 viku.fi, 1
 vila-eden.cz, 1
 vilabiamodas.com.br, 1
-viladochurrasco.com.br, 1
 vilafloridacapivari.com.br, 1
 vilamarija.tk, 1
 vilantice.cz, 1
@@ -93182,6 +98358,7 @@
 villacarralon.tk, 1
 villach.at, 1
 villadelprado.tk, 1
+villaditirano.tk, 1
 villaespanola.tk, 1
 villafiore.com.br, 1
 villagecardshop.co.uk, 1
@@ -93193,6 +98370,7 @@
 villageunique.com.br, 1
 villagockel.de, 1
 villainsclothing.com.au, 1
+villaismaelcortinas.uy, 1
 villakarma.at, 1
 villalmanzo.tk, 1
 villamariaamalfi.it, 1
@@ -93202,7 +98380,6 @@
 villasfinistere.fr, 1
 villasforsale-bali.com, 1
 villaumbrales.tk, 1
-villavaltava.fi, 1
 villavasco.ovh, 1
 villaville.com, 1
 villawirz.it, 1
@@ -93216,15 +98393,16 @@
 villerez.fr, 1
 villers-ecalles.fr, 1
 villesalonen.fi, 1
+villitalia.nl, 1
 villu.ga, 1
 villu.stream, 1
-vilnagaon.com, 1
 viltsu.net, 1
 vim.cx, 1
 vim.ge, 1
 vima.ch, 0
 vimeo.com, 1
 vimeosucks.nyc, 1
+vimium.com, 1
 vimka.gq, 1
 vimoksa.com, 1
 vinarstvimodryhrozen.cz, 1
@@ -93232,11 +98410,14 @@
 vinaygarg.com, 1
 vinc.me, 1
 vinc.name.tr, 1
+vincehut.top, 1
 vincent-haupert.de, 1
 vincentcox.com, 0
-vincentpancol.com, 1
+vincentiliano.tk, 1
 vincentpo.tk, 1
+vincentsimon.de, 1
 vincentwolsink.nl, 1
+vinceracing.tk, 1
 vincexpertconsulting.fr, 1
 vincible.space, 1
 vinciconps4.it, 1
@@ -93254,6 +98435,7 @@
 vinetech.co.nz, 1
 vingt.me, 1
 vinicius.sl, 0
+viniciuscosta.tk, 1
 vinigas.com, 1
 vinilosdecorativos.net, 1
 vinistas.com, 1
@@ -93273,6 +98455,8 @@
 vinovum.net, 1
 vinsation.com, 1
 vinsetchampagne.fr, 0
+vinsonconsulting.cl, 1
+vinsonfinancials.tk, 1
 vintagebandfestival.org, 1
 vintagecarparts.co.uk, 1
 vintagecaskandbarrel.com, 1
@@ -93281,6 +98465,7 @@
 vintagemakeupguide.com, 1
 vintageportgifts.co.uk, 1
 vintagesouthernpicks.com, 1
+vintagetoydepot.tk, 1
 vintagetrailerbuyers.com, 1
 vintazh.net, 1
 vinticom.ch, 0
@@ -93312,12 +98497,14 @@
 vip6132.com, 1
 vip77018.com, 1
 vip8522.com, 1
-vip918.net, 1
 vipass.ca, 1
 vipcards.top, 1
 vipd88.net, 1
 vipenvia.com.br, 1
 viperperformance.co.uk, 1
+vipesball.cc, 1
+vipesball.info, 1
+vipesball.me, 1
 vipesball.net, 1
 vipf88.com, 1
 vipfitter.com, 1
@@ -93352,10 +98539,9 @@
 vir2.me, 1
 virala.tk, 1
 viralboombox.xyz, 1
-viralcreate.com, 0
 viralhua.com, 1
+viralinsurance.ga, 1
 viraljobs.ga, 1
-viralmailer.club, 1
 viralme.in, 1
 viraloffer.ga, 1
 viralpop.it, 0
@@ -93381,20 +98567,23 @@
 virtual-webcam.com, 1
 virtual.hk, 0
 virtualbrestby.tk, 1
+virtualbruges.tk, 1
 virtualcitehuallaga.com, 1
 virtualcloud.ddns.net, 1
 virtualcommodities.org, 1
 virtualcomputer.ml, 1
 virtualdesignmedia.com, 1
 virtualgovernance.tk, 1
-virtualgraphics.in, 1
 virtuality4d.com, 1
 virtuallifestyle.nl, 1
 virtuallypilates.com, 1
+virtualmachine.tk, 1
 virtualmemento.tk, 1
 virtualmt2.pl, 1
+virtualprom.tk, 1
 virtualsanity.com, 1
 virtualspeech.com, 1
+virtualtabletop.io, 1
 virtualvaults.com, 1
 virtualvitrine.com, 1
 virtualx.de, 1
@@ -93424,6 +98613,7 @@
 visatitans.com, 1
 visaya.com.co, 1
 viscoelastico.com.br, 1
+visconapp.com, 1
 viscopic.com, 1
 viserproject.com, 0
 viseum.co.uk, 1
@@ -93442,11 +98632,9 @@
 visionduweb.fr, 1
 visionexpresscareers.com, 1
 visiongamestudios.com, 1
-visiongroup.top, 1
 visionless.me, 0
 visionnissancanandaiguaparts.com, 1
 visionnocturne.tk, 1
-visionofcolour.com, 1
 visionthroughknowledge.com, 1
 visiontree-beta.eu, 1
 visionwow.ai, 1
@@ -93483,7 +98671,7 @@
 vistb.me, 1
 vistec-support.de, 1
 visto.cl, 1
-visual-cockpit.com, 1
+visual-cockpit.com, 0
 visual-concept.net, 1
 visual-design.cf, 1
 visualdrone.co, 1
@@ -93491,6 +98679,7 @@
 visualgrafix.com.mx, 1
 visualideas.org, 1
 visualiti.co, 1
+visualized.tech, 1
 visualizing.info, 1
 visuall.be, 1
 visualmarketingdeals.com, 1
@@ -93519,10 +98708,12 @@
 vitaliyshepotkov.tk, 1
 vitallispsy.nl, 1
 vitalos.com.br, 1
+vitalshop.tk, 1
 vitalthings.de, 1
 vitalware.com, 1
 vitalyzhukphoto.com, 1
 vitamaxxi.com.br, 1
+vitamed.ca, 1
 vitamina.cl, 1
 vitamina.com, 1
 vitaminka.tk, 1
@@ -93532,7 +98723,10 @@
 vitapingu.de, 1
 vitario.eu, 1
 vitastic.nl, 1
+vitavista.health, 1
+vitavista.io, 1
 viteoscrm.ch, 0
+viterboonair.tk, 1
 vitkausk.as, 1
 vitlproducts.com, 1
 vitoye.com, 1
@@ -93541,8 +98735,11 @@
 vitrade.de, 1
 vitrado.de, 1
 vitrinachasov.cf, 1
+vitromex.tk, 1
 vitron.ru, 1
 vitsoft.by, 1
+vitta.ml, 1
+vitto.tk, 1
 vitus-meppen.de, 1
 viva.ua, 1
 viva2000.com, 1
@@ -93555,9 +98752,11 @@
 vivaldi.club, 1
 vivaldi.com, 1
 vivaldi.net, 1
+vivamortgage.tk, 1
 vivanosports.com.br, 0
 vivantstays.com, 1
 vivaocredito.com.br, 1
+vivapharma.net, 1
 vivas.gq, 1
 vivates.tk, 1
 vivatv.com.tw, 1
@@ -93566,6 +98765,7 @@
 vive.link, 1
 viveconsalud.club, 1
 vivediabetes-sanamente.com, 1
+vivekanandaspokenenglish.com, 1
 vivemedialab.com, 1
 vivemercadosaludable.com, 1
 vivendi.de, 1
@@ -93575,10 +98775,12 @@
 vivesaludableconomnilife.com, 1
 vivetoluca.com, 1
 vivi.fyi, 1
+vivian.tk, 1
 vivianadavila.com, 1
 vivianmaier.cn, 1
 vivichannel.tk, 1
 vivid-academy.com, 1
+vivide.re, 1
 vividinflatables.co.uk, 1
 viviennelinettevandenassem.tk, 1
 viviennevandenbos.nl, 1
@@ -93633,7 +98835,10 @@
 vkstream.tk, 1
 vkulagin.ru, 1
 vkusnyashka.tk, 1
+vkwebsite.ru, 1
 vl-grafikdesign.de, 1
+vlaamsegemeenschap.tk, 1
+vlaamsetollers.tk, 1
 vladgazeta.gq, 1
 vladikavkaz-city.tk, 1
 vladimir-chanaev.pro, 1
@@ -93653,6 +98858,8 @@
 vlaggen-landen.nl, 1
 vlajo.org, 1
 vlakem.net, 1
+vlance.gq, 1
+vlaser.es, 1
 vlasov.ml, 1
 vlasova-sova.ml, 1
 vlastimilburian.cz, 1
@@ -93663,7 +98870,6 @@
 vleij.family, 1
 vleij.se, 1
 vleo.me, 1
-vlice.cn, 0
 vliegensvlug.online, 1
 vliegensvlug.services, 1
 vlike.ml, 1
@@ -93685,6 +98891,7 @@
 vmc.co.id, 1
 vmccnc.com, 1
 vmcsubastas.com, 1
+vmem.jp, 0
 vmf365.tk, 1
 vmgirls.com, 1
 vmhomedesign.com, 0
@@ -93701,8 +98908,8 @@
 vndb.org, 1
 vneftekamske.tk, 1
 vnetboard.com, 1
-vnfs-team.com, 1
 vnikolaev.tk, 1
+vnlfrk.com, 1
 vnministries.org, 1
 vnovosibirske.tk, 1
 vnpem.com, 1
@@ -93747,7 +98954,9 @@
 vocus.aero, 1
 vocustest.aero, 1
 voda.org.ru, 1
+vodadombay.cf, 1
 vodafone.com.gh, 1
+vodavoda.tk, 1
 vodb.org, 1
 voddinteriors.com, 1
 vodicak.info, 1
@@ -93756,6 +98965,7 @@
 vodpay.net, 1
 vodpay.org, 1
 voetbalclubinfo.tk, 1
+voetbalforum.tk, 1
 voetbalindestad.be, 1
 voetfit47.nl, 1
 voeux.io, 0
@@ -93773,7 +98983,6 @@
 voicedata.tk, 1
 voiceofcricket.tk, 1
 voiceofserbia.tk, 1
-voiceofthesilent.org, 1
 voicesoflabor.com, 1
 voicesofspirit.at, 1
 voicr.nl, 1
@@ -93797,10 +99006,8 @@
 vojenshandicap.dk, 1
 vojtat.cz, 1
 vokabl.io, 1
-vokalayedadgostary.com, 1
 vokativy.cz, 1
 vokeapp.com, 1
-vokieciupamokos.lt, 1
 vokrug.ga, 1
 vokurka.net, 1
 vokzalkursk.ru, 1
@@ -93830,6 +99037,7 @@
 volha.tk, 1
 volin.tk, 1
 volk.gq, 1
+volkanyilmaz.com.tr, 1
 volker-gropp.de, 1
 volkergropp.de, 1
 volkerwesselstransfer.nl, 0
@@ -93837,10 +99045,12 @@
 volkov.ga, 1
 volksvorschlagpmar.ch, 1
 volkswagengolf.tk, 1
+volkswagenmiennam.com.vn, 1
 volkswurst.de, 1
 vollans.id.au, 0
 volleyballnews.tk, 1
 volleyfreaks.tk, 1
+volleypatos.tk, 1
 vollmondstollen.de, 1
 volochaevskiy.tk, 1
 volochisk.tk, 1
@@ -93858,6 +99068,7 @@
 voltainsite.com, 1
 voltajedigital.com, 1
 voltarengelprice.tk, 1
+voltcloud.net, 1
 volto.io, 1
 volubilisplus.fr, 1
 volunka.ml, 1
@@ -93886,9 +99097,9 @@
 vooxia.xyz, 1
 vop.li, 1
 voprosnik.gq, 1
+voprosownet.tk, 1
 vorbrodt.blog, 1
 vorderklier.de, 1
-vorkbaard.nl, 1
 vorlage-musterbriefe.de, 1
 vorlage-mustervertrag.de, 1
 vorlagen-geburtstagsgruesse.de, 1
@@ -93944,6 +99155,7 @@
 votresiteweb.ch, 0
 votrespace.ca, 1
 vous-etre-utile-ceidf.fr, 1
+vous-les-jeunnes.tk, 1
 vov.cloud, 1
 vov.furniture, 1
 vovac.tk, 1
@@ -93960,22 +99172,28 @@
 voya.ga, 0
 voyage-evasion.com, 1
 voyage-martinique.fr, 1
-voyageat.com, 1
+voyageat.com, 0
 voyageforum.com, 1
 voyageofyume.com, 1
 voyagesaufildespages.be, 0
 voyageschine.com, 1
 voyagewd.world, 1
+voyagewiki.com, 1
+voyagewiki.org, 1
 voyagewonders.com, 1
 voyancedanslenord.com, 1
 vozami.com, 1
 vozbudim.tk, 1
+vozdux.tk, 1
 vozhatik.cf, 1
 vozhuo.cf, 1
+vparilke.su, 1
 vpc-display.com, 1
+vpinball.com, 1
 vpn.black, 1
 vpn.ht, 1
 vpn4free.ga, 1
+vpnaustralianow.org, 1
 vpnboss.com.au, 1
 vpnemail.com, 1
 vpnguvnor.co.uk, 1
@@ -93986,11 +99204,13 @@
 vpnstreamer.com.au, 1
 vponline.com.br, 1
 vprotect.ga, 1
+vps.hosting, 1
 vps.management, 1
 vpsao.org, 1
 vpsboard.com, 1
 vpsce.com, 1
 vpsdream.dk, 1
+vpsgongyi.com, 1
 vpsou.com, 1
 vpsport.ch, 1
 vpsproj.dynu.net, 1
@@ -94004,6 +99224,7 @@
 vqcymsa.com, 1
 vqebizconsulting.com, 1
 vqeg.org, 1
+vr-tops.ir, 1
 vr3marcas.com.br, 1
 vrachi.online, 1
 vractive.pl, 1
@@ -94015,12 +99236,14 @@
 vrcprofile.com, 1
 vredesregister.be, 1
 vredesregister.gent, 1
+vreeken-selfstorage.tk, 1
 vreeman.com, 1
 vreling.nl, 1
 vremyachko.tk, 1
 vremyapervyih-hd.tk, 1
 vretmaskin.se, 1
 vreviewbestseller.com, 1
+vrfoodchannel.com, 1
 vrgamecritic.com, 1
 vrgametrailers.net, 1
 vriendenkring-klassiekers.tk, 1
@@ -94072,6 +99295,7 @@
 vse-potolki.ml, 1
 vsean.net, 1
 vsec.co.il, 1
+vsekulinar.ru, 1
 vsem-privet.tk, 1
 vsenovosti.cf, 1
 vseostile.ml, 1
@@ -94090,8 +99314,11 @@
 vss-clan.ml, 1
 vssnederland.nl, 1
 vstavropole.tk, 1
+vstgnstickers.dk, 1
+vstrikovaci-lisy.cz, 1
 vsund.de, 1
 vsx.ch, 1
+vsz.me, 1
 vtanki.tk, 1
 vtaxi.se, 1
 vtbs.moe, 1
@@ -94109,7 +99336,6 @@
 vucdn.com, 1
 vuelacaruru.com, 1
 vuelosabajoprecio.net, 1
-vugt.me, 1
 vuilelakens.be, 1
 vulcancycling.ga, 1
 vuldb.com, 1
@@ -94130,6 +99356,7 @@
 vultrhxl.com, 1
 vulyk-medu.com.ua, 1
 vunn.com, 1
+vuonthotuanh.com, 1
 vuotila.eu, 1
 vuoto.fi, 1
 vusdigital.com, 1
@@ -94137,9 +99364,11 @@
 vuvanhon.com, 1
 vux.li, 1
 vuzi.fr, 1
+vv1234.cn, 1
 vv30019.com, 1
 vv5197.co, 1
 vv6729.co, 1
+vv6729.com, 1
 vv6957.co, 1
 vv9297.co, 1
 vv9397.com, 1
@@ -94169,7 +99398,6 @@
 vx.hn, 1
 vxapps.com, 1
 vxl.sh, 1
-vxne.com, 1
 vxst.org, 1
 vxz.me, 1
 vybavzahradu.cz, 1
@@ -94179,6 +99407,7 @@
 vygeja.lt, 1
 vyplnto.cz, 1
 vyresimeonline.cz, 1
+vyroba.site, 1
 vyshivanochka.in.ua, 1
 vyshivki.net, 1
 vysko.cz, 1
@@ -94193,6 +99422,7 @@
 vyzner.cz, 1
 vz.al, 1
 vzce.cn, 1
+vzemiseo.com, 1
 vzemisite.com, 1
 vztekloun.cz, 1
 vzwregent.be, 1
@@ -94207,7 +99437,7 @@
 vzyatzaimonline.tk, 1
 vzzjoias.com.br, 1
 w-architectes.com, 1
-w-e-b--s-e-o.com, 1
+w-oasis.co.jp, 1
 w-p-k.de, 1
 w-spotlight.appspot.com, 1
 w-surgeryhospital.com, 1
@@ -94227,7 +99457,6 @@
 w123123.com, 1
 w1n73r.de, 1
 w1nter.xyz, 1
-w233w.com, 1
 w234234.com, 1
 w2929w.com, 1
 w2design.eu, 1
@@ -94284,7 +99513,6 @@
 w6619.com, 1
 w66191.com, 1
 w66191.net, 1
-w662211.com, 1
 w6631.com, 1
 w6637.com, 1
 w663w.com, 1
@@ -94306,6 +99534,7 @@
 w66hao.net, 1
 w66w66.com, 1
 w6729.co, 1
+w6729.com, 1
 w678678.com, 1
 w6808.com, 1
 w6829.com, 1
@@ -94318,10 +99547,10 @@
 w6957.co, 1
 w6957.com, 1
 w6969.com, 1
-w696w.com, 1
+w696w.com, 0
 w789789.com, 1
 w7k.de, 1
-w80010.com, 1
+w80010.com, 0
 w8093.com, 1
 w8094.com, 1
 w81365.com, 1
@@ -94349,6 +99578,7 @@
 w88info.win, 1
 w88xinxi.com, 1
 w8less.nl, 1
+w8wat.com, 1
 w9196.com, 1
 w9297.co, 1
 w9297.com, 1
@@ -94371,6 +99601,7 @@
 w99w99.com, 1
 wa-stromerzeuger.de, 0
 wa.me, 1
+waagen.tk, 1
 waaifu.com, 1
 waalsekrook.be, 1
 waavit.com, 1
@@ -94394,15 +99625,14 @@
 waeldertexas.gov, 1
 waelisch.de, 1
 waelti.xxx, 1
-waermekabine.org, 1
 waf.hk, 1
 waf.ninja, 1
 waf.sexy, 1
 wafa4hw.com, 1
 wafelland.be, 1
+waffarcash.com, 1
 waffle-backend-sanggyu.shop, 1
 waffle-sanggyu.tk, 1
-waffle.at, 0
 waffleindex.com, 1
 wafflemachine.org, 1
 wafflemakers.ca, 1
@@ -94411,19 +99641,19 @@
 wage-feeg.gc.ca, 1
 wagenmanswonen.nl, 1
 wageverify.com, 1
-waggs.link, 1
 wagn3r.de, 1
+wagnervineyards.com, 1
 wagspuzzle.space, 1
 wahhoi.net, 1
 wahine.gq, 1
-wahlen-bad-wurzach.de, 1
+wahminda.tk, 1
 wahrnehmungswelt.de, 1
 wahrnehmungswelten.de, 1
 wai-in.com, 1
+wai-in.net, 1
 waidfrau.de, 1
 waifu-technologies.com, 1
 waifu-technologies.moe, 1
-waigel.org, 1
 waikatowebdesigners.com, 1
 wail.net, 1
 waimanu.io, 1
@@ -94436,11 +99666,17 @@
 wajtc.com, 1
 wak.io, 1
 waka-mono.com, 1
+waka168.com, 1
+waka168.net, 1
+waka88.net, 1
 wakamiyasumiyosi.com, 1
 wakandasun.com, 1
+wakarandroid.com, 1
 wakastream.cc, 1
 wakatime.com, 1
 wake.net, 1
+wakecountynorthcarolina.ml, 1
+wakeofthepredator.tk, 1
 wakeupworld.ml, 1
 wakf123.net, 1
 wakf456.com, 1
@@ -94450,7 +99686,10 @@
 wakuwakustudyworld.co.jp, 1
 wala-floor.de, 1
 walden-interiors.com, 1
+waldenwritingcenter.ml, 1
 waldgourmet.de, 1
+waldo.tk, 1
+waldparkerwoelfe.tk, 1
 waldur.nl, 1
 waldvogel.family, 1
 walent.in, 1
@@ -94460,7 +99699,9 @@
 walk.onl, 1
 walker-foundation.org, 1
 walkera-fans.de, 1
+walkfordogs2017.nl, 1
 walkingandcycling.org.uk, 1
+walkingranada.com, 1
 walkingrehabilitation.com, 1
 walkinweb.com, 1
 walklocal.be, 1
@@ -94477,6 +99718,8 @@
 wallace-group.net, 1
 wallacealvesdigital.com.br, 1
 wallacehigh.org.uk, 1
+wallada.tk, 1
+wallbanksweb.net, 1
 walldisplaysapp.com, 1
 wallduck.com, 1
 wallendair.com, 1
@@ -94523,6 +99766,7 @@
 waltzmanplasticsurgery.com, 1
 walutomat.pl, 1
 walvi.nl, 1
+wamm.chat, 1
 wammu.eu, 1
 wan.pp.ua, 0
 wanashi.com, 1
@@ -94546,7 +99790,6 @@
 wangbangyu.ml, 1
 wangbangyu.tk, 1
 wangjiatun.com.tw, 1
-wangjun.me, 1
 wangluoyunying.com, 1
 wangqiliang.cn, 1
 wangqiliang.com, 1
@@ -94555,7 +99798,7 @@
 wangql.net, 1
 wangqr.org, 1
 wangqr.tk, 1
-wangriwu.com, 1
+wangriwu.com, 0
 wangshengze.com, 1
 wangtanzhang.com, 1
 wangwill.me, 1
@@ -94566,9 +99809,9 @@
 wangzuan168.cc, 1
 wanlieyan.cc, 1
 wanlieyan.com, 1
+wannaknow.tk, 1
 wannapopularnews.cf, 1
 wannaridecostarica.com, 1
-wantedposterstudios.com, 1
 wantocode.com, 1
 wanybug.cf, 1
 wanybug.cn, 1
@@ -94582,6 +99825,7 @@
 wapazewddamcdocmanui6001.azurewebsites.net, 1
 wapazewrdamcdocmanui6001.azurewebsites.net, 1
 wapbd.ga, 1
+wapflash.ml, 1
 wapgame.gq, 1
 wapgu.cc, 1
 wapheat.tk, 1
@@ -94591,8 +99835,10 @@
 wapnepal.com.np, 1
 wapnews.tk, 1
 wapoolandspa.com, 1
+wappie.tk, 1
 wapplerbrewing.com, 1
 wapspaces.tk, 1
+waptransfer.tk, 1
 wapveil.ml, 1
 waqood.tech, 1
 war-requiem.com, 1
@@ -94600,14 +99846,19 @@
 warbox.ga, 1
 warcraftjournal.org, 1
 ward.nl, 1
+ward2u.com, 1
+wardemons.tk, 1
+warden.navy, 1
+wardogz.tk, 1
 wardonat.tk, 1
 wardow.com, 1
 wardslager.com, 1
 warebouncycastles.co.uk, 1
 warehost.de, 0
-warekit.io, 1
 warekon.com, 1
 warekon.dk, 1
+warenghem.com, 1
+warenhuisvandijk.nl, 1
 warenits.at, 0
 warenmedia.com, 1
 warezbook.org, 1
@@ -94620,6 +99871,7 @@
 warispak.tk, 1
 warking.ml, 1
 warlions.info, 0
+warlords.cf, 1
 warmestwishes.ca, 1
 warmlyyours.com, 1
 warmservers.com, 1
@@ -94633,6 +99885,7 @@
 warp-radio.net, 1
 warp-radio.tv, 1
 warr.ath.cx, 1
+warrantycontracts.ga, 1
 warrantynowvoid.com, 1
 warrencountyga.gov, 1
 warrenhousevets.co.uk, 1
@@ -94679,6 +99932,7 @@
 washingtonwatchdog.org, 1
 washoedems.org, 1
 washsolucoesemlimpeza.com.br, 1
+washup.tk, 1
 wasi-net.de, 1
 wasido.com, 1
 wasielewski.com.de, 1
@@ -94686,7 +99940,6 @@
 waskesiuapparel.com, 1
 wass.ga, 1
 wassenaar.org, 1
-wasserpflanzen-freunde.de, 1
 wassibauer.com, 1
 wassim.is, 1
 wasteman.com, 1
@@ -94695,10 +99948,12 @@
 watari-bg.com, 1
 watashi.bid, 1
 watboeithet.nl, 1
+watch-host.ga, 1
 watch-wiki.org, 1
 watchcom.org.za, 1
 watchcow.org, 0
 watchdogs.tk, 1
+watchersrealm.tk, 1
 watchface.watch, 1
 watchfreeonline.co.uk, 1
 watchhentai.co, 1
@@ -94713,45 +99968,51 @@
 watco.group, 1
 water-addict.com, 1
 water-filters.tk, 1
-water-net.ru, 1
 water-polo.tk, 1
 water-valley.tk, 1
 water.com, 1
 waterbrook.com.au, 1
+waterdamagehouston.us, 1
 waterdogsmokedfish.com, 1
+waterdownmedia.co.uk, 1
 waterdrop.tk, 1
 waterfedpole.com, 0
 waterfrontonlakeoconee.com, 1
 waterheaterirvingtx.com, 1
 waterheaterleaguecity.com, 1
 waterleeftinbeek.nl, 1
+waterlemons2k.top, 1
 watermarkly.com, 1
 watermission.org, 1
 watermitigationspecialists.com, 1
 watermonitor.gov, 1
 wateroutlook.com, 1
 waterpoint.tk, 1
+waterpolosantona.tk, 1
 waterpolospain.tk, 1
 waterschaplimburg.nl, 1
-waterseal.in, 1
 waterside-residents.org.uk, 1
-waterslide-austria.at, 1
+watersky.tk, 1
 watersoul.com, 1
 watersource.ga, 1
+waterstreetloft.com, 1
 watersview.co.uk, 1
 watertorenstraat.tk, 1
 watertownmn.gov, 1
 watertrails.io, 1
 watervillewomenscare.com, 1
 waterworkscondos.com, 1
+watestsite.ovh, 1
 watfordjc.uk, 1
 watgroeitwaar.com, 1
 watgroeitwaar.eu, 1
 watgroeitwaar.net, 1
 watgroeitwaar.nl, 1
 watgroeitwaar.org, 1
+watismijnbandenspanning.nl, 1
+watobi.jp, 1
 watoo.tech, 1
-watthasawang.com, 1
+watsonsurplus.com, 1
 wattmaedchen.de, 1
 watvindtnederland.com, 1
 watzijnmijnkerntalenten.nl, 1
@@ -94764,23 +100025,29 @@
 waveburst.net, 1
 wavee-plus.com, 1
 wavengine.com, 1
+waveous.com, 1
 wavered.cf, 1
 waverlypa.gov, 1
 waverlytn.gov, 1
 wavesboardshop.com, 1
 wavesite.tk, 1
-waveum.com, 1
 wawak.pl, 1
 wawapuquy.com, 1
 wawarsingny.gov, 1
 waxdramatic.com, 1
 waxlrs.com, 1
+waycoolmail.tk, 1
 waycraze.com, 1
+wayfair.ca, 1
+wayfair.co.uk, 1
+wayfair.com, 1
+wayfair.de, 1
 wayfairertravel.com, 1
 wayficdesign.com, 1
 waynecountyne.gov, 1
 waynecountyoh.gov, 1
 waynefranklin.com, 1
+wayneo.tk, 1
 wayohoo.com, 1
 wayohoo.net, 1
 waysthat.com, 0
@@ -94788,17 +100055,17 @@
 waytt.cf, 1
 wayuanma.com, 1
 waze.com, 1
-wazito-fc.com, 1
 wb-cw.tech, 1
 wb256.com, 1
 wba.or.at, 1
 wbbauth.de, 1
+wbbwbwebweb.cf, 1
 wbca.ca, 1
 wbcasaverde.co, 1
 wbci.us, 0
 wbcme.co.uk, 0
+wbh.im, 1
 wbinnssmith.com, 1
-wbit.co.il, 0
 wblinks.com, 1
 wbookcompany.com, 1
 wbsogids.nl, 1
@@ -94811,18 +100078,23 @@
 wby.gd, 1
 wby.tw, 1
 wc-is.com, 1
+wc3modding.ml, 1
 wc64.org, 1
 wca.link, 1
 wcally.com, 1
 wcbook.ru, 0
 wcei.com.au, 1
 wcfauth.de, 1
+wcit2010.com, 1
 wck.com, 1
 wcloud.pro, 1
 wcn.life, 0
 wcrca.org, 1
 wctsite.tk, 1
 wcwcg.net, 1
+wd-api.com, 1
+wd-img.com, 1
+wd-ljt.com, 1
 wd36.cc, 1
 wd627.com, 1
 wd63.cc, 1
@@ -94848,7 +100120,6 @@
 we168168.com, 1
 we5688.net, 1
 we88fun.com, 1
-we8hd.com, 1
 we9988.net, 1
 weacceptbitcoin.gr, 1
 wealthadvisorsmf.com, 1
@@ -94873,9 +100144,9 @@
 wearehackerone.com, 1
 weareincognito.org, 1
 wearekiwi.com, 1
-weareoffstage.com, 1
 wearepapermill.co, 1
 wearepapermill.com, 1
+wearesouthafricans.com, 1
 wearesuma.com, 1
 wearetravellers.nl, 1
 wearetuzag.com, 1
@@ -94887,6 +100158,7 @@
 weather.gov.mo, 1
 weatherbuzzmedia.com, 1
 weatherforyou.com, 1
+weathermelon.io, 1
 weathermyway.rocks, 1
 weatherproduct.ga, 1
 weavers.space, 1
@@ -94902,13 +100174,14 @@
 web-demarche.com, 1
 web-design-india.com, 1
 web-design.co.il, 1
-web-desing.com.ua, 0
+web-desing.com.ua, 1
 web-disaster.tk, 1
 web-format.tk, 1
 web-hotel.gr, 1
 web-info.ir, 1
 web-it-entwicklung.de, 1
 web-jive.com, 1
+web-lab.ml, 1
 web-odyssey.com, 1
 web-online.cf, 1
 web-ross.gq, 1
@@ -94933,6 +100206,8 @@
 web2screen.tv, 1
 web404.net, 1
 web74.ga, 1
+web76.tk, 1
+webaccio.com, 1
 webadiccion.net, 1
 webadicta.net, 1
 webadicto.net, 1
@@ -94943,9 +100218,11 @@
 webandmore.de, 1
 webandsun.com, 1
 webanet.eu, 1
+webannonces.tk, 1
 webanyti.me, 1
 webapky.cz, 1
 webappky.cz, 1
+webapplay.com, 1
 webaro.cloud, 1
 webart-factory.de, 1
 webartex.ru, 1
@@ -94953,6 +100230,7 @@
 webauthnlogin.com, 1
 webbhuset.se, 0
 webbiz.co.uk, 1
+webbolivia.tk, 1
 webbricks.ru, 1
 webcam-lisa.ml, 1
 webcam-model.tk, 1
@@ -94963,6 +100241,7 @@
 webcaptive.com, 1
 webcaptive.net, 1
 webcarroseletricos.ga, 1
+webcase.tk, 1
 webcatchers.nl, 0
 webcatechism.com, 0
 webce.de, 1
@@ -94972,8 +100251,10 @@
 webclymber.com, 1
 webcoins.tk, 1
 webcollect.org.uk, 1
+webcollector.ga, 1
 webcontentserver.com, 1
 webcontentspinning.com, 1
+webcontrol.tk, 1
 webconverge.nl, 1
 webcookies.org, 1
 webcreativa.tk, 1
@@ -94983,7 +100264,6 @@
 webdesign-kall.de, 1
 webdesign-note.jp, 1
 webdesignagency.cf, 1
-webdesigneauclaire.com, 1
 webdesignersinchennai.tk, 1
 webdesigngc.com, 1
 webdesignlabor.ch, 1
@@ -95006,12 +100286,16 @@
 webeau.com, 1
 webeditors.com, 1
 webehurt.com, 1
+webenglish.se, 1
+webera.pro, 1
 webergrillrestaurant.com, 1
 webers-webdesign.de, 1
 webexample.win, 0
 webexp.biz, 1
 webexperts.tk, 1
 webexpertsdirect.com.au, 1
+webfeifei.tk, 1
+webfence.pt, 1
 webfilings-eu-mirror.appspot.com, 1
 webfilings-eu.appspot.com, 1
 webfilings-mirror-hrd.appspot.com, 1
@@ -95020,6 +100304,7 @@
 webfixers.nl, 1
 webforce.pt, 1
 webformula.in, 1
+webfun.tk, 1
 webgap.io, 0
 webgarten.ch, 1
 webgears.com, 1
@@ -95027,6 +100312,7 @@
 webgeneric.in, 1
 webgentleman.tk, 1
 webhackspro.com, 1
+webharvest.gov, 1
 webhelyesarcu.hu, 1
 webhoffmann.de, 1
 webhooks.stream, 1
@@ -95044,7 +100330,10 @@
 webhotelsoversigt.dk, 1
 webhr.co, 1
 webia.in.th, 1
+webika.site, 1
+webimagina.tk, 1
 webinator.tk, 1
+webinformer.tk, 1
 webini.co, 1
 webinnovation.ie, 1
 webinstit.net, 1
@@ -95059,6 +100348,8 @@
 webkeks.org, 1
 webkindergarten.net, 1
 webkitchen.kiev.ua, 1
+webkorobka.tk, 1
+weblagalera.tk, 1
 weblate.com, 1
 weblate.cz, 1
 weblate.org, 1
@@ -95099,6 +100390,7 @@
 webmr.de, 1
 webmyhealth.com, 1
 webnames.ca, 1
+webnancy.tk, 1
 webnetforce.net, 1
 webnetmail4u.com, 1
 webneuch.ch, 0
@@ -95113,18 +100405,23 @@
 webo.agency, 1
 webo.pl, 1
 weboflies.tk, 1
+webofthingsmarwane.xyz, 1
 weboperater.com, 1
 weboperater.rs, 1
 webpagetest.org, 1
+webpakken.dk, 1
 webparallax.cf, 1
 webparallevar.com, 1
 webpc.com.ua, 1
 webpcstudio.com, 1
 webperformance.io, 1
+webpiar.tk, 1
 webpinoytv.info, 1
 webpitarque.tk, 1
+webpixelia.com, 1
 webplace4u.nl, 1
 webplatform.news, 1
+webportail.tk, 1
 webpostingmart.com, 0
 webpostingpro.com, 0
 webpostingreviews.com, 0
@@ -95135,10 +100432,12 @@
 webqualitat.com.br, 1
 webrabbit.at, 1
 webranking.tk, 1
+webranko.tk, 1
 webrebels.org, 0
 webregion.tk, 1
 webrentcars.com, 0
 webreport.fr, 1
+webrepresalia.tk, 1
 webs4all.ro, 0
 websanlamuerte.tk, 1
 websec.nu, 1
@@ -95147,11 +100446,11 @@
 webseitendesigner.com, 0
 webseitenserver.com, 0
 websenat.de, 1
-webservertalk.com, 1
+webshan.ir, 0
 webshaped.de, 1
 websharks.org, 1
 webshop.nl, 1
-website-engineering.co.za, 1
+website-engineering.co.za, 0
 website-traffic.shop, 1
 website.builders, 1
 websiteboost.nl, 1
@@ -95161,6 +100460,7 @@
 websitedesignersmalappuram.ga, 1
 websitedesignprice.ga, 1
 websitedown.io, 1
+websiteenergizers.com, 1
 websiteforstudents.com, 1
 websitelearners.cf, 1
 websitelia.com, 1
@@ -95173,12 +100473,16 @@
 websitesbymark.co.uk, 1
 websitesbywordpress.com, 1
 websitesdallas.com, 1
+websitesdemos.tk, 1
 websiteservice.pro, 1
 websitesmiths.com, 1
+websitesseller.com, 1
+websitesthatwork.biz, 1
 websiteurl.org, 1
 websize.me, 1
 webslate.co.nz, 1
 websoftba.gq, 1
+websol.biz, 1
 websouthdesign.com, 1
 websphere.tk, 1
 webspiral.jp, 1
@@ -95186,26 +100490,27 @@
 webspotter.nl, 1
 webssupport.ga, 1
 webstaff.xyz, 1
+webstamil.com, 1
 webstart.nl, 1
 webstats.tk, 1
-webstore.be, 0
 webstreamworld.com, 1
 webstu.be, 1
 webstudio-n.com, 1
 webstylemedia.com, 1
 websubmissions.tk, 1
 websuccess.co.za, 1
+websupporten.no, 1
 websvetaines.lt, 1
+webszolgaltatas.hu, 1
 webtasarim.pw, 1
 webtaxi.cf, 1
-webteammate.com, 1
-webtechnicom.net, 1
+webtechnicom.net, 0
 webtek.nu, 1
-webtheapp.com, 1
 webtobesocial.de, 1
 webtomsk.tk, 1
 webtoro.com, 1
 webtorrent.io, 1
+webtostore.fr, 1
 webtransfers.ml, 1
 webtrek.ch, 1
 webtrh.cz, 1
@@ -95213,10 +100518,12 @@
 webuildsite.ga, 1
 webukhost.com, 1
 webullreview.co, 1
+webuniverse.ml, 1
 webunix.ga, 1
 webusage.xyz, 1
 webvampiro.tk, 1
 webvenezuela.tk, 1
+webverdienst.tk, 1
 webviewcams.com, 1
 webwednesday.nl, 1
 webwelearn.com, 1
@@ -95241,10 +100548,11 @@
 wecomm.fr, 0
 wed.pw, 1
 weda.cf, 1
+wedding-e-dress.tk, 1
 wedding-page.ga, 1
+wedding-ua.tk, 1
 weddingalbumsdesign.com, 1
 weddingdays.tv, 1
-weddingenvelopes.co.uk, 1
 weddingfantasy.ru, 1
 weddinghotographers.tk, 1
 weddingideas.gq, 1
@@ -95254,10 +100562,10 @@
 weddingwire.co.uk, 1
 weddingwire.com, 1
 weddingwire.in, 1
+wedefendcharities.org, 1
 wedeliverdavao.com, 1
 wedg.uk, 1
 wednesday.one, 1
-wedoeducation.com.au, 1
 wedontcaregroup.com, 1
 wedooper.com, 1
 wedplay.host, 1
@@ -95288,6 +100596,7 @@
 weerstationgiethoorn.nl, 1
 weerstatistieken.nl, 1
 weewoo.net, 1
+wefact.nl, 1
 wefillgood.com, 1
 wefitboilers.com, 1
 wefixmd.com, 1
@@ -95313,6 +100622,7 @@
 weigelia.nl, 1
 weighed.ga, 1
 weightlift.ml, 1
+weightlosseasy.cf, 1
 weightlossoutcome.com, 1
 weightprogram.cf, 1
 weihnachten-schenken.de, 1
@@ -95329,17 +100639,15 @@
 weinbergerlawgroup.com, 1
 weinboxbuilders.co.nz, 1
 weinfuse.com, 1
+weingut-bernd-klein.de, 1
 weinhandel-preissler.de, 1
 weinholtzglass.com, 1
 weinundsein.com, 1
 weiran.org.cn, 1
 weirdesigns.com, 1
-weirdgenius.id, 1
-weirdgloop.org, 1
 weirdserver.com, 1
 weirdware.tech, 1
-weissborn.me, 1
-weissdorntee.de, 1
+weis.bz, 1
 weissman.agency, 1
 weiterbildung-vdz.de, 1
 weitergedacht.eu, 1
@@ -95349,6 +100657,7 @@
 weizenke.im, 1
 wejdmark.com, 1
 wekibe.de, 1
+wekipedia.com, 1
 weknowhowtodoit.com, 1
 weladee.com, 1
 welches-kinderfahrrad.de, 1
@@ -95356,10 +100665,9 @@
 welcome-to-the.wedding, 1
 welcome-werkstatt.com, 1
 welcome26.ch, 0
-welcomehelp.de, 1
 welcomepowayan.tk, 1
-welcometoscottsdalehomes.com, 1
 weld.io, 1
+weldersnet.tk, 1
 weldonconstruction.com.au, 1
 welfareness.icu, 1
 well-around-the-world.com, 1
@@ -95367,19 +100675,20 @@
 well.bayern, 1
 wella-download-center.de, 1
 wellandwealthy.org, 1
+wellbalancedhealth.ie, 1
 wellbeing360.com.au, 1
 wellbutrinxlgeneric.cf, 1
 wellcom.co.il, 1
 wellcomemdhealth.com, 1
 wellensteyn.ru, 1
 weller.pm, 1
+wellforlifenow.com, 1
 wellgreece.com, 1
 wellist.com, 1
 wellness-bonbon.de, 1
 wellness-gutschein.de, 1
 wellnesscheck.net, 1
 wellnessever.com, 1
-wellnesshotel-weimar.de, 1
 wellsolveit.com, 0
 wellspringsga.com, 1
 wellsprung.net, 1
@@ -95390,7 +100699,7 @@
 weloveliving.it, 1
 welovemail.com, 1
 welovemaira.com, 1
-welovetraffic.nl, 1
+welovemugs.co.uk, 1
 welp-mail.de, 1
 welpo.me, 1
 welshccf.org.uk, 1
@@ -95412,17 +100721,19 @@
 wem.hr, 1
 wemajin.com, 1
 wemakebookkeepingeasy.com, 1
-wemakeit.live, 1
 wemakemenus.com, 0
 wemakemx.mx, 1
 wemakeonlinereviews.com, 1
 wemediate.info, 1
 wemovemountains.co.uk, 1
+wen-in.com, 1
+wen-in.net, 1
 wenceslas.org.uk, 1
 wenchieh.com, 1
 wendepunkt-betreuung.de, 1
 wendlberger.net, 1
 wendu.me, 1
+wendycityblossoms.com, 1
 wenge-murphy.com, 1
 wenger-shop.ch, 1
 wenhelpdesk.tk, 1
@@ -95441,7 +100752,7 @@
 weple.gq, 1
 wer-kommt-her.de, 1
 werally.com, 1
-werbe-sonnenbrillen.de, 1
+werbe-sonnenbrillen.de, 0
 werbeagentur.de, 1
 werbedesign-tauber.de, 1
 werbefotograf-leitner.de, 1
@@ -95470,18 +100781,20 @@
 werkgroepderdewereld.nl, 1
 werkgroeppaleisparkhetloo.nl, 1
 werkinc.de, 1
+werkinholland.com, 0
 werkkrew.xyz, 1
 werkslimreisslim.nl, 1
 werkstattkinder.de, 1
 werlabs.se, 1
 wermeester.com, 1
-wermuttee.de, 1
 werner-ema.de, 1
+wernicke-it.de, 1
 werpo.com.ar, 1
 wertheimer-burgrock.de, 1
 wertpapiertreuhand.de, 1
 wervingenselectieamsterdam.nl, 1
 werwolf-live.de, 1
+werxa.cz, 1
 werxus.eu, 1
 weryfikacjapodatnika.pl, 1
 weschool.id, 1
@@ -95500,7 +100813,6 @@
 west-raptors.tk, 1
 west-wind.net, 1
 westafricatradehub.com, 1
-westbeachparks.com.au, 1
 westcanal.net, 1
 westcarrollton.org, 1
 westcentenaryscouts.org.au, 1
@@ -95514,6 +100826,7 @@
 westcommunitycu.org, 1
 westcountrystalking.com, 1
 westendwifi.net, 1
+westerdraai.tk, 1
 westernfrontierins.com, 1
 westernpadermatologist.com, 1
 westernparts.com, 1
@@ -95531,7 +100844,9 @@
 westlakevillagelandscapelighting.com, 1
 westlakevillagelighting.com, 1
 westlakevillageoutdoorlighting.com, 1
+westlander-nostalgie.tk, 1
 westlandplacestudios.com, 1
+westline.com.tr, 1
 westlinntowncar.com, 1
 westlogistic.com, 1
 westlondoncarpetcleaners.co.uk, 1
@@ -95571,6 +100886,7 @@
 wexilapp.com, 1
 weyhmueller.de, 0
 weyland-yutani.org, 1
+weyoui.de, 1
 wezl.net, 1
 wf-bigsky-master.appspot.com, 1
 wf-demo-eu.appspot.com, 1
@@ -95591,7 +100907,6 @@
 wfschicago.com, 1
 wfsrecruit.com.au, 1
 wft-portfolio.nl, 1
-wg-smue.de, 1
 wg-steubenstrasse.de, 1
 wg-tools.de, 1
 wg3k.us, 1
@@ -95618,6 +100933,7 @@
 what-does-kittens-need.ml, 1
 what-wood.servehttp.com, 1
 what.tf, 1
+whatabout.tk, 1
 whataboutjonbuckland.tk, 1
 whataboutjoshua.tk, 1
 whatagreatwebsite.net, 1
@@ -95631,6 +100947,7 @@
 whatclinic.ru, 1
 whatdevshouldknow.pl, 1
 whatevents.tk, 1
+whatevername.tk, 1
 whateverzone.ml, 1
 whatgrowswhere.com, 1
 whatgrowswhere.eu, 1
@@ -95657,36 +100974,41 @@
 whatsahoy.com, 1
 whatsapp.com, 1
 whatsapp.net, 1
+whatsapp.ru, 1
 whatsmychaincert.com, 1
+whatsmysuggestion.com, 1
 whatsthisword.com, 1
 whatsupgold.com.tw, 1
 whatsupgold.net, 1
 whatsupoutdoor.com, 0
+whatswrong.blog, 1
 whattheactual.nyc, 1
 whatthefile.info, 1
 whatthefoxhat.com, 1
 whatthingsweigh.com, 1
-whattodo.com, 1
+whattodo.com, 0
 whattominingrigrentals.com, 1
-whattyre.com, 1
 whatusb.com, 1
 whatwebcando.today, 1
 whatwg.org, 1
 whd-guide.de, 1
 whdpc.gov, 1
-wheatbagslove.com.au, 1
 wheatgra.in, 1
 wheelchair.gq, 1
 wheeler.kiwi.nz, 0
 wheelspin.ga, 1
 wheelwide.co.uk, 1
 wheelwork.org, 0
+wheelycool.tech, 1
+wheelycoolgear.com, 1
+wheelyking.tk, 1
 when-release.com, 1
 when-release.ru, 1
 when.fm, 0
 where2trip.com, 1
 whereapp.social, 1
 wheredoi.click, 1
+wherefish.com, 1
 whereicode.org, 1
 whereisjason.com, 1
 whereismyorigin.cf, 1
@@ -95714,7 +101036,7 @@
 whisky.money, 1
 whisky.my, 1
 whiskymy.com, 1
-whiskynerd.ca, 1
+whiskynerd.ca, 0
 whiskyshop.com.my, 1
 whiskyshop.my, 1
 whisp.ly, 0
@@ -95725,6 +101047,7 @@
 whistleblower.gov, 1
 whistleblowing.it, 1
 whistlingdog.media, 0
+whitdoit.tk, 1
 white-ibiza.com, 1
 white-info.tk, 1
 white-noise.tk, 1
@@ -95735,11 +101058,13 @@
 whitealps.de, 0
 whitealps.fr, 0
 whitealps.net, 0
+whiteantelopeinteriors.com, 1
 whitebear.cloud, 1
 whitebox.ga, 1
 whitecleatbeat.com, 1
 whitefm.ch, 0
 whiteglovemoving.us, 1
+whitehathackers.com.br, 1
 whitehats.nl, 1
 whitehorse.ga, 1
 whitehouse.gov, 1
@@ -95748,8 +101073,8 @@
 whitehousedrugpolicy.gov, 1
 whiteink.com, 1
 whitejaguars.com, 1
+whitekings.tk, 1
 whiteknightsafelockinc.com, 1
-whitelabelcashback.nl, 1
 whitelabeltickets.com, 0
 whitelotuscyp.com, 1
 whitelynx.co, 1
@@ -95775,24 +101100,25 @@
 whitworth.nyc, 1
 whizzzbang.co.uk, 1
 whm.gc.ca, 1
-whmcs.xn--9dbq2a, 1
 whnpa.org, 1
 who-calledme.com, 1
 who.pm, 0
+whoami.eu.org, 1
 whoami.io, 1
 whocalld.com, 1
 whocalled.us, 1
 whocalledme.xyz, 1
-whocybered.me, 1
+whocrushonme.com, 1
 whodatdish.com, 1
-whoimg.com, 0
 whoiscuter.ml, 1
 whoiscutest.ml, 1
-whoisdhh.com, 1
+whoiswho.tk, 1
 whojoo.com, 1
 wholesale.cf, 1
-wholesalerrr.deals, 1
+wholesalediamonds.tk, 1
 wholesomeharvestbread.com, 0
+wholevood.com, 1
+wholevood.de, 1
 whoneedstobeprimaried.today, 1
 whonix.org, 1
 whoopee.my, 0
@@ -95808,9 +101134,8 @@
 whta.eu, 1
 whta.se, 1
 whtcsj.com, 1
-whub.io, 1
+whub.io, 0
 why-brexit.uk, 1
-why918.com, 1
 whychoosebob.net.au, 1
 whyfeedthegreed.com, 1
 whymps.com, 1
@@ -95836,6 +101161,7 @@
 wichitafoundationpros.com, 1
 wick-machinery.com, 1
 wickbot.com, 1
+wickedsick.tk, 1
 wickelfischfrance.fr, 1
 wickerliving.com, 1
 wickersmith.com, 1
@@ -95843,6 +101169,7 @@
 wickrath.net, 1
 wicksandwonders.com.au, 1
 widatcp.gov, 1
+widderplasticsurgery.com, 1
 wideboxmacau.com, 0
 widecontrol.it, 1
 widegab.com, 0
@@ -95869,17 +101196,19 @@
 wiek.net, 1
 wieloswiat.pl, 1
 wielrenbond.ml, 1
+wielrennen-in-zeeland.tk, 1
 wien52.at, 1
 wieneck-bauelemente.de, 1
 wiener.hr, 1
 wienergyjobs.com, 1
 wieobensounten.de, 1
+wiewiorjonasz.pl, 1
 wifi-hack.com, 0
 wifi-names.com, 1
 wificafehosting.com, 1
 wificonnect.cc, 1
-wifimask.com, 1
 wifimb.cz, 1
+wifinube.com, 1
 wifipineapple.com, 1
 wifirst.net, 1
 wifishing.tk, 1
@@ -95889,12 +101218,15 @@
 wigglestudio.com, 1
 wigle.net, 1
 wigmore-hall.org.uk, 1
+wigos.ru, 1
 wigwam.design, 1
 wiiaam.com, 1
+wiikipedia.com, 1
 wiimotion.de, 1
 wiisas.fi, 1
 wijaya.net, 1
 wijaya2u.com, 1
+wijewick.com, 1
 wijkbudget.gent, 1
 wijnbesteld.nl, 1
 wijnlandkroatie.nl, 1
@@ -95906,17 +101238,25 @@
 wijzijnwolf.nl, 1
 wikalin.ski, 1
 wikelia.com, 1
+wikepedia.org, 1
 wiki-books.ga, 1
+wiki-pedia.org, 1
 wiki-play.ru, 1
 wiki.python.org, 1
+wiki.voyage, 1
 wiki24.ru, 1
+wikibook.com, 1
 wikibooks.org, 1
+wikibooks.pt, 1
 wikibulz.com, 0
 wikibuy.com, 1
 wikicooking.tk, 1
 wikidata.org, 1
+wikidpedia.org, 1
 wikidsystems.com, 0
-wikiehelp.com, 1
+wikiehelp.com, 0
+wikiepdia.com, 1
+wikiepdia.org, 1
 wikihelp.in, 1
 wikihistory.tk, 1
 wikihow.com, 1
@@ -95930,39 +101270,108 @@
 wikihow.pet, 1
 wikihow.tech, 1
 wikihow.vn, 1
+wikijunior.com, 1
+wikijunior.net, 1
+wikijunior.org, 1
 wikileaks.ch, 1
 wikileaks.com, 1
 wikileaks.org, 1
 wikilibrary.tk, 1
 wikilinux.xyz, 1
+wikimania.com, 1
+wikimania.org, 1
+wikimedia.biz, 1
+wikimedia.com, 1
+wikimedia.com.pt, 1
+wikimedia.community, 1
+wikimedia.is, 1
+wikimedia.jp.net, 1
+wikimedia.lt, 1
 wikimedia.org, 1
+wikimedia.us, 1
+wikimedia.xyz, 1
+wikimediacommons.co.uk, 1
+wikimediacommons.info, 1
+wikimediacommons.jp.net, 1
+wikimediacommons.mobi, 1
+wikimediacommons.net, 1
+wikimediacommons.org, 1
+wikimediafoundation.com, 1
+wikimediafoundation.info, 1
+wikimediafoundation.net, 1
 wikimediafoundation.org, 1
 wikimilk.org, 1
 wikimir.tk, 1
 wikimirror.org, 1
+wikinews.com, 1
+wikinews.de, 1
 wikinews.org, 1
+wikinews.pt, 1
+wikipaedia.net, 1
 wikipedia-mirror.org, 1
+wikipedia.bg, 1
+wikipedia.co.il, 1
+wikipedia.co.uk, 1
+wikipedia.co.za, 1
 wikipedia.com, 1
+wikipedia.com.ar, 1
+wikipedia.ee, 1
+wikipedia.es, 1
+wikipedia.fi, 1
+wikipedia.id, 1
+wikipedia.info, 1
+wikipedia.is, 1
+wikipedia.lt, 1
+wikipedia.net, 1
 wikipedia.org, 1
+wikipedia.org.il, 1
+wikipedia.sk, 1
+wikipediafoundation.org, 1
+wikipedial.org, 1
+wikipediazero.org, 1
 wikipeter.nl, 1
 wikipiedi.it, 1
+wikiquote.com, 1
+wikiquote.net, 1
 wikiquote.org, 1
+wikiquote.pt, 1
+wikiquotes.info, 1
 wikirace.tk, 1
 wikisaur.tk, 1
 wikiskripta.eu, 1
 wikisorg.tk, 1
+wikisource.com, 1
 wikisource.org, 1
+wikisource.pl, 1
+wikisource.pt, 1
+wikispecies.com, 1
+wikispecies.net, 1
+wikispecies.org, 1
 wikitech.tk, 1
 wikitransporte.tk, 1
+wikiversity.com, 1
 wikiversity.org, 1
+wikiversity.pt, 1
 wikiversus.com, 1
 wikivisually.com, 1
+wikivoyage.com, 1
+wikivoyage.de, 1
+wikivoyage.eu, 1
+wikivoyage.net, 1
 wikivoyage.org, 1
+wikivoyager.de, 1
+wikivoyager.org, 1
 wikiwp.org, 1
 wikizip.ga, 1
+wikjpedia.org, 1
 wikpa.com, 1
+wikpedia.org, 1
 wikproduccions.tk, 1
+wiktionary.com, 1
+wiktionary.eu, 1
 wiktionary.org, 1
+wiktionary.pl, 1
+wiktionary.pt, 1
 wiktor-imbierski.com, 1
 wilane.org, 1
 wilbrinkdesign.nl, 0
@@ -95974,6 +101383,7 @@
 wildandisle.com, 1
 wildandwonderfulbodycare.com, 1
 wildandwonderfulketo.com, 1
+wildanfauzy.com, 0
 wildbergh.tk, 1
 wildberries.cf, 1
 wildbirds.dk, 1
@@ -95987,6 +101397,7 @@
 wildercerron.com, 1
 wilderky.gov, 1
 wildewood.ca, 1
+wildfilm.tv, 1
 wildfirechain.xyz, 1
 wildfoxlady.com, 1
 wildfoxosteopathy.com, 1
@@ -96000,6 +101411,7 @@
 wildwildtravel.com, 1
 wildwind.world, 1
 wildwoodpolice-fl.gov, 1
+wildwoodrockers.tk, 1
 wildzap.ml, 1
 wildzoopark.co.uk, 1
 wildzoopark.com, 1
@@ -96011,6 +101423,7 @@
 wiliquet.net, 0
 wilk.tech, 1
 wilkebouwer.nl, 1
+wilkipedia.org, 1
 wilkushka.com, 1
 wilkushka.net, 1
 will-lash.com, 1
@@ -96019,7 +101432,6 @@
 willberg.bayern, 1
 willdropphoto.co.uk, 1
 willekeinden.nl, 1
-willems-kristiansen.dk, 1
 willenberg.family, 1
 willetlaw.com, 1
 willfarrell.ca, 1
@@ -96049,22 +101461,22 @@
 williamvds.me, 1
 willich.tk, 1
 williejackson.com, 1
+willlewis.co.uk, 1
 willnorris.com, 1
-willobyhomes.realestate, 1
 willocks.nl, 1
 willosagiede.com, 1
 willow.technology, 1
-willowbrook.co.uk, 1
 willowdalechurch.ca, 1
 willowpassdentalcare.com, 1
 wills.co.tt, 1
 willstamper.name, 1
+willsthebest.co.uk, 1
 willstocks.co.uk, 1
 willtc.co.uk, 1
 willtc.uk, 1
+willusherwood.com, 1
 willvision.com, 1
 willwilkins.com, 1
-willywangsextapes.com, 1
 willywangstory.com, 1
 willywangstory.com.tw, 1
 willywangstory.org, 1
@@ -96075,6 +101487,7 @@
 wilseyrealty.com, 1
 wilsonovi.com, 1
 wilsonvilleoregon.gov, 1
+wiltrovira.com, 1
 wimachtendienk.com, 1
 wimbledonmusicfestival.co.uk, 1
 wimmer-software.de, 1
@@ -96090,7 +101503,9 @@
 win88-line.com, 1
 win88-line.net, 1
 winall8.com, 1
+winampnederlands.tk, 1
 winancreekbarn.com, 1
+winario.de, 1
 winautomate.com, 1
 winball.ml, 1
 winbignow.click, 1
@@ -96098,6 +101513,7 @@
 wincasinosmoney.com, 1
 wincasinowin.click, 1
 winch-center.de, 1
+winchat365.com, 1
 winckelmann2020.com, 1
 wind-riders.cf, 1
 wind.moe, 0
@@ -96125,8 +101541,10 @@
 windscribe.com, 1
 windsock-app.com, 1
 windsorite.ca, 1
+windsorrealtysvs.com, 1
 windsorspi.com, 1
 windwoodmedia.com, 1
+windycitylawgroup.com, 1
 wine-route.net, 1
 wine-tapa.com, 1
 wine.com.my, 1
@@ -96136,7 +101554,6 @@
 wineforhelp.cz, 1
 wineparis.com, 1
 wineworksonline.com, 1
-winfar.co.za, 1
 winfieldchen.me, 1
 winfilestorage.tk, 1
 winfuture.de, 1
@@ -96163,12 +101580,14 @@
 winning.gq, 1
 winningattitudeawards.org, 1
 winphonemetro.com, 1
+winrss.com, 1
 winsabayi.tk, 1
 winserver.ne.jp, 1
 winsposure.com, 1
 winsufi.biz, 1
 wint.global, 1
 wintark.com, 1
+wintechlab.com, 1
 winter-auszeit.de, 1
 winter-elektro.de, 1
 winter-leak.ml, 1
@@ -96182,7 +101601,6 @@
 wintermeyer-consulting.de, 1
 wintermeyer.de, 1
 winteromeo.tk, 1
-winterschoen.nl, 1
 wintersportscompany.com, 1
 winterstudies.ga, 1
 winterstyle.com, 1
@@ -96213,6 +101631,7 @@
 wireshocks.com, 1
 wiretap.cf, 1
 wiretime.de, 1
+wiretransaction.ga, 1
 wirhabenspass.de, 1
 wirkaufendeinau.to, 1
 wirkstoffreich.de, 1
@@ -96230,7 +101649,6 @@
 wisak.me, 1
 wisal.org, 1
 wisatabagus.com, 1
-wisatawan.id, 1
 wischu.com, 1
 wiscon.co, 1
 wisconsinhomemaker.com, 1
@@ -96239,10 +101657,12 @@
 wisdomize.me, 1
 wisdomteethonly.com, 1
 wisdotplans.gov, 1
+wise.wtf, 1
 wiseadvicetravelling.com, 0
 wisecountytx.gov, 1
 wiseemergency.com.au, 1
 wisehome.dk, 1
+wisekidscollect.org, 1
 wisemen.digital, 1
 wisemoney.com.vc, 1
 wisenetalarm.com, 1
@@ -96276,7 +101696,6 @@
 wisselink.tk, 1
 wissen-a5.de, 1
 wissena5.de, 1
-wissl.org, 1
 wisv.ch, 1
 wisweb.no, 1
 wit-creations.fr, 1
@@ -96307,7 +101726,6 @@
 wittu.fi, 1
 witway.nl, 0
 wivcfinancialservices.com, 1
-wivenhoeforum.co.uk, 1
 wivoc.nl, 1
 wiwi.nl, 1
 wiz.at, 1
@@ -96335,9 +101753,9 @@
 wjg.dk, 1
 wjg.se, 1
 wjglerum.nl, 0
-wjm2038.me, 1
 wjr.io, 1
 wjsh.com, 1
+wjssl.com, 0
 wjtje.ga, 1
 wjwieland.dvrdns.org, 0
 wk.pl, 1
@@ -96360,6 +101778,7 @@
 wlwlwx.com, 0
 wm-access.com, 1
 wm-access.de, 1
+wm-referrals.com, 1
 wm-talk.net, 0
 wmaccess.com, 1
 wmaccess.de, 1
@@ -96383,7 +101802,6 @@
 wmsndorgen.tk, 1
 wmspropertyportal.co.uk, 1
 wnark.com, 1
-wngs-creative.hu, 1
 wnmed.com.au, 1
 wns68123.com, 1
 wns6852.com, 1
@@ -96406,6 +101824,7 @@
 wochennummern.de, 1
 wocup.ga, 1
 wod-stavby.cz, 1
+wodax.dk, 1
 wodboss.com, 1
 wodinaz.com, 1
 wodka-division.de, 1
@@ -96422,8 +101841,10 @@
 wohnungsbau-ludwigsburg.de, 1
 woi.vision, 1
 wois.info, 1
+wojak.xyz, 1
 wojciechowka.pl, 1
 wojciechszyjka.pl, 0
+wokeanda.com, 1
 wokfilms.pt, 1
 wokinghammotorhomes.com, 1
 woktoss.com, 1
@@ -96465,6 +101886,7 @@
 woltauth.de, 1
 woltlab-demo.com, 1
 wolvesbanemanor.com, 1
+womanbusinessnetwork.com, 1
 womb.city, 1
 wombatalla.com.au, 1
 wombatnet.com, 1
@@ -96476,16 +101898,18 @@
 women.gc.ca, 1
 womenbusinessfromhome.com, 1
 womenfashionshirt.tk, 1
+womenofwhatcom.com, 1
 womenonboardskenya.co.ke, 1
 womens-suits.tk, 1
 womensalespros.com, 1
 womensbiz.tk, 1
 womenshealth.gov, 1
 womensmedassoc.com, 1
+womensshelterofhope.com, 1
 womenswellnessobgyn.com, 1
 woms.top, 1
 womywomwoo.com, 1
-wondeerful.farm, 1
+wondeerful.farm, 0
 wonderbill.com, 1
 wonderbits.net, 1
 wonderbox.ml, 1
@@ -96501,10 +101925,10 @@
 wonderlab.ml, 1
 wonderland.com.ua, 1
 wonderlandmovies.de, 1
+wonderlangkawi.com, 1
 wonderleaks.gq, 1
 wondermags.com, 1
 wondersonlineshop.com, 1
-wonderzeal.com, 1
 wondium.nl, 1
 wonghome.net, 1
 wongu.tech, 1
@@ -96515,6 +101939,8 @@
 woningverfspuiten.be, 1
 woningverfspuiten.com, 1
 woo-jiho.tk, 1
+wooblr.com, 1
+wooby.tk, 1
 wooc.org, 1
 wood-crafted.co.uk, 1
 wood-crafted.uk, 1
@@ -96522,9 +101948,9 @@
 woodbornekitchens.com, 1
 woodbridgegrp.com, 1
 woodbury.io, 1
-woodcat.net, 1
 woodcock.cloud, 1
 woodcoin.org, 1
+woodconditioningonline.com, 1
 woodcountywi.gov, 1
 woodcraftind.com, 1
 woodenson.com, 1
@@ -96547,6 +101973,7 @@
 woodridgeil.gov, 1
 woodsidepottery.ca, 1
 woodstocksupply.com, 1
+woodtrust.com, 1
 woodward-vets.co.uk, 1
 woodwicker.cl, 1
 woodwo.se, 1
@@ -96563,6 +101990,7 @@
 woontegelwinkel.nl, 1
 woopie.com, 1
 wooplagaming.com, 1
+woothelpdesk.com, 1
 wootkit.tk, 1
 wootware.co.za, 1
 wopr.network, 1
@@ -96589,6 +102017,7 @@
 wordpress.com, 0
 wordpressabi.com, 1
 wordpressarequipa.com, 1
+wordpressbot.tk, 1
 wordpressdevelopment.ml, 1
 wordpressfalcon.com, 1
 wordpressfly.com, 1
@@ -96596,6 +102025,7 @@
 wordpresssetup.org, 1
 wordregistrar.ga, 1
 words.codes, 1
+wordsearchwhiz.com, 1
 wordsmart.it, 1
 wordsofamaster.com, 1
 wordspam.ga, 1
@@ -96603,12 +102033,16 @@
 wordwidessl.net, 1
 wordxtra.net, 1
 worf.in, 1
+worg.pl, 1
+worgtest.pl, 1
 work-at-home.ga, 1
 work-at-home.gq, 1
 work-in-progress.website, 1
 work-shift.work, 1
 workahealthic.de, 1
+workaholics.tk, 1
 workaround.run, 1
+workat.tech, 1
 workatclever.com, 1
 workatclever.us, 1
 workatclevyr.us, 1
@@ -96620,6 +102054,8 @@
 workemy.com, 1
 worker.gov, 1
 workeria-personal.de, 1
+workermess.tk, 1
+workers-iran.org, 1
 workerselforganisation.cf, 1
 workfromhomebusinessopportunities.cf, 1
 workfromhomelegitjob.com, 1
@@ -96636,7 +102072,9 @@
 workplace.com, 1
 workplace.tools, 1
 workraw.com, 1
+workreview10.com, 1
 works-ginan.jp, 1
+worksheets-to-print.com, 1
 workshop.men, 1
 workshopengine.com.au, 1
 workshopszwolle.nl, 1
@@ -96664,22 +102102,30 @@
 worldcharteronline.ga, 1
 worldchess.london, 1
 worldcigars.com.br, 1
+worldclassfriend.com, 1
+worldconsultingchile.tk, 1
 worldcubeassociation.org, 1
 worldessays.com, 1
 worldeventscalendars.com, 1
+worldfinancenews.org, 1
 worldfoodfestival.nl, 1
+worldfootball.tk, 1
 worldgun.ml, 1
 worldhairtrends.com, 1
 worldhosting.cf, 1
 worldintercontinental.cf, 1
+worldix.cf, 1
 worldix.gq, 1
 worldix.ml, 1
 worldix.tk, 1
 worldjobs.tk, 1
 worldmeetings.com, 1
+worldnetone.com, 1
 worldnewsinbox.ga, 1
+worldnewsphoto.tk, 1
 worldofbelia.de, 1
 worldofghibli.id, 1
+worldoflegion.ml, 1
 worldofparties.co.uk, 1
 worldofvnc.net, 1
 worldofwobble.co.uk, 1
@@ -96687,6 +102133,7 @@
 worldpeacetechnology.com, 1
 worldpolitics.cf, 1
 worldrallyforum.tk, 1
+worldranking.tk, 1
 worldrecipes.eu, 1
 worldsfree4u.ga, 1
 worldsgreatestazuredemo.com, 1
@@ -96699,6 +102146,7 @@
 worldstyling.com, 1
 worldsy.com, 1
 worldtalk.de, 1
+worldtourismgroup.com, 1
 worldtrandingnews.ml, 1
 worldtreechocolate.ca, 1
 worldturkmans.tk, 1
@@ -96711,7 +102159,9 @@
 wormbytes.ca, 1
 wormdisk.net, 1
 wormhol.org, 1
+wormhole.ga, 1
 wormholevpn.net, 1
+wormincorporated.tk, 1
 wormpress.com, 1
 worongarymedical.com.au, 1
 worst.horse, 0
@@ -96723,6 +102173,7 @@
 worthlessingratitudecq.gq, 1
 worthlessingratitudecq.ml, 1
 worthlydeals.com, 1
+worthwritingfor.com, 1
 worthygo.com, 1
 worzo.tk, 1
 woshiluo.com, 1
@@ -96731,6 +102182,7 @@
 wossl.net, 1
 wot-tudasbazis.hu, 1
 wot-zadrot.com, 1
+wotcheats.ru, 1
 woti.dedyn.io, 1
 wotsunduk.ru, 1
 wotzadrot.com, 1
@@ -96750,6 +102202,7 @@
 wowarcaim.ml, 1
 wowbabykids.com, 1
 wowbouncycastles.co.uk, 1
+wowcinema.tk, 1
 wowede.com, 1
 wowgenial.com, 1
 wowhelp.it, 1
@@ -96763,9 +102216,12 @@
 wowlegacy.ml, 1
 wowlove.tk, 1
 wownmedia.com, 1
+wownskportal.tk, 1
+wowonini.com, 1
 wowpolisa.pl, 1
+wowqueboda.com, 1
 wows-mods.tk, 1
-woxter.com, 0
+wozalapha.com, 1
 wozwebdesign.com.br, 1
 wp-bootstrap.org, 1
 wp-bundle.co, 0
@@ -96847,6 +102303,7 @@
 wptangtoc.com, 1
 wpthaiuser.com, 1
 wpthemearchive.com, 1
+wpthemecloud.com, 1
 wptorium.com, 1
 wptotal.com, 1
 wptrigone.net, 1
@@ -96876,9 +102333,7 @@
 write-right.net, 1
 writeandedit-for-you.com, 1
 writemyessay.today, 1
-writemyessays.com, 1
 writemypaperhub.com, 1
-writemytermpapers.com, 1
 writeoff.me, 1
 writepro.net, 1
 writer24.ru, 1
@@ -96886,6 +102341,9 @@
 writereditor.com, 1
 writerimranc.ca, 1
 writers-club.tk, 1
+writersblock.tk, 1
+writesafer.com, 1
+writestreak.team, 1
 writing-expert.com, 1
 writingapps.ga, 1
 writingcities.net, 1
@@ -96895,10 +102353,14 @@
 wrkflowmedia.de, 1
 wrmea.org, 1
 wrn.sh, 1
+wrnck.cloud, 1
+wroclawguide.com, 1
 wrong.wang, 1
 wrozbyonline.pl, 1
 wrp.gov, 1
 ws159.com, 1
+ws5.ru, 1
+wsa.org.nz, 1
 wsa.poznan.pl, 1
 wsadek.ovh, 1
 wsave.be, 1
@@ -96915,7 +102377,7 @@
 wselektro.de, 1
 wseo.kz, 1
 wsetech.com, 1
-wsg127.com, 1
+wsg127.com, 0
 wsgvet.com, 1
 wsiaca.org, 1
 wsjf.org, 1
@@ -96934,6 +102396,8 @@
 wszystkocokocham.com, 1
 wt-server3.de, 1
 wtfbryan.com, 0
+wtfcripto.com, 1
+wtfindonesia.tk, 1
 wtfnope.org, 1
 wth.in, 1
 wtp.co.jp, 1
@@ -96948,19 +102412,19 @@
 wuerfelmail.de, 1
 wuestenbergs.tk, 1
 wufupay.com, 1
-wug.fun, 1
+wug.fun, 0
 wug.jp, 1
 wug.news, 1
 wui.fan, 1
 wuifan.com, 1
 wuifan.in, 1
-wuifan.net, 1
 wuifan.org, 1
 wuji.cz, 1
 wuki.li, 1
 wulala.us, 1
 wulel.cn, 0
 wulfrun-invicta.tk, 1
+wum.me, 1
 wumai-p.cn, 1
 wumbo.cf, 1
 wumbo.co.nz, 1
@@ -96975,6 +102439,7 @@
 wunderlist.com, 1
 wundernas.ch, 1
 wundi.net, 1
+wunschpreisauto.de, 1
 wunschzettel.de, 1
 wuppertal-2018.de, 0
 wurmannsquick.bayern, 1
@@ -96997,12 +102462,14 @@
 ww30019.com, 1
 ww5197.co, 1
 ww6729.co, 1
+ww6729.com, 1
 ww6957.co, 1
 ww8989.com, 1
 ww9297.co, 1
 ww9397.com, 1
 ww9721.com, 1
 ww9728.co, 1
+wwa-clan.tk, 1
 wwads.cn, 1
 wwbsb.xyz, 1
 wwc.ren, 1
@@ -97030,7 +102497,6 @@
 www-pheromones.com, 1
 www-railto.com, 1
 www.aclu.org, 0
-www.airbnb.com, 1
 www.amazon.ca, 1
 www.amazon.cn, 1
 www.amazon.co.jp, 1
@@ -97082,7 +102548,7 @@
 www.noisebridge.net, 1
 www.opsmate.com, 1
 www.org.gg, 1
-www.paypal.com, 1
+www.paypal.com, 0
 www.python.org, 1
 www.re, 1
 www.rememberthemilk.com, 0
@@ -97100,7 +102566,6 @@
 www.united.com, 1
 www.usaa.com, 0
 www.viasinc.com, 0
-www.vino75.com, 0
 www.wepay.com, 0
 www.wordpress.com, 0
 www.zdnet.com, 1
@@ -97130,6 +102595,7 @@
 wxkxsw.com, 1
 wxlog.cn, 1
 wxrlab.com, 1
+wxservices.tk, 1
 wxster.com, 1
 wxw.moe, 1
 wxxcxd88.com, 1
@@ -97141,7 +102607,7 @@
 wycena.ga, 1
 wyckoff.pro, 1
 wyckoff.vip, 1
-wycombetoday.com, 1
+wycombetoday.com, 0
 wyczaruj.pl, 1
 wyday.com, 1
 wygibanki.pl, 1
@@ -97159,13 +102625,13 @@
 wyrimaps.net, 1
 wyssmuller.ch, 0
 wysz.com, 1
-wyu.cc, 1
 wywabmnie.pl, 1
 wyydsb.cn, 1
 wyydsb.com, 1
 wyydsb.xin, 1
 wyzphoto.nl, 1
 wyzwaniemilosci.com, 1
+wz8.info, 1
 wzajemnie.org.pl, 1
 wzrd.in, 1
 wzxaini9.com, 1
@@ -97176,6 +102642,7 @@
 x-iweb.ru, 1
 x-lan.be, 1
 x-one.co.jp, 1
+x-pertservice.com, 1
 x-way.org, 1
 x.io, 1
 x.st, 1
@@ -97192,6 +102659,7 @@
 x17.cafe, 1
 x2816.com, 1
 x2d2.de, 0
+x2ox.com, 1
 x30019.com, 1
 x36533.com, 1
 x378.ch, 1
@@ -97261,9 +102729,11 @@
 xab199.com, 1
 xab678.com, 1
 xaba.tk, 1
+xabifk.com, 1
 xacker.tk, 1
 xaffit.com, 1
 xahbspl.com, 1
+xakep-slon.tk, 1
 xakepctbo.tk, 1
 xamax.co.uk, 1
 xanadu-auto.cz, 1
@@ -97287,6 +102757,7 @@
 xavio-design.com, 1
 xavio.in, 1
 xaxax.ru, 1
+xaydungnamcuong.com, 1
 xaynhachothue.vn, 1
 xb008.com, 1
 xb052.com, 1
@@ -97443,7 +102914,6 @@
 xdeftor.com, 1
 xdesigns.biz, 1
 xdos.io, 1
-xdown.org, 1
 xdtag.com, 1
 xdty.org, 1
 xebeche.nl, 0
@@ -97454,7 +102924,6 @@
 xehost.com, 1
 xeiropraktiki.gr, 1
 xelesante.jp, 1
-xemcanho.com, 1
 xemxx.tv, 1
 xencor.com, 1
 xendo.net, 1
@@ -97464,6 +102933,7 @@
 xenicalonline.gq, 1
 xenicalorlistat.tk, 1
 xenicalpills.tk, 1
+xenocide.tk, 1
 xenomedia.nl, 1
 xenon.cloud, 1
 xenoncloud.net, 1
@@ -97483,6 +102953,7 @@
 xerezdeportivo.tk, 1
 xerhost.de, 0
 xerkus.pro, 1
+xerowaste.ca, 1
 xerownia.eu, 1
 xeryus.nl, 1
 xetnghiemadndanang.vn, 1
@@ -97513,6 +102984,7 @@
 xh7qqq.com, 1
 xhadius.de, 1
 xhanster.gq, 1
+xhci.com, 1
 xhcmnews.com, 1
 xhily.com, 1
 xhmikosr.io, 1
@@ -97553,7 +103025,6 @@
 xibilus.com, 1
 xice.cf, 1
 xice.wang, 1
-xichtsbuch.de, 1
 xichuangke.com, 0
 xicreative.net, 1
 xiecongan.org, 1
@@ -97568,6 +103039,8 @@
 xilkoi.net, 0
 xilo.net, 1
 ximes.com, 1
+ximeshosted.com, 1
+xin-in.com, 1
 xin365.com, 1
 xinbo010.com, 1
 xinbo016.com, 1
@@ -97684,8 +103157,8 @@
 xinbo609.com, 1
 xinbo610.com, 1
 xinbo676.com, 1
+xinebf.com, 0
 xing.ml, 1
-xingganfuli.com, 1
 xingyu1993.cn, 1
 xinja.com.au, 1
 xinjiang30019.com, 1
@@ -97708,6 +103181,7 @@
 xiphwork.de, 1
 xiqonline.com, 1
 xirion.net, 1
+xitin.tk, 1
 xiumu.org, 1
 xiyu.moe, 0
 xizang30019.com, 1
@@ -97741,6 +103215,7 @@
 xminds.net, 1
 xmiui.com, 1
 xmlbeam.org, 1
+xmp3.net, 1
 xmpp.dk, 1
 xmppwocky.net, 1
 xmr.to, 1
@@ -97761,15 +103236,19 @@
 xn----7sbabrwauchevq0ba.xn--p1ai, 1
 xn----7sbarcdvrtr1be.org, 1
 xn----7sbbagp2bcfwdeee1afm.xn--p1ai, 1
+xn----7sbbak4cyaoedjf3m.xn--p1ai, 1
+xn----7sbbfsshjvgyde8g3c.xn--p1ai, 1
 xn----7sbbgbr0arxb4a4exa.com.ua, 1
 xn----7sbbhzfbdo6dnf.tk, 1
 xn----7sbbncaddj9a9b6am9p.tk, 1
 xn----7sbbq5b0a1c.com, 1
+xn----7sbedlbhv2azb6a.xn--j1amh, 1
 xn----7sbfl2alf8a.xn--p1ai, 1
 xn----7sblrfhjjgq8g.xn--p1ai, 1
 xn----7sbmucgqdbgwwc5e9b.xn--p1ai, 1
 xn----7sbq4auch5b4b.xn--p1ai, 1
 xn----8hcdn2ankm1bfq.com, 1
+xn----8sbfkobhgmxahfmmhe8b8c6ff.xn--p1ai, 1
 xn----9sbkdigdao0de1a8g.com, 1
 xn----dtbfemantkhdczc.tk, 1
 xn----dtbfemmqjdddczc.tk, 1
@@ -97795,10 +103274,12 @@
 xn--2i0bo6pvvy.net, 1
 xn--2i0bo6pvvy.org, 1
 xn--2sxs9ol7o.com, 1
+xn--36-dlcdun7abo4a.xn--p1ai, 1
 xn--3lqp21gwna.cn, 1
 xn--3st814ec8r.cn, 1
 xn--3stv82k.hk, 1
 xn--3stv82k.tw, 1
+xn--41a.ml, 1
 xn--43-6kc4be0fbz.xn--p1ai, 1
 xn--4brt03c.xn--io0a7i, 1
 xn--4kro7fswi.xn--6qq986b3xl, 1
@@ -97853,14 +103334,15 @@
 xn--80ahjdhy.tk, 1
 xn--80ahnefiifo0g.xn--p1ai, 1
 xn--80aihgal0apt.xn--p1ai, 1
+xn--80airqbie.xn--p1ai, 0
 xn--80akjfhoqm2h2a.xn--p1ai, 1
 xn--80aknjgrv.tk, 1
 xn--80ancacgircb8q.xn--p1ai, 1
 xn--80anogxed.xn--p1ai, 1
 xn--80aocgsfei.xn--p1ai, 1
 xn--80aod6g.tk, 1
+xn--80aqlihiyv.xn--p1acf, 1
 xn--80axad8esa.tk, 1
-xn--80azelb.xn--p1ai, 1
 xn--80azep.tk, 1
 xn--8bi.gq, 0
 xn--8n2am80a.tech, 1
@@ -97882,20 +103364,17 @@
 xn--b1agcgqrei7i.tk, 1
 xn--b1ayb.tk, 1
 xn--b3c4f.xn--o3cw4h, 1
-xn--babassul-t4a.de, 1
-xn--bachblten-tee-1ob.de, 1
 xn--baron-bonzenbru-elb.com, 1
 xn--bckerei-wohlgemuth-ltb.de, 1
 xn--ben-bank-8za.dk, 1
 xn--benbank-dxa.dk, 1
 xn--bersetzung-8db.cc, 1
+xn--bersetzungen-beglaubigt-bpc.de, 1
 xn--berwachungspaket-izb.at, 1
-xn--birkenblttertee-7kb.de, 1
+xn--betwinnerespaa-2nb.com, 1
 xn--blusastlacotalpeas-20b.online, 1
 xn--bm3bl9r.com, 1
 xn--brneruhr-0za.ch, 1
-xn--brombeerblttertee-zqb.de, 1
-xn--bucheckernl-0fb.de, 1
 xn--c1aaulbdc.tk, 1
 xn--c1adqibibm8i.com, 1
 xn--c1aehtaetb.xn--p1ai, 1
@@ -97908,7 +103387,6 @@
 xn--cckdrt0kwb4g3cnh.com, 1
 xn--cckvb1cwa0c5br5e2d2711k.net, 1
 xn--cctsgy36bnvprwpekc.com, 1
-xn--chrysanthemenbltentee-nic.de, 1
 xn--circul-gva.cc, 1
 xn--circul-u3a.cc, 1
 xn--cisowcy-pjb5t.pl, 1
@@ -97925,9 +103403,11 @@
 xn--dej-3oa.lv, 1
 xn--detrkl13b9sbv53j.com, 1
 xn--detrkl13b9sbv53j.org, 1
+xn--dfirtrning-i6a.dk, 1
 xn--dk8haaa.ws, 1
 xn--dmontaa-9za.com, 1
 xn--dragni-g1a.de, 1
+xn--dragni-g1a.eu, 1
 xn--dtursfest-72a.dk, 1
 xn--durhre-yxa.de, 1
 xn--dviz-5qa.com, 1
@@ -97950,12 +103430,13 @@
 xn--elsignificadodesoar-c4b.com, 1
 xn--eo5aaa.eu.org, 1
 xn--erban-e9b.ro, 1
-xn--erdnussl-t4a.de, 1
 xn--erklderbarenben-slbh.dk, 1
 xn--et8h.cf, 0
 xn--ex-1b4auld4fn3u3ck2069g.com, 1
 xn--f1ai7a.tk, 1
 xn--f9jh4f4b4993b66s.tokyo, 1
+xn--fakovcov-gza74b.eu, 1
+xn--fakovec-k6a.eu, 1
 xn--familie-pppinghaus-l3b.de, 1
 xn--feuerlscher-arten-4zb.de, 1
 xn--flordepia-s6a.com, 1
@@ -97973,11 +103454,9 @@
 xn--gstehaus-leipzig-vnb.de, 1
 xn--h1aarew7ct.tk, 1
 xn--h1ahbcdb8g.xn--p1ai, 1
-xn--heidebltentee-2ob.de, 1
 xn--heilendehnde-ocb.de, 1
 xn--hfk-allgu-schwaben-stb.de, 1
 xn--hgbk4a00a.com, 1
-xn--hibiskusbltentee-szb.de, 1
 xn--hllrigl-90a.at, 0
 xn--hnse-gra.net, 1
 xn--hsers-kva.de, 1
@@ -97990,6 +103469,7 @@
 xn--irr.xn--fiqs8s, 1
 xn--is8h6d.gq, 0
 xn--j1afcdm4f.xn--p1ai, 1
+xn--j1agcso.xn--p1ai, 1
 xn--j4h.cf, 1
 xn--j8se.com, 1
 xn--jda.tk, 1
@@ -98001,11 +103481,10 @@
 xn--kl-oja.is, 1
 xn--klmek-0sa.com, 1
 xn--ktha-kamrater-pfba.se, 1
-xn--kuerbiskernl-fjb.de, 1
 xn--l8js6h476m.xn--q9jyb4c, 1
 xn--labanskllermark-ftb.se, 1
 xn--laclas-n0a.ro, 1
-xn--lavendelblten-tee-c3b.de, 1
+xn--lfv405c.com, 1
 xn--ll-yka.de, 1
 xn--lna-2000-9za.nu, 1
 xn--lna-4000-9za.nu, 1
@@ -98017,8 +103496,6 @@
 xn--lti-3qa.lv, 1
 xn--m1aba.tk, 1
 xn--manuela-stsser-psb.de, 1
-xn--maracujal-77a.de, 1
-xn--mariendistell-tmb.de, 1
 xn--marn-8ra.eu, 1
 xn--martnvillalba-zib.com, 1
 xn--martnvillalba-zib.net, 1
@@ -98037,10 +103514,6 @@
 xn--mntsamling-0cb.dk, 1
 xn--myrepubic-wub.net, 1
 xn--myrepublc-x5a.net, 1
-xn--n8j7dygrbu0c31a5861bq8qb.com, 1
-xn--n8jp5083dnzs.net, 1
-xn--n8jtcugp92n4wc738f.net, 1
-xn--nda.fit, 1
 xn--nicieri-b4a.ro, 1
 xn--nidar-tib.org, 1
 xn--nide-loa.ee, 1
@@ -98064,7 +103537,6 @@
 xn--pn1am9c.com, 1
 xn--pq1a637b.xn--6qq986b3xl, 1
 xn--prfontaine-c7a.name, 1
-xn--q9jb1h5dvcspke3218b9mn4p0c.com, 1
 xn--qckss0j.tk, 1
 xn--qfun83b.ga, 1
 xn--r77hya.ga, 1
@@ -98076,7 +103548,6 @@
 xn--rlcus7b3d.xn--xkc2dl3a5ee0h, 1
 xn--roselire-60a.ch, 0
 xn--roselire-60a.com, 0
-xn--rosenbltentee-2ob.de, 1
 xn--rt-cja.eu, 1
 xn--rt-cja.ie, 1
 xn--rtter-kva.eu, 1
@@ -98084,13 +103555,12 @@
 xn--s-0fa.fi, 1
 xn--s-1gaa.fi, 1
 xn--s1r71tg0o30bxm52odlvspdop4b.cn, 1
+xn--sb-lka.org, 1
 xn--schcke-yxa.de, 1
 xn--schlerzeitung-ideenlos-ulc.de, 1
 xn--schpski-c1a.de, 1
 xn--schsischer-christstollen-qbc.shop, 1
-xn--schwarzkmmeloel-6vb.de, 1
 xn--schwedischezahnrztin-pzb.de, 1
-xn--sesaml-0xa.de, 1
 xn--skmotoroptimering-zzb.site, 1
 xn--solidaritt-am-ort-yqb.de, 1
 xn--soloatrapasueos-brb.online, 1
@@ -98110,14 +103580,12 @@
 xn--thorme-6uaf.ca, 1
 xn--tigreray-i1a.org, 1
 xn--trdler-xxa.xyz, 1
-xn--u8jvc1drbz972aywbk0by95ffo1aqm1c.com, 1
 xn--u8jwd.ga, 1
-xn--u9j0ia6hb7347cg8wavz0avb0e.com, 1
 xn--u9j920h4sbt5ex10f.online, 1
 xn--u9jv84l7ea468b.com, 1
 xn--u9jy16ncfao19mo8i.nagoya, 1
 xn--uasacrilicas-9gb.net, 1
-xn--ugt.cc, 1
+xn--ugt.cc, 0
 xn--ukasik-2db.pl, 1
 xn--underux-0za.eu, 1
 xn--v-wfa35g.ro, 1
@@ -98126,7 +103594,6 @@
 xn--vck8crc010pu14e.biz, 1
 xn--vck8crcu789ajtaj92eura.xyz, 1
 xn--wby9t.xyz, 0
-xn--weidenrschen-tee-swb.de, 1
 xn--whlefamilie-l8a.de, 1
 xn--woistdermlleimer-rzb.de, 1
 xn--wp9ha.ws, 1
@@ -98165,6 +103632,7 @@
 xo.tc, 1
 xoan.cf, 1
 xoatickets.com, 1
+xobotun.com, 1
 xoda.pw, 1
 xoffy.com, 1
 xoh.at, 1
@@ -98177,7 +103645,6 @@
 xonet.cz, 1
 xonobixa.tk, 1
 xor.cat, 1
-xormatic.com, 1
 xosh.fr, 1
 xotictrends.com, 1
 xotika.tv, 1
@@ -98199,7 +103666,6 @@
 xpertsunlimited.com, 1
 xpj000666.com, 1
 xpj090.com, 1
-xpj100.com, 1
 xpj678678.com, 1
 xpj90.com, 1
 xpj909.cc, 1
@@ -98229,6 +103695,7 @@
 xpoc.pro, 1
 xpods.sg, 1
 xpornoizle.net, 1
+xportxpert.com, 1
 xposedornot.com, 1
 xposure.ae, 1
 xpressable.com, 1
@@ -98244,7 +103711,7 @@
 xqk7.com, 1
 xr.cx, 1
 xr1s.me, 1
-xraven.org, 1
+xrak.tk, 1
 xrayreview.ml, 1
 xrbox.me, 1
 xrg.cz, 1
@@ -98258,20 +103725,23 @@
 xs2a.no, 1
 xsapp.co, 1
 xscancun.com, 1
+xsden.info, 1
 xsec.me, 1
 xsenya74hram.tk, 1
 xserownia.com.pl, 1
 xserownia.eu, 1
+xserownia.info, 1
 xserownia.net, 1
 xserownia.pl, 1
 xslim.com.br, 1
-xsmobile.de, 1
 xsole.net, 1
+xsolla.com, 1
 xss.name, 1
 xss.sk, 1
 xssi.uk, 1
 xsstime.nl, 1
 xsteam.eu, 1
+xstore.top, 1
 xstreamable.com, 1
 xsuper.net, 1
 xsz.jp, 1
@@ -98348,6 +103818,7 @@
 xtremebouncepartyhire.com.au, 1
 xtremecoatingtechnologies.com, 1
 xtremegaming.it, 1
+xtremegearz.com, 1
 xtrememidlife.nl, 1
 xtronics.com, 1
 xts.bike, 1
@@ -98355,6 +103826,8 @@
 xtu2.com, 1
 xtzone.be, 1
 xuab.net, 1
+xuan-li88.com, 1
+xuan-li88.net, 1
 xuann.wang, 1
 xubo666.com, 1
 xuc.me, 1
@@ -98382,16 +103855,19 @@
 xvaldezendocrino.com, 1
 xvii.pl, 1
 xviimusic.com, 1
+xvix.eu, 1
 xvpn.io, 1
 xvt-blog.tk, 1
 xwalck.se, 1
 xwaretech.info, 1
 xwf.fyi, 1
 xwfwrestling.tk, 1
+xwm.ru, 1
 xx.gl, 1
 xx0r.eu, 1
 xx30019.com, 1
 xx6729.co, 1
+xx6729.com, 1
 xx6957.co, 1
 xx9297.co, 1
 xx9397.com, 1
@@ -98399,8 +103875,11 @@
 xx9728.co, 1
 xxffo.com, 1
 xxgalgame.com, 1
+xxgirl.xyz, 1
 xxiz.com, 1
 xxl-bonus.tk, 1
+xxl.tax, 1
+xxoo.best, 1
 xxxbunker.com, 1
 xxxfreepornclip.com, 1
 xxxoopz.com, 1
@@ -98424,7 +103903,6 @@
 xy7272.com, 1
 xy7373.com, 1
 xybabyshop.com, 1
-xybnb.com, 1
 xyenon.bid, 1
 xyfun.net, 0
 xylerfox.ca, 1
@@ -98445,6 +103923,7 @@
 xzibits.com, 1
 xzqy.net, 1
 xztech.co, 1
+y-nas.tk, 1
 y-syouten.com, 1
 y.gy, 1
 y09a.com, 0
@@ -98473,15 +103952,13 @@
 y5bet.com, 1
 y6180.com, 1
 y6729.co, 1
+y6729.com, 1
 y68aa.com, 1
 y68cc.com, 1
 y68dd.com, 1
 y68ee.com, 1
 y68ff.com, 1
-y68gg.com, 1
 y68gl.com, 1
-y68hh.com, 1
-y68ii.com, 1
 y68jj.com, 1
 y68jn.com, 1
 y68ll.com, 1
@@ -98529,8 +104006,8 @@
 y89c.com, 1
 y89c.net, 1
 y89ccc.com, 0
-y89d.com, 0
-y89d.net, 0
+y89d.com, 1
+y89d.net, 1
 y89dd.com, 1
 y89ddd.com, 1
 y89e.com, 0
@@ -98576,6 +104053,7 @@
 y9728.co, 1
 ya-hudeu.tk, 1
 ya-hudeyu.gq, 1
+ya-hudeyu.ml, 1
 ya-hudeyu.tk, 1
 ya-madina.tk, 1
 ya-radio.tk, 1
@@ -98584,7 +104062,6 @@
 ya.mk, 1
 yaay.com.br, 1
 yaay.today, 1
-yabo68.com, 1
 yabuisha.jp, 1
 yacca.co.uk, 1
 yacca.uk, 1
@@ -98596,14 +104073,16 @@
 yachting-home.com, 1
 yachtlettering.com, 1
 yachtmarket.com.ua, 1
-yacineboumaza.fr, 1
 yacobo.com, 1
+yacostasolutions.com, 1
 yadameshop.ir, 1
 yaencasa.net, 1
 yafull.com, 1
 yafuoku.ru, 1
 yageys.com, 1
 yagihiro.tech, 1
+yagizhan.me, 1
+yagliyurt.com, 1
 yagmursoft.tk, 1
 yagoda-malina.tk, 1
 yah-music.com, 1
@@ -98661,12 +104140,14 @@
 yananikitina.site, 1
 yanbao.xyz, 1
 yande.re, 1
+yandong.tk, 1
 yangfamily.tw, 1
 yangjingwen.cn, 1
 yangjingwen.com, 1
-yangmaodang.org, 1
+yangmaodang.org, 0
 yangmi.blog, 1
 yangruixin.com, 1
+yangshangzhen.com, 1
 yanhongming.net, 1
 yanik.info, 1
 yanlongli.com, 1
@@ -98675,9 +104156,7 @@
 yannic.world, 0
 yannick.cloud, 1
 yannickb.de, 1
-yannickcoffi.com, 1
 yannickkordel.de, 1
-yannickkordel.eu, 1
 yannickvdvelde.tk, 1
 yanniclandsmann.de, 1
 yannikbloscheck.com, 1
@@ -98690,6 +104169,8 @@
 yansurachman.web.id, 1
 yantox.com, 1
 yanwo.com.tw, 1
+yao-in.com, 1
+yao-in.net, 1
 yao28.com, 1
 yaoge123.com, 1
 yap26.cc, 1
@@ -98742,9 +104223,12 @@
 yaru.one, 1
 yarygin.tk, 1
 yasam.co.uk, 1
+yaseiblog.org, 1
 yaseminuzumcu.com, 1
+yash.com, 1
 yashinstore.com, 1
 yasic.net, 1
+yasmingarcia.tk, 1
 yasraiting.tk, 1
 yasrating.tk, 1
 yassine-ayari.com, 1
@@ -98791,7 +104275,6 @@
 ychon.com, 1
 yclan.net, 1
 ycnrg.org, 1
-ycwt.com, 1
 yd163.cc, 1
 yd169.cc, 1
 ydiversa.com, 1
@@ -98867,7 +104350,6 @@
 yenpape.com, 1
 yep-pro.ch, 0
 yepbitcoin.com, 1
-yephy.com, 0
 yeptechnology.store, 1
 yerbasbuenas.tk, 1
 yert.pink, 1
@@ -98927,6 +104409,7 @@
 yhe.me, 1
 yhenke.de, 0
 yhfou.com, 1
+yhn.sh, 1
 yhndnzj.com, 1
 yhong.me, 1
 yhori.xyz, 1
@@ -98943,7 +104426,6 @@
 yiff.rocks, 1
 yiff.supply, 1
 yify.online, 1
-yifymovietorrent.com, 1
 yigelangzi.com, 1
 yigit.shop, 1
 yigujin.cn, 1
@@ -98975,8 +104457,6 @@
 yjdevtech.com, 1
 yjsoft.me, 1
 yjsp.tv, 1
-yjsp07.com, 1
-yjsp333.com, 1
 yjst.cn, 1
 yjsw.sh.cn, 1
 ykhut.com, 1
@@ -98988,6 +104468,7 @@
 yl8.com, 1
 ylde.de, 1
 ylinternal.com, 1
+ylk.de, 1
 ylk.io, 1
 ym069.com, 1
 ym1199.com, 1
@@ -99022,11 +104503,14 @@
 yoduzw.com, 1
 yoga-alliance-teacher-training.com, 1
 yoga-bad-toelz.de, 1
+yoga-bien-etre.com, 1
+yoga-good.fr, 1
 yoga-in-aying.de, 1
 yoga-prive.de, 1
 yoga-school.xyz, 1
 yoga-zentrum-narayani.de, 1
 yoga.is-an-engineer.com, 1
+yogaangels.ga, 1
 yogacentric.co.uk, 1
 yogaecology.org, 1
 yogaemmental.ch, 1
@@ -99036,7 +104520,6 @@
 yogamarlene.ch, 1
 yogamaya9.com, 1
 yogamea.school, 1
-yogamexico.net, 1
 yogananda-roma.org, 1
 yogaprague.com, 1
 yogaschoolrishikesh.com, 1
@@ -99062,13 +104545,15 @@
 yolocast.wtf, 1
 yolops.net, 1
 yolosh.se, 1
+yoloyolo.top, 0
 yombo.net, 1
 yomena.in, 1
 yomiren.co.jp, 1
 yon.co.il, 1
+yoneda-paint.com, 1
 yonema.com, 1
 yongbin.org, 1
-yooand.me, 1
+yonkersdentalspa.com, 1
 yoogirls.com, 1
 yoonas.com, 1
 yooomu.com, 1
@@ -99103,21 +104588,21 @@
 yotilabs.com, 1
 yotta-zetta.com, 1
 yotubaiotona.net, 1
-yotubes.co, 1
 you.com.br, 1
 you15iv.com, 1
 you2you.fr, 1
 you52iv.com, 1
 youareme.ca, 0
+youarethelight.pl, 1
 youbehero.com, 1
 youber.cz, 1
 youc.ir, 1
 youcanfinance.com.au, 1
 youcanfuckoff.xyz, 1
+youcanhelp.tk, 1
 youcanmakeit.at, 1
 youdamom.com, 1
 youdungoofd.com, 1
-youengine.io, 1
 youftp.tk, 1
 yougee.ml, 1
 yougene.me, 1
@@ -99157,6 +104642,7 @@
 young-celebrities.tk, 1
 young-sheldon.com, 1
 young-zy.com, 1
+youngart.hu, 1
 youngauthentic.cf, 1
 youngguns.club, 1
 youngmodelsagency.tk, 1
@@ -99168,6 +104654,7 @@
 younl.net, 1
 youpark.no, 1
 youpickfarms.org, 1
+your-dns.run, 1
 your-erotic-stories.com, 1
 your-fitness-coach.ch, 1
 your-forum.tk, 1
@@ -99209,12 +104696,14 @@
 youreallyneedthis.co, 1
 youregeeks.com, 1
 youreitbranding.com, 1
+youreward.ga, 1
 yourforex.org, 1
 yourfriendlytech.com, 1
 yourfuntrivia.com, 1
 yourfuturestrategy.com.au, 1
 yourgadget.ro, 1
 yourgames.tv, 1
+yourgift.in, 1
 yourhair.net, 1
 yourhealthcommunity.com, 1
 yourkit.com, 1
@@ -99225,6 +104714,7 @@
 yourlscgroup.com, 1
 yourmagicstory.tk, 1
 yourmobility.ga, 1
+yourms.com, 1
 yourname.xyz, 1
 yournextagency.com, 1
 youronly.one, 1
@@ -99232,10 +104722,8 @@
 yourpalmbeachcountyrealtor.com, 1
 yourpalstore.com, 1
 yourpersonalfrance.com, 1
-yourpocketbook.uk, 1
 yourrenaissancemedspa.com, 1
 yourscotlandtour.co.uk, 1
-yourself.today, 1
 yourskin.nl, 1
 yoursoul.gq, 1
 yoursoulmate.tk, 1
@@ -99245,18 +104733,21 @@
 yourticketbooking.com, 1
 yourtime.tv, 1
 yourtimetravel.net, 1
+yourtwojugs.com, 1
 youruseragent.info, 1
 yourwatchdesign.co.uk, 1
 yourworlds.cf, 1
 yourznc.com, 1
 yousee.cf, 1
 yousei.ne.jp, 1
+youservice.it, 1
 youshouldbealiberal.com, 1
 yousite.by, 1
 youstyleski.it, 1
 youth-for-life.tk, 1
 youth.gov, 1
 youth2009.org, 1
+youthclothing.tk, 1
 youthingovernment.com, 1
 youthink.jp, 1
 youthopportunitieshub.com, 1
@@ -99268,11 +104759,13 @@
 youtubekids.com, 1
 youtubelet.com, 1
 youtuberis.lt, 1
+youtuberus.tk, 1
 youwatchporn.com, 1
 youyifans.com, 1
 youyoulemon.com, 1
 youyuan.rocks, 1
 youyuandesign.top, 1
+yovko.net, 0
 yoxall.me.uk, 1
 yoyoost.duckdns.org, 1
 yoyoost.ga, 1
@@ -99285,7 +104778,6 @@
 ypid.de, 1
 yplanapp.com, 1
 ypopovych.tk, 1
-yporti.net, 1
 ypse.com.br, 1
 yq5.de, 1
 yqjf68.com, 1
@@ -99301,6 +104793,7 @@
 ysearc.tk, 1
 ysicing.me, 1
 ysicorp.com, 1
+yslocksandkeys.com, 1
 ysoft.cloud, 1
 yspa.tv, 1
 yspertal.party, 1
@@ -99325,6 +104818,7 @@
 ytreza.fr, 1
 ytsdownload.com, 1
 ytuquelees.net, 1
+ytvideosaver.com, 1
 ytvwld.de, 0
 ytx588.com, 1
 yu-dkc.com, 1
@@ -99409,6 +104903,8 @@
 yugege.cf, 1
 yugodi.com, 1
 yugohome.com, 1
+yuharahisako.cf, 1
+yuharahisako.ga, 1
 yuhindo.com, 1
 yuho.vn, 1
 yuimarukitchen.com, 1
@@ -99422,11 +104918,13 @@
 yukiblog.tw, 1
 yukict.com, 1
 yukieda.com, 1
+yukimiu.cf, 1
 yukimochi.com, 1
 yukimochi.io, 1
 yukimochi.jp, 1
 yukimochi.me, 1
 yukimochi.net, 1
+yukina.blog, 0
 yukina.kr, 0
 yukinarita.com, 1
 yukonconnector.com, 1
@@ -99439,6 +104937,7 @@
 yuleyule88game.com, 1
 yulsn.com, 1
 yum0.cn, 1
+yumechi.jp, 1
 yumeconcert.com, 1
 yumepolo.com, 1
 yumiandryan.com, 1
@@ -99490,7 +104989,6 @@
 yuyo.com, 1
 yuzei.ml, 1
 yuzei.tk, 1
-yuzu-tee.de, 1
 yuzu.tk, 1
 yuzulia.com, 1
 yuzurisa.com, 1
@@ -99513,6 +105011,7 @@
 yy393.com, 1
 yy5197.co, 1
 yy6729.co, 1
+yy6729.com, 1
 yy6957.co, 1
 yy9297.co, 1
 yy9297.com, 1
@@ -99530,11 +105029,14 @@
 yzarul.com, 1
 yzddd.com, 1
 yzer.club, 1
+yzervast-heestert.be, 1
 yzh8.cc, 1
 yzh8.net, 1
 yzh8.vip, 1
 yzimroni.net, 1
 yzy6666.com, 1
+yzydo.com, 1
+yzzy.cc, 0
 z-cert.nl, 1
 z-coder.com, 1
 z-konzept-nutrition.ru, 1
@@ -99549,7 +105051,6 @@
 z1h.de, 1
 z2a4.com, 1
 z30019.com, 1
-z30365.com, 1
 z36533.com, 1
 z3s.nl, 1
 z3u5.net, 1
@@ -99595,6 +105096,7 @@
 z6592.com, 1
 z6616.com, 1
 z6729.co, 1
+z6729.com, 1
 z6751.com, 1
 z6753.com, 1
 z6757.com, 1
@@ -99767,6 +105269,7 @@
 zabbix.tips, 1
 zabszk.net, 1
 zabukovnik.net, 1
+zac.cy, 1
 zacarias.com.ar, 1
 zacchaeus.co.uk, 1
 zacco.site, 1
@@ -99785,6 +105288,8 @@
 zachgibbens.org, 1
 zachhay.es, 1
 zachschneider.ca, 1
+zaci.xyz, 1
+zack.today, 1
 zackiarfan.ml, 1
 zaclys.com, 0
 zadania.wiki, 1
@@ -99794,18 +105299,19 @@
 zaffit.com, 0
 zaffke.co, 1
 zafirus.name, 1
+zagadki-cosmosa.tk, 1
 zaghyr.org, 1
 zagorod.spb.ru, 1
 zagruz.tk, 1
 zahe.me, 1
 zahirdanzavila.com, 1
-zahnaerzte-bohne.de, 0
 zahnarzt-backfisch.de, 1
 zahnarzt-drvogel-rosenheim.de, 1
 zahnarzt-drvogel.de, 1
 zahnarzt-duempten.de, 1
 zahnarzt-hofer.de, 1
 zahnarzt-kramer.ch, 1
+zahnarzt-kruft.de, 1
 zahnarzt-seidenstuecker.de, 1
 zahnmedizinzentrum.com, 0
 zahrowski.com, 1
@@ -99849,13 +105355,16 @@
 zajmy-contact.tk, 1
 zak.co.at, 1
 zak.org.pl, 1
+zakaria.website, 1
 zakariya.blog, 1
 zakaz.cf, 1
+zakazat-dizayn-interyera.ru, 1
 zakbk.xyz, 1
 zakcutner.com, 1
 zakcutner.uk, 1
 zakelijketaalcursus.nl, 1
 zakladam.cz, 1
+zakladki.tk, 1
 zakmccrac.de, 1
 zakojifarm.jp, 1
 zakononline.cf, 1
@@ -99877,22 +105386,25 @@
 zalvus.com, 1
 zam0th.tk, 1
 zamalektoday.com, 1
+zamarax.com, 1
 zambianewsforum.tk, 1
 zambranopublicidadvideo.com, 1
 zamecnikkladno.cz, 1
 zamenim.tk, 1
 zamok-love.tk, 1
 zamok.cf, 1
+zamokservis.com, 1
 zamor.com.br, 1
+zamos.ru, 1
 zamow.co, 0
 zamtech.co.jp, 1
 zananta.com, 1
-zanardiadvogados.com.br, 1
 zandcell.com, 1
 zander.dk, 1
 zandra.cf, 1
 zanellidesigns.co.uk, 1
 zango.com.au, 1
+zanjirzanane-shanbeghazan.ir, 1
 zanotti.io, 1
 zanquan.net, 1
 zanshinkankarate.com, 1
@@ -99912,6 +105424,7 @@
 zapreaders.cf, 1
 zaprefy.com, 1
 zarabiaj.com, 1
+zarabotki-v-internete.tk, 1
 zarabotok-v-internete.ga, 1
 zarabotok2017.tk, 1
 zarabotoker.tk, 1
@@ -99927,6 +105440,7 @@
 zarla.com, 1
 zarobotok-forum.gq, 1
 zarobotok-forum.ml, 1
+zaroktv.krd, 1
 zaruhi.ml, 1
 zary.me, 1
 zaschtnik.ga, 1
@@ -99945,6 +105459,7 @@
 zaympodzalog.gq, 1
 zaympodzalog.ml, 1
 zaympodzalog.tk, 1
+zayzoh.com, 1
 zbanks.cn, 1
 zberger.com, 1
 zbetcheck.in, 1
@@ -100043,9 +105558,11 @@
 zd9797.com, 1
 zdbl.de, 1
 zdenek-hejl.com, 1
+zdenekpasek.com, 1
 zdenekpasek.cz, 1
 zdenekspacek.cz, 1
 zdenekvecera.cz, 1
+zdorov-blog.gq, 1
 zdorovayasimya.com, 1
 zdorovcentr.ga, 1
 zdrave-konzultace.cz, 1
@@ -100069,14 +105586,15 @@
 zeckenhilfe.de, 0
 zecuur.nl, 1
 zedeko.pl, 1
-zedern-welt.de, 1
 zeds-official.com, 1
 zeedroom.be, 0
+zeegers.family, 1
 zeel.com, 1
 zeetoppers.nl, 1
 zegarkidlakazdego.pl, 1
 zegluje.net, 1
 zeglujemy.net, 1
+zegriesalmansa.tk, 1
 zeguigui.com, 1
 zehdenick-bleibt-bunt.de, 1
 zehka.net, 1
@@ -100085,6 +105603,8 @@
 zehrailkeakyildiz.com, 0
 zeibekiko-souvlaki.gr, 1
 zeidlertechnik.de, 1
+zeihetecumre.cf, 1
+zeihetecumre.gq, 1
 zeihsel.com, 1
 zeilenmethans.nl, 1
 zeilenvoorondernemers.nl, 1
@@ -100092,10 +105612,10 @@
 zeilles.nu, 1
 zeit.co, 1
 zeit.sh, 1
-zeitgitter.org, 1
 zeitoununiversity.org, 1
 zeitpunkt-kulturmagazin.de, 1
 zeitzer-turngala.de, 1
+zekerheidvanparcelinternational.nl, 1
 zekesnider.com, 1
 zekinteractive.com, 1
 zeldaliberty.tk, 1
@@ -100114,16 +105634,21 @@
 zen-diez.de, 1
 zen-solutions.io, 1
 zen-zone.tk, 1
+zen3tech.com, 1
 zenassociates.com, 1
 zenavita.com, 1
 zenchain.com, 1
+zendarhunters.tk, 1
 zenfusion.fr, 1
+zengdong.ren, 1
+zengold.com, 1
 zenideen.com, 1
 zenidees.com, 1
 zenisi.com, 1
 zenithappliance.co.uk, 1
 zenithars-ledger.de, 1
 zenithmedia.ca, 1
+zenitkft.hu, 1
 zenk-security.com, 1
 zenki-manga.tk, 1
 zenlogic.com, 1
@@ -100135,6 +105660,8 @@
 zenrtal-online-russia.ml, 1
 zenspace.us, 1
 zenti.cloud, 1
+zentoy.club, 1
+zentrading.group, 1
 zentrumfuerchemie.de, 1
 zenvideocloud.com, 1
 zenvite.com, 1
@@ -100150,6 +105677,7 @@
 zepter.ml, 1
 zer0-day.pw, 1
 zer0.de, 0
+zer0dayhacks.com, 1
 zercutie.com, 1
 zerg.uk, 1
 zerium.ml, 1
@@ -100170,7 +105698,6 @@
 zerofy.de, 1
 zeroknowledge.me, 1
 zerolab.org, 1
-zeroling.com, 1
 zeromedia.co.id, 1
 zeromoment.marketing, 1
 zeronet.io, 1
@@ -100180,6 +105707,8 @@
 zerosource.net, 1
 zerosync.com, 1
 zerotoone.de, 1
+zerotoone.studio, 1
+zerotwo.ga, 1
 zerowastesonoma.gov, 1
 zerox-security.online, 1
 zeroz.gq, 1
@@ -100208,6 +105737,7 @@
 zevelev.net, 1
 zevenbergenbos.tk, 1
 zewtie.com, 1
+zezov.com, 1
 zfast.com.br, 1
 zfg.li, 1
 zfj.hk, 1
@@ -100235,13 +105765,14 @@
 zhangcheng.org, 0
 zhangda.xyz, 1
 zhangfangzhou.com, 1
-zhangge.net, 1
 zhanghao.me, 1
 zhanghao.org, 1
 zhanglizhi.ml, 1
 zhangshuqiao.org, 1
 zhangwendao.com, 1
 zhangyuhao.com, 1
+zhanxiangyang.com, 1
+zhanzhangb.com, 1
 zhaochen.xyz, 1
 zhaodao.ai, 1
 zhaoeq.com, 1
@@ -100282,7 +105813,6 @@
 zhis.ltd, 1
 zhitanska.com, 1
 zhiwei.me, 1
-zhiyuan.cloud, 1
 zhiyulife.pp.ua, 1
 zhl123.cn, 1
 zhl123.com, 1
@@ -100290,7 +105820,6 @@
 zhome.info, 1
 zhongxigo.com, 1
 zhongzicili.ws, 1
-zhost.io, 1
 zhouba.cz, 1
 zhoujianghan.com, 0
 zhoujiashu.com, 1
@@ -100352,12 +105881,13 @@
 zilsoft.net, 0
 zilv.life, 1
 zilver.nl, 1
+zima-lito.tk, 1
 zima.io, 1
+zimaaplus.com, 1
 zimaoxy.com, 1
 zimiao.moe, 1
 zimmer-voss.de, 1
 zimperium.com, 1
-zimtoel.de, 1
 zinabnews.tk, 1
 zinchenko.gq, 1
 zindan.tk, 1
@@ -100369,6 +105899,7 @@
 zinniazorgverlening.nl, 1
 zinnowitzer-ferienwohnung.de, 1
 zinoui.com, 1
+zion-craft.tk, 1
 ziondrive.com.br, 1
 zionnationalpark.net, 1
 zionsvillelocksmiths.com, 1
@@ -100380,20 +105911,16 @@
 ziprecruiter.com, 1
 ziqijiang.com, 0
 zir-online.com, 1
-zirbenholz-welt.de, 1
 zircode.com, 1
 zirka24.net, 1
 ziroh.be, 1
 ziron.com, 1
 ziroux.net, 1
 zirrka.de, 1
-zirtek.ie, 1
 zirtual.com, 1
 zistemo.com, 1
 zitadel.ch, 1
 zithromaxstrepthroat.gq, 1
-zitronengras-tee.de, 1
-zitronenmelisse-tee.de, 1
 zitseng.com, 1
 zivava.ge, 1
 zivimexico.com, 1
@@ -100419,7 +105946,6 @@
 zjyifa.cn, 1
 zk.gd, 1
 zk9.nl, 1
-zkd.me, 1
 zklcdc.top, 1
 zklokotskehory.cz, 1
 zkontrolujsiauto.cz, 1
@@ -100432,7 +105958,6 @@
 zl-79.com, 1
 zl-89.com, 1
 zl0101.com, 1
-zl0606.com, 1
 zl0707.com, 1
 zl071.com, 1
 zl0909.com, 1
@@ -100512,6 +106037,7 @@
 zmartagroup.se, 1
 zmc.com.sa, 1
 zmeya.tk, 1
+zmiguel.me, 1
 zmk.fr, 0
 zmy.im, 1
 zmy666.com, 1
@@ -100522,6 +106048,7 @@
 znakomstva-2013.tk, 1
 znakomstva.gq, 1
 znakomstvablogs.tk, 1
+znakomstvatochka.tk, 1
 znanie-sila.tk, 1
 znaniya.cf, 1
 znanje.gq, 1
@@ -100603,6 +106130,7 @@
 zonemaster.net, 1
 zonesec.org, 1
 zonewatcher.com, 1
+zongboao.com, 1
 zonglovani.info, 1
 zonky.cz, 1
 zonky.de, 1
@@ -100618,6 +106146,7 @@
 zoomative.com, 1
 zoomcar.pro, 1
 zoomek.com, 1
+zoomgov.com, 1
 zooom.azurewebsites.net, 1
 zooom2.azurewebsites.net, 1
 zoop.ml, 0
@@ -100660,7 +106189,6 @@
 zovirax-cream.ml, 1
 zovovo.com, 1
 zowe.ru, 1
-zowedo.com, 1
 zoyride.com, 1
 zoznamrealit.sk, 1
 zozzle.co.uk, 1
@@ -100670,6 +106198,7 @@
 zporno.porn, 1
 zporno.sex, 1
 zq789.com, 1
+zqwqz.org, 1
 zqzx.xyz, 1
 zravyobrazky.cz, 1
 zravypapir.cz, 1
@@ -100685,19 +106214,20 @@
 zs6688.cc, 1
 zsbd.xyz, 1
 zscales.com, 0
+zsdublovice.cz, 1
 zselicivt.hu, 1
 zserver.fr, 1
+zsien.cn, 1
 zskomenskeho.cz, 1
 zskomenskeho.eu, 1
-zsolti.hu, 1
-zsoltsandor.me, 1
+zsoltbereczki.tk, 1
 zsq.im, 1
 zsrbcs.com, 1
 zstgmnachod.cz, 1
 zsyaolong.com, 0
 zten.org, 1
 zthc.nl, 1
-ztickerz.nl, 1
+ztickerz.nl, 0
 zuan-in.com, 1
 zuan-in.net, 1
 zubar.bg, 1
@@ -100719,6 +106249,8 @@
 zuiverjegeest.nl, 1
 zukify.com, 1
 zukix.com, 1
+zukonar.ru, 1
+zukunft-mobilitaet.net, 1
 zula.africa, 1
 zulaoyun.ml, 1
 zulihome.vn, 1
@@ -100783,7 +106315,7 @@
 zy.md, 1
 zy.si, 1
 zybbo.com, 1
-zycao.com, 1
+zycao.com, 0
 zycie.news, 1
 zyciedirect.pl, 1
 zyciedogorynogami.pl, 1
@@ -100812,6 +106344,7 @@
 zz5197.co, 1
 zz606.com, 1
 zz6729.co, 1
+zz6729.com, 1
 zz6957.co, 1
 zz772.com, 1
 zz9297.co, 1
diff -Nru firefox-84.0.2+build1/security/manager/ssl/osclientcerts/Cargo.toml firefox-85.0+build1/security/manager/ssl/osclientcerts/Cargo.toml
--- firefox-84.0.2+build1/security/manager/ssl/osclientcerts/Cargo.toml	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/osclientcerts/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -9,7 +9,7 @@
 
 [dependencies]
 byteorder = "1.3"
-env_logger = {version = "0.6", default-features = false } # disable `regex` to reduce code size
+env_logger = {version = "0.8", default-features = false } # disable `regex` to reduce code size
 lazy_static = "1"
 log = "0.4"
 pkcs11 = "0.4"
diff -Nru firefox-84.0.2+build1/security/manager/ssl/OSReauthenticator.cpp firefox-85.0+build1/security/manager/ssl/OSReauthenticator.cpp
--- firefox-84.0.2+build1/security/manager/ssl/OSReauthenticator.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/OSReauthenticator.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -10,19 +10,24 @@
 #include "nsNetCID.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/Logging.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Preferences.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIBaseWindow.h"
 #include "nsIDocShell.h"
 #include "nsISupportsUtils.h"
 #include "nsIWidget.h"
+#include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
-#include "ipc/IPCMessageUtils.h"
+#include "mozilla/ipc/IPCTypes.h"
 
 NS_IMPL_ISUPPORTS(OSReauthenticator, nsIOSReauthenticator)
 
 extern mozilla::LazyLogModule gCredentialManagerSecretLog;
 
 using mozilla::LogLevel;
+using mozilla::Maybe;
 using mozilla::Preferences;
 using mozilla::WindowsHandle;
 using mozilla::dom::Promise;
diff -Nru firefox-84.0.2+build1/security/manager/ssl/PKCS11ModuleDB.cpp firefox-85.0+build1/security/manager/ssl/PKCS11ModuleDB.cpp
--- firefox-84.0.2+build1/security/manager/ssl/PKCS11ModuleDB.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/PKCS11ModuleDB.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -7,6 +7,7 @@
 #include "PKCS11ModuleDB.h"
 
 #include "ScopedNSSTypes.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIMutableArray.h"
 #include "nsNSSCertHelper.h"
 #include "nsNSSComponent.h"
diff -Nru firefox-84.0.2+build1/security/manager/ssl/PSMIPCTypes.ipdlh firefox-85.0+build1/security/manager/ssl/PSMIPCTypes.ipdlh
--- firefox-84.0.2+build1/security/manager/ssl/PSMIPCTypes.ipdlh	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/PSMIPCTypes.ipdlh	2021-01-18 19:58:18.000000000 +0000
@@ -5,7 +5,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-using mozilla::DataStorageType from "ipc/DataStorageIPCUtils.h";
+include "ipc/DataStorageIPCUtils.h";
+
+using mozilla::DataStorageType from "mozilla/DataStorage.h";
 
 namespace mozilla {
 namespace psm {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/RootCertificateTelemetryUtils.cpp firefox-85.0+build1/security/manager/ssl/RootCertificateTelemetryUtils.cpp
--- firefox-84.0.2+build1/security/manager/ssl/RootCertificateTelemetryUtils.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/RootCertificateTelemetryUtils.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/Logging.h"
 #include "nsINSSComponent.h"
 #include "nsNSSCertHelper.h"
+#include "nsServiceManagerUtils.h"
 #include "pk11pub.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/RootHashes.inc firefox-85.0+build1/security/manager/ssl/RootHashes.inc
--- firefox-84.0.2+build1/security/manager/ssl/RootHashes.inc	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/RootHashes.inc	2021-01-18 19:58:18.000000000 +0000
@@ -712,6 +712,12 @@
       146 /* Bin Number */
   },
   {
+    /* NAVER_Global_Root_Certification_Authority */
+    { 0x88, 0xF4, 0x38, 0xDC, 0xF8, 0xFF, 0xD1, 0xFA, 0x8F, 0x42, 0x91, 0x15, 0xFF, 0xE5, 0xF8, 0x2A,
+      0xE1, 0xE0, 0x6E, 0x0C, 0x70, 0xC3, 0x75, 0xFA, 0xAD, 0x71, 0x7B, 0x34, 0xA4, 0x9E, 0x72, 0x65 },
+      219 /* Bin Number */
+  },
+  {
     /* QuoVadis_Root_CA_1_G3 */
     { 0x8A, 0x86, 0x6F, 0xD1, 0xB2, 0x76, 0xB5, 0x7E, 0x57, 0x8E, 0x92, 0x1C, 0x65, 0x82, 0x8A, 0x2B,
       0xED, 0x58, 0xE9, 0xF2, 0xF2, 0x88, 0x05, 0x41, 0x34, 0xB7, 0xF1, 0xF4, 0xBF, 0xC9, 0xCC, 0x74 },
diff -Nru firefox-84.0.2+build1/security/manager/ssl/SecretDecoderRing.cpp firefox-85.0+build1/security/manager/ssl/SecretDecoderRing.cpp
--- firefox-84.0.2+build1/security/manager/ssl/SecretDecoderRing.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/SecretDecoderRing.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -310,25 +310,27 @@
 NS_IMETHODIMP
 SecretDecoderRing::Logout() {
   PK11_LogoutAll();
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
-  return NS_OK;
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(NS_NSSCOMPONENT_CID));
+  if (!nssComponent) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  return nssComponent->ClearSSLExternalAndInternalSessionCache();
 }
 
 NS_IMETHODIMP
 SecretDecoderRing::LogoutAndTeardown() {
-  static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
-
   PK11_LogoutAll();
-  nsNSSComponent::ClearSSLExternalAndInternalSessionCacheNative();
+  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(NS_NSSCOMPONENT_CID));
+  if (!nssComponent) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
 
-  nsresult rv;
-  nsCOMPtr<nsINSSComponent> nssComponent(do_GetService(kNSSComponentCID, &rv));
+  // LogoutAuthenticatedPK11 also clears the SSL caches.
+  nsresult rv = nssComponent->LogoutAuthenticatedPK11();
   if (NS_FAILED(rv)) {
     return rv;
   }
 
-  rv = nssComponent->LogoutAuthenticatedPK11();
-
   // After we just logged out, we need to prune dead connections to make
   // sure that all connections that should be stopped, are stopped. See
   // bug 517584.
@@ -337,5 +339,5 @@
     os->NotifyObservers(nullptr, "net:prune-dead-connections", nullptr);
   }
 
-  return rv;
+  return NS_OK;
 }
diff -Nru firefox-84.0.2+build1/security/manager/ssl/SharedCertVerifier.h firefox-85.0+build1/security/manager/ssl/SharedCertVerifier.h
--- firefox-84.0.2+build1/security/manager/ssl/SharedCertVerifier.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/SharedCertVerifier.h	2021-01-18 19:58:18.000000000 +0000
@@ -27,15 +27,13 @@
                      SHA1Mode sha1Mode,
                      BRNameMatchingPolicy::Mode nameMatchingMode,
                      NetscapeStepUpPolicy netscapeStepUpPolicy,
-                     CertificateTransparencyMode ctMode,
-                     DistrustedCAPolicy distrustedCAPolicy,
-                     CRLiteMode crliteMode, uint64_t crliteCTMergeDelaySeconds,
+                     CertificateTransparencyMode ctMode, CRLiteMode crliteMode,
+                     uint64_t crliteCTMergeDelaySeconds,
                      const Vector<EnterpriseCert>& thirdPartyCerts)
       : mozilla::psm::CertVerifier(
             odc, osc, ocspSoftTimeout, ocspHardTimeout, certShortLifetimeInDays,
             pinningMode, sha1Mode, nameMatchingMode, netscapeStepUpPolicy,
-            ctMode, distrustedCAPolicy, crliteMode, crliteCTMergeDelaySeconds,
-            thirdPartyCerts) {}
+            ctMode, crliteMode, crliteCTMergeDelaySeconds, thirdPartyCerts) {}
 };
 
 }  // namespace psm
diff -Nru firefox-84.0.2+build1/security/manager/ssl/SSLServerCertVerification.cpp firefox-85.0+build1/security/manager/ssl/SSLServerCertVerification.cpp
--- firefox-84.0.2+build1/security/manager/ssl/SSLServerCertVerification.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/SSLServerCertVerification.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -114,7 +114,6 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
-#include "mozilla/net/DNS.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsICertOverrideService.h"
@@ -513,202 +512,6 @@
   return SECFailure;
 }
 
-void AccumulateSubjectCommonNameTelemetry(const char* commonName,
-                                          bool commonNameInSubjectAltNames) {
-  if (!commonName) {
-    // 1 means no common name present
-    Telemetry::Accumulate(Telemetry::BR_9_2_2_SUBJECT_COMMON_NAME, 1);
-  } else if (!commonNameInSubjectAltNames) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("BR telemetry: common name '%s' not in subject alt. names "
-             "(or the subject alt. names extension is not present)\n",
-             commonName));
-    // 2 means the common name is not present in subject alt names
-    Telemetry::Accumulate(Telemetry::BR_9_2_2_SUBJECT_COMMON_NAME, 2);
-  } else {
-    // 0 means the common name is present in subject alt names
-    Telemetry::Accumulate(Telemetry::BR_9_2_2_SUBJECT_COMMON_NAME, 0);
-  }
-}
-
-// Returns true if and only if commonName ends with altName (minus its leading
-// "*"). altName has already been checked to be of the form "*.<something>".
-// commonName may be NULL.
-static bool TryMatchingWildcardSubjectAltName(const char* commonName,
-                                              const nsACString& altName) {
-  return commonName &&
-         StringEndsWith(nsDependentCString(commonName), Substring(altName, 1));
-}
-
-// Gathers telemetry on Baseline Requirements 9.2.1 (Subject Alternative
-// Names Extension) and 9.2.2 (Subject Common Name Field).
-// Specifically:
-//  - whether or not the subject common name field is present
-//  - whether or not the subject alternative names extension is present
-//  - if there is a malformed entry in the subject alt. names extension
-//  - if there is an entry in the subject alt. names extension corresponding
-//    to the subject common name
-// Telemetry is only gathered for certificates that chain to a trusted root
-// in Mozilla's Root CA program.
-// certList consists of a validated certificate chain. The end-entity
-// certificate is first and the root (trust anchor) is last.
-void GatherBaselineRequirementsTelemetry(const UniqueCERTCertList& certList) {
-  CERTCertListNode* endEntityNode = CERT_LIST_HEAD(certList);
-  CERTCertListNode* rootNode = CERT_LIST_TAIL(certList);
-  MOZ_ASSERT(!(CERT_LIST_END(endEntityNode, certList) ||
-               CERT_LIST_END(rootNode, certList)));
-  if (CERT_LIST_END(endEntityNode, certList) ||
-      CERT_LIST_END(rootNode, certList)) {
-    return;
-  }
-  CERTCertificate* cert = endEntityNode->cert;
-  MOZ_ASSERT(cert);
-  if (!cert) {
-    return;
-  }
-  UniquePORTString commonName(CERT_GetCommonName(&cert->subject));
-  // This only applies to certificates issued by authorities in our root
-  // program.
-  CERTCertificate* rootCert = rootNode->cert;
-  MOZ_ASSERT(rootCert);
-  if (!rootCert) {
-    return;
-  }
-  bool isBuiltIn = false;
-  Result result = IsCertBuiltInRoot(rootCert, isBuiltIn);
-  if (result != Success || !isBuiltIn) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("BR telemetry: root certificate for '%s' is not a built-in root "
-             "(or IsCertBuiltInRoot failed)\n",
-             commonName.get()));
-    return;
-  }
-  ScopedAutoSECItem altNameExtension;
-  SECStatus rv = CERT_FindCertExtension(cert, SEC_OID_X509_SUBJECT_ALT_NAME,
-                                        &altNameExtension);
-  if (rv != SECSuccess) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("BR telemetry: no subject alt names extension for '%s'\n",
-             commonName.get()));
-    // 1 means there is no subject alt names extension
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 1);
-    AccumulateSubjectCommonNameTelemetry(commonName.get(), false);
-    return;
-  }
-
-  UniquePLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
-  CERTGeneralName* subjectAltNames =
-      CERT_DecodeAltNameExtension(arena.get(), &altNameExtension);
-  if (!subjectAltNames) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("BR telemetry: could not decode subject alt names for '%s'\n",
-             commonName.get()));
-    // 2 means the subject alt names extension could not be decoded
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 2);
-    AccumulateSubjectCommonNameTelemetry(commonName.get(), false);
-    return;
-  }
-
-  CERTGeneralName* currentName = subjectAltNames;
-  bool commonNameInSubjectAltNames = false;
-  bool nonDNSNameOrIPAddressPresent = false;
-  bool malformedDNSNameOrIPAddressPresent = false;
-  bool nonFQDNPresent = false;
-  do {
-    nsAutoCString altName;
-    if (currentName->type == certDNSName) {
-      altName.Assign(
-          BitwiseCast<char*, unsigned char*>(currentName->name.other.data),
-          currentName->name.other.len);
-      nsDependentCString altNameWithoutWildcard(altName, 0);
-      if (StringBeginsWith(altNameWithoutWildcard, "*."_ns)) {
-        altNameWithoutWildcard.Rebind(altName, 2);
-        commonNameInSubjectAltNames |=
-            TryMatchingWildcardSubjectAltName(commonName.get(), altName);
-      }
-      // net_IsValidHostName appears to return true for valid IP addresses,
-      // which would be invalid for a DNS name.
-      // Note that the net_IsValidHostName check will catch things like
-      // "a.*.example.com".
-      if (!net_IsValidHostName(altNameWithoutWildcard) ||
-          net_IsValidIPv4Addr(altName) || net_IsValidIPv6Addr(altName)) {
-        MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                ("BR telemetry: DNSName '%s' not valid (for '%s')\n",
-                 altName.get(), commonName.get()));
-        malformedDNSNameOrIPAddressPresent = true;
-      }
-      if (!altName.Contains('.')) {
-        nonFQDNPresent = true;
-      }
-    } else if (currentName->type == certIPAddress) {
-      // According to DNS.h, this includes space for the null-terminator
-      char buf[net::kNetAddrMaxCStrBufSize] = {0};
-      PRNetAddr addr;
-      memset(&addr, 0, sizeof(addr));
-      if (currentName->name.other.len == 4) {
-        addr.inet.family = PR_AF_INET;
-        memcpy(&addr.inet.ip, currentName->name.other.data,
-               currentName->name.other.len);
-        if (PR_NetAddrToString(&addr, buf, sizeof(buf) - 1) != PR_SUCCESS) {
-          MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                  ("BR telemetry: IPAddress (v4) not valid (for '%s')\n",
-                   commonName.get()));
-          malformedDNSNameOrIPAddressPresent = true;
-        } else {
-          altName.Assign(buf);
-        }
-      } else if (currentName->name.other.len == 16) {
-        addr.inet.family = PR_AF_INET6;
-        memcpy(&addr.ipv6.ip, currentName->name.other.data,
-               currentName->name.other.len);
-        if (PR_NetAddrToString(&addr, buf, sizeof(buf) - 1) != PR_SUCCESS) {
-          MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                  ("BR telemetry: IPAddress (v6) not valid (for '%s')\n",
-                   commonName.get()));
-          malformedDNSNameOrIPAddressPresent = true;
-        } else {
-          altName.Assign(buf);
-        }
-      } else {
-        MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                ("BR telemetry: IPAddress not valid (for '%s')\n",
-                 commonName.get()));
-        malformedDNSNameOrIPAddressPresent = true;
-      }
-    } else {
-      MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-              ("BR telemetry: non-DNSName, non-IPAddress present for '%s'\n",
-               commonName.get()));
-      nonDNSNameOrIPAddressPresent = true;
-    }
-    if (commonName && altName.Equals(commonName.get())) {
-      commonNameInSubjectAltNames = true;
-    }
-    currentName = CERT_GetNextGeneralName(currentName);
-  } while (currentName && currentName != subjectAltNames);
-
-  if (nonDNSNameOrIPAddressPresent) {
-    // 3 means there's an entry that isn't an ip address or dns name
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 3);
-  }
-  if (malformedDNSNameOrIPAddressPresent) {
-    // 4 means there's a malformed ip address or dns name entry
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 4);
-  }
-  if (nonFQDNPresent) {
-    // 5 means there's a DNS name entry with a non-fully-qualified domain name
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 5);
-  }
-  if (!nonDNSNameOrIPAddressPresent && !malformedDNSNameOrIPAddressPresent &&
-      !nonFQDNPresent) {
-    // 0 means the extension is acceptable
-    Telemetry::Accumulate(Telemetry::BR_9_2_1_SUBJECT_ALT_NAMES, 0);
-  }
-
-  AccumulateSubjectCommonNameTelemetry(commonName.get(),
-                                       commonNameInSubjectAltNames);
-}
-
 // Gather telemetry on whether the end-entity cert for a server has the
 // required TLS Server Authentication EKU, or any others
 void GatherEKUTelemetry(const UniqueCERTCertList& certList) {
@@ -814,7 +617,6 @@
 // There are various things that we want to measure about certificate
 // chains that we accept.  This is a single entry point for all of them.
 void GatherSuccessfulValidationTelemetry(const UniqueCERTCertList& certList) {
-  GatherBaselineRequirementsTelemetry(certList);
   GatherEKUTelemetry(certList);
   GatherRootCATelemetry(certList);
 }
@@ -952,11 +754,10 @@
     const PinningTelemetryInfo& aPinningTelemetryInfo,
     const UniqueCERTCertList& aBuiltCertChain,
     const CertificateTransparencyInfo& aCertificateTransparencyInfo,
-    const CRLiteTelemetryInfo& aCRLiteTelemetryInfo) {
-  uint32_t evStatus = (aCertVerificationResult != Success)
-                          ? 0  // 0 = Failure
-                          : (aEvOidPolicy == SEC_OID_UNKNOWN) ? 1   // 1 = DV
-                                                              : 2;  // 2 = EV
+    const CRLiteLookupResult& aCRLiteLookupResult) {
+  uint32_t evStatus = (aCertVerificationResult != Success) ? 0  // 0 = Failure
+                      : (aEvOidPolicy == SEC_OID_UNKNOWN)  ? 1  // 1 = DV
+                                                           : 2;  // 2 = EV
   Telemetry::Accumulate(Telemetry::CERT_EV_STATUS, evStatus);
 
   if (aOcspStaplingStatus != CertVerifier::OCSP_STAPLING_NEVER_CHECKED) {
@@ -992,7 +793,7 @@
         /*isEV*/ aEvOidPolicy != SEC_OID_UNKNOWN, aCertificateTransparencyInfo);
   }
 
-  switch (aCRLiteTelemetryInfo.mLookupResult) {
+  switch (aCRLiteLookupResult) {
     case CRLiteLookupResult::FilterNotAvailable:
       Telemetry::AccumulateCategorical(
           Telemetry::LABELS_CRLITE_RESULT::FilterNotAvailable);
@@ -1027,19 +828,6 @@
       MOZ_ASSERT_UNREACHABLE("Unhandled CRLiteLookupResult value?");
       break;
   }
-
-  if (aCRLiteTelemetryInfo.mCRLiteFasterThanOCSPMillis.isSome()) {
-    Telemetry::Accumulate(
-        Telemetry::CRLITE_FASTER_THAN_OCSP_MS,
-        static_cast<uint32_t>(
-            *aCRLiteTelemetryInfo.mCRLiteFasterThanOCSPMillis));
-  }
-  if (aCRLiteTelemetryInfo.mOCSPFasterThanCRLiteMillis.isSome()) {
-    Telemetry::Accumulate(
-        Telemetry::OCSP_FASTER_THAN_CRLITE_MS,
-        static_cast<uint32_t>(
-            *aCRLiteTelemetryInfo.mOCSPFasterThanCRLiteMillis));
-  }
 }
 
 static void AuthCertificateSetResults(
@@ -1098,7 +886,7 @@
   KeySizeStatus keySizeStatus = KeySizeStatus::NeverChecked;
   SHA1ModeResult sha1ModeResult = SHA1ModeResult::NeverChecked;
   PinningTelemetryInfo pinningTelemetryInfo;
-  CRLiteTelemetryInfo crliteTelemetryInfo;
+  CRLiteLookupResult crliteTelemetryInfo;
 
   nsTArray<nsTArray<uint8_t>> peerCertsBytes;
   // Don't include the end-entity certificate.
@@ -1232,11 +1020,10 @@
       ("[0x%" PRIx64 "] Certificate error was not overridden\n", aPtrForLog));
 
   // pick the error code to report by priority
-  return errorCodeTrust
-             ? errorCodeTrust
-             : errorCodeMismatch
-                   ? errorCodeMismatch
-                   : errorCodeTime ? errorCodeTime : aDefaultErrorCodeToReport;
+  return errorCodeTrust      ? errorCodeTrust
+         : errorCodeMismatch ? errorCodeMismatch
+         : errorCodeTime     ? errorCodeTime
+                             : aDefaultErrorCodeToReport;
 }
 
 }  // unnamed namespace
@@ -1355,7 +1142,7 @@
 //  checks and calls SSLServerCertVerificationJob::Dispatch.
 SECStatus AuthCertificateHookInternal(
     TransportSecurityInfo* infoObject, const void* aPtrForLogging,
-    const UniqueCERTCertificate& serverCert,
+    const UniqueCERTCertificate& serverCert, const nsACString& hostName,
     nsTArray<nsTArray<uint8_t>>&& peerCertChain,
     Maybe<nsTArray<uint8_t>>& stapledOCSPResponse,
     Maybe<nsTArray<uint8_t>>& sctsFromTLSExtension,
@@ -1398,10 +1185,10 @@
 
   if (XRE_IsSocketProcess()) {
     return RemoteProcessCertVerification(
-        serverCert, std::move(peerCertChain), infoObject->GetHostName(),
-        infoObject->GetPort(), infoObject->GetOriginAttributes(),
-        stapledOCSPResponse, sctsFromTLSExtension, dcInfo, providerFlags,
-        certVerifierFlags, resultTask);
+        serverCert, std::move(peerCertChain), hostName, infoObject->GetPort(),
+        infoObject->GetOriginAttributes(), stapledOCSPResponse,
+        sctsFromTLSExtension, dcInfo, providerFlags, certVerifierFlags,
+        resultTask);
   }
 
   // We *must* do certificate verification on a background thread because
@@ -1409,11 +1196,10 @@
   // and we *want* to do certificate verification on a background thread
   // because of the performance benefits of doing so.
   return SSLServerCertVerificationJob::Dispatch(
-      addr, infoObject, serverCert, std::move(peerCertChain),
-      infoObject->GetHostName(), infoObject->GetPort(),
-      infoObject->GetOriginAttributes(), stapledOCSPResponse,
-      sctsFromTLSExtension, dcInfo, providerFlags, Now(), PR_Now(),
-      certVerifierFlags, resultTask);
+      addr, infoObject, serverCert, std::move(peerCertChain), hostName,
+      infoObject->GetPort(), infoObject->GetOriginAttributes(),
+      stapledOCSPResponse, sctsFromTLSExtension, dcInfo, providerFlags, Now(),
+      PR_Now(), certVerifierFlags, resultTask);
 }
 
 // Extracts whatever information we need out of fd (using SSL_*) and passes it
@@ -1501,11 +1287,24 @@
                                            channelPreInfo.authKeyBits));
   }
 
+  // If we configured an ECHConfig and NSS returned the public name
+  // for verification, ECH was rejected. Proceed, verifying to the
+  // public name. The result determines how NSS will fail (i.e. with
+  // any provided retry_configs if successful). See draft-ietf-tls-esni-08.
+  nsCString echConfig;
+  nsresult nsrv = socketInfo->GetEchConfig(echConfig);
+  bool verifyToEchPublicName =
+      NS_SUCCEEDED(nsrv) && echConfig.Length() && channelPreInfo.echPublicName;
+
+  const nsCString echPublicName(channelPreInfo.echPublicName);
+  const nsACString& hostname =
+      verifyToEchPublicName ? echPublicName : socketInfo->GetHostName();
   socketInfo->SetCertVerificationWaiting();
-  return AuthCertificateHookInternal(socketInfo, static_cast<const void*>(fd),
-                                     serverCert, std::move(peerCertsBytes),
-                                     stapledOCSPResponse, sctsFromTLSExtension,
-                                     dcInfo, providerFlags, certVerifierFlags);
+  rv = AuthCertificateHookInternal(
+      socketInfo, static_cast<const void*>(fd), serverCert, hostname,
+      std::move(peerCertsBytes), stapledOCSPResponse, sctsFromTLSExtension,
+      dcInfo, providerFlags, certVerifierFlags);
+  return rv;
 }
 
 // Takes information needed for cert verification, does some consistency
@@ -1550,10 +1349,10 @@
   // for Delegated Credentials.
   Maybe<DelegatedCredentialInfo> dcInfo;
 
-  return AuthCertificateHookInternal(infoObject, aPtrForLogging, cert,
-                                     std::move(peerCertChain),
-                                     stapledOCSPResponse, sctsFromTLSExtension,
-                                     dcInfo, providerFlags, certVerifierFlags);
+  return AuthCertificateHookInternal(
+      infoObject, aPtrForLogging, cert, infoObject->GetHostName(),
+      std::move(peerCertChain), stapledOCSPResponse, sctsFromTLSExtension,
+      dcInfo, providerFlags, certVerifierFlags);
 }
 
 NS_IMPL_ISUPPORTS_INHERITED0(SSLServerCertVerificationResult, Runnable)
diff -Nru firefox-84.0.2+build1/security/manager/ssl/StaticHPKPins.h firefox-85.0+build1/security/manager/ssl/StaticHPKPins.h
--- firefox-84.0.2+build1/security/manager/ssl/StaticHPKPins.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/StaticHPKPins.h	2021-01-18 19:58:19.000000000 +0000
@@ -143,10 +143,30 @@
 static const char kGOOGLE_PIN_GTSCA1O1Fingerprint[] =
   "YZPgTZ+woNCCCIW3LH2CxQeLzB/1m42QcCTBSdgayjs=";
 
+/* GOOGLE_PIN_GeoTrustGlobal */
+static const char kGOOGLE_PIN_GeoTrustGlobalFingerprint[] =
+  "h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=";
+
 /* GOOGLE_PIN_GeoTrustGlobal2 */
 static const char kGOOGLE_PIN_GeoTrustGlobal2Fingerprint[] =
   "F3VaXClfPS1y5vAxofB/QAxYi55YKyLxfq4xoVkNEYU=";
 
+/* GOOGLE_PIN_GeoTrustPrimary */
+static const char kGOOGLE_PIN_GeoTrustPrimaryFingerprint[] =
+  "SQVGZiOrQXi+kqxcvWWE96HhfydlLVqFr4lQTqI5qqo=";
+
+/* GOOGLE_PIN_GeoTrustPrimary_G3 */
+static const char kGOOGLE_PIN_GeoTrustPrimary_G3Fingerprint[] =
+  "q5hJUnat8eyv8o81xTBIeB5cFxjaucjmelBPT2pRMo8=";
+
+/* GOOGLE_PIN_GeoTrustUniversal */
+static const char kGOOGLE_PIN_GeoTrustUniversalFingerprint[] =
+  "lpkiXF3lLlbN0y3y6W0c/qWqPKC7Us2JM8I7XCdEOCA=";
+
+/* GOOGLE_PIN_GeoTrustUniversal2 */
+static const char kGOOGLE_PIN_GeoTrustUniversal2Fingerprint[] =
+  "fKoDRlEkWQxgHlZ+UhSOlSwM/+iQAFMP4NlbbVDqrkE=";
+
 /* GOOGLE_PIN_GoDaddySecure */
 static const char kGOOGLE_PIN_GoDaddySecureFingerprint[] =
   "MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=";
@@ -207,6 +227,14 @@
 static const char kGOOGLE_PIN_VeriSignClass3_G3Fingerprint[] =
   "SVqWumuteCQHvVIaALrOZXuzVVVeS7f4FGxxu6V+es4=";
 
+/* GOOGLE_PIN_VeriSignClass3_G4 */
+static const char kGOOGLE_PIN_VeriSignClass3_G4Fingerprint[] =
+  "UZJDjsNp1+4M5x9cbbdflB779y5YRBcV6Z6rBMLIrO4=";
+
+/* GOOGLE_PIN_VeriSignClass3_G5 */
+static const char kGOOGLE_PIN_VeriSignClass3_G5Fingerprint[] =
+  "JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=";
+
 /* GOOGLE_PIN_VeriSignClass4_G3 */
 static const char kGOOGLE_PIN_VeriSignClass4_G3Fingerprint[] =
   "VnuCEf0g09KD7gzXzgZyy52ZvFtIeljJ1U7Gf3fUqPU=";
@@ -227,30 +255,10 @@
 static const char kGTS_Root_R4Fingerprint[] =
   "mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=";
 
-/* GeoTrust Global CA */
-static const char kGeoTrust_Global_CAFingerprint[] =
-  "h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=";
-
-/* GeoTrust Primary Certification Authority */
-static const char kGeoTrust_Primary_Certification_AuthorityFingerprint[] =
-  "SQVGZiOrQXi+kqxcvWWE96HhfydlLVqFr4lQTqI5qqo=";
-
 /* GeoTrust Primary Certification Authority - G2 */
 static const char kGeoTrust_Primary_Certification_Authority___G2Fingerprint[] =
   "vPtEqrmtAhAVcGtBIep2HIHJ6IlnWQ9vlK50TciLePs=";
 
-/* GeoTrust Primary Certification Authority - G3 */
-static const char kGeoTrust_Primary_Certification_Authority___G3Fingerprint[] =
-  "q5hJUnat8eyv8o81xTBIeB5cFxjaucjmelBPT2pRMo8=";
-
-/* GeoTrust Universal CA */
-static const char kGeoTrust_Universal_CAFingerprint[] =
-  "lpkiXF3lLlbN0y3y6W0c/qWqPKC7Us2JM8I7XCdEOCA=";
-
-/* GeoTrust Universal CA 2 */
-static const char kGeoTrust_Universal_CA_2Fingerprint[] =
-  "fKoDRlEkWQxgHlZ+UhSOlSwM/+iQAFMP4NlbbVDqrkE=";
-
 /* GlobalSign ECC Root CA - R4 */
 static const char kGlobalSign_ECC_Root_CA___R4Fingerprint[] =
   "CLOmM1/OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=";
@@ -287,6 +295,10 @@
 static const char kGoogleBackup2048Fingerprint[] =
   "IPMbDAjLVSGntGO3WP53X/zilCVndez5YJ2+vJvhJsA=";
 
+/* ISRG Root X1 */
+static const char kISRG_Root_X1Fingerprint[] =
+  "C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M=";
+
 /* Let's Encrypt Authority X3 */
 static const char kLet_s_Encrypt_Authority_X3Fingerprint[] =
   "YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=";
@@ -347,14 +359,6 @@
 static const char kUSERTrust_RSA_Certification_AuthorityFingerprint[] =
   "x4QzPSC810K5/cMjb05Qm4k3Bw5zBn4lTdO/nEW/Td4=";
 
-/* VeriSign Class 3 Public Primary Certification Authority - G4 */
-static const char kVeriSign_Class_3_Public_Primary_Certification_Authority___G4Fingerprint[] =
-  "UZJDjsNp1+4M5x9cbbdflB779y5YRBcV6Z6rBMLIrO4=";
-
-/* VeriSign Class 3 Public Primary Certification Authority - G5 */
-static const char kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint[] =
-  "JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=";
-
 /* VeriSign Universal Root Certification Authority */
 static const char kVeriSign_Universal_Root_Certification_AuthorityFingerprint[] =
   "lnsM2T/O9/J84sJFdnrpsFp3awZJ+ZZbYpCWhGloaHI=";
@@ -412,7 +416,6 @@
   kCybertrust_Global_RootFingerprint,
   kStarfield_Root_Certificate_Authority___G2Fingerprint,
   kCOMODO_RSA_Certification_AuthorityFingerprint,
-  kGeoTrust_Global_CAFingerprint,
   kGTS_Root_R1Fingerprint,
   kDigiCert_Global_Root_G2Fingerprint,
   kGlobalSign_Root_CA___R2Fingerprint,
@@ -430,10 +433,9 @@
 };
 
 static const char* const kPinset_mozilla_services_Data[] = {
+  kISRG_Root_X1Fingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
-  kLet_s_Encrypt_Authority_X3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
-  kLet_s_Encrypt_Authority_X4Fingerprint,
 };
 static const StaticFingerprints kPinset_mozilla_services = {
   sizeof(kPinset_mozilla_services_Data) / sizeof(const char*),
@@ -493,19 +495,19 @@
   kGOOGLE_PIN_GeoTrustGlobal2Fingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
   kVerisign_Class_1_Public_Primary_Certification_Authority___G3Fingerprint,
-  kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
+  kGOOGLE_PIN_VeriSignClass3_G5Fingerprint,
   kGOOGLE_PIN_VeriSignClass1Fingerprint,
-  kGeoTrust_Primary_Certification_AuthorityFingerprint,
+  kGOOGLE_PIN_GeoTrustPrimaryFingerprint,
   kGOOGLE_PIN_VeriSignClass3_G3Fingerprint,
-  kVeriSign_Class_3_Public_Primary_Certification_Authority___G4Fingerprint,
+  kGOOGLE_PIN_VeriSignClass3_G4Fingerprint,
   kGOOGLE_PIN_VeriSignClass4_G3Fingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kVerisign_Class_2_Public_Primary_Certification_Authority___G3Fingerprint,
-  kGeoTrust_Universal_CA_2Fingerprint,
-  kGeoTrust_Global_CAFingerprint,
+  kGOOGLE_PIN_GeoTrustUniversal2Fingerprint,
+  kGOOGLE_PIN_GeoTrustGlobalFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
-  kGeoTrust_Universal_CAFingerprint,
-  kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
+  kGOOGLE_PIN_GeoTrustUniversalFingerprint,
+  kGOOGLE_PIN_GeoTrustPrimary_G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kTwitter1Fingerprint,
@@ -527,17 +529,17 @@
   kEntrust_net_Premium_2048_Secure_Server_CAFingerprint,
   kDigiCert_Assured_ID_Root_CAFingerprint,
   kVerisign_Class_1_Public_Primary_Certification_Authority___G3Fingerprint,
-  kVeriSign_Class_3_Public_Primary_Certification_Authority___G5Fingerprint,
+  kGOOGLE_PIN_VeriSignClass3_G5Fingerprint,
   kGlobalSign_Root_CAFingerprint,
   kGOOGLE_PIN_UTNUSERFirstClientAuthenticationandEmailFingerprint,
   kGOOGLE_PIN_VeriSignClass1Fingerprint,
   kGOOGLE_PIN_AddTrustPublicCARootFingerprint,
   kGOOGLE_PIN_UTNDATACorpSGCFingerprint,
   kGOOGLE_PIN_SecureCertificateServicesFingerprint,
-  kGeoTrust_Primary_Certification_AuthorityFingerprint,
+  kGOOGLE_PIN_GeoTrustPrimaryFingerprint,
   kGOOGLE_PIN_VeriSignClass3_G3Fingerprint,
   kGOOGLE_PIN_UTNUSERFirstHardwareFingerprint,
-  kVeriSign_Class_3_Public_Primary_Certification_Authority___G4Fingerprint,
+  kGOOGLE_PIN_VeriSignClass3_G4Fingerprint,
   kGOOGLE_PIN_VeriSignClass4_G3Fingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
   kBaltimore_CyberTrust_RootFingerprint,
@@ -545,14 +547,14 @@
   kVerisign_Class_2_Public_Primary_Certification_Authority___G3Fingerprint,
   kGlobalSign_Root_CA___R3Fingerprint,
   kEntrust_Root_Certification_Authority___G2Fingerprint,
-  kGeoTrust_Universal_CA_2Fingerprint,
-  kGeoTrust_Global_CAFingerprint,
+  kGOOGLE_PIN_GeoTrustUniversal2Fingerprint,
+  kGOOGLE_PIN_GeoTrustGlobalFingerprint,
   kGlobalSign_Root_CA___R2Fingerprint,
   kGOOGLE_PIN_AddTrustExternalCARootFingerprint,
   kVeriSign_Universal_Root_Certification_AuthorityFingerprint,
-  kGeoTrust_Universal_CAFingerprint,
+  kGOOGLE_PIN_GeoTrustUniversalFingerprint,
   kGOOGLE_PIN_Entrust_SSLFingerprint,
-  kGeoTrust_Primary_Certification_Authority___G3Fingerprint,
+  kGOOGLE_PIN_GeoTrustPrimary_G3Fingerprint,
   kDigiCert_Global_Root_CAFingerprint,
   kGeoTrust_Primary_Certification_Authority___G2Fingerprint,
   kComodo_AAA_Services_rootFingerprint,
@@ -596,7 +598,7 @@
   kSpiderOak2Fingerprint,
   kSpiderOak3Fingerprint,
   kDigiCert_High_Assurance_EV_Root_CAFingerprint,
-  kGeoTrust_Global_CAFingerprint,
+  kGOOGLE_PIN_GeoTrustGlobalFingerprint,
 };
 static const StaticFingerprints kPinset_spideroak = {
   sizeof(kPinset_spideroak_Data) / sizeof(const char*),
@@ -1142,4 +1144,4 @@
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1615817926379000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1619102038101000);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_certificateManager.js	2021-01-18 19:58:18.000000000 +0000
@@ -4,7 +4,7 @@
 "use strict";
 
 const TEST_CERT_BASE64 =
-  "MIICrjCCAZagAwIBAgIUe5lVOMkAlJoPQkmZ7fbJgzf2GqQwDQYJKoZIhvcNAQEEBQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowETEPMA0GA1UEAwwGbWQ1LWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQCYTPM+SoIBQ6eGd95zKrfbd0mvgDmLML/gkiGrgyw8Q1nyYzjlXP6WTf+5FoFgOxWwKYaqAa3uDoNgN5TaapxC9WQB0gE4JKbughSbNZb+MsiAYVciPlHBVkrjU4YcRus2J/J/fkx6v+PFohY99LZNi2IgUwhnt15CnWLIXb8FUlN/pjRVq8J2AKD2uj7I3SkBB3gQ9c7ELtvn6z22zMgAYA5uKVKyUjXKX4A67hZUoash6APIl0qQQiQKQLuwJ8nKYo3scrQ8DXdSiF99ufjrYY+bXgV8i7EnvX+qj2CELKw3xtkqOgeBTAR2dOw03LiiYKwWUydtXtRyKHRHoLze";
+  "MIICrjCCAZagAwIBAgIUCR+2dzKgSt0CBU86EgRdJIa/72owDQYJKoZIhvcNAQEEBQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowETEPMA0GA1UEAwwGbWQ1LWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQArfDtm5sEuzsPZps2oZhvrOYRViP0sRIAbAjuJVnAMA/7xLzI3LweXOlQJHBh3m3mrPUMAXfr4xJ5XjGySqHBUtFat9EBl/0bynd67sCMA7UOf51GC4ABOPAV0CkDj/FNqL/KSt8WB90FW+ZKnt1ojKikMIjmPjxDaaHj7KZVBQ2KtBEz1Igt5Bvbrp2AMNvjyhUCN4/z4NDPPbzkeDKYC7vmvYhN1Cs/73Jp3A0LU4z0gIyrWi6a7YEAVBzhIvJJ98U8AQQMm+iiIDGZMoAZyvEFouofF9te4xMHStUnYfa1jLY93dL1TuXrWvKB0pWg4REoQuFZUE8GS/LczW5xX";
 
 async function checkServerCertificates(win, expectedValues = []) {
   await TestUtils.waitForCondition(() => {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuth_connection.js	2021-01-18 19:58:18.000000000 +0000
@@ -181,7 +181,7 @@
 
   let win = await BrowserTestUtils.openNewBrowserWindow(options);
 
-  await BrowserTestUtils.loadURI(
+  BrowserTestUtils.loadURI(
     win.gBrowser.selectedBrowser,
     "https://requireclientcert.example.com:443"
   );
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuthRememberService.js firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuthRememberService.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuthRememberService.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/browser_clientAuthRememberService.js	2021-01-18 19:58:19.000000000 +0000
@@ -38,7 +38,7 @@
     set: [["security.default_personal_cert", "Ask Every Time"]],
   });
 
-  await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, connectURL);
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, connectURL);
 
   await BrowserTestUtils.browserLoaded(
     win.gBrowser.selectedBrowser,
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ca.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUIVqBBNkbiTYOl3tNaX/gMt4Zh4MwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUb2Np/S2xMtQR+BvitAuzKtjWxMswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAfeShvccw8RIbdHjxOZCo4nUn/
-gU8mSYYV2xIyENctB8PinH6jJdQgMkET20KAPUDZMnkZPH2EL31S+J+rSXimnDnS
-2+e9F+0H21aE4xsKIb4JbIvw0mZH8QO5qqd2XN5PlvM9CTrdWkuIgqCV+ADa9A6P
-UZpDR25y3BufjA0bnEAJmcvq3TOMk29Bg4D/K1cG0w3J7rBE0AHtXRMb0j5dmLWU
-RnNL330ShJPLbQtIdXNwes2MwzBGCaVUalUwcyFNMJ+I++qZy5xPm2iAqmw4rFfY
-A2XuEXh8R31Mi3oy+hapx/sTqf7sJgwcdqye7ZNm/DcArhJWvUd7SoF6ooQU
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBPEDwwrdd6h+SHkc0J+p4Ik/yc
+aoLWNdGsVD4hJYa0IOgNh6Z/GyhTXM9hr/q0f7fewjfNhXi/nrXNcW5w4FJERhHp
+HvZO6Z08i8CrVYSiijFcLf6ClK4e163j0LXUutBWY2PCf4TDS+fnF9PJmle0kPLU
+IxqptfSSoCjLuWyYyRmjZIdNCtrNCU9g85SDaUO6l79vBm0TYOLhOiPBN0F7DWXo
+JlOZKWEco6qqS22yIM1r/5KNc5ekPTD+UJFh7qprAq0riEfR38DYJmUq3w07q5Tb
+HQdG8JHEtemi7dHr/WoJY18MLZaF7BSLAwBWmBWzx8Lj2V+/4TP4NtRWkL7y
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/client-cert-via-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/client-cert-via-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/client-cert-via-intermediate.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/client-cert-via-intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDETCCAfmgAwIBAgIUZ/wVsZBVUjlx32bqA0sXgHFnIU8wDQYJKoZIhvcNAQEL
+MIIDETCCAfmgAwIBAgIUcepT9pQ4IQkGYiLxzM+rfwju1TYwDQYJKoZIhvcNAQEL
 BQAwQTEoMCYGA1UEAwwfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEV
-MBMGA1UECwwMSW50ZXJtZWRpYXRlMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCcxJTAjBgNVBAMMHGNsaWVudCBjZXJ0IHZpYSBpbnRlcm1lZGlh
+MBMGA1UECwwMSW50ZXJtZWRpYXRlMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCcxJTAjBgNVBAMMHGNsaWVudCBjZXJ0IHZpYSBpbnRlcm1lZGlh
 dGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
 p0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB
@@ -10,10 +10,10 @@
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUA
-A4IBAQA9RUkBQgMo9f6cUsGbOmA+wEQeCvGBaLgdlIfRpCcjm7cXGbwi8U072bo+
-fYw1Q9mKlN/S/RXCaixalxo2A4lVHJshDfM+SJ5wcY2OVKa2OxY3N/WMI3DlrfKK
-FM6Sj2MHNvKAdTwyXZodSl7VOF0tdoYXL7x2Ac5Vfl0VMMxbBM1YrWUYPsZRc0qN
-qSDQoB4CHB8cPxhGXx5rHgK9Pi3H4ZkjVNr0ZD9Tt1wso+G84FiIwQ/GKEIEtZ7B
-VOm+rjvAXivPNx3neAvIVNIG2rfLTKbbCURvBytJ/PWuzDdN8JWxDA1wqEpxC5Wh
-dMEsPmw3ChdQpqNN858qUSjKHWQf
+A4IBAQAcVbcUEeT+hYt/z82f9Ut81G6QKtq5lr/1ifSkLqV6t7P5chDt7bpujsFw
+ZI4jxHLZLL3M1znCSMBNseNRGWLW8cGlapOsO2KDNQdXbHcNJpLxETiWMRp/62Ii
+jW2/rdp4wYekjp/lYy6qQDj85N2Zc+zimqz1ELIPHQyxGQUy5uQ78+sE/eLIR8A4
+XvYwyd1pIatfYHkc2pb8LeZAAtSQ9lFQ2sJiBMac2n68wAOj1Dq3AG9MdcBuGMsh
+TiA7k4mdBiQywg8QG4GmXoP1j6QDJG0o5/8hIpbo95cmZ81Jye3TsZ8Sbmz3LR1J
+6lOk2w1lAfxwCim2cMMZ44StOBsq
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/client-cert-with-ocsp-signing.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/client-cert-with-ocsp-signing.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/client-cert-with-ocsp-signing.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/client-cert-with-ocsp-signing.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDSDCCAjCgAwIBAgIUd5MV+Q6LETVXiTtwniwUg+gEe10wDQYJKoZIhvcNAQEL
+MIIDSDCCAjCgAwIBAgIUUZw/zP5GmSytJJWBwEzzqZzjcTYwDQYJKoZIhvcNAQEL
 BQAwajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
-ZCBPcHRpbWl6YXRpb24wIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAw
+ZCBPcHRpbWl6YXRpb24wIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAw
 MFowKzEpMCcGA1UEAwwgY2xpZW50IGNlcnQgd2l0aCBPQ1NQU2lnbmluZyBla3Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
@@ -11,10 +11,10 @@
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
 AgMBAAGjITAfMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDCTANBgkqhkiG
-9w0BAQsFAAOCAQEAN/H/gQYh+0NblEL7OJYq37OtVgP9x9ljikDRe30BEN9n9r4r
-UvFLcDQFpH1Pxknqg7VWOq7rTHCzwxDf6V33B9081JQ/yOmShfxzJgFxMkdEw37D
-4V5cX3EDAyED1/9HOVf/BuiV6by05JuPU9a38ovUOfDdi3snZzMM0EMyWPppe0De
-sxQ1fBqzdoOiaST1N20BO0Ba+HHSQJd6Fy2wnchp7uknp1QcyM8W8B0x8egFnGY3
-orBML5zhIl9667QT+gdzmSCnz67p6cT5cZDjpzB5DCu/g5l7n/YoDqPyju9DGL2e
-JVYT6gFxI5W24HN1Id5xiXKvS8Ap3C6Vb6W4fA==
+9w0BAQsFAAOCAQEAFuiPgjMg34f/TNocFSU4Qc3hPod0s0W7oH53wp8I3kJXsPGs
+/P16w6YJ5dd5R9JZh6xBq63OnhFjS+j1Z6+NXalZrgSD2Q8FVNFS1z3P7bR+GSQ+
+r8ltlqkNV+Wu+Hk6TvfkrZhDX3VQ1IXtXXDQ0SuWLvczrPK3h+GCBE/LG1KybyBw
+aHHl8aqXSd7eXcwJF5/hLQlaGZlHHxVh451WHrE1i8/kX+9GdyNwlAXMP9JySqei
+YRwQPMa7MPDM5qkmFhlDh4+LWj8ugssv6n+6L5gFRNm6Db52aeNR17H2vezI7OUO
+5u0gDZ8IG4XwS1u1IRPxNtK5ZT8uV+BqhOPmhg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/code-ee.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/code-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/code-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/code-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyDCCAbCgAwIBAgIUGzC8D2NDx31GKXOKGzeDQgRsCJAwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyDCCAbCgAwIBAgIUUaEQHoacA0ankeJpt9iGsfyV7rYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHY29kZS1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
@@ -8,10 +8,10 @@
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMXMBUwEwYDVR0lBAwwCgYI
-KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAFu7IlKQgyCWbXWbknFmww0PkRgV
-0Okmxv/MFPfBc2I06fuzrUXw9VA0XIRXKBDPFrbuBEc7tlrWyAElu8y/cPdhtM3u
-GqdozWtNKfOQNdmHjGeg8alyrYXIg1pP0q0l0GuIUudow7zSgHOk9CpA16AtmaBP
-6975s9Y7bj8xHTi8SRK8IzPd6IGDqjLmaQ7ccSjbDbr6Is/V7gJOT7oXs3gEAODl
-RU94SCfQpr/LC4QKiOtiUkF/9q7q7B+nhv3l4IIW7TJ1ylddRgs5F6t1DWplFrAF
-lUh1epQq9lZFRYZemLxNkJMbZ1g8jCr31/2qGT9OBZjD0m3+M0N+l2uAcxw=
+KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAADhEW+xHUzkTkX1/RW4aODeW+NM
+aSI20y3CtLtF2BDcl08YoCCnPVdbBG/DSbKb+eZecgvKWgHGOPKFRWA4YXm8TXXW
+naVEWTDbbspVKjC6GzViuy2CsnNS5Bb5mhnGiMTI/zFvnfE+OwnfPFL+FAsLIaOm
+OhyWU6/pwWN3hQytWHK6+QI22A58nVc/vLiyLMfWnn/8Akkolob3gFj0hOZaXYbn
+mSSvBmWVTjq/7PfZLb/SD0VfGhbZMx7BebJGkUaikICS1w5F3bnM9ToRzkshhsBw
+9nI7Kq8kff8PHBSaVWR36Ygix157D7bMiGuZ5ZLpXAayYcXhGQhhIZs2+lE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ee-from-expired-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICwjCCAaqgAwIBAgIUXzTbDAMO+Ps3Ug8iiEtAsBmAziUwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKZXhwaXJlZC1jYTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAdMRswGQYDVQQDDBJlZS1mcm9tLWV4cGlyZWQtY2EwggEi
+MIICwjCCAaqgAwIBAgIUa3NpO02kyKRl+mnC7LrTUIC0W8EwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKZXhwaXJlZC1jYTAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAdMRswGQYDVQQDDBJlZS1mcm9tLWV4cGlyZWQtY2EwggEi
 MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT
 2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzV
 JJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8N
 jf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCA
 BiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVh
 He4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBAAbDn7qcFBNUlZc4DS7oIjXU3trSraCoujNJ
-Zn21lyI8/+wFzKV5wR95OQEKZwfbbiq/pDaZjv3yLf1vXZz5fNql8URQZxM1tv2A
-oqA0hOeyOZUFIfqX/tEu4LKtgcj0l2DiGXFflrNGk9o1eg4d0VFYRAoQL92oAYI7
-Q3iArYW4NilP/BKrmo/Rg/lJCZDwphPuBokr05qgFESyGjWOWwGi+y9fDt+9micG
-Cr0ZFC+OUKI49I6lPu/eIk1hzBc/mfVsEOWSERbQVJ0zki7WDKI4bGsq6oeLoMga
-aqOjU9lAeKxb7io1S2LlMwRU39rpdgOTzCjKG3bXU9fUINcbtBc=
+AAEwDQYJKoZIhvcNAQELBQADggEBAB7gNu/A0HmfIZQmKxaZno6txhlnzqU3jtCy
+TwmiYWpqCJgjNHdKKaPDNTILaDtcPtdG55JqbIxbv3mpHfbiwy9XLSYT56V3/XJy
+buMpUpXYTpsm+bXfU6aqsndiGwwuSSSrKP0MHi3R9hz/A+3hOqldu+a0d6zs4ByK
+YSjAvQwORGgLf0cLRY0CIroiMttCC2x1whvwVl4jWsa3p0wciRstsIwHUxbhcGJC
+R8bKFvK0VbNxcvyU3zwWwFnN+3ACBJT8ucI+MStFtR4oCILvvo0kL1O9C+tpWhEA
+9b7J+h9WJVroYvfDIjvuYrdkeBhaQaSk0b1WvO+0ZGKGstLFC/c=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ee-from-untrusted-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUH7Ut5QsrSWVqiijWqd9a6TnmNTcwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMB8xHTAbBgNVBAMMFGVlLWZyb20tdW50cnVzdGVkLWNh
+MIICxjCCAa6gAwIBAgIUd3uwPuHZt768G7dbGuv/MlnjS4YwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMB8xHTAbBgNVBAMMFGVlLWZyb20tdW50cnVzdGVkLWNh
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCB5GzRreaWhZSOJjlHwbUb6ppIWStJ
-pwsxxJcCsmMpmlPWInUMLt/KonkLpX7s1Tqvi6H3j9JqLoIF/GagAN3aNzwEfvQe
-yqim/ZhSeXUon1d0mwzpSE1q4WMWRkdsqxsFaXNBGBTFo/0aMKFSWGcd5kBwu6RM
-ifb/UC0tpGUwjVBddKlPSNtLj9XvWqXZgalifECvPyu1zXlOUoWfLraGqEpYU2AL
-DeHfap9LLmZhAnCHPsPPRpooti+34WJmNbYPIe21r09xvBh6uvSUyDTQVWUlTgyO
-0b+GvaRSxd7fieLYVGYbVWwq6R7nFwTWhsDVIHJ6Z4B6Rwbrdxp8UaDn
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCE43NUMM7jR2Xic3/8RdN8axQxqqnA
+YlRedr8BaEVDdiwneEG17EEGil1NU/a2DyBn6OC0I9Xx7NaB4ukYcJqheaczMHkG
+1SvpddaNmjteAtdfc+vQ2ktvwvVAi+wQDtV23Bz5kgYvONRHhk2NgTb/HPrAyG3x
+jg40Gi6wePb2vrzXQUxat88AEqh7BjCkeyJSXu/o56Pxo+TxHMX8QlZhaFT22Kj+
+J5u+WXEYygNdeTwDfIsyh0a6R/Eko+onzcT4JkNdFwI5u5bmoDQn1SjW1MBCmhJy
+Css4M/wP5BY4RzgbKA2uDdVQ2M2xPg2IeGi3bS4qwlUNNPm1iOx8WlZK
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/email-ee.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/email-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/email-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/email-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUf9XvTTDqXufY3FNeQzs/+uumL+MwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUZcgkXcHN7EQAuaIttjnYPdQFvOIwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZW1haWwtZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
@@ -8,10 +8,10 @@
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoG
-CCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4IBAQCsnkn2ZJOfVKJS/uYxtDznKR/R
-fI4fEtumEIY5DCrPvTQ9RdCMaMyc95Pn0TvU0uQA5H1N5fEsvKcyyTFlcpqma3l+
-VgtCy39bZ2h9RhA1ayBuzY53AppOPbRq+pygiLTJg871Y+XNJH4ctarTxPKBMc//
-6Vb9yo9u03ym2PfhSkh3kOJ4Oufu1CSZOfBgijqhAzTLGXibEySZ58766O+kUl9p
-3W9j2B2THuADQg0sMr/ES9j18Q3OgCvK01X1Bd5BWxfIl5ZEZvmAMfFXKNE7Inq8
-Csga0+KMxVdws6/dsfYDOXR/8gVjhW54qha/gi7IC9qsO/XK+fCNty36pBs2
+CCsGAQUFBwMEMA0GCSqGSIb3DQEBCwUAA4IBAQBSMjBmd3FC9Q/AOByGmK8GhlFk
+XhlBYmeVmxDJVDN0Z3OIcZUK1DWUl9M7hLJAUMbanng0jF98npAO1exDYx5ECyhV
+SEe+KjfsQuPj7AS0zb60Uf/4w7b5dFW3y1pKo2ruEoPWvjLzR4IYfkc5p+utc1VT
+0m568rEnF8dDGF19/FpsVjnzfwa8vmafXyXrogocOjk3qxRpx2wUqotbDwz6qDA1
+N/+LeE5+WHEgVDPF22BBECf/iPi1mUQQLURoUbQ499ELSZIRfIzI/MQUHBrF4Cx1
+TRnTDRhtzWvrcSaDBplLZzxTTWNhExwQUlg2rdFAPd9rdLuraimsLcly8xUC
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-cn.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-cn.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-cn.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-cn.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUJbOonk4RjUFUzmQK0YTygZ1EC3MwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1DCCAbygAwIBAgIUXfOLVuh26E15Y2GJNpqg+kEUVBEwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowNzEMMAoGA1UEAwwDRm9vMQwwCgYDVQQLDANCYXIxDDAKBgNVBAoMA0Jh
 ejELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
@@ -8,11 +8,11 @@
 8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OI
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
-I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAChDdlzA7JXz
-YsmpR7CEJ4vdbLNEQqbKs44jQ7iHzFJ6Zqgjb65BkQdZZupx6oAxT/ZQo92XKPV0
-2PxfqgBCpcDUOxHX5sMr9w92MnOvbHuPYR+SpDjZP0qOTLLujfQadJSMBltFxkC4
-OxR7BW17sPUJ9qq5/DrOT+SVhYV1jBkisxnTGlakQkMiaymfeEMf6ZfdlN/y9tFk
-pzeADQbIQCRfCGvFgkCvbcgdmBPnqZh1Mrqc2BPEueCuA/vt83VHFV6UJnpeyyMe
-Q6aEokyV4yPM9EtuuXnekWXExDwdNOGDo72Wzh0Jam81Bp80o0bpYQi8z2z6kRWl
-xJ3BUhe1dck=
+I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAI8sysFQZh4G
+EZKpcpOiGC0KLdbzkYAoALxjgvI+WPgOQBQBHSLGGTeIAe677xToSO6E/n9xocMh
+62YRiZc5PGpUb+T7hinZ1pq+10SXN5ERZKJiKbDfp4iUStySiRs3OL0tNpnjtcVv
+gIMZRcGr50vWBebe8fCRa/TFA3TilspiTjmRZCS6dUO7YHW8aMPWfG4gaSBF8E+6
+JCoK7YL1R/JxP4y7uAoU5+xfDBmC/vOUekUYZOH8w4Vs7dijC+weUU4zhe2L+QMb
+OC1SyG1/MZ9Orzetz3tYGZ0shZTONn/wjAnzRrUGRUmAl+LVlW+Wxs1YL3TjKqTr
+0QZaPOUVoms=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-empty-subject.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
 MIICijCCAXKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJjYTAi
-GA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAAMIIBIjANBgkqhkiG
+GA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAAMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQBNV56GqPaE6lwgEe3AHpqe9beBpGTXgyJ8dJ+O5ZLJAdg3
-ebgMLoHOuMxlpGYK9f7tpT+e/nFWkSjAtvHw5ytaJwJLcw6VMYMAf0WXB9W+g0IP
-gLbXKeaj18ASOw8bMETpBV7tmqTRbFNt03+jPJB3b96BJ210UHqYDxxCPJlb1A+i
-6hcU2BLam1R5CzsekmYIrMdwZ9zooo2HS+FSYPo+M9bJ0EPkRhwitprjnA3bSosL
-E1tix8gt8eDfcAf3vN/aMFnubeH89x9oM2oeJ/vtMIpR8+ri8mi33Y/TOA5T47b+
-NCAtWdb/V0XuMntT8dU3g9j1cuaWkgcvPGkZnbve
+SIb3DQEBCwUAA4IBAQAMkmx5NF2dju8/ckdgRK2M3fvoyEmBAYLOjWNh5ZfBX7VL
+vL6bjzwcwza41feaDwgZbIWzzqKwVJhkOb9ULFMFlkEO0k2WhvTpEc/ELJnE1uCr
+qKokl0b5BdllNGQQ9tSzhAwWumjfkhmVRZXziawWIiquA2UzowsdQX7Qf675Ae1e
+B9WJvTxfxfSscON3xKAThOcMbjs5G9SaIp+C43qRJMn2KBsbu0qmWuMXG7Iy7Dbd
+ak9CD2QG9tKDYOgjcvZRxdyErfjfIRoz3/4fiac7Ca6ooSc+TCF7va1yHNqhaYcH
+VNTl7xyArMu5uPXtcLwEBudlJgPNuLy5A3HgChh4
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-non-empty-subject.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICqjCCAZKgAwIBAgIUQX8/pFOADlK9xozrG7eio3rIy/4wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICqjCCAZKgAwIBAgIUQ1K/9yfCiqPsZYUo+7EBrddrWTowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
 bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
-FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAG2
-zrQKPin0a/zJlxXQr95Nr1gqmvYnoU9Uwn2NpK5loT1zchNQY5wDieB/BGivp9rS
-z4kfj8SEtOkWn2mrITJ69VbBF/bdbn3aKzxzWkGxtUDlsHlwHU2qZq+ShTAsivjT
-pKu0zAQDr8u+hhUgCDyKHhHwItqo8GVnd0WCNvv6cmwN4JvLHfCPeNHz01K/qdUu
-jUhMmIu9wZ22QI+sbDMv5lmt3tcwx0UEk9zXhkuxX37qX4E82CtVsm+UClCEAhSo
-o1r0oWyogvRiyCGwfx+8I0tMbtjjMBjwuhkVySxs77l+bdyig8KLKtheQD9dY8ZG
-9BxfECtRTKLCZ7Mtonw=
+FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJXk
+OiIktljwCkbDVVSyHlMX/kXOlzt4sVjWfL/YyFIaNVuiUpOYfEXlYFUc7nX8PXsL
+a4RvATrJ90fUcGxHqWdqJr19zrWW5co+vjDNFMTFFltootym0fQocq55JvVUK9ml
+BmZ+B60I82gI7L/M1NCPkylNvrG/UdD034pqY4ppgu6z/9lH6P6EpXZPseo6Ofx8
+tpSeTfYdtebvBbAkWmel56jzyN6C40ddIIjVHYKfLFgFsuavVhbwMm0AB1dFCnGQ
+06x1QGsAthQ7C7q7mYtoe+TZ6sHahUofE4gNJyQprIyBn/Itae/H6qO6qBewoYWX
+cBATil0Vqe2ZQ7FS5nk=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-o.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-o.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-o.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-o.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUG9dEzOJ+GxN0u/8eyNFGdIH10bIwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICuDCCAaCgAwIBAgIUL+2cA4H9fH3BS4yDvSfNqAx+SDkwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGzEMMAoGA1UECgwDQmF6MQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
@@ -8,10 +8,10 @@
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEALqwHZZXZrvo7m5K8yTjgQsFOSCkKUeA2Ds2QHmD6J6BpreBk
-1JL3R1n8DenRWgLtGTVcB5O5T9Fvo8r+rvXoL25P4DRuTt57up5pnr4R5fi0Qj0C
-xviuqnBZr7W0ey1t4WmoQDtlsoFvxePzQM2RMh2K8ATFXRHiCeNTFxHdCOOYseOq
-7/9yu+k0fCyEAbU5PGm1sOk31QaUmVVisRHXCigaHWvGUKte67cGuESsDKwQiGqZ
-4quKLEifAcChbNTf3l7BiSlmqWWOHo0zNWun/QDbEow661qtb7SawDBXemsdfHZV
-LWVbpIJGqGVQreWc3OeCL/bUqJD0C6eUECeXAA==
+9w0BAQsFAAOCAQEABlpU9dWi5TSGL0CISRugnOlpBATWlZbB2UYqN4H8n0R9mA28
+ss8F7+dzWq9yldVP5shpCqoHYbKgvcKwM7ki7l3QjaKvk4jqkxkp+0qw7LlNreFB
+9xH86vn0zcu/9PUYVjAAS2B5pObLhf0RpdS9km026WpL11o298hbuR8sOeADAPwh
+yqxrZz8i+ZCzBzwgNGGIwcgfpIRSQD+4rbpN5h2r3HmZupRuChA5rGR/z3xywD4J
+/81ELM7raPXtq15RoUUc/dR4rIqgDwI8zOL4zndw5Eiuxmw79BnsW7ziXSgZw2rJ
+vpxukd+42dBTnPEPHlFVZlnjn4zd97YwnuKXgw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-ou.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-ou.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/has-ou.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/has-ou.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUQbQlz0wPrOJ/X2eEFLqPNEQgXykwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAgIUB17J0zfbRaw+XdVWt9xzDjrY3o0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowKTEMMAoGA1UECwwDQmFyMQwwCgYDVQQKDANCYXoxCzAJBgNVBAYTAlVT
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
@@ -8,10 +8,10 @@
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBAYeNF+urDd0yQpkKNVqbQ4mKBCv3Z
-dwuuZxhBW3O+cfTJb7zhQS3Q+fPE5yjgIoJodVW99GSpnOnICPowCd5wCLWtypDI
-zmiH8Y9x4c78PNcCZp40CuNrZERzHjwWRIw5d6ldH3CxG6p2Zr89OCkWQ4S0spuO
-vyaDpxnxEkDQaiOOlLXxVOwK7k2v4/nCnVTaXUwcIULjhnEd6txDu3ulJpVraeMj
-r+DXLkNZODiV73K3w444A3bnuY/pFvXlafaOFESQPKE7gEJJV3D058bfDUZ9qnQy
-hlHlrMTbH+ptVMa4m4Ia8ebOuxvadiXI1DTc2NUEfhlxyKU1sLD7i4zG
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB83qFAuJObc3l0cOKL6NW2krNxkt/X
+ynRDZV1oVJ8Bw5vKb4PX8owP/answOwYsBK+Sy0g2+Y/JvhaI+PD/i/2MjwdP8qu
+vRXKGbbtfgKqfBonwZl1/6BNNS65Mb0Z1VLdE1Ah79afpHamppD07O7cqA+Hw2qj
+9mnoDoAiCBKDdKHDp+wLs7mUh8JSIOb0ZWkCqtED5l81KUB4T0bOI0HCuS15Zu+E
+wWCGw0w3Un0W0l6sUVIE23J1exo6qJKk9gFWl3mOOZLOCT4Rgpvwyx13PpzU4JqS
+vrxcuwwPKtEo7+smxl3DSpU/Vq0cuYbc2aS1xlCU2Vpl1VBNmao5KKAo
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/intermediate.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIUe9ala4zEws3CecubLRMUez2xnVowDQYJKoZIhvcNAQEL
+MIIDWjCCAkKgAwIBAgIUf/ZI9pFYXbeWG/5AXJ9EJIgxBtcwDQYJKoZIhvcNAQEL
 BQAwajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
-ZCBPcHRpbWl6YXRpb24wIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAw
+ZCBPcHRpbWl6YXRpb24wIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAw
 MFowQTEoMCYGA1UEAwwfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEV
 MBMGA1UECwwMSW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
@@ -11,10 +11,10 @@
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsG
-A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAJ3KXbElUMtO7THRTY8wKYzit
-cEuA1lwhO7qR7AkAjJIRcb+9qgT0gU8MesLxY1E6m5bpgWZB/pRRSaj702ahIlo/
-2cLy9rahM/dU7u792m+KT7Phd5NOAPQIEuIJZzu/ux5OFZbsCE67xKJXEQ56pxwJ
-H4fmsWaoDR8TtDBRONLsXVFy3gpfjhXOcdPEer9qmRz17pBRsB1M1ft3V4qnPJA5
-VoxlNucTsdK2fwy/KYuuujnPGEI4ERcjElOoSsxVizFlf/LrFe3ibVVxfpGKMDvO
-fsrffq2XhA2DnLYOlefJwiYS0Sz8thQN66cvdu489LMX0Lox8zFJgCvUJW01aA==
+A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAKO/vWs1AonZSTOAG+k2uA+HF
+m6clrXdQxq3cbXG/bHT1c1lMNLu8p3HYojZq4S6394iNDFBKR/EV0RIdYRVW8NOJ
+zfEFK4HIh6ReH5JBNbNqGGBbxBu1OR4UGXiTiKJh8VAPcuKhb01lAlkmmLWwE0em
+rX3YaC7syGCQX/7Il3W8Kt4xvPjTkx8UX6+SiIezaw9thUAFvynaYK+1uw3/3W31
+ObPIQke9dKhth/3+87zrmiZI95CdCpWXzsL48OJseU53HpEnA3Du0CHQYLWrAS+T
+fQIyV1qGMIXYRP0QW4eBVfVlKfACYZqRMOozR5AXIBp3ns5t3MXlyWS/0uAfJA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/invalid.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/invalid.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/invalid.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/invalid.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICwDCCAaigAwIBAgIUBSempR5thol1NoDlvv3NYndQxfkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICwDCCAaigAwIBAgIUaXqQ23/rq8JrbOwIIDACtHsydH0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHaW52YWxpZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
@@ -8,10 +8,10 @@
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4IBAQB+icBf2ZlYNAOozaxGBtv6mPa/52ML79fLwqwK
-BPlU9kXwSyu9eS9KhJVGWQ4orD6bAicMHlrQPxknzgRp60qgNmhQ/TkmCFnLROu4
-0HWHp4NP9HUR2kg2hhga5mcyLte8Q3U2sRsxaz37Aa1syXEjAPm+qF5QQCLbqnAo
-bSwqc4i7eU/mIzXaDIkdwvudhqgbj9UMYq/ONmfNEdX/BdD244Zum8EoBnFdL/77
-jGIbhJKsDN7WnEpKGWq0R40Xq0DDNms64aWzh8pyqp8Riu9qCOnl5oeetJ1ZwSEQ
-SDZM8iqwEwC1TOWZELBXSFZKrmkC8oBeuZXFYg6oucFB9eak
+MA0GCSqGSIb3DQEBCwUAA4IBAQAUtQnvaYAoyfHVMIPYiEctg/dBhiqjp1ZYUbQO
+nIuHETKtzTLUGJOSNFBIAaDcGHvJH7K4Ldp74+73EwDpGlK/wOQ4Of57pfNlYuCe
+PQ9CGRKsEGSPsE6w9EstcbnEvqZJmKFY+YEJU936KqJOA052EMBnW3dy2sXwqyX5
+zzNKSC5+3gLGn2rk0Xa1CIyZpNSGLP5Q801iO7bXXkKG5rOV0FTfR1mu39vnu/RI
+vO7BdLSbGPfdAv0io6aFLYw3kP5vSLFzUAoYHxrPokIoEM7pZtlSfECAXengcfis
+L5WYqNQ3Y+XXf02VaRhEGnyL1MMmPGVpvBwWAJnR97YSfylx
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/longOID.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/longOID.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/longOID.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/longOID.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIESjCCAzKgAwIBAgIUWSXIEYbHA8vqf112r03Nm5IN1lwwDQYJKoZIhvcNAQEL
-BQAwEzERMA8GA1UEAwwITG9uZyBPSUQwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIx
-MDIwNDAwMDAwMFowEzERMA8GA1UEAwwITG9uZyBPSUQwggEiMA0GCSqGSIb3DQEB
+MIIESjCCAzKgAwIBAgIUUUlZgo9gztazitkyNqsantBeQO4wDQYJKoZIhvcNAQEL
+BQAwEzERMA8GA1UEAwwITG9uZyBPSUQwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIy
+MDIwNTAwMDAwMFowEzERMA8GA1UEAwwITG9uZyBPSUQwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
 KZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmI
@@ -16,10 +16,10 @@
 65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/
 g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zr
 k3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D3OuTf4Pc65N/g9zrk3+D
-3OuTf4Pc65N/ATANBgkqhkiG9w0BAQsFAAOCAQEACBUoRqRlmmub+GTKlfxF//IV
-z/MDIWqgR1xZdyhIRTCYmGNCkcqq4ZSA7kqwVptfraTYioZ0W/Cuxq2yg/VgadWv
-ZK7PVNK6AWmYfYG3rGWwyCN6zKteqyryz54WTVJTdRGbRaJF5QI966LkY2nMYyWv
-KvOwyoWCC7MssAZ/XwtbLZj5ke7E5D6Eq+3uuU6aUS29lT1LVh7cQ92+TX3DXJO7
-UheBbz97ur0bkU349wt6HtV9tzkEGX0KWXckWqQD0PrAxtpfJjyyB6sx6GXWgIpq
-rhzfASqYYJD55rFnjsQyyDPQoH10znfxwX3tDIy740kV9sjWJHnP7bDjJAPadw==
+3OuTf4Pc65N/ATANBgkqhkiG9w0BAQsFAAOCAQEAcsD8I4kt/jjepOgtZMI38IB5
+wRhrnfvGvPE7/1mWkQyz2tRRdbMOrhLrWzMHjZwQtwWmEeQczPVeXHEyt9Sz+v0/
+rghH+32VAPI6fDYzj9KNBn60sNiLCBlOucegpW/Dechcf25O/xhF6G9ljU2RIbpj
+BAwTGd9gIYOpuAYGprht9d9smznPkO5qBpU7GV1SOzzhAldFYOMuYvjpgvtL7UXJ
+2FhaWxyC11Sw1aUdm8V93Mf4rs8RzizjY/4pKyl6yRarNXx7lP6qf95fWi0A3LYT
+3giV0e6NKrWjGLl1vnj8919wTzsh3OsVaAKDQNMz3I9/ENdDHMFl0WpAWjfQpg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/md5-ee.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/md5-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/md5-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/md5-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICrjCCAZagAwIBAgIUe5lVOMkAlJoPQkmZ7fbJgzf2GqQwDQYJKoZIhvcNAQEE
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICrjCCAZagAwIBAgIUCR+2dzKgSt0CBU86EgRdJIa/72owDQYJKoZIhvcNAQEE
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGbWQ1LWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,10 +8,10 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEBBAUAA4IB
-AQCYTPM+SoIBQ6eGd95zKrfbd0mvgDmLML/gkiGrgyw8Q1nyYzjlXP6WTf+5FoFg
-OxWwKYaqAa3uDoNgN5TaapxC9WQB0gE4JKbughSbNZb+MsiAYVciPlHBVkrjU4Yc
-Rus2J/J/fkx6v+PFohY99LZNi2IgUwhnt15CnWLIXb8FUlN/pjRVq8J2AKD2uj7I
-3SkBB3gQ9c7ELtvn6z22zMgAYA5uKVKyUjXKX4A67hZUoash6APIl0qQQiQKQLuw
-J8nKYo3scrQ8DXdSiF99ufjrYY+bXgV8i7EnvX+qj2CELKw3xtkqOgeBTAR2dOw0
-3LiiYKwWUydtXtRyKHRHoLze
+AQArfDtm5sEuzsPZps2oZhvrOYRViP0sRIAbAjuJVnAMA/7xLzI3LweXOlQJHBh3
+m3mrPUMAXfr4xJ5XjGySqHBUtFat9EBl/0bynd67sCMA7UOf51GC4ABOPAV0CkDj
+/FNqL/KSt8WB90FW+ZKnt1ojKikMIjmPjxDaaHj7KZVBQ2KtBEz1Igt5Bvbrp2AM
+NvjyhUCN4/z4NDPPbzkeDKYC7vmvYhN1Cs/73Jp3A0LU4z0gIyrWi6a7YEAVBzhI
+vJJ98U8AQQMm+iiIDGZMoAZyvEFouofF9te4xMHStUnYfa1jLY93dL1TuXrWvKB0
+pWg4REoQuFZUE8GS/LczW5xX
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-all-usages.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIUDQg2Gy5G9+g/H9GCUkYVM1qnf8IwDQYJKoZIhvcNAQEL
+MIIDgzCCAmugAwIBAgIUCYMVPDJVUSkrLVxErDqoXsUuy2AwDQYJKoZIhvcNAQEL
 BQAwajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
-ZCBPcHRpbWl6YXRpb24wIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAw
+ZCBPcHRpbWl6YXRpb24wIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAw
 MFowajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
 ZCBPcHRpbWl6YXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
@@ -12,10 +12,10 @@
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
 I/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQD
-AgH+MA0GCSqGSIb3DQEBCwUAA4IBAQBKtiqhwcyJShE77Uekj13k1483kc5hyNPN
-z3nDXWGA03M0IBYB6z5Fec/EuZp853N/MN1mnmHxWDsFH5C13a2aratr6bMrxaRf
-a+c2lvM023sulllKIYpLJSA67h7+qbbNv0hgQzyyE3Rjdjngh8b6ZCjm/D0GO/u6
-T8O+pzbekAWidE8TYPVP36cFzfzKxYTm7O5J2t9ilqFFw4NNHaQQt1JP+yk4B0MJ
-Gp+VBRDMMBTIZzR9AO1w85HMa/WwDs7Jj1vuxz0vjMhVfBMlgAzc5lum3Zde9mlp
-sAwLvmgPnNKL+bogu7YcE/xee9cM/lOW1AfiJlszssozcLKLz6/7
+AgH+MA0GCSqGSIb3DQEBCwUAA4IBAQBXqqT2fBXtmQaPHr86unEVaXirLmnc9qR2
+yMhrBSbZP1w6MWQDD/TWXjnjqeADqXZy1feI/yBBQDnkJa1x4IVz5oujQDuf/chQ
+vAemh7t7DhyfIZ+OQCMadSIOva06PhQuiwYXqM3Pg5MyBNp8NKP9fwSri39if4ru
+4VgSudV5yo2Z/pduJMl2zFGsu+ZbYco0AKqN4RX7Rwkp7Uf7uiizgAPVEpCrm+Ja
+EJUitKh1ejVH3SakdUfQEboQYsZl9c2S5/oKUlON4weoYctvc0zQkscRnqyuBkBJ
+RB/YMKaHcphMRfmJFbwA5Vs0AOJ5E9u/hhvhcdBL6ZTUi3uEermS
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-regular-usages.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-regular-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-regular-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/pgo-ca-regular-usages.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIUM3Lmh+4Pw8Pfiu1leYvuN3iWevEwDQYJKoZIhvcNAQEL
+MIIDgzCCAmugAwIBAgIUF5e1WSjUvqgAuz9/WyPcq+OgkOAwDQYJKoZIhvcNAQEL
 BQAwajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
-ZCBPcHRpbWl6YXRpb24wIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAw
+ZCBPcHRpbWl6YXRpb24wIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAw
 MFowajEoMCYGA1UEAxMfVGVtcG9yYXJ5IENlcnRpZmljYXRlIEF1dGhvcml0eTEY
 MBYGA1UEChMPTW96aWxsYSBUZXN0aW5nMSQwIgYDVQQLExtQcm9maWxlIEd1aWRl
 ZCBPcHRpbWl6YXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
@@ -12,10 +12,10 @@
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
 I/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQD
-AgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBzEAci/+VfRVPmd0Gc0g+1iwf2lGeGaN4o
-cvqKQQHdh6D0dqOFqXYeNsOELWKwgIRx8OX1MlvRQMH58ZB8bY1a+drIPALkIuWv
-ORWVLdNscJ+IT3wsscCWP6t3O64bBLbTonW1odcdVxez1uHBvRYZXYSc5U/D55PE
-Tf+ZU2yy6BzlJ2IftwS4M3Virny+SEE0lcBwP0m0Vz7+08K7apW2Yh/38VLukd6a
-Kv7JkcgoK/IeZXazlmG0Bxs+IpWlF239HZ4EvpZIxQBbcS68iNoqqL6OB9yycLay
-KzjejGBHyKXvtUKSEIOt84KFoEKio/cdYlv3xlfQ/LSe0AVdlJR5
+AgEGMA0GCSqGSIb3DQEBCwUAA4IBAQA2+3qj2Bme+jVFlNva/gyvL0QOg8lgDc++
+pWTDd+NMpeqwarX6z4+wjzXh9ZPKk29alBWpnhVVvD4WAOa1TSLbevTlV+viGloP
+uvZwoxn6naumwv992hJS8TJda8ZgKB5N5REdsDoD1hWeLevjWACMToSaXN+Bx8jF
+GFoh1ifj1SD4DN51sc4KkKscjcSbBwyWJUCJGsDw7H5FtSSNEfGnctdsoLCWS84z
+Jw/WUs/3hOB+MRsdqPBISlLrd5fnmL6RL7ZkDqad1Fi69GZQBDZUBmTxXhNl4VHK
+RkQZCVLg9YWDzaKDj1Q326+sSur3PvQGJBplMEOWIOz/MVs2skeT
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/revoked.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/revoked.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/revoked.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/revoked.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICrzCCAZegAwIBAgIUCT0lgWTZ8BA8bGSjgmRTIbTx1zgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICrzCCAZegAwIBAgIUJf4afZUeBhMdHovc6HjvffKmXJYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHcmV2b2tlZDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
@@ -8,10 +8,10 @@
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAQuQGrCzm2cFZy6k6I1IjVAD1/D2wt4XvuLOOepfx2LUPxpUrm5VwX1lxIEJy
-soUEGJltkBzyhiIYceaWKvBTndieZh+2I4huWRj9vocU+YQVugUvAeDPe+DLy3Oo
-mhQaqyLDfBh3Lww8Pd2dCBn/wpaSWwyZ33k16Nj0fTzZ3keh06x7ur3hthQxBh5f
-X1v7WaAMMlGKKbsQe2PgMqDhQRxFwnjlwPwdyAdq45ikf0nKCac3JUveZZbpteRy
-1Msz0x/MZtOalHDZxVGECEelGXeWaE24nRRgWnAHo7EzBgJW38iGPDgAkV8lplnB
-Mz1LXkSvNXUsVOLg6cBeQHPoGA==
+AQEAKYqs7wd9/1ufx9s+YsRsd/MBRE/figWWVI+Gha3qLnx2NI7389n9qY8ES0az
+bqNV71w8qYcn8tzlLCTLrgkhnt/rkMwXorvI+vfF+7fQeFlqFgXw46WxM4NtzLTz
+0Hdt3+QULysZdG/my/HB1mcBWPRSrSZer7s1oKRcsoNgbSvmuyIWrrUVmn/tiaKy
+kC5oOADLIoSHeGh4SvyUnP1oF3Aq5vxsykd66q/bP4MrmZinlJYNq/ybeEvrTEuA
+XrBkRkslcVE6+VS/1ieT/5aa4IUyQ7DYy8i+IyspkD0xJ6cklSNodMl55odQK67Y
+iC/MEn7uG9DJmwEH0ZN6Qxc3LA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/ssl-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIUJ+b1dlagUiATaMCXjEWEu6iT4mQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0TCCAbmgAwIBAgIUU9i1j3V1LGw7IBlKgfVezTka1I0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGc3NsLWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,11 +8,11 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyEwHzAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAEZ61jyUvbqvmzHC
-o/D9Gvx+737FJXE2gP7zfpikRP8AeEcm017vcHNy4fW4xhZ04l+3dHO7NAbD8f+C
-dU3ohbgfJ/Q4ux4qSB/ljFRkS1gGqpNehOZ2EOM6PZDdM4bkc927U6eTOTjo6vM+
-JV65OnfwvU/iyOn17iN5gzxgWZtRIG54rLnj6HBlX6R5LXKijNnN4dYabC7iK2NN
-8MXAF+MGobca4CQiHtpITyPnuSQhi/RjJt11N3OpDKZPftPcTNcQOECDA4MhF1iD
-q/5vBIF5m5WTx3qJrWYeTmI0C+b/78OHznR86v795171Uwbd0XgQm3CJJiU1dShF
-ePVZk7Y=
+BgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBACoLO/x/rat1m2td
+0FMcOoXAJiTmHIIg22yC7RgFZxkSxnp8Wr2cevTUkBhwsITD6I7T6UTkqwnaXFBt
+eeTxYuGoYx7VdefLNvAIdBKWZgtMvBr9+KHrhoFXOxL/+7oBFjFH0EP7B53aflJc
+/rVf0CUb4iwS3ebjk5wOLZhB+sk3PfuzsdSOPjpUQZSmni/hI1d+Am1Kn0Qs0COI
+0SPezVt7U5Gr0Ewc3eP2fI1I7YJbWKP/s5bd0C/aWW+tLBWxolYT3X4+S/7Bg52N
+bCxwkd5GHJZkpA/M2++kiDQVfedMsN2E7IlsXILxckQsGlODJgrSbQb9vIYP1hGm
+ryWS8kc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/unknown-issuer.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuzCCAaOgAwIBAgIUJ75LmP2YiKVKOhumWtLzN2FxsPIwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHdW5rbm93bjAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAZMRcwFQYDVQQDDA51bmtub3duLWlzc3VlcjCCASIwDQYJKoZI
+MIICuzCCAaOgAwIBAgIUI0xny6j77OiAn+msMVdsgBLMj/swDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHdW5rbm93bjAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAZMRcwFQYDVQQDDA51bmtub3duLWlzc3VlcjCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
 HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkq
-hkiG9w0BAQsFAAOCAQEADw6cp33PIo0FFaD/CRKTrnoAVtfEvR7KQMoGRiI4mKDs
-8Jlb+HoTxZhLePOQGYpztt9fCSqvKfo74jPmsL0+w4ji7xUNPoMRb5cU7FsFak94
-WVATiz6oWp+DfbeIcolscf4TSRcZMMhzcxCeVj5JQ6RWBMdGq/8QtVUSPQIhJLvo
-Iu7HRRLEtkkDAwcRZ4qGw9wlEkXCvSy2MeBcVBRW4D4mH7UTc/G7Z0qTdThKeYEP
-iuFkjwL5MXZnT1B/NoazgTZp6xNFZaAYqb+MdJcp5ogit1mACMalPLWMVvbCpHsn
-bXyRO2JT5buE8KWKPHOLs2AHeRaDnyrSncNfwRcn1A==
+hkiG9w0BAQsFAAOCAQEAP/jp5cJkeSP5DmAgvymt6zviEHmm24nHgHuLDwTPf446
+pCl4YGFSwzV44d6503AyFNOUbTg+l+2lOpG3CU3mDi+agcG+r4QEG3a01Mh9uWfB
+I60VBHfQwq4yoA7gwnhUyf5dEOgwJkerc8uZMaoVv0OlRjp89ycqkmBjHpzRUR9A
+6WzIKzA69foFI5b2UVMtUuXAZPyzPep2D35XNc1iSA4OsA5IhLJD7n7caQKoEiYv
+i6A0Ze4ZgOHU/w7Aj+DUjq8JK85cdpUksCxAnPGannRhpK90/uc+d6IyovxjCdo1
+YQCfU6R3RXWPQmhHRxrQX6LMde5sxUADtW/GDutaAQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/browser/untrusted-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUNSWXKtXV1gW0bzmf/a6HZNL3dX8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0zCCAbugAwIBAgIUA0ih/Zea7LtjFynUOzwIwcOQCjkwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMdW50cnVzdGVkLWNhMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,11 +8,11 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEABjfWUdAyo7Oq
-sDQdqRijv50jLA7zxF17SczqAEs1QYWObz4liII41hWBkBty1EYXxAfJ7iRs6wCu
-HdDyBGlJ9O4aCaGUrs3OmhxnEwsLaomPNFceMtl+NNNPx9ksl8jcUrlYC7ymE+et
-W6SKBMkpbPmcgEGwn5sm5f6Q2JeMPr2CUExQ1a5Lp2vweXO482NFw7GSbHj0ZuyB
-vmcnkxlfSi8D5bAQwIc/EDWQoMAavL9DTX9Ledx8Hc3DgQsQu5BqBaDKLMdlew9S
-FlgjpHnZ2yQi3JLyvt7qRZDi5ZaomjhkVtUM9/xQevKnRtMJhs/JX8KoIGer+Nsl
-SPjdIsxY0Q==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAb7HneKXYzHjB
+ehF6bTye2hTACi84WqaW9c2K7KrqBa+zqR+/aF5pjRdlYoSOOiAKIWzHdJZYY0sh
+fgoDFCCYuPg6Bim4AVthRxMDn07TDAkSxAV+M1P3bJLEeWx3/muTL0t98P/JXTS3
+GfmXjcWJ1E1bCMSrUclSk9Y6AKhyIOeapB0YovhvP8fWLso9RT7mv7W/xGmWohhP
+bdjjislgWouFtOWBrata/u4ifS3hsBpYESXL9D2EzdoDtgzRG0yetCLmxTogfDqm
+MeW75eQqQYiqU+VfnbvI46AvI9ihfXXzEfqVSzKkLwuYKiPa42QtU/sLNTbZeSqB
+bR9mMRqyKQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini firefox-85.0+build1/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini	2021-01-18 19:58:18.000000000 +0000
@@ -42,7 +42,6 @@
 [test_dynDelayedUnsecureXHR.html]
 [test_dynUnsecureBackground.html]
 [test_dynUnsecureIframeRedirect.html]
-skip-if = fission
 [test_dynUnsecurePicture.html]
 [test_dynUnsecurePicturePreload.html]
 [test_dynUnsecureRedirect.html]
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html firefox-85.0+build1/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html
--- firefox-84.0.2+build1/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/mochitest/stricttransportsecurity/test_sts_privatebrowsing_perwindowpb.html	2021-01-18 19:58:18.000000000 +0000
@@ -68,7 +68,7 @@
       await new Promise(resolve => whenDelayedStartupFinished(win, resolve));
 
       let browser = win.gBrowser.selectedBrowser;
-      await BrowserTestUtils.loadURI(browser, CONTENT_PAGE);
+      BrowserTestUtils.loadURI(browser, CONTENT_PAGE);
       await BrowserTestUtils.browserLoaded(browser);
 
       aCallback(win);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/badSubjectAltNames.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6DCCAdCgAwIBAgIUV9dUM4Oi02qhHgGKKFpBbo9hldgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAmMSQwIgYDVQQDDBtFRSB3aXRoIGJhZCBzdWJqZWN0QWx0TmFt
+MIIC6DCCAdCgAwIBAgIUL/mOXLOH4zs7sAoXCffwl7mbFPMwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAmMSQwIgYDVQQDDBtFRSB3aXRoIGJhZCBzdWJqZWN0QWx0TmFt
 ZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
 p0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB
@@ -9,10 +9,10 @@
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjHjAcMBoGA1UdEQQTMBGCDyouKi5leGFtcGxlLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAUw4YUt9lwZNqYFQ/p3qT49Jq3y6DxyPafKymmllHCTLtnop2
-of5moNcAE7yEiyPu4hE7X1hGLd4FNDda1bso7uEHwaCzJOFLwE4SbuHK775xPA4o
-+V0Es4UjWkF/1/EHs7pnxpqUsMKc0OXQDMPrSuKFg9qHzOC3gg7zimEc9TVkxiCb
-KpYBq4fMhb4OrHvJKVahHyAqM7+5FADITihAS46/Fr3Zr/Oba5CPRzs9lE4PWFUZ
-tyZVc8TvQBP5mm9sDHA8M6GMgRkCyhtkMyhnIg96PB8ijJMBxMdDeHy3gfViCRKv
-jwtozp6VKRVLLwohQwiKSYxoDXMp+pYBWJPQgQ==
+9w0BAQsFAAOCAQEAnyhjk+PoHjlqMAOhxlX6+Xn7x5HXzVRmOYPSHlrKtaSDF2/y
+Io1L/Ji7aMJ932MhaUNc83sFfHqGHLTHGhAe3icjuv745WdGsXzykAI+y4Z1gAH+
++0yzUJsYlNmYgn+8kaYTTI9P+HIRoqYPZ2YqshwNNSxdXnSs1jDYCg3yDsKX6DO6
+5vTET9ef5Ea6ePYZiGbwyvYA6lGz1JorrnZPD8uiQnx8CSa20YywYeZH0UGc8Jd+
+G/xRGd+T0eRMy4Xsvv4kZyiAQFPVRsYCDhrgpkeiYsWwlrgZ/LTZN7muBwsPPyy3
+fM2Y6VfVJhEjyv/nv8C44PnKaYYSK7ZWU+dpkw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/beforeEpochIssuer.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIUbWzIuT5ZmT57+qbEAM/p8KqRTHwwDQYJKoZIhvcNAQEL
+MIIDWjCCAkKgAwIBAgIUVV34jakVUF6D+5QkiXJ1kemF5q0wDQYJKoZIhvcNAQEL
 BQAwLjEsMCoGA1UEAwwjQmVmb3JlIFVOSVggRXBvY2ggVGVzdCBJbnRlcm1lZGlh
-dGUwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowODE2MDQGA1UE
+dGUwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowODE2MDQGA1UE
 AwwtVGVzdCBFbmQtZW50aXR5IHdpdGggQmVmb3JlIFVOSVggRXBvY2ggaXNzdWVy
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
@@ -11,10 +11,10 @@
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
 jQIDAQABo2IwYDAqBgNVHREEIzAhgh9iZWZvcmUtZXBvY2gtaXNzdWVyLmV4YW1w
 bGUuY29tMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2Fs
-aG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEASmbgdkyC2oj3mLaYai2u7eMm
-eTiP5QQxTYVCDhsvyEECi0+9hf+IGwu4AfXXw9Wtt0yQJzJ/86KpniX8PCDGYyPu
-LBX1XqOi0jntG3g7a2Lp5Tgo+EMuBzznRtC1hBUJRiB2ucJnEIO5/4zjkWiihMnm
-WVgwORwVDQMhfzL0T0baVykfcNg3hNjNw3GGBoaWiRBFuoH6+692XtJ0BYgCSaZN
-VJaKFcu8NFzpkxNb+fwGCBuxCoBYtFuVIqnlM9mJCjS0IEqiRQe9zLbmQ14lOFzc
-Kn/ns+rGlOX+9cBPsUsx/5NinhMUOxps5uXh5MST0+gmkFbJXW2SmLuiOpGqWw==
+aG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAhJFzxTYfWOkyMlXOowz7kFnK
+ChekuiwNJB3r0ZGwExAXmrdPKCfBz+OKsPM+3i+bNzIlJNrI2ZhKzylsAJ1mIeRF
+vvpviu5NeZ0TgT7Man5n7WSBylFgSiKymk6V529k0ZrCvVxU1BZK0kXbqYZmGVDt
+TOtkHEKP1YkNnjOs7pYZ7bslkH94oWbT2Cd+W3362o/ko6CCmkhaj2WAqSRyVEUy
++qdQndSpyvp85tRFZLb8bQkCqTtOVCLQfLHYWXRQ4qZQWy8kFPA7OpCMdXlR6Bwu
+vyYi9dw5cRXwAdbLzMpVouPBBXLbTT2b+R+vW5L/LoNGTgrnL+K8WshCSYZ+YQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ca-used-as-end-entity.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUdSb4Tkpp6srl5qI/NxQ+ZVPCoNcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
+MIIDRTCCAi2gAwIBAgIUF4tSVpnzLjrUBoa9WMfShlqrEjwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
 IEVuZC1FbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -11,10 +11,10 @@
 UcQx1QOs2hgKNe2NAgMBAAGjcjBwMAwGA1UdEwQFMAMBAf8wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMCwGA1UdEQQl
 MCOCIWNhLXVzZWQtYXMtZW5kLWVudGl0eS5leGFtcGxlLmNvbTANBgkqhkiG9w0B
-AQsFAAOCAQEArshYTGk7PXDPHaaVyqFM6yKsc8FxPWQ4ifqjj8wHyl9RoOgC8Lis
-yNUKRHZziA9TjYK2j+yNTGr7Ek0mErufm7gDw63alJ8u6ebjqJSDHvwqEOkZ78dz
-2SF6C2pTCrZ7sZnYeI53IqemwvhNqBbDKiaeQP9paS/cQ4URNg660XkkbZQTIpFM
-ViYM5SjwXEDyfIzJPo0IL2wQcBxY+4ZECNyY0cvFgXDpqtBIN4BOnw1XpNO1aaDh
-vBTU+EisYww07lwINi/uAkZ5oOeOjWhp5dWkKJDtqXAUtJaYRsqvIWCq1uVSOSo+
-ER1Hw0UBo8fpM2PLDE9CHbxqF3FnrmmSkA==
+AQsFAAOCAQEAllsGy7B4yROdLH5rmLV6Q6AxUMKk/ixwfCnkt3ibKGtoypvAG6wn
+vevqezN7BUeqIZd0QeoZBEtKwxv87oCiVDgSPXhkGqxryN9i8Zii07Sa27rCVZHd
+F/AJv7qSgl2mYPYAAcyDX5F5ecbc3i9tc96mYSUJawhgPCwNB6PGB+HUr5fSskzx
+j7Rg+0k9TEpk5bcTlsqH2hFvM9ZycEFC0/9trBVvnvh51WTHX/AzZDaaHPyOd2jD
+RxqCMwde0EfpNQmpz39WnRJqs7bf2Cdc080m/apFL9yjZOuCfNaWdezfNjWoBKNC
+S5tpZOoqNYzdV/8VAy74Nv+cXGNX4Ct7RA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/default-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/default-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDiTCCAnGgAwIBAgIUP+17Q0eKU0JbDVDhN4gqID8xFyAwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
+MIIDiTCCAnGgAwIBAgIUUwG2e1zCLPYPQc2aSZ4UsI/GiK0wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
@@ -12,10 +12,10 @@
 bm5pbmcuZXhhbXBsZS5jb22CKCouaW5jbHVkZS1zdWJkb21haW5zLnBpbm5pbmcu
 ZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5zLnBpbm5pbmcuZXhhbXBs
 ZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxo
-b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCkRiVfojVMvYWh80CcxVhS9RyR
-qWvFv4LyFxuM/izVf+c5aUHxr5JHkT8cw4kYPPnZh4M7V1ZNNI1fNOljMIByflU/
-uCHKfXQfcZiR89wjbiiLgcbhMX8MrlDVmih0Xo3eEEKklgS+WzvRgArFrDm60HFG
-fKWJpQi2Z73v5suSHG6IlJ+pIrxL29ZHcre9j+uj+m2id5UA8/WIod+D3c76civc
-xaSyVDGpkrPqwcCp/Q7GFqPpX5FYBOcYxOScfHyP+tz61zYkEEmaBuUdr+128U3V
-UXZQjYokTZndzFnWqk0pvDHXDs0VhFYRrrJwCsIBa+Ywb1vVseJh0glpNGPI
+b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCbcbjTQmzRu++LJ/R1KjA99THZ
+aRGG7u0knPs40bz+rIOAR7SllYTvZ1g5HanNG3GZ5+DExVmVtixcrqJFTV0BJsi0
+rv8XR4F3Cdict+rJ+hCSBqu6BGNWdptsaSPiSm+eL//tgjGY1zm9ln1B/OvTYA/n
+f+OV07v44pwRBUe8C9Awb2J3KMHATPciKTk0Pwmh0jXi4FN9ehG1rXZMY2daHoKq
+hzbBc8EaGzPPAyFumHd6wNqWX+/chEtT00SlcJw/lbQZnK8XvUSOhRuUeRdCM5wX
+3w+Gy4P/FrI5tePoR9606GR6plC8QZxT3+Z6lTyCHz3I05+PNXwfmZH3ABSg
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ee-from-missing-intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAeegAwIBAgIUE5W5faeTeyPhBsUTMEwJ3z4bJ2owDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUTWlzc2luZyBJbnRlcm1lZGlhdGUwIhgPMjAxODExMjcw
-MDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowJzElMCMGA1UEAwwcZWUtZnJvbS1taXNz
+MIIC/zCCAeegAwIBAgIUN/wGbPUAtIu5Cd7Ojx955mKb5Y0wDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUTWlzc2luZyBJbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgw
+MDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowJzElMCMGA1UEAwwcZWUtZnJvbS1taXNz
 aW5nLWludGVybWVkaWF0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
@@ -9,11 +9,11 @@
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
 /kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMnMCUwIwYDVR0RBBwwGoIJbG9jYWxob3N0
-gg0qLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBQ36rwltlYyvJGEhL8
-954mArAZk+ALx1i4XXFVrA4EAzvIZZDAP0LZrIHKodpBkQj0s2TwA7BNE3uq+vvE
-0BtIPMjWuMjtPLVbsX9iCWjbHYu19TSD2iTiikU93OPzAJ7Rclf7UTN+/HEIZ99k
-5Aq4xBQLOLDJbsXHB4EBYnPmpZG3ux3U/liQttH4UPzYlMwVBhClQf8GOg3gyqB8
-d0zwkVqImrl24KAt1U/JAeAtd0MvD4ateDxZZZof7XkCcz3Z2b+uQtnBc4C/mXCQ
-/CDhWmxrM1NdcbQzeM7y0yhv6tzoiB1IX62qsL/ZzlcOEiI09/8V/On5nJZWLfre
-D71D
+gg0qLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAmRFIXGwnArqj8ekdT
+bg+l3r5pkovY9UJpm5hdAvgKuTuFE3fvrfNt+TaftS90i/OlF9LcyIMzWehiJa3O
+axNeKptICjkcX6U6hF+4qvBxCpw3pD+SAsRgWugNzdFdytUxjX5cEnWMFq2MXSNc
+FRpzVJvspN/NdfoF8HYvnYszH4ReKaKF7uZKUVhu0MZ1+zSZBU9ajOyZ+Zo+AIdL
+Hhq3XsTxGcKwjEQZGaRoyKQe6bBxfejISetjsSsW+ZpFQsA1S+oUaIhHR1FzIMiG
+qyEhll/97Ub1PU3u/XNVBUcNETdHO+HERPpHkQPS8pNdZSzPR9aLY/te7iEv634D
+L4J2
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ee-imminently-distrusted.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDPjCCAiagAwIBAgIUI6NKw5F+nzRI2pAAIx/p2VKlh5AwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjArMSkwJwYDVQQDEyBJbW1pbmVudGx5IERpc3RydXN0ZWQgRW5k
+MIIDPjCCAiagAwIBAgIUIeBfVf/r/GMhsN7xxnsSiVo7hQswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjArMSkwJwYDVQQDEyBJbW1pbmVudGx5IERpc3RydXN0ZWQgRW5k
 IEVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,10 +11,10 @@
 A6zaGAo17Y0CAwEAAaNvMG0wNwYDVR0RBDAwLoIJbG9jYWxob3N0giFpbW1pbmVu
 dGx5LWRpc3RydXN0ZWQuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsG
 AQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IB
-AQCugfSiughP3R0G4CWv7dHLtwZlgjXOTZOQgePwHI3nHZdiUSw0sfN8cdNIC87R
-mj5WmaCfcwrDTWuI0egMxgagvbAzl/mHtfd7gkrDlyxkDDRvAb5ouS54HsdSEYCe
-mgK0hGBEGX+pGyE7ZAK5gRjZnr/pFFJ+5YDpysZpP+xnj9NIHSblgRzKsOQkX9qT
-5i/Fry6cQks1POyH1pSfqMsJp+9RsUBx6A8xwrmSn4ziLOCeulbavPx/699BL/SG
-YBbYS65DzBAXusICbSyZaD9dM2EdHdzozJelpoc9UrJlr2eitvp/B61Y+kUdpOcV
-pLjGhEhxMwExc1espV342FM7
+AQCmalWWhf0TDhN3e7UAbXC4mrg766FnGqrGsmbL2wm0q4IuzF9Xc4x26Y2mFaWg
+tkyv0W5YCpSwwbCI2wL6h2iWBZgz55APndydlwCDO5zrDWMx0tlaVSG6ZJiafQFk
+G3Mjky9dzmBMgAsS1L4y+rpP0Wla6WYxjtXmMOMEfLuOOhEK/8CjYru4bWSLKHxL
+baBhvXM3bMbFl/G3c6AAcLMwi+jau3NCZEXORFAoeoxskAIlyfRaqGatXcO19AZp
+5zURdW4WYMVM1DwuUTdKLR/I17xYuTnXdO9qOW6jUssGrspEpg+5Ruec0Q6kJsx3
+ZSJwMRGt69Y0hEGHDzjE3uwZ
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByNonCA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDJTCCAg2gAwIBAgIUHVkLXuBPwFmkU5mtGOGBJRsWGtowDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPVGVzdCBFbmQtZW50aXR5MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMB4xHDAaBgNVBAMME0VFIElzc3VlZCBieSBub24t
+MIIDJTCCAg2gAwIBAgIUY5v46X4dh8IilHQNDrSwO5u+Og4wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPVGVzdCBFbmQtZW50aXR5MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME0VFIElzc3VlZCBieSBub24t
 Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
 p0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB
@@ -10,10 +10,10 @@
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjWzBZMCMGA1UdEQQcMBqCCWxvY2FsaG9zdIINKi5leGFtcGxlLmNv
 bTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6
-ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAEWeVTmeCOIzKK6QneEXe5G+mFPm9B0Y
-cxdF3CvdOZeC8ZV5KCEyyQAlITrzDyFYcavlMe0en+yLV7d9l12BtmRBJGsbVCew
-ckyEDhl/JgMZydYCB67jfBsckadc7R1QCcqUJlHGHRLyGqImN9Mt9K23hkRLqABc
-/r0Hi1RfiQe/yAYQwFqfAx4XRV2APurdulPIwrneS1j5RDLZYPrNw60QNx8Caj8S
-FxafFaPiYpKF9WK3eGoQpdAwtVCpMhGyfX2f5b3Wy65CawzHKgL5pVmyrZuaoGwi
-98GRR2i57A86X3TFYDO0FRp8j0P+cAjgWcHyYQyPpAg5JZXbbnp/50k=
+ODg4OC8wDQYJKoZIhvcNAQELBQADggEBACbMjO/TTypmr3K1qgJHG4YVBzfXrj/u
+eARxTnPhbHivqP/e1wgVyHHhp/5QMBooXN9sykYwA22ZyzXRGYIXpsvfW/gx6fBT
+VVPNF5F6vt+FVtJEUZ4x101cArcWsizao5dRua1t3mE8tGiju+FIDZksF0m/UAQu
+JoNexlBnG2ooLZ8j+vwzLuo74K/VzVDktNPcNRnaF0TAaS078OYgmZfKHvkF/13z
+lyW5vCzqZLDMNnoszP95n4X9EjI+xo4kp+WfRz6c/bq6bQZdtRZAUo4vZSwxYnDm
++tH+r13KhZGekLczAgxK510RJrykZY+XrpZSBpGesSPzlwe8Ne+nkfI=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/eeIssuedByV1Cert.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6jCCAdKgAwIBAgIUN6d4UjLncE6YJgtDmcwURyaw344wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVjEgQ2VydDAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAfMR0wGwYDVQQDDBRFRSBJc3N1ZWQgYnkgVjEgQ2VydDCCASIw
+MIIC6jCCAdKgAwIBAgIUf83/oBwb560grMAqpqiLeF/len4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVjEgQ2VydDAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAfMR0wGwYDVQQDDBRFRSBJc3N1ZWQgYnkgVjEgQ2VydDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -9,10 +9,10 @@
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
 AaMnMCUwIwYDVR0RBBwwGoIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tMA0GCSqG
-SIb3DQEBCwUAA4IBAQB/zTxBQJ6xd7erfJQDzUUUMYsTo/DdIk5AoKspXI4hxgA1
-BV14XMvMlKoKuElU78aiDIrR0MwpM07TJxjdDSDxlC26pLsw0NFF8NJ03zU1+PLm
-e7+9FN3D6mQU/ItsMgcgLSQt+mZD+GnMn3XbReI1mZfGJweXbFPMx9iWAN8q9vxF
-A5D2fbmzaRu37Gg53T25HDCDzUfP91tMaDiBCvgTqzVfWyn6QWLe6MNhmhfZgRnL
-wW6SQSu4XSLuwLQzBYysoBwGEcDpXelEPbQAWLoWTXmh5/3VUls6KIclStDMm4YZ
-se4p4nv+/YxPHdHKbFiNudnj33aRA9MPvO0WBqQe
+SIb3DQEBCwUAA4IBAQCzt3ZusWZ/JxpErDDTk0/Y3DHseHv+7h4UY/wkMyGycn26
+qEDxDcAR2Xkj5b72DXt/et94b+BT0zd1lq8FFfjL29tSIdSsu+7fwO+lN8JMqGjT
+6F4u2BTjgvpAgoO7Zg9fqblE+r0YNOxlXL0EqDzsFFrz/u6PgsBWdKgEY6nWVFzg
+Pay4REzvXrJMIs0UA8mGgN6Bd9kYA7wGatLU7sa0AWtYppaTk1E+e7F2R4K26JEk
+Zo1BXuSITiYB8GKYyQU9q6HyVm38hq1TCzd8lewuLeLuTh69u7vvnMvIjeN+bjSz
+ExfzO3SZQeTHibGLf7oH2e72Fi+MN1OyTu0C6b2F
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/emptyIssuerName.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUe4NXI9vxk4Z9lyy3xy0OOXeranMwDQYJKoZIhvcNAQEL
-BQAwADAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAtMSswKQYD
+MIIC6TCCAdGgAwIBAgIUVQ7hP4Gor8gwKkSGLxvowMGx/BswDQYJKoZIhvcNAQEL
+BQAwADAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAtMSswKQYD
 VQQDDCJFbmQgZW50aXR5IHNpZ25lZCBieSBlbXB0eSBuYW1lIENBMIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVK
 tOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7N
@@ -9,10 +9,10 @@
 l62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYl
 nauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyow
 KDAmBgNVHREEHzAdghtlbXB0eWlzc3Vlcm5hbWUuZXhhbXBsZS5jb20wDQYJKoZI
-hvcNAQELBQADggEBAFI/U9XpmaAupM6H+6zsvo3LxPZGVuKzjFSfZqQRcT9RkSoc
-LQhFFwArtlYRVBifWH71WzKCYUoVU4r9Exaf9t+2PDz+1Q7IYs74OSg/YpFj96y2
-ZMf6avmgVv+8RxOq4YloMf+VrcSsEvB4aPVvhwGWY7Dpd/2xlX1SFyS1c85dC0bw
-s+45DaPYVGFEo2NT4J0q7o9aTd7wj6vUQvMR9XNh4TvO6hBAmbOzpD459EMAfdhb
-LjFDQhMUQeFrIXrQknXVD2562p4eJOXMRkGg927wP+ChHCCyQuakZpeJoyitJjok
-BRttJPj9br028Kc9q4v/PdRQSCj2wYZ/9bThEjo=
+hvcNAQELBQADggEBAC8PShkXwq0NGcZQ5nsyWwQDW0mRVL8lOyTU8O9GhHNSlwzs
+zhh1QgRmksWIXuxctIODYUlxLnQSCkUVMJjUNpXkZcnmxcgrazC+dfx9B49TQm8a
+9bvjlmZwWGtXi4fuI+mn0447GSOOBTjo5d7rHuwMZM+tZRNifXdBxFi6458xmFbP
+73+IxRc3Yl5jcCmlN+yb5D1elR9oeH2Sn6MrmNr9OEEWumTXb5Wqzb5D1gxNMV/Y
+V0h+u8QLgG3w1KJGL6u/Ahr2KnkfMMq2VuTvJ5wtjSMnA/9UJH1icJ+Ij9grvuZn
+4LbHY07qNnSr50j0Lki4rM/vrI23/T56QKwYndM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/emptyNameCA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICwTCCAamgAwIBAgIUU1bKcnA+O5RtJVHKYhN/m80+2EswDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
+MIICwTCCAamgAwIBAgIUVYzw/kKPlc6jC3ssIBL3rywd/VQwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
 qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
 WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
 rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPv
 JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
 Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
 clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB
-BjANBgkqhkiG9w0BAQsFAAOCAQEAlkov+Y3khkUChjBGz2yYmzILjm1sc/yXb162
-R8VtQqeOYXD+5ejo2OuAevtQnnXQ/QCUc0ne/ihL7p92oVhaZGCaMxpeVNHH/iDM
-3i6quXnTTsFvp0eCHYvCi7NZEt+51TUCZlz3rHnhMojJ9jLOGt/epyLWZSFHWlvm
-Ihq9daGdNAO1Nm9JMxZDIpIkAieDE7Ev5N7RpLMCmnOxcJroe+HpM/NKLSS7QLDp
-0+ej83VTdW5BRdNNmpDFlGy36KcFhARaVAfgk3enrmB7rRRCa560qZoAMn3xVHSo
-DKNBYN3d4IhbkOvZBuNf/cv1GP3KZr3jPnG1KbaXRMioYslcTw==
+BjANBgkqhkiG9w0BAQsFAAOCAQEAl6tTwSFSaEMVA8N+h/pQuCF+yG7XKBJKgETn
+y5fYobUbYrT5IOhxLotk/DmXTrNRwY7dycRz+zcbWCLypfpKK45XDHe9OXlMa5SE
+RoR++XrS6Q3xSK/Sg1LFZPcc5crNwKGWYTg+1ec4pwN71fKxi0Dk+y2UiJ6MMc1m
+z8o46kqOVQj1Ct4PiHsHQffKKAFPFnU4S49mOK8oEpn42YPMylfDd+xaSS5NEw1R
+SwUceewlaEOzfO1V6RK1EGNtfLqS4A2PHIDOtTvD6E8EMi1MLIvnXEIpduOuk0zQ
+zmC/1+oG/sadO27BdGLFkCLBQu+TYQ+j4B1n53lEV00vJ599xw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ev-test-intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDOzCCAiOgAwIBAgIUDSWRzDxlWqxdF4GBrzbP1brbdNAwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMB8xHTAbBgNVBAMMFGV2LXRlc3QtaW50ZXJtZWRpYXRlMIIBIjAN
+MIIDOzCCAiOgAwIBAgIUL6Ownjd7KeqXI1vuKoBnuMLqzpswDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMB8xHTAbBgNVBAMMFGV2LXRlc3QtaW50ZXJtZWRpYXRlMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -10,11 +10,11 @@
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 o3kwdzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBHBggrBgEFBQcBAQQ7MDkw
 NwYIKwYBBQUHMAGGK2h0dHA6Ly9sb2NhbGhvc3Q6ODg4OC9ldi10ZXN0LWludGVy
-bWVkaWF0ZS8wEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBCwUAA4IBAQAV
-0l+pcJA6s0BtMpuKGOC2KrrDD7MD+eFoyyKEs9pqEByQd7hHHWx538giW9/mu66A
-BfNJ1fx8bFECcx25Vb4uBfA4sZRkMZztLZOFtxHrSJSocpTYY8YKOWp5ZWMvGZMA
-5EjB+gQM8PmxyB8nwi3IkCgG/Chutnkm0HOGu9rgFFlBtYBRU6Rokj0OzsYFAZxB
-O5OJs5ReyL67P8C5L2RcmLdL/WrnPRU3R5tN+aGnnkjr2GIl99AAU5D6KNq1E0+K
-OlcOC5iL6uz2EvONtSzpO05YhN5GIhVyShDczKfigAW4TjU4x0vESbnQGkABy98b
-BVzslufBidIOqyHz0QLo
+bWVkaWF0ZS8wEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEBCwUAA4IBAQAJ
+gL0sq/Ak2xI3iYXPHg9ECQVPlnKRM09u7Ykj2ehg6INT9vf4XJ9Dyj8BWt0B3qtY
+y29bUl7SREVCuMgNWRu6OiflmVuwccJkNm7fYRrq9dto3sYTU1VPANq7jJ7J6S9X
+7kizD5UgV664WfA61uSfXdTb1z8NKCbQv3bO4v4mXeAPe1i2GTHN0fk1wpex1ETp
+XqaIgVULkgdl8wIPXXhbGXugogc1uXytcVPxLAqfH329qPQnSW3S71jMqGE2HxzL
+5oIbWqHJJba8YkDjk8/KC9cyk08bA5OXJ4IPxxRJfQ4+q4EPjXpKKhXdfMjsgryX
+wMwN88kEWkSl+VVy4uWk
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ev-test.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ev-test.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ev-test.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ev-test.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDQjCCAiqgAwIBAgIUCSPdcQI81TXoO7OamTyBOS8Rz98wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUZXYtdGVzdC1pbnRlcm1lZGlhdGUwIhgPMjAxODExMjcw
-MDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowEjEQMA4GA1UEAwwHZXYtdGVzdDCCASIw
+MIIDQjCCAiqgAwIBAgIUQyrN+2RfvyLlvHscTU0HNQdN9O0wDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUZXYtdGVzdC1pbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgw
+MDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowEjEQMA4GA1UEAwwHZXYtdGVzdDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -11,10 +11,10 @@
 AaN/MH0wOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8vbG9jYWxo
 b3N0Ojg4ODgvZXYtdGVzdC8wHwYDVR0gBBgwFjAUBhIrBgEEAetJhRqFGoUaAYN0
 CQEwHgYDVR0RBBcwFYITZXYtdGVzdC5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAQEAWUZ+R3z0K+zY5Z6VqeRNGgVxv7UmEAGQ64BaCItuxN/NetfA+GV2io/1
-mcxqL0xi8pXvMKoUVTluWDvGstN9J2fV6mo8ZZNe8wMAXnHEp+OAwV+GbmKkg/JC
-+g0riIWLCgCNqMN5zqm1TKb/fW9IP9bUHf30Fqf0KGjjItL22eAPrjDxjMdZZUFV
-YHRTk5rF6bwaAnM7O8vzWKdjwCP1CFnO+++F28b6EzKk6n6d14qOvBv/1APnG53W
-HwLVsE3QKFPUfnvmLLq82ASeUH4Ax71/d6Oclp4zdLMGG1hNbzq9/BU0vN3fxlSl
-+8CUyMhGwsAY+2ahuTpxUGJ7d8OcMA==
+AAOCAQEAcpJJ7FQJ8rtBQBitqPDdYgLYIuPq7kCNTwT2B2m60a8nIzc/wGtAePrN
+80x/VbLXeXOW+Pl6tzPWvja17SMzeEsakXkVZnE0qnQyfxxY69T7tKUsbGCUIIug
+Iwqdz11q2MbiWdOlZDh4o8G/dPM6FVLpKzfC6OmeUrLLmYE0Tme0+ejlZ0kVe4GZ
+CYrvCmXpIjXaF84mAWhd9LdJ42iVGusVbdTGN7xh8FACVZS80h4BKQXyYUzrPFpW
+boKOjshNrzvoTi7ihg46HMHNSAE7zdBrAieQpIZvRqCJbqk8hRvdCk6s1vj2w5hc
+NTE6HialIan5T7+ok0K5ok+ILT4Etg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/expiredissuer.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIUL1S8T7mu/hQUEuzg1HsPYGauQ3kwDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZRXhwaXJlZCBUZXN0IEludGVybWVkaWF0ZTAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAuMSwwKgYDVQQDDCNUZXN0IEVu
+MIIDQDCCAiigAwIBAgIUfTvvLki+Legnl10m+fcP7kxDp1YwDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZRXhwaXJlZCBUZXN0IEludGVybWVkaWF0ZTAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAuMSwwKgYDVQQDDCNUZXN0IEVu
 ZC1lbnRpdHkgd2l0aCBleHBpcmVkIGlzc3VlcjCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -11,10 +11,10 @@
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNcMFowJAYDVR0RBB0w
 G4IZZXhwaXJlZGlzc3Vlci5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYI
 KwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQAD
-ggEBAEa61YwOPeOnF4n1PV2abchi53U+kOs9Qm879hvqz+cK0wW8m0OUzCnIYlh3
-ugWaKeXOxrwxBgMGnwEPoeUJMQwfTfAfsh2o9KN+WXD07kOiGqDoVvylqtJ4zwiE
-tXm0rcLDCtHvs9YKahvQlBw/Dnti7A+JUsG0ON4DLzKR/EL3ETIUqQCsDwFvrN4A
-yrmKzwSwSn9KkfioId3lrAP75mS8Xka7jyxRLbVszwm/5seVyP3JexKIVyh26FcW
-2/jjzUPI+EWra4rc9T25cb7oXwbHk5PPqDcG/gsibSDtkKcXxAbTEyuvEEiqwRzl
-deUnbRg9LHszbN3fkU6K63JJtns=
+ggEBAF4T4Ye5qxMLGz/5dOgRxn/LXh717T2FKxXcWM50cShOGBU5NOjIVB5fkRS7
+uJsfgvHrT05123/ttDzVZefz2N1ZvXSxuzzJoA0DFhX/XSr4VXgLPEYHO0usDwxE
+HJq8ZmtgM4Xw39QlFU4Sw8ZA5tjOfFjdKv5Ow1ulbVVGZyk/9FsmcsSYZuPXFIvH
+DZyxrz8wFJOyrB/6Q/fOcTHeeh7bcC8YSAVtQvCFYOoKK1dJHwttpIa4/mdfsjpl
+aP+ixciWjoKNmiPTqTZy8BdDSlh+pRFJppGfNfkub55T4+5XegcQPUWkJA1w6woM
+hNZU708Mvf7u8j3XJuWlxNI8rHI=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/idn-certificate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC/TCCAeWgAwIBAgIUFWLWGsOWHrHmEoSKJ2RTZGohoNAwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOVW5rbm93biBJc3N1ZXIwIhgPMjAxODExMjcwMDAwMDBa
-GA8yMDIxMDIwNDAwMDAwMFowGjEYMBYGA1UEAwwPSUROIENlcnRpZmljYXRlMIIB
+MIIC/TCCAeWgAwIBAgIUBT+m5UYwTuABfetlYca4GEtsukAwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOVW5rbm93biBJc3N1ZXIwIhgPMjAxOTExMjgwMDAwMDBa
+GA8yMDIyMDIwNTAwMDAwMFowGjEYMBYGA1UEAwwPSUROIENlcnRpZmljYXRlMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
@@ -9,11 +9,11 @@
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABozgwNjA0BgNVHREELTArgilidWc0MTM5MDkueG4tLWh4YWpiaGVnMmF6M2Fs
-LnhuLS1qeGFscGRscDANBgkqhkiG9w0BAQsFAAOCAQEAuWaWxq0q0COomo2Zq/10
-9KF5sUnbkugFldbowB3xVx77hJHHr5QtGA68/RNrvREnPI/SAwvu9e52Mj7HLAqR
-IDxWx+tb+785KyGERd4WUumSFPDI9b9+CPwjvlHytXQYKZ16x2uphoVUIhFVouFJ
-5h6C8dxrCoI1BIMRO1xUoBQ3RAdXGBmc93K0L/DIc5n7u+y1ydHK03abY6THW28T
-rXrXE9qn1HHfUPbrJRL2kr0sFi8wfXNVd9ovE1DyQmQvnSPBTdaNdr6uTe93FE+o
-Q7u0Gd3V3m2Iore6YbBy3EDQkXLeNiTgP5NrKMfd3SWDZ+lqPQmXCZgX13KTk7QL
-mg==
+LnhuLS1qeGFscGRscDANBgkqhkiG9w0BAQsFAAOCAQEABk5q77He1tAU87VBBq2R
+E/lyg2rTNFU6oOgGUY9sWbz+RbTSxk8xjg89d6BhW8K9KFEzkTdS74sjxTKc9pMB
+jXDpKL5LzhPtBBRndtzsAaaKMfnR0r7EkxihAP7TNTkLgYBQzIyOXIAZvyDr+fnG
+J3om1g4pkt1rVFc4CtrTqSzr4Bdm7vwYWIU5ogwsF9Gpg7shShacbJam4pA6VzHE
+fl1v1bAmpCyfGiYFbDTSLLFMYiZvf03sy8MrCCxPftGqr9n6trkQfN+hzbImGJFw
+hkSt9hniJmVVglf0UVBmJTJ1Ud8rl9aoeOr9Ic2QvQ6HTvq5xzu8NECInNkzDENt
+Kw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/inadequateKeySizeEE.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtzCCAZ+gAwIBAgIUP6BUGJ3NXdYnIpM6gNB/wX/TWg0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowKTEnMCUGA1UEAwweSW5hZGVxdWF0ZSBLZXkg
+MIICtzCCAZ+gAwIBAgIUUTSENycPfy4QVpNTpBCq/pVp3nowDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowKTEnMCUGA1UEAwweSW5hZGVxdWF0ZSBLZXkg
 U2l6ZSBFbmQtRW50aXR5MIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgADSm7Ev
 uE/dzSmzpRnLZsQ7jY+L5UW6eThM5mPtA991mRYA65IHkNJTDOzlRNuZpx8FiWo+
 0gcWVTSqmQV+R8R+O8ga2m+h4S43JotQRqVSaPna18y0hdgaLhnVDU8LaFSsr217
 5p2aCDE24Vr6j1PByMhPxgdyed0OVdc2mlvdAgMBAAGjZTBjMC0GA1UdEQQmMCSC
 ImluYWRlcXVhdGUta2V5LXNpemUtZWUuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3
-DQEBCwUAA4IBAQAsDEZV5MJS3nQAgoX6EEXjacdCFhveJaDxNcBSWY0Q88KBk6ul
-8cWLmO08QsS4ANfg8c/if60PH/4wvIZrc+AzeuyyD5tUbXXr5Gd/wkKsYqTrYcDQ
-MLUruAv7OSK/FLobWKeg2BVUmkaRc0E/dllIpKJwl88p/zHTPdam0KycMCQOBvWA
-Bzxqvd2Ke/Lmm9M4XJ9a/IYem8hXCbZyqVLyvB+f4xwvHxphOoisMeVTO3JmQsh1
-bS9MuQjRpxQGwiYadZhvEgN0F2aqHf2mviXuzBkGgTu3H8MpUSss+cf4RWhhz7MD
-VSvS7QZguTo9LONJsRmaRTOKCT3TXJoTwA7d
+DQEBCwUAA4IBAQCf8g6xupfTgr6N78Zru3/XdJ9zzf8gNLNDEzncs8YipkkPEkUY
+F2yGf0bNOwqZnHMTo0D4lwaNTFFv1obY7kZd5auFt9WqI1GUWdPM7FaQS4a1oAqU
+6gWCz+tIbTJXVDrAJ+yYXntV030Qqr7i0DFvwJz5fPFk6V1192Xa2aLUDoenxv5d
+eiczsYvJMgBD6zkXSef+rSf24FgS23km6DHja89recbZ/fz09HJ5q9NDQ/EMilHf
+EJMP1Ny/73Ht6V+Q9RJdtA5PXDyOgc7WHjFY+Z2LZH51VDg1XJ49W4ClYqxB1Yg4
+4qhh6OwIoFEipevWJ2uGNwJfD9KV4jiDwUAB
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/inadequatekeyusage-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgIUAS5wVheCZxRw8aMBeOuqmB/2/BUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAvMS0wKwYDVQQDDCRJbmFkZXF1YXRlIEtleSBVc2FnZSBUZXN0
+MIIDQTCCAimgAwIBAgIUJ8CbecVvBfSdpQSAm71sCRjoCTUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRJbmFkZXF1YXRlIEtleSBVc2FnZSBUZXN0
 IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -11,10 +11,10 @@
 UcQx1QOs2hgKNe2NAgMBAAGjbjBsMAsGA1UdDwQEAwIBAjApBgNVHREEIjAggh5p
 bmFkZXF1YXRla2V5dXNhZ2UuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIG
 CCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUA
-A4IBAQB+iGk6U/gIRQeLpqSZ1b0lHpxLkQF9+nHlO1/4TJTw/T5oOEUbvM3tbRFS
-CT1LAl+g5JD6jZAhbjYspHhwyqsaP1K++jPmm7hbv0uFLWjJqedtNwP8FVtemP0I
-zMgQkrnmyTWhjYo10YXwmpmRvcZhgYhLObJBpZtt1cSqOsQZh+WxoziHUjGGro8U
-8XE/W5Q6OstN2dyZ2lr3WDFVxYhF2JoZGL7LRY6cEbWTXFnPRLsgxT+1VdaLSSpy
-vLGuFsi3MqBPsbK4pXgdG66YQizhaoTcnjJ+JkXyJaP2BlxrceAYd4He4wkPC4W6
-5ltKeTxN4ULH4anAkZDpg2jNQT+8
+A4IBAQCog4fCed4qaa2aLX7kx1l+03kSlDg9ZmnyIDR2kBsFZePto9TM6488Gaem
+m3GEHT6d/RQK1g7zG40lmYDAg33PShzxZqgCmyxzpSfc1HbFfh9w4m47JANY7Q7E
+NWDg42P64v/+Vdvxoprn594XklxYc8ci+y0NL9c79BWVEBlpyXaRwCJiKwfkcr6o
+1X/07hkbKCPi9uBR6GFPtQSJmnFRKGT4ePdRHAccqn6CExIhamCK0I/y+lsr8Atg
+ZtSrWLnXbqwYvdDyofhMWttDXPXCiWEdUq031KpQ/ENXxHi2cs7eEAtjjSZNefBv
+vX+wC4ZNznyAb8tR5Zvx3sDoasRT
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/ipAddressAsDNSNameInSAN.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0DCCAbigAwIBAgIUJ/2J7R88UnbeXHGbJs5iySGBxaIwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAUMRIwEAYDVQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEB
+MIIC0DCCAbigAwIBAgIUTfYfuzoa/9f2RQTT/c6KssuRWkkwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAUMRIwEAYDVQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
 KZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmI
 YXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7fi
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGDAWMBQGA1Ud
-EQQNMAuCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAaVEE9kBRQyFftaDQ
-xjU8g0gw90cp1CriodWEfzt8m+Lw2xSqSDp4mYY6ST6+iMX60IdX7zLyBDlQvI1V
-nF+iS8RCkF+BkCmnSED6ytm0f6HQIN3InujGWD5WDsI+332wLAlm7dUqZxyqzTGq
-kKdgldFQtiOfWPyEEUdfkhN15p/y0WKumZPZVczBK6Ex0A7j0L844egILQVfTrhr
-yLRzlK89sONx+YxdviRwezB2R0MTasNQEu9XiHRc4sqt4hXMUICUsN66oTO0lcyE
-XAEIO4KXCftd9vmE4mIuGG/tKuK1+NCotx4XKQZQvQLwxgKD9Tr+kdOYKAcVvS/K
-kdpbBA==
+EQQNMAuCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAYeN7Q1I0ihJhj2GG
+o/0XZM/WuxPJ0JaJzEWMvf4ZGYeSaxp86tyMFNUOhGaDCvHCu9ZiruHUEC1J5Z7h
+z4kSwG2h95SKLsOr5d3NDN3bGJJtzPARz8xeynFHI2f1AAiGM+ai714jNUgtVoXx
+a1U5J+Ls+xbIzNiRPRzze8shnHrqTXmHL+R4G3F9MRsLUPQs4tVubi2J8+lVRrsK
+QAFfnQp3VVGoWfDAj5OFDC9kCf6fVz9sVjTjHD2LuFCKvagOIxG62Y1qVhd5CLyJ
+HUAzeorgZuUl7QXN2RT2w5itIcpzGRbNmd5CoN7Tbm7TyuS6BIBWyjjxlWM5Ue/j
+ae8XOw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/md5signature.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/md5signature.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/md5signature.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/md5signature.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDLDCCAhSgAwIBAgIUc2YVIGqYAKQF3MkkJ8Bn3dQVJw8wDQYJKoZIhvcNAQEE
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEVuZC1lbnRpdHkgd2l0aCBNRDUg
+MIIDLDCCAhSgAwIBAgIUPbgiSgWOnRxOdlLj8dU/qbEhukQwDQYJKoZIhvcNAQEE
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEVuZC1lbnRpdHkgd2l0aCBNRDUg
 c2lnbmF0dXJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -10,10 +10,10 @@
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABo1swWTAjBgNVHREEHDAaghhtZDVzaWduYXR1cmUuZXhh
 bXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9j
-YWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBBAUAA4IBAQB7nHt891xQ8gY+ZmySzqhL
-ypJNjPmoDw9Iof3Hfegqog3PFM7Rrn/p0686ilQ5MQDdJt8iY0Y71z3Nr8RDoxU4
-SN1OM8c32bCMrx/O7JsKavdKq53fvRFM0vamvemsY1QvfP17HpdWwv7CsBi9rA39
-5zFgHTpcVC8sCvr1mjAfgtvEOM/2DMgsLM43eLpyV0+0k1asXlaUOnjNeJxpEkBN
-HwHu9Yy+lgtjnMBV5NLjCyJe5Jz97ByEKde/2QgUrffJvqQd07bU8KOhtHAct3E7
-27rbfq6f/TqEqDtUQkENI4ByRIN+fDVJ+WJYQEfdHnV7TzmfNfyhEdwKp+2VoIbd
+YWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBBAUAA4IBAQCFfTcMksF9oZhEnsAmGhLx
+u7LvPXarRynLOia8+un6Lx33ZtvItBpLHtbbPkPvlsiv7oyKspzNbk5IpKdYEQbd
+dYx6diFkEP8/xAnX8o1Jng1rbynLmVhnabRSnJfTOihGFlusN3UAVrmSZyZVAdEl
+knnKqDL+U+CSVMdEeaqBECNQOFIUL7F+uutt6jfKNuN/fpDHEz9vCfUGiuZVC7Kd
+2fVCwhDDOC7bN6rvQP3e+06uLoXGGleOM1aZjhNNdiYHvqq8veYiGLZckmkcF1a8
+XqCDuLoQDs0dVvsj4pNEyciXuk5wCuV6bgw4s4unPFMP9EBmgWQGFaW+iePqT6uS
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatchCN.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAgIUM8UFsFsuYCLIyZOWzEx2eBkWYwcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAiMSAwHgYDVQQDDBdkb2VzbnRtYXRjaC5leGFtcGxlLmNvbTCC
+MIICxDCCAaygAwIBAgIURUZJw9lGOsp7dEOmmehwl1FeaBwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdkb2VzbnRtYXRjaC5leGFtcGxlLmNvbTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAsTkHCmVLt20M64hma5QpQPftovTj9+At
-rqDcILYqmidMieKfVDHPaJmwtlhCpcqvLYyiDzLOje2yVojaHnkPo5Lcx3rGifO9
-j4PwjcIa2RB9oiCgl2w2IUlEyAp26HP6uz7ElwP6azoCsnlaiZgYomxd0kA9rO9F
-9ZnBMsk97vj28OwkEBKBZgEolwDTns2EV3E1puuR1e8YVut3jM7v+m3eeFzQZcUH
-3JQgxbuzdIvU3OnsO3miou8lFEqUNDdA+Tcgu/n4oU+jd0ZlxHwDEOqEdUfmL6C/
-fh8tt+/uAkOayc7LQ7m9y1RS9c13ssA/FzSgJM/pMcFZWmbFytmnlw==
+AwEAATANBgkqhkiG9w0BAQsFAAOCAQEABN5ha7Gn+zVm7AdnMKIIuDt5C5X3CfF7
+YKRgqPby5clFJybaYHz9msYoxgSFAyoA+nuD1KCCSbQA77rMFKVJ2mDQJh7a1tEI
+RdSDZMhgKbuA8qG3knr0Q6eBjfwDI4Gx8SIxU9BdJ3NhY9a31TQfzuhKeV+hN8FR
+9GGOO1121x29U4jih4vtt35blMZu4VLrvMAR+aapyBOTK2UzZeqYb8JTyWQrkdBT
+03nvtThsVl1SMZuyKDwCBAbenDqCknuZ/1FED7njbl9VuoEz8ApMopn0XnliM4RU
+AuyvWWF9oBY6+xLIZsDfK+shmlaH5hRUMQC25NVwOpE/VfIxdJPp6w==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatch.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatch.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatch.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatch.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIUT23OZ3bHjMXAAturSV+kqt/tf70wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAjMSEwHwYDVQQDDBhNaXNtYXRjaCBUZXN0IEVuZC1lbnRpdHkw
+MIIDQDCCAiigAwIBAgIUU/pv4TGBlwPGJxIpKC/9rJ31RaUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhNaXNtYXRjaCBUZXN0IEVuZC1lbnRpdHkw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
 9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw
@@ -11,10 +11,10 @@
 AgMBAAGjeTB3MEEGA1UdEQQ6MDiCF2RvZXNudG1hdGNoLmV4YW1wbGUuY29tgh0q
 LmFsc29kb2VzbnRtYXRjaC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYI
 KwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQAD
-ggEBAG2PGXEmIYI8AgafKHJw+UC+B5VUiYTu7/p9r5sh+CUeP7Jqrmc33QZjtfhF
-rPSyLBFUyQ9nvIpayHISOxrn90GhwGtCRqOzO79TeCnbPGUcG/5n5mAqbe9Gcp8o
-jcgXn1CpaQhyr0anmTJx/7LnmXuKd1HTv3uSvyy+qPDJXqvNp6ArZTAULtaciS66
-PT1cbDvWUz4tbr2paQBNk7chHeLC6lZfUrkgJvUxo0aU9T4KbdTlZ8YVP+JcOiO9
-k2YQuHwCxu5kMUAaYH4uDhOYSYr7g2Id2HkASh7r/OMjB1nN8EAhEdIHLKguZP/v
-4O6M0jUYwhOj0rAYmaW+TW+7ues=
+ggEBAIQ9iWQWypTHSxt73EdcGiorVJTczAisC4ar683CcwwcbonkG8c6Ca8OZZFz
+QWYZYwKO6xouFMpKYoby933dKiEwQrtyckaBKHsGlgOQWKzY4BiaCULeYg24d6S0
+rWzKOAwZgmA5eaAqHxmoIz2qefNLOED1sYFzg85jeT6vL+SeEuHFh8GOGct2RHEA
+I+EcdKgYT6/kFrHtxEkCu0QULVVk0g9PDlVeZZ8eOOMBYi1bsQq03QjKFTzUaQY2
+18iwDvWbIgh21MwTYGMDhCvEfXYXWKe+AqiMHNYDyfk2lmgxOHB48J7Akow4MiBX
+zGuf1lvgdACSETNaPq5TXniBnMI=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mismatch-untrusted.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDMTCCAhmgAwIBAgIUcdYHfT4TfM78bA1sV1RuNZjmiIIwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAtMSswKQYDVQQDDCJNaXNtYXRjaC1VbnRydXN0ZWQg
+MIIDMTCCAhmgAwIBAgIUIeL7ME9jR6UnL5tbkKtCbMzAstAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJNaXNtYXRjaC1VbnRydXN0ZWQg
 VGVzdCBFbmQtZW50aXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
@@ -10,11 +10,11 @@
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABo1owWDAiBgNVHREEGzAZghdkb2VzbnRtYXRj
 aC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6
-Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBAKVdw0y46k14rk5F
-eP1SmcEaTSAyvM28K4B/qHA+6KAMVVl+i0d5BGcQfA19f8TSPiklvDL2kbSsueaQ
-xKPlF9LeN7JoUXVvlnis7M5MOBjKU1fxBuV9SRzwAUO5g2Vg3aqeReBoemJxf7Rx
-PPTIfAExMN0xdjqb5j+0W34R0Tnx/zuOHgUg1R5YKllleosswsE40yuKlij6xRNw
-4w/mbCO40rMmhxG5havF7wTk6ms37Vgaf8/PRi3XO2qDeeA3n3c9eklyOFGD/Lut
-FE8gSt1pSDAJanbGjDp0xtZ7qSNcDiO4GW7ViB8XcNJIgxDKSNFlratl1mdjaRId
-K+18j0M=
+Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBABPy72/P12xlsoLz
+nImXr6gkVB84x2t32n9berLA5BuvB7XW3V5AnHM4cvEPw/SkWgkjb/CgKy/jE5mo
+ExTyrtneG3PcX5KgIJedKgKYPjyji01SnsT4jlWlzRND2ISC5sv/0xQovrEsgkAP
+pOLodr5WfjZhE0E0gA3TNwFW+/xDZeMwYeVuv1XwPtmto/r026VYhlQfhi7cZ0Rf
+6/sW7zBKDhAgg2Puk32w8J7eP+KxkIbAPdfeLrWU4hl4U5Srnt7tFaTaIng5YAGC
+6U3M8fEETS0YIgl1wRU77ywkIeSGX4jcRF3l5zwoexiDbSjSuJ/4lg6YItfW/Rd6
+xbzRon0=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mitm.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mitm.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/mitm.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/mitm.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC+jCCAeKgAwIBAgIUBx6fiJC9k4R33ZczPVw227Opb9UwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOVGVzdCBNSVRNIFJvb3QwIhgPMjAxODExMjcwMDAwMDBa
-GA8yMDIxMDIwNDAwMDAwMFowMDEuMCwGA1UEAwwlVGVzdCBlbmQtZW50aXR5IGlz
+MIIC+jCCAeKgAwIBAgIUS4dnYahNJmxk0T1Z0H+W8A+5tcgwDQYJKoZIhvcNAQEL
+BQAwGTEXMBUGA1UEAwwOVGVzdCBNSVRNIFJvb3QwIhgPMjAxOTExMjgwMDAwMDBa
+GA8yMDIyMDIwNTAwMDAwMFowMDEuMCwGA1UEAwwlVGVzdCBlbmQtZW50aXR5IGlz
 c3VlZCBmcm9tIE1JVE0gUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
 bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
@@ -9,10 +9,10 @@
 H6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8
 rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
 Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMfMB0wGwYDVR0RBBQwEoIQbWl0bS5l
-eGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAuZ9EuHAAHJ9VzNo35e3DU6E/
-/4LELk6Kwgw9D8m6RvDPmYcp2JNkfQNWaJe+FuPzkaVQb0gzZAyNSStfvoC5izTF
-9uSrbL2uuN08ySqAAMGpz7W+Z1eLrkpLyXiY+/dLDtXxvsPmiOS7XOwoSoByMoxe
-xS0bFK7ILzaqyOSmBH32jKSx+6QnfeNjMXx1ZAuz0MbnG6hiGL88+nzUJ/cfH9LV
-1su9aZ5fay0YNQpXaTqgnOZW6HE0tK1wW31pKPTcpEuAj60kyDtzA/rTLMepX/zR
-D5lXAj2hkRGY/PdsBvITj6o7qz66yAUWGzo0AnOhzDg5d274rLvfoXEiF504TQ==
+eGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAKNQhLbnyWK6cd8qvK8ZD/8cY
+Je/PuuCew7E76VtbQFX3/d5foJJE2sKY/SHtfvFocAQbLp68/Pydfs2CmrvFlyFa
+3rSUMJBSoFDOJ4az1Ht5iF374fnFCx61CXpxYl6b7SguWgZRd5qrstsTMw3cL+Er
+/8f88N+aOX8P92eU20S4ZyCq0aO1yOBoOpmidPGqtNTuCQa32kyi96mCDGoBrWii
+k9OQb8nrr/sORVGSIK377+/PdXyjPCPvDwYhhVEyIomYQrXXWrL6TTy5I5e1kpIs
+9zi7T7XnQbcRaHSWOwYkRGAkuKlXbq7eS3LF+PSHSzcBr5r9vYCXBZMmtBToMg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/notYetValidIssuer.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDUDCCAjigAwIBAgIUW6VXq09lDcWKIh+yvJE+GDK0RwgwDQYJKoZIhvcNAQEL
+MIIDUDCCAjigAwIBAgIUWzSKPj2hWVPCNbbwxWOZDW3/ESwwDQYJKoZIhvcNAQEL
 BQAwKjEoMCYGA1UEAwwfTm90IFlldCBWYWxpZCBUZXN0IEludGVybWVkaWF0ZTAi
-GA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjA0MTIwMAYDVQQDDClU
+GA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjA0MTIwMAYDVQQDDClU
 ZXN0IEVuZC1lbnRpdHkgd2l0aCBub3QgeWV0IHZhbGlkIGlzc3VlcjCCASIwDQYJ
 KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1
 SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+
@@ -11,10 +11,10 @@
 JZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNg
 MF4wKAYDVR0RBCEwH4Idbm90eWV0dmFsaWRpc3N1ZXIuZXhhbXBsZS5jb20wMgYI
 KwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgv
-MA0GCSqGSIb3DQEBCwUAA4IBAQAhJ1NGvcPGc+Le8m7nDKiLfsA89E4eLiURo+pa
-KgnPMPE98zfZcfuOLyAIeBV8OXmhkQCMiWFDicGrElYVtFOr+mTHZod9V+y+lIHG
-H8OvpvevPHqVemS02rTu+50p+RgOJ1xMtN5Bh2wBzZXuuifiCO49MTcq/v1IMwsM
-zmrHfQK9VjCsCOZAXvxj6KgoNdQ3kBvXz/vrenYaU84Y8amCk/4mZA72JQgZeoXd
-kTkYywOJDundf5W3eeZ0psUG1192MRp/CdrdXC/rd/A0s+lctFEVwB+kAGkGzh8w
-O3m36gnAfeabfayUELQEUvbJsqO3U9YYOv9hoprDUmHQ0TIq
+MA0GCSqGSIb3DQEBCwUAA4IBAQA6+mauWSqBTyI7KT2VVkNlmB0d0AZRnel1MMp8
+XkwBajtIMfwFiuQ5TZhIKbqPgV2tpUex4Uv5EPre2runpGWCBJNcWdQiTPPewHfK
+vWwVvSEOcsNIzo5jaJLM14JDQUgTlqjVjiIxbIAdouck6is4oFCBLbpkE3pUQCC9
+l6dzuDwmMRNEp0HEv/lDl5slubTOVrRN1G5CLEGRI9BdWk4IsJiNcvSJeVF1PhlV
+oE2/gcEcJo8gGzxwP07v6RAEf5quUCFDWbZwO9wba8vq1zVItMPHcxnM9n5vDzDa
+lognzXkxApHHzP0TJMi6PV5899iJgk+4tOJq+VrW7aIY9piS
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/noValidNames.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIUD2aUc4cCTPxa8dzVVyTODYGlZ4cwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjApMScwJQYDVQQDDB5FbmQtZW50aXR5IHdpdGggbm8gdmFsaWQg
+MIIDAzCCAeugAwIBAgIUc9BglcR5VS6X67v9lA6Nojd9gPUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjApMScwJQYDVQQDDB5FbmQtZW50aXR5IHdpdGggbm8gdmFsaWQg
 bmFtZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
@@ -9,11 +9,11 @@
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjNjA0MDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0
-cDovL2xvY2FsaG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAFQlYj7AMlmPi
-IL7UovAmyp2lTzQeAoInNPVb09N1FV4V9H039x22ulBBAK7adXBbODBbhDB0PfFH
-c0n2jfY8ytgR8lC5xz9G2JCKi0KrTwQmj4xgHVKyCGpHV5fm/ZEHgWhB0By08kLo
-rOChIGWVXGCWq38Hfnb+7ERn8JIJnuHdllixN2ecAF4OKaYcnkykqOKEgqFlMyS6
-olBclxYi+9BaNUAMFhMa/mIZAJ6wBGGMcx1nUYtd3AIJiLFF6dUytc/ulmg1rGPU
-rCEGUdzDX9imXjSaebTXwgZET8Dwcb2CZaJ37NfWvsngAEwa2FzQuLG69msShxWx
-a8KwtYQWJA==
+cDovL2xvY2FsaG9zdDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAbE3XcdHBwtBh
+Kqy2B6BDvVnYn06/rx0T+6HrWPkn5BRWwhQW3K6OBf/Mfm+F9QI73YGWSalVZPs/
+pIpfM2qvjXztkEJ0ZfZTEjo6b0Jd5gJ72XFYC0CZbRS8C81ck4f4hjegT+Fbyp3f
+hzNWHbdfo6yRIVtv3aGcfzn1K8RWy33620t+mNroaSNQoVVuO+TVGHWEp5g4vn8A
+GxUc0gx0ePNtENLpEC071aPBO4OEU/SiT1bVCp9XNCP6GSyVAl1b/VguBWn+G9pD
+m6kn0PjaNxLH9JQESIKrgHyj1s0vBizLdb4Yx+hmQVdHUESt99cmlkeJi6fBHwUU
+ekQ1Wipf1Q==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCritical.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAeegAwIBAgIUZ+4N/MsvBEXUqSPo9glzZ5tLdJ4wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAeMRwwGgYDVQQDDBNuc0NlcnRUeXBlIENyaXRpY2FsMIIBIjAN
+MIIC/zCCAeegAwIBAgIUO53hCvwCYNgrXfxkrdB945nRkCcwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNuc0NlcnRUeXBlIENyaXRpY2FsMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -9,11 +9,11 @@
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 oz0wOzAjBgNVHREEHDAagglsb2NhbGhvc3SCDSouZXhhbXBsZS5jb20wFAYJYIZI
-AYb4QgEBAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQB44nMIHF/PdNWfgwzG
-7+DBHl+ahUfGgGzdtL7aElliYb07jZw/ac8cfGjInm8zYcDs/X/Z4EaqrZurJcIY
-7pe9eixUBt0FPyENLuO4f/VkPee4BXWRPL4WN9w5Irgf/5B+FH3Au2rirhfv5xam
-sAD3hn/sv2jQwrE5z8U7jaDwINJjvWzk80SWysKSqg1vyb1bXbAMBT3Ih1JxLmPC
-1mAgCKh1dm5obEVWZygCL1r9E89MddubF4yAT+EYlsYmYaldDhEMbWWwDtEvrqWn
-yXME5PMj9NIzsrAb6Qclp7stAWityW1Ba9TNQrWxzYvMsOX+a5Fn7m4AIwhv9ggS
-exYN
+AYb4QgEBAQH/BAQDAgZAMA0GCSqGSIb3DQEBCwUAA4IBAQAk0AOu1pTYiYQ4ojdG
+1foeVBLBzCaC7jOK8FW/Ow04r5mli8saKVzC5YsPBRZreJp6nVnlBnjtmgHB4PW9
+XJcHzd46uzD7h/w8kFDpLsEgM3tTZ5oezNz82EFp9aoUvTXDrdMxBnC0S/lB2fek
+9B5XTmmooU+DPYhTYYOVXXpjPCsRlKsAncu+vTGmagHGHCsRmrv6HkbSfLUEkdCl
+dmyC9L9Fsr79RjtqPNQoLmc3zD78iH6fW2oSJnhYLGJrAJDIHuSLvVZ42puKxzMV
+ZV01nNh3vXkxCFlNoQxlz8YTHr7dSku6+DGs9yMldhCgR+c3lrvhZk6d6tcM83iA
+mqr3
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeCriticalWithExtKeyUsage.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgIUJ/1rycCKNifdsdetY7XB/epnM9AwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAvMS0wKwYDVQQDDCRuc0NlcnRUeXBlIENyaXRpY2FsIFdpdGgg
+MIIDMDCCAhigAwIBAgIUO8zMxMDLlO213zx4ekxrMaUbPiowDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRuc0NlcnRUeXBlIENyaXRpY2FsIFdpdGgg
 ZXh0S2V5VXNhZ2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -10,11 +10,11 @@
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjXTBbMCMGA1UdEQQcMBqCCWxvY2FsaG9zdIINKi5l
 eGFtcGxlLmNvbTAUBglghkgBhvhCAQEBAf8EBAMCBkAwCQYDVR0TBAIwADATBgNV
-HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAInwxq6n/jZ9ylck0
-2Rr4sYRfhMkCfnmmFHKrqAcGXEOwgrODo/4Qh3nrXIqMb9GIZUK5UT8fGNHWMIFt
-yvoP7sV2Y+EIWE8tJecXIWiMdvVuhM8Niqb9+vwoJ2h8yG8RaFkg2eDxNjSl+CsL
-VQVp7nPot77FxGhjLMs+LfGjZvIGa+FkZXW0MGWIS47H/sALdBOMI/e5xsHzAJPG
-qAs19+B//ogup5aWfEkSC1BTsnPV4ARu/ylfHtzYkLw6v+OH0q2vddN4AVPS1uEC
-HRz9tyNcEHbhgUC0ad5Uzj9joSAq4FnAx1f5x86YLfzmy4gNwVH6Z80ku8bOq1HY
-6iOubw==
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAJFaCPufuePUQLh1a
+TzJHqLoTZrAg+9L/NpGnFLpsyENIQOHiKf53KQ53oFT0lv7+g+s9qU/KKf7xu2IF
+egggCwb5VD4KeU72EgmNwDT3i7oYuyU8nq+wo9XegChNdhMz3luyoVtwAp9I2oe9
+yOb/9JOWOH0+qzIExpqCOx0GSNHVk6H9QQKIDwfPiaqmUXQA/HruHeoLI6LSI6WF
+CYyLzxoE8QKttN+1kL7e6GEWqvOExf1ZWRtvnPpt1qf5httvNq7aDZ0PID4hP4kP
+SHlJu7PmrQe9AHJULTTSCJGTEwi/ll5HInMOFltxYNfDZ+H+cTnZb5ej+xwHLfdf
+4uU4pQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/nsCertTypeNotCritical.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDADCCAeigAwIBAgIUXROhWx7ZRwJv/NRbdN/qKn6iSZYwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAiMSAwHgYDVQQDDBduc0NlcnRUeXBlIE5vdCBDcml0aWNhbDCC
+MIIDADCCAeigAwIBAgIUZ/ocY0tl1j/n07vD7m9BRpTDAUUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAiMSAwHgYDVQQDDBduc0NlcnRUeXBlIE5vdCBDcml0aWNhbDCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
@@ -9,11 +9,11 @@
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
 AwEAAaM6MDgwIwYDVR0RBBwwGoIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tMBEG
-CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEAc2bWo+DNmbW88bcg
-Q2HxJu5pNfAWPtt7HrSz6lsw+6GfMgeuVS9X3K7Jgn+hezi64vCqPoMQX//wnjBb
-YhTtv7BQAHhwv2fefMZk3ki71mXqyCOk6l+f6C/ZACETLvCjPDXujzwZuUPblx+f
-HL9BjJMMOFwDzvXZCOhju8o3Tb5UZNloVYk0D0afi5Xra+/1hAPMU4iaOZ9sAvfo
-NN9ijuuU4wfn7psA2XEHmnSAgbPfeBqc6XBiHzO9qi2F73ADibkkgwTGrlhSHuGl
-E0vo+lHiHIw49DU+abz/TxPZ96oz0WRBxK4RdBr7JlOVAeY9JSeDhgLzBIBEERsV
-DlIXPQ==
+CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAQEACDqdp7f3wMnxSwIE
+GSzvCwSBjMkV1ELElEiSYuhXzh1jQ+ke+xLmLkjYJi3E8BmTmJ3g+9jUlMFL6n1y
+b4OOdRXM3JJyCnv2EBURvonfk1hIzWqK6Fuiwfzs5YdRLeHPrUMw1trGvovQqZfY
+9qCnkgmeJL8OO9AeicCDYRhl/KMid+rHNJePhfkURKs0ww9AzrBFepAorZ5UOmDe
+8UfP4dJarEledosnoIZ6GSEwpLoQQ9ChzsdpaIAhKLIPz52l7Na/N/qUXKw2CMQv
+RnifJXwS2/DhaEjGsXGHq7rmC2tGaVJci+zamUhJdyb5iJlbsAqXQ6Ufq9jhNUoB
+4nnKNw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/other-issuer-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDfzCCAmegAwIBAgIUKZ5OCWOEuL3JPzaWPfg9GXuaFbMwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAnMSUwIwYDVQQDDBxXcm9uZyBDQSBQaW4gVGVzdCBF
+MIIDfzCCAmegAwIBAgIUbYx/Zvi5+U/zqP9O3mq26pzGgIAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAnMSUwIwYDVQQDDBxXcm9uZyBDQSBQaW4gVGVzdCBF
 bmQtRW50aXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXXGUmYJ
 n3cIKmeR8bh2w39c5TiwbErNIrHL1G+mWtoq3UHIwkmKxKOzwfYUh/QbaYlBvYCl
 HDwSAkTFhKTESDMF5ROMAQbPCL6ahidguuai6PNvI8XZgxO53683g0XazlHU1tzS
@@ -12,10 +12,10 @@
 b21haW5zLnBpbm5pbmcuZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5z
 LnBpbm5pbmcuZXhhbXBsZS5jb22CFSoucGlubmluZy5leGFtcGxlLmNvbTAyBggr
 BgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8w
-DQYJKoZIhvcNAQELBQADggEBAJyFgpD0USniub/c7M3jJaDM09kx4mA+I36vTsc+
-RQ5mk04IQ7L/J14QV8a31tGBW1Z/qY34jjwzULC6ecRoN5ufnZgvrdqiiI1+Zoux
-jBXT3wLw4OhcgZ+ZL1hDmzdI3rAfTAe+5av8CS31G1ORHXmhLVn+81Pm2eY9XsFl
-Vwf1QniZ4Qkmowzzdr2Eh0eU5fKRtykeCuVo8v50CbWxqGKWZX7CbSYqdEt5Jstt
-+l4JW14tBv1scA+OkSCubSrbJsFJx3SLDUHam0ahMVetSXofRsogyPNZ8//H357N
-vEEG6/PH4r9ZfvjyEK7ER1k3P+OGK9W3xSvwXAhQNxXrmpM=
+DQYJKoZIhvcNAQELBQADggEBAF95ssZxomk3Jj886Bqm8kDAHWR/njF15jNyLnVQ
+JOTQcbOItFbgftUOuY4aN3MQ2q+LzuDwsalcsm7vvmOXf/tp4LWjGKrFOdIkO0XG
+/yUZy5xBJgSnIKuDUtES3hrl2X6LllZBhLiKBiKuFqudYo8LG1JeyLdxDpCKoDZh
+dyDK3XQ42oqJz9GOXBIZiwl4x8AmaLSE3o+CRYwNxwNOpdqRWeSwlETC46LEdtSo
+0StD9MEu+onWbizWCsCB8p6ILvvPr1JJGI6GcR1sPtr2qTkT5veXWXBTZYuqW2Cl
+gs288iz7Kbbq1ABu9ZCQ6SzpyA+LAIadtkHeDc4p87KcjQc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/self-signed-EE-with-cA-true.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDeTCCAmGgAwIBAgIUOUcfyx7nQL/rxEkAvWsNJ91qb44wDQYJKoZIhvcNAQEL
+MIIDeTCCAmGgAwIBAgIUXSAD8MMxkJHsAS4PFETbUKRZyQ0wDQYJKoZIhvcNAQEL
 BQAwMzExMC8GA1UEAwwoVGVzdCBTZWxmLXNpZ25lZCBFbmQtZW50aXR5IHdpdGgg
-Q0EgdHJ1ZTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAzMTEw
+Q0EgdHJ1ZTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAzMTEw
 LwYDVQQDDChUZXN0IFNlbGYtc2lnbmVkIEVuZC1lbnRpdHkgd2l0aCBDQSB0cnVl
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
@@ -12,10 +12,10 @@
 jQIDAQABo4GAMH4wDAYDVR0TBAUwAwEB/zAyBggrBgEFBQcBAQQmMCQwIgYIKwYB
 BQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wOgYDVR0RBDMwMYIvc2VsZi1z
 aWduZWQtZW5kLWVudGl0eS13aXRoLWNBLXRydWUuZXhhbXBsZS5jb20wDQYJKoZI
-hvcNAQELBQADggEBALakmtyTL0f5fEPV7UCf2rzqTyuOgp23QpQ0LkiOVNazIYXS
-NNlLGbfOZl9cIE+tYl/Z24QxUdDgT7rrmqq0I/eClzm2LWimNZF0fXOJDCMNcez0
-ihWlSSJXVrCG0O9KZol/XIGiTLPQ7YmMXRImO+fvZNGO7jhMQSC0fzKN9q1dQTSo
-rj/FJ/MIH8sWYFXikyyhJxRsB1I26ehMXR4GFpLzI7NbHHf7tytPG9hnYrS12un7
-wM7Djq5b2uw5xYse+/bujXU2enhhAf4Z7kCUP13sl/TA8G6mlxXmdBwkzuPCqzp3
-PMPL56XPJ9bRUdKXbcaqw6X8nLf8neo8Dk6NVvE=
+hvcNAQELBQADggEBAGSgc1erifMbfX4bRpm4+jylXmCnAnBbdxrQKtSDpMMGZV//
+a66yGUEHRQ0SGNWo042NlLvQ52Z5OlS2eocrlny+eKCi7n4mVCjwKKRjZ9zfQU9r
+wbKozCA75PTkdYI1GforX4dkWhCCIMRKPDQv/zoI9bikJuMd+fadAjbLUeEiwkOM
+xmmDJ5wikGlj0U56+mu+8FN2A9NDDJHRAJd9YoD68cSb/IZSoOUVVsVGokLextDo
+/IxkvhignOEko5NWQOu2m6TbiqWzMlvwZZ1FcshgGuilrHpXPPmsbpILtzx3pG8Y
+E/PNSVRHKre5sPAEGPkt5q6l9WWUjgmXYnclKuY=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned-inadequateEKU.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDhzCCAm+gAwIBAgIUH1vI8gZSMRRcdSeGxsll4e0XiDMwDQYJKoZIhvcNAQEL
+MIIDhzCCAm+gAwIBAgIUf+URCTKBiuOZl+FIY/BdYQHsrx8wDQYJKoZIhvcNAQEL
 BQAwNTEzMDEGA1UEAwwqU2VsZi1zaWduZWQgSW5hZGVxdWF0ZSBFS1UgVGVzdCBF
-bmQtZW50aXR5MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMDUx
+bmQtZW50aXR5MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMDUx
 MzAxBgNVBAMMKlNlbGYtc2lnbmVkIEluYWRlcXVhdGUgRUtVIFRlc3QgRW5kLWVu
 dGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1u
 togGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6
@@ -12,10 +12,10 @@
 GAo17Y0CAwEAAaOBijCBhzALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUH
 AwEwLwYDVR0RBCgwJoIkc2VsZnNpZ25lZC1pbmFkZXF1YXRlRUtVLmV4YW1wbGUu
 Y29tMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2FsaG9z
-dDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAAliKxO5mIZk6xWFoOQoF5AzAduYp
-ZWIQk9anLR31lYfOpnRadmLr6w1OY/NmVmIxL6NwBv4jM6Px01fh1mvVrQFqBY1j
-y5QFJIHI38KUdln1yEbpWTmsaRD8QLqjNdlyJ9y8K46cDvHBi0N5lL/BfvD96MQM
-Pp4kwr6f6e8lTNM9wWf5jRxAWmocaeybJzx8ev+BlgInAxB8MLvqXArEDOgbtO+x
-3Uo4bTm/MCirozydj57c96oIG7aZAGQxrFQEBY7jIB7Wvf1AtLy175na79QqhmPW
-M8AsfnRafsos6nzyjBbGW65fGuHekk7TQw5Bq4FHp5mbht+ZU/3+Bzcrqg==
+dDo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAeotRluVjBUDHNaKs8g5VCS5keHXt
+nZMRxjAY0P6IqKdlfx3MUR8MbGHpHK1/f+3nzkKUTwemJXpUmsuPTTxOQwN5maSd
+0ekOG/Ycdpy3QF6vT0SFlv3AZDmYIAo13qt3mmpFYkaeMbBqXURZzBsdxzNF5IJ9
+bN9BlQzGj7VKd7bAWXAo8HMeR83OzwANONXoMSolT6JN5NX/JRd79Iyl7Vc3WBRy
+XDRlr74y5/YvETbQjDBOqi5+vWdceHmX3GekexXqtfnO/oX1hhupnMC+Mzjr3Awi
+euQP2QHwdxy0TQg5h8elCLOcYkpAF1IASZ6VFqWpSa/Sobu9hc5laau5TA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/selfsigned.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDNzCCAh+gAwIBAgIUPeX9JSFIlsh26Hp1HrGvyGYtgrUwDQYJKoZIhvcNAQEL
+MIIDNzCCAh+gAwIBAgIUR1TNNr+Uv6ZR4ml0F8x6mwwA/lEwDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbU2VsZi1zaWduZWQgVGVzdCBFbmQtZW50aXR5MCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCYxJDAiBgNVBAMMG1NlbGYt
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCYxJDAiBgNVBAMMG1NlbGYt
 c2lnbmVkIFRlc3QgRW5kLWVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72x
 nAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lM
@@ -10,11 +10,11 @@
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNZMFcwIQYDVR0RBBowGIIWc2Vs
 ZnNpZ25lZC5leGFtcGxlLmNvbTAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGG
-Fmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBABDeeGyd
-R+k3CVePFdaoKwu6YSupY2pZ2Q61mtnefTsX3tEGSFqGIEeNfi8FjVg0OUI+NWpQ
-S9wyz5kzjfn2LygX44sqMiRbeYH5yQUJSiFDh0satS/E3tcv2FUqas1aT1vLecsE
-xacLcG7RP0Wct6/CtWrOxEuzncl9a8tfF7N3BDzZhdSsa3YujZcWsKABZLpXxXJo
-gVEO3YzR06Kf+y8OOogMKgpBJfzI9BS4azHalKY/P4Q1fbUJEnfJ4CHKspN4I//K
-XzMsQqS+keYxPuHfoU+I8BzBx2Mxc8czmwI1AuO1hptzQ4wf9nfMBMVUBeXGABBf
-LvirVoTOcZ2YP4U=
+Fmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZIhvcNAQELBQADggEBADbaX7tZ
+XI5N3VzxZ3TUQ07croUVJj7DcduwDS1m2fc2w+Lub1odVm38RQGxvIROyfNdQA2q
+Djb5QyKYTnQgfFNR+rOFdDT22pRWzHQ/jqtNUzaxwrO4vGKTlISRrZBRkxde6c8m
+7Z5MDu6MyDkfJyFcm5oZX4L84wDTeALRAizR2c6dHT3CxVSqoCVK1hBLe7H5gy7R
+nwL6OSFy0FCnibqJwoeSFQbbga9nYsmIm165+r/4qQRrdhrRVZXtZmMmrauua86r
+nRqr5ZZWGV3kM3M5mlLiH7UYgYuC2i4XwxGoxuOX7ekX6ro3/grctareAzgsNWzv
+8skVQ1O9v6l22b0=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/test-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/test-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/test-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/test-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUHTx9c2saZsiwlWK1j3QKwpK0qtgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
+MIIC0zCCAbugAwIBAgIUZekW+kmMLmUyacMUQAExM6vEFpswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAh14uCtSQeGoT
-K6KlavS8/SRGpY6kcjNjNCUxeeDgMhnpCTohl5uYb9+jbE9j/hyihukC0h6cBJG3
-APzQdUk4ToXNySeX0sQ/KREsGq5qVwiTNcN4KXGdg9CGvm9tNygU/mg5/eQ/TXL9
-NA/O/UsbJNJ6AlEptEARt0wo4N/8Idt/k+7KE/NwJcoekI/TXAwLXRfG4wYBS6gT
-r08t8vllasBCx51rUlVutKdSu20tA3sL1oRqsLdykJQnZscJhRLIaF7/5y67idhR
-FaVI0f+tisDnBcP2gWWoV5stfuWrwrD5vXw26CU6RioUCBxaiQGP+R+gma3uZ2kP
-jEsvAfNHhQ==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAoabyPFisrr0c
+kmPrDCY8pyDZ6ScxE/ziG+5RG4yJzW0QLrnt6rusMdKuxwaLiTISsNI14vh9QQyG
+XQsVeiGNGIwyJ9k2ZbLvw6pjdUeaswkthSqUDYwYgCljBwViuFkK4SAwya0Vb0p8
+pErDX8pzSF78inMB/7f0+DPdEQgtAGPYfB0gMRWOliyJSVoJXTgJ2B6PTMMvIcIO
+OXcqjDvVYY4o9+YtsDfmzGOSa/YmbM4hO6lv/cO3zv3aT+szyQK8X44koSkvct2P
+QL4cY3/incY0l0I12PaScOJDuvITiRNca7gxbUiT2jz1eqzGPIyVS6ku2cO0v9tP
+TIiD5XDdFg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/unknownissuer.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIUUXXmYtAniOvR6Ryv5qDjvij0ruwwDQYJKoZIhvcNAQEL
+MIIDqTCCApGgAwIBAgIUexjAmwfKg8l4RNHPND1Dh+75sXEwDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbVGVzdCBJbnRlcm1lZGlhdGUgdG8gZGVsZXRlMCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMC4xLDAqBgNVBAMMI1Rlc3Qg
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMC4xLDAqBgNVBAMMI1Rlc3Qg
 RW5kLWVudGl0eSBmcm9tIHVua25vd24gaXNzdWVyMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -13,10 +13,10 @@
 ci5pbmNsdWRlLXN1YmRvbWFpbnMucGlubmluZy5leGFtcGxlLmNvbYIrdW5rbm93
 bmlzc3Vlci50ZXN0LW1vZGUucGlubmluZy5leGFtcGxlLmNvbTAyBggrBgEFBQcB
 AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9sb2NhbGhvc3Q6ODg4OC8wDQYJKoZI
-hvcNAQELBQADggEBAJVNIw+Tc+ICt6+qyTfDxDTcpUCJOJh6sxzPgjXjXuE65teU
-ecaaZbZFR0gXhd6olH4WKEOi15vf4QWTaeEZlwnYdfT9/C47+K6eAR79IFKnnE4C
-y/tmmIipneLUG8uTpJBmdPcvXWPM/tXbADbOsxrWLEh7hhWGZ4dlUlLieAP2e8Wt
-3oQOMqe9y3/qqDbQBxc2d2jWc016MYIOLiEM8B+7NCTNhwWEA/Ftnbwadr5PVb1U
-FHE1ntvBLNDzlVxPeUG2iDyR70JNmL+vFelxAWskz9e4WryT5umP5nk2G1wRpEWS
-YDGhXlaVCUOpiXofF1eWjq2E4jym/hY4UL+yTeo=
+hvcNAQELBQADggEBABITeIp7PtTCDIpSYqXqkf8cibmOkSHPDxBmHxR463rGXNiD
+ZGT3ATksVoKh/HugKxb8FC6e2oEszN3bVARypjkMFEmqD2LkC5SIU5KmvU0+E4Eq
+cjlvh7rDf0KED3aYXro3QUbmUKg12owyn0xzMqdwlvD6cWT2R6bBC0g6LN11BiLq
+/BSMGU+p62LEjhqZjxzBNflGnj5lY9BCIelZ9rhO5WhIFURqZANXKw+MKAwTREl3
+AD1TmJztLABQukbGnYYplmn/COnzPDo//3mTCtYZlg158srgsDMNINfEvPcA2ZsS
+Yg/nywbaXMCMyNiSUJJWf8Z/gDX8sfDbD7k/ets=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/untrustedissuer.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIUe9VqldXJxvHoE8k3q7gyp0+EQmAwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAwMS4wLAYDVQQDDCVUZXN0IEVuZC1lbnRpdHkgd2l0
+MIIDODCCAiCgAwIBAgIUM0gXawDCbh+O00f2TLkI3uS0aRswDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNT3RoZXIgdGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVUZXN0IEVuZC1lbnRpdHkgd2l0
 aCB1bnRydXN0ZWQgaXNzdWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptu
 Gobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO
@@ -10,11 +10,11 @@
 HSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcx
 uLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo14wXDAmBgNVHREEHzAdght1bnRydXN0
 ZWRpc3N1ZXIuZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAB
-hhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQAwVwuz
-kNMBLv/dCNYg0NSvDZ2cUnbTfKxbyQL/RTc9/EoTQItuoHjMRebEMI05/WWC1+B4
-nGE7BiX+pVELkNCn18Y19hQK2M7+nsHVdDGtXno9SgS5uhG/rC+0eJZy6ek+TIWo
-3msy4hFWGeX/lUfPxujqPHtMPG1my1jDSt+I7NBEW2sk83E90Sq2IlMEM8U/+7hd
-2+fby5gYB+0BhvVI3Racw1aihCttP/eXj59Ri699sppw8pPXBHsfh+0DumAArZAD
-3mpLLjpET4+ZlmANgFmnUN4WADGqB0DneqaMRy9SAGvh6i2D8jCPuubxBJ2mQTLe
-mJqc1DjxzFCJPtNy
+hhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCoqxjz
+UdEXTpLlinCBiDl0BM5qRYcWRM7YKaUAVfX0Wn7Csuk67PQS0armkRUQYJqY8Q1a
+/ChTD44Y9dtoe50gIIlWhXfOrVEWQHu36NQZx4uosrFXHmL96EmH4tznvWVydzh8
+4z7NQQ2rg9buiyY5zEyne2S2xDADvnYk/uszUv4AQ2+zQA2oARH3S9OO9VtFy1ZF
+wfkt12IGRnv7kptP6YdAbZqCHfXWVc2Dg8lS0OwGxtpRU9bYJZt7ojlIOmUSJjQs
+6iXqCUvax1KAWGNosVUlOgU0lEpyG94NkChiwgRgTpUEdnabnme0DYuhhm/suQEZ
+/1Tb6W2ER3oiR1I+
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/bad_certs/v1Cert.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICrzCCAZcCFBl5kfT++ZgAyo3nygUXipxD/6TJMA0GCSqGSIb3DQEBCwUAMBIx
-EDAOBgNVBAMMB1Rlc3QgQ0EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICrzCCAZcCFAOC1GLXYEEbe03otHMT9P0Sz1UpMA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB1Rlc3QgQ0EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEjEQMA4GA1UEAwwHVjEgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
@@ -8,10 +8,10 @@
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAlDiE5n1kTO3Yuo7zeQZXuZm7eHG/vRXQTV6uO5wqyzuuIev8SDXfkH05L+UW
-kJCJ7o0vUz6KOV43MNd30qfZOKiknUtcOFIi2WegGMimLj2u/ttUPaNZ2aAKN9uL
-PYIF7XmJ3Jd8/Dskhj9V04hXTp65afoHZIm3sdd/EtdVk32vf83oFXFoSpX6A5bM
-Kq+UZLTlm/kWDieMLWpgG0imXR8ZIMYoy3/NRcV7AN6VJqk54j4PaIpgJQgpnihG
-nAgmZfHINCz0ie3vZdjQ/U+QWYcDy1FRNGzNA3ny36mBYCwVq6NQ8bxHd7XrDbye
-I3eVQsSsSJUaS0E4qYL/9MbFeg==
+AQEAPfp2lSeHPS2M1Snc9ZMJ39bNbpLT3dJpbUFZ8lz3eh3NZEhDNig1ZgINC0Z4
+pwzAmt5Jurq6cHjr4akF+7I3LMmG6mdVrmcQY88ArkfC/PhYvh9eswhzq7C1y7nX
+KLFP30U5h9R8Y4+6XEyz+yB9z3Yyf8Pq7a9qWDdPNE9faHU628h74FFu0y+EvSD+
+4CU0Zte8w2+OBracUPne52Gi196rcO0Ic+H0d0PCSgC+KqkTbQjynqpgkGif3W54
+yXflu6sBODd6Xil7qjlw9Bky5VNyLDuKOH+nz+15U3gMfPHm+mJjWXhBjqSyD743
+72mMwbtT7ze7kCeAER4p/a2JZg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/head_psm.js firefox-85.0+build1/security/manager/ssl/tests/unit/head_psm.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/head_psm.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/head_psm.js	2021-01-18 19:58:18.000000000 +0000
@@ -80,6 +80,11 @@
 const SSL_ERROR_WEAK_SERVER_CERT_KEY = SSL_ERROR_BASE + 132;
 const SSL_ERROR_DC_INVALID_KEY_USAGE = SSL_ERROR_BASE + 184;
 
+const SSL_ERROR_ECH_RETRY_WITH_ECH = SSL_ERROR_BASE + 188;
+const SSL_ERROR_ECH_RETRY_WITHOUT_ECH = SSL_ERROR_BASE + 189;
+const SSL_ERROR_ECH_FAILED = SSL_ERROR_BASE + 190;
+const SSL_ERROR_ECH_REQUIRED_ALERT = SSL_ERROR_BASE + 191;
+
 const MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE = MOZILLA_PKIX_ERROR_BASE + 0;
 const MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY =
   MOZILLA_PKIX_ERROR_BASE + 1;
@@ -471,6 +476,11 @@
  *   The origin attributes that the socket transport will have. This parameter
  *   affects OCSP because OCSP cache is double-keyed by origin attributes' first
  *   party domain.
+ *
+ * @param {OriginAttributes} aEchConfig (optional)
+ *   A Base64-encoded ECHConfig. If non-empty, it will be configured to the client
+ *   socket resulting in an Encrypted Client Hello extension being sent. The client
+ *   keypair is ephermeral and generated within NSS.
  */
 function add_connection_test(
   aHost,
@@ -478,7 +488,8 @@
   aBeforeConnect,
   aWithSecurityInfo,
   aAfterStreamOpen,
-  /* optional */ aOriginAttributes
+  /* optional */ aOriginAttributes,
+  /* optional */ aEchConfig
 ) {
   add_test(function() {
     if (aBeforeConnect) {
@@ -489,7 +500,8 @@
       aExpectedResult,
       aWithSecurityInfo,
       aAfterStreamOpen,
-      aOriginAttributes
+      aOriginAttributes,
+      aEchConfig
     ).then(run_next_test);
   });
 }
@@ -499,7 +511,8 @@
   aExpectedResult,
   /* optional */ aWithSecurityInfo = undefined,
   /* optional */ aAfterStreamOpen = undefined,
-  /* optional */ aOriginAttributes = undefined
+  /* optional */ aOriginAttributes = undefined,
+  /* optional */ aEchConfig = undefined
 ) {
   const REMOTE_PORT = 8443;
 
@@ -511,6 +524,9 @@
       Ci.nsISocketTransportService
     );
     this.transport = sts.createTransport(["ssl"], host, REMOTE_PORT, null);
+    if (aEchConfig) {
+      this.transport.setEchConfig(atob(aEchConfig));
+    }
     // See bug 1129771 - attempting to connect to [::1] when the server is
     // listening on 127.0.0.1 causes frequent failures on OS X 10.10.
     this.transport.connectionFlags |= Ci.nsISocketTransport.DISABLE_IPV6;
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/moz.build firefox-85.0+build1/security/manager/ssl/tests/unit/moz.build
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/moz.build	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -25,6 +25,7 @@
     "test_content_signing",
     "test_ct",
     "test_delegated_credentials",
+    "test_encrypted_client_hello",
     "test_ev_certs",
     "test_intermediate_basic_usage_constraints",
     "test_intermediate_preloads",
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ca-used-as-end-entity.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUdSb4Tkpp6srl5qI/NxQ+ZVPCoNcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
+MIIDRTCCAi2gAwIBAgIUF4tSVpnzLjrUBoa9WMfShlqrEjwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAvMS0wKwYDVQQDDCRUZXN0IEludGVybWVkaWF0ZSB1c2VkIGFz
 IEVuZC1FbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -11,10 +11,10 @@
 UcQx1QOs2hgKNe2NAgMBAAGjcjBwMAwGA1UdEwQFMAMBAf8wMgYIKwYBBQUHAQEE
 JjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMCwGA1UdEQQl
 MCOCIWNhLXVzZWQtYXMtZW5kLWVudGl0eS5leGFtcGxlLmNvbTANBgkqhkiG9w0B
-AQsFAAOCAQEArshYTGk7PXDPHaaVyqFM6yKsc8FxPWQ4ifqjj8wHyl9RoOgC8Lis
-yNUKRHZziA9TjYK2j+yNTGr7Ek0mErufm7gDw63alJ8u6ebjqJSDHvwqEOkZ78dz
-2SF6C2pTCrZ7sZnYeI53IqemwvhNqBbDKiaeQP9paS/cQ4URNg660XkkbZQTIpFM
-ViYM5SjwXEDyfIzJPo0IL2wQcBxY+4ZECNyY0cvFgXDpqtBIN4BOnw1XpNO1aaDh
-vBTU+EisYww07lwINi/uAkZ5oOeOjWhp5dWkKJDtqXAUtJaYRsqvIWCq1uVSOSo+
-ER1Hw0UBo8fpM2PLDE9CHbxqF3FnrmmSkA==
+AQsFAAOCAQEAllsGy7B4yROdLH5rmLV6Q6AxUMKk/ixwfCnkt3ibKGtoypvAG6wn
+vevqezN7BUeqIZd0QeoZBEtKwxv87oCiVDgSPXhkGqxryN9i8Zii07Sa27rCVZHd
+F/AJv7qSgl2mYPYAAcyDX5F5ecbc3i9tc96mYSUJawhgPCwNB6PGB+HUr5fSskzx
+j7Rg+0k9TEpk5bcTlsqH2hFvM9ZycEFC0/9trBVvnvh51WTHX/AzZDaaHPyOd2jD
+RxqCMwde0EfpNQmpz39WnRJqs7bf2Cdc080m/apFL9yjZOuCfNaWdezfNjWoBKNC
+S5tpZOoqNYzdV/8VAy74Nv+cXGNX4Ct7RA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/default-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDiTCCAnGgAwIBAgIUP+17Q0eKU0JbDVDhN4gqID8xFyAwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
+MIIDiTCCAnGgAwIBAgIUUwG2e1zCLPYPQc2aSZ4UsI/GiK0wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
@@ -12,10 +12,10 @@
 bm5pbmcuZXhhbXBsZS5jb22CKCouaW5jbHVkZS1zdWJkb21haW5zLnBpbm5pbmcu
 ZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5zLnBpbm5pbmcuZXhhbXBs
 ZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxo
-b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCkRiVfojVMvYWh80CcxVhS9RyR
-qWvFv4LyFxuM/izVf+c5aUHxr5JHkT8cw4kYPPnZh4M7V1ZNNI1fNOljMIByflU/
-uCHKfXQfcZiR89wjbiiLgcbhMX8MrlDVmih0Xo3eEEKklgS+WzvRgArFrDm60HFG
-fKWJpQi2Z73v5suSHG6IlJ+pIrxL29ZHcre9j+uj+m2id5UA8/WIod+D3c76civc
-xaSyVDGpkrPqwcCp/Q7GFqPpX5FYBOcYxOScfHyP+tz61zYkEEmaBuUdr+128U3V
-UXZQjYokTZndzFnWqk0pvDHXDs0VhFYRrrJwCsIBa+Ywb1vVseJh0glpNGPI
+b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCbcbjTQmzRu++LJ/R1KjA99THZ
+aRGG7u0knPs40bz+rIOAR7SllYTvZ1g5HanNG3GZ5+DExVmVtixcrqJFTV0BJsi0
+rv8XR4F3Cdict+rJ+hCSBqu6BGNWdptsaSPiSm+eL//tgjGY1zm9ln1B/OvTYA/n
+f+OV07v44pwRBUe8C9Awb2J3KMHATPciKTk0Pwmh0jXi4FN9ehG1rXZMY2daHoKq
+hzbBc8EaGzPPAyFumHd6wNqWX+/chEtT00SlcJw/lbQZnK8XvUSOhRuUeRdCM5wX
+3w+Gy4P/FrI5tePoR9606GR6plC8QZxT3+Z6lTyCHz3I05+PNXwfmZH3ABSg
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSHA1Signer.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC4zCCAcugAwIBAgIUJxH0DvJb0cPXnT5K/J6ljqbvrK4wDQYJKoZIhvcNAQEF
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAoMSYwJAYDVQQDDB1UZXN0IFNIQTEgRGVsZWdhdGVkIFJlc3Bv
+MIIC4zCCAcugAwIBAgIUE031neMThT1B9azoKkIDscqx+88wDQYJKoZIhvcNAQEF
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAoMSYwJAYDVQQDDB1UZXN0IFNIQTEgRGVsZWdhdGVkIFJlc3Bv
 bmRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMF1xlJmCZ93CCpn
 kfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJisSjs8H2FIf0G2mJQb2ApRw8EgJE
 xYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF2YMTud+vN4NF2s5R1Nbc0qbLPMcG
@@ -9,10 +9,10 @@
 R5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzSg3UTH5MrEozihvp9JRwGKtJ+8Bbx
 h83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0YxMC4xo/DdIRXMkrX3obmVS8dHhkd
 cSFo07sCAwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
-BQADggEBAJMvxvC2kcRaf6FXST6Z97YAmzyKmJOBUPCAl/iJwK2klvp+uTT1Vepx
-TtsRnIiUGyR7RnlIUjX/9xMWjt47rwFPdMrsBwlDvt8tnefKTYeE5WANOQbsbqLT
-wvlHTuWMrE0Sj61e1BLHOizEGIC7DvICZjeASBlFcLdODxsTleep1feFRZuJypkC
-RdT9P4owBkkIfNklc85hEgz/pEuPH9XfWWPk3y2SHY+np0CRdKv32UX7aCsh8Qwe
-70zNKtXWUNsx7ikTnakErF1b/UdyvKqybiepebbCi5sWnuwO4vgNbjnkV50ifee/
-FEWNFBPpGDVbRrivW0ktQ0uj4dbM48Q=
+BQADggEBAI2xNUwZgoTpe439ouS6dI/8JRgWKTq9pzZdW5v7a0Tlwx7KUmoZ6mlZ
+xgvCVlk/6zIXT+eN0l79YDzWGzqjLpsFPuxPuczb1KraEFBteHwm/lrUpij2cnYD
+yOUNgCpIpUfR0UO5AOzAs1yHeMb/5YkfFl+4xU6rY6QL0RaI5n9rFbaPbXE0cNGg
+ORxg8K6/JwlwsfXg0pT/5KtcWEvdo2YVU5X26UROFBbwtWmcp6xpqnYVJY69mXGN
+utLR039Nv6IO5F6m0looSt0p3SSCNgqyls3GY6c8xXqS0YOR04IvGDHqWg2QKPtQ
+T1HiTliyNYNFzr2e84eTeqQm8aTUMYs=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/delegatedSigner.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3jCCAcagAwIBAgIUVV9MBS9b+N9DIo5Ou7XDRT8l8J0wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAjMSEwHwYDVQQDDBhUZXN0IERlbGVnYXRlZCBSZXNwb25kZXIw
+MIIC3jCCAcagAwIBAgIUM8qmS5w0gb5569IOxnYzJV4lfV4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhUZXN0IERlbGVnYXRlZCBSZXNwb25kZXIw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBdcZSZgmfdwgqZ5HxuHbD
 f1zlOLBsSs0iscvUb6Za2irdQcjCSYrEo7PB9hSH9BtpiUG9gKUcPBICRMWEpMRI
 MwXlE4wBBs8IvpqGJ2C65qLo828jxdmDE7nfrzeDRdrOUdTW3NKmyzzHBuvNMHDs
@@ -9,10 +9,10 @@
 CIgIEUIgaZiKQ/7kjOaHgd0itqac0oN1Ex+TKxKM4ob6fSUcBirSfvAW8YfN1U6D
 KzW4kw90upCqi8dhZyQqsf1tYhQNGMTAuMaPw3SEVzJK196G5lUvHR4ZHXEhaNO7
 AgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IB
-AQArQ1z+NQ3vTWrScBi7xget5T5prDJW1utBgEqxafprU2ugC+vNH/7NBcw0W/AA
-0YAMlWcvJoGxH9iQdgvm+R1psgYCzAcHw0AMShnJPl08pX3DD5FidaYqDcGV2JCB
-biUuHjdeV2/vhQykOnLyH/GNqxnLs4+8rmGB59nhkY+Ppg3+nTK038FiQKL3zSto
-f1hU6eGOk5FThVwZ5bGqMSaYiZgsFLTjeokzBhpbcSMSW0FPvb2R6DGgVkObSWnV
-i26TlTrrGvzIkI9J/NB+wWJCHKhqsyXcnh/mwDM+RzyeBnxcUGvaS1GN8dFmDk57
-+5/fjCfI4U4QqoGFpvjyIMNh
+AQCeOJWvm8T7quyhSh8Yyu6/h7Yzi6h7YcVaK0azDuvWpWvJALZcYnKir6qOFbbD
+x9pVEZ1r5DmwuC0UqBKo3KC8sDykT4fkjxKzW1OfOI0Iy6i76LHDGN7Ohg/U8I6x
+V3rdTyVkNxFDKo4nK5WHNkMR5CBY7LcysV5sDFI79O3eM62UVSgP7+RaOV0cul0x
+S8a1uad+azyE7EIM9qVkaO9456Z8ZT9P04fX5LRjrY/RVKXAUmpWGFmGes+matjw
+2StNMW9jmbxc+eFoMUqUD9R4iJdElGj8ut4JbRvAHmtPv/Bj64WwIvsdvLRkCN06
+7vmqrN3x/8Bjga6uDx+zMHkr
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerFromIntermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDAjCCAeqgAwIBAgIUK4cE1V6nQ9eISnKA+XR6Fn0FIVowDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowPTE7MDkGA1UEAwwyVGVzdCBJbnZhbGlkIERl
+MIIDAjCCAeqgAwIBAgIUEePkwqVPaz9IVH+MGS7msFHPqyowDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowPTE7MDkGA1UEAwwyVGVzdCBJbnZhbGlkIERl
 bGVnYXRlZCBSZXNwb25kZXIgRnJvbSBJbnRlcm1lZGlhdGUwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQDBdcZSZgmfdwgqZ5HxuHbDf1zlOLBsSs0iscvU
 b6Za2irdQcjCSYrEo7PB9hSH9BtpiUG9gKUcPBICRMWEpMRIMwXlE4wBBs8IvpqG
@@ -9,11 +9,11 @@
 vmZpHSst/shJRFkLxaPqSf2TsddTQF8Xc3aZlYZmJUeX7UJpCIgIEUIgaZiKQ/7k
 jOaHgd0itqac0oN1Ex+TKxKM4ob6fSUcBirSfvAW8YfN1U6DKzW4kw90upCqi8dh
 ZyQqsf1tYhQNGMTAuMaPw3SEVzJK196G5lUvHR4ZHXEhaNO7AgMBAAGjFzAVMBMG
-A1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQAZltlA8qJw6vUg
-541/8GpY+0UgSMLvN0x0icozgRemIvSjxaBOomRUnNZLzWvxX0ABGGo/Pw5cfxAQ
-nARavM1FT451cyr90hE9SdwUi6wI/jAVyiZuSl/6zIYEpSD/G2Noa4P6CCnGNY1i
-PhpRCYvxB6Jy+6dL1fKWBurzgPGFUWs+WUSDgs7go5Jee67A3ZOyZAFQHgjKJFOx
-hWs4TDI4o43m65ssfJLbNGJuE8BTw3LHaJVdtxzKYY8UUipRPk9CR57k9dmG8LOH
-xqBouwiLCNqCstK1sLVcgXh8CIljrWWT8ZGM5VXssxfe5M81N7NQ5c/6DX0mhjNP
-c6yNgjCp
+A1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQBFmLHca/8lrjch
+HtvuzERgSHeF8gsOjCKbkKmIJqAX7oAl+xoGV7sRzbk9Jcsl1be+xoffBCfuBPXI
+a1Mr08nB7HV5h1fKu1Bt68i1rpKp0cDawfJeccovZQCbEpmwJ+sF5SCdA628KxoX
+JclPsYODRqt6JSTb7WTRD7tIDO+CO9Q9Z2fis3zj6ZEN+mgnqj/SRFjkHnGKaRLN
+1Aaj5Lbr6B1HZN5UbhAKySqkDAm/iWg8pFm6syJ3qMfjf65jecvbP6T0gXDueYG/
+qAcnddtqGmQQvU1WbmbtC4Vxg71yw62OhRtfUd5gVpRaVWE9Rcv09JHsu5Nox14p
+sTEjoV/Q
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerKeyUsageCrlSigning.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8jCCAdqgAwIBAgIUVw1LnlJSbQIAXPuLa1nVqn6of4QwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjA/MT0wOwYDVQQDDDRUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
+MIIC8jCCAdqgAwIBAgIUbf11GwRR/gsZC/ZdyZ4rphMYM9AwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjA/MT0wOwYDVQQDDDRUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBrZXlVc2FnZSBjcmxTaWduaW5nMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAwXXGUmYJn3cIKmeR8bh2w39c5TiwbErNIrHL1G+mWtoq3UHI
 wkmKxKOzwfYUh/QbaYlBvYClHDwSAkTFhKTESDMF5ROMAQbPCL6ahidguuai6PNv
@@ -9,10 +9,10 @@
 SURZC8Wj6kn9k7HXU0BfF3N2mZWGZiVHl+1CaQiICBFCIGmYikP+5Izmh4HdIram
 nNKDdRMfkysSjOKG+n0lHAYq0n7wFvGHzdVOgys1uJMPdLqQqovHYWckKrH9bWIU
 DRjEwLjGj8N0hFcyStfehuZVLx0eGR1xIWjTuwIDAQABow8wDTALBgNVHQ8EBAMC
-AQIwDQYJKoZIhvcNAQELBQADggEBAEjBrQYyhYMSNd0BUWtU6oohz/a+WrdhlkCB
-uSL6qHnHWEQ7QavXN3eMvBHedh+6zkMcsR4FAr0m+gKQOJkoZRBy5y/mw8kIN5pC
-HSeoHMyXjWrNqUVX1Wrv9OUKO6jdTwclBHBQ63COC5Fqc3YRy7FPFB2TX3d4O3Zn
-qliRx/GGNiKqcYWs3/aqHOx9eXtQY0gIXmE1hUj3QdcS/9t7ffCRTZn58yg3VJNn
-GmFqQl/rYUAoIXj8L8Hw/x9GsnBjht9Ilqn8WZGahxwL3cVzcZ2bBKZsa9SXGBeL
-JmIn/joHtZRxAbwVdZ9kRGuFDBVTAMWWQFfWeZG77A/WOjrYaKY=
+AQIwDQYJKoZIhvcNAQELBQADggEBADLwe7YTejSPwSk2T+oDdGunG96A7fTOadGo
+/ygjd90S4ockZ+Bi/WgpEf/nPAhArYjKOdL0ND1lm2Zv5f5Ge/XrqX2rL4s7Owfq
+sOounyEP2RMwX58I1bkrCsx7kKGDOIRXyhukaCdiircMiu/GT8tiBmxCJ5NfTsEi
+k0R3+RaFQ0uhuryJWJ0IzjwPx7MaekSJuZ3rwSkm41zgCLU6cU9PkBW3jGW+M4Dg
+cTvUzqryhFfdctaESk5OUT2XW7f4s1QlcbjyK5XDD97vC7zey/C8K+2xizaLDBVZ
+iWdoE3WDmOHcYlLFeVg2l2sVAO1slQItVuQ1myy3VZo1r+SXEgs=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerNoExtKeyUsage.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAcSgAwIBAgIUFeuVG0sHPAstDJq6s3YCrMsTLXwwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjA6MTgwNgYDVQQDDC9UZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
+MIIC3DCCAcSgAwIBAgIULfke5oAO5ZbtLXezjOOcrqEQIHwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjA6MTgwNgYDVQQDDC9UZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBObyBleHRLZXlVc2FnZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
 AQoCggEBAMF1xlJmCZ93CCpnkfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJisSj
 s8H2FIf0G2mJQb2ApRw8EgJExYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF2YMT
@@ -9,10 +9,10 @@
 o+pJ/ZOx11NAXxdzdpmVhmYlR5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzSg3UT
 H5MrEozihvp9JRwGKtJ+8Bbxh83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0YxMC4
 xo/DdIRXMkrX3obmVS8dHhkdcSFo07sCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-ZJdVkhZxbRKeRvarcok6ehmK9EqSMp2P57uYuIUuIdkmeud0klUGlfpiYiRcJiJR
-iLz4ki9q9Qpz1Pd7NRDn2XdKjfLy8w84RfHkZDG6XADkoc9ch1+P25uC/RMLbGUa
-pg68KWZDKcfTBYE4qrokVhRYNc2Sz27ck+g4uWbzk1vZ4XjW/vOS8FZSHbfFES0y
-E8/24DcVDICnasTvnQgLCnXOJsup0MzHtK2Jjg73Vhdl7sBTEWTcqJrTT82d+D3X
-Dm3emhDWmO5fLhtC4KqEd7v3p5F2v0TOitpr0rj0/LP6iXNh+J8pLactgY5G/m2z
-b5kSUiLV9a5DxUL0JZVkvA==
+Yco2Ah5HxHlmkSm1YhZ6AyuGv/FyXmMkJ+7Jr7NCXy/MuQAGj1QtKbhFCtt2iotU
+D8V+sNPgUbtimTkstt3cdUsQhT61l+S9ZN1Be8Vza0S6RBA48RbkyDCx69DfjOWa
+yJF0WB0eg5H2GMq2+i2LNU1qgFhld62miB1g7We80GYX/+bBEfTvjuojaeSWijN2
+6txGUC1udv4o2ELsuvma0nymBr3et9xVwuFfWoLbQAeyRHCScdSku0vB/kDQb6Pt
+uCasUnBGiMPpf4w5DDNetLFh9FITYLCb4xWoPsj+6DSizVmD2/rOXhaNSwyHdWn9
+v2FW/J0cNFFuZLTSBA3z4w==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/invalidDelegatedSignerWrongExtKeyUsage.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC+DCCAeCgAwIBAgIUAQvoVhbNn0E8pRr9GwUubF0uuU0wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjA9MTswOQYDVQQDDDJUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
+MIIC+DCCAeCgAwIBAgIUdw7kK4XEwM9Ipz41NlM1pF9VSEkwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjA9MTswOQYDVQQDDDJUZXN0IEludmFsaWQgRGVsZWdhdGVkIFJl
 c3BvbmRlciBXcm9uZyBleHRLZXlVc2FnZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBAMF1xlJmCZ93CCpnkfG4dsN/XOU4sGxKzSKxy9RvplraKt1ByMJJ
 isSjs8H2FIf0G2mJQb2ApRw8EgJExYSkxEgzBeUTjAEGzwi+moYnYLrmoujzbyPF
@@ -9,10 +9,10 @@
 WQvFo+pJ/ZOx11NAXxdzdpmVhmYlR5ftQmkIiAgRQiBpmIpD/uSM5oeB3SK2ppzS
 g3UTH5MrEozihvp9JRwGKtJ+8Bbxh83VToMrNbiTD3S6kKqLx2FnJCqx/W1iFA0Y
 xMC4xo/DdIRXMkrX3obmVS8dHhkdcSFo07sCAwEAAaMXMBUwEwYDVR0lBAwwCgYI
-KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAKXDhyfGYh3IfOWX1Z3CRu/8FJng
-RVsP40vomDvuoHvMm5Xb3wfq+Ort0ny3ru5BEzWWzMwgSovLA/xGkB04nD8EoHH3
-0u+KoVr8vQyTfVbdLC/Mw85wSZB4JY3s2a9wfxYYL6wgc2hudTikKL9purKRNL1z
-EXDK5+FIfbPYtlvVhuyXdb01waldGF4Q3cTF/hpC/z7ussr975XsiRa5OUmMidAx
-odIH5wPZjrFY2xmwUJ5NeRd+NaY8/vct6sUU9rOEzl8aUk+4Bdd5r+kVeQIiQToF
-HIzWAJsPDbxkuBfLCM0RjFRA6yzacIyHsI/nRWmOHHsAICLLJLqWCOSPRvE=
+KwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBABdCK3EKY/6lwuCehtiHVJ6XcFBO
+rTUmmRxkrRfXzn47Llofu/QC9OISWhfV/JefrNh44mYkkscsWV76eHsEqOp2F3Gz
+Kv0bhlFt2ihCh1dzgz6tGWT5fwidow3nBSdssMZGqHD51kZXXGgB0xWopKDhnXgS
+hUforJ1X4anMZzDgV52DSGB+dTo0atgq6ke2m+nOsW8CErYVGHs2ey4lugNPo+AO
+XYaZqTclKGtrPjXt0P0E8ZaUs+Vxzx8jh0S096FDSPWMLdrfIETRB90legO8M2Qo
+woGV4FsA48aPqqy6LPEke0NltJ/AlBwS5wz54TwWkhjjBV/dmBrFV2bFQzU=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-bad-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDJDCCAgygAwIBAgIULTusJjvQ+r7EFw4ymxU0fZpmJvswDQYJKoZIhvcNAQEL
+MIIDJDCCAgygAwIBAgIUX5dBLWiffAZEKD2dHegBV9jFkhMwDQYJKoZIhvcNAQEL
 BQAwNzE1MDMGA1UEAwwsVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdWx0aXBsZSBU
-TFMgRmVhdHVyZXMwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFow
+TFMgRmVhdHVyZXMwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFow
 LDEqMCgGA1UEAwwhTXVsdGkgVExTIEZlYXR1cmUgVGVzdCBFbmQtRW50aXR5MIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
@@ -10,10 +10,10 @@
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABoy8wLTAYBgNVHREEETAPgg0qLmV4YW1wbGUuY29tMBEGCCsGAQUFBwEYBAUw
-AwIBBTANBgkqhkiG9w0BAQsFAAOCAQEATrDX7EI6dTCokTgIQlLzBJGS2Wx15Nn5
-eikM7mHj3PbPXPCQ8tb9eerw+8uWNOUU2DB8qPlYq0ueivLPz5nImmV4Zj2MlKlP
-e37QiUFd8A6/9j8qdNIA/RhmU2cCGb/8XbmEvaHkBQx1L85/FM2D3fccebf3nU26
-Xzr7oKjqzwYESmMcg6nd+4X/SPcDPeoEspO5zutd8mrtSzTF2NfstxSlgyXUeU0G
-Ijrvs4xgG9JNzKZl2JtUZrd6FEdsNaNODV6CaPVa3PGrg+x7BzIBQAd43xvTLZiC
-Sx0JtAXCywXlK1Ob3yscVVmFe4e0Nf+bPt/BdM/sVNErOAWSdhbHmQ==
+AwIBBTANBgkqhkiG9w0BAQsFAAOCAQEAoxlWVngbuVoxZdE2qM6gPpMbCR0vW99b
+XWki1fUm9RwQ0XhobwDXJvpopSguoZ5gNsXoGHpLUTsQNVgdcNz9YJkjU05JhQQF
+KRAufrkry4TLe+PmGmLCWkMJh2hemv8Ih5TUs2GPS4QsbAXKa3me6T3J4q4KBlH/
+RNN0cozoIbGdUmCmSFKgxnMuUN5E5/RpN06lgZIthtjcCvgbWHrOTPDJOs50KZSr
+l4+fHiHxBoRvW0MJ3S/oixA6SQWrO86kv0iahn0kZA5cnqhrC8qI9HUnFT31k7AZ
+XS4+EolIyjDrlse8fnehhW00dXjzH+zgvUNJFyafB3AYtJTco0gVqQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/multi-tls-feature-good-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDJzCCAg+gAwIBAgIUa3xatUTeEIdnPklGVvtsWkv/38IwDQYJKoZIhvcNAQEL
+MIIDJzCCAg+gAwIBAgIUNbatscZX2IBW2HGooNJW4304zyEwDQYJKoZIhvcNAQEL
 BQAwNzE1MDMGA1UEAwwsVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdWx0aXBsZSBU
-TFMgRmVhdHVyZXMwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFow
+TFMgRmVhdHVyZXMwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFow
 LDEqMCgGA1UEAwwhTXVsdGkgVExTIEZlYXR1cmUgVGVzdCBFbmQtRW50aXR5MIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
@@ -10,10 +10,10 @@
 gAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqV
 YR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQID
 AQABozIwMDAYBgNVHREEETAPgg0qLmV4YW1wbGUuY29tMBQGCCsGAQUFBwEYBAgw
-BgIBBQIBBjANBgkqhkiG9w0BAQsFAAOCAQEAJkekOTlAnY0ySsFdpZsPZhMkCD46
-oMMk+K+EN5PXae86Smm+tT7afOd4EOGwPgAOcLrf9koMAP1DtNO2NgTz03k1VbWk
-21ecRuN6OK3so/a/k85gM3gs7KSMTafAtycj7ZNKjSVdnlPrwbuYjfg5+vC6Vd13
-44aeR5Sp5JCD5IFzlgAFEbF+dYwwSkIpyKSsxhTfhN55jo1ef+BLPbpwsgnlWaVG
-gPGH2bzE5i5ZIS+xO18WrjqkACYELI2BNzd/zF5Vo+/YtTkBH9ImLIg6nLIoJXD1
-fpEt01IVpjawld7br8YibOcrx2PYUH86215eQrGrHRjEWUfhWtf6orBbuA==
+BgIBBQIBBjANBgkqhkiG9w0BAQsFAAOCAQEAKvmpaXwjW7///EBD0Qt6u4eYWxOf
+kItU9yAiOjoKpSl803Jskqpt1WAYeOWv0+vjlFlkSR+Wb4bUiWFUG0ETXQPnpndy
+zc0smDI+2ILQSRAUqF6UYvMqqkMQfTEfZN3CTSH48BdBw2G1brWnPBl/2qRZTFRy
+/mdOZqJmE4UZhkf8ihtyQstqlVNqNAW6luS8u3tm5Uwk/ZVsH80yphF0OPQAFMGV
+GxYbNYpmaUcJ4xGH1bwvxpUc7eVvu18GpZpl74VYThaizvXWTlIQGMxQU0OgBSAx
+1uNpLNMo2eoGXPt7sC9v9fMq/KFN/VfCULlIwrALDfQdhJ4ctTQbHNCZtQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDITCCAgmgAwIBAgIUa0G0d7W2iqN/0C5dR5Pi0wklAPEwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
+MIIDITCCAgmgAwIBAgIUFdjcRo9oZDqo1b9UOWgfewuqbdwwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
@@ -10,10 +10,10 @@
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjYzBh
 MBgGA1UdEQQRMA+CDSouZXhhbXBsZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMDIG
 CCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2FsaG9zdDo4ODg4
-LzANBgkqhkiG9w0BAQsFAAOCAQEAg9fJgQCADs2PYqs4LGC58nFtsnd92tWWS220
-moab0RS2YBhuaDkJsWGeuJ/ygLAdVTAHEag6lqsm2pLWU7FK9hCa5Az7mvVp41EL
-jBhPz6C/eF9LaG4MJBIZi/Nxa7jzlR2xXn6Hjc+LLa5UP3y1qCLS5/GxLaaAjo8y
-qXr3h6FL96Q2kxLbdBpo88bE4K2+Zew1yx7IG1sEYvJHnNoJZBEBlfhh55z6jxkn
-2PYiz8UEJUXpFydWOjBrQmCoDAgIWntPQerXwoFfKbbCypeODkKAee/gGX++58IA
-ba//Tv48va65RKlQ2orWsRoLi6zBGT6eW58VAduNPSmZjBUSAw==
+LzANBgkqhkiG9w0BAQsFAAOCAQEAMkt3s3WLtDF364ZlSZ+WSei6kpk8XNmQ8PlM
+SswAApahPrWlYlZ/V7Y18MHLHF26Rmoh2NdUczmLcOvvwRxq9/ekooDP4HkB7WFz
+YnfDo5lWhqRUyTVmSVUS2SS7mmvt1fPbZrB8kjATqhvAmOu23XmxZzJu3ylGfBn2
+MJhLxt3VhOymRkiX3sPFboxCsipj5zD3jeqGbwJCnlr3kwqvTayUEke35mvkwCew
+3L7akzbjXdJ8sFeLw/ZNpPbslRkVmV3lCv1Kl08U0POM6tKoow4sw4P0iVXGQqRT
+H/4Stc8jzHop21H5chKAfMVQqIM3u05o022+rzrCQomyoVCLaA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-ee-with-must-staple-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDCDCCAfCgAwIBAgIUSSwOijxs6wYA6qYLxwD5vIUJiCEwDQYJKoZIhvcNAQEL
+MIIDCDCCAfCgAwIBAgIUcXF8++LMW19oSQg8vdU5I0GGZWkwDQYJKoZIhvcNAQEL
 BQAwLTErMCkGA1UEAwwiVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdXN0LVN0YXBs
-ZTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAaMRgwFgYDVQQD
+ZTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
 DA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
@@ -9,11 +9,11 @@
 N9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0d
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjLzAtMBgGA1UdEQQRMA+CDSouZXhhbXBs
-ZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3DQEBCwUAA4IBAQBKYFXc
-nT9pMrnHexiKFZofpIYRjiOj/sZHbePUqMQtvVDIPBn9Y35fWSF7QC8Xh97ZYHgy
-9OzkjN4PqESNqU1zuqH81vomTpww8hEJVRe9eo0VAN7TiZQ/xxtc3AOFow0F1UHw
-ug9ruJQRQMaFvXogQr5/N8/lh51ezjOdBpVqd5vVqp/NpATioiKHVKCOcWKL7XPh
-wTDNbvcRlwawag9kDgmSvBjl4jXZjCbYC2JaM/lSJpi8mLdnuc+XeU3qF/ywA1/Q
-PAgSxB29ofOsqHSRu9rT7BEmAPnvugP8UjXS++oVLEIu6whJNfO8384D7d8xN3FY
-FiEBc+PowbKxzJFi
+ZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3DQEBCwUAA4IBAQArhytK
+0cN71epgzB/5M26RujocEL8Puk5O04x1uEbU7j3y+mNTO7bLB5z76ZKEzU98blLq
+V6Ds7PvmBHW/41KP8e7MwkOGprvUllfI8zmTvxXDV2iHGtmOvvEbfOf/QZS0e4Dj
+eZCcew9p4/+Efe5lcto6QazTfFSJLxjkpKHU6S0ZgAu5mEZl5UW7VdR5LHzHp17t
+dT4EWMt41CPoGxeJWYL5pOK14sD5GmUQ9OADzPBiN1M2v/9JY9IOWRabP1VafTYK
+95PHA21eXqmA6SjCugaCMXW99pdStcBSCvQEAWfHBWloyALzG5Mh7H14tuM41ldF
+abWEJfmtmGP2F2ru
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/must-staple-missing-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC9TCCAd2gAwIBAgIUK/fy0cJCLYMIqlHULTgKmCPuTWIwDQYJKoZIhvcNAQEL
+MIIC9TCCAd2gAwIBAgIUL+F6WGk9sZuSuDMbhvPWt8PKv3owDQYJKoZIhvcNAQEL
 BQAwLTErMCkGA1UEAwwiVGVzdCBJbnRlcm1lZGlhdGUgV2l0aCBNdXN0LVN0YXBs
-ZTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAaMRgwFgYDVQQD
+ZTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAaMRgwFgYDVQQD
 DA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
@@ -9,10 +9,10 @@
 N9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0d
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHDAaMBgGA1UdEQQRMA+CDSouZXhhbXBs
-ZS5jb20wDQYJKoZIhvcNAQELBQADggEBADm5dQT4aHbMMU6E8S8vB9nAlC+OSYD3
-l3n3MbIqK+KYxez1fxPHw5TawmCra3SGCryVNyCzDEmpqT74bXr5D5Za4PD1/ZZH
-fQDYcIhieyuR6XC0iuH6TCdiBIDyKQSEtCVdy2lVRvW0NN5tQ9NBxYTikfipmoDO
-ZbiVk33IedPgkwDWpWx8S1f5d6jAo2O+oH2iEpG8BlzBBQiL1Sc83ossXV7jAqDK
-kgPrbzq9TvUHXCXkUdtpRIi6jpf4k4Fejk/OJMMOd1A9k+VSMEwCD2mUYjJMbEV+
-ANc38EQT3DVW5O9rd9C8MTYAyA5BUtoAfTF+u1uDgEmB4Y6RyItVBh0=
+ZS5jb20wDQYJKoZIhvcNAQELBQADggEBALem6GEzJyvZWTVaYg54X2qWTnFfHVyu
+4F/UbGX54D+8hl/zumovWsAtPPfcls94uAMeVvAoRTBP8dUcubilzMwMig7QUPUs
+2YeqeQZ+2+NFHwmMG9SnkSU+CK8lnD4JJClLUuS2rYh5q+tp7c+U7+jFuktqIAQg
+PJijEhiFq0wlqjXg2ytvbdurEm/LAz+wu8sEJtWsWLCZt8QiQfYhX/epFRreO8tB
+Ulu/FCh/1kWx7JAIudigMSQqsg2R7ohgHyOV5Bm9ad2OyTuBjQ8xGFba3Y4jtPvy
+w6mpRAeFEJB7FVTdDQFAyEryoSuOE8MAve2Ld/+9YDddom4S5+ocXo8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspEEWithIntermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUBUtF7wqDRxFmHHEpanRJIGtLxHQwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowLDEqMCgGA1UEAwwhVGVzdCBFbmQtZW50aXR5
+MIIDNTCCAh2gAwIBAgIUc2xqnbHi4aDQ1Rj+6hXoSA+ut+8wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowLDEqMCgGA1UEAwwhVGVzdCBFbmQtZW50aXR5
 IHdpdGggSW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptu
 Gobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO
@@ -10,11 +10,11 @@
 HSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcx
 uLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo1swWTAjBgNVHREEHDAagglsb2NhbGhv
 c3SCDSouZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZo
-dHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCXoJqNtOzp
-2pzJn/FehosJA2TW30iClolUrEnR39pQ8tdLVSyirjo92dNk0at2cV0XLaH4e2Tm
-vPMh5UzUCsPWA3MouHIlg4vaHW8r5hnpIsXV1dsa1Fjo1d+i1iTHXDYqknMgMHJG
-cP6ym803xsxKeByFtoKE0R10s3PVFgRJ30oJh2gqUKQQJXhBCrD0oMCQ80GfKCJR
-CjoMMUxVxu4ViOcWK2SHGnhpy9EopZXPimHb2Uu/AAi54DSDd/lv3WT9YYgkWzXt
-PVT2ylGWPPUhIXNIxdaevLodVor8BV1D2/FaRe7FuklR8spPszggCCDyTaERw+Z5
-Pg5/OVcdarMc
+dHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCig/et41o2
+7hC3LJBIt5yh/eOgjZEUiuJlLAtrMssa5VjdxMDRyqBgn7FUMZMVnIpqRe9V0/a5
+E+yMZp+PvMWxexPlue7SOe7VYaDGvStdJ4ecsEqZzw151k6EuvyT2NJZPj92Mx+0
+gAAo2GysadZEn4E1juLZDCk+fTU1sq8Fek3XocrB/5on3UotDtglBIKW+O8N/vVh
+0Fymnt8owdmt9anGJW9GSLf11b2qZ9XS+5Wlyn3ujDDaeL6+d70mKWo1AuxA7IQx
+ODcsUb6lCGtyyJCLul6oW1ABJNGh1QGAPc3XSeONc2/w7UZcc5IzpmD46V1soJXl
+yLUPGwF1W//L
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/ocspOtherEndEntity.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDFDCCAfygAwIBAgIUCa6mVrV1BBGP1WFrMsCwG0mM2/EwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAVMRMwEQYDVQQDDApPdGhlciBDZXJ0MIIBIjANBgkqhkiG9w0B
+MIIDFDCCAfygAwIBAgIUX1EMg6wBeHSbS/NgLV/M/PaxdWswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAVMRMwEQYDVQQDDApPdGhlciBDZXJ0MIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
@@ -10,10 +10,10 @@
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo1swWTAjBgNV
 HREEHDAagglsb2NhbGhvc3SCDSouZXhhbXBsZS5jb20wMgYIKwYBBQUHAQEEJjAk
 MCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0Ojg4ODgvMA0GCSqGSIb3DQEB
-CwUAA4IBAQBo3djUnUzOOSICjmP9z+iy8iFK7fla9kt8XcQVF3EUUggPjcy0GqxB
-alPgbQZDMlLmrXWzTXXeL+Ln1QpW52XtgqBWNSLcaOas0Tpg3hCTbpElfvcStyJz
-6QzZKSMhF9FXQZdP0YQNHr+DgSOPeDQnzoM6sUs4QhC/ny9GNvSxfTJiEVDGFTUC
-39Fwsnrv5YTSiMzFyRR8A2BAVFZ+ml0gA7Dz1c+7GPst//SwMB8srQWtWCLrySx1
-oH31fCYgK4MkeMCFIF2rfjoczZvQsV8fAnynFtyBHSMRJ+elQqE2Kbq6jrB0VNI/
-jwVeAJ+0F39PhmlT5tyKDOoH+K9FL4kW
+CwUAA4IBAQCvTyo5F7zhOPBd0LZJpC0ZQAktZtct7z9j0E+iUbo6tohRsvRMmbDs
+lO/cwks/I2sNa3fzHEzE+oC/0kiCS9JUiHUSUrHQrPOraP1urmRdhzECbyFVQsdw
+E9YEtfZemxBQd/pHj7VnYlZ9xNimGZ7rcSi0vif3QbB3BlJiFfAe+IrJ1tkfYOGY
+3xwoCCWOIGj0xl79MXzlG6iI9678y0vUu45tM1JbnauekEjF65CqME035e3eFq/t
+oqghb07JW7JSGmIz0JE+0qli2iT2QIML77Wk0OTE9niDPAbORFPRbNytycNQ8yHk
+xDvo21FgYZFATLiYf4oUADqp23sTIhac
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/rsa-1016-keysizeDelegatedSigner.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAVOgAwIBAgIUM504o56erSoHvLW7+KLV9hl5EFUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjA1MTMwMQYDVQQDDCpSU0EgMTAxNiBLZXkgU2l6ZSBUZXN0IERl
+MIICazCCAVOgAwIBAgIUYU3JfdG046x00L5zAkjGn4xjoZUwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjA1MTMwMQYDVQQDDCpSU0EgMTAxNiBLZXkgU2l6ZSBUZXN0IERl
 bGVnYXRlZCBSZXNwb25kZXIwgZ4wDQYJKoZIhvcNAQEBBQADgYwAMIGIAoGAANKb
 sS+4T93NKbOlGctmxDuNj4vlRbp5OEzmY+0D33WZFgDrkgeQ0lMM7OVE25mnHwWJ
 aj7SBxZVNKqZBX5HxH47yBrab6HhLjcmi1BGpVJo+drXzLSF2BouGdUNTwtoVKyv
 bXvmnZoIMTbhWvqPU8HIyE/GB3J53Q5V1zaaW90CAwEAAaMXMBUwEwYDVR0lBAww
-CgYIKwYBBQUHAwkwDQYJKoZIhvcNAQELBQADggEBALF2rfcH4yGhk3NoFbnEDQgS
-BB9S3NUK4gSuNN3495VsAWVKHwgJ9XfDqULxKRW0lZ1fYOPaWeggONB42GtOiJTr
-S0PDnfBFKDyWfQfNW7+v9SrA40zupKfyyZoX2bL2gY1Y0sUTRfGS1ooW1kyaenLo
-cJke2SRd4ZeXPOneiUwbAXM3fDedJM9izpsFf4Jj6+q55caM4C3K11VcT1DJ0EiN
-S3JuqG8jiVLWbHqjYFxOJKhnP+wRFCcnMNMAyzkzxT9H4c10WK8iK8CHjrz8Oz7j
-Ai3jqq5zxW4/Sl7RnmYvy0gQWptvpXx1N8jXmDZ223tLpTkzPO2+j6wF3ThCWj8=
+CgYIKwYBBQUHAwkwDQYJKoZIhvcNAQELBQADggEBAHkGbdeUVBJCqfgXfmU4Acl1
+ZNunakiEmkZA2oOKvvksDaDg3rKbfZU6WwXhploKPtoWbCIyEkP3BTRJ6SqxNdq0
+S9yE3jR4CmfRy6+4f+cUIexihlI8l8PYC6ccXcZ5gvawCuMZ1YcVlq3LZS1WuNbV
+qBhLURgwzXjpKMIzmsz0e6zIHNBskGX/vXLJjjUJSwnxxdTuCOZ0BUNpz26jMfdl
+fEfYkPIEW0jvGSmg52NM6Uu20JUGM13lxp7WSrBPNqDnnV0Ivpvyiy1O7eOYBDRL
+9LpnghoviPlE04OgvWtiEETNYkDxs606xOGd3eb/1HYLEdJtWdR7F2/KweJBqe8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUHTx9c2saZsiwlWK1j3QKwpK0qtgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
+MIIC0zCCAbugAwIBAgIUZekW+kmMLmUyacMUQAExM6vEFpswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAh14uCtSQeGoT
-K6KlavS8/SRGpY6kcjNjNCUxeeDgMhnpCTohl5uYb9+jbE9j/hyihukC0h6cBJG3
-APzQdUk4ToXNySeX0sQ/KREsGq5qVwiTNcN4KXGdg9CGvm9tNygU/mg5/eQ/TXL9
-NA/O/UsbJNJ6AlEptEARt0wo4N/8Idt/k+7KE/NwJcoekI/TXAwLXRfG4wYBS6gT
-r08t8vllasBCx51rUlVutKdSu20tA3sL1oRqsLdykJQnZscJhRLIaF7/5y67idhR
-FaVI0f+tisDnBcP2gWWoV5stfuWrwrD5vXw26CU6RioUCBxaiQGP+R+gma3uZ2kP
-jEsvAfNHhQ==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAoabyPFisrr0c
+kmPrDCY8pyDZ6ScxE/ziG+5RG4yJzW0QLrnt6rusMdKuxwaLiTISsNI14vh9QQyG
+XQsVeiGNGIwyJ9k2ZbLvw6pjdUeaswkthSqUDYwYgCljBwViuFkK4SAwya0Vb0p8
+pErDX8pzSF78inMB/7f0+DPdEQgtAGPYfB0gMRWOliyJSVoJXTgJ2B6PTMMvIcIO
+OXcqjDvVYY4o9+YtsDfmzGOSa/YmbM4hO6lv/cO3zv3aT+szyQK8X44koSkvct2P
+QL4cY3/incY0l0I12PaScOJDuvITiRNca7gxbUiT2jz1eqzGPIyVS6ku2cO0v9tP
+TIiD5XDdFg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-multi-tls-feature-int.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDDjCCAfagAwIBAgIUH9egkhnvMZLTEuuVTw8SULRBD94wDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjA3MTUwMwYDVQQDDCxUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
+MIIDDjCCAfagAwIBAgIUZVYCAllpNYOv9692qhipPYQMx/4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjA3MTUwMwYDVQQDDCxUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
 bHRpcGxlIFRMUyBGZWF0dXJlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
 bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
@@ -10,10 +10,10 @@
 rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
 Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMzMDEwDAYDVR0TBAUwAwEB/zALBgNV
 HQ8EBAMCAQYwFAYIKwYBBQUHARgECDAGAgEFAgEGMA0GCSqGSIb3DQEBCwUAA4IB
-AQCYwlf8RCBbLlIkP8chufExMhL6AVtyk5z7LAkLerWxe3xT6YN53VF1FsRSW9+T
-2P8+8EUE+0b6dCd/hgP+OcXJ5gkWf4AgMUJUQ0R9VkNGSMiPgUUIhtUBynF4mihR
-88QenYLr/EgX274t6ALfxdwFHpOzgsVZXpxhQ0/ntLZbiss/Sv/ECidvSwGUNo7j
-xGmXVsKzLmd/wjUxONehT7/HfBBF4XrJBBv+SNq/Uc3khH52KC1U8rcL3fxzWqgY
-/9Spk8wrtO4eJkZ47pKt6LhBwks6UttOU1NP6iZLXcDuu7eFS4VhWpfCz6EoCGsj
-zAbUSkADtfH/bUAtXvuAfn4y
+AQAdkLVuX3A0Q9pzWuUV0XADf/nao4Wo5tlpQgsPFNmtrZSeeMJhue7JczJpeuKj
+0b176lb9VSKh8gdU7r1yvEYadl146UZnUvjbKGKQUlU9TLZBdgLnLIs845zRT8+T
+6fQcWzapnhXVt7YSaNCri/iWXyWbOU/PdYjTZejU0lcCEml+t3J7KaKmrZqWZQT/
+CJa7hphC6qEmgE4zoWdmur3nhRFq7JkPGl1JeVEK4M4coec7gTqM/Z1gCkKLmBW9
+fHsYVtf+viYfL6I6xxQtTa7WdgGFKKJyJJ70A6om6TFiD5RHZDZ90wuwtjg1y25x
+4rfoP1xZ9+2So4/8fNiX6PuD
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/ocsp_certs/test-must-staple-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDATCCAemgAwIBAgIULVSvyjej3dcVJy4ijd8folFhCcswDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
+MIIDATCCAemgAwIBAgIUV+gXM8WzfHTQR4sK51eSBZrYF9IwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAtMSswKQYDVQQDDCJUZXN0IEludGVybWVkaWF0ZSBXaXRoIE11
 c3QtU3RhcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -9,11 +9,11 @@
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABozAwLjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAR
-BggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcNAQELBQADggEBAD6/N87S4t9M9FJH
-y8URRNzRjUZfuxHsbUzBrxB4Tqt4XEqfuZXboklMBzdBcmJX9fg2zxZi4B6890do
-HeFUL0pXVxzKULW3sgy3TOuQxsZHn4REyWV8t+RjAlHt5T+ArrVOS95MjR3IxoiI
-VpfpaM82LwwGrJRso3y6oJ/gnqo/TFyqDjmr3A/D9HwYGaYrxPUXrE2Zdm7A7DlX
-PN0Tac9hKniqQqm1xt8gnqpWMW2ytx6gJEo+ZxrsBsp1jo4F0lf9J3tk4Q4sLa27
-qbnEpi4tur9c7tc9jvqhLnLjE10TGHYjmrsZurUGONouQJhzMObOTY+ojqWTUngf
-vBux9Ns=
+BggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcNAQELBQADggEBAJ3n7RFMk6L0VPZi
+1inbBkR3qLljszxJIkBQiYEV+leqxMXzn3S1CyTD1Pgnc59TCcf2W6upn58duyFN
+NQWj9o5BDGNoq4vs8LZAxs7KivhtDsrGAsr049nVG9VbbpxvCjsEA+oygqquPbhF
+N+775DpAYL/ZDdl/M3/R3XjLgK4FwIu9MDCc45HuYCPTIAp9ASNH65fBfV0be3FM
+2k1/luQygte7VkXKRLxA0/+q498Q3awyWdkFin1/0sTIcMpr2MAuFUMO9j1/BdD+
+2xRUpuHc5sEMHdCNEDZylCLrEMa6tqz9FzUclxAVL7y1irrlGxOfjm4tYzO3P2rr
+bT6iDxk=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_certDB_import/emailEE.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUBfk77Fo5elMy7K0NYjILz5SRXmMwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
+MIICxjCCAa6gAwIBAgIUZ0427vGPMGf5dB3ZIhW8mkoNr04wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0QGV4YW1wbGUuY29t
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBU7zPKHTMnyOnLuZ3P+sVOFYsHzhH0
-HxBqYb++mdNCR696yCzUoJ/vwo0Yqb5tj2B5AhqCOFFR19Me+zSUvC96/9JjZtZO
-PdIxEJlPxqSdbB3jlg0+Zt8hGKkV0KIiBzD7m1+OBSW6Iq3MctgcfMsSfgwWLIty
-TS4Nip3duVotoahtnlYvb9eAySC4Qm2Q7q7d7UeqBa8imF70fpbUcsJxU87ovoAN
-3n5xCoYhA9SrOI0+wqme1n6l/BcHr6j9yBOCy39ufK+9R5R5lkxXwtFLfpvx7IxB
-Ze2MzOBvVOCCp6fP+JwQiUI6SPx5I1ajqDO6GceH1uRgfE34MZ7e89Sm
+jQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBi4qlU7QLKNNAFYso7DWFZzptHNiR5
+5oOGSbUPu8pvi8YoJbyzefH7A9kiIyvdZNkBKPUZTwwFWKM+QwmZVrH8e7G3zI/G
+447HiUQ4VNeeAYkT3K126nxEhVsk/gWPfv7qv3jUQcii/3PlUhHNqVRZNcEe/u4D
+zwWp/j56ydzmQoWwBN/pal//uQOjum9PPpk+V1RYCDtekOHwOHQsuhKXTscMcamy
+SJmG06/O3JF8yhjq03X1cHtj3YF2PH0fTCcgZMv/3GY34kZ61A4VJWUWRZFoCujy
+Fx8jMEoMvJt/oIBggNJsDCBP9ksesfA5ImOqI5hziqo52oHG0Z9+0f1D
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_certDB_import/importedCA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICzDCCAbSgAwIBAgIUKW1x/LWEvI+H+Bu97XIU65FqGC0wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
+MIICzDCCAbSgAwIBAgIUUQGnWi0czVZBST5XDA1wp0G74kowDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKaW1wb3J0ZWRDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDAppbXBvcnRlZENBMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAFrKOzu81VAR+21n2fsSZ6
-x9zCa4wp8CHNqmFqaFrJWDFW4in/zNE2RgBCDy7qp4rPqZJa2KGWOBVzaKPFjDdj
-Yjx8h0FlJ80l04UduS2z+5MaA7rp/wm7VmBCk137D27Sec84Y3Lp/yHJZDJCjhtO
-K7MCMdVuHvbGlVCFhxXw+L8Xzf6hl+JxM5xHseNqOzWAm0EV2Rs8HFyYwNF4eykw
-9DxOhmq51m/TSfVPbkgpNGoVOypz528iqVbqgVmukentX67bvRCQWzn8983pQ1sm
-L6v/myWirO08USwGcUOhUfe9+KGWakW1Ngx+ejXRBHsD4iuV3P0H3Fgyd7fDooht
+BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCkMue2IDPldrL6f/ox5CoU
+RPLnEPQyUDYIz4eFdAS/PX2A1/KEvYthVuVNbGZ1r5/3htt4cOKJCUYI/LWKc4eB
+6gC9uhcC6JBqRfsQB4zK9RZu860shuNPGuEWA1KYgy1bzi8iJ2kTaHO0y3yXL+ow
+guKrFJTK5NWPnxWQsdLE5lA9p67bNHjWxDzRHkDqeyIPiG/zmrudprxWXHk+EQgx
+1hKN0rTaSAZnCyeik11i7MCyAnvrAk0mr9j8jX1+yf5mbFeKk0XcjSRmzoAQZBSA
+9br5LUP1CvN2DbphDK1jkgP2Dx0dBuQH4HZBbY6lcKGfi4mdiJUkwiwqp346q7vo
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-CA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUPV73MKQi4K0tEQsv+RXKhS4QiN8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAgIUC5X2jRE2ClirTUZa/5o/butQdrgwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEDEOMAwGA1UEAwwFZWUtQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
@@ -8,10 +8,10 @@
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsG
-AQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCDt+hCbeuPm5dJPq4mf3HJVmkkZog+
-AHFsI2JXNiNFX37l8L7O8Uf4NsHvpIxSVig9feqSuH4Ir1M4iY4DOrjmpwZnL2pr
-sx86h30n95c0reOD/TmrKOZWZCYfp3NuQwc3iQsdyww2yNuhtdysQVtQ8Vghl5+Z
-Y3gKgVA7xmG6wEBebUAOUTXNJUFFak7u+rX3FVA0dWenzdLUuB1A5h/bofLPxsHy
-kf06AT3gB6EMLTN7ybSK9XFRcKGd+Gr5GlZnZaj6h/1MzkbtJ/+RsmGCatMWvygQ
-9Il8nwtmMStFMz3iErytne/3ExVJg1iBbyaV2BIh3DGOCi+ixhh20Wu+
+AQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQCaHEnFif4rqZGKOtXrnXTCvFvkxr7i
+hBU/zInfRn+9Q1+k4/yyjdThNNLCuTVu3sMlWjIbZGvF/iudIN/m2ZkT4qOmi+LX
+fy7a+QEEFLPZy+CCAQ3KHX2p+LEf9rnuUVOiqub9/lxD/KJOBV6SOwVGU+D7bxq4
+/+Y1mVFpxlGqQgHgSroZCPDAquRVYJC43x+lrlPNnX5fOetd3ipbZDcEdLf6Vy1A
+RsWVyFgJhVR8Uw267iI9/j9rIbChLY4aQNxTmH6/Knz+KYussltkcotgEu5YAQSs
+y7VL3y2JzlLQaq/0WorvkjHjZ8F4eILSS1fGAHrK6HT1eJsDxJzYVayO
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-CA.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ2gAwIBAgIUH/5QrUeItz0C6Z7FI4NxZyxZmI8wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1DQTCCASIwDQYJKoZIhvcNAQEB
+MIICtTCCAZ2gAwIBAgIUZaXG7JEsTaOaPw87/nUy+/eUmqYwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1DQTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAbRfPm+8zhhYU6UlE4tPy6ljD04tkV2SD+GZJraDJqfMnF2JxPzZ1
-3usvsLaaHLtYhxXYX7t2x41UmC4BeH1icvcsBTQTtR7HfLS7bN9nDBa5VyYJFbbi
-PUP/36VWRqVyQl/AzqK1TEP0goKCrD2CqlFrsR/QhpczUyva0vt9mYxWjTC2zbo8
-20RgamseKyBddeafVuFWRSTt2qA1YH6gwEfIVDKyjpEAf+14Kuqj+Crekl4eV4lf
-OPH61VzWh9Xt/TfCh5Isn4GoqUzPrSz4u5s1fJsXH1arhcxvh6zoaLOs/y3n6O3o
-UeZR4M++RCFK29Ta6ZrXPGOjlmFJmIEaAQ==
+AQsFAAOCAQEAigF8fmjv72/13vJXo6IeNjrY7B7Vo4ojlCP+3MjGBCgCXy1Bm34p
+X8t4DcJMZ9e4QPkGpA30jl/TymxaFUA/Hr2zezdJ+uU66qPWzzsiQCYZVXpkHgDL
+yd2MpiQZeIoX7t71BdxZbikajedXutn36U/ZIehZcSeNeaz/Fd8MqABVcvvjuTsn
+0Lbt8eubJml/x6WtQbDjPspI25oQwbQz3stXOGv4uBfuALKzO9AtlAXWpS/JFhhs
+4rqa8VEqHKGtP8fSieSsqhy4R98gR/PfYS/XvnRo71U+/m2iGxMizz7/FIuO13X+
+Xq1+S2fKey7Z3ZbA8+zdfHwlZpBydKAkMA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-CA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuzCCAaOgAwIBAgIUW9QTeo/PmECo0luwwtracBGRReYwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaW50LVNBLUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAy
-MTAyMDQwMDAwMDBaMBcxFTATBgNVBAMMDGVlLWludC1TQS1DQTCCASIwDQYJKoZI
+MIICuzCCAaOgAwIBAgIUY8AAXoT/5+XKoZB/qHd8n2QKXn0wDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJaW50LVNBLUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAy
+MjAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLWludC1TQS1DQTCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
 HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkq
-hkiG9w0BAQsFAAOCAQEAMKSFZz2rgy5+fphs7dP6EISgFjXiFTSBgMHINZyyhw+9
-PodhvQC+B/Pl/p8R1lOUlEW3+la7h0stUoi5yJPitW5ilbrcjlEcCX7F2AaqKBcK
-WWw8rC3sD6td85hTHweBBFWw2cKBFLSRuMdX6xZlDUKFxdkYAddcMyEXDsjmIWcQ
-5C+fEEF/Nc4LzhP7SzBx0lXfqv3YmElq8GWbDPwawqvRZCw9Vhc5gmkSchWbVbQN
-7p/awisKu7PtvZf8sAeoCCLQpIvRTyPLp+sL2I2kdYOeteDVd2dm2cEzZl+eSSoH
-ZPnZKYKx786UBXxg+ji72zJVE+IFJUeXo3zr+wknww==
+hkiG9w0BAQsFAAOCAQEAongard/cqAypTPlDgt8nFQQxFkNgZ0L0izzNhbZ2VuYM
+8+gxKgT76VhixF5fM4aojpTKpvfBjMMVfBeYc9zLjad4jIvroYEzRTuOVeHhsVyf
+sre2adRS1Z1rj45x5G4N6KriZimKJGgaZeBeTNA4rVO6Tf9mUzllaHG9e3VhPXCR
+Pzqhb29lpdIkqn3TZR+RU/gRHLgk5uAL5d3izvI2xmH16zWdtEULjPA6fATiLPDi
+36dmkUFNBQBQ74xZBBmj98R0FpVGCEPj3yX8/hjYT4R2ixhLLZXrybLwSbVD7MVq
+GOnF+ezXULHmbUkNUO1expuWLFnrOTqsNMFOse453A==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-nsSGC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICwTCCAamgAwIBAgIUKw+tzBfBb9FysWyHFMpfvjQQcfYwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1TQS1uc1NHQzCCASIw
+MIICwTCCAamgAwIBAgIUQ+NMzLj5C9j8fDWZOGMQ0w7huRcwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1TQS1uc1NHQzCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
 /WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAG
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
-ATANBgkqhkiG9w0BAQsFAAOCAQEAuGM8mgCqy20G/52vvcxKkXx8GgMNOL+qCbb1
-/QDTCBI/JGYA3gcL4w5tKiPXdlWrkWGACRINUWf1hXbz2IO8deb4j+BdvZqSvhhK
-XIzPWYUADtrv/g+lGP3WNRw1uEAyntblSm6wgmFAjc/zr1JkvIsbhGFNkRFBt97/
-ipaRhbNLW4pHr4vC+oHU4Fzp3qs1h3+f79R41bNTjzevwka8GuVg1tg5/otHIWOF
-8Ns/J9yskf7ZzcDn8BV0Gg7SenVZbhih+zM1QAWWrdyp4PHAPfsEFz/vu+REccuu
-Ihm+zXjr6OZgUWwtwaDYuP9aFt3OzOPWqs2tTw5rfB9O2M3Vzg==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAMQ6PCkVUC9IQH/ZQippzUv5UWQo+YagnX13p
+10m5+Qt4OT/qxaj1hKbSnZrgZfphDoQ/8DKmHKFuRH8sCNXloc1XNrgXDb959BH8
+1R/BreULnXn7avmSycVTW06XuctRfozB15YjG9V6EUQgPOyzWeK7qmtJWJSxlsMw
+JxRtbD8M+UOXHO8mmneRjz0N7kzEEOhr97sr/XCbcRuc81PU9n8X3gqITEyvBRld
+MqXNuVF/cvN8DJG9A7gKQ6NWlpks2k2U2k93je5lsofLmdQFQjc8AQ63aW8i9Fa8
+kBOWlHNVMK838BSR8DPT05Pc6f6kAT9biLMx8Z7z3/5AmbJXlQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA-OCSP.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICvzCCAaegAwIBAgIUd74QLWRKtr4xxFO4w1QPDIoh4YgwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowGTEXMBUGA1UEAwwOZWUtaW50LVNBLU9DU1AwggEiMA0G
+MIICvzCCAaegAwIBAgIUG6TTZ+C/RpJ/4TcDy/SngGYRzAkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowGTEXMBUGA1UEAwwOZWUtaW50LVNBLU9DU1AwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
 fs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1m
 CyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTM
 HGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m
 1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEw
-DQYJKoZIhvcNAQELBQADggEBAJRhilgcdQV11WBDV6y7bTk23ZDkOnD6m10kbAx3
-MY9RAWVXcM7kbN5MEhSf7IjqtJww+lbjEUba/RGVDELXBtkYCyikQ0Ep2JB9MElI
-eKhLe27Kq4WsMA8J9jvWsMwAIxU27+2MNFnoAFReoLXdN+0PL1f0RFxUpLv4zfo9
-14JELbvUNBqRmfknV3LVSGSL618OQcFvHlg6+0ReXrN59095hYXa/3WyMa42rMRS
-27Ka3RjkK3O18NKBFor22zUyN5aOupiSByH1XAPNqxLydauoTl2KRkRxo2AAm9OH
-iF6QFtRMvQBq1vZKbXaIOqqExWVRt+E2Xmh5iMI8jLswK00=
+DQYJKoZIhvcNAQELBQADggEBAFPckRG2h/ZdBJmtCRQ0sLB76hwRRHxm6WMyCzUM
+V5kOmpgcIRIlbSJmYCVBzgcmVgT0q/6eK6qg+vCnrhBthv+lx+ZI42x0QEatyL0X
+FTqwEe5x0nnw6wqhDuFBQ5KGOyGfb5fRk3cT7m6Fya00X/87uPs/HuoYBJsnschJ
+2zCyP3yGQRiiQ8moBvQZvJBJ1wwlNPduMLF9WhQRxW6ijxZGiNctHmZU452ol+3/
+jOK2N7FvkK19f+fzMa0y1bWE8M68fIIIylWEpiYSrzCO04nf6TD6HK2Ss25qCoKS
+dzowS1bL9TdUmwbCXnL/CyXSDWHMaAhNWD/DEwL6t3altBc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-int-SA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ2gAwIBAgIUIW6zSFqNE6MIgY5eRNeWPVgGjB4wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LVNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1TQTCCASIwDQYJKoZIhvcNAQEB
+MIICtTCCAZ2gAwIBAgIUWSf0ySmH86e0yX7mdf5oq7s682cwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LVNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLWludC1TQTCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEALXgDDiwP5GsoXBeSBWTh3mh79nmqv6mi4Z4PGipsMRVFcDwzXz5+
-mwp8UfbRFlnOEFAUfOGSxVec4DG27bSZpMDydDHDm/LDDRYAs7Hi8q5BwYKayqjK
-IDZLYttI95qMbTszhK6gHiSHBrzRk6g3PhA6ztN5QJrKG/CwMCYm90K/MnNJdj7F
-gYa7IBdCtygA1YAOniuSZ3aRldErdRT0VYq1N5oM76z0njgX8jN74K8MLc7zTW0f
-FTw7Bce0SQeemxIG2/JfsZUvMvxlfxYE62tuPA7W93Pa/Nbg0UPvLm/I7W1lfBM2
-EyCVTPAxZP3iv32ggEffWIyNDFYZIXOXcg==
+AQsFAAOCAQEAfaFAdO8ATfh6LHVfh/R9TVdi+khwSItsGLXJO3XEJd5luGSb2bkH
+HM+9TWZmBC/LHhtnm5RDcQ9qSPSDoj7KRHPXccN0mLjTwr/nMnZaqG8P/khxsb1V
+8vQvHVz3XrNXbothv8TCidYPSain7Zr3j8iB8bArzwOL5gf0z7xyDtpnsRMkTd48
+/cOhY+YA5vx+mNE7NUVUSMk1jtfg7Q8FVSGVOzZlRFoZ7IxlDN7nt2fTepPjuYDM
+NTiJ1qLwkve2mig0ZPzov4eTH+i/gkFC08Kqc9IKI14VmFT72Lxu6pDTAeO4bEQm
+Jm5i9Z4ffgJmbL8nUC4IDTOau4eGoTjhig==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-nsSGC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIUI5DYKcnDrG4bpBVxMmIGZ09qNF0wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyjCCAbKgAwIBAgIUOcdHr2fMC/woQI+w/G6U646FIE0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZWUtbnNTR0MwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
@@ -8,10 +8,10 @@
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGDAWMBQGA1UdJQQNMAsG
-CWCGSAGG+EIEATANBgkqhkiG9w0BAQsFAAOCAQEATLcxB/C6p3LnAOa8QrsmGvLH
-B5iOeRrBYTOcAtf8mtiPfpJjrIUwqufqbP/6cSz+9sH0OQ5WghPOPV/uHKi2Jret
-IHXYhAuHPHZEE2dBVFUAQN5LWjY1ouLCu56wYTY80osG9LRrCwEqv/AYUGBM4vcy
-cOBMwy/nCwYteHYfqDhphcAbh4gk622q6qd40RjS0sBoWgAkfb1uc1KWjUJVHJoN
-PX7+rmoGNpyBejcBy6nhTJj2HtQoJp4M4KtakM07Ay/NRuK2z8EsdEBi3TFtg6Jj
-NFgl5CtG3pYeyJKHqrgAzqoTAWbfUIbV934M8ZJ7Kx4Ovf6nzKmLECPT/kRk5A==
+CWCGSAGG+EIEATANBgkqhkiG9w0BAQsFAAOCAQEATjPFb+Y7HWDeWq02niJ4Puxu
+T68/Q/P1M9BCeLMCaZAybxCJ1FDR/aOGfZMF8TQlx77wYz63j5s4BVjM1gLwl59w
+EQK1xaav37Jt5IxfTFVBkJovOnDZFkDa3s+ebZfFpXl5pUFCZc8XOzkV/dy5mbE+
+baYZUikhVIDrvRmWcbXwzhEJhl5qfzgFkiWP9vA0vkVt3NAMuPclh/6L9844d4TN
+uVo0C6X6I9jK3X7x2skLk00RT1MeigOE9o6Xuu0SYujDOXBAeOcjCE3mFJZQUr71
+FkD3Exrxo/UjbgIpLdBNLp2TEDR5bbwUIkk6bZy37vDa2xYCxe+Ret3ykpxshw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-CA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUQRDyghLP3JKW/XiXj5plykQlPK4wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0zCCAbugAwIBAgIUFZM7fDUSi2PQ/ZLQ1JsWSrDyX7kwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEzERMA8GA1UEAwwIZWUtU0EtQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
@@ -8,11 +8,11 @@
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjITAfMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAgavbktXdpftD
-QS2oxSAkmJPMMlP7cEhTRMMXgyRw+A/ECOJVo0l5tyhGke9l10IidF13YXLHGO46
-meTvOyjcXsDhP3QJx+Yclbme2timXhEPHV9wO8KsobFKn9sdHareCeXSARtJ34Ba
-ESuXhDWHVtgwkaPOpq5cqcorj32A2KkwsI465PN/8lsipMwHzqW7JIIDTHyJHwZU
-jP0lGgX0XSg86TsafsXEwpkjMkx6fJYnLYfOIlF8K2j2msS9I1ylzGK1NxGBHXtP
-VR0b2FhtGsuEgsUSAM6ccxVqMomAncx6jo1K43DBOSdPkVbkKhan1Azq6/4oRCmR
-+JuBEk8pFg==
+CCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAd6LFItpHZW0s
+kKR7utmFTcQmuSXg6OJF7DSbF0bJkVfE9L0ZrYc4ATp3M9zTxlZAVKJIFX8RPMp4
+tNPQrfsa3jQGWzRdIv6dtsHau3EUVrNQwdsErtko3LUr/W6anHy9VTOJuXWQ//qf
+eBiZHOfxf2WAZCjDcOP8k6/rttbrpka0Y1VjPzNNXJR83lLk0ADxt2R9R6/PYsq1
+uxuYbBbkmB3vlLrfpYw3yCEXkaAByTCvCALaEXzC9vS1gDxhPvucS122A9GdCe8j
+8wkHMNFpfeCafqTypD6KDS/6yl+GEiB1ErHM2pkwn9oromh9R9M1ILkBtICy+w/W
+4FqGVfffaQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-nsSGC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1zCCAb+gAwIBAgIUW57E1IHBx4BkTnuhFJddCn5EVc0wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1zCCAb+gAwIBAgIUD6t9UhitEOD4JaK87FphFLXfkgowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtU0EtbnNTR0MwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,11 +8,11 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjIjAgMB4GA1UdJQQX
-MBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcNAQELBQADggEBACEm6WM0
-z2xXVU3eEu0FFc6PDhOR9y611OovbZIcuWhlqjwGXtLRLYXCdrq3bgWZMNqishR0
-v0+w9k441d6EODOZVtr1GWE+7sG+4DcEScHamm+W5ILT2G5oWi7fMyw6IXo0kVL7
-Spb8cBrY4db1V0iTqhlXznCUsRtCCslpE+SRabpM3QaxEFccZIrtnYtnu6kFq5DJ
-2cPWEUTZeStB0MRyUqzRSHhdposBNFvCdPuZ8LrEnpF3PD2Dq8sBmt2otQCCR2v/
-pxoYsy+UhvtV+XS8v+jlQ7FxSTrq1GX1ntpkrTecBHYPmZqdq33WVrVvjA9vnz/F
-u13Z7oTcP0BPRWk=
+MBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcNAQELBQADggEBAIveO3ip
+QuHtl08d57tWw4yCLEvkm00QHiW45hvkB7sAc/yc5oQ6Ctas8kFeiQlFov0oc855
+H/m1/+q69AhjloTCRP56ETxQD8XOYpJ65Z+h7xLJ0ePb16KzFdP4D/RrrP88Q+IW
+P8y80sk79ZYFpXw/pQVWmeYlZ/2B+0lRG2Qr14Y87oJq58e2v3D8JVTYIaqvcUUV
+KL+vvz2VD2oIRVcHkPKRDziC71au/uGZNpaRFiJLrqMXp5tbSTnTfvEU8UQNvWsD
+up7hx5Sjnm1hih9NxNNYC0JqjqAe09fPLuKEpmhkMs+cQBhQkgGum82WOu/BVgTA
+bOzdhBReGuu6di4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA-OCSP.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUGciJXgOd9wQYBLngbxcqv3ogHDEwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1TCCAb2gAwIBAgIUO/5lR94sxaHEzsErl8RFZ8quniAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtU0EtT0NTUDCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -8,11 +8,11 @@
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMhMB8wHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQB+/GpcM1Jo
-7zctD5eDqwLP4oa3zcf5TOqarFz64zQL8+B+deTBxrXowfNPYZTuHUmm7datltlY
-1/lekBQ8f+Tmo7/h2myLNPAA1HDeybVAiAS6j79jAK1/msF5j+hf0zYUOu11CdUj
-pQHN88/xHqnEYLZv5fYDkrRPNGgmuL3JoqpvVwFB/GInpcY18gRdAI5uxAgU4Phf
-SGhYebQX23DRfv7Ayx7eGXztQbMliHWIsE6VlwaoCrMolVb7wab6iBfJ9jszEQdx
-HpZDPLzonPSr5ctgNpRlvCfxqU+xXCp9Xz8g0cL2UHbFAG3zrV9q1nFY/2d2HPAD
-Yo00xIH2roKP
+FAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQB+jNOQ3Nti
+BB0Vi9y2+E/TMcrR+A0YNJpGQfxbH2bPs1RONwq+b8/RXzTb5OXkh02gb94inOn6
+E8uvxwZeFNp6hRdJWrUMP/Fw0H5zn7F/X7h9yRGDV3aICULFK9G/c26jgiQY4+P8
+j61EnAaEI68KDXZ/QFSrH/nxlb+xOl+MZQfnD4jEbyGWknL6RX2uhOuc3c6mzaEI
+FkKRXtLuAnGaaBwnjPenNKO7wPKaaF5wo1JcO5uZqaEI/hkw3WXUF25HBhq8ntx4
+VYKQaKQwzwLvptLDxUsf4nhbyQYNSxUJq/L2hnZDuiLFQzWiK4cFnOiBeojZDoq4
+gVp7BdWxFL7A
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/ee-SA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUaQ55XNfg+AWqJfvc9TUPcTRD2PIwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAgIUO1FsmRgdyx0D0iMZXEesXr+RpxswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowEDEOMAwGA1UEAwwFZWUtU0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
@@ -8,10 +8,10 @@
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBF1WlYs0waHwERrtiPc/GvNLAvF4ry
-gK2d6LV1nrbTxkJCqs0MpcnkUV4wBq/BEh5DpbrgpyCXQeZVL0oQ4YRvBCunIelZ
-f0tW45BEHn6/6I5iYwHzFK9cycRQ0bxVNgLQkkYat/QHyDxGrcUP8ToH7/wAOOyx
-XdfDJJSNONasEEXXMe0YL+VGEvxDlhTOmigxopyxWu0YTXk3XwlcEvWn2IHLSaVG
-m5kPDr+v7Ngki9fEV5FL+AsqWt+7RJJeYMirIPKxiw5oZx5PDnOsxVw0OT3qSyVW
-fK9OB1jqET1rX7If/rDZ7Dz3Gohkfo3Ly0n7/MWRlDCPMFHIfGEmNi1x
+AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBHY3Yp7JCSy1kJOdflxPplNuPlU5i/
+WTQbM3LKjibHKefWe22GAKIArymZWtE5/1OLUOyicB2bd4AdLA2dflTN2kZ0isVd
+K4Gk5z7o+i3rSULI5DeAhlAHPDMP9+NV1os+j/c5eK+CKAaWEJtcH+khDeb6kH83
+1IQDAgvYOpXrZTnoC+dKc/9esdmAzEWeP05F5PgfFCTAjKX2voMmnJOjGtSoV/UM
+76RHmB3Z4tLeJ85eXU2k6E+RwMrb6JLZe+xfeInN3EE/g4dfnh+/KAHhgLl7MTyn
+GRIlTXisaOYe27wGK4/O9vuvoaQu4A5QrZcUp9lFv7cD1Fz1E8zBC8oY
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-CA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUN5Xr3o/N4eO5I6nwXD5M0UBRTJIwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1TCCAb2gAwIBAgIULaosvYiVvbvMj07BsP9K65Ea2yMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGaW50LUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,11 +8,11 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyUwIzAMBgNVHRMEBTADAQH/
-MBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQA5TKlqhM5u
-5IltTjm38UYrJtxtN/Ienq9COMu1FfO/sTuB8jHTuCoEWZsxwNBdSwQDHHg/iCVv
-OTikpjfdRj+WpjteE1jmJaOm59YeAGuomIVXU3t/D5V6PkRJIjnsMizvsE6ScoxR
-77etvqNE/dLaidN+tQZDvL+I/7rcqx+7c6jx5ST9chCgTDqsFsKDTol4estWNvvT
-q1LTMBGkM7bjGwQzoEU0seYQ4lF1xHOxrVGT2QbEdzWnYVwRHjoGNVKbkDCPQMQ+
-YTNw5a33KqKRYBJmnGf/fDmA/g72ck5VI+IgJTyOztbS7/wm8ogmTo2qwQhwaA7k
-P1R6Hijqaguh
+MBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQBRB7aEaMyA
+kIN82mO+ZICrTUqFqe/0LHF4N3c5hR/JqjHGnrYcyNnewYccQXMQhZhZu1aRfZ8o
+bs5Hz52teZsxjL8udA0c75bF48Dd2BHT++lHV4AHO8EZsW6SwF5NDGGJH6B8bRq9
+5FoiuOtWHan8MFTqC5FxHeaXsDiqS8MlEojSTvkh5Huq9HQAEAziJFfUyRZ1W8qw
+m0GNX+/iXvqj0g0vrIBkVnPnUgHuglQITcH8luYhBJlv7I9YE55wNMCIf/xcHJro
+htKzXzaJvdXeZrNlOLTzhEt8scv0sOF/tgiqVYpIHB7ku5x0Qnw7NRf6j9zDdzqm
+SlKm9uRBg4LX
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-CA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUUamT4ZzR3fgsM0nTgQz8an9BapQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC4jCCAcqgAwIBAgIUU53rn1mYUmAkdWEYl4H8CjVjAqUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFDESMBAGA1UEAwwJaW50LVNBLUNBMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo
 4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDD
@@ -9,10 +9,10 @@
 owyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/
 Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoy8wLTAMBgNVHRMEBTAD
 AQH/MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsF
-AAOCAQEAM1eFzpXQXr1rI3qXtOqaXIakVeGPZk+cJfQMbaxA0xpgHjDrjIf4WbiP
-0exG/m7zlukdcPpufUyjzlfg4//4vT8PO2DYxa9KVPkbOKx/R/2cUKcIM+sLZcFw
-P5mCcXdGqG4pIA78GR3USB+P20RDStwXFPk7oEggYbCgpPzgFrN94hmfeDveV50B
-7bEUSW4OrZJ+NlxMxNvBdWtMHVp83BJkwIjvPodp16kI5sKXpfYc3R5kkbnz9kZb
-8TdkOoYpHb3mE+VDDQPL16ArKStHKv71bEnhtqQp1gGO7+jjQHImnQ08DptQIRPg
-V9oZ3fyZE6hinuDSNW9RtYBMUWyeag==
+AAOCAQEANp5URW6l61bXiiNt7GQU/Q5bXrlHO31ipGzyo1t936xejdsnEZuRqc7i
+QCKsCDynX7z6+hqyjFiOx7hTxh3tek/LICciZfigatB0mGqK0SsqaDMPbPvJgPCT
+PDJUskEI92R4Qzelvol46F/4mZUQTOvoCASZRcr4RefqF/ClcE167XqZDn2DYxn/
+jpNY+Bs+VINWEgaqPbznEh3sQHksmweUWW49deIidAZGCwIHJFfFOegT0xBSRRdp
+BN2WV78zIr4LFsrpwSKD82LJ2jdeq86hrc9UXJ55+JffNXtsWxXr/vXxiNEW+qJ0
+g4OGIAY9XAF/sJ2iPJd5ynaCmpEqVw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-nsSGC.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUFwlOVyCv3CAj/MbwMq5JKYKcH9swDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC5jCCAc6gAwIBAgIUVWq3GjxxzfgGFcE6ypKcX3YnKZEwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LVNBLW5zU0dDMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -9,10 +9,10 @@
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozAwLjAMBgNVHRME
 BTADAQH/MB4GA1UdJQQXMBUGCCsGAQUFBwMBBglghkgBhvhCBAEwDQYJKoZIhvcN
-AQELBQADggEBAFRPKrvY9rDlCglfWmewmOmWLwKbVpeeqH0OKZrT0fu3k1Twqbx/
-mztma1uUxX5eBWKwbfTrE2zkuQ/KsVzi/Z/dEKehh5IC7AxD89Uu30q5dF0zVJXy
-62ZQpWOtUbM3/F1MyZ3YGR9vPh12SD0fRtO5O5lCf5sepY/VLCjPfWLkOz7d/ObA
-LqYSvUCieTzX3QjmitR38dOXaXazb1ENzq5lsrKA27MJHv5IwMGO5Iy/I2ppVLTU
-IYzdpVDjHptEJvNgRB+ooU3fefxCzfPGCLu0/tzHonJCck+CaPB4lpQeF5RcrvBB
-sGSoGD/5oEkJRh+utsLz+WjXO/oeddxORIM=
+AQELBQADggEBAFUF48SjYDpRRNNlGynD/g4jHOW5TTdUueiEWNCYEayldMMe6Rhq
+kkEhY+3yC5Ys94YZFoiWaPmlR9FGFNdvjYV+abyElqYoSWO99qOJUldvm4xFwGQr
+TwalO2jqwy4qtos/qbw6M/dflrRQzEZ5Cf5yYLwm9E18ALbuiU+B2Jp3n5LQ6T1Q
+dDt+FkP3LlCWde+Y3aFOY+aLCkXgLwCOVCluwet8/IsKTGD6qzJhd3R2f1fnX8EU
+EBfhaw850FpB8Xn4OvDYd+rEHSURNsNGxLzMVxhoBZKTzbwim5Cwem/5n8epRheW
+L3eKTia8yBvTtvxDE3+iKkR+Oz9ozOGp6Ys=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA-OCSP.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC5DCCAcygAwIBAgIUWZ5fAt9hi36r+qhwtrSWZA91/JMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC5DCCAcygAwIBAgIULf8za+LuAorq+vV7GCo4dV9SG8MwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LVNBLU9DU1AwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -9,10 +9,10 @@
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjLzAtMAwGA1UdEwQF
 MAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMJMA0GCSqGSIb3DQEB
-CwUAA4IBAQAPJy8reLOt287XHVjExkoSxbaDv0uDDeFRp6UjDlaZ2BxrCCiyx7Rz
-tFayRj0qicHgNQI5aGmT6G/C8g0p2uI5ZvzlVUwjBUZKSN2XIkOITOPf/EIAavOe
-PPSiAokwNyB0OH/MIERo6nOdWnYewEsjRgcv1C8uprBt4+jn8vZuOcA1Kio5isFB
-EbrvgNLoWcxEmMySkHw0s3nDFkFg7OIGSxzMwPRIHKjuqb/+nCAlxqFM2bF+RN4i
-zzC0Z7+pe/LJhBbhZAkW6vx7mZoc71d3MqNfHAfb2ptH+ex7lcqXjwPg3m6q2yDT
-YSA63RmQUIc4l7gncgCON2SLJfoOL8AD
+CwUAA4IBAQBuugyWnIWv5eql67JO/rdh5JswvOfsmDql24twefbVILsHDMKHNMm7
+Xzq7N2lQ0Ye5hy1G0Tmpgd6GV8Yyi1lWwRmI0zZCsRWDYeodbXgDYbDoBBdzNUeH
+KpPqV7PCkdMgoJp8AAlYOJnNKw9ARAQBe6ut5mq1fNgpzRGEeHpl0WVFKF0c1pSd
+snNLv8LgtCOXdbpc+gHEZ4CLHffVic1cVWg2M+EivuZsFZRPUMFlfevlC5Uh9ea9
+UWvp3Ta3ipZX+XuCTkmzDMLRNm6pM/Je6yKo8zywxLgGt+kpK6itSLEMmQFql49A
+NWS74xUiOXJWsE0+YeZ0aaNSPe0tFyLX
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_eku/int-SA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUO5VHMswhwwzvZOi8778ln2EzGpgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1TCCAb2gAwIBAgIUV3pjDiG/4yqDPtPjv5HyVpDHrncwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGaW50LVNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,11 +8,11 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyUwIzAMBgNVHRMEBTADAQH/
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAzsesaDsiU
-iyKQ0gcE5PEGbmzCdu73CgCHWMkFPyg9jvF6sNLH82nxCcnmRsiFnoLt3xQCjW9d
-ypfBMf+/iK8y+a/Hx2UxygZENewd+ZDXiP5Ru73HNwX6H/HYiD4xCnL3hrG8vhkE
-W31p+lvIOQCuiBX9Ughd3KcLrqiYQF1pmSnpfGIhcHXZPn6Hb5/Lkc7UmL0FkrgO
-UgPRs4O/S0P5y33vxl1XpNDabjD795ILfH+kkzY275cG+1mUsNzotTO8+LkoxUHQ
-GvflEoo0UBv+ErgLdBZO4YI1KYj4JQ3bKBJ9iYxhM8w7LbQB7jBC2AfVOap4BKcm
-LWmo8V9+Fq2C
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQABgZe7+5NE
+2Ui9SdwymCBbH8KrZcPKWRCBb/iCxVMbt39k+MQPaQQgxEKqGiYYCE79yJo0HznF
++gN/Jc62tuY+oBUc+E3MvULqR6AMB1qjSs48uq57aunoE5gDgwoGU/gMA1Mfd22s
+X08jcbpWfsyDVglzeK9J/Ihc7QPnBk3iMnv10TuFq+8/C6E+2ZQmTYd9CjVAPyS0
+C1DVIBoPsRrcWlh5cKVXQIVBECGLNAIIXbPGcO6tirxOtNG6ehnROfQn6hBqZQrs
+LIrrRHHGuF+eT9PV3Eld4puoHQ2FYPo8lK41xqqbZJYW7a9kP0EEJVQYLrwcM/0i
+haT6qq3JwqKA
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUIVqBBNkbiTYOl3tNaX/gMt4Zh4MwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUb2Np/S2xMtQR+BvitAuzKtjWxMswDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAfeShvccw8RIbdHjxOZCo4nUn/
-gU8mSYYV2xIyENctB8PinH6jJdQgMkET20KAPUDZMnkZPH2EL31S+J+rSXimnDnS
-2+e9F+0H21aE4xsKIb4JbIvw0mZH8QO5qqd2XN5PlvM9CTrdWkuIgqCV+ADa9A6P
-UZpDR25y3BufjA0bnEAJmcvq3TOMk29Bg4D/K1cG0w3J7rBE0AHtXRMb0j5dmLWU
-RnNL330ShJPLbQtIdXNwes2MwzBGCaVUalUwcyFNMJ+I++qZy5xPm2iAqmw4rFfY
-A2XuEXh8R31Mi3oy+hapx/sTqf7sJgwcdqye7ZNm/DcArhJWvUd7SoF6ooQU
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBPEDwwrdd6h+SHkc0J+p4Ik/yc
+aoLWNdGsVD4hJYa0IOgNh6Z/GyhTXM9hr/q0f7fewjfNhXi/nrXNcW5w4FJERhHp
+HvZO6Z08i8CrVYSiijFcLf6ClK4e163j0LXUutBWY2PCf4TDS+fnF9PJmle0kPLU
+IxqptfSSoCjLuWyYyRmjZIdNCtrNCU9g85SDaUO6l79vBm0TYOLhOiPBN0F7DWXo
+JlOZKWEco6qqS22yIM1r/5KNc5ekPTD+UJFh7qprAq0riEfR38DYJmUq3w07q5Tb
+HQdG8JHEtemi7dHr/WoJY18MLZaF7BSLAwBWmBWzx8Lj2V+/4TP4NtRWkL7y
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullCNAndSAN.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIUDV4SfWKymVtVrousupxOWvXVUVkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC8zCCAdugAwIBAgIUP8GnOjltE+C0ll5IYA6asvsZ+/MwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowKDEmMCQGA1UEAwwdd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20w
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
@@ -9,10 +9,10 @@
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
 AgMBAAGjLDAqMCgGA1UdEQQhMB+CHXd3dy5iYW5rMS5jb20Ad3d3LmJhZC1ndXku
-Y29tMA0GCSqGSIb3DQEBCwUAA4IBAQA7KgFKbJB7BHAoR25XlxKMYFi7SRMdaLSn
-hUiAg9JQONB/XCokbD44pQPVoMNrg3E6iAtruYRIVkQbEig0glBlyrihwxOFWPr7
-LVDwes3r27tfx60yGP84SZT5KdnqKzCPSNepB1dvyVOvHDtu8wur8faQVB+c/ySd
-isaQMxl6d2pWKQ0WnSb2YfTEQec2Kr2fM/3ktJx7BVOGNu4SUPgCKnDIVFNxgT2j
-KEXtL1+csQr1hiNd4MwQ7jWROuCtb18I0d91TiqW/w6Cyb9J3aBx9JA6Njr9uIrw
-g/c/ICH+sY1Y/+9/LEOTsI5s3mHDmch4KffNfgikSYuDkI+DxCJd
+Y29tMA0GCSqGSIb3DQEBCwUAA4IBAQAF6YEQrh2rMu+HEcySofn4x3MStqoXrqwc
+mn4r4cm4Qvrlubg+vewRan9b8pMryixRG8obsiEp+KGEB74XoSJmwumv8Ov3WL8V
+njKT2vAfVLgyZp4p+ZD3firGJMdzZcRDAU8Sg+yM0Vru3fx40piusBqeMbc7lOga
+AF+JCMtHPEJc32C4Y+itY0bedXUcBALljTHkam5nQ6+ShPk8X7wazKs8gn3wIBSB
+XmLZtmqEjzeI1UuUoyP3/AymCgo90Xi27aA8GGsxsmaUk5Am07Sw9WobLpeRoNgp
+c4dV4+2tcDqVM7nK2V4LKNlH9/2oRXoWnQNoDBzRZis9C6SeNV29
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNull.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAgIULfgueKTkJuH8NxQ8egmKXo51T1MwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxTCCAa2gAwIBAgIUN3cis45zT7JXRJUjglyGLKsRNY4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowKDEmMCQGA1UEAwwdd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20w
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
@@ -8,10 +8,10 @@
 4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86
 exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0
 ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2N
-AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEtGAHIDjE5c7wCVm20W4m4yoFjnmtcz
-dUNYiUuqbamkVq6pOjeFNVykemjrOa8z1mmU3NGidVABDYV47C8yZISRg+Th7yxK
-/NCfdczJpHlGRs7yaQ+0i0f+O8FQ4vShp+QU+m5C/WRwXJBFiYSWVyrByJIOfVwL
-89TUqHksCLFtipQHc43Dnc+Aky8OH3YV7YQFWOjwKne8EyKETa6Iv5OgSrmSv7Bm
-HOExhY5R7kJkw5FA+mFEl0DjOxt9IjZqy3V/t3KKSte/dWK3/5WLuA39AzjdO2g+
-WARgneSLiT0hSVhDMHP3QDwY0rLX2BU5Jz4HIHkNCX1mXmobWdZvoAY=
+AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEH79W5n+TiJob4LWvypQNMj4Fi44pwh
+L/Pcpe+vXd19sN/UyY4WAH4S6U+Fu+wNlItMWWFQnlkibutTQQLpJhXTSR2q/ttU
+CWo9MdCJ8JGFwTReHDoajxdD2NJ/C8vK/dJeFNtCUXLAnwR2bk+F+StDQt6I6iS4
+EXL/A+y1L3jw9j/qVO8ewNp8QJvA8jOe3AQyI3q8fHENExUk0opo1Nvorrlj4xWg
+MP+NTIHZeJMGUfBw9vRwIZvfsx5BVQ5aqWpzVR9wxv7UCbO5NKeva57P6s+UeqX5
+rNxjzk0t7MV/3TZSTkMSVCUDc//sGUHMGk0F5fFsZ4/7SM+dO9+PaFM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN2.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7jCCAdagAwIBAgIUFStep9n8xmJelUD+nyW/JYLNYNowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC7jCCAdagAwIBAgIUQx7QA9Wf1gacnL1geoQjuSqMSx4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLYmFkLWd1eS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -9,10 +9,10 @@
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjOTA3MDUGA1UdEQQu
 MCyCC2JhZC1ndXkuY29tgh13d3cuYmFuazEuY29tAHd3dy5iYWQtZ3V5LmNvbTAN
-BgkqhkiG9w0BAQsFAAOCAQEAZQjLVGoEYQDMfj+iLEZAMO9h2LUgl69hnCYauYlH
-iKrbZzDYZzzhQM7mkzocd7lukgJfH1bCCwXEHc2BjKkBWMS9/uE9NtISnAPA23o6
-DGHb6Mn3V43FcjMs1mo/w2RCu5ybPZvOMY4N1F76GcC7cbqmmQfWbJPaSuwBM0sh
-SluLzjHCf9zqP62qD9G+SuBFB0bVUjUOOdZ4FxyQeyZbcaj0JtCKBdNmSWhs5a0X
-wpbPoh4JmPR3D/n83LLZqxGyrDi1r4RUE0CJ11HJjcwgDcJpQNdKb82I1wjcZ8h9
-78uLO5zhaAbDyz1WK9QzncRODdTp191jKdcCcKogfjMXkQ==
+BgkqhkiG9w0BAQsFAAOCAQEAWyk3hxMIPXpSeKlePbth7wYv0kUF0RmT6eERgDtz
+h/0GIVYx7kaCNQLuBAaRCP/50Tj17R/gYWiPN7YXa1kGfgUYy25mOsrccMR1wvYy
+KDzCv4Fip0dDkYAVFRmpTHzy1JQ64dnVlgOkCWuhSb93XOcOJ651BAgPjRwzjDZ4
+vHYidUF61uOU3i/UsLrJJXHdojIgYsyfHv2B7aCkuO4ea1WcmwrS2YYW7DoDBft1
+/X4vRkWhJRKBrertLXCzpC/0ERO0pvGAQp1CJJIddIoO+XwCKnvvgsQI0ao34pJp
+Bsk3ZkIyNeYL5o9MAEAr8R4KkpZqACFWoyGqlwP9GPkqOw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_embedded_null/embeddedNullSAN.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUbb1oraalxqx67LdJMN3h66qKrf8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC6TCCAdGgAwIBAgIUAy5rhhLOHnC6Vr7TTF+tKn9VA+UwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHjEcMBoGA1UEAwwTZW1iZWRkZWQgTlVMIGluIFNBTjCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
@@ -9,10 +9,10 @@
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMsMCow
 KAYDVR0RBCEwH4Idd3d3LmJhbmsxLmNvbQB3d3cuYmFkLWd1eS5jb20wDQYJKoZI
-hvcNAQELBQADggEBABlema6g+wBh/dnIuxlcepmu+Rf6By6nx3D+XpXsn/8cVaEV
-Op/oloWjQUOqMkdyfIuUuG6gis+JXojRQWOP37QdkW+qgR4I97c0kOedE700eUpY
-ekkBcThLDdWGJFg5uI2u8jMjxWIAt01Kc2NlDonW/oYh/ha8nPP8SKeB3pCLcotS
-n2UpSe/VxQnuF50zo5+JQ4F0bXRvoEsGjEQfeTqh2jKFY+rycAGFyawO5b5BoBi0
-31fz37nTNYIxoQvRF4kUudq9BYWh6XSs+CC6kSiXKNWZXK/JUlFIF1YMYO4M8zub
-mQ2M4AzTXtsVIf4x4/eRFpeoD6FUVrv2tYhscjc=
+hvcNAQELBQADggEBAEmpR9Bldw/m1N5yODTW8J5E1vIy8UbxtcNJnGZaQNCeCbXO
+r5d1EwqhGIsrVrYk4kjPD3gLPJuwAGh4yRVTiHWM+dCGf0EyzY5Ytlw42J0ny0PW
+15dRoEf07hKxnloqwXy3pAQqtoRyKgIY38xrSYcIAaGlt/wbuO469nzyD7QoamxR
+VcSosi0YxSlD8yye+E8fiZyBzB+fiD9W+JHX6mhYEznvtdW3J6zTG7aCOBEswh9C
+kVBpMu7gAvGrIviIrtw7EFYxqwmNQg8/KMfeitOoBH7aznq0qsVajkXLo2QrX4CE
+VzOabf4X7rLlcdqGN3fl4aDcZNuGR8goj4dgRkY=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_isBuiltInRoot_reload.js	2021-01-18 19:58:18.000000000 +0000
@@ -89,12 +89,15 @@
 
   // This is a built-in root, but not one that was added to the preexisting
   // certificate DB.
-  const veriSignCertDBKey = `AAAAAAAAAAAAAAAQAAAAzS+A/iOM
-    DiIPSGcSKJGHrLMwgcoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwg
-    SW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMx
-    KGMpIDIwMDcgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-    eTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0
-    aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0`;
+  // Verisign Class 1 Public Primary Certification Authority - G3
+  // Certificate fingerprint (SHA1): 204285DCF7EB764195578E136BD4B7D1E98E46A5
+  // https://crt.sh/?id=8984570
+  const veriSignCertDBKey = `AAAAAAAAAAAAAAARAAAAzQCLW3VWhFSFCwDPrzhI
+    zrGkMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdB
+    gNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IF
+    ZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAM
+    TPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBB
+    dXRob3JpdHkgLSBHMw==`;
   let veriSignCert = certdb.findCertByDBKey(veriSignCertDBKey);
   ok(veriSignCert, "Should be able to find VeriSign root");
   ok(veriSignCert.isBuiltInRoot, "VeriSign root is a built-in");
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-all-usages.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAcegAwIBAgIUN6mwWVAlTnk5oFG3wZyT09XHSIwwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAYMRYwFAYDVQQDDA1jYS1hbGwtdXNhZ2VzMIIBIjAN
+MIIC3zCCAcegAwIBAgIUJUeujAg8AwYGhKxQTX/25wMUlcUwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1jYS1hbGwtdXNhZ2VzMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -9,10 +9,10 @@
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 ox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB/jANBgkqhkiG9w0BAQsFAAOC
-AQEAOtuAJ6zkNZrHB8iLuf+yOa+kAGN7wdiBP0ii/GQtI7JClbo9MtnvmWpNu0YE
-HQuc6lW7UGvPnkhZhJ5MmJ2AvIbAB43a7EIvgAbOZzC9YnRSAzRsluY2cL1qXGfO
-F9+pq5vr4kpN/xggRKEeYG7HwU58P3Qk5SlQSq0ukqPKA0QBeNqDsU6MtCUrwMpu
-UUG5GXfOvPBMyMkPkpLbEdDyOH00Nz7cs1iFBvJrJmGfXp4864mwVKU0l6G1F0XL
-jcoeyotuFcMItt5CZIgIAxnJwx5Fja3/9euoj4WWE9CWSSOvjEChfHbZve2folci
-CRi2YzjRZlvMbm7fPCbFOjMI9w==
+AQEAG8zr2oIAMopI4FXUoIcqnnqRafTg/URYGcBcuqpXQiCFufslaqIY2c1iQExS
+S6TcNM2BD2+XjudfRO4R3qSNWNHcq7MFGaiZEOIzIF4bSozXg4HWLkhhZFxPO6Sp
+zWd1wr3sHs+LpympZAB4Hs3BCkrYBPACKwTXSP8iqmZ5gN/vRMhyyZMNPSBE9YYO
+H7hl+eDeShTQZ8wrhMj2C1QRP8bLtANMpR1yzHNYBVaGFEGJi3ojgSlkZjt1OBu+
+AXOkTU72YycuV0Pin+5RPWGTpbQCBKKkDT4dWEKe9Ur04JdrVuFPHY1AA422Bg1k
+WpRsoqRh9fqXtwntrf3gRm/jIw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-missing-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUT47YWiZXOn+1tYnvBEu5SAGTWE0wDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAhMR8wHQYDVQQDDBZjYS1taXNzaW5n
+MIIC8TCCAdmgAwIBAgIUb5GhjzP0jcrSceWaX1M31KkwYIgwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAhMR8wHQYDVQQDDBZjYS1taXNzaW5n
 LWtleUNlcnRTaWduMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
 qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
 WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
@@ -9,10 +9,10 @@
 JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
 Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
 clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB
-+jANBgkqhkiG9w0BAQsFAAOCAQEAiGpDX8QGuA5AD5eV3hl0L6tmu8bhjWp8dVXM
-tfakE9/eJMTO680TC2R4iFXw3778+oLtbtCUSAFTeA1klM8izLNeCptYfUEjOBXS
-QqW/EMv26GtgNFWI3tB68SKIwwff81jCiPhcUAY3Deqh6e3Ru/t4bPv37mpB4/Ha
-8iNT3MQKl/HXFWfipkYL6doshppIXKXuevwBNqUSGi6hxJVM3VSA56Zj4Y13VLOa
-9BP/o5sXDLlXLzODp3MlJBLP5judwTjuN8AwE70N4/IwKH6VLsbBTxzr/zBGsRdy
-5OhXu0sZJSeobtERcNY5d6MBnbkY/6Ac9mLe3R3N8oqjBbSlsQ==
++jANBgkqhkiG9w0BAQsFAAOCAQEAGWOD5t5lqzj8nk4TXD4wNPTlZYYpGqRNkQJ4
+LAgt8LhtH656c1OPKCxwJDQXF9XapnkqnPzpT4M3wiRfVBVZgEoO0TN0Fh4CWNJM
+Dkq+kNC+rCvb9bddoF9Kzw1MoGa8A5y/JLqAQHi7TL+GwkksdgMvjBkmbEUqc0bc
+JdZ5USOBJPEWcsyfxNleyLHtcvI0JcngAeHfb6mK+Tr3wHUeRq1o6llfHOz1nzwE
+Lf1rhl6+hY458nxJjIv4p7YzON6dmzkkbKn4Rq4PPppMy44w2jxNqqtbev2TGJBh
+lnEibCTgzwFs0xJaQpKqKpHy4lBgjAMwjTzS76UsI30sYV9QjQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ca-no-keyUsage-extension.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6DCCAdCgAwIBAgIUITtViLjIL231eZ1DxVXqQUD1GRwwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCMxITAfBgNVBAMMGGNhLW5vLWtl
+MIIC6DCCAdCgAwIBAgIUd46cj+Dhtp73GVJRwiYAMXpO09EwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGNhLW5vLWtl
 eVVzYWdlLWV4dGVuc2lvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
@@ -9,10 +9,10 @@
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
 /kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG
-9w0BAQsFAAOCAQEAtAi3bMtSL+rw46UbP6EjFRHliSOC1oBprDxYRzCiNciJ7sYi
-IaMYrMJZlYTt0PEltFod+Sf5imiRqpyCkHUDjwL5ut1/cSqYG45aEoysZV7ZQG9v
-ll6cmbd8owKjcfuY+ccSIze65weFJYdLUgYptRxqOzOFSYj+9SX7FuRX48Zf0OXp
-B97z6FURk0d1KJ2RYR5t5nCsuxkbrUIjW8UL65+t2fClAEhVptKBoJ/3fpUxBGW0
-CUtFZmQtcPVds5+qcLooUafj4KuUGHMa8cS5sUQTsP5sulnDXUsIxgy5eq/4Xiii
-0B8FguQlLQRGgIj03+yhMTdX4dDkcoFxjTfS2w==
+9w0BAQsFAAOCAQEAfo7G469It6DM1PTLY0lfxGdV+4uCJPAWNKKjDk4swLsNy1yz
+4zxv5HUwQPnZZqm5dZT22EPUHmycWzt/N/cnjfn10pxDvB41h+XmWgmLPltVXD6E
+66N+9sNHb+XIwZdFdGa+oHJI0MLLH+/Uym4t46HuSsjAjvSth40yf7D76WXRmPUn
+2bTuxqK+T2Ioq3z8DXx47fNPSqmFiFsj7wUdfQfxugjTbwDNlZ9quxEicYChnl4O
+mScxJ/cDoBgB2ZV3FdcSeIc+0aVd7Nxx5sNOifS12/O8m0pflK5dVUtoNXLFoa78
+udnWXJ0J9224khw25u5vabj/gWJGe8TaI61tNw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-all-usages.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUTSRhq9GXUguuNQgB1cajPNlFq1MwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0U2lnbi1hbmQt
+MIIC5jCCAc6gAwIBAgIUIQJpgukzHUBKie2RdSdPXFoY4LwwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0U2lnbi1hbmQt
 a2V5RW5jaXBoZXJtZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
@@ -9,10 +9,10 @@
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAiQwDQYJKoZIhvcN
-AQELBQADggEBALIOuIMR8s7Pwkk6ZbikaLzvnif47jzg8FVvQZOm5t7LftHNAD0M
-VbkKKC41UST/vd78PfSKCdTNNSEAjIooiHzHSO74MgWAS10eKvAaM9byYi3CuLEs
-w7CrS0gu3PtiHw6irwpYfbYUZIjYZfdh7DFScd6fagGPwIej7Vx30Gwv+YyeBMLV
-joWwEVsabWLO2SzME3dBe5uyL4LLho2fiOMkBwfgPRuSj/XbjQIoWULJbkWxrMoZ
-Jgj9ioRA5XoxG7JoPKByzG+D7gwNzE26ebhYxM6GQ+UwiUrdTPzTHeJnqhfZSIzR
-gCCYb3hzMWvZ82kGVRzMngsx8fsV4iL6R4g=
+AQELBQADggEBAA69Kh2Wk+QjEnMqyClxxpodQa37MQqGkXAVgSKgWHYQSagQ0EEJ
+SD8oDeNdgeh2mb7lvBysQCw29jgoRj8f/9Pi1+8xkCGBocitM2Um8nYWJ70nHMgt
+YOY1io2vQnQmI/dTIrSn330Gf5aCByqIEczEB7Erv/wuZY4l3RPG/HI6e94DXLOt
+rSBW/bFM61PU8C/q31VLZ8IHebdaaRO3OL7T0BM4bzQafc3lPfMbqiVy9GzBfQ/a
+nRrJirwqNGrKRyAWQ3gfvC60eNTjryH+NSA2N7gPawr2HxMkBqbUXhQwRMRatNKx
+JwmoBQTlPI3GVL42qeWGO/ozgwQoRqwHqBs=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-missing-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAdegAwIBAgIUMXUeQ8P11ilM2e12LlsWmiYb108wDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0
+MIIC7zCCAdegAwIBAgIUG6KKRn9QfADWZAOAYBt7T0HRwxUwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAtMSswKQYDVQQDDCJlZS1rZXlDZXJ0
 U2lnbi1hbmQta2V5RW5jaXBoZXJtZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -9,10 +9,10 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAiQw
-DQYJKoZIhvcNAQELBQADggEBAHmdOQoltkXdC7i33UmfPsn68s6mrB8bMsAiQlZI
-gg+o5C79yUJPsw+2wRETxdSDROe43wgZOWC0t0ejyzbeJTdmJoTuVfownhjvd7CO
-p5lCo7BvHDE7HEenBDg9CkS3a9xUEbBLfgTP9BPisZmQOb8anh21Tp/xK1ADXyUG
-5sfUJDDKf+zu4dBKurgUQs31NweeeYBypEJrnEIRaSLZDLlNedPnnclNJwTABdUY
-MApWbxMll3ynWI6U9nxZnbnrsOU0vTIYMT/8kYef57Qr37zMYTa3mPWSDPbCCnUW
-h4RsNDGyMEfBsQY8xL+F+c9d7NrBPmP7CXZRYFooftGPAZc=
+DQYJKoZIhvcNAQELBQADggEBAA3HxmNPBMOe9i3095PKNQU3OPoJ+iRM6cQLM6KQ
+PnfTAXPJFK4gdiY/xH3A69fq8h44F7VoHmxBf2VNurgI8GYiG2U6rLtTshPvDyHe
+4KKTIz7rqiCAjdU5jslTS56HYvf0NguwdnFumXybWMAq0ThKCbQMXK16umegtoVE
+RgtupUHDwdx8FA+GdcEYYqe7n+yO5ZuzoMlOdAaCl4sO/2XjpTcTNOauUVfrgJ9k
+WlKTF6kzL7jhQVYosbGNpE/NblUjRt2/gDbz9tbi/OOcRqq0bQ3l7g6k+lpX7yYf
+TKBnXzLhUoP+TNRF/MnO/Hj+HefiGXDtugH2e1CoXJOXluM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-and-keyEncipherment-ca-no-keyUsage-extension.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUOTkS20OEmFeyTudRYbUo0FcodSUwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMC0xKzApBgNVBAMMImVlLWtleUNl
+MIIC8TCCAdmgAwIBAgIUKX6X2shljk68mAen0V5Rvu+OMJgwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMC0xKzApBgNVBAMMImVlLWtleUNl
 cnRTaWduLWFuZC1rZXlFbmNpcGhlcm1lbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
@@ -9,10 +9,10 @@
 PdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGj
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQEAwIC
-JDANBgkqhkiG9w0BAQsFAAOCAQEApFmwXL566Gn4kUV6lZfJLgDNZocHKGYzUTRP
-2l4o+MRb+WB/CtQolYn6KwQ3AGpNGpBkciYy4yEcAV5QhhQf+OXXmOO6jRXXvlvI
-XFTmqPg+YgsfOJsVGtkFOTmWKpHZ+y2zQe3spLtZ21yesg7Fca2YGWy04Szwc5sl
-cuu4akaUe6rLV6shPu08AHOUN7t5iZrxX6gr8NgVypTq+Oadg0/L63MFlHV+L1B6
-MBjZGc3AhNfOcGRWCAdAFeXFsNb6Dn7uStQCbuFJwM5XH4Z8kilcR6JgbZCuMDNy
-nlUSC7aojWRp6zw9RF6IhkRk1u5mWmwIna9+rCMfYFxwJBVXUg==
+JDANBgkqhkiG9w0BAQsFAAOCAQEAW4N1dHXHynllzRvDdokzMD8vKAFcXyOSXP5N
+lFqigC5B7Gmt19WFwui/y+qGws1H1PeJPdt73ht/R0tRFMfptuswGlyPufT7t+yP
+bVH3JEPuBYBBNragxVsXtqkYIxJGNH96xGBhAbovL7Ie4iIhY+6tsn0j/DATn301
+9Sv+Q3aUTjmpAYo+X7G/TkxOM37vtJbCvZhEYy3NnFQliIdyneJoXRX7V7Yxu+Yv
+vAnoDbiuiaT4N/XnP2OTdiwi/Obm7ITujbhwf2QOJvB8gGBIcGQ864opOmqIOn6i
+gx6ZpIB0bXeRun3j7qQdm/NeunBBG/EGlK1bcobxYB0lEthxUg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-all-usages.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC1zCCAb+gAwIBAgIUd5R1aOlz9ARJLmmPo31zoRPVIA8wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0U2lnbi1vbmx5
+MIIC1zCCAb+gAwIBAgIUS7/18rlCU549DxhuSleCZnLydSUwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0U2lnbi1vbmx5
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2
 ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdF
 h/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6n
 cOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAv
 OnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2nj
 tIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXt
-jQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBADsVKdc5
-Bs1Ddoq9fzm0ovxiXC58WnlzMNXsv43qZzc95eOCtZ6RxLbB1CdfcCD8h2LDgU5B
-25WtoPBnrnx6WbKdivNFbEGEbFqpHApsYBLArDdugTdy8MaGED3CyydcJ5unhRJX
-vDcDCP636PWNJ5qhhNC6NE2ZOwTG9poh1z9elj8Wlz0/ndFScOnOLngafkL20zJa
-hzmWKoFP+AwxJ7XN/yEM6eL5XhK6cn7f+HLZ+cyMY7ssKpfexeZhpzfQ3cPuOVzz
-IRsdhGegcju4xZlttdxuBtJpGn4KoDUDuCgiuxMx42YoQ9kL6q3jUAG1MTUHARwE
-QRcEBoCRq0ij/ms=
+jQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAHGZLv0V
+Jx+wMdx0BJkZWUpJq2rKTepW7b9zsGKO1OFo3Y9S+jCHobanWqmz2bwiEThQ4Ebx
+wy6eXK9/ex46HNMU/R2OmqjNRJ+fn8NIbSLRK1UTGBnUNFMJgwFqoDGKCHmSGIA/
+DPR0dCFn9VFSVet7vSLSLbUurvTgfSR9GlyXw3abJ1BWsxP+3iCXr5NBNRVepZte
+NGIajiG8gnm+JVhAAG1XSnd+/Q99IcLwkJK6QQ8rYQgsg86yF7f1PF/+1jMWo/3E
+irkb0oBiyx3aitcPcci3yHcBAHqB/BIooJiQmt9EhvnVOKxFycw1yh3bpbzp0sIr
+MBu/rdb+5QSUqCc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-missing-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAcigAwIBAgIUP/u5aCIqClGKjjgItIHHvGUeYPwwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0
+MIIC4DCCAcigAwIBAgIUW6rkcglhshQOePFgTRd3FZiywHgwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1rZXlDZXJ0
 U2lnbi1vbmx5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -9,10 +9,10 @@
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQAD
-ggEBAA5kbbgG2nLHYxg7we13RJ+0nujx/AHnrGP9Yw7zDExBhmJ02IkWdVtyAvHJ
-oWfKDRpqpxz5zQw7ewC/dzWixE20oXNGHTX6T+ulOq8SIS+3CDxcJ06dK7RoiQR6
-zoAaTFFt9C5j7XZTbQalAQZqcf1D9GnMOQc1jzsUc5M/ENC9lZIO/AGnYq4BJC3B
-sV9mlXBQc3sA2nPfTHlHXu/+0riGL0NjkqQdwLv5uCMzLjxn2QoxTZf+H1LuDeJi
-FHz6JQujQ95Ek61iiV5CIzqP4D3AGyKC6y/PIF9FbX1eZb3OnhV6DlQJnaDHZHMd
-z+ofl+nBzI59gCAVB4tyoKdopIQ=
+ggEBAAkfffPLkCJ7QwlVv19U2I69EEG7R8dfPcckXdxRQvRBSrnvFpq4xP+mS+b/
+cPzkCF7XK2JbKILWdpLl1Gl0fqIMdqAo3CUgAh2EgFXb+dDaTNF50vIKhIEnnVBt
+xWVQDOxNtFRrwtoUleeV7gOdY8oII+ehCIAqWSSN0tIHdYaoD84ngoIOYD7qGytK
+KN7AIIsZ9Ka+2WVGaWloE81ubJK68VThgrjW4eOHGjiHt38cEqge5zco2xj1rSE5
+G7Szdi+gcIOMoqJon3mXq/bkqaUZyTJs7BSm/tic/qID9cIeX2ZpuKCu1HWJqhSF
+Jdx3G8WPh5xnKwwKtDmdZoS5NgE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyCertSign-only-ca-no-keyUsage-extension.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUWRmicBg8oO29RGagOvlvWLr27AgwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMB4xHDAaBgNVBAMME2VlLWtleUNl
+MIIC4jCCAcqgAwIBAgIUHwJqP3oKeHdRO4h+n18uLiTGuvswDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMB4xHDAaBgNVBAMME2VlLWtleUNl
 cnRTaWduLW9ubHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -9,10 +9,10 @@
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQEAwICBDANBgkqhkiG9w0BAQsF
-AAOCAQEAraMXXQwqGWeywb0LK45Nmp+92fw2ldDXYXhQdvBiP0qx1kMALrl9yEVI
-CjBMpJdJkVMun+ZYkIBq8CDVIwY7cEhPLCDLtrSmnbybRNgrryJFWpwv+KNEmlUc
-8aTFonrTUM2Nfc3ISoK3XTakkqsLi3rBqyfQUkoU+qiGsnMxT1W52dAw7Sm90wS6
-5CtK0BEbIXvh5vPrRwAYcvobijjXoYJEAb8yRZ3edY4BRD5rewT/i/NmULmtE7Sp
-l0Exf8HvglYARKulSKH1enTEMItWJwZopcG2bHHGSZkoV3yTNtBNYlIXG9fsF1rq
-WKOCXgZuZWaeq93Njf/o+gqF/WUONA==
+AAOCAQEAGT9yKiHNhaNqa+QCuBKgMYN6cthRl7cXmB6rbgSl6x4+LGLFC/mpVx2n
+2ON9I9weQOcdqdA/s6LaT4sdk3V+BR7NDUBN0mHehxxYvMdOKWirMBGQsU/yspEh
+asD9RVHBBiX4AaCBfz+k+a0xGg1WNX+XQr7OGARPBclvN4gK/C3EnqWvcInd6dKh
+L11X5V8+O76coeii1pRTuEJTgJhttlFurr10YQM59xcJCvbNnDF4NP0ithumm3TX
+iH6h29vnr9Xuyhz6yBo8Izvw2mSKtn619U4nxqD0kT11ovfOLbBfS+0D67i7uGUe
+9xnFnXmaC7x/UPZ40Ba2bpm5KIo22w==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-all-usages.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC2zCCAcOgAwIBAgIUFwmZTFACbjGs7M8v/LlgeNRlmhEwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNpcGhlcm1lbnQt
+MIIC2zCCAcOgAwIBAgIUD4en2K6uMB5YpGMfwGgTtM+cZMMwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNpcGhlcm1lbnQt
 b25seTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1u
 togGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6
 pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqL
 KkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3Zlqq
 fgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3sv
 Im9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6za
-GAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEBCwUAA4IBAQCd
-A7wxCcMFHbpYyjDxDFN8rQj3BcPOeewRGld3CWTz9tLMPbyL9eh7pkjrXTsIxWAR
-cnc2Xd+gSKt22NHitxEaO9HfzcWFlgsNFveLChtYg2RBjIpVgvZq62uCra0Zjtov
-rn7nNyjgXyeeQUOnUFu7nwQo9tJLeINzcKHHnrdD+lH90MBpyGMP86fyZ3oZfNA7
-1rcma/qeY1bC5XuVOzTC96NK3mOg1AE/M3IEUs1Omt1tj/znCwNDO8aa3S2txvEq
-/ZOpYPoUgXr6R8/K+7UrMnasTpfb5uTLbIhmHCYXEUfbhcNgAlifznf6UlQBLfrQ
-/hSr6xEucQJTNtGU1t4B
+GAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEBCwUAA4IBAQCD
+FhkKA16rSKyeeyWbKV0GLm0leHDTHD1lLq9OMFJTnM8oIV4wTxkNlM8GBvmXrbJ9
+bR2XBZADefQ2/hYBWCQJHBONOss+G3OF4xYYYQT0gDnhZuABWpT97FLMOsajPaAJ
+GcCy4CXFiWmBR3Z70duV7B7AbYM18SOstghaOHCT6dLzA00C/MkeuSwwmylJ0jjX
+VE5kmrh8RMy4o9BT2RGLNCAyJehCik0DqHyQjq61Q2pE/eVwSaDIFH29Q57ianyB
+fsVGxWjebixLkFm+GWqTbTsGyACwL2tDgE9zA7FcuQ+bUsmNt14+9Sf9j+DGcMXn
+wroXpu9cJ2hUBGH/1kya
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-missing-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5DCCAcygAwIBAgIUH7w0WMd3GFgp/fECvZ/UsTKbvqQwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNp
+MIIC5DCCAcygAwIBAgIUR9LRIE9OxiebeLBW62zXCGMQD/4wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdlZS1rZXlFbmNp
 cGhlcm1lbnQtb25seTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
 UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
 r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
@@ -9,10 +9,10 @@
 7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnv
 uRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj
 +nJRxDHVA6zaGAo17Y0CAwEAAaMPMA0wCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEB
-CwUAA4IBAQCQDj0rrT4r6MYLz3ZwU7db3fUIqfUG2RzgR9eMrkkmKBt7QKVhGQlE
-7F32jsn+fFVv/97W4H0tsNaUw23dZHv8wel5A4We+SOyPK/jF5uBn0uHBNZqPRtx
-+0ZHxhmT86oNShTHef4P53rf9J9LanNWlELuDu6OVbGHEwMEPcr5KPiZa/1Q1a49
-incwcWiIkGUme8VQe5qArXPUWHbci1XZuc+HIwSJETyBCo3L+p6ZIh7SdsoOxFm/
-S9vne72sqPWzw1wEguJDvL2tCwZpudAzte6V76EoQeaII8P/wX0/7k3ksPlohjvK
-lVv9h4t5OP1yX/Gu1sjVhTYUz+37vnrD
+CwUAA4IBAQAgn7t4QKh0bvoLuwFaZMhTEG1aeC/UH8CAi9InsjNFFKsrqKNMFXIB
+BHMwsNX0pd92UVQmcxOelJGKh4Ssebqwi3CegvUxjkoc0XJmJIsmGnta7aliFgYq
+8yS9CzxQAsQBS8L/NgJx+kYL5OyyYcOdKkDH2MnHvMl66JwSKoerp0xxK+senJmM
+UjvR5bZgR+4L/IZ9G1J70u5EIKOKusrHHnD95y9OtwJSXriErMDaeTMK7C+HSqdK
+6+d7OSj/l7sBWgvvIRBAOqIOe3WBnNw5HVAfEf+RkzL9ry0llF93z429BxnV17r0
+DecPXRH8iTA11aPezhblHImD9I+LnEnx
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-keyEncipherment-only-ca-no-keyUsage-extension.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUP+7mpWGvz/XX/dKUo4LDgx1fFE8wDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCIxIDAeBgNVBAMMF2VlLWtleUVu
+MIIC5jCCAc6gAwIBAgIUUb8T3+6DgXwOgUnl93BH2znvH7swDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCIxIDAeBgNVBAMMF2VlLWtleUVu
 Y2lwaGVybWVudC1vbmx5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
@@ -9,10 +9,10 @@
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCBSAwDQYJKoZIhvcN
-AQELBQADggEBAGE8SMcEuDCw90Zz2ylQQJw/0GyeT7JyW9Qk9MtEFa7uC8t/HTe2
-+pEDYgI6Q/V5PPitOBHqabl6sJ6cstp/N9ImnhaLwF5GSAu8dydPy21rXbuzITQw
-Ad1BP0r9m6Vs6xvhAw08Xi0v9gPyPNKmA0swaEu8SI6RtxHMUBGjO1aD3Ao9cAsw
-7/tYsf9oSoFS7ZrtoHUalTjD3MBLIGo+cCDgBljbgSFfDnYb7v4E5RXrYVQsvcdL
-aCDjMwGgGOtyl1q+gnyCKrV2n1/R8SHMxcRQXrqjl6AagiBiiM/jfIj3MK84NPpU
-htiCtNgamlunvEP4nHn5zoxxnf3on96p81g=
+AQELBQADggEBADPdx2NPP/lnfhFONgim1PT1z9715fnVBUOovdbOFrX4o5bAW9A4
+5EL+4jWXFEgSDCWbaVZIunaExT0clbrdP+96KSu0eCmO8UtWuEmLvWBpwnLNSJmV
+V07kpv4cF3ju7m6FMVn2yAWC3MwUVwtG3rc1cTEaQb8mRSP168L+c4bgbDfjT3SH
+cjc0Xku8+0qEF8mvDkEjEQ6DXciMQMEA+mdnhjLY7pCxEeMeYn3wbc02j0sDg9mc
+P5r7KFALon3lvNNvfgX8ksqs/FxvtkMJuJfxuqqw0JKbTUnCSWDUQLLpH5vTSNwS
+J6HaMBk4cBmm7RiMSNHb4q4DD2KPQaR3ia0=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-all-usages.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICyzCCAbOgAwIBAgIUUX0Jdurgr30SElcbAFDbfhUUVOUwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlVc2FnZS1leHRl
+MIICyzCCAbOgAwIBAgIUdb+6dAvNPrDSi4t1Mh0VWTH9+PwwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNY2EtYWxsLXVzYWdlczAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlVc2FnZS1leHRl
 bnNpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
 iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
-2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABG4p0/3YpitRo3bjzvAj2kG
-wQOcIbKqM7XDsuwmOqlfs6QO/8skNGJ4p3Hr89XX1850HkIUUO//Cm7sIRBVOi7c
-r1C/solG3dt0IcPRk/gru/wzKv14IeFM0BwrITnuPFD+ShQHYfZ0WR4PNuiK4NNU
-dGYHiZK45K9P2SOMeMIpUxnJZHnHqsSK9cSsHI50wnJiyjXzFEH8T2ae3AoI51LR
-iWxsVTvPghTzrCz+uHK9L+XAy3Hd5dtkpgt0hfnGkziFJSYMLBa985CZ87uH5S6S
-VaATSsPz0Zvkh19tWKvmy8XNWlBgr2L5ueyAqQRsdbiGBiW/buY6wiIAnMK8rVk=
+2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAOmZY9qkWrF1fxh37r8uzeI
+DIliysuC/r8Zv2PH1uXNQ/Xc2/YRevoLlXYFjPSv+dDLBTLU8gaKoc4A8VbScMXj
+RD/4Dgg5P8zp8tYhC6IC6lJU+BsYdE4bVEfxYIuFsj9t3IWaV6dfBGV6tZr5+hma
+fd132i0EB6j9tHdWxyjRjbLlpS+Ebws1YxpxhFthtDXia8g4jowh1SRYpK3a+Feh
+f/uZAVVDUia9iLK17JwQCWSvIAoMz5A1GyYzfjL6CnhIpXO77G1crCGoUeWbJ94j
+5IX1zQfT0YQhdiIQEoD11478aok3BhIIE1KO6iCSXj4o+OVAlFWZexPcutqnTFA=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-missing-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUFfJ6QK377m2KRVdj+UR9XM3TjfwwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlV
+MIIC1DCCAbygAwIBAgIUQSQmSr1VH8nomKY2NVNJ+HN8y+0wDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWY2EtbWlzc2luZy1rZXlDZXJ0U2lnbjAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAjMSEwHwYDVQQDDBhlZS1uby1rZXlV
 c2FnZS1leHRlbnNpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP
 8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OI
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
-I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADw1lVHbTaaO
-S+yUK5gx7HRsv9jZeJTNMiA/kZQdH1shSBsmiy083dq+xJciijVKUZX6EqocoqnU
-bEvO81Jcip6g//7YpOS9hwQzPjcxr2dvrpJYVRg9RJVVt0MgSO/hmnfIOSjkPgd6
-tRFWBt7PbzMfYrkxkRIU42OJHvwRb2yx/A08Nomftnw3G7TMY1Cpo5mgmfYe4l3A
-I5oXbYGUdp6EmXqRb6Xbq7V2ozAkhyYKtKHlhIpX+Lis3CttLzIxHgvysTokKZqU
-zaCfuyD3yK07FCWgqBqCtL2NeILv31yteuYyhtwtgSI0zAeKvY/jNl89AnRd9MsO
-JZy2B8lgAKg=
+I/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAA36Vps+r3Ao
+jobxXMLVlFswo/qOC6/G1BtF8l0UPuOuSf7xpKDWVsorWY/FmsHAdcauHm0m5MUP
+nCVhPfH8xYP6TBQw2wWrGk/RBnWDNLewrdEIlWSTFUALY6SKcvRO1adWGJ/uJZr3
+O6KCvrg22O4ZlOFLpb5B8XhUVcCPiH30vdo2MeiaA/IOs0dqMZAfzH5s25WRjwnJ
+byYST/yVutDdexECWVibIFwi1N+APduacEyDXvao5y3VXz96kblSLtZaSX/2mHDc
+fhKTLWw4ykHqBIWmDYs2RJrSqFM45bNShLYGCqTPmYFmCU5SY9e+elcfReLcbJzv
+FNK2ofnYhm4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_keyUsage/ee-no-keyUsage-extension-ca-no-keyUsage-extension.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC1jCCAb6gAwIBAgIUCz4X+NpaAv9/Cg77oYFcdU7RNdIwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCMxITAfBgNVBAMMGGVlLW5vLWtl
+MIIC1jCCAb6gAwIBAgIUOXIHlX23XCDj+TpQN+GOUIa0wl0wDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2Etbm8ta2V5VXNhZ2UtZXh0ZW5zaW9uMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGVlLW5vLWtl
 eVVzYWdlLWV4dGVuc2lvbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
 gg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g3
 04hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
-/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHdZi9nJY
-vvSTqnGuhcfMHHUPH2HeKhsa0ZPpT4nue+H3+yqp2XqUHHyDZB0CTEuW32juKUuM
-1QCLAXayS5aQhMPMTT0solweL9jof93vrcBM+OBFI3uu0mKtPG2JoEgq3l1yAetE
-5GFPn2UU+85UW3FEy+HPJuiz0Jfw7ovz5CXxTymNnyq4b6QrC6/Vmve1diLKg5+d
-0M8VPbWl66P6hnMAAIUOUmfwrkgbIzYmPm02iXwymGobETQKro7xnxdsoNu6KDjl
-Qm/YcYY0+GwYxTY/G22hJSvpu0Fq2vY9VarEkWpFFg0OqKjcZ8bbxjTpX6Tn10Bc
-OtmqYlTfYyi6Mw==
+/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkKUtc+iJ
+0yBV2Y3xKmTIDe3he3Cy3VSembzQTpc+FBfQ4n9gXZSw5O8PllaWD4pjz7ovDYNp
+rl422x6vkfmm7ebZb1PqVXZDkONXYn22a/76j7EFl+LlG6EMUw8OJ+iMTiCrDS2j
+MbTpyRKLbgPMcT7GxZZDmqRJKva/VFVJ92XuIndZrltQ/RAr5QAg1+ijo2VpowWn
+etUhR/GZ6WbDS85KQLEOFeWHS9ez02asCjQcanWgMYPqZXG1wQQbEAgfJLT1Bqar
+k+TRt7NRlJPbxI8R5UfXJfCdXYrT17jhO52b7UZcCmCe/kyQPwtir5axOupFy17i
+NHOBFw1PVX4KfQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-rsa.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIUTxuyWmssyp7VgRJaIqjAfVV/Oq0wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBExDzANBgNVBAMMBmNhLXJzYTCCASIwDQYJKoZIhvcNAQEBBQAD
+MIIC0TCCAbmgAwIBAgIUJaZFyIe9qjfQ+Uofk9CZqYEHlTgwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBExDzANBgNVBAMMBmNhLXJzYTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswDAYDVR0TBAUw
-AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA9jd0smYSMYdOoQ
-/UtobzWjwPuu81jRpbOsR/Q/z4A/Xg1Q3kTF6+5jvS1eNp98sxbBIslCzG2eNBPd
-OYRoZClJwLVSLCLFBmfmB9sP7TejgiVWMni+HrLoPPBcycx4ED4KWGikFuhrLQWL
-6aaRQIVYnrNvB6VmHywqKlcdyhwVnEAEAf92a33rl9xKqJ1lSB6+3NCH3e7xfiOp
-AH0Is4kHqkrwsxk1sEqBame0TXQmpn0miQ3kdEhX88me1V2IF+1VHqErH/lRaHO0
-Qj2VhWtZuBldFx1uFpvN4WjR5Kk5QC/z0vEmPffm0tzzs5ewRo7huQ5Fw1U8PnKN
-OrKqGBw=
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBALa6fRuvA3KLtAMN
+jeo0kNekw4UJ4eZK2m1XPHOEbrPXIZ9tTRAPPioOuNCLHYsj0038iu2tjpHmorgs
+sCYSjvVxVxu9jWu2Ka99X/o8j1bH137Rrr9JpD1/Ur5/TvqjS4YmL+vhmogb9fr6
+1Duw6H9/L0E+KROhAQcxjAxe3kGHhBeIMLPFo4jtpTQo5rFUA2N1z9BHd7J3/zAv
+T72inci5G739Uo2l2EeAWB3VtqrMCZeSLw4WbBJiRS9sO7Q3weIRH+k5qqBlKcB9
+hQnP+MXADWkphfe5AucI8aKY5fK5vCn2SlWQ+/6J3rnPkNUYVHkjKTnqkPBeoCeq
+S3FICGE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ca-secp384r1.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBjzCCARSgAwIBAgIUVyzkE3DloZBCm3ju+Wh4GQjfQAIwCgYIKoZIzj0EAwIw
-FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAy
-MTAyMDQwMDAwMDBaMBcxFTATBgNVBAMMDGNhLXNlY3AzODRyMTB2MBAGByqGSM49
+MIIBjjCCARSgAwIBAgIUOyTEDH+eecqyzh2AucmMGj9fTLAwCgYIKoZIzj0EAwIw
+FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAy
+MjAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGNhLXNlY3AzODRyMTB2MBAGByqGSM49
 AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMt
 qM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC
 8Fr3Gh/dzIN0qm6pzqMdMBswDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwCgYI
-KoZIzj0EAwIDaQAwZgIxAO0GJz6haDpUtNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ
-1OxFRuhW515lVbeTqfcA8wIxAOPA9wiEoM42eWaM3h4ViB0t1/bUHd/9MCrPfddl
-h3Cqf6YiMtyxqIE3Zg14mm9PHQ==
+KoZIzj0EAwIDaAAwZQIxAO0GJz6haDpUtNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ
+1OxFRuhW515lVbeTqfcA8wIwEy0o836FaKqjhXZB1FUAVV+3Qr3iStR9Be83+S6N
+9SZg7pExVwePnv4bYkrcja5s
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa-direct.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuTCCAaGgAwIBAgIUPZjIE0Bl6mIL01+OaOxyeSInqmMwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBgxFjAUBgNVBAMMDWVlLXJzYS1kaXJlY3QwggEiMA0GCSqGSIb3
+MIICuTCCAaGgAwIBAgIUfab+E3B6QwSzRFe7us5sNYBJa10wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBgxFjAUBgNVBAMMDWVlLXJzYS1kaXJlY3QwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
 0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKk
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZI
-hvcNAQELBQADggEBAEnAVtsy/3ZMHVq+R3D2cvkRb6Q4qALTokR53St6QwJVjdvq
-/rjkLPxQnYx03aXQPySd5RJnPFqYCBhG6djE4lyuxGoFowSasAHeRKBlue2ZP0md
-jkz3utl7E2sH+qhafPZEkr8rjRqw+itpVeQv6Hzvx5n2QfDYS1sVgJf3VT4eGV0w
-9x6NSmcp/m7xlaqjc58BZ9r6MZfYxX3A1KrN2LYK60HX+phG4yaxxGXz526wsnGa
-MKlh727Isa/zwoJ+Xid8TtBQjMRxBjDP0uXVNlSSEQb1rmNsYkav7JcB/Ju1TVZb
-ywmPAQWX9EP83wuI5y9fCuPfbpl2A7xA5Rusdy0=
+hvcNAQELBQADggEBAJMWIw3o4w2U4Nvw2R0QZ41JZDGMSRSj88Jc3rqU9R0RrmuJ
+xWj1/PidCJGo0ZhKsBxgleezXqyxPrnm/2nIK6GValEbHQh5lybnGugnu8sjjHv0
+XRifYbr+Hw1IIs6ZCZbqt6X4BsbinS8Kj/SArptw45dnXYO+xQVkcZVXRj8tRuWo
+9H3uWpnspur3Jod2fhhyEWTYYHiH/B7XtD81slgWrNwPFvsdDiiLqBgsZ7O/vDAO
+zE7VowW8qcs7R3sNOZrPx5bW+uAp2LSpZVToLdInMzLuLA9DdUqppyE5uBQ+MgEy
+s052+WQ549Z8LN0l8iLYs9Ir9p437jNw9sty12k=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-rsa.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIURXg1cqeI8/O+6UM+PIx0TwLOSWEwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHaW50LXJzYTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjARMQ8wDQYDVQQDDAZlZS1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUG5+/xrLNQFse7iMoGWpBJsrHx84wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHaW50LXJzYTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjARMQ8wDQYDVQQDDAZlZS1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAAtIPDZrLgYWbutgGK2Bhb9UKau6T2OQPUBxniyFoQma/vw6UJxSJrnI
-VQIuDMAufBP7rvkYm94UUriZTwWqrmsXtDspythIFtWo2cVZMTrJvW1f1iZnyAyw
-yUlkEYwqf60py3pVmc53nGyn/JZ5wjj3vDQKtL7C8kUVMjxt/vOCqda9m2VPCcmW
-PilvCDeBpKwohCZ+Z3TZsjyoudheAfNAPxUedbwrvPxfAJsUujQQy3QnvYx2NahT
-rBu7ZUGJu49m69LU34DcTlojifQf1rcxR/9JRhnofS7UB9wzX5K4dZAkRs2tWYYN
-j+p8/1ZVVeP+GwFHCP8/sgthIAICKds=
+BQADggEBAFuOB6tFv6DrMoDrZcBwqptvrUE152IoCVT7M+p3VPIgTA4jyAm3tgog
+ID3CZJmoYJrd+7HNDhFsjudGOF21k8z8snqSCCYBDETlLz5EKq5XmVGLw+hdKyZB
+MtCmXXDr4qBFupN4D7x/1boqiB7L/AvDPOTk3H+UOF4xPLRFFSCZda0pAcbuPkAn
+M07E1P9/qN6qBNp0/AT8tOHvcw5L2oSnfSJyYDCB+fStuh3MGj8crwq5sOprEWXp
+5xxFiGM+0RyVTj6CqkJxb7UuY1g+rqKHxQo0CauF3g6pWFYz68NfHdOxiq17T5Ze
+cc/o2Bl0HfldhPykzcdafPe4sEF0gxQ=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1-direct.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBdTCB/KADAgECAhR3Bv1qVAPzZFdNQ3AqKp7XIWMH3TAKBggqhkjOPQQDAjAX
-MRUwEwYDVQQDDAxjYS1zZWNwMzg0cjEwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIx
-MDIwNDAwMDAwMFowHjEcMBoGA1UEAwwTZWUtc2VjcDM4NHIxLWRpcmVjdDB2MBAG
+MIIBdTCB/KADAgECAhRfE+Et8NOs0+Akxjdd6jKTDpPw6jAKBggqhkjOPQQDAjAX
+MRUwEwYDVQQDDAxjYS1zZWNwMzg0cjEwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIy
+MDIwNTAwMDAwMFowHjEcMBoGA1UEAwwTZWUtc2VjcDM4NHIxLWRpcmVjdDB2MBAG
 ByqGSM49AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22CO
 JS3ktxMtqM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXED
 viiIz/AC8Fr3Gh/dzIN0qm6pzjAKBggqhkjOPQQDAgNoADBlAjEA7QYnPqFoOlS0
-2BpDdIRIljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjAE//xYRuVb
-tBk5ArZVvmVV3d1nWnPzbzwLurbnyGojqxaP8m74ymeBY3YTLwGlwgs=
+2BpDdIRIljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjAYYo+yN543
+lFkKtNGxnw22Jtgv0oA8co0+1n9dOxz8zTR0msc+9jzshYa7VZQ0hNA=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/ee-secp384r1.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBcDCB9qADAgECAhQVTGsaXSDmYqfHn1djjD3TeNJOqTAKBggqhkjOPQQDAjAY
-MRYwFAYDVQQDDA1pbnQtc2VjcDM4NHIxMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAy
-MTAyMDQwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXNlY3AzODRyMTB2MBAGByqGSM49
+MIIBcDCB9qADAgECAhRPYP/LpKATb8Eee6XdLyXiGnwgJzAKBggqhkjOPQQDAjAY
+MRYwFAYDVQQDDA1pbnQtc2VjcDM4NHIxMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAy
+MjAyMDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXNlY3AzODRyMTB2MBAGByqGSM49
 AgEGBSuBBAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMt
 qM6Y6DFTTmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC
 8Fr3Gh/dzIN0qm6pzjAKBggqhkjOPQQDAgNpADBmAjEA7QYnPqFoOlS02BpDdIRI
-ljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjEAhpi6TKIofW0DCSXT
-8WQOGf4aPXIo2QsKWloxgcU2FfTQU9wji1G+nYVKccEC8jdd
+ljzmPr6BFwPs1z1y8KJUBlnU7EVG6FbnXmVVt5Op9wDzAjEAx9LL4IWV8HF8MrGQ
+ZdFqG+sVSQ3QCUcEsVjGG/gZ6RcMlEnjW21iGqxnIZpKtiTN
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-rsa.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0jCCAbqgAwIBAgIUdYkPtV9/FwbYbJ1Isl/lZivlR0cwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBIxEDAOBgNVBAMMB2ludC1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
+MIIC0jCCAbqgAwIBAgIURzatuu7JX78XkY/w99jKWmox0howDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGY2EtcnNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBIxEDAOBgNVBAMMB2ludC1yc2EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQF
-MAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCXNePtJp5dZz64
-e1ieJo2t2nl4nCm1Z6XzQvUxtzVZgs6W3smeinik0CPkelCm/F453wpbWCwsI+am
-P8n4ELeQ79UFicY8wCB6+NDAofQFbNeCSKxhGo3l/OZ5sKIYrMDiCooRQ/9hNBd4
-oyFfeiuhYGgljuFVA7W5E5yd+Sx2F1ysfNv07pcXXN7Y9QGyYZprc1BvybmGIjq0
-77TVeg02O/v/ohayiTSHUDvgrjcjjIhTkhy2oM5pToQO0BNl066gSGUYFBp/bJ13
-zL+bHBBAPfUiN+22DTOzIU/+74DQd18HcOZawr9KOvLttsDIWFYljSRw1xKo758T
-jaK7fEY2
+MAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQAQ64v/9Z3EylV0
+lsRQI0PevDlAIEL8YHGBJWToq++WJGC3eemcoxyvvw1b9rvZgdkrrjx/+bjtOJci
+7kloRJ2xiZOYQlqvnpwFcNqTlMDZnuWkPX50ZBUelqk4R6cwm0HB1VFIN+GOwCMD
+zCC7t4a66HhAiqaejMDVcWMzw9VqytWgwm/isui/uBYQW84NGI1GKy1cIk770S6Q
+J6HTKE6LM526ytMjIlGBtN9D7hl7K8AMuupKySA2QASodOrAJqoT5U2hlCl5OviF
+OjmxnbgvveU6kdKN8a7z7y3uTkjhZpef81ImbF1jj8E1KtkC+b7Lm/CbK+IiEXxL
+u9pvfao3
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_signatures/int-secp384r1.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBkDCCARWgAwIBAgIUcYkmRSJcINXOE2zAOOzmdLppSmIwCgYIKoZIzj0EAwIw
-FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAy
-MTAyMDQwMDAwMDBaMBgxFjAUBgNVBAMMDWludC1zZWNwMzg0cjEwdjAQBgcqhkjO
+MIIBjzCCARWgAwIBAgIUMSRDv+0O5jNq1Obl2F8M+xzDNGUwCgYIKoZIzj0EAwIw
+FzEVMBMGA1UEAwwMY2Etc2VjcDM4NHIxMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAy
+MjAyMDUwMDAwMDBaMBgxFjAUBgNVBAMMDWludC1zZWNwMzg0cjEwdjAQBgcqhkjO
 PQIBBgUrgQQAIgNiAAShaHJDNitcexiJ83kVRhWhxz+0je6GPgIpFdtgjiUt5LcT
 LajOmOgxU05qnAwLCcjWOa3oMgbluoE0c6EfozDgXajJbkOD/ieHPalxA74oiM/w
 AvBa9xof3cyDdKpuqc6jHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoG
-CCqGSM49BAMCA2kAMGYCMQDtBic+oWg6VLTYGkN0hEiWPOY+voEXA+zXPXLwolQG
-WdTsRUboVudeZVW3k6n3APMCMQCgDrfmgHtqxUkM5KUpKCUqakjwsgI/q2O3YIfP
-Pl68pPAPoziiP38WWh50Wl6brjg=
+CCqGSM49BAMCA2gAMGUCMQDtBic+oWg6VLTYGkN0hEiWPOY+voEXA+zXPXLwolQG
+WdTsRUboVudeZVW3k6n3APMCMCNZB4rLFK+Njz93hs7gAv/HPo9isW3PSdPN7Dt6
+5lZVYZzti2Ram/Fr4ki+/pP+/g==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIURdVlYhM27Zz+7PfsoqUYAOajP4YwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUVSmns5EZzUHKobrhxdpy/ZtJMucwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCOo60ZdxSjmPTbq8Q3+MxNusAJ
-Tsr+9zvgsFeA9cda9wRzj2csjfl9NTZFvx8bSt5p3rvCHiHYte+VQvw5sinVmonb
-cDfx5/brQCYSgk4HsP6BRxBXOceHbrDcAKJIBHbVtLfuTp1nBcUAUCyxiUuqvwra
-hPg1zusD/8X4aS2JhtoBL28zTFVl5EQ86Al5GpiDenAqwTRF+yD9E2Kl2hBej+If
-mfaqdOS6Tr3NXnu7GWVSz3k5rbMlTXSjaRYHVZclVS3Bn5reBXYgkglZGysgB798
-n2NLn6DYISV/LqKU/9sqtUr6k8C2lRO8Ws2+K36kgYstSEcCKtuQrDJcli7o
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQATPLfx55bklmCWgjlOjZjD8EpY
+fenI0HAkE0044+KmVlFSpsETog4OK0aZKYKwDysClM/ZipzBpmcZ4ZczM0TbtC7/
+d8nfUmT5R/sXBuMmeNIioAn6J5JaSctKQbsVta9GwIyJUBuYIvccL1c5wUuxV8xf
+CaTrFgKWkDWkhOEY+TN/95l+Cm0Gwc3l+jom5UrPRyw9Cb5AhRiRc+x3HhgJ2hGe
+kKo4K/AfH/jE7U0u4VM+VZTQf5K92aih3f54vPW+yFfMkgFgzHtwIrj1WStknR7u
+yRjBCHfjuoOgQLm1svKtpgnMbRhucCkW+mifY+ZbE51vYMiRlK3sHj9hz3ol
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUYV9lM2zuzET1SyHRZe115RRiP1UwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC4jCCAcqgAwIBAgIUKXfW0gwCmh3GP4O2Z+Kd/CYbINgwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
@@ -9,10 +9,10 @@
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozUwMzAxBgNVHSUEKjAoBggrBgEF
 BQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEBggrBgEFBQcDAzANBgkqhkiG9w0BAQsF
-AAOCAQEAQDCUuorDk/swiKBvN1n5vcZesV642BjEesH25IfS0W1A+Pw4j4l/40wG
-oK1KIiv9WSY5aFAKV/g8tbWs2y0JbY9UbhHfx4/k/65yuih7//pP14ny63J869bH
-o5y405aPCkqUjbQzn2pAOh7scSnAqQJVgDp1MrSKiZHXLLXxDoaAhtssCrD/a3nS
-doeaZDpDnIaPr2Seqs9tFyML4qgYHD3eg4cswNa35dyhUEitBgR2e2QkAr0yY62q
-SL6qrSCbKvvlvG8KEfGY0+zVGwzLbLfb9xxVJrhxvIuIXEfT6lh/Xfs1iaKzZnEP
-2fzw2M3j/J3Oj0fg88gjw/c4EwgoWg==
+AAOCAQEArrxwO26t+coTY3AKAoLTFj8Syt469PatjuQA911/QB64+YYrIEs4KTCZ
+HHx4/WvWAttXNtYV7NYiLXJOTfJUYKr9MdoM6S4C9HHh3oBzkKvNyg7hM6RKr1va
+qd/OVJMulsJ1oP2x2tHeK3k0GkG70yplUxFiaQZ4KVCHsfUo5GPergooQoM64jXC
+ILBF/YJ3vtox2AiNCAA8Vv742CBavsq3bOVN2VxZ/B8yBd5D366UBP39TSRdWHH5
+X3dJWkJ1vkJMmWSbP03zNbqG4H0Qimq5Pywr4uUkmckx6ZclEoGbxozutdMx8u9B
+erZH6etD3bj9ExPVUcf4qHfcJUrmdQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_trust/int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_trust/int.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIUVfwn7ejbExZ3FLFDGLrYufzpmFkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyjCCAbKgAwIBAgIUNbjVwdBjmiBHgijAyjyGIHuhJqQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDjEMMAoGA1UEAwwDaW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
@@ -8,10 +8,10 @@
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsG
-A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAjUgLQfNXAZaTn/0gN9JoK6x7
-uqWFck2fMXX8MFOiITUkZe/NAqnkctl1+V7xrGvA4xpM0HlfY5Hq8FmrRmitA++7
-gYweck1Zr5dgKeNCraueLtFS+sgrfwP5JRsMgFMNYT1VVdstrKo8UqULAlZ3Ju7B
-rtB0fmUQxtJM5MCICVV0RSJUZKaAh0YCpktlP8wwZIDhOF1QKEV6uRHfoWGWNybH
-bJaZIfXe3F/bUcMmrvVWxilAoWvljxzWWTcfYjR78FBllTqSFSxKabnNaIAplRnG
-Lv5WfRyeSoO4jZm1tdmIB9kBJAGExowxxOypk2Ht1e8oDd/4V1ZLYg5PIvt8DQ==
+A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAO35vcl2OA9fAarEgTCrS42CL
+5BeNfQLO7QCIdMZBfcIrQ6v5yw7i07pYGptagz/76OwYOsKO1lqb7sr2nTCNovVp
+Co4dCAGQI460C6x3BOG7qyCFgZvf17xXl5filhMZw93LkWaeEIp8JmOTb511i1Bv
+1akdFJ+xW40AuHE7EswLXzN0eu+tVAMJcsuxibK3jTkEdIjFCVwMD/7LC1rcoKcg
+V18MHbh0zcDrXzo/jk8JfjqkOH5eylBtX2DH/9BjFcKzZDvZQFYlhsmADRHOmqvi
+YoEXJj2A6fRzONsNKtQQbmVGvW/rHP7/YIiaAvn0kNb/FDtSqmTcLazSYpRewQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_utf8/certificateToAlter.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIUFSgjxvNCcbVliKtHKPBbZ84DMYowDQYJKoZIhvcNAQEL
+MIID7zCCAtegAwIBAgIUD0km5IZjROSFHzbVwqApAdud/iAwDQYJKoZIhvcNAQEL
 BQAwfDEcMBoGA1UECgwTSVNTVUVSIE8gUkVQTEFDRSBNRTEdMBsGA1UECwwUSVNT
 VUVSIE9VIFJFUExBQ0UgTUUxHTAbBgNVBAMMFElTU1VFUiBDTiBSRVBMQUNFIE1F
-MR4wHAYDVQQHDBVBTFdBWVMgTUFLRSBNRSBVTklRVUUwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowgY8xHTAbBgNVBAoMFFNVQkpFQ1QgTyBSRVBM
+MR4wHAYDVQQHDBVBTFdBWVMgTUFLRSBNRSBVTklRVUUwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowgY8xHTAbBgNVBAoMFFNVQkpFQ1QgTyBSRVBM
 QUNFIE1FMR4wHAYDVQQLDBVTVUJKRUNUIE9VIFJFUExBQ0UgTUUxHjAcBgNVBAMM
 FVNVQkpFQ1QgQ04gUkVQTEFDRSBNRTEuMCwGCSqGSIb3DQEJARYfU1VCSkVDVCBF
 TUFJTEFERFJFU1MgUkVQTEFDRSBNRTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
@@ -14,11 +14,11 @@
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNRME8wTQYDVR0RBEYwRIIeU1VC
 SkVDVCBBTFQgRE5TTkFNRSBSRVBMQUNFIE1FgSJTVUJKRUNUIEFMVCBSRkM4MjJA
-TkFNRSBSRVBMQUNFIE1FMA0GCSqGSIb3DQEBCwUAA4IBAQBFk/o2pH68ED1wtkoJ
-fL+HBHfq489E0HqUM6Fke9Nmttj7pu+INk6uHqfcfXdM1Qr5Ji7o9mzBt1H3eNfP
-Yw/JN34SBiNE2PW6hDRgqzsAZLZ62S94ev98Ag0H6VRtLwpZSwpqLtiAdLhTVttl
-jnN5pXRdn3scmqc429S3w+GGH5u9biNJp+37l52bg7pqTbnlUpCxMg2EySj6Dr7S
-7CVJ3bc/35wdXKqIu3uV4lDUshNijQCQ2xt0mqpcZg0eLj8XG8I4YWqpKH+Yenr7
-dfQipJ0dCeJNjpZuLmptuuO89Ehg47HdbyluLP24VLyTSfvTPg32YqEbrCQgpwIF
-CajY
+TkFNRSBSRVBMQUNFIE1FMA0GCSqGSIb3DQEBCwUAA4IBAQA1ZJfPm9pINBPkJ/hu
+5we0GtnKeTaIQOvtVnOXIA8NQBDny3pAaGNEQTaf48PL7RViFmUNGubPVzx27ZC4
+HIsUV+fT6ASdkgj9HU3cV7vOIXTDWiZOm8pFoqwV9sbkFToUuEomIHAJ5qXnF7Fv
+3O87ePTPf1s4bf8URK3Dn3cLY5N9P0o2wdUKj5Ey94ZMfGnqH7lZ0PSoDTRdzb8j
+lHp1bskW/s9jsYqF7zSExur2OZ3DBwQptmoiK6jYu3h5M6+lV/euRjsJLqEIBSu9
+krgKiuGeiG2F8aR+Vi8agulxZnm3zmZPCgIxHOe2O85+Ak1GctL6mRopr4nYgc+P
+dfBK
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIUT3Kq2EvZPmbgEZ8YOXaIZC1wML8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUX0wQbjf3LQAHIgB14ftnKbI1mekwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAsGA1UdDwQEAwIBBjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCIAaqoBfhl0sg5NeCvQrKDi5vm
-SUYTcUn3J95KPEZS0SmYOmKSNQXG6LjXaOKXZZ1TjMrBYVZfjJn/pSd/ee0g+895
-XnOI9mwDtWQwZByQC/LwmkS24S8lOxZPN2w5AcbFdIJeOT8atRgM2SUYxDqAFf91
-G3YP9NqetEdMGqMlWG0p8JpoylOJzQQUdKm1lRcRgZMYKrgi8DlXHDImitQGQDUF
-yEG26pEOaE5SlMv/d+qf5SQs8BDOXW2Tf2ggZ5giwf4mvjLoFPJbgB73q7wwxB29
-1aRW4I6ox02imlohx6Q84BU4hIstvxgMtER0EHzviycoxgqxhmgW3rbPh7Cr
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA3q3li09bMd9Y57E2xPY9NdMiG
+SA7DSsGnxOchtT06MfkP6lH4PlKDLATIEv2CSq2z25Thq6yYWyZnWXC+tOptACjQ
+FDS5scNAI2KDwtK7pqx1+Tr606DQI9QUF1ZeaKo7DP1ibmwmDu3cY16RaowbgaCh
+bU4ADBkZNAlRCvrRGCtBkdUl0hqVT6sW/eFkOK9vA5pDHZryQv/DZSg2bDeJIQBL
+ElArPKv3DhETpuf580rkI84+w7HBiUSNHB2KPq7ctn4Zvsou/zxJ9x2px/7t+pLx
+TPoYXl9QOgv2uqKqMr5dWMAgZXrFqvXVC01JHPbu4BJDKi5qyKcdZNcdl5pq
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUa1AoPfHqY6gGGp0ZMUI8XbOSYgUwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYxLUJDLWNBMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUYXRFk++ngkM7pfne+aGZuKsxTYUwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYxLUJDLWNBMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQA6aTjDAuE0O3yRqzYqeA8F1MyaR14laE9eeXbkg9dIufQN2r/4rudp
-6a7B3WzKY0sdAVGuOMdaVnl9cMda4ufgtHnDPWSe843RZWjuTnWYpLjGi5qIY+Fx
-y5z067CZ2i3Hvkjl1cAEsJkJe4ccjs9z8L+5kPTMyak8ovZGoaWTkuUi9nmgYtcC
-Y+kfVSth1VOQv1R9IEP7BDrdB2IV1BtMVDspHk4xAzPrhMk02NTV0Q95TUVnwYil
-7GmPcv7jHkQUN+5RA8b3aRy5Ox2Tkuc/DRtaerAirgMujUYeJDeaXRolifjBsbRF
-DoNzFqDznubI1d2zWLx42pKWYLE1SPTl
+CwUAA4IBAQCwvmF6hChs9K1PKjkg2daU5Lz2zAPhh1q7urmJu8gCWSTGz+PeJvKP
+zFptbQNPqFnDG9FBXX1IDkMJuZinwyQb1zcLxUqycX4ZKd09BcRIeS/9BXnOy+Cp
+1QFDj0R/wdMYnvh+yfMFOSLVBSFkGtHkvkDoaf7Sm9vzw8xVG8L2785tkfGVsyd4
+oqhDbRJ/RQu4wOjS8NmIRp8bAUg69YA1+wcc9cTbsp772sA529XzNDT6+IUV4H3b
+TcDW8/Z/A28616soIN6F1KXmQrj9y1lcj7o4uuHPhlpoF+CQScZNCKE94QqHqHvY
+yPuMZS8TZz0F31Jnb9sSncDWtK/MOyia
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-BC-not-cA.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUXYLRKI/ar+Gu1WLfZ99cz4uEMc8wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYxLUJDLW5vdC1jQTAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUT5zJeVS8mAKQvZ177AdPjbMcSZkwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYxLUJDLW5vdC1jQTAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAl05jFfQjgQwFhnQwCVN+srqRJAcsWj2JZl/B+z0cu0rQwovf
-/vZIWLu1kclr5s6mt09hFZXZs7p6MGH1/ELZRKYB9WiiuF9iqc9iJzHzodKjbqoL
-EN7IV/Qkc+c7B7pmxa6GkDeVOoPe1T97/Txk21m1J3fn7FoxX6Mn7UIaetuNrE2S
-Y94KeHBPt3B59a6SGi4hBj2u1zlIjjA1ETQXBeRopaxvfD5EFpbcAYg06CHBl2Pv
-HrPZMF9CptY7AaL9jqdyXE9uszwVI8oxGcpwXr60zggx6B3KW3OXBIFtnKKVzc/1
-7VgATRwyxLqv7G4FMpy+FXXbJBhRrzbAgvcPTQ==
+9w0BAQsFAAOCAQEAjr1UeC96xOI/hocWQtnEJxO9+qxnlRzSuM0gZKvjRlaSsGyn
+QmN+/hiYSl71Jq4IkLTxkDy+Fn6F/zb353+f0JMZDVjbBuBfr4HPMTdCHKLnNyoH
+XkDwIc08bhoeVFj67OA0E/DxyDjoxZNOfvVALC/8xWlvfrik/N6NBNUS/CPCEFa6
+G/R2RPpea9Ftx5op5SMApctxGT5ZiYTSER44EFLJ2GVQWm8Tt/PNNXt+sYAaAESF
+vuOYwiRp17TRPq7+ddE3omKB5xA8e51y/NSAtK8SAsE6nDnjJUmM8sBaitfX6vDY
+ji8NYlIWVEMLkEPmg3dWiUz0WYG7Z7RkZ9yT2g==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v1-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUS3Lpca8nlZxk5a8Hhx5bGAoha8cwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYxLW5vQkMwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUc2AKlc7qreFiWgePu0YLMlgs/YwwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYxLW5vQkMwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAIxA6UmArMYpeJrE7oSVjEJ9tIkyPk4L+IJp/+558HMv2AAhERz69LWo
-ua5VYYpGZgcHWEc+eALvlo3H1dYxfY9IZP1D0mbA6UNprRGtqs3yWpfcPLgkrcHt
-fqFN4vZ78ftQg2XL0BbpSTcMmNYesGqsEJRwmzQge5XlcC65QZp2QutGI7vVgKjS
-hMtnZDgXd6aM+CKWEgdanXmO81tr9gR+/HWfzsGQUlV0aXUxrOcoTKrdZER16UGr
-LM46TXsRIgqj7peANWtByf12Yq4W3LUAQQ+D9jMAmn8wNxCT1HHxOA7gdFaL1Hdc
-Vi7Xvl0ZRGqYLW1WN1/X+nbkcJCrC3I=
+BQADggEBACgJObqHt39+EYoxXhZWuYTAWF7Kjt5jRxluishYoqZ2SKOvhxe0UJAK
+ufWLYDbkE0rRW3SNmFxipkXO8ERztDIjc1tbmFJMQa/mC1A3N7YiCLHO8k7t97ie
+diw7nEF6kxNp+OkOwZqWiH4siyTiFcAGArnh7j2FZt9dF03FgjmtqAtpB02fON0G
+YXuIms0yWHfQv8kFuOmJ9ScBoDZu0layvueWnCfnejIEMyqynRR+ZkPeb5cGqRpL
+HGjZnXYXTR2//DV71uUskCz3SGYwttthlDdaBM/AIg7GZIU4mL7iLSq3hxdpVQoM
+QXbqnL6xZrDlSn3OmT7/cNrIxdf9qUU=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUF3t8ndNq2cCbdIEGiM6yXIuL79UwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUATfzH/PSKv0xC89ayKzWGTWeIYQwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQAn9obXEQq7vdS1P6XnMiWmTRhT4vVNfkwTCoe+9CNclh2F8HRKVaSr
-Qg8tW/HmOuyyWYAsmynlVvRk8m0VlT8fXqRhYv6khOeI+gcITwWmZHN0og0wPhit
-U6xpsWVQQdt6iW9wCFtvsZPsjWLl3IwQ6Emq+7jGFFRA3QI1BPuybaBRtqL9QYTS
-MoGXu1KTUFO70vNQAIAvIA8Jbi19Q7mtXigS41IJmMEon23RIQVNGFnlr5kfMTm5
-/VQqEHttRihfP9LP9SmHdtHLdph5SAIUES8/GerPb71VwKFNd2oqPz+lckqrtITT
-uHWjVi9jTTkv3aBwUJJw+W1OnpnqqRSr
+CwUAA4IBAQAiY5jZpo5IV7FF4xLax2uq+WdCxUDJgYQeaTiu9RlJ84vEcHIuERwu
+CaweD8T/4fE372XyivZlopfJ3QR1owqfjGBA67H50mJAurVIBpb+cBnHSxiSYezG
+NNTrHwosfb1G8H/oT1/AQtjB4tMSuD8RkTQMwN2G0N9JAhoKL0EnNxKFzuW3IZrW
+A9B5mxEe9LLo4JhiNFUtm2Cyh7KiOgOC4IqZfh+A2yrJYaJoBlc3KJx9EfhC/nnm
+jsT4W2xxAXn3mNNKaaxnqF/e1jMSlxuKvXTYu1CssaixqQ3XvdmtGRcFoMSgS3RS
+MBnffZz/68BbniBcHIgqUp5M7jMEx6lH
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUUctdzzKDosGFoGeIjnd4yTFf92AwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUfU0RGDUqR251hZR7j7dGSVvLOCEwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAOYilXOeVvoRugvbEuQz7ndLTbpRiViR3sQAIKbhbMAbmF/G3
-KaDfs7N1ZOqc8dMAjj1/KZZ4+2ctYUwZr+Qd79oSns9ykPIA4lllRwoVLePW5Eyn
-kgc0FlmCLfu6bhkpNebrHkgsLCZqY+BsUHiZFuaStZi7CJwuaN88qNzLBo8ADtPo
-8dChchEAyN6IYrPjxVVe0dRD89Z3ECCtv1u7PwHXLGPBlikh2cnq2zmLXddEB0v4
-WXMYchcQjVrbgCQ70fbIJew8sYHIiHHqdmo4X0hPVaLfuUuM4duPIEkv+rPlAWqH
-WO1xSRV6oiVy/j+whActJlmAkWhBkU9iJqegxQ==
+9w0BAQsFAAOCAQEAUzqCpvNWzcDl+DVO0zNcJ1YHLwCTGzD62ejKfjvSUFNloW1n
+VYfWP3FN77vtfHdPWZOWcaPGOgvIAjtrovv8PAqE3zusM8ml+2XHYckXReOv+3xp
+qMN+8uGgI/KjyYuuxUOcNnWjwEHs9aB5A2QznNfb73vorBoMGOsp/eRRu/88SIsm
+Lb8faovBW/M82DddY01u4pQ7NRdk1lRJP7NDwyeJi0sp0Tt8vkqQmaWwVxJcECQ9
+pjyHdcV6I8X/0unB5aTDVNPk59FQ2mBnL49uhwDLPw/CfvIFUk5t4e5Y8fYENL1o
+bCmQwdRtv2uvglGbduN14jNeWi2BrR97CwieaQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v2-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIULxbJNjBBH9hEj+KaTeYOkTw09SswDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUH3fF+CwxPCO0p6f03bj8udeTCqMwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAKdXFnDA5KVTYsfcCrNsqQYJDA9Kyr6fgGjuMlpncl5jy3W5BJ4z3hmS
-B/kV8MBvkpkss8hXrQ3Lu9t7CQAFELF09N+UqzBzw1cnsxuPqE/tWQ/yRWaObBdp
-5OAGpJliqi3O/6QbXaPqMOZDocqhHHO8tDD+YEnFhmmYmuXGhC3NYd+K2C+en6uz
-DJF3Rrsy+fR//sBKAxXzS0gHBAQOnWFXdKFT2dwMDZ3TTgFPIGPrqec+9JvE/N8S
-E820TyXQ4jwv1uHuaMJDTnBy0pFeoArXfyM90Cgmx38j/xoDeaQLYaFkIdoA6U64
-wcaWpmccblFiahZNTY6vBloGAR5oKsg=
+BQADggEBADV11pKOwjVQe19NU0Dm+mxFwfr3JtigZJTuqLkDuI1ZzoiLdy5Gm7N2
+HEzx+5A6XoV+HxAA3vgDXjcxqNoBlUFZSKcO3dME/YAwtE06y5R1o8xU2ySH6/Dp
+N4Cg5hVPNDo/gomEsqDou3IlLXVQO64fBGFT/eK4fnv96jEMl9hkCbHUjrz9XODI
+iEkz2wJSiBmrqKBG+ZB66HqvoqoCNTSfV/IHE85QEb9YanJOc+DR9CYN5S1FILEa
+LMi/nVB2Ldn42kBFZjXxEdkQFIWPyKZIk4wFAJwsw6fNGUY6UAb7exLTEhkvP1nD
+cgozZt5aezZOz8N+xKwseT66ebSnBhM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUVTPc7O0NpUOWMo072c2iVWOMGaMwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUc1r1zrsB1TOy5rvPR+6sCmW3WLkwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCw8zE9aaN2LzFpFcn7NqmuDeZ5u5bVHj6tGVGluAqrbP8mQ7IV9ZR1
-3WHpTt+ggJlw3QiZULXUEI2tBtul2SScp0L7RFs9+0ib+GUm3LNeOVYqOQrLRHJ/
-YF/fxq2OEy093Nc7ntZ4nclfvYUURJsCadXFd6WodkrL5Isd3G3sdOtBefv2OId9
-BHLKy4/MWTaUgWxWsxhKzEITTBTUAGEGb6Jv9GCKySEH5bIh1/fL/v2PTqCU7gq5
-y5Hw5Ab1unTW0+m8PWTKC4lfGCbpm31ap49YVYLiZUX3nWkrXP46H8RbMTaGWnG3
-GtmtqNd66W+HF6C38qYS/3hM0XwGIh0K
+CwUAA4IBAQB8cqiLjiCQsWyha7QOnGpJVDbrZ050OuDNgg0RZ4h4+vtzvADZFr9T
+bbDS5lBUwCipjySqJezUVAbjXLwFPVilc9HW/dZYQCrTHq1KsKma/hbS4+evrW32
+EbEIWLlSc/Dqh8TIwdPtFCtkaBDibIEw4NRjjr18qckN/QQRDRUTjWPFE3nSsSL8
+ywlfQN22LFZpz9mLDsR7hgHGVQ7lKSn7aFspCguu3Z4H3IotMZKd8HmoItayeOwT
+5r/tid/uBWUMEV/8IevoJ97arusRZxpCkgrJLK0lRjYfpdO46G9xyEa9NV6R3I1L
+OYG6w/XbJYyJujCE1G9tDGVVB88lR41Z
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-BC-not-cA.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIURdUTmOGTJjd+wP5r4yZgu1J98IkwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUMWZpljmNpyGng0Q4Nt3ZY0BTjjAwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAYuV6kCzHGsZWRcjgHwUYM/AYzUv7K678x8u2k9s5dR4lXLk9
-Gfu+Rrr52IrLbAYSFm2/kPAevVX2u5jWOUo58ae17QJs5sV1wmvB0150zlDECQ2D
-tegXXlpr56bugH9VS6ZcHzEeS+E52RxBj4fnuLrz1TggfVtmASS498n/VsXetHTc
-TaV9QS4f5SCeW6iUxDBCGYGmWqGzBqVTN5816k3KweQFiQmZlOHvngdiYcVvVegb
-D2RlC2HICUezizhyCivpJFcF+AF7o2lHDCJVxJXZxMEEUh4fhkW7x2mLxSQOOD7z
-O6L3E305FJyHr/Aiv4pLVNKCYu0yUyEbSMnbjw==
+9w0BAQsFAAOCAQEAGx9iRA2sOhzEzfbU7jg502lVEAfj0HwJFRN+DVQNyVuNl4ik
+QMVFHJvoMCFGu4loJRLqF/OuF/3tvUp4BC8QjbLqUj4wtSUCDZTF8o+Tjb9kTj3J
+60VqqL5/HU1G6FaKPDOU/mvmGkiVUjOcrrUghv8urTpYvx8/7Z+u0WySrxSCPCZZ
+mYv4LfCv4oEVpzpUBb4078qkntbezDQ5GAyzhpWHSo8qx0FTGnilyZ6Ql2RXItnf
+ube5HxTETDYRqHu9E9GcraGKIgYY7vbG2nNOvl87zxU4lHIwpu1vZftpe3raGLqL
+7nDqDqHC+9v64RDYH3U2yrl2SLzwsMR0by1otg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v3-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUEfkP1oYglp/20rkqQ6PgE8QNJDowDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUb5/nrEpBnFWFYMGAHbxheeinOLwwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAB43lmwH2EBG8UizTTuE7iZb4RA9qQf96Z8ENcp7wH4caUlYY0Lvtr7Q
-LV35+fceXJBtwXIcbCcSeFBSz4+qXNUZOxzfbLxZPcn6gzlhLo3mecPgB4/MgnRw
-S2YLYZyG7nP43rGktiFBqaTGXpyhelg42QukDw2rN0TgVo7yUMpYvGD4bFLHUAPl
-SEWqUsLM9OFgW/E2c367diAuYxgppj7oqkLURr3s6QoMBRdnVGIWdyYfHxd4pKoa
-xf6X++MJ4tqnlRSwwzRguFSlle8GbkIdlvMzZdS6kiF6arZ0n5DyYz6CB/FbXT1f
-uGFIh8t0xZ/kNt8Lze9T7yjnhIyGtw8=
+BQADggEBAFgzXwCceIuZFJ7jB2Fls1D1XvYiwhxeuSVZHsNz1kpCbpmZi1hnDYOY
+gfr3FEpcFI3P93b3hHpl8w7DGJ6bvJDqnNxe/idDDg60jeghcmCsJKYUgyoqoYbo
+kjHdg1ce+6xsf4n3of3Cr6xDCjpvTupXTf5zrUGtTAvE6XmQPTx1vOEXK/mOdsBb
+6ZiVv726yukaCsBN+zuhIU+0eOj8+2kXeKc4C5S3OZ/48LydMRNxjPT4pZtsHfAe
+NWy4hyTqfcKZfU31F5GzdXMgn0vvA/v2fssj+ke9sXhTnpNdI48Rp/l5koEBQBNQ
+D2rvAdgdZEEQ9xrl5RkLjAXDpVbSoI4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtDCCAZygAwIBAgIUG/VXupxY+WtmZ7XXlwrUo/WWC/cwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
+MIICtDCCAZygAwIBAgIUG/xdmUZCt7ps5TMTVbvfWjJHuxMwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCkDTBo4/yd60mdsYMxAE/DQyjvJqItcXtntjUmlztTpqBfYnGXXeyj
-lZi0rp4f5vJu47VHbMgkAqS6NOjyyo7eMTFKgH14HrHd/EdUOijZU6eJDxy+M1ka
-yM5QWQREZlMSJRCiT9N9hFT9pb1hBd0lHD7O27zO0GdbAGsTKsh8cTIx3wkAzV6G
-KcjUrVCDgIEHV+F1AcFMjQSqmyDb6RWqIGqqFW9sDxHaqQEcy4yDkASo5B/3O8uZ
-jSdfPg3UIRuGHSrBZ1RDhAkhMoE93WwePwvRZdfQxf7N78QBfmYbA1IUItO63/i5
-skDhxQkeLGiiCnUi6yXjpqN9ASCRRSuN
+CwUAA4IBAQCrG/sSj1dbSebCi92T47mRiq8Pm1ovwfqvcuOAcdOELdpLocJMGlDn
+7ywQFXRjWvSYHpnk6ekg1XrkHG/N8rUYijRJ0SyR5kpeqGfxiMxSGjxHtmA0sCuK
+inqpZAa58v8nsUsFNH4iBWlRYxOAJ+KjwboTar59A5+gKXkxxmoy+4f+LgbyBBJM
+EHp2lMg4Nce0/l7tBtNTw5kuozQ7ds0iRl0h++Aw0SjhpyWGP3WVGNa0z3WlBULx
+FRqHLPV7yS0WN8A2j2rPanzIzNpka4QsnPQuDznnI3295k1aaTKXacMDnj10JNHh
+VSNkPAii9GM0xubnEwvgioNrIePpRpPn
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaCgAwIBAgIUDW+824fz+bx3jFJPTG0Hg/41sgUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
+MIICuDCCAaCgAwIBAgIUPbBY1V9XpHrNz4pW9hdLlHaE8wowDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjANMQswCQYDVQQDDAJlZTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
 OCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAW0TW7UDkTlaZuzeS8Yth4w7WV8EOFvjWs0fHAmXaAEVSQvVN
-SX+AOrVTBUvD4K93RQuUWCGfQZELPz3LEo/2+yWdWPsQc/CPOx/ecpjei6sIqPa/
-dMl5bTMOCrhTUpTmXaN8XNRoqL0Wir33Z/8p7Zk7lKxJL07Vdlwgosg26O9vxCgV
-haWhkoI3ErvVCcIUFOV1D3g785B9zrAizIHWDCmV3hCC3Yjn02fsg7kFHU1h1cz6
-HLe/tRPV9nyiN3Q5DkK8ZSYEGDgV21QZDJjPEmb/2QIyKT07gTRiCwYyc4CpE7Ta
-0FT33zFtmWvz36CB8a5q+1jq6zYDshBrqJ1/Dw==
+9w0BAQsFAAOCAQEAbcIplVCPKWXW3FSoCRZE9gLtlnKN0aWmsqn9mbZij23ZbVXA
+i8t+wu0SSbgeJ99YE36Z/NkKCx3pRIGbjdE1r08rTAhoHxbTdeIzD8K3P6JOSqY2
+7HHsNQxkroWB3Mf3iPW/P8/53Q8o3FYfZEmLO18i2PHw+Y9ZVwHSE7pbdwvTrlGq
+MrGeSR57JJLHdZteMhr0A8w2qA2Cv+2NIKNLz0Tztvynmmu+laIMvfTpq9WJesmG
+Y1CPXrC7y+Z2720LoxtXpxtVKxi88WFFOKVsBdEBfH9E34TSw5B84RWiaQaZfrDJ
+Yd3E+Su7BkyfA89q1J8ITgHMEQdkceafCiQ0pA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee_int-v4-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAZugAwIBAgIUN8cpqU0L12Dw1FgmlSffgpLv1SQwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
+MIICszCCAZugAwIBAgIUM3CPGo7kDa/S240PLKd0jQ2d/SAwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowDTELMAkGA1UEAwwCZWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
 IMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQ
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQEL
-BQADggEBAD6Ifxyrfofyw6IRvLgxL3yOgbhns1whstZ5WvE77wjSxnCRqt6L+w9L
-l/y9U7ymXqCyehJxDpU3XdNN41bxlNUXR9WrIEIiRRuksSdxadZMoBubgsb/aC/9
-imKV94TPO3wmtGR2ZDCMUvA/6eZLY1FQaumzIJJpU4/sdv5bXhHamJDmLPt5xico
-Vh0GmN0g8UKDDxLks1WPKm34U6koyu8a3fSniowYaG5TFj0RSkpNXTXQ+p83ZYsd
-9XuME85UTK4mf9+DcXjX8PJORxZqeQiXmQHVMG/vp5jlyimTvh0s46wEzgGFvsoT
-7o0b/a2TkPaXYdtRcx2+2Iim4X/37M0=
+BQADggEBAJBYwR2i3Y5sJp1o6Eo7Ue1eOpBLFGSuOz0HmQHrZG4dal1dfVrRkv8S
+YV//loHyjmp80patejR3QylK1Y6ARQQm6Wn/fOSsUcy4KyWU+DQ5xSrWpRL1EA/7
+yMvK3uwKpoRGUCplLqpTnboRBuFvd6sqU2badeVBpOx/cJ5CBbTiHzudtoWs+O3x
+Pv6rjRS8KPDh0qENyKi0JKALXWmO0eHGKPAlRKjx96/4wfj4nvnj6i+OlIbLNZJ3
+Ff8+KCt2xc6cToClZ7jD68eGRDhBd4r5HcUO9y85BOKLPepTM7gRd1FSVXjL21W2
+H+SGy+jOUZOMSiFpQW7Gohv47xa3s4M=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICwDCCAagCFG2fOeI09P7fnVpX4hP0BoPpVppZMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICwDCCAagCFEmH4RSzGlM8deH3Cyvvc8BTUkK4MA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBYxFDASBgNVBAMMC2VlLXYxLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,10 +8,10 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBCwUAA4IBAQC2C5afNiW6ja5+DCbbyTsgPKZzOgTh0dTjcA/9
-ueh+HesBpvy4HdN9A8iXlrnO4oQmObjQrHXC7j5bLFi9wuKtOsv0e8rdVwpL59M8
-yTXyAr0PZN9pOJi5kCK4a7H+EHy2RDfj+cdlPgaUcs5VMoUumhvAEhvRmWksY8XO
-34iYov7dX5gvd4ORqbXDlxA+3RYiGpzehAbopf/eTfeapVIupzD6Xkcrl0WsqwRa
-6yj8VZx1si/ZV328gJW8gUCW81lSn1M7OSaLCZhf6+B0EI6Hw83fvS9y1PczR+aO
-FWcCcu3SGpXoeIuNNA9zme6SjZ7LtwhkPoJ1dF6cT4stQaHC
+MA0GCSqGSIb3DQEBCwUAA4IBAQCe6J0atonkAikXwwKyUEier2uTl/M5H1JoJKQT
+8FDYIgDKzZi2I0mt1OBd98r+SxCFEoF/r0Je1vwTzFnK9R460VdZY7kXzPOrQ3nP
+3XCXS/sOK+c6BoWF1NsFBzVohgatObe5zMgV9s5xYZqXlmPFDBJicNyO2DkyWHbk
+7sLMavGanKa1au1Zpn8GoAattNJW9ihqEZ1ZsXM8zgYzuRN850myynAYcIl9rsON
+6mMFe1d1UiEplhAJGGD91A8RtokJlq32uGMWIw76lNbrCEjN6oB6XFS57PcOF+3b
+5rVmgfY7IHbB2gjFSKcj8hFF8D0ISZn4mFRsJof62RwM8QCV
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-BC-not-cA_ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICwTCCAakCFEnEvLXCP/5POMOt+pjiEq37gXWmMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICwTCCAakCFDvg2eVC0vnuGk65tm8Vzurs8Uj1MA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBoxGDAWBgNVBAMMD2VlLXYxLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -8,10 +8,10 @@
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMNMAswCQYDVR0TBAIw
-ADANBgkqhkiG9w0BAQsFAAOCAQEAg1JdUyiorktU9kiQ0b4mfHERpuR9oza650Wv
-q0x3lWlIlTgSejDpga/63AIk2bdk9maBc9A6n1wegPPYFBmdMRrZC34rmI13jY0y
-nHlUPaaZhoozt3ek+T0AA7U9j/0PkpZwOVSIM/A5OZUNSsPe/V75q3xwY+H56gx2
-7jRppMbFZKOoxp+bcjlUyhYze9jGLMZmBo5zSPJ8lN7eaSlyrP28u+rZ2dgY3mrV
-pCsWI58sUFVqYnEbmX+oixxAtQG/Ycyjvv5k6jYpxddccgWbJ7Rfh5AwMqQ6PWnr
-4nODz6f6KAu2tT+rBmj1JQGQ4yuoVbch7OZmjEyWDbnmfj5OHg==
+ADANBgkqhkiG9w0BAQsFAAOCAQEAUnEgkyfbh+pY2ZAIpqUSRkMYv+NIXdcnTJZV
+GmqhFJEakZ2hMBxELneaxbv49Lj7JyK09CVfBhWFEA0CjnmS+APb3rVozt9uN6yE
+KCjGsmdUnthMG6E2D0VbLsNKq57m3naDVgDDedOhheAvsJyQvKubsQiMtuoJCdZO
+obx+lYE+16m6+SzJPFt1yh5vn9+hBcTq1zmYQSKbAJXkrDMMQnjywzb77kBKYgyr
+uQ3/SlwjzGojQFlWOhkRsQjcC+zz6lobziUeAQ1vXy8t8xaQQjTmwpVi+vVH7w+8
+ATJKEfIE4cl58aAEYHV7qv1fQ6NUQO0lsRumsgoR+E8PhPQKrQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v1-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICrTCCAZUCFAui8q0oTl0tXPDnSLBn2fPk4r2OMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICrTCCAZUCFEmbMXhUIOtpbMU4ZOUHBaPfFSv9MA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBUxEzARBgNVBAMMCmVlLXYxLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9
 sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5
@@ -8,10 +8,10 @@
 xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHd
 tMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l
 8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEB
-AH0D5hwVcdhWleHklEk0TxXR7XUQbf+Ux00V88h2gXFA6T/vZVpd8/OJ6TF+/Si0
-P8do8aMn1yhvPCnbX439cNt47U+lSCcfKtdYlnc94ov2k3ViyxcXx3hyzJ1XSplZ
-njhqinelVWcogE+GKK7ck3S8R6CATIQcDUIuJ7w3s4JO/x3fqJuKKNWL2fOYImyI
-zaLrTsRHQxIEiDoSNqlP26ZHD972wWQoBLkZaqj27IL8Bvu/YA7WKyBqPQifI/fw
-3UI+O87slv8p1fA+NcD6zyfeOeAPo2ksgADYQ8LfTe1usbl3xfvcCoeZHE3zZ83O
-hn5dQOnjBhLxkPfh7HmGZA4=
+AJkjYBJWNRU/lCHANJUmnuRt7ignqJyGsYR/q5z31B6kWUA1TGX15iyWnmgtRqR3
+jDiZqh3ejnozXtbAHkGykndeY3jvHCMzCNNpAQZKd9hoCb9Ix9yK1zbqtGAuDgT6
+t0nfkvGK9qPulRZ/2cHHHEdryceX2B1aVxv8D2z4M1Fg2Ajplp269EFhd0T5sZL3
+9zlgv9JlcoUVdjlDQ95Kagv4jt0gG3mGci/Oj3pYwhe8bVUE3/vwetR+1akOaBcE
+3YSvUW2EbQkGq5ghhIolF2K5DRGjsXkGrJQszRNRPTiEaexL3CV9r7lW0Re6z8Fs
+c2TT9q6PeqCvNoM0K4ji8Ag=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAQIUVSeIUHLGH3bxxPbtMsl09jYzjFowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxTCCAa2gAwIBAQIUTUkREc279H3wFGALzwJDTUzA5XYwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjItQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJzzzkDGuj3ilNBmaRoM2jKRtnT0rRMj
-zcX3WfyESr1xnZCogtCAwCd7cgefMbNovj3ALxBuz26J5cXtZW/5AQlE7c1i2zQn
-gQG1Xmv1zSMJfzY385FNc74Lf6mMBapjPPekRcBDYHTltcvnwFzaBEfDV+BWaQoh
-9/IbaOHZQh0tvrpu+7qMwH5Of4rtw5yhNF/8ePAtDLGzB1RBAmsURDW0W4Z9/3KL
-DtcsChOcaT/3dP/7wHz25FTaCrJgmH2qe8e+awK7WYA62voCX6efg17cQyW06gpe
-NtPlF8TcRUs9ljxWSrfOl8WhOcfPLc6P+e9y70cQu4CVPyx7Sbs0uq0=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAG0viSnuppjnIHdiuApCFM55eBf71+Tc
+g68DIa0yYtVylF6KAhFMCe7JPg+9viImNGeUktRSpwLtCc8w63gILGF8HhAcOScM
+2uMCQMX0HqQqDxZdl1PmQv7oj0pPK4FWiyEXjYaHOaHO+qzo5hV3KUe2iaK0VHbk
+vtyAhTrhkHrhLdpDGYtGErAj5E4hySfNW8tNdvrOge9n2SEshDiSr1G3NSQZwlGd
+ZOPrOGbDNFGlqzKRwIdn8wz1NC8JUjMWZRI7opnqA59e6RXoosT6Ruycnx6qC6eu
+gBKRYMtbVtYmaxHmTR7jKZLdmx+siIkt6nZZJ36sAiQvAd7pWdZrctU=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-BC-not-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAQIUX+C4r+mGtgaexZZaIK9fdQurZAswDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAQIUZUYdrYFQ0vpgwxOwG9WoaOfZlCQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjItQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -8,10 +8,10 @@
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBXG2upT5Kv0yJleTgEOig687LLA/4X
-PDep4HduXpV/Sx0Dpt2G/sr5kSie/sg2OAgGwNFIHV84+0oriFpH/3wnAIzKDLhH
-VMTh6IEROM3cJ4aJEggSNI2yGGN7SWb4Phv9s/K7oNbYmXoUq2dZZdlmQCznCquD
-iXB641GGPRFHI+k+l/IWdRRq2MSkfD2e9ZZgV8OV5jMtezDseuqFVx0cCIvoD+KL
-1DwP3q9pyjtOd93AaPdNo+YinZ48SfTWyOVpRu1WLpRubwTWP5NN2ZWEsakLCKda
-+JuujVuF45FnWB4sQvQ/OIzuCfUNRFdABSmKsTZmtRCFaTiczlPFnjRR
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCcsL4DBcZ9blKekKo3s0mhsNm056g4
+/QPMHfZ3V3Wtidz2VDp09LTuXaLDbfMYSlsR6p828rJmHrO1BhIvKKJ7SAfN3QXp
+lntK2RzY0G53huTqs8u34DdHdubrG8TSFbq/pqa/2So1YfvVLMQYrkz1p9AxtFqN
+/Ym1G33+1RIB5Shji8I8PyzKVL1ymlzfVLPP4jBkxopytZUykc6wPNRZl1FnbZV4
+0+ZFB01fOHmitHiLuPjIm5YYA48jArq6h589PUg3+WyNccd9MzRQgVdXNg5j88d5
+Ta2oXKAPmzTt0L+vkqkPyTYFT1gNAKg4eD6PdjxXtWDYwNtOqG827jfm
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v2-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAQIUAxjGgr6mX2stQfhj9JzCCTVX6UMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICsjCCAZqgAwIBAQIUY4fMtZjVWcwhTGK7pGcExmXLBzAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjItbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -8,10 +8,10 @@
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAlAYzxxH9IvQa8GUS9W4UPOelZRdJ8eTTgOYuikPefVZwrMkknXd0oEn/
-IRpIi/wmLtrrenDsfWa4cJY18oOzUuMbDXTWqMOU6Wcn6QtsyubyFA61h4/LdJGF
-T/4UXHXM2UAcIUUyMbLy0uQUfsfS++68DKmEWP71J8DphtNMave9FlG+zRc4lOyM
-8ktmn0jfHGTs1kBXVcGGxz//LPUGf7tE4o5BLBoRJm9KEuM31pSs36MMYAvMedj/
-63gDW8vAdgAt364yQXX32lRI/ngVOCzgkfrZhy2dnvIkkBT64+j48JqG9xeX72z6
-5pGuTWjl49J+9qStbVy+FcSAx/9mDg==
+AAOCAQEAG+pHmRMmLdRIWHbG+CiU4jBFaTfjRHVOjt2diO4p60dZ5up2tp2KAnHy
+U7OJmN0FcTl+7ydDWXyR3gRrR/rOGdx5inq3817+CotMkeai3dnKVjjLxDBCA8Ch
+2mqDXR6wYyXccIMokJgVam2b/OHAfpWlphecReKr7kYA8j6Kg52IFZl7iX0l2tL6
+34TJnRdPyGz0AM5uP46pLn7P1zi1M/6+l0y8EnX7KL/k2Bxj2BWwWLJ8L7IXIret
+f/zEM4EiHJHSC+HLq9r/XJFJGVXS6bNGPETQ96ySEvNPPQTRWLe8JBj5pUpe5LBj
+hrv7fb16fTx/eVdVFmbmdFH6q9nNHA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAgIUL/8uIC7w0VQDfwNEiAheOfqCD4cwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxTCCAa2gAwIBAgIUGxHIJJyv/iJrELEMIQD1aphjDaowDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjMtQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKWf2yUcOTdLtGAAuAVObfAtgs0io83w
-aeERhEaUZplIOX5fYNS4kgDL448mwtXfCtHLuMsKyAWfTczieV8XqYC2NuKWOoG6
-dqda+Tj23knBou+8Rus4on6WgUFNH7aZy6bzpRiJHI4170qzNqWmnwCmpIW3v5lx
-pfIo3jOIJ/3dxM4FyneeQh/LnViQcklTTn/7DZ5x+9aqpVxxtpJYU1rK/e+MZWxw
-l++XG68Ax7jughU+G0o5br5rENpWvr+AtXWZIjRuh0+we3B0KVBnaEw1+OTsuIdd
-Yj8hIP53o9JlLY/VWUwn6ulPIVREOkaGXTGp2RCsd+jOJLMuX1dhqNc=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBABwWiSkeHa9tiZRe2vCYFRgR9OEHPr+z
+uN1PFpmLbofm4HTQ+FYD91QrYuDJPoO6+zBLRbZqkBZ8J3X6ts1uRr7qk6x9Cgq5
+ZJNUre5gW8wjZ/WiX2IoY7ucZXuTYKePPyd5RyfPYm+9p9960elo2uNLLG0Nmy1A
+YlqjkhaFn6q2eNh/4c0tlRKIKpiUDnBa/ibsJPRzbTAhmIm6ooiphX6E6CG4sIWP
+HhWvldTPETvF8PGe4BxqZRBbAzh892yh8FCGos8RLNOoFrr4k4Vysb94n4E1SKrv
+ORfes12d6FmFdYlB4mjl50FJGh0hjPcP1tq78EbkipRGTJO/6Q3vcVE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-BC-not-cA_ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAgIUJ1+Q++MzeDiDlhtzZCaUIQSZqHowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAgIUb4dXJa+wzvKsmCT/HB8Xu0Cp8YcwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjMtQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -8,10 +8,10 @@
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAVNOf1qOt1pw5VQI/7AtIC5wWPdfWx
-3ZOoRfDfLYvFpH1yRL4GKh2gxMHQLJmWE4CSDsQxThfEF5+szRRumKu6T1WQ0bA/
-PpvnzjTdMEYqX1JAljRjCBPglH6WwRegvl7eQkqh5kQCi7FM9oK3Xg1GgQroyFU4
-nM0yYGdm5JC11Uc6bFFzknxs7kLGnA+7eY0T4EvQMRqD3vPNUGprLf7rP76jOkFJ
-zgj1tTcHv7FHUlAiWK8VSsME+pZPOuWDNdDEBdYPS40Qpl0RVzqEJ3HFxgOTUnMR
-/r/T8oUewfmTKW7QdeschqUojaKlmwmEead6SHD2j0BR6Zfqcz5+ePAQ
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB0pTw1CI81i2uK8HfcfuljDfI1/thC
+9QmV+nRLMic+82XNPHYjUBAS9r2kZvNEeSoQQThkefEzcRPP33hl4TbYXCKuFzpT
+k0ssjzLAUIWUCaVWnV3p0aryGv/MBITNu4TWTnRwOIinWZ/cExO42iLTDiMbuhQp
+b5IubLsj2+15aF56zuTFEqwB+O6D0L+r5uka7Q6I3T3kCrbDFqcjlosKxY67AqLG
+dKMahrfX2D1hFIeVz8yMtYCAH0ZWt+ooJE1ntUksbwsQ2pA7AQwKl2ojiqI6FMRm
+6jD0ydcYAGdNboNkL9fCC1oC7J66slt5a172GE8IGXVKqNZYLv2+0P+/
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v3-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAgIUGVInlj4s+4VpENGRHjelnFNEicUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICsjCCAZqgAwIBAgIUH6a1yPknNm4Zd5xhXtDsj5JWTVIwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjMtbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -8,10 +8,10 @@
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAPQCrr8a/rcnpAPGdncOdGrNa5mkmS60bEDffAVCepLC1SybDhPGOA5Pv
-CsjHy5K2tP4CBOFomxBAPNu1flD/gNBkkmPRNDcyk+JieDe8dv9aUaUtFKeSor9a
-D1zwXQf4bfZXYosdOqT1rmJ8fmZZOz7RIxLbq+GGXbVCnepxjKGxakyDTIS1lGMT
-n2E7TvRaCjGLpYUXdqsHd7bsmGCLrNaMA/TYDhWK80B05U+s6MJ+ciEV1DLHw9fx
-Hjtqt9dOZcnGM9cjOewH9C0cqwCxL4bl4tMVhW6cBZvaLdKExGlCCzlLM6AfldNy
-hfLE5qW27NR4GAXOJeU/ek2m4UvEnQ==
+AAOCAQEADZVMW87EF24I8XiCc+t0MG+vu8rcR1msyWAwtjxmYNbkt2Up+etwR0U/
+54zFmJiRagPnKZhd9pyp1rpej9nj1liL8mV5hLeX0Mlc6QnCo7gNIY0wWcwtsMXe
+NDWBO2i1mTlTBLjJrrcmTd8dwKy4Pru2oQ2+6O3/m58oWtBqsAJp47o8qOTmjJvZ
+IF2U6cOgoVNGeOmzq3QGGQnM3/9rXhD5DL3Trz2lCuy91fW0gMyFC3neaKdSDgoP
+2cZtvs5plLwBNXMu6W89BZI08mrD/flo3VkUgkxVBDr3PUKdY60Xvpp+sJwEw0Ef
+Yr9Zmb1FmDlwTjmAAZVo9OiAg7r2Jw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa2gAwIBAwIUKRsYM48SvGQ9902xiz3yGGmzgZAwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxTCCAa2gAwIBAwIUN2t/Wc6xThY3A8WTT8g4qc3BJccwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLZWUtdjQtQkMtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBABYAjKqfgyMY25aaw/uVZV0/rUUmfsYL
-4lYGIt13WHiPrt2DLW8y2wX0NmBus1TCTwKfPp8WdNBaGC4bhfnpx/lafBhOpU6M
-BIC7j29qWq7dXdMMHRXhZoV2vuSvZ24CmA7FiIsvo+D+ZCrvo4tfjvwekflfIl26
-rcIggzXVoQxLhamRPgBEGobM1Gll4IVPyaFOTWEdt4xCDoCN6Ktb/TCynv/jGDH/
-dubtvYGdVVOrRUuBuojuTzsx3PrPi5nGroBkzRKEzKjular8B/sfHuel7Tzyzdwh
-8xG7QjrD33vlSdaE2y1Vaqxb9Pn/NOss2FzDPmc5wj9ZO77nbs5xPRc=
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGcf/zc6xWE/038gQYOrWnTw5B65PsEi
+iGWJQgeUOSCwADHJ3DYzf239OmBqhe30/fbT4Z5F9y4OjSGqzKhiAwq6rRCeybFQ
+d/tQvT5F197q5b0ZgMSSbu9luGD8kNSrpzmIvqwEVrABbKTFUqaFpSumZKbCRuQ/
+2ReQ2W+nfnL/EDekytU9nDoIMULcCc5cPj8q+gEVPaMm94bDwYe+9vVRwf2JycWt
+ldZbH6brAZ4dOpa+hXK4W4RqY0baTRYU/8wrihezQtVElJmXszOzcWveGg5cOGFC
+vr1EgdFx4d/dj+Eh7HiMqSJqUlVQ9D84mR1C1NBJdDZESflVT26kB0k=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-BC-not-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAa6gAwIBAwIUO1z9VjfqDE4+z5c1INmOgbhs3uMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxjCCAa6gAwIBAwIUXX5wI9ZLvqMcMEKuZ6ShXJ0XfY4wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGjEYMBYGA1UEAwwPZWUtdjQtQkMtbm90LWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -8,10 +8,10 @@
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNV
-HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAbTBLtgfdp0axuuNYcDpbHB2mR4Ob+
-ga1aU8dyQY1LFSkOfEmKKn4LJJT+CJfavHO0nxXlDQYVbRVVL2+5/Run+UNfLwXK
-H+yQDMMQCtkCG75Yjls5GLTvnWTSQKyZkGjkgMH49si6KkWkyvOxXQQYoXxOtFwZ
-DRYPenleLnSQPgrZHwNHK6eoQon0+LH2JOZFAgybglDLRidooabPsbTwSCtqmw5L
-W3cUDEVjNg5D7vtDwTb7CygNJSniAzTNmqcYipevafeHzRF5kfOKoofD9XxBn48n
-XRQX7PALwWlkoCDYOpOkLH4rrOjP1Fm6X2plap+MLm3Gwpudrw+YPAf1
+HRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAoqp9OCrEoIKeQG+2mtReILd2OW21v
+sgvxqDP6MGYtdQ7HfZaHZuv1PZiVzxysqk/0nuUYWzbPh+7/xUWTa21YVjt2fhDV
+wotDiE3iNOumE3Pbeg70MIRgQa00pYvjRse9748y4rLMSpZu9Dx8vPS6T2efrjI/
+JwMh0lqjsqGNdMEotfNFeGCrsjr3bjBj43RtRHpL00Cq3A276PmSyfs/r+raxJEU
+BkKqjmry3AzOMTIyTxI7qe5/CMAm8GvfGdhr1tj7sh9lwS5oe8II4u4D/9tirHF9
+wTNAhSaTiAsUoynaJtBYTA/MxYvwJ6/qY69Q7oUkX/Gs7Pl9fryyDo05
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ee-v4-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICsjCCAZqgAwIBAwIUV0RLUzd4RL8aD7bSwpNxf/veYBMwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICsjCCAZqgAwIBAwIUB2z1TvAGiocHPPLxLlCE2W4kKrUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFTETMBEGA1UEAwwKZWUtdjQtbm9CQzCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -8,10 +8,10 @@
 V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAlPlOBtYP2sHdzBmLIsR+A8viJb5mdG/pxmh2hvLwDM0bE8Re5hBcMuxu
-kviVpp2ydVP8JmqcC1YkPS0uqABna99vwyD219H1rMQwzjH2k/YlDyiruBmnVN5C
-qsrLzygeJbxAZ269L82+wZVj43MURDZEBB5B5gckKqqLFyGMwI7p3ydvByN5Dx9P
-99x0HcHoo90JWouigreU3JSotxqwyIe1ivcSpOx9DqXN8wfRKbRNWbx15ucIj6vE
-TEL9yxxih5DQOExPCEr1FHrDA2ObSMed12L3nMsxxejQOjXTGMz2LoGreF4c1To3
-ZlPTDZI+pO3z1/PhzuJ4oE3ObcTD8g==
+AAOCAQEARifsn/PYmP30WdyRw3EBXEolSO+kqeY2fWM/4Qji7jUGLsgXRUt4zXbs
+Wgwrvxk+iHlrDwN8ux6OZ0UteKBlWxN6vWUZO3QqCI2prkdzBtHkiBB/sbp6kJPR
+IIBLPoXn8IOeV7xP7bjNHDqSqwDy4Ltm+0OmOBaONxhAjAyQPKZtuzLRUQzljLOZ
+9vE4CXM3Q/ZugkKOFq4YcJ8fTRXT08Tqtfxn0IIYBsezTPw3kX4qcgiyaSLhCSKC
+w1eb46+Kqe9FVC9pApbRFSsYm0guPnRRMASQSiHW3w+7KB35EFl4G5LlxzuZdZh5
+I3pv2YB2zXurIJ7IOizgX9GMVbOzjg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbYCFEvwrW+IBt6R9oSFyLj8XFEv/LhHMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICzjCCAbYCFE3k+54zZHCkzie8w4rzHPcWCvpHMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBcxFTATBgNVBAMMDGludC12MS1CQy1jQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODY
 H72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk
@@ -8,11 +8,11 @@
 0jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMM
 kd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaL
 L+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswCwYDVR0PBAQDAgEG
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKrvzJQl4tTo4y0LbYAX
-4on9F44+lW3X86+WXG45c+Wty6Hpby5dZskO4L77LiJ6li/lSELXV5+w8Dy/y0WS
-AFoRhNGrX64i66xmB3pejAfFVmKnD6WPAThw2JzaQgJV9iYrbSmXog8av+Juyn6I
-mCI3DH5c+xH8fYaKzJspsXeM/bodQJ85naKo+DDDMVvRyc3QR46QSQ08epviAQpu
-ODrOSNF4NaLrzCZsU6764arrLQQRJ9aSPMZSUE+0mVawA1KdsWNXPJBBeG1gHeWJ
-8XbyL2uuEVGfnYoRD1ciJS2MH89LH4ZJhnZvMvjsVDBKqyn7n5WGZaUPbBtjAP9r
-OtM=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACtj7FH0rKA0rkR4jE7D
+IoflYPE7meH6vbDEb7m0kALj69+TH6pnBuKiaiWQwyhx4anAbu13JEEpACJoaNER
+FtxsKL8y9j+tSbU5RFHx+6f7OOcz5SawscGEF+P3t0lJqU5d5sDs/frd9DZWu3Ho
+lzTlbP2YQsqiRAT2Ryx1AN6hrZEDoQ8TEwXqSC3slSeDvC+pkSZbhSg/VlZ9vwjz
+zZ/ukePXRg65AcBrlWhMuJoCCzkQk7lVt/oOHcrGl2AYzN+t04FXs+92/5Gr4Qcd
+iCweQYIyHm8UKGsA8gNpFzt8jP5cDUNx11FRPA+N7lImdCas9GHwKTKIunsqW8zC
+1lQ=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-BC-not-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICzzCCAbcCFG0QyFbWKNAL/Xi7AiuQUWMWM4y/MA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICzzCCAbcCFE3ZspZvBnOAmWIh05fgdovmSbLrMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBsxGTAXBgNVBAMMEGludC12MS1CQy1ub3QtY0EwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,11 +8,11 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGjAYMAsGA1UdDwQE
-AwIBBjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCH3/Dph1VoR9jJJjSU
-tesBTYJfodWl2Z7SFzhJnGJsT55nM0UMTfUQx6Ot8UPSBZv04NRAHI/isXS74qER
-zdQBE7fZ+IVVkQTaLWr4uN/QDfTnQn9YZG9/GbMCbd+3xKZw6REw/8QxpGwPOasr
-0gtsI/ktqXwx3Lju/XxteoZsoK2oRAXV0C4T6CUqawtylF7P8DoMBTpqh5mgJbxG
-kmRDl5vgYNlM2WstCKj3X42kkK98g4bq2EaJm33M3iQ+4coC9FnYglGCdYNSqTk0
-Y2LMKBhtA1HDCiBkLFbJlo7LrRrihVFqIo71pYxu2RMYGhILKV15x5sNzmCMyQph
-xJs1
+AwIBBjAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAbIDFm/7bUqz+GPgQj
+m5pCmxph7tF1Hfz1JMW/3Yi7bthN9ih9As18qgDOPVD3qrZFAUNM6mpvBo/UPb5V
+vW8IgtvoNffhUKUjUiYDBcPNmhc2XPCQ9CyhCAF2T1dXftp2H+kQ1cu7N/Yq3vz/
+XkadGQphSs+IWNxYf5hAFU12ZnY5L5BJ3Sr0fjzKYdiyv8MbNqxf1NNlg6+gH0aR
+qH+EjqJarw+VeGtwbQjiNCIqf60swE7Fj8hlnGXNlv3ISV0rY8Clfmpr9pG6YBZa
+30y/XrwECMiCGlGyQKjKHmijFUF6h49fI1M94jhGDWCslhtvpusdZkaTwBfDEf7U
+/5Ze
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v1-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICvzCCAacCFEnoTXKDyLlc6mAT0Cbr1XEpC6wGMA0GCSqGSIb3DQEBCwUAMA0x
-CzAJBgNVBAMMAmNhMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBa
+MIICvzCCAacCFGUeQFCueydOeMy6qL1r3OWc72slMA0GCSqGSIb3DQEBCwUAMA0x
+CzAJBgNVBAMMAmNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBa
 MBYxFDASBgNVBAMMC2ludC12MS1ub0JDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,10 +8,10 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow8wDTALBgNVHQ8EBAMCAQYw
-DQYJKoZIhvcNAQELBQADggEBAEhY3oceCI9iIMu3uKUuqFUaTzxgnNSrEB2QV2Uy
-ijidrPQG8k3e2DzliwjTCYDGUA6U1fNqrgcXYDLKOqlTNogZn0wjSJQ9FNkG8bjh
-qu/L9W5aQVqzUPgYFVAz/x5d1iWXNdBDRUluH86/AhhoAf3nCozf1Onpw7CjGY8x
-CKBNC0d1hNVoT88+7V/Y742RqhSvLxLSZOrBIZD8pP+CzvORXrgdOdsH5Dvwy5Qd
-P8LJVHPxIyuOF9jf4H8QxKeeIWT4AdDbxlgd0KiItyF4KicBG1Mgr05ztBgwg+aE
-HIE/WKqVEhye4AjREI06txRmWD2f6WibQfAM48irAz6UH/8=
+DQYJKoZIhvcNAQELBQADggEBABvfOrDhyQkVROM6IwTPmetz5M2MjZeQjOVYErgE
+fUCE+z7EW5jXaMrcIbjpR+FnnJ3nB6d5vwx6Bzw2q127dUQZkWcI/soiL0ERr+Kv
+e97+tPdLb5gL+6trnJb5enkfnGp+Ooo6NyBzUJT8EI326JCxkD3SrGBgLtxzd5hz
+rkyjp7y6ypK8ihHGgL7fp4kCeM1NjAt3IPLym7yQOkFFivcKN3Wp7+9oN8t3yo3U
+is9yEOmYE/VNRdm6nFnLbe+QQqAZwWQitadVVBHOcW9nIdB1e8VPO+1Dja0muX9K
+cLt3twV8Yjk+aaAC3T/4ZTUWNdH80gEZE5Esy1PYeoV16iY=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAQIUbSeomFRRxEoVhd1IPghMHB5AsQwwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0zCCAbugAwIBAQIUf9E2zqRqLx+VENz/4+SpW+a1PeAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXYyLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,11 +8,11 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAowokM5Jo55T2
-1sCevpr2gEhMEjnHEczUQS2Y276SfLyJx5lmOP8uuRRTqZ9kVdud4jJ0bbjfryYz
-AyOy0LbZs5qtuO0UXoQfeSKvXTTOJUAXo/W4i7EK8YrxGKqRbfb60cNK7PIRS5K9
-eeOk9Qn1QcXVf0DgPDaYJTfgiCsq/OFBuNC2zfAGSBNBdftao01EDmQC64fcIi1j
-z2w6+3zcWi7/ZBfmcaVSLM+4WelD/MYMtZZtqGRx/SXXNNsTJzOI0MvfkxoATCuj
-Xp/bPD7C/igRTfnCq70dMUAz+RMc5v3IJnDaN3R6+UpNMvCTKVIgN74yylgpmGJ6
-jT5TJVhNng==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEANmkUyFb9kU1z
+kMHtqom8a2oY76fmNcSyk2VbhodFyj4B9nl/wnHIUxFdL34lMHdxpkEKf2WlSWez
+fIYU2JHwPA+iuRE0K0bFqyYt0Bpjt2r5faUzk0ELxYoxIRW7KOHutLBhk/gotgWa
+7+HiVJrqfBXQlfWIcb+BNEMc+bzGkQDCdFuzxhUTdIY5monTTbHjF/PUhQ3l9Yql
+GQ8IfFQYzaTvZN7kHetuG/gl2dcHA3Yv8IjfSr3/ElrVtF9Tp/c30m3i0Z5YMa9M
+zyFYUxqNq5btZYqU7E5/9MXt1A45oet6QHO12E3m0816ooT7g9swJnIQ9CV21LYL
+HEVn3xw7sg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-BC-not-cA_ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAQIUV0v4gMD8TEVWdUeeEYqe/HRsSBgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1DCCAbygAwIBAQIUC1qc7IY2m7UMNztbSNKbdkpXSF0wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXYyLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
@@ -8,11 +8,11 @@
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAAIKb6oxJmYV
-aDASlUQD31JlJYAlUr/Nqw5rKI6h1kEgQPXkRxs0XeT18n/jRtAQvSqRAZXtDw9+
-11TU7iqapSubbKCIJ/LABuFZuJF81gGsc8d3Xzp126pCm5LD9TyPOIBD5uQak3mj
-pyX/hUM6iMhbuRzv5KTvOM3JbcTKo/4ecVNpxzmEZ2XE+yLE2QmSD+GeTQdgU6l+
-Xh/EBKmYdQ/mS0cNveuUTGrh+KifBvkuCGckZHj9EirKG1n74hiDjOyvJMqAsALR
-WH3Y6zN2fihTsX9a3ZC5V5uKZk1TC2LWuwvyAgTHS/OZpLtWXAu08tc6rCfnjIdo
-4yOpcrt7cQc=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAFSFOD3w2yEL
+hJBjs6WtkQGAOLJ5Ip/2DI0W+XJAyCRF5nRVpakj8ub/Y/cGG1dLbXuOFoQFR0Hc
+6m9hoNSn4Z0v84K5WEsKHtjawQ7DnXSYVyt3JVbtqtQLlVPgXhGqeuP4geF9Zu5+
+2hb6nkwg4bGkIumcx9WFDt0NI++UU9q7/Pw9CTjk86XGhwz1LlVA/RIfotsG3IeZ
+IBoV6qT5URErFpOj1b96VnMQNtnjo2HMq6GhrtOqBxRzkjySJ+2JHRe4cf/Phg7h
+DIkHTo+ueLrT9toHciMW5NXssUwuBtvhGyeCuzVTtYSnEKGHdnXcVUx6gB4F0PFI
+JsD87eWyB5U=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v2-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAQIUQQyLlHMT4AwQRXUE3t7HCuP1cEowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxDCCAaygAwIBAQIUVYXvMaxdKZ4YI73r4J7jv8+sslwwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXYyLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEACEyrZkiRnE/wiouBHt+pXTYZHbqcCKZt
-MJrxbVuJNKqgGU4rShr3VmQaW5Q3+uNJ3l1vhPVpN7lEpGdONNOnsRffG4tU25AG
-3cRfhaKNOfLMvTRXo/WE23VEUFm9FOelKT9a02SgY+YJrWuxrJJJzNv67uDaGU2T
-3naEyYHHyPzl6El70hNl0Xmmr5SmAaSCfdVz6pclpmpKCXN5MS5sjyUybw88lGbm
-nal3re5w5vf+fdM3rQhnDq8Mlq0eHnEgcRFriusl4JZ4E2DvKw6IWkhLbUBs63lw
-fPMaw2w39eUAIUYhxpdOPe8CsCQoKhOLuAudfP5vNNKfuc2YdGk8og==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAsNqQCwIN/u9TAVkh8Hv4IcfsY8u7Ex+t
+Z8kfW0rUz666kTRVGFQbM9gzgb+rqyou14vxHDuBx67kbJLKdJ8tUDoe8bcpWbGB
+jLx/f6elA7D0eSArpEAheRgoqOJS05f6S9pOA9RnNySfFyV+ypZxBOEbrGOzdzNd
+guwoBYS/CAx+TH/f4o92cdqBtm0psRkTp+Fj/qi6f2zetxNfLjFpy3Zog8GopCWK
+Mhg0W8j9zeKDLf3NVFt8XMSW8DfwJrsY9enK6ISrdBjIdDqaFdzsXEykeiZgHemf
+jBPdogIQD6ZsdlaFFWOq03DHLw4v9Sj0wgc9C8gtQDrL6K5fmfLXGA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUSXOuA2Y9HrRS1GWRB7+4Z/4FppkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0zCCAbugAwIBAgIUH8RrlVV1Arzvq9vwD37aGxKswKMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXYzLUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,11 +8,11 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEATCDunuJN3JmJ
-0R8fKN6LXNZMmXmXNPVIINxeOD/B0u2thkqL61ZzhxH7Rt/3Jp0Gfe4EoO9Apd58
-+Qy+B9jQmaeyOysMesbSmZbmHeotQuiv7qpiZx/S5ZMmPU2YHH6loBb4l8POpykP
-r5bEKLRy8MigQHuCsYkwRlWZYPSytPAWCw4KPbdudctAF6WjHLvOjbirgSip0Ec2
-x8Php0Us/Z1x3xf2mCsf6LuSSVIfZHExtkA+iG4dTXMufJ8YBcoFymcek7KZ16WM
-5jCEyrFgh0edC5/HmW5+WDFYB5ZpPn+DruVe3s/F1blqNXmYFkdyO/LlADH9uSOS
-ML+KwLsd6g==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFLbj9FU+Oa8R
+/9oGqUDa519Et6mg/euJ5tACGLozVoEGCGZN6raLMGlrGNSKLFZBKerg6CdvAuJj
+EUNU1utJhH+XGz6ZCIr9SAsDQ3y19cF31WJ9sSamjmChoAsB0zl9EDIrurg5RPHD
+wUaTGPLLieLzmAXYynsxIrKZbCCEmR0be2fPqGdkby3iuQnk/Punzluax/6d7pOV
+wNbXlRVH9Tcagjcfv/VqPy+8Vt+iOySaAQSj+Mq4chu7wnDYpsDjtAiR6lou3gvt
+tjYy66d0Az4SjJeE22r3Xbdz5fgcWyzkiTg0McHpzJqBjPHwONAgy711NOVUNrbM
+3RRmkWzpmQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-BC-not-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAgIUHzu4O//Q5t79pfA0ZHmWYI1WoOgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1DCCAbygAwIBAgIUY/xRC7wQthFDkmcRdLMOkyv+UdwwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXYzLUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
@@ -8,11 +8,11 @@
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBACIkxh+HFcld
-lhSILx4fs99TskGiLUgGLoa+ZvHO5LK/9LSWqMfSM7JbsS833E/6w+ysTt4/tL4t
-0Fomq65AeqkmUN29E9AePVIAOzdQ8svsx1ZQKimsMp+LCj+P0yagcnPQJEjWB41A
-885k68ZrHf3MhWGhsVrvBh33UAClt2XSPvKUz/K5MRo6/o0wVVo+PJUulfF1oRUj
-TSaa6VKfx+SRnPDyQ9VuQ0cUUGiD/Ka5Q6DxauyBT92dHDES+ubmiy5Kl4jpD00t
-bW2VbEZn2Qr4Jkuvzfd2ra7VB+uQzRlhm/Pwz+g0qLNMDYcIgy7070M7ARCxLbhS
-6nF60Y+uWLM=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAKvTbOiPSNbY
+tvjAcbZPsk+XMNJgOsZ9Wv9RGl+Pc2uZQOKLeysL9bhxqI3Hfylma55t4HI2G7Z/
+AhzgkYBr8H0XPF5q0h66up4YJrDCY2goWjv1W2TmVxleQNQO+eXpP4PJqz/bZnB1
+cXj+olt4CjUtbJ99+RnPU2/7pjQ7D0XMnH5KEqoOrqZr4jVrb86kps9OVmvDr8bW
+P7uzZywMNJfAuO9SYtSsqQMGz1SA/fDUK2Uhc3AeGyTU3ePAecABCVNaLnMlqR4L
+mugayqLdU0OLuNPpo/bNdtyU5GC+wpSFF2jIkASK+4a7KFJq5SViOCT1BV1NoWMN
+DzxXo1ODQjw=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v3-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAgIUN7TWG7r/IsU6ucZgeOILYEEX+M0wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxDCCAaygAwIBAgIUC26qMXLsjLi4NxcXvpWLTZI5pyUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXYzLW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEASso4H2cta3LlmVRnUQOSclNvFE6Gu7qj
-wJqfhsIqDFcxzePN+qQVNcb/yAW9wZHiFZRDy6T5RGsq2IKBgGDcVRReleUJc79Y
-3Jx2OrM3IGTY3HkM8NDuvGHEXoBZ5leF9ZXmcap3ku2nNiX3snVucV2qX8Ctpj6G
-/DVOVZmze3sRerxLmKrRETk12kEUFUUvRPkKgP3wRExnyBq69VZeQ8aKS9M8qiQp
-ZbEZOfoFDcULxwT8HLi3KT1UK5SS3viCe9r6VDYgsOuBPAs6+V8qbuzNJ6e8jDos
-jSVJo+jZP/DzialWyn5JDjiNess2LNbMAmkznBqIYxMJTyoSnrpUpg==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAkdjTbxvps6efTz63F1cnOMKU0NTgR+Qy
+IrfrbMX00GOuABe4IoEiq5uuV0Lj0jkd0sKSc516oy79ZujJnow0sQp6igv3fBHz
+6ZsQcHjULxd/PTsTGPp/NwLBsn49kXa/hwt1Us+59qH1oFtRPnQb4Hpr2QhXBR03
+DlhgsNHgaStKcfG37q1PIfDNENC4yM7mgQMvtqQX8QOmIEGAfnwBDLZAuD1GEZ5V
+qxprydaCHommBoUKUOAxMnZudco9SDDHPI5IiM1kN/cQL+WDHVIJgWMURqS+Xrod
+nkM5lFfdWGpU/79QLiCQC3mBpkyJ8Yu3bXCh4W4qxarC3n8QaCadjg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-cA_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAwIUOfbHRS6V7Pn+mvKPUX6B6llBr3QwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0zCCAbugAwIBAwIUD7Qul1mX5757Z6c1xfzbff8Bq3kwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LXY0LUJDLWNBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,11 +8,11 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzALBgNVHQ8E
-BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAYsgJ27vmbGXw
-LTTpn1PHOQlex1aQ2K2fP5aFsfaO0myhswHHuGkUkYUeU0xDNrd4w51MWLnUOpn6
-MQh7RD7SrsH+0gKdcmJVFgSmDPShwx8JWmybLVMocfJYFBxMpIVb7lcSmt1X28nU
-zMfxWQg1htJJV1qoZSjB7rxntoqAuJfM2YyXSUqj0BGHo7k/a3DHHKCRlpTN8i8h
-GZTalOjIsLymAygxfkgDTYYSzt5DFC+hvRMkqYcd5Z1CFWpAOcalhdy5LEQZ5zh1
-4uvNSs5T79cJWLMOaiIl3W7DmWZ3oUFeGKe5Hy3IaZxlSeLjS7xIYr3qjLgDkO3v
-at9pLekX3g==
+BAMCAQYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAX1ogR2JROTKS
+BzUzJ8dsfds1qRR4THa+4+1YcuuTJ1P66dnhnRXJVAdJmJyeqezQf23M5O56h4fL
+ilt20gptvf7bFd+DZCnV9iHQidQnukj7CweiHOs5xCdjz6+ozZfFpQZaRWX9/462
+VxYOLIWw8ft23liLUmBP/BhPn7W+ILpwvvqLamO3xm68yAGLOlGfz9FH65wupkq2
+wuXjh2XOVEKZ5RdUzXrF40nzVUBBWPwvQTLge+2wD07jXuDegMVrBKkbZDara9TO
+HNXcfbT1+9BcRJXlQDJGPyw6oFWHqH+FilAtbXryw3lc9forDWy6nLFvBGW+Ed7a
+lpGnStAJ4A==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-BC-not-cA_ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1DCCAbygAwIBAwIUB7tSSQWaSNI5n9XkMyeq1w19MxgwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1DCCAbygAwIBAwIULzzqCIST7DXQ9SzN6d/zzUSfj+UwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LXY0LUJDLW5vdC1jQTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
@@ -8,11 +8,11 @@
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCwYD
-VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBADXPLPfasakf
-XgbFcgAX2UX5bm4QETgKoKoW1Rr4qQyo/TJpkaEKAlYAb7H5OE5tFER1ivvgvroe
-fJkfZpjrA7561p9bHobzK6Xma7jGUSN27ak/WmGwbTJ3qIePVhoujT6wPlWbOEmj
-BYLd4EgEPmi7K84k3x3cFTPcA0bATbb64yYTbXt+Aqp1Av3stfDBqPekwwVH8QfS
-Si+35Tg/cApOzf2LrgV+01O730siBY9pRcur2wYP9B9b7wO/9YgjvIw+phXVG622
-zFrpaRXPlLJMkHI/HAyDSNoeGxTIGy+ypl5vtOdDZ5Glsy1c2bsyIw77nHEUwoVN
-BBvksm09I2A=
+VR0PBAQDAgEGMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAKlQRoxIy8+V
+EtYKZJGAsUvfB4+3LRWZy+eD89bhPUzEgh77u2EZS8byT9/I2+1kv1jJ7I6+G2m2
+cOLGILJBinEB8J3tOZHoUdiwAuqD0+zNBq+6sbItvNlJ84fh66Q1PTNnLWiKaQmr
+oIQJ+Nu7crZHkfUrCn8DxHgfaZqI+FV3mWie1AQYrsU9g5ZevWokQr4AH9X/jPrt
+ECbGoD5tPF0D3bAy3HxS1kCvwFSh0/GSszffYIaPrcUgOcUGYNdQSstE0y+lKZ2M
+ncYUxXd6JI/3OFDTMKRh37JcyPAozQyVecJQLjRc4ycB5uy99zdZzHB2DsMHu3aB
+gC2zpGY6iL8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/int-v4-noBC_ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICxDCCAaygAwIBAwIUMZpTWfCs2daN9HMqOjBLkylybY8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICxDCCAaygAwIBAwIUL9fvs2uc+o6yxIOieQDCERYiO0YwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFjEUMBIGA1UEAwwLaW50LXY0LW5vQkMwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -8,10 +8,10 @@
 sVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLA
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjDzANMAsGA1UdDwQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAtr1GxxNql/gJqOz8kza0/Av2D8j5lLrD
-CKIeWkppD6mnvTqr/XqoSmg2qZ5dxtPxNR4FeRM8IGmZR0etIIC1UCNAc1424DOP
-UqrCc8l7xRAZXeImqKyh2lZLKvzwWCruYu+m1nr0SWUXB5oEoQlK86TT81hHqvTf
-JymjX/LE9Pb07nUWA1QtmDZ953TQjm8vVXg26tokKn1V9cqovEv69+GAKBmAKrbx
-HFcr0QEbPVBBlnHN3w074aJR2ku+rbWK6AKLEmXBPTPLhEa4H0CK6BuqMKeM9zFR
-F5Z21oKF01WIh8HgHkOY3W9cLlX5zpg7BokyaHeEqms82tcWDiS/yw==
+AwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAe6Q1mwKjfxiOiyvpExwNTAo48PGfDIAF
+L9vF94d6fO7Z04Q5LeIMJwfXqb8sTJBBcsV51IYSMnK/EaVVf9vX7abcya6ku8VT
+EF9THjT6+8gXKPj1v1te77kvu0tYRpDQeZ1Nhv7fRm8LsZFZPTKeT+ADR2qZo24J
+K3073nn13fod1TnUYIWg5vjDezDUdgqWfRO35rPusy8DtIg3CqkYgXbQJQUnvEj+
+VDWbbmqc7tw3O0xFJVOPyo+/GAIqbSzmqJTzS9o3gBIzicBy8Q3B+s1F0+7qZELX
+P8ZOSdY4L0iHKSVEZhFnEmcz/cySwTwt5ou90CdVaNCeOntga0e19A==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-cA.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbECFFET4UqBD7WcurjXFr0qrPNoXG6QMA0GCSqGSIb3DQEBCwUAMBYx
-FDASBgNVBAMMC3NzLXYxLUJDLWNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBYxFDASBgNVBAMMC3NzLXYxLUJDLWNBMIIBIjANBgkqhkiG9w0B
+MIICyTCCAbECFHd1Crm+6DaFhkTjrm8a2lNZn96/MA0GCSqGSIb3DQEBCwUAMBYx
+FDASBgNVBAMMC3NzLXYxLUJDLWNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBYxFDASBgNVBAMMC3NzLXYxLUJDLWNBMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
 ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxAwDjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAMlw4x81NZCJ/s8W0KeWZfNRjx
-N8kUcYmSy94/gH7lhVgYSxMeA27qZfoXwyu9xhQ7oUG8QB2UU5cXL1FU6Onbd/GL
-KXZLGwXsaVkoPxd/aLjidF4ACnaSRii4jIt77OGDV5dYxESXgXtOMsZUCnfdhwus
-NaV0uc59MAEeHYEQUPWQA8A3YnCOJ33yP0PZCD/wy2fS2UJbsOLBYHk53gvRBBJA
-DUHVadwiO2PfIERx0vQRpQ3KB62ADmDjGk2Qhc1sxIjqqkNHJei9t6SEDDlTA4+l
-2BxQnqXxOwFtqHVNyTeZRP28gnxpMKxi+I9VfP/ZsXq/FCxEI9HMxATfDTBu
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCbtlhHVoAs3xPSRAoXxOuUpyTB
+MzQWcIvsS61mkueLRnhBVzkpR+fVlmLUObLpZkVvZpTwlzhutw8A18ALBTfme9vY
+8zdzMR/sNDRNe5kFDFWyqRAw7MWKKT70ViM9jJflEpN58wuboB6trwWoGuep5YSG
+Tzl9vnxxAPwlvUbMzktFHUYyVfXes5mvA1IjujgexuSLAQP494QWvgjUIIcvd+Vj
+FNBhDgj+bt7fhzRc4PF123lFn1bDpl7qxavC6+e7xx0AL1OPbifHTJD9M2sjrHe8
+Jqbq31/YoFQqgI+CTKH2IVnvioacB+rV4AxODP+unfIwNzjef5Z0UM/aXlMO
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbYCFB3u4coN2ieNxJhtdjQxr7yW7G5VMA0GCSqGSIb3DQEBCwUAMBox
-GDAWBgNVBAMMD3NzLXYxLUJDLW5vdC1jQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9zcy12MS1CQy1ub3QtY0EwggEiMA0G
+MIICzjCCAbYCFHt8jLZUapQcsSi0Kh9mqYUtCnd8MA0GCSqGSIb3DQEBCwUAMBox
+GDAWBgNVBAMMD3NzLXYxLUJDLW5vdC1jQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9zcy12MS1CQy1ub3QtY0EwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
 fs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1m
 CyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTM
 HGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m
 1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGj
-DTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAGo65oTmjAyjYImJwk7Q
-MqgGdz+pUnwE94o0O3SGDF3JMocUb9FBrvYqLdHSerNnpS5njmuea1UY4GlfRfUa
-vbLM/sTFE84JxyOYmIHjqRgu2CM5tCULLq061oI6MVyuLmQMAgKYP4UPiNFL7u5o
-pAtJs6hE9R9HQSPA8Jc0vvFMubcmolVP5ctv1EazyD2M58JACGcxZvo49CkqNbNN
-Qj1CdPGWtdDc0VRNnBkg5oMZfXKPPBpSgPG4TlKNwGBJTh6RXa95IcnlSzLZb1dE
-lXuCeqsuln3qrMYLbobX5UfVnsVj9gmii+Fq//uc5it3myiPrXXSyXkZRFLUBYp8
-HT8=
+DTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEBAFjtTHvdBSPcrUxP3PMM
+dnBxm/idtTvwhRcoskIXF/uHw39W9Md4lu9PT5AaSRFy+DCPG6WGuZW7z8qo9ECc
+2GbeoBCroJ7yYLQL0avK5SfWsuT79kBBuFXCD8NbDXQGle3RkXg+MrkCsvagoXqt
+8vexfNXMwPu6g+iAxZ7LdNjLVmHo8Q8vQKiAxDvjjmscxxrlGc6/biSEychTeEDK
+/JQMsD6uSadFCLBcKnZvAox05AxDd08yvlFGtGUx4NFToixkBUJZ8vPL9c0pHXVm
+YDKdib/UsN940D+chT7EI4fsolX4F4Ti2c3XbIHqF5yFbySODDKm9eVRCFxfLwrs
+7U8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v1-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICtTCCAZ0CFCsejGZdVDWh6sqM6brc+lOVCru3MA0GCSqGSIb3DQEBCwUAMBUx
-EzARBgNVBAMMCnNzLXYxLW5vQkMwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIw
-NDAwMDAwMFowFTETMBEGA1UEAwwKc3MtdjEtbm9CQzCCASIwDQYJKoZIhvcNAQEB
+MIICtTCCAZ0CFCmTa/0HEBZWaC3cI4nBeSBnQgArMA0GCSqGSIb3DQEBCwUAMBUx
+EzARBgNVBAMMCnNzLXYxLW5vQkMwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIw
+NTAwMDAwMFowFTETMBEGA1UEAwwKc3MtdjEtbm9CQzCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7
 wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCAp
 k6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhh
 eZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KW
 EsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONssc
 JAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAsBvTe4bpwI8+v4Uvvw+HuzPO2v62KHcbZARnWifnQexZ181qgpwJ
-y0hg2jjTsLcf/KJMwKP2KZQ/2vkvYyaslIMCqhL9GoyZm9SMYmthHYyCv62o7dPC
-2fk9Awx3AT60Nt03YYEcaQb5vxMy4nce7udpeFCbC8EFfggUz8JCnPFP9RTcQ9UA
-/lH7skXkLplhx1aibXTX8b3tmwvwqUXbOJwmPcEqDVhgxqGg8reY8jGJAlN47hiH
-yz7rO6+OlPuRtaSNbaRQ61GuhtrFnnzjSMWLn+dcoRvjdpedLHObqJX/h66AxYZ4
-oSQBpSiVwo2wS/x0iLOrvfaV0G/EDfPU7Q==
+AQsFAAOCAQEAGsjqQY3SWLufSRTl3mGq0Wv4rI5mSYOJlsZKCMtVXkMMs3QUNCcD
+1a7Fnae6tFjcpBElxgFFISLdmQ8lZXa4Et7flcwwYiQO9Hfzwpz/onlq1Cl150a0
+okDieDL5cklYlCoR2KGgq5T56K9PRKsAHWNys5Uhxfo+ysK/R8oqEVOUpm3k/Nsh
+k9EMx40a+T7idLj3z+D3hAOm9sus+TVSd0JXT0IFyJKf9+h7A6OCQasO9sTN7vpN
+O9nJf2aCU2rFPoTxOShDGJRqIFPLK2F1Efib8VqfZ85VmkepxyyzSpYnLYYtPLkK
+bpSqCfUSchX8syla2zeOldxUHWA2RjWYVw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbagAwIBAQIUQ1UrYgvl9d5p4DcmWVc6AVAD8okwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwggEiMA0GCSqG
+MIICzjCCAbagAwIBAQIUQQKlrDt19yvMQsPwETMYCCytugwwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjItQkMtY0EwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAO
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACi5ZQdIz06DGn7krX7k
-Io59bp7Fz0bPq0bXyy3q1fzRpSFTOFvHKMEkOJW4MLmsv0ioBsxbjqcZCDtUEw3P
-SXTsn237EnX1MHuXDj5xgmQCMICfL0Cm7yPt7IlwAtS6bnDOpzYglJYg1QlK8Vg8
-a/Hdj0ubfaQ7WSYzt7m2QGp/1HDiVvByZCIrezT2TLepx0Yk7+XWUDmXBnKK28O1
-ClAx7fMN75D2sqHJCQBQCgIdxQ+MjCfMTXWt+gZCV/5YOlmQVUvnJu6SMITM8C4z
-IJnH7r5K/kg69FqBUZoG0HO+maBfntIYvWggoYmxKm5wl9Xke+wIit9m5vnLf0Y9
-omA=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHG8xQ7meUSvopihSREz
+/svytvDvWFrlANJTBuUTDQUE/RR6uOgkJkSf3+je2Ngg4zCVkxqq+hSkbo+rQ+nA
+MhcDpNDxqu0waYeujbFIPMQ5iapebD7GoGKYZjv8HOHcg+PDDClP5ANIfUJBuTEF
+R9PePsHgnlF9wupRywfdd4E98psZmKhiHA7/rMiCmaf3lbxASVbqo2eWNMsBIzCb
+FQXab4rplzcQ+B76IzTNWRv08x+K32dApNfirepO5yCE5aLXn3XrChzV8tHgPaco
+gta9/I538U1xZOh3Z6qpQzksqL6r3inamvqvI10ZNB+/Mi0jUexPxyoj7MLCbtO1
+lI4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAQIUU9ChybySbNRQyuZtbHRF7XNodmowDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc3MtdjItQkMtbm90LWNBMCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYyLUJDLW5vdC1jQTCC
+MIIC0zCCAbugAwIBAQIUNbZQDstJLaaiUaQfs27GbUHZ38UwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc3MtdjItQkMtbm90LWNBMCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYyLUJDLW5vdC1jQTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEALvey0ymB/3Vl
-vvWeSvFNyCwf8Brvh7gu99lJCyaukEAKFIYcxva+wEUIeXRKfxmfXB0P+CPwfze3
-VtQGw6y5chQZe3PnWHLg12swtPiZSYhrnAcTjfXK0StEYqEygPG89TBvXxz0wBPF
-nBmcUs1JXplYQnh5FiCHq4iw3lAE0Ba+ciXqsMmCcvU+UVCyheBbaxWVitTdjqrp
-Xb8i51bCekuPepXCoEm/MQHpVHXoz+0CdKDEcD2pZV4d0sLpGMq1FV6Y10fzqJbE
-eB7XnEhBiK31sPjECarJxojVY9b3mfAAJHkzEoOIvCFCog24nlN0XA+kDS72SklV
-DRDUFbZpTg==
+AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAJWGrrP8uHTXB
+pIl5CU+IUk88BswSpETWnKenUqwyLfdQlr0fCzWPzZjZ+tbbtKLzHTdIhjAFqpwm
+Q7fefDO/CNmmRb49OajJE8HO3cHltcWK8mbIUgMsdcWpCCNyUBmwuxsAMj4ggJHE
+2p9KTvRorOj2Jzgvt2PktM7hV3Mh/hGP2VETMr4g1m87mSanFtmOUAX8BJ8Aemjj
+HHwPzJMCjnnfDap6YpIzgQQoRK+f/X9PiAfxM1vzjVezdiXjB1WWxqKMf7AcyTbz
+1QGA1bfMmJ1pRazpGqzeZmnADjvtcnmYKU0/MY5eAcmAVWRqbffg17Bgoj3ZKgc/
+sIiWXjciJA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v2-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICujCCAaKgAwIBAQIUeUlSFYddx48AfjOxMtCZp7TNH8AwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3MtdjItbm9CQzAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12Mi1ub0JDMIIBIjANBgkqhkiG
+MIICujCCAaKgAwIBAQIUFaBZ6C5ChVgFJTuYCY+Fv2HlV9UwDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKc3MtdjItbm9CQzAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12Mi1ub0JDMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQCISnaVfUrgMgKGTK9D3sxmOSkyEtBElkV7mef4zBFwnU87
-lrDXqSuzeV4DBBeXdP3WknymtaocPZubGo/5qAEOfUNv5/Cvxz9BnPQ22onMfLIp
-fro1v2Uml8YEdQULBUirrF2c1vFuYQ0o0qetjb5JTp6HQqTYO7KtolTw+k1/MW89
-slBL9DIReTpxJUl0jpXUdPrJ3beTybs82bssWSyzzhWY6wMepLtcZ0WzpOBIkqFI
-VUAviKn6XPyTuVMDRp+37BFWomO0+HOZltsvf2HXE+GDuY0Crqy/ZJP4e9pXbfCT
-KcIepDwGhCk9VRtYj9hWh7xCA9oi3r/9qt8s/dvS
+SIb3DQEBCwUAA4IBAQBnZXBfG8G0KE0SXdrsOA1pD/WGg0vnlbEZyL2/NCBoyuNb
+l57Ktb2ZtmSVgiAAtEnDDmeqUxkLKK0EVxyO1rRfWfgMf9C5+YwZvglnev0fZLN5
+k3+hQp3y4d15fURD70DbVajH4zk3S61GdlvUL4ic2qU4J6B1NudQSaDa8gn9sCBq
+rLrwmozkBOqL47QrFzXqigakuV+6b7ZU3Dh3c5xs2LtNMMlblMU2Ib0o/wgF7J6g
+bouwR3fbrBTmIwPCSsw/zM98H5v0xWYiKpGd8RKrazVpPnEmKzmud8aYhasRpTeB
+yQ+yfqGfJjrEJ/TAz++I/0/lAu63V1pFQRsTejAW
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-cA.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbagAwIBAgIUU89CkoAOfuuhhSfPmMvpu+ecXzYwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc3MtdjMtQkMtY0EwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjMtQkMtY0EwggEiMA0GCSqG
+MIICzjCCAbagAwIBAgIUETSep9lFvjlmLDhUIYgZJ9C1AZ4wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc3MtdjMtQkMtY0EwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjMtQkMtY0EwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAO
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACF0wOrx2iCEcZP0ZGSc
-0vpT08NizEqVHvC/H1pCjkOtbIrwa87FCVU8NpwgpkMRPNjQubfPyDCb4EZYMPKk
-WIsjLbCiBkZ+KMhyivfv8CT3wSnfXDw7NsJbnZfzXlDxkzxmGYz86uf0Np9IJuIy
-rQh17KfvNti7N3Iitt21Udr9Pa56f3qIsRJJtw/zDXUr+vMH6Ise4EZsXrdljQbm
-n43PWTEGNFCHZL2uXN9EPPbL1c6w0CzbgErofgu8pqIUesxTudd87+9jdiFnTzFb
-cAj6NRKDq+Zwhxbu3W9Yoz+8ae3C8EBTHBmf9uFSzUnY6V2zIQ/ymftqdr8h+PJO
-YJg=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAJA2yM4He8/hSksOiLp
+3WCPkSxarm9MIbj/XbbKpiDw5OZLsbwZzth6d1KJ38q57j0boNHNEPM5AJwW0jep
+izBQzVS+8Xy0x66MxEIoaxF/tVWNBnWnr6WPci8XpJl60XUcj/T8kPrncZ4jfu8I
+99qeMHMsv8LG4BzCZGkiHdmxGFbKvn9Fl1Incq2yTu4jR5nn9AeoyksYbbtbEFIB
+YUgWpmSj9Eu2g9JT1nq35ovOZ7wgcDXxnFiCHcULiMOw2ZrMViWhMRKOo5o93kZn
+34b4sPJ0dOnKVnLM09wICdvq2c4aDGKy6lCVoZPBV8yjxeqGdUeTVeHMZBJHAZUV
+FmQ=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUBSR965xkKFF6O48cDdB3OmBNDr0wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc3MtdjMtQkMtbm90LWNBMCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYzLUJDLW5vdC1jQTCC
+MIIC0zCCAbugAwIBAgIUCxOdFiOnJjGWpdtzdSkevnFmtiUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc3MtdjMtQkMtbm90LWNBMCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXYzLUJDLW5vdC1jQTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEACCFxs+TwuQYK
-hk2DIQxZP7q6IecazsBlQXjbim8hntdhUIwOCofn1YelxMuxVX3XFTWRrhSWRlRN
-A7BwQ5zskFmeiRUhu1dtKhUON83gB6qzJcDD9n5QDxiYwg73o5WaohnKTkpLBXCf
-XuDnL8327n6E7afhzswqdlk7vA1+vkANyDmy4kqJPQJckCohx5G/Sa59cVRweZVs
-GK9I2m3t2yfdRq0xgwZYosuUc9i6zDRZGMoBujA3bpz84kpqLqjG14j/kiJwZgwP
-jMO15WYpzojdu3Y6z0llRSmF92V6QTkUk0LRoFyM14bqJygYbBF+Ac9OOpa/6KEM
-/K/PDW9l5A==
+AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAsXgT1HoCwbXS
+yEW8j3hk7f8XrtC+l5oXby/NtEEh0UqG5/gjkkoPUXKh3kU/EsmwzadFtr9j8H5i
+Vy8+zr2rIkNzc8WkpXRLyvuwzRW04sIVmEnvvHWVnWIKoILk5XQ9wKKrXO40H4Jy
+6Fva9+f31D5y1hsPbYfmfKZlNxPrM9Mvd+NG5N/PEkBDzHkqMTh0jTmUs99DcoyR
+QVIta5ctnV8O+xWVTmKIte7hPGLnAUiDC54LNYkIXhevO6KbqpMvk74sKRPJRryt
+2NiTaSKu9YxL+Nv5wWqh2quv8hp6y4kzGt/dp9CrE3GQXkCe/KrTJr4Z6EBQfglL
+fy9XXKPejg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v3-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICujCCAaKgAwIBAgIUU8x5bp/aJfHQMtRJmeHUO7LjEf4wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3MtdjMtbm9CQzAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12My1ub0JDMIIBIjANBgkqhkiG
+MIICujCCAaKgAwIBAgIUK8t7xNHS43H4akDzvAdNmXRk9l0wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKc3MtdjMtbm9CQzAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12My1ub0JDMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQBBtLi0/gHU1ytf218EoWn0clfO715USLUiE5QVNWKfxgPf
-p5yKpLWYxvHaoxej+P0dPwoXB8404vlWGj/Nk7wKUNiKgR7aYPwkNuRelqMjo+l4
-Jgzyeu5bXnBSPjOTeJLp8Ju2uqoJKQJuX4uEoLdKBFf/RoIxDqKwXZylxnzjTwkk
-dyf3pUr4f9+PIAJzUUHRH78dLb4hqs0mYRPSLBixR2QR3ZeNOPUMyx2cjh0iIRpg
-LI33aPWmy4nbuaBwHwmOXOE/emXTbGOu/BoFNsz6AZuxR5ai5d1/jUwcgjr3aabB
-eI32ySI/3ZfuBHBit6Hb8YPnF/4XK5VP3fhD6lxS
+SIb3DQEBCwUAA4IBAQCh6MJjtVoXMs9CqIvFGOtC5xZBzApCyVVlO0sWRgdZ85Wr
+n0vdkUsRk7TPTeRmxC9aNtUHAYv7PznW59b8Kt3eOC2datSCu/d4HLLZasuwk/ti
+7ILH4wnLJx1NQJ/luax74pHmFR/ws+OomzL0IXu+nVsB/rv4OuNVZ2R4BlTsKdma
+conhammBSvpgCwOAXnT8lZAY0z9jYZfWYqKFgTz3wj9kyocrlJZNshf5JULEK4KZ
+tbJaVhFMv4BQK2ONaWj3fzjSVKW/lqUvd1P0c2Of/x48RXQlkZu5l87K/NQ99Nr5
+VprqZiNgNWMlOlMs+I2ooDjjdHLq/g5tlgF/kK48
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbagAwIBAwIUJwSAKGKYb9hNhOXovho4G4tgqx8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc3MtdjQtQkMtY0EwIhgPMjAxODExMjcwMDAwMDBaGA8y
-MDIxMDIwNDAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjQtQkMtY0EwggEiMA0GCSqG
+MIICzjCCAbagAwIBAwIUGR1OiiW80EkYCQaIVEB2xPm51J8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLc3MtdjQtQkMtY0EwIhgPMjAxOTExMjgwMDAwMDBaGA8y
+MDIyMDIwNTAwMDAwMFowFjEUMBIGA1UEAwwLc3MtdjQtQkMtY0EwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
 JJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyX
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAO
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAB4N5a7ay4L6/aS3YZ6v
-XgnjluY6uw+xfxXSmcKDHcqYtXPf64NU4MAryYZ8qgn1TitJhMRgk8/gEaqtS1aG
-gFKqji/wj8FeQcBZCl9oSQiTuaY/4QREenDxup454CvdYqpptJfTSW3poPjVOqzQ
-rImC15eE6oAxOGRO1ekHS6NbrH7qUX4SpuxcT7sgA6MJFXahfW96SpENoT1i3t2O
-xg0laP0zRuqVRoDRIF1SHyOsxDWkq4lJTYg0v8VhCdgo5s2h1pU+DLOSdWm1krcq
-KftODLwVkyvwVbCVgrzBTv2KMeXLNIM1j9UzP278v2rLrYKNvvmMn0t4frE2tGKB
-8rI=
+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABE/8s/iuB1DHRKW7Odz
+uv1MVeVgCYeWfVGJVZ9w5dMVvmng8/7tkSffzVmuKdbvcfugQ6QzTAXFaPeMzFa/
+djSrxTghal5rH36truQrNZKHkcMxzDkD1G7FuEYomZVuODWhRIQ1mZWS/AnyVoA0
+B4Dr7u1ULdDqaaWroxZX0i9UG2QtDX6DAytzeNJwxgJ0UhnHJ3b4uRJN92rObzQ9
+HwBwfWwFGfrjnO/DGn60NxDr6zdjNmK8pgzmEjgGxPE9lHsOkF4skq/9XnyUMh5N
+41EXZL3PC7PwgG2nYeFEkUd0rP2HahxkBEIcO2iVWorqhfBWGLRQUzYtfd8V/5QU
+B90=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-BC-not-cA.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAwIUFau1vX3jk0OL/fXLxCeTGa8tjTwwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc3MtdjQtQkMtbm90LWNBMCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXY0LUJDLW5vdC1jQTCC
+MIIC0zCCAbugAwIBAwIUISiwRjGQW0zDa8BcggTNw+Gw6EAwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPc3MtdjQtQkMtbm90LWNBMCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD3NzLXY0LUJDLW5vdC1jQTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
 Dw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7
 EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SK
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
-AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAiOiq6tGWIRBM
-pO2XSDZoY96sVGxt2eS0z/mHAkVJLwlmCxnErUcSHi+oubHmHM9W3Tz1OyUMUqgc
-RjO7Dwpj1EfyL1lwEUZeUDDriHUF+LijPPdvDZbdFHOQYEVNKBU2I+ImYlYFN7SG
-rcCRMT3D1uCiky4vNLUjn/unPYAvNwVpGsHegIaSDDPfELX6zq+2V19TrEHUf509
-d/PVEzdPGzeeJ5SL5V/s/0QuW8Fqm3v0u1kvfberwgCB6ZmtVeyHA880d3T7MOdl
-gad7mWUcA5BIEWS8STK+JO3J4QuLqYA6dfBRVNq5VAA3vUe+/zzj6q2pRpbGofdt
-/PBKr2BF/Q==
+AwEAAaMNMAswCQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAl20D6S5AemWE
+GJMgprIXINyeCpH7K2umFjmzoVk73HosNjOaPDZPgk+v4n8Wf2CVg21uU4U3v5LK
+1EHmNicbnI23fV/J/PPb1yy2YZ7+YPVolx8DwsxxYWH6N7aTGCdLwe6L44O91uQk
+zCXNXD/mHyRraYb1xPFLIg1GzzIz8LVHrax9V7Jz/u3TlhSeSRORaUbvJgrCm9nX
+V/7Ozc8czgtKfnTaeLz6791rK1my+gymoB01wbirqwxEzpWTlTFXUMCyzeLc/vuu
+L9+vHAWT4pglrPMRCa4GqGlmIdXpTj65kiYMTVHOdP8xKZL9q6jfDYLB1buYt+pz
+Nvh82338Bw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_cert_version/ss-v4-noBC.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICujCCAaKgAwIBAwIUB5pbfkpSndV/29sXVHdH4wpoO80wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3MtdjQtbm9CQzAiGA8yMDE4MTEyNzAwMDAwMFoYDzIw
-MjEwMjA0MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12NC1ub0JDMIIBIjANBgkqhkiG
+MIICujCCAaKgAwIBAwIUAWcyAUceQlTM7+BoK8oA8uak6q0wDQYJKoZIhvcNAQEL
+BQAwFTETMBEGA1UEAwwKc3MtdjQtbm9CQzAiGA8yMDE5MTEyODAwMDAwMFoYDzIw
+MjIwMjA1MDAwMDAwWjAVMRMwEQYDVQQDDApzcy12NC1ub0JDMIIBIjANBgkqhkiG
 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
 aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
 adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
 pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
 YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
 CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqG
-SIb3DQEBCwUAA4IBAQBirZdlCTB6lX8HUF1A9p8H6e8EeR9fEdNVhw91EKyug1fP
-a9q+DtTzihn9CO3gBYc0f417EllIKYLLEQJN+14nMVjgGLk4+piLyY6y8tcwkYXX
-p9hCjdcYOh2hhESUkbrAo/VZ1IHuqtLkVUhQYx/rAGoV5T0GCgFQauMKHA1h1UZg
-OLolwwnajiqmDmA0KjILTzOMJqerXn0j9C3rmdmbl9a9qx1AGqX4Hbg7zEa92nvC
-fvP3G/DBOyojFFhZ6viIR/WvnVx8KEnBiHsKtwol//hXcCtcf85mlYqZheE/stgk
-SmQIOBWDDjpawz1DOJvuVVYszvXpj4bLHoZQUov9
+SIb3DQEBCwUAA4IBAQCiyfMdjGJ6o4Yw2Q3L5QbFRBijGCTVn1547HXPibTewg8G
+Z0/2twX36MKwbUGvq/rWMhsKKMrdbf72W9pCvyPcRQKfxO2XFqfxUF8TDUI0DKw7
+Wj1+vmfsxu99bArAk6ESUgYoYHij+Y5OLIKjWYgqXQEOVx+/Ywtv4kQv+Hlc1kzg
+0H3rQcLboya8NxX6zNqO+l7xpKw+eoiEyF+hqjrjbAzKgbQbOA1t9ts1xlFcfTJ1
+36DqE4eWsP+lNBHPAOXSMXUtFEjgXw7UA73zOxWJUqnPRvKjqpMEE8P84bt7PoEX
+riT1RslyhX2zDCn4KhLzbqrHk+9hZQ+K+HB+E9r3
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIUdTvGd/ncIzuXj5tm4n7vhk4CR/kwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC1TCCAb2gAwIBAgIUfypncvlf0ZBX1MQ7mXPauUSiPVMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowETEPMA0GA1UEAwwGaW50LUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -8,11 +8,11 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyUwIzAMBgNVHRMEBTADAQH/
-MBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IBAQA7d5n4kxNl
-o+91eKBU7ACjhOlub5odigcQ9Ns08pT+CpnF8MNo6RTFw0LNCKX6xCIY05Xrw6ih
-PEgc47GLqYcNtjAHjQmFYnX+CQK2JAyeE8oS3JLh3SAQWiKsgSTpX2KiZa3uxU9/
-9r1Gk474kCUzrZt/cQEjqekJONqzc+yECIQdqW5f8vEUDjjPy/rdYGlZFwOyegFO
-7qogyOaY2VZ1XX8K4+vlrvC8wY4fgQHP4nxL2x3LyyziFfks6A5BLBjVVZI5hyYO
-Wd2pQq1tQ4UyW5gUBhvXUWHh/AUEYZsIoKyoK02KT2bszBkxgVz9ae28G1acY5J+
-PYcyOyLBQzzI
+MBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBCwUAA4IBAQA/uUqk6o66
+Hfkdkn/XZA7Wszvsz4k+eQEf/0Y15EqvjGPm1pS1qj/aQXhKqwA6kDaIP8urgUOu
+53ikXeiSE1LDFYHlduem8MgHg7tJ0QjzSAzdgjslHUuF0umbemwnXAbwGYfMlJOQ
+Pc2898QJoev+6YWC0Mb3nV86X0NwH9BTKVCqaxrQi0edqndxKv6VggfAyhPaw+TN
+jO8z3Hvv9APY184Spg/ndPhZPJ3hGCve8eus0hRhpSoRpGH6cmCw0IedUVhDpR1R
+StT5bZ2/XEGaKFGEIjYKzrreMIgdOfNQlsBB1iD/40qi+Mi1/m9ctYJv2RJaEjpw
+gu6XceM2TJaJ
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICPzCCASegAwIBAgIUc5iQbbq2Oa/NkFU9Y3yaH9GYW10wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
+MIICPzCCASegAwIBAgIUKVuGEG5eiGwlJfVnv/ULDdeFL0gwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
 oWhyQzYrXHsYifN5FUYVocc/tI3uhj4CKRXbYI4lLeS3Ey2ozpjoMVNOapwMCwnI
 1jmt6DIG5bqBNHOhH6Mw4F2oyW5Dg/4nhz2pcQO+KIjP8ALwWvcaH93Mg3SqbqnO
 oz0wOzATBgNVHSUEDDAKBggrBgEFBQcDAzAkBgNVHREEHTAbghlvbmVDUkwtc2ln
-bmVyLm1vemlsbGEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCuDqItCPB6mEnMQR03
-rtmsNBqLzGXrh4uVNuZiLF3x2nlnrJ1cetgckMY7JJS8RCfvVZ7oyQ3l8cwEZqzX
-CCIpEyEo+NEx4+9ab+/5oxJzG6+c5QbGdvB2IfaJ7LgrLKPAljuDkfpJKsykCzOo
-674GTx8UWJxuR/MnkLWeqFr7u6vLxFESJBDN7q0BbuDeI4lr9kV2lvszvBeeA6O9
-gDLNYnjxt2vQK3gnx/FZCzzQHyDsBKvpE3pqxVClkOe52kfwNDqT2OaI2bqFXp4A
-h5dUcMOm+/5odiLKyESnXGiu6UPb2b4MbZkiZ4bMIbgL7XZpYKVqmtO1UPMuwVCg
-5lY5
+bmVyLm1vemlsbGEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQA/Lumx62bij+HfehIY
+6+jXkePuTOsaRpL1W5jk3ai78rWYRAVzDgM389kTBYJYCViHglgZQmQUeU8+sS46
+L/PO17BboOsCgqZt5QPSGPqSFvmqFgNOT2bl6rKtg6F5pM+orlCU816noIOCFOTJ
+AHQHvK6qcy6SBGOn7BqvNMsRhGc7zqn2tTMt0FzjO7ULroR68aOLDCTzTgiDpz3A
+DELgbpWFFE+W8flGnO1NRXwQDX3kEVlgVlOGrw5RsryE9HTYFhV4KXymxluKjL7C
+oJFn115lsgbmbK38DKhjU4Sk0EHgFjC3K28fGaYtIBWoHAG3XGu1sBhWNCGCWqVH
+Q7un
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_no_SAN_ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICIDCCAQigAwIBAgIUaYf62WtySDK3dfqJQH144lxxg04wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLW5vLVNBTjB2MBAGByqGSM49AgEGBSuB
+MIICIDCCAQigAwIBAgIUQQefsZHHyGIzVRjWiIp+2Sojjt8wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBQxEjAQBgNVBAMMCWVlLW5vLVNBTjB2MBAGByqGSM49AgEGBSuB
 BAAiA2IABKFockM2K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMtqM6Y6DFT
 TmqcDAsJyNY5regyBuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC8Fr3Gh/d
 zIN0qm6pzqMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQAD
-ggEBAAJe6x3XRE9mgbLPEgQf3NAwjTIW7D0CD1eIjqd86QA+67jOJ4WIkAw+x4KB
-QQwcWxnqKZP+DCeQMe/0Cgiz6w/+wZ/wiBYDBJKvzzyqJHmgBeZrDUho6dEzmCKr
-iznk07HLCf+LbmAsexbpgeveJ80JEXi+5k3f+zv2WRN6tMi1+zJUszVRnYcwBMoM
-WhnOblGX+IwUIundn6enZY8U4/4XrvvafgXlS5fmDTWw5LsF9hCxbqC4/pCBTWUY
-oGz9jqDSjr/ji71kagVhldtGngG4swPJBdIgUevzhqudNIubN8C5ItiaWjR/YeSf
-Cofq2Q44khih4itvBOIEElyDLaE=
+ggEBAKT/ZTZsIyuxQFbK8CcN/DwFVxYfSDVLxDdv1hytINxuAHjpOF2kkcxHvUDf
+pjXG6pMSFip2+dJp61qDrDzeb68K0bzYjGvalDbv9a8JDKUI+mhGTfm7wh2ZmxRm
+SIZEP0fQ9TVB+h29bYqdBaanfWBAcvWKTKDIYE2visis8Jo29fBoeK6TC0fZpzzP
+Y5tNZgbwHvMWW39lqTZj0FtKAN7jdRTM0O/KYNAqlbzmtf9gSDNCklxFLRZRlbqO
+Z42M6FRc8k2ctbeFAGLZTF7ezolx8HlAUVbaptJPux7oj3dsCiq73aXExDPtiZj6
+9IX27OM4XsJhpS+RmI8GWqVSULI=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_RSA_ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUdYQySczMIv4AvB4JpnB5LjYCeBQwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBExDzANBgNVBAMMBmVlLVJTQTCCASIwDQYJKoZIhvcNAQEBBQAD
+MIIC8TCCAdmgAwIBAgIUETmtBD+18aLFBIz4293Yn084a+MwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBExDzANBgNVBAMMBmVlLVJTQTCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
 w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
@@ -9,10 +9,10 @@
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaM9MDswEwYDVR0lBAww
 CgYIKwYBBQUHAwMwJAYDVR0RBB0wG4IZb25lQ1JMLXNpZ25lci5tb3ppbGxhLm9y
-ZzANBgkqhkiG9w0BAQsFAAOCAQEAeWA7Z7f4PheoCySDGDWPisxEEHNEBrxwA7p0
-dA/f+LPjYAk+j4UpLzYMBUGrfsn0HGquqQA/aR2pT+RzKlaF7iu+VNTZ2vvuDAAJ
-CXmp/+hnA4FSgUEopKa8xMwsF1hz6K381zQuD3iSLF3j30kZGioPIYSd3nUEzsOZ
-YsRnrSnnXECJSPcPNmMcRdh0yAcyQJnEeaiEwJZDNVQ2KL2GnaS6sdZyhhhYLB09
-KwA+zAqCMvdQUlVM/4Wxwpy6OeOfsuGsVnRsOFSC2h9mBnIsJJD3gW8dqNW1d5xo
-+9B43ZKkIBkNZBO4K05Flm7SimTp+ig3OeWlEPuuSrpJ7XoLyw==
+ZzANBgkqhkiG9w0BAQsFAAOCAQEAEnk3u7e+n8mGwAbfy3Wj3RiBhXkJEN31ClBG
+/NsXUeRBv89rPb2m8DyLBcEWvyNgQ0woyUPmrP5vsIUYQ64mshWuLgSzEk5/lY2+
+Quro14NKCTWo4F/DNgra5lq7Q3S8tXhmM+mBlsxK5QN2kWQM0ODlZtMp3P9821DH
+OqaRTDvqd9dO2lFwlZ3vW5w5Uq/HQxciSkea4D2l1PcoWaqI7Zze66jj3H5kBoMY
+SN4n9+RqPXUyBuF1A0d3W/jIzSnW7f3F6Gwe8fzhNsiyVE71tRHNForx4KtDR6BG
+lyapz8MMoaTCgaS6gbv6RshJkRusqBQxvBY6JVgYBbkXw/IWBw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_onecrl_wrong_key_ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICLDCCARSgAwIBAgIUBylNuyLzMQcrrJ/Hbv6Pa1A3VeIwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXdyb25nLWtleTBZMBMGByqGSM49AgEG
+MIICLDCCARSgAwIBAgIUeYPUd9Pk1MZC6Pv1MwwnCAybLMQwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBcxFTATBgNVBAMMDGVlLXdyb25nLWtleTBZMBMGByqGSM49AgEG
 CCqGSM49AwEHA0IABE+/u7th4Pj5saYKWayHBOLsBQtCPjz3LpI/LE95S0VcKmnS
 M0VsNsQRnQcG4A7tyNGTkNeZG3stB6ME6qBKpsCjPTA7MBMGA1UdJQQMMAoGCCsG
 AQUFBwMDMCQGA1UdEQQdMBuCGW9uZUNSTC1zaWduZXIubW96aWxsYS5vcmcwDQYJ
-KoZIhvcNAQELBQADggEBAJF4kQZcLsG4WHZ0SCq2LHuDrkm0dS/a6V2vZjbEMcCL
-oGU6ng4gFtF75BgK31RXgHHj/kR3qNsLmb2KrtfzWOpiHi7e5aiVPePrLUSjHBj4
-HOO01cWUI2iqcqmpua3cwTPXLtoA/aY0MK7NiqeHqVVykWPxE2ifRDvEBEFsFdbJ
-yZvr0dwZCDDOQOR8et/sDE2LZ8/77fJaf5RQs1t4h1n2il6r4l3oCvjb3YeydXdg
-i26VqXukao9lVSIuR1BVSdJkYRCzJmv6l2M8hKYezJVBCyqz9RaakkHFcatl9i/n
-zQRef5pj3gtMi0DmNxM9gRyvnxYTCyCXVO20KbdjOt4=
+KoZIhvcNAQELBQADggEBAAsDCFfikCk7qQayhqET9q5qHWiXv+0NuLW9j3zpqwQY
+uRXfiY34JsSpNtR+AVICUcierAoKfqXe6HTtDtQfjef8viCaer40dfLI9P5gx1l7
+nwybFl0oRNSBo6CZTcLHEdWHXbQvogj27wt75pRP66e9hFnH9FdOqp5WtP1nBVJr
+wF8tdRZHHSLlsrLPtCBXMBtZxCBB6grqeIiuP5qz/+ayRvv+be4D6rqJrizHYgnW
+q4y0pxHZzOYwrv+cqzRYaVOlwH0oU6mm0d8QDiry4yIGdNSOtO8/a8cdmbQakFXI
+XK62f8bnkuYvn6wp/81lyK5DzFQLVobPnNnwloCyjII=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_remote_newtab_ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICUDCCATigAwIBAgIUMcWMRBzwL26gOp4GI1Fy4HXMasEwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
+MIICUDCCATigAwIBAgIUMX7ouKJot3CcYRs5Frqu4NZFy/wwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGaW50LUNBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMA0xCzAJBgNVBAMMAmVlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE
 oWhyQzYrXHsYifN5FUYVocc/tI3uhj4CKRXbYI4lLeS3Ey2ozpjoMVNOapwMCwnI
 1jmt6DIG5bqBNHOhH6Mw4F2oyW5Dg/4nhz2pcQO+KIjP8ALwWvcaH93Mg3SqbqnO
 o04wTDATBgNVHSUEDDAKBggrBgEFBQcDAzA1BgNVHREELjAsgipyZW1vdGVuZXd0
 YWIuY29udGVudC1zaWduYXR1cmUubW96aWxsYS5vcmcwDQYJKoZIhvcNAQELBQAD
-ggEBAIAMw8pCy2DffqK52uxOEFyjDUrTQHSdiFI4brJUTTvbKPU8EKAzzJ/B4MvD
-FVu1Xz68zPqtwd0u4DhPX8eiAM/fgM8jYp/NL3jnboM3ay6kVzxr75cVs9O37dLO
-GifB+pEKY6bZKydDhx5N/3wAQhv0/jXqZTrDpBKZHqL4MH/f78czOFYKsCoYVqxC
-IMDJFWe5xAJJFkj9FsQEkhwhKzZRvF0Nxj+PcX4/TmkUYRSRdHhSnNdupSw4I4fg
-7dzwoizAce/UxFgTuL3LnhBKb+WB9CmH1UEV0b8qLZQTr0RXwWwk9oLoIZPPorha
-RXpzr21ijzgO60EkyOS3g+0+Zu0=
+ggEBAAgkFNZeQNsGbNCAAWxVpWDdSgvCOYemduVhNJQTLZiZJkDia6hR+tgGGcoB
+dkCOjK38ipFeTttdeGTAGW7XwfM7ViB41sRTZnmkuPfAbiQfd4PjZQQ/KqfWipsZ
+UQbsXnoCNA9OfeE3RHK+79n8F+Wx7l0ISskYfMxoFE2HF42FuaZ0zh3CnLKQG+gn
+l8tiB1a1XgSBRNvXIgpqbyKD5YlHyhj7mW9SkhKfaFRnmktpQWqpmxczRFRNpMnd
+BcZRsmkQ+Kye+blgiBLudWrU18yDArYDHWD8ObhlVq9DSBqq1ClWdhxmMUxE95D0
+Bare3XT1RUSTBIuSH9gJFiiUpUw=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_content_signing/content_signing_root.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC0TCCAbmgAwIBAgIUK39wBpbmvGSOCAQSWGMB9IkEQZowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC0TCCAbmgAwIBAgIUG3upUKWDjbYJ8e8IBkIMf7SrvMMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,11 +8,11 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjJTAjMAwGA1UdEwQFMAMBAf8wEwYD
-VR0lBAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAFXezvdPR0pU7nWR
-yMd+UEMGbS+I6ChbuZ8pBRgL4/VJVWAs5ah7SKuk+bZjTIPR1pdPV3pl6PHsWTiA
-djBd/BviNhagMpJcb/NS5/MmnrFIlxou1LpzvUj7GkdsDyb6vKb/DbtIpkrw55v6
-T4AVKFCmJ4H4lXwEewAzrktMpz03yoqzdPuWifQbHRsbFvcrhI1ji+Mqz0mFfxif
-OfWFDtAw3dbs3lj3Ls3A1/Es+FGxYUf7q7/9xZhLC7BvGTN/wKvI9m6wTlaPwbjd
-5rvaHO4g5dsP2Ns4SnsqLqgMfmlvHKMXIrLbLlcTmCjXJBNlZT12L3BF+R1N2h0K
-ZXRCulA=
+VR0lBAwwCgYIKwYBBQUHAwMwDQYJKoZIhvcNAQELBQADggEBAKaz+RKqMBowh2H1
+HBun9kma1zWzkKb4ZNjke2eza3NDWCcDipnpYGB+iNhtzWPc2SA53ZF/yn/xDpWW
+zF0UyKsswTxRIS/FmOkXqqTu0bHU7kmdIb+cqSuuDZDshdONGRDspQD/aYPva499
+eKc/X9E96ICCyTAVaL0YQz6UMjPgiTrrP1O5cpYb2uGbny5+okw/Ir3rlKhw0SGb
+QqHuXmixawRj3PNzO0B63B0HsMdn+hbybHaZIkgNFrZ4pRmjnbiywMQNsvFzETZc
+mgX9vf9puBLgn/3qBpJrObuZ4xux4stfBumKXWQ2S/7HaGn8W1mjOV82TQSCvx4X
+Re529ME=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/ct-insufficient-scts.example.com.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/ct-insufficient-scts.example.com.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/ct-insufficient-scts.example.com.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/ct-insufficient-scts.example.com.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIEsjCCA5qgAwIBAgIUDZkLtaWciv9VX7GOQWCarH/+NiEwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjArMSkwJwYDVQQDDCBjdC1pbnN1ZmZpY2llbnQtc2N0cy5leGFt
+MIIEsjCCA5qgAwIBAgIUD7pA2hQ6aiqRWzwjIb6zStU4wxMwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjArMSkwJwYDVQQDDCBjdC1pbnN1ZmZpY2llbnQtc2N0cy5leGFt
 cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,18 +11,18 @@
 A6zaGAo17Y0CAwEAAaOCAeEwggHdMBgGA1UdEQQRMA+CDSouZXhhbXBsZS5jb20w
 ggG/BgorBgEEAdZ5AgQCBIIBrwSCAasBqQB2ACq4MEQzuRTe0vMeQgfyUcF6N6CS
 aFLZCAIG+F5XORYqAAABUfp73AAAAAQDAEcwRQIgXHVRnxMRUM1dit4go7wGMJH/
-snN1XzFk7P3LQoAKcOYCIQDbIaP1umpm38bXuHWbaTWVkbVQp/p2CjdDdHuoX0Ls
-qQEvADEI9rbdchgH8BaVhE2FAla2cZNgg9u9OTSgUFJQGiiSAAABUfp73AAAAAQB
-AQBi2+iMF+kdthvalJAPpzWakfYb6i9OKMzfpJ91KS6ZDC982YJp8v/+03O/IuQF
-S0/c2cUai5t+DK9wnt0uc4+cbss0Cvlth3ZWbaPD4G0MaLBhjVZVABrlvbFEG3Xh
-mD5zSR24mtXv8pKiP4QYYk+6yJqW0HyGR3aL9eqmctlsJz/Hh4NnQU6eYG6FQ2Jo
-Gc3npSKQTArzW0zH2PTZ2lWQYQkJYH7ddthd8/EAALNVCwF0aztlx65tXu3a8R46
-iBat5PellVBbkYA5b2IVVsjpWAYyfm4PVV/RP7HDdZGK7syllJEHlFJbbPJUh0LP
-sOVM81QQvTjjVaD4RZ80pPaMMA0GCSqGSIb3DQEBCwUAA4IBAQCNbcJVjcMIlZUU
-xuPbk8RTRBOWxdragpodxcL+geqfWHBiSbSL48AefINfsc8/HyBdcH9zNevz2Mpy
-4SdmcaTQvKk3LKgFYfZpZIh8iJiXv1dK92h5uczhmu7Plw3bnWbIXgw6hFAZcIet
-d/cb8dNXf1fT+TjdAJJJJ+p/IVfEY76I2FLdHWlfCbEse9ChFilylyvgIrefc+GV
-u1EHCeG6uyk+1iJLeFBvMkDb3XWCtamc3GuVX9NALJTgh+Vj90z/s8NCh0Zyc9FX
-9Cu6VBuOg8IA+q4acc9Y/Th/M+UoRyJdIcDN5b+SWwAVftl0AK1iOIecPcsyD7ql
-jxbO9FJS
+snN1XzFk7P3LQoAKcOYCIQD0nA7JqwaCdhzWfXxdSrCk6FesmzZ8JJ9CHVN7JqEr
+JAEvADEI9rbdchgH8BaVhE2FAla2cZNgg9u9OTSgUFJQGiiSAAABUfp73AAAAAQB
+AQAJQ/auHYB8PHgYp6ApXGqdIPM6hRnYlX292tOXymT3atbxcBbrwCaW01Y3mU7F
+ndLHBxnfcUdGK314D/GF+8Ez5k+/kWsKYkxH+pVFLcHuyJ6bVREfRkqEgwrenDlz
+3NvxXGXUoWgYKfT9fWoMJui1IuRIbDjci0qBq+vT6GhcNJHdXHm41Yze+NjmsmKx
+5XEwSQIqg/NeUwuDrsPU9LOcjZ3OVEAH1aVWY8cy5EhVA+Zojk9mTXVE/iuBCp/n
+90V9dXyK+E7+ougZ+jnhrlcPCmULgW/Q8LNtRtR0KKexWMom2PSjs1GmbU/l8Wm3
+sv7vmhihg5SQsitmM4CHjxWtMA0GCSqGSIb3DQEBCwUAA4IBAQAeXJGA3UeqCgu4
+VXi8ZvPAmz2BXIfEiwtOXwvuvK1u0SsuwkLoSkKwk2Qr5/p69qn8mpQQmd5zSQ2v
+sAAviWu0rl4ugfQr8DOHX1DUF0o82xNMhR/xvz4cpNr3SPrVJOgFqf2oKquo7dzI
+kE5vYqACL9w/pRht2EUTJ1eWwNDoz9FCY9zmsvFAiCc2WLWWomKW0VmhxJ+8zLCO
+Yk3PBHhipjjGobt6UcG4/QViwKZlRIUKyDMHJ16NhXmicmKWz7LVfkN1XtOpOPGh
+v7AX58qHA4ZjBg3AOzfvew+pDdnrAIgrUqcatMqu31xieJVLHDGsg2c5ID3xPx+P
+AHOmzcCa
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/ct-valid.example.com.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/ct-valid.example.com.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/ct-valid.example.com.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/ct-valid.example.com.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIF1jCCBL6gAwIBAgIUD6UUUFzdxh4LobDk7d00UOcLJukwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAfMR0wGwYDVQQDDBRjdC12YWxpZC5leGFtcGxlLmNvbTCCASIw
+MIIF1zCCBL+gAwIBAgIUF5bjHB2T8yqxNGQJmDc0Cm6FVTYwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAfMR0wGwYDVQQDDBRjdC12YWxpZC5leGFtcGxlLmNvbTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
 /WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAG
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
-AaOCAxEwggMNMBgGA1UdEQQRMA+CDSouZXhhbXBsZS5jb20wggLvBgorBgEEAdZ5
-AgQCBIIC3wSCAtsC2QEvAFQiJZjzPTZIBULa7ODmuU3hXA7ujFkUykjXXjxIToA/
-AAABUfp73AAAAAQBAQArjTdd09t5BJYPxRyfSSkbDGg6wGdCfAODx5r64+p3GBUF
-mVh7aHN3EWbaJQBDeSlaLAWeNzrk1BLHPtE4GQ1fxnJ27VdjBfM6o/Rqb3Qdzth8
-hGMtveuT1KSJGt629cn/Xu9yv5RyNO3U5bOCrdxmDnL7+GNfUPGFEW1tBt9Q0Acd
-svF1tRHlJnE3b4AHks7v2njjmOfqF7jaJut1UTa6s3lclYJIA7nBKBQ5wzRi3XRO
-V0NKzBHZVJjqzg+Q0z8IgAcev9/igL/qpbqEBk6wgrimc0g+xj/UqoD4U3N+qFCC
-gfifOWfFvqmz0jz5Xrwej7A87r6TBzOykR3phUS5AHUAKrgwRDO5FN7S8x5CB/JR
-wXo3oJJoUtkIAgb4Xlc5FioAAAFR+nvcAAAABAMARjBEAiBcdVGfExFQzV2K3iCj
-vAYwkf+yc3VfMWTs/ctCgApw5gIgBF2Jnsf5Orep8sk/4pcFq0amzeHofzOhjVMd
-ti3KaD4BLwAxCPa23XIYB/AWlYRNhQJWtnGTYIPbvTk0oFBSUBookgAAAVH6e9wA
-AAAEAQEALqMxXNj5SOCUghQ/5JCGTRy5rgxi3eF/Lr9VtNcR8SBQ9MkB6nNNviK3
-TQjHMSuvxRMbcxDOYEKHo9nqKEsLabnJq0pbF3FobjYN3QG84aGG5Zrm7B57Oq2s
-jvrxo3U6KGRESV24goGSQODOomrQrS6ZtNISFCL63S48olFOlx4zhrKXbFfW/6qI
-Q/QR9TZL6GiPDsdRXv1xNhEj1J4qbbe6WJt+6ikX6+mFl7tbmQkyT7bljPfjV7Ez
-e2d+eDb59AZkt11bxT3U7kYjapdlvvUNVYGybjZGx1UsMEO2IKHumRZh8BeMC7wz
-452gaCaPvbxnM9TRL6E6UL3T3sWTITANBgkqhkiG9w0BAQsFAAOCAQEAMtb1PLrz
-Aq7UFzfWvFPjeQ3wkiuG8g1cTBLF206oeKxkrtLtOrkO9sFm1D+Ze7cSH+06Zlm+
-0RvJH87mzIVijZO1zwxelwaQG7lxVKDAC3s0BFA0SjZUEXmW65fSMmDS183/3AME
-dZQTg/LL32qQBBFxGhXffW10FATgKAl+7wZdRpXXTxABm5/PrLF847/3yeycX2wh
-Ujsi6/F/y5s5AtbzK8z+/5E8mDh1oIvCulE/FUjRg6U+BCJt3o4hhGnmrR2Jvfw3
-ry+1WJEF7EgeXVPvL+71PhLMyZbNDaSXMvtpjhGy0yE0jUmKbkzRaDfRMPPlKzWN
-DwsgxlZ0xWluWg==
+AaOCAxIwggMOMBgGA1UdEQQRMA+CDSouZXhhbXBsZS5jb20wggLwBgorBgEEAdZ5
+AgQCBIIC4ASCAtwC2gEvAFQiJZjzPTZIBULa7ODmuU3hXA7ujFkUykjXXjxIToA/
+AAABUfp73AAAAAQBAQANJRHiZJgVmreqeqGKEvgLaZbuVZyz5Vp1IfzawYVV2J5/
+mbvIxX9yQcJVQhHHdWgyc2WzYvgQTQ8XwUg12Xx2za7c8y0YvEbVfb0bPVDXRvWY
+r8YaKgJJuAJO1SqR9lB8iDEz/6BahLGfM9C8ypXoCTtpQ14oV/qSsFzJhys9jlLI
+p6AjXgNSqv/NVVMnvTWJ5AOzhIdJJQmVNZM0NXdDZmqlC4Wk8r8rJKYzGswm6CkC
+JJ7+WCzuM0ufP5JyLGOp8AsEJvURajm19v09uifDieYysAlBAukPCur3ni8SIxS6
+12iFjawXIeQMkobGanZyKMFYsfeFnQCUBi6Kr1a4AHYAKrgwRDO5FN7S8x5CB/JR
+wXo3oJJoUtkIAgb4Xlc5FioAAAFR+nvcAAAABAMARzBFAiBcdVGfExFQzV2K3iCj
+vAYwkf+yc3VfMWTs/ctCgApw5gIhAJGsOl/pvErK6FvgTc4TNRBDdX2x37AhywuA
+NtqY3PZhAS8AMQj2tt1yGAfwFpWETYUCVrZxk2CD2705NKBQUlAaKJIAAAFR+nvc
+AAAABAEBAIAsvMMHiK9UjMgfOjdtLP2bJwLxQ6qHHgJ6IooQgq95gvXpZmhDhSrB
+WzHtjSf0G8NrIYQLfGNqeUFjVq7Yby8FkOMrE/VbQrvSHOADJ65hqPesNfRLjWuD
+1u9IjlTZFyIxZcrN2OqjWnBfsAylivHAHGj/1vbZqvOKWmQbBpuNW2P5p35uArEX
+r5jhBxfM0HO07UgDJzt8oG3fK+iDV/wv3R6Y4LvO+SebnHiXg9HygwG0wi8bGMYK
+2wXNUsQ3tdBq4WeJr9cxoH8Ke9l+sLUc9wZ1N7lV7p7hmZeN+nSt6aJny/DfCLoo
+rG62y/At1y4l0FmXXvPftkv1QunvWj0wDQYJKoZIhvcNAQELBQADggEBAEFe0sch
+6JG7g3uiNpomqOqNaBHnoe5qsYONRTRajDRl8/qyn9NwkMEks0bR6xwBQmBOpN5X
++0TLa43nv28V7B66Mfnpv9ISKdhOytQYN39us0LMBEP8dR/YK5Ux2JH/+iI6IHl0
+syErYIki6Wuz6NxVKAaQN7iB+Qw+pCSJLkbRojXCqSKUwP1uBrhMW1Oe3N2o/eZr
+ZpS9IWYtBeb3zPKlMIQHLEUxOBq6SvrNrxcylNKPBXHWTfvFvZYVgLmqzIyti1mw
+yC1fr2sMriB6cFd/7i+Mnh4vK31yH/c1KwxDnpOUCEToryH6z+1ydWxyoLgnO6Za
+Vx9PmW79Rj2mSFM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/default-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/default-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDiTCCAnGgAwIBAgIUP+17Q0eKU0JbDVDhN4gqID8xFyAwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
+MIIDiTCCAnGgAwIBAgIUUwG2e1zCLPYPQc2aSZ4UsI/GiK0wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9UZXN0IEVuZC1lbnRpdHkwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
 /B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuw
@@ -12,10 +12,10 @@
 bm5pbmcuZXhhbXBsZS5jb22CKCouaW5jbHVkZS1zdWJkb21haW5zLnBpbm5pbmcu
 ZXhhbXBsZS5jb22CKCouZXhjbHVkZS1zdWJkb21haW5zLnBpbm5pbmcuZXhhbXBs
 ZS5jb20wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxo
-b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCkRiVfojVMvYWh80CcxVhS9RyR
-qWvFv4LyFxuM/izVf+c5aUHxr5JHkT8cw4kYPPnZh4M7V1ZNNI1fNOljMIByflU/
-uCHKfXQfcZiR89wjbiiLgcbhMX8MrlDVmih0Xo3eEEKklgS+WzvRgArFrDm60HFG
-fKWJpQi2Z73v5suSHG6IlJ+pIrxL29ZHcre9j+uj+m2id5UA8/WIod+D3c76civc
-xaSyVDGpkrPqwcCp/Q7GFqPpX5FYBOcYxOScfHyP+tz61zYkEEmaBuUdr+128U3V
-UXZQjYokTZndzFnWqk0pvDHXDs0VhFYRrrJwCsIBa+Ywb1vVseJh0glpNGPI
+b3N0Ojg4ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCbcbjTQmzRu++LJ/R1KjA99THZ
+aRGG7u0knPs40bz+rIOAR7SllYTvZ1g5HanNG3GZ5+DExVmVtixcrqJFTV0BJsi0
+rv8XR4F3Cdict+rJ+hCSBqu6BGNWdptsaSPiSm+eL//tgjGY1zm9ln1B/OvTYA/n
+f+OV07v44pwRBUe8C9Awb2J3KMHATPciKTk0Pwmh0jXi4FN9ehG1rXZMY2daHoKq
+hzbBc8EaGzPPAyFumHd6wNqWX+/chEtT00SlcJw/lbQZnK8XvUSOhRuUeRdCM5wX
+3w+Gy4P/FrI5tePoR9606GR6plC8QZxT3+Z6lTyCHz3I05+PNXwfmZH3ABSg
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/test-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/test-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ct/test-ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ct/test-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC0zCCAbugAwIBAgIUHTx9c2saZsiwlWK1j3QKwpK0qtgwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
+MIIC0zCCAbugAwIBAgIUZekW+kmMLmUyacMUQAExM6vEFpswDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjASMRAwDgYDVQQDDAdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
 qyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAh14uCtSQeGoT
-K6KlavS8/SRGpY6kcjNjNCUxeeDgMhnpCTohl5uYb9+jbE9j/hyihukC0h6cBJG3
-APzQdUk4ToXNySeX0sQ/KREsGq5qVwiTNcN4KXGdg9CGvm9tNygU/mg5/eQ/TXL9
-NA/O/UsbJNJ6AlEptEARt0wo4N/8Idt/k+7KE/NwJcoekI/TXAwLXRfG4wYBS6gT
-r08t8vllasBCx51rUlVutKdSu20tA3sL1oRqsLdykJQnZscJhRLIaF7/5y67idhR
-FaVI0f+tisDnBcP2gWWoV5stfuWrwrD5vXw26CU6RioUCBxaiQGP+R+gma3uZ2kP
-jEsvAfNHhQ==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAoabyPFisrr0c
+kmPrDCY8pyDZ6ScxE/ziG+5RG4yJzW0QLrnt6rusMdKuxwaLiTISsNI14vh9QQyG
+XQsVeiGNGIwyJ9k2ZbLvw6pjdUeaswkthSqUDYwYgCljBwViuFkK4SAwya0Vb0p8
+pErDX8pzSF78inMB/7f0+DPdEQgtAGPYfB0gMRWOliyJSVoJXTgJ2B6PTMMvIcIO
+OXcqjDvVYY4o9+YtsDfmzGOSa/YmbM4hO6lv/cO3zv3aT+szyQK8X44koSkvct2P
+QL4cY3/incY0l0I12PaScOJDuvITiRNca7gxbUiT2jz1eqzGPIyVS6ku2cO0v9tP
+TIiD5XDdFg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/default-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/default-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICSDCCATCgAwIBAgIUA6uFikkOdOiqG+440ZTfq59xpYowDQYJKoZIhvcNAQEL
+MIICSDCCATCgAwIBAgIUNeh3F5ZVYezEJKXRBQTRiDY/isMwDQYJKoZIhvcNAQEL
 BQAwLDEqMCgGA1UEAwwhZGVsZWdhdGVkLWNyZWRlbnRpYWwtaW50ZXJtZWRpYXRl
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMBUxEzARBgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMBUxEzARBgNVBAMM
 CmRlZmF1bHQtZWUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPv7u7YeD4+bGm
 ClmshwTi7AULQj489y6SPyxPeUtFXCpp0jNFbDbEEZ0HBuAO7cjRk5DXmRt7LQej
 BOqgSqbAo0AwPjATBgNVHSUEDDAKBggrBgEFBQcDATAnBgNVHREEIDAeghxzdGFu
-ZGFyZC1lbmFibGVkLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBBoRNe
-5wgsurRiD+UrwbYdd2fMRy4ZvlO6OaMGo6dX/TGkG3BaDZeuuvVpvECHfGHYcxhJ
-6eh7/gZfgb9Rko7V0krHA7z/zmFG280ekRq5w4DrN0+Qy++dEHE4eAz8ctbD6pZa
-S/Cm+fyAIpmyVF+mRYs/IgjkStE+AO0WgUzoqcma/UoNIkOIYI/EINOxe1GhY3Kq
-EnvwP2L6bhkfAQlkNjEfIJN00WxLaQexTme9MrDPSXdklVQPIuu9TQl6j/J1JYqc
-wQrzL43Lv6CbbVBzmTPHe6HCegK+K7fzm3Iw+H+kYMO0hbZIz5tXCMjDitidomWq
-zRL9VsosUFPnyGO8
+ZGFyZC1lbmFibGVkLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBqh2DB
+lbCuX6H9CPsdgDLX3z4gS5ab/1g7J4az29EQuFgb2z6gHOOuMDkLgDPpq3Vz0mrk
+emsoXToPdHsRZ4S57KeELRLT42bdyYkDR8yWTm588UhDNo3n492RD+dYHILmJdj0
+d9MWlMnl/jpXo8/a36ZJ2QgjSUyzwE/Nyxd8864Pk5ipUwyabSFjiEGcHsrfsSIQ
+fqkBXG0UudjjWEPInSQIBNIwCZL3HDwoeV2SO3gjxDwyume2S0K6GGXWs8a+mLBn
+Kks7nmQ8pEipNyHDt9TUS+Ywj6txK4cOp4WTh86q0h9mLWqqvg/DdTHLyFyzPWPa
+LZl7VR1aKXr9IzE0
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/delegated-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/delegated-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/delegated-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/delegated-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICiTCCAXGgAwIBAgIUBWQ6XptfTSKqmonvi8t9ObztklcwDQYJKoZIhvcNAQEL
+MIICiTCCAXGgAwIBAgIUV0N3VFQpvGVw2qP62b/L1yTchOIwDQYJKoZIhvcNAQEL
 BQAwLDEqMCgGA1UEAwwhZGVsZWdhdGVkLWNyZWRlbnRpYWwtaW50ZXJtZWRpYXRl
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMBcxFTATBgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMBcxFTATBgNVBAMM
 DGRlbGVnYXRlZC1lZTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE+/u7th4Pj5
 saYKWayHBOLsBQtCPjz3LpI/LE95S0VcKmnSM0VsNsQRnQcG4A7tyNGTkNeZG3st
 B6ME6qBKpsCjfzB9MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAsGA1UdDwQEAwIFoDBI
 BgNVHREEQTA/gh1kZWxlZ2F0ZWQtZW5hYmxlZC5leGFtcGxlLmNvbYIeZGVsZWdh
 dGVkLWRpc2FibGVkLmV4YW1wbGUuY29tMA8GCSsGAQQBgtpLLAQCBQAwDQYJKoZI
-hvcNAQELBQADggEBALgpEuDcHwEdjDgMTafglGg5aUEIVj018acthgf86lEbROje
-EPtczIFQV757T5QFqQK4IJiDTeHjK3bS7kdnYSwQSLL+Gj+cuhxtpl60BVkuckhT
-MiQyU26ChOTj5cFly0zQsXmAN+wlv/wEXwyLPAQLQX8J1QW4/ORWwj0dYkG1sm1Z
-hUBXJhv2UUqApTNJJv3vUuHdxUmso5lUJ54iFUncwUS75U4bkp5tYdkcbr7Y2Duw
-7B2kW4OKdjflZNB9DiWwqCgZiApbtTckZodOQPBRPKSDDw8oE5FoVXznh1GrLXYI
-pUXRnIPpoHGWmuYQXm/LulcHSRR1VGBfjRCOwyk=
+hvcNAQELBQADggEBAIxXv51QQR9JwM+Q7kQnRpK41Xe4WCDSwoyD+eOgbKznTJvz
+v3YDZKkO9cdQDGdd2GgMA/6/a0vc1wK1IO5eI2bAisIbublJ8xkuTeLyhdisGxMb
+k0XLlcQ/KnXid3R6dccHguQPpdtDrf2kgKE8Wy9Gvg9LF3A6hIx5BtruInflvgp6
+jtUGlKrftPMhRIEP5FWy5KOJE8VW+ja4zBH6P36kDaNeWK3SrssyNAZmoDrxslJa
+LDls1xZ4+ElGUjoywmEG0Fbbrv4mUiwCQ+4flHoopBGqs+3J0gY8SJndTZniSjSh
+i7ivXTPlrU0Sm8jt1e/RYlnA6IyvQp8YbR+zX34=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIUA/ELSg7GyfBk8EUR9OYthNVQfI0wDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXZGVsZWdhdGVkLWNyZWRlbnRpYWwtY2EwIhgPMjAxODEx
-MjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowIjEgMB4GA1UEAwwXZGVsZWdhdGVk
+MIIC8zCCAdugAwIBAgIUXeumyyPJUORUNVVSf/2pTjEDxS4wDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAwwXZGVsZWdhdGVkLWNyZWRlbnRpYWwtY2EwIhgPMjAxOTEx
+MjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowIjEgMB4GA1UEAwwXZGVsZWdhdGVk
 LWNyZWRlbnRpYWwtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
 iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr
 4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP
@@ -9,10 +9,10 @@
 Q+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ
 77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5J
 I/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQD
-AgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCfcz47n84Czs0Ib8HyIefo+lb5beYkBHuf
-AfWsc7XtwYS9wPmS7Q+zogHXL+y3VvrUczDgMNCgt2radmRCPZd299fUfKyiw6Kf
-DNkluTw2tPDvNTUyThixhVBUiuaTWra3Tl1q/it1Iruqbfv37LnXv28IIXjdqREH
-G5harhvR/59K2HisjhUS3rrC3TGBbbdBtiTpxk04cZHyPK722J96pjG8PBIYFeqL
-UI8fe62Ldbs/hK97ZD1ITXchxvHqP8W88PZkfIJEex0x1sZRcqZhP1sNQOYN9a+E
-NpqKDn+VEjiEY7tG3XY7Blr99SQtA1s4ZX0x11akKP26S310i21u
+AgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCvQNfsGAcHMiKfrbxHpJVnmxTAzWBSqJnp
+V924Ofy80m03jI+99SEi9blzfHhJxRFe3cZYK3Dh4lhR3/RMHfZsepsAMzplS+to
+m1T7D9zwFpVuqfAOnlkPPneVf3hTvgmkQqiLWZUb/pWZ2fGWAKtDXPM5HHf6gBKY
++8VbTUpPHhwDH1MRauoK18QysMlBm90OwM6mnzCsJ6xwTDQkFAt4vQ+jS3AglhPd
+D5xqKbHwHi//h1EeV6u9mIJuX8HIZl5AM0Be4XaYb9gZFriflIjWxqmgh1alhKUM
+H2gTyrzG8NmD+J4CCLEygYdaFlj3QfBypdW/QpdOaV77u7dhmxzg
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_delegated_credentials/test-int.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC/TCCAeWgAwIBAgIURXsQA0meaFMUhMqZEw7Tn65gYwkwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXZGVsZWdhdGVkLWNyZWRlbnRpYWwtY2EwIhgPMjAxODEx
-MjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowLDEqMCgGA1UEAwwhZGVsZWdhdGVk
+MIIC/TCCAeWgAwIBAgIUAcAYRaw4AL7AX+7V+/SNR/7bZ0QwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAwwXZGVsZWdhdGVkLWNyZWRlbnRpYWwtY2EwIhgPMjAxOTEx
+MjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowLDEqMCgGA1UEAwwhZGVsZWdhdGVk
 LWNyZWRlbnRpYWwtaW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -9,11 +9,11 @@
 O8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR
 3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv
 5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/
-MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEALMNyUriaBV3FKtJGi7cu
-L3I5ys2N6o8GVwmx01Mk+vKX3jipi7pzMiuCpBlqjdFSjhktTfehf3K0jGwe/ldw
-Brj03fd6DftFWkO/LI8sp5elZfLgbTmoo6QtXwXEx/HDFPqvd+fbhInV2KjZgKG+
-E/G1bESglOYqfSVPKzoD9WnWrRgyT0QQlFFJtJy9IAHZbIF2UcFTnj6ZPqLvc/4d
-RF1wGYwYABOIKMEvmuTjyI89F9dnOMtT9SDmLVxBvUgAnNks5sLUfJret0KH9e3P
-9H3FRVuZUkAz0bZiaahqThMTqS56P+V/n35XKafQBQJErC/T/OgMJ8p3IVCRAFfm
-1Q==
+MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAgnn4xLqeQUJDkL2Vo5Xl
+WYgCcmCa0n01OwenTjTtWyIkbXCLDvyA5F7E79pW+8RevUJkM/JUzo/ZR6qr2cnR
+H7lg4EEjVUC8zI60jvFeFZAelCoz6W4C/A4Y9pqLkDgJMWfdOstAe2cescqQPwsY
+AK0OtxhdB8x371vwL0hBDL1u6CV+s2TGBc5Pj9lTY6UEDSAXIww2DzipVzalctg9
+oiihe6KDJuN0vTTt46ImksVo05EWT+uq2mJvVMgpcOXShJCmjl/zSM0KVT2VFc6v
+xyeWCmmyaem/m9Do7Gnq+DVPII153dWmy1Xr0vX31PhroRETFnY5eyyc8umDD4Qu
+uA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6iFGoRI4W1kH9
+braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
+eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
+iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
+qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
+LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
+2hgKNe2NAgMBAAECggEBAJ7LzjhhpFTsseD+j4XdQ8kvWCXOLpl4hNDhqUnaosWs
+VZskBFDlrJ/gw+McDu+mUlpl8MIhlABO4atGPd6e6CKHzJPnRqkZKcXmrD2IdT9s
+JbpZeec+XY+yOREaPNq4pLDN9fnKsF8SM6ODNcZLVWBSXn47kq18dQTPHcfLAFeI
+r8vh6Pld90AqFRUw1YCDRoZOs3CqeZVqWHhiy1M3kTB/cNkcltItABppAJuSPGgz
+iMnzbLm16+ZDAgQceNkIIGuHAJy4yrrK09vbJ5L7kRss9NtmA1hb6a4Mo7jmQXqg
+SwbkcOoaO1gcoDpngckxW2KzDmAR8iRyWUbuxXxtlEECgYEA3W4dT//r9o2InE0R
+TNqqnKpjpZN0KGyKXCmnF7umA3VkTVyqZ0xLi8cyY1hkYiDkVQ12CKwn1Vttt0+N
+gSfvj6CQmLaRR94GVXNEfhg9Iv59iFrOtRPZWB3V4HwakPXOCHneExNx7O/JznLp
+xD3BJ9I4GQ3oEXc8pdGTAfSMdCsCgYEA16dz2evDgKdn0v7Ak0rU6LVmckB3Gs3r
+ta15b0eP7E1FmF77yVMpaCicjYkQL63yHzTi3UlA66jAnW0fFtzClyl3TEMnXpJR
+3b5JCeH9O/Hkvt9Go5uLODMo70rjuVuS8gcK8myefFybWH/t3gXo59hspXiG+xZY
+EKd7mEW8MScCgYEAlkcrQaYQwK3hryJmwWAONnE1W6QtS1oOtOnX6zWBQAul3RMs
+2xpekyjHu8C7sBVeoZKXLt+X0SdR2Pz2rlcqMLHqMJqHEt1OMyQdse5FX8CT9byb
+WS11bmYhR08ywHryL7J100B5KzK6JZC7smGu+5WiWO6lN2VTFb6cJNGRmS0CgYAo
+tFCnp1qFZBOyvab3pj49lk+57PUOOCPvbMjo+ibuQT+LnRIFVA8Su+egx2got7pl
+rYPMpND+KiIBFOGzXQPVqFv+Jwa9UPzmz83VcbRspiG47UfWBbvnZbCqSgZlrCU2
+TaIBVAMuEgS4VZ0+NPtbF3yaVv+TUQpaSmKHwVHeLQKBgCgGe5NVgB0u9S36ltit
+tYlnPPjuipxv9yruq+nva+WKT0q/BfeIlH3IUf2qNFQhR6caJGv7BU7naqNGq80m
+ks/J5ExR5vBpxzXgc7oBn2pyFJYckbJoccrqv48GRBigJpDjmo1f8wZ7fNt/ULH1
+NBinA5ZsT8d0v3QCr2xDJH9D
+-----END PRIVATE KEY-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key.keyspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key.keyspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key.keyspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.key.keyspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+default
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC4DCCAcigAwIBAgIUP5hH78XA0upQ7cmqNASOW6WqkoUwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZWNoLWNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBgxFjAUBgNVBAMMDWVjaC1wdWJsaWMtZWUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
+V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
+0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKk
+fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
+W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
+TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjJTAjMCEG
+A1UdEQQaMBiCFmVjaC1wdWJsaWMuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAIgqt32ojY+McIFUq57FIpI0FsDnY/L+GsmtUziUjM0rfNTuDP0r+CF/1emA
+sTukf+YIiohoGjfRMebYdeWtpUjdG9O/Z1ygmGQNms6LP+xy6dPUM4G0sBpkfNdb
+u74ymuru0kMopYpVXuDsaYOPTNj2W6a7gLpn3llk8K4SVFEogUTlzzOBtYobf8L5
+9tSDpsMrTPINVbyi8SQHONMrsuqMfMDSTCkQnZJDcbRW56T2+PgrWJnQ78NDM0GB
+/KLRW6tIyyTco1IBrFC9+0j5jyHh4+3em0bT7sdcwidjZKipWsvcKK9DuycSSM6O
+nL8vxqnekennEVLV7zm6rjB/wns=
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/default-ee.pem.certspec	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+issuer:ech-ca
+subject:ech-public-ee
+extension:subjectAlternativeName:ech-public.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/moz.build firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/moz.build
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,24 @@
+# -*- 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/.
+
+# Temporarily disabled. See bug 1256495.
+# test_certificates = (
+#    'default-ee.pem',
+#    'private-ee.pem',
+#    'selfsigned.pem',
+#    'test-ca.pem',
+# )
+#
+# for test_certificate in test_certificates:
+#    GeneratedTestCertificate(test_certificate)
+#
+# test_keys = (
+#    'public-ee.key',
+#    'private-ee.key',
+# )
+#
+# for test_key in test_keys:
+#    GeneratedTestKey(test_key)
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6iFGoRI4W1kH9
+braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
+eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
+iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Za
+qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
+LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
+2hgKNe2NAgMBAAECggEBAJ7LzjhhpFTsseD+j4XdQ8kvWCXOLpl4hNDhqUnaosWs
+VZskBFDlrJ/gw+McDu+mUlpl8MIhlABO4atGPd6e6CKHzJPnRqkZKcXmrD2IdT9s
+JbpZeec+XY+yOREaPNq4pLDN9fnKsF8SM6ODNcZLVWBSXn47kq18dQTPHcfLAFeI
+r8vh6Pld90AqFRUw1YCDRoZOs3CqeZVqWHhiy1M3kTB/cNkcltItABppAJuSPGgz
+iMnzbLm16+ZDAgQceNkIIGuHAJy4yrrK09vbJ5L7kRss9NtmA1hb6a4Mo7jmQXqg
+SwbkcOoaO1gcoDpngckxW2KzDmAR8iRyWUbuxXxtlEECgYEA3W4dT//r9o2InE0R
+TNqqnKpjpZN0KGyKXCmnF7umA3VkTVyqZ0xLi8cyY1hkYiDkVQ12CKwn1Vttt0+N
+gSfvj6CQmLaRR94GVXNEfhg9Iv59iFrOtRPZWB3V4HwakPXOCHneExNx7O/JznLp
+xD3BJ9I4GQ3oEXc8pdGTAfSMdCsCgYEA16dz2evDgKdn0v7Ak0rU6LVmckB3Gs3r
+ta15b0eP7E1FmF77yVMpaCicjYkQL63yHzTi3UlA66jAnW0fFtzClyl3TEMnXpJR
+3b5JCeH9O/Hkvt9Go5uLODMo70rjuVuS8gcK8myefFybWH/t3gXo59hspXiG+xZY
+EKd7mEW8MScCgYEAlkcrQaYQwK3hryJmwWAONnE1W6QtS1oOtOnX6zWBQAul3RMs
+2xpekyjHu8C7sBVeoZKXLt+X0SdR2Pz2rlcqMLHqMJqHEt1OMyQdse5FX8CT9byb
+WS11bmYhR08ywHryL7J100B5KzK6JZC7smGu+5WiWO6lN2VTFb6cJNGRmS0CgYAo
+tFCnp1qFZBOyvab3pj49lk+57PUOOCPvbMjo+ibuQT+LnRIFVA8Su+egx2got7pl
+rYPMpND+KiIBFOGzXQPVqFv+Jwa9UPzmz83VcbRspiG47UfWBbvnZbCqSgZlrCU2
+TaIBVAMuEgS4VZ0+NPtbF3yaVv+TUQpaSmKHwVHeLQKBgCgGe5NVgB0u9S36ltit
+tYlnPPjuipxv9yruq+nva+WKT0q/BfeIlH3IUf2qNFQhR6caJGv7BU7naqNGq80m
+ks/J5ExR5vBpxzXgc7oBn2pyFJYckbJoccrqv48GRBigJpDjmo1f8wZ7fNt/ULH1
+NBinA5ZsT8d0v3QCr2xDJH9D
+-----END PRIVATE KEY-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key.keyspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key.keyspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key.keyspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.key.keyspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1 @@
+default
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC4jCCAcqgAwIBAgIUSXmHaEjlH8Iry6lZ5kbx/TBwgI8wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZWNoLWNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBkxFzAVBgNVBAMMDmVjaC1wcml2YXRlLWVlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1
+aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/we
+adA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSS
+pH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62W
+YVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauR
+CE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoyYwJDAi
+BgNVHREEGzAZghdlY2gtcHJpdmF0ZS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsF
+AAOCAQEAI63cvfxAvxMKJBDTIle1hHjW9wf1FgRyus37hqdLatN3fa4o2vNRLfX7
+MITXlLcmqehrBj/Wi7thMOC77HGE3wGvUNog2Avk4exps/bR1ksTraY5cxM386he
+FG2QJ8im2VavNyqwmu2IcbPpZk5MKYolptmRFvz/6XGtLQsRjdtABKoUBB1tXlT2
+go6VULbEQn62fAdBvb/1CO6+jDWIpPzbpFSdWTBSpY1IfhAjsEP6W5kkDaKYwf8G
+IJslTTh+4v8Fq06ySdV1T8IYu29YuCye+sbWyWfcfPQqssaQzWpqAyBOO2kV3r3B
+XsaWXLsuXMnzBDJ5PM6Wsp8dLFXFzg==
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/private-ee.pem.certspec	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+issuer:ech-ca
+subject:ech-private-ee
+extension:subjectAlternativeName:ech-private.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIUKyuH4MWSNUsG95g0ExZZWo1i0tkwDQYJKoZIhvcNAQEL
+BQAwJjEkMCIGA1UEAwwbU2VsZi1zaWduZWQgVGVzdCBFbmQtZW50aXR5MCIYDzIw
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCYxJDAiBgNVBAMMG1NlbGYt
+c2lnbmVkIFRlc3QgRW5kLWVudGl0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72x
+nAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lM
+wmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF
+4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20
+yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
+j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMlMCMwIQYDVR0RBBowGIIWc2Vs
+ZnNpZ25lZC5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAqCxzMj+ECM64
+aG9XqCBHkrR45i6UO0jZkGGBRhUJunfSpK8g5jCuRH0wv4SPZG3tl7VgOtFHFhm5
+1SkEOstkShslHCWwEXoMuO9uvRGzjXl3bxES70ERHmcncp0yWXDT+QDyXM489X1M
+UtEFzWLMv22BX6J6xrvyhJK3zodHXtBSphG2NUEARPsgxb3sMiQA9jTacsQHC9yZ
+dmknp5zhYgCHntO8jFVc04O21wwMlzMB7IR/WFHs67opimHlQlBIWvRDOSsVvxdY
+y8ybGmymQ8g3hxHlQ5fc+oX64SDuHQa6kw2ZWQEz3e4It+VU5Y93QhCLgKqijfBr
+HRt0AadMpg==
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/selfsigned.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,3 @@
+issuer:Self-signed Test End-entity
+subject:Self-signed Test End-entity
+extension:subjectAlternativeName:selfsigned.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC0TCCAbmgAwIBAgIUYc9/sZ6jdK4/ErAKn9/aEFPSgxowDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZWNoLWNhMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBExDzANBgNVBAMMBmVjaC1jYTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
+qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
+w0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCx
+V5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1
+MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
+vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswDAYDVR0TBAUw
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAFHcA3r+hl4tWZnO
+tG1AsddSxeqxhFsZTNTwzLfnYRlFgxytmgE+r3pp5Aost6ZLhcagQT2uIklEBOnw
+se2evClYtC4yVd/FOLaGdd9YCGCggYpoNgNhNMHXI5qS28kslZLnbcD4HScYan66
+KcxGDSBRPggdOkOjhBHax3nni1+kWbzNIFQ2SWR0V/C2pxZJXDGlkE/sggD0nqG+
+iQWJytyJQJsKskNdUOh4R0sANDMTYEQfMrDVuNS6poqRj1C98JyP8qP+jsZZ33WQ
+brR7zbYDhBHdIi4MLZMgGCN+0VZ5PD26nT+9XekV8A/7+U29PxdviW6oZqpMT+sD
+ne3P1JM=
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello/test-ca.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4 @@
+issuer:ech-ca
+subject:ech-ca
+extension:basicConstraints:cA,
+extension:keyUsage:cRLSign,keyCertSign
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello_client_only.js firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello_client_only.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello_client_only.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello_client_only.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,33 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+// Public Name = delegated-enabled.example.com
+const ECH_CONFIG_FIXED =
+  "AFH+CABNAB1kZWxlZ2F0ZWQtZW5hYmxlZC5leGFtcGxlLmNvbQAgigdWOUn6xiMpNu1vNsT6c1kw7N6u9nNOMUrqw1pW/QoAIAAEAAEAAwAyAAA=";
+
+do_get_profile();
+
+// An arbitrary, non-ECH server.
+add_tls_server_setup(
+  "DelegatedCredentialsServer",
+  "test_delegated_credentials"
+);
+
+add_test(function() {
+  clearSessionCache();
+  run_next_test();
+});
+
+// Connect, sending ECH. The server is not configured for it,
+// but *is* authoritative for the public name.
+add_connection_test(
+  "delegated-disabled.example.com",
+  SSL_ERROR_ECH_RETRY_WITHOUT_ECH,
+  null,
+  null,
+  null,
+  null,
+  ECH_CONFIG_FIXED
+);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello.js firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_encrypted_client_hello.js	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,93 @@
+/* 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";
+
+// Tests handling of Encrypted Client Hello. These ECHConfigs
+// can be regenerated by running EncryptedClientHelloServer
+// and dumping the output of SSL_EncodeEchConfig. They do not
+// expire. An update here is only needed if the host or ECH
+// ciphersuite configuration changes, or if the keypair in
+// EncryptedClientHelloServer.cpp is modified.
+
+// Public name: ech-public.example.com
+const ECH_CONFIG_FIXED =
+  "AEr+CABGABZlY2gtcHVibGljLmV4YW1wbGUuY29tACCKB1Y5SfrGIyk27W82xPpzWTDs3q72c04xSurDWlb9CgAgAAQAAQADADIAAA==";
+
+// Public name: ech-public.example.com, Unsupported AEAD to prompt retry_configs from a trusted host.
+const ECH_CONFIG_TRUSTED_RETRY =
+  "AEr+CABGABZlY2gtcHVibGljLmV4YW1wbGUuY29tACCKB1Y5SfrGIyk27W82xPpzWTDs3q72c04xSurDWlb9CgAgAAQAAQABADIAAA==";
+
+// Public name: selfsigned.example.com. Unsupported AEAD to prompt retry_configs from an untrusted host.
+const ECH_CONFIG_UNTRUSTED_RETRY =
+  "AEr+CABGABZzZWxmc2lnbmVkLmV4YW1wbGUuY29tACCKB1Y5SfrGIyk27W82xPpzWTDs3q72c04xSurDWlb9CgAgAAQAAQABADIAAA==";
+
+function shouldBeAcceptedEch(aTransportSecurityInfo) {
+  Assert.ok(
+    aTransportSecurityInfo.isAcceptedEch,
+    "This host should have accepted ECH"
+  );
+}
+
+function shouldBeRejectedEch(aTransportSecurityInfo) {
+  Assert.ok(
+    !aTransportSecurityInfo.isAcceptedEch,
+    "This host should have rejected ECH"
+  );
+}
+
+do_get_profile();
+
+add_tls_server_setup(
+  "EncryptedClientHelloServer",
+  "test_encrypted_client_hello"
+);
+
+// Connect directly without ECH first
+add_connection_test(
+  "ech-public.example.com",
+  PRErrorCodeSuccess,
+  null,
+  shouldBeRejectedEch
+);
+
+// Connect with ECH
+add_connection_test(
+  "ech-private.example.com",
+  PRErrorCodeSuccess,
+  null,
+  shouldBeAcceptedEch,
+  null,
+  null,
+  ECH_CONFIG_FIXED
+);
+
+// Trigger retry_configs by setting an ECHConfig with a different.
+// AEAD than the server supports.
+add_connection_test(
+  "ech-private.example.com",
+  SSL_ERROR_ECH_RETRY_WITH_ECH,
+  null,
+  null,
+  null,
+  null,
+  ECH_CONFIG_TRUSTED_RETRY
+);
+
+// Trigger retry_configs, but from a host that is untrusted
+// (due to a self-signed certificate for the public name).
+// Retry_configs must not be used or reported as available.
+add_connection_test(
+  "ech-private.example.com",
+  MOZILLA_PKIX_ERROR_SELF_SIGNED_CERT,
+  null,
+  null,
+  null,
+  null,
+  ECH_CONFIG_UNTRUSTED_RETRY
+);
+
+// A client-only (retry_without_ech) test is located in
+// test_encrypted_client_hello_client_only.js We can't easily restart
+// a different server (one without ECHConfigs) here, so put that
+// test in a different file that launches a non-ECH server.
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDVzCCAj+gAwIBAgIUBQhdmnCRfXFOBzyogGW+RG28AIwwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVYW55UG9saWN5LWVlLXBhdGgtaW50MCIYDzIwMTgxMTI3
-MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMB8xHTAbBgNVBAMMFGFueVBvbGljeS1l
+MIIDVzCCAj+gAwIBAgIUQx+5x/tjsPB8QKeRGMqa5Xa/prYwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAwwVYW55UG9saWN5LWVlLXBhdGgtaW50MCIYDzIwMTkxMTI4
+MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMB8xHTAbBgNVBAMMFGFueVBvbGljeS1l
 ZS1wYXRoLWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -11,10 +11,10 @@
 MdUDrNoYCjXtjQIDAQABo4GFMIGCME0GCCsGAQUFBwEBBEEwPzA9BggrBgEFBQcw
 AYYxaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2FueVBvbGljeS1lZS1wYXRo
 LWVlLzARBgNVHSAECjAIMAYGBFUdIAAwHgYDVR0RBBcwFYITZXYtdGVzdC5leGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAnu2uD7LLaCEygi/HW1hG+JpwZpVU
-ttDHrZtVb8H7ue5FzT5WqlIDkTfkkEf1auEAhmrL2tNz1MTXTHoFNd9/DpI/355V
-eSOUDmxDrrGQJbfrmJkD2PfSb516zKIiUZJhJPozpmuuFQ9fm6CTlpa/OCCpEQ1Q
-03012FODtVtntq4YWp1/t6M8J2mvcyVZP7ZJUmRQTPqxlS7dZcDAjBbOLuUw2Z5M
-as94RsiXf1193lo9Xf5J6BYHYeCh++mrwudxrw4BnATWz0YeEaLn02SSXolYTITf
-t9C2B5S4PzOZNvhQimybro3SF/HEtXaM3GHlh0tzUs3bk2dFi2i4KPH72Q==
+cGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAM5dSETXj42Kai/sDKzZOaltmATbf
+RDm9U8Pa1luk+m1Y2wgPDQfjcklPIkbyxsAwhdy1OCAUSVjWttAKs5w23TroT5Dq
+tJAt823UD2xjwA3x1tTTmielwhc5cRL9uddrKAZ+EnRNLsI4wlTvjX1OBS61BgA6
+V/4//SJgS72Yj1Ebl9D5mA6iVHyUZblAwhsrogTwzWKMPzcAVgGp7YQK4b1yV4vc
+zmcx9HrlsJuwpNwPQvysOhtOcbX1CbCdq9qzj6cCdIOZ3H5qzrr9swoZreVUsbic
+xeHxhXGcp4+Bk+djBqlKvSGuw9FSlOSgpaB/K3ceDRjewje2rzTgAzSg7Q==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-ee-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDRDCCAiygAwIBAgIUH27ZH/v1S6bKIBkmQpkjtPWd4WkwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCAxHjAcBgNVBAMMFWFueVBvbGljeS1lZS1wYXRoLWludDCCASIw
+MIIDRDCCAiygAwIBAgIUR7Qq6/A9VAD2EfTAFB5di93IJx8wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCAxHjAcBgNVBAMMFWFueVBvbGljeS1lZS1wYXRoLWludDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -11,10 +11,10 @@
 AaOBgDB+MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGME4GCCsGAQUFBwEBBEIw
 QDA+BggrBgEFBQcwAYYyaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2FueVBv
 bGljeS1lZS1wYXRoLWludC8wEQYDVR0gBAowCDAGBgRVHSAAMA0GCSqGSIb3DQEB
-CwUAA4IBAQACdGUrVXH6hF//xMcaJx0PzMub/qDwsZkqbtI0vD444SV+xwGDp916
-bGH8F36n8TMVstUWdb2vNTn3eg7Y9WTfjZyF9oR1LZHDvbCsYL8VxuD+FuOztVyI
-rcpyxNEqTjlQofQ/6Vq2z97IpxbOv9wKGjxotNQJdNYKnU3p0EPEtq/YMeSRnfGp
-jxBofpBLhCzmuLFfD85uc+0ly6dRkqs+gXMh9rK+FmeGC3W2YVogApGILCjBgSpR
-OTUQZKdiqjhHTbjVXS6NaE3LOtIgidvg0NNRtuKCKb3UuNWPS4dTQcXbDdkr2gRr
-Iw0T1CSyaFbZ4sMKVcwdqgJUISKBs2/f
+CwUAA4IBAQCCOVv8KxGwhAsLedhqkwyLkg7MnmFKYdGJo5LHXU5eszyRTHNy5L5/
+nvy6uCwA4h/FBL/XZb+VYIvbMpL8i7Oduf8kvWGWkfNPfUNgXK2ZdX3y1uBQda89
+kX2FTuP2ajdjZHkHPuA2wzpce8pDzlv0ULvIV4anOGgxuYqxKM1ihddYs/6LT/vs
+cFjLJDLIvqv7heucPJ3ungJY4IEaYRv3zEXwrS3FY/zakfpEGLqTNlLOppp82LPB
+7McNBxcxXrFdSfWqbLTl8U93Xe48utWl/qmUA/0+QBB7MvnaABss8pmzPGnC/FSV
+AhS442Jz7DkpyTFzKuWarWdQN4ggoTIg
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUfUfAN6IdASiPoMFgBPkVxNqSj1kwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWYW55UG9saWN5LWludC1wYXRoLWludDAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAgMR4wHAYDVQQDDBVhbnlQb2xpY3kt
+MIIDaDCCAlCgAwIBAgIUCeueEj6OFftd56Jw0VZ9VzHQVcowDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWYW55UG9saWN5LWludC1wYXRoLWludDAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAgMR4wHAYDVQQDDBVhbnlQb2xpY3kt
 aW50LXBhdGgtZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -11,11 +11,11 @@
 UcQx1QOs2hgKNe2NAgMBAAGjgZQwgZEwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUF
 BzABhjJodHRwOi8vd3d3LmV4YW1wbGUuY29tOjg4ODgvYW55UG9saWN5LWludC1w
 YXRoLWVlLzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREE
-FzAVghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBux6iM
-gUIFST2gfIBgeAstoSAIMC/KHy1IJewvduwinIrEcJUqflrGU93fEMvg2XJb3j2W
-BDXuh8u9xEAagDDFoj2vnu/k2aWhsSeezl7xFB/wNLTgHLrCtofCpWpHcwVpHRuQ
-1mhE0aATfGQ6+6AXIdDEVUp9A7tvmrc9Z8raEsbEgp+b01VSYToFXJ4ngpaCwHfT
-5VvRd9wWNO9GZAxDzaP05MkS22Q7ikTkQr7peGoGKJEWG2HE1s5y9cHtx3LnVhvr
-vIicyulbS3JE/piMkB1aOsevjaLBpuO4rEBJv/o6CMrmmiIh+FyECy7rlpWLSjsE
-YtYMSs3nWZOzGgTi
+FzAVghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAROBgq
+JsnJtkdWyOTrG4jVhQ6WU6tmiUXEHGqDr8ARrRImX9+oekgKcGN7gyiDkvGq74rm
+uqaeD4AlLkx9kXMKAd9Imr+efoOhzBbmZapCzeyrDFu343RIis2yjCSsjyLrNASZ
+JWmuwsL44WOY/vSem7NIkbVEw6po0nxYpsNA94fgfPJA8Ut82vixr7+dnrCWlWM1
+7boWU8S56HuDi9TjiE4ADqmbJ+j+UZcEktCIFo9tVMh7tbd9KbO54/nDG+qgAfJU
+yk8VJrYucrJa+Vtsa3CrCG640NcUD17618iwYw1c2Rseo/3yixTIQY8ujjSqC4j/
+oBiqhI8Wl7QOmX4h
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/anyPolicy-int-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi6gAwIBAgIUdyPrrc8P1I3nBxF4km0W+exJ2RQwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCExHzAdBgNVBAMMFmFueVBvbGljeS1pbnQtcGF0aC1pbnQwggEi
+MIIDRjCCAi6gAwIBAgIUMw+R5DkD+4bOA7KD8UDYcG3RD2IwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCExHzAdBgNVBAMMFmFueVBvbGljeS1pbnQtcGF0aC1pbnQwggEi
 MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT
 2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzV
 JJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8N
@@ -11,10 +11,10 @@
 AAGjgYEwfzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBPBggrBgEFBQcBAQRD
 MEEwPwYIKwYBBQUHMAGGM2h0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9hbnlQ
 b2xpY3ktaW50LXBhdGgtaW50LzARBgNVHSAECjAIMAYGBFUdIAAwDQYJKoZIhvcN
-AQELBQADggEBAGzhTiwEvjApDsDVE+IGFqul4OYkg0AcMOpTIqcCTrYuH81peT3k
-fiS+Coof9b6Nw9cowZkOGnvIXkQxxFY2e7s+kYDQwuBg6/LnqZ3e5rCvOdf40UJb
-g8PRXutO5Le2INe9FGkO3BejhpKoZUyOoqjMBIZxnp/eBZWtdFwFH69l1jvLoyN8
-WcReh9XPEDj4+JtqfDvBxVk7wYmne9b1dpnZoDW/c3H7mDVrKErFRAiNCnGi/fSB
-maA3CHgOz59EigOCmTL+3/lr6yTJtkLgRLkJCy5DILeBKSrtcYFLwypLms09+MPm
-HnEr0sC7E4JaPuXNXJisSC6HXEfdqWDiMwg=
+AQELBQADggEBAEHWJ58QNHayFGL5fxbvN66qffLJVpO5L+NM5MIaeEykSj7Weaem
+8Fx6V8b+j6TKs6DD4yy7o/5PODbjc7v62a25XbTE4VrlG9T58hnxRpOXfMeHFu3L
+oJajIIrJI4Am23rvHyQ/achk+cKqGIgBC6eBaEb5bV13OeM4dWM34Qo0VDmOAyo5
+Rgfeh0W5XBPi7fcnDhbIyJ3JQBhlHotR3krBv98nhy5mCi4bxTjERKMAgYaLvxUb
+UOAT87BxNgHAiP4vvXbxl5T/TD1KLOFuypa0Q2LpUONbW6c4fcfKRoWkyA1u3+sE
+RB/0RTleOS8Ekwzex8FgQMp9D5BrIA7JDbg=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUM8t2QZzn2o+MaXFr95yXKa5qHYIwDQYJKoZIhvcNAQEL
+MIIDxTCCAq2gAwIBAgIUAXnU/fLGVanzfXZztetMUPvcgM0wDQYJKoZIhvcNAQEL
 BQAwPTE7MDkGA1UEAwwyY2FiZm9ydW0tYW5kLXRlc3Qtb2lkLWVlLWNhYmZvcnVt
-LW9pZC1pbnQtcGF0aC1pbnQwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+LW9pZC1pbnQtcGF0aC1pbnQwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowPDE6MDgGA1UEAwwxY2FiZm9ydW0tYW5kLXRlc3Qtb2lkLWVlLWNhYmZv
 cnVtLW9pZC1pbnQtcGF0aC1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
@@ -13,11 +13,11 @@
 WgYIKwYBBQUHMAGGTmh0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9jYWJmb3J1
 bS1hbmQtdGVzdC1vaWQtZWUtY2FiZm9ydW0tb2lkLWludC1wYXRoLWVlLzAoBgNV
 HSAEITAfMAcGBWeBDAEBMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAV
-ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCZ2t8+3SGT
-3v8t/GEfswe93RXhErTwB9jcv5NvYzTTeD0Bk3lU7D6z/F6R34+oz69D7V/1l2lq
-Nsu+W0BVuOAPmrVhUY/5lSP1DE6tv7cBeZvwB0yl6cIVYeINN0pM1PKKiQCwRpgo
-wc3EWZ32PjqkesjjIOsnc9xDg03a5iwaT6I9wRUvQ1O9LPpA4/D9zCJLj7LXaPIx
-j/fg0e2nUPzWrpBdQ4cFsv/IeraHGVgqJlo2+yAEwItjPM74kNrJEpDxkOVcdYRl
-BPsUBXKWgXOvZn2Xlya8v03BwQlIzRZlAkX8qkkOJDo5YO6Sa46P2VJ3lDVFEjPe
-bRhdSO/eQY3h
+ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBAyAiPnxab
+CxbHi47hZ8xWcfpmyItTzPCzsKx9VGkbnFM7hA7p0CP116YlFny9wJoOi49+Qm3D
+qyrnKPWme1tyW9DuDe0jz5eiUcBZ72jL5CZbXkQ1LfPKt1sGnwHoAu0NDNPeE/lQ
+0RDSp/XW1kgjBDPDlTJ6k1MMdy9A0fEQosUH4bOpTOEeeTl3ZGVxJZmc2PcZebdV
+Z/fizZ1JiKalKpYcAvgXGLw5HE+/OvGFlPrqxcQRa2f+MZFFDS/X7ZAiIFp7qqZg
+h314bFrrPpB/v2oLMz2tdvTrIxJfj3+VXw19zkxuWavl6a/V5jiEZUQsJLgjLGdS
+zQ9m/Jf6yLjU
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-cabforum-oid-int-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDgDCCAmigAwIBAgIUb0VDebRmQg9eRBdL5KX+wIiDxGEwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMD0xOzA5BgNVBAMMMmNhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1j
+MIIDgDCCAmigAwIBAgIUIejtPWmffl6VTrZjY+grxp67lQAwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMD0xOzA5BgNVBAMMMmNhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1j
 YWJmb3J1bS1vaWQtaW50LXBhdGgtaW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -12,10 +12,10 @@
 Af8wCwYDVR0PBAQDAgEGMGsGCCsGAQUFBwEBBF8wXTBbBggrBgEFBQcwAYZPaHR0
 cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2NhYmZvcnVtLWFuZC10ZXN0LW9pZC1l
 ZS1jYWJmb3J1bS1vaWQtaW50LXBhdGgtaW50LzASBgNVHSAECzAJMAcGBWeBDAEB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAWHl8ibsErIXg3Ct+kkUsTQepXinQCpkCU0KWr
-n7D/ipeUmoeTc5puiOJrcbZeGziJDcnpWqLq9x056VOX5zT2TL/VWpTFssuvZzUI
-+RVA6Ks2juhYxGNI0tSAaKg7FY/T4eyx4bZ7gLAPxkCurNEkq96l0LcZRzL9yyrG
-XDs/ItN/3JX0auSy5Xy2rkO2KU8ahpdIdgyygAFP+vvgwE/I43QZztrmIS4AsuVk
-UgRWHGER8TXyoMSzFLurICDRSVLBOHyGwfOuW+2MBjK/mIZXUEE03+/UbUcD7dmj
-8QWRTSbNBTKJ9bZlz/Xuv7Afv3CHQeBG6J6X2hgrfVhISxwH
+MA0GCSqGSIb3DQEBCwUAA4IBAQB/zhtz6FPxar2eL9imF0/5lchKCYPLoHtMkMPo
+YPmyfsOODBw0MMTKlzvzYdy4hORU8zQ8JiKJa28GlyIf08fdtaIWPjf+PmNGhMex
+pD0KTCfJrmOeDVNwf3lKwM5TrWnH7nNTQ4SfRQCPBR91H6XuwgmuD8vTe1oebuX5
+ziPsjHgKp6qR707qlNQ54JSkTEnY7iLSB8O033Nrzqbz1LtFTX1kGLy0h4F/DKIJ
+q2yzixcU5mHwQHKKIiirjy6ZW25Acl5xsTc0Wj9zppbEItd+Jkma2rn4EvHeYAHa
+YUDwnsCqVp0WIG4QFhjzJsxoHqCnJek83E/5Av9vZX1JTwMs
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIUB6YUfrnoapjrdgZ9uJd0X2K1xmUwDQYJKoZIhvcNAQEL
+MIIDkjCCAnqgAwIBAgIUOXwNT5oauz67TgsKQiAb5GqLxy4wDQYJKoZIhvcNAQEL
 BQAwLDEqMCgGA1UEAwwhY2FiZm9ydW0tYW5kLXRlc3Qtb2lkLWVlLXBhdGgtaW50
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCsxKTAnBgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCsxKTAnBgNVBAMM
 IGNhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1wYXRoLWVlMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -12,11 +12,11 @@
 CCsGAQUFBwEBBE0wSzBJBggrBgEFBQcwAYY9aHR0cDovL3d3dy5leGFtcGxlLmNv
 bTo4ODg4L2NhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1wYXRoLWVlLzAoBgNVHSAE
 ITAfMAcGBWeBDAEBMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAVghNl
-di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCK1qyYqGjdVI/Z
-46RUkDwlagfWuKZ/NLKDt6TmHTI2vnt96QEXMrZCpbpg9s4H+zCemv6hovf+3FZh
-jgu7P6/vpe0JZxxr+n17J7YcAGwM3lWP+b5XFbVkFjlOrzCPqlImrkK/8vQLhJDR
-XQ0F9VwwM3Fq39734W4Pne020v19j94iV1uNv3JiyeMgexJrbQ9RFc33JXrCGwVE
-It90fw84gMCo/Iogz8XgzGFIIMxdyTHki+4Nnu/vGjjx4UFpBIjKZO/wc4iM3SoC
-u9x/ok3rCx2rfUDQnKg21xuOOr6Lh/hiuCNxxXCGjlF6yY1p2rSYGwVc2Rbdg3IL
-eCZJmY0G
+di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCY5y+AbntV59z+
+5tR6RV3Qs1ibjC/83zG3iPXLv6QqTGTB9C93d0i/cN0f2j8QE11TpPUU7pHMmblk
+ZDOVLpaZtv26viXCYHJaS7OMhusmVruOJ2AoSBRdX47Z7aZB8vbmGIdSB4p6ESet
+eID6Wd73189xakvUAoxFB8+zEZo1pmuTJ11tQlyIDWKz6XDrO0cIHTjF+EAAeKnv
+AanOis7N/UwYEau72cErZCAwsih3V3WZ6TIwA3BCt2XmrYKtTEtFMaJNg5pR3feI
+e9ZqKKT2UO1YZykFLMEYUkCAUQMUdA13MSWiA2EjnYdVRieI5nHajNhmm8hipgnf
+OBEt0Zw4
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-and-test-oid-ee-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIUJ9JkAQ3RAK01841pI/cFzkVWhuowDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCwxKjAoBgNVBAMMIWNhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1w
+MIIDXTCCAkWgAwIBAgIUTSLwbOxOBuzeSe9coAOylouA6sEwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCwxKjAoBgNVBAMMIWNhYmZvcnVtLWFuZC10ZXN0LW9pZC1lZS1w
 YXRoLWludDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,11 +11,11 @@
 A6zaGAo17Y0CAwEAAaOBjTCBijAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBa
 BggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAGGPmh0dHA6Ly93d3cuZXhhbXBsZS5j
 b206ODg4OC9jYWJmb3J1bS1hbmQtdGVzdC1vaWQtZWUtcGF0aC1pbnQvMBEGA1Ud
-IAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAISGuBfRBpVW21ls1DlW6
-ZCaTU2/X7910bpVUmbfD+XxyHAi7hgkxiAqhIA4IJs2SDTM7PsrO/5b6ibpm7Zf0
-waATKx7xunmcFG9bxKboS31Gy+q/Tz9F7H02+w2G5CoIubVlGml9OPFlRJ35EpRi
-UcNtQecPtuWaheDgCWlNgeX+n+/NEJdxHlFKBF5qPyWXETf370yNUsmX7BRy2F5f
-/C3wYZ2oY60zV2U1atCtWuOmSa4DiiyTqiDCMlJoXh0kSudxr7yReYWB3vgMNd+d
-ZXX9JSDWet7P7NQ3+bsaxKQA7oCNx9ZCupGMu4Fb68ilOg44z21eHjHewhHwB9aV
-ig==
+IAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEArzFPBw43mrcgEhmCcGAy
+1eglq5KnMgtDY4lTYTfVLxrx4tOqQTDoKyMp63o6//KJxhPvEzuD6O4Gq+FMzlVu
+MrGcRo78esgIkkp/I77L8YAoSALhmfBIQdiv1bC5xLWkk7MWyvHCUhQ91ZXXAOo9
+7kE/Jah0PqHZQ8GFZ50sJWaO7t1Werxw+H3uX0edUix9BhqUXt3eWxQ7f1rlcueE
+poiqEhc4ECG5XVt77GswtIfTvlfXZ0iELV3BtWqgDUxBGNgmHf+k8XtN9uEIB1Lg
+wJQ/zclk56ZrquaQLGm2GVIQIHQMHqkZQqWGr0SllsSXq72xX9k9WxHSGXqgfgRH
+kQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDWDCCAkCgAwIBAgIUZfV55NmxUtMX7mDT+3GP3XFSsMIwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVY2FiZm9ydW0tb2lkLXBhdGgtaW50MCIYDzIwMTgxMTI3
-MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMB8xHTAbBgNVBAMMFGNhYmZvcnVtLW9p
+MIIDWDCCAkCgAwIBAgIUQzfIanDdubWVWC4810gYEPO4i0swDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAwwVY2FiZm9ydW0tb2lkLXBhdGgtaW50MCIYDzIwMTkxMTI4
+MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMB8xHTAbBgNVBAMMFGNhYmZvcnVtLW9p
 ZC1wYXRoLWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -11,10 +11,10 @@
 MdUDrNoYCjXtjQIDAQABo4GGMIGDME0GCCsGAQUFBwEBBEEwPzA9BggrBgEFBQcw
 AYYxaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2NhYmZvcnVtLW9pZC1wYXRo
 LWVlLzASBgNVHSAECzAJMAcGBWeBDAEBMB4GA1UdEQQXMBWCE2V2LXRlc3QuZXhh
-bXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAHN1SCF/iZc0LnIraHf6xnj3j45o
-dkRKUkSbMQ31HHdV2sR24T/9J2NddYAnXvrqyG/bJOlw2o7BX9cqbD5T6C5gSRNE
-JsjsRHy8h7Ohrj4IWsKT/3OdqN79fYHQKTMxsAMVnugHparOWGr3Xn7rv+CAU44k
-xBSBiIU9+WGVUyP6+5rgujvw6EVF55wkFoQwf4zOcfG6rcOIjE7F6Z8xvL+gU6f7
-4wA+S71/eH+yRQIgFXTwD07zZrxQmyrRdG/3SL6HJX2aJ19a6eQQ9J20fgULU6FU
-Ko8tuLTtOykssIHCdruZELNj3QCwH90dSUG16vl4ZzBLAOkynAFAv1CE65w=
+bXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJ9Md1ZCs0/Hr6gqayb9vBSGdX1i
+vT8ufJef6ViOlW0L5RrH7cYU5tIDHIRTFy+KeOhL/CWbL7zVJKofw7RUYskPucwa
+ll4SeMGFMT0vDADhec9WLd+F9D8YCVhbWkb+OxeoOs98nlGhrl3ZEVP+aH55DtqF
+ufiUsl8cjHY2ye1pxkfv1IlNpjORi+xtsYkkCQvgY1B5KzGg9Fe5wIC8VtyslrR5
+f7EkfSnZjrQYEHNcJTvGojRniDXhKS/AGsyDYFMgUTd/Ur3l9Wn2WfzhyyeAO+vX
+6YGyLnghtcx4pvEHaKpkhCoQskjkcGOQhlq3Fq48p12IyFMCQP1LdWnHzZA=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/cabforum-oid-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIUD0u15G/SDktS2mZlR3N9w+S+t8IwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCAxHjAcBgNVBAMMFWNhYmZvcnVtLW9pZC1wYXRoLWludDCCASIw
+MIIDRTCCAi2gAwIBAgIUHxkuPQNGVMkABbeiiiNkn5pyPdgwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCAxHjAcBgNVBAMMFWNhYmZvcnVtLW9pZC1wYXRoLWludDCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -11,10 +11,10 @@
 AaOBgTB/MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGME4GCCsGAQUFBwEBBEIw
 QDA+BggrBgEFBQcwAYYyaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2NhYmZv
 cnVtLW9pZC1wYXRoLWludC8wEgYDVR0gBAswCTAHBgVngQwBATANBgkqhkiG9w0B
-AQsFAAOCAQEAiyqMZgpFQvHXou2ALjke0ykC6LfTxhfCvJ0V38jNyMX7ZaFmNSIn
-NAx8WwHiUEpZxR+wtVCzoH/THSLi9ZXM4IMUSbcmH5RsQruciENsRzyp7o39qvLL
-QFe9zJrhkPoGA5lbwQG6Bf98/wMxNuGmk8ewNFTjj5qEjZXqJ82FVD4m2AlS8gnb
-FPTUTtczlQdYsAhpVXd9pFbeGMl5sNM+E11/eU4dgIM1fw0wCZFAwinHFceMGowt
-UeXkHKz6TKyGaOs0RSWLLJxA5DJCiUedEzlI5RtADPB1oV/JgjtYo67BLlo3P13C
-E8hXwPAhri/XaEzW4nzmBkOt5rU6KPz+tw==
+AQsFAAOCAQEAfOjhFxR9ILmgEhFc0QtS1QxamGbs4aEPLfJpIf//IOMubqpSVr+7
+nS8nL+Fnglx4eeql6+LZNL6NUHY4xGVH9a9+RVZcfsFeJxUI9KCKBPrkD5Xetat4
+GpoYqjKT41UdJq+dLmXAs1YmF7XAVJY4vjYpFUbjML4JKlOw79jO72VRQC7MKl7t
+gxGq0/IPB3/zEVGtVdIWU73aFhvJ+2H3L4sFaVY5d9BTfYvOcQtebF3SWaVIDOlw
+13OdogmB1kzb2gaLs6tZAXCCtG+mxkd/+mrUXXDCsnfY7IEGf82z5cmEFJorgwEH
+uw/YpAPooZCMfvp5BNE6MIi6EYR/nHjCGw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-evroot-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAcegAwIBAgIUG6N8ff131UGNvQ881O7YvU5GeeQwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNbm9uLWV2cm9vdC1jYTAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAYMRYwFAYDVQQDDA1ub24tZXZyb290LWNhMIIBIjAN
+MIIC3zCCAcegAwIBAgIUGVWjVL2eG3LHefW8SbN9qKKBkR8wDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNbm9uLWV2cm9vdC1jYTAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1ub24tZXZyb290LWNhMIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -9,10 +9,10 @@
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 ox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
-AQEAnwueyTo4K5c+fqgPar0ykozF1VtEzGtQwxrDgqUkdL+2VSw8+9beIbzbxIjG
-JeCf/BU4REPf8Mn1jMWoPhOLw+pVlYNkWy+lXaQXJrOhHRhxCYSl3nJOqhvEg8Nm
-cbOw9Da0yKODxvO2YHfBxvHbWWVVY/F0s+I4QyGnhn72mEYUCTckHfbPGDk7Sh2V
-TZDvNaNHgQv7AwOCapyYX9A0ETebdrY5LgUGNQ0Lv2pfWd/4PfWKXYgy3LWfiFVT
-kgTffJrtlGDpvI7xW12ASH5tTX1rY4AmWyGkWjPO63Llu5xKWmUygLkPP8kq3KnU
-o5QmitKW5i7ZjR36IXkL6E87zA==
+AQEAIL1Lg6t9nhLv8OMt5Jupz2pz7r2l+OQOeVklrV4defOgh5GNA6Ib27iqbp3u
+WiKHKHwUIjNUCbjYulnDqyQOugU7c3MCq4iy+rJhPECmTkrwTW8D3Rk0HtaABG3I
+hlsf3ol+5TWP/84+eu3Re9GELv3ot9j9BGH29lW8wF6K2lw4Q61uXxTS1FZFfBw0
+fXxyQYeKLc/NXnde1I05/vgieogPJa8klb6IOhHgdnfyfFUyTSKRUTuchCNJWlua
+cxuMEYDkbusVVN3mNaBanqSuP4o8LnyOXvxUhDIm9I8dpcYD45db+2Et5SwPq1jB
+9Bm5lW6mnQkcBeSDAhXs8WjYWA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDYjCCAkqgAwIBAgIUT+Qe3CiwtTMGHNTIL8oRXKqIp3swDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUbm9uLWV2LXJvb3QtcGF0aC1pbnQwIhgPMjAxODExMjcw
-MDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowHjEcMBoGA1UEAwwTbm9uLWV2LXJvb3Qt
+MIIDYjCCAkqgAwIBAgIUd59Z/7YSXGFqK6Mbt0Q0cLiJV94wDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUbm9uLWV2LXJvb3QtcGF0aC1pbnQwIhgPMjAxOTExMjgw
+MDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowHjEcMBoGA1UEAwwTbm9uLWV2LXJvb3Qt
 cGF0aC1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,11 +11,11 @@
 A6zaGAo17Y0CAwEAAaOBkjCBjzBMBggrBgEFBQcBAQRAMD4wPAYIKwYBBQUHMAGG
 MGh0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9ub24tZXYtcm9vdC1wYXRoLWVl
 LzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAVghNl
-di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAnoWRR5ZgkNZSM
-APbOjYte67CRUdFuOP6OQMTa1B6H+GM2hGaNhoJOP1dLeGdZotMmqKs4W/xdJLE/
-KhyK906QHmliGQlZqBDB1OlU5abXKNPrhS4svaRlKJCVznv5iulYKFZIh775eh5l
-xkzsJxsEY3UvXW/R++pvEgjRwec6z9s4vybZ4myv+foqO46gtZjRN8/zb1wxNe71
-L7hw3jqYpai5Nb2w71Am/zAIajDHmSc/uhtQjKqdqT+UGCgcDYUWHszZzFC7ilfI
-SHKARCtrHCrjakjrQk6W5GzU0zksfP9F+djotvcoZRa8xNF9Dj0Z7PaEnzIBiYzv
-5v17B5PO
+di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAlsnI1h5nJcbp2
+0qwOoxUZZhmztKVGp5Oy9ae0TbkEgqVYYRTnNSSVd82cULRrMY4p3kEaAwbU7ej7
+YhxsNIBf1f9pRozRIdY/SZv20nh2/r3N6RfjvxHXRcoav9dpEti8kLFsRDaEbxo9
+yxS+9vbEmg9iuVkvMHAd3tZ0lBg5lYFXVk6BKrJF9nqrOiZhl5//0+tUfCenvleJ
+ngoB8MLZGR5Y25Vov0rSzj6HM3XLBoV5MIeFcB3n/JcBCXPPFwikQgIHTzInF4+H
+UgQOhv7L1nzSrIAZjiGHbD3R4RNwMlkIAlt6nzWse7e2zwBedYjpcFy4qFN3sweU
+91MM5I3h
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/non-ev-root-path-int.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDSDCCAjCgAwIBAgIUP5d7BLl/CUU+/00xCFIq/bFakq8wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNbm9uLWV2cm9vdC1jYTAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAfMR0wGwYDVQQDDBRub24tZXYtcm9vdC1wYXRoLWlu
+MIIDSDCCAjCgAwIBAgIUCa1ByR+IaXRuP5HPyIyTz7ZjGSAwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNbm9uLWV2cm9vdC1jYTAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAfMR0wGwYDVQQDDBRub24tZXYtcm9vdC1wYXRoLWlu
 dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
 RYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHu
@@ -11,10 +11,10 @@
 7Y0CAwEAAaN/MH0wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwTQYIKwYBBQUH
 AQEEQTA/MD0GCCsGAQUFBzABhjFodHRwOi8vd3d3LmV4YW1wbGUuY29tOjg4ODgv
 bm9uLWV2LXJvb3QtcGF0aC1pbnQvMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG
-9w0BAQsFAAOCAQEAANzSFnUzOIf7mPMIM4/RxecMxdG5hTx8ukmhja9FKsjY+9dV
-O0g511eQGjubQU9DdH0bZenhYrCGxWmVSdufGYyzHlaZC+frP0VXiP90xAL+wFcS
-H4pT6lRDTDChGEAXY986ICtUnXUOFT6Gi2GhirtO+BikuOy8xfbjq4bRT9dhuDkl
-9+Ju8ExFwPKEy1w7O/emvwZIWZ052Q15MDTlB+rzYgvWc+cYyhvqH1BEoflRv2co
-AQjH714teYoPNGd3qoK8ioEfmwiPKeNhUzRtZGTulw2UzdwFLf52usiNrhWmAUp9
-MX3YFWPiGB5lcj8unlCT/lUtEocJiCX5s+MxJw==
+9w0BAQsFAAOCAQEAZU5zl2ENgMl0Y+Yvstp/aDqF1s8OTSEQgaYdRd5z5lh2tZKc
+vQdj/eH9EuT9ao3HsYFLao79ukbvHBPmtU6snsbO82kf7fFO/LtaGoKYKWnTJVyF
+1jOlQ1YCpntdkEdrdgSH1dbxQCqffvPQUxlHUYuhPXM/OyC6ZPuH3409bH7NFE8d
+d9FzlOZu7wX+aIttXJUeH+QklPomOp2Ef0aZwj9TMi9yjRdomfD/amYPYKmvpXlN
+Vem+Lx3O9sN6zsTcDs3tmY0pQ9GRAWPO9n8wv4drUVyhtF4LU87bShJ66zxW/lN4
+50jdCVPBizdvAbDB1iNVHBiagWX1rL4unY8g5w==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDEDCCAfigAwIBAgIUS1V4hhbVWOdOtAWnsW9zPHZk6KAwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbm8tb2NzcC1lZS1wYXRoLWludDAiGA8yMDE4MTEyNzAw
-MDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAdMRswGQYDVQQDDBJuby1vY3NwLWVlLXBh
+MIIDEDCCAfigAwIBAgIUEVaHlHZqtF7YUMSMX768HxJ2o6QwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTbm8tb2NzcC1lZS1wYXRoLWludDAiGA8yMDE5MTEyODAw
+MDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAdMRswGQYDVQQDDBJuby1vY3NwLWVlLXBh
 dGgtZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
@@ -10,10 +10,10 @@
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjQzBBMB8GA1UdIAQYMBYwFAYSKwYBBAHrSYUahRqFGgGDdAkB
 MB4GA1UdEQQXMBWCE2V2LXRlc3QuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBABarAf4ul4FApzBSB3z4VMRNOKf3G8B3hW1v10/a7fydTuK4DRRHISDnjSw1
-lzvEh10z7WZME3O3VR8SedqNPMS+RNntB3F1BZIFAnPJdM3cFWAB+z5LUUwlHJ46
-rlTCW263ta1NpVAqnnHJ5ZoFrOt8Kv8msmuwtqwOMige1mxJXC9EJcwJxzAB0Ok6
-ZDGPZw1a9qOFfdWUPQW5A/4bO32Mf6I228TzRKtLAssTvEf05L3kYjvIrQeKOBj4
-P52R+v1eO8FtxEy7ErEOtxz19ISxBzHIdGWdwIExgHSlRSYpJ6LydX+icpccSZUz
-EndYH1hPb8aUZ+4oKeyIRUCsk1E=
+ggEBAEOYKTjhumr1vgG+VTbI09KXlkdy40/PKEKx6qqgcPVzJdwv9zcrcC0diJGm
+bgReRgaw7CauoL9iY/BaBI+awYfLeQR7+Sasyg3M7QPLHXTAvJYzjYWQrcI2Bq9f
+FpF6vGdN3O6OEifA+cdNWMAXQi2KnFdxCrwV1isLFSnonk+2qhmQmGBUCqVzSC+I
+09IzhxcZPtWYKPJL0Cfnx4r/+tLt/A+tfhUUcDxT3H6TgfhmN4oeMq01MQ/H/und
+ARclew0opuHEUQg1UL5cYJUTO/+rbslcRbwDkJNbw2CN6u2CCtaYEjkZQlQ+rfd8
+5m9OsORT8NhDwyGkCNoqU0eTYPY=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-ee-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDPzCCAiegAwIBAgIUJSDp5r8CWmh3Efaa040rgxL6TtQwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMB4xHDAaBgNVBAMME25vLW9jc3AtZWUtcGF0aC1pbnQwggEiMA0G
+MIIDPzCCAiegAwIBAgIUO1Rn0qhER6ecygoAUilco/BzuwUwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMB4xHDAaBgNVBAMME25vLW9jc3AtZWUtcGF0aC1pbnQwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
 fs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1m
@@ -11,10 +11,10 @@
 fjB8MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMEwGCCsGAQUFBwEBBEAwPjA8
 BggrBgEFBQcwAYYwaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L25vLW9jc3At
 ZWUtcGF0aC1pbnQvMBEGA1UdIAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOC
-AQEArBleV3YvEj9sric0uAJlx2S1R5i13rwQXhvgfS0DBAUf2sF7B9eqIxtDDpbO
-Xqz/aW/22q1+Eg8Fs+XlzgDG7CDrOn45mHQZgmSzEdVdl/0gVjhSx5y3XMcpg+33
-sNoVU+CJz79BGciv+gYuz2cfSrhaHSKpQA18ZLWDhFVclTjWWXFAt6KTyVN2i7PA
-oy3LOAeZRI5SHzcNNGdf9OLHo83DGYd3B1ZChNHhtUZykGGCh3H5eXHIaD6kZHEG
-rjXpMQDQHgEh2MAaZHd359E2sHU+YucdVcScxsBRsDH/OevEVbDkfH0qtNw3en+2
-gnGKC8cfx1DTwRDaKw3v6bFzug==
+AQEAkwxxKtURPe9v3BjIpNuig5QVEf5NXSoxqbScpEK/fumMsegQekfAqomKbmCn
+O5B3Qhn146UclkoeKaJJQ+DpWcRDqg9pMkwWbJDd7SpBGqzo34juHR2q7mnBEXQM
+jte6jJnV5XTNG0RSaBL523CcSByk0H6AtBI+vqYJlF2Ks7/9S94QD7fW7gvqBDPQ
+zXMbO4qXl34sA8rpaDQBjOmwMl0JXtt0/CrbOTkb7GcaNGaoNORKey6MxMQCmVbD
+KkMoU98lJwO5PMZkid03vN4ooTNoOFLevyDjP6dGBf3/+x7IASr7NQsdtXdWeSOs
+W31qevNBQqgSY/vA2graLBoKGQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDYjCCAkqgAwIBAgIUTYpgwb660OVh1Igc2sQWzMekDXYwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUbm8tb2NzcC1pbnQtcGF0aC1pbnQwIhgPMjAxODExMjcw
-MDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowHjEcMBoGA1UEAwwTbm8tb2NzcC1pbnQt
+MIIDYjCCAkqgAwIBAgIUU2GeukGa6dcsNWCnTyp5K0jKQO8wDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUbm8tb2NzcC1pbnQtcGF0aC1pbnQwIhgPMjAxOTExMjgw
+MDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowHjEcMBoGA1UEAwwTbm8tb2NzcC1pbnQt
 cGF0aC1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,11 +11,11 @@
 A6zaGAo17Y0CAwEAAaOBkjCBjzBMBggrBgEFBQcBAQRAMD4wPAYIKwYBBQUHMAGG
 MGh0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9uby1vY3NwLWludC1wYXRoLWVl
 LzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAVghNl
-di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBmoG7s/2tL1tHJ
-m0ugHS+GPK7W8qsC493zL8fa9yXOMDL6+G+39HpXgdjYU3PaLOOm7uXPowCZlxs0
-BcJl0LBMADH8nN7Kq6OrzUp+JXvieVwBwyY7DoVgZT2JAoWFtppqCtfDdDK2doBQ
-99c0X6eMNG38gMWPy4v/g3d3UD889gwXHcsgaKOa/yfTXcOIxE4kBvfj2yV2716X
-zuwBzzHw12aAjq75QlQgKChNxOReU73CDphSecMGFXflAvUzFE+U8ZW7E6TRkXkr
-xVX+7r+I1bRVd9i6HVBMYUs1Pque/89pOZTu7XzLHg4aKHyqetrmNmj0/ZgFLKxz
-C+0AjvrH
+di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAYiSEHOmStRPXW
+y5vUwnM98/F1YLNse2fC8PSsG3i+74YRVmtCi+A+KSIwVH6bRVSZCAXn0Ie86sQh
+UIty2qzWyn/nFrX3KS1N660GsSpvQmtnn31dMGGbEbEoLH5MOm1EPD/ydAdTZc9H
++Jg+0SSlELBTsdOI6mUj84JL4p8piYtIvgVWDUqn3d2Q4qp5m2IWsWJn/x/YrtJ9
+qcTHEYD1B3WGSg6LeUlqWCCmz/2CaYzd0SRSXPqOZpR5RCckoY5f7o1Lev+/yqLK
+ExfJrMIg+encVBPvPxIZrNLa+8GT705rVvX4MbKP0tIpTzPv1DimxaKauytRNkgR
+sN4lGvFc
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/no-ocsp-int-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8jCCAdqgAwIBAgIUezhekKY7BSy4HH10StJJPRR9t3IwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMB8xHTAbBgNVBAMMFG5vLW9jc3AtaW50LXBhdGgtaW50MIIBIjAN
+MIIC8jCCAdqgAwIBAgIUPy5yIOPguO2ZrWK+N5gQKt6P8vQwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMB8xHTAbBgNVBAMMFG5vLW9jc3AtaW50LXBhdGgtaW50MIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -9,10 +9,10 @@
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 ozAwLjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjARBgNVHSAECjAIMAYGBFUd
-IAAwDQYJKoZIhvcNAQELBQADggEBAEex8ibjj69DmHoA3ir3bqx4I19aN5tia3s/
-y6Q0DjZsNEHF8847Z4uHMhQ5tZDO9MBoR57880AjMgLOP74QpLj0bnbT/bSf6NoR
-PLezZxBjXhe0TO2tRGYc410w1fJnYqO0a1KnzIILQGKRYQ0bsAwKG8V+Ak1d/W+d
-Iu+PNqt1Gy14oFCR8MtZbDp/Xgwey7OCuQnCHZAJNfdPoTVo2xlQBD9VzFPl5z3T
-JHpg7S68mx5/SJI9zYAEb73J6kgESpcqyPeISHmoOIaYUPARvUs/NRJHPGvIdTzC
-vTUonw1ocYw5SDDBwHKqZ6QA9prceCFwGaRlCqqt5RgI0hi75vo=
+IAAwDQYJKoZIhvcNAQELBQADggEBAHLIQ3h5ckWiymYNqo255k6T/8bIupCPn6Z0
+qVoNmlb3s0XZfTy/64GRCqdRDMMhT80po7IVInalhfrxlBsoG4ASQ1Rc1HI3I1c5
+4umDOTxDrTIiCxJlMFGodb7ZWsrsIO0a9FpDAuuXRkl2wdqEo2UpfJBq3/LPhq4w
+Uzv5KUFDo5frBytVJFR+qpnrSEeekORLqszUw5eYy50YegC1qlXca2Vk/m2oQGKC
+4yAT+dS7i7WYrZ20aoAngBLrBr0EJuBjjDCpIGM3z41RcT7VOsezfmteGzoRoVBh
+GjHgM7gesSuC8oOOr8i9aT1X5MQMhfVo/MdS/UDtLlSt5bCVwQo=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDgDCCAmigAwIBAgIUf3A+Vqu86IDGAyFmqCDM8Jc3P8gwDQYJKoZIhvcNAQEL
+MIIDgDCCAmigAwIBAgIUEXmqqsX9kzkkT1kcgsKRmjz4I3owDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbcmV2ZXJzZS1vcmRlci1vaWRzLXBhdGgtaW50MCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCUxIzAhBgNVBAMMGnJldmVy
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCUxIzAhBgNVBAMMGnJldmVy
 c2Utb3JkZXItb2lkcy1wYXRoLWVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
@@ -12,10 +12,10 @@
 RTBDBggrBgEFBQcwAYY3aHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L3JldmVy
 c2Utb3JkZXItb2lkcy1wYXRoLWVlLzAoBgNVHSAEITAfMAcGBWeBDAEBMBQGEisG
 AQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAVghNldi10ZXN0LmV4YW1wbGUuY29t
-MA0GCSqGSIb3DQEBCwUAA4IBAQAAAlOVCmF5lw04rk6CY0A4Btm4i+Z4N5BbAjTK
-DtVp1pGfKoj4LfLyKHa7HnMeggM+n+6sXVSjYMn/tLUb6LLtbBOQ7qusrrWBZZ6b
-szA0Mk0tC36jeZ+18bA7chG1GzB5iC/Y1WFd+GqWE8g9Uf1RG5ITUnFYiVjmJ2qG
-Zm2FEeRNo19XnRmQCQyiuAXnx4StekKhFjg3XioyF62Fikw75IcbFOzMgDzzq+LI
-MBB2fv0PSDq6LbKVggJvLogkOjLxKPMz9FoerBEbRkDD7ARbH1VNQFRKyB7rX59/
-G6tBlBe7uqWFgHl5rOfJeJvtWJZ/Xj/ITr9P+li7b05+f8yv
+MA0GCSqGSIb3DQEBCwUAA4IBAQBUE1VSHa5kqgpWz91KR8zawKi+hFSszqXN8bFU
+H5WEl7j7W0fCBmpqKTlz6V3HFuphFaE6kDctZ33H8TLVTROPusCxY28dgphJPZQG
+LaOwdU0YcdCH20wEXgkoujM/cgnyNkTgBkRG5psvtAvTg28bsOWbqpgxiSaKBo0z
+xYPMq+J+schGpK02zLlkbANZQdBYg37jBVFWCTW5/tGS4rPEDC/agn33y6Pvv6mq
+XUrxOP0E8sZ3XPnjMBIXRI9NRm6urNMPQsteEHdhDVSo9LXV3d6GmlSW8xoGTmEA
+G4HYR1A6+D7PGJDVyvWaGENkGEfJUi7ngfiMEvDTwbQLy08V
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/reverse-order-oids-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUdSdaQB9xajzdoo3uO5u4+65ZIlwwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCYxJDAiBgNVBAMMG3JldmVyc2Utb3JkZXItb2lkcy1wYXRoLWlu
+MIIDaDCCAlCgAwIBAgIUVyTXYnGBHJHjCi2C6eJVXi/iBbUwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCYxJDAiBgNVBAMMG3JldmVyc2Utb3JkZXItb2lkcy1wYXRoLWlu
 dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
 RYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHu
@@ -11,11 +11,11 @@
 7Y0CAwEAAaOBnjCBmzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBUBggrBgEF
 BQcBAQRIMEYwRAYIKwYBBQUHMAGGOGh0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4
 OC9yZXZlcnNlLW9yZGVyLW9pZHMtcGF0aC1pbnQvMCgGA1UdIAQhMB8wFAYSKwYB
-BAHrSYUahRqFGgGDdAkBMAcGBWeBDAEBMA0GCSqGSIb3DQEBCwUAA4IBAQC0Pg+g
-/JQ78GyGshW31BY107uf3eLP+0+fURJfR1qtc5Qnyehrc41H/pH/0ckCG7874jpu
-YNH2va63rt/gIgez53f1+77Zlsl7lfrFT402Pjd0snm2C74Pn4jI7lhzLRtCor8a
-covoC6dKyjUsoLkv2VveabHdSB1DN+SQvV3Ta6qiT3oX2U5lVoZhn1Wf9nz993c2
-uqPWXMa5dsWabO4f9ikggjygiJNOU58SOLyM7UmrG4iyr8WtOoBxNgU20YTpLt0L
-AZy9c7P++DTUKvC+TW84xrOj1hqYeNw/XeQvHWJ9ieSjoN13HHYFeB+yy8CL3eiG
-rsUgMQ0VLtOjmEcM
+BAHrSYUahRqFGgGDdAkBMAcGBWeBDAEBMA0GCSqGSIb3DQEBCwUAA4IBAQAWdeBD
+aq3w2mJQWpFQLh9ilFWk0wR1wPTEu/G2sJlZiaj3hoQmjtAb2hzuoKorSDSv0z6l
+mTrvT1CLztFJmTosimY+aoDolDJ07cqMQ5LrzSRMw48vhzeeyy13DX5uCYUxRK27
+EHAovqpg9AoPBlA0oSEM1FHxxzWmnh3eJRsos6TBIeryzX3U3j9yVkXALprWc26W
+DK1SeAZjpALx2rapYRMKIypFmWmyYzOf2Ix5np6QwGCBnQyTvYSK2a8I4f4fGS2R
+y+ZSyd1JwVMD7ok6zfG3+KjXRgbAL3UFkT45h/BghBfavAuJbbjzbnUwHzy8NwQh
+e0303QOYHHq0vJIh
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIUT761hvIVKHWk1cEGLuvhZwGLYDowDQYJKoZIhvcNAQEL
+MIIDxTCCAq2gAwIBAgIUY4rG8NqK821vmnElwuFYW26zGUEwDQYJKoZIhvcNAQEL
 BQAwPTE7MDkGA1UEAwwydGVzdC1hbmQtY2FiZm9ydW0tb2lkLWVlLWNhYmZvcnVt
-LW9pZC1pbnQtcGF0aC1pbnQwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+LW9pZC1pbnQtcGF0aC1pbnQwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowPDE6MDgGA1UEAwwxdGVzdC1hbmQtY2FiZm9ydW0tb2lkLWVlLWNhYmZv
 cnVtLW9pZC1pbnQtcGF0aC1lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
 ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
@@ -13,11 +13,11 @@
 WgYIKwYBBQUHMAGGTmh0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC90ZXN0LWFu
 ZC1jYWJmb3J1bS1vaWQtZWUtY2FiZm9ydW0tb2lkLWludC1wYXRoLWVlLzAoBgNV
 HSAEITAfMBQGEisGAQQB60mFGoUahRoBg3QJATAHBgVngQwBATAeBgNVHREEFzAV
-ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA1LKqVc+cN
-lIPRC1DA3zIloE3emTxYwWnxhZ9HrvfP1bAmcSLaKLL2AX6ICFmoxlxnDTA+CXvA
-gF4tmDfJUqCrd6jsNrMYMUzPDM0LEXJxD5bgXTsyeLnaXppW+6D5wlwYJ08ZxRg2
-yYh3ACmsN5/Qod0dtS+eLzqypJMmWfTSjCKeCw8HryHU4R4WdXY0px+SNQ8C45I1
-Z1NPkP7tQi0bM1hGQaFbfYroId2OV+rp1Blt12YLBw/zBCzXAE0eikm85DhM7jMn
-2naHsxvtbIekPoLmPzMlI/I/hZZKecBpEBoywLZZWpRGCotPq29zY/dyE0IJvLEh
-alms9IOIkFAg
+ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAd+Daw/djP
+TluuhjaKDlybSeAF7k3Y7ndQXGkXHnnjyDSzVUsgaqZ5snUkYVLVFV5dG+IsYhhu
+hhkXok4nq+6Jc9O08/Uu7kIpjf7Ouv5Z0OZBBojAvcaYDH98bjxxx5Lec0nV+GTP
+PTh6BgJosCOTXEan6QzPHOV3xyNuDzrXMVDglyVFvBgOj8AavNUPiqi9lB9gN23w
+AjzxSo3i5J0oEYfwUjnPlwI5zQ9yOKG1pnno4lBI7XMhDs5J7BEMt9fz+W5U+/2p
+MAUkku6bPT94uOH4Lj6Chu2ppFo+herNAdNO1UznNWOcOkOap+SUQJubPqTwdf8c
+BJ4WinbiDmDf
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-cabforum-oid-int-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDgDCCAmigAwIBAgIUCc/eVm6lz3+FPLZLm0MkPB26dXkwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMD0xOzA5BgNVBAMMMnRlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1j
+MIIDgDCCAmigAwIBAgIUB38LWV7K1ZtRLJtMguF5H4CVwXAwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMD0xOzA5BgNVBAMMMnRlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1j
 YWJmb3J1bS1vaWQtaW50LXBhdGgtaW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4Ngf
 vbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTb
@@ -12,10 +12,10 @@
 Af8wCwYDVR0PBAQDAgEGMGsGCCsGAQUFBwEBBF8wXTBbBggrBgEFBQcwAYZPaHR0
 cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L3Rlc3QtYW5kLWNhYmZvcnVtLW9pZC1l
 ZS1jYWJmb3J1bS1vaWQtaW50LXBhdGgtaW50LzASBgNVHSAECzAJMAcGBWeBDAEB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAthkzX7GrfDfwrFTMXPWE1QxH7zwBVFbJKFbap
-hKTboyHb6838RIm362WvmyY0F2difOau3HuurYuaKziQD6YM7AzRVICMn6jpybbW
-lNfDx2gfquLLv6RuUjJq9Qw70ubePhgKfDWnVzASQksBJcr2rgiVl9ezweOUYPvF
-vAYwo1S8Y9cp5BJAoro3GHRxhag730y4V7gLtWDeaak+KkDQfvUt/LOpuV/hzO6b
-CpmlFnIiAoykQrdTnl0gHoOP3cYV85JAjtO9olCcAtydgWxxgPimMm+Lny0ZrTKm
-VYmgPUqRj5oPdo9/8KCoXlJPhQbCRrCb6DpnDR9nkGXfNZs6
+MA0GCSqGSIb3DQEBCwUAA4IBAQA2ga4887r55Lcv0LUHtIAd9DqcgqzY59nXDXOX
+PnS5gR58r1LF/u/7jPSJ6K3qzON6ug+PDoJhUf1UXBWzXhWusm8Eb5Fxo9OJV521
+GqZVsPdt8c1rnRLlrNi2GsLmywhgAy1w3mAR33laYeuT9PPQokn1W8hnU7hdWEwV
+V24CVsAK5YPH/BoSmnxVqG22/ZPbetqRKRzUanuOEOAuDBgPrt7NRm5djMpKyH4D
+k3drl+ZM0HFy3zH5XHN+a93E+iWrLy9/+kDq/7/2BBnXFSa7bTq+d/aWFrIXfW57
+Qx0bLWxz1SbqIElXnUKWGwWHoWObMRw7nP6orVKBqefyqRLL
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIUYbTXyunDOOg0TpDyQFuw9ti8HYQwDQYJKoZIhvcNAQEL
+MIIDkjCCAnqgAwIBAgIUTezLjnCdM9De3GXzBHXuGsNnVKowDQYJKoZIhvcNAQEL
 BQAwLDEqMCgGA1UEAwwhdGVzdC1hbmQtY2FiZm9ydW0tb2lkLWVlLXBhdGgtaW50
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCsxKTAnBgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCsxKTAnBgNVBAMM
 IHRlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1wYXRoLWVlMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -12,11 +12,11 @@
 CCsGAQUFBwEBBE0wSzBJBggrBgEFBQcwAYY9aHR0cDovL3d3dy5leGFtcGxlLmNv
 bTo4ODg4L3Rlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1wYXRoLWVlLzAoBgNVHSAE
 ITAfMBQGEisGAQQB60mFGoUahRoBg3QJATAHBgVngQwBATAeBgNVHREEFzAVghNl
-di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCjNS3/K+N4xqji
-tUN6PWu0YUsFVDuOVejgNgFWWeSVbUyyK8qlbN1SdXcYrw4nPiiiPC9IxGBmByeV
-sUWWOcvO3McSwJl19JGf5jpr0Mb+HneCruNZN1nbGBOMP9ou4Ixz0NleSCJi9pqM
-ayRjwNdVh0L/ygqMncByl0oB2XW82oZiFJw7C8bDKsUC6TcMjhPphoBSonHaT7AK
-d6BLsItUePMY2DKPbMvM0KNjvbvOWBZB1AwZbN+ClRDmCuAUcfhPuiphE1XEvDAC
-nBZB9KjERMPGu+F5fF/ehH6Yaq/baF31yd9jDD9/EEOTQNJPYSvs7S+fjSuviAbY
-sXssxbWc
+di10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAYzsZA6rEPjGaO
+3B9F7YLtYBFxtstq1++z+MRuLFXsXnaGgS65bP8C+phNNQQUYcTzjp/+nbA2HIVL
+OOtf0Z0Ciqxb6ALXhuHnPYX8pSby7afY1I4NAOuEKA844TZ2hwf6hGxMGFYC1Khv
++k0iFMLLzYA0gvVRMnhRvhoPqVQL0CxO0TRiYpf0pmPPiTkop37eNbaHorEAnCtf
+gZpfbDiYgh9USBGcfehKmwXjNRM0M+uVUdcsdzOwTHMeAUV5teRtf82D3j3moWhg
+HUjGRNpVDZjSp+Wn7psAWtKLETJhmfWPu5/b6X91+N2L20oWYk4ONCEsKezqDMxS
+Z5Ix+EJT
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-and-cabforum-oid-ee-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDXTCCAkWgAwIBAgIUR/xpnrFOlfltUTzDHeUSLN5HEl8wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCwxKjAoBgNVBAMMIXRlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1w
+MIIDXTCCAkWgAwIBAgIUIQbkixAb+1Y/Mab1Sh8NPYs0GLgwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCwxKjAoBgNVBAMMIXRlc3QtYW5kLWNhYmZvcnVtLW9pZC1lZS1w
 YXRoLWludDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -11,11 +11,11 @@
 A6zaGAo17Y0CAwEAAaOBjTCBijAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBa
 BggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAGGPmh0dHA6Ly93d3cuZXhhbXBsZS5j
 b206ODg4OC90ZXN0LWFuZC1jYWJmb3J1bS1vaWQtZWUtcGF0aC1pbnQvMBEGA1Ud
-IAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAOJsk/K4eKER/9M+Zh4oB
-4lqHvtzXDG6f4+Zzvms6PZ2DBX70JqIVz8A6xZMxZbbJtoSG9DTv2VzGymuhHZln
-i8KI94dtzrvlozUII7TqN02v7EioqXyNbMCZjieinxwNeF9tO+d0q+xs3p8cLiyi
-iDgv/nJv92bb4eu9cKMPAjnCdx3X6LnQQ0yJFaJ1S8stIWdJ+5CE3WA6YYplmtBw
-jle9e14SEEW54ZyLELFDE6/oPhQOj7KrjjMCkqV5+hqUiN1ydc6+ENFcUkOLH4kR
-nRdXllpGHsSDZp2GW6lwAy4sjlnhdRwdVA0ygsRGcPDsr5Rkb33t7ujadLgL2XK8
-jg==
+IAQKMAgwBgYEVR0gADANBgkqhkiG9w0BAQsFAAOCAQEAk6yOHhUbvCaulXNXvAUc
+X97+o1CkeFk1QCavnZUURyGZQlGppyKXU+RuEITsiGbYU/eqOrTGsxmdbLQ3QsPc
+hjiToDnXD7Bt7Nr98PDUFmIdh2sd++Wcjo9qjxoKrmxVvpxo8bdIRY3gVQaI/3Wy
+Hz+/iBKYKO07b3ql3cApqnnl+DEi4KFIfHOca4iBricDWWUBuJUmhwIiKqxsP/yv
+Y96xgMmO2/zVBG9bAwpbqnqygKoiaxZDEpFR7/4w0CKkgS85k6fVsE1Ozz8K8BZZ
+xuLfgn9A6I4qjfCxCGfH9Gojh61BwlHIUIJ8Rjbpn5kt7E9V3WMGTcopQISRoKEN
+vg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDlTCCAn2gAwIBAgIUQe3V663p0HHUZX2cjxQ4SleMnuUwDQYJKoZIhvcNAQEL
+MIIDlTCCAn2gAwIBAgIUV330em+9Xec1DGZ4wJhdv0RjswMwDQYJKoZIhvcNAQEL
 BQAwMDEuMCwGA1UEAwwldGVzdC1vaWQtZWUtY2FiZm9ydW0tb2lkLWludC1wYXRo
-LWludDAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAvMS0wKwYD
+LWludDAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAvMS0wKwYD
 VQQDDCR0ZXN0LW9pZC1lZS1jYWJmb3J1bS1vaWQtaW50LXBhdGgtZWUwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
@@ -12,11 +12,11 @@
 gaMwgaAwXQYIKwYBBQUHAQEEUTBPME0GCCsGAQUFBzABhkFodHRwOi8vd3d3LmV4
 YW1wbGUuY29tOjg4ODgvdGVzdC1vaWQtZWUtY2FiZm9ydW0tb2lkLWludC1wYXRo
 LWVlLzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAV
-ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAoPyA9WvYG
-bSudApwp+Ezyfs3Bx2s7L5SyCCiYojvZ7FfvROZQKFFW0pggPEgyhe3+UnyO4q/H
-ghTtDN9T+Dzf90ZOOXbNv10DpAEaLky2J9pYPX+VcEy96VTKVV2+r17V5tYarH/R
-QspRvpkMEpCT4WvE+5kCDOCXMebtIs15Pgqh6gLUrHM4ijxJDbMGQf8Df6Is/QyF
-GLWMLeELjEbF8VSzTF257T5WZwz+6uhgVSXSRwO+0bBQHeYX96KnX9LxxqiSNwDx
-SIi5+1mm9hS5+w5QgBee6uswm4rqKT7XL8IpbTt8VO4/cUaqJ73TF7PIZtEWa9tV
-SFRAmlcfu0gU
+ghNldi10ZXN0LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCh1PqRvUqb
+ZLTd7bxaQ//insQtmlqcflBQkPEkFLkyiyKOuBIeO5B+sgr2l8GsUfrVhqd6e2Xe
+qL/6+RNlLGm5tKaTLgmXo9iG/oADW8WKyf6oCXuFMU7AiZH6cS4//ewcWdZxO7xz
+vRfu5M6TDJMMEFk71wQSzx163/aidZ3u6tcPC+PSkCVD8vzQcJPBKcF+/hFyVOPT
+PJgF/NvUY3CBykH54zm12SEFh+iOkrbQRlazlJfUTXX+dGD3iohZ+KlpQUZ8Yibk
+OzHbgM5rggesRSvcu7Ud5e42XDdTq+gDVVbwEmYer6+h+qdT4WJ6bF3qNt7gKKf/
+FqqTAPIlcQFx
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-ee-cabforum-oid-int-path-int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIUVQ+fn91ZySCapCaFG8jjP102yBwwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMDAxLjAsBgNVBAMMJXRlc3Qtb2lkLWVlLWNhYmZvcnVtLW9pZC1p
+MIIDZjCCAk6gAwIBAgIUacgXv3Tmh0nRe3yh82VGGbTiqtkwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMDAxLjAsBgNVBAMMJXRlc3Qtb2lkLWVlLWNhYmZvcnVtLW9pZC1p
 bnQtcGF0aC1pbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -11,11 +11,11 @@
 UcQx1QOs2hgKNe2NAgMBAAGjgZIwgY8wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMC
 AQYwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzABhkJodHRwOi8vd3d3LmV4YW1w
 bGUuY29tOjg4ODgvdGVzdC1vaWQtZWUtY2FiZm9ydW0tb2lkLWludC1wYXRoLWlu
-dC8wEgYDVR0gBAswCTAHBgVngQwBATANBgkqhkiG9w0BAQsFAAOCAQEAcTHHsKGb
-e+NkVFdUPiaFRNjFMv8R1Pgig0HZUxlobBxQWF/bceSK8h82VDoG01fBjk/cT9B/
-EZ+fmwrcQOU1baf4VO1dZUyLfw4K0R7B9kE88/UBdAwOPxMf4w90pTHq4lCAtsTx
-a6V8WaRO+rnIKtx1DoJkcOiOs1Heubs4ZyfbviuLPg2Be0T57F9t8buOATdABqnp
-2nANiGLHEy9xf+Dx5nQ0zGvXhRuLI4LEW7hetQFQEHiqnLguqIOnxUMGD92tS0/2
-Yqg/+B+6QU/eZik51/6Pc2CVKo8vGzPLWaIlrS1hMs/4kZrJb4sPK8MBvKoHODYZ
-ZwQJtCtp/GQ+Wg==
+dC8wEgYDVR0gBAswCTAHBgVngQwBATANBgkqhkiG9w0BAQsFAAOCAQEAFRoD650v
+OtuTmJQO9NepvUZl8M3FqcQhrzl5u1qH9fKhpWaK2oXCsxirquCTitnFvIHwRARW
+2UUgGgngwKDVJ+c7ohRudQIrBaS4utKpIv6ljZQ/oF6W0Z+4SSkbv3wj1Aw0ThbQ
+am4Jhpf7KsxSwwrFwXn+8vCWahQvk31vZTw0S9EGdEL9P8xyor/pcG4RDB7+WYDP
+dHNdexGSYrnQINgQthPUSHfWJPI44CxyyACgpsu7zqd8UZ3BSP51wJARWBky5xhs
+RoVs9yVmXeah7ejpFSdI+fAS9ZAfHs0owrD+fEa2+2jdhpPEyay5DdLsGn/mMJ+Q
+K54zhyttXeyMtQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDWTCCAkGgAwIBAgIUOfdENxhAg8n9TvqrjsjfOOY7IoowDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRdGVzdC1vaWQtcGF0aC1pbnQwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowGzEZMBcGA1UEAwwQdGVzdC1vaWQtcGF0aC1l
+MIIDWTCCAkGgAwIBAgIUZWC2u4FJNGtmdv2n5Yk6Q7xQ8OQwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRdGVzdC1vaWQtcGF0aC1pbnQwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowGzEZMBcGA1UEAwwQdGVzdC1vaWQtcGF0aC1l
 ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
 RYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHu
@@ -11,10 +11,10 @@
 7Y0CAwEAAaOBjzCBjDBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAGGLWh0dHA6
 Ly93d3cuZXhhbXBsZS5jb206ODg4OC90ZXN0LW9pZC1wYXRoLWVlLzAfBgNVHSAE
 GDAWMBQGEisGAQQB60mFGoUahRoBg3QJATAeBgNVHREEFzAVghNldi10ZXN0LmV4
-YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCMc93tG76Po3A3DxUpKVJ6BcH8
-/KEAQmY4+Nx/9PF8Mh42CWBcje1LGJHyMHYTZk8/BLYrQf1L++1yg70+rGUkxsod
-ph2TyaHCyeP0z8fVV2OL4K2Vl4TtHQ2JN05hxuDBsENFPFMd9pxAAOj+BIbjxwgx
-azwcakYZGyLvSgQoyZj4GWTk+NFK0NP5tunfoNBg1AF+lIkb6yC3misitKucMWro
-lL7g8tpASHru9NHScPjCu5l4L/6Cc8c7G6TmuJOvnVH+xbJNtxHUiLlKjO5HZWAi
-UfOQhwbJ+ZoK8iS8RUe+Wx2UeijioMXvnumyNla0bO6YZaAYLAwy9gZY9Sh+
+YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQB3iZ8RGk7s3jwZY1cgJyJfjWIb
+A6DpKtL6KcvL/lcAF2VbrTdAHkEQ7TbSmDMZM484hRxckG7gs2C7rb+lUTDNk4JS
+WGm+WhTGd98DDM2ZIY3UPrGEKycqfrFqdjaJhMwd/BcgQgw5DgHUWlfKO1utSDLh
+vv212o2uzldYaGnVgyr6QK+kzpm+zLuveSxmiZSw3PE1+fZ8+yS5Ku6bo5yfdSg+
+jC9j6BZDiaf6B73offVyNlOMqD6LHczWENKCl7bCeLkH9OEl2eF7KMf3SL17b+fw
+QXvNBwHcKkEd1ElqyZOadUtAtRvaF0bWjOJ5QirH3czhPaq4XZJI8KVQyeWz
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ev_certs/test-oid-path-int.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDSzCCAjOgAwIBAgIUL1ITWXyOkN/KLojXLUpR0ekyDTAwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMBwxGjAYBgNVBAMMEXRlc3Qtb2lkLXBhdGgtaW50MIIBIjANBgkq
+MIIDSzCCAjOgAwIBAgIUEcfv2VQb1qigZ7waPro3Nb2Ury8wDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMBwxGjAYBgNVBAMMEXRlc3Qtb2lkLXBhdGgtaW50MIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVK
 tOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7N
 Q/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39Zgsr
@@ -11,10 +11,10 @@
 MIGIMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMEoGCCsGAQUFBwEBBD4wPDA6
 BggrBgEFBQcwAYYuaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L3Rlc3Qtb2lk
 LXBhdGgtaW50LzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoBg3QJATANBgkq
-hkiG9w0BAQsFAAOCAQEAeelRwgxZ91Q6wpvvyyGttQ3o0JtOjxWcKwVwjSf+tQlQ
-cyf8+oO2fU66AyT/420NCITWAnbSssl0Jl6Qzn+jFdSB/yXw1Ws2GSFPe7wCdVmA
-eF/d1gCEyVslyxkpoCynTuxANQ4YqzrlJrgsSGUJMY+mOe6cxw6l+tAIvRgUU95N
-EWGlNfMLIoV2ks61oEVkhakw8mZl+gS4RG5vTLGuwIL6jm6MO2vulWB6LgCz06KL
-UfoIwWx7R+f9AXnx9lhaxpWPYlBoDZxHDwd44J9fDIJoAhaSlgw03cGo0F9ef/AS
-Dy7AY4Qt0xSw2WniH189SQq8gaz49QpH18epDRKzjQ==
+hkiG9w0BAQsFAAOCAQEAJCZU0IPgdXwzNObNGVAa5SRNx3J9CZ9j6++cfitpaYc9
+sG6mdyyAjUbumaIgo84aH6dER+FxICt124AkAWFNPZtL+RVBV6/Y54KXSYKViXGl
+DRWOYqrbF+RGELQr5OW2kTr/u1Fsd7DWBjPBRvxLHzgSXvu3+knjXo9Mfsw+tpkH
+av8FGvxHvrj1Ad4tBXPL2MvwfT/KNtDLDVpWbkUW7sHhcEiVlitD6JONopiAmPEU
+8yNUERTw2eTDO16UMmh205wI4Z2f4SnZqrsueCQv86Nr5i12V6TWiipVvNKJLjQU
+UiBVkuFLI6o/rZMjJwgJrYgeeBmJa3E1Xa4cXf3Ehw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICvDCCAaSgAwIBAgIUB/++XKeXEH0g8rfonxS8JZ/JNGswDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICvDCCAaSgAwIBAgIUPbAn5aKDD+kIa7hReaL37pIRoqQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEDAOMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADggEBAAttHLdcp7lBQ9bpXc1I2gjfbenAfR/RDMemDZiGBiP5
-v7fOLw6VxLyp/RrQGLwlSDgMcClkeAmEKagplUbm970mfBE80yKRsIOZDsE4rWYZ
-mVAxV7h4j5T3k/8EGeQ4Np+nemlGi/SPye9+/OPFvxWkFNwHgBLJdkJDR5qjuY2K
-fptb0eGOoZoL5xo+i/KTP3W2MbOze2wpqgQT0AgsrFVfgeLxFO0Wtz7k4i7y5kQC
-f5xVxO7YQkL8TtKJXaf3R8kt3G7e4bGwxRstpacrYf+Dhi1U+/7ZLgrGvbMsME7i
-BSSaRI7CQexm+8sN6HEsUtoTaL7JkdWsU4rkMa+OrcI=
+KoZIhvcNAQELBQADggEBAByxcmVDqkg7zc2gVsSg2E+gTXDjMWp/DvVlbjOQoek1
+eRR6SmEEYQ8yYC4FMemiy2b1BXHkbcu4RlKJ/sr5n3qd+eKF1hSiekl8IAVO46lk
+I22qHCs3eRPkhSTXKfUqR8mOqLAMHNwmZ+4/S5xqrnSpq3+8q9o0a/A+osy1aj4K
+JNA+/Ey9HyxjOwTeq44JiMWbotqFAtrr4yQO8BVh6Kdskcp81UtRbm2gRjXtbIjO
+FSREK358HkIkcOYNT/qNgijwyJpQiWBUJ99dv3dgVXQpm+acsIgjQ8axT6Np+3+0
+f/kIT6Xl/umiMes/Q6auaRjdQMtok9nPTPFtWB0AlsM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5zCCAc+gAwIBAgIUb5unZI/obFW2XlkQ9VNJZcgWYmQwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaW50LWJhZC1rdS1uby1la3UwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LWJhZC1rdS1u
+MIIC5zCCAc+gAwIBAgIUJb+8nRpsie/LSW/e1iNkPRuYeGswDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaW50LWJhZC1rdS1uby1la3UwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LWJhZC1rdS1u
 by1la3UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
@@ -9,10 +9,10 @@
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0GCSqGSIb3
-DQEBCwUAA4IBAQAf4/nKZ2JAheo8LKHmW4wwNOpK4zn9wtb1rqCIcSOp7Kxwhedh
-44XV40srGVyi5VttV3/WdC5LAYTxKAVisyI6F1fYSAaIo2Xbcu3OgaJgCdmIiOb4
-iSJ3QGiR+8iUOfTMc1MHCMKCxm1ZBiTRpGPp0t7F7NtRSUiGyQm0U8SfNIs9+hxF
-ndkA7xasUNuWAq1zJf75ow+A8GCqAMame9Qky1+4qY9lPZAAiljAJTjVFkZkazZO
-X6cijJyW6JxG4qYsq0VAwEu41ZO6sjZVVtGpocRrU1euNiGxo+W7355EmChcua55
-7IXyRgAkp/sxtyJWdRLpkdnmk+/BNBdsAgw7
+DQEBCwUAA4IBAQBOyG/keiC1S06CjERcBFMpKlu4iPclxxZi8kscxlhpCfqUUW/v
+8bxR6AV7B5llfxW7fjxP1cx2tUzFMmipC6ShlO2M3Vfc4bxUy2plp0CVtt8099dR
+uXcuLxohJNL+hMs2Unt3rC+S4sZUypnWvDXcwCYhrsBZNq7IQ5oXy6m2oMxwHq29
+qUdIIFCmJ/wci6q2EaZttmLD3BW0IuPt7Z14oeAODYnIpnAjCIlPYUNRkFFT/2Tw
+cyEQlSeHqAc10dDuc7wLI8UMf0VOkxE5srTd3LPcXzrqBzeURwctZUFrwToE6Xk7
+g8czZIjwInmhjdES2r/iCLAlZX7/bl7tmDDS
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-bad-ku-server-eku.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAdegAwIBAgIUZx7Er1cPRjTeUj/pBJbovyzAgTcwDQYJKoZIhvcNAQEL
-BQAwIDEeMBwGA1UEAwwVaW50LWJhZC1rdS1zZXJ2ZXItZWt1MCIYDzIwMTgxMTI3
-MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCMxITAfBgNVBAMMGGVlLWludC1iYWQt
+MIIC7zCCAdegAwIBAgIUY4lZzPdovquC7Mbz72zTaN4o1y4wDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAwwVaW50LWJhZC1rdS1zZXJ2ZXItZWt1MCIYDzIwMTkxMTI4
+MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGVlLWludC1iYWQt
 a3Utc2VydmVyLWVrdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
 UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
 r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
@@ -9,10 +9,10 @@
 7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnv
 uRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj
 +nJRxDHVA6zaGAo17Y0CAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gw
-DQYJKoZIhvcNAQELBQADggEBAEVMc/eYSXp5Em5rCQuIQO2XPrBS/lRB3FSYHhCk
-40UhUz8kZ2TeT7TG+58555FsvJ/ot/YQt9RGL0WGN1hk8Tds+us38r4Pu5OORwZV
-CinZWglFx8XmSFHFc3BD0FH0pS6bKU69Yj3QINpCmEJGwbveqncsXw7gYVu+NzDN
-PYA+pTmPeKx6soxAnuHoEu/Mm9tP7Bb6wdGWoIJpSB4UfZV/bMRFQOU4BAqLMTvO
-LLtCS0dI9dr/XL6HFWdpMMaP7E1ZSNQXF2UskI0P05GJOhoYtOcy9RtjC6s5aJ8G
-AvnlEV4VjwbPw1KdkdAvAHe+BbqR4PcUWIv8xKH9qx+r8sE=
+DQYJKoZIhvcNAQELBQADggEBAEbel/uwJK/uVtGY33gMAcUi1M7dFeCrxbo51f3M
+dWf+qG4rMpZ9Jh9oUAk2OUuhkDfu52Vh4y17hjcPirOxWcy05UutefuEqUTLsiZ/
+Ykg+2RUMLtMPCjMgIv6OxWzwiN7hjuHW3MDmkEkT7YNzJnTE0isLwtd3gKiRILsM
+WtQ3AFdR1KK+CUj6pGht+yDYR0kTI7a/1d5fCcdWD6usuIWtJlzGTtA5X9KFaiB+
+40UZs0p5NAVq2jS6W+DMUjHfrH07e94R6cYHM0DFXQLqDJucpeOrBX1Pd6//Jl2h
+NtimaXJoTWiUOqclQstkhPrSLtT1GWj9S9MjDmB9G3hsLYc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-cA-FALSE-asserts-keyCertSign.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDBTCCAe2gAwIBAgIUa54MCYQ6kkxs6/0yYnypwRmiMZ4wDQYJKoZIhvcNAQEL
+MIIDBTCCAe2gAwIBAgIUd8ffH/82BvEHZUunrKaA0Zk6FG4wDQYJKoZIhvcNAQEL
 BQAwKzEpMCcGA1UEAwwgaW50LWNBLUZBTFNFLWFzc2VydHMta2V5Q2VydFNpZ24w
-IhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowLjEsMCoGA1UEAwwj
+IhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowLjEsMCoGA1UEAwwj
 ZWUtaW50LWNBLUZBTFNFLWFzc2VydHMta2V5Q2VydFNpZ24wggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
@@ -9,11 +9,11 @@
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGjAYMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0GCSqGSIb3DQEBCwUAA4IBAQCBdkr/8xp7
-5sRsfZIyI5Ev8VLFpFUFuUQv46Q7OdG+5Mra8l5Z2oUf4aMAWVL7+Z8KPzlzc9RI
-SpU7WyoI1YD6uVBVUTqtK31CgKQb24Lwri0qKCo240PO9nHEpSa2Bx5Tp6toJoRC
-0NVZWeMtk/UYGqjF6Ox8BEfQasdBlDoYXo3XZuT3bpdMd13NH47LdcRtz2ajV77U
-TMn7xoXk3CFLR0oWYmOIxn+HHa5IybMd22/ccu8kH09nKndxm4WV4uWVsUY8GJjY
-oqnonqZ6ssUuLiYoQSmWoE0DO8kxfnveJKSfrMIgn477jvBDAlqoYnMrodANrjaW
-07MCHSYlthZU
+A1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0GCSqGSIb3DQEBCwUAA4IBAQAVF9pewrYN
+HHFzPaQg07aY2le/pM3MgH2srjfHC+AZxrz0BeN0HFgmOcE/gnbN0hMPayVld+bh
+JvFFiHLTQ8/HyvcmGkHagHdcgjo+5NiD2baBWFPZ49Bj8N6XJyQKCyjF7YkOlpx1
+l6mte8APVgundg2iKXXVljIuJS+g3U6V6p7z5pkW/yU/Xbl+3GKYgPtGe/uIQA1S
+3fchFO11b/XWHw4PBQGMRxQKhS+e3Ih1TXJq5SwFp50RotkG/fLLw/q++W42bgcQ
+k+Eyww1HtI54wAC6AQyZ66pSkusk5OuQbs+dV83k5WEUnLFexImKUNIItCvM/2qq
+rEfSyd/jN5A8
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth-invalid.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC9zCCAd+gAwIBAgIUd/Z/0pB1i4hU5EGd1vPb2RiX6CIwDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZaW50LWxpbWl0ZWQtZGVwdGgtaW52YWxpZDAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAnMSUwIwYDVQQDDBxlZS1pbnQt
+MIIC9zCCAd+gAwIBAgIUPzIc4Q/DpFWUx8qcM7GOe4M/RF0wDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZaW50LWxpbWl0ZWQtZGVwdGgtaW52YWxpZDAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAnMSUwIwYDVQQDDBxlZS1pbnQt
 bGltaXRlZC1kZXB0aC1pbnZhbGlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
@@ -9,10 +9,10 @@
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwID+DANBgkqhkiG9w0BAQsFAAOCAQEAjkwutckimQac9uhNAGi/yAXquBsB
-de1p6DFyz480M6aUK5wIyVI/ar4yKzmlQbZDNkxk4CktXjJB4w0hfVjpIawybWnx
-dROwYJNcJEAT0S8gGRyIYdAmNv/DcbiGRS57blJRW/kUUlos3eLohw9TTdcqSnoK
-ym6qekjnRWieSLe6NoiJiwQrVxJOBzC45MGITNfp6PR0EyAKT+AwEVw2Ma+MiF1c
-V7Ii6VBq/9fMiTs50kHuG2AECsoT6566ErBjAgsKMpj7LuOQvTD9JVdbrafnNXoF
-a9PEVWOf3nYV/4M7DByaQokrZreRvo4D4mkjmT6PRVsg+3Ni+OG/4Sxj+A==
+DwQEAwID+DANBgkqhkiG9w0BAQsFAAOCAQEAil4HrKZ8ZItNn8riFIoViEPt1aif
+ATej/kVDhGRNOqqXIuR1+blS8VTbmKB4YA+HxyG4d2g4fZLPNbqRrNdFDIwRI08h
+EPk0ScoS+xBks5MS6EVqy507nR1XYHXRMjr9xD1L+hhMr+I42gFNDOm6BUfY2eb1
+11BttnNXk3PSakwAkt3sg8aZFLrZs1eW0EPjdbdmJPNV52ToUo0exydabJDrrFl1
+t2QJZCoz9MR+N/QPZkxpvOxjzmOCEFVHU8I4FIH2ddJVacg9LOZgh4CdLson8ug7
+mehOK8yk+QnfjoC0hlXi4FJdsNQFSL6SiCzuFlxk5AGs08pEfZQ75CvfIQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-limited-depth.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5zCCAc+gAwIBAgIUYZ2hUTiGszHMzr8RkxGdlbKmOX0wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaW50LWxpbWl0ZWQtZGVwdGgwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LWxpbWl0ZWQt
+MIIC5zCCAc+gAwIBAgIUV/tRlNSDvu7BruxM6b8StzTZACUwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaW50LWxpbWl0ZWQtZGVwdGgwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LWxpbWl0ZWQt
 ZGVwdGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
@@ -9,10 +9,10 @@
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0GCSqGSIb3
-DQEBCwUAA4IBAQAuXrMSiLplJWxV3wz5FuHl1eY1blYAWW+TohPeEi4dkTL5Dmo0
-x9RtFxeRr+Vbxj1KfO8BUeIdoaaJYzQJ9fq9I7ICxm0uBz8Wmk655LKxGf22/nLJ
-aT53NUQy2Fvl11LSCqgkahPOAT1BmaGAv7tL/bDTpgBb337W9nRaw71dX/9HhZ6K
-sMJIEBZnNTe72nW1Hi5XQfPZzzAeg4iO/l73lLwZD8SkqwjqoGrPUJZpQZP8VUDn
-sXm+yPfNrccIGvZvZIrtiNDcKxoRrfudBWOm1DMqiL8pSwV/vgaK/YMHY0LbWLCf
-SY5JQE5QC9YmPbuaQUvFvmVENWUlzEVye5Jz
+DQEBCwUAA4IBAQATRYSRBITskOkSFUKBg9DCA4bHR63pNBlEwb4L+aJYZnSdd2kc
+Cgz0x5GdoVdETz878x9O9yvNESspoASqwiobxFHsbWeW0h6eqt3LoVFI3Njt8OaG
+1kxynlyBvx3Q8E/b6ZT0hAbhum8GLqTxE10PZecvOjfDgNovCIhHk4PXpeXZNKo+
+p1yaXB4brxwVBEhv8iSBXnT60bt7vbqbJWCE2ASF2bgXTuARX1onkJz5+LWuGSF1
+ng9glpgB10r2XmOb52Hdlb9K1P4MM+Nofsb5XZ5WgdSEQnBb1b3pHLAwHXkNto3T
+E2AqOkV105ic8bkKGIMi/oCd06R0gZ7QO/u2
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-extensions.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5zCCAc+gAwIBAgIUaVwQutjwyKibejXgR8b6fVqfZkkwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaW50LW5vLWV4dGVuc2lvbnMwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LW5vLWV4dGVu
+MIIC5zCCAc+gAwIBAgIUX0rT0GAv2W7gbUOUYEYetQADH1wwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaW50LW5vLWV4dGVuc2lvbnMwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowHzEdMBsGA1UEAwwUZWUtaW50LW5vLWV4dGVu
 c2lvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9
 braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEI
 eqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6
@@ -9,10 +9,10 @@
 qn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7
 LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs
 2hgKNe2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0GCSqGSIb3
-DQEBCwUAA4IBAQBPpEWqjtdcJMdb/Otrj5JakCK7JwoQdvSZx3CQVkUwFkDK61Cl
-rQQS7O8vP5ZpIGX2EJvgDhDScGy2jDOoiioo/FS8V5y2wVoIu0/P715YX8YphHtN
-+zCsLDYVpiuYnmR9HfmTrh7z1ErmsTXvKqsOk4O6DOFy/TkdKTU6prKA9zuZ93me
-f5MdBgxrkSB1easHqbyZUasrYI2/MFa+RbcJ9mN9kLEDdaE52Le0MMVRZWNgwXit
-qwycG8OI7AoQF2L8RTTh7u4Jk0nb/TVSV80IRl51oqZQvKQNp/PCKIAJbXngKezk
-/jzKGJP7FVtLlUp3HVX8n90fVNRS5ABf+9Uq
+DQEBCwUAA4IBAQAw74cGcE+TWUij1up8e6PZJpTX5JHgpYmtZcSVKR7gFKlfLxg0
+6oB6JKkN7EIfJ85FnG0vYu0yFAHZG2bZJrqE3vUCAkRe2Q3Q39g1CBrlTkNy13pm
+U41KqojfAGCGR6iS0pjDbDqu5bIpPh/sX9bmiLBq3nv+xIHYNdRU36KaRAdJ9l6+
+VAjq1b7WvPN7mF0rWN5C35pqxXu50i2gejOxlsxM2hUEODCCZoAKAweSVO3qKGCv
+093AQ/WiHpvSjvMdFO0aA+WvnIya7KRYI1lpERJltIJPBS2CNgkKOnKonGgVpBoh
+nZm+5PMjIiDU/cIrgXU3DzY9hAXmlwuCOAzL
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5TCCAc2gAwIBAgIUDQJDQinAT65tT0ZlW5WH84sC0qIwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaW50LW5vLWt1LW5vLWVrdTAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1pbnQtbm8ta3Utbm8t
+MIIC5TCCAc2gAwIBAgIUcw4XUsGVtCZtRXKmHHReaOglg8kwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQaW50LW5vLWt1LW5vLWVrdTAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjAeMRwwGgYDVQQDDBNlZS1pbnQtbm8ta3Utbm8t
 ZWt1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62
 iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHql
 WqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosq
@@ -9,10 +9,10 @@
 ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8i
 b2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoY
 CjXtjQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwID+DANBgkqhkiG9w0B
-AQsFAAOCAQEAfI5bQgqFNGp11UG0z7q0TywMXciUTx2QbBGw7dOAFNij/ha5XYJ+
-EkqsdM8uGCbnKCJE8nSOw3+TaJK5uixQifkcDcO5Jf4Kwr/ZHXm5jEiemMVXEgfE
-0/Npv5Xy0Ni5PiJguoDl4iEr/nycJvuP+i1mDqnFG4/wIOZQ0RnttfCQGSL60+6+
-Fxdu63LrmtNOU8Cpb/eBwUYslY/WMMoEJ6v4vaMaZ6Bq5xFK19B+yKqijg1I/YAr
-OZXH6QjVFR0vqUMQ9nPK+U2VBxHpKwm3go+wb+klRqlY6hqqO4lU6ZxCibBQrcym
-JuT+bXBYpmM5AgP15ignCX9szKTl4OEsCA==
+AQsFAAOCAQEAG2jH13dTldiSOyQAtgKNJ8kv7zVK278ge0Dcihn5B1Q4JWgPCRn8
+d/RDDVajlBo3fIkQwlAnGU4YjSKDnjpSZoiU/qVmW7TGUZxY61nijgqgNMGBVO1z
+/81w17YNSHI1r6TEFAYo/NNRDCBpR4J+u3tKgQ8ZKWUv7ZdJbhHTPD+LwcoY8G07
+s9QgXisyB1KTofQAvWb4p+arjtjciTPfLg0QIf6dXOowg1+29IaGimnpb2P7yKB8
++Drg3VL+lnhDhDrTsS+VVbP7YRfI3nzTXmRTObukb9HCuT7AXacw0GbJvcNh7rFX
+2LPgZelDL5Xy/+l0osIbklL+fkcRb41xcA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-no-ku-server-eku.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAdWgAwIBAgIUJWV/6Yu+h4AF7VpDOrNIzS0H/R8wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaW50LW5vLWt1LXNlcnZlci1la3UwIhgPMjAxODExMjcw
-MDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowIjEgMB4GA1UEAwwXZWUtaW50LW5vLWt1
+MIIC7TCCAdWgAwIBAgIUSydkZNHcPpeuo7P9vZIuqBGKd6YwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUaW50LW5vLWt1LXNlcnZlci1la3UwIhgPMjAxOTExMjgw
+MDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowIjEgMB4GA1UEAwwXZWUtaW50LW5vLWt1
 LXNlcnZlci1la3UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGo
 RI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9a
 dWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6t
@@ -9,10 +9,10 @@
 FthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kX
 Dqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/py
 UcQx1QOs2hgKNe2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgP4MA0G
-CSqGSIb3DQEBCwUAA4IBAQCtl+fgAX21I8EuEuCYYSqOtcA7ir+3D7uQdpVRstEt
-OOytddeVh7Mi3NZbpIIc2nX/Ey/GLiUG2Gnb9zt46W5G9Yf13wI/EhiImqLzR2s2
-DyG9XQ79R/Yy5LrBhAgziJ5VTp6gWbCWTlpTrKeZOFYGobKuCrdaGBWMhIOWSX9k
-mj+k5DrnSrWoTsk6bI75Q/PuR1bkg8MzVMTMK9oY0Sr64674zbgXW811x166nX4Y
-F8kbVakrtYUyHKk3mKe43s4Bhur1dSemSDJaEZ6LRpu7oVUbe0mLDggh+2mX+pQP
-TmNFHg6GgXE2xcl7b5SgHvui4ijmvD2iALkZ8OSDhxqy
+CSqGSIb3DQEBCwUAA4IBAQBUaqs/EWro+OEULUWHRLBiLJCi1gA9tAHdxpisa0uT
+/tyodyY4L1xbgQWwlA13R5AjaVn1RfDnPAn6o1q/Xqbf53CGmyOCDkxTSXZifJbJ
+D4/4xF6ewsNPnERMkTjzBcrchIh8EbppoS9Bd1L3RVq1s6GOU6gVTF2BAXfpIwZo
+9bqTBc+DrCbT8+PoaZY8UJl4M7oy11Ye/GbwNd2Gm0TZU2zWdi2tsVTb82nr9wET
+BgDrwM63AdrrUQCaUC2I+vlOhuxWWboLl+W4XME22A+5t3S/+DBYyM8vf2S0SLyd
+h7NX2YzfBY9WI0r/rMJ0ubH7mbk1hypPjldbsygel/vw
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-not-a-ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3TCCAcWgAwIBAgIUNUtihcDvkiGdQhnCr5iai143RIYwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaW50LW5vdC1hLWNhMCIYDzIwMTgxMTI3MDAwMDAwWhgP
-MjAyMTAyMDQwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1ub3QtYS1jYTCCASIw
+MIIC3TCCAcWgAwIBAgIUUQAgWvrw7svP/y7EUHKfSCcVkjMwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMaW50LW5vdC1hLWNhMCIYDzIwMTkxMTI4MDAwMDAwWhgP
+MjAyMjAyMDUwMDAwMDBaMBoxGDAWBgNVBAMMD2VlLWludC1ub3QtYS1jYTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -9,10 +9,10 @@
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
 AaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwDQYJKoZIhvcNAQELBQADggEB
-ADWaZhALLNzzqTQTLVTnaREfo6fDaVroLwzKtRDZdtmA59bq0JqP1KOhEq8Zdfic
-9NjyXAFIHO7wQa5LuaFHP6VZFi3XJ+qUHXjXavWmTfetBZNqWBC27yD9hcuizFk+
-mIDdKgmKeGXgi1VSFYWnTVmylkArS7tmR/d61KZswBnPQTx9YdylJ/75viiTwy0T
-50FYOjRpifgY9UkzWtd9s75q/dHwj5HhsYbEIYVMZ2SCaoJ2QCZMtO7tBK0NYpwO
-xkqBsZn4Y+WQQ9TRiMpLH8dP6p05LJq749uQ6dFGZqwxbF8YrFqZE3ZjMvJw3ATY
-XmdaCZVxJs520u1pUkwzSV8=
+AAB8UNQ3JeAdPqtNhn1VFnZZzpLYcUGq1c+C8nQEOCmvy8s+QmdKsCKaO449t0fM
+Q8JyMuuH/ObHE54YzSEg/FWNrnO6hzTf05k8bxoUsFutL+xXvsLa7VGftz0VL2IC
+8xlYMvGDIZ3TGdU8B9D0B72Usn3nZvf+vbm/wZ5Wj3Bl//Fk8eqcosGJ6j5cQ1Bk
+DUQceGm6pRYtBERqkOPct9G+FOrd51tZ0+vTelJKC8v3OfK8pGwYqSjonhI146bp
+djCKAZsU9KynW1BZ61E0iU+D8/8F1ELi4SxTQtHeOWBkYq31mYnZO2ze3XYAE78C
+kkbfT9Qy0fIb9EpNn9FqOtU=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIUUX6br6bMD7EJsxLrybZv5kWlzh0wDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTaW50LXZhbGlkLWt1LW5vLWVrdTAiGA8yMDE4MTEyNzAw
-MDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAhMR8wHQYDVQQDDBZlZS1pbnQtdmFsaWQt
+MIIC6zCCAdOgAwIBAgIUFTa2zYscnDR5ILK/7lqO+cxtDUcwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTaW50LXZhbGlkLWt1LW5vLWVrdTAiGA8yMDE5MTEyODAw
+MDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAhMR8wHQYDVQQDDBZlZS1pbnQtdmFsaWQt
 a3Utbm8tZWt1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESO
 FtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVr
 amRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWka
@@ -9,10 +9,10 @@
 VbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6n
 aOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHE
 MdUDrNoYCjXtjQIDAQABoxowGDAJBgNVHRMEAjAAMAsGA1UdDwQEAwID+DANBgkq
-hkiG9w0BAQsFAAOCAQEAX9yMz3yrwxV2qsKPfGIpxTPGx599bn8xjjxpRMlsgugj
-9CFLT9zvPpA36hI6IuJAaV+dF9TprWo/mRT3Bxrm7jvs+ZEhZm7n8oeSWouZldU5
-NLQo0wSpPDCKEiP4BOyP4rPqBSak0mz5VQiayMDOrFqCihpK83MMCT4wj9jUoA0U
-lyu1YhaYSVjl8fwxRI2RYIy0uK2yJBINs8Nr9KVEvkuHpO4nMTMAT0oqxGfo3DF5
-X/zfqb9KISM6m5kiiTT005snoxFYocRAuDNdRLXB1n9matTg1hMcBO0Nl5Zy1PX7
-x74zbWWu6f4e7dH5etICcTSO16I+r7dHSIocogtpFA==
+hkiG9w0BAQsFAAOCAQEAmTBGZeCTRdr342Ff+rQuMiGwBl9prO45VGzGcb+QPQVF
+w1bubYX7lk9UlKNZZE4ZB8nBFDSNf7kMLn8T6MI8YYihOrUF1KxGCKmWgcSttmg0
+kZS02nrd+yVe+iYaWEK/VN8jQkyUyM5u8MJK0k0EEnljjnNs168I/pAWgcNf1zls
+1S9D3azqB0MFHe1CQzRtK6iOjE2deZHyYBb6T1uH3Gm2nm5kkpRgJ9mPGbccJS7p
+q903lUvxT7fmAj0ixaDABMggEU/hLNxNrCiV3XhxpNalNnBc1UiGJiPZBkHdSlAl
+nA0Ov7XuvCDmty7h8vWyUfZo0gchx43WTZImokBz8g==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/ee-int-valid-ku-server-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIUP6LtYy2P5RbsyMwB4hkFUQailfAwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXaW50LXZhbGlkLWt1LXNlcnZlci1la3UwIhgPMjAxODEx
-MjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowJTEjMCEGA1UEAwwaZWUtaW50LXZh
+MIIC8zCCAdugAwIBAgIUR3XzgtGCKrGxY8HRXSHlPF7GxWUwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAwwXaW50LXZhbGlkLWt1LXNlcnZlci1la3UwIhgPMjAxOTEx
+MjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowJTEjMCEGA1UEAwwaZWUtaW50LXZh
 bGlkLWt1LXNlcnZlci1la3UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
@@ -9,10 +9,10 @@
 N9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0d
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgP4MA0GCSqGSIb3DQEBCwUAA4IBAQCKqQsuEiR4iqCFs41/+PJTSy5WoDtCorKK
-UqgwFWXA0KC2JuLgaXPQjLAEnD65Y2mL9WhtNC1JjRMo9wRXfha0/mAZ/JjKxTmi
-dN+rp9z1MbWSvfXBvlkqTPz117IQh2zPEqT8aD5mz9gLQwMwvLAqnNttREVTIN99
-oab8V6WnVWHcHBP1TUm2JulaCJJmffSWSefKKE6UlB0uMU2hbqGOX2u+XqyJTd9B
-L66d/1O7jtytncf5q0B5SqUfiS4H12rwydDX63oUeMk6/Ud13d/TvhP2jRvVu5Kb
-HUK3qLiigM18+zog/j7Dltj2B+awM3wzFRLJJwMpp6izrWASukyI
+AgP4MA0GCSqGSIb3DQEBCwUAA4IBAQBE2wXCNaiIiuKCv3PV/jHaYR1VDcc6Ypsp
+GrClISVncIlQ+vav7bRCBfNvog8YycfP/roevVWvvoBwryoHWBNj/g6N3Skrn3+P
+510oo0GDJrh/X6ITRk3uqu+6DIGtK4FJ3IcKL51zJpyuOi/YbH9m3RC5zb74EdNJ
+pT1AVdLkwn5JxKNQ+ydXuIskYtvyNQt1xcv3k/HgqBKx3A14MsKBfuMoJBkifxVh
+EPgX4Q5rrSb9Ztdmhux13UsVvt2ECuF2MGW8E/VgKh/XcXBh2WNZ6xNIiPTBM6S8
+RGefE1lVOeVlH5a5h43mI09JWxISQr0wTFvaHrJhWgQ1gsIRgwFj
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC2DCCAcCgAwIBAgIUF4aHwXIu98qD+ppTYdyvnZhqbiowDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC2DCCAcCgAwIBAgIUZzy02i7tvAs/6RTdJfLYIt87D9cwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHDEaMBgGA1UEAwwRaW50LWJhZC1rdS1uby1la3UwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
@@ -8,11 +8,11 @@
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwG
-A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgH6MA0GCSqGSIb3DQEBCwUAA4IBAQACZ5hF
-+Esd5BKzlIfsVD1vXYOHwnxGsu8CYaiI86Za4RCYNSq254wCk6n400A1nnVA36Vj
-NG4uNIt/DNr3JI2P7YIXOD/UGAkVro0pHGO4gmivdnicpldeThrb2eJd9lgwcBni
-cOTxVA+coFIN6V30VPz0ztLaUW/5satbLQR1U78M9K7OWXX45lbM+KOc0UTVGrEP
-oyzZxXLMWaRyIglNPPDMVJ3iwemxpw4jB3cT9HPevdZuF1OkbT9rJ/UDkLBvSgTY
-E2JNU2B14uQPLF0/AkNBbmOnwpdSwrGpv69WvnezJmjuhfwtXcIJgEwyJENTKLdT
-SGl2+JT1zn4I5ffJ
+A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgH6MA0GCSqGSIb3DQEBCwUAA4IBAQAAHnJc
+VICzmnlR5N8AZlWrRHq3cye+ScZEQUXZRwxg3nLPIDwoNu0bgVAcoY2slrQEQ3d6
+Jq5UyBh6E6gjy0p3dVXO5bVlTTfdpoN3TmLUNERAqCyqRUw+tZUqqqOeLi8CT3jI
+JlW8usKSP4NaFZODWifLPQQ2DeQoBZbn6Em7YwalGqnA3Izb8zmMxPWZrwgWmYEa
+PG50Q3oh9j2dnkR4EOU0saT+gen86NwbvHZLSyAiIGH9/IJw9b5YvetZNRQ+wVuQ
+U7im69QqlZSTeDLq80YA2CCcVL617oKB+H+ChquMwnmTvviO2qnM7WcZK0Zqy9F3
+LpP0Hmpv067ExIdk
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-bad-ku-server-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC+zCCAeOgAwIBAgIUKQcqdrnNPJdQafnYn4N1r0nwUr8wDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC+zCCAeOgAwIBAgIUT+TsShZ32vzo05KpLbrZpGyUbCkwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowIDEeMBwGA1UEAwwVaW50LWJhZC1rdS1zZXJ2ZXItZWt1MIIBIjANBgkq
 hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVK
 tOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7N
@@ -9,10 +9,10 @@
 l62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYl
 nauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozww
 OjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIB+jAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAElmeVDS40VTSjH8VEWyJXRt
-NXOQfvaURBt91LYVRROMAjDM1IQYRUl+0oSzUDu4Y0BBHYhZGZK3d9cmP+3Da2Hi
-J4BZbwarkQd+irdbypQEiBU/AoJW2AfJCdK9XBYld8XaliB7vN1hmluGB2pCtmZF
-zYh4IwPj/fimb85gnZ5EiI+ULjQCTkNfdUsFZsQvyungKGOgoa5ZSnbNiDlDgRZK
-lgjGkTOm7zpsYKmGkNzEionT3G8SU08dbLiomNroDSqPXBL0WDJrWyvuyjtOQZAc
-NGtobP98yPBvNHTAo0mq67dBuyTmfxL0uVOwwspcv8QYmnI5pe73I8pxdSYZMQc=
+AQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBADETpYdt9P1ael7B2UilTCIu
+zaXfSBUZHAKidpNMENdqcYJScyLTrUSOsbHKzignTCoDN3NHVd7o/YJmV457yRKl
+nvtBaJQFd/9ycLtEiiksxvca1Zp7QfIeRRzspW23/n+bPa6CYEudbIp5KTzgi0uL
+1bEg52LoEM+ikrpT1QdgQ+q+v1Ao/BaybTumC+7nC3jvGj4itLsYTIskaacWEf/K
+WSFZ/K6cWIgKS5iEI+fAhx2IyJp4kK1jdIvmvtCiOG61r2f4GkxDkrQ5I2lvLEPF
+wS+S3scFNprbybPOpI7GAqSsewHWu+Ge81G2M+Z1ndBH9oV7qWhVlpvf2U/yXvg=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-cA-FALSE-asserts-keyCertSign.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC5DCCAcygAwIBAgIUCSMxSCkkSI6G9zOZjWfvKvdX7hUwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC5DCCAcygAwIBAgIUWz8ZXOO6fSSbmQau3JwsY5zTrDMwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowKzEpMCcGA1UEAwwgaW50LWNBLUZBTFNFLWFzc2VydHMta2V5Q2VydFNp
 Z24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
@@ -9,10 +9,10 @@
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
 Ne2NAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgH+MA0GCSqGSIb3DQEB
-CwUAA4IBAQCIVBM5pK9xBMGM2UHw5sPyzhOE46n4i0NK9Xi1Ipi9HRDEF/2cnXfT
-p3TWhsz5/qVY52pdnUPd3k/GAdytT4SeR/fhNGi+kCFc80Ep+H4eofakmu9i3R/p
-PK/v0+dwTlNhL8uM+KmqaISnKuTn2MCEC3JhS84PgdNxIU0IoQlYmPIY42uyu7Ox
-khwmXSqkcboT9DIMCi0gIwYu/EcN84iWBCpEIpu8EkjS+C2HN6LrfrhcyHEM0Jh/
-QCqV1Pc0xZmLLLl2p9Q+Z7uLg+8CN1RfajpTk0kWop1KLDviJsrfZTZ7gy2FKVip
-ueEzbvGOezszpiq+3+Ep860frIgj43sb
+CwUAA4IBAQCv+2MLK5Sm5TWC9WmEbavSz9bW315LIy/09r6NFaCQksbZzZ01b0n7
+jsuq6ZIhVfaMepUF1Fc7K5avfCzyJlPiOGsm9SmfT4XFIX5Ugu5mEAGva8jYDeOn
+3ie/VzwvQRPmb7fIDQ/in5siiQ3OcL3f7KaOZQM/zP34pxh2C2oZYz+xu/byaLhb
+qPXoTM8wnqVeNP7wqZDmv7ZZFXDT0dEKqCRs+G3YzPmfk/9tBokFla7jrrtG1vHt
+vWXmeRfJPzJq+bDDJo9BmzHjPWYTYajfDFTOs24AbNacZdyNdNnRLgXqKIn5slk7
+F2mjSU/KIeiQB9nGxC/nfqe1uAR5MdtY
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth-invalid.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC4jCCAcqgAwIBAgIUffoa3IHx6DczVfeVXYibFxONDg4wDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaW50LWxpbWl0ZWQtZGVwdGgwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowJDEiMCAGA1UEAwwZaW50LWxpbWl0ZWQtZGVw
+MIIC4jCCAcqgAwIBAgIULycRMzIhSjpkHsE2X111MeoH++4wDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRaW50LWxpbWl0ZWQtZGVwdGgwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowJDEiMCAGA1UEAwwZaW50LWxpbWl0ZWQtZGVw
 dGgtaW52YWxpZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahE
 jhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1
 a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1p
@@ -9,10 +9,10 @@
 2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcO
 p2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJR
 xDHVA6zaGAo17Y0CAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsF
-AAOCAQEABwAxUHi0dEG+onJh9fvKecOYHCnBmtMlEj/eawx9nTAO4AgQDJaIpi7M
-pjmJKUetWI3bIsN6pMytv1v+9XViAQZomE6y7As7JlhWzy7qcGv2M7464FI3ZHLJ
-hC3aZxUmFc4a3DfZtzPIGllyzGSATcAqPJawOprYlHGTOTBmOTQauI4DYa/fSFUq
-K/4JK2owi+usN9GfJYsGif0GRF5lPNXmZ0p/iQaWgtE8k1HUEwyHH9mupqUd7vFE
-fU2Cya1XnpR3KW2hsykW55GyJDJ9q65i0dongHdirE2AQuUEAUrKNQbqxpxjtfQG
-bd041yo6pVKtCTioIZNj4lksuAnk8A==
+AAOCAQEAQ20RfnhWErcr9Bvu6mjwrmB7WGXO+vvwODj2IeG+r9y+25ZClHYp/87p
+dKUknyhmQ7O+lgKDp+lzNFkt92JaEW2im1gBPFN/ZZi/WCOS6y+s3r/2Ji/+6BHr
+R+SXvrizmpyNEzlAHOiG6bKv4UuECM4kK656tJmH+dH0sGiYSdmhf9lwM1m6X3r6
+kTToN0G8rUJc6hS3WuVRoKNrtBZxq7f0Z+lcBtnnCH7PQc94Sm06bauo1WBGE0E+
+1CXmL8M/22hDDfyI1Ve0NMmrK1YGRCY3YD+A9dCnc6zM60YtXAXhsGA8Mh8mdIfV
+8y8gFBiMrWlNnWB/AC4bea8HBguxqA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-limited-depth.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICzjCCAbagAwIBAgIUP1lSMdnb8C3hWgb5GxXpToHHvlkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICzjCCAbagAwIBAgIUcylHQcmSUhRsK5erE0SNaPg0+okwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHDEaMBgGA1UEAwwRaW50LWxpbWl0ZWQtZGVwdGgwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
@@ -8,11 +8,11 @@
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjEzARMA8G
-A1UdEwQIMAYBAf8CAQAwDQYJKoZIhvcNAQELBQADggEBABSSgRW+xcSKx/vh4DCb
-Uh1X0zgj5uZgxzerMYcmOoc5z7z1YvAcs6nVQ6NdIwExl0uYYIoU6NHLn1wfeJMo
-g49Ks8cdttR87qEwKn3YLtVgRheQIAYNhZjPxXBXASybhmbg5ZIeSH2pfhrJ/0HB
-sCMNoCh7T7SdyXmNdx/MSjB7ATbWO2DczHhHodRPWxb9GXXM4vzvjK0BNcTazADO
-87ma0CwINrGlFR0t0dAl2w0jpn2yLIiZI/6+mUk9eU1rrCHbWkXbt+8uuwZKog+R
-77JA1x1ZNFt71Vvrx26/fZ+gEoMRkQ5/u7FP/vYC/wKp8dL7G0wZYvsh2sXmWD/p
-7cQ=
+A1UdEwQIMAYBAf8CAQAwDQYJKoZIhvcNAQELBQADggEBAHHwYSdzz1ScKu0ShKs/
+9CVPkIuGIYrMpyBYCarzkQOs+bQIV91JPpoUt2W6enHixZ54M8bdACKYC3CnBiYe
+wbPcZP0thQB7Sd5yHI3uNT8JSvinVv2EXcCNlZSei2Y+agc8d/9KMYvBYMG7SMHX
+Egp5L4xrwkKrWOQ88DnokFMHf650Ddq5A1b1NFBHAjkRIQGhjRnwlxuVGf1cAle+
+C6tDK7ptHQM5CtAEdzGmf51MoErFRH0RCxJmUcbGnHTiq7HBMWw6Q/8PMTUsndS6
+W9igwATnCJqLpynZ0SvaETMa42JFJ+goSOYKVZTy2/uhvRlW81ZaR2E3lqj4W6jB
+Svc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-extensions.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICuTCCAaGgAwIBAgIUX+ghWVTQ6V+7xAqY/EERtzd0RcYwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICuTCCAaGgAwIBAgIUYcfJhXqUXKOGw+E5MNKdPih6hZ8wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHDEaMBgGA1UEAwwRaW50LW5vLWV4dGVuc2lvbnMwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
@@ -8,10 +8,10 @@
 fbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZh
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAEwDQYJKoZI
-hvcNAQELBQADggEBAAjaLbevS/xUkZhx4mFbBR57hf5fH5lIW8EZ5MXP+oxz5itI
-/imfTMq5RhG2gSAoAHyHl4lqVLH5seyRkNi94wz8JQjoQzbzPt+cWlwu1VX44NuQ
-F0R6/aG/z9VTVCIgM3k/xRT9w+qL+wW4XyFlMGHhiljNi2y4RNclOseMxKGiKiY7
-VF/VnQjKCjnDcYlfot7a8bKDqNE1ZVRmtDhI0PfjWt8dp8udxuXhPJ5Pn3bteb0d
-j9BmC3GTAGGzzWX0+XrH0CD6MRe+V/NOm75Gt7ZVaK15hHZi0spR0QqN8r2EJlUH
-bYPClyIqBP2PjfBG7liQHbFklnLRPgqcRroMCK8=
+hvcNAQELBQADggEBAI7R3HB8uiokTZA8E4dciZE6IQXm+cwTwwC41KXk8gKwIdXN
+wuJiYmpFJS+ckS2azp8prxw9oGk1rv5V3v1b3yQ1js1MAEOcGlhFG02OMoEegOVe
+RI5p1WN0A6S8sf4HwvbyxBWgM0J+uFez+GKpX2X/UVGtG+YI9yZ0x5BGdUsdKbvS
+KJVgYmAjOg9wfl2vM71mfzMTVSHk7Nva7c0qjC3tNtGpILWrZH9tyccdJqSRTZzO
+Xge+BUCe5hiTpT+sAGij6ESR1QBe1F8U2QmQRUhy3K2s43JFxWu5gep0XBY/p6kR
+6EXpbTn9mWFuRg7nLEcOwYtbAXA1mNtH9QXw6PE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIUW3C2BUZ1nu7784q3yhty1eTnV6kwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyjCCAbKgAwIBAgIUQXSt+CjpOfyWdZcfjuLpGReDI5QwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowGzEZMBcGA1UEAwwQaW50LW5vLWt1LW5vLWVrdTCCASIwDQYJKoZIhvcN
 AQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhX
 bCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQ
@@ -8,10 +8,10 @@
 uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFb
 t+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhO
 NsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMQMA4wDAYD
-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEADGeNeD96QhU1DU3hFHei59k6
-TW7G7wpRCdr/iQ+jQ7Vmqp36IsjFTXlYRGsHI4XDGxuUOkkUYf2vZPJAxias53tU
-esg1tl0UuFDDcjAHWRdTHitDqSqJbqMloitpvDtIrR/sLjm5MrYTMoEsWSyUeC92
-gEOu4qoj94RLnl5012jBKhYa+eCkMqiEa9O/CUdCvScNoYHOwecekh3GHP+OzUiR
-qAkAWe3smt7JyU29WWrrp6yfPESgeOGw4X1ZnJ0r+EPSsfs/PhOvtRuZ5GHnvQC/
-TVtFWAPjNTU5BYXLUic5+l9uE3iIszECQi/SEbvXFTT8PH05r/q7HXoAhkCkgA==
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASpnks6qV+XZPFh2HPqCPcm9H
+M4zZafwvx+OvwALtsu3goai06A2z2lWt/uGDNa773kkQI8rRBieuwjk7mUgAZFhm
+HbcGmVaih01VYVrPzr5iKhoY0p3RVDxtPJusy8OXv4+jPEpQ8SnIUIPzpoSUhpA4
+ejH/rZNOUuKnz5aI01mmAq2Q0eUlQLFvjJPy4qfJ7R2vuhDi7T/Op3Fbd78a1A2I
+/411XZ7rpjbh2tJVHI71kpaHGXGeppciYxPwjRG+hlebKFD9NVXldCcvVzy8DNzu
+FjCMqGOsHm87uu6R6ZDekW+Zxy30Ui2qW74b06nxlxphHgO0LglFhwwKVhs3Dw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-no-ku-server-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAdWgAwIBAgIUM+bEKFpm7b27ZB4AE/fZ+H9ljZswDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC7TCCAdWgAwIBAgIUe0/iqtgXpUCqSBbTkk3j6cHrF40wDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHzEdMBsGA1UEAwwUaW50LW5vLWt1LXNlcnZlci1la3UwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
@@ -9,10 +9,10 @@
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjLzAt
 MAwGA1UdEwQFMAMBAf8wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0G
-CSqGSIb3DQEBCwUAA4IBAQAtYRdp8SzJoFtEn+0ArFuwZZGBtwk1vVPSG7kzRlcR
-yg5sAYZQVAhs3WqsRUSTQg+oPE0V28PWtforpPqG0N6Vjcuq1Wc0t1r0qof19F8/
-5KLI/9lOL0mC5sXPKErafzznia2RskgiOfbYYhUCJHzoE0ZERQ7CHNh9kN2t7IDD
-YXodBp7WvsraEb+/RmDwWPu9T33F5FLWg5QruTzEcA/pRCnEVe4WGjlfSFoxfOOA
-wGFzKtflmwmTW9mG++szNg0go13JB55Qvhn5e5uQIgfIhk+vOmcl830w7Sej9wyX
-0R69pfxeP2OqnHbaJho3QHhL1z2bmRHLzcdIfppTdklt
+CSqGSIb3DQEBCwUAA4IBAQA66A/sfTMBP0yPBfI4TtxMv1Af0gpOchsekkY4lUxg
+IgsSvqjrlW/r7oBVpucIqH03wlHZkoiY+rl2hokh5fVNmztaBSaSQSdzrwW7qpsS
+0OFmUmPPcV4Kjy4EaaFXk2diNP/xCENwci6CN6iVvTrHt1Nu5DVEAbEwQVjN2Lme
+f1prvxAcqkyoJqHNQyS5nr31Bc4OdBFEJJ4ZjMvJV0UfRH0fkwhutIW4kgYgHp6o
+6BVpnDyqEN0yZaNHIQ8VP1hl+gSoHYmhX6BuF6vI739ACKlZXMCtGEEOi0o/oZb8
+GMUgv22QZFC5JMiWwhbcN6LJC5XpGEl9X/FwDndrv2JZ
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-not-a-ca.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICwzCCAaugAwIBAgIUL4U4rMFkZYX70nYUBsiIsPbgnWkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICwzCCAaugAwIBAgIULcyFCPC5AqS4vb2uiw2vfP5d52swDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowFzEVMBMGA1UEAwwMaW50LW5vdC1hLWNhMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -8,10 +8,10 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABow0wCzAJBgNVHRME
-AjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAzhT0WXVpMVaz4ej3Vpxp5pP7kv6ZQ53+g
-JqdDVESLmRKjQBA19T6R1UeDshxOLHkYVogWqz9UT8naqmq8co238jK/Vss4QRpK
-emx8dif5YXaeoi1xuWb9sjWAMJV6/+o4w3y0QuyTW65bWRY+iDqoweO++vcaLTcj
-0qo10V+asSAYSPeuMQrZq9BQAcC5wmiazey/NKyeIIxO4QN/o6bHPpH0zs6bs+Go
-KTyz4bbKY6ZpfiLYlavQPHuoioioTyWTEJH+y/KIGEJ7hFtnY7k915v1Dd34NwE5
-DBHbaVUhpnNQE9r/qQdcSrWPEfa1SzspQib4/YbrIQyLaFF2YA9V
+AjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAib9DQGbyyJ/RSZet5VQiZ/1WLmOZNDU63
+1tmavPbUWtoV6ac2nvObfMBxiMfog51CyS9kys9umj5i4wBOFc07ADPnZvZ4JzCH
+DMJqe83Q9DNMRqiUFgoioLmZM4+t6gOFdfv0Hcm1/dPrT7PAX/68aa2OP95vPrec
+LTKHirbpV9BxgH2ZFWmiI/iMYlEJpb9BcJfpAV9VzmOAoXwuP87qqxdWUhMuE3V/
+Jopnz32iH/j6HEsmhG5cixmiDOoVcuKo0EpsZSAV6QjQJWZ0KYBfnFwqSkaNLAzd
+Tsql/80wHPgrlb5G0na1VWqfzijcWrMM9GwYu2nliE0b8Erl70Wc
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-no-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC2jCCAcKgAwIBAgIUM/CA+G5KePSMHg8ADpK1SGE1uPAwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC2jCCAcKgAwIBAgIUAQgTd7cj4mynq7/pBIjhOMglEsUwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowHjEcMBoGA1UEAwwTaW50LXZhbGlkLWt1LW5vLWVrdTCCASIwDQYJKoZI
 hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
 9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
@@ -8,11 +8,11 @@
 kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
 lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
 kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBsw
-DAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAA4P
-HALn4ZjUJoeKD4xNktkZbwmcaPIOgI19C+W+fJDAbZG4ustYofuiG4TiuddkXld7
-yJh1sNgX6E1o07AsprRW4aRbVReen12g1S2zMlDjX9Nd3aU2WnfRIrvBojVED2k+
-ZWStyCmTqTjOs1K4zESQ/k3bBudxoQRYN+Wmt0kTwYhrXELinJ0gJxuRTLf7ibdp
-jtjEw6Pj+aL1An7bAcDBVN4AyM33aDP96d3z4SDQmOKMKGS352h3mhcApELl1Ar6
-/lM9OGHo1x93pekCK5UfgkqANFfxLxytAhv8CwRbV4BvlabNCYf8hFXqaztMAdLt
-bBQsk2aADR3cj43joWc=
+DAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQELBQADggEBAI+T
+Z5fdjBIEKwA7tLJHWAkXLYYX2/NIjc3ZS5J1+LMpQXA+Rmw7T8zZ5Tecf7wvHJNd
+qsjNFkOx9IkV3tiGPsv7J3B53Kk5qJ1LR3sNj99YW6zs0SpETYbVc0IY49ZP8eOA
+BMS6eGrkSYgXXTWN6fu83gr+/QB6vCri8xkOw7NM0gnfoZhOAXmKkWILW3S1Arj0
+E6FpW88Pww6miceSa8ecdc4QL8qRIFKDZTXCIwykjeOLZgw3JTOr0YYGO0uBjspj
+ASheUaiNfEGbLIU+PySMvgX3RRheSDMIxeoKCL8Wg5nyIg/6yE5vXipiTexqk9rR
+0z/z588qvYn2g5AqUB0=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_basic_usage_constraints/int-valid-ku-server-eku.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC/TCCAeWgAwIBAgIUUZSfep090KVdODoaWadXAaMjIbQwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIIC/TCCAeWgAwIBAgIUWWZayMVWHspFSBkAYaO7s8p84NAwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowIjEgMB4GA1UEAwwXaW50LXZhbGlkLWt1LXNlcnZlci1la3UwggEiMA0G
 CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erk
 NUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwC
@@ -9,11 +9,11 @@
 HGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m
 1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGj
 PDA6MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgIEMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEACpEeCAhVz6Gupseiqjos
-zNKok7GMbPM72toiE+DmfMZkEEu21AgMP1TNkeffSX9LVvy7ebJdh9Ux05fpCO+Y
-VKL59LnAQW31qN4rF3K7+iLIbKTZpkVYc3XaEU4xq+m5uNnMXzSfER11TDRh9ppQ
-cbRa8kc3j2AH6DSLvnJBYJYX8UPp/2/iYE9EbpXhCbiS27XS7vJ2Bq7nBLA2qkOW
-bjh3Ns9N+t+Cozu6JCvtb2Qjeg1GGDc5wZzfW1ojp89+OPIUyZU3XgPjx9QJUvcb
-cCc68LKLm9PCZTiXR5VsGsvXDFUdH6MN+dHfHxcRNIe3F+xlLS8M8/IYob6tqRp9
-VQ==
+BwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAud9bDsVnUs48CsoNie24
+ZnxZPn6RJe6JjZUDdAYwVVYVzJz4UqZF2kwwjXm0Dzs758WdbqgP22bBrs6sZZBI
+39Rw74d2apnh8PpVzrsKVQSQqh8RAk38c6MDDRhYo859sTW2/Lvyo2PHr4wIR2jH
++awmkP3EEq7c1kt23q2c0u+rxKR20pYjJJ0br92b/buiOfjdA9q0pF/rRdm6/U4L
+ApUHYzyXiuEoekLbLf5tIL3Xel/OkaD7jBrrEWll/vWj+RBI4B33LViDJ9lMjavP
+KJHDM7PbzM1XKogapqmfqxYXzyY+ZtxurIXTkyWuuNfINd+OMOzRkvwDYkATNEGD
+OQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/default-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/default-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/default-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/default-ee.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIUd+1bKW1mbe2MwpVKvm/QkyqvZlYwDQYJKoZIhvcNAQEL
+MIIDDDCCAfSgAwIBAgIUTw97bCabpmjf11gbMSrUIZkrl30wDQYJKoZIhvcNAQEL
 BQAwLzEtMCsGA1UEAwwkaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRp
-YXRlMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMBkxFzAVBgNV
+YXRlMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMBkxFzAVBgNV
 BAMMDmVlLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
 AQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptu
 Gobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO
@@ -10,10 +10,10 @@
 HSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcx
 uLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozIwMDATBgNVHSUEDDAKBggrBgEFBQcD
 ATAZBgNVHREEEjAQgg5lZS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEA
-PMVYxpKJnYIBXJ43W6Ib028yfmJzCTKqEcjjXbbmdK72JuV20KE820AgDu3kuBUY
-+W7ErfavZmMqHBLy9fTIULK0DbFnJ7Q5f0DirSFsbR5M8bkOo7tSZz73GBj5COOn
-+WB8buUW3E6KqKdCGHoam+glSyye/896dXE9vZFQhhO5LMsr2HThl/i/E84WuOch
-eu2DQv5hRbOTxq+U6OmkzrIezTpzyTqT9cNV9XT3U6jIdrl3FMhEmAFyFIZ9jc5D
-GH1c7RvUU4uMBvXXAZJTBpG0sriGPWM7NTewnOuL5dhTlrFGetmFsH8v/JhQ58tm
-TrVGP/f+SOeqwaG1IGj9PQ==
+J7Ff5mE6qJuS+kszRFBNnD2OBj0ss6mrayQCqqJqeM01JHRFJ295iDvxHMbtzfYH
+EMSytow8dZ8vWoxPSDSr3TV8kJOYYKXjW5ClYi6rWwHt6aC9zPTQ87AspBBKhf3q
+2jX+fPoLIKzauktAnzYApvyTTe8fNE/LfLHpDpR2ipQBKTz1J2Pw9RHcp7WxC9rW
+6PTH40kMLD2F3fRYdrsJ37nIe853MvUsH3Fa6oMfGxpvIpN3gJtj3w0OPj8rWq9X
+gQbN/56afzE4zG0HhX+RP71LXpn1US0twQfP0GM0q6xh0P7pfWT8Z7lHk1j4j7u+
+3RU1do8+1Ak6TLrMnfkZBw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/ee2.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC5zCCAc+gAwIBAgIUW/Dnw/l4fff6/4XUH/s6OPogkW8wDQYJKoZIhvcNAQEL
+MIIC5zCCAc+gAwIBAgIUV3PLWwVDtiZkBpRLWYBIrcA3uowwDQYJKoZIhvcNAQEL
 BQAwMDEuMCwGA1UEAwwlaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRp
-YXRlMjAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAOMQwwCgYD
+YXRlMjAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAOMQwwCgYD
 VQQDDANlZTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W
 1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtq
 ZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx
@@ -9,10 +9,10 @@
 t2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo
 4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx
 1QOs2hgKNe2NAgMBAAGjFzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3
-DQEBCwUAA4IBAQC2OwW+8cJo6VAcy+usJ4ncfvOsMqCFD2KU8qX+IBhSKRY4vGrL
-2kkewzko2uuNyaIoLKqSHD3Z3tQ4LZ/C9NV0NzV3WkbqfWBF3YdY4U8Iw8VFprBF
-/AkcF722pHRAOEGAhYnTWeaK4BTRGmfxu1WsJyTcQVZoG4OpyX9Y0GlA3KADDi4/
-+Vct/g6wRbVDohhiOWVPbBiCoTZ+lbEn9hf0ypmJx8G5QrfwkSmrxnDl/uwkSksU
-iP4GMC6pmyaUA2pW37aeEnho3IcKz7smY1qPieU1aSjXBaPIVWqk79ahQAiwztM/
-Tk0ffUfR1TC+28tLYeEEhnA1swMXQAYpE7a8
+DQEBCwUAA4IBAQBSxrC9YRPkmqYz2MsbyytjlG/f0g2uVv78Q3yR0tVsGW67VH0l
+X3rUdqWXCrYi8NtmZjbwx/EERtXc4dLXmJ2DEaHWPygQ3zAiKBAEWh9COaz7b11/
+wHu3uZVOXsWKqt212FpjKob6n4ceQu2RlnYYX+VVSKrt4ct3ph5X31D/heerNvLp
+Et6UETIAY6PhC982XC3wn/r0ykIPQygXKdMJ3Umvq+OzOObn7RTX10EPdOmyU9su
+bmpR4oYBPB71GWGoeNpp17swOe9BVvQvIcnEwiWuVeWhaZvFAmrFe1484PnTgcjg
+kLtYKtzg0Z8t1jWExmdb00A8CP92iHa2HGl+
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int2.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDBTCCAe2gAwIBAgIUX8XYbAe9m9RmRft8BDZOTuIMgRMwDQYJKoZIhvcNAQEL
+MIIDBTCCAe2gAwIBAgIUb7hTHv3uBY6lDd0XbWQLu/+jjIQwDQYJKoZIhvcNAQEL
 BQAwJjEkMCIGA1UEAwwbaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctY2EyMCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMDAxLjAsBgNVBAMMJWludGVy
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMDAxLjAsBgNVBAMMJWludGVy
 bWVkaWF0ZS1wcmVsb2FkaW5nLWludGVybWVkaWF0ZTIwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
@@ -9,11 +9,11 @@
 YXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7fi
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1Ud
-EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBLnXv+X/Ly
-FouMiHwrNlRkOTfttwRxTXnu9f4ZJ9Issf+blp5W1F2WlkNZTCBs0hOjrPrN6ofB
-0Wk5ZBpxhakC7YvOvOGLrNLg7TtJsnGLKQgQ6TM24hA5cNmaIBnk3hIgfAd6n2a0
-YRe3VwCU4V28ztTYNNVzNJcJIktJh5ODRQGJv8ZAwoKAM+O+pbYs29vE0i0T+SOi
-lNU6PoINUjKYs/JeaqSAxRpdgVIfuDKGbbfLhagqlhsk/m0tQeX74cd857S3Unk1
-F1+WOGcCKnMDMAEEKXWvgA58bM+81yRM4xxvFgY3W9X2dEnVODbVZs3XFCfeFcoW
-k1VX12pRYvBL
+EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQBJYzhJ9SuX
+sqKTHwITcbGmv30f1CFOE23Pwf1KSk/Rqw2yx7CCeobGpLQUlIU72lGqZ0W4BVGy
+TJDwGOGTKtFYVtYddo5DXVuUREUcUeRzAwSZwEhm2ANyEXypRffmQNR+h4VH3skX
+2pWfNH8TAes+z6Vz4HCkEOqa3uBUe9GMjbg8Gtrqsx2Vt3hJrg9dB2/0I5POMM95
+9nRtl6ZHx81DMccy6YT/lhsBDIA106u75THS45yuFNRtzPaL06/7iiNFjW+upsf7
+3Bg6x7VKBt2ZGFebHFiMnGyVPsMyXQw/i1w6yiXD04F9PHdYjMtY90hH69aGhQNk
+Lgcw88dDaKaL
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_intermediate_preloads/int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIUSZHzRC3DhryQmCeA8McE+HkV420wDQYJKoZIhvcNAQEL
+MIIDAzCCAeugAwIBAgIUHyDRZ9EprKjXteNSxinckLtLUqMwDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50ZXJtZWRpYXRlLXByZWxvYWRpbmctY2EwIhgPMjAx
-ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowLzEtMCsGA1UEAwwkaW50ZXJt
+OTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowLzEtMCsGA1UEAwwkaW50ZXJt
 ZWRpYXRlLXByZWxvYWRpbmctaW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -9,11 +9,11 @@
 kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYS
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRME
-BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAqi23fLIijrII
-/ASwO9GsLz/0E6oExh7eUdlHAuB4XsT4VUqKPg756SjYBJlejOdjK303jERxoToQ
-4piA3/LajuG0ZuYHoZh/8RxKiagUCvDcN4Anso/MJfH+TMiJZrjhGf++KJEWZ41o
-b5W0ImIhyxIV2YSPhNYQkpINtFg+rgyzWEer81wYUpnaFSj9l+mNmfNFpoc400kw
-LQtcXDBC1OPE7r0CmHPq/CKNbVDcJqDQuZtbI3AHXeTeFClZRR+R9hlRoTrKklPK
-QDW2qEWJ4YVttaOQtc3YNo6zP4QR8ygb/djpu6af/M3FlNAzEks0bLBp9jvARQJf
-13ghJkPpxw==
+BTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEARadVY9uVwXt3
+8p81yXQxJ87Vyc02HL9qc1l1+ttJ0g0CL10pEJjT8rbXwghaGQ8Jw/GGhoYVy0VH
++5+uqnpvLaBgFX7noX5+eKABzVW3NfcD9705Ul3N8dFo11mGsvzL3+B5ucOyjY+9
+CPLIzYCBY5OnCIrsU+zkS9TcoqblvPQGkzVdHcNQLy01Fs6XJ4VQhoP6KZ2rsCJn
+QcHlg5t5HXywCf5ihzXPqWB7Ib7GL7nLIv7ViyHK6QkEPpeHtSxcs2OiwkJCeKTs
+v2HFnnLiKfF0zGhOp8nLaMXmFTCaNBLs7YaSbWqOYct9zNTBlDtO+GcYqDx74B6c
++W7hLcJ9aA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1016-int_rsa_1024-root_rsa_1024.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4DCCAUmgAwIBAgIUEdsCzztBqx+ic5/zmbDysIA5uV8wDQYJKoZIhvcNAQEL
+MIIB4DCCAUmgAwIBAgIUP87ifngF30j5hBghK5jGe5gcLtswDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50X3JzYV8xMDI0LXJvb3RfcnNhXzEwMjQwIhgPMjAx
-ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
+OTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
 XzEwMTYtaW50X3JzYV8xMDI0LXJvb3RfcnNhXzEwMjQwgZ4wDQYJKoZIhvcNAQEB
 BQADgYwAMIGIAoGAANKbsS+4T93NKbOlGctmxDuNj4vlRbp5OEzmY+0D33WZFgDr
 kgeQ0lMM7OVE25mnHwWJaj7SBxZVNKqZBX5HxH47yBrab6HhLjcmi1BGpVJo+drX
 zLSF2BouGdUNTwtoVKyvbXvmnZoIMTbhWvqPU8HIyE/GB3J53Q5V1zaaW90CAwEA
-ATANBgkqhkiG9w0BAQsFAAOBgQCYbUmQu7tnC0XcB1vd+7U/fAot75NV+/bgLpuy
-FwwkOjUmvByvtyHKwjAlAwu8OPvCijJmR/H0GWyQpGPIUPO5VBoqKzq+EI2+cPJZ
-cF8tmf9KWF8wUCwD6C176YFaXrzEE2j5Wa6b7X9Jp5Zh17wxj4v1Knu8dwwUq6mP
-ATLRZQ==
+ATANBgkqhkiG9w0BAQsFAAOBgQCiWMxWN4+CamDzXDW90neja5RHg/pDlBI9pI+Q
+NRyUycpJwN5Flv+/C+OCdmxH/dd15SeGiXCrjJQcSXFBeMD/1JK427SR1acE6z+W
+qY+rYzJ+b68Dybx/4cj2VeFWpdMhZtttgvNrGfwGMbHs9gWG7n6wPKjg6h0OuThf
+2TfVIw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1016-root_rsa_1024.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4DCCAUqgAwIBAgIUHbHUlopWRFXLAP9TObG++yMQgnUwDQYJKoZIhvcNAQEL
+MIIB4DCCAUqgAwIBAgIUFclsTfsYyWNzZajFqzlMZX7fOHswDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50X3JzYV8xMDE2LXJvb3RfcnNhXzEwMjQwIhgPMjAx
-ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
+OTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
 XzEwMjQtaW50X3JzYV8xMDE2LXJvb3RfcnNhXzEwMjQwgZ8wDQYJKoZIhvcNAQEB
 BQADgY0AMIGJAoGBANOpdEAQHrqMXflQPm+TXrUv/rPr6dDcXKzib5c8qUy8DZwx
 1mwMATvOnILQ1IAyjfBftrzXmQpTEt2uYVKtbuYcjBvdhmPGi9NiJKmIKueOifVW
 39vm9R2mESy/wnyKSTNrQa/bdTIbUrJKc0TRNI5kY1GlUcdXHM2guP419hp1AgMB
-AAEwDQYJKoZIhvcNAQELBQADgYAAOKRQ8USuIAMuuXJesAMDsO2UxUEmWTDX1DQj
-ZIARpnR/YP2Acup/rdzjA4ea5sYYggP4RDMVcEn8x5VOvxKvQNtAfbT8NaOLBU1n
-r461Swjm8dcupdJze4ts2ytDFEia25xpHK3Fq8/pk7S4b9Xjl5gAyAuRR2ata8pH
-bARDbg==
+AAEwDQYJKoZIhvcNAQELBQADgYAAy04O696YrNhCjvlDn3FEPZ1Ce4dmSvJQzw3U
+A6nAq3PLq16WwopAus+b3fEXke5k/u+pYfM4+5X7XRDNZW9i+5nUQVmGgiEzG3TU
++WYwGa5V0z6xMXl39i0tIaY4irYwzEpA+DvbJOz/gExQ9dpP/LW5Y8rE0kdMvBbZ
+Gz6gjw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1016.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICRjCCAa+gAwIBAgIUHcDIk0jrRNx3A8o/eFF3uiF39d0wDQYJKoZIhvcNAQEL
+MIICRjCCAa+gAwIBAgIUU7Z8PfJj0EkU6p/oJRcYHJt+uckwDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50X3JzYV8xMDI0LXJvb3RfcnNhXzEwMTYwIhgPMjAx
-ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowEjEQMA4GA1UEAwwHcnNhMTAy
+OTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowEjEQMA4GA1UEAwwHcnNhMTAy
 NDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
 RYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHu
 p3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQ
 Lzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p
 47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo1
-7Y0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQATJwsm8prhVerJZ6t5ayY9/OyFvhdS
-xRAkgoKoFn3JlyYMLuiV+6jxoxaWi6TaRHxhhUrlF5+ixr3deySDxFhnNBJN8//X
-thqxy8Toz5AceD4x7az98zESqRllLuks4RMZ1bsRIINExaYY5gMW/qePAuW2RW07
-znfn/ZQVAW9omw==
+7Y0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQAr4tqhlbfFvYm2bAmba+gdsk6+EwQ7
+I4qed6vUQfzFcNMSOFBfFLo5q6CG+UsZ06/Hl3YXDHOhVhZC5QANZRO9tEV59eGS
+Hbo3lfSQF8zXJ99vc0q3vNJejGgU/74FjTXX54Pe7KhdUSSjUPEapvpkc2/Y8SFF
+CcL9Lsz8hh7dQw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_rsa_1024-int_rsa_1024-root_rsa_1024.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB4TCCAUqgAwIBAgIUAzTa80VoMARDFfUS5qMB4TvrKv0wDQYJKoZIhvcNAQEL
+MIIB4TCCAUqgAwIBAgIUcbFravMReDSDzA6Uxk8BzwUwF2MwDQYJKoZIhvcNAQEL
 BQAwJTEjMCEGA1UEAwwaaW50X3JzYV8xMDI0LXJvb3RfcnNhXzEwMjQwIhgPMjAx
-ODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
+OTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowMTEvMC0GA1UEAwwmZWVfcnNh
 XzEwMjQtaW50X3JzYV8xMDI0LXJvb3RfcnNhXzEwMjQwgZ8wDQYJKoZIhvcNAQEB
 BQADgY0AMIGJAoGBANOpdEAQHrqMXflQPm+TXrUv/rPr6dDcXKzib5c8qUy8DZwx
 1mwMATvOnILQ1IAyjfBftrzXmQpTEt2uYVKtbuYcjBvdhmPGi9NiJKmIKueOifVW
 39vm9R2mESy/wnyKSTNrQa/bdTIbUrJKc0TRNI5kY1GlUcdXHM2guP419hp1AgMB
-AAEwDQYJKoZIhvcNAQELBQADgYEAPy/qPvTe0JrpWsKAsBlHlmw0A8a+z/mttWqn
-UhqmizElkI7oRzqqFTFKvshWCOTsDjNcpPmoX6a/SOhUqG0OA97u0tgv6qUc8gKH
-uPHeGxgCHY8GLNHaGuycOVzjlfVr8OQon54lS115xWBkfdM254mxz+niDMZSP3We
-qHiW+t4=
+AAEwDQYJKoZIhvcNAQELBQADgYEABBfO6S+wGG0HKRb07V+bQpV8eiARnq5ZzoDV
+EpfClXnyorjhuU4sYuzvTUMUcKF5lSmiCF9yl4zSoV8fiDJY2qScZ2C+xMSXnf/7
+plub8Pu0oaSb0KSWSSvon4DDbjSpNfQ/QZZkjvtj2wwK9XVK/7aiZ2e7NuGwOLrd
+tTs3wec=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_rsa_2048.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBXDCCAQOgAwIBAgIUcev4tjqJzDOOA9WdqQ+rLkWvtHswCgYIKoZIzj0EAwIw
+MIIBXDCCAQOgAwIBAgIUOZ6qI6KmpVBIQuNSmsJSrHJ2W1gwCgYIKoZIzj0EAwIw
 KjEoMCYGA1UEAwwfaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9yc2FfMjA0ODAiGA8y
-MDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjA7MTkwNwYDVQQDDDBlZV9z
+MDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjA7MTkwNwYDVQQDDDBlZV9z
 ZWNwMjI0cjFfMjI0LWludF9zZWNwMjU2cjFfMjU2LXJvb3RfcnNhXzIwNDgwTTAQ
 BgcqhkjOPQIBBgUrgQQAIQM5AARmjXLMpv1qGzVXtTZhBNhECOy2N/COjIa7/4LM
 6I8AZtevY8Mpi6N3NIoSArA7N/1rH/QVqjEeMAoGCCqGSM49BAMCA0cAMEQCIFx1
-UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiAYitQ+8xUcF1Ln+i23d4w1
-77UANIY9v+PzNh+Vdf+z3A==
+UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiBvUw1d8jQrTL7jxcshvTvj
+a/7XJT41KYCZC4kHc1sn8A==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp224r1_224-int_secp256r1_256-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBZzCCAQ2gAwIBAgIUT6cxNuk/y2hPum4SNfxAsCu/xY0wCgYIKoZIzj0EAwIw
+MIIBZzCCAQ2gAwIBAgIUQd9nJAnSoGdsru1U5XzdnZSmQngwCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2cjFfMjU2
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3AyMjRyMV8yMjQtaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2
 cjFfMjU2ME0wEAYHKoZIzj0CAQYFK4EEACEDOQAEZo1yzKb9ahs1V7U2YQTYRAjs
 tjfwjoyGu/+CzOiPAGbXr2PDKYujdzSKEgKwOzf9ax/0FaoxHjAKBggqhkjOPQQD
-AgNIADBFAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctCgApw5gIhALkDhtrs
-QzKnviS692b/3RGkovXtK2OttimFy3/ch13g
+AgNIADBFAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctCgApw5gIhAIgKiG6Y
+Wn7JOkWTie+T+AVcLVZU1CT171W8r/AtOYkq
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256k1_256-int_secp256r1_256-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBcDCCARagAwIBAgIUIb58kfYhaz7YHP+Hat9WbdAWzUkwCgYIKoZIzj0EAwIw
+MIIBbzCCARagAwIBAgIUF4GiHggPJErLtUU4O82JTDsn9/UwCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2cjFfMjU2
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3AyNTZrMV8yNTYtaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2
 cjFfMjU2MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAENe58conY/veoav5dpm2Lwuu2
 qFQ/0v6tCJ9FznrND6ZDgqlQDEHa13D/1LURv0tJLrEjiADDLE92xzo/MpTnxTAK
-BggqhkjOPQQDAgNIADBFAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctCgApw
-5gIhAN0sjtsQtF0EKHY9MCldF9E8JlOuPDbBOOq4EW2I7fpu
+BggqhkjOPQQDAgNHADBEAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctCgApw
+5gIgUp27SDHsVOPJ3xOj87plJRqBLZ/mkOWbhZjp8SUTsVs=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_rsa_1016-root_secp256r1_256.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBqDCCARKgAwIBAgIUSWlPMrbZfBOQWq19BGeBDBrCniIwDQYJKoZIhvcNAQEL
+MIIBqDCCARKgAwIBAgIUJd4SuF585qlYm74gqnZsBTfIYhQwDQYJKoZIhvcNAQEL
 BQAwKjEoMCYGA1UEAwwfaW50X3JzYV8xMDE2LXJvb3Rfc2VjcDI1NnIxXzI1NjAi
-GA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjA7MTkwNwYDVQQDDDBl
+GA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjA7MTkwNwYDVQQDDDBl
 ZV9zZWNwMjU2cjFfMjU2LWludF9yc2FfMTAxNi1yb290X3NlY3AyNTZyMV8yNTYw
 WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPv7u7YeD4+bGmClmshwTi7AULQj48
 9y6SPyxPeUtFXCpp0jNFbDbEEZ0HBuAO7cjRk5DXmRt7LQejBOqgSqbAMA0GCSqG
-SIb3DQEBCwUAA4GAAH25gXBXBBYbmdRra7eUxJcO+VkwrOu4h34wdNM2z0Eg+8pl
-a7rovniTqsBm6my2gDYRSVArECB8kuzoyq9ZR7tVWsFa1CsrVqhmcM/Dh8GlG12v
-WZiAkgMKX5u9gazmpUuZbSWBRl7v28qCTTf3A0A+fW8DUHuVVXrlZpYgImA=
+SIb3DQEBCwUAA4GAAH+y3CZOoy2Z3zegsj4EmKuwAYBRm7WjV7J7gM2Bak6JaycQ
+NhA2hAd3z3vLEVNlgw0b/WM6lVBNH6fFXikKEzNBytofZtxFqRH66J0qc/CAbmw5
+fG8rkHL4vrDQ1vr3Lyh/qbGXZJxPd2lbFk029o8BkBZADra8QcPuD2EHmDk=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp224r1_224-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBbDCCARmgAwIBAgIUD0NR63h3r1M4NAkAdNW9NNxyGkcwCgYIKoZIzj0EAwIw
+MIIBazCCARmgAwIBAgIUF+3Ha/HblkQ9RVAnd5VUa5BPQ2YwCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AyMjRyMV8yMjQtcm9vdF9zZWNwMjU2cjFfMjU2
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3AyNTZyMV8yNTYtaW50X3NlY3AyMjRyMV8yMjQtcm9vdF9zZWNwMjU2
 cjFfMjU2MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAET7+7u2Hg+PmxpgpZrIcE
 4uwFC0I+PPcukj8sT3lLRVwqadIzRWw2xBGdBwbgDu3I0ZOQ15kbey0HowTqoEqm
-wDAKBggqhkjOPQQDAgNBADA+Ah0Amjxv8EbbcPJV9S/WmFIc1y28BSBjT5W2S7JS
-VAIdAIk/uo2e9O67vOGUW9fxb3AFV0OsVcs19aC2rHk=
+wDAKBggqhkjOPQQDAgNAADA9Ah0Amjxv8EbbcPJV9S/WmFIc1y28BSBjT5W2S7JS
+VAIcL1LLWdbRbY2jphtXTfe1/t7vRvZlRgQPxxlSrg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp224r1_224.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBczCCARmgAwIBAgIUd7Ykw9ICMpUpGIpYkSK6EJa0Ho0wCgYIKoZIzj0EAwIw
+MIIBcjCCARmgAwIBAgIUUfZawfrAes7uJnC3lbyou+3HboEwCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjI0cjFfMjI0
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3AyNTZyMV8yNTYtaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjI0
 cjFfMjI0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAET7+7u2Hg+PmxpgpZrIcE
 4uwFC0I+PPcukj8sT3lLRVwqadIzRWw2xBGdBwbgDu3I0ZOQ15kbey0HowTqoEqm
-wDAKBggqhkjOPQQDAgNIADBFAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctC
-gApw5gIhAIfYWZI6y6CKcJeLMlw9R8DIOISnsRwRaoUB4nfpp536
+wDAKBggqhkjOPQQDAgNHADBEAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctC
+gApw5gIgbc9p70u5ogMPqCSTG4IpDnjR+Cguf8a+8Erbgfur7Dg=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp256r1_256-int_secp256r1_256-root_secp256k1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBczCCARmgAwIBAgIUYxwXKRucwQ0l/qVyhOiGTG5EnzowCgYIKoZIzj0EAwIw
+MIIBcjCCARmgAwIBAgIUdduB4Waw8NoEQbwRm8oYqzYqyF8wCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2azFfMjU2
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3AyNTZyMV8yNTYtaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9zZWNwMjU2
 azFfMjU2MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAET7+7u2Hg+PmxpgpZrIcE
 4uwFC0I+PPcukj8sT3lLRVwqadIzRWw2xBGdBwbgDu3I0ZOQ15kbey0HowTqoEqm
-wDAKBggqhkjOPQQDAgNIADBFAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctC
-gApw5gIhALosRS4iu4jpy6Fe+APP7Cb3mzxfa+XC0bpT4gqLtJCf
+wDAKBggqhkjOPQQDAgNHADBEAiBcdVGfExFQzV2K3iCjvAYwkf+yc3VfMWTs/ctC
+gApw5gIgKk16br1bktVUX0hUgSKha7mCXqcLm2OqbEfhnnvTGQI=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp384r1_384-int_secp256r1_256-root_rsa_2048.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBhjCCASygAwIBAgIUJykcY3+sqnmH0rwcCYISwX3NPWMwCgYIKoZIzj0EAwIw
+MIIBhTCCASygAwIBAgIUP57NpzW0TiQ7Dv+Eu/Jsec7uG1EwCgYIKoZIzj0EAwIw
 KjEoMCYGA1UEAwwfaW50X3NlY3AyNTZyMV8yNTYtcm9vdF9yc2FfMjA0ODAiGA8y
-MDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjA7MTkwNwYDVQQDDDBlZV9z
+MDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjA7MTkwNwYDVQQDDDBlZV9z
 ZWNwMzg0cjFfMzg0LWludF9zZWNwMjU2cjFfMjU2LXJvb3RfcnNhXzIwNDgwdjAQ
 BgcqhkjOPQIBBgUrgQQAIgNiAAShaHJDNitcexiJ83kVRhWhxz+0je6GPgIpFdtg
 jiUt5LcTLajOmOgxU05qnAwLCcjWOa3oMgbluoE0c6EfozDgXajJbkOD/ieHPalx
-A74oiM/wAvBa9xof3cyDdKpuqc4wCgYIKoZIzj0EAwIDSAAwRQIgXHVRnxMRUM1d
-it4go7wGMJH/snN1XzFk7P3LQoAKcOYCIQDz+85Y9//YzBUHnouwUan5s0csGTWD
-Q0eORyH8BcLXxQ==
+A74oiM/wAvBa9xof3cyDdKpuqc4wCgYIKoZIzj0EAwIDRwAwRAIgXHVRnxMRUM1d
+it4go7wGMJH/snN1XzFk7P3LQoAKcOYCIFJ475L6BSzMQmSQ4of5j0VvzGWLlc4p
+P7WljL/PnuoG
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/ee_secp521r1_521-int_secp384r1_384-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB1zCCAVygAwIBAgIUcy1rBcUR8SDPhzHYsoFS3+kCGn8wCgYIKoZIzj0EAwIw
+MIIB1zCCAVygAwIBAgIUZSV+XPsVuShLaoK1fI9SUQtuqpUwCgYIKoZIzj0EAwIw
 LzEtMCsGA1UEAwwkaW50X3NlY3AzODRyMV8zODQtcm9vdF9zZWNwMjU2cjFfMjU2
-MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEAxPjA8BgNVBAMM
+MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEAxPjA8BgNVBAMM
 NWVlX3NlY3A1MjFyMV81MjEtaW50X3NlY3AzODRyMV8zODQtcm9vdF9zZWNwMjU2
 cjFfMjU2MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBTNycrMR5QQlrycxmdS7C
 f1l3NPpmxit5L4jFGdbTfw0W6hxIOhgnoBC5Eo46CAcMoz719Xg1t8G6JR9sw1Id
 xCsBBlNFGYG0RdND7tN4KjXWz/D/SE9aiD0gnxuQQrcmcDVosvMm4YuDO92KoHND
 krzRlQHhDWmKefU+EeCiK90qrZAwCgYIKoZIzj0EAwIDaQAwZgIxAO0GJz6haDpU
-tNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ1OxFRuhW515lVbeTqfcA8wIxANO+0W3k
-S7AvyCXeoja1VazeUA1mQ0AGDlmQTX0W7os50m4At+CdpYwwuEpMVkf+4g==
+tNgaQ3SESJY85j6+gRcD7Nc9cvCiVAZZ1OxFRuhW515lVbeTqfcA8wIxAKIisY3l
++oJ2fwRVdjaU3+DIoB72CX208Piq2hSKjF8eVtEHV2liiAfQoH9ktR+0mw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_rsa_1024.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5jCCAU+gAwIBAgIUG13Ovyk5H3fcsX4pbIeiR8R5rswwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMTYtcm9vdF9y
+MIIB5jCCAU+gAwIBAgIUN856fz51l3lVM7u/s/R3tvFzxkgwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMTYtcm9vdF9y
 c2FfMTAyNDCBnjANBgkqhkiG9w0BAQEFAAOBjAAwgYgCgYAA0puxL7hP3c0ps6UZ
 y2bEO42Pi+VFunk4TOZj7QPfdZkWAOuSB5DSUwzs5UTbmacfBYlqPtIHFlU0qpkF
 fkfEfjvIGtpvoeEuNyaLUEalUmj52tfMtIXYGi4Z1Q1PC2hUrK9te+admggxNuFa
 +o9TwcjIT8YHcnndDlXXNppb3QIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1Ud
-DwQEAwIBBjANBgkqhkiG9w0BAQsFAAOBgQCkq4f8dt++qAcc3TaL8d0ekz7s+k7W
-PpsS1Vd5aF3OCdFEFL85oxwEIbcNZZ3dLWpHgLQzApXojOS/OQDQf3f8wrTua6Qi
-qTl/7ccYNrwD+Bq+FF+WD5YobJ2RyWITElL+zaqgBBoSGc17ssGcToEhytihKswP
-xKFOrwP8zaAPxA==
+DwQEAwIBBjANBgkqhkiG9w0BAQsFAAOBgQAwJyIekNQXnajDVspHOAAsNBkPw0MW
+Q8r7OPH9Q9ZzXkz1oXHdwnEXyW4uIOhBYKRvtaqEEQI3SXvV72d5gKIXbP2cf/mQ
+RLRS0GBsy1ulg2w4dSvkwkwFgeYZ+BxM5+esVECzFKZsXrPUcYraymqurqdZcAxy
+0edmg/yt37w8zA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1016-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBrzCCAVagAwIBAgIUM1mVhS64kWh2oV/udtlmg894KQ0wCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMCoxKDAmBgNVBAMMH2ludF9yc2FfMTAxNi1yb290
+MIIBsDCCAVagAwIBAgIUe0w3IjAYBfw32mIJMH/pETsJGAcwCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMCoxKDAmBgNVBAMMH2ludF9yc2FfMTAxNi1yb290
 X3NlY3AyNTZyMV8yNTYwgZ4wDQYJKoZIhvcNAQEBBQADgYwAMIGIAoGAANKbsS+4
 T93NKbOlGctmxDuNj4vlRbp5OEzmY+0D33WZFgDrkgeQ0lMM7OVE25mnHwWJaj7S
 BxZVNKqZBX5HxH47yBrab6HhLjcmi1BGpVJo+drXzLSF2BouGdUNTwtoVKyvbXvm
 nZoIMTbhWvqPU8HIyE/GB3J53Q5V1zaaW90CAwEAAaMdMBswDAYDVR0TBAUwAwEB
-/zALBgNVHQ8EBAMCAQYwCgYIKoZIzj0EAwIDRwAwRAIgXHVRnxMRUM1dit4go7wG
-MJH/snN1XzFk7P3LQoAKcOYCIF3OCc75XZC5nbgHT0yl0tQ8nkY18SWQKG5b/VdU
-3/lW
+/zALBgNVHQ8EBAMCAQYwCgYIKoZIzj0EAwIDSAAwRQIgXHVRnxMRUM1dit4go7wG
+MJH/snN1XzFk7P3LQoAKcOYCIQCPyLXUG26XZLO3nMf58EJ2Ej+o+gXDAllaLBW5
+2nS+jA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1016.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5jCCAVCgAwIBAgIUSyIs1G7rjqADqdqNL/8FPbI5GRowDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAxNjAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMjQtcm9vdF9y
+MIIB5jCCAVCgAwIBAgIUeZhovVNDUuRN9h3SwWVSaVKNv14wDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAxNjAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMjQtcm9vdF9y
 c2FfMTAxNjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA06l0QBAeuoxd+VA+
 b5NetS/+s+vp0NxcrOJvlzypTLwNnDHWbAwBO86cgtDUgDKN8F+2vNeZClMS3a5h
 Uq1u5hyMG92GY8aL02IkqYgq546J9Vbf2+b1HaYRLL/CfIpJM2tBr9t1MhtSskpz
 RNE0jmRjUaVRx1cczaC4/jX2GnUCAwEAAaMdMBswDAYDVR0TBAUwAwEB/zALBgNV
-HQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYAAs2cTmzyB5L1k3B+yZuu5fuhOlCfo
-lT61DJFaq/n2iJRJUB7yZA9ItXS7zK3wah9Od0SCexRH1DYkGdGpH2IRpVKQXg0+
-1N+2YFG5pS0waOdPb44xchfqjpCWE0fQfFRR1SMXrt3L1zMoS+XOure/gYb4hVy7
-zM/XD9WByaW4lw==
+HQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYAAximjztC//bRBDGD/zQzHBU9DC2CR
+cfdN0A7LgtHgyue5DFtdj1RRioj3ZLIfEgMLi+gESTmZPH1YkMExF2xCJRBdTu3O
+dweani8aTdLWSF3ikt00jCSGH1kiPjWM9pRXhLEz62VW4yvxFt4eVB1xmM5VPOwZ
+B9EHfdS8AeaNVw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_rsa_1024-root_rsa_1024.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIIB5zCCAVCgAwIBAgIUD925Qutty1/lcK1z6fjS0GkbeXcwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMjQtcm9vdF9y
+MIIB5zCCAVCgAwIBAgIUYcS07xR3ydcgKjUYhNFcmIw+FKQwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAlMSMwIQYDVQQDDBppbnRfcnNhXzEwMjQtcm9vdF9y
 c2FfMTAyNDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA06l0QBAeuoxd+VA+
 b5NetS/+s+vp0NxcrOJvlzypTLwNnDHWbAwBO86cgtDUgDKN8F+2vNeZClMS3a5h
 Uq1u5hyMG92GY8aL02IkqYgq546J9Vbf2+b1HaYRLL/CfIpJM2tBr9t1MhtSskpz
 RNE0jmRjUaVRx1cczaC4/jX2GnUCAwEAAaMdMBswDAYDVR0TBAUwAwEB/zALBgNV
-HQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYm0Un8ekTlxNk05PJuq6gnyZmVxO
-GY5xvPBOJJ6r/zA4xvOlINaQGwJXOY9+D8NXdCgimk4h9pfayyXFX25Ty5gMxXtA
-sC5pKqroluxypXLvXxtS7+/zrGoCtAB/f4/Qf5nWr9JQ0WmnXPFH++e3BiFoceOy
-4wa1QOXcUIRMjEo=
+HQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzgSst5WpRJFjBpDYQ+/oQE99sYmc
+JZ6lA2Lf5kFDMXb/bF7jf0/FbEheFNRHs+I5kc95lPbwyzpA2bQ3TK9jzFpoDTjK
+kPYnXKn0xa+H7mUS4V6VQh28GdBcWffLZC8vBkB+DKR6N3M2s7erDZjEA8PodKUd
+dR5G85B8pwswVJM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp224r1_224-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBYzCCAQmgAwIBAgIUUTUl71aZnq0VQ5OlCDKEb7AdqTkwCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjI0cjFfMjI0
+MIIBYjCCAQmgAwIBAgIUZf9BUQycH51qhAjba7oMtj+YWtowCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjI0cjFfMjI0
 LXJvb3Rfc2VjcDI1NnIxXzI1NjBNMBAGByqGSM49AgEGBSuBBAAhAzkABGaNcsym
 /WobNVe1NmEE2EQI7LY38I6Mhrv/gszojwBm169jwymLo3c0ihICsDs3/Wsf9BWq
-MR6jHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0gA
-MEUCIFx1UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiEAv92o7RsE0h2h
-C4eYCy3HO1XUzXyB1EXzFAeKJ5eJTME=
+MR6jHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0cA
+MEQCIFx1UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiAgvRpeJMeD41PQ
+ydWsdlfwmrgnjM+Vn+bBX0ty9NcEEA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_rsa_2048.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICJjCCAQ6gAwIBAgIUYw94TGD9eQV4WisY5vFcO6EPv5cwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMjA0ODAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAqMSgwJgYDVQQDDB9pbnRfc2VjcDI1NnIxXzI1Ni1y
+MIICJjCCAQ6gAwIBAgIUG/u+QDiBCAoaoWJYvqL0uwY1/iIwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMjA0ODAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAqMSgwJgYDVQQDDB9pbnRfc2VjcDI1NnIxXzI1Ni1y
 b290X3JzYV8yMDQ4MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAET7+7u2Hg+Pmx
 pgpZrIcE4uwFC0I+PPcukj8sT3lLRVwqadIzRWw2xBGdBwbgDu3I0ZOQ15kbey0H
 owTqoEqmwKMdMBswDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcN
-AQELBQADggEBAJLXlez8uEBrKbAeZs5x3SWE7DVBkQ2hrarrCcrAK5b12ZsUXeb5
-6j/tpw2XsRtPtQy/EwrmIAVE+9ijZfDuCZui5e0vuWKmL2EtuX7rJG31HGwhxw3I
-bKITtUI8vz5JvIndN8bA7rOR4DCAREJhXgREdaTJD0Wj30Y7W6vJdX0xFUTwesW+
-ZRqfMA4HDu/BW/GhjkHZl1/gq8fg8C/6UlVLUFURHeaF22rUDuuHvVGXT2xaQz/G
-3v2BePeZQZ5QOgSOQhSAf7T43VybpL0HomOcjYSEiGJRqWpfSK44pgLDbllaWweb
-vWbR/kNOeVAHD0h6oQGoBaoW+O0d7fGLkkg=
+AQELBQADggEBADJyKAFPb7ilK80rDDSGNqf7ls/rpElvmhpVJvivJ3Yv1DRm7EEM
+38mwE14TcmayyOS+0avA4gDqH7T9du5NhNWMfluNediBjzl2CgFgXXjSsE7sr1py
+RAi3nYSnUiih6k9Q4a69RteD6FigfSfO0w0nrmLi+njkSVqJ+0pSvnmvf2RKBK9H
+i0VR2oFjoEM/cyxibv1ETqaT6V0CWZSAu6IMT7gpmvvkF5Ti7+KeXXkbuZuQTqIo
+ow/zOhW7aMK24jGDKBLwunbh4EeLyWWtIy88ZNbdGmJkf7+s+/km6DziS9TkcQxn
+tCUR7ze5cYRZ49TNfAcQC0ogdokgo1Cag+U=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp224r1_224.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBaDCCARWgAwIBAgIUB+v/R5pRB5iUsqpCICzjln7TxU0wCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjI0cjFfMjI0MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
+MIIBaDCCARWgAwIBAgIULWja0CElNsf9uHoMLXihbb0y8dMwCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjI0cjFfMjI0MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
 LXJvb3Rfc2VjcDIyNHIxXzIyNDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE+/
 u7th4Pj5saYKWayHBOLsBQtCPjz3LpI/LE95S0VcKmnSM0VsNsQRnQcG4A7tyNGT
 kNeZG3stB6ME6qBKpsCjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoG
 CCqGSM49BAMCA0EAMD4CHQCaPG/wRttw8lX1L9aYUhzXLbwFIGNPlbZLslJUAh0A
-9fkc0rmkPg2EL1w1uRtOHnjFImJX3L6vBn6PPQ==
+4ZWHxPcxexTE/kShvISJeBka5jGQ1baqxDM6ng==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256k1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBbjCCARWgAwIBAgIUK1ubcEHCxZ9zJ1RURpZyivAYlEYwCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2azFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
+MIIBbzCCARWgAwIBAgIUeQnFuTzLPx3FrBWD3ouZIpqXfFUwCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2azFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
 LXJvb3Rfc2VjcDI1NmsxXzI1NjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE+/
 u7th4Pj5saYKWayHBOLsBQtCPjz3LpI/LE95S0VcKmnSM0VsNsQRnQcG4A7tyNGT
 kNeZG3stB6ME6qBKpsCjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoG
-CCqGSM49BAMCA0cAMEQCIGNZAgGJ1z5b/9EWTuPiCuBK2HWvd1yTYLoQH5fdJy0k
-AiACyLGiZQJsFhtrN8sf2eJjaMs2Qua6BZ/2nz+g7qHzPQ==
+CCqGSM49BAMCA0gAMEUCIFuwodUwyOUnIR4KN5ZCSrU7y4iz4/1EWRdHm5kWKi8d
+AiEA8M23PrqXz5+5jx1UeQEuaN+Q4ln3gT+XclPmR9P82tA=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp256r1_256-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBbzCCARWgAwIBAgIUZfcJ3EMI6/oDLciMyJeeKR2qqW4wCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
+MIIBbjCCARWgAwIBAgIUS3I7amSSwFamYMLcx8D/W1zjoCowCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMjU2cjFfMjU2
 LXJvb3Rfc2VjcDI1NnIxXzI1NjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE+/
 u7th4Pj5saYKWayHBOLsBQtCPjz3LpI/LE95S0VcKmnSM0VsNsQRnQcG4A7tyNGT
 kNeZG3stB6ME6qBKpsCjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoG
-CCqGSM49BAMCA0gAMEUCIFx1UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDm
-AiEA3ue7oIeY+Pe458sA+Uqh663+MH1e+QE+UJ+4NK4eR/A=
+CCqGSM49BAMCA0cAMEQCIFx1UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDm
+AiBnPZ/DApW1c90gQo+deVHt8TrmT4zNesvqmTzEpU4Tkg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/int_secp384r1_384-root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBjDCCATKgAwIBAgIUI8Ic4sPCfI/QhS9wLuhT603gEzwwCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMzg0cjFfMzg0
+MIIBizCCATKgAwIBAgIUIwvMnx4+Cfvo4LHUHSyx8+OIpLIwCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMC8xLTArBgNVBAMMJGludF9zZWNwMzg0cjFfMzg0
 LXJvb3Rfc2VjcDI1NnIxXzI1NjB2MBAGByqGSM49AgEGBSuBBAAiA2IABKFockM2
 K1x7GInzeRVGFaHHP7SN7oY+AikV22COJS3ktxMtqM6Y6DFTTmqcDAsJyNY5regy
 BuW6gTRzoR+jMOBdqMluQ4P+J4c9qXEDviiIz/AC8Fr3Gh/dzIN0qm6pzqMdMBsw
-DAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwCgYIKoZIzj0EAwIDSAAwRQIgXHVR
-nxMRUM1dit4go7wGMJH/snN1XzFk7P3LQoAKcOYCIQDYtk2mi5lB/kh2AoqYMHoz
-0K7bw7G42CnTD3FBO5mlyA==
+DAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwCgYIKoZIzj0EAwIDRwAwRAIgXHVR
+nxMRUM1dit4go7wGMJH/snN1XzFk7P3LQoAKcOYCIEefciT9jaPnIvEiHC2ktArf
+XGf7h0FGlxLkN9YhKmZ1
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1016.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2DCCAUKgAwIBAgIUOeAnjWDLjaJBL9ISlUS6EzGeO1MwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAxNjAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8xMDE2MIGeMA0G
+MIIB2DCCAUKgAwIBAgIUbY90vJ4/+tgc8hsO+VMaaSWW1kgwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAxNjAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8xMDE2MIGeMA0G
 CSqGSIb3DQEBAQUAA4GMADCBiAKBgADSm7EvuE/dzSmzpRnLZsQ7jY+L5UW6eThM
 5mPtA991mRYA65IHkNJTDOzlRNuZpx8FiWo+0gcWVTSqmQV+R8R+O8ga2m+h4S43
 JotQRqVSaPna18y0hdgaLhnVDU8LaFSsr2175p2aCDE24Vr6j1PByMhPxgdyed0O
 Vdc2mlvdAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqG
-SIb3DQEBCwUAA4GAAAyk5BRGu9A/kVFNGfhDE99zmjMCV+K6C7pvIl5C68AnTO2g
-U3Ru/xtIIuFbi2ZL1HgayxIjkYSenNvKKVZq9X/rm7H6HfW0lqQAo6Y8SNFD0fPS
-kJTPm4QmEl5jryDaxoyKa+wVGbvkBazJz5jtZC5+NqtXqv59/f4BpfgmIPc=
+SIb3DQEBCwUAA4GAAIV+rBvvS1MrBSnjxfYBmX/Kp4bWEXtrStskD9xfyKkmWVxO
+9NxHmA7L3NTqxkYgzfANE1OdFSd+mKK/Bx/xDCUgfRIQZCPZId4GLGl+gRq25R6X
+V3IV53b8UHiGJP0ASJbXUqTQF/7fZvuvBLBDgg9nXObe3ZwHUgWfc3I974I=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_1024.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIB2jCCAUOgAwIBAgIUVZfGPJgpZrOVDCDgn6Pe9V/32z0wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8xMDI0MIGfMA0G
+MIIB2jCCAUOgAwIBAgIUEWZ1ZXY8sKYaumyn9kCsWK1AEZMwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMTAyNDAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8xMDI0MIGfMA0G
 CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTqXRAEB66jF35UD5vk161L/6z6+nQ3Fys
 4m+XPKlMvA2cMdZsDAE7zpyC0NSAMo3wX7a815kKUxLdrmFSrW7mHIwb3YZjxovT
 YiSpiCrnjon1Vt/b5vUdphEsv8J8ikkza0Gv23UyG1KySnNE0TSOZGNRpVHHVxzN
 oLj+NfYadQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkq
-hkiG9w0BAQsFAAOBgQC6IDK+AIhgW3Leq29hqnYveyLPpRBzQwuIDHKy2j5X/P2y
-3+56ysZVuMnvbHYyQsQS0hOjhNwyIUkkfhgz1T67EtEBL+RqmVfL1B35EybhJIlW
-kn1me7gI92RZ9s+EvB3uqPoKpS/7+dkVnYmSVgJyH3PCvvEe/K6+6TnE1MtkKg==
+hkiG9w0BAQsFAAOBgQBL16xkIAjU8a2lPy+Ax4N6OjeTrT+pBbj90/ynUiRuEYkI
+GR0Qpv2vcKoFBGIywsJm61z6VRojuaoZGww4D1xlKaHp4R2DmPQYPG/EsUcPdyNK
+MszBmNHK+gRG0HoR4XJUIFMIfnF2R9m9vpVK1XPikLA10UlETdnp9tGuYIXcQw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_rsa_2048.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAcegAwIBAgIUTx00T88ZhI1/t4aAzd/3P3i43CwwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMjA0ODAiGA8yMDE4MTEyNzAwMDAwMFoY
-DzIwMjEwMjA0MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8yMDQ4MIIBIjAN
+MIIC3zCCAcegAwIBAgIUFbP+AdxwM3PsfxQino2TeiJLnW4wDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAwwNcm9vdF9yc2FfMjA0ODAiGA8yMDE5MTEyODAwMDAwMFoY
+DzIwMjIwMjA1MDAwMDAwWjAYMRYwFAYDVQQDDA1yb290X3JzYV8yMDQ4MIIBIjAN
 BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq
 5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SSc
 An7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAPDY39
@@ -9,10 +9,10 @@
 zBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3u
 JtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQAB
 ox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
-AQEAg8upG8oNdLOrGb4EzipFGoBV1GMX5jd2wjd2vhpcP6OvUP2U2I/aFiEISOIk
-flL90Ka2hGq0ChA3WZyLK7B9A7XzKqz+IyUUCuVyJPKk2UVGkWHkfEvJIKd2+VVj
-lE+6Uia89E/YedPkyi3Qcov33bIzezD91bmtO9uAEkuRtQ7DxyL4mvBwiriOwCPl
-kyqD3aqoOB+OjPCCIqRs2V1uk3j+fWpech5RHaUioRzALGS1VR0ifcCE5jHx7Oa6
-N3londW3IAG76GJSXbVlTPTyqXJ5VEH6kB/G8hpT+n4TjQ9Yfx3bgu/XsNij990C
-IGC++ChFcnfMTZ8oMi/hqdI6EQ==
+AQEAt1vYMFhLBuETUi2evjncIdzhu8cAqvqnN9WdB/SWL/PsS3cwGb6zu03fxkvZ
+/z07qSs/ojSUR1I70S23NDcmX5Q2vToo8H3Zks2MS+AI0BPVnxo+RllO+zOqMYOQ
+LPGJ+o9M6TGbL/jzYRhCWdF64jOnzgRFN1LU56fWYJLXMwIBHMQ/qMokiDkfc4pG
+O3TOeJHAlfm49pJ1VhTZv3otCel+EkTa7mv0TTaJ+su0/zxgNFtUYWGcCuBJ95hi
+t6Zh6GpOq0ML6NtZK7vMB7BvCIwihU3Fq2ApAiIq/I4tk9ROTvwKCNW6THQ+3+YH
+eSUgFEYNH1T1dcCjsdthf9sKJw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp224r1_224.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIBSTCB96ADAgECAhQfA26x/mwhY4YS3S9KG/TJAy1QmjAKBggqhkjOPQQDAjAd
-MRswGQYDVQQDDBJyb290X3NlY3AyMjRyMV8yMjQwIhgPMjAxODExMjcwMDAwMDBa
-GA8yMDIxMDIwNDAwMDAwMFowHTEbMBkGA1UEAwwScm9vdF9zZWNwMjI0cjFfMjI0
+MIIBSTCB96ADAgECAhRLUpJGgls27Ph+GqVq1TzwkXgSPTAKBggqhkjOPQQDAjAd
+MRswGQYDVQQDDBJyb290X3NlY3AyMjRyMV8yMjQwIhgPMjAxOTExMjgwMDAwMDBa
+GA8yMDIyMDIwNTAwMDAwMFowHTEbMBkGA1UEAwwScm9vdF9zZWNwMjI0cjFfMjI0
 ME0wEAYHKoZIzj0CAQYFK4EEACEDOQAEZo1yzKb9ahs1V7U2YQTYRAjstjfwjoyG
 u/+CzOiPAGbXr2PDKYujdzSKEgKwOzf9ax/0FaoxHqMdMBswDAYDVR0TBAUwAwEB
 /zALBgNVHQ8EBAMCAQYwCgYIKoZIzj0EAwIDQQAwPgIdAJo8b/BG23DyVfUv1phS
-HNctvAUgY0+VtkuyUlQCHQDm5q+9zOl2j9iCmxUYqv44Ws3g5qOO0VU9elbG
+HNctvAUgY0+VtkuyUlQCHQDZkK9gapfJf6mFLQZOVyj5QrFII+O1AhmojjBO
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256k1_256.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBWjCCAQCgAwIBAgIUbVP8Z1FCKW9Cwef+V6hGBe1FJxcwCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2azFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMB0xGzAZBgNVBAMMEnJvb3Rfc2VjcDI1NmsxXzI1
+MIIBWjCCAQCgAwIBAgIUExiTXNGw/1/DWr3T+8iOfYQqhoYwCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2azFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMB0xGzAZBgNVBAMMEnJvb3Rfc2VjcDI1NmsxXzI1
 NjBWMBAGByqGSM49AgEGBSuBBAAKA0IABDXufHKJ2P73qGr+XaZti8LrtqhUP9L+
 rQifRc56zQ+mQ4KpUAxB2tdw/9S1Eb9LSS6xI4gAwyxPdsc6PzKU58WjHTAbMAwG
-A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0gAMEUCIGNZAgGJ
-1z5b/9EWTuPiCuBK2HWvd1yTYLoQH5fdJy0kAiEAiSyF/t9WYUDH+iBSKl+Hz4Fa
-xsE+X7Y1kqHX631n5BE=
+A1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0gAMEUCIFuwodUw
+yOUnIR4KN5ZCSrU7y4iz4/1EWRdHm5kWKi8dAiEA5z1yM2Xj8Xz+mTzaSV3Ic3Xi
+wEJTXssXlwfECKILxX8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize/root_secp256r1_256.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,10 +1,10 @@
 -----BEGIN CERTIFICATE-----
-MIIBXTCCAQOgAwIBAgIUXf7z4263S3x2pJ4jnk4o2EGI/KIwCgYIKoZIzj0EAwIw
-HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTgxMTI3MDAwMDAw
-WhgPMjAyMTAyMDQwMDAwMDBaMB0xGzAZBgNVBAMMEnJvb3Rfc2VjcDI1NnIxXzI1
+MIIBXDCCAQOgAwIBAgIUH8NJbu+U7yxLh2580Q2Bh0WUOX0wCgYIKoZIzj0EAwIw
+HTEbMBkGA1UEAwwScm9vdF9zZWNwMjU2cjFfMjU2MCIYDzIwMTkxMTI4MDAwMDAw
+WhgPMjAyMjAyMDUwMDAwMDBaMB0xGzAZBgNVBAMMEnJvb3Rfc2VjcDI1NnIxXzI1
 NjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABE+/u7th4Pj5saYKWayHBOLsBQtC
 Pjz3LpI/LE95S0VcKmnSM0VsNsQRnQcG4A7tyNGTkNeZG3stB6ME6qBKpsCjHTAb
-MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0gAMEUCIFx1
-UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiEAyDsDVVgkx+cRS6DIQmvL
-Jatjx0MMzctbWVHJ68eHk8o=
+MAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMAoGCCqGSM49BAMCA0cAMEQCIFx1
+UZ8TEVDNXYreIKO8BjCR/7JzdV8xZOz9y0KACnDmAiA1QYiu/g1qUtMLwoIqOMYb
+Qi7ckS6Dd1TkOR0kW1dGAw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2040-ev_int_rsa_2048-evroot.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIUNQWOadSLoGZ5tbqqUkog5/i3mfIwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQ4LWV2cm9vdDAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
+MIIDZzCCAk+gAwIBAgIUY8VXvB5H7AGqWbz0hoVm0b7dAnIwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQ4LWV2cm9vdDAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
 MjA0MC1ldl9pbnRfcnNhXzIwNDgtZXZyb290MIIBITANBgkqhkiG9w0BAQEFAAOC
 AQ4AMIIBCQKCAQAAusBlL9+8AFWIL/uurO7Ij6LQg8KX3V1AZk3T2Q9S+aoCvYpQ
 +6FuD9mRh470dfmzUNn44+sqvXF84yewl4hTHxPfjj5OO51ha7ikHlMG7tJHIWMW
@@ -11,11 +11,11 @@
 1ASYGp/8AmNuMRsJXGMyoMh9w5JxtVUUgXdLAgMBAAGjgYQwgYEwXgYIKwYBBQUH
 AQEEUjBQME4GCCsGAQUFBzABhkJodHRwOi8vd3d3LmV4YW1wbGUuY29tOjg4ODgv
 ZXZfZWVfcnNhXzIwNDAtZXZfaW50X3JzYV8yMDQ4LWV2cm9vdC8wHwYDVR0gBBgw
-FjAUBhIrBgEEAetJhRqFGoUaAYN0CQEwDQYJKoZIhvcNAQELBQADggEBACkt3nD+
-wAKLVuddx29zaIIXZQaa9UwtI8MHP7oMMbsaBjIimN1ZPd0LykKyHYxWRARIevZ6
-nzNGd4o3ESVG0kTDYA/nabYr73rcF4QR3z6ZKOccc5TstDaDfvgDNSGnV5WXFe87
-l77qCccWpUCos/WyGsl1sf8wHAKfYr+7aqAlnkN3OpGnx8jo8s2WuXavbPupxROH
-Rsvtjld41pVrzjEBFrOAjwBqin8dTX2uK44fRInAyQYphc2aHqmY3Q2GkaIo+Job
-uAoEJMrZRhPMztYnYIMNrHkwnm/3Oy0e8/gLCop9EzyvcLrst2ZTROVs/BRPfQpP
-+aAtMjndlpq83No=
+FjAUBhIrBgEEAetJhRqFGoUaAYN0CQEwDQYJKoZIhvcNAQELBQADggEBAJlhONR0
+b4Ov6D8ZLINHf06gcsvLXOHvK3UlbB2COdd6Oe1c5bePo6D+zU44vUH4rwb1z25k
+OQt6d4LW1ISuw1Wf7HZN1PFwBpvQZ72JcvLwouSqCEuMz68tKTzZy9E9fbRdzMLo
+8N5OKxPiTY9R3gziR0AXnadZ0P0yP2mT2Oro/o7+punU4kJsOxzcfu0nMaRTht22
+6XcF6goHUD74zGxwgSeCKdImN4JvA2GYVAniDyOvJCMCjyryxeETZlgsPmXZGAVH
+hiGVhFrH1E6FVxagebdK6eB7UJ9Cau5tLefAEHpCr5Xut4QNj9ck0A1J/mj3dwl/
+wV5OZmqoCAEk2h4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2040-evroot.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDZzCCAlCgAwIBAgIUGVaJXvSfvZzaEYPjUhR2eLRDCQQwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQwLWV2cm9vdDAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
+MIIDZzCCAlCgAwIBAgIUf03mHDtKgdbREowlJgpuQsbxVXQwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQwLWV2cm9vdDAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
 MjA0OC1ldl9pbnRfcnNhXzIwNDAtZXZyb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo
 4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDD
@@ -11,11 +11,11 @@
 Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo4GEMIGBMF4GCCsGAQUF
 BwEBBFIwUDBOBggrBgEFBQcwAYZCaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4
 L2V2X2VlX3JzYV8yMDQ4LWV2X2ludF9yc2FfMjA0MC1ldnJvb3QvMB8GA1UdIAQY
-MBYwFAYSKwYBBAHrSYUahRqFGgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAAB+69dK
-4haDVzbk/bwSOeBXyvnslAv3tUFfHVxptNiYHeusieW1Cv/5rm7s3yFQBJ5Xbxhh
-1K1ym4Cvfer+iCdmTWnGz5iHngdQ10ObcAZOrw6OSzYvwQ4YO3YoQdlZ4wB6WTus
-LwKs2gcfJ8hdW/tRYHIFT6KuFov+RdVoncD02dexECsyutCuBdNWn0QacalWY7if
-jbe1LfrGoucEACOkj92kn+2pgXHRcAx9JLg6UR/2KcJPjzp8oIfCe8ugE/GGS4b5
-dkuuLFxsPuVycsLJVTGchdt0AGMf2WqAJCMCz2SsxdWb9ZrPZ4me6L47ks5UskwH
-o8WciJaF2kl2xh8=
+MBYwFAYSKwYBBAHrSYUahRqFGgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAABud5gZ
+fQFcRyWt2bw3rxs+c0/FsV7XSHnGxYX9DXUiGFL2glNmu4DVQEHYk3CDbAPafTBD
+7143VCXQu97AuLl7OAApEbsteRtSX2uMjatA2xDFACUPWqTAVNjhs3/oumldK4GS
+Fq7hrPrFim/OQ/pwRvIjE12fUhz4G5uClhCVArtDwCo+0SCWsPveBVVCPmgKM6TI
+3t0b20Cya2H7XCB8HC61wftGw0dIjxw5MmA7VAQmoGAxD1DOh0UAXMgMaet93riI
+96g8UETpPo89cdPSZ4tMM8JSvnyrc9bns8hvX1KxQyctjXKPgtfszd9pEYv/Aked
+S82jJp6aPYt7DFA=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-evroot.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUKZg1SQdiL72p92ahVLd72s6XyLswDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQ4LWV2cm9vdDAiGA8yMDE4MTEy
-NzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
+MIIDaDCCAlCgAwIBAgIUSxuZebHYtwEQBNR2ItC9xEgw7CkwDQYJKoZIhvcNAQEL
+BQAwITEfMB0GA1UEAwwWZXZfaW50X3JzYV8yMDQ4LWV2cm9vdDAiGA8yMDE5MTEy
+ODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAwMS4wLAYDVQQDDCVldl9lZV9yc2Ff
 MjA0OC1ldl9pbnRfcnNhXzIwNDgtZXZyb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo
 4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDD
@@ -11,11 +11,11 @@
 Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo4GEMIGBMF4GCCsGAQUF
 BwEBBFIwUDBOBggrBgEFBQcwAYZCaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4
 L2V2X2VlX3JzYV8yMDQ4LWV2X2ludF9yc2FfMjA0OC1ldnJvb3QvMB8GA1UdIAQY
-MBYwFAYSKwYBBAHrSYUahRqFGgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAQADSlD+
-wZeBrZt0pjlOMUk+xpAa37+0pKddv3JrxTvHHeH/yi1jiiA/BECRVnr6jfvo2NHb
-AjYIUX7bWPSX643wJKinvSx1ZANXdiMJPKyt9DHCOhwKOW22whAip/VyFaFd7fHF
-k+RouJ78qimi8OH2n9FmGwiR1Xq6aydV+BayAF+3ml7LTNbvSBpuE+afYPw+/6Ou
-IjerlrPePRO1o7aGAzCdrcVgdZQkvjosQNKqzjIVNEmbLSkR8wnWIEVWRd2k0MGq
-dWcY6kG0DuYhAuwG9JxGtlXDauFMe6FuGPjrx+p5xdBcI1UcFHI206TCyUhEfQR1
-adbQqj+aegkaD2Ik
+MBYwFAYSKwYBBAHrSYUahRqFGgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAQAMgEzp
+6Q8vRl95TLzhiLXC/9otBQpV50iq8Waqf8B2JfOPIP0M/Emz9VKQxavw6iti3YPz
+utsdGyIje2W0GhlJVtMKHfvfKYXCwtVEe/XNF/Ojz7znk8KEuUPBzjKTjBuICw4F
+PnmKyzoYsD1HwkgrkoII9hr+WBqY5vWLNJA1IXyA2cc3u9oAM1+QqPWEwX+bKjai
+4QbngYKTL2ybQbM7TcCkvY/dSOoyyF4K4Kz0eAFXrH1cLHlPj2wo5kgexXRWAgO0
+klZrS2b3C3cJVEWi/bYCg7E3I1noNsgnZ1zQgXqjf7frAUwZURoSSPVO3azM88UJ
+FCh9RLnIOgbs7zos
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_ee_rsa_2048-ev_int_rsa_2048-ev_root_rsa_2040.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDhjCCAm6gAwIBAgIUJXZ2LnKjPL3ZgheuTFTp9L5MWPEwDQYJKoZIhvcNAQEL
+MIIDhjCCAm6gAwIBAgIUG40lfqXpVIsXGwWLss7U0Guh2lcwDQYJKoZIhvcNAQEL
 BQAwKzEpMCcGA1UEAwwgZXZfaW50X3JzYV8yMDQ4LWV2X3Jvb3RfcnNhXzIwNDAw
-IhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAwMDAwMFowOjE4MDYGA1UEAwwv
+IhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAwMDAwMFowOjE4MDYGA1UEAwwv
 ZXZfZWVfcnNhXzIwNDgtZXZfaW50X3JzYV8yMDQ4LWV2X3Jvb3RfcnNhXzIwNDAw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQ
 PTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH
@@ -12,10 +12,10 @@
 AgMBAAGjgY4wgYswaAYIKwYBBQUHAQEEXDBaMFgGCCsGAQUFBzABhkxodHRwOi8v
 d3d3LmV4YW1wbGUuY29tOjg4ODgvZXZfZWVfcnNhXzIwNDgtZXZfaW50X3JzYV8y
 MDQ4LWV2X3Jvb3RfcnNhXzIwNDAvMB8GA1UdIAQYMBYwFAYSKwYBBAHrSYUahRqF
-GgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAQCFztZKSl810MkQTqCnVkWddzf8ikix
-Va8zUZR0MNVrXsyA2EtXgIaOyW33/302lJZoKOrTLTCoKKyr+GwYOWMXy6fxui5g
-OXAd9SrJiEiF1Ev9J1ult9Iw7XKTa2aPWDs43RAJjYSwWP5JocP/H+ruJuVQLvsc
-h7+ztNUl+0x24O8lXZkv5clZ6FI6NpisA2P26A36JoogovBtKbvGjm188tjEgGV9
-1wSIG/tAzvNCpx+mxslOVG0J8rUtDgpQeICvLRfzG6OhvNeXeuq35n3Mg4PpyS2Y
-m7ZeZDwd41eVwVSiyEk5ihlKXsf9xgMIc1obPdRds7Gfs0g3etsrp286
+GgGDdAkBMA0GCSqGSIb3DQEBCwUAA4IBAQAQWGc/1fHcFeIavOXfSSFDn+b9+saU
+xIuK4SujRstki8AUxoFyLDa5Hm5aLIU4MTpOxDLBGjFVyv9hGi4aEKnZuzdUDrSe
+6ezdNNfTuwgwU1VeivTDzm2lkj9C/F7MnOgste6MMcEj+Cun34ORh7F2adE8KRxU
+RgGQYhlurmUEe14ewxyEZ9PZ210v7xSqa+XPg5GNjZHjPoNUYEliASnflJ1eSRqh
+Xzm0HabdSJEoUBClQLp2m/BstlkzQgEe7m+S83XPVuRPe79Ey4BnzVYqkpFdeAGO
+ffs15R7qbIbOG2DeU5mQFiEFnRTv+80MVHGz0gspMBiyYI1h4wItnYx4
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2040-evroot.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIUdwOJVwzvMG0qw/MCYwhdr/o+icQwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCExHzAdBgNVBAMMFmV2X2ludF9yc2FfMjA0MC1ldnJvb3QwggEh
+MIIDVDCCAjygAwIBAgIUM/wVnL73PZefwiXVUHFwY4BBJGwwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCExHzAdBgNVBAMMFmV2X2ludF9yc2FfMjA0MC1ldnJvb3QwggEh
 MA0GCSqGSIb3DQEBAQUAA4IBDgAwggEJAoIBAAC6wGUv37wAVYgv+66s7siPotCD
 wpfdXUBmTdPZD1L5qgK9ilD7oW4P2ZGHjvR1+bNQ2fjj6yq9cXzjJ7CXiFMfE9+O
 Pk47nWFruKQeUwbu0kchYxYQURgBJ2pOtm8HMxtcvIvK5wFqj5s9TyrEVTxiTPUm
@@ -11,10 +11,10 @@
 AaOBkDCBjTAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjBPBggrBgEFBQcBAQRD
 MEEwPwYIKwYBBQUHMAGGM2h0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9ldl9p
 bnRfcnNhXzIwNDAtZXZyb290LzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUahRoB
-g3QJATANBgkqhkiG9w0BAQsFAAOCAQEABxlnhK78YQX4Dq82qs/7e3rJzZKApX7J
-hlMVa+ui4NoOdBSJ7ZutY/h9qzlvjhcTPnbvDJk4MpDLTYs1Lfpx6OS7Y7DqU0sx
-eydaFP676aD7P3EsIRN0qSKDuBvA60od0o0VEZ/ADMFlZ3xl6dE9Rbkf5uH9E64e
-f+Irx/ZcY7FbOW/Pnp54yful6NpCo/0Zi8Sv31SZZAjK1TnLkp0IhA/JSVMKWo0E
-Uoi0KmHutGZPhDNh7E7qd/AKgXTQA5tvOERzw/4SKn5Zn2fAZXNUm4iHC04LcOKz
-h0ZKsuS81vlo6G7EyZbR/jbpKxk940SwGVw3GZqkeBJbKVVrOXmz3Q==
+g3QJATANBgkqhkiG9w0BAQsFAAOCAQEAWnghIlyjOs/GO6obJdu5wmjDghKBP/pQ
+5L6yF9jTdfVaTudO/liGBeP1Lnor+0QbTNWlOE2MhPobve6WPbpcGbDoCk+QorFH
+sgnLbMMlSUXPgvGt4yNJefsmy02G472T9kSn6KkoLM3Zzanv0crqOUYXsQVODs17
+NEvuWuxcvsA+tuuFxwVMUuBK4AWW64zOmio/xTNqxijV8/Cd7w/20ORDhExtzxsu
+l3V04WcZp8GNk6PVbmSCyZ+Oqv8aoF3sI3JCHK0cKHdM5+sQzJyTbKZ1J7kfLE+4
+aB/LZyf3EHOS5/Qv5wCSBxIBHSmQL19l48IU6FBZ+65RtIooczs3bg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-evroot.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIUXX9GEkM2GA+noaVOjbYUwmN/YaYwDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAy
-MDQwMDAwMDBaMCExHzAdBgNVBAMMFmV2X2ludF9yc2FfMjA0OC1ldnJvb3QwggEi
+MIIDVTCCAj2gAwIBAgIUO+CV3E1g9n7p1BWTj+qvQOZRjLUwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAy
+MDUwMDAwMDBaMCExHzAdBgNVBAMMFmV2X2ludF9yc2FfMjA0OC1ldnJvb3QwggEi
 MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT
 2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzV
 JJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx0wI6iypB7qdw4A8N
@@ -11,10 +11,10 @@
 AAGjgZAwgY0wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwTwYIKwYBBQUHAQEE
 QzBBMD8GCCsGAQUFBzABhjNodHRwOi8vd3d3LmV4YW1wbGUuY29tOjg4ODgvZXZf
 aW50X3JzYV8yMDQ4LWV2cm9vdC8wHwYDVR0gBBgwFjAUBhIrBgEEAetJhRqFGoUa
-AYN0CQEwDQYJKoZIhvcNAQELBQADggEBAAI6pTa59FaKjZe3mwKkwimGI1Az6XPP
-z8yGEr5T67c2fHFplf6K0joSX8tCbvncaisbWNT3loYHh4eJZFfEIjBKJ3bSBnMS
-uclSGBYaXfgg89E/hMvakiEsWnIk38qyeXYBhedlOTu+ZGra3MXzG0CCvGA9nXYc
-Y+MuaTiZ+AmBgBDWYmlfXiR/Gl6Ex62Yea3TzMTQf/ew90BNIl0QAZsJTKfbxalm
-lscCnRTsh8pRHtvJsQgnIPWFxhE5/gOpjUrJ8tXQsn2H/0wWxq8AwHXmMdZzoJo+
-ahwhkvL6lvF9b0MUUy5dsf3YrdVqfQ7RLDu9yYd4l6kUSQ88YLZYss4=
+AYN0CQEwDQYJKoZIhvcNAQELBQADggEBAJ7HDMpaOr+hmteHqb414a3xwUpEO+X9
+Jh5zHvsAHG8DXXKu36Q25w+7joXsusD5GrDbZdXVEcNF3tpx+SqahzzDK0jzOIuO
+26ZRVXxkJmhyI6WdMbIrm6fC0WjGeJl0ByHo3MYJrnOgNOrGxJy3Ecpk5ttlge41
+m8TzQIi7hXYmOLqmqJ0yQoyukfX7uSr/PZsKI3tjZ8Na/q/7HesgGVH4vdbzhlmu
+lZP1MPPZmn9hWHkoLxjG4KI8hGAgaUlkwk2WKn5SC9IUuz52bm3Xz0rkK+C3RSQo
+MJagAa0x+heCFeWJpuhiIOWKRCwol72o0Nm+mFKi4/qAxNWBI1kTD1A=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_keysize_ev/ev_int_rsa_2048-ev_root_rsa_2040.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDcjCCAlugAwIBAgIUa+gFO+jbK8XmdPahT7HbbByusIMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQZXZfcm9vdF9yc2FfMjA0MDAiGA8yMDE4MTEyNzAwMDAw
-MFoYDzIwMjEwMjA0MDAwMDAwWjArMSkwJwYDVQQDDCBldl9pbnRfcnNhXzIwNDgt
+MIIDcjCCAlugAwIBAgIUFdhUsJK/XuSsxS2GLAc6Q/dnYpowDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAwwQZXZfcm9vdF9yc2FfMjA0MDAiGA8yMDE5MTEyODAwMDAw
+MFoYDzIwMjIwMjA1MDAwMDAwWjArMSkwJwYDVQQDDCBldl9pbnRfcnNhXzIwNDgt
 ZXZfcm9vdF9yc2FfMjA0MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
@@ -12,10 +12,10 @@
 DwQEAwIBBjBZBggrBgEFBQcBAQRNMEswSQYIKwYBBQUHMAGGPWh0dHA6Ly93d3cu
 ZXhhbXBsZS5jb206ODg4OC9ldl9pbnRfcnNhXzIwNDgtZXZfcm9vdF9yc2FfMjA0
 MC8wHwYDVR0gBBgwFjAUBhIrBgEEAetJhRqFGoUaAYN0CQEwDQYJKoZIhvcNAQEL
-BQADggEAAFHoe51fTi1uHZg7N4O0fGvZMs6SKWbz8bXSYSqrAUPiSB3Y/4wZkMdi
-hi+Hsi5TG0YVetfPmYTeS5MpZum3RIKTIQAR9tYmYd4OERY6sLfJYoOKzozCvQWv
-HeAy2tVt4rO6G5hJWpWmlAH8q8XU+C/LvadJ8saeVkxjnLB8/PaUc7YMQWn0d1G/
-1JSK0s96dUX0wBAQITYpRbbY+3wUwi+1zgTLvoNUCa7rShaS/wHYpc87XKAKRdkb
-DfVRr9VoyTCey6XGBvR/Fb9BMtkXGY4KvEt2Tz8B+GtqNRs+ca1b1uEUDrIKYWzH
-nI8Jqks8L98Y/P9OX0VV4w1cGiRo1g==
+BQADggEAAJNwhipzaCUDddzc+heX+MgcJ9DcupEFuuSmEgdne3PgxhfhXrIqIT4X
+4DpxmtUS4oB3FhhXLxlndiBVbC2GRzPN5Qhss3ULbyfVa3Bf45LyMpDNfjs2MozJ
++xLPjhQDJcMwq10RsDUhwQz4BCcCb5AoXHaMXZJe0J2ZhYBZMMZt/22an7mR9HRc
+AOvnLXtzUEZSrIsIXC0LvnAcEMy6g3WPfeJCcJZ5cWw0DVabtGBTlPy7/dOFYtmI
+2BHxsDj1pTKjitmgbVfA67u24Ct5glHzkVsQEPD4vB2J5Ptu0UidQ7fRyuZwpZuW
+Q72nXFdSEs0UVGp8fSsQ8ORv2m21nQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_missing_intermediate/missing-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_missing_intermediate/missing-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_missing_intermediate/missing-intermediate.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_missing_intermediate/missing-intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAcigAwIBAgIUATzJWW0V+6qn8Fa3Wav0J6GzcCcwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAfMR0wGwYDVQQDDBRNaXNzaW5nIEludGVybWVkaWF0ZTCCASIw
+MIIC4DCCAcigAwIBAgIUVwdwwrCWfp82pGODTXMV35GajGQwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAfMR0wGwYDVQQDDBRNaXNzaW5nIEludGVybWVkaWF0ZTCCASIw
 DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ
 6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUk
 nAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N
@@ -9,10 +9,10 @@
 JMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd
 7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEA
 AaMdMBswDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQAD
-ggEBADDenktlz5CcG+M/jzKAdGcAGxFLNiozvKOjS6YpLbOu6j5F8oKtCvwqvPrG
-l9n0UImlqQ2Jo8Dmh8Oqg4W3NtjTYuqJhhBo+xwnIjyiQNiknsfVb30VS4ldgRWX
-EVPdHz4aVLjIlcPq/UqQ3xvhxqAxY+rLNsKntJ7mmAL/gos1k9dYRZ0M26y/+a1+
-pJGwDc6lYjIBN8RkGOAwPYtQrWYzCazu/78qzhamse/tm5c/jy1EU+kFd5f0HMMQ
-OgFxP0qhpbWRZV8CraYU+t8LQvvjXR60beLHvnMGXqCM5qVLMu6ZpOMLen3YmG91
-d/DbdSVrNdE+QB9f0IfPtoqrWDk=
+ggEBAFDTK/9saOeJ3Sb0vjJ0ogp/E7WrpjHaMsx7janNrpaIGqn+vaICF30Muazb
+/LywCjvXsJCFI1aPh+s4eavMPZVEdDIsoQIwdBLCU8u/s1wVlA+BHOy/M0u+7rGw
++F2AeKd4vUfZJ4jrxSorxqCuwyE606UXImSSngpJq4dRJul4cDcHOg6uSRl/hPU+
+sjGdo2DIJKiGquBwmMVgEwIF6qSP7iI+qguy2k6XykGnVSN/HASqB+0UfYvvHhkI
+3sPcsU1LM3tW5hnM/81SE0JUHyvNgXEHHXO1FST2U6H6LyrTsem3Ga33yhBoayD/
+L1P2Qgq8tryeqcV4cqolR7MfYx4=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ca-example-com-permitted.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDETCCAfmgAwIBAgIUA1K7+5vzMPWPjgwarkKG6CtL7bEwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2EtZXhhbXBsZS1jb20tcGVybWl0dGVkMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCMxITAfBgNVBAMMGGNhLWV4YW1w
+MIIDETCCAfmgAwIBAgIUW/imFdGk/JA1NKPzOw1+UoGjVIUwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2EtZXhhbXBsZS1jb20tcGVybWl0dGVkMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCMxITAfBgNVBAMMGGNhLWV4YW1w
 bGUtY29tLXBlcm1pdHRlZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
 ALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG
 8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0V
@@ -10,10 +10,10 @@
 0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz
 /kkj+nJRxDHVA6zaGAo17Y0CAwEAAaM5MDcwDAYDVR0TBAUwAwEB/zALBgNVHQ8E
 BAMCAQYwGgYDVR0eBBMwEaAPMA2CC2V4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUA
-A4IBAQBP44tr4myCHEw5ppAzSILG5y68lCjd4SUSs7pfBQvMFYpDiGSQ7XBcE0us
-qBI41Fte2nXc2NB8rAEqpCjXzru/NiHwOBd2r7GHNFK4oL4Ewpdz+POaFVB73CHl
-z+Fzm/HDAVCifOulB5q2iqQ+QDcSF64x8lD3rMr6cVzikFq/KU7crvfYH9iZPRCL
-gJe3cnplbgnRjTLzIVNL0ejQZ8CBwb6IhB/qwt4VkXFW68bAXtVWOfTKdgn/E9B2
-jSAlsRG8/X7UfjkGhZWQKSuyxJlvopHh7DXEvyGA34yXuygjwZ9+VdyTnyJFZ3Cf
-fgVUJp/QunLPuN3y3a2YdUoHKf2L
+A4IBAQBCxftaoGEXtPvmno3v44S7ahV7PYR6kNE1VxZDifghRNneBc+um3r/S6Rz
+Qfej9e+u6/pSNyW1laZE3EXCKX9za5LE//qbm4l7UaomqO95BD3oVNV5pVNuC5Hc
+JyLLbFTT4QKi1pHoD/Wjv17f4rBl13MFqXB4Nt9KqvZOn1RGcU+dPgivuuNYXGEq
+0REsQRqloVOdZ9WhF0lEUNDvWhxxZi1arLlv5UCrQZ+srvroZMrjyQJ9Wu3RH6Hm
+HdpBkIkoghiykIILF23zWeb8tgqlakkTtuVU1dnzFhP8NZDMYG7Ms2vpTkbBjnwb
+cYKuzvcsfwnFbmAN9v0/Hzo4zZrh
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/dciss.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIUSaaMmNALB/iEO5QcmG8aMO/9jHEwDQYJKoZIhvcNAQEL
+MIIDuzCCAqOgAwIBAgIUcxz6c/GMYB7/nrD4zXg4j6UrJckwDQYJKoZIhvcNAQEL
 BQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBh
 cmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMF
 SUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMIGFMQswCQYDVQQGEwJGUjEP
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMIGFMQswCQYDVQQGEwJGUjEP
 MA0GA1UECBMGRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczEQMA4GA1UEChMHUE0vU0dE
 TjEOMAwGA1UECxMFRENTU0kxDjAMBgNVBAMTBUlHQy9BMSMwIQYJKoZIhvcNAQkB
 FhRpZ2NhQHNnZG4ucG0uZ291di5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
@@ -13,10 +13,10 @@
 4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20
 yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xx
 j5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBswDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAF7VHJRFh+3fYGwIToSe1km0
-0RO7Y0fU/TSXZsrXO4HRExf2doFwQ6VId68eg6xxcjENENriMn396Sle+tSADbMV
-C+/6auPX94WTvArHfHSBB5OmgxVEEp865nHFf0l2Diq3GMi+gmtTlqznZhMWDh68
-wb202k37typwX4YZLlEW0KODUMEiVRdWkMcYWqxUJjuL59g/6TNgwjwylX5NCSYf
-JN7N63HovIYTs5MaNrFpFVYUULfAhhMk3OedlMfF9pGYPCxtZfy7TKQg/rcduhvv
-fT6R/kpnqeIYBrShuxUrWkH1Y3gBf7TONcl2poI7I/3k/bDpgK9RcKNtt7ecRpY=
+BgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKUhmbYZJnpAEOUHAxYTaGZD
+0juaNppvdhTeI2T3bfIVgL3qFqPeom3pLNU+Rnl1hTplxl0C9wxIEl849nc9cWxa
+EK/JCnGHrBCZ4qJn9xUN96AhGICE654c7CgBNLKs8KZ6tAunAGtxCR6c5R7L5G7m
+fA7DWX9lEI0R9L0NJzWyhELsafoMlZGFTiIERiYGhotemxf+QEPWAWn3cfFgN0ma
+aK23cFbzw6SXHbC2y9OCtz8nWgn417Los+H2emQrBqISdvPh54EU2uCb7vxH2/ly
+KZW8QFo5M3/UCuy/X47y7gUTHQQ+BhX9Dz40sp7DP0pDSwt0fksVxXlZoldMppM=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com-and-org.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC/jCCAeagAwIBAgIUd4b+2v1tMqaub9lPkTHRevMjARowDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAhMR8wHQYDVQQDDBZlZS1leGFt
+MIIC/jCCAeagAwIBAgIUcVd3d0Lp6rsQX88nbU7VYHOOVKswDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAhMR8wHQYDVQQDDBZlZS1leGFt
 cGxlLWNvbS1hbmQtb3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
 uohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGoby
 a+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWC
@@ -9,11 +9,11 @@
 iEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXT
 Ce+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+
 SSP6clHEMdUDrNoYCjXtjQIDAQABoycwJTAjBgNVHREEHDAaggtleGFtcGxlLmNv
-bYILZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAJpK1aSApq7GvdjVkfbI
-BHWFejUYXTKQuFLY+M77FRGGV/8k9txq7MrgA1YpM6oYsyeyZxOvsbxo0S6G9K10
-nmG+aegA8938spxBR8+pgISThsWn2wW6Cm/XEUQU8N/XTYEXv3Rk1zxchfwWJPDd
-w+LDIuBIF5fs3p4K0Cf4O0+bAH1kPQMzjkL6/RmszHme8T/YqP92mlbvF2OOokxf
-YrqOEqi9DixW4E52P2HAMVm4/dTV37TK4+iCYeANG6Nn1dSpjSy+mMsHY5cTxQdT
-OZ8+h/NjYWlGu8SiLGlfbb0x2E/qa0xVf3XMDoX3hcshQy8oZGiT+358H4V81S/N
-T9Q=
+bYILZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAKZjORSM/94cF9uzMJCX
+MZ3JmZKiMRXCW9Y1mCKeimvV5LqFyRVMlE7DAHXuPwzaJVS1y/q99dUcUfMd5q1b
+jEMdLc4qM+7JSpI1qxoeFQPym+3tCH15u6ZXkPzrAdGElVraCEYsCWjEmpMaZS6Q
+Zfbe7mcBqIDiFKQma6tioiwfdg2KLKb/bFML/guxGVIYFla8UaiOFtQ0mLg6qMrp
+1RdjqJhGqqD71IS+ez65W4gaizKgAyBmKqOqRoSjvF7lqrQNAOk7m+pY4Dzlxyg9
+iGYyNVWen1R436FLJEgdFQOefGY5vhtg5dVX+D/MH+vRX8apumQ3Q1sVMgoLb5v3
+yWw=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-com.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUb91eR8VZJFHgq7/xjghmX1Yj928wDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAZMRcwFQYDVQQDDA5lZS1leGFt
+MIIC6TCCAdGgAwIBAgIULdge2q8uLXhglJkSVlCLPnl/KsswDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAZMRcwFQYDVQQDDA5lZS1leGFt
 cGxlLWNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -9,10 +9,10 @@
 ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jh
 s3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHV
 A6zaGAo17Y0CAwEAAaMaMBgwFgYDVR0RBA8wDYILZXhhbXBsZS5jb20wDQYJKoZI
-hvcNAQELBQADggEBAKQDwI+nccrKLTMM4Q/5V07jSJghnFa6KtXeBpae160EBGTB
-PnjW794Fq3//vFWB+caasAb4KBFlM0uD9nrBVz5Y0GcdmL/NrUgqEt7UySIEq1LU
-WB2TYtGJGwsE2O3KMo5hjwpARXgX/To2h5mALvrIX2lRzivVMo8s6YjUoZf9/Apq
-wWz3DykVWedt1wA3H3rjKOxIQrG2JuFOQouS+ahfpZiJUhwg9Tj2x3UzX+eRqqac
-zRcsm8VhIqYEYPIXq76oqAJP3DYuUVQvzy1WYEVfLq5GAaQ3iLSMRGfIM+O/ZDNY
-+ZtaqnnrfN0Onwbax8HbV+VGBQubi0t2844hNgE=
+hvcNAQELBQADggEBAKazM8Y0fbv4mYND26inNXWTooZz6G4zFxa9TDVEYYl0W5mS
+kC0nE1L38cP7hFpuKwChl87UNHgkpxplSozadgSUg1yqyZ+F1KzpAs1647WHqAgB
+cIPzhR1Y7d1v3/jkCxioYvwudeXwO8eqH3EPOz5h70U8LRY+Dney+qT9OLAvyAl/
+dpF3ZjT3AQRTT90ZL15I+rLR10kI4a2MwqUALaEmZtZAp1ecDoh/71VJF4CEPb3l
+JE7rR/Ff5VHC6fNMJcoc9Ze6laEOH3+BK+l8wpf4ABGiCdkfUsHbO3W/g0h4QKhS
+Me7tz24aSISqinNGxOGcFVBB//V1sPGkH3lFVTc=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-org.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6TCCAdGgAwIBAgIUcUrEZXBM0Hdoh8bSSJIrPxWWiI0wDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAZMRcwFQYDVQQDDA5lZS1leGFt
+MIIC6TCCAdGgAwIBAgIUd1DYJK/QJRwY0oGdFXeMsRKcwhAwDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAZMRcwFQYDVQQDDA5lZS1leGFt
 cGxlLW9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
@@ -9,10 +9,10 @@
 ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jh
 s3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHV
 A6zaGAo17Y0CAwEAAaMaMBgwFgYDVR0RBA8wDYILZXhhbXBsZS5vcmcwDQYJKoZI
-hvcNAQELBQADggEBAKRCJ0u4+BrGKmsQ4gv/7HyfFu/J8Qnv8LDcahd7a6aZ1NXy
-6Iwpyru6IA1rpxpWtjw65JyeWidHWjhrD2FCOkBVhRJV+Aam6qWN38kWvWtCJvkf
-5KG2QoPXONE5HmkJous5jzAO6cdJd7H2z2A75gvadiClB5ARLWHBxUT9/n9uZCcR
-3st7FHlY+UoONEOhry/oGMqV9gby83ZMJFNMyB1lKnV5CIz4/XIlLfQdjUotPwGC
-CIzrp8wtO7XMIXeOBVOsbd76pFWCYKziFFsxr+DTbUiXo6igJ3suHwR9bcaZuOGZ
-mYINdj3PwxyXXWgm2TDFKeVqxWkFSkvekF/Nz6k=
+hvcNAQELBQADggEBAJyjoYfBfON+x24YHczjV3ngQfTH0SZ4WzebR/lqsIrKKx08
+siDPKpdrkNGDyQ0A9pxaLMgDjl9e+7Z8aWLklzGYY1TN8/KWaQdqAN9VAL/9QfIz
+qo5jxzEt29nNvO9NTc9sBQ/fPiTydI96JJgsWPg/ikw3y0c+1IPVYT0jSCxHc7qN
+MLXtmDxl7ZoMyPKU9ZIACHSU3+BZee/TTqZT97TIEYkS39bJUyP6UwttTfh4Zm8l
+3Eju6bMPrQGu/M1hy+n6bliY+qxnJ0TDaJcHfd6ox9SFGajjAvU2KMVfiG7NzzBP
+qdmp5Hw6BIskbjzGD9TfOiQiDd/CqwfuoXStH1M=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/ee-example-test.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6zCCAdOgAwIBAgIUSYxxOkl00JXKLMbdC3oJ7M1KH58wDQYJKoZIhvcNAQEL
-BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE4
-MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAwWjAaMRgwFgYDVQQDDA9lZS1leGFt
+MIIC6zCCAdOgAwIBAgIUMV6sDJo62fVf2QrGVmoUYUmkl5AwDQYJKoZIhvcNAQEL
+BQAwJDEiMCAGA1UEAwwZaW50LWV4YW1wbGUtb3JnLXBlcm1pdHRlZDAiGA8yMDE5
+MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAwWjAaMRgwFgYDVQQDDA9lZS1leGFt
 cGxlLXRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W
 1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtq
 ZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7tFYIP8X6taRqx
@@ -9,10 +9,10 @@
 t2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo
 4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx
 1QOs2hgKNe2NAgMBAAGjGzAZMBcGA1UdEQQQMA6CDGV4YW1wbGUudGVzdDANBgkq
-hkiG9w0BAQsFAAOCAQEAVP/bqUISD7VshsFJg3+i8T5j5agt4flBtnWgAuFSrmc1
-TGPyUw9p+OXxCK8KN1U6zf480H1KhLdjeaW2F8TIenN8GOvcLwO2k06Jg8L0kFvm
-A4wtU4UCIefeEodBLvX0AxKAnd3ay/OhtNvCtr1qHHGjqcODlYwLwv7yTU5558ic
-38ZC18h33UTGWWzUunJ5S2Y3ffY3HB5YiDTJqdDHLAyBOk9S/Lsce/2Uohfbbq8S
-88VcBAL6OLy9tJq9DJVy/nyB44yiA7bxheL3bQZmBvNr3W++N28Vla7CGhanJUMR
-RyLGZHWZvpOGf8kFlYwcEvYk2t27ZIetoH/qKcQWYA==
+hkiG9w0BAQsFAAOCAQEAZyhNrPkiThyQJBib0iYbXOP7NOEdenQzeyCRZJ5QcPZM
+jO5iXpRRzyEqBDyOtnIG6UihP98qOmF7T8RTZmZ0Ex8Kzw5iHniXYDJPr5pnaTG+
+INyKLMMVr884xHEKKarX2sg52b+u01gAUBD6B9yQZ3MAdqjNyqcbYmOVzreFsYcL
+ddhhC9/B0iE801OPf2/vbAIcLNKVXSkPJ0Xry3KeGqwc3v5a4SNmEGLYBZKdaIAb
+q4a6ViUPFxS/MduXzXxzU8FaXDMZj8eGezExuDUWrZvWLjmfl5RaV+/JJbTRcMKR
+xIVqTKtCbuXvNsetc0/IIQ4lz7eMniQrGQd6QM3HRg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/int-example-org-permitted.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDEjCCAfqgAwIBAgIUH+POVuWOrxSHzzkcVjJ8Zxxp7OYwDQYJKoZIhvcNAQEL
-BQAwIzEhMB8GA1UEAwwYY2EtZXhhbXBsZS1jb20tcGVybWl0dGVkMCIYDzIwMTgx
-MTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCQxIjAgBgNVBAMMGWludC1leGFt
+MIIDEjCCAfqgAwIBAgIUTwrMhhSd1s9Xs6fjDP+FeWX6YigwDQYJKoZIhvcNAQEL
+BQAwIzEhMB8GA1UEAwwYY2EtZXhhbXBsZS1jb20tcGVybWl0dGVkMCIYDzIwMTkx
+MTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCQxIjAgBgNVBAMMGWludC1leGFt
 cGxlLW9yZy1wZXJtaXR0ZWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
 AQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24a
 hvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJrbA7t
@@ -10,10 +10,10 @@
 JdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4
 s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjOTA3MAwGA1UdEwQFMAMBAf8wCwYDVR0P
 BAQDAgEGMBoGA1UdHgQTMBGgDzANggtleGFtcGxlLm9yZzANBgkqhkiG9w0BAQsF
-AAOCAQEAsx9Hr8ur9KGINZ7JvIoEdcQJlkBGNY1cMMUHfustuzSbF3blzMQo+215
-08rtBCJcvFzi1eCsjvTn+mOwPNQQKIRz2bXxGK+NcCoPe2w6Dm2Kipp7fCQg3waI
-0/dkqFrK45z2PIb5TS9f0S/YFGvs+gkf1CG/gMQHbMOeHZv4yGhUWg0LJl8sfotC
-+byiS2Szq4PCTODUJoptINo621ZXCJ0sRIfBVsyh1XZm4bu6U+RnXEEha1jQPe8t
-ecreghBRKxxabWYi0chpOg+T/yYDoSd0mrCCvRh8aWR0tzbvA4nsX98gkCymrzCZ
-pZE5GtE5ccicFDNDLSzxvvSfPmOAQA==
+AAOCAQEAoHM57NeL7TRmMXZ5eR6hep2vYELQ6x6OHIZQy6v/B9mDY5kdNkO3tcbW
+jEbdL3wInvxxaUWgDfdHlW6isUDMWn9pqAejytzwQveCHHve+yPmaR5Kgnm/LR7U
+ygE8f1CDpm/u/+q8UXzG7B8g3qwo1HRWx07G43ZXbMp/0BiBdA2Hjhj9drohosAY
+g2aDqaRIUeq97PCarNztkzr//zt9eCXg8qQBjVSghB03ikFRBmkCBVBNLqq6iqN+
+wb6Crc5RKKEec8n1HHEBnl16sfF/W9Z3GYFXf/Oesnz9JyaLuns1MiZx+TEf9afn
+sg4XFW8K1vQ+t/1CR+OB1sEhmgkd2A==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissallowed.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIDVzCCAj+gAwIBAgIUS/OtHqC4UP0buADWdciN5emcwyAwDQYJKoZIhvcNAQEL
+MIIDVzCCAj+gAwIBAgIUH/IH7a1iPGpyhpstium2HZvHBr0wDQYJKoZIhvcNAQEL
 BQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBh
 cmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMF
 SUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEExCzAJBgNVBAYTAlVTMQsw
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEExCzAJBgNVBAYTAlVTMQsw
 CQYDVQQIDAJDQTEMMAoGA1UECgwDRm9vMRcwFQYDVQQDDA5mb28uZXhhbXBsZS5m
 cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogG
 NhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqn
@@ -11,10 +11,10 @@
 p3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQ
 Lzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p
 47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo1
-7Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFbWieufo2Dd7ZCTTxGtE7AF5wRjL
-q25C2B4gOUEGT/802ZLKCMJ+ErJPKRaZYT4XPmOhWadBl7VHZh6NQNbPsBmkX6tb
-N/unfUj7YzlZu6dVtLtA3AULF0ZVK+HAgM2BokPRfc5KLdTMvlJprTfQscyeNSHN
-aVQagN1pjyhXgVD89LipYkSRvApVz1st0IZyvSxhU0Y0jvqM5Rr9MwL5DM5rj00C
-XVYuSK2T+ZV/UvTZQNtUvJ3iStJou3lttqGeQfkH6y/Is78+xTiU7qIjiroE8GUQ
-GegEvlczbYwCQAVGoDwejP0l/X1s9GxlP9km8KRkuOyVGl57m/qhTClkoA==
+7Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALZy0l4IRtgX2v24zAUssBpdMpfUt
+2Evctbg02kRX3y1cWvoXMq4qrnoMhoaNBpdMf8m1kqbsirPaT5NHsr7V/NgJGPwA
+cHBEb1oV+Smy8KfhqF12VD2gWYHxs9Ooc67+Bf90cZO9yPpOjiNqJeMtat/xVA+e
+dG1kE6V5tMufIi4wARy4tjaMWoD2aw4oYFn1VREkOeyT79JzCTJMBR1bArVhas7D
+mn+EON5e16oYmFPfSRT3oWmtEHa3Er0M5v0icSaEA7YFkPdoXLRNxstggh7IPcD4
+3dmH0xosUax8+E4gp0lVk+ok0nEvRNcw+KTopFSO83tPn/4yLQMGjGB8Rg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_name_constraints/NameConstraints.dcissblocked.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIDWDCCAkCgAwIBAgIUFZXU+s6RhqnhNyjf87qOdWRYBDEwDQYJKoZIhvcNAQEL
+MIIDWDCCAkCgAwIBAgIUdb90UMieOa6hVljB8cPlSVhDhNUwDQYJKoZIhvcNAQEL
 BQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBh
 cmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMF
 SUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMCIYDzIw
-MTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMEIxCzAJBgNVBAYTAlVTMQsw
+MTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMEIxCzAJBgNVBAYTAlVTMQsw
 CQYDVQQIDAJDQTEMMAoGA1UECgwDRm9vMRgwFgYDVQQDDA9mb28uZXhhbXBsZS5j
 b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braI
 BjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVa
@@ -11,10 +11,10 @@
 7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4SB+oN9OIQ+8nFthVt2Zaqn4C
 kC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJv
 aeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgK
-Ne2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKPOzPEvThntbScKjLrMbGkKf75o
-USqGWxCRBRCkrxOGDhMPWHjeXkO5c9p+vHv8oIk7dAyRKZ8m79VhmKXtvb5m6XxK
-CkqYjsFWQTN6fnpitR6d2r4DmYHmNL3x8HDXtkHewiGCEFyVPzgRXUe+RN6AlBoA
-5Nqvl+EOpQOtTn1jT65KSU29S2dUnAijcZKsA57PsC6j7GsmW20/DOEKQighsVNB
-P6MF1dwzTnL+yyOSfOJ9a4zJSXtGl5wh3WlIsEFcfAjtEg/cUmjVj3z4PWiL26mH
-bEIzu3fpyULvVEXhp8bQoW/xVlbXWVigNLu3Yf2/KbwF90bBhTNrOc+gShE=
+Ne2NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKIQo2A4GXqb8uYaOekw5f/SJBg4
+iPiOlhNNGEmczSCty8UbFDrd3L44EpH1Wi5YvuxnqWwHzLxU4Ze2aJIwIZ04godV
+nHCd57qFsuakPdxesdGeFdeM/Ni2h6YhZkyoZzmUKtKbMcoCQOq/WPzXehU9/D2n
+okuePkoXw92YVSFq/IBuKcPpQKIpKq+Oho9PbDXho3ZDYW5PVReif2I9Pp9mIIfN
+rGkM/oSA+3brZGe8fXUIg6zXlTiXX70FdIuWeXcd5TjY141+27jshjXvIy+5ZZep
+uPCx9jYjmOUklbf8hKeKZzFZfXo3Fg1QlXcMOmZbE4rgF7wKysux6jgnEo8=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/bad-scheme.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAc6gAwIBAgIUddXOXeCQGJPbvAbO7HzrHgrOWZowDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC5jCCAc6gAwIBAgIUd7u/VsqA+jFMod09OYNM6n5mIjQwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBUxEzARBgNVBAMMCmJhZC1zY2hlbWUwggEiMA0GCSqGSIb3DQEBAQUA
 A4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HH
 Jajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOr
@@ -9,10 +9,10 @@
 dTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQE
 LL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjMTAvMC0GCCsGAQUF
 BwEBBCEwHzAdBggrBgEFBQcwAYYRL3d3dy5leGFtcGxlLmNvbS8wDQYJKoZIhvcN
-AQELBQADggEBAGefGdi+gSZBHawr8rv2uXIkEsNidkeerrmFFHozrFdm3j17Z7HG
-6xQWSlcqMI1P26UP8ElXeCSJsGbnszZHS7QnEExRMQfUWl/wMWK8qC7oaIhNMyJx
-1V0qaY+sM4zNMNFH5tRf2N0nA7AcFsOjcq3GkmlhEqu3Sz0C9Mm8g0qmqy61OLwc
-ZhaCD7NbZ/tCn60ssHkGNGFWdzi7hvMTcvEdKZlkQZupfh+SqpZdQwX1xsMmzFG5
-i47EAAj/EaYTVKAGRrEkaqVQcRZrxCM36G4Ea3Avy+LpGHyGfVE+2L7QlJDMjSdK
-S77q8yWsvR875RtlT3GuYECYIKWLQpSMUwE=
+AQELBQADggEBAKqR40rThjJ83dCqvxt2tqzfVWNsG8/j8Ylkh2PVe4duegymNbtx
+lrGs7e+bR4s3HXwGdtCNqInFuFlZBK1j1LWZTd0o8o/p8VxXk3ZRyWFfaBM96mfM
+EkbWSlmgraoS3OJXemV1mU8HpOnsN/P7jkTeAocf+UqXOuyg08f4qKlAwkkX4DIu
+A6NHuFmPqDjj2uclq/e/xtL1Xah22kIkql00CmMqBdbtKYnYHd4k5wCWRkEiUzlc
+Y8qBnTcamQiNYGgQUOHh/5J0mCrNDmh17A1rnJ4mjkAy4F+bDp2KFwzPtLJKhQeJ
+jLclopcJHcmgn3hFbHMcgDwQxVl6UIZXOes=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/ca.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAbGgAwIBAgIURdVlYhM27Zz+7PfsoqUYAOajP4YwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyTCCAbGgAwIBAgIUVSmns5EZzUHKobrhxdpy/ZtJMucwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDTELMAkGA1UEAwwCY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
 AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
 m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
@@ -8,10 +8,10 @@
 SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
 /K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
 FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYD
-VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCOo60ZdxSjmPTbq8Q3+MxNusAJ
-Tsr+9zvgsFeA9cda9wRzj2csjfl9NTZFvx8bSt5p3rvCHiHYte+VQvw5sinVmonb
-cDfx5/brQCYSgk4HsP6BRxBXOceHbrDcAKJIBHbVtLfuTp1nBcUAUCyxiUuqvwra
-hPg1zusD/8X4aS2JhtoBL28zTFVl5EQ86Al5GpiDenAqwTRF+yD9E2Kl2hBej+If
-mfaqdOS6Tr3NXnu7GWVSz3k5rbMlTXSjaRYHVZclVS3Bn5reBXYgkglZGysgB798
-n2NLn6DYISV/LqKU/9sqtUr6k8C2lRO8Ws2+K36kgYstSEcCKtuQrDJcli7o
+VR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQATPLfx55bklmCWgjlOjZjD8EpY
+fenI0HAkE0044+KmVlFSpsETog4OK0aZKYKwDysClM/ZipzBpmcZ4ZczM0TbtC7/
+d8nfUmT5R/sXBuMmeNIioAn6J5JaSctKQbsVta9GwIyJUBuYIvccL1c5wUuxV8xf
+CaTrFgKWkDWkhOEY+TN/95l+Cm0Gwc3l+jom5UrPRyw9Cb5AhRiRc+x3HhgJ2hGe
+kKo4K/AfH/jE7U0u4VM+VZTQf5K92aih3f54vPW+yFfMkgFgzHtwIrj1WStknR7u
+yRjBCHfjuoOgQLm1svKtpgnMbRhucCkW+mifY+ZbE51vYMiRlK3sHj9hz3ol
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/empty-scheme-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIURwGC1UILkUOweqDXEpHM0Gf5P2AwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC8zCCAdugAwIBAgIUC7eHAf4GqnJKXvCpc9aTUTnkKgEwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBsxGTAXBgNVBAMMEGVtcHR5LXNjaGVtZS11cmwwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVo
 V2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p
@@ -9,10 +9,10 @@
 W7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EI
 TjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjODA2MDQG
 CCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYOi8vd3d3LmV4YW1wbGUuY29tOjg4
-ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCq+qv9Ba3ThYgdw55r6GiLCDhVfia8eTs4
-+h0XtlT39DYqANQ65VqzrLe8G9cRunSJJwsHZYEVoyhbaZvrX0Vpo6Kdvl7PMY4x
-7MpzXNs+X/Yh2u1894iUV3PHB17MWvQm/2CElr8WrfHHDPTy4rKalIjjYrdxhGXc
-HZ1k1kf/49t6lzYokidRvsmDQ0UBQ+DgllUAu9gAaW+I/WPasY77PedBO9ZuI0pq
-Cd3gO4Co1so00PxAN5Tg4ZDn+QQmANv7crVMceYWYZ0gpo86AJC4UqeKhbnujqY4
-j85D2Xxka3Xs8O322SJR7bHGYTjxgr7x1JUGVDgGhGSythpFAXRx
+ODgvMA0GCSqGSIb3DQEBCwUAA4IBAQCNWUubk4gbD3KqPPJW/vNw8LUHoQHjglk3
+6+RdbY/UCNfd6y3aGSrDLV8a/tVnV55UM9ADi4pd35Otu5i6fGunQcoL19QqFzDV
+4dYC3WWGw+AqcF4pgqHBBBVtgDx+kZAS9NwwKCgaagPx7QOWJCDRgNxuol7q1UCI
+vthWRt2PPIh4TCA5GDrFfrEYmVH6KgLKtHHr7TBrW0j3Cy6EIAsMMGXbj7z4DIxr
+Lh0lP9sW87QJlU1cJF8VO1la9yDWvEQsETw5X5SYBdsG4y+AJ6dJI4872/fgAG7G
+DP6nKhXuFvNbbpDTDKAwW2Xu4rVmPmUzv8G2+xis/u8jPhxv9zOS
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/ftp-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAdWgAwIBAgIULyqbz9c4QOAhkrHgZAuBRVM3ANQwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC7TCCAdWgAwIBAgIUPf/7zF8sBjFB4sd3ys4pW8gWQZAwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBIxEDAOBgNVBAMMB2Z0cC11cmwwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg
 2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ
@@ -9,10 +9,10 @@
 DJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8W
 iy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjOzA5MDcGCCsGAQUFBwEB
 BCswKTAnBggrBgEFBQcwAYYbZnRwOi8vd3d3LmV4YW1wbGUuY29tOjg4ODgvMA0G
-CSqGSIb3DQEBCwUAA4IBAQAdgZS9MbrHfyvsZ37zHv+9NnuEghTeBDjchFnNpbFQ
-oUJxtAvYrEtNAo8e4mzSDrn1dS1V/6C6F3GTgKHAZqWL4Pz5kRKU09mMfycxPLxy
-VADgbVKsiKcAnkjp9UGhXwFMIB5Kj2utGuMGyQ0bNPUFGuY6slSvtcA2xp2IgkEV
-AM1jFLQF4pYKVXGzFZth2b1aKWteRdwgC01UmCGHPuUzJDZDs3mNT2c3bVgKFOXu
-uKl32HKZlFVR8lLqPThJHsprjmf24wBSW2wi5u+2HClCFMYWJcYIb8/H33b2nXro
-FsMJmYpCEZr2E3fLxEo9z8lRUhItFZOUlL2r6gKC2amD
+CSqGSIb3DQEBCwUAA4IBAQBoJzEDwSyDzVxFuPRiRs3kcxZBa9FKXJK472UKrwvc
+w3xx8+TJPwMZorN/UMe+rxOBMORh1U3bx/nLqfyRB6VxGD2NO/JAUuaXsrEt5cD9
+RekCsFg/nZ4kjnFS8W0ImXGs5MaAEHKyVLaQFaCySpz3lSBd6laJOLpj1qkFIMuv
+Z/AsflArUst/hZr+JbsPORu1TBOAWSUofKcfMEGs7WFZS5TwNOxFe0va1ejht7Bh
+v1eohpaa5c9SA61Z5uD2vvT3+MiDDs7IAqb1m5hHWPVsgqxSbhzEdqwtR68NejLA
+kCeintbVE3FgH/ZC5oT/DYo/9DqAD+CGlbIfORvK7rhJ
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/https-url.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC+jCCAeKgAwIBAgIUSXRGY+UI7mPYhTKpAqQqiItNfaMwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC+jCCAeKgAwIBAgIUL0PWDEnxL9Qrouxs08+j0g981AEwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBQxEjAQBgNVBAMMCWh0dHBzLXVybDCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -9,10 +9,10 @@
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNGMEQwQgYIKwYBBQUH
 AQEENjA0MDIGCCsGAQUFBzABhiZodHRwczovL3d3dy5leGFtcGxlLmNvbTo4ODg4
-L2h0dHBzLXVybDANBgkqhkiG9w0BAQsFAAOCAQEAuXYi5L8xlg9UCX8R4H8sN+p9
-iHdT2DqwYcy1JJOFSCKkxd99BnTSe4ByvyY3hdEti6rV84D7LMtC/9ZITsQgk7Ng
-HOFTKNAIi0jMxDNlAwjyil50nGy7/cNkYhWQK/4gDio8Wh3W8ASSvIOcB2hZOQ+C
-hb95vh9BmnPTaWDjTMHQP9Gz/X64YW9hKLcD6d+cLoliiaDrjuJ0uAiFqLJhI77s
-Kqp+oCxibyelk0X0s/XxBnTXl2gIrugnYZztjfGwKCr09OdpPNBu/ko42yP5wqlB
-QNqhPMMm8GcZsVX+RcsSDO2LF8bE6V8ARrRAze9jP2xdmK2DqoP7CAAxh3RfDA==
+L2h0dHBzLXVybDANBgkqhkiG9w0BAQsFAAOCAQEAXzQbnyFm4vlXOrCe9Pt42bt+
+6gg5UZieDPBYIiTBTfUY2e1EII4pxyRJJXjubbfajd+6bxRt38nd0/Ts56WljwiN
+ZefieOoMVsRVrX6APHiMvkkZwmtqwOpAgxICpg/pRqEn2BAFIPB3Lrm5rfGHZhw2
+be+FJp4SbBHlnQUnG4oCl6yzR9hAcRssZL+6ewsWNet02aNJgDAVg00wLxNhCFAt
+ZdtPq+E6l80/LYLYoVY6O+osC5eMR4Z48FoN8NQ8Yu/pe/t8Km/59NdyQxJFneXr
+HXpcpdYsVOr4gzbNFO2552esXwx96tprehFtVc2ZxqnorfMayJz2uO/NVcrPxA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/hTTp-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC9zCCAd+gAwIBAgIUad2oCzxUyFlgI6AmadQ/g6Er0RswDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC9zCCAd+gAwIBAgIUFyY16h/GkLcgYETfxjsZRxt38JIwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBMxETAPBgNVBAMMCGhUVHAtdXJsMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo
 4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDD
@@ -9,10 +9,10 @@
 owyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/
 Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABo0QwQjBABggrBgEFBQcB
 AQQ0MDIwMAYIKwYBBQUHMAGGJGhUVHA6Ly93d3cuZXhhbXBsZS5jb206ODg4OC9o
-VFRwLXVybDANBgkqhkiG9w0BAQsFAAOCAQEAWrbUPG5G/gZpnAHwob/7r+U4nWLk
-Ir5htWpZtp5uERHyNfo8eFWg3D0edtsjFhfS/rdB11yXFuYXHX9NhVcm8hIkLowM
-lr7xOSzLmAX1CX+4zNWooSSb4Z7MtyyJJa2+lJ9CCuD4g2DIjTQ1OjRhvxRtpJ1o
-Zjta1UQzZKlwGeNC5KR+PN6YObp3n5YKSCUTrMjaTZ127KimobkbxUjaJ/oYedI3
-izcEw5T8z3L1YnwhsLxVnhs877/4h5IIdkF4QqZ9PJlmNSNZFdQhBMpQTF5wrcGj
-TkJMcH8TRNOGj1aMnUwFXic6aBdbv+rGwMcFey6QGuTVSUdr1Tzp3EwbYQ==
+VFRwLXVybDANBgkqhkiG9w0BAQsFAAOCAQEAg1XOX1zbHNpzMW9ivatvCMi9rMgQ
+ZPFkuu6i4c5diLgo1VbzpM569nsfZnXkWGBv5hhGlFlJPRPc+q9joJMMsebnAlR+
+Q27kAqd/Q9kLQfA5x1Vail+7fin/cI5gR2XbmsXztbX7QYnE1lLSR1BWkJ99LNj4
+lfG5Ofu8CG0dBPfbO4+WtwNnije+J2O3iRc54EEv9kTBaieM34ejxPwg3WY/cUsw
+h6UuRjOJf5Q/uhhRwzPZ4sphsdZcdzPhamIBSF2aCnUiFJlYLDV5eBLbr3GVAuFE
+bJN5zNNCn2lzyo5dxbzuQO6VaGsZcI4/Y2gMn5Q9Gxym59qniVGLCmzTOg==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/int.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/int.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/int.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/int.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIICyjCCAbKgAwIBAgIUVfwn7ejbExZ3FLFDGLrYufzpmFkwDQYJKoZIhvcNAQEL
-BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxODExMjcwMDAwMDBaGA8yMDIxMDIwNDAw
+MIICyjCCAbKgAwIBAgIUNbjVwdBjmiBHgijAyjyGIHuhJqQwDQYJKoZIhvcNAQEL
+BQAwDTELMAkGA1UEAwwCY2EwIhgPMjAxOTExMjgwMDAwMDBaGA8yMDIyMDIwNTAw
 MDAwMFowDjEMMAoGA1UEAwwDaW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
 CgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGc
 BptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzC
@@ -8,10 +8,10 @@
 uEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK
 9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGP
 mRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsG
-A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAjUgLQfNXAZaTn/0gN9JoK6x7
-uqWFck2fMXX8MFOiITUkZe/NAqnkctl1+V7xrGvA4xpM0HlfY5Hq8FmrRmitA++7
-gYweck1Zr5dgKeNCraueLtFS+sgrfwP5JRsMgFMNYT1VVdstrKo8UqULAlZ3Ju7B
-rtB0fmUQxtJM5MCICVV0RSJUZKaAh0YCpktlP8wwZIDhOF1QKEV6uRHfoWGWNybH
-bJaZIfXe3F/bUcMmrvVWxilAoWvljxzWWTcfYjR78FBllTqSFSxKabnNaIAplRnG
-Lv5WfRyeSoO4jZm1tdmIB9kBJAGExowxxOypk2Ht1e8oDd/4V1ZLYg5PIvt8DQ==
+A1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAO35vcl2OA9fAarEgTCrS42CL
+5BeNfQLO7QCIdMZBfcIrQ6v5yw7i07pYGptagz/76OwYOsKO1lqb7sr2nTCNovVp
+Co4dCAGQI460C6x3BOG7qyCFgZvf17xXl5filhMZw93LkWaeEIp8JmOTb511i1Bv
+1akdFJ+xW40AuHE7EswLXzN0eu+tVAMJcsuxibK3jTkEdIjFCVwMD/7LC1rcoKcg
+V18MHbh0zcDrXzo/jk8JfjqkOH5eylBtX2DH/9BjFcKzZDvZQFYlhsmADRHOmqvi
+YoEXJj2A6fRzONsNKtQQbmVGvW/rHP7/YIiaAvn0kNb/FDtSqmTcLazSYpRewQ==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/negative-port.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC8jCCAdqgAwIBAgIUec+thnBfxFxLas4mbhurfVBnZl8wDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC8jCCAdqgAwIBAgIUe2K7ATAb5CY6+Kltt7J1qxX5Yn0wDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBgxFjAUBgNVBAMMDW5lZ2F0aXZlLXBvcnQwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
@@ -9,10 +9,10 @@
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjOjA4MDYGCCsG
 AQUFBwEBBCowKDAmBggrBgEFBQcwAYYaaHR0cDovL3d3dy5leGFtcGxlLmNvbTot
-MS8wDQYJKoZIhvcNAQELBQADggEBAF0lD+9Au0H710DKVCylXu8qJ2OAGYgjNuJN
-aRTt7yQvyIT55H7cCexinCZHkQZc3t6Xjx8Ovdx8+V85GftL2zJTbjcnPsbFZ5oz
-81gFRCfptFOzKTtaqbFPDvxXamm/JTfHBL42Z5Lp2DL9yelXeo3da24M2S6ejrc4
-siLImfHUv8Cimpxw+fY0sVWdK6ewS+hdmOAgmcCykEMWnDATiEZeXNilr1JdvdGp
-NXA0zkr2+EtXyEzvgL5UKRn7zLh5tov3suWb2YZ7OpwXVYJfB3PTz8mTiGs+eN2x
-EiUas2vXkiSbVHflvkmx+wnnHwsJEb/WcxzS+dDBvNHZbealOJQ=
+MS8wDQYJKoZIhvcNAQELBQADggEBAJbJQ0Qp9K4dFRMu5te+e4MPi+zb9ZHa1nmE
+wQLYKbmJ0/HSP7RjAnk2LqPi3Kej5aAqSWfd9x4pahEro9CEjVSrjD4y7iBTXbM8
+9jTyN01BJED2uHjVwOuaT6dVvx5I+QD7rAByxweQ0aoa14Rsf/odAszWmiburmar
+3LuVBwfB3gyqBk8z6VdfqgUMjs+vi/DesvSZ5IvHwWGFok9uab8v5Ar8L0KoM5gT
+1fAERsxk6W31SsDsSyd5si4dQo6tLJU6jVm2C+rEbt/iOU8CLHs/IozD0jXf1j9S
+XeqFoTBvmJaUqpDdgjzXX/ZACz/s5YffRuDfrRqo7H7cBNaK1r0=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-host-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC4zCCAcugAwIBAgIULaFqnXFuzxktjE3spB+tDEiMTdMwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC4zCCAcugAwIBAgIUY6ACuApKijUD7p8u8yUDVv95Qr0wDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBYxFDASBgNVBAMMC25vLWhvc3QtdXJsMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -9,10 +9,10 @@
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABoy0wKzApBggrBgEF
 BQcBAQQdMBswGQYIKwYBBQUHMAGGDWh0dHA6Ly86ODg4OC8wDQYJKoZIhvcNAQEL
-BQADggEBAKYGUrKx8paphsD/kxO7okwXsSuJHRlcXCa7JEjWnxePHYLRcqBkzaEU
-ZdxKJ6YX1Jeqzusj7QAOX6KKZVIDq6grEk1QSDJS+ZG2B9YAFPioM3nhR1tGPnYN
-GGQ1vTw5/HcQh3zByBQ484WYj12asNoso+YcEPzm7R+KmfErLcaxUioFA4iI/cvI
-hGtNzRitT4oE6JuK8j/9elDDubJtQwVsRAujJCvV6/4mK5jr2cFNvKdjhpMxr974
-KieMXnjsyaiyjuikRb5r+vMYHVzpnCjvFi0ASaB/9s1Htza/umJEzxZfrcBqyVyH
-2lEGuE7pRvw0IL2XqNg+ud9kzfcSqDk=
+BQADggEBAKft+lbYDwaC4MkOViz/t9Zke8sOCkydLJ+gRhx7iaFjQ00VZOURHWrf
+wbOKHaCe3WYofBMlmKARmCB5U8ohvnDqVuCnyt9hXKg3dhWLRGYZOxLEeToTddxc
+OSyl736QFCT1GUtyzRE9fG7RZtSmTMrrhxDUkBf5wuwHboXEiN8pXEQY/L1wxze8
+lbGEBvUnQdTtMm2O9kz0Dg186BBw3Fi4yVcUU9COnvDRMfLt8Yt/MGbckfsdpRSn
+qC80pJ3kFvJkzBF2MwkJVlZMBPFNexBovxAuVk48uyJLDyNp4J397h09JgvCl7Fl
+FMhwIBglV3EvWERD9uq/7Hl1+zLD6GE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-path-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC8TCCAdmgAwIBAgIUf1G8oV7sHf6BXzjE1VW89NGVhuUwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC8TCCAdmgAwIBAgIUE41GlTjHpx516QFRZ73bImTTVmwwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBYxFDASBgNVBAMMC25vLXBhdGgtdXJsMIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -9,10 +9,10 @@
 wHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwk
 BCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozswOTA3BggrBgEF
 BQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly93d3cuZXhhbXBsZS5jb206ODg4
-ODANBgkqhkiG9w0BAQsFAAOCAQEAufAxH8HR1wM98yQsCBK+6X/ZB5iQcjnbuPU7
-jLG5WRw9tXboZng50y99uEdJkAb7hKy7RO9HlKUClvsKy+BE8s/2uvPJKiagBDek
-bomUwc5H9nS4hz+frzTFfiCUqef0TQoOrWSZ8DR3xGsY86zk+VtPHOQpG7AL9LTf
-RVwzmPQTlah4TXuvLAFYwpNL/MUg/T2qWBI0kgbRIdFvbdAY2fNZOC5iFKlYyeEB
-R06TsgWxRzoBlvHAY7/m3VhV7Eoq7Pe0O/8AwzyLE0s8jo0g/aRVdGDOZ+PvHiGc
-Z2tVFHBzb9+2uEUc8DNTtsh9r3xbyT1EKhlk/A3v7xv6goZ2Tw==
+ODANBgkqhkiG9w0BAQsFAAOCAQEARnXgGgNQHB4JClN93VLOVYzJoPkCtO70HjXc
+nIuhAAwEISvIk9RWeDlE33x5T+g8SFaEOp/pqSZaa9FUr0y7PyxEwfF72JPQMff0
+L6dYtKiKS1+Uh5FNHC38ev4SJdOyGvD8k7og4+VVlitcDtQgVqiKxBoBCzl37wuK
+s1aFx9a7FZcum3sdyFAQCwqpr9qWf9NBbiDdbZDTNyCg7zxk8olsr/DjQLKrAo40
+n2DPfYw+kAfXZgAi1XJjREe4BAaMJw9zCl7Ugsxl53YbUSl1CeicOH5yUiQ3vlCp
+eW2QVjq/HRi6zUrSiOhgIzgVys4LivV3FgKIV/m4hgAGPHYLlw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-host-port.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC3zCCAcegAwIBAgIUZ99cETIY+s5SxJba8zzT0J0bb0QwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC3zCCAcegAwIBAgIUD/zYHQI03aXMAELGGvMX7vnOnyQwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMB4xHDAaBgNVBAMME25vLXNjaGVtZS1ob3N0LXBvcnQwggEiMA0GCSqG
 SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq0
 7PVoV2wke8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D
@@ -9,10 +9,10 @@
 rZZhW7filhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWd
 q5EITjbLHCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjITAf
 MB0GCCsGAQUFBwEBBBEwDzANBggrBgEFBQcwAYYBLzANBgkqhkiG9w0BAQsFAAOC
-AQEACou6FusUddL2x/vnrKn3IoZNABZCUI+i182hbuJRVgBaZjRvoZlY6DoTDEVw
-AaBFGhIX9d497vTBR99fGSvzQaqrw4T+IehbbWhTmUm2miXg7cLIQ6CMaj18S5/c
-678f2u3D86SgXzuq8J9jTmTCJWwhks/OO4o702wwK628kO8sKS+7h6yDrY6LukMW
-PuQ9QK/mmMIslk4b2XtCwRSta7YASVFyeTBSJQZBgimumR03ij5F8YwlEy67z3qb
-p2vFwXjaOQAPZ05ZG/FXB/nbm4YeoLIt5eE7HtrjHf3KwdbqtUJYSBMroVu426Dg
-vvdwQjgmRhQoVFsvxbLhNkVByg==
+AQEAddd/BUyk8OMHan7wrkL8m3euWJ7+UjxDP1yQL9Gehb34sHiSwr1pE3hfbmHU
+Xc92MX9Fnm/M/uZRoMQqUqU0aqPr91rwwnf47+sd86yNvXxCgjAIN31W4wISDuqU
+4j6dOYPyz0KGlD9qRJorJ4oxhnQfleTcvz3COrPrRypK4QuRJu3v7wR1qFvZP8Iq
+loJ4cY8WwMMpaYecuZHrhfBpG8yO3wihc6IkXqWRWIzBia00v8DNSm+neEF5FTk5
+oCXNJAdh+qWwfzad5gUYGAlPaPdNxbO6G0SOfn7RRGSQj1Nb2Cl2RWzGAcGSGdfL
+2h4H1w0XLwjStLtUM/8eQUvQrA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/no-scheme-url.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7TCCAdWgAwIBAgIUccWpA8vDZ9Xlo5JjymYkT/7kNK8wDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC7TCCAdWgAwIBAgIUBziqKKOqXlKjkoU2XMzG67w9qZQwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBgxFjAUBgNVBAMMDW5vLXNjaGVtZS11cmwwggEiMA0GCSqGSIb3DQEB
 AQUAA4IBDwAwggEKAoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wk
 e8HHJajg2B+9sZwGm24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0Dgg
@@ -9,10 +9,10 @@
 lhLAdTGjDJHdtMr3/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbL
 HCQELL8Wiy/l8Y+ZFzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjNTAzMDEGCCsG
 AQUFBwEBBCUwIzAhBggrBgEFBQcwAYYVd3d3LmV4YW1wbGUuY29tOjg4ODgvMA0G
-CSqGSIb3DQEBCwUAA4IBAQChIEAmrrHSjJzC5J1x6DPmwKxGK+uRqQl+fx1Vowfo
-Spyemj+JvbRJtB3F/ug652nv+TSh7xrWNjdpKBdOqTjqA6ScVTiAHUCgk8MTk/c0
-sUKuwP6+re8m63zM/RL5/W/3I/Q+SIHsPlfixqpLJ8s3RDyoRc01sZYZ4ZLK/UnP
-NaqeW3+QFJ91QGXfIelt9EG+3ozaJl/kisYgRAbsJuyP3W8M13TFKZAWt759CFfA
-q6ALJS78o56evUqFbro10UiW+0aQ8B2t+a4tJi4Ogsz0LaQ4K/j6hOCrYyn8R+5t
-Wh/Ud4x2w7JnlTnRncZRACAFqEPLaLrdPaJ6jNsIEmD0
+CSqGSIb3DQEBCwUAA4IBAQB2TQq4V9zThvWdOYtaIGY/p3o6OHgtkU2n9RFVxImD
+h+CObFyHbyDpbMMKghZOfdbI9Tl3QMk+d04TnMJRyiw/XhRJqoDY1fKv1N7AT3TM
+Jmx3mR1wD1l9Zo/c4XOywljeypw++Z1DmtwP5TER0u4oLTklBzw9oTSR8snTyfSn
+YA3gQL1jFVWwVKou1Gm4pZTavUdCpjJpF3Bp7QUKRFncTvYViVSibzVAIG+/PiY9
+K/EodGfokxgcKG2GUW6kUe2XadhJ8m2KSWtJrBKXnQ1pY8ZPbWHD/jfQsExRMGJL
+wJx7HqA+8WNBPwqlqIbQejaieRIKOi++QIRuW4QPKA+6
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/unknown-scheme.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC7zCCAdegAwIBAgIUU1Rw0pKs8mQQZVvS3YFKlClGGu8wDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC7zCCAdegAwIBAgIUST8AviJzhAkMzTRIKaSHBtla3aEwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBkxFzAVBgNVBAMMDnVua25vd24tc2NoZW1lMIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -9,10 +9,10 @@
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABozYwNDAyBggr
 BgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFnR0cDovL3d3dy5leGFtcGxlLmNvbS8w
-DQYJKoZIhvcNAQELBQADggEBAHKWDrFfqElT8gUErFV4SrYC7rxxBpWyLTYcP3aM
-FavvkRGv4mogMbrAwbhCNBNHDSVsxGCI7V1h4/V95MACvZBKZ670gE/4Ck+zsC7k
-HrjRY6n6Hrq4d/76Gdg/NPe4MQv19Lz6wH51GEE5jfR/XvopVxlKwl3fE1B2S2oy
-GIt4cgItulNKIQTHhbe7QyJ9sULKDl3WUoYNtg8U5vsoSF6rVA+LhBKx15rvlcLD
-ABqzfuamCN7qZGcVtFbfeH7ekVPC8LRhfQQuxCbaFIupzcF2rAXkohSXUQnJpMDq
-UDBvh5/IoYmDXsDT68EtV1cte2KqLAoenUGi0x1ZJHSxgXE=
+DQYJKoZIhvcNAQELBQADggEBALJakuxDp5Gpygxj3MY9tK33Dr/JrxN9NH0GmgcR
+ruhT6DwStz7irOadxVUqNxxSIMf95QBHPEAWihXxn5qyrmH5Pz/M2H6H9xpWiK1r
+fy5UTynUpcqZKVHHfER7tdw371XNdyPeGAfUKQwzO6LS4aBFhDssWxba0ZAt/iQU
+Gqf0X9d73mfEvJZeiMJSqXReITRjTb+0f++0s95IfEhKs3YL9nbP/LHw9XxfmLU/
+2ZUvuAfOTq5U1XnoGIoqg2C8LtQxPXjvezAW/XQNcjQBwyYBxa64HFp5deWv7imf
+QjF9yYYJOBz+BdyXCM+DZL+YJ/Ic6SpuEquVHewvegOpDDE=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_ocsp_url/user-pass.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
-MIIC+jCCAeKgAwIBAgIUGxQmG4JJqiLA06bJcQcM4OqmB9QwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQw
+MIIC+jCCAeKgAwIBAgIUc+MjmGMCD8xzGcHP2/uSyWK/9D4wDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDaW50MCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUw
 MDAwMDBaMBQxEjAQBgNVBAMMCXVzZXItcGFzczCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wccl
 qODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sg
@@ -9,10 +9,10 @@
 MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQs
 vxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNGMEQwQgYIKwYBBQUH
 AQEENjA0MDIGCCsGAQUFBzABhiZodHRwOi8vdXNlcjpwYXNzQHd3dy5leGFtcGxl
-LmNvbTo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEADsswdKHgMWO0oH51DabKhLiB
-4CjYMV8tINPVced0XrZD554/qH/DfBJIXxhsppbwa4rjqdgTDpr6Sd3ZDkwyXqi0
-S9Y5rtanruas1RxJLf7Ydm2FqAbPBkUF6d4TgyZELM77G+/P4AFAXq/qTcB9iKw4
-JJDMbIeCWdEsz2mHukgWS4eUgeB5RZCiD8cC6cJ/sVEMaQY8HMaXPSPqvbilADa7
-8EpfStBCUNVsGce4mdd+/YHTMUtHRRftpYut/FEnAPnhEd1HEtzhcd/MMTWAkTJj
-9X5VmRtlZHgYrmAw82pSxMhskvX4gpAlMkoa+N2E0/ppIbptxAyxElYxVeYTlg==
+LmNvbTo4ODg4LzANBgkqhkiG9w0BAQsFAAOCAQEAOZmeoErLJLw7l2J8terpOiFf
+68YxI5/QZcRMZhVCMG71XjcZHj6mHLAgKi3Iw2iBeaUnfb5sfg5J7nOXUzebDoHD
+j9W6h0tUxMyYDSdi8aXdvJ4WywPvYlJpWc33O+iDm3cLy224wF14eVD3rZcwroes
+r/wf/86aszBY+xpkwHf/lD6KLNhmaAo0HKq8U4Ys6kJzLpvXMLcwnTs93lCE/VE3
+PYxzndXfRikAQ3j+e8KntIb99NeXMErjnq7vhrcjY7YPHTX60y8QC3fmX60qTAtV
+YWYJusDKXiSDqo1wSHMgpgJ1EEptPsR/DdcCFLfg0PnAvYD8T7LI8jvJt8H8jw==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
 MIICyTCCAbGgAwIBAgIBTjANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDDBFUZXN0
-IEludGVybWVkaWF0ZTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAw
+IEludGVybWVkaWF0ZTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAw
 WjAwMS4wLAYDVQQDDCVBbm90aGVyIEVFIFJldm9rZWQgYnkgcmV2b2NhdGlvbnMu
 dHh0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62
 iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHql
@@ -8,10 +8,10 @@
 Qe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+
 ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8i
 b2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoY
-CjXtjQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA341wpnf6aP4hvvrgLHhzAhPWB
-ddlb6ehuG/3uKVCEokLZ6FGrruw8U2WLJyq+fE7N57FGabNeEODDlmqUuvor7H6k
-SiMRrFOThbCBhKRDdl3JswSfGwSUfoHR2+8Kep7Ck5O6BCqIppiCBSttlHS0gk4z
-ggoidA8DzpaHW9URsZtnXaPsIwMG6LOcu5IZw8a+mpDiH1kuBgMW+D7FhqneCicW
-fkBKkLy3K5N2LDZPt1uBmzsOYKG2dTosO2QfrUKjbWLMI65FSAurJJBpaeUIvyKG
-agqly3GYxjb+VIAp3kyRI+2ecYF9mDD74WKgLaKTneZxYOfy9pMIRqy00Z/t
+CjXtjQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAGkBeSA8w5p5awb4t6gWXuXwpO
++N3LQcIAfdWcHuOXaYfWM6tuGRD7fumskMh1fp/7IcqxI0dvNd4iRuWm2IMypQN1
+rlYhkk6Z6N4Z2q8x+vlUl9cdFbXy8q3Iyo7dZflSkk/4vyWpIL6VBZEYs8wc+zJC
+iEFFxjakhs8lNtFgJfcKDJGpb47q2burXP7D9rPkfYhNA8JnjSc2gXFd/wqP25ns
+kmtUyjt/7kCKEtEsn2jLiIWOeASYMOzn10PVIrpX2hMphNw9DDljbIXbEbMat2p4
+GmN7xOLJgCFXZ1c1tGIxxbSsCjeHVjLY1j7D0ovOx5pn/+Fuga6FdWBdeTxC
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt-serial-2.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt-serial-2.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt-serial-2.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/another-ee-revoked-by-revocations-txt-serial-2.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
 MIICyTCCAbGgAwIBAgIBHzANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDDBFUZXN0
-IEludGVybWVkaWF0ZTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEwMjA0MDAwMDAw
+IEludGVybWVkaWF0ZTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIwMjA1MDAwMDAw
 WjAwMS4wLAYDVQQDDCVBbm90aGVyIEVFIFJldm9rZWQgYnkgcmV2b2NhdGlvbnMu
 dHh0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62
 iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHql
@@ -8,10 +8,10 @@
 Qe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+
 ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8i
 b2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoY
-CjXtjQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCJ13qFRJ7XcPuFFcqj8DT5PUUC
-EjpoBzEmCv6HArSpEsSX3TOiLtq4dXkIngm7Ws5ZQot5204+HF4is/Xd//KNAffa
-gNP2YA0JBRb3IY6pF7zPeOW3Hyt7rbq8YgQHP+n8EW45Cl0n6aVEvZBBniTvvmEx
-eQRGYc8G2gR2rtwYJ5qThrhgquY+lMt9QVtEEcPedQOZkNIHygVEei0gYSoSOlfT
-s/8+1ABHNEG19AdV/a0Stf2c4QB9pckB20vyiT3+1ttKivVDCa16MvkRL1Aa3MwT
-T1pBgEdsBFZ8TDnzwma8gY1J4nXWVaSc6oQdxIEqX4E7QJJzhcwXBGsoXn91
+CjXtjQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCZh0XjjDVy1Ev/wSgS850t9KtD
+YbFnqn3dCQjeECmXAH3BXAgb+hZwQEPvNcg1C7tzAowdZ+8h3+SbRLlEL50SkjXQ
+euMrIOSBlJcOQTKYQrpTkbT68MhvFlLsM/BCjQ6lGRIKVGTGv4Q2k8NDF3+9N//Q
+0QaTZ/3gZrmXSOGrbFUjiKrONMpQZhgVW8TMceJHnmOsxO5sQ4VPRVS3oYAbyoWU
+JwWZYN/moFvQ/bE1ZceWhdyspzF3NVy0SP+eLQ/LznkZeQ+5ZVvNftwE8D3w+rYQ
+t8ppnbaSPWQFgyL07OdFmhIpBWODrpjNQOq+ZmPkRBLKHiagw+c73gNbx5ui
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-revocations-txt.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-revocations-txt.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-revocations-txt.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-revocations-txt.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +1,6 @@
 -----BEGIN CERTIFICATE-----
 MIICtzCCAZ+gAwIBAgIBKjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0
-IENBMCIYDzIwMTgxMTI3MDAwMDAwWhgPMjAyMTAyMDQwMDAwMDBaMCgxJjAkBgNV
+IENBMCIYDzIwMTkxMTI4MDAwMDAwWhgPMjAyMjAyMDUwMDAwMDBaMCgxJjAkBgNV
 BAMMHUVFIFJldm9rZWQgYnkgcmV2b2NhdGlvbnMudHh0MIIBIjANBgkqhkiG9w0B
 AQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFds
 JHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4
@@ -8,10 +8,10 @@
 iGF5kLFXkD3SO8XguEgfqDfTiEPvJxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu3
 4pYSwHUxowyR3bTK9/ytHSXTCe+5Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42
 yxwkBCy/Fosv5fGPmRcxuLP+SSP6clHEMdUDrNoYCjXtjQIDAQABMA0GCSqGSIb3
-DQEBCwUAA4IBAQASqtcK4wANOBpLq8Zf8YgLOiIevPELjBjSNkv1QSzKGgLx1BiX
-/OGcqCBQOF5mSmo/h+ejrn6U1QYG3lVf7gCboKl0vkU5Hb5hPQe7krM69rRtWUPm
-TmxRZihBvLFzd2kAiXnBj+yPe9lnPwvp8pn/jvMCmxWFPvGyq34E5UMA+109dko1
-VidatMxNA159oP4HIYtqf7ZgR8BHwbUJgHkDZtUI4QZxAUaVMWaJnqY/LTfoRGxw
-GMg1LMAqb1YJV4Wc1KEURc3ma7MwrCEEq2NwyR00N1juYyQ/IibO5Wr4kjF0qYok
-wKgyfh5nOXiKGQg35Z1YRs+uMtfQbpOoCFc3
+DQEBCwUAA4IBAQCnVdUu30/kzE7JGkVtpRb/obsNkFySebWpr3gNfkHQJcwAXB+6
+jX6zluZW2e+2jdalTmJ7r1jfQnC76P/trz5GyWQGiM1ht50l1yZonTPtC1Qzkzfh
+DPyqUr9PgeZZMdVPD8vaMqxYCqELRrCTxrUmC+vEjGKkBlvtY48ZBcEb/wrSm+4+
+j7vdHDpAxmg6dxZrWlvOBz7TOMwGWlF8loJD3bJYepV1w5N1LB5YR4rc6Peis3LA
+EFHhbUFZlkbY7shChIh1S0PEiTSB5yFopC4iMkALBAJxfdPNKFUyzbVIZolpxA0m
+Bk9uBCR3zv4lpm1JkUR/AOL8zXI7wrRvhh9F
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-subject-and-pubkey.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-subject-and-pubkey.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-subject-and-pubkey.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/ee-revoked-by-subject-and-pubkey.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICzTCCAbWgAwIBAgIUO4qLtfMY5pVRlsfeKpwYdH+fk3QwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjArMSkwJwYDVQQDDCBFRSBSZXZva2VkIEJ5IFN1YmplY3QgYW5k
+MIICzTCCAbWgAwIBAgIUZylsQT6JPUjiShyHn9bjtXVZ1BEwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjArMSkwJwYDVQQDDCBFRSBSZXZva2VkIEJ5IFN1YmplY3QgYW5k
 IFB1YktleTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbW
 Qf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pk
 cQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHT
 AjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3
 ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jh
 s3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHV
-A6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANpxOBpXUtUxKzd4vi1LF
-HHmUMeKme4bO0vHkfdB7hTNDffxDjS/l1WwhqvpBdDO4n/8oE8Tis+69cca20ub7
-jbrWL8xaRc5S82gP7aF6NLnMDc9XvTrDsl/zd+dAVkoBwgOms01tROceMKIF/OxB
-18YcFYE52ERoQ6EKJ9dDwTNR+TzSOZ3pkF2iTUWoy5Dmg1/MhEcNzKH9tan1Pneh
-8wro48HIZLo5zenmWyXBrZI2ZRwixXLo/qcGEWHtuRySFb6ukeRdNaATttF7uvm0
-6Upoe8qQvg+ZBI0AnAz4fc0WCUXXHsvAlYgQJGnenn3+/WEo1xHVPyUD76mrkHy+
-1w==
+A6zaGAo17Y0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAeMJzZMlfsHzM/gTj02WQ
+scQ9rdvDSaPI52IWt0Dwu+Iv+nLCvn6Z2eL6E7DVp613u5y47GwtohTCvNoe9/Nt
+SWKN5WlwaOLbRA5wmt5sbrB6w1z5qt+YDJuVvaw2OmLc7klBpF+ZXHufS7XIPg3e
+xWyqnnJ7ewlYF7fMe8q6WhHlzZ5BYuhNXntpf3dvAA9xMxGYr5CQcXSDF9CqdaAF
+n2P6ZgI7K7CpWzOqLinc+kTyJ8WmcW6WiHIN2ce2XFL49oRFXasjpJtGHmIr5ns4
+yGkHw9WKKzmMG5kgLy5Ar3PSdqAD51l4IGLPIzquhnlo/oTe/Lwi5fZIiHWOmr/z
+1Q==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/same-issuer-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDITCCAgmgAwIBAgIUbZurdiXl+Tr43cT3hk97UM1mbXUwDQYJKoZIhvcNAQEL
-BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE4MTEyNzAwMDAwMFoYDzIwMjEw
-MjA0MDAwMDAwWjAiMSAwHgYDVQQDDBdBbm90aGVyIFRlc3QgRW5kLWVudGl0eTCC
+MIIDITCCAgmgAwIBAgIUB8T8WSJXA+AFg+rEJQ6d49gVhG4wDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHVGVzdCBDQTAiGA8yMDE5MTEyODAwMDAwMFoYDzIwMjIw
+MjA1MDAwMDAwWjAiMSAwHgYDVQQDDBdBbm90aGVyIFRlc3QgRW5kLWVudGl0eTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9
 PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3
 HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3Dg
@@ -10,10 +10,10 @@
 lWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0C
 AwEAAaNbMFkwIwYDVR0RBBwwGoIJbG9jYWxob3N0gg0qLmV4YW1wbGUuY29tMDIG
 CCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL2xvY2FsaG9zdDo4ODg4
-LzANBgkqhkiG9w0BAQsFAAOCAQEAfXGZ18d7P+nh/iI+f67J60kDWfztB+JHx8Nc
-fOFc0i7fcLbyFu1jXici6InDh7CqGN6bVYs5JW4PhPDUD1IcKRFBnPJXFuYUihUB
-VOhGFfBwpY6LHzkdc211w+CV5mHL6ug1ouHnzEv5r8AEkCnfi9Qci1wFceGG4EOo
-87746YQV4zCYk/zd3SRahiz89XH/oPxGV3c55FcC4ZcO2/RKrjTh+buuLJXfJBsy
-mjXvmUINGED+WAWMnjj+qQFOCuJxUKwKIGouS0q5dEqSDYIO43+YCAl7ugSXQ/dB
-gLy4F7SUVb0EHZ1j7adJKqvJTiw7F0T6w6srH2mcEs3Sezldug==
+LzANBgkqhkiG9w0BAQsFAAOCAQEAXEPHIKtQkyoGnJ0TjHvybmECV9OKdmQg34JL
+EZ276YtRZBfcPIlt6v0dTzYy8kS68OTjQ2wAa+jVyJRg24x7Jln0R2XVgyGX7FKJ
+646dlYC5sqXPx1N7bh2Zh9aU6erBBbQZbBC3KGYT6pFxHcddmSFIlkxLREj10lr1
+CTVE7Xq5pel4jE9YS4Su/n0zVmMCLdEh2mOml+L0N2oxFchczJVcogi9iGVSElPx
+PaQBsAtRW7Kl/yCEsENNXqYm/B+QaJd6c+MxYTd+DuKx3TZiT3Pk4xDGExdW+yUv
+BvVaHBtavJYAw+IDzz6MxuUIiJ/wpUXP/CnsK8eD3ADyabxkFA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_onecrl/test-int-ee.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIC6jCCAdKgAwIBAgIUBcieGsB2klHcM/UCYpIcAhPYcpYwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxODExMjcwMDAw
-MDBaGA8yMDIxMDIwNDAwMDAwMFowJDEiMCAGA1UEAwwZRUUgaXNzdWVkIGJ5IGlu
+MIIC6jCCAdKgAwIBAgIUE/Ee/Yl0qsBfU62Pa29Gu17/HNMwDQYJKoZIhvcNAQEL
+BQAwHDEaMBgGA1UEAwwRVGVzdCBJbnRlcm1lZGlhdGUwIhgPMjAxOTExMjgwMDAw
+MDBaGA8yMDIyMDIwNTAwMDAwMFowJDEiMCAGA1UEAwwZRUUgaXNzdWVkIGJ5IGlu
 dGVybWVkaWF0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqIUahE
 jhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1
 a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1p
@@ -9,10 +9,10 @@
 2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcO
 p2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJR
 xDHVA6zaGAo17Y0CAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqG
-SIb3DQEBCwUAA4IBAQArgGWpeIqvT2fePYdv52g9Y+fyufEdnf7iEZPc4G0txj23
-J/SyY3MNK2y1vPC5jJmt9ZV+btoUOHmUqMyxLlBzlsejrNUs13IweVSKdnSOwWjU
-Mv9FxCOCKTG20isjkF1GXYuaE+KRNl4aFQLYzNYMIEpPaGJPIGjChLZX2JZEcK0d
-ujL9ZVhQweHAAqsrxmwAAcHncGwOwNzRZsy8GDHE4vCytfmBVf4kaN91wFZ+ozWd
-4F5GTNmKZ3DujLVU50Xh9t66ugqMx3Zq25txbJNsSp1KJj6JDIMi+zw7D1Xzsl7m
-5epM29XgHaTLsyAU6jPsTOH1BeZjLeddy6HCuvzv
+SIb3DQEBCwUAA4IBAQAnJwAGpGTVIkzj1a9MyPYLMgy+36xRzYe6WmIgsFPV/51u
+AZZqcxlI+haWQQf13erUoM2HnvQXw+h4cwWTqZ59NqrWeZWFtHiVFCQVip+/1+dX
+IUmOJjgAOsKUtgg/plvp6mtaT/4ko8mA8dmhdOhASYpEocT4veDpovAQD00B2YCx
+2qxRypDTSd4oM1RFf7KsKglFOPmi5lOjfvSGprIMbj6JgoplYk+vAZC53mK5UgF+
+qCnXGJr3dEpGy7uJHX69hBtZWom84a62YqTeUMRsMDcz15XS5L6Gdrc4YW0NHRci
+lId9qfDpC7jhL1mWAPEBHOtKxsrCPjkToPND9WVz
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/apple-ist-ca-8-g1-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/apple-ist-ca-8-g1-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/apple-ist-ca-8-g1-intermediate.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/apple-ist-ca-8-g1-intermediate.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAtugAwIBAgIQE1Iuv8HdXOEe8nZAdR/n3zAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTE2MDYwOTAwMDAwMFoXDTMxMDYwODIzNTk1OVowYjEcMBoGA1UE
+AwwTQXBwbGUgSVNUIENBIDggLSBHMTEgMB4GA1UECwwXQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkxEzARBgNVBAoMCkFwcGxlIEluYy4xCzAJBgNVBAYTAlVTMFkwEwYH
+KoZIzj0CAQYIKoZIzj0DAQcDQgAELVSOaLAQE+/0LdvYCbJD6J1lmW40uNSXyY7J
+1qgiNzLIcWDusPHyxWT2ukdf/OYHeDIt9sqAIMn9cPhykyGIRaOCATowggE2MBIG
+A1UdEwEB/wQIMAYBAf8CAQAwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2cuc3lt
+Y2IuY29tL0dlb1RydXN0UENBLUcyLmNybDAOBgNVHQ8BAf8EBAMCAQYwLgYIKwYB
+BQUHAQEEIjAgMB4GCCsGAQUFBzABhhJodHRwOi8vZy5zeW1jZC5jb20wSQYDVR0g
+BEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2VvdHJ1
+c3QuY29tL3Jlc291cmNlcy9jcHMwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMB0GA1UdDgQWBBTDxKRYBWPXgwa6lo3cso8y9ru3QTAfBgNVHSMEGDAWgBQV
+XzVXUVX7JbKtA2n8AaP6vhFV1TAKBggqhkjOPQQDAwNnADBkAjBH2jMNybjCk3Ts
+OidXxJX9YDPMd5S3KDCv8vyTdJGhtoly7fQJRNv5rnVz+6YGfsMCMEp6wyheL7NK
+mqavsduix2R+j1B3wRjelzJYgXzgM3nwhQKKlJWxpF7IGHuva1taxg==
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/gspe72-4-ssl-ls-apple-com.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/gspe72-4-ssl-ls-apple-com.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/gspe72-4-ssl-ls-apple-com.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/gspe72-4-ssl-ls-apple-com.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,38 @@
+-----BEGIN CERTIFICATE-----
+MIIGuzCCBmCgAwIBAgIQJwfBKDdrh96xNA/Wr1LyATAKBggqhkjOPQQDAjBiMRww
+GgYDVQQDDBNBcHBsZSBJU1QgQ0EgOCAtIEcxMSAwHgYDVQQLDBdDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eTETMBEGA1UECgwKQXBwbGUgSW5jLjELMAkGA1UEBhMCVVMw
+HhcNMTkwMzExMjA1MDE0WhcNMjEwNDA5MjA1MDE0WjCBgjEiMCAGA1UEAwwZZ3Nw
+ZTcyLTQtc3NsLmxzLmFwcGxlLmNvbTElMCMGA1UECwwcbWFuYWdlbWVudDppZG1z
+Lmdyb3VwLjY2NTAzNTETMBEGA1UECgwKQXBwbGUgSW5jLjETMBEGA1UECAwKQ2Fs
+aWZvcm5pYTELMAkGA1UEBhMCVVMwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATr
+NqVhtJlzuIqo/qrkTFUFe8IRKh9sOr6HXrbvE1vUIbUcWcfhWs8dczP9RBCw6TNI
+TGHAhuG2RZ/f9IrUjSldo4IE1TCCBNEwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAW
+gBTDxKRYBWPXgwa6lo3cso8y9ru3QTB+BggrBgEFBQcBAQRyMHAwNAYIKwYBBQUH
+MAKGKGh0dHA6Ly9jZXJ0cy5hcHBsZS5jb20vYXBwbGVpc3RjYThnMS5kZXIwOAYI
+KwYBBQUHMAGGLGh0dHA6Ly9vY3NwLmFwcGxlLmNvbS9vY3NwMDMtYXBwbGVpc3Rj
+YThnMTA1MCQGA1UdEQQdMBuCGWdzcGU3Mi00LXNzbC5scy5hcHBsZS5jb20wgf4G
+A1UdIASB9jCB8zCB8AYKKoZIhvdjZAULBDCB4TCBpAYIKwYBBQUHAgIwgZcMgZRS
+ZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVz
+IGFjY2VwdGFuY2Ugb2YgYW55IGFwcGxpY2FibGUgdGVybXMgYW5kIGNvbmRpdGlv
+bnMgb2YgdXNlIGFuZC9vciBjZXJ0aWZpY2F0aW9uIHByYWN0aWNlIHN0YXRlbWVu
+dHMuMDgGCCsGAQUFBwICMCwMKmh0dHA6Ly93d3cuYXBwbGUuY29tL2NlcnRpZmlj
+YXRlYXV0aG9yaXR5LzAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwNwYD
+VR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5hcHBsZS5jb20vYXBwbGVpc3RjYThn
+MS5jcmwwHQYDVR0OBBYEFNNlLsYlY4okSG2S2Gl2UMdPlkbzMA4GA1UdDwEB/wQE
+AwIDiDCCAnAGCisGAQQB1nkCBAIEggJgBIICXAJaAHYAu9nfvB+KcbWTlCOXqpJ7
+RzhXlQqrUugakJZkNo4e0YUAAAFpbo5SYgAABAMARzBFAiATXJMIgS9+f9P92SWY
+0oYi/vRuE4hTvLANoLv0FLE7WwIhAJBMLXnqV3k8R7yWdISnvRZF0/QBmMK632Cp
+N/kcpd3SAHYApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFpbo5S
+WQAABAMARzBFAiBCsSdFBiDjDEMsKdI8FyXD0aS6fCZ9bAuNYIGNPfAGhQIhAJ/R
+mCOrVp/GBOg0CLYrjJcBbIAGditNOg8Kd8WTP85fAHYA7ku9t3XOYLrhQmkfq+Ge
+ZqMPfl+wctiDAMR7iXqo/csAAAFpbo5SXgAABAMARzBFAiEAvzTu/MJBrBuyhPCj
+6R6qtyTLyTrin/HmOttlH6iJ4IsCICuqq2EK9+k8w0c6BuBtfK1BDw/lUUGqtSDZ
+svcDKVkIAHcAVYHUwhaQNgFK6gubVzxT8MDkOHhwJQgXL6OqHQcT0wwAAAFpbo5U
+5wAABAMASDBGAiEA92TvuiKRNcHjkIZlCo2TBW/ZFWvOoZwgoC6mB1CHmTcCIQDm
+cHuw1Ap1MUC6W+s76Im/js9KBumICSxByBkjxI1w6AB3AG9Tdqwx8DEZ2JkApFEV
+/3cVHBHZAsEAKQaNsgiaN9kTAAABaW6OVTEAAAQDAEgwRgIhAPaUtnaDmwkQvO3i
+nzgdo7AOVh1DEco+axckyrcxJgAKAiEA++0eb4HftQ9rUh9oZNYvqnyVSwNZfZwW
+5DYuKcTTRhswCgYIKoZIzj0EAwIDSQAwRgIhAJVASCnbb+d9zglT5b7wirXUxvEu
+nkHBAsB7VcVNqBEfAiEAiAlD40/WXTh31J41SVyb4CaQDTn0V+MstUnS1h+M1Cg=
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/moz.build firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/moz.build
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/moz.build	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -7,13 +7,13 @@
 # Temporarily disabled. See bug 1256495.
 # test_certificates = (
 #    'default-ee.pem',
-#    'symantec-ee-from-whitelist-after-cutoff.pem',
-#    'symantec-ee-from-whitelist-before-cutoff.pem',
-#    'symantec-ee-not-whitelisted-after-cutoff.pem',
-#    'symantec-ee-not-whitelisted-before-cutoff.pem',
+#    'symantec-ee-from-allowlist-after-cutoff.pem',
+#    'symantec-ee-from-allowlist-before-cutoff.pem',
+#    'symantec-ee-not-allowlisted-after-cutoff.pem',
+#    'symantec-ee-not-allowlisted-before-cutoff.pem',
 #    'symantec-intermediate-other.pem',
 #    'symantec-intermediate-other-crossigned.pem',
-#    'symantec-intermediate-whitelisted.pem',
+#    'symantec-intermediate-allowlisted.pem',
 #    'symantec-test-ca.pem',
 # )
 #
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDPjCCAiagAwIBAgIUN+Dcp+HeMvZhIJ3BD5af4bwrj4IwDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMT
+HEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzIwIhgPMjAxNjA2MDEwMDAwMDBa
+GA8yMDUwMDEwMTAwMDAwMFowKTEnMCUGA1UEAwweZWUtZnJvbS1hbGxvd2xpc3Qt
+YWZ0ZXItY3V0b2ZmMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
+qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
+WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
+rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPv
+JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
+Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
+clHEMdUDrNoYCjXtjQIDAQABozowODA2BgNVHREELzAtgitzeW1hbnRlYy1hbGxv
+d2xpc3QtYWZ0ZXItY3V0b2ZmLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IB
+AQB/2Pgyyje+T4uKkibYZ537NZB6OUvef4nrGtswjxKbUnHzrLK1kJd3mtyNpydK
+fzW8WV1CR+nltFI5oaoOAf26FuQfaoCADmlmFlirgnm2fEH2xCokDCQHIgQxNwXr
+Ok6JTHWeuaOsu+verDPjkuUATnONY+FRTBxfPh5B3OA+aBO62bAeNCAjIya1U60S
+emAnleYtwhXs0Q9TLsR7O7aSYP3FgnqnWPuOkPF3wrUiE8Nrd3givz5OJW42IU63
+ijiojHtPpjAiudbzD8y1zuDcxTxiI4jEjTDS1kIqnvHd3f4bSxpgcQUPk44nu+wO
+j5+as/TRu5dC+xHmWCVT10yd
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-after-cutoff.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4 @@
+issuer:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
+subject:ee-from-allowlist-after-cutoff
+validity:20160601-20500101
+extension:subjectAlternativeName:symantec-allowlist-after-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQDCCAiigAwIBAgIUVWP+EbM7hYQLOXoABvWpRwoPWJ0wDQYJKoZIhvcNAQEL
+BQAwSTELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMT
+HEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzIwIhgPMjAxNDA2MDEwMDAwMDBa
+GA8yMDUwMDEwMTAwMDAwMFowKjEoMCYGA1UEAwwfZWUtZnJvbS1hbGxvd2xpc3Qt
+YmVmb3JlLWN1dG9mZjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
+UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
+r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
+fq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD
+7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnv
+uRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj
++nJRxDHVA6zaGAo17Y0CAwEAAaM7MDkwNwYDVR0RBDAwLoIsc3ltYW50ZWMtYWxs
+b3dsaXN0LWJlZm9yZS1jdXRvZmYuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
+ggEBAFhn9xNv/Yp1Ua9OX7oXgbVgzxCIAm6/zDK7V4V37P5em/lI85OpbuuTO4ns
+9VB2/nijkELhSkiyCjmCaxQhlUBzA/2wJeNIfaWu9Mq5MR6jWShhNXND66lTCDIQ
+wGVQkBl8/3OqSD4IFI3pKAiPhCGsUnRIhGSARcrFMQpKssnN5XN1ump1YA7/u6Kv
+apNbKccgKvLekO8/kUpFrpHt+uQaNS2IeVrmOnNh4GtyD3DG1ZDcZ1VgLAnzbVUg
+xiUbs58mY0o1qumuzqJ0/ie5UPOjWnoXSNq6dd4jqsXcFeYXe106G6arV5BLN1Pa
+gNxxfOfBcebE1OwxZpfQwNy3JxI=
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-allowlist-before-cutoff.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4 @@
+issuer:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
+subject:ee-from-allowlist-before-cutoff
+validity:20140601-20500101
+extension:subjectAlternativeName:symantec-allowlist-before-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPjCCAiagAwIBAgIUBcl/HX4d+YLUUdNe1KZJy2fvmE4wDQYJKoZIhvcNAQEL
-BQAwSTELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMT
-HEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzIwIhgPMjAxNjA2MDEwMDAwMDBa
-GA8yMDUwMDEwMTAwMDAwMFowKTEnMCUGA1UEAwweZWUtZnJvbS13aGl0ZWxpc3Qt
-YWZ0ZXItY3V0b2ZmMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohR
-qESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+Kv
-WnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+
-rWkasdMCOosqQe6ncOAPDY39ZgsrsCSSpH25iGF5kLFXkD3SO8XguEgfqDfTiEPv
-JxbYVbdmWqp+ApAvOnsQgAYkzBxsl62WYVu34pYSwHUxowyR3bTK9/ytHSXTCe+5
-Fw6naOGzey8ib2njtIqVYR3uJtYlnauRCE42yxwkBCy/Fosv5fGPmRcxuLP+SSP6
-clHEMdUDrNoYCjXtjQIDAQABozowODA2BgNVHREELzAtgitzeW1hbnRlYy13aGl0
-ZWxpc3QtYWZ0ZXItY3V0b2ZmLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IB
-AQA4I07OKDEoSOfZuYOzWxUwHFE0pktfTQIqL0TAnv3upP6dTjDyJWiVuMOQ1Ddx
-MDdEyhe/enMdg5SWR07Eimcwn/dzVM6X6GcePgAprtKWkTLS9rU/VnybDLh3mxEf
-n+ruZ10EvsiDbv7nvTgcJiF4jaMwcDytsJn1CRTwOarx9oVwd/ZDZg0ZcDAEt7xV
-VzRfxOcTE033z4PTl6gPClk/FVQ5nWh2LBYYPpsQNsRYHMaWg6xQqnJnCYlGRd/l
-P0Q94rgmSysZhq07WxCamEGy578n2doBWmRywbU/tt7gW42SDidNIpWZWPpMz7wp
-7NWOlgMZJdj7pYXsZCzrr5xW
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem.certspec	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-after-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-issuer:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
-subject:ee-from-whitelist-after-cutoff
-validity:20160601-20500101
-extension:subjectAlternativeName:symantec-whitelist-after-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDQDCCAiigAwIBAgIUO/pWn7XXIQG5Ywx3wfa2C0oQ0CcwDQYJKoZIhvcNAQEL
-BQAwSTELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMT
-HEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzIwIhgPMjAxNDA2MDEwMDAwMDBa
-GA8yMDUwMDEwMTAwMDAwMFowKjEoMCYGA1UEAwwfZWUtZnJvbS13aGl0ZWxpc3Qt
-YmVmb3JlLWN1dG9mZjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqI
-UahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAabbhqG8mvi
-r1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/x
-fq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhIH6g304hD
-7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8rR0l0wnv
-uRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj
-+nJRxDHVA6zaGAo17Y0CAwEAAaM7MDkwNwYDVR0RBDAwLoIsc3ltYW50ZWMtd2hp
-dGVsaXN0LWJlZm9yZS1jdXRvZmYuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAK+zlOFlpQ9CyKEPYMTS5pbZZFverE75coUGQXuEUvjR7q6qwt2+ynJlybr0
-fUT0+b5x9j4ocPkpHyT9wi3jwQQx1Fl5nzl0RRBJGulbYZE6+5xzf5VVKvveaoFY
-jmyiiY8/v31Y95ANdo3OWUhrCq2ymAPA7Fxabj9LUEqe47Hm/bb4YoHHvBd3NFOQ
-G0fMfrE2+ZHg0j6x2lfrzkzIMkoo9STp7f3zBy3xLpVeay4w6Tig8PYkmYe4bvqs
-MFX2GUegooYfmPoMUvEFOmPRgGZyDqsfB2XjxxK+9OU8QtXg2YRjnjtg/nlUPeh+
-vspfmRNgI5PzNa2HWIR42MoH3uM=
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem.certspec	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-from-whitelist-before-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-issuer:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
-subject:ee-from-whitelist-before-cutoff
-validity:20140601-20500101
-extension:subjectAlternativeName:symantec-whitelist-before-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSzCCAjOgAwIBAgIUNWWgyC4I0/jmqdamoCRL0qhP3QQwDQYJKoZIhvcNAQEL
+BQAwTzELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD0Fub3RoZXIgQ0EgSW5jLjEmMCQG
+A1UEAxMdU29tZSBPdGhlciBDQSBUaGFuIFRoZSBPdGhlcnMwIhgPMjAxNjA2MDEw
+MDAwMDBaGA8yMDUwMDEwMTAwMDAwMFowKjEoMCYGA1UEAwwfZWUtbm90LWFsbG93
+bGlzdGVkLWFmdGVyLWN1dG9mZjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
+bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
+Du0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhI
+H6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8
+rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
+Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNAMD4wPAYDVR0RBDUwM4Ixc3ltYW50
+ZWMtbm90LWFsbG93bGlzdGVkLWFmdGVyLWN1dG9mZi5leGFtcGxlLmNvbTANBgkq
+hkiG9w0BAQsFAAOCAQEARlQNYz+w2ekzdX8FKwlWoMX6Df5o4ZhXreRK9V4SuYJg
+SvAucL35TuTKkBz9C5VPjAL/Qts4n5DKWaWQfsvoCJOGtTMEKd1MEL9RbMFOewI0
+tN9sV9aMNsmhNPL4PB3A7lKJb8gi/tyoN3BXjsaZBxmyi5A6Vt3lyybgMOSTdzR6
+u2XAPm+zNDrOzc2tavZEyhEKzptaJuCQrefcnAM9JTHtJhvJp30WWighJyclqmRX
+bLDYaHRRuRI0jkgrrcUKolau8YKsSoIBoxP2aels8drZDH4UAC86GW2iF/tK+J65
++JJ2Mk9erdcLoYGLxHZqQySpRaFtciSF+Uym1nmNxA==
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-after-cutoff.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,4 @@
+issuer:printableString/C=US/O=Another CA Inc./CN=Some Other CA Than The Others
+subject:ee-not-allowlisted-after-cutoff
+validity:20160601-20500101
+extension:subjectAlternativeName:symantec-not-allowlisted-after-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDTTCCAjWgAwIBAgIUaxGuzjOrA/2qScMaz5tKQTUrvAYwDQYJKoZIhvcNAQEL
+BQAwTzELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD0Fub3RoZXIgQ0EgSW5jLjEmMCQG
+A1UEAxMdU29tZSBPdGhlciBDQSBUaGFuIFRoZSBPdGhlcnMwIhgPMjAxNDA2MDEw
+MDAwMDBaGA8yMDUwMDEwMTAwMDAwMFowKzEpMCcGA1UEAwwgZWUtbm90LWFsbG93
+bGlzdGVkLWJlZm9yZS1jdXRvZmYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
+m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
+bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
+SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
+/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
+FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjQTA/MD0GA1UdEQQ2MDSCMnN5bWFu
+dGVjLW5vdC1hbGxvd2xpc3RlZC1iZWZvcmUtY3V0b2ZmLmV4YW1wbGUuY29tMA0G
+CSqGSIb3DQEBCwUAA4IBAQBCkIIEXnX/3rv0JuF0FZEpROnQw8zoa4vZjwG1NmvH
++PwnTL7FvBg9QBK0n8ZKfCMqJU98jR5+x6V9Eo2amXEYRAsxCU6kY/Xz43OxGLQz
+5cbr9eDswWmt7h/LXl0tsprpgfBNaQ9512UbPMkDG4MSwLjkuTgdnM4dBsLURrAU
+5lcukutuNYJ7x92/Ah7hffouB6QHyP80onxqqQTQs2j/0MvJxlUWrnKBzk+B475W
+/1iMOCE3r2q6+TVp1sun9mcn7UvRHQRPvjSdjujjJ++5fqH5s4cF2Sv4lv+dEGJn
+xrr/a9GA3bUE6Iq9PbAeX3l7RaP+q/znSDBtaLYZ1Xau
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-allowlisted-before-cutoff.pem.certspec	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,4 @@
+issuer:printableString/C=US/O=Another CA Inc./CN=Some Other CA Than The Others
+subject:ee-not-allowlisted-before-cutoff
+validity:20140601-20500101
+extension:subjectAlternativeName:symantec-not-allowlisted-before-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSzCCAjOgAwIBAgIUL/OWThipKmcY97fOqTqqKqXUQfkwDQYJKoZIhvcNAQEL
-BQAwTzELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD0Fub3RoZXIgQ0EgSW5jLjEmMCQG
-A1UEAxMdU29tZSBPdGhlciBDQSBUaGFuIFRoZSBPdGhlcnMwIhgPMjAxNjA2MDEw
-MDAwMDBaGA8yMDUwMDEwMTAwMDAwMFowKjEoMCYGA1UEAwwfZWUtbm90LXdoaXRl
-bGlzdGVkLWFmdGVyLWN1dG9mZjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs9WhXbCR7wcclqODYH72xnAab
-bhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8HmnQOCApk6sgw0nk27lMwmts
-Du0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7AkkqR9uYhheZCxV5A90jvF4LhI
-H6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJetlmFbt+KWEsB1MaMMkd20yvf8
-rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2rkQhONsscJAQsvxaLL+Xxj5kX
-Mbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaNAMD4wPAYDVR0RBDUwM4Ixc3ltYW50
-ZWMtbm90LXdoaXRlbGlzdGVkLWFmdGVyLWN1dG9mZi5leGFtcGxlLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEASlh3FQaS5Jyf67GhSlcA/AzhiSSi4Ut6sSK9MSd8un5K
-ulsEQX3r0UF575WD9hGXQcTFEhEBnlQkswEP7kNYXMhzOmvdSFHs8g2smJO7Mlmd
-tTjQ7GvYUVdmdLUAHcKNUSxf1mKHkBvKEEzHG4gqP8YFd1GaJDNNEwY3Wa7vhkbw
-fVz2Kg7OWejIp3EGYRqISl7baH6T98kWFYDNHvtODLduSK360SLB2bVRhgGbgDe3
-LTx8sJENsxm0TwBGqmzlcEXQOtk0FGToWILyJNnRrK9+ECkdM1p1HGBhSzIpqN0I
-bgxdWU4NtJgzSJSdb0TcPGzCRM8ABEVX/otYJJc/JQ==
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem.certspec	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-after-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-issuer:printableString/C=US/O=Another CA Inc./CN=Some Other CA Than The Others
-subject:ee-not-whitelisted-after-cutoff
-validity:20160601-20500101
-extension:subjectAlternativeName:symantec-not-whitelisted-after-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIUAVepRdyIoupt4hj3xATgIRk/omUwDQYJKoZIhvcNAQEL
-BQAwTzELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD0Fub3RoZXIgQ0EgSW5jLjEmMCQG
-A1UEAxMdU29tZSBPdGhlciBDQSBUaGFuIFRoZSBPdGhlcnMwIhgPMjAxNDA2MDEw
-MDAwMDBaGA8yMDUwMDEwMTAwMDAwMFowKzEpMCcGA1UEAwwgZWUtbm90LXdoaXRl
-bGlzdGVkLWJlZm9yZS1jdXRvZmYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC6iFGoRI4W1kH9braIBjYQPTwT2erkNUq07PVoV2wke8HHJajg2B+9sZwG
-m24ahvJr4q9adWtqZHEIeqVap0WH9xzVJJwCfs1D/B5p0DggKZOrIMNJ5Nu5TMJr
-bA7tFYIP8X6taRqx0wI6iypB7qdw4A8Njf1mCyuwJJKkfbmIYXmQsVeQPdI7xeC4
-SB+oN9OIQ+8nFthVt2Zaqn4CkC86exCABiTMHGyXrZZhW7filhLAdTGjDJHdtMr3
-/K0dJdMJ77kXDqdo4bN7LyJvaeO0ipVhHe4m1iWdq5EITjbLHCQELL8Wiy/l8Y+Z
-FzG4s/5JI/pyUcQx1QOs2hgKNe2NAgMBAAGjQTA/MD0GA1UdEQQ2MDSCMnN5bWFu
-dGVjLW5vdC13aGl0ZWxpc3RlZC1iZWZvcmUtY3V0b2ZmLmV4YW1wbGUuY29tMA0G
-CSqGSIb3DQEBCwUAA4IBAQAs6WqQHKkHM4uD0mzrGR1Vmm6RfHEFJAwf7BaMllDl
-6DxDYB0/hDhbTgIZ/69G9JN70aml9tJqOZLpNrCKxtDq0Ww80yWBXpI3oiQVYrnW
-ZDhK0ZuU0UgaQ8kNcBS1ZXADaIw324yuUSLtIzi1PIK9u+mYDffIlVF+RodPJXj9
-KkRLi5SpDPBlrea6AZdv6jP2Tg3wLV8JIilHE9NFGLC+pPws52/FaDvIKH7Duo8V
-mAJejDyahyjGo7q6LnYtg6v7i5huddP2eGfm06O6J2/zGmuhefgncp8sWqNA7eos
-rKjL3wXvYqpAT9DKPcU8JqI490RpEZwu4IQLopBKH1ZJ
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem.certspec	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-ee-not-whitelisted-before-cutoff.pem.certspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-issuer:printableString/C=US/O=Another CA Inc./CN=Some Other CA Than The Others
-subject:ee-not-whitelisted-before-cutoff
-validity:20140601-20500101
-extension:subjectAlternativeName:symantec-not-whitelisted-before-cutoff.example.com
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDOjCCAiKgAwIBAgIUaY03lyFe+30G6gvBlfMEB2BNPqwwDQYJKoZIhvcNAQEL
+BQAwQjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xGzAZBgNV
+BAMTEkdlb1RydXN0IEdsb2JhbCBDQTAiGA8yMDEwMDEwMTAwMDAwMFoYDzIwNTAw
+MTAxMDAwMDAwWjBJMQswCQYDVQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEl
+MCMGA1UEAxMcR29vZ2xlIEludGVybmV0IEF1dGhvcml0eSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
+9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
+HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
+kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
+lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
+kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBsw
+CwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEEg
+GVWhvSp1aHsTZIDT/tIS0GsfiHnKfLRVaQ9iLDMe57ScjTwcCvzMwu1D2Twk9P95
+WXibcX9FzcoABVy3E93VuTzYNTE5wtN4bx7f6xSCUv7S3mhgwKPw6vuAJ7MpytPk
+wMV12D5S9IrynFNQi8qTFR5CeWzcs9OjeAEMXUn0bJDnIqfJQKtl9HOCPo0hM/f7
+cAQBCmfWgYMAR0EpTCLBrTV0928oAGW7rzK/GhEt6yCkfDgjDs3dglMmUNNunXH4
+Gj0IJYNCbh1QEn17QVq0J7BApBdIGCCtSfQgI9tZ8iii1U7ev6CPbLEKfFtUl1mU
+Dhe5f/l2R5Ss8NcXbZA=
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem.certspec	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-allowlisted.pem.certspec	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,5 @@
+issuer:printableString/C=US/O=GeoTrust Inc./CN=GeoTrust Global CA
+subject:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
+validity:20100101-20500101
+extension:keyUsage:keyCertSign,cRLSign
+extension:basicConstraints:cA,
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDOjCCAiKgAwIBAgIUaY03lyFe+30G6gvBlfMEB2BNPqwwDQYJKoZIhvcNAQEL
-BQAwQjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xGzAZBgNV
-BAMTEkdlb1RydXN0IEdsb2JhbCBDQTAiGA8yMDEwMDEwMTAwMDAwMFoYDzIwNTAw
-MTAxMDAwMDAwWjBJMQswCQYDVQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEl
-MCMGA1UEAxMcR29vZ2xlIEludGVybmV0IEF1dGhvcml0eSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALqIUahEjhbWQf1utogGNhA9PBPZ6uQ1SrTs
-9WhXbCR7wcclqODYH72xnAabbhqG8mvir1p1a2pkcQh6pVqnRYf3HNUknAJ+zUP8
-HmnQOCApk6sgw0nk27lMwmtsDu0Vgg/xfq1pGrHTAjqLKkHup3DgDw2N/WYLK7Ak
-kqR9uYhheZCxV5A90jvF4LhIH6g304hD7ycW2FW3ZlqqfgKQLzp7EIAGJMwcbJet
-lmFbt+KWEsB1MaMMkd20yvf8rR0l0wnvuRcOp2jhs3svIm9p47SKlWEd7ibWJZ2r
-kQhONsscJAQsvxaLL+Xxj5kXMbiz/kkj+nJRxDHVA6zaGAo17Y0CAwEAAaMdMBsw
-CwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEEg
-GVWhvSp1aHsTZIDT/tIS0GsfiHnKfLRVaQ9iLDMe57ScjTwcCvzMwu1D2Twk9P95
-WXibcX9FzcoABVy3E93VuTzYNTE5wtN4bx7f6xSCUv7S3mhgwKPw6vuAJ7MpytPk
-wMV12D5S9IrynFNQi8qTFR5CeWzcs9OjeAEMXUn0bJDnIqfJQKtl9HOCPo0hM/f7
-cAQBCmfWgYMAR0EpTCLBrTV0928oAGW7rzK/GhEt6yCkfDgjDs3dglMmUNNunXH4
-Gj0IJYNCbh1QEn17QVq0J7BApBdIGCCtSfQgI9tZ8iii1U7ev6CPbLEKfFtUl1mU
-Dhe5f/l2R5Ss8NcXbZA=
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem.certspec firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem.certspec
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem.certspec	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-intermediate-whitelisted.pem.certspec	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-issuer:printableString/C=US/O=GeoTrust Inc./CN=GeoTrust Global CA
-subject:printableString/C=US/O=Google Inc/CN=Google Internet Authority G2
-validity:20100101-20500101
-extension:keyUsage:keyCertSign,cRLSign
-extension:basicConstraints:cA,
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-googlecom.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-googlecom.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-googlecom.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-googlecom.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHgzCCBmugAwIBAgIIQsrhz4cRtNQwDQYJKoZIhvcNAQELBQAwSTELMAkGA1UE
-BhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMTHEdvb2dsZSBJbnRl
-cm5ldCBBdXRob3JpdHkgRzIwHhcNMTgwMTMwMDgzMDQ1WhcNMTgwNDI0MDgzMDAw
-WjBmMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN
-TW91bnRhaW4gVmlldzETMBEGA1UECgwKR29vZ2xlIEluYzEVMBMGA1UEAwwMKi5n
-b29nbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfcqxFBn8JLSGSDgu
-sXeY+zZJyXFVGDt4rFMUUx0iWDjegJea9rk0yR0/J+h/DsFjxpR2lRX2HeNqpWEC
-3cxFOKOCBRswggUXMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIH
-gDCCA+EGA1UdEQSCA9gwggPUggwqLmdvb2dsZS5jb22CDSouYW5kcm9pZC5jb22C
-FiouYXBwZW5naW5lLmdvb2dsZS5jb22CEiouY2xvdWQuZ29vZ2xlLmNvbYIUKi5k
-YjgzMzk1My5nb29nbGUuY26CBiouZy5jb4IOKi5nY3AuZ3Z0Mi5jb22CFiouZ29v
-Z2xlLWFuYWx5dGljcy5jb22CCyouZ29vZ2xlLmNhggsqLmdvb2dsZS5jbIIOKi5n
-b29nbGUuY28uaW6CDiouZ29vZ2xlLmNvLmpwgg4qLmdvb2dsZS5jby51a4IPKi5n
-b29nbGUuY29tLmFygg8qLmdvb2dsZS5jb20uYXWCDyouZ29vZ2xlLmNvbS5icoIP
-Ki5nb29nbGUuY29tLmNvgg8qLmdvb2dsZS5jb20ubXiCDyouZ29vZ2xlLmNvbS50
-coIPKi5nb29nbGUuY29tLnZuggsqLmdvb2dsZS5kZYILKi5nb29nbGUuZXOCCyou
-Z29vZ2xlLmZyggsqLmdvb2dsZS5odYILKi5nb29nbGUuaXSCCyouZ29vZ2xlLm5s
-ggsqLmdvb2dsZS5wbIILKi5nb29nbGUucHSCEiouZ29vZ2xlYWRhcGlzLmNvbYIP
-Ki5nb29nbGVhcGlzLmNughQqLmdvb2dsZWNvbW1lcmNlLmNvbYIRKi5nb29nbGV2
-aWRlby5jb22CDCouZ3N0YXRpYy5jboINKi5nc3RhdGljLmNvbYIKKi5ndnQxLmNv
-bYIKKi5ndnQyLmNvbYIUKi5tZXRyaWMuZ3N0YXRpYy5jb22CDCoudXJjaGluLmNv
-bYIQKi51cmwuZ29vZ2xlLmNvbYIWKi55b3V0dWJlLW5vY29va2llLmNvbYINKi55
-b3V0dWJlLmNvbYIWKi55b3V0dWJlZWR1Y2F0aW9uLmNvbYIHKi55dC5iZYILKi55
-dGltZy5jb22CGmFuZHJvaWQuY2xpZW50cy5nb29nbGUuY29tggthbmRyb2lkLmNv
-bYIbZGV2ZWxvcGVyLmFuZHJvaWQuZ29vZ2xlLmNughxkZXZlbG9wZXJzLmFuZHJv
-aWQuZ29vZ2xlLmNuggRnLmNvggZnb28uZ2yCFGdvb2dsZS1hbmFseXRpY3MuY29t
-ggpnb29nbGUuY29tghJnb29nbGVjb21tZXJjZS5jb22CGHNvdXJjZS5hbmRyb2lk
-Lmdvb2dsZS5jboIKdXJjaGluLmNvbYIKd3d3Lmdvby5nbIIIeW91dHUuYmWCC3lv
-dXR1YmUuY29tghR5b3V0dWJlZWR1Y2F0aW9uLmNvbYIFeXQuYmUwaAYIKwYBBQUH
-AQEEXDBaMCsGCCsGAQUFBzAChh9odHRwOi8vcGtpLmdvb2dsZS5jb20vR0lBRzIu
-Y3J0MCsGCCsGAQUFBzABhh9odHRwOi8vY2xpZW50czEuZ29vZ2xlLmNvbS9vY3Nw
-MB0GA1UdDgQWBBS6J6RnRCWCaToeaLBcgAaUHc9xzDAMBgNVHRMBAf8EAjAAMB8G
-A1UdIwQYMBaAFErdBhYbvPZotXb1gba7Yhq6WoEvMCEGA1UdIAQaMBgwDAYKKwYB
-BAHWeQIFATAIBgZngQwBAgIwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL3BraS5n
-b29nbGUuY29tL0dJQUcyLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAG9Kpcnranqxj
-9vKV1y8jqnRJG/0M9bvAiRcHmnubtt4Q9yV79lj4tQQn3/p/XohPtPA8WX0Yt2pS
-vrmHxOdgrj/peT7TmldATA3wVnE5OW72V/bBYn3Fh5+8D+y0cokubjWpH5xA/VJ0
-Zcrs6vXJz6onCfo2oBPwJK+vxfL/xuTv18eBK1RpeN9flFEBuvMZ3eaTWWv63qa4
-1U+xujiCGrBtm0z5TSXLZe8QAaULaBGQTfpqGOdrEO6iJR/1++ktQkZKkpBCKeqT
-0vCJiZuxTaUceB59GWAkuzX4CuRN8W9KICfqqyjeiFIww/D8H1jRxJOYc7YPKb5C
-RLxt4tpXTw==
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-google-g2-intermediate.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-google-g2-intermediate.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-google-g2-intermediate.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions/symantec-real-google-g2-intermediate.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKDCCAxCgAwIBAgIQAQAhJYiw+lmnd+8Fe2Yn3zANBgkqhkiG9w0BAQsFADBC
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMS
-R2VvVHJ1c3QgR2xvYmFsIENBMB4XDTE3MDUyMjExMzIzN1oXDTE4MTIzMTIzNTk1
-OVowSTELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkdvb2dsZSBJbmMxJTAjBgNVBAMT
-HEdvb2dsZSBJbnRlcm5ldCBBdXRob3JpdHkgRzIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCcKgR3XNhQkToGo4Lg2FBIvIk/8RlwGohGfuCPxfGJziHu
-Wv5hDbcyRImgdAtTT1WkzoJile7rWV/G4QWAEsRelD+8W0g49FP3JOb7kekVxM/0
-Uw30SvyfVN59vqBrb4fA0FAfKDADQNoIc1Fsf/86PKc3Bo69SxEE630k3ub5/DFx
-+5TVYPMuSq9C0svqxGoassxT3RVLix/IGWEfzZ2oPmMrhDVpZYTIGcVGIvhTlb7j
-gEoQxirsupcgEcc5mRAEoPBhepUljE5SdeK27QjKFPzOImqzTs9GA5eXA37Asd57
-r0Uzz7o+cbfe9CUlwg01iZ2d+w4ReYkeN8WvjnJpAgMBAAGjggERMIIBDTAfBgNV
-HSMEGDAWgBTAephojYn7qwVkDBF9qn1luMrMTjAdBgNVHQ4EFgQUSt0GFhu89mi1
-dvWBtrtiGrpagS8wDgYDVR0PAQH/BAQDAgEGMC4GCCsGAQUFBwEBBCIwIDAeBggr
-BgEFBQcwAYYSaHR0cDovL2cuc3ltY2QuY29tMBIGA1UdEwEB/wQIMAYBAf8CAQAw
-NQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2cuc3ltY2IuY29tL2NybHMvZ3RnbG9i
-YWwuY3JsMCEGA1UdIAQaMBgwDAYKKwYBBAHWeQIFATAIBgZngQwBAgIwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQDKSeWs
-12Rkd1u+cfrP9B4jx5ppY1Rf60zWGSgjZGaOHMeHgGRfBIsmr5jfCnC8vBk97nsz
-qX+99AXUcLsFJnnqmseYuQcZZTTMPOk/xQH6bwx+23pwXEz+LQDwyr4tjrSogPsB
-E4jLnD/lu3fKOmc2887VJwJyQ6C9bgLxRwVxPgFZ6RGeGvOED4Cmong1L7bHon8X
-fOGLVq7uZ4hRJzBgpWJSwzfVO+qFKgE4h6LPcK2kesnE58rF2rwjMvL+GMJ74N87
-L9TQEOaWTPtEtyFkDbkAlDASJodYmDkFOA/MgkgMCkdm7r+0X8T/cKjhf4t5K7hl
-MqO5tzHpCvX2HzLc
------END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions_symantec_apple_google.js firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions_symantec_apple_google.js
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_sanctions_symantec_apple_google.js	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_sanctions_symantec_apple_google.js	2021-01-18 19:58:18.000000000 +0000
@@ -4,7 +4,7 @@
 "use strict";
 
 // Tests handling of certificates issued by Symantec. If such certificates were
-// issued by an Apple or Google intermediate, they are whitelisted. Otherwise,
+// issued by an Apple or Google intermediate, they are allowlisted. Otherwise,
 // If they have a notBefore before 1 June 2016, they should be distrusted, while
 // those from that date or later emit a warning to the console.
 
@@ -35,7 +35,7 @@
 add_test(function() {
   addCertFromFile(
     certDB,
-    "test_sanctions/symantec-intermediate-whitelisted.pem",
+    "test_sanctions/symantec-intermediate-allowlisted.pem",
     ",,"
   );
   addCertFromFile(
@@ -43,77 +43,23 @@
     "test_sanctions/symantec-intermediate-other.pem",
     ",,"
   );
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* DistrustedCAPolicy::DistrustSymantecRoots */ 0b01
-  );
-  run_next_test();
-});
-
-// Not-whitelisted certs after the cutoff are to be distrusted
-add_connection_test(
-  "symantec-not-whitelisted-after-cutoff.example.com",
-  PRErrorCodeSuccess,
-  null,
-  shouldBeImminentlyDistrusted
-);
-
-// Not whitelisted certs before the cutoff are to be distrusted
-add_connection_test(
-  "symantec-not-whitelisted-before-cutoff.example.com",
-  MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED,
-  null,
-  null
-);
-
-// Enable the Firefox 63 total distrust; before or after cutoff should now all
-// behave the same. This will be made the default in Bug 1460062.
-add_test(function() {
-  clearSessionCache();
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* DistrustedCAPolicy::DistrustSymantecRootsRegardlessOfDate */ 0b10
-  );
   run_next_test();
 });
 
 add_connection_test(
-  "symantec-not-whitelisted-before-cutoff.example.com",
+  "symantec-not-allowlisted-before-cutoff.example.com",
   MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED,
   null,
   null
 );
 
 add_connection_test(
-  "symantec-not-whitelisted-after-cutoff.example.com",
+  "symantec-not-allowlisted-after-cutoff.example.com",
   MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED,
   null,
   null
 );
 
-// Disable the distrust, should be back to the console warning
-add_test(function() {
-  clearSessionCache();
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* DistrustedCAPolicy::Permit */ 0b00
-  );
-  run_next_test();
-});
-
-add_connection_test(
-  "symantec-not-whitelisted-before-cutoff.example.com",
-  PRErrorCodeSuccess,
-  null,
-  shouldBeImminentlyDistrusted
-);
-
-add_test(function() {
-  clearSessionCache();
-  Services.prefs.clearUserPref("security.pki.distrust_ca_policy");
-  run_next_test();
-});
-
 // Add a cross-signed intermediate into the database, and ensure we still get
 // the expected error.
 add_test(function() {
@@ -126,80 +72,36 @@
 });
 
 add_connection_test(
-  "symantec-not-whitelisted-before-cutoff.example.com",
+  "symantec-not-allowlisted-before-cutoff.example.com",
   MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED,
   null,
   null
 );
 
-// Load the wildcard *.google.com cert and its intermediate, then verify
-// it at a reasonable time and make sure the whitelists work
+// Load the Apple EE cert and its intermediate, then verify
+// it at a reasonable time and make sure the allowlists work
 add_task(async function() {
   addCertFromFile(
     certDB,
-    "test_sanctions/symantec-real-google-g2-intermediate.pem",
+    "test_sanctions/apple-ist-ca-8-g1-intermediate.pem",
     ",,"
   );
-  let whitelistedCert = constructCertFromFile(
-    "test_sanctions/symantec-real-googlecom.pem"
+  let allowlistedCert = constructCertFromFile(
+    "test_sanctions/gspe72-4-ssl-ls-apple-com.pem"
   );
 
   // Since we don't want to actually try to fetch OCSP for this certificate,
   // (as an external fetch is bad in the tests), disable OCSP first.
   Services.prefs.setIntPref("security.OCSP.enabled", 0);
 
-  // Try with the policy for 60
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* DistrustedCAPolicy::DistrustSymantecRoots */ 0b01
-  );
-
-  // (new Date("2018-02-16")).getTime() / 1000
-  const VALIDATION_TIME = 1518739200;
-
-  await checkCertErrorGenericAtTime(
-    certDB,
-    whitelistedCert,
-    PRErrorCodeSuccess,
-    certificateUsageSSLServer,
-    VALIDATION_TIME
-  );
-
-  // Try with the policy for 63
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* DistrustedCAPolicy::DistrustSymantecRootsRegardlessOfDate */ 0b10
-  );
+  // (new Date("2020-01-01")).getTime() / 1000
+  const VALIDATION_TIME = 1577836800;
 
   await checkCertErrorGenericAtTime(
     certDB,
-    whitelistedCert,
+    allowlistedCert,
     PRErrorCodeSuccess,
     certificateUsageSSLServer,
     VALIDATION_TIME
   );
 });
-
-// Check invalid policy values; should default to current default
-add_test(function() {
-  clearSessionCache();
-  Services.prefs.setIntPref(
-    "security.pki.distrust_ca_policy",
-    /* Larger than Max Value */ 0b1111
-  );
-  run_next_test();
-});
-
-add_connection_test(
-  "symantec-not-whitelisted-before-cutoff.example.com",
-  MOZILLA_PKIX_ERROR_ADDITIONAL_POLICY_CONSTRAINT_FAILED,
-  null,
-  null
-);
-
-add_connection_test(
-  "symantec-not-whitelisted-after-cutoff.example.com",
-  PRErrorCodeSuccess,
-  null,
-  shouldBeImminentlyDistrusted
-);
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIUaym0PCofS8ZuX/bS0oifGDgTjuMwDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXZXZfaW50XzYwX21vbnRocy1ldnJvb3QwIhgPMjAxODEx
-MTYwMDAwMDBaGA8yMDIxMDIxNTAwMDAwMFowMjEwMC4GA1UEAwwnZXZfZWVfMjdf
+MIIDbTCCAlWgAwIBAgIUYYDQjys/AnzMoLUwrnp0+jqAmQMwDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAwwXZXZfaW50XzYwX21vbnRocy1ldnJvb3QwIhgPMjAxOTEx
+MTYxMjAwMDBaGA8yMDIyMDIxNjEyMDAwMFowMjEwMC4GA1UEAwwnZXZfZWVfMjdf
 bW9udGhzLWV2X2ludF82MF9tb250aHMtZXZyb290MIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -12,10 +12,10 @@
 AQUFBwEBBFQwUjBQBggrBgEFBQcwAYZEaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4
 ODg4L2V2X2VlXzI3X21vbnRocy1ldl9pbnRfNjBfbW9udGhzLWV2cm9vdC8wHwYD
 VR0gBBgwFjAUBhIrBgEEAetJhRqFGoUaAYN0CQEwDQYJKoZIhvcNAQELBQADggEB
-AHeVkZtdBTW9NXfI1t2lr9p3Alwr+cJEeS0FSun3zl5GBMCvv4Xv7AudmXzZfzzI
-4wHtohL0uqRxt/Kyl+7F60hMob/7OzqrOKgG/u2Ofc+FJ5B8fo0p/ceLBUE1rC1Q
-wxJ5pjKRTsQe6LG/qKuLQwJDjk4uRhO6prTocyiAlTm7n0kQ4Y6LsfoC7TZQnL/b
-WiUIRNbFFnpwFYXMvCdoV/mg4GtvXAEWof4HTKquqNpIF+G9mjLmWX6q1yt9JQc/
-pCKY8YffcWFRvDMY246kckZiu9sLokGoVqGU46XVWJXIr2nyO89Vfi7Bb1V0GEgX
-C9VjbweDgNtIi5mQipqcv0A=
+AIP1/h4cT0t0hvLupI1lMwefjvlUtiXfTLW8u6BU8kEaENJybcWbIsCnPM2Bi2bz
+AwxQ6ByBMyicnxzgiHZofC9ATxXUrIKHLOk5I8aW6FNvEcD4KdJoju3u/EmbaDjP
+ORijvoa9gm9FQjl9SKYohfnjmOfNKcHQDQafnm4GHJV4nh7cIPfzl9kLrFYD9Hsu
+Ct2Yo8qEaWltZ84JqZX2GYD0eNLDt6WSxhIDB1WcRhMsa/XNBm5TwzfGt1yx/Mqb
+SHOKviSFUv5HTjJ/l5NDtzvUV+KVEcTA99Ve12Ok74JO7ChRG1U3nHONRKcfJWu9
+7va//Iq102BI6uilMkbGjlQ=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem	2021-01-18 19:58:18.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIUBQnYEKcfjJxTODSGU5rl57gf2FowDQYJKoZIhvcNAQEL
-BQAwIjEgMB4GA1UEAwwXZXZfaW50XzYwX21vbnRocy1ldnJvb3QwIhgPMjAxODEw
-MzEwMDAwMDBaGA8yMDIxMDMwMzAwMDAwMFowMjEwMC4GA1UEAwwnZXZfZWVfMjhf
+MIIDbTCCAlWgAwIBAgIUD55RmXcxc2Ubvzh7CUeXD5mJm20wDQYJKoZIhvcNAQEL
+BQAwIjEgMB4GA1UEAwwXZXZfaW50XzYwX21vbnRocy1ldnJvb3QwIhgPMjAxOTEx
+MDEwMDAwMDBaGA8yMDIyMDMwNDAwMDAwMFowMjEwMC4GA1UEAwwnZXZfZWVfMjhf
 bW9udGhzLWV2X2ludF82MF9tb250aHMtZXZyb290MIIBIjANBgkqhkiG9w0BAQEF
 AAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08E9nq5DVKtOz1aFdsJHvB
 xyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc1SScAn7NQ/weadA4ICmT
@@ -12,10 +12,10 @@
 AQUFBwEBBFQwUjBQBggrBgEFBQcwAYZEaHR0cDovL3d3dy5leGFtcGxlLmNvbTo4
 ODg4L2V2X2VlXzI4X21vbnRocy1ldl9pbnRfNjBfbW9udGhzLWV2cm9vdC8wHwYD
 VR0gBBgwFjAUBhIrBgEEAetJhRqFGoUaAYN0CQEwDQYJKoZIhvcNAQELBQADggEB
-AEmwKCDcOFiIWy9LX9k9QLh0dpKJb5yQTdW9ufTLXGVnby0MG3iMcszaTcyavCOH
-sxBjgZri+ikC1P7WYWMvMUJtUhgr2iEIfnfpeHpzqG0vapGqCxlRl7WaZDITE+yQ
-rWCFVwb/x+N37GcvaSv2UzWPSFr5YqRcV6lbYrSNvQ8fQgkxrtL5EZ4WAriIZPSi
-mv3KOyHcFVsxzgawpjEuOzpbcw3sEjWGFm2A88enVdHfbq9vNBS/9t0PQnZe+33i
-O2fwpNrwY4f2E9GW5dpGscecbUhnrB8RNLGw2cHmB0dqv8EW+eXfIcfa+onPPlKa
-7VJo2ZvmwDTvwBsglSXx1vs=
+AF1J9oNzg5u2a/E4nHHY1WgEPrMD3A4KFgprQxzzyebOqypMWK3+jXNdloF8AS8u
+5mIQoLNNw/bCFb0zgpK+0qKwxGHkreN+eJyfoi+zJr2Ygf4BmRlb02t79v4mYcFN
+rfCFSyvgwOI5aUr5n/BYFkUn38IAllJDn5igGGeROHSyOYZa9lOQZRAsh4vnas99
+V1RWo9E+hOmDH5be67HqJw4DHJ0sld8SWDxtjyXd6RbdJd4VIXScp2sk1W6F49Av
+otRZSrZFaZeS95a9SmN+xhCfpL3VNF3YdHCbfYeam/A/AUlD0TFBSoqJo6l9nT1c
+Of56pBg7jLup+dDdx7whu/w=
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/test_validity/ev_int_60_months-evroot.pem	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIDVzCCAj+gAwIBAgIUaePz4cgvjD+rCGOnX0Nh/MWcpK4wDQYJKoZIhvcNAQEL
-BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTcwNzAzMDAwMDAwWhgPMjAyMjA3
-MDEwMDAwMDBaMCIxIDAeBgNVBAMMF2V2X2ludF82MF9tb250aHMtZXZyb290MIIB
+MIIDVzCCAj+gAwIBAgIUGWNNFPvyjk63DRepZV/gB/+L1VUwDQYJKoZIhvcNAQEL
+BQAwETEPMA0GA1UEAwwGZXZyb290MCIYDzIwMTgwNzAzMTIwMDAwWhgPMjAyMzA3
+MDIxMjAwMDBaMCIxIDAeBgNVBAMMF2V2X2ludF82MF9tb250aHMtZXZyb290MIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuohRqESOFtZB/W62iAY2ED08
 E9nq5DVKtOz1aFdsJHvBxyWo4NgfvbGcBptuGobya+KvWnVramRxCHqlWqdFh/cc
 1SScAn7NQ/weadA4ICmTqyDDSeTbuUzCa2wO7RWCD/F+rWkasdMCOosqQe6ncOAP
@@ -11,10 +11,10 @@
 AQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMFAGCCsGAQUFBwEB
 BEQwQjBABggrBgEFBQcwAYY0aHR0cDovL3d3dy5leGFtcGxlLmNvbTo4ODg4L2V2
 X2ludF82MF9tb250aHMtZXZyb290LzAfBgNVHSAEGDAWMBQGEisGAQQB60mFGoUa
-hRoBg3QJATANBgkqhkiG9w0BAQsFAAOCAQEAMPzVAOmIJDA2qgxyS+GT6Lwls9K6
-CpZYbTHO5nQZkXBH5+L/wQOHOYxw2BE8pfZ5f+DRf5Zcf0NJBaZr2AeLdEmfYocZ
-7EPu3rFbYjHd+HfSguwOPPNZExvpJGP2Rha8LB1DkJVtv5Fx5ZLf0AjApdycJ0W3
-FBD58+zqSGqikF0ZatmfMZfd+50N/+eWv4J5eP6ARRbroT+Fw8DtKpnFKMp4Cy7P
-ue8ygwfBGvhx4557kSybZh+4DzvVkU9TF07DZAFzQYvQUC/XU8pd72QOoENf93dj
-asmdxbPjMNGvg/1z3EQcj7mPdShLVZ7Flcfl36oY6fvPb1fItybl8YC/fA==
+hRoBg3QJATANBgkqhkiG9w0BAQsFAAOCAQEADae0P+9+rtDogzf5zQega4VLX+Nj
+tUru5/tU1IKifEGO1UibkrACklVZPh5I8A0scUNQVuvsSTmRSR3np25bhFtibs0T
+7cx4x9Uwuk/KO2257NUJwj1tZFMdTCxkcIDOujU5XIWo3q1+b2MMgzwgcESjSV8K
+1dUi0mDbhut9SjfimmUgfB+53ZVJDk40RTQIZYFvQy1XKnFpd0R/FXxz3YTZkICm
+E0fAuSsif/wjopUgMnjgXHxA7bZYAuWQxgcZ28MRuqI9JESDZ3eH2oPUkYcpR8DK
+FGd5wcJGvQtR2u/e3EmzcC9jZzBzZE7rvXuyl+AAwXhC25eq1Tqg/7XxjA==
 -----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/EncryptedClientHelloServer.cpp firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/EncryptedClientHelloServer.cpp
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/EncryptedClientHelloServer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/EncryptedClientHelloServer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,143 @@
+/* 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 is a standalone server that offers TLS 1.3 Encrypted
+// Client Hello support.
+
+#include <stdio.h>
+
+#include "nspr.h"
+#include "ScopedNSSTypes.h"
+#include "ssl.h"
+#include "sslexp.h"
+#include "TLSServer.h"
+#include <pk11pub.h>
+#include <vector>
+
+using namespace mozilla;
+using namespace mozilla::test;
+
+struct EchHost {
+  const char* mHostName;
+  const char* mCertName;
+};
+
+const std::vector<uint32_t> kSuiteChaCha = {
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) |
+    HpkeAeadChaCha20Poly1305};
+
+// Hostname, cert nickname pairs.
+const EchHost sEchHosts[] = {{"ech-public.example.com", "default-ee"},
+                             {"ech-private.example.com", "private-ee"},
+                             {"selfsigned.example.com", "selfsigned"},
+                             {nullptr, nullptr}};
+
+int32_t DoSNISocketConfigBySubjectCN(PRFileDesc* aFd,
+                                     const SECItem* aSrvNameArr,
+                                     uint32_t aSrvNameArrSize) {
+  for (uint32_t i = 0; i < aSrvNameArrSize; i++) {
+    UniquePORTString name(
+        static_cast<char*>(PORT_ZAlloc(aSrvNameArr[i].len + 1)));
+    if (name) {
+      PORT_Memcpy(name.get(), aSrvNameArr[i].data, aSrvNameArr[i].len);
+      if (ConfigSecureServerWithNamedCert(aFd, name.get(), nullptr, nullptr,
+                                          nullptr) == SECSuccess) {
+        return 0;
+      }
+    }
+  }
+
+  return SSL_SNI_SEND_ALERT;
+}
+
+int32_t DoSNISocketConfig(PRFileDesc* aFd, const SECItem* aSrvNameArr,
+                          uint32_t aSrvNameArrSize, void* aArg) {
+  const EchHost* host = GetHostForSNI(aSrvNameArr, aSrvNameArrSize, sEchHosts);
+  if (!host) {
+    PrintPRError("No cert found for hostname");
+    return SSL_SNI_SEND_ALERT;
+  }
+
+  if (gDebugLevel >= DEBUG_VERBOSE) {
+    fprintf(stderr, "found pre-defined host '%s'\n", host->mHostName);
+  }
+
+  UniqueCERTCertificate cert;
+  SSLKEAType certKEA;
+  if (SECSuccess != ConfigSecureServerWithNamedCert(aFd, host->mCertName, &cert,
+                                                    &certKEA, nullptr)) {
+    return SSL_SNI_SEND_ALERT;
+  }
+
+  return 0;
+}
+
+SECStatus ConfigureServer(PRFileDesc* aFd) {
+  UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
+  if (!slot) {
+    PrintPRError("PK11_GetInternalKeySlot failed");
+    return SECFailure;
+  }
+
+  UniqueSECKEYPublicKey pubKey;
+  UniqueSECKEYPrivateKey privKey;
+  SECKEYPublicKey* tmpPubKey = nullptr;
+  SECKEYPrivateKey* tmpPrivKey = nullptr;
+
+  static const std::vector<uint8_t> pkcs8{
+      0x30, 0x67, 0x02, 0x01, 0x00, 0x30, 0x14, 0x06, 0x07, 0x2a, 0x86, 0x48,
+      0xce, 0x3d, 0x02, 0x01, 0x06, 0x09, 0x2b, 0x06, 0x01, 0x04, 0x01, 0xda,
+      0x47, 0x0f, 0x01, 0x04, 0x4c, 0x30, 0x4a, 0x02, 0x01, 0x01, 0x04, 0x20,
+      0x8c, 0x49, 0x0e, 0x5b, 0x0c, 0x7d, 0xbe, 0x0c, 0x6d, 0x21, 0x92, 0x48,
+      0x4d, 0x2b, 0x7a, 0x04, 0x23, 0xb3, 0xb4, 0x54, 0x4f, 0x24, 0x81, 0x09,
+      0x5a, 0x99, 0xdb, 0xf2, 0x38, 0xfb, 0x35, 0x0f, 0xa1, 0x23, 0x03, 0x21,
+      0x00, 0x8a, 0x07, 0x56, 0x39, 0x49, 0xfa, 0xc6, 0x23, 0x29, 0x36, 0xed,
+      0x6f, 0x36, 0xc4, 0xfa, 0x73, 0x59, 0x30, 0xec, 0xde, 0xae, 0xf6, 0x73,
+      0x4e, 0x31, 0x4a, 0xea, 0xc3, 0x5a, 0x56, 0xfd, 0x0a};
+
+  SECItem pkcs8Item = {siBuffer, const_cast<uint8_t*>(pkcs8.data()),
+                       static_cast<unsigned int>(pkcs8.size())};
+  SECStatus rv = PK11_ImportDERPrivateKeyInfoAndReturnKey(
+      slot.get(), &pkcs8Item, nullptr, nullptr, false, false, KU_ALL,
+      &tmpPrivKey, nullptr);
+
+  if (rv != SECSuccess) {
+    PrintPRError("PK11_ImportDERPrivateKeyInfoAndReturnKey failed");
+    return SECFailure;
+  }
+  privKey.reset(tmpPrivKey);
+  tmpPubKey = SECKEY_ConvertToPublicKey(privKey.get());
+  pubKey.reset(tmpPubKey);
+
+  if (!privKey || !pubKey) {
+    PrintPRError("ECH/HPKE Public or Private key is null!");
+    return SECFailure;
+  }
+
+  std::vector<uint8_t> echConfig(1000, 0);
+  unsigned int len = 0;
+  rv = SSL_EncodeEchConfig("ech-public.example.com", kSuiteChaCha.data(), 1,
+                           HpkeDhKemX25519Sha256, pubKey.get(), 50,
+                           echConfig.data(), &len, echConfig.size());
+  if (rv != SECSuccess) {
+    PrintPRError("SSL_EncodeEchConfig failed");
+    return rv;
+  }
+
+  rv = SSL_SetServerEchConfigs(aFd, pubKey.get(), privKey.get(),
+                               echConfig.data(), len);
+  if (rv != SECSuccess) {
+    PrintPRError("SSL_SetServerEchConfigs failed");
+    return rv;
+  }
+
+  return SECSuccess;
+}
+
+int main(int argc, char* argv[]) {
+  int rv = StartServer(argc, argv, DoSNISocketConfig, nullptr, ConfigureServer);
+  if (rv < 0) {
+    return rv;
+  }
+}
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -8,6 +8,7 @@
     [
         "BadCertAndPinningServer",
         "DelegatedCredentialsServer",
+        "EncryptedClientHelloServer",
         "GenerateOCSPResponse",
         "OCSPStaplingServer",
         "SanctionsTestServer",
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/SanctionsTestServer.cpp firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/SanctionsTestServer.cpp
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/cmd/SanctionsTestServer.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/cmd/SanctionsTestServer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -25,14 +25,14 @@
 
 // Hostname, cert nickname pairs.
 const SanctionsCertHost sSanctionsCertHosts[] = {
-    {"symantec-whitelist-after-cutoff.example.com",
-     "symantec-ee-from-whitelist-after-cutoff"},
-    {"symantec-whitelist-before-cutoff.example.com",
-     "symantec-ee-from-whitelist-before-cutoff"},
-    {"symantec-not-whitelisted-after-cutoff.example.com",
-     "symantec-ee-not-whitelisted-after-cutoff"},
-    {"symantec-not-whitelisted-before-cutoff.example.com",
-     "symantec-ee-not-whitelisted-before-cutoff"},
+    {"symantec-allowlist-after-cutoff.example.com",
+     "symantec-ee-from-allowlist-after-cutoff"},
+    {"symantec-allowlist-before-cutoff.example.com",
+     "symantec-ee-from-allowlist-before-cutoff"},
+    {"symantec-not-allowlisted-after-cutoff.example.com",
+     "symantec-ee-not-allowlisted-after-cutoff"},
+    {"symantec-not-allowlisted-before-cutoff.example.com",
+     "symantec-ee-not-allowlisted-before-cutoff"},
     {"symantec-unaffected.example.com", "symantec-ee-unaffected"},
     {nullptr, nullptr}};
 
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -494,7 +494,7 @@
 }
 
 int StartServer(int argc, char* argv[], SSLSNISocketConfig sniSocketConfig,
-                void* sniSocketConfigArg) {
+                void* sniSocketConfigArg, ServerConfigFunc configFunc) {
   if (argc != 3) {
     fprintf(stderr, "usage: %s <NSS DB directory> <ppid>\n", argv[0]);
     return 1;
@@ -613,6 +613,14 @@
     return 1;
   }
 
+  // Call back to implementation-defined configuration func, if provided.
+  if (configFunc) {
+    if (((configFunc)(modelSocket.get())) != SECSuccess) {
+      PrintPRError("configFunc failed");
+      return 1;
+    }
+  }
+
   if (gCallbackPort != 0) {
     if (DoCallback()) {
       return 1;
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/tlsserver/lib/TLSServer.h	2021-01-18 19:58:19.000000000 +0000
@@ -30,6 +30,8 @@
 namespace mozilla {
 namespace test {
 
+typedef SECStatus (*ServerConfigFunc)(PRFileDesc* fd);
+
 enum DebugLevel { DEBUG_ERRORS = 1, DEBUG_WARNINGS = 2, DEBUG_VERBOSE = 3 };
 
 extern DebugLevel gDebugLevel;
@@ -52,8 +54,13 @@
 
 SECStatus InitializeNSS(const char* nssCertDBDir);
 
+// StartServer initializes NSS, sockets, the SNI callback, and a default
+// certificate. configFunc (optional) is a pointer to an implementation-
+// defined configuration function, which is called on the model socket
+// prior to handling any connections.
 int StartServer(int argc, char* argv[], SSLSNISocketConfig sniSocketConfig,
-                void* sniSocketConfigArg);
+                void* sniSocketConfigArg,
+                ServerConfigFunc configFunc = nullptr);
 
 template <typename Host>
 inline const Host* GetHostForSNI(const SECItem* aSrvNameArr,
diff -Nru firefox-84.0.2+build1/security/manager/ssl/tests/unit/xpcshell.ini firefox-85.0+build1/security/manager/ssl/tests/unit/xpcshell.ini
--- firefox-84.0.2+build1/security/manager/ssl/tests/unit/xpcshell.ini	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/tests/unit/xpcshell.ini	2021-01-18 19:58:18.000000000 +0000
@@ -25,6 +25,7 @@
   test_crlite_filters/**
   test_ct/**
   test_delegated_credentials/**
+  test_encrypted_client_hello/**
   test_ev_certs/**
   test_intermediate_basic_usage_constraints/**
   test_intermediate_preloads/**
@@ -112,6 +113,10 @@
 skip-if = toolkit == 'android'
 [test_delegated_credentials.js]
 run-sequentially = hardcoded ports
+[test_encrypted_client_hello.js]
+run-sequentially = hardcoded ports
+[test_encrypted_client_hello_client_only.js]
+run-sequentially = hardcoded ports
 [test_der.js]
 [test_enterprise_roots.js]
 # This feature is implemented for Windows and OS X. However, we don't currently
@@ -193,6 +198,7 @@
 skip-if = toolkit == 'android'
 [test_self_signed_certs.js]
 [test_session_resumption.js]
+skip-if = ccov && webrender && os == "win" # Bug 1585916
 run-sequentially = hardcoded ports
 [test_signed_apps.js]
 [test_ssl_status.js]
diff -Nru firefox-84.0.2+build1/security/manager/ssl/TransportSecurityInfo.cpp firefox-85.0+build1/security/manager/ssl/TransportSecurityInfo.cpp
--- firefox-84.0.2+build1/security/manager/ssl/TransportSecurityInfo.cpp	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/TransportSecurityInfo.cpp	2021-01-18 19:58:18.000000000 +0000
@@ -46,6 +46,7 @@
           nsITransportSecurityInfo::CERTIFICATE_TRANSPARENCY_NOT_APPLICABLE),
       mKeaGroup(),
       mSignatureSchemeName(),
+      mIsAcceptedEch(false),
       mIsDelegatedCredential(false),
       mIsDomainMismatch(false),
       mIsNotValidAtThisTime(false),
@@ -194,7 +195,7 @@
   // Re-purpose mErrorMessageCached to represent serialization version
   // If string doesn't match exact version it will be treated as older
   // serialization.
-  rv = aStream->WriteWStringZ(NS_ConvertUTF8toUTF16("5").get());
+  rv = aStream->WriteWStringZ(NS_ConvertUTF8toUTF16("6").get());
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -275,6 +276,11 @@
     return rv;
   }
 
+  rv = aStream->WriteBoolean(mIsAcceptedEch);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
   return NS_OK;
 }
 
@@ -535,7 +541,7 @@
   // moved from nsISSLStatus
   if (!serVersion.EqualsASCII("1") && !serVersion.EqualsASCII("2") &&
       !serVersion.EqualsASCII("3") && !serVersion.EqualsASCII("4") &&
-      !serVersion.EqualsASCII("5")) {
+      !serVersion.EqualsASCII("5") && !serVersion.EqualsASCII("6")) {
     // nsISSLStatus may be present
     rv = ReadSSLStatus(aStream);
     CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
@@ -612,7 +618,7 @@
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!serVersion.EqualsASCII("3") && !serVersion.EqualsASCII("4") &&
-        !serVersion.EqualsASCII("5")) {
+        !serVersion.EqualsASCII("5") && !serVersion.EqualsASCII("6")) {
       // The old data structure of certList(nsIX509CertList) presents
       rv = ReadCertList(aStream, mSucceededCertChain);
       CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
@@ -631,7 +637,7 @@
   }
   // END moved from nsISSLStatus
   if (!serVersion.EqualsASCII("3") && !serVersion.EqualsASCII("4") &&
-      !serVersion.EqualsASCII("5")) {
+      !serVersion.EqualsASCII("5") && !serVersion.EqualsASCII("6")) {
     // The old data structure of certList(nsIX509CertList) presents
     rv = ReadCertList(aStream, mFailedCertChain);
     CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
@@ -650,7 +656,8 @@
 
   // mIsDelegatedCredential added in bug 1562773
   if (serVersion.EqualsASCII("2") || serVersion.EqualsASCII("3") ||
-      serVersion.EqualsASCII("4") || serVersion.EqualsASCII("5")) {
+      serVersion.EqualsASCII("4") || serVersion.EqualsASCII("5") ||
+      serVersion.EqualsASCII("6")) {
     rv = aStream->ReadBoolean(&mIsDelegatedCredential);
     CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
                             "Deserialization should not fail");
@@ -660,7 +667,8 @@
   }
 
   // mNPNCompleted, mNegotiatedNPN, mResumed added in bug 1584104
-  if (serVersion.EqualsASCII("4") || serVersion.EqualsASCII("5")) {
+  if (serVersion.EqualsASCII("4") || serVersion.EqualsASCII("5") ||
+      serVersion.EqualsASCII("6")) {
     rv = aStream->ReadBoolean(&mNPNCompleted);
     CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
                             "Deserialization should not fail");
@@ -684,7 +692,7 @@
   }
 
   // mIsBuiltCertChainRootBuiltInRoot added in bug 1485652
-  if (serVersion.EqualsASCII("5")) {
+  if (serVersion.EqualsASCII("5") || serVersion.EqualsASCII("6")) {
     rv = aStream->ReadBoolean(&mIsBuiltCertChainRootBuiltInRoot);
     CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
                             "Deserialization should not fail");
@@ -693,6 +701,16 @@
     }
   }
 
+  // mIsAcceptedEch added in bug 1678079
+  if (serVersion.EqualsASCII("6")) {
+    rv = aStream->ReadBoolean(&mIsAcceptedEch);
+    CHILD_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv),
+                            "Deserialization should not fail");
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
   return NS_OK;
 }
 
@@ -725,6 +743,7 @@
   WriteParam(aMsg, mNegotiatedNPN);
   WriteParam(aMsg, mResumed);
   WriteParam(aMsg, mIsBuiltCertChainRootBuiltInRoot);
+  WriteParam(aMsg, mIsAcceptedEch);
 }
 
 bool TransportSecurityInfo::DeserializeFromIPC(const IPC::Message* aMsg,
@@ -754,7 +773,8 @@
       !ReadParam(aMsg, aIter, &mNPNCompleted) ||
       !ReadParam(aMsg, aIter, &mNegotiatedNPN) ||
       !ReadParam(aMsg, aIter, &mResumed) ||
-      !ReadParam(aMsg, aIter, &mIsBuiltCertChainRootBuiltInRoot)) {
+      !ReadParam(aMsg, aIter, &mIsBuiltCertChainRootBuiltInRoot) ||
+      !ReadParam(aMsg, aIter, &mIsAcceptedEch)) {
     return false;
   }
 
@@ -1162,6 +1182,16 @@
 }
 
 NS_IMETHODIMP
+TransportSecurityInfo::GetIsAcceptedEch(bool* aIsAcceptedEch) {
+  NS_ENSURE_ARG_POINTER(aIsAcceptedEch);
+  if (!mHaveCipherSuiteAndProtocol) {
+    return NS_ERROR_NOT_AVAILABLE;
+  }
+  *aIsAcceptedEch = mIsAcceptedEch;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
 TransportSecurityInfo::GetIsDelegatedCredential(bool* aIsDelegCred) {
   NS_ENSURE_ARG_POINTER(aIsDelegCred);
   if (!mHaveCipherSuiteAndProtocol) {
diff -Nru firefox-84.0.2+build1/security/manager/ssl/TransportSecurityInfo.h firefox-85.0+build1/security/manager/ssl/TransportSecurityInfo.h
--- firefox-84.0.2+build1/security/manager/ssl/TransportSecurityInfo.h	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/ssl/TransportSecurityInfo.h	2021-01-18 19:58:18.000000000 +0000
@@ -103,6 +103,7 @@
   nsCString mKeaGroup;
   nsCString mSignatureSchemeName;
 
+  bool mIsAcceptedEch;
   bool mIsDelegatedCredential;
   bool mIsDomainMismatch;
   bool mIsNotValidAtThisTime;
diff -Nru firefox-84.0.2+build1/security/manager/tools/KnownRootHashes.json firefox-85.0+build1/security/manager/tools/KnownRootHashes.json
--- firefox-84.0.2+build1/security/manager/tools/KnownRootHashes.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/manager/tools/KnownRootHashes.json	2021-01-18 19:58:18.000000000 +0000
@@ -1097,7 +1097,12 @@
       "label": "Trustwave_Global_ECC_P384_Certification_Authority",
       "binNumber": 218,
       "sha256Fingerprint": "VZA4WcjAw+u4dZ7OTiVXIl/1dYu9OOvUgnZgHhvVgJc="
+    },
+    {
+      "label": "NAVER_Global_Root_Certification_Authority",
+      "binNumber": 219,
+      "sha256Fingerprint": "iPQ43Pj/0fqPQpEV/+X4KuHgbgxww3X6rXF7NKSecmU="
     }
   ],
-  "maxBin": 218
+  "maxBin": 219
 }
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/security/manager/tools/PreloadedHPKPins.json firefox-85.0+build1/security/manager/tools/PreloadedHPKPins.json
--- firefox-84.0.2+build1/security/manager/tools/PreloadedHPKPins.json	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/manager/tools/PreloadedHPKPins.json	2021-01-18 19:58:18.000000000 +0000
@@ -74,10 +74,7 @@
       "sha256_hashes": [
         "DigiCert Global Root CA",
         "DigiCert High Assurance EV Root CA",
-        // Backup intermediates with Let's Encrypt are not normally
-        // in use and require disabling Mozilla's sites blacklisting
-        "Let's Encrypt Authority X3",
-        "Let's Encrypt Authority X4"
+        "ISRG Root X1"
       ]
     },
     // For pinning tests on pinning.example.com, the certificate must be 'End
@@ -118,7 +115,7 @@
         "Entrust Root Certification Authority - EC1",
         "Entrust Root Certification Authority - G2",
         "Entrust.net Premium 2048 Secure Server CA",
-        "GeoTrust Global CA",
+        // "GeoTrust Global CA",
         "GlobalSign ECC Root CA - R4",
         "GlobalSign ECC Root CA - R5",
         "GlobalSign Root CA",
diff -Nru firefox-84.0.2+build1/security/moz.build firefox-85.0+build1/security/moz.build
--- firefox-84.0.2+build1/security/moz.build	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/moz.build	2021-01-18 19:58:18.000000000 +0000
@@ -94,6 +94,7 @@
 # System sqlite here is the in-tree mozsqlite.
 gyp_vars["use_system_sqlite"] = 1
 gyp_vars["sqlite_libs"] = "sqlite"
+gyp_vars["enable_draft_hpke"] = 1
 
 
 if CONFIG["MOZ_SYSTEM_NSPR"]:
diff -Nru firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libnss3.so.txt firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libnss3.so.txt
--- firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libnss3.so.txt	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libnss3.so.txt	2021-01-18 19:58:18.000000000 +0000
@@ -1,8 +0,0 @@
-
-4 Added functions:
-
-  [A] 'function SECStatus CERT_AddCertToListHeadWithData(CERTCertList*, CERTCertificate*, void*)'    {CERT_AddCertToListHeadWithData@@NSS_3.59}
-  [A] 'function SECStatus CERT_AddCertToListTailWithData(CERTCertList*, CERTCertificate*, void*)'    {CERT_AddCertToListTailWithData@@NSS_3.59}
-  [A] 'function PK11SymKey* PK11_PubUnwrapSymKeyWithMechanism(SECKEYPrivateKey*, CK_MECHANISM_TYPE, SECItem*, SECItem*, CK_MECHANISM_TYPE, CK_ATTRIBUTE_TYPE, int)'    {PK11_PubUnwrapSymKeyWithMechanism@@NSS_3.59}
-  [A] 'function SECStatus PK11_PubWrapSymKeyWithMechanism(SECKEYPublicKey*, CK_MECHANISM_TYPE, SECItem*, PK11SymKey*, SECItem*)'    {PK11_PubWrapSymKeyWithMechanism@@NSS_3.59}
-
diff -Nru firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt
--- firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libnssutil3.so.txt	2021-01-18 19:58:18.000000000 +0000
@@ -1,6 +0,0 @@
-
-2 Added functions:
-
-  [A] 'function PRBool NSS_IsPolicyLocked()'    {NSS_IsPolicyLocked@@NSSUTIL_3.59}
-  [A] 'function void NSS_LockPolicy()'    {NSS_LockPolicy@@NSSUTIL_3.59}
-
diff -Nru firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libssl3.so.txt firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libssl3.so.txt
--- firefox-84.0.2+build1/security/nss/automation/abi-check/expected-report-libssl3.so.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/automation/abi-check/expected-report-libssl3.so.txt	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,19 @@
+
+2 functions with some indirect sub-type change:
+
+  [C] 'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:14:1 has some indirect sub-type changes:
+    parameter 2 of type 'SSLChannelInfo*' has sub-type changes:
+      in pointed to type 'typedef SSLChannelInfo' at sslt.h:378:1:
+        underlying type 'struct SSLChannelInfoStr' at sslt.h:299:1 changed:
+          type size hasn't changed
+          1 data member insertion:
+            'PRBool SSLChannelInfoStr::echAccepted', at offset 992 (in bits) at sslt.h:374:1
+
+  [C] 'function SECStatus SSL_GetPreliminaryChannelInfo(PRFileDesc*, SSLPreliminaryChannelInfo*, PRUintn)' at sslinfo.c:122:1 has some indirect sub-type changes:
+    parameter 2 of type 'SSLPreliminaryChannelInfo*' has sub-type changes:
+      in pointed to type 'typedef SSLPreliminaryChannelInfo' at sslt.h:446:1:
+        underlying type 'struct SSLPreliminaryChannelInfoStr' at sslt.h:386:1 changed:
+          type size changed from 288 to 384 (in bits)
+          2 data member insertions:
+            'PRBool SSLPreliminaryChannelInfoStr::echAccepted', at offset 288 (in bits) at sslt.h:439:1
+            'const char* SSLPreliminaryChannelInfoStr::echPublicName', at offset 320 (in bits) at sslt.h:442:1
diff -Nru firefox-84.0.2+build1/security/nss/automation/abi-check/previous-nss-release firefox-85.0+build1/security/nss/automation/abi-check/previous-nss-release
--- firefox-84.0.2+build1/security/nss/automation/abi-check/previous-nss-release	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/nss/automation/abi-check/previous-nss-release	2021-01-18 19:58:18.000000000 +0000
@@ -1 +1 @@
-NSS_3_58_BRANCH
+NSS_3_59_BRANCH
diff -Nru firefox-84.0.2+build1/security/nss/build.sh firefox-85.0+build1/security/nss/build.sh
--- firefox-84.0.2+build1/security/nss/build.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/build.sh	2021-01-18 19:58:18.000000000 +0000
@@ -131,6 +131,7 @@
         --mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;
         --disable-keylog) sslkeylogfile=0 ;;
         --enable-legacy-db) gyp_params+=(-Ddisable_dbm=0) ;;
+        --mozilla-central) gyp_params+=(-Dmozilla_central=1) ;;
         -D*) gyp_params+=("$1") ;;
         *) show_help; exit 2 ;;
     esac
diff -Nru firefox-84.0.2+build1/security/nss/cmd/tstclnt/tstclnt.c firefox-85.0+build1/security/nss/cmd/tstclnt/tstclnt.c
--- firefox-84.0.2+build1/security/nss/cmd/tstclnt/tstclnt.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/cmd/tstclnt/tstclnt.c	2021-01-18 19:58:19.000000000 +0000
@@ -231,7 +231,7 @@
             "  [-r N] [-w passwd] [-W pwfile] [-q [-t seconds]]\n"
             "  [-I groups] [-J signatureschemes]\n"
             "  [-A requestfile] [-L totalconnections] [-P {client,server}]\n"
-            "  [-N encryptedSniKeys] [-Q] [-z externalPsk]\n"
+            "  [-N echConfigs] [-Q] [-z externalPsk]\n"
             "\n",
             progName);
 }
@@ -313,10 +313,9 @@
                     "%-20s rsa_pss_pss_sha256, rsa_pss_pss_sha384, rsa_pss_pss_sha512,\n"
                     "%-20s dsa_sha1, dsa_sha256, dsa_sha384, dsa_sha512\n",
             "-J", "", "", "", "", "", "", "");
-    fprintf(stderr, "%-20s Enable alternative TLS 1.3 handshake\n", "-X alt-server-hello");
     fprintf(stderr, "%-20s Use DTLS\n", "-P {client, server}");
     fprintf(stderr, "%-20s Exit after handshake\n", "-Q");
-    fprintf(stderr, "%-20s Encrypted SNI Keys\n", "-N");
+    fprintf(stderr, "%-20s Use Encrypted Client Hello with the given Base64-encoded ECHConfigs\n", "-N");
     fprintf(stderr, "%-20s Enable post-handshake authentication\n"
                     "%-20s for TLS 1.3; need to specify -n\n",
             "-E", "");
@@ -1010,7 +1009,7 @@
 PRBool requestToExit = PR_FALSE;
 char *versionString = NULL;
 PRBool handshakeComplete = PR_FALSE;
-char *encryptedSNIKeys = NULL;
+char *echConfigs = NULL;
 PRBool enablePostHandshakeAuth = PR_FALSE;
 PRBool enableDelegatedCredentials = PR_FALSE;
 const secuExporter *enabledExporters = NULL;
@@ -1263,6 +1262,30 @@
     return rv;
 }
 
+static SECStatus
+printEchRetryConfigs(PRFileDesc *s)
+{
+    if (PORT_GetError() == SSL_ERROR_ECH_RETRY_WITH_ECH) {
+        SECItem retries = { siBuffer, NULL, 0 };
+        SECStatus rv = SSL_GetEchRetryConfigs(s, &retries);
+        if (rv != SECSuccess) {
+            SECU_PrintError(progName, "SSL_GetEchRetryConfigs failed");
+            return SECFailure;
+        }
+        char *retriesBase64 = NSSBase64_EncodeItem(NULL, NULL, 0, &retries);
+        if (!retriesBase64) {
+            SECU_PrintError(progName, "NSSBase64_EncodeItem on retry_configs failed");
+            SECITEM_FreeItem(&retries, PR_FALSE);
+            return SECFailure;
+        }
+
+        fprintf(stderr, "Received ECH retry_configs: \n%s\n", retriesBase64);
+        PORT_Free(retriesBase64);
+        SECITEM_FreeItem(&retries, PR_FALSE);
+    }
+    return SECSuccess;
+}
+
 static int
 run()
 {
@@ -1511,21 +1534,20 @@
         }
     }
 
-    if (encryptedSNIKeys) {
-        SECItem esniKeysBin = { siBuffer, NULL, 0 };
+    if (echConfigs) {
+        SECItem echConfigsBin = { siBuffer, NULL, 0 };
 
-        if (!NSSBase64_DecodeBuffer(NULL, &esniKeysBin, encryptedSNIKeys,
-                                    strlen(encryptedSNIKeys))) {
-            SECU_PrintError(progName, "ESNIKeys record is invalid base64");
+        if (!NSSBase64_DecodeBuffer(NULL, &echConfigsBin, echConfigs,
+                                    strlen(echConfigs))) {
+            SECU_PrintError(progName, "ECHConfigs record is invalid base64");
             error = 1;
             goto done;
         }
 
-        rv = SSL_EnableESNI(s, esniKeysBin.data, esniKeysBin.len,
-                            "dummy.invalid");
-        SECITEM_FreeItem(&esniKeysBin, PR_FALSE);
+        rv = SSL_SetClientEchConfigs(s, echConfigsBin.data, echConfigsBin.len);
+        SECITEM_FreeItem(&echConfigsBin, PR_FALSE);
         if (rv < 0) {
-            SECU_PrintError(progName, "SSL_EnableESNI failed");
+            SECU_PrintError(progName, "SSL_SetClientEchConfigs failed");
             error = 1;
             goto done;
         }
@@ -1702,6 +1724,9 @@
             } else {
                 error = writeBytesToServer(s, buf, nb);
                 if (error) {
+                    if (echConfigs) {
+                        (void)printEchRetryConfigs(s);
+                    }
                     goto done;
                 }
                 pollset[SSOCK_FD].in_flags = PR_POLL_READ;
@@ -1881,7 +1906,7 @@
                 break;
 
             case 'N':
-                encryptedSNIKeys = PORT_Strdup(optstate->value);
+                echConfigs = PORT_Strdup(optstate->value);
                 break;
 
             case 'P':
@@ -2257,7 +2282,7 @@
     PORT_Free(pwdata.data);
     PORT_Free(host);
     PORT_Free(zeroRttData);
-    PORT_Free(encryptedSNIKeys);
+    PORT_Free(echConfigs);
     SECITEM_ZfreeItem(&psk, PR_FALSE);
     SECITEM_ZfreeItem(&pskLabel, PR_FALSE);
 
diff -Nru firefox-84.0.2+build1/security/nss/coreconf/config.gypi firefox-85.0+build1/security/nss/coreconf/config.gypi
--- firefox-84.0.2+build1/security/nss/coreconf/config.gypi	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/coreconf/config.gypi	2021-01-18 19:58:18.000000000 +0000
@@ -130,6 +130,7 @@
     'only_dev_random%': 1,
     'disable_fips%': 1,
     'mozpkix_only%': 0,
+    'mozilla_central%': 0,
     'coverage%': 0,
     'softfp_cflags%': '',
     'enable_draft_hpke%': 0,
diff -Nru firefox-84.0.2+build1/security/nss/coreconf/coreconf.dep firefox-85.0+build1/security/nss/coreconf/coreconf.dep
--- firefox-84.0.2+build1/security/nss/coreconf/coreconf.dep	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/coreconf/coreconf.dep	2021-01-18 19:58:18.000000000 +0000
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff -Nru firefox-84.0.2+build1/security/nss/cpputil/tls_parser.h firefox-85.0+build1/security/nss/cpputil/tls_parser.h
--- firefox-84.0.2+build1/security/nss/cpputil/tls_parser.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/cpputil/tls_parser.h	2021-01-18 19:58:18.000000000 +0000
@@ -56,6 +56,7 @@
 const uint8_t kTlsAlertUnrecognizedName = 112;
 const uint8_t kTlsAlertCertificateRequired = 116;
 const uint8_t kTlsAlertNoApplicationProtocol = 120;
+const uint8_t kTlsAlertEchRequired = 121;
 
 const uint8_t kTlsFakeChangeCipherSpec[] = {
     ssl_ct_change_cipher_spec,  // Type
diff -Nru firefox-84.0.2+build1/security/nss/gtests/pk11_gtest/pk11_aeskeywrappad_unittest.cc firefox-85.0+build1/security/nss/gtests/pk11_gtest/pk11_aeskeywrappad_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/pk11_gtest/pk11_aeskeywrappad_unittest.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/pk11_gtest/pk11_aeskeywrappad_unittest.cc	2021-01-18 19:58:19.000000000 +0000
@@ -66,6 +66,14 @@
                          true, CKK_EC, usages, usageCount, nullptr));
   ASSERT_EQ(0, PORT_GetError());
   ASSERT_TRUE(!!unwrapped);
+
+  // Try it with internal params allocation.
+  SECKEYPrivateKey* tmp = PK11_UnwrapPrivKey(
+      slot.get(), kek.get(), CKM_NSS_AES_KEY_WRAP_PAD, nullptr, wrapped.get(),
+      nullptr, &pubKey, false, true, CKK_EC, usages, usageCount, nullptr);
+  ASSERT_EQ(0, PORT_GetError());
+  ASSERT_NE(nullptr, tmp);
+  unwrapped.reset(tmp);
 }
 
 // Encrypt an ephemeral RSA key
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/libssl_internals.c firefox-85.0+build1/security/nss/gtests/ssl_gtest/libssl_internals.c
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/libssl_internals.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/libssl_internals.c	2021-01-18 19:58:19.000000000 +0000
@@ -8,8 +8,10 @@
 #include "libssl_internals.h"
 
 #include "nss.h"
+#include "pk11hpke.h"
 #include "pk11pub.h"
 #include "pk11priv.h"
+#include "tls13ech.h"
 #include "seccomon.h"
 #include "selfencrypt.h"
 #include "secmodti.h"
@@ -481,3 +483,17 @@
   ssl_ReleaseSSL3HandshakeLock(ss);
   return SECSuccess;
 }
+
+SECStatus SSLInt_SetRawEchConfigForRetry(PRFileDesc *fd, const uint8_t *buf,
+                                         size_t len) {
+  sslSocket *ss = ssl_FindSocket(fd);
+  if (!ss) {
+    return SECFailure;
+  }
+
+  sslEchConfig *cfg = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+  SECITEM_FreeItem(&cfg->raw, PR_FALSE);
+  SECITEM_AllocItem(NULL, &cfg->raw, len);
+  memcpy(cfg->raw.data, buf, len);
+  return SECSuccess;
+}
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/libssl_internals.h firefox-85.0+build1/security/nss/gtests/ssl_gtest/libssl_internals.h
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/libssl_internals.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/libssl_internals.h	2021-01-18 19:58:18.000000000 +0000
@@ -49,5 +49,7 @@
                                            const SSLSignatureScheme *schemes,
                                            uint32_t num_sig_schemes);
 SECStatus SSLInt_RemoveServerCertificates(PRFileDesc *fd);
+SECStatus SSLInt_SetRawEchConfigForRetry(PRFileDesc *fd, const uint8_t *buf,
+                                         size_t len);
 
 #endif  // ndef libssl_internals_h_
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/manifest.mn firefox-85.0+build1/security/nss/gtests/ssl_gtest/manifest.mn
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/manifest.mn	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/manifest.mn	2021-01-18 19:58:18.000000000 +0000
@@ -58,7 +58,7 @@
       tls_protect.cc \
       tls_psk_unittest.cc \
       tls_subcerts_unittest.cc \
-      tls_esni_unittest.cc \
+      tls_ech_unittest.cc \
       $(SSLKEYLOGFILE_FILES) \
       $(NULL)
 
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_auth_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_auth_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_auth_unittest.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_auth_unittest.cc	2021-01-18 19:58:19.000000000 +0000
@@ -660,6 +660,18 @@
   CheckKeys(ssl_kea_ecdh, ssl_auth_ecdsa);
 }
 
+#ifdef NSS_ENABLE_DRAFT_HPKE
+TEST_P(TlsConnectGeneric, ClientAuthWithEch) {
+  Reset(TlsAgent::kServerEcdsa256);
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetupClientAuth();
+  server_->RequestClientAuth(true);
+  Connect();
+  CheckKeys(ssl_kea_ecdh, ssl_auth_ecdsa);
+}
+#endif
+
 TEST_P(TlsConnectGeneric, ClientAuthBigRsa) {
   Reset(TlsAgent::kServerRsa, TlsAgent::kRsa2048);
   client_->SetupClientAuth();
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_custext_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_custext_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_custext_unittest.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_custext_unittest.cc	2021-01-18 19:58:19.000000000 +0000
@@ -67,8 +67,8 @@
     ssl_tls13_certificate_authorities_xtn,
     ssl_next_proto_nego_xtn,
     ssl_renegotiation_info_xtn,
-    ssl_tls13_short_header_xtn,
     ssl_record_size_limit_xtn,
+    ssl_tls13_encrypted_client_hello_xtn,
     1,
     0xffff};
 // The list here includes all extensions we expect to use (SSL_MAX_EXTENSIONS),
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_extension_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_extension_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_extension_unittest.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_extension_unittest.cc	2021-01-18 19:58:19.000000000 +0000
@@ -83,63 +83,6 @@
   size_t length_;
 };
 
-class TlsExtensionAppender : public TlsHandshakeFilter {
- public:
-  TlsExtensionAppender(const std::shared_ptr<TlsAgent>& a,
-                       uint8_t handshake_type, uint16_t ext, DataBuffer& data)
-      : TlsHandshakeFilter(a, {handshake_type}), extension_(ext), data_(data) {}
-
-  virtual PacketFilter::Action FilterHandshake(const HandshakeHeader& header,
-                                               const DataBuffer& input,
-                                               DataBuffer* output) {
-    TlsParser parser(input);
-    if (!TlsExtensionFilter::FindExtensions(&parser, header)) {
-      return KEEP;
-    }
-    *output = input;
-
-    // Increase the length of the extensions block.
-    if (!UpdateLength(output, parser.consumed(), 2)) {
-      return KEEP;
-    }
-
-    // Extensions in Certificate are nested twice.  Increase the size of the
-    // certificate list.
-    if (header.handshake_type() == kTlsHandshakeCertificate) {
-      TlsParser p2(input);
-      if (!p2.SkipVariable(1)) {
-        ADD_FAILURE();
-        return KEEP;
-      }
-      if (!UpdateLength(output, p2.consumed(), 3)) {
-        return KEEP;
-      }
-    }
-
-    size_t offset = output->len();
-    offset = output->Write(offset, extension_, 2);
-    WriteVariable(output, offset, data_, 2);
-
-    return CHANGE;
-  }
-
- private:
-  bool UpdateLength(DataBuffer* output, size_t offset, size_t size) {
-    uint32_t len;
-    if (!output->Read(offset, size, &len)) {
-      ADD_FAILURE();
-      return false;
-    }
-
-    len += 4 + data_.len();
-    output->Write(offset, len, size);
-    return true;
-  }
-
-  const uint16_t extension_;
-  const DataBuffer data_;
-};
-
 class TlsExtensionTestBase : public TlsConnectTestBase {
  protected:
   TlsExtensionTestBase(SSLProtocolVariant variant, uint16_t version)
@@ -1155,6 +1098,22 @@
                               SSL_ERROR_MISSING_SUPPORTED_GROUPS_EXTENSION);
 }
 
+#ifdef NSS_ENABLE_DRAFT_HPKE
+TEST_P(TlsExtensionTest13, HrrThenRemoveEch) {
+  if (variant_ == ssl_variant_datagram) {
+    // ECH not supported in DTLS.
+    return;
+  }
+
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  ExpectAlert(server_, kTlsAlertIllegalParameter);
+  HrrThenRemoveExtensionsTest(ssl_tls13_encrypted_client_hello_xtn,
+                              SSL_ERROR_ILLEGAL_PARAMETER_ALERT,
+                              SSL_ERROR_BAD_2ND_CLIENT_HELLO);
+}
+#endif
+
 TEST_P(TlsExtensionTest13, EmptyVersionList) {
   static const uint8_t ext[] = {0x00, 0x00};
   ConnectWithBogusVersionList(ext, sizeof(ext));
@@ -1289,6 +1248,7 @@
 
 TEST_P(TlsConnectStream, IncludePadding) {
   EnsureTlsSetup();
+  SSL_EnableTls13GreaseEch(client_->ssl_fd(), PR_FALSE);  // Don't GREASE
 
   // This needs to be long enough to push a TLS 1.0 ClientHello over 255, but
   // short enough not to push a TLS 1.3 ClientHello over 511.
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_gtest.gyp firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_gtest.gyp
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_gtest.gyp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_gtest.gyp	2021-01-18 19:58:18.000000000 +0000
@@ -55,7 +55,7 @@
         'tls_connect.cc',
         'tls_filter.cc',
         'tls_hkdf_unittest.cc',
-        'tls_esni_unittest.cc',
+        'tls_ech_unittest.cc',
         'tls_protect.cc',
         'tls_psk_unittest.cc',
         'tls_subcerts_unittest.cc'
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/ssl_tls13compat_unittest.cc	2021-01-18 19:58:19.000000000 +0000
@@ -214,6 +214,31 @@
   CheckForCompatHandshake();
 }
 
+#ifdef NSS_ENABLE_DRAFT_HPKE
+TEST_F(Tls13CompatTest, EnabledAcceptedEch) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  EnableCompatMode();
+  InstallFilters();
+  Connect();
+  CheckForCompatHandshake();
+}
+
+TEST_F(Tls13CompatTest, EnabledRejectedEch) {
+  EnsureTlsSetup();
+  // Configure ECH on the client only, and expect CCS.
+  SetupEch(client_, server_, HpkeDhKemX25519Sha256, false, true, false);
+  EnableCompatMode();
+  InstallFilters();
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  ConnectExpectFailOneSide(TlsAgent::CLIENT);
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+  CheckForCompatHandshake();
+  // Reset expectations for the TlsAgent dtor.
+  server_->ExpectReceiveAlert(kTlsAlertCloseNotify, kTlsAlertWarning);
+}
+#endif
+
 class TlsSessionIDEchoFilter : public TlsHandshakeFilter {
  public:
   TlsSessionIDEchoFilter(const std::shared_ptr<TlsAgent>& a)
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_agent.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_agent.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_agent.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_agent.cc	2021-01-18 19:58:19.000000000 +0000
@@ -74,6 +74,7 @@
       expected_version_(0),
       expected_cipher_suite_(0),
       expect_client_auth_(false),
+      expect_ech_(false),
       expect_psk_(ssl_psk_none),
       can_falsestart_hook_called_(false),
       sni_hook_called_(false),
@@ -687,7 +688,9 @@
   SetOption(SSL_ENABLE_FALSE_START, PR_TRUE);
 }
 
-void TlsAgent::ExpectPsk() { expect_psk_ = ssl_psk_external; }
+void TlsAgent::ExpectEch(bool expected) { expect_ech_ = expected; }
+
+void TlsAgent::ExpectPsk(SSLPskType psk) { expect_psk_ = psk; }
 
 void TlsAgent::ExpectResumption() { expect_psk_ = ssl_psk_resume; }
 
@@ -820,7 +823,6 @@
             SSL_GetPreliminaryChannelInfo(ssl_fd(), &preinfo, sizeof(preinfo)));
   EXPECT_EQ(sizeof(preinfo), preinfo.length);
   EXPECT_TRUE(preinfo.valuesSet & ssl_preinfo_version);
-  EXPECT_TRUE(preinfo.valuesSet & ssl_preinfo_cipher_suite);
 
   // A version of 0 is invalid and indicates no expectation.  This value is
   // initialized to 0 so that tests that don't explicitly set an expected
@@ -932,6 +934,7 @@
 
   EXPECT_EQ(expect_psk_ == ssl_psk_resume, info_.resumed == PR_TRUE);
   EXPECT_EQ(expect_psk_, info_.pskType);
+  EXPECT_EQ(expect_ech_, info_.echAccepted);
 
   // Preliminary values are exposed through callbacks during the handshake.
   // If either expected values were set or the callbacks were called, check
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_agent.h firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_agent.h
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_agent.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_agent.h	2021-01-18 19:58:18.000000000 +0000
@@ -158,7 +158,9 @@
   void SetServerKeyBits(uint16_t bits);
   void ExpectReadWriteError();
   void EnableFalseStart();
-  void ExpectPsk();
+  void ExpectEch(bool expected = true);
+  bool GetEchExpected() const { return expect_ech_; }
+  void ExpectPsk(SSLPskType psk = ssl_psk_external);
   void ExpectResumption();
   void SkipVersionChecks();
   void SetSignatureSchemes(const SSLSignatureScheme* schemes, size_t count);
@@ -186,6 +188,7 @@
   void EnableExtendedMasterSecret();
   void CheckExtendedMasterSecret(bool expected);
   void CheckEarlyDataAccepted(bool expected);
+  void CheckEchAccepted(bool expected);
   void SetDowngradeCheckVersion(uint16_t version);
   void CheckSecretsDestroyed();
   void ConfigNamedGroups(const std::vector<SSLNamedGroup>& groups);
@@ -426,6 +429,7 @@
   uint16_t expected_version_;
   uint16_t expected_cipher_suite_;
   bool expect_client_auth_;
+  bool expect_ech_;
   SSLPskType expect_psk_;
   bool can_falsestart_hook_called_;
   bool sni_hook_called_;
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_connect.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_connect.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_connect.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_connect.cc	2021-01-18 19:58:19.000000000 +0000
@@ -248,6 +248,91 @@
   anti_replay_.reset(p_anti_replay);
 }
 
+void TlsConnectTestBase::MakeEcKeyParams(SECItem* params, SSLNamedGroup group) {
+  auto groupDef = ssl_LookupNamedGroup(group);
+  ASSERT_NE(nullptr, groupDef);
+
+  auto oidData = SECOID_FindOIDByTag(groupDef->oidTag);
+  ASSERT_NE(nullptr, oidData);
+  ASSERT_NE(nullptr,
+            SECITEM_AllocItem(nullptr, params, (2 + oidData->oid.len)));
+  params->data[0] = SEC_ASN1_OBJECT_ID;
+  params->data[1] = oidData->oid.len;
+  memcpy(params->data + 2, oidData->oid.data, oidData->oid.len);
+}
+
+void TlsConnectTestBase::GenerateEchConfig(
+    HpkeKemId kem_id, const std::vector<uint32_t>& cipher_suites,
+    const std::string& public_name, uint16_t max_name_len, DataBuffer& record,
+    ScopedSECKEYPublicKey& pubKey, ScopedSECKEYPrivateKey& privKey) {
+  bool gen_keys = !pubKey && !privKey;
+  SECKEYECParams ecParams = {siBuffer, NULL, 0};
+  MakeEcKeyParams(&ecParams, ssl_grp_ec_curve25519);
+
+  SECKEYPublicKey* pub = nullptr;
+  SECKEYPrivateKey* priv = nullptr;
+
+  if (gen_keys) {
+    priv = SECKEY_CreateECPrivateKey(&ecParams, &pub, nullptr);
+  } else {
+    priv = privKey.get();
+    pub = pubKey.get();
+  }
+  ASSERT_NE(nullptr, priv);
+  SECITEM_FreeItem(&ecParams, PR_FALSE);
+  PRUint8 encoded[1024];
+  unsigned int encoded_len = 0;
+  SECStatus rv = SSL_EncodeEchConfig(
+      public_name.c_str(), cipher_suites.data(), cipher_suites.size(), kem_id,
+      pub, max_name_len, encoded, &encoded_len, sizeof(encoded));
+  EXPECT_EQ(SECSuccess, rv);
+  EXPECT_GT(encoded_len, 0U);
+
+  if (gen_keys) {
+    pubKey.reset(pub);
+    privKey.reset(priv);
+  }
+  record.Truncate(0);
+  record.Write(0, encoded, encoded_len);
+}
+
+void TlsConnectTestBase::SetupEch(std::shared_ptr<TlsAgent>& client,
+                                  std::shared_ptr<TlsAgent>& server,
+                                  HpkeKemId kem_id, bool expect_ech,
+                                  bool set_client_config,
+                                  bool set_server_config) {
+  EXPECT_TRUE(set_server_config || set_client_config);
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  static const std::vector<uint32_t> kDefaultSuites = {
+      (static_cast<uint16_t>(HpkeKdfHkdfSha256) << 16) |
+          HpkeAeadChaCha20Poly1305,
+      (static_cast<uint16_t>(HpkeKdfHkdfSha256) << 16) | HpkeAeadAes128Gcm};
+
+  GenerateEchConfig(kem_id, kDefaultSuites, "public.name", 100, record, pub,
+                    priv);
+  ASSERT_NE(0U, record.len());
+  SECStatus rv;
+  if (set_server_config) {
+    rv = SSL_SetServerEchConfigs(server->ssl_fd(), pub.get(), priv.get(),
+                                 record.data(), record.len());
+    ASSERT_EQ(SECSuccess, rv);
+  }
+  if (set_client_config) {
+    rv = SSL_SetClientEchConfigs(client->ssl_fd(), record.data(), record.len());
+    ASSERT_EQ(SECSuccess, rv);
+  }
+
+  /* Filter expect_ech, which typically defaults to true. Parameterized tests
+   * running DTLS or TLS < 1.3 should expect only a non-ECH result. */
+  bool expect = expect_ech && variant_ != ssl_variant_datagram &&
+                version_ >= SSL_LIBRARY_VERSION_TLS_1_3 && set_client_config &&
+                set_server_config;
+  client->ExpectEch(expect);
+  server->ExpectEch(expect);
+}
+
 void TlsConnectTestBase::Reset() {
   // Take a copy of the names because they are about to disappear.
   std::string server_name = server_->name();
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_connect.h firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_connect.h
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_connect.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_connect.h	2021-01-18 19:58:19.000000000 +0000
@@ -146,6 +146,19 @@
   void SaveAlgorithmPolicy();
   void RestoreAlgorithmPolicy();
 
+  static void MakeEcKeyParams(SECItem* params, SSLNamedGroup group);
+  static void GenerateEchConfig(HpkeKemId kem_id,
+                                const std::vector<uint32_t>& cipher_suites,
+                                const std::string& public_name,
+                                uint16_t max_name_len, DataBuffer& record,
+                                ScopedSECKEYPublicKey& pubKey,
+                                ScopedSECKEYPrivateKey& privKey);
+  void SetupEch(std::shared_ptr<TlsAgent>& client,
+                std::shared_ptr<TlsAgent>& server,
+                HpkeKemId kem_id = HpkeDhKemX25519Sha256,
+                bool expect_ech = true, bool set_client_config = true,
+                bool set_server_config = true);
+
  protected:
   SSLProtocolVariant variant_;
   std::shared_ptr<TlsAgent> client_;
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_ech_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_ech_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_ech_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_ech_unittest.cc	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,1604 @@
+/* -*- Mode: C++; tab-width: 8; 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/. */
+
+// TODO: Add padding/maxNameLen tests after support is added in bug 1677181.
+
+#include "secerr.h"
+#include "ssl.h"
+
+#include "gtest_utils.h"
+#include "pk11pub.h"
+#include "tls_agent.h"
+#include "tls_connect.h"
+#include "util.h"
+
+namespace nss_test {
+
+class TlsAgentEchTest : public TlsAgentTestClient13 {
+ protected:
+  void InstallEchConfig(const DataBuffer& record, PRErrorCode err = 0) {
+    SECStatus rv =
+        SSL_SetClientEchConfigs(agent_->ssl_fd(), record.data(), record.len());
+    if (err == 0) {
+      ASSERT_EQ(SECSuccess, rv);
+    } else {
+      ASSERT_EQ(SECFailure, rv);
+      ASSERT_EQ(err, PORT_GetError());
+    }
+  }
+};
+
+#ifdef NSS_ENABLE_DRAFT_HPKE
+#include "cpputil.h"  // Unused function error if included without HPKE.
+
+static std::string kPublicName("public.name");
+
+static const std::vector<uint32_t> kDefaultSuites = {
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) | HpkeAeadChaCha20Poly1305,
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) | HpkeAeadAes128Gcm};
+static const std::vector<uint32_t> kSuiteChaCha = {
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) |
+    HpkeAeadChaCha20Poly1305};
+static const std::vector<uint32_t> kSuiteAes = {
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) | HpkeAeadAes128Gcm};
+std::vector<uint32_t> kBogusSuite = {0xfefefefe};
+static const std::vector<uint32_t> kUnknownFirstSuite = {
+    0xfefefefe,
+    (static_cast<uint32_t>(HpkeKdfHkdfSha256) << 16) | HpkeAeadAes128Gcm};
+
+class TlsConnectStreamTls13Ech : public TlsConnectTestBase {
+ public:
+  TlsConnectStreamTls13Ech()
+      : TlsConnectTestBase(ssl_variant_stream, SSL_LIBRARY_VERSION_TLS_1_3) {}
+
+  void ReplayChWithMalformedInner(const std::string& ch, uint8_t server_alert,
+                                  uint32_t server_code, uint32_t client_code) {
+    std::vector<uint8_t> ch_vec = hex_string_to_bytes(ch);
+    DataBuffer ch_buf;
+    ScopedSECKEYPublicKey pub;
+    ScopedSECKEYPrivateKey priv;
+    EnsureTlsSetup();
+    ImportFixedEchKeypair(pub, priv);
+    SetMutualEchConfigs(pub, priv);
+
+    TlsAgentTestBase::MakeRecord(variant_, ssl_ct_handshake,
+                                 SSL_LIBRARY_VERSION_TLS_1_3, ch_vec.data(),
+                                 ch_vec.size(), &ch_buf, 0);
+    StartConnect();
+    client_->SendDirect(ch_buf);
+    ExpectAlert(server_, server_alert);
+    server_->Handshake();
+    server_->CheckErrorCode(server_code);
+    client_->ExpectReceiveAlert(server_alert, kTlsAlertFatal);
+    client_->Handshake();
+    client_->CheckErrorCode(client_code);
+  }
+
+  // Setup Client/Server with mismatched AEADs
+  void SetupForEchRetry() {
+    ScopedSECKEYPublicKey server_pub;
+    ScopedSECKEYPrivateKey server_priv;
+    ScopedSECKEYPublicKey client_pub;
+    ScopedSECKEYPrivateKey client_priv;
+    DataBuffer server_rec;
+    DataBuffer client_rec;
+    TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteChaCha,
+                                          kPublicName, 100, server_rec,
+                                          server_pub, server_priv);
+    ASSERT_EQ(SECSuccess,
+              SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                      server_priv.get(), server_rec.data(),
+                                      server_rec.len()));
+
+    TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteAes,
+                                          kPublicName, 100, client_rec,
+                                          client_pub, client_priv);
+    ASSERT_EQ(SECSuccess,
+              SSL_SetClientEchConfigs(client_->ssl_fd(), client_rec.data(),
+                                      client_rec.len()));
+  }
+
+  // Parse a captured SNI extension and validate the contained name.
+  void CheckSniExtension(const DataBuffer& data,
+                         const std::string expected_name) {
+    TlsParser parser(data.data(), data.len());
+    uint32_t tmp;
+    ASSERT_TRUE(parser.Read(&tmp, 2));
+    ASSERT_EQ(parser.remaining(), tmp);
+    ASSERT_TRUE(parser.Read(&tmp, 1));
+    ASSERT_EQ(0U, tmp); /* sni_nametype_hostname */
+    DataBuffer name;
+    ASSERT_TRUE(parser.ReadVariable(&name, 2));
+    ASSERT_EQ(0U, parser.remaining());
+    // Manual comparison to silence coverity false-positives.
+    ASSERT_EQ(name.len(), kPublicName.length());
+    ASSERT_EQ(0,
+              memcmp(kPublicName.c_str(), name.data(), kPublicName.length()));
+  }
+
+  void DoEchRetry(const ScopedSECKEYPublicKey& server_pub,
+                  const ScopedSECKEYPrivateKey& server_priv,
+                  const DataBuffer& server_rec) {
+    StackSECItem retry_configs;
+    ASSERT_EQ(SECSuccess,
+              SSL_GetEchRetryConfigs(client_->ssl_fd(), &retry_configs));
+    ASSERT_NE(0U, retry_configs.len);
+
+    // Reset expectations for the TlsAgent dtor.
+    server_->ExpectReceiveAlert(kTlsAlertCloseNotify, kTlsAlertWarning);
+    Reset();
+    EnsureTlsSetup();
+    ASSERT_EQ(SECSuccess,
+              SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                      server_priv.get(), server_rec.data(),
+                                      server_rec.len()));
+    ASSERT_EQ(SECSuccess,
+              SSL_SetClientEchConfigs(client_->ssl_fd(), retry_configs.data,
+                                      retry_configs.len));
+    client_->ExpectEch();
+    server_->ExpectEch();
+    Connect();
+  }
+
+ private:
+  // Testing certan invalid CHInner configurations is tricky, particularly
+  // since the CHOuter forms AAD and isn't available in filters. Instead of
+  // generating these inputs on the fly, use a fixed server keypair so that
+  // the input can be generated once (e.g. via a debugger) and replayed in
+  // each invocation of the test.
+  std::string kFixedServerPubkey =
+      "3067020100301406072a8648ce3d020106092b06010401da470f01044c304a"
+      "02010104205a8aa0d2476b28521588e0c704b14db82cdd4970d340d293a957"
+      "6deaee9ec1c7a1230321008756e2580c07c1d2ffcb662f5fadc6d6ff13da85"
+      "abd7adfecf984aaa102c1269";
+
+  void ImportFixedEchKeypair(ScopedSECKEYPublicKey& pub,
+                             ScopedSECKEYPrivateKey& priv) {
+    ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
+    if (!slot) {
+      ADD_FAILURE() << "No slot";
+      return;
+    }
+    std::vector<uint8_t> pkcs8_r = hex_string_to_bytes(kFixedServerPubkey);
+    SECItem pkcs8_r_item = {siBuffer, toUcharPtr(pkcs8_r.data()),
+                            static_cast<unsigned int>(pkcs8_r.size())};
+
+    SECKEYPrivateKey* tmp_priv = nullptr;
+    ASSERT_EQ(SECSuccess, PK11_ImportDERPrivateKeyInfoAndReturnKey(
+                              slot.get(), &pkcs8_r_item, nullptr, nullptr,
+                              false, false, KU_ALL, &tmp_priv, nullptr));
+    priv.reset(tmp_priv);
+    SECKEYPublicKey* tmp_pub = SECKEY_ConvertToPublicKey(tmp_priv);
+    pub.reset(tmp_pub);
+    ASSERT_NE(nullptr, tmp_pub);
+  }
+
+  void SetMutualEchConfigs(ScopedSECKEYPublicKey& pub,
+                           ScopedSECKEYPrivateKey& priv) {
+    DataBuffer record;
+    TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                          kPublicName, 100, record, pub, priv);
+    ASSERT_EQ(SECSuccess,
+              SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                      record.data(), record.len()));
+    ASSERT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                  record.data(), record.len()));
+  }
+};
+
+static void CheckCertVerifyPublicName(TlsAgent* agent) {
+  agent->UpdatePreliminaryChannelInfo();
+  EXPECT_NE(0U, (agent->pre_info().valuesSet & ssl_preinfo_ech));
+  EXPECT_EQ(agent->GetEchExpected(), agent->pre_info().echAccepted);
+
+  // Check that echPublicName is only exposed in the rejection
+  // case, so that the application can use it for CertVerfiy.
+  if (agent->GetEchExpected()) {
+    EXPECT_EQ(nullptr, agent->pre_info().echPublicName);
+  } else {
+    EXPECT_NE(nullptr, agent->pre_info().echPublicName);
+    if (agent->pre_info().echPublicName) {
+      EXPECT_EQ(0,
+                strcmp(kPublicName.c_str(), agent->pre_info().echPublicName));
+    }
+  }
+}
+
+static SECStatus AuthCompleteSuccess(TlsAgent* agent, PRBool, PRBool) {
+  CheckCertVerifyPublicName(agent);
+  return SECSuccess;
+}
+
+static SECStatus AuthCompleteFail(TlsAgent* agent, PRBool, PRBool) {
+  CheckCertVerifyPublicName(agent);
+  return SECFailure;
+}
+
+TEST_P(TlsAgentEchTest, EchConfigsSupportedYesNo) {
+  if (variant_ == ssl_variant_datagram) {
+    return;
+  }
+
+  // ECHConfig 2 cipher_suites are unsupported.
+  const std::string mixed =
+      "0086FE08003F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304"
+      "444156E4E04D1BF0FFDA7783B6B457F75600200008000100030001000100640000FE0800"
+      "3F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304444156E4E0"
+      "4D1BF0FFDA7783B6B457F756002000080001FFFFFFFF000100640000";
+  std::vector<uint8_t> config = hex_string_to_bytes(mixed);
+  DataBuffer record(config.data(), config.size());
+
+  EnsureInit();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  InstallEchConfig(record, 0);
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_TRUE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, EchConfigsSupportedNoYes) {
+  if (variant_ == ssl_variant_datagram) {
+    return;
+  }
+
+  // ECHConfig 1 cipher_suites are unsupported.
+  const std::string mixed =
+      "0086FE08003F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304"
+      "444156E4E04D1BF0FFDA7783B6B457F756002000080001FFFFFFFF000100640000FE0800"
+      "3F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304444156E4E0"
+      "4D1BF0FFDA7783B6B457F75600200008000100030001000100640000";
+  std::vector<uint8_t> config = hex_string_to_bytes(mixed);
+  DataBuffer record(config.data(), config.size());
+
+  EnsureInit();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  InstallEchConfig(record, 0);
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_TRUE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, EchConfigsSupportedNoNo) {
+  if (variant_ == ssl_variant_datagram) {
+    return;
+  }
+
+  // ECHConfig 1 and 2 cipher_suites are unsupported.
+  const std::string unsupported =
+      "0086FE08003F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304"
+      "444156E4E04D1BF0FFDA7783B6B457F756002000080001FFFF0001FFFF00640000FE0800"
+      "3F000B7075626C69632E6E616D6500203BB6D46C201B820F1AE4AFD4DEC304444156E4E0"
+      "4D1BF0FFDA7783B6B457F75600200008FFFF0003FFFF000100640000";
+  std::vector<uint8_t> config = hex_string_to_bytes(unsupported);
+  DataBuffer record(config.data(), config.size());
+
+  EnsureInit();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  InstallEchConfig(record, SEC_ERROR_INVALID_ARGS);
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, ShortEchConfig) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  record.Truncate(record.len() - 1);
+  InstallEchConfig(record, SEC_ERROR_BAD_DATA);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, LongEchConfig) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  record.Write(record.len(), 1, 1);  // Append one byte
+  InstallEchConfig(record, SEC_ERROR_BAD_DATA);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, UnsupportedEchConfigVersion) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  static const uint8_t bad_version[] = {0xff, 0xff};
+  DataBuffer bad_ver_buf(bad_version, sizeof(bad_version));
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  record.Splice(bad_ver_buf, 2, 2);
+  InstallEchConfig(record, SEC_ERROR_INVALID_ARGS);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, UnsupportedHpkeKem) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  // SSL_EncodeEchConfig encodes without validation.
+  TlsConnectTestBase::GenerateEchConfig(static_cast<HpkeKemId>(0xff),
+                                        kDefaultSuites, kPublicName, 100,
+                                        record, pub, priv);
+  InstallEchConfig(record, SEC_ERROR_INVALID_ARGS);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, EchRejectIgnoreAllUnknownSuites) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kBogusSuite,
+                                        kPublicName, 100, record, pub, priv);
+  InstallEchConfig(record, SEC_ERROR_INVALID_ARGS);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_F(TlsConnectStreamTls13, EchAcceptIgnoreSingleUnknownSuite) {
+  EnsureTlsSetup();
+  DataBuffer record;
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256,
+                                        kUnknownFirstSuite, kPublicName, 100,
+                                        record, pub, priv);
+  ASSERT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                record.data(), record.len()));
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                    record.data(), record.len()));
+
+  client_->ExpectEch();
+  server_->ExpectEch();
+  Connect();
+}
+
+TEST_P(TlsAgentEchTest, ApiInvalidArgs) {
+  EnsureInit();
+  // SetClient
+  EXPECT_EQ(SECFailure, SSL_SetClientEchConfigs(agent_->ssl_fd(), nullptr, 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_SetClientEchConfigs(agent_->ssl_fd(),
+                                    reinterpret_cast<const uint8_t*>(1), 0));
+
+  // SetServer
+  EXPECT_EQ(SECFailure,
+            SSL_SetServerEchConfigs(agent_->ssl_fd(), nullptr,
+                                    reinterpret_cast<SECKEYPrivateKey*>(1),
+                                    reinterpret_cast<const uint8_t*>(1), 1));
+  EXPECT_EQ(SECFailure,
+            SSL_SetServerEchConfigs(
+                agent_->ssl_fd(), reinterpret_cast<SECKEYPublicKey*>(1),
+                nullptr, reinterpret_cast<const uint8_t*>(1), 1));
+  EXPECT_EQ(SECFailure,
+            SSL_SetServerEchConfigs(
+                agent_->ssl_fd(), reinterpret_cast<SECKEYPublicKey*>(1),
+                reinterpret_cast<SECKEYPrivateKey*>(1), nullptr, 1));
+  EXPECT_EQ(SECFailure,
+            SSL_SetServerEchConfigs(agent_->ssl_fd(),
+                                    reinterpret_cast<SECKEYPublicKey*>(1),
+                                    reinterpret_cast<SECKEYPrivateKey*>(1),
+                                    reinterpret_cast<const uint8_t*>(1), 0));
+
+  // GetRetries
+  EXPECT_EQ(SECFailure, SSL_GetEchRetryConfigs(agent_->ssl_fd(), nullptr));
+
+  // EncodeEchConfig
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig(nullptr, reinterpret_cast<uint32_t*>(1), 1,
+                                static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 1,
+                                reinterpret_cast<uint8_t*>(1),
+                                reinterpret_cast<uint32_t*>(1), 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig("name", nullptr, 1, static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 1,
+                                reinterpret_cast<uint8_t*>(1),
+                                reinterpret_cast<uint32_t*>(1), 1));
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig("name", reinterpret_cast<uint32_t*>(1), 0,
+                                static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 1,
+                                reinterpret_cast<uint8_t*>(1),
+                                reinterpret_cast<uint32_t*>(1), 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig("name", reinterpret_cast<uint32_t*>(1), 1,
+                                static_cast<HpkeKemId>(1), nullptr, 1,
+                                reinterpret_cast<uint8_t*>(1),
+                                reinterpret_cast<uint32_t*>(1), 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig(nullptr, reinterpret_cast<uint32_t*>(1), 1,
+                                static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 0,
+                                reinterpret_cast<uint8_t*>(1),
+                                reinterpret_cast<uint32_t*>(1), 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig("name", reinterpret_cast<uint32_t*>(1), 1,
+                                static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 1,
+                                nullptr, reinterpret_cast<uint32_t*>(1), 1));
+
+  EXPECT_EQ(SECFailure,
+            SSL_EncodeEchConfig("name", reinterpret_cast<uint32_t*>(1), 1,
+                                static_cast<HpkeKemId>(1),
+                                reinterpret_cast<SECKEYPublicKey*>(1), 1,
+                                reinterpret_cast<uint8_t*>(1), nullptr, 1));
+}
+
+TEST_P(TlsAgentEchTest, NoEarlyRetryConfigs) {
+  EnsureInit();
+  StackSECItem retry_configs;
+  EXPECT_EQ(SECFailure,
+            SSL_GetEchRetryConfigs(agent_->ssl_fd(), &retry_configs));
+  EXPECT_EQ(SSL_ERROR_HANDSHAKE_NOT_COMPLETED, PORT_GetError());
+
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  InstallEchConfig(record, 0);
+
+  EXPECT_EQ(SECFailure,
+            SSL_GetEchRetryConfigs(agent_->ssl_fd(), &retry_configs));
+  EXPECT_EQ(SSL_ERROR_HANDSHAKE_NOT_COMPLETED, PORT_GetError());
+}
+
+TEST_P(TlsAgentEchTest, NoSniSoNoEch) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  SSL_SetURL(agent_->ssl_fd(), "");
+  InstallEchConfig(record, 0);
+  SSL_SetURL(agent_->ssl_fd(), "");
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, NoEchConfigSoNoEch) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_P(TlsAgentEchTest, EchConfigDuplicateExtensions) {
+  EnsureInit();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+
+  static const uint8_t duped_xtn[] = {0x00, 0x08, 0x00, 0x01, 0x00,
+                                      0x00, 0x00, 0x01, 0x00, 0x00};
+  DataBuffer buf(duped_xtn, sizeof(duped_xtn));
+  record.Truncate(record.len() - 2);
+  record.Append(buf);
+  uint32_t len;
+  ASSERT_TRUE(record.Read(0, 2, &len));
+  len += buf.len() - 2;
+  DataBuffer new_len;
+  ASSERT_TRUE(new_len.Write(0, len, 2));
+  record.Splice(new_len, 0, 2);
+  new_len.Truncate(0);
+
+  ASSERT_TRUE(record.Read(4, 2, &len));
+  len += buf.len() - 2;
+  ASSERT_TRUE(new_len.Write(0, len, 2));
+  record.Splice(new_len, 4, 2);
+
+  InstallEchConfig(record, SEC_ERROR_EXTENSION_VALUE_INVALID);
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(agent_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      agent_, ssl_tls13_encrypted_client_hello_xtn);
+  agent_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
+  ASSERT_FALSE(filter->captured());
+}
+
+// Test an encoded ClientHelloInner containing an extra extensionType
+// in outer_extensions, for which there is no corresponding (uncompressed)
+// extension in ClientHelloOuter.
+TEST_F(TlsConnectStreamTls13Ech, EchOuterExtensionsReferencesMissing) {
+  std::string ch =
+      "01000170030374d616d97efe591bf9bee4496bcc1118145b4dd02f7d1ff979fd0cf61749"
+      "a91e0000061301130313020100014100000010000e00000b7075626c69632e6e616d65ff"
+      "01000100000a00140012001d00170018001901000101010201030104003300260024001d"
+      "00204f346f86351b077492c83564c909d1aaab4f6f3ee2566af0e90a4684c793805d002b"
+      "0003020304000d0018001604030503060302030804080508060401050106010201002d00"
+      "020101001c00024001fe0800b30001000320a10698ccbd4bd86df91f617e58dd2ca96b8b"
+      "a5f058dd5c5ab1ca9750ef9d28c70020924764b36fe5d4a985f9857ceb75edb10b5f4b5b"
+      "f9d59290db70743e3c582163006acea5d7785cc506ecf5c859a9cad18f2b1df1a32231fe"
+      "0330471ee0e88ece9047e6491a381bfabed58f7fc542f0ba78eb55030bcfe1d400f67275"
+      "eac8619d1e4237e9d6176dd4eb54f3f25865686756f313a4ba47901c83e5ad5413609d39"
+      "816346b940115fd68e534609";
+  ReplayChWithMalformedInner(ch, kTlsAlertIllegalParameter,
+                             SSL_ERROR_RX_MALFORMED_ECH_EXTENSION,
+                             SSL_ERROR_ILLEGAL_PARAMETER_ALERT);
+}
+
+// Drop supported_versions from CHInner, make sure we don't negotiate 1.2+ECH.
+TEST_F(TlsConnectStreamTls13Ech, EchVersion12Inner) {
+  std::string ch =
+      "0100017003034dd5bf4c12835e9be21f983953720e3595b3a8eeb4a44467678caceb7727"
+      "3be90000061301130313020100014100000010000e00000b7075626c69632e6e616d65ff"
+      "01000100000a00140012001d00170018001901000101010201030104003300260024001d"
+      "0020af7b976cdf69ffcd494ca5a93ae3ecde692b09be518ee033aad908c45b82c368002b"
+      "0003020304000d0018001604030503060302030804080508060401050106010201002d00"
+      "020101001c0002400100150003000000fe0800ac0001000320a10698ccbd4bd86df91f61"
+      "7e58dd2ca96b8ba5f058dd5c5ab1ca9750ef9d28c70020f5ece4c187b76f7e3d467c7506"
+      "215e73c27c918cd863c0e80d76a7987ec274320063e037492868eff5296a22dc50885e9d"
+      "f6964a5e26546f1bada043f8834988dfea5394b4c45a4d0b3afc52142d33f94161135a63"
+      "ed3c1b63f60d8133fb1cff17e1f9ced6c871984e412ed8ddb0f487c4d09d7aea80488004"
+      "c45a17cd3b5cdca316155fdb";
+  ReplayChWithMalformedInner(ch, kTlsAlertProtocolVersion,
+                             SSL_ERROR_UNSUPPORTED_VERSION,
+                             SSL_ERROR_PROTOCOL_VERSION_ALERT);
+}
+
+// Use CHInner supported_versions to negotiate 1.2.
+TEST_F(TlsConnectStreamTls13Ech, EchVersion12InnerSupportedVersions) {
+  std::string ch =
+      "010001700303845c298db4017d2ed2584284b90e4ecba57a63663560c57aa0b1ac51203d"
+      "c8560000061301130313020100014100000010000e00000b7075626c69632e6e616d65ff"
+      "01000100000a00140012001d00170018001901000101010201030104003300260024001d"
+      "00203356719e88b539645438f645916aeeffe93c38803a59d6997938aa98eefbcf64002b"
+      "0003020304000d0018001604030503060302030804080508060401050106010201002d00"
+      "020101001c00024001fe0800b30001000320a10698ccbd4bd86df91f617e58dd2ca96b8b"
+      "a5f058dd5c5ab1ca9750ef9d28c700208412c945c53624bcace5eda0dc1ad300a1620e86"
+      "5a0f4a27755a3477b115b65b006abf1dfd77ddc1b80c5976732174a5fe7ebcf9ff1a548b"
+      "097daa12a37f3e32a613a0798544ba1d96239431bc807ddd9055ac3fb3e32b2eb42cec30"
+      "e915357418a953027d73020fd739287414205349eeff376dd464750ca70a965141a88800"
+      "6a043fe1d6d882d9a2c2f6f3";
+  ReplayChWithMalformedInner(ch, kTlsAlertProtocolVersion,
+                             SSL_ERROR_UNSUPPORTED_VERSION,
+                             SSL_ERROR_PROTOCOL_VERSION_ALERT);
+}
+
+// Replay a CH for which the ECH Inner lacks the required
+// empty ECH extension.
+TEST_F(TlsConnectStreamTls13Ech, EchInnerMissingEmptyEch) {
+  std::string ch =
+      "0100017103032bf866cbd6d4abdec8ce23107eaef9af51b644043953e3b70f2f28f1898e"
+      "87880000061301130313020100014200000010000e00000b7075626c69632e6e616d65ff"
+      "01000100000a00140012001d00170018001901000101010201030104003300260024001d"
+      "00208f614d3017575332ca009a42d33bcaf876b4ba6d44b052e8019c31f6f1559e41002b"
+      "0003020304000d0018001604030503060302030804080508060401050106010201002d00"
+      "020101001c000240010015000100fe0800af0001000320a10698ccbd4bd86df91f617e58"
+      "dd2ca96b8ba5f058dd5c5ab1ca9750ef9d28c70020da1d5d9f183a5d5e49892e38eaae5e"
+      "9e3e6c5d404a5fdb672ca37f9cebabd57400660ea1d61917cc1049aab22506078ccecfc4"
+      "16a364a1beaa8915b250bb86ac2c725698c3c641830c4aa4e8b7f50152b5732b29b1ac43"
+      "45c97fc018855fd68e5600d0ef188e905b69997c3711b0ec0114a857177df728c7b84f52"
+      "2923f932838f7f15bb22644fd4";
+  ReplayChWithMalformedInner(ch, kTlsAlertDecodeError,
+                             SSL_ERROR_MISSING_ECH_EXTENSION,
+                             SSL_ERROR_DECODE_ERROR_ALERT);
+}
+
+// An empty config_id should prompt an alert. We don't support
+// Optional Configuration Identifiers.
+TEST_F(TlsConnectStreamTls13, EchRejectEmptyConfigId) {
+  static const uint8_t junk[16] = {0};
+  DataBuffer junk_buf(junk, sizeof(junk));
+  DataBuffer ech_xtn;
+  ech_xtn.Write(ech_xtn.len(), HpkeKdfHkdfSha256, 2);
+  ech_xtn.Write(ech_xtn.len(), HpkeAeadAes128Gcm, 2);
+  ech_xtn.Write(ech_xtn.len(), 0U, 1);              // empty config_id
+  ech_xtn.Write(ech_xtn.len(), junk_buf.len(), 2);  // enc
+  ech_xtn.Append(junk_buf);
+  ech_xtn.Write(ech_xtn.len(), junk_buf.len(), 2);  // payload
+  ech_xtn.Append(junk_buf);
+
+  EnsureTlsSetup();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  MakeTlsFilter<TlsExtensionAppender>(client_, kTlsHandshakeClientHello,
+                                      ssl_tls13_encrypted_client_hello_xtn,
+                                      ech_xtn);
+  ConnectExpectAlert(server_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+}
+
+TEST_F(TlsConnectStreamTls13Ech, EchAcceptBasic) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  auto c_filter_sni =
+      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  Connect();
+  ASSERT_TRUE(c_filter_sni->captured());
+  CheckSniExtension(c_filter_sni->extension(), kPublicName);
+}
+
+TEST_F(TlsConnectStreamTls13, EchAcceptWithResume) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  ConfigureSessionCache(RESUME_BOTH, RESUME_TICKET);
+  Connect();
+  SendReceive();  // Need to read so that we absorb the session ticket.
+  CheckKeys();
+
+  Reset();
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  ExpectResumption(RESUME_TICKET);
+  auto filter =
+      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_tls13_pre_shared_key_xtn);
+  StartConnect();
+  Handshake();
+  CheckConnected();
+  // Make sure that the PSK extension is only in CHInner.
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_F(TlsConnectStreamTls13, EchAcceptWithExternalPsk) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
+  ASSERT_TRUE(!!slot);
+  ScopedPK11SymKey key(
+      PK11_KeyGen(slot.get(), CKM_HKDF_KEY_GEN, nullptr, 16, nullptr));
+  ASSERT_TRUE(!!key);
+  AddPsk(key, std::string("foo"), ssl_hash_sha256);
+
+  // Not permitted in outer.
+  auto filter =
+      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_tls13_pre_shared_key_xtn);
+  StartConnect();
+  Handshake();
+  CheckConnected();
+  SendReceive();
+  CheckKeys(ssl_kea_ecdh, ssl_grp_ec_curve25519, ssl_auth_psk, ssl_sig_none);
+  // Make sure that the PSK extension is only in CHInner.
+  ASSERT_FALSE(filter->captured());
+}
+
+// If an earlier version is negotiated, False Start must be disabled.
+TEST_F(TlsConnectStreamTls13, EchDowngradeNoFalseStart) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_, HpkeDhKemX25519Sha256, false, true, false);
+  MakeTlsFilter<TlsExtensionDropper>(client_,
+                                     ssl_tls13_encrypted_client_hello_xtn);
+  client_->EnableFalseStart();
+  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+  server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_2);
+
+  StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  client_->Handshake();
+  EXPECT_FALSE(client_->can_falsestart_hook_called());
+
+  // Make sure the write is blocked.
+  client_->ExpectReadWriteError();
+  client_->SendData(10);
+}
+
+SSLHelloRetryRequestAction RetryEchHello(PRBool firstHello,
+                                         const PRUint8* clientToken,
+                                         unsigned int clientTokenLen,
+                                         PRUint8* appToken,
+                                         unsigned int* appTokenLen,
+                                         unsigned int appTokenMax, void* arg) {
+  auto* called = reinterpret_cast<size_t*>(arg);
+  ++*called;
+
+  EXPECT_EQ(0U, clientTokenLen);
+  return firstHello ? ssl_hello_retry_request : ssl_hello_retry_accept;
+}
+
+// Generate HRR on CH1 Inner
+TEST_F(TlsConnectStreamTls13, EchAcceptWithHrr) {
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                    record.data(), record.len()));
+  ASSERT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                record.data(), record.len()));
+  client_->ExpectEch();
+  server_->ExpectEch();
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  // Start the handshake.
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                    record.data(), record.len()));
+  client_->ExpectEch();
+  server_->ExpectEch();
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  Handshake();
+  EXPECT_EQ(1U, cb_called);
+  CheckConnected();
+  SendReceive();
+}
+
+// Fail to decrypt CH2. Unlike CH1, this generates an alert.
+TEST_F(TlsConnectStreamTls13, EchFailDecryptCH2) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  EXPECT_EQ(1U, cb_called);
+  // Stop the callback from being called in future handshakes.
+  EXPECT_EQ(SECSuccess,
+            SSL_HelloRetryRequestCallback(server_->ssl_fd(), nullptr, nullptr));
+
+  MakeTlsFilter<TlsExtensionDamager>(client_,
+                                     ssl_tls13_encrypted_client_hello_xtn, 80);
+  ExpectAlert(server_, kTlsAlertDecryptError);
+  Handshake();
+  client_->CheckErrorCode(SSL_ERROR_DECRYPT_ERROR_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+}
+
+// Change the ECH advertisement between CH1 and CH2. Use GREASE for simplicity.
+TEST_F(TlsConnectStreamTls13, EchHrrChangeCh2OfferingYN) {
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  // Start the handshake, send GREASE ECH.
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_TRUE));  // GREASE
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  ExpectAlert(server_, kTlsAlertIllegalParameter);
+  Handshake();
+  client_->CheckErrorCode(SSL_ERROR_ILLEGAL_PARAMETER_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_BAD_2ND_CLIENT_HELLO);
+  EXPECT_EQ(1U, cb_called);
+}
+
+TEST_F(TlsConnectStreamTls13, EchHrrChangeCh2OfferingNY) {
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  // Start the handshake.
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_TRUE));  // Send GREASE
+  ExpectAlert(server_, kTlsAlertIllegalParameter);
+  Handshake();
+  client_->CheckErrorCode(SSL_ERROR_ILLEGAL_PARAMETER_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_BAD_2ND_CLIENT_HELLO);
+  EXPECT_EQ(1U, cb_called);
+}
+
+// Configure an external PSK. Generate an HRR off CH1Inner (which contains
+// the PSK extension). Use the same PSK in CH2 and connect.
+TEST_F(TlsConnectStreamTls13, EchAcceptWithHrrAndPsk) {
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                    record.data(), record.len()));
+  ASSERT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                record.data(), record.len()));
+  client_->ExpectEch();
+  server_->ExpectEch();
+
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  static const uint8_t key_buf[16] = {0};
+  SECItem key_item = {siBuffer, const_cast<uint8_t*>(&key_buf[0]),
+                      sizeof(key_buf)};
+  const char* label = "foo";
+  ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
+  ASSERT_TRUE(!!slot);
+  ScopedPK11SymKey key(PK11_ImportSymKey(slot.get(), CKM_HKDF_KEY_GEN,
+                                         PK11_OriginUnwrap, CKA_DERIVE,
+                                         &key_item, nullptr));
+  ASSERT_TRUE(!!key);
+  AddPsk(key, std::string(label), ssl_hash_sha256);
+
+  // Start the handshake.
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), pub.get(), priv.get(),
+                                    record.data(), record.len()));
+  client_->ExpectEch();
+  server_->ExpectEch();
+  EXPECT_EQ(SECSuccess,
+            SSL_AddExternalPsk0Rtt(server_->ssl_fd(), key.get(),
+                                   reinterpret_cast<const uint8_t*>(label),
+                                   strlen(label), ssl_hash_sha256, 0, 1000));
+  server_->ExpectPsk();
+  Handshake();
+  EXPECT_EQ(1U, cb_called);
+  CheckConnected();
+  SendReceive();
+}
+
+// Generate an HRR on CHOuter. Reject ECH on the second CH.
+TEST_F(TlsConnectStreamTls13Ech, EchRejectWithHrr) {
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+  SetupForEchRetry();
+
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  // Start the handshake.
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  client_->ExpectEch(false);
+  server_->ExpectEch(false);
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  Handshake();
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  EXPECT_EQ(1U, cb_called);
+}
+
+// Reject ECH on CH1 and (HRR) CH2. PSKs are no longer allowed
+// in CHOuter, but can still make sure the handshake succeeds.
+// (prompting ech_required at the completion).
+TEST_F(TlsConnectStreamTls13, EchRejectWithHrrAndPsk) {
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  ConfigureSelfEncrypt();
+  EnsureTlsSetup();
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, record, pub, priv);
+  ASSERT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                record.data(), record.len()));
+
+  size_t cb_called = 0;
+  EXPECT_EQ(SECSuccess, SSL_HelloRetryRequestCallback(
+                            server_->ssl_fd(), RetryEchHello, &cb_called));
+
+  // Add a PSK to both endpoints.
+  static const uint8_t key_buf[16] = {0};
+  SECItem key_item = {siBuffer, const_cast<uint8_t*>(&key_buf[0]),
+                      sizeof(key_buf)};
+  const char* label = "foo";
+  ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
+  ASSERT_TRUE(!!slot);
+  ScopedPK11SymKey key(PK11_ImportSymKey(slot.get(), CKM_HKDF_KEY_GEN,
+                                         PK11_OriginUnwrap, CKA_DERIVE,
+                                         &key_item, nullptr));
+  ASSERT_TRUE(!!key);
+  AddPsk(key, std::string(label), ssl_hash_sha256);
+  client_->ExpectPsk(ssl_psk_none);
+
+  // Start the handshake.
+  client_->StartConnect();
+  server_->StartConnect();
+  client_->Handshake();
+  server_->Handshake();
+  MakeNewServer();
+  client_->ExpectEch(false);
+  server_->ExpectEch(false);
+  EXPECT_EQ(SECSuccess,
+            SSL_AddExternalPsk0Rtt(server_->ssl_fd(), key.get(),
+                                   reinterpret_cast<const uint8_t*>(label),
+                                   strlen(label), ssl_hash_sha256, 0, 1000));
+  // Don't call ExpectPsk
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  Handshake();
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  EXPECT_EQ(1U, cb_called);
+}
+
+// ECH (both connections), resumption rejected.
+TEST_F(TlsConnectStreamTls13, EchRejectResume) {
+  EnsureTlsSetup();
+  ConfigureSessionCache(RESUME_BOTH, RESUME_TICKET);
+  SetupEch(client_, server_);
+  Connect();
+  SendReceive();
+
+  Reset();
+  ClearServerCache();  // Invalidate the ticket
+  ConfigureSessionCache(RESUME_BOTH, RESUME_NONE);
+  ExpectResumption(RESUME_NONE);
+  SetupEch(client_, server_);
+  Connect();
+  SendReceive();
+}
+
+// ECH (both connections) + 0-RTT
+TEST_F(TlsConnectStreamTls13, EchZeroRttBoth) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  SetupForZeroRtt();
+  client_->Set0RttEnabled(true);
+  server_->Set0RttEnabled(true);
+  SetupEch(client_, server_);
+  ExpectResumption(RESUME_TICKET);
+  ZeroRttSendReceive(true, true);
+  Handshake();
+  ExpectEarlyDataAccepted(true);
+  CheckConnected();
+  SendReceive();
+}
+
+// ECH (first connection only) + 0-RTT
+TEST_F(TlsConnectStreamTls13, EchZeroRttFirst) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  SetupForZeroRtt();
+  client_->Set0RttEnabled(true);
+  server_->Set0RttEnabled(true);
+  ExpectResumption(RESUME_TICKET);
+  ZeroRttSendReceive(true, true);
+  Handshake();
+  ExpectEarlyDataAccepted(true);
+  CheckConnected();
+  SendReceive();
+}
+
+// ECH (second connection only) + 0-RTT
+TEST_F(TlsConnectStreamTls13, EchZeroRttSecond) {
+  EnsureTlsSetup();
+  SetupForZeroRtt();  // Get a ticket
+  client_->Set0RttEnabled(true);
+  server_->Set0RttEnabled(true);
+  SetupEch(client_, server_);
+  ExpectResumption(RESUME_TICKET);
+  ZeroRttSendReceive(true, true);
+  Handshake();
+  ExpectEarlyDataAccepted(true);
+  CheckConnected();
+  SendReceive();
+}
+
+// ECH (first connection only, reject on second) + 0-RTT
+TEST_F(TlsConnectStreamTls13, EchZeroRttRejectSecond) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  SetupForZeroRtt();
+  client_->Set0RttEnabled(true);
+  server_->Set0RttEnabled(true);
+
+  // Setup ECH only on the client.
+  SetupEch(client_, server_, HpkeDhKemX25519Sha256, false, true, false);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+
+  ExpectResumption(RESUME_NONE);
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  ZeroRttSendReceive(true, false);
+  server_->Handshake();
+  client_->Handshake();
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+
+  ExpectEarlyDataAccepted(false);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  // Reset expectations for the TlsAgent dtor.
+  server_->ExpectReceiveAlert(kTlsAlertCloseNotify, kTlsAlertWarning);
+}
+
+// Test a critical extension in ECHConfig
+TEST_F(TlsConnectStreamTls13, EchRejectUnknownCriticalExtension) {
+  EnsureTlsSetup();
+  ScopedSECKEYPublicKey pub;
+  ScopedSECKEYPrivateKey priv;
+  DataBuffer record;
+  DataBuffer crit_rec;
+  DataBuffer len_buf;
+  uint64_t tmp;
+
+  static const uint8_t crit_extensions[] = {0x00, 0x04, 0xff, 0xff, 0x00, 0x00};
+  static const uint8_t extensions[] = {0x00, 0x04, 0x7f, 0xff, 0x00, 0x00};
+  DataBuffer crit_exts(crit_extensions, sizeof(crit_extensions));
+  DataBuffer non_crit_exts(extensions, sizeof(extensions));
+
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteChaCha,
+                                        kPublicName, 100, record, pub, priv);
+  record.Truncate(record.len() - 2);  // Eat the empty extensions.
+  crit_rec.Assign(record);
+  ASSERT_TRUE(crit_rec.Read(0, 2, &tmp));
+  len_buf.Write(0, tmp + crit_exts.len() - 2, 2);  // two bytes of length
+  crit_rec.Splice(len_buf, 0, 2);
+  len_buf.Truncate(0);
+
+  ASSERT_TRUE(crit_rec.Read(4, 2, &tmp));
+  len_buf.Write(0, tmp + crit_exts.len() - 2, 2);  // two bytes of length
+  crit_rec.Append(crit_exts);
+  crit_rec.Splice(len_buf, 4, 2);
+  len_buf.Truncate(0);
+
+  ASSERT_TRUE(record.Read(0, 2, &tmp));
+  len_buf.Write(0, tmp + non_crit_exts.len() - 2, 2);
+  record.Append(non_crit_exts);
+  record.Splice(len_buf, 0, 2);
+  ASSERT_TRUE(record.Read(4, 2, &tmp));
+  len_buf.Write(0, tmp + non_crit_exts.len() - 2, 2);
+  record.Splice(len_buf, 4, 2);
+
+  EXPECT_EQ(SECFailure,
+            SSL_SetClientEchConfigs(client_->ssl_fd(), crit_rec.data(),
+                                    crit_rec.len()));
+  EXPECT_EQ(SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION, PORT_GetError());
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_FALSE));  // Don't GREASE
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      client_, ssl_tls13_encrypted_client_hello_xtn);
+  StartConnect();
+  client_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, client_->state());
+  ASSERT_FALSE(filter->captured());
+
+  // Now try a variant with non-critical extensions, it should work.
+  Reset();
+  EnsureTlsSetup();
+  EXPECT_EQ(SECSuccess, SSL_SetClientEchConfigs(client_->ssl_fd(),
+                                                record.data(), record.len()));
+  filter = MakeTlsFilter<TlsExtensionCapture>(
+      client_, ssl_tls13_encrypted_client_hello_xtn);
+  StartConnect();
+  client_->Handshake();
+  ASSERT_EQ(TlsAgent::STATE_CONNECTING, client_->state());
+  ASSERT_TRUE(filter->captured());
+}
+
+// Secure disable without ECH
+TEST_F(TlsConnectStreamTls13, EchRejectAuthCertSuccessNoRetries) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_, HpkeDhKemX25519Sha256, false, true, false);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  ConnectExpectFailOneSide(TlsAgent::CLIENT);
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  // Reset expectations for the TlsAgent dtor.
+  server_->ExpectReceiveAlert(kTlsAlertCloseNotify, kTlsAlertWarning);
+}
+
+// When authenticating to the public name, the client MUST NOT
+// send a certificate in response to a certificate request.
+TEST_F(TlsConnectStreamTls13, EchRejectSuppressClientCert) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_, HpkeDhKemX25519Sha256, false, true, false);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  client_->SetupClientAuth();
+  server_->RequestClientAuth(true);
+  auto cert_capture =
+      MakeTlsFilter<TlsHandshakeRecorder>(client_, kTlsHandshakeCertificate);
+  cert_capture->EnableDecryption();
+
+  StartConnect();
+  client_->ExpectSendAlert(kTlsAlertEchRequired);
+  server_->ExpectSendAlert(kTlsAlertCertificateRequired);
+  ConnectExpectFail();
+
+  static const uint8_t empty_cert[4] = {0};
+  EXPECT_EQ(DataBuffer(empty_cert, sizeof(empty_cert)), cert_capture->buffer());
+}
+
+// Secure disable with incompatible ECHConfig
+TEST_F(TlsConnectStreamTls13, EchRejectAuthCertSuccessIncompatibleRetries) {
+  EnsureTlsSetup();
+  ScopedSECKEYPublicKey server_pub;
+  ScopedSECKEYPrivateKey server_priv;
+  ScopedSECKEYPublicKey client_pub;
+  ScopedSECKEYPrivateKey client_priv;
+  DataBuffer server_rec;
+  DataBuffer client_rec;
+
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteChaCha,
+                                        kPublicName, 100, server_rec,
+                                        server_pub, server_priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteAes,
+                                        kPublicName, 100, client_rec,
+                                        client_pub, client_priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetClientEchConfigs(client_->ssl_fd(), client_rec.data(),
+                                    client_rec.len()));
+
+  // Change the first ECHConfig version to one we don't understand.
+  server_rec.Write(2, 0xfefe, 2);
+  // Skip the ECHConfigs length, the server sender will re-encode.
+  ASSERT_EQ(SECSuccess, SSLInt_SetRawEchConfigForRetry(server_->ssl_fd(),
+                                                       &server_rec.data()[2],
+                                                       server_rec.len() - 2));
+
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  ConnectExpectFailOneSide(TlsAgent::CLIENT);
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  // Reset expectations for the TlsAgent dtor.
+  server_->ExpectReceiveAlert(kTlsAlertCloseNotify, kTlsAlertWarning);
+}
+
+// Check that an otherwise-accepted ECH fails expectedly
+// with a bad certificate.
+TEST_F(TlsConnectStreamTls13, EchRejectAuthCertFail) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetAuthCertificateCallback(AuthCompleteFail);
+  ConnectExpectAlert(client_, kTlsAlertBadCertificate);
+  client_->CheckErrorCode(SSL_ERROR_BAD_CERTIFICATE);
+  server_->CheckErrorCode(SSL_ERROR_BAD_CERT_ALERT);
+  EXPECT_EQ(TlsAgent::STATE_ERROR, client_->state());
+}
+
+TEST_F(TlsConnectStreamTls13Ech, EchShortClientEncryptedCH) {
+  EnsureTlsSetup();
+  SetupForEchRetry();
+  auto filter = MakeTlsFilter<TlsExtensionResizer>(
+      client_, ssl_tls13_encrypted_client_hello_xtn, 1);
+  ConnectExpectAlert(server_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+}
+
+TEST_F(TlsConnectStreamTls13Ech, EchLongClientEncryptedCH) {
+  EnsureTlsSetup();
+  SetupForEchRetry();
+  auto filter = MakeTlsFilter<TlsExtensionResizer>(
+      client_, ssl_tls13_encrypted_client_hello_xtn, 1000);
+  ConnectExpectAlert(server_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+}
+
+TEST_F(TlsConnectStreamTls13Ech, EchShortServerEncryptedCH) {
+  EnsureTlsSetup();
+  SetupForEchRetry();
+  auto filter = MakeTlsFilter<TlsExtensionResizer>(
+      server_, ssl_tls13_encrypted_client_hello_xtn, 1);
+  filter->EnableDecryption();
+  ConnectExpectAlert(client_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+  server_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+}
+
+TEST_F(TlsConnectStreamTls13Ech, EchLongServerEncryptedCH) {
+  EnsureTlsSetup();
+  SetupForEchRetry();
+  auto filter = MakeTlsFilter<TlsExtensionResizer>(
+      server_, ssl_tls13_encrypted_client_hello_xtn, 1000);
+  filter->EnableDecryption();
+  ConnectExpectAlert(client_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+  server_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+}
+
+// Check that if authCertificate fails, retry_configs
+// are not available to the application.
+TEST_F(TlsConnectStreamTls13Ech, EchInsecureFallbackNoRetries) {
+  EnsureTlsSetup();
+  StackSECItem retry_configs;
+  SetupForEchRetry();
+
+  // Use the filter to make sure retry_configs are sent.
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      server_, ssl_tls13_encrypted_client_hello_xtn);
+  filter->EnableDecryption();
+
+  client_->SetAuthCertificateCallback(AuthCompleteFail);
+  ConnectExpectAlert(client_, kTlsAlertBadCertificate);
+  client_->CheckErrorCode(SSL_ERROR_BAD_CERTIFICATE);
+  server_->CheckErrorCode(SSL_ERROR_BAD_CERT_ALERT);
+  EXPECT_EQ(TlsAgent::STATE_ERROR, client_->state());
+  EXPECT_EQ(SECFailure,
+            SSL_GetEchRetryConfigs(client_->ssl_fd(), &retry_configs));
+  EXPECT_EQ(SSL_ERROR_HANDSHAKE_NOT_COMPLETED, PORT_GetError());
+  ASSERT_EQ(0U, retry_configs.len);
+  EXPECT_TRUE(filter->captured());
+}
+
+// Test that mismatched ECHConfigContents triggers a retry.
+TEST_F(TlsConnectStreamTls13Ech, EchMismatchHpkeCiphersRetry) {
+  EnsureTlsSetup();
+  ScopedSECKEYPublicKey server_pub;
+  ScopedSECKEYPrivateKey server_priv;
+  ScopedSECKEYPublicKey client_pub;
+  ScopedSECKEYPrivateKey client_priv;
+  DataBuffer server_rec;
+  DataBuffer client_rec;
+
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteChaCha,
+                                        kPublicName, 100, server_rec,
+                                        server_pub, server_priv);
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kSuiteAes,
+                                        kPublicName, 100, client_rec,
+                                        client_pub, client_priv);
+
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+  ASSERT_EQ(SECSuccess,
+            SSL_SetClientEchConfigs(client_->ssl_fd(), client_rec.data(),
+                                    client_rec.len()));
+
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  ExpectAlert(client_, kTlsAlertEchRequired);
+  ConnectExpectFailOneSide(TlsAgent::CLIENT);
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITH_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  DoEchRetry(server_pub, server_priv, server_rec);
+}
+
+// Test that mismatched ECH server keypair triggers a retry.
+TEST_F(TlsConnectStreamTls13Ech, EchMismatchKeysRetry) {
+  EnsureTlsSetup();
+  ScopedSECKEYPublicKey server_pub;
+  ScopedSECKEYPrivateKey server_priv;
+  ScopedSECKEYPublicKey client_pub;
+  ScopedSECKEYPrivateKey client_priv;
+  DataBuffer server_rec;
+  DataBuffer client_rec;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, server_rec,
+                                        server_pub, server_priv);
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, client_rec,
+                                        client_pub, client_priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+  ASSERT_EQ(SECSuccess,
+            SSL_SetClientEchConfigs(client_->ssl_fd(), client_rec.data(),
+                                    client_rec.len()));
+
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  client_->ExpectSendAlert(kTlsAlertEchRequired);
+  ConnectExpectFailOneSide(TlsAgent::CLIENT);
+  client_->CheckErrorCode(SSL_ERROR_ECH_RETRY_WITH_ECH);
+  server_->ExpectReceiveAlert(kTlsAlertEchRequired, kTlsAlertFatal);
+  server_->Handshake();
+  DoEchRetry(server_pub, server_priv, server_rec);
+}
+
+// Check that the client validates any server response to GREASE ECH
+TEST_F(TlsConnectStreamTls13, EchValidateGreaseResponse) {
+  EnsureTlsSetup();
+  ScopedSECKEYPublicKey server_pub;
+  ScopedSECKEYPrivateKey server_priv;
+  DataBuffer server_rec;
+  TlsConnectTestBase::GenerateEchConfig(HpkeDhKemX25519Sha256, kDefaultSuites,
+                                        kPublicName, 100, server_rec,
+                                        server_pub, server_priv);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+
+  // Damage the length and expect an alert.
+  auto filter = MakeTlsFilter<TlsExtensionDamager>(
+      server_, ssl_tls13_encrypted_client_hello_xtn, 0);
+  filter->EnableDecryption();
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_TRUE));  // GREASE
+  ConnectExpectAlert(client_, kTlsAlertDecodeError);
+  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+  server_->CheckErrorCode(SSL_ERROR_DECODE_ERROR_ALERT);
+
+  // If the retry_config contains an unknown version, it should be ignored.
+  Reset();
+  EnsureTlsSetup();
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+  server_rec.Write(2, 0xfefe, 2);
+  // Skip the ECHConfigs length, the server sender will re-encode.
+  ASSERT_EQ(SECSuccess, SSLInt_SetRawEchConfigForRetry(server_->ssl_fd(),
+                                                       &server_rec.data()[2],
+                                                       server_rec.len() - 2));
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_TRUE));  // GREASE
+  Connect();
+
+  // Lastly, if we DO support the retry_config, GREASE ECH should ignore it.
+  Reset();
+  EnsureTlsSetup();
+  server_rec.Write(2, ssl_tls13_encrypted_client_hello_xtn, 2);
+  ASSERT_EQ(SECSuccess,
+            SSL_SetServerEchConfigs(server_->ssl_fd(), server_pub.get(),
+                                    server_priv.get(), server_rec.data(),
+                                    server_rec.len()));
+  EXPECT_EQ(SECSuccess, SSL_EnableTls13GreaseEch(client_->ssl_fd(),
+                                                 PR_TRUE));  // GREASE
+  Connect();
+}
+
+// Test a tampered CHInner (decrypt failure).
+// Expect negotiation on outer, which fails due to the tampered transcript.
+TEST_F(TlsConnectStreamTls13, EchBadCiphertext) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  /* Target the payload:
+     struct {
+            ECHCipherSuite suite;      // 4B
+            opaque config_id<0..255>;  // 32B
+            opaque enc<1..2^16-1>;     // 32B for X25519
+            opaque payload<1..2^16-1>;
+        } ClientEncryptedCH;
+  */
+  MakeTlsFilter<TlsExtensionDamager>(client_,
+                                     ssl_tls13_encrypted_client_hello_xtn, 80);
+  client_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  server_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  ConnectExpectFail();
+}
+
+// Test a tampered CHOuter (decrypt failure on AAD).
+// Expect negotiation on outer, which fails due to the tampered transcript.
+TEST_F(TlsConnectStreamTls13, EchOuterBinding) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetAuthCertificateCallback(AuthCompleteSuccess);
+  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+
+  static const uint8_t supported_vers_13[] = {0x02, 0x03, 0x04};
+  DataBuffer buf(supported_vers_13, sizeof(supported_vers_13));
+  MakeTlsFilter<TlsExtensionReplacer>(client_, ssl_tls13_supported_versions_xtn,
+                                      buf);
+  client_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  server_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  ConnectExpectFail();
+}
+
+// Test a bad (unknown) ECHCipherSuite.
+// Expect negotiation on outer, which fails due to the tampered transcript.
+TEST_F(TlsConnectStreamTls13, EchBadCiphersuite) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  /* Make KDF unknown */
+  MakeTlsFilter<TlsExtensionDamager>(client_,
+                                     ssl_tls13_encrypted_client_hello_xtn, 0);
+  client_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  server_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  ConnectExpectFail();
+
+  Reset();
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  /* Make AEAD unknown */
+  MakeTlsFilter<TlsExtensionDamager>(client_,
+                                     ssl_tls13_encrypted_client_hello_xtn, 3);
+  client_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  server_->ExpectSendAlert(kTlsAlertBadRecordMac);
+  ConnectExpectFail();
+}
+
+// Connect to a 1.2 server, it should ignore ECH.
+TEST_F(TlsConnectStreamTls13, EchToTls12Server) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+  server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_2);
+
+  client_->ExpectEch(false);
+  server_->ExpectEch(false);
+  Connect();
+}
+
+TEST_F(TlsConnectStreamTls13, NoEchFromTls12Client) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_2);
+  server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      client_, ssl_tls13_encrypted_client_hello_xtn);
+  client_->ExpectEch(false);
+  server_->ExpectEch(false);
+  SetExpectedVersion(SSL_LIBRARY_VERSION_TLS_1_2);
+  Connect();
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_F(TlsConnectStreamTls13, EchOuterWith12Max) {
+  EnsureTlsSetup();
+  SetupEch(client_, server_);
+  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+  server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
+                           SSL_LIBRARY_VERSION_TLS_1_3);
+
+  static const uint8_t supported_vers_12[] = {0x02, 0x03, 0x03};
+  DataBuffer buf(supported_vers_12, sizeof(supported_vers_12));
+
+  StartConnect();
+  MakeTlsFilter<TlsExtensionReplacer>(client_, ssl_tls13_supported_versions_xtn,
+                                      buf);
+
+  // Server should ignore the extension if 1.2 is negotiated.
+  // Here the CHInner is not modified, so if Accepted we'd connect.
+  auto filter = MakeTlsFilter<TlsExtensionCapture>(
+      server_, ssl_tls13_encrypted_client_hello_xtn);
+  client_->ExpectEch(false);
+  server_->ExpectEch(false);
+  ConnectExpectAlert(server_, kTlsAlertDecryptError);
+  client_->CheckErrorCode(SSL_ERROR_DECRYPT_ERROR_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE);
+  ASSERT_FALSE(filter->captured());
+}
+
+TEST_F(TlsConnectStreamTls13, EchOuterExtensionsInCHOuter) {
+  EnsureTlsSetup();
+  uint8_t outer[2] = {0};
+  DataBuffer outer_buf(outer, sizeof(outer));
+  MakeTlsFilter<TlsExtensionAppender>(client_, kTlsHandshakeClientHello,
+                                      ssl_tls13_outer_extensions_xtn,
+                                      outer_buf);
+
+  ConnectExpectAlert(server_, kTlsAlertUnsupportedExtension);
+  client_->CheckErrorCode(SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT);
+  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
+}
+
+INSTANTIATE_TEST_CASE_P(EchAgentTest, TlsAgentEchTest,
+                        ::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
+                                           TlsConnectTestBase::kTlsV13));
+#else
+
+TEST_P(TlsAgentEchTest, NoEchWithoutHpke) {
+  EnsureInit();
+  uint8_t non_null[1];
+  SECKEYPublicKey pub;
+  SECKEYPrivateKey priv;
+  ASSERT_EQ(SECFailure, SSL_SetClientEchConfigs(agent_->ssl_fd(), non_null,
+                                                sizeof(non_null)));
+  ASSERT_EQ(SSL_ERROR_FEATURE_DISABLED, PORT_GetError());
+
+  ASSERT_EQ(SECFailure, SSL_SetServerEchConfigs(agent_->ssl_fd(), &pub, &priv,
+                                                non_null, sizeof(non_null)));
+  ASSERT_EQ(SSL_ERROR_FEATURE_DISABLED, PORT_GetError());
+}
+
+INSTANTIATE_TEST_CASE_P(EchAgentTest, TlsAgentEchTest,
+                        ::testing::Combine(TlsConnectTestBase::kTlsVariantsAll,
+                                           TlsConnectTestBase::kTlsV13));
+
+#endif  // NSS_ENABLE_DRAFT_HPKE
+}  // namespace nss_test
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_esni_unittest.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_esni_unittest.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_esni_unittest.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_esni_unittest.cc	1970-01-01 00:00:00.000000000 +0000
@@ -1,494 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "secerr.h"
-#include "ssl.h"
-
-#include "gtest_utils.h"
-#include "tls_agent.h"
-#include "tls_connect.h"
-
-namespace nss_test {
-
-static const char* kDummySni("dummy.invalid");
-
-std::vector<uint16_t> kDefaultSuites = {TLS_AES_256_GCM_SHA384,
-                                        TLS_AES_128_GCM_SHA256};
-std::vector<uint16_t> kChaChaSuite = {TLS_CHACHA20_POLY1305_SHA256};
-std::vector<uint16_t> kBogusSuites = {0};
-std::vector<uint16_t> kTls12Suites = {
-    TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256};
-
-static void NamedGroup2ECParams(SSLNamedGroup group, SECItem* params) {
-  auto groupDef = ssl_LookupNamedGroup(group);
-  ASSERT_NE(nullptr, groupDef);
-
-  auto oidData = SECOID_FindOIDByTag(groupDef->oidTag);
-  ASSERT_NE(nullptr, oidData);
-  ASSERT_NE(nullptr,
-            SECITEM_AllocItem(nullptr, params, (2 + oidData->oid.len)));
-
-  /*
-   * params->data needs to contain the ASN encoding of an object ID (OID)
-   * representing the named curve. The actual OID is in
-   * oidData->oid.data so we simply prepend 0x06 and OID length
-   */
-  params->data[0] = SEC_ASN1_OBJECT_ID;
-  params->data[1] = oidData->oid.len;
-  memcpy(params->data + 2, oidData->oid.data, oidData->oid.len);
-}
-
-/* Checksum is a 4-byte array. */
-static void UpdateEsniKeysChecksum(DataBuffer* buf) {
-  SECStatus rv;
-  PRUint8 sha256[32];
-
-  /* Stomp the checksum. */
-  PORT_Memset(buf->data() + 2, 0, 4);
-
-  rv = PK11_HashBuf(ssl3_HashTypeToOID(ssl_hash_sha256), sha256, buf->data(),
-                    buf->len());
-  ASSERT_EQ(SECSuccess, rv);
-  buf->Write(2, sha256, 4);
-}
-
-static void GenerateEsniKey(PRTime now, SSLNamedGroup group,
-                            std::vector<uint16_t>& cipher_suites,
-                            DataBuffer* record,
-                            ScopedSECKEYPublicKey* pubKey = nullptr,
-                            ScopedSECKEYPrivateKey* privKey = nullptr) {
-  SECKEYECParams ecParams = {siBuffer, NULL, 0};
-  NamedGroup2ECParams(group, &ecParams);
-
-  SECKEYPublicKey* pub = nullptr;
-  SECKEYPrivateKey* priv = SECKEY_CreateECPrivateKey(&ecParams, &pub, nullptr);
-  ASSERT_NE(nullptr, priv);
-  SECITEM_FreeItem(&ecParams, PR_FALSE);
-  PRUint8 encoded[1024];
-  unsigned int encoded_len = 0;
-
-  SECStatus rv = SSL_EncodeESNIKeys(
-      &cipher_suites[0], cipher_suites.size(), group, pub, 100,
-      (now / PR_USEC_PER_SEC) - 1, (now / PR_USEC_PER_SEC) + 10, encoded,
-      &encoded_len, sizeof(encoded));
-  ASSERT_EQ(SECSuccess, rv);
-  ASSERT_GT(encoded_len, 0U);
-
-  if (pubKey) {
-    pubKey->reset(pub);
-  } else {
-    SECKEY_DestroyPublicKey(pub);
-  }
-  if (privKey) {
-    privKey->reset(priv);
-  } else {
-    SECKEY_DestroyPrivateKey(priv);
-  }
-  record->Truncate(0);
-  record->Write(0, encoded, encoded_len);
-}
-
-static void SetupEsni(PRTime now, const std::shared_ptr<TlsAgent>& client,
-                      const std::shared_ptr<TlsAgent>& server,
-                      SSLNamedGroup group = ssl_grp_ec_curve25519) {
-  ScopedSECKEYPublicKey pub;
-  ScopedSECKEYPrivateKey priv;
-  DataBuffer record;
-
-  GenerateEsniKey(now, ssl_grp_ec_curve25519, kDefaultSuites, &record, &pub,
-                  &priv);
-  SECStatus rv = SSL_SetESNIKeyPair(server->ssl_fd(), priv.get(), record.data(),
-                                    record.len());
-  ASSERT_EQ(SECSuccess, rv);
-
-  rv = SSL_EnableESNI(client->ssl_fd(), record.data(), record.len(), kDummySni);
-  ASSERT_EQ(SECSuccess, rv);
-}
-
-static void CheckSniExtension(const DataBuffer& data) {
-  TlsParser parser(data.data(), data.len());
-  uint32_t tmp;
-  ASSERT_TRUE(parser.Read(&tmp, 2));
-  ASSERT_EQ(parser.remaining(), tmp);
-  ASSERT_TRUE(parser.Read(&tmp, 1));
-  ASSERT_EQ(0U, tmp); /* sni_nametype_hostname */
-  DataBuffer name;
-  ASSERT_TRUE(parser.ReadVariable(&name, 2));
-  ASSERT_EQ(0U, parser.remaining());
-  DataBuffer expected(reinterpret_cast<const uint8_t*>(kDummySni),
-                      strlen(kDummySni));
-  ASSERT_EQ(expected, name);
-}
-
-class TlsAgentEsniTest : public TlsAgentTestClient13 {
- public:
-  void SetUp() override { now_ = PR_Now(); }
-
- protected:
-  PRTime now() const { return now_; }
-
-  void InstallEsni(const DataBuffer& record, PRErrorCode err = 0) {
-    SECStatus rv = SSL_EnableESNI(agent_->ssl_fd(), record.data(), record.len(),
-                                  kDummySni);
-    if (err == 0) {
-      ASSERT_EQ(SECSuccess, rv);
-    } else {
-      ASSERT_EQ(SECFailure, rv);
-      ASSERT_EQ(err, PORT_GetError());
-    }
-  }
-
- private:
-  PRTime now_ = 0;
-};
-
-TEST_P(TlsAgentEsniTest, EsniInstall) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  InstallEsni(record);
-}
-
-// The next set of tests fail at setup time.
-TEST_P(TlsAgentEsniTest, EsniInvalidHash) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(time(0), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.data()[2]++;
-  InstallEsni(record, SSL_ERROR_RX_MALFORMED_ESNI_KEYS);
-}
-
-TEST_P(TlsAgentEsniTest, EsniInvalidVersion) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.Write(0, 0xffff, 2);
-  InstallEsni(record, SSL_ERROR_UNSUPPORTED_VERSION);
-}
-
-TEST_P(TlsAgentEsniTest, EsniShort) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.Truncate(record.len() - 1);
-  UpdateEsniKeysChecksum(&record);
-  InstallEsni(record, SSL_ERROR_RX_MALFORMED_ESNI_KEYS);
-}
-
-TEST_P(TlsAgentEsniTest, EsniLong) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.Write(record.len(), 1, 1);
-  UpdateEsniKeysChecksum(&record);
-  InstallEsni(record, SSL_ERROR_RX_MALFORMED_ESNI_KEYS);
-}
-
-TEST_P(TlsAgentEsniTest, EsniExtensionMismatch) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.Write(record.len() - 1, 1, 1);
-  UpdateEsniKeysChecksum(&record);
-  InstallEsni(record, SSL_ERROR_RX_MALFORMED_ESNI_KEYS);
-}
-
-// The following tests fail by ignoring the Esni block.
-TEST_P(TlsAgentEsniTest, EsniUnknownGroup) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  record.Write(8, 0xffff, 2);  // Fake group
-  UpdateEsniKeysChecksum(&record);
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
-  ASSERT_TRUE(!filter->captured());
-}
-
-TEST_P(TlsAgentEsniTest, EsniUnknownCS) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kBogusSuites, &record);
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
-  ASSERT_TRUE(!filter->captured());
-}
-
-TEST_P(TlsAgentEsniTest, EsniInvalidCS) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kTls12Suites, &record);
-  UpdateEsniKeysChecksum(&record);
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_EQ(TlsAgent::STATE_CONNECTING, agent_->state());
-  ASSERT_TRUE(!filter->captured());
-}
-
-TEST_P(TlsAgentEsniTest, EsniNotReady) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now() + 1000, ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_TRUE(!filter->captured());
-}
-
-TEST_P(TlsAgentEsniTest, EsniExpired) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now() - 1000, ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_TRUE(!filter->captured());
-}
-
-TEST_P(TlsAgentEsniTest, NoSniSoNoEsni) {
-  EnsureInit();
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-  SSL_SetURL(agent_->ssl_fd(), "");
-  InstallEsni(record, 0);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(agent_, ssl_tls13_encrypted_sni_xtn);
-  agent_->Handshake();
-  ASSERT_TRUE(!filter->captured());
-}
-
-static int32_t SniCallback(TlsAgent* agent, const SECItem* srvNameAddr,
-                           PRUint32 srvNameArrSize) {
-  EXPECT_EQ(1U, srvNameArrSize);
-  SECItem expected = {
-      siBuffer, reinterpret_cast<unsigned char*>(const_cast<char*>("server")),
-      6};
-  EXPECT_TRUE(!SECITEM_CompareItem(&expected, &srvNameAddr[0]));
-  return SECSuccess;
-}
-
-TEST_P(TlsConnectTls13, ConnectEsni) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  auto cFilterSni =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
-  auto cFilterEsni =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_tls13_encrypted_sni_xtn);
-  client_->SetFilter(std::make_shared<ChainedPacketFilter>(
-      ChainedPacketFilterInit({cFilterSni, cFilterEsni})));
-  auto sfilter =
-      MakeTlsFilter<TlsExtensionCapture>(server_, ssl_server_name_xtn);
-  sfilter->EnableDecryption();
-  server_->SetSniCallback(SniCallback);
-  Connect();
-  CheckSniExtension(cFilterSni->extension());
-  ASSERT_TRUE(cFilterEsni->captured());
-  // Check that our most preferred suite got chosen.
-  uint32_t suite;
-  ASSERT_TRUE(cFilterEsni->extension().Read(0, 2, &suite));
-  ASSERT_EQ(TLS_AES_128_GCM_SHA256, static_cast<PRUint16>(suite));
-  ASSERT_TRUE(!sfilter->captured());
-}
-
-TEST_P(TlsConnectTls13, ConnectEsniHrr) {
-  EnsureTlsSetup();
-  const std::vector<SSLNamedGroup> groups = {ssl_grp_ec_secp384r1};
-  server_->ConfigNamedGroups(groups);
-  SetupEsni(now(), client_, server_);
-  auto hrr_capture = MakeTlsFilter<TlsHandshakeRecorder>(
-      server_, kTlsHandshakeHelloRetryRequest);
-  auto filter =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
-  auto filter2 =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn, true);
-  auto efilter =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_tls13_encrypted_sni_xtn);
-  auto efilter2 = MakeTlsFilter<TlsExtensionCapture>(
-      client_, ssl_tls13_encrypted_sni_xtn, true);
-
-  client_->SetFilter(std::make_shared<ChainedPacketFilter>(
-      ChainedPacketFilterInit({filter, filter2, efilter, efilter2})));
-  server_->SetSniCallback(SniCallback);
-  Connect();
-  CheckSniExtension(filter->extension());
-  CheckSniExtension(filter2->extension());
-  ASSERT_TRUE(efilter->captured());
-  ASSERT_TRUE(efilter2->captured());
-  ASSERT_NE(efilter->extension(), efilter2->extension());
-  EXPECT_NE(0UL, hrr_capture->buffer().len());
-}
-
-TEST_P(TlsConnectTls13, ConnectEsniNoDummy) {
-  EnsureTlsSetup();
-  ScopedSECKEYPublicKey pub;
-  ScopedSECKEYPrivateKey priv;
-  DataBuffer record;
-
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record, &pub,
-                  &priv);
-  SECStatus rv = SSL_SetESNIKeyPair(server_->ssl_fd(), priv.get(),
-                                    record.data(), record.len());
-  ASSERT_EQ(SECSuccess, rv);
-  rv = SSL_EnableESNI(client_->ssl_fd(), record.data(), record.len(), "");
-  ASSERT_EQ(SECSuccess, rv);
-
-  auto cfilter =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
-  auto sfilter =
-      MakeTlsFilter<TlsExtensionCapture>(server_, ssl_server_name_xtn);
-  server_->SetSniCallback(SniCallback);
-  Connect();
-  ASSERT_TRUE(!cfilter->captured());
-  ASSERT_TRUE(!sfilter->captured());
-}
-
-TEST_P(TlsConnectTls13, ConnectEsniNullDummy) {
-  EnsureTlsSetup();
-  ScopedSECKEYPublicKey pub;
-  ScopedSECKEYPrivateKey priv;
-  DataBuffer record;
-
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record, &pub,
-                  &priv);
-  SECStatus rv = SSL_SetESNIKeyPair(server_->ssl_fd(), priv.get(),
-                                    record.data(), record.len());
-  ASSERT_EQ(SECSuccess, rv);
-  rv = SSL_EnableESNI(client_->ssl_fd(), record.data(), record.len(), nullptr);
-  ASSERT_EQ(SECSuccess, rv);
-
-  auto cfilter =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
-  auto sfilter =
-      MakeTlsFilter<TlsExtensionCapture>(server_, ssl_server_name_xtn);
-  server_->SetSniCallback(SniCallback);
-  Connect();
-  ASSERT_TRUE(!cfilter->captured());
-  ASSERT_TRUE(!sfilter->captured());
-}
-
-/* Tell the client that it supports AES but the server that it supports ChaCha
- */
-TEST_P(TlsConnectTls13, ConnectEsniCSMismatch) {
-  EnsureTlsSetup();
-  ScopedSECKEYPublicKey pub;
-  ScopedSECKEYPrivateKey priv;
-  DataBuffer record;
-
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record, &pub,
-                  &priv);
-  PRUint8 encoded[1024];
-  unsigned int encoded_len = 0;
-
-  SECStatus rv = SSL_EncodeESNIKeys(
-      &kChaChaSuite[0], kChaChaSuite.size(), ssl_grp_ec_curve25519, pub.get(),
-      100, (now() / PR_USEC_PER_SEC) - 1, (now() / PR_USEC_PER_SEC) + 10,
-      encoded, &encoded_len, sizeof(encoded));
-  ASSERT_EQ(SECSuccess, rv);
-  ASSERT_LT(0U, encoded_len);
-  rv = SSL_SetESNIKeyPair(server_->ssl_fd(), priv.get(), encoded, encoded_len);
-  ASSERT_EQ(SECSuccess, rv);
-  rv = SSL_EnableESNI(client_->ssl_fd(), record.data(), record.len(), "");
-  ASSERT_EQ(SECSuccess, rv);
-  ConnectExpectAlert(server_, illegal_parameter);
-  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
-}
-
-TEST_P(TlsConnectTls13, ConnectEsniP256) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_, ssl_grp_ec_secp256r1);
-  auto cfilter =
-      MakeTlsFilter<TlsExtensionCapture>(client_, ssl_server_name_xtn);
-  auto sfilter =
-      MakeTlsFilter<TlsExtensionCapture>(server_, ssl_server_name_xtn);
-  server_->SetSniCallback(SniCallback);
-  Connect();
-  CheckSniExtension(cfilter->extension());
-  ASSERT_TRUE(!sfilter->captured());
-}
-
-TEST_P(TlsConnectTls13, ConnectMismatchedEsniKeys) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  // Now install a new set of keys on the client, so we have a mismatch.
-  DataBuffer record;
-  GenerateEsniKey(now(), ssl_grp_ec_curve25519, kDefaultSuites, &record);
-
-  SECStatus rv =
-      SSL_EnableESNI(client_->ssl_fd(), record.data(), record.len(), kDummySni);
-  ASSERT_EQ(SECSuccess, rv);
-  ConnectExpectAlert(server_, illegal_parameter);
-  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
-}
-
-TEST_P(TlsConnectTls13, ConnectDamagedEsniExtensionCH) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  auto filter = MakeTlsFilter<TlsExtensionDamager>(
-      client_, ssl_tls13_encrypted_sni_xtn, 50);  // in the ciphertext
-  ConnectExpectAlert(server_, illegal_parameter);
-  server_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_CLIENT_HELLO);
-}
-
-TEST_P(TlsConnectTls13, ConnectRemoveEsniExtensionEE) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  auto filter =
-      MakeTlsFilter<TlsExtensionDropper>(server_, ssl_tls13_encrypted_sni_xtn);
-  filter->EnableDecryption();
-  ConnectExpectAlert(client_, missing_extension);
-  client_->CheckErrorCode(SSL_ERROR_MISSING_ESNI_EXTENSION);
-}
-
-TEST_P(TlsConnectTls13, ConnectShortEsniExtensionEE) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  DataBuffer shortNonce;
-  auto filter = MakeTlsFilter<TlsExtensionReplacer>(
-      server_, ssl_tls13_encrypted_sni_xtn, shortNonce);
-  filter->EnableDecryption();
-  ConnectExpectAlert(client_, illegal_parameter);
-  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION);
-}
-
-TEST_P(TlsConnectTls13, ConnectBogusEsniExtensionEE) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  const uint8_t bogusNonceBuf[16] = {0};
-  DataBuffer bogusNonce(bogusNonceBuf, sizeof(bogusNonceBuf));
-  auto filter = MakeTlsFilter<TlsExtensionReplacer>(
-      server_, ssl_tls13_encrypted_sni_xtn, bogusNonce);
-  filter->EnableDecryption();
-  ConnectExpectAlert(client_, illegal_parameter);
-  client_->CheckErrorCode(SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION);
-}
-
-// ESNI is a commitment to doing TLS 1.3 or above.
-// The TLS 1.2 server ignores ESNI and processes the dummy SNI.
-// The client then aborts when it sees the server did TLS 1.2.
-TEST_P(TlsConnectTls13, EsniButTLS12Server) {
-  EnsureTlsSetup();
-  SetupEsni(now(), client_, server_);
-  client_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
-                           SSL_LIBRARY_VERSION_TLS_1_3);
-  server_->SetVersionRange(SSL_LIBRARY_VERSION_TLS_1_2,
-                           SSL_LIBRARY_VERSION_TLS_1_2);
-  ConnectExpectAlert(client_, kTlsAlertProtocolVersion);
-  client_->CheckErrorCode(SSL_ERROR_UNSUPPORTED_VERSION);
-  server_->CheckErrorCode(SSL_ERROR_PROTOCOL_VERSION_ALERT);
-  ASSERT_FALSE(SSLInt_ExtensionNegotiated(server_->ssl_fd(),
-                                          ssl_tls13_encrypted_sni_xtn));
-}
-}  // namespace nss_test
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_filter.cc firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_filter.cc
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_filter.cc	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_filter.cc	2021-01-18 19:58:18.000000000 +0000
@@ -17,6 +17,7 @@
 #include "gtest_utils.h"
 #include "tls_agent.h"
 #include "tls_filter.h"
+#include "tls_parser.h"
 #include "tls_protect.h"
 
 namespace nss_test {
@@ -1031,6 +1032,69 @@
   return CHANGE;
 }
 
+PacketFilter::Action TlsExtensionResizer::FilterExtension(
+    uint16_t extension_type, const DataBuffer& input, DataBuffer* output) {
+  if (extension_type != extension_) {
+    return KEEP;
+  }
+
+  if (input.len() <= length_) {
+    DataBuffer buf(length_ - input.len());
+    output->Append(buf);
+    return CHANGE;
+  }
+
+  output->Assign(input.data(), length_);
+  return CHANGE;
+}
+
+PacketFilter::Action TlsExtensionAppender::FilterHandshake(
+    const HandshakeHeader& header, const DataBuffer& input,
+    DataBuffer* output) {
+  TlsParser parser(input);
+  if (!TlsExtensionFilter::FindExtensions(&parser, header)) {
+    return KEEP;
+  }
+  *output = input;
+
+  // Increase the length of the extensions block.
+  if (!UpdateLength(output, parser.consumed(), 2)) {
+    return KEEP;
+  }
+
+  // Extensions in Certificate are nested twice.  Increase the size of the
+  // certificate list.
+  if (header.handshake_type() == kTlsHandshakeCertificate) {
+    TlsParser p2(input);
+    if (!p2.SkipVariable(1)) {
+      ADD_FAILURE();
+      return KEEP;
+    }
+    if (!UpdateLength(output, p2.consumed(), 3)) {
+      return KEEP;
+    }
+  }
+
+  size_t offset = output->len();
+  offset = output->Write(offset, extension_, 2);
+  WriteVariable(output, offset, data_, 2);
+
+  return CHANGE;
+}
+
+bool TlsExtensionAppender::UpdateLength(DataBuffer* output, size_t offset,
+                                        size_t size) {
+  uint32_t len;
+  if (!output->Read(offset, size, &len)) {
+    ADD_FAILURE();
+    return false;
+  }
+
+  len += 4 + data_.len();
+  output->Write(offset, len, size);
+  return true;
+}
+
 PacketFilter::Action TlsExtensionDropper::FilterExtension(
     uint16_t extension_type, const DataBuffer& input, DataBuffer* output) {
   if (extension_type == extension_) {
diff -Nru firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_filter.h firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_filter.h
--- firefox-84.0.2+build1/security/nss/gtests/ssl_gtest/tls_filter.h	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/security/nss/gtests/ssl_gtest/tls_filter.h	2021-01-18 19:58:19.000000000 +0000
@@ -11,6 +11,7 @@
 #include <memory>
 #include <set>
 #include <vector>
+#include "pk11pub.h"
 #include "sslt.h"
 #include "sslproto.h"
 #include "test_io.h"
@@ -524,6 +525,37 @@
   const uint16_t extension_;
   const DataBuffer data_;
 };
+
+class TlsExtensionResizer : public TlsExtensionFilter {
+ public:
+  TlsExtensionResizer(const std::shared_ptr<TlsAgent>& a, uint16_t extension,
+                      size_t length)
+      : TlsExtensionFilter(a), extension_(extension), length_(length) {}
+  PacketFilter::Action FilterExtension(uint16_t extension_type,
+                                       const DataBuffer& input,
+                                       DataBuffer* output) override;
+
+ private:
+  uint16_t extension_;
+  size_t length_;
+};
+
+class TlsExtensionAppender : public TlsHandshakeFilter {
+ public:
+  TlsExtensionAppender(const std::shared_ptr<TlsAgent>& a,
+                       uint8_t handshake_type, uint16_t ext, DataBuffer& data)
+      : TlsHandshakeFilter(a, {handshake_type}), extension_(ext), data_(data) {}
+
+  virtual PacketFilter::Action FilterHandshake(const HandshakeHeader& header,
+                                               const DataBuffer& input,
+                                               DataBuffer* output);
+
+ private:
+  bool UpdateLength(DataBuffer* output, size_t offset, size_t size);
+
+  const uint16_t extension_;
+  const DataBuffer data_;
+};
 
 class TlsExtensionDropper : public TlsExtensionFilter {
  public:
diff -Nru firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/certdata.txt firefox-85.0+build1/security/nss/lib/ckfw/builtins/certdata.txt
--- firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/certdata.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ckfw/builtins/certdata.txt	2021-01-18 19:58:19.000000000 +0000
@@ -1142,468 +1142,6 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "GeoTrust Global CA"
-#
-# Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US
-# Serial Number: 144470 (0x23456)
-# Subject: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US
-# Not Valid Before: Tue May 21 04:00:00 2002
-# Not Valid After : Sat May 21 04:00:00 2022
-# Fingerprint (MD5): F7:75:AB:29:FB:51:4E:B7:77:5E:FF:05:3C:99:8E:F5
-# Fingerprint (SHA1): DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Global CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003
-\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141
-\154\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003
-\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141
-\154\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\002\064\126
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\124\060\202\002\074\240\003\002\001\002\002\003\002
-\064\126\060\015\006\011\052\206\110\206\367\015\001\001\005\005
-\000\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162
-\165\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004
-\003\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142
-\141\154\040\103\101\060\036\027\015\060\062\060\065\062\061\060
-\064\060\060\060\060\132\027\015\062\062\060\065\062\061\060\064
-\060\060\060\060\132\060\102\061\013\060\011\006\003\125\004\006
-\023\002\125\123\061\026\060\024\006\003\125\004\012\023\015\107
-\145\157\124\162\165\163\164\040\111\156\143\056\061\033\060\031
-\006\003\125\004\003\023\022\107\145\157\124\162\165\163\164\040
-\107\154\157\142\141\154\040\103\101\060\202\001\042\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017
-\000\060\202\001\012\002\202\001\001\000\332\314\030\143\060\375
-\364\027\043\032\126\176\133\337\074\154\070\344\161\267\170\221
-\324\274\241\330\114\370\250\103\266\003\351\115\041\007\010\210
-\332\130\057\146\071\051\275\005\170\213\235\070\350\005\267\152
-\176\161\244\346\304\140\246\260\357\200\344\211\050\017\236\045
-\326\355\203\363\255\246\221\307\230\311\102\030\065\024\235\255
-\230\106\222\056\117\312\361\207\103\301\026\225\127\055\120\357
-\211\055\200\172\127\255\362\356\137\153\322\000\215\271\024\370
-\024\025\065\331\300\106\243\173\162\310\221\277\311\125\053\315
-\320\227\076\234\046\144\314\337\316\203\031\161\312\116\346\324
-\325\173\251\031\315\125\336\310\354\322\136\070\123\345\134\117
-\214\055\376\120\043\066\374\146\346\313\216\244\071\031\000\267
-\225\002\071\221\013\016\376\070\056\321\035\005\232\366\115\076
-\157\017\007\035\257\054\036\217\140\071\342\372\066\123\023\071
-\324\136\046\053\333\075\250\024\275\062\353\030\003\050\122\004
-\161\345\253\063\075\341\070\273\007\066\204\142\234\171\352\026
-\060\364\137\300\053\350\161\153\344\371\002\003\001\000\001\243
-\123\060\121\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024\300
-\172\230\150\215\211\373\253\005\144\014\021\175\252\175\145\270
-\312\314\116\060\037\006\003\125\035\043\004\030\060\026\200\024
-\300\172\230\150\215\211\373\253\005\144\014\021\175\252\175\145
-\270\312\314\116\060\015\006\011\052\206\110\206\367\015\001\001
-\005\005\000\003\202\001\001\000\065\343\051\152\345\057\135\124
-\216\051\120\224\237\231\032\024\344\217\170\052\142\224\242\047
-\147\236\320\317\032\136\107\351\301\262\244\317\335\101\032\005
-\116\233\113\356\112\157\125\122\263\044\241\067\012\353\144\166
-\052\056\054\363\375\073\165\220\277\372\161\330\307\075\067\322
-\265\005\225\142\271\246\336\211\075\066\173\070\167\110\227\254
-\246\040\217\056\246\311\014\302\262\231\105\000\307\316\021\121
-\042\042\340\245\352\266\025\110\011\144\352\136\117\164\367\005
-\076\307\212\122\014\333\025\264\275\155\233\345\306\261\124\150
-\251\343\151\220\266\232\245\017\270\271\077\040\175\256\112\265
-\270\234\344\035\266\253\346\224\245\301\307\203\255\333\365\047
-\207\016\004\154\325\377\335\240\135\355\207\122\267\053\025\002
-\256\071\246\152\164\351\332\304\347\274\115\064\036\251\134\115
-\063\137\222\011\057\210\146\135\167\227\307\035\166\023\251\325
-\345\361\026\011\021\065\325\254\333\044\161\160\054\230\126\013
-\331\027\264\321\343\121\053\136\165\350\325\320\334\117\064\355
-\302\005\146\200\241\313\346\063
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Wed Jan 01 00:00:00 2020
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\062\060\060\061\060\061\060\060\060\060\060\060\132
-END
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "GeoTrust Global CA"
-# Issuer: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US
-# Serial Number: 144470 (0x23456)
-# Subject: CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US
-# Not Valid Before: Tue May 21 04:00:00 2002
-# Not Valid After : Sat May 21 04:00:00 2022
-# Fingerprint (MD5): F7:75:AB:29:FB:51:4E:B7:77:5E:FF:05:3C:99:8E:F5
-# Fingerprint (SHA1): DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Global CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\336\050\364\244\377\345\271\057\243\305\003\321\243\111\247\371
-\226\052\202\022
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\367\165\253\051\373\121\116\267\167\136\377\005\074\231\216\365
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\102\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\033\060\031\006\003\125\004\003
-\023\022\107\145\157\124\162\165\163\164\040\107\154\157\142\141
-\154\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\002\064\126
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "GeoTrust Universal CA"
-#
-# Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US
-# Not Valid Before: Thu Mar 04 05:00:00 2004
-# Not Valid After : Sun Mar 04 05:00:00 2029
-# Fingerprint (MD5): 92:65:58:8B:A2:1A:31:72:73:68:5C:B4:A5:7A:07:48
-# Fingerprint (SHA1): E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Universal CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003
-\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003
-\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\150\060\202\003\120\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026
-\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163
-\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003\023
-\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145\162
-\163\141\154\040\103\101\060\036\027\015\060\064\060\063\060\064
-\060\065\060\060\060\060\132\027\015\062\071\060\063\060\064\060
-\065\060\060\060\060\132\060\105\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\026\060\024\006\003\125\004\012\023\015
-\107\145\157\124\162\165\163\164\040\111\156\143\056\061\036\060
-\034\006\003\125\004\003\023\025\107\145\157\124\162\165\163\164
-\040\125\156\151\166\145\162\163\141\154\040\103\101\060\202\002
-\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000
-\003\202\002\017\000\060\202\002\012\002\202\002\001\000\246\025
-\125\240\243\306\340\037\214\235\041\120\327\301\276\053\133\265
-\244\236\241\331\162\130\275\000\033\114\277\141\311\024\035\105
-\202\253\306\035\200\326\075\353\020\234\072\257\155\044\370\274
-\161\001\236\006\365\174\137\036\301\016\125\312\203\232\131\060
-\256\031\313\060\110\225\355\042\067\215\364\112\232\162\146\076
-\255\225\300\340\026\000\340\020\037\053\061\016\327\224\124\323
-\102\063\240\064\035\036\105\166\335\117\312\030\067\354\205\025
-\172\031\010\374\325\307\234\360\362\251\056\020\251\222\346\075
-\130\075\251\026\150\074\057\165\041\030\177\050\167\245\341\141
-\027\267\246\351\370\036\231\333\163\156\364\012\242\041\154\356
-\332\252\205\222\146\257\366\172\153\202\332\272\042\010\065\017
-\317\102\361\065\372\152\356\176\053\045\314\072\021\344\155\257
-\163\262\166\035\255\320\262\170\147\032\244\071\034\121\013\147
-\126\203\375\070\135\015\316\335\360\273\053\226\037\336\173\062
-\122\375\035\273\265\006\241\262\041\136\245\326\225\150\177\360
-\231\236\334\105\010\076\347\322\011\015\065\224\335\200\116\123
-\227\327\265\011\104\040\144\026\027\003\002\114\123\015\150\336
-\325\252\162\115\223\155\202\016\333\234\275\317\264\363\134\135
-\124\172\151\011\226\326\333\021\301\215\165\250\264\317\071\310
-\316\074\274\044\174\346\142\312\341\275\175\247\275\127\145\013
-\344\376\045\355\266\151\020\334\050\032\106\275\001\035\320\227
-\265\341\230\073\300\067\144\326\075\224\356\013\341\365\050\256
-\013\126\277\161\213\043\051\101\216\206\305\113\122\173\330\161
-\253\037\212\025\246\073\203\132\327\130\001\121\306\114\101\331
-\177\330\101\147\162\242\050\337\140\203\251\236\310\173\374\123
-\163\162\131\365\223\172\027\166\016\316\367\345\134\331\013\125
-\064\242\252\133\265\152\124\347\023\312\127\354\227\155\364\136
-\006\057\105\213\130\324\043\026\222\344\026\156\050\143\131\060
-\337\120\001\234\143\211\032\237\333\027\224\202\160\067\303\044
-\236\232\107\326\132\312\116\250\151\211\162\037\221\154\333\176
-\236\033\255\307\037\163\335\054\117\031\145\375\177\223\100\020
-\056\322\360\355\074\236\056\050\076\151\046\063\305\173\002\003
-\001\000\001\243\143\060\141\060\017\006\003\125\035\023\001\001
-\377\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004
-\026\004\024\332\273\056\252\260\014\270\210\046\121\164\134\155
-\003\323\300\330\217\172\326\060\037\006\003\125\035\043\004\030
-\060\026\200\024\332\273\056\252\260\014\270\210\046\121\164\134
-\155\003\323\300\330\217\172\326\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\001\206\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\202\002\001\000\061\170\346\307
-\265\337\270\224\100\311\161\304\250\065\354\106\035\302\205\363
-\050\130\206\260\013\374\216\262\071\217\104\125\253\144\204\134
-\151\251\320\232\070\074\372\345\037\065\345\104\343\200\171\224
-\150\244\273\304\237\075\341\064\315\060\106\213\124\053\225\245
-\357\367\077\231\204\375\065\346\317\061\306\334\152\277\247\327
-\043\010\341\230\136\303\132\010\166\251\246\257\167\057\267\140
-\275\104\106\152\357\227\377\163\225\301\216\350\223\373\375\061
-\267\354\127\021\021\105\233\060\361\032\210\071\301\117\074\247
-\000\325\307\374\253\155\200\042\160\245\014\340\135\004\051\002
-\373\313\240\221\321\174\326\303\176\120\325\235\130\276\101\070
-\353\271\165\074\025\331\233\311\112\203\131\300\332\123\375\063
-\273\066\030\233\205\017\025\335\356\055\254\166\223\271\331\001
-\215\110\020\250\373\365\070\206\361\333\012\306\275\204\243\043
-\101\336\326\167\157\205\324\205\034\120\340\256\121\212\272\215
-\076\166\342\271\312\047\362\137\237\357\156\131\015\006\330\053
-\027\244\322\174\153\273\137\024\032\110\217\032\114\347\263\107
-\034\216\114\105\053\040\356\110\337\347\335\011\216\030\250\332
-\100\215\222\046\021\123\141\163\135\353\275\347\304\115\051\067
-\141\353\254\071\055\147\056\026\326\365\000\203\205\241\314\177
-\166\304\175\344\267\113\146\357\003\105\140\151\266\014\122\226
-\222\204\136\246\243\265\244\076\053\331\314\330\033\107\252\362
-\104\332\117\371\003\350\360\024\313\077\363\203\336\320\301\124
-\343\267\350\012\067\115\213\040\131\003\060\031\241\054\310\275
-\021\037\337\256\311\112\305\363\047\146\146\206\254\150\221\377
-\331\346\123\034\017\213\134\151\145\012\046\310\036\064\303\135
-\121\173\327\251\234\006\241\066\335\325\211\224\274\331\344\055
-\014\136\011\154\010\227\174\243\075\174\223\377\077\241\024\247
-\317\265\135\353\333\333\034\304\166\337\210\271\275\105\005\225
-\033\256\374\106\152\114\257\110\343\316\256\017\322\176\353\346
-\154\234\117\201\152\172\144\254\273\076\325\347\313\166\056\305
-\247\110\301\134\220\017\313\310\077\372\346\062\341\215\033\157
-\244\346\216\330\371\051\110\212\316\163\376\054
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Sun Sep 30 00:00:00 2018
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\070\060\071\063\060\060\060\060\060\060\060\132
-END
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "GeoTrust Universal CA"
-# Issuer: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=GeoTrust Universal CA,O=GeoTrust Inc.,C=US
-# Not Valid Before: Thu Mar 04 05:00:00 2004
-# Not Valid After : Sun Mar 04 05:00:00 2029
-# Fingerprint (MD5): 92:65:58:8B:A2:1A:31:72:73:68:5C:B4:A5:7A:07:48
-# Fingerprint (SHA1): E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Universal CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\346\041\363\065\103\171\005\232\113\150\060\235\212\057\164\042
-\025\207\354\171
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\222\145\130\213\242\032\061\162\163\150\134\264\245\172\007\110
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\036\060\034\006\003\125\004\003
-\023\025\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "GeoTrust Universal CA 2"
-#
-# Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US
-# Not Valid Before: Thu Mar 04 05:00:00 2004
-# Not Valid After : Sun Mar 04 05:00:00 2029
-# Fingerprint (MD5): 34:FC:B8:D0:36:DB:9E:14:B3:C2:F2:DB:8F:E4:94:C7
-# Fingerprint (SHA1): 37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Universal CA 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003
-\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101\040\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003
-\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\154\060\202\003\124\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026
-\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163
-\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003\023
-\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145\162
-\163\141\154\040\103\101\040\062\060\036\027\015\060\064\060\063
-\060\064\060\065\060\060\060\060\132\027\015\062\071\060\063\060
-\064\060\065\060\060\060\060\132\060\107\061\013\060\011\006\003
-\125\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012
-\023\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061
-\040\060\036\006\003\125\004\003\023\027\107\145\157\124\162\165
-\163\164\040\125\156\151\166\145\162\163\141\154\040\103\101\040
-\062\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002
-\001\000\263\124\122\301\311\076\362\331\334\261\123\032\131\051
-\347\261\303\105\050\345\327\321\355\305\305\113\241\252\164\173
-\127\257\112\046\374\330\365\136\247\156\031\333\164\014\117\065
-\133\062\013\001\343\333\353\172\167\065\352\252\132\340\326\350
-\241\127\224\360\220\243\164\126\224\104\060\003\036\134\116\053
-\205\046\164\202\172\014\166\240\157\115\316\101\055\240\025\006
-\024\137\267\102\315\173\217\130\141\064\334\052\010\371\056\303
-\001\246\042\104\034\114\007\202\346\133\316\320\112\174\004\323
-\031\163\047\360\252\230\177\056\257\116\353\207\036\044\167\152
-\135\266\350\133\105\272\334\303\241\005\157\126\216\217\020\046
-\245\111\303\056\327\101\207\042\340\117\206\312\140\265\352\241
-\143\300\001\227\020\171\275\000\074\022\155\053\025\261\254\113
-\261\356\030\271\116\226\334\334\166\377\073\276\317\137\003\300
-\374\073\350\276\106\033\377\332\100\302\122\367\376\343\072\367
-\152\167\065\320\332\215\353\136\030\152\061\307\036\272\074\033
-\050\326\153\124\306\252\133\327\242\054\033\031\314\242\002\366
-\233\131\275\067\153\206\265\155\202\272\330\352\311\126\274\251
-\066\130\375\076\031\363\355\014\046\251\223\070\370\117\301\135
-\042\006\320\227\352\341\255\306\125\340\201\053\050\203\072\372
-\364\173\041\121\000\276\122\070\316\315\146\171\250\364\201\126
-\342\320\203\011\107\121\133\120\152\317\333\110\032\135\076\367
-\313\366\145\367\154\361\225\370\002\073\062\126\202\071\172\133
-\275\057\211\033\277\241\264\350\377\177\215\214\337\003\361\140
-\116\130\021\114\353\243\077\020\053\203\232\001\163\331\224\155
-\204\000\047\146\254\360\160\100\011\102\222\255\117\223\015\141
-\011\121\044\330\222\325\013\224\141\262\207\262\355\377\232\065
-\377\205\124\312\355\104\103\254\033\074\026\153\110\112\012\034
-\100\210\037\222\302\013\000\005\377\362\310\002\112\244\252\251
-\314\231\226\234\057\130\340\175\341\276\273\007\334\137\004\162
-\134\061\064\303\354\137\055\340\075\144\220\042\346\321\354\270
-\056\335\131\256\331\241\067\277\124\065\334\163\062\117\214\004
-\036\063\262\311\106\361\330\134\310\125\120\311\150\275\250\272
-\066\011\002\003\001\000\001\243\143\060\141\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003
-\125\035\016\004\026\004\024\166\363\125\341\372\244\066\373\360
-\237\134\142\161\355\074\364\107\070\020\053\060\037\006\003\125
-\035\043\004\030\060\026\200\024\166\363\125\341\372\244\066\373
-\360\237\134\142\161\355\074\364\107\070\020\053\060\016\006\003
-\125\035\017\001\001\377\004\004\003\002\001\206\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\002\001\000
-\146\301\306\043\363\331\340\056\156\137\350\317\256\260\260\045
-\115\053\370\073\130\233\100\044\067\132\313\253\026\111\377\263
-\165\171\063\241\057\155\160\027\064\221\376\147\176\217\354\233
-\345\136\202\251\125\037\057\334\324\121\007\022\376\254\026\076
-\054\065\306\143\374\334\020\353\015\243\252\320\174\314\321\320
-\057\121\056\304\024\132\336\350\031\341\076\306\314\244\051\347
-\056\204\252\006\060\170\166\124\163\050\230\131\070\340\000\015
-\142\323\102\175\041\237\256\075\072\214\325\372\167\015\030\053
-\026\016\137\066\341\374\052\265\060\044\317\340\143\014\173\130
-\032\376\231\272\102\022\261\221\364\174\150\342\310\350\257\054
-\352\311\176\256\273\052\075\015\025\334\064\225\266\030\164\250
-\152\017\307\264\364\023\304\344\133\355\012\322\244\227\114\052
-\355\057\154\022\211\075\361\047\160\252\152\003\122\041\237\100
-\250\147\120\362\363\132\037\337\337\043\366\334\170\116\346\230
-\117\125\072\123\343\357\362\364\237\307\174\330\130\257\051\042
-\227\270\340\275\221\056\260\166\354\127\021\317\357\051\104\363
-\351\205\172\140\143\344\135\063\211\027\331\061\252\332\326\363
-\030\065\162\317\207\053\057\143\043\204\135\204\214\077\127\240
-\210\374\231\221\050\046\151\231\324\217\227\104\276\216\325\110
-\261\244\050\051\361\025\264\341\345\236\335\370\217\246\157\046
-\327\011\074\072\034\021\016\246\154\067\367\255\104\207\054\050
-\307\330\164\202\263\320\157\112\127\273\065\051\047\240\213\350
-\041\247\207\144\066\135\314\330\026\254\307\262\047\100\222\125
-\070\050\215\121\156\335\024\147\123\154\161\134\046\204\115\165
-\132\266\176\140\126\251\115\255\373\233\036\227\363\015\331\322
-\227\124\167\332\075\022\267\340\036\357\010\006\254\371\205\207
-\351\242\334\257\176\030\022\203\375\126\027\101\056\325\051\202
-\175\231\364\061\366\161\251\317\054\001\047\245\005\271\252\262
-\110\116\052\357\237\223\122\121\225\074\122\163\216\126\114\027
-\100\300\011\050\344\213\152\110\123\333\354\315\125\125\361\306
-\370\351\242\054\114\246\321\046\137\176\257\132\114\332\037\246
-\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Wed Jan 01 00:00:00 2020
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\062\060\060\061\060\061\060\060\060\060\060\060\132
-END
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "GeoTrust Universal CA 2"
-# Issuer: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US
-# Serial Number: 1 (0x1)
-# Subject: CN=GeoTrust Universal CA 2,O=GeoTrust Inc.,C=US
-# Not Valid Before: Thu Mar 04 05:00:00 2004
-# Not Valid After : Sun Mar 04 05:00:00 2029
-# Fingerprint (MD5): 34:FC:B8:D0:36:DB:9E:14:B3:C2:F2:DB:8F:E4:94:C7
-# Fingerprint (SHA1): 37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Universal CA 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\067\232\031\173\101\205\105\065\014\246\003\151\363\074\056\257
-\107\117\040\171
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\064\374\270\320\066\333\236\024\263\302\362\333\217\344\224\307
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\107\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\040\060\036\006\003\125\004\003
-\023\027\107\145\157\124\162\165\163\164\040\125\156\151\166\145
-\162\163\141\154\040\103\101\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
 # Certificate "Certum Root CA"
 #
 # Issuer: CN=Certum CA,O=Unizeto Sp. z o.o.,C=PL
@@ -4500,138 +4038,136 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "GeoTrust Primary Certification Authority"
+# Certificate "SecureTrust CA"
 #
-# Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US
-# Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1
-# Subject: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US
-# Not Valid Before: Mon Nov 27 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): 02:26:C3:01:5E:08:30:37:43:A9:D0:7D:CF:37:E6:BF
-# Fingerprint (SHA1): 32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96
+# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
+# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
+# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
+# Not Valid Before: Tue Nov 07 19:31:18 2006
+# Not Valid After : Mon Dec 31 19:40:55 2029
+# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1
+# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority"
+CKA_LABEL UTF8 "SecureTrust CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003
-\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141
-\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171
+\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
+\162\145\124\162\165\163\164\040\103\101
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003
-\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141
-\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171
+\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
+\162\145\124\162\165\163\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372
-\304\241
+\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030
+\131\320
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\003\174\060\202\002\144\240\003\002\001\002\002\020\030
-\254\265\152\375\151\266\025\072\143\154\257\332\372\304\241\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\130
-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026\060
-\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163\164
-\040\111\156\143\056\061\061\060\057\006\003\125\004\003\023\050
-\107\145\157\124\162\165\163\164\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\060\036\027\015\060\066\061\061
-\062\067\060\060\060\060\060\060\132\027\015\063\066\060\067\061
-\066\062\063\065\071\065\071\132\060\130\061\013\060\011\006\003
-\125\004\006\023\002\125\123\061\026\060\024\006\003\125\004\012
-\023\015\107\145\157\124\162\165\163\164\040\111\156\143\056\061
-\061\060\057\006\003\125\004\003\023\050\107\145\157\124\162\165
-\163\164\040\120\162\151\155\141\162\171\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\060\202\003\270\060\202\002\240\240\003\002\001\002\002\020\014
+\360\216\134\010\026\245\255\102\177\360\353\047\030\131\320\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\110
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060
+\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162
+\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061
+\027\060\025\006\003\125\004\003\023\016\123\145\143\165\162\145
+\124\162\165\163\164\040\103\101\060\036\027\015\060\066\061\061
+\060\067\061\071\063\061\061\070\132\027\015\062\071\061\062\063
+\061\061\071\064\060\065\065\132\060\110\061\013\060\011\006\003
+\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004\012
+\023\027\123\145\143\165\162\145\124\162\165\163\164\040\103\157
+\162\160\157\162\141\164\151\157\156\061\027\060\025\006\003\125
+\004\003\023\016\123\145\143\165\162\145\124\162\165\163\164\040
+\103\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015
 \001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
-\001\001\000\276\270\025\173\377\324\174\175\147\255\203\144\173
-\310\102\123\055\337\366\204\010\040\141\326\001\131\152\234\104
-\021\257\357\166\375\225\176\316\141\060\273\172\203\137\002\275
-\001\146\312\356\025\215\157\241\060\234\275\241\205\236\224\072
-\363\126\210\000\061\317\330\356\152\226\002\331\355\003\214\373
-\165\155\347\352\270\125\026\005\026\232\364\340\136\261\210\300
-\144\205\134\025\115\210\307\267\272\340\165\351\255\005\075\235
-\307\211\110\340\273\050\310\003\341\060\223\144\136\122\300\131
-\160\042\065\127\210\212\361\225\012\203\327\274\061\163\001\064
-\355\357\106\161\340\153\002\250\065\162\153\227\233\146\340\313
-\034\171\137\330\032\004\150\036\107\002\346\235\140\342\066\227
-\001\337\316\065\222\337\276\147\307\155\167\131\073\217\235\326
-\220\025\224\274\102\064\020\301\071\371\261\047\076\176\326\212
-\165\305\262\257\226\323\242\336\233\344\230\276\175\341\351\201
-\255\266\157\374\327\016\332\340\064\260\015\032\167\347\343\010
-\230\357\130\372\234\204\267\066\257\302\337\254\322\364\020\006
-\160\161\065\002\003\001\000\001\243\102\060\100\060\017\006\003
-\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006
-\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006
-\003\125\035\016\004\026\004\024\054\325\120\101\227\025\213\360
-\217\066\141\133\112\373\153\331\231\311\063\222\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\132\160\177\054\335\267\064\117\365\206\121\251\046\276\113\270
-\252\361\161\015\334\141\307\240\352\064\036\172\167\017\004\065
-\350\047\217\154\220\277\221\026\044\106\076\112\116\316\053\026
-\325\013\122\035\374\037\147\242\002\105\061\117\316\363\372\003
-\247\171\235\123\152\331\332\143\072\370\200\327\323\231\341\245
-\341\276\324\125\161\230\065\072\276\223\352\256\255\102\262\220
-\157\340\374\041\115\065\143\063\211\111\326\233\116\312\307\347
-\116\011\000\367\332\307\357\231\142\231\167\266\225\042\136\212
-\240\253\364\270\170\230\312\070\031\231\311\162\236\170\315\113
-\254\257\031\240\163\022\055\374\302\101\272\201\221\332\026\132
-\061\267\371\264\161\200\022\110\231\162\163\132\131\123\301\143
-\122\063\355\247\311\322\071\002\160\372\340\261\102\146\051\252
-\233\121\355\060\124\042\024\137\331\253\035\301\344\224\360\370
-\365\053\367\352\312\170\106\326\270\221\375\246\015\053\032\024
-\001\076\200\360\102\240\225\007\136\155\315\314\113\244\105\215
-\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131
+\001\001\000\253\244\201\345\225\315\365\366\024\216\302\117\312
+\324\342\170\225\130\234\101\341\015\231\100\044\027\071\221\063
+\146\351\276\341\203\257\142\134\211\321\374\044\133\141\263\340
+\021\021\101\034\035\156\360\270\273\370\336\247\201\272\246\110
+\306\237\035\275\276\216\251\101\076\270\224\355\051\032\324\216
+\322\003\035\003\357\155\015\147\034\127\327\006\255\312\310\365
+\376\016\257\146\045\110\004\226\013\135\243\272\026\303\010\117
+\321\106\370\024\134\362\310\136\001\231\155\375\210\314\206\250
+\301\157\061\102\154\122\076\150\313\363\031\064\337\273\207\030
+\126\200\046\304\320\334\300\157\337\336\240\302\221\026\240\144
+\021\113\104\274\036\366\347\372\143\336\146\254\166\244\161\243
+\354\066\224\150\172\167\244\261\347\016\057\201\172\342\265\162
+\206\357\242\153\213\360\017\333\323\131\077\272\162\274\104\044
+\234\343\163\263\367\257\127\057\102\046\235\251\164\272\000\122
+\362\113\315\123\174\107\013\066\205\016\146\251\010\227\026\064
+\127\301\146\367\200\343\355\160\124\307\223\340\056\050\025\131
+\207\272\273\002\003\001\000\001\243\201\235\060\201\232\060\023
+\006\011\053\006\001\004\001\202\067\024\002\004\006\036\004\000
+\103\000\101\060\013\006\003\125\035\017\004\004\003\002\001\206
+\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001
+\377\060\035\006\003\125\035\016\004\026\004\024\102\062\266\026
+\372\004\375\376\135\113\172\303\375\367\114\100\035\132\103\257
+\060\064\006\003\125\035\037\004\055\060\053\060\051\240\047\240
+\045\206\043\150\164\164\160\072\057\057\143\162\154\056\163\145
+\143\165\162\145\164\162\165\163\164\056\143\157\155\057\123\124
+\103\101\056\143\162\154\060\020\006\011\053\006\001\004\001\202
+\067\025\001\004\003\002\001\000\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\202\001\001\000\060\355\117\112
+\341\130\072\122\162\133\265\246\243\145\030\246\273\121\073\167
+\351\235\352\323\237\134\340\105\145\173\015\312\133\342\160\120
+\262\224\005\024\256\111\307\215\101\007\022\163\224\176\014\043
+\041\375\274\020\177\140\020\132\162\365\230\016\254\354\271\177
+\335\172\157\135\323\034\364\377\210\005\151\102\251\005\161\310
+\267\254\046\350\056\264\214\152\377\161\334\270\261\337\231\274
+\174\041\124\053\344\130\242\273\127\051\256\236\251\243\031\046
+\017\231\056\010\260\357\375\151\317\231\032\011\215\343\247\237
+\053\311\066\064\173\044\263\170\114\225\027\244\006\046\036\266
+\144\122\066\137\140\147\331\234\305\005\164\013\347\147\043\322
+\010\374\210\351\256\213\177\341\060\364\067\176\375\306\062\332
+\055\236\104\060\060\154\356\007\336\322\064\374\322\377\100\366
+\113\364\146\106\006\124\246\362\062\012\143\046\060\153\233\321
+\334\213\107\272\341\271\325\142\320\242\240\364\147\005\170\051
+\143\032\157\004\326\370\306\114\243\232\261\067\264\215\345\050
+\113\035\236\054\302\270\150\274\355\002\356\061
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Tue Apr 30 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\064\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "GeoTrust Primary Certification Authority"
-# Issuer: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US
-# Serial Number:18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1
-# Subject: CN=GeoTrust Primary Certification Authority,O=GeoTrust Inc.,C=US
-# Not Valid Before: Mon Nov 27 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): 02:26:C3:01:5E:08:30:37:43:A9:D0:7D:CF:37:E6:BF
-# Fingerprint (SHA1): 32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96
+# Trust for Certificate "SecureTrust CA"
+# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
+# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
+# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
+# Not Valid Before: Tue Nov 07 19:31:18 2006
+# Not Valid After : Mon Dec 31 19:40:55 2029
+# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1
+# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority"
+CKA_LABEL UTF8 "SecureTrust CA"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\062\074\021\216\033\367\270\266\122\124\342\342\020\015\326\002
-\220\067\360\226
+\207\202\306\303\004\065\073\317\322\226\222\322\131\076\175\104
+\331\064\377\021
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\002\046\303\001\136\010\060\067\103\251\320\175\317\067\346\277
+\334\062\303\247\155\045\127\307\150\011\235\352\055\251\242\321
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\130\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165
-\163\164\040\111\156\143\056\061\061\060\057\006\003\125\004\003
-\023\050\107\145\157\124\162\165\163\164\040\120\162\151\155\141
-\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171
+\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
+\162\145\124\162\165\163\164\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\030\254\265\152\375\151\266\025\072\143\154\257\332\372
-\304\241
+\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030
+\131\320
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
@@ -4639,483 +4175,438 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "thawte Primary Root CA"
+# Certificate "Secure Global CA"
 #
-# Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d
-# Subject: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Not Valid Before: Fri Nov 17 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): 8C:CA:DC:0B:22:CE:F5:BE:72:AC:41:1A:11:A8:D8:12
-# Fingerprint (SHA1): 91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
+# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US
+# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
+# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US
+# Not Valid Before: Tue Nov 07 19:42:28 2006
+# Not Valid After : Mon Dec 31 19:52:06 2029
+# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE
+# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA"
+CKA_LABEL UTF8 "Secure Global CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006
-\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101
+\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
+\162\145\040\107\154\157\142\141\154\040\103\101
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006
-\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101
+\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
+\162\145\040\107\154\157\142\141\154\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333
-\053\155
+\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370
+\352\245
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\004\040\060\202\003\010\240\003\002\001\002\002\020\064
-\116\325\127\040\325\355\354\111\364\057\316\067\333\053\155\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\251\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025
-\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054
-\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023\037
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
-\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061
-\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060
-\060\066\040\164\150\141\167\164\145\054\040\111\156\143\056\040
-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144
-\040\165\163\145\040\157\156\154\171\061\037\060\035\006\003\125
-\004\003\023\026\164\150\141\167\164\145\040\120\162\151\155\141
-\162\171\040\122\157\157\164\040\103\101\060\036\027\015\060\066
-\061\061\061\067\060\060\060\060\060\060\132\027\015\063\066\060
-\067\061\066\062\063\065\071\065\071\132\060\201\251\061\013\060
-\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006\003
-\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156\143
-\056\061\050\060\046\006\003\125\004\013\023\037\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\123\145\162\166\151\143
-\145\163\040\104\151\166\151\163\151\157\156\061\070\060\066\006
-\003\125\004\013\023\057\050\143\051\040\062\060\060\066\040\164
-\150\141\167\164\145\054\040\111\156\143\056\040\055\040\106\157
-\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145
-\040\157\156\154\171\061\037\060\035\006\003\125\004\003\023\026
-\164\150\141\167\164\145\040\120\162\151\155\141\162\171\040\122
-\157\157\164\040\103\101\060\202\001\042\060\015\006\011\052\206
+\060\202\003\274\060\202\002\244\240\003\002\001\002\002\020\007
+\126\042\244\350\324\212\211\115\364\023\310\360\370\352\245\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\112
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060
+\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162
+\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061
+\031\060\027\006\003\125\004\003\023\020\123\145\143\165\162\145
+\040\107\154\157\142\141\154\040\103\101\060\036\027\015\060\066
+\061\061\060\067\061\071\064\062\062\070\132\027\015\062\071\061
+\062\063\061\061\071\065\062\060\066\132\060\112\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125
+\004\012\023\027\123\145\143\165\162\145\124\162\165\163\164\040
+\103\157\162\160\157\162\141\164\151\157\156\061\031\060\027\006
+\003\125\004\003\023\020\123\145\143\165\162\145\040\107\154\157
+\142\141\154\040\103\101\060\202\001\042\060\015\006\011\052\206
 \110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
-\001\012\002\202\001\001\000\254\240\360\373\200\131\324\234\307
-\244\317\235\241\131\163\011\020\105\014\015\054\156\150\361\154
-\133\110\150\111\131\067\374\013\063\031\302\167\177\314\020\055
-\225\064\034\346\353\115\011\247\034\322\270\311\227\066\002\267
-\211\324\044\137\006\300\314\104\224\224\215\002\142\157\353\132
-\335\021\215\050\232\134\204\220\020\172\015\275\164\146\057\152
-\070\240\342\325\124\104\353\035\007\237\007\272\157\356\351\375
-\116\013\051\365\076\204\240\001\361\234\253\370\034\176\211\244
-\350\241\330\161\145\015\243\121\173\356\274\322\042\140\015\271
-\133\235\337\272\374\121\133\013\257\230\262\351\056\351\004\350
-\142\207\336\053\310\327\116\301\114\144\036\335\317\207\130\272
-\112\117\312\150\007\035\034\235\112\306\325\057\221\314\174\161
-\162\034\305\300\147\353\062\375\311\222\134\224\332\205\300\233
-\277\123\175\053\011\364\214\235\221\037\227\152\122\313\336\011
-\066\244\167\330\173\207\120\104\325\076\156\051\151\373\071\111
-\046\036\011\245\200\173\100\055\353\350\047\205\311\376\141\375
-\176\346\174\227\035\325\235\002\003\001\000\001\243\102\060\100
-\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001
-\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
-\006\060\035\006\003\125\035\016\004\026\004\024\173\133\105\317
-\257\316\313\172\375\061\222\032\152\266\363\106\353\127\110\120
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
-\202\001\001\000\171\021\300\113\263\221\266\374\360\351\147\324
-\015\156\105\276\125\350\223\322\316\003\077\355\332\045\260\035
-\127\313\036\072\166\240\114\354\120\166\350\144\162\014\244\251
-\361\270\213\326\326\207\204\273\062\345\101\021\300\167\331\263
-\140\235\353\033\325\321\156\104\104\251\246\001\354\125\142\035
-\167\270\134\216\110\111\174\234\073\127\021\254\255\163\067\216
-\057\170\134\220\150\107\331\140\140\346\374\007\075\042\040\027
-\304\367\026\351\304\330\162\371\310\163\174\337\026\057\025\251
-\076\375\152\047\266\241\353\132\272\230\037\325\343\115\144\012
-\235\023\310\141\272\365\071\034\207\272\270\275\173\042\177\366
-\376\254\100\171\345\254\020\157\075\217\033\171\166\213\304\067
-\263\041\030\204\345\066\000\353\143\040\231\271\351\376\063\004
-\273\101\310\301\002\371\104\143\040\236\201\316\102\323\326\077
-\054\166\323\143\234\131\335\217\246\341\016\240\056\101\367\056
-\225\107\317\274\375\063\363\366\013\141\176\176\221\053\201\107
-\302\047\060\356\247\020\135\067\217\134\071\053\344\004\360\173
-\215\126\214\150
+\001\012\002\202\001\001\000\257\065\056\330\254\154\125\151\006
+\161\345\023\150\044\263\117\330\314\041\107\370\361\140\070\211
+\211\003\351\275\352\136\106\123\011\334\134\365\132\350\367\105
+\052\002\353\061\141\327\051\063\114\316\307\174\012\067\176\017
+\272\062\230\341\035\227\257\217\307\334\311\070\226\363\333\032
+\374\121\355\150\306\320\156\244\174\044\321\256\102\310\226\120
+\143\056\340\376\165\376\230\247\137\111\056\225\343\071\063\144
+\216\036\244\137\220\322\147\074\262\331\376\101\271\125\247\011
+\216\162\005\036\213\335\104\205\202\102\320\111\300\035\140\360
+\321\027\054\225\353\366\245\301\222\243\305\302\247\010\140\015
+\140\004\020\226\171\236\026\064\346\251\266\372\045\105\071\310
+\036\145\371\223\365\252\361\122\334\231\230\075\245\206\032\014
+\065\063\372\113\245\004\006\025\034\061\200\357\252\030\153\302
+\173\327\332\316\371\063\040\325\365\275\152\063\055\201\004\373
+\260\134\324\234\243\342\134\035\343\251\102\165\136\173\324\167
+\357\071\124\272\311\012\030\033\022\231\111\057\210\113\375\120
+\142\321\163\347\217\172\103\002\003\001\000\001\243\201\235\060
+\201\232\060\023\006\011\053\006\001\004\001\202\067\024\002\004
+\006\036\004\000\103\000\101\060\013\006\003\125\035\017\004\004
+\003\002\001\206\060\017\006\003\125\035\023\001\001\377\004\005
+\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024
+\257\104\004\302\101\176\110\203\333\116\071\002\354\354\204\172
+\346\316\311\244\060\064\006\003\125\035\037\004\055\060\053\060
+\051\240\047\240\045\206\043\150\164\164\160\072\057\057\143\162
+\154\056\163\145\143\165\162\145\164\162\165\163\164\056\143\157
+\155\057\123\107\103\101\056\143\162\154\060\020\006\011\053\006
+\001\004\001\202\067\025\001\004\003\002\001\000\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\143\032\010\100\175\244\136\123\015\167\330\172\256\037\015\013
+\121\026\003\357\030\174\310\343\257\152\130\223\024\140\221\262
+\204\334\210\116\276\071\212\072\363\346\202\211\135\001\067\263
+\253\044\244\025\016\222\065\132\112\104\136\116\127\372\165\316
+\037\110\316\146\364\074\100\046\222\230\154\033\356\044\106\014
+\027\263\122\245\333\245\221\221\317\067\323\157\347\047\010\072
+\116\031\037\072\247\130\134\027\317\171\077\213\344\247\323\046
+\043\235\046\017\130\151\374\107\176\262\320\215\213\223\277\051
+\117\103\151\164\166\147\113\317\007\214\346\002\367\265\341\264
+\103\265\113\055\024\237\371\334\046\015\277\246\107\164\006\330
+\210\321\072\051\060\204\316\322\071\200\142\033\250\307\127\111
+\274\152\125\121\147\025\112\276\065\007\344\325\165\230\067\171
+\060\024\333\051\235\154\305\151\314\107\125\242\060\367\314\134
+\177\302\303\230\034\153\116\026\200\353\172\170\145\105\242\000
+\032\257\014\015\125\144\064\110\270\222\271\361\264\120\051\362
+\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Tue Apr 30 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\064\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "thawte Primary Root CA"
-# Issuer: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Serial Number:34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d
-# Subject: CN=thawte Primary Root CA,OU="(c) 2006 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Not Valid Before: Fri Nov 17 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): 8C:CA:DC:0B:22:CE:F5:BE:72:AC:41:1A:11:A8:D8:12
-# Fingerprint (SHA1): 91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81
+# Trust for Certificate "Secure Global CA"
+# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US
+# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
+# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US
+# Not Valid Before: Tue Nov 07 19:42:28 2006
+# Not Valid After : Mon Dec 31 19:52:06 2029
+# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE
+# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA"
+CKA_LABEL UTF8 "Secure Global CA"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\221\306\326\356\076\212\310\143\204\345\110\302\231\051\134\165
-\154\201\173\201
+\072\104\163\132\345\201\220\037\044\206\141\106\036\073\234\304
+\137\365\072\033
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\214\312\334\013\042\316\365\276\162\254\101\032\021\250\330\022
+\317\364\047\015\324\355\334\145\026\111\155\075\332\277\156\336
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\251\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\066\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\037\060\035\006
-\003\125\004\003\023\026\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101
+\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
+\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
+\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
+\162\145\040\107\154\157\142\141\154\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\064\116\325\127\040\325\355\354\111\364\057\316\067\333
-\053\155
+\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370
+\352\245
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "VeriSign Class 3 Public Primary Certification Authority - G5"
+# Certificate "COMODO Certification Authority"
 #
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Wed Nov 08 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): CB:17:E4:31:67:3E:E2:09:FE:45:57:93:F3:0A:FA:1C
-# Fingerprint (SHA1): 4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5
+# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d
+# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Fri Dec 01 00:00:00 2006
+# Not Valid After : Mon Dec 31 23:59:59 2029
+# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75
+# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G5"
+CKA_LABEL UTF8 "COMODO Certification Authority"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\065
+\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
+\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\065
+\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
+\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153
-\073\112
+\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106
+\345\075
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\004\323\060\202\003\273\240\003\002\001\002\002\020\030
-\332\321\236\046\175\350\273\112\041\130\315\314\153\073\112\060
+\060\202\004\035\060\202\003\005\240\003\002\001\002\002\020\116
+\201\055\212\202\145\340\013\002\356\076\065\002\106\345\075\060
 \015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\312\061\013\060\011\006\003\125\004\006\023\002\125\123\061\027
-\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151\147
-\156\054\040\111\156\143\056\061\037\060\035\006\003\125\004\013
-\023\026\126\145\162\151\123\151\147\156\040\124\162\165\163\164
-\040\116\145\164\167\157\162\153\061\072\060\070\006\003\125\004
-\013\023\061\050\143\051\040\062\060\060\066\040\126\145\162\151
-\123\151\147\156\054\040\111\156\143\056\040\055\040\106\157\162
-\040\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040
-\157\156\154\171\061\105\060\103\006\003\125\004\003\023\074\126
-\145\162\151\123\151\147\156\040\103\154\141\163\163\040\063\040
-\120\165\142\154\151\143\040\120\162\151\155\141\162\171\040\103
+\201\061\013\060\011\006\003\125\004\006\023\002\107\102\061\033
+\060\031\006\003\125\004\010\023\022\107\162\145\141\164\145\162
+\040\115\141\156\143\150\145\163\164\145\162\061\020\060\016\006
+\003\125\004\007\023\007\123\141\154\146\157\162\144\061\032\060
+\030\006\003\125\004\012\023\021\103\117\115\117\104\117\040\103
+\101\040\114\151\155\151\164\145\144\061\047\060\045\006\003\125
+\004\003\023\036\103\117\115\117\104\117\040\103\145\162\164\151
+\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
+\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060
+\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065
+\071\132\060\201\201\061\013\060\011\006\003\125\004\006\023\002
+\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162\145
+\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162\061
+\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157\162
+\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115\117
+\104\117\040\103\101\040\114\151\155\151\164\145\144\061\047\060
+\045\006\003\125\004\003\023\036\103\117\115\117\104\117\040\103
 \145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\065\060\036\027\015\060
-\066\061\061\060\070\060\060\060\060\060\060\132\027\015\063\066
-\060\067\061\066\062\063\065\071\065\071\132\060\201\312\061\013
-\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006
-\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040
-\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126
-\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145
-\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061
-\050\143\051\040\062\060\060\066\040\126\145\162\151\123\151\147
-\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151
-\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142
-\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\055\040\107\065\060\202\001\042\060\015\006\011
-\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000
-\060\202\001\012\002\202\001\001\000\257\044\010\010\051\172\065
-\236\140\014\252\347\113\073\116\334\174\274\074\105\034\273\053
-\340\376\051\002\371\127\010\243\144\205\025\047\365\361\255\310
-\061\211\135\042\350\052\252\246\102\263\217\370\271\125\267\261
-\267\113\263\376\217\176\007\127\354\357\103\333\146\142\025\141
-\317\140\015\244\330\336\370\340\303\142\010\075\124\023\353\111
-\312\131\124\205\046\345\053\217\033\237\353\365\241\221\302\063
-\111\330\103\143\152\122\113\322\217\350\160\121\115\321\211\151
-\173\307\160\366\263\334\022\164\333\173\135\113\126\323\226\277
-\025\167\241\260\364\242\045\362\257\034\222\147\030\345\364\006
-\004\357\220\271\344\000\344\335\072\265\031\377\002\272\364\074
-\356\340\213\353\067\213\354\364\327\254\362\366\360\075\257\335
-\165\221\063\031\035\034\100\313\164\044\031\041\223\331\024\376
-\254\052\122\307\217\325\004\111\344\215\143\107\210\074\151\203
-\313\376\107\275\053\176\117\305\225\256\016\235\324\321\103\300
-\147\163\343\024\010\176\345\077\237\163\270\063\012\317\135\077
-\064\207\226\212\356\123\350\045\025\002\003\001\000\001\243\201
-\262\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005
-\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004
-\004\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001
-\014\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026
-\011\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007
-\006\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215
-\216\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026
-\043\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162
-\151\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157
-\056\147\151\146\060\035\006\003\125\035\016\004\026\004\024\177
-\323\145\247\302\335\354\273\360\060\011\363\103\071\372\002\257
-\063\061\063\060\015\006\011\052\206\110\206\367\015\001\001\005
-\005\000\003\202\001\001\000\223\044\112\060\137\142\317\330\032
-\230\057\075\352\334\231\055\275\167\366\245\171\042\070\354\304
-\247\240\170\022\255\142\016\105\160\144\305\347\227\146\055\230
-\011\176\137\257\326\314\050\145\362\001\252\010\032\107\336\371
-\371\174\222\132\010\151\040\015\331\076\155\156\074\015\156\330
-\346\006\221\100\030\271\370\301\355\337\333\101\252\340\226\040
-\311\315\144\025\070\201\311\224\356\242\204\051\013\023\157\216
-\333\014\335\045\002\333\244\213\031\104\322\101\172\005\151\112
-\130\117\140\312\176\202\152\013\002\252\045\027\071\265\333\177
-\347\204\145\052\225\212\275\206\336\136\201\026\203\055\020\314
-\336\375\250\202\052\155\050\037\015\013\304\345\347\032\046\031
-\341\364\021\157\020\265\225\374\347\102\005\062\333\316\235\121
-\136\050\266\236\205\323\133\357\245\175\105\100\162\216\267\016
-\153\016\006\373\063\065\110\161\270\235\047\213\304\145\137\015
-\206\166\234\104\172\366\225\134\366\135\062\010\063\244\124\266
-\030\077\150\134\362\102\112\205\070\124\203\137\321\350\054\362
-\254\021\326\250\355\143\152
+\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206
+\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
+\001\012\002\202\001\001\000\320\100\213\213\162\343\221\033\367
+\121\301\033\124\004\230\323\251\277\301\346\212\135\073\207\373
+\273\210\316\015\343\057\077\006\226\360\242\051\120\231\256\333
+\073\241\127\260\164\121\161\315\355\102\221\115\101\376\251\310
+\330\152\206\167\104\273\131\146\227\120\136\264\324\054\160\104
+\317\332\067\225\102\151\074\060\304\161\263\122\360\041\115\241
+\330\272\071\174\034\236\243\044\235\362\203\026\230\252\026\174
+\103\233\025\133\267\256\064\221\376\324\142\046\030\106\232\077
+\353\301\371\361\220\127\353\254\172\015\213\333\162\060\152\146
+\325\340\106\243\160\334\150\331\377\004\110\211\167\336\265\351
+\373\147\155\101\351\274\071\275\062\331\142\002\361\261\250\075
+\156\067\234\342\057\342\323\242\046\213\306\270\125\103\210\341
+\043\076\245\322\044\071\152\107\253\000\324\241\263\251\045\376
+\015\077\247\035\272\323\121\301\013\244\332\254\070\357\125\120
+\044\005\145\106\223\064\117\055\215\255\306\324\041\031\322\216
+\312\005\141\161\007\163\107\345\212\031\022\275\004\115\316\116
+\234\245\110\254\273\046\367\002\003\001\000\001\243\201\216\060
+\201\213\060\035\006\003\125\035\016\004\026\004\024\013\130\345
+\213\306\114\025\067\244\100\251\060\251\041\276\107\066\132\126
+\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
+\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\111\006\003\125\035\037\004\102\060\100\060\076\240
+\074\240\072\206\070\150\164\164\160\072\057\057\143\162\154\056
+\143\157\155\157\144\157\143\141\056\143\157\155\057\103\117\115
+\117\104\117\103\145\162\164\151\146\151\143\141\164\151\157\156
+\101\165\164\150\157\162\151\164\171\056\143\162\154\060\015\006
+\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
+\000\076\230\236\233\366\033\351\327\071\267\170\256\035\162\030
+\111\323\207\344\103\202\353\077\311\252\365\250\265\357\125\174
+\041\122\145\371\325\015\341\154\364\076\214\223\163\221\056\002
+\304\116\007\161\157\300\217\070\141\010\250\036\201\012\300\057
+\040\057\101\213\221\334\110\105\274\361\306\336\272\166\153\063
+\310\000\055\061\106\114\355\347\235\317\210\224\377\063\300\126
+\350\044\206\046\270\330\070\070\337\052\153\335\022\314\307\077
+\107\027\114\242\302\006\226\011\326\333\376\077\074\106\101\337
+\130\342\126\017\074\073\301\034\223\065\331\070\122\254\356\310
+\354\056\060\116\224\065\264\044\037\113\170\151\332\362\002\070
+\314\225\122\223\360\160\045\131\234\040\147\304\356\371\213\127
+\141\364\222\166\175\077\204\215\125\267\350\345\254\325\361\365
+\031\126\246\132\373\220\034\257\223\353\345\034\324\147\227\135
+\004\016\276\013\203\246\027\203\271\060\022\240\305\063\025\005
+\271\015\373\307\005\166\343\330\112\215\374\064\027\243\306\041
+\050\276\060\105\061\036\307\170\276\130\141\070\254\073\342\001
+\145
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Tue Apr 30 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\064\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G5"
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU="(c) 2006 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Wed Nov 08 00:00:00 2006
-# Not Valid After : Wed Jul 16 23:59:59 2036
-# Fingerprint (MD5): CB:17:E4:31:67:3E:E2:09:FE:45:57:93:F3:0A:FA:1C
-# Fingerprint (SHA1): 4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5
+# Trust for Certificate "COMODO Certification Authority"
+# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d
+# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Fri Dec 01 00:00:00 2006
+# Not Valid After : Mon Dec 31 23:59:59 2029
+# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75
+# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G5"
+CKA_LABEL UTF8 "COMODO Certification Authority"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\116\266\325\170\111\233\034\317\137\130\036\255\126\276\075\233
-\147\104\245\345
+\146\061\277\236\367\117\236\266\311\325\246\014\272\152\276\321
+\367\275\357\173
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\313\027\344\061\147\076\342\011\376\105\127\223\363\012\372\034
+\134\110\334\367\102\162\354\126\224\155\034\314\161\065\200\165
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\066\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\065
+\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
+\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\030\332\321\236\046\175\350\273\112\041\130\315\314\153
-\073\112
+\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106
+\345\075
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "SecureTrust CA"
+# Certificate "Network Solutions Certificate Authority"
 #
-# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
-# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
-# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
-# Not Valid Before: Tue Nov 07 19:31:18 2006
-# Not Valid After : Mon Dec 31 19:40:55 2029
-# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1
-# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11
+# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
+# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
+# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
+# Not Valid Before: Fri Dec 01 00:00:00 2006
+# Not Valid After : Mon Dec 31 23:59:59 2029
+# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E
+# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "SecureTrust CA"
+CKA_LABEL UTF8 "Network Solutions Certificate Authority"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
-\162\145\124\162\165\163\164\040\103\101
+\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
+\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
+\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
+\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
-\162\145\124\162\165\163\164\040\103\101
+\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
+\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
+\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
+\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030
-\131\320
+\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061
+\150\340
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\003\270\060\202\002\240\240\003\002\001\002\002\020\014
-\360\216\134\010\026\245\255\102\177\360\353\047\030\131\320\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\110
-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060
-\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162
-\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061
-\027\060\025\006\003\125\004\003\023\016\123\145\143\165\162\145
-\124\162\165\163\164\040\103\101\060\036\027\015\060\066\061\061
-\060\067\061\071\063\061\061\070\132\027\015\062\071\061\062\063
-\061\061\071\064\060\065\065\132\060\110\061\013\060\011\006\003
-\125\004\006\023\002\125\123\061\040\060\036\006\003\125\004\012
-\023\027\123\145\143\165\162\145\124\162\165\163\164\040\103\157
-\162\160\157\162\141\164\151\157\156\061\027\060\025\006\003\125
-\004\003\023\016\123\145\143\165\162\145\124\162\165\163\164\040
-\103\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
-\001\001\000\253\244\201\345\225\315\365\366\024\216\302\117\312
-\324\342\170\225\130\234\101\341\015\231\100\044\027\071\221\063
-\146\351\276\341\203\257\142\134\211\321\374\044\133\141\263\340
-\021\021\101\034\035\156\360\270\273\370\336\247\201\272\246\110
-\306\237\035\275\276\216\251\101\076\270\224\355\051\032\324\216
-\322\003\035\003\357\155\015\147\034\127\327\006\255\312\310\365
-\376\016\257\146\045\110\004\226\013\135\243\272\026\303\010\117
-\321\106\370\024\134\362\310\136\001\231\155\375\210\314\206\250
-\301\157\061\102\154\122\076\150\313\363\031\064\337\273\207\030
-\126\200\046\304\320\334\300\157\337\336\240\302\221\026\240\144
-\021\113\104\274\036\366\347\372\143\336\146\254\166\244\161\243
-\354\066\224\150\172\167\244\261\347\016\057\201\172\342\265\162
-\206\357\242\153\213\360\017\333\323\131\077\272\162\274\104\044
-\234\343\163\263\367\257\127\057\102\046\235\251\164\272\000\122
-\362\113\315\123\174\107\013\066\205\016\146\251\010\227\026\064
-\127\301\146\367\200\343\355\160\124\307\223\340\056\050\025\131
-\207\272\273\002\003\001\000\001\243\201\235\060\201\232\060\023
-\006\011\053\006\001\004\001\202\067\024\002\004\006\036\004\000
-\103\000\101\060\013\006\003\125\035\017\004\004\003\002\001\206
-\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001
-\377\060\035\006\003\125\035\016\004\026\004\024\102\062\266\026
-\372\004\375\376\135\113\172\303\375\367\114\100\035\132\103\257
-\060\064\006\003\125\035\037\004\055\060\053\060\051\240\047\240
-\045\206\043\150\164\164\160\072\057\057\143\162\154\056\163\145
-\143\165\162\145\164\162\165\163\164\056\143\157\155\057\123\124
-\103\101\056\143\162\154\060\020\006\011\053\006\001\004\001\202
-\067\025\001\004\003\002\001\000\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\202\001\001\000\060\355\117\112
-\341\130\072\122\162\133\265\246\243\145\030\246\273\121\073\167
-\351\235\352\323\237\134\340\105\145\173\015\312\133\342\160\120
-\262\224\005\024\256\111\307\215\101\007\022\163\224\176\014\043
-\041\375\274\020\177\140\020\132\162\365\230\016\254\354\271\177
-\335\172\157\135\323\034\364\377\210\005\151\102\251\005\161\310
-\267\254\046\350\056\264\214\152\377\161\334\270\261\337\231\274
-\174\041\124\053\344\130\242\273\127\051\256\236\251\243\031\046
-\017\231\056\010\260\357\375\151\317\231\032\011\215\343\247\237
-\053\311\066\064\173\044\263\170\114\225\027\244\006\046\036\266
-\144\122\066\137\140\147\331\234\305\005\164\013\347\147\043\322
-\010\374\210\351\256\213\177\341\060\364\067\176\375\306\062\332
-\055\236\104\060\060\154\356\007\336\322\064\374\322\377\100\366
-\113\364\146\106\006\124\246\362\062\012\143\046\060\153\233\321
-\334\213\107\272\341\271\325\142\320\242\240\364\147\005\170\051
-\143\032\157\004\326\370\306\114\243\232\261\067\264\215\345\050
-\113\035\236\054\302\270\150\274\355\002\356\061
+\060\202\003\346\060\202\002\316\240\003\002\001\002\002\020\127
+\313\063\157\302\134\026\346\107\026\027\343\220\061\150\340\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142
+\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041\060
+\037\006\003\125\004\012\023\030\116\145\164\167\157\162\153\040
+\123\157\154\165\164\151\157\156\163\040\114\056\114\056\103\056
+\061\060\060\056\006\003\125\004\003\023\047\116\145\164\167\157
+\162\153\040\123\157\154\165\164\151\157\156\163\040\103\145\162
+\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151
+\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060
+\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065
+\071\132\060\142\061\013\060\011\006\003\125\004\006\023\002\125
+\123\061\041\060\037\006\003\125\004\012\023\030\116\145\164\167
+\157\162\153\040\123\157\154\165\164\151\157\156\163\040\114\056
+\114\056\103\056\061\060\060\056\006\003\125\004\003\023\047\116
+\145\164\167\157\162\153\040\123\157\154\165\164\151\157\156\163
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206
+\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
+\001\012\002\202\001\001\000\344\274\176\222\060\155\306\330\216
+\053\013\274\106\316\340\047\226\336\336\371\372\022\323\074\063
+\163\263\004\057\274\161\214\345\237\266\042\140\076\137\135\316
+\011\377\202\014\033\232\121\120\032\046\211\335\325\141\135\031
+\334\022\017\055\012\242\103\135\027\320\064\222\040\352\163\317
+\070\054\006\046\011\172\162\367\372\120\062\370\302\223\323\151
+\242\043\316\101\261\314\344\325\037\066\321\212\072\370\214\143
+\342\024\131\151\355\015\323\177\153\350\270\003\345\117\152\345
+\230\143\151\110\005\276\056\377\063\266\351\227\131\151\370\147
+\031\256\223\141\226\104\025\323\162\260\077\274\152\175\354\110
+\177\215\303\253\252\161\053\123\151\101\123\064\265\260\271\305
+\006\012\304\260\105\365\101\135\156\211\105\173\075\073\046\214
+\164\302\345\322\321\175\262\021\324\373\130\062\042\232\200\311
+\334\375\014\351\177\136\003\227\316\073\000\024\207\047\160\070
+\251\216\156\263\047\166\230\121\340\005\343\041\253\032\325\205
+\042\074\051\265\232\026\305\200\250\364\273\153\060\217\057\106
+\002\242\261\014\042\340\323\002\003\001\000\001\243\201\227\060
+\201\224\060\035\006\003\125\035\016\004\026\004\024\041\060\311
+\373\000\327\116\230\332\207\252\052\320\247\056\261\100\061\247
+\114\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
+\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\122\006\003\125\035\037\004\113\060\111\060\107\240
+\105\240\103\206\101\150\164\164\160\072\057\057\143\162\154\056
+\156\145\164\163\157\154\163\163\154\056\143\157\155\057\116\145
+\164\167\157\162\153\123\157\154\165\164\151\157\156\163\103\145
+\162\164\151\146\151\143\141\164\145\101\165\164\150\157\162\151
+\164\171\056\143\162\154\060\015\006\011\052\206\110\206\367\015
+\001\001\005\005\000\003\202\001\001\000\273\256\113\347\267\127
+\353\177\252\055\267\163\107\205\152\301\344\245\035\344\347\074
+\351\364\131\145\167\265\172\133\132\215\045\066\340\172\227\056
+\070\300\127\140\203\230\006\203\237\271\166\172\156\120\340\272
+\210\054\374\105\314\030\260\231\225\121\016\354\035\270\210\377
+\207\120\034\202\302\343\340\062\200\277\240\013\107\310\303\061
+\357\231\147\062\200\117\027\041\171\014\151\134\336\136\064\256
+\002\265\046\352\120\337\177\030\145\054\311\362\143\341\251\007
+\376\174\161\037\153\063\044\152\036\005\367\005\150\300\152\022
+\313\056\136\141\313\256\050\323\176\302\264\146\221\046\137\074
+\056\044\137\313\130\017\353\050\354\257\021\226\363\334\173\157
+\300\247\210\362\123\167\263\140\136\256\256\050\332\065\054\157
+\064\105\323\046\341\336\354\133\117\047\153\026\174\275\104\004
+\030\202\263\211\171\027\020\161\075\172\242\026\116\365\001\315
+\244\154\145\150\241\111\166\134\103\311\330\274\066\147\154\245
+\224\265\324\314\271\275\152\065\126\041\336\330\303\353\373\313
+\244\140\114\260\125\240\240\173\127\262
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "SecureTrust CA"
-# Issuer: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
-# Serial Number:0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
-# Subject: CN=SecureTrust CA,O=SecureTrust Corporation,C=US
-# Not Valid Before: Tue Nov 07 19:31:18 2006
-# Not Valid After : Mon Dec 31 19:40:55 2029
-# Fingerprint (MD5): DC:32:C3:A7:6D:25:57:C7:68:09:9D:EA:2D:A9:A2:D1
-# Fingerprint (SHA1): 87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11
+# Trust for Certificate "Network Solutions Certificate Authority"
+# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
+# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
+# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
+# Not Valid Before: Fri Dec 01 00:00:00 2006
+# Not Valid After : Mon Dec 31 23:59:59 2029
+# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E
+# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "SecureTrust CA"
+CKA_LABEL UTF8 "Network Solutions Certificate Authority"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\207\202\306\303\004\065\073\317\322\226\222\322\131\076\175\104
-\331\064\377\021
+\164\370\243\303\357\347\263\220\006\113\203\220\074\041\144\140
+\040\345\337\316
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\334\062\303\247\155\045\127\307\150\011\235\352\055\251\242\321
+\323\363\246\026\300\372\153\035\131\261\055\226\115\016\021\056
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\110\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\027\060\025\006\003\125\004\003\023\016\123\145\143\165
-\162\145\124\162\165\163\164\040\103\101
+\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
+\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
+\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
+\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
+\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\014\360\216\134\010\026\245\255\102\177\360\353\047\030
-\131\320
+\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061
+\150\340
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
@@ -5123,136 +4614,129 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "Secure Global CA"
+# Certificate "COMODO ECC Certification Authority"
 #
-# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US
-# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
-# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US
-# Not Valid Before: Tue Nov 07 19:42:28 2006
-# Not Valid After : Mon Dec 31 19:52:06 2029
-# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE
-# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B
+# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a
+# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Thu Mar 06 00:00:00 2008
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23
+# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Secure Global CA"
+CKA_LABEL UTF8 "COMODO ECC Certification Authority"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
-\162\145\040\107\154\157\142\141\154\040\103\101
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
-\162\145\040\107\154\157\142\141\154\040\103\101
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370
-\352\245
+\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143
+\231\052
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\003\274\060\202\002\244\240\003\002\001\002\002\020\007
-\126\042\244\350\324\212\211\115\364\023\310\360\370\352\245\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\112
-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\040\060
-\036\006\003\125\004\012\023\027\123\145\143\165\162\145\124\162
-\165\163\164\040\103\157\162\160\157\162\141\164\151\157\156\061
-\031\060\027\006\003\125\004\003\023\020\123\145\143\165\162\145
-\040\107\154\157\142\141\154\040\103\101\060\036\027\015\060\066
-\061\061\060\067\061\071\064\062\062\070\132\027\015\062\071\061
-\062\063\061\061\071\065\062\060\066\132\060\112\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\040\060\036\006\003\125
-\004\012\023\027\123\145\143\165\162\145\124\162\165\163\164\040
-\103\157\162\160\157\162\141\164\151\157\156\061\031\060\027\006
-\003\125\004\003\023\020\123\145\143\165\162\145\040\107\154\157
-\142\141\154\040\103\101\060\202\001\042\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
-\001\012\002\202\001\001\000\257\065\056\330\254\154\125\151\006
-\161\345\023\150\044\263\117\330\314\041\107\370\361\140\070\211
-\211\003\351\275\352\136\106\123\011\334\134\365\132\350\367\105
-\052\002\353\061\141\327\051\063\114\316\307\174\012\067\176\017
-\272\062\230\341\035\227\257\217\307\334\311\070\226\363\333\032
-\374\121\355\150\306\320\156\244\174\044\321\256\102\310\226\120
-\143\056\340\376\165\376\230\247\137\111\056\225\343\071\063\144
-\216\036\244\137\220\322\147\074\262\331\376\101\271\125\247\011
-\216\162\005\036\213\335\104\205\202\102\320\111\300\035\140\360
-\321\027\054\225\353\366\245\301\222\243\305\302\247\010\140\015
-\140\004\020\226\171\236\026\064\346\251\266\372\045\105\071\310
-\036\145\371\223\365\252\361\122\334\231\230\075\245\206\032\014
-\065\063\372\113\245\004\006\025\034\061\200\357\252\030\153\302
-\173\327\332\316\371\063\040\325\365\275\152\063\055\201\004\373
-\260\134\324\234\243\342\134\035\343\251\102\165\136\173\324\167
-\357\071\124\272\311\012\030\033\022\231\111\057\210\113\375\120
-\142\321\163\347\217\172\103\002\003\001\000\001\243\201\235\060
-\201\232\060\023\006\011\053\006\001\004\001\202\067\024\002\004
-\006\036\004\000\103\000\101\060\013\006\003\125\035\017\004\004
-\003\002\001\206\060\017\006\003\125\035\023\001\001\377\004\005
-\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004\024
-\257\104\004\302\101\176\110\203\333\116\071\002\354\354\204\172
-\346\316\311\244\060\064\006\003\125\035\037\004\055\060\053\060
-\051\240\047\240\045\206\043\150\164\164\160\072\057\057\143\162
-\154\056\163\145\143\165\162\145\164\162\165\163\164\056\143\157
-\155\057\123\107\103\101\056\143\162\154\060\020\006\011\053\006
-\001\004\001\202\067\025\001\004\003\002\001\000\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\143\032\010\100\175\244\136\123\015\167\330\172\256\037\015\013
-\121\026\003\357\030\174\310\343\257\152\130\223\024\140\221\262
-\204\334\210\116\276\071\212\072\363\346\202\211\135\001\067\263
-\253\044\244\025\016\222\065\132\112\104\136\116\127\372\165\316
-\037\110\316\146\364\074\100\046\222\230\154\033\356\044\106\014
-\027\263\122\245\333\245\221\221\317\067\323\157\347\047\010\072
-\116\031\037\072\247\130\134\027\317\171\077\213\344\247\323\046
-\043\235\046\017\130\151\374\107\176\262\320\215\213\223\277\051
-\117\103\151\164\166\147\113\317\007\214\346\002\367\265\341\264
-\103\265\113\055\024\237\371\334\046\015\277\246\107\164\006\330
-\210\321\072\051\060\204\316\322\071\200\142\033\250\307\127\111
-\274\152\125\121\147\025\112\276\065\007\344\325\165\230\067\171
-\060\024\333\051\235\154\305\151\314\107\125\242\060\367\314\134
-\177\302\303\230\034\153\116\026\200\353\172\170\145\105\242\000
-\032\257\014\015\125\144\064\110\270\222\271\361\264\120\051\362
-\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026
+\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037
+\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060
+\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013
+\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006
+\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141
+\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004
+\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003
+\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114
+\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023
+\042\103\117\115\117\104\117\040\105\103\103\040\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
+\151\164\171\060\036\027\015\060\070\060\063\060\066\060\060\060
+\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071
+\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023
+\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162
+\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162
+\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157
+\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115
+\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053
+\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040
+\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\060\166\060\020\006
+\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003
+\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221
+\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341
+\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344
+\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011
+\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011
+\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262
+\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026
+\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224
+\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377
+\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075
+\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254
+\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346
+\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316
+\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223
+\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157
+\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346
+\334\335\363\377\035\054\072\026\127\331\222\071\326
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "Secure Global CA"
-# Issuer: CN=Secure Global CA,O=SecureTrust Corporation,C=US
-# Serial Number:07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
-# Subject: CN=Secure Global CA,O=SecureTrust Corporation,C=US
-# Not Valid Before: Tue Nov 07 19:42:28 2006
-# Not Valid After : Mon Dec 31 19:52:06 2029
-# Fingerprint (MD5): CF:F4:27:0D:D4:ED:DC:65:16:49:6D:3D:DA:BF:6E:DE
-# Fingerprint (SHA1): 3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B
+# Trust for Certificate "COMODO ECC Certification Authority"
+# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a
+# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
+# Not Valid Before: Thu Mar 06 00:00:00 2008
+# Not Valid After : Mon Jan 18 23:59:59 2038
+# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23
+# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Secure Global CA"
+CKA_LABEL UTF8 "COMODO ECC Certification Authority"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\072\104\163\132\345\201\220\037\044\206\141\106\036\073\234\304
-\137\365\072\033
+\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216
+\055\223\303\021
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\317\364\047\015\324\355\334\145\026\111\155\075\332\277\156\336
+\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\112\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\040\060\036\006\003\125\004\012\023\027\123\145\143\165\162\145
-\124\162\165\163\164\040\103\157\162\160\157\162\141\164\151\157
-\156\061\031\060\027\006\003\125\004\003\023\020\123\145\143\165
-\162\145\040\107\154\157\142\141\154\040\103\101
+\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
+\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
+\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
+\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
+\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
+\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
+\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\007\126\042\244\350\324\212\211\115\364\023\310\360\370
-\352\245
+\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143
+\231\052
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
@@ -5260,1142 +4744,283 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "COMODO Certification Authority"
+# Certificate "OISTE WISeKey Global Root GA CA"
 #
-# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d
-# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Not Valid Before: Fri Dec 01 00:00:00 2006
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75
-# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B
+# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
+# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
+# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
+# Not Valid Before: Sun Dec 11 16:03:44 2005
+# Not Valid After : Fri Dec 11 16:09:51 2037
+# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93
+# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "COMODO Certification Authority"
+CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
-\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171
+\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
+\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
+\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
+\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
+\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
+\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
+\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
+\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
+\141\154\040\122\157\157\164\040\107\101\040\103\101
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
-\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171
+\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
+\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
+\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
+\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
+\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
+\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
+\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
+\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
+\141\154\040\122\157\157\164\040\107\101\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106
-\345\075
+\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124
+\337\232
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\004\035\060\202\003\005\240\003\002\001\002\002\020\116
-\201\055\212\202\145\340\013\002\356\076\065\002\106\345\075\060
+\060\202\003\361\060\202\002\331\240\003\002\001\002\002\020\101
+\075\162\307\364\153\037\201\103\175\361\322\050\124\337\232\060
 \015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\201\061\013\060\011\006\003\125\004\006\023\002\107\102\061\033
-\060\031\006\003\125\004\010\023\022\107\162\145\141\164\145\162
-\040\115\141\156\143\150\145\163\164\145\162\061\020\060\016\006
-\003\125\004\007\023\007\123\141\154\146\157\162\144\061\032\060
-\030\006\003\125\004\012\023\021\103\117\115\117\104\117\040\103
-\101\040\114\151\155\151\164\145\144\061\047\060\045\006\003\125
-\004\003\023\036\103\117\115\117\104\117\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060
-\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065
-\071\132\060\201\201\061\013\060\011\006\003\125\004\006\023\002
-\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162\145
-\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162\061
-\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157\162
-\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115\117
-\104\117\040\103\101\040\114\151\155\151\164\145\144\061\047\060
-\045\006\003\125\004\003\023\036\103\117\115\117\104\117\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
-\001\012\002\202\001\001\000\320\100\213\213\162\343\221\033\367
-\121\301\033\124\004\230\323\251\277\301\346\212\135\073\207\373
-\273\210\316\015\343\057\077\006\226\360\242\051\120\231\256\333
-\073\241\127\260\164\121\161\315\355\102\221\115\101\376\251\310
-\330\152\206\167\104\273\131\146\227\120\136\264\324\054\160\104
-\317\332\067\225\102\151\074\060\304\161\263\122\360\041\115\241
-\330\272\071\174\034\236\243\044\235\362\203\026\230\252\026\174
-\103\233\025\133\267\256\064\221\376\324\142\046\030\106\232\077
-\353\301\371\361\220\127\353\254\172\015\213\333\162\060\152\146
-\325\340\106\243\160\334\150\331\377\004\110\211\167\336\265\351
-\373\147\155\101\351\274\071\275\062\331\142\002\361\261\250\075
-\156\067\234\342\057\342\323\242\046\213\306\270\125\103\210\341
-\043\076\245\322\044\071\152\107\253\000\324\241\263\251\045\376
-\015\077\247\035\272\323\121\301\013\244\332\254\070\357\125\120
-\044\005\145\106\223\064\117\055\215\255\306\324\041\031\322\216
-\312\005\141\161\007\163\107\345\212\031\022\275\004\115\316\116
-\234\245\110\254\273\046\367\002\003\001\000\001\243\201\216\060
-\201\213\060\035\006\003\125\035\016\004\026\004\024\013\130\345
-\213\306\114\025\067\244\100\251\060\251\041\276\107\066\132\126
-\377\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
-\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
-\001\377\060\111\006\003\125\035\037\004\102\060\100\060\076\240
-\074\240\072\206\070\150\164\164\160\072\057\057\143\162\154\056
-\143\157\155\157\144\157\143\141\056\143\157\155\057\103\117\115
-\117\104\117\103\145\162\164\151\146\151\143\141\164\151\157\156
-\101\165\164\150\157\162\151\164\171\056\143\162\154\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
-\000\076\230\236\233\366\033\351\327\071\267\170\256\035\162\030
-\111\323\207\344\103\202\353\077\311\252\365\250\265\357\125\174
-\041\122\145\371\325\015\341\154\364\076\214\223\163\221\056\002
-\304\116\007\161\157\300\217\070\141\010\250\036\201\012\300\057
-\040\057\101\213\221\334\110\105\274\361\306\336\272\166\153\063
-\310\000\055\061\106\114\355\347\235\317\210\224\377\063\300\126
-\350\044\206\046\270\330\070\070\337\052\153\335\022\314\307\077
-\107\027\114\242\302\006\226\011\326\333\376\077\074\106\101\337
-\130\342\126\017\074\073\301\034\223\065\331\070\122\254\356\310
-\354\056\060\116\224\065\264\044\037\113\170\151\332\362\002\070
-\314\225\122\223\360\160\045\131\234\040\147\304\356\371\213\127
-\141\364\222\166\175\077\204\215\125\267\350\345\254\325\361\365
-\031\126\246\132\373\220\034\257\223\353\345\034\324\147\227\135
-\004\016\276\013\203\246\027\203\271\060\022\240\305\063\025\005
-\271\015\373\307\005\166\343\330\112\215\374\064\027\243\306\041
-\050\276\060\105\061\036\307\170\276\130\141\070\254\073\342\001
-\145
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "COMODO Certification Authority"
-# Issuer: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Serial Number:4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d
-# Subject: CN=COMODO Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Not Valid Before: Fri Dec 01 00:00:00 2006
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): 5C:48:DC:F7:42:72:EC:56:94:6D:1C:CC:71:35:80:75
-# Fingerprint (SHA1): 66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "COMODO Certification Authority"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\146\061\277\236\367\117\236\266\311\325\246\014\272\152\276\321
-\367\275\357\173
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\134\110\334\367\102\162\354\126\224\155\034\314\161\065\200\165
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\201\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\047\060\045\006
-\003\125\004\003\023\036\103\117\115\117\104\117\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\116\201\055\212\202\145\340\013\002\356\076\065\002\106
-\345\075
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Network Solutions Certificate Authority"
-#
-# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
-# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
-# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
-# Not Valid Before: Fri Dec 01 00:00:00 2006
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E
-# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Network Solutions Certificate Authority"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
-\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
-\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
-\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
-\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
-\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
-\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
-\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
-\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061
-\150\340
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\346\060\202\002\316\240\003\002\001\002\002\020\127
-\313\063\157\302\134\026\346\107\026\027\343\220\061\150\340\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\142
-\061\013\060\011\006\003\125\004\006\023\002\125\123\061\041\060
-\037\006\003\125\004\012\023\030\116\145\164\167\157\162\153\040
-\123\157\154\165\164\151\157\156\163\040\114\056\114\056\103\056
-\061\060\060\056\006\003\125\004\003\023\047\116\145\164\167\157
-\162\153\040\123\157\154\165\164\151\157\156\163\040\103\145\162
-\164\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151
-\164\171\060\036\027\015\060\066\061\062\060\061\060\060\060\060
-\060\060\132\027\015\062\071\061\062\063\061\062\063\065\071\065
-\071\132\060\142\061\013\060\011\006\003\125\004\006\023\002\125
-\123\061\041\060\037\006\003\125\004\012\023\030\116\145\164\167
-\157\162\153\040\123\157\154\165\164\151\157\156\163\040\114\056
-\114\056\103\056\061\060\060\056\006\003\125\004\003\023\047\116
-\145\164\167\157\162\153\040\123\157\154\165\164\151\157\156\163
-\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
-\150\157\162\151\164\171\060\202\001\042\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202
-\001\012\002\202\001\001\000\344\274\176\222\060\155\306\330\216
-\053\013\274\106\316\340\047\226\336\336\371\372\022\323\074\063
-\163\263\004\057\274\161\214\345\237\266\042\140\076\137\135\316
-\011\377\202\014\033\232\121\120\032\046\211\335\325\141\135\031
-\334\022\017\055\012\242\103\135\027\320\064\222\040\352\163\317
-\070\054\006\046\011\172\162\367\372\120\062\370\302\223\323\151
-\242\043\316\101\261\314\344\325\037\066\321\212\072\370\214\143
-\342\024\131\151\355\015\323\177\153\350\270\003\345\117\152\345
-\230\143\151\110\005\276\056\377\063\266\351\227\131\151\370\147
-\031\256\223\141\226\104\025\323\162\260\077\274\152\175\354\110
-\177\215\303\253\252\161\053\123\151\101\123\064\265\260\271\305
-\006\012\304\260\105\365\101\135\156\211\105\173\075\073\046\214
-\164\302\345\322\321\175\262\021\324\373\130\062\042\232\200\311
-\334\375\014\351\177\136\003\227\316\073\000\024\207\047\160\070
-\251\216\156\263\047\166\230\121\340\005\343\041\253\032\325\205
-\042\074\051\265\232\026\305\200\250\364\273\153\060\217\057\106
-\002\242\261\014\042\340\323\002\003\001\000\001\243\201\227\060
-\201\224\060\035\006\003\125\035\016\004\026\004\024\041\060\311
-\373\000\327\116\230\332\207\252\052\320\247\056\261\100\061\247
-\114\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
-\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
-\001\377\060\122\006\003\125\035\037\004\113\060\111\060\107\240
-\105\240\103\206\101\150\164\164\160\072\057\057\143\162\154\056
-\156\145\164\163\157\154\163\163\154\056\143\157\155\057\116\145
-\164\167\157\162\153\123\157\154\165\164\151\157\156\163\103\145
-\162\164\151\146\151\143\141\164\145\101\165\164\150\157\162\151
-\164\171\056\143\162\154\060\015\006\011\052\206\110\206\367\015
-\001\001\005\005\000\003\202\001\001\000\273\256\113\347\267\127
-\353\177\252\055\267\163\107\205\152\301\344\245\035\344\347\074
-\351\364\131\145\167\265\172\133\132\215\045\066\340\172\227\056
-\070\300\127\140\203\230\006\203\237\271\166\172\156\120\340\272
-\210\054\374\105\314\030\260\231\225\121\016\354\035\270\210\377
-\207\120\034\202\302\343\340\062\200\277\240\013\107\310\303\061
-\357\231\147\062\200\117\027\041\171\014\151\134\336\136\064\256
-\002\265\046\352\120\337\177\030\145\054\311\362\143\341\251\007
-\376\174\161\037\153\063\044\152\036\005\367\005\150\300\152\022
-\313\056\136\141\313\256\050\323\176\302\264\146\221\046\137\074
-\056\044\137\313\130\017\353\050\354\257\021\226\363\334\173\157
-\300\247\210\362\123\167\263\140\136\256\256\050\332\065\054\157
-\064\105\323\046\341\336\354\133\117\047\153\026\174\275\104\004
-\030\202\263\211\171\027\020\161\075\172\242\026\116\365\001\315
-\244\154\145\150\241\111\166\134\103\311\330\274\066\147\154\245
-\224\265\324\314\271\275\152\065\126\041\336\330\303\353\373\313
-\244\140\114\260\125\240\240\173\127\262
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "Network Solutions Certificate Authority"
-# Issuer: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
-# Serial Number:57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
-# Subject: CN=Network Solutions Certificate Authority,O=Network Solutions L.L.C.,C=US
-# Not Valid Before: Fri Dec 01 00:00:00 2006
-# Not Valid After : Mon Dec 31 23:59:59 2029
-# Fingerprint (MD5): D3:F3:A6:16:C0:FA:6B:1D:59:B1:2D:96:4D:0E:11:2E
-# Fingerprint (SHA1): 74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Network Solutions Certificate Authority"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\164\370\243\303\357\347\263\220\006\113\203\220\074\041\144\140
-\040\345\337\316
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\323\363\246\026\300\372\153\035\131\261\055\226\115\016\021\056
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\041\060\037\006\003\125\004\012\023\030\116\145\164\167\157\162
-\153\040\123\157\154\165\164\151\157\156\163\040\114\056\114\056
-\103\056\061\060\060\056\006\003\125\004\003\023\047\116\145\164
-\167\157\162\153\040\123\157\154\165\164\151\157\156\163\040\103
-\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\127\313\063\157\302\134\026\346\107\026\027\343\220\061
-\150\340
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "COMODO ECC Certification Authority"
-#
-# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a
-# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Not Valid Before: Thu Mar 06 00:00:00 2008
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23
-# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "COMODO ECC Certification Authority"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
-\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
-\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143
-\231\052
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\002\211\060\202\002\017\240\003\002\001\002\002\020\037
-\107\257\252\142\000\160\120\124\114\001\236\233\143\231\052\060
-\012\006\010\052\206\110\316\075\004\003\003\060\201\205\061\013
-\060\011\006\003\125\004\006\023\002\107\102\061\033\060\031\006
-\003\125\004\010\023\022\107\162\145\141\164\145\162\040\115\141
-\156\143\150\145\163\164\145\162\061\020\060\016\006\003\125\004
-\007\023\007\123\141\154\146\157\162\144\061\032\060\030\006\003
-\125\004\012\023\021\103\117\115\117\104\117\040\103\101\040\114
-\151\155\151\164\145\144\061\053\060\051\006\003\125\004\003\023
-\042\103\117\115\117\104\117\040\105\103\103\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\060\036\027\015\060\070\060\063\060\066\060\060\060
-\060\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071
-\065\071\132\060\201\205\061\013\060\011\006\003\125\004\006\023
-\002\107\102\061\033\060\031\006\003\125\004\010\023\022\107\162
-\145\141\164\145\162\040\115\141\156\143\150\145\163\164\145\162
-\061\020\060\016\006\003\125\004\007\023\007\123\141\154\146\157
-\162\144\061\032\060\030\006\003\125\004\012\023\021\103\117\115
-\117\104\117\040\103\101\040\114\151\155\151\164\145\144\061\053
-\060\051\006\003\125\004\003\023\042\103\117\115\117\104\117\040
-\105\103\103\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\060\166\060\020\006
-\007\052\206\110\316\075\002\001\006\005\053\201\004\000\042\003
-\142\000\004\003\107\173\057\165\311\202\025\205\373\165\344\221
-\026\324\253\142\231\365\076\122\013\006\316\101\000\177\227\341
-\012\044\074\035\001\004\356\075\322\215\011\227\014\340\165\344
-\372\373\167\212\052\365\003\140\113\066\213\026\043\026\255\011
-\161\364\112\364\050\120\264\376\210\034\156\077\154\057\057\011
-\131\133\245\133\013\063\231\342\303\075\211\371\152\054\357\262
-\323\006\351\243\102\060\100\060\035\006\003\125\035\016\004\026
-\004\024\165\161\247\031\110\031\274\235\235\352\101\107\337\224
-\304\110\167\231\323\171\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377
-\004\005\060\003\001\001\377\060\012\006\010\052\206\110\316\075
-\004\003\003\003\150\000\060\145\002\061\000\357\003\133\172\254
-\267\170\012\162\267\210\337\377\265\106\024\011\012\372\240\346
-\175\010\306\032\207\275\030\250\163\275\046\312\140\014\235\316
-\231\237\317\134\017\060\341\276\024\061\352\002\060\024\364\223
-\074\111\247\063\172\220\106\107\263\143\175\023\233\116\267\157
-\030\067\200\123\376\335\040\340\065\232\066\321\307\001\271\346
-\334\335\363\377\035\054\072\026\127\331\222\071\326
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "COMODO ECC Certification Authority"
-# Issuer: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Serial Number:1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a
-# Subject: CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB
-# Not Valid Before: Thu Mar 06 00:00:00 2008
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 7C:62:FF:74:9D:31:53:5E:68:4A:D5:78:AA:1E:BF:23
-# Fingerprint (SHA1): 9F:74:4E:9F:2B:4D:BA:EC:0F:31:2C:50:B6:56:3B:8E:2D:93:C3:11
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "COMODO ECC Certification Authority"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\237\164\116\237\053\115\272\354\017\061\054\120\266\126\073\216
-\055\223\303\021
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\174\142\377\164\235\061\123\136\150\112\325\170\252\036\277\043
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\205\061\013\060\011\006\003\125\004\006\023\002\107\102
-\061\033\060\031\006\003\125\004\010\023\022\107\162\145\141\164
-\145\162\040\115\141\156\143\150\145\163\164\145\162\061\020\060
-\016\006\003\125\004\007\023\007\123\141\154\146\157\162\144\061
-\032\060\030\006\003\125\004\012\023\021\103\117\115\117\104\117
-\040\103\101\040\114\151\155\151\164\145\144\061\053\060\051\006
-\003\125\004\003\023\042\103\117\115\117\104\117\040\105\103\103
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\037\107\257\252\142\000\160\120\124\114\001\236\233\143
-\231\052
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "OISTE WISeKey Global Root GA CA"
-#
-# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
-# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
-# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
-# Not Valid Before: Sun Dec 11 16:03:44 2005
-# Not Valid After : Fri Dec 11 16:09:51 2037
-# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93
-# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
-\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
-\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
-\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
-\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
-\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
-\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
-\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
-\141\154\040\122\157\157\164\040\107\101\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
-\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
-\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
-\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
-\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
-\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
-\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
-\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
-\141\154\040\122\157\157\164\040\107\101\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124
-\337\232
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\361\060\202\002\331\240\003\002\001\002\002\020\101
-\075\162\307\364\153\037\201\103\175\361\322\050\124\337\232\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\212\061\013\060\011\006\003\125\004\006\023\002\103\110\061\020
-\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145\171
-\061\033\060\031\006\003\125\004\013\023\022\103\157\160\171\162
-\151\147\150\164\040\050\143\051\040\062\060\060\065\061\042\060
-\040\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157
-\165\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145
-\144\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124
-\105\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154
-\040\122\157\157\164\040\107\101\040\103\101\060\036\027\015\060
-\065\061\062\061\061\061\066\060\063\064\064\132\027\015\063\067
-\061\062\061\061\061\066\060\071\065\061\132\060\201\212\061\013
-\060\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006
-\003\125\004\012\023\007\127\111\123\145\113\145\171\061\033\060
-\031\006\003\125\004\013\023\022\103\157\160\171\162\151\147\150
-\164\040\050\143\051\040\062\060\060\065\061\042\060\040\006\003
-\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156\144
-\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061\050
-\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040\127
-\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122\157
-\157\164\040\107\101\040\103\101\060\202\001\042\060\015\006\011
-\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000
-\060\202\001\012\002\202\001\001\000\313\117\263\000\233\075\066
-\335\371\321\111\152\153\020\111\037\354\330\053\262\306\370\062
-\201\051\103\225\114\232\031\043\041\025\105\336\343\310\034\121
-\125\133\256\223\350\067\377\053\153\351\324\352\276\052\335\250
-\121\053\327\146\303\141\134\140\002\310\365\316\162\173\073\270
-\362\116\145\010\232\315\244\152\031\301\001\273\163\246\327\366
-\303\335\315\274\244\213\265\231\141\270\001\242\243\324\115\324
-\005\075\221\255\370\264\010\161\144\257\160\361\034\153\176\366
-\303\167\235\044\163\173\344\014\214\341\331\066\341\231\213\005
-\231\013\355\105\061\011\312\302\000\333\367\162\240\226\252\225
-\207\320\216\307\266\141\163\015\166\146\214\334\033\264\143\242
-\237\177\223\023\060\361\241\047\333\331\377\054\125\210\221\240
-\340\117\007\260\050\126\214\030\033\227\104\216\211\335\340\027
-\156\347\052\357\217\071\012\061\204\202\330\100\024\111\056\172
-\101\344\247\376\343\144\314\301\131\161\113\054\041\247\133\175
-\340\035\321\056\201\233\303\330\150\367\275\226\033\254\160\261
-\026\024\013\333\140\271\046\001\005\002\003\001\000\001\243\121
-\060\117\060\013\006\003\125\035\017\004\004\003\002\001\206\060
-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
-\060\035\006\003\125\035\016\004\026\004\024\263\003\176\256\066
-\274\260\171\321\334\224\046\266\021\276\041\262\151\206\224\060
-\020\006\011\053\006\001\004\001\202\067\025\001\004\003\002\001
-\000\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
-\003\202\001\001\000\113\241\377\013\207\156\263\371\301\103\261
-\110\363\050\300\035\056\311\011\101\372\224\000\034\244\244\253
-\111\117\217\075\036\357\115\157\275\274\244\366\362\046\060\311
-\020\312\035\210\373\164\031\037\205\105\275\260\154\121\371\066
-\176\333\365\114\062\072\101\117\133\107\317\350\013\055\266\304
-\031\235\164\305\107\306\073\152\017\254\024\333\074\364\163\234
-\251\005\337\000\334\164\170\372\370\065\140\131\002\023\030\174
-\274\373\115\260\040\155\103\273\140\060\172\147\063\134\305\231
-\321\370\055\071\122\163\373\214\252\227\045\134\162\331\010\036
-\253\116\074\343\201\061\237\003\246\373\300\376\051\210\125\332
-\204\325\120\003\266\342\204\243\246\066\252\021\072\001\341\030
-\113\326\104\150\263\075\371\123\164\204\263\106\221\106\226\000
-\267\200\054\266\341\343\020\342\333\242\347\050\217\001\226\142
-\026\076\000\343\034\245\066\201\030\242\114\122\166\300\021\243
-\156\346\035\272\343\132\276\066\123\305\076\165\217\206\151\051
-\130\123\265\234\273\157\237\134\305\030\354\335\057\341\230\311
-\374\276\337\012\015
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "OISTE WISeKey Global Root GA CA"
-# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
-# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
-# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
-# Not Valid Before: Sun Dec 11 16:03:44 2005
-# Not Valid After : Fri Dec 11 16:09:51 2037
-# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93
-# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\131\042\241\341\132\352\026\065\041\370\230\071\152\106\106\260
-\104\033\017\251
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\274\154\121\063\247\351\323\146\143\124\025\162\033\041\222\223
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
-\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
-\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
-\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
-\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
-\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
-\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
-\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
-\141\154\040\122\157\157\164\040\107\101\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124
-\337\232
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Certigna"
-#
-# Issuer: CN=Certigna,O=Dhimyotis,C=FR
-# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff
-# Subject: CN=Certigna,O=Dhimyotis,C=FR
-# Not Valid Before: Fri Jun 29 15:13:05 2007
-# Not Valid After : Tue Jun 29 15:13:05 2027
-# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF
-# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Certigna"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
-\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
-\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
-\162\164\151\147\156\141
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
-\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
-\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
-\162\164\151\147\156\141
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\011\000\376\334\343\001\017\311\110\377
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\250\060\202\002\220\240\003\002\001\002\002\011\000
-\376\334\343\001\017\311\110\377\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\060\064\061\013\060\011\006\003\125
-\004\006\023\002\106\122\061\022\060\020\006\003\125\004\012\014
-\011\104\150\151\155\171\157\164\151\163\061\021\060\017\006\003
-\125\004\003\014\010\103\145\162\164\151\147\156\141\060\036\027
-\015\060\067\060\066\062\071\061\065\061\063\060\065\132\027\015
-\062\067\060\066\062\071\061\065\061\063\060\065\132\060\064\061
-\013\060\011\006\003\125\004\006\023\002\106\122\061\022\060\020
-\006\003\125\004\012\014\011\104\150\151\155\171\157\164\151\163
-\061\021\060\017\006\003\125\004\003\014\010\103\145\162\164\151
-\147\156\141\060\202\001\042\060\015\006\011\052\206\110\206\367
-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
-\202\001\001\000\310\150\361\311\326\326\263\064\165\046\202\036
-\354\264\276\352\134\341\046\355\021\107\141\341\242\174\026\170
-\100\041\344\140\236\132\310\143\341\304\261\226\222\377\030\155
-\151\043\341\053\142\367\335\342\066\057\221\007\271\110\317\016
-\354\171\266\054\347\064\113\160\010\045\243\074\207\033\031\362
-\201\007\017\070\220\031\323\021\376\206\264\362\321\136\036\036
-\226\315\200\154\316\073\061\223\266\362\240\320\251\225\022\175
-\245\232\314\153\310\204\126\212\063\251\347\042\025\123\026\360
-\314\027\354\127\137\351\242\012\230\011\336\343\137\234\157\334
-\110\343\205\013\025\132\246\272\237\254\110\343\011\262\367\364
-\062\336\136\064\276\034\170\135\102\133\316\016\042\217\115\220
-\327\175\062\030\263\013\054\152\277\216\077\024\021\211\040\016
-\167\024\265\075\224\010\207\367\045\036\325\262\140\000\354\157
-\052\050\045\156\052\076\030\143\027\045\077\076\104\040\026\366
-\046\310\045\256\005\112\264\347\143\054\363\214\026\123\176\134
-\373\021\032\010\301\106\142\237\042\270\361\302\215\151\334\372
-\072\130\006\337\002\003\001\000\001\243\201\274\060\201\271\060
-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
-\060\035\006\003\125\035\016\004\026\004\024\032\355\376\101\071
-\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021\060
-\144\006\003\125\035\043\004\135\060\133\200\024\032\355\376\101
-\071\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021
-\241\070\244\066\060\064\061\013\060\011\006\003\125\004\006\023
-\002\106\122\061\022\060\020\006\003\125\004\012\014\011\104\150
-\151\155\171\157\164\151\163\061\021\060\017\006\003\125\004\003
-\014\010\103\145\162\164\151\147\156\141\202\011\000\376\334\343
-\001\017\311\110\377\060\016\006\003\125\035\017\001\001\377\004
-\004\003\002\001\006\060\021\006\011\140\206\110\001\206\370\102
-\001\001\004\004\003\002\000\007\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\202\001\001\000\205\003\036\222
-\161\366\102\257\341\243\141\236\353\363\300\017\362\245\324\332
-\225\346\326\276\150\066\075\176\156\037\114\212\357\321\017\041
-\155\136\245\122\143\316\022\370\357\052\332\157\353\067\376\023
-\002\307\313\073\076\042\153\332\141\056\177\324\162\075\335\060
-\341\036\114\100\031\214\017\327\234\321\203\060\173\230\131\334
-\175\306\271\014\051\114\241\063\242\353\147\072\145\204\323\226
-\342\355\166\105\160\217\265\053\336\371\043\326\111\156\074\024
-\265\306\237\065\036\120\320\301\217\152\160\104\002\142\313\256
-\035\150\101\247\252\127\350\123\252\007\322\006\366\325\024\006
-\013\221\003\165\054\154\162\265\141\225\232\015\213\271\015\347
-\365\337\124\315\336\346\330\326\011\010\227\143\345\301\056\260
-\267\104\046\300\046\300\257\125\060\236\073\325\066\052\031\004
-\364\134\036\377\317\054\267\377\320\375\207\100\021\325\021\043
-\273\110\300\041\251\244\050\055\375\025\370\260\116\053\364\060
-\133\041\374\021\221\064\276\101\357\173\235\227\165\377\227\225
-\300\226\130\057\352\273\106\327\273\344\331\056
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "Certigna"
-# Issuer: CN=Certigna,O=Dhimyotis,C=FR
-# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff
-# Subject: CN=Certigna,O=Dhimyotis,C=FR
-# Not Valid Before: Fri Jun 29 15:13:05 2007
-# Not Valid After : Tue Jun 29 15:13:05 2027
-# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF
-# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Certigna"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\261\056\023\143\105\206\244\157\032\262\140\150\067\130\055\304
-\254\375\224\227
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\253\127\246\133\175\102\202\031\265\330\130\046\050\136\375\377
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
-\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
-\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
-\162\164\151\147\156\141
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\011\000\376\334\343\001\017\311\110\377
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Cybertrust Global Root"
-#
-# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc"
-# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48
-# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc"
-# Not Valid Before: Fri Dec 15 08:00:00 2006
-# Not Valid After : Wed Dec 15 08:00:00 2021
-# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1
-# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Cybertrust Global Root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
-\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
-\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
-\164\040\107\154\157\142\141\154\040\122\157\157\164
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
-\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
-\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
-\164\040\107\154\157\142\141\154\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\013\004\000\000\000\000\001\017\205\252\055\110
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\241\060\202\002\211\240\003\002\001\002\002\013\004
-\000\000\000\000\001\017\205\252\055\110\060\015\006\011\052\206
-\110\206\367\015\001\001\005\005\000\060\073\061\030\060\026\006
-\003\125\004\012\023\017\103\171\142\145\162\164\162\165\163\164
-\054\040\111\156\143\061\037\060\035\006\003\125\004\003\023\026
-\103\171\142\145\162\164\162\165\163\164\040\107\154\157\142\141
-\154\040\122\157\157\164\060\036\027\015\060\066\061\062\061\065
-\060\070\060\060\060\060\132\027\015\062\061\061\062\061\065\060
-\070\060\060\060\060\132\060\073\061\030\060\026\006\003\125\004
-\012\023\017\103\171\142\145\162\164\162\165\163\164\054\040\111
-\156\143\061\037\060\035\006\003\125\004\003\023\026\103\171\142
-\145\162\164\162\165\163\164\040\107\154\157\142\141\154\040\122
-\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206\367
-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
-\202\001\001\000\370\310\274\275\024\120\146\023\377\360\323\171
-\354\043\362\267\032\307\216\205\361\022\163\246\031\252\020\333
-\234\242\145\164\132\167\076\121\175\126\366\334\043\266\324\355
-\137\130\261\067\115\325\111\016\156\365\152\207\326\322\214\322
-\047\306\342\377\066\237\230\145\240\023\116\306\052\144\233\325
-\220\022\317\024\006\364\073\343\324\050\276\350\016\370\253\116
-\110\224\155\216\225\061\020\134\355\242\055\275\325\072\155\262
-\034\273\140\300\106\113\001\365\111\256\176\106\212\320\164\215
-\241\014\002\316\356\374\347\217\270\153\146\363\177\104\000\277
-\146\045\024\053\335\020\060\035\007\226\077\115\366\153\270\217
-\267\173\014\245\070\353\336\107\333\325\135\071\374\210\247\363
-\327\052\164\361\350\132\242\073\237\120\272\246\214\105\065\302
-\120\145\225\334\143\202\357\335\277\167\115\234\142\311\143\163
-\026\320\051\017\111\251\110\360\263\252\267\154\305\247\060\071
-\100\135\256\304\342\135\046\123\360\316\034\043\010\141\250\224
-\031\272\004\142\100\354\037\070\160\167\022\006\161\247\060\030
-\135\045\047\245\002\003\001\000\001\243\201\245\060\201\242\060
-\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060
-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
-\060\035\006\003\125\035\016\004\026\004\024\266\010\173\015\172
-\314\254\040\114\206\126\062\136\317\253\156\205\055\160\127\060
-\077\006\003\125\035\037\004\070\060\066\060\064\240\062\240\060
-\206\056\150\164\164\160\072\057\057\167\167\167\062\056\160\165
-\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143
-\162\154\057\143\164\057\143\164\162\157\157\164\056\143\162\154
-\060\037\006\003\125\035\043\004\030\060\026\200\024\266\010\173
-\015\172\314\254\040\114\206\126\062\136\317\253\156\205\055\160
-\127\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
-\003\202\001\001\000\126\357\012\043\240\124\116\225\227\311\370
-\211\332\105\301\324\243\000\045\364\037\023\253\267\243\205\130
-\151\302\060\255\330\025\212\055\343\311\315\201\132\370\163\043
-\132\247\174\005\363\375\042\073\016\321\006\304\333\066\114\163
-\004\216\345\260\042\344\305\363\056\245\331\043\343\270\116\112
-\040\247\156\002\044\237\042\140\147\173\213\035\162\011\305\061
-\134\351\171\237\200\107\075\255\241\013\007\024\075\107\377\003
-\151\032\014\013\104\347\143\045\247\177\262\311\270\166\204\355
-\043\366\175\007\253\105\176\323\337\263\277\351\212\266\315\250
-\242\147\053\122\325\267\145\360\071\114\143\240\221\171\223\122
-\017\124\335\203\273\237\321\217\247\123\163\303\313\377\060\354
-\174\004\270\330\104\037\223\137\161\011\042\267\156\076\352\034
-\003\116\235\032\040\141\373\201\067\354\136\374\012\105\253\327
-\347\027\125\320\240\352\140\233\246\366\343\214\133\051\302\006
-\140\024\235\055\227\114\251\223\025\235\141\304\001\137\110\326
-\130\275\126\061\022\116\021\310\041\340\263\021\221\145\333\264
-\246\210\070\316\125
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "Cybertrust Global Root"
-# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc"
-# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48
-# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc"
-# Not Valid Before: Fri Dec 15 08:00:00 2006
-# Not Valid After : Wed Dec 15 08:00:00 2021
-# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1
-# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Cybertrust Global Root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\137\103\345\261\277\370\170\214\254\034\307\312\112\232\306\042
-\053\314\064\306
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\162\344\112\207\343\151\100\200\167\352\274\343\364\377\360\341
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
-\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
-\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
-\164\040\107\154\157\142\141\154\040\122\157\157\164
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\013\004\000\000\000\000\001\017\205\252\055\110
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "ePKI Root Certification Authority"
-#
-# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
-# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
-# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
-# Not Valid Before: Mon Dec 20 02:31:27 2004
-# Not Valid After : Wed Dec 20 02:31:27 2034
-# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3
-# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "ePKI Root Certification Authority"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
-\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
-\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322
-\274\235
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025
-\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136
-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060
-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141
-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164
-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113
-\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036
-\027\015\060\064\061\062\062\060\060\062\063\061\062\067\132\027
-\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136
-\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060
-\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141
-\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164
-\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113
-\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\202
-\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341
-\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155
-\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007
-\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217
-\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376
-\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041
-\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225
-\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364
-\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327
-\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367
-\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020
-\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065
-\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047
-\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330
-\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111
-\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221
-\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162
-\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300
-\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243
-\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024
-\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224
-\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076
-\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101
-\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322
-\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172
-\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052
-\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107
-\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203
-\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215
-\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251
-\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132
-\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215
-\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002
-\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004
-\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125
-\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005
-\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060
-\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005
-\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307
-\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
-\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201
-\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000
-\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022
-\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045
-\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312
-\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066
-\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017
-\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122
-\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227
-\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277
-\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322
-\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323
-\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066
-\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245
-\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355
-\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272
-\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224
-\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115
-\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001
-\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217
-\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341
-\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122
-\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200
-\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211
-\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263
-\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342
-\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374
-\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304
-\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156
-\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143
-\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203
-\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352
-\201\370\021\234
+\212\061\013\060\011\006\003\125\004\006\023\002\103\110\061\020
+\060\016\006\003\125\004\012\023\007\127\111\123\145\113\145\171
+\061\033\060\031\006\003\125\004\013\023\022\103\157\160\171\162
+\151\147\150\164\040\050\143\051\040\062\060\060\065\061\042\060
+\040\006\003\125\004\013\023\031\117\111\123\124\105\040\106\157
+\165\156\144\141\164\151\157\156\040\105\156\144\157\162\163\145
+\144\061\050\060\046\006\003\125\004\003\023\037\117\111\123\124
+\105\040\127\111\123\145\113\145\171\040\107\154\157\142\141\154
+\040\122\157\157\164\040\107\101\040\103\101\060\036\027\015\060
+\065\061\062\061\061\061\066\060\063\064\064\132\027\015\063\067
+\061\062\061\061\061\066\060\071\065\061\132\060\201\212\061\013
+\060\011\006\003\125\004\006\023\002\103\110\061\020\060\016\006
+\003\125\004\012\023\007\127\111\123\145\113\145\171\061\033\060
+\031\006\003\125\004\013\023\022\103\157\160\171\162\151\147\150
+\164\040\050\143\051\040\062\060\060\065\061\042\060\040\006\003
+\125\004\013\023\031\117\111\123\124\105\040\106\157\165\156\144
+\141\164\151\157\156\040\105\156\144\157\162\163\145\144\061\050
+\060\046\006\003\125\004\003\023\037\117\111\123\124\105\040\127
+\111\123\145\113\145\171\040\107\154\157\142\141\154\040\122\157
+\157\164\040\107\101\040\103\101\060\202\001\042\060\015\006\011
+\052\206\110\206\367\015\001\001\001\005\000\003\202\001\017\000
+\060\202\001\012\002\202\001\001\000\313\117\263\000\233\075\066
+\335\371\321\111\152\153\020\111\037\354\330\053\262\306\370\062
+\201\051\103\225\114\232\031\043\041\025\105\336\343\310\034\121
+\125\133\256\223\350\067\377\053\153\351\324\352\276\052\335\250
+\121\053\327\146\303\141\134\140\002\310\365\316\162\173\073\270
+\362\116\145\010\232\315\244\152\031\301\001\273\163\246\327\366
+\303\335\315\274\244\213\265\231\141\270\001\242\243\324\115\324
+\005\075\221\255\370\264\010\161\144\257\160\361\034\153\176\366
+\303\167\235\044\163\173\344\014\214\341\331\066\341\231\213\005
+\231\013\355\105\061\011\312\302\000\333\367\162\240\226\252\225
+\207\320\216\307\266\141\163\015\166\146\214\334\033\264\143\242
+\237\177\223\023\060\361\241\047\333\331\377\054\125\210\221\240
+\340\117\007\260\050\126\214\030\033\227\104\216\211\335\340\027
+\156\347\052\357\217\071\012\061\204\202\330\100\024\111\056\172
+\101\344\247\376\343\144\314\301\131\161\113\054\041\247\133\175
+\340\035\321\056\201\233\303\330\150\367\275\226\033\254\160\261
+\026\024\013\333\140\271\046\001\005\002\003\001\000\001\243\121
+\060\117\060\013\006\003\125\035\017\004\004\003\002\001\206\060
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\035\006\003\125\035\016\004\026\004\024\263\003\176\256\066
+\274\260\171\321\334\224\046\266\021\276\041\262\151\206\224\060
+\020\006\011\053\006\001\004\001\202\067\025\001\004\003\002\001
+\000\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
+\003\202\001\001\000\113\241\377\013\207\156\263\371\301\103\261
+\110\363\050\300\035\056\311\011\101\372\224\000\034\244\244\253
+\111\117\217\075\036\357\115\157\275\274\244\366\362\046\060\311
+\020\312\035\210\373\164\031\037\205\105\275\260\154\121\371\066
+\176\333\365\114\062\072\101\117\133\107\317\350\013\055\266\304
+\031\235\164\305\107\306\073\152\017\254\024\333\074\364\163\234
+\251\005\337\000\334\164\170\372\370\065\140\131\002\023\030\174
+\274\373\115\260\040\155\103\273\140\060\172\147\063\134\305\231
+\321\370\055\071\122\163\373\214\252\227\045\134\162\331\010\036
+\253\116\074\343\201\061\237\003\246\373\300\376\051\210\125\332
+\204\325\120\003\266\342\204\243\246\066\252\021\072\001\341\030
+\113\326\104\150\263\075\371\123\164\204\263\106\221\106\226\000
+\267\200\054\266\341\343\020\342\333\242\347\050\217\001\226\142
+\026\076\000\343\034\245\066\201\030\242\114\122\166\300\021\243
+\156\346\035\272\343\132\276\066\123\305\076\165\217\206\151\051
+\130\123\265\234\273\157\237\134\305\030\354\335\057\341\230\311
+\374\276\337\012\015
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "ePKI Root Certification Authority"
-# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
-# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
-# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
-# Not Valid Before: Mon Dec 20 02:31:27 2004
-# Not Valid After : Wed Dec 20 02:31:27 2034
-# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3
-# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
+# Trust for Certificate "OISTE WISeKey Global Root GA CA"
+# Issuer: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
+# Serial Number:41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
+# Subject: CN=OISTE WISeKey Global Root GA CA,OU=OISTE Foundation Endorsed,OU=Copyright (c) 2005,O=WISeKey,C=CH
+# Not Valid Before: Sun Dec 11 16:03:44 2005
+# Not Valid After : Fri Dec 11 16:09:51 2037
+# Fingerprint (MD5): BC:6C:51:33:A7:E9:D3:66:63:54:15:72:1B:21:92:93
+# Fingerprint (SHA1): 59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "ePKI Root Certification Authority"
+CKA_LABEL UTF8 "OISTE WISeKey Global Root GA CA"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342
-\075\151\306\360
+\131\042\241\341\132\352\026\065\041\370\230\071\152\106\106\260
+\104\033\017\251
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263
+\274\154\121\063\247\351\323\146\143\124\025\162\033\041\222\223
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
-\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
-\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
-\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
-\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\060\201\212\061\013\060\011\006\003\125\004\006\023\002\103\110
+\061\020\060\016\006\003\125\004\012\023\007\127\111\123\145\113
+\145\171\061\033\060\031\006\003\125\004\013\023\022\103\157\160
+\171\162\151\147\150\164\040\050\143\051\040\062\060\060\065\061
+\042\060\040\006\003\125\004\013\023\031\117\111\123\124\105\040
+\106\157\165\156\144\141\164\151\157\156\040\105\156\144\157\162
+\163\145\144\061\050\060\046\006\003\125\004\003\023\037\117\111
+\123\124\105\040\127\111\123\145\113\145\171\040\107\154\157\142
+\141\154\040\122\157\157\164\040\107\101\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322
-\274\235
+\002\020\101\075\162\307\364\153\037\201\103\175\361\322\050\124
+\337\232
 END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "certSIGN ROOT CA"
+# Certificate "Certigna"
 #
-# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO
-# Serial Number:20:06:05:16:70:02
-# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO
-# Not Valid Before: Tue Jul 04 17:20:04 2006
-# Not Valid After : Fri Jul 04 17:20:04 2031
-# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17
-# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
+# Issuer: CN=Certigna,O=Dhimyotis,C=FR
+# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff
+# Subject: CN=Certigna,O=Dhimyotis,C=FR
+# Not Valid Before: Fri Jun 29 15:13:05 2007
+# Not Valid After : Tue Jun 29 15:13:05 2027
+# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF
+# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "certSIGN ROOT CA"
+CKA_LABEL UTF8 "Certigna"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
-\164\123\111\107\116\040\122\117\117\124\040\103\101
+\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
+\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
+\162\164\151\147\156\141
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
-\164\123\111\107\116\040\122\117\117\124\040\103\101
+\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
+\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
+\162\164\151\147\156\141
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\006\040\006\005\026\160\002
+\002\011\000\376\334\343\001\017\311\110\377
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040
-\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001
-\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023
-\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145
-\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023
-\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103
-\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060
-\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064
-\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117
-\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123
-\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145
-\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202
-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267
-\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350
-\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127
-\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135
-\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020
-\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272
-\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263
-\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135
-\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001
-\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200
-\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020
-\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320
-\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045
-\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057
-\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020
-\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234
-\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002
-\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001
-\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017
-\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016
-\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262
-\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211
-\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327
-\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044
-\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030
-\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124
-\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223
-\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031
-\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133
-\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367
-\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210
-\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240
-\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240
-\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160
-\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302
-\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210
-\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115
-\366\356\260\132\116\111\104\124\130\137\102\203
+\060\202\003\250\060\202\002\220\240\003\002\001\002\002\011\000
+\376\334\343\001\017\311\110\377\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\060\064\061\013\060\011\006\003\125
+\004\006\023\002\106\122\061\022\060\020\006\003\125\004\012\014
+\011\104\150\151\155\171\157\164\151\163\061\021\060\017\006\003
+\125\004\003\014\010\103\145\162\164\151\147\156\141\060\036\027
+\015\060\067\060\066\062\071\061\065\061\063\060\065\132\027\015
+\062\067\060\066\062\071\061\065\061\063\060\065\132\060\064\061
+\013\060\011\006\003\125\004\006\023\002\106\122\061\022\060\020
+\006\003\125\004\012\014\011\104\150\151\155\171\157\164\151\163
+\061\021\060\017\006\003\125\004\003\014\010\103\145\162\164\151
+\147\156\141\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\310\150\361\311\326\326\263\064\165\046\202\036
+\354\264\276\352\134\341\046\355\021\107\141\341\242\174\026\170
+\100\041\344\140\236\132\310\143\341\304\261\226\222\377\030\155
+\151\043\341\053\142\367\335\342\066\057\221\007\271\110\317\016
+\354\171\266\054\347\064\113\160\010\045\243\074\207\033\031\362
+\201\007\017\070\220\031\323\021\376\206\264\362\321\136\036\036
+\226\315\200\154\316\073\061\223\266\362\240\320\251\225\022\175
+\245\232\314\153\310\204\126\212\063\251\347\042\025\123\026\360
+\314\027\354\127\137\351\242\012\230\011\336\343\137\234\157\334
+\110\343\205\013\025\132\246\272\237\254\110\343\011\262\367\364
+\062\336\136\064\276\034\170\135\102\133\316\016\042\217\115\220
+\327\175\062\030\263\013\054\152\277\216\077\024\021\211\040\016
+\167\024\265\075\224\010\207\367\045\036\325\262\140\000\354\157
+\052\050\045\156\052\076\030\143\027\045\077\076\104\040\026\366
+\046\310\045\256\005\112\264\347\143\054\363\214\026\123\176\134
+\373\021\032\010\301\106\142\237\042\270\361\302\215\151\334\372
+\072\130\006\337\002\003\001\000\001\243\201\274\060\201\271\060
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\035\006\003\125\035\016\004\026\004\024\032\355\376\101\071
+\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021\060
+\144\006\003\125\035\043\004\135\060\133\200\024\032\355\376\101
+\071\220\264\044\131\276\001\362\122\325\105\366\132\071\334\021
+\241\070\244\066\060\064\061\013\060\011\006\003\125\004\006\023
+\002\106\122\061\022\060\020\006\003\125\004\012\014\011\104\150
+\151\155\171\157\164\151\163\061\021\060\017\006\003\125\004\003
+\014\010\103\145\162\164\151\147\156\141\202\011\000\376\334\343
+\001\017\311\110\377\060\016\006\003\125\035\017\001\001\377\004
+\004\003\002\001\006\060\021\006\011\140\206\110\001\206\370\102
+\001\001\004\004\003\002\000\007\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\202\001\001\000\205\003\036\222
+\161\366\102\257\341\243\141\236\353\363\300\017\362\245\324\332
+\225\346\326\276\150\066\075\176\156\037\114\212\357\321\017\041
+\155\136\245\122\143\316\022\370\357\052\332\157\353\067\376\023
+\002\307\313\073\076\042\153\332\141\056\177\324\162\075\335\060
+\341\036\114\100\031\214\017\327\234\321\203\060\173\230\131\334
+\175\306\271\014\051\114\241\063\242\353\147\072\145\204\323\226
+\342\355\166\105\160\217\265\053\336\371\043\326\111\156\074\024
+\265\306\237\065\036\120\320\301\217\152\160\104\002\142\313\256
+\035\150\101\247\252\127\350\123\252\007\322\006\366\325\024\006
+\013\221\003\165\054\154\162\265\141\225\232\015\213\271\015\347
+\365\337\124\315\336\346\330\326\011\010\227\143\345\301\056\260
+\267\104\046\300\046\300\257\125\060\236\073\325\066\052\031\004
+\364\134\036\377\317\054\267\377\320\375\207\100\021\325\021\043
+\273\110\300\041\251\244\050\055\375\025\370\260\116\053\364\060
+\133\041\374\021\221\064\276\101\357\173\235\227\165\377\227\225
+\300\226\130\057\352\273\106\327\273\344\331\056
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
 CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "certSIGN ROOT CA"
-# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO
-# Serial Number:20:06:05:16:70:02
-# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO
-# Not Valid Before: Tue Jul 04 17:20:04 2006
-# Not Valid After : Fri Jul 04 17:20:04 2031
-# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17
-# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
+# Trust for Certificate "Certigna"
+# Issuer: CN=Certigna,O=Dhimyotis,C=FR
+# Serial Number:00:fe:dc:e3:01:0f:c9:48:ff
+# Subject: CN=Certigna,O=Dhimyotis,C=FR
+# Not Valid Before: Fri Jun 29 15:13:05 2007
+# Not Valid After : Tue Jun 29 15:13:05 2027
+# Fingerprint (MD5): AB:57:A6:5B:7D:42:82:19:B5:D8:58:26:28:5E:FD:FF
+# Fingerprint (SHA1): B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "certSIGN ROOT CA"
+CKA_LABEL UTF8 "Certigna"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350
-\174\113\057\233
+\261\056\023\143\105\206\244\157\032\262\140\150\067\130\055\304
+\254\375\224\227
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027
+\253\127\246\133\175\102\202\031\265\330\130\046\050\136\375\377
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
-\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
-\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
-\164\123\111\107\116\040\122\117\117\124\040\103\101
+\060\064\061\013\060\011\006\003\125\004\006\023\002\106\122\061
+\022\060\020\006\003\125\004\012\014\011\104\150\151\155\171\157
+\164\151\163\061\021\060\017\006\003\125\004\003\014\010\103\145
+\162\164\151\147\156\141
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\006\040\006\005\026\160\002
+\002\011\000\376\334\343\001\017\311\110\377
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
@@ -6403,159 +5028,130 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "GeoTrust Primary Certification Authority - G3"
+# Certificate "Cybertrust Global Root"
 #
-# Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US
-# Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f
-# Subject: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US
-# Not Valid Before: Wed Apr 02 00:00:00 2008
-# Not Valid After : Tue Dec 01 23:59:59 2037
-# Fingerprint (MD5): B5:E8:34:36:C9:10:44:58:48:70:6D:2E:83:D4:B8:05
-# Fingerprint (SHA1): 03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD
+# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc"
+# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48
+# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc"
+# Not Valid Before: Fri Dec 15 08:00:00 2006
+# Not Valid After : Wed Dec 15 08:00:00 2021
+# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1
+# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3"
+CKA_LABEL UTF8 "Cybertrust Global Root"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162
-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004
-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124
-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040
-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157
-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145
-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\063
+\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
+\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
+\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
+\164\040\107\154\157\142\141\154\040\122\157\157\164
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162
-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004
-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124
-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040
-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157
-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145
-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\063
+\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
+\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
+\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
+\164\040\107\154\157\142\141\154\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030
-\017\037
+\002\013\004\000\000\000\000\001\017\205\252\055\110
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\003\376\060\202\002\346\240\003\002\001\002\002\020\025
-\254\156\224\031\262\171\113\101\366\047\251\303\030\017\037\060
-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201
-\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061\026
-\060\024\006\003\125\004\012\023\015\107\145\157\124\162\165\163
-\164\040\111\156\143\056\061\071\060\067\006\003\125\004\013\023
-\060\050\143\051\040\062\060\060\070\040\107\145\157\124\162\165
-\163\164\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\066\060\064\006\003\125\004\003\023\055\107\145\157\124
-\162\165\163\164\040\120\162\151\155\141\162\171\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\055\040\107\063\060\036\027\015\060\070\060
-\064\060\062\060\060\060\060\060\060\132\027\015\063\067\061\062
-\060\061\062\063\065\071\065\071\132\060\201\230\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\026\060\024\006\003\125
-\004\012\023\015\107\145\157\124\162\165\163\164\040\111\156\143
-\056\061\071\060\067\006\003\125\004\013\023\060\050\143\051\040
-\062\060\060\070\040\107\145\157\124\162\165\163\164\040\111\156
-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151
-\172\145\144\040\165\163\145\040\157\156\154\171\061\066\060\064
-\006\003\125\004\003\023\055\107\145\157\124\162\165\163\164\040
-\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\040
-\055\040\107\063\060\202\001\042\060\015\006\011\052\206\110\206
-\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012
-\002\202\001\001\000\334\342\136\142\130\035\063\127\071\062\063
-\372\353\313\207\214\247\324\112\335\006\210\352\144\216\061\230
-\245\070\220\036\230\317\056\143\053\360\106\274\104\262\211\241
-\300\050\014\111\160\041\225\237\144\300\246\223\022\002\145\046
-\206\306\245\211\360\372\327\204\240\160\257\117\032\227\077\006
-\104\325\311\353\162\020\175\344\061\050\373\034\141\346\050\007
-\104\163\222\042\151\247\003\210\154\235\143\310\122\332\230\047
-\347\010\114\160\076\264\311\022\301\305\147\203\135\063\363\003
-\021\354\152\320\123\342\321\272\066\140\224\200\273\141\143\154
-\133\027\176\337\100\224\036\253\015\302\041\050\160\210\377\326
-\046\154\154\140\004\045\116\125\176\175\357\277\224\110\336\267
-\035\335\160\215\005\137\210\245\233\362\302\356\352\321\100\101
-\155\142\070\035\126\006\305\003\107\121\040\031\374\173\020\013
-\016\142\256\166\125\277\137\167\276\076\111\001\123\075\230\045
-\003\166\044\132\035\264\333\211\352\171\345\266\263\073\077\272
-\114\050\101\177\006\254\152\216\301\320\366\005\035\175\346\102
-\206\343\245\325\107\002\003\001\000\001\243\102\060\100\060\017
-\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060
+\060\202\003\241\060\202\002\211\240\003\002\001\002\002\013\004
+\000\000\000\000\001\017\205\252\055\110\060\015\006\011\052\206
+\110\206\367\015\001\001\005\005\000\060\073\061\030\060\026\006
+\003\125\004\012\023\017\103\171\142\145\162\164\162\165\163\164
+\054\040\111\156\143\061\037\060\035\006\003\125\004\003\023\026
+\103\171\142\145\162\164\162\165\163\164\040\107\154\157\142\141
+\154\040\122\157\157\164\060\036\027\015\060\066\061\062\061\065
+\060\070\060\060\060\060\132\027\015\062\061\061\062\061\065\060
+\070\060\060\060\060\132\060\073\061\030\060\026\006\003\125\004
+\012\023\017\103\171\142\145\162\164\162\165\163\164\054\040\111
+\156\143\061\037\060\035\006\003\125\004\003\023\026\103\171\142
+\145\162\164\162\165\163\164\040\107\154\157\142\141\154\040\122
+\157\157\164\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\370\310\274\275\024\120\146\023\377\360\323\171
+\354\043\362\267\032\307\216\205\361\022\163\246\031\252\020\333
+\234\242\145\164\132\167\076\121\175\126\366\334\043\266\324\355
+\137\130\261\067\115\325\111\016\156\365\152\207\326\322\214\322
+\047\306\342\377\066\237\230\145\240\023\116\306\052\144\233\325
+\220\022\317\024\006\364\073\343\324\050\276\350\016\370\253\116
+\110\224\155\216\225\061\020\134\355\242\055\275\325\072\155\262
+\034\273\140\300\106\113\001\365\111\256\176\106\212\320\164\215
+\241\014\002\316\356\374\347\217\270\153\146\363\177\104\000\277
+\146\045\024\053\335\020\060\035\007\226\077\115\366\153\270\217
+\267\173\014\245\070\353\336\107\333\325\135\071\374\210\247\363
+\327\052\164\361\350\132\242\073\237\120\272\246\214\105\065\302
+\120\145\225\334\143\202\357\335\277\167\115\234\142\311\143\163
+\026\320\051\017\111\251\110\360\263\252\267\154\305\247\060\071
+\100\135\256\304\342\135\046\123\360\316\034\043\010\141\250\224
+\031\272\004\142\100\354\037\070\160\167\022\006\161\247\060\030
+\135\045\047\245\002\003\001\000\001\243\201\245\060\201\242\060
 \016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060
-\035\006\003\125\035\016\004\026\004\024\304\171\312\216\241\116
-\003\035\034\334\153\333\061\133\224\076\077\060\177\055\060\015
-\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001
-\001\000\055\305\023\317\126\200\173\172\170\275\237\256\054\231
-\347\357\332\337\224\136\011\151\247\347\156\150\214\275\162\276
-\107\251\016\227\022\270\112\361\144\323\071\337\045\064\324\301
-\315\116\201\360\017\004\304\044\263\064\226\306\246\252\060\337
-\150\141\163\327\371\216\205\211\357\016\136\225\050\112\052\047
-\217\020\216\056\174\206\304\002\236\332\014\167\145\016\104\015
-\222\375\375\263\026\066\372\021\015\035\214\016\007\211\152\051
-\126\367\162\364\335\025\234\167\065\146\127\253\023\123\330\216
-\301\100\305\327\023\026\132\162\307\267\151\001\304\172\261\203
-\001\150\175\215\101\241\224\030\301\045\134\374\360\376\203\002
-\207\174\015\015\317\056\010\134\112\100\015\076\354\201\141\346
-\044\333\312\340\016\055\007\262\076\126\334\215\365\101\205\007
-\110\233\014\013\313\111\077\175\354\267\375\313\215\147\211\032
-\253\355\273\036\243\000\010\010\027\052\202\134\061\135\106\212
-\055\017\206\233\164\331\105\373\324\100\261\172\252\150\055\206
-\262\231\042\341\301\053\307\234\370\363\137\250\202\022\353\031
-\021\055
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\035\006\003\125\035\016\004\026\004\024\266\010\173\015\172
+\314\254\040\114\206\126\062\136\317\253\156\205\055\160\127\060
+\077\006\003\125\035\037\004\070\060\066\060\064\240\062\240\060
+\206\056\150\164\164\160\072\057\057\167\167\167\062\056\160\165
+\142\154\151\143\055\164\162\165\163\164\056\143\157\155\057\143
+\162\154\057\143\164\057\143\164\162\157\157\164\056\143\162\154
+\060\037\006\003\125\035\043\004\030\060\026\200\024\266\010\173
+\015\172\314\254\040\114\206\126\062\136\317\253\156\205\055\160
+\127\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000
+\003\202\001\001\000\126\357\012\043\240\124\116\225\227\311\370
+\211\332\105\301\324\243\000\045\364\037\023\253\267\243\205\130
+\151\302\060\255\330\025\212\055\343\311\315\201\132\370\163\043
+\132\247\174\005\363\375\042\073\016\321\006\304\333\066\114\163
+\004\216\345\260\042\344\305\363\056\245\331\043\343\270\116\112
+\040\247\156\002\044\237\042\140\147\173\213\035\162\011\305\061
+\134\351\171\237\200\107\075\255\241\013\007\024\075\107\377\003
+\151\032\014\013\104\347\143\045\247\177\262\311\270\166\204\355
+\043\366\175\007\253\105\176\323\337\263\277\351\212\266\315\250
+\242\147\053\122\325\267\145\360\071\114\143\240\221\171\223\122
+\017\124\335\203\273\237\321\217\247\123\163\303\313\377\060\354
+\174\004\270\330\104\037\223\137\161\011\042\267\156\076\352\034
+\003\116\235\032\040\141\373\201\067\354\136\374\012\105\253\327
+\347\027\125\320\240\352\140\233\246\366\343\214\133\051\302\006
+\140\024\235\055\227\114\251\223\025\235\141\304\001\137\110\326
+\130\275\126\061\022\116\021\310\041\340\263\021\221\145\333\264
+\246\210\070\316\125
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Tue Apr 30 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\064\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "GeoTrust Primary Certification Authority - G3"
-# Issuer: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US
-# Serial Number:15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f
-# Subject: CN=GeoTrust Primary Certification Authority - G3,OU=(c) 2008 GeoTrust Inc. - For authorized use only,O=GeoTrust Inc.,C=US
-# Not Valid Before: Wed Apr 02 00:00:00 2008
-# Not Valid After : Tue Dec 01 23:59:59 2037
-# Fingerprint (MD5): B5:E8:34:36:C9:10:44:58:48:70:6D:2E:83:D4:B8:05
-# Fingerprint (SHA1): 03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD
+# Trust for Certificate "Cybertrust Global Root"
+# Issuer: CN=Cybertrust Global Root,O="Cybertrust, Inc"
+# Serial Number:04:00:00:00:00:01:0f:85:aa:2d:48
+# Subject: CN=Cybertrust Global Root,O="Cybertrust, Inc"
+# Not Valid Before: Fri Dec 15 08:00:00 2006
+# Not Valid After : Wed Dec 15 08:00:00 2021
+# Fingerprint (MD5): 72:E4:4A:87:E3:69:40:80:77:EA:BC:E3:F4:FF:F0:E1
+# Fingerprint (SHA1): 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "GeoTrust Primary Certification Authority - G3"
+CKA_LABEL UTF8 "Cybertrust Global Root"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\003\236\355\270\013\347\240\074\151\123\211\073\040\322\331\062
-\072\114\052\375
+\137\103\345\261\277\370\170\214\254\034\307\312\112\232\306\042
+\053\314\064\306
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\265\350\064\066\311\020\104\130\110\160\155\056\203\324\270\005
+\162\344\112\207\343\151\100\200\167\352\274\343\364\377\360\341
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\026\060\024\006\003\125\004\012\023\015\107\145\157\124\162
-\165\163\164\040\111\156\143\056\061\071\060\067\006\003\125\004
-\013\023\060\050\143\051\040\062\060\060\070\040\107\145\157\124
-\162\165\163\164\040\111\156\143\056\040\055\040\106\157\162\040
-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157
-\156\154\171\061\066\060\064\006\003\125\004\003\023\055\107\145
-\157\124\162\165\163\164\040\120\162\151\155\141\162\171\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\063
+\060\073\061\030\060\026\006\003\125\004\012\023\017\103\171\142
+\145\162\164\162\165\163\164\054\040\111\156\143\061\037\060\035
+\006\003\125\004\003\023\026\103\171\142\145\162\164\162\165\163
+\164\040\107\154\157\142\141\154\040\122\157\157\164
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\025\254\156\224\031\262\171\113\101\366\047\251\303\030
-\017\037
+\002\013\004\000\000\000\000\001\017\205\252\055\110
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
@@ -6563,303 +5159,298 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "thawte Primary Root CA - G2"
+# Certificate "ePKI Root Certification Authority"
 #
-# Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US
-# Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56
-# Subject: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US
-# Not Valid Before: Mon Nov 05 00:00:00 2007
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 74:9D:EA:60:24:C4:FD:22:53:3E:CC:3A:72:D9:29:4F
-# Fingerprint (SHA1): AA:DB:BC:22:23:8F:C4:01:A1:27:BB:38:DD:F4:1D:DB:08:9E:F0:12
+# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
+# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
+# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
+# Not Valid Before: Mon Dec 20 02:31:27 2004
+# Not Valid After : Wed Dec 20 02:31:27 2034
+# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3
+# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA - G2"
+CKA_LABEL UTF8 "ePKI Root Certification Authority"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013
-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164
-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167
-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040
-\103\101\040\055\040\107\062
+\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
+\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
+\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
+\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
+\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013
-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164
-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167
-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040
-\103\101\040\055\040\107\062
+\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
+\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
+\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
+\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
+\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256
-\327\126
+\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322
+\274\235
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\002\210\060\202\002\015\240\003\002\001\002\002\020\065
-\374\046\134\331\204\117\311\075\046\075\127\233\256\327\126\060
-\012\006\010\052\206\110\316\075\004\003\003\060\201\204\061\013
-\060\011\006\003\125\004\006\023\002\125\123\061\025\060\023\006
-\003\125\004\012\023\014\164\150\141\167\164\145\054\040\111\156
-\143\056\061\070\060\066\006\003\125\004\013\023\057\050\143\051
-\040\062\060\060\067\040\164\150\141\167\164\145\054\040\111\156
-\143\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151
-\172\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042
-\006\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162
-\151\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040
-\107\062\060\036\027\015\060\067\061\061\060\065\060\060\060\060
-\060\060\132\027\015\063\070\060\061\061\070\062\063\065\071\065
-\071\132\060\201\204\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\025\060\023\006\003\125\004\012\023\014\164\150\141
-\167\164\145\054\040\111\156\143\056\061\070\060\066\006\003\125
-\004\013\023\057\050\143\051\040\062\060\060\067\040\164\150\141
-\167\164\145\054\040\111\156\143\056\040\055\040\106\157\162\040
-\141\165\164\150\157\162\151\172\145\144\040\165\163\145\040\157
-\156\154\171\061\044\060\042\006\003\125\004\003\023\033\164\150
-\141\167\164\145\040\120\162\151\155\141\162\171\040\122\157\157
-\164\040\103\101\040\055\040\107\062\060\166\060\020\006\007\052
-\206\110\316\075\002\001\006\005\053\201\004\000\042\003\142\000
-\004\242\325\234\202\173\225\235\361\122\170\207\376\212\026\277
-\005\346\337\243\002\117\015\007\306\000\121\272\014\002\122\055
-\042\244\102\071\304\376\217\352\311\301\276\324\115\377\237\172
-\236\342\261\174\232\255\247\206\011\163\207\321\347\232\343\172
-\245\252\156\373\272\263\160\300\147\210\242\065\324\243\232\261
-\375\255\302\357\061\372\250\271\363\373\010\306\221\321\373\051
-\225\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004
-\024\232\330\000\060\000\347\153\177\205\030\356\213\266\316\212
-\014\370\021\341\273\060\012\006\010\052\206\110\316\075\004\003
-\003\003\151\000\060\146\002\061\000\335\370\340\127\107\133\247
-\346\012\303\275\365\200\212\227\065\015\033\211\074\124\206\167
-\050\312\241\364\171\336\265\346\070\260\360\145\160\214\177\002
-\124\302\277\377\330\241\076\331\317\002\061\000\304\215\224\374
-\334\123\322\334\235\170\026\037\025\063\043\123\122\343\132\061
-\135\235\312\256\275\023\051\104\015\047\133\250\347\150\234\022
-\367\130\077\056\162\002\127\243\217\241\024\056
+\060\202\005\260\060\202\003\230\240\003\002\001\002\002\020\025
+\310\275\145\107\134\257\270\227\000\136\344\006\322\274\235\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\136
+\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060
+\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141
+\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164
+\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113
+\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036
+\027\015\060\064\061\062\062\060\060\062\063\061\062\067\132\027
+\015\063\064\061\062\062\060\060\062\063\061\062\067\132\060\136
+\061\013\060\011\006\003\125\004\006\023\002\124\127\061\043\060
+\041\006\003\125\004\012\014\032\103\150\165\156\147\150\167\141
+\040\124\145\154\145\143\157\155\040\103\157\056\054\040\114\164
+\144\056\061\052\060\050\006\003\125\004\013\014\041\145\120\113
+\111\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\202
+\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000\341
+\045\017\356\215\333\210\063\165\147\315\255\037\175\072\116\155
+\235\323\057\024\363\143\164\313\001\041\152\067\352\204\120\007
+\113\046\133\011\103\154\041\236\152\310\325\003\365\140\151\217
+\314\360\042\344\037\347\367\152\042\061\267\054\025\362\340\376
+\000\152\103\377\207\145\306\265\032\301\247\114\155\042\160\041
+\212\061\362\227\164\211\011\022\046\034\236\312\331\022\242\225
+\074\332\351\147\277\010\240\144\343\326\102\267\105\357\227\364
+\366\365\327\265\112\025\002\130\175\230\130\113\140\274\315\327
+\015\232\023\063\123\321\141\371\172\325\327\170\263\232\063\367
+\000\206\316\035\115\224\070\257\250\354\170\121\160\212\134\020
+\203\121\041\367\021\075\064\206\136\345\110\315\227\201\202\065
+\114\031\354\145\366\153\305\005\241\356\107\023\326\263\041\047
+\224\020\012\331\044\073\272\276\104\023\106\060\077\227\074\330
+\327\327\152\356\073\070\343\053\324\227\016\271\033\347\007\111
+\177\067\052\371\167\170\317\124\355\133\106\235\243\200\016\221
+\103\301\326\133\137\024\272\237\246\215\044\107\100\131\277\162
+\070\262\066\154\067\377\231\321\135\016\131\012\253\151\367\300
+\262\004\105\172\124\000\256\276\123\366\265\347\341\370\074\243
+\061\322\251\376\041\122\144\305\246\147\360\165\007\006\224\024
+\201\125\306\047\344\001\217\027\301\152\161\327\276\113\373\224
+\130\175\176\021\063\261\102\367\142\154\030\326\317\011\150\076
+\177\154\366\036\217\142\255\245\143\333\011\247\037\042\102\101
+\036\157\231\212\076\327\371\077\100\172\171\260\245\001\222\322
+\235\075\010\025\245\020\001\055\263\062\166\250\225\015\263\172
+\232\373\007\020\170\021\157\341\217\307\272\017\045\032\164\052
+\345\034\230\101\231\337\041\207\350\225\006\152\012\263\152\107
+\166\145\366\072\317\217\142\027\031\173\012\050\315\032\322\203
+\036\041\307\054\277\276\377\141\150\267\147\033\273\170\115\215
+\316\147\345\344\301\216\267\043\146\342\235\220\165\064\230\251
+\066\053\212\232\224\271\235\354\314\212\261\370\045\211\134\132
+\266\057\214\037\155\171\044\247\122\150\303\204\065\342\146\215
+\143\016\045\115\325\031\262\346\171\067\247\042\235\124\061\002
+\003\001\000\001\243\152\060\150\060\035\006\003\125\035\016\004
+\026\004\024\036\014\367\266\147\362\341\222\046\011\105\300\125
+\071\056\167\077\102\112\242\060\014\006\003\125\035\023\004\005
+\060\003\001\001\377\060\071\006\004\147\052\007\000\004\061\060
+\057\060\055\002\001\000\060\011\006\005\053\016\003\002\032\005
+\000\060\007\006\005\147\052\003\000\000\004\024\105\260\302\307
+\012\126\174\356\133\170\014\225\371\030\123\301\246\034\330\020
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
+\202\002\001\000\011\263\203\123\131\001\076\225\111\271\361\201
+\272\371\166\040\043\265\047\140\164\324\152\231\064\136\154\000
+\123\331\237\362\246\261\044\007\104\152\052\306\245\216\170\022
+\350\107\331\130\033\023\052\136\171\233\237\012\052\147\246\045
+\077\006\151\126\163\303\212\146\110\373\051\201\127\164\006\312
+\234\352\050\350\070\147\046\053\361\325\265\077\145\223\370\066
+\135\216\215\215\100\040\207\031\352\357\047\300\075\264\071\017
+\045\173\150\120\164\125\234\014\131\175\132\075\101\224\045\122
+\010\340\107\054\025\061\031\325\277\007\125\306\273\022\265\227
+\364\137\203\205\272\161\301\331\154\201\021\166\012\012\260\277
+\202\227\367\352\075\372\372\354\055\251\050\224\073\126\335\322
+\121\056\256\300\275\010\025\214\167\122\064\226\326\233\254\323
+\035\216\141\017\065\173\233\256\071\151\013\142\140\100\040\066
+\217\257\373\066\356\055\010\112\035\270\277\233\134\370\352\245
+\033\240\163\246\330\370\156\340\063\004\137\150\252\047\207\355
+\331\301\220\234\355\275\343\152\065\257\143\337\253\030\331\272
+\346\351\112\352\120\212\017\141\223\036\342\055\031\342\060\224
+\065\222\135\016\266\007\257\031\200\217\107\220\121\113\056\115
+\335\205\342\322\012\122\012\027\232\374\032\260\120\002\345\001
+\243\143\067\041\114\104\304\233\121\231\021\016\163\234\006\217
+\124\056\247\050\136\104\071\207\126\055\067\275\205\104\224\341
+\014\113\054\234\303\222\205\064\141\313\017\270\233\112\103\122
+\376\064\072\175\270\351\051\334\166\251\310\060\370\024\161\200
+\306\036\066\110\164\042\101\134\207\202\350\030\161\213\101\211
+\104\347\176\130\133\250\270\215\023\351\247\154\303\107\355\263
+\032\235\142\256\215\202\352\224\236\335\131\020\303\255\335\342
+\115\343\061\325\307\354\350\362\260\376\222\036\026\012\032\374
+\331\363\370\047\266\311\276\035\264\154\144\220\177\364\344\304
+\133\327\067\256\102\016\335\244\032\157\174\210\124\305\026\156
+\341\172\150\056\370\072\277\015\244\074\211\073\170\247\116\143
+\203\004\041\010\147\215\362\202\111\320\133\375\261\315\017\203
+\204\324\076\040\205\367\112\075\053\234\375\052\012\011\115\352
+\201\370\021\234
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Sun Sep 30 00:00:00 2018
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\070\060\071\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "thawte Primary Root CA - G2"
-# Issuer: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US
-# Serial Number:35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56
-# Subject: CN=thawte Primary Root CA - G2,OU="(c) 2007 thawte, Inc. - For authorized use only",O="thawte, Inc.",C=US
-# Not Valid Before: Mon Nov 05 00:00:00 2007
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 74:9D:EA:60:24:C4:FD:22:53:3E:CC:3A:72:D9:29:4F
-# Fingerprint (SHA1): AA:DB:BC:22:23:8F:C4:01:A1:27:BB:38:DD:F4:1D:DB:08:9E:F0:12
+# Trust for Certificate "ePKI Root Certification Authority"
+# Issuer: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
+# Serial Number:15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
+# Subject: OU=ePKI Root Certification Authority,O="Chunghwa Telecom Co., Ltd.",C=TW
+# Not Valid Before: Mon Dec 20 02:31:27 2004
+# Not Valid After : Wed Dec 20 02:31:27 2034
+# Fingerprint (MD5): 1B:2E:00:CA:26:06:90:3D:AD:FE:6F:15:68:D3:6B:B3
+# Fingerprint (SHA1): 67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA - G2"
+CKA_LABEL UTF8 "ePKI Root Certification Authority"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\252\333\274\042\043\217\304\001\241\047\273\070\335\364\035\333
-\010\236\360\022
+\147\145\015\361\176\216\176\133\202\100\244\364\126\113\317\342
+\075\151\306\360
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\164\235\352\140\044\304\375\042\123\076\314\072\162\331\051\117
+\033\056\000\312\046\006\220\075\255\376\157\025\150\323\153\263
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\204\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\070\060\066\006\003\125\004\013
-\023\057\050\143\051\040\062\060\060\067\040\164\150\141\167\164
-\145\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\044\060\042\006\003\125\004\003\023\033\164\150\141\167
-\164\145\040\120\162\151\155\141\162\171\040\122\157\157\164\040
-\103\101\040\055\040\107\062
+\060\136\061\013\060\011\006\003\125\004\006\023\002\124\127\061
+\043\060\041\006\003\125\004\012\014\032\103\150\165\156\147\150
+\167\141\040\124\145\154\145\143\157\155\040\103\157\056\054\040
+\114\164\144\056\061\052\060\050\006\003\125\004\013\014\041\145
+\120\113\111\040\122\157\157\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\065\374\046\134\331\204\117\311\075\046\075\127\233\256
-\327\126
+\002\020\025\310\275\145\107\134\257\270\227\000\136\344\006\322
+\274\235
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "thawte Primary Root CA - G3"
+# Certificate "certSIGN ROOT CA"
 #
-# Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb
-# Subject: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Not Valid Before: Wed Apr 02 00:00:00 2008
-# Not Valid After : Tue Dec 01 23:59:59 2037
-# Fingerprint (MD5): FB:1B:5D:43:8A:94:CD:44:C6:76:F2:43:4B:47:E7:31
-# Fingerprint (SHA1): F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2
+# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO
+# Serial Number:20:06:05:16:70:02
+# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO
+# Not Valid Before: Tue Jul 04 17:20:04 2006
+# Not Valid After : Fri Jul 04 17:20:04 2031
+# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17
+# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
 CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA - G3"
+CKA_LABEL UTF8 "certSIGN ROOT CA"
 CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
 CKA_SUBJECT MULTILINE_OCTAL
-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006
-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107
-\063
+\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
+\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
+\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
+\164\123\111\107\116\040\122\117\117\124\040\103\101
 END
 CKA_ID UTF8 "0"
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006
-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107
-\063
+\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
+\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
+\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
+\164\123\111\107\116\040\122\117\117\124\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367
-\220\373
+\002\006\040\006\005\026\160\002
 END
 CKA_VALUE MULTILINE_OCTAL
-\060\202\004\052\060\202\003\022\240\003\002\001\002\002\020\140
-\001\227\267\106\247\352\264\264\232\326\113\057\367\220\373\060
-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060\201
-\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061\025
-\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145\054
-\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023\037
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123\145
-\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156\061
-\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062\060
-\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056\040
-\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145\144
-\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003\125
-\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155\141
-\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063\060
-\036\027\015\060\070\060\064\060\062\060\060\060\060\060\060\132
-\027\015\063\067\061\062\060\061\062\063\065\071\065\071\132\060
-\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164\145
-\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013\023
-\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123
-\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156
-\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040\062
-\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143\056
-\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172\145
-\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006\003
-\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151\155
-\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107\063
-\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001\001
-\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001\001
-\000\262\277\047\054\373\333\330\133\335\170\173\033\236\167\146
-\201\313\076\274\174\256\363\246\047\232\064\243\150\061\161\070
-\063\142\344\363\161\146\171\261\251\145\243\245\213\325\217\140
-\055\077\102\314\252\153\062\300\043\313\054\101\335\344\337\374
-\141\234\342\163\262\042\225\021\103\030\137\304\266\037\127\154
-\012\005\130\042\310\066\114\072\174\245\321\317\206\257\210\247
-\104\002\023\164\161\163\012\102\131\002\370\033\024\153\102\337
-\157\137\272\153\202\242\235\133\347\112\275\036\001\162\333\113
-\164\350\073\177\177\175\037\004\264\046\233\340\264\132\254\107
-\075\125\270\327\260\046\122\050\001\061\100\146\330\331\044\275
-\366\052\330\354\041\111\134\233\366\172\351\177\125\065\176\226
-\153\215\223\223\047\313\222\273\352\254\100\300\237\302\370\200
-\317\135\364\132\334\316\164\206\246\076\154\013\123\312\275\222
-\316\031\006\162\346\014\134\070\151\307\004\326\274\154\316\133
-\366\367\150\234\334\045\025\110\210\241\351\251\370\230\234\340
-\363\325\061\050\141\021\154\147\226\215\071\231\313\302\105\044
-\071\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
-\035\016\004\026\004\024\255\154\252\224\140\234\355\344\377\372
-\076\012\164\053\143\003\367\266\131\277\060\015\006\011\052\206
-\110\206\367\015\001\001\013\005\000\003\202\001\001\000\032\100
-\330\225\145\254\011\222\211\306\071\364\020\345\251\016\146\123
-\135\170\336\372\044\221\273\347\104\121\337\306\026\064\012\357
-\152\104\121\352\053\007\212\003\172\303\353\077\012\054\122\026
-\240\053\103\271\045\220\077\160\251\063\045\155\105\032\050\073
-\047\317\252\303\051\102\033\337\073\114\300\063\064\133\101\210
-\277\153\053\145\257\050\357\262\365\303\252\146\316\173\126\356
-\267\310\313\147\301\311\234\032\030\270\304\303\111\003\361\140
-\016\120\315\106\305\363\167\171\367\266\025\340\070\333\307\057
-\050\240\014\077\167\046\164\331\045\022\332\061\332\032\036\334
-\051\101\221\042\074\151\247\273\002\362\266\134\047\003\211\364
-\006\352\233\344\162\202\343\241\011\301\351\000\031\323\076\324
-\160\153\272\161\246\252\130\256\364\273\351\154\266\357\207\314
-\233\273\377\071\346\126\141\323\012\247\304\134\114\140\173\005
-\167\046\172\277\330\007\122\054\142\367\160\143\331\071\274\157
-\034\302\171\334\166\051\257\316\305\054\144\004\136\210\066\156
-\061\324\100\032\142\064\066\077\065\001\256\254\143\240
+\060\202\003\070\060\202\002\040\240\003\002\001\002\002\006\040
+\006\005\026\160\002\060\015\006\011\052\206\110\206\367\015\001
+\001\005\005\000\060\073\061\013\060\011\006\003\125\004\006\023
+\002\122\117\061\021\060\017\006\003\125\004\012\023\010\143\145
+\162\164\123\111\107\116\061\031\060\027\006\003\125\004\013\023
+\020\143\145\162\164\123\111\107\116\040\122\117\117\124\040\103
+\101\060\036\027\015\060\066\060\067\060\064\061\067\062\060\060
+\064\132\027\015\063\061\060\067\060\064\061\067\062\060\060\064
+\132\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117
+\061\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123
+\111\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145
+\162\164\123\111\107\116\040\122\117\117\124\040\103\101\060\202
+\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\267
+\063\271\176\310\045\112\216\265\333\264\050\033\252\127\220\350
+\321\042\323\144\272\323\223\350\324\254\206\141\100\152\140\127
+\150\124\204\115\274\152\124\002\005\377\337\233\232\052\256\135
+\007\217\112\303\050\177\357\373\053\372\171\361\307\255\360\020
+\123\044\220\213\146\311\250\210\253\257\132\243\000\351\276\272
+\106\356\133\163\173\054\027\202\201\136\142\054\241\002\145\263
+\275\305\053\000\176\304\374\003\063\127\015\355\342\372\316\135
+\105\326\070\315\065\266\262\301\320\234\201\112\252\344\262\001
+\134\035\217\137\231\304\261\255\333\210\041\353\220\010\202\200
+\363\060\243\103\346\220\202\256\125\050\111\355\133\327\251\020
+\070\016\376\217\114\133\233\106\352\101\365\260\010\164\303\320
+\210\063\266\174\327\164\337\334\204\321\103\016\165\071\241\045
+\100\050\352\170\313\016\054\056\071\235\214\213\156\026\034\057
+\046\202\020\342\343\145\224\012\004\300\136\367\135\133\370\020
+\342\320\272\172\113\373\336\067\000\000\032\133\050\343\322\234
+\163\076\062\207\230\241\311\121\057\327\336\254\063\263\117\002
+\003\001\000\001\243\102\060\100\060\017\006\003\125\035\023\001
+\001\377\004\005\060\003\001\001\377\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\001\306\060\035\006\003\125\035\016
+\004\026\004\024\340\214\233\333\045\111\263\361\174\206\326\262
+\102\207\013\320\153\240\331\344\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\202\001\001\000\076\322\034\211
+\056\065\374\370\165\335\346\177\145\210\364\162\114\311\054\327
+\062\116\363\335\031\171\107\275\216\073\133\223\017\120\111\044
+\023\153\024\006\162\357\011\323\241\241\343\100\204\311\347\030
+\062\164\074\110\156\017\237\113\324\367\036\323\223\206\144\124
+\227\143\162\120\325\125\317\372\040\223\002\242\233\303\043\223
+\116\026\125\166\240\160\171\155\315\041\037\317\057\055\274\031
+\343\210\061\370\131\032\201\011\310\227\246\164\307\140\304\133
+\314\127\216\262\165\375\033\002\011\333\131\157\162\223\151\367
+\061\101\326\210\070\277\207\262\275\026\171\371\252\344\276\210
+\045\335\141\047\043\034\265\061\007\004\066\264\032\220\275\240
+\164\161\120\211\155\274\024\343\017\206\256\361\253\076\307\240
+\011\314\243\110\321\340\333\144\347\222\265\317\257\162\103\160
+\213\371\303\204\074\023\252\176\222\233\127\123\223\372\160\302
+\221\016\061\371\233\147\135\351\226\070\136\137\263\163\116\210
+\025\147\336\236\166\020\142\040\276\125\151\225\103\000\071\115
+\366\356\260\132\116\111\104\124\130\137\102\203
 END
 CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Tue Apr 30 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\064\063\060\060\060\060\060\060\060\132
-END
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
 CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
 
-# Trust for Certificate "thawte Primary Root CA - G3"
-# Issuer: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Serial Number:60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb
-# Subject: CN=thawte Primary Root CA - G3,OU="(c) 2008 thawte, Inc. - For authorized use only",OU=Certification Services Division,O="thawte, Inc.",C=US
-# Not Valid Before: Wed Apr 02 00:00:00 2008
-# Not Valid After : Tue Dec 01 23:59:59 2037
-# Fingerprint (MD5): FB:1B:5D:43:8A:94:CD:44:C6:76:F2:43:4B:47:E7:31
-# Fingerprint (SHA1): F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2
+# Trust for Certificate "certSIGN ROOT CA"
+# Issuer: OU=certSIGN ROOT CA,O=certSIGN,C=RO
+# Serial Number:20:06:05:16:70:02
+# Subject: OU=certSIGN ROOT CA,O=certSIGN,C=RO
+# Not Valid Before: Tue Jul 04 17:20:04 2006
+# Not Valid After : Fri Jul 04 17:20:04 2031
+# Fingerprint (MD5): 18:98:C0:D6:E9:3A:FC:F9:B0:F5:0C:F7:4B:01:44:17
+# Fingerprint (SHA1): FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
 CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "thawte Primary Root CA - G3"
+CKA_LABEL UTF8 "certSIGN ROOT CA"
 CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\361\213\123\215\033\351\003\266\246\360\126\103\133\027\025\211
-\312\363\153\362
+\372\267\356\066\227\046\142\373\055\260\052\366\277\003\375\350
+\174\113\057\233
 END
 CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\373\033\135\103\212\224\315\104\306\166\362\103\113\107\347\061
+\030\230\300\326\351\072\374\371\260\365\014\367\113\001\104\027
 END
 CKA_ISSUER MULTILINE_OCTAL
-\060\201\256\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\025\060\023\006\003\125\004\012\023\014\164\150\141\167\164
-\145\054\040\111\156\143\056\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\070\060\066\006\003\125\004\013\023\057\050\143\051\040
-\062\060\060\070\040\164\150\141\167\164\145\054\040\111\156\143
-\056\040\055\040\106\157\162\040\141\165\164\150\157\162\151\172
-\145\144\040\165\163\145\040\157\156\154\171\061\044\060\042\006
-\003\125\004\003\023\033\164\150\141\167\164\145\040\120\162\151
-\155\141\162\171\040\122\157\157\164\040\103\101\040\055\040\107
-\063
+\060\073\061\013\060\011\006\003\125\004\006\023\002\122\117\061
+\021\060\017\006\003\125\004\012\023\010\143\145\162\164\123\111
+\107\116\061\031\060\027\006\003\125\004\013\023\020\143\145\162
+\164\123\111\107\116\040\122\117\117\124\040\103\101
 END
 CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\140\001\227\267\106\247\352\264\264\232\326\113\057\367
-\220\373
+\002\006\040\006\005\026\160\002
 END
 CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
@@ -7180,167 +5771,6 @@
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
 #
-# Certificate "VeriSign Class 3 Public Primary Certification Authority - G4"
-#
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Mon Nov 05 00:00:00 2007
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 3A:52:E1:E7:FD:6F:3A:E3:6F:F3:6F:99:1B:F9:22:41
-# Fingerprint (SHA1): 22:D5:D8:DF:8F:02:31:D1:8D:F7:9D:B7:CF:8A:2D:64:C9:3F:6C:3A
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\064
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\064
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207
-\254\263
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\204\060\202\003\012\240\003\002\001\002\002\020\057
-\200\376\043\214\016\042\017\110\147\022\050\221\207\254\263\060
-\012\006\010\052\206\110\316\075\004\003\003\060\201\312\061\013
-\060\011\006\003\125\004\006\023\002\125\123\061\027\060\025\006
-\003\125\004\012\023\016\126\145\162\151\123\151\147\156\054\040
-\111\156\143\056\061\037\060\035\006\003\125\004\013\023\026\126
-\145\162\151\123\151\147\156\040\124\162\165\163\164\040\116\145
-\164\167\157\162\153\061\072\060\070\006\003\125\004\013\023\061
-\050\143\051\040\062\060\060\067\040\126\145\162\151\123\151\147
-\156\054\040\111\156\143\056\040\055\040\106\157\162\040\141\165
-\164\150\157\162\151\172\145\144\040\165\163\145\040\157\156\154
-\171\061\105\060\103\006\003\125\004\003\023\074\126\145\162\151
-\123\151\147\156\040\103\154\141\163\163\040\063\040\120\165\142
-\154\151\143\040\120\162\151\155\141\162\171\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\055\040\107\064\060\036\027\015\060\067\061\061
-\060\065\060\060\060\060\060\060\132\027\015\063\070\060\061\061
-\070\062\063\065\071\065\071\132\060\201\312\061\013\060\011\006
-\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004
-\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143
-\056\061\037\060\035\006\003\125\004\013\023\026\126\145\162\151
-\123\151\147\156\040\124\162\165\163\164\040\116\145\164\167\157
-\162\153\061\072\060\070\006\003\125\004\013\023\061\050\143\051
-\040\062\060\060\067\040\126\145\162\151\123\151\147\156\054\040
-\111\156\143\056\040\055\040\106\157\162\040\141\165\164\150\157
-\162\151\172\145\144\040\165\163\145\040\157\156\154\171\061\105
-\060\103\006\003\125\004\003\023\074\126\145\162\151\123\151\147
-\156\040\103\154\141\163\163\040\063\040\120\165\142\154\151\143
-\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\040\055\040\107\064\060\166\060\020\006\007\052\206\110\316\075
-\002\001\006\005\053\201\004\000\042\003\142\000\004\247\126\172
-\174\122\332\144\233\016\055\134\330\136\254\222\075\376\001\346
-\031\112\075\024\003\113\372\140\047\040\331\203\211\151\372\124
-\306\232\030\136\125\052\144\336\006\366\215\112\073\255\020\074
-\145\075\220\210\004\211\340\060\141\263\256\135\001\247\173\336
-\174\262\276\312\145\141\000\206\256\332\217\173\320\211\255\115
-\035\131\232\101\261\274\107\200\334\236\142\303\371\243\201\262
-\060\201\257\060\017\006\003\125\035\023\001\001\377\004\005\060
-\003\001\001\377\060\016\006\003\125\035\017\001\001\377\004\004
-\003\002\001\006\060\155\006\010\053\006\001\005\005\007\001\014
-\004\141\060\137\241\135\240\133\060\131\060\127\060\125\026\011
-\151\155\141\147\145\057\147\151\146\060\041\060\037\060\007\006
-\005\053\016\003\002\032\004\024\217\345\323\032\206\254\215\216
-\153\303\317\200\152\324\110\030\054\173\031\056\060\045\026\043
-\150\164\164\160\072\057\057\154\157\147\157\056\166\145\162\151
-\163\151\147\156\056\143\157\155\057\166\163\154\157\147\157\056
-\147\151\146\060\035\006\003\125\035\016\004\026\004\024\263\026
-\221\375\356\246\156\344\265\056\111\217\207\170\201\200\354\345
-\261\265\060\012\006\010\052\206\110\316\075\004\003\003\003\150
-\000\060\145\002\060\146\041\014\030\046\140\132\070\173\126\102
-\340\247\374\066\204\121\221\040\054\166\115\103\075\304\035\204
-\043\320\254\326\174\065\006\316\315\151\275\220\015\333\154\110
-\102\035\016\252\102\002\061\000\234\075\110\071\043\071\130\032
-\025\022\131\152\236\357\325\131\262\035\122\054\231\161\315\307
-\051\337\033\052\141\173\161\321\336\363\300\345\015\072\112\252
-\055\247\330\206\052\335\056\020
-END
-CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
-# For Server Distrust After: Thu Jan 31 00:00:00 2019
-CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-\061\071\060\061\063\061\060\060\060\060\060\060\132
-END
-CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
-
-# Trust for Certificate "VeriSign Class 3 Public Primary Certification Authority - G4"
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Serial Number:2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4,OU="(c) 2007 VeriSign, Inc. - For authorized use only",OU=VeriSign Trust Network,O="VeriSign, Inc.",C=US
-# Not Valid Before: Mon Nov 05 00:00:00 2007
-# Not Valid After : Mon Jan 18 23:59:59 2038
-# Fingerprint (MD5): 3A:52:E1:E7:FD:6F:3A:E3:6F:F3:6F:99:1B:F9:22:41
-# Fingerprint (SHA1): 22:D5:D8:DF:8F:02:31:D1:8D:F7:9D:B7:CF:8A:2D:64:C9:3F:6C:3A
-CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "VeriSign Class 3 Public Primary Certification Authority - G4"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\042\325\330\337\217\002\061\321\215\367\235\267\317\212\055\144
-\311\077\154\072
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\072\122\341\347\375\157\072\343\157\363\157\231\033\371\042\101
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\312\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123
-\151\147\156\054\040\111\156\143\056\061\037\060\035\006\003\125
-\004\013\023\026\126\145\162\151\123\151\147\156\040\124\162\165
-\163\164\040\116\145\164\167\157\162\153\061\072\060\070\006\003
-\125\004\013\023\061\050\143\051\040\062\060\060\067\040\126\145
-\162\151\123\151\147\156\054\040\111\156\143\056\040\055\040\106
-\157\162\040\141\165\164\150\157\162\151\172\145\144\040\165\163
-\145\040\157\156\154\171\061\105\060\103\006\003\125\004\003\023
-\074\126\145\162\151\123\151\147\156\040\103\154\141\163\163\040
-\063\040\120\165\142\154\151\143\040\120\162\151\155\141\162\171
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\040\055\040\107\064
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\057\200\376\043\214\016\042\017\110\147\022\050\221\207
-\254\263
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
 # Certificate "NetLock Arany (Class Gold) Főtanúsítvány"
 #
 # Issuer: CN=NetLock Arany (Class Gold) F..tan..s..tv..ny,OU=Tan..s..tv..nykiad..k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU
@@ -23100,3 +21530,177 @@
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "NAVER Global Root Certification Authority"
+#
+# Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR
+# Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d
+# Subject: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR
+# Not Valid Before: Fri Aug 18 08:58:42 2017
+# Not Valid After : Tue Aug 18 23:59:59 2037
+# Fingerprint (SHA-256): 88:F4:38:DC:F8:FF:D1:FA:8F:42:91:15:FF:E5:F8:2A:E1:E0:6E:0C:70:C3:75:FA:AD:71:7B:34:A4:9E:72:65
+# Fingerprint (SHA1): 8F:6B:F2:A9:27:4A:DA:14:A0:C4:F4:8E:61:27:F9:C0:1E:78:5D:D1
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "NAVER Global Root Certification Authority"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061
+\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040
+\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122
+\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003
+\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122
+\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061
+\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040
+\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122
+\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003
+\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122
+\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\001\224\060\036\242\013\335\365\305\063\052\261\103\104
+\161\370\326\120\115\015
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\242\060\202\003\212\240\003\002\001\002\002\024\001
+\224\060\036\242\013\335\365\305\063\052\261\103\104\161\370\326
+\120\115\015\060\015\006\011\052\206\110\206\367\015\001\001\014
+\005\000\060\151\061\013\060\011\006\003\125\004\006\023\002\113
+\122\061\046\060\044\006\003\125\004\012\014\035\116\101\126\105
+\122\040\102\125\123\111\116\105\123\123\040\120\114\101\124\106
+\117\122\115\040\103\157\162\160\056\061\062\060\060\006\003\125
+\004\003\014\051\116\101\126\105\122\040\107\154\157\142\141\154
+\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036\027
+\015\061\067\060\070\061\070\060\070\065\070\064\062\132\027\015
+\063\067\060\070\061\070\062\063\065\071\065\071\132\060\151\061
+\013\060\011\006\003\125\004\006\023\002\113\122\061\046\060\044
+\006\003\125\004\012\014\035\116\101\126\105\122\040\102\125\123
+\111\116\105\123\123\040\120\114\101\124\106\117\122\115\040\103
+\157\162\160\056\061\062\060\060\006\003\125\004\003\014\051\116
+\101\126\105\122\040\107\154\157\142\141\154\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\060\202\002\042\060\015\006\011
+\052\206\110\206\367\015\001\001\001\005\000\003\202\002\017\000
+\060\202\002\012\002\202\002\001\000\266\324\361\223\134\265\100
+\211\012\253\015\220\133\120\143\256\220\224\164\027\105\162\326
+\173\145\132\051\113\247\126\240\113\270\057\102\165\351\331\173
+\044\132\061\145\253\027\027\321\063\072\331\021\334\100\066\207
+\337\307\152\351\046\136\131\212\167\343\350\110\234\061\026\372
+\076\221\261\312\311\243\342\237\316\041\123\243\002\066\060\313
+\122\002\345\332\062\135\303\305\346\371\356\021\307\213\311\104
+\036\204\223\030\112\264\237\345\022\144\151\320\046\205\142\001
+\266\311\002\035\276\203\121\273\134\332\370\255\025\152\231\367
+\222\124\367\064\133\351\277\352\051\201\022\324\123\221\226\263
+\221\132\335\376\220\163\050\373\060\106\265\312\010\007\307\161
+\162\311\146\323\064\227\366\214\364\030\112\341\320\075\132\105
+\266\151\247\051\373\043\316\210\330\022\234\000\110\250\246\017
+\263\073\222\215\161\016\164\305\213\310\114\371\364\233\216\270
+\074\151\355\157\073\120\057\130\355\304\260\320\034\033\152\014
+\342\274\104\252\330\315\024\135\224\170\141\277\016\156\332\052
+\274\057\014\013\161\246\263\026\077\234\346\371\314\237\123\065
+\342\003\240\240\030\277\273\361\276\364\326\214\207\015\102\367
+\006\271\361\155\355\004\224\250\376\266\323\006\306\100\141\337
+\235\235\363\124\166\316\123\072\001\246\222\101\354\004\243\217
+\015\242\325\011\312\326\313\232\361\357\103\135\300\253\245\101
+\317\134\123\160\160\311\210\246\055\324\153\141\163\120\046\206
+\141\016\137\033\302\053\342\214\325\273\235\301\003\102\272\224
+\332\137\251\260\312\314\115\012\357\107\151\003\057\042\373\361
+\050\316\277\135\120\145\250\220\155\263\164\260\010\307\254\250
+\321\353\076\234\374\135\032\203\056\053\313\265\363\104\235\072
+\247\027\141\226\242\161\323\160\226\025\115\267\114\163\356\031
+\134\305\133\076\101\376\254\165\140\073\033\143\316\000\335\332
+\010\220\142\264\345\055\356\110\247\153\027\231\124\276\207\112
+\343\251\136\004\114\353\020\155\124\326\357\361\350\362\142\026
+\313\200\153\355\075\355\365\037\060\245\256\113\311\023\355\212
+\001\001\311\270\121\130\300\146\072\261\146\113\304\325\061\002
+\142\351\164\204\014\333\115\106\055\002\003\001\000\001\243\102
+\060\100\060\035\006\003\125\035\016\004\026\004\024\322\237\210
+\337\241\315\054\275\354\365\073\001\001\223\063\047\262\353\140
+\113\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001
+\006\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\015\006\011\052\206\110\206\367\015\001\001\014\005
+\000\003\202\002\001\000\062\312\200\263\235\075\124\006\335\322
+\322\056\360\244\001\041\013\147\110\312\155\216\340\310\252\015
+\252\215\041\127\217\306\076\172\312\333\121\324\122\263\324\226
+\204\245\130\140\177\345\013\216\037\365\334\012\025\201\345\073
+\266\267\042\057\011\234\023\026\261\154\014\065\010\155\253\143
+\162\355\334\276\354\307\127\346\060\040\161\326\327\020\301\023
+\125\001\214\052\103\344\101\361\317\072\172\123\222\316\242\003
+\005\015\070\337\002\273\020\056\331\073\322\233\172\300\241\246
+\370\265\061\346\364\165\311\271\123\231\165\107\042\132\024\025
+\307\170\033\266\235\351\014\370\033\166\361\205\204\336\241\332
+\022\357\244\342\020\227\172\170\336\014\121\227\250\041\100\213
+\206\275\015\360\136\116\113\066\273\073\040\037\212\102\126\341
+\013\032\277\173\320\042\103\054\104\214\373\345\052\264\154\034
+\034\272\224\340\023\176\041\346\232\302\313\305\102\144\264\036
+\224\173\010\045\310\161\314\207\105\127\205\323\237\051\142\042
+\203\121\227\000\030\227\167\152\230\222\311\174\140\154\337\154
+\175\112\344\160\114\302\236\270\035\367\320\064\307\017\314\373
+\247\377\003\276\255\160\220\332\013\335\310\155\227\137\232\177
+\011\062\101\375\315\242\314\132\155\114\362\252\111\376\146\370
+\351\330\065\353\016\050\036\356\110\057\072\320\171\011\070\174
+\246\042\202\223\225\320\003\276\276\002\240\005\335\040\042\343
+\157\035\210\064\140\306\346\012\271\011\165\013\360\007\350\151
+\226\065\307\373\043\201\216\070\071\270\105\053\103\170\242\321
+\054\024\377\015\050\162\162\225\233\136\011\333\211\104\230\252
+\241\111\273\161\122\362\277\366\377\047\241\066\257\270\266\167
+\210\335\072\244\155\233\064\220\334\024\135\060\277\267\353\027
+\344\207\267\161\320\241\327\167\025\324\102\327\362\363\061\231
+\135\233\335\026\155\077\352\006\043\370\106\242\042\355\223\366
+\335\232\346\052\207\261\230\124\361\042\367\153\105\343\342\216
+\166\035\232\215\304\006\215\066\267\024\363\235\124\151\267\216
+\074\325\244\155\223\201\267\255\366\275\144\173\302\311\150\071
+\240\222\234\315\064\206\221\220\372\144\121\235\376\376\353\245
+\365\165\336\211\367\162
+END
+CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE
+CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE
+CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE
+
+# Trust for "NAVER Global Root Certification Authority"
+# Issuer: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR
+# Serial Number:01:94:30:1e:a2:0b:dd:f5:c5:33:2a:b1:43:44:71:f8:d6:50:4d:0d
+# Subject: CN=NAVER Global Root Certification Authority,O=NAVER BUSINESS PLATFORM Corp.,C=KR
+# Not Valid Before: Fri Aug 18 08:58:42 2017
+# Not Valid After : Tue Aug 18 23:59:59 2037
+# Fingerprint (SHA-256): 88:F4:38:DC:F8:FF:D1:FA:8F:42:91:15:FF:E5:F8:2A:E1:E0:6E:0C:70:C3:75:FA:AD:71:7B:34:A4:9E:72:65
+# Fingerprint (SHA1): 8F:6B:F2:A9:27:4A:DA:14:A0:C4:F4:8E:61:27:F9:C0:1E:78:5D:D1
+CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "NAVER Global Root Certification Authority"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\217\153\362\251\047\112\332\024\240\304\364\216\141\047\371\300
+\036\170\135\321
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\310\176\101\366\045\073\365\011\263\027\350\106\075\277\320\233
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\151\061\013\060\011\006\003\125\004\006\023\002\113\122\061
+\046\060\044\006\003\125\004\012\014\035\116\101\126\105\122\040
+\102\125\123\111\116\105\123\123\040\120\114\101\124\106\117\122
+\115\040\103\157\162\160\056\061\062\060\060\006\003\125\004\003
+\014\051\116\101\126\105\122\040\107\154\157\142\141\154\040\122
+\157\157\164\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\024\001\224\060\036\242\013\335\365\305\063\052\261\103\104
+\161\370\326\120\115\015
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff -Nru firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/nssckbi.h firefox-85.0+build1/security/nss/lib/ckfw/builtins/nssckbi.h
--- firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/nssckbi.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ckfw/builtins/nssckbi.h	2021-01-18 19:58:19.000000000 +0000
@@ -46,8 +46,8 @@
  * It's recommend to switch back to 0 after having reached version 98/99.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 44
-#define NSS_BUILTINS_LIBRARY_VERSION "2.44"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 46
+#define NSS_BUILTINS_LIBRARY_VERSION "2.46"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff -Nru firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/testlib/builtins-testlib.gyp firefox-85.0+build1/security/nss/lib/ckfw/builtins/testlib/builtins-testlib.gyp
--- firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/testlib/builtins-testlib.gyp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ckfw/builtins/testlib/builtins-testlib.gyp	2021-01-18 19:58:18.000000000 +0000
@@ -47,7 +47,7 @@
         }
       ],
       'variables': {
-        'mapfile': '../nssckbi.def',
+        'mapfile': 'nssckbi-testlib.def',
         'certdata-testlib_c': '<(INTERMEDIATE_DIR)/certdata-testlib.c',
       }
     }
diff -Nru firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/testlib/nssckbi-testlib.def firefox-85.0+build1/security/nss/lib/ckfw/builtins/testlib/nssckbi-testlib.def
--- firefox-84.0.2+build1/security/nss/lib/ckfw/builtins/testlib/nssckbi-testlib.def	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ckfw/builtins/testlib/nssckbi-testlib.def	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,26 @@
+;+#
+;+# 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/.
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#     line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+
+;+NSS_3.1 {       # NSS 3.1 release
+;+    global:
+LIBRARY nssckbi-testlib ;-
+EXPORTS ;-
+C_GetFunctionList;
+;+    local:
+;+*;
+;+};
diff -Nru firefox-84.0.2+build1/security/nss/lib/dev/devslot.c firefox-85.0+build1/security/nss/lib/dev/devslot.c
--- firefox-84.0.2+build1/security/nss/lib/dev/devslot.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/dev/devslot.c	2021-01-18 19:58:19.000000000 +0000
@@ -171,12 +171,11 @@
 
     nssSlot_EnterMonitor(slot);
     ckrv = CKAPI(epv)->C_GetSlotInfo(slot->slotID, &slotInfo);
+    nssSlot_ExitMonitor(slot);
     if (ckrv != CKR_OK) {
-        if (slot->token) {
-            slot->token->base.name[0] = 0; /* XXX */
-        }
+        slot->token->base.name[0] = 0; /* XXX */
         isPresent = PR_FALSE;
-        goto done; /* slot lock held */
+        goto done;
     }
     slot->ckFlags = slotInfo.flags;
     /* check for the presence of the token */
@@ -184,11 +183,10 @@
         if (!slot->token) {
             /* token was never present */
             isPresent = PR_FALSE;
-            goto done; /* slot lock held */
+            goto done;
         }
         session = nssToken_GetDefaultSession(slot->token);
         if (session) {
-            nssSlot_ExitMonitor(slot);
             nssSession_EnterMonitor(session);
             /* token is not present */
             if (session->handle != CK_INVALID_HANDLE) {
@@ -198,12 +196,6 @@
                 session->handle = CK_INVALID_HANDLE;
             }
             nssSession_ExitMonitor(session);
-            nssSlot_EnterMonitor(slot);
-            if (!slot->token) {
-                /* Check token presence after re-acquiring lock */
-                isPresent = PR_FALSE;
-                goto done; /* slot lock held */
-            }
         }
         if (slot->token->base.name[0] != 0) {
             /* notify the high-level cache that the token is removed */
@@ -214,23 +206,14 @@
         /* clear the token cache */
         nssToken_Remove(slot->token);
         isPresent = PR_FALSE;
-        goto done; /* slot lock held */
-    }
-    if (!slot->token) {
-        /* This should not occur, based on the fact that the
-         * below calls will dereference NULL otherwise. */
-        PORT_Assert(0);
-        isPresent = PR_FALSE;
-        goto done; /* slot lock held */
+        goto done;
     }
-
     /* token is present, use the session info to determine if the card
      * has been removed and reinserted.
      */
     session = nssToken_GetDefaultSession(slot->token);
     if (session) {
         PRBool tokenRemoved;
-        nssSlot_ExitMonitor(slot);
         nssSession_EnterMonitor(session);
         if (session->handle != CK_INVALID_HANDLE) {
             CK_SESSION_INFO sessionInfo;
@@ -244,16 +227,10 @@
         }
         tokenRemoved = (session->handle == CK_INVALID_HANDLE);
         nssSession_ExitMonitor(session);
-        nssSlot_EnterMonitor(slot);
         /* token not removed, finished */
         if (!tokenRemoved) {
             isPresent = PR_TRUE;
-            goto done; /* slot lock held */
-        }
-        if (!slot->token) {
-            /* Check token presence after re-acquiring lock */
-            isPresent = PR_FALSE;
-            goto done; /* slot lock held */
+            goto done;
         }
     }
     /* the token has been removed, and reinserted, or the slot contains
@@ -271,7 +248,6 @@
         isPresent = PR_FALSE;
     }
 done:
-    nssSlot_ExitMonitor(slot);
     /* Once we've set up the condition variable,
      * Before returning, it's necessary to:
      *  1) Set the lastTokenPingTime so that any other threads waiting on this
diff -Nru firefox-84.0.2+build1/security/nss/lib/freebl/blinit.c firefox-85.0+build1/security/nss/lib/freebl/blinit.c
--- firefox-84.0.2+build1/security/nss/lib/freebl/blinit.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/freebl/blinit.c	2021-01-18 19:58:19.000000000 +0000
@@ -231,6 +231,15 @@
         arm_sha1_support_ = ID_AA64ISAR0_SHA1_VAL(isar0) >= ID_AA64ISAR0_SHA1_BASE;
         arm_sha2_support_ = ID_AA64ISAR0_SHA2_VAL(isar0) >= ID_AA64ISAR0_SHA2_BASE;
     }
+#elif defined(__ARM_FEATURE_CRYPTO)
+    /*
+     * Although no feature detection, default compiler option allows ARM
+     * Crypto Extension.
+     */
+    arm_aes_support_ = PR_TRUE;
+    arm_pmull_support_ = PR_TRUE;
+    arm_sha1_support_ = PR_TRUE;
+    arm_sha2_support_ = PR_TRUE;
 #endif
     /* aarch64 must support NEON. */
     arm_neon_support_ = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON") == NULL;
diff -Nru firefox-84.0.2+build1/security/nss/lib/freebl/Makefile firefox-85.0+build1/security/nss/lib/freebl/Makefile
--- firefox-84.0.2+build1/security/nss/lib/freebl/Makefile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/freebl/Makefile	2021-01-18 19:58:19.000000000 +0000
@@ -293,9 +293,12 @@
 endif
 ifeq ($(CPU_ARCH),ppc)
     EXTRA_SRCS += gcm-ppc.c
-    ASFILES += sha512-p8.s
 ifdef USE_64
     DEFINES += -DNSS_NO_INIT_SUPPORT
+    PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
+    ifeq ($(PPC_ABI),2)
+        ASFILES += sha512-p8.s
+    endif
 endif # USE_64
 endif # ppc
 endif # Linux
diff -Nru firefox-84.0.2+build1/security/nss/lib/nss/nss.h firefox-85.0+build1/security/nss/lib/nss/nss.h
--- firefox-84.0.2+build1/security/nss/lib/nss/nss.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/nss/nss.h	2021-01-18 19:58:19.000000000 +0000
@@ -22,9 +22,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.59.1" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.60.1" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 59
+#define NSS_VMINOR 60
 #define NSS_VPATCH 1
 #define NSS_VBUILD 0
 #define NSS_BETA PR_FALSE
diff -Nru firefox-84.0.2+build1/security/nss/lib/pk11wrap/pk11obj.c firefox-85.0+build1/security/nss/lib/pk11wrap/pk11obj.c
--- firefox-84.0.2+build1/security/nss/lib/pk11wrap/pk11obj.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/pk11wrap/pk11obj.c	2021-01-18 19:58:19.000000000 +0000
@@ -1321,23 +1321,23 @@
                                                                 NULL, perm, sensitive);
                 SECKEY_DestroyPrivateKey(privKey);
                 PK11_FreeSlot(int_slot);
+                SECITEM_FreeItem(param_free, PR_TRUE);
                 return newPrivKey;
             }
         }
         if (int_slot)
             PK11_FreeSlot(int_slot);
         PORT_SetError(PK11_MapError(crv));
+        SECITEM_FreeItem(param_free, PR_TRUE);
         return NULL;
     }
+    SECITEM_FreeItem(param_free, PR_TRUE);
     return PK11_MakePrivKey(slot, nullKey, PR_FALSE, privKeyID, wincx);
 
 loser:
-    if (newKey) {
-        PK11_FreeSymKey(newKey);
-    }
-    if (ck_id) {
-        SECITEM_FreeItem(ck_id, PR_TRUE);
-    }
+    PK11_FreeSymKey(newKey);
+    SECITEM_FreeItem(ck_id, PR_TRUE);
+    SECITEM_FreeItem(param_free, PR_TRUE);
     return NULL;
 }
 
diff -Nru firefox-84.0.2+build1/security/nss/lib/softoken/softkver.h firefox-85.0+build1/security/nss/lib/softoken/softkver.h
--- firefox-84.0.2+build1/security/nss/lib/softoken/softkver.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/softoken/softkver.h	2021-01-18 19:58:19.000000000 +0000
@@ -17,9 +17,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.59.1" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.60.1" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 59
+#define SOFTOKEN_VMINOR 60
 #define SOFTOKEN_VPATCH 1
 #define SOFTOKEN_VBUILD 0
 #define SOFTOKEN_BETA PR_FALSE
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/manifest.mn firefox-85.0+build1/security/nss/lib/ssl/manifest.mn
--- firefox-84.0.2+build1/security/nss/lib/ssl/manifest.mn	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/manifest.mn	2021-01-18 19:58:19.000000000 +0000
@@ -60,7 +60,7 @@
         sslcert.c \
         sslgrp.c \
         sslprimitive.c \
-        tls13esni.c \
+        tls13ech.c \
         tls13subcerts.c \
         $(NULL)
 
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3con.c firefox-85.0+build1/security/nss/lib/ssl/ssl3con.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3con.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3con.c	2021-01-18 19:58:19.000000000 +0000
@@ -21,6 +21,8 @@
 #include "sslerr.h"
 #include "ssl3ext.h"
 #include "ssl3exthandle.h"
+#include "tls13ech.h"
+#include "tls13exthandle.h"
 #include "tls13psk.h"
 #include "tls13subcerts.h"
 #include "prtime.h"
@@ -62,7 +64,6 @@
                                                       PRUint8 *b,
                                                       PRUint32 length);
 static SECStatus ssl3_FlushHandshakeMessages(sslSocket *ss, PRInt32 flags);
-
 static CK_MECHANISM_TYPE ssl3_GetHashMechanismByHashType(SSLHashType hashType);
 static CK_MECHANISM_TYPE ssl3_GetMgfMechanismByHashType(SSLHashType hash);
 PRBool ssl_IsRsaPssSignatureScheme(SSLSignatureScheme scheme);
@@ -1035,27 +1036,6 @@
     return ssl3_CipherSuiteAllowedForVersionRange(suite->cipher_suite, vrange);
 }
 
-/* Return the number of cipher suites that are usable. */
-/* called from ssl3_SendClientHello */
-static unsigned int
-count_cipher_suites(sslSocket *ss, PRUint8 policy)
-{
-    unsigned int i, count = 0;
-
-    if (SSL_ALL_VERSIONS_DISABLED(&ss->vrange)) {
-        return 0;
-    }
-    for (i = 0; i < ssl_V3_SUITES_IMPLEMENTED; i++) {
-        if (ssl3_config_match(&ss->cipherSuites[i], policy, &ss->vrange, ss)) {
-            count++;
-        }
-    }
-    if (count == 0) {
-        PORT_SetError(SSL_ERROR_SSL_DISABLED);
-    }
-    return count;
-}
-
 /* For TLS 1.3, when resuming, check for a ciphersuite that is both compatible
  * with the identified ciphersuite and enabled. */
 static PRBool
@@ -1188,7 +1168,7 @@
     return SECSuccess;
 }
 
-static SECStatus
+SECStatus
 ssl3_GetNewRandom(SSL3Random random)
 {
     SECStatus rv;
@@ -3130,6 +3110,9 @@
         case bad_certificate_hash_value:
             error = SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT;
             break;
+        case ech_required:
+            error = SSL_ERROR_ECH_REQUIRED_ALERT;
+            break;
         default:
             error = SSL_ERROR_RX_UNKNOWN_ALERT;
             break;
@@ -3758,6 +3741,27 @@
     return SECFailure;
 }
 
+void
+ssl3_CoalesceEchHandshakeHashes(sslSocket *ss)
+{
+    /* |sha| contains the CHOuter transcript, which is the singular
+     * transcript if not doing ECH. If the server responded with 1.2,
+     * contexts are not yet initialized. */
+    if (ss->ssl3.hs.echAccepted) {
+        if (ss->ssl3.hs.sha) {
+            PORT_Assert(ss->ssl3.hs.shaEchInner);
+            PK11_DestroyContext(ss->ssl3.hs.sha, PR_TRUE);
+            ss->ssl3.hs.sha = ss->ssl3.hs.shaEchInner;
+            ss->ssl3.hs.shaEchInner = NULL;
+        }
+    } else {
+        if (ss->ssl3.hs.shaEchInner) {
+            PK11_DestroyContext(ss->ssl3.hs.shaEchInner, PR_TRUE);
+            ss->ssl3.hs.shaEchInner = NULL;
+        }
+    }
+}
+
 /* ssl3_InitHandshakeHashes creates handshake hash contexts and hashes in
  * buffered messages in ss->ssl3.hs.messages. Called from
  * ssl3_NegotiateCipherSuite(), tls13_HandleClientHelloPart2(),
@@ -3802,6 +3806,18 @@
                 return SECFailure;
             }
 
+            /* Alternate transcript hash used in Encrypted Client Hello. */
+            if (!ss->sec.isServer && ss->ssl3.hs.echHpkeCtx) {
+                ss->ssl3.hs.shaEchInner = PK11_CreateDigestContext(hash_oid->offset);
+                if (ss->ssl3.hs.shaEchInner == NULL) {
+                    ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
+                    return SECFailure;
+                }
+                if (PK11_DigestBegin(ss->ssl3.hs.shaEchInner) != SECSuccess) {
+                    ssl_MapLowLevelError(SSL_ERROR_DIGEST_FAILURE);
+                    return SECFailure;
+                }
+            }
         } else {
             /* Both ss->ssl3.hs.md5 and ss->ssl3.hs.sha should be NULL or
              * created successfully. */
@@ -3838,6 +3854,15 @@
         }
         sslBuffer_Clear(&ss->ssl3.hs.messages);
     }
+    if (ss->ssl3.hs.shaEchInner &&
+        ss->ssl3.hs.echInnerMessages.len > 0) {
+        if (PK11_DigestOp(ss->ssl3.hs.shaEchInner, ss->ssl3.hs.echInnerMessages.buf,
+                          ss->ssl3.hs.echInnerMessages.len) != SECSuccess) {
+            ssl_MapLowLevelError(SSL_ERROR_DIGEST_FAILURE);
+            return SECFailure;
+        }
+        sslBuffer_Clear(&ss->ssl3.hs.echInnerMessages);
+    }
 
     return SECSuccess;
 }
@@ -3849,6 +3874,7 @@
                  SSL_GETPID(), ss->fd));
     ss->ssl3.hs.hashType = handshake_hash_unknown;
     ss->ssl3.hs.messages.len = 0;
+    ss->ssl3.hs.echInnerMessages.len = 0;
     if (ss->ssl3.hs.md5) {
         PK11_DestroyContext(ss->ssl3.hs.md5, PR_TRUE);
         ss->ssl3.hs.md5 = NULL;
@@ -3857,12 +3883,46 @@
         PK11_DestroyContext(ss->ssl3.hs.sha, PR_TRUE);
         ss->ssl3.hs.sha = NULL;
     }
+    if (ss->ssl3.hs.shaEchInner) {
+        PK11_DestroyContext(ss->ssl3.hs.shaEchInner, PR_TRUE);
+        ss->ssl3.hs.shaEchInner = NULL;
+    }
     if (ss->ssl3.hs.shaPostHandshake) {
         PK11_DestroyContext(ss->ssl3.hs.shaPostHandshake, PR_TRUE);
         ss->ssl3.hs.shaPostHandshake = NULL;
     }
 }
 
+/* For TLS 1.3 EncryptedClientHello, add the provided buffer to the
+ * given hash context. This is only needed for the initial CH,
+ * after which ssl3_UpdateHandshakeHashes will update both contexts
+ * until ssl3_CoalesceEchHandshakeHashes. */
+SECStatus
+ssl3_UpdateExplicitHandshakeTranscript(sslSocket *ss, const unsigned char *b,
+                                       unsigned int l, sslBuffer *target)
+{
+    PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));
+    PORT_Assert(ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_3);
+    if (ss->sec.isServer) {
+        /* Only the client maintains two states at the outset. */
+        PORT_Assert(target != &ss->ssl3.hs.echInnerMessages);
+    }
+    return sslBuffer_Append(target, b, l);
+}
+static SECStatus
+ssl3_UpdateOuterHandshakeHashes(sslSocket *ss, const unsigned char *b,
+                                unsigned int l)
+{
+    return ssl3_UpdateExplicitHandshakeTranscript(ss, b, l,
+                                                  &ss->ssl3.hs.messages);
+}
+static SECStatus
+ssl3_UpdateInnerHandshakeHashes(sslSocket *ss, const unsigned char *b,
+                                unsigned int l)
+{
+    return ssl3_UpdateExplicitHandshakeTranscript(ss, b, l,
+                                                  &ss->ssl3.hs.echInnerMessages);
+}
 /*
  * Handshake messages
  */
@@ -3893,7 +3953,14 @@
 
     if (ss->ssl3.hs.hashType == handshake_hash_unknown ||
         ss->ssl3.hs.hashType == handshake_hash_record) {
-        return sslBuffer_Append(&ss->ssl3.hs.messages, b, l);
+        rv = sslBuffer_Append(&ss->ssl3.hs.messages, b, l);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+        if (!ss->sec.isServer && ss->ssl3.hs.echHpkeCtx) {
+            return ssl3_UpdateInnerHandshakeHashes(ss, b, l);
+        }
+        return SECSuccess;
     }
 
     PRINT_BUF(90, (ss, "handshake hash input:", b, l));
@@ -4903,6 +4970,202 @@
     ssl_ReleaseSpecWriteLock(ss);
 }
 
+SECStatus
+ssl3_InsertChHeaderSize(const sslSocket *ss, sslBuffer *preamble, const sslBuffer *extensions)
+{
+    SECStatus rv;
+    unsigned int msgLen = preamble->len;
+    msgLen += extensions->len ? (2 + extensions->len) : 0;
+    unsigned int headerLen = IS_DTLS(ss) ? 12 : 4;
+
+    /* Record the message length. */
+    rv = sslBuffer_InsertNumber(preamble, 1, msgLen - headerLen, 3);
+    if (rv != SECSuccess) {
+        return SECFailure; /* code set */
+    }
+    if (IS_DTLS(ss)) {
+        /* Record the (unfragmented) fragment length. */
+        unsigned int offset = 1 /* ch */ + 3 /* len */ +
+                              2 /* seq */ + 3 /* fragment offset */;
+        rv = sslBuffer_InsertNumber(preamble, offset, msgLen - headerLen, 3);
+        if (rv != SECSuccess) {
+            return SECFailure; /* code set */
+        }
+    }
+
+    return SECSuccess;
+}
+
+static SECStatus
+ssl3_AppendCipherSuites(sslSocket *ss, PRBool fallbackSCSV, sslBuffer *buf)
+{
+    SECStatus rv;
+    unsigned int offset;
+    unsigned int i;
+    unsigned int saveLen;
+
+    rv = sslBuffer_Skip(buf, 2, &offset);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    if (ss->ssl3.hs.sendingSCSV) {
+        /* Add the actual SCSV */
+        rv = sslBuffer_AppendNumber(buf, TLS_EMPTY_RENEGOTIATION_INFO_SCSV,
+                                    sizeof(ssl3CipherSuite));
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+    }
+    if (fallbackSCSV) {
+        rv = sslBuffer_AppendNumber(buf, TLS_FALLBACK_SCSV,
+                                    sizeof(ssl3CipherSuite));
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+    }
+
+    saveLen = SSL_BUFFER_LEN(buf);
+    /* CipherSuites are appended to Hello message here */
+    for (i = 0; i < ssl_V3_SUITES_IMPLEMENTED; i++) {
+        ssl3CipherSuiteCfg *suite = &ss->cipherSuites[i];
+        if (ssl3_config_match(suite, ss->ssl3.policy, &ss->vrange, ss)) {
+            rv = sslBuffer_AppendNumber(buf, suite->cipher_suite,
+                                        sizeof(ssl3CipherSuite));
+            if (rv != SECSuccess) {
+                return SECFailure;
+            }
+        }
+    }
+    if (SSL_ALL_VERSIONS_DISABLED(&ss->vrange) ||
+        (SSL_BUFFER_LEN(buf) - saveLen) == 0) {
+        PORT_SetError(SSL_ERROR_SSL_DISABLED);
+        return SECFailure;
+    }
+
+    return sslBuffer_InsertLength(buf, offset, 2);
+}
+
+SECStatus
+ssl3_CreateClientHelloPreamble(sslSocket *ss, const sslSessionID *sid,
+                               PRBool realSid, PRUint16 version, PRBool isEchInner,
+                               const sslBuffer *extensions, sslBuffer *preamble)
+{
+    SECStatus rv;
+    sslBuffer constructed = SSL_BUFFER_EMPTY;
+    const PRUint8 *client_random = isEchInner ? ss->ssl3.hs.client_inner_random : ss->ssl3.hs.client_random;
+    PORT_Assert(sid);
+    PRBool fallbackSCSV = ss->opt.enableFallbackSCSV && !isEchInner &&
+                          (!realSid || version < sid->version);
+
+    rv = sslBuffer_AppendNumber(&constructed, ssl_hs_client_hello, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_Skip(&constructed, 3, NULL);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (IS_DTLS(ss)) {
+        /* Note that we make an unfragmented message here. We fragment in the
+         * transmission code, if necessary */
+        rv = sslBuffer_AppendNumber(&constructed, ss->ssl3.hs.sendMessageSeq, 2);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        ss->ssl3.hs.sendMessageSeq++;
+
+        /* 0 is the fragment offset, because it's not fragmented yet */
+        rv = sslBuffer_AppendNumber(&constructed, 0, 3);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        /* Fragment length -- set to the packet length because not fragmented */
+        rv = sslBuffer_Skip(&constructed, 3, NULL);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+    }
+
+    if (ss->firstHsDone) {
+        /* The client hello version must stay unchanged to work around
+         * the Windows SChannel bug described in ssl3_SendClientHello. */
+        PORT_Assert(version == ss->clientHelloVersion);
+    }
+
+    ss->clientHelloVersion = PR_MIN(version, SSL_LIBRARY_VERSION_TLS_1_2);
+    if (IS_DTLS(ss)) {
+        PRUint16 dtlsVersion = dtls_TLSVersionToDTLSVersion(ss->clientHelloVersion);
+        rv = sslBuffer_AppendNumber(&constructed, dtlsVersion, 2);
+    } else {
+        rv = sslBuffer_AppendNumber(&constructed, ss->clientHelloVersion, 2);
+    }
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_Append(&constructed, client_random, SSL3_RANDOM_LENGTH);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (sid->version < SSL_LIBRARY_VERSION_TLS_1_3 && !isEchInner) {
+        rv = sslBuffer_AppendVariable(&constructed, sid->u.ssl3.sessionID,
+                                      sid->u.ssl3.sessionIDLength, 1);
+    } else if (ss->opt.enableTls13CompatMode && !IS_DTLS(ss)) {
+        /* We're faking session resumption, so rather than create new
+         * randomness, just mix up the client random a little. */
+        PRUint8 buf[SSL3_SESSIONID_BYTES];
+        ssl_MakeFakeSid(ss, buf);
+        rv = sslBuffer_AppendVariable(&constructed, buf, SSL3_SESSIONID_BYTES, 1);
+    } else {
+        rv = sslBuffer_AppendNumber(&constructed, 0, 1);
+    }
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (IS_DTLS(ss)) {
+        /* This cookieLen applies to the cookie that appears in the DTLS
+        * ClientHello, which isn't used in DTLS 1.3. */
+        rv = sslBuffer_AppendVariable(&constructed, ss->ssl3.hs.cookie.data,
+                                      ss->ssl3.hs.helloRetry ? 0 : ss->ssl3.hs.cookie.len,
+                                      1);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+    }
+
+    rv = ssl3_AppendCipherSuites(ss, fallbackSCSV, &constructed);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Compression methods: count is always 1, null compression. */
+    rv = sslBuffer_AppendNumber(&constructed, 1, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendNumber(&constructed, ssl_compression_null, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = ssl3_InsertChHeaderSize(ss, &constructed, extensions);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    *preamble = constructed;
+    return SECSuccess;
+loser:
+    sslBuffer_Clear(&constructed);
+    return SECFailure;
+}
+
 /* Called from ssl3_HandleHelloRequest(),
  *             ssl3_RedoHandshake()
  *             ssl_BeginClientHandshake (when resuming ssl3 session)
@@ -4920,17 +5183,13 @@
 {
     sslSessionID *sid;
     SECStatus rv;
-    unsigned int i;
-    unsigned int length;
-    unsigned int num_suites;
-    unsigned int actual_count = 0;
     PRBool isTLS = PR_FALSE;
-    PRBool requestingResume = PR_FALSE, fallbackSCSV = PR_FALSE;
+    PRBool requestingResume = PR_FALSE;
     PRBool unlockNeeded = PR_FALSE;
     sslBuffer extensionBuf = SSL_BUFFER_EMPTY;
     PRUint16 version = ss->vrange.max;
     PRInt32 flags;
-    unsigned int cookieLen = ss->ssl3.hs.cookie.len;
+    sslBuffer chBuf = SSL_BUFFER_EMPTY;
 
     SSL_TRC(3, ("%d: SSL3[%d]: send %s ClientHello handshake", SSL_GETPID(),
                 ss->fd, ssl_ClientHelloTypeName(type)));
@@ -4947,14 +5206,10 @@
 
     /* If we are responding to a HelloRetryRequest, don't reinitialize. We need
      * to maintain the handshake hashes. */
-    if (ss->ssl3.hs.helloRetry) {
-        PORT_Assert(type == client_hello_retry);
-        /* This cookieLen applies to the cookie that appears in the DTLS
-           ClientHello, which isn't used in DTLS 1.3. */
-        cookieLen = 0;
-    } else {
+    if (!ss->ssl3.hs.helloRetry) {
         ssl3_RestartHandshakeHashes(ss);
     }
+    PORT_Assert(!ss->ssl3.hs.helloRetry || type == client_hello_retry);
 
     if (type == client_hello_initial) {
         ssl_SetClientHelloSpecVersion(ss, ss->ssl3.cwSpec);
@@ -5206,171 +5461,77 @@
         ssl3_DisableNonDTLSSuites(ss);
     }
 
-    /* how many suites are permitted by policy and user preference? */
-    num_suites = count_cipher_suites(ss, ss->ssl3.policy);
-    if (!num_suites) {
-        goto loser; /* count_cipher_suites has set error code. */
-    }
-
-    fallbackSCSV = ss->opt.enableFallbackSCSV && (!requestingResume ||
-                                                  version < sid->version);
-    /* make room for SCSV */
-    if (ss->ssl3.hs.sendingSCSV) {
-        ++num_suites;
-    }
-    if (fallbackSCSV) {
-        ++num_suites;
-    }
-
-    length = sizeof(SSL3ProtocolVersion) + SSL3_RANDOM_LENGTH +
-             1 + /* session id */
-             2 + num_suites * sizeof(ssl3CipherSuite) +
-             1 + 1 /* compression methods */;
-    if (sid->version < SSL_LIBRARY_VERSION_TLS_1_3) {
-        length += sid->u.ssl3.sessionIDLength;
-    } else if (ss->opt.enableTls13CompatMode && !IS_DTLS(ss)) {
-        length += SSL3_SESSIONID_BYTES;
-    }
-    if (IS_DTLS(ss)) {
-        length += 1 + cookieLen;
-    }
-
-    if (extensionBuf.len) {
-        rv = ssl_InsertPaddingExtension(ss, length, &extensionBuf);
-        if (rv != SECSuccess) {
-            goto loser; /* err set by ssl_InsertPaddingExtension */
-        }
-        length += 2 + extensionBuf.len;
-    }
-
-    rv = ssl3_AppendHandshakeHeader(ss, ssl_hs_client_hello, length);
+    rv = ssl3_CreateClientHelloPreamble(ss, sid, requestingResume, version,
+                                        PR_FALSE, &extensionBuf, &chBuf);
     if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
+        goto loser; /* err set by ssl3_CreateClientHelloPreamble. */
     }
 
-    if (ss->firstHsDone) {
-        /* The client hello version must stay unchanged to work around
-         * the Windows SChannel bug described above. */
-        PORT_Assert(version == ss->clientHelloVersion);
-    }
-    ss->clientHelloVersion = PR_MIN(version, SSL_LIBRARY_VERSION_TLS_1_2);
-    if (IS_DTLS(ss)) {
-        PRUint16 dtlsVersion;
-
-        dtlsVersion = dtls_TLSVersionToDTLSVersion(ss->clientHelloVersion);
-        rv = ssl3_AppendHandshakeNumber(ss, dtlsVersion, 2);
-    } else {
-        rv = ssl3_AppendHandshakeNumber(ss, ss->clientHelloVersion, 2);
-    }
-    if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
-
-    rv = ssl3_AppendHandshake(ss, ss->ssl3.hs.client_random,
-                              SSL3_RANDOM_LENGTH);
-    if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
+    if (!ss->ssl3.hs.echHpkeCtx) {
+        if (extensionBuf.len) {
+            rv = tls13_MaybeGreaseEch(ss, chBuf.len, &extensionBuf);
+            if (rv != SECSuccess) {
+                goto loser; /* err set by tls13_MaybeGreaseEch. */
+            }
+            rv = ssl_InsertPaddingExtension(ss, chBuf.len, &extensionBuf);
+            if (rv != SECSuccess) {
+                goto loser; /* err set by ssl_InsertPaddingExtension. */
+            }
 
-    if (sid->version < SSL_LIBRARY_VERSION_TLS_1_3) {
-        rv = ssl3_AppendHandshakeVariable(
-            ss, sid->u.ssl3.sessionID, sid->u.ssl3.sessionIDLength, 1);
-    } else if (ss->opt.enableTls13CompatMode && !IS_DTLS(ss)) {
-        /* We're faking session resumption, so rather than create new
-         * randomness, just mix up the client random a little. */
-        PRUint8 buf[SSL3_SESSIONID_BYTES];
-        ssl_MakeFakeSid(ss, buf);
-        rv = ssl3_AppendHandshakeVariable(ss, buf, SSL3_SESSIONID_BYTES, 1);
-    } else {
-        rv = ssl3_AppendHandshakeNumber(ss, 0, 1);
-    }
-    if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
+            rv = ssl3_InsertChHeaderSize(ss, &chBuf, &extensionBuf);
+            if (rv != SECSuccess) {
+                goto loser; /* err set by ssl3_InsertChHeaderSize. */
+            }
 
-    if (IS_DTLS(ss)) {
-        rv = ssl3_AppendHandshakeVariable(
-            ss, ss->ssl3.hs.cookie.data, cookieLen, 1);
-        if (rv != SECSuccess) {
-            goto loser; /* err set by ssl3_AppendHandshake* */
+            /* If we are sending a PSK binder, replace the dummy value. */
+            if (ssl3_ExtensionAdvertised(ss, ssl_tls13_pre_shared_key_xtn)) {
+                rv = tls13_WriteExtensionsWithBinder(ss, &extensionBuf, &chBuf);
+            } else {
+                rv = sslBuffer_AppendNumber(&chBuf, extensionBuf.len, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                rv = sslBuffer_AppendBuffer(&chBuf, &extensionBuf);
+            }
+            if (rv != SECSuccess) {
+                goto loser; /* err set by sslBuffer_Append*. */
+            }
         }
-    }
-
-    rv = ssl3_AppendHandshakeNumber(ss, num_suites * sizeof(ssl3CipherSuite), 2);
-    if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
 
-    if (ss->ssl3.hs.sendingSCSV) {
-        /* Add the actual SCSV */
-        rv = ssl3_AppendHandshakeNumber(ss, TLS_EMPTY_RENEGOTIATION_INFO_SCSV,
-                                        sizeof(ssl3CipherSuite));
+        /* If we already have a message in place, we need to enqueue it.
+         * This empties the buffer. This is a convenient place to call
+         * dtls_StageHandshakeMessage to mark the message boundary.  */
+        if (IS_DTLS(ss)) {
+            rv = dtls_StageHandshakeMessage(ss);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+        }
+        rv = ssl3_AppendHandshake(ss, chBuf.buf, chBuf.len);
+    } else {
+        rv = tls13_ConstructClientHelloWithEch(ss, sid, !requestingResume, &chBuf, &extensionBuf);
         if (rv != SECSuccess) {
-            goto loser; /* err set by ssl3_AppendHandshake* */
+            goto loser; /* code set */
         }
-        actual_count++;
-    }
-    if (fallbackSCSV) {
-        rv = ssl3_AppendHandshakeNumber(ss, TLS_FALLBACK_SCSV,
-                                        sizeof(ssl3CipherSuite));
+        rv = ssl3_UpdateOuterHandshakeHashes(ss, chBuf.buf, chBuf.len);
         if (rv != SECSuccess) {
-            goto loser; /* err set by ssl3_AppendHandshake* */
+            goto loser; /* code set */
         }
-        actual_count++;
-    }
-    /* CipherSuites are appended to Hello message here */
-    for (i = 0; i < ssl_V3_SUITES_IMPLEMENTED; i++) {
-        ssl3CipherSuiteCfg *suite = &ss->cipherSuites[i];
-        if (ssl3_config_match(suite, ss->ssl3.policy, &ss->vrange, ss)) {
-            actual_count++;
-            if (actual_count > num_suites) {
-                /* set error card removal/insertion error */
-                PORT_SetError(SSL_ERROR_TOKEN_INSERTION_REMOVAL);
-                goto loser;
-            }
-            rv = ssl3_AppendHandshakeNumber(ss, suite->cipher_suite,
-                                            sizeof(ssl3CipherSuite));
+
+        if (IS_DTLS(ss)) {
+            rv = dtls_StageHandshakeMessage(ss);
             if (rv != SECSuccess) {
-                goto loser; /* err set by ssl3_AppendHandshake* */
+                goto loser;
             }
         }
+        /* By default, all messagess are added to both the inner and
+         * outer transcripts. For CH (or CH2 if HRR), that's problematic. */
+        rv = ssl3_AppendHandshakeSuppressHash(ss, chBuf.buf, chBuf.len);
     }
-
-    /* if cards were removed or inserted between count_cipher_suites and
-     * generating our list, detect the error here rather than send it off to
-     * the server.. */
-    if (actual_count != num_suites) {
-        /* Card removal/insertion error */
-        PORT_SetError(SSL_ERROR_TOKEN_INSERTION_REMOVAL);
-        goto loser;
-    }
-
-    /* Compression methods: count is always 1, null compression. */
-    rv = ssl3_AppendHandshakeNumber(ss, 1, 1);
-    if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
-    rv = ssl3_AppendHandshakeNumber(ss, ssl_compression_null, 1);
     if (rv != SECSuccess) {
-        goto loser; /* err set by ssl3_AppendHandshake* */
-    }
-
-    if (extensionBuf.len) {
-        /* If we are sending a PSK binder, replace the dummy value. */
-        if (ssl3_ExtensionAdvertised(ss, ssl_tls13_pre_shared_key_xtn)) {
-            PORT_Assert(ss->psk ||
-                        (ss->statelessResume && ss->xtnData.sentSessionTicketInClientHello));
-            PORT_Assert(!PR_CLIST_IS_EMPTY(&ss->ssl3.hs.psks));
-            rv = tls13_WriteExtensionsWithBinder(ss, &extensionBuf);
-        } else {
-            rv = ssl3_AppendBufferToHandshakeVariable(ss, &extensionBuf, 2);
-        }
-        if (rv != SECSuccess) {
-            goto loser; /* err set by AppendHandshake. */
-        }
+        goto loser;
     }
 
-    sslBuffer_Clear(&extensionBuf);
     if (unlockNeeded) {
         /* Note: goto loser can't be used past this point. */
         PR_RWLock_Unlock(sid->u.ssl3.lock);
@@ -5401,12 +5562,15 @@
     }
 
     ss->ssl3.hs.ws = wait_server_hello;
+    sslBuffer_Clear(&chBuf);
+    sslBuffer_Clear(&extensionBuf);
     return SECSuccess;
 
 loser:
     if (unlockNeeded) {
         PR_RWLock_Unlock(sid->u.ssl3.lock);
     }
+    sslBuffer_Clear(&chBuf);
     sslBuffer_Clear(&extensionBuf);
     return SECFailure;
 }
@@ -6674,6 +6838,7 @@
         PRUint8 *downgrade_sentinel =
             ss->ssl3.hs.server_random +
             SSL3_RANDOM_LENGTH - sizeof(tls12_downgrade_random);
+
         if (!PORT_Memcmp(downgrade_sentinel,
                          tls12_downgrade_random,
                          sizeof(tls12_downgrade_random)) ||
@@ -6815,17 +6980,15 @@
     /* There are three situations in which the server must pick
      * TLS 1.3.
      *
-     * 1. We offered ESNI.
-     * 2. We received HRR
-     * 3. We sent early app data.
+     * 1. We received HRR
+     * 2. We sent early app data
+     * 3. ECH was accepted (checked in MaybeHandleEchSignal)
+     *
+     * If we offered ECH and the server negotiated a lower version,
+     * authenticate to the public name for secure disablement.
      *
      */
     if (ss->version < SSL_LIBRARY_VERSION_TLS_1_3) {
-        if (ss->xtnData.esniPrivateKey) {
-            desc = protocol_version;
-            errCode = SSL_ERROR_UNSUPPORTED_VERSION;
-            goto alert_loser;
-        }
         if (isHelloRetry || ss->ssl3.hs.helloRetry) {
             /* SSL3_SendAlert() will uncache the SID. */
             desc = illegal_parameter;
@@ -6901,6 +7064,11 @@
         return SECSuccess;
     }
 
+    rv = tls13_MaybeHandleEchSignal(ss);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+
     rv = ssl3_HandleParsedExtensions(ss, ssl_hs_server_hello);
     ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.remoteExtensions);
     if (rv != SECSuccess) {
@@ -7630,6 +7798,12 @@
 {
     SECStatus rv;
 
+    /* Should not send a client cert when (non-GREASE) ECH is rejected. */
+    if (ss->ssl3.hs.echHpkeCtx && !ss->ssl3.hs.echAccepted) {
+        PORT_Assert(ssl3_ExtensionAdvertised(ss, ssl_tls13_encrypted_client_hello_xtn));
+        goto send_no_certificate;
+    }
+
     if (ss->getClientAuthData != NULL) {
         PORT_Assert((ss->ssl3.hs.preliminaryInfo & ssl_preinfo_all) ==
                     ssl_preinfo_all);
@@ -7712,49 +7886,53 @@
         SSL_TRC(3, ("%d: SSL[%d]: no false start callback so no false start",
                     SSL_GETPID(), ss->fd));
     } else {
-        PRBool maybeFalseStart = PR_TRUE;
         SECStatus rv;
 
         rv = ssl_CheckServerRandom(ss);
         if (rv != SECSuccess) {
             SSL_TRC(3, ("%d: SSL[%d]: no false start due to possible downgrade",
                         SSL_GETPID(), ss->fd));
-            maybeFalseStart = PR_FALSE;
+            goto no_false_start;
         }
 
         /* An attacker can control the selected ciphersuite so we only wish to
          * do False Start in the case that the selected ciphersuite is
          * sufficiently strong that the attack can gain no advantage.
          * Therefore we always require an 80-bit cipher. */
-        if (maybeFalseStart) {
-            ssl_GetSpecReadLock(ss);
-            maybeFalseStart = ss->ssl3.cwSpec->cipherDef->secret_key_size >= 10;
-            ssl_ReleaseSpecReadLock(ss);
+        ssl_GetSpecReadLock(ss);
+        PRBool weakCipher = ss->ssl3.cwSpec->cipherDef->secret_key_size < 10;
+        ssl_ReleaseSpecReadLock(ss);
+        if (weakCipher) {
+            SSL_TRC(3, ("%d: SSL[%d]: no false start due to weak cipher",
+                        SSL_GETPID(), ss->fd));
+            goto no_false_start;
         }
 
-        if (!maybeFalseStart) {
-            SSL_TRC(3, ("%d: SSL[%d]: no false start due to weak cipher",
+        if (ssl3_ExtensionAdvertised(ss, ssl_tls13_encrypted_client_hello_xtn)) {
+            SSL_TRC(3, ("%d: SSL[%d]: no false start due to lower version after ECH",
                         SSL_GETPID(), ss->fd));
+            goto no_false_start;
+        }
+
+        PORT_Assert((ss->ssl3.hs.preliminaryInfo & ssl_preinfo_all) ==
+                    ssl_preinfo_all);
+        rv = (ss->canFalseStartCallback)(ss->fd,
+                                         ss->canFalseStartCallbackData,
+                                         &ss->ssl3.hs.canFalseStart);
+        if (rv == SECSuccess) {
+            SSL_TRC(3, ("%d: SSL[%d]: false start callback returned %s",
+                        SSL_GETPID(), ss->fd,
+                        ss->ssl3.hs.canFalseStart ? "TRUE"
+                                                  : "FALSE"));
         } else {
-            PORT_Assert((ss->ssl3.hs.preliminaryInfo & ssl_preinfo_all) ==
-                        ssl_preinfo_all);
-            rv = (ss->canFalseStartCallback)(ss->fd,
-                                             ss->canFalseStartCallbackData,
-                                             &ss->ssl3.hs.canFalseStart);
-            if (rv == SECSuccess) {
-                SSL_TRC(3, ("%d: SSL[%d]: false start callback returned %s",
-                            SSL_GETPID(), ss->fd,
-                            ss->ssl3.hs.canFalseStart ? "TRUE"
-                                                      : "FALSE"));
-            } else {
-                SSL_TRC(3, ("%d: SSL[%d]: false start callback failed (%s)",
-                            SSL_GETPID(), ss->fd,
-                            PR_ErrorToName(PR_GetError())));
-            }
-            return rv;
+            SSL_TRC(3, ("%d: SSL[%d]: false start callback failed (%s)",
+                        SSL_GETPID(), ss->fd,
+                        PR_ErrorToName(PR_GetError())));
         }
+        return rv;
     }
 
+no_false_start:
     ss->ssl3.hs.canFalseStart = PR_FALSE;
     return SECSuccess;
 }
@@ -8342,12 +8520,9 @@
                 }
                 /* Need to tell the client that application has picked
                  * the name from the offered list and reconfigured the socket.
-                 * Don't do this if we negotiated ESNI.
                  */
-                if (!ssl3_ExtensionNegotiated(ss, ssl_tls13_encrypted_sni_xtn)) {
-                    ssl3_RegisterExtensionSender(ss, &ss->xtnData, ssl_server_name_xtn,
-                                                 ssl_SendEmptyExtension);
-                }
+                ssl3_RegisterExtensionSender(ss, &ss->xtnData, ssl_server_name_xtn,
+                                             ssl_SendEmptyExtension);
             } else {
                 /* Callback returned index outside of the boundary. */
                 PORT_Assert((unsigned int)ret < ss->xtnData.sniNameArrSize);
@@ -8445,11 +8620,21 @@
 static SECStatus
 ssl_GenerateServerRandom(sslSocket *ss)
 {
-    SECStatus rv = ssl3_GetNewRandom(ss->ssl3.hs.server_random);
+    SECStatus rv;
+    PRUint8 *downgradeSentinel;
+
+    rv = ssl3_GetNewRandom(ss->ssl3.hs.server_random);
     if (rv != SECSuccess) {
         return SECFailure;
     }
 
+    if (ss->ssl3.hs.echAccepted) {
+        rv = tls13_WriteServerEchSignal(ss);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+    }
+
     if (ss->version == ss->vrange.max) {
         return SECSuccess;
     }
@@ -8477,10 +8662,9 @@
      *
      *   44 4F 57 4E 47 52 44 00
      */
-    PRUint8 *downgradeSentinel =
+    downgradeSentinel =
         ss->ssl3.hs.server_random +
         SSL3_RANDOM_LENGTH - sizeof(tls12_downgrade_random);
-
     if (ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_2) {
         switch (ss->version) {
             case SSL_LIBRARY_VERSION_TLS_1_2:
@@ -8502,6 +8686,126 @@
     return SECSuccess;
 }
 
+SECStatus
+ssl3_HandleClientHelloPreamble(sslSocket *ss, PRUint8 **b, PRUint32 *length, SECItem *sidBytes,
+                               SECItem *cookieBytes, SECItem *suites, SECItem *comps)
+{
+    SECStatus rv;
+    PRUint32 tmp;
+    rv = ssl3_ConsumeHandshakeNumber(ss, &tmp, 2, b, length);
+    if (rv != SECSuccess) {
+        return SECFailure; /* malformed, alert already sent */
+    }
+
+    /* Translate the version. */
+    if (IS_DTLS(ss)) {
+        ss->clientHelloVersion = dtls_DTLSVersionToTLSVersion((SSL3ProtocolVersion)tmp);
+    } else {
+        ss->clientHelloVersion = (SSL3ProtocolVersion)tmp;
+    }
+
+    /* Grab the client random data. */
+    rv = ssl3_ConsumeHandshake(
+        ss, ss->ssl3.hs.client_random, SSL3_RANDOM_LENGTH, b, length);
+    if (rv != SECSuccess) {
+        return SECFailure; /* malformed */
+    }
+
+    /* Grab the client's SID, if present. */
+    rv = ssl3_ConsumeHandshakeVariable(ss, sidBytes, 1, b, length);
+    if (rv != SECSuccess) {
+        return SECFailure; /* malformed */
+    }
+
+    /* Grab the client's cookie, if present. It is checked after version negotiation. */
+    if (IS_DTLS(ss)) {
+        rv = ssl3_ConsumeHandshakeVariable(ss, cookieBytes, 1, b, length);
+        if (rv != SECSuccess) {
+            return SECFailure; /* malformed */
+        }
+    }
+
+    /* Grab the list of cipher suites. */
+    rv = ssl3_ConsumeHandshakeVariable(ss, suites, 2, b, length);
+    if (rv != SECSuccess) {
+        return SECFailure; /* malformed */
+    }
+
+    /* Grab the list of compression methods. */
+    rv = ssl3_ConsumeHandshakeVariable(ss, comps, 1, b, length);
+    if (rv != SECSuccess) {
+        return SECFailure; /* malformed */
+    }
+    return SECSuccess;
+}
+
+static SECStatus
+ssl3_ValidatePreambleWithVersion(sslSocket *ss, const SECItem *sidBytes, const SECItem *comps,
+                                 const SECItem *cookieBytes)
+{
+    SECStatus rv;
+    if (ss->version >= SSL_LIBRARY_VERSION_TLS_1_3) {
+        if (sidBytes->len > 0 && !IS_DTLS(ss)) {
+            SECITEM_FreeItem(&ss->ssl3.hs.fakeSid, PR_FALSE);
+            rv = SECITEM_CopyItem(NULL, &ss->ssl3.hs.fakeSid, sidBytes);
+            if (rv != SECSuccess) {
+                FATAL_ERROR(ss, PORT_GetError(), internal_error);
+                return SECFailure;
+            }
+        }
+
+        /* TLS 1.3 requires that compression include only null. */
+        if (comps->len != 1 || comps->data[0] != ssl_compression_null) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+            return SECFailure;
+        }
+
+        /* receivedCcs is only valid if we sent an HRR. */
+        if (ss->ssl3.hs.receivedCcs && !ss->ssl3.hs.helloRetry) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER, unexpected_message);
+            return SECFailure;
+        }
+
+        /* A DTLS 1.3-only client MUST set the legacy_cookie field to zero length.
+         * If a DTLS 1.3 ClientHello is received with any other value in this field,
+         * the server MUST abort the handshake with an "illegal_parameter" alert. */
+        if (IS_DTLS(ss) && cookieBytes->len != 0) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+            return SECFailure;
+        }
+    } else {
+        /* ECH not possible here. */
+        ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_ech;
+
+        /* HRR and ECH are TLS1.3-only. We ignore the Cookie extension here. */
+        if (ss->ssl3.hs.helloRetry) {
+            FATAL_ERROR(ss, SSL_ERROR_UNSUPPORTED_VERSION, protocol_version);
+            return SECFailure;
+        }
+
+        /* receivedCcs is only valid if we sent an HRR. */
+        if (ss->ssl3.hs.receivedCcs) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER, unexpected_message);
+            return SECFailure;
+        }
+
+        /* TLS versions prior to 1.3 must include null somewhere. */
+        if (comps->len < 1 ||
+            !memchr(comps->data, ssl_compression_null, comps->len)) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+            return SECFailure;
+        }
+
+        /* We never send cookies in DTLS 1.2. */
+        if (IS_DTLS(ss) && cookieBytes->len != 0) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+            return SECFailure;
+        }
+    }
+
+    return SECSuccess;
+}
+
 /* Called from ssl3_HandleHandshakeMessage() when it has deciphered a complete
  * ssl3 Client Hello message.
  * Caller must hold Handshake and RecvBuf locks.
@@ -8510,18 +8814,18 @@
 ssl3_HandleClientHello(sslSocket *ss, PRUint8 *b, PRUint32 length)
 {
     sslSessionID *sid = NULL;
-    PRUint32 tmp;
     unsigned int i;
     SECStatus rv;
+    PRUint32 extensionLength;
     int errCode = SSL_ERROR_RX_MALFORMED_CLIENT_HELLO;
     SSL3AlertDescription desc = illegal_parameter;
     SSL3AlertLevel level = alert_fatal;
-    SSL3ProtocolVersion version;
     TLSExtension *versionExtension;
     SECItem sidBytes = { siBuffer, NULL, 0 };
     SECItem cookieBytes = { siBuffer, NULL, 0 };
     SECItem suites = { siBuffer, NULL, 0 };
     SECItem comps = { siBuffer, NULL, 0 };
+    SECItem *echInner = NULL;
     PRBool isTLS13;
     const PRUint8 *savedMsg = b;
     const PRUint32 savedLen = length;
@@ -8574,47 +8878,8 @@
         dtls_RehandshakeCleanup(ss);
     }
 
-    rv = ssl3_ConsumeHandshakeNumber(ss, &tmp, 2, &b, &length);
-    if (rv != SECSuccess)
-        goto loser; /* malformed, alert already sent */
-
-    /* Translate the version. */
-    if (IS_DTLS(ss)) {
-        ss->clientHelloVersion = version =
-            dtls_DTLSVersionToTLSVersion((SSL3ProtocolVersion)tmp);
-    } else {
-        ss->clientHelloVersion = version = (SSL3ProtocolVersion)tmp;
-    }
-
-    /* Grab the client random data. */
-    rv = ssl3_ConsumeHandshake(
-        ss, ss->ssl3.hs.client_random, SSL3_RANDOM_LENGTH, &b, &length);
-    if (rv != SECSuccess) {
-        goto loser; /* malformed */
-    }
-
-    /* Grab the client's SID, if present. */
-    rv = ssl3_ConsumeHandshakeVariable(ss, &sidBytes, 1, &b, &length);
-    if (rv != SECSuccess) {
-        goto loser; /* malformed */
-    }
-
-    /* Grab the client's cookie, if present. It is checked after version negotiation. */
-    if (IS_DTLS(ss)) {
-        rv = ssl3_ConsumeHandshakeVariable(ss, &cookieBytes, 1, &b, &length);
-        if (rv != SECSuccess) {
-            goto loser; /* malformed */
-        }
-    }
-
-    /* Grab the list of cipher suites. */
-    rv = ssl3_ConsumeHandshakeVariable(ss, &suites, 2, &b, &length);
-    if (rv != SECSuccess) {
-        goto loser; /* malformed */
-    }
-
-    /* Grab the list of compression methods. */
-    rv = ssl3_ConsumeHandshakeVariable(ss, &comps, 1, &b, &length);
+    rv = ssl3_HandleClientHelloPreamble(ss, &b, &length, &sidBytes,
+                                        &cookieBytes, &suites, &comps);
     if (rv != SECSuccess) {
         goto loser; /* malformed */
     }
@@ -8625,10 +8890,8 @@
      * Note: we allow extensions even when negotiating SSL3 for the sake
      * of interoperability (and backwards compatibility).
      */
-
     if (length) {
         /* Get length of hello extensions */
-        PRUint32 extensionLength;
         rv = ssl3_ConsumeHandshakeNumber(ss, &extensionLength, 2, &b, &length);
         if (rv != SECSuccess) {
             goto loser; /* alert already sent */
@@ -8657,12 +8920,12 @@
         /* The PR_MIN here ensures that we never negotiate 1.3 if the
          * peer didn't offer "supported_versions". */
         rv = ssl3_NegotiateVersion(ss,
-                                   PR_MIN(version,
+                                   PR_MIN(ss->clientHelloVersion,
                                           SSL_LIBRARY_VERSION_TLS_1_2),
                                    PR_TRUE);
         if (rv != SECSuccess) {
-            desc = (version > SSL_LIBRARY_VERSION_3_0) ? protocol_version
-                                                       : handshake_failure;
+            desc = (ss->clientHelloVersion > SSL_LIBRARY_VERSION_3_0) ? protocol_version
+                                                                      : handshake_failure;
             errCode = SSL_ERROR_UNSUPPORTED_VERSION;
             goto alert_loser;
         }
@@ -8684,64 +8947,23 @@
             goto alert_loser;
         }
 
-        if (sidBytes.len > 0 && !IS_DTLS(ss)) {
-            SECITEM_FreeItem(&ss->ssl3.hs.fakeSid, PR_FALSE);
-            rv = SECITEM_CopyItem(NULL, &ss->ssl3.hs.fakeSid, &sidBytes);
-            if (rv != SECSuccess) {
-                desc = internal_error;
-                errCode = PORT_GetError();
-                goto alert_loser;
-            }
-        }
-
-        /* TLS 1.3 requires that compression include only null. */
-        if (comps.len != 1 || comps.data[0] != ssl_compression_null) {
-            goto alert_loser;
-        }
-
         /* If there is a cookie, then this is a second ClientHello (TLS 1.3). */
         if (ssl3_FindExtension(ss, ssl_tls13_cookie_xtn)) {
             ss->ssl3.hs.helloRetry = PR_TRUE;
         }
 
-        /* receivedCcs is only valid if we sent an HRR. */
-        if (ss->ssl3.hs.receivedCcs && !ss->ssl3.hs.helloRetry) {
-            desc = unexpected_message;
-            errCode = SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER;
-            goto alert_loser;
-        }
-
-        /* A DTLS 1.3-only client MUST set the legacy_cookie field to zero length.
-         * If a DTLS 1.3 ClientHello is received with any other value in this field,
-         * the server MUST abort the handshake with an "illegal_parameter" alert. */
-        if (IS_DTLS(ss) && cookieBytes.len != 0) {
-            goto alert_loser;
-        }
-    } else {
-        /* HRR is TLS1.3-only. We ignore the Cookie extension here. */
-        if (ss->ssl3.hs.helloRetry) {
-            desc = protocol_version;
-            errCode = SSL_ERROR_UNSUPPORTED_VERSION;
-            goto alert_loser;
-        }
-
-        /* receivedCcs is only valid if we sent an HRR. */
-        if (ss->ssl3.hs.receivedCcs) {
-            desc = unexpected_message;
-            errCode = SSL_ERROR_RX_UNEXPECTED_CHANGE_CIPHER;
-            goto alert_loser;
-        }
-
-        /* TLS versions prior to 1.3 must include null somewhere. */
-        if (comps.len < 1 ||
-            !memchr(comps.data, ssl_compression_null, comps.len)) {
-            goto alert_loser;
+        rv = tls13_MaybeHandleEch(ss, savedMsg, savedLen, &sidBytes,
+                                  &comps, &cookieBytes, &suites, &echInner);
+        if (rv != SECSuccess) {
+            errCode = PORT_GetError();
+            goto loser; /* code set, alert sent. */
         }
+    }
 
-        /* We never send cookies in DTLS 1.2. */
-        if (IS_DTLS(ss) && cookieBytes.len != 0) {
-            goto loser;
-        }
+    rv = ssl3_ValidatePreambleWithVersion(ss, &sidBytes, &comps, &cookieBytes);
+    if (rv != SECSuccess) {
+        errCode = PORT_GetError();
+        goto loser; /* code set, alert sent. */
     }
 
     /* Now parse the rest of the extensions. */
@@ -8877,7 +9099,11 @@
     }
 
     if (isTLS13) {
-        rv = tls13_HandleClientHelloPart2(ss, &suites, sid, savedMsg, savedLen);
+        rv = tls13_HandleClientHelloPart2(ss, &suites, sid,
+                                          ss->ssl3.hs.echAccepted ? echInner->data : savedMsg,
+                                          ss->ssl3.hs.echAccepted ? echInner->len : savedLen);
+        SECITEM_FreeItem(echInner, PR_TRUE);
+        echInner = NULL;
     } else {
         rv = ssl3_HandleClientHelloPart2(ss, &suites, sid,
                                          savedMsg, savedLen);
@@ -8892,6 +9118,7 @@
     (void)SSL3_SendAlert(ss, level, desc);
 /* FALLTHRU */
 loser:
+    SECITEM_FreeItem(echInner, PR_TRUE);
     PORT_SetError(errCode);
     return SECFailure;
 }
@@ -9338,6 +9565,8 @@
         errCode = SSL_ERROR_UNSUPPORTED_VERSION;
         goto alert_loser;
     }
+    /* ECH not possible here. */
+    ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_ech;
     ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_version;
     if (!ss->firstHsDone) {
         ssl_GetSpecWriteLock(ss);
@@ -12051,6 +12280,21 @@
 }
 
 SECStatus
+ssl_HashHandshakeMessageDefault(sslSocket *ss, SSLHandshakeType ct,
+                                const PRUint8 *b, PRUint32 length)
+{
+    return ssl_HashHandshakeMessageInt(ss, ct, ss->ssl3.hs.recvMessageSeq,
+                                       b, length, ssl3_UpdateOuterHandshakeHashes);
+}
+SECStatus
+ssl_HashHandshakeMessageEchInner(sslSocket *ss, SSLHandshakeType ct,
+                                 const PRUint8 *b, PRUint32 length)
+{
+    return ssl_HashHandshakeMessageInt(ss, ct, ss->ssl3.hs.recvMessageSeq,
+                                       b, length, ssl3_UpdateInnerHandshakeHashes);
+}
+
+SECStatus
 ssl_HashPostHandshakeMessage(sslSocket *ss, SSLHandshakeType ct,
                              const PRUint8 *b, PRUint32 length)
 {
@@ -13182,6 +13426,7 @@
 
     ssl3_ResetExtensionData(&ss->xtnData, ss);
     PR_INIT_CLIST(&ss->ssl3.hs.remoteExtensions);
+    PR_INIT_CLIST(&ss->ssl3.hs.echOuterExtensions);
     if (IS_DTLS(ss)) {
         ss->ssl3.hs.sendMessageSeq = 0;
         ss->ssl3.hs.recvMessageSeq = 0;
@@ -13200,6 +13445,8 @@
     ss->ssl3.hs.serverHsTrafficSecret = NULL;
     ss->ssl3.hs.clientTrafficSecret = NULL;
     ss->ssl3.hs.serverTrafficSecret = NULL;
+    ss->ssl3.hs.echHpkeCtx = NULL;
+    ss->ssl3.hs.echAccepted = PR_FALSE;
 
     PORT_Assert(!ss->ssl3.hs.messages.buf && !ss->ssl3.hs.messages.space);
     ss->ssl3.hs.messages.buf = NULL;
@@ -13532,12 +13779,18 @@
     if (ss->ssl3.hs.sha) {
         PK11_DestroyContext(ss->ssl3.hs.sha, PR_TRUE);
     }
+    if (ss->ssl3.hs.shaEchInner) {
+        PK11_DestroyContext(ss->ssl3.hs.shaEchInner, PR_TRUE);
+    }
     if (ss->ssl3.hs.shaPostHandshake) {
         PK11_DestroyContext(ss->ssl3.hs.shaPostHandshake, PR_TRUE);
     }
     if (ss->ssl3.hs.messages.buf) {
         sslBuffer_Clear(&ss->ssl3.hs.messages);
     }
+    if (ss->ssl3.hs.echInnerMessages.buf) {
+        sslBuffer_Clear(&ss->ssl3.hs.echInnerMessages);
+    }
 
     /* free the SSL3Buffer (msg_body) */
     PORT_Free(ss->ssl3.hs.msg_body.buf);
@@ -13556,6 +13809,7 @@
 
     /* Destroy remote extensions */
     ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.remoteExtensions);
+    ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.echOuterExtensions);
     ssl3_DestroyExtensionData(&ss->xtnData);
 
     /* Destroy cipher specs */
@@ -13586,8 +13840,13 @@
     ss->ssl3.hs.zeroRttState = ssl_0rtt_none;
     /* Destroy TLS 1.3 buffered early data. */
     tls13_DestroyEarlyData(&ss->ssl3.hs.bufferedEarlyData);
-    /* Destroy TLS 1.3 PSKs */
+
+    /* Destroy TLS 1.3 PSKs. */
     tls13_DestroyPskList(&ss->ssl3.hs.psks);
+
+    /* TLS 1.3 ECH state. */
+    PK11_HPKE_DestroyContext(ss->ssl3.hs.echHpkeCtx, PR_TRUE);
+    PORT_Free((void *)ss->ssl3.hs.echPublicName); /* CONST */
 }
 
 /*
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3ext.c firefox-85.0+build1/security/nss/lib/ssl/ssl3ext.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3ext.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3ext.c	2021-01-18 19:58:19.000000000 +0000
@@ -53,7 +53,6 @@
     { ssl_tls13_early_data_xtn, &tls13_ServerHandleEarlyDataXtn },
     { ssl_tls13_psk_key_exchange_modes_xtn, &tls13_ServerHandlePskModesXtn },
     { ssl_tls13_cookie_xtn, &tls13_ServerHandleCookieXtn },
-    { ssl_tls13_encrypted_sni_xtn, &tls13_ServerHandleEsniXtn },
     { ssl_tls13_post_handshake_auth_xtn, &tls13_ServerHandlePostHandshakeAuthXtn },
     { ssl_record_size_limit_xtn, &ssl_HandleRecordSizeLimitXtn },
     { 0, NULL }
@@ -74,6 +73,7 @@
     { ssl_tls13_key_share_xtn, &tls13_ClientHandleKeyShareXtn },
     { ssl_tls13_pre_shared_key_xtn, &tls13_ClientHandlePreSharedKeyXtn },
     { ssl_tls13_early_data_xtn, &tls13_ClientHandleEarlyDataXtn },
+    { ssl_tls13_encrypted_client_hello_xtn, &tls13_ClientHandleEchXtn },
     { ssl_record_size_limit_xtn, &ssl_HandleRecordSizeLimitXtn },
     { 0, NULL }
 };
@@ -143,7 +143,6 @@
       { ssl_signature_algorithms_xtn, &ssl3_SendSigAlgsXtn },
       { ssl_tls13_cookie_xtn, &tls13_ClientSendHrrCookieXtn },
       { ssl_tls13_psk_key_exchange_modes_xtn, &tls13_ClientSendPskModesXtn },
-      { ssl_tls13_encrypted_sni_xtn, &tls13_ClientSendEsniXtn },
       { ssl_tls13_post_handshake_auth_xtn, &tls13_ClientSendPostHandshakeAuthXtn },
       { ssl_record_size_limit_xtn, &ssl_SendRecordSizeLimitXtn },
       /* The pre_shared_key extension MUST be last. */
@@ -193,7 +192,8 @@
     { ssl_tls13_psk_key_exchange_modes_xtn, ssl_ext_native_only },
     { ssl_tls13_ticket_early_data_info_xtn, ssl_ext_native_only },
     { ssl_tls13_certificate_authorities_xtn, ssl_ext_native },
-    { ssl_renegotiation_info_xtn, ssl_ext_native }
+    { ssl_renegotiation_info_xtn, ssl_ext_native },
+    { ssl_tls13_encrypted_client_hello_xtn, ssl_ext_native_only },
 };
 
 static SSLExtensionSupport
@@ -866,40 +866,25 @@
     return extensionLen - 4;
 }
 
-/* ssl3_SendPaddingExtension possibly adds an extension which ensures that a
- * ClientHello record is either < 256 bytes or is >= 512 bytes. This ensures
- * that we don't trigger bugs in F5 products.
- *
- * This takes an existing extension buffer, |buf|, and the length of the
- * remainder of the ClientHello, |prefixLen|.  It modifies the extension buffer
- * to insert padding at the right place.
- */
+/* Manually insert an extension, retaining the position of the PSK
+ * extension, if present. */
 SECStatus
-ssl_InsertPaddingExtension(const sslSocket *ss, unsigned int prefixLen,
-                           sslBuffer *buf)
+ssl3_EmplaceExtension(sslSocket *ss, sslBuffer *buf, PRUint16 exType,
+                      const PRUint8 *data, unsigned int len, PRBool advertise)
 {
-    static unsigned char padding[252] = { 0 };
-    unsigned int paddingLen;
-    unsigned int tailLen;
     SECStatus rv;
-
-    /* Account for the size of the header, the length field of the extensions
-     * block and the size of the existing extensions. */
-    paddingLen = ssl_CalculatePaddingExtLen(ss, prefixLen + 2 + buf->len);
-    if (!paddingLen) {
-        return SECSuccess;
-    }
+    unsigned int tailLen;
 
     /* Move the tail if there is one. This only happens if we are sending the
      * TLS 1.3 PSK extension, which needs to be at the end. */
     if (ss->xtnData.lastXtnOffset) {
         PORT_Assert(buf->len > ss->xtnData.lastXtnOffset);
         tailLen = buf->len - ss->xtnData.lastXtnOffset;
-        rv = sslBuffer_Grow(buf, buf->len + 4 + paddingLen);
+        rv = sslBuffer_Grow(buf, buf->len + 4 + len);
         if (rv != SECSuccess) {
             return SECFailure;
         }
-        PORT_Memmove(buf->buf + ss->xtnData.lastXtnOffset + 4 + paddingLen,
+        PORT_Memmove(buf->buf + ss->xtnData.lastXtnOffset + 4 + len,
                      buf->buf + ss->xtnData.lastXtnOffset,
                      tailLen);
         buf->len = ss->xtnData.lastXtnOffset;
@@ -907,20 +892,71 @@
         tailLen = 0;
     }
 
-    rv = sslBuffer_AppendNumber(buf, ssl_padding_xtn, 2);
+    rv = sslBuffer_AppendNumber(buf, exType, 2);
     if (rv != SECSuccess) {
         return SECFailure; /* Code already set. */
     }
-    rv = sslBuffer_AppendVariable(buf, padding, paddingLen, 2);
+    rv = sslBuffer_AppendVariable(buf, data, len, 2);
     if (rv != SECSuccess) {
         return SECFailure; /* Code already set. */
     }
 
+    if (ss->xtnData.lastXtnOffset) {
+        ss->xtnData.lastXtnOffset += 4 + len;
+    }
+
     buf->len += tailLen;
 
+    /* False only to retain behavior with padding_xtn. Maybe
+     * we can just mark that advertised as well? TODO */
+    if (advertise) {
+        ss->xtnData.advertised[ss->xtnData.numAdvertised++] = exType;
+    }
+
     return SECSuccess;
 }
 
+/* ssl3_SendPaddingExtension possibly adds an extension which ensures that a
+ * ClientHello record is either < 256 bytes or is >= 512 bytes. This ensures
+ * that we don't trigger bugs in F5 products.
+ *
+ * This takes an existing extension buffer, |buf|, and the length of the
+ * remainder of the ClientHello, |prefixLen|.  It modifies the extension buffer
+ * to insert padding at the right place.
+ */
+SECStatus
+ssl_InsertPaddingExtension(sslSocket *ss, unsigned int prefixLen,
+                           sslBuffer *buf)
+{
+    static unsigned char padding[252] = { 0 };
+    unsigned int paddingLen;
+    /* Exit early if an application-provided extension hook
+     * already added padding. */
+    if (ssl3_ExtensionAdvertised(ss, ssl_padding_xtn)) {
+        return SECSuccess;
+    }
+
+    /* Account for the size of the header, the length field of the extensions
+     * block and the size of the existing extensions. */
+    paddingLen = ssl_CalculatePaddingExtLen(ss, prefixLen + 2 + buf->len);
+    if (!paddingLen) {
+        return SECSuccess;
+    }
+
+    return ssl3_EmplaceExtension(ss, buf, ssl_padding_xtn, padding, paddingLen, PR_FALSE);
+}
+
+void
+ssl3_MoveRemoteExtensions(PRCList *dst, PRCList *src)
+{
+    PRCList *cur_p;
+    while (!PR_CLIST_IS_EMPTY(src)) {
+        cur_p = PR_LIST_TAIL(src);
+        PR_REMOVE_LINK(cur_p);
+        PR_APPEND_LINK(cur_p, dst);
+    }
+}
+
 void
 ssl3_DestroyRemoteExtensions(PRCList *list)
 {
@@ -982,9 +1018,14 @@
         xtnData->certReqAuthorities.arena = NULL;
     }
     PORT_Free(xtnData->advertised);
-    ssl_FreeEphemeralKeyPair(xtnData->esniPrivateKey);
-    SECITEM_FreeItem(&xtnData->keyShareExtension, PR_FALSE);
     tls13_DestroyDelegatedCredential(xtnData->peerDelegCred);
+
+    /* ECH State */
+    SECITEM_FreeItem(&xtnData->innerCh, PR_FALSE);
+    SECITEM_FreeItem(&xtnData->echSenderPubKey, PR_FALSE);
+    SECITEM_FreeItem(&xtnData->echConfigId, PR_FALSE);
+    SECITEM_FreeItem(&xtnData->echRetryConfigs, PR_FALSE);
+    xtnData->echRetryConfigsValid = PR_FALSE;
 }
 
 /* Free everything that has been allocated and then reset back to
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3ext.h firefox-85.0+build1/security/nss/lib/ssl/ssl3ext.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3ext.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3ext.h	2021-01-18 19:58:19.000000000 +0000
@@ -9,10 +9,9 @@
 #ifndef __ssl3ext_h_
 #define __ssl3ext_h_
 
+#include "pk11hpke.h"
 #include "sslencode.h"
 
-#define TLS13_ESNI_NONCE_SIZE 16
-
 typedef enum {
     sni_nametype_hostname
 } SNINameType;
@@ -98,7 +97,8 @@
 
     PRUint16 dtlsSRTPCipherSuite; /* 0 if not selected */
 
-    unsigned int lastXtnOffset; /* Where to insert padding. 0 = end. */
+    unsigned int lastXtnOffset; /* Where to insert any other extensions.
+                                 * 0 = end, otherwise base of PSK xtn. */
     PRCList remoteKeyShares;    /* The other side's public keys (TLS 1.3) */
 
     /* The following are used by a TLS 1.3 server. */
@@ -114,14 +114,6 @@
     /* The record size limit set by the peer. Our value is kept in ss->opt. */
     PRUint16 recordSizeLimit;
 
-    /* ESNI working state */
-    SECItem keyShareExtension;
-    ssl3CipherSuite esniSuite;
-    sslEphemeralKeyPair *esniPrivateKey;
-    /* Pointer into |ss->esniKeys->keyShares| */
-    TLS13KeyShareEntry *peerEsniShare;
-    PRUint8 esniNonce[TLS13_ESNI_NONCE_SIZE];
-
     /* Delegated credentials.
      *
      * The delegated credential sent by the peer. Set by
@@ -138,6 +130,14 @@
     /* A non-owning reference to the selected PSKs. MUST NOT be freed directly,
      * rather through tls13_DestoryPskList(). */
     sslPsk *selectedPsk;
+
+    /* ECH working state. */
+    SECItem innerCh;             /* Server: "payload value of ClientECH. */
+    SECItem echSenderPubKey;     /* Server: "enc value of ClientECH, required for CHInner decryption. */
+    SECItem echConfigId;         /* Server: "config_id" value of ClientECH.  */
+    PRUint32 echCipherSuite;     /* Server: "cipher_suite" value of ClientECH. */
+    SECItem echRetryConfigs;     /* Client: Retry_configs from ServerEncryptedCH. */
+    PRBool echRetryConfigsValid; /* Client: Permits retry_configs to be extracted. */
 };
 
 typedef struct TLSExtensionStr {
@@ -165,6 +165,7 @@
 TLSExtension *ssl3_FindExtension(sslSocket *ss,
                                  SSLExtensionType extension_type);
 void ssl3_DestroyRemoteExtensions(PRCList *list);
+void ssl3_MoveRemoteExtensions(PRCList *dst, PRCList *src);
 void ssl3_InitExtensionData(TLSExtensionData *xtnData, const sslSocket *ss);
 void ssl3_DestroyExtensionData(TLSExtensionData *xtnData);
 void ssl3_ResetExtensionData(TLSExtensionData *xtnData, const sslSocket *ss);
@@ -180,7 +181,9 @@
                                   SSLHandshakeType message);
 SECStatus ssl_SendEmptyExtension(const sslSocket *ss, TLSExtensionData *xtnData,
                                  sslBuffer *buf, PRBool *append);
-SECStatus ssl_InsertPaddingExtension(const sslSocket *ss, unsigned int prefixLen,
+SECStatus ssl3_EmplaceExtension(sslSocket *ss, sslBuffer *buf, PRUint16 exType,
+                                const PRUint8 *data, unsigned int len, PRBool advertise);
+SECStatus ssl_InsertPaddingExtension(sslSocket *ss, unsigned int prefixLen,
                                      sslBuffer *buf);
 
 /* Thunks to let us operate on const sslSocket* objects. */
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3exthandle.c firefox-85.0+build1/security/nss/lib/ssl/ssl3exthandle.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3exthandle.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3exthandle.c	2021-01-18 19:58:19.000000000 +0000
@@ -15,7 +15,7 @@
 #include "selfencrypt.h"
 #include "ssl3ext.h"
 #include "ssl3exthandle.h"
-#include "tls13esni.h"
+#include "tls13ech.h"
 #include "tls13exthandle.h" /* For tls13_ServerSendStatusRequestXtn. */
 
 PRBool
@@ -42,13 +42,11 @@
  */
 SECStatus
 ssl3_ClientFormatServerNameXtn(const sslSocket *ss, const char *url,
-                               TLSExtensionData *xtnData,
+                               unsigned int len, TLSExtensionData *xtnData,
                                sslBuffer *buf)
 {
-    unsigned int len;
     SECStatus rv;
 
-    len = PORT_Strlen(url);
     /* length of server_name_list */
     rv = sslBuffer_AppendNumber(buf, len + 3, 2);
     if (rv != SECSuccess) {
@@ -76,17 +74,15 @@
 
     const char *url = ss->url;
 
-    /* We only make an ESNI private key if we are going to
-     * send ESNI. */
-    if (ss->xtnData.esniPrivateKey != NULL) {
-        url = ss->esniKeys->dummySni;
-    }
-
     if (!ssl_ShouldSendSNIExtension(ss, url)) {
         return SECSuccess;
     }
 
-    rv = ssl3_ClientFormatServerNameXtn(ss, url, xtnData, buf);
+    /* If ECH, write the public name. The real server name
+     * is emplaced while constructing CHInner extensions. */
+    sslEchConfig *cfg = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+    const char *sniContents = PR_CLIST_IS_EMPTY(&ss->echConfigs) ? url : cfg->contents.publicName;
+    rv = ssl3_ClientFormatServerNameXtn(ss, sniContents, strlen(sniContents), xtnData, buf);
     if (rv != SECSuccess) {
         return SECFailure;
     }
@@ -107,13 +103,6 @@
         return SECSuccess; /* ignore extension */
     }
 
-    if (ssl3_ExtensionNegotiated(ss, ssl_tls13_encrypted_sni_xtn)) {
-        /* If we already have ESNI, make sure we don't overwrite
-         * the value. */
-        PORT_Assert(ss->version >= SSL_LIBRARY_VERSION_TLS_1_3);
-        return SECSuccess;
-    }
-
     /* Server side - consume client data and register server sender. */
     /* do not parse the data if don't have user extension handling function. */
     if (!ss->sniSocketConfig) {
@@ -323,11 +312,11 @@
     }
 
     PORT_Assert(ss->nextProtoCallback);
-    /* The cipher suite isn't selected yet.  Note that extensions
+    /* Neither the cipher suite nor ECH are selected yet Note that extensions
      * sometimes affect what cipher suite is selected, e.g., for ECC. */
     PORT_Assert((ss->ssl3.hs.preliminaryInfo &
-                 ssl_preinfo_all & ~ssl_preinfo_cipher_suite) ==
-                (ssl_preinfo_all & ~ssl_preinfo_cipher_suite));
+                 ssl_preinfo_all & ~ssl_preinfo_cipher_suite & ~ssl_preinfo_ech) ==
+                (ssl_preinfo_all & ~ssl_preinfo_cipher_suite & ~ssl_preinfo_ech));
     /* The callback has to make sure that either rv != SECSuccess or that result
      * is not set if there is no common protocol. */
     rv = ss->nextProtoCallback(ss->nextProtoArg, ss->fd, data->data, data->len,
@@ -928,6 +917,13 @@
         PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
         return SECFailure;
     }
+
+#ifndef UNSAFE_FUZZER_MODE
+    PORT_Assert(temp < ssl_auth_size);
+#else
+    temp %= (8 * sizeof(SSLAuthType));
+#endif
+
     parsedTicket->authType = (SSLAuthType)temp;
     rv = ssl3_ExtConsumeHandshakeNumber(ss, &temp, 4, &buffer, &len);
     if (rv != SECSuccess) {
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3exthandle.h firefox-85.0+build1/security/nss/lib/ssl/ssl3exthandle.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3exthandle.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3exthandle.h	2021-01-18 19:58:19.000000000 +0000
@@ -93,7 +93,7 @@
                                           /* out */ SECItem *appToken);
 PRBool ssl_ShouldSendSNIExtension(const sslSocket *ss, const char *url);
 SECStatus ssl3_ClientFormatServerNameXtn(const sslSocket *ss, const char *url,
-                                         TLSExtensionData *xtnData,
+                                         unsigned int len, TLSExtensionData *xtnData,
                                          sslBuffer *buf);
 SECStatus ssl3_ClientSendServerNameXtn(const sslSocket *ss,
                                        TLSExtensionData *xtnData,
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl3prot.h firefox-85.0+build1/security/nss/lib/ssl/ssl3prot.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl3prot.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl3prot.h	2021-01-18 19:58:18.000000000 +0000
@@ -76,6 +76,7 @@
     bad_certificate_hash_value = 114,
     certificate_required = 116,
     no_application_protocol = 120,
+    ech_required = 121,
 
     /* invalid alert */
     no_alert = 256
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslencode.c firefox-85.0+build1/security/nss/lib/ssl/sslencode.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslencode.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslencode.c	2021-01-18 19:58:19.000000000 +0000
@@ -165,6 +165,23 @@
     return SECSuccess;
 }
 
+SECStatus
+sslBuffer_InsertNumber(sslBuffer *b, unsigned int at,
+                       PRUint64 v, unsigned int size)
+{
+    PORT_Assert(b->len >= at + size);
+    PORT_Assert(b->space >= at + size);
+
+    PORT_Assert(size <= 4 && size > 0);
+    if (v >= (1ULL << (8 * size))) {
+        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+        return SECFailure;
+    }
+
+    ssl_EncodeUintX(SSL_BUFFER_BASE(b) + at, v, size);
+    return SECSuccess;
+}
+
 void
 sslBuffer_Clear(sslBuffer *b)
 {
@@ -247,8 +264,8 @@
 #define MAX_SEND_BUF_LENGTH 32000 /* watch for 16-bit integer overflow */
 #define MIN_SEND_BUF_LENGTH 4000
 
-SECStatus
-ssl3_AppendHandshake(sslSocket *ss, const void *void_src, unsigned int bytes)
+static SECStatus
+ssl3_AppendHandshakeInternal(sslSocket *ss, const void *void_src, unsigned int bytes, PRBool suppressHash)
 {
     unsigned char *src = (unsigned char *)void_src;
     int room = ss->sec.ci.sendBuf.space - ss->sec.ci.sendBuf.len;
@@ -267,7 +284,8 @@
     }
 
     PRINT_BUF(60, (ss, "Append to Handshake", (unsigned char *)void_src, bytes));
-    if (!ss->firstHsDone || ss->version < SSL_LIBRARY_VERSION_TLS_1_3) {
+    // TODO: Move firstHsDone and version check into callers as a suppression.
+    if (!suppressHash && (!ss->firstHsDone || ss->version < SSL_LIBRARY_VERSION_TLS_1_3)) {
         rv = ssl3_UpdateHandshakeHashes(ss, src, bytes);
         if (rv != SECSuccess)
             return SECFailure; /* error code set by ssl3_UpdateHandshakeHashes */
@@ -293,6 +311,18 @@
 }
 
 SECStatus
+ssl3_AppendHandshakeSuppressHash(sslSocket *ss, const void *void_src, unsigned int bytes)
+{
+    return ssl3_AppendHandshakeInternal(ss, void_src, bytes, PR_TRUE);
+}
+
+SECStatus
+ssl3_AppendHandshake(sslSocket *ss, const void *void_src, unsigned int bytes)
+{
+    return ssl3_AppendHandshakeInternal(ss, void_src, bytes, PR_FALSE);
+}
+
+SECStatus
 ssl3_AppendHandshakeNumber(sslSocket *ss, PRUint64 num, unsigned int lenSize)
 {
     PRUint8 b[sizeof(num)];
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslencode.h firefox-85.0+build1/security/nss/lib/ssl/sslencode.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslencode.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslencode.h	2021-01-18 19:58:19.000000000 +0000
@@ -27,6 +27,10 @@
     {                               \
         b, 0, maxlen, PR_TRUE       \
     }
+#define SSL_BUFFER_FIXED_LEN(b, len) \
+    {                                \
+        b, len, 0, PR_TRUE           \
+    }
 #define SSL_BUFFER(b) SSL_BUFFER_FIXED(b, sizeof(b))
 #define SSL_BUFFER_BASE(b) ((b)->buf)
 #define SSL_BUFFER_LEN(b) ((b)->len)
@@ -45,10 +49,14 @@
                          unsigned int *savedOffset);
 SECStatus sslBuffer_InsertLength(sslBuffer *b, unsigned int at,
                                  unsigned int size);
+SECStatus sslBuffer_InsertNumber(sslBuffer *b, unsigned int at,
+                                 PRUint64 v, unsigned int size);
 void sslBuffer_Clear(sslBuffer *b);
 
 SECStatus ssl3_AppendHandshake(sslSocket *ss, const void *void_src,
                                unsigned int bytes);
+SECStatus ssl3_AppendHandshakeSuppressHash(sslSocket *ss, const void *void_src,
+                                           unsigned int bytes);
 SECStatus ssl3_AppendHandshakeHeader(sslSocket *ss,
                                      SSLHandshakeType t, unsigned int length);
 SECStatus ssl3_AppendHandshakeNumber(sslSocket *ss, PRUint64 num,
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslerr.h firefox-85.0+build1/security/nss/lib/ssl/sslerr.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslerr.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslerr.h	2021-01-18 19:58:18.000000000 +0000
@@ -276,8 +276,21 @@
     SSL_ERROR_DC_EXPIRED = (SSL_ERROR_BASE + 185),
     SSL_ERROR_DC_INAPPROPRIATE_VALIDITY_PERIOD = (SSL_ERROR_BASE + 186),
     SSL_ERROR_FEATURE_DISABLED = (SSL_ERROR_BASE + 187),
+    /* ECH rejected, public name authentication succeeded,
+     * and at least one of the retry_configs is compatible. */
+    SSL_ERROR_ECH_RETRY_WITH_ECH = (SSL_ERROR_BASE + 188),
+    /* ECH rejected, public name authentication succeeded,
+     * but none of the retry_configs are compatible. */
+    SSL_ERROR_ECH_RETRY_WITHOUT_ECH = (SSL_ERROR_BASE + 189),
+    /* ECH rejected and public name authentication failed. */
+    SSL_ERROR_ECH_FAILED = (SSL_ERROR_BASE + 190),
+    SSL_ERROR_ECH_REQUIRED_ALERT     = (SSL_ERROR_BASE + 191),
     SSL_ERROR_END_OF_LIST   /* let the c compiler determine the value of this. */
 } SSLErrorCodes;
+
+#define SSL_ERROR_RX_MALFORMED_ECH_CONFIG SSL_ERROR_RX_MALFORMED_ESNI_KEYS
+#define SSL_ERROR_RX_MALFORMED_ECH_EXTENSION SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION
+#define SSL_ERROR_MISSING_ECH_EXTENSION SSL_ERROR_MISSING_ESNI_EXTENSION
 #endif /* NO_SECURITY_ERROR_ENUM */
 
 /* clang-format on */
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/SSLerrs.h firefox-85.0+build1/security/nss/lib/ssl/SSLerrs.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/SSLerrs.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/SSLerrs.h	2021-01-18 19:58:19.000000000 +0000
@@ -585,3 +585,18 @@
 
 ER3(SSL_ERROR_DC_INAPPROPRIATE_VALIDITY_PERIOD, (SSL_ERROR_BASE + 186),
     "SSL received a delegated credential with excessive TTL.")
+
+ER3(SSL_ERROR_FEATURE_DISABLED, (SSL_ERROR_BASE + 187),
+    "The requested feature is disabled.")
+
+ER3(SSL_ERROR_ECH_RETRY_WITH_ECH, (SSL_ERROR_BASE + 188),
+    "TLS ECH was rejected, but verification succeeded and compatible retry_configs are available.")
+
+ER3(SSL_ERROR_ECH_RETRY_WITHOUT_ECH, (SSL_ERROR_BASE + 189),
+    "TLS ECH was rejected, but verification succeeded and no compatible retry_configs were found.")
+
+ER3(SSL_ERROR_ECH_FAILED, (SSL_ERROR_BASE + 190),
+    "TLS ECH was rejected and verification failed.")
+
+ER3(SSL_ERROR_ECH_REQUIRED_ALERT, (SSL_ERROR_BASE + 191),
+    "SSL peer reported ECH required.")
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslexp.h firefox-85.0+build1/security/nss/lib/ssl/sslexp.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslexp.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslexp.h	2021-01-18 19:58:19.000000000 +0000
@@ -502,63 +502,86 @@
                          (PRFileDesc * _fd, PRUint32 _size), \
                          (fd, size))
 
-/* Set the ESNI key pair on a socket (server side)
+/* If |enabled|, a GREASE ECH extension will be sent in every ClientHello,
+ * unless a valid and supported ECHConfig is configured to the socket
+ * (in which case real ECH takes precedence). If |!enabled|, it is not sent.*/
+#define SSL_EnableTls13GreaseEch(fd, enabled)        \
+    SSL_EXPERIMENTAL_API("SSL_EnableTls13GreaseEch", \
+                         (PRFileDesc * _fd, PRBool _enabled), (fd, enabled))
+
+/* Called by the client after an initial ECH connection fails with
+ * SSL_ERROR_ECH_RETRY_WITH_ECH. Returns compatible ECHConfigs, which
+ * are configured via SetClientEchConfigs for an ECH retry attempt.
+ * These configs MUST NOT be used for more than the single retry
+ * attempt. Subsequent connections MUST use advertised ECHConfigs. */
+#define SSL_GetEchRetryConfigs(fd, out)            \
+    SSL_EXPERIMENTAL_API("SSL_GetEchRetryConfigs", \
+                         (PRFileDesc * _fd,        \
+                          SECItem * _out),         \
+                         (fd, out))
+
+/* Called to remove all ECHConfigs from a socket (fd). */
+#define SSL_RemoveEchConfigs(fd)                 \
+    SSL_EXPERIMENTAL_API("SSL_RemoveEchConfigs", \
+                         (PRFileDesc * _fd),     \
+                         (fd))
+
+/* Set the ECHConfig and key pair on a socket (server side)
  *
  * fd -- the socket
+ * pubKey -- the server's SECKEYPublicKey for HPKE/ECH.
+ * privateKey -- the server's SECKEYPrivateKey for HPKE/ECH.
  * record/recordLen -- the encoded DNS record (not base64)
- *
- * Important: the suites that are advertised in the record must
- * be configured on, or this call will fail.
  */
-#define SSL_SetESNIKeyPair(fd,                                              \
-                           privKey, record, recordLen)                      \
-    SSL_EXPERIMENTAL_API("SSL_SetESNIKeyPair",                              \
+#define SSL_SetServerEchConfigs(fd, pubKey,                                 \
+                                privKey, record, recordLen)                 \
+    SSL_EXPERIMENTAL_API("SSL_SetServerEchConfigs",                         \
                          (PRFileDesc * _fd,                                 \
-                          SECKEYPrivateKey * _privKey,                      \
+                          const SECKEYPublicKey *_pubKey,                   \
+                          const SECKEYPrivateKey *_privKey,                 \
                           const PRUint8 *_record, unsigned int _recordLen), \
-                         (fd, privKey,                                      \
+                         (fd, pubKey, privKey,                              \
                           record, recordLen))
 
-/* Set the ESNI keys on a client
+/* Set ECHConfig(s) on a client. The first supported ECHConfig will be used.
  *
  * fd -- the socket
- * ensikeys/esniKeysLen -- the ESNI key structure (not base64)
- * dummyESNI -- the dummy ESNI to use (if any)
+ * echConfigs/echConfigsLen -- the ECHConfigs structure (not base64)
  */
-#define SSL_EnableESNI(fd, esniKeys, esniKeysLen, dummySNI) \
-    SSL_EXPERIMENTAL_API("SSL_EnableESNI",                  \
-                         (PRFileDesc * _fd,                 \
-                          const PRUint8 *_esniKeys,         \
-                          unsigned int _esniKeysLen,        \
-                          const char *_dummySNI),           \
-                         (fd, esniKeys, esniKeysLen, dummySNI))
+#define SSL_SetClientEchConfigs(fd, echConfigs, echConfigsLen) \
+    SSL_EXPERIMENTAL_API("SSL_SetClientEchConfigs",            \
+                         (PRFileDesc * _fd,                    \
+                          const PRUint8 *_echConfigs,          \
+                          unsigned int _echConfigsLen),        \
+                         (fd, echConfigs, echConfigsLen))
 
 /*
- * Generate an encoded ESNIKeys structure (presumably server side).
+ * Generate an encoded ECHConfig structure (presumably server side).
  *
- * cipherSuites -- the cipher suites that can be used
- * cipherSuitesCount -- the number of suites in cipherSuites
+ * publicName -- the public_name value to be placed in SNI.
+ * hpkeSuites -- the HPKE cipher suites that can be used
+ * hpkeSuitesCount -- the number of suites in hpkeSuites
+ * kemId -- the HKPE KEM ID value
  * group -- the named group this key corresponds to
  * pubKey -- the public key for the key pair
- * pad -- the length to pad to
- * notBefore/notAfter -- validity range in seconds since epoch
+ * pad -- the maximum length to pad to
  * out/outlen/maxlen -- where to output the data
  */
-#define SSL_EncodeESNIKeys(cipherSuites, cipherSuiteCount,          \
-                           group, pubKey, pad, notBefore, notAfter, \
-                           out, outlen, maxlen)                     \
-    SSL_EXPERIMENTAL_API("SSL_EncodeESNIKeys",                      \
-                         (PRUint16 * _cipherSuites,                 \
-                          unsigned int _cipherSuiteCount,           \
-                          SSLNamedGroup _group,                     \
-                          SECKEYPublicKey *_pubKey,                 \
-                          PRUint16 _pad,                            \
-                          PRUint64 _notBefore, PRUint64 _notAfter,  \
-                          PRUint8 *_out, unsigned int *_outlen,     \
-                          unsigned int _maxlen),                    \
-                         (cipherSuites, cipherSuiteCount,           \
-                          group, pubKey, pad, notBefore, notAfter,  \
-                          out, outlen, maxlen))
+#define SSL_EncodeEchConfig(publicName, hpkeSuites, hpkeSuitesCount, \
+                            kemId, pubKey, maxNameLen, out, outlen,  \
+                            maxlen)                                  \
+    SSL_EXPERIMENTAL_API("SSL_EncodeEchConfig",                      \
+                         (const char *_publicName,                   \
+                          const PRUint32 *_hpkeSuites,               \
+                          unsigned int _hpkeSuitesCount,             \
+                          HpkeKemId _kemId,                          \
+                          const SECKEYPublicKey *_pubKey,            \
+                          PRUint16 _maxNameLen,                      \
+                          PRUint8 *_out, unsigned int *_outlen,      \
+                          unsigned int _maxlen),                     \
+                         (publicName, hpkeSuites, hpkeSuitesCount,   \
+                          kemId, pubKey, maxNameLen, out, outlen,    \
+                          maxlen))
 
 /* SSL_SetSecretCallback installs a callback that TLS calls when it installs new
  * traffic secrets.
@@ -1001,6 +1024,9 @@
 #define SSL_UseAltServerHelloType(fd, enable) SSL_DEPRECATED_EXPERIMENTAL_API
 #define SSL_SetupAntiReplay(a, b, c) SSL_DEPRECATED_EXPERIMENTAL_API
 #define SSL_InitAntiReplay(a, b, c) SSL_DEPRECATED_EXPERIMENTAL_API
+#define SSL_EnableESNI(a, b, c, d) SSL_DEPRECATED_EXPERIMENTAL_API
+#define SSL_EncodeESNIKeys(a, b, c, d, e, f, g, h, i, j) SSL_DEPRECATED_EXPERIMENTAL_API
+#define SSL_SetESNIKeyPair(a, b, c, d) SSL_DEPRECATED_EXPERIMENTAL_API
 
 SEC_END_PROTOS
 
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/ssl.gyp firefox-85.0+build1/security/nss/lib/ssl/ssl.gyp
--- firefox-84.0.2+build1/security/nss/lib/ssl/ssl.gyp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/ssl.gyp	2021-01-18 19:58:19.000000000 +0000
@@ -44,7 +44,7 @@
         'ssltrace.c',
         'sslver.c',
         'tls13con.c',
-        'tls13esni.c',
+        'tls13ech.c',
         'tls13exthandle.c',
         'tls13hashstate.c',
         'tls13hkdf.c',
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslimpl.h firefox-85.0+build1/security/nss/lib/ssl/sslimpl.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslimpl.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslimpl.h	2021-01-18 19:58:19.000000000 +0000
@@ -37,6 +37,8 @@
 typedef struct sslSocketStr sslSocket;
 typedef struct sslNamedGroupDefStr sslNamedGroupDef;
 typedef struct sslEsniKeysStr sslEsniKeys;
+typedef struct sslEchConfigStr sslEchConfig;
+typedef struct sslEchConfigContentsStr sslEchConfigContents;
 typedef struct sslPskStr sslPsk;
 typedef struct sslDelegatedCredentialStr sslDelegatedCredential;
 typedef struct sslEphemeralKeyPairStr sslEphemeralKeyPair;
@@ -284,6 +286,7 @@
     unsigned int enableDelegatedCredentials : 1;
     unsigned int enableDtls13VersionCompat : 1;
     unsigned int suppressEndOfEarlyData : 1;
+    unsigned int enableTls13GreaseEch : 1;
 } sslOptions;
 
 typedef enum { sslHandshakingUndetermined = 0,
@@ -611,17 +614,26 @@
 typedef struct SSL3HandshakeStateStr {
     SSL3Random server_random;
     SSL3Random client_random;
-    SSL3WaitState ws; /* May also contain SSL3WaitState | 0x80 for TLS 1.3 */
+    SSL3Random client_inner_random; /* TLS 1.3 ECH Inner. */
+    SSL3WaitState ws;               /* May also contain SSL3WaitState | 0x80 for TLS 1.3 */
 
     /* This group of members is used for handshake running hashes. */
     SSL3HandshakeHashType hashType;
-    sslBuffer messages; /* Accumulated handshake messages */
+    sslBuffer messages;         /* Accumulated handshake messages */
+    sslBuffer echInnerMessages; /* Accumulated ECH Inner handshake messages */
     /* PKCS #11 mode:
      * SSL 3.0 - TLS 1.1 use both |md5| and |sha|. |md5| is used for MD5 and
      * |sha| for SHA-1.
-     * TLS 1.2 and later use only |sha|, for SHA-256. */
+     * TLS 1.2 and later use only |sha| variants, for SHA-256.
+     * Under normal (non-1.3 ECH) handshakes, only |sha| and |shaPostHandshake|
+     * are used. When doing 1.3 ECH, |sha| contains the transcript hash
+     * corresponding to the outer Client Hello. To facilitate secure retry and
+     * disablement, |shaEchInner|, tracks, in parallel, the transcript hash
+     * corresponding to the inner Client Hello. Once we process the SH
+     * extensions, coalesce into |sha|. */
     PK11Context *md5;
     PK11Context *sha;
+    PK11Context *shaEchInner;
     PK11Context *shaPostHandshake;
     SSLSignatureScheme signatureScheme;
     const ssl3KEADef *kea_def;
@@ -662,7 +674,8 @@
     PRUint32 preliminaryInfo;
 
     /* Parsed extensions */
-    PRCList remoteExtensions; /* Parsed incoming extensions */
+    PRCList remoteExtensions;   /* Parsed incoming extensions */
+    PRCList echOuterExtensions; /* If ECH, hold CHOuter extensions for decompression. */
 
     /* This group of values is used for DTLS */
     PRUint16 sendMessageSeq;   /* The sending message sequence
@@ -717,6 +730,7 @@
                                            * we use for TLS 1.3 */
     PRUint16 ticketNonce;                 /* A counter we use for tickets. */
     SECItem fakeSid;                      /* ... (server) the SID the client used. */
+    PRCList psks;                         /* A list of PSKs, resumption and/or external. */
 
     /* rttEstimate is used to guess the round trip time between server and client.
      * When the server sends ServerHello it sets this to the current time.
@@ -729,13 +743,19 @@
     PRCList dtlsRcvdHandshake; /* Handshake records we have received
                                 * used to generate ACKs. */
 
-    PRCList psks; /* A list of PSKs, resumption and/or external. */
+    /* TLS 1.3 ECH state. */
+    PRBool echAccepted;        /* Client/Server: True if we've commited to using CHInner. */
+    HpkeContext *echHpkeCtx;   /* Client/Server: HPKE context for ECH. */
+    const char *echPublicName; /* Client: If rejected, the ECHConfig.publicName to
+                                * use for certificate verification. */
+
 } SSL3HandshakeState;
 
 #define SSL_ASSERT_HASHES_EMPTY(ss)                                  \
     do {                                                             \
         PORT_Assert(ss->ssl3.hs.hashType == handshake_hash_unknown); \
         PORT_Assert(ss->ssl3.hs.messages.len == 0);                  \
+        PORT_Assert(ss->ssl3.hs.echInnerMessages.len == 0);          \
     } while (0)
 
 /*
@@ -1101,9 +1121,10 @@
     /* Whether we are doing stream or datagram mode */
     SSLProtocolVariant protocolVariant;
 
-    /* The information from the ESNI keys record
-     * (also the private key for the server). */
-    sslEsniKeys *esniKeys;
+    /* TLS 1.3 Encrypted Client Hello. */
+    PRCList echConfigs;           /* Client/server: Must not change while hs is in-progress. */
+    SECKEYPublicKey *echPubKey;   /* Server: The ECH keypair used in HPKE setup */
+    SECKEYPrivateKey *echPrivKey; /* As above. */
 
     /* Anti-replay for TLS 1.3 0-RTT. */
     SSLAntiReplayContext *antiReplay;
@@ -1262,6 +1283,10 @@
                             sslUpdateHandshakeHashes cb);
 SECStatus ssl_HashHandshakeMessage(sslSocket *ss, SSLHandshakeType type,
                                    const PRUint8 *b, PRUint32 length);
+SECStatus ssl_HashHandshakeMessageEchInner(sslSocket *ss, SSLHandshakeType type,
+                                           const PRUint8 *b, PRUint32 length);
+SECStatus ssl_HashHandshakeMessageDefault(sslSocket *ss, SSLHandshakeType type,
+                                          const PRUint8 *b, PRUint32 length);
 SECStatus ssl_HashPostHandshakeMessage(sslSocket *ss, SSLHandshakeType type,
                                        const PRUint8 *b, PRUint32 length);
 
@@ -1438,6 +1463,11 @@
 extern SECStatus ssl3_HandleV2ClientHello(
     sslSocket *ss, unsigned char *buffer, unsigned int length, PRUint8 padding);
 
+SECStatus
+ssl3_CreateClientHelloPreamble(sslSocket *ss, const sslSessionID *sid,
+                               PRBool realSid, PRUint16 version, PRBool isEchInner,
+                               const sslBuffer *extensions, sslBuffer *preamble);
+SECStatus ssl3_InsertChHeaderSize(const sslSocket *ss, sslBuffer *preamble, const sslBuffer *extensions);
 SECStatus ssl3_SendClientHello(sslSocket *ss, sslClientHelloType type);
 
 /*
@@ -1679,6 +1709,7 @@
 SECStatus ssl3_NegotiateCipherSuite(sslSocket *ss, const SECItem *suites,
                                     PRBool initHashes);
 SECStatus ssl3_InitHandshakeHashes(sslSocket *ss);
+void ssl3_CoalesceEchHandshakeHashes(sslSocket *ss);
 SECStatus ssl3_ServerCallSNICallback(sslSocket *ss);
 SECStatus ssl3_FlushHandshake(sslSocket *ss, PRInt32 flags);
 SECStatus ssl3_CompleteHandleCertificate(sslSocket *ss,
@@ -1725,6 +1756,7 @@
 SECStatus ssl_CreateStaticECDHEKey(sslSocket *ss,
                                    const sslNamedGroupDef *ecGroup);
 SECStatus ssl3_FlushHandshake(sslSocket *ss, PRInt32 flags);
+SECStatus ssl3_GetNewRandom(SSL3Random random);
 PK11SymKey *ssl3_GetWrappingKey(sslSocket *ss,
                                 PK11SlotInfo *masterSecretSlot,
                                 CK_MECHANISM_TYPE masterWrapMech,
@@ -1914,6 +1946,8 @@
 
 SECStatus SSLExp_DestroyMaskingContext(SSLMaskingContext *ctx);
 
+SECStatus SSLExp_EnableTls13GreaseEch(PRFileDesc *fd, PRBool enabled);
+
 SEC_END_PROTOS
 
 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslinfo.c firefox-85.0+build1/security/nss/lib/ssl/sslinfo.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslinfo.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslinfo.c	2021-01-18 19:58:19.000000000 +0000
@@ -89,6 +89,7 @@
             inf.pskType = ssl_psk_none;
         }
         inf.peerDelegCred = tls13_IsVerifyingWithDelegatedCredential(ss);
+        inf.echAccepted = ss->ssl3.hs.echAccepted;
 
         if (sid) {
             unsigned int sidLen;
@@ -171,6 +172,9 @@
     inf.peerDelegCred = tls13_IsVerifyingWithDelegatedCredential(ss);
     inf.authKeyBits = ss->sec.authKeyBits;
     inf.signatureScheme = ss->sec.signatureScheme;
+    inf.echAccepted = ss->ssl3.hs.echAccepted;
+    /* Only expose this if the application should use it for verification. */
+    inf.echPublicName = (inf.echAccepted == PR_FALSE) ? ss->ssl3.hs.echPublicName : NULL;
 
     memcpy(info, &inf, inf.length);
     return SECSuccess;
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslsecur.c firefox-85.0+build1/security/nss/lib/ssl/sslsecur.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslsecur.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslsecur.c	2021-01-18 19:58:19.000000000 +0000
@@ -173,9 +173,18 @@
     ssl_Release1stHandshakeLock(ss);
 
     ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.remoteExtensions);
+    ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.echOuterExtensions);
     ssl3_ResetExtensionData(&ss->xtnData, ss);
     tls13_ResetHandshakePsks(ss, &ss->ssl3.hs.psks);
 
+    if (ss->ssl3.hs.echHpkeCtx) {
+        PK11_HPKE_DestroyContext(ss->ssl3.hs.echHpkeCtx, PR_TRUE);
+        ss->ssl3.hs.echHpkeCtx = NULL;
+        PORT_Assert(ss->ssl3.hs.echPublicName);
+        PORT_Free((void *)ss->ssl3.hs.echPublicName); /* CONST */
+        ss->ssl3.hs.echPublicName = NULL;
+    }
+
     if (!ss->TCPconnected)
         ss->TCPconnected = (PR_SUCCESS == ssl_DefGetpeername(ss, &addr));
 
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslsock.c firefox-85.0+build1/security/nss/lib/ssl/sslsock.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslsock.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslsock.c	2021-01-18 19:58:19.000000000 +0000
@@ -19,7 +19,7 @@
 #include "nss.h"
 #include "pk11pqg.h"
 #include "pk11pub.h"
-#include "tls13esni.h"
+#include "tls13ech.h"
 #include "tls13psk.h"
 #include "tls13subcerts.h"
 
@@ -92,7 +92,8 @@
     .enableHelloDowngradeCheck = PR_FALSE,
     .enableV2CompatibleHello = PR_FALSE,
     .enablePostHandshakeAuth = PR_FALSE,
-    .suppressEndOfEarlyData = PR_FALSE
+    .suppressEndOfEarlyData = PR_FALSE,
+    .enableTls13GreaseEch = PR_FALSE
 };
 
 /*
@@ -371,12 +372,18 @@
         ss->resumptionTokenCallback = os->resumptionTokenCallback;
         ss->resumptionTokenContext = os->resumptionTokenContext;
 
-        if (os->esniKeys) {
-            ss->esniKeys = tls13_CopyESNIKeys(os->esniKeys);
-            if (!ss->esniKeys) {
+        rv = tls13_CopyEchConfigs(&os->echConfigs, &ss->echConfigs);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        if (os->echPrivKey && os->echPubKey) {
+            ss->echPrivKey = SECKEY_CopyPrivateKey(os->echPrivKey);
+            ss->echPubKey = SECKEY_CopyPublicKey(os->echPubKey);
+            if (!ss->echPrivKey || !ss->echPubKey) {
                 goto loser;
             }
         }
+
         if (os->antiReplay) {
             ss->antiReplay = tls13_RefAntiReplayContext(os->antiReplay);
             PORT_Assert(ss->antiReplay); /* Can't fail. */
@@ -478,13 +485,13 @@
     ssl_ClearPRCList(&ss->ssl3.hs.dtlsRcvdHandshake, NULL);
     tls13_DestroyPskList(&ss->ssl3.hs.psks);
 
-    tls13_DestroyESNIKeys(ss->esniKeys);
     tls13_ReleaseAntiReplayContext(ss->antiReplay);
 
-    if (ss->psk) {
-        tls13_DestroyPsk(ss->psk);
-        ss->psk = NULL;
-    }
+    tls13_DestroyPsk(ss->psk);
+
+    tls13_DestroyEchConfigs(&ss->echConfigs);
+    SECKEY_DestroyPrivateKey(ss->echPrivKey);
+    SECKEY_DestroyPublicKey(ss->echPubKey);
 }
 
 /*
@@ -2378,6 +2385,7 @@
 {
     sslSocket *sm = NULL, *ss = NULL;
     PRCList *cursor;
+    SECStatus rv;
 
     if (model == NULL) {
         PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
@@ -2447,7 +2455,6 @@
     for (cursor = PR_NEXT_LINK(&sm->extensionHooks);
          cursor != &sm->extensionHooks;
          cursor = PR_NEXT_LINK(cursor)) {
-        SECStatus rv;
         sslCustomExtensionHooks *hook = (sslCustomExtensionHooks *)cursor;
         rv = SSL_InstallExtensionHooks(ss->fd, hook->type,
                                        hook->writer, hook->writerArg,
@@ -2473,12 +2480,19 @@
         }
     }
 
-    /* Copy ESNI. */
-    tls13_DestroyESNIKeys(ss->esniKeys);
-    ss->esniKeys = NULL;
-    if (sm->esniKeys) {
-        ss->esniKeys = tls13_CopyESNIKeys(sm->esniKeys);
-        if (!ss->esniKeys) {
+    /* Copy ECH. */
+    tls13_DestroyEchConfigs(&ss->echConfigs);
+    SECKEY_DestroyPrivateKey(ss->echPrivKey);
+    SECKEY_DestroyPublicKey(ss->echPubKey);
+    rv = tls13_CopyEchConfigs(&sm->echConfigs, &ss->echConfigs);
+    if (rv != SECSuccess) {
+        return NULL;
+    }
+    if (sm->echPrivKey && sm->echPubKey) {
+        /* Might be client (no keys). */
+        ss->echPrivKey = SECKEY_CopyPrivateKey(sm->echPrivKey);
+        ss->echPubKey = SECKEY_CopyPublicKey(sm->echPubKey);
+        if (!ss->echPrivKey || !ss->echPubKey) {
             return NULL;
         }
     }
@@ -4161,6 +4175,7 @@
     PR_INIT_CLIST(&ss->serverCerts);
     PR_INIT_CLIST(&ss->ephemeralKeyPairs);
     PR_INIT_CLIST(&ss->extensionHooks);
+    PR_INIT_CLIST(&ss->echConfigs);
 
     ss->dbHandle = CERT_GetDefaultCertDB();
 
@@ -4194,7 +4209,8 @@
     PR_INIT_CLIST(&ss->ssl3.hs.psks);
     dtls_InitTimers(ss);
 
-    ss->esniKeys = NULL;
+    ss->echPrivKey = NULL;
+    ss->echPubKey = NULL;
     ss->antiReplay = NULL;
     ss->psk = NULL;
 
@@ -4277,9 +4293,10 @@
     EXP(DestroyAead),
     EXP(DestroyMaskingContext),
     EXP(DestroyResumptionTokenInfo),
-    EXP(EnableESNI),
-    EXP(EncodeESNIKeys),
+    EXP(EnableTls13GreaseEch),
+    EXP(EncodeEchConfig),
     EXP(GetCurrentEpoch),
+    EXP(GetEchRetryConfigs),
     EXP(GetExtensionSupport),
     EXP(GetResumptionTokenInfo),
     EXP(HelloRetryRequestCallback),
@@ -4295,16 +4312,18 @@
     EXP(RecordLayerData),
     EXP(RecordLayerWriteCallback),
     EXP(ReleaseAntiReplayContext),
+    EXP(RemoveEchConfigs),
     EXP(RemoveExternalPsk),
     EXP(SecretCallback),
     EXP(SendCertificateRequest),
     EXP(SendSessionTicket),
     EXP(SetAntiReplayContext),
+    EXP(SetClientEchConfigs),
     EXP(SetDtls13VersionWorkaround),
-    EXP(SetESNIKeyPair),
     EXP(SetMaxEarlyDataSize),
     EXP(SetResumptionTokenCallback),
     EXP(SetResumptionToken),
+    EXP(SetServerEchConfigs),
     EXP(SetTimeFunc),
 #endif
     { "", NULL }
@@ -4342,6 +4361,17 @@
 }
 
 SECStatus
+SSLExp_EnableTls13GreaseEch(PRFileDesc *fd, PRBool enabled)
+{
+    sslSocket *ss = ssl_FindSocket(fd);
+    if (!ss) {
+        return SECFailure;
+    }
+    ss->opt.enableTls13GreaseEch = enabled;
+    return SECSuccess;
+}
+
+SECStatus
 SSLExp_SetDtls13VersionWorkaround(PRFileDesc *fd, PRBool enabled)
 {
     sslSocket *ss = ssl_FindSocket(fd);
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/sslt.h firefox-85.0+build1/security/nss/lib/ssl/sslt.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/sslt.h	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/sslt.h	2021-01-18 19:58:18.000000000 +0000
@@ -368,6 +368,11 @@
     /* Indicates what type of PSK, if any, was used in a handshake. */
     SSLPskType pskType;
 
+    /* The following fields were added in NSS 3.60 */
+    /* This field is PR_TRUE when the connection is established
+     * with TLS 1.3 Encrypted Client Hello. */
+    PRBool echAccepted;
+
     /* When adding new fields to this structure, please document the
      * NSS version in which they were added. */
 } SSLChannelInfo;
@@ -376,12 +381,13 @@
 #define ssl_preinfo_version (1U << 0)
 #define ssl_preinfo_cipher_suite (1U << 1)
 #define ssl_preinfo_0rtt_cipher_suite (1U << 2)
-/* ssl_preinfo_peer_auth covers peerDelegCred, authKeyBits, and scheme. Not
- * included in ssl_preinfo_all as it is client-only. */
+/* ssl_preinfo_peer_auth covers peerDelegCred, authKeyBits,
+ * and scheme. Not included in ssl_preinfo_all as it is client-only. */
 #define ssl_preinfo_peer_auth (1U << 3)
+#define ssl_preinfo_ech (1U << 4)
 /* ssl_preinfo_all doesn't contain ssl_preinfo_0rtt_cipher_suite because that
  * field is only set if 0-RTT is sent (client) or accepted (server). */
-#define ssl_preinfo_all (ssl_preinfo_version | ssl_preinfo_cipher_suite)
+#define ssl_preinfo_all (ssl_preinfo_version | ssl_preinfo_cipher_suite | ssl_preinfo_ech)
 
 typedef struct SSLPreliminaryChannelInfoStr {
     /* On return, SSL_GetPreliminaryChannelInfo sets |length| to the smaller of
@@ -429,6 +435,12 @@
     PRUint32 authKeyBits;
     SSLSignatureScheme signatureScheme;
 
+    /* The following fields were added in NSS 3.60. */
+    PRBool echAccepted;
+    /* If the application configured ECH but |!echAccepted|, authCertificate
+     * should use the following hostname extracted from the ECHConfig. */
+    const char* echPublicName;
+
     /* When adding new fields to this structure, please document the
      * NSS version in which they were added. */
 } SSLPreliminaryChannelInfo;
@@ -533,7 +545,9 @@
     ssl_next_proto_nego_xtn = 13172, /* Deprecated. */
     ssl_renegotiation_info_xtn = 0xff01,
     ssl_tls13_short_header_xtn = 0xff03, /* Deprecated. */
-    ssl_tls13_encrypted_sni_xtn = 0xffce,
+    ssl_tls13_outer_extensions_xtn = 0xfd00,
+    ssl_tls13_encrypted_client_hello_xtn = 0xfe08,
+    ssl_tls13_encrypted_sni_xtn = 0xffce, /* Deprecated. */
 } SSLExtensionType;
 
 /* This is the old name for the supported_groups extensions. */
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13con.c firefox-85.0+build1/security/nss/lib/ssl/tls13con.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13con.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13con.c	2021-01-18 19:58:19.000000000 +0000
@@ -21,7 +21,7 @@
 #include "tls13hkdf.h"
 #include "tls13con.h"
 #include "tls13err.h"
-#include "tls13esni.h"
+#include "tls13ech.h"
 #include "tls13exthandle.h"
 #include "tls13hashstate.h"
 #include "tls13subcerts.h"
@@ -73,7 +73,7 @@
                                             PRUint32 length);
 static SECStatus tls13_MaybeHandleSuppressedEndOfEarlyData(sslSocket *ss);
 static SECStatus tls13_SendFinished(sslSocket *ss, PK11SymKey *baseKey);
-static SECStatus tls13_ComputePskBinderHash(sslSocket *ss, unsigned int prefix,
+static SECStatus tls13_ComputePskBinderHash(sslSocket *ss, PRUint8 *b, size_t length,
                                             SSL3Hashes *hashes, SSLHashType type);
 static SECStatus tls13_VerifyFinished(sslSocket *ss, SSLHandshakeType message,
                                       PK11SymKey *secret,
@@ -446,10 +446,7 @@
     PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));
     PORT_Assert(ss->opt.noLocks || ssl_HaveXmitBufLock(ss));
 
-    /* Do encrypted SNI.
-     * Note: this makes a new key even though we don't need one.
-     * Maybe remove this in future for efficiency. */
-    rv = tls13_ClientSetupESNI(ss);
+    rv = tls13_ClientSetupEch(ss, chType);
     if (rv != SECSuccess) {
         return SECFailure;
     }
@@ -1755,6 +1752,11 @@
         return SECFailure; /* Code already set. */
     }
 
+    /* We may have received ECH, but have to start over with CH2. */
+    ss->ssl3.hs.echAccepted = PR_FALSE;
+    PK11_HPKE_DestroyContext(ss->ssl3.hs.echHpkeCtx, PR_TRUE);
+    ss->ssl3.hs.echHpkeCtx = NULL;
+
     *hrrSent = PR_TRUE;
     return SECSuccess;
 }
@@ -1814,6 +1816,7 @@
     TLS13KeyShareEntry *clientShare = NULL;
     ssl3CipherSuite previousCipherSuite = 0;
     const sslNamedGroupDef *previousGroup = NULL;
+    PRBool previousEchOffered = PR_FALSE;
     PRBool hrr = PR_FALSE;
 
     /* If the legacy_version field is set to 0x300 or smaller,
@@ -1865,11 +1868,19 @@
         rv = tls13_RecoverHashState(ss, ss->xtnData.cookie.data,
                                     ss->xtnData.cookie.len,
                                     &previousCipherSuite,
-                                    &previousGroup);
+                                    &previousGroup,
+                                    &previousEchOffered);
         if (rv != SECSuccess) {
             FATAL_ERROR(ss, SSL_ERROR_BAD_2ND_CLIENT_HELLO, illegal_parameter);
             goto loser;
         }
+
+        /* CH1/CH2 must either both include ECH, or both exclude it. */
+        if ((ss->xtnData.echConfigId.len > 0) != previousEchOffered) {
+            FATAL_ERROR(ss, SSL_ERROR_BAD_2ND_CLIENT_HELLO,
+                        illegal_parameter);
+            goto loser;
+        }
     }
 
     /* Now merge the ClientHello into the hash state. */
@@ -2027,6 +2038,7 @@
         PORT_Assert(ss->ssl3.hs.messages.len > ss->xtnData.pskBindersLen);
         rv = tls13_ComputePskBinderHash(
             ss,
+            ss->ssl3.hs.messages.buf,
             ss->ssl3.hs.messages.len - ss->xtnData.pskBindersLen,
             &hashes, tls13_GetHash(ss));
         if (rv != SECSuccess) {
@@ -2425,14 +2437,19 @@
  *           00 00 Hash.length ||   // Handshake message length
  *           Hash(ClientHello1) ||  // Hash of ClientHello1
  *           HelloRetryRequest ... MN)
+ *
+ *  For an ECH handshake, the process occurs for the outer
+ *  transcript in |ss->ssl3.hs.messages| and the inner
+ *  transcript in |ss->ssl3.hs.echInnerMessages|.
  */
 static SECStatus
 tls13_ReinjectHandshakeTranscript(sslSocket *ss)
 {
     SSL3Hashes hashes;
+    SSL3Hashes echInnerHashes;
     SECStatus rv;
 
-    // First compute the hash.
+    /* First compute the hash. */
     rv = tls13_ComputeHash(ss, &hashes,
                            ss->ssl3.hs.messages.buf,
                            ss->ssl3.hs.messages.len,
@@ -2441,16 +2458,35 @@
         return SECFailure;
     }
 
-    // Now re-init the handshake.
+    if (ss->ssl3.hs.echHpkeCtx) {
+        rv = tls13_ComputeHash(ss, &echInnerHashes,
+                               ss->ssl3.hs.echInnerMessages.buf,
+                               ss->ssl3.hs.echInnerMessages.len,
+                               tls13_GetHash(ss));
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+    }
+
     ssl3_RestartHandshakeHashes(ss);
 
-    // And reinject the message.
-    rv = ssl_HashHandshakeMessage(ss, ssl_hs_message_hash,
-                                  hashes.u.raw, hashes.len);
+    /* Reinject the message. The Default context variant updates
+     * the default hash state. Use it for both non-ECH and ECH Outer. */
+    rv = ssl_HashHandshakeMessageDefault(ss, ssl_hs_message_hash,
+                                         hashes.u.raw, hashes.len);
     if (rv != SECSuccess) {
         return SECFailure;
     }
 
+    if (ss->ssl3.hs.echHpkeCtx) {
+        rv = ssl_HashHandshakeMessageEchInner(ss, ssl_hs_message_hash,
+                                              echInnerHashes.u.raw,
+                                              echInnerHashes.len);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+    }
+
     return SECSuccess;
 }
 static unsigned int
@@ -3840,6 +3876,8 @@
 {
     SECStatus rv;
     PK11Context *ctx = NULL;
+    PRBool useEchInner;
+    sslBuffer *transcript;
 
     PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));
     if (ss->ssl3.hs.hashType == handshake_hash_unknown) {
@@ -3856,13 +3894,18 @@
             goto loser;
         }
 
+        /* One might expect this to use ss->ssl3.hs.echAccepted,
+         * but with 0-RTT we don't know that yet. */
+        useEchInner = ss->sec.isServer ? PR_FALSE : !!ss->ssl3.hs.echHpkeCtx;
+        transcript = useEchInner ? &ss->ssl3.hs.echInnerMessages : &ss->ssl3.hs.messages;
+
         PRINT_BUF(10, (ss, "Handshake hash computed over saved messages",
-                       ss->ssl3.hs.messages.buf,
-                       ss->ssl3.hs.messages.len));
+                       transcript->buf,
+                       transcript->len));
 
         if (PK11_DigestOp(ctx,
-                          ss->ssl3.hs.messages.buf,
-                          ss->ssl3.hs.messages.len) != SECSuccess) {
+                          transcript->buf,
+                          transcript->len) != SECSuccess) {
             ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
             goto loser;
         }
@@ -4132,15 +4175,6 @@
         return SECFailure; /* Error code set below */
     }
 
-    /* If we sent ESNI, check the nonce. */
-    if (ss->xtnData.esniPrivateKey) {
-        PORT_Assert(ssl3_ExtensionAdvertised(ss, ssl_tls13_encrypted_sni_xtn));
-        rv = tls13_ClientCheckEsniXtn(ss);
-        if (rv != SECSuccess) {
-            return SECFailure;
-        }
-    }
-
     /* Handle the rest of the extensions. */
     rv = ssl3_HandleParsedExtensions(ss, ssl_hs_encrypted_extensions);
     if (rv != SECSuccess) {
@@ -4469,29 +4503,66 @@
     return SECFailure;
 }
 
+/* Compute the PSK binder hash over:
+ * Client HRR prefix, if present in ss->ssl3.hs.messages or ss->ssl3.hs.echInnerMessages,
+ * |len| bytes of |buf| */
 static SECStatus
-tls13_ComputePskBinderHash(sslSocket *ss, unsigned int prefixLength,
+tls13_ComputePskBinderHash(sslSocket *ss, PRUint8 *b, size_t length,
                            SSL3Hashes *hashes, SSLHashType hashType)
 {
     SECStatus rv;
-
+    PK11Context *ctx = NULL;
+    sslBuffer *clientResidual = NULL;
+    if (!ss->sec.isServer) {
+        /* On the server, HRR residual is already buffered. */
+        clientResidual = ss->ssl3.hs.echHpkeCtx ? &ss->ssl3.hs.echInnerMessages : &ss->ssl3.hs.messages;
+    }
     PORT_Assert(ss->ssl3.hs.hashType == handshake_hash_unknown);
     PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));
-    PORT_Assert(prefixLength <= ss->ssl3.hs.messages.len);
 
-    PRINT_BUF(10, (NULL, "Handshake hash computed over ClientHello prefix",
-                   ss->ssl3.hs.messages.buf, prefixLength));
-    rv = PK11_HashBuf(ssl3_HashTypeToOID(hashType),
-                      hashes->u.raw, ss->ssl3.hs.messages.buf, prefixLength);
+    PRINT_BUF(10, (NULL, "Binder computed over ClientHello",
+                   b, length));
+
+    ctx = PK11_CreateDigestContext(ssl3_HashTypeToOID(hashType));
+    if (!ctx) {
+        goto loser;
+    }
+    rv = PK11_DigestBegin(ctx);
     if (rv != SECSuccess) {
         ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
-        return SECFailure;
+        goto loser;
     }
 
-    hashes->len = tls13_GetHashSizeForHash(hashType);
-    PRINT_BUF(10, (NULL, "PSK Binder hash", hashes->u.raw, hashes->len));
+    if (clientResidual && clientResidual->len) {
+        PRINT_BUF(10, (NULL, " with HRR prefix", clientResidual->buf,
+                       clientResidual->len));
+        rv = PK11_DigestOp(ctx, clientResidual->buf, clientResidual->len);
+        if (rv != SECSuccess) {
+            ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
+            goto loser;
+        }
+    }
 
+    rv = PK11_DigestOp(ctx, b, length);
+    if (rv != SECSuccess) {
+        ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
+        goto loser;
+    }
+    rv = PK11_DigestFinal(ctx, hashes->u.raw, &hashes->len, sizeof(hashes->u.raw));
+    if (rv != SECSuccess) {
+        ssl_MapLowLevelError(SSL_ERROR_SHA_DIGEST_FAILURE);
+        goto loser;
+    }
+
+    PK11_DestroyContext(ctx, PR_TRUE);
+    PRINT_BUF(10, (NULL, "PSK Binder hash", hashes->u.raw, hashes->len));
     return SECSuccess;
+
+loser:
+    if (ctx) {
+        PK11_DestroyContext(ctx, PR_TRUE);
+    }
+    return SECFailure;
 }
 
 /* Compute and inject the PSK Binder for sending.
@@ -4502,7 +4573,7 @@
  * the saved message (in ss->ssl3.hs.messages).  This is written over the dummy
  * binder, after which we write the remainder of the binder extension. */
 SECStatus
-tls13_WriteExtensionsWithBinder(sslSocket *ss, sslBuffer *extensions)
+tls13_WriteExtensionsWithBinder(sslSocket *ss, sslBuffer *extensions, sslBuffer *chBuf)
 {
     SSL3Hashes hashes;
     SECStatus rv;
@@ -4515,7 +4586,7 @@
 
     PORT_Assert(extensions->len >= size + 3);
 
-    rv = ssl3_AppendHandshakeNumber(ss, extensions->len, 2);
+    rv = sslBuffer_AppendNumber(chBuf, extensions->len, 2);
     if (rv != SECSuccess) {
         return SECFailure;
     }
@@ -4524,14 +4595,13 @@
      * the pre_shared_key extension is at the end of the buffer.  Don't write
      * the binder, or the lengths that precede it (a 2 octet length for the list
      * of all binders, plus a 1 octet length for the binder length). */
-    rv = ssl3_AppendHandshake(ss, extensions->buf, prefixLen);
+    rv = sslBuffer_Append(chBuf, extensions->buf, prefixLen);
     if (rv != SECSuccess) {
         return SECFailure;
     }
 
     /* Calculate the binder based on what has been written out. */
-    rv = tls13_ComputePskBinderHash(ss, ss->ssl3.hs.messages.len,
-                                    &hashes, psk->hash);
+    rv = tls13_ComputePskBinderHash(ss, chBuf->buf, chBuf->len, &hashes, psk->hash);
     if (rv != SECSuccess) {
         return SECFailure;
     }
@@ -4550,8 +4620,8 @@
     PORT_Assert(finishedLen == size);
 
     /* Write out the remainder of the extension. */
-    rv = ssl3_AppendHandshake(ss, extensions->buf + prefixLen,
-                              extensions->len - prefixLen);
+    rv = sslBuffer_Append(chBuf, extensions->buf + prefixLen,
+                          extensions->len - prefixLen);
     if (rv != SECSuccess) {
         return SECFailure;
     }
@@ -4873,6 +4943,8 @@
 static SECStatus
 tls13_FinishHandshake(sslSocket *ss)
 {
+    /* If |!echHpkeCtx|, any advertised ECH was GREASE ECH. */
+    PRBool offeredEch = !ss->sec.isServer && ss->ssl3.hs.echHpkeCtx;
     PORT_Assert(ss->opt.noLocks || ssl_HaveRecvBufLock(ss));
     PORT_Assert(ss->opt.noLocks || ssl_HaveSSL3HandshakeLock(ss));
     PORT_Assert(ss->ssl3.hs.restartTarget == NULL);
@@ -4888,6 +4960,21 @@
 
     TLS13_SET_HS_STATE(ss, idle_handshake);
 
+    if (offeredEch &&
+        !ssl3_ExtensionNegotiated(ss, ssl_tls13_encrypted_client_hello_xtn)) {
+        SSL3_SendAlert(ss, alert_fatal, ech_required);
+
+        /* "If [one, none] of the values contains a supported version, the client can
+         * regard ECH as securely [replaced, disabled] by the server." */
+        if (ss->xtnData.echRetryConfigs.len) {
+            PORT_SetError(SSL_ERROR_ECH_RETRY_WITH_ECH);
+            ss->xtnData.echRetryConfigsValid = PR_TRUE;
+        } else {
+            PORT_SetError(SSL_ERROR_ECH_RETRY_WITHOUT_ECH);
+        }
+        return SECFailure;
+    }
+
     ssl_FinishHandshake(ss);
 
     return SECSuccess;
@@ -5398,6 +5485,7 @@
     return SECSuccess;
 }
 
+#define _M_NONE 0
 #define _M(a) (1 << PR_MIN(a, 31))
 #define _M1(a) (_M(ssl_hs_##a))
 #define _M2(a, b) (_M1(a) | _M1(b))
@@ -5431,7 +5519,8 @@
     { ssl_tls13_supported_versions_xtn, _M3(client_hello, server_hello,
                                             hello_retry_request) },
     { ssl_record_size_limit_xtn, _M2(client_hello, encrypted_extensions) },
-    { ssl_tls13_encrypted_sni_xtn, _M2(client_hello, encrypted_extensions) },
+    { ssl_tls13_encrypted_client_hello_xtn, _M2(client_hello, encrypted_extensions) },
+    { ssl_tls13_outer_extensions_xtn, _M_NONE /* Encoding/decoding only */ },
     { ssl_tls13_post_handshake_auth_xtn, _M1(client_hello) }
 };
 
@@ -6127,10 +6216,9 @@
         return SECFailure;
     }
     for (version = ss->vrange.max; version >= ss->vrange.min; --version) {
-        if (ss->ssl3.hs.helloRetry && version < SSL_LIBRARY_VERSION_TLS_1_3) {
-            /* Prevent negotiating to a lower version in response to a TLS 1.3 HRR.
-             * Since we check in descending (local) order, this will only fail if
-             * our vrange has changed or the client didn't offer 1.3 in response. */
+        if (version < SSL_LIBRARY_VERSION_TLS_1_3 &&
+            (ss->ssl3.hs.helloRetry || ss->ssl3.hs.echAccepted)) {
+            /* Prevent negotiating to a lower version after 1.3 HRR or ECH */
             PORT_SetError(SSL_ERROR_UNSUPPORTED_VERSION);
             FATAL_ERROR(ss, SSL_ERROR_UNSUPPORTED_VERSION, protocol_version);
             return SECFailure;
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13con.h firefox-85.0+build1/security/nss/lib/ssl/tls13con.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13con.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13con.h	2021-01-18 19:58:19.000000000 +0000
@@ -19,6 +19,7 @@
 } tls13ExtensionStatus;
 
 #define TLS13_MAX_FINISHED_SIZE 64
+#define TLS13_COOKIE_SENTINEL 0xff
 
 SECStatus tls13_UnprotectRecord(
     sslSocket *ss, ssl3CipherSpec *spec,
@@ -68,7 +69,8 @@
 PRBool tls13_AllowPskCipher(const sslSocket *ss,
                             const ssl3CipherSuiteDef *cipher_def);
 PRBool tls13_PskSuiteEnabled(sslSocket *ss);
-SECStatus tls13_WriteExtensionsWithBinder(sslSocket *ss, sslBuffer *extensions);
+SECStatus tls13_WriteExtensionsWithBinder(sslSocket *ss, sslBuffer *extensions,
+                                          sslBuffer *chBuf);
 SECStatus tls13_HandleClientHelloPart2(sslSocket *ss,
                                        const SECItem *suites,
                                        sslSessionID *sid,
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13ech.c firefox-85.0+build1/security/nss/lib/ssl/tls13ech.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13ech.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13ech.c	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2202 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nss.h"
+#include "pk11func.h"
+#include "pk11hpke.h"
+#include "ssl.h"
+#include "sslproto.h"
+#include "sslimpl.h"
+#include "selfencrypt.h"
+#include "ssl3exthandle.h"
+#include "tls13ech.h"
+#include "tls13exthandle.h"
+#include "tls13hkdf.h"
+
+extern SECStatus
+ssl3_UpdateExplicitHandshakeTranscript(sslSocket *ss, const unsigned char *b,
+                                       unsigned int l, sslBuffer *transcriptBuf);
+extern SECStatus
+ssl3_HandleClientHelloPreamble(sslSocket *ss, PRUint8 **b, PRUint32 *length, SECItem *sidBytes,
+                               SECItem *cookieBytes, SECItem *suites, SECItem *comps);
+
+void
+tls13_DestroyEchConfig(sslEchConfig *config)
+{
+    if (!config) {
+        return;
+    }
+    SECITEM_FreeItem(&config->contents.publicKey, PR_FALSE);
+    SECITEM_FreeItem(&config->contents.suites, PR_FALSE);
+    SECITEM_FreeItem(&config->raw, PR_FALSE);
+    PORT_Free(config->contents.publicName);
+    config->contents.publicName = NULL;
+    PORT_ZFree(config, sizeof(*config));
+}
+
+void
+tls13_DestroyEchConfigs(PRCList *list)
+{
+    PRCList *cur_p;
+    while (!PR_CLIST_IS_EMPTY(list)) {
+        cur_p = PR_LIST_TAIL(list);
+        PR_REMOVE_LINK(cur_p);
+        tls13_DestroyEchConfig((sslEchConfig *)cur_p);
+    }
+}
+
+SECStatus
+tls13_CopyEchConfigs(PRCList *oConfigs, PRCList *configs)
+{
+    SECStatus rv;
+    sslEchConfig *config;
+    sslEchConfig *newConfig = NULL;
+
+    for (PRCList *cur_p = PR_LIST_HEAD(oConfigs);
+         cur_p != oConfigs;
+         cur_p = PR_NEXT_LINK(cur_p)) {
+        config = (sslEchConfig *)PR_LIST_TAIL(oConfigs);
+        newConfig = PORT_ZNew(sslEchConfig);
+        if (!newConfig) {
+            goto loser;
+        }
+
+        rv = SECITEM_CopyItem(NULL, &newConfig->raw, &config->raw);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        newConfig->contents.publicName = PORT_Strdup(config->contents.publicName);
+        if (!newConfig->contents.publicName) {
+            goto loser;
+        }
+        rv = SECITEM_CopyItem(NULL, &newConfig->contents.publicKey,
+                              &config->contents.publicKey);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        rv = SECITEM_CopyItem(NULL, &newConfig->contents.suites,
+                              &config->contents.suites);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        newConfig->contents.kemId = config->contents.kemId;
+        newConfig->contents.kdfId = config->contents.kdfId;
+        newConfig->contents.aeadId = config->contents.aeadId;
+        newConfig->contents.maxNameLen = config->contents.maxNameLen;
+        PORT_Memcpy(newConfig->configId, config->configId, sizeof(newConfig->configId));
+        PR_APPEND_LINK(&newConfig->link, configs);
+    }
+    return SECSuccess;
+
+loser:
+    tls13_DestroyEchConfig(newConfig);
+    tls13_DestroyEchConfigs(configs);
+    return SECFailure;
+}
+
+static SECStatus
+tls13_DigestEchConfig(const sslEchConfig *cfg, PRUint8 *digest, size_t maxDigestLen)
+{
+    SECStatus rv;
+    PK11SymKey *configKey = NULL;
+    PK11SymKey *derived = NULL;
+    SECItem *derivedItem = NULL;
+    CK_HKDF_PARAMS params = { 0 };
+    SECItem paramsi = { siBuffer, (unsigned char *)&params, sizeof(params) };
+    PK11SlotInfo *slot = PK11_GetInternalSlot();
+
+    if (!slot) {
+        goto loser;
+    }
+
+    configKey = PK11_ImportDataKey(slot, CKM_HKDF_DATA, PK11_OriginUnwrap,
+                                   CKA_DERIVE, CONST_CAST(SECItem, &cfg->raw), NULL);
+    if (!configKey) {
+        goto loser;
+    }
+
+    /* We only support SHA256 KDF. */
+    PORT_Assert(cfg->contents.kdfId == HpkeKdfHkdfSha256);
+    params.bExtract = CK_TRUE;
+    params.bExpand = CK_TRUE;
+    params.prfHashMechanism = CKM_SHA256;
+    params.ulSaltType = CKF_HKDF_SALT_NULL;
+    params.pInfo = CONST_CAST(CK_BYTE, hHkdfInfoEchConfigID);
+    params.ulInfoLen = strlen(hHkdfInfoEchConfigID);
+    derived = PK11_DeriveWithFlags(configKey, CKM_HKDF_DATA,
+                                   &paramsi, CKM_HKDF_DERIVE, CKA_DERIVE, 32,
+                                   CKF_SIGN | CKF_VERIFY);
+
+    rv = PK11_ExtractKeyValue(derived);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    derivedItem = PK11_GetKeyData(derived);
+    if (!derivedItem) {
+        goto loser;
+    }
+
+    if (derivedItem->len != maxDigestLen) {
+        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+        goto loser;
+    }
+
+    PORT_Memcpy(digest, derivedItem->data, derivedItem->len);
+    PK11_FreeSymKey(configKey);
+    PK11_FreeSymKey(derived);
+    PK11_FreeSlot(slot);
+    return SECSuccess;
+
+loser:
+    PK11_FreeSymKey(configKey);
+    PK11_FreeSymKey(derived);
+    if (slot) {
+        PK11_FreeSlot(slot);
+    }
+    return SECFailure;
+}
+
+static SECStatus
+tls13_DecodeEchConfigContents(const sslReadBuffer *rawConfig,
+                              sslEchConfig **outConfig)
+{
+    SECStatus rv;
+    sslEchConfigContents contents = { 0 };
+    sslEchConfig *decodedConfig;
+    PRUint64 tmpn;
+    PRUint64 tmpn2;
+    sslReadBuffer tmpBuf;
+    PRUint16 *extensionTypes = NULL;
+    unsigned int extensionIndex = 0;
+    sslReader configReader = SSL_READER(rawConfig->buf, rawConfig->len);
+    sslReader suiteReader;
+    sslReader extensionReader;
+    PRBool hasValidSuite = PR_FALSE;
+
+    /* Parse the public_name. */
+    rv = sslRead_ReadVariable(&configReader, 2, &tmpBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    /* Make sure the public name doesn't contain any NULLs.
+     * TODO: Just store the SECItem instead. */
+    for (tmpn = 0; tmpn < tmpBuf.len; tmpn++) {
+        if (tmpBuf.buf[tmpn] == '\0') {
+            PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+            goto loser;
+        }
+    }
+
+    contents.publicName = PORT_ZAlloc(tmpBuf.len + 1);
+    if (!contents.publicName) {
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+        goto loser;
+    }
+    PORT_Memcpy(contents.publicName, (PRUint8 *)tmpBuf.buf, tmpBuf.len);
+
+    /* Public key. */
+    rv = sslRead_ReadVariable(&configReader, 2, &tmpBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = SECITEM_MakeItem(NULL, &contents.publicKey, (PRUint8 *)tmpBuf.buf, tmpBuf.len);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslRead_ReadNumber(&configReader, 2, &tmpn);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    contents.kemId = tmpn;
+
+    /* Parse HPKE cipher suites. */
+    rv = sslRead_ReadVariable(&configReader, 2, &tmpBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    if (tmpBuf.len & 1) {
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+        goto loser;
+    }
+    suiteReader = (sslReader)SSL_READER(tmpBuf.buf, tmpBuf.len);
+    while (SSL_READER_REMAINING(&suiteReader)) {
+        /* kdf_id */
+        rv = sslRead_ReadNumber(&suiteReader, 2, &tmpn);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        /* aead_id */
+        rv = sslRead_ReadNumber(&suiteReader, 2, &tmpn2);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        if (!hasValidSuite) {
+            /* Use the first compatible ciphersuite. */
+            rv = PK11_HPKE_ValidateParameters(contents.kemId, tmpn, tmpn2);
+            if (rv == SECSuccess) {
+                hasValidSuite = PR_TRUE;
+                contents.kdfId = tmpn;
+                contents.aeadId = tmpn2;
+                break;
+            }
+        }
+    }
+
+    rv = SECITEM_MakeItem(NULL, &contents.suites, (PRUint8 *)tmpBuf.buf, tmpBuf.len);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Read the max name length. */
+    rv = sslRead_ReadNumber(&configReader, 2, &tmpn);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    contents.maxNameLen = (PRUint16)tmpn;
+
+    /* Extensions. We don't support any, but must
+     * check for any that are marked critical. */
+    rv = sslRead_ReadVariable(&configReader, 2, &tmpBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    extensionReader = (sslReader)SSL_READER(tmpBuf.buf, tmpBuf.len);
+    extensionTypes = PORT_NewArray(PRUint16, tmpBuf.len / 2 * sizeof(PRUint16));
+    if (!extensionTypes) {
+        goto loser;
+    }
+
+    while (SSL_READER_REMAINING(&extensionReader)) {
+        /* Get the extension's type field */
+        rv = sslRead_ReadNumber(&extensionReader, 2, &tmpn);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        for (unsigned int i = 0; i < extensionIndex; i++) {
+            if (extensionTypes[i] == tmpn) {
+                PORT_SetError(SEC_ERROR_EXTENSION_VALUE_INVALID);
+                goto loser;
+            }
+        }
+        extensionTypes[extensionIndex++] = (PRUint16)tmpn;
+
+        /* If it's mandatory, fail. */
+        if (tmpn & (1 << 15)) {
+            PORT_SetError(SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION);
+            goto loser;
+        }
+
+        /* Skip. */
+        rv = sslRead_ReadVariable(&extensionReader, 2, &tmpBuf);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+    }
+
+    /* Check that we consumed the entire ECHConfig */
+    if (SSL_READER_REMAINING(&configReader)) {
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
+        goto loser;
+    }
+
+    /* If the ciphersuites weren't compatible, don't
+     * set the outparam. Return success to indicate
+     * the config was well-formed. */
+    if (hasValidSuite) {
+        decodedConfig = PORT_ZNew(sslEchConfig);
+        if (!decodedConfig) {
+            goto loser;
+        }
+        decodedConfig->contents = contents;
+        *outConfig = decodedConfig;
+    } else {
+        PORT_Free(contents.publicName);
+        SECITEM_FreeItem(&contents.publicKey, PR_FALSE);
+        SECITEM_FreeItem(&contents.suites, PR_FALSE);
+    }
+    PORT_Free(extensionTypes);
+    return SECSuccess;
+
+loser:
+    PORT_Free(extensionTypes);
+    PORT_Free(contents.publicName);
+    SECITEM_FreeItem(&contents.publicKey, PR_FALSE);
+    SECITEM_FreeItem(&contents.suites, PR_FALSE);
+    return SECFailure;
+}
+
+/* Decode an ECHConfigs struct and store each ECHConfig
+ * into |configs|.  */
+SECStatus
+tls13_DecodeEchConfigs(const SECItem *data, PRCList *configs)
+{
+    SECStatus rv;
+    sslEchConfig *decodedConfig = NULL;
+    sslReader rdr = SSL_READER(data->data, data->len);
+    sslReadBuffer tmp;
+    sslReadBuffer singleConfig;
+    PRUint64 version;
+    PRUint64 length;
+    PORT_Assert(PR_CLIST_IS_EMPTY(configs));
+
+    rv = sslRead_ReadVariable(&rdr, 2, &tmp);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    if (SSL_READER_REMAINING(&rdr)) {
+        PORT_SetError(SEC_ERROR_BAD_DATA);
+        return SECFailure;
+    }
+
+    sslReader configsReader = SSL_READER(tmp.buf, tmp.len);
+
+    if (!SSL_READER_REMAINING(&configsReader)) {
+        PORT_SetError(SEC_ERROR_BAD_DATA);
+        return SECFailure;
+    }
+
+    /* Handle each ECHConfig. */
+    while (SSL_READER_REMAINING(&configsReader)) {
+        singleConfig.buf = SSL_READER_CURRENT(&configsReader);
+        /* Version */
+        rv = sslRead_ReadNumber(&configsReader, 2, &version);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        /* Length */
+        rv = sslRead_ReadNumber(&configsReader, 2, &length);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        singleConfig.len = 4 + length;
+
+        rv = sslRead_Read(&configsReader, length, &tmp);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        if (version == TLS13_ECH_VERSION) {
+            rv = tls13_DecodeEchConfigContents(&tmp, &decodedConfig);
+            if (rv != SECSuccess) {
+                goto loser; /* code set */
+            }
+
+            if (decodedConfig) {
+                decodedConfig->version = version;
+                rv = SECITEM_MakeItem(NULL, &decodedConfig->raw, singleConfig.buf,
+                                      singleConfig.len);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+
+                rv = tls13_DigestEchConfig(decodedConfig, decodedConfig->configId,
+                                           sizeof(decodedConfig->configId));
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                PR_APPEND_LINK(&decodedConfig->link, configs);
+                decodedConfig = NULL;
+            }
+        }
+    }
+    return SECSuccess;
+
+loser:
+    tls13_DestroyEchConfigs(configs);
+    return SECFailure;
+}
+
+/* Encode an ECHConfigs structure. We only allow one config, and as the
+ * primary use for this function is to generate test inputs, we don't
+ * validate against what HPKE and libssl can actually support. */
+SECStatus
+SSLExp_EncodeEchConfig(const char *publicName, const PRUint32 *hpkeSuites,
+                       unsigned int hpkeSuiteCount, HpkeKemId kemId,
+                       const SECKEYPublicKey *pubKey, PRUint16 maxNameLen,
+                       PRUint8 *out, unsigned int *outlen, unsigned int maxlen)
+{
+    SECStatus rv;
+    unsigned int savedOffset;
+    unsigned int len;
+    sslBuffer b = SSL_BUFFER_EMPTY;
+    PRUint8 tmpBuf[66]; // Large enough for an EC public key, currently only X25519.
+    unsigned int tmpLen;
+
+    if (!publicName || PORT_Strlen(publicName) == 0 || !hpkeSuites ||
+        hpkeSuiteCount == 0 || !pubKey || maxNameLen == 0 || !out || !outlen) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    rv = sslBuffer_Skip(&b, 2, NULL);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendNumber(&b, TLS13_ECH_VERSION, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_Skip(&b, 2, &savedOffset);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    len = PORT_Strlen(publicName);
+    rv = sslBuffer_AppendVariable(&b, (const PRUint8 *)publicName, len, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = PK11_HPKE_Serialize(pubKey, tmpBuf, &tmpLen, sizeof(tmpBuf));
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(&b, tmpBuf, tmpLen, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendNumber(&b, kemId, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendNumber(&b, hpkeSuiteCount * 4, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    for (unsigned int i = 0; i < hpkeSuiteCount; i++) {
+        rv = sslBuffer_AppendNumber(&b, hpkeSuites[i], 4);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+    }
+
+    rv = sslBuffer_AppendNumber(&b, maxNameLen, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* extensions */
+    rv = sslBuffer_AppendNumber(&b, 0, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Write the length now that we know it. */
+    rv = sslBuffer_InsertLength(&b, 0, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_InsertLength(&b, savedOffset, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (SSL_BUFFER_LEN(&b) > maxlen) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        goto loser;
+    }
+    PORT_Memcpy(out, SSL_BUFFER_BASE(&b), SSL_BUFFER_LEN(&b));
+    *outlen = SSL_BUFFER_LEN(&b);
+    sslBuffer_Clear(&b);
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(&b);
+    return SECFailure;
+}
+
+SECStatus
+SSLExp_GetEchRetryConfigs(PRFileDesc *fd, SECItem *retryConfigs)
+{
+    SECStatus rv;
+    sslSocket *ss;
+    SECItem out = { siBuffer, NULL, 0 };
+
+    if (!fd || !retryConfigs) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+    ss = ssl_FindSocket(fd);
+    if (!ss) {
+        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
+                 SSL_GETPID(), fd, __FUNCTION__));
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+    if (!ss->xtnData.echRetryConfigsValid) {
+        PORT_SetError(SSL_ERROR_HANDSHAKE_NOT_COMPLETED);
+        return SECFailure;
+    }
+    /* May be empty. */
+    rv = SECITEM_CopyItem(NULL, &out, &ss->xtnData.echRetryConfigs);
+    if (rv == SECFailure) {
+        return SECFailure;
+    }
+    *retryConfigs = out;
+    return SECSuccess;
+}
+
+SECStatus
+SSLExp_RemoveEchConfigs(PRFileDesc *fd)
+{
+    sslSocket *ss;
+
+    if (!fd) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    ss = ssl_FindSocket(fd);
+    if (!ss) {
+        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
+                 SSL_GETPID(), fd, __FUNCTION__));
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    if (!PR_CLIST_IS_EMPTY(&ss->echConfigs)) {
+        tls13_DestroyEchConfigs(&ss->echConfigs);
+    }
+
+    /* Also remove any retry_configs and handshake context. */
+    if (ss->xtnData.echRetryConfigs.len) {
+        SECITEM_FreeItem(&ss->xtnData.echRetryConfigs, PR_FALSE);
+    }
+
+    if (ss->ssl3.hs.echHpkeCtx) {
+        PK11_HPKE_DestroyContext(ss->ssl3.hs.echHpkeCtx, PR_TRUE);
+        ss->ssl3.hs.echHpkeCtx = NULL;
+    }
+    PORT_Free(CONST_CAST(char, ss->ssl3.hs.echPublicName));
+    ss->ssl3.hs.echPublicName = NULL;
+
+    return SECSuccess;
+}
+
+/* Import one or more ECHConfigs for the given keypair. The AEAD/KDF
+ * may differ , but only X25519 is supported for the KEM.*/
+SECStatus
+SSLExp_SetServerEchConfigs(PRFileDesc *fd,
+                           const SECKEYPublicKey *pubKey, const SECKEYPrivateKey *privKey,
+                           const PRUint8 *echConfigs, unsigned int echConfigsLen)
+{
+#ifndef NSS_ENABLE_DRAFT_HPKE
+    PORT_SetError(SSL_ERROR_FEATURE_DISABLED);
+    return SECFailure;
+#else
+    sslSocket *ss;
+    SECStatus rv;
+    SECItem data = { siBuffer, CONST_CAST(PRUint8, echConfigs), echConfigsLen };
+
+    if (!fd || !pubKey || !privKey || !echConfigs || echConfigsLen == 0) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    ss = ssl_FindSocket(fd);
+    if (!ss) {
+        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
+                 SSL_GETPID(), fd, __FUNCTION__));
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    /* Overwrite if we're already configured. */
+    rv = SSLExp_RemoveEchConfigs(fd);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    rv = tls13_DecodeEchConfigs(&data, &ss->echConfigs);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    if (PR_CLIST_IS_EMPTY(&ss->echConfigs)) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        goto loser;
+    }
+
+    ss->echPubKey = SECKEY_CopyPublicKey(pubKey);
+    if (!ss->echPubKey) {
+        goto loser;
+    }
+    ss->echPrivKey = SECKEY_CopyPrivateKey(privKey);
+    if (!ss->echPrivKey) {
+        goto loser;
+    }
+    return SECSuccess;
+
+loser:
+    tls13_DestroyEchConfigs(&ss->echConfigs);
+    SECKEY_DestroyPrivateKey(ss->echPrivKey);
+    SECKEY_DestroyPublicKey(ss->echPubKey);
+    ss->echPubKey = NULL;
+    ss->echPrivKey = NULL;
+    return SECFailure;
+#endif
+}
+
+/* Client enable. For now, we'll use the first
+ * compatible config (server preference). */
+SECStatus
+SSLExp_SetClientEchConfigs(PRFileDesc *fd,
+                           const PRUint8 *echConfigs,
+                           unsigned int echConfigsLen)
+{
+#ifndef NSS_ENABLE_DRAFT_HPKE
+    PORT_SetError(SSL_ERROR_FEATURE_DISABLED);
+    return SECFailure;
+#else
+    SECStatus rv;
+    sslSocket *ss;
+    SECItem data = { siBuffer, CONST_CAST(PRUint8, echConfigs), echConfigsLen };
+
+    if (!fd || !echConfigs || echConfigsLen == 0) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    ss = ssl_FindSocket(fd);
+    if (!ss) {
+        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
+                 SSL_GETPID(), fd, __FUNCTION__));
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    /* Overwrite if we're already configured. */
+    rv = SSLExp_RemoveEchConfigs(fd);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    rv = tls13_DecodeEchConfigs(&data, &ss->echConfigs);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+    if (PR_CLIST_IS_EMPTY(&ss->echConfigs)) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    return SECSuccess;
+#endif
+}
+
+/* Set up ECH. This generates an ephemeral sender
+ * keypair and the HPKE context */
+SECStatus
+tls13_ClientSetupEch(sslSocket *ss, sslClientHelloType type)
+{
+    SECStatus rv;
+    HpkeContext *cx = NULL;
+    SECKEYPublicKey *pkR = NULL;
+    SECItem hpkeInfo = { siBuffer, NULL, 0 };
+    PK11SymKey *hrrPsk = NULL;
+    sslEchConfig *cfg = NULL;
+    const SECItem kEchHrrInfoItem = { siBuffer,
+                                      (unsigned char *)kHpkeInfoEchHrr,
+                                      strlen(kHpkeInfoEchHrr) };
+    const SECItem kEchHrrPskLabelItem = { siBuffer,
+                                          (unsigned char *)kHpkeLabelHrrPsk,
+                                          strlen(kHpkeLabelHrrPsk) };
+
+    if (PR_CLIST_IS_EMPTY(&ss->echConfigs) ||
+        !ssl_ShouldSendSNIExtension(ss, ss->url) ||
+        IS_DTLS(ss)) {
+        return SECSuccess;
+    }
+
+    /* Maybe apply our own priority if >1. For now, we only support
+     * one version and one KEM. Each ECHConfig can specify multiple
+     * KDF/AEADs, so just use the first. */
+    cfg = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+
+    /* Skip ECH if the public name matches the private name. */
+    if (0 == PORT_Strcmp(cfg->contents.publicName, ss->url)) {
+        return SECSuccess;
+    }
+
+    SSL_TRC(50, ("%d: TLS13[%d]: Setup client ECH",
+                 SSL_GETPID(), ss->fd));
+
+    switch (type) {
+        case client_hello_initial:
+            PORT_Assert(!ss->ssl3.hs.echHpkeCtx && !ss->ssl3.hs.echPublicName);
+            cx = PK11_HPKE_NewContext(cfg->contents.kemId, cfg->contents.kdfId,
+                                      cfg->contents.aeadId, NULL, NULL);
+            break;
+        case client_hello_retry:
+            PORT_Assert(ss->ssl3.hs.echHpkeCtx && ss->ssl3.hs.echPublicName);
+            rv = PK11_HPKE_ExportSecret(ss->ssl3.hs.echHpkeCtx,
+                                        &kEchHrrInfoItem, 32, &hrrPsk);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+
+            PK11_HPKE_DestroyContext(ss->ssl3.hs.echHpkeCtx, PR_TRUE);
+            PORT_Free((void *)ss->ssl3.hs.echPublicName); /* CONST */
+            ss->ssl3.hs.echHpkeCtx = NULL;
+            ss->ssl3.hs.echPublicName = NULL;
+            cx = PK11_HPKE_NewContext(cfg->contents.kemId, cfg->contents.kdfId,
+                                      cfg->contents.aeadId, hrrPsk, &kEchHrrPskLabelItem);
+            break;
+        default:
+            PORT_Assert(0);
+            goto loser;
+    }
+    if (!cx) {
+        goto loser;
+    }
+
+    rv = PK11_HPKE_Deserialize(cx, cfg->contents.publicKey.data, cfg->contents.publicKey.len, &pkR);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (!SECITEM_AllocItem(NULL, &hpkeInfo, strlen(kHpkeInfoEch) + 1 + cfg->raw.len)) {
+        goto loser;
+    }
+    PORT_Memcpy(&hpkeInfo.data[0], kHpkeInfoEch, strlen(kHpkeInfoEch));
+    PORT_Memset(&hpkeInfo.data[strlen(kHpkeInfoEch)], 0, 1);
+    PORT_Memcpy(&hpkeInfo.data[strlen(kHpkeInfoEch) + 1], cfg->raw.data, cfg->raw.len);
+
+    /* Setup with an ephemeral sender keypair. */
+    rv = PK11_HPKE_SetupS(cx, NULL, NULL, pkR, &hpkeInfo);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (!ss->ssl3.hs.helloRetry) {
+        rv = ssl3_GetNewRandom(ss->ssl3.hs.client_inner_random);
+        if (rv != SECSuccess) {
+            goto loser; /* code set */
+        }
+    }
+
+    /* If ECH is rejected, the application will use SSLChannelInfo
+     * to fetch this field and perform cert chain verification. */
+    ss->ssl3.hs.echPublicName = PORT_Strdup(cfg->contents.publicName);
+    if (!ss->ssl3.hs.echPublicName) {
+        goto loser;
+    }
+
+    ss->ssl3.hs.echHpkeCtx = cx;
+    PK11_FreeSymKey(hrrPsk);
+    SECKEY_DestroyPublicKey(pkR);
+    SECITEM_FreeItem(&hpkeInfo, PR_FALSE);
+    return SECSuccess;
+
+loser:
+    PK11_HPKE_DestroyContext(cx, PR_TRUE);
+    PK11_FreeSymKey(hrrPsk);
+    SECKEY_DestroyPublicKey(pkR);
+    SECITEM_FreeItem(&hpkeInfo, PR_FALSE);
+    return SECFailure;
+}
+
+/*
+ *  enum {
+ *     encrypted_client_hello(0xfe08), (65535)
+ *  } ExtensionType;
+ *
+ *  struct {
+ *      HpkeKdfId kdf_id;
+ *      HpkeAeadId aead_id;
+ *  } ECHCipherSuite;
+ *  struct {
+ *     ECHCipherSuite cipher_suite;
+ *     opaque config_id<0..255>;
+ *     opaque enc<1..2^16-1>;
+ *     opaque payload<1..2^16-1>;
+ *  } ClientECH;
+ *
+ * Takes as input the constructed ClientHelloInner and
+ * returns a constructed encrypted_client_hello extension
+ * (replacing the contents of |chInner|).
+ */
+static SECStatus
+tls13_EncryptClientHello(sslSocket *ss, sslBuffer *outerAAD, sslBuffer *chInner)
+{
+    SECStatus rv;
+    SECItem chPt = { siBuffer, chInner->buf, chInner->len };
+    SECItem *chCt = NULL;
+    SECItem aadItem = { siBuffer, outerAAD ? outerAAD->buf : NULL, outerAAD ? outerAAD->len : 0 };
+    const SECItem *hpkeEnc = NULL;
+    const sslEchConfig *cfg = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+    PORT_Assert(!PR_CLIST_IS_EMPTY(&ss->echConfigs));
+
+    SSL_TRC(50, ("%d: TLS13[%d]: Encrypting Client Hello Inner",
+                 SSL_GETPID(), ss->fd));
+
+    hpkeEnc = PK11_HPKE_GetEncapPubKey(ss->ssl3.hs.echHpkeCtx);
+    if (!hpkeEnc) {
+        FATAL_ERROR(ss, SEC_ERROR_LIBRARY_FAILURE, internal_error);
+        goto loser;
+    }
+
+#ifndef UNSAFE_FUZZER_MODE
+    rv = PK11_HPKE_Seal(ss->ssl3.hs.echHpkeCtx, &aadItem, &chPt, &chCt);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+#else
+    /* Fake a tag. */
+    SECITEM_AllocItem(NULL, chCt, chPt.len + 16);
+    if (!chCt) {
+        goto loser;
+    }
+    PORT_Memcpy(chCt->data, chPt.data, chPt.len);
+#endif
+
+    /* Format the encrypted_client_hello extension. */
+    sslBuffer_Clear(chInner);
+    rv = sslBuffer_AppendNumber(chInner, cfg->contents.kdfId, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendNumber(chInner, cfg->contents.aeadId, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(chInner, cfg->configId, sizeof(cfg->configId), 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(chInner, hpkeEnc->data, hpkeEnc->len, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(chInner, chCt->data, chCt->len, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    SECITEM_FreeItem(chCt, PR_TRUE);
+    return SECSuccess;
+
+loser:
+    SECITEM_FreeItem(chCt, PR_TRUE);
+    return SECFailure;
+}
+
+SECStatus
+tls13_GetMatchingEchConfig(const sslSocket *ss, HpkeKdfId kdf, HpkeAeadId aead,
+                           const SECItem *configId, sslEchConfig **cfg)
+{
+    sslEchConfig *candidate;
+    PRINT_BUF(50, (ss, "Server GetMatchingEchConfig with digest:",
+                   configId->data, configId->len));
+
+    for (PRCList *cur_p = PR_LIST_HEAD(&ss->echConfigs);
+         cur_p != &ss->echConfigs;
+         cur_p = PR_NEXT_LINK(cur_p)) {
+        sslEchConfig *echConfig = (sslEchConfig *)cur_p;
+        if (configId->len != sizeof(echConfig->configId) ||
+            PORT_Memcmp(echConfig->configId, configId->data, sizeof(echConfig->configId))) {
+            continue;
+        }
+        candidate = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+        if (candidate->contents.aeadId != aead ||
+            candidate->contents.kdfId != kdf) {
+            continue;
+        }
+        *cfg = candidate;
+        return SECSuccess;
+    }
+
+    SSL_TRC(50, ("%d: TLS13[%d]: Server found no matching ECHConfig",
+                 SSL_GETPID(), ss->fd));
+
+    *cfg = NULL;
+    return SECSuccess;
+}
+
+/* This is unfortunate in that it requires a second decryption of the cookie.
+ * This is largely copied from tls13hashstate.c as HRR handling is still in flux.
+ * TODO: Consolidate this code no later than -09. */
+/* struct {
+ *     uint8 indicator = 0xff;            // To disambiguate from tickets.
+ *     uint16 cipherSuite;                // Selected cipher suite.
+ *     uint16 keyShare;                   // Requested key share group (0=none)
+ *     opaque applicationToken<0..65535>; // Application token
+ *     opaque echHrrPsk<0..255>;          // Encrypted ClientHello HRR PSK
+ *     opaque echConfigId<0..255>;        // ECH config ID selected in CH1, to decrypt the CH2 ECH payload.
+ *     opaque ch_hash[rest_of_buffer];    // H(ClientHello)
+ * } CookieInner;
+ */
+SECStatus
+tls13_GetEchInfoFromCookie(sslSocket *ss, const TLSExtension *hrrCookie, PK11SymKey **echHrrPsk, SECItem *echConfigId)
+{
+    SECStatus rv;
+    PK11SymKey *hrrKey = NULL;
+    PRUint64 tmpn;
+    sslReadBuffer tmpReader = { 0 };
+    PK11SlotInfo *slot = NULL;
+    unsigned char plaintext[1024];
+    unsigned int plaintextLen = 0;
+    SECItem hrrPskItem = { siBuffer, NULL, 0 };
+    SECItem hrrCookieData = { siBuffer, NULL, 0 };
+    SECItem saveHrrCookieData = hrrCookieData;
+    SECItem previousEchConfigId = { siBuffer, NULL, 0 };
+
+    /* Copy the extension data so as to not consume it in the handler.
+     * The extension handler walks the pointer, so save a copy to free. */
+    rv = SECITEM_CopyItem(NULL, &hrrCookieData, &hrrCookie->data);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    saveHrrCookieData = hrrCookieData;
+
+    rv = tls13_ServerHandleCookieXtn(ss, &ss->xtnData, &hrrCookieData);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = ssl_SelfEncryptUnprotect(ss, ss->xtnData.cookie.data, ss->xtnData.cookie.len,
+                                  plaintext, &plaintextLen, sizeof(plaintext));
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    sslReader reader = SSL_READER(plaintext, plaintextLen);
+
+    /* Should start with 0xff. */
+    rv = sslRead_ReadNumber(&reader, 1, &tmpn);
+    if ((rv != SECSuccess) || (tmpn != 0xff)) {
+        rv = SECFailure;
+        goto loser;
+    }
+    rv = sslRead_ReadNumber(&reader, 2, &tmpn);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    /* The named group, if any. */
+    rv = sslRead_ReadNumber(&reader, 2, &tmpn);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    /* Application token. */
+    rv = sslRead_ReadNumber(&reader, 2, &tmpn);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslRead_Read(&reader, tmpn, &tmpReader);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* ECH Config ID */
+    rv = sslRead_ReadVariable(&reader, 1, &tmpReader);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = SECITEM_MakeItem(NULL, &previousEchConfigId,
+                          tmpReader.buf, tmpReader.len);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* ECH HRR key. */
+    rv = sslRead_ReadVariable(&reader, 1, &tmpReader);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    if (tmpReader.len) {
+        slot = PK11_GetInternalSlot();
+        if (!slot) {
+            rv = SECFailure;
+            goto loser;
+        }
+        hrrPskItem.len = tmpReader.len;
+        hrrPskItem.data = CONST_CAST(PRUint8, tmpReader.buf);
+        hrrKey = PK11_ImportSymKey(slot, CKM_HKDF_KEY_GEN, PK11_OriginUnwrap,
+                                   CKA_DERIVE, &hrrPskItem, NULL);
+        PK11_FreeSlot(slot);
+        if (!hrrKey) {
+            rv = SECFailure;
+            goto loser;
+        }
+    }
+    *echConfigId = previousEchConfigId;
+    *echHrrPsk = hrrKey;
+    SECITEM_FreeItem(&saveHrrCookieData, PR_FALSE);
+    return SECSuccess;
+
+loser:
+    SECITEM_FreeItem(&previousEchConfigId, PR_FALSE);
+    SECITEM_FreeItem(&saveHrrCookieData, PR_FALSE);
+    return SECFailure;
+}
+
+/* Given a CH with extensions, copy from the start up to the extensions
+ * into |writer| and return the extensions themselves in |extensions|.
+ * If |explicitSid|, place this value into |writer| as the SID. Else,
+ * the sid is copied from |reader| to |writer|. */
+static SECStatus
+tls13_CopyChPreamble(sslReader *reader, const SECItem *explicitSid, sslBuffer *writer, sslReadBuffer *extensions)
+{
+    SECStatus rv;
+    sslReadBuffer tmpReadBuf;
+
+    /* Locate the extensions. */
+    rv = sslRead_Read(reader, 2 + SSL3_RANDOM_LENGTH, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+    rv = sslBuffer_Append(writer, tmpReadBuf.buf, tmpReadBuf.len);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    /* legacy_session_id */
+    rv = sslRead_ReadVariable(reader, 1, &tmpReadBuf);
+    if (explicitSid) {
+        /* Encoded SID should be empty when copying from CHOuter. */
+        if (tmpReadBuf.len > 0) {
+            PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+            return SECFailure;
+        }
+        rv = sslBuffer_AppendVariable(writer, explicitSid->data, explicitSid->len, 1);
+    } else {
+        rv = sslBuffer_AppendVariable(writer, tmpReadBuf.buf, tmpReadBuf.len, 1);
+    }
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    /* cipher suites */
+    rv = sslRead_ReadVariable(reader, 2, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+    rv = sslBuffer_AppendVariable(writer, tmpReadBuf.buf, tmpReadBuf.len, 2);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    /* compression */
+    rv = sslRead_ReadVariable(reader, 1, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+    rv = sslBuffer_AppendVariable(writer, tmpReadBuf.buf, tmpReadBuf.len, 1);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    /* extensions */
+    rv = sslRead_ReadVariable(reader, 2, extensions);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    if (SSL_READER_REMAINING(reader) != 0) {
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+        return SECFailure;
+    }
+
+    return SECSuccess;
+}
+
+static SECStatus
+tls13_MakeChOuterAAD(const SECItem *outer, sslBuffer *outerAAD)
+{
+    SECStatus rv;
+    sslBuffer aad = SSL_BUFFER_EMPTY;
+    sslReadBuffer aadXtns;
+    sslReader chReader = SSL_READER(outer->data, outer->len);
+    PRUint64 tmpn;
+    sslReadBuffer tmpvar;
+    unsigned int offset;
+    unsigned int preambleLen;
+
+    rv = sslBuffer_Skip(&aad, 4, NULL);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* aad := preamble, aadXtn := extensions */
+    rv = tls13_CopyChPreamble(&chReader, NULL, &aad, &aadXtns);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    sslReader xtnsReader = SSL_READER(aadXtns.buf, aadXtns.len);
+    preambleLen = SSL_BUFFER_LEN(&aad);
+
+    /* Save room for extensions length. */
+    rv = sslBuffer_Skip(&aad, 2, &offset);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Append each extension, minus encrypted_client_hello_xtn. */
+    while (SSL_READER_REMAINING(&xtnsReader)) {
+        rv = sslRead_ReadNumber(&xtnsReader, 2, &tmpn);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        rv = sslRead_ReadVariable(&xtnsReader, 2, &tmpvar);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        if (tmpn != ssl_tls13_encrypted_client_hello_xtn) {
+            rv = sslBuffer_AppendNumber(&aad, tmpn, 2);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+            rv = sslBuffer_AppendVariable(&aad, tmpvar.buf, tmpvar.len, 2);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+        }
+    }
+
+    rv = sslBuffer_InsertNumber(&aad, offset, SSL_BUFFER_LEN(&aad) - preambleLen - 2, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Give it a message header. */
+    rv = sslBuffer_InsertNumber(&aad, 0, ssl_hs_client_hello, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_InsertLength(&aad, 1, 3);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    *outerAAD = aad;
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(&aad);
+    return SECFailure;
+}
+
+SECStatus
+tls13_OpenClientHelloInner(sslSocket *ss, const SECItem *outer, sslEchConfig *cfg, PK11SymKey *echHrrPsk, SECItem **chInner)
+{
+    SECStatus rv;
+    sslBuffer outerAAD = SSL_BUFFER_EMPTY;
+    HpkeContext *cx = NULL;
+    SECItem *decryptedChInner = NULL;
+    SECItem hpkeInfo = { siBuffer, NULL, 0 };
+    SECItem outerAADItem = { siBuffer, NULL, 0 };
+    const SECItem kEchHrrPskLabelItem = { siBuffer,
+                                          (unsigned char *)kHpkeLabelHrrPsk,
+                                          strlen(kHpkeLabelHrrPsk) };
+    SSL_TRC(50, ("%d: TLS13[%d]: Server opening ECH Inner%s", SSL_GETPID(),
+                 ss->fd, ss->ssl3.hs.helloRetry ? " after HRR" : ""));
+
+    cx = PK11_HPKE_NewContext(cfg->contents.kemId, cfg->contents.kdfId,
+                              cfg->contents.aeadId, echHrrPsk,
+                              echHrrPsk ? &kEchHrrPskLabelItem : NULL);
+    if (!cx) {
+        goto loser;
+    }
+
+    if (!SECITEM_AllocItem(NULL, &hpkeInfo, strlen(kHpkeInfoEch) + 1 + cfg->raw.len)) {
+        goto loser;
+    }
+    PORT_Memcpy(&hpkeInfo.data[0], kHpkeInfoEch, strlen(kHpkeInfoEch));
+    PORT_Memset(&hpkeInfo.data[strlen(kHpkeInfoEch)], 0, 1);
+    PORT_Memcpy(&hpkeInfo.data[strlen(kHpkeInfoEch) + 1], cfg->raw.data, cfg->raw.len);
+
+    rv = PK11_HPKE_SetupR(cx, ss->echPubKey, ss->echPrivKey,
+                          &ss->xtnData.echSenderPubKey, &hpkeInfo);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+
+    rv = tls13_MakeChOuterAAD(outer, &outerAAD);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+
+    outerAADItem.data = outerAAD.buf;
+    outerAADItem.len = outerAAD.len;
+
+#ifndef UNSAFE_FUZZER_MODE
+    rv = PK11_HPKE_Open(cx, &outerAADItem, &ss->xtnData.innerCh, &decryptedChInner);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+#else
+    rv = SECITEM_CopyItem(NULL, decryptedChInner, &ss->xtnData.innerCh);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    decryptedChInner->len -= 16; /* Fake tag */
+#endif
+
+    /* Stash the context, we may need it for HRR. */
+    ss->ssl3.hs.echHpkeCtx = cx;
+    *chInner = decryptedChInner;
+    SECITEM_FreeItem(&hpkeInfo, PR_FALSE);
+    sslBuffer_Clear(&outerAAD);
+    return SECSuccess;
+
+loser:
+    SECITEM_FreeItem(decryptedChInner, PR_TRUE);
+    PK11_HPKE_DestroyContext(cx, PR_TRUE);
+    SECITEM_FreeItem(&hpkeInfo, PR_FALSE);
+    sslBuffer_Clear(&outerAAD);
+    return SECFailure;
+}
+
+/* Given a buffer of extensions prepared for CHOuter, translate those extensions to a
+ * buffer suitable for CHInner. This is intended to be called twice: once without
+ * compression for the transcript hash and binders, and once with compression for
+ * encoding the actual CHInner value. On the first run, if |inOutPskXtn| and
+ * chOuterXtnsBuf contains a PSK extension, remove it and return in the outparam.
+ * The caller will compute the binder value based on the uncompressed output. Next,
+ * if |compress|, consolidate duplicated extensions (that would otherwise be copied)
+ * into a single outer_extensions extension. If |inOutPskXtn|, the extension contains
+ * a binder, it is appended after the deduplicated outer_extensions. In the case of
+ * GREASE ECH, one call is made to estimate size (wiith compression, null inOutPskXtn).
+ */
+SECStatus
+tls13_ConstructInnerExtensionsFromOuter(sslSocket *ss, sslBuffer *chOuterXtnsBuf,
+                                        sslBuffer *chInnerXtns, sslBuffer *inOutPskXtn,
+                                        PRBool compress)
+{
+    SECStatus rv;
+    PRUint64 extensionType;
+    sslReadBuffer extensionData;
+    sslBuffer pskXtn = SSL_BUFFER_EMPTY;
+    sslBuffer dupXtns = SSL_BUFFER_EMPTY; /* Dupcliated extensions, types-only if |compress|. */
+    unsigned int tmpOffset;
+    unsigned int tmpLen;
+    unsigned int srcXtnBase; /* To truncate CHOuter and remove the PSK extension. */
+    SSL_TRC(50, ("%d: TLS13[%d]: Constructing ECH inner extensions %s compression",
+                 SSL_GETPID(), compress ? "with" : "without"));
+
+    /* When offering the "encrypted_client_hello" extension in its
+     * ClientHelloOuter, the client MUST also offer an empty
+     * "encrypted_client_hello" extension in its ClientHelloInner. */
+    rv = sslBuffer_AppendNumber(chInnerXtns, ssl_tls13_encrypted_client_hello_xtn, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendNumber(chInnerXtns, 0, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    sslReader rdr = SSL_READER(chOuterXtnsBuf->buf, chOuterXtnsBuf->len);
+    while (SSL_READER_REMAINING(&rdr)) {
+        srcXtnBase = rdr.offset;
+        rv = sslRead_ReadNumber(&rdr, 2, &extensionType);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        /* Get the extension data. */
+        rv = sslRead_ReadVariable(&rdr, 2, &extensionData);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+
+        switch (extensionType) {
+            case ssl_server_name_xtn:
+                /* Write the real (private) SNI value. */
+                rv = sslBuffer_AppendNumber(chInnerXtns, extensionType, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                rv = sslBuffer_Skip(chInnerXtns, 2, &tmpOffset);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                tmpLen = SSL_BUFFER_LEN(chInnerXtns);
+                rv = ssl3_ClientFormatServerNameXtn(ss, ss->url,
+                                                    strlen(ss->url),
+                                                    NULL, chInnerXtns);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                tmpLen = SSL_BUFFER_LEN(chInnerXtns) - tmpLen;
+                rv = sslBuffer_InsertNumber(chInnerXtns, tmpOffset, tmpLen, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                break;
+            case ssl_tls13_supported_versions_xtn:
+                /* Only TLS 1.3 on CHInner. */
+                rv = sslBuffer_AppendNumber(chInnerXtns, extensionType, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                rv = sslBuffer_AppendNumber(chInnerXtns, 3, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                rv = sslBuffer_AppendNumber(chInnerXtns, 2, 1);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                rv = sslBuffer_AppendNumber(chInnerXtns, SSL_LIBRARY_VERSION_TLS_1_3, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                break;
+            case ssl_tls13_pre_shared_key_xtn:
+                /* If GREASEing, the estimated internal length
+                 * will be short. However, the presence of a PSK extension in
+                 * CHOuter is already a distinguisher. */
+                if (inOutPskXtn) {
+                    rv = sslBuffer_AppendNumber(&pskXtn, extensionType, 2);
+                    if (rv != SECSuccess) {
+                        goto loser;
+                    }
+                    rv = sslBuffer_AppendVariable(&pskXtn, extensionData.buf,
+                                                  extensionData.len, 2);
+                    if (rv != SECSuccess) {
+                        goto loser;
+                    }
+                    /* In terms of CHOuter, the PSK extension no longer exists.
+                     * 0 lastXtnOffset means insert padding at the end. */
+                    SSL_BUFFER_LEN(chOuterXtnsBuf) = srcXtnBase;
+                    ss->xtnData.lastXtnOffset = 0;
+                }
+                break;
+            default:
+                PORT_Assert(extensionType != ssl_tls13_encrypted_client_hello_xtn);
+                rv = sslBuffer_AppendNumber(&dupXtns, extensionType, 2);
+                if (rv != SECSuccess) {
+                    goto loser;
+                }
+                if (!compress) {
+                    rv = sslBuffer_AppendVariable(&dupXtns, extensionData.buf,
+                                                  extensionData.len, 2);
+                    if (rv != SECSuccess) {
+                        goto loser;
+                    }
+                }
+                break;
+        }
+    }
+
+    /* Append duplicated extensions, compressing or not. */
+    if (SSL_BUFFER_LEN(&dupXtns) && compress) {
+        rv = sslBuffer_AppendNumber(chInnerXtns, ssl_tls13_outer_extensions_xtn, 2);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        rv = sslBuffer_AppendNumber(chInnerXtns, dupXtns.len + 1, 2);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        rv = sslBuffer_AppendBufferVariable(chInnerXtns, &dupXtns, 1);
+    } else if (SSL_BUFFER_LEN(&dupXtns)) {
+        /* Each duplicated extension has its own length. */
+        rv = sslBuffer_AppendBuffer(chInnerXtns, &dupXtns);
+    }
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* On the compression run, append the completed PSK extension (if
+     * provided). Else an incomplete (no binder) extension; the caller
+     * will compute the binder and call again. */
+    if (compress && inOutPskXtn) {
+        rv = sslBuffer_AppendBuffer(chInnerXtns, inOutPskXtn);
+    } else if (pskXtn.len) {
+        rv = sslBuffer_AppendBuffer(chInnerXtns, &pskXtn);
+        if (inOutPskXtn) {
+            *inOutPskXtn = pskXtn;
+        }
+    }
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    sslBuffer_Clear(&dupXtns);
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(&pskXtn);
+    sslBuffer_Clear(&dupXtns);
+    return SECFailure;
+}
+
+static SECStatus
+tls13_EncodeClientHelloInner(sslSocket *ss, sslBuffer *chInner, sslBuffer *chInnerXtns, sslBuffer *out)
+{
+    PORT_Assert(ss && chInner && chInnerXtns && out);
+    SECStatus rv;
+    sslReadBuffer tmpReadBuf;
+    sslReader chReader = SSL_READER(chInner->buf, chInner->len);
+
+    rv = sslRead_Read(&chReader, 4, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslRead_Read(&chReader, 2 + SSL3_RANDOM_LENGTH, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_Append(out, tmpReadBuf.buf, tmpReadBuf.len);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Skip the legacy_session_id */
+    rv = sslRead_ReadVariable(&chReader, 1, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendNumber(out, 0, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* cipher suites */
+    rv = sslRead_ReadVariable(&chReader, 2, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(out, tmpReadBuf.buf, tmpReadBuf.len, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* compression methods */
+    rv = sslRead_ReadVariable(&chReader, 1, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendVariable(out, tmpReadBuf.buf, tmpReadBuf.len, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Append the extensions. */
+    rv = sslBuffer_AppendBufferVariable(out, chInnerXtns, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(out);
+    return SECFailure;
+}
+
+SECStatus
+tls13_ConstructClientHelloWithEch(sslSocket *ss, const sslSessionID *sid, PRBool freshSid,
+                                  sslBuffer *chOuter, sslBuffer *chOuterXtnsBuf)
+{
+    SECStatus rv;
+    sslBuffer chInner = SSL_BUFFER_EMPTY;
+    sslBuffer encodedChInner = SSL_BUFFER_EMPTY;
+    sslBuffer chInnerXtns = SSL_BUFFER_EMPTY;
+    sslBuffer pskXtn = SSL_BUFFER_EMPTY;
+    sslBuffer outerAAD = SSL_BUFFER_EMPTY;
+    unsigned int encodedChLen;
+    unsigned int preambleLen;
+    SSL_TRC(50, ("%d: TLS13[%d]: Constructing ECH inner", SSL_GETPID()));
+
+    /* Create the full (uncompressed) inner extensions and steal any PSK extension.
+     * NB: Neither chOuterXtnsBuf nor chInnerXtns are length-prefixed. */
+    rv = tls13_ConstructInnerExtensionsFromOuter(ss, chOuterXtnsBuf, &chInnerXtns,
+                                                 &pskXtn, PR_FALSE);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+
+    rv = ssl3_CreateClientHelloPreamble(ss, sid, PR_FALSE, SSL_LIBRARY_VERSION_TLS_1_3,
+                                        PR_TRUE, &chInnerXtns, &chInner);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+    preambleLen = SSL_BUFFER_LEN(&chInner);
+
+    /* Write handshake header length. tls13_EncryptClientHello will
+     * remove this upon encoding, but the transcript needs it. This assumes
+     * the 4B stream-variant header. */
+    PORT_Assert(!IS_DTLS(ss));
+    rv = sslBuffer_InsertNumber(&chInner, 1,
+                                chInner.len + 2 + chInnerXtns.len - 4, 3);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    if (pskXtn.len) {
+        PORT_Assert(ssl3_ExtensionAdvertised(ss, ssl_tls13_pre_shared_key_xtn));
+        PORT_Assert(ss->xtnData.lastXtnOffset == 0); /* stolen from outer */
+        rv = tls13_WriteExtensionsWithBinder(ss, &chInnerXtns, &chInner);
+        /* Update the stolen PSK extension with the binder value. */
+        PORT_Memcpy(pskXtn.buf, &chInnerXtns.buf[chInnerXtns.len - pskXtn.len], pskXtn.len);
+    } else {
+        rv = sslBuffer_AppendBufferVariable(&chInner, &chInnerXtns, 2);
+    }
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = ssl3_UpdateExplicitHandshakeTranscript(ss, chInner.buf, chInner.len,
+                                                &ss->ssl3.hs.echInnerMessages);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+
+    /* Un-append the extensions, then append compressed via Encoded. */
+    SSL_BUFFER_LEN(&chInner) = preambleLen;
+    sslBuffer_Clear(&chInnerXtns);
+    rv = tls13_ConstructInnerExtensionsFromOuter(ss, chOuterXtnsBuf,
+                                                 &chInnerXtns, &pskXtn, PR_TRUE);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* TODO: Pad CHInner */
+    rv = tls13_EncodeClientHelloInner(ss, &chInner, &chInnerXtns, &encodedChInner);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Pad the outer prior to appending ECH (for the AAD).
+     * Encoded extension size is (echCipherSuite + enc + configId + payload + tag).
+     * Post-encryption, we'll assert that this was correct. */
+    encodedChLen = 4 + 33 + 34 + 2 + encodedChInner.len + 16;
+    rv = ssl_InsertPaddingExtension(ss, chOuter->len + encodedChLen, chOuterXtnsBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Make the ClientHelloOuterAAD value, which is complete
+     * chOuter minus encrypted_client_hello xtn. */
+    rv = sslBuffer_Append(&outerAAD, chOuter->buf, chOuter->len);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_AppendBufferVariable(&outerAAD, chOuterXtnsBuf, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    rv = sslBuffer_InsertLength(&outerAAD, 1, 3);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Insert the encrypted_client_hello xtn and coalesce. */
+    rv = tls13_EncryptClientHello(ss, &outerAAD, &encodedChInner);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    PORT_Assert(encodedChLen == encodedChInner.len);
+
+    rv = ssl3_EmplaceExtension(ss, chOuterXtnsBuf, ssl_tls13_encrypted_client_hello_xtn,
+                               encodedChInner.buf, encodedChInner.len, PR_TRUE);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = ssl3_InsertChHeaderSize(ss, chOuter, chOuterXtnsBuf);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendBufferVariable(chOuter, chOuterXtnsBuf, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+loser:
+    sslBuffer_Clear(&chInner);
+    sslBuffer_Clear(&encodedChInner);
+    sslBuffer_Clear(&chInnerXtns);
+    sslBuffer_Clear(&pskXtn);
+    sslBuffer_Clear(&outerAAD);
+    return rv;
+}
+
+static SECStatus
+tls13_ComputeEchSignal(sslSocket *ss, PRUint8 *out)
+{
+    SECStatus rv;
+    PRUint8 derived[64];
+    SECItem randItem = { siBuffer,
+                         ss->sec.isServer ? ss->ssl3.hs.client_random : ss->ssl3.hs.client_inner_random,
+                         SSL3_RANDOM_LENGTH };
+    SSLHashType hashAlg = tls13_GetHash(ss);
+    PK11SymKey *extracted = NULL;
+    PK11SymKey *randKey = NULL;
+    PK11SlotInfo *slot = PK11_GetInternalSlot();
+    if (!slot) {
+        goto loser;
+    }
+
+    randKey = PK11_ImportDataKey(slot, CKM_HKDF_DATA, PK11_OriginUnwrap,
+                                 CKA_DERIVE, &randItem, NULL);
+    if (!randKey) {
+        goto loser;
+    }
+
+    rv = tls13_HkdfExtract(NULL, randKey, hashAlg, &extracted);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = tls13_HkdfExpandLabelRaw(extracted, hashAlg, ss->ssl3.hs.server_random, 24,
+                                  kHkdfInfoEchConfirm, strlen(kHkdfInfoEchConfirm),
+                                  ss->protocolVariant, derived, TLS13_ECH_SIGNAL_LEN);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    PORT_Memcpy(out, derived, TLS13_ECH_SIGNAL_LEN);
+    SSL_TRC(50, ("%d: TLS13[%d]: %s computed ECH signal", SSL_GETPID(), ss->fd, SSL_ROLE(ss)));
+    PRINT_BUF(50, (ss, "", out, TLS13_ECH_SIGNAL_LEN));
+    PK11_FreeSymKey(extracted);
+    PK11_FreeSymKey(randKey);
+    PK11_FreeSlot(slot);
+    return SECSuccess;
+
+loser:
+    PK11_FreeSymKey(extracted);
+    PK11_FreeSymKey(randKey);
+    if (slot) {
+        PK11_FreeSlot(slot);
+    }
+    return SECFailure;
+}
+
+/* Called just prior to padding the CH. Use the size of the CH to estimate
+ * the size of a corresponding ECH extension, then add it to the buffer. */
+SECStatus
+tls13_MaybeGreaseEch(sslSocket *ss, unsigned int preambleLen, sslBuffer *buf)
+{
+    SECStatus rv;
+    sslBuffer chInnerXtns = SSL_BUFFER_EMPTY;
+    sslBuffer greaseBuf = SSL_BUFFER_EMPTY;
+    unsigned int payloadLen;
+    HpkeAeadId aead;
+    PK11SlotInfo *slot = NULL;
+    PK11SymKey *hmacPrk = NULL;
+    PK11SymKey *derivedData = NULL;
+    SECItem *rawData;
+    CK_HKDF_PARAMS params;
+    SECItem paramsi;
+
+    if (!ss->opt.enableTls13GreaseEch || ss->ssl3.hs.echHpkeCtx) {
+        return SECSuccess;
+    }
+
+    if (ss->vrange.max < SSL_LIBRARY_VERSION_TLS_1_3 ||
+        IS_DTLS(ss)) {
+        return SECSuccess;
+    }
+
+    /* Compress the extensions for payload length. */
+    rv = tls13_ConstructInnerExtensionsFromOuter(ss, buf, &chInnerXtns,
+                                                 NULL, PR_TRUE);
+    if (rv != SECSuccess) {
+        goto loser; /* Code set */
+    }
+    payloadLen = preambleLen + 2 /* Xtns len */ + chInnerXtns.len - 4 /* msg header */;
+    payloadLen += 16; /* Aead tag */
+
+    /* HMAC-Expand to get something that will pass for ciphertext. */
+    slot = PK11_GetBestSlot(CKM_HKDF_DERIVE, NULL);
+    if (!slot) {
+        goto loser;
+    }
+
+    hmacPrk = PK11_KeyGen(slot, CKM_HKDF_DATA, NULL, SHA256_LENGTH, NULL);
+    if (!hmacPrk) {
+        goto loser;
+    }
+
+    params.bExtract = CK_FALSE;
+    params.bExpand = CK_TRUE;
+    params.prfHashMechanism = CKM_SHA256;
+    params.pInfo = NULL;
+    params.ulInfoLen = 0;
+    paramsi.data = (unsigned char *)&params;
+    paramsi.len = sizeof(params);
+    derivedData = PK11_DeriveWithFlags(hmacPrk, CKM_HKDF_DATA,
+                                       &paramsi, CKM_HKDF_DATA,
+                                       CKA_DERIVE, 65 + payloadLen,
+                                       CKF_VERIFY);
+    if (!derivedData) {
+        goto loser;
+    }
+
+    rv = PK11_ExtractKeyValue(derivedData);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* 1B aead determinant (don't send), 32B config_id, 32B enc, payload */
+    rawData = PK11_GetKeyData(derivedData);
+    if (!rawData) {
+        goto loser;
+    }
+    PORT_Assert(rawData->len == 65 + payloadLen);
+
+    /* struct {
+       HpkeKdfId kdf_id;
+       HpkeAeadId aead_id;
+       opaque config_id<0..255>;
+       opaque enc<1..2^16-1>;
+       opaque payload<1..2^16-1>;
+    } ClientECH; */
+
+    /* Only support SHA256. */
+    rv = sslBuffer_AppendNumber(&greaseBuf, HpkeKdfHkdfSha256, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* HpkeAeadAes128Gcm = 1, HpkeAeadChaCha20Poly1305 = 3, */
+    aead = (rawData->data[0] & 1) ? HpkeAeadAes128Gcm : HpkeAeadChaCha20Poly1305;
+    rv = sslBuffer_AppendNumber(&greaseBuf, aead, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendVariable(&greaseBuf, &rawData->data[1], 32, 1);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* enc len is fixed 32B for X25519. */
+    rv = sslBuffer_AppendVariable(&greaseBuf, &rawData->data[33], 32, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    rv = sslBuffer_AppendVariable(&greaseBuf, &rawData->data[65], payloadLen, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* Mark ECH as advertised so that we can validate any response.
+     * We'll use echHpkeCtx to determine if we sent real or GREASE ECH.
+     * TODO: Maybe a broader need to similarly track GREASED extensions? */
+    rv = ssl3_EmplaceExtension(ss, buf, ssl_tls13_encrypted_client_hello_xtn,
+                               greaseBuf.buf, greaseBuf.len, PR_TRUE);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    sslBuffer_Clear(&greaseBuf);
+    sslBuffer_Clear(&chInnerXtns);
+    PK11_FreeSymKey(hmacPrk);
+    PK11_FreeSymKey(derivedData);
+    PK11_FreeSlot(slot);
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(&greaseBuf);
+    sslBuffer_Clear(&chInnerXtns);
+    PK11_FreeSymKey(hmacPrk);
+    PK11_FreeSymKey(derivedData);
+    if (slot) {
+        PK11_FreeSlot(slot);
+    }
+    return SECFailure;
+}
+
+SECStatus
+tls13_MaybeHandleEch(sslSocket *ss, const PRUint8 *msg, PRUint32 msgLen, SECItem *sidBytes,
+                     SECItem *comps, SECItem *cookieBytes, SECItem *suites, SECItem **echInner)
+{
+    SECStatus rv;
+    int error;
+    SSL3AlertDescription desc;
+    SECItem *tmpEchInner = NULL;
+    PRUint8 *b;
+    PRUint32 length;
+    TLSExtension *echExtension;
+    TLSExtension *versionExtension;
+    PORT_Assert(!ss->ssl3.hs.echAccepted);
+    SECItem tmpSid = { siBuffer, NULL, 0 };
+    SECItem tmpCookie = { siBuffer, NULL, 0 };
+    SECItem tmpSuites = { siBuffer, NULL, 0 };
+    SECItem tmpComps = { siBuffer, NULL, 0 };
+
+    echExtension = ssl3_FindExtension(ss, ssl_tls13_encrypted_client_hello_xtn);
+    if (echExtension) {
+        rv = tls13_ServerHandleEchXtn(ss, &ss->xtnData, &echExtension->data);
+        if (rv != SECSuccess) {
+            goto loser; /* code set, alert sent. */
+        }
+        rv = tls13_MaybeAcceptEch(ss, sidBytes, msg, msgLen, &tmpEchInner);
+        if (rv != SECSuccess) {
+            goto loser; /* code set, alert sent. */
+        }
+    }
+    ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_ech;
+
+    if (ss->ssl3.hs.echAccepted) {
+        PORT_Assert(tmpEchInner);
+        PORT_Assert(!PR_CLIST_IS_EMPTY(&ss->ssl3.hs.remoteExtensions));
+
+        /* Start over on ECHInner */
+        b = tmpEchInner->data;
+        length = tmpEchInner->len;
+        rv = ssl3_HandleClientHelloPreamble(ss, &b, &length, &tmpSid,
+                                            &tmpCookie, &tmpSuites, &tmpComps);
+        if (rv != SECSuccess) {
+            goto loser; /* code set, alert sent. */
+        }
+
+        /* Since in Outer we explicitly call the ECH handler, do the same on Inner.
+         * Extensions are already parsed in tls13_MaybeAcceptEch. */
+        echExtension = ssl3_FindExtension(ss, ssl_tls13_encrypted_client_hello_xtn);
+        if (!echExtension) {
+            FATAL_ERROR(ss, SSL_ERROR_MISSING_ECH_EXTENSION, decode_error);
+            goto loser;
+        }
+        rv = tls13_ServerHandleEchXtn(ss, &ss->xtnData, &echExtension->data);
+        if (rv != SECSuccess) {
+            goto loser; /* code set, alert sent. */
+        }
+
+        versionExtension = ssl3_FindExtension(ss, ssl_tls13_supported_versions_xtn);
+        if (!versionExtension) {
+            FATAL_ERROR(ss, SSL_ERROR_UNSUPPORTED_VERSION, protocol_version);
+            goto loser;
+        }
+        rv = tls13_NegotiateVersion(ss, versionExtension);
+        if (rv != SECSuccess) {
+            /* Could be malformed or not allowed in ECH. */
+            error = PORT_GetError();
+            desc = (error == SSL_ERROR_UNSUPPORTED_VERSION) ? protocol_version : illegal_parameter;
+            FATAL_ERROR(ss, error, desc);
+            goto loser;
+        }
+
+        *comps = tmpComps;
+        *cookieBytes = tmpCookie;
+        *sidBytes = tmpSid;
+        *suites = tmpSuites;
+        *echInner = tmpEchInner;
+    }
+    return SECSuccess;
+
+loser:
+    SECITEM_FreeItem(tmpEchInner, PR_TRUE);
+    return SECFailure;
+}
+
+SECStatus
+tls13_MaybeHandleEchSignal(sslSocket *ss)
+{
+    SECStatus rv;
+    PRUint8 computed[TLS13_ECH_SIGNAL_LEN];
+    const PRUint8 *signal = &ss->ssl3.hs.server_random[SSL3_RANDOM_LENGTH - TLS13_ECH_SIGNAL_LEN];
+    PORT_Assert(!ss->sec.isServer);
+
+    /* If !echHpkeCtx, we either didn't advertise or sent GREASE ECH. */
+    if (ss->ssl3.hs.echHpkeCtx) {
+        PORT_Assert(ssl3_ExtensionAdvertised(ss, ssl_tls13_encrypted_client_hello_xtn));
+        rv = tls13_ComputeEchSignal(ss, computed);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+
+        ss->ssl3.hs.echAccepted = !PORT_Memcmp(computed, signal, TLS13_ECH_SIGNAL_LEN);
+        if (ss->ssl3.hs.echAccepted) {
+            if (ss->version < SSL_LIBRARY_VERSION_TLS_1_3) {
+                FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_SERVER_HELLO, illegal_parameter);
+                return SECFailure;
+            }
+            ss->xtnData.negotiated[ss->xtnData.numNegotiated++] = ssl_tls13_encrypted_client_hello_xtn;
+            PORT_Memcpy(ss->ssl3.hs.client_random, ss->ssl3.hs.client_inner_random, SSL3_RANDOM_LENGTH);
+        }
+        /* If rejected, leave echHpkeCtx and echPublicName for rejection paths. */
+        ssl3_CoalesceEchHandshakeHashes(ss);
+        SSL_TRC(50, ("%d: TLS13[%d]: ECH %s accepted by server",
+                     SSL_GETPID(), ss->fd, ss->ssl3.hs.echAccepted ? "is" : "is not"));
+    }
+
+    ss->ssl3.hs.preliminaryInfo |= ssl_preinfo_ech;
+    return SECSuccess;
+}
+
+static SECStatus
+tls13_UnencodeChInner(sslSocket *ss, const SECItem *sidBytes, SECItem **echInner)
+{
+    SECStatus rv;
+    sslReadBuffer outerExtensionsList;
+    sslReadBuffer tmpReadBuf;
+    sslBuffer unencodedChInner = SSL_BUFFER_EMPTY;
+    PRCList *outerCursor;
+    PRCList *innerCursor;
+    PRBool outerFound;
+    PRUint32 xtnsOffset;
+    PRUint64 tmp;
+    PRUint8 *tmpB;
+    PRUint32 tmpLength;
+    sslReader chReader = SSL_READER((*echInner)->data, (*echInner)->len);
+    PORT_Assert(!PR_CLIST_IS_EMPTY(&ss->ssl3.hs.echOuterExtensions));
+    PORT_Assert(PR_CLIST_IS_EMPTY(&ss->ssl3.hs.remoteExtensions));
+
+    /* unencodedChInner := preamble, tmpReadBuf := encoded extensions. */
+    rv = tls13_CopyChPreamble(&chReader, sidBytes, &unencodedChInner, &tmpReadBuf);
+    if (rv != SECSuccess) {
+        goto loser; /* code set */
+    }
+
+    /* Parse inner extensions into ss->ssl3.hs.remoteExtensions. */
+    tmpB = CONST_CAST(PRUint8, tmpReadBuf.buf);
+    rv = ssl3_ParseExtensions(ss, &tmpB, &tmpReadBuf.len);
+    if (rv != SECSuccess) {
+        goto loser; /* malformed, alert sent. */
+    }
+
+    /* Exit early if there are no outer_extensions to decompress. */
+    if (!ssl3_FindExtension(ss, ssl_tls13_outer_extensions_xtn)) {
+        rv = sslBuffer_AppendVariable(&unencodedChInner, tmpReadBuf.buf, tmpReadBuf.len, 2);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        sslBuffer_Clear(&unencodedChInner);
+        return SECSuccess;
+    }
+
+    /* Save room for uncompressed length. */
+    rv = sslBuffer_Skip(&unencodedChInner, 2, &xtnsOffset);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    /* For each inner extension: If not outer_extensions, copy it to the output.
+     * Else if outer_extensions, iterate the compressed extension list and append
+     * each full extension as contained in CHOuter. Compressed extensions must be
+     * contiguous, so decompress at the point at which outer_extensions appears. */
+    for (innerCursor = PR_NEXT_LINK(&ss->ssl3.hs.remoteExtensions);
+         innerCursor != &ss->ssl3.hs.remoteExtensions;
+         innerCursor = PR_NEXT_LINK(innerCursor)) {
+        TLSExtension *innerExtension = (TLSExtension *)innerCursor;
+        if (innerExtension->type != ssl_tls13_outer_extensions_xtn) {
+            rv = sslBuffer_AppendNumber(&unencodedChInner,
+                                        innerExtension->type, 2);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+            rv = sslBuffer_AppendVariable(&unencodedChInner,
+                                          innerExtension->data.data,
+                                          innerExtension->data.len, 2);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+            continue;
+        }
+
+        /* Decompress */
+        sslReader extensionRdr = SSL_READER(innerExtension->data.data,
+                                            innerExtension->data.len);
+        rv = sslRead_ReadVariable(&extensionRdr, 1, &outerExtensionsList);
+        if (rv != SECSuccess) {
+            goto loser;
+        }
+        if (SSL_READER_REMAINING(&extensionRdr) || (outerExtensionsList.len % 2) != 0) {
+            PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+            goto loser;
+        }
+
+        sslReader compressedTypes = SSL_READER(outerExtensionsList.buf, outerExtensionsList.len);
+        while (SSL_READER_REMAINING(&compressedTypes)) {
+            outerFound = PR_FALSE;
+            rv = sslRead_ReadNumber(&compressedTypes, 2, &tmp);
+            if (rv != SECSuccess) {
+                goto loser;
+            }
+            if (tmp == ssl_tls13_encrypted_client_hello_xtn ||
+                tmp == ssl_tls13_outer_extensions_xtn) {
+                FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_ECH_EXTENSION, illegal_parameter);
+                goto loser;
+            }
+            for (outerCursor = PR_NEXT_LINK(&ss->ssl3.hs.echOuterExtensions);
+                 outerCursor != &ss->ssl3.hs.echOuterExtensions;
+                 outerCursor = PR_NEXT_LINK(outerCursor)) {
+                if (((TLSExtension *)outerCursor)->type == tmp) {
+                    outerFound = PR_TRUE;
+                    rv = sslBuffer_AppendNumber(&unencodedChInner,
+                                                ((TLSExtension *)outerCursor)->type, 2);
+                    if (rv != SECSuccess) {
+                        goto loser;
+                    }
+                    rv = sslBuffer_AppendVariable(&unencodedChInner,
+                                                  ((TLSExtension *)outerCursor)->data.data,
+                                                  ((TLSExtension *)outerCursor)->data.len, 2);
+                    if (rv != SECSuccess) {
+                        goto loser;
+                    }
+                    break;
+                }
+            }
+            if (!outerFound) {
+                FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_ECH_EXTENSION, illegal_parameter);
+                goto loser;
+            }
+        }
+    }
+    ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.echOuterExtensions);
+    ssl3_DestroyRemoteExtensions(&ss->ssl3.hs.remoteExtensions);
+
+    /* Correct the message and extensions sizes. */
+    rv = sslBuffer_InsertNumber(&unencodedChInner, xtnsOffset,
+                                unencodedChInner.len - xtnsOffset - 2, 2);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    tmpB = &unencodedChInner.buf[xtnsOffset];
+    tmpLength = unencodedChInner.len - xtnsOffset;
+    rv = ssl3_ConsumeHandshakeNumber64(ss, &tmp, 2, &tmpB, &tmpLength);
+    if (rv != SECSuccess || tmpLength != tmp) {
+        FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, internal_error);
+        goto loser;
+    }
+
+    rv = ssl3_ParseExtensions(ss, &tmpB, &tmpLength);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+
+    SECITEM_FreeItem(*echInner, PR_FALSE);
+    (*echInner)->data = unencodedChInner.buf;
+    (*echInner)->len = unencodedChInner.len;
+    return SECSuccess;
+
+loser:
+    sslBuffer_Clear(&unencodedChInner);
+    return SECFailure;
+}
+
+SECStatus
+tls13_MaybeAcceptEch(sslSocket *ss, const SECItem *sidBytes, const PRUint8 *chOuter,
+                     unsigned int chOuterLen, SECItem **chInner)
+{
+    SECStatus rv;
+    SECItem outer = { siBuffer, CONST_CAST(PRUint8, chOuter), chOuterLen };
+    SECItem *decryptedChInner = NULL;
+    PK11SymKey *echHrrPsk = NULL;
+    SECItem hrrCh1ConfigId = { siBuffer, NULL, 0 };
+    HpkeKdfId kdf;
+    HpkeAeadId aead;
+    sslEchConfig *candidate = NULL; /* non-owning */
+    TLSExtension *hrrXtn;
+    SECItem *configId = ss->ssl3.hs.helloRetry ? &hrrCh1ConfigId : &ss->xtnData.echConfigId;
+    if (!ss->xtnData.innerCh.len) {
+        return SECSuccess;
+    }
+
+    PORT_Assert(ss->xtnData.echSenderPubKey.data);
+    PORT_Assert(ss->xtnData.echConfigId.data);
+    PORT_Assert(ss->xtnData.echCipherSuite);
+
+    if (ss->ssl3.hs.helloRetry) {
+        hrrXtn = ssl3_FindExtension(ss, ssl_tls13_cookie_xtn);
+        if (!hrrXtn) {
+            /* If the client doesn't echo cookie, we can't decrypt. */
+            return SECSuccess;
+        }
+
+        rv = tls13_GetEchInfoFromCookie(ss, hrrXtn, &echHrrPsk, &hrrCh1ConfigId);
+        if (rv != SECSuccess) {
+            /* If we failed due to an issue with the cookie, continue without
+             * ECH and let the HRR code handle the problem. */
+            goto exit_success;
+        }
+
+        /* No CH1 config_id means ECH wasn't advertised in CH1.
+         * No CH1 HRR PSK means that ECH was not accepted in CH1, and the
+         * HRR was generated off CH1Outer. */
+        if (hrrCh1ConfigId.len == 0) {
+            FATAL_ERROR(ss, SSL_ERROR_BAD_2ND_CLIENT_HELLO,
+                        illegal_parameter);
+            goto loser;
+        }
+        if (!echHrrPsk) {
+            goto exit_success;
+        }
+    }
+    kdf = (HpkeKdfId)(ss->xtnData.echCipherSuite & 0xFFFF);
+    aead = (HpkeAeadId)(((ss->xtnData.echCipherSuite) >> 16) & 0xFFFF);
+    rv = tls13_GetMatchingEchConfig(ss, kdf, aead, configId, &candidate);
+    if (rv != SECSuccess) {
+        goto loser;
+    }
+    if (!candidate || candidate->contents.kdfId != kdf ||
+        candidate->contents.aeadId != aead) {
+        /* Send retry_configs if we have any.
+         * This does *not* count as negotiating ECH. */
+        rv = ssl3_RegisterExtensionSender(ss, &ss->xtnData,
+                                          ssl_tls13_encrypted_client_hello_xtn,
+                                          tls13_ServerSendEchXtn);
+        goto exit_success;
+    }
+
+    rv = tls13_OpenClientHelloInner(ss, &outer, candidate, echHrrPsk, &decryptedChInner);
+    if (rv != SECSuccess) {
+        if (ss->ssl3.hs.helloRetry) {
+            FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION, decrypt_error);
+            goto loser;
+        } else {
+            rv = ssl3_RegisterExtensionSender(ss, &ss->xtnData,
+                                              ssl_tls13_encrypted_client_hello_xtn,
+                                              tls13_ServerSendEchXtn);
+            goto exit_success;
+        }
+    }
+    SSL_TRC(20, ("%d: TLS13[%d]: Successfully opened ECH inner CH",
+                 SSL_GETPID(), ss->fd));
+    ss->ssl3.hs.echAccepted = PR_TRUE;
+
+    /* Stash the CHOuter extensions. They're not yet handled (only parsed). If
+     * the CHInner contains outer_extensions_xtn, we'll need to reference them. */
+    ssl3_MoveRemoteExtensions(&ss->ssl3.hs.echOuterExtensions, &ss->ssl3.hs.remoteExtensions);
+
+    rv = tls13_UnencodeChInner(ss, sidBytes, &decryptedChInner);
+    if (rv != SECSuccess) {
+        SECITEM_FreeItem(decryptedChInner, PR_TRUE);
+        goto loser; /* code set */
+    }
+    *chInner = decryptedChInner;
+
+exit_success:
+    PK11_FreeSymKey(echHrrPsk);
+    SECITEM_FreeItem(&hrrCh1ConfigId, PR_FALSE);
+    return SECSuccess;
+
+loser:
+    PK11_FreeSymKey(echHrrPsk);
+    SECITEM_FreeItem(&hrrCh1ConfigId, PR_FALSE);
+    return SECFailure;
+}
+
+SECStatus
+tls13_WriteServerEchSignal(sslSocket *ss)
+{
+    SECStatus rv;
+    PRUint8 signal[TLS13_ECH_SIGNAL_LEN];
+    rv = tls13_ComputeEchSignal(ss, signal);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+    PRUint8 *dest = &ss->ssl3.hs.server_random[SSL3_RANDOM_LENGTH - TLS13_ECH_SIGNAL_LEN];
+    PORT_Memcpy(dest, signal, TLS13_ECH_SIGNAL_LEN);
+    return SECSuccess;
+}
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13ech.h firefox-85.0+build1/security/nss/lib/ssl/tls13ech.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13ech.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13ech.h	2021-01-18 19:58:18.000000000 +0000
@@ -0,0 +1,82 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is PRIVATE to SSL.
+ *
+ * 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 __tls13ech_h_
+#define __tls13ech_h_
+
+#include "pk11hpke.h"
+
+/* draft-08, shared-mode only.
+ * Notes on the implementation status:
+ * - Padding (https://tools.ietf.org/html/draft-ietf-tls-esni-08#section-6.2),
+ *   is not implemented (see bug 1677181).
+ * - When multiple ECHConfigs are provided by the server, the first compatible
+ *   config is selected by the client. Ciphersuite choices are limited and only
+ *   the AEAD may vary (AES-128-GCM or ChaCha20Poly1305).
+ * - Some of the buffering (construction/compression/decompression) could likely
+ *   be optimized, but the spec is still evolving so that work is deferred.
+ */
+#define TLS13_ECH_VERSION 0xfe08
+#define TLS13_ECH_SIGNAL_LEN 8
+
+static const char kHpkeInfoEch[] = "tls ech";
+static const char kHpkeInfoEchHrr[] = "tls ech hrr key";
+static const char kHpkeLabelHrrPsk[] = "hrr key";
+static const char hHkdfInfoEchConfigID[] = "tls ech config id";
+static const char kHkdfInfoEchConfirm[] = "ech accept confirmation";
+
+struct sslEchConfigContentsStr {
+    char *publicName;
+    SECItem publicKey; /* NULL on server. Use the keypair in sslEchConfig instead. */
+    HpkeKemId kemId;
+    HpkeKdfId kdfId;
+    HpkeAeadId aeadId;
+    SECItem suites; /* One or more HpkeCipherSuites. The selected s
+                     * suite is placed in kdfId and aeadId. */
+    PRUint16 maxNameLen;
+    /* No supported extensions. */
+};
+
+struct sslEchConfigStr {
+    PRCList link;
+    SECItem raw;
+    PRUint8 configId[32];
+    PRUint16 version;
+    sslEchConfigContents contents;
+};
+
+SECStatus SSLExp_EncodeEchConfig(const char *publicName, const PRUint32 *hpkeSuites,
+                                 unsigned int hpkeSuiteCount, HpkeKemId kemId,
+                                 const SECKEYPublicKey *pubKey, PRUint16 maxNameLen,
+                                 PRUint8 *out, unsigned int *outlen, unsigned int maxlen);
+SECStatus SSLExp_GetEchRetryConfigs(PRFileDesc *fd, SECItem *retryConfigs);
+SECStatus SSLExp_SetClientEchConfigs(PRFileDesc *fd, const PRUint8 *echConfigs,
+                                     unsigned int echConfigsLen);
+SECStatus SSLExp_SetServerEchConfigs(PRFileDesc *fd,
+                                     const SECKEYPublicKey *pubKey, const SECKEYPrivateKey *privKey,
+                                     const PRUint8 *echConfigs, unsigned int numEchConfigs);
+SECStatus SSLExp_RemoveEchConfigs(PRFileDesc *fd);
+
+SECStatus tls13_ClientSetupEch(sslSocket *ss, sslClientHelloType type);
+SECStatus tls13_ConstructClientHelloWithEch(sslSocket *ss, const sslSessionID *sid,
+                                            PRBool freshSid, sslBuffer *chOuterBuf,
+                                            sslBuffer *chInnerXtnsBuf);
+SECStatus tls13_CopyEchConfigs(PRCList *oconfigs, PRCList *configs);
+SECStatus tls13_DecodeEchConfigs(const SECItem *data, PRCList *configs);
+void tls13_DestroyEchConfigs(PRCList *list);
+SECStatus tls13_GetMatchingEchConfig(const sslSocket *ss, HpkeKdfId kdf, HpkeAeadId aead,
+                                     const SECItem *configId, sslEchConfig **cfg);
+SECStatus tls13_MaybeHandleEch(sslSocket *ss, const PRUint8 *msg, PRUint32 msgLen, SECItem *sidBytes,
+                               SECItem *comps, SECItem *cookieBytes, SECItem *suites, SECItem **echInner);
+SECStatus tls13_MaybeHandleEchSignal(sslSocket *ss);
+SECStatus tls13_MaybeAcceptEch(sslSocket *ss, const SECItem *sidBytes, const PRUint8 *chOuter,
+                               unsigned int chOuterLen, SECItem **chInner);
+SECStatus tls13_MaybeGreaseEch(sslSocket *ss, unsigned int prefixLen, sslBuffer *buf);
+SECStatus tls13_WriteServerEchSignal(sslSocket *ss);
+
+#endif
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13esni.c firefox-85.0+build1/security/nss/lib/ssl/tls13esni.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13esni.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13esni.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,846 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#define TLS13_ESNI_VERSION 0xff01
-
-/*
- *  struct {
- *      uint16 version;
- *      uint8 checksum[4];
- *      KeyShareEntry keys<4..2^16-1>;
- *      CipherSuite cipher_suites<2..2^16-2>;
- *      uint16 padded_length;
- *      uint64 not_before;
- *      uint64 not_after;
- *      Extension extensions<0..2^16-1>;
- *  } ESNIKeys;
- */
-#include "nss.h"
-#include "pk11func.h"
-#include "ssl.h"
-#include "sslproto.h"
-#include "sslimpl.h"
-#include "ssl3exthandle.h"
-#include "tls13esni.h"
-#include "tls13exthandle.h"
-#include "tls13hkdf.h"
-
-const char kHkdfPurposeEsniKey[] = "esni key";
-const char kHkdfPurposeEsniIv[] = "esni iv";
-
-void
-tls13_DestroyESNIKeys(sslEsniKeys *keys)
-{
-    if (!keys) {
-        return;
-    }
-    SECITEM_FreeItem(&keys->data, PR_FALSE);
-    PORT_Free((void *)keys->dummySni);
-    tls13_DestroyKeyShares(&keys->keyShares);
-    ssl_FreeEphemeralKeyPair(keys->privKey);
-    SECITEM_FreeItem(&keys->suites, PR_FALSE);
-    PORT_ZFree(keys, sizeof(sslEsniKeys));
-}
-
-sslEsniKeys *
-tls13_CopyESNIKeys(sslEsniKeys *okeys)
-{
-    sslEsniKeys *nkeys;
-    SECStatus rv;
-
-    PORT_Assert(okeys);
-
-    nkeys = PORT_ZNew(sslEsniKeys);
-    if (!nkeys) {
-        return NULL;
-    }
-    PR_INIT_CLIST(&nkeys->keyShares);
-    rv = SECITEM_CopyItem(NULL, &nkeys->data, &okeys->data);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    if (okeys->dummySni) {
-        nkeys->dummySni = PORT_Strdup(okeys->dummySni);
-        if (!nkeys->dummySni) {
-            goto loser;
-        }
-    }
-    for (PRCList *cur_p = PR_LIST_HEAD(&okeys->keyShares);
-         cur_p != &okeys->keyShares;
-         cur_p = PR_NEXT_LINK(cur_p)) {
-        TLS13KeyShareEntry *copy = tls13_CopyKeyShareEntry(
-            (TLS13KeyShareEntry *)cur_p);
-        if (!copy) {
-            goto loser;
-        }
-        PR_APPEND_LINK(&copy->link, &nkeys->keyShares);
-    }
-    if (okeys->privKey) {
-        nkeys->privKey = ssl_CopyEphemeralKeyPair(okeys->privKey);
-        if (!nkeys->privKey) {
-            goto loser;
-        }
-    }
-    rv = SECITEM_CopyItem(NULL, &nkeys->suites, &okeys->suites);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    nkeys->paddedLength = okeys->paddedLength;
-    nkeys->notBefore = okeys->notBefore;
-    nkeys->notAfter = okeys->notAfter;
-    return nkeys;
-
-loser:
-    tls13_DestroyESNIKeys(nkeys);
-    return NULL;
-}
-
-/* Checksum is a 4-byte array. */
-static SECStatus
-tls13_ComputeESNIKeysChecksum(const PRUint8 *buf, unsigned int len,
-                              PRUint8 *checksum)
-{
-    SECItem copy;
-    SECStatus rv;
-    PRUint8 sha256[32];
-
-    rv = SECITEM_MakeItem(NULL, &copy, buf, len);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    /* Stomp the checksum. */
-    PORT_Memset(copy.data + 2, 0, 4);
-
-    rv = PK11_HashBuf(ssl3_HashTypeToOID(ssl_hash_sha256),
-                      sha256,
-                      copy.data, copy.len);
-    SECITEM_FreeItem(&copy, PR_FALSE);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-    PORT_Memcpy(checksum, sha256, 4);
-    return SECSuccess;
-}
-
-static SECStatus
-tls13_DecodeESNIKeys(SECItem *data, sslEsniKeys **keysp)
-{
-    SECStatus rv;
-    sslReadBuffer tmp;
-    PRUint64 tmpn;
-    sslEsniKeys *keys;
-    PRUint8 checksum[4];
-    sslReader rdr = SSL_READER(data->data, data->len);
-
-    rv = sslRead_ReadNumber(&rdr, 2, &tmpn);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-    if (tmpn != TLS13_ESNI_VERSION) {
-        PORT_SetError(SSL_ERROR_UNSUPPORTED_VERSION);
-        return SECFailure;
-    }
-    keys = PORT_ZNew(sslEsniKeys);
-    if (!keys) {
-        return SECFailure;
-    }
-    PR_INIT_CLIST(&keys->keyShares);
-
-    /* Make a copy. */
-    rv = SECITEM_CopyItem(NULL, &keys->data, data);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    rv = tls13_ComputeESNIKeysChecksum(data->data, data->len, checksum);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Read and check checksum. */
-    rv = sslRead_Read(&rdr, 4, &tmp);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    if (0 != NSS_SecureMemcmp(tmp.buf, checksum, 4)) {
-        goto loser;
-    }
-
-    /* Parse the key shares. */
-    rv = sslRead_ReadVariable(&rdr, 2, &tmp);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    sslReader rdr2 = SSL_READER(tmp.buf, tmp.len);
-    while (SSL_READER_REMAINING(&rdr2)) {
-        TLS13KeyShareEntry *ks = NULL;
-
-        rv = tls13_DecodeKeyShareEntry(&rdr2, &ks);
-        if (rv != SECSuccess) {
-            goto loser;
-        }
-
-        if (ks) {
-            PR_APPEND_LINK(&ks->link, &keys->keyShares);
-        }
-    }
-
-    /* Parse cipher suites. */
-    rv = sslRead_ReadVariable(&rdr, 2, &tmp);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    /* This can't be odd. */
-    if (tmp.len & 1) {
-        goto loser;
-    }
-    rv = SECITEM_MakeItem(NULL, &keys->suites, (PRUint8 *)tmp.buf, tmp.len);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Padded Length */
-    rv = sslRead_ReadNumber(&rdr, 2, &tmpn);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    keys->paddedLength = (PRUint16)tmpn;
-
-    /* Not Before */
-    rv = sslRead_ReadNumber(&rdr, 8, &keys->notBefore);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Not After */
-    rv = sslRead_ReadNumber(&rdr, 8, &keys->notAfter);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Extensions, which we ignore. */
-    rv = sslRead_ReadVariable(&rdr, 2, &tmp);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Check that this is empty. */
-    if (SSL_READER_REMAINING(&rdr) > 0) {
-        goto loser;
-    }
-
-    *keysp = keys;
-    return SECSuccess;
-
-loser:
-    tls13_DestroyESNIKeys(keys);
-    PORT_SetError(SSL_ERROR_RX_MALFORMED_ESNI_KEYS);
-
-    return SECFailure;
-}
-
-/* Encode an ESNI keys structure. We only allow one key
- * share. */
-SECStatus
-SSLExp_EncodeESNIKeys(PRUint16 *cipherSuites, unsigned int cipherSuiteCount,
-                      SSLNamedGroup group, SECKEYPublicKey *pubKey,
-                      PRUint16 pad, PRUint64 notBefore, PRUint64 notAfter,
-                      PRUint8 *out, unsigned int *outlen, unsigned int maxlen)
-{
-    unsigned int savedOffset;
-    SECStatus rv;
-    sslBuffer b = SSL_BUFFER_EMPTY;
-
-    rv = sslBuffer_AppendNumber(&b, TLS13_ESNI_VERSION, 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    rv = sslBuffer_Skip(&b, 4, &savedOffset);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Length of vector. */
-    rv = sslBuffer_AppendNumber(
-        &b, tls13_SizeOfKeyShareEntry(pubKey), 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Our one key share. */
-    rv = tls13_EncodeKeyShareEntry(&b, group, pubKey);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Cipher suites. */
-    rv = sslBuffer_AppendNumber(&b, cipherSuiteCount * 2, 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    for (unsigned int i = 0; i < cipherSuiteCount; i++) {
-        rv = sslBuffer_AppendNumber(&b, cipherSuites[i], 2);
-        if (rv != SECSuccess) {
-            goto loser;
-        }
-    }
-
-    /* Padding Length. Fixed for now. */
-    rv = sslBuffer_AppendNumber(&b, pad, 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Start time. */
-    rv = sslBuffer_AppendNumber(&b, notBefore, 8);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* End time. */
-    rv = sslBuffer_AppendNumber(&b, notAfter, 8);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* No extensions. */
-    rv = sslBuffer_AppendNumber(&b, 0, 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    rv = tls13_ComputeESNIKeysChecksum(SSL_BUFFER_BASE(&b),
-                                       SSL_BUFFER_LEN(&b),
-                                       SSL_BUFFER_BASE(&b) + 2);
-    if (rv != SECSuccess) {
-        PORT_Assert(PR_FALSE);
-        goto loser;
-    }
-
-    if (SSL_BUFFER_LEN(&b) > maxlen) {
-        PORT_SetError(SEC_ERROR_INVALID_ARGS);
-        goto loser;
-    }
-    PORT_Memcpy(out, SSL_BUFFER_BASE(&b), SSL_BUFFER_LEN(&b));
-    *outlen = SSL_BUFFER_LEN(&b);
-
-    sslBuffer_Clear(&b);
-    return SECSuccess;
-loser:
-    sslBuffer_Clear(&b);
-    return SECFailure;
-}
-
-SECStatus
-SSLExp_SetESNIKeyPair(PRFileDesc *fd,
-                      SECKEYPrivateKey *privKey,
-                      const PRUint8 *record, unsigned int recordLen)
-{
-    sslSocket *ss;
-    SECStatus rv;
-    sslEsniKeys *keys = NULL;
-    SECKEYPublicKey *pubKey = NULL;
-    SECItem data = { siBuffer, CONST_CAST(PRUint8, record), recordLen };
-    PLArenaPool *arena = NULL;
-
-    ss = ssl_FindSocket(fd);
-    if (!ss) {
-        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
-                 SSL_GETPID(), fd, __FUNCTION__));
-        return SECFailure;
-    }
-
-    rv = tls13_DecodeESNIKeys(&data, &keys);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    /* Check the cipher suites. */
-    (void)ssl3_config_match_init(ss);
-    /* Make sure the cipher suite is OK. */
-    SSLVersionRange vrange = { SSL_LIBRARY_VERSION_TLS_1_3,
-                               SSL_LIBRARY_VERSION_TLS_1_3 };
-
-    sslReader csrdr = SSL_READER(keys->suites.data,
-                                 keys->suites.len);
-    while (SSL_READER_REMAINING(&csrdr)) {
-        PRUint64 asuite;
-
-        rv = sslRead_ReadNumber(&csrdr, 2, &asuite);
-        if (rv != SECSuccess) {
-            goto loser;
-        }
-        const ssl3CipherSuiteCfg *suiteCfg =
-            ssl_LookupCipherSuiteCfg(asuite, ss->cipherSuites);
-        if (!ssl3_config_match(suiteCfg, ss->ssl3.policy, &vrange, ss)) {
-            /* Illegal suite. */
-            PORT_SetError(SEC_ERROR_INVALID_ARGS);
-            goto loser;
-        }
-    }
-
-    if (PR_CLIST_IS_EMPTY(&keys->keyShares)) {
-        PORT_SetError(SEC_ERROR_INVALID_ARGS);
-        goto loser;
-    }
-    if (PR_PREV_LINK(&keys->keyShares) != PR_NEXT_LINK(&keys->keyShares)) {
-        PORT_SetError(SEC_ERROR_INVALID_ARGS);
-        goto loser;
-    }
-    TLS13KeyShareEntry *entry = (TLS13KeyShareEntry *)PR_LIST_HEAD(
-        &keys->keyShares);
-    if (entry->group->keaType != ssl_kea_ecdh) {
-        PORT_SetError(SEC_ERROR_INVALID_ARGS);
-        goto loser;
-    }
-    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-    if (!arena) {
-        goto loser;
-    }
-    pubKey = PORT_ArenaZNew(arena, SECKEYPublicKey);
-    if (!pubKey) {
-        goto loser;
-    }
-    pubKey->arena = arena;
-    arena = NULL; /* From here, this will be destroyed with the pubkey. */
-    /* Dummy PKCS11 values because this key isn't on a slot. */
-    pubKey->pkcs11Slot = NULL;
-    pubKey->pkcs11ID = CK_INVALID_HANDLE;
-    rv = ssl_ImportECDHKeyShare(pubKey,
-                                entry->key_exchange.data,
-                                entry->key_exchange.len,
-                                entry->group);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    privKey = SECKEY_CopyPrivateKey(privKey);
-    if (!privKey) {
-        goto loser;
-    }
-    keys->privKey = ssl_NewEphemeralKeyPair(entry->group, privKey, pubKey);
-    if (!keys->privKey) {
-        goto loser;
-    }
-    pubKey = NULL;
-    ss->esniKeys = keys;
-    return SECSuccess;
-
-loser:
-    PORT_FreeArena(arena, PR_FALSE);
-    SECKEY_DestroyPublicKey(pubKey);
-    tls13_DestroyESNIKeys(keys);
-    return SECFailure;
-}
-
-SECStatus
-SSLExp_EnableESNI(PRFileDesc *fd,
-                  const PRUint8 *esniKeys,
-                  unsigned int esniKeysLen,
-                  const char *dummySNI)
-{
-    sslSocket *ss;
-    sslEsniKeys *keys = NULL;
-    SECItem data = { siBuffer, CONST_CAST(PRUint8, esniKeys), esniKeysLen };
-    SECStatus rv;
-
-    ss = ssl_FindSocket(fd);
-    if (!ss) {
-        SSL_DBG(("%d: SSL[%d]: bad socket in %s",
-                 SSL_GETPID(), fd, __FUNCTION__));
-        return SECFailure;
-    }
-
-    rv = tls13_DecodeESNIKeys(&data, &keys);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    if (dummySNI) {
-        keys->dummySni = PORT_Strdup(dummySNI);
-        if (!keys->dummySni) {
-            tls13_DestroyESNIKeys(keys);
-            return SECFailure;
-        }
-    }
-
-    /* Delete in case it was set before. */
-    tls13_DestroyESNIKeys(ss->esniKeys);
-    ss->esniKeys = keys;
-
-    return SECSuccess;
-}
-
-/*
- * struct {
- *     opaque record_digest<0..2^16-1>;
- *     KeyShareEntry esni_key_share;
- *     Random client_hello_random;
- * } ESNIContents;
- */
-SECStatus
-tls13_ComputeESNIKeys(const sslSocket *ss,
-                      TLS13KeyShareEntry *entry,
-                      sslKeyPair *keyPair,
-                      const ssl3CipherSuiteDef *suite,
-                      const PRUint8 *esniKeysHash,
-                      const PRUint8 *keyShareBuf,
-                      unsigned int keyShareBufLen,
-                      const PRUint8 *clientRandom,
-                      ssl3KeyMaterial *keyMat)
-{
-    PK11SymKey *Z = NULL;
-    PK11SymKey *Zx = NULL;
-    SECStatus ret = SECFailure;
-    PRUint8 esniContentsBuf[256]; /* Just big enough. */
-    sslBuffer esniContents = SSL_BUFFER(esniContentsBuf);
-    PRUint8 hash[64];
-    const ssl3BulkCipherDef *cipherDef = ssl_GetBulkCipherDef(suite);
-    size_t keySize = cipherDef->key_size;
-    size_t ivSize = cipherDef->iv_size +
-                    cipherDef->explicit_nonce_size; /* This isn't always going to
-                                                     * work, but it does for
-                                                     * AES-GCM */
-    unsigned int hashSize = tls13_GetHashSizeForHash(suite->prf_hash);
-    SECStatus rv;
-
-    rv = tls13_HandleKeyShare(CONST_CAST(sslSocket, ss), entry, keyPair,
-                              suite->prf_hash, &Z);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    rv = tls13_HkdfExtract(NULL, Z, suite->prf_hash, &Zx);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Encode ESNIContents. */
-    rv = sslBuffer_AppendVariable(&esniContents,
-                                  esniKeysHash, hashSize, 2);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    rv = sslBuffer_Append(&esniContents, keyShareBuf, keyShareBufLen);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    rv = sslBuffer_Append(&esniContents, clientRandom, SSL3_RANDOM_LENGTH);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    PORT_Assert(hashSize <= sizeof(hash));
-    rv = PK11_HashBuf(ssl3_HashTypeToOID(suite->prf_hash),
-                      hash,
-                      SSL_BUFFER_BASE(&esniContents),
-                      SSL_BUFFER_LEN(&esniContents));
-    ;
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    rv = tls13_HkdfExpandLabel(Zx, suite->prf_hash,
-                               hash, hashSize,
-                               kHkdfPurposeEsniKey, strlen(kHkdfPurposeEsniKey),
-                               ssl3_Alg2Mech(cipherDef->calg),
-                               keySize, ss->protocolVariant,
-                               &keyMat->key);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    rv = tls13_HkdfExpandLabelRaw(Zx, suite->prf_hash,
-                                  hash, hashSize,
-                                  kHkdfPurposeEsniIv, strlen(kHkdfPurposeEsniIv),
-                                  ss->protocolVariant, keyMat->iv, ivSize);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    ret = SECSuccess;
-
-loser:
-    PK11_FreeSymKey(Z);
-    PK11_FreeSymKey(Zx);
-    return ret;
-}
-
-/* Set up ESNI. This generates a private key as a side effect. */
-SECStatus
-tls13_ClientSetupESNI(sslSocket *ss)
-{
-    ssl3CipherSuite suite;
-    sslEphemeralKeyPair *keyPair;
-    size_t i;
-    PRCList *cur;
-    SECStatus rv;
-    TLS13KeyShareEntry *share = NULL;
-    const sslNamedGroupDef *group = NULL;
-    PRTime now = ssl_Time(ss) / PR_USEC_PER_SEC;
-
-    PORT_Assert(!ss->xtnData.esniPrivateKey);
-
-    if (!ss->esniKeys) {
-        return SECSuccess;
-    }
-
-    if ((ss->esniKeys->notBefore > now) || (ss->esniKeys->notAfter < now)) {
-        return SECSuccess;
-    }
-
-    /* If we're not sending SNI, don't send ESNI. */
-    if (!ssl_ShouldSendSNIExtension(ss, ss->url)) {
-        return SECSuccess;
-    }
-
-    /* Pick the group. */
-    for (i = 0; i < SSL_NAMED_GROUP_COUNT; ++i) {
-        for (cur = PR_NEXT_LINK(&ss->esniKeys->keyShares);
-             cur != &ss->esniKeys->keyShares;
-             cur = PR_NEXT_LINK(cur)) {
-            if (!ss->namedGroupPreferences[i]) {
-                continue;
-            }
-            share = (TLS13KeyShareEntry *)cur;
-            if (share->group->name == ss->namedGroupPreferences[i]->name) {
-                group = ss->namedGroupPreferences[i];
-                break;
-            }
-        }
-    }
-
-    if (!group) {
-        /* No compatible group. */
-        return SECSuccess;
-    }
-
-    rv = ssl3_NegotiateCipherSuiteInner(ss, &ss->esniKeys->suites,
-                                        SSL_LIBRARY_VERSION_TLS_1_3, &suite);
-    if (rv != SECSuccess) {
-        return SECSuccess;
-    }
-
-    rv = tls13_CreateKeyShare(ss, group, &keyPair);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    ss->xtnData.esniPrivateKey = keyPair;
-    ss->xtnData.esniSuite = suite;
-    ss->xtnData.peerEsniShare = share;
-
-    return SECSuccess;
-}
-
-/*
- * struct {
- *     CipherSuite suite;
- *     KeyShareEntry key_share;
- *     opaque record_digest<0..2^16-1>;
- *     opaque encrypted_sni<0..2^16-1>;
- * } ClientEncryptedSNI;
- *
- * struct {
- *     ServerNameList sni;
- *     opaque zeros[ESNIKeys.padded_length - length(sni)];
- * } PaddedServerNameList;
- *
- * struct {
- *     uint8 nonce[16];
- *     PaddedServerNameList realSNI;
- * } ClientESNIInner;
- */
-SECStatus
-tls13_FormatEsniAADInput(sslBuffer *aadInput,
-                         PRUint8 *keyShare, unsigned int keyShareLen)
-{
-    SECStatus rv;
-
-    /* Key share. */
-    PORT_Assert(keyShareLen > 0);
-    rv = sslBuffer_Append(aadInput, keyShare, keyShareLen);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    return SECSuccess;
-}
-
-static SECStatus
-tls13_ServerGetEsniAEAD(const sslSocket *ss, PRUint64 suite,
-                        const ssl3CipherSuiteDef **suiteDefp)
-{
-    SECStatus rv;
-    const ssl3CipherSuiteDef *suiteDef;
-
-    /* Check against the suite list for ESNI */
-    PRBool csMatch = PR_FALSE;
-    sslReader csrdr = SSL_READER(ss->esniKeys->suites.data,
-                                 ss->esniKeys->suites.len);
-    while (SSL_READER_REMAINING(&csrdr)) {
-        PRUint64 asuite;
-
-        rv = sslRead_ReadNumber(&csrdr, 2, &asuite);
-        if (rv != SECSuccess) {
-            return SECFailure;
-        }
-        if (asuite == suite) {
-            csMatch = PR_TRUE;
-            break;
-        }
-    }
-    if (!csMatch) {
-        return SECFailure;
-    }
-
-    suiteDef = ssl_LookupCipherSuiteDef(suite);
-    PORT_Assert(suiteDef);
-    if (!suiteDef) {
-        return SECFailure;
-    }
-
-    *suiteDefp = suiteDef;
-    return SECSuccess;
-}
-
-SECStatus
-tls13_ServerDecryptEsniXtn(const sslSocket *ss, const PRUint8 *in, unsigned int inLen,
-                           PRUint8 *out, unsigned int *outLen, unsigned int maxLen)
-{
-    sslReader rdr = SSL_READER(in, inLen);
-    PRUint64 suite;
-    const ssl3CipherSuiteDef *suiteDef = NULL;
-    TLSExtension *keyShareExtension;
-    TLS13KeyShareEntry *entry = NULL;
-    ssl3KeyMaterial keyMat = { NULL };
-
-    sslBuffer aadInput = SSL_BUFFER_EMPTY;
-    const PRUint8 *keyShareBuf;
-    sslReadBuffer buf;
-    unsigned int keyShareBufLen;
-    PRUint8 hash[64];
-    SECStatus rv;
-
-    /* Read the cipher suite. */
-    rv = sslRead_ReadNumber(&rdr, 2, &suite);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Find the AEAD */
-    rv = tls13_ServerGetEsniAEAD(ss, suite, &suiteDef);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Note where the KeyShare starts. */
-    keyShareBuf = SSL_READER_CURRENT(&rdr);
-    rv = tls13_DecodeKeyShareEntry(&rdr, &entry);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    keyShareBufLen = SSL_READER_CURRENT(&rdr) - keyShareBuf;
-    if (!entry || entry->group->name != ss->esniKeys->privKey->group->name) {
-        goto loser;
-    }
-
-    /* The hash of the ESNIKeys structure. */
-    rv = sslRead_ReadVariable(&rdr, 2, &buf);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Check that the hash matches. */
-    unsigned int hashLen = tls13_GetHashSizeForHash(suiteDef->prf_hash);
-    PORT_Assert(hashLen <= sizeof(hash));
-    rv = PK11_HashBuf(ssl3_HashTypeToOID(suiteDef->prf_hash),
-                      hash,
-                      ss->esniKeys->data.data, ss->esniKeys->data.len);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    if (buf.len != hashLen) {
-        /* This is malformed. */
-        goto loser;
-    }
-    if (0 != NSS_SecureMemcmp(hash, buf.buf, hashLen)) {
-        goto loser;
-    }
-
-    rv = tls13_ComputeESNIKeys(ss, entry,
-                               ss->esniKeys->privKey->keys,
-                               suiteDef,
-                               hash, keyShareBuf, keyShareBufLen,
-                               ((sslSocket *)ss)->ssl3.hs.client_random,
-                               &keyMat);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Read the ciphertext. */
-    rv = sslRead_ReadVariable(&rdr, 2, &buf);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Check that this is empty. */
-    if (SSL_READER_REMAINING(&rdr) > 0) {
-        goto loser;
-    }
-
-    /* Find the key share extension. */
-    keyShareExtension = ssl3_FindExtension(CONST_CAST(sslSocket, ss),
-                                           ssl_tls13_key_share_xtn);
-    if (!keyShareExtension) {
-        goto loser;
-    }
-    rv = tls13_FormatEsniAADInput(&aadInput,
-                                  keyShareExtension->data.data,
-                                  keyShareExtension->data.len);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    const ssl3BulkCipherDef *cipher_def = ssl_GetBulkCipherDef(suiteDef);
-    unsigned char *aad = SSL_BUFFER_BASE(&aadInput);
-    int aadLen = SSL_BUFFER_LEN(&aadInput);
-    int ivLen = cipher_def->iv_size + cipher_def->explicit_nonce_size;
-    SSLCipherAlgorithm calg = cipher_def->calg;
-    unsigned char zero[sizeof(sslSequenceNumber)] = { 0 };
-    SECItem null_params = { siBuffer, NULL, 0 };
-    PK11Context *ctxt = PK11_CreateContextBySymKey(ssl3_Alg2Mech(calg),
-                                                   CKA_NSS_MESSAGE | CKA_DECRYPT,
-                                                   keyMat.key, &null_params);
-    if (!ctxt) {
-        sslBuffer_Clear(&aadInput);
-        goto loser;
-    }
-
-    rv = tls13_AEAD(ctxt, PR_TRUE /* Decrypt */, CKG_NO_GENERATE, 0,
-                    keyMat.iv, NULL, ivLen, zero, sizeof(zero), aad, aadLen,
-                    out, outLen, maxLen, cipher_def->tag_size, buf.buf, buf.len);
-    PK11_DestroyContext(ctxt, PR_TRUE);
-    sslBuffer_Clear(&aadInput);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    ssl_DestroyKeyMaterial(&keyMat);
-    tls13_DestroyKeyShareEntry(entry);
-    return SECSuccess;
-
-loser:
-    FATAL_ERROR(CONST_CAST(sslSocket, ss), SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION, illegal_parameter);
-    ssl_DestroyKeyMaterial(&keyMat); /* Safe because zeroed. */
-    if (entry) {
-        tls13_DestroyKeyShareEntry(entry);
-    }
-    return SECFailure;
-}
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13esni.h firefox-85.0+build1/security/nss/lib/ssl/tls13esni.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13esni.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13esni.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is PRIVATE to SSL.
- *
- * 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 __tls13esni_h_
-#define __tls13esni_h_
-
-struct sslEsniKeysStr {
-    SECItem data; /* The encoded record. */
-    sslEphemeralKeyPair *privKey;
-    const char *dummySni;
-    PRCList keyShares; /* List of TLS13KeyShareEntry */
-    SECItem suites;
-    PRUint16 paddedLength;
-    PRUint64 notBefore;
-    PRUint64 notAfter;
-};
-
-SECStatus SSLExp_SetESNIKeyPair(PRFileDesc *fd,
-                                SECKEYPrivateKey *privKey,
-                                const PRUint8 *record, unsigned int recordLen);
-
-SECStatus SSLExp_EnableESNI(PRFileDesc *fd, const PRUint8 *esniKeys,
-                            unsigned int esniKeysLen, const char *dummySNI);
-SECStatus SSLExp_EncodeESNIKeys(PRUint16 *cipherSuites, unsigned int cipherSuiteCount,
-                                SSLNamedGroup group, SECKEYPublicKey *pubKey,
-                                PRUint16 pad, PRUint64 notBefore, PRUint64 notAfter,
-                                PRUint8 *out, unsigned int *outlen, unsigned int maxlen);
-sslEsniKeys *tls13_CopyESNIKeys(sslEsniKeys *okeys);
-void tls13_DestroyESNIKeys(sslEsniKeys *keys);
-SECStatus tls13_ClientSetupESNI(sslSocket *ss);
-SECStatus tls13_ComputeESNIKeys(const sslSocket *ss,
-                                TLS13KeyShareEntry *entry,
-                                sslKeyPair *keyPair,
-                                const ssl3CipherSuiteDef *suite,
-                                const PRUint8 *esniKeysHash,
-                                const PRUint8 *keyShareBuf,
-                                unsigned int keyShareBufLen,
-                                const PRUint8 *clientRandom,
-                                ssl3KeyMaterial *keyMat);
-SECStatus tls13_FormatEsniAADInput(sslBuffer *aadInput,
-                                   PRUint8 *keyShare, unsigned int keyShareLen);
-
-SECStatus tls13_ServerDecryptEsniXtn(const sslSocket *ss, const PRUint8 *in, unsigned int inLen,
-                                     PRUint8 *out, unsigned int *outLen, unsigned int maxLen);
-
-#endif
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13exthandle.c firefox-85.0+build1/security/nss/lib/ssl/tls13exthandle.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13exthandle.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13exthandle.c	2021-01-18 19:58:19.000000000 +0000
@@ -12,7 +12,7 @@
 #include "pk11pub.h"
 #include "ssl3ext.h"
 #include "ssl3exthandle.h"
-#include "tls13esni.h"
+#include "tls13ech.h"
 #include "tls13exthandle.h"
 #include "tls13psk.h"
 #include "tls13subcerts.h"
@@ -126,7 +126,6 @@
 {
     SECStatus rv;
     PRCList *cursor;
-    unsigned int extStart;
     unsigned int lengthOffset;
 
     if (ss->vrange.max < SSL_LIBRARY_VERSION_TLS_1_3) {
@@ -138,8 +137,6 @@
     SSL_TRC(3, ("%d: TLS13[%d]: send client key share xtn",
                 SSL_GETPID(), ss->fd));
 
-    extStart = SSL_BUFFER_LEN(buf);
-
     /* Save the offset to the length. */
     rv = sslBuffer_Skip(buf, 2, &lengthOffset);
     if (rv != SECSuccess) {
@@ -162,13 +159,6 @@
         return SECFailure;
     }
 
-    rv = SECITEM_MakeItem(NULL, &xtnData->keyShareExtension,
-                          SSL_BUFFER_BASE(buf) + extStart,
-                          SSL_BUFFER_LEN(buf) - extStart);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
     *added = PR_TRUE;
     return SECSuccess;
 }
@@ -849,6 +839,7 @@
         return SECFailure;
     }
 
+    PORT_Assert(!ss->ssl3.hs.echHpkeCtx || ss->vrange.max >= SSL_LIBRARY_VERSION_TLS_1_3);
     for (version = ss->vrange.max; version >= ss->vrange.min; --version) {
         PRUint16 wire = tls13_EncodeVersion(version,
                                             ss->protocolVariant);
@@ -1213,289 +1204,30 @@
 }
 
 SECStatus
-tls13_ClientSendEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
-                        sslBuffer *buf, PRBool *added)
-{
-    SECStatus rv;
-    PRUint8 sniBuf[1024];
-    PRUint8 hash[64];
-    sslBuffer sni = SSL_BUFFER(sniBuf);
-    const ssl3CipherSuiteDef *suiteDef;
-    ssl3KeyMaterial keyMat;
-    PRUint8 outBuf[1024];
-    unsigned int outLen;
-    unsigned int sniStart;
-    unsigned int sniLen;
-    sslBuffer aadInput = SSL_BUFFER_EMPTY;
-    unsigned int keyShareBufStart;
-    unsigned int keyShareBufLen;
-
-    PORT_Memset(&keyMat, 0, sizeof(keyMat));
-
-    if (!ss->xtnData.esniPrivateKey) {
-        return SECSuccess;
-    }
-
-    /* nonce */
-    rv = PK11_GenerateRandom(
-        (unsigned char *)xtnData->esniNonce, sizeof(xtnData->esniNonce));
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-    rv = sslBuffer_Append(&sni, xtnData->esniNonce, sizeof(xtnData->esniNonce));
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    /* sni */
-    sniStart = SSL_BUFFER_LEN(&sni);
-    rv = ssl3_ClientFormatServerNameXtn(ss, ss->url, xtnData, &sni);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    sniLen = SSL_BUFFER_LEN(&sni) - sniStart;
-    /* Padding. */
-    if (ss->esniKeys->paddedLength > sniLen) {
-        unsigned int paddingRequired = ss->esniKeys->paddedLength - sniLen;
-        while (paddingRequired--) {
-            rv = sslBuffer_AppendNumber(&sni, 0, 1);
-            if (rv != SECSuccess) {
-                return SECFailure;
-            }
-        }
-    }
-
-    suiteDef = ssl_LookupCipherSuiteDef(xtnData->esniSuite);
-    PORT_Assert(suiteDef);
-    if (!suiteDef) {
-        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
-        return SECFailure;
-    }
-
-    /* Format the first part of the extension so we have the
-     * encoded KeyShareEntry. */
-    rv = sslBuffer_AppendNumber(buf, xtnData->esniSuite, 2);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-    keyShareBufStart = SSL_BUFFER_LEN(buf);
-    rv = tls13_EncodeKeyShareEntry(buf,
-                                   xtnData->esniPrivateKey->group->name,
-                                   xtnData->esniPrivateKey->keys->pubKey);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-    keyShareBufLen = SSL_BUFFER_LEN(buf) - keyShareBufStart;
-
-    if (tls13_GetHashSizeForHash(suiteDef->prf_hash) > sizeof(hash)) {
-        PORT_Assert(PR_FALSE);
-        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
-        return SECFailure;
-    }
-
-    rv = PK11_HashBuf(ssl3_HashTypeToOID(suiteDef->prf_hash),
-                      hash,
-                      ss->esniKeys->data.data,
-                      ss->esniKeys->data.len);
-    if (rv != SECSuccess) {
-        PORT_Assert(PR_FALSE);
-        return SECFailure;
-    }
-
-    rv = sslBuffer_AppendVariable(buf, hash,
-                                  tls13_GetHashSizeForHash(suiteDef->prf_hash), 2);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    /* Compute the ESNI keys. */
-    rv = tls13_ComputeESNIKeys(ss, xtnData->peerEsniShare,
-                               xtnData->esniPrivateKey->keys,
-                               suiteDef,
-                               hash,
-                               SSL_BUFFER_BASE(buf) + keyShareBufStart,
-                               keyShareBufLen,
-                               CONST_CAST(PRUint8, ss->ssl3.hs.client_random),
-                               &keyMat);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    rv = tls13_FormatEsniAADInput(&aadInput,
-                                  xtnData->keyShareExtension.data,
-                                  xtnData->keyShareExtension.len);
-    if (rv != SECSuccess) {
-        ssl_DestroyKeyMaterial(&keyMat);
-        return SECFailure;
-    }
-
-    /* Now encrypt. */
-    unsigned char *aad = SSL_BUFFER_BASE(&aadInput);
-    int aadLen = SSL_BUFFER_LEN(&aadInput);
-    const ssl3BulkCipherDef *cipher_def = ssl_GetBulkCipherDef(suiteDef);
-    int ivLen = cipher_def->iv_size + cipher_def->explicit_nonce_size;
-    unsigned char zero[sizeof(sslSequenceNumber)] = { 0 };
-    SSLCipherAlgorithm calg = cipher_def->calg;
-    SECItem null_params = { siBuffer, NULL, 0 };
-    PK11Context *ctxt = PK11_CreateContextBySymKey(ssl3_Alg2Mech(calg),
-                                                   CKA_NSS_MESSAGE | CKA_ENCRYPT,
-                                                   keyMat.key, &null_params);
-    if (!ctxt) {
-        ssl_DestroyKeyMaterial(&keyMat);
-        sslBuffer_Clear(&aadInput);
-        return SECFailure;
-    }
-
-    /* This function is a single shot, with fresh/unique keys, no need to
-     * generate the IV internally */
-    rv = tls13_AEAD(ctxt, PR_FALSE /* Encrypt */, CKG_NO_GENERATE, 0,
-                    keyMat.iv, NULL, ivLen, zero, sizeof(zero), aad, aadLen,
-                    outBuf, &outLen, sizeof(outBuf), cipher_def->tag_size,
-                    SSL_BUFFER_BASE(&sni), SSL_BUFFER_LEN(&sni));
-    ssl_DestroyKeyMaterial(&keyMat);
-    sslBuffer_Clear(&aadInput);
-    PK11_DestroyContext(ctxt, PR_TRUE);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    /* Encode the rest. */
-    rv = sslBuffer_AppendVariable(buf, outBuf, outLen, 2);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    *added = PR_TRUE;
-    return SECSuccess;
-}
-
-static SECStatus
-tls13_ServerSendEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
-                        sslBuffer *buf, PRBool *added)
-{
-    SECStatus rv;
-
-    rv = sslBuffer_Append(buf, xtnData->esniNonce, sizeof(xtnData->esniNonce));
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
-
-    *added = PR_TRUE;
-    return SECSuccess;
-}
-
-SECStatus
-tls13_ServerHandleEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
-                          SECItem *data)
+tls13_ClientHandleEchXtn(const sslSocket *ss, TLSExtensionData *xtnData,
+                         SECItem *data)
 {
-    sslReadBuffer buf;
-    PRUint8 *plainText = NULL;
-    unsigned int ptLen;
     SECStatus rv;
+    PRCList parsedConfigs;
+    PR_INIT_CLIST(&parsedConfigs);
 
-    /* If we are doing < TLS 1.3, then ignore this. */
-    if (ss->version < SSL_LIBRARY_VERSION_TLS_1_3) {
-        return SECSuccess;
-    }
-
-    if (!ss->esniKeys) {
-        /* Apparently we used to be configured for ESNI, but
-         * no longer. This violates the spec, or the client is
-         * broken. */
-        return SECFailure;
-    }
-
-    plainText = PORT_ZAlloc(data->len);
-    if (!plainText) {
-        return SECFailure;
-    }
-    rv = tls13_ServerDecryptEsniXtn(ss, data->data, data->len,
-                                    plainText, &ptLen, data->len);
-    if (rv) {
-        goto loser;
-    }
-
-    /* Read out the interior extension. */
-    sslReader sniRdr = SSL_READER(plainText, ptLen);
-
-    rv = sslRead_Read(&sniRdr, sizeof(xtnData->esniNonce), &buf);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    PORT_Memcpy(xtnData->esniNonce, buf.buf, sizeof(xtnData->esniNonce));
-
-    /* We need to capture the whole block with the length. */
-    SECItem sniItem = { siBuffer, (unsigned char *)SSL_READER_CURRENT(&sniRdr), 0 };
-    rv = sslRead_ReadVariable(&sniRdr, 2, &buf);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-    sniItem.len = buf.len + 2;
-
-    /* Check the padding. Note we don't need to do this in constant time
-     * because it's inside the AEAD boundary. */
-    /* TODO(ekr@rtfm.com): check that the padding is the right length. */
-    PRUint64 tmp;
-    while (SSL_READER_REMAINING(&sniRdr)) {
-        rv = sslRead_ReadNumber(&sniRdr, 1, &tmp);
-        if (rv != SECSuccess) {
-            goto loser;
-        }
-        if (tmp != 0) {
-            goto loser;
-        }
-    }
-
-    rv = ssl3_HandleServerNameXtn(ss, xtnData, &sniItem);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    rv = ssl3_RegisterExtensionSender(ss, xtnData,
-                                      ssl_tls13_encrypted_sni_xtn,
-                                      tls13_ServerSendEsniXtn);
-    if (rv != SECSuccess) {
-        goto loser;
-    }
-
-    /* Keep track of negotiated extensions. */
-    xtnData->negotiated[xtnData->numNegotiated++] =
-        ssl_tls13_encrypted_sni_xtn;
-
-    PORT_ZFree(plainText, data->len);
-    return SECSuccess;
-loser:
-    PORT_ZFree(plainText, data->len);
-    return SECFailure;
-}
-
-/* Function to check the extension. We don't install a handler here
- * because we need to check for the presence of the extension as
- * well and it's easier to do it in one place. */
-SECStatus
-tls13_ClientCheckEsniXtn(sslSocket *ss)
-{
-    TLSExtension *esniExtension =
-        ssl3_FindExtension(ss, ssl_tls13_encrypted_sni_xtn);
-    if (!esniExtension) {
-        FATAL_ERROR(ss, SSL_ERROR_MISSING_ESNI_EXTENSION, missing_extension);
+    /* Parse the list to determine 1) That the configs are valid
+     * and properly encoded, and 2) If any are compatible. */
+    rv = tls13_DecodeEchConfigs(data, &parsedConfigs);
+    if (rv == SECFailure) {
+        ssl3_ExtSendAlert(ss, alert_fatal, decode_error);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_CONFIG);
         return SECFailure;
     }
-
-    if (esniExtension->data.len != sizeof(ss->xtnData.esniNonce)) {
-        FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION, illegal_parameter);
-        return SECFailure;
+    /* Don't mark ECH negotiated on retry. Save the the raw
+     * configs so the application can retry. If we sent GREASE
+     * ECH (no echHpkeCtx), don't apply returned retry_configs. */
+    if (ss->ssl3.hs.echHpkeCtx && !PR_CLIST_IS_EMPTY(&parsedConfigs)) {
+        rv = SECITEM_CopyItem(NULL, &xtnData->echRetryConfigs, data);
     }
+    tls13_DestroyEchConfigs(&parsedConfigs);
 
-    if (0 != NSS_SecureMemcmp(esniExtension->data.data,
-                              ss->xtnData.esniNonce,
-                              sizeof(ss->xtnData.esniNonce))) {
-        FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_ESNI_EXTENSION, illegal_parameter);
-        return SECFailure;
-    }
-
-    return SECSuccess;
+    return rv;
 }
 
 /* Indicates support for the delegated credentials extension. This should be
@@ -1691,3 +1423,123 @@
         ss, xtnData, ssl_delegated_credentials_xtn,
         tls13_ServerSendDelegatedCredentialsXtn);
 }
+
+/* Adds the ECH extension containing server retry_configs */
+SECStatus
+tls13_ServerSendEchXtn(const sslSocket *ss,
+                       TLSExtensionData *xtnData,
+                       sslBuffer *buf, PRBool *added)
+{
+    SECStatus rv;
+    PORT_Assert(ss->version >= SSL_LIBRARY_VERSION_TLS_1_3);
+    if (PR_CLIST_IS_EMPTY(&ss->echConfigs)) {
+        return SECSuccess;
+    }
+
+    const sslEchConfig *cfg = (sslEchConfig *)PR_LIST_HEAD(&ss->echConfigs);
+    rv = sslBuffer_AppendVariable(buf, cfg->raw.data, cfg->raw.len, 2);
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    *added = PR_TRUE;
+    return SECSuccess;
+}
+
+SECStatus
+tls13_ServerHandleEchXtn(const sslSocket *ss, TLSExtensionData *xtnData,
+                         SECItem *data)
+{
+    SECStatus rv;
+    HpkeKdfId kdf;
+    HpkeAeadId aead;
+    PRUint32 tmp;
+    SECItem configId;
+    SECItem senderPubKey;
+    SECItem encryptedCh;
+
+    /* Ignore it if not doing 1.3+. If we have no ECHConfigs,
+     * proceed to save the config_id for HRR validation. */
+    if (ss->version < SSL_LIBRARY_VERSION_TLS_1_3 ||
+        IS_DTLS(ss)) {
+        return SECSuccess;
+    }
+
+    /* On CHInner, the extension must be empty. */
+    if (ss->ssl3.hs.echAccepted && data->len > 0) {
+        ssl3_ExtSendAlert(ss, alert_fatal, illegal_parameter);
+        PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+        return SECFailure;
+    } else if (ss->ssl3.hs.echAccepted) {
+        xtnData->negotiated[xtnData->numNegotiated++] = ssl_tls13_encrypted_client_hello_xtn;
+        return SECSuccess;
+    }
+
+    /* Parse the KDF and AEAD. */
+    rv = ssl3_ExtConsumeHandshakeNumber(ss, &tmp, 2,
+                                        &data->data, &data->len);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+    kdf = (HpkeKdfId)tmp;
+    rv = ssl3_ExtConsumeHandshakeNumber(ss, &tmp, 2,
+                                        &data->data, &data->len);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+    aead = (HpkeAeadId)tmp;
+
+    /* config_id */
+    rv = ssl3_ExtConsumeHandshakeVariable(ss, &configId, 1,
+                                          &data->data, &data->len);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+
+    /* enc */
+    rv = ssl3_ExtConsumeHandshakeVariable(ss, &senderPubKey, 2,
+                                          &data->data, &data->len);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+
+    /* payload */
+    rv = ssl3_ExtConsumeHandshakeVariable(ss, &encryptedCh, 2,
+                                          &data->data, &data->len);
+    if (rv != SECSuccess) {
+        goto alert_loser;
+    }
+
+    if (data->len) {
+        goto alert_loser;
+    }
+
+    /* All fields required. */
+    if (!configId.len || !senderPubKey.len || !encryptedCh.len) {
+        goto alert_loser;
+    }
+
+    rv = SECITEM_CopyItem(NULL, &xtnData->echSenderPubKey, &senderPubKey);
+    if (rv == SECFailure) {
+        return SECFailure;
+    }
+
+    rv = SECITEM_CopyItem(NULL, &xtnData->innerCh, &encryptedCh);
+    if (rv == SECFailure) {
+        return SECFailure;
+    }
+
+    rv = SECITEM_CopyItem(NULL, &xtnData->echConfigId, &configId);
+    if (rv == SECFailure) {
+        return SECFailure;
+    }
+    xtnData->echCipherSuite = (aead & 0xFFFF) << 16 | (kdf & 0xFFFF);
+
+    /* Not negotiated until tls13_MaybeAcceptEch. */
+    return SECSuccess;
+
+alert_loser:
+    ssl3_ExtSendAlert(ss, alert_fatal, decode_error);
+    PORT_SetError(SSL_ERROR_RX_MALFORMED_ECH_EXTENSION);
+    return SECFailure;
+}
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13exthandle.h firefox-85.0+build1/security/nss/lib/ssl/tls13exthandle.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13exthandle.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13exthandle.h	2021-01-18 19:58:19.000000000 +0000
@@ -88,11 +88,12 @@
 PRUint32 tls13_SizeOfKeyShareEntry(const SECKEYPublicKey *pubKey);
 SECStatus tls13_EncodeKeyShareEntry(sslBuffer *buf, SSLNamedGroup group,
                                     SECKEYPublicKey *pubKey);
-SECStatus tls13_ClientSendEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
-                                  sslBuffer *buf, PRBool *added);
-SECStatus tls13_ServerHandleEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
-                                    SECItem *data);
-SECStatus tls13_ClientCheckEsniXtn(sslSocket *ss);
+SECStatus tls13_ServerHandleEchXtn(const sslSocket *ss, TLSExtensionData *xtnData,
+                                   SECItem *data);
+SECStatus tls13_ServerSendEchXtn(const sslSocket *ss, TLSExtensionData *xtnData,
+                                 sslBuffer *buf, PRBool *added);
+SECStatus tls13_ClientHandleEchXtn(const sslSocket *ss, TLSExtensionData *xtnData,
+                                   SECItem *data);
 SECStatus tls13_ClientSendPostHandshakeAuthXtn(const sslSocket *ss,
                                                TLSExtensionData *xtnData,
                                                sslBuffer *buf, PRBool *added);
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13hashstate.c firefox-85.0+build1/security/nss/lib/ssl/tls13hashstate.c
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13hashstate.c	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13hashstate.c	2021-01-18 19:58:19.000000000 +0000
@@ -12,6 +12,7 @@
 #include "sslimpl.h"
 #include "selfencrypt.h"
 #include "tls13con.h"
+#include "tls13ech.h"
 #include "tls13err.h"
 #include "tls13hashstate.h"
 
@@ -24,8 +25,13 @@
  *     uint16 cipherSuite;                // Selected cipher suite.
  *     uint16 keyShare;                   // Requested key share group (0=none)
  *     opaque applicationToken<0..65535>; // Application token
+ *     echConfigId<0..255>;               // Encrypted Client Hello config_id
+ *     echHrrPsk<0..255>;                 // Encrypted Client Hello HRR PSK
  *     opaque ch_hash[rest_of_buffer];    // H(ClientHello)
  * } CookieInner;
+ *
+ * An empty echConfigId means that ECH was not offered in the first ClientHello.
+ * An empty echHrrPsk means that ECH was not accepted in CH1.
  */
 SECStatus
 tls13_MakeHrrCookie(sslSocket *ss, const sslNamedGroupDef *selectedGroup,
@@ -37,6 +43,10 @@
     PRUint8 cookie[1024];
     sslBuffer cookieBuf = SSL_BUFFER(cookie);
     static const PRUint8 indicator = 0xff;
+    SECItem hrrNonceInfoItem = { siBuffer, (unsigned char *)kHpkeInfoEchHrr,
+                                 strlen(kHpkeInfoEchHrr) };
+    PK11SymKey *echHrrPsk = NULL;
+    SECItem *rawEchPsk = NULL;
 
     /* Encode header. */
     rv = sslBuffer_Append(&cookieBuf, &indicator, 1);
@@ -59,6 +69,48 @@
         return SECFailure;
     }
 
+    /* Received ECH config_id, regardless of acceptance or possession
+     * of a matching ECHConfig. If rejecting ECH, this is essentially a boolean
+     * indicating that ECH was offered in CH1. If accepting ECH, this config_id
+     * will be used for the ECH decryption in CH2. */
+    if (ss->xtnData.echConfigId.len) {
+        rv = sslBuffer_AppendVariable(&cookieBuf, ss->xtnData.echConfigId.data,
+                                      ss->xtnData.echConfigId.len, 1);
+    } else {
+        PORT_Assert(!ssl3_FindExtension(ss, ssl_tls13_encrypted_client_hello_xtn));
+        rv = sslBuffer_AppendNumber(&cookieBuf, 0, 1);
+    }
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
+    /* Extract and encode the ech-hrr-key, if ECH was accepted
+     * (i.e. an Open() succeeded. */
+    if (ss->ssl3.hs.echAccepted) {
+        rv = PK11_HPKE_ExportSecret(ss->ssl3.hs.echHpkeCtx, &hrrNonceInfoItem, 32, &echHrrPsk);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
+        rv = PK11_ExtractKeyValue(echHrrPsk);
+        if (rv != SECSuccess) {
+            PK11_FreeSymKey(echHrrPsk);
+            return SECFailure;
+        }
+        rawEchPsk = PK11_GetKeyData(echHrrPsk);
+        if (!rawEchPsk) {
+            PK11_FreeSymKey(echHrrPsk);
+            return SECFailure;
+        }
+        rv = sslBuffer_AppendVariable(&cookieBuf, rawEchPsk->data, rawEchPsk->len, 1);
+        PK11_FreeSymKey(echHrrPsk);
+    } else {
+        /* Zero length ech_hrr_key. */
+        rv = sslBuffer_AppendNumber(&cookieBuf, 0, 1);
+    }
+    if (rv != SECSuccess) {
+        return SECFailure;
+    }
+
     /* Compute and encode hashes. */
     rv = tls13_ComputeHandshakeHashes(ss, &hashes);
     if (rv != SECSuccess) {
@@ -84,12 +136,15 @@
 tls13_RecoverHashState(sslSocket *ss,
                        unsigned char *cookie, unsigned int cookieLen,
                        ssl3CipherSuite *previousCipherSuite,
-                       const sslNamedGroupDef **previousGroup)
+                       const sslNamedGroupDef **previousGroup,
+                       PRBool *previousEchOffered)
 {
     SECStatus rv;
     unsigned char plaintext[1024];
     unsigned int plaintextLen = 0;
     sslBuffer messageBuf = SSL_BUFFER_EMPTY;
+    sslReadBuffer echPskBuf;
+    sslReadBuffer echConfigIdBuf;
     PRUint64 sentinel;
     PRUint64 cipherSuite;
     PRUint64 group;
@@ -104,9 +159,9 @@
 
     sslReader reader = SSL_READER(plaintext, plaintextLen);
 
-    /* Should start with 0xff. */
+    /* Should start with the sentinel value. */
     rv = sslRead_ReadNumber(&reader, 1, &sentinel);
-    if ((rv != SECSuccess) || (sentinel != 0xff)) {
+    if ((rv != SECSuccess) || (sentinel != TLS13_COOKIE_SENTINEL)) {
         FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
         return SECFailure;
     }
@@ -147,6 +202,19 @@
     PORT_Assert(appTokenReader.len == appTokenLen);
     PORT_Memcpy(ss->xtnData.applicationToken.data, appTokenReader.buf, appTokenLen);
 
+    /* ECH Config ID, which may be empty. */
+    rv = sslRead_ReadVariable(&reader, 1, &echConfigIdBuf);
+    if (rv != SECSuccess) {
+        FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+        return SECFailure;
+    }
+    /* ECH HRR PSK, if present, is already used by tls13_GetEchInfoFromCookie */
+    rv = sslRead_ReadVariable(&reader, 1, &echPskBuf);
+    if (rv != SECSuccess) {
+        FATAL_ERROR(ss, SSL_ERROR_RX_MALFORMED_CLIENT_HELLO, illegal_parameter);
+        return SECFailure;
+    }
+
     /* The remainder is the hash. */
     unsigned int hashLen = SSL_READER_REMAINING(&reader);
     if (hashLen != tls13_GetHashSize(ss)) {
@@ -183,5 +251,6 @@
 
     *previousCipherSuite = cipherSuite;
     *previousGroup = selectedGroup;
+    *previousEchOffered = echConfigIdBuf.len > 0;
     return SECSuccess;
 }
diff -Nru firefox-84.0.2+build1/security/nss/lib/ssl/tls13hashstate.h firefox-85.0+build1/security/nss/lib/ssl/tls13hashstate.h
--- firefox-84.0.2+build1/security/nss/lib/ssl/tls13hashstate.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/ssl/tls13hashstate.h	2021-01-18 19:58:19.000000000 +0000
@@ -18,8 +18,8 @@
                               PRUint8 *buf, unsigned int *len, unsigned int maxlen);
 SECStatus tls13_GetHrrCookieLength(sslSocket *ss, unsigned int *length);
 SECStatus tls13_RecoverHashState(sslSocket *ss,
-                                 unsigned char *cookie,
-                                 unsigned int cookieLen,
+                                 unsigned char *cookie, unsigned int cookieLen,
                                  ssl3CipherSuite *previousCipherSuite,
-                                 const sslNamedGroupDef **previousGroup);
+                                 const sslNamedGroupDef **previousGroup,
+                                 PRBool *previousEchOffered);
 #endif
diff -Nru firefox-84.0.2+build1/security/nss/lib/util/nssutil.h firefox-85.0+build1/security/nss/lib/util/nssutil.h
--- firefox-84.0.2+build1/security/nss/lib/util/nssutil.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/util/nssutil.h	2021-01-18 19:58:19.000000000 +0000
@@ -19,9 +19,9 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.59.1"
+#define NSSUTIL_VERSION "3.60.1"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 59
+#define NSSUTIL_VMINOR 60
 #define NSSUTIL_VPATCH 1
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_FALSE
diff -Nru firefox-84.0.2+build1/security/nss/lib/util/pkcs11t.h firefox-85.0+build1/security/nss/lib/util/pkcs11t.h
--- firefox-84.0.2+build1/security/nss/lib/util/pkcs11t.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/lib/util/pkcs11t.h	2021-01-18 19:58:19.000000000 +0000
@@ -1460,7 +1460,7 @@
 #define CKR_FIPS_SELF_TEST_FAILED 0x000001B6UL
 #define CKR_LIBRARY_LOAD_FAILED 0x000001B7UL
 #define CKR_PIN_TOO_WEAK 0x000001B8UL
-#define CKR_PUBLIC_KEY_INVALID 0x000001B
+#define CKR_PUBLIC_KEY_INVALID 0x000001B9UL
 
 /* This is new to v2.20 */
 #define CKR_FUNCTION_REJECTED 0x00000200UL
diff -Nru firefox-84.0.2+build1/security/nss/nss.gyp firefox-85.0+build1/security/nss/nss.gyp
--- firefox-84.0.2+build1/security/nss/nss.gyp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/nss/nss.gyp	2021-01-18 19:58:19.000000000 +0000
@@ -314,5 +314,16 @@
         },
       ],
     }],
+    [ 'mozilla_central==1', {
+      'targets': [
+        {
+          'target_name': 'test_nssckbi',
+          'type': 'none',
+          'dependencies': [
+            'lib/ckfw/builtins/testlib/builtins-testlib.gyp:nssckbi-testlib',
+          ],
+        },
+      ],
+    }],
   ],
 }
diff -Nru firefox-84.0.2+build1/security/nss/TAG-INFO firefox-85.0+build1/security/nss/TAG-INFO
--- firefox-84.0.2+build1/security/nss/TAG-INFO	2021-01-06 11:23:15.000000000 +0000
+++ firefox-85.0+build1/security/nss/TAG-INFO	2021-01-18 19:58:19.000000000 +0000
@@ -1 +1 @@
-NSS_3_59_1_RTM
\ No newline at end of file
+NSS_3_60_1_RTM
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/security/sandbox/common/test/SandboxTest.cpp firefox-85.0+build1/security/sandbox/common/test/SandboxTest.cpp
--- firefox-84.0.2+build1/security/sandbox/common/test/SandboxTest.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/common/test/SandboxTest.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/GPUChild.h"
+#include "mozilla/ipc/Endpoint.h"
 
 using namespace mozilla;
 using namespace mozilla::ipc;
diff -Nru firefox-84.0.2+build1/security/sandbox/common/test/SandboxTest.h firefox-85.0+build1/security/sandbox/common/test/SandboxTest.h
--- firefox-84.0.2+build1/security/sandbox/common/test/SandboxTest.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/common/test/SandboxTest.h	2021-01-18 19:58:19.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "SandboxTestingParent.h"
 #include "mozISandboxTest.h"
+#include "mozilla/GfxMessageUtils.h"
 
 #if !defined(MOZ_DEBUG) || !defined(ENABLE_TESTS)
 #  error "This file should not be used outside of debug with tests"
diff -Nru firefox-84.0.2+build1/security/sandbox/common/test/SandboxTestingChild.cpp firefox-85.0+build1/security/sandbox/common/test/SandboxTestingChild.cpp
--- firefox-84.0.2+build1/security/sandbox/common/test/SandboxTestingChild.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/common/test/SandboxTestingChild.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -13,6 +13,7 @@
 #  include <fcntl.h>
 #  include <sys/stat.h>
 #  include <sys/types.h>
+#  include <time.h>
 #  include <unistd.h>
 #endif
 
@@ -70,16 +71,25 @@
     ErrnoTest("fstatat_as_lstat"_ns, true, [&] {
       return fstatat(AT_FDCWD, kAllowedPath, &st, AT_SYMLINK_NOFOLLOW);
     });
+
 #  ifdef XP_LINUX
     ErrnoTest("fstatat_as_fstat"_ns, true,
               [&] { return fstatat(0, "", &st, AT_EMPTY_PATH); });
 #  endif  // XP_LINUX
-#else     // XP_UNIX
+
+    const struct timespec usec = {0, 1000};
+    ErrnoTest("nanosleep"_ns, true, [&] { return nanosleep(&usec, nullptr); });
+
+    struct timespec res = {0, 0};
+    ErrnoTest("clock_getres"_ns, true,
+              [&] { return clock_getres(CLOCK_REALTIME, &res); });
+
+#else   // XP_UNIX
     SendReportTestResults("dummy_test"_ns,
                           /* shouldSucceed */ true,
                           /* didSucceed */ true,
                           "The test framework fails if there are no cases."_ns);
-#endif    // XP_UNIX
+#endif  // XP_UNIX
   }
 
   // Tell SandboxTest that this process is done with all tests.
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/broker/SandboxBroker.cpp firefox-85.0+build1/security/sandbox/linux/broker/SandboxBroker.cpp
--- firefox-84.0.2+build1/security/sandbox/linux/broker/SandboxBroker.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/broker/SandboxBroker.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -24,6 +24,7 @@
 
 #include <utility>
 
+#include "GeckoProfiler.h"
 #include "SpecialSystemDirectory.h"
 #include "base/string_util.h"
 #include "mozilla/Assertions.h"
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp firefox-85.0+build1/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
--- firefox-84.0.2+build1/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/dom/ContentChild.h"
+#include "nsComponentManagerUtils.h"
 #include "nsPrintfCString.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/gtest/TestBroker.cpp firefox-85.0+build1/security/sandbox/linux/gtest/TestBroker.cpp
--- firefox-84.0.2+build1/security/sandbox/linux/gtest/TestBroker.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/gtest/TestBroker.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -217,6 +217,18 @@
   EXPECT_EQ(realStat.st_ino, brokeredStat.st_ino);
   EXPECT_EQ(realStat.st_rdev, brokeredStat.st_rdev);
 
+#if defined(__clang__) || defined(__GNUC__)
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wnonnull"
+#endif
+  EXPECT_EQ(-1, statsyscall(nullptr, &realStat));
+  EXPECT_EQ(errno, EFAULT);
+
+  EXPECT_EQ(-EFAULT, Stat(nullptr, &brokeredStat));
+#if defined(__clang__) || defined(__GNUC__)
+#  pragma GCC diagnostic pop
+#endif
+
   EXPECT_EQ(-ENOENT, Stat("/var/empty/qwertyuiop", &brokeredStat));
   EXPECT_EQ(-EACCES, Stat("/dev", &brokeredStat));
 
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/moz.build firefox-85.0+build1/security/sandbox/linux/moz.build
--- firefox-84.0.2+build1/security/sandbox/linux/moz.build	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/moz.build	2021-01-18 19:58:19.000000000 +0000
@@ -106,7 +106,7 @@
     ]
 
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-    CXXFLAGS += ["-Wno-shadow"]
+    CXXFLAGS += ["-Wno-shadow", "-Wno-error=stack-protector"]
     SOURCES["../chromium/sandbox/linux/services/syscall_wrappers.cc"].flags += [
         "-Wno-empty-body",
     ]
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/SandboxBrokerClient.cpp firefox-85.0+build1/security/sandbox/linux/SandboxBrokerClient.cpp
--- firefox-84.0.2+build1/security/sandbox/linux/SandboxBrokerClient.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/SandboxBrokerClient.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -159,11 +159,19 @@
 }
 
 int SandboxBrokerClient::Stat(const char* aPath, statstruct* aStat) {
+  if (!aPath || !aStat) {
+    return -EFAULT;
+  }
+
   Request req = {SANDBOX_FILE_STAT, 0, sizeof(statstruct)};
   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
 }
 
 int SandboxBrokerClient::LStat(const char* aPath, statstruct* aStat) {
+  if (!aPath || !aStat) {
+    return -EFAULT;
+  }
+
   Request req = {SANDBOX_FILE_STAT, O_NOFOLLOW, sizeof(statstruct)};
   return DoCall(&req, aPath, nullptr, (void*)aStat, false);
 }
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/SandboxFilter.cpp firefox-85.0+build1/security/sandbox/linux/SandboxFilter.cpp
--- firefox-84.0.2+build1/security/sandbox/linux/SandboxFilter.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/SandboxFilter.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -297,8 +297,8 @@
     auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
     auto flags = static_cast<int>(aArgs.args[3]);
 
-    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
-        strcmp(path, "") == 0) {
+    if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) && path &&
+        !strcmp(path, "")) {
 #ifdef __NR_fstat64
       return DoSyscall(__NR_fstat64, fd, buf);
 #else
@@ -310,7 +310,7 @@
       return BlockedSyscallTrap(aArgs, nullptr);
     }
 
-    if (fd != AT_FDCWD && path[0] != '/') {
+    if (fd != AT_FDCWD && path && path[0] != '/') {
       SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, 0x%x)",
                         fd, path, buf, flags);
       return BlockedSyscallTrap(aArgs, nullptr);
@@ -619,12 +619,19 @@
 
     switch (sysno) {
         // Timekeeping
-      case __NR_clock_nanosleep:
-      case __NR_clock_getres:
-#ifdef __NR_clock_gettime64
-      case __NR_clock_gettime64:
+        //
+        // (Note: the switch needs to start with a literal case, not a
+        // macro; otherwise clang-format gets confused.)
+      case __NR_gettimeofday:
+#ifdef __NR_time
+      case __NR_time:
 #endif
-      case __NR_clock_gettime: {
+      case __NR_nanosleep:
+        return Allow();
+
+      CASES_FOR_clock_gettime:
+      CASES_FOR_clock_getres:
+      CASES_FOR_clock_nanosleep : {
         // clockid_t can encode a pid or tid to monitor another
         // process or thread's CPU usage (see CPUCLOCK_PID and related
         // definitions in include/linux/posix-timers.h in the kernel
@@ -645,15 +652,8 @@
             .Else(InvalidSyscall());
       }
 
-      case __NR_gettimeofday:
-#ifdef __NR_time
-      case __NR_time:
-#endif
-      case __NR_nanosleep:
-        return Allow();
-
         // Thread synchronization
-      case __NR_futex:
+      CASES_FOR_futex:
         // FIXME(bug 1441993): This could be more restrictive.
         return Allow();
 
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/SandboxFilterUtil.h firefox-85.0+build1/security/sandbox/linux/SandboxFilterUtil.h
--- firefox-84.0.2+build1/security/sandbox/linux/SandboxFilterUtil.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/SandboxFilterUtil.h	2021-01-18 19:58:19.000000000 +0000
@@ -156,24 +156,52 @@
 #  define CASES_FOR_sigreturn case __NR_rt_sigreturn
 #endif
 
+#ifdef __NR_clock_gettime64
+#  define CASES_FOR_clock_gettime \
+    case __NR_clock_gettime:      \
+    case __NR_clock_gettime64
+#  define CASES_FOR_clock_getres \
+    case __NR_clock_getres:      \
+    case __NR_clock_getres_time64
+#  define CASES_FOR_clock_nanosleep \
+    case __NR_clock_nanosleep:      \
+    case __NR_clock_nanosleep_time64
+#  define CASES_FOR_pselect6 \
+    case __NR_pselect6:      \
+    case __NR_pselect6_time64
+#  define CASES_FOR_ppoll \
+    case __NR_ppoll:      \
+    case __NR_ppoll_time64
+#  define CASES_FOR_futex \
+    case __NR_futex:      \
+    case __NR_futex_time64
+#else
+#  define CASES_FOR_clock_gettime case __NR_clock_gettime
+#  define CASES_FOR_clock_getres case __NR_clock_getres
+#  define CASES_FOR_clock_nanosleep case __NR_clock_nanosleep
+#  define CASES_FOR_pselect6 case __NR_pselect6
+#  define CASES_FOR_ppoll case __NR_ppoll
+#  define CASES_FOR_futex case __NR_futex
+#endif
+
 #if defined(__NR__newselect)
 #  define CASES_FOR_select \
     case __NR__newselect:  \
-    case __NR_pselect6
+      CASES_FOR_pselect6
 #elif defined(__NR_select)
 #  define CASES_FOR_select \
     case __NR_select:      \
-    case __NR_pselect6
+      CASES_FOR_pselect6
 #else
-#  define CASES_FOR_select case __NR_pselect6
+#  define CASES_FOR_select CASES_FOR_pselect6
 #endif
 
 #ifdef __NR_poll
 #  define CASES_FOR_poll \
     case __NR_poll:      \
-    case __NR_ppoll
+      CASES_FOR_ppoll
 #else
-#  define CASES_FOR_poll case __NR_ppoll
+#  define CASES_FOR_poll CASES_FOR_ppoll
 #endif
 
 #ifdef __NR_epoll_create
diff -Nru firefox-84.0.2+build1/security/sandbox/linux/Sandbox.h firefox-85.0+build1/security/sandbox/linux/Sandbox.h
--- firefox-84.0.2+build1/security/sandbox/linux/Sandbox.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/linux/Sandbox.h	2021-01-18 19:58:19.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozilla_Sandbox_h
 #define mozilla_Sandbox_h
 
+#include "mozilla/Maybe.h"
 #include "mozilla/Types.h"
 #include "nsXULAppAPI.h"
 #include <vector>
diff -Nru firefox-84.0.2+build1/security/sandbox/mac/SandboxPolicyRDD.h firefox-85.0+build1/security/sandbox/mac/SandboxPolicyRDD.h
--- firefox-84.0.2+build1/security/sandbox/mac/SandboxPolicyRDD.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/mac/SandboxPolicyRDD.h	2021-01-18 19:58:19.000000000 +0000
@@ -163,6 +163,7 @@
       (iokit-property "IOGLBundleName")
       (iokit-property "IOGVACodec")
       (iokit-property "IOGVAHEVCDecode")
+      (iokit-property "IOAVDHEVCDecodeCapabilities")
       (iokit-property "IOGVAHEVCEncode")
       (iokit-property "IOGVAXDecode")
       (iokit-property "IOPCITunnelled")
diff -Nru firefox-84.0.2+build1/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerChild.cpp firefox-85.0+build1/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerChild.cpp
--- firefox-84.0.2+build1/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerChild.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/win/src/remotesandboxbroker/RemoteSandboxBrokerChild.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "RemoteSandboxBrokerChild.h"
+#include "chrome/common/ipc_channel.h"
 #include "mozilla/ipc/CrashReporterClient.h"
 #include "nsDebugImpl.h"
 #include "mozilla/ipc/CrashReporterClient.h"
diff -Nru firefox-84.0.2+build1/security/sandbox/win/src/remotesandboxbroker/remoteSandboxBroker.cpp firefox-85.0+build1/security/sandbox/win/src/remotesandboxbroker/remoteSandboxBroker.cpp
--- firefox-84.0.2+build1/security/sandbox/win/src/remotesandboxbroker/remoteSandboxBroker.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/win/src/remotesandboxbroker/remoteSandboxBroker.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -6,6 +6,9 @@
 
 #include "remoteSandboxBroker.h"
 
+#include "mozilla/SpinEventLoopUntil.h"
+#include "nsIThread.h"
+
 namespace mozilla {
 
 RemoteSandboxBroker::RemoteSandboxBroker() {}
diff -Nru firefox-84.0.2+build1/security/sandbox/win/src/sandboxbroker/sandboxBroker.h firefox-85.0+build1/security/sandbox/win/src/sandboxbroker/sandboxBroker.h
--- firefox-84.0.2+build1/security/sandbox/win/src/sandboxbroker/sandboxBroker.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/security/sandbox/win/src/sandboxbroker/sandboxBroker.h	2021-01-18 19:58:19.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "build/build_config.h"
 #include "mozilla/ipc/EnvironmentMap.h"
+#include "nsCOMPtr.h"
 #include "nsXULAppAPI.h"
 #include "nsISupportsImpl.h"
 
diff -Nru firefox-84.0.2+build1/services/common/app_services_logger/Cargo.toml firefox-85.0+build1/services/common/app_services_logger/Cargo.toml
--- firefox-84.0.2+build1/services/common/app_services_logger/Cargo.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/common/app_services_logger/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cstr = "0.1"
+cstr = "0.2"
 golden_gate = { path = "../../../services/sync/golden_gate" }
 log = "0.4"
 once_cell = "1.4.0"
diff -Nru firefox-84.0.2+build1/services/fxaccounts/FxAccountsCommands.js firefox-85.0+build1/services/fxaccounts/FxAccountsCommands.js
--- firefox-84.0.2+build1/services/fxaccounts/FxAccountsCommands.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/fxaccounts/FxAccountsCommands.js	2021-01-18 19:58:19.000000000 +0000
@@ -57,19 +57,6 @@
     const { sessionToken } = await this._fxai.getUserAccountData([
       "sessionToken",
     ]);
-    let pushState;
-    if (!device.pushCallback) {
-      pushState = "noCallback";
-    } else if (device.pushEndpointExpired) {
-      pushState = "expiredCallback";
-    } else {
-      pushState = "ok";
-    }
-    Services.telemetry.keyedScalarAdd(
-      "identity.fxaccounts.push_state_command_target",
-      pushState,
-      1
-    );
     const client = this._fxai.fxAccountsClient;
     const now = Date.now();
     if (now < this._invokeRateLimitExpiry) {
@@ -113,7 +100,6 @@
     // Whether the call to `pollDeviceCommands` was initiated by a Push message from the FxA
     // servers in response to a message being received or simply scheduled in order
     // to fetch missed messages.
-    const scheduledFetch = notifiedIndex == 0;
     if (
       !Services.prefs.getBoolPref("identity.fxaccounts.commands.enabled", true)
     ) {
@@ -140,12 +126,6 @@
           device: { ...device, lastCommandIndex: index },
         });
         log.info(`Handling ${messages.length} messages`);
-        if (scheduledFetch) {
-          Services.telemetry.scalarAdd(
-            "identity.fxaccounts.missed_commands_fetched",
-            messages.length
-          );
-        }
         await this._handleCommands(messages, notifiedIndex);
       }
     });
diff -Nru firefox-84.0.2+build1/services/fxaccounts/FxAccountsDevice.jsm firefox-85.0+build1/services/fxaccounts/FxAccountsDevice.jsm
--- firefox-84.0.2+build1/services/fxaccounts/FxAccountsDevice.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/fxaccounts/FxAccountsDevice.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -255,15 +255,7 @@
               ourDevice &&
               (ourDevice.pushCallback === null || ourDevice.pushEndpointExpired)
             ) {
-              let pushState = ourDevice.pushEndpointExpired
-                ? "expiredCallback"
-                : "noCallback";
-              Services.telemetry.keyedScalarAdd(
-                "identity.fxaccounts.push_state_this_device",
-                pushState,
-                1
-              );
-              log.warn(`Our push status is '${pushState}' - resubscribing`);
+              log.warn(`Our push endpoint needs resubscription`);
               await this._fxai.fxaPushService.unsubscribe();
               await this._registerOrUpdateDevice(currentState, accountData);
               // and there's a reasonable chance there are commands waiting.
diff -Nru firefox-84.0.2+build1/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml firefox-85.0+build1/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml
--- firefox-84.0.2+build1/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -8,7 +8,7 @@
 
 [dependencies]
 atomic_refcell = "0.1"
-cstr = "0.1"
+cstr = "0.2"
 libc = "0.2"
 once_cell = "1"
 paste = "0.1"
diff -Nru firefox-84.0.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json firefox-85.0+build1/services/settings/dumps/blocklists/addons-bloomfilters.json
--- firefox-84.0.2+build1/services/settings/dumps/blocklists/addons-bloomfilters.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/settings/dumps/blocklists/addons-bloomfilters.json	2021-01-18 19:58:19.000000000 +0000
@@ -1 +1 @@
-{"data":[{"stash":{"blocked":["{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.44","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.3","search@freeweathersearcher.com:1.1.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.1","{CE2DE70F-9351-4057-B6D8-B14BB34DD401}:1.0.1","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.43","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.42","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.1","{4356F7E9-22F2-477E-86BA-BD25350DCC22}:1.0.0","extension@searchsecurer.com:1.0.10","{6300fcbc-5f02-4735-81ec-896350de01a6}:1.0.1","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.2.7","{4b6085bd-3ad2-4583-a8c4-abfd61970ebd}:0.6","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.4","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.5","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.1","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.4","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.2","{8A053236-CE57-4686-8C6B-C3BC8EB0E75E}:1.0.0","{8aebfd17-13a7-4651-8ce8-1826f5cd1c19}:1.7","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.2","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.5","{be6788f3-e106-43d0-9d27-9c4811931588}:0.0.31","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.3","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.1","extension@searchsecurer.com:1.0.9","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.8","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.5","extension@searchsecurer.com:1.1.3","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.2","{9179905e-606f-453a-b204-35adb53a8152}:0.1.100.102","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.1","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.3","@baboomsearch:1.1.2","{eb900458-3122-443c-ab4e-3a36f0d1968f}:1.2","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.4","{788c4081-e227-43c4-853a-1733a2eca513}:3.2","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.41","{aeb932ec-7ec1-4c96-a44d-ba053097a4a3}:1.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.3","{ef86f2ef-dcf4-4a75-884d-fb1f67858b4b}:1.2.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.6.0","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.7","{aeb932ec-7ec1-4c96-a44d-ba053097a4a3}:1.0","{64c9344c-9645-47b4-9603-ef6d51339ce6}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.5.0","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:1.0","{788c4081-e227-43c4-853a-1733a2eca513}:1.3","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.1","{CE2DE70F-9351-4057-B6D8-B14BB34DD401}:1.0.0","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.2","{788c4081-e227-43c4-853a-1733a2eca513}:0.11","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.7","{788c4081-e227-43c4-853a-1733a2eca513}:4.61","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.5","app@ConvertirArchivos:1.0.2","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.8","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.2.0","{788c4081-e227-43c4-853a-1733a2eca513}:2.3","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.96","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.1","{6b5c7804-ccb1-4201-92b5-051c87816c61}:1.3","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.1.0","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.6","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.95","{8eb8fd41-144c-4ffd-b885-1b79d5e03b20}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.2.5","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.4","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.6","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.2","{3983F47C-2A53-4FF0-9808-FB0B7D89443C}:1.0.1","@noicetab:1.9.2.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.3","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.5","{293dc6f6-b90a-4ea6-9ea2-fe618d1ecad1}:1.2.0","{49bbdc35-496e-46f7-b9c1-5db7a47adbbe}:1.2","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.5","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.0","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.1","search@quickeasypdf.com:0.0.5","search@quickeasypdf.com:0.0.4","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.6","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.51","search@freecouponsearcher.com:1.1.0","{38DFCD31-215F-4CB4-9246-9B9772FDA728}:1.0.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.5.1","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.4","extension@searchsecurer.com:1.0.0","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.4","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.5","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.3","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.2","extension@searchsecurer.com:1.1.2","{eb900458-3122-443c-ab4e-3a36f0d1968f}:1.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.4.0","extension@searchsecurer.com:1.0.11","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.5","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.3.0","@noicetab:1.10.0.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.3","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.5.0","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.3","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.9","{6b5c7804-ccb1-4201-92b5-051c87816c61}:1.3.3","{6300fcbc-5f02-4735-81ec-896350de01a6}:1.0.2","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.6","{4c84099d-766a-40b4-a8e0-f90c4cdf4040}:1.0","{788c4081-e227-43c4-853a-1733a2eca513}:4.6","{788c4081-e227-43c4-853a-1733a2eca513}:2.2"],"unblocked":[]},"schema":1608208705099,"key_format":"{guid}:{version}","stash_time":1608230110944,"id":"745e18c2-75d4-44fc-a1d7-954d0abb92d8","last_modified":1608230359579},{"stash":{"blocked":["{5849fc76-08e3-4d14-9d43-6bba81fd99f0}:0.6","{277c5cb0-631b-4cd2-a06c-634bb76aaa4b}:0.6"],"unblocked":[]},"schema":1608061293771,"key_format":"{guid}:{version}","stash_time":1608208509548,"id":"e943c577-ed0b-4c21-acd4-b074c72402ec","last_modified":1608208705056},{"stash":{"blocked":["{64fcf02f-041f-4e91-8ba8-d55eded72a9e}:3.0.0"],"unblocked":[]},"schema":1607992710456,"key_format":"{guid}:{version}","stash_time":1608057322815,"id":"c5b01b4e-f5f7-4313-bc80-0a69d8c9c3ad","last_modified":1608057532329},{"stash":{"blocked":["{f40659b4-6c2d-4c01-bacb-2e0ba34c94e0}:1.0.1"],"unblocked":[]},"schema":1607959877005,"key_format":"{guid}:{version}","stash_time":1607992509477,"id":"2169fb74-a1b4-4347-ac42-9984e16b766a","last_modified":1607992710411},{"stash":{"blocked":["@vkuniversaldownloader:1.17","@vkuniversaldownloader:1.45","@vkuniversaldownloader:1.0","@vkuniversaldownloader:1.9","@vkuniversaldownloader:1.26","@vkuniversaldownloader:1.38","@vkuniversaldownloader:1.34","@vkuniversaldownloader:1.37","@vkuniversaldownloader:1.21","@vkuniversaldownloader:1.27","@vkuniversaldownloader:1.39","@vkuniversaldownloader:1.48","@vkuniversaldownloader:1.11","@vkuniversaldownloader:1.29","@vkuniversaldownloader:1.46","@vkuniversaldownloader:1.18","@vkuniversaldownloader:1.30","@vkuniversaldownloader:1.44","@vkuniversaldownloader:1.33","@vkuniversaldownloader:1.12","@vkuniversaldownloader:1.36","@vkuniversaldownloader:1.19","@vkuniversaldownloader:1.41","@vkuniversaldownloader:1.13","@vkuniversaldownloader:1.16","@vkuniversaldownloader:1.43","@vkuniversaldownloader:1.25","@vkuniversaldownloader:1.10","@vkuniversaldownloader:1.49","@vkuniversaldownloader:1.20","@vkuniversaldownloader:1.31","@vkuniversaldownloader:1.6","@vkuniversaldownloader:1.42","@vkuniversaldownloader:1.23","@vkuniversaldownloader:1.28","@vkuniversaldownloader:1.15","@vkuniversaldownloader:1.1","@vkuniversaldownloader:1.8","@vkuniversaldownloader:1.7","@vkuniversaldownloader:1.40","@vkuniversaldownloader:1.14","@vkuniversaldownloader:1.47","@vkuniversaldownloader:1.24","@vkuniversaldownloader:1.5","@vkuniversaldownloader:1.3","@vkuniversaldownloader:1.32","@vkuniversaldownloader:1.22","@vkuniversaldownloader:1.35"],"unblocked":[]},"schema":1607888491138,"key_format":"{guid}:{version}","stash_time":1607949310449,"id":"c760bc2d-c71e-4206-be35-672f4c73e9c9","last_modified":1607949518837},{"stash":{"blocked":["{2982a5a8-62c0-413f-b51b-204013722511}:2.3.3","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.2","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.3","{2982a5a8-62c0-413f-b51b-204013722511}:2.3.4","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.4"],"unblocked":[]},"schema":1607715696348,"key_format":"{guid}:{version}","stash_time":1607862909181,"id":"b2b46539-8eaf-4ba0-8115-14dfa6f8c2b4","last_modified":1607863109093},{"stash":{"blocked":[],"unblocked":[]},"schema":1607517521762,"key_format":"{guid}:{version}","stash_time":1607538909472,"id":"aaf3380c-7ac6-43a7-be44-82a1195e95dd","last_modified":1607539165992},{"stash":{"blocked":["{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.9.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.0.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:4.14.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.3.1","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.5.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.1.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.7.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.4.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.2.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.3.2"],"unblocked":[]},"schema":1607462847383,"key_format":"{guid}:{version}","stash_time":1607517309357,"id":"73f87ff1-0625-4efa-beae-3cb1d0abfe26","last_modified":1607517521721},{"stash":{"blocked":["{461b09d3-9f69-4778-889d-6c6c7212b970}:1.0","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.2","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.3","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.1","{eee03ab2-df0e-4d66-ab9b-404b4cfbb52d}:1.0"],"unblocked":[]},"schema":1607370095452,"key_format":"{guid}:{version}","stash_time":1607452512106,"id":"29f021a3-5e70-4fd9-aa43-b900913fa8a2","last_modified":1607452775945},{"schema":1607085666461,"attachment":{"hash":"481519c28921adb7ba1e19d8ffe9d1869274f19beb1dab91adc246d51e622ef1","size":800295,"filename":"filter.bin","location":"staging/addons-bloomfilters/df53c91c-b598-46a1-8ca9-32bdbb646258.bin","mimetype":"application/octet-stream"},"key_format":"{guid}:{version}","attachment_type":"bloomfilter-base","generation_time":1607085311428,"id":"0930be19-8b19-486a-82c6-06f3a656cbf5","last_modified":1607085668743}]}
\ No newline at end of file
+{"data":[{"stash":{"blocked":["{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:9.6.0.13","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:9.4.0.1","searchme@mybrowserbar.com:9.4.0.34","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.33","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:9.6.0.10","{515d1883-7376-4db3-b710-8d76a27231b1}:3.6.0.9","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.6.0.10","{515d1883-7376-4db3-b710-8d76a27231b1}:9.6.0.10","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.6.0.13","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.6.0.10","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:9.4.0.1","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.4.0.1","searchme@mybrowserbar.com:9.6.0.1","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.4.0.1","{ca750902-d68a-4670-adef-bb1ed70b87b4}:9.4.0.1","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.6.0.4","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:9.6.0.10","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.6.0.12","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.6.0.16","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.6.0.13","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.31","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:9.6.0.10","{21e161fe-59ff-41d1-8653-310b0feb13ef}:9.6.0.10","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:9.6.0.16","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.6.0.13","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.6.0.13","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:9.6.0.16","{83052879-afb9-4cd8-98c3-e805f5614026}:3.6.0.10","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:9.6.0.10","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.6.0.12","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.6.0.9","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.6.0.9","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.6.0.16","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.6.0.13","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:9.4.0.1","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.6.0.12","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.5.0.6","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.6.0.16","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:9.6.0.10","{51158baf-dd07-417a-a195-0722d0d22da6}:9.6.0.10","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.6.0.4","{3c59c791-aeec-44bb-af60-ff112eea18e3}:9.6.0.13","searchme@mybrowserbar.com:3.4.0.28","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.4.0.1","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.6.0.13","{e51a3d1b-600e-43d5-8116-817a1d964285}:9.4.0.1","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.4.0.34","{181f5e13-15c8-4103-8e08-4283da8beb97}:9.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.38","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.6.0.16","searchme@mybrowserbar.com:3.5.0.2","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.6.0.1","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.6.0.10","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.6.0.10","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.6.0.5","{a1d72db8-4198-408e-9f30-f9df0c242580}:9.6.0.16","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:9.6.0.13","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.6.0.16","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:9.4.0.1","{ab937f68-342b-4481-89d5-288f05876ec2}:3.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.6.0.1","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.6.0.13","searchme@mybrowserbar.com:3.6.0.2","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.6.0.16","{515d1883-7376-4db3-b710-8d76a27231b1}:3.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.6.0.6","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.6.0.16","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:9.6.0.16","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.6.0.12","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.6.0.13","{71a729ac-3a65-4988-8007-794124369292}:9.6.0.16","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.6.0.9","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.4.0.34","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.6.0.10","{51158baf-dd07-417a-a195-0722d0d22da6}:3.6.0.9","{9971fa51-12c0-4f03-933c-8fd80043c666}:9.6.0.10","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.6.0.12","{B489E004-0A0C-496D-A374-33AF61E54469}:9.6.0.5","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.6.0.10","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:9.6.0.16","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.6.0.12","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.6.0.13","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.19","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.6.0.10","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.4.0.1","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:9.6.0.10","{B489E004-0A0C-496D-A374-33AF61E54469}:3.6.0.4","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.1","{013f5925-9580-4512-a9d4-31475773387e}:9.6.0.13","{a1d72db8-4198-408e-9f30-f9df0c242580}:9.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.5.0.1","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.12","searchme@mybrowserbar.com:3.6.0.6","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:9.6.0.16","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.6.0.10","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.30","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.6.0.12","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.6.0.10","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.31","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.6.0.12","{ca750902-d68a-4670-adef-bb1ed70b87b4}:9.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.29","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.6.0.12","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.6.0.13","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:9.4.0.1","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:9.4.0.1","web@123:1.0","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.14","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.6.0.12","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.6.0.16","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:9.6.0.10","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.4.0.1","{B489E004-0A0C-496D-A374-33AF61E54469}:9.4.0.34","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.4.0.1","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:9.6.0.16","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.6.0.12","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.6.0.5","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:9.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.6.0.5","{ca750902-d68a-4670-adef-bb1ed70b87b4}:9.6.0.13","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.6.0.9","{71a729ac-3a65-4988-8007-794124369292}:3.6.0.9","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:9.6.0.10","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.6.0.12","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.33","{013f5925-9580-4512-a9d4-31475773387e}:3.6.0.10","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.6.0.10","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.6.0.13","{515d1883-7376-4db3-b710-8d76a27231b1}:9.6.0.16","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.6.0.10","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.6.0.13","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.6.0.10","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.6.0.12","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:9.4.0.1","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.4.0.1","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:9.6.0.13","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.6.0.12","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:9.4.0.1","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.6.0.5","{83052879-afb9-4cd8-98c3-e805f5614026}:3.6.0.13","{71a729ac-3a65-4988-8007-794124369292}:9.6.0.10","{ab937f68-342b-4481-89d5-288f05876ec2}:3.6.0.10","searchme@mybrowserbar.com:3.5.0.6","{7a526449-3a92-426f-8ca4-47439918f2b1}:9.6.0.16","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:9.6.0.13","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.6.0.10","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.6.0.16","{B489E004-0A0C-496D-A374-33AF61E54469}:3.5.0.1","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.6.0.16","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:9.4.0.1","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:9.6.0.10","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.6.0.13","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.6.0.10","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.6.0.16","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.6.0.12","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.6.0.12","{51158baf-dd07-417a-a195-0722d0d22da6}:3.6.0.12","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.6.0.6","{9971fa51-12c0-4f03-933c-8fd80043c666}:9.6.0.13","{B489E004-0A0C-496D-A374-33AF61E54469}:3.6.0.6","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.32","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.6.0.13","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.34","{9971fa51-12c0-4f03-933c-8fd80043c666}:9.6.0.16","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.6.0.9","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.4.0.38","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.4.0.1","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.4.0.1","{93c2c934-4922-4774-bf29-691fbd7246ff}:9.4.0.1","{83052879-afb9-4cd8-98c3-e805f5614026}:3.4.0.1","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:9.6.0.16","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.6.0.10","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.4.0.1","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:9.6.0.16","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.4.0.1","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.6.0.10","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:9.4.0.1","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.6.0.13","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.6.0.16","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:9.6.0.16","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:9.4.0.1","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:9.6.0.13","{ab937f68-342b-4481-89d5-288f05876ec2}:9.6.0.13","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:9.6.0.13","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.4.0.1","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.35","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.6.0.16","{51158baf-dd07-417a-a195-0722d0d22da6}:9.6.0.16","{a192bf54-089f-4325-ac25-7eafcd17a342}:9.6.0.13","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:9.4.0.1","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:9.6.0.10","{181f5e13-15c8-4103-8e08-4283da8beb97}:9.4.0.1","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.6.0.9","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.6.0.9","{79da9acc-c057-4f43-b6c3-041f863ee074}:9.4.0.1","searchme@mybrowserbar.com:3.4.0.33","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:9.6.0.13","searchme@mybrowserbar.com:9.5.0.2","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.22","{013f5925-9580-4512-a9d4-31475773387e}:9.4.0.1","{3c59c791-aeec-44bb-af60-ff112eea18e3}:9.4.0.1","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.6.0.12","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.6.0.10","searchme@mybrowserbar.com:3.4.0.29","{51158baf-dd07-417a-a195-0722d0d22da6}:9.4.0.1","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.4.0.1","{b7a6d831-71e7-4af7-833f-bef174626e18}:9.6.0.13","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.6.0.13","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.4.0.1","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.5.0.6","{e51a3d1b-600e-43d5-8116-817a1d964285}:9.6.0.13","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.4.0.1","{76239af6-9293-43ed-aa86-4d871453c7c9}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.5.0.1","{a192bf54-089f-4325-ac25-7eafcd17a342}:9.6.0.16","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.6.0.13","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.4.0.1","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.6.0.9","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.6.0.13","searchme@mybrowserbar.com:3.5.0.5","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.12","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.38","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.6.0.9","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:9.6.0.10","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.6.0.10","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.6.0.16","{515d1883-7376-4db3-b710-8d76a27231b1}:3.6.0.12","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.27","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.6.0.9","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:9.6.0.16","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.4.0.1","{aa4be34a-2e93-4618-a241-975ec11fb606}:9.6.0.16","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:9.6.0.13","{83052879-afb9-4cd8-98c3-e805f5614026}:9.4.0.1","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:9.6.0.16","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.4.0.1","searchme@mybrowserbar.com:9.6.0.5","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.6.0.10","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:9.6.0.13","{7a526449-3a92-426f-8ca4-47439918f2b1}:9.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.14","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.6.0.6","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.6.0.6","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.6.0.6","{bb9b852f-1129-439b-91df-6583bd135c6f}:9.6.0.16","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.6.0.16","{71a729ac-3a65-4988-8007-794124369292}:3.6.0.16","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.4.0.1","{013f5925-9580-4512-a9d4-31475773387e}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.5.0.1","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:9.4.0.1","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:9.6.0.13","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.30","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:9.6.0.10","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.6.0.13","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.6.0.9","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.6.0.7","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.6.0.4","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.6.0.12","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.6.0.10","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:9.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.6.0.1","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:9.6.0.13","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.6.0.9","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.6.0.9","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:9.6.0.10","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.6.0.16","{3c59c791-aeec-44bb-af60-ff112eea18e3}:9.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.5.0.6","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.4.0.1","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:9.6.0.13","{a1d72db8-4198-408e-9f30-f9df0c242580}:9.4.0.1","searchme@mybrowserbar.com:3.4.0.31","{83052879-afb9-4cd8-98c3-e805f5614026}:9.6.0.10","{ca750902-d68a-4670-adef-bb1ed70b87b4}:9.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.39","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.6.0.9","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.6.0.16","{B489E004-0A0C-496D-A374-33AF61E54469}:3.6.0.1","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:9.4.0.1","{013f5925-9580-4512-a9d4-31475773387e}:9.6.0.16","{9971fa51-12c0-4f03-933c-8fd80043c666}:9.4.0.1","{51158baf-dd07-417a-a195-0722d0d22da6}:9.6.0.13","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:3.4.0.1","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.4.0.1","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:9.6.0.10","{b7a6d831-71e7-4af7-833f-bef174626e18}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.4.0.34","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.32","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.6.0.9","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.6.0.13","searchme@mybrowserbar.com:3.5.0.4","{515d1883-7376-4db3-b710-8d76a27231b1}:9.6.0.13","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.6.0.12","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.6.0.10","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.6.0.9","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.6.0.12","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.6.0.12","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.6.0.13","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.6.0.13","{76239af6-9293-43ed-aa86-4d871453c7c9}:9.6.0.16","{ab937f68-342b-4481-89d5-288f05876ec2}:9.4.0.1","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.7","{76239af6-9293-43ed-aa86-4d871453c7c9}:9.4.0.1","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:9.6.0.10","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.6.0.10","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:9.4.0.1","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.6.0.5","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.6.0.13","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.6.0.16","searchme@mybrowserbar.com:9.4.0.30","{71a729ac-3a65-4988-8007-794124369292}:3.6.0.10","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.4.0.1","{7a526449-3a92-426f-8ca4-47439918f2b1}:9.6.0.13","{51158baf-dd07-417a-a195-0722d0d22da6}:3.6.0.13","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.6.0.16","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:9.6.0.13","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.6.0.15","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:9.6.0.13","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.6.0.12","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.6.0.12","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.6.0.13","{013f5925-9580-4512-a9d4-31475773387e}:3.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.21","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.4.0.38","{ab937f68-342b-4481-89d5-288f05876ec2}:3.6.0.9","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.6.0.9","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.6.0.1","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.5.0.1","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:9.4.0.1","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:9.6.0.10","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.9","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.4.0.30","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.6.0.13","{a1d72db8-4198-408e-9f30-f9df0c242580}:9.6.0.13","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:9.4.0.1","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.5.0.6","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.6.0.10","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.4.0.1","searchme@mybrowserbar.com:9.6.0.6","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.6.0.13","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.6.0.16","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.6.0.13","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:9.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.34","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:9.6.0.13","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.6.0.10","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.6.0.9","searchme@mybrowserbar.com:9.4.0.28","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.6.0.13","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.4.0.1","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.6.0.13","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.6.0.9","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.29","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.6.0.6","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.6.0.9","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.6.0.16","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.6.0.12","{181f5e13-15c8-4103-8e08-4283da8beb97}:9.6.0.13","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.15","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.5.0.1","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.6.0.1","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.6.0.9","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.6.0.16","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.6.0.16","{181f5e13-15c8-4103-8e08-4283da8beb97}:9.6.0.16","{ab937f68-342b-4481-89d5-288f05876ec2}:9.6.0.10","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.6.0.10","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.4.0.1","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:9.6.0.13","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.6.0.16","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.34","{79da9acc-c057-4f43-b6c3-041f863ee074}:9.6.0.13","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.6.0.10","searchme@mybrowserbar.com:3.4.0.34","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.6.0.12","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.4.0.1","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.6.0.9","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:9.6.0.13","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.6.0.6","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.6.0.9","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:9.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.6.0.1","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.6.0.13","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:9.6.0.13","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.6.0.9","{21e161fe-59ff-41d1-8653-310b0feb13ef}:9.6.0.13","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.10","searchme@mybrowserbar.com:3.6.0.5","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.6.0.10","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.6.0.1","searchme@mybrowserbar.com:3.4.0.32","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:9.4.0.1","{013f5925-9580-4512-a9d4-31475773387e}:3.6.0.9","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:9.6.0.10","web@2:1.0","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.6.0.10","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:3.6.0.9","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.4.0.1","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.6.0.12","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.5.0.6","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.4.0.30","{cc80619b-e882-40c2-b816-03a61b1d0c4f}:9.6.0.10","searchme@mybrowserbar.com:9.6.0.2","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.31","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.30","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.6.0.13","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.31","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.6.0.6","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:9.6.0.13","{71a729ac-3a65-4988-8007-794124369292}:3.4.0.1","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.4.0.1","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.6.0.16","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.6.0.16","{93c2c934-4922-4774-bf29-691fbd7246ff}:9.6.0.13","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.4.0.1","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.6.0.16","{013f5925-9580-4512-a9d4-31475773387e}:3.6.0.12","searchme@mybrowserbar.com:9.4.0.38","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:9.6.0.16","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.6.0.16","{71a729ac-3a65-4988-8007-794124369292}:9.6.0.13","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.6.0.13","{515d1883-7376-4db3-b710-8d76a27231b1}:3.6.0.10","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:9.6.0.10","{83052879-afb9-4cd8-98c3-e805f5614026}:3.6.0.9","{B489E004-0A0C-496D-A374-33AF61E54469}:9.4.0.30","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:9.6.0.13","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.6.0.10","{B489E004-0A0C-496D-A374-33AF61E54469}:3.6.0.5","{ab937f68-342b-4481-89d5-288f05876ec2}:9.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.18","searchme@mybrowserbar.com:9.5.0.3","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.6.0.12","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.6.0.10","searchme@mybrowserbar.com:9.5.0.4","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.6.0.9","{21e161fe-59ff-41d1-8653-310b0feb13ef}:3.6.0.12","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:9.6.0.10","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.4.0.1","searchme@mybrowserbar.com:3.4.0.38","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:9.4.0.1","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:9.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.6.0.5","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:9.4.0.1","searchme@mybrowserbar.com:9.6.0.4","{bb9b852f-1129-439b-91df-6583bd135c6f}:9.4.0.1","web@1:1.0","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.4.0.1","{51158baf-dd07-417a-a195-0722d0d22da6}:3.6.0.16","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:3.6.0.12","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:3.6.0.12","{c27b59ba-0917-46d1-aaf6-165528a99a3d}:3.6.0.13","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.32","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.6.0.10","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.5.0.6","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.6.0.9","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:9.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.4.0.30","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.5.0.6","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.6.0.9","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.17","{B489E004-0A0C-496D-A374-33AF61E54469}:9.6.0.1","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.6.0.12","{ab937f68-342b-4481-89d5-288f05876ec2}:3.4.0.1","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.6.0.16","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:3.6.0.9","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.6.0.14","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.38","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.6.0.9","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.6.0.4","{b7a6d831-71e7-4af7-833f-bef174626e18}:9.4.0.1","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.13","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:9.6.0.10","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.6.0.12","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.6.0.16","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.6.0.12","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.32","{a1d72db8-4198-408e-9f30-f9df0c242580}:3.6.0.16","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.6.0.16","searchme@mybrowserbar.com:3.6.0.3","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.6.0.16","searchme@mybrowserbar.com:9.5.0.1","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.6.0.10","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.6.0.10","{21e161fe-59ff-41d1-8653-310b0feb13ef}:9.4.0.1","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:9.6.0.13","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.6.0.16","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:9.6.0.10","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.6.0.12","{7a526449-3a92-426f-8ca4-47439918f2b1}:3.4.0.1","{bb9b852f-1129-439b-91df-6583bd135c6f}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.6.0.1","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:9.6.0.16","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:9.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.36","{83052879-afb9-4cd8-98c3-e805f5614026}:3.6.0.16","{93c2c934-4922-4774-bf29-691fbd7246ff}:3.4.0.1","{aa4be34a-2e93-4618-a241-975ec11fb606}:9.6.0.13","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.4.0.1","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:9.4.0.1","{79da9acc-c057-4f43-b6c3-041f863ee074}:9.6.0.10","searchme@mybrowserbar.com:9.6.0.3","{515d1883-7376-4db3-b710-8d76a27231b1}:9.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.13","{51158baf-dd07-417a-a195-0722d0d22da6}:3.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.34","{aa4be34a-2e93-4618-a241-975ec11fb606}:9.4.0.1","{B489E004-0A0C-496D-A374-33AF61E54469}:9.4.0.38","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:9.4.0.1","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:9.4.0.1","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:3.6.0.13","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:9.6.0.13","{415B04AB-808E-45AA-B994-B37E73F911CE}:9.4.0.34","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.29","{aa4be34a-2e93-4618-a241-975ec11fb606}:3.4.0.1","{93c2c934-4922-4774-bf29-691fbd7246ff}:9.6.0.10","{b7a6d831-71e7-4af7-833f-bef174626e18}:9.6.0.16","{83052879-afb9-4cd8-98c3-e805f5614026}:3.6.0.12","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.6.0.9","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.6.0.13","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.6.0.12","{b1af0454-f88e-46d2-ad7e-f7d88c664ab8}:9.6.0.13","{9971fa51-12c0-4f03-933c-8fd80043c666}:3.6.0.9","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.6.0.12","{e51a3d1b-600e-43d5-8116-817a1d964285}:9.6.0.10","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:9.6.0.10","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:9.6.0.16","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.6.0.10","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.6.0.9","{93c2c934-4922-4774-bf29-691fbd7246ff}:9.6.0.16","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:3.6.0.9","{ab937f68-342b-4481-89d5-288f05876ec2}:3.6.0.12","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:9.4.0.1","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:3.4.0.1","searchme@mybrowserbar.com:3.5.0.1","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.6.0.16","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.24","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:9.6.0.16","{ce2ed0a1-9cbf-4545-a990-3f7769e77216}:3.4.0.1","{f0bd0efa-2a31-4729-86bc-1b4236f0e626}:9.4.0.1","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:9.4.0.30","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.6.0.12","{b7a6d831-71e7-4af7-833f-bef174626e18}:3.6.0.13","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.5.0.1","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.38","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.30","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.5.0.3","{b26f9132-2f33-4796-97d7-c5ec7d880d79}:9.6.0.13","{ef816e8f-c376-409e-a3bd-bcd7bf8d935e}:3.6.0.9","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:3.6.0.16","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:3.6.0.13","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.6.0.16","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.33","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.8","{ab937f68-342b-4481-89d5-288f05876ec2}:3.6.0.13","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:9.4.0.1","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:9.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.15","{bb9b852f-1129-439b-91df-6583bd135c6f}:3.6.0.13","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.38","{a192bf54-089f-4325-ac25-7eafcd17a342}:9.6.0.10","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.6.0.5","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.6.0.9","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.6.0.12","{e51a3d1b-600e-43d5-8116-817a1d964285}:3.6.0.13","{7a526449-3a92-426f-8ca4-47439918f2b1}:9.6.0.10","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:9.4.0.38","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:9.6.0.13","{013f5925-9580-4512-a9d4-31475773387e}:9.6.0.10","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.6.0.12","{76239af6-9293-43ed-aa86-4d871453c7c9}:3.6.0.9","searchme@mybrowserbar.com:9.5.0.6","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.6.0.9","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.33","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:9.6.0.10","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.4.0.1","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.5.0.1","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:3.6.0.9","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:3.6.0.16","{51158baf-dd07-417a-a195-0722d0d22da6}:3.4.0.1","{181f5e13-15c8-4103-8e08-4283da8beb97}:3.6.0.12","{84bbe6bf-fea5-418f-9bed-2ee0d6f1fba0}:3.4.0.1","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:3.4.0.34","{83052879-afb9-4cd8-98c3-e805f5614026}:9.6.0.13","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.29","{B489E004-0A0C-496D-A374-33AF61E54469}:3.5.0.6","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.6.0.9","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.5.0.6","{90bab949-8d98-4d4e-8462-9dd85d0b5aba}:9.6.0.10","{7ec0d03e-d893-49f1-8db7-614e27b2a9c7}:9.6.0.16","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:9.6.0.16","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.6.0.13","{013f5925-9580-4512-a9d4-31475773387e}:3.6.0.13","{b2bfe60c-eef8-4e20-8334-c53afdc1ffdd}:3.4.0.1","{B489E004-0A0C-496D-A374-33AF61E54469}:3.4.0.33","{189849ff-f5ad-4480-9c4a-74ac74fc3246}:9.6.0.16","{19F6FEE2-01F5-44F2-8618-1AE34A8111EF}:3.4.0.31","{d184bb9a-da59-4370-8e68-7e763aecf1cb}:3.6.0.13","{515d1883-7376-4db3-b710-8d76a27231b1}:3.4.0.1","{e51a3d1b-600e-43d5-8116-817a1d964285}:9.6.0.16","{046c09c5-321a-401b-acb7-7ec1d73bbd77}:9.6.0.13","{dde80c96-ec4f-4fa7-ad2f-758cffd3cd38}:9.6.0.16","{2bc72c53-9bde-4db2-8479-eda9a5e71f4e}:3.6.0.9","{A87A31AD-9EEF-47E6-B8CF-991AF9DCF4B6}:9.4.0.38","{76239af6-9293-43ed-aa86-4d871453c7c9}:9.6.0.13","{95d8f17c-2b56-4112-8165-060d9cb6fff9}:3.6.0.12","searchme@mybrowserbar.com:3.6.0.1","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:9.6.0.13","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.5.0.1","{353dd9ca-1cd6-49a4-989d-c38c9ef480c5}:3.6.0.16","{77e576fc-7ffe-4633-9ad0-6982d5fb863c}:3.6.0.13","{79da9acc-c057-4f43-b6c3-041f863ee074}:9.6.0.16","{ca750902-d68a-4670-adef-bb1ed70b87b4}:3.6.0.12","{bb9b852f-1129-439b-91df-6583bd135c6f}:9.6.0.13","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.6.0.13","{83052879-afb9-4cd8-98c3-e805f5614026}:9.6.0.16","{aa4be34a-2e93-4618-a241-975ec11fb606}:9.6.0.10","{21e161fe-59ff-41d1-8653-310b0feb13ef}:9.6.0.16","{7b1f151d-4c1c-4656-a460-df3dee5d49fb}:3.6.0.13","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:3.6.0.12","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.6.0.10","{0d889789-563b-4f51-85ec-a9f1f68f82ca}:3.6.0.10","web@1:1.1","{71a729ac-3a65-4988-8007-794124369292}:9.4.0.1","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.6.0.9","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.6.0.13","{cdd177ac-fcda-44a9-9687-64afe2b1cef5}:9.6.0.13","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.29","{B489E004-0A0C-496D-A374-33AF61E54469}:9.5.0.1","{f8b0ecf9-8ef3-4951-9f86-6ce199e1843b}:9.6.0.13","{fc57343e-50d9-4305-9095-b4d4f07cf31a}:9.6.0.16","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.4.0.32","{74c63407-081c-4580-a3b8-a4b34e04ffd2}:3.6.0.12","{71a729ac-3a65-4988-8007-794124369292}:3.6.0.13","{B489E004-0A0C-496D-A374-33AF61E54469}:9.6.0.6","{160e8925-b26a-49fc-969b-d4cce7c2f7d7}:3.6.0.10","{a192bf54-089f-4325-ac25-7eafcd17a342}:3.4.0.1","{3c59c791-aeec-44bb-af60-ff112eea18e3}:9.6.0.16","{737cd3ee-f9fe-48c1-89f5-74d7ba5ee1f3}:9.4.0.1","{71a729ac-3a65-4988-8007-794124369292}:3.6.0.12","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:9.6.0.10","{79da9acc-c057-4f43-b6c3-041f863ee074}:3.6.0.9","{B489E004-0A0C-496D-A374-33AF61E54469}:9.5.0.6","searchme@mybrowserbar.com:3.6.0.4","{3822c14e-b9ff-4d31-bc1e-b9d18329d8ad}:3.6.0.9","{a192bf54-089f-4325-ac25-7eafcd17a342}:9.4.0.1","{3c59c791-aeec-44bb-af60-ff112eea18e3}:3.6.0.10","{415B04AB-808E-45AA-B994-B37E73F911CE}:3.4.0.30","{62DD0A97-FDD4-421b-94A5-D1A9434450C7}:3.6.0.16","{515d1883-7376-4db3-b710-8d76a27231b1}:3.6.0.13","searchme@mybrowserbar.com:3.4.0.30","{DBFBF2B3-E522-4520-93B4-BA130FCCFD6D}:3.6.0.5","searchme@mybrowserbar.com:3.5.0.3","{b0b7ad14-1326-4fcc-ab3c-7b61bc3ec444}:3.6.0.16"],"unblocked":[]},"schema":1610541485715,"key_format":"{guid}:{version}","stash_time":1610627709203,"id":"afe5009a-8a2c-4a2a-8f19-d67f8cdd6fb2","last_modified":1610627879132},{"stash":{"blocked":["{24d84c9d-8472-472e-a9ef-8e4f16e8e995}:0.6","{276ea011-69eb-4a56-b687-c86478772a96}:0.6","{dd41b0da-197a-4330-85a7-9a5c0d69b157}:0.6","{5773b5f8-f9b8-4e6d-94cf-85cce03e4bb4}:0.8","{d5221091-f8df-481d-8ba4-ce9e337e0ab9}:0.8","{89acb232-250e-4afa-b65e-f6f5caf21afa}:1.0.2","{a0d000d6-9d78-494c-b5ba-4e0da94af6b7}:0.6","{d285627b-5dda-4baf-8315-3542ee5b3b79}:0.8","{e1c8eac4-9ddf-4ae1-a298-8834d08e2cfe}:0.8","{0cf942a0-f59d-497d-a336-2f672c37fcad}:0.6","{125f5269-2f69-401e-b072-40be97188078}:0.4.5","{230a5283-ab42-49a2-8860-b06d797917c7}:0.6","{3dec0353-9766-40d8-9351-629789a5ad1c}:0.7","{77a5a325-ee90-4b2c-b4bb-7f96bfbf2735}:0.8","{e0985fce-6352-4798-aae5-a3c346ecaaa9}:1.1.1","{4922fc25-9175-4c7b-aa31-f04797b0244b}:0.8","{9d02017d-80f1-421f-b441-f63fbe6b6ed1}:0.8","{6fb62b49-a2ae-44b4-970a-cf37491dadea}:0.6","{7e7c7b61-cda2-4c30-a448-80a9609b1806}:0.6","{82f6ab32-57ac-459e-a157-7f0a141d70fe}:0.4.4","{89b6df65-c157-4bb5-a2e8-4039490713bb}:0.6","{125f5269-2f69-401e-b072-40be97188078}:0.4.4","{60bc80e8-0735-4e76-98c7-fd097e72dfff}:0.8"],"unblocked":["browser-mon@xdman.sourceforge.net:2.1","browser-mon@xdman.sourceforge.net:1.4.1","browser-mon@xdman.sourceforge.net:1.5","browser-mon@xdman.sourceforge.net:2.0","browser-mon@xdman.sourceforge.net:1.4"]},"schema":1610480491282,"key_format":"{guid}:{version}","stash_time":1610541311225,"id":"970bccef-0d6b-45c9-be3b-10bee4b25a9e","last_modified":1610541485668},{"stash":{"blocked":["{d9b84c91-b49e-4294-97f0-af503d41ee70}:3.5.11","browser-mon@xdman.sourceforge.net:1.5","{24912aaa-d0e6-468f-ae3b-bc30c6cf208f}:0.6","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.1.2","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.2.0","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.0.6","browser-mon@xdman.sourceforge.net:2.0","browser-mon@xdman.sourceforge.net:1.4.1","{d9b84c91-b49e-4294-97f0-af503d41ee70}:3.5.12","newtabsearchwebnew@realtimepackagetracker.com:1.0.1","search-engin-picker@addon:1.0","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.2.1","{3ec925f3-200e-4b55-9daf-18fa4b383d89}:0.7","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.1.1","{d9b84c91-b49e-4294-97f0-af503d41ee70}:3.5.10","newtabsearchwebnew@realtimepackagetracker.com:1.0.0","{d9b84c91-b49e-4294-97f0-af503d41ee70}:3.5.13","browser-mon@xdman.sourceforge.net:2.1","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.0.8","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.0.9","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.1.0","{d835b809-10ad-40bc-a261-81df00e5f848}:0.9","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.0.5","{d9b84c91-b49e-4294-97f0-af503d41ee70}:3.5.14","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.0.7","{1e5e51a8-e7e9-4fe1-a683-462422abe05d}:1.2.2","browser-mon@xdman.sourceforge.net:1.4"],"unblocked":[]},"schema":1610307694439,"key_format":"{guid}:{version}","stash_time":1610476509860,"id":"276fe166-6050-4afe-a5ff-0e4601fc25a6","last_modified":1610476682530},{"stash":{"blocked":["{d836bb26-414c-42e2-9010-ad89c5aa6afb}:2.1","{d836bb26-414c-42e2-9010-ad89c5aa6afb}:2.0"],"unblocked":[]},"schema":1610134890207,"key_format":"{guid}:{version}","stash_time":1610152509622,"id":"8f88a597-328d-4057-843e-1c9f9510da2b","last_modified":1610152677926},{"stash":{"blocked":["{034b4a48-a522-43a6-a3e3-842c7fd67863}:2.6","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.4","{0c0e26f3-7f75-43b5-a7c2-22e2b3429067}:1.2","{dde15009-d20a-44e3-89c3-94ebb39a6e48}:1.1","{eb7a4078-a5b4-4191-be02-5bc06ef00c7f}:1.8","{624120ee-d5aa-4aef-a192-a54ac28da835}:1.0","{77a51de1-939b-4fc6-b277-039b499d1bf2}:1.1","{431be38a-8eab-4602-9cd0-9ab9682dfdc6}:1.3","{77a51de1-939b-4fc6-b277-039b499d1bf2}:1.0","{a13bfd70-f2c8-4ed5-8725-87bad020519e}:1.1","{431be38a-8eab-4602-9cd0-9ab9682dfdc6}:1.0","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.2","{0c0e26f3-7f75-43b5-a7c2-22e2b3429067}:1.0","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.0","{7be089c1-1849-420d-87fc-42b6c5d4c049}:1.2","{7a2b38e1-4d2b-4220-9cb5-c2795aab0d89}:1.0","{169603cc-2d16-48d2-a6de-4be354841f00}:1.4","{b104f2f7-126f-4fe0-b0b1-241c5771c801}:1.2","{556bcd61-2c26-4b08-9092-621334006f07}:1.0","{1afd3b73-75d2-407c-9942-deeeedf92a9e}:1.1","{b104f2f7-126f-4fe0-b0b1-241c5771c801}:1.1","jid1-MIAJd5BiK7V4Pw@jetpack:0.9.2","{b104f2f7-126f-4fe0-b0b1-241c5771c801}:1.0","@CyberSearch-ext:1.0.0","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.5","{169603cc-2d16-48d2-a6de-4be354841f00}:1.1","{1afd3b73-75d2-407c-9942-deeeedf92a9e}:1.0","{77a51de1-939b-4fc6-b277-039b499d1bf2}:1.2","{169603cc-2d16-48d2-a6de-4be354841f00}:1.5","{431be38a-8eab-4602-9cd0-9ab9682dfdc6}:1.2","{034b4a48-a522-43a6-a3e3-842c7fd67863}:2.8","jid1-MIAJd5BiK7V4Pw@jetpack:0.9.3","{6e1ddd1e-7d2c-4207-bb50-3c183e823e5d}:1.0","{9ec19675-ae4c-4c90-a066-2e400f6e286b}:1.0","{6e4f4a3d-dc55-4315-9915-2db61587cfc1}:1.2","{dda0f40c-a83b-491a-851d-af8ccb379a8c}:1.1","{7be089c1-1849-420d-87fc-42b6c5d4c049}:1.0","{8fb7ee22-555c-463b-b534-1c6461449617}:1","{6e1ddd1e-7d2c-4207-bb50-3c183e823e5d}:1.1","{7be089c1-1849-420d-87fc-42b6c5d4c049}:1.3","{034b4a48-a522-43a6-a3e3-842c7fd67863}:1.0","{7a2b38e1-4d2b-4220-9cb5-c2795aab0d89}:1.1","{02b39b37-7cf6-45c3-9179-996c3c37b491}:1.0","{a13bfd70-f2c8-4ed5-8725-87bad020519e}:1.0","{dde15009-d20a-44e3-89c3-94ebb39a6e48}:1.0","{7473192b-b08b-496c-a849-0bb0d14dafc3}:1.0","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.3","{7be089c1-1849-420d-87fc-42b6c5d4c049}:1.1","{6e4f4a3d-dc55-4315-9915-2db61587cfc1}:1.0","{49a8bb11-4887-42fb-b16d-d6bf74fd4313}:1.0","{307d047e-2591-4c33-86ff-819fd8c747ac}:1.0","{eb7a4078-a5b4-4191-be02-5bc06ef00c7f}:1.9","{dda0f40c-a83b-491a-851d-af8ccb379a8c}:1.0","{ab96b384-a512-42cc-8738-18ea3d6a89e5}:1.0","{289c0c00-0624-44ae-ae98-2979546b3aa6}:1.1","{431be38a-8eab-4602-9cd0-9ab9682dfdc6}:1.4","{289c0c00-0624-44ae-ae98-2979546b3aa6}:1.0","{fda05e53-fb52-47d4-9672-146a642c7f54}:1.6","{ab96b384-a512-42cc-8738-18ea3d6a89e5}:1.1"],"unblocked":[]},"schema":1610044676214,"key_format":"{guid}:{version}","stash_time":1610130909877,"id":"4d3bd580-fdc7-4c93-9d41-22b55ff28cbd","last_modified":1610131079523},{"stash":{"blocked":["{06d4cb25-df8d-47b8-b37d-3abc403ed785}:1.0.8","{bdb812b0-e758-43f0-92ef-55e847f4710a}:2.16","{f2033592-c40c-437b-b447-2e179cf2ca30}:1.2.6","{805448c0-d89d-4289-b561-fd5e59afec86}:2.7.18","{805448c0-d89d-4289-b561-fd5e59afec86}:2.7.17","{06d4cb25-df8d-47b8-b37d-3abc403ed785}:1.0.7","{bdb812b0-e758-43f0-92ef-55e847f4710a}:2.17"],"unblocked":[]},"schema":1609962090400,"key_format":"{guid}:{version}","stash_time":1610044510227,"id":"adbb78d7-2f1b-4f72-aae0-23f8103e7711","last_modified":1610044676159},{"stash":{"blocked":["{b832a00e-8eb4-4c83-ae10-fc7b620078be}:1.53","{b832a00e-8eb4-4c83-ae10-fc7b620078be}:1.52","{c4fad22d-460f-465f-abeb-76a18604314e}:1.1.4","{b832a00e-8eb4-4c83-ae10-fc7b620078be}:1.54"],"unblocked":[]},"schema":1609936740545,"key_format":"{guid}:{version}","stash_time":1609958108910,"id":"a74cd41e-925e-4921-9bcf-1c50382fada4","last_modified":1609958353197},{"stash":{"blocked":["{b6d90033-5c73-4f13-a7d4-47fab3038cfe}:1.6","{084d3f7f-0c8f-4138-9ae3-24465605f735}:1.0","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.27","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.25","{084d3f7f-0c8f-4138-9ae3-24465605f735}:1.1","{b6d90033-5c73-4f13-a7d4-47fab3038cfe}:1.5","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.31","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.28","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.23","{b6d90033-5c73-4f13-a7d4-47fab3038cfe}:1.0.0","{3cd26bac-fd3d-4978-9279-517e219df132}:1.0.0.29"],"unblocked":[]},"schema":1609847198889,"key_format":"{guid}:{version}","stash_time":1609936510814,"id":"e1347a42-e173-402b-bf5d-f3c00a6458e7","last_modified":1609936740497},{"stash":{"blocked":["{4ba3b5e1-bc5b-4e59-b8b2-4c1de38fb5fe}:1.3","movies-suggest@addon:1.0","{4ba3b5e1-bc5b-4e59-b8b2-4c1de38fb5fe}:1.1","{3fc3b7f8-4749-4e54-a18f-3e12b9ed0db3}:1.0","{4ba3b5e1-bc5b-4e59-b8b2-4c1de38fb5fe}:1.2","{4ba3b5e1-bc5b-4e59-b8b2-4c1de38fb5fe}:1.0"],"unblocked":[]},"schema":1609616497459,"key_format":"{guid}:{version}","stash_time":1609763713027,"id":"70ccd414-e031-4569-8b23-adba5b522a0c","last_modified":1609763911689},{"stash":{"blocked":["{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.44","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.3","search@freeweathersearcher.com:1.1.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.1","{CE2DE70F-9351-4057-B6D8-B14BB34DD401}:1.0.1","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.43","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.42","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.1","{4356F7E9-22F2-477E-86BA-BD25350DCC22}:1.0.0","extension@searchsecurer.com:1.0.10","{6300fcbc-5f02-4735-81ec-896350de01a6}:1.0.1","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.2.7","{4b6085bd-3ad2-4583-a8c4-abfd61970ebd}:0.6","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.4","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.5","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.1","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.4","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.2","{8A053236-CE57-4686-8C6B-C3BC8EB0E75E}:1.0.0","{8aebfd17-13a7-4651-8ce8-1826f5cd1c19}:1.7","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.2","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.5","{be6788f3-e106-43d0-9d27-9c4811931588}:0.0.31","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.3","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.1","extension@searchsecurer.com:1.0.9","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.8","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.5","extension@searchsecurer.com:1.1.3","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.2","{9179905e-606f-453a-b204-35adb53a8152}:0.1.100.102","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.1","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.3","@baboomsearch:1.1.2","{eb900458-3122-443c-ab4e-3a36f0d1968f}:1.2","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.4","{788c4081-e227-43c4-853a-1733a2eca513}:3.2","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.41","{aeb932ec-7ec1-4c96-a44d-ba053097a4a3}:1.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.3","{ef86f2ef-dcf4-4a75-884d-fb1f67858b4b}:1.2.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.6.0","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.7","{aeb932ec-7ec1-4c96-a44d-ba053097a4a3}:1.0","{64c9344c-9645-47b4-9603-ef6d51339ce6}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.5.0","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:1.0","{788c4081-e227-43c4-853a-1733a2eca513}:1.3","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.1","{CE2DE70F-9351-4057-B6D8-B14BB34DD401}:1.0.0","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.0.2","{788c4081-e227-43c4-853a-1733a2eca513}:0.11","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.7","{788c4081-e227-43c4-853a-1733a2eca513}:4.61","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.5","app@ConvertirArchivos:1.0.2","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.8","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.2.0","{788c4081-e227-43c4-853a-1733a2eca513}:2.3","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.96","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.1","{6b5c7804-ccb1-4201-92b5-051c87816c61}:1.3","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.1.0","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.6","{5cedfd0c-e90f-4cab-a1ff-805733935a1a}:5.95","{8eb8fd41-144c-4ffd-b885-1b79d5e03b20}:1.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.2.5","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.4","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.6","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.2","{3983F47C-2A53-4FF0-9808-FB0B7D89443C}:1.0.1","@noicetab:1.9.2.0","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.3","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.6.5","{293dc6f6-b90a-4ea6-9ea2-fe618d1ecad1}:1.2.0","{49bbdc35-496e-46f7-b9c1-5db7a47adbbe}:1.2","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.5","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.0","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.1","search@quickeasypdf.com:0.0.5","search@quickeasypdf.com:0.0.4","{9b046088-82e9-4a82-a619-d7705091b942}:1.0.0.6","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.51","search@freecouponsearcher.com:1.1.0","{38DFCD31-215F-4CB4-9246-9B9772FDA728}:1.0.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:4.5.1","{c6e11521-fe0f-423f-857f-ba9a5dc48384}:1.4","extension@searchsecurer.com:1.0.0","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.4","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.5","{a113235c-ef37-4e9c-ac7e-b320163539e9}:1.3","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.1.2","extension@searchsecurer.com:1.1.2","{eb900458-3122-443c-ab4e-3a36f0d1968f}:1.1","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.4.0","extension@searchsecurer.com:1.0.11","{6e22a85a-1281-4cb5-8915-88f02b8cd19e}:1.0.0.5","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.3.0","@noicetab:1.10.0.0","{9b5bdaba-545f-4f48-bb75-5d90a9fb44ce}:1.3.3","{b8b035b5-3406-402e-a0e2-8094c0d58933}:1.5.0","{14fae57e-4122-4f32-961b-9892ce7c1bee}:1.6.3","{1dfa5658-a1ad-41fe-9d26-9699586001f3}:1.0.9","{6b5c7804-ccb1-4201-92b5-051c87816c61}:1.3.3","{6300fcbc-5f02-4735-81ec-896350de01a6}:1.0.2","{adb8f8c4-f90f-4cce-8d7a-b270df97e074}:3.1.6","{4c84099d-766a-40b4-a8e0-f90c4cdf4040}:1.0","{788c4081-e227-43c4-853a-1733a2eca513}:4.6","{788c4081-e227-43c4-853a-1733a2eca513}:2.2"],"unblocked":[]},"schema":1608208705099,"key_format":"{guid}:{version}","stash_time":1608230110944,"id":"745e18c2-75d4-44fc-a1d7-954d0abb92d8","last_modified":1608230359579},{"stash":{"blocked":["{5849fc76-08e3-4d14-9d43-6bba81fd99f0}:0.6","{277c5cb0-631b-4cd2-a06c-634bb76aaa4b}:0.6"],"unblocked":[]},"schema":1608061293771,"key_format":"{guid}:{version}","stash_time":1608208509548,"id":"e943c577-ed0b-4c21-acd4-b074c72402ec","last_modified":1608208705056},{"stash":{"blocked":["{64fcf02f-041f-4e91-8ba8-d55eded72a9e}:3.0.0"],"unblocked":[]},"schema":1607992710456,"key_format":"{guid}:{version}","stash_time":1608057322815,"id":"c5b01b4e-f5f7-4313-bc80-0a69d8c9c3ad","last_modified":1608057532329},{"stash":{"blocked":["{f40659b4-6c2d-4c01-bacb-2e0ba34c94e0}:1.0.1"],"unblocked":[]},"schema":1607959877005,"key_format":"{guid}:{version}","stash_time":1607992509477,"id":"2169fb74-a1b4-4347-ac42-9984e16b766a","last_modified":1607992710411},{"stash":{"blocked":["@vkuniversaldownloader:1.17","@vkuniversaldownloader:1.45","@vkuniversaldownloader:1.0","@vkuniversaldownloader:1.9","@vkuniversaldownloader:1.26","@vkuniversaldownloader:1.38","@vkuniversaldownloader:1.34","@vkuniversaldownloader:1.37","@vkuniversaldownloader:1.21","@vkuniversaldownloader:1.27","@vkuniversaldownloader:1.39","@vkuniversaldownloader:1.48","@vkuniversaldownloader:1.11","@vkuniversaldownloader:1.29","@vkuniversaldownloader:1.46","@vkuniversaldownloader:1.18","@vkuniversaldownloader:1.30","@vkuniversaldownloader:1.44","@vkuniversaldownloader:1.33","@vkuniversaldownloader:1.12","@vkuniversaldownloader:1.36","@vkuniversaldownloader:1.19","@vkuniversaldownloader:1.41","@vkuniversaldownloader:1.13","@vkuniversaldownloader:1.16","@vkuniversaldownloader:1.43","@vkuniversaldownloader:1.25","@vkuniversaldownloader:1.10","@vkuniversaldownloader:1.49","@vkuniversaldownloader:1.20","@vkuniversaldownloader:1.31","@vkuniversaldownloader:1.6","@vkuniversaldownloader:1.42","@vkuniversaldownloader:1.23","@vkuniversaldownloader:1.28","@vkuniversaldownloader:1.15","@vkuniversaldownloader:1.1","@vkuniversaldownloader:1.8","@vkuniversaldownloader:1.7","@vkuniversaldownloader:1.40","@vkuniversaldownloader:1.14","@vkuniversaldownloader:1.47","@vkuniversaldownloader:1.24","@vkuniversaldownloader:1.5","@vkuniversaldownloader:1.3","@vkuniversaldownloader:1.32","@vkuniversaldownloader:1.22","@vkuniversaldownloader:1.35"],"unblocked":[]},"schema":1607888491138,"key_format":"{guid}:{version}","stash_time":1607949310449,"id":"c760bc2d-c71e-4206-be35-672f4c73e9c9","last_modified":1607949518837},{"stash":{"blocked":["{2982a5a8-62c0-413f-b51b-204013722511}:2.3.3","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.2","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.3","{2982a5a8-62c0-413f-b51b-204013722511}:2.3.4","{011f65f0-7143-470a-83ca-20ec4297f3f4}:2.3.4"],"unblocked":[]},"schema":1607715696348,"key_format":"{guid}:{version}","stash_time":1607862909181,"id":"b2b46539-8eaf-4ba0-8115-14dfa6f8c2b4","last_modified":1607863109093},{"stash":{"blocked":[],"unblocked":[]},"schema":1607517521762,"key_format":"{guid}:{version}","stash_time":1607538909472,"id":"aaf3380c-7ac6-43a7-be44-82a1195e95dd","last_modified":1607539165992},{"stash":{"blocked":["{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.9.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.0.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:4.14.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.3.1","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.5.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.1.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.7.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.4.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.2.0","{a15e6a4f-ef90-4ce5-b9cf-c202e9db0896}:5.3.2"],"unblocked":[]},"schema":1607462847383,"key_format":"{guid}:{version}","stash_time":1607517309357,"id":"73f87ff1-0625-4efa-beae-3cb1d0abfe26","last_modified":1607517521721},{"stash":{"blocked":["{461b09d3-9f69-4778-889d-6c6c7212b970}:1.0","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.2","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.3","{461b09d3-9f69-4778-889d-6c6c7212b970}:1.1","{eee03ab2-df0e-4d66-ab9b-404b4cfbb52d}:1.0"],"unblocked":[]},"schema":1607370095452,"key_format":"{guid}:{version}","stash_time":1607452512106,"id":"29f021a3-5e70-4fd9-aa43-b900913fa8a2","last_modified":1607452775945},{"schema":1607085666461,"attachment":{"hash":"481519c28921adb7ba1e19d8ffe9d1869274f19beb1dab91adc246d51e622ef1","size":800295,"filename":"filter.bin","location":"staging/addons-bloomfilters/df53c91c-b598-46a1-8ca9-32bdbb646258.bin","mimetype":"application/octet-stream"},"key_format":"{guid}:{version}","attachment_type":"bloomfilter-base","generation_time":1607085311428,"id":"0930be19-8b19-486a-82c6-06f3a656cbf5","last_modified":1607085668743}]}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/services/settings/dumps/main/search-config.json firefox-85.0+build1/services/settings/dumps/main/search-config.json
--- firefox-84.0.2+build1/services/settings/dumps/main/search-config.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/settings/dumps/main/search-config.json	2021-01-18 19:58:19.000000000 +0000
@@ -1 +1 @@
-{"data":[{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-d"},{"name":"q","value":"{searchTerms}"}]},"schema":1605047692074,"appliesTo":[{"default":"yes-if-no-other","included":{"everywhere":true}},{"override":true,"orderHint":2000,"application":{"distributions":["MozillaOnline"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"included":{"everywhere":true},"application":{"channel":["esr"]},"telemetryId":"google-b-e"},{"default":"no","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"],"telemetryId":"google"}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"default":"no","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"],"telemetryId":"google"},"application":{"channel":["esr"]}},{"default":"no","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"default":"no","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]},"application":{"channel":["esr"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-1-d"},{"name":"q","value":"{searchTerms}"}]},"included":{"regions":["us"]},"extraParams":[{"name":"channel","pref":"google_channel_us","condition":"pref"}],"telemetryId":"google-b-1-d"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-1-e"},{"name":"q","value":"{searchTerms}"}]},"included":{"regions":["us"]},"application":{"channel":["esr"]},"extraParams":[{"name":"channel","pref":"google_channel_us","condition":"pref"}],"telemetryId":"google-b-1-e"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-oem1"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-oem1","sweetlabs-r-oem1"]},"telemetryId":"google-sweetlabs"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-oem2"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-oem2","sweetlabs-r-oem2"]},"telemetryId":"google-sweetlabs"},{"params":{"searchUrlGetParams":[{"name":"client","value":"ubuntu"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]},"extraParams":[{"name":"channel","value":"fs"}],"telemetryId":"google-canonical"}],"extraParams":[{"name":"channel","pref":"google_channel_row","condition":"pref"}],"telemetryId":"google-b-d","webExtension":{"id":"google@search.mozilla.org"},"id":"cb8e7210-9f0b-48fa-8708-b9a03df79eea","last_modified":1605203142486},{"params":{"searchUrlGetParams":[{"name":"tn","value":"monline_7_dg"},{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"monline_7_dg"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"schema":1604950920293,"appliesTo":[{"params":{"searchUrlGetParams":[{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"monline_4_dg"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"default":"yes","override":true,"orderHint":3000,"application":{"distributions":["MozillaOnline"]},"extraParams":[{"name":"tn","value":"monline_4_dg","purpose":"searchbar","condition":"purpose"},{"name":"tn","value":"monline_3_dg","purpose":"homepage","condition":"purpose"},{"name":"tn","value":"monline_3_dg","purpose":"newtab","condition":"purpose"}]},{"included":{"locales":{"matches":["zh-CN"]}}},{"default":"yes","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]}},{"params":{"searchUrlGetParams":[{"name":"tn","value":"ubuntuu_cb"},{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"ubuntuu_cb"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}},{"default":"no","override":true,"application":{"distributions":["acer-001","acer-002","acer-g-003"]}}],"telemetryId":"baidu","webExtension":{"id":"baidu@search.mozilla.org"},"id":"52dd490a-89e8-45f2-96b0-f2c72e157526","last_modified":1605203142482},{"schema":1599470446693,"appliesTo":[{"included":{"locales":{"matches":["bn","bn-IN","kn","gu-IN","mr","pa-IN","ta","te","ur"]}},"telemetryId":"amazon-in","webExtension":{"locales":["in"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["fr"]},"telemetryId":"amazon-france","webExtension":{"locales":["france"]}},{"included":{"locales":{"matches":["br","ff","fr","son","wo"]}},"telemetryId":"amazon-france","webExtension":{"locales":["france"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","br","cak","en-US","eo","es-AR","fa","ff","fr","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","son","th","tl","trs","uz","wo"]},"regions":["ca"]},"telemetryId":"amazon-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["en-CA"]}},"telemetryId":"amazon-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["ja-JP-macos","ja"]}},"telemetryId":"amazon-jp","webExtension":{"locales":["jp"]}},{"included":{"locales":{"matches":["it","lij"]}},"telemetryId":"amazon-it","webExtension":{"locales":["it"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]}},"telemetryId":"amazon-de","webExtension":{"locales":["de"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]}},"experiment":"amazon-de-adm","telemetryId":"amazon-de-adm","webExtension":{"locales":["de-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["gb"]},"telemetryId":"amazon-en-GB","webExtension":{"locales":["en-GB"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["gb"]},"experiment":"amazon-en-GB-adm","telemetryId":"amazon-en-GB-adm","webExtension":{"locales":["en-GB-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["cy","da","el","en-GB","eu","ga-IE","gd","gl","hr","nb-NO","nn-NO","pt-PT","sq","sr"]}},"telemetryId":"amazon-en-GB","webExtension":{"locales":["en-GB"]}},{"included":{"locales":{"matches":["cy","da","el","en-GB","eu","ga-IE","gd","gl","hr","nb-NO","nn-NO","pt-PT","sq","sr"]}},"experiment":"amazon-en-GB-adm","telemetryId":"amazon-en-GB-adm","webExtension":{"locales":["en-GB-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","cy","da","el","en-GB","en-US","eo","es-AR","eu","fa","ga-IE","gd","gl","gn","hr","hy-AM","ia","is","ka","km","lt","mk","ms","my","nb-NO","nn-NO","pt-PT","ro","si","sq","sr","th","tl","trs","uz"]},"regions":["au"]},"telemetryId":"amazon-au","webExtension":{"locales":["au"]}},{"params":{"searchUrlGetParams":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"ie","value":"{inputEncoding}"},{"name":"mode","value":"blended"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"sourceid","value":"Mozilla-search"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"webExtension":{"id":"amazon@search.mozilla.org"},"id":"a620b506-c3ae-4332-97bb-190a73868580","last_modified":1599574471325},{"schema":1599421304249,"appliesTo":[{"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}}},{"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}},"experiment":"amazondotcom-adm","telemetryId":"amazondotcom-adm","webExtension":{"locales":["en-adm"]},"sendAttributionRequest":true},{"params":{"searchUrlGetParams":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"ie","value":"{inputEncoding}"},{"name":"mode","value":"blended"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"sourceid","value":"Mozilla-search"}]},"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}},"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"telemetryId":"amazondotcom","webExtension":{"id":"amazondotcom@search.mozilla.org"},"id":"071c671c-7c1b-469d-a771-ab16ff6e8beb","last_modified":1599574471320},{"schema":1596483697391,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmx"]},"webExtension":{"locales":["de","shopping"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxcouk"]},"webExtension":{"locales":["en-GB"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxes"]},"webExtension":{"locales":["es"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxfr"]},"webExtension":{"locales":["fr"]}}],"webExtension":{"id":"gmx@search.mozilla.org"},"id":"1571e5fc-17e4-492b-b6d2-106d8669b6c8","last_modified":1597327602800},{"schema":1594312404762,"appliesTo":[{"included":{"locales":{"matches":["zh-CN"]}}},{"override":true,"orderHint":1500,"application":{"distributions":["MozillaOnline"]},"webExtension":{"locales":["mozillaonline"]}},{"params":{"searchUrlGetParams":[{"name":"ix","value":"sunray"},{"name":"pageletid","value":"headsearch"},{"name":"searchType","value":""},{"name":"Go.x","value":"0"},{"name":"Go.y","value":"0"},{"name":"bestSaleNum","value":"0"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"keywords","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"telemetryId":"amazondotcn","webExtension":{"id":"amazondotcn@search.mozilla.org"},"id":"ccb137f1-7733-464c-bb70-037be4ba2529","last_modified":1595254832070},{"schema":1594312388385,"appliesTo":[{"included":{"everywhere":true}},{"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]},"extraParams":[{"name":"t","value":"canonical"}]}],"extraParams":[{"name":"t","value":"ffcm","purpose":"contextmenu","condition":"purpose"},{"name":"t","value":"ffab","purpose":"keyword","condition":"purpose"},{"name":"t","value":"ffsb","purpose":"searchbar","condition":"purpose"},{"name":"t","value":"ffhp","purpose":"homepage","condition":"purpose"},{"name":"t","value":"ffnt","purpose":"newtab","condition":"purpose"}],"telemetryId":"ddg","webExtension":{"id":"ddg@search.mozilla.org"},"id":"c0b26c0e-63e6-4235-b2ce-5f16b6a8bf87","last_modified":1595254832054},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZI"},{"name":"q","value":"{searchTerms}"}]},"schema":1592948527171,"appliesTo":[{"included":{"locales":{"matches":["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-macos","ja","ka","kab","km","kn","lij","lo","lt","mk","ms","my","nb-NO","ne-NP","nl","nn-NO","oc","pa-IN","pt-BR","rm","ro","son","sq","sr","sv-SE","th","tl","trs","uk","ur","uz","wo","xh","zh-CN"],"startsWith":["bn","en"]}}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL01"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem1","sweetlabs-b-r-oem1"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL02"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem2","sweetlabs-b-r-oem2"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL03"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem3","sweetlabs-b-r-oem3"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["acer-001","acer-002","acer-g-003"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZD"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["acer-001","acer-002"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZE"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["acer-g-003"]}},{"override":"true","orderHint":2500,"application":{"distributions":["MozillaOnline"]}}],"extraParams":[{"name":"form","value":"MOZCON","purpose":"contextmenu","condition":"purpose"},{"name":"form","value":"MOZSBR","purpose":"searchbar","condition":"purpose"},{"name":"form","value":"MOZSPG","purpose":"homepage","condition":"purpose"},{"name":"form","value":"MOZLBR","purpose":"keyword","condition":"purpose"},{"name":"form","value":"MOZTSB","purpose":"newtab","condition":"purpose"}],"webExtension":{"id":"bing@search.mozilla.org"},"id":"7ec766f6-639a-4618-91bc-33eb3d4378c6","last_modified":1593025575021},{"schema":1588177655532,"appliesTo":[{"included":{"locales":{"matches":["fr"]}},"orderHint":1500,"application":{"distributions":["qwant-001","qwant-002"]}}],"webExtension":{"id":"qwantjr@search.mozilla.org"},"id":"f59fddbc-580b-4672-9cda-32941ceec730","last_modified":1589299342073},{"schema":1588177692141,"appliesTo":[{"included":{"everywhere":true}},{"included":{"locales":{"matches":["af","an","ar","ast","az","bg","br","bs","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","lij","lo","lt","ltg","lv","mk","mr","ms","my","nl","oc","pl","rm","ro","ru","si","sk","sl","sq","sr","sv-SE","ta","te","th","tl","tr","uk","ur","uz","vi","wo","zh-CN","zh-TW"]}},"webExtension":{"locales":["$USER_LOCALE"]}},{"included":{"locales":{"matches":["be"]}},"webExtension":{"locales":["be","be-tarask"]}},{"included":{"locales":{"matches":["bn","bn-BD","bn-IN"]}},"webExtension":{"locales":["bn"]}},{"included":{"locales":{"matches":["ca","ca-valencia"]}},"webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["cak","es-AR","es-CL","es-ES","es-MX","trs"]}},"webExtension":{"locales":["es"]}},{"included":{"locales":{"matches":["cs"]}},"webExtension":{"locales":["cz"]}},{"included":{"locales":{"matches":["ff","fr","son"]}},"webExtension":{"locales":["fr"]}},{"included":{"locales":{"matches":["gu-IN"]}},"webExtension":{"locales":["gu"]}},{"included":{"locales":{"matches":["hi-IN"]}},"webExtension":{"locales":["hi"]}},{"included":{"locales":{"matches":["hy-AM"]}},"webExtension":{"locales":["hy"]}},{"included":{"locales":{"matches":["ja-JP-macos","ja"]}},"webExtension":{"locales":["ja"]}},{"included":{"locales":{"matches":["ko"]}},"webExtension":{"locales":["kr"]}},{"included":{"locales":{"matches":["nb-NO"]}},"webExtension":{"locales":["NO"]}},{"included":{"locales":{"matches":["ne-NP"]}},"webExtension":{"locales":["ne"]}},{"included":{"locales":{"matches":["nn-NO"]}},"webExtension":{"locales":["NN"]}},{"included":{"locales":{"matches":["pa-IN"]}},"webExtension":{"locales":["pa"]}},{"included":{"locales":{"matches":["pt-BR","pt-PT"]}},"webExtension":{"locales":["pt"]}},{"override":true,"orderHint":1000,"application":{"distributions":["MozillaOnline"]}}],"webExtension":{"id":"wikipedia@search.mozilla.org"},"id":"3f3beb1d-e32e-40a4-b6ed-56741803e1d8","last_modified":1589299342069},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.com/sch/{searchTerms}"}]},"schema":1588177687783,"appliesTo":[{"included":{"locales":{"matches":["en-US"]},"regions":["us"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.es/sch/{searchTerms}"}]},"included":{"locales":{"matches":["an","ast","ca","ca-valencia","es-ES","eu","gl"]}},"telemetryId":"ebay-es","webExtension":{"locales":["es"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.fr/sch/{searchTerms}"}]},"included":{"locales":{"matches":["br","fr","wo"]}},"telemetryId":"ebay-fr","webExtension":{"locales":["fr"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.befr.ebay.be/sch/{searchTerms}"}]},"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["be"]},"telemetryId":"ebay-be","webExtension":{"locales":["be"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ca/sch/{searchTerms}"}]},"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["ca"]},"telemetryId":"ebay-ca","webExtension":{"locales":["ca"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ch/sch/{searchTerms}"}]},"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["ch"]},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.co.uk/sch/{searchTerms}"}]},"included":{"locales":{"matches":["cy","en-GB","gd"]}},"telemetryId":"ebay-uk","webExtension":{"locales":["uk"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.co.uk/sch/{searchTerms}"}]},"included":{"locales":{"matches":["en-US"]},"regions":["gb"]},"telemetryId":"ebay-uk","webExtension":{"locales":["uk"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.com.au/sch/{searchTerms}"}]},"included":{"locales":{"matches":["cy","en-GB","en-US","gd"]},"regions":["au"]},"telemetryId":"ebay-au","webExtension":{"locales":["au"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ie/sch/{searchTerms}"}]},"included":{"locales":{"matches":["cy","en-GB","en-US","gd"]},"regions":["ie"]},"telemetryId":"ebay-ie","webExtension":{"locales":["ie"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.de/sch/{searchTerms}"}]},"included":{"locales":{"matches":["de","dsb","hsb"]}},"telemetryId":"ebay-de","webExtension":{"locales":["de"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.at/sch/{searchTerms}"}]},"included":{"locales":{"matches":["de","dsb","hsb"]},"regions":["at"]},"telemetryId":"ebay-at","webExtension":{"locales":["at"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]},"regions":["ch"]},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ca/sch/{searchTerms}"}]},"included":{"locales":{"matches":["en-CA"]}},"telemetryId":"ebay-ca","webExtension":{"locales":["ca"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.nl/sch/{searchTerms}"}]},"included":{"locales":{"matches":["fy-NL","nl"]}},"telemetryId":"ebay-nl","webExtension":{"locales":["nl"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.nl/sch/{searchTerms}"}]},"included":{"locales":{"matches":["en-US"]},"regions":["nl"]},"telemetryId":"ebay-nl","webExtension":{"locales":["nl"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.befr.ebay.be/sch/{searchTerms}"}]},"included":{"locales":{"matches":["fy-NL","nl"]},"regions":["be"]},"telemetryId":"ebay-be","webExtension":{"locales":["be"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ie/sch/{searchTerms}"}]},"included":{"locales":{"matches":["ga-IE"]}},"telemetryId":"ebay-ie","webExtension":{"locales":["ie"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.it/sch/{searchTerms}"}]},"included":{"locales":{"matches":["it","lij"]}},"telemetryId":"ebay-it","webExtension":{"locales":["it"]}},{"params":{"searchUrlGetParams":[{"name":"ff3","value":"4"},{"name":"toolid","value":"20004"},{"name":"campid","value":"5338192028"},{"name":"customid","value":""},{"name":"mpre","value":"https://www.ebay.ch/sch/{searchTerms}"}]},"included":{"locales":{"matches":["rm"]}},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}}],"webExtension":{"id":"ebay@search.mozilla.org"},"id":"cbe309e0-f638-4996-9dfc-ea5c19ef16e9","last_modified":1589299342060},{"schema":1589053296453,"appliesTo":[{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-drp"]},"extraParams":[{"name":"clid","value":"2039342","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-planb"]},"extraParams":[{"name":"clid","value":"1857376","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-portals"]},"extraParams":[{"name":"clid","value":"1923034","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-ru"]},"extraParams":[{"name":"clid","value":"1923018","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr"]},"extraParams":[{"name":"clid","value":"1953197","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr-gezginler"]},"extraParams":[{"name":"clid","value":"1945716","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr-tamindir"]},"extraParams":[{"name":"clid","value":"1945686","purpose":"searchbar","condition":"purpose"}]},{"default":"yes","included":{"locales":{"matches":["uk"]}},"application":{"distributions":["yandex-uk"]},"extraParams":[{"name":"clid","value":"1923018","purpose":"searchbar","condition":"purpose"}],"webExtension":{"locales":["ua"]}},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-ru-mz"]},"extraParams":[{"name":"clid","value":"2320519","purpose":"searchbar","condition":"purpose"}]},{"default":"yes","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"]},"telemetryId":"yandex-en","webExtension":{"locales":["en"]}},{"included":{"locales":{"matches":["az"]}},"telemetryId":"yandex-az","webExtension":{"locales":["az"]}},{"included":{"locales":{"matches":["be"]}},"telemetryId":"yandex-by","webExtension":{"locales":["by"]}},{"included":{"locales":{"matches":["kk"]}},"telemetryId":"yandex-kk","webExtension":{"locales":["kk"]}},{"included":{"locales":{"matches":["ru"]}},"telemetryId":"yandex-ru","webExtension":{"locales":["ru"]}},{"included":{"locales":{"matches":["tr"]}},"telemetryId":"yandex-tr","webExtension":{"locales":["tr"]}},{"default":"no","override":true,"application":{"distributions":["mailru-001","okru-001"]}}],"extraParams":[{"name":"clid","value":"2186618","purpose":"searchbar","condition":"purpose"},{"name":"clid","value":"2186621","purpose":"keyword","condition":"purpose"},{"name":"clid","value":"2186623","purpose":"contextmenu","condition":"purpose"},{"name":"clid","value":"2186617","purpose":"homepage","condition":"purpose"},{"name":"clid","value":"2186620","purpose":"newtab","condition":"purpose"}],"webExtension":{"id":"yandex@search.mozilla.org"},"id":"a0e7f96a-14e0-4d56-9f54-e0c7e49fd306","last_modified":1589299342036},{"schema":1588177656482,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}},{"default":"yes","included":{"locales":{"matches":["ru"]}},"application":{"distributions":["mailru-001"]},"webExtension":{"locales":["mailru001"]}},{"default":"yes","included":{"locales":{"matches":["az"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-az"]}},{"default":"yes","included":{"locales":{"matches":["en-US"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-en-US"]}},{"default":"yes","included":{"locales":{"matches":["hy-AM"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-hy-AM"]}},{"default":"yes","included":{"locales":{"matches":["kk"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-kk"]}},{"default":"yes","included":{"locales":{"matches":["ro"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-ro"]}},{"default":"yes","included":{"locales":{"matches":["ru"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-ru"]}},{"default":"yes","included":{"locales":{"matches":["tr"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-tr"]}},{"default":"yes","included":{"locales":{"matches":["uk"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-uk"]}},{"default":"yes","included":{"locales":{"matches":["uz"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-uz"]}}],"webExtension":{"id":"mailru@search.mozilla.org"},"id":"e0ca4964-e324-44e7-80b6-16a831706d17","last_modified":1589299342033},{"schema":1588177653636,"appliesTo":[{"included":{"locales":{"matches":["fr"]}}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefoxqwant"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"orderHint":2000,"application":{"distributions":["qwant-001","qwant-002"]}}],"webExtension":{"id":"qwant@search.mozilla.org"},"id":"f59fddbc-580b-4672-9cda-32941ceec729","last_modified":1589299342030},{"schema":1588177651820,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}},{"params":{"searchUrlGetParams":[{"name":"sourceid","value":"FF_3"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","included":{"locales":{"matches":["cs"]}},"application":{"distributions":["seznam"]}}],"webExtension":{"id":"seznam-cz@search.mozilla.org"},"id":"c50dcc87-0192-4461-bb88-17a55ba181c7","last_modified":1589299342027},{"schema":1588177648193,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["1und1"]}}],"webExtension":{"id":"1und1@search.mozilla.org"},"id":"e98c663d-408d-4901-9666-66e67a3084b4","last_modified":1589299342018},{"schema":1588177646165,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["webde"]}}],"webExtension":{"id":"webde@search.mozilla.org"},"id":"613d1391-4be5-4296-80e2-cfb740de6607","last_modified":1589299342015},{"schema":1588016493937,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["mail.com"]}}],"webExtension":{"id":"mailcom@search.mozilla.org"},"id":"62d232d5-304e-4c35-a4da-46626a9b54c2","last_modified":1589299342012},{"schema":1586273556552,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"rakuten@search.mozilla.org"},"id":"8551c432-c68d-4934-836e-98513ae4b4a5","last_modified":1586375636481},{"schema":1586273291150,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"oshiete-goo@search.mozilla.org"},"id":"daa695d9-3f38-494b-81f1-1f601bbe5163","last_modified":1586375636478},{"schema":1582890770937,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"allaannonser-sv-SE@search.mozilla.org"},"id":"69a82554-c9b4-4c84-98c7-80f86fa7174a","last_modified":1583937832369},{"schema":1582890771781,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"allegro-pl@search.mozilla.org"},"id":"d915b6bc-bbae-47a6-8323-1b2990ad0e57","last_modified":1583937832367},{"schema":1582890772625,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"atlas-sk@search.mozilla.org"},"id":"6cebcf52-2cfa-4da2-ae4d-2c845ebdbc0b","last_modified":1583937832365},{"schema":1582890773480,"appliesTo":[{"included":{"locales":{"matches":["az"]}}}],"webExtension":{"id":"azerdict@search.mozilla.org"},"id":"c1a6845f-015e-4e67-bc64-6e39a843643f","last_modified":1583937832363},{"schema":1582890774347,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"azet-sk@search.mozilla.org"},"id":"3c632ae9-f758-43b5-9d06-b9c1b6bc7105","last_modified":1583937832361},{"schema":1582890775198,"appliesTo":[{"included":{"locales":{"matches":["gd"]}}}],"webExtension":{"id":"bbc-alba@search.mozilla.org"},"id":"4ab14cdb-35ea-42dc-8500-110eb3088b89","last_modified":1583937832358},{"schema":1582890776067,"appliesTo":[{"included":{"locales":{"matches":["nb-NO","nn-NO"]}}}],"webExtension":{"id":"bok-NO@search.mozilla.org"},"id":"64ce88a6-fd55-48d1-85a9-724c753f5721","last_modified":1583937832356},{"schema":1582890776913,"appliesTo":[{"included":{"locales":{"matches":["fy-NL"]}},"webExtension":{"locales":["fy-NL"]}},{"included":{"locales":{"matches":["nl"]}},"webExtension":{"locales":["nl"]}}],"webExtension":{"id":"bolcom@search.mozilla.org"},"id":"3d0ab163-0808-4be0-b479-0900dcdc8e35","last_modified":1583937832354},{"schema":1582890777775,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"ceneji@search.mozilla.org"},"id":"d908d622-0387-4d36-8098-1a9e32c0c697","last_modified":1583937832352},{"schema":1582890778608,"appliesTo":[{"included":{"locales":{"matches":["en-GB"]}}}],"webExtension":{"id":"chambers-en-GB@search.mozilla.org"},"id":"270000f0-8527-4f98-aa17-879820209f68","last_modified":1583937832350},{"schema":1582890779439,"appliesTo":[{"included":{"locales":{"matches":["vi"]}}}],"webExtension":{"id":"coccoc@search.mozilla.org"},"id":"4e447f5a-9eb1-436e-8de1-9e4b4b709efb","last_modified":1583937832348},{"schema":1582890780276,"appliesTo":[{"included":{"locales":{"matches":["ko"]}}}],"webExtension":{"id":"daum-kr@search.mozilla.org"},"id":"0cdc44be-173a-4ca8-96e3-43e3000da75d","last_modified":1583937832346},{"schema":1582890781123,"appliesTo":[{"included":{"locales":{"matches":["ca","ca-valencia"]}}}],"webExtension":{"id":"diec2@search.mozilla.org"},"id":"055103b9-1f4a-43d0-9b99-5b8d7209b022","last_modified":1583937832343},{"schema":1582890781968,"appliesTo":[{"included":{"locales":{"matches":["es-AR","es-CL","es-ES"]}}}],"webExtension":{"id":"drae@search.mozilla.org"},"id":"3d27c51f-83d4-43be-af84-4d7a51c5a8e4","last_modified":1583937832341},{"schema":1582890782823,"appliesTo":[{"included":{"locales":{"matches":["de"]}}}],"webExtension":{"id":"ecosia@search.mozilla.org"},"id":"1fc1b257-3e6b-4cfb-a323-64c1429bcf51","last_modified":1583937832339},{"schema":1582890783661,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"eki-ee@search.mozilla.org"},"id":"63b74323-1d14-4989-921f-7cc32bfee072","last_modified":1583937832336},{"schema":1582890784534,"appliesTo":[{"included":{"locales":{"matches":["hr"]}}}],"webExtension":{"id":"eudict@search.mozilla.org"},"id":"5cd4781c-2906-4fe7-9d4b-ea9ddbdc2c3b","last_modified":1583937832334},{"schema":1582890785390,"appliesTo":[{"included":{"locales":{"matches":["gd"]}}}],"webExtension":{"id":"faclair-beag@search.mozilla.org"},"id":"6491a2b8-c487-4798-a817-a0fd08b40ee2","last_modified":1583937832332},{"schema":1582890786256,"appliesTo":[{"included":{"locales":{"matches":["kk"]}}}],"webExtension":{"id":"flip@search.mozilla.org"},"id":"d045762c-52ac-4c16-8ca3-072aecea83da","last_modified":1583937832330},{"schema":1582890787108,"appliesTo":[{"included":{"locales":{"matches":["br"]}}}],"webExtension":{"id":"freelang@search.mozilla.org"},"id":"ed6a0f8c-e496-4d9c-936c-b906892e3d23","last_modified":1583937832327},{"schema":1582890787961,"appliesTo":[{"included":{"locales":{"matches":["nn-NO","nb-NO"]}}}],"webExtension":{"id":"gulesider-NO@search.mozilla.org"},"id":"f458e78b-9128-4027-b344-538f5661c148","last_modified":1583937832325},{"schema":1582890788795,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}}],"webExtension":{"id":"heureka-cz@search.mozilla.org"},"id":"b9a718b5-fc78-40b8-b1c3-2e15d2009f5c","last_modified":1583937832323},{"schema":1582890789635,"appliesTo":[{"included":{"locales":{"matches":["uk"]}}}],"webExtension":{"id":"hotline-ua@search.mozilla.org"},"id":"da2ec2d3-6c5c-4191-b428-351fbea8aeba","last_modified":1583937832321},{"schema":1582890790469,"appliesTo":[{"included":{"locales":{"matches":["kn"]}}}],"webExtension":{"id":"kannadastore@search.mozilla.org"},"id":"ae1cfae5-0516-41c0-99af-fd3d92a77aa8","last_modified":1583937832318},{"schema":1582890791315,"appliesTo":[{"included":{"locales":{"matches":["de","dsb","hsb","rm"]}}}],"webExtension":{"id":"leo_ende_de@search.mozilla.org"},"id":"03d60939-2c92-45b0-874f-11c8e6d0c2b9","last_modified":1583937832316},{"schema":1582890792162,"appliesTo":[{"included":{"locales":{"matches":["hy-AM"]}}}],"webExtension":{"id":"list-am@search.mozilla.org"},"id":"206db966-db1f-492d-9ab0-71b3e12b434e","last_modified":1583937832313},{"schema":1582890793008,"appliesTo":[{"included":{"locales":{"matches":["th"]}}}],"webExtension":{"id":"longdo@search.mozilla.org"},"id":"8b4f2887-0c24-49ce-b467-2ba8cc9a4945","last_modified":1583937832311},{"schema":1582890794722,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}}],"webExtension":{"id":"mapy-cz@search.mozilla.org"},"id":"9a404348-0998-42c4-9d87-45ef47672c95","last_modified":1583937832306},{"schema":1582890795553,"appliesTo":[{"included":{"locales":{"matches":["fy-NL"]}},"webExtension":{"locales":["fy-NL"]}},{"included":{"locales":{"matches":["nl"]}},"webExtension":{"locales":["nl"]}}],"webExtension":{"id":"marktplaats@search.mozilla.org"},"id":"7823cbee-e13e-4de6-8cf1-86e9234f06ae","last_modified":1583937832304},{"schema":1582890796393,"appliesTo":[{"included":{"locales":{"matches":["es-AR"]}},"webExtension":{"locales":["ar"]}},{"included":{"locales":{"matches":["es-CL"]}},"webExtension":{"locales":["cl"]}},{"included":{"locales":{"matches":["es-MX"]}},"webExtension":{"locales":["mx"]}}],"webExtension":{"id":"mercadolibre@search.mozilla.org"},"id":"df070348-e771-4bd5-964e-d19d82c1384e","last_modified":1583937832302},{"schema":1582890797236,"appliesTo":[{"included":{"locales":{"matches":["pt-BR"]}}}],"webExtension":{"id":"mercadolivre@search.mozilla.org"},"id":"53bf6974-0e60-4551-994f-2d5176a5d1c6","last_modified":1583937832300},{"schema":1582890798070,"appliesTo":[{"included":{"locales":{"matches":["he"]}}}],"webExtension":{"id":"morfix-dic@search.mozilla.org"},"id":"3d05b67d-ef69-4abf-82ab-c943a7e3eff3","last_modified":1583937832298},{"schema":1582890798901,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"najdi-si@search.mozilla.org"},"id":"dd8dcdda-7da8-46db-823b-d33fb1da63f8","last_modified":1583937832295},{"schema":1582890799757,"appliesTo":[{"included":{"locales":{"matches":["ko"]}}}],"webExtension":{"id":"naver-kr@search.mozilla.org"},"id":"4135dc8f-f0bf-475b-b39f-74c4256572af","last_modified":1583937832292},{"schema":1582890800610,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"neti-ee@search.mozilla.org"},"id":"2260d56e-d47c-435e-9cb8-9c7c67e8df7c","last_modified":1583937832289},{"schema":1582890801444,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"odpiralni@search.mozilla.org"},"id":"fa42b23a-30c5-46f3-8997-4a84029b5349","last_modified":1583937832287},{"schema":1582890802297,"appliesTo":[{"included":{"locales":{"matches":["bs"]}}}],"webExtension":{"id":"olx@search.mozilla.org"},"id":"af72d7ef-4255-4362-b328-703aea68ee7e","last_modified":1583937832283},{"schema":1582890803993,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"osta-ee@search.mozilla.org"},"id":"af16e0da-1bcf-4769-b9bb-e43a94bfac75","last_modified":1583937832276},{"schema":1582890804842,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}}],"webExtension":{"id":"ozonru@search.mozilla.org"},"id":"f62fc00c-2e87-4e95-aa11-0db075cd5741","last_modified":1583937832272},{"schema":1582890805689,"appliesTo":[{"included":{"locales":{"matches":["cy"]}}}],"webExtension":{"id":"palasprint@search.mozilla.org"},"id":"656d9e4e-74d5-4eee-bee3-519b4d9bfd37","last_modified":1583937832269},{"schema":1582890806533,"appliesTo":[{"included":{"locales":{"matches":["bg"]}}}],"webExtension":{"id":"pazaruvaj@search.mozilla.org"},"id":"acc27094-9f0a-49af-868b-8b6ecbbda976","last_modified":1583937832267},{"schema":1582890807390,"appliesTo":[{"included":{"locales":{"matches":["sr"]}}}],"webExtension":{"id":"pogodak@search.mozilla.org"},"id":"3bb87247-c36b-4606-a0d6-92b14eaeba86","last_modified":1583937832264},{"schema":1582890808245,"appliesTo":[{"included":{"locales":{"matches":["pt-PT"]}}}],"webExtension":{"id":"priberam@search.mozilla.org"},"id":"a3f1a5b6-cd8d-41b3-bb2b-de6bb1943a3d","last_modified":1583937832261},{"schema":1582890809085,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}}],"webExtension":{"id":"priceru@search.mozilla.org"},"id":"de771801-5bca-436c-be56-f882897c46f2","last_modified":1583937832259},{"schema":1582890809928,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"prisjakt-sv-SE@search.mozilla.org"},"id":"8a7de784-efa5-428f-9193-a0d3368b80d4","last_modified":1583937832257},{"schema":1582890810778,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"pwn-pl@search.mozilla.org"},"id":"2ca17e29-ed08-4218-99f6-0615c8bc5c67","last_modified":1583937832254},{"schema":1582890812485,"appliesTo":[{"included":{"locales":{"matches":["nb-NO","nn-NO"]}}}],"webExtension":{"id":"qxl-NO@search.mozilla.org"},"id":"e54d56d1-defb-4e34-b85e-9814cb7797c2","last_modified":1583937832249},{"schema":1582890814195,"appliesTo":[{"included":{"locales":{"matches":["zh-TW"]}}}],"webExtension":{"id":"readmoo@search.mozilla.org"},"id":"2d24515e-3e35-42ed-bf17-1388acfe80fa","last_modified":1583937832245},{"schema":1582890815048,"appliesTo":[{"included":{"locales":{"matches":["ltg","lv"]}}}],"webExtension":{"id":"salidzinilv@search.mozilla.org"},"id":"e7dcde21-5b5e-4406-b602-0611130fd3a6","last_modified":1583937832242},{"schema":1582890816739,"appliesTo":[{"included":{"locales":{"matches":["ltg","lv"]}}}],"webExtension":{"id":"sslv@search.mozilla.org"},"id":"74f2f615-8d17-4133-82c1-18d03643c383","last_modified":1583937832237},{"schema":1582890817589,"appliesTo":[{"included":{"locales":{"matches":["ga-IE"]}}}],"webExtension":{"id":"tearma@search.mozilla.org"},"id":"518293ee-4bf0-4514-9b73-c6fb646a8a18","last_modified":1583937832235},{"schema":1582890819290,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"tyda-sv-SE@search.mozilla.org"},"id":"32eec495-ce07-4ce5-8d07-4cb32050459d","last_modified":1583937832229},{"schema":1582890820131,"appliesTo":[{"included":{"locales":{"matches":["hu"]}}}],"webExtension":{"id":"vatera@search.mozilla.org"},"id":"d0eab7e7-9084-4a43-b845-568dbe9f07dc","last_modified":1583937832225},{"schema":1582890820983,"appliesTo":[{"included":{"locales":{"matches":["te"]}},"webExtension":{"locales":["te"]}},{"included":{"locales":{"matches":["oc"]}},"webExtension":{"locales":["oc"]}}],"webExtension":{"id":"wiktionary@search.mozilla.org"},"id":"781f42f0-3a5c-4d14-8be2-665eefa65653","last_modified":1583937832222},{"schema":1582890821826,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"wolnelektury-pl@search.mozilla.org"},"id":"1960ccff-4aab-48cd-9bf5-0eb2adde76f9","last_modified":1583937832218},{"schema":1582890822671,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"yahoo-jp@search.mozilla.org"},"id":"9e73a342-4e27-4e9f-8a29-be193d59236a","last_modified":1583937832213},{"schema":1582890823520,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"yahoo-jp-auctions@search.mozilla.org"},"id":"43559b11-05dc-4750-b131-afdbd9d25905","last_modified":1583937832210},{"schema":1582890824418,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"zoznam-sk@search.mozilla.org"},"id":"e332f9dd-d1c5-4cc9-8534-3fd9938b970c","last_modified":1583937832207}]}
\ No newline at end of file
+{"data":[{"schema":1609962110792,"appliesTo":[{"included":{"locales":{"matches":["en-US"]},"regions":["us"]}},{"included":{"locales":{"matches":["an","ast","ca","ca-valencia","es-ES","eu","gl"]}},"telemetryId":"ebay-es","webExtension":{"locales":["es"]}},{"included":{"locales":{"matches":["br","fr","wo"]}},"telemetryId":"ebay-fr","webExtension":{"locales":["fr"]}},{"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["be"]},"telemetryId":"ebay-be","webExtension":{"locales":["be"]}},{"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["ca"]},"telemetryId":"ebay-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["br","en-US","fr","wo"]},"regions":["ch"]},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}},{"included":{"locales":{"matches":["cy","en-GB","gd"]}},"telemetryId":"ebay-uk","webExtension":{"locales":["uk"]}},{"included":{"locales":{"matches":["en-US"]},"regions":["gb"]},"telemetryId":"ebay-uk","webExtension":{"locales":["uk"]}},{"included":{"locales":{"matches":["cy","en-GB","en-US","gd"]},"regions":["au"]},"telemetryId":"ebay-au","webExtension":{"locales":["au"]}},{"included":{"locales":{"matches":["cy","en-GB","en-US","gd"]},"regions":["ie"]},"telemetryId":"ebay-ie","webExtension":{"locales":["ie"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]}},"telemetryId":"ebay-de","webExtension":{"locales":["de"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]},"regions":["at"]},"telemetryId":"ebay-at","webExtension":{"locales":["at"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]},"regions":["ch"]},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}},{"included":{"locales":{"matches":["en-CA"]}},"telemetryId":"ebay-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["fy-NL","nl"]}},"telemetryId":"ebay-nl","webExtension":{"locales":["nl"]}},{"included":{"locales":{"matches":["en-US"]},"regions":["nl"]},"telemetryId":"ebay-nl","webExtension":{"locales":["nl"]}},{"included":{"locales":{"matches":["fy-NL","nl"]},"regions":["be"]},"telemetryId":"ebay-be","webExtension":{"locales":["be"]}},{"included":{"locales":{"matches":["ga-IE"]}},"telemetryId":"ebay-ie","webExtension":{"locales":["ie"]}},{"included":{"locales":{"matches":["it","lij"]}},"telemetryId":"ebay-it","webExtension":{"locales":["it"]}},{"included":{"locales":{"matches":["rm"]}},"telemetryId":"ebay-ch","webExtension":{"locales":["ch"]}}],"webExtension":{"id":"ebay@search.mozilla.org"},"id":"cbe309e0-f638-4996-9dfc-ea5c19ef16e9","last_modified":1610163579843},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-d"},{"name":"q","value":"{searchTerms}"}]},"schema":1605047692074,"appliesTo":[{"default":"yes-if-no-other","included":{"everywhere":true}},{"override":true,"orderHint":2000,"application":{"distributions":["MozillaOnline"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"included":{"everywhere":true},"application":{"channel":["esr"]},"telemetryId":"google-b-e"},{"default":"no","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"],"telemetryId":"google"}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"default":"no","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"],"telemetryId":"google"},"application":{"channel":["esr"]}},{"default":"no","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-e"},{"name":"q","value":"{searchTerms}"}]},"default":"no","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]},"application":{"channel":["esr"]}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-1-d"},{"name":"q","value":"{searchTerms}"}]},"included":{"regions":["us"]},"extraParams":[{"name":"channel","pref":"google_channel_us","condition":"pref"}],"telemetryId":"google-b-1-d"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-1-e"},{"name":"q","value":"{searchTerms}"}]},"included":{"regions":["us"]},"application":{"channel":["esr"]},"extraParams":[{"name":"channel","pref":"google_channel_us","condition":"pref"}],"telemetryId":"google-b-1-e"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-oem1"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-oem1","sweetlabs-r-oem1"]},"telemetryId":"google-sweetlabs"},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefox-b-oem2"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-oem2","sweetlabs-r-oem2"]},"telemetryId":"google-sweetlabs"},{"params":{"searchUrlGetParams":[{"name":"client","value":"ubuntu"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]},"extraParams":[{"name":"channel","value":"fs"}],"telemetryId":"google-canonical"}],"extraParams":[{"name":"channel","pref":"google_channel_row","condition":"pref"}],"telemetryId":"google-b-d","webExtension":{"id":"google@search.mozilla.org"},"id":"cb8e7210-9f0b-48fa-8708-b9a03df79eea","last_modified":1605203142486},{"params":{"searchUrlGetParams":[{"name":"tn","value":"monline_7_dg"},{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"monline_7_dg"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"schema":1604950920293,"appliesTo":[{"params":{"searchUrlGetParams":[{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"monline_4_dg"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"default":"yes","override":true,"orderHint":3000,"application":{"distributions":["MozillaOnline"]},"extraParams":[{"name":"tn","value":"monline_4_dg","purpose":"searchbar","condition":"purpose"},{"name":"tn","value":"monline_3_dg","purpose":"homepage","condition":"purpose"},{"name":"tn","value":"monline_3_dg","purpose":"newtab","condition":"purpose"}]},{"included":{"locales":{"matches":["zh-CN"]}}},{"default":"yes","included":{"locales":{"matches":["zh-CN"]},"regions":["cn"]}},{"params":{"searchUrlGetParams":[{"name":"tn","value":"ubuntuu_cb"},{"name":"ie","value":"utf-8"},{"name":"wd","value":"{searchTerms}"}],"suggestUrlGetParams":[{"name":"tn","value":"ubuntuu_cb"},{"name":"ie","value":"utf-8"},{"name":"action","value":"opensearch"},{"name":"wd","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}},{"default":"no","override":true,"application":{"distributions":["acer-001","acer-002","acer-g-003"]}}],"telemetryId":"baidu","webExtension":{"id":"baidu@search.mozilla.org"},"id":"52dd490a-89e8-45f2-96b0-f2c72e157526","last_modified":1605203142482},{"schema":1599470446693,"appliesTo":[{"included":{"locales":{"matches":["bn","bn-IN","kn","gu-IN","mr","pa-IN","ta","te","ur"]}},"telemetryId":"amazon-in","webExtension":{"locales":["in"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["fr"]},"telemetryId":"amazon-france","webExtension":{"locales":["france"]}},{"included":{"locales":{"matches":["br","ff","fr","son","wo"]}},"telemetryId":"amazon-france","webExtension":{"locales":["france"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","br","cak","en-US","eo","es-AR","fa","ff","fr","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","son","th","tl","trs","uz","wo"]},"regions":["ca"]},"telemetryId":"amazon-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["en-CA"]}},"telemetryId":"amazon-ca","webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["ja-JP-macos","ja"]}},"telemetryId":"amazon-jp","webExtension":{"locales":["jp"]}},{"included":{"locales":{"matches":["it","lij"]}},"telemetryId":"amazon-it","webExtension":{"locales":["it"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]}},"telemetryId":"amazon-de","webExtension":{"locales":["de"]}},{"included":{"locales":{"matches":["de","dsb","hsb"]}},"experiment":"amazon-de-adm","telemetryId":"amazon-de-adm","webExtension":{"locales":["de-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["gb"]},"telemetryId":"amazon-en-GB","webExtension":{"locales":["en-GB"]}},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]},"regions":["gb"]},"experiment":"amazon-en-GB-adm","telemetryId":"amazon-en-GB-adm","webExtension":{"locales":["en-GB-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["cy","da","el","en-GB","eu","ga-IE","gd","gl","hr","nb-NO","nn-NO","pt-PT","sq","sr"]}},"telemetryId":"amazon-en-GB","webExtension":{"locales":["en-GB"]}},{"included":{"locales":{"matches":["cy","da","el","en-GB","eu","ga-IE","gd","gl","hr","nb-NO","nn-NO","pt-PT","sq","sr"]}},"experiment":"amazon-en-GB-adm","telemetryId":"amazon-en-GB-adm","webExtension":{"locales":["en-GB-adm"]},"sendAttributionRequest":true},{"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","cy","da","el","en-GB","en-US","eo","es-AR","eu","fa","ga-IE","gd","gl","gn","hr","hy-AM","ia","is","ka","km","lt","mk","ms","my","nb-NO","nn-NO","pt-PT","ro","si","sq","sr","th","tl","trs","uz"]},"regions":["au"]},"telemetryId":"amazon-au","webExtension":{"locales":["au"]}},{"params":{"searchUrlGetParams":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"ie","value":"{inputEncoding}"},{"name":"mode","value":"blended"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"sourceid","value":"Mozilla-search"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"webExtension":{"id":"amazon@search.mozilla.org"},"id":"a620b506-c3ae-4332-97bb-190a73868580","last_modified":1599574471325},{"schema":1599421304249,"appliesTo":[{"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}}},{"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}},"experiment":"amazondotcom-adm","telemetryId":"amazondotcom-adm","webExtension":{"locales":["en-adm"]},"sendAttributionRequest":true},{"params":{"searchUrlGetParams":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"ie","value":"{inputEncoding}"},{"name":"mode","value":"blended"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"sourceid","value":"Mozilla-search"}]},"excluded":{"regions":["au","ca","fr","gb"]},"included":{"locales":{"matches":["ach","af","ar","az","bg","cak","en-US","eo","es-AR","fa","gn","hy-AM","ia","is","ka","km","lt","mk","ms","my","ro","si","th","tl","trs","uz"]}},"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"telemetryId":"amazondotcom","webExtension":{"id":"amazondotcom@search.mozilla.org"},"id":"071c671c-7c1b-469d-a771-ab16ff6e8beb","last_modified":1599574471320},{"schema":1596483697391,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmx"]},"webExtension":{"locales":["de","shopping"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxcouk"]},"webExtension":{"locales":["en-GB"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxes"]},"webExtension":{"locales":["es"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["gmxfr"]},"webExtension":{"locales":["fr"]}}],"webExtension":{"id":"gmx@search.mozilla.org"},"id":"1571e5fc-17e4-492b-b6d2-106d8669b6c8","last_modified":1597327602800},{"schema":1594312404762,"appliesTo":[{"included":{"locales":{"matches":["zh-CN"]}}},{"override":true,"orderHint":1500,"application":{"distributions":["MozillaOnline"]},"webExtension":{"locales":["mozillaonline"]}},{"params":{"searchUrlGetParams":[{"name":"ix","value":"sunray"},{"name":"pageletid","value":"headsearch"},{"name":"searchType","value":""},{"name":"Go.x","value":"0"},{"name":"Go.y","value":"0"},{"name":"bestSaleNum","value":"0"},{"name":"tag","value":"wwwcanoniccom-20"},{"name":"keywords","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]}}],"telemetryId":"amazondotcn","webExtension":{"id":"amazondotcn@search.mozilla.org"},"id":"ccb137f1-7733-464c-bb70-037be4ba2529","last_modified":1595254832070},{"schema":1594312388385,"appliesTo":[{"included":{"everywhere":true}},{"override":true,"application":{"distributions":["canonical","canonical-001","canonical-002"]},"extraParams":[{"name":"t","value":"canonical"}]}],"extraParams":[{"name":"t","value":"ffcm","purpose":"contextmenu","condition":"purpose"},{"name":"t","value":"ffab","purpose":"keyword","condition":"purpose"},{"name":"t","value":"ffsb","purpose":"searchbar","condition":"purpose"},{"name":"t","value":"ffhp","purpose":"homepage","condition":"purpose"},{"name":"t","value":"ffnt","purpose":"newtab","condition":"purpose"}],"telemetryId":"ddg","webExtension":{"id":"ddg@search.mozilla.org"},"id":"c0b26c0e-63e6-4235-b2ce-5f16b6a8bf87","last_modified":1595254832054},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZI"},{"name":"q","value":"{searchTerms}"}]},"schema":1592948527171,"appliesTo":[{"included":{"locales":{"matches":["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-macos","ja","ka","kab","km","kn","lij","lo","lt","mk","ms","my","nb-NO","ne-NP","nl","nn-NO","oc","pa-IN","pt-BR","rm","ro","son","sq","sr","sv-SE","th","tl","trs","uk","ur","uz","wo","xh","zh-CN"],"startsWith":["bn","en"]}}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL01"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem1","sweetlabs-b-r-oem1"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL02"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem2","sweetlabs-b-r-oem2"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MZSL03"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["sweetlabs-b-oem3","sweetlabs-b-r-oem3"]}},{"default":"yes","included":{"everywhere":true},"application":{"distributions":["acer-001","acer-002","acer-g-003"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZD"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["acer-001","acer-002"]}},{"params":{"searchUrlGetParams":[{"name":"pc","value":"MOZE"},{"name":"q","value":"{searchTerms}"}]},"override":true,"application":{"distributions":["acer-g-003"]}},{"override":"true","orderHint":2500,"application":{"distributions":["MozillaOnline"]}}],"extraParams":[{"name":"form","value":"MOZCON","purpose":"contextmenu","condition":"purpose"},{"name":"form","value":"MOZSBR","purpose":"searchbar","condition":"purpose"},{"name":"form","value":"MOZSPG","purpose":"homepage","condition":"purpose"},{"name":"form","value":"MOZLBR","purpose":"keyword","condition":"purpose"},{"name":"form","value":"MOZTSB","purpose":"newtab","condition":"purpose"}],"webExtension":{"id":"bing@search.mozilla.org"},"id":"7ec766f6-639a-4618-91bc-33eb3d4378c6","last_modified":1593025575021},{"schema":1588177655532,"appliesTo":[{"included":{"locales":{"matches":["fr"]}},"orderHint":1500,"application":{"distributions":["qwant-001","qwant-002"]}}],"webExtension":{"id":"qwantjr@search.mozilla.org"},"id":"f59fddbc-580b-4672-9cda-32941ceec730","last_modified":1589299342073},{"schema":1588177692141,"appliesTo":[{"included":{"everywhere":true}},{"included":{"locales":{"matches":["af","an","ar","ast","az","bg","br","bs","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","lij","lo","lt","ltg","lv","mk","mr","ms","my","nl","oc","pl","rm","ro","ru","si","sk","sl","sq","sr","sv-SE","ta","te","th","tl","tr","uk","ur","uz","vi","wo","zh-CN","zh-TW"]}},"webExtension":{"locales":["$USER_LOCALE"]}},{"included":{"locales":{"matches":["be"]}},"webExtension":{"locales":["be","be-tarask"]}},{"included":{"locales":{"matches":["bn","bn-BD","bn-IN"]}},"webExtension":{"locales":["bn"]}},{"included":{"locales":{"matches":["ca","ca-valencia"]}},"webExtension":{"locales":["ca"]}},{"included":{"locales":{"matches":["cak","es-AR","es-CL","es-ES","es-MX","trs"]}},"webExtension":{"locales":["es"]}},{"included":{"locales":{"matches":["cs"]}},"webExtension":{"locales":["cz"]}},{"included":{"locales":{"matches":["ff","fr","son"]}},"webExtension":{"locales":["fr"]}},{"included":{"locales":{"matches":["gu-IN"]}},"webExtension":{"locales":["gu"]}},{"included":{"locales":{"matches":["hi-IN"]}},"webExtension":{"locales":["hi"]}},{"included":{"locales":{"matches":["hy-AM"]}},"webExtension":{"locales":["hy"]}},{"included":{"locales":{"matches":["ja-JP-macos","ja"]}},"webExtension":{"locales":["ja"]}},{"included":{"locales":{"matches":["ko"]}},"webExtension":{"locales":["kr"]}},{"included":{"locales":{"matches":["nb-NO"]}},"webExtension":{"locales":["NO"]}},{"included":{"locales":{"matches":["ne-NP"]}},"webExtension":{"locales":["ne"]}},{"included":{"locales":{"matches":["nn-NO"]}},"webExtension":{"locales":["NN"]}},{"included":{"locales":{"matches":["pa-IN"]}},"webExtension":{"locales":["pa"]}},{"included":{"locales":{"matches":["pt-BR","pt-PT"]}},"webExtension":{"locales":["pt"]}},{"override":true,"orderHint":1000,"application":{"distributions":["MozillaOnline"]}}],"webExtension":{"id":"wikipedia@search.mozilla.org"},"id":"3f3beb1d-e32e-40a4-b6ed-56741803e1d8","last_modified":1589299342069},{"schema":1589053296453,"appliesTo":[{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-drp"]},"extraParams":[{"name":"clid","value":"2039342","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-planb"]},"extraParams":[{"name":"clid","value":"1857376","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-portals"]},"extraParams":[{"name":"clid","value":"1923034","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-ru"]},"extraParams":[{"name":"clid","value":"1923018","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr"]},"extraParams":[{"name":"clid","value":"1953197","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr-gezginler"]},"extraParams":[{"name":"clid","value":"1945716","purpose":"searchbar","condition":"purpose"}]},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-tr-tamindir"]},"extraParams":[{"name":"clid","value":"1945686","purpose":"searchbar","condition":"purpose"}]},{"default":"yes","included":{"locales":{"matches":["uk"]}},"application":{"distributions":["yandex-uk"]},"extraParams":[{"name":"clid","value":"1923018","purpose":"searchbar","condition":"purpose"}],"webExtension":{"locales":["ua"]}},{"params":{"searchUrlGetParams":[{"name":"text","value":"{searchTerms}"}]},"default":"yes","override":true,"application":{"distributions":["yandex-ru-mz"]},"extraParams":[{"name":"clid","value":"2320519","purpose":"searchbar","condition":"purpose"}]},{"default":"yes","included":{"locales":{"matches":["ru","tr","be","kk"],"startsWith":["en"]},"regions":["ru","tr","by","kz"]},"telemetryId":"yandex-en","webExtension":{"locales":["en"]}},{"included":{"locales":{"matches":["az"]}},"telemetryId":"yandex-az","webExtension":{"locales":["az"]}},{"included":{"locales":{"matches":["be"]}},"telemetryId":"yandex-by","webExtension":{"locales":["by"]}},{"included":{"locales":{"matches":["kk"]}},"telemetryId":"yandex-kk","webExtension":{"locales":["kk"]}},{"included":{"locales":{"matches":["ru"]}},"telemetryId":"yandex-ru","webExtension":{"locales":["ru"]}},{"included":{"locales":{"matches":["tr"]}},"telemetryId":"yandex-tr","webExtension":{"locales":["tr"]}},{"default":"no","override":true,"application":{"distributions":["mailru-001","okru-001"]}}],"extraParams":[{"name":"clid","value":"2186618","purpose":"searchbar","condition":"purpose"},{"name":"clid","value":"2186621","purpose":"keyword","condition":"purpose"},{"name":"clid","value":"2186623","purpose":"contextmenu","condition":"purpose"},{"name":"clid","value":"2186617","purpose":"homepage","condition":"purpose"},{"name":"clid","value":"2186620","purpose":"newtab","condition":"purpose"}],"webExtension":{"id":"yandex@search.mozilla.org"},"id":"a0e7f96a-14e0-4d56-9f54-e0c7e49fd306","last_modified":1589299342036},{"schema":1588177656482,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}},{"default":"yes","included":{"locales":{"matches":["ru"]}},"application":{"distributions":["mailru-001"]},"webExtension":{"locales":["mailru001"]}},{"default":"yes","included":{"locales":{"matches":["az"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-az"]}},{"default":"yes","included":{"locales":{"matches":["en-US"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-en-US"]}},{"default":"yes","included":{"locales":{"matches":["hy-AM"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-hy-AM"]}},{"default":"yes","included":{"locales":{"matches":["kk"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-kk"]}},{"default":"yes","included":{"locales":{"matches":["ro"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-ro"]}},{"default":"yes","included":{"locales":{"matches":["ru"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-ru"]}},{"default":"yes","included":{"locales":{"matches":["tr"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-tr"]}},{"default":"yes","included":{"locales":{"matches":["uk"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-uk"]}},{"default":"yes","included":{"locales":{"matches":["uz"]}},"application":{"distributions":["okru-001"]},"webExtension":{"locales":["okru-uz"]}}],"webExtension":{"id":"mailru@search.mozilla.org"},"id":"e0ca4964-e324-44e7-80b6-16a831706d17","last_modified":1589299342033},{"schema":1588177653636,"appliesTo":[{"included":{"locales":{"matches":["fr"]}}},{"params":{"searchUrlGetParams":[{"name":"client","value":"firefoxqwant"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","override":true,"orderHint":2000,"application":{"distributions":["qwant-001","qwant-002"]}}],"webExtension":{"id":"qwant@search.mozilla.org"},"id":"f59fddbc-580b-4672-9cda-32941ceec729","last_modified":1589299342030},{"schema":1588177651820,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}},{"params":{"searchUrlGetParams":[{"name":"sourceid","value":"FF_3"},{"name":"q","value":"{searchTerms}"}]},"default":"yes","included":{"locales":{"matches":["cs"]}},"application":{"distributions":["seznam"]}}],"webExtension":{"id":"seznam-cz@search.mozilla.org"},"id":"c50dcc87-0192-4461-bb88-17a55ba181c7","last_modified":1589299342027},{"schema":1588177648193,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["1und1"]}}],"webExtension":{"id":"1und1@search.mozilla.org"},"id":"e98c663d-408d-4901-9666-66e67a3084b4","last_modified":1589299342018},{"schema":1588177646165,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["webde"]}}],"webExtension":{"id":"webde@search.mozilla.org"},"id":"613d1391-4be5-4296-80e2-cfb740de6607","last_modified":1589299342015},{"schema":1588016493937,"appliesTo":[{"default":"yes","included":{"everywhere":true},"application":{"distributions":["mail.com"]}}],"webExtension":{"id":"mailcom@search.mozilla.org"},"id":"62d232d5-304e-4c35-a4da-46626a9b54c2","last_modified":1589299342012},{"schema":1586273556552,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"rakuten@search.mozilla.org"},"id":"8551c432-c68d-4934-836e-98513ae4b4a5","last_modified":1586375636481},{"schema":1586273291150,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"oshiete-goo@search.mozilla.org"},"id":"daa695d9-3f38-494b-81f1-1f601bbe5163","last_modified":1586375636478},{"schema":1582890770937,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"allaannonser-sv-SE@search.mozilla.org"},"id":"69a82554-c9b4-4c84-98c7-80f86fa7174a","last_modified":1583937832369},{"schema":1582890771781,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"allegro-pl@search.mozilla.org"},"id":"d915b6bc-bbae-47a6-8323-1b2990ad0e57","last_modified":1583937832367},{"schema":1582890772625,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"atlas-sk@search.mozilla.org"},"id":"6cebcf52-2cfa-4da2-ae4d-2c845ebdbc0b","last_modified":1583937832365},{"schema":1582890773480,"appliesTo":[{"included":{"locales":{"matches":["az"]}}}],"webExtension":{"id":"azerdict@search.mozilla.org"},"id":"c1a6845f-015e-4e67-bc64-6e39a843643f","last_modified":1583937832363},{"schema":1582890774347,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"azet-sk@search.mozilla.org"},"id":"3c632ae9-f758-43b5-9d06-b9c1b6bc7105","last_modified":1583937832361},{"schema":1582890775198,"appliesTo":[{"included":{"locales":{"matches":["gd"]}}}],"webExtension":{"id":"bbc-alba@search.mozilla.org"},"id":"4ab14cdb-35ea-42dc-8500-110eb3088b89","last_modified":1583937832358},{"schema":1582890776067,"appliesTo":[{"included":{"locales":{"matches":["nb-NO","nn-NO"]}}}],"webExtension":{"id":"bok-NO@search.mozilla.org"},"id":"64ce88a6-fd55-48d1-85a9-724c753f5721","last_modified":1583937832356},{"schema":1582890776913,"appliesTo":[{"included":{"locales":{"matches":["fy-NL"]}},"webExtension":{"locales":["fy-NL"]}},{"included":{"locales":{"matches":["nl"]}},"webExtension":{"locales":["nl"]}}],"webExtension":{"id":"bolcom@search.mozilla.org"},"id":"3d0ab163-0808-4be0-b479-0900dcdc8e35","last_modified":1583937832354},{"schema":1582890777775,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"ceneji@search.mozilla.org"},"id":"d908d622-0387-4d36-8098-1a9e32c0c697","last_modified":1583937832352},{"schema":1582890778608,"appliesTo":[{"included":{"locales":{"matches":["en-GB"]}}}],"webExtension":{"id":"chambers-en-GB@search.mozilla.org"},"id":"270000f0-8527-4f98-aa17-879820209f68","last_modified":1583937832350},{"schema":1582890779439,"appliesTo":[{"included":{"locales":{"matches":["vi"]}}}],"webExtension":{"id":"coccoc@search.mozilla.org"},"id":"4e447f5a-9eb1-436e-8de1-9e4b4b709efb","last_modified":1583937832348},{"schema":1582890780276,"appliesTo":[{"included":{"locales":{"matches":["ko"]}}}],"webExtension":{"id":"daum-kr@search.mozilla.org"},"id":"0cdc44be-173a-4ca8-96e3-43e3000da75d","last_modified":1583937832346},{"schema":1582890781123,"appliesTo":[{"included":{"locales":{"matches":["ca","ca-valencia"]}}}],"webExtension":{"id":"diec2@search.mozilla.org"},"id":"055103b9-1f4a-43d0-9b99-5b8d7209b022","last_modified":1583937832343},{"schema":1582890781968,"appliesTo":[{"included":{"locales":{"matches":["es-AR","es-CL","es-ES"]}}}],"webExtension":{"id":"drae@search.mozilla.org"},"id":"3d27c51f-83d4-43be-af84-4d7a51c5a8e4","last_modified":1583937832341},{"schema":1582890782823,"appliesTo":[{"included":{"locales":{"matches":["de"]}}}],"webExtension":{"id":"ecosia@search.mozilla.org"},"id":"1fc1b257-3e6b-4cfb-a323-64c1429bcf51","last_modified":1583937832339},{"schema":1582890783661,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"eki-ee@search.mozilla.org"},"id":"63b74323-1d14-4989-921f-7cc32bfee072","last_modified":1583937832336},{"schema":1582890784534,"appliesTo":[{"included":{"locales":{"matches":["hr"]}}}],"webExtension":{"id":"eudict@search.mozilla.org"},"id":"5cd4781c-2906-4fe7-9d4b-ea9ddbdc2c3b","last_modified":1583937832334},{"schema":1582890785390,"appliesTo":[{"included":{"locales":{"matches":["gd"]}}}],"webExtension":{"id":"faclair-beag@search.mozilla.org"},"id":"6491a2b8-c487-4798-a817-a0fd08b40ee2","last_modified":1583937832332},{"schema":1582890786256,"appliesTo":[{"included":{"locales":{"matches":["kk"]}}}],"webExtension":{"id":"flip@search.mozilla.org"},"id":"d045762c-52ac-4c16-8ca3-072aecea83da","last_modified":1583937832330},{"schema":1582890787108,"appliesTo":[{"included":{"locales":{"matches":["br"]}}}],"webExtension":{"id":"freelang@search.mozilla.org"},"id":"ed6a0f8c-e496-4d9c-936c-b906892e3d23","last_modified":1583937832327},{"schema":1582890787961,"appliesTo":[{"included":{"locales":{"matches":["nn-NO","nb-NO"]}}}],"webExtension":{"id":"gulesider-NO@search.mozilla.org"},"id":"f458e78b-9128-4027-b344-538f5661c148","last_modified":1583937832325},{"schema":1582890788795,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}}],"webExtension":{"id":"heureka-cz@search.mozilla.org"},"id":"b9a718b5-fc78-40b8-b1c3-2e15d2009f5c","last_modified":1583937832323},{"schema":1582890789635,"appliesTo":[{"included":{"locales":{"matches":["uk"]}}}],"webExtension":{"id":"hotline-ua@search.mozilla.org"},"id":"da2ec2d3-6c5c-4191-b428-351fbea8aeba","last_modified":1583937832321},{"schema":1582890790469,"appliesTo":[{"included":{"locales":{"matches":["kn"]}}}],"webExtension":{"id":"kannadastore@search.mozilla.org"},"id":"ae1cfae5-0516-41c0-99af-fd3d92a77aa8","last_modified":1583937832318},{"schema":1582890791315,"appliesTo":[{"included":{"locales":{"matches":["de","dsb","hsb","rm"]}}}],"webExtension":{"id":"leo_ende_de@search.mozilla.org"},"id":"03d60939-2c92-45b0-874f-11c8e6d0c2b9","last_modified":1583937832316},{"schema":1582890792162,"appliesTo":[{"included":{"locales":{"matches":["hy-AM"]}}}],"webExtension":{"id":"list-am@search.mozilla.org"},"id":"206db966-db1f-492d-9ab0-71b3e12b434e","last_modified":1583937832313},{"schema":1582890793008,"appliesTo":[{"included":{"locales":{"matches":["th"]}}}],"webExtension":{"id":"longdo@search.mozilla.org"},"id":"8b4f2887-0c24-49ce-b467-2ba8cc9a4945","last_modified":1583937832311},{"schema":1582890794722,"appliesTo":[{"included":{"locales":{"matches":["cs"]}}}],"webExtension":{"id":"mapy-cz@search.mozilla.org"},"id":"9a404348-0998-42c4-9d87-45ef47672c95","last_modified":1583937832306},{"schema":1582890795553,"appliesTo":[{"included":{"locales":{"matches":["fy-NL"]}},"webExtension":{"locales":["fy-NL"]}},{"included":{"locales":{"matches":["nl"]}},"webExtension":{"locales":["nl"]}}],"webExtension":{"id":"marktplaats@search.mozilla.org"},"id":"7823cbee-e13e-4de6-8cf1-86e9234f06ae","last_modified":1583937832304},{"schema":1582890796393,"appliesTo":[{"included":{"locales":{"matches":["es-AR"]}},"webExtension":{"locales":["ar"]}},{"included":{"locales":{"matches":["es-CL"]}},"webExtension":{"locales":["cl"]}},{"included":{"locales":{"matches":["es-MX"]}},"webExtension":{"locales":["mx"]}}],"webExtension":{"id":"mercadolibre@search.mozilla.org"},"id":"df070348-e771-4bd5-964e-d19d82c1384e","last_modified":1583937832302},{"schema":1582890797236,"appliesTo":[{"included":{"locales":{"matches":["pt-BR"]}}}],"webExtension":{"id":"mercadolivre@search.mozilla.org"},"id":"53bf6974-0e60-4551-994f-2d5176a5d1c6","last_modified":1583937832300},{"schema":1582890798070,"appliesTo":[{"included":{"locales":{"matches":["he"]}}}],"webExtension":{"id":"morfix-dic@search.mozilla.org"},"id":"3d05b67d-ef69-4abf-82ab-c943a7e3eff3","last_modified":1583937832298},{"schema":1582890798901,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"najdi-si@search.mozilla.org"},"id":"dd8dcdda-7da8-46db-823b-d33fb1da63f8","last_modified":1583937832295},{"schema":1582890799757,"appliesTo":[{"included":{"locales":{"matches":["ko"]}}}],"webExtension":{"id":"naver-kr@search.mozilla.org"},"id":"4135dc8f-f0bf-475b-b39f-74c4256572af","last_modified":1583937832292},{"schema":1582890800610,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"neti-ee@search.mozilla.org"},"id":"2260d56e-d47c-435e-9cb8-9c7c67e8df7c","last_modified":1583937832289},{"schema":1582890801444,"appliesTo":[{"included":{"locales":{"matches":["sl"]}}}],"webExtension":{"id":"odpiralni@search.mozilla.org"},"id":"fa42b23a-30c5-46f3-8997-4a84029b5349","last_modified":1583937832287},{"schema":1582890802297,"appliesTo":[{"included":{"locales":{"matches":["bs"]}}}],"webExtension":{"id":"olx@search.mozilla.org"},"id":"af72d7ef-4255-4362-b328-703aea68ee7e","last_modified":1583937832283},{"schema":1582890803993,"appliesTo":[{"included":{"locales":{"matches":["et"]}}}],"webExtension":{"id":"osta-ee@search.mozilla.org"},"id":"af16e0da-1bcf-4769-b9bb-e43a94bfac75","last_modified":1583937832276},{"schema":1582890804842,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}}],"webExtension":{"id":"ozonru@search.mozilla.org"},"id":"f62fc00c-2e87-4e95-aa11-0db075cd5741","last_modified":1583937832272},{"schema":1582890805689,"appliesTo":[{"included":{"locales":{"matches":["cy"]}}}],"webExtension":{"id":"palasprint@search.mozilla.org"},"id":"656d9e4e-74d5-4eee-bee3-519b4d9bfd37","last_modified":1583937832269},{"schema":1582890806533,"appliesTo":[{"included":{"locales":{"matches":["bg"]}}}],"webExtension":{"id":"pazaruvaj@search.mozilla.org"},"id":"acc27094-9f0a-49af-868b-8b6ecbbda976","last_modified":1583937832267},{"schema":1582890807390,"appliesTo":[{"included":{"locales":{"matches":["sr"]}}}],"webExtension":{"id":"pogodak@search.mozilla.org"},"id":"3bb87247-c36b-4606-a0d6-92b14eaeba86","last_modified":1583937832264},{"schema":1582890808245,"appliesTo":[{"included":{"locales":{"matches":["pt-PT"]}}}],"webExtension":{"id":"priberam@search.mozilla.org"},"id":"a3f1a5b6-cd8d-41b3-bb2b-de6bb1943a3d","last_modified":1583937832261},{"schema":1582890809085,"appliesTo":[{"included":{"locales":{"matches":["ru"]}}}],"webExtension":{"id":"priceru@search.mozilla.org"},"id":"de771801-5bca-436c-be56-f882897c46f2","last_modified":1583937832259},{"schema":1582890809928,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"prisjakt-sv-SE@search.mozilla.org"},"id":"8a7de784-efa5-428f-9193-a0d3368b80d4","last_modified":1583937832257},{"schema":1582890810778,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"pwn-pl@search.mozilla.org"},"id":"2ca17e29-ed08-4218-99f6-0615c8bc5c67","last_modified":1583937832254},{"schema":1582890812485,"appliesTo":[{"included":{"locales":{"matches":["nb-NO","nn-NO"]}}}],"webExtension":{"id":"qxl-NO@search.mozilla.org"},"id":"e54d56d1-defb-4e34-b85e-9814cb7797c2","last_modified":1583937832249},{"schema":1582890814195,"appliesTo":[{"included":{"locales":{"matches":["zh-TW"]}}}],"webExtension":{"id":"readmoo@search.mozilla.org"},"id":"2d24515e-3e35-42ed-bf17-1388acfe80fa","last_modified":1583937832245},{"schema":1582890815048,"appliesTo":[{"included":{"locales":{"matches":["ltg","lv"]}}}],"webExtension":{"id":"salidzinilv@search.mozilla.org"},"id":"e7dcde21-5b5e-4406-b602-0611130fd3a6","last_modified":1583937832242},{"schema":1582890816739,"appliesTo":[{"included":{"locales":{"matches":["ltg","lv"]}}}],"webExtension":{"id":"sslv@search.mozilla.org"},"id":"74f2f615-8d17-4133-82c1-18d03643c383","last_modified":1583937832237},{"schema":1582890817589,"appliesTo":[{"included":{"locales":{"matches":["ga-IE"]}}}],"webExtension":{"id":"tearma@search.mozilla.org"},"id":"518293ee-4bf0-4514-9b73-c6fb646a8a18","last_modified":1583937832235},{"schema":1582890819290,"appliesTo":[{"included":{"locales":{"matches":["sv-SE"]}}}],"webExtension":{"id":"tyda-sv-SE@search.mozilla.org"},"id":"32eec495-ce07-4ce5-8d07-4cb32050459d","last_modified":1583937832229},{"schema":1582890820131,"appliesTo":[{"included":{"locales":{"matches":["hu"]}}}],"webExtension":{"id":"vatera@search.mozilla.org"},"id":"d0eab7e7-9084-4a43-b845-568dbe9f07dc","last_modified":1583937832225},{"schema":1582890820983,"appliesTo":[{"included":{"locales":{"matches":["te"]}},"webExtension":{"locales":["te"]}},{"included":{"locales":{"matches":["oc"]}},"webExtension":{"locales":["oc"]}}],"webExtension":{"id":"wiktionary@search.mozilla.org"},"id":"781f42f0-3a5c-4d14-8be2-665eefa65653","last_modified":1583937832222},{"schema":1582890821826,"appliesTo":[{"included":{"locales":{"matches":["pl"]}}}],"webExtension":{"id":"wolnelektury-pl@search.mozilla.org"},"id":"1960ccff-4aab-48cd-9bf5-0eb2adde76f9","last_modified":1583937832218},{"schema":1582890822671,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"yahoo-jp@search.mozilla.org"},"id":"9e73a342-4e27-4e9f-8a29-be193d59236a","last_modified":1583937832213},{"schema":1582890823520,"appliesTo":[{"included":{"locales":{"matches":["ja-JP-macos","ja"]}}}],"webExtension":{"id":"yahoo-jp-auctions@search.mozilla.org"},"id":"43559b11-05dc-4750-b131-afdbd9d25905","last_modified":1583937832210},{"schema":1582890824418,"appliesTo":[{"included":{"locales":{"matches":["sk"]}}}],"webExtension":{"id":"zoznam-sk@search.mozilla.org"},"id":"e332f9dd-d1c5-4cc9-8534-3fd9938b970c","last_modified":1583937832207}]}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/services/settings/dumps/security-state/intermediates.json firefox-85.0+build1/services/settings/dumps/security-state/intermediates.json
--- firefox-84.0.2+build1/services/settings/dumps/security-state/intermediates.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/settings/dumps/security-state/intermediates.json	2021-01-18 19:58:19.000000000 +0000
@@ -1 +1 @@
-{"data":[{"schema":1609443692100,"derHash":"TKNPcQp+EDdNpQYzfXVj/b2PraRt6PCm5SL9L6whNts=","subject":"CN=CrossTrust OV CA3,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBMw==","whitelist":false,"attachment":{"hash":"36e858212fd3a35823f7631743852eaacd6260657261d3400fb64bd1cbe22e7c","size":1581,"filename":"NRDKWT0450v5op6gvs41KoV3CLtbD8-8t8IphVrIvqM=.pem","location":"security-state-staging/intermediates/71e0b574-d31e-4f97-a406-ea5014ad14db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NRDKWT0450v5op6gvs41KoV3CLtbD8+8t8IphVrIvqM=","crlite_enrolled":false,"id":"6098095f-4cec-4428-9aa8-fa4e3e7c40fc","last_modified":1609444767338},{"schema":1609270892903,"derHash":"cj4fieqqwPVrn5OF8TEvbNvXVFQGl7pGNA3yrjDqWec=","subject":"CN=SSL.com High Assurance CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEiMCAGA1UEAxMZU1NMLmNvbSBIaWdoIEFzc3VyYW5jZSBDQQ==","whitelist":false,"attachment":{"hash":"71002c2662ef686fd97b1ed39205f25720a2a54c2d5da18fc7df07bfe9b794d0","size":2121,"filename":"Ck8cX6ydytkZDI6Az0ES3m8TykmMPRUEb5UVDjRtJ_w=.pem","location":"security-state-staging/intermediates/c9101671-f46c-4528-bbd3-0ebe60946c0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ck8cX6ydytkZDI6Az0ES3m8TykmMPRUEb5UVDjRtJ/w=","crlite_enrolled":false,"id":"28852233-ff69-424d-9c51-72ed58ffda41","last_modified":1609423089503},{"schema":1609142264146,"derHash":"Jv1MQ2fkY9OccXlq5AEOUzgNyTvBMvsBnWcYpoc+gfQ=","subject":"CN=SHECA RSA Organization Validation Server CA G3,O=UniTrust,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE3MDUGA1UEAwwuU0hFQ0EgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==","whitelist":false,"attachment":{"hash":"a02a5c8205e62c2ef5dc42345a1585558c86f166ed9875d861601a465bcc4651","size":2016,"filename":"0JA1q1ctk_4J8qS0t-GhJaG5egVDq9SB33oMY7SMpfs=.pem","location":"security-state-staging/intermediates/caec957d-379a-4c23-bf42-3bd122e7cf33.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0JA1q1ctk/4J8qS0t+GhJaG5egVDq9SB33oMY7SMpfs=","crlite_enrolled":true,"id":"10ec0271-99d5-4c06-a20d-1c03ccf7d780","last_modified":1609163887774},{"schema":1608861456264,"derHash":"p+OsttcN/1U2hSW8O+I2xgJSk/umCbPEQfSZRPoGAB8=","subject":"SERIALNUMBER=201510,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTA=","whitelist":false,"attachment":{"hash":"28e1ef70f8de2a776568ca7bdc90bf54323d92557e04219bd3266354c5029a9c","size":2093,"filename":"l6QMc6rTKdl0AehazkNhC6i7uekp05bi-O4TLl8ebbE=.pem","location":"security-state-staging/intermediates/ca92f10f-e298-4db4-9442-e61019866e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l6QMc6rTKdl0AehazkNhC6i7uekp05bi+O4TLl8ebbE=","crlite_enrolled":true,"id":"7c2ace93-b725-4eb3-93be-ed978b60fe4e","last_modified":1608904653190},{"schema":1608818264256,"derHash":"ClUqZfIv+CDn7D1Du/iLAqvDS9JH4MNQWJG2NC8WpfI=","subject":"CN=SHECA RSA Domain Validation Server CA G3,O=UniTrust,C=CN","subjectDN":"MFMxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDExMC8GA1UEAwwoU0hFQ0EgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==","whitelist":false,"attachment":{"hash":"42516b0068507cb60d6383aaefa05ac169921cff9e4616761151efe098d3e1fe","size":2008,"filename":"N6OrM0KKQgR1zORoDKkLLFEKAYCmS_84dpbLl_qNOnU=.pem","location":"security-state-staging/intermediates/525578e5-a94b-4525-b9e7-801be6e0ff89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N6OrM0KKQgR1zORoDKkLLFEKAYCmS/84dpbLl/qNOnU=","crlite_enrolled":true,"id":"4b6a2421-1677-41c0-8103-bc13fb7e09f9","last_modified":1608861455378},{"schema":1608731356438,"derHash":"MlNBL9rUUjEIwJi7DuDv7df6/dAPsw5Hxrup/j4c24g=","subject":"CN=GDCA TrustAUTH R4 Primer CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IFByaW1lciBDQQ==","whitelist":false,"attachment":{"hash":"63e5b17371590f3ec401bd9eb3b8ed4d9589063e1d6eef4f8889c34e61e19155","size":2056,"filename":"0QPovc90TjBNTpee1IAatbvOdHFYmqVUPYNToEldWCY=.pem","location":"security-state-staging/intermediates/5786a959-598e-4837-8220-7a23733b51ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0QPovc90TjBNTpee1IAatbvOdHFYmqVUPYNToEldWCY=","crlite_enrolled":false,"id":"ac8f566c-4341-4d69-9204-a2ed8524ca5e","last_modified":1608731862281},{"schema":1608651068348,"derHash":"wWnWndPSbTbLgt8TXFf+M27P9+fqQB6Z484ZF6j7gYA=","subject":"CN=CSP SSL Service CA 5,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA1","whitelist":false,"attachment":{"hash":"a26a3bb69b8762ccb5f00b997d7f14a0fe3eccca50cf54a3b76508a75d97353c","size":2154,"filename":"feELO37IL4l2CJfivsLI0VTQkKQc7sskntJ5vxPVVW8=.pem","location":"security-state-staging/intermediates/adfaf648-0669-46cc-a5d4-251b1d33f435.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"feELO37IL4l2CJfivsLI0VTQkKQc7sskntJ5vxPVVW8=","crlite_enrolled":false,"id":"ee30cbe2-04fc-4d99-8ef4-c0cc6362bfcc","last_modified":1608688660806},{"schema":1608256159665,"derHash":"dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=","subject":"CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"11a50056d6027ba92a4d016bbdd72de6b8e7498171f12762ce2eda7a60762e6e","size":1483,"filename":"vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem","location":"security-state-staging/intermediates/7bf16759-da8d-43e0-b260-f55aac6a39b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=","crlite_enrolled":false,"id":"ce744321-7f4d-4f9c-9da1-63454f6d33bb","last_modified":1608321440489},{"schema":1608256158159,"derHash":"m/7T2dyVI2vP/LNdSxINsOOGf2Kx/QFako2gswOWZoM=","subject":"CN=DigiCert High Assurance TLS RSA SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"007b4991e764dfb6fc682cc922b8e457508cb343dfd1edc993260455daaf7c3b","size":1748,"filename":"KKzhMaY72_nD-ZVShAg153XyomvfRUrrKjaWxh3ZCRo=.pem","location":"security-state-staging/intermediates/d3e8c2ab-b791-4d1a-9686-b3075fe8b947.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KKzhMaY72/nD+ZVShAg153XyomvfRUrrKjaWxh3ZCRo=","crlite_enrolled":false,"id":"44ffb93f-8613-4234-ae12-7682b310843a","last_modified":1608321440478},{"schema":1608234551224,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"c0ac75ba366ac172e14ea829ea033e50cfad846dda99a812e6cc75e5ee716e26","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/7d4b43b6-4fd7-4438-a41f-6edb60308600.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"547c8ddc-885a-4577-b1a9-9c8488b81b16","last_modified":1608321440466},{"schema":1608256163558,"derHash":"YD23B6WEADvtbx1D3NTq4TzRjXmOgn3i86MfMZP8Daw=","subject":"CN=NII Open Domain CA - G7 RSA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSQwIgYDVQQDExtOSUkgT3BlbiBEb21haW4gQ0EgLSBHNyBSU0E=","whitelist":false,"attachment":{"hash":"c415b80eaca6cc1fe0d46f93c28c3f50a71fdc2d34c05596ad432c7d1071765c","size":1772,"filename":"gdcmbbO--ObnWtuH5s-3w7lzQiYlLeXyMGuHZ7bgaG0=.pem","location":"security-state-staging/intermediates/921112a4-f1b9-4d7d-ab3a-4e36fab6dc15.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gdcmbbO++ObnWtuH5s+3w7lzQiYlLeXyMGuHZ7bgaG0=","crlite_enrolled":true,"id":"8e4c3aba-f9c2-4fae-891a-3f9906c7f95d","last_modified":1608321440455},{"schema":1608191356989,"derHash":"7dT7pAzTq64U8XW732cGprcoAHprRthmyge3Z0Ov9Cw=","subject":"CN=FUJIFILM Fnet CA - S2,O=FUJIFILM,C=JP","subjectDN":"MEAxCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEeMBwGA1UEAxMVRlVKSUZJTE0gRm5ldCBDQSAtIFMy","whitelist":false,"attachment":{"hash":"47545f66891e5ed5a53c7991cbcd4359aa9cb6dec5626532dac2ca678d6e15d4","size":1593,"filename":"FoZrORtfOQVQIdnaO-pphxZC_MNQQ1WYobR981Jaydk=.pem","location":"security-state-staging/intermediates/63ad0bdd-0afc-4d0e-9d2c-da6d4dd9a811.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FoZrORtfOQVQIdnaO+pphxZC/MNQQ1WYobR981Jaydk=","crlite_enrolled":true,"id":"5c93d10c-ee60-4257-80b8-06c25ca75baf","last_modified":1608321440434},{"schema":1608000560645,"derHash":"xesadjm52NcLT4Kt2AeUF17ktqPbGGGzhxfJb8GRSSc=","subject":"CN=NAVER Secure Certification Authority 1,O=NAVER BUSINESS PLATFORM Corp.,C=KR","subjectDN":"MGYxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBDb3JwLjEvMC0GA1UEAwwmTkFWRVIgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDE=","whitelist":false,"attachment":{"hash":"99d81a11ba4ee9372795e89c14a2c5c6011f433176a402bb5dd5889a378b6c0b","size":1991,"filename":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=.pem","location":"security-state-staging/intermediates/d534a023-2aac-45ec-9bca-b6f031bcf4a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=","crlite_enrolled":true,"id":"9fe92629-6232-4af7-a10f-6fe9d20f1fa8","last_modified":1608001043200},{"schema":1607996964517,"derHash":"xesadjm52NcLT4Kt2AeUF17ktqPbGGGzhxfJb8GRSSc=","subject":"CN=NAVER Secure Certification Authority 1,O=NAVER BUSINESS PLATFORM Corp.,C=KR","subjectDN":"MGYxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBDb3JwLjEvMC0GA1UEAwwmTkFWRVIgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDE=","whitelist":false,"attachment":{"hash":"99d81a11ba4ee9372795e89c14a2c5c6011f433176a402bb5dd5889a378b6c0b","size":1991,"filename":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=.pem","location":"security-state-staging/intermediates/30dde061-e042-4d6a-b9ff-b5b063040817.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=","crlite_enrolled":true,"id":"b91d1139-0ac1-45fb-bf47-cea7ab32882e","last_modified":1607997452848},{"schema":1607715692979,"derHash":"/KiES2J8Nx3kp/kQpS6OkM3CmBOqJNY3Hf0e8MFKH4Y=","subject":"SERIALNUMBER=201507,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDc=","whitelist":false,"attachment":{"hash":"e08c53caafa23be5fba08037729fa1585b1cf96c14f77428038d77f5b1670e27","size":2093,"filename":"sTL0G6l0dolGcB2vAkf3KGdhh0Glca9lcMoxggaMDQs=.pem","location":"security-state-staging/intermediates/6dc6b7a6-cead-4228-b8e4-0e086a453f57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sTL0G6l0dolGcB2vAkf3KGdhh0Glca9lcMoxggaMDQs=","crlite_enrolled":true,"id":"499c3a9b-8ef3-47e9-a544-38e54edc5ba3","last_modified":1607759852380},{"schema":1607694534261,"derHash":"bzNd181Kqh2RQPKQ6eezSYp8w1okSqMA4Ua6LZ0CuWA=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"c382d90e02609513d21d5c25d700a6f8e6b01f00b16e0cc3be89ad8d2de7a642","size":1248,"filename":"V_K2Vnq-QG5Dg_lYp-FnfgtMGvtLYZ1qAfYtkKQAILg=.pem","location":"security-state-staging/intermediates/32b8806d-e3fb-4c24-838a-25c957f58b64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V/K2Vnq+QG5Dg/lYp+FnfgtMGvtLYZ1qAfYtkKQAILg=","crlite_enrolled":false,"id":"9d98e0ae-79dc-42dd-b2ab-457585b3b2e0","last_modified":1607695036009},{"schema":1607694531126,"derHash":"pgMsw1Lx4uNijhYqMEe8fWR+LWAaLA8myq+ar3pUI5w=","subject":"CN=GlobalSign Atlas R3 OV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"87bb6f2c47bbed017d590d273e3e104b9a51d89c90f2d746b6d5c6b22a32b5e5","size":1691,"filename":"q8RzYVnv8u4WxSzLeEvOffFfpsrmgSIHiNuWJdK7BlU=.pem","location":"security-state-staging/intermediates/45a9ec2b-ccc8-4abc-9d7c-a2ad83a3fca5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q8RzYVnv8u4WxSzLeEvOffFfpsrmgSIHiNuWJdK7BlU=","crlite_enrolled":false,"id":"5176fc36-9fd7-446d-aa9d-773e2d5f82c2","last_modified":1607695035994},{"schema":1607694532759,"derHash":"LrihMXKI8IIz5og86+Z+pqCYniKspCxY1Z9ag04CxRM=","subject":"CN=GlobalSign Atlas ECCR5 OV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"0da48dd5abf0b542d1a4a62dc458f758e9c3517117e8ec13525dc3dc3e0ac628","size":1248,"filename":"pE2Mn6zDBy5ZUUx_Fz25_Wr_c2YZWOT8FCJpeRfpTXQ=.pem","location":"security-state-staging/intermediates/c3fa086f-e7d9-478c-8836-1bc02ce096dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pE2Mn6zDBy5ZUUx/Fz25/Wr/c2YZWOT8FCJpeRfpTXQ=","crlite_enrolled":false,"id":"7313f33d-0022-4715-8279-106b6ce53a40","last_modified":1607695035982},{"schema":1607676521432,"derHash":"WfX/krYIoBGf8d18YD4OsW9P6tnUcXrDvGLShq45nNo=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"978bbc0b5187a94f5a992a6478523b1f397eaf3bfd62a8b8256dc53cc30af2bb","size":1691,"filename":"qHEiXUiOfz6Ni9Jz-z5RQSnsI3DqTIU9kw0X_YkfXsU=.pem","location":"security-state-staging/intermediates/15b5c177-d7da-4308-9c80-e5eb34a8193e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHEiXUiOfz6Ni9Jz+z5RQSnsI3DqTIU9kw0X/YkfXsU=","crlite_enrolled":false,"id":"93403c3f-2de2-47f2-9594-d1e0c59935f0","last_modified":1607677034093},{"schema":1607672928470,"derHash":"WfX/krYIoBGf8d18YD4OsW9P6tnUcXrDvGLShq45nNo=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"978bbc0b5187a94f5a992a6478523b1f397eaf3bfd62a8b8256dc53cc30af2bb","size":1691,"filename":"qHEiXUiOfz6Ni9Jz-z5RQSnsI3DqTIU9kw0X_YkfXsU=.pem","location":"security-state-staging/intermediates/9e8e5ad0-dd70-48a0-9802-7115a4b06295.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHEiXUiOfz6Ni9Jz+z5RQSnsI3DqTIU9kw0X/YkfXsU=","crlite_enrolled":false,"id":"9ffa3358-512a-4c95-ac0f-0699656bcaad","last_modified":1607673449938},{"schema":1607241495452,"derHash":"RVtfptakcuI/CsDxwUqj9egFUyA8p/9CgPwRJQVFdP0=","subject":"CN=CrossTrust OV CA4,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBNA==","whitelist":false,"attachment":{"hash":"97a527f046f5624a30b63930ccf621cb3a3547798bbad1b604eb580bffb8488e","size":1589,"filename":"7cvw7u1H41D6YEAbLwb40cb22xC4hWT1GJJedbVdsVU=.pem","location":"security-state-staging/intermediates/ed8a8352-aa21-42b8-a131-1abe9284bf80.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7cvw7u1H41D6YEAbLwb40cb22xC4hWT1GJJedbVdsVU=","crlite_enrolled":false,"id":"47fc2392-f7e9-4142-bf2f-b04268d380c2","last_modified":1607263109979},{"schema":1607197292996,"derHash":"kAFLo7mQAYSoTKKkZW0DxgU1fyAu/z9ZF2ylTJgALLE=","subject":"CN=CrossTrust DV CA3,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBMw==","whitelist":false,"attachment":{"hash":"a4299ae8c6d64201f117d7faa1cc4ab82a9fd681134ae157d8e4d73f3048227e","size":1581,"filename":"qfSK-xETySSQi4hk8YejfqWMDWTFyNRPmj8rfRp62tA=.pem","location":"security-state-staging/intermediates/5ffe7bf6-caee-4f37-8a1b-a823dd866066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qfSK+xETySSQi4hk8YejfqWMDWTFyNRPmj8rfRp62tA=","crlite_enrolled":false,"id":"f345a14d-3b2d-4084-b276-a9357ebc2988","last_modified":1607241494575},{"schema":1607050675439,"derHash":"zx+PmJ+XXQUabw2VI65XMqOn4jRObFQPu2Q94pVRnmc=","subject":"CN=CSP SSL Service CA 4,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA0","whitelist":false,"attachment":{"hash":"5680447216a29294af84501384f90dd03d987feb70a168dc884d807c1ce6dcb1","size":2154,"filename":"6cmFGKSet-uN9lExNlA28Wy9f_epSW1jDhpODTW1QyI=.pem","location":"security-state-staging/intermediates/2efe3c65-93ec-4c6e-bc4f-8354baae1d21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6cmFGKSet+uN9lExNlA28Wy9f/epSW1jDhpODTW1QyI=","crlite_enrolled":false,"id":"fca3cb91-0e32-4135-a6e7-e231918a3734","last_modified":1607090289374},{"schema":1607050148986,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"68247409e722cb630f0449b14b3db230f4582f5b0b6b21e2acf7724783a35df9","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/ed532c05-a2de-4cc3-a825-b66ee8628364.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"0becdd95-da83-4547-ab7c-c6cbfee44235","last_modified":1607050674570},{"schema":1607046545967,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"68247409e722cb630f0449b14b3db230f4582f5b0b6b21e2acf7724783a35df9","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/57f1e4b9-a9f7-461b-ba56-09907e258ee8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"bfd16bc3-34f1-440a-a9fd-89a869068333","last_modified":1607047075462},{"schema":1606917474805,"derHash":"r+FZXnCXzN+0Ms6mOb3uhs8ldsJ982+caRzwPhMkwdQ=","subject":"CN=Trustico RSA OV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"4aaceec6690459b455ad73585e25a07a65b1b302c94a4e198062875402f68530","size":2113,"filename":"hZa79Z70L3tWUM25OQ658Ld4Rg65tj7Rn6OQXFiJPkg=.pem","location":"security-state-staging/intermediates/38b03aee-b8d2-4bb3-982e-18487f59c304.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hZa79Z70L3tWUM25OQ658Ld4Rg65tj7Rn6OQXFiJPkg=","crlite_enrolled":false,"id":"fff9a2df-08f2-4fef-b8f3-e1462f74c9dd","last_modified":1606939082092},{"schema":1606917034925,"derHash":"Efukp+5XnHDh1X+fm2qMIJ4SGcTx04Rvg//OdOnl4s4=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBFVg==","whitelist":false,"attachment":{"hash":"b45919819e02ad79724a514eaf858e77f666b1352e04efbd7b970ef878509a6a","size":1776,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/fa38118a-b0dd-4170-b25b-2077e50db1af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"036fbcb0-0139-4457-840c-cb0e018adfe6","last_modified":1606917473706},{"schema":1606916930155,"derHash":"Efukp+5XnHDh1X+fm2qMIJ4SGcTx04Rvg//OdOnl4s4=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBFVg==","whitelist":false,"attachment":{"hash":"b45919819e02ad79724a514eaf858e77f666b1352e04efbd7b970ef878509a6a","size":1776,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/2c39ac03-7820-4419-beb2-d08951cc6726.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"7f207e9f-d31a-4ba4-957d-09d4f8291836","last_modified":1606917473688},{"schema":1606916931468,"derHash":"q3SxQRrSPiIn+4iiqTBKGkWlxIQLNjXxA2pG6DdCeaw=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBPVg==","whitelist":false,"attachment":{"hash":"1289ff9c033377f8edc9f2ded9318205d7263d8c7040b70ff2db68630eaac699","size":1776,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/d46e5729-e1a1-4a1d-b398-9fae0f398bf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"c9dfa791-474d-4cd4-b016-5e238a4e2c8f","last_modified":1606917473670},{"schema":1606916931901,"derHash":"q3SxQRrSPiIn+4iiqTBKGkWlxIQLNjXxA2pG6DdCeaw=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBPVg==","whitelist":false,"attachment":{"hash":"1289ff9c033377f8edc9f2ded9318205d7263d8c7040b70ff2db68630eaac699","size":1776,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/7ff46c16-7f19-481d-b990-fd4bc6aabfe9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"3908bde0-cc20-4ee6-af97-f8c7e04833ac","last_modified":1606917473651},{"schema":1606916930579,"derHash":"uxcLOXhNAnhDJc6pONkjFMYX3egIyGfjPirRYdVLPoo=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gRVY=","whitelist":false,"attachment":{"hash":"19fefd4f70ea48cb5d6ea309efe68d11ffa03632cea4cfeec8dc09417da36fa2","size":1837,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/d2973af0-94cb-4052-9f9a-a6c552deb9a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"cc2e3096-5b34-4e12-8901-72cacec6b510","last_modified":1606917473614},{"schema":1606916929707,"derHash":"5ukpyEVsAU6NpzOs5OmBRVInK4EXYFChPqRagjIAsUs=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gT1Y=","whitelist":false,"attachment":{"hash":"19cb0ae44011765535de42c22ddec245a2178d13094aa7cc8d2ebfe5143caa64","size":1837,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/801d6b0f-a466-4902-99e1-de0020c43f0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"e78a46ec-c8ec-4fbb-9d87-67247c3ba782","last_modified":1606917473595},{"schema":1606830635261,"derHash":"IIOI6/mbEhiIUvEd15Rme145laJ2etslXpuPXUz1BXY=","subject":"CN=CertCloud RSA EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"12724d564e2cbda02a9fc1327e4c62a1bc03b1b2e93f870d923346a811dc27a5","size":2109,"filename":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa_MxbJugEHms=.pem","location":"security-state-staging/intermediates/e4655ca7-9066-423f-985a-340112104daf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa/MxbJugEHms=","crlite_enrolled":true,"id":"172b1f94-1468-4b3a-8538-b1071e17c256","last_modified":1606831071215},{"schema":1606830533191,"derHash":"cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=","subject":"CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872","size":2081,"filename":"ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem","location":"security-state-staging/intermediates/3b08e799-b31b-4131-a15e-06ba6cd0b067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=","crlite_enrolled":true,"id":"1e513d59-b8f5-4b2d-b079-bf21291f788f","last_modified":1606831071197},{"schema":1606830635701,"derHash":"yYqJmVEeL2CJUFOv9MU5vRtnZXVOu3s1OJaz8pdO2D8=","subject":"CN=CertCloud ECC OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8ea4ce61b55373639b30bc8f5a9bc1599c0d2d52d91a015219632c719b540bb9","size":1240,"filename":"q6ASqDW7KvwqyTSX_m1w95QebvKZnwudV__ETDG8YTc=.pem","location":"security-state-staging/intermediates/50537f53-efe3-47c3-934b-9e406a3ffdce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6ASqDW7KvwqyTSX/m1w95QebvKZnwudV//ETDG8YTc=","crlite_enrolled":true,"id":"677706c1-d0ab-48a0-9227-8df475ae33b1","last_modified":1606831071178},{"schema":1606830532323,"derHash":"IIOI6/mbEhiIUvEd15Rme145laJ2etslXpuPXUz1BXY=","subject":"CN=CertCloud RSA EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"12724d564e2cbda02a9fc1327e4c62a1bc03b1b2e93f870d923346a811dc27a5","size":2109,"filename":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa_MxbJugEHms=.pem","location":"security-state-staging/intermediates/d12087b1-5f70-4a41-8e7f-7a3fdbda8505.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa/MxbJugEHms=","crlite_enrolled":true,"id":"02e3f60f-46b3-4774-9f8c-0bc4cc9893db","last_modified":1606831071159},{"schema":1606830531854,"derHash":"cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=","subject":"CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872","size":2081,"filename":"ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem","location":"security-state-staging/intermediates/85b0d8c2-29b3-4346-9080-e95bce35f8b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=","crlite_enrolled":true,"id":"b87a1d31-36bc-448e-ba4b-6a58e79386ba","last_modified":1606831071136},{"schema":1606830532756,"derHash":"yYqJmVEeL2CJUFOv9MU5vRtnZXVOu3s1OJaz8pdO2D8=","subject":"CN=CertCloud ECC OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8ea4ce61b55373639b30bc8f5a9bc1599c0d2d52d91a015219632c719b540bb9","size":1240,"filename":"q6ASqDW7KvwqyTSX_m1w95QebvKZnwudV__ETDG8YTc=.pem","location":"security-state-staging/intermediates/c59c8cb7-d94d-4f73-8a7f-702018c3797f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6ASqDW7KvwqyTSX/m1w95QebvKZnwudV//ETDG8YTc=","crlite_enrolled":true,"id":"577f165f-8a63-4889-afea-e7ee828bc7c3","last_modified":1606831071111},{"schema":1606787357745,"derHash":"I+ywPuwXM4xOM6a0ikHcPNoSKBu8P/gTwFidbMI4dSI=","subject":"CN=GTS CA 1C3,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUMz","whitelist":false,"attachment":{"hash":"88a6ecb70d888765711d7b8ea76f793d4b228fedad48e215e01fc948196b7baf","size":1995,"filename":"zCTnfLwLKbS9S2sbp-uFz4KZOocFvXxkV06Ce9O5M2w=.pem","location":"security-state-staging/intermediates/8274b76f-2423-4a90-b8c0-15fb22c3d9a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zCTnfLwLKbS9S2sbp+uFz4KZOocFvXxkV06Ce9O5M2w=","crlite_enrolled":true,"id":"bb2cfbac-beea-4199-9bfb-7822a906f054","last_modified":1606787861390},{"schema":1606787486997,"derHash":"ZOKGt2BjYCo3Lv1gzejbJlaknuFehCVLPW61/jj0KIs=","subject":"CN=GTS CA 1D4,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUQ0","whitelist":false,"attachment":{"hash":"3eeab8b593f9b526e5e441336b3c99ef183d6618c02890e5bab1825e1a95744b","size":1983,"filename":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=.pem","location":"security-state-staging/intermediates/a56bd323-af0f-48aa-9258-720471d08a2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=","crlite_enrolled":true,"id":"06a19215-a3f8-41c0-b91d-c0119027036e","last_modified":1606787861369},{"schema":1606753452631,"derHash":"ZOKGt2BjYCo3Lv1gzejbJlaknuFehCVLPW61/jj0KIs=","subject":"CN=GTS CA 1D4,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUQ0","whitelist":false,"attachment":{"hash":"3eeab8b593f9b526e5e441336b3c99ef183d6618c02890e5bab1825e1a95744b","size":1983,"filename":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=.pem","location":"security-state-staging/intermediates/2e90889f-7abd-4634-9a0e-0b6484068790.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=","crlite_enrolled":true,"id":"d80b8959-3c46-49da-8258-57d90d760838","last_modified":1606787861349},{"schema":1606787357308,"derHash":"I+ywPuwXM4xOM6a0ikHcPNoSKBu8P/gTwFidbMI4dSI=","subject":"CN=GTS CA 1C3,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUMz","whitelist":false,"attachment":{"hash":"88a6ecb70d888765711d7b8ea76f793d4b228fedad48e215e01fc948196b7baf","size":1995,"filename":"zCTnfLwLKbS9S2sbp-uFz4KZOocFvXxkV06Ce9O5M2w=.pem","location":"security-state-staging/intermediates/d5e42a4e-f2c4-48cb-b4db-dff2bdeaa25a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zCTnfLwLKbS9S2sbp+uFz4KZOocFvXxkV06Ce9O5M2w=","crlite_enrolled":true,"id":"006e939d-ce4c-47b3-83b6-1106c0cbe038","last_modified":1606787861330},{"schema":1606744134795,"derHash":"kxqqHsmyug+lmoIwL0+DBijIbZstKlCk0bLOiVxMxkg=","subject":"CN=Actalis Organization Validated Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGJMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"71fafcd9a9832cc1330204b9331c40ce9c1fbcedeb9bd11114cd6cc2e1618b06","size":2645,"filename":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=.pem","location":"security-state-staging/intermediates/eedc60b7-37aa-42bf-bad4-6909eaa5094d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=","crlite_enrolled":false,"id":"62176a9a-7824-4b40-9921-687fd3033eb6","last_modified":1606744672041},{"schema":1606744133804,"derHash":"kxqqHsmyug+lmoIwL0+DBijIbZstKlCk0bLOiVxMxkg=","subject":"CN=Actalis Organization Validated Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGJMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"71fafcd9a9832cc1330204b9331c40ce9c1fbcedeb9bd11114cd6cc2e1618b06","size":2645,"filename":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=.pem","location":"security-state-staging/intermediates/6a86241e-e0c9-4fa3-9aa2-ff1afa4b55b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=","crlite_enrolled":false,"id":"3107a9df-8e66-4472-ad36-f1062492c3e0","last_modified":1606744672021},{"schema":1606678892869,"derHash":"ROvwEj4n/x2wSXvS2uGBVbKkFOa82cbI+49IOYRJuek=","subject":"CN=TeleSec Business CA 1,OU=T-Systems Trust Center,O=T-Systems International GmbH,C=DE","subjectDN":"MHUxCzAJBgNVBAYTAkRFMSUwIwYDVQQKExxULVN5c3RlbXMgSW50ZXJuYXRpb25hbCBHbWJIMR8wHQYDVQQLExZULVN5c3RlbXMgVHJ1c3QgQ2VudGVyMR4wHAYDVQQDExVUZWxlU2VjIEJ1c2luZXNzIENBIDE=","whitelist":false,"attachment":{"hash":"5f456791aae0975819a267a4b01e2b4e0fcb12b375c5334b5a72562eefa58948","size":1947,"filename":"XmXOT9NXQoum_vwr876xEH0qCXmA3ZncBDyibtkXpQU=.pem","location":"security-state-staging/intermediates/085cace9-264b-4a9a-9330-f554e6585359.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XmXOT9NXQoum/vwr876xEH0qCXmA3ZncBDyibtkXpQU=","crlite_enrolled":false,"id":"eda28108-1b54-44e6-b8c5-1b6afcf10b67","last_modified":1606744671982},{"schema":1606506095774,"derHash":"G095TXcNxuBdx6QVhFD4JZVy621Z3mZ6PD++CNoBJIE=","subject":"CN=Global Trust CA - OV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"136048afa3b294583ccc15f0a0a6102dcca6cc9bf7d5c19811460c54c4e79fce","size":2089,"filename":"K6VGZ_ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV-Oe8U=.pem","location":"security-state-staging/intermediates/002c6e58-6238-435b-9b0d-7b0691d17ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K6VGZ/ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV+Oe8U=","crlite_enrolled":true,"id":"d6d94677-fd6d-4901-bbae-6817f8abcd97","last_modified":1606636669583},{"schema":1606333742190,"derHash":"M55rkr5UWfJqjcPF83IJM8g44jZgGwUASMBHoSPm+Oc=","subject":"CN=Sectigo Qualified Website Authentication CA Natural R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MG0xCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMUAwPgYDVQQDEzdTZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIE5hdHVyYWwgUjM1","whitelist":false,"attachment":{"hash":"2fdbc0c44bbbeb793ee6210c10f58a2b439a31b2c4f3ad98fc85188c1f0f7741","size":2272,"filename":"8SDm7JR9Lr5k8CRbSJ0R2_L6J0y30uLS_XkBNMdspCI=.pem","location":"security-state-staging/intermediates/af7fd13b-b101-4e0c-b915-c07e51012dae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8SDm7JR9Lr5k8CRbSJ0R2/L6J0y30uLS/XkBNMdspCI=","crlite_enrolled":false,"id":"6e195515-4482-4668-8fe4-f5027666c37a","last_modified":1606334252701},{"schema":1606333739838,"derHash":"qYQdLkfL5tcdj6/fODh/k/Q9dteSUE77F6IQIMWMC4k=","subject":"CN=Sectigo Qualified Website Authentication CA Natural E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MG0xCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMUAwPgYDVQQDEzdTZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIE5hdHVyYWwgRTM1","whitelist":false,"attachment":{"hash":"7444706a13ee3d249ce6a3beee972c7b398c8ea8de04ca1731c7f2a672dc84f2","size":1256,"filename":"_E4OWM1It5EGPdb8mrqad2xJL7i_-r8fvlJCYaFSPu8=.pem","location":"security-state-staging/intermediates/48775c2f-29fa-4215-9452-7af9caeaf04e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/E4OWM1It5EGPdb8mrqad2xJL7i/+r8fvlJCYaFSPu8=","crlite_enrolled":false,"id":"ffb4d38b-871d-4d95-90a0-f5a3af5f65aa","last_modified":1606334252687},{"schema":1606161750920,"derHash":"zAslEu4gKAw28w1XCErLa4Y22UtIF0LkJDNcd2fnWMY=","subject":"CN=SZCA OV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgT1YgU1NMIENB","whitelist":false,"attachment":{"hash":"f14773351856d24a716ac777ab1f49b20bc3e773a90bd6e81448699608ed3745","size":1756,"filename":"bJ62__O9KMouzGPMfpN1AzgR1FpzP3mVaUCWzzs5FjI=.pem","location":"security-state-staging/intermediates/2377fa54-4f75-4365-adcf-533a61b44d4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJ62//O9KMouzGPMfpN1AzgR1FpzP3mVaUCWzzs5FjI=","crlite_enrolled":true,"id":"31bbaba6-e6cc-4825-8c0e-724e8d0c9398","last_modified":1606298245517},{"schema":1606160494313,"derHash":"oX1hDWhKT/Iokus8AyW8b36ux4cUuHZyHsuwMzV2FyY=","subject":"CN=FujiSSL Public Certification Authority - G2,O=Nijimo\\, Inc.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMRUwEwYDVQQKEwxOaWppbW8sIEluYy4xNDAyBgNVBAMTK0Z1amlTU0wgUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"af126afe4039f135d0760332f28490f6b342c6bae42eabf97eb795c14726eb23","size":1626,"filename":"9JHVNVBfHJmPYVl2MYnHpVngU078_w25VD2RfhBP-xk=.pem","location":"security-state-staging/intermediates/39b0118b-e68a-47ca-8de4-28f23d41335a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9JHVNVBfHJmPYVl2MYnHpVngU078/w25VD2RfhBP+xk=","crlite_enrolled":false,"id":"6287a280-58bd-4c6c-8833-22c9b30a93d0","last_modified":1606161750117},{"schema":1605878542738,"derHash":"vf2E2QKq0BDE4IExd1r7c2VpTugcm4ri33ZBnz7fG+E=","subject":"CN=TrustSign BR Certification Authority (OV) 2,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoT1YpIDI=","whitelist":false,"attachment":{"hash":"d3dc3d5cc6b731efb8dd4582c2ff3a8a8908962642aa4824f4b90b58832e90cd","size":2251,"filename":"YH8nyVlvrD15SoA59nrCYN5KN2y2Xz-fJ5K-uBAfl1Y=.pem","location":"security-state-staging/intermediates/c00b8ed3-5bd7-4213-8c0b-7b171e5b524a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YH8nyVlvrD15SoA59nrCYN5KN2y2Xz+fJ5K+uBAfl1Y=","crlite_enrolled":true,"id":"4d16fbc3-1ed1-40c0-940d-7abe6b7f2408","last_modified":1605945559522},{"schema":1605772140734,"derHash":"M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=","subject":"CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"7b5d64467372b9a0fe18ac79c51920708cd6c7b9c0d147b7a4a34b03d00bb358","size":1325,"filename":"qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem","location":"security-state-staging/intermediates/0c3ef7f6-26b4-4d20-9cb8-4c3b14750242.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=","crlite_enrolled":true,"id":"0a6eb392-3c5c-43f2-b690-2b1aade1bd65","last_modified":1605772704241},{"schema":1605772140264,"derHash":"M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=","subject":"CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"7b5d64467372b9a0fe18ac79c51920708cd6c7b9c0d147b7a4a34b03d00bb358","size":1325,"filename":"qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem","location":"security-state-staging/intermediates/502372d5-20f4-4deb-a9b8-3f30424dac2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=","crlite_enrolled":true,"id":"759b2da7-e5d3-4d7e-9ffe-d2f76b839a59","last_modified":1605772704220},{"schema":1605728373130,"derHash":"hDqnaDKJtx00jAh65vcaHIMTi0w5fzFtHnjJ2oZmC4Q=","subject":"SERIALNUMBER=201403,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDM=","whitelist":false,"attachment":{"hash":"2d7b611abc13145ddd774597f42e94c75815440e6a93c58100920eddebec906c","size":2093,"filename":"NOiJ9aKMOqQ8-vIWDKgcNhgjZvY5sEVcjdasO9aAZts=.pem","location":"security-state-staging/intermediates/7527cef8-47f2-4be7-82b5-ffbc4be18fa9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NOiJ9aKMOqQ8+vIWDKgcNhgjZvY5sEVcjdasO9aAZts=","crlite_enrolled":true,"id":"b255a018-1cfd-4cb0-a8c2-5afafbdcc29c","last_modified":1605772704200},{"schema":1605533478416,"derHash":"90w7LH5FXWVNnuWqpxJ4nMsme5YcGhzkimnIYM0ZNng=","subject":"CN=Thawte EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBFQ0MgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"029e038309e109b338a8e5d3d4e6300803b81c7d7d64ed413d523864ea9f6f9d","size":1390,"filename":"sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS_jwKtxLc=.pem","location":"security-state-staging/intermediates/c4cea83a-c04d-4940-8b0e-62cf421b3779.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS/jwKtxLc=","crlite_enrolled":true,"id":"fe536340-3673-4218-bc86-b13888ae9bf3","last_modified":1605578284427},{"schema":1605123695624,"derHash":"yTGg+FoFKQEjSlT9Rg1BfxqLY8OMSBH3m5jzrhwv6fs=","subject":"CN=SECOM Passport for Member PUB CA5,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTU=","whitelist":false,"attachment":{"hash":"c65635be2bd0d20a2b0fd6d70bd227a546782c46ab1e3c6b2394239fc8cfd6cb","size":1695,"filename":"v3h5R_3OzMC-NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=.pem","location":"security-state-staging/intermediates/de481d0f-d78a-4134-95c5-8978b12cffcd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3h5R/3OzMC+NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=","crlite_enrolled":false,"id":"8cc1c1a9-82f5-425d-bc26-7033cc45e093","last_modified":1605189460438},{"schema":1604950897176,"derHash":"E+oRBESaEaH4HLl9CYxILsEqK2CetTx+YVXtCEqosJM=","subject":"CN=SECOM Passport for Member PUB CA1,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTE=","whitelist":false,"attachment":{"hash":"cbe1744ff7c3b516662a7fcf7f98a6251c21968145cac4cedf9a9f3172ff0574","size":1581,"filename":"6cgk6TZAPcY4yIiIMAg1ccG9_fhHLRXTFVWj7IrvDq4=.pem","location":"security-state-staging/intermediates/b3a3dc5c-8be0-46e0-9329-c2253f02349f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6cgk6TZAPcY4yIiIMAg1ccG9/fhHLRXTFVWj7IrvDq4=","crlite_enrolled":false,"id":"3bda166d-f610-4dee-9b49-3b63bba2ef5b","last_modified":1605081484966},{"schema":1604908139751,"derHash":"15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=","subject":"CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"388fede353d5e81549d7a9a264bceab472ffc7eff4991123ac93299f4a9ebfe3","size":1536,"filename":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem","location":"security-state-staging/intermediates/14b3ab45-1d4e-450b-9224-99c237082b97.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=","crlite_enrolled":true,"id":"61051771-39c7-4792-994d-f7e1b8f69254","last_modified":1604908666929},{"schema":1604778093487,"derHash":"15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=","subject":"CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"388fede353d5e81549d7a9a264bceab472ffc7eff4991123ac93299f4a9ebfe3","size":1536,"filename":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem","location":"security-state-staging/intermediates/f4b4778a-4e0c-4756-bf8f-075982ede557.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=","crlite_enrolled":true,"id":"2e597179-5b56-4fea-bf13-6d641de8d405","last_modified":1604908666908},{"schema":1604605293287,"derHash":"LmsV+e7R69YtJ1aR+T3JQ/kN0eCvEYkGYZxXfXUpi9o=","subject":"CN=CrossTrust DV CA4,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBNA==","whitelist":false,"attachment":{"hash":"e44f47a3381c3bd6aad3c0e85f6aac99405404d194c82777031a54eca4500dad","size":1589,"filename":"bzFxWlFhCb1TJC-ZiW0DXANo9uoO45khqSeMELmYpJ8=.pem","location":"security-state-staging/intermediates/2beceff3-685f-42a3-b31b-2f13ed3711f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bzFxWlFhCb1TJC+ZiW0DXANo9uoO45khqSeMELmYpJ8=","crlite_enrolled":false,"id":"22cc58f6-abf4-4039-92e1-6739f9c77c7d","last_modified":1604649438460},{"schema":1604524708530,"derHash":"3pjRCJ+u+Ol9jEKPIYrKDtF8Vc+zVxEl5aURiameKJg=","subject":"SERIALNUMBER=201502,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMg==","whitelist":false,"attachment":{"hash":"f6fd663baa7ee87b66e0d41b4d6d83d993a00817f1591bdd92cb0340672c10f5","size":2097,"filename":"JBmS5WYsQXSCs7cj9Y7nmmgLd8xpVrpdsZFXcnD15HU=.pem","location":"security-state-staging/intermediates/812ee2d5-773e-4345-ad5c-fa142a66fab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JBmS5WYsQXSCs7cj9Y7nmmgLd8xpVrpdsZFXcnD15HU=","crlite_enrolled":false,"id":"c2109866-4770-49a8-abec-da2ea0083799","last_modified":1604541499405},{"schema":1604389849675,"derHash":"JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=","subject":"CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"7f449f1e3178f1a2603b8177a108b02654caa02203944597174e3f46651ba513","size":1764,"filename":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem","location":"security-state-staging/intermediates/7485d12b-9344-4c47-ac5b-288655151f37.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=","crlite_enrolled":true,"id":"6261e4b7-bb37-4f81-98ea-f94e5bd6e51a","last_modified":1604390293643},{"schema":1604389737473,"derHash":"H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=","subject":"CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"be6d0e35f0c53e7c0af632d9bdf5dabd2be82214fc5e1c990c2bb46537d41287","size":1776,"filename":"Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem","location":"security-state-staging/intermediates/df6e4082-7b47-4af2-8d24-f1add41951d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=","crlite_enrolled":true,"id":"6dc04366-cd3f-4bd3-8b1e-25fcf12fb005","last_modified":1604390293622},{"schema":1604325493707,"derHash":"JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=","subject":"CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"7f449f1e3178f1a2603b8177a108b02654caa02203944597174e3f46651ba513","size":1764,"filename":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem","location":"security-state-staging/intermediates/4017d719-9895-4e22-9126-8a0f51a90435.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=","crlite_enrolled":true,"id":"574b122c-db71-4b2e-9e17-0037916e0d24","last_modified":1604390293602},{"schema":1604389736973,"derHash":"H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=","subject":"CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"be6d0e35f0c53e7c0af632d9bdf5dabd2be82214fc5e1c990c2bb46537d41287","size":1776,"filename":"Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem","location":"security-state-staging/intermediates/c4681dc7-0e43-4ac0-8bc3-34144df38b63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=","crlite_enrolled":true,"id":"35a1d22d-443b-417b-a403-ff057dc50c1c","last_modified":1604390293581},{"schema":1604163572112,"derHash":"qq/pPjWbFJpMngtXLVG/N/2jin6aNZv5A1m6nKqWqt8=","subject":"CN=Atos TrustedRoot Server-CA 2013,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgU2VydmVyLUNBIDIwMTMxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"3a6282f735ea66c38369711f7a511e7a8f40608ccbb6adb005af1b94bad5d4de","size":1561,"filename":"obLbX6ExWI0XXj12lo4-ITcs5rF7AE6dzl2X86Q8EpI=.pem","location":"security-state-staging/intermediates/69a41bd1-a437-463d-b4ba-83c2a65e4936.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"obLbX6ExWI0XXj12lo4+ITcs5rF7AE6dzl2X86Q8EpI=","crlite_enrolled":false,"id":"a25c486d-fc0f-4770-9864-911e40701c9b","last_modified":1604325492885},{"schema":1603979716226,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/bb2dc257-d008-42de-ac7f-5c5c5da83a16.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"1625200c-4327-47a5-ac76-3eeb94c77907","last_modified":1603983473695},{"schema":1603979451595,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/b446caf5-e02c-44cd-a182-fe46d91d9d58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"cfb41545-0746-4be6-8d75-5a993a4ac7f5","last_modified":1603983473670},{"schema":1603979907768,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/3aa18798-246a-4c38-aaf6-d0ba69875c58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"251b1a67-1d3e-4e59-83cb-1523c2461f64","last_modified":1603983473633},{"schema":1603789063900,"derHash":"ogZkT1ev0QuUFpSYhYmBwW1jOFjODIi1fPFPoqkqrP0=","subject":"CN=Secure Site Pro ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlNlY3VyZSBTaXRlIFBybyBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"e293173433a0678dd0c07a0432db8bc25e796896b84c9cfb996a1234d78528d2","size":1443,"filename":"jqgpMe3J72LhpK4BfQvcmwg-Oh-RwdZH-swdUvq8F9k=.pem","location":"security-state-staging/intermediates/9620ee73-5f68-44bd-b368-b0ca0bcc7153.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jqgpMe3J72LhpK4BfQvcmwg+Oh+RwdZH+swdUvq8F9k=","crlite_enrolled":false,"id":"d9d951a6-56f3-4229-8405-898b7f223384","last_modified":1603850281659},{"schema":1603849736165,"derHash":"fsjnqkIZXpo2uFjilmnqo31XsTr6IzG9rqah6/fkbn4=","subject":"CN=CertCenter Enterprise ECC EV CA,OU=Controlled by COMODO CA exclusively for CertCenter AG,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MIGyMQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMRAwDgYDVQQHEwdHaWVzc2VuMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgQ2VydENlbnRlciBBRzEoMCYGA1UEAxMfQ2VydENlbnRlciBFbnRlcnByaXNlIEVDQyBFViBDQQ==","whitelist":false,"attachment":{"hash":"ad13f4a2c2b0453bcad7768dfb8aa9dd9abf52d18d9b3381705fe30226d297cc","size":1414,"filename":"9IEsy6v-cBI7ee5Y4xt277Tel65rfvCSsKBMLrGfjVI=.pem","location":"security-state-staging/intermediates/4c478c30-a765-41e1-95bd-ee2f0924ed09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9IEsy6v+cBI7ee5Y4xt277Tel65rfvCSsKBMLrGfjVI=","crlite_enrolled":false,"id":"02b2f900-f9fa-411c-9402-75944e3fdbbf","last_modified":1603850281630},{"schema":1603741294890,"derHash":"PF45H9jKOyFhRJViSuWynzntBmEktZRDj5SUs0NDx5U=","subject":"CN=EuropeanSSL High Assurance Server CA 2,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MIGIMQswCQYDVQQGEwJERTEbMBkGA1UECAwSQmFkZW4tV8O8cnR0ZW1iZXJnMRQwEgYDVQQHEwtEdXJtZXJzaGVpbTEVMBMGA1UEChMMRVVORVRJQyBHbWJIMS8wLQYDVQQDEyZFdXJvcGVhblNTTCBIaWdoIEFzc3VyYW5jZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"b7ee97e44a0b08b84600f14d91999274d13538fbe487ae5bbe2ffeda760373f7","size":2166,"filename":"HhU8wZ-rl8VgXaRRv_XdnUCKI8eLRVXfTeY77HdaQ3Y=.pem","location":"security-state-staging/intermediates/f4cdda25-89ad-4ed5-8091-82787a46cd76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HhU8wZ+rl8VgXaRRv/XdnUCKI8eLRVXfTeY77HdaQ3Y=","crlite_enrolled":true,"id":"a64ae3ed-7e46-4997-83b9-78bead9c29f5","last_modified":1603785478255},{"schema":1603784937046,"derHash":"C9FHkYe6Aeo+k4p1DHveO28oXcEOu5lTA/ZmAbpbLSA=","subject":"CN=WebSpace-Forum Server CA II,O=WebSpace-Forum e.K.,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHMxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEcMBoGA1UEChMTV2ViU3BhY2UtRm9ydW0gZS5LLjEkMCIGA1UEAxMbV2ViU3BhY2UtRm9ydW0gU2VydmVyIENBIElJ","whitelist":false,"attachment":{"hash":"7768f5bec77dbbbde9e9572bc1c4098d4a05278998998904ac61c71b62987df1","size":2133,"filename":"5RYmGs6llHArO1X6YMpESuHfz0WJ0hjDErS2_5y9hWo=.pem","location":"security-state-staging/intermediates/892d5f14-b84e-460c-b541-1c43bd0b45f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5RYmGs6llHArO1X6YMpESuHfz0WJ0hjDErS2/5y9hWo=","crlite_enrolled":true,"id":"28961bab-dbd4-41f9-a1f3-d6fbd473a508","last_modified":1603785478231},{"schema":1603568492594,"derHash":"dnvCnbma9MKmJkkADRcvxswtCdQIxMq2qNmaHdXc99s=","subject":"CN=CertCenter Enterprise ECC DV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"f8716a70364bdbf780503d8d9ac1bacd7600d5f66e511193c3337cf92df9e24a","size":3756,"filename":"zuRQp-iYZxMyj8bp4pFJtJ30vMQId6DXMagFWZ9jfmU=.pem","location":"security-state-staging/intermediates/b0afc492-2be7-4ad1-923d-89b25034dc22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zuRQp+iYZxMyj8bp4pFJtJ30vMQId6DXMagFWZ9jfmU=","crlite_enrolled":false,"id":"719f84ba-e1e8-4bdd-a10b-76268634b5d7","last_modified":1603591065213},{"schema":1603504182613,"derHash":"3CcoMxMS51xNe0QvO92nkMt3qdashU1bzhisQ8pZkJo=","subject":"CN=ATT Atlas R3 OV TLS CA 2020,O=ATT Services Inc,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBBVFQgU2VydmljZXMgSW5jMSQwIgYDVQQDExtBVFQgQXRsYXMgUjMgT1YgVExTIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"e93ec3c93798a4c69c537ee7a488670b0c74cf8ea19467445243e440fc143d44","size":1699,"filename":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa-HSRf4=.pem","location":"security-state-staging/intermediates/e319120e-f55a-4fb8-acd8-2770716a5481.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa+HSRf4=","crlite_enrolled":true,"id":"461f5fb1-2c7d-4292-92b0-c3b6b9545359","last_modified":1603504658778},{"schema":1603504181937,"derHash":"3CcoMxMS51xNe0QvO92nkMt3qdashU1bzhisQ8pZkJo=","subject":"CN=ATT Atlas R3 OV TLS CA 2020,O=ATT Services Inc,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBBVFQgU2VydmljZXMgSW5jMSQwIgYDVQQDExtBVFQgQXRsYXMgUjMgT1YgVExTIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"e93ec3c93798a4c69c537ee7a488670b0c74cf8ea19467445243e440fc143d44","size":1699,"filename":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa-HSRf4=.pem","location":"security-state-staging/intermediates/38da369b-01f7-4c44-8faf-e99f6ec6cb1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa+HSRf4=","crlite_enrolled":true,"id":"975baf8e-91bf-44e3-8f33-57c1e8df8a23","last_modified":1603504658759},{"schema":1603421850516,"derHash":"71ZjFC9bLWuCdFKbFX3y+WWnGHOlrlql4HICRPI5i28=","subject":"CN=CertCenter Enterprise RSA EV CA,OU=Controlled by COMODO CA exclusively for CertCenter AG,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MIGyMQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMRAwDgYDVQQHEwdHaWVzc2VuMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgQ2VydENlbnRlciBBRzEoMCYGA1UEAxMfQ2VydENlbnRlciBFbnRlcnByaXNlIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"64e8335938bbaaed651bd59a9b50e97bfe919c616430e117a5ab454247a4949e","size":2255,"filename":"CaGpyyfpmNg5jcDd5cWMfcPMbbqa5_5gKWvNRcBjqoA=.pem","location":"security-state-staging/intermediates/99b11aff-7143-4874-8b2d-03b88f194e89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CaGpyyfpmNg5jcDd5cWMfcPMbbqa5/5gKWvNRcBjqoA=","crlite_enrolled":false,"id":"74d7ba69-fd50-4a4a-947c-c4d634776f86","last_modified":1603504658740},{"schema":1603395693272,"derHash":"MkC4HG31Uq6hbXAinb/v8k1Q6qmiJyORiI9lvpW0UOM=","subject":"CN=CertCenter Enterprise RSA OV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"f0ef15c657a987fd884de4d2445f0e2311d7cecef612a3443bcc050eac65d0ae","size":2138,"filename":"ke_AQ9WF4UMSgAU_wMJhEjKM4oBlpoIH0lidCk0FTIM=.pem","location":"security-state-staging/intermediates/97f31fbd-c914-4077-9d2f-90ed3d7eec32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ke/AQ9WF4UMSgAU/wMJhEjKM4oBlpoIH0lidCk0FTIM=","crlite_enrolled":false,"id":"205e175a-96fc-44bc-b8ba-0dd4c7881485","last_modified":1603418262238},{"schema":1603417750565,"derHash":"wG7UFefe0G5aSgg6gCX2XkXU5GtjUema20feSLAvi+0=","subject":"CN=CertCenter Enterprise RSA DV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"73c39b45f6be720b687e13337fa318950c5887b8e1fae66aa0d7c83bd7b66dfe","size":2133,"filename":"FfDDB8UNFaSYYtmGpdb9uuU8NXG50-ypsKYjpMCN2c0=.pem","location":"security-state-staging/intermediates/8d50283b-4b41-4218-9f3b-5a1bdac55359.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FfDDB8UNFaSYYtmGpdb9uuU8NXG50+ypsKYjpMCN2c0=","crlite_enrolled":false,"id":"980e074c-1142-4749-9f90-b1d7d8e5f3b2","last_modified":1603418262218},{"schema":1603331414283,"derHash":"GLtw79o/kUOBFcnrTzM+tOxoNUVx5pSRlaCpHJ5vvNg=","subject":"CN=QuoVadis RCA1G3 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0ExRzMgVExTIENB","whitelist":false,"attachment":{"hash":"b3bb67e5eae26a4c94edb219c24b0b5e4b61ccf76dfc1f6b45000e822a22ceb3","size":2369,"filename":"oVTzYxEWPWmbDlo2GZhwL-6my7pLP_DO_Q5zS0j4erM=.pem","location":"security-state-staging/intermediates/0142a491-80f0-4728-bbff-4b23436aafa0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oVTzYxEWPWmbDlo2GZhwL+6my7pLP/DO/Q5zS0j4erM=","crlite_enrolled":false,"id":"6737f4c2-a14c-4b1d-8e0c-b062884b238a","last_modified":1603331864382},{"schema":1603331409918,"derHash":"7MDResMmOsahZNzbCPgtB+k/zqcj9muIsG7rqWeN8rs=","subject":"CN=QuoVadis RCA3G3 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzMgVExTIENB","whitelist":false,"attachment":{"hash":"fc4fc6584822834debd279e4a8481536c6bd26913df00dda003fbc4ed5facf42","size":2369,"filename":"HGG1eHmdWucI4rZV77-UwfI3jqj3-wm0NFUmWbyNZvs=.pem","location":"security-state-staging/intermediates/098ff8c0-cbd6-4de0-93e9-b29fc7971c7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGG1eHmdWucI4rZV77+UwfI3jqj3+wm0NFUmWbyNZvs=","crlite_enrolled":false,"id":"c4121d69-d075-4111-9d27-6dbed565f530","last_modified":1603331864371},{"schema":1603331412138,"derHash":"a7lkZHte5hWaKgKe5cfc0dnPOwiEUeCmjpDmB0w/XKM=","subject":"CN=QuoVadis RCA1G1 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0ExRzEgVExTIENB","whitelist":false,"attachment":{"hash":"34870e705e578bbcd98319ac5f84b11e5770d2ad43f4dfe76db0785c91777fdb","size":2089,"filename":"Qvjdi2jwbwNDElJ0tj6ROtrf4nU-v9QUSIl7Mk_pIgk=.pem","location":"security-state-staging/intermediates/d3959276-8446-44d6-bbf5-d30de62aeabd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qvjdi2jwbwNDElJ0tj6ROtrf4nU+v9QUSIl7Mk/pIgk=","crlite_enrolled":false,"id":"0e7c9134-ab1c-4f19-846d-30587aaac2be","last_modified":1603331864359},{"schema":1603331407633,"derHash":"OmbmSCEuYyH5TZ6rzJLAUuZ52ZLJmtRZak57ha3O5d4=","subject":"CN=QuoVadis RCA3G1 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzEgVExTIENB","whitelist":false,"attachment":{"hash":"e5c77c38ef33f161625bc3592afbf547db64bc8507aff887efbd2902cd674003","size":2361,"filename":"cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp_y4=.pem","location":"security-state-staging/intermediates/4251568a-3965-4fe1-81c3-100b6c736472.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp/y4=","crlite_enrolled":false,"id":"6eca33ec-4f64-4e1a-9686-48926a7dccbd","last_modified":1603331864347},{"schema":1603241851952,"derHash":"qmHCkn3InbIlypoX1gA3PQWPaW2G0Q4r17Xo9EqX7tE=","subject":"CN=WoSign OV SSL Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIE9WIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"afb1ffcaed2f65ba6080da16e771b2fd79536ffb5f81dc7fd0f22152661e7331","size":1666,"filename":"YgNpzwCbB-5jnp9Vn5xVC090y79oIjE_2P8pF1_4DMI=.pem","location":"security-state-staging/intermediates/4aef0608-20c1-4fb7-b413-e1f6b8d8ccf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YgNpzwCbB+5jnp9Vn5xVC090y79oIjE/2P8pF1/4DMI=","crlite_enrolled":false,"id":"ff45948b-1310-4371-a262-b582c5ad0bbb","last_modified":1603245450595},{"schema":1603205963547,"derHash":"kzuA97lyVd9c8dlaEj6QFyLdswtIGvOqg1SCARGe0wM=","subject":"CN=AC Firmaprofesional - Secure Web 2020,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGTMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxGjAYBgNVBAsMEVNlY3VyaXR5IFNlcnZpY2VzMS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gU2VjdXJlIFdlYiAyMDIw","whitelist":false,"attachment":{"hash":"52c3fc5e3b79e5116293a6f3f94714018b37170fcaad6cecb1a8528e12265be4","size":2304,"filename":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=.pem","location":"security-state-staging/intermediates/e90cca09-75a9-4de3-8a0c-95aee7b3a2d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=","crlite_enrolled":true,"id":"154de830-9906-4718-b472-7abb5a1a20f3","last_modified":1603209441493},{"schema":1603205802060,"derHash":"kzuA97lyVd9c8dlaEj6QFyLdswtIGvOqg1SCARGe0wM=","subject":"CN=AC Firmaprofesional - Secure Web 2020,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGTMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxGjAYBgNVBAsMEVNlY3VyaXR5IFNlcnZpY2VzMS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gU2VjdXJlIFdlYiAyMDIw","whitelist":false,"attachment":{"hash":"52c3fc5e3b79e5116293a6f3f94714018b37170fcaad6cecb1a8528e12265be4","size":2304,"filename":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=.pem","location":"security-state-staging/intermediates/a129dd72-36e3-442a-bd95-4a35a0dcec63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=","crlite_enrolled":true,"id":"140dddc9-659c-426f-a0ae-c2d82202b637","last_modified":1603209441473},{"schema":1603133839564,"derHash":"LihhKJtczt7K5MMb8mLg+wwptsFTBXNEJzHKZdgh6QE=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"bf637313289e8c27077991be26a0d07e37b59838312f06c7099b3e967081ef81","size":1589,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/9a6d9b7e-8c6d-4c3a-a77c-3e8b76b81960.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"62e33177-52e4-4dd8-acfc-f9fd671aab01","last_modified":1603137438283},{"schema":1602961037868,"derHash":"qlf0gsvFFrTRDKQJfdkNmfWqcn0gcJDQfanDaZirua0=","subject":"CN=HydrantID SSL CA G3,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHDAaBgNVBAMME0h5ZHJhbnRJRCBTU0wgQ0EgRzM=","whitelist":false,"attachment":{"hash":"7e0808e92ebc33ef96558a3d7c46b9b86290ea9b9c814fe1b375dd5f6e94179f","size":2414,"filename":"CgDzm8Z-Gk0j7D6yq4U4IstjpiYpBiVqyPDYr-62oO8=.pem","location":"security-state-staging/intermediates/5cbfc23e-7d49-4372-82b5-58e1a0a3785e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CgDzm8Z+Gk0j7D6yq4U4IstjpiYpBiVqyPDYr+62oO8=","crlite_enrolled":true,"id":"b97f538d-34bf-41f2-ba3b-3ffa41cdfa5e","last_modified":1602964635139},{"schema":1602939433240,"derHash":"unmfMiWR3X0128WPSCByXwlPVDqhPLRYxVyR3Ia+Iv8=","subject":"CN=CERTDATA SSL EV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBFViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"817455fbcfc00bd641341d581d3a97196ae6a94a33f63590a5b540321bf458e8","size":2158,"filename":"cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=.pem","location":"security-state-staging/intermediates/498affb3-e1de-4edb-9347-ffb1561473e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=","crlite_enrolled":true,"id":"9b021867-2e4d-4bd5-ad39-3ba7645c4e76","last_modified":1602943040447},{"schema":1602917835280,"derHash":"dWqrkA4/XHYnNLZGH8MqndNB6h1KBCg0CSM8OXh6hn4=","subject":"CN=TrustAsia ECC OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzM=","whitelist":false,"attachment":{"hash":"2e493c5d02aaed01f99e9499d09f7808636cd52471c8ddfc79dfb5c64d83b8ac","size":1353,"filename":"tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=.pem","location":"security-state-staging/intermediates/5ea136cd-de72-4386-83f7-76fda17b499d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=","crlite_enrolled":true,"id":"13e82017-a63b-46d6-8df5-d824c3250fcc","last_modified":1602921443410},{"schema":1602766682987,"derHash":"sIwZai7R6E+YktsbYSGc62QogkePObCHGWA9BzX6A9E=","subject":"CN=CA de Certificados SSL EV,OU=BZ Ziurtagiri publikoa - Certificado publico EV,O=IZENPE S.A.,C=ES","subjectDN":"MIGBMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xODA2BgNVBAsML0JaIFppdXJ0YWdpcmkgcHVibGlrb2EgLSBDZXJ0aWZpY2FkbyBwdWJsaWNvIEVWMSIwIAYDVQQDDBlDQSBkZSBDZXJ0aWZpY2Fkb3MgU1NMIEVW","whitelist":false,"attachment":{"hash":"388ad7bfbc659f5233cd21bf5d91654c878954f11b1f806a8471ebe1dc89e676","size":2515,"filename":"D0NbyGhND0J0g9UeFoaXmcD9hKK6WSHEogR1kaVlsfA=.pem","location":"security-state-staging/intermediates/3edc35f2-2f62-434a-b3d0-3fa02db4b362.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D0NbyGhND0J0g9UeFoaXmcD9hKK6WSHEogR1kaVlsfA=","crlite_enrolled":false,"id":"097e4515-9a01-4511-a66e-dd72a6a0a98c","last_modified":1602770278643},{"schema":1602723479783,"derHash":"eGeq6QXrjVVjX/67v4zwWmO5s5BmXeI2esEHPpKRNyg=","subject":"CN=Thawte CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHDAaBgNVBAMTE1RoYXd0ZSBDTiBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"6abb2fa6476c1d938c58f7d3648720a6cb3239b7fc026f82046b76d081192231","size":1825,"filename":"VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=.pem","location":"security-state-staging/intermediates/1ff4f374-cd06-4afa-af4e-4f8b3a444843.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=","crlite_enrolled":true,"id":"f1601a66-8fd4-4b53-9279-cb7e19b76aa6","last_modified":1602727076193},{"schema":1602647311437,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/beb6572f-d50f-49e3-b522-e0fe9eeab7fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"dca5191c-f858-49ca-a6b2-00f2b0f05703","last_modified":1602647874803},{"schema":1602647312961,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/474af47c-ab34-47f0-9db5-7040d594066b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"4e869e4f-53c6-4bd3-9258-7598c81fab2e","last_modified":1602647874790},{"schema":1602647309895,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/47f00ab7-e48a-442b-9784-5c0b868f566e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"4890ab90-0f29-46a1-b3dc-d52fa68f9372","last_modified":1602647874776},{"schema":1602647305364,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/eb498f2b-bc85-4f23-89cb-665499148b38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"41ca7b3f-d056-431f-9812-e3654e7b1240","last_modified":1602647874765},{"schema":1602647308368,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/a69eec9d-0275-4eaa-9b0a-e523fbdd3a8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"eea631ce-192d-4b2d-8672-08e5b2626a2c","last_modified":1602647874753},{"schema":1602647306905,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/a65de85c-368b-4cff-a210-dba348e6ce3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"1cefe49f-ef56-4996-bcdb-2fb9d9f3e0f1","last_modified":1602647874741},{"schema":1602647302024,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/0e071112-b7ec-44a8-bf67-d3723d6c9c8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"d709f323-b76c-451f-bf49-dabb2b709355","last_modified":1602647874718},{"schema":1602643717900,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/4588f17a-19a9-4b87-8bc7-cc7a8f3cd02a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"99222dda-57f4-496b-a40e-da86b57d52f1","last_modified":1602644269945},{"schema":1602643716484,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/b756e2ce-c3a3-4925-8863-6eb0770f170b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"3c36b8ef-d2ca-44ed-9c79-583632600361","last_modified":1602644269933},{"schema":1602643713481,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/c634aa09-48b7-4b62-a0cd-2ed068b25b24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"a25361d2-dff5-46fc-a564-b5747ef9506b","last_modified":1602644269922},{"schema":1602643710444,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/1c3c49e3-967d-4a9b-95ae-11369f856524.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"e210e9bd-6cc8-4831-b27f-5a9929687c99","last_modified":1602644269898},{"schema":1602643706774,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/c43aba38-0250-470d-bc16-4fa8ee7973cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"e3964c59-8391-4432-9624-9b3f841b6121","last_modified":1602644269887},{"schema":1602643708962,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/bd9bdd90-d095-4742-a046-a09c00d73663.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"d7b0cd98-f3ca-42ba-a858-0a8ddd93a881","last_modified":1602644269875},{"schema":1602643711912,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/4ad66af4-3592-47b1-8904-24809ee4969b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"6ecd7afb-009a-4d64-84bd-55a9b230d932","last_modified":1602644269863},{"schema":1602640122258,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/1b89cfad-19e3-489b-b8c4-504e5e5e9475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"85dfcf61-54d1-481d-a21a-e7345029aab6","last_modified":1602640676802},{"schema":1602640115594,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/7609c1c4-b19b-4565-9720-dd5e6d124c41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"6b3d1184-9e4d-4516-bfb4-06d823d81fc5","last_modified":1602640676790},{"schema":1602640108808,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/c06db3d6-f723-43e2-99fe-fb7ab58beff9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"3d87fa81-1922-410b-ad87-b072f825cf4c","last_modified":1602640676779},{"schema":1602640117836,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/547e6227-750a-41af-8a1d-b3fdfc7ea5ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"c6fc4ae3-a815-4a2e-988d-d8af1c74d123","last_modified":1602640676767},{"schema":1602640107298,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/ee608fb0-eb77-46a5-87e7-b85b3d4f5999.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"776212f2-5d11-4ced-aae1-d3525eafad9c","last_modified":1602640676744},{"schema":1602640119969,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/b1f46dae-b0b6-4395-8eb4-5e0562bccef1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"8fc742ec-b377-4e41-a314-6542db51830c","last_modified":1602640676732},{"schema":1602640110933,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/f38b174b-fe67-499c-87e4-4179475f4305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"bb05ed4d-3921-4bb5-b9fd-ad946be0f10d","last_modified":1602640676717},{"schema":1602298099827,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/96070886-41b8-49d7-bdc8-288a168b4d42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"55b23a55-20b5-4564-9301-19e1f6663e64","last_modified":1602298664805},{"schema":1602298101397,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/76c4ae03-cb6d-458e-86c7-67b6e175a4bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"647a58c6-8821-45ab-be6a-5060bc947663","last_modified":1602298664792},{"schema":1602295137997,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/c6fc6d45-b2fd-49ff-8537-ead6a452efe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"ca5a7b22-9e28-43dd-988a-2dce9d4cbc55","last_modified":1602298664780},{"schema":1602294982304,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/530644a0-1e30-447d-ae93-a1bc0d62a856.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"69151f48-9355-402a-a4f7-edc3bd8c245c","last_modified":1602298664768},{"schema":1602294980728,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/64d78a05-459d-490a-a9b7-710ea2e69e9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"c1ef662d-911d-4ee8-93a5-6897f5af1d2e","last_modified":1602298664756},{"schema":1602294812900,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/ca0daa91-d2da-46e1-8fad-ce93b4478be2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"6fa539e1-18ab-40f6-bd9c-235218cccb25","last_modified":1602298664744},{"schema":1602294704633,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/636064f0-6cbf-481c-ae6c-8786ed5ac5c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"8b4d5d9b-6f1f-4081-a0ec-313b4caf68b9","last_modified":1602298664733},{"schema":1602294814450,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/57373448-8114-4a2b-8088-f440a5659ce2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"90aadf13-6f41-4808-adf7-5d7b5a196ece","last_modified":1602298664721},{"schema":1602294606254,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/7ed8a5e9-d627-46e2-b8bd-3d94ebf324fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"dd950c26-9f72-4fcd-bde1-2853dba9a33d","last_modified":1602298664709},{"schema":1602294702179,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/3bff1db2-cec5-4117-9ae4-6f4c16dc8215.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"072e74df-3503-4c99-9403-75fb542972c6","last_modified":1602298664698},{"schema":1602295140467,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/3a6cebdc-e2d4-4f19-ba75-a61e1559cf91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"bf02c337-050a-43b5-a4eb-598b01c58812","last_modified":1602298664686},{"schema":1602294608115,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/80080d6b-3dc2-4a81-b302-4b52e36b835b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"ec700973-5e01-43ff-9d72-19f79ffb9c70","last_modified":1602298664674},{"schema":1602294515612,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/c55dfd59-234e-4ff8-9459-d7d2b199d649.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"3c043e6a-b731-4ecc-a152-a94704a97068","last_modified":1602298664663},{"schema":1602294517394,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/114b1d47-f6d2-4167-87f3-2820ec5baa1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"37cd4ec9-5aa2-48af-b66b-9f4f4cda0b08","last_modified":1602298664651},{"schema":1602298103338,"derHash":"oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"efe10561bf3266c3b533e4642fc8dc3f95e0af6b13697751ab9e922af3013c4c","size":1804,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/cfaadb5b-e902-470e-923b-22b8d677a073.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"f6f1bda2-caaa-42ec-9ed1-a53b8a23db58","last_modified":1602298664631},{"schema":1602298102910,"derHash":"oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"efe10561bf3266c3b533e4642fc8dc3f95e0af6b13697751ab9e922af3013c4c","size":1804,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/5bb48710-2b16-46cb-89d2-50b66eb64107.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"50e4ca03-eb57-4ac4-8ed5-17d92d977986","last_modified":1602298664611},{"schema":1602298102487,"derHash":"ChY2AGMb1mJn+3rq0lxTiyt9cq1kFqK70oX2VLtkL20=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"0be7b4b36e584af7c9c5b112ea58bd9a35c130ac60498f529685f3677950def8","size":1687,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/944a758d-2190-478d-9aaf-b72d3189ad0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"2ebb6e61-790b-44fe-a28c-c32b851f947b","last_modified":1602298664591},{"schema":1602269869014,"derHash":"J3z0tl9TD8wHKF74nYMRiEiEAE5PLH2+fKAG6WU2zWI=","subject":"CN=Shoper\u00ae SSL,OU=Dreamcommerce S.A.,O=Dreamcommerce S.A.,C=PL","subjectDN":"MF4xCzAJBgNVBAYTAlBMMRswGQYDVQQKDBJEcmVhbWNvbW1lcmNlIFMuQS4xGzAZBgNVBAsMEkRyZWFtY29tbWVyY2UgUy5BLjEVMBMGA1UEAwwMU2hvcGVywq4gU1NM","whitelist":false,"attachment":{"hash":"e4b74658c87e531a9abfebbd57bf225a85f5e2a737dd73be3794a19bc905b06b","size":1613,"filename":"u2qzRrAdmNr-Meysupi9x7UNMaLYZzuT4OTThn_6xF4=.pem","location":"security-state-staging/intermediates/dee40a5f-efa0-4a09-8a63-181ab2062fb5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u2qzRrAdmNr+Meysupi9x7UNMaLYZzuT4OTThn/6xF4=","crlite_enrolled":false,"id":"5ffb5aee-a080-4a31-aec0-6301099b7425","last_modified":1602273466706},{"schema":1602248260747,"derHash":"7qFSzPdRfhZRMga3HBfiBPpAB8JsNgUexn30yUdGPPg=","subject":"CN=cPanel High Assurance ECC Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTowOAYDVQQDEzFjUGFuZWwgSGlnaCBBc3N1cmFuY2UgRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"82ee0338bc29f687ea9594b3ee05b3cacfd4b1890b1c95e3452bcfccd99f8c87","size":1297,"filename":"L4q9ILB-EyvjFKWbhrCSV_fq9CRcnS_EmX6BUSqw8Zo=.pem","location":"security-state-staging/intermediates/73d51902-463f-4e96-b2af-d79fd4da20cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L4q9ILB+EyvjFKWbhrCSV/fq9CRcnS/EmX6BUSqw8Zo=","crlite_enrolled":true,"id":"0d1ede70-4b26-4a54-919b-ffca9db0bb57","last_modified":1602251860240},{"schema":1602125315857,"derHash":"cwwb3NhfV85dwLunM+XxulqSWyp3HWQKJvekVCJNrTs=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"8467f9a9c499b547e02391a7fe31c469557c379b07852c2ca04ce3ecec676dea","size":1585,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/1f71d4c5-823d-4f6a-9fcf-107004848c43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"5d9dd4cf-783a-46de-885d-a4702103320f","last_modified":1602125863571},{"schema":1602125317285,"derHash":"Wo8W/aRI14NIHMpXokKNF02tjGCUPOso9mGuMf05pfo=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"9cd790ac13f6ba45dcb08a81db71c89d50e10474fcde7568d501e5893f538729","size":1585,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/a1dd6cdc-7cb6-4608-ad10-121c1417b86e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"2b30c13e-2cab-4b8c-883d-43f99052d539","last_modified":1602125863559},{"schema":1602121858033,"derHash":"Wo8W/aRI14NIHMpXokKNF02tjGCUPOso9mGuMf05pfo=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"9cd790ac13f6ba45dcb08a81db71c89d50e10474fcde7568d501e5893f538729","size":1585,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/4f471d30-f2da-4143-bbec-db772922e9d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"835f8581-8590-4a2f-80bc-f607c2264bc5","last_modified":1602122269012},{"schema":1602121856579,"derHash":"cwwb3NhfV85dwLunM+XxulqSWyp3HWQKJvekVCJNrTs=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"8467f9a9c499b547e02391a7fe31c469557c379b07852c2ca04ce3ecec676dea","size":1585,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/5b388518-029b-4136-9c78-d43474613fd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"6d11fad9-c414-48d6-b593-5cafd1758bc5","last_modified":1602122268992},{"schema":1602103701893,"derHash":"ks5+p0JLPnosFMJuDVcq29VW4F4rKovTdhxpUlQlWFY=","subject":"CN=AnsonNet TLS Issuing RSA CA R1,O=Anson Network Limited,L=London,ST=London,C=GB","subjectDN":"MHgxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEeMBwGA1UECgwVQW5zb24gTmV0d29yayBMaW1pdGVkMScwJQYDVQQDDB5BbnNvbk5ldCBUTFMgSXNzdWluZyBSU0EgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c2a431004a217db81281a2de2c05eb1e93eb5abc1d4a818825e74e917c6a7019","size":2556,"filename":"mPShRNkBUp1VgXuaiIbIdh-5lcY6nG4Evw-dwtjk06A=.pem","location":"security-state-staging/intermediates/cc65c814-7ae3-4f5b-b2db-27bad5f914d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mPShRNkBUp1VgXuaiIbIdh+5lcY6nG4Evw+dwtjk06A=","crlite_enrolled":false,"id":"20dd4e9a-8d90-4e64-9389-8d8a9c66c10d","last_modified":1602104258093},{"schema":1602103700443,"derHash":"N/0pxwHWl3mY8gUVPqikwumWNU3wctSYTcXYsfdaK2E=","subject":"CN=SwissNS TLS Issuing RSA CA R1,O=swissns GmbH,L=Luzern,ST=Luzern,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMQ8wDQYDVQQIDAZMdXplcm4xDzANBgNVBAcMBkx1emVybjEVMBMGA1UECgwMc3dpc3NucyBHbWJIMSYwJAYDVQQDDB1Td2lzc05TIFRMUyBJc3N1aW5nIFJTQSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"712a44aa441a1572aa92968b2b418a8c979bfb72b6b17653fed5888d76210828","size":2544,"filename":"KAda-LJFeGtGthCqCejer2EUArFZNe-fmlkLdhkdcJc=.pem","location":"security-state-staging/intermediates/2b761dc1-930d-4dc0-ba17-650c271bfb95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KAda+LJFeGtGthCqCejer2EUArFZNe+fmlkLdhkdcJc=","crlite_enrolled":false,"id":"32fe68ce-7d4c-4d54-bab1-b2aab2d02223","last_modified":1602104258081},{"schema":1602100118791,"derHash":"ks5+p0JLPnosFMJuDVcq29VW4F4rKovTdhxpUlQlWFY=","subject":"CN=AnsonNet TLS Issuing RSA CA R1,O=Anson Network Limited,L=London,ST=London,C=GB","subjectDN":"MHgxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEeMBwGA1UECgwVQW5zb24gTmV0d29yayBMaW1pdGVkMScwJQYDVQQDDB5BbnNvbk5ldCBUTFMgSXNzdWluZyBSU0EgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c2a431004a217db81281a2de2c05eb1e93eb5abc1d4a818825e74e917c6a7019","size":2556,"filename":"mPShRNkBUp1VgXuaiIbIdh-5lcY6nG4Evw-dwtjk06A=.pem","location":"security-state-staging/intermediates/34297edd-f3b2-4fef-999b-4d930d483b6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mPShRNkBUp1VgXuaiIbIdh+5lcY6nG4Evw+dwtjk06A=","crlite_enrolled":false,"id":"be5f22dc-d3c0-4ba9-8bab-7df502dfa36c","last_modified":1602100657898},{"schema":1602100117378,"derHash":"N/0pxwHWl3mY8gUVPqikwumWNU3wctSYTcXYsfdaK2E=","subject":"CN=SwissNS TLS Issuing RSA CA R1,O=swissns GmbH,L=Luzern,ST=Luzern,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMQ8wDQYDVQQIDAZMdXplcm4xDzANBgNVBAcMBkx1emVybjEVMBMGA1UECgwMc3dpc3NucyBHbWJIMSYwJAYDVQQDDB1Td2lzc05TIFRMUyBJc3N1aW5nIFJTQSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"712a44aa441a1572aa92968b2b418a8c979bfb72b6b17653fed5888d76210828","size":2544,"filename":"KAda-LJFeGtGthCqCejer2EUArFZNe-fmlkLdhkdcJc=.pem","location":"security-state-staging/intermediates/c7fb95b1-4e6e-44da-b797-1b64a448dbfb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KAda+LJFeGtGthCqCejer2EUArFZNe+fmlkLdhkdcJc=","crlite_enrolled":false,"id":"1c713ec1-22b4-4bb9-a642-d8188603e3c9","last_modified":1602100657886},{"schema":1601686641575,"derHash":"ZTkjWloflBgMUjPq+KXWcQLeqhbAdRrvNbPmfOVgfyk=","subject":"CN=University of Macedonia TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChVbml2ZXJzaXR5IG9mIE1hY2Vkb25pYSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"128df8a47dde21bf8cb684fe77d41c11d5bf09efa2af436a8f9cad4ff2a69844","size":2824,"filename":"Yr1zUmzXNRDeB9FlIE3oqt2RAilAhCi90mNw8jOw5j0=.pem","location":"security-state-staging/intermediates/6bf79ff6-7e88-4c7c-b114-96d5328c44c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yr1zUmzXNRDeB9FlIE3oqt2RAilAhCi90mNw8jOw5j0=","crlite_enrolled":true,"id":"87925423-9a51-40ac-ad0b-43800ff2c93f","last_modified":1601690248797},{"schema":1601672077933,"derHash":"KIs1Rm+44ii5iDIBnhp5Vqw+nxVCgMyXSG7Mjiycq8E=","subject":"CN=IdenTrust Public Sector Server CA 1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMSwwKgYDVQQDEyNJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBTZXJ2ZXIgQ0EgMQ==","whitelist":false,"attachment":{"hash":"76f53e60805d58cfdf8c7851caca2cc1b2e1d58ccecc5f8c3c4894a02b95a3fa","size":2393,"filename":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=.pem","location":"security-state-staging/intermediates/7b450fbd-7542-44c9-be47-022a4d7418ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=","crlite_enrolled":true,"id":"58959c17-11bd-4882-9810-171e73efdcf3","last_modified":1601675840485},{"schema":1601672000910,"derHash":"KIs1Rm+44ii5iDIBnhp5Vqw+nxVCgMyXSG7Mjiycq8E=","subject":"CN=IdenTrust Public Sector Server CA 1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMSwwKgYDVQQDEyNJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBTZXJ2ZXIgQ0EgMQ==","whitelist":false,"attachment":{"hash":"76f53e60805d58cfdf8c7851caca2cc1b2e1d58ccecc5f8c3c4894a02b95a3fa","size":2393,"filename":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=.pem","location":"security-state-staging/intermediates/b0475a24-c54a-415c-b8a5-508f00049e42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=","crlite_enrolled":true,"id":"a8eb67a0-8c64-4314-8f5d-f8052549076c","last_modified":1601675840461},{"schema":1601646741831,"derHash":"eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=","subject":"CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874","size":1707,"filename":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem","location":"security-state-staging/intermediates/87766a98-a2cc-464d-9b61-f38989d08aef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=","crlite_enrolled":true,"id":"679290b1-74f0-4692-85c0-80c7ed611f13","last_modified":1601647037525},{"schema":1601646862791,"derHash":"eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=","subject":"CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874","size":1707,"filename":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem","location":"security-state-staging/intermediates/dffc1d44-5fa3-4cf0-8e03-6e735e18ca4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=","crlite_enrolled":true,"id":"bd781195-4915-4ba3-9cc4-34433abaf5c9","last_modified":1601647037505},{"schema":1601628639979,"derHash":"OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=","subject":"CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"b11aaedbe5436f35dfaa91a1b599580a4875728df582882c8b0654b4695f6f8d","size":1752,"filename":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem","location":"security-state-staging/intermediates/3e01120a-d2e3-42a3-9d54-b75e73a5246a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=","crlite_enrolled":true,"id":"9cf120fd-788c-4296-bacc-d339a0c51529","last_modified":1601629035363},{"schema":1601628561952,"derHash":"OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=","subject":"CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"b11aaedbe5436f35dfaa91a1b599580a4875728df582882c8b0654b4695f6f8d","size":1752,"filename":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem","location":"security-state-staging/intermediates/93cb65fb-aaaa-48e2-98f3-414e208ebd02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=","crlite_enrolled":true,"id":"05b6f881-a4d5-4faf-891d-c599dd09284d","last_modified":1601629035343},{"schema":1601581756903,"derHash":"jlEFdfB6l9X62jv9phh+A+d9M5IxhFfqhxip0otDOWs=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"7c779081b9be519ff3d25e8772978950f385cb19f49a24a6057409137112bc14","size":1540,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/8847b089-d96c-4f13-acc0-18117749df17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"417742c5-f44f-46d5-972d-d38d206c0784","last_modified":1601582282303},{"schema":1601581755437,"derHash":"/udl2kys9TxxryAvifNhJCD9kw2ATiBP7u/J14CEu3s=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"5fc63297733d4d2adf06d7e52b3337147d888c5dd5442cb6ec2d88986bb1de4c","size":1540,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/988d8f38-2e00-41eb-a26c-76d18afbb2d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"36186b66-f98f-44f9-89fe-243c1b143997","last_modified":1601582282291},{"schema":1601581757962,"derHash":"vao4RyBgT/RlOwDaOHOoxUWZb/uKuR1hbxBJX8Am6Pw=","subject":"CN=cPanel\\, Inc. ECC Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTEwLwYDVQQDEyhjUGFuZWwsIEluYy4gRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"3abd6d4119adbd58f964bcd4518e31534b73279076cf34283e7839869f436dfb","size":1284,"filename":"1OWbvT5F8be0LIlW8C2KyzC-FMP8CzHyOolBvIgt6bc=.pem","location":"security-state-staging/intermediates/d08866e7-4949-4b27-9ef1-69593b3642dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1OWbvT5F8be0LIlW8C2KyzC+FMP8CzHyOolBvIgt6bc=","crlite_enrolled":true,"id":"e137294d-0311-4243-8e1c-d116db18b312","last_modified":1601582282261},{"schema":1601376714502,"derHash":"HjVoI/5AwOqsKfntVGO3stscCItj67BYdqLmMcEId5g=","subject":"CN=QuoVadis Enterprise Trust CA 2 G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFsxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEqMCgGA1UEAwwhUXVvVmFkaXMgRW50ZXJwcmlzZSBUcnVzdCBDQSAyIEc0","whitelist":false,"attachment":{"hash":"756cc72bf46fca106a4ae94315fc04ea6bbe1b93e3229513d02875b33ca13f45","size":2385,"filename":"z-lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=.pem","location":"security-state-staging/intermediates/97e9a258-06aa-43a7-8ada-49f8b85b4dc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z+lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=","crlite_enrolled":false,"id":"09667865-dc1f-4be8-b78d-5f3614672a9a","last_modified":1601517448053},{"schema":1601376711578,"derHash":"LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=","subject":"CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"f01753f65dd631ba19494a777a86712466e7e8b20994d581e672f52716f315bb","size":1873,"filename":"VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem","location":"security-state-staging/intermediates/920f9d58-4bbc-4b8c-9c0d-15d09f34ef1c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=","crlite_enrolled":true,"id":"493a41b4-bb0b-48eb-b54e-2a2d3b1343e4","last_modified":1601517448040},{"schema":1601376707030,"derHash":"DakU+3El9uZE63qiYd6euAncf5Jbayp9in7dhzY5i1s=","subject":"CN=Staat der Nederlanden Domein Server CA 2020,O=Staat der Nederlanden,C=NL","subjectDN":"MGMxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xNDAyBgNVBAMMK1N0YWF0IGRlciBOZWRlcmxhbmRlbiBEb21laW4gU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"2f30004a37d33d9c2a59bae9b9e7ae94f816bd331c1a88deabd4af0f028ec59e","size":2438,"filename":"N9-YluTCUa_HTXc60QxjUReBLpRniAkIK2N84DhgmW4=.pem","location":"security-state-staging/intermediates/1a840a62-8cd7-4d70-9975-b54d902e70f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9+YluTCUa/HTXc60QxjUReBLpRniAkIK2N84DhgmW4=","crlite_enrolled":false,"id":"aac1684b-0ef2-4e80-a504-29ddab6c3e72","last_modified":1601517448028},{"schema":1601376713050,"derHash":"N2EL91bKTDz6GGlsTBSXOOZEyp9nY4fsUBZzZdakXMo=","subject":"CN=Digidentity PKIoverheid Server CA 2020,O=Digidentity B.V.,C=NL","subjectDN":"MFkxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMS8wLQYDVQQDDCZEaWdpZGVudGl0eSBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"c6efc5a8dbba37f6c4ba76f0ccd0f86ceb94b6b66cfd390227a747d4d83ff0b3","size":2487,"filename":"DnmLzHZn-pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=.pem","location":"security-state-staging/intermediates/cd42a716-ce60-48c0-a709-ead47fce1fbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DnmLzHZn+pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=","crlite_enrolled":true,"id":"5f56fcf5-5fc3-476f-865b-5607ab67cac6","last_modified":1601517448016},{"schema":1601376708754,"derHash":"0zqEf2QDd74K4aQpFToH6HyIJ/pIQLUVi83LheEKRTo=","subject":"CN=VR IDENT EV SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMSAwHgYDVQQDDBdWUiBJREVOVCBFViBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a95e7ccf2ef4b020f65fbd061c44e49d966821be27623376e3f16a8a3ebd371f","size":2361,"filename":"te09bIALahNazDua57TEibeM7CatIkOAT8t-qu_Kdro=.pem","location":"security-state-staging/intermediates/e430be6f-1a38-4cff-9a26-75b9c1b40411.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"te09bIALahNazDua57TEibeM7CatIkOAT8t+qu/Kdro=","crlite_enrolled":true,"id":"c405cfcb-b5a3-404e-8080-a25fac8bd624","last_modified":1601517448004},{"schema":1601376705563,"derHash":"WS4aLwo0KEsOJvy0/tIq+FmEju6IIq22G0LatHov/cI=","subject":"CN=KPN PKIoverheid Server CA 2020,O=KPN B.V.,C=NL","subjectDN":"MEkxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEnMCUGA1UEAwweS1BOIFBLSW92ZXJoZWlkIFNlcnZlciBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d6c29637397d41ba732890b7381061d5aa7ce2b45a6658ec8cd3e1578ec36521","size":2463,"filename":"Yao-RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=.pem","location":"security-state-staging/intermediates/8f344132-b3c2-493d-9fdf-f15cdbe23305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yao+RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=","crlite_enrolled":true,"id":"d48b6ae2-446b-453a-8cc2-98b0a8e19be2","last_modified":1601517447991},{"schema":1601376701147,"derHash":"YDiLdz0z6RQWSGE/NrkUnwFaEUN4us8+NpSGT/2kJuw=","subject":"CN=HydrantID EV SSL CA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHzAdBgNVBAMMFkh5ZHJhbnRJRCBFViBTU0wgQ0EgRzI=","whitelist":false,"attachment":{"hash":"ba2cc602bd31081e17f7745ac462854773e79726958ff1b8a553cc7ecaba9db2","size":2389,"filename":"FpAps1LWs_UTm3xApHYkNccnnZX-7Wc_v8V0t70p6rg=.pem","location":"security-state-staging/intermediates/8c73b0d9-e8cd-4f65-9003-94df3b81af5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FpAps1LWs/UTm3xApHYkNccnnZX+7Wc/v8V0t70p6rg=","crlite_enrolled":true,"id":"0541e738-c47e-45c8-a4f1-9494790fa98e","last_modified":1601517447980},{"schema":1601376699741,"derHash":"a0+d4TZ4hGcw1Q6RSgjnvpt0LKOgp9U5M2eDC5Om9VM=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"8b796428cc5e4733630431ccd7284dbe8bae53efc39384f0fccbbf1b490e4d49","size":1788,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/970c219c-4540-4fd6-96a0-5a1b30eed570.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"1a842e90-819c-4e3f-989b-ff36631ffdd8","last_modified":1601517447967},{"schema":1601376702562,"derHash":"Euom9u7v7HarhZJUVAOriFFbAOJ12YiHE0B6hvxcf9c=","subject":"CN=e-Szigno Qualified Organization CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgT3JnYW5pemF0aW9uIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"2dcc501b643fe8ac38e3b36c6e87ffbb458e7d031117857c3d81511ee2eadfd8","size":1687,"filename":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=.pem","location":"security-state-staging/intermediates/77e2b395-5a50-4800-954e-b7b8417fdc14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=","crlite_enrolled":false,"id":"0b5e8fe1-4816-49b7-95bb-58d0f7ab520b","last_modified":1601517447955},{"schema":1601376698310,"derHash":"yKYQupQXdw0sAt4ivKjFakKK916ONU76NsVoIh3bfPw=","subject":"CN=WISeKey CertifyID SSL GB CA 2,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMg==","whitelist":false,"attachment":{"hash":"25f18c47254a897f57257e91e33dccd040b88a2d2805589a22993da2900db84f","size":1699,"filename":"ktJRzJxhVE71wdby3vum5K-dgm6QylD4z-l9CBGOUQU=.pem","location":"security-state-staging/intermediates/b23e58a4-ba88-4c87-a828-1c8dc6d99e89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ktJRzJxhVE71wdby3vum5K+dgm6QylD4z+l9CBGOUQU=","crlite_enrolled":true,"id":"3c319d1b-2657-423e-bbda-6ae5b1cb7599","last_modified":1601517447943},{"schema":1601376696895,"derHash":"FjzS/K0NaofI2vzgVvWU87U7kXwPkl1A2SJY6id/xPQ=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"d4292d809a630e5b57cdc50d9205799bd35a8b3a0c8cf33366d00d5e3e8cdf78","size":2499,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/f2c956b5-ac64-4fb1-ba98-32776090134e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"5281f41c-c9a7-4ac3-92ec-73db0e1bca22","last_modified":1601517447931},{"schema":1601376691138,"derHash":"yhTPmzCboDK7IZEMGu2uTSn+Bla0+L/6I8vpTUMcBnQ=","subject":"CN=Entrust Certification Authority - DE QWAC1,O=Entrust Datacard Deutschland GmbH,C=DE","subjectDN":"MIGIMTMwMQYDVQQDDCpFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gREUgUVdBQzExGDAWBgNVBGEMD1ZBVERFLTExOTI2NDMxNjEqMCgGA1UECgwhRW50cnVzdCBEYXRhY2FyZCBEZXV0c2NobGFuZCBHbWJIMQswCQYDVQQGEwJERQ==","whitelist":false,"attachment":{"hash":"4e133243cde83dcbe732252fbf43b8518690328d9c29c7647170c786d537e396","size":1792,"filename":"ZWhmaUZRaiEz-pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=.pem","location":"security-state-staging/intermediates/bc1603cf-b495-4c30-be21-9c90c1fc4057.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZWhmaUZRaiEz+pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=","crlite_enrolled":true,"id":"7a54c01d-7d1f-4f82-8016-dfab02e81156","last_modified":1601517447907},{"schema":1601376694051,"derHash":"Kyz67KvyJm/U+2UF8zQrklFOvm+nwIy2y9SYj2r9F70=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"399b1d081c0af091e4829f3801f90b9e266db1e4e3c5d6a03e438d33ecc67c14","size":2788,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/ed3be1ec-27c5-4877-a576-a88953808e0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"b5744a09-248a-49f5-a2f4-743d2e1c013d","last_modified":1601517447896},{"schema":1601376695464,"derHash":"J47PIR4lGOndmROvxYPusxJ8gYS8vu2q171k6J6MQxA=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"8e15c43f71096a592c3d5819db25f4547bb4ef4f8232293578abdf314d149392","size":2353,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/1aa7522d-26fc-4dab-a48f-37ed0f57c916.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"cffe3216-3de3-4c2c-ac7b-6674695cb014","last_modified":1601517447884},{"schema":1601376689641,"derHash":"vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=","subject":"CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4","size":1670,"filename":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem","location":"security-state-staging/intermediates/713a5d0b-40ac-4d69-8093-93d4bd2e61ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=","crlite_enrolled":true,"id":"20f1bea5-b08a-4583-bdc2-e4d66e4dbc30","last_modified":1601517447872},{"schema":1601376685072,"derHash":"rXtYw8XZWGvltieZwnksQRHJhSqW97BgciEmVxOVfhw=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMUMwQQYDVQQKEzpTaGFuZ2hhaSBFbGVjdHJvbmljIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQuMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"64ac68b2f5fcfe1eb5b26d7d052a52af0101c298fc359ab1870916a82601f563","size":1808,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/53d0ff76-6315-493d-b9a5-6b2d1230a9f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"fec31040-5c17-4c95-895a-afaebcb0a054","last_modified":1601517447861},{"schema":1601376692642,"derHash":"tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"0e8105a00963a2942951dacf763351b5c4f4fcffe32ab691c090848452d6b285","size":2377,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/e36cd675-51d4-45ae-9be5-01d1ee3cb3c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"14f0f77b-ba93-4761-a2d2-71f0ab726c4c","last_modified":1601517447849},{"schema":1601376703987,"derHash":"J1vwBG4CcBeLE7Z+TbFQoQGXy3H5oGH602s9dmOf4YY=","subject":"CN=Trustwave Global ECDSA P-256 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"b39b1eb52f8d651482f3d14bd9a033de3982f3cc3fa825ba761d2fefa3a11981","size":1325,"filename":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=.pem","location":"security-state-staging/intermediates/2c77b828-79f7-4649-86b4-c67b7672d80c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=","crlite_enrolled":true,"id":"32afcb9b-abe9-408d-b53f-79bb1fdee4cf","last_modified":1601517447837},{"schema":1601376687921,"derHash":"am8voTstnbu0CYAgAtM3BnJ2CiF42bjVaU1mBHQjH6Q=","subject":"CN=e-Szigno Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHkxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJjAkBgNVBAMMHWUtU3ppZ25vIFBzZXVkb255bW91cyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"4a22ba90a733131c2581c1d0dd2fbb9a8df38f518f2e5ba6ee0d10f4b3169c24","size":1670,"filename":"vqerAqvFBz-pP0lY3LKc96jOLcWu__imbw0SS3qBch8=.pem","location":"security-state-staging/intermediates/2334d610-446d-4e2b-baa4-aea8a7184032.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vqerAqvFBz+pP0lY3LKc96jOLcWu//imbw0SS3qBch8=","crlite_enrolled":false,"id":"ac246f90-eed2-4d87-83c3-1716f637a9e2","last_modified":1601517447824},{"schema":1601376682271,"derHash":"hIwDq2R9W9fg0MQ8C11nTMmJP4NquGOvjz8ThLVE2DM=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"caf1e07303de77d2971983851eb6cdc8b1662168dab0ef7c3dc3df46b70b3ec3","size":2300,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/01da7aaa-a363-4749-9396-bfdd094350f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"629163cc-e2d2-49d2-9179-b5f4a91ddbd5","last_modified":1601517447801},{"schema":1601376679409,"derHash":"ozAX2d9JTAnVhwkQdAOu5GG5Rh6BujlcKMNmk8J9GYY=","subject":"CN=GlobalSign GCC R3 UK EV QWAC CA 2020,O=GMO GlobalSign Ltd,C=GB","subjectDN":"MFkxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJHTU8gR2xvYmFsU2lnbiBMdGQxLTArBgNVBAMTJEdsb2JhbFNpZ24gR0NDIFIzIFVLIEVWIFFXQUMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"ef3f87aa1971aaebb3accc4f6b43e518068a070c3df5324fafc49bd6faea510d","size":2040,"filename":"_cLNIs90Pu4zrpnBuJdA-wTl2BrxEVUjup-MFOMyr1g=.pem","location":"security-state-staging/intermediates/7413dbb2-a053-4d05-8c07-e8013d4954f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/cLNIs90Pu4zrpnBuJdA+wTl2BrxEVUjup+MFOMyr1g=","crlite_enrolled":false,"id":"49bc5d61-3d39-432b-8401-09f5cf6fe8fb","last_modified":1601517447789},{"schema":1601376680877,"derHash":"FamHYevgEVVNo6RtIGsIEssutproeqoRpt1MuE7VFCo=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"b94f365e9c87f17f0cce2845177df14966cfe660eb761de3a71b860db6a98fd9","size":2121,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/24659b31-0ac7-4f82-a6b2-81b56170c56c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"a3070eea-daf1-4198-a69d-4f1b513e2e69","last_modified":1601517447777},{"schema":1601376677870,"derHash":"1KWUHHFB7RlJoMbOndRaCrlNwzeQLrChIJhSc47r6FQ=","subject":"CN=GlobalSign GCC R3 EV QWAC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIEdDQyBSMyBFViBRV0FDIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"9a306430e243544a1c823baa60388aa1b7c197ccafd79a5fd9847056d91f6d8b","size":2032,"filename":"6Vipkd7oFTwhj_Z54b71vjmwq0aEJc6KkharcmzGaV4=.pem","location":"security-state-staging/intermediates/078357e9-d9aa-4223-9fe2-9322058e368a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Vipkd7oFTwhj/Z54b71vjmwq0aEJc6KkharcmzGaV4=","crlite_enrolled":false,"id":"7e12f161-4f28-4ab5-b22b-2c4ce8de8d3d","last_modified":1601517447766},{"schema":1601376669443,"derHash":"ZZt6UYxsnrGKoes1rrp6AkeBe4mMH6GED5fSh32aIOQ=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"19f63552805d608f671589717902feefe03afc5da94e20c555f68ef484a23b46","size":1772,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/47eb68ae-22f7-4ab1-af83-1feca0168e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"7fae8ab0-1f93-4bb4-ad9e-d35322d05bb4","last_modified":1601517447754},{"schema":1601376672283,"derHash":"diU4Q5UJxBHEN9PFZ1Y+E3hnEoH8ShRkrdAxhwhDZ24=","subject":"CN=GlobalSign GCC R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEdDQyBSMyBEViBUTFMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a57c3388263edee7694a304c5fb1c3c28046d3d7c1493d3ddf93c385aaf9b3ad","size":1687,"filename":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=.pem","location":"security-state-staging/intermediates/0731bf19-eea4-42f6-9ac8-48a2b2d155aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=","crlite_enrolled":true,"id":"59416cc7-fedb-4bdf-ae06-52bfcce27e43","last_modified":1601517447731},{"schema":1601376675098,"derHash":"Z4LG6a2/khbiaDBtRjM/vGdL3t+GtnvndweeLA42iI4=","subject":"CN=Trustwave Global Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGOMTcwNQYDVQQDEy5UcnVzdHdhdmUgR2xvYmFsIERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"a1aae690e4bc653bc8dd049d0014c8bdf294c1327ae51c6f40d11e8b728cdee3","size":2499,"filename":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X-kFQNRrNSN8Cw=.pem","location":"security-state-staging/intermediates/bbb80e65-6dd1-4c6a-86dc-ed0eb42c9484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X+kFQNRrNSN8Cw=","crlite_enrolled":false,"id":"f70ebe3d-e7d1-4205-bda8-448b578f4005","last_modified":1601517447708},{"schema":1601376683642,"derHash":"/PJvvBsqJadqtOqSssvvNn4BMQkcgC2kmJj3iuVLMPg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"551d256b9e4988053973e8535709a6276d327de7d3ea6dd215e8c97deef2c69f","size":1768,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/fde06ce8-4602-4d76-892b-b6cf8d5e7df2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"c14d8dbc-33da-445a-9bf1-c590049e77e7","last_modified":1601517447696},{"schema":1601376665083,"derHash":"EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=","subject":"CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE","subjectDN":"MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl","whitelist":false,"attachment":{"hash":"a9f261d0ad4e87bacd12e03d772b19c478c501880901e13afa12424a3fa0819b","size":1906,"filename":"1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem","location":"security-state-staging/intermediates/8b44d61d-b858-43fa-b426-fbbbc968b95d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=","crlite_enrolled":false,"id":"e80bbded-a765-4025-b5d2-e47ce2297737","last_modified":1601517447684},{"schema":1601376676513,"derHash":"KXW6tR0A2GLQ4W7t74MGp1nGXNS58A2vUOzfy07DluQ=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"913a6555d1accfb6fad27f0850000c3dead37ef7c0c8683ab4771d4154dafae2","size":1329,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/7138d666-f219-4eca-9b68-3b6dbcfe02b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"8b0c2567-a21b-4543-a7b7-cafd2a3b2559","last_modified":1601517447666},{"schema":1601376663499,"derHash":"h9QhabJpNVHKIFzPF/BvbmZR9yGM1tJmB79bpN0vJvI=","subject":"CN=Trustwave Global ECDSA P-384 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8cd0dbed89841d6b6854301f7eecbbdcd40ac73d8c8347c1ea8a577a05c10603","size":1410,"filename":"91i1mhKwhcz0SKoJ9CzM_9ohVagG6cKG9Z_i4Ts1FFk=.pem","location":"security-state-staging/intermediates/9aa01a62-0930-4473-93bc-42f043cb480f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91i1mhKwhcz0SKoJ9CzM/9ohVagG6cKG9Z/i4Ts1FFk=","crlite_enrolled":false,"id":"a65d784a-aa65-4997-b67c-6e62f264ae5b","last_modified":1601517447619},{"schema":1601376660625,"derHash":"BMGHHGhgdRU4n6Owz7g9vmpK8F6MgOdFcClp8kBgbjY=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"22b4bbcfbe3f75b06e7578a6a45c84da9c0262d68c36a8114773ff9a455d842b","size":1788,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/1d629e89-02d9-4ab4-bff8-d297d4dae791.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"c5aa18ff-f49e-44c8-9396-c03197aa910d","last_modified":1601517447603},{"schema":1601376656232,"derHash":"Ek6q8m9XDE+02J9dYQePFbiFNF/K8MV/NHfYxjtasm8=","subject":"CN=Actalis Extended Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGGMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"332f65bf2214e30be6f0940dc3bde167397bf14fc227615cd42ca92857dd83bf","size":2641,"filename":"Qit8ertDRalW2_YZANpfGKsGuNxcSeZ5UXpPg8_gmpE=.pem","location":"security-state-staging/intermediates/fd033e38-cc55-468e-af90-2a082b309e20.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qit8ertDRalW2/YZANpfGKsGuNxcSeZ5UXpPg8/gmpE=","crlite_enrolled":true,"id":"a99821b6-4960-494c-8f67-232566a4edc4","last_modified":1601517447590},{"schema":1601376657738,"derHash":"T4OELx8Eqx4E1NjnUWZvyoLlGRyvwkBiv9H+d8AspLQ=","subject":"CN=e-Szigno Class3 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"71132024dc6f9eb4be8dbf1a0131b491fae4efd3d711ad58c399ed1ebdd355ef","size":1662,"filename":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=.pem","location":"security-state-staging/intermediates/c0d8ef6e-268f-48b3-a7fc-780d0dc7ea0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=","crlite_enrolled":false,"id":"77f03aac-ef84-4ca4-960c-68a37582c545","last_modified":1601517447577},{"schema":1601376659170,"derHash":"gpj8QnBMTtd0tNsxBSkmC1JKkHUlKh0Ks44G8bmoNJk=","subject":"CN=CertCloud RSA TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgUlNBIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"59bb133020146d20f0d963a09c0520755e8a49c60982dbc377b4072ee287be19","size":2073,"filename":"Wz3-4Wr1VbAmx0vpewGzhrRMM8dT5kZ8_PHc1S6WqYs=.pem","location":"security-state-staging/intermediates/19ad562b-8c2b-49a4-a53c-f8979d651b08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wz3+4Wr1VbAmx0vpewGzhrRMM8dT5kZ8/PHc1S6WqYs=","crlite_enrolled":false,"id":"58c4fe43-8482-4fd9-a504-3f27e47b56b9","last_modified":1601517447564},{"schema":1601376653303,"derHash":"EcaXh4cyBW3hfB2hNOnSttI88d6Vs/sKTRilF6tjIwo=","subject":"CN=GTS CA 2A1,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMkEx","whitelist":false,"attachment":{"hash":"66c35c0df4a124a571526bb96130bec322a6f7500769403d0c068726f5bf3b3c","size":1130,"filename":"dEp_Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=.pem","location":"security-state-staging/intermediates/34f43fc6-b91c-4d55-8672-e2ba29010b29.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dEp/Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=","crlite_enrolled":false,"id":"911255a8-a1cd-4edd-8e7e-f67154d601a8","last_modified":1601517447552},{"schema":1601376650517,"derHash":"pmUAegXv4YidZqQN7svGwaJx6RkAaBH9uNvX4GdSEtE=","subject":"CN=Siemens Issuing CA Internet Server 2020,O=Siemens,C=DE","subjectDN":"MFExMDAuBgNVBAMMJ1NpZW1lbnMgSXNzdWluZyBDQSBJbnRlcm5ldCBTZXJ2ZXIgMjAyMDEQMA4GA1UECgwHU2llbWVuczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"5ab8cb8a5146787aeb9025fd757a28e47c16893e2603c336459385a83349e955","size":1719,"filename":"uOU9UZhtVd_opiG5DbxESujdJ9UY8BLJblR-MMq9FbY=.pem","location":"security-state-staging/intermediates/e9295752-30ef-4d70-8969-fd3831ca87ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uOU9UZhtVd/opiG5DbxESujdJ9UY8BLJblR+MMq9FbY=","crlite_enrolled":true,"id":"0a08acd0-7a3a-448c-97ca-8b13d65bb4c7","last_modified":1601517447540},{"schema":1601376654768,"derHash":"QtyCf0b7XoXf+uR9PGkPUB7OJdV11ZelDY+Hj6Qq/Oo=","subject":"CN=e-Szigno Class2 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMiBDQSAyMDE3","whitelist":false,"attachment":{"hash":"24e4936e9492f5245f32e7f9b60258d25f2a4c8e36002f26691cdf9f19bb94f3","size":1662,"filename":"3TGdI2jR-PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=.pem","location":"security-state-staging/intermediates/e9ec773b-bb9c-4483-aaae-eed0307b52c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3TGdI2jR+PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=","crlite_enrolled":false,"id":"ad182baf-a664-418f-b166-97468c566a74","last_modified":1601517447528},{"schema":1601376649078,"derHash":"DTb2oimeniaPlK20nlfmcX1xPD9HuInEDc3Iz+lAy4A=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,C=IL","subjectDN":"MDwxCzAJBgNVBAYTAklMMRUwEwYDVQQKEwxCZWFtZS5pbyBMdGQxFjAUBgNVBAMTDUJlYW1lLmlvIENBIDE=","whitelist":false,"attachment":{"hash":"4b493757d7d299f8cc22b2765b16fa2d9bcc5aab6354a1aba37cad4f16162bf8","size":1727,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/c63ea01c-f085-4c51-8777-54e68bb926ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"1376d433-c704-4fdf-b6e5-2eb14d36c683","last_modified":1601517447517},{"schema":1601376647571,"derHash":"9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"f3d6221594115cd098f20f66a013d90aae3becd3c578a737a8e58a35230c208d","size":2016,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/d16f438d-3c35-419c-9f98-50f522b13cd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"ace44f60-2db3-4ac9-8da0-94488a7efde1","last_modified":1601517447505},{"schema":1601376662098,"derHash":"iwW2jMZZ5e0PyzjyyUL7/SAOby/5+F1jxplO9eCwJwE=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"0a551cc852c7b0f054ae4c9e72acb7a6b4b1a8bab2d598b21063ab92fc36ecb6","size":1577,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/632fc862-dd3b-4e49-9fcc-064d7ec3bed7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"6cf55332-76a4-433e-bf71-a3817eca7a01","last_modified":1601517447493},{"schema":1601376651889,"derHash":"8RRGn7gHeBM6H3Dk2DOO2rl91CzrjswByvtw1rh98R4=","subject":"CN=certSIGN Web CA,O=CERTSIGN SA,C=RO","subjectDN":"MFYxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEYMBYGA1UEAxMPY2VydFNJR04gV2ViIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d637585d0fa1d3a2b6cea2a2ab6f2b7d30229bc1eb350aeb2b8cc2f529b5998a","size":2308,"filename":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs_0ubJ68=.pem","location":"security-state-staging/intermediates/e722a8ed-95b5-4804-afae-33cfb565e784.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs/0ubJ68=","crlite_enrolled":true,"id":"bcbc78b3-6912-4320-9fcd-fdc468194871","last_modified":1601517447481},{"schema":1601376646054,"derHash":"E/ezfMH4RCqM4T57RCIhfY6JlXz+qFDDy751y+Vh53Q=","subject":"CN=CertCloud ECC EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"68a6d4de039d26f711386d924105e95da6fb2c74e019e46d3006b1d43a0281f3","size":1272,"filename":"S9iaDtfedpswiFg99kL_1fGIcuuU0gvf0uBHeNGHlmw=.pem","location":"security-state-staging/intermediates/da97892c-7184-4868-809e-e2de1fd11f77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S9iaDtfedpswiFg99kL/1fGIcuuU0gvf0uBHeNGHlmw=","crlite_enrolled":false,"id":"0b514bd5-5bab-4144-8394-f91d8e5083cb","last_modified":1601517447469},{"schema":1601376643176,"derHash":"l9QgA+EyVSlGCX8g75VfWxzVcKpDcteAAzpl775pdY0=","subject":"CN=GTS CA 1P5,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMVA1","whitelist":false,"attachment":{"hash":"6d39d26fa45c2aea9f3ecfb72ba0887e152ffd6f6a6dc6e197c57cefd4030fa0","size":1983,"filename":"81Wf12bcLlFHQAfJluxnzZ6Frg-oJ9PWY_Wrwur8viQ=.pem","location":"security-state-staging/intermediates/680da5a2-5a45-499e-9fe7-ad8478a1e4b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"81Wf12bcLlFHQAfJluxnzZ6Frg+oJ9PWY/Wrwur8viQ=","crlite_enrolled":true,"id":"0332f56b-8620-4d04-8c28-c92c27457a8d","last_modified":1601517447453},{"schema":1601376644621,"derHash":"zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=","subject":"CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey","whitelist":false,"attachment":{"hash":"3e5a1329226826601bdcf297eb985c9089c7df20bac76d529770ff0dcdc2bd3e","size":1752,"filename":"UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem","location":"security-state-staging/intermediates/8cd77c9b-486e-4100-9c8d-97ad44a4562c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=","crlite_enrolled":false,"id":"0ec526cd-a0ef-4c4a-8b3b-a754ccb19f72","last_modified":1601517447434},{"schema":1601376637469,"derHash":"X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"bd47e7c223bc2e656a7455d83b5877cd3dbf66c20fcb9f464190df0a25d15bdb","size":1760,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/c6186265-d36f-4c14-952e-e41d57172aba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"8c1bcef6-6009-4c63-9b0a-3c13dfdbc750","last_modified":1601517447421},{"schema":1601376641748,"derHash":"jJegCPfOIfdG6vsuOuBgleVX0omjEMgsbzwC2fch5fg=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"27785b9964ca41a7f924e4715e32d3827904bec2c860b8f2f76367447209d89d","size":2089,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/f5ede2b0-fb12-43ce-bedd-eb7497d73176.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"da4a208a-302a-4e48-b4c4-e13b959e3b91","last_modified":1601517447407},{"schema":1601376636030,"derHash":"kn6b/A11wxRgcMPzr91KLBD3ZSiRJJl8xSz9EgnnY8s=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"f1fff265badcfcfaa0e9addfdc7577271845c1a6c9766600e36f19dc9bb90333","size":1780,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/b3b041d6-10f4-47b8-9a9d-e23fc8550699.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"d6ebc2af-8b16-4c9e-a668-85bc3c6e5db3","last_modified":1601517447392},{"schema":1601376640357,"derHash":"a0O0wkOqLZlEDA8UvexSMe7GPoaq8jdspwAgKEWNxyY=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"b63de0fbdd8dbe519e4d6f674c13166625a717f8e6156297f07badf1c8b0d8fc","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/08efa28e-ac8e-4439-8571-25fa10e93a54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"336fa754-0327-4934-8691-767db2f8c4e8","last_modified":1601517447374},{"schema":1601376634613,"derHash":"AD9x3EggIWV1/Fqs/jsa63b3Kupbjo/O/IC59RekphI=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"312e807dea2263ef605990bfa0b57b238b64d9fea0fc945e37f48f3e6246d576","size":1329,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/2f5049d0-8147-4c75-8788-37b8cc132687.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"cac77e25-ef10-4186-8398-2e2c849f9861","last_modified":1601517447354},{"schema":1601376638894,"derHash":"bINDiPKg0GlJxj788w13eC4lqCUBNZOeVJYCFFQO6kU=","subject":"CN=Root CA - G3,O=Root Networks\\, LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxFTATBgNVBAMMDFJvb3QgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7a25b4650cf78598d30bd2fd71f98a9514917410a9123cf8351a487e3ed9a093","size":1678,"filename":"ujBfMmfTX_3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=.pem","location":"security-state-staging/intermediates/a716f279-b6d3-4fb2-95c8-c4be3eb17af2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ujBfMmfTX/3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=","crlite_enrolled":true,"id":"027c9cd4-cf00-448e-94e8-dd1d17b4a715","last_modified":1601517447337},{"schema":1601376633198,"derHash":"sarhvNVV6KPR492o7ITnV8VSZVNEzj/uu6+Y6JXb7aw=","subject":"CN=QuoVadis Europe SSL CA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEiMCAGA1UEAwwZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"dfb31ebff112bccbef0ba90c29987f9962823acb59f69bd984351d9e2c7e22df","size":2381,"filename":"XOogr9_VItHwTOA_JogutdX4V06tVw9btHQLa2tR0_A=.pem","location":"security-state-staging/intermediates/a64232dc-7d88-4d93-8ab8-1406e19a3244.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XOogr9/VItHwTOA/JogutdX4V06tVw9btHQLa2tR0/A=","crlite_enrolled":true,"id":"86ca8809-c9be-449b-953e-f7162dbeee9d","last_modified":1601517447320},{"schema":1601376628816,"derHash":"BeQAXbDDgvO9ZrR3KekBFXdgG/b3sofppSztcQ0lg0Y=","subject":"CN=Microsoft RSA TLS CA 02,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAy","whitelist":false,"attachment":{"hash":"b31f15756dd2424f4c72909e8e5489c3443c030299ab3270a47adebded78e565","size":1914,"filename":"1wMGTin0PoCN5O41h0-XIHXuzGRwDEa8ehHf7wSdSQE=.pem","location":"security-state-staging/intermediates/d2e5fdc3-84aa-4140-9187-817c95bd7ba2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1wMGTin0PoCN5O41h0+XIHXuzGRwDEa8ehHf7wSdSQE=","crlite_enrolled":true,"id":"0d0f8898-e508-48d6-9b66-e3b209767588","last_modified":1601517447304},{"schema":1601376627290,"derHash":"BN5Hqc3TCRz8Xvaqo7fUtT4TxNTcAjZPbAtAh0LsPHY=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGoxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxNTAzBgNVBAMTLFZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBBbHBoYVNTTCBDQSAyMDE4","whitelist":false,"attachment":{"hash":"d9ce06bfe7f10679316c826ca701910ff485eff604b066946a2f9397ac536aa7","size":1772,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/07ef1804-cfe6-4217-9420-629acd5754f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"2f75750f-796d-48e1-87ec-0f623cba8354","last_modified":1601517447288},{"schema":1601376631782,"derHash":"aeLQbDDzZhZhZekdaNHO5cxHWEqAIn52ZmCGwBByQes=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R2,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIyMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"a9f6d16a93aa62ba7dbf378a10c0719ad51755b8d8276a662013037d6fbe06d3","size":1353,"filename":"iie1VXtL7HzAMF-_PVPR9xzT80kQxdZeJ-zduCB3uj0=.pem","location":"security-state-staging/intermediates/359bf7c2-bdab-4656-a7f3-cdb3dc7672bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iie1VXtL7HzAMF+/PVPR9xzT80kQxdZeJ+zduCB3uj0=","crlite_enrolled":false,"id":"f3cb24be-3618-4b26-a4a6-1b25f3cf0023","last_modified":1601517447276},{"schema":1601376630285,"derHash":"CZg6JjLAM+uUScDr8h+bjUqZdcBvuOIPSlBC6eTMZBE=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"dffc20f5ea1b99f91d8665a18a15d299bddfa0b71cb6b19267a6efa7d6b7d6ed","size":12598,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/f4c29470-a6fd-43c0-a33a-5ff5f52725f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"d2f38b78-3b2b-479d-8f4c-a7f2f68fc57f","last_modified":1601517447261},{"schema":1601376624368,"derHash":"ffTT70V5j4xDhPxwK6UqRM571imLFBYo1Kurx2ePZGc=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"8d704ee294bd149733993801e0cbad6deaa30f162b02e59509443d2f13b07b74","size":2653,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/cc459e2e-5a1b-46ee-a8fb-e27ec23c89e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"79efde4e-0f38-47f1-818d-bc7ec34f652f","last_modified":1601517447248},{"schema":1601376622963,"derHash":"lJ1rS3YcoTStPnqFcRhvWA7oh/LGtWi1FA9BV/mNaN0=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"1a3bc0dfeb8f9e3f79809953a727d69dc11a315684b4cf57c35d226206502e31","size":1329,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/82ad1928-1b21-4c0d-ba0a-c3f04d6691cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"9bc8e3bb-0a99-4d29-a7f9-6256977d6e41","last_modified":1601517447236},{"schema":1601376625746,"derHash":"vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=","subject":"CN=GlobalSign Atlas R6 EV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"7a27c45b53bfd5690bb01873eeb250e11a9b84a706cbbd33be1cafcbad5ed9a5","size":2402,"filename":"P7xnWSLQVg6f_MMaRe-f9TBAwDOlwdoyxweVGx8v2hY=.pem","location":"security-state-staging/intermediates/abbc51d6-58ed-461b-a517-c72a39e10eb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P7xnWSLQVg6f/MMaRe+f9TBAwDOlwdoyxweVGx8v2hY=","crlite_enrolled":true,"id":"456d5875-ff1b-473b-bc56-e5be4f248b30","last_modified":1601517447225},{"schema":1601376620104,"derHash":"MCQkQ/aJWpRWDkjk3/cgU26vUWPLQvXod0AqveL4Ynw=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"63f37d712386cb1b4ab3fb0368f861aeb7ba74ec9b9bc7ecdd247bcf94725693","size":2373,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/22bf873e-f19a-445b-a1d8-616b8f871405.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"e101da6b-d1cb-4f14-badd-55bf7b2b98b3","last_modified":1601517447213},{"schema":1601376618691,"derHash":"jSXNlyKdv3A1a9pOs8xzQDHiTPAPr8/TLcdutYQcfqg=","subject":"CN=GTS Root R2,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMg==","whitelist":false,"attachment":{"hash":"4d0fda0d78fd282ab5f1cf69e3b3e458120a33cf3e5fdeb14796f324a389d74e","size":1910,"filename":"Vfd95BwDeSQo-NUYxVEEIlvkOlWY2SalKK1lPhzOx78=.pem","location":"security-state-staging/intermediates/18d175d2-d289-4938-9ea9-830a54586520.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vfd95BwDeSQo+NUYxVEEIlvkOlWY2SalKK1lPhzOx78=","crlite_enrolled":false,"id":"9c5a86fd-acfb-44e6-a965-16bd0489fce0","last_modified":1601517447198},{"schema":1601376621544,"derHash":"YIG+5bDfGRrE4mWsD294mfB4uMifBgVa4Wavkd9w1uA=","subject":"CN=e-Szigno Qualified QCP CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBRQ1AgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"280a786ca35892c86124fb11c5e02f70f1bf6cd40daa1e6538e054942241cdaf","size":1674,"filename":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=.pem","location":"security-state-staging/intermediates/0b5259bf-1e93-47a7-90b3-dca802d1f439.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=","crlite_enrolled":false,"id":"00fa2c99-0c09-488d-8cc5-539354f0043a","last_modified":1601517447186},{"schema":1601376617148,"derHash":"RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=","subject":"CN=Bloomberg TLS CA,O=Bloomberg LP,C=US","subjectDN":"MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=","whitelist":false,"attachment":{"hash":"e48dfa14c978c6bbeb5232c7e711afced2f56d20f367cd0a74a7100aac332138","size":1743,"filename":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem","location":"security-state-staging/intermediates/ab934801-da9e-47a4-9ebd-e248835633fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=","crlite_enrolled":false,"id":"14d2a1f9-84c0-4272-b5cc-bf8f1d0b1cef","last_modified":1601517447175},{"schema":1601376614329,"derHash":"ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=","subject":"CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0","size":1674,"filename":"qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem","location":"security-state-staging/intermediates/b21a2837-5b65-44b6-92b7-fec471d70713.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=","crlite_enrolled":true,"id":"2f5d27a3-cb0f-4f6b-b6b1-20c198d58fc8","last_modified":1601517447163},{"schema":1601376615736,"derHash":"BDerLsLCtIkClsE1A0sh2xRkNLgxfucDqoqpQ8XqUa4=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"2777739491d74eeced727118790444484a83437e4e704c6697aa928b36a78bbb","size":2653,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/0f03fd0a-27a3-4dc4-ae4b-cae63ccda207.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"9588f4b7-ef4c-454c-ae12-6fe792fd04fb","last_modified":1601517447151},{"schema":1601376612913,"derHash":"NJ36QFjF4mMSOzmK55VXPE4TE8g/5o+TVWzV6AMbPH0=","subject":"CN=GTS Root R4,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSNA==","whitelist":false,"attachment":{"hash":"5f621c613a2dfb4502a29efcba11f0a010ef7954ea3464006115a9c300bdcdc1","size":764,"filename":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=.pem","location":"security-state-staging/intermediates/162ddfd3-2b0d-4442-bcce-7da7e8bf6407.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=","crlite_enrolled":false,"id":"9e098de2-8eff-4563-8498-48674d36fd03","last_modified":1601517447140},{"schema":1601376608575,"derHash":"LK77tV5w31qJhf6bwQ3VakDD3tqz2hUwopaCAVxbfGY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"a45e27eb4ce4e2624d46479d0ecf5a612e520e17ac29d9b405427a94f6798f65","size":1512,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/3712ec43-ab3a-42ad-b264-a74c80ef69e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"3c689452-ab89-4bf2-8422-175cc12405ef","last_modified":1601517447128},{"schema":1601376610110,"derHash":"iPwYvQcb4fvFP/vIAfA/WyxNqHu6DAmOK0gI8Z6rBf4=","subject":"CN=RNP ICPEdu OV SSL CA 2019,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MGQxCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMSIwIAYDVQQDExlSTlAgSUNQRWR1IE9WIFNTTCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"292ae2e45b6a02ae65ded412e50c0abf3b623685bd49a8f6369bb4d5010c40d8","size":1784,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/2d768dc6-b376-4595-aa5f-511c0ca86bbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"13b1b2af-0a3e-4a0e-bd66-ac0c5569b5b2","last_modified":1601517447117},{"schema":1601376607092,"derHash":"l0uCB2FUzv9W7U21Yhhvc5SgL/OHqiBdY2eosI/3+qA=","subject":"CN=e-Szigno Online SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIE9ubGluZSBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"0abdd69f4b3ccf85097142e285b47d52e0f91c59aa3e684dfa3c25bb3c8d6039","size":1666,"filename":"G_JwHP_ydSe7pufWcUyNckBrxBbnQ6Kmqw_OFPPiQI0=.pem","location":"security-state-staging/intermediates/0db470e8-a13c-4fce-ba60-4c8e912112f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/JwHP/ydSe7pufWcUyNckBrxBbnQ6Kmqw/OFPPiQI0=","crlite_enrolled":false,"id":"be3dd44c-e4c2-4dea-82b9-1119b2b6f158","last_modified":1601517447105},{"schema":1601376611528,"derHash":"FkjOSrG7ZcSFyyI2x2j6u4ZRR9QmkVuSr7yoHpsu47w=","subject":"CN=e-Szigno Qualified Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgUHNldWRvbnltb3VzIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"babeb483e7bc13a161427464ff4aa32b126458a9b7bd684609420f8d1a7cb6ab","size":1687,"filename":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=.pem","location":"security-state-staging/intermediates/544f8df8-fe6c-4936-b396-e58147817864.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=","crlite_enrolled":false,"id":"88241fa1-e1ea-449a-89fc-9125fa95445b","last_modified":1601517447093},{"schema":1601376605658,"derHash":"GgdSmos/AdIx360qvfcYmSALtlzX4DxZ+oInJTM1W3Q=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"e7c443b15be49a4083c31378f2a1749ea59e73cd564b4d4e0465ea2d9d839146","size":1825,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/7295ba60-db16-49ff-8ccd-589f3c2d0632.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"9e2ed41b-4f49-45cf-b525-68dac3e4fc03","last_modified":1601517447080},{"schema":1601376602750,"derHash":"+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=","subject":"CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez","whitelist":false,"attachment":{"hash":"cc6eb0f3e51ae41188fd3477d2b097eb3bfd190c1e01766f9836d30c6d379aaa","size":1817,"filename":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem","location":"security-state-staging/intermediates/8a525834-15cd-4e6d-805f-40c255beee70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=","crlite_enrolled":false,"id":"2aeb4971-751b-44b1-b195-c573c242c491","last_modified":1601517447057},{"schema":1601376595585,"derHash":"kfGc5QPJ/n/5WH2O++9zFarud9wtFFJhJkk7Stb+gB8=","subject":"CN=Trusted Root TLS CA SHA256 G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1UcnVzdGVkIFJvb3QgVExTIENBIFNIQTI1NiBHMw==","whitelist":false,"attachment":{"hash":"9e03d57a2b38ff0564d3f320d536aae856aa3db18618f722e03e7da8e2a0d9eb","size":1674,"filename":"hMdIk_Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=.pem","location":"security-state-staging/intermediates/34bd21db-03ad-4d1f-8aac-923be9545dda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMdIk/Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=","crlite_enrolled":false,"id":"cfd4ef1e-3a44-4b12-b34e-4223ff9c39b2","last_modified":1601517447046},{"schema":1601376599850,"derHash":"5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"e080ccfbdfc6374397f903976e83dea4fdecc00a0a36cd72f9c882ceff09e62a","size":1902,"filename":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem","location":"security-state-staging/intermediates/ec813aa3-890f-4aaf-af70-891b2f9ac694.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=","crlite_enrolled":true,"id":"b6bfa80e-3f0f-4690-b7d7-23d34186cfc8","last_modified":1601517447035},{"schema":1601376601295,"derHash":"02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=","subject":"CN=GIAG4x,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=","whitelist":false,"attachment":{"hash":"7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50","size":1991,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/201e7f79-691e-483a-a577-cb5954177a09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"06dbcd12-25fc-4a32-8d4c-764f1fa66c80","last_modified":1601517447023},{"schema":1601376594131,"derHash":"2sqgn/rY9m7bbtaXB6gnyeRMH5fEjwF5SF8gbXB7Pis=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ef925783f986610c821619c78a724b477a9c2b4492f84e6446635c18799dc2f9","size":12623,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/8c3bcdfd-c7d2-4fdd-9211-dbb84bb4eb1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"929ecfd8-abd5-4745-9e8a-0a336c38b785","last_modified":1601517447012},{"schema":1601376598367,"derHash":"4iFgNk5W98JyNPVDXYR3saW7ugEQMpjzlUkJGA3wJ3g=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"ad86215f7ef8a6f4477d1e9ceb7ec59f0773886cebfee09bac4eb456aa559c8c","size":2085,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/ec4121ac-bc6c-4e56-a364-4f4fd043fe83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"36d968fe-300d-4647-a1dc-b69c50bd236f","last_modified":1601517447000},{"schema":1601376591167,"derHash":"1ehNmmd+bNpy3Rwbp62N38Je+sIgyKlXHOwnwQdVVwI=","subject":"CN=ICPEdu,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MFExCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMQ8wDQYDVQQDEwZJQ1BFZHU=","whitelist":false,"attachment":{"hash":"9b9ef56a8e9ed418407c8f8b194145af30c2c29e7dceb0b41ecc390660a45493","size":1735,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/023abc51-e443-459b-b3d5-6898ddf046fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"168d707f-83ff-429a-a54e-c3f9bb1c6afe","last_modified":1601517446973},{"schema":1601376588314,"derHash":"8Z1VzQij6kK9kVCAc4IxdN2SNwITwXf4JTF1badQilE=","subject":"CN=JPRS Domain Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"d1fbc1604b7b78d8673b6b7247a33b5d142c6ebaa41b8e0412cedc570a24b3d7","size":1780,"filename":"KbEUDafDNIUlOxLiaD-8KAlxp-gea65O57qq4l5SFl8=.pem","location":"security-state-staging/intermediates/d06f72b5-3ee5-451e-b19b-87a6d6e9d7ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbEUDafDNIUlOxLiaD+8KAlxp+gea65O57qq4l5SFl8=","crlite_enrolled":true,"id":"00b4fe55-009b-4329-870b-f41b82632937","last_modified":1601517446958},{"schema":1601376586918,"derHash":"XEUjNNnJyaLqQsx3pxZeF5XunYTrcMt4S0fqnZKlgtk=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBEVg==","whitelist":false,"attachment":{"hash":"8265936e7b87a7845ad3792c1bfbde5b8469f44276f048e773d7d306888e920a","size":1756,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/5d4ddc4f-7993-45bf-85a2-6ceec4bee87c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"099088c0-fda2-4d4e-8994-f1c2d2324da0","last_modified":1601517446944},{"schema":1601376592637,"derHash":"xj35YY+69IZiuhKr6HshLPd3wnpEag+lVdep0ZEUjtc=","subject":"CN=Trustwave Global ECDSA P-384 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"e81cc0a883e6e41a009a5d876bc62528cd6b26b1edd7421071b6ff434dca6265","size":1390,"filename":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l_zvmwptYjCgg=.pem","location":"security-state-staging/intermediates/7c9dffb0-6aeb-4bdf-b8db-f5e872badd2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l/zvmwptYjCgg=","crlite_enrolled":false,"id":"4ab5e3ff-7ca1-404f-8d51-ff0a87281a04","last_modified":1601517446930},{"schema":1601376585488,"derHash":"wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"f4d91481d1e4e17c44e796f180b7b4af9f0ae8e97cf8d41165640b3fdefd8f5d","size":1760,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/97d8919a-981a-48f8-aaf7-c8bb7fce029c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"a6bcf5b7-81c1-46f8-81ff-00adef177a8c","last_modified":1601517446898},{"schema":1601376580991,"derHash":"2UdDKr3nt/qQ/C5rWRAbEoDg4cfk5A+jxoh//1en9M8=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"56cc033ba7b1b7f111791affa1f1df410009c08c0b9a625d2bbe0a30aca502bb","size":1910,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/93ef7a02-e8d5-4844-979f-44ee6395f343.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"eb48188a-e93a-4e46-8709-36bdc859d240","last_modified":1601517446886},{"schema":1601376583949,"derHash":"RklOMDeQWd8YvlISQwXmBvxZBw5bIQds4ROVS2BRfNo=","subject":"CN=E1,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMQ==","whitelist":false,"attachment":{"hash":"14cf69c79f1a688b326247f724ad50a3b22de5e34daf12c66670e5a38b1273d0","size":1020,"filename":"J2_oqMTsdhFWW_n85tys6b4yDBtb6idZayIEBx7QTxA=.pem","location":"security-state-staging/intermediates/aed297e0-bd28-4811-8d38-5b759a3b3026.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J2/oqMTsdhFWW/n85tys6b4yDBtb6idZayIEBx7QTxA=","crlite_enrolled":false,"id":"1141e315-003d-455f-8db2-84954ef57b40","last_modified":1601517446875},{"schema":1601376582516,"derHash":"iZlLbZ2d3/9of6vT5zQs3YUi1mH1786Oar3rJaBPECM=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4446a8961707823fad23675d037ebcc454ecda2fe98586b7839466271d4521a2","size":2369,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/f260e4c6-6602-47d8-b091-aa180b906619.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"ac9b7c21-b5e0-4211-af9f-f972e93e12a6","last_modified":1601517446863},{"schema":1601376575218,"derHash":"TsQ5ZypENAGmbieUfMO1iX8TK2Z/cSzBo3AYo8yFsWo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"d6b88839e53fd1739f156f78254837d2b4b300f968dc9ab78c1f926d2648da2c","size":1508,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/e0df5215-e166-4b85-982c-ca84a269c0b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"b24f85ea-0f0f-4a8a-ab1e-ae3b2fcb9f7a","last_modified":1601517446852},{"schema":1601376579574,"derHash":"NNinPuII2bzbDZVlIJNLTkDmlIJZbotvc8hCawEKb0g=","subject":"CN=GTS Root R3,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMw==","whitelist":false,"attachment":{"hash":"3febe52108c8006fec57c9deeef32126e877134377f5fed563452d77eb20ce23","size":764,"filename":"QXnt2YHvdHR3tJYmQIr0Paosp6t_nggsEGD4QJZ3Q0g=.pem","location":"security-state-staging/intermediates/f16dce1f-4902-45b2-81af-f5793daff8e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QXnt2YHvdHR3tJYmQIr0Paosp6t/nggsEGD4QJZ3Q0g=","crlite_enrolled":false,"id":"183bf702-6f79-4eff-94c6-c38c248affbe","last_modified":1601517446840},{"schema":1601376578159,"derHash":"us3gRjBTzh1i+L50Nwu6551PyvGfwHZDrvGV5qWb1Xg=","subject":"CN=E2,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMg==","whitelist":false,"attachment":{"hash":"051882dab9b07102f7aba08eef5eb943e8b8096631074d7f98f9c7dcef77e86d","size":1020,"filename":"vZNucrIS7293MQLGt304-UKXMi78JTlrwyeUIuDIknA=.pem","location":"security-state-staging/intermediates/91546249-fef0-4823-a9ed-185c11ff8809.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vZNucrIS7293MQLGt304+UKXMi78JTlrwyeUIuDIknA=","crlite_enrolled":false,"id":"a9e072f6-e8b9-4cd0-bd25-18fc9624033e","last_modified":1601517446828},{"schema":1601376576656,"derHash":"3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"f0c9af66d96dd17fa4676b867f59ad47a1e282afe025a8c07064a4124e677b47","size":1800,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/c52a5d8c-8943-4eaa-bc48-88843df5b604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"80b0b822-d489-4a48-a0ea-77bb1d2013fc","last_modified":1601517446816},{"schema":1601376573787,"derHash":"NH0Y3Mwu/FGpIOen+7B7+9o1YTaB+C3KXExyuwyDwDU=","subject":"CN=VR IDENT SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MEoxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMR0wGwYDVQQDDBRWUiBJREVOVCBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"4158e246be129509cb8d8eb14b647517fea0196e81a9d593f4b8f64a11a6414f","size":2357,"filename":"fQUctsUYoew1aFnAFT0prf-kJmkVNqkPo2jJ5Jm9RaA=.pem","location":"security-state-staging/intermediates/b7b9a6e5-c886-4743-80e1-a004bb1d75fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fQUctsUYoew1aFnAFT0prf+kJmkVNqkPo2jJ5Jm9RaA=","crlite_enrolled":true,"id":"d7d2fa4e-5c2b-416e-8b89-ab9fdc251bbf","last_modified":1601517446797},{"schema":1601376570852,"derHash":"1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217","size":2121,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/e3b5ce85-565e-482f-b742-aae47955c01f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"8fc3b269-4824-4ae9-9b9d-2d5ab7099766","last_modified":1601517446782},{"schema":1601376569389,"derHash":"HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"2e0cee661a4a6fd3b4cc86995b705e916cb3c5b536a617c5d74956b4574cf947","size":1902,"filename":"WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem","location":"security-state-staging/intermediates/d00fd466-270b-4020-bcdc-6546fd39651d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=","crlite_enrolled":false,"id":"0fb16912-e152-4389-8528-af7e45b4a303","last_modified":1601517446770},{"schema":1601376567997,"derHash":"JMcpmGTgoqaWT1UcDo3yRhUy+oxI5Nu7YIBxZpHxkOU=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"1963ee36a9c20eb3169ad73cd42da09bfc6829eb50f71d6216925c6b9c2dddcb","size":2121,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/a7c93098-e1be-467b-b69f-faa129a552ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"476c2db8-a579-44d3-a747-000ac1f604c4","last_modified":1601517446759},{"schema":1601376563770,"derHash":"lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=","subject":"CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"6c7a7611b0ccd14478c030a701a6eee0909ea61c24f76a90cf4f5eaec2ddfd88","size":1873,"filename":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem","location":"security-state-staging/intermediates/2a18cd5e-bcf4-44b2-a1f9-a25d0729bb7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=","crlite_enrolled":true,"id":"1d6a3599-67f8-40a4-917a-3ab4dccd05ad","last_modified":1601517446748},{"schema":1601376566564,"derHash":"nGSppD6ZDpj7zoMXstTBwH/+bgMtqLttYKaW4v8Djx8=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"10551307f634eba8fbd03c34df0f74b6bf4e7d3b3857885e7e915dc171786627","size":1329,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/b60d08eb-819e-4b81-9b83-eeafe6a230a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"d0e47240-43a2-4706-a470-f44bd78b9892","last_modified":1601517446736},{"schema":1601376572369,"derHash":"aXKbjhWobvwXelevtxcd/GSt0owvyozxUH40RTzLFHA=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"df3c4c472795ccd5ca93453fa1024c35f64466f19536a34fb21d39c840e2e27b","size":789,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/8249b5fc-9f4b-4ce8-abcf-e69d8668a819.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"ec4c0f03-0d74-4029-98eb-969399ddf1b3","last_modified":1601517446713},{"schema":1601376562331,"derHash":"Z63RFmsCCuYbj1/JaBPATCqliZYHloZVcqPH5zdhPf0=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"c298ec17b9257dbfb7f36280caade22c6317186c146b5fdd5792bcb77afced29","size":1825,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/7e7a0279-0dad-4fd9-81d3-64173b7386bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"e559297e-5536-435f-919c-c382724f485b","last_modified":1601517446702},{"schema":1601376559371,"derHash":"GGJqO3IREo1WNGnGVFV9E8k2bX/OyLlNtPCqfgWUQEE=","subject":"CN=Trustwave Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGQMTkwNwYDVQQDEzBUcnVzdHdhdmUgR2xvYmFsIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"4e61dd89fb06d5da14f5a4b0f7a2328cd7ab2dea6544a50ea59b3e7d59167e32","size":2515,"filename":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=.pem","location":"security-state-staging/intermediates/40795e76-4053-4806-aaa7-a950a1cb31b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=","crlite_enrolled":true,"id":"6cfc11a9-c2ed-4bfa-9d64-f401bc35007b","last_modified":1601517446679},{"schema":1601376552121,"derHash":"xnDHm/J3r357NKaqT6MERBgzxr0Bpwp+m3otlMHB+SY=","subject":"CN=certSIGN Qualified CA,O=CERTSIGN SA,C=RO","subjectDN":"MFwxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEeMBwGA1UEAxMVY2VydFNJR04gUXVhbGlmaWVkIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"22d738f384d471ab73b8f3d1ec90fd80d0f61bf77294a7139dc772f58bb58e1a","size":2316,"filename":"hztK7Nl786SeQOWatriSlHoTSUt-1THcFFIGKRr08bk=.pem","location":"security-state-staging/intermediates/f1489932-a573-46d9-8a92-b0e3602d6b75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hztK7Nl786SeQOWatriSlHoTSUt+1THcFFIGKRr08bk=","crlite_enrolled":false,"id":"72fc535e-8f0d-4e88-93c6-72376b952d1a","last_modified":1601517446667},{"schema":1601376555038,"derHash":"MqTlVONjEW/kjiLwHawXNnUqcccg+Z9GLVZQItO60H0=","subject":"CN=DPDHL Global TLS CA - I5,O=Deutsche Post AG,C=DE","subjectDN":"MEsxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTU=","whitelist":false,"attachment":{"hash":"136f459d98a2f42f67f606dcf55c11198fea1f244cf8003c576d60d969cef1ac","size":1695,"filename":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7-_aukXzu-S0_M=.pem","location":"security-state-staging/intermediates/3efe881e-11a4-4301-908e-d7eee31dc4cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7+/aukXzu+S0/M=","crlite_enrolled":true,"id":"83a27672-fbfe-478b-b63b-a1ac28382021","last_modified":1601517446646},{"schema":1601376553578,"derHash":"BO7qjlC0d1s8JHlyYpF+5QAC7Ex1tWzfPuHBjPylulI=","subject":"CN=Microsoft RSA TLS CA 01,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAx","whitelist":false,"attachment":{"hash":"d21d673254fc1596b7b7c3a9a38e33ab09f786822535934e507dec3291deab5a","size":1914,"filename":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=.pem","location":"security-state-staging/intermediates/aa5247b7-b9cf-4225-87d6-0d81706e6bd2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=","crlite_enrolled":true,"id":"512871ef-52ae-48c3-9b77-a4853cd57ef7","last_modified":1601517446632},{"schema":1601376549115,"derHash":"PyJb2814jOkkhwyvkvgUt8b/Ttq6utk/HTqRdyUs8dE=","subject":"CN=QuoVadis Qualified Web ICA G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzM=","whitelist":false,"attachment":{"hash":"8eb4cfbfd4e31a971f563f4a974c582ecd679cc8c15604af9f0f24fb1daf720e","size":2385,"filename":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU_inT417rc=.pem","location":"security-state-staging/intermediates/7fee1a5f-8384-4340-9b00-3022795d91e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU/inT417rc=","crlite_enrolled":false,"id":"8c0d1791-073e-4560-9737-df4f28bdae8c","last_modified":1601517446609},{"schema":1601376557942,"derHash":"mRe/2FNziYXkbJIEGUEOlmwxaYJ2nnGBfifQOEu+Nnk=","subject":"CN=certSIGN Public CA,O=CERTSIGN SA,C=RO","subjectDN":"MFkxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEbMBkGA1UEAxMSY2VydFNJR04gUHVibGljIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d61a1b35a91c710f44d6b989faabe0cbe91a89dbc701983bdbf2602b85bf3038","size":2312,"filename":"IGxtWhsxuC58R149YREUyaqPK7jXR9no_MMC227zRVo=.pem","location":"security-state-staging/intermediates/1e86dd0e-4dbe-4e62-96a7-ff8105badaf4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IGxtWhsxuC58R149YREUyaqPK7jXR9no/MMC227zRVo=","crlite_enrolled":false,"id":"a8c42df1-8fa0-4806-b23c-c738e23dc581","last_modified":1601517446597},{"schema":1601376547689,"derHash":"PuAnjfcfo8ElxM1IfwHXdGlOb8V+DNlMJO/XaRM5GOU=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"a7e1e9af45661eb891874dbac46389428139246fe7050143e9b0fd233f74e236","size":1926,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/ce5580e6-ae0d-4210-908a-37cf76309cf0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"5aadf4a5-f650-462e-9a63-dc6992d5c308","last_modified":1601517446574},{"schema":1601376544904,"derHash":"LmPcG+z0J/mQK0neYzD9Po7r+IsU5lOzui431OSICWU=","subject":"CN=Trustwave Global Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGUMT0wOwYDVQQDEzRUcnVzdHdhdmUgR2xvYmFsIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"9d9bb0ca6a8a59110e9ecd8714e94894e0be5886e46f9c4e5265ffa83dcece40","size":2519,"filename":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=.pem","location":"security-state-staging/intermediates/d07f4614-6ee6-486f-a186-ba85e88f2762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=","crlite_enrolled":false,"id":"0b5e934d-aa20-488f-9bc5-23db1b6cf78f","last_modified":1601517446563},{"schema":1601376546320,"derHash":"WAuzqxJ/XhPpQK5zZePGmmKtIE1/36RRWS/nxH3AKpU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,O=Prodrive Technologies B.V.,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMSMwIQYDVQQKExpQcm9kcml2ZSBUZWNobm9sb2dpZXMgQi5WLjE1MDMGA1UEAxMsUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4gT1YgU1NMIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f33b1ca67bc2f7ef2190fc43c1d09060a4d6392a8969577007ae2dcf61b1b92a","size":1788,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/5ddd9e30-4510-471c-ab94-0d0e278ac61c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"2811956d-b0a4-4adf-900f-63b897378faf","last_modified":1601517446551},{"schema":1601376539008,"derHash":"tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"f6ba4b244d0f4d8748bdeb3905b09e20d0bb70b28d5fe8f7a5d9f622031a27cd","size":1687,"filename":"xW7Bujpo5E-lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=.pem","location":"security-state-staging/intermediates/6e62179d-8cf7-4dd3-8b7a-23c5f44fed60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xW7Bujpo5E+lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=","crlite_enrolled":false,"id":"e4665b3f-67e0-41db-a6da-e7462f9cf059","last_modified":1601517446528},{"schema":1601376543423,"derHash":"chMuzy+MdbXyFMAO0UVi4UkSt/L00mMxgPPkkYmA/sQ=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"cfbfd73e27f80ba2ca88e566c4433b91afffa3e781fa1bb6329edcdd18b007fb","size":1244,"filename":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=.pem","location":"security-state-staging/intermediates/2bfcb5a8-a759-447d-8ba5-a522f5ff7213.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=","crlite_enrolled":false,"id":"33b467c3-b884-40cf-8821-05ca09a4ebb6","last_modified":1601517446517},{"schema":1601376536064,"derHash":"9i41qtNF+yU4Y8/A5lgjrNPn8IRtGbgybXCceRmiLX4=","subject":"CN=Trustwave Global ECDSA P-256 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ce8879da72592af4bbeefb13d2c925ca1eed8e33ca17d960a29ad9ae0835124d","size":1305,"filename":"a-5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=.pem","location":"security-state-staging/intermediates/39ef4ea2-486e-4ed5-a449-bfd847e8ae82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=","crlite_enrolled":false,"id":"4651d4e2-a3a3-4ad4-a939-6f0a6e93d25f","last_modified":1601517446505},{"schema":1601376531791,"derHash":"KfjhBN845hK/T1BTZbXQsLIN1OickIMGSE64N0weZtg=","subject":"CN=Trustwave Global ECDSA P-384 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"53f8122b5a0fa5136d24ba312f1f8c41061bd774427e22f6d2a5e4fababcd5ea","size":1406,"filename":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=.pem","location":"security-state-staging/intermediates/ae0ef8cd-16e2-4b41-a4f9-28579d057043.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=","crlite_enrolled":true,"id":"83fb01e4-965f-4aa6-a108-09ee05b4bede","last_modified":1601517446494},{"schema":1601376537489,"derHash":"nOJ0/9oMxIdiy3GxLHQgScco5h37wHCOP5yHHp696iI=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"95cf8df7fb366c8a374ed3369242ba3db91973c2101055c3f8282a0abaae2334","size":2032,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/71bfbe43-67b3-4ff1-a0a0-520de046ac99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"d6ba73ad-526c-414a-927a-cc485bdb4ba3","last_modified":1601517446482},{"schema":1601376530391,"derHash":"f+uTdOqwjTknF8ZHQ22uBhdqJMAQYH/aHM5eXwEGtHI=","subject":"CN=QuoVadis Qualified Web ICA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzI=","whitelist":false,"attachment":{"hash":"c551ff3d69db56e747169ab80b2fdea513f1de4806de98e0e34ab04da70a7566","size":2385,"filename":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=.pem","location":"security-state-staging/intermediates/78fe6755-6ce9-4dd5-b75b-e9d055b6147f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=","crlite_enrolled":true,"id":"c8cbdc39-dfda-4e8d-8483-16a7e62a27fa","last_modified":1601517446471},{"schema":1601376528929,"derHash":"Kg4/KneoDcvlzVLVDWUHbr03+tUx2xDWoThaVX97cl0=","subject":"CN=e-Szigno Class2 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMiBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"bcb11e505804477ce4429c8ef9cc22d043e0f59d222d5e4524ec9158cc8e972b","size":1666,"filename":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=.pem","location":"security-state-staging/intermediates/ed1e06ed-dd51-4820-9ef9-0ec3fe1c0d7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=","crlite_enrolled":false,"id":"e2064836-6f61-4236-a0e4-ecf652bd4970","last_modified":1601517446459},{"schema":1601376527513,"derHash":"BYd+5cz+fPGrs8nt85BbX2FCx7eTnWfjJBHPiWMn+Yc=","subject":"CN=CertCloud ECC TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgRUNDIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"f8337f06d70a3f7f0f2ef60247a23ef7a2527a55578bd6069dab297153907ecc","size":1232,"filename":"-iSs_1O_biy_0c0nXxdAJJKe4jDCWam1eQs-GklMUgI=.pem","location":"security-state-staging/intermediates/70ceef02-e1d2-4132-979d-678f2f773e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+iSs/1O/biy/0c0nXxdAJJKe4jDCWam1eQs+GklMUgI=","crlite_enrolled":false,"id":"bc047e86-7084-42d2-8efc-a8163307861a","last_modified":1601517446445},{"schema":1601376526117,"derHash":"IcBmMy1rkt2aJT4mN2hKW8PjE1f4Y77XovmMhFmjO2I=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"d6663fad41c3d961839d1c3ba63881823a3ae0e79e492bcb4b89de356ba61449","size":1780,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/76332bc0-ade4-489e-8a7a-7408d1a0866b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"d3ccc38d-c16d-42a2-8bad-f6a2a9db6ea8","last_modified":1601517446433},{"schema":1601376542023,"derHash":"MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=","subject":"CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=","whitelist":false,"attachment":{"hash":"7ebde9e072e9a7bbb57c5810346275bf9ef461c815c5ae04aea58f3354aeb691","size":1873,"filename":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem","location":"security-state-staging/intermediates/1a609f96-bf52-4c1e-b5cd-8d41976209a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=","crlite_enrolled":true,"id":"0c7bee58-270f-4570-ad29-3d70aec91153","last_modified":1601517446422},{"schema":1601376534633,"derHash":"sIXXC5ZPGRpz5K8NVK56Dgeq/a+bcd0IYhOKtzJaJKI=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R4,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNDETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"babd66311bcbddf05b57e8c3547a7daa9175826a9288b0eddc4bce49d951e547","size":703,"filename":"CLOmM1_OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=.pem","location":"security-state-staging/intermediates/3f9c81ac-eb1d-4480-8098-04c2865620a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLOmM1/OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=","crlite_enrolled":false,"id":"806db0d2-addc-4b97-a56f-47f8f6ee463b","last_modified":1601517446411},{"schema":1601376523273,"derHash":"q7P/KZqhuu/BJ4gYxCQ4iu97KWUVlcYBlOeNlDaUaAs=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"d81fa5cb3c1ec6bbe8f1e276fd6412ef30e25f49781b84d8eb23f85d412845ef","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/a1d18e1f-643c-4eba-ac9d-259252860cb9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"261cd019-9a12-4ef0-9d64-3205805bcee7","last_modified":1601517446399},{"schema":1601376524722,"derHash":"iu/r2IvoejCxnGDFvQ+16fvNFdVYLV/Jp0mVeNaNzsA=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"54373e1e17726accdcc2879266317a44d0dc889c8003fa002f0337d0cd53627c","size":1788,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/cc028f24-b5cb-46d6-97d7-726ebda21925.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"41b336e4-b32b-436f-891e-66fbf1ad02f3","last_modified":1601517446388},{"schema":1601376520490,"derHash":"6ywqgGxp/JY8TiSlu+og7U47hq55hzC7TupRv53jMyU=","subject":"CN=QuoVadis PKIoverheid Server CA 2020,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MF0xCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEsMCoGA1UEAwwjUXVvVmFkaXMgUEtJb3ZlcmhlaWQgU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"ccde215eb034050ccfc37f9fd71517cfb10b5c84d583a98f618475edced4e91a","size":2491,"filename":"Uru4DWx-N-Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn-Y=.pem","location":"security-state-staging/intermediates/1ae6c747-3f6d-429e-9013-e01cf1ab4ce0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uru4DWx+N+Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn+Y=","crlite_enrolled":true,"id":"fee96d42-f02d-4455-be00-596e2c349fe8","last_modified":1601517446377},{"schema":1601376518910,"derHash":"jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"4af7bd8ab75b6ddf04593a19426b34042c0a2078cfaa4c0c6b54dba25cc4a74c","size":1902,"filename":"n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem","location":"security-state-staging/intermediates/f1b1f28b-139b-40e5-ab31-a425c3b7121f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=","crlite_enrolled":true,"id":"ffad931a-781d-4472-9d60-f6fbe37689c9","last_modified":1601517446365},{"schema":1601376515985,"derHash":"05zjn/b0SdTzOR7iAE1wXsIvmc/8pAqI+F2yZFSt29E=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"ce0b3cc7344615f4e2c08e375e5170baea84e9c13a2b7eab45e0eb275cfec111","size":2653,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/01188f2a-2433-4025-a1b5-a82cdada1811.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"02c14f6f-b36e-477e-b00c-4caa53ab7b3a","last_modified":1601517446343},{"schema":1601376521873,"derHash":"SP+LSUZox1IwS0i/6Bh1iYfe9lguXwm5IfS2C7PWqN0=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"b800befca1341c29912755ead3105bdab854e4517a96d3492de73bd48b6aca1c","size":2121,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/7038775d-bfdd-40ab-9cc3-51a112d8e5dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"a24284b8-b137-4a18-a2f8-d193c6197acc","last_modified":1601517446331},{"schema":1601376514564,"derHash":"TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=","subject":"CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"9b316d7bf93b9d342bdd4df71094c0e97165fde2c9cd97a6beca3f212dac4054","size":2479,"filename":"rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem","location":"security-state-staging/intermediates/3784123e-47c0-449e-a944-a3c098106179.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=","crlite_enrolled":false,"id":"d7056525-3689-4f09-8017-71e76770f63f","last_modified":1601517446320},{"schema":1601376511612,"derHash":"GKvW6cqQe7NnVNDARuu1Ddm5XVJ4JNlYGjG3UPz9uu8=","subject":"CN=Trustwave Global ECDSA P-256 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"f16bdfde574887cdf9b20fdd1a1ad5e789c2d8b5094a68dc63225d64c51f2d50","size":1329,"filename":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=.pem","location":"security-state-staging/intermediates/073d40fe-2052-4262-88bf-6f72a0fcaeb9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=","crlite_enrolled":false,"id":"b41c2405-7326-442a-9924-c50f3172fd29","last_modified":1601517446297},{"schema":1601376510177,"derHash":"qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f","size":2653,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/8493a5e1-2fe7-48d1-baff-5f6b9f29913f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"f45995f1-56b8-45c4-9465-14c646f731cc","last_modified":1601517446286},{"schema":1601376507194,"derHash":"Yk1VdqZSshMHaL/oS5Ze7//ZFgPSXNX3FVp9wnidrDg=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"2468274c7b25fd2b19d422592a89957967b1d0b2667a280258fa181e4990089d","size":1512,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/d5ffeea3-4d99-41bd-a872-5838d3443762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"382d6dd1-e459-49c6-860d-167823f42b12","last_modified":1601517446275},{"schema":1601376513034,"derHash":"YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"3ba8b83eb97ad48e9de41cf5e2bf4f6fdf72bd92b464134f8a11860b041476ae","size":1902,"filename":"inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem","location":"security-state-staging/intermediates/e93f7c27-0dfc-43ed-b6d8-be3651eb25e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=","crlite_enrolled":false,"id":"47925b35-99a1-43bf-951a-336125b4c6bf","last_modified":1601517446263},{"schema":1601376508724,"derHash":"NFC204KQw8pde7OLcUlbv3LG0MRNuikiRfm8qYQ6n/8=","subject":"CN=Actalis Domain Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGEMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"428ff62276c3ecb6dc5848fb6212834d3718a3c55c9f538eca07bc4998f52fe6","size":2637,"filename":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=.pem","location":"security-state-staging/intermediates/875e53bd-1442-40e4-b076-8d1b1fa6e8d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=","crlite_enrolled":true,"id":"7663fd6d-0a64-4aa0-b3f2-41b165083e59","last_modified":1601517446252},{"schema":1601376505726,"derHash":"y2Zmsyv/Lv7cxBh98Umm00pdELcWW5z/KmfA4xGu7tc=","subject":"CN=QuoVadis Europe EV SSL CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjElMCMGA1UEAwwcUXVvVmFkaXMgRXVyb3BlIEVWIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"990290f2ea4ff420df521c3b3851971e7be41a8508394faa2cb562a69bce9e55","size":2385,"filename":"WkWVWx1-X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=.pem","location":"security-state-staging/intermediates/b1596bae-e57e-470c-a3d6-2bfa8b281a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WkWVWx1+X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=","crlite_enrolled":true,"id":"024c5848-73e2-4816-9ebb-342c7407fa3c","last_modified":1601517446241},{"schema":1601376502834,"derHash":"FRo+WWnGYW62N6hyKxdM/ZU4eqznjVfDvSPwyzAIGGo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"3f94a2f59b7465d9ec3993abf5497a7454a624492a51b0f1af1453447008be7a","size":1508,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/9b67e543-818a-4165-8fb3-37301ea9deea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"49bdb04d-12f4-46e0-a161-dd632bc2b6db","last_modified":1601517446230},{"schema":1601376501391,"derHash":"Wr5YGPbQLwUQbGw1VUDhviF8I1S1Nc8lB7+FFeGmBEo=","subject":"CN=e-Szigno Qualified CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIzAhBgNVBAMMGmUtU3ppZ25vIFF1YWxpZmllZCBDQSAyMDE3","whitelist":false,"attachment":{"hash":"b1a685a82713fdb970ba0d46956ad6f758e20974ec4e06085ed70d31639c065a","size":1666,"filename":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n-mSxrdMylY=.pem","location":"security-state-staging/intermediates/b37a4a28-4db1-4035-813b-02db9e3f6071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n+mSxrdMylY=","crlite_enrolled":false,"id":"c8ec64d9-a492-4075-9411-af27b698120c","last_modified":1601517446218},{"schema":1601376504316,"derHash":"gBxSLTrROOTwXUZ+o2nBzCdgeL8oQBjQUl67vFNCyDY=","subject":"CN=JPRS Organization Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"5073da9684a445c50c1705a593be556ce4f1fa98e69b8c50acc426e2088d88b7","size":1788,"filename":"xOSyACYAjsQ-aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=.pem","location":"security-state-staging/intermediates/0624e1eb-5311-4f0c-888d-7e403179d070.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xOSyACYAjsQ+aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=","crlite_enrolled":true,"id":"df6b1845-7aef-405a-8ee7-cd3b62ac1cad","last_modified":1601517446207},{"schema":1601373119320,"derHash":"lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=","subject":"CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"6c7a7611b0ccd14478c030a701a6eee0909ea61c24f76a90cf4f5eaec2ddfd88","size":1873,"filename":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem","location":"security-state-staging/intermediates/04e13866-ca20-456a-a3bb-ba2db3470ae7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=","crlite_enrolled":true,"id":"d70ee858-3159-4c5f-be64-8dd0f689e5f4","last_modified":1601517446196},{"schema":1601373115079,"derHash":"PyJb2814jOkkhwyvkvgUt8b/Ttq6utk/HTqRdyUs8dE=","subject":"CN=QuoVadis Qualified Web ICA G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzM=","whitelist":false,"attachment":{"hash":"8eb4cfbfd4e31a971f563f4a974c582ecd679cc8c15604af9f0f24fb1daf720e","size":2385,"filename":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU_inT417rc=.pem","location":"security-state-staging/intermediates/c2ab9b92-d500-4e7a-9bcc-5394c5c70aae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU/inT417rc=","crlite_enrolled":false,"id":"1a156366-309c-4a8a-ad9a-8b722dd7e8dd","last_modified":1601517446184},{"schema":1601373116456,"derHash":"HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"2e0cee661a4a6fd3b4cc86995b705e916cb3c5b536a617c5d74956b4574cf947","size":1902,"filename":"WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem","location":"security-state-staging/intermediates/86304c64-acdf-4c00-b9d2-09d524112cb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=","crlite_enrolled":false,"id":"03e0208d-8abc-42a3-8849-5141d1c1217e","last_modified":1601517446173},{"schema":1601373112312,"derHash":"l9QgA+EyVSlGCX8g75VfWxzVcKpDcteAAzpl775pdY0=","subject":"CN=GTS CA 1P5,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMVA1","whitelist":false,"attachment":{"hash":"6d39d26fa45c2aea9f3ecfb72ba0887e152ffd6f6a6dc6e197c57cefd4030fa0","size":1983,"filename":"81Wf12bcLlFHQAfJluxnzZ6Frg-oJ9PWY_Wrwur8viQ=.pem","location":"security-state-staging/intermediates/85fa4716-33ed-4d5d-ae53-9235954b29df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"81Wf12bcLlFHQAfJluxnzZ6Frg+oJ9PWY/Wrwur8viQ=","crlite_enrolled":true,"id":"a7aa7953-bef4-44d7-9224-c3b2f6d04aa6","last_modified":1601517446162},{"schema":1601373113703,"derHash":"nGSppD6ZDpj7zoMXstTBwH/+bgMtqLttYKaW4v8Djx8=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"10551307f634eba8fbd03c34df0f74b6bf4e7d3b3857885e7e915dc171786627","size":1329,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/782e2f05-e5fd-466e-b95e-c9d281d07173.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"a7462d67-605a-4b39-b1d9-d9bcc225b615","last_modified":1601517446150},{"schema":1601373117853,"derHash":"jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"4af7bd8ab75b6ddf04593a19426b34042c0a2078cfaa4c0c6b54dba25cc4a74c","size":1902,"filename":"n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem","location":"security-state-staging/intermediates/87545501-5f6c-42fb-b550-4c586450cf1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=","crlite_enrolled":true,"id":"6cc82c1a-ac75-4901-aaed-17c56d2f15ec","last_modified":1601517446138},{"schema":1601373110783,"derHash":"BYd+5cz+fPGrs8nt85BbX2FCx7eTnWfjJBHPiWMn+Yc=","subject":"CN=CertCloud ECC TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgRUNDIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"f8337f06d70a3f7f0f2ef60247a23ef7a2527a55578bd6069dab297153907ecc","size":1232,"filename":"-iSs_1O_biy_0c0nXxdAJJKe4jDCWam1eQs-GklMUgI=.pem","location":"security-state-staging/intermediates/e12a2935-1487-4453-8530-4d711142453e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+iSs/1O/biy/0c0nXxdAJJKe4jDCWam1eQs+GklMUgI=","crlite_enrolled":false,"id":"dcf8275c-d947-4783-80e2-d92f9c62e14b","last_modified":1601517446127},{"schema":1601373106595,"derHash":"tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"0e8105a00963a2942951dacf763351b5c4f4fcffe32ab691c090848452d6b285","size":2377,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/cc9d0a66-6a3b-4630-97a9-cef777fb6c74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"e5c0424f-e3f2-433c-b803-708744469857","last_modified":1601517446116},{"schema":1601373109415,"derHash":"IcBmMy1rkt2aJT4mN2hKW8PjE1f4Y77XovmMhFmjO2I=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"d6663fad41c3d961839d1c3ba63881823a3ae0e79e492bcb4b89de356ba61449","size":1780,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/ec00442d-0592-4095-a93c-2de7c8ad6498.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"d8c024a4-05d8-47b8-9ced-9ba0b9e802ee","last_modified":1601517446104},{"schema":1601373105225,"derHash":"chMuzy+MdbXyFMAO0UVi4UkSt/L00mMxgPPkkYmA/sQ=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"cfbfd73e27f80ba2ca88e566c4433b91afffa3e781fa1bb6329edcdd18b007fb","size":1244,"filename":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=.pem","location":"security-state-staging/intermediates/1930c81b-a47e-4196-aaf5-9bb9b253ef40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=","crlite_enrolled":false,"id":"23a49eff-8f01-4ad2-80b0-64b42dd5699e","last_modified":1601517446093},{"schema":1601373102382,"derHash":"RklOMDeQWd8YvlISQwXmBvxZBw5bIQds4ROVS2BRfNo=","subject":"CN=E1,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMQ==","whitelist":false,"attachment":{"hash":"14cf69c79f1a688b326247f724ad50a3b22de5e34daf12c66670e5a38b1273d0","size":1020,"filename":"J2_oqMTsdhFWW_n85tys6b4yDBtb6idZayIEBx7QTxA=.pem","location":"security-state-staging/intermediates/3a789ebf-1903-4ab8-b9cf-488af62cbf0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J2/oqMTsdhFWW/n85tys6b4yDBtb6idZayIEBx7QTxA=","crlite_enrolled":false,"id":"ab99130c-7c4f-494d-939c-89c4285b08b3","last_modified":1601517446082},{"schema":1601373103809,"derHash":"5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"e080ccfbdfc6374397f903976e83dea4fdecc00a0a36cd72f9c882ceff09e62a","size":1902,"filename":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem","location":"security-state-staging/intermediates/4faddda2-227d-409d-a1cd-1edcb045de63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=","crlite_enrolled":true,"id":"48991605-b48a-4d04-9db7-8a39fdd03db1","last_modified":1601517446071},{"schema":1601373108002,"derHash":"NFC204KQw8pde7OLcUlbv3LG0MRNuikiRfm8qYQ6n/8=","subject":"CN=Actalis Domain Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGEMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"428ff62276c3ecb6dc5848fb6212834d3718a3c55c9f538eca07bc4998f52fe6","size":2637,"filename":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=.pem","location":"security-state-staging/intermediates/0f25bf9e-ffcc-4a10-84f0-8cd86a7ae6b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=","crlite_enrolled":true,"id":"35eb9d7f-ce65-41cf-b26c-080757a4a116","last_modified":1601517446059},{"schema":1601373100891,"derHash":"FamHYevgEVVNo6RtIGsIEssutproeqoRpt1MuE7VFCo=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"b94f365e9c87f17f0cce2845177df14966cfe660eb761de3a71b860db6a98fd9","size":2121,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/e70bfcd1-20f6-4b7c-b862-637c228984c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"ea3a37d8-31e6-48a8-aa7d-2107ac42c3a1","last_modified":1601517446047},{"schema":1601373097943,"derHash":"diU4Q5UJxBHEN9PFZ1Y+E3hnEoH8ShRkrdAxhwhDZ24=","subject":"CN=GlobalSign GCC R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEdDQyBSMyBEViBUTFMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a57c3388263edee7694a304c5fb1c3c28046d3d7c1493d3ddf93c385aaf9b3ad","size":1687,"filename":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=.pem","location":"security-state-staging/intermediates/23842d68-8107-429d-bb5a-283b0023bdc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=","crlite_enrolled":true,"id":"2faa1882-c670-43e5-bb46-85e2017d2664","last_modified":1601517446036},{"schema":1601373099507,"derHash":"a0+d4TZ4hGcw1Q6RSgjnvpt0LKOgp9U5M2eDC5Om9VM=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"8b796428cc5e4733630431ccd7284dbe8bae53efc39384f0fccbbf1b490e4d49","size":1788,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/0c3aa131-41fa-45f6-b13d-f21f3c620bb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"6a3cbd3d-6d7b-4338-a7c0-623f3ebafa19","last_modified":1601517446025},{"schema":1601373095187,"derHash":"LmPcG+z0J/mQK0neYzD9Po7r+IsU5lOzui431OSICWU=","subject":"CN=Trustwave Global Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGUMT0wOwYDVQQDEzRUcnVzdHdhdmUgR2xvYmFsIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"9d9bb0ca6a8a59110e9ecd8714e94894e0be5886e46f9c4e5265ffa83dcece40","size":2519,"filename":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=.pem","location":"security-state-staging/intermediates/27248c41-4ea8-410d-a467-b8ab82ef29fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=","crlite_enrolled":false,"id":"0f1ec6de-5bf9-4bc1-a695-3279e8b13a0b","last_modified":1601517446014},{"schema":1601373089423,"derHash":"0zqEf2QDd74K4aQpFToH6HyIJ/pIQLUVi83LheEKRTo=","subject":"CN=VR IDENT EV SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMSAwHgYDVQQDDBdWUiBJREVOVCBFViBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a95e7ccf2ef4b020f65fbd061c44e49d966821be27623376e3f16a8a3ebd371f","size":2361,"filename":"te09bIALahNazDua57TEibeM7CatIkOAT8t-qu_Kdro=.pem","location":"security-state-staging/intermediates/d45a19a8-eb83-48c2-b5c8-9ce2608c9f2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"te09bIALahNazDua57TEibeM7CatIkOAT8t+qu/Kdro=","crlite_enrolled":true,"id":"7dfd117a-4bff-4a4a-8050-e2cf3a58ebae","last_modified":1601517446002},{"schema":1601373092298,"derHash":"EcaXh4cyBW3hfB2hNOnSttI88d6Vs/sKTRilF6tjIwo=","subject":"CN=GTS CA 2A1,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMkEx","whitelist":false,"attachment":{"hash":"66c35c0df4a124a571526bb96130bec322a6f7500769403d0c068726f5bf3b3c","size":1130,"filename":"dEp_Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=.pem","location":"security-state-staging/intermediates/3a532dde-9f77-4149-85b5-6d89f2216f05.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dEp/Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=","crlite_enrolled":false,"id":"7fa7839c-ef0e-4a68-bb15-0b1884015b0a","last_modified":1601517445990},{"schema":1601373090891,"derHash":"Wr5YGPbQLwUQbGw1VUDhviF8I1S1Nc8lB7+FFeGmBEo=","subject":"CN=e-Szigno Qualified CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIzAhBgNVBAMMGmUtU3ppZ25vIFF1YWxpZmllZCBDQSAyMDE3","whitelist":false,"attachment":{"hash":"b1a685a82713fdb970ba0d46956ad6f758e20974ec4e06085ed70d31639c065a","size":1666,"filename":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n-mSxrdMylY=.pem","location":"security-state-staging/intermediates/6516a4b9-6493-4bfb-a2e3-23763dc5c0f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n+mSxrdMylY=","crlite_enrolled":false,"id":"c843833c-5c87-472d-adb2-b79ac1f9377d","last_modified":1601517445979},{"schema":1601373096569,"derHash":"BO7qjlC0d1s8JHlyYpF+5QAC7Ex1tWzfPuHBjPylulI=","subject":"CN=Microsoft RSA TLS CA 01,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAx","whitelist":false,"attachment":{"hash":"d21d673254fc1596b7b7c3a9a38e33ab09f786822535934e507dec3291deab5a","size":1914,"filename":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=.pem","location":"security-state-staging/intermediates/4e38e0db-da22-4304-ac1e-288010c3a100.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=","crlite_enrolled":true,"id":"49e9befa-5c1a-46b0-b4e6-cb23de9ad30c","last_modified":1601517445968},{"schema":1601373088050,"derHash":"J1vwBG4CcBeLE7Z+TbFQoQGXy3H5oGH602s9dmOf4YY=","subject":"CN=Trustwave Global ECDSA P-256 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"b39b1eb52f8d651482f3d14bd9a033de3982f3cc3fa825ba761d2fefa3a11981","size":1325,"filename":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=.pem","location":"security-state-staging/intermediates/f1b77292-94b4-4442-903d-9547feeb6e60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=","crlite_enrolled":true,"id":"7f2240ce-ea07-4998-8344-b13fb802637e","last_modified":1601517445956},{"schema":1601373093777,"derHash":"Euom9u7v7HarhZJUVAOriFFbAOJ12YiHE0B6hvxcf9c=","subject":"CN=e-Szigno Qualified Organization CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgT3JnYW5pemF0aW9uIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"2dcc501b643fe8ac38e3b36c6e87ffbb458e7d031117857c3d81511ee2eadfd8","size":1687,"filename":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=.pem","location":"security-state-staging/intermediates/80f7e08b-2813-4c53-b749-e5ae184d8e46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=","crlite_enrolled":false,"id":"dc168871-d662-484e-80bb-0aaa4d482b71","last_modified":1601517445945},{"schema":1601373086550,"derHash":"3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"f0c9af66d96dd17fa4676b867f59ad47a1e282afe025a8c07064a4124e677b47","size":1800,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/7a5d531c-a614-4a6e-ad99-fce2da57ac1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"71ef61b1-4863-49bb-a2a3-8bca78f3eec0","last_modified":1601517445934},{"schema":1601373082085,"derHash":"CZg6JjLAM+uUScDr8h+bjUqZdcBvuOIPSlBC6eTMZBE=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"dffc20f5ea1b99f91d8665a18a15d299bddfa0b71cb6b19267a6efa7d6b7d6ed","size":12598,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/c0315adb-4bd9-4968-8188-a004a1b8fade.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"21660b58-2f5d-4097-ae1e-aade60a55184","last_modified":1601517445922},{"schema":1601373083661,"derHash":"05zjn/b0SdTzOR7iAE1wXsIvmc/8pAqI+F2yZFSt29E=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"ce0b3cc7344615f4e2c08e375e5170baea84e9c13a2b7eab45e0eb275cfec111","size":2653,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/db00b4f0-c8f3-4700-913d-fb5588510249.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"db7da0b1-4700-40e5-8766-05564c2f1aaf","last_modified":1601517445911},{"schema":1601373080635,"derHash":"JMcpmGTgoqaWT1UcDo3yRhUy+oxI5Nu7YIBxZpHxkOU=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"1963ee36a9c20eb3169ad73cd42da09bfc6829eb50f71d6216925c6b9c2dddcb","size":2121,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/3a2e8b34-b640-409f-ba11-42410897c3c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"f4667d41-8d93-404a-85ac-348e9d27cbc4","last_modified":1601517445900},{"schema":1601373076427,"derHash":"TsQ5ZypENAGmbieUfMO1iX8TK2Z/cSzBo3AYo8yFsWo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"d6b88839e53fd1739f156f78254837d2b4b300f968dc9ab78c1f926d2648da2c","size":1508,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/a533ae98-4acc-4c4e-90e9-c1f73411f64b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"e164a6de-4f75-479e-b04f-54334c5235fd","last_modified":1601517445889},{"schema":1601373077828,"derHash":"h9QhabJpNVHKIFzPF/BvbmZR9yGM1tJmB79bpN0vJvI=","subject":"CN=Trustwave Global ECDSA P-384 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8cd0dbed89841d6b6854301f7eecbbdcd40ac73d8c8347c1ea8a577a05c10603","size":1410,"filename":"91i1mhKwhcz0SKoJ9CzM_9ohVagG6cKG9Z_i4Ts1FFk=.pem","location":"security-state-staging/intermediates/f260c10f-2e10-43a2-ac7a-1fff03473e79.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91i1mhKwhcz0SKoJ9CzM/9ohVagG6cKG9Z/i4Ts1FFk=","crlite_enrolled":false,"id":"3ebd415b-87d1-4a9d-b708-d59719c85d42","last_modified":1601517445866},{"schema":1601373073544,"derHash":"02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=","subject":"CN=GIAG4x,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=","whitelist":false,"attachment":{"hash":"7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50","size":1991,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/e4fc6359-81c9-49c3-ada7-2ec1bdf010a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"c20c0d70-6c96-450f-8ecf-8135b2f7766e","last_modified":1601517445844},{"schema":1601373070729,"derHash":"DakU+3El9uZE63qiYd6euAncf5Jbayp9in7dhzY5i1s=","subject":"CN=Staat der Nederlanden Domein Server CA 2020,O=Staat der Nederlanden,C=NL","subjectDN":"MGMxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xNDAyBgNVBAMMK1N0YWF0IGRlciBOZWRlcmxhbmRlbiBEb21laW4gU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"2f30004a37d33d9c2a59bae9b9e7ae94f816bd331c1a88deabd4af0f028ec59e","size":2438,"filename":"N9-YluTCUa_HTXc60QxjUReBLpRniAkIK2N84DhgmW4=.pem","location":"security-state-staging/intermediates/32515a04-77a4-49fa-83c0-36ae6f3a5dab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9+YluTCUa/HTXc60QxjUReBLpRniAkIK2N84DhgmW4=","crlite_enrolled":false,"id":"732efca5-8974-4190-8e83-bf82ff07f739","last_modified":1601517445832},{"schema":1601373066528,"derHash":"X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"bd47e7c223bc2e656a7455d83b5877cd3dbf66c20fcb9f464190df0a25d15bdb","size":1760,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/1ee740d1-83dd-4bc7-a5a7-cb03a31c1763.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"5c31a860-b4ef-4791-8e42-f75e10d6c910","last_modified":1601517445821},{"schema":1601373074948,"derHash":"aXKbjhWobvwXelevtxcd/GSt0owvyozxUH40RTzLFHA=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"df3c4c472795ccd5ca93453fa1024c35f64466f19536a34fb21d39c840e2e27b","size":789,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/e3c85b2f-376b-4a02-af59-534857d8ea19.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"edd34046-1baa-49cb-8053-ff3025c65f81","last_modified":1601517445810},{"schema":1601373069295,"derHash":"LK77tV5w31qJhf6bwQ3VakDD3tqz2hUwopaCAVxbfGY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"a45e27eb4ce4e2624d46479d0ecf5a612e520e17ac29d9b405427a94f6798f65","size":1512,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/6ef0f203-a563-43fa-8eba-9b978890ca68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"e542d416-8008-4a93-9c04-69bcfd8087a2","last_modified":1601517445799},{"schema":1601373072113,"derHash":"us3gRjBTzh1i+L50Nwu6551PyvGfwHZDrvGV5qWb1Xg=","subject":"CN=E2,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMg==","whitelist":false,"attachment":{"hash":"051882dab9b07102f7aba08eef5eb943e8b8096631074d7f98f9c7dcef77e86d","size":1020,"filename":"vZNucrIS7293MQLGt304-UKXMi78JTlrwyeUIuDIknA=.pem","location":"security-state-staging/intermediates/582d2a81-663c-4e04-a8a6-341023b6be78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vZNucrIS7293MQLGt304+UKXMi78JTlrwyeUIuDIknA=","crlite_enrolled":false,"id":"a537077a-14c9-4783-a4e0-5a7ea2e660b9","last_modified":1601517445787},{"schema":1601373067917,"derHash":"am8voTstnbu0CYAgAtM3BnJ2CiF42bjVaU1mBHQjH6Q=","subject":"CN=e-Szigno Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHkxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJjAkBgNVBAMMHWUtU3ppZ25vIFBzZXVkb255bW91cyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"4a22ba90a733131c2581c1d0dd2fbb9a8df38f518f2e5ba6ee0d10f4b3169c24","size":1670,"filename":"vqerAqvFBz-pP0lY3LKc96jOLcWu__imbw0SS3qBch8=.pem","location":"security-state-staging/intermediates/f7567136-382e-42ac-a1c6-fff3eb13845f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vqerAqvFBz+pP0lY3LKc96jOLcWu//imbw0SS3qBch8=","crlite_enrolled":false,"id":"aed26e63-166d-44c2-99e2-e757b42d4182","last_modified":1601517445776},{"schema":1601373063695,"derHash":"xj35YY+69IZiuhKr6HshLPd3wnpEag+lVdep0ZEUjtc=","subject":"CN=Trustwave Global ECDSA P-384 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"e81cc0a883e6e41a009a5d876bc62528cd6b26b1edd7421071b6ff434dca6265","size":1390,"filename":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l_zvmwptYjCgg=.pem","location":"security-state-staging/intermediates/ecde76ec-b1ee-48ec-b2c6-2cda6bc52ba4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l/zvmwptYjCgg=","crlite_enrolled":false,"id":"e696ad4e-cdc6-4b17-8ee7-13c8bcb02291","last_modified":1601517445754},{"schema":1601373056407,"derHash":"jSXNlyKdv3A1a9pOs8xzQDHiTPAPr8/TLcdutYQcfqg=","subject":"CN=GTS Root R2,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMg==","whitelist":false,"attachment":{"hash":"4d0fda0d78fd282ab5f1cf69e3b3e458120a33cf3e5fdeb14796f324a389d74e","size":1910,"filename":"Vfd95BwDeSQo-NUYxVEEIlvkOlWY2SalKK1lPhzOx78=.pem","location":"security-state-staging/intermediates/95c47a1a-f461-4dc1-8420-4c32207900df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vfd95BwDeSQo+NUYxVEEIlvkOlWY2SalKK1lPhzOx78=","crlite_enrolled":false,"id":"bc7a2f54-60da-4bb6-96f3-795d0359d8f8","last_modified":1601517445731},{"schema":1601373062251,"derHash":"YIG+5bDfGRrE4mWsD294mfB4uMifBgVa4Wavkd9w1uA=","subject":"CN=e-Szigno Qualified QCP CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBRQ1AgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"280a786ca35892c86124fb11c5e02f70f1bf6cd40daa1e6538e054942241cdaf","size":1674,"filename":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=.pem","location":"security-state-staging/intermediates/bb8b8c4c-b637-4241-a27d-e3f497235709.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=","crlite_enrolled":false,"id":"0f3daffc-a656-4c5f-a71b-0db59222a014","last_modified":1601517445720},{"schema":1601373057866,"derHash":"ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=","subject":"CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0","size":1674,"filename":"qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem","location":"security-state-staging/intermediates/9528d3b9-a037-4f0f-b644-1e7827d3c927.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=","crlite_enrolled":true,"id":"4802c4c4-718e-4497-a9a5-c367fed873eb","last_modified":1601517445709},{"schema":1601373055050,"derHash":"1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217","size":2121,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/d49999e5-60cd-4c45-a970-e9462ab32f63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"9561182b-470d-459e-8d38-ee7e1b3ceed8","last_modified":1601517445698},{"schema":1601373060728,"derHash":"4iFgNk5W98JyNPVDXYR3saW7ugEQMpjzlUkJGA3wJ3g=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"ad86215f7ef8a6f4477d1e9ceb7ec59f0773886cebfee09bac4eb456aa559c8c","size":2085,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/8f810e8e-9b9b-4830-b261-6873c11e2437.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"0c6f5e09-6c3c-4747-b629-3d81788a49ae","last_modified":1601517445675},{"schema":1601373050792,"derHash":"rXtYw8XZWGvltieZwnksQRHJhSqW97BgciEmVxOVfhw=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMUMwQQYDVQQKEzpTaGFuZ2hhaSBFbGVjdHJvbmljIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQuMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"64ac68b2f5fcfe1eb5b26d7d052a52af0101c298fc359ab1870916a82601f563","size":1808,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/f52fd61a-cf0c-4458-a6a1-3cfe976c2304.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"cf8cce0e-bdf8-41ca-b618-b43f76dc9e43","last_modified":1601517445664},{"schema":1601373052202,"derHash":"MqTlVONjEW/kjiLwHawXNnUqcccg+Z9GLVZQItO60H0=","subject":"CN=DPDHL Global TLS CA - I5,O=Deutsche Post AG,C=DE","subjectDN":"MEsxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTU=","whitelist":false,"attachment":{"hash":"136f459d98a2f42f67f606dcf55c11198fea1f244cf8003c576d60d969cef1ac","size":1695,"filename":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7-_aukXzu-S0_M=.pem","location":"security-state-staging/intermediates/c1a36f1f-4324-4c38-822b-4955c7caa508.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7+/aukXzu+S0/M=","crlite_enrolled":true,"id":"c33aa503-cce0-418b-b8e1-1cd25396b905","last_modified":1601517445653},{"schema":1601373043849,"derHash":"YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"3ba8b83eb97ad48e9de41cf5e2bf4f6fdf72bd92b464134f8a11860b041476ae","size":1902,"filename":"inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem","location":"security-state-staging/intermediates/4f7289d9-3d0b-4bf7-9a5e-934f96747340.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=","crlite_enrolled":false,"id":"02ce3313-f150-44ba-b7a1-9aee17e6d859","last_modified":1601517445642},{"schema":1601373048045,"derHash":"1KWUHHFB7RlJoMbOndRaCrlNwzeQLrChIJhSc47r6FQ=","subject":"CN=GlobalSign GCC R3 EV QWAC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIEdDQyBSMyBFViBRV0FDIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"9a306430e243544a1c823baa60388aa1b7c197ccafd79a5fd9847056d91f6d8b","size":2032,"filename":"6Vipkd7oFTwhj_Z54b71vjmwq0aEJc6KkharcmzGaV4=.pem","location":"security-state-staging/intermediates/54c37b8e-2d9f-4770-a6ee-08a7d4d11934.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Vipkd7oFTwhj/Z54b71vjmwq0aEJc6KkharcmzGaV4=","crlite_enrolled":false,"id":"16ddf1bb-a12f-4d95-a455-9e6a82d4469a","last_modified":1601517445631},{"schema":1601373049403,"derHash":"QtyCf0b7XoXf+uR9PGkPUB7OJdV11ZelDY+Hj6Qq/Oo=","subject":"CN=e-Szigno Class2 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMiBDQSAyMDE3","whitelist":false,"attachment":{"hash":"24e4936e9492f5245f32e7f9b60258d25f2a4c8e36002f26691cdf9f19bb94f3","size":1662,"filename":"3TGdI2jR-PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=.pem","location":"security-state-staging/intermediates/a0283198-a2ca-42e2-abee-9f579d7b9911.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3TGdI2jR+PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=","crlite_enrolled":false,"id":"6df97aa6-df00-4c66-afdc-850ead7cdcec","last_modified":1601517445619},{"schema":1601373045250,"derHash":"lJ1rS3YcoTStPnqFcRhvWA7oh/LGtWi1FA9BV/mNaN0=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"1a3bc0dfeb8f9e3f79809953a727d69dc11a315684b4cf57c35d226206502e31","size":1329,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/471ff3d1-a234-44c3-9336-a3593480bf23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"46952ab6-744f-4ac4-8cd9-767a8ebaa351","last_modified":1601517445608},{"schema":1601373046633,"derHash":"wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"f4d91481d1e4e17c44e796f180b7b4af9f0ae8e97cf8d41165640b3fdefd8f5d","size":1760,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/17efd7bd-6142-4486-a521-1bac923f5f17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"e194894d-74fa-4e44-b5c9-c5bbb841d31a","last_modified":1601517445597},{"schema":1601373042464,"derHash":"DTb2oimeniaPlK20nlfmcX1xPD9HuInEDc3Iz+lAy4A=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,C=IL","subjectDN":"MDwxCzAJBgNVBAYTAklMMRUwEwYDVQQKEwxCZWFtZS5pbyBMdGQxFjAUBgNVBAMTDUJlYW1lLmlvIENBIDE=","whitelist":false,"attachment":{"hash":"4b493757d7d299f8cc22b2765b16fa2d9bcc5aab6354a1aba37cad4f16162bf8","size":1727,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/0491bd9a-2ff4-4f0a-a3b2-3bee78c50874.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"eef290b4-e4ac-424b-91d6-846b75957235","last_modified":1601517445586},{"schema":1601373038124,"derHash":"Z4LG6a2/khbiaDBtRjM/vGdL3t+GtnvndweeLA42iI4=","subject":"CN=Trustwave Global Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGOMTcwNQYDVQQDEy5UcnVzdHdhdmUgR2xvYmFsIERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"a1aae690e4bc653bc8dd049d0014c8bdf294c1327ae51c6f40d11e8b728cdee3","size":2499,"filename":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X-kFQNRrNSN8Cw=.pem","location":"security-state-staging/intermediates/10461dd8-f33a-4e82-b46a-5408f96b944a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X+kFQNRrNSN8Cw=","crlite_enrolled":false,"id":"beb516ed-cac1-4c3b-af61-f25c3202f32a","last_modified":1601517445563},{"schema":1601373039540,"derHash":"HjVoI/5AwOqsKfntVGO3stscCItj67BYdqLmMcEId5g=","subject":"CN=QuoVadis Enterprise Trust CA 2 G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFsxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEqMCgGA1UEAwwhUXVvVmFkaXMgRW50ZXJwcmlzZSBUcnVzdCBDQSAyIEc0","whitelist":false,"attachment":{"hash":"756cc72bf46fca106a4ae94315fc04ea6bbe1b93e3229513d02875b33ca13f45","size":2385,"filename":"z-lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=.pem","location":"security-state-staging/intermediates/8a9ec500-a3e8-4a94-a076-29717920b30a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z+lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=","crlite_enrolled":false,"id":"6d245b72-3e57-43e5-936f-1071536497e7","last_modified":1601517445552},{"schema":1601373033892,"derHash":"iu/r2IvoejCxnGDFvQ+16fvNFdVYLV/Jp0mVeNaNzsA=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"54373e1e17726accdcc2879266317a44d0dc889c8003fa002f0337d0cd53627c","size":1788,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/49c18a87-730f-412f-8285-71d4cd57b21e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"741c5f94-32f1-402f-ae6a-c183d5680da9","last_modified":1601517445540},{"schema":1601373035317,"derHash":"f+uTdOqwjTknF8ZHQ22uBhdqJMAQYH/aHM5eXwEGtHI=","subject":"CN=QuoVadis Qualified Web ICA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzI=","whitelist":false,"attachment":{"hash":"c551ff3d69db56e747169ab80b2fdea513f1de4806de98e0e34ab04da70a7566","size":2385,"filename":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=.pem","location":"security-state-staging/intermediates/4557b165-1b70-4b52-a1df-a31b5fcc16f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=","crlite_enrolled":true,"id":"70588538-20e7-4b9a-980d-0d1bd77ff052","last_modified":1601517445529},{"schema":1601373029586,"derHash":"GKvW6cqQe7NnVNDARuu1Ddm5XVJ4JNlYGjG3UPz9uu8=","subject":"CN=Trustwave Global ECDSA P-256 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"f16bdfde574887cdf9b20fdd1a1ad5e789c2d8b5094a68dc63225d64c51f2d50","size":1329,"filename":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=.pem","location":"security-state-staging/intermediates/9a14c734-72c1-49ae-8503-ff362f4d20d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=","crlite_enrolled":false,"id":"dc0e3a1b-af1b-4795-a306-b6671eafd75f","last_modified":1601517445517},{"schema":1601373032433,"derHash":"YDiLdz0z6RQWSGE/NrkUnwFaEUN4us8+NpSGT/2kJuw=","subject":"CN=HydrantID EV SSL CA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHzAdBgNVBAMMFkh5ZHJhbnRJRCBFViBTU0wgQ0EgRzI=","whitelist":false,"attachment":{"hash":"ba2cc602bd31081e17f7745ac462854773e79726958ff1b8a553cc7ecaba9db2","size":2389,"filename":"FpAps1LWs_UTm3xApHYkNccnnZX-7Wc_v8V0t70p6rg=.pem","location":"security-state-staging/intermediates/9a936f86-971e-4af3-ae70-ee94da9a5554.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FpAps1LWs/UTm3xApHYkNccnnZX+7Wc/v8V0t70p6rg=","crlite_enrolled":true,"id":"05c4f166-166c-46c7-853e-436884874fa9","last_modified":1601517445506},{"schema":1601373036712,"derHash":"T4OELx8Eqx4E1NjnUWZvyoLlGRyvwkBiv9H+d8AspLQ=","subject":"CN=e-Szigno Class3 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"71132024dc6f9eb4be8dbf1a0131b491fae4efd3d711ad58c399ed1ebdd355ef","size":1662,"filename":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=.pem","location":"security-state-staging/intermediates/b983723e-4861-4166-a5e3-5b415cee2a65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=","crlite_enrolled":false,"id":"f369caa4-59c3-40ea-ab24-534bda082949","last_modified":1601517445495},{"schema":1601373022448,"derHash":"sarhvNVV6KPR492o7ITnV8VSZVNEzj/uu6+Y6JXb7aw=","subject":"CN=QuoVadis Europe SSL CA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEiMCAGA1UEAwwZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"dfb31ebff112bccbef0ba90c29987f9962823acb59f69bd984351d9e2c7e22df","size":2381,"filename":"XOogr9_VItHwTOA_JogutdX4V06tVw9btHQLa2tR0_A=.pem","location":"security-state-staging/intermediates/d277bb95-8c7d-4bda-b42b-841c07743fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XOogr9/VItHwTOA/JogutdX4V06tVw9btHQLa2tR0/A=","crlite_enrolled":true,"id":"fbb49441-fc76-4afd-b067-1c2f1578798d","last_modified":1601517445484},{"schema":1601373026753,"derHash":"mRe/2FNziYXkbJIEGUEOlmwxaYJ2nnGBfifQOEu+Nnk=","subject":"CN=certSIGN Public CA,O=CERTSIGN SA,C=RO","subjectDN":"MFkxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEbMBkGA1UEAxMSY2VydFNJR04gUHVibGljIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d61a1b35a91c710f44d6b989faabe0cbe91a89dbc701983bdbf2602b85bf3038","size":2312,"filename":"IGxtWhsxuC58R149YREUyaqPK7jXR9no_MMC227zRVo=.pem","location":"security-state-staging/intermediates/f32e48dd-f449-4b02-b440-48880750748b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IGxtWhsxuC58R149YREUyaqPK7jXR9no/MMC227zRVo=","crlite_enrolled":false,"id":"c16caddc-a295-485f-a252-08d162ad74da","last_modified":1601517445472},{"schema":1601373025354,"derHash":"gpj8QnBMTtd0tNsxBSkmC1JKkHUlKh0Ks44G8bmoNJk=","subject":"CN=CertCloud RSA TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgUlNBIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"59bb133020146d20f0d963a09c0520755e8a49c60982dbc377b4072ee287be19","size":2073,"filename":"Wz3-4Wr1VbAmx0vpewGzhrRMM8dT5kZ8_PHc1S6WqYs=.pem","location":"security-state-staging/intermediates/3f52eb76-c690-4e12-a4e3-67a11e5c69ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wz3+4Wr1VbAmx0vpewGzhrRMM8dT5kZ8/PHc1S6WqYs=","crlite_enrolled":false,"id":"63cade8d-29ec-4030-993f-05ec44965f59","last_modified":1601517445461},{"schema":1601373031043,"derHash":"ozAX2d9JTAnVhwkQdAOu5GG5Rh6BujlcKMNmk8J9GYY=","subject":"CN=GlobalSign GCC R3 UK EV QWAC CA 2020,O=GMO GlobalSign Ltd,C=GB","subjectDN":"MFkxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJHTU8gR2xvYmFsU2lnbiBMdGQxLTArBgNVBAMTJEdsb2JhbFNpZ24gR0NDIFIzIFVLIEVWIFFXQUMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"ef3f87aa1971aaebb3accc4f6b43e518068a070c3df5324fafc49bd6faea510d","size":2040,"filename":"_cLNIs90Pu4zrpnBuJdA-wTl2BrxEVUjup-MFOMyr1g=.pem","location":"security-state-staging/intermediates/6aff1d72-b020-44ed-9747-7e0d0daeebe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/cLNIs90Pu4zrpnBuJdA+wTl2BrxEVUjup+MFOMyr1g=","crlite_enrolled":false,"id":"0de3a855-871f-4807-8a57-6455d04ddf13","last_modified":1601517445450},{"schema":1601373028185,"derHash":"NH0Y3Mwu/FGpIOen+7B7+9o1YTaB+C3KXExyuwyDwDU=","subject":"CN=VR IDENT SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MEoxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMR0wGwYDVQQDDBRWUiBJREVOVCBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"4158e246be129509cb8d8eb14b647517fea0196e81a9d593f4b8f64a11a6414f","size":2357,"filename":"fQUctsUYoew1aFnAFT0prf-kJmkVNqkPo2jJ5Jm9RaA=.pem","location":"security-state-staging/intermediates/c5cd11fd-b913-4de0-8e55-2cba38801c23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fQUctsUYoew1aFnAFT0prf+kJmkVNqkPo2jJ5Jm9RaA=","crlite_enrolled":true,"id":"8b7ef937-682a-4391-bc17-7b736da1f754","last_modified":1601517445438},{"schema":1601373023867,"derHash":"ZZt6UYxsnrGKoes1rrp6AkeBe4mMH6GED5fSh32aIOQ=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"19f63552805d608f671589717902feefe03afc5da94e20c555f68ef484a23b46","size":1772,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/eb37192b-3adc-4149-a4a6-22c2a4989853.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"4c46f44e-56a4-4453-aa72-bde6a760e021","last_modified":1601517445427},{"schema":1601373021078,"derHash":"MCQkQ/aJWpRWDkjk3/cgU26vUWPLQvXod0AqveL4Ynw=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"63f37d712386cb1b4ab3fb0368f861aeb7ba74ec9b9bc7ecdd247bcf94725693","size":2373,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/39871409-2b2c-4c4c-bbfe-718a4f28b294.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"d6eb39bf-c00f-470b-b66d-4cbff41072d6","last_modified":1601517445416},{"schema":1601373015521,"derHash":"y2Zmsyv/Lv7cxBh98Umm00pdELcWW5z/KmfA4xGu7tc=","subject":"CN=QuoVadis Europe EV SSL CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjElMCMGA1UEAwwcUXVvVmFkaXMgRXVyb3BlIEVWIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"990290f2ea4ff420df521c3b3851971e7be41a8508394faa2cb562a69bce9e55","size":2385,"filename":"WkWVWx1-X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=.pem","location":"security-state-staging/intermediates/c109e409-4365-46b3-9ad9-fa7bfb71916e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WkWVWx1+X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=","crlite_enrolled":true,"id":"be8ee1dd-ae8d-4533-b3df-85448960d676","last_modified":1601517445405},{"schema":1601373018308,"derHash":"AD9x3EggIWV1/Fqs/jsa63b3Kupbjo/O/IC59RekphI=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"312e807dea2263ef605990bfa0b57b238b64d9fea0fc945e37f48f3e6246d576","size":1329,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/b67ac8d6-d3f8-4aff-a8b2-27648de5ca88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"8c986b7e-d08c-4c76-975d-f8d0f5c5e972","last_modified":1601517445383},{"schema":1601373019690,"derHash":"q7P/KZqhuu/BJ4gYxCQ4iu97KWUVlcYBlOeNlDaUaAs=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"d81fa5cb3c1ec6bbe8f1e276fd6412ef30e25f49781b84d8eb23f85d412845ef","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/399cee33-9586-41bb-bc42-6810dfa7af54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"57e04007-0e32-49c8-878b-c113ac0b0204","last_modified":1601517445372},{"schema":1601373014084,"derHash":"gBxSLTrROOTwXUZ+o2nBzCdgeL8oQBjQUl67vFNCyDY=","subject":"CN=JPRS Organization Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"5073da9684a445c50c1705a593be556ce4f1fa98e69b8c50acc426e2088d88b7","size":1788,"filename":"xOSyACYAjsQ-aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=.pem","location":"security-state-staging/intermediates/37978617-d633-4b10-9ad5-20fb1eb251e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xOSyACYAjsQ+aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=","crlite_enrolled":true,"id":"6e8f2f2b-bcba-4f33-94ec-0a957b820ea2","last_modified":1601517445361},{"schema":1601373009905,"derHash":"WAuzqxJ/XhPpQK5zZePGmmKtIE1/36RRWS/nxH3AKpU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,O=Prodrive Technologies B.V.,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMSMwIQYDVQQKExpQcm9kcml2ZSBUZWNobm9sb2dpZXMgQi5WLjE1MDMGA1UEAxMsUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4gT1YgU1NMIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f33b1ca67bc2f7ef2190fc43c1d09060a4d6392a8969577007ae2dcf61b1b92a","size":1788,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/cf2dd791-1cb8-4120-9b15-9753e5636426.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"4cc64cd6-766e-45df-8736-8ed3f0b8ed2b","last_modified":1601517445350},{"schema":1601373011329,"derHash":"FjzS/K0NaofI2vzgVvWU87U7kXwPkl1A2SJY6id/xPQ=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"d4292d809a630e5b57cdc50d9205799bd35a8b3a0c8cf33366d00d5e3e8cdf78","size":2499,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/c5792cf8-8999-4ef3-be9d-129c9886ac27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"732922a9-4172-428e-90da-844ecf1ead96","last_modified":1601517445339},{"schema":1601373012722,"derHash":"a0O0wkOqLZlEDA8UvexSMe7GPoaq8jdspwAgKEWNxyY=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"b63de0fbdd8dbe519e4d6f674c13166625a717f8e6156297f07badf1c8b0d8fc","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/fb391543-5f49-46ed-80a5-42df9aea0b5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"80645ecf-a0a4-4cd4-bda9-ff2edd1cad90","last_modified":1601517445327},{"schema":1601373006798,"derHash":"iZlLbZ2d3/9of6vT5zQs3YUi1mH1786Oar3rJaBPECM=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4446a8961707823fad23675d037ebcc454ecda2fe98586b7839466271d4521a2","size":2369,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/0e88e01d-3cf6-41bf-82fa-ec760632f6d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"3c925fcd-4777-4caf-95a1-e9b43fded89a","last_modified":1601517445305},{"schema":1601373000857,"derHash":"yhTPmzCboDK7IZEMGu2uTSn+Bla0+L/6I8vpTUMcBnQ=","subject":"CN=Entrust Certification Authority - DE QWAC1,O=Entrust Datacard Deutschland GmbH,C=DE","subjectDN":"MIGIMTMwMQYDVQQDDCpFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gREUgUVdBQzExGDAWBgNVBGEMD1ZBVERFLTExOTI2NDMxNjEqMCgGA1UECgwhRW50cnVzdCBEYXRhY2FyZCBEZXV0c2NobGFuZCBHbWJIMQswCQYDVQQGEwJERQ==","whitelist":false,"attachment":{"hash":"4e133243cde83dcbe732252fbf43b8518690328d9c29c7647170c786d537e396","size":1792,"filename":"ZWhmaUZRaiEz-pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=.pem","location":"security-state-staging/intermediates/caa2d710-6be9-4877-98e8-e7eb89e1ece1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZWhmaUZRaiEz+pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=","crlite_enrolled":true,"id":"fb1542af-66aa-4793-a4a4-2ec82b62886f","last_modified":1601517445294},{"schema":1601373002455,"derHash":"jJegCPfOIfdG6vsuOuBgleVX0omjEMgsbzwC2fch5fg=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"27785b9964ca41a7f924e4715e32d3827904bec2c860b8f2f76367447209d89d","size":2089,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/7923969e-6dfe-452f-ad52-6c9e18f6b1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"35357782-dccb-4d60-914f-70a972059474","last_modified":1601517445272},{"schema":1601373003919,"derHash":"yKYQupQXdw0sAt4ivKjFakKK916ONU76NsVoIh3bfPw=","subject":"CN=WISeKey CertifyID SSL GB CA 2,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMg==","whitelist":false,"attachment":{"hash":"25f18c47254a897f57257e91e33dccd040b88a2d2805589a22993da2900db84f","size":1699,"filename":"ktJRzJxhVE71wdby3vum5K-dgm6QylD4z-l9CBGOUQU=.pem","location":"security-state-staging/intermediates/157b7e9c-098b-4150-9256-1327b4494c1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ktJRzJxhVE71wdby3vum5K+dgm6QylD4z+l9CBGOUQU=","crlite_enrolled":true,"id":"95dfd144-a5fe-481a-8864-499dbc671323","last_modified":1601517445261},{"schema":1601372999143,"derHash":"8RRGn7gHeBM6H3Dk2DOO2rl91CzrjswByvtw1rh98R4=","subject":"CN=certSIGN Web CA,O=CERTSIGN SA,C=RO","subjectDN":"MFYxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEYMBYGA1UEAxMPY2VydFNJR04gV2ViIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d637585d0fa1d3a2b6cea2a2ab6f2b7d30229bc1eb350aeb2b8cc2f529b5998a","size":2308,"filename":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs_0ubJ68=.pem","location":"security-state-staging/intermediates/41d41219-98b5-42b0-af05-16477adebf5b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs/0ubJ68=","crlite_enrolled":true,"id":"16c01cde-d169-45ca-b52b-e3c8ff102c4c","last_modified":1601517445250},{"schema":1601372996248,"derHash":"Kyz67KvyJm/U+2UF8zQrklFOvm+nwIy2y9SYj2r9F70=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"399b1d081c0af091e4829f3801f90b9e266db1e4e3c5d6a03e438d33ecc67c14","size":2788,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/bd9324bb-91f0-4fa2-9e2f-01a7635399bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"c146412b-6547-40f7-b3b1-14568ce07444","last_modified":1601517445239},{"schema":1601372993406,"derHash":"Kg4/KneoDcvlzVLVDWUHbr03+tUx2xDWoThaVX97cl0=","subject":"CN=e-Szigno Class2 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMiBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"bcb11e505804477ce4429c8ef9cc22d043e0f59d222d5e4524ec9158cc8e972b","size":1666,"filename":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=.pem","location":"security-state-staging/intermediates/30bc71d2-6f0d-4d55-8e79-2d8b4e3ca301.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=","crlite_enrolled":false,"id":"b35f777c-ccb5-4262-bd7b-171a05274855","last_modified":1601517445215},{"schema":1601372987894,"derHash":"kfGc5QPJ/n/5WH2O++9zFarud9wtFFJhJkk7Stb+gB8=","subject":"CN=Trusted Root TLS CA SHA256 G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1UcnVzdGVkIFJvb3QgVExTIENBIFNIQTI1NiBHMw==","whitelist":false,"attachment":{"hash":"9e03d57a2b38ff0564d3f320d536aae856aa3db18618f722e03e7da8e2a0d9eb","size":1674,"filename":"hMdIk_Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=.pem","location":"security-state-staging/intermediates/d02d6906-c341-4db4-8d1d-1e2fe228c6ba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMdIk/Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=","crlite_enrolled":false,"id":"1b0ddc8f-9147-471c-b076-471f56173514","last_modified":1601517445204},{"schema":1601372992040,"derHash":"Z63RFmsCCuYbj1/JaBPATCqliZYHloZVcqPH5zdhPf0=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"c298ec17b9257dbfb7f36280caade22c6317186c146b5fdd5792bcb77afced29","size":1825,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/4d4b4f19-2a28-4629-813e-a946f8f93613.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"ceb5d877-bb7a-4afa-935a-747f6f6edb9a","last_modified":1601517445182},{"schema":1601372989273,"derHash":"nOJ0/9oMxIdiy3GxLHQgScco5h37wHCOP5yHHp696iI=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"95cf8df7fb366c8a374ed3369242ba3db91973c2101055c3f8282a0abaae2334","size":2032,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/5e3cbdc7-e03a-4759-8d05-acfd67cfe11d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"6abf86be-2d68-4ffb-8cc4-f106c8e6672a","last_modified":1601517445171},{"schema":1601372986478,"derHash":"LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=","subject":"CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"f01753f65dd631ba19494a777a86712466e7e8b20994d581e672f52716f315bb","size":1873,"filename":"VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem","location":"security-state-staging/intermediates/478959ca-26d9-412d-85ae-28108bbb5141.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=","crlite_enrolled":true,"id":"c79290ea-cb9f-41a0-978e-7fb294622f3c","last_modified":1601517445160},{"schema":1601372982248,"derHash":"BDerLsLCtIkClsE1A0sh2xRkNLgxfucDqoqpQ8XqUa4=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"2777739491d74eeced727118790444484a83437e4e704c6697aa928b36a78bbb","size":2653,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/775f7b60-b34b-4f8a-8784-5cb0bdf38b8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"51cc8cd9-87cd-4af4-bd26-441c2d7b0365","last_modified":1601517445149},{"schema":1601372983592,"derHash":"zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=","subject":"CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey","whitelist":false,"attachment":{"hash":"3e5a1329226826601bdcf297eb985c9089c7df20bac76d529770ff0dcdc2bd3e","size":1752,"filename":"UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem","location":"security-state-staging/intermediates/533dec71-3955-4ae6-a2ac-45d8bbb06f61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=","crlite_enrolled":false,"id":"3de29e4b-6106-495c-92fc-1daf069924d7","last_modified":1601517445138},{"schema":1601372990662,"derHash":"vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=","subject":"CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4","size":1670,"filename":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem","location":"security-state-staging/intermediates/35bc1459-db4e-4fbe-b245-efb1d8b3e9e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=","crlite_enrolled":true,"id":"5bb86eed-d806-4423-a0c3-14872f739af8","last_modified":1601517445127},{"schema":1601372984986,"derHash":"PuAnjfcfo8ElxM1IfwHXdGlOb8V+DNlMJO/XaRM5GOU=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"a7e1e9af45661eb891874dbac46389428139246fe7050143e9b0fd233f74e236","size":1926,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/94d8f6ef-9901-4bbf-94da-34339f9a5963.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"91a079ca-bed6-440f-bcb5-bf985f4fa544","last_modified":1601517445115},{"schema":1601372976467,"derHash":"xnDHm/J3r357NKaqT6MERBgzxr0Bpwp+m3otlMHB+SY=","subject":"CN=certSIGN Qualified CA,O=CERTSIGN SA,C=RO","subjectDN":"MFwxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEeMBwGA1UEAxMVY2VydFNJR04gUXVhbGlmaWVkIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"22d738f384d471ab73b8f3d1ec90fd80d0f61bf77294a7139dc772f58bb58e1a","size":2316,"filename":"hztK7Nl786SeQOWatriSlHoTSUt-1THcFFIGKRr08bk=.pem","location":"security-state-staging/intermediates/f6b4147e-2d85-401b-b347-336b86f662e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hztK7Nl786SeQOWatriSlHoTSUt+1THcFFIGKRr08bk=","crlite_enrolled":false,"id":"1389ee32-b744-400a-ab40-13406b869a0f","last_modified":1601517445104},{"schema":1601372979267,"derHash":"/PJvvBsqJadqtOqSssvvNn4BMQkcgC2kmJj3iuVLMPg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"551d256b9e4988053973e8535709a6276d327de7d3ea6dd215e8c97deef2c69f","size":1768,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/f5bc3f86-9688-4e6c-ab8c-549cf8ae95c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"061b3372-2f09-4347-81b6-08192cd27c88","last_modified":1601517445093},{"schema":1601372977883,"derHash":"9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"f3d6221594115cd098f20f66a013d90aae3becd3c578a737a8e58a35230c208d","size":2016,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/a696b13d-038b-4610-9f8b-38652860e9c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"edd2b6b4-07a7-4a01-b28d-0dc72a371b84","last_modified":1601517445082},{"schema":1601372980668,"derHash":"NJ36QFjF4mMSOzmK55VXPE4TE8g/5o+TVWzV6AMbPH0=","subject":"CN=GTS Root R4,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSNA==","whitelist":false,"attachment":{"hash":"5f621c613a2dfb4502a29efcba11f0a010ef7954ea3464006115a9c300bdcdc1","size":764,"filename":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=.pem","location":"security-state-staging/intermediates/69f37a26-8b23-4ccd-8dfb-890714c89849.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=","crlite_enrolled":false,"id":"5431c1cf-28e7-4a86-9584-396994a62e7d","last_modified":1601517445068},{"schema":1601372969365,"derHash":"SP+LSUZox1IwS0i/6Bh1iYfe9lguXwm5IfS2C7PWqN0=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"b800befca1341c29912755ead3105bdab854e4517a96d3492de73bd48b6aca1c","size":2121,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/c268b46a-b13f-4845-b57c-817f59e5ddbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"0c4389a1-a439-4fb9-97da-d505176b0ce2","last_modified":1601517445044},{"schema":1601372970795,"derHash":"Yk1VdqZSshMHaL/oS5Ze7//ZFgPSXNX3FVp9wnidrDg=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"2468274c7b25fd2b19d422592a89957967b1d0b2667a280258fa181e4990089d","size":1512,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/cdd4bad1-dc39-4943-9512-33b9f4affd94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"eb66473b-5fea-4e7e-91ac-acc760eb3e08","last_modified":1601517445031},{"schema":1601372967809,"derHash":"iPwYvQcb4fvFP/vIAfA/WyxNqHu6DAmOK0gI8Z6rBf4=","subject":"CN=RNP ICPEdu OV SSL CA 2019,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MGQxCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMSIwIAYDVQQDExlSTlAgSUNQRWR1IE9WIFNTTCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"292ae2e45b6a02ae65ded412e50c0abf3b623685bd49a8f6369bb4d5010c40d8","size":1784,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/49b02dda-6993-4e4a-8639-8061b575e3f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"d785db77-6704-4e55-b637-4f5c27423ab9","last_modified":1601517444997},{"schema":1601372974968,"derHash":"WS4aLwo0KEsOJvy0/tIq+FmEju6IIq22G0LatHov/cI=","subject":"CN=KPN PKIoverheid Server CA 2020,O=KPN B.V.,C=NL","subjectDN":"MEkxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEnMCUGA1UEAwweS1BOIFBLSW92ZXJoZWlkIFNlcnZlciBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d6c29637397d41ba732890b7381061d5aa7ce2b45a6658ec8cd3e1578ec36521","size":2463,"filename":"Yao-RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=.pem","location":"security-state-staging/intermediates/950d42f2-c7e5-4243-a5d9-0abf3ca120c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yao+RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=","crlite_enrolled":true,"id":"aeaffa76-1733-4a39-a25e-4c5a82a04937","last_modified":1601517444985},{"schema":1601372966279,"derHash":"sIXXC5ZPGRpz5K8NVK56Dgeq/a+bcd0IYhOKtzJaJKI=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R4,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNDETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"babd66311bcbddf05b57e8c3547a7daa9175826a9288b0eddc4bce49d951e547","size":703,"filename":"CLOmM1_OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=.pem","location":"security-state-staging/intermediates/92c74d74-33c3-442b-8f3d-283431becf54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLOmM1/OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=","crlite_enrolled":false,"id":"f9805daa-ab6f-4827-8a6e-dfdda2f0530e","last_modified":1601517444974},{"schema":1601372972183,"derHash":"EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=","subject":"CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE","subjectDN":"MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl","whitelist":false,"attachment":{"hash":"a9f261d0ad4e87bacd12e03d772b19c478c501880901e13afa12424a3fa0819b","size":1906,"filename":"1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem","location":"security-state-staging/intermediates/6aba6c2c-da6f-4f90-9dbc-856cf2fefcdd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=","crlite_enrolled":false,"id":"de96a547-05fc-48e0-9eaf-ddeca013b4c1","last_modified":1601517444963},{"schema":1601372960748,"derHash":"l0uCB2FUzv9W7U21Yhhvc5SgL/OHqiBdY2eosI/3+qA=","subject":"CN=e-Szigno Online SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIE9ubGluZSBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"0abdd69f4b3ccf85097142e285b47d52e0f91c59aa3e684dfa3c25bb3c8d6039","size":1666,"filename":"G_JwHP_ydSe7pufWcUyNckBrxBbnQ6Kmqw_OFPPiQI0=.pem","location":"security-state-staging/intermediates/9386bab7-f17e-4eab-807c-9bac2367686a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/JwHP/ydSe7pufWcUyNckBrxBbnQ6Kmqw/OFPPiQI0=","crlite_enrolled":false,"id":"492ac880-b573-41d2-9d22-5faff82d960e","last_modified":1601517444952},{"schema":1601372962115,"derHash":"pmUAegXv4YidZqQN7svGwaJx6RkAaBH9uNvX4GdSEtE=","subject":"CN=Siemens Issuing CA Internet Server 2020,O=Siemens,C=DE","subjectDN":"MFExMDAuBgNVBAMMJ1NpZW1lbnMgSXNzdWluZyBDQSBJbnRlcm5ldCBTZXJ2ZXIgMjAyMDEQMA4GA1UECgwHU2llbWVuczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"5ab8cb8a5146787aeb9025fd757a28e47c16893e2603c336459385a83349e955","size":1719,"filename":"uOU9UZhtVd_opiG5DbxESujdJ9UY8BLJblR-MMq9FbY=.pem","location":"security-state-staging/intermediates/35dbe988-7f8a-48f2-b67b-e95d314fa047.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uOU9UZhtVd/opiG5DbxESujdJ9UY8BLJblR+MMq9FbY=","crlite_enrolled":true,"id":"4e715493-0fb6-4d65-b11d-e75ae54c02e0","last_modified":1601517444941},{"schema":1601372963495,"derHash":"MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=","subject":"CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=","whitelist":false,"attachment":{"hash":"7ebde9e072e9a7bbb57c5810346275bf9ef461c815c5ae04aea58f3354aeb691","size":1873,"filename":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem","location":"security-state-staging/intermediates/a37b7f8c-a3b5-430e-89cf-8fe6b38bb6b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=","crlite_enrolled":true,"id":"07b39017-e019-4285-8987-c74c020ff536","last_modified":1601517444930},{"schema":1601372959354,"derHash":"TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=","subject":"CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"9b316d7bf93b9d342bdd4df71094c0e97165fde2c9cd97a6beca3f212dac4054","size":2479,"filename":"rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem","location":"security-state-staging/intermediates/e43a7840-9ea4-4b76-93c0-ab636088bcb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=","crlite_enrolled":false,"id":"7f65139b-c66f-48be-9e43-38f9d4c05309","last_modified":1601517444919},{"schema":1601372956559,"derHash":"ffTT70V5j4xDhPxwK6UqRM571imLFBYo1Kurx2ePZGc=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"8d704ee294bd149733993801e0cbad6deaa30f162b02e59509443d2f13b07b74","size":2653,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/4637d3ff-89aa-452e-a12e-c9c34c573108.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"0d9dd2b6-0308-43ef-9472-413931d00b4c","last_modified":1601517444908},{"schema":1601372957982,"derHash":"kn6b/A11wxRgcMPzr91KLBD3ZSiRJJl8xSz9EgnnY8s=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"f1fff265badcfcfaa0e9addfdc7577271845c1a6c9766600e36f19dc9bb90333","size":1780,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/e12f21c4-2828-41ca-8175-b204c12fa8e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"1b37cd2f-53fb-4ecf-a206-6d0e4afba506","last_modified":1601517444897},{"schema":1601372953629,"derHash":"NNinPuII2bzbDZVlIJNLTkDmlIJZbotvc8hCawEKb0g=","subject":"CN=GTS Root R3,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMw==","whitelist":false,"attachment":{"hash":"3febe52108c8006fec57c9deeef32126e877134377f5fed563452d77eb20ce23","size":764,"filename":"QXnt2YHvdHR3tJYmQIr0Paosp6t_nggsEGD4QJZ3Q0g=.pem","location":"security-state-staging/intermediates/b89eea26-3504-4cee-a2a0-c85c4b432b85.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QXnt2YHvdHR3tJYmQIr0Paosp6t/nggsEGD4QJZ3Q0g=","crlite_enrolled":false,"id":"89b91266-e037-419a-a184-4ab66dc534f2","last_modified":1601517444875},{"schema":1601372955108,"derHash":"2UdDKr3nt/qQ/C5rWRAbEoDg4cfk5A+jxoh//1en9M8=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"56cc033ba7b1b7f111791affa1f1df410009c08c0b9a625d2bbe0a30aca502bb","size":1910,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/8f214a61-eaa8-4dfd-92f7-5caa2913bd08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"2aa716a5-b2ec-4655-ac65-199f085bd020","last_modified":1601517444864},{"schema":1601372952199,"derHash":"Ek6q8m9XDE+02J9dYQePFbiFNF/K8MV/NHfYxjtasm8=","subject":"CN=Actalis Extended Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGGMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"332f65bf2214e30be6f0940dc3bde167397bf14fc227615cd42ca92857dd83bf","size":2641,"filename":"Qit8ertDRalW2_YZANpfGKsGuNxcSeZ5UXpPg8_gmpE=.pem","location":"security-state-staging/intermediates/8479152b-cdd2-4fed-95c0-1c66f39292d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qit8ertDRalW2/YZANpfGKsGuNxcSeZ5UXpPg8/gmpE=","crlite_enrolled":true,"id":"f558856f-e8d1-44d9-810f-5e8dbdec4fed","last_modified":1601517444853},{"schema":1601372942202,"derHash":"vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=","subject":"CN=GlobalSign Atlas R6 EV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"7a27c45b53bfd5690bb01873eeb250e11a9b84a706cbbd33be1cafcbad5ed9a5","size":2402,"filename":"P7xnWSLQVg6f_MMaRe-f9TBAwDOlwdoyxweVGx8v2hY=.pem","location":"security-state-staging/intermediates/f027e922-5664-470d-ba39-6a79f14247f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P7xnWSLQVg6f/MMaRe+f9TBAwDOlwdoyxweVGx8v2hY=","crlite_enrolled":true,"id":"aa289f7c-0e5e-40b8-ba40-ac6f5788381c","last_modified":1601517444830},{"schema":1601372945081,"derHash":"N2EL91bKTDz6GGlsTBSXOOZEyp9nY4fsUBZzZdakXMo=","subject":"CN=Digidentity PKIoverheid Server CA 2020,O=Digidentity B.V.,C=NL","subjectDN":"MFkxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMS8wLQYDVQQDDCZEaWdpZGVudGl0eSBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"c6efc5a8dbba37f6c4ba76f0ccd0f86ceb94b6b66cfd390227a747d4d83ff0b3","size":2487,"filename":"DnmLzHZn-pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=.pem","location":"security-state-staging/intermediates/757831dd-1795-41f0-85b5-3bdaf5cb5601.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DnmLzHZn+pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=","crlite_enrolled":true,"id":"aaf24e45-19fe-4a12-a2f3-d98e7fc92964","last_modified":1601517444819},{"schema":1601372949425,"derHash":"XEUjNNnJyaLqQsx3pxZeF5XunYTrcMt4S0fqnZKlgtk=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBEVg==","whitelist":false,"attachment":{"hash":"8265936e7b87a7845ad3792c1bfbde5b8469f44276f048e773d7d306888e920a","size":1756,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/4c65ee88-c3a0-444f-8224-2f3fbb1fde00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"6f0acdbe-0901-4b59-9d46-68ce3226c729","last_modified":1601517444808},{"schema":1601372946483,"derHash":"2sqgn/rY9m7bbtaXB6gnyeRMH5fEjwF5SF8gbXB7Pis=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ef925783f986610c821619c78a724b477a9c2b4492f84e6446635c18799dc2f9","size":12623,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/9f426597-caa0-4a27-92c0-7468bd0125b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"fb29665c-f0b3-4e26-bf78-cb609e14309f","last_modified":1601517444797},{"schema":1601372943635,"derHash":"iwW2jMZZ5e0PyzjyyUL7/SAOby/5+F1jxplO9eCwJwE=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"0a551cc852c7b0f054ae4c9e72acb7a6b4b1a8bab2d598b21063ab92fc36ecb6","size":1577,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/5715b967-abe0-4b73-a98a-855ba0fd7305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"d12a8e04-5884-4328-a3e6-8c87d375a305","last_modified":1601517444786},{"schema":1601372940788,"derHash":"8Z1VzQij6kK9kVCAc4IxdN2SNwITwXf4JTF1badQilE=","subject":"CN=JPRS Domain Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"d1fbc1604b7b78d8673b6b7247a33b5d142c6ebaa41b8e0412cedc570a24b3d7","size":1780,"filename":"KbEUDafDNIUlOxLiaD-8KAlxp-gea65O57qq4l5SFl8=.pem","location":"security-state-staging/intermediates/7a36f3a9-39e9-4ca5-9620-2343f7db4d81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbEUDafDNIUlOxLiaD+8KAlxp+gea65O57qq4l5SFl8=","crlite_enrolled":true,"id":"e816bed4-10ab-4c75-95fd-28eef887f190","last_modified":1601517444774},{"schema":1601372939433,"derHash":"aeLQbDDzZhZhZekdaNHO5cxHWEqAIn52ZmCGwBByQes=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R2,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIyMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"a9f6d16a93aa62ba7dbf378a10c0719ad51755b8d8276a662013037d6fbe06d3","size":1353,"filename":"iie1VXtL7HzAMF-_PVPR9xzT80kQxdZeJ-zduCB3uj0=.pem","location":"security-state-staging/intermediates/8d7aa4a5-2eaa-4bc6-9ce4-baf356fe12fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iie1VXtL7HzAMF+/PVPR9xzT80kQxdZeJ+zduCB3uj0=","crlite_enrolled":false,"id":"32fad39e-e70b-4cce-82ad-336077b42508","last_modified":1601517444763},{"schema":1601372938080,"derHash":"bINDiPKg0GlJxj788w13eC4lqCUBNZOeVJYCFFQO6kU=","subject":"CN=Root CA - G3,O=Root Networks\\, LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxFTATBgNVBAMMDFJvb3QgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7a25b4650cf78598d30bd2fd71f98a9514917410a9123cf8351a487e3ed9a093","size":1678,"filename":"ujBfMmfTX_3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=.pem","location":"security-state-staging/intermediates/70d0ee09-2bed-4e79-8b66-01b3f0e03488.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ujBfMmfTX/3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=","crlite_enrolled":true,"id":"3282e6f4-3c4c-4afc-990c-c8ea66eb46ae","last_modified":1601517444753},{"schema":1601372933832,"derHash":"BN5Hqc3TCRz8Xvaqo7fUtT4TxNTcAjZPbAtAh0LsPHY=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGoxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxNTAzBgNVBAMTLFZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBBbHBoYVNTTCBDQSAyMDE4","whitelist":false,"attachment":{"hash":"d9ce06bfe7f10679316c826ca701910ff485eff604b066946a2f9397ac536aa7","size":1772,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/05cdb21a-1510-4b11-bd15-1aa8167bf850.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"dc4f0d2e-5aa7-4bc9-aa1e-cc80241c3ea5","last_modified":1601517444742},{"schema":1601372932440,"derHash":"FkjOSrG7ZcSFyyI2x2j6u4ZRR9QmkVuSr7yoHpsu47w=","subject":"CN=e-Szigno Qualified Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgUHNldWRvbnltb3VzIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"babeb483e7bc13a161427464ff4aa32b126458a9b7bd684609420f8d1a7cb6ab","size":1687,"filename":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=.pem","location":"security-state-staging/intermediates/942e6499-d923-4703-afab-4b554cc059b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=","crlite_enrolled":false,"id":"70bbc676-eea1-421c-94b2-ac63a2a914ee","last_modified":1601517444730},{"schema":1601372936606,"derHash":"KfjhBN845hK/T1BTZbXQsLIN1OickIMGSE64N0weZtg=","subject":"CN=Trustwave Global ECDSA P-384 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"53f8122b5a0fa5136d24ba312f1f8c41061bd774427e22f6d2a5e4fababcd5ea","size":1406,"filename":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=.pem","location":"security-state-staging/intermediates/bf40f9cc-47d0-4977-b40d-52494d2164f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=","crlite_enrolled":true,"id":"d1f49640-2d22-442e-baeb-12b29866c49b","last_modified":1601517444720},{"schema":1601372929639,"derHash":"RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=","subject":"CN=Bloomberg TLS CA,O=Bloomberg LP,C=US","subjectDN":"MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=","whitelist":false,"attachment":{"hash":"e48dfa14c978c6bbeb5232c7e711afced2f56d20f367cd0a74a7100aac332138","size":1743,"filename":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem","location":"security-state-staging/intermediates/45a8ebc6-a06b-4bc7-929b-39e2e2281328.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=","crlite_enrolled":false,"id":"cab1b209-9a94-4919-b365-866f22bf712d","last_modified":1601517444697},{"schema":1601372931031,"derHash":"GgdSmos/AdIx360qvfcYmSALtlzX4DxZ+oInJTM1W3Q=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"e7c443b15be49a4083c31378f2a1749ea59e73cd564b4d4e0465ea2d9d839146","size":1825,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/f67f63b4-6b9e-497c-9e0d-4d48d2fecb43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"e3ad0bd5-3dd1-4ea1-82b3-0c0f94f6811c","last_modified":1601517444686},{"schema":1601372928289,"derHash":"+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=","subject":"CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez","whitelist":false,"attachment":{"hash":"cc6eb0f3e51ae41188fd3477d2b097eb3bfd190c1e01766f9836d30c6d379aaa","size":1817,"filename":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem","location":"security-state-staging/intermediates/13dc02d5-16c2-4ff9-97ca-030b3dff8234.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=","crlite_enrolled":false,"id":"4708e8c7-a3b5-479c-b5d0-134bee4102fa","last_modified":1601517444665},{"schema":1601372921280,"derHash":"hIwDq2R9W9fg0MQ8C11nTMmJP4NquGOvjz8ThLVE2DM=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"caf1e07303de77d2971983851eb6cdc8b1662168dab0ef7c3dc3df46b70b3ec3","size":2300,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/f6e7d27f-9711-4b7b-b226-a67deebbaadd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"c2d2bd34-f2d0-429f-94d4-dec518ff87f0","last_modified":1601517444654},{"schema":1601372925530,"derHash":"1ehNmmd+bNpy3Rwbp62N38Je+sIgyKlXHOwnwQdVVwI=","subject":"CN=ICPEdu,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MFExCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMQ8wDQYDVQQDEwZJQ1BFZHU=","whitelist":false,"attachment":{"hash":"9b9ef56a8e9ed418407c8f8b194145af30c2c29e7dceb0b41ecc390660a45493","size":1735,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/4d583b92-7ea5-4759-b075-69728740ce72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"b299bf16-90d0-453d-a0e2-c5d0e7350002","last_modified":1601517444643},{"schema":1601372922648,"derHash":"KXW6tR0A2GLQ4W7t74MGp1nGXNS58A2vUOzfy07DluQ=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"913a6555d1accfb6fad27f0850000c3dead37ef7c0c8683ab4771d4154dafae2","size":1329,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/66ae0166-605b-4a81-ab78-0398cec83309.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"89936832-2d17-42a8-a1db-8f59f5e125c4","last_modified":1601517444632},{"schema":1601372919901,"derHash":"E/ezfMH4RCqM4T57RCIhfY6JlXz+qFDDy751y+Vh53Q=","subject":"CN=CertCloud ECC EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"68a6d4de039d26f711386d924105e95da6fb2c74e019e46d3006b1d43a0281f3","size":1272,"filename":"S9iaDtfedpswiFg99kL_1fGIcuuU0gvf0uBHeNGHlmw=.pem","location":"security-state-staging/intermediates/ef7d0921-b722-44bd-a037-89afdb97564f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S9iaDtfedpswiFg99kL/1fGIcuuU0gvf0uBHeNGHlmw=","crlite_enrolled":false,"id":"1f8cd9e7-71f5-4ee1-a557-c82739d93206","last_modified":1601517444615},{"schema":1601372917114,"derHash":"FRo+WWnGYW62N6hyKxdM/ZU4eqznjVfDvSPwyzAIGGo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"3f94a2f59b7465d9ec3993abf5497a7454a624492a51b0f1af1453447008be7a","size":1508,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/4514e223-4a1f-49ef-a2c4-d139874f652c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"819dff23-74b0-426a-9138-e6825bedf0d4","last_modified":1601517444601},{"schema":1601372924077,"derHash":"9i41qtNF+yU4Y8/A5lgjrNPn8IRtGbgybXCceRmiLX4=","subject":"CN=Trustwave Global ECDSA P-256 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ce8879da72592af4bbeefb13d2c925ca1eed8e33ca17d960a29ad9ae0835124d","size":1305,"filename":"a-5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=.pem","location":"security-state-staging/intermediates/f37e490a-e2a3-407a-af53-85d666751ad9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=","crlite_enrolled":false,"id":"ee174cb7-2285-43f5-824c-7d7f5e2e30f7","last_modified":1601517444583},{"schema":1601372918495,"derHash":"GGJqO3IREo1WNGnGVFV9E8k2bX/OyLlNtPCqfgWUQEE=","subject":"CN=Trustwave Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGQMTkwNwYDVQQDEzBUcnVzdHdhdmUgR2xvYmFsIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"4e61dd89fb06d5da14f5a4b0f7a2328cd7ab2dea6544a50ea59b3e7d59167e32","size":2515,"filename":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=.pem","location":"security-state-staging/intermediates/77c9874e-b7a6-4206-8e33-ce46978876a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=","crlite_enrolled":true,"id":"ace9be7d-afb4-4716-92de-ec68d8675c16","last_modified":1601517444570},{"schema":1601372915726,"derHash":"qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f","size":2653,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/cd6fd8ca-476d-4166-8171-47e097b3fba7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"cdcb7fdb-36d0-4d2b-b326-6537b6c0a255","last_modified":1601517444558},{"schema":1601372912986,"derHash":"6ywqgGxp/JY8TiSlu+og7U47hq55hzC7TupRv53jMyU=","subject":"CN=QuoVadis PKIoverheid Server CA 2020,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MF0xCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEsMCoGA1UEAwwjUXVvVmFkaXMgUEtJb3ZlcmhlaWQgU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"ccde215eb034050ccfc37f9fd71517cfb10b5c84d583a98f618475edced4e91a","size":2491,"filename":"Uru4DWx-N-Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn-Y=.pem","location":"security-state-staging/intermediates/cc1fdc96-5137-44e1-9e1a-08e1f30a8121.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uru4DWx+N+Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn+Y=","crlite_enrolled":true,"id":"92bb66a1-3ad5-4bf3-be95-3b89b37ac52a","last_modified":1601517444544},{"schema":1601372908508,"derHash":"J47PIR4lGOndmROvxYPusxJ8gYS8vu2q171k6J6MQxA=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"8e15c43f71096a592c3d5819db25f4547bb4ef4f8232293578abdf314d149392","size":2353,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/58908f21-7e94-469e-8aa3-665248306d7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"d92d6955-6093-4c7a-8e45-d0a418aedd2f","last_modified":1601517444533},{"schema":1601372911404,"derHash":"BMGHHGhgdRU4n6Owz7g9vmpK8F6MgOdFcClp8kBgbjY=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"22b4bbcfbe3f75b06e7578a6a45c84da9c0262d68c36a8114773ff9a455d842b","size":1788,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/0f69bb89-fec3-43e8-baca-4b3ed464ca4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"f9117b3e-e330-435a-a6d7-19d7e7d0173c","last_modified":1601517444511},{"schema":1601372909924,"derHash":"tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"f6ba4b244d0f4d8748bdeb3905b09e20d0bb70b28d5fe8f7a5d9f622031a27cd","size":1687,"filename":"xW7Bujpo5E-lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=.pem","location":"security-state-staging/intermediates/2ce89d4c-981f-4db3-a423-8e54ac84e6e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xW7Bujpo5E+lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=","crlite_enrolled":false,"id":"c5667f47-199d-42d7-93fc-7add87a67e78","last_modified":1601517444500},{"schema":1601372907081,"derHash":"BeQAXbDDgvO9ZrR3KekBFXdgG/b3sofppSztcQ0lg0Y=","subject":"CN=Microsoft RSA TLS CA 02,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAy","whitelist":false,"attachment":{"hash":"b31f15756dd2424f4c72909e8e5489c3443c030299ab3270a47adebded78e565","size":1914,"filename":"1wMGTin0PoCN5O41h0-XIHXuzGRwDEa8ehHf7wSdSQE=.pem","location":"security-state-staging/intermediates/2f4de690-8167-44de-9c57-c55ac9aad999.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1wMGTin0PoCN5O41h0+XIHXuzGRwDEa8ehHf7wSdSQE=","crlite_enrolled":true,"id":"d349fd50-98e3-4121-b014-e22fcf4058f0","last_modified":1601517444489},{"schema":1601473892209,"derHash":"DjTMNfZt4MBuHZAeJYCWFULsLi+rF1eDfQnP42VHlmw=","subject":"CN=ISSAuth RSA EV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"b03ac152020dfd148bdbce043b79cdde718f7f398e6c2974784e2d12ea728c21","size":2117,"filename":"JuVSbm2PtOMQrBijLX2uh7DV87h-dofG6_8CWgsoUso=.pem","location":"security-state-staging/intermediates/3c02cc5d-9eb8-44c2-b42c-833613b0c0de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JuVSbm2PtOMQrBijLX2uh7DV87h+dofG6/8CWgsoUso=","crlite_enrolled":false,"id":"9e780ac3-b573-43c8-957f-b2d5a2a57492","last_modified":1601517444478},{"schema":1601473893770,"derHash":"Roc0T0cTq9A9rZGZQoxq1qVhRGKsO9efsPDBpW9KIGU=","subject":"CN=ISSAuth ECC EV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBFViBDQQ==","whitelist":false,"attachment":{"hash":"bb49012e57337e767503078ee15ddaed516c3a49b29affe8504ebd31287ba003","size":1280,"filename":"CtBkdSMYFcbDm93WqDl2w4aG4lRl0t4pSXZrBwxP4NQ=.pem","location":"security-state-staging/intermediates/08f3f015-50b1-42f7-910b-1d194b7c172d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CtBkdSMYFcbDm93WqDl2w4aG4lRl0t4pSXZrBwxP4NQ=","crlite_enrolled":false,"id":"ae201e28-14a4-4ab0-abc8-83d58b676aa1","last_modified":1601517444466},{"schema":1601473896669,"derHash":"k3CbW9sMdo/JaftJZYaCGNbehqaib4E7cm/0aXZgfGQ=","subject":"CN=ISSAuth RSA OV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"4186dcf1884e739095a2e744c4ccd5de721687ea6575da4ea5b3d4c73f07d4a7","size":2085,"filename":"pedwg-t32CS6XTTc_JUBqMnUFDQfsrfFl-YRQXc_Jco=.pem","location":"security-state-staging/intermediates/30359a92-8a61-4c98-9bee-afe2d78656b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pedwg+t32CS6XTTc/JUBqMnUFDQfsrfFl+YRQXc/Jco=","crlite_enrolled":false,"id":"83964573-3e97-41f2-9ce8-bc7f7ce62667","last_modified":1601517444456},{"schema":1601473889131,"derHash":"fOuUWEQnVvQKSFww8rrwAQfB6e6F2wL6APQbpYRDZOU=","subject":"CN=ISSAuth ECC DV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBEViBDQQ==","whitelist":false,"attachment":{"hash":"43ee1efa5f0a207b149a67aaf0323e49197e5c769577b389eb3471c5539f8ad2","size":1248,"filename":"82GvRpB_uAZ2gBlFqbv5pwS1b52FWaLFTHSLLlPtkS4=.pem","location":"security-state-staging/intermediates/104f20f8-b19b-47ab-900b-8d1023c6ef8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"82GvRpB/uAZ2gBlFqbv5pwS1b52FWaLFTHSLLlPtkS4=","crlite_enrolled":false,"id":"5a3ba8e4-7aa8-42fe-b7d7-6a51a2cb824f","last_modified":1601517444445},{"schema":1601473895251,"derHash":"2dgcAVBdsZNxAhDZtCe2Uynv/yVhNfb7L+2+U+WTvwI=","subject":"CN=ISSAuth ECC OV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBPViBDQQ==","whitelist":false,"attachment":{"hash":"7c05b04c5a6bbda8889889dadcc4004f477b9429c2ca7085c924ef4cc7961804","size":1248,"filename":"GE-HA2pOP4xPkalzLKDvBn9-H2GvpzI92tTTxyspNKk=.pem","location":"security-state-staging/intermediates/df193818-a02b-4e4d-866a-66cc8dc89803.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GE+HA2pOP4xPkalzLKDvBn9+H2GvpzI92tTTxyspNKk=","crlite_enrolled":false,"id":"1ce8bbb0-2bde-459d-b3ef-f90049c4f3ae","last_modified":1601517444434},{"schema":1601473890650,"derHash":"YkukJyyJbPvlUSj+vm5NbSSMI6HI2zLReJyBGHL2/Dw=","subject":"CN=ISSAuth RSA DV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"c006295568921093e5148e77673f798172fdb1b6b28d3ac7737f3b5b35f7c661","size":2085,"filename":"3EfOHBtoOcqfHn9qHOGL-BkHEhOKUfa0ttPxLO6OaUY=.pem","location":"security-state-staging/intermediates/9a72162b-3c00-4079-9ce1-0b08c6e23202.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3EfOHBtoOcqfHn9qHOGL+BkHEhOKUfa0ttPxLO6OaUY=","crlite_enrolled":false,"id":"db10a85d-fae6-4776-b901-d09000033eca","last_modified":1601517444423},{"schema":1601376757462,"derHash":"13V4SIfNvX6fyyqdWJ02egtiONoer1HcccmbibmSKeA=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"e32b53c148cbc70936170082c6ba25a772ef3d90af11a32176389625e0c0691d","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/9a10b1ed-2339-4fb1-a42a-f9909244eef5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"42958ff2-5fcd-4c14-8815-60ee31623d20","last_modified":1601517444371},{"schema":1601376740640,"derHash":"VMN6joU/0dY3jTeLk5MH7DIaMcwaWonnGAYzvBPxh2I=","subject":"CN=GlobalSign HV RSA DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEhWIFJTQSBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"1c5322edfdbb1b8079d8aca3070adf94e68b553d512f64c518c1a6271a4e3ebf","size":1613,"filename":"5J8n1iJ-aJofFJd3TQfvG3J_UdKG9lFZc5KF98adKQg=.pem","location":"security-state-staging/intermediates/b0d1d6d0-aa0f-4d67-8a2b-7b3a6a157f00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5J8n1iJ+aJofFJd3TQfvG3J/UdKG9lFZc5KF98adKQg=","crlite_enrolled":true,"id":"8fced961-4ed6-4ff4-9402-d3f6ee0f77a3","last_modified":1601517444353},{"schema":1601376745601,"derHash":"lbCdAhIvqK5iNXgPbqZQPnZ6wCGgh0/oMc6AOlDqj9c=","subject":"CN=GeoTrust EV SSL CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"f9cce53a2c02bfdd9b421931d8556b782c6ecd2333ff1759e7a701722351de47","size":1597,"filename":"owrR9U9FWDWtrFF-myoRIu75JwU4sJwzvhCNLZoY37g=.pem","location":"security-state-staging/intermediates/93d3a920-7dd2-4552-a9bb-3e52e0c6d380.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"owrR9U9FWDWtrFF+myoRIu75JwU4sJwzvhCNLZoY37g=","crlite_enrolled":false,"id":"ff691ba0-3a0c-45ac-b608-b75b65279543","last_modified":1601517444335},{"schema":1601376727385,"derHash":"Nmb4BJFA/cCmXoCbKBo747ENr+79drndwnKpPoPKW5k=","subject":"SERIALNUMBER=A82743287,CN=Chambers of Commerce Root - 2008,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=EU","subjectDN":"MIGuMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4","whitelist":false,"attachment":{"hash":"b4b436ef9231a9bbea04b3f960f93e2326676d0ee0cd4474684e42b776ddde11","size":2593,"filename":"ztQ5AqtftXtEIyLcDhcqT7VfcXi4CPlOeApv1sxr2Bg=.pem","location":"security-state-staging/intermediates/fd1a7011-0604-4a45-83c7-ca62f842fb8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ztQ5AqtftXtEIyLcDhcqT7VfcXi4CPlOeApv1sxr2Bg=","crlite_enrolled":false,"id":"0e5f4be2-73c5-4bf6-b6a2-45f1f07226d8","last_modified":1601517444317},{"schema":1601376755442,"derHash":"axQ8IAXVU5zCLqtfdy2yqf6HRn/v+gf88Kn30oJ0yno=","subject":"CN=Entrust Root Certification Authority - G2,OU=See www.entrust.net/legal-terms+OU=(c) 2009 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQDEylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMg==","whitelist":false,"attachment":{"hash":"d1674b1f7b1aef60543ae1256c7298ed99b5016d5a49c8ba8b9745c679003a0f","size":1792,"filename":"du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at_U=.pem","location":"security-state-staging/intermediates/90532b3e-aeb1-42ae-b53d-9b0794e82506.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at/U=","crlite_enrolled":false,"id":"512e1df0-26cc-48dd-9524-3c1d7aaf422b","last_modified":1601517444299},{"schema":1601376750957,"derHash":"Vsuw/8QU6IgipQ6fQtRoIDgdjCqu71bgVmgX7TDyeic=","subject":"CN=DKHS Device CA - G2,OU=GeoRoot Certification Authority,O=NTT DOCOMO\\, INC.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBOVFQgRE9DT01PLCBJTkMuMSgwJgYDVQQLEx9HZW9Sb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRwwGgYDVQQDExNES0hTIERldmljZSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"bde21987c9e3d549164d3f8bd906c3e0e7143f88e251c6d038487800c1df337d","size":1609,"filename":"XAKgtY9g-AuhN_1uwTUpgRjOYN5vJWan9jzWCnhebjw=.pem","location":"security-state-staging/intermediates/fc44b1b1-a48b-417b-911e-ce6d05512da2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XAKgtY9g+AuhN/1uwTUpgRjOYN5vJWan9jzWCnhebjw=","crlite_enrolled":false,"id":"23862319-a4da-4783-ae80-57929b6958f5","last_modified":1601517444281},{"schema":1601376775699,"derHash":"aGkkLNitKsd7wCiUe8fQxPbpy/CJnWVwmBDYn5S11w0=","subject":"CN=GDCA TrustAUTH R4 EV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IEVWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"2e1f89d236b55a9e53ce42bf4e6c979ac2d4e9d9e836793810d01c10dc91ff0f","size":1727,"filename":"GlfrRgw9jW9VNC7Y1aXDsTsHh6dUPAEud8fhzOO-EdY=.pem","location":"security-state-staging/intermediates/76ca0f35-dc5e-4a6b-a715-cae8b21ba328.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GlfrRgw9jW9VNC7Y1aXDsTsHh6dUPAEud8fhzOO+EdY=","crlite_enrolled":false,"id":"15d2f4f5-d5d0-4fc9-8825-8c5fcf5cbe4f","last_modified":1601517444263},{"schema":1601376779796,"derHash":"qDhAXrsD9d/Y1KlXKubg4/NW7E7BNDdaWdt7GV3D7EQ=","subject":"CN=GeoTrust TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBFQ0MgQ0EgRzE=","whitelist":false,"attachment":{"hash":"c0c946701c933eed603c99ac71fe696329ac344e1eb857450da9a3c6fc6b28e7","size":1146,"filename":"5UDBgr_RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=.pem","location":"security-state-staging/intermediates/8ff205f5-9e76-40e9-807e-5a7aa972ec40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5UDBgr/RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=","crlite_enrolled":true,"id":"ff1f04eb-42ca-4339-9a6e-842a41a4be3c","last_modified":1601517444245},{"schema":1601376753403,"derHash":"V94Fg+/Ssm4DYdqZ2p30ZI3vfuhEHDtyivqbzeD5smo=","subject":"CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES","subjectDN":"MFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjg=","whitelist":false,"attachment":{"hash":"6d84cf680e962beda938e61164d5227272b5f42dc698ba20d2daf9fa5b01e5a4","size":2166,"filename":"Ow1ztL5KhUrcPlHX75-kiu-7LN2CTWe9x9fQmiq8LUM=.pem","location":"security-state-staging/intermediates/db0d57a0-e293-40b4-ac35-c505d0b77f4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ow1ztL5KhUrcPlHX75+kiu+7LN2CTWe9x9fQmiq8LUM=","crlite_enrolled":false,"id":"19461103-183f-4856-b2fe-be344c1f63e1","last_modified":1601517444223},{"schema":1601376741054,"derHash":"U6XjKsxXFO0gx3eMZV0e6X7AcVYHTIsBbiz8c+nScSs=","subject":"CN=DigiCert Global Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcz","whitelist":false,"attachment":{"hash":"b4887e6003a7f6553d3ac6da8c1ec7ddeec67cdeb9a3a2629953e71f2f779353","size":1297,"filename":"uUwZgwDOxcBXrQcntwu-kYFpkiVkOaezL0WYEZ3anJc=.pem","location":"security-state-staging/intermediates/a66116e2-f28d-4977-b407-ee74b5f52aac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uUwZgwDOxcBXrQcntwu+kYFpkiVkOaezL0WYEZ3anJc=","crlite_enrolled":false,"id":"8e9e5e57-79b3-4dd5-b6dc-59b075cc06ed","last_modified":1601517444204},{"schema":1601376777334,"derHash":"giK8T+ej3cqe8L8NaCrIiHmfh4ItFTMqVMC/38aFT3s=","subject":"CN=Staat der Nederlanden Organisatie Persoon CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOjA4BgNVBAMMMVN0YWF0IGRlciBOZWRlcmxhbmRlbiBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"0e3b37043e3f3aa596ff489e47e328fc72d538d552cc6714e820266d3bd25eb9","size":2239,"filename":"A8tEuTPX4UVR5S3b_DNaTVe_ZacDZntXrJYd4x46EG0=.pem","location":"security-state-staging/intermediates/416db4aa-c73c-4a15-9a7f-92977f67e9ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A8tEuTPX4UVR5S3b/DNaTVe/ZacDZntXrJYd4x46EG0=","crlite_enrolled":false,"id":"1222b1e8-48ad-44cf-9106-0db07c445fdd","last_modified":1601517444171},{"schema":1601376761177,"derHash":"Ukz3MxxO41PusezXTh+AGg8fCN+gMiCS9CIFr8OhdnU=","subject":"CN=DigiCert SHA-2 RADIUS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFNIQS0yIFJBRElVUyBDQQ==","whitelist":false,"attachment":{"hash":"27066a171b414ad64061c4d31e5004cbce8f4d7555ba47fca659f81f97acaaf9","size":1674,"filename":"yZwj8Xi_M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845-xQ=.pem","location":"security-state-staging/intermediates/0356953d-ca56-4ed4-b79b-6447b2d907ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yZwj8Xi/M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845+xQ=","crlite_enrolled":false,"id":"2b7210c5-6bef-4469-b9b2-3cf4a91afb14","last_modified":1601517444153},{"schema":1601376733088,"derHash":"ZHFyUK+LAo3Y5cC65MkULIsQNTJhK8SHCF/Twxn5wGc=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"73789188b1ff6dcd70442594b8ff119cb7b30d858c0e7f072cf8a014cd8f296a","size":2649,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/3785b85c-da3b-4b7b-bd12-2796cce60c04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"ee033ab1-7bfc-4f08-b26a-b3b2bce86767","last_modified":1601517444135},{"schema":1601376743119,"derHash":"P94NNuAmtujr4sKIg2B8hlHeEL1sH8rTZeVg9OovOwM=","subject":"CN=Entrust Root Certification Authority - EC1,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG/MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTMwMQYDVQQDEypFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBFQzE=","whitelist":false,"attachment":{"hash":"fa84991015956f299a21164f4a77c8da26802bb7bac4207eb696cc086ce715b0","size":1577,"filename":"_qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=.pem","location":"security-state-staging/intermediates/2827fb47-01de-4cf9-88b5-faa3f7464bf6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=","crlite_enrolled":false,"id":"10eb04ab-95e7-45a1-94b3-40bc33bad469","last_modified":1601517444117},{"schema":1601376774088,"derHash":"BTHIb3hZWJOf3FOZJNOV0e+kCTZOaCfTq5h2MR/7J7A=","subject":"CN=QuoVadis Enterprise Trust CA 1 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDEgRzM=","whitelist":false,"attachment":{"hash":"0838a224858164040768ee9fb8bab6de6efb11294b58f2c5db9fea5788b39bc7","size":2333,"filename":"8ZpHrAG1eQIQZnOeYn-p9E7tqq_yc1fiaSaeKR1BY2I=.pem","location":"security-state-staging/intermediates/360e077f-09bb-4788-bbfe-80bd616b8011.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8ZpHrAG1eQIQZnOeYn+p9E7tqq/yc1fiaSaeKR1BY2I=","crlite_enrolled":false,"id":"2a1565c1-b11e-4fb4-a545-99acd43e82cf","last_modified":1601517444099},{"schema":1601376769580,"derHash":"rY6zLJ2pHdyFXzgnRZkBR9xvI9n7sE/J1Hax7iD8cdg=","subject":"CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBHNA==","whitelist":false,"attachment":{"hash":"12cc0d0e07a0ce9a1fae8bc81a3c9918619e6044dedda6d70c56fec58c5aa0d5","size":2024,"filename":"Wd8xe_qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=.pem","location":"security-state-staging/intermediates/40ac2caf-9799-41cc-9949-62fe94bd7c8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wd8xe/qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=","crlite_enrolled":false,"id":"9702b5ab-ac3b-478f-8641-763a8b97d8df","last_modified":1601517444080},{"schema":1601376751370,"derHash":"rev4P9PT+VRrt3+qtRbdkzfM+R4RmPdDN3aexo5ugm4=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMjU2IGJpdCBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"221a0273827a23e87c0dd7ce8626aa6c220b418e5234c22b3d0208d1d9f6dc1a","size":1394,"filename":"kNDz7bhhiRNqEf2UFG3eoPwdtsGjjYfGnZgWRkA10BI=.pem","location":"security-state-staging/intermediates/35791f89-9b45-419d-8e77-406b12700572.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kNDz7bhhiRNqEf2UFG3eoPwdtsGjjYfGnZgWRkA10BI=","crlite_enrolled":false,"id":"b0560908-0ea5-4fca-99b1-ce23985cb524","last_modified":1601517444062},{"schema":1601376774489,"derHash":"to1dm06mNZV8DDIVwg01siF7aeNJx6MExPl/IMQIH4g=","subject":"SERIALNUMBER=A82743287,CN=AC Camerfirma - 2009,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIGqMQswCQYDVQQGEwJFUzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcTQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEdMBsGA1UEAxMUQUMgQ2FtZXJmaXJtYSAtIDIwMDk=","whitelist":false,"attachment":{"hash":"197ccbfd7ec7b28f0f75167600f50b767843f9737a9e63f410e93c076cda6c09","size":2918,"filename":"wAh6UmDWkgJZX-MvtntK3hAjxzxC6tPEmrdc3IqHZl8=.pem","location":"security-state-staging/intermediates/3341ba59-f7ad-4982-bb52-733b1fd5490b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wAh6UmDWkgJZX+MvtntK3hAjxzxC6tPEmrdc3IqHZl8=","crlite_enrolled":false,"id":"48847bb5-0281-45c3-b2d3-e7f76ca2cb3b","last_modified":1601517444043},{"schema":1601376755836,"derHash":"joxuv3fcc9s+OOk/SAPmK2tZM761HuQVL2jXqhRCazE=","subject":"CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"3d68f4af65db5b779ba073b81f3674d2dd3df3323be8808d825116f4a0a129c3","size":1557,"filename":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq_Juw=.pem","location":"security-state-staging/intermediates/ad34e608-081b-4ce8-83f8-80bf15e28c0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq/Juw=","crlite_enrolled":false,"id":"35957622-8171-40c9-b5c6-f6630c77d128","last_modified":1601517444025},{"schema":1601376772500,"derHash":"l55f990lhUXx0dc3+UCPOlWud8j8bmHcR0JQ0sl5sFE=","subject":"OU=ePKI Root Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"001850d9f7cb0ad915c278964fe8db058918ef083cfdd108f313803de6710705","size":2560,"filename":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=.pem","location":"security-state-staging/intermediates/eba466f4-bb7c-4798-9986-b6b5eca4a446.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=","crlite_enrolled":false,"id":"478b2025-c6ad-416f-9ef4-0e96131f47a6","last_modified":1601517444008},{"schema":1601376742712,"derHash":"YO9BLqvnw/xjme7RtjO3d3R1FbKdchuWPdJYvEmKspI=","subject":"CN=SSL.com EV Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTQwMgYDVQQDDCtTU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRUND","whitelist":false,"attachment":{"hash":"ab3dfad3dda55fb2c174fabf92fc81f2757e57a915b1f78f5483d12dfaf50f76","size":1821,"filename":"NIdnza073SiyuN1TUa7DDGjOxc1p0nbfOCfbxPWAZGQ=.pem","location":"security-state-staging/intermediates/734df71e-5087-4844-aa75-47d2809181f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIdnza073SiyuN1TUa7DDGjOxc1p0nbfOCfbxPWAZGQ=","crlite_enrolled":false,"id":"b512360d-9f2f-4206-97ac-09aa8d521233","last_modified":1601517443989},{"schema":1601376752989,"derHash":"dp9v8Jp0Yqwnpugt53ABPTwCEzr92+WBrvzKGwoCkYA=","subject":"CN=TrustSign BR Certification Authority (EV) 2,OU=Controlled by COMODO for TrustSign Certificadora Digital,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIIBCDELMAkGA1UEBhMCQlIxEzARBgNVBAgMClPDo28gUGF1bG8xHjAcBgNVBAcMFVPDo28gSm9zw6kgZG9zIENhbXBvczFLMEkGA1UECgxCVHJ1c3RTaWduIENlcnRpZmljYWRvcmEgRGlnLiAmIFNvbHXDp8O1ZXMgU2VndXJhbsOnYSBkYSBJbmYuIEx0ZGEuMUEwPwYDVQQLEzhDb250cm9sbGVkIGJ5IENPTU9ETyBmb3IgVHJ1c3RTaWduIENlcnRpZmljYWRvcmEgRGlnaXRhbDE0MDIGA1UEAxMrVHJ1c3RTaWduIEJSIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IChFVikgMg==","whitelist":false,"attachment":{"hash":"ba4c3dbca2d5728e872bf00f09797aeef4e3eca1f8283c82bfa080bb528a8dc9","size":2373,"filename":"iKWK-FGvQxVzCQKwKOQ7Rd18KzTZXBBwxTbfJaG1qN0=.pem","location":"security-state-staging/intermediates/a1e03bb9-2c35-49c6-bd32-f0994e053167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iKWK+FGvQxVzCQKwKOQ7Rd18KzTZXBBwxTbfJaG1qN0=","crlite_enrolled":false,"id":"e0f723e6-76d1-4bee-9c67-8136e524719e","last_modified":1601517443971},{"schema":1601376730664,"derHash":"8oqXrCjP7RCpOn8Hj5eMj2IEydhFH3RdX+u9bgttTXw=","subject":"CN=Hellenic Academic and Research Institutions RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGmMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxNQ==","whitelist":false,"attachment":{"hash":"599c4d3414fd09b7ab7a1692a79ac80f5e452adbeed9d0aecc7a05228a1b427e","size":2292,"filename":"UMyGupbbMmPHmkPq0HVT2fVmWeaQfnLYwCZjehzchdw=.pem","location":"security-state-staging/intermediates/9269078b-f3eb-4f59-b548-f9978d1786cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UMyGupbbMmPHmkPq0HVT2fVmWeaQfnLYwCZjehzchdw=","crlite_enrolled":false,"id":"f360da31-27aa-400f-8a47-3d517bae9327","last_modified":1601517443953},{"schema":1601376744781,"derHash":"asZkCS2bsVahECbk/nNNM3jIDe1FGYawul7KEcbfirs=","subject":"CN=KDDI Web Communications Certification Authority 2,O=KDDI Web Communications Inc.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBJbmMuMTowOAYDVQQDEzFLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAy","whitelist":false,"attachment":{"hash":"30e363da73774add76e38c29a61875ab860a411951b9f29e3ad90d7e3fbfe77f","size":1658,"filename":"aUNVAMKFhtzaVShUUcBbp8xP_plnuqaBn80TpHKVfNs=.pem","location":"security-state-staging/intermediates/1e7b2323-695f-4952-ad56-19f517a7246b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aUNVAMKFhtzaVShUUcBbp8xP/plnuqaBn80TpHKVfNs=","crlite_enrolled":false,"id":"d7768dd2-6b98-4ad2-886e-cac6d553ec16","last_modified":1601517443936},{"schema":1601376782713,"derHash":"H5sx+CCSnr+gMRfsK3e6aw+27MngJ2gqVZN42jEcVO8=","subject":"CN=Symantec Class 3 Extended Validation SHA256 SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxOzA5BgNVBAMTMlN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"73b3e2e12b6d805388d7894c35f9c43b08121eeddc974879d17a8b755870c43b","size":1894,"filename":"fb0Tfqir1HP3KpDb-G45zaPKd4IMWkZQgeiSsLeH8tk=.pem","location":"security-state-staging/intermediates/f1503402-4fce-4d76-96a3-ab24eed07569.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fb0Tfqir1HP3KpDb+G45zaPKd4IMWkZQgeiSsLeH8tk=","crlite_enrolled":false,"id":"27f99fc8-8d5d-4c73-ad31-4ef517e5ef06","last_modified":1601517443918},{"schema":1601376747224,"derHash":"uQ7q6THl4rfTNfFJ2mwiEJhgANIU/9tipy9zMtY3Ma8=","subject":"CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBWZXJpem9uIEJ1c2luZXNzMREwDwYDVQQLEwhPbW5pUm9vdDEfMB0GA1UEAxMWVmVyaXpvbiBHbG9iYWwgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"b2ff06177ee90557f82e4d2b65f87cbe3e37ef185fd9f5b2f7d8c654bf7eefbc","size":1760,"filename":"v-gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=.pem","location":"security-state-staging/intermediates/96d8b2a4-5c83-408a-aba1-f8c0818c74a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v+gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=","crlite_enrolled":false,"id":"90eff404-0514-42a4-b6bc-375d060840d8","last_modified":1601517443892},{"schema":1601376720802,"derHash":"2VgdvembOe7/bOXIDeFlDaDByKEJcF7ShsU7yV5mVeQ=","subject":"CN=Staat der Nederlanden Organisatie Services CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOzA5BgNVBAMMMlN0YWF0IGRlciBOZWRlcmxhbmRlbiBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"7e2d605d386b1377355070db06e788e514e057431cc7ff2c0772d4f9b8ff0e62","size":2324,"filename":"WoBMz_bIYMctSPZ5Zhje__eik13TeByHSK4zXYYEsAQ=.pem","location":"security-state-staging/intermediates/baa75ba7-d136-47a9-96af-8da37255a077.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoBMz/bIYMctSPZ5Zhje//eik13TeByHSK4zXYYEsAQ=","crlite_enrolled":false,"id":"ea6ff4e8-dc0c-4bf1-8751-7f9a6053af57","last_modified":1601517443861},{"schema":1601376719498,"derHash":"rPcY34OOZABRd30ZR/UWIOjYBLoYZVOuUvyYEbXTS4s=","subject":"CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTEwLwYDVQQDDChTU0wuY29tIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNB","whitelist":false,"attachment":{"hash":"0be6061408140698708a3d3cb24d39ad6416effde544c39b9e52f40a1b6fe9cf","size":2085,"filename":"0cRTd-vc1hjNFlHcLgLCHXUeWqn80bNDH_bs9qMTSPo=.pem","location":"security-state-staging/intermediates/a9cbcbd0-800f-442e-8f52-903325a5ee23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0cRTd+vc1hjNFlHcLgLCHXUeWqn80bNDH/bs9qMTSPo=","crlite_enrolled":false,"id":"60def2d8-d623-4952-91b9-30913d09f7b4","last_modified":1601517443836},{"schema":1601376719951,"derHash":"RiJre4ngLKj12F1n7Yy0sZxIOCBYuxYkIZnVQMq+kmg=","subject":"CN=TeliaSonera Gateway CA v2,O=TeliaSonera,C=FI","subjectDN":"MEcxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgR2F0ZXdheSBDQSB2Mg==","whitelist":false,"attachment":{"hash":"a217b78c13516b7cdc64085ded0920414e8b497f59bb8ad9e4ba1202473f3e28","size":2532,"filename":"jaaJsNV10gkW5ui1mprnOhj0AU9JlvfHwfeE-4pG7Lg=.pem","location":"security-state-staging/intermediates/e2f9758e-b3b7-476a-a010-68d270baddb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jaaJsNV10gkW5ui1mprnOhj0AU9JlvfHwfeE+4pG7Lg=","crlite_enrolled":false,"id":"94fd3ab1-6743-43b7-b04b-f3ce9336a99b","last_modified":1601517443809},{"schema":1601376760342,"derHash":"RcKL5DQvByzWIZaYw+8qxtunPxngTazyBE0vaZPjQrQ=","subject":"CN=eMudhra RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for eMudhra Technologies Ltd.,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIHhMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxSDBGBgNVBAsTP0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgZU11ZGhyYSBUZWNobm9sb2dpZXMgTHRkLjE5MDcGA1UEAxMwZU11ZGhyYSBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"68e999dcfb6f85564fab0d02baa239b313d7e2dc8f5a4ecb6346e4afc6201b43","size":2316,"filename":"xIsOtN5uZ5ZZQRiHSu6NrXg36kenjPgaYZeoj9lRsXk=.pem","location":"security-state-staging/intermediates/e30be843-e47e-40e4-8d03-35c62a341392.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xIsOtN5uZ5ZZQRiHSu6NrXg36kenjPgaYZeoj9lRsXk=","crlite_enrolled":true,"id":"29d99702-edc8-413c-b8ca-77c56ea0181f","last_modified":1601517443782},{"schema":1601376721235,"derHash":"1Gkx4Bgt1lXqDBbm3Zn45hr/5AH3NMbKjqAFapaOr4E=","subject":"CN=DigiCert Baltimore EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEJhbHRpbW9yZSBFViBDQQ==","whitelist":false,"attachment":{"hash":"71b566b9248c134842c94e190eb959e767923e037257d37b3e855d67a010ab2d","size":1577,"filename":"VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=.pem","location":"security-state-staging/intermediates/fb866139-1efa-47a1-b0a2-afca62bb7d30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=","crlite_enrolled":true,"id":"3395f234-9055-4caa-a4d5-11b4a7f375a3","last_modified":1601517443761},{"schema":1601376769979,"derHash":"EoGtj6vog/IJ6WNkSNGoDDc9qnaGyBOicPrUj19eWJo=","subject":"CN=Telia Server CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MEYxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEbMBkGA1UEAwwSVGVsaWEgU2VydmVyIENBIHYz","whitelist":false,"attachment":{"hash":"c49599398958207a50863ebc4e7e508a20b8551b440ae2d3d28ab90e317f5c12","size":2341,"filename":"TCgTLigAKZ2ouWM1T2dh92G9wUDP8Wlma6sqwmm3aVc=.pem","location":"security-state-staging/intermediates/bdcf129f-b3fa-4ce1-8a67-6da86c05d54f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TCgTLigAKZ2ouWM1T2dh92G9wUDP8Wlma6sqwmm3aVc=","crlite_enrolled":true,"id":"681d294f-17d7-400e-a4ca-507ee1d90a50","last_modified":1601517443744},{"schema":1601376746412,"derHash":"RksOwKYC8Bk9tfM5EYhaOmGSGtFtJmTiW++rEM+m7SU=","subject":"OU=Public Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MFsxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEnMCUGA1UECwweUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"49845caec147a9f80e7f49b5e4b2b8629653bccf72d7aa8dfa0b7029f5d75514","size":1934,"filename":"qMjf0br8Ay71_wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=.pem","location":"security-state-staging/intermediates/cabaf189-98ae-41ee-8da3-966fb99dbea2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qMjf0br8Ay71/wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=","crlite_enrolled":false,"id":"201bbcbe-98a9-4e1d-9ba8-1d91ccaef4d5","last_modified":1601517443722},{"schema":1601376782315,"derHash":"p+gwVumz2d2xgWuVUY9qXlod/foo9gUzschQhV6qQmM=","subject":"CN=Telia Domain Validation CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFExCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEmMCQGA1UEAwwdVGVsaWEgRG9tYWluIFZhbGlkYXRpb24gQ0EgdjM=","whitelist":false,"attachment":{"hash":"0f8c227df79307dbeec994ba6d8bd832268f9d2b0c636499e29d589ed747a88c","size":2353,"filename":"RU2jIfMztj4AADghygjY9gbxUkW13LXRSS7JeONgrxc=.pem","location":"security-state-staging/intermediates/f38aa272-1880-4c2f-b745-6c01a69b0614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RU2jIfMztj4AADghygjY9gbxUkW13LXRSS7JeONgrxc=","crlite_enrolled":true,"id":"b07c6446-0c44-4a00-bb56-ca8b2b55a54e","last_modified":1601517443698},{"schema":1601376730262,"derHash":"MBx2dQJ2GpCYk29sqnNsQ2QHQeDdmiaY9DoAHZfBZ/k=","subject":"CN=Fuji Xerox Certification Authority 2,O=Fuji Xerox,C=JP","subjectDN":"MFExCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MS0wKwYDVQQDEyRGdWppIFhlcm94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDI=","whitelist":false,"attachment":{"hash":"b2e83a0583235d0e89d877d8abbd4ddc71a9825998e2cd9c7aa40500a9f10667","size":1500,"filename":"jEakGI1jOC9M7t1p7b_cp7OOuFt2ovRpogRWrRVxQt8=.pem","location":"security-state-staging/intermediates/7ae7dfdd-6a6d-492e-9eba-8b861f68976a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jEakGI1jOC9M7t1p7b/cp7OOuFt2ovRpogRWrRVxQt8=","crlite_enrolled":false,"id":"c9552f3d-50c5-424d-aa0b-ddb2a0a0f796","last_modified":1601517443675},{"schema":1601376759931,"derHash":"pYmOW/uEKVwEPsQDQoivs34NWjhm8Xy2V7l/cty1O+w=","subject":"CN=EC-ACC,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verarrel (c)03+OU=Jerarquia Entitats de Certificacio Catalanes,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHzMQswCQYDVQQGEwJFUzE7MDkGA1UECgwyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsMH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsMLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLDCxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAwwGRUMtQUND","whitelist":false,"attachment":{"hash":"c91d4443f3c8f83a280186a047029b6b4b7ce659addce7f07caf597e11a9dc65","size":1902,"filename":"sh0qdDMYcSuhbzmRnZYaS6-6O8qaQ6dbH8_iLF1wyro=.pem","location":"security-state-staging/intermediates/dad2be5f-3b40-4362-a644-e7ed3ec0debd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sh0qdDMYcSuhbzmRnZYaS6+6O8qaQ6dbH8/iLF1wyro=","crlite_enrolled":false,"id":"96d98717-9a96-4d73-b156-2eb909eb5054","last_modified":1601517443658},{"schema":1601376776932,"derHash":"BrlyKmmcV9/xhp9DC0ebtutJquEYTqycUyXBM0o06kw=","subject":"CN=SSL.com Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTEwLwYDVQQDDChTU0wuY29tIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRUND","whitelist":false,"attachment":{"hash":"3575f65e014fd8fa943566de2f3d7a42adc6b4e947cc86fb2028d533adc24ad9","size":1804,"filename":"oyD01TTXvpfBro3QSZc1vIlcMjrdLTiL_M9mLCPX-Zo=.pem","location":"security-state-staging/intermediates/34d6fd53-d5dd-4289-aa37-161e72f0a7e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oyD01TTXvpfBro3QSZc1vIlcMjrdLTiL/M9mLCPX+Zo=","crlite_enrolled":false,"id":"3ecf65b2-97c8-4b50-a416-2032e8bdbdf7","last_modified":1601517443636},{"schema":1601376768352,"derHash":"LU+tNFWrYTl0Aau7UYki+EM2tn4C/I0tsoOCXEq5gbs=","subject":"CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcy","whitelist":false,"attachment":{"hash":"0558647c4eeecfb355382c6706854b426612a1444f25dc3adfb7d56079fcf28d","size":1748,"filename":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl_s2uC_CY=.pem","location":"security-state-staging/intermediates/0b9f9a42-27c0-4853-935f-4345030e4d62.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl/s2uC/CY=","crlite_enrolled":false,"id":"06d0c87d-d5a6-47ab-ad28-8767585b4426","last_modified":1601517443609},{"schema":1601376743527,"derHash":"J1JOMrshd8u/CnFveKcSQnFPyS8KRHEw2RZmxxangQc=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"0dad756b753d0f88b83d8bc46c6d0a9066434d03ab6d72e1a0e9c0473e83eedd","size":1764,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/005152cc-aa3c-4406-b480-f4d2f2aef4e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":false,"id":"d07ede68-44a2-4cf4-beb9-f363bd8d953e","last_modified":1601517443590},{"schema":1601376738088,"derHash":"umub+7+WmK+R60xpNGZBQYGgACrVKP8VSUbVhqpdlEU=","subject":"CN=GoGetSSL ECC EV CA,OU=Controlled by COMODO CA exclusively for GoGetSSL,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MIGHMQswCQYDVQQGEwJMVjENMAsGA1UEBxMEUmlnYTERMA8GA1UEChMIR29HZXRTU0wxOTA3BgNVBAsTMENvbnRyb2xsZWQgYnkgQ09NT0RPIENBIGV4Y2x1c2l2ZWx5IGZvciBHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"9bbb40268769a0fb2d93f4ba28e208765ce02172266fd724354d40fe752d0187","size":1362,"filename":"og9uiCTdRwcFKbx11dQHwWx4x4btYdfYz4pKq5LpcoY=.pem","location":"security-state-staging/intermediates/13744076-d7ed-4f2f-b95b-985bbf7257dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"og9uiCTdRwcFKbx11dQHwWx4x4btYdfYz4pKq5LpcoY=","crlite_enrolled":false,"id":"073a888e-1813-4d8e-ba5d-23e7a79798b1","last_modified":1601517443573},{"schema":1601376734311,"derHash":"8Bwayjkogq8VLp8B7MzQr93YqjW/iVsAMZix6MdS3bg=","subject":"SERIALNUMBER=A82743287,CN=Global Chambersign Root - 2008,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=EU","subjectDN":"MIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwOA==","whitelist":false,"attachment":{"hash":"94f96c02a67a0946b9d781981a2662422e1f728a9316476f6561cd899b6e528d","size":2584,"filename":"knobhWIoBXbQSMUDIa2kPYcD0tlSGhjCi4xGzGquTv0=.pem","location":"security-state-staging/intermediates/0cbd049c-06d3-49b2-aae6-c0bcd5fa210c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"knobhWIoBXbQSMUDIa2kPYcD0tlSGhjCi4xGzGquTv0=","crlite_enrolled":false,"id":"81e99069-a8ad-46a8-b96f-c0e2cc7a5494","last_modified":1601517443555},{"schema":1601376768762,"derHash":"bay7iUUTex2tQhGwQ2774G8SrONpBJc7Ra4ldAgj02k=","subject":"CN=DigiCert Global Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENB","whitelist":false,"attachment":{"hash":"1a8c56af27223d777da24bba93b743c15e633c42f9ab430fc69c48fe2ac69bbb","size":1577,"filename":"r_mIkG3eEpVdm-u_ko_cwxzOMo1bk4TyHIlByibiA5E=.pem","location":"security-state-staging/intermediates/038b81ab-4eff-4d41-90a4-8f4f86b72f6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=","crlite_enrolled":false,"id":"39be0c8a-1350-49d8-95ce-b5095d2d226d","last_modified":1601517443537},{"schema":1601376736414,"derHash":"6VY1gecSspDyOnSTRlNesNmB49SjnVbWBGhM0LFpjIk=","subject":"CN=TeliaSonera Root CA v1,O=TeliaSonera","subjectDN":"MDcxFDASBgNVBAoMC1RlbGlhU29uZXJhMR8wHQYDVQQDDBZUZWxpYVNvbmVyYSBSb290IENBIHYx","whitelist":false,"attachment":{"hash":"dff294c7a5bf61855f4bf4688f93273254185339ca8c7fa141f0597c90fb4a8d","size":1963,"filename":"ELo0hcqLtogKuVMaQGPkABVVVhx_LgVRZfSbLXT8X2s=.pem","location":"security-state-staging/intermediates/a4200fb3-9012-4d6e-8f39-3a0ac6b62bf3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ELo0hcqLtogKuVMaQGPkABVVVhx/LgVRZfSbLXT8X2s=","crlite_enrolled":false,"id":"a5d1352e-4a82-433c-870e-ad8c58fc9bbb","last_modified":1601517443520},{"schema":1601376749293,"derHash":"2lRiUmoMLphSqGGGsCU5AVh1nNymriHwn3E8pqzN0fE=","subject":"CN=QuoVadis Enterprise Trust CA 3 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDMgRzM=","whitelist":false,"attachment":{"hash":"0b01ec78286d184607dd09e4cac9c4992d4af9f58534eb2cb8fea437481a6197","size":2333,"filename":"smsafMf1m1b-3NN_jssl3RMKHXok-GELWWNtG9vZEmA=.pem","location":"security-state-staging/intermediates/e3b263a6-dc7b-4bda-8acb-d8c10b677b2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"smsafMf1m1b+3NN/jssl3RMKHXok+GELWWNtG9vZEmA=","crlite_enrolled":false,"id":"b1c31974-0f71-4207-8532-82f8138e8ca8","last_modified":1601517443502},{"schema":1601376748042,"derHash":"wl8elgALw24qpc1UvyT0i3aJChYuGtjhBJkmUFEGJsI=","subject":"CN=TrustAsia DV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"8818c8f5c68801123839b3cc239cbd89d6750c3eebd094b7e193b8d4c008359f","size":1691,"filename":"kZD1rAhydUcYx_iHiwQ-xsh92idc5Cryvs4-2MeQnpk=.pem","location":"security-state-staging/intermediates/30df4c61-9f07-4a43-9956-25742af9cddb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kZD1rAhydUcYx/iHiwQ+xsh92idc5Cryvs4+2MeQnpk=","crlite_enrolled":false,"id":"2e43a311-dc6c-4644-b4fd-dabaca2c1929","last_modified":1601517443484},{"schema":1601376725349,"derHash":"KGibMOTDBqq1OwJ7KeNq1t0dz0uVOZRILKhL3B7KyZY=","subject":"CN=Starfield Services Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGYMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZpZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"f86af69b434af8ea5af1e027d56a7a38f6f22b387403ecb5009164accf5a6e79","size":1605,"filename":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6-oP5I=.pem","location":"security-state-staging/intermediates/901b5264-4d8d-44b2-9d34-a3510247f9db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6+oP5I=","crlite_enrolled":false,"id":"c0aa9228-9471-4d9a-a0df-1f91fd16b767","last_modified":1601517443467},{"schema":1601376729443,"derHash":"HparstZQK13OUY7AC1oeVDNJ79Lj9ovpq8ESiyVv7dc=","subject":"CN=GDCA TrustAUTH R4 SSL CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGQxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjEhMB8GA1UEAwwYR0RDQSBUcnVzdEFVVEggUjQgU1NMIENB","whitelist":false,"attachment":{"hash":"0c153a0a3e193285fb42bc65ed86726b6ce20e989c5ce61bee6ac0249ccc9114","size":2052,"filename":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb-nZvgw-0Who=.pem","location":"security-state-staging/intermediates/917af39e-808a-4852-8c1c-b2360829b69b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb+nZvgw+0Who=","crlite_enrolled":false,"id":"056dcecf-b54d-4dca-bd31-f6fa1134a775","last_modified":1601517443449},{"schema":1601376783927,"derHash":"5K8vrkEYfVjyCbAbHYdTwtzLP2Ac6GJz436HOMKlzLU=","subject":"CN=Oracle SSL CA - G2,OU=Symantec Trust Network,O=Oracle Corporation,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxGzAZBgNVBAMTEk9yYWNsZSBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"e494e978931ad5d02f062cfb56e8f25cd10bc3632a24ccafb9f97d68508fdd32","size":1829,"filename":"AifQ_vsDlH7aQOdXumUDNTzAh2cI97-83a1FqoQss7M=.pem","location":"security-state-staging/intermediates/a3eac2bb-9bb3-446e-bfb6-c8d463e48cb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AifQ/vsDlH7aQOdXumUDNTzAh2cI97+83a1FqoQss7M=","crlite_enrolled":false,"id":"d1739c52-6e71-43f0-a8c1-3fe9fa938594","last_modified":1601517443431},{"schema":1601376736833,"derHash":"uXF28htu1kYJJnstGiqfrwxN69RGRNyF62rphvyGfVY=","subject":"CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE3MDUGA1UEAwwuU1NMLmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQSBSMg==","whitelist":false,"attachment":{"hash":"26b0eb0f7d0c63890a8cb3bac26790139d109c65e18753a461b28633c51c86e3","size":2093,"filename":"fNZ8JI9p2D_C-bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=.pem","location":"security-state-staging/intermediates/cbc009ee-d95a-4c1a-b665-8d351c2f25cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fNZ8JI9p2D/C+bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=","crlite_enrolled":false,"id":"7b426af5-c32a-4108-a18c-9f524b01f83a","last_modified":1601517443414},{"schema":1601376766712,"derHash":"F04d53yNk8aOzSvS6m4ZG1hNuFAneoNKrImLfICpHHA=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"d0caddb97c0bc5c29f2e4a3313e5fcde643b44351f7d21145f14294c7d1ca9eb","size":2333,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/5219558a-ec4b-4733-86f9-13b9bf9c74ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"4faccf9d-b079-45fb-8618-5f3f864455de","last_modified":1601517443396},{"schema":1601376781071,"derHash":"RF7seLxhIVBEoDeWVqotXbXkL3bLcLjRTCB3qpQ9Trs=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R3,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIzMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"03136ae4f1cc15165e71fa5ef33f14d451ac52630098f060194f365a61a44a74","size":1553,"filename":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP-4A=.pem","location":"security-state-staging/intermediates/de87ee5e-fc90-47ae-a551-27f45867b68c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP+4A=","crlite_enrolled":false,"id":"61380e8f-ba33-418f-b251-e9adeb0d421b","last_modified":1601517443361},{"schema":1601376723250,"derHash":"3ajac2GH129PDtWl9me1TZmpiuBgkdDjoBcU6SIWla0=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R6,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"b41c9b2e15c3c244c322fbf94a4a850c7938223b476b1126737bdf2e5eec446a","size":1890,"filename":"aCdH-LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=.pem","location":"security-state-staging/intermediates/4d8959af-58c7-4dbf-b787-864dac9fdf64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aCdH+LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=","crlite_enrolled":false,"id":"ff319db3-4ac0-4406-9c29-03f632e42c98","last_modified":1601517443342},{"schema":1601376731061,"derHash":"GpkBn51BKmRFR0ntqo59xGZz1kTfPOFcxlVzXqDfhv4=","subject":"CN=thawte EV SSL CA - G3,O=thawte\\, Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHjAcBgNVBAMTFXRoYXd0ZSBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"1cf868355a40b245f6cc59c13c1382c34b4f199d60214e4df7096639b87717dc","size":1683,"filename":"L_6MoT_ohYSR0eSF5RZoAF17Gqj6vWJpWTK-FNgH0rM=.pem","location":"security-state-staging/intermediates/7544ec1b-5339-422e-9183-77c1d3ba8469.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L/6MoT/ohYSR0eSF5RZoAF17Gqj6vWJpWTK+FNgH0rM=","crlite_enrolled":false,"id":"4f72d4f2-5538-4d6c-82f9-01320834b544","last_modified":1601517443324},{"schema":1601376750539,"derHash":"krty8V63XeRnyEtDgYEDS9rpoBbsJkNL7jybutjNivA=","subject":"CN=Symantec Web PKI ECC Root - G1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEnMCUGA1UEAxMeU3ltYW50ZWMgV2ViIFBLSSBFQ0MgUm9vdCAtIEcx","whitelist":false,"attachment":{"hash":"488787a086889d5ac385a1e96db2cc8bd76c1015d9c3c1003c0ad97b8bd7d46a","size":898,"filename":"iduNzFNKpwYZ3se_XV-hXcbUonlLw09QPa6AYUwpu4M=.pem","location":"security-state-staging/intermediates/413ec41f-5315-44a7-add5-99589e58480c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iduNzFNKpwYZ3se/XV+hXcbUonlLw09QPa6AYUwpu4M=","crlite_enrolled":false,"id":"d00abc39-e08a-44f1-84d7-b68ac1d5334f","last_modified":1601517443307},{"schema":1601376757868,"derHash":"uCIQzend6g4UvimvZH5LMvlu0qnvGqW6qcxks4tsAco=","subject":"OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES","subjectDN":"MDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTQ==","whitelist":false,"attachment":{"hash":"dda828b4a97c8a8f24d378bef318af5d144be4d873ff73ba3f07303c1c298e49","size":1971,"filename":"L8VmekuaJnjtasatJUZfy_YJS_zZUECXx6j6R63l6Ig=.pem","location":"security-state-staging/intermediates/517b4707-ce8c-4711-b41b-f2251c5edd3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L8VmekuaJnjtasatJUZfy/YJS/zZUECXx6j6R63l6Ig=","crlite_enrolled":false,"id":"a16f609b-1af0-4b48-90e8-2d6a182ca81f","last_modified":1601517443289},{"schema":1601376729034,"derHash":"VuT0VNmC3NzmEbe3B9sSxTPqwpol9KUwfhwGVxOw3I4=","subject":"CN=DigiCert TLS ICA Thawte PCA-G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEnMCUGA1UEAxMeRGlnaUNlcnQgVExTIElDQSBUaGF3dGUgUENBLUcz","whitelist":false,"attachment":{"hash":"8bae35c0e06cb5fb2398f3147505a1a2ea437352eb1117c66f7060548a248981","size":1735,"filename":"1kuMMhuDt5uIGZpznnoQhtlIwlmJ85sNYnH0jX_yBUA=.pem","location":"security-state-staging/intermediates/3cfa0bee-444c-4508-9234-5f45d449c7c3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1kuMMhuDt5uIGZpznnoQhtlIwlmJ85sNYnH0jX/yBUA=","crlite_enrolled":true,"id":"abdee471-bc7c-45ce-a24e-e12b11d63ef9","last_modified":1601517443271},{"schema":1601376749709,"derHash":"LnoKOwxSfrIMUiU8jSJ4yhCBNqjKOk6iLae1m6yQZQo=","subject":"CN=Staat der Nederlanden Burger CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MFwxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xLTArBgNVBAMMJFN0YWF0IGRlciBOZWRlcmxhbmRlbiBCdXJnZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"333baabfa08d3f556b2b77e6fbd81a7c8d6eeffc79185f35ee1b9940de7adb0b","size":2219,"filename":"Ddtmy6Pa-pijb1fgZHrEBrRujNwcH920-5ucOhHG4yU=.pem","location":"security-state-staging/intermediates/1bef5ac3-89f5-4d09-bc35-4146f932b183.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ddtmy6Pa+pijb1fgZHrEBrRujNwcH920+5ucOhHG4yU=","crlite_enrolled":false,"id":"19a63c15-3c2a-4f1b-a4bf-f07b30de7c65","last_modified":1601517443254},{"schema":1601376755045,"derHash":"5x2MO69D9rM1LfV0qfDUogZb8D2heVFLH8xdm+yMj80=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"1f262ade87c1ad2a96c3e27c26a783f6daabfe4db8d38fe377fa18eb20f05c8a","size":1674,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/fbb7342f-2e0d-4f3b-8dc3-9f69e60e0638.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"5a0248e5-fd5a-426c-99c1-331ad9cd50b2","last_modified":1601517443236},{"schema":1601376747615,"derHash":"usTwPcY1va4Gf3v+d6sG2ItbpGaLD0YVflPWypMQB38=","subject":"CN=TrustSign RSA EV CA,OU=Controlled by Sectigo exclusively for Ziwit,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MIGZMQswCQYDVQQGEwJGUjEQMA4GA1UECBMHSGVyYXVsdDEUMBIGA1UEBxMLTW9udHBlbGxpZXIxDjAMBgNVBAoTBVppd2l0MTQwMgYDVQQLEytDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFppd2l0MRwwGgYDVQQDExNUcnVzdFNpZ24gUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"05a98cf5e38717d1c7e8544b531bdf4bfdf308c7625823a299e96ffed1c65683","size":2219,"filename":"8o6U66RqF4Lhi_AFVcFBCBGggA7zxR6NC-m3h-ZT7LQ=.pem","location":"security-state-staging/intermediates/5183544d-1fa9-4601-9ea1-3b4454090cc0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8o6U66RqF4Lhi/AFVcFBCBGggA7zxR6NC+m3h+ZT7LQ=","crlite_enrolled":true,"id":"24008211-7aff-4f54-8d10-3ca632141e41","last_modified":1601517443218},{"schema":1601376732692,"derHash":"rUk9boXsYIq4E6iHvcTUGWoLybM9JWWn+orEMPCKmaU=","subject":"CN=Staat der Nederlanden Autonome Apparaten CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOTA3BgNVBAMMMFN0YWF0IGRlciBOZWRlcmxhbmRlbiBBdXRvbm9tZSBBcHBhcmF0ZW4gQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"13422064a1f73d17cb471aba1692618580819b2905822f628fa9325f4b9e8af4","size":2235,"filename":"QWTrYSKIZOkhPgxgK-ugNhLAYPM-za6OF4Z2NVH_OxU=.pem","location":"security-state-staging/intermediates/f0af33f7-86d7-46b0-8317-bfb72df4322b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QWTrYSKIZOkhPgxgK+ugNhLAYPM+za6OF4Z2NVH/OxU=","crlite_enrolled":false,"id":"2d565bb4-689f-41cd-a84f-c3529232d0d5","last_modified":1601517443201},{"schema":1601376771244,"derHash":"EjXhOBK5dSFwzpvTo7YOZqyMDLRPnMtcdoWJ/Z8nufQ=","subject":"CN=GoGetSSL ECC OV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"a7a310387416fb0d0327af048190b506d023a1f7b0790692246276e1948d468a","size":1244,"filename":"PrR6EH8Bm2wimAptoITpdhgeQfnUp4ASjI8FRS-Bq7E=.pem","location":"security-state-staging/intermediates/bc6d1c2b-c19f-42de-b2ec-11a97b643751.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PrR6EH8Bm2wimAptoITpdhgeQfnUp4ASjI8FRS+Bq7E=","crlite_enrolled":true,"id":"0bc47da0-e7f9-4d90-abc8-4a6d3f0c15c7","last_modified":1601517443179},{"schema":1601376763724,"derHash":"d+rEdkU8tzIlf/FmpevRZWyx9nO2jijfQXdBM5efoqQ=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"af175c34733f44cc96e00555374654c4f4d467bef0feb67039c31a3cd7232ef9","size":1886,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/9b757196-34e5-4a3c-b276-4df8ae32ee65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"2f77cfd2-2ffb-4909-8714-3629bde7ad50","last_modified":1601517443152},{"schema":1601376770407,"derHash":"WaNFbnUOMl/LE1ncKegoGJtJgsEZxk+s/WcocRswUy8=","subject":"CN=www.lh.pl,OU=LH.pl,O=LH.pl Sp. z o.o.,C=PL","subjectDN":"MEwxCzAJBgNVBAYTAlBMMRkwFwYDVQQKDBBMSC5wbCBTcC4geiBvLm8uMQ4wDAYDVQQLDAVMSC5wbDESMBAGA1UEAwwJd3d3LmxoLnBs","whitelist":false,"attachment":{"hash":"402828757f41d8cffb0ca05dbda29cf243d74ac40d69868042f3c4704cefe6be","size":1589,"filename":"SPflJTPfbRg6NWYkxrOaqWFjkUz6d6fxe8POctPyEFo=.pem","location":"security-state-staging/intermediates/9852f8f4-698c-4682-be77-b302a242b445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SPflJTPfbRg6NWYkxrOaqWFjkUz6d6fxe8POctPyEFo=","crlite_enrolled":true,"id":"88fae53f-9c98-4491-98fc-5382066d04ba","last_modified":1601517443133},{"schema":1601376764928,"derHash":"RKFX2TSIYKfUznyS4aOJ5MwMpZZ/nbu9EmY5+bmARrc=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"a954c72f600501a139cda333d4ad599c7d80d5c9a2f820e99b478ea81e4bd705","size":2564,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/9b8b9500-5c8a-4fff-839f-ec8c5225007c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"d45a382a-27a0-4770-bd46-caa195365dc3","last_modified":1601517443115},{"schema":1601376758715,"derHash":"ZLNULRvJcvWKHRefPQuWUr5DTzrjhC4MRHiA1NYjpN4=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"47de0a95895055ce31d99d828b0db0f2ec2817ccee0b1699eac0fc8b4c0d7a15","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/b0359886-f578-4ff8-b6f6-68c9c49ac966.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"565f7b1a-68fa-497d-9c56-e9cd5a86b74e","last_modified":1601517443097},{"schema":1601376718312,"derHash":"y/j7d2YBZ+a6rNDfd82jl9ARfuK+6iO5NTF/i7W147A=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"382e8d24a379c01750353f084bffee84b45ad51b937a3bc8fdb300cd978bbeac","size":1593,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/007ae41e-e2a4-4671-8841-b6c69a70cb76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"c21f9364-fa90-4173-bcc3-ae3c385c1bb5","last_modified":1601517443080},{"schema":1601376737682,"derHash":"qtrdWoedLrjEGolZcpEpJwnUIFL1tjmVQcaUw7c1PNE=","subject":"CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcy","whitelist":false,"attachment":{"hash":"136d10cac076bac0accd9db250939ff676ec4c68b25d282e902afbdd7c69c034","size":1748,"filename":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl_s2uC_CY=.pem","location":"security-state-staging/intermediates/9e4f7a6a-f1d9-42ef-bd0b-185c9c60d805.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl/s2uC/CY=","crlite_enrolled":false,"id":"2bb1ad45-bcec-4adb-b3ed-edb4f01d5b68","last_modified":1601517443045},{"schema":1601376728640,"derHash":"S9FvSVXz88nI6kjvmZUyTaUSFyT4mRXV8skesLrvIzc=","subject":"OU=Public Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MFsxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEnMCUGA1UECwweUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"689c7ab13bb497838c62b566e5da7f914f4cf9354f08643500263bcfb46a32a3","size":2105,"filename":"qMjf0br8Ay71_wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=.pem","location":"security-state-staging/intermediates/c2017a82-2237-4c28-8656-5764f263e185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qMjf0br8Ay71/wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=","crlite_enrolled":false,"id":"a869aa70-b82b-40fc-b8b7-123af99bb58e","last_modified":1601517443027},{"schema":1601376778540,"derHash":"yU/t2k6GCJCFgLx/h7Q04DuyYuQvZMY4IKj1D7F8HOw=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R3,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIzMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"46ad75ae4d4b3ea866008e00969c44fcf11c5283b34097a140d1ce9577c0080a","size":1548,"filename":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP-4A=.pem","location":"security-state-staging/intermediates/ee510c0b-d1d8-40ba-bcca-1982d73cd1cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP+4A=","crlite_enrolled":false,"id":"fa4a1c02-26b3-4bf5-8034-bb4cabca2a73","last_modified":1601517443010},{"schema":1601376724096,"derHash":"TKCAJjzkvCTxgRzvP/rKWl7zmPk+vQxbz1t70LrmfUo=","subject":"CN=BitCert RSA Business Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSwwKgYDVQQDEyNCaXRDZXJ0IFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"a40bf8b9f7a6cc399211e086cb3d8144ff7e721b1e16e5646fdc299974c39bc5","size":2133,"filename":"cz-x3ySlDQ6TKlRCvrhCFabpnRLASgrkOqGv8wQxW6A=.pem","location":"security-state-staging/intermediates/846ca5bb-c701-4333-a9a7-808ec99af5f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cz+x3ySlDQ6TKlRCvrhCFabpnRLASgrkOqGv8wQxW6A=","crlite_enrolled":true,"id":"c8d11d03-f57b-43e8-9309-17aa68d467a5","last_modified":1601517442992},{"schema":1601376762009,"derHash":"qNFOlF4+UVa8rl45c3z2obH1ECi7v5gvUM5fTAVWi00=","subject":"CN=Belgium Root CA3,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ez","whitelist":false,"attachment":{"hash":"27c08a789500d6de5e3c63a5f87e09d913bc798b43f41a68cb3e106a86c3feeb","size":1987,"filename":"x7xeSTcmu_Ux9i_F9VE6wD6tgTr03NRFszBbo9PVM3Q=.pem","location":"security-state-staging/intermediates/5c7c8389-3909-40c6-b8fe-11b4a28455ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x7xeSTcmu/Ux9i/F9VE6wD6tgTr03NRFszBbo9PVM3Q=","crlite_enrolled":false,"id":"c7e38a24-aefc-45fe-a666-c74ab61c8f39","last_modified":1601517442975},{"schema":1601376750124,"derHash":"raGI+DDDE/YEZIjsNB8e1K95PG3CjFhgBEXfvrQWN0Y=","subject":"CN=Thawte CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlRoYXd0ZSBDTiBSU0EgRVYgQ0EgRzE=","whitelist":false,"attachment":{"hash":"2e25caf70d87ee67fe15801e44af860291aeeb44a7970edffe70210cf856c3ba","size":1678,"filename":"Hn_AvJkahgLnROxUs8e4tPKOI2wS-n9H5P_jk0Cf2T4=.pem","location":"security-state-staging/intermediates/e792a27d-66e1-40ac-a2be-d23b05217ef8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Hn/AvJkahgLnROxUs8e4tPKOI2wS+n9H5P/jk0Cf2T4=","crlite_enrolled":false,"id":"2eabd45c-f82e-46d9-84d2-60e3b784ff6f","last_modified":1601517442957},{"schema":1601376781920,"derHash":"JJBRRb2bm/6ZxgNUtJlRvg5wnxY0z70ONw/rnwaO1sM=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"14cdeb20754749b93fa91fc1e30b4e9dfedfb7f4d7022c381688a63321e757cd","size":1674,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/d469a3f0-cf37-44b9-a3bf-95ac5492cd92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"fc237743-155a-442f-b754-e8fba2257bfe","last_modified":1601517442922},{"schema":1601376757069,"derHash":"cDV7nlbT+zxsAJw4xxgUVMRikI37zm1U1g3+HlBuFP0=","subject":"CN=TrustAsia ECC OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzI=","whitelist":false,"attachment":{"hash":"eef7786b39056fba3e747973ce4532b06a0cd3dc1326554703821b55ecdd5eff","size":1406,"filename":"zQ_SLNg_h_U_OTLMb3XQLYnyHZ7Y7Hk6_xyTVTSQekc=.pem","location":"security-state-staging/intermediates/48fd3053-a283-46d0-99e4-f89312258dce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zQ/SLNg/h/U/OTLMb3XQLYnyHZ7Y7Hk6/xyTVTSQekc=","crlite_enrolled":false,"id":"24ff0be6-616b-4ad5-8017-005dbb310bf7","last_modified":1601517442905},{"schema":1601376762852,"derHash":"aLnHYSGaWx8BMXhEdGZdthu9sQngDwXKn3QkTuX19Ss=","subject":"CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwGA1UEAxMlVVNFUlRydXN0IFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"9e2ebbe76bfd34d023064438681d83355a539b5267b279ebe8789bff5deae232","size":1967,"filename":"x4QzPSC810K5_cMjb05Qm4k3Bw5zBn4lTdO_nEW_Td4=.pem","location":"security-state-staging/intermediates/4357dc68-fa1b-4e2f-83fd-69a438b26167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x4QzPSC810K5/cMjb05Qm4k3Bw5zBn4lTdO/nEW/Td4=","crlite_enrolled":false,"id":"637da9fa-bc0c-4f4b-becc-9710f0181efd","last_modified":1601517442888},{"schema":1601376741469,"derHash":"hQSgNQA2sYWUsfR7ajvTUT4osEW8fb/lsI2PMEnNPP4=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"22a1ae9da8ba7c77870bcf18a45bd22acc40f753e2f6febbfb77c1140ac63f95","size":1764,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/b046d24e-cefe-4131-8cfa-17dc7fa261e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":false,"id":"c37666f8-318b-4ea3-9931-8bf0653657d1","last_modified":1601517442870},{"schema":1601376764522,"derHash":"ie/rJQlrpMzUCvT7h1bwpIQ5lZdIIgIJFMToWdkyt/M=","subject":"CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE3MDUGA1UEAwwuU1NMLmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQSBSMg==","whitelist":false,"attachment":{"hash":"c7680e4e47bb04f8515b20fc6fe36741515835bace47ef132f02922b0ea612ea","size":2113,"filename":"fNZ8JI9p2D_C-bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=.pem","location":"security-state-staging/intermediates/a586bb32-1766-40e6-bdd8-ba5e8bf95066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fNZ8JI9p2D/C+bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=","crlite_enrolled":false,"id":"2dea51d4-7fea-4eb2-a507-7fa4ef9b5e26","last_modified":1601517442852},{"schema":1601376724524,"derHash":"yE4TeLl0qZGs3N1zNCHjBh5vohoEkciQK6/eOFXgBj4=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R6,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"bc273edde0aa009fa424378923565ab23426f40d786f1f743e2a80d94c8514a4","size":1902,"filename":"aCdH-LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=.pem","location":"security-state-staging/intermediates/cd783c76-a2d3-49bb-8aaf-dd09ffcf625c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aCdH+LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=","crlite_enrolled":false,"id":"8feb1032-85fe-4d8c-b444-3c69d47c6f6d","last_modified":1601517442835},{"schema":1601376771681,"derHash":"VgCvtrriqDtmucu+nO7I9T4mQgppk5pI3MbVa5l5CmM=","subject":"CN=GDCA TrustAUTH R4 OV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"9212a9d7e5c2bfcfbf43aaf53d8aa2e3501f467ef547dee098ab48f5d850d6ad","size":2052,"filename":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb-nZvgw-0Who=.pem","location":"security-state-staging/intermediates/4aa91fab-6b52-44a6-a3c1-ef65ee1e7d8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb+nZvgw+0Who=","crlite_enrolled":false,"id":"a463b3f5-089a-40a1-ac08-8bb23ab16b4c","last_modified":1601517442818},{"schema":1601376773694,"derHash":"idqttBummLs3iu6E6slhIdIPjC/KY+xobZMHIprT6y4=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"040d9900f833e268067238f80552cbc76f9b4e228c4b60e714c5fae8f85e3ff4","size":1743,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/95a26b1c-0192-4ed1-be8b-87bc4f2afbe7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"587ff666-b7af-4e54-b57e-854a5cbd3919","last_modified":1601517442800},{"schema":1601376738506,"derHash":"n2HQl2jaM/f5n35+rZNZAiJJQ7TJrQe2KfdFwLCEdbc=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"d77ee7751b6c931314693fd1c86891d4a8d25831eb4080427adfd11d77e84924","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/aa0a44b0-c3d8-459e-a78d-df26e5aa1492.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"49fc0d95-3476-4729-bcc9-6946f161d1ed","last_modified":1601517442783},{"schema":1601376765799,"derHash":"2Wy8A7UjzTMVkYZRz0hiFiiH3VY6+yNS0/NLuUV2+T0=","subject":"CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRkwFwYDVQQKDBBWZXJpem9uIEJ1c2luZXNzMREwDwYDVQQLDAhPbW5pUm9vdDEfMB0GA1UEAwwWVmVyaXpvbiBHbG9iYWwgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"522a9129b746a60c4aa7d040da0f639b8349b1fee088f3f0ecf8b8101c7e452a","size":1760,"filename":"v-gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=.pem","location":"security-state-staging/intermediates/98a3c55c-3f5d-4937-9389-3ca882ba85cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v+gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=","crlite_enrolled":false,"id":"62b74836-05bd-4881-9d60-b255969ce226","last_modified":1601517442759},{"schema":1601376780668,"derHash":"gCRH7lIcxmbNt7uuk6OF5V8gDXaj0TVqhURaxMvb7RI=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"0311ba514ea52c161164a44190d3ff8d3f21d7e178936261c9f0f3b873c30bc0","size":1317,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/3b96ff08-978c-47b1-9a08-f7894f3bb801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"cabdabb7-b6b6-4aac-8c2a-c5931f2fc460","last_modified":1601517442729},{"schema":1601376738922,"derHash":"LRK2GaZgzvsBMnGDHYkSE/xDTpgqIVaCVs9OLoYyS+o=","subject":"CN=Starfield Services Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGYMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZpZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"4c84e52a6f32fdac5b7a09a6c9cd30af89415d99ee94c615e420b34e67cffcb0","size":1605,"filename":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6-oP5I=.pem","location":"security-state-staging/intermediates/70be3983-3e8b-4df2-b609-e35f19408bbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6+oP5I=","crlite_enrolled":false,"id":"f9243f28-e9ff-47ba-ae4a-e2657cce028c","last_modified":1601517442703},{"schema":1601376763286,"derHash":"0QjDSljA5KYWRJ+MSDGAI6IpyGzT3dXV/mBBpAHBahQ=","subject":"OU=ePKI Root Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"15e5931fc9e514bb8bf23b5f5c3c40bb3131ccf6ed8b0857416342b002b8db15","size":2645,"filename":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=.pem","location":"security-state-staging/intermediates/a894f5a2-8e74-4828-97c6-41052369ca59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=","crlite_enrolled":false,"id":"056b1bcf-53e9-405c-96eb-eea77dcff395","last_modified":1601517442680},{"schema":1601376720383,"derHash":"BxuLSxOteyvgn91/vfNIJGCDgJjCFRm4OzFQ+OkZgy0=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"aaca8a07803242bef149ceadff6a9f44dbefb42c36b2589988a8a242b9fd78a3","size":1622,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/09507c13-a7e2-48de-8c37-88554ebc941e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"61372f59-c5ce-4c32-958a-7ee04c1dc8bb","last_modified":1601517442652},{"schema":1601376780263,"derHash":"GEZ8TmTVhshEpERm3lunptWWnHqShZpRHF/a11sDzc4=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"6bf1025a0f2a333a3a9f9cf1fa26d326f099cad7c0d6658f30ea16733092bd7a","size":2621,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/c7b2feb5-da29-4802-ba1d-e34f9184099c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"ca26521c-22ff-48b3-bd4d-3c06d4ffa75a","last_modified":1601517442632},{"schema":1601376767919,"derHash":"ps9k27TI1f0ZzkiJYGjbA7UzqNEzbGJWqH0Ay7Pe8+o=","subject":"CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwGA1UEAxMlVVNFUlRydXN0IEVDQyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"3a7503777199e5b45661530654f7276cd82134eaa1ba8f391bb243e5a7a8bf47","size":1386,"filename":"ICGRfpgmOUXIWcQ_HXPLQTkFPEFPoDyjvH7ohhQpjzs=.pem","location":"security-state-staging/intermediates/8b43a741-845c-4f0d-9cb8-04371ae9c724.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ICGRfpgmOUXIWcQ/HXPLQTkFPEFPoDyjvH7ohhQpjzs=","crlite_enrolled":false,"id":"256c0067-d90e-4625-aa2a-4223c14c4995","last_modified":1601517442614},{"schema":1601376752583,"derHash":"n5dERjvhNxR1Tho77PmMCMwgXkqzICj04oMMShsndbg=","subject":"CN=Belgium Root CA2,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ey","whitelist":false,"attachment":{"hash":"6b1177b9cf6d097674388a839e23ad9fe6462ab73ca6a823af4fa3a196083069","size":1293,"filename":"-OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=.pem","location":"security-state-staging/intermediates/68bf58ba-15f5-4acc-982f-48b8b2e021fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=","crlite_enrolled":false,"id":"6f19a71d-8c52-477f-9ad5-ef93aab07c08","last_modified":1601517442593},{"schema":1601376772083,"derHash":"Hd/d+IPjlFsssk+luDeIN5xasFhCKrl532bHdHOYhoc=","subject":"CN=Aetna Inc. Secure EV CA2,O=Aetna Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxITAfBgNVBAMTGEFldG5hIEluYy4gU2VjdXJlIEVWIENBMg==","whitelist":false,"attachment":{"hash":"e6068e6a00cb2a48657b0008e9ab5e6e47917580dc4400c9d7210b278ef98854","size":1626,"filename":"u6NyIqjq8NgZ5VkAyKFRk6mJ-QeTmwgG2SNmXrkK7vE=.pem","location":"security-state-staging/intermediates/0a4750b1-d9fb-4d20-8e86-0a6d40d82ece.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u6NyIqjq8NgZ5VkAyKFRk6mJ+QeTmwgG2SNmXrkK7vE=","crlite_enrolled":true,"id":"d84be73b-937b-4c91-b80e-a6cd1de6e276","last_modified":1601517442569},{"schema":1601376726961,"derHash":"OrvmPa91bFAWtrhfUgFf2Oisvid8UIexJ6YFY6hB7Yo=","subject":"CN=Cloudflare Inc ECC CA-3,O=Cloudflare\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBFQ0MgQ0EtMw==","whitelist":false,"attachment":{"hash":"aae889b11427ea641ba5e6fa121be2cea21baf4f6c6e3a4a24696fb45f974223","size":1378,"filename":"FEzVOUp4dF3gI0ZVPRJhFbSJVXR-uQmMH65xhs1glH4=.pem","location":"security-state-staging/intermediates/27a31a42-feae-47ff-8d4e-647a896f9508.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FEzVOUp4dF3gI0ZVPRJhFbSJVXR+uQmMH65xhs1glH4=","crlite_enrolled":true,"id":"de14e899-d269-4989-b43a-525c56a62193","last_modified":1601517442545},{"schema":1601376751778,"derHash":"nHgvawVYrcscye+EUyDRRZLJIg/PADDAmA2ddTsGYk8=","subject":"CN=International Hellenic University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE7MDkGA1UEAwwySW50ZXJuYXRpb25hbCBIZWxsZW5pYyBVbml2ZXJzaXR5IFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"3b0bf8066566b2050bb810100d606b335370d03d1252c58e445985c84ba0a8df","size":2954,"filename":"i3AYNFBcJ3BXrQRfRHmas7YdtYYMFl9BDRWLHPQMDXo=.pem","location":"security-state-staging/intermediates/6d2a3494-4259-4df1-9701-4a86ccae3824.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i3AYNFBcJ3BXrQRfRHmas7YdtYYMFl9BDRWLHPQMDXo=","crlite_enrolled":true,"id":"dcc6fefb-dd5a-48f0-8fbf-f8c7a8ac06c0","last_modified":1601517442525},{"schema":1601376783522,"derHash":"MHiREhT4haTna0lROE9TIsM8ob88aIrPA0f0M6bna4s=","subject":"SERIALNUMBER=201604,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDQ=","whitelist":false,"attachment":{"hash":"5a2eb7557029c21a2d0310c86e2ae8eae55e2e98cbf96fd1eb53a71127e8eddf","size":2093,"filename":"4Seg4lVqXNpRcFpI-CnyaEL9ZiJxhk3QwyO0AUdDDGo=.pem","location":"security-state-staging/intermediates/705294e3-5b5c-4fee-bb7f-2e84dfea46f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Seg4lVqXNpRcFpI+CnyaEL9ZiJxhk3QwyO0AUdDDGo=","crlite_enrolled":false,"id":"0911d5fd-fce5-4da1-a223-d8a576f29a50","last_modified":1601517442507},{"schema":1601376762446,"derHash":"wKV48hCeb0LT2TmUje6rcpsg97I7Qjer2ElN9VTPmFw=","subject":"CN=emSign ECC EV SSL CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEiMCAGA1UEAxMZZW1TaWduIEVDQyBFViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"853ba62a0ec592eb9c2ee33d281011227250af71cdcbf9b0e894d233249115ca","size":1138,"filename":"UEYlLVSYKuv5nRGqAxngK1P6jpyy3oyLZGnFpQIPQFk=.pem","location":"security-state-staging/intermediates/81418df8-ee8d-48b2-804c-11c4866e8e31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UEYlLVSYKuv5nRGqAxngK1P6jpyy3oyLZGnFpQIPQFk=","crlite_enrolled":true,"id":"b968e489-d60c-472f-8f60-2e7fcd90e869","last_modified":1601517442490},{"schema":1601376772898,"derHash":"30vyBMyAZ3PtfRBa9IgwZqsmrcIpI5HJjnnXENGbT2c=","subject":"SERIALNUMBER=201409,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDk=","whitelist":false,"attachment":{"hash":"fb73c5f85843cf6be0d3dc997db1b00003baf1f7b523e507ab38c78a333f0449","size":2093,"filename":"2BoYdyaSF9u3Rypv_R3GF6bqtEh-S4UwMsMm_WkvQLU=.pem","location":"security-state-staging/intermediates/5b0bc508-a430-449a-a37a-7b1bc3209fc3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2BoYdyaSF9u3Rypv/R3GF6bqtEh+S4UwMsMm/WkvQLU=","crlite_enrolled":false,"id":"a23d52c7-7936-41be-8f46-9e9ca4464caa","last_modified":1601517442472},{"schema":1601376718715,"derHash":"DnpJwCo8FPnGvBbDgYBHXCOzPV6xp50OjHhUK8GxD0I=","subject":"SERIALNUMBER=201702,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMg==","whitelist":false,"attachment":{"hash":"0837b1571241ef7e3c08a48093f8379ebfaf41141ba72b772e9ec14261bd34c6","size":2154,"filename":"H5gPRidS80eiZb-FQHKd8rMNDdv3rm1Hm6AIX7qvyAo=.pem","location":"security-state-staging/intermediates/64a9cc69-47c4-483d-98c5-99e00158e56a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H5gPRidS80eiZb+FQHKd8rMNDdv3rm1Hm6AIX7qvyAo=","crlite_enrolled":false,"id":"e82dfd35-d2d7-4663-a2a3-40a07ad942ce","last_modified":1601517442454},{"schema":1601376758315,"derHash":"2df9kLkOwYhr3PZVGVWc1V7sP6qJstQbeVxOpLl2A14=","subject":"SERIALNUMBER=201607,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDc=","whitelist":false,"attachment":{"hash":"acacd408aa018f6c76af5f4a18d599c644b9f2353cc079074462f31ff777ec42","size":2093,"filename":"pRg9cPl95zPK0qA68ddGKi1dmweMxXLMBYHiTX7n4J0=.pem","location":"security-state-staging/intermediates/cbebd73e-a2be-4ca9-a531-bcc305c4ded0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRg9cPl95zPK0qA68ddGKi1dmweMxXLMBYHiTX7n4J0=","crlite_enrolled":false,"id":"41592bd5-4e42-443c-a3aa-aeb0ed864faf","last_modified":1601517442430},{"schema":1601376726155,"derHash":"vWKNNkRXh8p3Y3Sp/iUxdo9oiGory9001zewcCgONOY=","subject":"SERIALNUMBER=201503,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDM=","whitelist":false,"attachment":{"hash":"220be85a912b82c555c282848b582b9dccd3f786353662d697b99074d3e0b874","size":2093,"filename":"fcwvxBR_7dywvrrGWH54w2I5o2MWZNZJurHDsiPXY1w=.pem","location":"security-state-staging/intermediates/1edb624f-4dfa-4eee-ba74-aa6a7155be76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fcwvxBR/7dywvrrGWH54w2I5o2MWZNZJurHDsiPXY1w=","crlite_enrolled":false,"id":"f4f52d98-123a-46df-aeb4-6bfb8e484b5d","last_modified":1601517442391},{"schema":1601376779391,"derHash":"ReTBVe5IzKO/un0ggVB9lyAY6CKrqe3TREzAHdxMNCk=","subject":"SERIALNUMBER=201606,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDY=","whitelist":false,"attachment":{"hash":"0b8d76856fea354ea3c15ce6b88596f1684f7b7387bc2ef5bed74a1eed5eba50","size":2093,"filename":"QGnVUqqcNoQM84XsWCS5GovEHtb29uveMcAlBBZfXVY=.pem","location":"security-state-staging/intermediates/7c1bc0de-34b5-4fd5-946f-1da949e8371d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QGnVUqqcNoQM84XsWCS5GovEHtb29uveMcAlBBZfXVY=","crlite_enrolled":false,"id":"3dcf2d07-f7f6-450b-a888-b59d9c81fd99","last_modified":1601517442372},{"schema":1601376721639,"derHash":"oryx6FI/uyO5onevoLZ9ouYemti6wbkmpzOhrgfGfN4=","subject":"SERIALNUMBER=201404,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDQ=","whitelist":false,"attachment":{"hash":"85b83278cf6fd8d7e7662c4b50b777a2eee40d98edd6ea3566189611dc182e4f","size":2093,"filename":"59ldQ4_B5SEeeY5yyNfRUTT2h15K2xW1KqgBu6OoBU8=.pem","location":"security-state-staging/intermediates/053dea68-1653-4891-b126-132054c21dac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"59ldQ4/B5SEeeY5yyNfRUTT2h15K2xW1KqgBu6OoBU8=","crlite_enrolled":false,"id":"d77a4a26-a8a9-49c6-993f-e5713bcb231a","last_modified":1601517442355},{"schema":1601376722839,"derHash":"9vFZKGoUAd5Tl+IaAJBTSoX157n5j9SlpHsd/9S/3tQ=","subject":"CN=emSign EV SSL CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIEVWIFNTTCBDQSAtIEMx","whitelist":false,"attachment":{"hash":"6e8a3c81fcf028c7f31ff8a6ecf47b000e0c56f86618ee42c5ab92b7dd438a5f","size":1581,"filename":"bJpaGvT-ExoQi2_an1HG3Mo5yMrot02ORyF_NS5p5J8=.pem","location":"security-state-staging/intermediates/586120f4-7f7a-48aa-a621-1d452827f4f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJpaGvT+ExoQi2/an1HG3Mo5yMrot02ORyF/NS5p5J8=","crlite_enrolled":true,"id":"219bee21-4e35-434a-b98f-7a9cdbbf3432","last_modified":1601517442337},{"schema":1601376759122,"derHash":"s0pHXAGVUDWHE+0DXqAsXtw6ObL9X8ZOR+jsDM4frx8=","subject":"SERIALNUMBER=201708,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwOA==","whitelist":false,"attachment":{"hash":"f375406a2b6f58568b6c858fe21f9d564d1cf55fc594234237157747a4d3dc92","size":2154,"filename":"kLOxxy10NQkrCrh2qL5R2g-yx6mjlkwYCq44XF4JDnE=.pem","location":"security-state-staging/intermediates/eaee698e-518e-4ca6-a425-60d3f01f6de4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kLOxxy10NQkrCrh2qL5R2g+yx6mjlkwYCq44XF4JDnE=","crlite_enrolled":false,"id":"0ed3dc2d-dec7-4eef-8b35-a119fd18862e","last_modified":1601517442320},{"schema":1601376753803,"derHash":"B3Q+mECXm+IlPnqICW3y2MTs4PpbrIWs1gujtNtNijw=","subject":"SERIALNUMBER=201608,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDg=","whitelist":false,"attachment":{"hash":"8c0cbaae9526908b6f5e7c40992af9d535a7001ef6d181f7e72c214e621c827d","size":2093,"filename":"db1FmZo_iQKRN_DoaJ1EqbHbAgjTFPseNUqd5epdDlQ=.pem","location":"security-state-staging/intermediates/0c410741-518e-4f46-b761-90c573b9d339.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"db1FmZo/iQKRN/DoaJ1EqbHbAgjTFPseNUqd5epdDlQ=","crlite_enrolled":false,"id":"a37c7a69-bb5b-45df-95df-cc27e5d2d7bf","last_modified":1601517442303},{"schema":1601376737259,"derHash":"AqetTdXgue/AlzaNn8xQd7ibDy4tbqfOJ1EreP4jLcw=","subject":"SERIALNUMBER=201605,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDU=","whitelist":false,"attachment":{"hash":"5587fb6a2f9d49ffcdca5e46b1f4fe6990b3720eab5f405fa5c274655c54845a","size":2093,"filename":"mxzmcEmVZ7pbwgyakCsaNfIs0nO1a2ATXlWM3YDPSv4=.pem","location":"security-state-staging/intermediates/79266315-a547-48b7-8a8c-539dd98c4c81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mxzmcEmVZ7pbwgyakCsaNfIs0nO1a2ATXlWM3YDPSv4=","crlite_enrolled":false,"id":"0d05e044-702c-45d3-ad6f-6da64708138e","last_modified":1601517442285},{"schema":1601376778129,"derHash":"uvdk/pz9nDFLuXaGQbRcOhu6U1hqeqbdAUy2wJ+aBSA=","subject":"SERIALNUMBER=201503,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMw==","whitelist":false,"attachment":{"hash":"3e033e3994ee02f690af4a6e1dfc41b5ff5533912cf4d56880cb72398af497c1","size":2097,"filename":"XfHlidGGDVVOgzjUprEw8aIeQxYbnmOME26_9SaNpvE=.pem","location":"security-state-staging/intermediates/3d07716f-e548-4635-91fc-532fccbbb2d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XfHlidGGDVVOgzjUprEw8aIeQxYbnmOME26/9SaNpvE=","crlite_enrolled":false,"id":"9fd8a38a-216f-4d8b-9d09-d79bf14e30ed","last_modified":1601517442268},{"schema":1601376740238,"derHash":"ZfceS8/y742OALVAFT3EYctgLGFdSf89kSCbOHscJgo=","subject":"SERIALNUMBER=201703,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMw==","whitelist":false,"attachment":{"hash":"fcbdbb96bf0df55e19f16d9601414e7c0338df1eeef0d6de6ab4deffe63f2581","size":2154,"filename":"6rvgeyqeTZZdXHb3Ou7zqzk6_NHxF5QuumcKoawuk7k=.pem","location":"security-state-staging/intermediates/86de0db1-1ca7-46ac-9cfb-412953f84176.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rvgeyqeTZZdXHb3Ou7zqzk6/NHxF5QuumcKoawuk7k=","crlite_enrolled":false,"id":"293c6349-ae54-4ddd-8603-df8d4e0ff284","last_modified":1601517442250},{"schema":1601376719105,"derHash":"4KM1mSv89KKXon0Q/9nLnuCZbnxUiK2o2ureNFAlA7U=","subject":"SERIALNUMBER=201602,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDI=","whitelist":false,"attachment":{"hash":"8ed8c59d6f248090b9615d90830669f44c25dd87c173570e90df02cfb884effd","size":2093,"filename":"xoEAoF10JcsljWhXiwKwqchikB5LpWs5WsK8af_smGc=.pem","location":"security-state-staging/intermediates/a59db986-6cba-48b5-a4e6-31308dca10db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xoEAoF10JcsljWhXiwKwqchikB5LpWs5WsK8af/smGc=","crlite_enrolled":false,"id":"249e5ad1-b304-4642-91e7-fdeb791315f6","last_modified":1601517442232},{"schema":1601376744368,"derHash":"cQtQSTgw21Uk2z0n4hl2Yq3xl29x9TZLtA/f+EIFw7w=","subject":"SERIALNUMBER=201603,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMw==","whitelist":false,"attachment":{"hash":"4c9149541b8e9c4b674fa0ff33d8df3025f88a01f50933c9da4d3b40e69c096c","size":2097,"filename":"XBQTAIj5aGw-bAbL6VUInxFeRnki1PNjhKhT0LcTGrY=.pem","location":"security-state-staging/intermediates/f9479f29-2c37-41fa-8851-de53e17e6b8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XBQTAIj5aGw+bAbL6VUInxFeRnki1PNjhKhT0LcTGrY=","crlite_enrolled":false,"id":"abd3813e-1fdc-42f4-bf74-e1c2cc8aeaae","last_modified":1601517442215},{"schema":1601376748866,"derHash":"p0//9ShHGQU4UHOt85lwGbJvT68kvOkQKicuekSE5Lw=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gRFY=","whitelist":false,"attachment":{"hash":"e2655aaf6aee7659f46b6845d4679fe00f2961d4f982179edfe793575137f826","size":1837,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/2f0964e2-f735-4725-9e68-4346c3123587.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"d7891a3b-bf82-49b7-8ef7-c041d57dde7a","last_modified":1601517442198},{"schema":1601376760753,"derHash":"ivthwh4w3DDI9gwHsHg7nu0GhtyurJElhz/XyqjAvlw=","subject":"SERIALNUMBER=201603,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDM=","whitelist":false,"attachment":{"hash":"3d028d5c255fc3a1068076848710da8b3f843a8758c47228b6ac0486ac903f72","size":2093,"filename":"VaNDp0-GOXKCK5DMQUXXYJaetuE09YpOUENU9PNhSQY=.pem","location":"security-state-staging/intermediates/f4ae12b2-8eaa-4573-84c2-ed92fcac954c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VaNDp0+GOXKCK5DMQUXXYJaetuE09YpOUENU9PNhSQY=","crlite_enrolled":false,"id":"6a26c541-441f-4996-9f72-a867fe62b81f","last_modified":1601517442181},{"schema":1601376761610,"derHash":"+RqsoOTlM3R6CIC/z28mcg3B0FSUw5ONpoAikNWgmzI=","subject":"CN=emSign SSL CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFUxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEbMBkGA1UEAxMSZW1TaWduIFNTTCBDQSAtIEMx","whitelist":false,"attachment":{"hash":"371dbaddc94c282e8343a28dc05dcb74778a143ee818d5884a3116b27bd5028b","size":1577,"filename":"Vu8rCm62GhPpPUIskAEOlG-x_WJEzc46NqUrWffwTVo=.pem","location":"security-state-staging/intermediates/5c3885bb-cc4d-4eb7-8b65-2d767339453e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vu8rCm62GhPpPUIskAEOlG+x/WJEzc46NqUrWffwTVo=","crlite_enrolled":true,"id":"40ee5283-fd3d-4e3c-9d19-0ac5439365bb","last_modified":1601517442163},{"schema":1601376723649,"derHash":"+BdppSTluWI+F/P111gfpKQZKXf/TiRX+wAyONz2BBA=","subject":"SERIALNUMBER=201601,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDE=","whitelist":false,"attachment":{"hash":"af582fa89b43c20eb4a7f6f2c88ded4c302410d4af719b9206186aba8336ed67","size":2093,"filename":"84Za4kYwrRkyQwGdAI_OxURzEVfnTxcOpAabMr7iKM0=.pem","location":"security-state-staging/intermediates/7905a8bc-173d-40e7-92ed-b4a494401b4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"84Za4kYwrRkyQwGdAI/OxURzEVfnTxcOpAabMr7iKM0=","crlite_enrolled":false,"id":"37d95d8c-3513-4a11-b930-b8f47cf74952","last_modified":1601517442128},{"schema":1601376725753,"derHash":"GUrT6FS2tXfbgMnlg73fLap/gIFmmODMhRoAdoB9i5Q=","subject":"SERIALNUMBER=201709,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwOQ==","whitelist":false,"attachment":{"hash":"e13f921d77416a5ba55814e3a229c8b50d66c523580816ae7194e8c46cb533da","size":2154,"filename":"91_yXUHhaE8XQE7T4qtIwHduKC0gNiCwyt7acKtcMCg=.pem","location":"security-state-staging/intermediates/d1d09664-4aea-44d3-b3bb-521febdd9266.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91/yXUHhaE8XQE7T4qtIwHduKC0gNiCwyt7acKtcMCg=","crlite_enrolled":false,"id":"06523722-fbe4-4e54-ad81-768c08b9b3a7","last_modified":1601517442111},{"schema":1601376745190,"derHash":"oGHURTmXFMOPwQGm6a+9s4HxEvpd59W8FJBFWNHtMnY=","subject":"CN=emSign ECC SSL CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIEVDQyBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"8c77ffa9b893c57610bd16e4953c97a408efab95236b88e9a574f1475ed5146e","size":1134,"filename":"TPymzs2gSTCnRzT83dxpTHxfGl2tdQ9snhCfXXcejy4=.pem","location":"security-state-staging/intermediates/86a79f6f-14ab-4ade-a0ec-33f05a4994dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TPymzs2gSTCnRzT83dxpTHxfGl2tdQ9snhCfXXcejy4=","crlite_enrolled":true,"id":"5dc47e36-cabd-43eb-ac61-417a710e88b8","last_modified":1601517442093},{"schema":1601376731471,"derHash":"a2qdHAN/d/qodOYQmkk/H4QJXB0VJNvihhjaSIdhtTA=","subject":"SERIALNUMBER=201610,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MTA=","whitelist":false,"attachment":{"hash":"acd0c347136ab560467f0971b7ba00b91a4f2ccf988d106e3712504bf18965f0","size":2093,"filename":"pPTKMyEFXY56k6Lx4t1g9b9VGfP81txv-Nmof3ELcXw=.pem","location":"security-state-staging/intermediates/ccc3a418-512b-4930-99d5-de8e5dd2f210.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pPTKMyEFXY56k6Lx4t1g9b9VGfP81txv+Nmof3ELcXw=","crlite_enrolled":false,"id":"a9d83d3b-fca9-4ea7-a503-58b614621e5b","last_modified":1601517442076},{"schema":1601376784332,"derHash":"J09FXfZsfa8EPXoj2Lb6tanx+PxchSe3yUybxFyoyac=","subject":"SERIALNUMBER=201602,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMg==","whitelist":false,"attachment":{"hash":"f3bbe5d03f98b86af0a98a1d89517f05aec2aebd9dc847f1545502d7af308d1f","size":2097,"filename":"BOBA5Twm4mitveGSW5FDlhbrXAX2Nzp9tI149Ez2o68=.pem","location":"security-state-staging/intermediates/e20288d5-796f-41b7-9189-9086d9e97ace.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BOBA5Twm4mitveGSW5FDlhbrXAX2Nzp9tI149Ez2o68=","crlite_enrolled":false,"id":"5798e19f-2072-453b-ad44-339f57379ab4","last_modified":1601517442059},{"schema":1601376735177,"derHash":"mwT9+YEhXzUdwOyFrh+BZZ/LSpo/5/nhq2IYovNuj64=","subject":"SERIALNUMBER=201703,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAz","whitelist":false,"attachment":{"hash":"1710c12d6adc6eb6e5a43eca12c2013dbe3a7eae7e9c830428ac3cc4377eeaea","size":2158,"filename":"LuxKcz3x6blC_Nkgqe95wYedyrYHgwj9WLLOX_aAPig=.pem","location":"security-state-staging/intermediates/33864ab7-757a-4de4-ab78-3ef8d1052e1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LuxKcz3x6blC/Nkgqe95wYedyrYHgwj9WLLOX/aAPig=","crlite_enrolled":false,"id":"06266cbb-b88c-4fad-8490-7408e17e2488","last_modified":1601517442042},{"schema":1601376774903,"derHash":"gKw1KTCHW6Cv5/cN04kTDI4ee+/9yWR3NWrSqeADrSs=","subject":"SERIALNUMBER=201710,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcxMA==","whitelist":false,"attachment":{"hash":"3af89870b8cd5676b0650cc634057a2d93e3823dd927c33ebc945573081a928a","size":2154,"filename":"ZCLFrfNE0YmOMDXn8TdGm9cXS6EtB4A-rRuWgSitNdg=.pem","location":"security-state-staging/intermediates/52e7a4e1-eb06-4a43-a509-8d6dbf521484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZCLFrfNE0YmOMDXn8TdGm9cXS6EtB4A+rRuWgSitNdg=","crlite_enrolled":false,"id":"f80d87d6-b1f3-44c6-857b-f6828b862fdf","last_modified":1601517442025},{"schema":1601376732293,"derHash":"kZ6sPkYMJraGLxPDpVgue6CI/MIUKOd98A7reCcaKas=","subject":"SERIALNUMBER=201701,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAx","whitelist":false,"attachment":{"hash":"263b1f66d8d54d280867fbc124be5a36fe7a73a5820533e7e232dbee9643c4e9","size":2158,"filename":"nQ35mJfWCjba_vijrSnf88AaEOz5U-zNipRR1TZQkSs=.pem","location":"security-state-staging/intermediates/1a6c42f3-a4b3-4fd3-9fc8-9572f932ddd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nQ35mJfWCjba/vijrSnf88AaEOz5U+zNipRR1TZQkSs=","crlite_enrolled":false,"id":"f0037444-3d10-48ef-b661-fb3d87999e3e","last_modified":1601517442008},{"schema":1601376756663,"derHash":"D20/jpLBQygVbG/pPPL4yqOZNfWAt3/qGbkz6UE2D0E=","subject":"SERIALNUMBER=201701,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMQ==","whitelist":false,"attachment":{"hash":"13316f9b8a81c37d912c95bab9b1a75fe27e85c4e78bdc8565dbcc0b0e4a1556","size":2154,"filename":"EB_ThksEnKMJ2YVoHHvY5XyMHTzvC2P_L5G9CrSyfnE=.pem","location":"security-state-staging/intermediates/2c971077-3395-468f-85b2-6e07cfc04c2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EB/ThksEnKMJ2YVoHHvY5XyMHTzvC2P/L5G9CrSyfnE=","crlite_enrolled":false,"id":"ad12ea65-7f92-4b32-a337-6b02ee3bdc0c","last_modified":1601517441990},{"schema":1601376733494,"derHash":"g4jwUGW1mD+TLCvi5UiYTfca4H9susMxtkj1KIs3DXQ=","subject":"SERIALNUMBER=201702,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAy","whitelist":false,"attachment":{"hash":"3676002f43efd0a0bf3b10e582b3755e5da23bce4442ce825d14540454c25e29","size":2158,"filename":"lOlKIyhajdx1Pv_UumL8AwhOIVSEc53cII6qCgzybVk=.pem","location":"security-state-staging/intermediates/f2aa5a07-7a1e-48fa-8dc8-77b88c525caa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lOlKIyhajdx1Pv/UumL8AwhOIVSEc53cII6qCgzybVk=","crlite_enrolled":false,"id":"b5fe7e45-4ee5-4d6a-8d20-7acc5f32c0d1","last_modified":1601517441972},{"schema":1601376722047,"derHash":"Ifxe6PnsM7qGAumyFnKblorF6ZfHAF+D5rIfjUkAuT8=","subject":"SERIALNUMBER=201707,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNw==","whitelist":false,"attachment":{"hash":"35d1b042d6b7f4876f0915a8b07bd424360c27093aa293ef221b3d067ade827e","size":2154,"filename":"3kBEsS8bJGqOcdSGOBcn3v3kGJVLwDpOs47luWkYCHg=.pem","location":"security-state-staging/intermediates/30760870-3ab9-4763-86af-d783516015c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kBEsS8bJGqOcdSGOBcn3v3kGJVLwDpOs47luWkYCHg=","crlite_enrolled":false,"id":"c8211913-3fd7-4bd5-88bc-38fcb5a06beb","last_modified":1601517441955},{"schema":1601376752186,"derHash":"CV6Eg9E+kLuL0koueaWte/Gps0k99ipIGnUdR7BE8TM=","subject":"SERIALNUMBER=201601,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMQ==","whitelist":false,"attachment":{"hash":"d9a2af818638a1d86ad680c36ec904451911a7e715805edacb13ea0adc0866f2","size":2097,"filename":"RBcL06ULAF8SGk-hJRdj-ieBrxnrfENSen5Fejc3mXI=.pem","location":"security-state-staging/intermediates/fbe2a61c-6afe-4a84-9f3f-82ca320cd112.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RBcL06ULAF8SGk+hJRdj+ieBrxnrfENSen5Fejc3mXI=","crlite_enrolled":false,"id":"29ab9c28-65b1-4b04-92fa-c1216ae03460","last_modified":1601517441938},{"schema":1601376739342,"derHash":"MI5DTr7hlojys3UPsyH/9pGwT90OIF+zYmurAU8gAvU=","subject":"SERIALNUMBER=201609,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDk=","whitelist":false,"attachment":{"hash":"f458b0f2c2365915054245f4299cac76f566e47f974c119a5ff84df844025876","size":2093,"filename":"KRgOg6mRpaWoXbaKdK3GrcmjYXMv-Efv_xGeSRFTYTY=.pem","location":"security-state-staging/intermediates/cf87470d-e1e4-4f10-acd2-3ff10bed17e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KRgOg6mRpaWoXbaKdK3GrcmjYXMv+Efv/xGeSRFTYTY=","crlite_enrolled":false,"id":"c1ccd3a8-0060-4e25-932a-6cf5aca04875","last_modified":1601517441921},{"schema":1601376724920,"derHash":"4KSpHFCvxPss7N60HtjK5yvwFE+w1ii0k/6sUREg/XM=","subject":"CN=Atos TrustedRoot Client-CA 2013,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTMxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"8f4098af61d8dad073dd0771e4efd2ee78f3b9dde5b20990c03fe1075bdd678a","size":1561,"filename":"x1544Iz8YLSNjqF0CQ1JdKEkifn0AZ3h_QZt_MioExg=.pem","location":"security-state-staging/intermediates/92c082b5-f8f5-4f02-a1a2-d0a7112d4a35.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x1544Iz8YLSNjqF0CQ1JdKEkifn0AZ3h/QZt/MioExg=","crlite_enrolled":false,"id":"8b0d5b38-6f90-4466-8606-bde07a3e12e8","last_modified":1601517441903},{"schema":1601376745997,"derHash":"a1HR3PTreu5CQYXLG5WAV0s5y5Y4Y94+wa0x3bB2zp8=","subject":"CN=emSign ECC SSL CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gRUNDIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"89e969a3a81606f2a36171383c4b70f380c4613a543363e819611910547c8eca","size":1183,"filename":"9O08XqhJ4GK5qjGNH9IY24XQxhGv8dsFbbZDBPNw1xA=.pem","location":"security-state-staging/intermediates/7b91ca89-e860-4ed9-a170-78aaec18ecf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9O08XqhJ4GK5qjGNH9IY24XQxhGv8dsFbbZDBPNw1xA=","crlite_enrolled":true,"id":"ed563635-4e2d-4c84-83bd-179c24abeb41","last_modified":1601517441886},{"schema":1601376741893,"derHash":"QzTusswRT4K+5vin5a6gOkLrLh9wy9ZhAuQU1y8AM7k=","subject":"CN=emSign EV SSL CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRVYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"d1a4e2a86d82be89bc5a8cdd12e0721917280f6b41222ff230bfd34bde486b4d","size":1626,"filename":"uyublT6SsX3mh_3EIO2_Tv5ftRcL40wCzJ0G9rOjYKE=.pem","location":"security-state-staging/intermediates/ba44d28c-de08-40a9-a1e1-21782eca68cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uyublT6SsX3mh/3EIO2/Tv5ftRcL40wCzJ0G9rOjYKE=","crlite_enrolled":true,"id":"c280c564-6ffb-47f0-ab87-127727d076a0","last_modified":1601517441869},{"schema":1601376773300,"derHash":"lW2vVrCgKjNqJ3dk4Pu/slaFZTHPap3udG2dYhsTG/M=","subject":"SERIALNUMBER=201406,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDY=","whitelist":false,"attachment":{"hash":"30638046bea6f155841dc365c841daedace83b0ded20d9c17bd46f73824c7891","size":2093,"filename":"qRU5F6qy_4wyi4HARkT-CYod607PlhyQSnMiBSD98fA=.pem","location":"security-state-staging/intermediates/2338e82d-fbfc-4bac-9e6c-1c5bb39b6e12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qRU5F6qy/4wyi4HARkT+CYod607PlhyQSnMiBSD98fA=","crlite_enrolled":false,"id":"56faeaf3-53f6-4608-ba25-57843acf584f","last_modified":1601517441851},{"schema":1601376770828,"derHash":"J/ob5PS1ahQqR6VqfpS3JQIFm0Ai5GI+dIyh7xUc8iI=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,OU=VALID SSL EV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIEVWMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"bc6b910f331f4825a9cdbd16a2115b7223ea010714fdf6974ca9412bdffc09e0","size":1886,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/e338d07c-10d0-4444-bd57-e0078726ad72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"4a1b6514-22ff-49a9-be43-c6c364cbf909","last_modified":1601517441834},{"schema":1601376777737,"derHash":"ng7HCFncHr8Sc3agy/QGZVkzOJrRyZ9dDHHOcdkYaPw=","subject":"SERIALNUMBER=201512,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTI=","whitelist":false,"attachment":{"hash":"2484239d7a2b9e714612b99b1585d4488fa991e4441f3486e7199d6c718ecf77","size":2093,"filename":"QRGGHe2oDxCAjDkdNzdV6-xL36aDt6GV-GXVtBEkosM=.pem","location":"security-state-staging/intermediates/d2820bde-3f75-43bd-aead-4f4865442d63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QRGGHe2oDxCAjDkdNzdV6+xL36aDt6GV+GXVtBEkosM=","crlite_enrolled":false,"id":"0aa43ec4-32c2-47e5-aca1-d8075618de6d","last_modified":1601517441817},{"schema":1601376783115,"derHash":"5szJZRkoFxFKRGHEz+3DRFPewb3mOXDOIaZC+8OPujA=","subject":"SERIALNUMBER=201502,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDI=","whitelist":false,"attachment":{"hash":"428f2f9a51942c06ebed0f13b6c1f503c537da14065e552cddd6dc3aef00db50","size":2093,"filename":"59nRM6JR4L01zd4twLB_PFOYuHBhNCUYvIjVMyinlIE=.pem","location":"security-state-staging/intermediates/4ed92c45-caac-4b1a-910e-039ddc0393a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"59nRM6JR4L01zd4twLB/PFOYuHBhNCUYvIjVMyinlIE=","crlite_enrolled":false,"id":"369fd6ef-b877-41c7-a13d-85f997662997","last_modified":1601517441800},{"schema":1601376731860,"derHash":"lSP+dqG/dVGSFdLN6frnvBIqlbLZjw73XFL7Z48V2hI=","subject":"SERIALNUMBER=201405,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDU=","whitelist":false,"attachment":{"hash":"8a4bc54af51cb4e07200000c701dd8192e248fb98c77aeed37be83fcb14a6943","size":2093,"filename":"a5V9lhZQ8dgRturcVZOVCxuSonandHuH6Jgt6Zy0QIY=.pem","location":"security-state-staging/intermediates/e73b1326-10ed-4674-be98-cbfab7ab8b6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a5V9lhZQ8dgRturcVZOVCxuSonandHuH6Jgt6Zy0QIY=","crlite_enrolled":false,"id":"6b0f74f1-9348-4005-9a02-0991e4735ed4","last_modified":1601517441783},{"schema":1601376735991,"derHash":"Sg4PMPotGIaQ+cdSU6AXGV8hY+RcCQz10rc8YsRJp4I=","subject":"SERIALNUMBER=201407,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDc=","whitelist":false,"attachment":{"hash":"5eb830f3bd31118690d65594afbb9d6640f7fc39f7779806e57b7d09787ce1ac","size":2093,"filename":"6t5RgbwqR17MdH8G9oKG0nuWGXrgv23l5Vk707xd_w4=.pem","location":"security-state-staging/intermediates/bdfc8266-4f92-4d83-83b4-7e16937c5af8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6t5RgbwqR17MdH8G9oKG0nuWGXrgv23l5Vk707xd/w4=","crlite_enrolled":false,"id":"f99a3ff4-5bf0-4cd9-9dc2-1453caa92464","last_modified":1601517441765},{"schema":1601376729849,"derHash":"KgB0N17Gt742elO3btlKaNRfUQdgy3+eDPkjFK/7oqA=","subject":"SERIALNUMBER=201706,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNg==","whitelist":false,"attachment":{"hash":"34a1c01e6ea7d6294b23196003905fcfcd0afb39a48726902fe069d5692be888","size":2154,"filename":"P8H4tWILrwuL6Uguy479T0QJ1pdTn_DRNH-qJIbwJlc=.pem","location":"security-state-staging/intermediates/48234e98-f00e-4cf2-a19d-5f44294aaa12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P8H4tWILrwuL6Uguy479T0QJ1pdTn/DRNH+qJIbwJlc=","crlite_enrolled":false,"id":"ac01d2c3-ff22-4dd8-be8d-65f3d74f33c2","last_modified":1601517441748},{"schema":1601376776109,"derHash":"588SO/NMrj+IToDLEAuXJEsdOkWUTSoROUuZXEuPgSg=","subject":"SERIALNUMBER=201408,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDg=","whitelist":false,"attachment":{"hash":"33e224fe32c39a932baf3f274d5afc7e27a5bc5193dffb4623b01db89c667fc2","size":2093,"filename":"hQIjsSxVvTiuqkpzyrXb6OAXsPacyApugghiaf0blNQ=.pem","location":"security-state-staging/intermediates/45fa3321-3de9-45d6-9f73-917714717124.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hQIjsSxVvTiuqkpzyrXb6OAXsPacyApugghiaf0blNQ=","crlite_enrolled":false,"id":"60ec0b65-adf0-4bf9-a827-5a07e599f184","last_modified":1601517441731},{"schema":1601376735592,"derHash":"ARbxf5fN70reLmPPLBsGT9mfQE0rkUEAvCQfB4GFMyM=","subject":"CN=emSign ECC EV SSL CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG0xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSIwIAYDVQQDExllbVNpZ24gRUNDIEVWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"cf06e95703019f175db9c5a52f46e1ddea5ac2ad994d77248a0ec9479bc9be49","size":1183,"filename":"f01011qEaFf6Wqq3wyJQCu96P1p4Ia4fYG9V_7Q6Pu4=.pem","location":"security-state-staging/intermediates/98578ae6-b345-4b4a-9f77-0f821db4c50a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f01011qEaFf6Wqq3wyJQCu96P1p4Ia4fYG9V/7Q6Pu4=","crlite_enrolled":true,"id":"c3a3ece5-9d3e-4a95-9e75-88b6770383fc","last_modified":1601517441714},{"schema":1601376769178,"derHash":"zMDsSwDyec8NbQurLUhtwnSm5BDtNAZXiV9SMu6hdNU=","subject":"SERIALNUMBER=201506,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDY=","whitelist":false,"attachment":{"hash":"d6555d845c65379f6c99daf370954c2b157def962266ea8993272c465b58437e","size":2093,"filename":"fJUnTwcxiS8oV_WhpL3lY4VeVXdTSo1_3QD1YzWg8mM=.pem","location":"security-state-staging/intermediates/15d98a45-71c0-4188-a3c1-6096c75f137a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fJUnTwcxiS8oV/WhpL3lY4VeVXdTSo1/3QD1YzWg8mM=","crlite_enrolled":false,"id":"5e88bec2-48e1-407c-81f0-3e8ec8a1b182","last_modified":1601517441697},{"schema":1601376748460,"derHash":"cvmvIVgYG68W1gybTm9L18qNI0GtSK/bZ8tMgzLVRvY=","subject":"CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"b90c76e81f578b8bc26b991192e309fc1f7c20f49cb20bf33c55c1455c1f615e","size":1557,"filename":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq_Juw=.pem","location":"security-state-staging/intermediates/1700e695-ab2e-4343-b33f-89b8ee9187a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq/Juw=","crlite_enrolled":false,"id":"4ac33a0c-1052-4702-874c-dc40ae073f75","last_modified":1601517441658},{"schema":1601376767113,"derHash":"pmyXrlnf+eoBXnPHRO5VIHRfEBo5XEl9GeHxaNOa/NA=","subject":"CN=DigiCert Secure Site Pro CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"5aded62775075d08acc444c1de87c126e2389b6c7642ebc86c4a8c12384e4285","size":1808,"filename":"BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB_bo=.pem","location":"security-state-staging/intermediates/721e23ad-72ff-4222-ae1d-d221eb1482a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB/bo=","crlite_enrolled":true,"id":"7a20a336-c213-4fd2-ad8c-92be449691f2","last_modified":1601517441636},{"schema":1601376726545,"derHash":"HJ0+jgzx5POcc00Z5Hmulx/DBmwAA1Oitq8yeVqX6hs=","subject":"CN=University of the Peloponnese TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5Vbml2ZXJzaXR5IG9mIHRoZSBQZWxvcG9ubmVzZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"b97f4a98dfcd061cff017369f0b4c03f42a54b33d6e77aea0c96e2e972f74092","size":3819,"filename":"D5AmHvgsz8nnufCXywDHL8VpnKB80L_QvVJn75tQULs=.pem","location":"security-state-staging/intermediates/4e78eb05-39f9-4129-b04a-377f0b320b0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D5AmHvgsz8nnufCXywDHL8VpnKB80L/QvVJn75tQULs=","crlite_enrolled":true,"id":"55ed86a1-d369-4516-b887-90a0eccdfd12","last_modified":1601517441618},{"schema":1601376722448,"derHash":"fsrKSjWFo7QOJVdEFVEtVrV5mbdTAXhW8qsV+h8h9tA=","subject":"CN=NETLOCK Trust Qualified EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBFViBDQSAz","whitelist":false,"attachment":{"hash":"5c9cd98f81f0d60b8f3c40b8be94209d25226eb7ebf1c126947da32ed3d21dbc","size":2215,"filename":"ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU_0=.pem","location":"security-state-staging/intermediates/be90d242-60d9-4a6b-aefe-8e8fb342b23e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU/0=","crlite_enrolled":true,"id":"bf7893da-0baf-4aae-8bfc-282641a4dcff","last_modified":1601517441601},{"schema":1601376727778,"derHash":"NAylukAtFAtlosl2566BKKFQXCnRkODgNPWcyuepK8I=","subject":"CN=Apple Public EV Server RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"ea385fed15dbd58a3c6f6fafe8e1873268b80afe2586ec31c75f1eebd9fb7c21","size":1833,"filename":"9C7mf4J789KvLX59lcMyYpsH6bpdmoAGTByZNhcusLA=.pem","location":"security-state-staging/intermediates/f25279c5-ac9c-4d91-99fc-93ec4b61b575.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9C7mf4J789KvLX59lcMyYpsH6bpdmoAGTByZNhcusLA=","crlite_enrolled":true,"id":"e7170fbb-6ceb-4f32-b932-7da04ce6562c","last_modified":1601517441584},{"schema":1601376759524,"derHash":"nmyANcDxyKlFMQ5y2D5TGUe1cfkpLkKkJIo3C/ezBb4=","subject":"CN=VR IDENT EV SSL CA 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEYxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIDAeBgNVBAMTF1ZSIElERU5UIEVWIFNTTCBDQSAyMDIw","whitelist":false,"attachment":{"hash":"dc99c4f4f52985f008966e436a519a723e8fc97d68041786cb235d067d979c71","size":2556,"filename":"n2nZ8zPLSNKoerb6X9o01VOniH-YyahnTcdt2oR9ovw=.pem","location":"security-state-staging/intermediates/24db4e33-c897-4e54-9072-c201e9f0c903.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n2nZ8zPLSNKoerb6X9o01VOniH+YyahnTcdt2oR9ovw=","crlite_enrolled":true,"id":"911c16b5-610f-407c-95ae-d17b705f20c2","last_modified":1601517441567},{"schema":1601376734751,"derHash":"mmlizYwhtdzx9ws5qDbH85fsSV+IC+m5tpuLJyiOyxQ=","subject":"CN=KICA RSA OV CA,O=KICA,C=KR","subjectDN":"MDUxCzAJBgNVBAYTAktSMQ0wCwYDVQQKEwRLSUNBMRcwFQYDVQQDEw5LSUNBIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"7a548420d69a6edd334c25490c6cbe65e35a11c6a7454d19f074a9b28f83a11b","size":1569,"filename":"404SflxwLnJCxfU7K35IbTgipMzslOzUuXBgFjCXwfk=.pem","location":"security-state-staging/intermediates/ce4b3c0b-bbe0-4b2d-a0c5-ba035046a670.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"404SflxwLnJCxfU7K35IbTgipMzslOzUuXBgFjCXwfk=","crlite_enrolled":true,"id":"12bb20c3-03a9-4d9e-b748-09d93661963f","last_modified":1601517441550},{"schema":1601376766270,"derHash":"sjopwxKnqAsP5rTnG5CcrpKtZJ6Idm5Wye6OHXwBOUU=","subject":"CN=Trust Provider B.V. TLS RSA EV CA G2,O=Trust Provider B.V.,C=NL","subjectDN":"MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBSU0EgRVYgQ0EgRzI=","whitelist":false,"attachment":{"hash":"38af4377ab1fc22658f11e631b7b47777b04bb8fb15d4b189132d8502e7c0990","size":1756,"filename":"tbS_1veJrHW-X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=.pem","location":"security-state-staging/intermediates/5f9c71f9-ea8c-4afb-94cb-c8d606a8933d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tbS/1veJrHW+X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=","crlite_enrolled":true,"id":"784ae2c3-b573-43e8-b16e-5c7524b7e6bc","last_modified":1601517441532},{"schema":1601376743958,"derHash":"vaRnKkA8okUcdNfpPnpOcantIqKozNb5H4/prg5sqIE=","subject":"CN=Sectigo SHA-256 OV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBPViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"6fa5518098b61edaf23a4c92a1150dea5509453a08d15a05eadad2f245c4f1f3","size":1634,"filename":"XB8O6m4KrSEF6ajZf52dFtzGpdc9UJGKYYbXFCuXf7c=.pem","location":"security-state-staging/intermediates/f5d8cd57-5f94-40f5-b472-53aace47ac48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XB8O6m4KrSEF6ajZf52dFtzGpdc9UJGKYYbXFCuXf7c=","crlite_enrolled":true,"id":"e68d9c20-1ff8-4609-843d-a98cdbd6806b","last_modified":1601517441515},{"schema":1601376739819,"derHash":"TUUDnuzKEU1kgioKqAlE1m4I+u5isdJT8UAph2nyJ7Q=","subject":"CN=XinChaCha Trust SSL Domain Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHQxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xLTArBgNVBAMMJFhpbkNoYUNoYSBUcnVzdCBTU0wgRG9tYWluIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"68b6dde00d9409bcff41cb8d3a250a7199377a35f14c4af0235cb34b2ced91d2","size":1772,"filename":"d2LYPy24Y7JLfKDPVkl-Qxb3wvxf9gwxrL4YMYl4enA=.pem","location":"security-state-staging/intermediates/1d26950e-1533-4bb9-9e82-339b1a07f6c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d2LYPy24Y7JLfKDPVkl+Qxb3wvxf9gwxrL4YMYl4enA=","crlite_enrolled":true,"id":"d85db883-7604-4b25-88f2-ae094367a108","last_modified":1601517441498},{"schema":1601376754203,"derHash":"1u8+Cevg2TcOUfXAmlMrOscNPOgiJT+fyEwo6b+lUNU=","subject":"CN=Apple Public EV Server RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"f1a0bae2b273ddf514b8e42304f3dbb8040fd3721185f80ada46dd69c0ddd5de","size":1861,"filename":"4ZMBBKlWyhpdsKqKnbXEkuo4CnSxw6b7svlcKIJWfEA=.pem","location":"security-state-staging/intermediates/b422a0ee-0a04-4468-a9fa-5635e30c83bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ZMBBKlWyhpdsKqKnbXEkuo4CnSxw6b7svlcKIJWfEA=","crlite_enrolled":true,"id":"b3dc6b21-3ad1-4586-8cdb-5e2dd1c613bc","last_modified":1601517441481},{"schema":1601376781512,"derHash":"JYWSjSxb/ZUuAlvRLifGd2Ikz3Uuw2LTAxzdSTUYRNQ=","subject":"CN=Apple Public EV Server ECC CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIEVDQyBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"0c68df98e690b7945017fb11b9de0a5e05c426b30a289db35a64ca96eb1ac781","size":1341,"filename":"Lr2fY89asbE9ohd7WW8tLI0pvoPLX-Wt_N7mP-ri3c0=.pem","location":"security-state-staging/intermediates/934c88bb-99cf-4fc7-8742-47d2064a1e39.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lr2fY89asbE9ohd7WW8tLI0pvoPLX+Wt/N7mP+ri3c0=","crlite_enrolled":true,"id":"6cb0600d-434e-4a59-a8d8-60ea5bf117e9","last_modified":1601517441464},{"schema":1601376767517,"derHash":"0OilGsqrmvgnZ+LvFlQ8LMY1VRtd4NriXWqsceeGKHA=","subject":"CN=TrustAsia OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMw==","whitelist":false,"attachment":{"hash":"f3b5ebd05dd3f189c5ed69f72d96e308522771553df7feb6a4fcdace0c0745b0","size":1821,"filename":"tv1pIXiJEYFUrzxhRqxCjTL7S9s7y_PZbxYVnDOXeCI=.pem","location":"security-state-staging/intermediates/128dd01a-e1a1-4819-bc9a-043a0fa2563c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tv1pIXiJEYFUrzxhRqxCjTL7S9s7y/PZbxYVnDOXeCI=","crlite_enrolled":true,"id":"6d03d111-d670-4e12-9bbd-b3ecad0252cd","last_modified":1601517441447},{"schema":1601376775308,"derHash":"lyoYG2ApTroHMzucGYJEDUM5WrqR1FDsDvtIWu1J1ac=","subject":"CN=D-TRUST SSL CA 2 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHjAcBgNVBAMTFUQtVFJVU1QgU1NMIENBIDIgMjAyMA==","whitelist":false,"attachment":{"hash":"dff0ac820c6ed7f8e2a14edfc11acfc4f548f8a7afc8f0f31cf6e7cea3bd1ec8","size":1918,"filename":"Qw7yBnlh3ygQw2Ss4PCmfsq94Je-YAYnMuM9CpdMS0w=.pem","location":"security-state-staging/intermediates/2e9665a5-d214-4616-9a99-e5f11afc8ab6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qw7yBnlh3ygQw2Ss4PCmfsq94Je+YAYnMuM9CpdMS0w=","crlite_enrolled":true,"id":"c3a9fa2d-eff6-4044-8fbd-014bd0c42505","last_modified":1601517441430},{"schema":1601376746825,"derHash":"jAmUsq7QCF/lQoE+4DxLLXMuzcwleuZFMRTGyHWTO9Q=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGMMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFEMEIGA1UEAww7SEVBTC1MSU5LIEhlbGxlbmljIEFjYWRlbWljIExpYnJhcmllcyBMaW5rIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1ad892976d511047af18da5aab5153b607c353df841e532029d0341a6aaaed34","size":2946,"filename":"YAtUtdUCD9mINjDHhpnZ-aWI7q9rbr-ylz-Qj5YyuqM=.pem","location":"security-state-staging/intermediates/528a2b56-532f-4299-a341-4f138138bea8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YAtUtdUCD9mINjDHhpnZ+aWI7q9rbr+ylz+Qj5YyuqM=","crlite_enrolled":true,"id":"81e51c73-89cd-4657-860d-7cc2ce56eed2","last_modified":1601517441412},{"schema":1601376728241,"derHash":"wa/GWx6BOw5hRuaqU0FoEnKr6aONWfe9Gye3KYNKDZw=","subject":"CN=UCA Global G2 Root,O=UniTrust,C=CN","subjectDN":"MD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290","whitelist":false,"attachment":{"hash":"8b23b9246ee0e3e317646bd91f006eaccbe8145196df356203921598a861c41c","size":2093,"filename":"ElXKvoFS-mTflC96R0F-KflsHOEb-MhOy-KBXMEoCBA=.pem","location":"security-state-staging/intermediates/069b42b2-4592-4d14-8a72-aec786fb8af9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ElXKvoFS+mTflC96R0F+KflsHOEb+MhOy+KBXMEoCBA=","crlite_enrolled":false,"id":"343087f6-4b20-4a64-8815-bfd565b84a7e","last_modified":1601517441395},{"schema":1601376764120,"derHash":"ji0Hv8WRsU+jFGhuHMjZu19vjQkcBZUZSqLHWFuZGIc=","subject":"CN=XinChaCha Trust SSL Organization Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xMzAxBgNVBAMMKlhpbkNoYUNoYSBUcnVzdCBTU0wgT3JnYW5pemF0aW9uIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"ee098ec8d0e0db01810ca1c3b3201c226be5f7b8a356ca702dca8dd33aec3a43","size":1780,"filename":"RHqNaKq-7GhfAxN8i7T10nLSrr6EQCmPkPfRvnXA2S0=.pem","location":"security-state-staging/intermediates/5a268c9f-0c99-4ae8-8988-0610fa6a632a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RHqNaKq+7GhfAxN8i7T10nLSrr6EQCmPkPfRvnXA2S0=","crlite_enrolled":true,"id":"6ee147c4-6e70-4972-8a69-4e4ff8257c86","last_modified":1601517441378},{"schema":1601376733906,"derHash":"AHEIGUEV88iZ9U7mfLTahyde3B1nmNp4fgdYz6aulrE=","subject":"CN=VR IDENT SSL CA 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHTAbBgNVBAMTFFZSIElERU5UIFNTTCBDQSAyMDIw","whitelist":false,"attachment":{"hash":"1206315657f09d9afaec77ac85e998dd3c6cdcb66f3f2176acc53b52c01c503c","size":2519,"filename":"tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=.pem","location":"security-state-staging/intermediates/35f8e921-4fcb-4f84-9bbb-da548ebd9895.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=","crlite_enrolled":true,"id":"9a044a16-723a-4cf7-8fef-aef81b9007f6","last_modified":1601517441361},{"schema":1601376778985,"derHash":"vrUcj0UkJrK55nL33R7qSzPWw49MoqlpVs4kvQWww40=","subject":"CN=TrustCor DV SSL CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIERWIFNTTCBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"87f0868047f749fb388e8d44c43d08ee740544952b1d3dadbc73172c343a6e6d","size":1695,"filename":"eS9Oc92-qoeyy7FaGbRe6FO_VTah35Lxm0PDdpsLdHc=.pem","location":"security-state-staging/intermediates/5e2a99e7-7c31-46e5-9e47-d2efc550858a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eS9Oc92+qoeyy7FaGbRe6FO/VTah35Lxm0PDdpsLdHc=","crlite_enrolled":true,"id":"b6448c15-89fa-4f40-bfc4-08ede3de01a0","last_modified":1601517441343},{"schema":1592519325523,"derHash":"tf7ML2lshQMj/HqFxltQpMXhv7+CPiZqsKRvATssDrI=","subject":"CN=DigiCert Trust Service ECC CA G2,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENBIEcy","whitelist":false,"attachment":{"hash":"3ca0e82119ab2a0b243ffb803c5d18e55b693598fd856f1a7d0a948e1d69157c","size":1366,"filename":"4VdkcpY-ZOfUyYWEJvjLhuY_q1wbV_iIKsGc2tE5I3A=.pem","location":"security-state-staging/intermediates/71b44562-b362-4564-a50c-c4d248bc8403.pem","mimetype":"text/plain"},"pubKeyHash":"4VdkcpY+ZOfUyYWEJvjLhuY/q1wbV/iIKsGc2tE5I3A=","crlite_enrolled":false,"id":"0e1c5bc4-8ad7-4fc2-98de-26295e8e6c53","last_modified":1600461980986},{"schema":1592519324037,"derHash":"lnDMo2rzULm0at/mRu3rv6vOwBzPg7gZznx4ZO3LZsg=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Code Signing CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"465e1a9061e7e389d0ea9da9747262b81d40ae4e14cd9fb27a42f4945f02703f","size":2113,"filename":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=.pem","location":"security-state-staging/intermediates/dbbc83b8-f71f-442b-9caf-a0b071759042.pem","mimetype":"text/plain"},"pubKeyHash":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=","crlite_enrolled":false,"id":"e29dabe7-26f8-4b0e-9a74-744b01286fbd","last_modified":1600461980972},{"schema":1592519319465,"derHash":"gAd2ZTOKAJeJ+ELzQDZHpxU2wfsmTzXa7OwBk+ZQjg4=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Secure Email CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"ebd4f889c36301f375bca790983c878bebf65b6cb79bf50ad94757d9791e1129","size":2125,"filename":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=.pem","location":"security-state-staging/intermediates/f89f921c-a3c7-42c9-994a-462056a42c42.pem","mimetype":"text/plain"},"pubKeyHash":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=","crlite_enrolled":false,"id":"b031ea12-8aac-4bac-aee4-5d52d060d214","last_modified":1600461980958},{"schema":1592519320938,"derHash":"3LiusAU7pcUw9Hor4dHk93taB24diij202yPHv3nYaM=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 DV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBEViBDQQ==","whitelist":false,"attachment":{"hash":"fa4d3f7d98a36f15104d4476514f5038617b69c71d4e11bdfa0516941f5805c0","size":2125,"filename":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=.pem","location":"security-state-staging/intermediates/aa550fcc-4cab-4c33-991a-e69878ac8229.pem","mimetype":"text/plain"},"pubKeyHash":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=","crlite_enrolled":false,"id":"7dcd5c54-eebb-427c-bea4-620c6203e573","last_modified":1600461980945},{"schema":1592519322519,"derHash":"TJ55n+pib17TXY+RVI+2o5AFAwmfMrxJ3A+1ZrCg7zc=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 OV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBPViBDQQ==","whitelist":false,"attachment":{"hash":"a18c07e5eb226b53a94eddfaa604b8c410e66396eb63dba5ffff4555b00cab71","size":2125,"filename":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=.pem","location":"security-state-staging/intermediates/8c5cbc1b-7010-4279-9592-7bf449788484.pem","mimetype":"text/plain"},"pubKeyHash":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=","crlite_enrolled":false,"id":"80d031b5-a786-4d6f-92db-1187faf75cfc","last_modified":1600461980928},{"schema":1592519318021,"derHash":"UrbEsFs8Uhd0VXzVPupZVvNryUxktm2Z6KcpH8L8nDY=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 EV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBFViBDQQ==","whitelist":false,"attachment":{"hash":"0fbfbb9e88addc3cd5be14cbc4fc98ffaf71d3590e9528f71285f55e6da787dd","size":2158,"filename":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=.pem","location":"security-state-staging/intermediates/133bea84-438e-4b34-99c8-925e79eac21e.pem","mimetype":"text/plain"},"pubKeyHash":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=","crlite_enrolled":false,"id":"03d0ad68-4073-473a-808c-029a1be1de3c","last_modified":1600461980915},{"schema":1592518507191,"derHash":"UrbEsFs8Uhd0VXzVPupZVvNryUxktm2Z6KcpH8L8nDY=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 EV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBFViBDQQ==","whitelist":false,"attachment":{"hash":"0fbfbb9e88addc3cd5be14cbc4fc98ffaf71d3590e9528f71285f55e6da787dd","size":2158,"filename":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=.pem","location":"security-state-staging/intermediates/5e9b82e3-6498-46cb-ae02-ec6e85daa9d4.pem","mimetype":"text/plain"},"pubKeyHash":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=","crlite_enrolled":false,"id":"68fb8595-ab2e-4358-8b7f-2d8630f8d173","last_modified":1600461980903},{"schema":1592518505595,"derHash":"3LiusAU7pcUw9Hor4dHk93taB24diij202yPHv3nYaM=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 DV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBEViBDQQ==","whitelist":false,"attachment":{"hash":"fa4d3f7d98a36f15104d4476514f5038617b69c71d4e11bdfa0516941f5805c0","size":2125,"filename":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=.pem","location":"security-state-staging/intermediates/d0c9c8fe-9684-46f7-8bec-543fada2095a.pem","mimetype":"text/plain"},"pubKeyHash":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=","crlite_enrolled":false,"id":"03cebcec-948e-4495-a47e-70c600be3181","last_modified":1600461980889},{"schema":1592518500941,"derHash":"gAd2ZTOKAJeJ+ELzQDZHpxU2wfsmTzXa7OwBk+ZQjg4=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Secure Email CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"ebd4f889c36301f375bca790983c878bebf65b6cb79bf50ad94757d9791e1129","size":2125,"filename":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=.pem","location":"security-state-staging/intermediates/5cd1888e-6da6-4b26-982c-41ff0fcb648d.pem","mimetype":"text/plain"},"pubKeyHash":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=","crlite_enrolled":false,"id":"b5b51d7e-18c0-4051-990e-2227c2564998","last_modified":1600461980874},{"schema":1592518504135,"derHash":"lnDMo2rzULm0at/mRu3rv6vOwBzPg7gZznx4ZO3LZsg=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Code Signing CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"465e1a9061e7e389d0ea9da9747262b81d40ae4e14cd9fb27a42f4945f02703f","size":2113,"filename":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=.pem","location":"security-state-staging/intermediates/f603f16e-856a-454f-b298-d24dd8fca252.pem","mimetype":"text/plain"},"pubKeyHash":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=","crlite_enrolled":false,"id":"b797be80-d570-40a8-a654-8dabec0a9efd","last_modified":1600461980861},{"schema":1592518499324,"derHash":"tf7ML2lshQMj/HqFxltQpMXhv7+CPiZqsKRvATssDrI=","subject":"CN=DigiCert Trust Service ECC CA G2,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENBIEcy","whitelist":false,"attachment":{"hash":"3ca0e82119ab2a0b243ffb803c5d18e55b693598fd856f1a7d0a948e1d69157c","size":1366,"filename":"4VdkcpY-ZOfUyYWEJvjLhuY_q1wbV_iIKsGc2tE5I3A=.pem","location":"security-state-staging/intermediates/48219111-c4c3-46ea-8a9b-039c95dd8687.pem","mimetype":"text/plain"},"pubKeyHash":"4VdkcpY+ZOfUyYWEJvjLhuY/q1wbV/iIKsGc2tE5I3A=","crlite_enrolled":false,"id":"505a1a9d-4fd8-4405-8efd-ffeeb546927b","last_modified":1600461980847},{"schema":1592518502537,"derHash":"TJ55n+pib17TXY+RVI+2o5AFAwmfMrxJ3A+1ZrCg7zc=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 OV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBPViBDQQ==","whitelist":false,"attachment":{"hash":"a18c07e5eb226b53a94eddfaa604b8c410e66396eb63dba5ffff4555b00cab71","size":2125,"filename":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=.pem","location":"security-state-staging/intermediates/6231d971-9aa9-41b5-a807-ac2ac34ed03e.pem","mimetype":"text/plain"},"pubKeyHash":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=","crlite_enrolled":false,"id":"d425ff0e-dd7f-46dd-bec7-e1a25ff6824a","last_modified":1600461980834},{"schema":1592519327887,"derHash":"HQzX7zwZJlUI4g5Ys1OJZPShGt7Ipx2KuKiv8VaDxq4=","subject":"CN=Trustwave XRamp Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE/MD0GA1UEAxM2VHJ1c3R3YXZlIFhSYW1wIEdsb2JhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"8a9ab9f7d0fa1dce10d8a47b00a029a25fdd07597d57eaa58121c3285bd1534f","size":1857,"filename":"bNKluS4Pu3ijZ1polhtHJPfB2HD5sR_s46h0NYeir6U=.pem","location":"security-state-staging/intermediates/5016e431-0390-45dc-8e65-2642b4718233.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bNKluS4Pu3ijZ1polhtHJPfB2HD5sR/s46h0NYeir6U=","crlite_enrolled":false,"id":"d9c54bdb-939c-4a86-a826-cc0f2f68da43","last_modified":1600461980813},{"schema":1592519327482,"derHash":"RbKwjhtYlIoCi+E6Z8DiDUskZq4rbsYlDrsQ/Wt/gjk=","subject":"CN=Trustwave Secure Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG4MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjFAMD4GA1UEAxM3VHJ1c3R3YXZlIFNlY3VyZSBHbG9iYWwgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"296ea0b36874faa2487773b3da5792b5b41278241a226affe7e50a6ba22c0e72","size":1784,"filename":"jyPoX5LnCMukfvFxrxuJWUrZycp69MmdphXiTrhpMU4=.pem","location":"security-state-staging/intermediates/3c07694f-03e7-4fdb-b353-876f81151fda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jyPoX5LnCMukfvFxrxuJWUrZycp69MmdphXiTrhpMU4=","crlite_enrolled":false,"id":"170a74a6-1485-4c35-aecb-8b37550de004","last_modified":1600461980794},{"schema":1592519327070,"derHash":"t1rumDb++8RG8oiilwuE/GCq+e+9LLn4L3WBeQ3kuNw=","subject":"CN=DigiCert Secure Site Pro EV CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"8f19662a936c31bb439790a003ca25e57b94197599e34213f653edb625e96dbe","size":1642,"filename":"2OVT1JHnI_dBAIq49zWtXoFiiSQRI-yC8zdls8oKK38=.pem","location":"security-state-staging/intermediates/2d3ad204-0ce2-4d05-9f72-d1c775ffbbf7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2OVT1JHnI/dBAIq49zWtXoFiiSQRI+yC8zdls8oKK38=","crlite_enrolled":true,"id":"009aa822-146e-46a3-a719-3dcd9bf7e8e3","last_modified":1600461980775},{"schema":1592519326661,"derHash":"avXE6sGAKJuUp3pdIx44Zf/pNPPmokv0h+tOK/2Amks=","subject":"CN=DigiCert Secure Site CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIENOIENBIEcz","whitelist":false,"attachment":{"hash":"743079f69e24d2afafbe5dd936ba2cfc2f9326699f40d7bb7f26e940a110daa9","size":1804,"filename":"TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=.pem","location":"security-state-staging/intermediates/8026b161-5f15-4e50-9e04-efeab78566fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=","crlite_enrolled":true,"id":"ad68756a-4b01-4086-81fb-9969fb748de3","last_modified":1600461980756},{"schema":1591908256929,"derHash":"xssItdbf5GGuzpqjzwOvf+0TQcnm7gBSEpwnynVJM/I=","subject":"CN=HARICA Qualified Legal Entities SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAwwoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMw==","whitelist":false,"attachment":{"hash":"15186c02c3df74416fd0f87801be6425aa3a0e406c53fd492f830a54cc92d12e","size":2544,"filename":"e-dd9g8VZXXMsr7G7fKcXN7tMA9ukaEjSLgZF2ICfqc=.pem","location":"security-state-staging/intermediates/80dd46f5-d545-40df-895f-23e2ea8d22af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e+dd9g8VZXXMsr7G7fKcXN7tMA9ukaEjSLgZF2ICfqc=","crlite_enrolled":false,"id":"283da37c-85ac-496a-ba61-80ed629f1f7e","last_modified":1591908420097},{"schema":1591908255464,"derHash":"Z/YmZm9F8XvCPH3e/5joVqpvLhhJ9dfhOS0YnrZte7Y=","subject":"CN=TrustCor OV Code Signing CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MGQxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xLzAtBgNVBAMMJlRydXN0Q29yIE9WIENvZGUgU2lnbmluZyBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"ddfe34bed60cad4d57b2e8417bba93ac215d0d0e840345142b03f395008543ce","size":2410,"filename":"iNMsaPqm4Y4GBd1dQ8pIwhWcEiF-oQ5TSyxyIysvIrw=.pem","location":"security-state-staging/intermediates/9e5d4cf9-fb23-4745-9ce6-a087b871d619.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iNMsaPqm4Y4GBd1dQ8pIwhWcEiF+oQ5TSyxyIysvIrw=","crlite_enrolled":false,"id":"d28c346b-415c-4cc5-9c09-487a46fab821","last_modified":1591908420093},{"schema":1591908258704,"derHash":"Hdniosh1+Qbfh6dbuSG6ureyrFwNL3iXWz70TTiEQw8=","subject":"CN=TrustCor OV TSA CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIE9WIFRTQSBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"6ec3d34afb73dd44ae301e1e6f0a88bfab245afafd5ea585c3b265293a072f79","size":2373,"filename":"1jVOPg4ry58GnR2_TFxGoDvcplP9fgYirn7IFdbUyC8=.pem","location":"security-state-staging/intermediates/66f59a5b-00d0-4d69-ac6d-d179a9c00001.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jVOPg4ry58GnR2/TFxGoDvcplP9fgYirn7IFdbUyC8=","crlite_enrolled":false,"id":"a770b1e9-9624-43aa-8f7e-5bff4eb600b6","last_modified":1591908420089},{"schema":1591908251155,"derHash":"Xun1cEg2BnWCXDrJQ5R8wTnEpiNoWQ68GVZiBVVJx6A=","subject":"CN=TrustCor OV TSA CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIE9WIFRTQSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"69adbaf65c55ef987d6666699aecc848786f8f9f06e2d00ed3bc77f76a5b48c0","size":2483,"filename":"d_caspjhmZltcVsqecvlCTBnVD8N3iuX2zSiNPeUluk=.pem","location":"security-state-staging/intermediates/edc45158-fbf7-4c73-a277-ac4bd7ae90b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d/caspjhmZltcVsqecvlCTBnVD8N3iuX2zSiNPeUluk=","crlite_enrolled":false,"id":"8074dbab-0f4a-4d83-86d4-04f377d177ba","last_modified":1591908420086},{"schema":1591908252552,"derHash":"rdvoi0aBVM+Pd3MojIxQ92CHnkkIkqqScoFbgU5yHn0=","subject":"CN=HARICA Qualified Natural Entities SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAwwqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIz","whitelist":false,"attachment":{"hash":"6c52992f4d66e47d6bc189688395f1d9b653b4ee61b4f9e7ba93bdf82f90d707","size":2548,"filename":"Pms5vxD68EJwYxeOKxJ-6ilislMxv6HNu2tpcnKXIMU=.pem","location":"security-state-staging/intermediates/111e670d-debd-4ffe-a437-edb530691a7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Pms5vxD68EJwYxeOKxJ+6ilislMxv6HNu2tpcnKXIMU=","crlite_enrolled":false,"id":"6093d7f2-f99d-4c21-8ee3-9a9b80983545","last_modified":1591908420082},{"schema":1591908260103,"derHash":"Dxfjdv6U5YLW7mSc3FFv+XfnZcVhrgh/MaP16OZszs0=","subject":"CN=MULTICERT SSL Certification Authority 005,OU=Certification Authority,O=MULTICERT - Servi\u00e7os de Certifica\u00e7\u00e3o Electr\u00f3nica S.A.,C=PT","subjectDN":"MIGnMQswCQYDVQQGEwJQVDFCMEAGA1UECgw5TVVMVElDRVJUIC0gU2VydmnDp29zIGRlIENlcnRpZmljYcOnw6NvIEVsZWN0csOzbmljYSBTLkEuMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEyMDAGA1UEAwwpTVVMVElDRVJUIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAwMDU=","whitelist":false,"attachment":{"hash":"7c1eb5e82b6b98c5fbb2cc2e946e862c3e9603db9030601769545d27dfc680ab","size":2710,"filename":"SnDcth-CFMtKqv8C-vvYUiVswx8i9btebkBPGF9jAbg=.pem","location":"security-state-staging/intermediates/8a7a0501-5a3d-44a9-9174-ddbbcbe9051c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SnDcth+CFMtKqv8C+vvYUiVswx8i9btebkBPGF9jAbg=","crlite_enrolled":false,"id":"66431be4-4652-4565-bed9-271b8a5ecc9c","last_modified":1591908420078},{"schema":1591908243825,"derHash":"igI8COShqsySWzTFx5ZajQUnVlrqEwq7kV5QjNM6+0U=","subject":"CN=GeoTrust RSA CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"1c253f34ef8fb2a9d6743df4e53b8c564f86da911d0aee06adf0de306c22beb7","size":1792,"filename":"Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC-fWQBE=.pem","location":"security-state-staging/intermediates/da3b185f-0b51-4749-b8bc-791ebfd15fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC+fWQBE=","crlite_enrolled":false,"id":"9c0eb9aa-b6ce-452b-9c28-80f98e51306b","last_modified":1591908420075},{"schema":1591908254121,"derHash":"GYvM8E55tCt8oo88Hq75phQ5LsxDugAK6nd+PXCKsfw=","subject":"CN=TrustCor IV TSA CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIElWIFRTQSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"e538e57c2db6d21be93f1f9d530ffe21255eb9564f89c4f57a8b5dfee1db83e6","size":1792,"filename":"BcOVIft6Aa3I0Epsv8lbkAjkC8BYiOf4PL9PpPN24ME=.pem","location":"security-state-staging/intermediates/ac3a4076-5275-48cb-b805-73ea185a8dd6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BcOVIft6Aa3I0Epsv8lbkAjkC8BYiOf4PL9PpPN24ME=","crlite_enrolled":false,"id":"4f5b63f1-53f9-473d-8f4b-9fb17c89e6b5","last_modified":1591908420071},{"schema":1591908249702,"derHash":"RwjdbQktf7WVj1tDUB9hc/uWae2wWv1LvM3dLVBo2NA=","subject":"CN=NBN CO Limited Public Issuing CA - G3,O=NBN Co Limited,C=AU","subjectDN":"MFYxCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5OQk4gQ28gTGltaXRlZDEuMCwGA1UEAxMlTkJOIENPIExpbWl0ZWQgUHVibGljIElzc3VpbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"35095ff447bac3e1f428c0d591589efb625ae06c8da9a3771bafa7a54eaa07ea","size":1979,"filename":"gN_XmPns3r-Tbn-lkGyIDLxbLl0lVx5A-u0anA34Css=.pem","location":"security-state-staging/intermediates/5c4df234-31b6-4f83-b408-9ea720930655.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gN/XmPns3r+Tbn+lkGyIDLxbLl0lVx5A+u0anA34Css=","crlite_enrolled":false,"id":"f2f582d9-505a-4589-a18d-d9f70347e84c","last_modified":1591908420067},{"schema":1591908246671,"derHash":"FhSDQzEmNqwQtnlG87RSRvrhCxiP10lEKfTlFBdwnjk=","subject":"CN=TrustCor IV Code Signing CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF4xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKTAnBgNVBAMMIFRydXN0Q29yIElWIENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"4d46a09d4ee7352f08502d4721c53275065e5acc36b5bc3396acb9aa1357bd49","size":1804,"filename":"NNZ-Qjfj6rAm3CfD2zqpQShEqkK41UzTIGWJhlN2bww=.pem","location":"security-state-staging/intermediates/8fc46347-ec1a-42b8-bbf5-4b52d947a95b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NNZ+Qjfj6rAm3CfD2zqpQShEqkK41UzTIGWJhlN2bww=","crlite_enrolled":false,"id":"7913159f-41dd-4bb6-acfc-cd380f6bf5cf","last_modified":1591908420064},{"schema":1591908239339,"derHash":"mOajHV3KWkpNVWV+35TdDUSBVUnuqmNgrWnVWCQdRro=","subject":"CN=TrustCor IV TSA CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIElWIFRTQSBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"8bfa506d32d10c6528ea412e42a0d855ba7723dfe606ff19f0e40fe5fde89031","size":1678,"filename":"CsfHattDE4htH2z5II2WNywRRT9YaOXpOx4wtM_8LlI=.pem","location":"security-state-staging/intermediates/45d1ffad-718a-40e3-88d2-f0114ef3d216.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CsfHattDE4htH2z5II2WNywRRT9YaOXpOx4wtM/8LlI=","crlite_enrolled":false,"id":"b7f95b53-bebf-41cf-b830-690df9cc21aa","last_modified":1591908420059},{"schema":1591908245176,"derHash":"UGWE8Z53dAahawtrgU5mmhH01Kqh5zhkvf2VuyPF+WE=","subject":"CN=TrustCor IV Code Signing CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MGQxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xLzAtBgNVBAMMJlRydXN0Q29yIElWIENvZGUgU2lnbmluZyBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"cf590adb24b61ce55d52164c9a4d6c27c2436330ff35fcb41ec4b62ddd3a7b1e","size":1715,"filename":"JBOYzlgICSKcHIvX9_5QkncM_Z34f2lDBKwwj4Jdjaw=.pem","location":"security-state-staging/intermediates/7772d5b3-5c72-4498-a98b-27e0bd4507f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JBOYzlgICSKcHIvX9/5QkncM/Z34f2lDBKwwj4Jdjaw=","crlite_enrolled":false,"id":"cb96c308-4047-4032-a68c-949e1f543ae3","last_modified":1591908420054},{"schema":1591908237803,"derHash":"3wJdzio2QRvl62WQwWHv0mUuwrP3DVxlH5DQI8RvOgA=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"349b15c3f214b888d6f6a4b46c954070b45c19cb06c1ab8d5e1ba9af1f45fdba","size":2003,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/b9978482-c255-4c65-b859-e48b280ba0b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"e4d0a3e7-9fd9-4cbd-88ed-66cdec39ce70","last_modified":1591908420049},{"schema":1591908240858,"derHash":"ZGFrYoINRY98ceNEnszz8+RzW3aHmGDBxmDfI0OGB+o=","subject":"CN=DigiCert Trust Service CA G1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0EgRzE=","whitelist":false,"attachment":{"hash":"8f3bd7702431a74663d155fff1053e6a21a12d31b04d933bf288ac32b921b34d","size":1833,"filename":"QxsK1VHNknY5S-B94-JqCZPJWfnMPftvWK4_FNOB6V0=.pem","location":"security-state-staging/intermediates/f6b4b592-197e-4d6d-8689-a50686e47427.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QxsK1VHNknY5S+B94+JqCZPJWfnMPftvWK4/FNOB6V0=","crlite_enrolled":false,"id":"542da68e-9ecf-40ae-95ca-47a2d82da288","last_modified":1591908420041},{"schema":1591908248234,"derHash":"Ut3on91vYQRz+TFMeosaxEL4qoM6pddzAG/adYyf8ew=","subject":"CN=GeoTrust ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"e06f12d6e0b15958641d81bbc87c7e33098dcc36413ea0b92cdc4e4543a9f083","size":1321,"filename":"htzU8zBrdwmMNFLvW_ZzkFTZcn95rIZbtuXmmiR6prc=.pem","location":"security-state-staging/intermediates/da92e448-1975-4ac4-8055-a07ffe8cc9d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"htzU8zBrdwmMNFLvW/ZzkFTZcn95rIZbtuXmmiR6prc=","crlite_enrolled":false,"id":"88abec4b-eb1e-406d-bc4b-5b94bef1b7d9","last_modified":1591908420022},{"schema":1591908242250,"derHash":"LJfYbJSXYjw80JindbmbUK4Kk6pXIjWLid9jbHOeqiQ=","subject":"CN=TrustCor OV Code Signing CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF4xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKTAnBgNVBAMMIFRydXN0Q29yIE9WIENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"ef0aab26ac8bd0928a9d66d5daef52f3a25eeb827d1e043a71c60577efd7bf90","size":2495,"filename":"8R2HhqEOvFRlo8eJ7ZRC7QNG2WAYSUwQZJ0DIpmsPTg=.pem","location":"security-state-staging/intermediates/92acae6d-6fa5-4775-a134-7b54bd6fce8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8R2HhqEOvFRlo8eJ7ZRC7QNG2WAYSUwQZJ0DIpmsPTg=","crlite_enrolled":false,"id":"013d2fce-1b00-4e3a-a1e6-8adb2b7f1539","last_modified":1591908420018},{"schema":1591908261553,"derHash":"VlyCcCtexjICdU1PS3bMO64ypMkUbtO+zXOkBP+tTN4=","subject":"CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls","whitelist":false,"attachment":{"hash":"1d9a2d179a6bd77673a2997822c24eb83c91358de300c97d4a73f66949753211","size":1674,"filename":"Laj56jRU0hFGRko_nQKNxMf7tXscUsc8KwVyovWZotM=.pem","location":"security-state-staging/intermediates/510154be-a7ff-4d30-ac0f-47117e4efac6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Laj56jRU0hFGRko/nQKNxMf7tXscUsc8KwVyovWZotM=","crlite_enrolled":false,"id":"f8a064f9-72f6-4b80-82ab-21209517e607","last_modified":1591908420004},{"schema":1591908261181,"derHash":"BwUxODzNEA0+nNlk2weqXoRaBoby6uO8imJ7GCBXsfE=","subject":"CN=WoTrus EV SSL Pro CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIEVWIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"7be2ec04c8313dc05a7e0bef9687e9b6f04e6acceb8e83e4058ae0bf0657219d","size":1845,"filename":"rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=.pem","location":"security-state-staging/intermediates/fb7112f9-ebcd-4924-94f2-c22ec2b2f71e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=","crlite_enrolled":false,"id":"2e485221-a36c-44c6-9a72-4f500ee13bf3","last_modified":1591908419995},{"schema":1591908262427,"derHash":"M3xiU3dZLx38xuZWMcYF64uW4AwUa0N/wfBnJoFU6Vk=","subject":"CN=CA Teknikoa - CA Tecnica,OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGCMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExITAfBgNVBAMMGENBIFRla25pa29hIC0gQ0EgVGVjbmljYQ==","whitelist":false,"attachment":{"hash":"0c9abfeebfbd944291d27dfed50b0748b9adc5e8a3e675787d264631975bf3fa","size":2523,"filename":"DQi2term9F9bDPt5Nfb1rvSpznThwvfs2UDIgalF_gU=.pem","location":"security-state-staging/intermediates/4f1d16ba-fc95-4a1f-a3f9-da34f76cd637.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DQi2term9F9bDPt5Nfb1rvSpznThwvfs2UDIgalF/gU=","crlite_enrolled":false,"id":"a8fcbf40-670e-4659-b931-283e4034014e","last_modified":1591908419993},{"schema":1591908261922,"derHash":"FOOEZJqkAfHRyr1fo9CKvoLxS32ubFYVsc191B6XUOM=","subject":"CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls","whitelist":false,"attachment":{"hash":"13e9b1674386c0c79e7249e0a15c3c2a7a26566c25cabf53498bce266477b0ab","size":1748,"filename":"Laj56jRU0hFGRko_nQKNxMf7tXscUsc8KwVyovWZotM=.pem","location":"security-state-staging/intermediates/27474a2a-2668-4899-9441-3d21b2a180a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Laj56jRU0hFGRko/nQKNxMf7tXscUsc8KwVyovWZotM=","crlite_enrolled":false,"id":"057b5891-6e79-4a5c-82ac-96cc6b60a971","last_modified":1591908419990},{"schema":1591167086514,"derHash":"nbCiDDBVQeFegYqIDQZXmHapyQG47s2WhILFjZun8Kc=","subject":"CN=TrustAsia EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMw==","whitelist":false,"attachment":{"hash":"4e4f81e693158e50a56fefb6a5aca6b3e4574f9fe988f6c8784cddc95d070ff8","size":1650,"filename":"qPCsIegto8XzD_ooUOSN32SyAwuprv0BX_QDRc0K3aI=.pem","location":"security-state-staging/intermediates/4ac60b8e-b3bd-4e52-a97e-bd3b83cc2ec5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qPCsIegto8XzD/ooUOSN32SyAwuprv0BX/QDRc0K3aI=","crlite_enrolled":false,"id":"0b7fb8d7-395a-4a87-bbca-e9f0494cbbd2","last_modified":1591199862516},{"schema":1591167089365,"derHash":"6h87+00ylrRn1LWCVZ1lGNZ21a/H0cJL6AJS95GRBG8=","subject":"CN=Thawte EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBFQ0MgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"6600278f549dbae28e5eccd7c6d67369706158aee73bf69487e3b23a4b7ddaf2","size":1349,"filename":"3GFGMg3yja_Gu8_Fov8gNPJ7b50vsniti0_Jy-xvY9A=.pem","location":"security-state-staging/intermediates/add88934-8005-4e38-b32f-7fc51dfffed1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3GFGMg3yja/Gu8/Fov8gNPJ7b50vsniti0/Jy+xvY9A=","crlite_enrolled":false,"id":"af76e31b-fcae-4185-b725-666687e288ef","last_modified":1591199862513},{"schema":1591167082089,"derHash":"77RIRPN+5t4/tMyNLAyDL8j+66lQYjfg0fx61FdKTMo=","subject":"CN=University of Western Macedonia TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE5MDcGA1UEAwwwVW5pdmVyc2l0eSBvZiBXZXN0ZXJuIE1hY2Vkb25pYSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"34785736752f18d257707426251597f0daa53471c56c0f47a301e173c27e43ba","size":2848,"filename":"kTSX_4RoREKHkIC-2xr1SaXHZsAeaVcmjRu6cQGraoE=.pem","location":"security-state-staging/intermediates/a44e6dfa-6c78-4c11-ad62-016557267d7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kTSX/4RoREKHkIC+2xr1SaXHZsAeaVcmjRu6cQGraoE=","crlite_enrolled":false,"id":"91a2b5ee-075a-4618-bd8f-4d04cf5ccddf","last_modified":1591199862511},{"schema":1591167083551,"derHash":"wwvJZn4nOTeDPDlq2F7jJd5jP0/MxRSDQXqcik4zs50=","subject":"CN=Baidu\\, Inc. EV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gRVYgQ0E=","whitelist":false,"attachment":{"hash":"296487ea789ddbc074c95c8a463b37b717d3a6c661a41bcb0dfd1a6ee7de489b","size":2097,"filename":"onoL2w__80DVMiDBAhLw1xZS_BfLNB7xpPDNOU-t5vE=.pem","location":"security-state-staging/intermediates/66b05ddd-742a-4677-a64c-14bc59b1ff6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"onoL2w//80DVMiDBAhLw1xZS/BfLNB7xpPDNOU+t5vE=","crlite_enrolled":false,"id":"48a4c34d-ae22-4bed-a3e3-7c45741571fe","last_modified":1591199862505},{"schema":1591167073329,"derHash":"bsjTVRvQRUsMxLnbh2Nmrgh2TF/PFbAPlBG94w1TNq4=","subject":"CN=Harokopio University Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHAMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChIYXJva29waW8gVW5pdmVyc2l0eSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"dba0350edbfdcc712ff95f2aa7545bf242512d280fbf9f00eb896c1adb172dfa","size":3108,"filename":"qyD-jU59xuSNhgaWYyihJ7dWdsGFxoMvakE0j5xjD58=.pem","location":"security-state-staging/intermediates/c71e16a6-5051-4aec-805d-bdf273356535.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qyD+jU59xuSNhgaWYyihJ7dWdsGFxoMvakE0j5xjD58=","crlite_enrolled":false,"id":"34b45359-b190-4d3f-9191-c6d59ac0eded","last_modified":1591199862502},{"schema":1591167080617,"derHash":"53rALbbqoOmmtXOpmHDG3029uDOd2jvEB4b3DivX9/Y=","subject":"CN=Athens University of Economics and Business Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHXMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUgwRgYDVQQDDD9BdGhlbnMgVW5pdmVyc2l0eSBvZiBFY29ub21pY3MgYW5kIEJ1c2luZXNzIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1e3cb2c9ecca76313a725db387ac067371fbea9fc0ce4ce7d60c9ede6f74bf54","size":2950,"filename":"3IfeeqbDX_0ezFEcTXsTFVdG9GzLQIlDyy4VhgHxzS4=.pem","location":"security-state-staging/intermediates/54bf59a7-d689-4acd-bf6e-3101a05ef2c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3IfeeqbDX/0ezFEcTXsTFVdG9GzLQIlDyy4VhgHxzS4=","crlite_enrolled":false,"id":"3aea72b3-3960-455b-b711-025fdab94667","last_modified":1591199862497},{"schema":1591167071907,"derHash":"5Xu/UHn5gpO0FC80iXLmjjUeUrkDc/BfRvCcyzCvW/A=","subject":"CN=Democritus University of Thrace Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHLMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTwwOgYDVQQDDDNEZW1vY3JpdHVzIFVuaXZlcnNpdHkgb2YgVGhyYWNlIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"ea40db8a47367dd54c7678ae623e536b940224acac4e453074d7530c35cb3164","size":3754,"filename":"3QvO-bCh_CHkx1PzWSKQKGbIBtURouotLTwEHyZIxdg=.pem","location":"security-state-staging/intermediates/532ef40b-a9e4-413d-a1e1-d0aa802e5956.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3QvO+bCh/CHkx1PzWSKQKGbIBtURouotLTwEHyZIxdg=","crlite_enrolled":false,"id":"2500e750-51f7-4bfa-b14c-410eee994700","last_modified":1591199862494},{"schema":1591167076191,"derHash":"WOifT3BBDaALQUc8+kE/oHN+0nKfPtd74pp/RwU3cUc=","subject":"CN=Thawte ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFQ0MgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"4b60a802a42e6e4c05c687e45fc85a906f057a59607855889909b6b0d8b54554","size":1317,"filename":"0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY-X4H-exCnC0=.pem","location":"security-state-staging/intermediates/b6d2ca16-612a-4f12-b4de-bdc927f057ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY+X4H+exCnC0=","crlite_enrolled":false,"id":"114db227-c822-4ad8-bc85-78ec38af7372","last_modified":1591199862491},{"schema":1591167085011,"derHash":"dayOQdmnzHWNOZj+Aw9jjP0ohVgj2k6bVpVM+94FTrY=","subject":"CN=DigiCert Trust Service CA,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0E=","whitelist":false,"attachment":{"hash":"a6a66b7af55471e0b38711d7f08e2851582c3a9a4fa4a8c11ffd63d8796ffc4e","size":1849,"filename":"gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=.pem","location":"security-state-staging/intermediates/30d35091-2272-41b0-8d63-8aa9c6a7253d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=","crlite_enrolled":false,"id":"f0d3ef47-0140-4de4-8a17-349ba642faf7","last_modified":1591199862488},{"schema":1591167077621,"derHash":"FtnelFpCgBH6OggyPaDkNHQ49a8c4+gCgyI+JaRsKp4=","subject":"CN=GEANT Personal CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEYxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRwwGgYDVQQDExNHRUFOVCBQZXJzb25hbCBDQSA0","whitelist":false,"attachment":{"hash":"73692dd6b71347619e873c420c2d14921c90d06d40eef62de1dd6e50b7f88c6c","size":2450,"filename":"gKNaaLTb-FNPxezlz9qfuHiINdFBc6WBAavUqmlBe6g=.pem","location":"security-state-staging/intermediates/7a3ca483-65a7-42ca-9486-496ebb6c28b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gKNaaLTb+FNPxezlz9qfuHiINdFBc6WBAavUqmlBe6g=","crlite_enrolled":false,"id":"230a150f-d7b7-4b76-a970-cc4f56ac6428","last_modified":1591199862485},{"schema":1591167087942,"derHash":"8La3WY3yeQRxVSYy66nN5tNJBl/G1mWVf57u9ae7JPI=","subject":"CN=TrustCor DV SSL CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"55baa0feb441643563e5145eadf1edc0e02ae8038105624c584bb56a289bf41d","size":1804,"filename":"joJVEgkWNcXOGzwqvqRUGUI1s5Dz-sm7yE2V6LjAa9A=.pem","location":"security-state-staging/intermediates/2eb164f7-eecd-451b-a136-542653e6f4f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"joJVEgkWNcXOGzwqvqRUGUI1s5Dz+sm7yE2V6LjAa9A=","crlite_enrolled":false,"id":"100d0005-d64d-4678-9a8a-b4bdf571825a","last_modified":1591199862482},{"schema":1591167070504,"derHash":"Ok7AN5MHig3sFN5w5XvX+wO/Yv8pzuK2FH44ogjXIak=","subject":"CN=Trust Italia Class 1 Consumer Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHExCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUQwQgYDVQQDEztUcnVzdCBJdGFsaWEgQ2xhc3MgMSBDb25zdW1lciBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e2adf285776a91d6521266dfe60be2a2db10c624e80bf05ae97589ba714509a6","size":1752,"filename":"dfgf335FqF0Y0eTCH64ilFM_xC3YeT00OdPeMai8sc4=.pem","location":"security-state-staging/intermediates/966eaf80-4841-49df-b8f9-750be2fd7f7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dfgf335FqF0Y0eTCH64ilFM/xC3YeT00OdPeMai8sc4=","crlite_enrolled":false,"id":"2a196fcc-f810-4d55-84e4-93d5649fc1e5","last_modified":1591199862480},{"schema":1591167068979,"derHash":"vUQgxZKm9/JSromBJOAC8bnP4fJTiGTVazSntN+zH8g=","subject":"CN=Greek Universities Network Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHGMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5HcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3538047cb62ad089be4f013252357132586b290e06995041bb69677e17b8b668","size":2881,"filename":"eClYCfzKv6P76tWqfScdObnNeoNSeykW6trew89MfYM=.pem","location":"security-state-staging/intermediates/b80462a6-6676-4df4-a32c-d62f8671081d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eClYCfzKv6P76tWqfScdObnNeoNSeykW6trew89MfYM=","crlite_enrolled":false,"id":"5432729e-8e88-4b49-8687-b320365e9e8a","last_modified":1591199862477},{"schema":1591167067557,"derHash":"/AG1j8eLnFkhF4TC4lvx0BKh4j8zchiEemLrQUXuSrY=","subject":"CN=GeoTrust EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"a71cb7825b1dcf648f03a80a46f1bd37d9455ca249fb68a85c6ecf9a15848e99","size":1370,"filename":"aDb4btQIVH2hsyd4IxUsJGinBpyh-phY6PF4IHasdAw=.pem","location":"security-state-staging/intermediates/c09c55b5-14e7-4603-a7a9-e7c0bc70e59b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aDb4btQIVH2hsyd4IxUsJGinBpyh+phY6PF4IHasdAw=","crlite_enrolled":true,"id":"4efbcf92-bf3d-47eb-a092-4b861635e97f","last_modified":1591199862471},{"schema":1591167058628,"derHash":"99utEui2K4N7p/agHhZymZz69pKWWbgbB/JTV2KB970=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"58df8d69047ece6fc6c0574d72432af6c16e5891bf2288364d4f01eebe585ad2","size":2276,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/db52ffd9-3a42-42ba-8d9c-fc19090d2447.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"c8857033-8969-438b-9ca1-33b6315bf546","last_modified":1591199862469},{"schema":1591167064529,"derHash":"wCk9W8NXY05tfKK/u3qhGFUz0s4JqgiDPTevWEZhXFY=","subject":"CN=TrustCor OV Email CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF0xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKDAmBgNVBAMMH1RydXN0Q29yIE9WIEVtYWlsIENBIC0gRzIgLSBSU0E=","whitelist":false,"attachment":{"hash":"27952ee3cf848c1c572a7bc0277c75c118c8dbec11a0224bd318870efa2f642e","size":2385,"filename":"TcTNufQAyMrXUOohYwD5emGgQ5j6I9N3jwzAzPt28sE=.pem","location":"security-state-staging/intermediates/56545cc0-b857-4c4f-98ee-c974db77f53e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TcTNufQAyMrXUOohYwD5emGgQ5j6I9N3jwzAzPt28sE=","crlite_enrolled":false,"id":"5186c50e-d721-4e7b-af5f-3331785a2ac5","last_modified":1591199862466},{"schema":1591167061645,"derHash":"nDPLanZZZ1Kgx+UcctSAznh2x3J5Tr7lhB+gcDXm6OA=","subject":"CN=Telenor Norge AS Dealer G2 CA,O=Telenor Norge AS,C=NO","subjectDN":"MFAxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSYwJAYDVQQDEx1UZWxlbm9yIE5vcmdlIEFTIERlYWxlciBHMiBDQQ==","whitelist":false,"attachment":{"hash":"7845072fc6f1b355f9345a6ce52a2438a06f31436f734a5d5b37130bbdb64d31","size":1959,"filename":"9gdYrOp6FaFqRJ5-QJcz3vpuYebgu7hh-Vw15jpzzKk=.pem","location":"security-state-staging/intermediates/074f8517-9c34-4b75-88e0-2c24b553379c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9gdYrOp6FaFqRJ5+QJcz3vpuYebgu7hh+Vw15jpzzKk=","crlite_enrolled":false,"id":"25439fab-5fb0-406f-902f-84a905579e0f","last_modified":1591199862463},{"schema":1591167063096,"derHash":"LRskT6zq+tlHVbXpmqv3rJHFmdpzv6Rh7uuvtLlptck=","subject":"CN=Panteion Univ. of Social and Political Sciences Client SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHXMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUgwRgYDVQQDDD9QYW50ZWlvbiBVbml2LiBvZiBTb2NpYWwgYW5kIFBvbGl0aWNhbCBTY2llbmNlcyBDbGllbnQgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"9e41c8f1b7df552a4c991c34ef28ac4b6de98f4abf712a108a103a343b0ee714","size":3048,"filename":"xQvovgfn-eQF_oAgGtY1VdtWF8Cy81x6M6y01IOUqRQ=.pem","location":"security-state-staging/intermediates/803b8ba4-75d3-4b10-9089-3b52e7662628.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQvovgfn+eQF/oAgGtY1VdtWF8Cy81x6M6y01IOUqRQ=","crlite_enrolled":false,"id":"8213c2b2-aa66-4314-ae1d-26f7b9562096","last_modified":1591199862460},{"schema":1591167054203,"derHash":"6VKbQo+2c5C8ZFXXm6JDToFsVP5PNZkwy3Cdslb935Q=","subject":"CN=DigiCert High Assurance Trust Service ECC EV CA,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxODA2BgNVBAMTL0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"de06436b3a21e829632e0b079103d0155f88adbdbc35e4184178d5e16626e73e","size":1431,"filename":"MMkARzLCDka9T1FV6sAvs-cZUAaL2QbYfVCCeg3D0W8=.pem","location":"security-state-staging/intermediates/e2efbea3-a3f8-4d7b-9645-ba2d190125e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MMkARzLCDka9T1FV6sAvs+cZUAaL2QbYfVCCeg3D0W8=","crlite_enrolled":false,"id":"a9e0d855-db12-4790-a733-58040361f588","last_modified":1591199862458},{"schema":1591167060249,"derHash":"e2ugsXNlgQElA5XVR2QwN6aCFhVScLybpGs1jDt36Q4=","subject":"CN=Adobe Public Issuing CA,O=Adobe Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZG9iZSBJbmMxIDAeBgNVBAMTF0Fkb2JlIFB1YmxpYyBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"9fa10fb4c94ca524acfdaf55d748672b6bdf9af1d3bc554cecef45362e465647","size":1955,"filename":"m7KaH9Z-A0_S4XkUf0qbkb0a7hPwHRz8EHHcRjLCSMA=.pem","location":"security-state-staging/intermediates/3f6f7dda-b7e1-4553-aff4-1f18c36d0f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7KaH9Z+A0/S4XkUf0qbkb0a7hPwHRz8EHHcRjLCSMA=","crlite_enrolled":false,"id":"9e07316e-733c-4699-89c5-e189d67de109","last_modified":1591199862455},{"schema":1591167052726,"derHash":"1YwU+8AQDhHv5yCN1pFpYCVzPheG8acwOwYz4H9mHDk=","subject":"CN=CERTDATA SSL OV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBPViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"a7ba1f7c3b1be14cda8132b559c02a76768e4908267a62b581190dccbd617fe0","size":1297,"filename":"3fq1AiHgm5wPjtliqEAe6Hqe_TUKwGTHlpm_w85y2o4=.pem","location":"security-state-staging/intermediates/fa9997a5-72d8-43c8-bb04-befe0fe4ea62.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fq1AiHgm5wPjtliqEAe6Hqe/TUKwGTHlpm/w85y2o4=","crlite_enrolled":false,"id":"9d1610d0-eec4-4f89-b0f1-2c18a5a5fffa","last_modified":1591199862452},{"schema":1591167057183,"derHash":"jYPWn6YVqiaDsT14lEgsVCsLzxi7ktMPAV+0JHGvu2Y=","subject":"CN=TrustAsia ECC EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzM=","whitelist":false,"attachment":{"hash":"02177e95a053529e56a44df11a7524e3b40ddadc426f737c2d9c84e00dc43f28","size":1382,"filename":"xgkVHlf2XyODr7l-8b1HSx2m_0yRG8ZF5HdfiYwDwaY=.pem","location":"security-state-staging/intermediates/5b9163c5-db6d-4370-8fa7-c89bcf81e95b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xgkVHlf2XyODr7l+8b1HSx2m/0yRG8ZF5HdfiYwDwaY=","crlite_enrolled":false,"id":"b866ec0b-ef71-426c-8709-aab24aae0fbd","last_modified":1591199862449},{"schema":1591167055791,"derHash":"hg+OSYT8qqp4yH8HE/IDGBtX17VW/tl5zhTcoB/6SlQ=","subject":"CN=GEANT EV ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBFViBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"fc2b67c0063115937980d79c3e67247ea70cc6101c5985ad73310d907964164d","size":1264,"filename":"FFXxLheN9s893pVXnMlRnGpl8sSJRMnaghLMByYYI1Y=.pem","location":"security-state-staging/intermediates/ba5698b0-efb9-4bb2-b7c6-0a26fb3752a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FFXxLheN9s893pVXnMlRnGpl8sSJRMnaghLMByYYI1Y=","crlite_enrolled":false,"id":"49c9b36e-598e-45a0-8e4c-a7cf27e53b9a","last_modified":1591199862444},{"schema":1591167045220,"derHash":"405TXezfAKo3Tn1CiI5lCHTAOuKxW5oONNKJglXXFuA=","subject":"CN=TrustOcean Encryption365 Pro SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxLDAqBgNVBAMTI1RydXN0T2NlYW4gRW5jcnlwdGlvbjM2NSBQcm8gU1NMIENB","whitelist":false,"attachment":{"hash":"f786cc89df5476b284f6ebc8706f27d17d706e261be2f501c9fcce7d60c1386d","size":1260,"filename":"b73E5DRCm6VpQzKDNZJF6xWzf2fL62a-r0eJZj5f1_Y=.pem","location":"security-state-staging/intermediates/65f80d0b-45ab-4ac9-b896-274c7239ff7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b73E5DRCm6VpQzKDNZJF6xWzf2fL62a+r0eJZj5f1/Y=","crlite_enrolled":false,"id":"63e56db0-43ac-44a1-917f-aa5aaff3b271","last_modified":1591199862441},{"schema":1591167043562,"derHash":"0kGVxh+c2oVizXXpVWUZcJe9dN/AfOLR30FIi2mdxek=","subject":"CN=ZeroSSL ECC EV Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEcxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSYwJAYDVQQDEx1aZXJvU1NMIEVDQyBFViBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"823e3f2639582c72811e1ddf7900356ac05b194124fd81ee82b5aa37faa06fe4","size":1309,"filename":"A8f81KNlDx2NqB55PbT84Ofjg0xfNreLGekgTvDP594=.pem","location":"security-state-staging/intermediates/ccf60840-a6b7-4d19-9596-d073ce79f2df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A8f81KNlDx2NqB55PbT84Ofjg0xfNreLGekgTvDP594=","crlite_enrolled":false,"id":"34b2cd0f-9958-4f45-bdb3-24d3ba02ae86","last_modified":1591199862438},{"schema":1591167049789,"derHash":"TV9aea7wkkFf9oHZ+pWPJPv9dNJtP/0VO8YefBucmSA=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"8532a51efeed07390debc1531004aa9806e82d2c1bda5e60b695ce6fe4671366","size":2276,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/0452fd2e-1ec9-4596-8f27-0f60d31ce83f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"cd7edab9-0a83-4d7a-ac8f-b96aa4df559a","last_modified":1591199862435},{"schema":1591167048156,"derHash":"x3xf3ExlXJ3GkMucdvmPrtPD3s7wZMvNctQcWeVYf+s=","subject":"CN=TrustOcean Organization Validation SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMjAwBgNVBAMTKVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU1NMIENB","whitelist":false,"attachment":{"hash":"556a16e9adc4480fdb9e891eaeeed7d9e5985f01350398edeb90bb12a7902658","size":2109,"filename":"iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=.pem","location":"security-state-staging/intermediates/c2f7ee4a-a230-40fe-ae6d-7bac146e0fca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=","crlite_enrolled":false,"id":"08d30c0e-cd9a-4c3e-b21d-ea273d69191b","last_modified":1591199862432},{"schema":1591167041835,"derHash":"6sATQ3DJ/6v8eutf0DwlFikPrlWFCBxAoI8ZyJq3v1s=","subject":"CN=Sectigo Partners - Client Authentication and Secure Email - ECC,O=Sectigo Limited,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxSDBGBgNVBAMTP1NlY3RpZ28gUGFydG5lcnMgLSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCAtIEVDQw==","whitelist":false,"attachment":{"hash":"41b0725f1556ca322a9a093945f10ac4a78ac9fd53f4f87424358588af90869e","size":1301,"filename":"3-iHJaeW0w8BOWRucLU59AureWRmw6oFBSFskSOxxFI=.pem","location":"security-state-staging/intermediates/920323a3-e248-43b6-a0ed-449746e19e5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3+iHJaeW0w8BOWRucLU59AureWRmw6oFBSFskSOxxFI=","crlite_enrolled":false,"id":"8bcfa0b2-e35e-49cd-844d-463a24f7f8b3","last_modified":1591199862430},{"schema":1591167040444,"derHash":"wv6s1nSHjHsMIyWi7O0KMz23eAqG3+w3WBAO/AEBxmU=","subject":"CN=GlobalSign Qualified Timestamping ECC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MHsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFF1YWxpZmllZCBUaW1lc3RhbXBpbmcgRUNDIENBIDIwMjAxGTAXBgNVBGETEE5UUkJFLTA0NTkxMzQyNTY=","whitelist":false,"attachment":{"hash":"dfd5994848268b7d4c9f0e58d9d33bd62a38c8b8aa02ddff40fc64573747f716","size":1317,"filename":"vQb9MziuYR3JwsWUg7XIa11YjUtOFnw-FWOE5oq95uE=.pem","location":"security-state-staging/intermediates/ea9a711d-d96e-4a8f-ba89-26fdd8430750.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vQb9MziuYR3JwsWUg7XIa11YjUtOFnw+FWOE5oq95uE=","crlite_enrolled":false,"id":"ec8193b6-fea2-4dbb-aac4-1b1be84f8f6b","last_modified":1591199862427},{"schema":1591167046740,"derHash":"J38PyiY+EoVtuqTdCt8EIE9/mM/XLOnJOAfjd+NMiHY=","subject":"CN=GEANT eScience SSL CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBlU2NpZW5jZSBTU0wgQ0EgNA==","whitelist":false,"attachment":{"hash":"68075f9cd2cc60ade2eac547fc756af29513e6cfe214c0330fd8e350cd01b052","size":2458,"filename":"aMvT7rta1tsjwjUiL86lNQhPARjlTSPwT-vUCzjJnTM=.pem","location":"security-state-staging/intermediates/b4e71607-9e9f-44c1-bffc-f52f82c8345a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aMvT7rta1tsjwjUiL86lNQhPARjlTSPwT+vUCzjJnTM=","crlite_enrolled":true,"id":"7a3d933b-8c06-4e96-8918-dbe59b8b41b4","last_modified":1591199862424},{"schema":1591167038909,"derHash":"7tCpXn3jylPkpscqhrPxZMDCPjgPj2t5o0nvF4Q0LB8=","subject":"CN=Sectigo SHA-256 DV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBEViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"8ee56d8ef938ba4af2c0e70e0468c434181b9e82ca18f599691bb7386c8440de","size":1634,"filename":"HPMSsaUyVhFGoL9nU4W2uLB0hGaRXQ5DmhLQh_ivAOI=.pem","location":"security-state-staging/intermediates/2b7ba355-fdd1-40c5-931a-ab2ab80990db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HPMSsaUyVhFGoL9nU4W2uLB0hGaRXQ5DmhLQh/ivAOI=","crlite_enrolled":false,"id":"892ea545-f970-4099-82a0-cb0796cff322","last_modified":1591199862421},{"schema":1591167037484,"derHash":"K7RwAz1Xd9rC14r2E/HkZXkGvj31tuMx7Hn1zVNNh5s=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"708973feef9a0edc66b4d44761ffe346c676de8fd48daf43a0b291c9f6e1d8d3","size":1479,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/61b61e47-26ee-4791-bd33-bd8d5c78ffbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"76be9ace-5a84-46e5-ad9f-1035b065dfd0","last_modified":1591199862419},{"schema":1591167034523,"derHash":"HjNJzTZqk+We9BUqHkg9rGB2GExdRtTNoA5gk+/J5qM=","subject":"CN=University of West Attica TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTMwMQYDVQQDDCpVbml2ZXJzaXR5IG9mIFdlc3QgQXR0aWNhIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"ad55c1ebf554ac88c4ee7ca2a6ac10ede14cc708e9e9241628118eb06a7159ac","size":2820,"filename":"CyajdIEcy4Hr_cxQQqnu0qrnumFkHRMCTTcJDgIK41E=.pem","location":"security-state-staging/intermediates/70d67b10-99b6-4f51-b3b9-3f1e070e7f7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CyajdIEcy4Hr/cxQQqnu0qrnumFkHRMCTTcJDgIK41E=","crlite_enrolled":false,"id":"5c9fffc4-55de-4707-bf44-0dce68ff0d17","last_modified":1591199862416},{"schema":1591167036082,"derHash":"iDnSt3Z1HeaNMxJJjbtgjAiqT+cnpcMl2masgGTgV9M=","subject":"CN=Sectigo Partners - Code Signing - ECC,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gUGFydG5lcnMgLSBDb2RlIFNpZ25pbmcgLSBFQ0M=","whitelist":false,"attachment":{"hash":"88311f0ab36dc8818db8973c74ff16324387b6be5bd1ec65038a0fbb119eff0d","size":1256,"filename":"Mt57qGD4OmM1FA-J_hFGLzHI5GSYdHW8EafwJr2iBfk=.pem","location":"security-state-staging/intermediates/a19e812e-9cc8-45dd-8903-f7add99df475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mt57qGD4OmM1FA+J/hFGLzHI5GSYdHW8EafwJr2iBfk=","crlite_enrolled":false,"id":"763c8ffa-7dda-4f82-8a7f-98b654689f80","last_modified":1591199862406},{"schema":1591167032970,"derHash":"E5rDa9hTmLu7RYhofCDcNoJ9A6X0Kq34fwK+zEvpv8I=","subject":"CN=DigiCert Secure Site EV CN CA G3,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIENOIENBIEcz","whitelist":false,"attachment":{"hash":"0b1f6ecad39cb939686ab17ee9e4168992c49d49dadf8783292a36743b0eabd0","size":1638,"filename":"q0mT-mtnAchq7xXJEtVo25yl_8a1e08EqUu2Ww5ybfQ=.pem","location":"security-state-staging/intermediates/1ce4670b-c3e7-4e29-9f89-30844efb4ed9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q0mT+mtnAchq7xXJEtVo25yl/8a1e08EqUu2Ww5ybfQ=","crlite_enrolled":false,"id":"bcd47841-6736-4533-bf49-4312192e3896","last_modified":1591199862403},{"schema":1591167027009,"derHash":"nGJKAXdk/Lo2NYZ5gEp1ys6V8ETwVd/fAlBfOwYBfzQ=","subject":"CN=Sectigo Partners - Server Authentication - ECC,O=Sectigo Limited,C=GB","subjectDN":"MGAxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUGFydG5lcnMgLSBTZXJ2ZXIgQXV0aGVudGljYXRpb24gLSBFQ0M=","whitelist":false,"attachment":{"hash":"965543ef4688c780b26fe4ee398172e77fae789ccc287dd22f669e4086c54e64","size":1280,"filename":"_WhZ_JfPDtfaL87jEAix_9CGklMDqSAXqw8H6I5WmaM=.pem","location":"security-state-staging/intermediates/1b383c95-777e-440f-b0ce-bee1a692cb46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/WhZ/JfPDtfaL87jEAix/9CGklMDqSAXqw8H6I5WmaM=","crlite_enrolled":false,"id":"7e08b5b4-31d8-4e72-8460-b0a5767bdada","last_modified":1591199862400},{"schema":1591167025307,"derHash":"89kW0bcyAfBJ7afll/4KXM1XEaaVj7wLem9/pk96/kc=","subject":"CN=National and Kapodistrian Univ. of Athens Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHVMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUYwRAYDVQQDDD1OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXYuIG9mIEF0aGVucyBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"f5375566c23535064bf73fff7c1447dfed381f69baaccfb60278db4b1df08068","size":2991,"filename":"po_dRQH7IGS9y25dkTis42QhTrBTBikFiq3x34kGvyg=.pem","location":"security-state-staging/intermediates/1604ec06-c741-4dcf-99b5-fb4336be8907.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"po/dRQH7IGS9y25dkTis42QhTrBTBikFiq3x34kGvyg=","crlite_enrolled":false,"id":"209b5f61-f0d0-43c6-b630-d4bc29799afb","last_modified":1591199862397},{"schema":1591167022088,"derHash":"hGT/6ymjrRfp1vRuSMXHJ8nXho2sAmK/JW4gs8+1WII=","subject":"CN=Sectigo SHA-256 EV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBFViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"49f7bd3efa4fcc0722a6f4605271d5fe0a5c1083d9dcbfbecd0ebf94310ad26e","size":1674,"filename":"ZFA27ke4TClASV6I0jW87lSWFo_b8drlh9D36Vzid1s=.pem","location":"security-state-staging/intermediates/0ae99740-9844-4cbd-9b4d-19f9519a49a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZFA27ke4TClASV6I0jW87lSWFo/b8drlh9D36Vzid1s=","crlite_enrolled":true,"id":"29f50ad4-1ef9-49cc-a491-3f8d8fdc0a06","last_modified":1591199862394},{"schema":1591167030041,"derHash":"S3BM2oDiRNQYaETw7yQrcMSxq02NiWFWjyjhLIl4TyM=","subject":"CN=Baidu\\, Inc. OV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gT1YgQ0E=","whitelist":false,"attachment":{"hash":"6ea162d68f2654682d4ebd9366bb52aa672edd57c7ae49ba447b5de53dccf6cc","size":2056,"filename":"YhO9UIj-GsxiTpBJJHAy3KMI3EVCiDbs7p2O02LNtXc=.pem","location":"security-state-staging/intermediates/fce8e914-285b-4edc-a752-7fac0e7445c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YhO9UIj+GsxiTpBJJHAy3KMI3EVCiDbs7p2O02LNtXc=","crlite_enrolled":true,"id":"ee7f153f-966e-43f0-8e29-7981b781986a","last_modified":1591199862392},{"schema":1591167028565,"derHash":"FGwc+bt9IxBg0Pq9mG6YUPAFAfWjt7asQsUbOMjiKiM=","subject":"CN=Inst. of Accelerating Systems and Applications TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGQMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFIMEYGA1UEAww/SW5zdC4gb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9ucyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3a570f3ca5ad4b439d7c8d33c6002d18626e99d07f0bf1e60eb24b7a1a11cd75","size":2946,"filename":"D7Xfk-7YUggnXZisbV8HX7kcYYgzDkMy57Y3cC1Fqqs=.pem","location":"security-state-staging/intermediates/ec795ad6-cbbb-4bad-9e87-bc160120bf58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D7Xfk+7YUggnXZisbV8HX7kcYYgzDkMy57Y3cC1Fqqs=","crlite_enrolled":false,"id":"d42142d3-081a-4ea8-8b46-ca780b098b0c","last_modified":1591199862389},{"schema":1591167015993,"derHash":"g8xQ4V0WmCSuvQvsv/r+c2vFWuIRvD7mM4+0c7kBWgc=","subject":"CN=TrustCor OV SSL CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIE9WIFNTTCBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"0dc01364783a9271db505d8e1e3e6043cf875754d6bd36c6945e11fb53e02604","size":2385,"filename":"Mj3vTN7j1fDT_WCo762M8I9WedMYrlbBSvj8E4HDtuA=.pem","location":"security-state-staging/intermediates/173a1a2d-4f59-4194-99eb-916147b82f27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mj3vTN7j1fDT/WCo762M8I9WedMYrlbBSvj8E4HDtuA=","crlite_enrolled":false,"id":"38aa6198-2c05-4917-88c6-c6a161997f08","last_modified":1591199862386},{"schema":1591167018876,"derHash":"CDeZ6LK5AW5EcC6/m/NpziU/4fvrZQ5d8Q70TYe/O64=","subject":"CN=GEANT OV ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBPViBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"8192abe4c9a117dee4774f8edfcc12a8fb4c01e2f5d4fb1927f882b61391467b","size":1264,"filename":"nMY4vuFVgfkmWBODcb-TSGhs4sivegdluGYPGdmc-ac=.pem","location":"security-state-staging/intermediates/8ae9c209-ac28-4acd-9b6c-93323d2ba3cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nMY4vuFVgfkmWBODcb+TSGhs4sivegdluGYPGdmc+ac=","crlite_enrolled":true,"id":"e25e445b-40bc-4a3d-984e-f19238697009","last_modified":1591199862381},{"schema":1591167011546,"derHash":"ugMS97cva2S0zO40tfYoz2Wh87nxa43+etqQxU5HWhw=","subject":"CN=HARICA QWAC ECC SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),L=Athens,C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMSswKQYDVQQKDCJHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMRgwFgYDVQRhDA9WQVRHUi0wOTkwMjgyMjAxNzA1BgNVBAsMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExITAfBgNVBAMMGEhBUklDQSBRV0FDIEVDQyBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"3132a7793ecd22890d90a9b668b15a5bbb58368a0dde81dd5ab7909a6e210082","size":1435,"filename":"My5yT8M-8RZqS9wIe_1GKdv6BmFJetmYV8QXy2UQNVQ=.pem","location":"security-state-staging/intermediates/8c36ec80-60de-4cb2-8067-27d3459d9272.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"My5yT8M+8RZqS9wIe/1GKdv6BmFJetmYV8QXy2UQNVQ=","crlite_enrolled":false,"id":"e5adb388-5770-4b2d-ab78-9714ddd085c0","last_modified":1591199862378},{"schema":1591167009812,"derHash":"sdKb4BPPJ5gqqraUeFo+n1oWmmgvi404Z3aUZwxCgog=","subject":"CN=Volvo Car Corporation CA,O=Volvo Car Corporation AB,C=SE","subjectDN":"MFMxCzAJBgNVBAYTAlNFMSEwHwYDVQQKExhWb2x2byBDYXIgQ29ycG9yYXRpb24gQUIxITAfBgNVBAMTGFZvbHZvIENhciBDb3Jwb3JhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"a994d8a357cf9caa3a52dbedf3fa4253d4cae99e9da27e7249d2abb02c372362","size":1975,"filename":"UBZHXRQOIZeD5Wykj4uI2nNLlxdnTll9SO7dn-ejVYM=.pem","location":"security-state-staging/intermediates/398e9a7c-0468-4ca8-9ab4-9ea3b832ebe9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UBZHXRQOIZeD5Wykj4uI2nNLlxdnTll9SO7dn+ejVYM=","crlite_enrolled":false,"id":"8bf17c1a-a6d9-422b-adb9-93502ed40667","last_modified":1591199862375},{"schema":1591167017476,"derHash":"NFjH94fDD+mvPlinq2h3sZWat8wsRYGwcL3TjDm4Svc=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"77d060f6db6e51cfdc717d3ed978a4be03a2a9b64b955fbecb64b0ccd4ced790","size":1479,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/6def578c-3064-4137-b8df-f2747fbfab93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"4aac2f1d-7301-4a72-b32f-844df8079dc0","last_modified":1591199862373},{"schema":1591167014412,"derHash":"fogrHMVDm3+5WgWUPFqPQNrnWq27a2JMVe3ZRiTvoOM=","subject":"CN=ZIPAIR-Public-CA,O=ZIPAIR Tokyo\\, K.K.,C=JP","subjectDN":"MEUxCzAJBgNVBAYTAkpQMRswGQYDVQQKExJaSVBBSVIgVG9reW8sIEsuSy4xGTAXBgNVBAMTEFpJUEFJUi1QdWJsaWMtQ0E=","whitelist":false,"attachment":{"hash":"2c984e2131fa368ef2b5aa3b3e90a0922afa4740aabe97b5cb2019ab14830d37","size":1955,"filename":"PIUGed6DkU3CojfvzNyd5kHY3JiTqukpDDfDBatgs4g=.pem","location":"security-state-staging/intermediates/54e74715-f012-4611-b2a5-b2147fcad5bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PIUGed6DkU3CojfvzNyd5kHY3JiTqukpDDfDBatgs4g=","crlite_enrolled":false,"id":"169fb9d2-9eda-4150-b791-e966bdcafdda","last_modified":1591199862370},{"schema":1591167008071,"derHash":"U2ElE5cLnyZMpLzDv9hNvF/ndOPGKVs+u5nrnXQGnio=","subject":"CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIEVDQyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"dc36e4c286a9069d729c789a17603fc5652298f8bf2def86e601936c8873ae90","size":1382,"filename":"58qRu_uxh4gFezqAcERupSkRYBlBAvfcw7mEjGPLnNU=.pem","location":"security-state-staging/intermediates/6652ce0d-3c54-446e-ace4-ab3bf3abd2a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"58qRu/uxh4gFezqAcERupSkRYBlBAvfcw7mEjGPLnNU=","crlite_enrolled":false,"id":"8b11a693-e60e-4d6d-80ee-c38a1d65c423","last_modified":1591199862367},{"schema":1591167006644,"derHash":"zhW4jsoyo3HQtRs7BHWQVdao/ww9Gg1gSI3zVtwFDlU=","subject":"CN=STMicroelectronics Public User CA1,O=STMicroelectronics International N.V.,C=CH","subjectDN":"MGoxCzAJBgNVBAYTAkNIMS4wLAYDVQQKEyVTVE1pY3JvZWxlY3Ryb25pY3MgSW50ZXJuYXRpb25hbCBOLlYuMSswKQYDVQQDEyJTVE1pY3JvZWxlY3Ryb25pY3MgUHVibGljIFVzZXIgQ0Ex","whitelist":false,"attachment":{"hash":"18f50a255b00546467dd0cb80409b58291d5ab408250b7ea98a4d3dd53f0f322","size":2008,"filename":"gx_o4mBjRjGO5e2ioaSkT_ZBwzD0O9B-6SNRvTUnqMk=.pem","location":"security-state-staging/intermediates/648ed62b-e5f8-42d4-83ee-7ca6d40b6d44.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gx/o4mBjRjGO5e2ioaSkT/ZBwzD0O9B+6SNRvTUnqMk=","crlite_enrolled":false,"id":"540cc7e9-1df2-416a-96b6-d6176d4ee3ed","last_modified":1591199862364},{"schema":1591167023478,"derHash":"AMDLqVy/4eJwgUJ18ytQXW5ZFsK22mf69N0wnubobL4=","subject":"CN=DigiCert Secure Site ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"a51772df4a2b835008c2a8c8dc0deb86a5aaec98e9697ee63a20924af248b9b2","size":1337,"filename":"mpDMzjSYAgr-a1VhfWcSLkk3xG29zzCRDJISnBodNVg=.pem","location":"security-state-staging/intermediates/f09648f8-e528-485c-9101-53303017f3fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mpDMzjSYAgr+a1VhfWcSLkk3xG29zzCRDJISnBodNVg=","crlite_enrolled":false,"id":"2e3dc91b-19d5-4380-b3e9-3b54bf59c028","last_modified":1591199862361},{"schema":1591167003672,"derHash":"qv3O5Xk7XPS/LQxfYELYpCK8wzs5Zaxig9JzzGm0g3U=","subject":"CN=Sectigo SHA-256 EV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"bb0c7ed52a4ba2392ff048a5246e2367101f04ffd385b39e3f25798fd40060a7","size":1654,"filename":"KlGkFBm4cI6bwYi3-GIwgmgYzH3wAO3Gtlqk0GMInns=.pem","location":"security-state-staging/intermediates/7b9ca479-5606-4a77-b93a-fe3bb5a328c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KlGkFBm4cI6bwYi3+GIwgmgYzH3wAO3Gtlqk0GMInns=","crlite_enrolled":false,"id":"8f019901-9110-45b1-a5f0-88464c331fdf","last_modified":1591199862359},{"schema":1591166999172,"derHash":"fTW/BMhXKCtCLoUeqKYit10uzLq2XVumJZjB2koR1QI=","subject":"CN=University of West Attica Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHFMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTYwNAYDVQQDDC1Vbml2ZXJzaXR5IG9mIFdlc3QgQXR0aWNhIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"e76cfc440a5e991448c5b38f99766a4faa2a624e64bf18924a3a70f16a63e272","size":2901,"filename":"Bm78D1XrPXTGXm5_bdFOIATkxbrsQopzy-GvKlFzrUk=.pem","location":"security-state-staging/intermediates/6adea3d9-6cbe-4104-beb4-08ef22d8c125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bm78D1XrPXTGXm5/bdFOIATkxbrsQopzy+GvKlFzrUk=","crlite_enrolled":false,"id":"6eb82243-bae6-4111-a042-bcbbe5d9dd18","last_modified":1591199862356},{"schema":1591167012948,"derHash":"tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=","subject":"CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"d2c3c0eb28e66976ac4acda4193e4e6b8892fa07ec37f9932f19408c824dc0a2","size":1654,"filename":"M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem","location":"security-state-staging/intermediates/aae99adb-feec-4ec3-b8f8-06e4b7cc8071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=","crlite_enrolled":true,"id":"1a6503c7-0f5c-4cde-8e28-452c972f857e","last_modified":1591199862353},{"schema":1591167002071,"derHash":"SS7uizqm6sCMK3ipdvEz5+I6FDkhCAfcTHNPk1qvpbo=","subject":"CN=CERTDATA SMIME OV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHAxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMjAwBgNVBAMMKUNFUlREQVRBIFNNSU1FIE9WIENBICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"98241269a4b1f56f2d27a325260ce43c94609dbfaf15d3cede526f6777068c39","size":2117,"filename":"Dr3UcttDQ-gWx98s4F3mRweUcI5P3LlsRG88w3HyeDY=.pem","location":"security-state-staging/intermediates/c0410e24-a6b4-4f3e-b115-5cc80074fda2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dr3UcttDQ+gWx98s4F3mRweUcI5P3LlsRG88w3HyeDY=","crlite_enrolled":false,"id":"b03a064b-a5c5-43d1-ab97-33e8f885f4a7","last_modified":1591199862351},{"schema":1591166994812,"derHash":"k+M699owMFMNCQycVXYsrefq6UP4NDSdEFepDrZ/MGs=","subject":"CN=DigiCert QV TLS ICA G1,O=DigiCert\\, Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwgSW5jLjEfMB0GA1UEAwwWRGlnaUNlcnQgUVYgVExTIElDQSBHMQ==","whitelist":false,"attachment":{"hash":"e53ef7db1684caaae756089b951bc6e4365a4f5c50235345441db0a95fe9771c","size":1943,"filename":"z2OteA0mfCO56LKn5Y19lFMNUGHucFGGWmVD8x0rpLU=.pem","location":"security-state-staging/intermediates/04030cb6-4ee3-4cec-92bb-45022fc5c066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z2OteA0mfCO56LKn5Y19lFMNUGHucFGGWmVD8x0rpLU=","crlite_enrolled":false,"id":"e117a5f6-6353-4757-b12d-27c470add07c","last_modified":1591199862348},{"schema":1591166996250,"derHash":"DLZoT2AcQW+ZKolAmRSjKgwgmXFodfX3jsDEaxtXCZw=","subject":"CN=University of Western Macedonia Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHLMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTwwOgYDVQQDDDNVbml2ZXJzaXR5IG9mIFdlc3Rlcm4gTWFjZWRvbmlhIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"980754593a22fa62c9411e8446cb7058f9764009306b6036fb1346607ad0d57a","size":2926,"filename":"pe7vO9l5Xa6m3aQk0-_tXQkCapBdsBH-eRONUxuj8co=.pem","location":"security-state-staging/intermediates/1b7dc9d7-f2ed-44cb-a349-acd5e1892a99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pe7vO9l5Xa6m3aQk0+/tXQkCapBdsBH+eRONUxuj8co=","crlite_enrolled":false,"id":"53f37f97-31b5-44e3-85e5-e6ffef357ebd","last_modified":1591199862340},{"schema":1591166990437,"derHash":"F0S0dBAf5qkZNvXmAwfGPaWLiEBbBFMj3sjIwAF2r3c=","subject":"CN=National and Kapodistrian University of Athens TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGQMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFIMEYGA1UEAww/TmF0aW9uYWwgYW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"36053c828d125835e8d94289286aea2da2d611fec7d55eabcf9ed7ff6f47c393","size":2922,"filename":"PmFP9aUtjAk7nFzQ7X_3QtLDOEdeNBJ9s0RIbfOFB9Y=.pem","location":"security-state-staging/intermediates/54a5ee4d-75d7-428c-82ca-9a69b743198e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PmFP9aUtjAk7nFzQ7X/3QtLDOEdeNBJ9s0RIbfOFB9Y=","crlite_enrolled":false,"id":"bb3988df-aa14-46bc-8a96-cb5ed802ce77","last_modified":1591199862337},{"schema":1591166987528,"derHash":"ysBfTwUIEJkybc8nxNlwqKPqkU5nkq2swQSWEcntQ7o=","subject":"CN=SECOM Passport for Member PUB CodeSigning CA G1,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGaMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMTgwNgYDVQQDEy9TRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDb2RlU2lnbmluZyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"88cb4e998412b8161dd4cce63fae57821221160429b49ae302868eca99d858e1","size":2211,"filename":"svXZ_or9Iyq1IFvQhPesIt1V12hnn6Emvsxku1znTIQ=.pem","location":"security-state-staging/intermediates/b9f92943-09e8-4e6d-b04f-31095d30490d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"svXZ/or9Iyq1IFvQhPesIt1V12hnn6Emvsxku1znTIQ=","crlite_enrolled":false,"id":"cd8685fc-3e6f-4bb0-8774-0ae8d85693c5","last_modified":1591199862334},{"schema":1591166984645,"derHash":"l8S0QxYFXyalKh9mTOOFgAqWSoVSyZ0ryv1hjm2AdKA=","subject":"CN=DigiCert Basic ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"212fb078da2ffbb3ac1149f0dbd37bafc1c192f15595649f27ba9a328c516a96","size":1382,"filename":"Mg4fdox_AdxNXF8FVxl956AK4z_M3V3fNH5JYxAVfu4=.pem","location":"security-state-staging/intermediates/b674bdb2-2b94-4918-8068-2c0bcb83439d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mg4fdox/AdxNXF8FVxl956AK4z/M3V3fNH5JYxAVfu4=","crlite_enrolled":false,"id":"0c53b0b5-57c7-4119-9ba9-b6a454b96cfd","last_modified":1591199862328},{"schema":1591166993298,"derHash":"+4YtCEkljX2WtqKwFY0IFCJy5NPKglv/w2MF9dKBFsU=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"089f758bacd904da828169799bc711fcbeb3ec968700dd5a8e37334f30a724e3","size":1479,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/ef80ac11-e55c-4e76-90b7-55a5776cb672.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"747de98b-4252-4064-b892-7ad013087eee","last_modified":1591199862326},{"schema":1591166986072,"derHash":"N4NPpepA+/e2EZaVWWLhygVYhyQ15CBmU9P2IN2OmI4=","subject":"CN=GEANT OV RSA CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBPViBSU0EgQ0EgNA==","whitelist":false,"attachment":{"hash":"18b4437cd205bd9ac9702220d5adb3aa3cbabf10cec7c537606362b8d30ed943","size":2450,"filename":"j0qRK9S0oUba9b4ttZdKp42Q4T2J8S4FFKPNG5FTFVA=.pem","location":"security-state-staging/intermediates/cc610264-2385-48c0-8360-41da294451ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j0qRK9S0oUba9b4ttZdKp42Q4T2J8S4FFKPNG5FTFVA=","crlite_enrolled":true,"id":"91ec81f9-4c89-4c52-bf16-828510b256ac","last_modified":1591199862323},{"schema":1591166981675,"derHash":"9gbY3rJ8BAHzTntqN8jipR242gJr5YoH6FS2ht50xpo=","subject":"CN=KICA RSA DV CA,O=KICA,C=KR","subjectDN":"MDUxCzAJBgNVBAYTAktSMQ0wCwYDVQQKEwRLSUNBMRcwFQYDVQQDEw5LSUNBIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"318379d0564ebe89aa14dff5f62506a9553f6d9d680f10e82a54fa192e67f398","size":1569,"filename":"cK05Ok8jo8SXlxRdWcmPHjPUXO0-KqZKDWAQhEkCcCs=.pem","location":"security-state-staging/intermediates/d52fd294-49a6-40bb-a05a-5fdd485b772d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cK05Ok8jo8SXlxRdWcmPHjPUXO0+KqZKDWAQhEkCcCs=","crlite_enrolled":false,"id":"d1256819-e772-4787-a82e-3e8aaeb2120a","last_modified":1591199862320},{"schema":1591166988974,"derHash":"b+O0p6moUlWcHffqQH+vPZvxdvQOUaFF1XaQ+ih8BWs=","subject":"CN=Trust Italia Class 2 Consumer Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHExCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUQwQgYDVQQDEztUcnVzdCBJdGFsaWEgQ2xhc3MgMiBDb25zdW1lciBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7b226066c603caaf929b3d86c889809d734dce014b67e674ccd4a93d032dff0f","size":1752,"filename":"Y8cllDVPXsCqMnw5qEva_MDC_VRf4wx4J3MjppPCdmY=.pem","location":"security-state-staging/intermediates/0df5e9cd-f031-4578-a6e7-a9ffc40ef37b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y8cllDVPXsCqMnw5qEva/MDC/VRf4wx4J3MjppPCdmY=","crlite_enrolled":false,"id":"ba658967-ce3c-4045-b431-b94346eed3b3","last_modified":1591199862314},{"schema":1591166978625,"derHash":"2rP6DW6CEAb+cJrhIXarovOXcGzJxx9cHA0JgETa69w=","subject":"CN=HARICA QWAC RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),L=Athens,C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMSswKQYDVQQKDCJHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMRgwFgYDVQRhDA9WQVRHUi0wOTkwMjgyMjAxNzA1BgNVBAsMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExITAfBgNVBAMMGEhBUklDQSBRV0FDIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"f227a120f73f7c94eea56c73047fd7bc0c8d6c1c7f2e43d3dc8bc4bfe55156dd","size":2568,"filename":"4_BwvJtY4Tb6_B1gdFJmSV4cG4FmBSDa7puZdnWS2Pk=.pem","location":"security-state-staging/intermediates/9864323a-90b7-4153-a038-810578cb55eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4/BwvJtY4Tb6/B1gdFJmSV4cG4FmBSDa7puZdnWS2Pk=","crlite_enrolled":false,"id":"310263a5-bb52-41c2-8048-2d24f253c95e","last_modified":1591199862312},{"schema":1591166977096,"derHash":"l6cYCCt47nSAl5shFtS6AhXGGqpSC0bKa5wqs3j0CCE=","subject":"CN=Sectigo SHA-256 OV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"7e3339701c1e2d499ba3def9492001c41adc810c4a458724657109305f3cec89","size":1613,"filename":"318hNJIiS7rMUgV2mjh-LHcZUnFNjtl4to5OuT2nr4s=.pem","location":"security-state-staging/intermediates/6f711398-7de9-46d1-bae2-5455d21b7f77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"318hNJIiS7rMUgV2mjh+LHcZUnFNjtl4to5OuT2nr4s=","crlite_enrolled":false,"id":"59c27eb3-4715-484a-82f5-7afdcdc2eedb","last_modified":1591199862306},{"schema":1591166972688,"derHash":"4cSwtb6SRx7sKI2yquyA++Bl+66MmppXaY172J8wcDE=","subject":"CN=CERTDATA SSL EV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBFViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"088b10c1c11e8d18ab606970a0a1d199bee8b60e73f3e3ace0f39fb2a23ad934","size":1325,"filename":"9vCfWQvK73Fpm-vFHRSFb1GMEe-jrHgkRGYDgnPa5M0=.pem","location":"security-state-staging/intermediates/64a98518-89e2-4dff-904a-5f9b145dff93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9vCfWQvK73Fpm+vFHRSFb1GMEe+jrHgkRGYDgnPa5M0=","crlite_enrolled":false,"id":"0971425c-d185-4d5e-bde8-ffbc73ce3ff6","last_modified":1591199862300},{"schema":1591166980064,"derHash":"nDXokHtUmiYAKUKnkY4y4URQP+NCJhsH2Cuw1J1z2RI=","subject":"CN=Trust Provider B.V. TLS ECC EV CA G1,O=Trust Provider B.V.,C=NL","subjectDN":"MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBFQ0MgRVYgQ0EgRzE=","whitelist":false,"attachment":{"hash":"953d2f55cb4e36af74de0869d7a372e01732610473e423b3b655c9de264a2efd","size":1297,"filename":"lbgvzVAS_HD1uhWtKd_pFMrEGQXAJsWzN-B8qi3z2Jk=.pem","location":"security-state-staging/intermediates/9b32bfa2-9970-42cc-94f9-296198748c61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lbgvzVAS/HD1uhWtKd/pFMrEGQXAJsWzN+B8qi3z2Jk=","crlite_enrolled":false,"id":"3b26ac86-1633-45de-ac90-e6202efc1efe","last_modified":1591199862298},{"schema":1591166969828,"derHash":"6keT4uuBTUMmH4Borv3ng7g358AhrBnI6bCFUfLWyD8=","subject":"CN=University of the Peloponnese Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHJMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTowOAYDVQQDDDFVbml2ZXJzaXR5IG9mIHRoZSBQZWxvcG9ubmVzZSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"e434a384ec70a2f55224b8dba36988a5cc832b8efb47eff89c3e75c99a16d366","size":3897,"filename":"5FgD1hywYOFqq6q8GjfE0VbAd_BXMtIzKXSTe5rs_jU=.pem","location":"security-state-staging/intermediates/3c978eca-7a9d-4ea7-91c6-2b91b0add092.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5FgD1hywYOFqq6q8GjfE0VbAd/BXMtIzKXSTe5rs/jU=","crlite_enrolled":false,"id":"6efe66d3-a1a9-44c7-b6fb-84fed7ca0d86","last_modified":1591199862295},{"schema":1591166975559,"derHash":"ytA6WE5YU5uJGS7EnOp6bY7XJCrV3N+D+W0IfwnyMts=","subject":"CN=GEANT eScience SSL ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"ME4xCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSQwIgYDVQQDExtHRUFOVCBlU2NpZW5jZSBTU0wgRUNDIENBIDQ=","whitelist":false,"attachment":{"hash":"7db15ec19aae6dfd33627c70072ae0be041ec482c68931ac550f8e7ecbe82a38","size":1276,"filename":"nzYOlulDufoKXDgcAhC63BnT5t74_zG2ZFweTlq2pTA=.pem","location":"security-state-staging/intermediates/82fcc086-5e5e-43f4-b969-d11903a233b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nzYOlulDufoKXDgcAhC63BnT5t74/zG2ZFweTlq2pTA=","crlite_enrolled":false,"id":"3ae9678b-4310-42e4-8c4b-a2bd36359c71","last_modified":1591199862292},{"schema":1591166971277,"derHash":"MJ5sgAPP4bmr/d+86sK/24ftkniIl2Pk2MBvZgQGAfs=","subject":"CN=TrustOcean Organization Validation Pro SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxNjA0BgNVBAMTLVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gUHJvIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"07bddd64aebedac19bab91ba8353765dd92a8b9a4f03b70b0a65f48dd0852316","size":1276,"filename":"wO_TPO2pacd9S4TXCA6ZK5sbowZLU3pvj1j4lewK054=.pem","location":"security-state-staging/intermediates/fadb40d2-243a-4c13-b44e-88de44fe0e39.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wO/TPO2pacd9S4TXCA6ZK5sbowZLU3pvj1j4lewK054=","crlite_enrolled":false,"id":"2f68d515-67c7-4d03-b155-933ce48d47a6","last_modified":1591199862289},{"schema":1591166966944,"derHash":"peSmK2AQBtwX5KyvSXd3v9fS8+Um/HDKHyIJTIyzkWY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"7ddf736675486e01c80cd307d0f3193f2bbd4866fbd4cf47e6f478fe688f46a6","size":1479,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/43b64ec8-51d9-48a3-8273-22a78716681e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"f942e88e-4d39-4260-8629-7493a5de205f","last_modified":1591199862287},{"schema":1591166965541,"derHash":"vEicbcK94lP1hto0E01mQLi1g6MSCJzhCTPEvAP8XzM=","subject":"CN=University of Piraeus Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTIwMAYDVQQDDClVbml2ZXJzaXR5IG9mIFBpcmFldXMgQ2xpZW50IFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"0714cf4a610f08f71ee755e1a2bc9a6125e97457fc94bd11adbe1fbf13e199bc","size":2881,"filename":"aEyGET6vMUZ78LzXlMwp7zrJc54FqQbkEpltCsA0Ym0=.pem","location":"security-state-staging/intermediates/dbf2652a-44f6-4622-99f7-5a0260fb6902.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aEyGET6vMUZ78LzXlMwp7zrJc54FqQbkEpltCsA0Ym0=","crlite_enrolled":false,"id":"66be0711-b86b-410c-ba66-83267576a61b","last_modified":1591199862281},{"schema":1591166962590,"derHash":"ansqo0FAOaZj1di7q4JWo5eahMMyv14e6PbQ4K2oRmg=","subject":"CN=DigiCert QV EV TLS ICA G1,O=DigiCert\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwgSW5jLjEiMCAGA1UEAwwZRGlnaUNlcnQgUVYgRVYgVExTIElDQSBHMQ==","whitelist":false,"attachment":{"hash":"da7ebd3537612c5ba7de71120be602b9e04c9127ce688075aa408dbe6025f441","size":1943,"filename":"WlGHvWN6kWbS5I0pZA1mzBa36H7tg_dkp0nOMyIfpIg=.pem","location":"security-state-staging/intermediates/fdd44b41-87a8-41b1-b24d-bc629efb1193.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WlGHvWN6kWbS5I0pZA1mzBa36H7tg/dkp0nOMyIfpIg=","crlite_enrolled":false,"id":"2b7934df-863e-4ca7-a586-c7e3f8289d51","last_modified":1591199862278},{"schema":1591166961182,"derHash":"mFFAkZNCI5yJCGsi38qkUIWQsRo94KQj4l68Pdr4kQ0=","subject":"CN=DigiCert Secure Site Pro ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLjAsBgNVBAMTJURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFQ0MgQ04gQ0EgRzM=","whitelist":false,"attachment":{"hash":"abadc7dab3aa3ce9c3b3984b57de541e8e2155f1acb9659ec05255d0505f836a","size":1341,"filename":"ljUnYjVBy0mvbfWJdhWfQmd_OGXEqZ6sBA-BZTbrSVY=.pem","location":"security-state-staging/intermediates/69abe7b3-bea5-4ac4-b147-b7a9c256cfae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ljUnYjVBy0mvbfWJdhWfQmd/OGXEqZ6sBA+BZTbrSVY=","crlite_enrolled":false,"id":"d5251cce-28fd-44ee-97af-2b2fea57506d","last_modified":1591199862273},{"schema":1591166956588,"derHash":"xCTcOtYm1EP8rqlxA8tki552MryM2TyW2rsdYFk3IR0=","subject":"CN=Trust Italia Class 2 Managed PKI Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHQxCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUcwRQYDVQQDEz5UcnVzdCBJdGFsaWEgQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"2b320fdd4d82aab2b8852ba0e230e7f6687512ad7a4d5bb5db260f796b144559","size":1756,"filename":"Y24lFs1PJyWMpmHV04a28-0WEzBV7ZwjGI-b6o_a1xE=.pem","location":"security-state-staging/intermediates/2607592c-0c94-43f5-88a4-9642f57c2771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y24lFs1PJyWMpmHV04a28+0WEzBV7ZwjGI+b6o/a1xE=","crlite_enrolled":false,"id":"1b18f8e1-bb52-4c71-a2b4-dd715bd30d34","last_modified":1591199862270},{"schema":1591166959669,"derHash":"e5d410LenRGp6AKurLE9W3D5CrT/fGPEEr7vQgJQElA=","subject":"CN=TrustOcean Encryption365 SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxKDAmBgNVBAMTH1RydXN0T2NlYW4gRW5jcnlwdGlvbjM2NSBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"13a6ab9380accd50f6b136c0959380987299900d1e88f93608d04d9164ba247d","size":2093,"filename":"SQofq62FvYueQ205OJiQThWVUH_MQwaHQWw2twlwTDo=.pem","location":"security-state-staging/intermediates/fe167bbc-49ae-4867-b511-147e23b615bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SQofq62FvYueQ205OJiQThWVUH/MQwaHQWw2twlwTDo=","crlite_enrolled":false,"id":"958e59d8-df82-40f3-8891-c1afbc81139d","last_modified":1591199862267},{"schema":1591166958294,"derHash":"CE7KcKm0Dk4VY+NXdrcW5BCpcrsn7VHCSMSNMkL6ja8=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHWMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUcwRQYDVQQDDD5IRUFMLUxJTksgSGVsbGVuaWMgQWNhZGVtaWMgTGlicmFyaWVzIExpbmsgQ2xpZW50IFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"a6f0308fffdec71204189a96efafbbe956e995e60418265f274c6bd2476b8c78","size":3031,"filename":"_Kft_K_873z0mlP2VRjp4LH9H_mcuLMh9d5dMp190iM=.pem","location":"security-state-staging/intermediates/e9daf701-b37c-4436-a783-4b2fd35b7700.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Kft/K/873z0mlP2VRjp4LH9H/mcuLMh9d5dMp190iM=","crlite_enrolled":false,"id":"017d1e6a-3d57-4f28-bde8-d93e1818bf31","last_modified":1591199862264},{"schema":1591166952132,"derHash":"saj9QLQ33tly9XQ3BiLiu7L5uVk7wFBNfiAw8rJOZ/o=","subject":"CN=GEANT Personal ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBQZXJzb25hbCBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"bd13e9c72f30021203129679456a87eaec1c3ebc91620c3355c3c943cdf5c9d1","size":1272,"filename":"x9rdz7WXOhNwDB_vccBkt66zVPn9EqlDFEDj0tN29TE=.pem","location":"security-state-staging/intermediates/23ee9177-81be-49de-b088-b5e00cf4c5ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x9rdz7WXOhNwDB/vccBkt66zVPn9EqlDFEDj0tN29TE=","crlite_enrolled":false,"id":"d7220a44-b71d-43aa-aceb-9f6f42b35563","last_modified":1591199862262},{"schema":1591166953641,"derHash":"rgO5rRcQaih4WDCx3NY2eXxMZNgcuNFhWV26+DQz5kw=","subject":"CN=CrowdStrike OV SSL Issuing CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFUxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSswKQYDVQQDEyJDcm93ZFN0cmlrZSBPViBTU0wgSXNzdWluZyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d681fc0b6a1cbda829e8ebba97a30707ab2d95062c3ef6bce4b7e7555d3584cf","size":1792,"filename":"lHRUL7zqcHfSFUzbd0WqRZOXK57EqS8L6C4CJmQ5Npo=.pem","location":"security-state-staging/intermediates/8097ddb1-fac8-4626-acdd-d1b8ae316ae4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lHRUL7zqcHfSFUzbd0WqRZOXK57EqS8L6C4CJmQ5Npo=","crlite_enrolled":false,"id":"6aa2e51f-636d-455e-a044-c2edde8889f6","last_modified":1591199862259},{"schema":1591166947809,"derHash":"8bQTkri3zVpFay1Kkbe89szvIpS4tuYs/zj5w6J5bwY=","subject":"CN=GlobeSSL OV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIE9WIENB","whitelist":false,"attachment":{"hash":"6276193f8ef60a83e6b2a01cea8c469f7785960d98bb97c057e1ca2b3843e6a6","size":2085,"filename":"mfCBWjYYEugo1yhASbIoRwohL9WPkl5owslIdpTfCno=.pem","location":"security-state-staging/intermediates/4a4d3b84-603d-4f56-ae5f-96b87fd11076.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mfCBWjYYEugo1yhASbIoRwohL9WPkl5owslIdpTfCno=","crlite_enrolled":false,"id":"b2fe309b-8a3e-44b2-b214-099b8f793b32","last_modified":1591199862253},{"schema":1591166955049,"derHash":"IgBA3aN3yURCnozpE7fYGzbeNOvy3CGNIGY5PZSGNDk=","subject":"CN=Democritus University of Thrace TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE5MDcGA1UEAwwwRGVtb2NyaXR1cyBVbml2ZXJzaXR5IG9mIFRocmFjZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"633a331af1df260887adfe035dd9a69e0eac22b2b0e008c5072c8e7173f0a5dd","size":3677,"filename":"hwhNNDnScyM0IPzP1QnWxg68NK1ZdubxLavxfWWRRq8=.pem","location":"security-state-staging/intermediates/eefd61d3-4ede-4b5b-8b11-2b05034967e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hwhNNDnScyM0IPzP1QnWxg68NK1ZdubxLavxfWWRRq8=","crlite_enrolled":false,"id":"f1b5b7ab-27cf-4b2f-8a24-24d137c1fd82","last_modified":1591199862251},{"schema":1591166946335,"derHash":"t+EkLZaU+1AlsJaWT6dq997Z9VrkpnpCCtxfnRGzrTM=","subject":"CN=CERTDATA SSL DV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBEViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"790d8b9e3ba565304aee9733ce4b0e0bfd2096f72e2e0601b8df408f07910a53","size":1293,"filename":"KCVGX9PZojp3nb42QFg8CInxwnSWCYZ4kG3HC87bf4o=.pem","location":"security-state-staging/intermediates/24bcf52a-aa3c-4d05-8236-9a1e72833516.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KCVGX9PZojp3nb42QFg8CInxwnSWCYZ4kG3HC87bf4o=","crlite_enrolled":false,"id":"404783d0-cde7-4f2f-a512-dc32c5183168","last_modified":1591199862248},{"schema":1591166941957,"derHash":"26wvrk+MlJsaMM+HHqtYlX9kILeXpRJVBrjO3Uj114Q=","subject":"CN=GEANT EV RSA CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBFViBSU0EgQ0EgNA==","whitelist":false,"attachment":{"hash":"a81d6464a4c6c0326479b46fc4a739c1ebd123cdfdd13ed5be6d44d55df9d953","size":2450,"filename":"BPjQDgce-sDBA1ay4Jv5JRXoEJZUq9x6xkxGPweoK8o=.pem","location":"security-state-staging/intermediates/957ee282-8db5-484b-b663-4f8f5fd4418b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BPjQDgce+sDBA1ay4Jv5JRXoEJZUq9x6xkxGPweoK8o=","crlite_enrolled":true,"id":"2d3008cc-2ef8-4483-8a08-556cf24cc117","last_modified":1591199862245},{"schema":1591166938789,"derHash":"tfTF0YWoyHx4tvZ9/c/U4buwc+d6JkRV2pYd2b6R0c4=","subject":"CN=ZeroSSL ECC Business Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"ME0xCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSwwKgYDVQQDEyNaZXJvU1NMIEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"f5c243c2a7e060190fd8f59984d77e4edc40f58294bf379fcdfdc67342935f80","size":1284,"filename":"joN60utJv0YtzK4dit_eZatsv9Qz7o9doV9ZOgCp2Y8=.pem","location":"security-state-staging/intermediates/922b61f4-a9a8-47c2-8bb5-04f65f00c145.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"joN60utJv0YtzK4dit/eZatsv9Qz7o9doV9ZOgCp2Y8=","crlite_enrolled":false,"id":"3a7be123-83ee-4956-b198-0fb8e0ba83f7","last_modified":1591199862242},{"schema":1591166949219,"derHash":"/nNANw1ZWjn/4Q3OIZdEfOZ8mL4o8DMMj8hd0DISSG0=","subject":"CN=XinChaCha Trust SSL Extended Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xLzAtBgNVBAMMJlhpbkNoYUNoYSBUcnVzdCBTU0wgRXh0ZW5kZWQgVmFsaWRhdGVk","whitelist":false,"attachment":{"hash":"11c238131ce3dc238f6eaf26ec690ecf4d548a913c3c5bc452afce5fbc790b99","size":1776,"filename":"eMfyN-Ikg69beln4AW1OIVajdbo0bMtS7jlQTjdmeVM=.pem","location":"security-state-staging/intermediates/e6f8b0f0-9bb3-4ffd-b7bc-95b78916692e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eMfyN+Ikg69beln4AW1OIVajdbo0bMtS7jlQTjdmeVM=","crlite_enrolled":false,"id":"93b12a0d-0df4-4127-af9a-a1ef7dbef757","last_modified":1591199862239},{"schema":1591166943449,"derHash":"6tyA999jBWDMGzU/aOpmAVnOlm4i1ARYh4B4fAR20OQ=","subject":"CN=Greek School Network Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHAMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChHcmVlayBTY2hvb2wgTmV0d29yayBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"91da938723919124b3744b40cb7465eb0441bb9d657002500df3379c62df1aff","size":3356,"filename":"JZb0xnTbHxn3GgHZAAa8PyGC1eaFoUGTxOKLXnmjA5U=.pem","location":"security-state-staging/intermediates/681f152c-a338-407e-905a-352955fbadfa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JZb0xnTbHxn3GgHZAAa8PyGC1eaFoUGTxOKLXnmjA5U=","crlite_enrolled":false,"id":"95cec1f6-13e2-40e5-8b62-dbb5123c691d","last_modified":1591199862236},{"schema":1591166940293,"derHash":"PzsNaiB8UKWCnxsf4ca8O2YQYIV3RhTBIie3ZnKO0q4=","subject":"CN=ZeroSSL RSA EV Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEcxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSYwJAYDVQQDEx1aZXJvU1NMIFJTQSBFViBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"f28bd1dd2858c64b5c7d1c3058a2d544f0ea768abc37a7d72e159566eecca98e","size":2454,"filename":"25iQFhK1cn8vc_vird2SyolWQqiVsnbjTu9eZlX690I=.pem","location":"security-state-staging/intermediates/ddc002a3-f79f-459e-ac61-cdfd850062c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"25iQFhK1cn8vc/vird2SyolWQqiVsnbjTu9eZlX690I=","crlite_enrolled":false,"id":"c853522e-9668-40f2-8f15-ce50259bbbd8","last_modified":1591199862233},{"schema":1591166944923,"derHash":"cDQIhtCP4bCTFY8RpMwrKtRaZ/QCYyoEDpBnxuRH5P4=","subject":"CN=Telenor Norge AS OTL CA G2,O=Telenor Norge AS,C=NO","subjectDN":"ME0xCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSMwIQYDVQQDExpUZWxlbm9yIE5vcmdlIEFTIE9UTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"d438922f73cc95a79a030a5b88b1deff430948c8e65d26d6889657785975664c","size":1955,"filename":"XuXysKYz8525S8d1tzSylmtHnnsKgXMnjn2sP1DuoMo=.pem","location":"security-state-staging/intermediates/32ba931d-0b1a-4777-a7bd-9d236db04e41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XuXysKYz8525S8d1tzSylmtHnnsKgXMnjn2sP1DuoMo=","crlite_enrolled":false,"id":"d779a32d-7743-44cb-876e-eab354bd767c","last_modified":1591199862230},{"schema":1591166935697,"derHash":"aZGdgg7fWCrbz44JKpKE2QF3LuK0Geqd4fWHLHkfxvo=","subject":"CN=Thawte EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBSU0EgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"ce1818d94d078e469bacac8ce640901ec6f9ef4e08ee8ed1295da929ca3f4723","size":1626,"filename":"5jGxIiaHNj15fBcUBvvAsMfKNtiK_podXNf0YoRUoeI=.pem","location":"security-state-staging/intermediates/f5157a19-89e9-4513-9b51-b540e430b34c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5jGxIiaHNj15fBcUBvvAsMfKNtiK/podXNf0YoRUoeI=","crlite_enrolled":false,"id":"e05d537c-e98a-4c16-8476-344896c66748","last_modified":1591199862227},{"schema":1591166929792,"derHash":"ODkvF857aCwZjSnG5x0nQJZKIHTI0lWObP9kwngj8Sk=","subject":"CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"f9fb67b8408e95dec2ccd730836629e9b9d21217185bc11efea7ba000d32c9b2","size":1963,"filename":"grX4Ta9HpZx6tSHkmCrvpApTQGo67CYDnvprLg5yRME=.pem","location":"security-state-staging/intermediates/866b660e-4e5e-4198-8a99-1bfad68e708d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"grX4Ta9HpZx6tSHkmCrvpApTQGo67CYDnvprLg5yRME=","crlite_enrolled":true,"id":"11673ac8-c50e-4666-a891-ff70f87c1a73","last_modified":1591199862224},{"schema":1591166937148,"derHash":"bKPl13ICFflFRFI+PEdLItppxzKuRV3IL49e4wLsVfw=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"9ed7588547d656029af2bccfd199a781d49253141c1b25fe3816f388e01a40ba","size":2276,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/d1dd8476-0af4-4e05-ae35-f513f493a2a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"54dcf0fb-88b2-43d1-b183-0d27f9f1ca7e","last_modified":1591199862221},{"schema":1591166925354,"derHash":"yE485bLKhdXfmHLf3awqoDrWJyV6/ZL39yCZLQA9hHw=","subject":"CN=TrustCor OV Email CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFcxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIjAgBgNVBAMMGVRydXN0Q29yIE9WIEVtYWlsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"81ae2e960751b130d0b99f592bb364874c086c4953fc4713f9acde4303430257","size":2487,"filename":"5_U9kCeaRySTk4HsUFuOXpJ_NJ08eeHqbukItZJ_DmA=.pem","location":"security-state-staging/intermediates/e7f12a82-e8f6-40a3-a1df-8d55d14e713e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5/U9kCeaRySTk4HsUFuOXpJ/NJ08eeHqbukItZJ/DmA=","crlite_enrolled":false,"id":"2bc63522-d07a-4d32-b1dc-4fa0c956f17c","last_modified":1591199862219},{"schema":1591166928355,"derHash":"vJE3miHnveEbRVvx1RGGMxaCgFpKNTqO4lj3oDcGxmQ=","subject":"CN=DigiCert Secure Site Pro EV ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMTAvBgNVBAMTKERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBFQ0MgQ04gQ0EgRzM=","whitelist":false,"attachment":{"hash":"175f55c6e184737a8ef08da7da2ba8eeb68ccb7a8f4c26cb4135728b20cc7228","size":1374,"filename":"ABohyUv2yKwrj07ViEB9SgfSMpe6-G4RvaB7869gYaQ=.pem","location":"security-state-staging/intermediates/62c0ef15-c0da-4ff8-958c-8a5f9420afe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABohyUv2yKwrj07ViEB9SgfSMpe6+G4RvaB7869gYaQ=","crlite_enrolled":false,"id":"0197f7a1-e219-43b2-b473-43a75d63a1a6","last_modified":1591199862216},{"schema":1591166931233,"derHash":"9lG1yq2Qm8SzM6TDzHN76crUmJD7ltItvB4h438NtVE=","subject":"CN=Sectigo Partners - Client Authentication and Secure Email - RSA,O=Sectigo Limited,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxSDBGBgNVBAMTP1NlY3RpZ28gUGFydG5lcnMgLSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCAtIFJTQQ==","whitelist":false,"attachment":{"hash":"45e2cb2916cebbc90466fd2304cb16497db3d816cf32d7d3cebe897ace744a9c","size":2280,"filename":"89Ol1fIDO-V67gTYc90uHy6AX2aUkT-e7bZJZPsPRDY=.pem","location":"security-state-staging/intermediates/46453155-431d-4965-a199-bbcc878c82de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"89Ol1fIDO+V67gTYc90uHy6AX2aUkT+e7bZJZPsPRDY=","crlite_enrolled":false,"id":"db218d0f-2b15-4354-b0c0-aa1aeb5bad5c","last_modified":1591199862213},{"schema":1591166934097,"derHash":"jG24FxrmeF8FQmrljD0291WTUiAukgm50psb1EeWHcg=","subject":"CN=SECOM Passport for Member PUB CA5,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTU=","whitelist":false,"attachment":{"hash":"778625b74bb48d643b387a0656870db1b5624e8da9cf6eb4625cb095b6badcbe","size":1833,"filename":"v3h5R_3OzMC-NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=.pem","location":"security-state-staging/intermediates/93efcc52-53a0-4409-91be-be430a0c43f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3h5R/3OzMC+NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=","crlite_enrolled":true,"id":"54d7197f-50f6-43db-a133-6f98696362d5","last_modified":1591199862210},{"schema":1591166922501,"derHash":"BHeVeFzc/55uCuEiSS5be/CKnlxJdi4ry1J0fGkDFWE=","subject":"CN=NETLOCK Trust EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMR4wHAYDVQQDDBVORVRMT0NLIFRydXN0IEVWIENBIDM=","whitelist":false,"attachment":{"hash":"5baaa1ca8ca90156561df8c1bc2cd10801794f20c1984d55bbcedeb1417c7dd2","size":2203,"filename":"vRSkgbqFoy29lSNM6Ih557Nl-K07Rwh3GriW7t3fMJw=.pem","location":"security-state-staging/intermediates/7c1161bd-10bb-4642-b809-92c87a367bf2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vRSkgbqFoy29lSNM6Ih557Nl+K07Rwh3GriW7t3fMJw=","crlite_enrolled":false,"id":"75389d14-b6d9-4b99-8f96-a61e30aaa117","last_modified":1591199862208},{"schema":1591166926812,"derHash":"yYFBK1WBDDfBgm0kZn0ayos21uvwmm2MjlRZBT/hweU=","subject":"CN=CrazySSL ECC CA,O=TrustOcean Limited,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"747b534a20d09d3120dad524bafdfbf5cb11711b35f79294ed033004fb14560b","size":1232,"filename":"ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe-OCri6lbwMZgQ=.pem","location":"security-state-staging/intermediates/36d8be0c-e7bf-47dc-9c16-a44982c5b45a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe+OCri6lbwMZgQ=","crlite_enrolled":false,"id":"fac0b4a6-912b-4c27-9d25-3f313e16c85e","last_modified":1591199862202},{"schema":1591166921097,"derHash":"iKuWH2T5No9MTRMH9Z1OWcXlcPhSpsUROo/yjgQxUVc=","subject":"CN=Atos TrustedRoot Client-CA for Worldline 2020,O=Atos,C=DE","subjectDN":"MFQxNjA0BgNVBAMMLUF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBXb3JsZGxpbmUgMjAyMDENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"8895b7aafb7411c125d5f5f5e5c9cc15845e1090369326b33c602d60f278f664","size":2008,"filename":"zPRLgkk0XdrL8_6Lzu5ze4i8hb4_92LoMI-3ehy---c=.pem","location":"security-state-staging/intermediates/197f3e64-6163-4266-a36d-a1f82bbc2ed3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zPRLgkk0XdrL8/6Lzu5ze4i8hb4/92LoMI+3ehy+++c=","crlite_enrolled":false,"id":"5bdbdd05-0f5d-45cc-8395-71ce201b26dc","last_modified":1591199862199},{"schema":1591166919650,"derHash":"TUC18q3mX5K6SHoN0TnaJ1YSIAwcBpVR1Vdh0xr+9U0=","subject":"CN=TrustOcean Organization Software Vendor CA,O=TrustOcean Limited,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMzAxBgNVBAMTKlRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFNvZnR3YXJlIFZlbmRvciBDQQ==","whitelist":false,"attachment":{"hash":"e39d05e5f9c53252def849bf70674041fa74e229d6f216deade7fa12494cb266","size":2081,"filename":"DNaN9ECmC5lN-TJRanHzxHgUnOqZKkkYnFou0gIs0Rs=.pem","location":"security-state-staging/intermediates/013ea5f1-eeed-4770-b182-f088fce7cf3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DNaN9ECmC5lN+TJRanHzxHgUnOqZKkkYnFou0gIs0Rs=","crlite_enrolled":false,"id":"12d3c939-3013-4a58-bb98-f8641d3f5b70","last_modified":1591199862196},{"schema":1591166923906,"derHash":"0DgqxYGfla0QI4y+bjxO09gkHNlU0mU/6kcKyfOQzU0=","subject":"CN=GEANT eScience Personal CA 4,O=GEANT Vereniging,C=NL","subjectDN":"ME8xCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSUwIwYDVQQDExxHRUFOVCBlU2NpZW5jZSBQZXJzb25hbCBDQSA0","whitelist":false,"attachment":{"hash":"0c9a8a1c3c7a80001a8265136dbe7ab0ca180b5cb986f88f590c1306ef88e1e4","size":2467,"filename":"E5rMC3LvWxbIbmC1yqxjOfCRXR4VmimCyZ810qKd2yc=.pem","location":"security-state-staging/intermediates/1865fc47-5288-451c-bc32-7bcf66172e9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E5rMC3LvWxbIbmC1yqxjOfCRXR4VmimCyZ810qKd2yc=","crlite_enrolled":false,"id":"2ad040cf-f92c-4396-a43f-3ff1ceaf2e87","last_modified":1591199862194},{"schema":1591166918242,"derHash":"OZWwGheACuz1SA6TnZ2kTtzMfPKTVlfGF51aHvol100=","subject":"CN=Athens University of Economics and Business TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGNMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFFMEMGA1UEAww8QXRoZW5zIFVuaXZlcnNpdHkgb2YgRWNvbm9taWNzIGFuZCBCdXNpbmVzcyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"11ea0406dfeeaa9f5ad947fa44f5668e897816a0cef799c302cf631508960b47","size":2877,"filename":"oHI6zIj2JBHJtqjt17sQSYylYI0zRaSACkBuS9578tg=.pem","location":"security-state-staging/intermediates/62628027-0ac7-4ce7-9faf-8e1d69efd621.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oHI6zIj2JBHJtqjt17sQSYylYI0zRaSACkBuS9578tg=","crlite_enrolled":false,"id":"73ad1e50-a261-4fd2-ad3f-4bdaad97c2af","last_modified":1591199862191},{"schema":1591166916773,"derHash":"YCHUo83r2Y1SmCNfWIH0uWnXHUPz7j3xVr8jYwsHrjs=","subject":"CN=GEANT eScience Personal ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSkwJwYDVQQDEyBHRUFOVCBlU2NpZW5jZSBQZXJzb25hbCBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"a15cf405c7906db643b095bf625ec35404ec455eb1daec286aa2e13426ab47bb","size":1284,"filename":"2NMssuhH5JflFnMKpNfoZDqlv-C0lZhqf9O7FKDzn2k=.pem","location":"security-state-staging/intermediates/b482da9b-0ede-43e3-8d72-41cf5e16dc3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2NMssuhH5JflFnMKpNfoZDqlv+C0lZhqf9O7FKDzn2k=","crlite_enrolled":false,"id":"c2502c1a-de63-491e-865a-683fb594c4ee","last_modified":1591199862185},{"schema":1591166909159,"derHash":"f4FM0UVJAKwTMTZLa23ga4fMjLmTbsWDEAgichBX06M=","subject":"CN=Sectigo SHA-256 DV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"96985e5b8fc9114fc1bf6fb46c70668299157f698f5a03a51844df4b86d1c687","size":1613,"filename":"VrhAF5b9APFDNaFQfbVHB1xrJSjOWlQAmlz3WdQFkqE=.pem","location":"security-state-staging/intermediates/95b7263b-b946-4b1b-97fc-588b469275fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VrhAF5b9APFDNaFQfbVHB1xrJSjOWlQAmlz3WdQFkqE=","crlite_enrolled":false,"id":"75e0caaf-9db0-4002-8fc9-28e0a8675dd8","last_modified":1591199862181},{"schema":1591166907750,"derHash":"Bf/GS4/FO3n1ucYpYevMrLoZMdUPNNAU6SnrACtb2DI=","subject":"CN=Sectigo Partners - Server Authentication - RSA,O=Sectigo Limited,C=GB","subjectDN":"MGAxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUGFydG5lcnMgLSBTZXJ2ZXIgQXV0aGVudGljYXRpb24gLSBSU0E=","whitelist":false,"attachment":{"hash":"34622395c087b9ecdf1001a6e9b02b94a16f0b8b5740c5fa10c266d6d293ea31","size":2255,"filename":"KnIj02v94up0vjV7A3aidbRS7a3ZTae0ANppOclqdzs=.pem","location":"security-state-staging/intermediates/702a1c60-d97b-4507-b9f5-08eb480da6df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KnIj02v94up0vjV7A3aidbRS7a3ZTae0ANppOclqdzs=","crlite_enrolled":false,"id":"adec9cb0-b198-46a2-8796-b1f419db6d26","last_modified":1591199862176},{"schema":1591166912114,"derHash":"ZfbCtEFU9cZCXzwcWyblyeNXF6/29FG9IWpiT0j6Br8=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"d23b9e148f80dcabe98cab74d01cf619cd6c75b4f333e73266ccd4eda1a59efc","size":2276,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/c7b3c306-3cae-4f8c-9796-9857ff2613fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"67e78f14-8519-4508-b33f-9886e4cc3385","last_modified":1591199862173},{"schema":1591166901999,"derHash":"jNco+cM5G6Q2ChDGbKSEyAdlHWIH8QYzZp7YiB/pG/U=","subject":"CN=CrowdStrike Global EV CA,O=CrowdStrike\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFDcm93ZFN0cmlrZSwgSW5jLjEhMB8GA1UEAxMYQ3Jvd2RTdHJpa2UgR2xvYmFsIEVWIENB","whitelist":false,"attachment":{"hash":"aeae72b6b6e2f2f8a2aa8ada26064ad98f11711c82a084d34471dd8ada45bc94","size":1853,"filename":"jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=.pem","location":"security-state-staging/intermediates/983271b4-b453-4809-8582-3af405f54fdc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=","crlite_enrolled":false,"id":"edfeea6f-0f8a-4a58-a196-634c0ea181e0","last_modified":1591199862165},{"schema":1591166913573,"derHash":"ApN5EY5XdSJsVNcYKjZ6JAtRdw9QEbs1F3z9F9myRFo=","subject":"CN=Deutsche Telekom AG secure email CA E02,O=Deutsche Telekom AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNEZXV0c2NoZSBUZWxla29tIEFHMTAwLgYDVQQDDCdEZXV0c2NoZSBUZWxla29tIEFHIHNlY3VyZSBlbWFpbCBDQSBFMDI=","whitelist":false,"attachment":{"hash":"6e88e41a6082feb041571a75be3c7b654d5697d0db3ceffb0299e4690d8d5fd4","size":2312,"filename":"212l6lxrSA898ktySyw4XkR_tW58YtsNEmSrE5hy0fc=.pem","location":"security-state-staging/intermediates/a35a70fa-aad1-4273-b4f6-96a9aff12f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"212l6lxrSA898ktySyw4XkR/tW58YtsNEmSrE5hy0fc=","crlite_enrolled":false,"id":"2b4e8679-20ae-4985-a806-2a5e63507ac3","last_modified":1591199862162},{"schema":1591166906381,"derHash":"HpU+FRI6leRwRL+vBrGXT7mXa4T0Nx69d/itge/QXAA=","subject":"CN=CEDEFOP Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIGzMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSQwIgYDVQQDDBtDRURFRk9QIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"5983f161ec520da3023c0007656827199a31a855fdd2eb9b90bdeaae9b89390a","size":2893,"filename":"uwdG75MlCgrDelaIfeRDM31eTTu4dGBtOwv0vvamoqA=.pem","location":"security-state-staging/intermediates/4c553782-18e1-4296-8988-79845d8a1322.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uwdG75MlCgrDelaIfeRDM31eTTu4dGBtOwv0vvamoqA=","crlite_enrolled":false,"id":"10207011-b3ed-4c07-806d-0ca7a15f67e7","last_modified":1591199862159},{"schema":1591166899084,"derHash":"pLK0dUVVn1//t83aehIg5i+3TRt6mk1NrLKyqDnOdFY=","subject":"CN=DigiCert Secure Site EV ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"fe2667a1a90e9632c52d9fbaa7270f136842dcb2a58d926acb1094829bab3c83","size":1370,"filename":"k53DKcmdvTrcweDtMvf_MKTy3iBxavrlU-riK2LCoiQ=.pem","location":"security-state-staging/intermediates/b5412eae-7d6f-41c0-89be-66ca27c50b2d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k53DKcmdvTrcweDtMvf/MKTy3iBxavrlU+riK2LCoiQ=","crlite_enrolled":false,"id":"205d8820-e751-432c-9078-56282ef45802","last_modified":1591199862156},{"schema":1591166893168,"derHash":"Je7RMdcZNZfkjU42U2zFz/v56yBCxiVzrolo2KNpXxw=","subject":"CN=University of Piraeus TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHcxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS8wLQYDVQQDDCZVbml2ZXJzaXR5IG9mIFBpcmFldXMgVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"550cd132d0b40f0576ab9d26a6f5bf1dc59ff3e329b9631757e620752e685318","size":2800,"filename":"yoaRLzm23zeQXpsVd163dslqNpFi19V_XBBOcxeUJWo=.pem","location":"security-state-staging/intermediates/6c2fcd65-e0b3-4577-b113-10ecfe46cc56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yoaRLzm23zeQXpsVd163dslqNpFi19V/XBBOcxeUJWo=","crlite_enrolled":false,"id":"c232a4ca-24ba-45bd-88a7-77cd5d193f7e","last_modified":1591199862154},{"schema":1591166903471,"derHash":"ctD3y/RSm4DDSny7Q4vR0OH8JugOWcvU/XMU/N3w6ZQ=","subject":"CN=DigiCert High Assurance Trust Service EV CA,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRVYgQ0E=","whitelist":false,"attachment":{"hash":"0aa319cc69c625abdd0fac5d90509c1840a629bc7b17f7130b545c0bfd57c6eb","size":1699,"filename":"HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=.pem","location":"security-state-staging/intermediates/3af22c45-79a8-47ec-b3d0-1aeade14957b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=","crlite_enrolled":false,"id":"581603f2-07f6-428c-bee1-1efb081ee0c2","last_modified":1591199862149},{"schema":1591166900577,"derHash":"YoBqPZQu1PbAkaEx5jY7E43WOlw830QT0AzIoMMzqfg=","subject":"CN=CERTDATA SSL OV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBPViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"2f80f47c488ec7412b055557852db65a46130e869818968c2e1abd16dfde9038","size":2129,"filename":"j329Y60dfipsfu2WQjIJzo3bfYjWBMO0L6-erwtRMEM=.pem","location":"security-state-staging/intermediates/ac48c1cf-d260-4b4a-beb7-599ef5ee1de8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j329Y60dfipsfu2WQjIJzo3bfYjWBMO0L6+erwtRMEM=","crlite_enrolled":false,"id":"538da95e-219e-4f04-9887-5ef9291a70ab","last_modified":1591199862143},{"schema":1591166887418,"derHash":"qONS2wyOJ7rlg9AVFG6Led7gkdVjj1g6DEQvO/Vd7rM=","subject":"CN=Inst. of Accelerating Sys and Applications Client RSA SubCA R2,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHWMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUcwRQYDVQQDDD5JbnN0LiBvZiBBY2NlbGVyYXRpbmcgU3lzIGFuZCBBcHBsaWNhdGlvbnMgQ2xpZW50IFJTQSBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"13056507a245291565a35702e8a516a852c5655e71152a9aa83d1952fbc2e8ee","size":3019,"filename":"zgmH0SdYDJGk955F1_GyB2cxMwfYJTe5cQw86vwds4o=.pem","location":"security-state-staging/intermediates/af60a983-8e6b-42d9-8628-b6b31228e1b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zgmH0SdYDJGk955F1/GyB2cxMwfYJTe5cQw86vwds4o=","crlite_enrolled":false,"id":"091a0fcb-58b7-4cca-9ae4-c64ea842282e","last_modified":1591199862132},{"schema":1591166894678,"derHash":"2gxJgfYzbgbBKffoFDsqVKqFoUpjykT84s3cae7niMk=","subject":"CN=Ionian University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHMxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSswKQYDVQQDDCJJb25pYW4gVW5pdmVyc2l0eSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"86df2e731f35984856a01fe3f4dd74d61e7b0c1d84cd76b17bb01d4e0e90568a","size":2779,"filename":"tQEYBAU52znFOxCYz6CBZu4mfcBhcZVQIztFuFsaj5w=.pem","location":"security-state-staging/intermediates/2622e890-355a-4626-b276-90bc8df7aa57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tQEYBAU52znFOxCYz6CBZu4mfcBhcZVQIztFuFsaj5w=","crlite_enrolled":false,"id":"8abdff0c-264b-47ce-9085-9d5f2b8e9c0a","last_modified":1591199862129},{"schema":1591166896111,"derHash":"6kI/GzsbUp0cfbmiGvh9x43nJZVV4pi6JsY88SdakSw=","subject":"CN=Baidu\\, Inc. DV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gRFYgQ0E=","whitelist":false,"attachment":{"hash":"4d24e6e2737c306ddb3da55bc36a62f0205cbf4ede28147d78ad6ce31bd2a2b0","size":2056,"filename":"XDCvV-xbAMAx9ilt0xDgWpOhUuTMeTe4IRR7qYMYfJA=.pem","location":"security-state-staging/intermediates/44bb90ea-7bfd-4581-9df0-a2132775710d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XDCvV+xbAMAx9ilt0xDgWpOhUuTMeTe4IRR7qYMYfJA=","crlite_enrolled":false,"id":"fa66d869-faf6-42b8-b838-e3f95942d6cc","last_modified":1591199862126},{"schema":1591166890348,"derHash":"1hnzJXuYdW0ogR087pra2LyuG0Nnu7DHP2teVY+6RWM=","subject":"CN=DigiCert Basic EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"41848d17b98767397ec8bf100d1dfe140c4770ad085d9c802b3d8c7b949b96e7","size":1378,"filename":"yE_naogfFzNf_bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=.pem","location":"security-state-staging/intermediates/134279b7-bda6-4c1c-8662-4961873f1071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yE/naogfFzNf/bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=","crlite_enrolled":false,"id":"99330272-0e3e-4df5-9535-55e2097b7ee6","last_modified":1591199862124},{"schema":1591166884523,"derHash":"XdZh08sztQBcvtBFoiPdxERaqkHRrLXfcAiEytm6QZU=","subject":"CN=ZeroSSL ECC Domain Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEsxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSowKAYDVQQDEyFaZXJvU1NMIEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"de8d5b5ee9e74901d1bbcc4ad4e1c43a96d0797608f7d04820cdabfa0de24f33","size":1280,"filename":"3fLLVjRIWnCqDqIETU2OcnMP7EzmN_Z3Q_jQ8cIaAoc=.pem","location":"security-state-staging/intermediates/cc8a3501-4e66-4b5b-9d98-d401566c67e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fLLVjRIWnCqDqIETU2OcnMP7EzmN/Z3Q/jQ8cIaAoc=","crlite_enrolled":false,"id":"5f4e1d4e-6a23-4bbc-a9b9-366ff6016a5b","last_modified":1591199862121},{"schema":1591166888935,"derHash":"y1ez/yBAyyaUl2JbyQ+p17TtSTjG9g9C9pr99QisKZM=","subject":"CN=DigiCert Basic RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"af11309a3c20fa360cb678f8d6958ba267f86f202af25ff95cae834d95837fe4","size":1821,"filename":"ZckwC4fqIUCeiz1_ihqLY9TDek4tDc704HFPrhqylPo=.pem","location":"security-state-staging/intermediates/a293e696-ef17-4439-8b31-20962f5f352a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZckwC4fqIUCeiz1/ihqLY9TDek4tDc704HFPrhqylPo=","crlite_enrolled":true,"id":"f921edde-d8b6-430f-aa42-636c604bb2a3","last_modified":1591199862118},{"schema":1591166881281,"derHash":"lRQaNVpaKqPgESIcq5/nOBD9tdiBNYZPA+TYUr0Lvts=","subject":"CN=Thawte RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBSU0EgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"419f063716d0b08e5119a943e2d8506a67bba9d8b72f725763a5b48b0911dfd3","size":1792,"filename":"hN3GzHyLopxOn8DxNQIEvpQa-NyS7R_1oQY0xsFsrOA=.pem","location":"security-state-staging/intermediates/0d05c78d-0f37-439e-b5d1-08268337d922.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hN3GzHyLopxOn8DxNQIEvpQa+NyS7R/1oQY0xsFsrOA=","crlite_enrolled":false,"id":"0810cb55-6c6a-4343-a322-9e5c9f7920af","last_modified":1591199862116},{"schema":1591166886003,"derHash":"8mmsALQQAD9y3GKK+z2VAnljDHxdDIIUig/STfTaQwE=","subject":"CN=DigiCert Trust Service ECC CA,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENB","whitelist":false,"attachment":{"hash":"75b96b01d9b932fb522e5615db087c64e2ee12af68af026235262358e0eeef91","size":1410,"filename":"447EOyTQJY3PyAbUMHr-SyrdqoPSJsxpM0Nf26eUpV0=.pem","location":"security-state-staging/intermediates/82c3a715-65dc-4dc7-9803-8e94ab1605f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"447EOyTQJY3PyAbUMHr+SyrdqoPSJsxpM0Nf26eUpV0=","crlite_enrolled":false,"id":"2184c07f-101d-4e6e-ab1a-f806fff4f1af","last_modified":1591199862113},{"schema":1591166873630,"derHash":"8AQ+n++zeup5TmkEN9wjnWvSxcoPtYoSJEVVoaiioBo=","subject":"CN=Panteion Univ. of Social and Political Sciences TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGRMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFJMEcGA1UEAwxAUGFudGVpb24gVW5pdi4gb2YgU29jaWFsIGFuZCBQb2xpdGljYWwgU2NpZW5jZXMgVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"be73f7729891ce22885d13e919d4708521fcefe4b74165aa08c8af1edd701af1","size":2970,"filename":"gPEc0jcCVlywHAUQHhYL3X5OqG89O9YInrCwyDjgJ1A=.pem","location":"security-state-staging/intermediates/9922f7a2-d69e-4d2d-a01d-3ea5abe1a1cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gPEc0jcCVlywHAUQHhYL3X5OqG89O9YInrCwyDjgJ1A=","crlite_enrolled":false,"id":"8d0bdf59-a81c-44d7-acc2-c7d6d72244e0","last_modified":1591199862110},{"schema":1591166882853,"derHash":"abCFmqwMqRvCm0IqPQS5/5D4e4Wje8BtuFMV9d5AvZU=","subject":"CN=CrazySSL RSA CA,O=TrustOcean Limited,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"adc25f98c021da162cd92cb4b92db565ba5e5a23ac8adb3a819e65bfdb69adb9","size":2073,"filename":"oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=.pem","location":"security-state-staging/intermediates/2ce09943-1a2f-4726-b421-a52c2d8f6a91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=","crlite_enrolled":false,"id":"4934e39d-e79f-478e-a9b9-339c5922e0b8","last_modified":1591199862107},{"schema":1591166876495,"derHash":"T/V3/d4o5h5/XKT19CvLsSvheXAKT+8kSJznaEigg0Y=","subject":"CN=TrustCor OV SSL CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIE9WIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"cf99b2b77fcf543c7c67e25d79c9076859c38851045d20b200bb357d806163bd","size":2499,"filename":"Wpyq4op-j7iz0FI6Mlw06h6hqo6X_DGLpRt7yAcPkVc=.pem","location":"security-state-staging/intermediates/a1a3157e-3254-4565-a991-e1fce05b4212.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wpyq4op+j7iz0FI6Mlw06h6hqo6X/DGLpRt7yAcPkVc=","crlite_enrolled":false,"id":"af05ac5f-9bff-4bd9-8cca-8a84c13ab21f","last_modified":1591199862105},{"schema":1591166872202,"derHash":"IuXm21yuQo7alq7QVk4rl3DsoswCUVjjep3e7eMfReU=","subject":"CN=Technical University of Crete Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHJMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTowOAYDVQQDDDFUZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"349f0200e3e31175b7f871f287144f5fc1b0f766e23da219f0e2eb7ad790f83a","size":2881,"filename":"_CQ8b_NnBc7JI0Y-BPaUM3fLCvTvHHR9e17XKVFxpKQ=.pem","location":"security-state-staging/intermediates/f3b2f230-d3a1-4a11-8cbb-3ed9df6cba12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/CQ8b/NnBc7JI0Y+BPaUM3fLCvTvHHR9e17XKVFxpKQ=","crlite_enrolled":false,"id":"0414d3b7-67d2-4ee4-ab18-cdc03115a996","last_modified":1591199862102},{"schema":1591166875099,"derHash":"iTfpDhSVyaeO+xgYLUP9xz/NKSq2NHoSuQd96HhTDmI=","subject":"CN=GeoTrust EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"dbcead7fd92db8003e615e6ab4e681c29b1f4e1f5a16537b11786c41b180f203","size":1646,"filename":"AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw_OD7I=.pem","location":"security-state-staging/intermediates/4f22de4a-5b44-4d18-bc10-7deaee7abcc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw/OD7I=","crlite_enrolled":true,"id":"4af8f737-c4f7-4213-a097-781dca9addd3","last_modified":1591199862099},{"schema":1591166864681,"derHash":"J9b9r4ApeEbf7/guf1i5pIrJ4+6ToRKxu+JD7hqXRHw=","subject":"CN=GlobalSign PersonalSign 2 CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gU0hBMjU2IC0gRzQ=","whitelist":false,"attachment":{"hash":"72db62fc54a69dcc4b1a4901db76c47a55d537320160cc5a8fbb0927080ef6d0","size":1764,"filename":"Somjy3lQL3f4pdxt3-mUebYuNRJSdhkiZOiWMZfaFJk=.pem","location":"security-state-staging/intermediates/173ac902-1ec7-4f50-8515-83dd7b63fb48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Somjy3lQL3f4pdxt3+mUebYuNRJSdhkiZOiWMZfaFJk=","crlite_enrolled":false,"id":"e478fb02-efe1-44fa-8785-ca6be9105a6a","last_modified":1591199862097},{"schema":1591166877998,"derHash":"SkVVmtiWhLtDn80sxMXsD5LuBpLNa5djlX3jGi9GfMo=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"48223edca6350527ab420c9318720f7b18a516efb69f4d3a590a6036f911ea66","size":2020,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/ba6ce4e6-8bf6-4e20-b6c7-6627aa13effb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"0ab7ad33-dfba-49fa-853d-2ba541df6e11","last_modified":1591199862094},{"schema":1591166867546,"derHash":"cNK5bnwEC2Jw/yC7a6mEITEq035GK+y4O+lQK4PfVpc=","subject":"CN=CERTDATA SSL DV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBEViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"10d55d2c2cadcf08f96b96c50475b9f79aeea102d66ab44733cfbd5b499b113c","size":2129,"filename":"96wDgmEz6BSfBEFFYy6VQtjNjdFAvz3d60x4NuYW52A=.pem","location":"security-state-staging/intermediates/de9b3e8a-9359-4fdf-803d-cc3302061a0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"96wDgmEz6BSfBEFFYy6VQtjNjdFAvz3d60x4NuYW52A=","crlite_enrolled":false,"id":"3ce95fd6-d1f8-4199-9fa8-c95bac94f60f","last_modified":1591199862091},{"schema":1591166879750,"derHash":"9igmTHnb+9/P3sZDFxvcvU3nSD+cgOpZBoiHrkSaLkg=","subject":"CN=HARICA EV TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,L=Athens,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExIzAhBgNVBAMMGkhBUklDQSBFViBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"fceb3c305820e5740d776d78ddc750d3e1437be8b57d2d23a8d244530c7a9624","size":2475,"filename":"qQHYBA8HuHBDaaxDEsg5_SBSGWrd6XH3D7_lIoKEbz8=.pem","location":"security-state-staging/intermediates/f457a0bc-793c-495f-b9cf-cdda16dbe625.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qQHYBA8HuHBDaaxDEsg5/SBSGWrd6XH3D7/lIoKEbz8=","crlite_enrolled":false,"id":"93ed36ab-5394-4851-a2ff-ebe5055f9d98","last_modified":1591199862088},{"schema":1591166870531,"derHash":"iK+RXGbUJ/GTFVc6/jnFliyKEWju2z/4+KLtnbS+R5Q=","subject":"CN=TrustCor IV Email CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFcxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIjAgBgNVBAMMGVRydXN0Q29yIElWIEVtYWlsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"040c4a3d4b54a50ec78e9f5629b11f91e34e93c44a7405f344d01e4eabf67ee4","size":1796,"filename":"8Go2wmmhcWTAHDnpeLCjSIByzS-G4W6HtvLhlIVNNAA=.pem","location":"security-state-staging/intermediates/5c86b050-ff2b-4fd2-8968-cd839be57614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Go2wmmhcWTAHDnpeLCjSIByzS+G4W6HtvLhlIVNNAA=","crlite_enrolled":false,"id":"053c0da4-29be-41ad-96a3-db952c73a378","last_modified":1591199862086},{"schema":1591166869000,"derHash":"RM6X9clX3QVtRMPhvfzrLPmntCjtCJg5JkM2MDvKx+8=","subject":"CN=CEDEFOP TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MGkxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSEwHwYDVQQDDBhDRURFRk9QIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"3026c201f734e5066c363d7aacffac89da4a95bf11bfcd83f195f70269ed6b89","size":2800,"filename":"56n8EMBsMqyH4pNbD4KmUsbeas26-ouP-jDHJMDFKcA=.pem","location":"security-state-staging/intermediates/258b19c6-10e8-4216-aa3d-5b45dfdfdd18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"56n8EMBsMqyH4pNbD4KmUsbeas26+ouP+jDHJMDFKcA=","crlite_enrolled":false,"id":"763a3427-7045-435e-bbc2-31346fc77265","last_modified":1591199862083},{"schema":1591166866080,"derHash":"48JCed1qM3+IGxvGkuh49KMa/pWFHyCPlIALDCTYjDg=","subject":"CN=GeoTrust RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"ab4a0d2c2f5e08bd7983cd7ef5ded4ca8f1b29963790a87f297d00860979dc97","size":1813,"filename":"LYxGolhhMxT6m_MXQhVdp6zkEP-xK8sxXN4I4pBqtFs=.pem","location":"security-state-staging/intermediates/b2b450c3-0185-461d-8eb2-c785ac2b386e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LYxGolhhMxT6m/MXQhVdp6zkEP+xK8sxXN4I4pBqtFs=","crlite_enrolled":true,"id":"bb0939ee-0780-4a40-abd6-9461d85b0902","last_modified":1591199862080},{"schema":1591166863169,"derHash":"h6rZeKX+LulB5AaPmWPqKb2qWIeNJBIkmoLNIvgSbYI=","subject":"CN=University of Crete Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIG/MQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTAwLgYDVQQDDCdVbml2ZXJzaXR5IG9mIENyZXRlIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"692b3293cf1a2c637247f3db6669e730f76949fccde9d90ac06bdcef756d76d2","size":3092,"filename":"H9OjMfo3b9PnK6ZODqvqQ8917lxRCk2emeK5O_WdnJ8=.pem","location":"security-state-staging/intermediates/376fbaf1-eb26-410a-9ba7-3e657a2a3097.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H9OjMfo3b9PnK6ZODqvqQ8917lxRCk2emeK5O/WdnJ8=","crlite_enrolled":false,"id":"58bc984c-12d9-448c-8fcb-884fca564508","last_modified":1591199862077},{"schema":1591166860318,"derHash":"TQ/0Ld2VUufnd6bFdpVzcJkMroNjcXXmV86Ez2riElw=","subject":"CN=TrustCor IV Email CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF0xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKDAmBgNVBAMMH1RydXN0Q29yIElWIEVtYWlsIENBIC0gRzIgLSBSU0E=","whitelist":false,"attachment":{"hash":"6831a4af86aa2fceccfa00b8de0f564eda083e00e5ed0d648ef7faeb5148b941","size":1691,"filename":"8ktLjVrByicgpMzqI7L7d5WdKCuRsMvvZdUgHPdSMMM=.pem","location":"security-state-staging/intermediates/3ab0441b-91be-4203-a0a7-a673f60b6614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8ktLjVrByicgpMzqI7L7d5WdKCuRsMvvZdUgHPdSMMM=","crlite_enrolled":false,"id":"a253a65f-3afa-4490-96c8-b2fefa45a8ea","last_modified":1591199862074},{"schema":1591166857432,"derHash":"cB6yP5VWTNVWnNIOXwXCiIkAuum6A6v1q+V7/gS1SmA=","subject":"CN=HARICA EV TLS ECC SubCA R1,O=Hellenic Academic and Research Institutions CA,L=Athens,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExIzAhBgNVBAMMGkhBUklDQSBFViBUTFMgRUNDIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"2bdd6ee732808aea1903a2c083127ea36909183341515eb1c2d363248a76902d","size":1337,"filename":"guE2rUJ3slSQ9iYP0Ub25zrLqasAFng1eTC5H9BqTUg=.pem","location":"security-state-staging/intermediates/7fa0d0da-ae47-4777-b3fb-42cd8bced5c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"guE2rUJ3slSQ9iYP0Ub25zrLqasAFng1eTC5H9BqTUg=","crlite_enrolled":false,"id":"7946e404-ecf2-49eb-932a-103eedce84ab","last_modified":1591199862071},{"schema":1591166861744,"derHash":"ZgjoSOY6aCBgm4VcIjJPa4yxU+3MgBMyVNcVa8PToCY=","subject":"CN=TrustOcean Organization Client Certification CA,O=TrustOcean Limited,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxODA2BgNVBAMTL1RydXN0T2NlYW4gT3JnYW5pemF0aW9uIENsaWVudCBDZXJ0aWZpY2F0aW9uIENB","whitelist":false,"attachment":{"hash":"65ea831c43dee9e586e0d0ae71fba096e656cdc1710cbec81161240dfaf2123c","size":2105,"filename":"YWMMSjIsV3sKAsZ1Dvh-XMo6c_3lrcidiB03ALvLATA=.pem","location":"security-state-staging/intermediates/0a25e298-0fdd-4f7e-bf45-bf211562056b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWMMSjIsV3sKAsZ1Dvh+XMo6c/3lrcidiB03ALvLATA=","crlite_enrolled":false,"id":"0dba3544-d858-465f-b63e-47e4a678e132","last_modified":1591199862068},{"schema":1591166854460,"derHash":"DuACkMinHZheOL64TsrJ0Cm1WWcRnUfLy+NH8WTfS0o=","subject":"CN=GlobeSSL EV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIEVWIENB","whitelist":false,"attachment":{"hash":"0fd5faa4f58b29049d8b91e89fec33c6dc0dec4eb75a8a1762d58c678142084b","size":2113,"filename":"CxpahwRxk_rjFSnTogI-dPS7QQ16sQ0GM12A7ChwIS4=.pem","location":"security-state-staging/intermediates/60a23013-1e93-4dc8-b52b-246c4ad92a03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CxpahwRxk/rjFSnTogI+dPS7QQ16sQ0GM12A7ChwIS4=","crlite_enrolled":false,"id":"5bb075c8-70d6-4037-ac4b-2d7fe0e7d948","last_modified":1591199862065},{"schema":1591166851621,"derHash":"/UfLIwR4baJPhJ/KiKxcrUufwDf575LNt8YArxizKrg=","subject":"CN=MeSince Secure Email CA  [Run by the Issuer],O=MeSince Technology Limited,C=CN","subjectDN":"MGkxCzAJBgNVBAYTAkNOMSMwIQYDVQQKExpNZVNpbmNlIFRlY2hub2xvZ3kgTGltaXRlZDE1MDMGA1UEAwwsTWVTaW5jZSBTZWN1cmUgRW1haWwgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"c5566f7d2a8434f0eddb8367a4cb46f563e2390f36ceac0355692ad81f11831d","size":2109,"filename":"YzIWVNY9JMWk52vFK7cRTkUR1BXsWaEnPD4uzbUepjc=.pem","location":"security-state-staging/intermediates/2ed8238c-f5b4-49af-a65c-37e040edf53b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzIWVNY9JMWk52vFK7cRTkUR1BXsWaEnPD4uzbUepjc=","crlite_enrolled":false,"id":"dea24760-68b1-4097-9960-86d8d488aaed","last_modified":1591199862062},{"schema":1591166849966,"derHash":"nOYws1+K4sZBnnNK2dL6MEdt2ec5Sx6Tsn+D93agJOo=","subject":"CN=AC Unidades de Sellado de Tiempo,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MHUxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEpMCcGA1UEAwwgQUMgVW5pZGFkZXMgZGUgU2VsbGFkbyBkZSBUaWVtcG8=","whitelist":false,"attachment":{"hash":"671a59fe01d2cd2074dbea84483abb7c9c75db400f3b54d2aebd79a620add787","size":2836,"filename":"RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87-GT4=.pem","location":"security-state-staging/intermediates/ba299b7d-dc4a-4efd-b7d4-c67563ad72aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87+GT4=","crlite_enrolled":false,"id":"590c1b99-aca9-4c60-8b11-030c3d8071a5","last_modified":1591199862060},{"schema":1591166858926,"derHash":"JWQOYOqy1R//xDd28IewCzpzyFOa6EQKHL0BSHP+iCw=","subject":"CN=CERTDATA SMIME OV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHQxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNjA0BgNVBAMMLUNFUlREQVRBIFNNSU1FIE9WIEVDQyBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"f7e54e3b9fd412e9b3097879572017a4abe1c6a15b59a5352aa1efbd5b7dd98c","size":1284,"filename":"B3SYowuqr6O2cz9jLEn6_2MBbD9I9YZYmd58lDVi-K0=.pem","location":"security-state-staging/intermediates/8e3d5211-286e-4f56-b365-1a73e696a4d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B3SYowuqr6O2cz9jLEn6/2MBbD9I9YZYmd58lDVi+K0=","crlite_enrolled":false,"id":"98be93bb-bc71-4fc9-8bdd-f2c9c7737238","last_modified":1591199862057},{"schema":1591166855957,"derHash":"bXsxthrbeOvGp2YpaIYgnqjnT0YA2uR7eNo/CL559OU=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"499764662760ff98d3639ab422aa0d20b4ef8daee619d174c63d3ba9e3f28abf","size":2003,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/dadedae0-6925-4458-829e-3ca4f70bd690.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"38353e65-3a23-4c3e-8f3c-ed8f0e8dd8fd","last_modified":1591199862054},{"schema":1591166853045,"derHash":"ukJRIvMdm658vh5/ov9Det8oPgFDM0hfdpHLhWrsd2o=","subject":"CN=Harokopio University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVIYXJva29waW8gVW5pdmVyc2l0eSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"cdf8c52a3037ef4ea0b094b6ba99c9767673ebc4fd1c01418360482d28225ddf","size":3031,"filename":"mTSefyaEu5Ue6uOHJdZVbu7WMV69SsHOEk-8P2x2eZw=.pem","location":"security-state-staging/intermediates/697fa4e3-d146-410d-a470-027574d10e7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mTSefyaEu5Ue6uOHJdZVbu7WMV69SsHOEk+8P2x2eZw=","crlite_enrolled":false,"id":"da737b54-eb2a-4dd0-92d6-87dc7f62e5ee","last_modified":1591199862051},{"schema":1591166845601,"derHash":"fK7saA5kl/xRCQc/g4FueY8n+JaKJmPByVcRtUgZLjU=","subject":"CN=GeoTrust ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"253b1b900adc6be80e90ac3862b020d22321e25976cb9c08fa7266318159ad58","size":1374,"filename":"5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem","location":"security-state-staging/intermediates/ff6fd4b8-f7d7-4779-922b-29b398cecef6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=","crlite_enrolled":true,"id":"c542f5dc-33cb-490b-9311-a1dadc26b605","last_modified":1591199862048},{"schema":1591166848442,"derHash":"gmV1bdXNijfuYeQDUSiOSxaondJIwexOuiWq8WGr9Jg=","subject":"CN=AC Sector P\u00fablico,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MGcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEbMBkGA1UEAwwSQUMgU2VjdG9yIFDDumJsaWNv","whitelist":false,"attachment":{"hash":"cfe09ce65e4dcbc8449292b7e92e1cdaacc6c228de14a49ccc6300fda8e73598","size":2816,"filename":"aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=.pem","location":"security-state-staging/intermediates/7f6c9b16-66e0-4bd8-bb34-a2812443ecfb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=","crlite_enrolled":false,"id":"72c55deb-6292-4294-b3d7-cd0eb0bc896a","last_modified":1591199862045},{"schema":1591166842796,"derHash":"Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=","subject":"CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"900dcce8153813e7b2c906ae9d9fa6097afb0dc015d9e872eb1ab2b64a110ab5","size":2800,"filename":"t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem","location":"security-state-staging/intermediates/c78cc87b-67ad-4dd7-a00f-ea7badd2fb2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=","crlite_enrolled":false,"id":"d8b67105-91c0-4a05-8e13-ccb8eacc591f","last_modified":1591199862043},{"schema":1591166841277,"derHash":"d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=","subject":"CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy","whitelist":false,"attachment":{"hash":"38c26b5824725648f58682db859677ed5f482b8a98476190e2f4b5cea965ce52","size":1918,"filename":"7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem","location":"security-state-staging/intermediates/84f2426b-c265-4fe5-8bcc-09e6d612433c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=","crlite_enrolled":true,"id":"d8d54086-08a6-43e4-94b4-1d46de796b92","last_modified":1591199862040},{"schema":1591166835191,"derHash":"0UBlCwqh/FTfkstGmFM3wGghRyd3CUfWeIWJpSAH6iA=","subject":"CN=GEANT Code Signing CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBDb2RlIFNpZ25pbmcgQ0EgNA==","whitelist":false,"attachment":{"hash":"edc93cb9e5360feec50b43ae80da119d4e71408c3e9c92723064f3b2cc06cf8c","size":2446,"filename":"6rWABF2Zr2RIZW___Nsg04EsGouKiLCsOwLLFjWmcjI=.pem","location":"security-state-staging/intermediates/4e49cd28-5206-49f1-9fb9-df5b2bc7780d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rWABF2Zr2RIZW///Nsg04EsGouKiLCsOwLLFjWmcjI=","crlite_enrolled":false,"id":"a60ee48d-740a-4c85-a973-cb905e3ec7bf","last_modified":1591199862036},{"schema":1591166844241,"derHash":"hzBOlUqqHTzYf9dXT/8/YNmEhHdEObE+L3EHGiz9oJU=","subject":"CN=CERTDATA CODESIGN CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHAxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMjAwBgNVBAMMKUNFUlREQVRBIENPREVTSUdOIENBICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"1c51a822d23a496a6903a26b1c85074c8be0264142891eeda4cd9a5cb80ad364","size":2105,"filename":"Lb_GZlDH8vWm-YzPSBkFTGAPcXFglJ0TRI1d5ylxKrY=.pem","location":"security-state-staging/intermediates/cc5c3cf7-c249-4d97-8a2f-f76d61d333e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lb/GZlDH8vWm+YzPSBkFTGAPcXFglJ0TRI1d5ylxKrY=","crlite_enrolled":false,"id":"fe08a0b2-fc6d-4141-8f1d-bc618e428b98","last_modified":1591199862033},{"schema":1591166833781,"derHash":"GYXnA415CbsDcMFplx+zPvcF+jvp+tG/iyrnwhTgST8=","subject":"CN=Sectigo Partners - Code Signing - RSA,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gUGFydG5lcnMgLSBDb2RlIFNpZ25pbmcgLSBSU0E=","whitelist":false,"attachment":{"hash":"7a7ac856690ca8a49161e5fdc6c4dd5cb328afc0b9ac474458d175401361f4f8","size":2231,"filename":"uVuyzfpTK-HYz0FgOd2jzoYbT2MGEVb8eXyyy7nusfA=.pem","location":"security-state-staging/intermediates/524618c9-698b-4f29-bc7e-77e200e21e58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uVuyzfpTK+HYz0FgOd2jzoYbT2MGEVb8eXyyy7nusfA=","crlite_enrolled":false,"id":"d807888d-c6f2-4a81-9246-abd565f41150","last_modified":1591199862030},{"schema":1591166839860,"derHash":"z9/vA3z9vWuw4xHpuygcpgJxxdriaVMSAzgG+ksOlLc=","subject":"CN=Greek School Network TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVHcmVlayBTY2hvb2wgTmV0d29yayBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"dfe124f290af20e4aa698fc6a6d8efa83d2a2f2cf9a8704bc47d19592ed8888a","size":3275,"filename":"Qrg8oKp5CK8PmUjVC4rnbh8VZo2IQZkWRT9cewFmdNw=.pem","location":"security-state-staging/intermediates/e342d812-7acc-4bc9-aa30-015331e0e0db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qrg8oKp5CK8PmUjVC4rnbh8VZo2IQZkWRT9cewFmdNw=","crlite_enrolled":true,"id":"967aadb0-2c9f-4c7c-b505-fd576df66e1b","last_modified":1591199862023},{"schema":1591166838271,"derHash":"REzv7dg/YxXF7Iay8c1jsdvyOHz6K+sPtAAVPyr5QI8=","subject":"CN=University of Macedonia Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHDMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTQwMgYDVQQDDCtVbml2ZXJzaXR5IG9mIE1hY2Vkb25pYSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3cb71d057e94e927b5ef03b43ad9a43ca78cb4663db298c5d097a9c5c989ae0d","size":2901,"filename":"8lsb1Oss51hyiC9R8zhI90GFGgrz-w6UmqlE_DbZuX4=.pem","location":"security-state-staging/intermediates/4f2758f5-69bb-4081-811e-affa0ea3cbf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8lsb1Oss51hyiC9R8zhI90GFGgrz+w6UmqlE/DbZuX4=","crlite_enrolled":false,"id":"9686b556-ebcc-448d-9ed4-fff34d4ae0c2","last_modified":1591199862020},{"schema":1591166836780,"derHash":"VtWLJvRb84eK9DlwFqlq9IbpiV9mxfO3MXUSCztOSkg=","subject":"CN=Telenor Norge AS EDC CA G2,O=Telenor Norge AS,C=NO","subjectDN":"ME0xCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSMwIQYDVQQDExpUZWxlbm9yIE5vcmdlIEFTIEVEQyBDQSBHMg==","whitelist":false,"attachment":{"hash":"0213f2f3333de40ecac4484546d04528fd3fd4e937d6bae029cdb7a55f97c3ab","size":1955,"filename":"7uuCeOn6U9gLfnVl6djAetEiPQL_HYdnX8odqQvPToY=.pem","location":"security-state-staging/intermediates/bc5ecf10-0122-4293-aaa0-a410bbc06f12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7uuCeOn6U9gLfnVl6djAetEiPQL/HYdnX8odqQvPToY=","crlite_enrolled":false,"id":"32ba5d1f-5bfb-44bb-b751-d686a7cc74d9","last_modified":1591199862017},{"schema":1591166832366,"derHash":"HhMjmuBLlxvd5lOv38cyRDi44UbFxIqBcDEibJV2RTk=","subject":"CN=GlobeSSL DV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIERWIENB","whitelist":false,"attachment":{"hash":"46ff926f845cbf0b70cc18fe28ae6ecc15392b7bf6d30f53d5e62c20fc4a177b","size":2085,"filename":"z9mSm0UWyXCmP7GyKCI8befW1Y69hzCdVgD4FqXpCJY=.pem","location":"security-state-staging/intermediates/e7f0cdf9-77c2-4123-9a86-5c429ea6c98a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z9mSm0UWyXCmP7GyKCI8befW1Y69hzCdVgD4FqXpCJY=","crlite_enrolled":false,"id":"64111cc5-6679-4853-a02f-ad3d4544e923","last_modified":1591199862014},{"schema":1591166828107,"derHash":"dpIe23/lVTsM6d1DiMhBZinrwO0KGjmUFarVwFDpUKA=","subject":"CN=TrustID CA A13,O=IdenTrust,C=US","subjectDN":"MDoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAMTDlRydXN0SUQgQ0EgQTEz","whitelist":false,"attachment":{"hash":"9d6ffa6d28de01541ba5efbc6e4af6ad8ba66e234f6b7eb4b9dcc0b58dc5bdc5","size":2346,"filename":"ryhrFN5k_1-bedv_3wzS8mqzqbXS5FAb4dH-qLx8XhI=.pem","location":"security-state-staging/intermediates/4a7062e9-fc48-4b84-8615-7d355f7faa4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ryhrFN5k/1+bedv/3wzS8mqzqbXS5FAb4dH+qLx8XhI=","crlite_enrolled":false,"id":"746f8a3c-27b7-4e5a-9ed7-4a5e59633474","last_modified":1591199862011},{"schema":1591166829580,"derHash":"TjD4AEwY09eY7Fp3NDRrWl6+jVRCPOmCV/xXc1pvc40=","subject":"CN=DigiCert High Assurance CA-3b,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTNi","whitelist":false,"attachment":{"hash":"cc6e9717bc66f910a2529ed604fb79e0564914be23443f51afe962a3afe09891","size":2048,"filename":"1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=.pem","location":"security-state-staging/intermediates/6990bf85-33f3-4e45-a819-27baa0ed7dcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=","crlite_enrolled":false,"id":"6fe7a90f-5366-4061-a9ed-581dae6a646b","last_modified":1591199862009},{"schema":1591166823456,"derHash":"3JmT3DOnH9lYCHh9GaS1VwTmAdV+vOrMiALHi1w29cc=","subject":"CN=Greek Universities Network TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTQwMgYDVQQDDCtHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"37aeafbaa92c269e67ec01c7b961f23ddae3ee344c134b4601de4378c0e7af0a","size":2800,"filename":"-Wo-2quCv6ywG-coso5aG2NSMQ-PKhucBmfbix2syuA=.pem","location":"security-state-staging/intermediates/67373d63-a254-4c05-8ac5-9407ec4d672e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+Wo+2quCv6ywG+coso5aG2NSMQ+PKhucBmfbix2syuA=","crlite_enrolled":false,"id":"1c09be64-b512-4449-834f-8ca5f3fa50ad","last_modified":1591199862005},{"schema":1591166819038,"derHash":"uE1wmCCo/rQc4YcuI3JgtEb5m9PMFY93ONkUaxP65k4=","subject":"CN=Thomson Reuters Special Services CA - G2,O=Thomson Reuters Special Services LLC,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMS0wKwYDVQQKEyRUaG9tc29uIFJldXRlcnMgU3BlY2lhbCBTZXJ2aWNlcyBMTEMxMTAvBgNVBAMTKFRob21zb24gUmV1dGVycyBTcGVjaWFsIFNlcnZpY2VzIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"9ba10b792ea0079372689444dff84857253c95f3026cc8b37b262818bc7a2535","size":2012,"filename":"YhdjD_JSKwUqNm1zwQIQCcIsBmHPhcQoPb28p5I61o0=.pem","location":"security-state-staging/intermediates/1793240d-0e71-4b88-944b-d72dd3cbfc93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YhdjD/JSKwUqNm1zwQIQCcIsBmHPhcQoPb28p5I61o0=","crlite_enrolled":false,"id":"edc96d6d-34ad-40e9-9a79-45ea18971be4","last_modified":1591199862002},{"schema":1591166825015,"derHash":"IazB29aUT5rBjHgstcMo1sKCHGtjcx+juJh/ViXeig0=","subject":"CN=ZeroSSL RSA Domain Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEsxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSowKAYDVQQDEyFaZXJvU1NMIFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"2c3ace9b9a1c08d3905fc990df49b6936f78e356141ef0cd8969bdb44ec78bff","size":2430,"filename":"R3hcMOAGw0WFztuG2skTodoHp8IGid3Qg63Cn7YUYoM=.pem","location":"security-state-staging/intermediates/5681e683-bd54-4255-89fe-dce439358be4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R3hcMOAGw0WFztuG2skTodoHp8IGid3Qg63Cn7YUYoM=","crlite_enrolled":false,"id":"a8da5928-6b84-408c-9441-1ac7d1244157","last_modified":1591199861999},{"schema":1591166830965,"derHash":"XavaBGJy7siey5WmKX26kQ0BRPfutYFNBzrlSkqM9kY=","subject":"CN=University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHUxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS0wKwYDVQQDDCRVbml2ZXJzaXR5IG9mIENyZXRlIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1a950b8eac9bc2e6e71ab38a9bd317e2540c5b960b7ee7f5ef04e55f6503f36b","size":3011,"filename":"OiyYqIVTvazzKZtgPhUjzE_UUtrL4LTPfcYtNSGRrdI=.pem","location":"security-state-staging/intermediates/e011b9cd-3b7e-4057-a812-404fbb369589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OiyYqIVTvazzKZtgPhUjzE/UUtrL4LTPfcYtNSGRrdI=","crlite_enrolled":false,"id":"4617dbad-655a-4429-a26e-d3c7a2641c18","last_modified":1591199861996},{"schema":1591166826539,"derHash":"V1LF+9wDVD8M7GzSlM2WXY0yxOqpk9VQ8kSR7Pm3ODY=","subject":"CN=Telenor Norge AS NF CA G2,O=Telenor Norge AS,C=NO","subjectDN":"MEwxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSIwIAYDVQQDExlUZWxlbm9yIE5vcmdlIEFTIE5GIENBIEcy","whitelist":false,"attachment":{"hash":"7e1fff6b49d5243587acf127f86270b07767650ad23faf0c11778a3edc03a380","size":1951,"filename":"3vqCc3GvO_KCc0HjvSktu5UdgOfPXvv9g0xLuhW7svg=.pem","location":"security-state-staging/intermediates/42892b56-dead-4e2d-823c-ff62093f319c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3vqCc3GvO/KCc0HjvSktu5UdgOfPXvv9g0xLuhW7svg=","crlite_enrolled":false,"id":"e9407fe4-846e-4c28-8e38-5e374b619d88","last_modified":1591199861993},{"schema":1591166821852,"derHash":"3aS+P3jG10KxABRsJgEbQXUq67gQwEWIw6+B8NNFERg=","subject":"CN=Telenor Norge B2B2 CA,O=Telenor Norge AS,C=NO","subjectDN":"MEgxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMR4wHAYDVQQDExVUZWxlbm9yIE5vcmdlIEIyQjIgQ0E=","whitelist":false,"attachment":{"hash":"6075146652fc2c8712240812655579c519cfa4dfc6c95b4fb2dcdb1b134a6cdd","size":1947,"filename":"m5f-WLbmqsgq9Tc-cBMKCyJTMDtguE7B72yjk-002fs=.pem","location":"security-state-staging/intermediates/7219b684-e0b2-4d03-8a8d-449dc5f93118.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m5f+WLbmqsgq9Tc+cBMKCyJTMDtguE7B72yjk+002fs=","crlite_enrolled":false,"id":"a8c73c58-80a6-4c4a-9371-adae40c783bf","last_modified":1591199861990},{"schema":1591166817594,"derHash":"NhledtZVmIiLBeOJnyESqcW+tngVXrgVwzccy6fDeBk=","subject":"CN=ZeroSSL RSA Business Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"ME0xCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSwwKgYDVQQDEyNaZXJvU1NMIFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"d98d4219b4cefa57646bea3e49feeb4adf39e63225477fe89ec365decf6cd3dc","size":2430,"filename":"-xzCearoGbvh_Q0yMU_NCkm14rjMFnaa57u3iwTvlBk=.pem","location":"security-state-staging/intermediates/c6ec3db2-572e-4487-b311-5e2bb57fa8ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+xzCearoGbvh/Q0yMU/NCkm14rjMFnaa57u3iwTvlBk=","crlite_enrolled":false,"id":"128d8a90-b885-4e90-b004-dcf4a4564270","last_modified":1591199861985},{"schema":1591167126696,"derHash":"DtmWPhu6BBfh/Be9OOkgYfllETuSHLNX8THxLwhTRVc=","subject":"CN=WoTrus OV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIE9WIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"42e74afbec45396f4ca75a68524ec41e4332f766126f2a85e7495b95deab1db7","size":2097,"filename":"B2o6KjBMvs-b5LG04FOX1d-Dw82KgV4aPdu-Q6Wq764=.pem","location":"security-state-staging/intermediates/92525c20-b370-4991-8043-7acb57900e5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B2o6KjBMvs+b5LG04FOX1d+Dw82KgV4aPdu+Q6Wq764=","crlite_enrolled":true,"id":"c4da2cdb-1ad8-4e7d-b6ba-ac427bb25786","last_modified":1591199861982},{"schema":1591167123560,"derHash":"J+/mgsdHnDgTOglDZm+8kQP8uxqRljTkOXEcvqfjz8c=","subject":"CN=WoTrus EV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIEVWIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"f9a24f721b157cb04a8b7d174607e009aac14567c63b22e7c3e17aa9f2d8fda5","size":2129,"filename":"7gcte6Sz2PaLDgthd1WawzH-5AZvEHps9kxV7G1Z6nU=.pem","location":"security-state-staging/intermediates/76d7666f-4a9f-47f3-bf8e-01730383b16c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gcte6Sz2PaLDgthd1WawzH+5AZvEHps9kxV7G1Z6nU=","crlite_enrolled":true,"id":"82c567ab-3eb1-4255-b03a-4fe090b864b8","last_modified":1591199861980},{"schema":1591167113685,"derHash":"MJp4I7s9Hd9EpXPsC/n9UWZiX95zd2GExiIStMC06U4=","subject":"CN=Root Global CA - G2,O=Root Networks\\, LLC,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxHDAaBgNVBAMME1Jvb3QgR2xvYmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"cfe4daa3fda4a067b507bc4e87a81144512c76604b39da965d2fd02591e76353","size":1715,"filename":"SWMEi8LaBMvhivSePD6iqXTAoaa_XCxGaHOnp0EwbRU=.pem","location":"security-state-staging/intermediates/21c96bd4-d994-48b4-8aaf-e1fc560e61ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWMEi8LaBMvhivSePD6iqXTAoaa/XCxGaHOnp0EwbRU=","crlite_enrolled":true,"id":"1416d740-c734-4daa-8679-a129b8a0cdb3","last_modified":1591199861974},{"schema":1591167110583,"derHash":"RnJ7kMWl9zN1CC2bG8nxe0RfUCCpXjff3x7yCyh8URU=","subject":"CN=University of Ioannina TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTAwLgYDVQQDDCdVbml2ZXJzaXR5IG9mIElvYW5uaW5hIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"2b27a5e354cb0f9e8d1cd07448eeb318b0abc320a26fb40bda7d124841bae222","size":2836,"filename":"PUZlCSUltdtmQPkFYuFiu4nfB3U5nmSRkJODEG7M5_U=.pem","location":"security-state-staging/intermediates/15ccea59-9c05-4ced-ac5a-7cc1be35692f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PUZlCSUltdtmQPkFYuFiu4nfB3U5nmSRkJODEG7M5/U=","crlite_enrolled":true,"id":"e529cfbf-9677-400f-b048-dcf098de3231","last_modified":1591199861972},{"schema":1591167114876,"derHash":"I9OqLFMTb3if98Ix6StiEPzHuA5dpCh8XfG8UltPRhI=","subject":"CN=Panteion University of Social and Political Sciences CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQzBBBgNVBAMTOlBhbnRlaW9uIFVuaXZlcnNpdHkgb2YgU29jaWFsIGFuZCBQb2xpdGljYWwgU2NpZW5jZXMgQ0EgUjE=","whitelist":false,"attachment":{"hash":"320da917aa844f5f9f72ad1a881171ff49ab6edc207d3bc18409b484b1b9bdfa","size":2560,"filename":"VMbQEJYB6stdyxcbVix1ggpyIpDl04eRjPtwyopAi3M=.pem","location":"security-state-staging/intermediates/e1bbdbc4-35da-419b-a610-9112dcfc0c44.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMbQEJYB6stdyxcbVix1ggpyIpDl04eRjPtwyopAi3M=","crlite_enrolled":false,"id":"bb2a53c8-67d7-40e4-bc04-8215a0a2f253","last_modified":1591199861969},{"schema":1591167101480,"derHash":"2v0lBqfpF8Em5ZBEeUOdd5UIfwT6e75hR5Zye5oWHW8=","subject":"CN=vTrus OV SSL CA G1,O=iTrusChina Co.\\, Ltd.,C=CN","subjectDN":"MEkxCzAJBgNVBAYTAkNOMR0wGwYDVQQKDBRpVHJ1c0NoaW5hIENvLiwgTHRkLjEbMBkGA1UEAwwSdlRydXMgT1YgU1NMIENBIEcx","whitelist":false,"attachment":{"hash":"6d43b5a68905a0f438a343d2b49648cb9b0920fd66cc6fcdd135b5e84025a94a","size":1715,"filename":"iJYYHEjYNccDf7l4rZqt8_6DdC728xy4x8RcQNOya3o=.pem","location":"security-state-staging/intermediates/f238a915-dd39-437d-96c4-daca3c66e661.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iJYYHEjYNccDf7l4rZqt8/6DdC728xy4x8RcQNOya3o=","crlite_enrolled":true,"id":"5a1bc619-eb90-4733-b11b-42fc5acbb075","last_modified":1591199861967},{"schema":1591167135744,"derHash":"5n0YY5NnxbKb96VoO1aw8MIxVcj+lFK8/lFoFDYCN0I=","subject":"CN=Abitab SSL Domain Validated,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MF0xCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMSQwIgYDVQQDDBtBYml0YWIgU1NMIERvbWFpbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"8256a9036481e14355f63a485a8508dd9d4b897eba0e2777a7ceada7c537c808","size":1699,"filename":"9wg1kxbl_ew-5-7tpattPPu_j9bgDctkucNkpOG-U6s=.pem","location":"security-state-staging/intermediates/8b5bc65e-d9cc-4c82-9694-c4d4d3657828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9wg1kxbl/ew+5+7tpattPPu/j9bgDctkucNkpOG+U6s=","crlite_enrolled":true,"id":"1568c2be-d6ba-48ba-b4b8-ce6ec52e0dbc","last_modified":1591199861964},{"schema":1591167122329,"derHash":"aX5BqFolPHZaMesYD3jH8QR0nWYsGlNMhDsOWDgFvjc=","subject":"CN=EINS/PKI Public Certification Authority V3,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjM=","whitelist":false,"attachment":{"hash":"cf959bad362e7e0decfbc518291b8dc872e98c2081554568f886e4a2eb24aae3","size":1622,"filename":"Vqrl6W9KGP-r7gtDX4gbt-n6LV6FCHcVDcRFRLJbrrE=.pem","location":"security-state-staging/intermediates/ab2b03cd-7a34-4a64-9be7-9fd364ce7517.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vqrl6W9KGP+r7gtDX4gbt+n6LV6FCHcVDcRFRLJbrrE=","crlite_enrolled":false,"id":"3a33f401-da1b-4241-a126-531a94e3c243","last_modified":1591199861940},{"schema":1591167117608,"derHash":"ltxhXR892QAu5eYosoAe7Qe5Hw5FrK3t7na8YT2gbL0=","subject":"CN=Gehirn Managed Certification Authority - RSA EV,OU=Controlled by COMODO CA exclusively for Gehirn Inc.,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIHAMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTwwOgYDVQQLEzNDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgR2VoaXJuIEluYy4xODA2BgNVBAMTL0dlaGlybiBNYW5hZ2VkIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gUlNBIEVW","whitelist":false,"attachment":{"hash":"bf7465d428608f121b033890ad1a75ce11462b529bb64e1998a64bae2c60d26e","size":2276,"filename":"MQrt-wrOan6w852uOuU2w7xe24wLLPV42Kyxv47Qm84=.pem","location":"security-state-staging/intermediates/6236a16a-b874-4440-b6ea-722270af5ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MQrt+wrOan6w852uOuU2w7xe24wLLPV42Kyxv47Qm84=","crlite_enrolled":false,"id":"8e8cddfa-e58f-4def-a0f9-af5024b733c8","last_modified":1591199861911},{"schema":1591167095567,"derHash":"q9bQU/2+NW0HUFAYFYawucK4wDKYq85kziXEBAHfOyI=","subject":"CN=Hostpoint DV SSL CA - G2,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSEwHwYDVQQDExhIb3N0cG9pbnQgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"87053a64d9eb3524427e4a3d04f8b5844ad96645dd5d5a59da38eafecbec5e2b","size":1654,"filename":"jjxkrzcP29b_8ZkP1-su2vb2ZcV_BkodMS4zGp_DloM=.pem","location":"security-state-staging/intermediates/0bd40108-386a-406c-80a3-b90b463997bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jjxkrzcP29b/8ZkP1+su2vb2ZcV/BkodMS4zGp/DloM=","crlite_enrolled":false,"id":"019b18c2-b025-4793-9449-53a85c827c76","last_modified":1591199861873},{"schema":1591167128660,"derHash":"KrTf9p11u/lUEGC0NM5a0MTay3rw2/IdNhavy0c3lt4=","subject":"CN=Certum Class I CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHsxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBDbGFzcyBJIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"42c093531894319de5b6736e8bb7302536bb599cd0c23045983bc8cdb0398cbf","size":1711,"filename":"DlML3IIZYmKbkc5sg_Vlwu7GmLOhTHxlwiDnuM8uXco=.pem","location":"security-state-staging/intermediates/537f9e86-0aa2-4487-ac82-d4e6d63a5030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DlML3IIZYmKbkc5sg/Vlwu7GmLOhTHxlwiDnuM8uXco=","crlite_enrolled":false,"id":"f0bd44f2-5281-42f1-ae71-9815dbe807b3","last_modified":1591199861864},{"schema":1591167103436,"derHash":"rv/kM17lZCLpJ/Rela4UK56zWXmnQAVprpvepsqrwdw=","subject":"CN=SHECA Global G3 SSL,O=UniTrust,ST=Shanghai,C=CN","subjectDN":"MFExCzAJBgNVBAYTAkNOMREwDwYDVQQIDAhTaGFuZ2hhaTERMA8GA1UECgwIVW5pVHJ1c3QxHDAaBgNVBAMME1NIRUNBIEdsb2JhbCBHMyBTU0w=","whitelist":false,"attachment":{"hash":"966814ad4c7925d39057eb115ca90947f532fe888d00abdd9884f26cad189f7d","size":1999,"filename":"-3DYv-zWynH_VKDDzSsG9R5GfeXFt--F4B8P0tAoRsU=.pem","location":"security-state-staging/intermediates/72f5db49-9653-406b-b129-7db8f562a09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+3DYv+zWynH/VKDDzSsG9R5GfeXFt++F4B8P0tAoRsU=","crlite_enrolled":false,"id":"9a5f7622-15ab-419e-9203-7b79dd0f844e","last_modified":1591199861813},{"schema":1591167118391,"derHash":"QT7CqkZXCIQ3XaAfo6LCNSzVzwK/rLnQAWJacTesbyw=","subject":"SERIALNUMBER=201504,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDQ=","whitelist":false,"attachment":{"hash":"becc7a19429c3fe510ce2088a493ef9860f8e74fc31f972b853d1a6d6d7ddec9","size":2093,"filename":"u-gqJoIpOdY1O3UZ68GeSClDGGp95Ws_umP8zyOohyA=.pem","location":"security-state-staging/intermediates/afe856e5-1628-4340-8086-2841883f1ebd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u+gqJoIpOdY1O3UZ68GeSClDGGp95Ws/umP8zyOohyA=","crlite_enrolled":true,"id":"6c785882-b0f8-4ced-9bdc-d7ab6d035040","last_modified":1591199861786},{"schema":1591167127871,"derHash":"whCHQWu/mDuf/kD11W7g/9lOseZmsEpTKt5ILsIB1nw=","subject":"CN=Wells Fargo Certificate Authority WS1,OU=Symantec Trust Network,O=Wells Fargo,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtXZWxscyBGYXJnbzEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEuMCwGA1UEAxMlV2VsbHMgRmFyZ28gQ2VydGlmaWNhdGUgQXV0aG9yaXR5IFdTMQ==","whitelist":false,"attachment":{"hash":"cba0f94ea2cabab47d4fc2cff80461a012e1384fdf9dae249dbda8696bac62da","size":1845,"filename":"1qvJcavhwfdLbQFNDvMFYaClqSTldkdYglp4N1CvDAE=.pem","location":"security-state-staging/intermediates/605850ac-8284-471d-b389-57594942215e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1qvJcavhwfdLbQFNDvMFYaClqSTldkdYglp4N1CvDAE=","crlite_enrolled":false,"id":"8dbc9b5b-c846-432c-87e4-5c44cbc82bce","last_modified":1591199861782},{"schema":1591167127088,"derHash":"j9FqF5lE1dHUIK8JQF7aer8qnHQog+jC+J4NkK+vdUs=","subject":"CN=AC Representaci\u00f3n,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"ME0xCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxGzAZBgNVBAMMEkFDIFJlcHJlc2VudGFjacOzbg==","whitelist":false,"attachment":{"hash":"fbb63f349bcc5868c551877141aadf4dc7c5f336ecd9ff3349ae89d79806d799","size":2438,"filename":"2ldsefSfkTU7GGXfz4iYiPnOUDkbKiYdUaPGd2du8EQ=.pem","location":"security-state-staging/intermediates/28006d3e-f7bf-4fec-b7d7-e7f43b6987e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ldsefSfkTU7GGXfz4iYiPnOUDkbKiYdUaPGd2du8EQ=","crlite_enrolled":false,"id":"4f3d1faf-a555-407d-bf85-71e6aa0c4bbe","last_modified":1591199861766},{"schema":1591167110971,"derHash":"vJ4iPMQidcwDQZDfLQF5tVtzLVrFMRN6e1Itz+BKBZI=","subject":"CN=GeoTrust Extended Validation SHA256 SSL CA,O=GeoTrust Inc.,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTMwMQYDVQQDEypHZW9UcnVzdCBFeHRlbmRlZCBWYWxpZGF0aW9uIFNIQTI1NiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"46ad52d45d9e44779ff98b1488cb499ecc79a96ca90bddbd6c76512c47d537ed","size":1735,"filename":"ETrxfY_aVptAHxW1VmC2WjDv0VLyOmN9vfVO45quBtg=.pem","location":"security-state-staging/intermediates/8511db0a-de1a-44fa-87cc-fd1e1fc95f78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ETrxfY/aVptAHxW1VmC2WjDv0VLyOmN9vfVO45quBtg=","crlite_enrolled":false,"id":"dcc3ee74-7f0b-4951-9f0e-c7d34097d1dc","last_modified":1591199861760},{"schema":1591167129850,"derHash":"w2i6rNq2w0pSPlfzn+Bx3oWm0a7f0d29Ivq7S3DaX0E=","subject":"CN=The University of Texas at Austin RSA CA,OU=Information Security Office,O=The University of Texas at Austin,L=Austin,ST=TX,C=US","subjectDN":"MIGwMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxDzANBgNVBAcTBkF1c3RpbjEqMCgGA1UEChMhVGhlIFVuaXZlcnNpdHkgb2YgVGV4YXMgYXQgQXVzdGluMSQwIgYDVQQLExtJbmZvcm1hdGlvbiBTZWN1cml0eSBPZmZpY2UxMTAvBgNVBAMTKFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIGF0IEF1c3RpbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"b0061b5cde3d079be7801311c889ce6fbf716ebb7e28e0dbf666e7beb7a18115","size":2207,"filename":"lLeKgz_ECOEUD_q5gE_wxHdQZwCGZUSX7XdxXEOzoG4=.pem","location":"security-state-staging/intermediates/d468242c-fc9f-4cb4-8acb-451892fc85cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lLeKgz/ECOEUD/q5gE/wxHdQZwCGZUSX7XdxXEOzoG4=","crlite_enrolled":true,"id":"89c34cc1-9032-4a6e-a795-1a0dcd125dfe","last_modified":1591199861733},{"schema":1591167135342,"derHash":"bo2VL9urrY3j1h4JQ5Nzm1pHNxpSvcsqPC+MQ2IvZA8=","subject":"CN=DigiCert Trusted Server CA G4,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0ZWQgU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"1b0227fb528c1325b07b31b6a5fb4aaae403cf52260bf9d9cd10243df1594c27","size":2263,"filename":"ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=.pem","location":"security-state-staging/intermediates/59a98e6a-d170-4c1b-a564-25e3d6f2bade.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=","crlite_enrolled":false,"id":"0af55fad-9862-4ab7-b10a-5e19e0d6a32c","last_modified":1591199861718},{"schema":1591167098714,"derHash":"twC6Sa9NGecvsVotrDwhO6RMMZ+n2pJ3KzaC4St4EJM=","subject":"CN=AffirmTrust Extended Validation CA - EV3,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjM=","whitelist":false,"attachment":{"hash":"2e254ce9b0bd7ecaa13ed912c586e0853458c939d61e8f564883c7f10f882aab","size":1674,"filename":"-TrM-YTWywZV8UwhobD51F1gyN0R9i8HSXRhwDUA_PQ=.pem","location":"security-state-staging/intermediates/1a96dd1e-3da0-45c3-af06-b3f0b4132469.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+TrM+YTWywZV8UwhobD51F1gyN0R9i8HSXRhwDUA/PQ=","crlite_enrolled":true,"id":"5c30def2-02f2-4f59-9e75-fb7cec21fda7","last_modified":1591199861716},{"schema":1591167115649,"derHash":"JOnyCsFnu48J3ooemWjMU/C186SUj1G4ZHtAsYbHXr4=","subject":"CN=DigiCert Secure Auth CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IFNlY3VyZSBBdXRoIENB","whitelist":false,"attachment":{"hash":"a64942af324b392768de8a32c2187db5660a414d7e770bda2812f1a9e980d44b","size":1792,"filename":"tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=.pem","location":"security-state-staging/intermediates/0500e928-1f83-4f99-a7e3-24b68820248d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=","crlite_enrolled":false,"id":"6526cd1b-5a23-40c2-b96c-e1680e2c0884","last_modified":1591199861714},{"schema":1591167115264,"derHash":"FHxEf+64YgK1AzFPyvADa+qu9DfDm1azWOxEap0gOH8=","subject":"CN=SHECA EV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"79e8a49ce016fdd9c0af03939862785c3c2d81031cbbf7fa59067b46edcfa51c","size":1886,"filename":"xi4INX1FNKxbnVAZdwTrMNDrumTwxFHJ81fg-e_d2lc=.pem","location":"security-state-staging/intermediates/89c1da85-ab0a-47e6-9779-d9122d19152f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xi4INX1FNKxbnVAZdwTrMNDrumTwxFHJ81fg+e/d2lc=","crlite_enrolled":false,"id":"ac6e22b1-b052-4a8c-8678-c546d37f748d","last_modified":1591199861695},{"schema":1591167133769,"derHash":"wKsH2QcaTMHTRAkXj4vKBYMQqLER3c+mVWWHYCJvUPk=","subject":"CN=WoSign EV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"70b0ebbc523a8c85dfbcba297ad8752536887543b61fafc141de629f096c6ef6","size":1691,"filename":"kUsaqEFcRNYeLMDaKST82jCK2fP2QzSDRUyN92iicvw=.pem","location":"security-state-staging/intermediates/77469872-4038-4fec-bc01-bcfacaf96e61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kUsaqEFcRNYeLMDaKST82jCK2fP2QzSDRUyN92iicvw=","crlite_enrolled":false,"id":"c63369ab-e91c-444e-ab6e-6400efdbc7ea","last_modified":1591199861686},{"schema":1591167104643,"derHash":"iKFeJAyJhzwddDxQPA9fTvcagrVsM1l8ake/CW2dO+Y=","subject":"SERIALNUMBER=201508,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDg=","whitelist":false,"attachment":{"hash":"2f79b1033df0522a67c163fc81ce2732e1f478e53059f30038d886faad2d198c","size":2093,"filename":"zduiwxJuZStrkO6Flv96lCWLQI-61C3s5N1jNhbIU7Y=.pem","location":"security-state-staging/intermediates/5e1a3c18-e372-498e-8f60-5f889e22773b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zduiwxJuZStrkO6Flv96lCWLQI+61C3s5N1jNhbIU7Y=","crlite_enrolled":true,"id":"f8a7b557-1b13-43a0-8b2b-3338f34c8383","last_modified":1591199861672},{"schema":1591167127479,"derHash":"eSC44Y0vwS2Bwvq5CmOxtSqzKc580ct8oJTN+dYA9JI=","subject":"CN=thawte Extended Validation SHA256 SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xMTAvBgNVBAMTKHRoYXd0ZSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNIQTI1NiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"563a21cfced81aebe67aac78ad46c393d97ccc5dfae514ccccedd89d53d40a37","size":1727,"filename":"o-9u8XvAYtT_uhU48fZ16spZWnwnEELUcZesUD4gsBA=.pem","location":"security-state-staging/intermediates/ef964011-0a45-44b3-9e70-8d05f1a139c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o+9u8XvAYtT/uhU48fZ16spZWnwnEELUcZesUD4gsBA=","crlite_enrolled":false,"id":"aef4d01c-2e71-497a-9152-77b111228724","last_modified":1591199861670},{"schema":1591167125522,"derHash":"OH1Ja5IgLUxEPNlP9C2hffLx5o4kTC+7p+KU290RNXs=","subject":"CN=WISeKey CertifyID Advanced GC CA 1,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBBZHZhbmNlZCBHQyBDQSAx","whitelist":false,"attachment":{"hash":"3847cc74ceb46d2e07d37b69b668ff50587428a43ef992473d4a3e433bcb1972","size":1293,"filename":"Y3IJxxxojxFKeXVhVUyyPE4P-7QrAbKt0viCWXpb1G8=.pem","location":"security-state-staging/intermediates/233bd648-66bc-440b-8b31-293196be1b49.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y3IJxxxojxFKeXVhVUyyPE4P+7QrAbKt0viCWXpb1G8=","crlite_enrolled":true,"id":"5905f153-1bda-44df-8205-013b8756834a","last_modified":1591199861664},{"schema":1591167102659,"derHash":"qK0cJcxYCyEx/Mb8bWUTdG846pm9FiyBtcU5NJUXWxg=","subject":"CN=STRATO TLS RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFwxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRowGAYDVQQDExFTVFJBVE8gVExTIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"d4b8e211872849d13a1e260cdc06a24464432a0fa7627e3f666d44abf76f5a34","size":1654,"filename":"_MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=.pem","location":"security-state-staging/intermediates/7bc0c334-aaef-4dcb-92c6-98e7cfab6209.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=","crlite_enrolled":false,"id":"cede6dc8-3cb1-4e8b-840c-e51a697702ec","last_modified":1591199861662},{"schema":1591167118782,"derHash":"xVfZ3uOkUTRbCN6xeJYaHIDC+8NyMGfLGyM4DOfeiMA=","subject":"SERIALNUMBER=201511,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTE=","whitelist":false,"attachment":{"hash":"00fb675f00181f478291ea1dc2ee08b8fcdfc0d519fcfa6402b4ff474fbd3eae","size":2093,"filename":"lj1vlZfMd2V_aT2U-5-kNFLhsBmFrR34EQm2OTMD3Y8=.pem","location":"security-state-staging/intermediates/7c090492-98db-41a5-b69d-8401237a3fe4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lj1vlZfMd2V/aT2U+5+kNFLhsBmFrR34EQm2OTMD3Y8=","crlite_enrolled":true,"id":"2372ca19-0a90-4964-a048-80f7a672471a","last_modified":1591199861653},{"schema":1591167112135,"derHash":"4+lOe+UyuUk/Sz7dUxHqCw1O63rYFd/Ljz5jVuHxy44=","subject":"SERIALNUMBER=201505,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDU=","whitelist":false,"attachment":{"hash":"34d10a97c4300798b8710e1fef33d7bbaf26eea241d30c38d827a8314fb24dab","size":2093,"filename":"RNe7v5CES3j8AJTjDjnXy97aI59Zwn09cBcYeuDXVk4=.pem","location":"security-state-staging/intermediates/33b81138-bc9d-4183-9c67-e85acf11ae6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RNe7v5CES3j8AJTjDjnXy97aI59Zwn09cBcYeuDXVk4=","crlite_enrolled":true,"id":"4acd2cb7-b56a-4ee2-9037-f765c2850803","last_modified":1591199861630},{"schema":1591167100293,"derHash":"OTuLFcq8OIb7LkFkldY8i63Y3K+HVSB2yKCpY3wk3kc=","subject":"CN=SHECA DV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"80e794ca68f692fa483c4c5cb8e9806bc0ddce1148522be81196e5ad85e5b01b","size":1886,"filename":"vxQ5rrMProJi_--FvKOiNtV0E-SCmjf-g1jA2GXodec=.pem","location":"security-state-staging/intermediates/64c3d745-1d1f-48a0-b654-9371f223ad9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vxQ5rrMProJi/++FvKOiNtV0E+SCmjf+g1jA2GXodec=","crlite_enrolled":false,"id":"e5580962-2ff1-4674-881d-d2a669207187","last_modified":1591199861583},{"schema":1591167133382,"derHash":"nfd0iMS3SsMuPOxMZD0AHVw7q/pAAf/Rk9yhDIvlyzo=","subject":"CN=AffirmTrust Extended Validation CA - EV2,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjI=","whitelist":false,"attachment":{"hash":"89053e842a9e8970354492a7c4548abec7c0be523c780e0f953ea552f30a541f","size":2012,"filename":"x6O8qvzc0zILZCc4XHPUu67PSku6NJHUaXQY4KvAUgg=.pem","location":"security-state-staging/intermediates/3085f02a-64cc-4c75-9005-38f7daa19fab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x6O8qvzc0zILZCc4XHPUu67PSku6NJHUaXQY4KvAUgg=","crlite_enrolled":true,"id":"6b507c8d-2732-4c9b-9a07-d2512c0e2117","last_modified":1591199861568},{"schema":1591167107831,"derHash":"WBbG5AeZtbx/CxTJYUo206yncd9UoASUXw+Nfgsp/8o=","subject":"SERIALNUMBER=201501,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMQ==","whitelist":false,"attachment":{"hash":"0d46e6a34f0da6a0c2fecffc0740218d25d513ae95664755de9d235bda5d9281","size":2097,"filename":"tRPCGioU3g7SQ_LnaZzP56f2x-Cn4zzeQuT-EjcFVwg=.pem","location":"security-state-staging/intermediates/57330922-3e65-46a3-be30-5c0d975f5b82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tRPCGioU3g7SQ/LnaZzP56f2x+Cn4zzeQuT+EjcFVwg=","crlite_enrolled":true,"id":"77d7942b-74d8-4b94-ab76-a0e65bd98d6c","last_modified":1591199861538},{"schema":1591167104251,"derHash":"7MKVtt3NCEunF5+1O90dQiy2wKjZTxVNSlsXeAtyee0=","subject":"CN=Amazon,OU=Server CA 3B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAzQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"c7c4797af7be4621b3d92ccb6bd9cb9b0dd0a450c089b66be3ba98c8bc4186e3","size":1008,"filename":"s5SRPmhQ_9M4pBTJFJbNff5De6KuZpZr6r1_ZkgUbbE=.pem","location":"security-state-staging/intermediates/72c3d6bb-f1e7-4495-af68-0ba087eda278.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"s5SRPmhQ/9M4pBTJFJbNff5De6KuZpZr6r1/ZkgUbbE=","crlite_enrolled":true,"id":"302e34c5-2646-4c4a-ac02-84ccf409fc91","last_modified":1591199861532},{"schema":1591167129058,"derHash":"bEDQf0cFpbTwTGrs3Fob9f040rbPLbfyEsolEHW+El0=","subject":"CN=Shuidi Webtrust SSL Extended Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMS8wLQYDVQQDDCZTaHVpZGkgV2VidHJ1c3QgU1NMIEV4dGVuZGVkIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"15549ed43fba7dd4ac582772db414c06ac7f55ba18ecf419619290411515f7e8","size":1780,"filename":"YARY8M4pNVQjSsk5Xgw-N3b7ZaQssU3-Ml2q5c55P1Q=.pem","location":"security-state-staging/intermediates/63152062-fb6c-4aea-80be-e8ee9f7ee7e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YARY8M4pNVQjSsk5Xgw+N3b7ZaQssU3+Ml2q5c55P1Q=","crlite_enrolled":false,"id":"1944c7f1-bf0e-4729-a9ec-68ff7ce41381","last_modified":1591199861522},{"schema":1591167107052,"derHash":"MoxZkdg4PifQ6+kQv2bArz10ioXTARpS2I8djIY1ZH8=","subject":"CN=CloudFlare Inc RSA CA-1,O=CloudFlare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRGbGFyZSwgSW5jLjEgMB4GA1UEAxMXQ2xvdWRGbGFyZSBJbmMgUlNBIENBLTE=","whitelist":false,"attachment":{"hash":"f41ed47d0f43325c9f089d03415c972ce1d3f1ecab6e4d6260665baf3db3ccee","size":1597,"filename":"CfyancXuwYEHYRX3mmLJI3NFW6E8cydaCGS1D9wGhT4=.pem","location":"security-state-staging/intermediates/65650a0f-7c22-4c10-9744-2d67e301f5f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CfyancXuwYEHYRX3mmLJI3NFW6E8cydaCGS1D9wGhT4=","crlite_enrolled":false,"id":"872ce619-ac04-47e9-b4ac-7ff12d0ec19c","last_modified":1591199861498},{"schema":1591167116427,"derHash":"zeI6UjA8PKZ6S7vMlYL/XJIDqpjLDzhxOTCM4iiVBqI=","subject":"CN=AffirmTrust Extended Validation CA - EVEC1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGFMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMzAxBgNVBAMTKkFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVkVDMQ==","whitelist":false,"attachment":{"hash":"865dd39def93692e37eef786ad2c8cc23e7d0c975e5371aadd94657e67cbbcb9","size":1223,"filename":"EJPx6trc98AgGgNEdBceeQPzoTVw1_xu9uLPoj5Wczw=.pem","location":"security-state-staging/intermediates/48c70d0d-3354-46cd-857a-bedd9c0140c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EJPx6trc98AgGgNEdBceeQPzoTVw1/xu9uLPoj5Wczw=","crlite_enrolled":true,"id":"07decb3e-5474-49fb-8e4b-b0ce15e562f9","last_modified":1591199861471},{"schema":1591167129450,"derHash":"bmLL4+QqQcUEBbPi8aRCV2gyZ4VhhK+cAhEgcKyDaTY=","subject":"CN=Thawte ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBFQ0MgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"b720fd52f7eed374b2c5902c55a3d185a8cd84a9b4fada7958cae32b764e4368","size":1358,"filename":"3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0-ig=.pem","location":"security-state-staging/intermediates/f9d2835d-36a6-47e4-b9d6-addbf0a8d4cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0+ig=","crlite_enrolled":true,"id":"0bc07455-8ec5-41eb-ac5a-22460bb932e5","last_modified":1591199861461},{"schema":1591167132596,"derHash":"Or00nX/hQwXmlSQSNPn/lK6CGt9EZ7wWB6E+ES9ep2c=","subject":"CN=SSL.com Premium EV CA,OU=Controlled by COMODO exclusively for SSL.com+OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MIGMMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHU1NMLmNvbTE1MDMGA1UECxMsQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIFNTTC5jb20xFDASBgNVBAsTC3d3dy5zc2wuY29tMR4wHAYDVQQDExVTU0wuY29tIFByZW1pdW0gRVYgQ0E=","whitelist":false,"attachment":{"hash":"a9afa165fd6ff926ecdcac1b57b4aff26949c7339f1f27f14e96ba34ba7aed05","size":2231,"filename":"q9kHBA4OE40-HVkOIjyKiKBED3yDP_uskMLt3i9Z7e8=.pem","location":"security-state-staging/intermediates/b4c44040-4a0f-44f0-bafc-2ef091b752cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q9kHBA4OE40+HVkOIjyKiKBED3yDP/uskMLt3i9Z7e8=","crlite_enrolled":false,"id":"14597233-b2e4-409d-a2e8-143da66f07a4","last_modified":1591199861440},{"schema":1591167092722,"derHash":"fOza/GvmGKQPG6wmRiRjhHQS1nalxtI4mVUO6Xa+Mv4=","subject":"CN=SSL Blindado EV 2,OU=Controlled by COMODO exclusively for Site Blindado S.A.+OU=Certifica\u00e7\u00e3o Digital,O=Site Blindado S.A.,L=S\u00e3o Paulo,ST=SP,C=BR","subjectDN":"MIHLMQswCQYDVQQGEwJCUjELMAkGA1UECBMCU1AxEzARBgNVBAcMClPDo28gUGF1bG8xGzAZBgNVBAoTElNpdGUgQmxpbmRhZG8gUy5BLjFAMD4GA1UECxM3Q29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIFNpdGUgQmxpbmRhZG8gUy5BLjEfMB0GA1UECwwWQ2VydGlmaWNhw6fDo28gRGlnaXRhbDEaMBgGA1UEAxMRU1NMIEJsaW5kYWRvIEVWIDI=","whitelist":false,"attachment":{"hash":"259a41110133846c14d5ea5590dd8aa42d7531eaef59c1841a6b6f301cde5c42","size":2280,"filename":"oomAz8Bc3vA9i8i7dKzYpXEAA9hSHc_4c1uNOVpwL_s=.pem","location":"security-state-staging/intermediates/36e73adc-530e-402f-9d94-27f5e9c0cb96.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oomAz8Bc3vA9i8i7dKzYpXEAA9hSHc/4c1uNOVpwL/s=","crlite_enrolled":false,"id":"d082497c-c3b1-488e-a8a2-7474e38160a3","last_modified":1591199861436},{"schema":1591167119174,"derHash":"UnTMU7wGH5+YRDD0AanTujWiDO686I5t+nGyaafGQNI=","subject":"CN=Hongkong Post e-Cert CA 1 - 10,O=Hongkong Post,C=HK","subjectDN":"ME4xCzAJBgNVBAYTAkhLMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MScwJQYDVQQDEx5Ib25na29uZyBQb3N0IGUtQ2VydCBDQSAxIC0gMTA=","whitelist":false,"attachment":{"hash":"8da29ad05563050f363f59f064bea5f14050e76d2ade435bde02d43bf0465938","size":1175,"filename":"PfEWtMmnBuSczngTKHScBWoAorL7zO3kx7RNC29R4e0=.pem","location":"security-state-staging/intermediates/d2f47cd7-6af4-430b-8440-37887987872c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PfEWtMmnBuSczngTKHScBWoAorL7zO3kx7RNC29R4e0=","crlite_enrolled":true,"id":"472dc9b5-2882-40d9-8a50-9352050b4390","last_modified":1591199861425},{"schema":1591167130252,"derHash":"+lH+OfDzFukkEuEXARji1iqOStoPiOwjfzzmMfcL4pg=","subject":"CN=Noble Energy SHA256 CA - G2,O=Noble Energy\\, Inc.,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEQMA4GA1UEBxMHSG91c3RvbjEbMBkGA1UEChMSTm9ibGUgRW5lcmd5LCBJbmMuMSQwIgYDVQQDExtOb2JsZSBFbmVyZ3kgU0hBMjU2IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"90ad7e696dba8c1e23f6880f2f04e6cb6a14c58d040ee93ab47d30fa7e5d936a","size":1869,"filename":"E2apBiPMG_Zpvk8zbzKt5sh4sBj4KaAUi2QTkc8XsaM=.pem","location":"security-state-staging/intermediates/fb675c81-8e4b-4430-96db-09b12e43bdae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E2apBiPMG/Zpvk8zbzKt5sh4sBj4KaAUi2QTkc8XsaM=","crlite_enrolled":false,"id":"89546195-a930-4b5e-a9ea-1a504f1bdc72","last_modified":1591199861413},{"schema":1591167096355,"derHash":"ZUDPz3Q+hKstZ4ZvLxOlP+evLol3pcFoH+B6GGliDdE=","subject":"CN=NII Open Domain CA - G4,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MG0xCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc0","whitelist":false,"attachment":{"hash":"694b64628a7d5374fe0a1236dde0139e98c044d4e255e52f6e8890eaa0a4dea1","size":1646,"filename":"pkYOyiZbq6eiG3-fTHdQPKnpyBMSHLTdN87BtKobe2o=.pem","location":"security-state-staging/intermediates/9fddafa0-9c9d-4c6c-b696-f7502cb6768d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pkYOyiZbq6eiG3+fTHdQPKnpyBMSHLTdN87BtKobe2o=","crlite_enrolled":false,"id":"1f00a77e-a49f-4949-8809-b6e456e666ae","last_modified":1591199861401},{"schema":1591167109400,"derHash":"PQwrOOhcr0nDg7bDMoZA5fvobs+in6sTcVGs0bQu0Uk=","subject":"CN=EINS/PKI Public Certification Authority V3,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjM=","whitelist":false,"attachment":{"hash":"e4b8a6bf0eddbecf5ae45cdefa44dbaf3900507c7ec1f5f815078e0c1219f2f3","size":1618,"filename":"RnCQQs9ip0vyrhGBt2ogczNkSTqpuYCXhqgIL0RZGWQ=.pem","location":"security-state-staging/intermediates/f240b23f-faa7-4c5f-94ad-2b165f331e4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RnCQQs9ip0vyrhGBt2ogczNkSTqpuYCXhqgIL0RZGWQ=","crlite_enrolled":false,"id":"50fbb791-2793-42f8-bb20-6140333152f2","last_modified":1591199861395},{"schema":1591167111362,"derHash":"Cz5xovGFt21ghI+AWN8IXNSUtFu/+jSrt/4KTudRPtw=","subject":"SERIALNUMBER=201501,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDE=","whitelist":false,"attachment":{"hash":"22965e59ce07d01290e039c484a513333a3947d9ec580812b375f3d4f8a8f9a9","size":2093,"filename":"-PZGhNMpPNHJLO37ogEwXscavltZ_j_PtNOQVm_NWF8=.pem","location":"security-state-staging/intermediates/50e98f69-8a78-489c-99e2-51b3ef5607cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+PZGhNMpPNHJLO37ogEwXscavltZ/j/PtNOQVm/NWF8=","crlite_enrolled":true,"id":"3cdafee2-76f3-42c8-858b-e26661a6a9c9","last_modified":1591199861393},{"schema":1591167114082,"derHash":"TAE7iFRonLZibMCHtNT8ykUQTi1zv63zOml57RJLeDc=","subject":"CN=AlphaSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcz","whitelist":false,"attachment":{"hash":"5ec4d3d36a5abdd7e8f9f97d4fdfe971b778b6a3c00875e565acf06c59c855ed","size":1601,"filename":"yiytxmxVlqUkaojBswiPQ3AdtFgFdeR3-pfRgzPzjyc=.pem","location":"security-state-staging/intermediates/0ed13f7e-af76-4379-bca8-e1e23e23ba32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yiytxmxVlqUkaojBswiPQ3AdtFgFdeR3+pfRgzPzjyc=","crlite_enrolled":false,"id":"968f0c8d-ebe5-488a-8340-d5e4e9b76cc6","last_modified":1591199861383},{"schema":1591167134944,"derHash":"8U1VJtvE4hi048eJuAX6UD5MHgCPUbR4sx9ewsBGUFM=","subject":"SERIALNUMBER=201410,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MTA=","whitelist":false,"attachment":{"hash":"a755a413df5939715ef8ed2b03de59241eaf26b5b17fb53165acddacbe7fb37d","size":2093,"filename":"bpnQ2j55R3xHAVSt43XkvZK65UCBePG74mW3xb2U6bE=.pem","location":"security-state-staging/intermediates/900020b0-bc89-454b-9900-ea5cfd7cdf75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bpnQ2j55R3xHAVSt43XkvZK65UCBePG74mW3xb2U6bE=","crlite_enrolled":true,"id":"6e1e16c5-1f74-4570-b13f-fb8d4006e3d9","last_modified":1591199861339},{"schema":1591167119954,"derHash":"VvGgaYpGlIe4WKYsgccurHgTtqbmKh1ci0tofvRahsY=","subject":"SERIALNUMBER=201509,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDk=","whitelist":false,"attachment":{"hash":"1382abc89dabcc879a78d635a83dfff7b7f8f4690017765fb959d56f15328322","size":2093,"filename":"YgUnZLend8A1dYQYIwzEwA7hgRZqcesd6yztVE5VXmQ=.pem","location":"security-state-staging/intermediates/a635f570-6367-4776-9303-d0f24e8d99d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YgUnZLend8A1dYQYIwzEwA7hgRZqcesd6yztVE5VXmQ=","crlite_enrolled":true,"id":"dbe5c709-506e-4280-897b-020eeea4ef49","last_modified":1591199861325},{"schema":1591167113296,"derHash":"iR7i4jKC5QdsmukEfejqkA4Gb4HW3Nm4Q8WQeLDxBbw=","subject":"CN=WoSign EV SSL Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIEVWIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"07c937a29a0a69cd8357438132740524c5f2b962a315e7238630d95a61147284","size":1634,"filename":"pH1dud9XORPnyq8wyLWWIS773gVEO_1UuyQKQdv4xKg=.pem","location":"security-state-staging/intermediates/bfbf0539-e24d-4990-a202-fc97784d7f75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pH1dud9XORPnyq8wyLWWIS773gVEO/1UuyQKQdv4xKg=","crlite_enrolled":false,"id":"78e81458-dc94-491e-9bbd-82c797f01706","last_modified":1591199861316},{"schema":1591167125915,"derHash":"w4BN5R6MFwUiIK4crT04PlTVt9wohDxC8NvZkTwehlg=","subject":"CN=Secure Site Pro Extended Validation ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"0888b26cf00bcea2525da774e654b5c2ea18871782615c5140d3fb8b3541ab28","size":1463,"filename":"_Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB_j8=.pem","location":"security-state-staging/intermediates/c841c215-26a7-4218-8633-09f2ccc236bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB/j8=","crlite_enrolled":false,"id":"19662870-223a-4691-9872-b58acbff1ebd","last_modified":1591199861310},{"schema":1591167124738,"derHash":"w+PC3uEb+M/qVv1ZAK/pXNQ41zkdylWge/9EFHo1qCg=","subject":"SERIALNUMBER=10810700152,CN=Intesa Sanpaolo Organization Validation 2019 CA,OU=WSA Trust Service Provider,O=Intesa Sanpaolo S.p.A.,C=IT","subjectDN":"MIGjMQswCQYDVQQGEwJJVDEfMB0GA1UECgwWSW50ZXNhIFNhbnBhb2xvIFMucC5BLjEjMCEGA1UECwwaV1NBIFRydXN0IFNlcnZpY2UgUHJvdmlkZXIxFDASBgNVBAUTCzEwODEwNzAwMTUyMTgwNgYDVQQDDC9JbnRlc2EgU2FucGFvbG8gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gMjAxOSBDQQ==","whitelist":false,"attachment":{"hash":"5f497951c07710b122718d697a85665edc20f8913fca4830c994f0a3d4543bf2","size":2706,"filename":"U8_hCRrBPyuCYZBzEVQyVIzTfQOQ9G2QXmqJbys0WpE=.pem","location":"security-state-staging/intermediates/79430411-6e34-4b98-ae2f-ec7ec3df0e00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U8/hCRrBPyuCYZBzEVQyVIzTfQOQ9G2QXmqJbys0WpE=","crlite_enrolled":true,"id":"72a4e0da-1359-4549-99b6-255fe0354d0e","last_modified":1591199861293},{"schema":1591167131032,"derHash":"Iy9jZ89WHgDIPhgKn8qFRrN3H7RQ68tKBSb4NJyMoTk=","subject":"CN=Entrust Certification Authority - L1E,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFF","whitelist":false,"attachment":{"hash":"fb13e64f68c20f1be87aefb4a955348c9604a4103426723d49f8029f9fbcc797","size":1833,"filename":"HeMEDmta9acr_zmjHkdP_dKlW5RaqBlmADFOqTG56eA=.pem","location":"security-state-staging/intermediates/703534c7-f828-4ce3-86b8-8655d652362c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HeMEDmta9acr/zmjHkdP/dKlW5RaqBlmADFOqTG56eA=","crlite_enrolled":true,"id":"4afefd58-c2fb-4ede-9f24-7a133bc67e03","last_modified":1591199861291},{"schema":1591167105053,"derHash":"62K/+my8gC5Nrm+MU5CAIL5/B3dKVeZ7vWPsw3Z53sg=","subject":"CN=Apple Public Client RSA CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBDbGllbnQgUlNBIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"0ac5fad4496d38d0d04fa4eb7fd0df675e54078a637db0a03dc61b5310fb81b1","size":1796,"filename":"W2tlxSBNBFn6yFefJU_iRsNK6Wx_D6jCbtOc0sr3dcM=.pem","location":"security-state-staging/intermediates/cff50670-bd2a-4c54-8946-9c3a2f2bf269.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W2tlxSBNBFn6yFefJU/iRsNK6Wx/D6jCbtOc0sr3dcM=","crlite_enrolled":true,"id":"4be325ba-4a50-48a4-a443-4817dedb5e8f","last_modified":1591199861263},{"schema":1591167121138,"derHash":"AQoQMqQflagsxaSrsJiAmbF5qa+zkusQOOlTuxxfeBM=","subject":"SERIALNUMBER=201401,CN=Government CA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IENBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"a5d0529635f9c3cff86ede1648e1e65a41e9f78e171871943131767a45c1fb70","size":2097,"filename":"ykSGWOpAu6O0UEhE_5QaIEVb1TdtAlxXyuYiXn95XsY=.pem","location":"security-state-staging/intermediates/494cc004-690d-4312-8e57-fdc940038998.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ykSGWOpAu6O0UEhE/5QaIEVb1TdtAlxXyuYiXn95XsY=","crlite_enrolled":false,"id":"4b2bbd7d-eba6-4808-83aa-09b3e1fa24ac","last_modified":1591199861253},{"schema":1591167120744,"derHash":"NxIsGj8+LSF0dAxCxrxfWFzTjYGwlS3LRXrMAQrHpOI=","subject":"SERIALNUMBER=07945211006,CN=InfoCert Organization Validation 2019 CA 3,OU=WSA Trust Service Provider,O=InfoCert S.p.A.,C=IT","subjectDN":"MIGXMQswCQYDVQQGEwJJVDEYMBYGA1UECgwPSW5mb0NlcnQgUy5wLkEuMSMwIQYDVQQLDBpXU0EgVHJ1c3QgU2VydmljZSBQcm92aWRlcjEUMBIGA1UEBRMLMDc5NDUyMTEwMDYxMzAxBgNVBAMMKkluZm9DZXJ0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIDIwMTkgQ0EgMw==","whitelist":false,"attachment":{"hash":"3a11138c7a600ec7442b5e4709ee0f88fa80829315e74b8e78d4a456fd849c4e","size":2690,"filename":"N9dUlTAT1o0Ai9rArJ9HdU0z5ynuQQbtzwjWvGFRrDo=.pem","location":"security-state-staging/intermediates/3c7379b5-17ba-43e5-bd15-542d1e08e93e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9dUlTAT1o0Ai9rArJ9HdU0z5ynuQQbtzwjWvGFRrDo=","crlite_enrolled":true,"id":"8d2d8e23-ed85-48df-9c81-6f9ab4e4971b","last_modified":1591199861247},{"schema":1591167097159,"derHash":"vMOlTXCDEWMWzgO5pAyjbzNvSDmsWBhi1DEahPcBUU0=","subject":"CN=OKCERT R4 OV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IE9WIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"579d6f5ecf8bcd46d62a770353e586d532320b1e7caea44c51a03952e3fdadde","size":1776,"filename":"J_LNyLPuoW1JcAhG6eG-bHMYhGpN5b-M_HHHd56hnzU=.pem","location":"security-state-staging/intermediates/a65aafdc-334e-4b10-b8d7-597fbfe091bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J/LNyLPuoW1JcAhG6eG+bHMYhGpN5b+M/HHHd56hnzU=","crlite_enrolled":true,"id":"101d25a5-7aab-4b79-9230-e4cb060e9e42","last_modified":1591199861225},{"schema":1591167136138,"derHash":"i7L2iD/tKJpSG6J8R4SClQh04UPKzOxvwCWZDAxGgT4=","subject":"CN=HydrantID Server CA O1,OU=HydrantID Trusted Certificate Service,O=IdenTrust,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxLjAsBgNVBAsTJUh5ZHJhbnRJRCBUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2UxHzAdBgNVBAMTFkh5ZHJhbnRJRCBTZXJ2ZXIgQ0EgTzE=","whitelist":false,"attachment":{"hash":"5c37cd80ee6407081923d28c6774e88ec067942ade58ad3454319f095efcf4e3","size":2431,"filename":"EeppXTka8xyJcDQhuKdo9XL4LWROHEY7l1qZG55lMIo=.pem","location":"security-state-staging/intermediates/fc98d0bf-3fd0-4144-8840-b8ab888570c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EeppXTka8xyJcDQhuKdo9XL4LWROHEY7l1qZG55lMIo=","crlite_enrolled":true,"id":"5b05b0f5-6f11-4694-90c1-40b4a6d81b2c","last_modified":1591199861222},{"schema":1591167093122,"derHash":"7vkGZCTCNQjpxl+EZxsU4W2hvsNY51/GOC7KBwroYb4=","subject":"CN=Abitab SSL Organization Validated,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MGMxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMSowKAYDVQQDDCFBYml0YWIgU1NMIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"c30af6395f2acc919d52e2b39391c424dfd9016f96111216e9bc5fd3dc34421c","size":1707,"filename":"E4GLDtTEwO7UCeAtO8ibbOu6FLZxSIUC_fBzIbM5mV4=.pem","location":"security-state-staging/intermediates/2cbc872a-e92a-4c95-ad98-01379cbdc630.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E4GLDtTEwO7UCeAtO8ibbOu6FLZxSIUC/fBzIbM5mV4=","crlite_enrolled":true,"id":"d02db623-261b-4357-8746-76ac75242c86","last_modified":1591199861175},{"schema":1591167121528,"derHash":"dqxae3TjELnmJOf30Rg4DKloW0DEFsa4meSm1Cm+ej8=","subject":"CN=TLS RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHExCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRcwFQYDVQQDDA5UTFMgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"88b7219cd2bfa1a2a982b183233cc928eff1d7978796768a60b207e4b616e009","size":2146,"filename":"U9LfjT2tp7DInjOaxZZKrKVVV0njtruyUezjKlI9ECI=.pem","location":"security-state-staging/intermediates/2fbb27ec-89ae-4aef-84d0-2750c73c7785.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U9LfjT2tp7DInjOaxZZKrKVVV0njtruyUezjKlI9ECI=","crlite_enrolled":true,"id":"fb7109db-c35b-44ca-bc73-d09688a86c9f","last_modified":1591199861157},{"schema":1591167097545,"derHash":"VYRK03slu02z/+fc3DkCOkGzxIikepX60fz61Qi3AoU=","subject":"CN=Dodo Sign TLS ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHIxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSEwHwYDVQQDDBhEb2RvIFNpZ24gVExTIElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"9bbab79fdec346cdda828bc4486cedf2582bee9d80c23587c1c2f05407854b6e","size":2438,"filename":"QBni1na5RD10V0ehoagk-O8mlEaC8kPw1gH8_uoYYTY=.pem","location":"security-state-staging/intermediates/512c8ed9-74cb-4a34-a0b5-79f8a0f953b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QBni1na5RD10V0ehoagk+O8mlEaC8kPw1gH8/uoYYTY=","crlite_enrolled":true,"id":"d63929e7-804a-4e7f-9657-ccb49438e6ad","last_modified":1591199861147},{"schema":1591167131818,"derHash":"G/2HAtj5uzQPNTggMwwLun5SLGMWTJHylUFNrHl/CGM=","subject":"CN=TI Trust Technologies OV CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSQwIgYDVQQDExtUSSBUcnVzdCBUZWNobm9sb2dpZXMgT1YgQ0E=","whitelist":false,"attachment":{"hash":"d1c5248d16ba7957e64d310b79c06f83962508230f7fda1e9cff52d1e9cc1998","size":2150,"filename":"nrqQiXIilvjVUSIRwooWc9ltG3vqAn5jSqfwOAWLI-I=.pem","location":"security-state-staging/intermediates/c2e929c5-0bcd-40c3-ac35-7ee70033ede9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nrqQiXIilvjVUSIRwooWc9ltG3vqAn5jSqfwOAWLI+I=","crlite_enrolled":true,"id":"758a2de9-5261-4baa-a5e8-7baf82981b7c","last_modified":1591199861118},{"schema":1591167132991,"derHash":"QeyAjjPMqGWerqgWcNbH3AFEZjbh8idWG2MHuAumOGI=","subject":"CN=ESTEID-SK 2011,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGQxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQQDDA5FU1RFSUQtU0sgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVl","whitelist":false,"attachment":{"hash":"5091662e698c754433563aee646a022ab0fdfa210abaebb1fd27a54e5f1655f2","size":1800,"filename":"skV85t_ThW7yfg-vIYodS-8kTmAl9PUd5o-azF1ck8g=.pem","location":"security-state-staging/intermediates/652c0f8c-f873-4a5b-8a4f-ab67ca5b5f73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"skV85t/ThW7yfg+vIYodS+8kTmAl9PUd5o+azF1ck8g=","crlite_enrolled":true,"id":"2212cd12-531d-4091-9a9f-ef40974684ee","last_modified":1591199861115},{"schema":1580831328676,"derHash":"KGdiAMQV2C0QJR9Senc+fnrJkCIy+rpD4aaMWtO32H0=","subject":"CN=GTS Y4,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTQ=","whitelist":false,"attachment":{"hash":"486ab74ff1c4972cd1baab20287fa21027e8baa01565310ad4a6b2ba09b0db74","size":1069,"filename":"HS03mRwbGwWTfk-g79L17_0GMn7Rd5Xac10BclJV8_Q=.pem","location":"security-state-staging/intermediates/39a2b6b1-2661-49d8-8ecb-62edfe0d4253.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HS03mRwbGwWTfk+g79L17/0GMn7Rd5Xac10BclJV8/Q=","crlite_enrolled":true,"id":"35ccfbf8-d14e-443c-9642-d4ee52e72bcc","last_modified":1580831371709},{"schema":1580831327306,"derHash":"kl7n1aIq1/vpurVNfI0LmnT341qK9q9kXi6MNRmnCS8=","subject":"CN=GlobalSign PersonalSign 2 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"49d234d4a3edd7b4cb0c75434e2e91f053274224b94175e4723db618636c4ec5","size":1719,"filename":"Uln62-9-5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=.pem","location":"security-state-staging/intermediates/4e4916ba-c892-4f63-80bf-933e7f5f1d4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uln62+9+5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=","crlite_enrolled":false,"id":"7bb75ff5-1b3b-4aab-b802-6f4a62094549","last_modified":1580831371706},{"schema":1580831325730,"derHash":"sf466/ljp4gOdLCwVWaB6osczOPmmn07EKaKy+huSKE=","subject":"CN=GlobalSign PersonalSign 3 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"9df8b037bf3f1247cda959357f2a0176035ad46da5184d24d3c0f8f89f56a218","size":1719,"filename":"6FXSznfWYgPxKc6WahR_l3YNNCjz1qGbLp4BZInCAps=.pem","location":"security-state-staging/intermediates/0fbd634e-c1ef-4d67-b5d7-96259d76e8cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FXSznfWYgPxKc6WahR/l3YNNCjz1qGbLp4BZInCAps=","crlite_enrolled":false,"id":"f9ed8c87-8e2b-4eaf-8d98-6760b04b86f1","last_modified":1580831371702},{"schema":1580831324294,"derHash":"lcanR90Lx1WhlBgn6JS4CDWSJBt5JUHi6xsw+5sT9X8=","subject":"CN=GlobalSign Timestamping CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"d8b1d98667f8f3b8858d8d8ce48e135b6b6babb05637d9da7ebef401cc352174","size":1634,"filename":"EWgZuHzMOb4ZdnGU9IxfHAPzzoePcjKG4e43x60fObk=.pem","location":"security-state-staging/intermediates/dbe4d218-3dd2-4d42-9aa1-e0cd1566f50a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWgZuHzMOb4ZdnGU9IxfHAPzzoePcjKG4e43x60fObk=","crlite_enrolled":false,"id":"e25bd43e-b8b0-44cd-96de-1e11f8c38cfd","last_modified":1580831371698},{"schema":1580831322835,"derHash":"Qavo+alRqJkPvc0+FM9HnUJkAbEV8BcBibZl6UDDYyw=","subject":"CN=Atos TrustedRoot Client-CA for Wintershall Dea 2020,O=Atos,C=DE","subjectDN":"MFoxPDA6BgNVBAMMM0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBXaW50ZXJzaGFsbCBEZWEgMjAyMDENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"4cdeea0f9b8c0d997d02497ca1ee85933ee9951ccb157373c44c4bc692a9b8df","size":1967,"filename":"zcJkvK7NculMD4JHrLZo49s5X520hjStrsqlpdtggCw=.pem","location":"security-state-staging/intermediates/d7592445-357a-4da3-8a7e-eca6e608fb9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zcJkvK7NculMD4JHrLZo49s5X520hjStrsqlpdtggCw=","crlite_enrolled":false,"id":"211419dc-84cb-45b0-8f04-eec2531753e9","last_modified":1580831371695},{"schema":1580831321448,"derHash":"wlxO28NuP7fD2Te+6fLSnjavsHz6MYgmLg1f3JGeDXc=","subject":"CN=DPDHL User CA I4,O=Deutsche Post AG,C=DE","subjectDN":"MEMxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMRkwFwYDVQQDExBEUERITCBVc2VyIENBIEk0","whitelist":false,"attachment":{"hash":"2284b18d3214c38aca82371dca2b990cd83a71d4db5f694b2c5db7ac5b811d0e","size":1618,"filename":"OWNuV6Vtom_Tl21u76ItEZifNmUFqyk8bIdhqTYbo0o=.pem","location":"security-state-staging/intermediates/588fe312-43ff-488f-a400-d053f2bece0f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OWNuV6Vtom/Tl21u76ItEZifNmUFqyk8bIdhqTYbo0o=","crlite_enrolled":false,"id":"03b918a8-4f61-4afe-803b-34daeebcdbc5","last_modified":1580831371691},{"schema":1580831314282,"derHash":"xMfENr2I6OaNsAKX34OsyBnhmGOboAUiyOMkWHaJhSM=","subject":"CN=NAESB Issuing CA - SHA384 - G4,O=GMO GlobalSign Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNHTU8gR2xvYmFsU2lnbiBJbmMuMScwJQYDVQQDEx5OQUVTQiBJc3N1aW5nIENBIC0gU0hBMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"e422c75bd14759c6d943cddb3c942e6cb19ff73705f805417a8a2f8b7b0fa999","size":1995,"filename":"t0THBpo4KRCZCa973c4m7iljnz-pEFkuYmErlNe9hqM=.pem","location":"security-state-staging/intermediates/eaf540e0-1fbe-4611-8993-c52d3bef4f6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t0THBpo4KRCZCa973c4m7iljnz+pEFkuYmErlNe9hqM=","crlite_enrolled":false,"id":"3f6f60eb-e924-4cdc-a702-722960fe9832","last_modified":1580831371685},{"schema":1580831317160,"derHash":"Zz401+HmslwYfzkcxJE4tHIqkH4z9bdIe2E7tt/niQk=","subject":"CN=University of Patras TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVVbml2ZXJzaXR5IG9mIFBhdHJhcyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"0d52e770e64ec62a5d607f5c7443737f99e82d18a9a8f2a17529cad9f1efee82","size":2836,"filename":"rjG2r01snR1vtNko4nWlkriwJxHfOXpXBBH61kCBBWk=.pem","location":"security-state-staging/intermediates/18240d87-7e34-4a1d-91a9-dc48596e156c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjG2r01snR1vtNko4nWlkriwJxHfOXpXBBH61kCBBWk=","crlite_enrolled":false,"id":"08c5fddf-3321-4860-b075-e3f26e028ae0","last_modified":1580831371679},{"schema":1580831320021,"derHash":"FU5INLKNT7H5D+6TXQ3eRsRaF3/BQloCjGhcMoVaha0=","subject":"CN=AbbVie AATL ICA 2020,O=AbbVie\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxBYmJWaWUsIEluYy4xHTAbBgNVBAMTFEFiYlZpZSBBQVRMIElDQSAyMDIw","whitelist":false,"attachment":{"hash":"ba9c71096f49bdde519be7fb7f247b426ff900568ff7a2ba2316f147a992cead","size":2434,"filename":"GI2Jkvlij3dVdDLgyRLzTDluE3sQAJFLYa_aA9xUM0c=.pem","location":"security-state-staging/intermediates/ae91d22f-44b3-413a-955d-a4f8a924a57e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GI2Jkvlij3dVdDLgyRLzTDluE3sQAJFLYa/aA9xUM0c=","crlite_enrolled":false,"id":"29a5d15e-9394-46f4-9880-8dceb939b8d1","last_modified":1580831371676},{"schema":1580831312622,"derHash":"Xn/LnJe9pWmTsWWNEgIydh1mWjZEU0MA+mpb7F4NV5U=","subject":"CN=Trafigura PTE Ltd S/MIME ICA 2020,O=Trafigura PTE Ltd,C=SG","subjectDN":"MFUxCzAJBgNVBAYTAlNHMRowGAYDVQQKExFUcmFmaWd1cmEgUFRFIEx0ZDEqMCgGA1UEAxMhVHJhZmlndXJhIFBURSBMdGQgUy9NSU1FIElDQSAyMDIw","whitelist":false,"attachment":{"hash":"250b875f651857d2b605dc8e52718c96fa970d9e56b6d9707052af92fb6cdfa2","size":1630,"filename":"M7IzU76VFwCyiys4kdB9s9rTtdHRcgivamjLj2kzia0=.pem","location":"security-state-staging/intermediates/53a4f63c-1629-4fd9-9f20-bfe3cd2b942b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M7IzU76VFwCyiys4kdB9s9rTtdHRcgivamjLj2kzia0=","crlite_enrolled":false,"id":"910675bd-2aaf-44d3-a72d-003713f103f5","last_modified":1580831371673},{"schema":1580831309740,"derHash":"Logg3A6vrj1tKFwFfs4URws3dDiwAs7dTHK080OlT0M=","subject":"CN=GlobalSign CA for AATL - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"06608a25d2fe312140d296f45b61f4e40a3f0c7008ae57216e239fb8cbdd14f8","size":1666,"filename":"NsJvmEwzvkjFIbS9AQUkdxT3pZQun6S6_bLxVOtwgPY=.pem","location":"security-state-staging/intermediates/dca9077d-3cc6-4e61-9348-5ca4fd9bd72b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NsJvmEwzvkjFIbS9AQUkdxT3pZQun6S6/bLxVOtwgPY=","crlite_enrolled":false,"id":"39f68ef8-75fb-467a-9830-b68adf4c7e9e","last_modified":1580831371670},{"schema":1580831308352,"derHash":"ETE43XshZyWEAjji1+7ss3ONsTkGSyTLhT/CcKSeYFc=","subject":"CN=LinQuest SMIME CA 2020,O=LinQuest Corporation,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRMaW5RdWVzdCBDb3Jwb3JhdGlvbjEfMB0GA1UEAxMWTGluUXVlc3QgU01JTUUgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"1964c93083547483ce396c6b7394a6a320a45144235ba95d5d3f41767333748d","size":1662,"filename":"OTbNG9ctIq9fLcNWLKN-6TPCNxKIXtezx3cvW-VNjTw=.pem","location":"security-state-staging/intermediates/1ccd3681-1ed9-44af-90cf-e9ca70a463ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OTbNG9ctIq9fLcNWLKN+6TPCNxKIXtezx3cvW+VNjTw=","crlite_enrolled":false,"id":"5c4141c4-8b62-4cb1-bf86-432c9861196e","last_modified":1580831371667},{"schema":1580831306957,"derHash":"8GjeqhjMAtWovjXLgzgyeRApH25i5yFqk0dkoaukqAA=","subject":"CN=GlobalSign PersonalSign 1 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"92689792fad9cd14100ac0efc4e9c934a5d181ec306067de07973b086f7f08c0","size":1719,"filename":"YRypdHS0Ru4gIYd-v2Cul5vQVyh8seMxVJvPr2qLJOA=.pem","location":"security-state-staging/intermediates/b14cd6cf-79b6-4e53-a744-d93d0935a1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YRypdHS0Ru4gIYd+v2Cul5vQVyh8seMxVJvPr2qLJOA=","crlite_enrolled":false,"id":"3fc3c911-3c15-4079-bd82-f0a75e90547b","last_modified":1580831371664},{"schema":1580831304072,"derHash":"fixTc5fnuNmyTYfzBMluoFekB84R0LZtmbpLiiK7EWc=","subject":"CN=University of the Aegean TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTIwMAYDVQQDDClVbml2ZXJzaXR5IG9mIHRoZSBBZWdlYW4gVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"6da62caec34c8ba27123e839c8b9d42f2f11146e20354529cc5a9bff3a1a6f42","size":2816,"filename":"-2hOVMwfAeVZbcXurvYs9YQXog6eDjr_2LpDSHWN4k8=.pem","location":"security-state-staging/intermediates/3f60dcda-f35c-432b-9148-214d88b8bf88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+2hOVMwfAeVZbcXurvYs9YQXog6eDjr/2LpDSHWN4k8=","crlite_enrolled":false,"id":"8e460471-24d1-4c87-ae97-394153845668","last_modified":1580831371661},{"schema":1580831302660,"derHash":"TnB4Z5RqwFNDxrqP8SHqZqdYA3kTJXqO5JdDUNOaEDQ=","subject":"CN=GlobalSign PersonalSign Partners CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiBQYXJ0bmVycyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"1c645bcac68fa67210aa0c2da55360e71914c6ed7e5ac89b02c1a00e4e9d897a","size":1670,"filename":"F0bWPekPIC9_nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=.pem","location":"security-state-staging/intermediates/67048fec-2fba-43f3-8088-3d8e682cc628.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F0bWPekPIC9/nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=","crlite_enrolled":true,"id":"a44d553d-2d55-4d48-b6f0-79321a1a5f3c","last_modified":1580831371658},{"schema":1580831311193,"derHash":"Eo3tGorWDCS0JU4x25T8Q5K/k+1UNEcqpDoLmFYQYGg=","subject":"CN=NAESB Issuing CA - SHA384 - G3,O=GMO GlobalSign Inc.,L=Portsmouth,ST=New Hampshire,C=US","subjectDN":"MIGBMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTmV3IEhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0aDEcMBoGA1UEChMTR01PIEdsb2JhbFNpZ24gSW5jLjEnMCUGA1UEAxMeTkFFU0IgSXNzdWluZyBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"38bdf0865a2acc0ad3abac1f138e15080391b32d0a2516ec72427913339424f1","size":2251,"filename":"LV_Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=.pem","location":"security-state-staging/intermediates/db701e77-79df-4689-a701-eab7648377a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LV/Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=","crlite_enrolled":false,"id":"e94653b0-4ce9-48b9-95e6-a108f69af72e","last_modified":1580831371656},{"schema":1580831305601,"derHash":"ptmjeSc0nedGTI2mP2Ac5VwhS+/XsyRnnmThsw91zv8=","subject":"CN=SRI International CA - G3,O=SRI International,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRowGAYDVQQKExFTUkkgSW50ZXJuYXRpb25hbDEiMCAGA1UEAxMZU1JJIEludGVybmF0aW9uYWwgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"68736c3ea587d110029f29fab96f407ca21f42efed8b5a2dcd08d36ee102c762","size":1967,"filename":"6A_h_ePWgZWtzRg2oGoR7XWlHGi2tZLjeMmvfUXp4Jk=.pem","location":"security-state-staging/intermediates/9cdf9ab0-57bf-4725-9363-936388693103.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6A/h/ePWgZWtzRg2oGoR7XWlHGi2tZLjeMmvfUXp4Jk=","crlite_enrolled":false,"id":"4db81cce-52f9-4678-ba47-e88290532416","last_modified":1580831371653},{"schema":1580831297956,"derHash":"GB3Ivn6R7fFj5mzD+tFNl5ptrlO1Vtruj33KDhFMFPY=","subject":"CN=GTS Y3,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTM=","whitelist":false,"attachment":{"hash":"f539ab8855770bc8a9e8f1286baa54629b8813ded2d2972aa64a9f3e37d83152","size":1065,"filename":"LbcjaXDdzSbOmLRKWKuGWSqd6T4QuNVJwnA_RYD9a1k=.pem","location":"security-state-staging/intermediates/5e1d14ec-bfc9-439f-a503-78429b0b2596.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbcjaXDdzSbOmLRKWKuGWSqd6T4QuNVJwnA/RYD9a1k=","crlite_enrolled":true,"id":"e503815e-602e-4784-b2b8-996d3d90a704","last_modified":1580831371650},{"schema":1580831300864,"derHash":"rshjiY8oTWzUxqP2w+ZSNICjWcM9r2b60zgYSbi7AYs=","subject":"CN=Cloudflare Inc RSA CA-2,O=Cloudflare\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBSU0EgQ0EtMg==","whitelist":false,"attachment":{"hash":"842301a8382a5def37850ade1e06b5c25ea99a6c56136a48f896bd964b68090f","size":1654,"filename":"hS5jJ4P-iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=.pem","location":"security-state-staging/intermediates/a38d6897-15d6-441e-b9ae-07da1d37dbb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hS5jJ4P+iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=","crlite_enrolled":false,"id":"57692346-8878-48fc-aea7-e7f609f4a9de","last_modified":1580831371647},{"schema":1580831291682,"derHash":"Ho8FHyIm+ZLRe3zxfw3s4Kp2mQLp/o0R81sZsYpaFPE=","subject":"CN=National Technical University of Athens TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFBMD8GA1UEAww4TmF0aW9uYWwgVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2YgQXRoZW5zIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"5e004b9b1d085376feba71c29967263b5cdcc31cca7e606092c3f736254d0209","size":2889,"filename":"YiljC0xS2lPq3_MnjzPbKhYhVKBYFBS37Ng6sk1TQZA=.pem","location":"security-state-staging/intermediates/b378de2a-a5be-440b-bb97-be8c716f2e42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YiljC0xS2lPq3/MnjzPbKhYhVKBYFBS37Ng6sk1TQZA=","crlite_enrolled":false,"id":"34feab45-913a-4dd1-84b7-d99d60446e72","last_modified":1580831371641},{"schema":1580831294634,"derHash":"TefMrLUJmUJkSVDyzIYTQBJWXGFNUap9MIf6wZaVihQ=","subject":"CN=e-Szigno TSA CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHTAbBgNVBAMMFGUtU3ppZ25vIFRTQSBDQSAyMDE3","whitelist":false,"attachment":{"hash":"99eeb6166b538653a00b3b422cf44072341a5b8d18f5b0e12e8ec8a1a8760f47","size":1987,"filename":"-zUr-M0QExvXqqFmoTjEoyptTZT9_MSzDynC4xICVcw=.pem","location":"security-state-staging/intermediates/39b65a62-38b8-4d9c-869d-927659d4f92c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+zUr+M0QExvXqqFmoTjEoyptTZT9/MSzDynC4xICVcw=","crlite_enrolled":false,"id":"91caa638-4e14-4a27-b77c-09e6164f4747","last_modified":1580831371638},{"schema":1580831296037,"derHash":"qg6DtK4ANmeXA9FgO8fmOggEZKAzrkufRlg4rchcYe0=","subject":"CN=QuoVadis Belgium Issuing CA G2,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MHMxCzAJBgNVBAYTAkJFMRkwFwYDVQRhDBBOVFJCRS0wNTM3Njk4MzE4MSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEnMCUGA1UEAwweUXVvVmFkaXMgQmVsZ2l1bSBJc3N1aW5nIENBIEcy","whitelist":false,"attachment":{"hash":"22347539759669106f3a7765621fb849dad1b802618f047a90329fb3d5376e8f","size":2385,"filename":"4nY96le5C7s4z7Zn4U54gjJ0DBkcyRkQdgPUP_7jCug=.pem","location":"security-state-staging/intermediates/1a441015-13b3-4f5f-9e9f-0a828fcbb180.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4nY96le5C7s4z7Zn4U54gjJ0DBkcyRkQdgPUP/7jCug=","crlite_enrolled":true,"id":"a39fe513-6200-46a9-8bf3-1bcfd4a39f50","last_modified":1580831371635},{"schema":1580831293178,"derHash":"vjPRxX693ZJ7V722BL5Fe1Uv5Wjn89y6CTw57Rwwojk=","subject":"CN=GlobalSign Timestamping CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTI1NiAtIEcz","whitelist":false,"attachment":{"hash":"c80175b04163d7cc6c7d2e9c5545512450e2d6810fe45aa00ba94a8632fd95a8","size":1638,"filename":"0IJvE5elXx6yt0HsXWztwcpMm15CK7mQObUFIdbDWQA=.pem","location":"security-state-staging/intermediates/28332d18-1b84-4af3-b61b-e54f8d27de50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0IJvE5elXx6yt0HsXWztwcpMm15CK7mQObUFIdbDWQA=","crlite_enrolled":false,"id":"9ae52d06-d6e8-4b06-a154-7d811ca1d920","last_modified":1580831371632},{"schema":1580831290205,"derHash":"vh/8Dh/2CIEE9D4yfnx9xyqcp7DfBXkxI6vjLerO528=","subject":"CN=GlobalSign CA 6 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDYgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"90ada09c822f53f63600f66563831e5787d6a5e5019b3df727996081461170a0","size":1739,"filename":"T_CPVYCiPuMLEQIHPvaGV6XWv5XN7SPSvzuu2ITgIPA=.pem","location":"security-state-staging/intermediates/90f113d9-557a-46c1-9cce-85418c9cdbc0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"T/CPVYCiPuMLEQIHPvaGV6XWv5XN7SPSvzuu2ITgIPA=","crlite_enrolled":false,"id":"65450678-db0b-4efa-acf6-1b5f28c8c48b","last_modified":1580831371626},{"schema":1580831335038,"derHash":"+OO/Hv4I73AMTtv9xP8xnVjst4DfsN2n1RBHs5socY4=","subject":"CN=WoTrus DV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIERWIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"cb3db8844f4cf6e57c8cf55d76cc5f8f0b417e0ed22a9fc06cf2741ac0a55336","size":2101,"filename":"-VWlwEVcGawfAmx6yUXVECmp5xZpZ7uvqv3Jr-xEvE4=.pem","location":"security-state-staging/intermediates/6d8b593d-3f3a-4270-99f9-acc5c0f72b4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VWlwEVcGawfAmx6yUXVECmp5xZpZ7uvqv3Jr+xEvE4=","crlite_enrolled":true,"id":"00a2f6a9-b608-4e1c-87f2-7a5cfea1b7f1","last_modified":1580831371623},{"schema":1580831335834,"derHash":"GZ7lgAlVXa4s2gYmkxxkOR1qiMzLH58LLugLZn9YHAY=","subject":"CN=Cisco Meraki CA,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRgwFgYDVQQDEw9DaXNjbyBNZXJha2kgQ0E=","whitelist":false,"attachment":{"hash":"7342f611caee0df18ce789033dc9e56f170d71c7d12b34b4fc9e466d18ae427d","size":1638,"filename":"GUIjMNe--V5-Oj0iDybPHPoFZBo3KkQeXR-6l1vJW34=.pem","location":"security-state-staging/intermediates/0ccbae70-0f86-469f-b039-43d5e133fcba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GUIjMNe++V5+Oj0iDybPHPoFZBo3KkQeXR+6l1vJW34=","crlite_enrolled":false,"id":"b4089320-2338-4364-9003-455eb7c3db79","last_modified":1580831371617},{"schema":1580831337070,"derHash":"ldmo0w9rHAacKWs+EGvDzgHrhK1Xhg0PRr9/FdBTscA=","subject":"CN=DigiCert TLS ICA GeoTrust PCA-G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEpMCcGA1UEAxMgRGlnaUNlcnQgVExTIElDQSBHZW9UcnVzdCBQQ0EtRzM=","whitelist":false,"attachment":{"hash":"4514cda38d635585a4a6d2254c3883dd54f1c32575f05f56e6eb49c1d11f3d6f","size":1711,"filename":"3RehXzWRn3R3fv3cusa5RRk9PlyTmd350YfJjNQPvrc=.pem","location":"security-state-staging/intermediates/27e7e058-1946-43a0-a9ac-2cc8952ea030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3RehXzWRn3R3fv3cusa5RRk9PlyTmd350YfJjNQPvrc=","crlite_enrolled":false,"id":"489a2b6c-03ce-4f5b-bd5e-7d870f6a3c38","last_modified":1580831371598},{"schema":1580831330114,"derHash":"ZjY2wD/QtbFx8rBEB8Pfdns0nIqZDYfOSFiYFm4rUSA=","subject":"CN=Symantec Class 3 ECC 256 bit EV CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMjU2IGJpdCBFViBDQSAtIEcy","whitelist":false,"attachment":{"hash":"9f762e9d208c868f54d1d9f22496087a7c2ddf82038a661413c0fcada8947697","size":1581,"filename":"PtK3zjOppRxW-hXzyuP7gC8Nt8hPS735XLgT-lQ1KTo=.pem","location":"security-state-staging/intermediates/ef5cc88d-3503-4e5e-bf8b-346475ed4c49.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PtK3zjOppRxW+hXzyuP7gC8Nt8hPS735XLgT+lQ1KTo=","crlite_enrolled":false,"id":"f82e3ad4-2109-405b-875a-44254587907f","last_modified":1580831371592},{"schema":1580831333860,"derHash":"iegKPtct9z5Y2yN0Tiyj7LwiX3UKYda+JoEk98leRls=","subject":"CN=TrustSafe Organization Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR","subjectDN":"MIGTMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxLDAqBgNVBAMMI1RydXN0U2FmZSBPcmdhbml6YXRpb24gVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"741eb73cef38e441d495e385775b23b7e66578c11dcfd91591514ce55e8d824d","size":2255,"filename":"F8P6yRGn6PHOPi3LHmd5_Awd3GeSxMlyfUhUwxtVaoU=.pem","location":"security-state-staging/intermediates/28295eb2-0fa4-40e0-b2af-e05ece3ff066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F8P6yRGn6PHOPi3LHmd5/Awd3GeSxMlyfUhUwxtVaoU=","crlite_enrolled":false,"id":"80b7ece4-c29e-4494-ad88-0dd9d4fd72bc","last_modified":1580831371589},{"schema":1580831333485,"derHash":"Ies3q0z274ll7BdmQJyna4suA/LRo4jfc0II6G3u5nk=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"d90539ef3ff76bf2ac792ae9bbc21d751d2ce841eab7781e291ab04fd791d950","size":2259,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/3211ad63-2e73-4235-916c-6b7f2a4c67d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"d468c05a-c173-4f74-855c-1e3eba3d2298","last_modified":1580831371587},{"schema":1580831339464,"derHash":"pBBtqF97NKbT3jeITRUokWuE8Eb/t9SqxSERewxplfM=","subject":"CN=Orion Health Direct Secure Messaging CA,OU=Orion Health Direct Secure Messaging,O=Orion Health Inc.,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRT3Jpb24gSGVhbHRoIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEwMC4GA1UEAxMnT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nIENB","whitelist":false,"attachment":{"hash":"8942a52d799e4407f98a25999571b12fe4fe70ec9e8c96715a5740c25bdb1d28","size":2239,"filename":"bDFIpmFQnVfXPxjH5kSmVzxV7SFcnyivqEmwWZSPF3U=.pem","location":"security-state-staging/intermediates/b59d9fc5-64da-4fb3-8e0b-33e5ae941228.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bDFIpmFQnVfXPxjH5kSmVzxV7SFcnyivqEmwWZSPF3U=","crlite_enrolled":false,"id":"39d3f04d-1e55-44d2-ac2c-207049c51797","last_modified":1580831371578},{"schema":1580831339070,"derHash":"LarG/frBbFSMU/8RmCVNfpN3YdIqHnzFwalGLpcUYfU=","subject":"CN=TrustAsia ECC EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"97a9ce8bbe9252f62216d67f4991a416a4fcdeaadd410a6256c49e9a395d1a3a","size":1427,"filename":"FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=.pem","location":"security-state-staging/intermediates/d7338706-64ff-461f-8703-a9d2acd7dd78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=","crlite_enrolled":false,"id":"518e4647-08ec-44a9-941f-366feccac035","last_modified":1580831371575},{"schema":1580831334241,"derHash":"vzVY+HfonSfapg2pZxZ2Vw376yFdhKxaNxItZ3a3j24=","subject":"CN=GeoTrust EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"76fd10b988ddc4d10ef675e1353505739b36be3396db70baccebfc087010c5f1","size":1390,"filename":"KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4_NrxCA=.pem","location":"security-state-staging/intermediates/196ccf12-c8cc-45fb-8759-263709c412c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4/NrxCA=","crlite_enrolled":false,"id":"840a78d8-f593-4732-8812-b23743799fe7","last_modified":1580831371556},{"schema":1580831332364,"derHash":"q47piksrl+WQXs6ApkMEwUOrONlQj/cob2gjXg22iic=","subject":"CN=Florida HIE Exchange CA G2,OU=Florida HIE,O=Harris Corp,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtIYXJyaXMgQ29ycDEUMBIGA1UECxMLRmxvcmlkYSBISUUxIzAhBgNVBAMTGkZsb3JpZGEgSElFIEV4Y2hhbmdlIENBIEcy","whitelist":false,"attachment":{"hash":"f3852aeda8f85636e7791041b0694b02b52d33de2a769be09274f1ca984f7733","size":1780,"filename":"1nUKEuk4dEhejnwcerLSNmjLvtZghm_IXhlNdSkF4cc=.pem","location":"security-state-staging/intermediates/305047b8-a83b-4757-a971-623606a36267.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1nUKEuk4dEhejnwcerLSNmjLvtZghm/IXhlNdSkF4cc=","crlite_enrolled":false,"id":"70561ed2-fa24-49f8-965b-a8c8a121ce7d","last_modified":1580831371552},{"schema":1580831334622,"derHash":"uPROSx+Gl99Uuz0PHmdZbOL+nauoWvTm8qLnQ5b4xW0=","subject":"CN=DigiCert Assured ID CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQ==","whitelist":false,"attachment":{"hash":"9f1924a62b10e5287c42ac43753e12a092080fb0e6308ba0aaff1cbf62b2da97","size":2402,"filename":"eabi0-qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=.pem","location":"security-state-staging/intermediates/542904ea-61fa-4fda-8838-3d7167d5a926.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eabi0+qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=","crlite_enrolled":false,"id":"621f1f02-ada1-4425-aee3-ad581ab0a99a","last_modified":1580831371550},{"schema":1580831332734,"derHash":"D7bOgJCdGa/uaojJWenpqmRmcVvOBcZEn+tTCghtrxQ=","subject":"CN=GeoTrust SupremeSSL EV 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJDAiBgNVBAMTG0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBDQQ==","whitelist":false,"attachment":{"hash":"384493a25bd899d9fdf55deb2a362135f4ec8be8dc34518f6004cef3e417556c","size":1691,"filename":"uG3aQXLPd55q_z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=.pem","location":"security-state-staging/intermediates/df7f43b0-32fb-48f8-a431-f2b77edc9607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uG3aQXLPd55q/z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=","crlite_enrolled":false,"id":"b7c4e0d2-c4b9-4872-b1e7-b9f4dc59e44c","last_modified":1580831371547},{"schema":1580831329745,"derHash":"NU/PxhYqDuIgXb72iTHngDPs6dEl4IJOSbrr+C390Wc=","subject":"CN=GeoTrust SupremeSSL 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGIxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xITAfBgNVBAMTGEdlb1RydXN0IFN1cHJlbWVTU0wgMSBDQQ==","whitelist":false,"attachment":{"hash":"324604ce7c1feb1281d395804fd405d53c1027c74aaaa93ab18d05f841ca2630","size":1707,"filename":"SM-CBbHgVoJj8KYqNoXbUd-IGEbfvpomZR5lGHQ3qng=.pem","location":"security-state-staging/intermediates/a8e9d4d9-73f3-4a4e-a0dc-fdd198240404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SM+CBbHgVoJj8KYqNoXbUd+IGEbfvpomZR5lGHQ3qng=","crlite_enrolled":false,"id":"63d1b703-15d1-445c-b43c-64ca8d44bf0a","last_modified":1580831371545},{"schema":1580831336666,"derHash":"lNTs4u2aVFe5aaE7JgSJ6aX+R5CgQfJ6PrQSbIRBjvk=","subject":"CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c0d77ccda911d76f8c80ebf6c501b4dba9c6a787604981af5b3c3a9f954bac59","size":1642,"filename":"v2OX1FzmsvhGRs3vKv7P5R4N-Aly9A_qKXxfEauTwao=.pem","location":"security-state-staging/intermediates/b3abe3ee-8707-467d-8091-1ab64836b606.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v2OX1FzmsvhGRs3vKv7P5R4N+Aly9A/qKXxfEauTwao=","crlite_enrolled":false,"id":"86931689-a92f-49d4-a149-95fd2b1d44eb","last_modified":1580831371541},{"schema":1580831337881,"derHash":"UET2XhBCzTgLC5mX5CgzWPDe73hz2nLv228CR0rjfr4=","subject":"CN=QuoVadis Swiss Advanced CA G2,O=QuoVadis Trustlink Switzerland Ltd.,C=CH","subjectDN":"MGMxCzAJBgNVBAYTAkNIMSwwKgYDVQQKEyNRdW9WYWRpcyBUcnVzdGxpbmsgU3dpdHplcmxhbmQgTHRkLjEmMCQGA1UEAxMdUXVvVmFkaXMgU3dpc3MgQWR2YW5jZWQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"52468c6ff74eaacb84d6dd6f765d0298d7770b1dae8e98d5802a8d4f567db964","size":2003,"filename":"PCO7NaLxR0Lr-39nGUXqmY4h-pmQMueSQPa8s2l13l4=.pem","location":"security-state-staging/intermediates/57cd48b2-3a6e-4130-89c2-dc40d75c65c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PCO7NaLxR0Lr+39nGUXqmY4h+pmQMueSQPa8s2l13l4=","crlite_enrolled":false,"id":"bc7be9c4-1921-4c16-88a4-6eb56aade751","last_modified":1580831371532},{"schema":1580831331616,"derHash":"5bvcytVy7J0t2W4OXr8EmpGB8HDx4zzBY1rY7Eh9IXc=","subject":"CN=DigiCert Federated Trust CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBUcnVzdCBDQQ==","whitelist":false,"attachment":{"hash":"cf01aee2f6176035c8559ce184ffcfadec801283ea8db12c2b9e6f46a098ba52","size":2345,"filename":"uuhysnUgrwe87B8nb6rPmj9TeTzDQNfGrcbWD5032EE=.pem","location":"security-state-staging/intermediates/ecf46a97-981d-4937-b12f-8d513406ce38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uuhysnUgrwe87B8nb6rPmj9TeTzDQNfGrcbWD5032EE=","crlite_enrolled":false,"id":"8eeda8c2-f1aa-4f20-a564-47080b5d7906","last_modified":1580831371526},{"schema":1580831331985,"derHash":"wN0GD/jOVW81aD1WTg5mspBxeICGk/g/OqZCMmv20Mg=","subject":"CN=TrustAsia ECC EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzI=","whitelist":false,"attachment":{"hash":"0b22b379557262c177cd0df97c067db059c622c348c2768de211920a4cc62a97","size":1398,"filename":"6lJqHj6Al12YiHTPXbfLj9_MNtnpjUBiUvHLHqoVkTA=.pem","location":"security-state-staging/intermediates/7e4a29a7-3ed7-4e85-8e48-c24ebed06855.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6lJqHj6Al12YiHTPXbfLj9/MNtnpjUBiUvHLHqoVkTA=","crlite_enrolled":false,"id":"293e0ccd-71f9-42a4-ac96-f21584cc8fa2","last_modified":1580831371521},{"schema":1580831338677,"derHash":"V9jVuDJha3gjRmoMNydw0WpdzyRlgfD1g3PlHH4eUxY=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"80d4bb692e396cf3ccf6595d18d123459107363391f6c0e030d16cefc85308ba","size":2255,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/e98dee35-7b84-4d8f-9f01-3021b3339da7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"2a5f71dc-243b-43b6-918e-b6e20ae381aa","last_modified":1580831371512},{"schema":1580831335425,"derHash":"UW2FbQNTumn/65weugNdeAhEhXAG7OmcBR7BnBDDbNU=","subject":"CN=DigiCert TLS ICA GeoTrust Global,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEpMCcGA1UEAxMgRGlnaUNlcnQgVExTIElDQSBHZW9UcnVzdCBHbG9iYWw=","whitelist":false,"attachment":{"hash":"2b6a498e6adf7455626036e3d5498468dd85769c78b6b869202cdcc57038e0db","size":1593,"filename":"cAWbaZmut0LWOQOIkM3RvlL9I2y_OHNWu8-bB1lbGXM=.pem","location":"security-state-staging/intermediates/efd1d410-c75a-40cb-896e-c5e083e18935.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cAWbaZmut0LWOQOIkM3RvlL9I2y/OHNWu8+bB1lbGXM=","crlite_enrolled":false,"id":"a86bf8ec-bd1a-453e-982c-b25e4c008a5e","last_modified":1580831371502},{"schema":1580831330483,"derHash":"VEULJ4BS+pGRFgDLmPMQCg+1gVKNj+q5i2/++KSMmY4=","subject":"CN=Actalis Client Authentication CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGNMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLDAqBgNVBAMMI0FjdGFsaXMgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIENBIEcy","whitelist":false,"attachment":{"hash":"888db3995a9779092a92b32155ba48b8f752cb7e76586fcafb29157c596ba126","size":2316,"filename":"6-WU29fzcxxCr7poWUULZoDxQb7pJ5qJhne0S46pWb4=.pem","location":"security-state-staging/intermediates/26b55346-6fba-46c5-ab26-624533bc90b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6+WU29fzcxxCr7poWUULZoDxQb7pJ5qJhne0S46pWb4=","crlite_enrolled":true,"id":"856d2476-aec9-4824-b7ee-236a8f6d0fa0","last_modified":1580831371497},{"schema":1580831338274,"derHash":"wKShrAXgMJajsquKOFArOeJhThE5e+5z0KZris73ooM=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"e3909fbaebb8ef6af7bbffe333d52eafa063b31f216ab25a26f98adacb9b51f6","size":2349,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/202293f2-84fb-4a8c-b939-35ceaeb78a8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"4495c40e-442c-4744-bcea-962e2b93bfd0","last_modified":1580831371491},{"schema":1580831333108,"derHash":"Ql5yyH/yKFXZkItxq0xksNLySChwl2kMYv5zP2Md448=","subject":"CN=DigiCert Assured ID CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQ==","whitelist":false,"attachment":{"hash":"fbcee06cf0f489ec7dc8c26d9e8e072e5eb0c91534e3ec10e979ff1b101f86d8","size":2418,"filename":"eabi0-qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=.pem","location":"security-state-staging/intermediates/061ce3bb-6e51-49c7-a5f9-08a7b270fbdf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eabi0+qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=","crlite_enrolled":false,"id":"c866113d-8267-4723-993b-0f7fc4008f25","last_modified":1580831371480},{"schema":1580831331243,"derHash":"3LQArMJJ+4SDQV/CZQvJBIjKlmQxGMsOT0Qkshw6paQ=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"7b2bb2e718615878d60921325a6b6a79bfcdb0076c093323e35de7dc5ccb5e1e","size":2259,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/dc2adf52-a65a-47f4-98df-90d1bc2795c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"b1fa8b2a-9240-4c89-a31e-bbedfe18d2c1","last_modified":1580831371478},{"schema":1579028939007,"derHash":"bwHOS5alTzv287PwG8FFKQLoBm9+9HoEcdmUicwvhEw=","subject":"CN=DigitalTrust Assured CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGYxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE4MDYGA1UEAwwvRGlnaXRhbFRydXN0IEFzc3VyZWQgQ0EgRzMgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"e3f0a2228d028c7c2d686497c9827724f05379697bdaebfa9ab67fc93565b02b","size":1305,"filename":"9ZrELmXXgaRdMyl2s40R_lSll2UwWzKv_lc0T1G-S90=.pem","location":"security-state-staging/intermediates/df9de46d-ee97-4db0-92c5-106659dc6344.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9ZrELmXXgaRdMyl2s40R/lSll2UwWzKv/lc0T1G+S90=","crlite_enrolled":false,"id":"747489d6-2a1f-4621-b484-55e2f26e43de","last_modified":1579029043788},{"schema":1579028940448,"derHash":"vb9XvRAWOncbKNCdTJAYjVlgcsaZvYJ0/kYo0SUOSb0=","subject":"CN=DigitalTrust Secure CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGUxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE3MDUGA1UEAwwuRGlnaXRhbFRydXN0IFNlY3VyZSBDQSBHMyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"6a1034555007397b09db59427c8e6b61eb18ac3ecad29bdc8289511a2376368e","size":1317,"filename":"n7S9CUGXp7reMdZAD7cwkt9AngliimrF0ya3qfi_Tn0=.pem","location":"security-state-staging/intermediates/92dcc5d2-c2c7-42fd-a315-adf0a0c1e58a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n7S9CUGXp7reMdZAD7cwkt9AngliimrF0ya3qfi/Tn0=","crlite_enrolled":false,"id":"4e95b8dd-b52a-491c-b875-8bf748643131","last_modified":1579029043785},{"schema":1579028933319,"derHash":"0QEGJDi/sK8Fq6ed8A9N1J54uM79XtkpVlwjNhExAZE=","subject":"CN=Global Trust CA - OV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"a82660958c3ea8942f29245ff2b8ee8aec7c0394bfd0909b9fe76c5f958d64c7","size":1252,"filename":"oWD3L7oqjz3vUhAVyhQoyubwAtUDmmdDOlkahsKwP6M=.pem","location":"security-state-staging/intermediates/154a10aa-4805-4fd8-aa5d-4a0114f27a83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oWD3L7oqjz3vUhAVyhQoyubwAtUDmmdDOlkahsKwP6M=","crlite_enrolled":false,"id":"420f7c9b-46e0-4c2e-acf4-354a9e1e107f","last_modified":1579029043779},{"schema":1579028930299,"derHash":"9NaVrak2Ni3frtpkTHzO8k63TcQ404GiivqqEUd65n8=","subject":"CN=Global Trust CA - DV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBEViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"c7355ba281b86440b42869da1995f8827d941dd7f536e3597c74d5f9bf8bf1ec","size":1252,"filename":"LUbiRYLu1pSHTj3Z-ypCjtIr7U83tgAbsXPL2H-meVE=.pem","location":"security-state-staging/intermediates/39747309-5dcc-499d-b5fe-d02d1627de6a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LUbiRYLu1pSHTj3Z+ypCjtIr7U83tgAbsXPL2H+meVE=","crlite_enrolled":false,"id":"5d5a8603-5a22-40cc-bcf3-f79feed83467","last_modified":1579029043776},{"schema":1579028937540,"derHash":"TAjC+6lI1IQ3FLYzoYEmskFwONe3RdpB7RXqp6rnxZk=","subject":"CN=Global Trust CA - Client,O=Global Digital Inc.,C=TW","subjectDN":"ME4xCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSEwHwYDVQQDExhHbG9iYWwgVHJ1c3QgQ0EgLSBDbGllbnQ=","whitelist":false,"attachment":{"hash":"a3e006f755c53595620f6d0060a12fede2112d94f648dcd70d3d87b37675dd85","size":2073,"filename":"JgEFqnj4Eusn8_aqR2_HteSVCb6j5aYpdbZslup32ys=.pem","location":"security-state-staging/intermediates/235af0b7-680c-49da-ad9d-8e6a2e51f1fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JgEFqnj4Eusn8/aqR2/HteSVCb6j5aYpdbZslup32ys=","crlite_enrolled":false,"id":"a4200022-b213-44b7-8b23-b9230dd5c849","last_modified":1579029043773},{"schema":1579028934721,"derHash":"qK7gyk++CQh4qQHLVkElV07GS6KOnpApbtPkkrFgtNk=","subject":"CN=DNEncrypt SHA2 OV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgT1YgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"8ec77c856ada00bc203c0a2a7d135f1f333e047356ddccdecae96b4e7660d604","size":2454,"filename":"oTOjvcPyAYB-WsThLALbWlgbUUxVxj6xmmL3GnHrCkY=.pem","location":"security-state-staging/intermediates/08b4b6d3-6190-461c-ab2c-59d46d235160.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oTOjvcPyAYB+WsThLALbWlgbUUxVxj6xmmL3GnHrCkY=","crlite_enrolled":false,"id":"a6a0c891-36a3-44bb-b93e-90f730832f4a","last_modified":1579029043770},{"schema":1579028926994,"derHash":"mgaeR4zTQUSf8ot8d1LFSuz6usWOS1AoVhZJq0gggNs=","subject":"CN=DigitalTrust Secure CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGUxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE3MDUGA1UEAwwuRGlnaXRhbFRydXN0IFNlY3VyZSBDQSBHNCAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"ee227902a2765dd235ffb37849a132e5ace2b7361e7587f18cf42ce39977a16c","size":2467,"filename":"R683Qs6upExakQVDH-vmwK67rfyDMxBotLmYh7TobVA=.pem","location":"security-state-staging/intermediates/40000abd-9451-4eae-98e4-311a759d8645.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R683Qs6upExakQVDH+vmwK67rfyDMxBotLmYh7TobVA=","crlite_enrolled":false,"id":"2dde196f-ed22-44e8-a3a5-c2cf3108accd","last_modified":1579029043767},{"schema":1579028931778,"derHash":"DaILPAU4a9l1sdvTfw63aJ5qMjZDluBlP/qe7mBnlPU=","subject":"CN=Global Trust CA - DV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBEViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"5cdd0b9b0275f33beab775b37771a02bf084cef5c96a9cf78baff9e34cab1c37","size":2089,"filename":"hwddnilH_pWtWcAnCBvcpQEiJA8MsPuSY74GtASteIo=.pem","location":"security-state-staging/intermediates/8b16acf6-9f74-495d-a9f0-b039aa0c54b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hwddnilH/pWtWcAnCBvcpQEiJA8MsPuSY74GtASteIo=","crlite_enrolled":false,"id":"6224b875-5c34-475b-8cdf-aecad54173d7","last_modified":1579029043764},{"schema":1579028920989,"derHash":"iF6OHcrQdxTzuiysmtv2hxH7LlY2g/xOM0z5JNl8wkU=","subject":"CN=DNEncrypt SHA2 EV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgRVYgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"515389105a63e30072896ef76765146cfb695657c76de28794dd225b612049b3","size":2487,"filename":"EonOFaZgJpBcxWk-Gu5D6SKzi_Nbfzub6RHPOQrObVs=.pem","location":"security-state-staging/intermediates/84327d88-f8a0-4200-a3f7-98e74dd330d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EonOFaZgJpBcxWk+Gu5D6SKzi/Nbfzub6RHPOQrObVs=","crlite_enrolled":false,"id":"aea19046-d765-48b5-896c-bca4d813161f","last_modified":1579029043762},{"schema":1579028923899,"derHash":"6xRHA3Gwku0ggB4h6jllObTkKMFwirjJtwaDQjmdPIE=","subject":"CN=Global Trust CA - EV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBFViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"954e40ee7eb9c53e13a02c16f50f72b1a2bcc3abd5f5ca2cfda37936f3b26950","size":2117,"filename":"V2odnnJSCZapUukBa0XBQ7E-peZxS4qRJ22CftbyIG4=.pem","location":"security-state-staging/intermediates/9fd0a474-3344-4a18-81a8-6b47d22813f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V2odnnJSCZapUukBa0XBQ7E+peZxS4qRJ22CftbyIG4=","crlite_enrolled":false,"id":"ea836d76-6bc4-4cdb-8aa6-28726f31823c","last_modified":1579029043753},{"schema":1579028918130,"derHash":"lp4yAFIOssaalmdYfm3U0LI/KPUQzBMXZwqO02E+vq0=","subject":"CN=DigitalTrust High Assurance CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"e74dd2a02806fa7c508188e10a5f0c0712f1cfbccde8988e042626a766beecb4","size":2507,"filename":"LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=.pem","location":"security-state-staging/intermediates/df91fee1-b72c-4071-bb40-85741d9a30db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=","crlite_enrolled":false,"id":"82e3caed-61a5-46f8-b0a5-e0e5548b3eaa","last_modified":1579029043747},{"schema":1579028915292,"derHash":"A3GlU+Ss9AJFkQfo95M3nMVpEw8u4DxBL+2HtcFyQkQ=","subject":"CN=DNEncrypt ECC DV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBEViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"f33c1660f86553d61d7d2c9223b3d32b7720ca57b4c5c5a3542c544085b3ba13","size":1309,"filename":"cMgUafsF3Pj6CXkE48F1T9jPwW-ZXrmmryJ99sHNyYA=.pem","location":"security-state-staging/intermediates/73b1704d-b140-489e-a73d-4b23fc14264f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cMgUafsF3Pj6CXkE48F1T9jPwW+ZXrmmryJ99sHNyYA=","crlite_enrolled":false,"id":"626f9b82-c857-46cc-b90a-e7bcf3ac92cc","last_modified":1579029043744},{"schema":1579028919558,"derHash":"6ZOtZU1FhUS7Dk2n7HxfumDEZFebGyLGWSPd0UpngKw=","subject":"CN=DNEncrypt ECC EV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBFViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"0c64bd4a0285b5cf304cffc344c87492bc476b3a278216dda0ca3efb7367f40d","size":1341,"filename":"m7sp44VsyZf6_AVSHx-N3M0tXcbynVKIOugeitl06ZM=.pem","location":"security-state-staging/intermediates/ffd48335-dab5-42df-8a9e-44fa95bafa0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7sp44VsyZf6/AVSHx+N3M0tXcbynVKIOugeitl06ZM=","crlite_enrolled":false,"id":"777c1fad-dd5b-4d30-a1d2-2cea029d3253","last_modified":1579029043738},{"schema":1579028913702,"derHash":"Ot3JgkDiGnLZxA61BYkFqkDt+jRa3t3lhEzLD0YthPc=","subject":"CN=Global Trust CA - EV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBFViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"a73482c81f3542c42bb1637ffc95ed5fd477eb92360c59b579ee3dcdf8374936","size":1280,"filename":"PRcljLZm-PUuo_QCHUFdjCyCwTjglb9Jg7caPjv8bI0=.pem","location":"security-state-staging/intermediates/1d3bd069-53ec-4918-9c0b-66e52af2eb8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PRcljLZm+PUuo/QCHUFdjCyCwTjglb9Jg7caPjv8bI0=","crlite_enrolled":false,"id":"fcad5a9e-1e6a-49e0-9041-34e4a071516c","last_modified":1579029043735},{"schema":1579028916680,"derHash":"yjd7GIZrI48xqASd/RNgnlSbdROQ7vzbmpoTUxJ/+zU=","subject":"CN=DNEncrypt ECC OV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBPViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"b7a060b2b07e92212754c63a106ae5c0f0264b8a9e50ae75feb93ab2437da7ff","size":1309,"filename":"Vqfldlh0sPrGbhkt70MsWwISyFbsgHXV3Scyfh6rREM=.pem","location":"security-state-staging/intermediates/b4b0e86a-be59-4d75-89d3-13042e2a838f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vqfldlh0sPrGbhkt70MsWwISyFbsgHXV3Scyfh6rREM=","crlite_enrolled":false,"id":"f546b858-d355-4107-834f-3c7e2949cc1d","last_modified":1579029043733},{"schema":1579028909294,"derHash":"FlLGbbZC0KUkv4n/3z7tWo6UsUpusH56ReqAxU+ehZM=","subject":"CN=DigitalTrust High Assurance CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEczICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"3e8bf279c9897937ae0931414eed45e94b47bdf7016de3722ff1cd06587daef8","size":1358,"filename":"mLgcAaWaR7874mBWx4gTZEcxbuqvMnF41qXNwAW8A1E=.pem","location":"security-state-staging/intermediates/14c76e24-e6f7-4004-8696-e7ffffd72208.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mLgcAaWaR7874mBWx4gTZEcxbuqvMnF41qXNwAW8A1E=","crlite_enrolled":false,"id":"4b4467a7-4c39-45a4-a5c8-00e3f9693711","last_modified":1579029043730},{"schema":1579028906281,"derHash":"dYQWlcYABAZgo9NyXlMdPc+vzNJvWIN16rLY0SmQR4U=","subject":"CN=DigitalTrust Assured CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGYxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE4MDYGA1UEAwwvRGlnaXRhbFRydXN0IEFzc3VyZWQgQ0EgRzQgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"bbff348acb2ad27e947747edbb0636e41b1168d27439b5bfbfce18f743d587d2","size":2450,"filename":"wVc5iD8EbsOm6PnS6dmUMrpLPgr3_owf0Dl1X-4IYQ4=.pem","location":"security-state-staging/intermediates/9baa2709-0abc-4a36-827c-799f5de9c2af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wVc5iD8EbsOm6PnS6dmUMrpLPgr3/owf0Dl1X+4IYQ4=","crlite_enrolled":false,"id":"86983387-0e43-46b3-9e47-6a40ed8f8619","last_modified":1579029043727},{"schema":1579028904846,"derHash":"qXQcP6RM+Xd6Sbb1Du1dDrh+lIHzpFCWw5VqXuG7iEQ=","subject":"CN=DigitalTrust CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MF4xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjEwMC4GA1UEAwwnRGlnaXRhbFRydXN0IENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"84f190959472ef5c60f53b166df0e32ccc218bd9a02ad1184c432a5c1187fd7c","size":2454,"filename":"3MPa3WIVqOW4yU6-w-ZSt3hKIEBpElbYDOX4tDWu1pI=.pem","location":"security-state-staging/intermediates/b67dbf30-2e5f-4572-9a51-963a2e41fcd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3MPa3WIVqOW4yU6+w+ZSt3hKIEBpElbYDOX4tDWu1pI=","crlite_enrolled":false,"id":"b8b2f836-8e81-4a67-8afc-877abf1c8895","last_modified":1579029043724},{"schema":1579028910703,"derHash":"nRkILiQzvlUB9GkSlXD1c4c7Lf6DhrH4qd+pjC+q3Ns=","subject":"CN=DNEncrypt SHA2 DV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgRFYgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"a65bbd2c04e427655a0c45d1f82f7685ada08bc874a74ab4e09037ec98ac9d5a","size":2458,"filename":"3E1xVsnJnhe9i57XMuug-LOT83YzrJjC1N60Oln6OaU=.pem","location":"security-state-staging/intermediates/c1c68b60-29de-4cdf-8ba2-7adf17023d5a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3E1xVsnJnhe9i57XMuug+LOT83YzrJjC1N60Oln6OaU=","crlite_enrolled":false,"id":"66492022-3f9c-4abc-b14f-9bce674885fb","last_modified":1579029043721},{"schema":1579028903393,"derHash":"vg1slHe5ggklSa3T1cC9GejxPE9OhelHEpfhxeGax2g=","subject":"CN=DigitalTrust CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MF4xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjEwMC4GA1UEAwwnRGlnaXRhbFRydXN0IENBIEczICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"eb78b6848ba5286d4224160e64392e5ad1c80330a158642dd0a826b312889cf6","size":1309,"filename":"0r9lDiNtrXm0xXuKfgPxSSDXNDGuK2HF29dk8BUZsCA=.pem","location":"security-state-staging/intermediates/5ba9312c-58e2-408d-ab65-a5b513dd2ccf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0r9lDiNtrXm0xXuKfgPxSSDXNDGuK2HF29dk8BUZsCA=","crlite_enrolled":false,"id":"f4a41986-65e8-483c-bdb5-1b551dcf0317","last_modified":1579029043719},{"schema":1579028942702,"derHash":"pXZN/QRUrToGQouQfbiqQ22mMXIJ6v1h3ULlaud/mxM=","subject":"CN=vTrus DV SSL CA G1,O=iTrusChina Co.\\, Ltd.,C=CN","subjectDN":"MEkxCzAJBgNVBAYTAkNOMR0wGwYDVQQKDBRpVHJ1c0NoaW5hIENvLiwgTHRkLjEbMBkGA1UEAwwSdlRydXMgRFYgU1NMIENBIEcx","whitelist":false,"attachment":{"hash":"2139889982ea46a63a464eeadd8924a0691d8a5aafe08c973053fa5c343bb807","size":1715,"filename":"Lh5Dl4rrZsfMQM9Q9U2BcmEKABgw3NzU5omS-Hb7j-E=.pem","location":"security-state-staging/intermediates/5381eea4-5663-4fb1-8a43-154a02daae8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lh5Dl4rrZsfMQM9Q9U2BcmEKABgw3NzU5omS+Hb7j+E=","crlite_enrolled":true,"id":"74de0e26-7443-4e36-b943-532a38006251","last_modified":1579029043713},{"schema":1579028944355,"derHash":"jlzqHRASUhwnpOEScHArx8mhFW8TUHPWyk5C7ugmJJ4=","subject":"CN=QuoVadis Europe Advanced CA G1,O=QuoVadis Trustlink Deutschland GmbH,C=DE","subjectDN":"MIGAMQswCQYDVQQGEwJERTEaMBgGA1UEYQwRVkFUREUtREUyOTY4OTgzODIxLDAqBgNVBAoMI1F1b1ZhZGlzIFRydXN0bGluayBEZXV0c2NobGFuZCBHbWJIMScwJQYDVQQDDB5RdW9WYWRpcyBFdXJvcGUgQWR2YW5jZWQgQ0EgRzE=","whitelist":false,"attachment":{"hash":"c2dcb9263638c8e20a18233f4f7774cbe2557b5e3f14dc6772a603042c2b5fb2","size":2471,"filename":"cFVZyGLFfkszy_X-hkVMcSVvZFH70X8fvwA5CnidJ9A=.pem","location":"security-state-staging/intermediates/4bb7a95b-e5ad-47af-8a74-99ab87c335aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cFVZyGLFfkszy/X+hkVMcSVvZFH70X8fvwA5CnidJ9A=","crlite_enrolled":true,"id":"98356c2d-a35c-4278-8d52-4deef1c5fa59","last_modified":1579029043711},{"schema":1579028943120,"derHash":"+xFH56uXopu5wRQKvz3oMfTF9g0RuQ/smZoIFjddhFc=","subject":"CN=DC Government SHA2 Assured ID Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US","subjectDN":"MIGnMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMTYwNAYDVQQDEy1EQyBHb3Zlcm5tZW50IFNIQTIgQXNzdXJlZCBJRCBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"0b2d79a38acd24c45b952101f6a70cb8f52427e090db11f7a958102e19ff5991","size":1938,"filename":"eBMo_2IweCsxeqG8ggZwOamIcoYP6_GqxtfdG-LT0UQ=.pem","location":"security-state-staging/intermediates/31697f1b-6613-4efe-9f5a-1c51e06249db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBMo/2IweCsxeqG8ggZwOamIcoYP6/GqxtfdG+LT0UQ=","crlite_enrolled":false,"id":"521e1353-a4bb-4e91-b7aa-955db2c75172","last_modified":1579029043704},{"schema":1579028942315,"derHash":"VJiWPf+mUWBPRn4QjmWhg0cPqbVXwSnd+MnYErTwv5Y=","subject":"CN=NETLOCK Trust Qualified CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSMwIQYDVQQDDBpORVRMT0NLIFRydXN0IFF1YWxpZmllZCBDQQ==","whitelist":false,"attachment":{"hash":"eca87866bec2d4554f1b58f8091c7337c82c9e65d743cf2eba31c9d2757e5244","size":2073,"filename":"fuUqgkkwOoU6AwXExGnKFu7G3knCONHh2ksz-wBRRbY=.pem","location":"security-state-staging/intermediates/5c604286-d66a-44d4-b654-de83a937b1a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fuUqgkkwOoU6AwXExGnKFu7G3knCONHh2ksz+wBRRbY=","crlite_enrolled":false,"id":"ce93fbf8-83be-4a31-acf0-fd669baf4f55","last_modified":1579029043697},{"schema":1579028944748,"derHash":"a6qwxDPXef1qS21W1jBNXm6l3mif41pDA4pAKPNF32A=","subject":"CN=TrustID Server CA O1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElEIFNlcnZlciBDQSBPMQ==","whitelist":false,"attachment":{"hash":"ff57c4d65b0b7547b7257b720248edc7df260a756f562751560760f5692ed85a","size":2398,"filename":"TpfnK_TFKAbtiqXG0BETu96LfmJwwZKETBR58_SIZnk=.pem","location":"security-state-staging/intermediates/cb7629a5-e914-4dfc-8b42-a9f8565378d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TpfnK/TFKAbtiqXG0BETu96LfmJwwZKETBR58/SIZnk=","crlite_enrolled":true,"id":"74822f06-6362-433e-a670-6209b0f88ebc","last_modified":1579029043693},{"schema":1577473661023,"derHash":"WtQYO1Tw4nYtqNkQ4efp8qsvG8TOamOPDbvzN+tKE58=","subject":"CN=Symantec Class 3 ECC 256 bit Extended Validation CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAMTM1N5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"a298322e090d871dee6a5377ed4d7372c1bd2c977bc9067c23d4471b8680577d","size":1406,"filename":"sofhbubvXHTCSb_u26mxxJyvvNAx0U-JADKlcpRG9WA=.pem","location":"security-state-staging/intermediates/cd1dd854-37d4-44b1-b0ea-eaa57fadb3ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sofhbubvXHTCSb/u26mxxJyvvNAx0U+JADKlcpRG9WA=","crlite_enrolled":false,"id":"0cec5b1f-5cf4-4d0d-95f5-f13f8a18d57e","last_modified":1577473769153},{"schema":1577473659233,"derHash":"ZOcWAfcFCSHe4DnANJNhXkiPEvw/zsut9DiqRn7h1Bo=","subject":"CN=GlobalSign PersonalSign 2 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"5fbdd9d4f35d177aa98a436994c97d3b3775ddb8c383c1eb9ef3dea1496456cb","size":1569,"filename":"Uln62-9-5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=.pem","location":"security-state-staging/intermediates/15861c41-dd2c-4e34-a1cf-2cb02237f06a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uln62+9+5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=","crlite_enrolled":false,"id":"8d244824-310b-4dff-a724-1de13c98b0de","last_modified":1577473769150},{"schema":1577473662286,"derHash":"JUvpHBq8so215NZ1opoeeIRgsGWR8bqEl8vReDfier4=","subject":"CN=GlobalSign PersonalSign 1 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"bc9230903dfbbfdcd3c101efc4734db554a1b1c549cf25ffec6ac311d6f57552","size":1569,"filename":"YRypdHS0Ru4gIYd-v2Cul5vQVyh8seMxVJvPr2qLJOA=.pem","location":"security-state-staging/intermediates/eb2091ee-9a1e-4ade-96fc-d8ad4c4294c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YRypdHS0Ru4gIYd+v2Cul5vQVyh8seMxVJvPr2qLJOA=","crlite_enrolled":false,"id":"0b699a25-cbef-43aa-9d17-e10c820aba03","last_modified":1577473769134},{"schema":1577473661866,"derHash":"FQc8a73HRpmohRjCelfJVuXiPWypYZ5SGkaMeHPeT4o=","subject":"CN=QuoVadis PKIoverheid Organisatie Persoon CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGDMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTkwNwYDVQQDDDBRdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"28af41c11c70cf3e8ab413a31b4bfdda3463af11655163604adb33bc16fa601a","size":2584,"filename":"5V1JaYa-6v2oFoMXifuhrjdea3drxtVr9lqziPTCV9M=.pem","location":"security-state-staging/intermediates/13ac31b3-3b06-43f6-adbc-a093f09aa585.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5V1JaYa+6v2oFoMXifuhrjdea3drxtVr9lqziPTCV9M=","crlite_enrolled":true,"id":"7efaa58e-f86c-4e33-a478-1aba997bda84","last_modified":1577473769128},{"schema":1577473661458,"derHash":"m5xV1YbxX0/woS4+h6oq5fbAwhiFfg20zEobp05JP1Q=","subject":"CN=SSL.com Client Certificate Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"60c1324f1b4e8c85bb78e12327e3d72df8cb78ba2d2069292ebb40949c16575c","size":2454,"filename":"YeeUjd94ScdJ8i2-hpJwlv6sWAHbchQGz-Tc2OPHYTY=.pem","location":"security-state-staging/intermediates/65637eab-d23b-44cc-b000-271ee3dc8738.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YeeUjd94ScdJ8i2+hpJwlv6sWAHbchQGz+Tc2OPHYTY=","crlite_enrolled":true,"id":"09522f6d-b510-4a0e-aaf4-f4b95ad1504e","last_modified":1577473769122},{"schema":1576536065510,"derHash":"CCBMUq3aqXpv3vcC9s60uU5Xj4/BwwHJ1RNqs4HPp9k=","subject":"CN=QuoVadis Issuing CA G5,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBJc3N1aW5nIENBIEc1","whitelist":false,"attachment":{"hash":"66f3123973d39ccbf60d892e9ebde107446c11a5c53f318327323821448c1e41","size":2381,"filename":"3Fz_Px_gHN6RuC6dUox8MHiOEiVu0gRwp1hvGNsgDYo=.pem","location":"security-state-staging/intermediates/92f45ca6-dd81-4ea8-8d09-b4f49e9bf983.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3Fz/Px/gHN6RuC6dUox8MHiOEiVu0gRwp1hvGNsgDYo=","crlite_enrolled":false,"id":"7bc692ae-1a69-4513-ab7b-11be9685c440","last_modified":1576536534255},{"schema":1576536064064,"derHash":"6nb58huSvtaYEIVm9fCSEbIExQNcnQGUM8Y1jfoKc8o=","subject":"CN=TI Trust Technologies DV CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSQwIgYDVQQDExtUSSBUcnVzdCBUZWNobm9sb2dpZXMgRFYgQ0E=","whitelist":false,"attachment":{"hash":"c00194c16ee92968419bef2890e0a9f99c7ba4d5e671c1c2d6d8aa388428c9ea","size":2150,"filename":"_TQ1SdM_c-9Y7ggqiTm5AZCppmeqhMts_1_7qE6c-xM=.pem","location":"security-state-staging/intermediates/1b2efaae-5ec5-45f0-ad37-15376c4ec56f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/TQ1SdM/c+9Y7ggqiTm5AZCppmeqhMts/1/7qE6c+xM=","crlite_enrolled":false,"id":"25f9b537-5a44-42db-a613-3918314a6ff8","last_modified":1576536534251},{"schema":1576536062656,"derHash":"5hpIwzz5SqdiSmFEFhoHWmll5qTrTNEcXvvRx5eGLXU=","subject":"SERIALNUMBER=202016,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE2","whitelist":false,"attachment":{"hash":"e8dbb214f2c572f1efa48045b1982c3ecc9acc6245e47f1ef69beb6bbf4d7d20","size":2333,"filename":"nLR5xUKq0rdJtnZz181UU9uGySiik-vmQRP8KKXXm5Q=.pem","location":"security-state-staging/intermediates/d54f9898-1680-47bd-a9d3-899013d3bed5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nLR5xUKq0rdJtnZz181UU9uGySiik+vmQRP8KKXXm5Q=","crlite_enrolled":false,"id":"5e859662-94cb-44d3-8c1d-78e7e9ec6098","last_modified":1576536534247},{"schema":1576536061124,"derHash":"XtlQFWaEpjtyY4OpkIcZ2TFjuZhMPIYpIh8GE7ZRgUA=","subject":"CN=SECOM Passport for Web EV 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIEVWIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"dcd65eecda4a3dced1e4e4ad24854f9c5c361683698a129262cffcca2c3f7911","size":1626,"filename":"Wa2FjlVfGKwvkiH0LYWh-y-ihHlaTmVQ-gqZEsR3RwY=.pem","location":"security-state-staging/intermediates/de596f76-eb11-48b1-81fc-9fbb828ef964.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wa2FjlVfGKwvkiH0LYWh+y+ihHlaTmVQ+gqZEsR3RwY=","crlite_enrolled":true,"id":"a7834442-473f-4afa-8837-5fcba0ed97c0","last_modified":1576536534244},{"schema":1576536058303,"derHash":"DxVUwv1ZGwJWpgjhwTaoN+em4EFWHuCKkRsq/c08bBs=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"619239fa36d141159ca184a5846f04250cf658d2d441555c880bc314397cd6f9","size":1089,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/053b9ee7-c4d5-4804-9f95-f705688c379e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"08445463-0e37-4bbe-a1ed-f079c2145e45","last_modified":1576536534240},{"schema":1576536056853,"derHash":"sKbvA1DnxMYFa+6nr50thgue0QITe5cp08IyFtGVVGo=","subject":"CN=Advanced Class 3 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"0ed62164b86f37c69eb2018a4a79db046f2eae11bfb1c748569dff5da6e94178","size":1768,"filename":"VGt-HUDy6qey1Up5ZYyfXaLC_1Yy9l4AvJsHFIQXC5g=.pem","location":"security-state-staging/intermediates/912a52c5-97ea-4353-806f-dbf6b9c95e81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VGt+HUDy6qey1Up5ZYyfXaLC/1Yy9l4AvJsHFIQXC5g=","crlite_enrolled":true,"id":"1d065829-106f-4cf5-a7ce-33874e651514","last_modified":1576536534237},{"schema":1576536055441,"derHash":"ZlZv7dYNs64QkQ8qiXB89RWQkgM6cadc2GhR1zWRlBE=","subject":"CN=AffirmTrust Premium Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczEzMDEGA1UEAwwqQWZmaXJtVHJ1c3QgUHJlbWl1bSBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"07e66a596ddcbc285e7ce2b1bcf7871dd6efe67086212e3bc3b716b226897194","size":2259,"filename":"3gMCuDMv_P0gIb194xpHJCsdZogzAhE3N6usv_7BXhk=.pem","location":"security-state-staging/intermediates/df155982-cf71-469c-b7b6-f9ec964f04d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3gMCuDMv/P0gIb194xpHJCsdZogzAhE3N6usv/7BXhk=","crlite_enrolled":false,"id":"3b6cb9bb-6102-43a3-a5ec-c29bd087081d","last_modified":1576536534233},{"schema":1576536054026,"derHash":"uJslas18i/xcE2qFcFdTUCGenVWHmoWn7AzAwSg8JKM=","subject":"CN=GeoTrust Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSkwJwYDVQQDEyBHZW9UcnVzdCBQcmltYXJ5IFRyYW5zaXRpb24gUm9vdA==","whitelist":false,"attachment":{"hash":"3b63926b8672802e6e86e795d069d9b8ebe0d873eda192eea364acc603da92ea","size":1321,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/fb461011-416d-431a-adcc-978da8bb647a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"6867e533-7324-4367-bc4f-614a4d65ee7e","last_modified":1576536534229},{"schema":1576536051207,"derHash":"vq9G0P9iZF9WvhGDDd78ZjN5YZ8zfoVxNJHIOuF5SB0=","subject":"CN=DigiCert High Assurance Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENvZGUgU2lnbmluZyBDQS0x","whitelist":false,"attachment":{"hash":"bcc6fa461c63e72b5b0bdc1f0528fcda516e2b2b7713c3adfd2e23e60cd2e4d3","size":2398,"filename":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=.pem","location":"security-state-staging/intermediates/c6968810-a29a-4b33-a240-69b369665d59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=","crlite_enrolled":false,"id":"a6c9e2a8-cd22-4f84-9e9f-9966c2232b36","last_modified":1576536534222},{"schema":1576536052576,"derHash":"c2CeaO6qi1KAjLUD+46mTt04kj2pxVrniAUatBbddZ4=","subject":"CN=Cybertrust Japan SureMail CA G4,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEoMCYGA1UEAxMfQ3liZXJ0cnVzdCBKYXBhbiBTdXJlTWFpbCBDQSBHNA==","whitelist":false,"attachment":{"hash":"c3fcdbacd6b54d25047ea8d3094785afc7d48a4287b00a64a28107c78a9b5252","size":1768,"filename":"M4LPRPbTPA3AGjc9JdVUp9Em24oAD5Kjau8R089zAB8=.pem","location":"security-state-staging/intermediates/c7a96d3d-04d0-42dd-865d-c5f45b51f284.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M4LPRPbTPA3AGjc9JdVUp9Em24oAD5Kjau8R089zAB8=","crlite_enrolled":false,"id":"6f4c9ab7-9848-46a5-9f9a-5edda5ee1d2f","last_modified":1576536534218},{"schema":1576536049752,"derHash":"22y7hzO+tJOvOccCqd0GdDFOLtMmDNUlCkkUgHV9jqI=","subject":"CN=EC-Ciutadania,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGGMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxFjAUBgNVBAMMDUVDLUNpdXRhZGFuaWE=","whitelist":false,"attachment":{"hash":"5c694da195ee633dd4f5eacef34a18111f5e53e6c9465f5b1f0838a7d708db50","size":2097,"filename":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM_BQAAwtDlBw0=.pem","location":"security-state-staging/intermediates/9b12aa4e-23ee-4d0a-a54c-66e324175fe8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM/BQAAwtDlBw0=","crlite_enrolled":false,"id":"0da25c82-2a82-44ca-9a30-70c090781a84","last_modified":1576536534211},{"schema":1576536046907,"derHash":"wtT9+72C9KHNrEcT46sJmVYJGNehcN3gP33b+aKI3Nw=","subject":"CN=SafeToOpen EV TLS ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"ME0xCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDElMCMGA1UEAwwcU2FmZVRvT3BlbiBFViBUTFMgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"d8dd280ca81928ac5d9f88d5ea7cd0bff13b2f2e60bb565232b7e0ab19fcc49e","size":2438,"filename":"wceoTySaLCXY7FAABlMa1eB4Fc2Vodc8zSQij-gt6Ko=.pem","location":"security-state-staging/intermediates/120899dd-21f2-4b40-a059-69ed9a6e0b01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wceoTySaLCXY7FAABlMa1eB4Fc2Vodc8zSQij+gt6Ko=","crlite_enrolled":false,"id":"18d7553d-a362-4364-81b1-d16f12ae4797","last_modified":1576536534207},{"schema":1576536044022,"derHash":"AL/lF32kDgQFBqBEF/tLgGSBa12HWFKgf8OjZwAJEIA=","subject":"CN=CSS Public Issuing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Common Securitization Solutions LLC,C=US","subjectDN":"MIGcMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjQ29tbW9uIFNlY3VyaXRpemF0aW9uIFNvbHV0aW9ucyBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEeMBwGA1UEAxMVQ1NTIFB1YmxpYyBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"9625d57fc7f6a49deb14728feb83cf7edb83bdf782a5b10e9f2bb3725331b3d9","size":2077,"filename":"rzb3PNwXMW__yJquQWI_mhropzVU1Kcapgx84gb4XHg=.pem","location":"security-state-staging/intermediates/2687e0e3-608a-4004-887b-71f74dececfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rzb3PNwXMW//yJquQWI/mhropzVU1Kcapgx84gb4XHg=","crlite_enrolled":false,"id":"727cccf2-d7e7-4e9c-9ffa-5778d62af14c","last_modified":1576536534204},{"schema":1576536036442,"derHash":"YPU+YDsO+nHGzDS26HwRRfcNyULIn3F2PZD+GOesWJ4=","subject":"CN=IBM Certification Authority G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=International Business Machines Corporation,C=US","subjectDN":"MIGtMQswCQYDVQQGEwJVUzE0MDIGA1UEChMrSW50ZXJuYXRpb25hbCBCdXNpbmVzcyBNYWNoaW5lcyBDb3Jwb3JhdGlvbjE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMScwJQYDVQQDEx5JQk0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzQ=","whitelist":false,"attachment":{"hash":"cfa1d134c87a2adf5d7fd6db4082a050b8ab05ed5a65606f7cb38a7e5dc61951","size":2097,"filename":"9CRueC2hB1f0IGH9tycGhgC7JiLlOmttZCFXZKjuVns=.pem","location":"security-state-staging/intermediates/d4118315-6f84-47da-b5e6-39d23274046f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9CRueC2hB1f0IGH9tycGhgC7JiLlOmttZCFXZKjuVns=","crlite_enrolled":false,"id":"c7140ad4-c587-413b-a16d-54eb6735efca","last_modified":1576536534182},{"schema":1576536034560,"derHash":"KHMACROLTh1tM0qPKAWmCqO+mWnVc7uy8FFjErt/NU4=","subject":"CN=OneSignSSL RSA DV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIFJTQSBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"4fb6ba778562a884883cc8f1c7ddf3cc76924b6c481f1238cd9d0d09eef988cd","size":2154,"filename":"9IAV2sm8fSQPPgrFDnJNElfd6K4uJrxTx15o5jJy9nA=.pem","location":"security-state-staging/intermediates/fd1c6268-0059-46b1-8058-e8765d252ba4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9IAV2sm8fSQPPgrFDnJNElfd6K4uJrxTx15o5jJy9nA=","crlite_enrolled":false,"id":"ec48a0f4-07fe-4af5-898f-dd29d59f3ea3","last_modified":1576536534175},{"schema":1576536031495,"derHash":"29+pGsxNuK2D/MeXjjXWL24y5VEIJzyOyZjjEzWA1mQ=","subject":"CN=TrustAsia OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"62f07941ab31ac93b3aa011cf5c969d6144dfa3248c15cf83974bbad7d102dde","size":1821,"filename":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem","location":"security-state-staging/intermediates/01439ed9-c5df-42a3-bd51-09e6f0ab3467.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=","crlite_enrolled":true,"id":"2d04d337-69e3-44ad-9e68-0cfd2a4a4153","last_modified":1576536534164},{"schema":1576536028565,"derHash":"5StEzR5qmtoKBAnRzF1zpvQXYD1w5vXcVIOritrvPKQ=","subject":"CN=DigiCert Transition RSA Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gUlNBIFJvb3Q=","whitelist":false,"attachment":{"hash":"914596db391a90381989f75de44986a84111af1a86a6b47fea188272724fb77b","size":1305,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/476a40fc-77d9-4bbd-9c7f-f592807899f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"8a0d3f97-d849-409d-bcd3-af5446738f74","last_modified":1576536534153},{"schema":1576536022550,"derHash":"UoauHFWKgVN82YcPdJ2W76vC0ro5PfgY3+lep85kUKc=","subject":"CN=HydrantID Client ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMMF0h5ZHJhbnRJRCBDbGllbnQgSUNBIEcy","whitelist":false,"attachment":{"hash":"cb3984f4a713da4d2127e347745132b9485b6c954cea045b71d0577d7480d89d","size":2430,"filename":"8wG5JEK-6eyiSKMnSyu9H-Pc0UuAPV0a_kfNCqvHesw=.pem","location":"security-state-staging/intermediates/5f5ebd57-b000-419a-8646-fb81335b2cf0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8wG5JEK+6eyiSKMnSyu9H+Pc0UuAPV0a/kfNCqvHesw=","crlite_enrolled":false,"id":"c8d9b464-441d-4479-8062-9d2b30308c14","last_modified":1576536534149},{"schema":1576536018232,"derHash":"3BmD8UsAlvsSptgrSCJzDSOHecoFQ8Q8AV8kkklWTU0=","subject":"CN=IHI-EC International Corporation,O=IHI E&C International Corporation,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMSowKAYDVQQKDCFJSEkgRSZDIEludGVybmF0aW9uYWwgQ29ycG9yYXRpb24xKTAnBgNVBAMTIElISS1FQyBJbnRlcm5hdGlvbmFsIENvcnBvcmF0aW9u","whitelist":false,"attachment":{"hash":"e8e00a93568f3fa2e62aeb3a661d6a923d701ea84d6424fd27b3b4118ffb4c5d","size":2016,"filename":"1o2j5nZgvI5dVwmpYiHsdVUKWwz3kjk9zbDYvdSrsJo=.pem","location":"security-state-staging/intermediates/b7c27d63-0da5-4f18-bcef-f5ee1e72c875.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1o2j5nZgvI5dVwmpYiHsdVUKWwz3kjk9zbDYvdSrsJo=","crlite_enrolled":false,"id":"d9ce419c-1a2f-4273-8a12-4fc0839054f2","last_modified":1576536534137},{"schema":1576536016807,"derHash":"hV3KaPgZTW1byUpRzzZM3P/IOCWhItimLkehGEhNN0s=","subject":"CN=ITSO Ltd RSA DV,O=ITSO LTD,L=Milton Keynes,ST=Buckinghamshire,C=GB","subjectDN":"MGwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxFjAUBgNVBAcTDU1pbHRvbiBLZXluZXMxETAPBgNVBAoTCElUU08gTFREMRgwFgYDVQQDEw9JVFNPIEx0ZCBSU0EgRFY=","whitelist":false,"attachment":{"hash":"f7f8ae5a4d6c669308077f3d66de5bced3fc6ce838c89515e89a27eb62208b17","size":2129,"filename":"hoWbyI9IWnkDxapxLWOIsrvM58HKk5XQdT0Wk5A2ovs=.pem","location":"security-state-staging/intermediates/8855bb62-810b-4e29-aa2c-072a825e881a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hoWbyI9IWnkDxapxLWOIsrvM58HKk5XQdT0Wk5A2ovs=","crlite_enrolled":false,"id":"7e6c7559-1afe-4e48-aa16-564c45d842e6","last_modified":1576536534134},{"schema":1576536014868,"derHash":"hDeCMDBAv7M1dnZuFwBpbeD8FIh74pPXJl61ns5O2cw=","subject":"CN=BT Class 2 DigiCert PKI Platform CA,O=British Telecommunications plc,C=GB","subjectDN":"MGQxLDAqBgNVBAMMI0JUIENsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIENBMScwJQYDVQQKDB5Ccml0aXNoIFRlbGVjb21tdW5pY2F0aW9ucyBwbGMxCzAJBgNVBAYTAkdC","whitelist":false,"attachment":{"hash":"62ef2e16ec258184426b6b7eb77c56afc020739891f177c120b217fd8bfba3a2","size":2414,"filename":"oFI13M2pDTmr88JyQ06EE_PwqDFGIYNwj2EVxXS2dII=.pem","location":"security-state-staging/intermediates/d83477f2-d610-4eb1-8c9b-818352128513.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFI13M2pDTmr88JyQ06EE/PwqDFGIYNwj2EVxXS2dII=","crlite_enrolled":false,"id":"9b9d198c-a69d-446c-b648-eda5de768f4b","last_modified":1576536534130},{"schema":1576536011965,"derHash":"X6SbNsctA+QtqkMCUA1kbJSMh6w27TDMPb3bviTGRjM=","subject":"CN=WebNIC ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for WebNIC,O=WebNIC (Web Commerce Communications (Singapore) Pte. Ltd.),L=Singapore,C=SG","subjectDN":"MIHVMQswCQYDVQQGEwJTRzESMBAGA1UEBxMJU2luZ2Fwb3JlMUMwQQYDVQQKEzpXZWJOSUMgKFdlYiBDb21tZXJjZSBDb21tdW5pY2F0aW9ucyAoU2luZ2Fwb3JlKSBQdGUuIEx0ZC4pMTUwMwYDVQQLEyxDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFdlYk5JQzE2MDQGA1UEAxMtV2ViTklDIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"a2a7f841b5ca8fd57463ff8f1b27e4d11398c8605a0f4139ea461bd98ecdca69","size":1443,"filename":"wJUIwtfbQyb8AQ8i7WNkx5y7MTHHrQ3ILlCihfqdp-I=.pem","location":"security-state-staging/intermediates/6b627396-e558-45f3-9641-d84574e674e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wJUIwtfbQyb8AQ8i7WNkx5y7MTHHrQ3ILlCihfqdp+I=","crlite_enrolled":false,"id":"079aab15-46c4-4056-bf61-918aa3d1c397","last_modified":1576536534122},{"schema":1576536019673,"derHash":"wuQjbbG3V7Ubd5ITiO+oI+amAP1L2jC2Ord4hvJWGLc=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"80e5a75a2133c51ce0a9e5cb79192a969122aa9d0010027ed0919b87dfdf6905","size":1638,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/171b6f60-be37-44ac-913e-06a4514e36a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"f66e7da9-1a66-4dc3-b793-faca5bf40093","last_modified":1576536534119},{"schema":1576536010525,"derHash":"Z8RtwXdiZnhE8VlgiTdf9F4FwrMWyJSZ9uf6t4yPA3k=","subject":"CN=GlobalSign Issuing CA for AATL Partners 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTUwMwYDVQQDEyxHbG9iYWxTaWduIElzc3VpbmcgQ0EgZm9yIEFBVEwgUGFydG5lcnMgMjAxOQ==","whitelist":false,"attachment":{"hash":"8b06c8725c287688440cf9bd1330f4a6e7a1522a3af5778fa2d6840dc296bc16","size":2142,"filename":"Gsj1AO3cbWx61NJW93Qr6MNrKZrsf6R-7BgXSXF_iZE=.pem","location":"security-state-staging/intermediates/1e204c9a-f0e4-41c8-af6b-5e43de9851ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gsj1AO3cbWx61NJW93Qr6MNrKZrsf6R+7BgXSXF/iZE=","crlite_enrolled":false,"id":"00c11545-654a-4793-a31c-32844bb8119e","last_modified":1576536534115},{"schema":1576536009127,"derHash":"2FU6KIDpa3qkx0E92QOv09WAUEaV3SahaP1IzOexR0o=","subject":"CN=UZI-register Medewerker op naam CA G3,O=CIBG,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEuMCwGA1UEAwwlVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgb3AgbmFhbSBDQSBHMw==","whitelist":false,"attachment":{"hash":"0cb57be73bd621623092fefcb68872855290eb020523b0a53e53afd972a316e3","size":2544,"filename":"dCyrxAKUK8j5RoQJISk_QPQ9eWh1wvDZFjkJxvysY1M=.pem","location":"security-state-staging/intermediates/3be928bc-8d4b-4aa9-8cf4-f65d61cb6c76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dCyrxAKUK8j5RoQJISk/QPQ9eWh1wvDZFjkJxvysY1M=","crlite_enrolled":false,"id":"0903bf91-4b0c-4d03-945c-ee38128bff24","last_modified":1576536534111},{"schema":1576536006146,"derHash":"al9MFnjKZeWfBg1Xzf9mUGUxSGHVOo59FFDKktlsoQI=","subject":"CN=CRB Group SMIME CA 2019,O=CRB Group\\, Inc.,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9DUkIgR3JvdXAsIEluYy4xIDAeBgNVBAMTF0NSQiBHcm91cCBTTUlNRSBDQSAyMDE5","whitelist":false,"attachment":{"hash":"46bf4a65e1a1d6041a7fd486d3b111820fb297aa92a6aa5e32412d73b2175762","size":1849,"filename":"5uacCErrU9OKxrpS_6aTZMtadjLWMJFTodYoyJ4SiAY=.pem","location":"security-state-staging/intermediates/3379f57c-e87e-469a-ba90-3b4ebbe6718d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5uacCErrU9OKxrpS/6aTZMtadjLWMJFTodYoyJ4SiAY=","crlite_enrolled":false,"id":"83317d20-9d0d-4313-8faf-840701aeed1f","last_modified":1576536534103},{"schema":1576536001652,"derHash":"CUBFHf7LZ1tSBMiuBxidTk6QlXz9K6/c/zbbIMJ56Ro=","subject":"CN=SECOM Passport for Member PUB CA4,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTQ=","whitelist":false,"attachment":{"hash":"67bd2661144de940ff04d2ed4a8a7c1ef3c2122d9e3a8cd9a484dcb81a67f399","size":1601,"filename":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=.pem","location":"security-state-staging/intermediates/974ee8b6-e05b-45c0-b50d-b37049e98644.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=","crlite_enrolled":true,"id":"545f4ef1-6eac-4f67-adf9-fc62354d1a33","last_modified":1576536534099},{"schema":1576536003209,"derHash":"+AhlYjZyW1ZvByHFGBWKZ1bJaQPLcetI3dqO3f6g8mw=","subject":"CN=GRNET Client RSA SubCA R3,O=National Infrastructures for Research and Technology,L=Athens,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMT0wOwYDVQQKDDROYXRpb25hbCBJbmZyYXN0cnVjdHVyZXMgZm9yIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5MSIwIAYDVQQDDBlHUk5FVCBDbGllbnQgUlNBIFN1YkNBIFIz","whitelist":false,"attachment":{"hash":"9ce8e8721d5cca69e41940aaa10d38fe6b27f089228093b65e92232a18aa10eb","size":2913,"filename":"wnEjGCVxs6O7Ii9LxKLgiSA52mkxeYBv8ou6SCPwpvg=.pem","location":"security-state-staging/intermediates/b592e2e9-8c51-4362-9fd6-a000990cddc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wnEjGCVxs6O7Ii9LxKLgiSA52mkxeYBv8ou6SCPwpvg=","crlite_enrolled":false,"id":"76f424b7-5f52-4859-a914-ec79d2d35576","last_modified":1576536534096},{"schema":1576536004669,"derHash":"aSSk3YKUjaU/b7kz6JWg9lgcjb3rq7NvwRysJenAM1o=","subject":"CN=Telia Document Signing CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFAxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajElMCMGA1UEAwwcVGVsaWEgRG9jdW1lbnQgU2lnbmluZyBDQSB2Mw==","whitelist":false,"attachment":{"hash":"173b45b95c7e25dee728aa0b7e79bfa2b9b4a023c89e1f7f3b67e0b5f9426723","size":2365,"filename":"-YHiKkNgq-wtY5uDU57xDrTPWbMr0zXao2o9yt7I3XU=.pem","location":"security-state-staging/intermediates/7dba7569-1903-4086-beb4-3af36738b147.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+YHiKkNgq+wtY5uDU57xDrTPWbMr0zXao2o9yt7I3XU=","crlite_enrolled":false,"id":"d947c391-8bce-4ff2-b4a1-7a3ab55ca8f5","last_modified":1576536534092},{"schema":1576536000239,"derHash":"GY4zLxD6D1ivCDrpZLxkQfBs0PrTGbEjX+PtD3xur5M=","subject":"CN=WebNIC RSA Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for WebNIC,O=WebNIC (Web Commerce Communications (Singapore) Pte. Ltd.),L=Singapore,C=SG","subjectDN":"MIHVMQswCQYDVQQGEwJTRzESMBAGA1UEBxMJU2luZ2Fwb3JlMUMwQQYDVQQKEzpXZWJOSUMgKFdlYiBDb21tZXJjZSBDb21tdW5pY2F0aW9ucyAoU2luZ2Fwb3JlKSBQdGUuIEx0ZC4pMTUwMwYDVQQLEyxDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFdlYk5JQzE2MDQGA1UEAxMtV2ViTklDIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"d535c3739b449a27a1b6564d8aad501fab7d3100a592e443a8b7bd56a791e24e","size":2284,"filename":"DkUXONpZG5H7NGx6X1k9T9v4PYppUd35pZ3oginTOG0=.pem","location":"security-state-staging/intermediates/0f0215fa-7dbe-4e90-84a6-26597491f0ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DkUXONpZG5H7NGx6X1k9T9v4PYppUd35pZ3oginTOG0=","crlite_enrolled":false,"id":"03d2a8c2-61ca-4d46-9d5e-f60e5a03eb5a","last_modified":1576536534088},{"schema":1576535998723,"derHash":"j8FGm4AFv+vb9n9RTnlf4fF+ojmippNIV/JCitzm0k8=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"f6cba1367b384f4518e9f358bd8e3eb845860eaf88cf8a1cc5885c5a8ed426fa","size":2353,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/71bbf673-0978-4961-8f3b-f4d087f7a2fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"5e4b37fb-de99-4276-bab2-22314fb5af67","last_modified":1576536534084},{"schema":1576535995805,"derHash":"TCQc/j0/+2DKiNawalUqsc8O99jS4I2hUoK1UZLrvSk=","subject":"CN=Ford Motor Company - Enterprise Issuing CA01,O=Ford Motor Company,L=Dearborn,ST=Michigan,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEbMBkGA1UEChMSRm9yZCBNb3RvciBDb21wYW55MREwDwYDVQQHEwhEZWFyYm9ybjERMA8GA1UECBMITWljaGlnYW4xNTAzBgNVBAMTLEZvcmQgTW90b3IgQ29tcGFueSAtIEVudGVycHJpc2UgSXNzdWluZyBDQTAx","whitelist":false,"attachment":{"hash":"efb755d084ded13b3ac2b3f55c16b2160cdfaaf2b7cfcaf53d00f4a459b915e1","size":2938,"filename":"CqwsdVHa6T0W9pos5-f88X2UNjXr4wKHpQ8Muq3ipRA=.pem","location":"security-state-staging/intermediates/7fd0fc7b-3efd-4fcd-ac96-22557e159fe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CqwsdVHa6T0W9pos5+f88X2UNjXr4wKHpQ8Muq3ipRA=","crlite_enrolled":false,"id":"92464914-70b1-4378-b814-a132ec905cfd","last_modified":1576536534077},{"schema":1576535994452,"derHash":"2HqR2sJtZONllQcRnoCxG+N62oeo1sAeThdduzKxoNM=","subject":"CN=OSRAM Continental Secure Email CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=OSRAM Continental GmbH,C=DE","subjectDN":"MIGbMQswCQYDVQQGEwJERTEfMB0GA1UEChMWT1NSQU0gQ29udGluZW50YWwgR21iSDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSowKAYDVQQDEyFPU1JBTSBDb250aW5lbnRhbCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"5f68e368fd16e235475da58f55a2204584b88eac641e4ec557936b8042173d83","size":2073,"filename":"7wyniI0KLvACB3qDw45iTsE1UaQBDsAQZqKze49FvxU=.pem","location":"security-state-staging/intermediates/93f9172f-6795-44d1-96c8-6d2405099fcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7wyniI0KLvACB3qDw45iTsE1UaQBDsAQZqKze49FvxU=","crlite_enrolled":false,"id":"f0afa748-66b7-486a-8cf4-afd8f25070d0","last_modified":1576536534073},{"schema":1576535993029,"derHash":"HJc36Witnf+NjX/PmWoUS7l4UaGQEaAZDJQ8ro1Dz+A=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"b57a3d5029c97a35bb6880a05ad369fcc13be288c141ba5be144c0ae53d84579","size":1585,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/2c443791-49a4-46c3-a27f-7b2599e100bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"75e1b780-8583-4cab-9027-6f97f24c19ab","last_modified":1576536534069},{"schema":1576535991616,"derHash":"NX3sxWIviSOf/RyRwTZqCVG6TbX9OE9RjMSuhdLa46U=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"d6aa735f6570dd8eab1124e88a5ba575ee35143738f4392b74e86c8480049357","size":1821,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/49393096-c9ac-401e-8fbe-4e0947a3b892.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"c9f72111-46bb-4634-a3cb-ee00f147a31e","last_modified":1576536534065},{"schema":1576535990183,"derHash":"IQxPMHL4/Jg8HzpxDS/a86swTXv2z+X0ttpFf1cTLTE=","subject":"SERIALNUMBER=202014,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE0","whitelist":false,"attachment":{"hash":"20d695ce508b51f51bda71c5995f9c66d68083544a5344390d4a0f76c15d4521","size":2333,"filename":"U7zoSHg0PLA-Mg7Q6oQ_hupqX2qetdMjZL96ei27DEA=.pem","location":"security-state-staging/intermediates/72b82bcb-aeea-4515-a822-70d25282517a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U7zoSHg0PLA+Mg7Q6oQ/hupqX2qetdMjZL96ei27DEA=","crlite_enrolled":false,"id":"c0375a0f-d96b-4db0-aaad-58593a2c322a","last_modified":1576536534061},{"schema":1576535988714,"derHash":"cNyG+fd1C3Sx3sjNNS7CWDfDbmQPcUjghGTvWQHlpYk=","subject":"CN=Secure Site Pro Extended Validation ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQSBHMg==","whitelist":false,"attachment":{"hash":"35bebf4b8ef09fd9c565bc9f3a5ece74886943a8aa8f6a6fd56758beb70fe08c","size":1435,"filename":"XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=.pem","location":"security-state-staging/intermediates/6ae86321-38ae-410a-9975-233f0c20315a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=","crlite_enrolled":false,"id":"41c79e82-ac51-4718-90e4-42e605116e4a","last_modified":1576536534057},{"schema":1576535987339,"derHash":"dHz01wwMqeY99r9g7xzOtvlTn6ilNPtp8Fxh3flypBk=","subject":"CN=OneSignSSL ECC OV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIEVDQyBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cc9c83787b291373dbd2e3f059f539f92b2c5f65b1c6894deeab63306a0b5399","size":1313,"filename":"k5mlhqxcFc-cb0nNpLyym3e1yVLu33JKb1dKa-MuMjg=.pem","location":"security-state-staging/intermediates/64049552-b29b-4299-ac7c-a87b3186a1d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5mlhqxcFc+cb0nNpLyym3e1yVLu33JKb1dKa+MuMjg=","crlite_enrolled":false,"id":"bf594d1a-53f1-42fb-9dd0-379365307a1f","last_modified":1576536534054},{"schema":1576535984479,"derHash":"Ptv//DTroC4NupzRGdvPmNdJclc3evi8YhDYgQASCng=","subject":"CN=WebNIC ECC Domain Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF0xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEpMCcGA1UEAxMgV2ViTklDIEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"dba8424009d862179d68d2288ea0622dd0951d98a15c8c2596e223b755ce68ec","size":1252,"filename":"df4BU-36qEmkjB2K0NlnnriyUqYwdm9JiwyAOrs_dqk=.pem","location":"security-state-staging/intermediates/03cca880-f44b-4cdf-9623-58ce69906e26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"df4BU+36qEmkjB2K0NlnnriyUqYwdm9JiwyAOrs/dqk=","crlite_enrolled":false,"id":"9ffe1aa1-fafe-45e2-825b-4897086c8615","last_modified":1576536534045},{"schema":1576535983075,"derHash":"b2stSjCaFWxhl3+8z30qyfWWI//M6sPk7lqDoY2JUnU=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"579ba63d8e05c2f3a59978f656050ef48c8e602297091d1ed3a31125febe5170","size":1817,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/210a246c-98d2-41d9-a803-f82c201c8678.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"60144f18-ade4-4eba-8530-c82470db382f","last_modified":1576536534042},{"schema":1576535981674,"derHash":"/8ONKDRFlPVfG5qRjEVPy47Oxq6ZM/7xo9UJTupAa/g=","subject":"SERIALNUMBER=202004,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA0","whitelist":false,"attachment":{"hash":"126ef456a5bb89cfb4b28ccb59b42371458419f55f17444201b4a4ed3c51a096","size":2333,"filename":"SkEb8xbUUApSuC0FN2Cl9MIrkLC1W0ZZj0SmAGVRFhs=.pem","location":"security-state-staging/intermediates/77773575-9c9b-48cd-90d6-70d9b80b0e12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SkEb8xbUUApSuC0FN2Cl9MIrkLC1W0ZZj0SmAGVRFhs=","crlite_enrolled":false,"id":"4dffeaa7-6739-4da0-a61e-b415a1c9cdc8","last_modified":1576536534038},{"schema":1576535978841,"derHash":"uilZ+kSOmALIWfkMtdrHOO952/zM1NQHlDZR8LBFahM=","subject":"CN=OneSignSSL ECC EV Secure Server CA,OU=Controlled by Sectigo exclusively for One Sign Pte. Ltd.,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIHCMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjFBMD8GA1UECxM4Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBPbmUgU2lnbiBQdGUuIEx0ZC4xKzApBgNVBAMTIk9uZVNpZ25TU0wgRUNDIEVWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d117e83a464d541b97c043720e671efe1bbb754498b470212e04c2db573a1f09","size":1435,"filename":"zWWzic6NajzDYmdUGim_cTkcA88HtIi7aWRbwgP9kKU=.pem","location":"security-state-staging/intermediates/f6d7179c-d394-48c0-b210-7ecc25444e38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zWWzic6NajzDYmdUGim/cTkcA88HtIi7aWRbwgP9kKU=","crlite_enrolled":false,"id":"665b92bf-ffa1-450e-9fd8-73b6dfb09f83","last_modified":1576536534035},{"schema":1576535980267,"derHash":"iM5J46T6N+rijo41+P+M91aMqEVjnO87jf305Gk6wUo=","subject":"CN=GRNET TLS RSA SubCA R1,O=National Infrastructures for Research and Technology,L=Athens,C=GR","subjectDN":"MH4xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxPTA7BgNVBAoMNE5hdGlvbmFsIEluZnJhc3RydWN0dXJlcyBmb3IgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kxHzAdBgNVBAMMFkdSTkVUIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"875cc017e6ef92a89f7ebb1204cd67182ac3e07cb6d69df484965fe258b7686c","size":2930,"filename":"mRBQN6GrKf_OuCxLxwvdLuH0S0HerSNcK0j4LUEd3RM=.pem","location":"security-state-staging/intermediates/e12686fe-e47e-4b1f-82d6-533862fd6ef2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mRBQN6GrKf/OuCxLxwvdLuH0S0HerSNcK0j4LUEd3RM=","crlite_enrolled":false,"id":"a536c660-f8ee-4457-b327-7ca9444b5ea4","last_modified":1576536534027},{"schema":1576535976050,"derHash":"6ucutFS/bDl369KJ6XCy9SgpSRkAk9DSb5jQ8Napzxc=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"1f391e0925fd3c36dbc642db948b408638e24e1faec76c62a4c7c36240dbbdcb","size":1869,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/a3b1dab1-e810-4738-93a8-0fbb33f8a5d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"5eaa4972-8682-4d87-822f-e064c03bd257","last_modified":1576536534023},{"schema":1576535973202,"derHash":"ZokB5XZNfZCZq8ITSFmdn/NrkWyoObNR5odbGLFhML4=","subject":"CN=WebNIC RSA Domain Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF0xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEpMCcGA1UEAxMgV2ViTklDIFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"16d026d7e222b83b21f30fffd6c86d922e1bc13c0f20bb7a6760efc390c2a1be","size":2093,"filename":"-6H0JyfPfrRNWedIzjtNbJYDUqMxAM9vGdy4yFQ5yFI=.pem","location":"security-state-staging/intermediates/568e3b62-fb8c-462e-87f0-420b7b3c9dd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+6H0JyfPfrRNWedIzjtNbJYDUqMxAM9vGdy4yFQ5yFI=","crlite_enrolled":false,"id":"c67fab8d-6da0-439a-8323-77c7d8bf7a59","last_modified":1576536534019},{"schema":1576535971650,"derHash":"la2U6I9bhgTkDl//NrDTS+RsHVugbA5zW3KqOWc1xBU=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"1d98ed13e49faa1ac91f1c05a20ba514f612b0638b9446469f44c66fc6c8bda6","size":1821,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/18884e92-e13e-435d-b35a-fbc2c75c3ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":true,"id":"a07ca5be-944f-42e0-99d8-923c20190318","last_modified":1576536534005},{"schema":1576535974622,"derHash":"N9CApemlJmY+Vu4g3kvZ95UtrMNBSRQ5CAFnrV3RjKw=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"8084973f28f9bb8da2dddef1086d13c58d35fafd5b6cd1cf19b002ea327410a9","size":1577,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/cd733eb5-cc1a-4fa5-b47c-ba77042e0a43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"0d02c2ec-63df-4380-9e5d-1efee98dd704","last_modified":1576536533996},{"schema":1576535970291,"derHash":"kO5UjrrKyrQCB6YaN4zhhrlNJK58Vb/IMGXqlgcuKzg=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"367d165dd5eefba12617df9187cb1fb88671b8e377384841173261d966443745","size":1800,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/149beeb6-544e-481e-b3be-c402c7431da4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"c46e9453-6f06-4a8c-9daf-3011076811b1","last_modified":1576536533991},{"schema":1576535967278,"derHash":"k5BxSx2Qn6PXDdx2gbOPB+1OY1bLXHGRXRvc1I/jNfg=","subject":"CN=QuoVadis Swiss Regulated CA G2,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH4xCzAJBgNVBAYTAkNIMSYwJAYDVQQKDB1RdW9WYWRpcyBUcnVzdGxpbmsgU2Nod2VpeiBBRzEeMBwGA1UEYQwVTlRSQ0gtQ0hFLTExMi4yMTAuMzQ5MScwJQYDVQQDDB5RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"cda3d8577bf0baf4725200eafbb5747ad79644550bd7c1c48d40b01fdc7946c9","size":2576,"filename":"040Y3nIF8mSEbEH2aHTk7ZBKjNtqGeuBX2HCAFKIdZk=.pem","location":"security-state-staging/intermediates/5bd77f72-723f-45bf-8207-34eacc0d7e58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"040Y3nIF8mSEbEH2aHTk7ZBKjNtqGeuBX2HCAFKIdZk=","crlite_enrolled":false,"id":"7d40a737-aaa0-4124-ba0e-ac49991f5cf8","last_modified":1576536533982},{"schema":1576535965828,"derHash":"DVG2zc80qfIhRHh/P9kg3IgA+2BJC/yNKJoZU+D72k0=","subject":"CN=TrustAsia EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"8410138c0818efe36c3c5e447194465f2a0b00c3453529916ca8fa0c0abaf130","size":1670,"filename":"JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem","location":"security-state-staging/intermediates/622cc492-e266-42bf-8807-edd1fafd23b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=","crlite_enrolled":true,"id":"0188e712-0f9b-4e95-8c28-48e3eaae9945","last_modified":1576536533978},{"schema":1576535964386,"derHash":"XCnb6pt8yLAkGPKMHIc2398XBmXQmO9oHZA752mH0kk=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"2d9d379dbd5d0002b3c68677e98b81199b8b1b9abba7cf87839774bbeb1339c0","size":1386,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/ce55fa72-c68e-4449-9da1-b8dd4268c16b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"d5fc3ad9-0ada-4751-b516-44478b4bd331","last_modified":1576536533975},{"schema":1576535962958,"derHash":"x29wmAWYxmqOMn4XtJWiJ2JlxLmjV176HVUFAqgj1ZE=","subject":"CN=Oracle SSL CA,OU=VeriSign Trust Network+OU=Class 3 MPKI Secure Server CA,O=Oracle Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEbMBkGA1UEChMST3JhY2xlIENvcnBvcmF0aW9uMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSYwJAYDVQQLEx1DbGFzcyAzIE1QS0kgU2VjdXJlIFNlcnZlciBDQTEWMBQGA1UEAxMNT3JhY2xlIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"e135ce0a3d08137664ff0e33244bb56fb9eb8cb6b54b086d79707974cac32e51","size":2133,"filename":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=.pem","location":"security-state-staging/intermediates/da453cab-a5b5-4f7e-86ec-fba0675fba01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=","crlite_enrolled":false,"id":"42ab6ded-b971-46f3-bdec-f470ccf5261a","last_modified":1576536533969},{"schema":1576535960132,"derHash":"9HHFZ8FAz4vNwKp2lSEyhx3QwH2qEeCYJDWnceMF7eU=","subject":"CN=OneSignSSL RSA OV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIFJTQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"6298cec88d94935e3b0f9c901e0273e3a8557c8f1311f9a010fd4932282f0ce1","size":2154,"filename":"GcCWGhSfB0XZcAsL42Mnp5VnYlDpXAIzW27AN4z6kJs=.pem","location":"security-state-staging/intermediates/5f3b260b-467e-4ea2-b6d4-faf33390a8e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GcCWGhSfB0XZcAsL42Mnp5VnYlDpXAIzW27AN4z6kJs=","crlite_enrolled":false,"id":"c5ab89f8-5496-43d8-b443-cb7b14df0f97","last_modified":1576536533966},{"schema":1576535961539,"derHash":"CFoHFFJN966ZGab1l4hEOeEqUz5hVS0p1qGMNQlvxUg=","subject":"CN=DigiCert SHA2 Extended Validation Server CA-3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MHkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE2MDQGA1UEAxMtRGlnaUNlcnQgU0hBMiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQS0z","whitelist":false,"attachment":{"hash":"15b5964a25d36b4473500f8cf513384d9fa90b6caa77e7007c1d32de791ca6ca","size":1719,"filename":"lwTPN61Qg5-1qAU-Mik9sFaDX5hLo2AHP80YR-IgN6M=.pem","location":"security-state-staging/intermediates/c25c1336-89eb-46c5-9de3-c6b8546dd191.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwTPN61Qg5+1qAU+Mik9sFaDX5hLo2AHP80YR+IgN6M=","crlite_enrolled":true,"id":"b1c9f693-7c29-4bbf-bf61-d0546487685b","last_modified":1576536533940},{"schema":1576535954460,"derHash":"BBFKVCPaXKegx4rci2PYiT4zQwhOEzZ8GvgyRybs+nM=","subject":"CN=WebNIC ECC Business Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF8xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzErMCkGA1UEAxMiV2ViTklDIEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"e3d85d4c5c0dece7c9b8791d2072ed443a160dccd558b3d399b08355f2948117","size":1256,"filename":"YUjFyuQK3Sa5iGXuitIqguBGtB0x_Lr2rwEwdRQVZWA=.pem","location":"security-state-staging/intermediates/a39bfba1-ad59-4493-95ba-ab7998a76e38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YUjFyuQK3Sa5iGXuitIqguBGtB0x/Lr2rwEwdRQVZWA=","crlite_enrolled":false,"id":"67bf15e5-26ad-4309-a7e5-22c36b2cb9cf","last_modified":1576536533929},{"schema":1576535951697,"derHash":"X2yqRKRmPEQd2SyLZlX7+Xz24daTTbj1+Nl633Az+qw=","subject":"CN=Ministerie van Defensie PKIoverheid Organisatie Persoon CA - G3,O=Ministerie van Defensie,C=NL","subjectDN":"MIGSMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXTWluaXN0ZXJpZSB2YW4gRGVmZW5zaWUxFzAVBgNVBGEMDk5UUk5MLTI3MzcwOTg1MUgwRgYDVQQDDD9NaW5pc3RlcmllIHZhbiBEZWZlbnNpZSBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"3934a8eae4fa88952cd3ddc4edf5c6254398638e6435b2c68d813a4f5fff7abb","size":2621,"filename":"7KYLzx5QRzu-au_gCwTTZqCh6FsSbJxUNaNe0NxbMUY=.pem","location":"security-state-staging/intermediates/efcc6a95-7e5a-4184-a7e2-2927ba00b55c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7KYLzx5QRzu+au/gCwTTZqCh6FsSbJxUNaNe0NxbMUY=","crlite_enrolled":false,"id":"24681fb4-628a-4460-90b9-0f14ba2293c4","last_modified":1576536533918},{"schema":1576535950273,"derHash":"HoZCeMIIgbZxwMbS4UthFQrR8Tz5LG7BS1UNy8R+FUE=","subject":"CN=GlobalSign Extended Validation CodeSigning CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MG4xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMUQwQgYDVQQDEztHbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZVNpZ25pbmcgQ0EgLSBTSEEyNTYgLSBHMg==","whitelist":false,"attachment":{"hash":"77455cfaed61330456ffaa7da32df0dd4731a0acaf6fe166bcac0b28f0aeb328","size":1674,"filename":"HNr6oOEerHtzaDCmff-4LbZgFDwyRlI4dx4JIztxd3s=.pem","location":"security-state-staging/intermediates/532ffdbf-57f8-42d1-a031-8a8275647a0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HNr6oOEerHtzaDCmff+4LbZgFDwyRlI4dx4JIztxd3s=","crlite_enrolled":false,"id":"6168888f-6929-4f40-b04f-33d9070bec84","last_modified":1576536533915},{"schema":1576535948851,"derHash":"Ly8AiBdxChCFtOa8XjM1R0RE2YMnLjOZWjMb4aTE/go=","subject":"CN=GDCA TrustAUTH R4 CodeSigning CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGwxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjEpMCcGA1UEAwwgR0RDQSBUcnVzdEFVVEggUjQgQ29kZVNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"e49b8906ff1d55085ab7bffeb8787da6f1f9f4546d283158c9622d150967f70e","size":2064,"filename":"5Zt41KtIYUpjoXvNDZtGlrN-S-X9juxZk0kJdwQpIlM=.pem","location":"security-state-staging/intermediates/76698902-bd03-4c1d-9344-a48278211966.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Zt41KtIYUpjoXvNDZtGlrN+S+X9juxZk0kJdwQpIlM=","crlite_enrolled":false,"id":"012b0afc-e805-47a0-ab53-af5bbbf79132","last_modified":1576536533911},{"schema":1576535945982,"derHash":"pjwTmLX43S1DL75MLBkUK+ptXQIh+ueUcYrnWXrMqW0=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"378f762af5809d2286eb016c78a51681c834fff84abc2ac05a6cb350bb81bbeb","size":1886,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/d658e22b-e2c2-4eaf-a261-dda71e485545.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"de84677c-3935-4ff1-ad12-b7f06ddaa458","last_modified":1576536533904},{"schema":1576535940122,"derHash":"MB6Mu4xmXKslbrGW9z9NKWycrSXzJ0SQQnnhsxgjPjs=","subject":"CN=Apple Public Client RSA CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBDbGllbnQgUlNBIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"887d323a9b612519f14d2640bdc97e2677c441bc5d92da332d0583d40e61e576","size":2182,"filename":"nhhSlUJJxG_ZM3LQ_T2Iz5U3Ps22YlhuUE1fscITI-E=.pem","location":"security-state-staging/intermediates/21666efd-84e2-47c7-bf9c-726c7f7f05a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhhSlUJJxG/ZM3LQ/T2Iz5U3Ps22YlhuUE1fscITI+E=","crlite_enrolled":false,"id":"ed6766d4-f179-49da-8e26-9b08acdf55b7","last_modified":1576536533889},{"schema":1576535937184,"derHash":"9k0GlO2uBtGEkebp0xxnOZeaLIGiWo5jnf186N/bMWI=","subject":"CN=Dodo Sign EV TLS ICA ECC R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHUxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSQwIgYDVQQDDBtEb2RvIFNpZ24gRVYgVExTIElDQSBFQ0MgUjE=","whitelist":false,"attachment":{"hash":"b0add226615cad1733ff8c5b493bd754f9de850c3f1c8e2cca90816f49c5e1be","size":1305,"filename":"uaqYQ15j83wFQwwqS3bYDrjKrM800inzcvgnootnrYQ=.pem","location":"security-state-staging/intermediates/ffe612d9-45c5-4329-86af-79a0687b4338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uaqYQ15j83wFQwwqS3bYDrjKrM800inzcvgnootnrYQ=","crlite_enrolled":false,"id":"08c035d3-a0b3-448a-a866-9b7bd59b922b","last_modified":1576536533882},{"schema":1576535935756,"derHash":"cNud7ZRN011HTqFf8qpOJfOTqJPs2lQ1nTBbwxlkmBc=","subject":"CN=Apple Public Server ECC CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgRUNDIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"7b664a38a0036f3f518be6f71fd3dccba44bd002424257ded7f358d26fc7fc10","size":1366,"filename":"MxdHGRZ7LjsiyER0ypQ2XivrmpBgAU9_a6gf1ko2sQk=.pem","location":"security-state-staging/intermediates/58a031a8-c0ba-426e-a1de-b8e9854cc946.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MxdHGRZ7LjsiyER0ypQ2XivrmpBgAU9/a6gf1ko2sQk=","crlite_enrolled":true,"id":"20411773-904e-4e23-bf8b-23aa4d20b75d","last_modified":1576536533879},{"schema":1576535931554,"derHash":"H/oNH1XOSgUH6MOOi1V7iMvdaQ2QPZlrH3hQ2B1qSpM=","subject":"CN=Avaya Client Services Users CA 2,OU=Avaya IT+OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Avaya Inc,C=US","subjectDN":"MIGgMQswCQYDVQQGEwJVUzESMBAGA1UEChMJQXZheWEgSW5jMREwDwYDVQQLEwhBdmF5YSBJVDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSkwJwYDVQQDEyBBdmF5YSBDbGllbnQgU2VydmljZXMgVXNlcnMgQ0EgMg==","whitelist":false,"attachment":{"hash":"762a8ed6494b6d421f213b9cd99b97030ae64a5065989022b11dc9f26509453e","size":2097,"filename":"C7LniTwqz9SPKmkZKSXHUjuMCa0AK-H4ybIDe47Reik=.pem","location":"security-state-staging/intermediates/6199eb30-85b4-4e68-83f2-a4abb88247dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C7LniTwqz9SPKmkZKSXHUjuMCa0AK+H4ybIDe47Reik=","crlite_enrolled":false,"id":"47a63ece-4e39-4450-bcb5-d5cb581e733d","last_modified":1576536533868},{"schema":1576535930122,"derHash":"0zTTWamUSGS00I9rUJ43C743j3G97Qsjmjq4vgUqKW4=","subject":"CN=WebNIC Code Signing CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MFMxCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEfMB0GA1UEAxMWV2ViTklDIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"c88ea8edec48a2a9e100e3e3fd97b805b8b9797072d3efb198a2c439af86f188","size":2052,"filename":"LjMYKwzuWRO32yBUWdj18dPNxCqxzel-VbQgj6hHAmM=.pem","location":"security-state-staging/intermediates/70791cac-3c98-4f75-990d-6954d0219a0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LjMYKwzuWRO32yBUWdj18dPNxCqxzel+VbQgj6hHAmM=","crlite_enrolled":false,"id":"7791a584-5e29-4235-b416-b854d3c3a85f","last_modified":1576536533864},{"schema":1576535928721,"derHash":"HSQiK17scf6Zvp1wD6X/cjEts+sPy0pPO8wTXaNsE1U=","subject":"CN=QuoVadis EU Issuing Certification Authority G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEXMBUGA1UEYQwOTlRSTkwtMzAyMzc0NTkxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYuMTcwNQYDVQQDDC5RdW9WYWRpcyBFVSBJc3N1aW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEc0","whitelist":false,"attachment":{"hash":"abc8779ce19e7e1b723ea4b7569c06c7bcf6a1d55f0595dbae8c152d800dbfb8","size":2406,"filename":"N4NzF7zbHULFki3CS8POhVnUVvnENOs7cQO__vGsV3I=.pem","location":"security-state-staging/intermediates/c4f3c05f-b7ad-4dee-a5ff-e59984747cdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N4NzF7zbHULFki3CS8POhVnUVvnENOs7cQO//vGsV3I=","crlite_enrolled":true,"id":"e52f87f2-6917-4b55-a618-7063e3c0e4d3","last_modified":1576536533861},{"schema":1576535924422,"derHash":"ON7T/2gnV5AIr0iH65aYo8+pJ/qO1Z8GugkPuaY+LXc=","subject":"CN=UZI-register Medewerker niet op naam CA G3,O=CIBG,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEzMDEGA1UEAwwqVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgbmlldCBvcCBuYWFtIENBIEcz","whitelist":false,"attachment":{"hash":"fdf235b099b1f37447f060ecf05a38a7f2f77b7ed689f4bd3554bcbb87e84429","size":2645,"filename":"io70m-V_59D3apVL30ZLD4BQjGAhNUmM2cLS-be8t_s=.pem","location":"security-state-staging/intermediates/43cbf583-ed6b-42a6-b390-579b0f581372.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"io70m+V/59D3apVL30ZLD4BQjGAhNUmM2cLS+be8t/s=","crlite_enrolled":false,"id":"3ff5743e-265f-4d7a-bebb-a4404e593665","last_modified":1576536533845},{"schema":1576535922917,"derHash":"neYdQGDkzEOIcYLd1eYWlGqqN7QxbumMQkSQFg9sjKo=","subject":"CN=Dodo Sign EV TLS ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHUxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSQwIgYDVQQDDBtEb2RvIFNpZ24gRVYgVExTIElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"d54a7cdc1a94f8a39a42db730bf1d72281d7628995592515709e572163799782","size":2454,"filename":"1DY43lDb7xlJzDvOVPtYU5JGz5PGXMK4hqwmC0tfYpM=.pem","location":"security-state-staging/intermediates/9ed8d2c1-00de-4ffd-89ed-0cb1c60b4487.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1DY43lDb7xlJzDvOVPtYU5JGz5PGXMK4hqwmC0tfYpM=","crlite_enrolled":false,"id":"65100e6a-48de-4e6d-b0f8-394031300eea","last_modified":1576536533840},{"schema":1576535920130,"derHash":"f79dtJF2OZMAdqr/ePyR3aDv7qhsrTihjZiUfXzTaUg=","subject":"CN=SZCA EV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgRVYgU1NMIENB","whitelist":false,"attachment":{"hash":"e03f3052b8789db5fcf3cdcc2c99f637a46dfc7e75b7e90821532f0139858a50","size":1756,"filename":"m9Fzkl4nfip9REp7mGOZ4yhSFF4FL4A--9o7eUTYzMQ=.pem","location":"security-state-staging/intermediates/7c9c9455-5d39-4925-822c-e353ba07464d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m9Fzkl4nfip9REp7mGOZ4yhSFF4FL4A++9o7eUTYzMQ=","crlite_enrolled":false,"id":"26dd89a7-d444-4647-be98-393c4cd93ed5","last_modified":1576536533836},{"schema":1576535917274,"derHash":"do0Y37412P5mcS+Yd2I9FRB3G1P1u4GcYkoVZI8f5Qk=","subject":"CN=S/MIME RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFTL01JTUUgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"c1068b3b2ea8a0e2711bbbcf2ee76ab8b8d91745c4ab08f6436801acbfbcd677","size":2150,"filename":"nIOaO62AxFMW0JOKjsy1DZselooknRqTfmOxDEfM0sQ=.pem","location":"security-state-staging/intermediates/d98a7be1-b9c7-4085-83fd-776f5f6cbfab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nIOaO62AxFMW0JOKjsy1DZselooknRqTfmOxDEfM0sQ=","crlite_enrolled":false,"id":"db0531c3-1ffd-4acb-bb7c-522369de5914","last_modified":1576536533830},{"schema":1576535915880,"derHash":"xoxVme3roVwRJUOBsB0V8rxif924XjOkkgfjH+HxXQ0=","subject":"SERIALNUMBER=202017,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE3","whitelist":false,"attachment":{"hash":"22151c5f67954f7df4f45c9f49de95bcf1b4fb76f2717dfe75902e496d782508","size":2333,"filename":"IKjMrd9-Ii4IPuS5zV5KhZDFudzyr4xsb9_Cb4VwSS4=.pem","location":"security-state-staging/intermediates/d09d4bcc-90b3-44ad-ba6f-0e1ec07943f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IKjMrd9+Ii4IPuS5zV5KhZDFudzyr4xsb9/Cb4VwSS4=","crlite_enrolled":false,"id":"02d05a88-8534-4a6e-bbe1-c9dfae1a53c4","last_modified":1576536533826},{"schema":1576535914365,"derHash":"kDfZCQpjZkzuREvoYzEJdlyQqeDgAyo2xDfjuru5Tt4=","subject":"CN=SSL X Y & Z EV TLS CA ECC R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHMxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSUwIwYDVQQDDBxTU0wgWCBZICYgWiBFViBUTFMgQ0EgRUNDIFIx","whitelist":false,"attachment":{"hash":"a6e5424ce1469b72faaa4f808cfc02460b40b4084b8f825f82f4d6e09ed3a17a","size":1280,"filename":"Tgm74K8EbuCBKCktudG9C_UXO5irwHL8qNYuxdJv1B8=.pem","location":"security-state-staging/intermediates/2a7c27bf-35c8-427f-bf91-b620e767a6e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Tgm74K8EbuCBKCktudG9C/UXO5irwHL8qNYuxdJv1B8=","crlite_enrolled":false,"id":"6878d4f8-2f0a-4abe-ae4b-6e1572598927","last_modified":1576536533821},{"schema":1576535909746,"derHash":"yikDieDYxipAg/Yoo59S/j84tzGZz/r3wDcjeKRA+2o=","subject":"CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN","whitelist":false,"attachment":{"hash":"02e23f9b06e438417e4e71c8b9fb42a8e2da31ad266ad1ca50792fd36d7251b9","size":1829,"filename":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem","location":"security-state-staging/intermediates/3aae7952-dcc2-4419-b53f-9eac4094c51b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=","crlite_enrolled":true,"id":"d9a71e99-a2ad-4f36-b975-79dca9dd44f0","last_modified":1576536533809},{"schema":1576535918743,"derHash":"yMP/XemO82kvOhlooT69KoYLs/SG7EVDT46Qc8SpzWc=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"f1224f7660297ee13d77fcf353555cc0aacb21730c122ed72881ccaaa2d49833","size":1536,"filename":"-HZ42z-6jzbfrf-8zoB-rhhWo8lWk9UMNlhPseiUpJs=.pem","location":"security-state-staging/intermediates/7b3da4b3-c177-4a6e-b7a9-062e872bf107.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HZ42z+6jzbfrf+8zoB+rhhWo8lWk9UMNlhPseiUpJs=","crlite_enrolled":true,"id":"a9f66876-d086-446f-a12c-e9ee7c486c5e","last_modified":1576536533804},{"schema":1576535908358,"derHash":"peM8KOMBOnH192CuOxZZUJAEPS7FIJ7FKQPE+60lja0=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"fa8a56ce9427949481f533247ba9c60a2399344aa8e931f631f8a47245217c4d","size":1894,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/ef48945b-24c4-41bf-afdf-5d30c4725e72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"0bac52a2-0949-48f2-abb2-f09ac245fd7f","last_modified":1576536533799},{"schema":1576535906937,"derHash":"r8oz2sVEOJ49Iw2xKti6PufBqeTM8Mr/1+FsKi81zuU=","subject":"CN=EC-GENCAT,OU=Serveis Publics de Certificacio ECV-1+OU=Vegeu https://www.catcert.net/verCIC-1  (c)03+OU=Generalitat de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHpMQswCQYDVQQGEwJFUzE7MDkGA1UECgwyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxLjAsBgNVBAsMJVNlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8gRUNWLTExNjA0BgNVBAsMLVZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlckNJQy0xICAoYykwMzEhMB8GA1UECwwYR2VuZXJhbGl0YXQgZGUgQ2F0YWx1bnlhMRIwEAYDVQQDDAlFQy1HRU5DQVQ=","whitelist":false,"attachment":{"hash":"68020eeafb9e19fcbbb5e650b27c54a86372fc89f55eae47738a248afb78dd7e","size":2251,"filename":"plh85tWIetVs5VcJnItuNLDy-XNaKKGitW1elxmTBeI=.pem","location":"security-state-staging/intermediates/a2444857-efdc-427c-b27e-3219f87d774f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"plh85tWIetVs5VcJnItuNLDy+XNaKKGitW1elxmTBeI=","crlite_enrolled":false,"id":"f0031ace-b829-4f9f-bc0d-2388295555dd","last_modified":1576536533795},{"schema":1576535905508,"derHash":"HQgt3e0W1OTkkWOJPZJEl468VCKPS4ESeLVaspnExI4=","subject":"CN=Symantec Class 2 Employee CA - G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Symantec Corporation,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEqMCgGA1UEAxMhU3ltYW50ZWMgQ2xhc3MgMiBFbXBsb3llZSBDQSAtIEc0","whitelist":false,"attachment":{"hash":"0adbea35abde14e3bb65a4cf56dcfeccf401e8fbcdc72a4dbc92c98f155ce6d0","size":2068,"filename":"4UyOSF_VGPv56JpY5z0BV-AVEbPZZ1xvB4dYq2yDeYM=.pem","location":"security-state-staging/intermediates/0694ff66-1242-44e8-ae1f-d5b3147fdaae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4UyOSF/VGPv56JpY5z0BV+AVEbPZZ1xvB4dYq2yDeYM=","crlite_enrolled":false,"id":"9f2c8f1c-ef21-472e-af7e-202f6d9d5d2f","last_modified":1576536533788},{"schema":1576535901047,"derHash":"sm6zEPj68O9bDQtxqmXsBQ+jreKRNPtDirZEAoj6bmc=","subject":"CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"c9fd1a02e33e6fb6aa966212b051bc01d9763d43207f96cd14bd4d2ab77caf5e","size":1666,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/3c324156-7f22-4755-bd9d-801f027fb229.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"a72a5e79-3626-409e-b043-cd067d75f18f","last_modified":1576536533781},{"schema":1576535898184,"derHash":"fLHw8QPU7oLZrUH2kCPFlCEfUoXDlOh9VL8EdGIsgmU=","subject":"CN=WebNIC Assured ID CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MFExCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEdMBsGA1UEAxMUV2ViTklDIEFzc3VyZWQgSUQgQ0E=","whitelist":false,"attachment":{"hash":"1f3fc0bed59983b040a2da0d18be6dc5f3fbb5f7e006a7b529e21595eb3fdce8","size":2060,"filename":"h2xdkR0tsowblgOKHnXoWz4HRd6TFdufPwK2kA5rZis=.pem","location":"security-state-staging/intermediates/a5ecf113-0411-470d-8892-a713b0040746.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h2xdkR0tsowblgOKHnXoWz4HRd6TFdufPwK2kA5rZis=","crlite_enrolled":false,"id":"08077971-3fdb-4c74-8da6-e19b41c8d0c3","last_modified":1576536533776},{"schema":1576535895349,"derHash":"6PoWk7ilm16fnt4fzEpIOv1BBeclV2MuTdQ12vQ2F18=","subject":"SERIALNUMBER=202003,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDM=","whitelist":false,"attachment":{"hash":"55f2cc3018c2099898a8f957abde4000e8cbf3bdd59e78af1b6baa2b915f7749","size":2337,"filename":"zorY5O9LVEFY683mlqVCo5VR0c9nqYIj4Rcn5gmEKbg=.pem","location":"security-state-staging/intermediates/7ce01a0e-78a4-4eb4-aa2b-49fcba780598.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zorY5O9LVEFY683mlqVCo5VR0c9nqYIj4Rcn5gmEKbg=","crlite_enrolled":false,"id":"5f7010e9-833f-4403-b47c-eb8cec371020","last_modified":1576536533772},{"schema":1576535896778,"derHash":"2qBDVAf6RMKKuTnmgjgTYFd5CThzqWZJrW4DsF0oYmw=","subject":"CN=Buypass Class 3 CA 2,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAzIENBIDI=","whitelist":false,"attachment":{"hash":"c3adfe4cbf2b1d7e9a605067bbec92b2d0430c2b1227c76517242204d270ea39","size":1849,"filename":"4ZQYrjRV6ScgdFiC0vn_Vy4QMIji7Tv-wkkEKEEQ6_I=.pem","location":"security-state-staging/intermediates/f4c24d5d-274d-468d-ad24-5434b0abf493.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ZQYrjRV6ScgdFiC0vn/Vy4QMIji7Tv+wkkEKEEQ6/I=","crlite_enrolled":true,"id":"a3808703-8211-46eb-9e79-a0dff56992fd","last_modified":1576536533765},{"schema":1576535892539,"derHash":"Y2WyXpKZtfOC6wBmhQYpCI682byzmPKGIhB2A8PBwn4=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - AAPP,OU=Certificados Digitales para la Administracion Publica,O=Firmaprofesional SA,C=ES","subjectDN":"MIGkMQswCQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTE+MDwGA1UECww1Q2VydGlmaWNhZG9zIERpZ2l0YWxlcyBwYXJhIGxhIEFkbWluaXN0cmFjaW9uIFB1YmxpY2ExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAwwaQUMgRmlybWFwcm9mZXNpb25hbCAtIEFBUFA=","whitelist":false,"attachment":{"hash":"b364c73112b234b54f2bbfcccc157ff6a6e56b1eb3642bba27e9a19807372305","size":2434,"filename":"hLz0sJLVz-CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=.pem","location":"security-state-staging/intermediates/088426b5-e7ac-44ac-ad09-766b42cb1607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hLz0sJLVz+CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=","crlite_enrolled":false,"id":"7a673029-7426-4fd2-aa04-1eead6f1048a","last_modified":1576536533761},{"schema":1576535891125,"derHash":"sU1QiQecHY92SduaXTzvsarAb2avxJIlxb4qoZ/UGjU=","subject":"CN=Entrust Certification Authority - L1N,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFO","whitelist":false,"attachment":{"hash":"2a107eb8056c22e82435858002ab7da59ecfe298d1cafd19ef86a74343e7a1bb","size":2207,"filename":"vJyqpf--OgJrh0WkGBWAggmVgZ5-o9t2KvyRdPxvIhs=.pem","location":"security-state-staging/intermediates/119f868d-4224-48fa-aca4-4e950d595c12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vJyqpf++OgJrh0WkGBWAggmVgZ5+o9t2KvyRdPxvIhs=","crlite_enrolled":false,"id":"b03bf780-0b68-4f48-9034-834ec2d038db","last_modified":1576536533758},{"schema":1576535893935,"derHash":"4MLr0fa61P6q4xoxB+aavukC2zi5374z8FcL2jSUwgo=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"5708992fbcf9481fd4654b18ba083f1c9225a94e396e861bbd592d38a6bee662","size":1626,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/48379e9d-8361-44d6-a4a7-eb48ae824248.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"d57a5e4c-dfdb-4c21-809b-ec5a60174f9c","last_modified":1576536533751},{"schema":1576535884083,"derHash":"IcrbfNgi6hO0luJau4FRx/sA77se5FijtKTzwWvDwW8=","subject":"CN=Digidentity BV PKIoverheid Burger CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MHUxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMRcwFQYDVQRhDA5OVFJOTC0yNzMyMjYzMTEyMDAGA1UEAwwpRGlnaWRlbnRpdHkgQlYgUEtJb3ZlcmhlaWQgQnVyZ2VyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"c8ff04eeee6bce152e5e98c99dca5cf921fce2820ba60817a872fed0cb518838","size":2532,"filename":"k5vPHt_MdNtfcnpCDwqfEjdm4LB7gBM9vX2iTb0kIPM=.pem","location":"security-state-staging/intermediates/2912fe8c-837e-4193-8500-db273f27fb75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5vPHt/MdNtfcnpCDwqfEjdm4LB7gBM9vX2iTb0kIPM=","crlite_enrolled":false,"id":"55d018b4-4eb7-4d7f-bdf4-e4553efdc451","last_modified":1576536533743},{"schema":1576535888279,"derHash":"w0bZE34FJUxu6smawvZ0igxdOvxre5seAMQK302FZV0=","subject":"CN=CBMM SMIME CA 2019,O=COMPANHIA BRASILEIRA DE METALURGIA E MINERACAO,POSTALCODE=38183-903,STREET=RUA CORREGO DA MATA S/N,L=ARAXA,ST=MINAS GERAIS,C=BR","subjectDN":"MIHAMQswCQYDVQQGEwJCUjE3MDUGA1UEChMuQ09NUEFOSElBIEJSQVNJTEVJUkEgREUgTUVUQUxVUkdJQSBFIE1JTkVSQUNBTzEOMAwGA1UEBxMFQVJBWEExFTATBgNVBAgTDE1JTkFTIEdFUkFJUzEgMB4GA1UECRMXUlVBIENPUlJFR08gREEgTUFUQSBTL04xEjAQBgNVBBETCTM4MTgzLTkwMzEbMBkGA1UEAxMSQ0JNTSBTTUlNRSBDQSAyMDE5","whitelist":false,"attachment":{"hash":"fe3d14bd5254e0a39c15a733dad05e8c9bcd3953ff1d49f2715e7a6102a14c44","size":1983,"filename":"JgrysEOXcXWHyUdTbvFXqUmyd60uxVfkiQtywlZv_nE=.pem","location":"security-state-staging/intermediates/7cc1e4ac-bbbc-42b5-bca1-eee58338135b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JgrysEOXcXWHyUdTbvFXqUmyd60uxVfkiQtywlZv/nE=","crlite_enrolled":false,"id":"6db211d5-5b49-42f3-a1ba-e139fb5d1836","last_modified":1576536533739},{"schema":1576535885503,"derHash":"Rb8E3KXeemM58d+DW8kBNFe0h/20MI5AgMZCPI5LJwU=","subject":"CN=DigiCert Transition ECC Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gRUNDIFJvb3Q=","whitelist":false,"attachment":{"hash":"ec9ca1e7872737de9eba06d02d6f59709cc00db0519cdf3d07ec29275c2360e7","size":768,"filename":"fKyaD_MVOHdQuouv2xwrwps_C7oWNiypOpD4TaLfXz4=.pem","location":"security-state-staging/intermediates/2a8d9c82-4e74-4311-aac0-3155dcba518c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fKyaD/MVOHdQuouv2xwrwps/C7oWNiypOpD4TaLfXz4=","crlite_enrolled":false,"id":"5b349da4-d246-4360-a09a-7028a7bb4f8c","last_modified":1576536533736},{"schema":1576535879770,"derHash":"dPVuGrM52D6A8vbiZPiUd1tCbIm0RwPfT6ijIxFjor0=","subject":"CN=Trustwave Domain Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGvMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE3MDUGA1UEAxMuVHJ1c3R3YXZlIERvbWFpbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"f3dfc731d826e0d0984812c4ea4c6e2485418da6eea5873875262b9282480123","size":1792,"filename":"D2BA_wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=.pem","location":"security-state-staging/intermediates/ddbc7552-96a7-4b2e-91f9-ffb3835036ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2BA/wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=","crlite_enrolled":true,"id":"ef25e7fa-720b-412c-bf83-aba79dc2aa8e","last_modified":1576536533732},{"schema":1576535878387,"derHash":"JCtpdC/LHlsqv5iJi5RXIYdUTltNmRF4ZXNiH2p0uCw=","subject":"CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2Mg==","whitelist":false,"attachment":{"hash":"6f399d9adcd59cadec87760241621f46a9daf25db3c442d61999a94042f01988","size":1951,"filename":"wrPDGkophQqo889HKhFp_3G0FlefakSC7HdEuD35iKw=.pem","location":"security-state-staging/intermediates/4c25a27e-2c0e-442f-893f-37ea349bb645.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrPDGkophQqo889HKhFp/3G0FlefakSC7HdEuD35iKw=","crlite_enrolled":false,"id":"f1dcb796-9a85-4f2d-a0fb-9b3f7b4c9089","last_modified":1576536533728},{"schema":1576535877021,"derHash":"3gqS5UNbYTII3ENezHFYvyj0IKk+CpHVlllyBT9SNUk=","subject":"CN=Cleverbase ID PKIoverheid Burger CA - G3,O=Cleverbase ID B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRswGQYDVQQKDBJDbGV2ZXJiYXNlIElEIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTY3NDE5OTI1MTEwLwYDVQQDDChDbGV2ZXJiYXNlIElEIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"43ba7b18219f05d870af64b48aedb5b0e035eedf35ae2f0fec42aba1789e5955","size":2532,"filename":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps_pS8BKM=.pem","location":"security-state-staging/intermediates/c27d2459-6f95-4c85-9ff7-8e14e05a2150.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps/pS8BKM=","crlite_enrolled":false,"id":"b6549aff-91bd-4c31-8324-526c379bbdfe","last_modified":1576536533724},{"schema":1576535875604,"derHash":"1sP8STus0d+KG6MPSuJiVLKkUo5IdggerMahagkKo2o=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"baf3c774613f8942857b2ad6d40766ac8a7a67fdbc624e9c4a17b50ca45bddd5","size":1792,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/f8d538de-5cc7-4991-8270-0a2d1d7d3b8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"b1366715-e202-4ce8-9018-b39313524fe8","last_modified":1576536533719},{"schema":1576535871360,"derHash":"aitFjsogSy3av04m1G/Q+bvoZ9p6rDVTJROm5aT8ylg=","subject":"CN=TBS X509 CA Persona 3 (ECC),O=TBS INTERNET Ltd.,L=Douglas,ST=Isle of Man,C=IM","subjectDN":"MHcxCzAJBgNVBAYTAklNMRQwEgYDVQQIEwtJc2xlIG9mIE1hbjEQMA4GA1UEBxMHRG91Z2xhczEaMBgGA1UEChMRVEJTIElOVEVSTkVUIEx0ZC4xJDAiBgNVBAMTG1RCUyBYNTA5IENBIFBlcnNvbmEgMyAoRUNDKQ==","whitelist":false,"attachment":{"hash":"944dcf6a8c1ee8957b2a174f54675ec285a093b949a186d434f20d91f13a1365","size":1288,"filename":"r7xCTXIT-QWYjyxg-QtDiWm-o-0SPzjo9qjik4pHEhA=.pem","location":"security-state-staging/intermediates/ad0081bd-1851-4d54-91a9-d1a6326f8a6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r7xCTXIT+QWYjyxg+QtDiWm+o+0SPzjo9qjik4pHEhA=","crlite_enrolled":false,"id":"62e2b79f-f3c1-4952-b73d-ced0186eca23","last_modified":1576536533710},{"schema":1576535872699,"derHash":"Av7Tui5qeEOjGKmBvIRwYf0oLZ6IR/+p9U14W2uB1vM=","subject":"CN=Secure Site Pro CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVNlY3VyZSBTaXRlIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"5c18d3156506cd5355f4d18f1913e2bd2818958dce99153a650e7f3195877f83","size":1829,"filename":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem","location":"security-state-staging/intermediates/69603c20-57db-47e4-8db1-78012f614eb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=","crlite_enrolled":true,"id":"047bbf71-0e60-47f1-88fb-c8654e3e2fd6","last_modified":1576536533706},{"schema":1576535869920,"derHash":"3ZxUXWtkXCv74bbstgN2AGRk6XuxMEt5eM/oOkCZsic=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"22de8a87722574e5bae64f227adae54749a53ce2eb2247106a3a9a9137cc429b","size":2292,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/1bba8b1c-fe09-452a-8030-5299448f1616.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"ab862fa5-0269-4007-9bfc-154dc88f81fc","last_modified":1576536533702},{"schema":1576535868368,"derHash":"/s6a2nqknU/qnv8SNUIJWogMAE/Wkz+TZLArLjV06jg=","subject":"CN=Cybertrust Japan SureServer EV CA G3,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEtMCsGA1UEAxMkQ3liZXJ0cnVzdCBKYXBhbiBTdXJlU2VydmVyIEVWIENBIEcz","whitelist":false,"attachment":{"hash":"442ad2ef3f029c8ae0616647479fbe53d99e0e9ed017c893d2b5952cbf146f8f","size":1772,"filename":"zJoepoy-7XeJoRmjbR7_i8oZ1WEujOKGTD9NNM0uWHM=.pem","location":"security-state-staging/intermediates/5a528d23-16fc-4550-b70f-7b7202891213.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zJoepoy+7XeJoRmjbR7/i8oZ1WEujOKGTD9NNM0uWHM=","crlite_enrolled":true,"id":"9aa2bac0-292b-4549-8d79-e82841fe7262","last_modified":1576536533695},{"schema":1576535866783,"derHash":"9hSuKxAUhPFfZvTdpW7m60InKPF52UOZ7eGawdhai9M=","subject":"CN=Secure Site CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVNlY3VyZSBTaXRlIENBIEcy","whitelist":false,"attachment":{"hash":"ea9ed009cee9ad525cea31b09520df7f3327215055a5f8d38c27bc5eed479ab1","size":1825,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/f1eaf41b-8ddc-4230-8adb-5920c9c4ef35.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"0558d609-3bfb-4844-bf88-b93e9bd0dbdb","last_modified":1576536533692},{"schema":1576535863986,"derHash":"sXdPmya04tX3UXE2AP/rFjs0y3oUwsB5cE6VNk+8ykk=","subject":"CN=InCommon RSA Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBSU0EgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"a3ecf6ad18dd20e2bb3d0213cf639e3748842228ce2c96008b3f6da877409bcf","size":2129,"filename":"b1JA6-4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=.pem","location":"security-state-staging/intermediates/f130c14b-f812-4c68-9577-4859f57b2126.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b1JA6+4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=","crlite_enrolled":true,"id":"22533613-9108-4af4-8604-a14d14de2ada","last_modified":1576536533688},{"schema":1576535860850,"derHash":"txawif5OU9Gi73ulesheaOxyLPYQUsJaWWJq07FcX0A=","subject":"CN=Qu\u00e1litas Compa\u00f1\u00eda de Seguros S.A. de C.V.,O=QUALITAS COMPA\u00d1IA DE SEGUROS S.A. DE C.V.,POSTALCODE=05200,STREET=JOSE MARIA CASTORENA No. 426\\, SAN JOSE DE LOS CEDROS,L=CUAJIMALPA,ST=CIUDAD DE MEXICO,C=MX","subjectDN":"MIH4MQswCQYDVQQGEwJNWDEzMDEGA1UECgwqUVVBTElUQVMgQ09NUEHDkUlBIERFIFNFR1VST1MgUy5BLiBERSBDLlYuMRMwEQYDVQQHEwpDVUFKSU1BTFBBMRkwFwYDVQQIExBDSVVEQUQgREUgTUVYSUNPMT0wOwYDVQQJEzRKT1NFIE1BUklBIENBU1RPUkVOQSBOby4gNDI2LCBTQU4gSk9TRSBERSBMT1MgQ0VEUk9TMQ4wDAYDVQQREwUwNTIwMDE1MDMGA1UEAwwsUXXDoWxpdGFzIENvbXBhw7HDrWEgZGUgU2VndXJvcyBTLkEuIGRlIEMuVi4=","whitelist":false,"attachment":{"hash":"b4cc258aa16607dd839fa8f83252a629b07c1acdd5fa87f696c466297ca3c432","size":2093,"filename":"lxQankog6Tf_kuy51v0yHPp7VAlCmH0rA0RAvunUR2U=.pem","location":"security-state-staging/intermediates/85c27bd1-db7e-4507-b140-76bd7f1708d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lxQankog6Tf/kuy51v0yHPp7VAlCmH0rA0RAvunUR2U=","crlite_enrolled":false,"id":"8aff6d32-3b8c-46c2-82fd-fe7efd828486","last_modified":1576536533684},{"schema":1576535862557,"derHash":"3MVmIv8NIJH7n/yfZ8LTUEmWacYpjajemsQaSIu52eQ=","subject":"CN=KIBSTrust Issuing CA for e-Seals,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA+OU=KIBS AD Trust Services,O=KIBS AD Skopje,C=MK","subjectDN":"MIHLMQswCQYDVQQGEwJNSzEXMBUGA1UEChMOS0lCUyBBRCBTa29wamUxFjAUBgNVBGETDU5UUk1LLTU1Mjk1ODExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UECxMWS0lCUyBBRCBUcnVzdCBTZXJ2aWNlczEpMCcGA1UEAxMgS0lCU1RydXN0IElzc3VpbmcgQ0EgZm9yIGUtU2VhbHM=","whitelist":false,"attachment":{"hash":"8d7c38f00343d8c6a7932df61962f01724d42231ff99cb9d43e41b71980f219b","size":2418,"filename":"BHGCDczb35jf24uF9UQUIWbl37u3KH6m3tAW-DvKkBs=.pem","location":"security-state-staging/intermediates/aec25152-6938-41ba-83be-9d485724a1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BHGCDczb35jf24uF9UQUIWbl37u3KH6m3tAW+DvKkBs=","crlite_enrolled":false,"id":"222af1d2-d2b2-43a7-bd2e-b11bafc80a2f","last_modified":1576536533680},{"schema":1576535859306,"derHash":"rVTYl5qhNun1aOASNKzKaMgabwD5YppxknU/dnUrymk=","subject":"SERIALNUMBER=D-059888-N,CN=Entitat de Certificaci\u00f3 de l'Administraci\u00f3 P\u00fablica Andorrana-19,O=M.I. Govern d'Andorra,L=Andorra la Vella,C=AD","subjectDN":"MIGqMQswCQYDVQQGEwJBRDEeMBwGA1UECgwVTS5JLiBHb3Zlcm4gZCdBbmRvcnJhMRMwEQYDVQQFEwpELTA1OTg4OC1OMRkwFwYDVQQHDBBBbmRvcnJhIGxhIFZlbGxhMUswSQYDVQQDDEJFbnRpdGF0IGRlIENlcnRpZmljYWNpw7MgZGUgbCdBZG1pbmlzdHJhY2nDsyBQw7pibGljYSBBbmRvcnJhbmEtMTk=","whitelist":false,"attachment":{"hash":"2439a9af8e105590273a7f8dabfeff7fe23363d87885f4c5d124c95547f557cc","size":2674,"filename":"8uKsf7ZcawPyLn1CLEss26WHE7eXoc3NID0KIkebeE0=.pem","location":"security-state-staging/intermediates/95f44cc1-b11a-4c39-a5a3-792b30b17a70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8uKsf7ZcawPyLn1CLEss26WHE7eXoc3NID0KIkebeE0=","crlite_enrolled":false,"id":"20a21317-92a5-4f06-a7ae-6ef34f6c2524","last_modified":1576536533677},{"schema":1576535857717,"derHash":"oTggpzh7360gRGPvqSFkFmObfnPDHcL0mfU/zU1NJcQ=","subject":"CN=GlobalSign CA 2 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDIgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"db9fd8cd368a78c90dd388eabe22ac3ee5212f6971941d7ade0a0962870b2211","size":1670,"filename":"VUXuJLG7arucp8FV8pQeMxfw0abKhW_SszycDbgPGng=.pem","location":"security-state-staging/intermediates/5aeeca9a-d281-461f-ad3c-0940396f589d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VUXuJLG7arucp8FV8pQeMxfw0abKhW/SszycDbgPGng=","crlite_enrolled":false,"id":"9e27f27f-9ae6-4c4d-9359-109637b37bd6","last_modified":1576536533673},{"schema":1576535854905,"derHash":"xFG++6hwFOzVeFHR5oJAPjymCWN3Ouf6oA/9b/rIsqM=","subject":"CN=Apple Public Server ECC CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgRUNDIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"159650c695404e21baee3c84c9de3b14321fc786ae0d79ab3c53f0265e742c3e","size":1179,"filename":"AW191Or9_rr7bm1xPdsvaWeUUt-lfxY77hstOrTylbc=.pem","location":"security-state-staging/intermediates/28078966-bfa4-4d0f-b3af-2e868d081f40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AW191Or9/rr7bm1xPdsvaWeUUt+lfxY77hstOrTylbc=","crlite_enrolled":false,"id":"b0ae8271-61f1-4d4d-89b4-39a4305bde48","last_modified":1576536533666},{"schema":1576535851987,"derHash":"lBuK7kvPHv6wR1+yef3dzzf8WyD2ToQs2doHcLFX6E0=","subject":"CN=QuoVadis Swiss Regulated CA G2x,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH8xCzAJBgNVBAYTAkNIMSYwJAYDVQQKDB1RdW9WYWRpcyBUcnVzdGxpbmsgU2Nod2VpeiBBRzEeMBwGA1UEYQwVTlRSQ0gtQ0hFLTExMi4yMTAuMzQ5MSgwJgYDVQQDDB9RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzJ4","whitelist":false,"attachment":{"hash":"6908125b6436fe504186ad05f08f9ca8c51425e59416e586f9f37633a09be7f3","size":2564,"filename":"17usyAuuwq4vUDVkKKvhX_ccE7giLJSP0KwWdGbb-0k=.pem","location":"security-state-staging/intermediates/4b426595-1c8d-43aa-aec0-68f7d34d8ff0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"17usyAuuwq4vUDVkKKvhX/ccE7giLJSP0KwWdGbb+0k=","crlite_enrolled":false,"id":"f756cd0f-1e3b-4dc2-b9ec-0b4d23c9557c","last_modified":1576536533658},{"schema":1576535850582,"derHash":"dOswenisfoVwzBuuHFEQKmBTyW8zMtcDKFp0O8vTXZ4=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"25db1a27864552963eca82334bf17c5f8a3fcd5136a534321802fe7faa031628","size":1878,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/3b4e1c8b-6df4-468d-811d-6f9716be92d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"f1c185b6-80ef-454d-904b-6d48cbff1b6f","last_modified":1576536533655},{"schema":1576535847703,"derHash":"DuTa9xqF2ELSP0kQ/UyQm3Jxhhkx8dX+rIaCJfUnAOI=","subject":"CN=Entrust Certification Authority - L1C,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFD","whitelist":false,"attachment":{"hash":"47190803db64ab25e51ba6527fc97063b52701bffd05aa298e45e7e5dabf9efd","size":1780,"filename":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS-Ui0bQ94=.pem","location":"security-state-staging/intermediates/af52194d-e2db-45ba-a919-c7d2518b2eb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS+Ui0bQ94=","crlite_enrolled":false,"id":"af3a7f96-b279-4002-b898-ea1e04bf6025","last_modified":1576536533651},{"schema":1576535844835,"derHash":"h7utTJFdVtLnTwRNciC5V9SoU9mhgYtS82JUF9tlXjo=","subject":"CN=DigiCert SHA2 Assured ID CA - G1,OU=DigiCert Organizational E-Mail Certificate,O=DigiCert Inc,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQLEypEaWdpQ2VydCBPcmdhbml6YXRpb25hbCBFLU1haWwgQ2VydGlmaWNhdGUxKTAnBgNVBAMTIERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQSAtIEcx","whitelist":false,"attachment":{"hash":"87c92053d9938823a56b4253352209b1d9d45591fa0b90354ba17bc2dd0e6c6a","size":2121,"filename":"3iSMgpA0YuQJvvYFlTcCIByASHD5ze38kI_HcGk_5V0=.pem","location":"security-state-staging/intermediates/16516982-ac58-46e6-b7ac-4ff348b045ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3iSMgpA0YuQJvvYFlTcCIByASHD5ze38kI/HcGk/5V0=","crlite_enrolled":false,"id":"f9614db0-e95f-45ec-9e6a-44a7d7451bb4","last_modified":1576536533644},{"schema":1576535843434,"derHash":"Yt3PoFpjrPt8IHCkNSY/ImvyA5/BHRzPxzZ5LkRmmDs=","subject":"CN=BitCert RSA Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for BitCert,O=\u6210\u90fd\u6570\u8bc1\u79d1\u6280\u6709\u9650\u516c\u53f8,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MIHLMQswCQYDVQQGEwJDTjEQMA4GA1UECBMHU2ljaHVhbjEQMA4GA1UEBxMHQ2hlbmdkdTEnMCUGA1UECgwe5oiQ6YO95pWw6K+B56eR5oqA5pyJ6ZmQ5YWs5Y+4MTYwNAYDVQQLEy1Db250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIEJpdENlcnQxNzA1BgNVBAMTLkJpdENlcnQgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"50c510f25b6df7566b8bdeb308314bae9b7f601ea6c791b72f5f9e4fc19c283d","size":2288,"filename":"zdcDW7Ob8cQk0OUfB1X4d7hxi0MhL_P6fBOYC60fvWs=.pem","location":"security-state-staging/intermediates/aedc46d5-227a-4543-b3d2-4bea3bd28a2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdcDW7Ob8cQk0OUfB1X4d7hxi0MhL/P6fBOYC60fvWs=","crlite_enrolled":false,"id":"8ee705aa-0876-4478-adde-0bfd21573307","last_modified":1576536533640},{"schema":1576535841997,"derHash":"bGZXjclq0T63toi9wJ20ctX78Ds70hMJZlBSqIbX6bQ=","subject":"CN=Apple Public Server RSA CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgUlNBIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"961515735a466b16075e55c7da361418ee043d9647f04c36b42e00fdd5304fa3","size":2028,"filename":"xXDXs35ozcjwk0JgHOmIO-JXQxta1bb9rQ14FVEqdWE=.pem","location":"security-state-staging/intermediates/f51e2efe-1586-43cb-8513-42d7587139fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xXDXs35ozcjwk0JgHOmIO+JXQxta1bb9rQ14FVEqdWE=","crlite_enrolled":false,"id":"b906d89b-573b-4733-920c-a0796309ee22","last_modified":1576536533636},{"schema":1576535840600,"derHash":"exZmp5kc/Ci2TaNx8XFB29b1Mh8huDoaZY1qQQ03TgU=","subject":"CN=EID-SK 2011,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGExCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRQwEgYDVQQDDAtFSUQtU0sgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVl","whitelist":false,"attachment":{"hash":"89a20e4b68a5ddbe58c0227ee52ef3440a11519c35dff5be41948baf0eafaae1","size":1792,"filename":"TH9WdGlVHNg84FAVfGSYy4E-hezWZlRfg3kL9-E9txs=.pem","location":"security-state-staging/intermediates/3b232e22-80b5-4310-a0f3-ffe15d3325c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TH9WdGlVHNg84FAVfGSYy4E+hezWZlRfg3kL9+E9txs=","crlite_enrolled":false,"id":"2294a4d1-a1d8-4963-beaf-58bf195a5728","last_modified":1576536533632},{"schema":1576535839167,"derHash":"Vk28anZVD9LU9LrGRIoRV7M8vY4LP9dtchB1QJZKhbU=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"fde7df84fbe0edfbcf96535bc97d6525b3869212e9cada774905831935692c2f","size":1821,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/003fd367-2188-4dcf-9002-58cb555aca5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"72652e1b-dcd1-4778-8e82-d9e0cadea9d3","last_modified":1576536533628},{"schema":1576535849224,"derHash":"m7XMhCevJ2vyFqdIrSV4XResur3eQoLmBtpSYs2UDzg=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"25ce176fa214e6e0fdebb7a1832dce5580bd8c52cea81154114f3b6cd553dbe6","size":1459,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/12de7d43-38fd-47e4-abd4-cf2fd4a2bc1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":true,"id":"884a0690-da65-400c-9fab-d03457385b58","last_modified":1576536533624},{"schema":1576535836297,"derHash":"z4iRXPmWkywrTL4wOQdtEZu3KLTzHkm2OlAi/mVImhI=","subject":"CN=AffirmTrust Extended Validation CA - EV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjE=","whitelist":false,"attachment":{"hash":"59f97b75ff4aa85380593bee67266d9df3536810543f8906024dce481dec03a9","size":1662,"filename":"xAD7ZgT8h1RQOQsz_6DxwKe17_oiwt-Jy6y1G1Akw00=.pem","location":"security-state-staging/intermediates/2d7384a5-c21e-4c9c-bab1-09bac6329f82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xAD7ZgT8h1RQOQsz/6DxwKe17/oiwt+Jy6y1G1Akw00=","crlite_enrolled":true,"id":"de2d8ef8-81da-4d27-98dc-2aac5604a760","last_modified":1576536533616},{"schema":1576535831521,"derHash":"qpQuUStCh9W+7IWhxagcLd0TazzHBltoMPBoURBTBBI=","subject":"CN=FedEx Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=FedEx Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRmVkRXggQ29ycG9yYXRpb24xPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UEAxMWRmVkRXggUHVibGljIE9ubGluZSBDQQ==","whitelist":false,"attachment":{"hash":"5d96dd1daba1201584f62db2c1b9025798e5aaf6fa68c96d8f9fcbf8cba48a3a","size":2052,"filename":"_HtX-jLmvyksCJaoiBQGgnIqDG05H_g_Wm2PUhssqrc=.pem","location":"security-state-staging/intermediates/e46a68fc-41f3-4b6e-bdff-866d25e359cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/HtX+jLmvyksCJaoiBQGgnIqDG05H/g/Wm2PUhssqrc=","crlite_enrolled":false,"id":"b8528abc-baa8-44b9-bd18-905904ccc434","last_modified":1576536533605},{"schema":1576535830116,"derHash":"Pr9f/sWC0nxpPRvDAQSmO7v8NlLHipUCfpG3+I2sY0U=","subject":"SERIALNUMBER=ZZZZZZV0,CN=Siemens Internet CA V1.0,OU=Copyright (C) Siemens AG 2011 All Rights Reserved,O=Siemens,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaVjAxOjA4BgNVBAsMMUNvcHlyaWdodCAoQykgU2llbWVucyBBRyAyMDExIEFsbCBSaWdodHMgUmVzZXJ2ZWQxITAfBgNVBAMMGFNpZW1lbnMgSW50ZXJuZXQgQ0EgVjEuMA==","whitelist":false,"attachment":{"hash":"74b68a212aa3556e43f111197ff49f0b49384f017d5a0bf0f7691f07af8f80df","size":1642,"filename":"rQOD_jrRH5t2JxCWlRagCWxoDrKXhsLELQ-GrW6LeRI=.pem","location":"security-state-staging/intermediates/a3a0159e-a06f-40cb-a535-7707bef95b3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQOD/jrRH5t2JxCWlRagCWxoDrKXhsLELQ+GrW6LeRI=","crlite_enrolled":false,"id":"0ed532dd-1eea-4b09-8cf1-7d776e31478a","last_modified":1576536533601},{"schema":1576535828734,"derHash":"z4qG5oA2cAGUyxeihzJWsMP0+HmxHpze2X+b2Um72s8=","subject":"SERIALNUMBER=202010,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEw","whitelist":false,"attachment":{"hash":"c489aec141409cafd97e5f1081ec7447e97a8cc115dee8bf2856b9cfdc6b6a20","size":2333,"filename":"1Gj2oYHo5bx6UB6N1ZWaYH9p_JKTNdy9svwFXrtPOrE=.pem","location":"security-state-staging/intermediates/39a5b788-3acd-4c5a-95dd-da0e047288c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Gj2oYHo5bx6UB6N1ZWaYH9p/JKTNdy9svwFXrtPOrE=","crlite_enrolled":false,"id":"5c92465d-48b2-42ad-883f-f60b197d738b","last_modified":1576536533597},{"schema":1576535827277,"derHash":"f3VdwrnumesC1xyxgFBZqqu16z6FWNyowJodDeJY12c=","subject":"CN=DigiCert PKI Platform Class 3 Shared SMIME Organization CA,O=DigiCert\\, Inc.,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFDMEEGA1UEAxM6RGlnaUNlcnQgUEtJIFBsYXRmb3JtIENsYXNzIDMgU2hhcmVkIFNNSU1FIE9yZ2FuaXphdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"962146c4389406a5837448504ee8917c15a34a91f062837c24aae8379a53f649","size":2129,"filename":"kIMb0w91fvtIKY9SWGVWsLBdmzYR7ulapDwjSpj_sUw=.pem","location":"security-state-staging/intermediates/99ab416c-3ec0-4538-882f-0a8f848c39ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kIMb0w91fvtIKY9SWGVWsLBdmzYR7ulapDwjSpj/sUw=","crlite_enrolled":false,"id":"085b8109-df05-4f60-9f5b-24a135c8e502","last_modified":1576536533594},{"schema":1576535822371,"derHash":"2HqtYV/nwjhQMiRNCM3+BusAVnWqGJLW5bgngPGfuH8=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"3e9b27c1653abd1f49b5189ccb18ea591194a9d481d1174341a7cfca58f3cecc","size":2239,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/401c0af2-b653-4020-b4fc-748c2eb73eb0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"e3ea9bb3-49c5-4737-8811-c946f0d12a7f","last_modified":1576536533586},{"schema":1576535825729,"derHash":"m+2DMyEROjZtb2zzecVtTY5w84AarBScRn3VR7lbgDA=","subject":"SERIALNUMBER=202001,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDE=","whitelist":false,"attachment":{"hash":"1a6c080cdf1e6925db74f55875bcc4c9b4dee5cdc065acb74b17d9d378823ff6","size":2337,"filename":"wTIgzVyDobl0UXdknuaJLn7IjhxQWstWSpX0gYZxwSc=.pem","location":"security-state-staging/intermediates/33367ce4-c7a5-4a00-9a19-f5a75f62ec4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wTIgzVyDobl0UXdknuaJLn7IjhxQWstWSpX0gYZxwSc=","crlite_enrolled":false,"id":"df664d63-b5f5-4b4c-9421-c7442a5e3d1f","last_modified":1576536533583},{"schema":1576535820935,"derHash":"M+8VHvsI0cRPuFzD8j7GhzAU6fiBaRvUk4t/JRWAtpQ=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"41d424d3da88a84293ad6feed475c1a513b2a30cd740e6d86c7ec641141bd50e","size":1313,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/e4bdfc10-cf3c-4f1d-8566-19d3353552f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"59fa6d74-626e-410e-a605-3508e34fb522","last_modified":1576536533576},{"schema":1576535815181,"derHash":"ScWCcPcPG+C3wZ0bwsLrxB4v3g1IhdT6Ze8DcKzsegA=","subject":"CN=Trustwave Extended Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE5MDcGA1UEAxMwVHJ1c3R3YXZlIEV4dGVuZGVkIFZhbGlkYXRpb24gU0hBMjU2IENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"8d10fdb281e7d06718cfb07684595820b2ba91fe916794f089027ecd08741ae9","size":1808,"filename":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=.pem","location":"security-state-staging/intermediates/ce6b6bbd-6319-4603-8b73-cca667b9433f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=","crlite_enrolled":true,"id":"9ae59d4e-7e03-474f-941d-3981e7735030","last_modified":1576536533565},{"schema":1576535813752,"derHash":"cqxCi7cV313Br4dXkwjozC6/pYhoa1Zykv1w7rD+6Lc=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"9f2cd48065c65b19c1567155587ee5b2ea12096fc059100e9dae031f046e8223","size":2247,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/80b2e6eb-6ab0-45b0-934a-0bd551103c17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"5c8d7aa0-ea1f-4169-aad6-87d9f174d9b1","last_modified":1576536533561},{"schema":1576535810909,"derHash":"m1P2nYRHsBsB5FZbhT4oi2y4IpHagqW0G7wVwvOtZUg=","subject":"CN=OneSignSSL RSA EV Secure Server CA,OU=Controlled by Sectigo exclusively for One Sign Pte. Ltd.,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIHCMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjFBMD8GA1UECxM4Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBPbmUgU2lnbiBQdGUuIEx0ZC4xKzApBgNVBAMTIk9uZVNpZ25TU0wgUlNBIEVWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d526be8dbfd4f8a1f4fa720b72484238615a1d43b39f4d9644bcd8a645363d48","size":2276,"filename":"N8OD-hIuhMaCwngPwhlrWu8ly-IEZbRt_gL0S4FH9GU=.pem","location":"security-state-staging/intermediates/580704b8-c2d3-4b2b-ac3f-4f4088f817ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8OD+hIuhMaCwngPwhlrWu8ly+IEZbRt/gL0S4FH9GU=","crlite_enrolled":false,"id":"2f63765d-9e3e-4f03-9bc9-57612db1fbf6","last_modified":1576536533557},{"schema":1576535812375,"derHash":"Qx9jChtd5vD/G3MxjQGqqf5KEl8wJsHMMOJc9KXLuj8=","subject":"CN=BitCert RSA Domain Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSowKAYDVQQDEyFCaXRDZXJ0IFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"6ffbd17583806cfd9f9461e1213cba2e87fa5d6150d467d60f1bea3a6057e527","size":2129,"filename":"cNE8mPePscWLEKBJVbelkXANOrn4fk_NgWvF39Zm9FU=.pem","location":"security-state-staging/intermediates/082754db-89db-4a21-b19c-beb0cea8ad0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cNE8mPePscWLEKBJVbelkXANOrn4fk/NgWvF39Zm9FU=","crlite_enrolled":false,"id":"67e2adbf-676e-4de8-b707-4616d1daef65","last_modified":1576536533550},{"schema":1576535808036,"derHash":"Fq1RJaCVWvAmQhhUXnSCfiw5oDLV0L9mWxfDv5nSNJY=","subject":"CN=BitCert ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for BitCert,O=\u6210\u90fd\u6570\u8bc1\u79d1\u6280\u6709\u9650\u516c\u53f8,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MIHLMQswCQYDVQQGEwJDTjEQMA4GA1UECBMHU2ljaHVhbjEQMA4GA1UEBxMHQ2hlbmdkdTEnMCUGA1UECgwe5oiQ6YO95pWw6K+B56eR5oqA5pyJ6ZmQ5YWs5Y+4MTYwNAYDVQQLEy1Db250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIEJpdENlcnQxNzA1BgNVBAMTLkJpdENlcnQgRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"0bf8e9bb5d7d37aa96702157cb3f2294932a83c08a9d1b6c2b943e541fc807fb","size":1451,"filename":"7tz57vvcF4mLPHC5kUb-dwbT09hTvQJZuiNDyCG4Swc=.pem","location":"security-state-staging/intermediates/ae19039d-8a97-4be8-9215-27223a283e1e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7tz57vvcF4mLPHC5kUb+dwbT09hTvQJZuiNDyCG4Swc=","crlite_enrolled":false,"id":"402c61da-df23-4bb5-9b05-933a5fcc8719","last_modified":1576536533546},{"schema":1576535806599,"derHash":"f9zjv0EDwmhLOtu1eSiEvUXHUJTCF3iIY5UDRveckKM=","subject":"CN=Let's Encrypt Authority X1,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMQ==","whitelist":false,"attachment":{"hash":"bbe724ea37646109cfdf462e31c712ce1860c42f0c33c899f330a39c44c47cc9","size":1674,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/ca8a4374-c876-45a5-a7e5-93bbf9babd0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"0638efef-e35a-421b-af37-979d39b08cbc","last_modified":1576536533543},{"schema":1576535805086,"derHash":"U2dpLs5it1jQTZt+bfsNswf4WevGpstfd/8kVh18wAQ=","subject":"CN=USERTrust RSA Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e824527655464dd31a8c05c4d0472f598ceba1ccfa4c8b6f1f82aacae141213f","size":2174,"filename":"8E_u4IJLStWPqhVEn4td_2Ae6WYCii1AmJC2dgTCj1s=.pem","location":"security-state-staging/intermediates/81cfbb36-b77a-44c7-b9d5-e2c1a3bdf3fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8E/u4IJLStWPqhVEn4td/2Ae6WYCii1AmJC2dgTCj1s=","crlite_enrolled":true,"id":"e80e13e0-9ae0-4852-86c7-1c266fe0906a","last_modified":1576536533536},{"schema":1576535803675,"derHash":"Hk/DTSbgeT1VnjIv4RHx4ZqdLjS8JdPEJ7AypI0sW2o=","subject":"CN=Encryption Everywhere ECC DV TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLDAqBgNVBAMTI0VuY3J5cHRpb24gRXZlcnl3aGVyZSBFQ0MgRFYgVExTIENB","whitelist":false,"attachment":{"hash":"b2e5666f89f6d4fcf8a08fb74f9c91de3fd68ec696f62a873e86e4f8f9820119","size":1402,"filename":"Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54_cJM=.pem","location":"security-state-staging/intermediates/e826a1f2-a878-4c8b-a4fe-e7e952f31ace.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54/cJM=","crlite_enrolled":false,"id":"088948ef-fc2d-4e5d-8116-9d744c2d517a","last_modified":1576536533532},{"schema":1576535802266,"derHash":"X6UFXyQNl2NCYTkfBp1nNWiQpmaZrDU8h5bAIIfD9iU=","subject":"SERIALNUMBER=202005,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDU=","whitelist":false,"attachment":{"hash":"a1d2ba4c6e094c13518e23442e78edfc498b63f04ef46e0ff1d638ec4611959f","size":2337,"filename":"yXbKpkevIJYstXu3Y8aQhnKxJCsgkPusJy_04jWrd9k=.pem","location":"security-state-staging/intermediates/da35fd7e-cb9e-45b0-b785-a3544f24944a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yXbKpkevIJYstXu3Y8aQhnKxJCsgkPusJy/04jWrd9k=","crlite_enrolled":false,"id":"719da943-9eca-48e7-a6f7-8fabfaa691eb","last_modified":1576536533527},{"schema":1576535800599,"derHash":"EaJ2cYciZURctyWOsoRO5hTRR3e59vc76VMhIvIfrQ0=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"4b63dd60cab5b91793fb269517be9ffd9aadf4f0d673182ce5c573d60f93a5f0","size":1792,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/219df0bb-3a25-4e71-9a82-6e5b4dff8b72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"fa314713-1710-4998-8e47-324d8a08bbcb","last_modified":1576536533524},{"schema":1576535799214,"derHash":"PX/nnGA3ySsvcebuMuqOSJe+DlJHE/pXZv5QcKuuNbQ=","subject":"CN=OneSign OV Code Signing CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MHcxCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSMwIQYDVQQDExpPbmVTaWduIE9WIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"d0d86e927bb45144063cad68a993a2989fc62706735c52f3bfe6e4f30652c741","size":2113,"filename":"5nYj6KpzYdmcxBc53ixNusk36BbU6mrGTXPVKqFZz4o=.pem","location":"security-state-staging/intermediates/6a639b4c-4c2d-449d-9944-d639bf15eea6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5nYj6KpzYdmcxBc53ixNusk36BbU6mrGTXPVKqFZz4o=","crlite_enrolled":false,"id":"9380b8fd-2e8a-4be6-8e33-2ac89816bd16","last_modified":1576536533520},{"schema":1576535797770,"derHash":"ceZTv79eclFbQJm71eyIcoErR8bsH6mt0yfhySyeoW0=","subject":"CN=Certigna Services CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MH0xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBTZXJ2aWNlcyBDQQ==","whitelist":false,"attachment":{"hash":"1e69d697d43d9ba8bb5bef41ca322d6effdfa8f6fb680b6b8c84759cb9c7151f","size":2170,"filename":"Vvyvg4-bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB_uE=.pem","location":"security-state-staging/intermediates/fd277823-b07c-41b0-bff8-0cdb90cd2145.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vvyvg4+bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB/uE=","crlite_enrolled":true,"id":"e83a378a-19a8-4110-bf0b-0f49b8965b01","last_modified":1576536533516},{"schema":1576535796324,"derHash":"l8ZzTlSpCzt8D1QCU39IH95CN5ndsub4WybuGqctITQ=","subject":"SERIALNUMBER=202002,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDI=","whitelist":false,"attachment":{"hash":"c0fa3dc15aeb9baebdbfdfe25bcfee4127a355c5cb6c09e43c562da3b547eeea","size":2337,"filename":"2rt-W6yXxYkYjTahsDT5hHsIBPVpVTxJQpmpCAktRXo=.pem","location":"security-state-staging/intermediates/da70c200-aa3a-489e-b91c-90be8cf90677.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2rt+W6yXxYkYjTahsDT5hHsIBPVpVTxJQpmpCAktRXo=","crlite_enrolled":false,"id":"47a787f1-e657-48ab-abc2-2282a260dd45","last_modified":1576536533512},{"schema":1576535793514,"derHash":"ndwuDVW0YeDHMigoLfVrK+8iTKI4VoHRe26MB3hSVzw=","subject":"CN=GlobalSign CA 4 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDQgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"1971e4bd393e616d4a85fc372108d3352c1321acd50f44ae8d74ec89a345738a","size":2089,"filename":"Xj0OpiKM5fkJ7g__pfUXsKnp9Ggz3CaAgIY6QU_Ml6I=.pem","location":"security-state-staging/intermediates/b5319024-9627-4d8d-b25c-c792f4e61e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Xj0OpiKM5fkJ7g//pfUXsKnp9Ggz3CaAgIY6QU/Ml6I=","crlite_enrolled":false,"id":"0e72f222-c8c3-4c56-8ae7-c680fea038a5","last_modified":1576536533509},{"schema":1576535791937,"derHash":"ixbUj3Id+rFXIUuazp3ajvuloGtO7ZAYBvCG0d+OrTc=","subject":"CN=Entrust Code Signing Certification Authority - L1D,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMTswOQYDVQQDEzJFbnRydXN0IENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxRA==","whitelist":false,"attachment":{"hash":"fdd58cea7e31810e5f8ba89b9c1c7613eb91f74984042fd3837aefe09410de81","size":1796,"filename":"q4FwU8-QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=.pem","location":"security-state-staging/intermediates/8aed1bf7-b11b-476e-823d-17c0cf8948ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q4FwU8+QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=","crlite_enrolled":false,"id":"1276d7f5-5c93-47a5-ba50-e376b6f24b77","last_modified":1576536533505},{"schema":1576535788951,"derHash":"OALkJFFveO6sMpqumx9gpBLb4dWwldesncDc3ePB9fs=","subject":"CN=Ford Motor Company - Enterprise Issuing CA01,O=Ford Motor Company,L=Dearborn,ST=Michigan,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEbMBkGA1UEChMSRm9yZCBNb3RvciBDb21wYW55MREwDwYDVQQHEwhEZWFyYm9ybjERMA8GA1UECBMITWljaGlnYW4xNTAzBgNVBAMTLEZvcmQgTW90b3IgQ29tcGFueSAtIEVudGVycHJpc2UgSXNzdWluZyBDQTAx","whitelist":false,"attachment":{"hash":"66305a50b272e38167edac50ea0ea4251e15c161604ba011e5ce7a459a47d597","size":2588,"filename":"CqwsdVHa6T0W9pos5-f88X2UNjXr4wKHpQ8Muq3ipRA=.pem","location":"security-state-staging/intermediates/7824b869-27a2-4934-a88c-9eb415787415.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CqwsdVHa6T0W9pos5+f88X2UNjXr4wKHpQ8Muq3ipRA=","crlite_enrolled":false,"id":"b7ef57bf-52b7-42de-ba58-d36fd3aa3e00","last_modified":1576536533498},{"schema":1576535794903,"derHash":"Xh2m6S4okrpqc/xQjkHzX5+SfkaEKCmA4XoBORii6lA=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"df9806c74f3765764c083de1480b0a52cd10e922c4f3954907a5dd627d515904","size":1707,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/2005e5a9-9e1a-4fdd-92da-332b6cf65fe2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"78dd32a3-453b-4588-8500-d6e3ba556e36","last_modified":1576536533495},{"schema":1576535787501,"derHash":"WXK5vUcQF9XzJwW+6RVwNiZXX4snCjnBwxLH+SRsENQ=","subject":"SERIALNUMBER=ZZZZZZA2,CN=Siemens Issuing CA EE Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGfMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTIxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMSgwJgYDVQQDDB9TaWVtZW5zIElzc3VpbmcgQ0EgRUUgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"b12e53720e7865f31d817d0aa08374ddea48a85382ed262c82bbeb55a1b88f0f","size":3133,"filename":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=.pem","location":"security-state-staging/intermediates/25f101de-ca3e-462b-ae08-6d5c61e71bdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=","crlite_enrolled":true,"id":"8555121f-5201-43c7-a55b-0a7a5c2bcaba","last_modified":1576536533491},{"schema":1576535784624,"derHash":"r2OdwLuxaO/3WxURfYiJN+tkwbBFPxaNG4xS7PBKy5M=","subject":"CN=AffirmTrust Networking Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgTmV0d29ya2luZyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"567c0deb382057dc9c24a94f806ff056b5ca63c56b30305ac6dbb6b17fc7c414","size":1581,"filename":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=.pem","location":"security-state-staging/intermediates/1e83b359-8021-4e03-997d-db1ee57d127d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=","crlite_enrolled":false,"id":"c50530e0-79bd-45c9-a333-3de7cc66a670","last_modified":1576536533484},{"schema":1576535780113,"derHash":"c50MOnG2w3fL0cQIrnzBlzLCy++GINY7Fsn9AYXfmnE=","subject":"CN=Atos TrustedRoot Client-CA for equensWorldlinePartner 2 2019,O=Atos,C=DE","subjectDN":"MGMxRTBDBgNVBAMMPEF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBlcXVlbnNXb3JsZGxpbmVQYXJ0bmVyIDIgMjAxOTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"ccd6bf64b0fe85f84a39efc0e01f5c14bd29d87d463cebcb319c05a721bb707b","size":1963,"filename":"mYzVJyiW8rCGgYKsa2ZqYeJxDrP-AP2AAx-gS-JpbgI=.pem","location":"security-state-staging/intermediates/a180baa5-7ae1-4c2f-b681-e2005c81c50d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mYzVJyiW8rCGgYKsa2ZqYeJxDrP+AP2AAx+gS+JpbgI=","crlite_enrolled":false,"id":"9300e6b6-6f08-4bef-a127-adb3c76eefe1","last_modified":1576536533472},{"schema":1576535777302,"derHash":"/TOu/TOhYfrAGQ5B353VDDM56IPAP0nEoqsriVbvVNQ=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"8bb58e69a554da25ed0e9a2e2c0f0b5c5c4a14229e342a65c32c6aac31ba5d3a","size":1894,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/eab13c01-ef46-422e-9972-eae0610179d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"ad42cc39-3cc7-493a-be53-30f0af27396d","last_modified":1576536533468},{"schema":1576535778745,"derHash":"djSK3uSOYdcynuSDEJZR6ksuC1wC998lg/4QdO2cb+w=","subject":"CN=SafeToOpen ClientCert ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MFExCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDEpMCcGA1UEAwwgU2FmZVRvT3BlbiBDbGllbnRDZXJ0IElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"d2225a4c67341a1d2bb21c9161f9f20b36f3436d9503b4c0ed123d5c05200e9e","size":2483,"filename":"e9_bjft2byP0VwBVyMlQUiqIe4r0YRn4_rKl-kQ3Vt4=.pem","location":"security-state-staging/intermediates/3a631fc8-f14e-493b-9c86-1f3c36c6637d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e9/bjft2byP0VwBVyMlQUiqIe4r0YRn4/rKl+kQ3Vt4=","crlite_enrolled":false,"id":"709c1ccf-bcc4-4d2c-be64-a416ecaddacd","last_modified":1576536533464},{"schema":1576535771624,"derHash":"6H6ivtbGIDssVbAP5J0odvumRwIQWut0i4ZakYtcfSc=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"d4e7ca7e1402409ada7f0f5a43f305ef2e3e302c74d18ba940f4da00d03dc570","size":1569,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/9ee14808-899d-4024-8b79-c401b44fd1ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"9b7b6720-a2ad-489f-9c69-dfd96a8c27b1","last_modified":1576536533450},{"schema":1576535770260,"derHash":"2jvitqbZcVwSlaQr5SbgAB0Q5ddUDwbnYxs05kSTSEg=","subject":"CN=Secure Site Pro ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIjAgBgNVBAMTGVNlY3VyZSBTaXRlIFBybyBFQ0MgQ0EgRzI=","whitelist":false,"attachment":{"hash":"788b2f3686e8970c3f5cfad0711b04ffb48ca9be4a2d82a766de64e5a7aa6248","size":1394,"filename":"SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=.pem","location":"security-state-staging/intermediates/f6d2b6fc-b4fb-4bad-81b8-9e27104a4e8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=","crlite_enrolled":true,"id":"8353b3ca-43b2-48d1-87b8-c28fcd0ba0e3","last_modified":1576536533447},{"schema":1576535768847,"derHash":"O5HEzWer3x1Scu67Lienee8C2CDOAvZLU7ncXnhnQ7g=","subject":"CN=Document Signing ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MH4xCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSQwIgYDVQQDDBtEb2N1bWVudCBTaWduaW5nIEVDQyBJQ0EgUjE=","whitelist":false,"attachment":{"hash":"1d398f18501d3a5e09a31afee26764aead55237baa53a49993a4afaa2acaff8e","size":1366,"filename":"FZ8xakLVjVKD3n_pRB8V9qVb1lmJuM7JBY6uzwl3Ht0=.pem","location":"security-state-staging/intermediates/a5f07e80-dd03-4fbe-b113-0487d431c83b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZ8xakLVjVKD3n/pRB8V9qVb1lmJuM7JBY6uzwl3Ht0=","crlite_enrolled":false,"id":"c3150be2-0aba-41ac-86ce-a463eb088d4f","last_modified":1576536533443},{"schema":1576535767420,"derHash":"Bb3Zp8ZwbTnW2xpYCq/2fUZzAnts8B/RU2fY7YSokPA=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"ef5b81322c43753e4a9ea1ffbbe9bdcd81aa70b6aee06e7346ec6e8fab589497","size":2125,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/038fe9fc-bab4-43ca-832c-ef6d0f3ba1fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"96bc6b19-4307-4508-8c1f-7093ac0bcddc","last_modified":1576536533439},{"schema":1576535765971,"derHash":"679NxgDBfaBDgd79z8EZw/NO+0oE0IYJELgTx3ktdYU=","subject":"CN=Certigna Entity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHsxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRswGQYDVQQDDBJDZXJ0aWduYSBFbnRpdHkgQ0E=","whitelist":false,"attachment":{"hash":"ada86b610b9f472f00e1921d532cf509f6692c87cb45580cbdd6cdb13bc4ffbd","size":2170,"filename":"0Eiyrr-wFIp1JqShtXzNCtJt2yUU0-j_mDnLwk1-AHk=.pem","location":"security-state-staging/intermediates/f1c34a68-978a-4f12-85f8-06564ca3f194.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0Eiyrr+wFIp1JqShtXzNCtJt2yUU0+j/mDnLwk1+AHk=","crlite_enrolled":false,"id":"b641a082-df69-4132-a8a8-a1a801f83c2c","last_modified":1576536533436},{"schema":1576535764596,"derHash":"xa2jSGvdtUWzqn7JnGnBrtlCdNX+ynkz4BMuIS8CZnE=","subject":"CN=BitCert ECC Domain Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSowKAYDVQQDEyFCaXRDZXJ0IEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"cf45883f3cb3aaa3f86e6fd95964673ab8be0ec688db38395556914cc50c457e","size":1288,"filename":"l03AMxIZai8wvW2nrYEfG_5pj3_oGL2PS1_B5kv47yg=.pem","location":"security-state-staging/intermediates/1dc1c5ba-377f-4791-bea6-1421a0da10d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l03AMxIZai8wvW2nrYEfG/5pj3/oGL2PS1/B5kv47yg=","crlite_enrolled":false,"id":"a06f0bc4-ae00-450f-9b23-5180ec001c0e","last_modified":1576536533432},{"schema":1576535763166,"derHash":"TElDueqhTqKmm4p+TY2okIHuoRyH6CKbm3T2inrTO3k=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"131d16f8a3827db506e21e62347e6935b0db5934f7cd31f78e3735432e71fcd8","size":2446,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/53ce7c2b-bdc9-4c39-8f4e-19e5a9954bb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"97d292c2-1d66-4cc8-8ec8-a8911cfaad9e","last_modified":1576536533429},{"schema":1576535759951,"derHash":"61fyBRE6WBFH4PHZcygnT7Aw7GnuyJyil9z1Wj+0Rjw=","subject":"CN=Cybertrust Japan Public CA G3,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEmMCQGA1UEAxMdQ3liZXJ0cnVzdCBKYXBhbiBQdWJsaWMgQ0EgRzM=","whitelist":false,"attachment":{"hash":"d0ce3f546a0b5b31ffeafd1b7b56cdfb890a2a42f77fbd7a34624bfeb1403b9e","size":1569,"filename":"QnKSPXOthAGsklSpx8zrmS9gtfzbJ28gPMA9AMjEoJc=.pem","location":"security-state-staging/intermediates/cfc9aae0-3939-46e2-b9b5-031113811434.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QnKSPXOthAGsklSpx8zrmS9gtfzbJ28gPMA9AMjEoJc=","crlite_enrolled":true,"id":"170fdc60-b3a3-4542-9702-1b3b2f475163","last_modified":1576536533421},{"schema":1576535758523,"derHash":"TM8XwMjBwQ1YduxeMoD+jRNN82rt2ERCibmQvDdB508=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CUALIFICADOS,OU=Certificados Cualificados,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGSMQswCQYDVQQGEwJFUzEeMBwGA1UEChMVRmlybWFwcm9mZXNpb25hbCBTLkEuMSIwIAYDVQQLExlDZXJ0aWZpY2Fkb3MgQ3VhbGlmaWNhZG9zMRIwEAYDVQQFEwlBNjI2MzQwNjgxKzApBgNVBAMTIkFDIEZpcm1hcHJvZmVzaW9uYWwgLSBDVUFMSUZJQ0FET1M=","whitelist":false,"attachment":{"hash":"b3e4e383491cfa05a6e5858dc73ac1a4018938ed5c15a0d37c708311bd252227","size":2251,"filename":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU-Y=.pem","location":"security-state-staging/intermediates/2b8e2bc0-c68e-4dce-9e23-322c77fed80d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU+Y=","crlite_enrolled":true,"id":"3a7a7325-7f7b-40b5-86ed-594919a759ac","last_modified":1576536533417},{"schema":1576535754283,"derHash":"A3YWMmo0L8B4DUr/tzRP8Okl0eD95Hgqt4L0q9W1MrA=","subject":"CN=Code Signing ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHoxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSAwHgYDVQQDDBdDb2RlIFNpZ25pbmcgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"36f68794088b135f677cebba75e488317c36d03d79ae9a05ab74f929ff5b8764","size":1329,"filename":"jZT0dnUpZ1-v9bahYwUFxf9JNVofQeMD_ZBqvCPnxLA=.pem","location":"security-state-staging/intermediates/8e437135-4819-4662-96a1-702396b42c86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jZT0dnUpZ1+v9bahYwUFxf9JNVofQeMD/ZBqvCPnxLA=","crlite_enrolled":false,"id":"090c1b74-da3c-4164-b879-475bec9c94e8","last_modified":1576536533413},{"schema":1576535752775,"derHash":"+/gAl7yu7qyhOf263rWt2YyRu2msHUpmnU3gPgg1TU8=","subject":"SERIALNUMBER=202006,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA2","whitelist":false,"attachment":{"hash":"9b87f4ed0a777f1fe45c49dfb7ca4daed55e7e7a233f5f373c4019fba5815a9c","size":2333,"filename":"tmU4vIMx2B_mhNc1TEZrX5KYbxjUTIs_Eu0mrAh0UJ0=.pem","location":"security-state-staging/intermediates/d60c2192-fd0b-4214-a308-ffdc49d9ef23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tmU4vIMx2B/mhNc1TEZrX5KYbxjUTIs/Eu0mrAh0UJ0=","crlite_enrolled":false,"id":"a470c28a-df12-4579-b9a6-1f16a4ca2214","last_modified":1576536533408},{"schema":1576535757125,"derHash":"A86bxxuR/bfLPFI1yuBwHLSGu9Yo1KreWEH8XwqjekY=","subject":"CN=DigiCert CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFURpZ2lDZXJ0IENOIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"595bf22b78664a42587deccbb284643462b25d170791f641b0fd546e4050d8f6","size":1829,"filename":"MIKoeatlSqVA3aCIrE0_JYoP9vF4XSCTPHy-c9vAsKk=.pem","location":"security-state-staging/intermediates/d17777aa-b2a4-484e-8441-343c9547032e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MIKoeatlSqVA3aCIrE0/JYoP9vF4XSCTPHy+c9vAsKk=","crlite_enrolled":true,"id":"03498728-f5b2-439d-81fe-b9e6d9610c07","last_modified":1576536533404},{"schema":1576535748430,"derHash":"9nh/qMrX0sJ5oDdL+1A4B8xq3MfCNwknPdWkBH0a73g=","subject":"CN=SZCA DV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgRFYgU1NMIENB","whitelist":false,"attachment":{"hash":"a9b2ca0380643dfb1ea6c1f34c39fa58988e778b07ffa23714878880023314a7","size":1756,"filename":"PPn3ERZq7pmEq4QyyPxBu8LvJxjiPlPsQLVTHYbOwbo=.pem","location":"security-state-staging/intermediates/da53fafc-fb80-458f-bfea-530aa2404b02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PPn3ERZq7pmEq4QyyPxBu8LvJxjiPlPsQLVTHYbOwbo=","crlite_enrolled":true,"id":"9edde23a-7218-41f2-abd4-607c025433f0","last_modified":1576536533388},{"schema":1576535745623,"derHash":"P4/Is8Q1eJGu6pafkGovTyLbVlRDYoMNAaQN/WmhezQ=","subject":"SERIALNUMBER=202019,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE5","whitelist":false,"attachment":{"hash":"934630bc6dc2e4108e88dabcc6340b616f8eacb0881c9e46119b1dc2a356f2e5","size":2333,"filename":"ocfITRRhsDIXLV159O4zK-dM7Mn-83WfdL1qjoaRY60=.pem","location":"security-state-staging/intermediates/7d403344-5dc7-4250-8e51-ffe66db08bd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ocfITRRhsDIXLV159O4zK+dM7Mn+83WfdL1qjoaRY60=","crlite_enrolled":false,"id":"85ec4838-2515-43b4-8bf6-1c66071fa3ed","last_modified":1576536533373},{"schema":1576535744191,"derHash":"4R4GhhxNMI/ZRL8Xvl6QcqA0xPkwNMtZwC1RLTD3/EU=","subject":"CN=COMODO SHA-2 Pro Series Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDExMC8GA1UEAxMoQ09NT0RPIFNIQS0yIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"20e0af1ce1afab12f371d4975120dcf56cf9ac794e09d91ed9f543ab66f3df9e","size":1691,"filename":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=.pem","location":"security-state-staging/intermediates/b573613e-98b2-442f-b706-7ff52a6c758a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=","crlite_enrolled":true,"id":"99771b0e-6ace-4444-871f-7a6c6e0bffa4","last_modified":1576536533370},{"schema":1576535742721,"derHash":"W2kOHNK8ABbk2yqrq1A3ReQfhrJEjy7AbSnySZnevKI=","subject":"CN=Symantec Class 3 Registration Authority Intermediate CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgUmVnaXN0cmF0aW9uIEF1dGhvcml0eSBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"ea664603ffb12d1a1345ffb13a3ca44d29711f5043c16a6488fa3b9f2b64f3ba","size":2198,"filename":"vO3_XaIzmqGtcOO2LQL_yHzKa4ueBDChpnLbfwpiu8c=.pem","location":"security-state-staging/intermediates/fdc9f14c-56b9-4103-a6c5-aaa28d69e0dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vO3/XaIzmqGtcOO2LQL/yHzKa4ueBDChpnLbfwpiu8c=","crlite_enrolled":false,"id":"abf5170f-a490-479a-a959-03b3ec607959","last_modified":1576536533366},{"schema":1576535739800,"derHash":"pmQixORJ1GXLAjp/x2M96O0YFphcpBCT/JazZj7XpDs=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"8e16299210c970b497a721b3efd1e8535900deef5b981db9c57146ed85f7ff39","size":1577,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/5f6d485b-b94c-40e9-8cc6-7345b0d7d030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"01146bea-1246-4f33-8f61-a7813e0e2d87","last_modified":1576536533362},{"schema":1576535741259,"derHash":"nhLW4T3dU6iQorOjdCOuXkV3MaezShU5kvHvH1SJpF4=","subject":"CN=DigiCert Assured ID Client CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ2xpZW50IENBIEcy","whitelist":false,"attachment":{"hash":"aba4ac7f47cd3fa5c97a15e2f8e46b0e94ea9d901e60ab40b1dd3ef285a8e6ab","size":1922,"filename":"9uNJKUqEgsV_TXwKFsvy0WrHpWynY8_2cDPAxVlPKwc=.pem","location":"security-state-staging/intermediates/4ea199af-90de-4f71-87de-cb9cd99b0573.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9uNJKUqEgsV/TXwKFsvy0WrHpWynY8/2cDPAxVlPKwc=","crlite_enrolled":false,"id":"61689adb-2a3b-46ab-9ad9-da8f662c67aa","last_modified":1576536533357},{"schema":1576535734060,"derHash":"J84nIGUCAw46ELyW06IMPYiV+HH7ar4dgEdKtFbzGvU=","subject":"CN=BitCert ECC Business Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSwwKgYDVQQDEyNCaXRDZXJ0IEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"21b09c09247dfb82fcc1068e7b44ec24f339af2145e053fa304feaccc96b5143","size":1293,"filename":"WavFTPiAKmlGYUqrK6pToCjDxiEpoNAPMXa5dEGGoi0=.pem","location":"security-state-staging/intermediates/bf93fc43-be30-4713-89f4-6c568e6e35a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WavFTPiAKmlGYUqrK6pToCjDxiEpoNAPMXa5dEGGoi0=","crlite_enrolled":false,"id":"0a103d72-7904-480c-a650-b799dc30c443","last_modified":1576536533349},{"schema":1576535736902,"derHash":"SIVck1lFJzOdmESWifq3wxX/VGUGbFFsKdvc8YU5AdM=","subject":"CN=WebNIC RSA Business Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF8xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzErMCkGA1UEAxMiV2ViTklDIFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"8d8a9aace8a73869057b9a3f4640419a8e8603f9acfbe1caa324a7884b5b0cdf","size":2093,"filename":"VEf8vFVDUxjsP3LYyFy549557yb431jkLHXGaJeeg0s=.pem","location":"security-state-staging/intermediates/3e1e18bc-6809-4b82-b004-81bb3abaf8d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VEf8vFVDUxjsP3LYyFy549557yb431jkLHXGaJeeg0s=","crlite_enrolled":false,"id":"5e2d4521-debf-4170-bfa2-c04516822e90","last_modified":1576536533345},{"schema":1576535730952,"derHash":"RWO5NuNauXV29a7xk12bx+mXeEHwVzvS4WvKyVNKavk=","subject":"CN=AffirmTrust Certificate Authority - DV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIERWMQ==","whitelist":false,"attachment":{"hash":"f469b6a26ab18f58e6fd0cfbda5e03e69cf3d3264a9c4790878f903d60151468","size":1674,"filename":"68BRY3XqvlKubfNnBJ64F_17BHUniDemUwxZNNvfdaA=.pem","location":"security-state-staging/intermediates/62e47fee-8839-40c8-9719-edf4a5d2615c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"68BRY3XqvlKubfNnBJ64F/17BHUniDemUwxZNNvfdaA=","crlite_enrolled":true,"id":"dd1c7414-0b47-4e26-8b61-6e686bc90126","last_modified":1576536533336},{"schema":1576535735514,"derHash":"rCuSLs/V4BcRdy/qjtNy3p0eIkX84/V6nNvsdylqQks=","subject":"CN=Apple IST CA 2 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMTE0FwcGxlIElTVCBDQSAyIC0gRzExIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKEwpBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"601b5385fb06a628528a738d6141af6a10c29b3d7659e002ba224353ca089d38","size":1532,"filename":"tc-C1H75gj-ap48SMYbFLoh56oSw-CLJHYPgQnm3j9U=.pem","location":"security-state-staging/intermediates/e3bbb057-9c2f-4ddc-a720-28c4ff04b318.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tc+C1H75gj+ap48SMYbFLoh56oSw+CLJHYPgQnm3j9U=","crlite_enrolled":true,"id":"0c58ca4b-21b3-473e-bddb-a75c77a17971","last_modified":1576536533332},{"schema":1576535729560,"derHash":"2n5XePYvh2Vbj9JKieZR5XMp3JwHZacRWM5WRDykTpU=","subject":"CN=DigiCert Extended Validation CA-3 G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEtMCsGA1UEAxMkRGlnaUNlcnQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQS0zIEcz","whitelist":false,"attachment":{"hash":"6844a48cc10ea1a880af9e0aea02a3fc4be2786b3ce299bd1644cd2fc49c1f64","size":1187,"filename":"epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t_u8=.pem","location":"security-state-staging/intermediates/5d0c77a4-ad61-4b2d-9500-0ed1ce697602.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t/u8=","crlite_enrolled":true,"id":"9bd31525-cabf-4b0e-acc5-1952d08e7761","last_modified":1576536533328},{"schema":1576535726603,"derHash":"6k7i+qV65LU5tjl3/luyBbavsy96c7KzY+S+As2Kkek=","subject":"CN=AffirmTrust Certificate Authority - OV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIE9WMQ==","whitelist":false,"attachment":{"hash":"fc3aae931bd9e488d29bffc6c6628b5ba9b6c606359b942aad8056a2af13c8c0","size":1662,"filename":"RM5J-l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv-DsGM=.pem","location":"security-state-staging/intermediates/8c875b16-e424-4471-88e1-1af28bb1e98b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RM5J+l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv+DsGM=","crlite_enrolled":true,"id":"b68b971e-8343-4eb4-a930-a11700292076","last_modified":1576536533324},{"schema":1576535725125,"derHash":"lvvIq01wU+hwR4G6vuiaaY8yL87iAB0ezeriO1oN0NQ=","subject":"CN=SafeToOpen Code Signing ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MFMxCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDErMCkGA1UEAwwiU2FmZVRvT3BlbiBDb2RlIFNpZ25pbmcgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"6dc110fcc3fff1cd11570485a2e45474f51f761c2f9b590aae82ec5444111a10","size":2467,"filename":"pjQ3wML2cKErfco7LBCiW12IeMTd7OO0vxtR3O4OUJk=.pem","location":"security-state-staging/intermediates/31e48b05-fa3c-4d5e-88b8-e31faca46e6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pjQ3wML2cKErfco7LBCiW12IeMTd7OO0vxtR3O4OUJk=","crlite_enrolled":false,"id":"397e2ece-c82e-4f63-b9c9-9564ffbb0787","last_modified":1576536533319},{"schema":1576535728195,"derHash":"v99M8/FDrQ25EtirOnwS9he56mDOix9ORPdCcPshsZs=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"afa822a679ac53a1fe787fd1b3418ea474613a029a776a216762efa2b870ff8b","size":1581,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/0ff9bf8a-8c2d-458a-843f-714bb4ae0838.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"391141f8-c2c2-411c-b042-418ab514fd96","last_modified":1576536533315},{"schema":1576535720797,"derHash":"zteRflb0JG/xkH7v+SItfcgR0oZYOh8RbF9hdaiZX7E=","subject":"CN=Dodo Sign SMIME ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHQxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSMwIQYDVQQDDBpEb2RvIFNpZ24gU01JTUUgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"9c0526ad9bdea4d1b9fe223be445e0031426ba95b4c6d4f9d11ea0576f6ac9dd","size":2450,"filename":"aQV1CuJZgAKpjACerkGg_CxArZYPkL2zgDhkI8ka1lw=.pem","location":"security-state-staging/intermediates/661841db-d069-4d57-994a-4d79d8389bd0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aQV1CuJZgAKpjACerkGg/CxArZYPkL2zgDhkI8ka1lw=","crlite_enrolled":false,"id":"11b21bdc-d76d-4edc-8894-61264ce40ffc","last_modified":1576536533307},{"schema":1576535719414,"derHash":"iC4BRtFdNIPuWYHjUGfxRJ5WK4niLsw/3zcnTt0xTNo=","subject":"CN=GDCA TrustAUTH R4 EV CodeSigning CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xLDAqBgNVBAMMI0dEQ0EgVHJ1c3RBVVRIIFI0IEVWIENvZGVTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"10f99f1db6de610fba982c5f65250fa8086ea7f1cdce17fd51e1059ad62997f3","size":2068,"filename":"K1O1P19UCSRwBq2Y5xce7r_TavF-pDYjmdSYRVYHFXI=.pem","location":"security-state-staging/intermediates/8227657d-5641-4c7a-aa33-89019ad18fdf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1O1P19UCSRwBq2Y5xce7r/TavF+pDYjmdSYRVYHFXI=","crlite_enrolled":false,"id":"072a60e3-e6bd-435f-8486-855b8b3b6efe","last_modified":1576536533298},{"schema":1576535718042,"derHash":"HfYFTWZBQEYzZBu1+jdC/afQdeJRSECrYeAMy7t9NB0=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"7e5ce727726952ca1f6cb21c02d6ca82c82baaaf53c5c69de963c2ddc3344595","size":1305,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/06349813-d93c-441c-a351-17e576175b0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"60de9866-3e99-4374-b830-17ad74f56f75","last_modified":1576536533289},{"schema":1576535714600,"derHash":"+QrKY8uLtE+NkbhkR0u0Kq4XfnP9/m9Ky9EqATpBXBU=","subject":"CN=MKB SubCA 5,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"ME0xCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMRQwEgYDVQQDDAtNS0IgU3ViQ0EgNQ==","whitelist":false,"attachment":{"hash":"d609fc9e466cfe1aecec6216a280e25bf274686799575f8c7edd8f7e8232e669","size":2146,"filename":"PGgGeTzLYgdsBfTyNhkEXF4J3GMzNhuKWFmeFINeefQ=.pem","location":"security-state-staging/intermediates/d62c8770-b09d-44d0-a7bb-d6c9b93fd6b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PGgGeTzLYgdsBfTyNhkEXF4J3GMzNhuKWFmeFINeefQ=","crlite_enrolled":false,"id":"875ecbce-accc-43a4-b056-d79c0f013227","last_modified":1576536533285},{"schema":1576535711746,"derHash":"k1BhvlLI6ojANLOa39UiuzFMv1ME5acGRzXdvaMkKq8=","subject":"CN=Certigna Entity Code Signing CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGIMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEoMCYGA1UEAwwfQ2VydGlnbmEgRW50aXR5IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"dfa52fac8680622c2c208aa337be1f107052398f893cb8cdaa1bc8ee0c3c1f93","size":2186,"filename":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=.pem","location":"security-state-staging/intermediates/a34d09dc-c1e9-4b35-bb0f-0c7ee3e64ad8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=","crlite_enrolled":false,"id":"90283279-5bef-4526-8705-37883c1dc2bc","last_modified":1576536533281},{"schema":1576535710282,"derHash":"X00sDgy6fR+2AO3TUG1DMchmoR8g0TcFTuOc9RRXZnk=","subject":"CN=SSL.com Timestamping Issuing RSA CA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLzAtBgNVBAMMJlNTTC5jb20gVGltZXN0YW1waW5nIElzc3VpbmcgUlNBIENBIFIx","whitelist":false,"attachment":{"hash":"21e71885a88fc5db9ef891b88f7821fb1e634323d90b65bdc3268d422b8350ab","size":2483,"filename":"SiW6P63hxKyk7kypaOzuu6Vn7Ki7UXJCZjkLtFIcPCE=.pem","location":"security-state-staging/intermediates/05741471-0868-4508-b20f-758afe2658b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SiW6P63hxKyk7kypaOzuu6Vn7Ki7UXJCZjkLtFIcPCE=","crlite_enrolled":false,"id":"af31000d-8c6b-4c8e-8969-c161e3b093b8","last_modified":1576536533277},{"schema":1576535713205,"derHash":"RUBA5JaQcEAcw1vffypOvOV5e7dpSucx2TqBFf1Zkpw=","subject":"CN=Starfield Root Certificate Authority - G2,OU=https://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHFMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE0MDIGA1UECxMraHR0cHM6Ly9jZXJ0cy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5LzEyMDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"9d2202937f8e54392d669c92cd8a75a53b1784157b44c73b0ce0c2614d485051","size":1735,"filename":"gI1os_q0iEpflxrOfRBVDXqVoWN3Tz7Dav_7IT--THQ=.pem","location":"security-state-staging/intermediates/25785222-2756-4269-a695-0a60c3918f3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=","crlite_enrolled":false,"id":"1515b293-9629-40ac-b90c-843783835be0","last_modified":1576536533268},{"schema":1576535705691,"derHash":"aB68GCKwebl+BATkaH2bbAwIksgg9Vc4ooKq5iUpvdg=","subject":"CN=Entrust Certification Authority - QTSP1,O=Entrust Datacard Europe S.L.,C=ES","subjectDN":"MIGAMTAwLgYDVQQDDCdFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gUVRTUDExGDAWBgNVBGEMD1ZBVEVTLUI4MTE4ODA0NzElMCMGA1UECgwcRW50cnVzdCBEYXRhY2FyZCBFdXJvcGUgUy5MLjELMAkGA1UEBhMCRVM=","whitelist":false,"attachment":{"hash":"1b36e574afaad2d084671e777c7351c3fb5ab139919e47a5ad362e0629f3d0a9","size":1784,"filename":"aZtZPtGaXbm8qg3lvpcFEicPNLfVwGoRKVgV17tW99k=.pem","location":"security-state-staging/intermediates/ba3c2414-b8f6-4b6f-b58a-13bd454deef5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aZtZPtGaXbm8qg3lvpcFEicPNLfVwGoRKVgV17tW99k=","crlite_enrolled":true,"id":"d64bc41f-40a9-4404-b8e7-977885a8b020","last_modified":1576536533260},{"schema":1576535704194,"derHash":"pEnbq21MA1+q/Z0EWJH+mKvXPShiaKioP4VBRVUWkuM=","subject":"CN=DigiCert Global Client CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEdsb2JhbCBDbGllbnQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"527e07fba3c052bc204844ca180ab6b407338b8d533f579a75968162d959aa09","size":1906,"filename":"kJGSyUHCVurpr4HjTqx1jU6HMmuaNzGu5ukKqGV0I-Q=.pem","location":"security-state-staging/intermediates/fb4825ba-30a6-4680-a666-5e92f0755810.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kJGSyUHCVurpr4HjTqx1jU6HMmuaNzGu5ukKqGV0I+Q=","crlite_enrolled":false,"id":"3c4a336f-4021-49ad-b28f-d8c1994bb54a","last_modified":1576536533257},{"schema":1576535701221,"derHash":"lMZj6epcJ+5PZBJ/m0JYY+mRqeFWwH3xoAgDrjF2QWI=","subject":"CN=DPDHL Global TLS CA - I4,O=Deutsche Post AG,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MHgxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMQ0wCwYDVQQHEwRCb25uMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTQ=","whitelist":false,"attachment":{"hash":"82df1783f9ebe0247dd6ecbe16d4c18ae72f1dd07acc563c22457497332adccd","size":1687,"filename":"dDCzzRFNRKnMrHRFZT7PTt0huOU3tTdBT-09j4Qo0dw=.pem","location":"security-state-staging/intermediates/fd7aa6f3-e797-44a8-b182-386d30d9bae6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dDCzzRFNRKnMrHRFZT7PTt0huOU3tTdBT+09j4Qo0dw=","crlite_enrolled":true,"id":"4a157548-8ffc-4b18-9a39-6a3d034a4b20","last_modified":1576536533253},{"schema":1576535702771,"derHash":"fggrvFaXaxWdRpZUCpa2AUhhS6m14psgNfeJvs+/Blc=","subject":"CN=KPN BV PKIoverheid Organisatie Server CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHExCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNjA0BgNVBAMMLUtQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e14dfe0a090eadc281ff2db7ada84d99fae9eca05625d7c7e0e8301bff79fdd5","size":2584,"filename":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn-TXs=.pem","location":"security-state-staging/intermediates/5df062b7-6dbf-40fb-b4d3-69692b678a3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn+TXs=","crlite_enrolled":true,"id":"256b5706-1f4a-4d46-bd99-cd98266a34c4","last_modified":1576536533248},{"schema":1576535698371,"derHash":"DzKEswasQimGyPVg6kYib9hCVRmm9hqpxVq1CCdLgtI=","subject":"CN=Solenis Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Solenis LLC,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLU29sZW5pcyBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEhMB8GA1UEAxMYU29sZW5pcyBQdWJsaWMgT25saW5lIENB","whitelist":false,"attachment":{"hash":"07c3a057b0a793ccc127ced6e4656951d395af324fbf13db505a5158e79cf5a1","size":2044,"filename":"FbUF4mDwk2lNgD-Pejjnol8xBCKJWyaJf_t3H9qx33E=.pem","location":"security-state-staging/intermediates/9dc2eb3c-f2a0-4921-b7ac-e9b351bc4271.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FbUF4mDwk2lNgD+Pejjnol8xBCKJWyaJf/t3H9qx33E=","crlite_enrolled":false,"id":"4eac52f2-55a9-4aad-a5ec-b460abc548b6","last_modified":1576536533244},{"schema":1576535699807,"derHash":"khi6uU59XR+B1i0Pwj4xyLvL7jVF0dfp0/0pswvBiMg=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"0be6834a2b742f4b697c05091ee7071ce8419abe4ed8eed05d569d2e0029ffc6","size":1187,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/52220f23-3b7c-41f2-8367-dacbf192340e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"6d2dd04d-c23f-4dde-8701-5d637684bb1f","last_modified":1576536533232},{"schema":1576535694050,"derHash":"VKiey5iaHcz0ATY584l0oLwHQsKZPftr0Mvx9GKWRQE=","subject":"CN=Buypass Class 2 CA 2,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAyIENBIDI=","whitelist":false,"attachment":{"hash":"0614048608f149da266521b3b029d5d9fbab892a53adc1151476ffbb67f64ea8","size":1849,"filename":"61MXD2Y0eBaJtXDtSP1wW5LIdaIPjtVmYYrVCM8GDDg=.pem","location":"security-state-staging/intermediates/807b4084-3ed6-4c3d-9105-8e356f3bdc73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"61MXD2Y0eBaJtXDtSP1wW5LIdaIPjtVmYYrVCM8GDDg=","crlite_enrolled":true,"id":"ef80dba5-2722-4073-94a2-06a8e7cf1eee","last_modified":1576536533226},{"schema":1576535692634,"derHash":"wt/7PBuwbeTBCSblF/82b5OJLV4C3G95CAJ121f9b8g=","subject":"CN=TI Trust Technologies EV CA,OU=Controlled by Sectigo exclusively for TI Trust Technologies,O=Telecom Italia Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MIHNMQswCQYDVQQGEwJJVDENMAsGA1UECBMEUm9tYTEQMA4GA1UEBxMHUG9tZXppYTExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuUi5MLjFEMEIGA1UECxM7Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBUSSBUcnVzdCBUZWNobm9sb2dpZXMxJDAiBgNVBAMTG1RJIFRydXN0IFRlY2hub2xvZ2llcyBFViBDQQ==","whitelist":false,"attachment":{"hash":"f3a3288bc3b67208c3f1e4164cb00b27794763ac59477eb6171158b3507ab3e8","size":2288,"filename":"lG0jsaBDRslBBApGfnJu_ukJ5x3uoc841KUU1OMrO1E=.pem","location":"security-state-staging/intermediates/48b456c7-6568-4b6a-b3a6-e6d3c9384968.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lG0jsaBDRslBBApGfnJu/ukJ5x3uoc841KUU1OMrO1E=","crlite_enrolled":false,"id":"3eca5483-9836-4680-82c5-bb0774a0b4ad","last_modified":1576536533221},{"schema":1576535691263,"derHash":"j3Y2enra5GQiWOZYaiqWQqAPPsux63JfGLXnrT2Vrtk=","subject":"CN=Saudi Enaya Public Issuing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Saudi Enaya Cooperative Insurance Company,C=SA","subjectDN":"MIGqMQswCQYDVQQGEwJTQTEyMDAGA1UEChMpU2F1ZGkgRW5heWEgQ29vcGVyYXRpdmUgSW5zdXJhbmNlIENvbXBhbnkxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEmMCQGA1UEAxMdU2F1ZGkgRW5heWEgUHVibGljIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f9a1cc1c0a4d31769022a32fa750c3366fb992b9cf15e57a75f7dec8fa1b0f43","size":2093,"filename":"cNHwIfttyOKzQurjMJbU9iw-zkVDSMIGzrkUphg-oZ8=.pem","location":"security-state-staging/intermediates/9a23fc37-8c51-4bb4-95e5-218e36e2fc5b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cNHwIfttyOKzQurjMJbU9iw+zkVDSMIGzrkUphg+oZ8=","crlite_enrolled":false,"id":"0faea224-cee9-4c13-9b49-037fb4c24a88","last_modified":1576536533217},{"schema":1576535689739,"derHash":"vkCBOGmrJ6Bx0SrWqIMFg+vDthjj8jRjWfSxGhyUNO4=","subject":"CN=GlobalSign CodeSigning CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"0e8e5deefe3f05a7aa5d9c40e35ec54cf376114dbb14eec1d7dd699f04481655","size":1650,"filename":"YAIydgGB-L3Y0NHNmsAGLQDXeo7ww8TLvpXGKFMPJ3s=.pem","location":"security-state-staging/intermediates/057a2b86-b448-4070-94c1-5f09ce2bfac7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YAIydgGB+L3Y0NHNmsAGLQDXeo7ww8TLvpXGKFMPJ3s=","crlite_enrolled":false,"id":"fe5a8e71-da19-42ab-acde-06d1d5cef1b9","last_modified":1576536533211},{"schema":1576535688336,"derHash":"4zB2/7UmffQZ9y3gbEbixspE/0ODtTFs99bmKOmNm/0=","subject":"CN=Saudi Telecom Company Email CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Saudi Telecom Company,C=SA","subjectDN":"MIGXMQswCQYDVQQGEwJTQTEeMBwGA1UEChMVU2F1ZGkgVGVsZWNvbSBDb21wYW55MT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExJzAlBgNVBAMTHlNhdWRpIFRlbGVjb20gQ29tcGFueSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"ec9e4ca56df4d26db8f71b689f200f5196410806d42b92ded254322d04471378","size":2068,"filename":"1tmevyCqnyAoinSCzwcqiqEsILe2CvKE2FskRnaTgXI=.pem","location":"security-state-staging/intermediates/f7d99d4a-d900-4eaf-978b-09f11eda8642.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1tmevyCqnyAoinSCzwcqiqEsILe2CvKE2FskRnaTgXI=","crlite_enrolled":false,"id":"1dd892f7-1bad-4b9b-a81d-e331f72cdbe8","last_modified":1576536533204},{"schema":1576535685544,"derHash":"Rcsdh0ywO9XFtuB5yPwp5RUh7lYoSGMBlkpB+Uuln4g=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"6aeca6429f492ce0a1e976110a582cd7b8c66033c209b47b36f98a2ec75750f1","size":2231,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/7e4b802f-b595-45c5-b8c9-7a395c2592f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"db71c7f0-2fac-43c3-ad72-dd258c250fa5","last_modified":1576536533196},{"schema":1576535678404,"derHash":"Ocdjqc8Z2SP5d9I2JquJBEmkRKuLeVyBXvHvgf68Hjg=","subject":"CN=Amazon,OU=Server CA 1A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"f399c4419d079a15a697f418e9a8d5ff90d3ac32db49507e30ee4a17491a1fd2","size":1544,"filename":"ZLtb2AMR-j9TvZlATKuHYq1uBIRH0Kl_IZ_OyhZh83w=.pem","location":"security-state-staging/intermediates/0bf45415-b984-4367-b6a5-c8d413da9d72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZLtb2AMR+j9TvZlATKuHYq1uBIRH0Kl/IZ/OyhZh83w=","crlite_enrolled":false,"id":"ad381075-9d54-4e8f-9730-7b932a4f8b90","last_modified":1576536533183},{"schema":1576535676932,"derHash":"lqWizTmADPtqKoMO5S3PR/uwD/GwMgTbNpFc6jHxM0I=","subject":"CN=GDCA TrustAUTH R4 EV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"d72e2007f8b0bdbb9bfdfca3bc7bdf7eebe0d9a1b5b3e0aa3c49210a42752f35","size":2056,"filename":"LA_cQZEhZA_J3pK28of_Jf7Wn0WmfSQvp4eYJW5o8NQ=.pem","location":"security-state-staging/intermediates/2b13103f-f111-4488-951a-d948d81a84f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LA/cQZEhZA/J3pK28of/Jf7Wn0WmfSQvp4eYJW5o8NQ=","crlite_enrolled":true,"id":"2a556f13-fd00-4e58-82e2-6de75321c936","last_modified":1576536533172},{"schema":1576535675523,"derHash":"SUYzfTlUMF82dw7oMX9nz+/zlDV2gov1XBU4R2tKINg=","subject":"CN=Nedbank Limited Public CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Nedbank Limited,C=ZA","subjectDN":"MIGMMQswCQYDVQQGEwJaQTEYMBYGA1UEChMPTmVkYmFuayBMaW1pdGVkMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExIjAgBgNVBAMTGU5lZGJhbmsgTGltaXRlZCBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"43afb828d2dd6d74b9f5df2475c5670452bceb66714a87118006a59ad1cf74c6","size":2040,"filename":"9mmBieouT_9Ouiv7FZSLvox_uvaz5I2XlSgCRjt0g4U=.pem","location":"security-state-staging/intermediates/24be1fad-b770-4eaa-9f19-6ee181105daa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9mmBieouT/9Ouiv7FZSLvox/uvaz5I2XlSgCRjt0g4U=","crlite_enrolled":false,"id":"ef1b8ccf-e9c6-4f39-bdfa-c80513385093","last_modified":1576536533165},{"schema":1576535672682,"derHash":"wjofgxVTioZRgW6ZMsBE64VsAf2ZdxaQyGNnHSLEhWQ=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"681c27ac05298a228c23d2463699b61b0aa53157638b6195793d2f53a4324aa3","size":1764,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/023b7b2a-88b0-4538-a665-37a504c10e0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"d6958925-96d0-4139-981d-d725a0cfcd01","last_modified":1576536533158},{"schema":1576535681283,"derHash":"piM+y3cFP3KTfolDcqYB7Tq+qQzDtdiVEnIL8//L3J0=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"42a159a44078e6c0428cd2a9784e5d8186a3da87350930ca5180f61690f4056b","size":1488,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/89ddf5ba-0659-4630-8b16-885ce7e6d764.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"fe1c2020-b88a-4748-9de2-7099a5ad0afb","last_modified":1576536533150},{"schema":1576535669802,"derHash":"nWEnnSIyqH4QjXir8uuhjSQRL4S1Y2ovQ7OaAPHqAHg=","subject":"CN=docSigning RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHgxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMR4wHAYDVQQDDBVkb2NTaWduaW5nIFJTQSBJQ0EgUjE=","whitelist":false,"attachment":{"hash":"5cd9fe248c1e6cfdd4496f76f7e9b0d9f810255c2d9fa5333ebee39edd8ffd14","size":2174,"filename":"xFyVKlUSjns3MjbWeJFTGcGIijP7GVc2KFJgm8bUeOc=.pem","location":"security-state-staging/intermediates/7109fecc-da82-4d0b-9fa5-b524a272ec72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFyVKlUSjns3MjbWeJFTGcGIijP7GVc2KFJgm8bUeOc=","crlite_enrolled":false,"id":"126ded4d-8431-41b1-8aaa-6c0ce484cc26","last_modified":1576536533139},{"schema":1576535674127,"derHash":"tIzzartJglw7fEB4ZpWMJAhck4xgx8GkihjQCFnKNIw=","subject":"CN=Duerr Group Global IT CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Duerr IT Service GmbH,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEeMBwGA1UEChMVRHVlcnIgSVQgU2VydmljZSBHbWJIMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExITAfBgNVBAMTGER1ZXJyIEdyb3VwIEdsb2JhbCBJVCBDQQ==","whitelist":false,"attachment":{"hash":"928dad68e0291b5a5f266a4c55be650b95b1211ff60094db0f2bb89e3e2ba03a","size":2060,"filename":"bnsFn2J9Leu9MsEXRbGO_q2R-jj5yi6VtDkLN6eGjeQ=.pem","location":"security-state-staging/intermediates/4accbbd5-64dc-41ec-b3a2-da410305e736.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bnsFn2J9Leu9MsEXRbGO/q2R+jj5yi6VtDkLN6eGjeQ=","crlite_enrolled":false,"id":"c4b02e84-aa88-460f-8418-ed2d4ce9c088","last_modified":1576536533131},{"schema":1576535668349,"derHash":"9QaMQpOiag5CDQKuS+8nAIN34+fs2OXPGUQoFi48QPQ=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"79bca702d17f54c89c8f1e54a7956e70ff158d4f2d61e7f721612a7f3e4bd4fa","size":2337,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/e6d61643-b154-4216-bc90-f92e5b6fee88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"e6faa6db-c65c-469e-908c-c757eb2ec1f2","last_modified":1576536533125},{"schema":1576535665468,"derHash":"MWAFjnKwWH51OssUyzfX+PZy17xTVJ9n1485yreGGCQ=","subject":"CN=SSL X Y & Z SMIME CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHIxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSQwIgYDVQQDDBtTU0wgWCBZICYgWiBTTUlNRSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"a097fe3436a48e1a1774823f1d3ec33dbaec7e073b22c598310479de26b737f6","size":2430,"filename":"MdoGDrhcCn8MTwSG3kgrfgj1b2G-u2wNnQpYY6Da_RI=.pem","location":"security-state-staging/intermediates/73a63257-cfe8-4332-909d-abd0ddfc4aff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MdoGDrhcCn8MTwSG3kgrfgj1b2G+u2wNnQpYY6Da/RI=","crlite_enrolled":false,"id":"5020f660-2bdc-4078-8c20-598e0bcc3837","last_modified":1576536533121},{"schema":1576535664030,"derHash":"VQdJ/141xAfVFdmLMnUEvEhP2q4opxOv5OIoKYa+BOg=","subject":"CN=Atos TrustedRoot Client-CA 2019,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"2763c7c0f3bcf025ec0ce357637ad9f89fd53a05004ea4e1da17b19062c0c5d2","size":1987,"filename":"CcXMYukvilEK0pDMWab7SEXh_fMs7tv1MLrQO9DXGDE=.pem","location":"security-state-staging/intermediates/d90a2b08-7306-4808-ad80-fe80b7cc54a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CcXMYukvilEK0pDMWab7SEXh/fMs7tv1MLrQO9DXGDE=","crlite_enrolled":false,"id":"326252ee-6763-4e00-9187-88a0d4172e5f","last_modified":1576536533108},{"schema":1576535662659,"derHash":"Gh+CWS4DO2IBlsuE5rYehctEiZJZXnDuKSR79cF3HYw=","subject":"SERIALNUMBER=202008,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA4","whitelist":false,"attachment":{"hash":"9ace3aac9b2541a7af8dfbb069619b62df30695152d476c2b4fd355300eb687e","size":2333,"filename":"psgf5vm4NPM1KfVsJMG2yfIKFfkuFfaruYmPA9y5EbU=.pem","location":"security-state-staging/intermediates/8cd8139f-8283-4cc1-92f7-5ae9c296893e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"psgf5vm4NPM1KfVsJMG2yfIKFfkuFfaruYmPA9y5EbU=","crlite_enrolled":false,"id":"1df62141-638d-4e30-b950-909f7bf55133","last_modified":1576536533102},{"schema":1576535661193,"derHash":"pP58fxUVXz8K73qqg89uBt65fKP5Cd+SCsFJCILUiO0=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"10c037107309161edc52970a837e5b2cfb01393b7a295c3a8af53adb4fe2e7dc","size":1215,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/246c8ccb-37a5-4b40-8b4f-c83734302c40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"4702383e-8507-468f-8710-add08465230d","last_modified":1576536533099},{"schema":1576535658276,"derHash":"Vyv4mf13Q2LcGSGWJezBV7tVQ06lFm1XWNxLT4kNZlM=","subject":"CN=ACCVCA-130,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMzAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"3bcfe77948ebaa1fe7f7bfb31339eeaba3e27a506d01e1f6704b54ecb78cc54a","size":2686,"filename":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=.pem","location":"security-state-staging/intermediates/ebb99ee5-c251-4021-80eb-3e74471c91bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=","crlite_enrolled":false,"id":"b94aff1d-4802-4d47-9d29-833321cc8644","last_modified":1576536533095},{"schema":1576535659737,"derHash":"llvSWDiN3dTqe6r7d1TfSfiWzwLhW+CSXeM7ADjpkl8=","subject":"CN=ITsMine Document Signing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=ITsMine LTD,C=IL","subjectDN":"MIGKMQswCQYDVQQGEwJJTDEUMBIGA1UEChMLSVRzTWluZSBMVEQxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEkMCIGA1UEAxMbSVRzTWluZSBEb2N1bWVudCBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"2c67f2b0b0186aec64088386089a58adb768c7499823baa61f1f8a11a70658d3","size":2048,"filename":"cPOXn2iF_axKs58wv5vJ7sPiY84mMQ63aDplTinh778=.pem","location":"security-state-staging/intermediates/b929354d-ee94-4466-9b96-48bee5a5f6ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cPOXn2iF/axKs58wv5vJ7sPiY84mMQ63aDplTinh778=","crlite_enrolled":false,"id":"0d633c6e-6482-476c-bcdb-4014ef17c4a3","last_modified":1576536533085},{"schema":1576535656889,"derHash":"IR8wg7nnegHQgoVliXoc6UXuquBJQszDaQh9gIDJ5KY=","subject":"CN=Certigna Wild CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHkxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRkwFwYDVQQDDBBDZXJ0aWduYSBXaWxkIENB","whitelist":false,"attachment":{"hash":"5496347e4439fb545ba2bee7caa37b999d7fbae9c05425339345faf2c1e52d1f","size":2166,"filename":"6PsBH2V6vxU_w6DnSyY4EpqQYeF8QrYgohY-fWMfhmE=.pem","location":"security-state-staging/intermediates/fc3270ce-2a3b-48cd-9a3c-dba02a58d9a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6PsBH2V6vxU/w6DnSyY4EpqQYeF8QrYgohY+fWMfhmE=","crlite_enrolled":true,"id":"fc74dd7b-d279-49bc-8b15-430100d07015","last_modified":1576536533078},{"schema":1576535655303,"derHash":"0gpAuxsFTRx0HPb0BHBUNoUfRo/ApFVklBzHx/dKEm8=","subject":"CN=BitCert SHA2 Assured ID CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MGgxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSMwIQYDVQQDExpCaXRDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQQ==","whitelist":false,"attachment":{"hash":"cd452783d809de9bf053ff47432c701bae9479d5129875f8323deef141a7761e","size":2109,"filename":"Eb_J1AmK0wOeRgjXvartK-UnMX6tUpo4ieIOClF8g2Q=.pem","location":"security-state-staging/intermediates/61caf33f-9ace-4134-98fe-d165a8ec1c58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Eb/J1AmK0wOeRgjXvartK+UnMX6tUpo4ieIOClF8g2Q=","crlite_enrolled":false,"id":"3aa5477f-8d27-4d3f-b148-e830916ccc30","last_modified":1576536533075},{"schema":1576535653934,"derHash":"C0Bc/ppr6wmP+5aRIcX2cQ8/f6nqEBpkGPevIB09OTg=","subject":"CN=Apple Public Server RSA CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgUlNBIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"2f8960fd8a1b0bc311f2c5d7bb7825254affcf347c165514fa071119dc28f794","size":1642,"filename":"1CC6SL5QjEUUEr5JiV4Zw8QxiSkGVmp2CRJ4mm1IhKU=.pem","location":"security-state-staging/intermediates/eb7ea53e-f578-4b8a-913a-dd87bcd7ab01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1CC6SL5QjEUUEr5JiV4Zw8QxiSkGVmp2CRJ4mm1IhKU=","crlite_enrolled":true,"id":"6acdc223-21b9-4ff8-847f-e22f72f1795a","last_modified":1576536533071},{"schema":1576535651001,"derHash":"8DhCHwfyDWOiDTaR5aF4q4RZ6+VwwWR7dpBVTvI4dqs=","subject":"OU=AC Componentes Inform\u00e1ticos,O=FNMT-RCM,C=ES","subjectDN":"MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==","whitelist":false,"attachment":{"hash":"711fb746c38ddfee6090169d62da5358968caf228ade2ad75cb8be4c4dd3832d","size":2430,"filename":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem","location":"security-state-staging/intermediates/0ab80520-1d1a-43c3-88ab-467f0681114b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=","crlite_enrolled":true,"id":"e28f2f6d-d594-43d7-8356-195ce9834fcf","last_modified":1576536533065},{"schema":1576535652494,"derHash":"tutPitGXBz/lID+Pzr/VxQnN6co6pl7FnSA4MUJBktQ=","subject":"CN=Secure Site Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJVNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzI=","whitelist":false,"attachment":{"hash":"1fe012e3f79fed86fcbc44ecbe0623dc6e29f5661b7a0c3e9fa7227ba2d32481","size":1699,"filename":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem","location":"security-state-staging/intermediates/6a40c4ce-bac6-44bf-8873-e22c2cf6735c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=","crlite_enrolled":true,"id":"d0ac7826-e8f7-4908-96fa-e77d77b7fca2","last_modified":1576536533061},{"schema":1576535649578,"derHash":"9swE4YU0YZ+y1l8ORbi0O8gVa11zzYets0fXPqgYDcE=","subject":"SERIALNUMBER=202005,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA1","whitelist":false,"attachment":{"hash":"13a3958f8e97bcc176573c94065b0838280266505f4e21d65dd4652ed1624007","size":2333,"filename":"lHjVx8leNZfTqDhJ3N-kjJRU57zR6fm4BDZ5v0rEF0o=.pem","location":"security-state-staging/intermediates/2d8c25c1-f2c9-4bd9-9c5a-9e6d8c25207a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lHjVx8leNZfTqDhJ3N+kjJRU57zR6fm4BDZ5v0rEF0o=","crlite_enrolled":false,"id":"6b0e77ce-e0d4-4ab7-8c1b-739e111d122b","last_modified":1576536533052},{"schema":1576535648114,"derHash":"QA5ehSTzVZh5hXYxLnWlRRQKTktzFMHIxT/X7IIOd7U=","subject":"CN=Cybertrust Japan EV CA G2,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFYxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEiMCAGA1UEAxMZQ3liZXJ0cnVzdCBKYXBhbiBFViBDQSBHMg==","whitelist":false,"attachment":{"hash":"12d7e73666399e1632382096136702c7f6ddd26eafb3f820e0d875b2159deb98","size":1581,"filename":"9xjmuIhAK6exitWv2xYUaN-6SVHIiB-Ru97-tkgiEaQ=.pem","location":"security-state-staging/intermediates/4fe4936e-6ee1-4086-9e1a-96626e262d90.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9xjmuIhAK6exitWv2xYUaN+6SVHIiB+Ru97+tkgiEaQ=","crlite_enrolled":true,"id":"e1a63b90-4f19-42c3-b7d2-78e446b0ec66","last_modified":1576536533044},{"schema":1576535646650,"derHash":"jLPSG7slXb/q+hon0dH3AyDchFZCl7zoLim48uRh8nA=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"620328d479e891c69d0c67a2ec66fd71909d1fe9036160c5d1b7bbe353e26461","size":1764,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/27eee13f-f193-44ab-8232-40eb1212232b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"bf2fe5fc-ec29-4166-b024-fc5fb8243944","last_modified":1576536533032},{"schema":1576535643788,"derHash":"7nk2QxmUdO1g79yMzeTTdEWSFoNZOqdRu/juSRo5Hpc=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"c96caf591ca234c790ecd0c0142086ce1cbad337effe808b85d29665b86b6406","size":1552,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/79818100-f277-4947-a852-dfbece0f18ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"624fd6dc-c0b6-4c85-8fb1-295b309ec7f8","last_modified":1576536533028},{"schema":1576535642291,"derHash":"wC2KMO1psvhk7Y+xpjo+clUoiSDKKUvcow9jiY+5GVw=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"084445d2bd7f8a0ad35589c511c54697c31173f9ad36a47aa142a7a1118fa204","size":2487,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/24de9566-9a8e-45bb-a121-561374a4c6fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"e84d58a8-f2a9-445a-9119-7dae1ad73849","last_modified":1576536533021},{"schema":1576535645226,"derHash":"my3U++6UH2UQ9xbASWmzZCiJJ2VGFwHvR9QbMolHXVA=","subject":"CN=DigiCert Global CA-3 G2,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEgMB4GA1UEAxMXRGlnaUNlcnQgR2xvYmFsIENBLTMgRzI=","whitelist":false,"attachment":{"hash":"757579da2f6f9930d26c82c4e92bc05ec07c1fcce3e1ee174551ff91391a2bd3","size":1662,"filename":"Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=.pem","location":"security-state-staging/intermediates/d3883f37-bd4a-41ad-8203-298556b22bf4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=","crlite_enrolled":true,"id":"ec6de765-7e2e-48d2-89d5-fa17988865eb","last_modified":1576536533014},{"schema":1576535637770,"derHash":"WoF+raSteHNOuyz2dDUtl/Q1IpDEDq8Q52Sx6sB1sOY=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"9e22882f79ab3be980839bd320927657c042801062d09965a2ee7f9c37cb5ebb","size":1553,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/eeca1f4a-6a10-4a9d-9ee9-def181a418dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"7266f37e-582e-4266-8b74-bc9fb7fd3dd4","last_modified":1576536533008},{"schema":1576535639426,"derHash":"hGDMrqkbDoBatRx81G3fLowcSUgG2Isf4u0xPR1Ifi4=","subject":"CN=Belgium Root CA4,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0E0","whitelist":false,"attachment":{"hash":"c8eff8eef440160ccab900bf7031e1af09b3a4bef4d8c101696a37821bbec601","size":1768,"filename":"sVOKkHFwWpLZOOUGtzjaDK_Rrmauwu7dx1R51DO9h3Y=.pem","location":"security-state-staging/intermediates/f288db85-ff0a-4046-9f02-6da9c467e64f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sVOKkHFwWpLZOOUGtzjaDK/Rrmauwu7dx1R51DO9h3Y=","crlite_enrolled":false,"id":"b2169a79-3567-43ba-8939-fa49dd624174","last_modified":1576536533004},{"schema":1576535634959,"derHash":"T4E3iCtte38au8/e0AgvDlzeyHC6OSPvhNCN3kLkN0k=","subject":"CN=Alcon Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Alcon Vision\\, LLC,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRQWxjb24gVmlzaW9uLCBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UEAxMWQWxjb24gUHVibGljIE9ubGluZSBDQQ==","whitelist":false,"attachment":{"hash":"af525935d6a89c209d6c44a4b29465804f968d30ea869b10f4edbb7b57813c09","size":2052,"filename":"WBomzJZ_qwkCDmRFxNmLqVSbWixOwsRY9u1EbzrMbPY=.pem","location":"security-state-staging/intermediates/7f8d798d-ec51-43f9-8b1a-a1597ea3a8a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WBomzJZ/qwkCDmRFxNmLqVSbWixOwsRY9u1EbzrMbPY=","crlite_enrolled":false,"id":"229edf78-3580-4ef7-b252-71bf9ceeb3c4","last_modified":1576536533000},{"schema":1576535640830,"derHash":"RCLjoUGFsWfX5NsIUbYwclshQjpBQIaDF9/r+z7BL4Y=","subject":"SERIALNUMBER=202001,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAx","whitelist":false,"attachment":{"hash":"a2cd59de0f5a95dd0fe8a1292a63d32d78185d5d4c846dd8a890d5e0e6d770aa","size":2333,"filename":"CI43x8FBUHvxfxoGbmHNltvH2MO4nkawMP-sUN2xS6Q=.pem","location":"security-state-staging/intermediates/7ff06f26-0a5b-405a-9d02-bd71339a3f76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CI43x8FBUHvxfxoGbmHNltvH2MO4nkawMP+sUN2xS6Q=","crlite_enrolled":false,"id":"3d35aca1-8f69-4db1-8da3-924aa35ec02d","last_modified":1576536532997},{"schema":1576535631984,"derHash":"9cLyPGUY+dGbbzm+rqT7rhADG6ncmFzhVjpSDaCtQRY=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"fe5ad678578f0f457c9742e59bdd7a274fc2a2703d89bb47f109be35c9fb47c2","size":1796,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/a8904bd0-aa03-46a0-bade-1596b9597a4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"9e54305c-cd5d-4716-a6ac-2c9ac161fb04","last_modified":1576536532992},{"schema":1576535636372,"derHash":"Za3JxpHTIVXmjOjVGTvzcildJaBAdUV7Me6FoEQbI/g=","subject":"CN=TI Trust Technologies Client CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MH8xCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSgwJgYDVQQDEx9USSBUcnVzdCBUZWNobm9sb2dpZXMgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"d92ac436ba1cab3afb23073f014daa729cb95f0b615852f9ad3be08dcf2e2e6a","size":2142,"filename":"rQbgtNOOZtnMnXSS7fXZPfjIVzkUf2zOAwb-4IxU9Vc=.pem","location":"security-state-staging/intermediates/a3c72377-4d1f-40ea-9cb3-66cfd6d0ec67.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQbgtNOOZtnMnXSS7fXZPfjIVzkUf2zOAwb+4IxU9Vc=","crlite_enrolled":false,"id":"de55f04b-e0f9-4d47-a8f4-5bb1ca8d24af","last_modified":1576536532989},{"schema":1576535633463,"derHash":"jCQQ92sUnKBitCCrYRtr8KBubnmaKVh+TU7BbQU3t+o=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"251b1c75021f8bc991e5055b95dc85d55b230fe1e51032acec934db9388e32bb","size":1548,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/9f419b94-c769-4b88-9c1a-b128ea2e4c7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"d511b39d-be68-4a28-831e-12c61c4a9c8f","last_modified":1576536532983},{"schema":1576535630524,"derHash":"YTvHs5w3gkHulTuhpRno9f4wIjsEV/EMw14wpJM7oT8=","subject":"CN=EV TLS RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFFViBUTFMgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"450066ddb6401419478134c6cc21c49591122f709bfab4eac6795f340d7fb7c0","size":2162,"filename":"gBX99XA0NOEUd6rWyM2Sljn_RHatTUjnhh-CTUMNF9Y=.pem","location":"security-state-staging/intermediates/42108e76-498d-4cf5-ba7d-c870ef1380c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gBX99XA0NOEUd6rWyM2Sljn/RHatTUjnhh+CTUMNF9Y=","crlite_enrolled":false,"id":"c15cd20b-10b4-4541-8ab4-4bc8b11d1ba3","last_modified":1576536532977},{"schema":1576535629122,"derHash":"h3oG24ul2jvaQClnYHePwqwYuRj9jcDs5C+q+U4OfgE=","subject":"CN=Code Signing RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHoxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSAwHgYDVQQDDBdDb2RlIFNpZ25pbmcgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"8e6d563b0f09cfa72c95f8a2d88bfd3916fae9d8695168d0808b7a763383c67e","size":2146,"filename":"K1lPt4REdICzUhMjxOlgDpqJPE3nn9EmNsiWORHNbF8=.pem","location":"security-state-staging/intermediates/8cf01f2e-8b7a-4d6c-b286-017322ec9948.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1lPt4REdICzUhMjxOlgDpqJPE3nn9EmNsiWORHNbF8=","crlite_enrolled":false,"id":"610aab37-a863-4feb-bdec-615fe799f373","last_modified":1576536532971},{"schema":1576535881203,"derHash":"/FUnD+zHzYsTnjTLDolmBrKwO79YSJMKUKJRNDo20Qw=","subject":"CN=SSL X Y & Z EV TLS CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHMxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSUwIwYDVQQDDBxTU0wgWCBZICYgWiBFViBUTFMgQ0EgUlNBIFIx","whitelist":false,"attachment":{"hash":"f056a95f23b4c48b57e03eb9655e5b2cdb76ae8ffb5a21b0c71900a4012e7ade","size":2446,"filename":"TJQd4p_Mb4gEcXc_faqyIKD02JVJuPcRmDP6eWrYj4U=.pem","location":"security-state-staging/intermediates/e7206eaf-5ba8-4318-9e57-7f0f7a5ab946.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TJQd4p/Mb4gEcXc/faqyIKD02JVJuPcRmDP6eWrYj4U=","crlite_enrolled":false,"id":"6cab8056-0a21-41cf-949d-aefefd3538ca","last_modified":1576536532962},{"schema":1576535627693,"derHash":"B3t19rf6cb5PgSHh7FL668oNCu0twBcRoPbc3Djnvzg=","subject":"CN=AffirmTrust Premium ECC Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE3MDUGA1UEAwwuQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"43b4e45ea693189a3d8c47075e8ca1933b10bcf2637194cee318ac943a3e3fb2","size":1284,"filename":"wbpI9B7IKa-_o7qnyxj6V-kvQMgcCDHDVt0t5EmhFCU=.pem","location":"security-state-staging/intermediates/9298955a-093a-4c5e-8b94-0cae2ef4d2f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbpI9B7IKa+/o7qnyxj6V+kvQMgcCDHDVt0t5EmhFCU=","crlite_enrolled":false,"id":"dc12948f-61be-42e3-928b-19b5d31626c6","last_modified":1576536532957},{"schema":1576535624708,"derHash":"fYm6d2TP9v4u6a1Eg41WxdV/Pdc2+WBo3psKFxD7PUc=","subject":"CN=Henkel Secure E-mail CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Henkel AG & Co. KGaA,C=DE","subjectDN":"MIGPMQswCQYDVQQGEwJERTEdMBsGA1UECgwUSGVua2VsIEFHICYgQ28uIEtHYUExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEgMB4GA1UEAwwXSGVua2VsIFNlY3VyZSBFLW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"294ab264e7b4ee55cfa9efb8ae4aea5f4996733a4807ee05c08cc6a41b60767c","size":2385,"filename":"UgDmKmS9-uOo8N_FB448s8_bWQidaNeI-pMnokDiLt8=.pem","location":"security-state-staging/intermediates/b2fbe93c-f81d-447a-8e42-a4fbb3cfb908.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgDmKmS9+uOo8N/FB448s8/bWQidaNeI+pMnokDiLt8=","crlite_enrolled":false,"id":"2c1552f1-bf67-4dd1-b718-1d94dca8ec29","last_modified":1576536532950},{"schema":1576535621506,"derHash":"dD4yjzKeGU2iUnEb9r/wDPY7akwKpmsuGWdxaRBniXE=","subject":"CN=TrustID Server CA E1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElEIFNlcnZlciBDQSBFMQ==","whitelist":false,"attachment":{"hash":"0bdc1e653dd27bde4924c78842f2ce8a676e17e94570bcb4d9a68dbb15842d8a","size":2398,"filename":"ddXHjYup7j8-aweO9eKo5dPHP_ulMVLc4zqjLbj0f6s=.pem","location":"security-state-staging/intermediates/a2c07257-f449-4845-8a46-396088d1f54d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ddXHjYup7j8+aweO9eKo5dPHP/ulMVLc4zqjLbj0f6s=","crlite_enrolled":false,"id":"3238adbc-8e16-4f0c-8de1-94a33d6b7601","last_modified":1576536532946},{"schema":1576535620060,"derHash":"GRHihJevksIKAdCKmO1CYcxLA1Vksxxv5J8zuUTv9KE=","subject":"SERIALNUMBER=202013,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEz","whitelist":false,"attachment":{"hash":"f711bb1c2c21ddbf0b2e54b19b1d218c32f69ec21cd4b5d142e882fbb86962c0","size":2333,"filename":"OYSO5rBxTAxhmALfXxoU_JmeXYPpNe7f9A8A7RlSMpE=.pem","location":"security-state-staging/intermediates/87eea63e-7839-4503-9b98-e116df917240.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OYSO5rBxTAxhmALfXxoU/JmeXYPpNe7f9A8A7RlSMpE=","crlite_enrolled":false,"id":"6995e0b8-1596-4485-b620-cdacc2d62dd0","last_modified":1576536532938},{"schema":1576535615726,"derHash":"7Cnv0MXdRFP5Ehu+TJzOvolZVerYc8ks/nQ4VPW48Jw=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"4b6def81757fa93692e39ad391d859a97a2588dbee94fc28099ded53ed43507a","size":1711,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/15da25c3-a3b9-4737-9e47-9c5c770f1a5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"0d24cbb7-5903-4eb4-90ae-67ba7e8ac227","last_modified":1576536532931},{"schema":1576535617235,"derHash":"I93wiyI3PYYVjrnJn9tTZrGYBFYFMTct0g3OP7dm9Ww=","subject":"CN=GeoTrust CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"286b2d63e30e027855db802c9e0539ca23b9a9060c9f3e3b810fc02209173191","size":1829,"filename":"4H6OXny7MqJPbCOTpHyS0fSSUeHk_I5nKbIyuQwnfsA=.pem","location":"security-state-staging/intermediates/8e773633-0151-43b1-93be-e2074d328d67.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4H6OXny7MqJPbCOTpHyS0fSSUeHk/I5nKbIyuQwnfsA=","crlite_enrolled":true,"id":"5e1984cb-9f6f-403f-98dc-ede2f85ccbae","last_modified":1576536532928},{"schema":1576535612816,"derHash":"3OsG4EanZwa9HZKPotuJPbVQ0pc5FIQ8XMXb4tnZt50=","subject":"CN=RISE Signing CA,OU=IT,O=RISE Research Institutes of Sweden AB,L=Goteborg,ST=Vastra Gotalands Lan,C=SE","subjectDN":"MIGWMQswCQYDVQQGEwJTRTEdMBsGA1UECBMUVmFzdHJhIEdvdGFsYW5kcyBMYW4xETAPBgNVBAcTCEdvdGVib3JnMQswCQYDVQQLEwJJVDEuMCwGA1UEChMlUklTRSBSZXNlYXJjaCBJbnN0aXR1dGVzIG9mIFN3ZWRlbiBBQjEYMBYGA1UEAxMPUklTRSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"0b3130a1bf94bcc09068abf71183511b68ea44796ff137283c0bb9befe436a08","size":2341,"filename":"ABereoS4tHlP22V2SwqX-_gSDxY5zscHpMnIBdDpp1Q=.pem","location":"security-state-staging/intermediates/59dec23c-71c4-4991-91c4-fc481fb67086.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABereoS4tHlP22V2SwqX+/gSDxY5zscHpMnIBdDpp1Q=","crlite_enrolled":false,"id":"46209f3f-7ba4-418d-bea7-e7fc955216a9","last_modified":1576536532924},{"schema":1576535609692,"derHash":"EAz34Tc+va4jPl+LGlOF/av+6KMfdS4zIZ00PeOvvJw=","subject":"CN=Ensured Root CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MG4xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xGDAWBgNVBAMTD0Vuc3VyZWQgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"dd7d8d5feb4991b7b316e15803451412027d152bba5f790538c890d7f73ad0a1","size":2020,"filename":"oFFz-dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=.pem","location":"security-state-staging/intermediates/e5746ff6-3f16-468a-b066-d3abf5428ab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFFz+dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=","crlite_enrolled":false,"id":"be465d19-94ce-4a45-8efa-c8ab0e3e3e75","last_modified":1576536532920},{"schema":1576535611170,"derHash":"7R/0Bw8IaOsgoDGfxgGRmAD25e/YI6YVayf4nLBLLCY=","subject":"CN=TLS ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHExCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRcwFQYDVQQDDA5UTFMgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"cdef2916796079c83b6dca7ea4057f6349122487ca8f75c47a08e663b83d0ac2","size":1329,"filename":"x0b-nG3FvmwYXc4hymUVggr-35gjXzG-RtqvVgdjLaY=.pem","location":"security-state-staging/intermediates/3953305c-dd4c-413f-9c24-c98b0e5a57c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x0b+nG3FvmwYXc4hymUVggr+35gjXzG+RtqvVgdjLaY=","crlite_enrolled":false,"id":"622d3ad6-978f-43e1-bfd5-8f6bebf7a53f","last_modified":1576536532916},{"schema":1576535614276,"derHash":"cFYQcjyWE/ZBMYHK33PVEHG9dh/aSRQj4avQAVAbZPM=","subject":"CN=Digidentity BV PKIoverheid Organisatie Server CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPjA8BgNVBAMMNURpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFNlcnZlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"ea3643e9caf068468406f4fccd9435feabff55ebc6e0969f16722f970943804b","size":2609,"filename":"zm4euNC-JiW-4by3xDIvrjNA-47VRZb3MnFpy-xVE4E=.pem","location":"security-state-staging/intermediates/3a61810b-d2ad-4815-aed1-a1d77b4594fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zm4euNC+JiW+4by3xDIvrjNA+47VRZb3MnFpy+xVE4E=","crlite_enrolled":true,"id":"5f89bdcc-376e-4489-9362-6be0bd69133c","last_modified":1576536532909},{"schema":1576535606746,"derHash":"OwzCA4StfyTrQ48rgMY+vgA/fyFbiHfkGOuwSEAo21c=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"87d3147517902aed8e819b14b1dacf02ee1294c4c3b31b4bb42a0369c1435b9f","size":1711,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/5cc18fd8-15e6-494b-a189-5e1a98f43e77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"ca408a50-c8da-4bfe-967d-1c1fd0bb946c","last_modified":1576536532905},{"schema":1576535605336,"derHash":"VfOjWfCibXL/JEwu45b9UbwkAOolDJHvw1Xi+BA8mTk=","subject":"CN=DigiCert PKI Platform C2 Shared SMIME Individual Subscriber CA,O=DigiCert\\, Inc.,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFHMEUGA1UEAxM+RGlnaUNlcnQgUEtJIFBsYXRmb3JtIEMyIFNoYXJlZCBTTUlNRSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0E=","whitelist":false,"attachment":{"hash":"fd6efa96746cef0ca8ce8597e6e6fbc2f1cb6fa9dd9295250b112e46354ea94f","size":2182,"filename":"xCPd-4wOcg7RHCiFt8QndJQj0lTGpZNzZgqyMY0yEFw=.pem","location":"security-state-staging/intermediates/f079080e-f88e-4928-97ef-7f18e0a5938b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xCPd+4wOcg7RHCiFt8QndJQj0lTGpZNzZgqyMY0yEFw=","crlite_enrolled":false,"id":"e20477f8-f814-48f9-bd92-7e92a2bd12c3","last_modified":1576536532901},{"schema":1576535603787,"derHash":"gC4LEz1hRBoKaveZ3F5LJglymQ1ty4fcCs/FhdkIJhA=","subject":"CN=KAINOS-PUBLIC-TRUST,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Kainos Software Ltd,C=GB","subjectDN":"MIGKMQswCQYDVQQGEwJHQjEcMBoGA1UEChMTS2Fpbm9zIFNvZnR3YXJlIEx0ZDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMRwwGgYDVQQDExNLQUlOT1MtUFVCTElDLVRSVVNU","whitelist":false,"attachment":{"hash":"f9b2ca117f05b362a6d654febf9b94ed53454c2fd3971b036e93ded0a1ca2a1e","size":2052,"filename":"c_Ep9MPvAU_vVs08JfE2_ztuEqYPDLwz_RD1oE_4__M=.pem","location":"security-state-staging/intermediates/e93cd091-763c-4dc9-a571-7c2da2b86a50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c/Ep9MPvAU/vVs08JfE2/ztuEqYPDLwz/RD1oE/4//M=","crlite_enrolled":false,"id":"46307b27-d96a-4832-a7c6-01140ad38819","last_modified":1576536532898},{"schema":1576535602401,"derHash":"Kosib1zF9+os4ESe64pxX4a7rSRB53XcX4m/f7BlphY=","subject":"SERIALNUMBER=202004,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDQ=","whitelist":false,"attachment":{"hash":"530c26605f6cc334c3b24de395cde5d524dc087c7e5d426c096ae73d47e5671b","size":2337,"filename":"YKoPQytsUiYv9XeHwk2Vn9vD9ArNj_LsZreUUWmHDPM=.pem","location":"security-state-staging/intermediates/f5b681e8-e2c0-4537-9b4a-5e7391c4a09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YKoPQytsUiYv9XeHwk2Vn9vD9ArNj/LsZreUUWmHDPM=","crlite_enrolled":false,"id":"28a75208-9a9a-47d5-8400-f79e047b5462","last_modified":1576536532894},{"schema":1576535600960,"derHash":"z7IiWXstBVtHh9pyOnSNfi9Dd9t8i5T3/ZmvW9IWP8k=","subject":"SERIALNUMBER=202002,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAy","whitelist":false,"attachment":{"hash":"513c238212527dc8f0129c6323cbf9607be77ea2434d5ba48063eaa65e8f1720","size":2333,"filename":"TXCiKaiHdI6ASTC6_M9mbHGeLbmkLX5hTPl45I7zvY8=.pem","location":"security-state-staging/intermediates/1ae2f1a9-4b9a-4207-8977-04f97bfd005b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TXCiKaiHdI6ASTC6/M9mbHGeLbmkLX5hTPl45I7zvY8=","crlite_enrolled":false,"id":"e579267f-82d9-4f4c-8aa0-323312c433c5","last_modified":1576536532887},{"schema":1576535597671,"derHash":"4VXr+WM055ri4ofVXPyRhd4kk1plPxPFugWv+Bh3G8Y=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"55655605c7ce9c971ab03390d8184fc277ae70699910a9e487994de27fd1e269","size":1638,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/dd061739-a439-406c-bc1c-c3dcf1a5c2c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"53fa801b-05d6-4051-90f3-4350385d8e6c","last_modified":1576536532883},{"schema":1576535594773,"derHash":"G8OytG+vAPCtjmleK3WTvZNHNl0savqxSQ42CJbvbko=","subject":"SERIALNUMBER=202009,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA5","whitelist":false,"attachment":{"hash":"3ce81fe0691ef3beea65fca4658bd6387ac10bbe5f14ec28000785c58f4950a5","size":2333,"filename":"DSlbVTwQBYvCao9cl8EkWAC1CjW7Fie6KKpzjPDp1Rw=.pem","location":"security-state-staging/intermediates/34f0e639-4d4d-47c8-9598-8259f59ee104.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DSlbVTwQBYvCao9cl8EkWAC1CjW7Fie6KKpzjPDp1Rw=","crlite_enrolled":false,"id":"274acd87-6025-4bce-bb40-37e93b78302b","last_modified":1576536532879},{"schema":1576535596263,"derHash":"ANuGpwh6dQzgezJV0NMSnoiMqeDuys+ecr2ydrFxR+8=","subject":"CN=KLASS3-SK 2010,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MG0xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSEwHwYDVQQLExhTZXJ0aWZpdHNlZXJpbWlzdGVlbnVzZWQxFzAVBgNVBAMTDktMQVNTMy1TSyAyMDEw","whitelist":false,"attachment":{"hash":"042b094c75aa054c83b0bfb76bf4cc6a362c77b88f8c7ddffc0770a77ea5ce75","size":1849,"filename":"21pSl8-gYIgzVrmihoLqfp4XlT3k97qo-M2ZGRQsy4Q=.pem","location":"security-state-staging/intermediates/8b165542-5819-4ea0-b9ec-4b1f31d1704c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"21pSl8+gYIgzVrmihoLqfp4XlT3k97qo+M2ZGRQsy4Q=","crlite_enrolled":false,"id":"c4e9303c-d86a-4819-adae-e6fbfe2cd985","last_modified":1576536532872},{"schema":1576535589142,"derHash":"ThU6WIh3aI8aDBA6CEwu2zrR2MSAzwPYq2/tR9kgQ3A=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"76d0b5a6bef0132806bae16a534cb1699d6f053ea10a73a6a9f121dd15765520","size":1626,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/0488e943-51c6-4a2a-9cc4-5979ebb4cc57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"f366897a-f2ea-4b9e-be08-13b01c4f215c","last_modified":1576536532868},{"schema":1576535586284,"derHash":"Pwrls9BWUkcqEIwoVGNksxtaM9AVKLVV/qshr667Wzo=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"61d3d2c76fff74929a739fafc9288572e7cb53a76ebc465347acb2c2000ca94c","size":1447,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/9c45e999-6dc2-4a83-b49b-687d87da1f29.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"5cb4733e-13a4-4279-81c5-5692b01bd879","last_modified":1576536532862},{"schema":1576535587654,"derHash":"yHzgOv+13mMZwhmXHy7S2Pb1OJ4tU7It0sVipcmCf8A=","subject":"CN=GeoTrust EV CN RSA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IEVWIENOIFJTQSBHMQ==","whitelist":false,"attachment":{"hash":"d222797c82dd7127576a516cb679acc7149d876ca1871f151665584a65c8958e","size":1678,"filename":"_AbtYXa2JlKxQyB1FnBObb2Wv8Q-bUxjsGRIXvzcvpQ=.pem","location":"security-state-staging/intermediates/018708e8-2e71-4cdd-808d-b307f41e71a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/AbtYXa2JlKxQyB1FnBObb2Wv8Q+bUxjsGRIXvzcvpQ=","crlite_enrolled":true,"id":"dd86d747-415a-4663-841b-9d245710f0eb","last_modified":1576536532858},{"schema":1576535584747,"derHash":"cMfmgRnfrRKKiOHXr4501aGeKxmh9ejwCKnPUPRPLbs=","subject":"CN=SSL X Y & Z TLS CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHAxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSIwIAYDVQQDDBlTU0wgWCBZICYgWiBUTFMgQ0EgUlNBIFIx","whitelist":false,"attachment":{"hash":"fa1303b719e1d84c2d575bdb34a549d866cb7136d850a3400cbfd89b2f4ccbe5","size":2430,"filename":"R4T7HX6pKZp9r7OGr6NyCYcdUsEH_aad6Zft_LMvyf0=.pem","location":"security-state-staging/intermediates/5bb7f143-7660-4b95-878e-f1341fea8ea6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R4T7HX6pKZp9r7OGr6NyCYcdUsEH/aad6Zft/LMvyf0=","crlite_enrolled":false,"id":"d62e32e9-67fb-4119-951f-c462ddffe4e7","last_modified":1576536532855},{"schema":1576535583284,"derHash":"2jvIEAX9u4U9aBp+lCZhrrojeJIRUl6vUiIfKFFMCcs=","subject":"CN=QuoVadis Issuing CA G4,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBJc3N1aW5nIENBIEc0","whitelist":false,"attachment":{"hash":"7b11a86250a18ac5dac6b4e9d9a5638069dc115c40cfdef38dc073726ccda870","size":1967,"filename":"Q3uGh6nrEU1_2eTHReUBvoLYNArYb3i7Qz286_nBn7Q=.pem","location":"security-state-staging/intermediates/35521446-cee1-4cf0-947c-c068c11acec1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q3uGh6nrEU1/2eTHReUBvoLYNArYb3i7Qz286/nBn7Q=","crlite_enrolled":true,"id":"13ab7e91-4d7f-417d-9099-ffcf9e4bf594","last_modified":1576536532851},{"schema":1576535581658,"derHash":"en2t4IVo/Tv/JFPmm3qE1b9Bc7S/WM0GQ/8GDDX5Fl0=","subject":"CN=SSL X Y & Z TLS CA ECC R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHAxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSIwIAYDVQQDDBlTU0wgWCBZICYgWiBUTFMgQ0EgRUNDIFIx","whitelist":false,"attachment":{"hash":"d9454a599aefed353e8d1bead50ae07d5bd45c94c6729e3d59e8c4c72306ab4e","size":1268,"filename":"TC1hkMikhbNbWT7TjUDnHdt4hkFz4dY7ULwwF8-lf3I=.pem","location":"security-state-staging/intermediates/14e678e7-d2fe-4b48-a544-60cfa82b3275.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TC1hkMikhbNbWT7TjUDnHdt4hkFz4dY7ULwwF8+lf3I=","crlite_enrolled":false,"id":"fc0bb8ef-4095-4f5b-98eb-34c572664019","last_modified":1576536532843},{"schema":1576535578773,"derHash":"dO8zXl4YeIMH+52Jy3BL7BEqvSNIfb/0HE3tUHDyQdk=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"d127064c98a35e06b558457e35c1d15905d100eb14b73d7fd679b978441b5b0f","size":1589,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/a6c94cd4-4f33-46e2-8858-3eacc056bb12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"f4e16820-98b9-49a9-8e18-7494d1d0dd70","last_modified":1576536532836},{"schema":1576535580153,"derHash":"Bip25RluTGIgrKfTKqQZdhEBN0wRhmw2J9X4oFXs4s4=","subject":"CN=Symantec Class 3 Admin Intermediate Certificate Authority,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgQWRtaW4gSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"6e68121c7da618c74b2bf94b41b68161d9de0843f9a65350b2b41464efdd6c36","size":2203,"filename":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=.pem","location":"security-state-staging/intermediates/1ebad936-5863-490b-a667-2a96eb695a7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=","crlite_enrolled":false,"id":"9942326c-f86b-4922-895e-e23f9e021b32","last_modified":1576536532832},{"schema":1576535577287,"derHash":"80mVTo+21EARvLeJ2X2aLLIDK9XwtZjR+4oJn1hI1SM=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R5,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNTETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"8e31af76b6ffba628ef77f3869f8354882f946eb5ff2352cf52785a9787b247b","size":1325,"filename":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=.pem","location":"security-state-staging/intermediates/afbb8634-f114-41c2-98ab-86ef89d3a7f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=","crlite_enrolled":false,"id":"77a173f6-46fd-4be8-ba6f-c64b6308db3f","last_modified":1576536532829},{"schema":1576535575850,"derHash":"ZhFE0REXIkQICyTX/kp7zraow12gyZGMjppYY13Ekjw=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"4277e2a7f71129a3837869b4dc2390a017ee5641def4a8640f1b4f673b8b643f","size":1760,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/eadd6041-e936-41dc-ae64-e03625e527ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":true,"id":"f00a5631-60d1-4b34-9191-50b30924ed38","last_modified":1576536532825},{"schema":1576535572387,"derHash":"D+RlaG/uLc0BKaFqfVm6Kisz9lKbWYiXU7g+C+o7fgQ=","subject":"SERIALNUMBER=202007,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA3","whitelist":false,"attachment":{"hash":"a5513b0fbc7d522403e4c0ca9a2ad46a72d21ee012f373b1b0db761e2ae7e601","size":2333,"filename":"sRTAvLuml1nZ25l3oqzol98ZuS1JG5EdhJ-TY63PwXo=.pem","location":"security-state-staging/intermediates/713bda9e-695b-47d5-bfb8-022892bf0b34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRTAvLuml1nZ25l3oqzol98ZuS1JG5EdhJ+TY63PwXo=","crlite_enrolled":false,"id":"7914b6fe-1a40-47cf-8d43-5b437aec1f07","last_modified":1576536532821},{"schema":1576535569402,"derHash":"IpdXDb0sDe8bBQ2ZJ/6oldsP0guCuFluCgoTJezgjQU=","subject":"CN=SECOM Passport for Web SR 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"e915fd41e3e3cc034825e2e513688643882df2dd79b58f8738fe092993109c81","size":1520,"filename":"0CzdK_GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=.pem","location":"security-state-staging/intermediates/5b3e9b4a-ea34-4675-849e-8adbd915a261.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0CzdK/GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=","crlite_enrolled":false,"id":"9ec6f3e5-9aab-41f6-9ccf-5ede8da74e5e","last_modified":1576536532814},{"schema":1576535570874,"derHash":"D1e5b6ezEkfsOcswfTjKK/Oyn1Sv1Qo1HRhTNSlRe0Y=","subject":"CN=DigiCert Transition Root G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBUcmFuc2l0aW9uIFJvb3QgRzM=","whitelist":false,"attachment":{"hash":"c080ef9080f906fa2c289ef910f8910848f4f26bfb328c0efd43ac77fcc52cc3","size":2040,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/ce901e54-cf68-4abc-b935-9640cec37430.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"fb9b4b7b-76ea-4ba8-b5f6-2f80547aa743","last_modified":1576536532811},{"schema":1576535567918,"derHash":"26EJdxDzximUPCPcdQOsgrkUKCXvBJ8cJlONs2tIBUk=","subject":"CN=thawte Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMScwJQYDVQQDEx50aGF3dGUgUHJpbWFyeSBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"89dee949e02c694fa984b3b8c8b7969c98ab3399e00e52dca4306446b0384992","size":1735,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/03b26244-8e28-4bfa-acb2-0df61add2abc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"af87efd1-445a-4171-8aef-7caaca23fb3f","last_modified":1576536532807},{"schema":1576535566488,"derHash":"KtkJUW/XLKcNgB7oMeS7heqvlsJSDI+Dy6aOm1Rz9Nk=","subject":"CN=TBS X509 CA Persona 3 (RSA),O=TBS INTERNET Ltd.,L=Douglas,ST=Isle of Man,C=IM","subjectDN":"MHcxCzAJBgNVBAYTAklNMRQwEgYDVQQIEwtJc2xlIG9mIE1hbjEQMA4GA1UEBxMHRG91Z2xhczEaMBgGA1UEChMRVEJTIElOVEVSTkVUIEx0ZC4xJDAiBgNVBAMTG1RCUyBYNTA5IENBIFBlcnNvbmEgMyAoUlNBKQ==","whitelist":false,"attachment":{"hash":"461a7cb9308661369347d20ce15e3c4d6ebfa7b32b74c4a2b3d2d306d0b9fe81","size":2125,"filename":"z3pEJKBoO1fdk2jCBPfRIop6ygjEkto5FhQko4yPR9A=.pem","location":"security-state-staging/intermediates/9f88bad7-8b3a-4092-9c6c-c850ef8cf5c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z3pEJKBoO1fdk2jCBPfRIop6ygjEkto5FhQko4yPR9A=","crlite_enrolled":false,"id":"b299de4d-2908-4fed-9755-f51ebc482510","last_modified":1576536532803},{"schema":1576535565134,"derHash":"x80C+uV4aHQ2n1NFdBbrcTNXFkf+kSIJ78Twd6jtcuM=","subject":"SERIALNUMBER=202015,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE1","whitelist":false,"attachment":{"hash":"51ef9ce4079b75fb93d27cb9af4ed07b2bcd7336b6f53687b00e904458dcf0b3","size":2333,"filename":"kY1t8IGrljcRfRgo1nuCJj6b5Qn9itJ695GG1Rd1Bro=.pem","location":"security-state-staging/intermediates/c31bd631-14e9-4399-b33e-79c247091349.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kY1t8IGrljcRfRgo1nuCJj6b5Qn9itJ695GG1Rd1Bro=","crlite_enrolled":false,"id":"5b90ea65-389e-4fb6-b10f-faef455a1c0b","last_modified":1576536532799},{"schema":1576535563725,"derHash":"6TJ6NHy+HLlM3JqlTLMbbkPWiWjRfQnOMmoJG/wvCxE=","subject":"CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"88d175177fc311fc5ad5e439d61dfabfbe6a0cc3dbf7be58654a104156ba2dae","size":2686,"filename":"qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem","location":"security-state-staging/intermediates/7b9e7264-b0e3-4c9e-bda1-908a922c5b3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=","crlite_enrolled":false,"id":"772a5e91-e4ab-4bc1-b2a7-9d88c0c7e9bf","last_modified":1576536532792},{"schema":1576535560876,"derHash":"j7iGQfTiMc6BQ2N1E4pbNtKgajzCpJ5bH0aZmBvh5FE=","subject":"CN=Absa Group Limited Public CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Absa Group Limited,C=ZA","subjectDN":"MIGSMQswCQYDVQQGEwJaQTEbMBkGA1UEChMSQWJzYSBHcm91cCBMaW1pdGVkMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExJTAjBgNVBAMTHEFic2EgR3JvdXAgTGltaXRlZCBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"51736122794efa7bfecf956b04e07f42516a9ed8361aa4a44f250170f90cfb86","size":2048,"filename":"vRb7HqdoT5ixhzzRCvN6PNUCaEBVGzIOVNy1MyJgmZU=.pem","location":"security-state-staging/intermediates/07490972-9ddc-4a60-8439-1f434b2f63a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vRb7HqdoT5ixhzzRCvN6PNUCaEBVGzIOVNy1MyJgmZU=","crlite_enrolled":false,"id":"795ca4a8-041d-408c-99cf-62a09306cc8c","last_modified":1576536532788},{"schema":1576535558052,"derHash":"QNaZIOoFRW+gEX3mCLioATeQtUIJfjQ+wcvOLfuXE7A=","subject":"CN=Secure Site Pro Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENBIEcy","whitelist":false,"attachment":{"hash":"8020f42d89c841697f922651d0d7b35319708585b4dae12e24e03526e2a96f83","size":1703,"filename":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem","location":"security-state-staging/intermediates/adec223e-eda3-4d12-bdab-c4e535e58e79.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=","crlite_enrolled":true,"id":"982fce8e-e441-4c2f-a4a8-2304fb7e2ac2","last_modified":1576536532781},{"schema":1576535555127,"derHash":"sTGQXMciEnBhO1KayeeGqiMKv+FUoKy+RSvDUL0e/ks=","subject":"CN=DigiCert CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IENOIFJTQSBFViBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4faf62df3f53a4fe26ac667c6b9d791fd8d952eec9c249782056ad06c4fead0d","size":1683,"filename":"mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=.pem","location":"security-state-staging/intermediates/20053df1-5626-4ba2-a024-3f6bb49f5e6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=","crlite_enrolled":true,"id":"5ed1b67e-597a-44c5-bbf4-973e53cc5889","last_modified":1576536532777},{"schema":1576535556567,"derHash":"zXMOU/5zLY8J1ows2/0e/ZioVfXhSQIcAcsu7h2Bhuc=","subject":"CN=COMODO RSA Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"7d2f460009e99bedb3ed4c894ebf320d7eed0cf7460a7d81e4eb7dcfd8793cf7","size":2158,"filename":"Fbr_5aSOo4KRal8YE49t4lc76IOnK_oto9NWV1cSKWM=.pem","location":"security-state-staging/intermediates/0e5c6bab-00ba-4b47-8e40-654d140bf187.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fbr/5aSOo4KRal8YE49t4lc76IOnK/oto9NWV1cSKWM=","crlite_enrolled":true,"id":"5db685fc-9b69-480f-8fc6-f5e4386636ad","last_modified":1576536532774},{"schema":1576535552192,"derHash":"38x3XGRNtKM61xKTQz9GPI4xBXziLLJn+dMaA1P0/C8=","subject":"CN=Amazon,OU=Server CA 0A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAwQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"beb147abe96d6e343843d2e2fd729d58e42b2dab74a3c0ccc41530639168e721","size":1666,"filename":"tYU57KoTkhzNuA0400h1_eZHHFoVnZvu8vpvmZg71hE=.pem","location":"security-state-staging/intermediates/e3003237-67fc-4118-adfa-35b22f4430b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYU57KoTkhzNuA0400h1/eZHHFoVnZvu8vpvmZg71hE=","crlite_enrolled":false,"id":"838bb94d-8f5e-4921-a93a-9035addc8ae6","last_modified":1576536532770},{"schema":1576535553697,"derHash":"I7zV16lqUTqYHq0nk25ZqAKKgHvXKGBBj2i1VaKRFnA=","subject":"CN=Certigna Identity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MSIwIAYDVQRhDBlOVFJGUi0wMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBJZGVudGl0eSBDQQ==","whitelist":false,"attachment":{"hash":"211c9fabe3b82a58caaded8a0e4fe51f77d8506e143103dc3f8db31704cb7e6e","size":2178,"filename":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH_eJZlWjWo=.pem","location":"security-state-staging/intermediates/00c1f21f-a695-478a-9e33-19d48f9525d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH/eJZlWjWo=","crlite_enrolled":true,"id":"f695b618-333e-4759-a681-19c5f52aeb16","last_modified":1576536532767},{"schema":1576535550809,"derHash":"U5wT1vJzElL5ndK69D1AVZxGxYV1jE/EQQx+xILb7Wk=","subject":"CN=OneSignSSL ECC DV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIEVDQyBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0e21e684e88796f0f844928dd52cc107b1280c4c7eae78e1934ca07301495bb1","size":1313,"filename":"8vM1dUqGdSXi2UQvVgGUGNw0L1p0-y-yK8MC0MVE9Zs=.pem","location":"security-state-staging/intermediates/86301532-3955-416c-9e34-7bcb144c4837.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8vM1dUqGdSXi2UQvVgGUGNw0L1p0+y+yK8MC0MVE9Zs=","crlite_enrolled":false,"id":"e0e26920-5001-4bb2-b934-8e6f0697161c","last_modified":1576536532763},{"schema":1576535547841,"derHash":"LeYg8tEgCqkLFsPM9nD9ftFDeasG+osDHP742gUepaI=","subject":"CN=ACCVCA-120,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMjAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"edd78aa1bd6255d7f1003657a126700b8500239227d9aba192fc06dd0a8d1d6b","size":2686,"filename":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=.pem","location":"security-state-staging/intermediates/65d00951-3633-4568-89cc-188eb82084b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=","crlite_enrolled":true,"id":"cf7c93de-8a6e-4b12-b0aa-7dc5ef535f84","last_modified":1576536532759},{"schema":1576535549332,"derHash":"ORIgcFt1vPPtPNSzYxIT9WnSz4ImEB4XB5mlNUqxKGE=","subject":"CN=Amazon Root CA 1,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=","whitelist":false,"attachment":{"hash":"076400302106a1d71c433340807aa21af7fdcdd85ff586d57757cf6d6718dbc4","size":1646,"filename":"--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem","location":"security-state-staging/intermediates/3f9e0d02-5eec-434a-9f82-730c885b8a36.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=","crlite_enrolled":false,"id":"9cb19f7a-6a36-46ac-a938-502daee657ab","last_modified":1576536532756},{"schema":1576535546460,"derHash":"DcCb1929fCwKuKBoB0wVc3SIj/qXYpAFFM8NWfqvNL8=","subject":"SERIALNUMBER=202011,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEx","whitelist":false,"attachment":{"hash":"0bae1aae996ba5f02e57521b5020e6363bbc4090b93b9c08c78a8239a09bb853","size":2333,"filename":"q2i_RQ19XRNztaq5O0Vqrcxf0DOsBBy3DYkUcG-I2g0=.pem","location":"security-state-staging/intermediates/92c0c429-f2cd-4bb1-a505-09504e342281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q2i/RQ19XRNztaq5O0Vqrcxf0DOsBBy3DYkUcG+I2g0=","crlite_enrolled":false,"id":"4ae8957f-b111-42f2-88e8-6d2e0d084617","last_modified":1576536532752},{"schema":1576535544989,"derHash":"pfS4JqWGN/kStp/oWZByQ73+qnGgLcRCnQZk4hSgqds=","subject":"CN=EV TLS ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFFViBUTFMgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"a1b4c52e486a2016d66dc838bc590e59ddd948336f11ca09416ac685b53e9483","size":1341,"filename":"Hm-YeyBPf0CgyqM7jDoHDoSn9_W6pVfgP9SsXIGh6d4=.pem","location":"security-state-staging/intermediates/a3259a3d-6fb9-47b0-a295-0225b3cde342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Hm+YeyBPf0CgyqM7jDoHDoSn9/W6pVfgP9SsXIGh6d4=","crlite_enrolled":false,"id":"8c7f006c-01ed-40dc-a748-e934bdf889f9","last_modified":1576536532749},{"schema":1576535542013,"derHash":"Oi++kokeV/4F1XCH9I5zDxflpfU+9APWGOW3TXp+bss=","subject":"CN=Go Daddy Root Certificate Authority - G2,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMTAvBgNVBAMTKEdvIERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"28840eaf068daaa9dc2d390f16a3685d787b1538e5d8cb9b2977d2063d3719ba","size":1618,"filename":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=.pem","location":"security-state-staging/intermediates/9a9d5981-04f6-43af-9a85-cf7f8a3cfaf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=","crlite_enrolled":false,"id":"db9d1a57-7d79-44f0-a9c2-f880bce304dc","last_modified":1576536532745},{"schema":1576535540530,"derHash":"hTY6JMsbZubPYkTofSQ9u4MG9gc1fGFMucTCJKDgQ1g=","subject":"CN=QuoVadis PKIoverheid Organisatie Server CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTgwNgYDVQQDDC9RdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"2b9839d77bb3847c1706cb2e8bf87fef25e339114ceb10c8c50b05924d67ef9e","size":2609,"filename":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=.pem","location":"security-state-staging/intermediates/5d4f4104-270d-401d-8122-44c0c565d211.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=","crlite_enrolled":true,"id":"4cb231b7-c2c3-498a-b050-cb940c8ed420","last_modified":1576536532741},{"schema":1576535537496,"derHash":"xUU/fBRwFqmqD19LsdIX3r4cLTaMU890019VxSM8SYo=","subject":"CN=OKCERT R4 EV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IEVWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"7d588ca61738784840bbd7ff005ff17935bc0d1a36366ef3279871fa2e31ba71","size":1776,"filename":"fFdFUEieyjNs9DctpEE6fSI3FB56V1hzaJMiFIo0Rnk=.pem","location":"security-state-staging/intermediates/72d9b43e-856b-4662-a065-6f3500f76267.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fFdFUEieyjNs9DctpEE6fSI3FB56V1hzaJMiFIo0Rnk=","crlite_enrolled":false,"id":"ee0c36d3-570c-4d2a-a081-be514ff0a94b","last_modified":1576536532733},{"schema":1576535535906,"derHash":"hsZwe74nzeEhXiXT+BRqUiKB4YxF3yy4xvt6A8FzNRA=","subject":"CN=GDCA TrustAUTH R4 Generic CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGgxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjElMCMGA1UEAwwcR0RDQSBUcnVzdEFVVEggUjQgR2VuZXJpYyBDQQ==","whitelist":false,"attachment":{"hash":"3b6dea215a5d301b1acaa2f77d6d9182513b6bf335cd1cfaa9683bc4efe3d224","size":2060,"filename":"mXaq2dsX_TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=.pem","location":"security-state-staging/intermediates/74e3a779-4648-4fc7-8e96-17622071ed2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mXaq2dsX/TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=","crlite_enrolled":false,"id":"6ed2cbdd-26bb-461a-81d7-712abefd1ddd","last_modified":1576536532726},{"schema":1576535530119,"derHash":"FPr8qEvbiw7DJxknK+cw/hjW/CkwHFz3iUAFluxCmv4=","subject":"CN=DigiCert Assured ID Client CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ2xpZW50IENBIEcz","whitelist":false,"attachment":{"hash":"139cbdece29a63f10575c4fd3db1782db101a13332f52498f6d746d203036116","size":1471,"filename":"OwnA3IH2SexQr1cTjKzw_Xj6O5qxksjv4SAEa7AYVio=.pem","location":"security-state-staging/intermediates/c08a5a8f-f3b4-4fdb-8c64-e237b98f8316.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OwnA3IH2SexQr1cTjKzw/Xj6O5qxksjv4SAEa7AYVio=","crlite_enrolled":false,"id":"5f7e3c26-5dc5-4bca-820b-89b0835e925a","last_modified":1576536532722},{"schema":1576535533020,"derHash":"YvaSt0R5U9QgWrMbTjTUWgKhLKRWVK+CcP7NieLbPkc=","subject":"CN=AffirmTrust Commercial Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgQ29tbWVyY2lhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"27a3e81bf9f6497aaae6fec88eedc3a72c99ce9e8c856dcb65308fc860687bbc","size":1581,"filename":"cP3S-p60iPGa8-tLw-iQ2NE3CAx2vu0EeyZs6EXiCyo=.pem","location":"security-state-staging/intermediates/e3ba7120-a042-4465-9b24-297a54fa1d86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cP3S+p60iPGa8+tLw+iQ2NE3CAx2vu0EeyZs6EXiCyo=","crlite_enrolled":false,"id":"4b12644e-fa2b-4185-8818-40f29402009d","last_modified":1576536532715},{"schema":1576535531565,"derHash":"JYR9Zo608E/dQLErawdAxWfafQJDCOtsLJb+QdneIY0=","subject":"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMw==","whitelist":false,"attachment":{"hash":"de6da669c1368f77b7e9d695474ed9aa592423603bbbe6a546b8bd3c90c2f2fb","size":1646,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/3df213e3-41eb-4ad7-9716-411dd9ac133d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"096b6a86-f254-4a09-9836-f98ddf792a1a","last_modified":1576536532711},{"schema":1576535527226,"derHash":"YNNVEG3WRk9qvlT/Wc3Gi5yWFei3FScfV/yZb2zvIdw=","subject":"CN=S/MIME ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFTL01JTUUgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"03d3ff16730384f2fc15daf75d20e0acad2849f2cee795ed8614e55a92fdd10f","size":1333,"filename":"KnJHdgWgUyBWr1LjNnzAFNzR0twTYLZWklBuL0-EpBY=.pem","location":"security-state-staging/intermediates/2f4e4051-4278-40b8-8687-b00bb9eb8d72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KnJHdgWgUyBWr1LjNnzAFNzR0twTYLZWklBuL0+EpBY=","crlite_enrolled":false,"id":"c4e0a4c3-c9a2-4571-bb3e-18933abcc323","last_modified":1576536532708},{"schema":1576535524269,"derHash":"AgcFbRcsgL37bcRb6eWAiEYHjR5u7xtu1wJZqzMqZME=","subject":"CN=Cybertrust Japan SureServer CA G4,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTdXJlU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"d14576fded8dc8bc2c5e4595b2e25160155f8f967c80541b129ff564174309bd","size":1768,"filename":"rS4Ex7fMz9dQhgdB6qjxP-jJJQwjIeb-7RhvvdO6xy8=.pem","location":"security-state-staging/intermediates/8d6e839e-9d33-48c2-a9d9-40c21c559dd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rS4Ex7fMz9dQhgdB6qjxP+jJJQwjIeb+7RhvvdO6xy8=","crlite_enrolled":true,"id":"278d6db3-b339-4446-8841-06784b687319","last_modified":1576536532704},{"schema":1576535525743,"derHash":"WOoGiLeQmqqOqqL/8287vo9KKtA71wJDs5A0adtIkPc=","subject":"CN=Trustwave Organization Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG1MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE9MDsGA1UEAxM0VHJ1c3R3YXZlIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"1844432d6d4b7a217e3b736de1419af2fca76a2f6ccc1ce30a69111d8d201479","size":1817,"filename":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=.pem","location":"security-state-staging/intermediates/cbb140b8-1fb0-4a2a-bd22-98b808d0732b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=","crlite_enrolled":true,"id":"d7fe49e4-283f-4e24-9961-b2cdc4d883ed","last_modified":1576536532690},{"schema":1576535519719,"derHash":"ARBV1IV/2QEDjrodDwNkCCvT94xpCwx3C/lEvCZLfrA=","subject":"CN=KIBSTrust Issuing CA for e-Signatures,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA+OU=KIBS AD Trust Services,O=KIBS AD Skopje,C=MK","subjectDN":"MIHQMQswCQYDVQQGEwJNSzEXMBUGA1UEChMOS0lCUyBBRCBTa29wamUxFjAUBgNVBGETDU5UUk1LLTU1Mjk1ODExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UECxMWS0lCUyBBRCBUcnVzdCBTZXJ2aWNlczEuMCwGA1UEAxMlS0lCU1RydXN0IElzc3VpbmcgQ0EgZm9yIGUtU2lnbmF0dXJlcw==","whitelist":false,"attachment":{"hash":"3f7958374c60f55cb8c9663d8487e680d5ac5b648c0b81613f75565c21da0b6c","size":2422,"filename":"yElc8NruRg-2MsMcl1chcF1INgoayZ7Rv3q4mzfz458=.pem","location":"security-state-staging/intermediates/e36f4085-6521-4c0d-8616-a938793d117b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yElc8NruRg+2MsMcl1chcF1INgoayZ7Rv3q4mzfz458=","crlite_enrolled":false,"id":"edec88d7-e1c6-4300-b142-8b497d3afd5c","last_modified":1576536532686},{"schema":1576535518197,"derHash":"YJkw64B61CCv2iqKphtnSDA5FozXZuCZQqSL/n873BA=","subject":"OU=Public Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGAxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEsMCoGA1UECwwjUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"b2b74d8c5d2ce4f283391974773f823f1441c476105a4e78f1b99db3e02f9528","size":2117,"filename":"tnFqrstaexEa6Zz-CVGGozhI8IF1FafM6uzX3zzHrUI=.pem","location":"security-state-staging/intermediates/b062306c-bad7-433f-bcc1-81512b1194eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tnFqrstaexEa6Zz+CVGGozhI8IF1FafM6uzX3zzHrUI=","crlite_enrolled":true,"id":"4835ad01-5f2c-4639-abc1-05d2b5279fb5","last_modified":1576536532682},{"schema":1576535515302,"derHash":"lXG/6i8fVy7uNPnumfXlXMei7DobS1K3wyoihIK2zFc=","subject":"CN=Intertek Document Signing Authority,O=Intertek Group plc,C=GB","subjectDN":"MFgxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJJbnRlcnRlayBHcm91cCBwbGMxLDAqBgNVBAMTI0ludGVydGVrIERvY3VtZW50IFNpZ25pbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"d20e9af16fa1f1de11830ddd2702a3577e2bab498eace1eead436cb9b2e8b063","size":1938,"filename":"YHxb7yqXsZo593tQi7lml-UbIYBZ-nRncrwmyt7z_jU=.pem","location":"security-state-staging/intermediates/0ae0900f-5f8b-42d2-b2b6-8bfb7d688e75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YHxb7yqXsZo593tQi7lml+UbIYBZ+nRncrwmyt7z/jU=","crlite_enrolled":false,"id":"9687202f-e5b6-4ba7-bbed-0b1ec1daf218","last_modified":1576536532679},{"schema":1576535516747,"derHash":"U8D8e2Y0ObwCvBRspo7SeX1czEBqSgM3DYhIOA4cKZY=","subject":"CN=Dodo Sign TLS ICA ECC R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHIxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSEwHwYDVQQDDBhEb2RvIFNpZ24gVExTIElDQSBFQ0MgUjE=","whitelist":false,"attachment":{"hash":"ec04a4b626598cf051a07300496777b8ce46ba637f9f30d3f1dd8b58ae418fe6","size":1288,"filename":"gfr73neHKDZwYTmqZKhKtCIUMzhBNbVvVRuE1GZiSaw=.pem","location":"security-state-staging/intermediates/4f3693ee-a00e-4bd8-8b08-9d368b3d9b64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gfr73neHKDZwYTmqZKhKtCIUMzhBNbVvVRuE1GZiSaw=","crlite_enrolled":false,"id":"b281f90d-4780-4454-a47e-7aa979cc9791","last_modified":1576536532675},{"schema":1576535513673,"derHash":"uP/ATIaxUEHbjzqtpH/q8JfoWQqvKKDlnNutt3VqZjQ=","subject":"CN=thawte Primary G3 Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyF0aGF3dGUgUHJpbWFyeSBHMyBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"dbc16836cd8731b78eb02f959a8c5a226e73133b8e253e8608ded9dd176ee060","size":1321,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/19fd9bb8-2f32-4d65-bc2f-3e4289158d4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"7cec5d36-de25-4e2c-92e5-f32afca6422f","last_modified":1576536532672},{"schema":1576535510916,"derHash":"MKqFj/PGdSZLs60Ed1feX8MHgZWswjh2tFjnqjUEmes=","subject":"SERIALNUMBER=202018,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE4","whitelist":false,"attachment":{"hash":"6eee99c35c359ebfcd92b16092336017ae404339b3791de0aa56d50c02de20e9","size":2333,"filename":"F8qyHHv8MJtO-mb8tPNzX7jrf8zI4r_nHFRexuJgd9Q=.pem","location":"security-state-staging/intermediates/fda13208-5fb7-4d01-82e5-1b954ba9b283.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F8qyHHv8MJtO+mb8tPNzX7jrf8zI4r/nHFRexuJgd9Q=","crlite_enrolled":false,"id":"9dc1119e-7e46-4b76-915c-6a22a5706102","last_modified":1576536532668},{"schema":1576535509540,"derHash":"TJ0+I9iCkFiUl8NU8FIiA+8tlZ8/dgciV2rHxiIv5C0=","subject":"CN=OneSign RSA Client Authentication and Secure Email CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIGSMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjE+MDwGA1UEAxM1T25lU2lnbiBSU0EgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"0be83fe64c644cd30c1406de27e2a54ffe81b680b83cc329d886b1b2e95dfaf8","size":2166,"filename":"UbiEkYnpeEuDUAY38CtS5DK4aXovgdeK95X0LBk3N_o=.pem","location":"security-state-staging/intermediates/128a5920-e2e5-4b28-a24e-8acdf37e05fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UbiEkYnpeEuDUAY38CtS5DK4aXovgdeK95X0LBk3N/o=","crlite_enrolled":false,"id":"8da7888f-9413-4e57-a97f-aa917c25d4ca","last_modified":1576536532664},{"schema":1576535503850,"derHash":"ujYSYP8dRgMWhjBeCC3oNtSjIEZuDengE/AM3t3WIxc=","subject":"CN=DigiCert Global Client CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEdsb2JhbCBDbGllbnQgQ0EgRzM=","whitelist":false,"attachment":{"hash":"555946571b12b9ab7e2734e4ecebf68a7935cc0d40a358be3d6474d971b56c9f","size":1451,"filename":"QfXubDxBsxQ0e_T0TZ377rKOF8NOU9JZSTSOaOBNNVU=.pem","location":"security-state-staging/intermediates/87d0e70e-5e2c-4f1b-bdf9-c8443e1f3856.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QfXubDxBsxQ0e/T0TZ377rKOF8NOU9JZSTSOaOBNNVU=","crlite_enrolled":false,"id":"830a6fb0-b074-4eb8-85eb-85de0f03e55e","last_modified":1576536532650},{"schema":1576535499570,"derHash":"iKBwc9RScGncnpeAU/NXKXBcBYMCZI7QLl/OZWFFnmE=","subject":"CN=DigiCert Universal Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBVbml2ZXJzYWwgVHJhbnNpdGlvbiBSb290","whitelist":false,"attachment":{"hash":"d9217061d8cff01ff6b7275eb4591f00e32d8aadf1fb0695999ff14597211202","size":1756,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/b9e17518-7c43-41a2-855f-b4eec55fd32f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"00d91a48-e1b8-4d9a-b3fc-0a777a762044","last_modified":1576536532639},{"schema":1576535498133,"derHash":"QWeLiJfmNd6gO25IVl4me6Wqw7j03Et0t6CpdIz9014=","subject":"CN=DigitalSign Qualified CA - G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=DigitalSign - Certificadora Digital,C=PT","subjectDN":"MIGkMQswCQYDVQQGEwJQVDEsMCoGA1UEChMjRGlnaXRhbFNpZ24gLSBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEmMCQGA1UEAxMdRGlnaXRhbFNpZ24gUXVhbGlmaWVkIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"e56f4437043f71e151d0d3f245590c77186eac4683a312733e8a9677ed235dc9","size":2280,"filename":"HA7gqrL9Koo73WVyp4BRDRAeWpsT9I2GiRiBbpD0lMI=.pem","location":"security-state-staging/intermediates/41219887-d4bf-48c9-9a9e-bb89a747b0d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HA7gqrL9Koo73WVyp4BRDRAeWpsT9I2GiRiBbpD0lMI=","crlite_enrolled":false,"id":"a3996fb4-2015-4418-8297-05a8746272a2","last_modified":1576536532636},{"schema":1576535496701,"derHash":"uaiFMJ5s8yFvtmJJB8YGbZmZvDDREJyuT/M4gNXfNJQ=","subject":"SERIALNUMBER=202003,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAz","whitelist":false,"attachment":{"hash":"58f58c3cf17d7945abc83902b9f2678a79391eb5456d2b1c3efd3e5443dce15e","size":2333,"filename":"UobzRk-EBZtLQBfzMMAEk5fOkG1ShzOH3Qlw34ErLsA=.pem","location":"security-state-staging/intermediates/2ddb692a-500f-4fba-ab72-4a6e8a4b0541.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UobzRk+EBZtLQBfzMMAEk5fOkG1ShzOH3Qlw34ErLsA=","crlite_enrolled":false,"id":"f5b1872a-fb99-4559-b0ee-faa1166caa4e","last_modified":1576536532632},{"schema":1576535493678,"derHash":"peJBV9FBq9Bp86I7wwVtxPRsZo+8GqbpwDCmOBYIkIY=","subject":"SERIALNUMBER=202012,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEy","whitelist":false,"attachment":{"hash":"08c06e256f98afb4d9806d52e8f1a2b9cc165fa03702ad012b07cdd37f837621","size":2333,"filename":"3RdyBMMkedoxCUDA86JqdijXazSIloqW4_vNeBGZiCA=.pem","location":"security-state-staging/intermediates/cfdd00b1-4a8e-4641-bb24-31945e7273b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3RdyBMMkedoxCUDA86JqdijXazSIloqW4/vNeBGZiCA=","crlite_enrolled":false,"id":"37becd26-64a0-4453-b1a8-0eac48c4d3a3","last_modified":1576536532625},{"schema":1576535490873,"derHash":"Pq1PcvBvEFSIHSco3gM6jhP63mvRZQhAGOuUPBc3jao=","subject":"CN=UZI-register Zorgverlener CA G3,O=CIBG,C=NL","subjectDN":"MF8xCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEoMCYGA1UEAwwfVVpJLXJlZ2lzdGVyIFpvcmd2ZXJsZW5lciBDQSBHMw==","whitelist":false,"attachment":{"hash":"329164edbb1b27621bd02bae2add97fcdcdabe45f217ab352c27f446203676e1","size":2536,"filename":"LJbktDpUTtQFxix-TH4PidTGLrt1SGxWZUTWK8SCn9Q=.pem","location":"security-state-staging/intermediates/58e65d2f-9c20-46d6-8b43-0497398cbe0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LJbktDpUTtQFxix+TH4PidTGLrt1SGxWZUTWK8SCn9Q=","crlite_enrolled":false,"id":"7a4c15d1-a236-488f-9ad0-a2c5a64937bb","last_modified":1576536532618},{"schema":1576535500999,"derHash":"38zb8HfRQteSP2MW3UEeRix6i8BHgfK4cGWlxeJYp+A=","subject":"CN=SafeToOpen TLS ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MEoxCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDEiMCAGA1UEAwwZU2FmZVRvT3BlbiBUTFMgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"08e4db6360bbce20665833a4342083987eea5f8cdc3e66fc6fc0292fcb38b032","size":2434,"filename":"uQ4czJaJhrriBdIxl7SyPwX8Wy4z12aj9ZqCb3mdYpo=.pem","location":"security-state-staging/intermediates/8e22945f-abae-4998-9dd4-d3dd5f4f878d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uQ4czJaJhrriBdIxl7SyPwX8Wy4z12aj9ZqCb3mdYpo=","crlite_enrolled":true,"id":"74d8f446-fb98-4c65-8f25-c0c00d3aab68","last_modified":1576536532610},{"schema":1576535485113,"derHash":"GKQ8UdCBdMOm2F8cExi9KQl1PnXZHPZZn3M0ewBwKJA=","subject":"SERIALNUMBER=Q2826004J,CN=AC Administraci\u00f3n P\u00fablica,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh","whitelist":false,"attachment":{"hash":"b1b8087026dcff96160076000ab8ec70cb29448880359f0ce676c987951eea3d","size":2438,"filename":"uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem","location":"security-state-staging/intermediates/b3020299-7dbb-43c6-97f7-e87736a45fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=","crlite_enrolled":true,"id":"aabec165-9b72-4d6a-8fa8-d4eeb29669f0","last_modified":1576536532600},{"schema":1576535483615,"derHash":"q8hnBsmNa/ZzcvkI7AGt9jGxkdczron4ND6wR7EIFEs=","subject":"CN=DexKo Global SMIME CA 2019,O=DexKo Global Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRowGAYDVQQKExFEZXhLbyBHbG9iYWwgSW5jLjEjMCEGA1UEAxMaRGV4S28gR2xvYmFsIFNNSU1FIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"6e6ef760c62377e53a22b0da3f25f97f7be656c23736dda53dea01102617cf95","size":1857,"filename":"AHjdlX8_el8CCLz5JKmfBOMMvmJPx7t19z58Cw9zbng=.pem","location":"security-state-staging/intermediates/f82a276e-7fa2-447c-aad5-a331e918bde9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AHjdlX8/el8CCLz5JKmfBOMMvmJPx7t19z58Cw9zbng=","crlite_enrolled":false,"id":"f14ded04-2e06-4b3e-b8ca-3d16e25391d6","last_modified":1576536532596},{"schema":1576535474803,"derHash":"7AxspJamehM0L+xSIfaNSz5Tsbwi9uS8zJxo8EFc3qQ=","subject":"CN=Let's Encrypt Authority X2,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMg==","whitelist":false,"attachment":{"hash":"f87a7fc64b76ec8ff49f94aa8ea389cf8c8b37040fca79f64dcbcac12a49586d","size":1674,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/68dfffac-ff48-4aca-935c-22a0f4d36894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"07674fee-0d0d-440e-a3a1-7f554318a8ca","last_modified":1576536532578},{"schema":1576535471694,"derHash":"SkDUvn+wsF+b3KYLzjg/tZLEkgbbxceE+BnNdPKge+M=","subject":"CN=EC-PARLAMENT,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verCIC-2 (c)03+OU=Parlament de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),L=Passatge de la Concepcio 11 08008 Barcelona,C=ES","subjectDN":"MIIBGTELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQwMgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzEfMB0GA1UECxMWUGFybGFtZW50IGRlIENhdGFsdW55YTEVMBMGA1UEAxMMRUMtUEFSTEFNRU5U","whitelist":false,"attachment":{"hash":"9a9ee63a0194dbc598a491404da83c06957163a8fe0c70b3649c45a680f332da","size":2320,"filename":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF-GQQrZtCBAentM=.pem","location":"security-state-staging/intermediates/83499263-b834-4622-bb97-580ab14ab723.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF+GQQrZtCBAentM=","crlite_enrolled":false,"id":"9b0777fb-4e6d-413b-a3dd-5ee301810d9b","last_modified":1576536532570},{"schema":1576535476283,"derHash":"p0sMMrZblf4sT48JiUemi2lQM77QtR3YuYTsrolXG7Y=","subject":"CN=Let's Encrypt Authority X4,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYNA==","whitelist":false,"attachment":{"hash":"86e7dd996382dd285f7661e48620de68d357e550b0745d5154781c7e4df1074e","size":1646,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/47db9996-ee4b-4494-92ef-73eda080d42a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"8d00314d-e387-477e-af43-6e68d3c1b1b6","last_modified":1576536532567},{"schema":1576535467347,"derHash":"9V+f/Lg8c0UyYWAcfgRNsVoPA0uTwFgw8oY174ic9nA=","subject":"CN=Amazon,OU=Server CA 1B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"37adce7ce3a304a9a05f1f1f66ba3242182c5165a762ea08dab41ed3eb9b76f3","size":1544,"filename":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=.pem","location":"security-state-staging/intermediates/e974e18f-9dbd-443f-ad0e-843d3b3588b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=","crlite_enrolled":true,"id":"aa9b7129-b8e6-4ae5-b00f-5a7d58046865","last_modified":1576536532563},{"schema":1576535464512,"derHash":"5XIIy/0obOlxgmfkRJHLW0NclbsJ3Jcg9bZLJax5dM0=","subject":"CN=DigiCert Assured ID Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBLTE=","whitelist":false,"attachment":{"hash":"7160a1203edefe6cdb7dde107be2606128ce7bed16da9e11d5999d17ec003921","size":2357,"filename":"RElq7qZGBSzuZ3oQFuu4t-dh5QqmqZDyU-EAqeRVfJ4=.pem","location":"security-state-staging/intermediates/8fc6e3b5-78f6-4638-8253-27ee2e7e031a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RElq7qZGBSzuZ3oQFuu4t+dh5QqmqZDyU+EAqeRVfJ4=","crlite_enrolled":false,"id":"339bd4fd-f044-40eb-b55d-92b7d38c137b","last_modified":1576536532560},{"schema":1576535470193,"derHash":"frRF6jikamQR8KEqDhbNPQc+kbElZ5l3BB/7zoO+PBo=","subject":"CN=OKCERT R4 DV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IERWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"857ccc0777952ba7b08a36e3f5c6ace78f7260f270402953c6a16a68d3690e2a","size":1776,"filename":"Y9JE2NiQ3ArheJd2k5RFD7JxnbQzgfJYS2Z0JfG64Uo=.pem","location":"security-state-staging/intermediates/4b034577-3c79-416d-9af6-374a4c0b5405.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y9JE2NiQ3ArheJd2k5RFD7JxnbQzgfJYS2Z0JfG64Uo=","crlite_enrolled":true,"id":"9dfe1a67-5cce-4d31-a077-99d8791d279d","last_modified":1576536532556},{"schema":1576535465886,"derHash":"UtnfGzqxncGd8MQFkagy0aNHMcKA4pZkS5YwpIYTUtw=","subject":"SERIALNUMBER=202020,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDIw","whitelist":false,"attachment":{"hash":"efa4a8fe8f77910f0ba97261dd229810331d2057180f6a263b06ab238a56cce2","size":2333,"filename":"Dc-eCaAIIzKUTOxxbCJR_Q1XbU4XPdnAPaZrNBwsz4s=.pem","location":"security-state-staging/intermediates/5d61ee8f-24a7-4669-8345-a93e77ae00e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dc+eCaAIIzKUTOxxbCJR/Q1XbU4XPdnAPaZrNBwsz4s=","crlite_enrolled":false,"id":"5c2785f7-cb84-413d-8cc2-e7cd5ea85b3e","last_modified":1576536532552},{"schema":1576535468794,"derHash":"UmJRhV4femM3wPNyDJ8yOHCm4BTGj4jteWw/e2n1t5M=","subject":"CN=COMODO Name Constraints Testing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIE5hbWUgQ29uc3RyYWludHMgVGVzdGluZyBDQQ==","whitelist":false,"attachment":{"hash":"a1bc51c8f527415890294e4c206d2ee571e40e60ed19bb1e45e327745f2ec267","size":1951,"filename":"jqMnv-0IEzdGPwNerQxiv2wxmlCcGT7awRI5CPRdDmE=.pem","location":"security-state-staging/intermediates/ffb0c961-02cc-4fd0-b678-54d536adca31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jqMnv+0IEzdGPwNerQxiv2wxmlCcGT7awRI5CPRdDmE=","crlite_enrolled":false,"id":"b64380c5-1f6a-4f0a-bc6e-11a506873c41","last_modified":1576536532548},{"schema":1576535461580,"derHash":"k4xFV1ibcmPVmy8Pa4TL6yfvubI7pyTrPM1bfipYcW8=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"768970dda8922e6ebf07cc524aaa977361d022fe143b092afeba179ec36c7f8d","size":1602,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/ed9d84de-064e-41d2-8681-3ac181eebe73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"a87b472d-be5c-496b-a98b-6df181566b82","last_modified":1576536532545},{"schema":1576535460116,"derHash":"rxiY1/Bjh1HAddAULU4qDqcx/GIjJPFT/hvztq/ZrxM=","subject":"CN=DPDHL User CA I3,O=Deutsche Post,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MG0xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ0wCwYDVQQHEwRCb25uMRYwFAYDVQQKEw1EZXV0c2NoZSBQb3N0MRkwFwYDVQQDExBEUERITCBVc2VyIENBIEkz","whitelist":false,"attachment":{"hash":"db7cbd2598eed19261df59b9537f65a933ee5e3acf9d91abd8b284f4ddad2d90","size":4039,"filename":"U24C-tQ5-xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko_A=.pem","location":"security-state-staging/intermediates/88f7058d-853e-4eab-98bc-8195c5c54535.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U24C+tQ5+xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko/A=","crlite_enrolled":false,"id":"f20fecad-a88e-46ac-897b-f2f4f750d9b3","last_modified":1576536532540},{"schema":1576535463138,"derHash":"wBljBZBwyyMG9LSGzPFQM1kgnphJnIEMK0nibjGkvXQ=","subject":"CN=GlobalSign CA 3 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDMgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"9e1c97c3c6f261707f3456f641117268b30609284db6d243177b47277422c123","size":1670,"filename":"RI4ORwwbrz7iTK-Bub6gGw9N1yaxwBY2kdx8dAAXKBo=.pem","location":"security-state-staging/intermediates/35ce22d9-16b3-4623-83ae-2d36944c1604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RI4ORwwbrz7iTK+Bub6gGw9N1yaxwBY2kdx8dAAXKBo=","crlite_enrolled":false,"id":"0e67c136-94b1-4dff-9e85-e269cba38b1a","last_modified":1576536532537},{"schema":1576535458597,"derHash":"AsSjAKCcG4k7EflWdlmvlbu5u+eVOJPjbFuvF7VVzuM=","subject":"CN=Certigna Identity Plus CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEiMCAGA1UEAwwZQ2VydGlnbmEgSWRlbnRpdHkgUGx1cyBDQQ==","whitelist":false,"attachment":{"hash":"4f9b8c5d9910a9c5057de2bdaa15c263ccc9194055f0f6d438f7dd65e0000884","size":2178,"filename":"ywhSp1oF34bfFheBzKO3KqbsXi-qQbyfXu94SMYBxwg=.pem","location":"security-state-staging/intermediates/a9861ffb-3a18-416a-b622-b2317ad102ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ywhSp1oF34bfFheBzKO3KqbsXi+qQbyfXu94SMYBxwg=","crlite_enrolled":false,"id":"cd3a316e-5ab3-425f-9bd1-f6ef6ab8e077","last_modified":1576536532530},{"schema":1576536129891,"derHash":"JOVvSGBERtioNztDyinRocSXcuWquounwXZivWDajfY=","subject":"SERIALNUMBER=ZZZZZZV0,CN=Siemens Internet CA V1.0,OU=Copyright (C) Siemens AG 2011 All Rights Reserved,O=Siemens,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaVjAxOjA4BgNVBAsMMUNvcHlyaWdodCAoQykgU2llbWVucyBBRyAyMDExIEFsbCBSaWdodHMgUmVzZXJ2ZWQxITAfBgNVBAMMGFNpZW1lbnMgSW50ZXJuZXQgQ0EgVjEuMA==","whitelist":false,"attachment":{"hash":"11c8c1af993fd49e1d65508fa79b88655f291aabdc36b8721da6f945bdc405bf","size":1752,"filename":"rQOD_jrRH5t2JxCWlRagCWxoDrKXhsLELQ-GrW6LeRI=.pem","location":"security-state-staging/intermediates/af88eecd-44f5-40b7-8894-4af88bccad18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQOD/jrRH5t2JxCWlRagCWxoDrKXhsLELQ+GrW6LeRI=","crlite_enrolled":false,"id":"87540db7-8b67-47b6-9194-744d32ff9b43","last_modified":1576536532512},{"schema":1576536085205,"derHash":"zPSXrgDaWh5agidWuOjwOOANUtxD7S9dM2J5CXMr4L0=","subject":"CN=CertCenter Enterprise ECC OV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"ee2787fc54c594fa045213e347f917704a15e0ee9f6dba2054aafcfc80442b6d","size":1297,"filename":"bzjbLG4lOPyzYixFbEQ90vuRtQ04e0wlcXN7_CMDiqo=.pem","location":"security-state-staging/intermediates/b868b5dd-e624-413d-b9e5-61564e90b21f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bzjbLG4lOPyzYixFbEQ90vuRtQ04e0wlcXN7/CMDiqo=","crlite_enrolled":false,"id":"4ab3adfc-d739-4e1b-92c8-c0d1d2898090","last_modified":1576536532486},{"schema":1576536109129,"derHash":"ehQrGl4WIVGDoT6ECoYqQ34pPZNmkh2wfttU8TisDXg=","subject":"CN=TrustAsia OV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBPViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"bfb83a4526e35f2dc8e07512d6f16dfffedccf8e3263aebf657edd6423d54673","size":1691,"filename":"hEZRb0aBfyh_1yoi7II2m0TQ_JCkJgWwfLZni7lZUHY=.pem","location":"security-state-staging/intermediates/200bc2a0-44c0-40f1-b810-696bea5c140a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hEZRb0aBfyh/1yoi7II2m0TQ/JCkJgWwfLZni7lZUHY=","crlite_enrolled":false,"id":"c6d61ecf-df03-455e-b621-1a69e4c44ab9","last_modified":1576536532463},{"schema":1576536111049,"derHash":"F2rr8pcr1vRxee3j3mOEixVDtFrilUvqRRhbFSU3ucQ=","subject":"CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMXSG9uZ2tvbmcgUG9zdCBSb290IENBIDM=","whitelist":false,"attachment":{"hash":"b4ba7c31c249eb874c39b6a3e78147e6623a6ccbab1429cce2313067069229b7","size":2020,"filename":"JUHlO6WzsHrL5wl6xKA-BAwRz3ptSmfLIT1Vi1AWegY=.pem","location":"security-state-staging/intermediates/15934ce0-b66f-41d1-9cc3-4f83f0c22828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JUHlO6WzsHrL5wl6xKA+BAwRz3ptSmfLIT1Vi1AWegY=","crlite_enrolled":false,"id":"78e6c5d3-d8b9-4d7e-b67b-b08391bf0d23","last_modified":1576536532457},{"schema":1576536110684,"derHash":"BuXewxyR19M0NSAdLiIRbCBxk6h04KQmUyovaVMMhrU=","subject":"CN=SwissSign Server Silver CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFMxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLTArBgNVBAMTJFN3aXNzU2lnbiBTZXJ2ZXIgU2lsdmVyIENBIDIwMDggLSBHMg==","whitelist":false,"attachment":{"hash":"dae13d2d8c181bf4ec65a316a2ba892ac9d49b530d749454a41b697b93c0e4ad","size":2276,"filename":"pdw-szkFhaLHw56vsd_eV19nZd8tlYabs6ie9lk3vz0=.pem","location":"security-state-staging/intermediates/a8e67472-ca0f-418d-8e14-eded55f5c9b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pdw+szkFhaLHw56vsd/eV19nZd8tlYabs6ie9lk3vz0=","crlite_enrolled":false,"id":"626a64c6-27bd-4788-ac43-961a6c286a2f","last_modified":1576536532446},{"schema":1576536114489,"derHash":"ultuXf69rhyAvXJ5C8hbzGU4q0YTAj2nBs6CZBX15bM=","subject":"CN=DigiCert TLS ICA VRSN Universal,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEoMCYGA1UEAxMfRGlnaUNlcnQgVExTIElDQSBWUlNOIFVuaXZlcnNhbA==","whitelist":false,"attachment":{"hash":"aeb637f50e3be97e9cd0a8cd4338c79685bc9385f9eefd1c71be433f0880aafc","size":1760,"filename":"syraymM-04Pk6mIoR9bwWpSF7IexVaZZTkmETpWCe50=.pem","location":"security-state-staging/intermediates/583c8c31-1235-464a-bfaf-2066acd4e1ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"syraymM+04Pk6mIoR9bwWpSF7IexVaZZTkmETpWCe50=","crlite_enrolled":true,"id":"2bdacac2-2d88-4a2a-8592-2179c09c6c99","last_modified":1576536532435},{"schema":1576536097332,"derHash":"DWhporT133emr7A0Il6b7zRXQ88wbt827jW50Fr62Jw=","subject":"CN=emSign ECC CS CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRUNDIENTIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"5deb0c464051d5e32daa2afa7cbadc82f6c069bab3db03b8117ad1300b8efda4","size":1167,"filename":"ChGUm4JufQCgxfjTELLQ1T93-EAuA3QrcKKFUAlKCdo=.pem","location":"security-state-staging/intermediates/c488046a-1f5d-4763-bc70-ec75ed1cde37.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ChGUm4JufQCgxfjTELLQ1T93+EAuA3QrcKKFUAlKCdo=","crlite_enrolled":false,"id":"355bd93e-e57b-4170-916c-7d12208880f5","last_modified":1576536532411},{"schema":1576536130303,"derHash":"RS6EVSQQ1D3liEmeM7tdKNXnm4cXBklqP0JC6FS5Cls=","subject":"CN=Athens University of Economics and Business CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGPMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxOjA4BgNVBAMTMUF0aGVucyBVbml2ZXJzaXR5IG9mIEVjb25vbWljcyBhbmQgQnVzaW5lc3MgQ0EgUjI=","whitelist":false,"attachment":{"hash":"06410ad96ec056a34da29d0d86aca4b26e3a19fc5ae4df404e2443c0d36c688f","size":2552,"filename":"kE-j5ZgeypLRoFQ30V9GkRmfWhTimO6x5iKj24k9ovc=.pem","location":"security-state-staging/intermediates/fe193b1e-2de1-4771-9e79-df47a6e849de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kE+j5ZgeypLRoFQ30V9GkRmfWhTimO6x5iKj24k9ovc=","crlite_enrolled":true,"id":"60d94adc-b93d-44b3-8824-05e7d33b94e3","last_modified":1576536532398},{"schema":1576536118729,"derHash":"izWEZtZhJjEhIGRaWHWmpX48gdmEdqlnYEJEJU6sAPA=","subject":"CN=Amazon Root CA 2,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDI=","whitelist":false,"attachment":{"hash":"099a90f379b0ecca696c3cde0f60b64211dbaafa0ce4ae4b1b13e1dc145c4f27","size":1991,"filename":"f0KW_FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=.pem","location":"security-state-staging/intermediates/b138d0b5-195f-401a-8c97-1bd007ddf648.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f0KW/FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=","crlite_enrolled":false,"id":"4a7d284b-1295-4ae6-af24-7de01c05ab0d","last_modified":1576536532395},{"schema":1576536107246,"derHash":"cpVqHFql2RrGnNYxB6JaoYQ4Gd3CHFEI7B2X8yKWA84=","subject":"CN=USERTrust ECC Domain Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE5MDcGA1UEAxMwVVNFUlRydXN0IEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"2a6313c6f238488f62807d206801b298319fe9aadc79bea5d1cb52261d84102a","size":1333,"filename":"-orpYE2E52U2_GRvH4NTBMqU6WeiGaMHjrIRWT8JypY=.pem","location":"security-state-staging/intermediates/a4a30987-f9be-4178-80b7-093289d197b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+orpYE2E52U2/GRvH4NTBMqU6WeiGaMHjrIRWT8JypY=","crlite_enrolled":false,"id":"e697d669-10e9-4820-af92-62a85ce2e0a3","last_modified":1576536532387},{"schema":1576536081355,"derHash":"728p9jb2K91HUxIvQfNBnufCh3WHvkqYB631iUZFjn8=","subject":"CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2Mg==","whitelist":false,"attachment":{"hash":"ef7efd4cbf4031585f1a5951e9b5d6bac8a753a47e1861138b45eaaf0f441821","size":2284,"filename":"wrPDGkophQqo889HKhFp_3G0FlefakSC7HdEuD35iKw=.pem","location":"security-state-staging/intermediates/9808e62b-cdbd-44b3-941f-6f29f249116a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrPDGkophQqo889HKhFp/3G0FlefakSC7HdEuD35iKw=","crlite_enrolled":false,"id":"8adb25e4-ae4d-4bdd-aa24-a1b07637fb72","last_modified":1576536532385},{"schema":1576536095821,"derHash":"iyVXlJH4XPV37CFyz60tskyiJVdC5uU0HPBuLL7F2QY=","subject":"CN=EUNETIC - EuropeanSSL Extended Validation Server CA 2,OU=Controlled by COMODO exclusively for EUNETIC GmbH,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MIHTMQswCQYDVQQGEwJERTEbMBkGA1UECAwSQmFkZW4tV8O8cnR0ZW1iZXJnMRQwEgYDVQQHEwtEdXJtZXJzaGVpbTEVMBMGA1UEChMMRVVORVRJQyBHbWJIMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgRVVORVRJQyBHbWJIMT4wPAYDVQQDEzVFVU5FVElDIC0gRXVyb3BlYW5TU0wgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"b32469934418bb2a41ae410f7cf1b81f731ab25583637ac43feedf2f48d3db72","size":2284,"filename":"nWdB0jAAGzhZiLNjLocqdxL16ZnFE4xjHkhnauNoK-A=.pem","location":"security-state-staging/intermediates/ff46e186-87f9-434d-a8c8-dfe148c39f56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nWdB0jAAGzhZiLNjLocqdxL16ZnFE4xjHkhnauNoK+A=","crlite_enrolled":false,"id":"1c90cd8c-5291-49c3-afbf-9a91c6860b4b","last_modified":1576536532382},{"schema":1576536096203,"derHash":"n6n8tQDxqYNVCZ9wA0zw0u50Orpj9utn1VaF6pBlMos=","subject":"CN=GlobeSSL OV Certification Authority 2,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEcMBoGA1UEChMTR2xvYmUgSG9zdGluZywgSW5jLjEuMCwGA1UEAxMlR2xvYmVTU0wgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"e1ed99b56e89cca5568d4660da394400dfeaaad7eee9761ce8d918ba375252d3","size":2150,"filename":"iaAN4YIvVl4idrHfqCHBL-dZTUISZ2ANiVmgZiYqSUY=.pem","location":"security-state-staging/intermediates/9e584cc8-197d-4d8a-8610-9b7b49c2f306.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iaAN4YIvVl4idrHfqCHBL+dZTUISZ2ANiVmgZiYqSUY=","crlite_enrolled":false,"id":"d77ee3af-f063-4cbf-8b9b-f99976780075","last_modified":1576536532374},{"schema":1576536113725,"derHash":"h9zU3HRkCjIs0gVVJQbRvmTxJZYlgJZUSYa0hQvHJwY=","subject":"CN=Amazon Root CA 1,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=","whitelist":false,"attachment":{"hash":"8f2766bb42744fe0fcf37f433c66191277a29d9bd4641cc4121ccf842ecf940c","size":1646,"filename":"--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem","location":"security-state-staging/intermediates/6e41f0a0-496f-4745-a675-09b997850d04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=","crlite_enrolled":false,"id":"a3c4dda1-24a7-46e0-97f3-4ce13eb70857","last_modified":1576536532366},{"schema":1576536131430,"derHash":"1uoQYcKLPblv9bqhQKtXFOawtPXXGrzNJCpJubn03Cc=","subject":"CN=Trust Provider B.V. DV SSL CA - G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHcxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDErMCkGA1UEAxMiVHJ1c3QgUHJvdmlkZXIgQi5WLiBEViBTU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"6902fcbf7cbaa6113fef3012c5b4cb6b57eedbecb1246fd4d021980ddd8bb4a7","size":1910,"filename":"3XnCzH5cKkeCxK0I9DpYpRQZ9Cyf6P7e0ks_yr-wMIg=.pem","location":"security-state-staging/intermediates/1099e1c1-4d22-46ec-a2a6-2b6f7d5bc460.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3XnCzH5cKkeCxK0I9DpYpRQZ9Cyf6P7e0ks/yr+wMIg=","crlite_enrolled":false,"id":"d0259003-812c-49cc-bc2f-a76605c14baf","last_modified":1576536532363},{"schema":1576536088977,"derHash":"h8cVU0Res8M8PgcQcRuZ6cd3PwTZGsOKn0wILuJBAeo=","subject":"CN=GlobalSign ECC OV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBPViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"390a77060a6993d4717518c954c7ca27a2d0f5fbf0e41a6b5af1c798425dcc9c","size":1102,"filename":"KJpedoXG-Rd6IJnYeOJjxUjlaDEDI8K1vCBBgzeJkC4=.pem","location":"security-state-staging/intermediates/87b2c54d-9bb3-4349-af42-cefe085827c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KJpedoXG+Rd6IJnYeOJjxUjlaDEDI8K1vCBBgzeJkC4=","crlite_enrolled":true,"id":"9054318d-a1b1-4bd8-b4ea-20ce57f44d1f","last_modified":1576536532346},{"schema":1576536090109,"derHash":"myWmp71RvF9cTwbg0SGP03DdMfr9XNO2J8gvIC8bRlc=","subject":"CN=SSL.com EV SSL Enterprise Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOTA3BgNVBAMMMFNTTC5jb20gRVYgU1NMIEVudGVycHJpc2UgSW50ZXJtZWRpYXRlIENBIFJTQSBSMg==","whitelist":false,"attachment":{"hash":"6a19f551792254e07344f7d7c4e7e861f60d6567194233434f62adc62f595f4e","size":2454,"filename":"vcL6kVP3jP8hbTn5A-tyKe1IWIWBFnhvUva3qmvEG2I=.pem","location":"security-state-staging/intermediates/3fb0958a-3a98-489e-b496-28b535b8c59c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vcL6kVP3jP8hbTn5A+tyKe1IWIWBFnhvUva3qmvEG2I=","crlite_enrolled":false,"id":"65d2abf0-ea93-4b8d-9f45-2b5db33f4074","last_modified":1576536532324},{"schema":1576536101946,"derHash":"q6amXc6JVbrwaFq4iAm3aZwXRJbvnumRUzJRSU9DzhA=","subject":"CN=emSign ECC Class 1 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDEgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"08dbb6b7acb073d4854e540ae8a5b481d4a53af8dfa6bbd5167547bab1bbfd6c","size":1146,"filename":"Vi90DKA5oebj_na5AG-8ED2AOxp_ezxWTtviS14jpQ4=.pem","location":"security-state-staging/intermediates/6af4e353-16ba-477f-8e14-bcd1749fbc26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vi90DKA5oebj/na5AG+8ED2AOxp/ezxWTtviS14jpQ4=","crlite_enrolled":false,"id":"2f009cfb-439c-4999-9f3b-77b9f7f84299","last_modified":1576536532313},{"schema":1576536098122,"derHash":"D1XyiI0WPKxaC2jmzsEJjFgsPO4DiUeryibWMhpmrY8=","subject":"CN=Fuji Xerox Product CA 2 - S,O=Fuji Xerox,C=JP","subjectDN":"MEgxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSQwIgYDVQQDExtGdWppIFhlcm94IFByb2R1Y3QgQ0EgMiAtIFM=","whitelist":false,"attachment":{"hash":"4a691b4f9e237d7eaaea8136399d660fbe891126105e9bfe3f0956884bbd34fc","size":1601,"filename":"VB5huVvz3NIuvb6JobC09TJ-Z4tKvVOuqvLZ7m9792w=.pem","location":"security-state-staging/intermediates/ee8a45d5-2b62-47a3-a3bf-bd0a39f1b181.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VB5huVvz3NIuvb6JobC09TJ+Z4tKvVOuqvLZ7m9792w=","crlite_enrolled":false,"id":"08afddd5-844d-4c8d-99f7-fd8629fd2eb0","last_modified":1576536532303},{"schema":1576536090882,"derHash":"m6ZluG4nIfUe8GULcoVoqTwNabVtjTjmMFMOdF1mO08=","subject":"CN=MilleniumSign EV SSL Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIEVWIFNTTCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"c2d9efcecdb520559e5d07b646a51f926b8020b4f41b9f42712640a7ca83e215","size":2568,"filename":"Fd9SgizCQBs1fPfz5Y2Z-ByhTYsHK6yT0xbzqrSicsU=.pem","location":"security-state-staging/intermediates/bc7b9946-608d-4516-ab44-46715a90f0bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fd9SgizCQBs1fPfz5Y2Z+ByhTYsHK6yT0xbzqrSicsU=","crlite_enrolled":false,"id":"945a7a27-6220-4db0-a327-1b00830d3cab","last_modified":1576536532298},{"schema":1576536108745,"derHash":"81Ft3MivyAh4i9iw6EC9orXiPGJEJSyjAAu2yHFwQCo=","subject":"CN=Symantec SHA256 TimeStamping CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBDQQ==","whitelist":false,"attachment":{"hash":"f6d7d6142a404fb7f198a9deab5fa8cebdd00388a6f9ed5db9f9955c9d6c8783","size":1869,"filename":"-6bBVDoKjNHndL1ldZpf1QyIXiLIV4dUkciVo24ddLw=.pem","location":"security-state-staging/intermediates/0e83b85f-9d85-4404-8403-e9292f674f6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+6bBVDoKjNHndL1ldZpf1QyIXiLIV4dUkciVo24ddLw=","crlite_enrolled":false,"id":"8cf1f488-3cd4-4c5b-9414-22ff2ba90b1b","last_modified":1576536532288},{"schema":1576536124596,"derHash":"3IW4p987GGIXSqb8lxQ8npzCLW8Zp3bVxX5cHfcA2VE=","subject":"CN=SSL.com Object CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEaMBgGA1UEAxMRU1NMLmNvbSBPYmplY3QgQ0E=","whitelist":false,"attachment":{"hash":"20323ec6ee175231bf323239854623c13b6833fd8c9e755fa77925793b58ca26","size":2085,"filename":"HgdIFDIn7_8ksxHClkFmw9q0QEIK6fN7wZ7qkvDisFw=.pem","location":"security-state-staging/intermediates/ceccf42d-13a0-454c-a0db-f9e1976f0047.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HgdIFDIn7/8ksxHClkFmw9q0QEIK6fN7wZ7qkvDisFw=","crlite_enrolled":false,"id":"f309bff7-7186-4f3b-9b95-51df26462077","last_modified":1576536532278},{"schema":1576536121896,"derHash":"TptzFWcXfhd2qW1m2RILPesouACTfqRmJWWz717IAAs=","subject":"CN=emSign ECC Class 2 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"b2c9c934bd28c6cdde9ab4d84c6c8da067598d50410f83afa8df464ff780c749","size":1142,"filename":"e6icTYnqPAeqRyiV6T1Z-dePhAfjZW9RbzFi-_h840Q=.pem","location":"security-state-staging/intermediates/2a9db6d2-ba72-49aa-a083-f23d88661c4b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6icTYnqPAeqRyiV6T1Z+dePhAfjZW9RbzFi+/h840Q=","crlite_enrolled":false,"id":"6058b519-9e61-482a-8f27-01c5ffd80762","last_modified":1576536532275},{"schema":1576536094293,"derHash":"Maw0azEHPcDRNOKfwhLMShXtNTDuoe3PyNrLNkktXeQ=","subject":"CN=4fastssl.com,OU=3S2N Sp. z o.o.,O=3S2N Sp. z o.o.,C=PL","subjectDN":"MFgxCzAJBgNVBAYTAlBMMRgwFgYDVQQKDA8zUzJOIFNwLiB6IG8uby4xGDAWBgNVBAsMDzNTMk4gU3AuIHogby5vLjEVMBMGA1UEAwwMNGZhc3Rzc2wuY29t","whitelist":false,"attachment":{"hash":"cae137f6053594f20d796d4a5a5d5e9f305e814739d0e7870c9bd2f123fd1605","size":1630,"filename":"sN7Yv0qTyjW-BJTfkzdVvYxd1ExUFwl3cvwbLztk5Fc=.pem","location":"security-state-staging/intermediates/bea7e911-09b3-4259-995d-27e5b79f0dda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sN7Yv0qTyjW+BJTfkzdVvYxd1ExUFwl3cvwbLztk5Fc=","crlite_enrolled":false,"id":"49094aa8-a7a0-4644-bc88-83ff76b96f56","last_modified":1576536532272},{"schema":1576536123068,"derHash":"Vtj24UWykfX7op65iYz1Ir3nsUqziSnQpMTR3dq6Kmk=","subject":"CN=Sectigo RSA Time Stamping CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDElMCMGA1UEAxMcU2VjdGlnbyBSU0EgVGltZSBTdGFtcGluZyBDQQ==","whitelist":false,"attachment":{"hash":"56a8d17bc1d2247a5c19076e98bcbe74c2bf2b35c572ea145ef0bab20aeec262","size":2458,"filename":"HAzgkpPws05gdb_VUEsKyKptN9VTKZx6piTRmO_w1x8=.pem","location":"security-state-staging/intermediates/1f071dbb-1f95-42d5-b695-bf6623c56f06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HAzgkpPws05gdb/VUEsKyKptN9VTKZx6piTRmO/w1x8=","crlite_enrolled":false,"id":"50b19790-5758-49b6-b055-5e746d518437","last_modified":1576536532266},{"schema":1576536068013,"derHash":"0MrmlHvHfwtJXKgI1s3mhfzSAiXh5TC2NbET7UByjvM=","subject":"CN=GlobalSign Timestamping CA,OU=Timestamping CA,O=GlobalSign","subjectDN":"MFQxGDAWBgNVBAsTD1RpbWVzdGFtcGluZyBDQTETMBEGA1UEChMKR2xvYmFsU2lnbjEjMCEGA1UEAxMaR2xvYmFsU2lnbiBUaW1lc3RhbXBpbmcgQ0E=","whitelist":false,"attachment":{"hash":"7806ad293fa3eb0a436e9a8ee203d8340d736f8be793ab3d5c685c08b945c6dd","size":1483,"filename":"cJyzJQR9magyD5d9C2fLGru8Aqi-PgtEQD7TM2Dq-qI=.pem","location":"security-state-staging/intermediates/0144b6ca-d91d-42e8-ab16-043dfc8b9b9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJyzJQR9magyD5d9C2fLGru8Aqi+PgtEQD7TM2Dq+qI=","crlite_enrolled":false,"id":"e3f03587-8572-466f-981a-ea6ccff203c5","last_modified":1576536532261},{"schema":1576536085955,"derHash":"65T44sjQyDOLuLpA4erWIkuELLr8mfJp7vB2HoOcQaY=","subject":"CN=Western Digital Technologies Certification Authority,O=Western Digital Technologies,L=Irvine,ST=CA,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTElMCMGA1UEChMcV2VzdGVybiBEaWdpdGFsIFRlY2hub2xvZ2llczE9MDsGA1UEAxM0V2VzdGVybiBEaWdpdGFsIFRlY2hub2xvZ2llcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"27bab012779245048bd280aa6bede454d41b18d63a1152020a3b837b9f5ad7fd","size":2869,"filename":"w5ZKTAj16cKbFb_ByP_gQe9CQupFYdX6HVmRkZZtm9w=.pem","location":"security-state-staging/intermediates/1eee0ce9-061c-466b-a247-b923fa34aa69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w5ZKTAj16cKbFb/ByP/gQe9CQupFYdX6HVmRkZZtm9w=","crlite_enrolled":false,"id":"7faa7ca0-252e-4c62-aa48-c3cd1eafa8e5","last_modified":1576536532253},{"schema":1576536135282,"derHash":"K3XMTzZ1nPxMZjex4OVDWUV9tX503k0txdAs3f8pYM8=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CUALIFICADOS,OU=Certificados Cualificados,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGSMQswCQYDVQQGEwJFUzEeMBwGA1UEChMVRmlybWFwcm9mZXNpb25hbCBTLkEuMSIwIAYDVQQLExlDZXJ0aWZpY2Fkb3MgQ3VhbGlmaWNhZG9zMRIwEAYDVQQFEwlBNjI2MzQwNjgxKzApBgNVBAMTIkFDIEZpcm1hcHJvZmVzaW9uYWwgLSBDVUFMSUZJQ0FET1M=","whitelist":false,"attachment":{"hash":"4d2dfe0fc860422f305f1ad6329bd436365d1605d8d9a03702b07b42faebbed8","size":2410,"filename":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU-Y=.pem","location":"security-state-staging/intermediates/0101c000-f69c-425a-97e2-af8490d77aba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU+Y=","crlite_enrolled":true,"id":"971a56e0-c3e7-431a-840f-f4f65604621f","last_modified":1576536532235},{"schema":1576536136036,"derHash":"rAq5Y7tfPaBfvIaH+YwrbqC7SZ5hGMGpE2sbx8PHGms=","subject":"CN=GlobalSign CA for AATL - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"85c8ec5dd9e2aef22c301709411a40ca34de77ae66cdf3a22ea4e351f5965835","size":2251,"filename":"eXySzCsBWDIfmGF01cwDJgdAdt8Hj7D429qgL2aN-zU=.pem","location":"security-state-staging/intermediates/db81a002-ed02-457c-8ef2-9ceae481d3bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eXySzCsBWDIfmGF01cwDJgdAdt8Hj7D429qgL2aN+zU=","crlite_enrolled":false,"id":"4267e1b8-a619-4607-8632-9f4be3c8c3b3","last_modified":1576536532222},{"schema":1576536084428,"derHash":"g5Tj0H780el+psuiFMOgVcF92afr+N3gAg/N23byhlM=","subject":"CN=SSL.com EV SSL Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLjAsBgNVBAMMJVNTTC5jb20gRVYgU1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"ec67d7acaecbee9548bf5d3b578b728e2309b8a0884f20b3973a99b6a90d4f0a","size":1280,"filename":"d1tKuR2aFFnhw8eRBoNei7sB4YWR1iQmOEmGB337A0k=.pem","location":"security-state-staging/intermediates/2afb24cd-f81f-48bf-b601-fda65e8b7dcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d1tKuR2aFFnhw8eRBoNei7sB4YWR1iQmOEmGB337A0k=","crlite_enrolled":true,"id":"734d16c1-380a-4953-81ad-78c29e818910","last_modified":1576536532216},{"schema":1576536100444,"derHash":"noUsWd/G/Wq9ThfqgLX05W/AQZLRByWNVNqKklKGcNY=","subject":"CN=Certum Global Services CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGDMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MScwJQYDVQQDEx5DZXJ0dW0gR2xvYmFsIFNlcnZpY2VzIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"8aa13e80c83c232b2f8047b3b1df764885c9c822e03078672b01899a2acd4a16","size":1723,"filename":"M7aD_Hmgy7CF8sTddr5so1MZWEBuNfLIdGe1jvy0X6E=.pem","location":"security-state-staging/intermediates/f51cd94a-f3bc-4f18-bbba-d7bc1b52c422.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M7aD/Hmgy7CF8sTddr5so1MZWEBuNfLIdGe1jvy0X6E=","crlite_enrolled":false,"id":"b69c3618-7b62-4d9b-ac74-c8f39cf75c4c","last_modified":1576536532214},{"schema":1576536132995,"derHash":"ZAF9eLXwwExBlzXWpKbVLsHSARUkOw18dFB+JX/6SkA=","subject":"CN=ABB ECC Intermediate CA 1,O=ABB","subjectDN":"MFwxEzARBgoJkiaJk/IsZAEZFgNDT00xEzARBgoJkiaJk/IsZAEZFgNBQkIxDDAKBgNVBAoTA0FCQjEiMCAGA1UEAxMZQUJCIEVDQyBJbnRlcm1lZGlhdGUgQ0EgMQ==","whitelist":false,"attachment":{"hash":"3bf4e56157209c6ae799aba198d716c87bb03db2fff0a948a5bf6c6f8312cd00","size":1902,"filename":"vtfN7uXcmYy-xpK14sDzgUP-IgxdWGzKLJ7P5ZVQFQg=.pem","location":"security-state-staging/intermediates/c8e925dd-10ad-45bc-8572-9fa64ce3655a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vtfN7uXcmYy+xpK14sDzgUP+IgxdWGzKLJ7P5ZVQFQg=","crlite_enrolled":false,"id":"78f90a7c-db0b-4ba1-bac5-6b8d2f8d842e","last_modified":1576536532209},{"schema":1576536116032,"derHash":"DYiQDbtoxspUcfZT/KzUB+vXsVGQRvnguM7TwnT9EaE=","subject":"CN=DigiCert Transition RSA Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gUlNBIFJvb3Q=","whitelist":false,"attachment":{"hash":"49bdab403720cb448ce0da5276c296f3e531dbc84f9b34389b2dd8ce3d71aed4","size":1756,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/04dff2a2-c62d-4f0e-912a-27aa436c85fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"844e0b7d-1eab-45a2-9c34-a8152b8a194d","last_modified":1576536532206},{"schema":1576536085589,"derHash":"FCFFg+X0nOLbiLk8/j99gbZ4yGr7ypJAuqS55M6Qvyw=","subject":"CN=Symantec Class 3 ECC 384 bit SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMzg0IGJpdCBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"e892cc0b4f7fa3b87f4a7469bf3e6a34084c3d9fec4e10943e11df05f74981b4","size":1435,"filename":"6WrpsMoYWnzd1kOPyS8f--FOclfP_jONLsXqcE6_5MU=.pem","location":"security-state-staging/intermediates/857e59e8-e4eb-4c38-9d55-324c35931b83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6WrpsMoYWnzd1kOPyS8f++FOclfP/jONLsXqcE6/5MU=","crlite_enrolled":false,"id":"0d8edf2b-c4b1-483c-8cb8-331321784db9","last_modified":1576536532203},{"schema":1576536139122,"derHash":"F4zizkHm0pkmyJNy7PAbESCte22YCtKYNUwu/TFB4Sk=","subject":"CN=GIAG4,O=Google Trust Services LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ4wDAYDVQQDEwVHSUFHNA==","whitelist":false,"attachment":{"hash":"173627aa7b741915b72ac66ef4c36175e19527dc12a9e064793b587bc24840df","size":1557,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/0a69dac3-a94c-4464-9a5f-cb3c4dd4adcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"563d4e1b-cc04-4563-aa02-3a2f24d91ee9","last_modified":1576536532192},{"schema":1576536098902,"derHash":"FesKdcZzq/vc0vr8AoI8kf5svDbgB4hELIdU1yvsNxc=","subject":"CN=Encryption Everywhere DV TLS CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"6e79684a22734ca75ec32f3adf0f864295161310bce94980a2608da91fbdd285","size":1678,"filename":"GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=.pem","location":"security-state-staging/intermediates/f06c6294-7b8f-48d8-b0f8-2b14682e5159.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=","crlite_enrolled":true,"id":"0c722bda-522b-4e54-86de-6947716f1ec9","last_modified":1576536532190},{"schema":1576536127628,"derHash":"6UL/g/YzoI29ZeQ7VxmkNA3hPbfGG9aofNywuph1qWg=","subject":"CN=K Software Certificate Authority (OV) 2,O=K Software,L=Ashland,ST=KY,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLWTEQMA4GA1UEBxMHQXNobGFuZDETMBEGA1UEChMKSyBTb2Z0d2FyZTEwMC4GA1UEAxMnSyBTb2Z0d2FyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgKE9WKSAy","whitelist":false,"attachment":{"hash":"aefeae002e54508394d61079ca1d8477c613220626f0529d41aa1d0c8df5be3b","size":2138,"filename":"afXDX7F7Ynjqxjg6ewL0PMjH-QIuDGSiQQ1PAGTTkE4=.pem","location":"security-state-staging/intermediates/11514566-7d13-4edb-80cc-b5dffd44649f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"afXDX7F7Ynjqxjg6ewL0PMjH+QIuDGSiQQ1PAGTTkE4=","crlite_enrolled":false,"id":"22df7292-b32a-48e1-bf8a-dba558e5fb9a","last_modified":1576536532187},{"schema":1576536068766,"derHash":"gK2NJI1gE+/wAzZkVs3abPhbxHkaZ4FS4XjHK1p/Es0=","subject":"CN=InterCloud Ventures CA for CodeSigning,O=InterCloud Ventures Inc,C=SC","subjectDN":"MGAxCzAJBgNVBAYTAlNDMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEvMC0GA1UEAwwmSW50ZXJDbG91ZCBWZW50dXJlcyBDQSBmb3IgQ29kZVNpZ25pbmc=","whitelist":false,"attachment":{"hash":"58c167ecb8625f5ed88a6385c37aabfbe34ed011345c4a3c3bf6314f851bb37f","size":2381,"filename":"WTN_ayqlb7AXN8GdgPK1i40EqHGWA4uaGPFpRKCY18U=.pem","location":"security-state-staging/intermediates/c29cf028-60a7-4ae0-a6d9-6ae37269fb43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WTN/ayqlb7AXN8GdgPK1i40EqHGWA4uaGPFpRKCY18U=","crlite_enrolled":false,"id":"74797804-f7a2-4f5d-a135-11483ca97411","last_modified":1576536532158},{"schema":1576536127256,"derHash":"PzGbKv7UoPdRJ75ZklVQ0EKOaHY6CeJz62qf+NGNu1s=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R5,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNTETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"b003225e25a61e89168f5f77baef1eabcd91e2a9c9117c1f5602208a802290e3","size":1313,"filename":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=.pem","location":"security-state-staging/intermediates/8d1d0d1d-6a84-49b1-8a6d-74b898777b5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=","crlite_enrolled":false,"id":"e97393c4-72ac-459c-8c42-ee0e57bd8a90","last_modified":1576536532144},{"schema":1576536096573,"derHash":"e9C9d7T7i2+CUz5OzsPHVl61IKP1NUnBerElNX//TFo=","subject":"CN=CertAssure RSA OV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIE9WIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"29c2f0e95cd6822b6a47aec4b666a7e3143b04825116f0db4a5268602ee77ea5","size":2166,"filename":"AFV-kOki635A1nbhk6e6ZQs4lmPcP6IboL5EBPOsVYE=.pem","location":"security-state-staging/intermediates/d75b1d9e-e92c-4e6a-8378-24a25dd4ed9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AFV+kOki635A1nbhk6e6ZQs4lmPcP6IboL5EBPOsVYE=","crlite_enrolled":false,"id":"ede04aed-0845-44f9-b1a8-03b4525fd10b","last_modified":1576536532124},{"schema":1576536125351,"derHash":"N2N3/R+vS4pbFHJkenC5QQOaYtdM/plEfkhhb41jqXg=","subject":"CN=DigiCert EV Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0eb4c47655aa0125f23ad7ce888e0b58b7d36dad717750fdf0a4fd40e8403de6","size":2385,"filename":"c7df1T6z2RjxaDctD21S-mkgZ71HlsdERYtYXJwYb1Y=.pem","location":"security-state-staging/intermediates/e5bcc777-d888-4a08-b42d-beffa2bd76b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c7df1T6z2RjxaDctD21S+mkgZ71HlsdERYtYXJwYb1Y=","crlite_enrolled":false,"id":"e71509c8-ac25-4827-b3b8-11b99c4357d4","last_modified":1576536532121},{"schema":1576536128757,"derHash":"VD2bf8KmRxzYT8pSws9hWd+D6/zYjYsIta8/iHN/UuY=","subject":"CN=Amazon Root CA 4,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDQ=","whitelist":false,"attachment":{"hash":"529e23adcf592c5f3ead786e4cade919e70e5ce97467aa24135ffedb958ca909","size":1410,"filename":"9-ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=.pem","location":"security-state-staging/intermediates/7e2813c8-5040-4edb-82d1-6727b462247e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9+ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=","crlite_enrolled":false,"id":"6fb12511-5167-469d-9692-07522e197a11","last_modified":1576536532102},{"schema":1576536112199,"derHash":"VYenKm9zjt7O9nOHEW3o0ZNw6vPGsnLEmvm6uheV/Yc=","subject":"CN=Intel External Issuing CA 6B,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDZC","whitelist":false,"attachment":{"hash":"730c860c6a1a3c3e77c108c43b0e00f56074e1d949ea0d71d28548bf7e864319","size":5302,"filename":"sCfIb8e9n-5ipNtw1OVRRBJh67L2MmLDTBHeYecn3kU=.pem","location":"security-state-staging/intermediates/13d73ff1-47cf-4d6e-8af3-9c233886a4fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sCfIb8e9n+5ipNtw1OVRRBJh67L2MmLDTBHeYecn3kU=","crlite_enrolled":false,"id":"16fc2ee5-bf2c-4cc5-8f57-bf1b29ba948f","last_modified":1576536532066},{"schema":1576536131064,"derHash":"nfDT1VQN6umWwbJtox0O1OYO/fOj2jm2P6g4HTuok9o=","subject":"CN=Ionian University SSL CA R1,O=Ionian University,L=Kerkyra,C=GR","subjectDN":"MGExCzAJBgNVBAYTAkdSMRAwDgYDVQQHEwdLZXJreXJhMRowGAYDVQQKExFJb25pYW4gVW5pdmVyc2l0eTEkMCIGA1UEAxMbSW9uaWFuIFVuaXZlcnNpdHkgU1NMIENBIFIx","whitelist":false,"attachment":{"hash":"364105dddbc9280a5dc7aac80e22fa9fd688d01ec8b0110999ac19afaded8a71","size":2454,"filename":"vBUhM35ax7DSrTLTDo3K4f4_Yd93zumJYU7QNR67YtU=.pem","location":"security-state-staging/intermediates/75df7b02-0780-4005-b8d8-783cc77d09c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vBUhM35ax7DSrTLTDo3K4f4/Yd93zumJYU7QNR67YtU=","crlite_enrolled":false,"id":"612dfa9e-2e51-4254-a17e-f34d2cae3b73","last_modified":1576536532052},{"schema":1576536100826,"derHash":"H9McZrC0X5PmZwk2XXYL9nAnax05z45waNSo4gu/8+A=","subject":"CN=Fuji Xerox Certification Authority - G2,O=Fuji Xerox,C=JP","subjectDN":"MFQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MTAwLgYDVQQDEydGdWppIFhlcm94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"ff0a48b0b443388798edbed20dce740060299f311eaec5dc02593af9d96d1bf1","size":1524,"filename":"wekvipZx96mzAem7jXzac4eapzJ0kMdCftv4NPCJWHI=.pem","location":"security-state-staging/intermediates/b38241d8-fdc6-4ea0-afb6-1b2e9733c067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wekvipZx96mzAem7jXzac4eapzJ0kMdCftv4NPCJWHI=","crlite_enrolled":false,"id":"d9de2a31-3c1a-49cf-94be-d01d8a121fc3","last_modified":1576536532047},{"schema":1576536077185,"derHash":"HXCbKITsCT5dd6UElx6IcWMERzT22nDJI6Tz/41OW0k=","subject":"CN=SECOM TimeStamping CA1,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFUxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMR8wHQYDVQQDExZTRUNPTSBUaW1lU3RhbXBpbmcgQ0Ex","whitelist":false,"attachment":{"hash":"2b40c9fd758859d4734cefde3fe5cd1175a48ac4ef24ea479ba390451fe539a5","size":1508,"filename":"bKZzNUt0-zNujbmPHn_6dYVxxpdXJumDRXx-2XvGdiU=.pem","location":"security-state-staging/intermediates/97e4eadc-10fe-4d84-9cec-1818af90d1b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bKZzNUt0+zNujbmPHn/6dYVxxpdXJumDRXx+2XvGdiU=","crlite_enrolled":false,"id":"07b884ce-8837-4df7-98be-ec07ec4647fe","last_modified":1576536532018},{"schema":1576536112576,"derHash":"F/MCIZ/Pzo/RjKwXL4sNRJa6Xajkn4cavB+dDKqjYOU=","subject":"CN=KLASS3-SK 2010,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MG0xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSEwHwYDVQQLExhTZXJ0aWZpdHNlZXJpbWlzdGVlbnVzZWQxFzAVBgNVBAMTDktMQVNTMy1TSyAyMDEw","whitelist":false,"attachment":{"hash":"69e17cd00463182ef276c37a763b3e1a5148efde85621a344e83ef9f3a74623d","size":1678,"filename":"21pSl8-gYIgzVrmihoLqfp4XlT3k97qo-M2ZGRQsy4Q=.pem","location":"security-state-staging/intermediates/5a20865e-48b8-4068-bc47-0a2bb83948ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"21pSl8+gYIgzVrmihoLqfp4XlT3k97qo+M2ZGRQsy4Q=","crlite_enrolled":false,"id":"76af15b4-926a-4869-93cb-119affd2926c","last_modified":1576536532010},{"schema":1576536080221,"derHash":"m/WJZ1RZlhlFEtthdxUa/plwauo9o2/u562fizwFB8s=","subject":"CN=Go Daddy Root Certificate Authority - G2,OU=https://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGzMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLjAsBgNVBAsTJWh0dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8xMTAvBgNVBAMTKEdvIERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"f01b7da33411fa8ad18c3acbb3b660ca139a5179f86a05a17e7ed8579b7c64a1","size":1678,"filename":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=.pem","location":"security-state-staging/intermediates/32481f93-70cb-40f2-b608-39d1e40518fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=","crlite_enrolled":false,"id":"e7caf81b-a272-4ba4-ab9e-23e7d0270c4e","last_modified":1576536532002},{"schema":1576536099289,"derHash":"5/FSbqnVFHt6Xhrmq+MXN6RmbR6PA+YzcDvTw9mx43Y=","subject":"CN=Gehirn Managed Certification Authority - ECC DV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDQyBEVg==","whitelist":false,"attachment":{"hash":"ba00e0cc1ef2c958c1e04e3258cb7126d14548e2dd931dcbef08cf72cc29b04e","size":1321,"filename":"gXehP87ukwK1hI7ZuoCGUFVeee8oPwN9F_lSos9o0ns=.pem","location":"security-state-staging/intermediates/f5997c64-0815-4e51-af66-9a8200623298.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gXehP87ukwK1hI7ZuoCGUFVeee8oPwN9F/lSos9o0ns=","crlite_enrolled":false,"id":"106fef5b-5aa0-42a1-9b57-e378ad429a2d","last_modified":1576536531983},{"schema":1576536111786,"derHash":"g8Hqnp78ooO4QOFn+ep5xOMqzTODT1nROPzaudiAayA=","subject":"CN=Symantec Time Stamping Services CA - G2,O=Symantec Corporation,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UEAxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNlcyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"5f5a445a9debe9c5e196f66f3b896b29dfaecc3edf8c69d98c4185b20314d170","size":1626,"filename":"oGumzLGyzl2o91wqGSYl0m7wwzZ3wViPyem6aWf2UBI=.pem","location":"security-state-staging/intermediates/fb9448bc-44dd-4282-85f1-c4aaf431ae38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oGumzLGyzl2o91wqGSYl0m7wwzZ3wViPyem6aWf2UBI=","crlite_enrolled":false,"id":"7e13165b-c802-4b83-850e-2830259615ae","last_modified":1576536531977},{"schema":1576536119484,"derHash":"9rtbeYWoc2WUwUZ5+jFgOBRQKq619CgqaZhdyEpFB3c=","subject":"CN=Symantec Web PKI RSA Root - G1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEnMCUGA1UEAxMeU3ltYW50ZWMgV2ViIFBLSSBSU0EgUm9vdCAtIEcx","whitelist":false,"attachment":{"hash":"64b574e42d99825dad6ef8f064e0287d85641837ec9f03bf1bf83090374436e9","size":2044,"filename":"Gtk3r1evlBrs0hG3fm3VoM19daHexDWP__OCmeeMr5M=.pem","location":"security-state-staging/intermediates/34f3de0a-0ed3-4749-b3b5-3627781c6d0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gtk3r1evlBrs0hG3fm3VoM19daHexDWP//OCmeeMr5M=","crlite_enrolled":false,"id":"91f64259-d321-4336-9692-f6d7385aee61","last_modified":1576536531975},{"schema":1576536091272,"derHash":"Ie5tT1/uSFrHoDXx1l3i/E3Q7SiXrNwqO2ecBNRZmug=","subject":"CN=DOMENY SSL EV Certification Authority,OU=Controlled by COMODO exclusively for DOMENY.PL sp. z o.o,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIHHMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMUEwPwYDVQQLEzhDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgRE9NRU5ZLlBMIHNwLiB6IG8ubzEuMCwGA1UEAxMlRE9NRU5ZIFNTTCBFViBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"6970cf0b963db7eef40d70e72633e4c8ce08e846f279520c4999c0506b87d77e","size":2292,"filename":"QKMgYhV5InRJvYzUJ1ylX-BvwC9fUdLVL_e6cCnbdGM=.pem","location":"security-state-staging/intermediates/85329473-fb73-4c5c-867f-1f579e8084dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QKMgYhV5InRJvYzUJ1ylX+BvwC9fUdLVL/e6cCnbdGM=","crlite_enrolled":false,"id":"3884c098-4ac5-4ebc-8315-ed00d73e0f3b","last_modified":1576536531969},{"schema":1576536113347,"derHash":"43IiEmajMN0T6xOI36rx+rEd8lS2M4XLY3v++PtftnU=","subject":"CN=QIDUOCA 2018 DV SSL,OU=Domain Validated SSL,O=Suzhou Qiduo Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MIGCMQswCQYDVQQGEwJDTjE2MDQGA1UECgwtU3V6aG91IFFpZHVvIEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMR0wGwYDVQQLDBREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAwwTUUlEVU9DQSAyMDE4IERWIFNTTA==","whitelist":false,"attachment":{"hash":"0ba2fb2707f62d2ab80d7dea9b69d32058ae47514caecd5cf221db84eb014577","size":1752,"filename":"HjT11uxb0dXXxZnh6FUmEWVHULtStPZ1LLzRYdkdoqY=.pem","location":"security-state-staging/intermediates/b6478416-94fe-4096-b983-23b33e8a6d14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HjT11uxb0dXXxZnh6FUmEWVHULtStPZ1LLzRYdkdoqY=","crlite_enrolled":false,"id":"774024b8-2afe-482e-ad94-a88d0107d630","last_modified":1576536531954},{"schema":1576536134135,"derHash":"E0fpe/W3HHjeAPKkSp0H33ji6ZfpjnA4t2JXZcl83Ec=","subject":"CN=InterCloud SSL Certificate CA RSA R2,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBTU0wgQ2VydGlmaWNhdGUgQ0EgUlNBIFIy","whitelist":false,"attachment":{"hash":"7e3b11492fce1b8ac408168e725129a5c774c0d4764c02c60d7e653acf1e4856","size":2454,"filename":"zp3iAFlKcyLAMqe-MJZjgpwhwmLrQYDlVEHNTCciBQw=.pem","location":"security-state-staging/intermediates/c1f1ee12-bac1-479c-8f15-6e35034b9672.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zp3iAFlKcyLAMqe+MJZjgpwhwmLrQYDlVEHNTCciBQw=","crlite_enrolled":false,"id":"c591d861-86f8-4939-8c1c-a0b83d61b88a","last_modified":1576536531926},{"schema":1576536119117,"derHash":"3U4MF5APP8Klt7dzrkAhitcyFrXOXShev/zogw0PA0o=","subject":"CN=TERENA Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDM=","whitelist":false,"attachment":{"hash":"ee4661bbdd2c4531f9ec0affb2c8462ab039ea1abc75584561047afbf60517fc","size":1792,"filename":"HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC_kcr3CVOg0=.pem","location":"security-state-staging/intermediates/3efac7ca-1e54-4d12-b5f9-b9a9bcb72512.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC/kcr3CVOg0=","crlite_enrolled":false,"id":"f823a65d-ac05-44a5-adb6-73f57c876206","last_modified":1576536531896},{"schema":1576536089732,"derHash":"h1b6/vsKedj/Nhx/46TbP5rVIGVS5xpJXfmKM85laTw=","subject":"CN=CertAssure RSA DV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIERWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"59e582ca4786d9959908ac2fdee355c16c187ee8353d64d2648b55b2d448272f","size":2166,"filename":"XUK4_mOFBsai_iVZvPajZozACtYX_1Rgy6ZjFieNpck=.pem","location":"security-state-staging/intermediates/c0a3d994-1f2c-424b-b5a4-7fd2569d8f40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XUK4/mOFBsai/iVZvPajZozACtYX/1Rgy6ZjFieNpck=","crlite_enrolled":false,"id":"0c8e5371-6bfd-4e3c-8fc1-214bbadc4181","last_modified":1576536531888},{"schema":1576536128385,"derHash":"nDBRZJbhJbPQkx9Jh14pUW2dwlRz5dahBsH8+GbTBts=","subject":"CN=GTS Y2,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTI=","whitelist":false,"attachment":{"hash":"e8c95c6e8334db472dd4dd81fc9057a756258573b6b2c815af66cdf0e960c6a0","size":1906,"filename":"zYGIkpoNQj_A8MrSV7BzubZdDqEk9LkLgAj8t8_U_ns=.pem","location":"security-state-staging/intermediates/4f5d4d0d-ab8d-454f-9170-45bee44c5db8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zYGIkpoNQj/A8MrSV7BzubZdDqEk9LkLgAj8t8/U/ns=","crlite_enrolled":true,"id":"510e0089-ae37-4b96-8605-c4ba8a4f38f3","last_modified":1576536531882},{"schema":1576536083630,"derHash":"1XCEwSeYcycess57hBWkHOkSa1RNhRi62H/xzlpgTaM=","subject":"CN=GTS CA 1D2,O=Google Trust Services,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3QgU2VydmljZXMxEzARBgNVBAMTCkdUUyBDQSAxRDI=","whitelist":false,"attachment":{"hash":"9111c956475abad64a74fc25f5dc5839249913246aeda37cded4b3651b45520e","size":1548,"filename":"qPerI4uMwY1VrtRE5aBY8jIQJopLUuBt2-GDUWMwZn4=.pem","location":"security-state-staging/intermediates/577bf05b-e334-4a66-bcb0-d3bb3cbb33d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qPerI4uMwY1VrtRE5aBY8jIQJopLUuBt2+GDUWMwZn4=","crlite_enrolled":true,"id":"21baac25-4dc6-42e5-813f-8cb5b1d60305","last_modified":1576536531880},{"schema":1576536096939,"derHash":"307LFhEO3qq6B6eB7Lk/41SWGzEx0tpQctNKvgt01bg=","subject":"CN=SecureCore RSA OV CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxHTAbBgNVBAMTFFNlY3VyZUNvcmUgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"2967d56ddac89aa3e10b2450061c6d5258252e83a4ea9ffd3e0c4453b315d01f","size":2113,"filename":"i9YotTNYIfvzcEXlwG2eor_v3IOO_LhM0dufRqOf7Dk=.pem","location":"security-state-staging/intermediates/4750431c-6e17-4977-8f5e-4aadf57f6f10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i9YotTNYIfvzcEXlwG2eor/v3IOO/LhM0dufRqOf7Dk=","crlite_enrolled":false,"id":"060fd0ef-9267-43a4-be6a-5844fda14113","last_modified":1576536531877},{"schema":1576536119880,"derHash":"vVY5dW8Ng32ZohBnKiEMZJsj6lm0+nbeDW5C/XutIbk=","subject":"CN=SECOM Passport for Web SR 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"d513ae4a2e1cd882559b7cef11ccc51bab7106fa40baff92662c011fc57d40a7","size":1609,"filename":"0CzdK_GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=.pem","location":"security-state-staging/intermediates/fc037576-199b-471d-9159-805b07c72b77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0CzdK/GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=","crlite_enrolled":false,"id":"c483233c-8b30-44c2-a3bc-bbba8ccd21f7","last_modified":1576536531859},{"schema":1576536087107,"derHash":"Dve4Y/qrw4SmlP9jLar5vTHO0j6SRlWaWezXRydUzOY=","subject":"CN=emSign Class 1 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDEgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"7794b1b190e82b18d7b5fa922d7bfc2eac719e69dd3bdb72cc135eddd69bc51c","size":1540,"filename":"tGZeupl-1fZilJwugiteFK3_QBrwzCRpRSZvX6uA41s=.pem","location":"security-state-staging/intermediates/1c8b5b0a-6ce6-460c-b68c-5b9e6dcd4acd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tGZeupl+1fZilJwugiteFK3/QBrwzCRpRSZvX6uA41s=","crlite_enrolled":false,"id":"3d7a069a-f29d-4118-9ac6-49aa45da46c3","last_modified":1576536531856},{"schema":1576536094670,"derHash":"NsfjKXUKQD2wuvBpyanzOWPlyYpmqKtXAW22+IzFYU0=","subject":"CN=MilleniumSign SSL Certificate CA RSA R2,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIFNTTCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"3c3182c3f974165726acb2e2b6c35f9306b120ba4684e22ac91eef26e5ef70a1","size":2552,"filename":"1jNByu9N5tc5kL0IfWW4-AIUQnp6ljVLB3ROX-cA6b4=.pem","location":"security-state-staging/intermediates/03421df1-3916-4c0a-87eb-0d83ea93a06f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jNByu9N5tc5kL0IfWW4+AIUQnp6ljVLB3ROX+cA6b4=","crlite_enrolled":true,"id":"17e6f300-d0c1-4ef6-ae0f-36ecd026b133","last_modified":1576536531841},{"schema":1576536072963,"derHash":"pBaiukkMRU4juFvwh9t7E39PR9l0fmD4aS/0yN8OBis=","subject":"CN=TrustOcean Certification Authority,O=QiaoKr Corporation Limited,C=CN","subjectDN":"MF8xCzAJBgNVBAYTAkNOMSMwIQYDVQQKDBpRaWFvS3IgQ29ycG9yYXRpb24gTGltaXRlZDErMCkGA1UEAwwiVHJ1c3RPY2VhbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"40aa115c2456db45d24f826f71babce7e8711e6dadb79d51f81544b5cc127980","size":1703,"filename":"AqnxlVGHcuEywBdQxncOoMBd2w-idNlfoDEnTgEx5S4=.pem","location":"security-state-staging/intermediates/a719d773-6e0a-47c4-84e1-8f61cf95748f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AqnxlVGHcuEywBdQxncOoMBd2w+idNlfoDEnTgEx5S4=","crlite_enrolled":false,"id":"13b2016a-1e62-488b-bfaa-2c73a57c8dc9","last_modified":1576536531833},{"schema":1576536114857,"derHash":"LHPumlL/rQcWa4co12gdjL79makGYzRbJarPmx7x8zM=","subject":"CN=SignSec Certification Authority,OU=SSL Department,O=FBS Inc,L=Irvine,ST=CA,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTEQMA4GA1UEChMHRkJTIEluYzEXMBUGA1UECxMOU1NMIERlcGFydG1lbnQxKDAmBgNVBAMTH1NpZ25TZWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"62210923e47646adf9d060655571c4ce48eb821e4d6302a97121bed12dde39bc","size":2158,"filename":"41fzHe29HqEJ0_pGALXNvRuPsmNV1cP7w8L-2fi7OPc=.pem","location":"security-state-staging/intermediates/d72e3cd5-274b-4802-b95f-74a7558123ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"41fzHe29HqEJ0/pGALXNvRuPsmNV1cP7w8L+2fi7OPc=","crlite_enrolled":false,"id":"b5c03b14-145c-4893-ae49-ec141b83889c","last_modified":1576536531830},{"schema":1576536097708,"derHash":"QMgm/bIroyovnbT5R3D3K4sdqcj/2nsR5vJ68kXIm14=","subject":"CN=Amazon Root CA 3,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDM=","whitelist":false,"attachment":{"hash":"527804e0cdb3a780b57c0f3f7429e1a5b42984b3bd67157b9fda6ba75cdc6d0a","size":1370,"filename":"NqvDJlas_GRcYbcWE8S_IceH9cq77kg0jVhZeAPXq8k=.pem","location":"security-state-staging/intermediates/52ba3866-d596-48e9-9a8f-b80188b6a77a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NqvDJlas/GRcYbcWE8S/IceH9cq77kg0jVhZeAPXq8k=","crlite_enrolled":false,"id":"249a688b-b665-4574-a1c8-43ac8cff8067","last_modified":1576536531740},{"schema":1576536137962,"derHash":"WuRkvS+DkB/DPvK1DNiA9RGMjb6x60pOlLL7BRKIBcI=","subject":"CN=TrustID CA A12,O=IdenTrust,C=US","subjectDN":"MDoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAMTDlRydXN0SUQgQ0EgQTEy","whitelist":false,"attachment":{"hash":"5643f5bf1bb2b2cce3b4d8ebe783772927119005e011155e3846f1bbdbd4b89f","size":2337,"filename":"Bl-cWNKzUJ_jTvgry8Yjj5Z5DS-raoYNAW6LXHJZf5I=.pem","location":"security-state-staging/intermediates/d6c0cf43-3179-4734-93d2-2708d847db07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bl+cWNKzUJ/jTvgry8Yjj5Z5DS+raoYNAW6LXHJZf5I=","crlite_enrolled":false,"id":"058ccc29-07c2-417f-93d5-b3629027f1f1","last_modified":1576536531734},{"schema":1576536075645,"derHash":"z20DM9C+LGmkLUU5YN7p4QnZ6IQ+owYaFnHW6vhet9g=","subject":"CN=emSign Class 1 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMSBDQSAtIEcx","whitelist":false,"attachment":{"hash":"266278533c3786da3d8865fcd54e0e8fbedf26868dc64378e368d49cb3b7817b","size":1589,"filename":"8eYpGcWTiEZyMyyg19Q9T-bCQt78vGjuJDkLU10HGx8=.pem","location":"security-state-staging/intermediates/ca8d7c44-0de7-4fdb-a4bb-a07b24618b68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8eYpGcWTiEZyMyyg19Q9T+bCQt78vGjuJDkLU10HGx8=","crlite_enrolled":false,"id":"1cb8aaf5-1bf5-4af2-992d-adeedaabcaa7","last_modified":1576536531692},{"schema":1576536075273,"derHash":"jxn/4C/Hle1wdl0UNq3fdy/g8Hc9pDbtvbQqLjDi6Cg=","subject":"CN=GlobalSign ECC EV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBFViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"f363653deddf2dfcf9778cf76ffb95c3df7a78ee504183ca843b0302e14a7651","size":1102,"filename":"OD_WDbD3VsfMwwNzzy9MWd9JXppKB77Vb3ST2wn9meg=.pem","location":"security-state-staging/intermediates/44d3815f-42a9-4cec-bf3e-876bdcd1f014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OD/WDbD3VsfMwwNzzy9MWd9JXppKB77Vb3ST2wn9meg=","crlite_enrolled":true,"id":"0fd62746-093f-43ab-bba0-8f8ee357a4e7","last_modified":1576536531682},{"schema":1576536080984,"derHash":"QtocVi+A5G2noyEkTvwj0Pqp/ru3qgN32WtC2eiKsgA=","subject":"CN=emSign Class 3 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMyBDQSAtIEcx","whitelist":false,"attachment":{"hash":"d7df1cc3c3cc232a8f51e22a5dd4ea1766aeacac640f8a976a7c227626346ed2","size":1589,"filename":"4d2pu0FN5HWVpPbYu-0cH1AeCZYz3dgz9eFeY0xuTh8=.pem","location":"security-state-staging/intermediates/dbf450a1-135d-4dc7-8677-00049ab4ecf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4d2pu0FN5HWVpPbYu+0cH1AeCZYz3dgz9eFeY0xuTh8=","crlite_enrolled":false,"id":"6f7f445a-9db3-41b6-8e6e-c97091de4b0d","last_modified":1576536531660},{"schema":1576536092403,"derHash":"6KfgjGL0C3iqD3Asx6b38M4L/ghgnSI0mJDDpYs//20=","subject":"CN=CrossTrust OV CA1,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBMQ==","whitelist":false,"attachment":{"hash":"0f7649880bfb97b342488531ab9f62e71f04e868a7191e8ae54b03b2526a7b31","size":1475,"filename":"qCy2EaMHB8FwmEDmszuH-bVZvMg1fSM10j8JL_PqoF8=.pem","location":"security-state-staging/intermediates/b797cd73-20ba-443a-a101-20abc2160b1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qCy2EaMHB8FwmEDmszuH+bVZvMg1fSM10j8JL/PqoF8=","crlite_enrolled":false,"id":"10c4381f-23c3-44d1-a6f7-2707055dca1d","last_modified":1576536531624},{"schema":1576536074509,"derHash":"/SmRsTTOV7+c1oaHiFSl7tXqZEMwAkUrpAOY2niEXKc=","subject":"CN=SwissSign Server Gold CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFExCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDA4IC0gRzI=","whitelist":false,"attachment":{"hash":"f15bb6ffc3798a8b4808913b8ac6cc390cb6a0a58fbd2d65caf2e689c58711c6","size":2268,"filename":"4wrJfevPFcxD_U4tiJM27RJ1g4zjbu-B3eTgC_qPxGg=.pem","location":"security-state-staging/intermediates/56bf7371-6dd1-4cf7-a321-74547c1d3616.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4wrJfevPFcxD/U4tiJM27RJ1g4zjbu+B3eTgC/qPxGg=","crlite_enrolled":false,"id":"6ea46eb8-ddab-4129-8cd8-2b50d6580b24","last_modified":1576536531598},{"schema":1576536084043,"derHash":"XbYMLWtr7PMUR3WJo6T7TM+EZJ1psLIbPWsquni9Nfs=","subject":"CN=GDCA TrustAUTH R4 Generic CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJTAjBgNVBAMMHEdEQ0EgVHJ1c3RBVVRIIFI0IEdlbmVyaWMgQ0E=","whitelist":false,"attachment":{"hash":"22066078c8b548595b3543e7f4efbc0819675c6d5799aab9f7eb51ee3085e95e","size":2056,"filename":"mXaq2dsX_TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=.pem","location":"security-state-staging/intermediates/874fedb4-3946-494c-8f65-a56d07cb81a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mXaq2dsX/TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=","crlite_enrolled":false,"id":"67740d97-16e0-48d6-9078-18385eaf1f0c","last_modified":1576536531581},{"schema":1576536100074,"derHash":"wijZPb5VNqEgrCTtk0RnutcpL4t+sgJjSxcHConF/ps=","subject":"CN=GlobalSign PersonalSign 3 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"bf2a244863f255c9fd22a4c3444454a1bcccd8d89f263ecd2121ad83d9dd4cee","size":1569,"filename":"6FXSznfWYgPxKc6WahR_l3YNNCjz1qGbLp4BZInCAps=.pem","location":"security-state-staging/intermediates/41e39ce7-b2aa-4851-98bc-78caa2fa6bf2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FXSznfWYgPxKc6WahR/l3YNNCjz1qGbLp4BZInCAps=","crlite_enrolled":false,"id":"cb5f2e05-a07d-4855-b07c-6f225c2dc2da","last_modified":1576536531569},{"schema":1576536089348,"derHash":"aMGCyP43TVwJTmMllVny8HZKWJdDWD9KA+P2O3TXruo=","subject":"CN=WISeKey CertifyID Qualified G1 CA,OU=Copyright (c) 2006 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGLMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA2IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKjAoBgNVBAMTIVdJU2VLZXkgQ2VydGlmeUlEIFF1YWxpZmllZCBHMSBDQQ==","whitelist":false,"attachment":{"hash":"d121c53328227cbe05ca7fef5dd84f062e82ef7e4960906d63b965909c82c934","size":1792,"filename":"8rqHoUpCjtZnIU9Eqwsz8IZwJcJMjg593mwJBPG32DI=.pem","location":"security-state-staging/intermediates/6c5d5d70-f804-4ff4-ba96-0b7fbe2e30f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8rqHoUpCjtZnIU9Eqwsz8IZwJcJMjg593mwJBPG32DI=","crlite_enrolled":false,"id":"3687c07b-0800-4cc1-aa2b-1e6741bc3428","last_modified":1576536531556},{"schema":1576536104206,"derHash":"WpoD8tP+WJvmPNoRggqfJfB0ySA09RwEfTQibSUuwCU=","subject":"CN=emSign ECC Class 3 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAzIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"6a976c7c76045fe8433c1fea57e7ae1de19f27a18f1c7bac51939e901257ea89","size":1098,"filename":"7yfF5AdGH75Zx9ksuCGXlGlIQcXlTbPFVOh5ccaTF0o=.pem","location":"security-state-staging/intermediates/f7dc2c14-5d52-4c59-97e7-78062c62da07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7yfF5AdGH75Zx9ksuCGXlGlIQcXlTbPFVOh5ccaTF0o=","crlite_enrolled":false,"id":"0e7af0a7-8aa0-4cbb-960e-7f7436ef41ed","last_modified":1576536531553},{"schema":1576536138735,"derHash":"Uk5bOlWNX/AafEYCahS1jHfPne+6aR6sjkoX+sKjo7Y=","subject":"CN=ABB Intermediate CA 4,O=ABB","subjectDN":"MFgxEzARBgoJkiaJk/IsZAEZFgNDT00xEzARBgoJkiaJk/IsZAEZFgNBQkIxDDAKBgNVBAoTA0FCQjEeMBwGA1UEAxMVQUJCIEludGVybWVkaWF0ZSBDQSA0","whitelist":false,"attachment":{"hash":"bcf24b7da92702c711a274a90adbcc4eb31cc77e3005b0f0418c5b579b3dedbd","size":2690,"filename":"kaOrTzoe-Gh5cWt5XfatccAttrnblSCwYojFn7U0lhM=.pem","location":"security-state-staging/intermediates/914207d4-d1ef-4cdc-857d-aeea9ec81e43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kaOrTzoe+Gh5cWt5XfatccAttrnblSCwYojFn7U0lhM=","crlite_enrolled":false,"id":"e8e0c38b-beec-4346-b2db-7c6cac67c695","last_modified":1576536531548},{"schema":1576536104947,"derHash":"dEaBgM5WS61+gSIQr3Q+hcqWy6RM9YUfoACCNBslNfU=","subject":"CN=GDCA TrustAUTH R4 DV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"7cfea5fa9465373b3b94affa9d9aab2c113c1118cc633be2b62f93987ea69fa5","size":2052,"filename":"iBHlL3zuDBffc94FLYVkQWUl8ghEY26YFGj-wm1psHY=.pem","location":"security-state-staging/intermediates/99cb19eb-1375-4867-90aa-b0b2d298c16c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iBHlL3zuDBffc94FLYVkQWUl8ghEY26YFGj+wm1psHY=","crlite_enrolled":false,"id":"66719d09-7132-4513-86df-72ef54bba5b6","last_modified":1576536531539},{"schema":1576536126868,"derHash":"928NitMwrP1MW9BaWKHPFV3gC+LJj054mb4k6AoqvL8=","subject":"CN=thawte SHA256 Code Signing CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xKzApBgNVBAMTInRoYXd0ZSBTSEEyNTYgQ29kZSBTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"8d1b6568e0c9f839594eb1d21126334c08330175fdd7aa0dd5ef87b386381f2b","size":1813,"filename":"KxgL7ZzAwOK6VyuRh0Qgl8AO3GNYmmtOAageweXe2HM=.pem","location":"security-state-staging/intermediates/6623e0a2-ca3f-42df-9aab-1ae957647958.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxgL7ZzAwOK6VyuRh0Qgl8AO3GNYmmtOAageweXe2HM=","crlite_enrolled":false,"id":"99881c4a-a35d-4f02-8c92-1bdb792da661","last_modified":1576536531530},{"schema":1576536077553,"derHash":"gQHDuvnQ7dcRgNHzfW11t3sOjPtZPTQsOjHkZ5hdSnQ=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign Primary CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGwMQswCQYDVQQGEwJQVDEqMCgGA1UECgwhRGlnaXRhbFNpZ24gQ2VydGlmaWNhZG9yYSBEaWdpdGFsMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTE+MDwGA1UEBww1R3VpbWFyYWVzIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5kaWdpdGFsc2lnbi5wdCkxHzAdBgNVBAMMFkRpZ2l0YWxTaWduIFByaW1hcnkgQ0E=","whitelist":false,"attachment":{"hash":"a83022b4b30a88628db0ac26c6a3b7fd1211de3741122d444a90773a7113a376","size":2978,"filename":"lGHa44HE2Tf2byLm_zbLjYVyWUTCuVjs85wVs0pjx_4=.pem","location":"security-state-staging/intermediates/3ebbcd56-4f53-4881-9eb6-501675f8fa48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lGHa44HE2Tf2byLm/zbLjYVyWUTCuVjs85wVs0pjx/4=","crlite_enrolled":false,"id":"7c2951dd-7bee-4774-8867-6403834d5206","last_modified":1576536531525},{"schema":1576536079076,"derHash":"20WR+Hj2Zy9bcHM6Zq18lTe5fm8K9cpJqrjsss4C+Gs=","subject":"CN=emSign ECC Class 2 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAyIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"6726d4cd8b74a9dc90a4a784c54671d69630f8fb6349c445e838be1cfccdce15","size":1098,"filename":"6nBouKNAQSAKbMyn22fCnI3dwxK0fiT4UvzcTjEMQKo=.pem","location":"security-state-staging/intermediates/e7df3325-60f1-4ee6-9ef7-fad0411247c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6nBouKNAQSAKbMyn22fCnI3dwxK0fiT4UvzcTjEMQKo=","crlite_enrolled":false,"id":"95e7d143-1acd-49b1-a78d-ad87dbf9fa68","last_modified":1576536531522},{"schema":1576536074889,"derHash":"2gr68VzTAONLUg+3ik+mjrQsRgHpObkD4LHXHfWWW/8=","subject":"CN=QuoVadis Code Signing CA G1,O=QuoVadis Limited,C=BM","subjectDN":"ME4xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSQwIgYDVQQDExtRdW9WYWRpcyBDb2RlIFNpZ25pbmcgQ0EgRzE=","whitelist":false,"attachment":{"hash":"0dc22657eb892ad49c75f643d992174fea2c22fdc850b5792b0259b076e66faa","size":2272,"filename":"VCr-eF6_xVmjgcXvq31J5dzsT0JrmClTQ6o74gj6qE8=.pem","location":"security-state-staging/intermediates/4656eb34-6036-4f00-9758-cc94462b55e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VCr+eF6/xVmjgcXvq31J5dzsT0JrmClTQ6o74gj6qE8=","crlite_enrolled":false,"id":"55cb4262-db0c-4e46-9de7-bd25df1c58d9","last_modified":1576536531519},{"schema":1576536111418,"derHash":"RZCrAULHhnEfVuh9+B6/mJGngEPNaNBwKUM/NRjsdss=","subject":"CN=WebSpace-Forum Essential CA II,O=WebSpace-Forum e.K.,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHYxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEcMBoGA1UEChMTV2ViU3BhY2UtRm9ydW0gZS5LLjEnMCUGA1UEAxMeV2ViU3BhY2UtRm9ydW0gRXNzZW50aWFsIENBIElJ","whitelist":false,"attachment":{"hash":"93fcdf1909661393298dbc544f6986fede575481f68106dae6fa2e24691582ff","size":2138,"filename":"JLiByOVnWd2f8bAC0L_puQNtFwBfGt4XaQ6BRcqgrQ4=.pem","location":"security-state-staging/intermediates/1247d329-776e-42bb-8a64-e61a2c46e6e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JLiByOVnWd2f8bAC0L/puQNtFwBfGt4XaQ6BRcqgrQ4=","crlite_enrolled":false,"id":"fcf2e7fb-bc92-4de6-8e18-b79ce15100a5","last_modified":1576536531502},{"schema":1576536092777,"derHash":"dNNMp9NUf7PslV2O7+vE3PDLsK7z+XfhnFchIjxuW0M=","subject":"CN=InterCloud Code Signing Certificate CA RSA,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGHMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEzMDEGA1UEAwwqSW50ZXJDbG91ZCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGUgQ0EgUlNB","whitelist":false,"attachment":{"hash":"b6b52e4c73da45484c9e358a3b77a269cef709c7275e385f705525e41e5cd34f","size":2438,"filename":"kaEqLmvrlN2nJCNqgThzck5OGxBpaazwyCcRzxiCwdU=.pem","location":"security-state-staging/intermediates/cd8297a0-ead5-4928-9218-b14cf084fdfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kaEqLmvrlN2nJCNqgThzck5OGxBpaazwyCcRzxiCwdU=","crlite_enrolled":false,"id":"98c56f00-c9a1-49b1-8c3c-95dca890b9f9","last_modified":1576536531499},{"schema":1576536069912,"derHash":"QE5kPW7tO/z6/EnMV9bmvktt6ClxdsUZDxXgpe8R/pc=","subject":"SERIALNUMBER=A82743287,CN=AC Camerfirma Portugal - 2015,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=ES","subjectDN":"MIGrMQswCQYDVQQGEwJFUzEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxQzBBBgNVBAcMOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRkcmVzcykxJjAkBgNVBAMMHUFDIENhbWVyZmlybWEgUG9ydHVnYWwgLSAyMDE1","whitelist":false,"attachment":{"hash":"a879f554628862eeeb50ede2ef4f18fa09e2fe831a737a081bbf05239bbf32ea","size":2930,"filename":"w12hFjmf7dfqB7Th3bbHbZCxFIvO6PueH3VrEWkJdmE=.pem","location":"security-state-staging/intermediates/3f702bc9-3fdf-4d61-9947-f953f2f91225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w12hFjmf7dfqB7Th3bbHbZCxFIvO6PueH3VrEWkJdmE=","crlite_enrolled":false,"id":"d89ad2c7-c77a-4a8a-8d0a-d54c3b1492d7","last_modified":1576536531481},{"schema":1576536129511,"derHash":"9mCwwlZIHLK/xnZhweqP7uOVtxQbysNsNuBNCM2eFYI=","subject":"CN=DFN-Verein Certification Authority 2,OU=DFN-PKI,O=Verein zur Foerderung eines Deutschen Forschungsnetzes e. V.,C=DE","subjectDN":"MIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDI=","whitelist":false,"attachment":{"hash":"6a4a495a8e0a5d05743b1038d796e892b2588f6e493314ad4c9bd9091e0e5590","size":1817,"filename":"nKACHrGIK7Y2Rip247vWnOEfapF_v8H8rewd_Mzla8U=.pem","location":"security-state-staging/intermediates/97909fb6-ddc3-470e-be2b-383bf9c3f177.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nKACHrGIK7Y2Rip247vWnOEfapF/v8H8rewd/Mzla8U=","crlite_enrolled":false,"id":"3cfbb558-f1ba-418a-9513-9ebf4f15523d","last_modified":1576536531457},{"schema":1576536073722,"derHash":"fXQDQbUZP1PmdeOh47SxCV5gJQn2Wl+nV2sOOlRw+cY=","subject":"CN=GTS Y1,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTE=","whitelist":false,"attachment":{"hash":"639a1475e5dc0801f220279c12f2a7afd908a3c78a3734cd6f1be16127a0c9d7","size":1906,"filename":"V7Wxjz1qgqxtHdP2QmPdLItv2zRjJ79Zl1N6X7TYHVA=.pem","location":"security-state-staging/intermediates/7190cdca-d03a-4a38-9344-112721e008fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V7Wxjz1qgqxtHdP2QmPdLItv2zRjJ79Zl1N6X7TYHVA=","crlite_enrolled":true,"id":"a7a48ed8-bb53-4eac-b5dd-e7e62ded4fd6","last_modified":1576536531429},{"schema":1576536128013,"derHash":"EercU3mxUsGpDR2+AHIsUxZbMgAx9bpGmt9ZAv2x+kU=","subject":"CN=SSL.com Code Signing Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMT8wPQYDVQQDDDZTU0wuY29tIENvZGUgU2lnbmluZyBFbnRlcnByaXNlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"09d53bf64faddcead2273649e4cb3fa12dc7c5c6b11e5b058c2da05851cfa6b0","size":2438,"filename":"-HKIj9tLIUqgEj0Y5m5tNgY4LWGaXWYKZ86BvcEzblM=.pem","location":"security-state-staging/intermediates/63a0dcc7-5d7b-4f91-b6d4-59aa5af2f7d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HKIj9tLIUqgEj0Y5m5tNgY4LWGaXWYKZ86BvcEzblM=","crlite_enrolled":false,"id":"e5ed27bc-521e-4e8c-a344-7fcf0bfa9290","last_modified":1576536531403},{"schema":1576536117580,"derHash":"pCOjNJOzGVMibflkd2J9vQVnVnBCEQAbYWH7X4KZ3Do=","subject":"CN=Government Root Certification Authority - G1.5,O=\u884c\u653f\u9662,C=TW","subjectDN":"MFoxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxNzA1BgNVBAMMLkdvdmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcxLjU=","whitelist":false,"attachment":{"hash":"bd641cbfea8a068b2460fd4b90519d206aaa857dfae47763af8e3c24467355c9","size":2296,"filename":"C-F4mFTVkarDabMlcY1XHBga4Nw59VzZ4uPejwqVOg0=.pem","location":"security-state-staging/intermediates/992aa19e-0103-45d3-bfc5-52baf8d7eab6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C+F4mFTVkarDabMlcY1XHBga4Nw59VzZ4uPejwqVOg0=","crlite_enrolled":false,"id":"a1cc2141-ced4-48dd-9b77-c0596f7d704f","last_modified":1576536531327},{"schema":1576536076791,"derHash":"BabbOJOR35LgvpP9+k2x489TkDkYuNnYWpw5bLVd8DA=","subject":"SERIALNUMBER=10688435,CN=Starfield Secure Certification Authority,OU=http://certificates.starfieldtech.com/repository,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHcMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE5MDcGA1UECxMwaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5MTEwLwYDVQQDEyhTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgxMDY4ODQzNQ==","whitelist":false,"attachment":{"hash":"37d7bba2be8f3a98a69a003482d6d53844e60252e23b914f5352656847af97ff","size":1804,"filename":"lpQNmRQZFRRQ0edfZiGPbyWU4d9K8xpa1nPJqHRoF84=.pem","location":"security-state-staging/intermediates/6300e821-542e-4fd8-affd-d5e6a763540c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lpQNmRQZFRRQ0edfZiGPbyWU4d9K8xpa1nPJqHRoF84=","crlite_enrolled":false,"id":"cad79643-368d-41c4-961a-f100b194b581","last_modified":1576536531299},{"schema":1576536109499,"derHash":"wWH1qt5A+8lyPwiS3pY9TRBAVWGmvcaacnmPkYvtGc0=","subject":"CN=GRnet SSL RSA SubCA R2,O=Greek Research and Technology Network,L=Athens,C=GR","subjectDN":"MG8xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxLjAsBgNVBAoMJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsxHzAdBgNVBAMMFkdSbmV0IFNTTCBSU0EgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"69b971bbf7810fedfe1e5c31583714084300973264f6030e959f6e28b6f4374c","size":2861,"filename":"AC8xqpj5E7pReTXZrh3N31yqqxl7UQm0Z14O0g7xxVE=.pem","location":"security-state-staging/intermediates/d83f633b-df4f-4572-92e9-553a186319eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AC8xqpj5E7pReTXZrh3N31yqqxl7UQm0Z14O0g7xxVE=","crlite_enrolled":false,"id":"0d1c158e-15af-44d3-a9cf-1acb50435e20","last_modified":1576536531289},{"schema":1576536081735,"derHash":"5Wru6/KIBp7sLW4Ziifhn53zCRNQaM+pNUAmlD0k87E=","subject":"CN=InterCloud EV SSL Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBFViBTU0wgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"fbc3954b7d52a01d40cab42d2bc9fc08eff3e597a5d428992bb9581b7a8c94e0","size":2471,"filename":"hPLzG6Vy1gf1PMWWgLY8z_a0WyqyMoej9-buHprroIU=.pem","location":"security-state-staging/intermediates/f78a36aa-8e5c-4bf1-a835-3ab514fc45cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hPLzG6Vy1gf1PMWWgLY8z/a0WyqyMoej9+buHprroIU=","crlite_enrolled":false,"id":"edb99a2d-ef3a-4ae0-bf49-a63992885a1e","last_modified":1576536531281},{"schema":1576536076033,"derHash":"o6/XI3XB16gzDmLVd+E1gbcjMsgGLfqc855RrmUIhYI=","subject":"CN=emSign ECC CS CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIEVDQyBDUyBDQSAtIEMz","whitelist":false,"attachment":{"hash":"e78db72b2b20a263d8c00cd39c67f567bc602deb614b1af569a52798597a55a9","size":1122,"filename":"Qh3k9ZQZLXq0iPvXe_T_63H5TS-rZeD7d7TMPYB2nDQ=.pem","location":"security-state-staging/intermediates/c11d4e0a-dc97-4886-8df9-bb636b532d84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qh3k9ZQZLXq0iPvXe/T/63H5TS+rZeD7d7TMPYB2nDQ=","crlite_enrolled":false,"id":"0e5a0ce4-5b84-4080-a74e-7f228333f9b8","last_modified":1576536531267},{"schema":1576536126114,"derHash":"45ank0detv8VCmTWEzp+4KLHtndcvuumlbkNoB2BoEQ=","subject":"CN=Ensured Timestamping CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xIDAeBgNVBAMTF0Vuc3VyZWQgVGltZXN0YW1waW5nIENB","whitelist":false,"attachment":{"hash":"cad6a53fe8c841dabf9443dcb6b3d99b137f49b1af74207c6d31953d096f1df7","size":2389,"filename":"VgegaX7G8tbYRNCFSwpzrgTk_xEr-tyezX0fkrC6Opw=.pem","location":"security-state-staging/intermediates/a6e7795d-6715-4499-b681-96e97a4e8fc4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VgegaX7G8tbYRNCFSwpzrgTk/xEr+tyezX0fkrC6Opw=","crlite_enrolled":false,"id":"1712421f-df63-4c5b-b4ee-0359adde1aa5","last_modified":1576536531238},{"schema":1576536098501,"derHash":"7aycRZCfTex7tl8KT79qigN15Srt1m4GiI/tfj7exTc=","subject":"CN=SSL.com SSL Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNjA0BgNVBAMMLVNTTC5jb20gU1NMIEVudGVycHJpc2UgSW50ZXJtZWRpYXRlIENBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"42a56861b5ab133e4979bc06ef0b003aa3dcaff205a11727c118fa7ddf6a0048","size":2438,"filename":"oKApNpDL2hzvB6fqN6yfWxbdoxF2lvnVZLw24c9MNWU=.pem","location":"security-state-staging/intermediates/81af418f-7a0f-4859-980a-b92c6e71ed11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oKApNpDL2hzvB6fqN6yfWxbdoxF2lvnVZLw24c9MNWU=","crlite_enrolled":false,"id":"1ffc4914-2a3d-42d2-af2c-8f6f9dfaa60c","last_modified":1576536531230},{"schema":1576536121479,"derHash":"abDdCbmPNqnMe9f/6KANzTGaX8lHycivcskolNjoEJI=","subject":"CN=emSign Class 3 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDMgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"3aa155eb8f98e023c61de4d46433bc4046b93234f688f14f6806cdbe52688ea5","size":1540,"filename":"196cBc4ZpZ-dgc2f9eiIzsTDKH1UcMUQklpeqjt81U8=.pem","location":"security-state-staging/intermediates/99544220-2852-47f5-be07-65330e576225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"196cBc4ZpZ+dgc2f9eiIzsTDKH1UcMUQklpeqjt81U8=","crlite_enrolled":false,"id":"b1870974-fb66-409f-a707-cfab57324858","last_modified":1576536531194},{"schema":1576536083268,"derHash":"itR/bXCkT6gK8PkxEl/+OnaHb/rSGaTUChPAONyF5p4=","subject":"CN=TWCA Global Root CA,OU=Root CA,O=TAIWAN-CA,C=TW","subjectDN":"MFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"6e89794002729d6ef21257984707c517e72b2e5f2de8c602a8b0b3cdc1a90d19","size":1914,"filename":"xES1tmzl1x4bXkDyc4XJXL_SSgW1b3DKwJkvD1DDN5w=.pem","location":"security-state-staging/intermediates/9bf8c741-9386-401d-8c59-f5410390ae2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xES1tmzl1x4bXkDyc4XJXL/SSgW1b3DKwJkvD1DDN5w=","crlite_enrolled":false,"id":"954d0ac8-d979-4964-a8f1-6ae3ae761ebc","last_modified":1576536531183},{"schema":1576536078694,"derHash":"PzHbdYKNqpbk3luCoGeP4gI71bJGw/klDL9nGOEJWPU=","subject":"CN=Domain The Net Technologies Ltd CA for EV SSL R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MHIxCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMTkwNwYDVQQDDDBEb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBFViBTU0wgUjI=","whitelist":false,"attachment":{"hash":"cf5351124dd205109785f9b65c288b991342bec54071a6a24020c197870d64f5","size":2487,"filename":"Lk19AkNIC7AwHNF5HsU_phCEnUBI-eiA0mbFhxxeQsQ=.pem","location":"security-state-staging/intermediates/e3c32426-ee59-4729-9b1d-1ad5faa81c2c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lk19AkNIC7AwHNF5HsU/phCEnUBI+eiA0mbFhxxeQsQ=","crlite_enrolled":false,"id":"dafe281c-5c26-4b1e-b927-70b741e43b25","last_modified":1576536531160},{"schema":1576536136786,"derHash":"VyZLgqhk26HBHvP4CruUysNmBmKwwi9XH/mTs/vPdvs=","subject":"CN=GlobalSign R6 RSA EV SSL CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIFI2IFJTQSBFViBTU0wgQ0EgMjAxOQ==","whitelist":false,"attachment":{"hash":"3b45d522dacf5c2af31738aa7c87c46d04931ff0b15b7fac7f3a0f171300c60f","size":1963,"filename":"QOolPR845HC8Ff4855uLdJUjLioapW8oSD6M_yIMFwA=.pem","location":"security-state-staging/intermediates/8742ca82-49c0-4222-b980-771286d11f78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QOolPR845HC8Ff4855uLdJUjLioapW8oSD6M/yIMFwA=","crlite_enrolled":true,"id":"ce348e68-e297-4df6-86a7-02c8ed110b86","last_modified":1576536531157},{"schema":1576536106491,"derHash":"fb38a9RGPU4iR5vaTkqXP1islIRdsL+GwPaes9cZaRo=","subject":"CN=Entrust Certificate Authority - VMC1,OU=See www.entrust.net/legal-terms+OU=(c) 2018 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG5MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTggRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS0wKwYDVQQDEyRFbnRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIFZNQzE=","whitelist":false,"attachment":{"hash":"bb02397873f2c4d4ce4d00db9eb18931f8ed1d39d0b0013faf79e12d252bbf17","size":1845,"filename":"ccMHyN2s134FoF3tjZvYF97dSeZrfgLvt_bx5e-ZL6c=.pem","location":"security-state-staging/intermediates/3e0427b3-ebac-48e1-b923-b2775b46dba3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ccMHyN2s134FoF3tjZvYF97dSeZrfgLvt/bx5e+ZL6c=","crlite_enrolled":true,"id":"3817f2f2-2578-409e-ad5f-fe770e6cea9e","last_modified":1576536531128},{"schema":1576536084822,"derHash":"OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=","subject":"CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx","whitelist":false,"attachment":{"hash":"ba3408ac68d16d056b4d13b99108fdd4576e2f22a9d9433b1760f7042dff9c1e","size":2690,"filename":"2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem","location":"security-state-staging/intermediates/2d1416fb-780b-4826-b492-392b31a4d840.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=","crlite_enrolled":true,"id":"512ea919-32ec-46b7-bb60-30d517367583","last_modified":1576536531112},{"schema":1576536070287,"derHash":"BbMLP8RPhXUzS9gS75+opSp1dD4ZvDWlvjkS7KYsRmk=","subject":"CN=emSign Class 2 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDIgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"9e607bd9110b39c805c7004ad3bfc08fe04b920a7b93635f51bf863efcf5e402","size":1540,"filename":"wS3fnwn6I-0aX-URrvRiO7hPWPjTnhX4ui6vAkztOls=.pem","location":"security-state-staging/intermediates/090d486e-d557-4442-bccd-17e9440798f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wS3fnwn6I+0aX+URrvRiO7hPWPjTnhX4ui6vAkztOls=","crlite_enrolled":false,"id":"2938bfef-51d8-4a22-8411-49848fd8bfc8","last_modified":1576536531087},{"schema":1576536072203,"derHash":"yvOiKdRUWX8mKTnwfhBWg6cf3PkWRvxgoyr2s1T+Uq4=","subject":"CN=GIAG4 ECC,O=Google Trust Services LLC,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRIwEAYDVQQDEwlHSUFHNCBFQ0M=","whitelist":false,"attachment":{"hash":"d250d9ee687cf9e4246b82644cb5630d09a6b047ffbc09e2710c262db5258086","size":1033,"filename":"BZc_5XFEr4iNHxqv9J30g896n5jT5IJLYZJnXyqUkIU=.pem","location":"security-state-staging/intermediates/0586b336-44bf-4b57-81a3-a597aa6ac696.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BZc/5XFEr4iNHxqv9J30g896n5jT5IJLYZJnXyqUkIU=","crlite_enrolled":true,"id":"6b4f13f9-70f4-409d-8480-f02c4bff0feb","last_modified":1576536531082},{"schema":1576536117185,"derHash":"JKyImXRpR4nb1OEl/uGku6kVMgVnlcBSRLtmQAqdAxY=","subject":"CN=Intel External Issuing CA 6A,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDZB","whitelist":false,"attachment":{"hash":"689c11e7ec910735efff604833048c221777eab4f3a869452217208a6496c697","size":5302,"filename":"62Bjz2wUDypDAJAdgOWO6g4Q-xvhF2S5V9Ub4WaF38c=.pem","location":"security-state-staging/intermediates/0eb0ede0-3b40-4914-b328-d867d46793d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"62Bjz2wUDypDAJAdgOWO6g4Q+xvhF2S5V9Ub4WaF38c=","crlite_enrolled":false,"id":"996fe70e-67a0-4e5f-bbb2-c6aa08b730f6","last_modified":1576536531076},{"schema":1576536109863,"derHash":"K2XkXqGBwcwhscyen7HhD1QSlDK7eJc/YIxmpBUfvw4=","subject":"CN=SwissSign Personal Gold CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFMxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLTArBgNVBAMTJFN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMDggLSBHMg==","whitelist":false,"attachment":{"hash":"598861c42588dab6e66731a8211dd284f0fd76066d4512d38abb614bf0c0fec1","size":2272,"filename":"H8wvfs1_9UKqnEqfWrRdcjdulVUeWxShhG-KY5EtdAA=.pem","location":"security-state-staging/intermediates/c3f9f87d-4c3d-46e8-a9e5-97afdf8a5d56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H8wvfs1/9UKqnEqfWrRdcjdulVUeWxShhG+KY5EtdAA=","crlite_enrolled":false,"id":"eebb6ed7-cb4d-4157-8fc3-1589b7cf744e","last_modified":1576536531073},{"schema":1576536134507,"derHash":"BMQG8UgFI5rZqnMOQEMJhCUGJjcjBPeIg8iy7sTh8Ow=","subject":"CN=CertAssure RSA EV Secure Server Certification Authority,OU=Controlled by COMODO exclusively for CertAssure Inc.,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xPTA7BgNVBAsTNENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBDZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIEVWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"39f2469fbb8df9e31c6e1ac1d1f7adde9b94b1d93547c15a7bca015ee52b5be9","size":2284,"filename":"V-duof7YTC0BUw__nveYUxHnrma4qFXZJSOkbo7nmLA=.pem","location":"security-state-staging/intermediates/a6f51c91-d5c9-404f-a32f-c53011a17dcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V+duof7YTC0BUw//nveYUxHnrma4qFXZJSOkbo7nmLA=","crlite_enrolled":false,"id":"a2fccee2-f622-4d53-8bcc-821725ef9be7","last_modified":1576536531041},{"schema":1576536138351,"derHash":"z/m1TQAiAQAbZbHrdHSkXNGWV0DLrWqpMTxgovUo4Pc=","subject":"CN=InterCloud Code Signing Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGKMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzE2MDQGA1UEAwwtSW50ZXJDbG91ZCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"9e1ed4fa952f2f9b9a4fe771769f7256c676f3e12d757b982fdd175a6ede8bf3","size":2450,"filename":"yAZPLkv0qbo69hAf_tCw5gCcLyL1r_oksv9mX_yQPm4=.pem","location":"security-state-staging/intermediates/0f6e2365-6b15-47d3-96f2-37104310baf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yAZPLkv0qbo69hAf/tCw5gCcLyL1r/oksv9mX/yQPm4=","crlite_enrolled":false,"id":"d9ef7752-6373-47eb-8368-7254d44bc48d","last_modified":1576536531038},{"schema":1576536088599,"derHash":"k7KBvYHYPPmGZZ3/0K9XmTuS5uRhQWJTn3UFJM4Ru8s=","subject":"CN=Abitab SSL Extended Validation,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MGAxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMScwJQYDVQQDDB5BYml0YWIgU1NMIEV4dGVuZGVkIFZhbGlkYXRpb24=","whitelist":false,"attachment":{"hash":"a994aaf2225099f989467d317d95162a61ab0f2a8b48927a953540b65a87fe3e","size":1703,"filename":"y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=.pem","location":"security-state-staging/intermediates/972694b4-ca85-44f1-91f0-7e0a868a3149.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=","crlite_enrolled":false,"id":"04ee2b55-620a-4d2e-a4c7-00b5c73ec962","last_modified":1576536531027},{"schema":1576536117970,"derHash":"IqBmaJrJHHl9lwFGsLwTjhcDudqrpIFl/SVheSy3ApI=","subject":"CN=Ensured Root CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MG4xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xGDAWBgNVBAMTD0Vuc3VyZWQgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"58c6b3f9590beaac8c847b51838c79979c51e03d2e6837c39bec42dd614f1bbb","size":2499,"filename":"oFFz-dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=.pem","location":"security-state-staging/intermediates/35e9d30a-5e67-4eb9-9300-626da1a8a5ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFFz+dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=","crlite_enrolled":false,"id":"b9b47555-b6c5-4ee0-a493-eddd58344aa5","last_modified":1576536531021},{"schema":1576536120269,"derHash":"cKsPoVhs3K9hbpRorYiZV9uIsvpRMmDVv7TXGGJLyas=","subject":"CN=InterCloud Client Certificate CA ECC R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgRUNDIFIz","whitelist":false,"attachment":{"hash":"15381690ccb8715220ee0f2d1bd5f129abc513efd4d1b81be9011a5cc970a66c","size":1313,"filename":"FAxGAbOZXGp0v7CYE5tx-qSnEMhHxrej_VYYc0sM8lM=.pem","location":"security-state-staging/intermediates/e5d3b545-57b5-48bb-b906-dee6c7d31674.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FAxGAbOZXGp0v7CYE5tx+qSnEMhHxrej/VYYc0sM8lM=","crlite_enrolled":false,"id":"7963f1dc-116f-42ab-9528-718e02a7037c","last_modified":1576536530984},{"schema":1576536095441,"derHash":"+tLphknxxgYVD1UmnrwDWuoi/6wTHeZLppAMddhEe34=","subject":"CN=emSign ECC Class 1 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAxIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"c516b0ad97b1477bff6c92128e355bb9684dfe454d1ed7edc1e2a015ab934271","size":1098,"filename":"EqlTjvAcH3DgHiMTTQZXlA45Cyry_ZcvmeEoRmnEl5k=.pem","location":"security-state-staging/intermediates/e0fbcccb-8a1c-4bef-bbd6-b6e85d8aa2bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EqlTjvAcH3DgHiMTTQZXlA45Cyry/ZcvmeEoRmnEl5k=","crlite_enrolled":false,"id":"aa27b627-8f3f-4f46-a72d-a321873e033e","last_modified":1576536530924},{"schema":1576536123465,"derHash":"n4sFE38grN6bmWQQ9NC/eXGhAG3JnglMNG0nm5PP964=","subject":"CN=Certum Trusted Network CA 2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGAMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBIDI=","whitelist":false,"attachment":{"hash":"2ed8b49464676c3582a67b99f3e5cd0dd098cf86ea3a380a08fdb723ecff73a6","size":2081,"filename":"aztX6eyI0bs9AWN_8zx2mLPJdYJV6fAeqRePPn87K1I=.pem","location":"security-state-staging/intermediates/33541c6c-eb11-48ef-a315-ad9ba3237f2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aztX6eyI0bs9AWN/8zx2mLPJdYJV6fAeqRePPn87K1I=","crlite_enrolled":false,"id":"a3bedf42-c492-4e6c-a5b0-121be9c27b82","last_modified":1576536530917},{"schema":1576536115651,"derHash":"PIsNXCrfL3CQqbj/RSpBQYM96qBbX0TpUT25S/3x1r0=","subject":"CN=DigiCert Assured ID Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBLTE=","whitelist":false,"attachment":{"hash":"e7bb74d116899e94bb94f4648506beb395c201e451b7a717b2597204d707f0da","size":2361,"filename":"RElq7qZGBSzuZ3oQFuu4t-dh5QqmqZDyU-EAqeRVfJ4=.pem","location":"security-state-staging/intermediates/00f269ef-41b3-49c1-a17f-997a67e72cc2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RElq7qZGBSzuZ3oQFuu4t+dh5QqmqZDyU+EAqeRVfJ4=","crlite_enrolled":false,"id":"5ad4c097-50a4-4cb9-96b5-464ffb534360","last_modified":1576536530901},{"schema":1576536132210,"derHash":"6j0fxryF0/KKJ5/s0nFu37JIAboKkXMdndT2HAAF3OA=","subject":"CN=InterCloud Client Certificate CA RSA,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgUlNB","whitelist":false,"attachment":{"hash":"492e0463351fa0afda4ce4b8d543ce8bd04f92b6af7eb48b1ae6e6acc0a873d7","size":2458,"filename":"bTbQPhmklBVN2-MAzB_0isQMRAbBSvu6grjyvXYmNoA=.pem","location":"security-state-staging/intermediates/e0bfc4c4-4509-4b19-b44a-520e027bb6bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bTbQPhmklBVN2+MAzB/0isQMRAbBSvu6grjyvXYmNoA=","crlite_enrolled":false,"id":"7591fdc5-75b0-4980-b1f3-1a16f824a8d2","last_modified":1576536530898},{"schema":1576536071043,"derHash":"qvJSMNAwHa37HdV2g/rSUxk15z06evkfiMIJLfZPHlU=","subject":"CN=Sectigo RSA Client Authentication and Secure Email CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPjA8BgNVBAMTNVNlY3RpZ28gUlNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"972372f27d0e8a57aebece9d4ffd182cfe091eb2da10dc63ef24fb3e99505316","size":2162,"filename":"P4e3-L27Gol5FEOf4FvS1VtqCeuUHIS2ggBLqq2iVno=.pem","location":"security-state-staging/intermediates/51e4090e-a587-4bb4-95dd-3a21896e60ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P4e3+L27Gol5FEOf4FvS1VtqCeuUHIS2ggBLqq2iVno=","crlite_enrolled":true,"id":"79b1007e-6c07-4d7e-917c-835771f2207e","last_modified":1576536530893},{"schema":1576536101197,"derHash":"n0PVLoCMIK/2ngL6rCBarGhOaXUhPWYg+sZL3l/KtLw=","subject":"CN=Starfield Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"789b9056f79d6141a6214c6b990151b3e4959ece572fb2004fd731b195d33a79","size":1662,"filename":"gI1os_q0iEpflxrOfRBVDXqVoWN3Tz7Dav_7IT--THQ=.pem","location":"security-state-staging/intermediates/f18299c6-f4da-4af4-9ec8-a8d711749b1c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=","crlite_enrolled":false,"id":"bd0ecefd-cffd-4cd5-8a92-4ea3a0be8a89","last_modified":1576536530882},{"schema":1576536093158,"derHash":"PEa4r0DrgqOjMNjFvQfhy2FrRrHXAReeAls+aGbjyJ4=","subject":"CN=SECOM Passport for Web MH CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSUwIwYDVQQDExxTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIE1IIENB","whitelist":false,"attachment":{"hash":"1e77e83301dcd18767f1427a54e0da0cf6cfcca8d5a86931141a03a6aeeded7a","size":1630,"filename":"-WHNrFdX4L0XyuQsW7J364wRog3UU202mTVvLAgf0-Q=.pem","location":"security-state-staging/intermediates/df21fb52-0b48-4442-a551-4721b94d9185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+WHNrFdX4L0XyuQsW7J364wRog3UU202mTVvLAgf0+Q=","crlite_enrolled":false,"id":"af3b1462-5642-48da-b488-f8d9f455609b","last_modified":1576536530854},{"schema":1576536126483,"derHash":"C62pebcUAv6GBpYDLPQOnSo/Qcy10DvjP7uUqA1//Hw=","subject":"CN=emSign ECC EV CS CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGwxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSEwHwYDVQQDExhlbVNpZ24gRUNDIEVWIENTIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"ced67ca3e556805fc8dff2f88fe0a7eb2085c52e69c4487451bc0751f3fdd556","size":1171,"filename":"EJmcyHOC7lF3LeT2tA6NEeiAraOIeA9S1UYpt02xkfM=.pem","location":"security-state-staging/intermediates/cbb4de63-2aae-4252-8c82-60ec375b9f75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EJmcyHOC7lF3LeT2tA6NEeiAraOIeA9S1UYpt02xkfM=","crlite_enrolled":false,"id":"ac6b7097-8d8e-48f7-95dd-c5b3f779e44b","last_modified":1576536530846},{"schema":1576536102706,"derHash":"+BMqOx0ZAlxebrPBt2tTRljBGlvmkETp1ER7V5Rju0U=","subject":"CN=SecureCore RSA EV CA,OU=Controlled by COMODO exclusively for SecureCore,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MIGbMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFT1NBS0ExDjAMBgNVBAcTBU9TQUtBMRMwEQYDVQQKEwpTZWN1cmVDb3JlMTgwNgYDVQQLEy9Db250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgU2VjdXJlQ29yZTEdMBsGA1UEAxMUU2VjdXJlQ29yZSBSU0EgRVYgQ0E=","whitelist":false,"attachment":{"hash":"5c3979464fc2a18f34c71294f923f114dd13022b37f77d094c13eeaebc622af7","size":2227,"filename":"4oLlji5ovjgkWA95bS8h_Ik9hO3Fy_mgx1aM3Jv7Bn0=.pem","location":"security-state-staging/intermediates/3b845211-4906-4376-af9c-f6badae8bcae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4oLlji5ovjgkWA95bS8h/Ik9hO3Fy/mgx1aM3Jv7Bn0=","crlite_enrolled":false,"id":"ee5c06bc-0408-4c89-9c71-e4c6f1e26161","last_modified":1576536530832},{"schema":1576536077934,"derHash":"FFEKshf93SD6POLxcVg6RMXFP2ytCIa60Kkc+2ZmMtg=","subject":"CN=Fuji Xerox Xnet CA - S,O=Fuji Xerox,C=JP","subjectDN":"MEMxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR8wHQYDVQQDExZGdWppIFhlcm94IFhuZXQgQ0EgLSBT","whitelist":false,"attachment":{"hash":"57dab81e035f1e449c6b003fbfe4285e15046b4a31eb117a8b448089a24297e2","size":1597,"filename":"gAO3JhjiAz1Zf0po-cZL3EE5-B8ldkQ96CMkLA6pwic=.pem","location":"security-state-staging/intermediates/e24ff5fa-e62b-4eda-8e09-f1f1ba2a144f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gAO3JhjiAz1Zf0po+cZL3EE5+B8ldkQ96CMkLA6pwic=","crlite_enrolled":false,"id":"6f18cf19-a326-40aa-92df-d8dd2db7b375","last_modified":1576536530823},{"schema":1576536102337,"derHash":"gAQlY9tfFi5FVjK1icYBUPN+9/7bd0xtwu1bpvuGUSA=","subject":"CN=Fuji Xerox Product CA - S,O=Fuji Xerox,C=JP","subjectDN":"MEYxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSIwIAYDVQQDExlGdWppIFhlcm94IFByb2R1Y3QgQ0EgLSBT","whitelist":false,"attachment":{"hash":"2bd8c47808af695a6613fd3fda43e5e89156aa141086ccc13c4c478f1db0e222","size":1601,"filename":"cC-MmfQjJ6-hHwnk1ddR_Ki1Ompz1JMISw5dkaAcWHU=.pem","location":"security-state-staging/intermediates/6d9a5767-2099-402d-afb9-4293160f950e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cC+MmfQjJ6+hHwnk1ddR/Ki1Ompz1JMISw5dkaAcWHU=","crlite_enrolled":false,"id":"be853ae0-909e-4510-9fd8-ad6fb1bf7e15","last_modified":1576536530792},{"schema":1576536082122,"derHash":"V8B4jlHXvRRHDPnk830z+8EEx3UB69lXFm0U9ExRbDA=","subject":"CN=eMudhra RSA Organization Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGbMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPTA7BgNVBAMTNGVNdWRocmEgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"1dc5009b8a187d80f4c2d4b64c686bc21f7c5271889d102e7e57b598f0844b51","size":2190,"filename":"D9NZ6oWac3feaXj7Ii5NCfiL5RG3s0UIV08ecGxPgtc=.pem","location":"security-state-staging/intermediates/86678ec4-fa06-4337-ae60-af7ccb4a876d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D9NZ6oWac3feaXj7Ii5NCfiL5RG3s0UIV08ecGxPgtc=","crlite_enrolled":true,"id":"141d5b09-0e83-42ba-ae07-12fff6f057fe","last_modified":1576536530789},{"schema":1576536090496,"derHash":"tm0ozXDm0bMhaI4cR+Y8Q8dqxQMSkJ1OMNePCLLtYFo=","subject":"CN=Gehirn Managed Certification Authority - RSA OV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBPVg==","whitelist":false,"attachment":{"hash":"cc9bd6f9b4c416502e6664e834588afc8e552cabdfcd1da1a05bb57e4a8d208b","size":2158,"filename":"sshJv9IEWk4-_PzdkseeN0rxfdOaGYVax8sZbKeQegY=.pem","location":"security-state-staging/intermediates/1164b7bb-5691-4323-ad2c-7fdcd5cc1406.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sshJv9IEWk4+/PzdkseeN0rxfdOaGYVax8sZbKeQegY=","crlite_enrolled":false,"id":"070c5338-70b0-43f6-af7a-47b4b217d8b6","last_modified":1576536530783},{"schema":1576536082901,"derHash":"cGag9C9TDg21r+5yo7BN5hTn0jBcZ9EsdWuyFeN8uXU=","subject":"CN=emSign ECC Class 3 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDMgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"a70534399006c5c9656d36fab666a70380eef9fb1048307630726609ee92f9e0","size":1146,"filename":"jCaXOAfJZSEcZ2svKHJ5NTIJpwnQiYsnkj_rOSON6UU=.pem","location":"security-state-staging/intermediates/87469897-2f9a-45ba-aabb-01e0de7e07a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jCaXOAfJZSEcZ2svKHJ5NTIJpwnQiYsnkj/rOSON6UU=","crlite_enrolled":false,"id":"a029188c-564e-4bac-988a-0d1d88ede978","last_modified":1576536530747},{"schema":1576536079836,"derHash":"dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=","subject":"CN=NetLock K\u00f6zjegyz\u0151i (Class A) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz","whitelist":false,"attachment":{"hash":"4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d","size":2190,"filename":"RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem","location":"security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=","crlite_enrolled":false,"id":"a76d3004-9787-484d-a4d9-2e5555cd8b56","last_modified":1576536530731},{"schema":1576536091651,"derHash":"t8br3CobZe8YNtwAJQxE4VcDEhBSwatrnQOFoFgVOuM=","subject":"CN=TERENA Code Signing CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIENvZGUgU2lnbmluZyBDQSAz","whitelist":false,"attachment":{"hash":"9595df35a7756d2f24d866de1c547105fb2d1a23c92599127ec1619cec0e5882","size":1829,"filename":"USGSmlpkcecWrLB5M3IEvxRSpeUQQE1OwxGf996ZYQc=.pem","location":"security-state-staging/intermediates/7b8f4903-0cfd-41f6-bf07-2c11090076ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"USGSmlpkcecWrLB5M3IEvxRSpeUQQE1OwxGf996ZYQc=","crlite_enrolled":false,"id":"93337ced-e601-42f7-8544-8ca9911b970e","last_modified":1576536530728},{"schema":1576536137180,"derHash":"18DvgKPaxNpcfpU8YlVVlmlZ3KkxIvInKIUL6q8XQa8=","subject":"CN=InterCloud Ventures CA for ClientCert RSA,O=InterCloud Ventures Inc,C=SC","subjectDN":"MGMxCzAJBgNVBAYTAlNDMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEyMDAGA1UEAwwpSW50ZXJDbG91ZCBWZW50dXJlcyBDQSBmb3IgQ2xpZW50Q2VydCBSU0E=","whitelist":false,"attachment":{"hash":"1a61b2027ba9e04f54ba2c1975baba6a7302e88dad005b69309298f28dcbb069","size":2418,"filename":"DVzxlQQTcDaxRb7Thp47SkJtXlhSGa2iHgnSPgAIcKY=.pem","location":"security-state-staging/intermediates/8798e2e6-3fd7-4fe3-9d33-05761fe4f040.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DVzxlQQTcDaxRb7Thp47SkJtXlhSGa2iHgnSPgAIcKY=","crlite_enrolled":false,"id":"b868818e-a798-4e90-a5b7-9df711eb98fb","last_modified":1576536530720},{"schema":1576536129132,"derHash":"AH0sixV4YjK6wOqjH2Cq4G3FcpIbrQ1Gx3EH2MLcpLM=","subject":"CN=DigiCert High Assurance Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENvZGUgU2lnbmluZyBDQS0x","whitelist":false,"attachment":{"hash":"82dca5587e213be35931a42824ef1b9490aed5a1516174a65dd432e88de10d4b","size":2402,"filename":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=.pem","location":"security-state-staging/intermediates/547f9b3e-e076-4477-b8bb-03322f731f5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=","crlite_enrolled":false,"id":"9653732b-f401-488c-af29-94e5348433f1","last_modified":1576536530696},{"schema":1576536073348,"derHash":"IBwGF8wzEMfyn8vka1dFm8Z4aouidTAY6yfB6AAWii4=","subject":"SERIALNUMBER=A82743287,CN=GLOBAL CORPORATE SERVER,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=ES","subjectDN":"MIGlMQswCQYDVQQGEwJFUzFDMEEGA1UEBww6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxIDAeBgNVBAMMF0dMT0JBTCBDT1JQT1JBVEUgU0VSVkVS","whitelist":false,"attachment":{"hash":"793fb09204775121a36d94490bb1db8fac7223f956e39839e78312ddbc396881","size":2918,"filename":"cm983EKKIFObkQXG4Px6wK6fhcnGoOnGmpdiszhdgnc=.pem","location":"security-state-staging/intermediates/92d9580d-4cd2-40d0-b184-d1288a6e9346.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cm983EKKIFObkQXG4Px6wK6fhcnGoOnGmpdiszhdgnc=","crlite_enrolled":false,"id":"ca7f15aa-576e-4c11-b2ff-ab17d8fc59e4","last_modified":1576536530670},{"schema":1576536116411,"derHash":"Y6g2ncgkpCvHrm7l0mqv0y30r2d8oYuUG3pX4zseNVk=","subject":"CN=emSign Class 2 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMiBDQSAtIEcx","whitelist":false,"attachment":{"hash":"eed8ae8522e552261846735911703422edcda86f9319535078afc6d728d2a768","size":1585,"filename":"3bEiK1EHsF_yyH5kHV9snYO-hS_ijijvRBCS1wrrAuc=.pem","location":"security-state-staging/intermediates/d8c04dd9-2d2c-4510-a92e-286b8f977661.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3bEiK1EHsF/yyH5kHV9snYO+hS/ijijvRBCS1wrrAuc=","crlite_enrolled":false,"id":"26f75550-6f7c-4915-a0c5-6ce0fc78a16b","last_modified":1576536530666},{"schema":1576536103822,"derHash":"oEpRS7gRTAPLa9uYFyNgzwvmgun6EdXYBnMJztEVGHI=","subject":"CN=InterCloud Client Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"d2ef1ad672c2124bb41aa28b4a68e4170c1d21b11ba0de3bce99cfad4c2d6ea4","size":2475,"filename":"RU7z7Sf2d5WOjWnAl8q-nWTzHsG_NR5njeswcm4xFwU=.pem","location":"security-state-staging/intermediates/49e4a997-d0fd-423c-bc13-8792ddab3f48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RU7z7Sf2d5WOjWnAl8q+nWTzHsG/NR5njeswcm4xFwU=","crlite_enrolled":false,"id":"8404d0aa-3718-4f57-ba78-f9cc2e58060e","last_modified":1576536530599},{"schema":1576536112949,"derHash":"EdXvRg2rNYK3QhIxJxJ9VAQPscIG4m8CXLWEWPIlERo=","subject":"CN=HARICA SSL ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGGMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEgMB4GA1UEAwwXSEFSSUNBIFNTTCBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"90ccc75b0a6ae9b340199fa07f14417de52268b581d41473e2ece14b411f9423","size":1370,"filename":"nYO5UGTgmkq1Vf1wcAVPqg8McgUqLIhjZ8R8zTDqvQI=.pem","location":"security-state-staging/intermediates/937e41c4-b81a-4546-a469-03b67c321ff2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nYO5UGTgmkq1Vf1wcAVPqg8McgUqLIhjZ8R8zTDqvQI=","crlite_enrolled":true,"id":"03d21865-516a-4a83-bbed-64f440fbc75e","last_modified":1576536530589},{"schema":1576536134890,"derHash":"2OGKZa94RUhUyqKPsvXnm1fsFB8BBCO8yKcav8BJbCw=","subject":"CN=GENIOUS RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"dc505a925299ceeea43e708019d0fb1086a320d0a035fb0cf585b7e376d7e4f6","size":2304,"filename":"ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=.pem","location":"security-state-staging/intermediates/ae100f8d-c411-4912-908b-ef0fe59832c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=","crlite_enrolled":false,"id":"51c58311-bdec-4aab-a6cb-4a4f8e10e262","last_modified":1576536530584},{"schema":1576536110295,"derHash":"kK8R5XfHLJQLQOwvPVBQcxAJHuYZbJwWsiiIImSk2Ag=","subject":"CN=GeoTrust SSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"49be8c4efb07895b3f53c063b0bdc42ec090d8ac6a5a50f4736bdd2382107b65","size":1569,"filename":"reIKrQPC-mmj-0OSUhJW0gQmUxXSm2O3N3bhso_ENzs=.pem","location":"security-state-staging/intermediates/739c1736-bb09-4fcb-a77b-16a00919c4aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"reIKrQPC+mmj+0OSUhJW0gQmUxXSm2O3N3bhso/ENzs=","crlite_enrolled":false,"id":"39fd6999-98ad-4452-91c5-c5d5b9161f71","last_modified":1576536530579},{"schema":1576536133765,"derHash":"1I6qVcMuSUMaUxmHdr7HGeXDNZ2Mte5AYBbBhIFdBCk=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"de24f135c7bca2cfda41bd1611ddc001fad23d8819325dec4bf6e386b932447e","size":1711,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/12455f4c-5005-4b7d-99a6-4f1d40b5c5b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"bfc29d7b-32c1-4544-908c-31f1a7428c70","last_modified":1576536530571},{"schema":1576536082514,"derHash":"UZEcAlmKOaJFWUp4F2j5UDxUaz7tsbcmGv4PpDbjN08=","subject":"CN=InCommon RSA Code Signing CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMSUwIwYDVQQDExxJbkNvbW1vbiBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"719dda28e517227192940bf007a71318f0a32088f45d10ea1d875d6e8f7672fc","size":2113,"filename":"4tLfAbj1F8M2w2h5CGAbNDdfguBIooQNoy7lajKrCZc=.pem","location":"security-state-staging/intermediates/043a58d3-97e0-428f-8f70-1cbb17254c84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4tLfAbj1F8M2w2h5CGAbNDdfguBIooQNoy7lajKrCZc=","crlite_enrolled":false,"id":"556b9e93-5a6e-4158-a233-de0b8973e7c4","last_modified":1576536530558},{"schema":1562108705166,"derHash":"SVfe00EFRkETnLqzuWAGVF0JTUSVkPsIrpp40FpAvYM=","subject":"CN=LAWtrust2048 CA2,O=LAWtrust,C=ZA","subjectDN":"MDsxCzAJBgNVBAYTAlpBMREwDwYDVQQKEwhMQVd0cnVzdDEZMBcGA1UEAxMQTEFXdHJ1c3QyMDQ4IENBMg==","whitelist":false,"attachment":{"hash":"81d17bc1193286f68eb9189a96132eec7b01b9df70c5c0c8be545b723a8b9c97","size":1825,"filename":"tF23S1M73lGV_qIXyJDgt7QyCjnORfV2T1KQKOCPDnY=.pem","location":"security-state-staging/intermediates/c78792ca-adea-456a-8b5d-5e8ff14b0cd2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tF23S1M73lGV/qIXyJDgt7QyCjnORfV2T1KQKOCPDnY=","crlite_enrolled":false,"id":"211f757d-d852-4415-81e8-e7707c0574e6","last_modified":1562108762611},{"schema":1562108592560,"derHash":"GR4LSLeLfvpIIqRlrWmzRAW4eNEL2FPY5Xy4udnlC4s=","subject":"CN=Trust Technologies Global CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT","subjectDN":"MIGPMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxJTAjBgNVBAMTHFRydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ0E=","whitelist":false,"attachment":{"hash":"564c57bdee05db70d390e6bcb2f79dd54852bdaa6b303ee4de5c564d29d262a2","size":1683,"filename":"kCvviSGuWkulE1Rv-GhY_fjUuT622_2qjrGk96XfS6A=.pem","location":"security-state-staging/intermediates/a8b72e50-2b9d-4f2e-be8d-f11ffd8c9f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kCvviSGuWkulE1Rv+GhY/fjUuT622/2qjrGk96XfS6A=","crlite_enrolled":true,"id":"5c03ce12-486e-4b06-811e-bb3df097bbb5","last_modified":1562108593320},{"schema":1562108591793,"derHash":"cdLuTdolHZJE9858bUeOxVLUJO9xnwK3EDDyghtryFM=","subject":"CN=emSign ECC Time stamping CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEpMCcGA1UEAxMgZW1TaWduIEVDQyBUaW1lIHN0YW1waW5nIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"ee2704d9b62a381d492b93995f8499745a688f458d3d292b4698475ed59f68c3","size":1134,"filename":"dcrqDFOyJxfpksjz9CO_ISerP6wmX7VYiV8TT8U2I8I=.pem","location":"security-state-staging/intermediates/3b0e96f2-8f14-48a7-bd67-cf26d4d5fabe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dcrqDFOyJxfpksjz9CO/ISerP6wmX7VYiV8TT8U2I8I=","crlite_enrolled":false,"id":"a64f2de2-3dce-4c3e-be2c-670cf9edd067","last_modified":1562108592552},{"schema":1562108591033,"derHash":"pKfQXyloVnnjwAoyLOa2zVf92l8u9CxsbnNYHIpHEHc=","subject":"CN=Trusted Secure ECC Certificate Authority DV,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTE0MDIGA1UEAxMrVHJ1c3RlZCBTZWN1cmUgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eSBEVg==","whitelist":false,"attachment":{"hash":"a2edd0806e645f467b7b84c89a97ef301a4be56527999553d91e8ed132b3063b","size":1333,"filename":"qaGgP6zdlL_vHNs7F1JoC4tyJv8eGtwjguHkPQZ2HYg=.pem","location":"security-state-staging/intermediates/00575f53-f32f-4c7d-8588-1006e713455a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qaGgP6zdlL/vHNs7F1JoC4tyJv8eGtwjguHkPQZ2HYg=","crlite_enrolled":false,"id":"bb1af08a-d563-4c13-b15f-03b3860103a2","last_modified":1562108591785},{"schema":1562108590272,"derHash":"Oyffndk8ESqgiwYqauOXP355pRkdfpuV1wgXgODWrOo=","subject":"CN=certSIGN Enterprise CA Class 3 G2,OU=certSIGN Enterprise CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHgxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEqMCgGA1UECxMhY2VydFNJR04gRW50ZXJwcmlzZSBDQSBDbGFzcyAzIEcyMSowKAYDVQQDEyFjZXJ0U0lHTiBFbnRlcnByaXNlIENBIENsYXNzIDMgRzI=","whitelist":false,"attachment":{"hash":"b4245e3bdf682d3b5991b85df5dc0d5234efbfa10c3e6191331eafc4de6d44b3","size":1638,"filename":"NgZU2Z5HKX3Ynzv2v13QXVNlTGQrS2rrCCv2W4gJn_o=.pem","location":"security-state-staging/intermediates/50534563-bc40-4117-a35e-c5f2825173e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NgZU2Z5HKX3Ynzv2v13QXVNlTGQrS2rrCCv2W4gJn/o=","crlite_enrolled":true,"id":"44fdaa59-55ab-4b5a-9584-878de01ee51f","last_modified":1562108591025},{"schema":1562108589509,"derHash":"X2ZcusweNxceqD6oXFcPmGHK93usiIarxLsZs2mMCUo=","subject":"CN=DigiCert Governmental Direct CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEdvdmVybm1lbnRhbCBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"75cddcda9026b56305335b2fdbe4d7f15d3018e1a8d4ece32129f4dc33a90ca6","size":2109,"filename":"6TqJ4tJCAmwNBt54ibBuljs7KG-F8NTbgZ5U4gcrbnk=.pem","location":"security-state-staging/intermediates/74ab5016-866c-42c7-ba70-6936c7c09121.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6TqJ4tJCAmwNBt54ibBuljs7KG+F8NTbgZ5U4gcrbnk=","crlite_enrolled":false,"id":"93219782-f847-4e1d-a437-b056f1a40b47","last_modified":1562108590264},{"schema":1562108587986,"derHash":"vsBvVTRMPeTxLNXYCJBs3idSNJUb4BdqeH5ijivn1R8=","subject":"CN=GDCA TrustAUTH R4 Extended Validation CodeSigning CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MIGAMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpR1VBTkcgRE9ORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkgQ08uLExURC4xPTA7BgNVBAMMNEdEQ0EgVHJ1c3RBVVRIIFI0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZVNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"504b1a2b2ef9230c71054bc7a026d1827d3f8d8b714b5492dc42264973ecb432","size":2105,"filename":"K1O1P19UCSRwBq2Y5xce7r_TavF-pDYjmdSYRVYHFXI=.pem","location":"security-state-staging/intermediates/292a44cc-36e5-4678-b2da-b286cf71965d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1O1P19UCSRwBq2Y5xce7r/TavF+pDYjmdSYRVYHFXI=","crlite_enrolled":false,"id":"08dade63-03e8-4738-af5e-1139634ccf0f","last_modified":1562108588742},{"schema":1562108586421,"derHash":"XN2AnPRPX4Zl6sFQVVBMWwa3h6wYKUUFvbq0p35Q13Y=","subject":"CN=GlobalSign PersonalSign 2 RSA CA SHA 384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIFJTQSBDQSBTSEEgMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"5b298699387d70fa85da876e97c713c9b5f9d078e4f99d1aa8d2b372b1b2635c","size":2458,"filename":"qrYYY1IgVc8P6057Z-sQtrV3gsdG77COpxcpk5ExuDQ=.pem","location":"security-state-staging/intermediates/bb0e1ae1-8c37-4a42-9ca5-f39d3c77b419.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qrYYY1IgVc8P6057Z+sQtrV3gsdG77COpxcpk5ExuDQ=","crlite_enrolled":false,"id":"68e18044-c154-4952-88f5-513ffe55be79","last_modified":1562108587216},{"schema":1562108584875,"derHash":"aTBkc0LACuYloDhnMICQOmpUMaGPrmRAOuufSoOCibQ=","subject":"CN=COMODO ECC Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIEVDQyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"e6b81f970e0aebdf005be203087db76baba49f82e43eebe6ce07930d859c3a12","size":1305,"filename":"ztEQWck30AphjrV693Uu-2ykUUMpLPaPTr3q8O6AbrA=.pem","location":"security-state-staging/intermediates/e1042655-8614-4230-91ec-d6a21ec4ad1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ztEQWck30AphjrV693Uu+2ykUUMpLPaPTr3q8O6AbrA=","crlite_enrolled":false,"id":"e22721ff-a0b1-47e9-b5b6-7c3c74b2432b","last_modified":1562108585623},{"schema":1562108584121,"derHash":"8AMiyXtXzqbWSmodNlxsa38OujCJh2wUMOEGPoqCpnY=","subject":"CN=UbiquiTLS\u2122 DV RSA Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAwwdVWJpcXVpVExT4oSiIERWIFJTQSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"34402ac995c9387b9c9835b6d19bbf5f738839e57491436e8fb9d880eabb284d","size":2129,"filename":"4FOjiY6IYxhWCosn04P8_UB9mAXrdVXjkoJw0SF4xqM=.pem","location":"security-state-staging/intermediates/8314b196-222a-4ea4-b73e-05d946a6b0f3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4FOjiY6IYxhWCosn04P8/UB9mAXrdVXjkoJw0SF4xqM=","crlite_enrolled":false,"id":"6a542733-c365-45a6-88e1-581fbf55eea9","last_modified":1562108584867},{"schema":1562108583348,"derHash":"jPY11qdHdQzxND6WNqptpBWMfOCbIG0Qgzuv5eTuBLM=","subject":"SERIALNUMBER=201905,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA1","whitelist":false,"attachment":{"hash":"e20bc7cc8f53ffc223962f9bd966b021032bdfadb38bba1b518d8a4b5473fc84","size":2333,"filename":"STwxc4DljeWjithRB7fUiXJ-Av3LzSL1RArniQiNF8Y=.pem","location":"security-state-staging/intermediates/702560cb-abeb-40ac-8efe-9be95e6e64dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"STwxc4DljeWjithRB7fUiXJ+Av3LzSL1RArniQiNF8Y=","crlite_enrolled":false,"id":"8ed0efa3-f0d7-42e8-a20a-cf5d56da716b","last_modified":1562108584113},{"schema":1562108578013,"derHash":"cqNKwrQkrtP2sLBHVbiMwCfczIBv3bIrTNfEd3OXPsA=","subject":"CN=Sectigo RSA Organization Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGVMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPTA7BgNVBAMTNFNlY3RpZ28gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"8b4a6a5a2f7b4562478f11cef6a2950d91dc8f9f63844b556396576c712a7556","size":2174,"filename":"RkhWTcfJAQN_YxOR12VkPo-PhmIoSfWd_JVkg44einY=.pem","location":"security-state-staging/intermediates/a5de32a1-0075-4479-b9c7-902f76532ee6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RkhWTcfJAQN/YxOR12VkPo+PhmIoSfWd/JVkg44einY=","crlite_enrolled":true,"id":"3137331f-d637-4d45-a845-5baf38ea0ae4","last_modified":1562108578764},{"schema":1562108576476,"derHash":"z8tgwfAYDGjj6l0ktKBenZkA2Hw9g9UDzhaQs8FlZFg=","subject":"CN=Qualified e-Szigno QCP CA 2012,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHlF1YWxpZmllZCBlLVN6aWdubyBRQ1AgQ0EgMjAxMjEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"0918a8dff15d27cbb4e8b360eb83374b19fa2947fb8fabb2c8200569d2b9b5ca","size":1780,"filename":"xa1dpEOu-k1shciGkpd-djS0kvHJPOmnvqja-16S2o0=.pem","location":"security-state-staging/intermediates/edcd1fb2-b2cf-4e62-a12a-5ba7788690ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xa1dpEOu+k1shciGkpd+djS0kvHJPOmnvqja+16S2o0=","crlite_enrolled":false,"id":"0f39cd6a-43ef-4feb-8856-6d300edaa87c","last_modified":1562108577246},{"schema":1562108574941,"derHash":"ksdI7NEnrmBVsYCEZPO7ETzFGuAHNZGzaB7FJ8YXzIA=","subject":"CN=cPanel\\, Inc. Certification Authority 2,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMS8wLQYDVQQDEyZjUGFuZWwsIEluYy4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"78d6f3be5c00899b98ae15d4fa3abf96f1139ea90f126dddc735831fa0309e49","size":2138,"filename":"HVDLzoiDeh9hx-Qx4o0Fjy44bVZy8Qv7zwbUSS7r4dQ=.pem","location":"security-state-staging/intermediates/8e628e92-767a-4b9c-9320-e85932918fc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HVDLzoiDeh9hx+Qx4o0Fjy44bVZy8Qv7zwbUSS7r4dQ=","crlite_enrolled":false,"id":"dcd0fd78-79ac-4a9e-9cff-563f4bf1ce79","last_modified":1562108575720},{"schema":1562108568778,"derHash":"vmoNnh0RXyKT9qvxGz7I6ILiRCbu6wmqpQNZeZPneiU=","subject":"CN=TERENA SSL High Assurance CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHMxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEnMCUGA1UEAxMeVEVSRU5BIFNTTCBIaWdoIEFzc3VyYW5jZSBDQSAz","whitelist":false,"attachment":{"hash":"effd0b7540a7b55bbbeb9e6a80bcdbd3b388bcd57d806539c76f81519c9d7595","size":1752,"filename":"XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx-hQBmJ54WmCs=.pem","location":"security-state-staging/intermediates/1bbb351c-9d45-49c1-b318-f589af9d1196.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx+hQBmJ54WmCs=","crlite_enrolled":true,"id":"181cc0ed-5e29-45f4-8d8a-642c6de7cd5e","last_modified":1562108569549},{"schema":1562108568021,"derHash":"93zhWdOIjqK8w13UZHLO2MwzAH4NpsiROc06Jw2JADM=","subject":"CN=JPRS Organization Validation Authority - G1,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"92d9886b691320b334b799e6516c3dd2b5983372bd2bcc7f08fc2d333da9d9c1","size":1654,"filename":"L5ieGJdPRxC_98J-9PhsO1f9uxRZOzwq8bdfg4akGmk=.pem","location":"security-state-staging/intermediates/e7a0f9c3-8c87-4bc7-9d6f-14e84b6a4cac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L5ieGJdPRxC/98J+9PhsO1f9uxRZOzwq8bdfg4akGmk=","crlite_enrolled":true,"id":"462bd0e2-8618-4ee3-9643-5aae497bb252","last_modified":1562108568770},{"schema":1562108567270,"derHash":"HcpluGpXM2ulr7chSjb31u3mmOtPAzh8s61rvTqTurY=","subject":"CN=AlphaSSL CA - G2,O=AlphaSSL","subjectDN":"MC4xETAPBgNVBAoTCEFscGhhU1NMMRkwFwYDVQQDExBBbHBoYVNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3a19247e72c0620bdf6ef309d6d8385eabd2ef9e5c5b61ab6fd98d4878db9492","size":1512,"filename":"yxgiWGK--SFB9ySwt3M3qpn5HO0ZLFY5D-h-G_vcT_c=.pem","location":"security-state-staging/intermediates/9bc85edc-cae8-4042-b29e-895b1be37f71.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yxgiWGK++SFB9ySwt3M3qpn5HO0ZLFY5D+h+G/vcT/c=","crlite_enrolled":false,"id":"86b16dc2-9cb9-4271-acfe-4a80959ea5ea","last_modified":1562108568014},{"schema":1562108564189,"derHash":"XO2pkfE2Rtcy3832wQtjallx9FSxBxcswDtb7k0pBrs=","subject":"CN=Fuji Xerox Xnet CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSAwHgYDVQQDExdGdWppIFhlcm94IFhuZXQgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"3f6deb7e20788638c3fd1a97de5a5390c10da49774515d8e6f3c11da176731a6","size":1483,"filename":"SWBebvlsLulUhE9tf8Z1RbIcTJY-kLhXO_sAB63M6tA=.pem","location":"security-state-staging/intermediates/89038819-ab40-47c3-ab8e-f9fba8ab86a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWBebvlsLulUhE9tf8Z1RbIcTJY+kLhXO/sAB63M6tA=","crlite_enrolled":false,"id":"ef301980-b77f-412d-8a81-1db73953b696","last_modified":1562108564939},{"schema":1562108561881,"derHash":"KWyeU1fJwfIekGSjENG389qNEN7Eq96nw3K7TDdbm74=","subject":"SERIALNUMBER=201814,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE0","whitelist":false,"attachment":{"hash":"fc14a5e8664374b8b9e73e78f636f520ad6627705388366008910d6dad4e0aea","size":2333,"filename":"YZlVjG_9bo_7G1Ld_UML44gp8CBlrnAhNWrF-z8r_Uk=.pem","location":"security-state-staging/intermediates/f34b8e30-671d-497f-a7a4-9c1fd484d573.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZlVjG/9bo/7G1Ld/UML44gp8CBlrnAhNWrF+z8r/Uk=","crlite_enrolled":false,"id":"6d13d21e-c95b-4e10-bca3-e345c83ad59e","last_modified":1562108562629},{"schema":1562108558832,"derHash":"xKhCQ0rbUoCVJrbR6GmiZfU1tpuxZFSjAWZ8yUJnjVg=","subject":"CN=North Carolina Health Information Exchange CA,OU=Orion Health Direct Secure Messaging,O=North Carolina Health Information Exchange,C=US","subjectDN":"MIGpMQswCQYDVQQGEwJVUzEzMDEGA1UEChMqTm9ydGggQ2Fyb2xpbmEgSGVhbHRoIEluZm9ybWF0aW9uIEV4Y2hhbmdlMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxNjA0BgNVBAMTLU5vcnRoIENhcm9saW5hIEhlYWx0aCBJbmZvcm1hdGlvbiBFeGNoYW5nZSBDQQ==","whitelist":false,"attachment":{"hash":"033ec8c8c6591c333e976876a9b2dd85541a10a3a81cce7795dd6b11a2ff26db","size":2373,"filename":"sKMwLCLBC5txNEjL5HsQSJ1AllsHjsrcGecmnUBdJ_8=.pem","location":"security-state-staging/intermediates/abc29b05-2731-4492-a337-a40ee72b26ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sKMwLCLBC5txNEjL5HsQSJ1AllsHjsrcGecmnUBdJ/8=","crlite_enrolled":false,"id":"b56d935b-ae8c-4513-81f9-94e429220804","last_modified":1562108559596},{"schema":1562108558073,"derHash":"vxyw4hPY08cLrolCn8Ft4sdPdVlj0bm0iL0CYNvJG5w=","subject":"CN=DigiCert Baltimore CA-1 G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0xIEcy","whitelist":false,"attachment":{"hash":"8c3b20ef21e5a0850702c5b36f4116d9340de8e2ea3746b1051c95ee4a4615ff","size":1581,"filename":"EppRiUi9P-L8-u3LNh2t2P4La8TbSH4Xh_DCYKPwqts=.pem","location":"security-state-staging/intermediates/bbbed6f4-b330-448c-a685-127194973cd5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EppRiUi9P+L8+u3LNh2t2P4La8TbSH4Xh/DCYKPwqts=","crlite_enrolled":false,"id":"23c18ab5-afb4-4915-9211-0b1bc495e783","last_modified":1562108558823},{"schema":1562108557320,"derHash":"CSgpQz0jGUn0qbxmbL9Us6on1768oEjXXlkJPhWnLqU=","subject":"CN=TeliaSonera Class 2 CA v2,O=TeliaSonera,C=SE","subjectDN":"MEcxCzAJBgNVBAYTAlNFMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgQ2xhc3MgMiBDQSB2Mg==","whitelist":false,"attachment":{"hash":"a3a1b4dfa388dfe0d25ab5674cfaeaf78ef03e5364e2cd9de1328b58f2a891b3","size":2528,"filename":"lqMfOTYct9rMx_Y2LpHI8aZt9xgWHX_TwLLQ51NQl04=.pem","location":"security-state-staging/intermediates/d6d3711a-b7d2-4f85-a846-aca44739e149.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lqMfOTYct9rMx/Y2LpHI8aZt9xgWHX/TwLLQ51NQl04=","crlite_enrolled":false,"id":"0edb2d0c-78d4-4869-9399-77844e0f7698","last_modified":1562108558066},{"schema":1562108553418,"derHash":"BqV9HNWHn7ohNWEN2NclzCaNKm3opGPUJMS52omEhpY=","subject":"CN=MULTICERT SSL Certification Authority 001,OU=Certification Authority,O=MULTICERT - Servi\u00e7os de Certifica\u00e7\u00e3o Electr\u00f3nica S.A.,C=PT","subjectDN":"MIGnMQswCQYDVQQGEwJQVDFCMEAGA1UECgw5TVVMVElDRVJUIC0gU2VydmnDp29zIGRlIENlcnRpZmljYcOnw6NvIEVsZWN0csOzbmljYSBTLkEuMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEyMDAGA1UEAwwpTVVMVElDRVJUIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAwMDE=","whitelist":false,"attachment":{"hash":"a4edffa6966beade48281eb732dd7be86742b1a9c74b4388c4d184c5f3707d9f","size":2970,"filename":"yxq9jBkkvQNgcVw-gq6-E8-0_Z-HVCg1PJ12mz_Ot1M=.pem","location":"security-state-staging/intermediates/9af4dc8b-5d79-4fe4-91a7-1f528e522c34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yxq9jBkkvQNgcVw+gq6+E8+0/Z+HVCg1PJ12mz/Ot1M=","crlite_enrolled":true,"id":"82333ba7-d875-4700-9521-e3450b26f275","last_modified":1562108554178},{"schema":1562108547322,"derHash":"0YY7VaBinzKl2thn0C3x0aRVCyOsQitTWB555Uj9Zhc=","subject":"CN=COMODO RSA Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE3MDUGA1UEAxMuQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"37c8cc316edcb62d120bb0cdb7f6d376a41995100929c1faae633cc5bbd5db9b","size":2186,"filename":"o0YMd50JaO9KHQa59-yeJR7mqkmBME4Yb2KrDeMsVpo=.pem","location":"security-state-staging/intermediates/638df8c9-7c2c-43c8-aa37-e137759f5495.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o0YMd50JaO9KHQa59+yeJR7mqkmBME4Yb2KrDeMsVpo=","crlite_enrolled":false,"id":"41915ab2-d4a7-472f-9c9c-1aa184245482","last_modified":1562108548066},{"schema":1562108546547,"derHash":"snRdCptx2UjzTpIa9Z80Kt9uQH2IvFHTisUrWDoOvRU=","subject":"CN=Symantec Class 3 EV SSL SGC CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgU0dDIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"87eaf82db6f5848ee292c8bbd616cd095dc400e5299454872db01db7b0ce908f","size":1930,"filename":"RpiK7rBfp_gM93kpBie2lazUf8UesNcTJ-aL6W-Q06M=.pem","location":"security-state-staging/intermediates/634c9f70-8695-4f35-ab1c-be88bffa111f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RpiK7rBfp/gM93kpBie2lazUf8UesNcTJ+aL6W+Q06M=","crlite_enrolled":false,"id":"7ec41ffd-3b17-4b9b-ae03-cf4034674eda","last_modified":1562108547314},{"schema":1562108543508,"derHash":"kuN3Cx60T4TC8ssAl8L9cSa9IStBwmEOeN39iUZ2Fzg=","subject":"CN=Cybertrust Japan ECC EV CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEjMCEGA1UEAxMaQ3liZXJ0cnVzdCBKYXBhbiBFQ0MgRVYgQ0E=","whitelist":false,"attachment":{"hash":"f1536ae14b59510b0a578ef86b18c2742aeecff181da96be873249c707dce9a0","size":1171,"filename":"DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz-uWIQs=.pem","location":"security-state-staging/intermediates/4177e11b-b581-4577-a6bf-acb75730661d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz+uWIQs=","crlite_enrolled":false,"id":"0792354e-832d-44b5-86f7-9d8759ed1b08","last_modified":1562108544257},{"schema":1562108542761,"derHash":"4Yz41SmRiHUrFvPjw82Gc2GQRuLxueCI2rXTEWrqYb0=","subject":"CN=TrustAsia RSA Secure Client and Email CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjExMC8GA1UEAxMoVHJ1c3RBc2lhIFJTQSBTZWN1cmUgQ2xpZW50IGFuZCBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"7385ded00c38eddd52d86a832caf6912d588fab55cfa476313cc762a9ee84eeb","size":2133,"filename":"rtkg6RrvnlbQH5J_vZPqsgnI9zzjiHs9IjqKSD9m6wA=.pem","location":"security-state-staging/intermediates/9e0c407a-c81b-4c6c-afca-584b65500eab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rtkg6RrvnlbQH5J/vZPqsgnI9zzjiHs9IjqKSD9m6wA=","crlite_enrolled":false,"id":"aebb965c-2a24-466b-a16b-3c0dae236232","last_modified":1562108543500},{"schema":1562108539744,"derHash":"qXyhN1uRlT5TalVHawrERMcIapUeSQo6PRNjChn0DNQ=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"6aaaa07d5c201417999a0e22e73d6ede06b3ae7309353301a6d321d172316983","size":1703,"filename":"bqhl3DAHcc4Kg-bxpYCIoIh4Tjx38mrpuN4vD6gDaHY=.pem","location":"security-state-staging/intermediates/a7eca8e3-d4e8-42fd-97a7-7b7589b511a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bqhl3DAHcc4Kg+bxpYCIoIh4Tjx38mrpuN4vD6gDaHY=","crlite_enrolled":false,"id":"53671fd7-9e3a-4f0c-a8fb-99fc788cacba","last_modified":1562108540486},{"schema":1562108538966,"derHash":"OYmjFwLp5qlIXzySp30hsYUsf2ci8j1EuMvnKpJuyFQ=","subject":"CN=Trustico ECC DV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIEVDQyBEViBDQQ==","whitelist":false,"attachment":{"hash":"8b1dd84a5acfc99c935c7937a7a736233a80c299b2fa9f230d20070f92594aa8","size":1272,"filename":"siFWwL8GHh0KXgWfKS8Gt9laNL7edvX8IB7dl6zLe-o=.pem","location":"security-state-staging/intermediates/d1d2f9ef-7d30-4f5a-a80c-8f0414545ab3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"siFWwL8GHh0KXgWfKS8Gt9laNL7edvX8IB7dl6zLe+o=","crlite_enrolled":false,"id":"7a3a1349-6283-418e-8d1b-090ce11da3f7","last_modified":1562108539733},{"schema":1562108538217,"derHash":"BXRs6sgws4RAWrc81iOd5Czp9IdVPvP6iwoGTleSaDw=","subject":"CN=WISeKey CertifyID Policy GA CA 1,O=WISeKey,C=CH","subjectDN":"MEoxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSkwJwYDVQQDEyBXSVNlS2V5IENlcnRpZnlJRCBQb2xpY3kgR0EgQ0EgMQ==","whitelist":false,"attachment":{"hash":"2a6ff225010bbc9464e5d31c320657c525c3f0a392977f50123d28559f13fa21","size":1804,"filename":"xfM0VsUhSI6vKknRncbTW9di7pj0_a_oYa-o46JnDHQ=.pem","location":"security-state-staging/intermediates/d62ddced-fc46-4718-bdce-87c1b2f05042.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xfM0VsUhSI6vKknRncbTW9di7pj0/a/oYa+o46JnDHQ=","crlite_enrolled":false,"id":"82dadb91-864a-43ad-a206-42c281b95f08","last_modified":1562108538958},{"schema":1562108535152,"derHash":"SOJsWQSXTWoi5EL66IoqQYKQ4AY3uJhyChPyFDrNjrY=","subject":"SERIALNUMBER=201805,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDU=","whitelist":false,"attachment":{"hash":"ea45f8bf2666fc6e58e70aeda7b9ff6120dfa479bad56c7031ba318d09590473","size":2337,"filename":"0kb6t7LFkL6D6CBvoNnXYZ6COh6vj_xxmWb-ywmnExU=.pem","location":"security-state-staging/intermediates/4a069aba-7636-41cb-85d9-b37bfbf913c3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0kb6t7LFkL6D6CBvoNnXYZ6COh6vj/xxmWb+ywmnExU=","crlite_enrolled":false,"id":"5ff661bc-0b12-45ef-9197-4095d0f03d00","last_modified":1562108535892},{"schema":1562108532768,"derHash":"4M5cTvXSGGlj0rBK3kYSu694fhYEiltGj3Nnd2w6A94=","subject":"CN=GlobalSign ECC HV S/MIME CA 1,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBIViBTL01JTUUgQ0EgMQ==","whitelist":false,"attachment":{"hash":"f7b7f1d2226533661c96045673837ee5eb504e816404882aa7cab4d769be6ab2","size":1154,"filename":"pAR30VcYn-nY7bGwPT-4qhHggma7QWdsp1QPL8x_YMk=.pem","location":"security-state-staging/intermediates/90d68223-dc0d-417b-82e9-fc789af959ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pAR30VcYn+nY7bGwPT+4qhHggma7QWdsp1QPL8x/YMk=","crlite_enrolled":false,"id":"5ae5ab8e-6ce3-43fb-8540-fb4edf7170b7","last_modified":1562108533536},{"schema":1562108532023,"derHash":"9XCaLS9otTv29kW7F4rflTRvif2lxjv94IBComSSqrI=","subject":"CN=GlobalSign Qualified CA 1,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAx","whitelist":false,"attachment":{"hash":"babdcd192e71c8b4c902d934518dcdf6ade0f8849accbf5f4b2633dbc59ae640","size":2109,"filename":"JLSkiSNPvaX8_Ng2Eq17tQJcAp2P6PnM2B-Ojyo8nYg=.pem","location":"security-state-staging/intermediates/56b7b3ba-16d7-43e7-9144-0bd4054c8b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JLSkiSNPvaX8/Ng2Eq17tQJcAp2P6PnM2B+Ojyo8nYg=","crlite_enrolled":false,"id":"842bb917-00d1-4d4d-b1dc-1cc655bce329","last_modified":1562108532760},{"schema":1562108529754,"derHash":"Elpf18ZA1eWfXOV2PNjJMvXll93cTq8dWWZ89LVWojc=","subject":"CN=USERTrust RSA Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"094e42381d9f1d18441d7220fac73d64fd68198174b849e5d674adb912d6ccec","size":2174,"filename":"8E_u4IJLStWPqhVEn4td_2Ae6WYCii1AmJC2dgTCj1s=.pem","location":"security-state-staging/intermediates/307f6f1b-9a38-4046-97d3-4d36958e0f86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8E/u4IJLStWPqhVEn4td/2Ae6WYCii1AmJC2dgTCj1s=","crlite_enrolled":true,"id":"49f70812-6671-41b7-a5d2-73cdf9cea32f","last_modified":1562108530510},{"schema":1562108525881,"derHash":"NXVUztPEm6E93VWlaCYptvzirPxFGasr4Es6hgGlny8=","subject":"CN=HARICA Qualified Natural Entities SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAxMqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"bc6e90f6d202ea8d62cd470c2ea31d41ed599f457738d82b87cdab0e3a3a439f","size":2438,"filename":"c5tJhzRUh_mULK82PkMvvJo7eF3WcNRab2OwHVToIzo=.pem","location":"security-state-staging/intermediates/8793bf9d-751b-47d1-8043-947b65b5b2fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c5tJhzRUh/mULK82PkMvvJo7eF3WcNRab2OwHVToIzo=","crlite_enrolled":false,"id":"ed4c1bcb-36d5-4f02-98c1-028cbb6c8eee","last_modified":1562108526678},{"schema":1562108524365,"derHash":"NcC4pXfRHJS6Zl4kLeRdZodSKlMeORu02ZXSYfOCmrc=","subject":"CN=certSIGN CA Class 2 G2,OU=certSIGN CA Class 2 G2,O=certSIGN,C=RO","subjectDN":"MGIxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEfMB0GA1UECxMWY2VydFNJR04gQ0EgQ2xhc3MgMiBHMjEfMB0GA1UEAxMWY2VydFNJR04gQ0EgQ2xhc3MgMiBHMg==","whitelist":false,"attachment":{"hash":"df0ec1a6797109126df83a75e016edf4ec5eae8f6a58946debcf2ddee8cf2524","size":1609,"filename":"noYGcVGJvDlxvfPLFE31WgvXSwkoZGrfCEpsm_L3qt4=.pem","location":"security-state-staging/intermediates/e03925b7-c8a0-4286-aa06-57ae5c110937.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"noYGcVGJvDlxvfPLFE31WgvXSwkoZGrfCEpsm/L3qt4=","crlite_enrolled":false,"id":"a0571407-53b3-407c-bbd4-0be77d0d2d3e","last_modified":1562108525121},{"schema":1562108523614,"derHash":"cBtDKsDN1NnPlbS4hMMr9cypDUTgFhq9E7k01o44BHI=","subject":"CN=GlobalSign PersonalSign 3 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"458cc82369b9a1032b78405e6806b74fd2952d39402bf697575b5d831cad259a","size":1670,"filename":"TB1kEWAFK_CTRZQanxy7YzsEBTcqSK49DqMWi8bxAek=.pem","location":"security-state-staging/intermediates/b62b5389-9e04-4c32-83bc-4bf85ed12fb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TB1kEWAFK/CTRZQanxy7YzsEBTcqSK49DqMWi8bxAek=","crlite_enrolled":false,"id":"27438f07-1327-49d9-acd2-a58622706d5c","last_modified":1562108524357},{"schema":1562108522832,"derHash":"ztQGeH82ZG2JfkaLe4tdyuEDDDp1rxybEFUUuV7G6nA=","subject":"CN=GENIOUS ECC Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0fdfe942ae38cec3fd4541c8578f5bb84c77d30b5d71964f0ddb9f5393c40ca8","size":1463,"filename":"lGB7vG_pOqUpHiqWKO7WQg8lfxBsfGVE0yulTTjMgJg=.pem","location":"security-state-staging/intermediates/2b90024e-92c3-45de-bb5a-9d61b0b7cf4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lGB7vG/pOqUpHiqWKO7WQg8lfxBsfGVE0yulTTjMgJg=","crlite_enrolled":false,"id":"c3d27779-fe8a-421f-97c2-5d4a5bee385c","last_modified":1562108523606},{"schema":1562108522078,"derHash":"MA6zIZBXi5rFeOGh0oAEIZFFaYzjtj8p3yHuTFQsCIU=","subject":"CN=WISeKey Qualified Services CA 2,OU=Copyright (c) 2013 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGJMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDEzIFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKDAmBgNVBAMTH1dJU2VLZXkgUXVhbGlmaWVkIFNlcnZpY2VzIENBIDI=","whitelist":false,"attachment":{"hash":"9807abddce6407d40c4c5529a15b7709518ba11092a254a7adc5d65af922e8d0","size":1800,"filename":"TONsHZMTU75SEOmQ_8UnWZ1dToH3MjqDXKqHFFbSot0=.pem","location":"security-state-staging/intermediates/a0e40893-99c0-437f-a615-8d710f969d3c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TONsHZMTU75SEOmQ/8UnWZ1dToH3MjqDXKqHFFbSot0=","crlite_enrolled":false,"id":"0a716af8-e441-4f96-a8d7-aff6571d96e0","last_modified":1562108522824},{"schema":1562108521318,"derHash":"YA6XYBsLvF8FbwTu9nHvWA8qhYPG0tP61AG52CCqiDY=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,OU=VALID SSL OV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIE9WMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"c4a550d79bb2b71f8c0928d49e7c96a982b4c362b1b8092cbbb975ca5e51df26","size":1886,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/1d251274-286b-4c35-be80-189120f190ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"a9c8bb82-a5e4-41bd-9be3-20842827e5bc","last_modified":1562108522070},{"schema":1562108518267,"derHash":"2NOC430vk4Eao9lA7vTG7qR7s7pQJxqL8ujCTN05PFY=","subject":"CN=SSL.com EV Code Signing Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"002fe1bcd61684d28427eba68ab1788bba7ded78e7dfbd283510a07be6c4fc4e","size":2511,"filename":"F9hW0k1yFI5zXeeLFdAPTsm--My7hmT-Wp09KwmK0Ic=.pem","location":"security-state-staging/intermediates/2e1d37e8-d5e8-4de3-b2d8-2b3181322a9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F9hW0k1yFI5zXeeLFdAPTsm++My7hmT+Wp09KwmK0Ic=","crlite_enrolled":false,"id":"f78ed066-8405-4a9e-a213-031511e661b5","last_modified":1562108519012},{"schema":1562108517488,"derHash":"z25rgsmXy1zBpVBmr19gyqx3WU6xBvtNSYvFDs3rijo=","subject":"CN=Beame.io CA 2,O=Beame.io Ltd,L=Tel Aviv-Jaffa,ST=Tel Aviv,C=IL","subjectDN":"MGgxCzAJBgNVBAYTAklMMREwDwYDVQQIEwhUZWwgQXZpdjEXMBUGA1UEBxMOVGVsIEF2aXYtSmFmZmExFTATBgNVBAoTDEJlYW1lLmlvIEx0ZDEWMBQGA1UEAxMNQmVhbWUuaW8gQ0EgMg==","whitelist":false,"attachment":{"hash":"0a359e91716bb249722632341e4f85f71d631e20e2ff0ee6379d782c54961a3c","size":1800,"filename":"9MtJhPjYwOW02TcCqan-4J_RHNT32dQraMIk0Pbgtsw=.pem","location":"security-state-staging/intermediates/ed0044e8-a7b6-4b07-ac80-b80f5eae9913.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9MtJhPjYwOW02TcCqan+4J/RHNT32dQraMIk0Pbgtsw=","crlite_enrolled":false,"id":"2cc06889-bf33-4a96-9d85-f0e243c76990","last_modified":1562108518259},{"schema":1562108515960,"derHash":"C4ljPxIvdYIZUK4n4LrdQNSbtQ8Msbde5PRmKs5Ms9g=","subject":"CN=Technological Educational Institute of Western Greece CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRlIG9mIFdlc3Rlcm4gR3JlZWNlIENBIFIx","whitelist":false,"attachment":{"hash":"d72696baad4643eb2d91dc268912327ed7fb5884f5fece72129c12a63a001e02","size":3328,"filename":"UHwj56cjJKum0BUjKMff1Ap3nL75-poJyKuT3GJwRPk=.pem","location":"security-state-staging/intermediates/c2e8bc36-2a68-4e45-84df-07e79a971076.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UHwj56cjJKum0BUjKMff1Ap3nL75+poJyKuT3GJwRPk=","crlite_enrolled":true,"id":"e7d5456b-323b-464b-9a57-3595df77606b","last_modified":1562108516718},{"schema":1562108515200,"derHash":"Ze7AzGyXDMHNc2WRFdyNkE5vEubcj9Tdo51UyzAiR4A=","subject":"CN=GlobalSign Organization Validated ECC CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMT8wPQYDVQQDEzZHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgRUNDIENBIC0gU0hBMjU2IC0gRzQ=","whitelist":false,"attachment":{"hash":"865c9143e047b0121c8b2a402263e27dd9fbbd276406fe62b420613e3e28edda","size":1394,"filename":"4Xv9MflABt7Iaf_CjuYWBVtq_uG5yZJdQ3s5VSjCGoM=.pem","location":"security-state-staging/intermediates/cb10ff6b-2fd7-4bd4-b66d-314238afca50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Xv9MflABt7Iaf/CjuYWBVtq/uG5yZJdQ3s5VSjCGoM=","crlite_enrolled":false,"id":"d1ef766b-9934-4f69-b604-dcdd7cc578aa","last_modified":1562108515952},{"schema":1562108513681,"derHash":"JJvmXwx6sP47dkizDODrPPaRQCxy2stAzxRinGA8ujY=","subject":"CN=BlackCert\\, Inc. RSA DV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBSU0EgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"d44215866949fb5ebbd47bf41f766c1cbccb5645c0bcc8ba38d8fb1bf6079e0d","size":2154,"filename":"dnTrbfgvJOGlJse4RxYg30jhwWfQfKyNYkL6SpGs_1I=.pem","location":"security-state-staging/intermediates/8b6b285b-820a-4bb9-95a5-2caace235136.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dnTrbfgvJOGlJse4RxYg30jhwWfQfKyNYkL6SpGs/1I=","crlite_enrolled":false,"id":"bc7c0580-5018-49e7-9009-b95e7f33663f","last_modified":1562108514431},{"schema":1562108511407,"derHash":"qV8jtSrxCJWIb7ZTI9KamHbqfTlvgF5MooDVYcJuPa0=","subject":"CN=Certyfikat SSL,O=home.pl S.A.,C=PL","subjectDN":"MD0xCzAJBgNVBAYTAlBMMRUwEwYDVQQKDAxob21lLnBsIFMuQS4xFzAVBgNVBAMMDkNlcnR5ZmlrYXQgU1NM","whitelist":false,"attachment":{"hash":"45a923fe0feea027c9100ec2d0aa873a99af0b2acd334a796bd4d4b8399213b0","size":1565,"filename":"5PJ4jB1sjJ5kx3a0Ds2noJPc07ZOb_y1vR1tN1t5FsQ=.pem","location":"security-state-staging/intermediates/907a7262-b883-4896-bb78-a84247ab3ab1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5PJ4jB1sjJ5kx3a0Ds2noJPc07ZOb/y1vR1tN1t5FsQ=","crlite_enrolled":true,"id":"2c153960-0405-4d5f-8576-a05ed26e5b62","last_modified":1562108512178},{"schema":1562108509878,"derHash":"Yelzden22pgv9cGeL5TmbE41toN847kU0iRcf19lgl8=","subject":"CN=Sectigo ECC Domain Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGPMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"4d1b7deaa365566deaed85adb3c7b35bb377cf800b13c07a8ae1e78b76e74645","size":1329,"filename":"6YBE8kK4d5J1qu1wEjyoKqzEIvyRY5HyM_NB2wKdcZo=.pem","location":"security-state-staging/intermediates/6cf98cdf-f1ba-4bfe-9130-5511f8e29381.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6YBE8kK4d5J1qu1wEjyoKqzEIvyRY5HyM/NB2wKdcZo=","crlite_enrolled":false,"id":"b57ef74e-655f-4231-a30d-f2cfe2066f04","last_modified":1562108510628},{"schema":1562108509119,"derHash":"TWP4dHqWgPgYgrYtD6mTwzWB0xTFtZb6Nz35Kyxl1P8=","subject":"CN=HARICA Client Authentication ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEyMDAGA1UEAwwpSEFSSUNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"32fe726d359401c573765c4caa155f44aeac7ff0db07e6c99717c13fd4d7a82f","size":1382,"filename":"RkjJ3_AfR7WnTEAv46GxRy7Zz598VYGQ238SwVsbHEc=.pem","location":"security-state-staging/intermediates/70f65e99-e8b2-48ee-bf42-4801c36cb68d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RkjJ3/AfR7WnTEAv46GxRy7Zz598VYGQ238SwVsbHEc=","crlite_enrolled":false,"id":"7048b675-56a5-4d07-87e6-3c72293658a5","last_modified":1562108509869},{"schema":1562108508335,"derHash":"XYHQqjR29IpaZ11tPmq3Zr3IqhZ6GpTXnfkbQlEIL6Q=","subject":"CN=Symantec Class 3 Managed PKI Administrator CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxOzA5BgNVBAMTMlN5bWFudGVjIENsYXNzIDMgTWFuYWdlZCBQS0kgQWRtaW5pc3RyYXRvciBDQSAtIEc0","whitelist":false,"attachment":{"hash":"a2a98936c029075a8a6b565f8abca868b55374cab948eec361bad48dc9d73bd0","size":2162,"filename":"uIRohYy30h0StjFaVDICGnRrRRAkdbt9s-ofq2uF76o=.pem","location":"security-state-staging/intermediates/b173c1dc-300c-45c7-823f-87a260239e8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uIRohYy30h0StjFaVDICGnRrRRAkdbt9s+ofq2uF76o=","crlite_enrolled":false,"id":"713b1d86-1417-4497-a763-6c7a9a07b477","last_modified":1562108509111},{"schema":1562108503735,"derHash":"OP32JQfO3uFrFFXpa9I9XG9sVlTWjH47JyONLHN0SoY=","subject":"CN=DigiCert Extended Validation CG CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0cgQ0E=","whitelist":false,"attachment":{"hash":"a8bdae9244ca24b0d8b09a70bc032e9b5362540edd5a59cdeccad12958d1c5d5","size":1585,"filename":"eXcE_FEH8E-PslVO5TCIbyP752KLqMYODNwbD-LCR-E=.pem","location":"security-state-staging/intermediates/12975646-7816-4709-882d-0143bf1a5283.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eXcE/FEH8E+PslVO5TCIbyP752KLqMYODNwbD+LCR+E=","crlite_enrolled":false,"id":"9f5c8ac4-b008-49c0-b9bc-863426c26d90","last_modified":1562108504480},{"schema":1562108502976,"derHash":"7bc1PhgR5fN4UcYgz8fUWugoiZ6wV35P53Z0yGjcuJA=","subject":"CN=BlackCert\\, Inc. RSA Codesigning Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMUAwPgYDVQQDEzdCbGFja0NlcnQsIEluYy4gUlNBIENvZGVzaWduaW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"83e714d2ebb72b6cd5797087fdeaa549882b84d809b88d45d29814a2953cf6e7","size":2138,"filename":"E7ZaNnwy2IYB-cbZdmFmsDqLQpBsyfd8D0Wla2IcsN0=.pem","location":"security-state-staging/intermediates/0945ea41-2704-48b4-b317-eefbc1b38066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E7ZaNnwy2IYB+cbZdmFmsDqLQpBsyfd8D0Wla2IcsN0=","crlite_enrolled":false,"id":"957cbb11-8361-4b15-b3eb-c82267f47a38","last_modified":1562108503727},{"schema":1562108499185,"derHash":"VBrwGZYXYO8Z6PtBNObUMIW15eCH8wGX3EKyCX4QSH4=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"cee9a5df6d83eab591096fe1d9a6f43cc80dad8b8a159436b567f21161cbc901","size":2450,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/b9c4edc6-247c-4b69-b0a5-a85ec816d3f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"ac2d44fb-7f7c-4ba9-91ea-9fb4a5225f72","last_modified":1562108499932},{"schema":1562108498428,"derHash":"E0qWmWjHDkdlE7N7AT2ME4whEEZpta1i1NX6sWhpueo=","subject":"CN=WISeKey CertifyID Standard Services CA 2,OU=Copyright (c) 2012 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDEyIFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIFN0YW5kYXJkIFNlcnZpY2VzIENBIDI=","whitelist":false,"attachment":{"hash":"e48e0619d7002605f182e4ca2eb951af933322592b7bf6ada875554550da1467","size":1813,"filename":"d_Kor69hknpIfroNumzs6NkLxxCUNhMn46dzck_SZSQ=.pem","location":"security-state-staging/intermediates/abde4617-8fc5-4d49-8840-cd067fafc1be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d/Kor69hknpIfroNumzs6NkLxxCUNhMn46dzck/SZSQ=","crlite_enrolled":false,"id":"3f228a15-48bd-4095-9b49-153752372cad","last_modified":1562108499177},{"schema":1562108494477,"derHash":"7A6RbnSr8VDXJpuoha5sdB5IeFXP3QAhsfklDg8CQKQ=","subject":"CN=Digi-Sign CA Digi-SSL,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHIxCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR4wHAYDVQQDExVEaWdpLVNpZ24gQ0EgRGlnaS1TU0w=","whitelist":false,"attachment":{"hash":"b97246136be3d99d20bf2f7603175d44195ddb23d6b06dc54798dbf020e157c7","size":2133,"filename":"SjhfW8JOPoS_CGVE2In9gc0KODUuyPow9mwTaYtMEq0=.pem","location":"security-state-staging/intermediates/8b3ac03e-2dd2-4039-a6c7-c35f9b0a128d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SjhfW8JOPoS/CGVE2In9gc0KODUuyPow9mwTaYtMEq0=","crlite_enrolled":true,"id":"6b2da634-a178-4fe0-a67a-69c7a80a110a","last_modified":1562108495264},{"schema":1562108492940,"derHash":"wTFJn9hrIT213vqv1TERwoot2vS6RlyCZactbPc5tmg=","subject":"CN=GeoTrust ECC EV SSL CA,O=GeoTrust\\, Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEfMB0GA1UEAxMWR2VvVHJ1c3QgRUNDIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"588ba7e7e84de78bd2ee165c7c1929bd7112e182bf928a3c226efe5c273d8534","size":1370,"filename":"OO0Iaj51W5pVJ0cy2PVRI2a7tHdEEIid5kv96_bdYG0=.pem","location":"security-state-staging/intermediates/2d6eb50e-d96b-494b-b34f-d3b38e2fa2d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OO0Iaj51W5pVJ0cy2PVRI2a7tHdEEIid5kv96/bdYG0=","crlite_enrolled":false,"id":"ca75d5de-dcb0-4e6c-906a-28cbb856e74b","last_modified":1562108493682},{"schema":1562108492186,"derHash":"fg4WwAVvQan0xh9XFQPDvPB54r3bIovyIZrDEgBJa1w=","subject":"CN=COMODO RSA Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"40fed6ab131f22b397c3c2ecb13e30bb474e343301e79a2b101da728c8f7e725","size":2158,"filename":"Fbr_5aSOo4KRal8YE49t4lc76IOnK_oto9NWV1cSKWM=.pem","location":"security-state-staging/intermediates/26792b4c-be44-42ef-b451-acdb85008cae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fbr/5aSOo4KRal8YE49t4lc76IOnK/oto9NWV1cSKWM=","crlite_enrolled":true,"id":"42a678eb-ad85-4ddf-9bde-2a36dbf7e3f1","last_modified":1562108492932},{"schema":1562108489881,"derHash":"VJq1JOiGreznC92WoEtVSULDdL58KcDugYtjC98gDuE=","subject":"CN=COMODO ECC Organization Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE8MDoGA1UEAxMzQ09NT0RPIEVDQyBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"6ff6976ecc5dc7e323e439ed8c254a856da8c9eb0f1d4d4530e0dc455cdeb727","size":1321,"filename":"ORuXcQB__xhdb52by_Vmo_qhrTuazztSjlMMhaafJZ0=.pem","location":"security-state-staging/intermediates/2ed754b8-5dad-47c1-9bf2-d49c86f2db2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORuXcQB//xhdb52by/Vmo/qhrTuazztSjlMMhaafJZ0=","crlite_enrolled":true,"id":"b68c9aa1-a037-426c-872e-e863b1da96e0","last_modified":1562108490643},{"schema":1562108489123,"derHash":"vhOl0vXHj0QBGdSExxBCcyXrEM6pYj72IAyxGwT2UOE=","subject":"CN=Apple Public Client RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgQ2xpZW50IFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"830fdd81ad376da5b83348ff96f33463a23ca58c58f45698a8cc7234d1ec4f2a","size":1613,"filename":"HI6y3qp-41VQ3mL9AJrkQaSsUBgehHMaI9RZeWJdLmk=.pem","location":"security-state-staging/intermediates/0e7aa9ac-77b4-49f7-9899-54a03c0c2d60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HI6y3qp+41VQ3mL9AJrkQaSsUBgehHMaI9RZeWJdLmk=","crlite_enrolled":false,"id":"db20381e-1c9e-4baf-aab2-f2b9c195e30b","last_modified":1562108489873},{"schema":1562108488345,"derHash":"2w2hYDLxZDoklv3nQuK76B2spYzXYSBhQg4VTOG84r0=","subject":"OU=AC Componentes Inform\u00e1ticos,O=FNMT-RCM,C=ES","subjectDN":"MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==","whitelist":false,"attachment":{"hash":"9667524969985c4cb1aa76f3e3c434be6441809f9c3d2bad6265165a0b509b08","size":2430,"filename":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem","location":"security-state-staging/intermediates/5bc2733e-1751-448d-9db9-b1e6c1f4afc4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=","crlite_enrolled":true,"id":"43dee182-4f7e-46ed-8e3c-f6b84da2e351","last_modified":1562108489116},{"schema":1562108487565,"derHash":"2y8BlO3LeMup0br0w9uo1Wg32XsgIz1hfdULcTvTE8g=","subject":"CN=JPRS Organization Validation Authority - G2,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"eaa0461d01871fe7efef1f6dd76aeadd5f6a7fa6294b55d75e3356efb3bfffbc","size":1654,"filename":"54eZQ4rB3O8NcogAUW0xb-Kj8mUlz1CXsQbqAv5JoyE=.pem","location":"security-state-staging/intermediates/0d2373da-abe4-4f76-9197-bd953b05bcbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"54eZQ4rB3O8NcogAUW0xb+Kj8mUlz1CXsQbqAv5JoyE=","crlite_enrolled":true,"id":"90ba5f7f-c6e6-46f1-9eed-ed13ab24ea34","last_modified":1562108488337},{"schema":1562108486020,"derHash":"dCZArGf41xssR3dQdK2MYLriwBI6sYNUwkwXGTLYYYM=","subject":"CN=eMudhra ECC Organization Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGbMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPTA7BgNVBAMTNGVNdWRocmEgRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e34a770b073f3a5213a76f49963f984357b1953c6da5947b47e936a4e630f73b","size":1353,"filename":"1Mpue8qB6gEzwG3fbKc1IdTydXsa-PS26DWSlP08NHA=.pem","location":"security-state-staging/intermediates/a4456a24-aeff-4e5b-8141-b75819e0c374.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Mpue8qB6gEzwG3fbKc1IdTydXsa+PS26DWSlP08NHA=","crlite_enrolled":false,"id":"2bf88053-7706-4881-a7fb-ac030ad0b530","last_modified":1562108486759},{"schema":1562108482958,"derHash":"8RiVmlrV6zfO2xJRjiNEiZ3thXwDTh1mYERGfHsq7Ck=","subject":"SERIALNUMBER=201722,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE3MjI=","whitelist":false,"attachment":{"hash":"0018cff73afd9fc80f48f5b2b28aa9e874f42ec1eadda135b207f08ab903561f","size":2402,"filename":"Mq0HXzU9lbGXxDh3OAHAmEOs6t-zrh0AMpitBhEV-go=.pem","location":"security-state-staging/intermediates/c6eae6ec-2815-40ed-ad49-db25026f1f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mq0HXzU9lbGXxDh3OAHAmEOs6t+zrh0AMpitBhEV+go=","crlite_enrolled":false,"id":"369b0e86-2ce9-4e05-b98d-508abd7b4c38","last_modified":1562108483725},{"schema":1562108479933,"derHash":"wY1Tv5hk3Qm8vKz9Zy4lZtTIH2iJ42313UJcBCEdB2M=","subject":"CN=Hongkong Post e-Cert EV SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MH0xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEuMCwGA1UEAxMlSG9uZ2tvbmcgUG9zdCBlLUNlcnQgRVYgU1NMIENBIDMgLSAxNw==","whitelist":false,"attachment":{"hash":"e4408c6b03e1deb0777ad20ea8b3466779565bcb2d92a17de6ac350bdaa5de18","size":2097,"filename":"shxxZc44F1hF3pjKzr0Oaoq-CwRFBKIr0_noGHUYkjA=.pem","location":"security-state-staging/intermediates/5092f509-515e-460e-b9cb-d9cdaff53b24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"shxxZc44F1hF3pjKzr0Oaoq+CwRFBKIr0/noGHUYkjA=","crlite_enrolled":true,"id":"8a76611a-1aeb-45ed-90ff-d235f7264a64","last_modified":1562108480674},{"schema":1562108479189,"derHash":"oqZEIzcPKdJbx6jjGHumTn65rSxpSzKwpgSDt3ZKipk=","subject":"SERIALNUMBER=201726,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI2","whitelist":false,"attachment":{"hash":"493a8723d33b245fb73ba475b1b71ef35f27d668af43408d38e274218fc62e66","size":2402,"filename":"CJitrQ5Xyw0ivYWDlDkdZhYGrR9n2v_BiXArqHx0E3k=.pem","location":"security-state-staging/intermediates/1be9953d-1cde-405a-b00c-7ba2d663a689.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CJitrQ5Xyw0ivYWDlDkdZhYGrR9n2v/BiXArqHx0E3k=","crlite_enrolled":false,"id":"a1acb403-444a-4209-85b5-81f33f7e1947","last_modified":1562108479925},{"schema":1562108477627,"derHash":"ci1Qh02kVJbQKZYnQJd3YDqHNBpflDuInDLnuSgKj3E=","subject":"CN=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda. RSA DV CA,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIG3MQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xRzBFBgNVBAMMPk1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4gUlNBIERWIENB","whitelist":false,"attachment":{"hash":"3ba8b2665039d7c2a7cf679634516d8d507d0415ddd08b1e41ac4a9c6c867605","size":2231,"filename":"0xvEIcXteNs-TYPZ7GyhN_WFNSBPpaBsyCLFCdhQQY0=.pem","location":"security-state-staging/intermediates/3319dc26-2db5-4b0e-ae5b-4709b309e91f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0xvEIcXteNs+TYPZ7GyhN/WFNSBPpaBsyCLFCdhQQY0=","crlite_enrolled":true,"id":"0b17a42e-ae1c-45f8-9f54-f23d38b3a873","last_modified":1562108478417},{"schema":1562108476077,"derHash":"JT48lzLfiHTD1U2lIsFxEULJjCzqdmRjUVKomgPuk2Q=","subject":"CN=Optum Public Trust CA 1,O=Optum,L=Minneapolis,ST=Minnesota,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExFDASBgNVBAcTC01pbm5lYXBvbGlzMQ4wDAYDVQQKEwVPcHR1bTEgMB4GA1UEAxMXT3B0dW0gUHVibGljIFRydXN0IENBIDE=","whitelist":false,"attachment":{"hash":"e28866c72d971df063ce52b61094d04901ae33bf5dac1c98cee5f231443b1820","size":1796,"filename":"vKi3BXeuhSDWdRuvjranv-RWto4k9Z05PXzhtTz0LnA=.pem","location":"security-state-staging/intermediates/488fc2c3-5bb3-412f-813e-a4df6c553ea4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vKi3BXeuhSDWdRuvjranv+RWto4k9Z05PXzhtTz0LnA=","crlite_enrolled":false,"id":"1c890a1b-6c30-4168-b0b3-e6f8888a7ef6","last_modified":1562108476867},{"schema":1562108475274,"derHash":"wKHKNkddM7Rx5OWOVXTdkpTTVMRXKVlU21VbJOrSqks=","subject":"CN=COMODO/PKWARE Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAxMdQ09NT0RPL1BLV0FSRSBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"536d387994d2fcf3c04c848acb66841104d87c9b0b1ed73ccec9768bd275d362","size":1979,"filename":"javoiDXitAWxKnEeWWJB_XeluETyAl8SAu8OHaB7Q0c=.pem","location":"security-state-staging/intermediates/6124ffbf-c334-4b41-82f5-92517e8e488e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"javoiDXitAWxKnEeWWJB/XeluETyAl8SAu8OHaB7Q0c=","crlite_enrolled":false,"id":"c7a0609a-ed94-40e7-b2ce-ac3e72d18619","last_modified":1562108476061},{"schema":1562108474475,"derHash":"SKfJxaNnNPyeIE1jzmu7zZ4hwZeGBHYM2NMNb0xntnw=","subject":"CN=Plex Devices High Assurance CA,O=Plex\\, Inc.,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMScwJQYDVQQDEx5QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0E=","whitelist":false,"attachment":{"hash":"3729070872ea8b8dcd9408300fc6e7708a388c0ab4515de46054748a7dbd7915","size":1670,"filename":"vLeOEXjDgoNqSXwuYXRAIm7pApi-S-w8e2zLIwsC76A=.pem","location":"security-state-staging/intermediates/9297fd9c-adef-430a-a45f-6a0e7715a25e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vLeOEXjDgoNqSXwuYXRAIm7pApi+S+w8e2zLIwsC76A=","crlite_enrolled":false,"id":"c99ad4f1-7ce1-4835-9f30-07a94e50f3dd","last_modified":1562108475266},{"schema":1562108472186,"derHash":"kgy86b1V08qNRGgIpZ7fPCIq1XZ6RFPGhu48b5T1W84=","subject":"CN=The University of Texas-Pan American RSA CA,OU=Information Technology,O=The University of Texas-Pan American,L=Edinburg,ST=TX,C=US","subjectDN":"MIGzMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxETAPBgNVBAcTCEVkaW5idXJnMS0wKwYDVQQKEyRUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcy1QYW4gQW1lcmljYW4xHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxNDAyBgNVBAMTK1RoZSBVbml2ZXJzaXR5IG9mIFRleGFzLVBhbiBBbWVyaWNhbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"68a204c4713144af9e565ce675099fc7333de3ce90a145da40d7e88cf87f1992","size":2211,"filename":"zDuCL0MFlm-s2lxuioDRbpVXq3F1pIFe3Ogdl6yJbPc=.pem","location":"security-state-staging/intermediates/93cc4789-ad8f-42af-a3d7-ba55126aae58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zDuCL0MFlm+s2lxuioDRbpVXq3F1pIFe3Ogdl6yJbPc=","crlite_enrolled":false,"id":"803e4821-11f5-4be0-b520-db82af50d777","last_modified":1562108472928},{"schema":1562108470681,"derHash":"xJw1DlqCBeBj50xVSplDNbhDXJllJ9TvGisMe1FYSy0=","subject":"CN=Buypass Class 3 CA 3,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAzIENBIDM=","whitelist":false,"attachment":{"hash":"954fa22283314bcbe40077bc8cee7655cbcfce4fb215854858c5599d8c8b498f","size":1723,"filename":"b2TqrhO3HsQ2hHTQB23iQnAAL127LlWqd3L_IgvgTtk=.pem","location":"security-state-staging/intermediates/379744b3-624d-49d1-b082-83d5b607dc72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b2TqrhO3HsQ2hHTQB23iQnAAL127LlWqd3L/IgvgTtk=","crlite_enrolled":true,"id":"636e348f-d4b7-425a-aabb-4eab295a6c6e","last_modified":1562108471419},{"schema":1562108469933,"derHash":"geBxsB8B3EPuRYwOG9y8hItHRiwmtM4Z7pAVQWvG34k=","subject":"CN=DigiCert Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"7669ec2c677f7c33ea164f3d8991239b21a5698efb50b48e0cb9ac939a508051","size":1658,"filename":"iHVCWDAkTkDEQzK_sRixqnC3Qp1KI3tOEHgKB14IEjE=.pem","location":"security-state-staging/intermediates/8c415eed-4867-4bda-81c4-10a03eb5b973.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iHVCWDAkTkDEQzK/sRixqnC3Qp1KI3tOEHgKB14IEjE=","crlite_enrolled":false,"id":"8fa42d62-2705-4c2b-8527-12fff6081ec6","last_modified":1562108470673},{"schema":1562108469181,"derHash":"T9c0GQRvkIaIJtWBU2kx0i5UlD680FnLdiE5TXSTQ8U=","subject":"CN=STRATO SSL - G3,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzM=","whitelist":false,"attachment":{"hash":"651a5cc911bb69e9769352cd79204ebad0b8c18a0618514fbc2f3b18fbf1985f","size":1699,"filename":"qvSFQBzCFM6BzrM7CfDEVTkxQPTvaKcxyp8jRACn-_g=.pem","location":"security-state-staging/intermediates/fe9022e1-381b-43c0-bf53-e4e296637182.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qvSFQBzCFM6BzrM7CfDEVTkxQPTvaKcxyp8jRACn+/g=","crlite_enrolled":false,"id":"f362a89a-ec51-4c83-b355-5992a88e47e8","last_modified":1562108469925},{"schema":1562108468428,"derHash":"P994ilpl5qKdjBVQ2CRJBqO4p7fT2pve3XSOQYOnY8k=","subject":"CN=GeoTrust DV SSL SHA256 CA - G2,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEnMCUGA1UEAxMeR2VvVHJ1c3QgRFYgU1NMIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"c021152fa65496c7d3044515d2b06d1fae2374b0af0f3a15b7898923ab81ec9b","size":1723,"filename":"1i8gOxF9EpNXxb95VRtBODr-LfSjs4yA5TdHoH3gAeI=.pem","location":"security-state-staging/intermediates/6513678f-bcad-46a9-9e10-82fa65ea35db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1i8gOxF9EpNXxb95VRtBODr+LfSjs4yA5TdHoH3gAeI=","crlite_enrolled":false,"id":"1d033b5b-0c9c-49e6-8018-fe710f401820","last_modified":1562108469174},{"schema":1562108466881,"derHash":"tuTI2dV1phQE3laOJ71vMEjXsPgDBl4vZSYmC9yj0hE=","subject":"CN=Hewlett Packard Enterprise Collaboration CA G21,OU=Class 2 Managed PKI Individual Subscriber CA,O=Hewlett Packard Enterprise Company,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzErMCkGA1UEChMiSGV3bGV0dCBQYWNrYXJkIEVudGVycHJpc2UgQ29tcGFueTE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExODA2BgNVBAMTL0hld2xldHQgUGFja2FyZCBFbnRlcnByaXNlIENvbGxhYm9yYXRpb24gQ0EgRzIx","whitelist":false,"attachment":{"hash":"96b02933ee42ce251c97ba41e496414d33f3c5e1c2a412abc53c2e02a4188766","size":2093,"filename":"Z90auS_kRdRG5Ao7y14bu7yNh6EQunNHlS4BvcxrXqg=.pem","location":"security-state-staging/intermediates/ca9b4a36-f032-4648-9039-916ec02a384f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z90auS/kRdRG5Ao7y14bu7yNh6EQunNHlS4BvcxrXqg=","crlite_enrolled":false,"id":"d6eec88c-c2ad-4bbc-8fa8-2a3910ffb27c","last_modified":1562108467674},{"schema":1562108465327,"derHash":"8BflEJGLd9pn5NAg4rdqQkYYdugi9iDFVzvLw7uzdAY=","subject":"CN=Gandi Secure Email CA,O=GANDI SAS,C=FR","subjectDN":"MEExCzAJBgNVBAYTAkZSMRIwEAYDVQQKEwlHQU5ESSBTQVMxHjAcBgNVBAMTFUdhbmRpIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"7374bb117a04dbe56b2af679a65a85a2c734afce7e88acb81917ecd528ba648e","size":1719,"filename":"iFIEeQ06wWLDY4tmZC6npViJr_VFbFCHUdRkqmIc7OY=.pem","location":"security-state-staging/intermediates/dec7936f-0abc-4ce6-95ac-65368ca76b94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iFIEeQ06wWLDY4tmZC6npViJr/VFbFCHUdRkqmIc7OY=","crlite_enrolled":false,"id":"8561ee44-dd28-4da1-ad1c-2cd801669b4f","last_modified":1562108466116},{"schema":1562108464555,"derHash":"oloZVGgZ0EgADvnGV3xLzY0hVbHkNGpFmdbIt5eZ1KE=","subject":"CN=DarkMatter Secure CA,O=DarkMatter LLC,C=AE","subjectDN":"MEUxCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzEdMBsGA1UEAwwURGFya01hdHRlciBTZWN1cmUgQ0E=","whitelist":false,"attachment":{"hash":"17a8659515054ccd708b7578033a8260071fbc5776d9f8d781877d7eb0ab17fc","size":2446,"filename":"_NdsyiNH5c1bOTR_Uc9DZUtpor_JBzZwpr5H2HAebg4=.pem","location":"security-state-staging/intermediates/aae3464a-97e3-430d-abca-3a3589b81fef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/NdsyiNH5c1bOTR/Uc9DZUtpor/JBzZwpr5H2HAebg4=","crlite_enrolled":true,"id":"fb7a603d-e9a8-4251-ba50-4366055db1f3","last_modified":1562108465319},{"schema":1562108462256,"derHash":"jXNz845j2DDAzqosMzMPIaLHdAjuPPvFlcDS89MvQiQ=","subject":"CN=AlwaysOnSSL ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGQxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVQWx3YXlzT25TU0wgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"6cd13823e7a07d0b6d63d3b9c92770bf894f5e25fefc4e8199730c15424c4112","size":1142,"filename":"40Fa99C7P_qSeG5RhWDK4bUcBBT4PiEO_gqhJF0vZqQ=.pem","location":"security-state-staging/intermediates/edeee72e-1d4e-43f0-b5b0-f8cdf445085f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"40Fa99C7P/qSeG5RhWDK4bUcBBT4PiEO/gqhJF0vZqQ=","crlite_enrolled":false,"id":"c9f1fa0d-0267-4cae-9099-43d21b02ada0","last_modified":1562108463012},{"schema":1562108461484,"derHash":"kPqY1kbdXwBgLWjRfddrVe5RzaPTki8NvdEEgPWZCs0=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"461fb473d9abcb1549d2bb8dc7f25d3d5d8ffcd271bcfd212d9339e162d6e4cf","size":2259,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/cd7dee2a-eebb-414f-bd65-a154eaf83a0f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"80730951-6e3a-4fd6-83ff-a24e2b107f4f","last_modified":1562108462248},{"schema":1562108460724,"derHash":"uzlJcDXtlYPShs3nD7ZE65WAZZgJKx6NjxG8A116R2o=","subject":"CN=Riverbed Certificate Issuer,O=Riverbed Technology\\, Inc.,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlSaXZlcmJlZCBUZWNobm9sb2d5LCBJbmMuMSQwIgYDVQQDExtSaXZlcmJlZCBDZXJ0aWZpY2F0ZSBJc3N1ZXI=","whitelist":false,"attachment":{"hash":"380d64120c38a475d1d02f25161d62ca2438dd34d22cc5fdc5ff8914d2ee748e","size":1837,"filename":"mLNcfRP6zZz8Ur0uU9bhIs_pxrgspWgbw-3oVVm2LZM=.pem","location":"security-state-staging/intermediates/51c4f2c3-b6a5-4cf4-9883-a9fc87d42f7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mLNcfRP6zZz8Ur0uU9bhIs/pxrgspWgbw+3oVVm2LZM=","crlite_enrolled":false,"id":"b91bef53-0465-4340-bc6f-1b264e20858f","last_modified":1562108461476},{"schema":1562108459225,"derHash":"GUAL5bejH7czkXcAeJ0vCiRxwMnVBsDlBMBsFtfLF8A=","subject":"CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJkRpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"97ebf8501ebeef539292b72802d284d4a90895579053c7ca04829988d01099fd","size":1687,"filename":"k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K-59sNQws=.pem","location":"security-state-staging/intermediates/c00739e2-a5f0-4bfc-bd66-49b848083fe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K+59sNQws=","crlite_enrolled":true,"id":"6bad67e8-353f-45a0-88bf-f84ca74f9d08","last_modified":1562108459963},{"schema":1562108457728,"derHash":"TJ4FOPmFaQ3p1c4cOPFsJLTDmhcQwIgc2wbir9t1e00=","subject":"CN=Deutscher Bundestag CA - G02,O=Deutscher Bundestag,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEcMBoGA1UECgwTRGV1dHNjaGVyIEJ1bmRlc3RhZzElMCMGA1UEAwwcRGV1dHNjaGVyIEJ1bmRlc3RhZyBDQSAtIEcwMg==","whitelist":false,"attachment":{"hash":"691728107bc477123f2b50cf26ee2991f3ba95b969683fd4fe04926cd388a729","size":1999,"filename":"p-DGsZUedDpJ0iAR6valV2XZykAPIyB_t6FdqCpsNck=.pem","location":"security-state-staging/intermediates/801fd9f6-afcf-4260-913d-7cedfb8d1f69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p+DGsZUedDpJ0iAR6valV2XZykAPIyB/t6FdqCpsNck=","crlite_enrolled":true,"id":"4b7cd555-ac58-4744-b9ae-1f90ccfdbd42","last_modified":1562108458465},{"schema":1562108456943,"derHash":"KFJhsTo5JkWtzcIueVlPj8qLbvgVyW6iUI2MaJs11JA=","subject":"SERIALNUMBER=201917,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE3","whitelist":false,"attachment":{"hash":"b4c42fc4159a8e09a7be7d92b67f375fe8a4a1289555b5146e634c922dfebc7c","size":2333,"filename":"pJ115qaM3iy0fBjotKRhuL4ZOLmB8hkeEaSrcQjAX-E=.pem","location":"security-state-staging/intermediates/94254f29-2c38-49e2-aa81-74e7a43490e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pJ115qaM3iy0fBjotKRhuL4ZOLmB8hkeEaSrcQjAX+E=","crlite_enrolled":false,"id":"2e788e05-bc12-4ee0-993f-0e4ce6728971","last_modified":1562108457720},{"schema":1562108455439,"derHash":"vzmkJB9C1SI2iUSz3FPtnqpax3NeJC4GJ8DdW7pxRIQ=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"771df57314c0ff60060e643c897bc3d2c750306ce65c3893ac7971eccbfaa626","size":2101,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/26d00339-07ff-4371-8b44-fe90949d947d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"d028614d-4a78-4253-b0be-7dafb1e46f70","last_modified":1562108456185},{"schema":1562108449412,"derHash":"hXYPd9sP0Nk8Ie4DZLjqsJuCz0m3hJgxA4IJtbEIE2M=","subject":"CN=DigiCert Federated ID L3 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMyBDQQ==","whitelist":false,"attachment":{"hash":"7688296a490812398f07da4054aa6c862d6971d10625571f6f958e6dcf89cf40","size":1861,"filename":"D_y1VvJ2qndIKmqJ6xcIr7CNwy7j0tZxmfALqY3I9DY=.pem","location":"security-state-staging/intermediates/dbf7ff78-daad-447b-9fd4-d935233f7746.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D/y1VvJ2qndIKmqJ6xcIr7CNwy7j0tZxmfALqY3I9DY=","crlite_enrolled":false,"id":"50c11f47-25d1-43c8-a40c-7dbbed4dec9b","last_modified":1562108450170},{"schema":1562108447119,"derHash":"7zVswpmqY3kWyBpIiRtbovMzogZNk6iboU9joUqmslE=","subject":"CN=Go Daddy Secure Code Signing Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEZMBcGA1UEChMQR29EYWRkeS5jb20sIExMQzEtMCsGA1UECxMkaHR0cDovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMUAwPgYDVQQDEzdHbyBEYWRkeSBTZWN1cmUgQ29kZSBTaWduaW5nIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"2a9da51343ba17fc69416527b4e61c230d78d040f1a4f4a653929473419fc67c","size":1776,"filename":"ZKrsHPc_itlBFX0ia7RhbHINkdKu7eJaRcSBtF1rbBk=.pem","location":"security-state-staging/intermediates/2354bf54-5e88-4dad-8baa-b8c573e7c4b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZKrsHPc/itlBFX0ia7RhbHINkdKu7eJaRcSBtF1rbBk=","crlite_enrolled":false,"id":"f9148830-33ed-4e5a-9e6a-dc463e9110ab","last_modified":1562108447878},{"schema":1562108446333,"derHash":"IOPoh0eo2I4RpSdSEDLcjK6SvDO0XJPu4E9iSnDckgo=","subject":"CN=Huntsville Hospital System CA,OU=Orion Health Direct Secure Messaging,O=Huntsville Hospital System,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaSHVudHN2aWxsZSBIb3NwaXRhbCBTeXN0ZW0xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEmMCQGA1UEAxMdSHVudHN2aWxsZSBIb3NwaXRhbCBTeXN0ZW0gQ0E=","whitelist":false,"attachment":{"hash":"4f9fab69c2825ed8051a167e929634c1a24478267e05efe7c084c5d300c59d25","size":2308,"filename":"4jZ0K-YfJqocNa6Q3OoluSDNkSjq0ytpvAtrDgTqLuQ=.pem","location":"security-state-staging/intermediates/8cf75bef-731d-4866-a120-e05cba8d7698.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4jZ0K+YfJqocNa6Q3OoluSDNkSjq0ytpvAtrDgTqLuQ=","crlite_enrolled":false,"id":"048d5070-4d74-42a3-bdd2-1e5791e0b347","last_modified":1562108447112},{"schema":1562108445570,"derHash":"gN2eNJfzVOMLis850EbdT1phj3iJI26zT3jVTRXNalA=","subject":"CN=Amazon,OU=Server CA 1A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"f502b13e5af94af796e88c4080574a5ad68c2787ff0f7bdb34061720b135d3eb","size":1544,"filename":"ZLtb2AMR-j9TvZlATKuHYq1uBIRH0Kl_IZ_OyhZh83w=.pem","location":"security-state-staging/intermediates/b9e331a0-e39f-41ce-a5d3-a151079adcca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZLtb2AMR+j9TvZlATKuHYq1uBIRH0Kl/IZ/OyhZh83w=","crlite_enrolled":false,"id":"dd706920-48c4-43c2-ad79-708be9e0d652","last_modified":1562108446325},{"schema":1562108441761,"derHash":"RYRGunXZMukU8jwrV7fRku3bwhgdlY4Rga1SUXR6Hug=","subject":"CN=DigiCert ECC Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEVDQyBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"b2bcbebe7e27673d1a6a02cea251d16fb5d61462c14b4e5f2959e1d241a38778","size":1333,"filename":"PZXN3lRAy-8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=.pem","location":"security-state-staging/intermediates/64f57389-f6e8-4703-a733-9ac4ef7d0e9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=","crlite_enrolled":true,"id":"ec135dce-52fb-4ab9-b488-075172498a7c","last_modified":1562108442503},{"schema":1562108441013,"derHash":"ljBWsNlB2dviesd4BT2F5DzHn0dq00z915nCfjgYQOs=","subject":"CN=NCC Group Secure Server CA G3,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"f16945e38e9d095d6f815613d6e34ba2de58cb018adf71a2eaff1dc03a45d3c5","size":1110,"filename":"o054ddOknAfLTeuaAC1q42pNk8GmJ-eXYrMMmlOPyUc=.pem","location":"security-state-staging/intermediates/75e73199-e46f-4f99-82bd-6bb22c48adc2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o054ddOknAfLTeuaAC1q42pNk8GmJ+eXYrMMmlOPyUc=","crlite_enrolled":false,"id":"90a2cf68-57ab-4964-a059-d6e9ca04d487","last_modified":1562108441753},{"schema":1562108438751,"derHash":"G9nTNskEXcF0JrmawmUvrjHLncKsPhmwQ5DCSwvUqKA=","subject":"CN=SSL.com NAESB Client Authentication Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMUMwQQYDVQQDDDpTU0wuY29tIE5BRVNCIENsaWVudCBBdXRoZW50aWNhdGlvbiBJbnRlcm1lZGlhdGUgQ0EgRUNDIFIy","whitelist":false,"attachment":{"hash":"025ec4ec422a32861ce2ee1ff6519ff877f45473617ddfbc0cc4d2d65a1f3403","size":1284,"filename":"-XFI74y_3Si13bQVqU7peqlv_Bm1B62UTJzvE6VW0eg=.pem","location":"security-state-staging/intermediates/86db5367-7cdb-43be-bc89-89822bb5d464.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+XFI74y/3Si13bQVqU7peqlv/Bm1B62UTJzvE6VW0eg=","crlite_enrolled":false,"id":"f5fb2bf8-c421-4d28-86ec-271b94f105e5","last_modified":1562108439491},{"schema":1562108437991,"derHash":"MoTgNczXH3odBjrpjimx5ZEjEa2fbZEYhMr513HTfE0=","subject":"CN=BlackCert\\, Inc. RSA OV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBSU0EgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"a606699a644f90e31cdac13ce9ab6fe654fc1b68e04d29ed2be0f02b771c6ddb","size":2150,"filename":"B5IV9Zui5uDR_htFQKKJviedASQLhuhY2W547xasQvc=.pem","location":"security-state-staging/intermediates/65c4a648-66cf-4447-ad46-c424ead1c1d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B5IV9Zui5uDR/htFQKKJviedASQLhuhY2W547xasQvc=","crlite_enrolled":false,"id":"50ca3b4d-bf64-427e-b5f2-60f0150b7f77","last_modified":1562108438743},{"schema":1562108436479,"derHash":"2oVGgW2JHBJB6Th95DbRuffqcNuh6z0l9YJxzoFqerw=","subject":"CN=Apple Public Server ECC CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIEVDQyBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"96414faae6fe080e422a2e6dffda79775450c27bd46afac2672914234e85706a","size":1358,"filename":"kKxRozcrd_eR6KCzq3nM59ZL2rXyJMQOx5NjXVurVaw=.pem","location":"security-state-staging/intermediates/08d896b9-e7d5-440e-a842-0552e86ff576.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kKxRozcrd/eR6KCzq3nM59ZL2rXyJMQOx5NjXVurVaw=","crlite_enrolled":false,"id":"1d2ac87d-efa3-4196-9b3d-7656b94384ac","last_modified":1562108437238},{"schema":1562108433427,"derHash":"NWpfTZlOnvp8rvxJF2iRHWXsJZd0ZbYQ4vKapEcmMcM=","subject":"CN=EC-SectorPublic,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGIMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxGDAWBgNVBAMMD0VDLVNlY3RvclB1YmxpYw==","whitelist":false,"attachment":{"hash":"8aa452217d865dd183b477c08181966ceab5ca68b4abe8ee3224d4a860effb60","size":2101,"filename":"VMk3U3j_saU9dzdCeDTxe0MSzuZR2tplayTBfNxG2oQ=.pem","location":"security-state-staging/intermediates/8e636754-d680-47c7-8862-2e0d71bd6568.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMk3U3j/saU9dzdCeDTxe0MSzuZR2tplayTBfNxG2oQ=","crlite_enrolled":true,"id":"8a63a6e7-575b-46fb-bdf4-944f8aa5edcc","last_modified":1562108434176},{"schema":1562108432677,"derHash":"KMu04NnE7m0ErI8UcXYFrjpL2Mv40IGyevbtsvPXajI=","subject":"CN=DigiCert Grid Trust CA G2,OU=www.digicert.com,O=DigiCert Grid,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExlEaWdpQ2VydCBHcmlkIFRydXN0IENBIEcy","whitelist":false,"attachment":{"hash":"2030c0b03af2fba71a3c252cde6988edc7bbd22d1d2515bf5da0d0ccf16c5a03","size":1796,"filename":"5TmPqy9bKSAy0zKN0Mz_yBIgKGk_pgZ4TMaSTFRh9xw=.pem","location":"security-state-staging/intermediates/062c27f3-e7a5-48a0-8734-535cb038e150.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5TmPqy9bKSAy0zKN0Mz/yBIgKGk/pgZ4TMaSTFRh9xw=","crlite_enrolled":true,"id":"0aee0acd-3e30-437a-b011-55d61c8d46c4","last_modified":1562108433420},{"schema":1562108431893,"derHash":"PtCuZ6FDLIPYIQHeabLuXn8gMCcJ2VeQc6MC2pD0hTM=","subject":"CN=TrustSafe Domain Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR","subjectDN":"MIGNMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxJjAkBgNVBAMMHVRydXN0U2FmZSBEb21haW4gVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"748834790eb69db784c3f00d7f2ef2b64cf353435e5de3e69ac4ca2c81299276","size":2247,"filename":"90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0-Sun5o=.pem","location":"security-state-staging/intermediates/32d1002c-6eee-400e-a7ec-8b0235165445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0+Sun5o=","crlite_enrolled":true,"id":"29a0cb2e-7719-4c2f-9360-00c82a4a3c72","last_modified":1562108432669},{"schema":1562108430382,"derHash":"bEfTZcE7yMw9be9djwerjb6jyNSUXWUaqYVKnJo8xxw=","subject":"CN=Certum Extended Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGHMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSswKQYDVQQDEyJDZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSBTSEEy","whitelist":false,"attachment":{"hash":"0c8cfb3c29a92dbd2d2289a8b8babc8b12040ee59493a752f19f90d04a232032","size":1731,"filename":"HYLX8fqXEbN3Nn7-5kDCagbbzZnSoXsP-rAxbZJ4isM=.pem","location":"security-state-staging/intermediates/d9eaba09-d66e-487d-9974-8980bc0a838e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HYLX8fqXEbN3Nn7+5kDCagbbzZnSoXsP+rAxbZJ4isM=","crlite_enrolled":true,"id":"53f85a16-b4c6-49b5-b7ae-79f9a96b81be","last_modified":1562108431124},{"schema":1562108429620,"derHash":"d9bCr1p7hvY9mRjIdTN3nyrwjTXPoU2kk4yAP1PeGKE=","subject":"CN=SwissSign Personal Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"37ef04fb6f6156e237c6f04ae3b383028744a07d5a6a4197c49d3411c82108f0","size":2389,"filename":"l5kY-a2-qCNGMn7LXb_lGEENF-dZOLccQOZBKr40wVE=.pem","location":"security-state-staging/intermediates/6a316d67-95bd-4ab5-aef3-82bd300391d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l5kY+a2+qCNGMn7LXb/lGEENF+dZOLccQOZBKr40wVE=","crlite_enrolled":true,"id":"26a70827-d9ed-46cc-8952-77eb4121605e","last_modified":1562108430373},{"schema":1562108428868,"derHash":"CzOSEtfP8XosWeNWabWOdzUBM3UKeNqUBHcO3UcN73Y=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"0e6fef16a9dfd3b1fc541bf1ed445460dda807a212171958df2ea10863a94d13","size":1581,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/c31bd046-861b-47b4-b83f-7da8f65eb61e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"065d9c56-c2d7-42eb-8986-f6e198626d65","last_modified":1562108429611},{"schema":1562108428107,"derHash":"xhkwd8YYnR37v4E7h9x8vwSYrPcniHvH7FQyCQbem8g=","subject":"CN=Deutsche Telekom AG Issuing CA 01,OU=Trust Center,O=Deutsche Telekom AG,C=DE","subjectDN":"MG4xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNEZXV0c2NoZSBUZWxla29tIEFHMRUwEwYDVQQLDAxUcnVzdCBDZW50ZXIxKjAoBgNVBAMMIURldXRzY2hlIFRlbGVrb20gQUcgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"42323bfb5127113b4438824fb58d3af80732c28856150ce28e9ba8a079d9df2d","size":2333,"filename":"6FKZ0XUSLykGJ_GTHFYeoN0IGYULT_v-FT0CIQgo_9k=.pem","location":"security-state-staging/intermediates/eb470e98-5598-4d83-8575-ea122484a072.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FKZ0XUSLykGJ/GTHFYeoN0IGYULT/v+FT0CIQgo/9k=","crlite_enrolled":false,"id":"3aa58b0f-f271-443e-b359-6c266dbd9ca7","last_modified":1562108428860},{"schema":1562108427352,"derHash":"FfrEJaqEQEs2L6NInrZ9BV1donb4aFxNaY2hgw1CDw8=","subject":"CN=COMODO RSA Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"6d952d782fa2f84e580c545480b40eeae3fab20a3eba7b734b158271c48b1117","size":2105,"filename":"mHI0vDHAQ12vglM3cO2DlsvGPmhqena8_DpLQz3BaYs=.pem","location":"security-state-staging/intermediates/df4e2dce-92b3-41f1-8479-4de071dddbfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mHI0vDHAQ12vglM3cO2DlsvGPmhqena8/DpLQz3BaYs=","crlite_enrolled":true,"id":"e9149e45-f71f-4714-887f-be55784c958e","last_modified":1562108428099},{"schema":1562108425846,"derHash":"qbrrbzgUtMNDENqE3tOsOC2gErhNIH1KObFnHPWB9ME=","subject":"CN=Gehirn Managed Certification Authority - RSA Digital ID,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGKMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMUAwPgYDVQQDEzdHZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBEaWdpdGFsIElE","whitelist":false,"attachment":{"hash":"9d3dd522c6781ec5c3a2a5d0e4fe04233096cafc6063899f7128d1dba3ae9a00","size":2158,"filename":"UbDxt_jWD-1wTemqPnXtZYGyWnVxg1DGdCspV6DLqOI=.pem","location":"security-state-staging/intermediates/d473bf66-6ea1-4118-ab26-b32ab412136a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UbDxt/jWD+1wTemqPnXtZYGyWnVxg1DGdCspV6DLqOI=","crlite_enrolled":false,"id":"52cca6b4-44db-46a4-a159-3fb79dc4e263","last_modified":1562108426596},{"schema":1562108425078,"derHash":"NFcQZ1JAAhKQOjVFyjsu84SkVpcr2VHY2EDBsKN576E=","subject":"CN=Sectigo ECC Organization Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGVMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPTA7BgNVBAMTNFNlY3RpZ28gRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"5b59d79497cc46bd9ade87bc119d6b5080a06bda160f1f1455a641a59af50c9d","size":1337,"filename":"NodEgLRdUtj_Cm5LdQFzr6BIONhbXlzcV7NAqMo879U=.pem","location":"security-state-staging/intermediates/81767626-1716-426f-855f-3a063a5ec84a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NodEgLRdUtj/Cm5LdQFzr6BIONhbXlzcV7NAqMo879U=","crlite_enrolled":true,"id":"5ce2d1bd-9d4d-4ded-b4fb-dfd347048cf8","last_modified":1562108425838},{"schema":1562108423559,"derHash":"kemNCUfBJUlOqvKjjQh74Hga8g2KFO6MOf7NxILPX4I=","subject":"CN=JCAN Public CA1 - G3,OU=JCAN Public CA1 - G3,O=JIPDEC,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxHTAbBgNVBAsTFEpDQU4gUHVibGljIENBMSAtIEczMR0wGwYDVQQDExRKQ0FOIFB1YmxpYyBDQTEgLSBHMw==","whitelist":false,"attachment":{"hash":"8715c938f66a00c894f04f3ef621c7b599a8b2e13eb998f7287d00d756bc284b","size":1618,"filename":"9VucP103hsLA3O6-YdMs0Xb-Ebf2eG--F7ZVgCe-B7w=.pem","location":"security-state-staging/intermediates/fc3bc551-be4c-4643-b4a8-9c47defcf8e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9VucP103hsLA3O6+YdMs0Xb+Ebf2eG++F7ZVgCe+B7w=","crlite_enrolled":false,"id":"40053026-a20d-4902-a676-37e6280f263b","last_modified":1562108424314},{"schema":1562108422021,"derHash":"6GX1g6kozLanKGuU55IO4fSZjAMLQ4aJ6Vg7zNasUmE=","subject":"CN=Symantec SAS EV Code Signing CA,O=Symantec Corporation,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfU3ltYW50ZWMgU0FTIEVWIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"337db3cb21f94b91820cbcc8f642633962faa317942d17c576ac1c2794189bff","size":1585,"filename":"ZxpdBOLTJS_kzdVgZXygrgtlyU-prl3vrT0h-s-62rw=.pem","location":"security-state-staging/intermediates/a306f3fa-06db-436a-a5c4-9e567203cfa7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZxpdBOLTJS/kzdVgZXygrgtlyU+prl3vrT0h+s+62rw=","crlite_enrolled":false,"id":"1570212f-0a9d-4cdc-8dc3-23b95d91c327","last_modified":1562108422770},{"schema":1562108420475,"derHash":"E8a3OVvGT8Bs7yzlP2bUuYAMUs2IFu43Uy86skuBZcw=","subject":"CN=K Software Certificate Authority (DV) 2,O=K Software,L=Ashland,ST=KY,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLWTEQMA4GA1UEBxMHQXNobGFuZDETMBEGA1UEChMKSyBTb2Z0d2FyZTEwMC4GA1UEAxMnSyBTb2Z0d2FyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgKERWKSAy","whitelist":false,"attachment":{"hash":"b5bebedbc80eec959a6861be597ae614a1b9569ca5c08388b478dd281dd1e7a7","size":2138,"filename":"fL2WqC2l5uf2-UsREkC4vpvX1l1w6N47XmmbDTOPHoM=.pem","location":"security-state-staging/intermediates/6f39f731-4c07-4245-b48d-2f223af99539.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fL2WqC2l5uf2+UsREkC4vpvX1l1w6N47XmmbDTOPHoM=","crlite_enrolled":true,"id":"02bd1d38-93b5-4067-ba88-0ff77d58e2b1","last_modified":1562108421264},{"schema":1562108419697,"derHash":"F06drmVEoHySXOrjoACgPJJUJpOlVcH8nmC5js06wX4=","subject":"SERIALNUMBER=201912,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEy","whitelist":false,"attachment":{"hash":"5b8b8402870a642d23670d933707eb7f84aa868a1d4eefc7cf0662245aa3ad21","size":2333,"filename":"xNZ3P4W2umfy0BWer-9Vg-Vb0i62qHEzfsjbZ50ayLs=.pem","location":"security-state-staging/intermediates/2d27de25-cdcc-4a6f-a95e-0256cdc2d762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xNZ3P4W2umfy0BWer+9Vg+Vb0i62qHEzfsjbZ50ayLs=","crlite_enrolled":false,"id":"2613d4d8-6244-44f1-908d-c456ecf17c6e","last_modified":1562108420466},{"schema":1562108418936,"derHash":"zHI8pITxsETH1CotSfFz93pUdi5d3qRM5HtTHwSPMzo=","subject":"SERIALNUMBER=201816,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE2","whitelist":false,"attachment":{"hash":"a44d57c6928b5d6fe4358c55101521dde08dec3196b3e455157ab3064e29e159","size":2333,"filename":"iZcoQqVY1Shs4RFS4buBmKFfplxRq_qotaDZ_dizH5s=.pem","location":"security-state-staging/intermediates/e402cac3-292a-4520-a48d-abe845e4e403.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iZcoQqVY1Shs4RFS4buBmKFfplxRq/qotaDZ/dizH5s=","crlite_enrolled":false,"id":"9db6356b-6c7b-4d8b-b48e-4766d60776cd","last_modified":1562108419689},{"schema":1562108418187,"derHash":"QRRL1BdMMVLhylJvd9n5zonevE66bHePgVwhFktRAdM=","subject":"CN=WISeKey CertifyID Advanced Services CA 4,OU=Copyright (c) 2016 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDE2IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIFNlcnZpY2VzIENBIDQ=","whitelist":false,"attachment":{"hash":"95344e4cd8faaef89e2c2b2a1e95b7a3f7cb66fe9f8125d2ad51a3eebb0fd966","size":1865,"filename":"czPh4iiE8c9phL0gdQlH3pi0J03JPqAzh4UnwUPK_Ho=.pem","location":"security-state-staging/intermediates/47311600-cf24-4f24-a91a-b0372535414e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czPh4iiE8c9phL0gdQlH3pi0J03JPqAzh4UnwUPK/Ho=","crlite_enrolled":true,"id":"1d7c7208-5af5-41ba-bdf5-ba68ae6bfe91","last_modified":1562108418928},{"schema":1562108416654,"derHash":"nkNiqRiokAmHfHuLGQ52OuASrUfBzKX8zxZvwJK8Kt4=","subject":"CN=NETLOCK Trust Qualified QSCD CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBRU0NEIENB","whitelist":false,"attachment":{"hash":"a9db5eb17262cb517f68c8b87a2d5cdf87701cef4f06e04fc0682b56add2277d","size":2081,"filename":"olqhNjTm2Sp9m1ZCWJdK_014dkyXVLKhU2hA03JqJDI=.pem","location":"security-state-staging/intermediates/e8f32acc-3396-4ecf-80ac-5467edd7dc61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"olqhNjTm2Sp9m1ZCWJdK/014dkyXVLKhU2hA03JqJDI=","crlite_enrolled":false,"id":"2a3597e8-9e52-40c9-8dcc-bdcde662da91","last_modified":1562108417422},{"schema":1562108415879,"derHash":"zHJT696ffpLLope1ut7Rsi5c6spSXiAbTcQQ9PNQS14=","subject":"CN=CFCA EV OCA,O=China Financial Certification Authority,C=CN","subjectDN":"MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgRVYgT0NB","whitelist":false,"attachment":{"hash":"74214137d4d8e9fcca062824947ddab76b72e3385e4e90362d532dea748a76cf","size":1898,"filename":"Ub-bKk6h-qrzcElkX07080gHiz8CDNkXagA7GJtPu0I=.pem","location":"security-state-staging/intermediates/7b653369-09f2-4882-9c83-209a35b305e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ub+bKk6h+qrzcElkX07080gHiz8CDNkXagA7GJtPu0I=","crlite_enrolled":true,"id":"2f50d8ff-d71a-4851-afa7-4fb7a4e14792","last_modified":1562108416646},{"schema":1562108414362,"derHash":"3VusTxu1NWrpjT8MjiTFnfhBmaVvePHBYRlqrXAoMJQ=","subject":"CN=HARICA Qualified Legal Entities ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGbMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE1MDMGA1UEAwwsSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"a4cd0b48e010309b799dbe232f333f24ec85e074e6fd8da5a72edd0e25b44499","size":1414,"filename":"gEkeI7w_XC0tO__4tVBt-LIgmfNb_WGyHCLBVLOc6dM=.pem","location":"security-state-staging/intermediates/1a8c88f8-0214-411b-ba36-7189845bcd0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gEkeI7w/XC0tO//4tVBt+LIgmfNb/WGyHCLBVLOc6dM=","crlite_enrolled":false,"id":"c6f7214a-3948-4a66-9853-a1cd614541b8","last_modified":1562108415116},{"schema":1562108410570,"derHash":"YHXaXOzRXWWExVYDItXAn8IZnlLep5IdkQQKp1JIZy4=","subject":"CN=NCC Group Secure Server CA G2,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcy","whitelist":false,"attachment":{"hash":"f12f3260268153b74fe5f7a70e593d2e60ab8a06d81aedc45bbc58dfba23d7b3","size":1593,"filename":"I00VnH3kFOOpwcnmh-WRlnA_EFwJgSkqGVgxV5O2veg=.pem","location":"security-state-staging/intermediates/8e1d6726-9296-4299-8659-1eaa656eb71c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I00VnH3kFOOpwcnmh+WRlnA/EFwJgSkqGVgxV5O2veg=","crlite_enrolled":true,"id":"9690b65c-a95f-41d0-b2fb-794178af9721","last_modified":1562108411311},{"schema":1562108409064,"derHash":"JBE2Mn3ArshJc9H6my0NwCd5cDeuPtZUVk47hfx9siE=","subject":"CN=AffirmTrust Commercial Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgQ29tbWVyY2lhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"3d38da18b7f343201573fda5c10ce7e844328f110190ddaa3e93682e93c4f324","size":1581,"filename":"cP3S-p60iPGa8-tLw-iQ2NE3CAx2vu0EeyZs6EXiCyo=.pem","location":"security-state-staging/intermediates/e3f6fafa-7ce4-4548-9824-9e111896a9f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cP3S+p60iPGa8+tLw+iQ2NE3CAx2vu0EeyZs6EXiCyo=","crlite_enrolled":false,"id":"c5710470-cd77-44c2-83de-2a5580439c6a","last_modified":1562108409809},{"schema":1562108407555,"derHash":"TLXLcF1JUkl7TtfEaoVk6lyRNyefOMhre8qOiIOGiwk=","subject":"CN=Atos TrustedRoot Client-CA 2012,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTIxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"237c2a98d0510ae3a9b74e7c36f58c7ec853417862f70d9eb1c558c23bcff6d9","size":1544,"filename":"QmoGZPrbEdG8ih-gUVH1279QqNMzEBlTyT6SsmZm4wo=.pem","location":"security-state-staging/intermediates/33f056bb-fc6e-4125-8eda-19f374d949e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QmoGZPrbEdG8ih+gUVH1279QqNMzEBlTyT6SsmZm4wo=","crlite_enrolled":false,"id":"44de3fa2-feb4-4729-b8cc-b010e83aeb80","last_modified":1562108408307},{"schema":1562108406771,"derHash":"YrSPUeWGhnb9ebndnbmLqShJS6c0QDxYM5PELOAK1Eg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,OU=VALID SSL DV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIERWMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"de35a9e8e654d603d0f474837e0d281de2ee85cb77fc4e646d172e507ed6d447","size":1886,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/f3d5b520-757c-47d4-ad47-ad1a07b45316.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"bee64529-5dc9-4da4-a777-437f3b51e31b","last_modified":1562108407547},{"schema":1562108404463,"derHash":"uITtZSdDNodifTUVfpBGkNLf9qXc084me7rxWcBvUFQ=","subject":"CN=Qualified e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MH4xCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEjMCEGA1UEAwwaUXVhbGlmaWVkIGUtU3ppZ25vIENBIDIwMDkxHzAdBgkqhkiG9w0BCQEWEGluZm9AZS1zemlnbm8uaHU=","whitelist":false,"attachment":{"hash":"bf48fc2c3b14d73b262a97912ba1131615bfc904ad5308aa6b2e6cf791f65740","size":1756,"filename":"Z91mM3fIfALcmTPBS54fQeHpI3uGuUg9kgkk7DDv-Fc=.pem","location":"security-state-staging/intermediates/177a6f68-3005-4b93-8a1d-b32344504ae0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z91mM3fIfALcmTPBS54fQeHpI3uGuUg9kgkk7DDv+Fc=","crlite_enrolled":false,"id":"88820ee2-60db-4e83-807f-ac34e6f6689a","last_modified":1562108405220},{"schema":1562108402917,"derHash":"pfL9DWbbTdd6KRTtPHR8vZfnNM9OK28hf7QapOr96tI=","subject":"CN=NetLock Min\u0151s\u00edtett Eat. Spec. (Class Q Legal Spec.) Kiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG3MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFFMEMGA1UEAww8TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiBTcGVjLiAoQ2xhc3MgUSBMZWdhbCBTcGVjLikgS2lhZMOz","whitelist":false,"attachment":{"hash":"960b0e99960f66aedab8032a321d21b1ee47b83c0bf8a84a35997f846a5cb818","size":2203,"filename":"ZFsXBjpAqEkgk5r4JAL_ikmxkDiIWah9rrr4UEJ-IYE=.pem","location":"security-state-staging/intermediates/f4f080e9-09db-4a3b-b6ca-670808743e87.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZFsXBjpAqEkgk5r4JAL/ikmxkDiIWah9rrr4UEJ+IYE=","crlite_enrolled":false,"id":"b99f664a-470e-47f9-8280-2596d76a8af8","last_modified":1562108403692},{"schema":1562108402151,"derHash":"Gu3a3cHtdIVD6vWWDflq1R4hoxZPMKBkDLBzI2XTkGI=","subject":"CN=DigiCert Direct Non-Provider CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IERpcmVjdCBOb24tUHJvdmlkZXIgQ0E=","whitelist":false,"attachment":{"hash":"d70798a706e24279bc01aec7ee38e8a6f268c696909fd27a60301559bd6cac7c","size":2028,"filename":"P-Xat14QLgbjUjCT7mpCpRhoSz0DbCWgcxqMJ-N0cF4=.pem","location":"security-state-staging/intermediates/bda76267-a787-4598-8441-1baec31cfa9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P+Xat14QLgbjUjCT7mpCpRhoSz0DbCWgcxqMJ+N0cF4=","crlite_enrolled":false,"id":"baa93922-a81d-4284-9799-aba68348f2b1","last_modified":1562108402909},{"schema":1562108399777,"derHash":"D2ctkqCwbO6UjwOyclAmAsbjfSoq1pSjHV3jExlukoI=","subject":"CN=Certum Digital Identification CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGKMQswCQYDVQQGEwJQTDEiMCAGA1UECgwZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECwweQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDDCVDZXJ0dW0gRGlnaXRhbCBJZGVudGlmaWNhdGlvbiBDQSBTSEEy","whitelist":false,"attachment":{"hash":"dba1fd363ac38cad212628cf7ec587f5e6478eb1b348d0b671e2f4ecad1116ce","size":1731,"filename":"QdcqIv2OPNsD75w32d9tMDyai2-ClzSRt_49i0WYwbU=.pem","location":"security-state-staging/intermediates/a1b2a835-7618-44f6-a32a-dbdc1ae40941.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QdcqIv2OPNsD75w32d9tMDyai2+ClzSRt/49i0WYwbU=","crlite_enrolled":true,"id":"8110be87-231b-42a7-80a7-db15071d3b5a","last_modified":1562108400573},{"schema":1562108396760,"derHash":"OFE1qxjdGQoDvMBgGspvg86jZmQnkevgov2wWcL3dQo=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,OU=VALID AlphaSSL,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGtMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEXMBUGA1UECxMOVkFMSUQgQWxwaGFTU0wxJDAiBgNVBAoTG1ZBTElEIENFUlRJRklDQURPUkEgRElHSVRBTDE1MDMGA1UEAxMsVmFsaWQgQ2VydGlmaWNhZG9yYSBEaWdpdGFsIEFscGhhU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"1d845c0c12f1aa29e304d16f0a848dd922bec000e52dd07fd07e93aa887204fb","size":1894,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/ddbf549d-2f5c-4a1f-838b-8b58934c19ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"1b4a7649-9862-4267-8efa-0fe6bf75a335","last_modified":1562108397499},{"schema":1562108393006,"derHash":"WUXcU0sLHzdzXVrtTrXWZBcvKFruYKnnsYJFqg4RmPY=","subject":"CN=FujiSSL SHA2 Domain Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHUxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKzApBgNVBAMTIkZ1amlTU0wgU0hBMiBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"e26de9b3dc4701004f0c895f5950b7c3b99233b7974b7618e6c960f0736fd2ed","size":2138,"filename":"vaPiW3esM9sfzdxIpWhz2dO053le6lZAjqtv-y_vZN8=.pem","location":"security-state-staging/intermediates/c8cb6374-215c-4f0c-bd04-6477b7579404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vaPiW3esM9sfzdxIpWhz2dO053le6lZAjqtv+y/vZN8=","crlite_enrolled":false,"id":"16682234-e483-4e72-9b5a-9a6efd36c796","last_modified":1562108393755},{"schema":1562108391480,"derHash":"ThB8mBtCrL5BwBBn4W1E22SBTUGT5XIxfqBLh8ecR18=","subject":"CN=Microsoft IT TLS CA 2,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgMg==","whitelist":false,"attachment":{"hash":"fa0452ec65893af4305ad26caace601ac42397ffc2e9e076caf9a35747718fb4","size":2036,"filename":"wBdPad95AU7OgLRs0FU_E6ILO1MSCM84kJ9y0H-TT7s=.pem","location":"security-state-staging/intermediates/c642cb8e-2b2e-4332-a8a6-2d5d2c3b16d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wBdPad95AU7OgLRs0FU/E6ILO1MSCM84kJ9y0H+TT7s=","crlite_enrolled":true,"id":"e5c4430f-8a00-49dd-acc5-6d71f306197e","last_modified":1562108392249},{"schema":1562108389969,"derHash":"yeQPToM5bzSnyGGBe07as9wfi6xpn9UMsmH6kSPVXvQ=","subject":"CN=SwissSign Personal Silver CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxMDAuBgNVBAMTJ1N3aXNzU2lnbiBQZXJzb25hbCBTaWx2ZXIgQ0EgMjAxNCAtIEcyMg==","whitelist":false,"attachment":{"hash":"8b3dff1c600553b50452dcbd5783cbfaa219a177d66705c2de0f41eb51b439a5","size":2398,"filename":"m0Mz3XVaph4DGN-UfcVV7i83DtSCwW0evxwDvZf_j18=.pem","location":"security-state-staging/intermediates/2b6e11e8-fc81-45eb-9865-4123414df1e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m0Mz3XVaph4DGN+UfcVV7i83DtSCwW0evxwDvZf/j18=","crlite_enrolled":true,"id":"59ced421-04b9-4022-85c6-56f10093da01","last_modified":1562108390730},{"schema":1562108387700,"derHash":"O7dLHmfyh2k2ivEdxJmzH04EWaeG87DYSbautZ0JJAI=","subject":"CN=SSLs.com ECC OV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gRUNDIE9WIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"4939e1795fca3391bc0db9bc8f5811b9b0e674f81acfea9231d664951a81cb88","size":1293,"filename":"8OVFe7aea8Jz58DI1YaYq0kntK7F4fquqS_LHwOMg5o=.pem","location":"security-state-staging/intermediates/495221d4-c8f4-46e1-af68-9c7206d5a087.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8OVFe7aea8Jz58DI1YaYq0kntK7F4fquqS/LHwOMg5o=","crlite_enrolled":false,"id":"e7f1ddc8-069b-4e0c-bc6d-e01d625d6a08","last_modified":1562108388457},{"schema":1562108386186,"derHash":"wwglzEhNigQOU88UmxrJfd23UxuquaApSZVd0ZOpI00=","subject":"CN=MilleniumSign Client Certificate CA RSA,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBSU0E=","whitelist":false,"attachment":{"hash":"a54a84bb2453ebc048576af4fc423e61caeb9cdcd2fda841b2f06fa4c827ce22","size":2576,"filename":"hOFjGAY71ZLu8PPt7a2bECwp5eQ64MVhmY-YMuRoz9g=.pem","location":"security-state-staging/intermediates/16d6a3de-3853-4c67-bfb2-b55faf4ac55d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hOFjGAY71ZLu8PPt7a2bECwp5eQ64MVhmY+YMuRoz9g=","crlite_enrolled":false,"id":"b5e87096-07f0-434a-a474-cca6d773c227","last_modified":1562108386929},{"schema":1562108385424,"derHash":"LYGa85fiidxBcJxKr22jsZBHScN6mVhgdFgDcW19VpA=","subject":"CN=Greek Federation of Judicial Officers Client SubCA R1,O=Greek Federation of Judicial Officers,L=Athens,C=GR","subjectDN":"MIGOMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMS4wLAYDVQQKDCVHcmVlayBGZWRlcmF0aW9uIG9mIEp1ZGljaWFsIE9mZmljZXJzMT4wPAYDVQQDDDVHcmVlayBGZWRlcmF0aW9uIG9mIEp1ZGljaWFsIE9mZmljZXJzIENsaWVudCBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"0906c63c05fc31a8f79768dd10295ea5c4df3a910c3c3f60bacd569952f373aa","size":2653,"filename":"sUxJeFBsILOAdDVzCbynXcS6cAmOTI2zpF9_nG1gGVA=.pem","location":"security-state-staging/intermediates/ffb8f4dd-ad63-4ca3-a907-f70c1586c828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sUxJeFBsILOAdDVzCbynXcS6cAmOTI2zpF9/nG1gGVA=","crlite_enrolled":false,"id":"6d3f8d5a-8bd5-4e16-a08b-1dd8bcf34dee","last_modified":1562108386178},{"schema":1562108383131,"derHash":"wG4wf3z8HTL6cqTAM8h7kAGa8hbwd11kl4ouymyKIw4=","subject":"CN=GeoTrust TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"79eaef52d1cceae208d6f4e81408cb6e81bd7358789d8d112f8acbab4bbf4f9c","size":1638,"filename":"SDG5orEv8iX6MNenIAxa8nQFNpROB_6-llsZdXHZNqs=.pem","location":"security-state-staging/intermediates/bbd8d31a-289d-443b-8947-9b039ab58447.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SDG5orEv8iX6MNenIAxa8nQFNpROB/6+llsZdXHZNqs=","crlite_enrolled":true,"id":"7c77748b-8cf1-488f-82d1-6b8f1e0d0a79","last_modified":1562108383872},{"schema":1562108376267,"derHash":"gi49jOlkYrTRnLaqwvzW0BvIAvknqYgBvuQaYAar2wg=","subject":"CN=MilleniumSign for Code Signing,O=MilleniumSign Limited,C=MU","subjectDN":"MFYxCzAJBgNVBAYTAk1VMR4wHAYDVQQKDBVNaWxsZW5pdW1TaWduIExpbWl0ZWQxJzAlBgNVBAMMHk1pbGxlbml1bVNpZ24gZm9yIENvZGUgU2lnbmluZw==","whitelist":false,"attachment":{"hash":"0e4a98b456f055fcf5a701286182d62ceff18ce1934e29b1deadf3935437f5e0","size":2410,"filename":"qlXmtrIuqV9vnNsJSci6M_sJhZlMGXPnHJYHEN04TTk=.pem","location":"security-state-staging/intermediates/63c67f55-7a99-421c-b700-926ab61fe6a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qlXmtrIuqV9vnNsJSci6M/sJhZlMGXPnHJYHEN04TTk=","crlite_enrolled":false,"id":"9d070cd0-86dd-4c32-85c2-3a3f935d9318","last_modified":1562108377012},{"schema":1562108373975,"derHash":"DXcmr9BKeUiHGS2L5nVUxnqWJrZ8aYlrarFNk7b1IIY=","subject":"SERIALNUMBER=201813,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEz","whitelist":false,"attachment":{"hash":"25d4248de319a28014ec0cf686ef1ddc39672abf62dc8c4f119a8b5b211c5176","size":2333,"filename":"gROmlz_cKoI7EYRQWxyKlftDUTbm3X5KMEAtOpzPXcU=.pem","location":"security-state-staging/intermediates/b5542973-393c-4d34-aecf-bc7d0c94f780.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gROmlz/cKoI7EYRQWxyKlftDUTbm3X5KMEAtOpzPXcU=","crlite_enrolled":false,"id":"65a12163-eb84-4ce9-b597-ed03a1cda6e8","last_modified":1562108374721},{"schema":1562108373221,"derHash":"zXQZjUwj5HAd6leYkjIbnk9HoIvYN0cQuJmq0UlaSzU=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"8f2caf097fcff03e0699cc947be66db51b738d2ae4d9481b13fef2c166fac062","size":2487,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/1cf6f683-a938-4991-9e52-8f8c6761d4a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"9e8d85f9-dacd-4a25-bb9f-968c95b025bb","last_modified":1562108373967},{"schema":1562108370940,"derHash":"BhmQXJLK7Il4jbVXqxd7CkzVBTHj7Vfyc3C37I2sG1o=","subject":"CN=CEDEFOP CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MGsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEWMBQGA1UEAxMNQ0VERUZPUCBDQSBSMQ==","whitelist":false,"attachment":{"hash":"595d6d2bf45a14ddc1ffd60f66b695249fe00d29fb53b62b1e1bcc2e0a9331d6","size":2853,"filename":"YuB-mSHGYquM5m3YPwjXfls_-AzEjXJZ5KYgzqCxIhA=.pem","location":"security-state-staging/intermediates/ba1f239b-a655-4016-97f1-a4013595e819.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YuB+mSHGYquM5m3YPwjXfls/+AzEjXJZ5KYgzqCxIhA=","crlite_enrolled":true,"id":"17daabb6-2075-4349-9159-d5089bab2f15","last_modified":1562108371712},{"schema":1562108369419,"derHash":"50ZE9Gzd7kcfz81lSMXzM9vRIspKTmfWUtWxaZ4Udnk=","subject":"SERIALNUMBER=201808,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA4","whitelist":false,"attachment":{"hash":"5ed7b09bd6e807a0a0a1b54c2def32df4bd844cc32727d659412c47d8d7300ee","size":2333,"filename":"bVohMFSMdT-k3psWkA0KlSPrIugikcLKV_UR1XtURGc=.pem","location":"security-state-staging/intermediates/343127c6-0767-4e2a-b078-bb03764a6aeb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bVohMFSMdT+k3psWkA0KlSPrIugikcLKV/UR1XtURGc=","crlite_enrolled":false,"id":"cfed6e41-e0df-488e-942e-aa80872d1f16","last_modified":1562108370177},{"schema":1562108368659,"derHash":"8i22V6GpKYQavKxSZxpc7op9BpWGr4XOFt4rBd2iIlI=","subject":"CN=KPN BV PKIoverheid Organisatie Services CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHMxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExODA2BgNVBAMML0tQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"55c902d78023e31283d149be854a3bbbbc37c60fa0b2039ba9f502851c94e5a3","size":2658,"filename":"R1jl1Axf32rFh-a9lHscwaUbU7s51_fPXWqGaLybSy4=.pem","location":"security-state-staging/intermediates/8a71784b-c95a-4df8-8a2d-fbb12104a39d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R1jl1Axf32rFh+a9lHscwaUbU7s51/fPXWqGaLybSy4=","crlite_enrolled":false,"id":"373e81fd-20d6-4770-afa2-1ca53260afa4","last_modified":1562108369411},{"schema":1562108367880,"derHash":"UH22DSY9PQnSg94uOqQ139h3XlK8M1cC44Mru1fsHL0=","subject":"CN=UZI-register Zorgverlener CA G3,O=CIBG,C=NL","subjectDN":"MF8xCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEoMCYGA1UEAwwfVVpJLXJlZ2lzdGVyIFpvcmd2ZXJsZW5lciBDQSBHMw==","whitelist":false,"attachment":{"hash":"075195032f66084393a80e78ea0276fb17f7871b6e35672e94580ec0b3e8eca5","size":2552,"filename":"LJbktDpUTtQFxix-TH4PidTGLrt1SGxWZUTWK8SCn9Q=.pem","location":"security-state-staging/intermediates/b35760a9-b8ff-4af3-a942-4c05ac26f0ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LJbktDpUTtQFxix+TH4PidTGLrt1SGxWZUTWK8SCn9Q=","crlite_enrolled":false,"id":"fcc67e61-43b8-4146-9df6-e8af510e8ca5","last_modified":1562108368651},{"schema":1562108366331,"derHash":"R7LvvDZw59tLQfIsUfwC7oT7Lb8wgqSfLCaIEi6SEKE=","subject":"CN=emSign SSL CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGYxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRswGQYDVQQDExJlbVNpZ24gU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"99a70855fffb043bc441083724ab6299ce68f28ce7c76547b9782e13a92d30ce","size":1622,"filename":"qvzNg6-PS7JbCFR-FL-eAfFZOiN6pXXsH1tc9auHlF8=.pem","location":"security-state-staging/intermediates/bc26b3e5-5243-4ed4-89a5-ee29b7471158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qvzNg6+PS7JbCFR+FL+eAfFZOiN6pXXsH1tc9auHlF8=","crlite_enrolled":true,"id":"136071c8-bc0a-49f6-9eed-0f027892d327","last_modified":1562108367113},{"schema":1562108365569,"derHash":"01M7cypRim2mjvJmCF4R39EUwOsAks1DUwpE1UuRPtE=","subject":"CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"93b4a44bb6fe2449a59754db745e41e1157b80bf49f3c2f364ac5f13eaca7195","size":1662,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/23ace4b9-0495-4126-8dd9-71f058704b6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"3901ad61-ba32-4e7e-985a-e7e654c02bf8","last_modified":1562108366323},{"schema":1562108364782,"derHash":"odJdKJQfr8DCpuueWWpUeG5zHQpKjjIdufHPLCT91gk=","subject":"CN=Actalis Authentication CA G3,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ8wDQYDVQQIDAZNaWxhbm8xDzANBgNVBAcMBk1pbGFubzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxJTAjBgNVBAMMHEFjdGFsaXMgQXV0aGVudGljYXRpb24gQ0EgRzM=","whitelist":false,"attachment":{"hash":"460a8caeba0a48e1b86b9aa61e29fe8358616f76304f1fbd67cb2527e77b9037","size":2243,"filename":"qqFYlKc1lGtPZDV3-S2Iiq7okt-fD5tWC2AM1QEBmEg=.pem","location":"security-state-staging/intermediates/8b0fb3aa-de5c-498b-ab03-3d295c24ca08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qqFYlKc1lGtPZDV3+S2Iiq7okt+fD5tWC2AM1QEBmEg=","crlite_enrolled":true,"id":"0fdbe9d5-d2f3-4438-9a51-df510e92865a","last_modified":1562108365561},{"schema":1562108363263,"derHash":"2TUmaeKTSTKa9HRcVabBWdyXmrdFklFwoZgGaDgqy8A=","subject":"CN=Trusted Secure ECC Certificate Authority,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTExMC8GA1UEAxMoVHJ1c3RlZCBTZWN1cmUgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"cfc396ec00d40088987be5a9ba74a98ac12898fa4a619448bddb134a79e30a67","size":1325,"filename":"qk3cnu1avJacTvFxrZGIIPiymx-oSzPLYsolI21B5Vc=.pem","location":"security-state-staging/intermediates/af01c122-e4e5-4b49-94d0-0ac4f64457b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qk3cnu1avJacTvFxrZGIIPiymx+oSzPLYsolI21B5Vc=","crlite_enrolled":true,"id":"7a73afd8-6e01-43c6-b272-bf633048a56e","last_modified":1562108364018},{"schema":1562108362489,"derHash":"Z5dDYhTv7mfN59cDWNTYsA37941ch8YrSn55DXPde9k=","subject":"CN=DigiCert Federated ID US L4 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJzAlBgNVBAMTHkRpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBVUyBMNCBDQQ==","whitelist":false,"attachment":{"hash":"339cbbd71fc5cd220030216ee58f63f6971ca0554de6c15b8e71f2baa14c5b3f","size":1930,"filename":"B8z1mybAVZ9w8W-4h2REOU9xSFadYswGsHsY67HszP8=.pem","location":"security-state-staging/intermediates/baed048b-daf3-4094-8898-29a31f22df0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B8z1mybAVZ9w8W+4h2REOU9xSFadYswGsHsY67HszP8=","crlite_enrolled":false,"id":"3326c102-8dd1-4eb1-aa2d-5c7f1b62cb2f","last_modified":1562108363256},{"schema":1562108360956,"derHash":"AqtX5OZ6DLSN0v80gw6KxA9EdvsIymvj9c2Eb2RoQPA=","subject":"CN=COMODO RSA Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE2MDQGA1UEAxMtQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"39df71b20e752359b043877384440f181016fcba83909d1f0480b6b13d1238b7","size":2150,"filename":"klO23nT2ehFDXCfx3eHTDRESMz3asj1muO-4aIdjiuY=.pem","location":"security-state-staging/intermediates/e401cab5-bdc2-42ca-a7cd-4612737cdb04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"klO23nT2ehFDXCfx3eHTDRESMz3asj1muO+4aIdjiuY=","crlite_enrolled":true,"id":"85dd2e16-bfc0-4ca0-8489-e28bc98da7e2","last_modified":1562108361731},{"schema":1562108355542,"derHash":"ufIWQyNjjc4LkiGLQ8QcGysmljiTKdsZ9c961Jtcs3I=","subject":"CN=Gandi Standard SSL CA 2,O=Gandi,L=Paris,ST=Paris,C=FR","subjectDN":"MF8xCzAJBgNVBAYTAkZSMQ4wDAYDVQQIEwVQYXJpczEOMAwGA1UEBxMFUGFyaXMxDjAMBgNVBAoTBUdhbmRpMSAwHgYDVQQDExdHYW5kaSBTdGFuZGFyZCBTU0wgQ0EgMg==","whitelist":false,"attachment":{"hash":"8b8a18be1cbca4662145d1b20e4f1e0f1394d7a0bcacd4d74108106348147956","size":2109,"filename":"WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV-nNm1r4=.pem","location":"security-state-staging/intermediates/63de5a2b-d709-4e92-b743-8310ba76d460.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=","crlite_enrolled":true,"id":"75d81643-efbd-4a64-a1d1-bc45d79dc4bc","last_modified":1562108356326},{"schema":1562108354774,"derHash":"CU94xT7F2AgrxdWq0bEdXflSvlaTM1jb9ZY1QpE6UM0=","subject":"CN=HARICA Qualified Natural Entities SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAwwqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"ed8b5c559e2fdf67dc679531bb2002bd0c1dcf26404c524d1707664a75852b12","size":2605,"filename":"ac0teCLoYEgCWHxksbpmW-G4cqCFgOJn4OxagiS1C-8=.pem","location":"security-state-staging/intermediates/b83579aa-a5ff-4575-adac-59e8ff66b1ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ac0teCLoYEgCWHxksbpmW+G4cqCFgOJn4OxagiS1C+8=","crlite_enrolled":false,"id":"edaf0f56-3588-493d-821d-fd24d28bc8c8","last_modified":1562108355535},{"schema":1562108354022,"derHash":"KvmI8m9u8Nq5BVaX8JQftOXEIkfKmCgmiV7ymYXTDNY=","subject":"CN=Apple Public Server ECC CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIEVDQyBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"9965d9b518d900e8daeab6fe08b6e6227a1114bb092251f35ffa9176cc753453","size":1163,"filename":"jT8fGVx6BA9z4arxOCBTK2xfhH6Uhco7diQx-k5Yo38=.pem","location":"security-state-staging/intermediates/782181df-19dc-4eb7-bc29-2f853bbcd8f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jT8fGVx6BA9z4arxOCBTK2xfhH6Uhco7diQx+k5Yo38=","crlite_enrolled":false,"id":"fdfcd022-f30c-40bf-a845-ed9f60c08730","last_modified":1562108354766},{"schema":1562108353265,"derHash":"kMZx4I5oI7hkbC7BgCN2msD8NDijPBAfZoO5XeMYBSQ=","subject":"CN=COMODO ECC Extended Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGUMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE6MDgGA1UEAxMxQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"c9c170b80feb89e0a62d9e1bc3a6e7612dcba1cdbb90d3e362acefa08fbc39b8","size":1366,"filename":"8BVB_xN70KohDkSwXqSXWyZjE3Wl2yUIqPlb8CShV54=.pem","location":"security-state-staging/intermediates/89831d8e-226f-4cf8-8e53-94bbf49b2c8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8BVB/xN70KohDkSwXqSXWyZjE3Wl2yUIqPlb8CShV54=","crlite_enrolled":false,"id":"8544bcc4-1d96-4822-a172-bfaedf576aa9","last_modified":1562108354014},{"schema":1562108352498,"derHash":"bmzMzdeogw6iKI01dgUylUJcBfXunbS3JjKh4mnd0MM=","subject":"CN=United Parcel Service\\, Inc. RSA Codesigning CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjE3MDUGA1UEAxMuVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"4f65ee96ef6dbaf15ab703424d981e03c5b84da1123c789b217310553578e58a","size":2125,"filename":"RPhKvLLQGKteXTbVCCrOIPDyAFANSXGqusA4X-LA8NE=.pem","location":"security-state-staging/intermediates/5f7d9e0e-c92a-47cf-bd97-24ecd52cfb08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RPhKvLLQGKteXTbVCCrOIPDyAFANSXGqusA4X+LA8NE=","crlite_enrolled":false,"id":"cf08ce37-7a22-489d-80a6-bd86c0596d6b","last_modified":1562108353258},{"schema":1562108350087,"derHash":"GFwK5HBCO51GeKfBBVtbSNkHBVBbeU4hXAY4UTNpgfQ=","subject":"CN=GeoTrust EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"a0a4b49c90bff29d9b9a8c5f2ef42bb769f854311f7a16f1b9861161f8870867","size":1666,"filename":"yWulDX8E5Q0XG4-9jVDljmO2FvAVzIRhn2MppW4vyUM=.pem","location":"security-state-staging/intermediates/7f58a4e2-a3f0-4b3c-bce7-96138c4ad930.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yWulDX8E5Q0XG4+9jVDljmO2FvAVzIRhn2MppW4vyUM=","crlite_enrolled":true,"id":"da405d05-6b42-461a-ad4d-d8e77fcc80a3","last_modified":1562108350832},{"schema":1562108349322,"derHash":"XmCWWARGGTCsJ7bb40RWeerkExwir7iK96z2oZF7Wro=","subject":"CN=SecureTrust Domain Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHwxMjAwBgNVBAMTKVNlY3VyZVRydXN0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMRQwEgYDVQQKEwtTZWN1cmVUcnVzdDEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"808680a0c2b3da12440074c2cecf8ba7b7a50796c469c901bf2bae7963658f5d","size":1618,"filename":"3MJ7kgH4AG-ip6CMzIBTeYe9X-9dSxFjCbnEIuYJlWA=.pem","location":"security-state-staging/intermediates/cfd0f4ac-b77c-4563-aeb5-243676326507.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3MJ7kgH4AG+ip6CMzIBTeYe9X+9dSxFjCbnEIuYJlWA=","crlite_enrolled":false,"id":"9bc337d9-2ebf-4b9a-a405-087a0a528af3","last_modified":1562108350078},{"schema":1562108348554,"derHash":"96hOJOjg2JFUh0chxbZB9Ioe8P87GY9TvgIdtT8Je9A=","subject":"CN=GeoTrust Primary Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtHZW9UcnVzdCBQcmltYXJ5IElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"4de8a182cd4692f539e1d1dd8938d2138d6e2c5e38b08e367a1f5223133d6790","size":1670,"filename":"N-1Ur2ovpcaBJa_gbazCpyWohrWTdX7YCwfN2n8jSvQ=.pem","location":"security-state-staging/intermediates/87eb41dc-9c52-4580-ad5c-4a0b65a013eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N+1Ur2ovpcaBJa/gbazCpyWohrWTdX7YCwfN2n8jSvQ=","crlite_enrolled":false,"id":"ef45312a-79cb-4973-8c28-14dc799a414c","last_modified":1562108349314},{"schema":1562108347772,"derHash":"nwIC1JJY2uQREYrxPwVebQxuh239KUMJeiveVFI1YJg=","subject":"SERIALNUMBER=201906,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA2","whitelist":false,"attachment":{"hash":"6be84562c866325f09ab7303e3c1001be8bb3c68f97aaab49df216cedbbb00ab","size":2333,"filename":"NgK9fKJF5ODcUC7yeq9jYkJgOh_aHc2YrfRLKoa7i20=.pem","location":"security-state-staging/intermediates/092e8bca-4b27-4d32-ab96-d805edc41385.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NgK9fKJF5ODcUC7yeq9jYkJgOh/aHc2YrfRLKoa7i20=","crlite_enrolled":false,"id":"6b470922-d941-49d7-a9f2-333a66bd4a69","last_modified":1562108348545},{"schema":1562108344661,"derHash":"Cqny59lccYt9HrfM29AWToYFeunWaSK8YPmQP5Sg8O8=","subject":"CN=GlobalSign Qualified CA 3,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAz","whitelist":false,"attachment":{"hash":"71031147564393ba600fd320c83c634a774e41ba086cc8f9e545656fcdabcef3","size":2109,"filename":"Jq1QOk-soKGVmobJu53tx3FfjSDpUS8-6JHMIRiTfyY=.pem","location":"security-state-staging/intermediates/9f11ba63-2039-4037-aeaa-70bbf201813d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Jq1QOk+soKGVmobJu53tx3FfjSDpUS8+6JHMIRiTfyY=","crlite_enrolled":false,"id":"2566de5f-27d3-4c41-a2ac-70e1afaa43f0","last_modified":1562108345474},{"schema":1562108341582,"derHash":"uhMFYzTMdV9dJ6qwvpnly5cJ0DQ7QF4c5GlkMxu1xF8=","subject":"SERIALNUMBER=201722,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIy","whitelist":false,"attachment":{"hash":"6c705a1aa9f045020109076b1368ee11c791ad581eae0d24f9ab47fce2b136c8","size":2402,"filename":"RPN8fKuwvw-VE_LlASEpAHzv7y7CFqofIc36APwmf6U=.pem","location":"security-state-staging/intermediates/4ea45b42-7029-4fa2-9cfa-12aa1c0511dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RPN8fKuwvw+VE/LlASEpAHzv7y7CFqofIc36APwmf6U=","crlite_enrolled":false,"id":"fe9eaa47-9e17-4a54-93e3-7e3ede93033a","last_modified":1562108342333},{"schema":1562108339272,"derHash":"GPzgkvo93kVUIjrnmwxJmiD0EUw2MHnSPY6v3JZzk2k=","subject":"CN=eMudhra ECC Domain Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGVMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxNzA1BgNVBAMTLmVNdWRocmEgRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"201778bdc7d2f1a79fae87f89e7f3c87563fb5ae692e5bef6d8a17870194a3d0","size":1345,"filename":"-OTJ6M1upuT7uMaCSaNjlP_D0AMYrqjwUWCEue0H24E=.pem","location":"security-state-staging/intermediates/776486c5-65f5-4d53-a6e6-5d510795f51c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OTJ6M1upuT7uMaCSaNjlP/D0AMYrqjwUWCEue0H24E=","crlite_enrolled":false,"id":"7c0ed329-430c-4414-a659-6daec3ec0bc0","last_modified":1562108340038},{"schema":1562108336263,"derHash":"7AICWhoVeywCrEn1Wai2zwchJvg3lJn658Uu0YPakBI=","subject":"CN=WISeKey CertifyID SSL GB CA 1,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMQ==","whitelist":false,"attachment":{"hash":"91c04850b4728e964f0c7a22327101d5caa482b389819d5ea41e8347b3216573","size":1711,"filename":"V3yMbpIwzARH7Q8FlejONqe3Rck6-AsElwszbRCUyLw=.pem","location":"security-state-staging/intermediates/180c7361-b19f-476a-9846-dea89f9af2d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3yMbpIwzARH7Q8FlejONqe3Rck6+AsElwszbRCUyLw=","crlite_enrolled":true,"id":"9d6c25a5-7949-4e2e-8ac2-d9926d5afd5f","last_modified":1562108337008},{"schema":1562108335514,"derHash":"CKJ3P5CLieNfg9wnCvuLxl6NGS8N0ktSEWFxaNYN06s=","subject":"CN=University of Western Macedonia CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLjAsBgNVBAMTJVVuaXZlcnNpdHkgb2YgV2VzdGVybiBNYWNlZG9uaWEgQ0EgUjM=","whitelist":false,"attachment":{"hash":"07a622c0054b947f643760306b50788cd9b381b0bfd2964a2a8bd78522022944","size":2536,"filename":"Ju8opIlP7q0-XAVutfqY3EgIGywyoMGPTAIfDTzsO3g=.pem","location":"security-state-staging/intermediates/189eb95b-2376-4f85-9562-34baa90ec24b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ju8opIlP7q0+XAVutfqY3EgIGywyoMGPTAIfDTzsO3g=","crlite_enrolled":true,"id":"cd81df63-b9f1-4a6f-8aca-f1449a8779f7","last_modified":1562108336255},{"schema":1562108334757,"derHash":"gOE6LoAIR1GeAj1k9PnPILQ8rdHUa6SBHSas4x4pX7s=","subject":"CN=SECOM Passport for Member PUB CA2,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTI=","whitelist":false,"attachment":{"hash":"1602b83b6e798319142c013cdb2fe6a89a8b210d20430e1a52898b81763211ad","size":1581,"filename":"3kJ__srPn_Y0kPQ-6atqtlJmgndIlfmZnUwsK0S0epg=.pem","location":"security-state-staging/intermediates/fde92bcb-5acc-4c45-bd04-b6f99f59a57c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kJ//srPn/Y0kPQ+6atqtlJmgndIlfmZnUwsK0S0epg=","crlite_enrolled":false,"id":"48e148bb-b6f8-45af-8c91-54771ca04156","last_modified":1562108335506},{"schema":1562108332475,"derHash":"s5xKRZbTGRr6Oz0lTSjlxIL80NUA4Kkzf5knfLii7vg=","subject":"CN=TrustID Server CA A52,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR4wHAYDVQQDExVUcnVzdElEIFNlcnZlciBDQSBBNTI=","whitelist":false,"attachment":{"hash":"98d3cfa7dab9b95ecb8cc38637e485c249a12ae6ca445e96105f2708a82c09fa","size":2442,"filename":"baHWPQeCjK_t6GB-okH73C13ZXVDr2QAVt6jQTsq2Ys=.pem","location":"security-state-staging/intermediates/6d66de8a-8c0b-4ade-8054-7f91cdf6accb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"baHWPQeCjK/t6GB+okH73C13ZXVDr2QAVt6jQTsq2Ys=","crlite_enrolled":true,"id":"aa0a2c54-cd68-43b3-be06-0831027e3b6b","last_modified":1562108333245},{"schema":1562108330945,"derHash":"YXLXoZlsvvcaAYLdRLmenANXQqnr0DEapzqkczNExaY=","subject":"CN=CloudFlare Inc ECC CA-2,O=CloudFlare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRGbGFyZSwgSW5jLjEgMB4GA1UEAxMXQ2xvdWRGbGFyZSBJbmMgRUNDIENBLTI=","whitelist":false,"attachment":{"hash":"847a716b6f6114e3d4f88a0a3e8e573fce99330a3de33aadc98997578166aad9","size":1321,"filename":"3kcNJzkUJ1RqMXJzFX4Zxux5WfETK-uL6Viq9lJNn4o=.pem","location":"security-state-staging/intermediates/2aee9ab7-0837-4213-bf07-b65e7a210ea5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kcNJzkUJ1RqMXJzFX4Zxux5WfETK+uL6Viq9lJNn4o=","crlite_enrolled":true,"id":"4f654672-7696-4bd6-84a2-503a66c6cfe4","last_modified":1562108331718},{"schema":1562108330185,"derHash":"chMOOyiQA0khRhf01vP7hdCEde54vwlcWUWKFNGCiGY=","subject":"CN=Amazon,OU=Server CA 2A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAyQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"2a82794488d990d2916a320c0881fba10016362c3188bf9954c30bf6848d39ec","size":2235,"filename":"G9pa__g3gTgL9wgZj599LbHgZ_FLuep7rnCqwLAwXns=.pem","location":"security-state-staging/intermediates/83918488-ba2c-4ac0-8d46-0bf63d394383.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G9pa//g3gTgL9wgZj599LbHgZ/FLuep7rnCqwLAwXns=","crlite_enrolled":false,"id":"b35b0a67-1556-41a4-a319-97a50209d163","last_modified":1562108330937},{"schema":1562108327127,"derHash":"ykOJyJ3fwxvsJsdLRKhJjFiy2DhRb6AbFPE5NinlikA=","subject":"CN=AffirmTrust Certificate Authority - DV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIERWMQ==","whitelist":false,"attachment":{"hash":"24062c77649490466b59b727862356b7b091396ef80b8d336e7a301146304ddf","size":1662,"filename":"68BRY3XqvlKubfNnBJ64F_17BHUniDemUwxZNNvfdaA=.pem","location":"security-state-staging/intermediates/4683bd6d-bd49-4e42-b154-69a18d94d8c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"68BRY3XqvlKubfNnBJ64F/17BHUniDemUwxZNNvfdaA=","crlite_enrolled":true,"id":"dcda7a02-af57-41d8-9206-72360ea3f7c1","last_modified":1562108327880},{"schema":1562108325586,"derHash":"Go15Cvmys0191q9htapM8TgLhglcusK8qzW9Vm0BgMM=","subject":"CN=Secure Site Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIlNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"8c560a22b1260bcb7f9b8c62c6d191f6064d6125f0146ef483820a79ada1e21a","size":1687,"filename":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem","location":"security-state-staging/intermediates/d890ff8b-cd56-49f2-b11e-4effc32732b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=","crlite_enrolled":true,"id":"2bbb4638-a2e8-488a-919c-7ebe87b2d089","last_modified":1562108326359},{"schema":1562108324809,"derHash":"4fLpUAD4FeEcgUkEMLXQLI2B0NJWyF32i1FtbCd2GSY=","subject":"CN=SECOM Passport for Web EV 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIEVWIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"11b2cc7c19c9ea658d73d93b55ba2118401c64553f83df52d6c23d8bb092eba4","size":1618,"filename":"Wa2FjlVfGKwvkiH0LYWh-y-ihHlaTmVQ-gqZEsR3RwY=.pem","location":"security-state-staging/intermediates/13abab2d-5558-442e-9c8c-9f54f283182e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wa2FjlVfGKwvkiH0LYWh+y+ihHlaTmVQ+gqZEsR3RwY=","crlite_enrolled":true,"id":"7310f222-43d0-494d-aa65-443d9a816261","last_modified":1562108325576},{"schema":1562108324028,"derHash":"cjdtWQ2aZl05alHSrqkzRjj9SxPW9emTKYMi80Tyt54=","subject":"CN=TrustSign ECC DV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"c7de9b26efc4eb3648124f025156bdbc60d2ee4df9bc5f2b40e0f3889a11aa13","size":1276,"filename":"DuV9kinKceC5mT-5PkiRrL4kz_gqWVCOloO5GTLSA8I=.pem","location":"security-state-staging/intermediates/829cc9be-f9c4-483a-8537-7de6820e7357.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DuV9kinKceC5mT+5PkiRrL4kz/gqWVCOloO5GTLSA8I=","crlite_enrolled":false,"id":"cd8781e3-476c-41fc-b598-6657d68d188e","last_modified":1562108324796},{"schema":1562108323189,"derHash":"SytyugviemNHjCc6DFtS9puJ42marU86Gg6v5muZUmU=","subject":"CN=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda. RSA EV CA,OU=Controlled by COMODO exclusively for MarketWare,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIHxMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xODA2BgNVBAsTL0NvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBNYXJrZXRXYXJlMUcwRQYDVQQDDD5NYXJrZXRXYXJlIC0gU29sdcOnw7VlcyBwYXJhIE1lcmNhZG9zIERpZ2l0YWlzLCBMZGEuIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"43c29684fc1791cf7a701d66ef4aad6b8f263f4f9493176e519013a2a3477626","size":2341,"filename":"qCF-PPuByTYruFr6MIeAiLpr2ebZPZHBVpg73sPCJwI=.pem","location":"security-state-staging/intermediates/9baba706-ea2c-4038-ab33-bc9d68d0a446.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qCF+PPuByTYruFr6MIeAiLpr2ebZPZHBVpg73sPCJwI=","crlite_enrolled":true,"id":"df37aefa-7686-4f4a-add4-d68ea15fb1a2","last_modified":1562108324019},{"schema":1562108321668,"derHash":"OXFmwBiQoBUCgI2sxcjf1L8v383BpqzDyxQh2WzzOP0=","subject":"CN=Servision Certification Authority,O=Servision Inc.,C=JP","subjectDN":"MFIxCzAJBgNVBAYTAkpQMRcwFQYDVQQKEw5TZXJ2aXNpb24gSW5jLjEqMCgGA1UEAxMhU2VydmlzaW9uIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"b4a562f44b51aeba750b02340947d52861ec82d00fb13a3c4dba87c57c923205","size":1504,"filename":"kWvg0ZVt3GHilKKOdxJccr8EU2CMQ_ITo4JOlWmPamo=.pem","location":"security-state-staging/intermediates/dd6d3c00-964b-4bdf-8c35-9a318050af9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kWvg0ZVt3GHilKKOdxJccr8EU2CMQ/ITo4JOlWmPamo=","crlite_enrolled":false,"id":"ccf0f9ed-32a8-4b69-bdeb-0fb197d51839","last_modified":1562108322404},{"schema":1562108320882,"derHash":"jNWR8zFL1XusdLP67i1wRxtdmWpP4ZfmQ4Crr56LMTM=","subject":"CN=Trend Micro S2 CA,O=Trend Micro Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxGjAYBgNVBAMMEVRyZW5kIE1pY3JvIFMyIENB","whitelist":false,"attachment":{"hash":"660470ac98e8eeae43c687e25c3224ed8bd61fa05d1c8a53bdd72e466955e2f4","size":1609,"filename":"BuGwKUFbAtZDGEd6cE3s5OqR23M2h4ZmIiGT_aw3TpM=.pem","location":"security-state-staging/intermediates/5e931958-8e44-432d-ba06-12c98f350199.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BuGwKUFbAtZDGEd6cE3s5OqR23M2h4ZmIiGT/aw3TpM=","crlite_enrolled":false,"id":"81f56af1-98ca-4c3e-89b4-27e8810e31fe","last_modified":1562108321659},{"schema":1562108319370,"derHash":"kdAFBjP2JXL2eWFIhnZE7jEUCtciZuD5MFp8b9QED58=","subject":"CN=COMODO ECC Domain Validation Secure Server CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDM=","whitelist":false,"attachment":{"hash":"32e13862aeb900961956b459740f0146d3e1e95489bfd8fad22c21965d884d6e","size":1317,"filename":"yRx6JkdTon5X6I6GmE6-8BL0QUZRKbcRvDM_vt2Beyg=.pem","location":"security-state-staging/intermediates/cd53a4d9-0989-4748-90f0-77a5b878e898.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yRx6JkdTon5X6I6GmE6+8BL0QUZRKbcRvDM/vt2Beyg=","crlite_enrolled":false,"id":"9e611c86-fc3a-4ab7-b7e5-7c09eb2cf86a","last_modified":1562108320119},{"schema":1562108317833,"derHash":"VMP1AQQs3MCa6BQ8sZK9XlckyciKarOVqUoaevwmznw=","subject":"CN=DigiCert Federated Healthcare CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEZlZGVyYXRlZCBIZWFsdGhjYXJlIENB","whitelist":false,"attachment":{"hash":"fa3f2859e516d877140c95ce6b6cfcc20adcc0576479bd8660cd9467da8d8558","size":2182,"filename":"flPZhpoPaXju4AbnPIUI-vdHW4h2ksR2LklMnV9MpzE=.pem","location":"security-state-staging/intermediates/df4a48bc-c9d4-4f52-9280-98ca919d2d3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"flPZhpoPaXju4AbnPIUI+vdHW4h2ksR2LklMnV9MpzE=","crlite_enrolled":false,"id":"8e0543db-7ee5-46cb-b691-0ecaa2627aa2","last_modified":1562108318607},{"schema":1562108317082,"derHash":"NyuPTOc77fyIcYxAe7az5tj5p5vpVxkNDnEBx7DvmjI=","subject":"CN=NetLock Expressz (Class C) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGqMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE4MDYGA1UEAwwvTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"96ba448b3b21c633bd5e293f4383a8b88b67e802476a48d48ba20ffa8359a5ce","size":2182,"filename":"KS2adY6eMaWNhbLW6JREO3Oo34Qy_UvmA5f-f4ROpYw=.pem","location":"security-state-staging/intermediates/6380c544-10af-435b-ae2d-adad842694a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KS2adY6eMaWNhbLW6JREO3Oo34Qy/UvmA5f+f4ROpYw=","crlite_enrolled":true,"id":"522256d0-e9e9-44e9-b35d-221ddf453cad","last_modified":1562108317826},{"schema":1562108316330,"derHash":"MMwfzLvsAuaJkblkWSD5qZbBJ8L8vQeVhPHXjYh1kbc=","subject":"SERIALNUMBER=201723,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIz","whitelist":false,"attachment":{"hash":"e4164234795efd76a9f953b98749a822314de01401d5c5078837c4d956d5ba3f","size":2402,"filename":"qVzRfQ2NKawghyfy2P967HGyMNOAxaW-lqGIKQbYwb4=.pem","location":"security-state-staging/intermediates/df4f4f25-4ed1-4bf7-b1ea-24e88ce80fb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qVzRfQ2NKawghyfy2P967HGyMNOAxaW+lqGIKQbYwb4=","crlite_enrolled":false,"id":"e3ba5f2e-ca62-462e-8dd5-91bc77510b2a","last_modified":1562108317074},{"schema":1562108314030,"derHash":"StuBnCUKLhgzE0BUmdhzUpnIj5cKUBmidWayflgY9Bs=","subject":"CN=DigiCert SHA2 Assured ID Code Signing,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmc=","whitelist":false,"attachment":{"hash":"9e9e20d7379e013d029c65c1b9f114e35b9cb392ec440ae8c6a13c462abaf8ff","size":1748,"filename":"-8NGthsZ4RousKQeaozXeiZJDbaHhZwcd6xncoIcZDs=.pem","location":"security-state-staging/intermediates/16ec3e96-c579-4008-bc71-57e4816d320d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+8NGthsZ4RousKQeaozXeiZJDbaHhZwcd6xncoIcZDs=","crlite_enrolled":false,"id":"41e0a36c-c55e-4508-a53e-8813c0916ed2","last_modified":1562108314770},{"schema":1562108312519,"derHash":"ZIU2E8JDY5lgPQ1WC1LwS7j4GoF0bkI4mIOk9ZpFZNU=","subject":"CN=Secure Site Starter DV SSL CA - G2,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxKzApBgNVBAMTIlNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"aa3fd009b6c5b5c9c5458fc4dc6385393a7200967a4b5c20281e2f99cfcb3d8f","size":1788,"filename":"eDTKI6X9vxY2k_ZfHbRQ6gLLPTAmRP5hH5orVWntz8U=.pem","location":"security-state-staging/intermediates/8506f034-f774-4313-ae85-555f9a9aa758.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eDTKI6X9vxY2k/ZfHbRQ6gLLPTAmRP5hH5orVWntz8U=","crlite_enrolled":false,"id":"00c0da63-9255-49cb-9d1e-16085032d2d9","last_modified":1562108313269},{"schema":1562108311015,"derHash":"98fij7XnnzFKqsa7upMvFeGnIGn0NdTJ5wf5PKFILuM=","subject":"CN=Qualified e-Szigno TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHlF1YWxpZmllZCBlLVN6aWdubyBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"f62124b291cbf9f0ce787625de446e21f2feb0426a05212dbc6111779c02cb02","size":2231,"filename":"B-kJdgVu-sQKTRurO5lOkBlDQ-2-UfVcgWNPVcJ2soQ=.pem","location":"security-state-staging/intermediates/b048750f-1cf2-47ec-9890-3fbaec58d1eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B+kJdgVu+sQKTRurO5lOkBlDQ+2+UfVcgWNPVcJ2soQ=","crlite_enrolled":true,"id":"eb56311d-499d-4871-aa3c-4d3359fc4ec0","last_modified":1562108311758},{"schema":1562108310265,"derHash":"VHMudAahOPpIra7c2jFWGXKG1lLgiwB3MFc9ntTgOmQ=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"a8c67b40b563cf63c41b06a70037ad190e434c4ef19f56e4e425fce1a0f1c1c0","size":1760,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/50703850-cc99-4156-803a-48fed64fa2df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"08551b17-2765-4c9f-abf8-ea28abf8f427","last_modified":1562108311008},{"schema":1562108308734,"derHash":"qonEZunQaILA2q9yvg8PvP58HvKqrRkGQMStRPVRfzQ=","subject":"CN=GlobalSign CA for AATL - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"faa26183cd8190e64a0334a9d0bc1653de74cdfe0addd4bd510ee4563a0b2664","size":1561,"filename":"Am8KjiB_BfHxcttxPcItD0PI_w1pckqm-saoOT32JQg=.pem","location":"security-state-staging/intermediates/d8f0e2b3-c3e9-4f66-a477-5ce6ec6be13f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Am8KjiB/BfHxcttxPcItD0PI/w1pckqm+saoOT32JQg=","crlite_enrolled":true,"id":"f3363149-33ea-4e28-8538-b42875404ad1","last_modified":1562108309489},{"schema":1562108307971,"derHash":"ABds2DVvL0kt0EqJMAHG72ELHry7E8Yf38O3BUY6B8w=","subject":"SERIALNUMBER=201725,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI1","whitelist":false,"attachment":{"hash":"92297ee53b100e26523fc1571e27142df221f691610b0e32df6e7afdf38e391e","size":2402,"filename":"P9ABMJpYdeY2_BVGAlcWULo2ZAn_I1lSLzQRDQ2Dduk=.pem","location":"security-state-staging/intermediates/6f729466-79f4-4719-8d47-79130027ab63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P9ABMJpYdeY2/BVGAlcWULo2ZAn/I1lSLzQRDQ2Dduk=","crlite_enrolled":false,"id":"d0b10adf-94cf-4423-947b-ba7caf6fa8a8","last_modified":1562108308726},{"schema":1562108306455,"derHash":"gptouX8R3uNEhXrBLrQM5QLuUmARIwFv3r8UIAkaQEg=","subject":"CN=Actalis Organization Validated Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGVMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzI=","whitelist":false,"attachment":{"hash":"a6d698bddb2882ffe01874cc8b31fb4cd7cb7b59e5753aba4899ac8735e1c3d7","size":2328,"filename":"7OrVER1djNO1n973ik5pn3X3z2McXLh4_UHg4gcP8Qs=.pem","location":"security-state-staging/intermediates/a016d22f-4259-4a3a-a259-0b096b9d9603.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7OrVER1djNO1n973ik5pn3X3z2McXLh4/UHg4gcP8Qs=","crlite_enrolled":true,"id":"33150e34-4a0c-4a16-8c20-614694dcacbc","last_modified":1562108307204},{"schema":1562108305694,"derHash":"tuRKaTQthDY6sSGC8tK4iFAbBjp2vrADUOON3HRxUDQ=","subject":"CN=SSL.com Client Certificate Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"70033e723115a4788e75a0975cdeef29d5401951abddea70bbbf2d85524897b8","size":2463,"filename":"i08jg0QBQmEM-JqJgQx323fDRPRGdVoqKp1H7yz79IY=.pem","location":"security-state-staging/intermediates/327c4e9b-94d6-4642-b0c8-34c09ab42569.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i08jg0QBQmEM+JqJgQx323fDRPRGdVoqKp1H7yz79IY=","crlite_enrolled":false,"id":"b29278b7-cf9f-4a99-ac8c-29557d9756be","last_modified":1562108306447},{"schema":1562108304934,"derHash":"wrS770oaZD8zTtCFD5KIdtKuOuNkK5hgFNaMZzwE0IE=","subject":"CN=DigiCert Assured ID Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEFzc3VyZWQgSUQgSW50ZXJtZWRpYXRlIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"b1d19ffd1ee53e7e96ff68523c9665541c7f0ad33953b984c40344cfd1b1b610","size":2414,"filename":"39FMK3AAz8IFXNAeBgxX6wMg9P7FiRLFT8ZlWfn_yN4=.pem","location":"security-state-staging/intermediates/310bb2a7-3082-4ca1-9b38-806b747f54a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"39FMK3AAz8IFXNAeBgxX6wMg9P7FiRLFT8ZlWfn/yN4=","crlite_enrolled":false,"id":"aff53e0c-f01a-44b2-8421-76ed33a192d6","last_modified":1562108305686},{"schema":1562108304182,"derHash":"gq1G7N6IJBMQaxyD72XcAtsMZbOHD290S2IoPfb6HVY=","subject":"CN=DigiCert SHA1 Assured ID Code Signing CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTEgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"7231d127229533342baeaa15873fec434cf18f783b1e0d40608577aef1cbf7c9","size":1898,"filename":"0w_4AUxe0Bd0wAJYMdu6EnJD9JmcIGhTrapIAusbp8g=.pem","location":"security-state-staging/intermediates/d099988a-680a-48ad-b2cb-9367e335da89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0w/4AUxe0Bd0wAJYMdu6EnJD9JmcIGhTrapIAusbp8g=","crlite_enrolled":false,"id":"dd18bf6f-8293-49a7-b238-5944b684f761","last_modified":1562108304925},{"schema":1562108301877,"derHash":"RMUKyA7b6eVS48ls5b0RyDfHD1ajOsq88Y2Neps1Dgc=","subject":"CN=EC-PARLAMENT,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verCIC-2 (c)03+OU=Parlament de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),L=Passatge de la Concepcio 11 08008 Barcelona,C=ES","subjectDN":"MIIBGTELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQwMgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzEfMB0GA1UECxMWUGFybGFtZW50IGRlIENhdGFsdW55YTEVMBMGA1UEAxMMRUMtUEFSTEFNRU5U","whitelist":false,"attachment":{"hash":"17e9173c46bb2384dba7fcb7a0f710c7b429cf4600461a89fba90b1af0a62645","size":2698,"filename":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF-GQQrZtCBAentM=.pem","location":"security-state-staging/intermediates/210f4610-3bf6-4547-b850-5fccce210bc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF+GQQrZtCBAentM=","crlite_enrolled":false,"id":"8a3a7743-6b95-491c-a7fd-c508a3a3588e","last_modified":1562108302644},{"schema":1562108301127,"derHash":"Ol9O91ja1i5DaSRkReBo5Nrf3Uhi3Nw1LLyj9YyxAoo=","subject":"CN=University of Ioannina CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTElMCMGA1UEAxMcVW5pdmVyc2l0eSBvZiBJb2FubmluYSBDQSBSMg==","whitelist":false,"attachment":{"hash":"e55385a6a99893ba059ad902f14cf08fc7e50c21f0767e96dade7ae8ff26f9f3","size":2519,"filename":"3Z_Xeh-0zD0mx1ntkdzF2uRggW2jjvRv4YohPdsTyH0=.pem","location":"security-state-staging/intermediates/07946fd8-678e-432f-88dd-926d7a5b0651.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3Z/Xeh+0zD0mx1ntkdzF2uRggW2jjvRv4YohPdsTyH0=","crlite_enrolled":true,"id":"5b78a2dc-204e-4f05-87aa-7d9a687db350","last_modified":1562108301868},{"schema":1562108299591,"derHash":"yVqUJkEOEecO7ZR4Bv2H9vDed7mPHEVL4Q01xEQtwd0=","subject":"CN=Ionian University Client CA R1,O=Ionian University,L=Kerkyra,C=GR","subjectDN":"MGQxCzAJBgNVBAYTAkdSMRAwDgYDVQQHEwdLZXJreXJhMRowGAYDVQQKExFJb25pYW4gVW5pdmVyc2l0eTEnMCUGA1UEAxMeSW9uaWFuIFVuaXZlcnNpdHkgQ2xpZW50IENBIFIx","whitelist":false,"attachment":{"hash":"421344cbf9de9ea4c9deeba9fd22a377f8a6001c222e3d8cf3cdfa2a7da4ebaa","size":2491,"filename":"BKdxsSIs-ijJFbyYWEdpq7cKm2wjAKYw1xIPkxhoTzY=.pem","location":"security-state-staging/intermediates/6b710da6-690c-4e56-9130-7542629ed94f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BKdxsSIs+ijJFbyYWEdpq7cKm2wjAKYw1xIPkxhoTzY=","crlite_enrolled":false,"id":"72505e52-9154-41da-9415-e855003b7e6e","last_modified":1562108300343},{"schema":1562108298809,"derHash":"fmr1Cjqd0Bc3IE2RK3ch98CAnMzmQoRXiZIEmqzjSws=","subject":"CN=DigiCert Transition Root G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBUcmFuc2l0aW9uIFJvb3QgRzM=","whitelist":false,"attachment":{"hash":"1744c43c724806504fbec8f1f008c72fec893abcf74097d2a9736fa436694410","size":1305,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/c140c6ab-92f6-4c11-8843-daf10323b427.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"93532867-ac56-4307-89f7-2dd212381524","last_modified":1562108299582},{"schema":1562108298021,"derHash":"HhdBoS642ivXbqlsBPUgNZg5cQ9iDoCVL0jdAkChLNg=","subject":"CN=GlobalSign Organization Validated CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTswOQYDVQQDEzJHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgQ0EgLSBTSEEyNTYgLSBHNA==","whitelist":false,"attachment":{"hash":"f56fe012352f32771440b0a10b06d66c2f469fb83a06518748eaa15ab9720834","size":1622,"filename":"S7kwF_US-qCLAH7QPb4nX6Ms8I_NUy0GV9_-wVRxQe4=.pem","location":"security-state-staging/intermediates/30b37c7c-3a4d-4dfb-b2c4-e2d5477cf21a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S7kwF/US+qCLAH7QPb4nX6Ms8I/NUy0GV9/+wVRxQe4=","crlite_enrolled":false,"id":"8957e3a4-614b-4b99-a5c4-476646f00273","last_modified":1562108298801},{"schema":1562108297261,"derHash":"OYsUmc4Aol9hysPYvuVxYBiAgj7yiL6XcqTRM5hCJZU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,OU=IT Services,O=Prodrive Technologies B.V.,L=Son,ST=Noord-Brabant,C=NL","subjectDN":"MIGlMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtQnJhYmFudDEMMAoGA1UEBxMDU29uMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UEChMaUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4xNTAzBgNVBAMTLFByb2RyaXZlIFRlY2hub2xvZ2llcyBCLlYuIE9WIFNTTCBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"60af9aca37322fa5579658de5c5e1492cee409be5bf7326842071c595027df3f","size":1882,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/11e8a6e5-dba1-4063-8a86-8ec3c096498d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"45dbad78-4cd0-4991-b5b2-47889daaaef8","last_modified":1562108298013},{"schema":1562108296484,"derHash":"Rx5dC46FdFDELa80KT6Dl2m6qpZkUQoVpIuDM2vvCmw=","subject":"CN=CSP Code Signing Service CA 2,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MIGIMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xFDASBgNVBAcTC1NoaW5qdWt1LWt1MSswKQYDVQQKEyJDRU5UUkFMIFNFQ1VSSVRZIFBBVFJPTFMgQ08uLCBMVEQuMSYwJAYDVQQDEx1DU1AgQ29kZSBTaWduaW5nIFNlcnZpY2UgQ0EgMg==","whitelist":false,"attachment":{"hash":"f3e215956535f23892f1f0bb74d9a78f5bb4021380b7e080da65339c11dfadd0","size":2138,"filename":"l_awPKBJ4UEI-z9_U5Rbx8t0nJMnpt5Zthvcoiu0J78=.pem","location":"security-state-staging/intermediates/23ecae1d-dd6b-4b7a-a260-e41bd9437c08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l/awPKBJ4UEI+z9/U5Rbx8t0nJMnpt5Zthvcoiu0J78=","crlite_enrolled":false,"id":"e71b7abd-b38b-4bdf-9596-8523c7cccf32","last_modified":1562108297253},{"schema":1562108295734,"derHash":"gCwq0dIV5XzckBDqQ3rOOZtlcZT71A47teALCA5klt8=","subject":"CN=DigiCert Extended Validation Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xPDA6BgNVBAMTM0RpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gSW50ZXJtZWRpYXRlIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"73904237d7f0a3a17b5f2c3f1b1275dae7eb95972b2f9bb854178fdf1f3c93ef","size":2450,"filename":"N8yNUCoqmVQZ-ft-5WHTEDP44ZaqSGYV9krPU-6GKxE=.pem","location":"security-state-staging/intermediates/946ac930-af2f-46ae-ba2b-8469d6da4d27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8yNUCoqmVQZ+ft+5WHTEDP44ZaqSGYV9krPU+6GKxE=","crlite_enrolled":false,"id":"00d32bfb-1f50-4f9a-b001-bcb7956c75f4","last_modified":1562108296476},{"schema":1562108294970,"derHash":"xunpk8JYtyEkqtPJwGi27yNXYVXzELMFczNh4gsXyUM=","subject":"CN=Entrust Class 1 Client CA - SHA256,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSswKQYDVQQDEyJFbnRydXN0IENsYXNzIDEgQ2xpZW50IENBIC0gU0hBMjU2","whitelist":false,"attachment":{"hash":"79a53ad927c3de7c40691b9a6c3fb0d4a6a204940ea279fea186b55c6e73d429","size":1857,"filename":"lH0dapXaEQzIObJaHxVa7uB4l8j3w-wHYQbHKgXEZkQ=.pem","location":"security-state-staging/intermediates/49d12b14-17cb-4217-85c7-65e635580b00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lH0dapXaEQzIObJaHxVa7uB4l8j3w+wHYQbHKgXEZkQ=","crlite_enrolled":false,"id":"3564ed73-7524-4710-8e3c-8934b9358650","last_modified":1562108295725},{"schema":1562108293455,"derHash":"rY1JjAjaJJk2urzdoHIGwTxx510WvjEgvqLY5XIMC7E=","subject":"CN=TrustID SAIC Public Email Issuing CA,O=SAIC,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMQ0wCwYDVQQKEwRTQUlDMS0wKwYDVQQDEyRUcnVzdElEIFNBSUMgUHVibGljIEVtYWlsIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"fe515a59c69804f303e416010886b99083e0d92387cf3175e7ad76b66b8064f5","size":2866,"filename":"xQtvQZq-EB3EN98Z5s79c3Oet8M4exlYihCVvU05dDc=.pem","location":"security-state-staging/intermediates/1118623a-93a7-4be6-89a9-07a8f0a9f4d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQtvQZq+EB3EN98Z5s79c3Oet8M4exlYihCVvU05dDc=","crlite_enrolled":false,"id":"c05d6677-609b-422a-ac39-28f20ba92e8a","last_modified":1562108294207},{"schema":1562108292695,"derHash":"mHpclYS0a1mHjkJGD4Pk1h9MJyI2aUbU0hbzNqbxKPc=","subject":"CN=BlackCert\\, Inc. ECC DV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBFQ0MgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"4851b2159dadaebd9610ff68cc3a0abe70105ceae03d43c0259bae336294d8c6","size":1313,"filename":"UHhlKE9aTixVYvtmCIINV9nOgVj-gicuzrl4dZJypeA=.pem","location":"security-state-staging/intermediates/299ba25a-3c88-4a56-99fc-8d482eacf964.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UHhlKE9aTixVYvtmCIINV9nOgVj+gicuzrl4dZJypeA=","crlite_enrolled":false,"id":"aec144f1-19f3-4440-b9b2-ca0cfb03eabd","last_modified":1562108293448},{"schema":1562108290423,"derHash":"G5em8Nu9kMEgcKSyJFDIntfangDRsMHTLHOfkfBUQ2k=","subject":"CN=USERTrust ECC Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE6MDgGA1UEAxMxVVNFUlRydXN0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"26dd31cde7427387d296f148833077d4fe20c284013c0fd9f15f8008f135d303","size":1362,"filename":"i7uClAe3_3wAhizAhhVydHbblUIZ4CnIbmP_37X1MDI=.pem","location":"security-state-staging/intermediates/6fd0a630-610a-4944-95e2-537aa76a82fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7uClAe3/3wAhizAhhVydHbblUIZ4CnIbmP/37X1MDI=","crlite_enrolled":false,"id":"c0e9c3ff-136b-4bae-bd6f-a2afc53d7dbc","last_modified":1562108291176},{"schema":1562108285841,"derHash":"dcFVADsRQcWwn9fdAy4vQTxHGV07ml2vbEUQOFzXsNo=","subject":"CN=SecureCore RSA Code Signing CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxJzAlBgNVBAMTHlNlY3VyZUNvcmUgUlNBIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"fb6fbc5f3a298360a9e790f55bf514d36e1065ad69d9250a0546434fd60e20ef","size":2097,"filename":"axW2YlMTDWWhbpiLWaU3zkErVvrZfY_GQ6cyk5u5luY=.pem","location":"security-state-staging/intermediates/1730ea7b-88b9-4db4-a901-15e5a1fae90e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"axW2YlMTDWWhbpiLWaU3zkErVvrZfY/GQ6cyk5u5luY=","crlite_enrolled":false,"id":"3e6d940e-6a54-426f-aa37-1484d14106e9","last_modified":1562108286598},{"schema":1562025729992,"derHash":"6o4gUWI+TkcQ/Vvyek0s4L5lsXoeVDm4+rdOAcyoFXU=","subject":"CN=COMODO Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGOMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE0MDIGA1UEAxMrQ09NT0RPIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"3d0e7c87aafe299697e93ab682a1740b5e0301d829f1f0172b1c96434892d004","size":1849,"filename":"U76LrE_Rijw5XfoXk5OQHHM69VvOLx93TdrIf4lbJe0=.pem","location":"security-state-staging/intermediates/b77966b0-d8a8-461b-82c0-0b542d6d45b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U76LrE/Rijw5XfoXk5OQHHM69VvOLx93TdrIf4lbJe0=","crlite_enrolled":false,"id":"ca6e3949-96ed-4927-a7ec-aa6983f017ca","last_modified":1562025730731},{"schema":1562025726215,"derHash":"3JRVykf1/Zvzu6u+rPiPPes7WL+oWvQE39IWF86QoN0=","subject":"CN=Academy of Athens SSL SubCA R2,O=Academy of Athens,L=Athens,C=GR","subjectDN":"MGMxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxGjAYBgNVBAoMEUFjYWRlbXkgb2YgQXRoZW5zMScwJQYDVQQDDB5BY2FkZW15IG9mIEF0aGVucyBTU0wgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"f72510e5379e821a4e63803bde1b2d0379bf113c2844ef59caf0def0e2469437","size":2771,"filename":"JSBgh4-dzeoIV9S02ySUrHvvy_rDBARUsVV1tnTxX34=.pem","location":"security-state-staging/intermediates/3e79bdae-5627-434e-bea2-8834a203d78b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSBgh4+dzeoIV9S02ySUrHvvy/rDBARUsVV1tnTxX34=","crlite_enrolled":false,"id":"cee3e6e9-42ed-4283-993c-cb0045e6be5b","last_modified":1562025726974},{"schema":1562025724722,"derHash":"L7qP6RVBUEmqlChXy1MTf/09nlpHsntXgtq5tNp9Yk0=","subject":"CN=GeoTrust SupremeSSL EV 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xKDAmBgNVBAMTH0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"41ecc5811611c2cca06c08009be39d0f651319e8cea2f6913a6d81897be776be","size":1423,"filename":"A97Lx6chFTH9FkG_Io5Uc5oemCnN0d8O2NjR9d-Pr0w=.pem","location":"security-state-staging/intermediates/baa9711d-751b-4f52-b6fb-eae863fd4185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A97Lx6chFTH9FkG/Io5Uc5oemCnN0d8O2NjR9d+Pr0w=","crlite_enrolled":false,"id":"abb039f2-2555-43ce-acd5-8385099aac50","last_modified":1562025725454},{"schema":1562025723206,"derHash":"sM1q57niDsX4MP7gH2ZtXZDm4inQa8RqMKzO3+yIlkg=","subject":"CN=GlobalSign ECC CloudSSL CA - SHA384 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEVDQyBDbG91ZFNTTCBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"de1af3b87a33aa08369966e57403b2c34643335f40db514a7afc6b97b106c162","size":1394,"filename":"jvkkZQCW-mhUvg-i2GTn-E3FaOYoVhJ1eCS-o6Q4yNk=.pem","location":"security-state-staging/intermediates/9cc4ce11-6d6f-43c7-bb98-74044eaff317.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jvkkZQCW+mhUvg+i2GTn+E3FaOYoVhJ1eCS+o6Q4yNk=","crlite_enrolled":false,"id":"64bc9cda-86f9-4b20-91ec-08b77c65c922","last_modified":1562025723952},{"schema":1562025722450,"derHash":"fAkS5d6EeLuG6OpGulrmXcOHC878vC9GeV7uz2SM++c=","subject":"CN=DigiCert Extended Validation CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzM=","whitelist":false,"attachment":{"hash":"a9b8d926d5c6840a9c7cfbb16d22ea65f23628c6fdb4af615cb30e7d3ceaa1f1","size":1158,"filename":"26Ut6iLcm-3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=.pem","location":"security-state-staging/intermediates/d9eb8ff7-9305-49b0-b4e6-9b4a86ebd7f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"26Ut6iLcm+3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=","crlite_enrolled":true,"id":"afc3f6a7-6865-4035-9978-68f1eaa2e5dc","last_modified":1562025723199},{"schema":1562025721682,"derHash":"daZZy9u+bJV+VBTbB4ySEm9jQ4IYnaG/XAojgP4MAVQ=","subject":"SERIALNUMBER=201902,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAy","whitelist":false,"attachment":{"hash":"4b65325d9d02469390d5b023e714e4e9c753ef0799e3f6a10e5916619c16dcc1","size":2333,"filename":"UwHbo6A5SENp-x9peFd6eLRH2pPK2OEh1Opi66naGmE=.pem","location":"security-state-staging/intermediates/3c472536-c16a-4f6a-8075-bc11e7725343.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UwHbo6A5SENp+x9peFd6eLRH2pPK2OEh1Opi66naGmE=","crlite_enrolled":false,"id":"8b83b14e-f66d-4d00-b7e1-4b8f9adff491","last_modified":1562025722443},{"schema":1562025718618,"derHash":"pIeewPNs+EtvLth65X7juUoHhcaGIjjNRUgQhNFS6xg=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"95a08802015a5ec4188aae43d624318718b33b1845abd2cc08cde2dd08795dda","size":1898,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/c20f4e11-fb50-446a-a3bf-298dcc6d3e94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"d60313ed-86f7-4c58-b298-f728a4d599dd","last_modified":1562025719366},{"schema":1562025714026,"derHash":"zxCWu5Mj2XLcMktnNx3AT/nYGPgyX5sUJPr/xIYWF94=","subject":"CN=MilleniumSign Client Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"66dc6cdcca92c736db22d6b0528e851eca29640b778a93b8e2ca01e136e44de9","size":2597,"filename":"rxjVY4zcTYKtIONSk7n6L7MrJYe_ND2NwaXtNQUP5TM=.pem","location":"security-state-staging/intermediates/73e81b8a-cb82-42dc-a82c-b44aa5531cff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rxjVY4zcTYKtIONSk7n6L7MrJYe/ND2NwaXtNQUP5TM=","crlite_enrolled":false,"id":"f4577da3-a2f0-4bf9-8805-1bf7390a8200","last_modified":1562025714778},{"schema":1562025713265,"derHash":"M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=","subject":"CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"3d3d273966feacef23b9bad6f99c08f1cc7d487295361ce8cc0b10c724baf67a","size":1711,"filename":"bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem","location":"security-state-staging/intermediates/aa91ff40-8753-4ea6-bc6c-9c2f51e7c6a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=","crlite_enrolled":true,"id":"03556fa4-abec-492c-a31c-149b44f3f991","last_modified":1562025714019},{"schema":1562025711764,"derHash":"hDJGhhPZjK3s3wgWxJ6it/aZ9KEc7AD1eMK6NnsmHAg=","subject":"CN=XiPS CA,O=XiPS,C=JP","subjectDN":"MC4xCzAJBgNVBAYTAkpQMQ0wCwYDVQQKEwRYaVBTMRAwDgYDVQQDEwdYaVBTIENB","whitelist":false,"attachment":{"hash":"3b65f8702240ac2d635ce5225969970a6e8557d2b9dd5eb165f96cadc14bfdc6","size":1455,"filename":"aqVWvShe1mzkhWFbetNw9nGqpsrVqF3oxvVKvhsIlK8=.pem","location":"security-state-staging/intermediates/5190658d-b50b-4f85-9700-87cd6e9064bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aqVWvShe1mzkhWFbetNw9nGqpsrVqF3oxvVKvhsIlK8=","crlite_enrolled":false,"id":"f181d5e2-48b8-4d91-a36f-3d0f2d8ee54b","last_modified":1562025712505},{"schema":1562025711016,"derHash":"H/7OCWgvhwJKKkSyyYex/M7jsrXPAh788jhpIkpMoVQ=","subject":"CN=Sectigo ECC Extended Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"fd85716a6add00125b582d3433c00b0de6d6b0b552bfd0c8ca14d4b009f89167","size":1374,"filename":"tMfg7Fo2Cq1tZyZLF7qjiWh-5J3kMiUXlIyn4Vr5nX4=.pem","location":"security-state-staging/intermediates/41bc169c-72dd-4bf8-b3cb-64ed94baec4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMfg7Fo2Cq1tZyZLF7qjiWh+5J3kMiUXlIyn4Vr5nX4=","crlite_enrolled":true,"id":"c6c4f0ce-0b29-4979-9287-aeced0243644","last_modified":1562025711756},{"schema":1562025708768,"derHash":"jSKvzLIsm24kJnzkILKZZVyB9dceKs/5B/5SqqU3qFg=","subject":"SERIALNUMBER=201802,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAy","whitelist":false,"attachment":{"hash":"102da7f31c535ea34d89635c806e2f2a5b759361e5b43ab595e6034e13660279","size":2333,"filename":"60YC4wjR2aMWmgm6s6gc7QNiw4QMHharRlBVWIH_dEE=.pem","location":"security-state-staging/intermediates/4afbb779-dbbc-4b0b-89c7-7381a2898294.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60YC4wjR2aMWmgm6s6gc7QNiw4QMHharRlBVWIH/dEE=","crlite_enrolled":false,"id":"9f54a066-75df-4d37-ade1-4dde85e658ea","last_modified":1562025709507},{"schema":1562025708011,"derHash":"FwFvanA1ZeKKsd9+Kai5iNLjW42DKBeh+TediK1xFBE=","subject":"SERIALNUMBER=201801,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDE=","whitelist":false,"attachment":{"hash":"e366da3a353529ab9e5aa4af9c4efab7baca0c8c3d39aac37cc5493de9185065","size":2337,"filename":"r1BqawCRtfiaTeSiVNjGZXvqScB9gfO7G-0GeWVXm80=.pem","location":"security-state-staging/intermediates/32f8564a-c764-4da5-a3f7-7bfa055ea02f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r1BqawCRtfiaTeSiVNjGZXvqScB9gfO7G+0GeWVXm80=","crlite_enrolled":false,"id":"514257fc-5422-4e69-b26c-e204e375c4a0","last_modified":1562025708760},{"schema":1562025707263,"derHash":"JbdJ1yKw/IhOac9afqobCx/vHiWdbQfwi3mOb++CPgI=","subject":"CN=eMudhra RSA Client Authentication and Secure Email CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGcMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPjA8BgNVBAMTNWVNdWRocmEgUlNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"c27ec82343f0d00259fda513c138c7d65d666bc8fe8ef949140eb37491534dd1","size":2182,"filename":"iBP3IIWrGNTEuOlANBTEQYR6YtaX4fTgxoiY4wfOsAE=.pem","location":"security-state-staging/intermediates/549b17f7-c9e3-4a71-a5d4-4b62bb4e1916.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iBP3IIWrGNTEuOlANBTEQYR6YtaX4fTgxoiY4wfOsAE=","crlite_enrolled":false,"id":"c68ae40e-0221-459c-9b5b-4816b26eec06","last_modified":1562025708004},{"schema":1562025706478,"derHash":"dcWz8B/R9RosRHq3x4XXLmn6nEcsCFcefq3zuOq65ww=","subject":"CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN","whitelist":false,"attachment":{"hash":"0f6a7a76e82068b37ee6c3f29a6d0c18baf727d5d7df2bb42b93f0257d84d61a","size":1853,"filename":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem","location":"security-state-staging/intermediates/4c299a33-dc8e-4885-82a2-d1b50cc80a72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=","crlite_enrolled":true,"id":"d372a7cc-1a5d-4429-8b38-67272cb151ed","last_modified":1562025707255},{"schema":1562025704941,"derHash":"0E25J8ZjqoyFPVRxbdbcKksv75w64b+yUER/xdd3Hlc=","subject":"CN=Entrust Extended Validation Code Signing CA - EVCS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTwwOgYDVQQDEzNFbnRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENBIC0gRVZDUzE=","whitelist":false,"attachment":{"hash":"1bf84b7a3f77f8f67f9e51d9336139cbd80e4db10cc4953df2414b0be4f645fe","size":1861,"filename":"GcPkbBB-ik0_z7Ti-5ln9eO4LtiY-qTd63BI9Hcr__o=.pem","location":"security-state-staging/intermediates/0e96ba5e-bdf5-4987-9558-5a42128bc3f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GcPkbBB+ik0/z7Ti+5ln9eO4LtiY+qTd63BI9Hcr//o=","crlite_enrolled":true,"id":"a2bd91d4-dd54-4a7c-92d7-9fff7bf0db8c","last_modified":1562025705694},{"schema":1562025703410,"derHash":"wzO2FjiwMV+oAcziHMTqlu9/ZaOZlFAYapnRm7IBKPc=","subject":"CN=Yandex CA,OU=Yandex Certification Authority,O=Yandex LLC,C=RU","subjectDN":"MF8xCzAJBgNVBAYTAlJVMRMwEQYDVQQKEwpZYW5kZXggTExDMScwJQYDVQQLEx5ZYW5kZXggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEjAQBgNVBAMTCVlhbmRleCBDQQ==","whitelist":false,"attachment":{"hash":"af258c6dfdfa092e5143efddb130a9995d357d1ad61ae4f796479ef04168a7a4","size":1674,"filename":"LNFe-yc4_NZbJVynpxAeAd-brU3EPwGbtwF6VeUjI_Y=.pem","location":"security-state-staging/intermediates/479968c7-7027-4f7e-8b5c-3222fd1e1b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LNFe+yc4/NZbJVynpxAeAd+brU3EPwGbtwF6VeUjI/Y=","crlite_enrolled":true,"id":"bf9d3f01-d8b6-4d86-8653-747e081c93a4","last_modified":1562025704179},{"schema":1562025701871,"derHash":"KkG6gZ62Elr1y0uLDp6VTs55jCp+5D3Nr305WYfE1VI=","subject":"CN=AlwaysOnSSL TLS RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"60ae06b06554f13d49fcd4ab75f5917d8c57dc17bd11f157428e11c66db10d22","size":1670,"filename":"DOdL2thyQw2ljWo5qhqUbm1_3EZBtYXxLKw14G9PO30=.pem","location":"security-state-staging/intermediates/a5955525-beea-41cd-bc30-2fdc381e930d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DOdL2thyQw2ljWo5qhqUbm1/3EZBtYXxLKw14G9PO30=","crlite_enrolled":false,"id":"47d5ce96-0aef-4db0-a607-a2e1c9d545d8","last_modified":1562025702639},{"schema":1562025701131,"derHash":"+WkIgIGfBs3MCy8iSyB/KvYAP7VzObhnmhYPqVII1i0=","subject":"CN=DigiCert Baltimore CA-2 G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0yIEcy","whitelist":false,"attachment":{"hash":"bd36d2274e9da51b8bdff6a5034236a8cd4be11b09a0484694bb0d5786f90c06","size":1581,"filename":"56higu_MFWb_c2b0avLE5oN2ECS2C43RvzSUgx_2xIE=.pem","location":"security-state-staging/intermediates/95cd362d-50b9-447c-9a65-f2618e6ef5a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"56higu/MFWb/c2b0avLE5oN2ECS2C43RvzSUgx/2xIE=","crlite_enrolled":true,"id":"25183d60-3420-4e98-9619-5f0eec8fee1d","last_modified":1562025701864},{"schema":1562025699565,"derHash":"vOtfbxkOdDBvdGmeK/bfPaO4MnTJTaYnMHfexjAkvCs=","subject":"CN=USERTrust Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGQMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE2MDQGA1UEAxMtVVNFUlRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"00ea6e2039bc7a594fce068cab36473f438d4d297b6a0dc47aefbfa0e23e48d6","size":1845,"filename":"qmiXmivqVtgR0GyawcxUjKYGCU2FpsPYSvuOnjXIl7A=.pem","location":"security-state-staging/intermediates/72c86bfc-7240-48e0-8b9e-f36bed44515a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qmiXmivqVtgR0GyawcxUjKYGCU2FpsPYSvuOnjXIl7A=","crlite_enrolled":false,"id":"6a69c8b2-71af-4964-b1b2-8cf7a40252ae","last_modified":1562025700328},{"schema":1562025698800,"derHash":"e+x4J+BdGTHdgmia9rLxmj9eTHVu+hYr1wjJJ50ank4=","subject":"CN=Hellenic Academic and Research Institutions AdminCA R5,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGUMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPzA9BgNVBAMTNkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQWRtaW5DQSBSNQ==","whitelist":false,"attachment":{"hash":"8ca53e2983ea3a48eebfa803f1747e95b415a1cb5d2480b8f436856a80d4faaa","size":2938,"filename":"AreUX-bchtedTom4SB7dY0hDFUCi6QqZHbrsRYdMV5w=.pem","location":"security-state-staging/intermediates/e9bb19e6-d0ac-490f-a20c-8c91408b1553.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AreUX+bchtedTom4SB7dY0hDFUCi6QqZHbrsRYdMV5w=","crlite_enrolled":true,"id":"002552b1-47b6-4410-a854-a48b4b40c244","last_modified":1562025699557},{"schema":1562025696418,"derHash":"gwy0Q+kSkB77qP+Pjhu86XAyqpEjjoGdi9bq/NWFLVA=","subject":"CN=SSLs.com ECC DV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gRUNDIERWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c384b3ab12ff6ea1b44a206f1afe0a9e294295d9b659f35735ad3b8f63df3777","size":1293,"filename":"dxXXi-wgMRVEkMxf8oNkW9S3knJacN3pyTKktpz6CO8=.pem","location":"security-state-staging/intermediates/e058b6fd-1598-40fa-bfc8-88653250ee88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dxXXi+wgMRVEkMxf8oNkW9S3knJacN3pyTKktpz6CO8=","crlite_enrolled":false,"id":"f9d6e124-3ddc-44f9-bbe1-dbb93eca419a","last_modified":1562025697178},{"schema":1562025694846,"derHash":"q97sUxSQmPigsH79lys0Wom+3o7eaXXmG+le4Cbafvo=","subject":"CN=Actalis Client Authentication CA G1,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MIGCMQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5vMQ8wDQYDVQQHDAZNaWxhbm8xIzAhBgNVBAoMGkFjdGFsaXMgUy5wLkEuLzAzMzU4NTIwOTY3MSwwKgYDVQQDDCNBY3RhbGlzIENsaWVudCBBdXRoZW50aWNhdGlvbiBDQSBHMQ==","whitelist":false,"attachment":{"hash":"737f0f0ce1590b65bb7efa52f0521e84ec1ac16313c8b4c6cd288064af2d127d","size":2235,"filename":"YsqG87ugr7iITRNFFaHeNX5oMmY80JlEVuqBCxAhZAM=.pem","location":"security-state-staging/intermediates/5df58a07-e383-4a1a-8af4-9471aa61c013.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YsqG87ugr7iITRNFFaHeNX5oMmY80JlEVuqBCxAhZAM=","crlite_enrolled":true,"id":"621a2382-280e-48de-b859-5293ba5379b7","last_modified":1562025695624},{"schema":1562025691799,"derHash":"Dc3Afsq7v+OKRga6ZjmHzbO9mBf8Z9HdDPCUrIyieH0=","subject":"CN=RapidSSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRkwFwYDVQQDExBSYXBpZFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"aa7fa595813e97a484acd6547bac20c9e71b2d410cc8c1411ce7c8dff477d7d9","size":1561,"filename":"ECmYCLPqKAHbhvlT_55ArJLWPUg2ET7VnEs9qxe4WMY=.pem","location":"security-state-staging/intermediates/954d8841-1fdb-4c14-b270-208ca50318c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ECmYCLPqKAHbhvlT/55ArJLWPUg2ET7VnEs9qxe4WMY=","crlite_enrolled":false,"id":"43b0aa37-7f19-4ef9-a14a-884ae615c7ad","last_modified":1562025692543},{"schema":1562025690289,"derHash":"6Y3cwNFYh2g2zUtq2CbES/ClmjY4ls4mbJ8ObO3AQLw=","subject":"CN=SSL.com EV Code Signing Intermediate CA RSA R3,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"32169e8329c248fa74da3ecdba2cb2ab5ddb103e65d9b25269226afcf1726058","size":2442,"filename":"A0PvmC7MDwMStpG2AMOTBGRwFSj4zczHavxDSYtMrUU=.pem","location":"security-state-staging/intermediates/29e6ec48-04e0-4511-8814-f046fc5fd80b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A0PvmC7MDwMStpG2AMOTBGRwFSj4zczHavxDSYtMrUU=","crlite_enrolled":false,"id":"2195f4e0-79ea-4388-98b0-6f42f8589dc9","last_modified":1562025691031},{"schema":1562025688012,"derHash":"sFR/1Gj7tuM3/gGwEINOU7TFsSZJ7O52+uw4uGQPiHg=","subject":"CN=Sectigo RSA Pro Series Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGIMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxMDAuBgNVBAMTJ1NlY3RpZ28gUlNBIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"21a5a5d98c08860c8bbdac09ecacbf28db1bf7fd896db33c56327c2680b27302","size":1699,"filename":"xTMa5n3gNYAxLuPmUb1OHXP8yMoC1p7qRTc2QnDh85w=.pem","location":"security-state-staging/intermediates/680c172b-fc67-4690-b97d-d1dea9a9f9be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xTMa5n3gNYAxLuPmUb1OHXP8yMoC1p7qRTc2QnDh85w=","crlite_enrolled":false,"id":"dce12f32-7494-4a0b-a01f-b3b7fcaa5481","last_modified":1562025688751},{"schema":1562025687263,"derHash":"3izLCHRurwKZjmyV4ko9LPtv9KPUHq+/g/1XAGby8qg=","subject":"CN=Network Solutions OV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBPViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"523a86b5180b5ec7c1414d69ac133130ee5d4575bd013804765541e369aae790","size":2150,"filename":"hIBbkSty62Y4PvvLLkYxEHhqoAK2s9JgMSFHh6HeR60=.pem","location":"security-state-staging/intermediates/97e3a8c1-f036-4137-9c18-5bdaae60b5d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hIBbkSty62Y4PvvLLkYxEHhqoAK2s9JgMSFHh6HeR60=","crlite_enrolled":true,"id":"fdf54b28-a69b-460f-a7af-12df7c5b6620","last_modified":1562025688004},{"schema":1562025682694,"derHash":"7gnUnHz0QYQNpRWNDnDUxsrrT8z+Z1juTMRccaKH3zk=","subject":"CN=Shuidi Webtrust SSL Organization Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MH4xCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMTMwMQYDVQQDDCpTaHVpZGkgV2VidHJ1c3QgU1NMIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"f975da322d7fcdc38e3cb51f4091077525b9e851b700830f29f444cceea7c7ca","size":1788,"filename":"bQEpVS_P2TaJBIhgpEXBC8jHqXLloS9b4EkKf3WILE8=.pem","location":"security-state-staging/intermediates/08ed8214-4b33-43b4-8ba3-b97456144534.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bQEpVS/P2TaJBIhgpEXBC8jHqXLloS9b4EkKf3WILE8=","crlite_enrolled":true,"id":"5ac2630d-d43f-4a21-8de4-363eea88f44e","last_modified":1562025683468},{"schema":1562025681943,"derHash":"SyTFIcR2AOg4AKP/DC1Y3ALIF3732ml8WoDB1IZ6Zt0=","subject":"CN=KPN CM PKIoverheid EV CA,O=KPN Corporate Market B.V.,C=NL","subjectDN":"MFQxCzAJBgNVBAYTAk5MMSIwIAYDVQQKDBlLUE4gQ29ycG9yYXRlIE1hcmtldCBCLlYuMSEwHwYDVQQDDBhLUE4gQ00gUEtJb3ZlcmhlaWQgRVYgQ0E=","whitelist":false,"attachment":{"hash":"a099dffc591861b7aafbe0f0a05c8b1f7bf81f559c01699413024d9884a31de1","size":2422,"filename":"LTKzfVX5csoVECsYSoKgWD8fCxvpkV_QvnpzmSXD67E=.pem","location":"security-state-staging/intermediates/133d0516-cda0-41bf-b11e-001d82752fbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTKzfVX5csoVECsYSoKgWD8fCxvpkV/QvnpzmSXD67E=","crlite_enrolled":false,"id":"571566e8-e55e-4901-b8d3-2549845c752d","last_modified":1562025682686},{"schema":1562025681184,"derHash":"12QgV8oX4AY1zEEFPxSRmYSIjmVwvi2Wah+ug6ZKTjA=","subject":"CN=Thawte Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGFRoYXd0ZSBDbGFzcyAzIEVDQyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"19920e1734805d1433e4ddbcc6556c5621f82552ecd3b1267802075ffe89b5bc","size":1118,"filename":"74qDh4tduGxF1WQBec7yb2TVAkVDQcZtSGFT6Fv2rKU=.pem","location":"security-state-staging/intermediates/b6b109d9-029d-47cb-9143-2b3f88a80822.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"74qDh4tduGxF1WQBec7yb2TVAkVDQcZtSGFT6Fv2rKU=","crlite_enrolled":false,"id":"511368c0-9bad-4168-ba0e-8752f57a500e","last_modified":1562025681935},{"schema":1562025678880,"derHash":"tBq4Rcq025yx/mUFdl82oIaK3F30GbOJeftqT+QTH3A=","subject":"CN=TrustAsia DV SSL CA - G5,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGXMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBHNQ==","whitelist":false,"attachment":{"hash":"3bf080b95af149ffd2e506772a96b0a2877c5d8652f00df4e6bcc0cbb8a66cd9","size":1930,"filename":"IiSbZ4pMDEyXvtl7Lg8K3FNmJcTAhKUTrB2FQOaAO_s=.pem","location":"security-state-staging/intermediates/92184c22-dea5-4c8a-a75f-4d675f372117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IiSbZ4pMDEyXvtl7Lg8K3FNmJcTAhKUTrB2FQOaAO/s=","crlite_enrolled":false,"id":"acd0d2d4-f089-4bc5-b759-b139cb3901cc","last_modified":1562025679624},{"schema":1562025678128,"derHash":"CQ3xIgpg6Ohl+GB7miS8O+ANkz1Dj7aGoxc978W/u0A=","subject":"CN=SecureTrust Timestamping CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IFRpbWVzdGFtcGluZyBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"4b45073fb2635b629bbf1095fb23e052ca68b981e23461115b479b6f22314bac","size":1691,"filename":"j2P1Z0mLSp4GAoBeesMfnj__nZWEBzdTPjXQKs135uY=.pem","location":"security-state-staging/intermediates/94b365b9-ee57-47ab-ae3e-0869f15a6ffc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j2P1Z0mLSp4GAoBeesMfnj//nZWEBzdTPjXQKs135uY=","crlite_enrolled":false,"id":"7b52d53f-2f70-4371-93de-fb4749b36a27","last_modified":1562025678867},{"schema":1562025677364,"derHash":"Pzr5ycwsdZnvj23XylFs/BeX19EgAiVPO/0NTQ/p3oY=","subject":"CN=thawte SHA256 SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAMTFHRoYXd0ZSBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"b784117d8a3ab57799dc2c072d17609dee8c92bc8067b1e11b8a4900f0e83e05","size":1711,"filename":"_36ymPAVaJl3QDyB1lUkVf9GqJNug0R8JJPDN6348p8=.pem","location":"security-state-staging/intermediates/4e0ed124-2d83-43f1-9448-6fb4dd45e482.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/36ymPAVaJl3QDyB1lUkVf9GqJNug0R8JJPDN6348p8=","crlite_enrolled":true,"id":"943e3610-ed29-496d-9a3e-cbb01e1ef005","last_modified":1562025678120},{"schema":1562025675802,"derHash":"EL7dxICqJ1Y0gLG8qrbCW1KZXqg26aKs6D+PWSBuJJY=","subject":"CN=New Mexico Health Information Collaborative CA,OU=Orion Health Direct Secure Messaging,O=New Mexico Health Information Collaborative,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzE0MDIGA1UEChMrTmV3IE1leGljbyBIZWFsdGggSW5mb3JtYXRpb24gQ29sbGFib3JhdGl2ZTEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMTcwNQYDVQQDEy5OZXcgTWV4aWNvIEhlYWx0aCBJbmZvcm1hdGlvbiBDb2xsYWJvcmF0aXZlIENB","whitelist":false,"attachment":{"hash":"3b860277584fea9df4295aab0745f897464dbf5e91296f9d2538f97974e21939","size":2349,"filename":"1m6_yYaaSZddN2cNjj0VawaRiHpS64DzwthprWkjdg8=.pem","location":"security-state-staging/intermediates/86f2c550-3b2e-4b7e-af76-e2becc64f74f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1m6/yYaaSZddN2cNjj0VawaRiHpS64DzwthprWkjdg8=","crlite_enrolled":false,"id":"f0a27a30-b268-4bf4-b255-1744ec057719","last_modified":1562025676587},{"schema":1562025673533,"derHash":"2N9+EYPW3vVh2E1W5iGm82oGXccX85Wbs7r8gkVW1Iw=","subject":"CN=NII Open Domain S/MIME CA,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIjAgBgNVBAMTGU5JSSBPcGVuIERvbWFpbiBTL01JTUUgQ0E=","whitelist":false,"attachment":{"hash":"4e6542a6648b4213a588d591b628e5dc92a54b95e08df2450f8821dc95d1784d","size":1654,"filename":"F9TkBe88zcRKkRsEqLE6JxhxN-bsw3hDKVMLUDn2y1M=.pem","location":"security-state-staging/intermediates/e43ae758-2dfb-4c9a-928e-c083c6da465e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F9TkBe88zcRKkRsEqLE6JxhxN+bsw3hDKVMLUDn2y1M=","crlite_enrolled":false,"id":"da5348e6-9e70-459c-bb07-1d2af71e7daf","last_modified":1562025674279},{"schema":1562025672771,"derHash":"6cUco5FHtXOPZPg1Jp0DTBAEc3VaQWnpbB/CNGmCGw4=","subject":"SERIALNUMBER=201820,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODIw","whitelist":false,"attachment":{"hash":"d2d13671c68a60835e1e652999025d0de6c631132ed3998cf5f6ee83d3144875","size":2333,"filename":"mL7LZxrYZ14X6ReGlhJRjYKddvqFCFZVLs-CL3gWAb8=.pem","location":"security-state-staging/intermediates/7338f0e5-344e-473a-93cb-121d6783b136.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mL7LZxrYZ14X6ReGlhJRjYKddvqFCFZVLs+CL3gWAb8=","crlite_enrolled":false,"id":"b9608c79-4ea9-44ef-8289-87b4489939bf","last_modified":1562025673525},{"schema":1562025670493,"derHash":"DOv5fR+rxkdTeZ96mlCMfF8rWLko+xs83GxBCcDPLpk=","subject":"CN=Thawte SGC CA - G2,O=Thawte\\, Inc.,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxUaGF3dGUsIEluYy4xGzAZBgNVBAMTElRoYXd0ZSBTR0MgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"484ba258f69f5a37429f7d0b9ef2ef46b4d8b05206ce0450b1081e696c815fe5","size":1723,"filename":"W6zRQBarVwwnzzEuDHuqu0dzg_srzfCimk7kZe_lXt0=.pem","location":"security-state-staging/intermediates/c3d071a4-89cc-4281-9735-9bdbad9e3f93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W6zRQBarVwwnzzEuDHuqu0dzg/srzfCimk7kZe/lXt0=","crlite_enrolled":false,"id":"d5dd4bbc-e6c1-4112-8b6a-c0dd8f5aed77","last_modified":1562025671254},{"schema":1562025669735,"derHash":"75E4mTZU35LS+1hg4o3ogYqfSdtW7LaJpnp/wtWIHdI=","subject":"CN=DigiCert Secure Site Korea ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"4b5bb15272048ea3f749dc2fa5eba0a04f9588364d8744af5fa74ba1eeced218","size":1410,"filename":"DqywqWwTJGFOkcrnV9IPNGtEO_GJMB1Y28mAQyChmRY=.pem","location":"security-state-staging/intermediates/9b369138-ca7e-43fa-806c-9e6cd4beea06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DqywqWwTJGFOkcrnV9IPNGtEO/GJMB1Y28mAQyChmRY=","crlite_enrolled":false,"id":"df60b489-c782-4306-b537-e7d0761c45ae","last_modified":1562025670486},{"schema":1562025668215,"derHash":"VTJKmDJRL8bJnxW/Dp7T1r60OYzO4ZS3/4SdltkTDUQ=","subject":"CN=GDCA TrustAUTH R4 Extended Validation SSL CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MHgxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjE1MDMGA1UEAwwsR0RDQSBUcnVzdEFVVEggUjQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"b7f589fd332a96773c813b272dcd486bc1231918f0643ed0662f171680cc3963","size":2093,"filename":"LA_cQZEhZA_J3pK28of_Jf7Wn0WmfSQvp4eYJW5o8NQ=.pem","location":"security-state-staging/intermediates/f42f0088-3a96-4549-833e-5948b8098639.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LA/cQZEhZA/J3pK28of/Jf7Wn0WmfSQvp4eYJW5o8NQ=","crlite_enrolled":true,"id":"eee3bb7d-8e10-46cc-af2c-14e1ec4763e3","last_modified":1562025668953},{"schema":1562025667477,"derHash":"WBTmy1Tq6VND2FmZKgFjD1krFVrxdSQx48G/OwVWJlA=","subject":"CN=CSP SSL Service CA 6,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA2","whitelist":false,"attachment":{"hash":"ea11110864b5c9817abbf5aa566a8057805deaf75f9481b604f2331ea70e98dc","size":2138,"filename":"q7drg9v6vXmd5nzhVcopuDRYMQ_LMZeqBynfhpYbHOk=.pem","location":"security-state-staging/intermediates/df60022f-853f-4111-a78b-4f89480bba48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q7drg9v6vXmd5nzhVcopuDRYMQ/LMZeqBynfhpYbHOk=","crlite_enrolled":false,"id":"5042a531-0af6-42d0-813f-e9ced7e21003","last_modified":1562025668207},{"schema":1562025665967,"derHash":"t6roJv/3LeP9azGIGlYiHXB3w9VcZLOUDO37ev0NzjU=","subject":"CN=Sectigo RSA Document Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxKDAmBgNVBAMTH1NlY3RpZ28gUlNBIERvY3VtZW50IFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"1afce422c54b00d30a903b931affa5c308ec9659de65c8cd7d9e68a0f9d83799","size":2190,"filename":"-Oc83wrXpHfiURh-sv35nT6kTLieb8t5m99W0qLHamc=.pem","location":"security-state-staging/intermediates/f747522e-7e39-4df3-aa39-2ef6d207958b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+Oc83wrXpHfiURh+sv35nT6kTLieb8t5m99W0qLHamc=","crlite_enrolled":false,"id":"a628600a-3dd2-4224-8076-be7ce8f30dae","last_modified":1562025666707},{"schema":1562025664465,"derHash":"G2gobe/OA2USpdrHbIq9Bn0zoH1ODe93BwicmAB14ZI=","subject":"CN=Highmark Tapestry HIE CA,OU=Orion Health Direct Secure Messaging,O=High Mark HIE\\, LLC,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJIaWdoIE1hcmsgSElFLCBMTEMxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEhMB8GA1UEAxMYSGlnaG1hcmsgVGFwZXN0cnkgSElFIENB","whitelist":false,"attachment":{"hash":"5e734fa19464bfd827dba86f076eeb3d032d3ce3f019eee75129e92a6dd81e20","size":2284,"filename":"tvN1gIKzR86qPSQ2AwrqugmOi6GtrIpoHkme7sem91Y=.pem","location":"security-state-staging/intermediates/f6c02c5c-dc08-47eb-899a-ae6b83749d80.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tvN1gIKzR86qPSQ2AwrqugmOi6GtrIpoHkme7sem91Y=","crlite_enrolled":false,"id":"a6432f10-db63-4211-8287-ee5b3019add5","last_modified":1562025665206},{"schema":1562025663727,"derHash":"6tYvQrs2ndQ89hMawtjXLk+f7oXmnUXar/4yaqwqRvE=","subject":"CN=thawte ECC EV SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAMTFHRoYXd0ZSBFQ0MgRVYgU1NMIENB","whitelist":false,"attachment":{"hash":"b9896b22533f91f08e44fd0d913e570893beda53a7ddaabc17bb5de4ac3715fa","size":1272,"filename":"v3yOKQDQnYnr9hQ5ns91kotLui5ZZWuKHuumsGg2skg=.pem","location":"security-state-staging/intermediates/7a20713d-c595-454a-aa10-6a71cb4cb5fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3yOKQDQnYnr9hQ5ns91kotLui5ZZWuKHuumsGg2skg=","crlite_enrolled":false,"id":"9294ecd4-a4c2-4786-9f0b-a20345e54442","last_modified":1562025664458},{"schema":1562025662215,"derHash":"P7oKpJ+94cgUyoMIeO0Dx9JDI/Y0g+Ut7o/0LBU8I08=","subject":"CN=GlobeSSL EV Certification Authority 2,OU=Controlled by COMODO exclusively for Globe Hosting\\, Inc.,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xHDAaBgNVBAoTE0dsb2JlIEhvc3RpbmcsIEluYy4xQTA/BgNVBAsTOENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBHbG9iZSBIb3N0aW5nLCBJbmMuMS4wLAYDVQQDEyVHbG9iZVNTTCBFViBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAy","whitelist":false,"attachment":{"hash":"8081c701056c43713db349d2808d99c5a352629faf0a60a54c7e2008170fc91c","size":2276,"filename":"iQ6SmjjdklCphf7sBBL9m4lWWf44bngHmvy7B8dl6XQ=.pem","location":"security-state-staging/intermediates/a35dab3a-08bf-43e8-b264-b1f7fa410a12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iQ6SmjjdklCphf7sBBL9m4lWWf44bngHmvy7B8dl6XQ=","crlite_enrolled":true,"id":"4fc9e088-612e-4c87-9986-7ef73542a266","last_modified":1562025662944},{"schema":1562025661465,"derHash":"wGiop8wvCL4Omh3bDfAeL3rnm/5QMSLFUrt7M2of1vQ=","subject":"CN=LuxTrust SSL CA 5,O=LuxTrust S.A.,C=LU","subjectDN":"MEExCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMRowGAYDVQQDDBFMdXhUcnVzdCBTU0wgQ0EgNQ==","whitelist":false,"attachment":{"hash":"07e1eb74359b90ce357ff15b2837652122ed2943ca4724c19f4a3192da301b57","size":2288,"filename":"bcglypvVD9g3zJapYfU5_6QrN_GcvIy5NZ1p98WA-tU=.pem","location":"security-state-staging/intermediates/3be807ca-d51c-486c-9724-945c312574a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bcglypvVD9g3zJapYfU5/6QrN/GcvIy5NZ1p98WA+tU=","crlite_enrolled":true,"id":"412b16c9-e9a4-4fdd-8e97-755cf0cd9015","last_modified":1562025662207},{"schema":1562025659950,"derHash":"CCskMEe/APWEQB9Ti1BLrp7AYOAH//KLFZwIQXBoZU4=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"e673e3e0c445d31eaaf7607090b13063ce93218b2424fad674db3bc682f6265e","size":1634,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/d2a682c5-e5d3-4d5f-8e12-1a3cbf600d6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"d5374ecb-80ce-47e5-b059-bece1cff031d","last_modified":1562025660705},{"schema":1562025658474,"derHash":"sZHt60y3cseYMVDAR1F/UL2SIcjLyTSaEdDMPn73K/0=","subject":"CN=CA A7,O=DST,C=US","subjectDN":"MCsxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNEU1QxDjAMBgNVBAMTBUNBIEE3","whitelist":false,"attachment":{"hash":"234f347bea5e6f979a5a03efb10ec2fdad80a05a5cf9ded51547fb01294a97f9","size":1114,"filename":"pIEW0Ptmy7_0EoTnwa5tDDgFuFD-p6-tNOU0O__34jM=.pem","location":"security-state-staging/intermediates/2df0a451-ff09-4261-a690-b21e121528de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pIEW0Ptmy7/0EoTnwa5tDDgFuFD+p6+tNOU0O//34jM=","crlite_enrolled":false,"id":"fb10dfd0-dceb-4cf8-99d9-966518cbbe69","last_modified":1562025659202},{"schema":1562025656956,"derHash":"cC25BNQaA4wMkpXPdD/DHy0OoXzEIou/z4Hle5oTmPk=","subject":"CN=COMODO ECC Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE3MDUGA1UEAxMuQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"86ad7eec9fe49f2da6658c805ff49b8cd4c0d919c347cd6ee2446088aacb544b","size":1345,"filename":"WD9JjqhTQMxwDO7l8vVZLuQPr1qlVa6IiVp1QVlgeRM=.pem","location":"security-state-staging/intermediates/7ad82a21-1226-4e6c-a4d1-f54dc95a4952.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WD9JjqhTQMxwDO7l8vVZLuQPr1qlVa6IiVp1QVlgeRM=","crlite_enrolled":false,"id":"ff63e1e4-f2df-4c1f-912d-140d9482d281","last_modified":1562025657724},{"schema":1562025656215,"derHash":"vTgAKIBt7svIM2r4cLeat0/5gsKOPn/wnbI2MARL3tk=","subject":"CN=CrossTrust DV CA1,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBMQ==","whitelist":false,"attachment":{"hash":"fec40cd025070029bdff6f3e4e23cc05a21fc2f02394834d05664e175bed593a","size":1475,"filename":"H7SdZc_IEjlBeqVzFuiez9bEZDA35H1qoMvWqNj3cTg=.pem","location":"security-state-staging/intermediates/9a1c5eae-ad1b-4c59-8e67-068aa1271cbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H7SdZc/IEjlBeqVzFuiez9bEZDA35H1qoMvWqNj3cTg=","crlite_enrolled":false,"id":"5229c4ed-b6d6-49aa-ac06-ff9409e3fe51","last_modified":1562025656948},{"schema":1562025655469,"derHash":"3MpxYWfwKaqaMJ7oyj/x9AF9Gh89GYG9/55a8/UDaCo=","subject":"CN=Booz Allen Hamilton BA CA 01,OU=TrustID,O=IdenTrust,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxEDAOBgNVBAsTB1RydXN0SUQxJTAjBgNVBAMTHEJvb3ogQWxsZW4gSGFtaWx0b24gQkEgQ0EgMDE=","whitelist":false,"attachment":{"hash":"909f0042606279a43c7d642c24bb37ea7161ec199ee60c8c634d754172b1ea23","size":2040,"filename":"UdncogVDGpmz7WJo4cgW3yRJEEC_B94goUWpdotXqis=.pem","location":"security-state-staging/intermediates/5c0368c0-92c7-4bdf-a1bd-6456c1a67422.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UdncogVDGpmz7WJo4cgW3yRJEEC/B94goUWpdotXqis=","crlite_enrolled":false,"id":"f48c0b76-fdb4-48ef-8265-f5936ac95931","last_modified":1562025656207},{"schema":1562025654686,"derHash":"t2ovsWJyFiIq+ksCXPTaey5Oyh7HvPdcXH8E+gnIJjo=","subject":"CN=TrustOcean SSL CA - ECC - 2018,OU=ECC Domain Validation Secure Server - 2018,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIGjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMTMwMQYDVQQLEypFQ0MgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTgxJzAlBgNVBAMTHlRydXN0T2NlYW4gU1NMIENBIC0gRUNDIC0gMjAxOA==","whitelist":false,"attachment":{"hash":"8563213d0beedc0bfe2aeaf6eea186a61ed41cc23c14a763c1ba2c84517a3a00","size":1362,"filename":"PKd-ld-FuxfPZ5wgPJhWwsUah7IUyvrd0dVMuPAcCHw=.pem","location":"security-state-staging/intermediates/dcc8872f-13cc-416b-b26c-72c8733ead48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PKd+ld+FuxfPZ5wgPJhWwsUah7IUyvrd0dVMuPAcCHw=","crlite_enrolled":true,"id":"90f1d6dd-0284-4beb-9154-f681754b0384","last_modified":1562025655462},{"schema":1562025647187,"derHash":"6sJBwEQKNoMBETgzNrwgysdAnCD26I1PhPSCe+kZ4zg=","subject":"CN=e-Szigno SSL CA 2014,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHgxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEdMBsGA1UEAwwUZS1Temlnbm8gU1NMIENBIDIwMTQxHzAdBgkqhkiG9w0BCQEWEGluZm9AZS1zemlnbm8uaHU=","whitelist":false,"attachment":{"hash":"a0cfba79ba47c056ad89715d67ca81adb743a5af504f88e8533bb086aa28c2a6","size":2268,"filename":"DuvXKXobTisU7ufJpGVYzPTgBJ3Vjeta2kpZtG9qXc8=.pem","location":"security-state-staging/intermediates/632fc789-8c70-460e-a724-365f1a2f468b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DuvXKXobTisU7ufJpGVYzPTgBJ3Vjeta2kpZtG9qXc8=","crlite_enrolled":true,"id":"b199af11-7ea2-49db-8145-22cd545ac30f","last_modified":1562025647917},{"schema":1562025646434,"derHash":"j3zEVemlUHgEEgZV1xORhiU+Q7AEIuc0JjoHadL4n30=","subject":"CN=ACCVCA-130,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMzAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"c7a672c81ca3a88f9f1026542e8a440443a8270bb0d1179ac7f197bfae1d5169","size":2686,"filename":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=.pem","location":"security-state-staging/intermediates/45659546-7b93-4a34-9576-89edb332e236.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=","crlite_enrolled":false,"id":"fdbfe4a6-8fe3-4795-a5fa-49db19f65800","last_modified":1562025647179},{"schema":1562025644937,"derHash":"IxukAuKLNJXzvgythweNm4+9hgQRFq+bgEfnsc/6gtA=","subject":"CN=Medicity Direct CA,OU=www.medicity.com,O=Medicity Inc.,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1NZWRpY2l0eSBJbmMuMRkwFwYDVQQLExB3d3cubWVkaWNpdHkuY29tMRswGQYDVQQDExJNZWRpY2l0eSBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"a8fe64d502cfb57f08bdf2b32b5b90927e134d559471c8aad19c666b7d29ebbc","size":2154,"filename":"Kcbe6mdTGz7kGQXiuqkZB-C5l9pbNG9BpLKyFU6s8MI=.pem","location":"security-state-staging/intermediates/1638d79d-0fa1-4196-828b-4100a5c9634d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kcbe6mdTGz7kGQXiuqkZB+C5l9pbNG9BpLKyFU6s8MI=","crlite_enrolled":false,"id":"c64e8b9f-acff-4734-8fac-8fd5810cd9cd","last_modified":1562025645673},{"schema":1562025640410,"derHash":"D9marh/81dnwrXbt3cvva4hMyFwWv8+ktSRhVdZZftY=","subject":"CN=EC-Ciutadania,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGGMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxFjAUBgNVBAMMDUVDLUNpdXRhZGFuaWE=","whitelist":false,"attachment":{"hash":"159d49dde4802a499bf0db5648ce2298fe56a96ce3f2e2800785445ea996088e","size":2097,"filename":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM_BQAAwtDlBw0=.pem","location":"security-state-staging/intermediates/df04e35c-a63e-447a-a80e-73770c3aef84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM/BQAAwtDlBw0=","crlite_enrolled":false,"id":"dca24481-e123-47e7-97bb-84d938fe8132","last_modified":1562025641172},{"schema":1562025637342,"derHash":"d6vmXfS+lOXsIi/JBeEjP4x31rOuKTM0agwvw7Lx9WA=","subject":"CN=Oklahoma State Department of Health CA,OU=Orion Health Direct Secure Messaging,O=Oklahoma State Department of Health,C=US","subjectDN":"MIGbMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjT2tsYWhvbWEgU3RhdGUgRGVwYXJ0bWVudCBvZiBIZWFsdGgxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEvMC0GA1UEAxMmT2tsYWhvbWEgU3RhdGUgRGVwYXJ0bWVudCBvZiBIZWFsdGggQ0E=","whitelist":false,"attachment":{"hash":"03627595711bc45e6bb6e4689b2bbe75b2cea7c9fd224b0697209dadce2df2d3","size":2324,"filename":"xQRTlo6N9UfoVMjpnJGZtpJr06LdDBpWpY-8ECdpOkk=.pem","location":"security-state-staging/intermediates/f4576b6f-cb28-441b-aa43-161c2d12c329.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQRTlo6N9UfoVMjpnJGZtpJr06LdDBpWpY+8ECdpOkk=","crlite_enrolled":false,"id":"797ff527-d050-47f9-8c3d-7f29381409db","last_modified":1562025638143},{"schema":1562025636604,"derHash":"ir/8+n0+Cd9TGnL/FkBls6bYCnfjPOxDbunT9g+EEzs=","subject":"CN=InterContinental Hotels Group RSA Client CA,O=Six Continents Hotels\\, Inc.,L=Dunwoody,ST=GA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExETAPBgNVBAcTCER1bndvb2R5MSQwIgYDVQQKExtTaXggQ29udGluZW50cyBIb3RlbHMsIEluYy4xNDAyBgNVBAMTK0ludGVyQ29udGluZW50YWwgSG90ZWxzIEdyb3VwIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"5128156a66f41cfb94c396626f58c95d45092d39232a2feee7a7f2663ae33066","size":2138,"filename":"qv_cktSW8maQyApxu-hdyO0fqYE834dm-HuXQIPLkOo=.pem","location":"security-state-staging/intermediates/f700690a-57b2-42f5-8f69-7b97adf26565.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qv/cktSW8maQyApxu+hdyO0fqYE834dm+HuXQIPLkOo=","crlite_enrolled":false,"id":"1f3a6742-4807-4da5-8b58-7b88abdece12","last_modified":1562025637335},{"schema":1562025635854,"derHash":"SJzJ8M0OKTehCtlqI3XAvRAxs+zFS9Bk1YWMwGK0GxA=","subject":"SERIALNUMBER=201812,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEy","whitelist":false,"attachment":{"hash":"209782e4f2ac908d3abdd1e2c651c9a94332adacb8ef3bed6f67ee015f73a1f6","size":2333,"filename":"K_y7Bld60S98GQkoxgI2sf4UHNiS90hGcdg2ZT9Sv2g=.pem","location":"security-state-staging/intermediates/ccf20a3e-8818-446c-bec4-8f650112c804.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K/y7Bld60S98GQkoxgI2sf4UHNiS90hGcdg2ZT9Sv2g=","crlite_enrolled":false,"id":"43c10a9f-ecd2-4c0b-b6c2-3c51ffbe80c8","last_modified":1562025636597},{"schema":1562025635117,"derHash":"RtO1D+3PjDa19nIjnMOi6eAu0V8zy9wMJiqGR4SUA/Q=","subject":"CN=USERTrust ECC Organization Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE/MD0GA1UEAxM2VVNFUlRydXN0IEVDQyBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0b8353c2d7776cd1f3b5e4ebc5145432dc3af3be23f68d2a3eaf204e02a02b17","size":1337,"filename":"kRGhnbdY7rR4yOa8G3EFT4gmen6uTLPFQPPk_s1vl-M=.pem","location":"security-state-staging/intermediates/ca9f4481-d288-4f5b-80c8-2bd10db0c543.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kRGhnbdY7rR4yOa8G3EFT4gmen6uTLPFQPPk/s1vl+M=","crlite_enrolled":false,"id":"a4586dee-7ea9-4b73-90f6-cb41b7b9cdfe","last_modified":1562025635846},{"schema":1562025634359,"derHash":"eqRdb1sU2rHGhEwZwoBOFLWBHm7eHwKwrvBlp7NZxo8=","subject":"CN=ATT Organization Validated CA 2019,OU=ATT Business Wi-Fi Services,O=ATT Services Inc,L=Austin,ST=Texas,C=US","subjectDN":"MIGcMQswCQYDVQQGEwJVUzEZMBcGA1UEChMQQVRUIFNlcnZpY2VzIEluYzEkMCIGA1UECxMbQVRUIEJ1c2luZXNzIFdpLUZpIFNlcnZpY2VzMQ8wDQYDVQQHEwZBdXN0aW4xDjAMBgNVBAgTBVRleGFzMSswKQYDVQQDEyJBVFQgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"ce151b1a5253a78fd23ad82efdd0ffb88b59b41f34a9871b6e2f3552df194f91","size":1735,"filename":"YOMvMe2Iot921yxSyd-8wLY-a8b_zYZmd31zENECyFE=.pem","location":"security-state-staging/intermediates/412a704f-f9d7-4f8f-8eb9-faf3eb2b7c8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YOMvMe2Iot921yxSyd+8wLY+a8b/zYZmd31zENECyFE=","crlite_enrolled":true,"id":"126186e4-fe3d-4610-a378-9d6ddff47030","last_modified":1562025635109},{"schema":1562025633607,"derHash":"ZeeA3/y1OHDqTtnhhLz5v8pGSEi00n5e7fY5GOabO4c=","subject":"CN=Don Dominio / MrDomain RSA OV CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"14cfac3f01120e8fab0ace79a95549801b13c469346a2d0e6aee4c6c99a8f967","size":2170,"filename":"PDA9PcTMXiEjxDxKYS1P_SinvLjX1xMCDWv1_fCl8_Q=.pem","location":"security-state-staging/intermediates/27edf606-4cc9-4094-b4bf-458c740217ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PDA9PcTMXiEjxDxKYS1P/SinvLjX1xMCDWv1/fCl8/Q=","crlite_enrolled":false,"id":"116c9082-ffba-4a57-92f9-73cd7e530aaa","last_modified":1562025634351},{"schema":1562025632851,"derHash":"ppxZlm67zf7H9P8CiMhv9gNW+nhgIIuTtDoJWwYAzB4=","subject":"CN=nazwaSSL,OU=http://nazwa.pl,O=nazwa.pl sp. z o.o.,C=PL","subjectDN":"MFgxCzAJBgNVBAYTAlBMMRwwGgYDVQQKDBNuYXp3YS5wbCBzcC4geiBvLm8uMRgwFgYDVQQLDA9odHRwOi8vbmF6d2EucGwxETAPBgNVBAMMCG5hendhU1NM","whitelist":false,"attachment":{"hash":"882b6da025cdfc61d89e03806a350163dfdfc251470ff6e5f8433ca8370adea9","size":1605,"filename":"AW6U8qPqk114rfl2sAhiEim2Pf0mq_Rb_BeWSlVAiP4=.pem","location":"security-state-staging/intermediates/4a692d29-8a7d-4aa6-b0fa-426ad6f59300.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AW6U8qPqk114rfl2sAhiEim2Pf0mq/Rb/BeWSlVAiP4=","crlite_enrolled":true,"id":"bbeb9d9e-3dd2-4546-8c96-d7fc9be4f2e6","last_modified":1562025633599},{"schema":1562025631337,"derHash":"KaTsi8oy3ZHxEg3hT1u0OTVtSO2AEg3xo6hmF+pIS8g=","subject":"CN=KeyNet Systems ECC DV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"05956e2bbe03a04e21687f1c9ca0133edafbb9211cbc05d0b3a5a99a07c8284b","size":1297,"filename":"BUAXj7DRPY9FwGYzytth18HC8DBDa4DvU_tIIX5dMkI=.pem","location":"security-state-staging/intermediates/a89204d4-8ae2-4fce-b46a-2384b1364511.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BUAXj7DRPY9FwGYzytth18HC8DBDa4DvU/tIIX5dMkI=","crlite_enrolled":false,"id":"3e638609-9645-46cf-88c9-263cbcf1d0e0","last_modified":1562025632090},{"schema":1562025629816,"derHash":"UFG9aeGdbNA2FHlJrFu8+Zg0Vh8Rn2DceTgkjWHHe70=","subject":"CN=Sectigo RSA Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEkMCIGA1UEAxMbU2VjdGlnbyBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"b8513c9c5b4db1eb407ce93a963c2fdb99d70689e74421029f245511fb2897fd","size":2125,"filename":"Ez_HDfkC0S25jJCRx4IUnR4y_p77QuYeiWPHVhWZbQU=.pem","location":"security-state-staging/intermediates/cbc4d51d-ac52-4ef3-8e1c-7c0fd3382973.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ez/HDfkC0S25jJCRx4IUnR4y/p77QuYeiWPHVhWZbQU=","crlite_enrolled":true,"id":"c2a4d5c5-1885-48b1-9bb9-b33f5686ec39","last_modified":1562025630576},{"schema":1562025629070,"derHash":"13N+Xy0//KQpkC6fOIz9bFlZzTWg/BA87i9+k9HGalI=","subject":"CN=DigiCert Assured ID TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENB","whitelist":false,"attachment":{"hash":"3acfd29ff87e4c65c2f222ef3a9d1cf2386bb9c35bc8466e5ff9d4b21ca177bf","size":1735,"filename":"wcEQuH5mngysd8OrgXuw0roT-SkrGkVZxVSpoNafgws=.pem","location":"security-state-staging/intermediates/0bd20a8e-99cf-4d4b-af90-c59deca2697a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wcEQuH5mngysd8OrgXuw0roT+SkrGkVZxVSpoNafgws=","crlite_enrolled":true,"id":"1a882256-e765-4db1-820b-0d4c76dcf9a5","last_modified":1562025629808},{"schema":1562025627540,"derHash":"M88fXJOW1+6egoOy529ADlBFBXXrFa0CyVbBxVdbGE0=","subject":"CN=MobileMD Direct Intermediate CA,OU=MobileMD,O=MobileMD Health Services,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhNb2JpbGVNRCBIZWFsdGggU2VydmljZXMxETAPBgNVBAsTCE1vYmlsZU1EMSgwJgYDVQQDEx9Nb2JpbGVNRCBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"35d053969fc5821037b137191551940bcf7fc50bfa0647a305746da9e582adeb","size":2190,"filename":"KF8mfWmAHOhFnWmjw7qocu6GmfRi8m7LPwwcVgTMS7s=.pem","location":"security-state-staging/intermediates/a811cee7-9306-41ed-ac9d-dd0f6360c358.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KF8mfWmAHOhFnWmjw7qocu6GmfRi8m7LPwwcVgTMS7s=","crlite_enrolled":false,"id":"59b4f0d3-d12e-4839-9c4d-373f62ed31ef","last_modified":1562025628306},{"schema":1562025626775,"derHash":"JTA8/QvxuqHvJIwp8HP//C58gVgu4jtFx/HDsy40Gtg=","subject":"CN=EAEko HAetako langileen CA - CA personal de AAPP vascas (2),OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGlMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExRDBCBgNVBAMMO0VBRWtvIEhBZXRha28gbGFuZ2lsZWVuIENBIC0gQ0EgcGVyc29uYWwgZGUgQUFQUCB2YXNjYXMgKDIp","whitelist":false,"attachment":{"hash":"33e5893bceb45f8047a84fd02b68d534b9290eb9deebc53433c7defcf5607d2c","size":2572,"filename":"fIoFCop2r5Hw838PL7crV4ts16Lq1s1xjk7E-I98dE8=.pem","location":"security-state-staging/intermediates/9635a458-c14c-408e-9445-8e8074645a18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fIoFCop2r5Hw838PL7crV4ts16Lq1s1xjk7E+I98dE8=","crlite_enrolled":true,"id":"ca492503-140b-4ef0-895d-d6ffd21fe324","last_modified":1562025627531},{"schema":1562025624539,"derHash":"vD8DpDYkDtul+DcU9vZ340s3+bHwwIweVY2YHieeggk=","subject":"CN=RapidSSL SHA256 CA - G3,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"6e37822b18adbba04ed1ed6f1d2b14f9a4d268516dd949736146f64d645e0617","size":1496,"filename":"6X0iNAQtPIjXKEVcqZBwyMcRwq1yW60549axatu3oDE=.pem","location":"security-state-staging/intermediates/f9e93d0f-a61e-467e-8adb-526e38c507be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6X0iNAQtPIjXKEVcqZBwyMcRwq1yW60549axatu3oDE=","crlite_enrolled":false,"id":"20d5332c-be89-418c-a8bb-b3fa2467c0f1","last_modified":1562025625274},{"schema":1562025623789,"derHash":"9kDlZDxAwfMp4QBDjijJV2ka+opT5AWjJvev63DCO8E=","subject":"CN=itsme Sign Issuing CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MG0xCzAJBgNVBAYTAkJFMRkwFwYDVQRhDBBOVFJCRS0wNTM3Njk4MzE4MSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEhMB8GA1UEAwwYaXRzbWUgU2lnbiBJc3N1aW5nIENBIEcx","whitelist":false,"attachment":{"hash":"b2592a909119953ff1445030e304e8ee3639a647ff3a126baef272b71727b5d0","size":2467,"filename":"nUS99ZApOt7vAjJaTRPLXupkkwz8777d3Be6QJ9XmXI=.pem","location":"security-state-staging/intermediates/db061d36-ae08-416c-9b85-54031ca3196d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nUS99ZApOt7vAjJaTRPLXupkkwz8777d3Be6QJ9XmXI=","crlite_enrolled":false,"id":"32e98d40-0e1a-4f96-bbd6-8cea5f34753c","last_modified":1562025624531},{"schema":1562025622305,"derHash":"HlW5BHmnN+eLVvOctXBRSisdy9mvJJwGGIaDeph8aVg=","subject":"CN=NII Open Domain Code Signing CA,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MHUxCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxKDAmBgNVBAMTH05JSSBPcGVuIERvbWFpbiBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"1cf70e67f36acabb305f46fa93fe5f445a8d376d8408160bbec5c9104908fd83","size":1638,"filename":"m3mE8ZnK8HZ9jzJz9euIeftEUmi37GkgQPeuCCQJI8o=.pem","location":"security-state-staging/intermediates/d2643bff-aec0-4b5e-b8ae-f32d7a258f21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m3mE8ZnK8HZ9jzJz9euIeftEUmi37GkgQPeuCCQJI8o=","crlite_enrolled":false,"id":"ba200c93-1e24-4cf0-b8ae-4f284461de5d","last_modified":1562025623035},{"schema":1562025620792,"derHash":"HMNYpt+gp2u1RwZg1487JfI8zWOVZn5JzPyCAdo9GS0=","subject":"CN=Certigna Entity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHsxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRswGQYDVQQDDBJDZXJ0aWduYSBFbnRpdHkgQ0E=","whitelist":false,"attachment":{"hash":"61a81d4d9681c5c86696195f2dcb40c8e795f9b490e5f72a7fa8ab4d6fd0ada9","size":2507,"filename":"0Eiyrr-wFIp1JqShtXzNCtJt2yUU0-j_mDnLwk1-AHk=.pem","location":"security-state-staging/intermediates/bfaf2dab-dfcf-4771-bf64-700aa69c0281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0Eiyrr+wFIp1JqShtXzNCtJt2yUU0+j/mDnLwk1+AHk=","crlite_enrolled":false,"id":"7c421e3b-f390-4235-af5f-e8a08ad5b7b3","last_modified":1562025621531},{"schema":1562025618556,"derHash":"VGyv+QYO7zD08+AiVfv1Ex5lfBcQyaZQAgEzqBi+wcg=","subject":"CN=GeoTrust EV SSL CA - G7,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNw==","whitelist":false,"attachment":{"hash":"819ac09e5307805d7bca58b450e383b8d795a443c6fe0c3ad0f26bdea6357767","size":1906,"filename":"mSUoTJHVFJsXYTXqbA1e3I1MK46Hl_VXGBvp5bWWW4c=.pem","location":"security-state-staging/intermediates/abc5e6d5-4632-4219-b8c8-fd208ce1314d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mSUoTJHVFJsXYTXqbA1e3I1MK46Hl/VXGBvp5bWWW4c=","crlite_enrolled":false,"id":"cbbe38e9-ee0e-4003-9c25-ae1e817de1e1","last_modified":1562025619303},{"schema":1562025617811,"derHash":"Zc+Tj9n7NCAMn235Pe1zqltxw2nMdKfEkfDkeh1edL4=","subject":"CN=MarketWare Server CA 2,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIGPMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xHzAdBgNVBAMTFk1hcmtldFdhcmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"f386a64f34b7c17cb08c2a7db308298366857c0b6c8c079eb54b64e3e52da778","size":2174,"filename":"nDi1HIiT115x0MuCzNMX50C66I0SdrTtqTFxWKBs9TA=.pem","location":"security-state-staging/intermediates/db573702-d4d2-4f8b-8424-67deaebcb59b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nDi1HIiT115x0MuCzNMX50C66I0SdrTtqTFxWKBs9TA=","crlite_enrolled":true,"id":"564405bd-7e8b-4930-98d8-7e9a66a09631","last_modified":1562025618549},{"schema":1562025616317,"derHash":"eO4jersjVKpnyo+14r+puRegv1Pi87PKs9rOweLDYeE=","subject":"CN=Gehirn Managed Certification Authority - ECC OV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDQyBPVg==","whitelist":false,"attachment":{"hash":"cacee93de389613e7f6636cfe013384ae68d256770ea28771d8a6196b104fee6","size":1321,"filename":"oARzv0l1Eo_Mizi_3scY3T6AQ1Zfy7sDSJO-oLT0O0g=.pem","location":"security-state-staging/intermediates/eec8e59e-ea66-4a29-82fe-6c948d312095.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oARzv0l1Eo/Mizi/3scY3T6AQ1Zfy7sDSJO+oLT0O0g=","crlite_enrolled":false,"id":"648ea664-8a0e-4b8c-b41f-de5c67be76d9","last_modified":1562025617054},{"schema":1562025614822,"derHash":"WKqSlhweA1BUrdpk6IO/rhshQ5y/etYeM/Z9xW4pX2o=","subject":"CN=National and Kapodistrian University of Athens CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGSMQswCQYDVQQGEwJHUjFEMEIGA1UECgw7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPTA7BgNVBAMMNE5hdGlvbmFsIGFuZCBLYXBvZGlzdHJpYW4gVW5pdmVyc2l0eSBvZiBBdGhlbnMgQ0EgUjI=","whitelist":false,"attachment":{"hash":"5789381e4fdcbc89485d0d084b116ecc57eab7a3411841e4acba28a4454b7219","size":2207,"filename":"a-9SzP1XJW2jpz0QniNws25_KvsEBfsN9xrkka1dChc=.pem","location":"security-state-staging/intermediates/b5f529a5-f373-4883-8c9c-9d8f165824f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+9SzP1XJW2jpz0QniNws25/KvsEBfsN9xrkka1dChc=","crlite_enrolled":true,"id":"2e2e2899-2ea5-4d68-b3d0-0c2c1ed211c9","last_modified":1562025615555},{"schema":1562025613331,"derHash":"WMldF5B+dD4SHO9H1IBk17OvMrUUvqPvdNKQpS1wuWw=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"33f2077021a616b53e063fdb38858c8315f1fa59cc4a6030f8c6a347c168de22","size":1459,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/263841e5-4107-4fe7-9f25-0ff66db32773.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"e5df1dae-0e71-4c7f-8ed1-4926351e8dea","last_modified":1562025614072},{"schema":1562025611813,"derHash":"Js3s3ROkRt6hoLehqs8Xu4BRtoUJ6ZAK0lQdBFSgP/U=","subject":"SERIALNUMBER=201914,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE0","whitelist":false,"attachment":{"hash":"33f2d6b3dab769a53325ffbb9013e62f16a787048391ec59be9889656248794f","size":2333,"filename":"PaxxgvdBQW_hDijSBTN-csj_vsanAzF9gsjoa6ic5w4=.pem","location":"security-state-staging/intermediates/ed61ec49-d0f8-412c-9387-8b9b3409e56f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PaxxgvdBQW/hDijSBTN+csj/vsanAzF9gsjoa6ic5w4=","crlite_enrolled":false,"id":"17cb40e4-54d0-4f35-b236-070f94f267f4","last_modified":1562025612546},{"schema":1562025611073,"derHash":"ml7s7px9iYvYHcO/Bm2vau+42xxZZ2IG0r/daCMSxvY=","subject":"CN=Thawte RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBSU0EgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"5ab0596aa7dd3f7d6cf1c6d2df754c46aa3f5872ff617e4f9336bde88379619b","size":1634,"filename":"S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=.pem","location":"security-state-staging/intermediates/289fd54c-d874-4e7c-966c-99955002ec14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=","crlite_enrolled":true,"id":"d280501b-539b-4cdb-87d5-dd02b98025b3","last_modified":1562025611805},{"schema":1562025606564,"derHash":"p7dwK9Ju9/BnodOXXsFyC0bW4B/RAayTQi7rDW3iXzI=","subject":"CN=SecureCore RSA DV CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxHTAbBgNVBAMTFFNlY3VyZUNvcmUgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"b3944ffa540226fa1a9e53714f5357803617cd5ef1176c921cf08e37c5a1f503","size":2113,"filename":"CrV-DCuu__rnw7hOV-VT2e3k97fReT_N7f4coJTynlM=.pem","location":"security-state-staging/intermediates/fb5448bb-8cd8-4448-abe0-785a2c069d60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CrV+DCuu//rnw7hOV+VT2e3k97fReT/N7f4coJTynlM=","crlite_enrolled":true,"id":"9e84ec55-93b1-412d-b1ec-dd9a2fa6d851","last_modified":1562025607312},{"schema":1562025605823,"derHash":"YvubbNJjO5LZHbJkzmeKmxnFdUFKsQrUbRV/B7uibv8=","subject":"CN=GeoTrust Secure Site Starter DV SSL CA - G1,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK0dlb1RydXN0IFNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"7fbb720621a1148fa1c1e47a4c221a58b477ab69560c12e200af131f56d400e8","size":1743,"filename":"INyHMxZOziIERyiIqDLB0VLBBRvnFowehelheu9bdZY=.pem","location":"security-state-staging/intermediates/4da4baa6-3ba3-4f18-b318-e556016cb10e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"INyHMxZOziIERyiIqDLB0VLBBRvnFowehelheu9bdZY=","crlite_enrolled":false,"id":"a2c4298c-6d7d-4e67-82d6-bba4f0fb4f9e","last_modified":1562025606556},{"schema":1562025602757,"derHash":"pesHtCHfz+1qnF4ucq5xBeKayGdaiWsrUijjVXYfr7Y=","subject":"CN=Digi-Sign CA Digi-ID,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHExCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR0wGwYDVQQDExREaWdpLVNpZ24gQ0EgRGlnaS1JRA==","whitelist":false,"attachment":{"hash":"49174c7fb3a07c4ee6bdd8f6d6366142a26863f173d39f278180b7de9c574c7a","size":2121,"filename":"lSWsBqNnQ74d1GG7ux7ThmLopqXERYuHcDLuXouxsyU=.pem","location":"security-state-staging/intermediates/975bf464-9aac-4785-9db4-bf6f599f9dfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lSWsBqNnQ74d1GG7ux7ThmLopqXERYuHcDLuXouxsyU=","crlite_enrolled":false,"id":"c9ba0d28-eb09-4617-9b02-8109a727b905","last_modified":1562025603528},{"schema":1562025601957,"derHash":"XxqCwJy64jnU4/BwTJcHVVR+U+PPKQ+Uef5+mGZf7w8=","subject":"CN=Abbott Laboratories Secure Code Signing CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xMzAxBgNVBAMTKkFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"c53bc185adf65cc1c3297afab1f667bf42bc5da4e68e8e1b18794a9385973297","size":1878,"filename":"Vgcwr9WVl0WnsAApvKgxDZM4Q7HznM_pP7X9u4ESS1I=.pem","location":"security-state-staging/intermediates/3ae5fbf0-e0db-481a-baad-a316a45d945a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vgcwr9WVl0WnsAApvKgxDZM4Q7HznM/pP7X9u4ESS1I=","crlite_enrolled":false,"id":"776078c7-791c-4564-8ce2-eb27e585f7b1","last_modified":1562025602746},{"schema":1562025600414,"derHash":"0roL/sQ/p4A4YM3mszd0IbH1Y+wSS1HZCEFbDpNzI+Y=","subject":"CN=QuoVadis Time-Stamping Authority CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHkxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xLzAtBgNVBAMMJlF1b1ZhZGlzIFRpbWUtU3RhbXBpbmcgQXV0aG9yaXR5IENBIEcx","whitelist":false,"attachment":{"hash":"26a4176be473a14f31de29d1da3b12f02f12be34041e77269c5979e00db43293","size":2418,"filename":"6o4kS9EEt21KPoxCFXRoGxaVWapw68wCcDeVHVAcpik=.pem","location":"security-state-staging/intermediates/1b3a0d87-9421-4607-a1d3-7692122d7547.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6o4kS9EEt21KPoxCFXRoGxaVWapw68wCcDeVHVAcpik=","crlite_enrolled":false,"id":"a14b051b-7d8e-4751-a0be-ea7845db3846","last_modified":1562025601175},{"schema":1562025597404,"derHash":"9ooj65c3qMdE7mcRLy/AJKrcUDu7sE8lze1PJXbJNIU=","subject":"CN=The Code Project Secure Email (S/mime) CA,O=The Code Project,C=CA","subjectDN":"MFwxCzAJBgNVBAYTAkNBMRkwFwYDVQQKExBUaGUgQ29kZSBQcm9qZWN0MTIwMAYDVQQDEylUaGUgQ29kZSBQcm9qZWN0IFNlY3VyZSBFbWFpbCAoUy9taW1lKSBDQQ==","whitelist":false,"attachment":{"hash":"e34a2353b9ea221ccf98cccc3d39c3562f1daceb776f42298bbc37afdd4fc54a","size":1752,"filename":"xtYGt02m4umLJCyy0kfaczCboF12WILjsGOb1umDfX0=.pem","location":"security-state-staging/intermediates/6a587b25-39c3-4ac6-95d6-78df25a40d97.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xtYGt02m4umLJCyy0kfaczCboF12WILjsGOb1umDfX0=","crlite_enrolled":false,"id":"9533ae64-4d6c-4fcd-bdaa-fbcf2aaf2775","last_modified":1562025598133},{"schema":1562025596661,"derHash":"Xyt9WujUNLYt/EOqPjZ+iF993t2aQ6QtGGk5BAD7MUY=","subject":"SERIALNUMBER=201904,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA0","whitelist":false,"attachment":{"hash":"c993ae91e5b73aeec9e80128be6a3eb8363cce5a8b6c955a24aa9c094b3764b8","size":2333,"filename":"_Eevym_zrvrIKVw8p8WS5pcOrGxY2QoyYX8eTm_Qcns=.pem","location":"security-state-staging/intermediates/98f269e6-220e-4aac-b625-a3681b2126a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Eevym/zrvrIKVw8p8WS5pcOrGxY2QoyYX8eTm/Qcns=","crlite_enrolled":false,"id":"72c868f6-7898-4524-8d73-77ed61951b94","last_modified":1562025597396},{"schema":1562025595171,"derHash":"zo4QUBzRiNIn73StCjQtl3ZDvS3j8hcWG17S/7BYEac=","subject":"CN=Don Dominio / MrDomain RSA Client CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGPMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMS0wKwYDVQQDEyREb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"b532c1793ab65aa624c09708e7ebac6c4a98303c286d5b180809d182d9d544f3","size":2162,"filename":"bZXUokABdjKvAlZHkn4TVSe5U8voAYQQKs7PqX-3PkA=.pem","location":"security-state-staging/intermediates/0f7549c3-9c5e-48fd-b0c1-8791638b7e0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bZXUokABdjKvAlZHkn4TVSe5U8voAYQQKs7PqX+3PkA=","crlite_enrolled":false,"id":"41d33eac-fc49-4e82-8895-d1613fe6d882","last_modified":1562025595903},{"schema":1562025594407,"derHash":"FDY4IlF+KYmwh9DJpC7vE0p3S9CyoGZNRVr3hLwI9NA=","subject":"CN=Trusted Secure Certificate Authority 5,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTEvMC0GA1UEAxMmVHJ1c3RlZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDU=","whitelist":false,"attachment":{"hash":"8a6494ec2603c5d7fa49b972528dee5f7e5ba0c42c069f06d9aeab2c7f90c7fa","size":2166,"filename":"PzYLl5g5RZkQsPcG4YUX6vzXQf86rOUEcSAhn7JxzNo=.pem","location":"security-state-staging/intermediates/e96bc34e-fa49-44d4-8bed-d0620ff47065.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PzYLl5g5RZkQsPcG4YUX6vzXQf86rOUEcSAhn7JxzNo=","crlite_enrolled":true,"id":"f9fe88db-9db6-4383-b17b-864a507f7e22","last_modified":1562025595163},{"schema":1562025591410,"derHash":"tnb/oxeeiBIJOhter+6HauemqvIxB42tG/shzSiTdko=","subject":"CN=GlobalSign RSA OV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"4a0e56bd3b0d5e1f85efac014a7e99c83489b11c4826b602e42b144c4f6e91da","size":1553,"filename":"hETpgVvaLC0bvcGG3t0cuqiHvr4XyP2MTwCiqhgRWwU=.pem","location":"security-state-staging/intermediates/3f1383e4-4860-4b8b-bf8b-eac0b66ceb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hETpgVvaLC0bvcGG3t0cuqiHvr4XyP2MTwCiqhgRWwU=","crlite_enrolled":true,"id":"5ec3f078-2414-46ca-aaf8-e9630ae2109a","last_modified":1562025592175},{"schema":1562025590674,"derHash":"CQM/4jmW/kpZxMD1I9JWDjHf5MF9jqFAPUKalx9L1lo=","subject":"CN=WoTrus OV SSL Pro CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIE9WIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"0e6c76a6d70346ff239c0a9320d8ebda8b750ae57610ff62a44fb8e221319a31","size":1861,"filename":"zACNb3_D6r-GIH58_Q4EDalNSChXFVVFbUJICvq7SIQ=.pem","location":"security-state-staging/intermediates/b1a606fe-50b5-4825-a5cc-14e050d9c0ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zACNb3/D6r+GIH58/Q4EDalNSChXFVVFbUJICvq7SIQ=","crlite_enrolled":true,"id":"633e504e-6010-4677-ba99-3052463cf02f","last_modified":1562025591403},{"schema":1562025589184,"derHash":"d3T6t1SJgiYrL+u0hmQ5sw+Ey7LRA1ed+esZ10tn/u4=","subject":"SERIALNUMBER=201919,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE5","whitelist":false,"attachment":{"hash":"61e72b9bfdca750e62c110c66bf30a3e69326deb6d793993bc4a88ba37a6e64d","size":2333,"filename":"tMuaH8MohBI08k1zTBkJ34YXWEOTQLc48i1wOMHbmdE=.pem","location":"security-state-staging/intermediates/37c38782-e0a8-4754-9a6f-655f6a72e086.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMuaH8MohBI08k1zTBkJ34YXWEOTQLc48i1wOMHbmdE=","crlite_enrolled":false,"id":"1c7d8111-6d2b-43cc-9d4f-8ac30ea4fe05","last_modified":1562025589921},{"schema":1562025586185,"derHash":"cQAks3vZ8OFTfBikwg+aMcS0hdEkjGQ/ILTADzcWuoU=","subject":"CN=DigiCert EV Server CA G4,OU=www.digicert.com,O=DigiCert  Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCAgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBFViBTZXJ2ZXIgQ0EgRzQ=","whitelist":false,"attachment":{"hash":"bfda2140f26102c7934ae20783fd8234f2b2f5bbbfe9aa291f7d91bb80b6078a","size":1951,"filename":"rSOteFVbBeX8qJ_1s6WFayDHdgaEKLjbWQS5PZDkdvg=.pem","location":"security-state-staging/intermediates/5b85823c-270a-414c-ab27-7a62b77143d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rSOteFVbBeX8qJ/1s6WFayDHdgaEKLjbWQS5PZDkdvg=","crlite_enrolled":true,"id":"66f62e6d-0c5f-4d24-80c0-b99829e532cb","last_modified":1562025586928},{"schema":1562025585399,"derHash":"cJvk6rCjchI28osquA92/aJRMwsygvUV6l4LbHmuZyk=","subject":"CN=RUB-Chipcard CA G2,O=Ruhr-Universitaet Bochum,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMSEwHwYDVQQKDBhSdWhyLVVuaXZlcnNpdGFldCBCb2NodW0xGzAZBgNVBAMMElJVQi1DaGlwY2FyZCBDQSBHMg==","whitelist":false,"attachment":{"hash":"5b3189496744b3baca10b9e288920f3c93f91a4cb9238792c8a84cb327282206","size":1947,"filename":"1LhrLd2v38EP1hLDpF6VhNqMjyRxu9cRaZL0r98r04o=.pem","location":"security-state-staging/intermediates/f9495b7a-e1af-4b97-bc3c-208ef9ce1a7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1LhrLd2v38EP1hLDpF6VhNqMjyRxu9cRaZL0r98r04o=","crlite_enrolled":false,"id":"25ac7183-b98c-44a4-b022-6d05aaf05e96","last_modified":1562025586178},{"schema":1562025584632,"derHash":"TRCTIKejRvitcC3/8ad1jvy2E1v7L6OCQRclafAzLIM=","subject":"CN=COMODO Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGNMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEzMDEGA1UEAxMqQ09NT0RPIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"8e7517a2e51225db3888dceafbd6ffe6b128140e61feec75ab7d84d1927194ce","size":1849,"filename":"7Hf58eWzQ6pqWMtrBn80g3KJoxUpyCJ8oVoYdu4VSr0=.pem","location":"security-state-staging/intermediates/cc2c49d0-3326-4e77-88c2-da405ccf308c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7Hf58eWzQ6pqWMtrBn80g3KJoxUpyCJ8oVoYdu4VSr0=","crlite_enrolled":false,"id":"3d00ad4a-5f8d-4f77-b665-1308530ca883","last_modified":1562025585390},{"schema":1562025581604,"derHash":"8DdiFAXg81ZQfiOfrdZHhC07UIV8PP+ECFkXT3L2/Rg=","subject":"CN=DPDHL User CA I3,O=Deutsche Post,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MG0xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ0wCwYDVQQHEwRCb25uMRYwFAYDVQQKEw1EZXV0c2NoZSBQb3N0MRkwFwYDVQQDExBEUERITCBVc2VyIENBIEkz","whitelist":false,"attachment":{"hash":"aa3ab0230e44f321498e54339387e4d5d251084f2d2be80234f5d282fff8ef58","size":4356,"filename":"U24C-tQ5-xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko_A=.pem","location":"security-state-staging/intermediates/cc9371be-8d27-4657-9e1d-c89b3c6e3e4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U24C+tQ5+xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko/A=","crlite_enrolled":false,"id":"cf8eb580-18e7-4ef4-851c-a3845809da47","last_modified":1562025582348},{"schema":1562025578554,"derHash":"F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=","subject":"CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=","whitelist":false,"attachment":{"hash":"7827466be49a6ae3b8dcac1383f0357eeae5507bb485fc1f144a41c7f8a6aa64","size":2519,"filename":"Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem","location":"security-state-staging/intermediates/529eeb7b-a51a-4cc6-b552-835ff75ba795.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=","crlite_enrolled":true,"id":"ce7d0110-67fe-41f1-92bf-c23fa3f7d1e5","last_modified":1562025579301},{"schema":1562025577754,"derHash":"hZlo+SeLTcgu4w/RGKXSl9KEtofLZM+XVauKnTjytw8=","subject":"CN=Trustwave Domain Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGvMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE3MDUGA1UEAxMuVHJ1c3R3YXZlIERvbWFpbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"9eada92e3a97dd020d1e54af280aa60bf3400d8c05725aec56aa8357bd9c9bed","size":1768,"filename":"D2BA_wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=.pem","location":"security-state-staging/intermediates/9e9ff0f0-f45d-41dc-8a17-414e7c15f484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2BA/wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=","crlite_enrolled":true,"id":"60bc13d6-1760-488c-b696-f2dd9d3df1a2","last_modified":1562025578546},{"schema":1562025575484,"derHash":"JhjEFcFGupil8K1+pJiqWHgLpV+o47By0TwzDUEBBxc=","subject":"CN=EuropeanSSL Client CA,O=EUNETIC GmbH,C=DE","subjectDN":"MEQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxFVU5FVElDIEdtYkgxHjAcBgNVBAMTFUV1cm9wZWFuU1NMIENsaWVudCBDQQ==","whitelist":false,"attachment":{"hash":"939382e857302d9c045c2918ffbab03973b2a29f5c566cfdd7e53388636562f6","size":1723,"filename":"6rE_4fpPwsenurNcVvOyU8xh7Vp9kamSGTFA4_9ffGI=.pem","location":"security-state-staging/intermediates/bfff1194-870c-47b2-ba6e-1180017f2936.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rE/4fpPwsenurNcVvOyU8xh7Vp9kamSGTFA4/9ffGI=","crlite_enrolled":false,"id":"1b741d5d-51c9-4a71-92ad-b421a5c2824e","last_modified":1562025576254},{"schema":1562025573252,"derHash":"cLm6WVQSz4YUt2dH/Wg8yidZ9CZCFkg0++/diFBcTxw=","subject":"CN=emSign ECC Device CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG0xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSIwIAYDVQQDExllbVNpZ24gRUNDIERldmljZSBDQSAtIEcz","whitelist":false,"attachment":{"hash":"d7af7c53238ed1dc9fffed6f3e5bce922f646c3ff9a60630c499d766352973cc","size":1142,"filename":"yETFaiH0jqwEN-yzu6pHbtmjgE5XzT3dvmi_Wzb31hM=.pem","location":"security-state-staging/intermediates/b6e31f0d-7208-4e42-8621-2efeaacbb876.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yETFaiH0jqwEN+yzu6pHbtmjgE5XzT3dvmi/Wzb31hM=","crlite_enrolled":false,"id":"c71399ad-5c58-4c11-9f7a-9147f50eae00","last_modified":1562025573987},{"schema":1562025571754,"derHash":"jZkhf/gtYOTfWb6KESFiXN/8TyLyHhJjod8G0twLVA4=","subject":"CN=QuoVadis QVRCA3G1 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTNHMSBTU0wgSUNB","whitelist":false,"attachment":{"hash":"4de419e355223a24032129dc3cd0fc679d92fcf36397afb5432936371479b9f5","size":2373,"filename":"m7H4WXNR3iGdK5BvRMFrKs78WAc-SoBCaPH-fLXigIw=.pem","location":"security-state-staging/intermediates/4ff3d1f9-4d98-4fa8-be76-8e1e5434cbdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7H4WXNR3iGdK5BvRMFrKs78WAc+SoBCaPH+fLXigIw=","crlite_enrolled":true,"id":"7be166ff-6cb1-402e-a354-a7337b7f2b7a","last_modified":1562025572488},{"schema":1562025571006,"derHash":"cG7LIbCW9v/M3J6+WqG3dvZNuPrn8KXAMscQQeUCuY8=","subject":"CN=AlwaysOnSSL RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGQxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVQWx3YXlzT25TU0wgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"0f46d6d2cca30792c370bd3b90969ec1e9cea56ad57621f2bd0fbf01ad6694cf","size":1678,"filename":"e7puxxctXmI2MqLnC-hc5AHDs-k8kQisdTcQbwxeeVw=.pem","location":"security-state-staging/intermediates/3d06736e-8267-4a12-a633-3600f98ff6fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7puxxctXmI2MqLnC+hc5AHDs+k8kQisdTcQbwxeeVw=","crlite_enrolled":false,"id":"e19127f4-02c2-4c09-a41d-a8487ab8ba3e","last_modified":1562025571746},{"schema":1562025570263,"derHash":"GpSMtekceQdDCTBFiJGmWg+q/o+zrweCSrY38iD2bSk=","subject":"CN=SecureTrust Secure Email CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IFNlY3VyZSBFbWFpbCBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ab9d76d98b7e15ddaff1cc6705503cc27e91b1c04e31e806f4bcea03dd345850","size":1707,"filename":"BGO27QFH6rNm9gr94hQ_pwpry227wWtyTaec9ZnAQMM=.pem","location":"security-state-staging/intermediates/4d0c7b73-fb1b-4ba2-852c-7b073f9b829c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BGO27QFH6rNm9gr94hQ/pwpry227wWtyTaec9ZnAQMM=","crlite_enrolled":false,"id":"b9dc7d52-8b0e-46d8-9878-51762ccd2aae","last_modified":1562025570998},{"schema":1562025567263,"derHash":"mp/DkCmr4TLWdNAy0ZnLhDGqyHjavObp4a7LgeyZ9Mw=","subject":"CN=thawte Primary Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExl0aGF3dGUgUHJpbWFyeSBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"bafc005b16bae347d59a3a7bf07a0c9eaf0f0e42cd9942af7404ef78c1b79f57","size":1662,"filename":"GeZLo-BA_Z6e8rPBE9nX-x6kAYZSVx3EtzJm0kkmCi8=.pem","location":"security-state-staging/intermediates/058fe399-3919-4528-8452-fe055f2b4630.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GeZLo+BA/Z6e8rPBE9nX+x6kAYZSVx3EtzJm0kkmCi8=","crlite_enrolled":false,"id":"89d303d5-9a8c-4a13-8200-40cec4505421","last_modified":1562025567998},{"schema":1562025566502,"derHash":"W4fiIvIDRvo2KIFu1s5x+qughX+4vLpzd26h+lbNAFc=","subject":"CN=RapidSSL SHA256 CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"cee3d5e53c8fb88912d492c3a976adf689082cc7d09d8f1ad43ff0ab0ea3e52c","size":1670,"filename":"aef6IF2UF6jNEwA2pNmP7kpgT6NFSdt7Tqf5HzaIGWI=.pem","location":"security-state-staging/intermediates/e3b45219-1226-4cd3-b74a-ba627fc772be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aef6IF2UF6jNEwA2pNmP7kpgT6NFSdt7Tqf5HzaIGWI=","crlite_enrolled":false,"id":"21950fe4-3bac-4f48-8082-d93e1d39f57f","last_modified":1562025567256},{"schema":1562025562772,"derHash":"32UwhcjtX4RMuwkWG4rgvy82gi+Te/e7Gmicb8i9V5o=","subject":"CN=cPanel Extended Validation ECC Certification Authority,OU=Controlled by COMODO exclusively for cPanel\\, Inc.,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xFTATBgNVBAoTDGNQYW5lbCwgSW5jLjE6MDgGA1UECxMxQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIGNQYW5lbCwgSW5jLjE/MD0GA1UEAxM2Y1BhbmVsIEV4dGVuZGVkIFZhbGlkYXRpb24gRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"8a86e6f0dba359bf8534a11ef39bc706ea74fe3c37ef6c1ddc14e0fcf3a44a82","size":1427,"filename":"M0KI4Ko0g5TclE_ltD5sgAvt8tWcj6K5Je7fmwLXcmg=.pem","location":"security-state-staging/intermediates/ce27d567-565e-4cf1-97c8-01a6e490337d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M0KI4Ko0g5TclE/ltD5sgAvt8tWcj6K5Je7fmwLXcmg=","crlite_enrolled":false,"id":"7c78c5c2-4088-45e8-b0ba-2ab26ea31e01","last_modified":1562025563524},{"schema":1562025560509,"derHash":"ftGTYa1zTXA/ut8Cn1LsO2ZI2N1WuroIhO1PhZtbk3U=","subject":"CN=Herritar eta Erakundeen CA - CA de Ciudadanos y Entidades (4),OU=NZZ Ziurtagiri publikoa - Certificado publico SCI,O=IZENPE S.A.,C=ES","subjectDN":"MIGnMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMU5aWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0kxRjBEBgNVBAMMPUhlcnJpdGFyIGV0YSBFcmFrdW5kZWVuIENBIC0gQ0EgZGUgQ2l1ZGFkYW5vcyB5IEVudGlkYWRlcyAoNCk=","whitelist":false,"attachment":{"hash":"4e2f85a9143fff0c499621d1b49e3f60d3c41d4a5456e8430b978d6171ec3334","size":2576,"filename":"psxZHe33uBE3X2CLur2frMJV_OKLVcjyPVVShpA--N4=.pem","location":"security-state-staging/intermediates/5cd6b31f-ffd5-4d52-a9e8-fa36ce7bbed8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"psxZHe33uBE3X2CLur2frMJV/OKLVcjyPVVShpA++N4=","crlite_enrolled":true,"id":"9827f84e-7c8f-4336-952d-450a06e83326","last_modified":1562025561262},{"schema":1562025559768,"derHash":"m9+zg/lrCktUtdbBxMweogWCub7Cu8YzkEzeh+6u29E=","subject":"CN=SECOM Passport for Member PUB CA7,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTc=","whitelist":false,"attachment":{"hash":"2f01f21ca9e48571a30e9933457faf8d617a0fc0544b0e36c7d42ba4165df819","size":1695,"filename":"K_7TdwdfqZgQqXEvsippKe857WFIJ7-iGlYgYdHo0c8=.pem","location":"security-state-staging/intermediates/fea86beb-fe7e-4048-9530-d96971843fc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K/7TdwdfqZgQqXEvsippKe857WFIJ7+iGlYgYdHo0c8=","crlite_enrolled":false,"id":"7770d262-2bdb-4ef7-8e57-a12893469529","last_modified":1562025560501},{"schema":1562025559020,"derHash":"XekVK+0x+gUV3R/HRhM/EydWLvcqhM8tJAPnSKYE0NQ=","subject":"CN=Let's Encrypt Authority X4,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYNA==","whitelist":false,"attachment":{"hash":"c715837b5cfccee20ea9dee2bf1248b0c86b0a49131fefcbe9dc28ff63dc5df4","size":1983,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/fa35ef4b-12d7-45e2-b335-c02f0d599219.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"6c3e369b-f720-45e1-9370-4ea8065c7c95","last_modified":1562025559758},{"schema":1562025558267,"derHash":"nNBykOi+3ZnPc5f5TLASsi7sE9pS7ZTzAXoupBRuqY0=","subject":"CN=HARICA S/MIME ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"f66d479e18356da82e4d231247d8bd5278e9884bf74c3118df07be05c95aa7b6","size":1443,"filename":"axmO2GJ2kjqEicyms7TJ0lABBqiozjItK6Zso_S1D9M=.pem","location":"security-state-staging/intermediates/bc7fd8b5-70e3-49e4-8c10-9d9d29b1eb10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"axmO2GJ2kjqEicyms7TJ0lABBqiozjItK6Zso/S1D9M=","crlite_enrolled":false,"id":"11cc2bb1-fc7d-4194-a61a-fddbefb3ca1c","last_modified":1562025559012},{"schema":1562025556764,"derHash":"KAu8NKmMx5YGqJaQ5Sq3L9xf/yddw2bEgnsWVjE+l5A=","subject":"CN=Don Dominio / MrDomain RSA DV CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"f6b7422faba44515b2fbf75aa4b06572f321cea63e5a19794440c400e5ac0cc9","size":2170,"filename":"k5zZlzm-7Ha5WKka7Wov4zebiiAPJ0-9cRslSNnRFWA=.pem","location":"security-state-staging/intermediates/356a0d2d-83bc-4215-8e84-dfade5405db5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5zZlzm+7Ha5WKka7Wov4zebiiAPJ0+9cRslSNnRFWA=","crlite_enrolled":true,"id":"f9c8f2af-446a-4150-9b8c-e06c472f9754","last_modified":1562025557503},{"schema":1562025555273,"derHash":"Y+2VsX/9y3rjD+rGqHRlMJkmTiGyaNg22VeWbwsEvkM=","subject":"CN=Ericsson NL Individual CA v3,O=Ericsson,C=SE","subjectDN":"MEcxCzAJBgNVBAYTAlNFMREwDwYDVQQKDAhFcmljc3NvbjElMCMGA1UEAwwcRXJpY3Nzb24gTkwgSW5kaXZpZHVhbCBDQSB2Mw==","whitelist":false,"attachment":{"hash":"fbc57ea9c1b2e224c728dfb5633827b206e81886f616d127c7638d4158c30ee6","size":2402,"filename":"gdwzJYc_pmK1jRgbaVo-CtT9QF4X6E1CcSK_5j-CHnc=.pem","location":"security-state-staging/intermediates/0c3604ee-ea79-46ad-8e68-81764865032e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gdwzJYc/pmK1jRgbaVo+CtT9QF4X6E1CcSK/5j+CHnc=","crlite_enrolled":false,"id":"9e2198dd-7423-466f-bd25-622f89d43770","last_modified":1562025556016},{"schema":1562025553755,"derHash":"LoFrz4UtgwJF3cNTS8+FpTsLGZkaUlzTKGJv10pA/II=","subject":"CN=GIS CA,OU=CA,O=GAZINFORMSERVICE Company limited,C=RU","subjectDN":"MFYxCzAJBgNVBAYTAlJVMSkwJwYDVQQKDCBHQVpJTkZPUk1TRVJWSUNFIENvbXBhbnkgbGltaXRlZDELMAkGA1UECwwCQ0ExDzANBgNVBAMMBkdJUyBDQQ==","whitelist":false,"attachment":{"hash":"4cedd57a38da64d6828aeb1b9ecfff34356abc080d413388c1ee191b7f2655dd","size":1601,"filename":"Bmyhj612-woocGRpHnc19r3dxL8Sz3qG4LDIr6VB3hY=.pem","location":"security-state-staging/intermediates/1c1b4e26-24a6-4505-9e5b-06e5e18d585a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bmyhj612+woocGRpHnc19r3dxL8Sz3qG4LDIr6VB3hY=","crlite_enrolled":false,"id":"03ccc153-2946-4d3d-be6c-b0881bebecf6","last_modified":1562025554496},{"schema":1562025551490,"derHash":"vbz+EZP7uSOr7hTKZiKP7IkLGOAhAsDZqY7y6GJuyns=","subject":"CN=Technical University of Crete CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjFEMEIGA1UECgw7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLDAqBgNVBAMMI1RlY2huaWNhbCBVbml2ZXJzaXR5IG9mIENyZXRlIENBIFIx","whitelist":false,"attachment":{"hash":"3db47bbdd3795e85ad600eb6fe393b0fcb6ae8991ef4af2e9bd7628b6f48f23b","size":2182,"filename":"ANwGE0ZaMhJXXiuIMDohCrwQWZohBpNfhyCEYW4H3dc=.pem","location":"security-state-staging/intermediates/9ac9ad25-52e0-46ee-a3e4-271e8e52c034.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ANwGE0ZaMhJXXiuIMDohCrwQWZohBpNfhyCEYW4H3dc=","crlite_enrolled":true,"id":"434a2f0e-2e97-40ee-b3ed-3b4161a532f7","last_modified":1562025552255},{"schema":1562025549998,"derHash":"1yERA4jKbyC7qf0ajbpO+4wWOSo9662XxVPurwrKyqw=","subject":"CN=TeliaSonera Server CA v2,O=TeliaSonera,C=FI","subjectDN":"MEYxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2VydmVyIENBIHYy","whitelist":false,"attachment":{"hash":"2f9dcba71811d0e494412cb5ac40c7215fd1e0e68794cf9d419462eb22bfdd4d","size":2528,"filename":"Fq3YMR2ibLgpoD509egJDn5cPXPfnXC5MUd2IWwV_qA=.pem","location":"security-state-staging/intermediates/e40e2f56-df5c-40a6-85f6-694d1d00f167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fq3YMR2ibLgpoD509egJDn5cPXPfnXC5MUd2IWwV/qA=","crlite_enrolled":true,"id":"3082ff87-55fc-4380-b33c-8f226a13dcec","last_modified":1562025550741},{"schema":1562025548476,"derHash":"resKwbN/XaRKaEjhS3NZcPkg/5x2JdqKoJmonqbXfHI=","subject":"CN=Technological Educational Institution of Thessaloniki CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgVGhlc3NhbG9uaWtpIENBIFIz","whitelist":false,"attachment":{"hash":"5b159fe11a04b001c33c5ad2e26f8314521fe4ba8377ff1dfa35fbb0d1c364c9","size":2576,"filename":"qVNET7_Zz6zS9i8KHh-GZOmKOFwBKjPuzYbBnMqBfRo=.pem","location":"security-state-staging/intermediates/747153bd-4eb6-4465-8e57-ed57495ed0a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qVNET7/Zz6zS9i8KHh+GZOmKOFwBKjPuzYbBnMqBfRo=","crlite_enrolled":true,"id":"b3fb74cf-8af2-47cc-b99e-55a1850ec31a","last_modified":1562025549240},{"schema":1562025547725,"derHash":"9BppSzgllC24lSPpd1+Zfbn6KZg5jcOadLcmcNrP1Gg=","subject":"CN=Starfield Secure Extended Validation Code Signing CA - G2,O=Starfield Technologies\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGeMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UEChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMUIwQAYDVQQDEzlTdGFyZmllbGQgU2VjdXJlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"88f852539dedf76ad7544f8aeb8a7d5aec509c504852a87b3cd5ddb9ce509469","size":1813,"filename":"43LAOVcZZKWCk7veYuyGUt0baGZdRZsfIBAmB7OlE8s=.pem","location":"security-state-staging/intermediates/e9ab7ece-e153-4d24-ba09-e51a29208528.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"43LAOVcZZKWCk7veYuyGUt0baGZdRZsfIBAmB7OlE8s=","crlite_enrolled":false,"id":"32ab8607-6d98-4de9-aee6-d3993cd8c627","last_modified":1562025548468},{"schema":1562025546979,"derHash":"YD1pgiOBoL/CdLvtZwCbx98TPLkC+iQs9Yv3J9I9VJU=","subject":"CN=Sutter Health CA,OU=Orion Health Direct Secure Messaging,O=Sutter Health\\, a California nonprofit public benefit corporation,C=US","subjectDN":"MIGiMQswCQYDVQQGEwJVUzFJMEcGA1UEChNAU3V0dGVyIEhlYWx0aCwgYSBDYWxpZm9ybmlhIG5vbnByb2ZpdCBwdWJsaWMgYmVuZWZpdCBjb3Jwb3JhdGlvbjEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRkwFwYDVQQDExBTdXR0ZXIgSGVhbHRoIENB","whitelist":false,"attachment":{"hash":"261d3dcbc380cdce3b0985f015ff39b28f560089caa3fe079b37d1dc1fd7db9c","size":2337,"filename":"5tfROj-rDBEjz6--464WIXkKw55dhqqzPscv3mBSipM=.pem","location":"security-state-staging/intermediates/7b819190-fb9a-4041-bc3b-78febdf0c849.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5tfROj+rDBEjz6++464WIXkKw55dhqqzPscv3mBSipM=","crlite_enrolled":false,"id":"edd6bf94-d421-4767-a0cc-afc7defb5666","last_modified":1562025547718},{"schema":1562025546244,"derHash":"FEIqG9WpHtunOXuGmJIjabavaYT/h6z2E52qkZ55WhQ=","subject":"CN=Hongkong Post e-Cert CA 1 - 14,O=Hongkong Post,C=HK","subjectDN":"ME4xCzAJBgNVBAYTAkhLMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MScwJQYDVQQDEx5Ib25na29uZyBQb3N0IGUtQ2VydCBDQSAxIC0gMTQ=","whitelist":false,"attachment":{"hash":"5a4d38e1effb5367e3fd8c4536f7e3be9e065be0cb93778e4484d32658a3c99c","size":1626,"filename":"vSKE_tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=.pem","location":"security-state-staging/intermediates/44f50bf9-a77b-4072-997d-ecb9e4196036.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vSKE/tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=","crlite_enrolled":false,"id":"05017875-8b94-4416-a852-fb1978415050","last_modified":1562025546971},{"schema":1562025544009,"derHash":"LmQsC+E6XeC8b7Pr5Cofrdt2Io0k3k/ruVtsOlSVM+s=","subject":"CN=United Parcel Service\\, Inc. RSA Client CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjEyMDAGA1UEAxMpVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"16a99f6659e69c9ae43dce74e5f55c2821e4c4b8102837c4e4b42be118238fe0","size":2133,"filename":"ADxdm5JW4ZAlMiTPdTtze13AoPKn5Ek4CVg8v3KP1aY=.pem","location":"security-state-staging/intermediates/9378362f-f38c-4094-b57e-66057d63456e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ADxdm5JW4ZAlMiTPdTtze13AoPKn5Ek4CVg8v3KP1aY=","crlite_enrolled":false,"id":"213eee19-f9c9-4440-b1e9-e14ae86ebf53","last_modified":1562025544746},{"schema":1562025538762,"derHash":"yo0PRzZFSuy+xd7sgJmMnr9B0Gxyjzx2zKJBUbxi1GM=","subject":"CN=DigiCert SHA2 Assured ID Timestamping CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBUaW1lc3RhbXBpbmcgQ0E=","whitelist":false,"attachment":{"hash":"cd22b462d7f7734d96e2f18ec558531d69e068abc2e4e91aaf88f0e849995c68","size":1861,"filename":"HXt5TooTUF4biA-m_h8zYOgpzJhFWnTDzgXfFqp3j3U=.pem","location":"security-state-staging/intermediates/2214d2c0-44ec-41b4-9661-48f9f5cfec31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HXt5TooTUF4biA+m/h8zYOgpzJhFWnTDzgXfFqp3j3U=","crlite_enrolled":true,"id":"89a2403e-23bf-426d-882a-8055a3e89d86","last_modified":1562025539506},{"schema":1562025537279,"derHash":"3/WD46HtNeV9lRBIF62CPAVfuQcc1ABDW1/HTmkggds=","subject":"CN=Symantec Basic DV SSL CA - G2,OU=Symantec Trust Network+OU=Domain Validated SSL,O=Symantec Corporation,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSYwJAYDVQQDEx1TeW1hbnRlYyBCYXNpYyBEViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"847aebbd5575a61f84be32bdb3dd7939184b251b0eb1611ef8ddb3440581e832","size":1918,"filename":"vJ6JGRfCsYINcfiUwxxg4vmkhmQOTi3jksgxCavebo8=.pem","location":"security-state-staging/intermediates/9e75dfa5-ba9c-402f-96de-7b864ea83342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vJ6JGRfCsYINcfiUwxxg4vmkhmQOTi3jksgxCavebo8=","crlite_enrolled":false,"id":"ae09b3e0-9e79-444e-995b-db575d939ffd","last_modified":1562025538011},{"schema":1562025535060,"derHash":"k8OBywezU6kgwqe+1r6/GVxoJ53QUn038gvdDZnDMPo=","subject":"CN=DigiCert Assured ID CA G2,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"b7c018817ad0fe311c0e3f46cb59e0998110a056304537716c2436a17916b212","size":1654,"filename":"dnPPE-JM_ZaNCC1Q198LELhQiAdfMsEPXi1LVYU-aPQ=.pem","location":"security-state-staging/intermediates/dd6dcf5a-a932-4645-be43-cc51dd5ef65c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dnPPE+JM/ZaNCC1Q198LELhQiAdfMsEPXi1LVYU+aPQ=","crlite_enrolled":true,"id":"a29b66e0-76d3-421c-90a3-3ed1083fe7a9","last_modified":1562025535793},{"schema":1562025532067,"derHash":"9ujsmwB3XMNnEDaToAFW/6WrhE5kB7HShTsIQfRRlG8=","subject":"CN=TrustOcean SSL CA - RSA - 2018,OU=RSA Domain Validation Secure Server - 2018,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIGjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMTMwMQYDVQQLEypSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTgxJzAlBgNVBAMTHlRydXN0T2NlYW4gU1NMIENBIC0gUlNBIC0gMjAxOA==","whitelist":false,"attachment":{"hash":"ed8dcc0f133ed1d1d3a53ead175c2642a1c5993820e97d74208cf3d363b608c5","size":2203,"filename":"e6xirxtNeGowerSlFMxXXnPAZUkXIXVu3FhkcvhvI7w=.pem","location":"security-state-staging/intermediates/a505f7ec-abe1-4afe-9a42-cad25bf7f8cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6xirxtNeGowerSlFMxXXnPAZUkXIXVu3FhkcvhvI7w=","crlite_enrolled":true,"id":"3a66312e-40aa-4141-b4bb-23159586906d","last_modified":1562025532803},{"schema":1562025529824,"derHash":"4F7UqeTHczCKk+hJhhIlrjSakrvUus3UkArU5zsTEQA=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"10b46479f6babe96f43e63ab11f87d973a00150e7dc2e9e4b6ce7b5e22ab3005","size":1634,"filename":"Rhcj0dcdOovISeMPXTWpuUDiNf1EzyxSHeMUK0lfoR8=.pem","location":"security-state-staging/intermediates/ae31b0a6-8423-4c86-a060-ba964c79794d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rhcj0dcdOovISeMPXTWpuUDiNf1EzyxSHeMUK0lfoR8=","crlite_enrolled":true,"id":"6ccb21c1-806e-410f-a6cb-594456ae82c0","last_modified":1562025530558},{"schema":1562025528330,"derHash":"eCbeG+QU5FTPyuDRexf/DK0S7mjPSH81ezhJnidLAXE=","subject":"CN=certSIGN SSL EV CA Class 3 G2,OU=certSIGN SSL EV CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHAxCzAJBgNVBAYTAlJPMREwDwYDVQQKDAhjZXJ0U0lHTjEmMCQGA1UECwwdY2VydFNJR04gU1NMIEVWIENBIENsYXNzIDMgRzIxJjAkBgNVBAMMHWNlcnRTSUdOIFNTTCBFViBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"bc1a9e940bb65deb19b1cb6d6aa4d8f360fdb2b2ae863c58bbf437c0cc0a4c6e","size":1626,"filename":"Yhf8lB-ohgsX4JNEP0LyfAgUEVbH6pn046hso3mF6Hg=.pem","location":"security-state-staging/intermediates/6017afd4-09df-42e0-9159-080ef3054310.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yhf8lB+ohgsX4JNEP0LyfAgUEVbH6pn046hso3mF6Hg=","crlite_enrolled":false,"id":"092ca645-852e-4f2a-85d5-1fdaa3bbb874","last_modified":1562025529063},{"schema":1562025524408,"derHash":"qcjpcSWaLtbmX3IeB6qWfHLHzbR8e+EojYe/CNLzWA0=","subject":"CN=Accenture Federal Services External CA,O=Accenture Federal Services LLC,ST=DE,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTEnMCUGA1UEChMeQWNjZW50dXJlIEZlZGVyYWwgU2VydmljZXMgTExDMS8wLQYDVQQDEyZBY2NlbnR1cmUgRmVkZXJhbCBTZXJ2aWNlcyBFeHRlcm5hbCBDQQ==","whitelist":false,"attachment":{"hash":"65c088044cd4735247c82fee610957f89cac4992c45e988b083aeb47757d5c08","size":1869,"filename":"k3Rb5ZqNYk6_1pEsnBWNNE1yn9vfIlJ90ZV3vqb7oEU=.pem","location":"security-state-staging/intermediates/a12744fd-3faa-416a-921b-d4943319e43c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3Rb5ZqNYk6/1pEsnBWNNE1yn9vfIlJ90ZV3vqb7oEU=","crlite_enrolled":false,"id":"c540bcea-ae3d-4bd9-ae0d-918e2ffbdbaa","last_modified":1562025525188},{"schema":1562025523636,"derHash":"C/jSeHGiXvvMcPVsJoyAxC0oxfHRimnAGA2YmyuNZxo=","subject":"CN=CertAssure ECC EV Secure Server Certification Authority,OU=Controlled by COMODO exclusively for CertAssure Inc.,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xPTA7BgNVBAsTNENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBDZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgRUNDIEVWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"61bf81b404a388537069a6ca1778291879f9ac51e8f78d42e4e640af887d27ee","size":1443,"filename":"ok9f2xbTTMytgvbxoAC3WVM2u44IiamlaLqKpKO_Se0=.pem","location":"security-state-staging/intermediates/713b734a-dcb5-4488-8c91-fb386062b7b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ok9f2xbTTMytgvbxoAC3WVM2u44IiamlaLqKpKO/Se0=","crlite_enrolled":false,"id":"64061b54-c2b8-41e0-9026-003c9204d5c4","last_modified":1562025524400},{"schema":1562025522880,"derHash":"6BsB+fVpLPOCPG/TWIZUK/ru/F6pT04kbkLEqfxf6Ks=","subject":"CN=GDCA TrustAUTH R4 OV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IE9WIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"62f632973d4566730fb0c215f361db0c6377f4fe7015f37d2f43bbbff8b9422b","size":1727,"filename":"X_kDRJGyo1gr5XgS4hGkA1JH19Rbn0-jAdxRkGwOfis=.pem","location":"security-state-staging/intermediates/b0587fd9-8f56-4f2e-bb41-45600e3dd3f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kDRJGyo1gr5XgS4hGkA1JH19Rbn0+jAdxRkGwOfis=","crlite_enrolled":true,"id":"242f8001-c709-472f-8e95-69caf24cb984","last_modified":1562025523628},{"schema":1562025522128,"derHash":"/UwrmT4DVukNT5+9I2He8aSYN4zuzrkt12/grX4sexY=","subject":"CN=LLB Root CA public v3,O=Liechtensteinische Landesbank AG,C=LI","subjectDN":"MFgxCzAJBgNVBAYTAkxJMSkwJwYDVQQKDCBMaWVjaHRlbnN0ZWluaXNjaGUgTGFuZGVzYmFuayBBRzEeMBwGA1UEAwwVTExCIFJvb3QgQ0EgcHVibGljIHYz","whitelist":false,"attachment":{"hash":"225f216bec9fd5f148f91a91fed5f24692bf9e5c51303a7c1e90b008dd44d103","size":2962,"filename":"NRgw95tt85HJuu4CfCZX4-xKo5pkkTNI_W6Iv9pV3vs=.pem","location":"security-state-staging/intermediates/6e7b78f9-c4f1-4ea2-80c7-6fdb9a4be85c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NRgw95tt85HJuu4CfCZX4+xKo5pkkTNI/W6Iv9pV3vs=","crlite_enrolled":false,"id":"5aaa9313-aa3d-449a-8c77-2cb032c7ce53","last_modified":1562025522872},{"schema":1562025521355,"derHash":"Kl6ti0GnzdwSaxDtJIou7+2oVWYDQvIio4zGYF1EPiI=","subject":"CN=InComm Agent Solutions Inc Root Certificate Authority,O=InComm Agent Solutions Inc,ST=Florida,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEjMCEGA1UEChMaSW5Db21tIEFnZW50IFNvbHV0aW9ucyBJbmMxPjA8BgNVBAMTNUluQ29tbSBBZ2VudCBTb2x1dGlvbnMgSW5jIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"31c63a5f2d41e64fcaf44e0f09cb40d2b97a4cf96133e3e1218bd242f642bdef","size":3279,"filename":"gjRan45dFolfE5atUzE5YRyiRP-Ume28jutJGa4F52Q=.pem","location":"security-state-staging/intermediates/96a22330-b050-4b28-a9d7-0bf6f1c758b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gjRan45dFolfE5atUzE5YRyiRP+Ume28jutJGa4F52Q=","crlite_enrolled":false,"id":"b128a011-ab73-48c6-9a91-ff4aacf63d67","last_modified":1562025522120},{"schema":1562025519874,"derHash":"CtdB2YqEw7nE51UuFb/x42m2gGg5RV26/KxjgSTV8QA=","subject":"CN=WISeKey CertifyID Advanced Services CA 2,OU=Copyright 2011 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGOMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZQ29weXJpZ2h0IDIwMTEgV0lTZUtleSBTQTEWMBQGA1UECxMNSW50ZXJuYXRpb25hbDExMC8GA1UEAxMoV0lTZUtleSBDZXJ0aWZ5SUQgQWR2YW5jZWQgU2VydmljZXMgQ0EgMg==","whitelist":false,"attachment":{"hash":"81fd96040b579082dcb68419d1094eb56463e3e20c10bd3fa17c3e16517983af","size":1804,"filename":"zdMfiH6IA0YPkhIz4JIAAig1qn2rsNG01lIg77-0Q_g=.pem","location":"security-state-staging/intermediates/7a9e18cd-0dc1-4345-8090-c78b5e715132.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdMfiH6IA0YPkhIz4JIAAig1qn2rsNG01lIg77+0Q/g=","crlite_enrolled":false,"id":"e8a2ac9e-74de-4224-956d-e36511c05c5c","last_modified":1562025520610},{"schema":1562025518366,"derHash":"IELjj8VziPHbMiLHq1vhHG7bfkVL9FSHrkT/LWordkU=","subject":"CN=Symantec Class 3 SHA256 Code Signing CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxNTAzBgNVBAMTLFN5bWFudGVjIENsYXNzIDMgU0hBMjU2IENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3603898500215969498b71d7763fd6c80194030c78e89cbe2cc4cd898da098a3","size":1890,"filename":"XTtvxiBTPOwi4pqFOHdXIcPbd4ypovT6ppPkiD6IopI=.pem","location":"security-state-staging/intermediates/5039c1ab-fbed-4c1c-85f8-8711a9c342ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XTtvxiBTPOwi4pqFOHdXIcPbd4ypovT6ppPkiD6IopI=","crlite_enrolled":true,"id":"18f77514-7954-4db7-97e6-ce50963c0834","last_modified":1562025519122},{"schema":1562025516726,"derHash":"SqgmR2MAt/BKTLjqBKPTTu/dczFwaqorN3DHY8bpgpw=","subject":"SERIALNUMBER=201920,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTIw","whitelist":false,"attachment":{"hash":"8be56415b479c3bd71fb4fa3f906ea2c8bee529abda29077c2168bb7dcec9bc3","size":2333,"filename":"agd4jcgZ7U9vszAHzkitYhaMypP6S1xWEdOio1i7XWk=.pem","location":"security-state-staging/intermediates/344fdd15-e8b8-4f4c-b0f7-32deb35dc5f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"agd4jcgZ7U9vszAHzkitYhaMypP6S1xWEdOio1i7XWk=","crlite_enrolled":false,"id":"a2b8c57d-821b-48be-bfd6-98b56202d19c","last_modified":1562025517463},{"schema":1562025515964,"derHash":"hXQ66mqXwTRF4IJMLh/lArl63RJKl+9RIP4H9VgS/DM=","subject":"CN=thawte Primary G3 Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyF0aGF3dGUgUHJpbWFyeSBHMyBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"b966d0608f7e57b49cc48ab7642ec205cb99622392d0c5e8bbd97d67cac8c981","size":1752,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/42f7fa9a-d4c9-4632-8f9a-43a30673af04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"f8329b3a-3b2c-4155-93af-3674f94626d3","last_modified":1562025516717},{"schema":1562025515215,"derHash":"MWImoQ0g2iJE0dqLwLKCg1ral92pT5AVPDy/n9UI8/s=","subject":"CN=TERENA eScience SSL CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"8581fa18f42b8918adea2532a23e06d00eb6673184af2b360f632d8d8810a0bf","size":2162,"filename":"oc7AIKwh7i1ZIjRUXdABQp1IDxMtDZil5mONjuWhNrw=.pem","location":"security-state-staging/intermediates/3d28f7d6-c877-4952-b501-934e0e63e91d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oc7AIKwh7i1ZIjRUXdABQp1IDxMtDZil5mONjuWhNrw=","crlite_enrolled":false,"id":"6e49815a-23d0-44f5-acfb-3db27567251c","last_modified":1562025515957},{"schema":1562025512974,"derHash":"b5Cl/ZiPrszsWxflYS/zbRmciEVR85TzGquk+SHkKgU=","subject":"CN=WISeKey CertifyID Advanced Services CA 3,OU=Copyright (c) 2015 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDE1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIFNlcnZpY2VzIENBIDM=","whitelist":false,"attachment":{"hash":"4393e05ab02178bc2ca8fb8233dcc75ea5ab977476ca3a1daac3f35467ee3bd1","size":1861,"filename":"LflM69jQUklvy4-1K0y670OKi5J-qdDMKD65BbHBC1w=.pem","location":"security-state-staging/intermediates/3f6ce260-ca71-4404-84a1-def903f8b228.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LflM69jQUklvy4+1K0y670OKi5J+qdDMKD65BbHBC1w=","crlite_enrolled":false,"id":"e371c1c1-08ab-45e5-808d-ac065dbcc687","last_modified":1562025513720},{"schema":1562025512184,"derHash":"X/rEPg3cW0rytpb2vE236R3zFLuP4NBxOgsaetKmj6w=","subject":"CN=Microsoft IT TLS CA 4,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgNA==","whitelist":false,"attachment":{"hash":"0a5d12cc2a6e89cac85a5cf8b44505305622b7fc2728ecbb1e917f31fa71a931","size":2036,"filename":"wUY9EOTJmS7Aj4fDVCu_KeE--mV7FgIcbn4WhMz1I2k=.pem","location":"security-state-staging/intermediates/585005f9-618d-4eba-8492-bc8713587608.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wUY9EOTJmS7Aj4fDVCu/KeE++mV7FgIcbn4WhMz1I2k=","crlite_enrolled":true,"id":"0978a1e0-b34b-4599-902a-03b07addc358","last_modified":1562025512966},{"schema":1562025509913,"derHash":"Qs/dpvZguOW0wcQRllpFGTElWeMmL422nS2uF7JrO6M=","subject":"CN=RNP ICPEdu OV SSL CA 2019,OU=Gerencia de Servicos (GSer),O=Rede Nacional de Ensino e Pesquisa - RNP,L=Rio de Janeiro,ST=Rio de Janeiro,C=BR","subjectDN":"MIG8MQswCQYDVQQGEwJCUjExMC8GA1UEChMoUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYSAtIFJOUDEkMCIGA1UECxMbR2VyZW5jaWEgZGUgU2Vydmljb3MgKEdTZXIpMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xIjAgBgNVBAMTGVJOUCBJQ1BFZHUgT1YgU1NMIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"8ed792d583fe417ecf576ea9ba51a3b76f0ca1d1979263b866fdc1d260e49731","size":1934,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/99d3faaf-d109-49f0-af7e-ace9ffabe9e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"dfb5e774-316b-43b6-a38e-c65e551ede8b","last_modified":1562025510662},{"schema":1562025509177,"derHash":"2IiPSoT3TJdN/7Vzob9bu6zRcTuQUJb46wFQYr85bE0=","subject":"CN=DarkMatter Assured CA,O=DarkMatter LLC,C=AE","subjectDN":"MEYxCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzEeMBwGA1UEAwwVRGFya01hdHRlciBBc3N1cmVkIENB","whitelist":false,"attachment":{"hash":"9ece1aca56a9484d62b81c93e6164987204a80f2f56507875c374fb0142f2469","size":2454,"filename":"wO0gU0a7veButWD1zuAqNjTiR0p-ds-PvvVjuxF90OM=.pem","location":"security-state-staging/intermediates/174ee1b5-dff7-441d-b8ae-bac7a4ea7395.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wO0gU0a7veButWD1zuAqNjTiR0p+ds+PvvVjuxF90OM=","crlite_enrolled":false,"id":"1eb36774-4682-48b8-99f8-89ba65d1dffb","last_modified":1562025509905},{"schema":1562025506918,"derHash":"3IYqPwJe9/JS+pQTy2DeJeV+aqfh+x3Ke1nSwiFxBuo=","subject":"CN=Staat der Nederlanden EV Intermediair CA,O=Staat der Nederlanden,C=NL","subjectDN":"MGAxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xMTAvBgNVBAMMKFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBJbnRlcm1lZGlhaXIgQ0E=","whitelist":false,"attachment":{"hash":"20b32e71047d03130c5abee6c17e94b54266c39387aaeb2f3f20ab2a00293064","size":2385,"filename":"F2qGHcawUpLrFM3Bakvv1HLNsSuhZ3AjWvwFk_fsUlQ=.pem","location":"security-state-staging/intermediates/7c8c1e28-85f4-4b11-beb8-53223276d75f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F2qGHcawUpLrFM3Bakvv1HLNsSuhZ3AjWvwFk/fsUlQ=","crlite_enrolled":true,"id":"ee67625f-1d82-4696-87f0-db1c529812ba","last_modified":1562025507665},{"schema":1562025506179,"derHash":"Xk/zRijavtaFm6zy4SioB6CPSbDCWdm+LjP+4Gasevc=","subject":"CN=SecureTrust Code Signing CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IENvZGUgU2lnbmluZyBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8309159fb3e9a032b16f326c2f3864df8c1f92301ff507d2950a27bea11c67f9","size":1613,"filename":"qWYqJU73KHoO_zICSkIr0M7QWK84NnIZGRhLvRLHocc=.pem","location":"security-state-staging/intermediates/a0f3e90d-4808-4c29-9d90-b6c75dd0bcea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qWYqJU73KHoO/zICSkIr0M7QWK84NnIZGRhLvRLHocc=","crlite_enrolled":false,"id":"80dce9dc-0e12-4410-be32-0a76c54ab462","last_modified":1562025506910},{"schema":1562025505422,"derHash":"m/lJZ3fRRCXtAIbBuywHB7YqYcGUxRYuTwdjev8Wa3Y=","subject":"CN=GlobalSign Timestamping CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"ce3ed3382cfca8726ebcc664e631bed0756c90bb7140cddbdd109b12175fdab5","size":1475,"filename":"qNR-DwyanLNyMurMwcUpVijQXK6JlGydxz7b2CNJx5k=.pem","location":"security-state-staging/intermediates/f32b145b-de9c-4e75-9666-414e3c647a20.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qNR+DwyanLNyMurMwcUpVijQXK6JlGydxz7b2CNJx5k=","crlite_enrolled":true,"id":"eed033d2-f12a-4125-92b7-1990e51d7913","last_modified":1562025506171},{"schema":1562025502424,"derHash":"CsK2CG6xDbVXajobjrDkNECCwbfYMlBPy/laSATVGDQ=","subject":"CN=CERTSIGN FOR BANKING SIMPLE SSL TEST CA V3,OU=Certificat de test Test certificate,O=certSIGN,C=RO","subjectDN":"MIGDMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLDAqBgNVBAsTI0NlcnRpZmljYXQgZGUgdGVzdCBUZXN0IGNlcnRpZmljYXRlMTMwMQYDVQQDEypDRVJUU0lHTiBGT1IgQkFOS0lORyBTSU1QTEUgU1NMIFRFU1QgQ0EgVjM=","whitelist":false,"attachment":{"hash":"301362625731dac5eb7b81495d7d67c27b4fb1d65a5cd95523b7a30f919868a6","size":1658,"filename":"BvkH8t9guVZzP7noiYDJM6l1ZztKvb9J8-54ik-6WFk=.pem","location":"security-state-staging/intermediates/de79005d-2e2f-4dc0-86e8-f105ed580da7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BvkH8t9guVZzP7noiYDJM6l1ZztKvb9J8+54ik+6WFk=","crlite_enrolled":false,"id":"1489788e-e63f-4fdc-8e4e-1a06fd2d279c","last_modified":1562025503177},{"schema":1562025500927,"derHash":"+p1t8a8CdTANUqSF0DawVDtT37REG+wLjJoN/4EbbYg=","subject":"CN=Entrust Code Signing Certification Authority - L1D,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMTswOQYDVQQDEzJFbnRydXN0IENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxRA==","whitelist":false,"attachment":{"hash":"3ab4f99522d4a1ebba62378e60fa3d93d465e523147db6f431462224a0e1fed6","size":1796,"filename":"q4FwU8-QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=.pem","location":"security-state-staging/intermediates/7f63a308-cc37-4aa4-a0df-341d3c227db8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q4FwU8+QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=","crlite_enrolled":false,"id":"bab7ff8a-caf1-417f-8c18-45de6956da8b","last_modified":1562025501666},{"schema":1562025500166,"derHash":"6uWboswzKBpc3exQz7/Z3QylVl8872mMk2ahDOwIf5c=","subject":"CN=Domain The Net Technologies Ltd CA for SSL R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MG8xCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMTYwNAYDVQQDDC1Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBTU0wgUjI=","whitelist":false,"attachment":{"hash":"dc6270566751505a7936c7847e06bc81b9c0a9ca4b21fd6512fbeaa3d7d3bc7d","size":2483,"filename":"1FBqLyRsP8ibxXXsW64LYWGTeYMGSsUTMFEetUQakD8=.pem","location":"security-state-staging/intermediates/c052ede4-8c2e-4eed-97b4-5d3e127c78f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1FBqLyRsP8ibxXXsW64LYWGTeYMGSsUTMFEetUQakD8=","crlite_enrolled":true,"id":"461724c9-5ae7-4021-be3d-b5c081e3b8d7","last_modified":1562025500918},{"schema":1562025498622,"derHash":"kY0pldob4hnjp+S6La+hGgJe6/TUo1o6iy25nnksaH4=","subject":"CN=Institute of Accelerating Systems and Applications SSL CA R1,O=Institute of Accelerating Systems and Applications,L=Athens,C=GR","subjectDN":"MIGiMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMTswOQYDVQQKEzJJbnN0aXR1dGUgb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9uczFFMEMGA1UEAxM8SW5zdGl0dXRlIG9mIEFjY2VsZXJhdGluZyBTeXN0ZW1zIGFuZCBBcHBsaWNhdGlvbnMgU1NMIENBIFIx","whitelist":false,"attachment":{"hash":"3227d4cd9162632a3344b5bf40179e61028d95d502e5747d6ff997f99e1464eb","size":2584,"filename":"at9jK6417LeuNsZ615BVxxLWrLPtoJLdMBfDe4WPAzQ=.pem","location":"security-state-staging/intermediates/bbefa09c-cafc-4275-a3e2-b647f7076851.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"at9jK6417LeuNsZ615BVxxLWrLPtoJLdMBfDe4WPAzQ=","crlite_enrolled":true,"id":"a1191fee-2efa-4764-8e64-b63579b09235","last_modified":1562025499398},{"schema":1562025497127,"derHash":"/CJFvlncZGHUEZw6Bu2+5NKIVWvYjEeeMO1fPoFhZGk=","subject":"CN=MPG CA - G02,O=Max-Planck-Gesellschaft,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MGoxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCYXllcm4xETAPBgNVBAcMCE11ZW5jaGVuMSAwHgYDVQQKDBdNYXgtUGxhbmNrLUdlc2VsbHNjaGFmdDEVMBMGA1UEAwwMTVBHIENBIC0gRzAy","whitelist":false,"attachment":{"hash":"43c1869e7e9b39a3e88534fec1a8ad7b6aa63eab2ad5f1a0dc457dc65ab08804","size":1983,"filename":"KEB9gT0zG0ZMgr0_mhORKVvNbNKMDEvo89gurjLLzYk=.pem","location":"security-state-staging/intermediates/608fe6af-14bc-4de0-83bc-a7b26be45449.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KEB9gT0zG0ZMgr0/mhORKVvNbNKMDEvo89gurjLLzYk=","crlite_enrolled":true,"id":"271d3f60-f00e-48ab-a3ed-13509369476e","last_modified":1562025497855},{"schema":1562025496364,"derHash":"ek/LoHn1vdzwp2w7A6N34VWlMAlHShs+uPNJYaU72pw=","subject":"CN=SECOM Passport for Member PUB CA8,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTg=","whitelist":false,"attachment":{"hash":"c0684ee95f098f8e4e9d458872bee1f661763e16e08e9d6468a417a6866b21c0","size":1695,"filename":"knWHoMFrEpDYcH_bcs_miCxeOB-UDZ0Od9J53hcgFTo=.pem","location":"security-state-staging/intermediates/edd28ea1-49ec-45fe-9115-70331fce9330.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"knWHoMFrEpDYcH/bcs/miCxeOB+UDZ0Od9J53hcgFTo=","crlite_enrolled":false,"id":"d9b97f0b-1f33-4059-afc0-b9b22421d0da","last_modified":1562025497120},{"schema":1562025495613,"derHash":"uxwB6ITdCRmrlNWvVXXNb+tx5WCytYc1p4sVChDVS/M=","subject":"CN=AAMC Direct Intermediate CA,OU=AAMC Direct Messaging,O=Anne Arundel Medical Center,C=US","subjectDN":"MHkxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtBbm5lIEFydW5kZWwgTWVkaWNhbCBDZW50ZXIxHjAcBgNVBAsTFUFBTUMgRGlyZWN0IE1lc3NhZ2luZzEkMCIGA1UEAxMbQUFNQyBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"286bfecb53b0d9b29d26533c7d51c5fb420701ea2fd97d77c8c2e35b5527c23c","size":2203,"filename":"MX1pC2RK37-NPr5PI1QhpoQO1JlFoVx4eAWyShJegwo=.pem","location":"security-state-staging/intermediates/26ef4eb5-e69e-4422-ba08-cba5446f95be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MX1pC2RK37+NPr5PI1QhpoQO1JlFoVx4eAWyShJegwo=","crlite_enrolled":false,"id":"a9d06cda-c795-4dae-8f8d-e612bb618904","last_modified":1562025496356},{"schema":1562025493351,"derHash":"+gCOFtHli+acfT5VNTz0/KJtqc5D51sYJs7xabdxlk4=","subject":"SERIALNUMBER=201903,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAz","whitelist":false,"attachment":{"hash":"3d9efb2320ac377e39214a083ef728e608468f15ac940b44b5ec026f6b5f5dd1","size":2333,"filename":"_ptmGnIhGIL555v-VzrWrwWliXZG-_Gtjaw3U9yq0Dk=.pem","location":"security-state-staging/intermediates/493165da-23b3-4744-a175-3a3659e553c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/ptmGnIhGIL555v+VzrWrwWliXZG+/Gtjaw3U9yq0Dk=","crlite_enrolled":false,"id":"122cfda9-8350-4bd2-b226-92d6ec264cdd","last_modified":1562025494102},{"schema":1562025490333,"derHash":"tEwGMAOfZeXc5XF6fLCMvtg+EDtHFTWBkcxLIgeTBbo=","subject":"SERIALNUMBER=201907,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA3","whitelist":false,"attachment":{"hash":"c4e57b87ffc99bca0261b099a9b314f1391c296d7b6d6fa3734ffe823fcb2976","size":2333,"filename":"gfBNwfL6MEQDNCljm2FFypvqnLrJmZGMO3sW47AmZDA=.pem","location":"security-state-staging/intermediates/23d7f272-7d2b-42c7-a799-ce1d5b201e01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gfBNwfL6MEQDNCljm2FFypvqnLrJmZGMO3sW47AmZDA=","crlite_enrolled":false,"id":"b42c7c68-9e0f-4fe8-8a25-e74156a8a1a3","last_modified":1562025491074},{"schema":1562025489551,"derHash":"uo7RkOkyWu1DgsaERjECUB+DG5b2PojKNfL+G7yMIsA=","subject":"CN=Piraeus University of Applied Sciences CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGKMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxNTAzBgNVBAMTLFBpcmFldXMgVW5pdmVyc2l0eSBvZiBBcHBsaWVkIFNjaWVuY2VzIENBIFIx","whitelist":false,"attachment":{"hash":"9da0c9629fca6be2e40503371efd3345089214f1c51772ce5424419163e0d8f2","size":2743,"filename":"yLZQpI_8sbjP1vWxETUhe0HsHKYOrjE111-yrrS8VHw=.pem","location":"security-state-staging/intermediates/bddc57bd-9002-4ae5-bbf1-5bc8f7478e4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yLZQpI/8sbjP1vWxETUhe0HsHKYOrjE111+yrrS8VHw=","crlite_enrolled":false,"id":"b46c4aee-89d5-489f-952e-a0be25381950","last_modified":1562025490325},{"schema":1562025488811,"derHash":"hdsL7tBmjQTXB0AA+Y6EsI0P1UKf9KJi3ny8FSihodo=","subject":"CN=SSL.com EV SSL Intermediate CA RSA R3,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLjAsBgNVBAMMJVNTTC5jb20gRVYgU1NMIEludGVybWVkaWF0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"c46e4dd819439f5a2d9a5d2211601d40b993e06abd5d732d23a35bb22ba8c164","size":2442,"filename":"4V6KJv09j4wCTdB1kG8-rfM7XCExYEpiXCGzJNL58IQ=.pem","location":"security-state-staging/intermediates/d130da26-d0a0-4e38-8c36-21ff44017d65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4V6KJv09j4wCTdB1kG8+rfM7XCExYEpiXCGzJNL58IQ=","crlite_enrolled":true,"id":"2e55d70f-46c9-4052-8db4-0a4d5811bae2","last_modified":1562025489544},{"schema":1562025486585,"derHash":"5mg+iDFc0ctAPAzqSQ98S0yCyRzUhQN0iarbqpCDn2E=","subject":"CN=RapidSSL SHA256 CA,O=GeoTrust Inc.,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJSYXBpZFNTTCBTSEEyNTYgQ0E=","whitelist":false,"attachment":{"hash":"0c427bb269700930378fdff9222a8084e44be120208a9d1c85da1818c55ccc4f","size":1553,"filename":"Slt48iBVTjuRQJTjbzopminRrHSGtndY0_sj0lFf9Qk=.pem","location":"security-state-staging/intermediates/51d0ad57-d709-4fd6-878e-800853fe44a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Slt48iBVTjuRQJTjbzopminRrHSGtndY0/sj0lFf9Qk=","crlite_enrolled":true,"id":"a1d663ba-8d2d-47cc-a3cf-348370fe97e5","last_modified":1562025487320},{"schema":1562025484343,"derHash":"Dugs637KJBzMKdTliAYsQ+RH7ebGlvE1rMQRlmEmuoM=","subject":"CN=Aristotle University of Thessaloniki SSL RSA SubCA R2,O=Aristotle University of Thessaloniki,L=Thessaloniki,C=GR","subjectDN":"MIGTMQswCQYDVQQGEwJHUjEVMBMGA1UEBwwMVGhlc3NhbG9uaWtpMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxPjA8BgNVBAMMNUFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBTU0wgUlNBIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"01ab73a33c9d719f58a09c3705ba3a27f08494d6b98a58a3c1cf1a8b73c04830","size":2962,"filename":"MOR9elaY2GOSXRQ0lkPZuOKdFNjk0evRDxZV72l0G6Y=.pem","location":"security-state-staging/intermediates/ae130e5d-a17e-4033-9421-9945a803151d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MOR9elaY2GOSXRQ0lkPZuOKdFNjk0evRDxZV72l0G6Y=","crlite_enrolled":true,"id":"0cfe3154-7bb3-4615-b637-5cd7a868f07c","last_modified":1562025485073},{"schema":1562025478331,"derHash":"iHH5nI9khT2RZEZOWa+z6th7brIPmGSbSweghO5sEk4=","subject":"SERIALNUMBER=201402,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwMg==","whitelist":false,"attachment":{"hash":"ec26f368737875a2881f23314886b24f9df446cc2759a1b454a725b37cc0fb48","size":1402,"filename":"5MRz3xew1J2eodt0I8LbElqYaptWQ2dbe84uXbsXefE=.pem","location":"security-state-staging/intermediates/fe54a667-4e34-4f87-9fa8-661cf2939604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5MRz3xew1J2eodt0I8LbElqYaptWQ2dbe84uXbsXefE=","crlite_enrolled":false,"id":"4a757875-256e-4611-9250-7948cffd2e85","last_modified":1562025479062},{"schema":1562025477573,"derHash":"ICi1Ih3id+8elh9OMYKjxQDuWqZ79bVE06bVil6md30=","subject":"CN=RU-CENTER High Assurance Services CA 2,O=RU-Center (\u0417\u0410\u041e \u0420\u0435\u0433\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0421\u0435\u0442\u0435\u0432\u043e\u0439 \u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u0426\u0435\u043d\u0442\u0440),L=Moscow,ST=Moscow,C=RU","subjectDN":"MIHNMQswCQYDVQQGEwJSVTEPMA0GA1UECBMGTW9zY293MQ8wDQYDVQQHEwZNb3Njb3cxazBpBgNVBAoMYlJVLUNlbnRlciAo0JfQkNCeINCg0LXQs9C40L7QvdCw0LvRjNC90YvQuSDQodC10YLQtdCy0L7QuSDQmNC90YTQvtGA0LzQsNGG0LjQvtC90L3Ri9C5INCm0LXQvdGC0YApMS8wLQYDVQQDEyZSVS1DRU5URVIgSGlnaCBBc3N1cmFuY2UgU2VydmljZXMgQ0EgMg==","whitelist":false,"attachment":{"hash":"2084d64f65967c43d9b17db5f8cdd4e5657fa8117b7544e8e70885c3ba03dc4d","size":2259,"filename":"Y8qWv3kk8QX9ecEOiluI35bMi7sfrRJPiD5ZnUYgq-g=.pem","location":"security-state-staging/intermediates/31475041-d093-493a-941d-b3b3020753fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y8qWv3kk8QX9ecEOiluI35bMi7sfrRJPiD5ZnUYgq+g=","crlite_enrolled":true,"id":"8dae2c43-6457-4056-9435-7fd37736a650","last_modified":1562025478323},{"schema":1562025476821,"derHash":"vJI+nHvr5T9VyXMrFvUdU7dyAzmkSBtCgaQBP2Ypn7Y=","subject":"CN=SSL.com DV CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEWMBQGA1UEAxMNU1NMLmNvbSBEViBDQQ==","whitelist":false,"attachment":{"hash":"c5707914003f2e3348b2d819e8a3f836ef2d4b8d2553ceb75fe22a2b62af054c","size":2105,"filename":"Csnhxeh1vsuMPZmVPaq9zufjZbtCA2WDcjROo3ZMJmY=.pem","location":"security-state-staging/intermediates/641c5dbf-a4d3-4f33-854a-1c71bb717a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Csnhxeh1vsuMPZmVPaq9zufjZbtCA2WDcjROo3ZMJmY=","crlite_enrolled":true,"id":"4af93016-ef93-484b-9fb5-971506f15e7e","last_modified":1562025477565},{"schema":1562025476076,"derHash":"W49+r3XRjWdK5nBf+rQ8q6YISpWm8Z4YCPBvCwzTfw0=","subject":"SERIALNUMBER=PT507015851,CN=DIGITALSIGN QUALIFIED TSA CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIG2MRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxJTAjBgNVBAMTHERJR0lUQUxTSUdOIFFVQUxJRklFRCBUU0EgQ0E=","whitelist":false,"attachment":{"hash":"de61aef599e63efcfa0754fb2e8a3dd87ffb49069188a24c4c267b8330852af3","size":2999,"filename":"eba3Dm8gkeBOmAEPMEXJUQJqoFAZpTSW0dUTpoKiXiU=.pem","location":"security-state-staging/intermediates/6ba896c9-1dbc-4dbb-a2b0-7b367394ce1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eba3Dm8gkeBOmAEPMEXJUQJqoFAZpTSW0dUTpoKiXiU=","crlite_enrolled":false,"id":"533f7578-20dd-4424-9067-dcd3cd960b25","last_modified":1562025476813},{"schema":1562025475338,"derHash":"vs/eEkzt00TZJctV7dpmLZqcBoj6mghwzj27baQxPk4=","subject":"CN=QuoVadis PKIoverheid Organisatie Services CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGEMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTowOAYDVQQDDDFRdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"ba1fd2a539b87d0e6ce58d2ff164fa4995802e3187facea07d2d4a47e2554906","size":2682,"filename":"Dd3dL3h7MwKL57AT7SDAXLcnBsv-F-NSsju9HDfnIUM=.pem","location":"security-state-staging/intermediates/c00199d1-677f-403e-a72f-6661d2766c66.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dd3dL3h7MwKL57AT7SDAXLcnBsv+F+NSsju9HDfnIUM=","crlite_enrolled":false,"id":"eada2bb2-7eee-4182-8069-0d14b9b2911e","last_modified":1562025476068},{"schema":1562025474587,"derHash":"I5/6htcQM7olWRR4IFfYfoQhrt1ZELeGkotqEkjD40E=","subject":"CN=CA Disig R2I3 Certification Service,O=Disig a.s.,L=Bratislava,C=SK","subjectDN":"MGUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMRMwEQYDVQQKDApEaXNpZyBhLnMuMSwwKgYDVQQDDCNDQSBEaXNpZyBSMkkzIENlcnRpZmljYXRpb24gU2VydmljZQ==","whitelist":false,"attachment":{"hash":"3420f786d68e2c9b43dcb43b746ca258b7a646ade27a146a00fe8af877df4f59","size":2142,"filename":"QUf9pBcUZxnKMgP_Op4uLhRku-x-b_JvkEQPmCrNbZY=.pem","location":"security-state-staging/intermediates/ccf776b5-dad9-4394-b424-8c2cacda75f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QUf9pBcUZxnKMgP/Op4uLhRku+x+b/JvkEQPmCrNbZY=","crlite_enrolled":false,"id":"85d742bd-cad8-4921-b914-8cb3b1931d2c","last_modified":1562025475330},{"schema":1562025473063,"derHash":"/SlUprx/R91EP2Fk2EVCRbsM/pz1Ws4327NbjkiVp9k=","subject":"CN=Technological Educational Institute of Epirus CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGRMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPDA6BgNVBAMTM1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRlIG9mIEVwaXJ1cyBDQSBSMw==","whitelist":false,"attachment":{"hash":"258f0ec659e411b76f696a63b9b54690d12b54e96a2fb86e896474db260f8cae","size":2560,"filename":"ifNtHuGOosnfWP8xv-35qett4I3b7lw-i4hIbE8TRKQ=.pem","location":"security-state-staging/intermediates/d58bdb06-bf59-4f47-a90c-3aedbe736775.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ifNtHuGOosnfWP8xv+35qett4I3b7lw+i4hIbE8TRKQ=","crlite_enrolled":true,"id":"818fa4ff-655c-4317-9fc1-6f97a7945f56","last_modified":1562025473803},{"schema":1562025472316,"derHash":"TWcjeyz6z/893IPC/xySqOCpinG9BO05+K/0Kq+ZNx0=","subject":"CN=Shuidi Webtrust SSL Domain Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MHgxCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMS0wKwYDVQQDDCRTaHVpZGkgV2VidHJ1c3QgU1NMIERvbWFpbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"63bdeba64d270d7fe2be7ee4b7e9a192c4f735067578e4fd400929b5b7d868b1","size":1780,"filename":"z8UvZVIyaOTkJosl2Vn8Hbcn7ChKCosFEmKBgvRLh6U=.pem","location":"security-state-staging/intermediates/8c50117d-cf04-4cb1-a7c7-4359f02fe4df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z8UvZVIyaOTkJosl2Vn8Hbcn7ChKCosFEmKBgvRLh6U=","crlite_enrolled":true,"id":"d35f58a2-ee1e-4379-a992-e748ce904d72","last_modified":1562025473055},{"schema":1562025471549,"derHash":"HZNobKQscDlPvcK8H5hGHRmHHCoAB4uBVJkxLtn2/gw=","subject":"CN=NetLock \u00dczleti Eat. (Class B Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG0MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFCMEAGA1UEAww5TmV0TG9jayDDnHpsZXRpIEVhdC4gKENsYXNzIEIgTGVnYWwpIFRhbsO6c8OtdHbDoW55a2lhZMOz","whitelist":false,"attachment":{"hash":"4fba3ae97dd053930e8514eb3fdcdbc3ccccbadc3b59f72c390b9e8968b894f8","size":2198,"filename":"_vwER7WMeggAoauXgB8U4heDYF3dmMm_S99ZfAayhZ8=.pem","location":"security-state-staging/intermediates/77e0aaee-29fa-489c-be2e-6dfde8a27857.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/vwER7WMeggAoauXgB8U4heDYF3dmMm/S99ZfAayhZ8=","crlite_enrolled":false,"id":"7174ab51-9ffe-493a-89bf-49620f52a798","last_modified":1562025472308},{"schema":1562025470795,"derHash":"igrdrk8s+dLCTXpJ7tXIbIsd8chbpz3lxHfLFPoNE+k=","subject":"CN=TeleSec ServerPass Extended Validation Class 3 CA,OU=T-Systems Trust Center,O=T-Systems International GmbH,POSTALCODE=57250,STREET=Untere Industriestr. 20,L=Netphen,ST=Nordrhein Westfalen,C=DE","subjectDN":"MIHzMQswCQYDVQQGEwJERTElMCMGA1UECgwcVC1TeXN0ZW1zIEludGVybmF0aW9uYWwgR21iSDEfMB0GA1UECwwWVC1TeXN0ZW1zIFRydXN0IENlbnRlcjEcMBoGA1UECAwTTm9yZHJoZWluIFdlc3RmYWxlbjEOMAwGA1UEEQwFNTcyNTAxEDAOBgNVBAcMB05ldHBoZW4xIDAeBgNVBAkMF1VudGVyZSBJbmR1c3RyaWVzdHIuIDIwMTowOAYDVQQDDDFUZWxlU2VjIFNlcnZlclBhc3MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDbGFzcyAzIENB","whitelist":false,"attachment":{"hash":"6a9bc970754ff10c0c32a05c6c462115e39db917fcb15d1f1100b01b47dd134b","size":2081,"filename":"MTsGouOKFT5kWxvdmCP_-h4QV7TzhyPSvGXJhG-g5f0=.pem","location":"security-state-staging/intermediates/05b2e8d3-5c0a-4ac8-a431-6bdcf5338f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MTsGouOKFT5kWxvdmCP/+h4QV7TzhyPSvGXJhG+g5f0=","crlite_enrolled":true,"id":"a0ea2a21-fe38-42f0-9e75-2978ac3f1b2b","last_modified":1562025471541},{"schema":1562025469311,"derHash":"E0XC05rktlzKceiOmispxx3JE/lS6TWoErAE26eueVc=","subject":"CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"e6da6a137d62a7acc06ba43bbecbca249317995ef2a5821be7c4c3e4904d11cd","size":2649,"filename":"qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem","location":"security-state-staging/intermediates/27528fc3-b963-415a-a99a-4f327d7d7c83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=","crlite_enrolled":false,"id":"4dff9826-c4f5-4bad-9c0b-ef5d5c0bc30d","last_modified":1562025470044},{"schema":1562025468558,"derHash":"ZOtX2jVJwmWF6CxePNUpfaAGZWPNtISlVcVS/HZ3piA=","subject":"SERIALNUMBER=201804,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDQ=","whitelist":false,"attachment":{"hash":"fe1e835417bcb19ae6c16ab3e8a48ce53769d1e1bdfb3714b59bd2df2331e973","size":2337,"filename":"LzTtPR8Oe31ePAty2U7CsncdK3ci20JcLZlNrvPd6qQ=.pem","location":"security-state-staging/intermediates/2295f504-6018-4bf5-ae72-802108de8889.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LzTtPR8Oe31ePAty2U7CsncdK3ci20JcLZlNrvPd6qQ=","crlite_enrolled":false,"id":"9e0dab9a-1aa8-4da7-91a7-97d2690aa2f7","last_modified":1562025469304},{"schema":1562025467075,"derHash":"z8CPv6IZg+Ql6/lszMSnKsCehze6gUICoNaL34wVfCI=","subject":"CN=TrustAsia RSA Code Signing CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEmMCQGA1UEAxMdVHJ1c3RBc2lhIFJTQSBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"af7f22b3550a9db54d3cbd9e01b7c2e6a303d300c2051effaeb73379580070c4","size":2105,"filename":"uYRmb4FygkQFPiA00xhe4MbHYAXdVv1gWA73i6X9SiE=.pem","location":"security-state-staging/intermediates/e4543cc9-e587-4ab6-843b-44246185720c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uYRmb4FygkQFPiA00xhe4MbHYAXdVv1gWA73i6X9SiE=","crlite_enrolled":false,"id":"1a94f983-ff93-4236-9e20-5cc280aab20d","last_modified":1562025467809},{"schema":1562025464817,"derHash":"ORLFhecn8rB3iI9njwQ/2N3O6ekeZiimJFsbjrvMORI=","subject":"CN=Class2 e-Szigno SSL CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEcMBoGA1UEYQwTVkFUSFUtMjM1ODQ0OTctMi00MTEkMCIGA1UEAwwbQ2xhc3MyIGUtU3ppZ25vIFNTTCBDQSAyMDE2","whitelist":false,"attachment":{"hash":"98b37ae1cc647006d33e1b0891b42ab2c5f41787f32cce3681803aba7fb66524","size":2580,"filename":"NZP4aC4bQmjlxXRAcygA6LF8yzeZlyKkTTGIC7B9glM=.pem","location":"security-state-staging/intermediates/410dd037-e90b-43ec-967e-bcf28d2920e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NZP4aC4bQmjlxXRAcygA6LF8yzeZlyKkTTGIC7B9glM=","crlite_enrolled":true,"id":"7c942e26-4b79-4354-935f-aa9e284f0568","last_modified":1562025465559},{"schema":1562025464078,"derHash":"JZptXtJOsgfNtf0U6tyHi94RHMt8y/uCdof3ecEYthI=","subject":"SERIALNUMBER=201404,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwNA==","whitelist":false,"attachment":{"hash":"889019d5ab04ba92e625e9b5cdc1390f99751d5c4a648649397c10e68edc795f","size":2097,"filename":"FvxdlGm9nh2LfyplssKej4AhCOWYExNd3MU9X-6cfPI=.pem","location":"security-state-staging/intermediates/1c5b7331-8fbe-451b-b06b-103d0b79a2b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FvxdlGm9nh2LfyplssKej4AhCOWYExNd3MU9X+6cfPI=","crlite_enrolled":false,"id":"f4b85424-2c51-497a-8bbf-1463f03e920b","last_modified":1562025464810},{"schema":1562025462586,"derHash":"2VEjGV+gLBzEBXMzbmTI36IQsXc+PGEQtusm5UN+I6U=","subject":"CN=McAfee OV SSL CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEbMBkGA1UEAxMSTWNBZmVlIE9WIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"1f4e1d5a686d456d53d5b5d7a9fcd1f0721fd2a598fe72d3071f05cc432b1bdd","size":2117,"filename":"KKKPHEdd8Vi-l7k78OoSVKsWZubT8CNhOr4ZCATqRXU=.pem","location":"security-state-staging/intermediates/2324e47a-771c-434f-a1f7-fd50942664f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KKKPHEdd8Vi+l7k78OoSVKsWZubT8CNhOr4ZCATqRXU=","crlite_enrolled":true,"id":"aab5604f-ab34-4e84-a719-7f0aed1db11d","last_modified":1562025463317},{"schema":1562025461841,"derHash":"PSkoopiCJ85OvDGao05lUunZiDnVziEU55+PXsK/neA=","subject":"CN=Jax HR Saint Vincents HIE CA,OU=Orion Health Direct Secure Messaging,O=Jax Health Records - SV HIE,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbSmF4IEhlYWx0aCBSZWNvcmRzIC0gU1YgSElFMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJTAjBgNVBAMTHEpheCBIUiBTYWludCBWaW5jZW50cyBISUUgQ0E=","whitelist":false,"attachment":{"hash":"f03905d542a9fefa6497381ee3132f9939c39d55d0cc647dcf61331e4aba8e20","size":2300,"filename":"7TZ-ZhVf1UwnhC-sgYAt2zg5_E6FaYgFktauJbqafHQ=.pem","location":"security-state-staging/intermediates/3b25f76c-ae83-4275-88b5-ca42f7b985d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7TZ+ZhVf1UwnhC+sgYAt2zg5/E6FaYgFktauJbqafHQ=","crlite_enrolled":false,"id":"d1c3009a-63fb-421f-9ad2-a297af5df98e","last_modified":1562025462578},{"schema":1562025457260,"derHash":"ku8vW1U1cGB9wpyAEOerwWKD/jVflVokglQpCiYKnrs=","subject":"CN=RapidSSL SHA256 CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"b94d4cf0a2a3415cd22cc29ae5ef73b31f0116f5e5eb61e676261b110cbcd64e","size":1691,"filename":"hKt_n8XrJnP3czMTKgZLx5NhiiXfYrdLodt3B3OSBA4=.pem","location":"security-state-staging/intermediates/8633f6bc-e397-45d0-9bda-05a8c8b7ef4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hKt/n8XrJnP3czMTKgZLx5NhiiXfYrdLodt3B3OSBA4=","crlite_enrolled":true,"id":"64a37cce-9a75-4f11-a71a-39c90d2fd63f","last_modified":1562025458022},{"schema":1562025456487,"derHash":"Irbr3umwptpcn6ztJ7+dzgmAPCr8EfdrXAvPR7f31WA=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - OTC,OU=Certificados de un solo uso,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMSQwIgYDVQQLDBtDZXJ0aWZpY2Fkb3MgZGUgdW4gc29sbyB1c28xEjAQBgNVBAUTCUE2MjYzNDA2ODEiMCAGA1UEAwwZQUMgRmlybWFwcm9mZXNpb25hbCAtIE9UQw==","whitelist":false,"attachment":{"hash":"76dd537d45ecc45c75cf9dbe89c64546ab6cf31e13c36fa01e475159f98cf4dd","size":2312,"filename":"D2ZFPMrSYrfEIs9VT_eGkCEQbRZnAyvXpiKOfaN8FXQ=.pem","location":"security-state-staging/intermediates/d6327b17-6e10-4392-90ec-a8d158fe27a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2ZFPMrSYrfEIs9VT/eGkCEQbRZnAyvXpiKOfaN8FXQ=","crlite_enrolled":false,"id":"0275846e-4b4d-4542-ad90-89c87fb603c5","last_modified":1562025457253},{"schema":1562025454957,"derHash":"Uabi7UEECq6OCJ+6v+JqONZW9bCFVjU1L+6VmChrsCE=","subject":"CN=MedicaSoft Direct Intermediate CA,OU=MedicaSoft Direct Messaging,O=MedicaSoft LLC,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5NZWRpY2FTb2Z0IExMQzEkMCIGA1UECxMbTWVkaWNhU29mdCBEaXJlY3QgTWVzc2FnaW5nMSowKAYDVQQDEyFNZWRpY2FTb2Z0IERpcmVjdCBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"daa2982cf7723c68da56f4044c110649777655603b75f03d055fbeb78ba7d7e5","size":2211,"filename":"V8jIbRTZ2Jcwh--xqrc07Wq7g1sX8qz4m2pdzkAfWc8=.pem","location":"security-state-staging/intermediates/3cb00065-23fe-4e73-b235-f88a1f25319e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V8jIbRTZ2Jcwh++xqrc07Wq7g1sX8qz4m2pdzkAfWc8=","crlite_enrolled":false,"id":"271f87bb-11bf-4a8f-af6d-f6ec1a72b45f","last_modified":1562025455725},{"schema":1562025453478,"derHash":"bWPqpzGCPYDkdiS+YLr6t52eQDDUPj0C4YW9W3fkZls=","subject":"CN=RapidSSL Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGlJhcGlkU1NMIENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"2828a0ce5ac1a03d861de6a22cb781b8b05e9bd6f6a3e313f25c9f1c8758c0ee","size":1171,"filename":"lsi38yOVz7rsuYInzpsbotgnNxIGE0MBWmOuuxHxyzg=.pem","location":"security-state-staging/intermediates/77ea1cda-330e-46da-9e4f-65f7eac889a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lsi38yOVz7rsuYInzpsbotgnNxIGE0MBWmOuuxHxyzg=","crlite_enrolled":false,"id":"e6c236d1-ffda-4acc-b341-2a7298a038e3","last_modified":1562025454210},{"schema":1562025452715,"derHash":"JvettyHMLT4m3wY6b+KHOYlLGEcGDDUdxvUxHFffC18=","subject":"CN=Harokopio University CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaSGFyb2tvcGlvIFVuaXZlcnNpdHkgQ0EgUjE=","whitelist":false,"attachment":{"hash":"54fc0649f327645e7044c8770a3bfba482784645cec24ffe4fcafdaedea25473","size":2775,"filename":"1hHFX5m3nX4IdanFE39sr-FVsRg1eVo-ThXvmiegp7I=.pem","location":"security-state-staging/intermediates/34bb8603-35d5-4679-9a06-6af37df069cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hHFX5m3nX4IdanFE39sr+FVsRg1eVo+ThXvmiegp7I=","crlite_enrolled":true,"id":"7946af96-326b-4ccb-a095-2e84cf59af33","last_modified":1562025453470},{"schema":1562025451214,"derHash":"L2iJlhp8pwZ+i6EDws+bmpJPjKKT8RF44joZeNLxM9M=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"a24b6873f5cedd0745b28d5b998ebab8816abfbde4a85fc3dfe456d4dedec97f","size":1646,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/ba6a6d30-b17d-4b39-9b81-2d721ab76ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"d3fb3bfb-718d-4849-a53c-b80f49b89818","last_modified":1562025451944},{"schema":1562025450459,"derHash":"LNS3kUOdL0Zf/G/a+SXgB0q1C61Olxev1fXRvNnkh78=","subject":"CN=CertAssure ECC OV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgRUNDIE9WIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"ca79bd3721de515408fb2058459249c5b588a11756f3a9e50e91639438ddac55","size":1329,"filename":"RHKZjmRhs4WSRd8tMaFGldq7b6_ydn4V_z1gGMLw964=.pem","location":"security-state-staging/intermediates/deb41aaf-0afe-42e7-91f4-fb74aff5a9ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RHKZjmRhs4WSRd8tMaFGldq7b6/ydn4V/z1gGMLw964=","crlite_enrolled":false,"id":"027ee554-14f3-42b9-ae64-9bcbb2e51d23","last_modified":1562025451206},{"schema":1562025448935,"derHash":"iExR1kO+ESbnLzsbcji6V+AmjB1sSiKs3WJJwXWKU7Y=","subject":"CN=International Hellenic University CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGFMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxMDAuBgNVBAMTJ0ludGVybmF0aW9uYWwgSGVsbGVuaWMgVW5pdmVyc2l0eSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"2796768ed94ab3131e06d64b6e4987fe576a2d613a5f396c616d09ef2dd46087","size":2556,"filename":"a-PXNvvwvG42Rv9bcpQohzLWt4DAOP3eKSIq1DrsZ4k=.pem","location":"security-state-staging/intermediates/daab4b93-62db-4a6b-bc6f-f46b286e4fee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+PXNvvwvG42Rv9bcpQohzLWt4DAOP3eKSIq1DrsZ4k=","crlite_enrolled":true,"id":"abae3c7c-83c7-4697-a147-205cb29d7079","last_modified":1562025449682},{"schema":1562025448185,"derHash":"3Syy7sUvXparHLhDCVL7Vsjmq9/yHqzXaEsc1ziqzP8=","subject":"CN=E-Tu\u011fra Nitelikli Elektronik Sertifika Hizmet Sa\u011flay\u0131c\u0131s\u0131 v2,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIHVMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQUUtVHXEn3JhIE5pdGVsaWtsaSBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIHYy","whitelist":false,"attachment":{"hash":"d1b6e6e0491d73a71d4ad42658703114017fc34ddf82211704a567e8a79c91cd","size":2532,"filename":"fBnYIiBq8xqr_eWatE8_Qu_RG3xGQvVyMbLEBpH6IaQ=.pem","location":"security-state-staging/intermediates/72c4e87b-00b8-4b94-a865-6ba2f2366e87.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fBnYIiBq8xqr/eWatE8/Qu/RG3xGQvVyMbLEBpH6IaQ=","crlite_enrolled":true,"id":"dbbda893-cc25-40e9-aa54-1d6afced3764","last_modified":1562025448928},{"schema":1562025445182,"derHash":"LmoMx4U6PnkmrnQQ6cF+UnpoGcLn3T3pe6LOH2lYtAs=","subject":"SERIALNUMBER=201705,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNQ==","whitelist":false,"attachment":{"hash":"74b6e406eb7ac2bec1e58082e3ff46de50ed63b02ee3bd0365de88b16b813eda","size":2154,"filename":"19L-zJeDluxT1FLE36D0RrY9R7OicvzFnd7jRtuX_ls=.pem","location":"security-state-staging/intermediates/5d60b5c0-1b6e-4174-a75c-c9224f584b9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"19L+zJeDluxT1FLE36D0RrY9R7OicvzFnd7jRtuX/ls=","crlite_enrolled":false,"id":"4627de1d-e106-4813-9f62-b85ac8e53227","last_modified":1562025445931},{"schema":1562025441417,"derHash":"ug4ra/LJjtLDscHAihu9yvknCsUooxlDAd0qC2tnubM=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"b7c827e445973f494efe9677b4f9b1b7c035e10603815e752de4b506960b41f1","size":1479,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/14161f5e-9367-4112-8960-f50cd50f3475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"83447c12-f983-4f66-882b-bddaa6e4cd07","last_modified":1562025442176},{"schema":1562025440674,"derHash":"x2wI1+IYJ0x92stO0VxzUGt5QvOFHxh+XfpH8l6pV9U=","subject":"CN=SECOM Passport for Member PUB CA6,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTY=","whitelist":false,"attachment":{"hash":"c1024033ff8c20229e3f55fdfb0c9cb4089d0a286659024908308d6dcc485400","size":1695,"filename":"NnvJfXhU4z942ew_zWnITNVe12dq-KCFhcLn4ho0g8c=.pem","location":"security-state-staging/intermediates/18e2fcf0-545a-4a7c-8f38-feb7ce6a5e4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NnvJfXhU4z942ew/zWnITNVe12dq+KCFhcLn4ho0g8c=","crlite_enrolled":false,"id":"12bf1fe5-ecba-49ad-9f42-1346d9ee9c9c","last_modified":1562025441409},{"schema":1562025439186,"derHash":"8wHcxRgblBCQqRd+n/q0eVt66afSNg6m/aPM4M8N5Jo=","subject":"CN=TrustAsia RSA DV SSL Server CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBEViBTU0wgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"fcc7d966960447b3bda63af26542a4c1033c73ed22b3ac2fbee0dba7c662ad3d","size":2133,"filename":"tBDWSaHOpgXo2ifK2nGQRAAdZWCfbS8D7IHof7Oj_VA=.pem","location":"security-state-staging/intermediates/0a629b5b-de56-4242-9a30-96c616e9eb5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tBDWSaHOpgXo2ifK2nGQRAAdZWCfbS8D7IHof7Oj/VA=","crlite_enrolled":true,"id":"63bd0518-b42e-4edb-8fff-b0224b41d592","last_modified":1562025439917},{"schema":1562025437676,"derHash":"Y0/fJsmU52opGNnvxMq5xvyzRO9kKnnIkZK82g7VL0w=","subject":"CN=DigiCert Assured ID CA G3,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzM=","whitelist":false,"attachment":{"hash":"e8fa45fec67bc1318a3819405f1bfb0e74f616a1846f577a9fcdd141b182ce2d","size":1118,"filename":"PvaHuwE2jRHMyjTCq1y7W0C__z4Wjsb057DegXU0Ars=.pem","location":"security-state-staging/intermediates/1b00f9cd-0690-430b-a511-38456b5cf3a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PvaHuwE2jRHMyjTCq1y7W0C//z4Wjsb057DegXU0Ars=","crlite_enrolled":true,"id":"7bbbdeb7-763b-47bd-9665-cddbe3976c31","last_modified":1562025438409},{"schema":1562025436923,"derHash":"XYvXudy+UOEcFjgLt+HFnUYsW3LpC38hCmghLsD5QAw=","subject":"SERIALNUMBER=201904,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDQ=","whitelist":false,"attachment":{"hash":"91cf290158b38a029004e1e0ea7b17dda428f83a36f6b66fec3ebb782d024586","size":2337,"filename":"EoHXS07Vl2TiboKoTMwp40itNbiL0bRHZ1TdPrhGiY0=.pem","location":"security-state-staging/intermediates/1bf6c6fe-dcef-4e8e-9218-dba53d3ba51e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EoHXS07Vl2TiboKoTMwp40itNbiL0bRHZ1TdPrhGiY0=","crlite_enrolled":false,"id":"6bcffa6d-4137-4799-89aa-464eceb8efaa","last_modified":1562025437669},{"schema":1562025436165,"derHash":"vrjv6bGnPIQbN1qQ5f/4BIhI46KvZvbE3XuTjW/oxdg=","subject":"CN=TERENA SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAz","whitelist":false,"attachment":{"hash":"9d893e798bf07b02ee964606c0d5c4fc736a3465312d4895a2e8e195edc18959","size":1788,"filename":"8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=.pem","location":"security-state-staging/intermediates/6bd257cc-8279-4f32-8333-4b6a39355c56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=","crlite_enrolled":true,"id":"1ca7f3e4-205e-41e8-ba7a-68ea492d0f45","last_modified":1562025436916},{"schema":1562025433930,"derHash":"WDRT7ArdhSaAHmL7hQePCySEXwtnYSgw3al+wOgp9B0=","subject":"CN=Trusted Secure Certificate Authority DV,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTEwMC4GA1UEAxMnVHJ1c3RlZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IERW","whitelist":false,"attachment":{"hash":"f504ba38fe591f0922dfc156b69cdcec8b16d9d143a6817c39f7ae33cef29428","size":2166,"filename":"tMbtz8E47Nvp7rWcxBxJwWfSw3stezSqn-KyFA3dAqo=.pem","location":"security-state-staging/intermediates/d7b06aac-8e2d-419e-ad53-1ef35a1631a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMbtz8E47Nvp7rWcxBxJwWfSw3stezSqn+KyFA3dAqo=","crlite_enrolled":true,"id":"5df16760-5ec9-4015-87fa-a2ef4bc3bed6","last_modified":1562025434671},{"schema":1562025430931,"derHash":"7c2Itr13/IomgOLsuP+6xFiY36D96YNCXg8b6wWMBLY=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzI=","whitelist":false,"attachment":{"hash":"a14f5dac8d6f50ed84b645b9217e55446e7d75de6489c65e580ab2df2e4bb02d","size":1804,"filename":"6YC6rxi_m1VJU_goQfoSx50MPPhsiwz8zgwBht5WJBI=.pem","location":"security-state-staging/intermediates/e0f10167-e74d-4bfb-9146-e178b6346fd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6YC6rxi/m1VJU/goQfoSx50MPPhsiwz8zgwBht5WJBI=","crlite_enrolled":false,"id":"b0a5917e-e060-4bff-9f8a-89d9957be49e","last_modified":1562025431667},{"schema":1562025430186,"derHash":"OIPm3kkXpGtZTswtKsapXUPn6qjgiakfm8EE/xbfjeY=","subject":"CN=Secure Site Pro Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"873a9affb573886082637d5874421893f652b55adfa77a32cb7cd76d35bb12b5","size":1695,"filename":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem","location":"security-state-staging/intermediates/1ded7fc2-cc24-4baa-9054-88cf1ffdb23f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=","crlite_enrolled":true,"id":"21893de7-b8e7-47a3-b253-4e26a2326ac3","last_modified":1562025430923},{"schema":1562025428680,"derHash":"MafFefJNVWLNsgP6Fanyw/9dwfLmv3wL2V+8sBFMjSE=","subject":"CN=QuoVadis Swiss Advanced CA G3,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH0xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTEyLjIxMC4zNDkxJjAkBgNVBAoMHVF1b1ZhZGlzIFRydXN0bGluayBTY2h3ZWl6IEFHMSYwJAYDVQQDDB1RdW9WYWRpcyBTd2lzcyBBZHZhbmNlZCBDQSBHMw==","whitelist":false,"attachment":{"hash":"4c229971fe06e9adf8da15571ba88a33b97732bcd7efb4c3096b84bafb019de0","size":2467,"filename":"KLQihRcKGkB7ukIgVMH3JF7JqQfl2YglDju59t5S7xc=.pem","location":"security-state-staging/intermediates/7560f454-7151-41fc-8d5c-cc244ed8aee2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KLQihRcKGkB7ukIgVMH3JF7JqQfl2YglDju59t5S7xc=","crlite_enrolled":false,"id":"3dff3c65-da33-4800-8dc5-549bfceca08d","last_modified":1562025429424},{"schema":1562025427924,"derHash":"jtUXtLzfL1DgXow27dMXMukt5m+9OAE5nCxj3PlkqRs=","subject":"SERIALNUMBER=201817,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE3","whitelist":false,"attachment":{"hash":"a87ea56cf878c4276c1f26db6f637964720a10b7fae2d35c645f81023350615c","size":2333,"filename":"kOdfzgDjsNVfydhVydVGyjvTw2nLr0bCdjn9_f-zdz8=.pem","location":"security-state-staging/intermediates/3dfa861d-ea88-4904-978a-0310ac3284bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kOdfzgDjsNVfydhVydVGyjvTw2nLr0bCdjn9/f+zdz8=","crlite_enrolled":false,"id":"f70b9a27-dfae-440f-b8b5-f77e5300d527","last_modified":1562025428672},{"schema":1562025426418,"derHash":"TY7Uo7Xzz3T+yHXoIEISpyGX1x3aOgeuX6W+/rYeycY=","subject":"CN=Trustico ECC EV CA,OU=Controlled by COMODO exclusively for The Trustico Group Ltd,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMRAwDgYDVQQHEwdDcm95ZG9uMR8wHQYDVQQKExZUaGUgVHJ1c3RpY28gR3JvdXAgTHRkMUQwQgYDVQQLEztDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgVGhlIFRydXN0aWNvIEdyb3VwIEx0ZDEbMBkGA1UEAxMSVHJ1c3RpY28gRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"442ba57bab9a7615f627b29e8f745bcc614a03a9a8babdc8c7460def49d525da","size":1406,"filename":"oSp7zLM2UdmSs3L-sF5vVgDPO3AMbxo2i3f5JYu4BYI=.pem","location":"security-state-staging/intermediates/9e0b0416-befa-4ad0-a1a0-07c5bc86cb3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oSp7zLM2UdmSs3L+sF5vVgDPO3AMbxo2i3f5JYu4BYI=","crlite_enrolled":false,"id":"7e4c32a3-05e2-466f-a302-2d4cb7a34e45","last_modified":1562025427178},{"schema":1562025425668,"derHash":"4bKV4UZcJOCVHsC5D799owtnjp6c5EF9/+nzQELfQ4Y=","subject":"CN=TU Dresden CA,O=Technische Universitaet Dresden,L=Dresden,ST=Sachsen,C=DE","subjectDN":"MHMxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdTYWNoc2VuMRAwDgYDVQQHDAdEcmVzZGVuMSgwJgYDVQQKDB9UZWNobmlzY2hlIFVuaXZlcnNpdGFldCBEcmVzZGVuMRYwFAYDVQQDDA1UVSBEcmVzZGVuIENB","whitelist":false,"attachment":{"hash":"4bb4a85a2aef8c2bbc7477ee066a25d177f13127df617d2caa763c5c9f3f5c92","size":1995,"filename":"dc-5wn2Qr-3zgoir8SQHWj7HfNM321MTym4ESb5GtH0=.pem","location":"security-state-staging/intermediates/d5d6b138-b20a-438c-bed9-6af0e662b862.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dc+5wn2Qr+3zgoir8SQHWj7HfNM321MTym4ESb5GtH0=","crlite_enrolled":true,"id":"5aecaad6-1f2a-4e95-82f0-497d2e825f43","last_modified":1562025426410},{"schema":1562025424927,"derHash":"VvMhZ/AD2PLLc4qzhsNcoVJlzCmpjuEGbNPhrFVsoVw=","subject":"CN=WISeKey CertifyID Personal GB CA 2,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBQZXJzb25hbCBHQiBDQSAy","whitelist":false,"attachment":{"hash":"fcd1020e802ce305dd5335ac117db1394ba35eb66280a7147e781bbc14a2fd48","size":1719,"filename":"PWvk9TZyRU9m6dOhEkswhdztMm-gtB5E3LzgPz8CQ6c=.pem","location":"security-state-staging/intermediates/f115ee94-ac0c-470b-a0c0-cb926fb24dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PWvk9TZyRU9m6dOhEkswhdztMm+gtB5E3LzgPz8CQ6c=","crlite_enrolled":false,"id":"fb909118-cd1d-4213-9faf-c66239f756d9","last_modified":1562025425660},{"schema":1562025424183,"derHash":"IQbMeQfGS4pdovwzjulN//EO9xHe27T8aU7gkuxTKx0=","subject":"CN=TrustCubes ICA G1,OU=www.trustcubes.com,O=TRUSTCUBES LIMITED,C=GB","subjectDN":"MIGhMQswCQYDVQQGEwJHQjEbMBkGA1UEChMSVFJVU1RDVUJFUyBMSU1JVEVEMRcwFQYIKwYBBAGEBwETCTIyMzAxMzcwMTEjMCEGCSsGAQQBg5gqARMUOTg0NTAwNTA1RkU4MENEME5FNTgxGzAZBgNVBAsTEnd3dy50cnVzdGN1YmVzLmNvbTEaMBgGA1UEAxMRVHJ1c3RDdWJlcyBJQ0EgRzE=","whitelist":false,"attachment":{"hash":"002d39d549b3edc3243fc8849e44a7320b6faab7fec61dbc7a17973a224b8dd3","size":1756,"filename":"WQNVf79ywhoSIaihn1jQE-5z8UKENBfhCeJcnklN0YQ=.pem","location":"security-state-staging/intermediates/0a4ef028-7d3c-4559-bee0-36cdd53068ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WQNVf79ywhoSIaihn1jQE+5z8UKENBfhCeJcnklN0YQ=","crlite_enrolled":true,"id":"84388c52-0b35-4c7c-aa4f-ad6fe76d6235","last_modified":1562025424920},{"schema":1562025423432,"derHash":"4b5ru7cPWiQec2/ETGohYL9s4ZuV7dZ7976JboN3h0U=","subject":"CN=TERENA eScience SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAz","whitelist":false,"attachment":{"hash":"b0d4a431134fa5326c4d8941ca00bc9e05a182f5314e22010ce190dafef3b64a","size":1800,"filename":"mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=.pem","location":"security-state-staging/intermediates/fb0d63fa-26c1-48ef-b408-173776b4675b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=","crlite_enrolled":true,"id":"788f8e47-0819-4adb-a11b-e91c396886c0","last_modified":1562025424175},{"schema":1562025422689,"derHash":"eBrNIJ07hz8Uj12zHGgK2tztQCONjBvxotVTOR+l0PM=","subject":"CN=Certigna Entity Code Signing CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGIMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEoMCYGA1UEAwwfQ2VydGlnbmEgRW50aXR5IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"08a562df9f7a4bc1c71eb903365f2523a36f48e8c67b7ab282f68e32bc060c3f","size":2523,"filename":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=.pem","location":"security-state-staging/intermediates/2eb117ef-3a3b-4901-9201-beb77a5e0cc8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=","crlite_enrolled":false,"id":"0fb33d2f-f64b-456b-ac79-80910985aadd","last_modified":1562025423424},{"schema":1562025421934,"derHash":"Bb+2YF1IUWpXG6+af/dTdhMEcNpe5/9oTCZy6qDAyK0=","subject":"SERIALNUMBER=ZZZZZZA5,CN=Siemens Issuing CA Multi Purpose 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGlMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTUxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMS4wLAYDVQQDDCVTaWVtZW5zIElzc3VpbmcgQ0EgTXVsdGkgUHVycG9zZSAyMDE2","whitelist":false,"attachment":{"hash":"af0f17b404fbe18f86b9a08fbf3a7290623dc40dfadc1ac8c5d13b301a225fb7","size":2629,"filename":"GXTRtJ2VY1qQoBilPBeqP3z474KaNpz5Yeg65lNpPkg=.pem","location":"security-state-staging/intermediates/dc6ad260-c1eb-49e3-8419-9c2c0123af72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GXTRtJ2VY1qQoBilPBeqP3z474KaNpz5Yeg65lNpPkg=","crlite_enrolled":false,"id":"1e840493-34d2-4a03-9e0f-4ab3736899a3","last_modified":1562025422681},{"schema":1562025420418,"derHash":"BRwjj618HcD860rvecrpf+SagtqJFqSgkg8weqzWD4E=","subject":"CN=GDCA TrustAUTH R4 CodeSigning CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHMxCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xKTAnBgNVBAMMIEdEQ0EgVHJ1c3RBVVRIIFI0IENvZGVTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"7af1e6c6f9dd99eac7019162f8379c26901b03968413c1d8c3c8744bfff66c86","size":2060,"filename":"5Zt41KtIYUpjoXvNDZtGlrN-S-X9juxZk0kJdwQpIlM=.pem","location":"security-state-staging/intermediates/9201b15f-d676-42cb-8b9d-46172588682e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Zt41KtIYUpjoXvNDZtGlrN+S+X9juxZk0kJdwQpIlM=","crlite_enrolled":false,"id":"9e86f345-8b64-4b98-bb28-df4a1df1da0b","last_modified":1562025421177},{"schema":1562025418924,"derHash":"e+0pJ2rL7Z8Xbzi7o6Z85YFbXL8VIse7WezYawnhbtI=","subject":"CN=Amazon,OU=Server CA 4A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSA0QTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"80e7ade2cfaf2410560723bc955bfee6189c0738bf29f0cbef746f8ab6211ff5","size":1089,"filename":"F3CN_yt_rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=.pem","location":"security-state-staging/intermediates/e35a1354-e5b2-4212-a952-670b71886c48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F3CN/yt/rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=","crlite_enrolled":false,"id":"e892e888-930b-4d65-ac61-bac8ebb2adc5","last_modified":1562025419658},{"schema":1562025417416,"derHash":"5/vS2obeMa5/4FHGQ/xF0x5nRUsqXNjkPG1lZyOujOo=","subject":"CN=FujiSSL SHA2 Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for Nijimo K.K.,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIG+MQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIE5pamltbyBLLksuMTgwNgYDVQQDEy9GdWppU1NMIFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"5234da30ba635d594351c8f25c9d98755ed276e3fda91212595e2b9141b6a270","size":2268,"filename":"yGo0I_1jRNcQKZcAyqa4MRLItXyEYd7pWVmh6m8y4C4=.pem","location":"security-state-staging/intermediates/18b98149-a8eb-4ec8-80fc-928d1983db68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yGo0I/1jRNcQKZcAyqa4MRLItXyEYd7pWVmh6m8y4C4=","crlite_enrolled":false,"id":"742b99e6-7240-40bc-8afc-bf1d45a1a9bf","last_modified":1562025418168},{"schema":1562025416678,"derHash":"asFZtMK8jnKfO4RkLvEoa8yA13X+J4x0CtpGjVlDkCU=","subject":"CN=D-TRUST SSL Class 3 CA 1 2009,O=D-Trust GmbH,C=DE","subjectDN":"MEwxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJjAkBgNVBAMMHUQtVFJVU1QgU1NMIENsYXNzIDMgQ0EgMSAyMDA5","whitelist":false,"attachment":{"hash":"554db3f3f6728e13a10d546724cfe973f631696acc81d3d80206909beb978612","size":1861,"filename":"9w0QP9HzLXkfs-4zENaUFq2XKcQON1oyksoJ-Gg2AZE=.pem","location":"security-state-staging/intermediates/bb452f94-c0b6-479f-b577-d019a89c31d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9w0QP9HzLXkfs+4zENaUFq2XKcQON1oyksoJ+Gg2AZE=","crlite_enrolled":true,"id":"37dde6cf-08e9-4e8e-bad3-9c993d870f8d","last_modified":1562025417408},{"schema":1562025415204,"derHash":"BkM/yp91OYC1JiNt1yhG7Bsgdwv8x9MYjdZ7wOz7d4I=","subject":"CN=Greenville Health System CA,OU=Orion Health Direct Secure Messaging,O=Greenville Health System,C=US","subjectDN":"MIGFMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYR3JlZW52aWxsZSBIZWFsdGggU3lzdGVtMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJDAiBgNVBAMTG0dyZWVudmlsbGUgSGVhbHRoIFN5c3RlbSBDQQ==","whitelist":false,"attachment":{"hash":"940f74f14744addbb8dcb7659509701cf0f713a02960e673bee265fefeaadb89","size":2300,"filename":"yPuMwpJMeMLa4pEq0C8FL_ugpU7_x3Zj_5fmOCHtRhI=.pem","location":"security-state-staging/intermediates/a9c6671b-774f-41f4-a46e-ff017860e2a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yPuMwpJMeMLa4pEq0C8FL/ugpU7/x3Zj/5fmOCHtRhI=","crlite_enrolled":false,"id":"91d209d2-e7c2-47b4-bd68-058b8adbda03","last_modified":1562025415931},{"schema":1562025414466,"derHash":"khDT/rax8B7K+McmESV1iQW/iH6NCygkjKf6coTC9zk=","subject":"CN=USERTrust RSA Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEmMCQGA1UEAxMdVVNFUlRydXN0IFJTQSBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"d865305420305a96e03553e0290021ab08fd6bef8d5bf1f6233a13f4349c2159","size":2142,"filename":"PWFYjBN92SersAqUUJzfJ8E4Pj9cxCTLluiO-_6xWqc=.pem","location":"security-state-staging/intermediates/8a270672-a325-421c-aa0c-d8056f155544.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PWFYjBN92SersAqUUJzfJ8E4Pj9cxCTLluiO+/6xWqc=","crlite_enrolled":true,"id":"1f1fa5d7-28c2-4016-a238-a255210ad688","last_modified":1562025415197},{"schema":1562025411468,"derHash":"//4HdQP9cvDlM4sKe04hjn0f+C5JPn6FKuUaocdYXRc=","subject":"CN=GlobalSign CodeSigning CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"f95ebdf17b6cf9f6ae57dab7480084843c2e7cc2cad146c563a2ee1a97bad6eb","size":1646,"filename":"bAToA1Qda7M7XsA72vR3vK2dwxV3EtiPeCfwswnDh44=.pem","location":"security-state-staging/intermediates/6fe38bdc-2f4e-4fcd-8665-de39d97dc15c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bAToA1Qda7M7XsA72vR3vK2dwxV3EtiPeCfwswnDh44=","crlite_enrolled":false,"id":"36efdaf9-8a7f-4d68-be5e-eae0852be93d","last_modified":1562025412213},{"schema":1562025410725,"derHash":"3eS+vyYsnY31y1T+T1mVGR6vWK3Lkv5a7TEorA0ZFsc=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"2073f18bd8b760997037f65cea8c6463d57c287eeaf37cd78e0afde81beb50ad","size":2008,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/ca6cba07-b0ed-4b09-9c57-b753df3f5d0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"472a34bc-59f2-4e7d-ab34-7e991d5266c8","last_modified":1562025411460},{"schema":1562025409209,"derHash":"64T8C0A9m2iSl6XYPqGGg447d3vGGO/aFip1t/6mZsE=","subject":"CN=DigiCert Federated ID US L3 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJzAlBgNVBAMTHkRpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBVUyBMMyBDQQ==","whitelist":false,"attachment":{"hash":"56a86bb48ed696de350c2df65d97e8c04077813d4858bfbee431f3e3a7b1e6f4","size":1869,"filename":"14vZQlpwjgYpJ-P-OWrCLfFBSxrpJvtuhoFlwDkZfKw=.pem","location":"security-state-staging/intermediates/d381d1d1-fd9f-4813-a5aa-4b22e940bbe5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"14vZQlpwjgYpJ+P+OWrCLfFBSxrpJvtuhoFlwDkZfKw=","crlite_enrolled":false,"id":"b6ac63f3-779d-4f02-888a-0f181a3001d2","last_modified":1562025409946},{"schema":1562025407732,"derHash":"rjc+SI3RPe9xYR1S8LUXndZIJBo4H2eoBzT2YV/25so=","subject":"CN=LuxTrust Corporate CA,O=LuxTrust S.A.,C=LU","subjectDN":"MEUxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMR4wHAYDVQQDExVMdXhUcnVzdCBDb3Jwb3JhdGUgQ0E=","whitelist":false,"attachment":{"hash":"14cabf521e5bbb849b1939229c0aaf15cee63afe34b235bcb187079f1ed2c596","size":2276,"filename":"1IJLHql-hNTPjvXDc2RSsXxNiuzg24zvLWDesq51de8=.pem","location":"security-state-staging/intermediates/f3beac36-1b74-49d5-9904-dcd3444e6570.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IJLHql+hNTPjvXDc2RSsXxNiuzg24zvLWDesq51de8=","crlite_enrolled":false,"id":"b6d2831c-8bb2-45c7-8018-5016141d7585","last_modified":1562025408461},{"schema":1562025406966,"derHash":"SKL31+gNQucip1LYkjgcBu7EQUFVydZFKqUG7qTtQ/Y=","subject":"CN=Trustico ECC OV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIEVDQyBPViBDQQ==","whitelist":false,"attachment":{"hash":"db16d66287fc83d7c7d389ce4e8d312e54908daf51f80a248788c398e0b5d751","size":1272,"filename":"WBn6yHQKpmzXFlZmp92hV73p71SuDLIwooOX99zzGBs=.pem","location":"security-state-staging/intermediates/d37260dd-6fc7-4943-aefe-3a877dde4827.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WBn6yHQKpmzXFlZmp92hV73p71SuDLIwooOX99zzGBs=","crlite_enrolled":false,"id":"dfad7acc-b54c-4fdb-9e08-0579d8b51981","last_modified":1562025407723},{"schema":1562025406218,"derHash":"d1N2gumgssW9XmK8HLNezrOPy+v30twyb35CDw3b7bM=","subject":"CN=RelayHealth Direct CA,O=RelayHealth,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtSZWxheUhlYWx0aDEeMBwGA1UEAxMVUmVsYXlIZWFsdGggRGlyZWN0IENB","whitelist":false,"attachment":{"hash":"7b8ec633ea8e4ffb238a02aaa13742373bff1c0a3eca844f96bd5fdcf1a5858c","size":2101,"filename":"8r_WvGnNYwiJkaujqkp9w8Cx_ydDtfGWD-u4L_ZVBUU=.pem","location":"security-state-staging/intermediates/99b1a459-48a1-4e6c-b286-32402da52a8a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8r/WvGnNYwiJkaujqkp9w8Cx/ydDtfGWD+u4L/ZVBUU=","crlite_enrolled":false,"id":"0433b918-a448-4953-9835-5d211669a194","last_modified":1562025406959},{"schema":1562025404691,"derHash":"K/TxtAQNvCkMF68cF3QVsV3nt6BeXWk9Gq2zSRmeknE=","subject":"CN=SSL.com Client Authentication and Email CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEzMDEGA1UEAxMqU1NMLmNvbSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"4a7e55df2d04b4fbf8ceb238621c3522b71ae629ff4a52cbdb209642962ced24","size":2129,"filename":"o-Stjubrf3fOy2A5YfQYHaRKuUFlHp7EwXfRxi0LD1M=.pem","location":"security-state-staging/intermediates/5ce5a3e3-2971-43e9-adc8-23ac4dbe924a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o+Stjubrf3fOy2A5YfQYHaRKuUFlHp7EwXfRxi0LD1M=","crlite_enrolled":false,"id":"6f2b7763-47bc-435d-90f4-e167839a82c1","last_modified":1562025405472},{"schema":1562025403937,"derHash":"YmFumxG9Djo1g2DIO3jbxb7qV1yQuX5oJEgz+zBDfGs=","subject":"CN=TERENA Personal CA,O=TERENA,C=NL","subjectDN":"MDsxCzAJBgNVBAYTAk5MMQ8wDQYDVQQKEwZURVJFTkExGzAZBgNVBAMTElRFUkVOQSBQZXJzb25hbCBDQQ==","whitelist":false,"attachment":{"hash":"b540a4b8690142678f25aaa6f34207fd3c4298612d40cac2034f5049aa748c3b","size":1711,"filename":"GrQOOcgaiD1vs9vGDvRaVMQKNDQm2_Nj7lPXTk4s2F0=.pem","location":"security-state-staging/intermediates/e89a4382-1535-4c37-8a30-6afc7db29ba0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GrQOOcgaiD1vs9vGDvRaVMQKNDQm2/Nj7lPXTk4s2F0=","crlite_enrolled":false,"id":"415dc948-b9c5-49ef-96c2-e37830540e67","last_modified":1562025404683},{"schema":1562025402414,"derHash":"YipCooytyD2WJ3HZ0JvTB4d9SrUTtP4M8uWFHnn/pv4=","subject":"CN=DigiCert Universal Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSYwJAYDVQQDEx1EaWdpQ2VydCBVbml2ZXJzYWwgSXNzdWluZyBDQQ==","whitelist":false,"attachment":{"hash":"f1a1ffb6fdb69d7a3855904617a2703d1eeacea8fdb96c2618a5d48d7cec562f","size":1678,"filename":"rpECg98Pqf-LyUsBhAF2Y2Or1rqJfjhDeTy2ZQhmgGI=.pem","location":"security-state-staging/intermediates/edab92da-32c4-4827-9208-230a7c26ad84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rpECg98Pqf+LyUsBhAF2Y2Or1rqJfjhDeTy2ZQhmgGI=","crlite_enrolled":false,"id":"b7cfacc8-6fd6-4e82-8bc6-24d3074d4f66","last_modified":1562025403178},{"schema":1562025400184,"derHash":"Af1z715w9Sb8nBH2X+Lub3Els2k5SSJ//Y5Fnlg8RYo=","subject":"CN=Trusted Root CA SHA256 G2,OU=Trusted Root,O=GlobalSign nv-sa,C=BE","subjectDN":"MGMxCzAJBgNVBAYTAkJFMRUwEwYDVQQLEwxUcnVzdGVkIFJvb3QxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExIjAgBgNVBAMTGVRydXN0ZWQgUm9vdCBDQSBTSEEyNTYgRzI=","whitelist":false,"attachment":{"hash":"0176070032bd2aad1dd44b838d42fdda701908895fbf143871d5d749253510f1","size":1573,"filename":"HHWscHR-mXReMKBRZxCvqEg6wDv6HAbPzKN7NlLvq4c=.pem","location":"security-state-staging/intermediates/989c40e2-7ad5-4b2b-8323-8e4496275666.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HHWscHR+mXReMKBRZxCvqEg6wDv6HAbPzKN7NlLvq4c=","crlite_enrolled":true,"id":"6cfd8096-2b5c-403d-8580-437aceb14b2e","last_modified":1562025400918},{"schema":1562025399410,"derHash":"L8wAmq/bKOklZDBBCm+m52rwkwGxBE/qqsqwAhWqOeE=","subject":"CN=Secure Site Starter DV SSL CA - G3,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxKzApBgNVBAMTIlNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"92ee49d649aaf20a97caf2d91e00782df1925655b89795b19a68aa987d986f4f","size":1650,"filename":"pevGgdMM_FHMatT2CPKUmJVunG4EypGCZJqawFp8J-I=.pem","location":"security-state-staging/intermediates/3c4ee093-9c34-4fd0-816d-87fdc7c5588d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pevGgdMM/FHMatT2CPKUmJVunG4EypGCZJqawFp8J+I=","crlite_enrolled":false,"id":"ddc005b0-cf67-41f1-aae0-2e1f3912a13b","last_modified":1562025400176},{"schema":1562025397124,"derHash":"Js+iBnU+lq7Xww9WdOfG9aDLL5ODevahWWwveZxyU4U=","subject":"CN=Starfield Secure Code Signing Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHSMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UEChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xQTA/BgNVBAMTOFN0YXJmaWVsZCBTZWN1cmUgQ29kZSBTaWduaW5nIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"e67baffceaaae8a33973769e8a0fee09f33d86447facacab10005c1e9966f816","size":1841,"filename":"pdrFwFVE08-U0RMwwjTWvOzvNV6eV6GCx6Vc3g5O3qQ=.pem","location":"security-state-staging/intermediates/bd7d360c-039c-441f-b5c0-01b65c968a68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pdrFwFVE08+U0RMwwjTWvOzvNV6eV6GCx6Vc3g5O3qQ=","crlite_enrolled":false,"id":"3783c081-1bbe-4271-a451-0a0cd17eccac","last_modified":1562025397888},{"schema":1562025396359,"derHash":"rRSmi+yUnoT2BjQZ1jRl0TfCrdPjqF4A6ePuguW0AY8=","subject":"CN=DigiCert Secure Site Japan CA,OU=www.digicert.co.jp,O=DigiCert Japan G.K.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNEaWdpQ2VydCBKYXBhbiBHLksuMRswGQYDVQQLExJ3d3cuZGlnaWNlcnQuY28uanAxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEphcGFuIENB","whitelist":false,"attachment":{"hash":"df60eb3da080f2840db9acafe44fcdcacda6ee46054e6e24d7990e36214d5715","size":1658,"filename":"RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=.pem","location":"security-state-staging/intermediates/59fe3a3f-e4cb-48ed-85fc-b4682138e5d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=","crlite_enrolled":false,"id":"18f06aa2-9015-4337-ac7b-12dfa481edb4","last_modified":1562025397117},{"schema":1562025395609,"derHash":"L1CGD5aAU6fboXhRNBdZsNXAQS+FeizRnzcx3TvtG2s=","subject":"CN=SecureTrust Client Authentication CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGAMTYwNAYDVQQDEy1TZWN1cmVUcnVzdCBDbGllbnQgQXV0aGVudGljYXRpb24gQ0EsIExldmVsIDExFDASBgNVBAoTC1NlY3VyZVRydXN0MRAwDgYDVQQHEwdDaGljYWdvMREwDwYDVQQIEwhJbGxpbm9pczELMAkGA1UEBhMCVVM=","whitelist":false,"attachment":{"hash":"7597ddd7590ab3bc97a1c2993f821d497d01ca156227cc8dd5576381cf270f76","size":1626,"filename":"mwNPmB4uqglX9MTEystm7SE6EITvH7E-j8zAmqo2488=.pem","location":"security-state-staging/intermediates/d1cfcb15-db46-4713-a13c-1c0c9d27bf59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mwNPmB4uqglX9MTEystm7SE6EITvH7E+j8zAmqo2488=","crlite_enrolled":false,"id":"d86224d9-6318-425c-9d3d-655fbc029085","last_modified":1562025396352},{"schema":1562025394125,"derHash":"srsm0nHcgrtkc1S29xjQq/G01nQRoO2v8aqVm+Xe034=","subject":"CN=STRATO RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFgxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRYwFAYDVQQDEw1TVFJBVE8gUlNBIENB","whitelist":false,"attachment":{"hash":"d842b8e25f120d3ec31470876c77959fcf153a53f4a6457032a5ed3a0b71fa9a","size":1662,"filename":"oq0kkPtB7DgGV2afHdfrfKYwd5HqSWcvdyQogYh9c1A=.pem","location":"security-state-staging/intermediates/c5305a44-babf-450b-8d0a-a867e9e4e1db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oq0kkPtB7DgGV2afHdfrfKYwd5HqSWcvdyQogYh9c1A=","crlite_enrolled":false,"id":"acc31af2-0f15-4651-81d6-75626778da0f","last_modified":1562025394863},{"schema":1562025390366,"derHash":"XKBOk6WgfXTG+0r+Gz1NvGLCXOdNhhfH7mbLVDi6ZX8=","subject":"CN=KeyNet Systems ECC OV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"fa718efade37d1ce6617cd424eb885b934990185cacf99b396a71b3ae4a20df9","size":1297,"filename":"px8fWni3abLFLZV9MOsgswaWeefS4bTPmddWxtEXiag=.pem","location":"security-state-staging/intermediates/9c7bf4e4-f185-47c3-8165-17f826f18051.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"px8fWni3abLFLZV9MOsgswaWeefS4bTPmddWxtEXiag=","crlite_enrolled":false,"id":"38fecd26-fc2d-4f68-b8af-3bc270e6db61","last_modified":1562025391119},{"schema":1562025388878,"derHash":"8mA2cL7erR2XfWmS+mVU5spZW8UPOwP0Ftzw8g2sNsI=","subject":"CN=NETLOCK Trust Advanced Plus CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMScwJQYDVQQDDB5ORVRMT0NLIFRydXN0IEFkdmFuY2VkIFBsdXMgQ0E=","whitelist":false,"attachment":{"hash":"540e442f30e4d92cc77c092424cd284037ee17d43f66a1f403d30efc07c2135e","size":2077,"filename":"mgqek_kZMpAjKUdlEROIUnDVMUVD0aenZnLSASM3iuY=.pem","location":"security-state-staging/intermediates/51f17241-57ee-4ea5-a20b-800c39580154.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mgqek/kZMpAjKUdlEROIUnDVMUVD0aenZnLSASM3iuY=","crlite_enrolled":false,"id":"b922d207-71dc-413f-b0fe-110a94999f23","last_modified":1562025389609},{"schema":1562025388126,"derHash":"zW65N+4Xqfz/YKeQ+L3gypq8oHs+9GB03Rl48Lyk1Ek=","subject":"CN=EAEko Herri Administrazioen CA - CA AAPP Vascas (2),OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGdMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExPDA6BgNVBAMMM0VBRWtvIEhlcnJpIEFkbWluaXN0cmF6aW9lbiBDQSAtIENBIEFBUFAgVmFzY2FzICgyKQ==","whitelist":false,"attachment":{"hash":"8a1839dcde98a8a35e268cfeba8b062ef97d7715e9cc268450315ee23cfb2c2c","size":2560,"filename":"1du3EfOp93FwG10en54tLejZ-LiGC4VDvyvFeaa50D8=.pem","location":"security-state-staging/intermediates/9e4524c0-0fc8-4de5-bb45-2b4a4446d9a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1du3EfOp93FwG10en54tLejZ+LiGC4VDvyvFeaa50D8=","crlite_enrolled":true,"id":"ae24e0ff-b8b9-4d71-8508-3ceac79ef326","last_modified":1562025388871},{"schema":1562025385874,"derHash":"zSZAlXz4hhBHDO/UCdhdm+BZYvfWwpmcT0MavMw0EYw=","subject":"CN=Corepoint Direct Intermediate CA,O=Corepoint Health,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDb3JlcG9pbnQgSGVhbHRoMSkwJwYDVQQDEyBDb3JlcG9pbnQgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"cc2a17a1ba1f2e38700e08a8b7dab378470299c34a9c211c703448e725d29381","size":2158,"filename":"pcwA2IetNTivVxDNYKmF_fNcmwNsIBxp87A1i9fW_gU=.pem","location":"security-state-staging/intermediates/ed6cd416-0abe-4039-9b98-dc18290ffe88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pcwA2IetNTivVxDNYKmF/fNcmwNsIBxp87A1i9fW/gU=","crlite_enrolled":false,"id":"01be0b37-1a80-45ba-b618-581f8d1328e9","last_modified":1562025386617},{"schema":1562025380611,"derHash":"9dLSumgXp6mqDiE1S78Ob5XF4ofuiM8vJ58P/sTtrBU=","subject":"CN=GlobalSign PersonalSign 1 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"e9535932b8ce7d0bcef6a5462309da7a327feffdbd8c14e093b83b0b4776caf3","size":1650,"filename":"iMfFHGybWVH4E_m1d7Ieopj7M_3ilnXGAP523KziGTA=.pem","location":"security-state-staging/intermediates/3ae8b875-d65b-4139-9c40-0ca7a4303014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iMfFHGybWVH4E/m1d7Ieopj7M/3ilnXGAP523KziGTA=","crlite_enrolled":true,"id":"90b74927-605a-46c7-859e-2feb24cd258f","last_modified":1562025381350},{"schema":1562025379866,"derHash":"yyEJeZJAIJcDN64y2lw/mBqeBXFOwiuxw0If5pXlFXo=","subject":"CN=emSign ECC EV CS CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEhMB8GA1UEAxMYZW1TaWduIEVDQyBFViBDUyBDQSAtIEMz","whitelist":false,"attachment":{"hash":"aa29641172fa5da3efadfcea19729a3a0972cd59a4c482c07d9a8f59a9c97b65","size":1122,"filename":"FTdvRLCxhXvzdqcyZyetYe4NaeD_whho2peMBnvy3_0=.pem","location":"security-state-staging/intermediates/29775bdf-351a-4b9a-b8b8-09ec37b40fe8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FTdvRLCxhXvzdqcyZyetYe4NaeD/whho2peMBnvy3/0=","crlite_enrolled":false,"id":"5caabcbd-5f17-4a1a-a3e9-8c20b1c1e213","last_modified":1562025380604},{"schema":1562025379117,"derHash":"d1MwBWSsZl1W/vW9r9mciKcxwh6tjjmWyzc+ea39v9w=","subject":"CN=SignSec High-Assurance OV Authority,OU=SSL Department,O=FBS Inc,L=Irvine,ST=CA,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTEQMA4GA1UEChMHRkJTIEluYzEXMBUGA1UECxMOU1NMIERlcGFydG1lbnQxLDAqBgNVBAMTI1NpZ25TZWMgSGlnaC1Bc3N1cmFuY2UgT1YgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"2ee05e9e143fedbf63ea31b25f8a8a197a00c108b7da824449f25fbee96ca62d","size":2162,"filename":"-NJzGF6Gew8FPxWa8xRHx0tz0t0bJjNH38uDaSIgIqI=.pem","location":"security-state-staging/intermediates/87e188d2-04c0-4db5-8bc2-d4a9c755752d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+NJzGF6Gew8FPxWa8xRHx0tz0t0bJjNH38uDaSIgIqI=","crlite_enrolled":false,"id":"f00ff66e-82b8-4bdc-9031-f7847d7239b7","last_modified":1562025379858},{"schema":1562025377619,"derHash":"wYlJ42Wf998isw7E2mtDQa+L7gDkF3p/hv9ZvEa2ukA=","subject":"CN=TrustAsia Technologies\\, Inc. DV SSL CA - G2,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGJMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK1RydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4gRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"e6cbbd0f9a61cf86b9fd7623d20287f4ac3e43cb278f02f2894ed63fec82069e","size":1703,"filename":"g64L97C6AazxVe3Bk6Wn6SXfqUejdhEXe57ga44NS3c=.pem","location":"security-state-staging/intermediates/2ff3c56d-10d9-4b33-a883-344736f96843.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"g64L97C6AazxVe3Bk6Wn6SXfqUejdhEXe57ga44NS3c=","crlite_enrolled":false,"id":"de1e3c3e-b52c-47c5-b13a-b6c6fe5ba8f9","last_modified":1562025378352},{"schema":1562025376125,"derHash":"lItxEa9C9UbVec/1ziveyCE03ZkUhCvdsMUocutgTjk=","subject":"CN=SSL.com SSL Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxKzApBgNVBAMMIlNTTC5jb20gU1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"29138ba36283c37133babfb45ad6da91b908056c4bc777229a9b6114c29bb9d7","size":1264,"filename":"zGgA4OU4DjJdvpRYUqbi5Vh2g9W5Oc_PgKihy9mkLsE=.pem","location":"security-state-staging/intermediates/583bc538-020a-40af-92a9-40c3653a90e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zGgA4OU4DjJdvpRYUqbi5Vh2g9W5Oc/PgKihy9mkLsE=","crlite_enrolled":true,"id":"a0acdb7c-e477-4e0c-8f54-b838e76497f5","last_modified":1562025376857},{"schema":1562025375368,"derHash":"O8UYVgQK1/9mg6qFoNNPnqaAzSPDfLigQjsPiaJEBbk=","subject":"CN=ACCVCA-120,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMjAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"5c48e95a58a4d10758544929296f57524a51140212f8479daff1c315fe338caf","size":2686,"filename":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=.pem","location":"security-state-staging/intermediates/fd767b1f-850e-4779-ad1c-fcb1520983b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=","crlite_enrolled":true,"id":"ea1bd9a0-1903-47bb-b8fb-ecb8955b6d38","last_modified":1562025376117},{"schema":1562025373104,"derHash":"+GhNKBK6mKUv6UUoxMsVI3ii1zqCiBCox7hSmHXGRnQ=","subject":"CN=Qualified Pseudonymous e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGLMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xMDAuBgNVBAMMJ1F1YWxpZmllZCBQc2V1ZG9ueW1vdXMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"347542aaaf94389452ec241deb4e9b0659bd7e3fbfa082767360ebd2bdc7f554","size":1776,"filename":"Q-MM9a5IVpTJcjzEB7Wyr_KGLpH4y_1V4wt5h4NJjQc=.pem","location":"security-state-staging/intermediates/84a1e40e-aa66-419a-a6e0-b29ad9504f47.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q+MM9a5IVpTJcjzEB7Wyr/KGLpH4y/1V4wt5h4NJjQc=","crlite_enrolled":false,"id":"2bda9927-7780-4c65-80cf-88e65081a941","last_modified":1562025373847},{"schema":1562025372359,"derHash":"xcX8r25L0K2VvYvr0a6/Fl0dv0SagS8Swatuq2zHkV4=","subject":"CN=KeyNet Systems RSA DV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"fb85ea9df4ce4fb7563cf8ffdcd79a5d2a7b3e955ba403f48d67f4e38d6ad1b0","size":2138,"filename":"VTJmz2gVhXT9nFPyCAVJ7HDpV4Rfyg-dNTgE3kbMShE=.pem","location":"security-state-staging/intermediates/a488d2fa-2e4f-4f72-aeaf-6d6787bb87bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VTJmz2gVhXT9nFPyCAVJ7HDpV4Rfyg+dNTgE3kbMShE=","crlite_enrolled":false,"id":"7db20a5a-a12b-4255-adc3-47c77bc3c921","last_modified":1562025373097},{"schema":1562025370878,"derHash":"MdqiXRQtCLkOZA1LxQsknw/jl4XJjV5T4jMlnA+uk5g=","subject":"CN=Online e-Szigno SSL CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEcMBoGA1UEYQwTVkFUSFUtMjM1ODQ0OTctMi00MTEkMCIGA1UEAwwbT25saW5lIGUtU3ppZ25vIFNTTCBDQSAyMDE2","whitelist":false,"attachment":{"hash":"a70c67eb66b82e4075e34248c87882934b44064980cd89b1e783b12797290157","size":2580,"filename":"x0t02qhpw-MVPvpI409gZ7KlO9C8TZ6yqNYTYIDmB98=.pem","location":"security-state-staging/intermediates/168326d2-eb32-4449-8388-890b59e9496f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x0t02qhpw+MVPvpI409gZ7KlO9C8TZ6yqNYTYIDmB98=","crlite_enrolled":true,"id":"2f2ec8eb-d0d3-4ccb-bfe9-6771b302aa0e","last_modified":1562025371611},{"schema":1562025367867,"derHash":"EYJiwgiO4VKOINg20gcIVHB8DY+OgPvjlvns1LkUG1s=","subject":"CN=GlobalSign PersonalSign Partners CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiBQYXJ0bmVycyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"a54cee1e50e97652bc6ebb1bf9a786f65fb993c0da0a2f5ca227f33c14524401","size":1577,"filename":"F0bWPekPIC9_nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=.pem","location":"security-state-staging/intermediates/22cd08f8-f4e5-4acd-b7cf-81fafc4917c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F0bWPekPIC9/nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=","crlite_enrolled":true,"id":"dd412308-f307-4318-883b-63990c7dea29","last_modified":1562025368603},{"schema":1562025366345,"derHash":"s5nv5CwBoFvcOJeER6eOlQRneT+xHBtrQmxBmg/HORE=","subject":"CN=BEKB - BCBE Issuing CA G2,OU=Issuing Certification Authority,O=Berner Kantonalbank AG,C=CH","subjectDN":"MHwxCzAJBgNVBAYTAkNIMR8wHQYDVQQKExZCZXJuZXIgS2FudG9uYWxiYW5rIEFHMSgwJgYDVQQLEx9Jc3N1aW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIwIAYDVQQDExlCRUtCIC0gQkNCRSBJc3N1aW5nIENBIEcy","whitelist":false,"attachment":{"hash":"79f462ae20c0a610ce0ab12fc2fd9ca90da21f17887100f85355c97675d7b986","size":2434,"filename":"EEAYW3FK7bntpT70XsEpdNLi9KK69z7ix9M0UPRAGKc=.pem","location":"security-state-staging/intermediates/6bdb371b-20a1-42c8-86dd-bf77318e8c7a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EEAYW3FK7bntpT70XsEpdNLi9KK69z7ix9M0UPRAGKc=","crlite_enrolled":false,"id":"d0dbcc6e-4eba-4b25-a0b6-c8e83527e696","last_modified":1562025367118},{"schema":1562025365609,"derHash":"20djOcy/zJ5L0dbLYGyifwBnnh74pYHnI2MJudY//jc=","subject":"CN=CA de Certificados SSL EV,OU=BZ Ziurtagiri publikoa - Certificado publico EV,O=IZENPE S.A.,C=ES","subjectDN":"MIGBMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xODA2BgNVBAsML0JaIFppdXJ0YWdpcmkgcHVibGlrb2EgLSBDZXJ0aWZpY2FkbyBwdWJsaWNvIEVWMSIwIAYDVQQDDBlDQSBkZSBDZXJ0aWZpY2Fkb3MgU1NMIEVW","whitelist":false,"attachment":{"hash":"6fa0a579644b4f4e2520de6c187e3d213f16c5035b15ab14690651899dbc5ca9","size":2523,"filename":"BjaOlbGE-OH8-vlWV2hZE4pvFyfXCm2QvaM1twHCrYk=.pem","location":"security-state-staging/intermediates/2ea9cda5-c628-44e6-aa94-ad77c8ed451b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BjaOlbGE+OH8+vlWV2hZE4pvFyfXCm2QvaM1twHCrYk=","crlite_enrolled":true,"id":"e6c4396d-16a0-4773-a029-036b775926fd","last_modified":1562025366337},{"schema":1562025364848,"derHash":"DgJX8GBri+586ev0UCPKT9ohooMMBJxG7Sr66bKGB8I=","subject":"SERIALNUMBER=201401,CN=Government AA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IEFBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"d4f0990c106c419b6d20070f298a396846b330490701c9ca58136a2a2e4202d5","size":2097,"filename":"zrqsI0LYhlXwV2fOwnlFX_c-r936bwTFFC4u2Tdf-98=.pem","location":"security-state-staging/intermediates/d3d76b39-0f66-4732-a4a7-8ad736b104df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zrqsI0LYhlXwV2fOwnlFX/c+r936bwTFFC4u2Tdf+98=","crlite_enrolled":false,"id":"d9480fb9-51ff-4517-9cc8-92edd9a9ca6a","last_modified":1562025365601},{"schema":1562025364107,"derHash":"L6MV3BVMIT3AwW/RL6Ahupl08MmuFC4kvzrtFQp85vw=","subject":"CN=CA A8,O=DST,C=US","subjectDN":"MCsxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNEU1QxDjAMBgNVBAMTBUNBIEE4","whitelist":false,"attachment":{"hash":"8ad25b6dba8e6a3e3eca82e8365e4be66a513461f80510fe2ad4afcf84a4b772","size":1114,"filename":"pMXM3on84rb3AQQVIojjeyZgOk0b95eNmbuYHSssTTQ=.pem","location":"security-state-staging/intermediates/ebd92230-8819-4a34-b485-619e524048de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pMXM3on84rb3AQQVIojjeyZgOk0b95eNmbuYHSssTTQ=","crlite_enrolled":false,"id":"4f938f2f-addb-409f-807b-7832954e7976","last_modified":1562025364841},{"schema":1562025360337,"derHash":"QD4GKiZTBZETKFuvgKDUrkIshIyfePrQH8lLxbh/7xo=","subject":"CN=DigiCert SHA2 Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNDAyBgNVBAMTK0RpZ2lDZXJ0IFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"a542625d5511b8e15e375edee06b6d656bea32f3a9e2fd08246b0b447f1dea45","size":1695,"filename":"RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn_yOhI_y-ho=.pem","location":"security-state-staging/intermediates/15c21eca-d96f-43c9-94b1-fd4217f81575.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=","crlite_enrolled":true,"id":"ac18b0e8-cf04-4b62-9dde-6c8bb64149e8","last_modified":1562025361073},{"schema":1562025359563,"derHash":"w6qJpPn3DBiw/qXN/bNeSH2gLBCrbT9g3nmtTJSuKEw=","subject":"CN=GoGetSSL RSA OV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"fd420f93d752f6ead1f685f98f4967e9d026eca00d116052e6b9968a41b636a5","size":2085,"filename":"hvk5zQ4_wW8fexIq-RQp19DbNh0mDLs7XtlPnYskzOc=.pem","location":"security-state-staging/intermediates/a9a7e749-c9b5-4bd8-9269-90fbfcbcdf38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hvk5zQ4/wW8fexIq+RQp19DbNh0mDLs7XtlPnYskzOc=","crlite_enrolled":true,"id":"5aa56c83-a91d-4f50-92ea-251d98d465d1","last_modified":1562025360329},{"schema":1562025357329,"derHash":"rUeIOkjIajRp4yyXKzmj7hVYBNMr9T/wAgALyhHSldk=","subject":"CN=NetLock K\u00f6zjegyz\u0151i Eat. (Class A Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBLw7Z6amVneXrFkWkgRWF0LiAoQ2xhc3MgQSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"98303cceb1fcd3ad4d4b766a36ae284b0b6b241967294bab6fa6f499c160964b","size":2203,"filename":"EZuZGAg4_KSV7oRx6yGMpZK9lx1i1gH3UJCYV6YepzM=.pem","location":"security-state-staging/intermediates/00bf4a30-9a87-4885-a9ec-6c5c8d3d8a9a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EZuZGAg4/KSV7oRx6yGMpZK9lx1i1gH3UJCYV6YepzM=","crlite_enrolled":false,"id":"a705c138-e0f7-4581-9978-d55ab5621403","last_modified":1562025358063},{"schema":1562025355822,"derHash":"F2qui91d0Gp9vUKGLcFzvYOP/jATEDsJe5Zxw3umrhQ=","subject":"CN=Certum Extended Validation Code Signing CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGUMQswCQYDVQQGEwJQTDEiMCAGA1UECgwZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECwweQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTgwNgYDVQQDDC9DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"29d062f3902f4c9626af092bcc8aead3944e31783d2e8c305ab8d18685552360","size":1776,"filename":"KmFi5E38OAi9iIt74jct7iJHQ0ASbjOOwdK57OFDu8U=.pem","location":"security-state-staging/intermediates/93162f40-a74d-43ed-b57a-2be36de6b390.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KmFi5E38OAi9iIt74jct7iJHQ0ASbjOOwdK57OFDu8U=","crlite_enrolled":false,"id":"79034794-4993-4207-9a13-888fe3887be9","last_modified":1562025356564},{"schema":1562025354324,"derHash":"Uz/pfrRfztJASeQe/p2yVKXdnZDf1TyVEsYgftsh2Cw=","subject":"CN=Digidentity BV PKIoverheid Organisatie Persoon CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPzA9BgNVBAMMNkRpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFBlcnNvb24gQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"24f901fd76e07be5ca74ae59a1209d08e86fd511e3a76ea3542c5285750f7541","size":2601,"filename":"MjKBWfIUno5zpHZcoox_zRpAEZ7AAFwqwtLT51BhL-Y=.pem","location":"security-state-staging/intermediates/0424da4d-ff44-499a-93e0-aa4ca3226dcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MjKBWfIUno5zpHZcoox/zRpAEZ7AAFwqwtLT51BhL+Y=","crlite_enrolled":false,"id":"2a0dcf45-1337-46ef-a43e-971523626591","last_modified":1562025355065},{"schema":1562025352786,"derHash":"TFbKejwQ61h2Xg/8+ANcV8nzvbAUhi9nZ1bPeJGT8Q4=","subject":"CN=Sonavation IoT CA,OU=sonavation.com,O=Sonavation\\, Inc.,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBTb25hdmF0aW9uLCBJbmMuMRcwFQYDVQQLEw5zb25hdmF0aW9uLmNvbTEaMBgGA1UEAxMRU29uYXZhdGlvbiBJb1QgQ0E=","whitelist":false,"attachment":{"hash":"18ab135d1a2faf6a0b5c5c5d02d5b9070887cd3dd8d6c059c6956151b5af592a","size":1695,"filename":"vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=.pem","location":"security-state-staging/intermediates/a3f91b25-e0b3-450f-8129-2c07431d1e59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=","crlite_enrolled":false,"id":"67cfe98d-cc06-44e2-84e3-4aeab1b20424","last_modified":1562025353534},{"schema":1562025352049,"derHash":"BOy6j5K/90WMSl58aSYfx+LvUtWvVPvdkrFxQbvgZR8=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"af6f343ca612b312217ca30cee00b9efa009722998fd072580bde0f44d349962","size":2487,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/c5ad5e32-69bd-4133-b577-c545ff03e7de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"e93aa26a-ab72-42de-ac2b-960617064295","last_modified":1562025352778},{"schema":1562025351312,"derHash":"k6B4mNibLMoWa6bx+KFBOM5Dgo5JG4MZJryCR9ORzHI=","subject":"CN=Starfield Secure Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHGMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYDVQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"4283da4ef9b6b21e475fb4a88aff9532a5c74e35282cb5459a20ee419646571c","size":1792,"filename":"8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe_w=.pem","location":"security-state-staging/intermediates/f0b4b8ab-658e-452d-a259-15b15f68060a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe/w=","crlite_enrolled":true,"id":"eda1d6cc-95f3-4925-b185-1972acc69e5a","last_modified":1562025352042},{"schema":1562025350573,"derHash":"Fp2vg8CHCriSfJnT/Ad03fNPuiiwK4gdzQtjO21xsro=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGMMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPTA7BgNVBAMTNFN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"2238ffd72ef99d7a932f6493708f5024fbb4da32672fc7a40feea3e027effdad","size":1938,"filename":"zktT0aLlN3tuuQeEOrKYTII7ybGAXJcvbxNyvqGo1dQ=.pem","location":"security-state-staging/intermediates/db401534-395d-4f9b-8dff-298f6e23b3a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zktT0aLlN3tuuQeEOrKYTII7ybGAXJcvbxNyvqGo1dQ=","crlite_enrolled":false,"id":"eda0f897-de94-418d-a287-4a4be71422cd","last_modified":1562025351305},{"schema":1562025348314,"derHash":"0oAzSTpc/vQJwq6oWbnUL3azhlkVj47bs/tPilh6SJE=","subject":"CN=YourNet SSL for domain,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEkxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMR8wHQYDVQQDExZZb3VyTmV0IFNTTCBmb3IgZG9tYWlu","whitelist":false,"attachment":{"hash":"0d491f1c30a69a0f0803421936a5ebe0b20f2c5ee70ff5705f7fbb8af76a895d","size":1492,"filename":"w0rNtXTKlMHqqX8us7SezMP-EqOqUzMJ5-x9IOvyYjs=.pem","location":"security-state-staging/intermediates/e9645405-ee30-48c7-b9cf-7be06e589c2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w0rNtXTKlMHqqX8us7SezMP+EqOqUzMJ5+x9IOvyYjs=","crlite_enrolled":false,"id":"7e641533-b4be-442b-bb14-aced7bf58fdb","last_modified":1562025349057},{"schema":1562025347548,"derHash":"Ce1umR/DJz2P6jF9M5wCBBhhlzVJz6bhVY9BHxEhGqM=","subject":"SERIALNUMBER=07969287,CN=Go Daddy Secure Certification Authority,OU=http://certificates.godaddy.com/repository,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4Nw==","whitelist":false,"attachment":{"hash":"3336e31997f16a6b0c8e3b2ca5641682721662f5ee9f648956959daaf8b8ab8d","size":1748,"filename":"MrZLZnJ6IGPkBm87lYywqu5Xal7O_ZUzmbuIdHMdlYc=.pem","location":"security-state-staging/intermediates/9d9449dc-fc0a-41b3-8e29-e1185a4d4526.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=","crlite_enrolled":true,"id":"dbfd9482-8c71-4e1a-b80a-37fbb3beee31","last_modified":1562025348307},{"schema":1562025346055,"derHash":"zfJ+6gw6VRI2kQj9dGNdLUz1DpTWyhmb7X3oGw0JozY=","subject":"CN=HARICA Qualified Legal Entities SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAwwoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"8a0bdbb8b96dee2791a488b9ce949588e7f3341a346c5b8cc52119c67b607537","size":2605,"filename":"aP4JUCD4l8Gb5cKoQl0ai7usQVAOHgsjtOGEe__rD5I=.pem","location":"security-state-staging/intermediates/8dac66c0-21aa-435e-9911-91551650b659.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aP4JUCD4l8Gb5cKoQl0ai7usQVAOHgsjtOGEe//rD5I=","crlite_enrolled":false,"id":"ee438ee6-5459-4f0f-94e6-ccd27fac2655","last_modified":1562025346789},{"schema":1562025344551,"derHash":"WC3B2Xp5DvBP4lZ7HsiMJrA79umZN8rmoLUDl60gu/g=","subject":"CN=Symantec Class 3 SHA256 Code Signing CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBTSEEyNTYgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"82513c1a54e82926dd75722ae90d375351d27823d1ce05f32bf41a71f2d4218f","size":1914,"filename":"s8kzVzbZoCJLMAVvClIf4wDT-C0efzYgJqpBI0uFLh8=.pem","location":"security-state-staging/intermediates/aa02826e-48b4-4d27-b078-6d7e1b49f241.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"s8kzVzbZoCJLMAVvClIf4wDT+C0efzYgJqpBI0uFLh8=","crlite_enrolled":true,"id":"969300bd-569a-4e2c-abfc-86ab18116743","last_modified":1562025345310},{"schema":1562025343069,"derHash":"nomO0D+kaWlpDa1zxylmdQRf+bWgEAo5m+uENamPUYU=","subject":"CN=GlobalSign RSA DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"cca208f1e570c01764f76eb5afafc8222abf5a3e3cc7d91541a8791abf93a1dd","size":1609,"filename":"zf-i_fasW4ALe6PM9XFmRtKN_HFCpamlq2FK8z_Vuvs=.pem","location":"security-state-staging/intermediates/1cfc6d0a-1bef-47dd-8656-2dd4ebf008d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zf+i/fasW4ALe6PM9XFmRtKN/HFCpamlq2FK8z/Vuvs=","crlite_enrolled":true,"id":"99897585-23f4-4f35-9dd3-4022885dd187","last_modified":1562025343805},{"schema":1562025342325,"derHash":"bs9ljM6ospvmDIWQT0rdfMt5UM9YyXu/YNV86kmicD0=","subject":"CN=North Dakota Information Technology Department CA,OU=Orion Health Direct Secure Messaging,O=North Dakota Information Technology Department,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzE3MDUGA1UEChMuTm9ydGggRGFrb3RhIEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgRGVwYXJ0bWVudDEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMTowOAYDVQQDEzFOb3J0aCBEYWtvdGEgSW5mb3JtYXRpb24gVGVjaG5vbG9neSBEZXBhcnRtZW50IENB","whitelist":false,"attachment":{"hash":"5f9cc0ce3c5d93329379d369ff1e0047e498fe1ffedc203f830e46ad0b803c71","size":2357,"filename":"e6QJ3uaxtddKrpwxGhdDIibY-LwCvEaQVA-SewcDHuw=.pem","location":"security-state-staging/intermediates/0decedaf-e893-43bf-8eb8-39ecf09e9125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6QJ3uaxtddKrpwxGhdDIibY+LwCvEaQVA+SewcDHuw=","crlite_enrolled":false,"id":"7e063cdc-6733-4883-9098-251e456f3adc","last_modified":1562025343058},{"schema":1562025339315,"derHash":"lqB17d0HKQVakyquJYcPfR9c+eOQGn3CzY6RbMbisQs=","subject":"SERIALNUMBER=201807,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA3","whitelist":false,"attachment":{"hash":"7e4d7c6e3a95158f919f57bb217238677995616ec31959d9d20ad76ed10aa9a5","size":2333,"filename":"Via59R_X7HXx5CA2nQ7ywLT26zw0YGiYBhwVzUuDX_s=.pem","location":"security-state-staging/intermediates/9d6bef93-9690-4c8b-a6fb-c17565b52221.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Via59R/X7HXx5CA2nQ7ywLT26zw0YGiYBhwVzUuDX/s=","crlite_enrolled":false,"id":"35982461-e9d0-4e1e-aabe-25f6f5f51428","last_modified":1562025340065},{"schema":1562025337828,"derHash":"tc/msLKqhhoLNnwMBTlaU4rUk6nfARVEqO/EaH/bLMg=","subject":"CN=NQ-SK 2016,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MF8xCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzETMBEGA1UEAwwKTlEtU0sgMjAxNg==","whitelist":false,"attachment":{"hash":"b9044318369543a1b181fe0448d08b456293cdbd66d3eb0cf081c7c872466eb7","size":2272,"filename":"-_v9mzheDZaz7Hjj0hmoJAfy8SckawyPQ6Kx_01hio4=.pem","location":"security-state-staging/intermediates/376ae8a1-60ca-43e7-b0fb-7acb9896ba24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+/v9mzheDZaz7Hjj0hmoJAfy8SckawyPQ6Kx/01hio4=","crlite_enrolled":false,"id":"b2430e92-ecf6-470a-82d0-ee268da554fa","last_modified":1562025338559},{"schema":1562025337064,"derHash":"qlNFLViQaevZFCODT+woinisxqe51NDxQ9jJLguD2Ok=","subject":"CN=CERTSIGN FOR BANKING QUALIFIED DS PRODUCTION CA V3,OU=Certificat de productie Production certificate,O=certSIGN,C=RO","subjectDN":"MIGWMQswCQYDVQQGEwJSTzERMA8GA1UECgwIY2VydFNJR04xNzA1BgNVBAsMLkNlcnRpZmljYXQgZGUgcHJvZHVjdGllIFByb2R1Y3Rpb24gY2VydGlmaWNhdGUxOzA5BgNVBAMMMkNFUlRTSUdOIEZPUiBCQU5LSU5HIFFVQUxJRklFRCBEUyBQUk9EVUNUSU9OIENBIFYz","whitelist":false,"attachment":{"hash":"eaa0de7b4753356246d652e36cc56d60e8a923001719aa842e83a1fbfb036ca1","size":1683,"filename":"lgaybEWhquJ9CUpEl0ci8n7TT_mQu7ls6VLD9gC0u2g=.pem","location":"security-state-staging/intermediates/b16e7431-1a00-4dad-9c47-46be383bcfe4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lgaybEWhquJ9CUpEl0ci8n7TT/mQu7ls6VLD9gC0u2g=","crlite_enrolled":false,"id":"515bc65f-fec1-4f6b-98db-30c867438ca2","last_modified":1562025337821},{"schema":1562025334820,"derHash":"ZOshqAA2VUiOliDtwrIXy81VklPEU+c15VJwZpXOGHg=","subject":"CN=TrustID HID Enterprise CA 1,O=HID Global,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpISUQgR2xvYmFsMSQwIgYDVQQDExtUcnVzdElEIEhJRCBFbnRlcnByaXNlIENBIDE=","whitelist":false,"attachment":{"hash":"3675fee67c57748a850ca3d25b38e888d086b6e291f15e60fc5955aae4ebdbd8","size":2858,"filename":"cpBDVSnEXaonbErjbbQ5nxA8Mek-w3LsQ6tRL149lGg=.pem","location":"security-state-staging/intermediates/ac3b37a3-2818-4aa7-8d6c-957f5d5ddfd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cpBDVSnEXaonbErjbbQ5nxA8Mek+w3LsQ6tRL149lGg=","crlite_enrolled":false,"id":"536b01cb-8380-4de7-9d91-20f761c15500","last_modified":1562025335558},{"schema":1562025334072,"derHash":"S3M04diZmCK6+o/2iIElOJsYpOWrJv+mJMf2j9yB8Ms=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"2d52ef3ad1bf79d364b9204631f8b1fedcd6e4e13aadf92c4b6af52d751e96dd","size":1634,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/67867c84-32d8-4600-aa2f-a51493938ab0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"8f1617bd-0e32-4828-b630-2a3c510a24ef","last_modified":1562025334812},{"schema":1562025333317,"derHash":"wSP1r6zJ+QloCYUDVeW/eMqTdzSBEbUWepZN3twETek=","subject":"CN=TERENA Personal CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEgMB4GA1UEAxMXVEVSRU5BIFBlcnNvbmFsIENBIDMgRzM=","whitelist":false,"attachment":{"hash":"d97fd351c70f4186ab1a1b6d07d4d7cd23c138d05ff6501f8793a7a457d714a0","size":1561,"filename":"YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=.pem","location":"security-state-staging/intermediates/465904a4-0fb5-43d2-a5c9-9857ba6ecc74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=","crlite_enrolled":false,"id":"834c434b-e007-4e04-818f-bd61ceb2e53a","last_modified":1562025334065},{"schema":1562025331082,"derHash":"j8HBdj9jF6sJBhxaeNTp1nAB7+Cnn+QFc7BIwG6yFlg=","subject":"CN=Thawte Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGFRoYXd0ZSBDbGFzcyAzIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"81ef8a4772629958118da223f884373db6f97ecd96c968ed91322150dc9cf583","size":1654,"filename":"YYguLfuEMtW11fy4mtQV_FlyFQDLr4EfWdDyGPSae9A=.pem","location":"security-state-staging/intermediates/47b2de9a-7c71-4e03-9275-544fee336f55.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YYguLfuEMtW11fy4mtQV/FlyFQDLr4EfWdDyGPSae9A=","crlite_enrolled":false,"id":"1e02fcc7-2993-47ca-940f-86653e3cecbe","last_modified":1562025331813},{"schema":1562025330338,"derHash":"fo+RQRm7EJDWIEkI5a4fQL4kwUkc19XPtqk2GMvAD9k=","subject":"CN=GlobalSign Partners TSA CA for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MFYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSwwKgYDVQQDEyNHbG9iYWxTaWduIFBhcnRuZXJzIFRTQSBDQSBmb3IgQUFUTA==","whitelist":false,"attachment":{"hash":"ac692c130dd61ad078ca128601e56417964e4f3c303740c7446aef653a0bf756","size":2036,"filename":"H92PKGXpuffyCKbwBGAY4e4XY990BbquJeNZ072shzw=.pem","location":"security-state-staging/intermediates/79bbb0c5-7608-426c-a235-c0262afa84a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H92PKGXpuffyCKbwBGAY4e4XY990BbquJeNZ072shzw=","crlite_enrolled":false,"id":"0471bdec-38ad-4b8d-86bd-3f137555792b","last_modified":1562025331074},{"schema":1562025329599,"derHash":"9AUHfHF0cDuXgceVRKe+mUJjhU0VFz5hqNGaKM96SrE=","subject":"CN=TERENA eScience Personal CA,O=TERENA,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMQ8wDQYDVQQKEwZURVJFTkExJDAiBgNVBAMTG1RFUkVOQSBlU2NpZW5jZSBQZXJzb25hbCBDQQ==","whitelist":false,"attachment":{"hash":"0ff25cb8ace98409f31247ecb59b650b17e31d145ec2485517081e2ac1dfa4fb","size":1743,"filename":"rfAIoQEXwIYxHVXIaa2COA8XlDmE8FsumvzEWCU7MfU=.pem","location":"security-state-staging/intermediates/8dd56ca7-dc47-487f-bb0a-fde60bbeab18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rfAIoQEXwIYxHVXIaa2COA8XlDmE8FsumvzEWCU7MfU=","crlite_enrolled":false,"id":"707787e0-3c77-41ba-a894-946cb1999932","last_modified":1562025330331},{"schema":1562025328112,"derHash":"ZuricJtUzdFpMXexMy/wNs3Q9yPbMDntMRVVpsv1/z4=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma Corporate Server II - 2015,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHTMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEuMCwGA1UEAwwlQ2FtZXJmaXJtYSBDb3Jwb3JhdGUgU2VydmVyIElJIC0gMjAxNQ==","whitelist":false,"attachment":{"hash":"df2d8a40bc28188df68d3c6579cec37ec903635f58cc869dcf759dfef7fa0eaf","size":3031,"filename":"m6nepCtxe9G9HhpXqQbCc7VSQX41KwYqD6LqFDqntKk=.pem","location":"security-state-staging/intermediates/4e0e9856-a536-495f-8223-f662f7a6e556.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m6nepCtxe9G9HhpXqQbCc7VSQX41KwYqD6LqFDqntKk=","crlite_enrolled":true,"id":"f3d9c664-5684-4d40-b74b-f45fc70887d8","last_modified":1562025328852},{"schema":1562025327350,"derHash":"sayM+xgbnJNU4Xdfy9/P54mMXMmhfXYxW1fBEu7lUjQ=","subject":"CN=Encryption Everywhere DV TLS CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"c75d6fc5179d7bb7baea5ffe48d9fda3810fdcb1340a3ca83e1e7b97a4af6478","size":1678,"filename":"gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX-qzRMqb9Xoa1w=.pem","location":"security-state-staging/intermediates/36b3d43a-f83c-40a5-af78-851b6283fd64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX+qzRMqb9Xoa1w=","crlite_enrolled":false,"id":"0d9d974c-bea1-4d7f-9958-e5dd76763236","last_modified":1562025328104},{"schema":1562025326608,"derHash":"AB14v0Ck2vlM1WS0IZRVg3sAVtMhayu4/3kZZrQbE24=","subject":"CN=Intel External Issuing CA 7A,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDdB","whitelist":false,"attachment":{"hash":"d813527cd54737fcfb5de10708464c3c058ae6b88a50b01c6d0f86657fd1e6ff","size":2588,"filename":"F1nC3g4x7xWb67o-xWeC3pUpqn2PqsssGrUzVFcrPlM=.pem","location":"security-state-staging/intermediates/5b73c6e2-ee41-4b2d-9a29-be9bf1eb744f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F1nC3g4x7xWb67o+xWeC3pUpqn2PqsssGrUzVFcrPlM=","crlite_enrolled":false,"id":"d1150731-818c-4e50-9788-d789004759e5","last_modified":1562025327343},{"schema":1562025325869,"derHash":"hgm9zvleSk1CZJe1zY7UsAHJU6XBRHHKr1j7ZQ34q/A=","subject":"CN=Spirit AeroSystems SHA256 CA - G2,O=Spirit AeroSystems\\, Inc.,ST=KS,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLUzEhMB8GA1UEChMYU3Bpcml0IEFlcm9TeXN0ZW1zLCBJbmMuMSowKAYDVQQDEyFTcGlyaXQgQWVyb1N5c3RlbXMgU0hBMjU2IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"2102b7e34260128aa8eddddcb68a23f8f43ef3852bbd09e6ddf31829ea3f4e94","size":1857,"filename":"-eZm38gBRNSIDBYrgLDj3YjRs2ABUSD5_ssqnCDgYlM=.pem","location":"security-state-staging/intermediates/45b38ccd-17b9-415e-a888-2b1631eceec9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+eZm38gBRNSIDBYrgLDj3YjRs2ABUSD5/ssqnCDgYlM=","crlite_enrolled":false,"id":"d0de06c4-5ab3-460f-8fcb-23b27889568f","last_modified":1562025326601},{"schema":1562025322865,"derHash":"CbwbE3wDEjnveIZz6U6xf18+yrB9Otv7SF51q/qvO5o=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"4827709bafd08a7e0584c4d4411937345e9fa8505ca1a15d2c4483e729c804a6","size":1626,"filename":"1kflsxIeB1bcxW1C61yFNdNQjO_xuF0ORdL9EtMe-Rs=.pem","location":"security-state-staging/intermediates/fdb62a70-c092-4d32-81b3-d72418696f57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1kflsxIeB1bcxW1C61yFNdNQjO/xuF0ORdL9EtMe+Rs=","crlite_enrolled":true,"id":"1c345873-cf2f-48aa-a6a3-93a5661939df","last_modified":1562025323597},{"schema":1562025322116,"derHash":"C8OTcHISi55bzDosak5VMe/T2W0wLByKDfVQ/geKCDo=","subject":"SERIALNUMBER=201915,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE1","whitelist":false,"attachment":{"hash":"3b8b7b4968d2d4a4042e69f27592e569862bdc2f143e41ebbe1a0c11736d81f0","size":2333,"filename":"kM1AzUSn_oORQFEI2x5nOsi3ZlZJxf6FjYmxYSu74Co=.pem","location":"security-state-staging/intermediates/66b03c59-a25d-40f2-8d5f-dae76d3270d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kM1AzUSn/oORQFEI2x5nOsi3ZlZJxf6FjYmxYSu74Co=","crlite_enrolled":false,"id":"5e3b9614-e826-466b-8b48-3c5f863463b1","last_modified":1562025322857},{"schema":1562025319082,"derHash":"Lkph5SOOVW6M7bzAtPPeIXgkVmSgvhlbOFW0yF297v8=","subject":"CN=USERTrust RSA Organization Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE/MD0GA1UEAxM2VVNFUlRydXN0IFJTQSBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"261660739939209c93938fbc278a1e17a758bea711e15624adbd1203f98c95d1","size":2178,"filename":"qmZOfgEUaNPh43JyVsa1dSCvAFxPKkxkytll6bY4_4E=.pem","location":"security-state-staging/intermediates/00deca06-8d9c-4815-b9cd-3365ade55c61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qmZOfgEUaNPh43JyVsa1dSCvAFxPKkxkytll6bY4/4E=","crlite_enrolled":true,"id":"f52a51f2-1d8f-4dee-b214-c65760473054","last_modified":1562025319823},{"schema":1562025318342,"derHash":"GJWNA6+0CWh6G8Jjhg0Nc1oloASrYODw5F1jM1h0N64=","subject":"CN=GoGetSSL Business Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGCMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLTArBgNVBAMMJEdvR2V0U1NMIEJ1c2luZXNzIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"bbda288904603261a16251c2a9b280cba6dabc71d51dcff1d3c4f6b0447c1a3b","size":1752,"filename":"WhJb1Rhj6-UXftVUkeVV5CiOZwfWF4gdskEVvyWpNxM=.pem","location":"security-state-staging/intermediates/1ce075cb-f977-4ccb-b47f-6aedf5a3162b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WhJb1Rhj6+UXftVUkeVV5CiOZwfWF4gdskEVvyWpNxM=","crlite_enrolled":false,"id":"bf5482ce-06f3-4976-a653-c8d2aced7246","last_modified":1562025319075},{"schema":1562025317595,"derHash":"lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=","subject":"CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b","size":1727,"filename":"8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem","location":"security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=","crlite_enrolled":true,"id":"549c92e2-3738-4c8c-ae37-407e4e6158ce","last_modified":1562025318334},{"schema":1562025314617,"derHash":"eZ4gVk1FSE36DyjtcmA3/wcNZsUd6OI0MoTeyrD8mZE=","subject":"CN=Network Solutions EV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBFViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"e31f1427ec6db92529d090d990064b3f8fd08dc7b1f02e0b68d1ef7ff9e4505c","size":1857,"filename":"uY4iOhjFT5ZJncBPVcvV4Vp7MzDa5mJyEdEtzpD6i28=.pem","location":"security-state-staging/intermediates/397f2aa1-bd87-47da-b308-5ddefa3c9e3c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uY4iOhjFT5ZJncBPVcvV4Vp7MzDa5mJyEdEtzpD6i28=","crlite_enrolled":true,"id":"3b08d1c1-eaa3-447e-a837-aa1abd1be8a4","last_modified":1562025315352},{"schema":1562025313862,"derHash":"tf1vgAM09WUDawmZ+DELWwvXJoOV2LJnAFaXr3MBxeg=","subject":"CN=AffirmTrust Certificate Authority - OV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIE9WMQ==","whitelist":false,"attachment":{"hash":"0444cfdbccd513e2a46e37f1768b21669333660cb0c9e2802b9e5041b414be02","size":1674,"filename":"RM5J-l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv-DsGM=.pem","location":"security-state-staging/intermediates/eb61a73a-5fdb-41c0-848b-e07b9e3a24e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RM5J+l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv+DsGM=","crlite_enrolled":true,"id":"be2ceaf1-8ba0-4cab-bd2a-0cdb7f118523","last_modified":1562025314608},{"schema":1562025313115,"derHash":"x/VG8Mdsmg2pmS6YhOYki3yiu2reg4vXoDqMQe4qMGQ=","subject":"CN=WoSign OV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"048dba35914e23e206772fb60d80b4ca80d87cf337af50dd6dc2287381e3e76a","size":1691,"filename":"MZKD2c60FHEBoj-uZNlegylIGvCafu0tBZ2eUHao0-0=.pem","location":"security-state-staging/intermediates/b60c5c46-1be6-40b6-8d56-cd82c562287f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MZKD2c60FHEBoj+uZNlegylIGvCafu0tBZ2eUHao0+0=","crlite_enrolled":true,"id":"2a6ed91a-06ad-49ae-94d2-9fd509326fda","last_modified":1562025313853},{"schema":1562025310863,"derHash":"b1h9G+4vFhxPwuZiBT35z/7+URRM6SfTFD5KTDSLhWc=","subject":"CN=GENIOUS ECC Organization Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGVMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxPTA7BgNVBAMTNEdFTklPVVMgRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"a15ce7808aa99574fda608941c7b79aeebab97da5fdca6096ca97147951f3fab","size":1345,"filename":"9JEABMnN_SwMIz1lP1QSJXAr9u9DfOC_51G3sB_hgvg=.pem","location":"security-state-staging/intermediates/11e95b57-aa8c-455b-bf47-2ce89665585e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9JEABMnN/SwMIz1lP1QSJXAr9u9DfOC/51G3sB/hgvg=","crlite_enrolled":false,"id":"eba108e8-2131-4af1-aa97-148aa27d0bbd","last_modified":1562025311599},{"schema":1562025307101,"derHash":"jDhVsKoIU/ZTfHcnrEFqJHYcioE54n2B4Ssz67dzhdg=","subject":"SERIALNUMBER=201908,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA4","whitelist":false,"attachment":{"hash":"cccaf9299dbfe420f3015ef4d158c1965fe160e99937c153a0290d2f9bc45873","size":2333,"filename":"Yuh8cRCxqhDPCJCNLDTVXWmhSaBY8Jl6YlQFhDVMYrU=.pem","location":"security-state-staging/intermediates/261862b1-2bce-41b6-ad40-c999c0dfa834.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yuh8cRCxqhDPCJCNLDTVXWmhSaBY8Jl6YlQFhDVMYrU=","crlite_enrolled":false,"id":"2f9d0c1d-b80d-43af-a476-95278b1e87b8","last_modified":1562025307842},{"schema":1562025305606,"derHash":"3QwL6c4JBB8Wty1rPWKluPU4Qn7BpC2DMa8bWd/mlEY=","subject":"CN=AffirmTrust Networking Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgTmV0d29ya2luZyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"c7b2667e5d9802f3d9c42a37d05f6c68fba7119a56843956b872ec74a1115970","size":1581,"filename":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=.pem","location":"security-state-staging/intermediates/9050ab70-b46f-45d7-90b4-edff1e8b4d24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=","crlite_enrolled":false,"id":"4db21147-aaec-40a6-b50d-3790bbcfd4f4","last_modified":1562025306340},{"schema":1562025304867,"derHash":"450+2Iblo68mudarYIAovG+8UuWZyzI9p+nndbUwM3w=","subject":"CN=Amazon,OU=Server CA 0A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAwQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"a68a630350b255e6f2fc6123fbd732917d5259386f485d3136d80a777271ef2a","size":1666,"filename":"tYU57KoTkhzNuA0400h1_eZHHFoVnZvu8vpvmZg71hE=.pem","location":"security-state-staging/intermediates/ad29234d-055c-47ec-b5fb-78bb146b74e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYU57KoTkhzNuA0400h1/eZHHFoVnZvu8vpvmZg71hE=","crlite_enrolled":false,"id":"e243a4ba-3208-4938-97f4-f4fe00c73c5e","last_modified":1562025305598},{"schema":1562025303361,"derHash":"43EPDGZ+WJ3o5K6jfnAa+vP7tidXYub+o/1mKVRCedY=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"a14b89bb2062f598bd836c642489dc372a04cf0bc46001ed6613adf12484de00","size":1849,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/0eafa101-533d-4a28-a0f1-4d0fe9c795a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"4ad1dc4a-0a9b-4057-867a-1d1aaef8e793","last_modified":1562025304109},{"schema":1562025302614,"derHash":"3Bqx78ogg/4eptDT3Ep4edXMbT2j8KgelMhpnTqnyw4=","subject":"CN=Institute of Accelerating Systems and Applications Client CA R1,O=Institute of Accelerating Systems and Applications,L=Athens,C=GR","subjectDN":"MIGlMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMTswOQYDVQQKEzJJbnN0aXR1dGUgb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9uczFIMEYGA1UEAxM/SW5zdGl0dXRlIG9mIEFjY2VsZXJhdGluZyBTeXN0ZW1zIGFuZCBBcHBsaWNhdGlvbnMgQ2xpZW50IENBIFIx","whitelist":false,"attachment":{"hash":"3c6264fd3d686bf2adb8496b232e035774c7efe61bb19a690633eaeb3995552c","size":2621,"filename":"IhXE146qQEkPE3NDCXQL_XCLpRiVTVuOAnKEHxg0A3w=.pem","location":"security-state-staging/intermediates/a6fe91af-3457-4d40-97b4-e7ac3e0bf68a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IhXE146qQEkPE3NDCXQL/XCLpRiVTVuOAnKEHxg0A3w=","crlite_enrolled":false,"id":"c10c0ae5-e174-4d1e-8333-c111ab28da33","last_modified":1562025303351},{"schema":1562025298880,"derHash":"rftaDyWTCRIrzR8DAmAHmIJRclX1s40z+Nq5c8tg4LY=","subject":"CN=FujiSSL ECC Domain Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHQxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKjAoBgNVBAMTIUZ1amlTU0wgRUNDIERvbWFpbiBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"a956c6214bc00a3983c1ec59a5c5b4fef7452a3a94862da4f2b186ac1f059736","size":1297,"filename":"2rgbkrRXysWSf_k1kOj6EDKWKuKW-YVR38ExFhGbHac=.pem","location":"security-state-staging/intermediates/bfdd4e7d-8b03-4761-b3d1-ab4103ab8df3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2rgbkrRXysWSf/k1kOj6EDKWKuKW+YVR38ExFhGbHac=","crlite_enrolled":false,"id":"f1917f9a-0c69-4510-a86a-08ce3db84cf9","last_modified":1562025299610},{"schema":1562025295880,"derHash":"6QSgV9g5vL5jEJK0IV3YzE+ISbqHtRqvJyi3HmSs51E=","subject":"CN=DREAMHOST SECURE EMAIL CA,O=DREAMHOST CERTIFICATION AUTHORITY,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMSowKAYDVQQKEyFEUkVBTUhPU1QgQ0VSVElGSUNBVElPTiBBVVRIT1JJVFkxIjAgBgNVBAMTGURSRUFNSE9TVCBTRUNVUkUgRU1BSUwgQ0E=","whitelist":false,"attachment":{"hash":"bd46e6b3068ecccbabe7da0273be8a3d35a413fdfcca05bc18847e7402db16fa","size":1756,"filename":"63NWnCfq1JadpotgYBS_ORAIQ4nhhoHBm9FjkLxi1nA=.pem","location":"security-state-staging/intermediates/f2757c69-e3af-4940-ab12-328e5089e118.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"63NWnCfq1JadpotgYBS/ORAIQ4nhhoHBm9FjkLxi1nA=","crlite_enrolled":false,"id":"1c2b0263-fa38-44fa-be13-95992ca973b2","last_modified":1562025296626},{"schema":1562025295127,"derHash":"7WeTcIOwc58wI5b5dK+0G/umSEc5Z3gLLFm4isQSGtQ=","subject":"CN=Volusion\\, Inc. DV SSL CA - G4,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"2345f19d6cfb45db379df441b2cdc6a5cfc3cb08f620d38c40c9b1efd1aae341","size":1642,"filename":"2vpFY_GsHi5tYScV5TkSw7SuQkJ1Qtyos25uI1C0Cok=.pem","location":"security-state-staging/intermediates/b12a2c62-5974-4e93-b3de-d12852b5fe03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2vpFY/GsHi5tYScV5TkSw7SuQkJ1Qtyos25uI1C0Cok=","crlite_enrolled":false,"id":"d468c55f-58fb-4439-a16d-69f3fafd2500","last_modified":1562025295872},{"schema":1562025292866,"derHash":"dK/O7OBzFYe0XDzae8IQ/JF1AqMjQB6TLoZbw9eX56s=","subject":"CN=Atos TrustedRoot Issuing CA for WWE 2015,O=Atos,C=DE","subjectDN":"ME8xMTAvBgNVBAMMKEF0b3MgVHJ1c3RlZFJvb3QgSXNzdWluZyBDQSBmb3IgV1dFIDIwMTUxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"0c5d1ea52b767af0853d6af41c73f1d188589a66e9c919e2858bc429241f4ffc","size":1573,"filename":"IA32tKC4ljNAfmi44SQR9xeWWNipPKjmUmjtzoT6pkY=.pem","location":"security-state-staging/intermediates/345d4a3f-ed22-4e47-af57-c4da221aa0cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IA32tKC4ljNAfmi44SQR9xeWWNipPKjmUmjtzoT6pkY=","crlite_enrolled":false,"id":"69330f6b-0bbf-4528-a402-c89b6262cce4","last_modified":1562025293606},{"schema":1562025292126,"derHash":"K/lNoe25VOkofJ5F4p/2ptKvuPiJDPJzO9dkEdV9vv4=","subject":"SERIALNUMBER=201402,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDI=","whitelist":false,"attachment":{"hash":"ae7283dfb872e87e5821a01f3bc4d8820099528e2f30c0e7e063e4d650afe62e","size":1402,"filename":"0EXmMnZ8pOr9XL2evHgo2vhHefnCt2aq-aHmDVgtjKU=.pem","location":"security-state-staging/intermediates/614d38fd-2482-4116-9af6-e749766cd34f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0EXmMnZ8pOr9XL2evHgo2vhHefnCt2aq+aHmDVgtjKU=","crlite_enrolled":false,"id":"f1f158d2-8546-42eb-9aba-1e797216092b","last_modified":1562025292859},{"schema":1562025291368,"derHash":"/ToPPdRIAJK21FBHPeuSAaCzCKiAeDOjxzj4oH64HtM=","subject":"CN=GlobalSign Qualified CA 2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAy","whitelist":false,"attachment":{"hash":"666808b17b5d5c0349aaa78a66212cf4825a5213929f0923b1a7e7ad57f22de8","size":2109,"filename":"6gTNFHlwskoXv_3BC7UG_CElyhyz-r3yoROD5FPGkK0=.pem","location":"security-state-staging/intermediates/adcf2001-8f21-4761-be6c-9e62f61e8388.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6gTNFHlwskoXv/3BC7UG/CElyhyz+r3yoROD5FPGkK0=","crlite_enrolled":false,"id":"e1f44dc0-1060-4ef8-9484-d4260f68e10d","last_modified":1562025292119},{"schema":1562025290627,"derHash":"K97vpzX/cAXf6C5mZBdy2CXno2GbvKyxPP4gEGYOPZ0=","subject":"CN=FujiSSL ECC Business Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHYxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xLDAqBgNVBAMTI0Z1amlTU0wgRUNDIEJ1c2luZXNzIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"a386eaf0d14a248038d2dbe1176d0e3ce1059635e00d20a970a14c70e2aea71e","size":1301,"filename":"VSIhlyLVTq0piI3j7ajNA5ZmdmgumlgTW-MV_okesCc=.pem","location":"security-state-staging/intermediates/931dec64-f845-46f7-8d31-c72027306d9c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VSIhlyLVTq0piI3j7ajNA5ZmdmgumlgTW+MV/okesCc=","crlite_enrolled":false,"id":"5e423d91-6fa8-4e19-9256-bcceaf49c94a","last_modified":1562025291360},{"schema":1562025287648,"derHash":"f2iJ/+iwIEXiysmaLy7k9MLu0kk0tlIYctNL+BJnHEs=","subject":"CN=Oracle SSL CA,OU=VeriSign Trust Network+OU=Class 3 MPKI Secure Server CA,O=Oracle Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEbMBkGA1UEChMST3JhY2xlIENvcnBvcmF0aW9uMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSYwJAYDVQQLEx1DbGFzcyAzIE1QS0kgU2VjdXJlIFNlcnZlciBDQTEWMBQGA1UEAxMNT3JhY2xlIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"7ee4ae6d41d1ebeeccf162c75257607ac06eccb9355c405dd9feb4a7974e24a3","size":1760,"filename":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=.pem","location":"security-state-staging/intermediates/78a7a038-46d1-4bda-b8d6-a3b6d6b8054b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=","crlite_enrolled":false,"id":"87511250-6e4a-46a5-b783-2c8da9c8699a","last_modified":1562025288390},{"schema":1562025285415,"derHash":"Ut/XNdStpK6sstd5aPlxEUP7DDxag7UKxN65h6h45Qk=","subject":"CN=USERTrust ECC Client Authentication and Secure Email CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGaMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazFAMD4GA1UEAxM3VVNFUlRydXN0IEVDQyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"502ff44158f951d41a26530bc84cf7795c28a1df29c855cfcef1ccac9b79ffea","size":1329,"filename":"vjKVj54qS0DDdeD0OJ1UYEfRr3NvN4Z5QRmAX66bxB8=.pem","location":"security-state-staging/intermediates/fceaa33d-3b3c-40c0-9a8f-8de7dc41a6c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vjKVj54qS0DDdeD0OJ1UYEfRr3NvN4Z5QRmAX66bxB8=","crlite_enrolled":false,"id":"de9349f5-db91-4241-8540-d0370d7c4de3","last_modified":1562025286167},{"schema":1562025284669,"derHash":"OZfHIYk7OSbTk4oxHKB6Jhsq4i4B3Fh/GB3/FbmLTqY=","subject":"CN=TrustAsia Technologies\\, Inc. DV SSL CA - G1,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGJMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK1RydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4gRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"11872ef0761a794cdfd0a48bdcaf7cd23daea461861f20c6fd25fe349bf445b0","size":1934,"filename":"OOzymZtqtOUPeO7RggB8hPhhnT-cN00YxTIniP-3dbM=.pem","location":"security-state-staging/intermediates/2198bb6c-f4f0-49d8-a771-38b6a5d3d95f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOzymZtqtOUPeO7RggB8hPhhnT+cN00YxTIniP+3dbM=","crlite_enrolled":false,"id":"990db375-32be-4512-98dd-189df3712cf5","last_modified":1562025285408},{"schema":1562025283917,"derHash":"+jl96NtvEQp/o00QG6yKkUdQ9TsCI6i9L7gS51cVXCA=","subject":"CN=SwissSign Personal Silver CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLzAtBgNVBAMTJlN3aXNzU2lnbiBQZXJzb25hbCBTaWx2ZXIgQ0EgMjAwOCAtIEcy","whitelist":false,"attachment":{"hash":"c1c9d52213575e65ceed56f35a6ed33a249d8d1c3a280659df44920339ef7ffe","size":2280,"filename":"jyhVT5llCBR7-xwGoq2SlKQcMasWHqmouxTYUO1Fhiw=.pem","location":"security-state-staging/intermediates/ea4ea5bd-3a75-4cd2-a235-c3e8ef18c8c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jyhVT5llCBR7+xwGoq2SlKQcMasWHqmouxTYUO1Fhiw=","crlite_enrolled":false,"id":"4f348dc6-e98b-4a77-a839-d0327398fe7f","last_modified":1562025284661},{"schema":1562025283171,"derHash":"U8Ra7/0YwhQHTBmDD/T1u0+g9sQkUIt7wEMhZThoXlo=","subject":"SERIALNUMBER=201805,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA1","whitelist":false,"attachment":{"hash":"e34007490624a17574e785aa940bb4a087283cee6f3c794ed80db3caecae05b0","size":2333,"filename":"ioQjHVX2Sgc0RK99U3WoHL7qOrrxLgG4Vk0NB28dfkU=.pem","location":"security-state-staging/intermediates/e1e9dbef-94d9-4968-b370-92830e644fe3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ioQjHVX2Sgc0RK99U3WoHL7qOrrxLgG4Vk0NB28dfkU=","crlite_enrolled":false,"id":"c1417a0b-e2ff-4c67-bbcb-92f31268a84c","last_modified":1562025283909},{"schema":1562025282408,"derHash":"fjI2jiSizEjT0p6IOyYOQM7aIq+XGJx4/FuShITpoBA=","subject":"CN=COMODO ECC Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE2MDQGA1UEAxMtQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"abc0795848f66d2488b81a62506ef09e4d6d926185ae30b0ab7290d81e4c61f4","size":1313,"filename":"EohwrK1N7rr3bRQphPj4j2cel-B2d0NNbM9PWHNDXpM=.pem","location":"security-state-staging/intermediates/6f4d4854-993d-42ab-936d-589d8c7fd633.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EohwrK1N7rr3bRQphPj4j2cel+B2d0NNbM9PWHNDXpM=","crlite_enrolled":true,"id":"693849c2-1989-4277-9217-80926c45cb4f","last_modified":1562025283163},{"schema":1562025280120,"derHash":"M8+wYs0pUeTdGiVr7RVr6lPykNA53u+4W+leGQEhajY=","subject":"CN=Trustico RSA DV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"02328d098993eca5c1b5bf2cc236d3f542a361cb3ed4b2e31d3d3ae57be6d2d2","size":2113,"filename":"B_bkhTDI5DJw6nXXzz0RfEQettWUxxESQlnc8VMZ4uk=.pem","location":"security-state-staging/intermediates/087c9b71-a0a9-4909-9e5f-c7b1e4f77ee3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B/bkhTDI5DJw6nXXzz0RfEQettWUxxESQlnc8VMZ4uk=","crlite_enrolled":true,"id":"7e702c67-68fb-441f-a66f-cf0a09acdafd","last_modified":1562025280864},{"schema":1562025279350,"derHash":"dNmS05ELz340uLXNKPkerrT0Hz2mOU14uMQ2ctQ/Tw8=","subject":"CN=ESTEID-SK 2015,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGMxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEXMBUGA1UEAwwORVNURUlELVNLIDIwMTU=","whitelist":false,"attachment":{"hash":"e79288e6283a6cf8e401f46b989c7aba65f6bce135c24772fae33f54a7339c1e","size":2292,"filename":"cl4xfKuRdlBntQEBobDSd3nPt8GamO_lYQLJgp-QIK8=.pem","location":"security-state-staging/intermediates/3e90d73f-3a85-419c-8bab-c12f148d4549.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cl4xfKuRdlBntQEBobDSd3nPt8GamO/lYQLJgp+QIK8=","crlite_enrolled":false,"id":"d4fae966-1bfe-4fcc-858e-bd9b0868c507","last_modified":1562025280113},{"schema":1562025278609,"derHash":"g/yJGzUNng1+vm3Spr/j0LD0ZT/KBIYVpd7rvAOaP2Y=","subject":"CN=GlobalSign AATL Partners CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEFBVEwgUGFydG5lcnMgQ0EgMjAxOQ==","whitelist":false,"attachment":{"hash":"d000e3224251910e8fb77335b40609ff5b3d0205b628feaf700f6e228504357a","size":2320,"filename":"lhJQC7F2rtgQWIaZBt4zOXO4E9P82bsb47uEijI-pcM=.pem","location":"security-state-staging/intermediates/9525d4df-8f6a-4b8f-b69e-ce869574f13c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lhJQC7F2rtgQWIaZBt4zOXO4E9P82bsb47uEijI+pcM=","crlite_enrolled":false,"id":"643f92c8-d792-43c2-a342-b580ba9e0749","last_modified":1562025279342},{"schema":1562025277127,"derHash":"wSRamgOcxRG8+zpQvh2JqYmTNDHyXA+WZbqXf5T4dsE=","subject":"CN=TeliaSonera Mobile ID CA v2,O=TeliaSonera Finland Oyj,C=FI","subjectDN":"MFUxCzAJBgNVBAYTAkZJMSAwHgYDVQQKDBdUZWxpYVNvbmVyYSBGaW5sYW5kIE95ajEkMCIGA1UEAwwbVGVsaWFTb25lcmEgTW9iaWxlIElEIENBIHYy","whitelist":false,"attachment":{"hash":"eaf431cf6c23f62a0ea543c5ad0adc1419e73f94ab2cab3d87029b9c730e91b4","size":2418,"filename":"cDMfyugvFsXyMurrO5J9HB6avAWXo9wMS1nT_8Mt7KA=.pem","location":"security-state-staging/intermediates/ada98906-2009-431a-ae1c-97f895b6b074.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cDMfyugvFsXyMurrO5J9HB6avAWXo9wMS1nT/8Mt7KA=","crlite_enrolled":false,"id":"10063ad2-f0b0-4c5f-96ba-842b66ad98f5","last_modified":1562025277858},{"schema":1562025276325,"derHash":"2eRFsixvyzeylvzRMxSGVpZRqNuYBxdT/vxz0sl79zI=","subject":"CN=Qualified KET e-Szigno CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHlF1YWxpZmllZCBLRVQgZS1Temlnbm8gQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"6b304876a14dedb4738c9754f4bc04eec54cc78cd3212181152603a8af2bcd15","size":2231,"filename":"oknJfA6HpIW3Guv29R8tlmS5hAgGjhhUfpBsZPu2Pds=.pem","location":"security-state-staging/intermediates/2563636d-ab39-462e-8e03-eeda6388ea2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oknJfA6HpIW3Guv29R8tlmS5hAgGjhhUfpBsZPu2Pds=","crlite_enrolled":false,"id":"0a5a0741-ed12-460d-8ae6-94cb14567a42","last_modified":1562025277120},{"schema":1562025273330,"derHash":"TmKiUlkvnXH/4gN3V/hV1KAjXWY4vRBenvFwhs4rvCU=","subject":"CN=SECOM Passport for Web MH CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSUwIwYDVQQDExxTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIE1IIENB","whitelist":false,"attachment":{"hash":"4325c7065bb83e9d92f3718a9948fddc4a55dc191e11a5d9b3164c843c5def37","size":1670,"filename":"q9I-r-WPX4f6FsDftbkgFglISBQJtf5Dqt8hXHPa7-U=.pem","location":"security-state-staging/intermediates/4c0cdeb1-6b0a-4cc1-8425-c5d64b1a5c3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q9I+r+WPX4f6FsDftbkgFglISBQJtf5Dqt8hXHPa7+U=","crlite_enrolled":true,"id":"a48f8f7b-e4c4-4695-b74a-c002a3d4d4c9","last_modified":1562025274069},{"schema":1562025270327,"derHash":"JNBrln5wvIziH/yv0+tbaaTi4suvNruc1k6rzdFCPE4=","subject":"CN=Ericsson NL Individual CA v2,O=Ericsson","subjectDN":"MDoxETAPBgNVBAoMCEVyaWNzc29uMSUwIwYDVQQDDBxFcmljc3NvbiBOTCBJbmRpdmlkdWFsIENBIHYy","whitelist":false,"attachment":{"hash":"9bd44a9602e69344b4bafda91c3b4a8dd3d025582daf9faf359359dd39289296","size":2385,"filename":"w-D6Z-19kKBN5dh4sJv7cmEtM_38D_ZKyomDU56r6Gs=.pem","location":"security-state-staging/intermediates/0ae9ba0f-5da4-47f6-be43-46d84e790e1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w+D6Z+19kKBN5dh4sJv7cmEtM/38D/ZKyomDU56r6Gs=","crlite_enrolled":false,"id":"643acb4e-7965-4eb4-98eb-22787679daf9","last_modified":1562025271070},{"schema":1562025267327,"derHash":"nG0IkzIBQH+/KxJUC2fMDkyWZvEy4VBHYqcXy66PP9Y=","subject":"CN=HydrantID SSL ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBTU0wgSUNBIEcy","whitelist":false,"attachment":{"hash":"c4fbca9a15eb275e83118896e4839aba070abde056cf047aa1a57afdd78af927","size":2406,"filename":"400Fim9IQe4j-Gj-Ci4R44M3gA6J1_TRh8LlPSLF3I8=.pem","location":"security-state-staging/intermediates/a6966be8-fd40-411c-9f57-e4027bd92592.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"400Fim9IQe4j+Gj+Ci4R44M3gA6J1/TRh8LlPSLF3I8=","crlite_enrolled":true,"id":"c6e5ffe6-a302-4ac5-a6b6-3b6b960d5347","last_modified":1562025268059},{"schema":1562025265805,"derHash":"CCf2v9u/MOoP6s8be9Bu72XbJxrNfptdJpoPLzcrIek=","subject":"CN=EuropeanSSL Server CA 2,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MHkxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1Xw7xydHRlbWJlcmcxFDASBgNVBAcTC0R1cm1lcnNoZWltMRUwEwYDVQQKEwxFVU5FVElDIEdtYkgxIDAeBgNVBAMTF0V1cm9wZWFuU1NMIFNlcnZlciBDQSAy","whitelist":false,"attachment":{"hash":"09d22bba9126989782eb2682c0b1fab55cbf0dc7dc8b1afbd39bcf120f1c52fe","size":2142,"filename":"voGNYzoU7vT-Rbv9zjL5yL6Z294ZkClnxHkt0bjiTWM=.pem","location":"security-state-staging/intermediates/0e75900a-af17-4c88-b8e2-a11d13588bd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"voGNYzoU7vT+Rbv9zjL5yL6Z294ZkClnxHkt0bjiTWM=","crlite_enrolled":true,"id":"497678fd-cecb-41ae-8247-6870a5a994e1","last_modified":1562025266548},{"schema":1562025264327,"derHash":"aezbwxR/WB39y1Itne+yYLJnhK1JVcdOalJSLMxMRAg=","subject":"CN=Hongkong Post e-Cert SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MHoxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDErMCkGA1UEAxMiSG9uZ2tvbmcgUG9zdCBlLUNlcnQgU1NMIENBIDMgLSAxNw==","whitelist":false,"attachment":{"hash":"d819d0da20d45c8f93a0efb0d37fd86e274107134845bf5480d9b3697bb0711d","size":2093,"filename":"SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65_DY=.pem","location":"security-state-staging/intermediates/b1839acb-c26b-4d29-aa46-65f25e6250c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65/DY=","crlite_enrolled":true,"id":"4d1c3055-4469-4d11-a7a0-e646d9c6bd59","last_modified":1562025265062},{"schema":1562025263575,"derHash":"yrAWxeoyBhvQZf4TpVpA+mEFiyezSn+NF19xAe4GPjs=","subject":"CN=DigiCert Federated ID L1 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMSBDQQ==","whitelist":false,"attachment":{"hash":"7a2334ef63e735c7a9de8317fb1bbca56541bf3f0d2bd5aa7df6733294d35767","size":1845,"filename":"PUDyhbzncnmmUQ8SN4OwZj01ukzlqryo_kEquVWErUo=.pem","location":"security-state-staging/intermediates/ddd65303-64d3-475c-8530-62101b203d10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PUDyhbzncnmmUQ8SN4OwZj01ukzlqryo/kEquVWErUo=","crlite_enrolled":false,"id":"97566edd-1d57-4cb3-8126-4a4c2b0482b8","last_modified":1562025264319},{"schema":1562025262823,"derHash":"F+9vtce+3y8P555xsbzMjYnnWgreFvVuo6qt3x0BLtg=","subject":"SERIALNUMBER=201818,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE4","whitelist":false,"attachment":{"hash":"1974a713335bdf0f88de6d1870fe48c4da9b47a0591e661657ce8e67bc14c9b4","size":2333,"filename":"Kb5-3Axv89fCYAIhhiEJWD0TJRRx0BZ7FLrkwQkAMBA=.pem","location":"security-state-staging/intermediates/dcc6ed3d-ff66-4c1a-97b7-b513478a0679.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kb5+3Axv89fCYAIhhiEJWD0TJRRx0BZ7FLrkwQkAMBA=","crlite_enrolled":false,"id":"8f13126f-ea09-4860-bb62-7c3995e356bf","last_modified":1562025263567},{"schema":1562025262072,"derHash":"/ciYbPrE818azVF+D2G4eYgq4HbiuoC3e9Pw/lzviGI=","subject":"CN=DigiCert ECC Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"31ecd5e8057fdfa62dc602519feac045085c66fc65b202627b24662a21a6de2f","size":1414,"filename":"WOINGBsGlG95B7s_6U7XB_KM7U73y-sXgtLqZpn3G88=.pem","location":"security-state-staging/intermediates/60a912ac-30e3-4cf3-b9c7-b3c3a357755f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WOINGBsGlG95B7s/6U7XB/KM7U73y+sXgtLqZpn3G88=","crlite_enrolled":true,"id":"7ea2d3a5-3815-43a7-93ac-94921c661784","last_modified":1562025262816},{"schema":1562025261328,"derHash":"Sw0TktORVzUyB6ZMyxRoPd6dLO0ftYsW4Di+VwfCeBM=","subject":"CN=GlobalSign HV ECC DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEhWIEVDQyBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"1acd32da9feed3e2e4ee157a2618013352d326fef642f7bfd585f8ae92c7d2ed","size":1163,"filename":"0fnBFUmy_VBjGa_Pg7kDaXRGAe4mSax_PZ77vht_SZk=.pem","location":"security-state-staging/intermediates/0463ef18-4ed8-456d-b684-8528412f482c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0fnBFUmy/VBjGa/Pg7kDaXRGAe4mSax/PZ77vht/SZk=","crlite_enrolled":false,"id":"8ada5368-0eb6-43b5-9561-ebab68b2417b","last_modified":1562025262065},{"schema":1562025258340,"derHash":"NFpS8WTfYTRjyHKIQmytJGurAoJFKU3b+mGMa7O+PDw=","subject":"CN=USERTrust ECC Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEmMCQGA1UEAxMdVVNFUlRydXN0IEVDQyBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"6d2fff64af8033e0034b6470f651280afccd50ced99453f4d67c9f2930b76ba3","size":1301,"filename":"0pKpvg7zRQ3q1ij8opewIS6KAUpC33v2uz9IDAj7Vm8=.pem","location":"security-state-staging/intermediates/0945ec2b-c44f-4f2b-a547-56c1007278dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0pKpvg7zRQ3q1ij8opewIS6KAUpC33v2uz9IDAj7Vm8=","crlite_enrolled":false,"id":"b8be43b3-c5c5-42cd-9032-02ad84857d12","last_modified":1562025259081},{"schema":1562025254563,"derHash":"EEUVQJRXCA2yCi6SH0e71q+nd1Wa272Xz8KtnXtBO2M=","subject":"CN=TERENA Personal CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDI=","whitelist":false,"attachment":{"hash":"ab5e9dc41345f4e069db5085e2e2163cca665a1acb76e2027588a96dfe55d4c1","size":2109,"filename":"lYumc4BVxXiIXDsLhm-7RneF4K3-Oq0Y7tWzE53jpdY=.pem","location":"security-state-staging/intermediates/f6cf20f8-9d99-4e75-86db-8ea4091ef3a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lYumc4BVxXiIXDsLhm+7RneF4K3+Oq0Y7tWzE53jpdY=","crlite_enrolled":false,"id":"e2f6d9c6-6f0b-4bc2-a31b-53a2c110e920","last_modified":1562025255321},{"schema":1562025253083,"derHash":"q0nGSsXSf5s2iMqAqjiSfxw3zRZZZBQIY/NDJ84FAiw=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma TSA - 2013,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIGrMQswCQYDVQQGEwJFUzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcTQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEeMBwGA1UEAxMVQ2FtZXJmaXJtYSBUU0EgLSAyMDEz","whitelist":false,"attachment":{"hash":"06bc7202aab2c07f1258303519c61f00bb59c17c80441fdb907ded166ba74a1b","size":2922,"filename":"EUdCx9qvs_LbJR4oy_CzU4P-rk_mcz-RAiT7758aSxE=.pem","location":"security-state-staging/intermediates/2ca3ac52-97ea-42f0-ac7f-0cceb0f6b524.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EUdCx9qvs/LbJR4oy/CzU4P+rk/mcz+RAiT7758aSxE=","crlite_enrolled":false,"id":"e582d41c-4c40-4138-8e0e-bab122025d20","last_modified":1562025253818},{"schema":1562025251569,"derHash":"CP1BixGIU0hP0bBm8ZIqgPVx2P/3Jo1Ziwht8YtYCtg=","subject":"CN=Atos TrustedRoot Server-CA 2019,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgU2VydmVyLUNBIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"e9026c05fca12f79a992b5c8a7d90af2ccafac750d96e6d2a420590a55a54e3c","size":1922,"filename":"SD8O2olCwqFt3wL6_lvBiVzprjUyo7vWr7bIS3B3am8=.pem","location":"security-state-staging/intermediates/c310d05d-c0b0-4149-9d40-04e0f46a1fab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SD8O2olCwqFt3wL6/lvBiVzprjUyo7vWr7bIS3B3am8=","crlite_enrolled":true,"id":"4f5ba09a-4228-4ae3-b9fb-e261273f7b68","last_modified":1562025252319},{"schema":1562025250085,"derHash":"YK+eXznYc7I2vhQrxwbaVxhJrtf65jX8WhRhoM90WcU=","subject":"CN=Qualified e-Szigno Organization CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGIMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExMDAuBgNVBAMMJ1F1YWxpZmllZCBlLVN6aWdubyBPcmdhbml6YXRpb24gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"dc2952bb2d73640240643f13334e8d01c2d9e778dde282b5c91837df5e8fae4e","size":2601,"filename":"WWpF25055wfjcZBv75P1HqErKnpSgGY5RThLltVZ-uo=.pem","location":"security-state-staging/intermediates/4a7927f3-053b-4fb2-b88a-f0952955b74b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WWpF25055wfjcZBv75P1HqErKnpSgGY5RThLltVZ+uo=","crlite_enrolled":false,"id":"e0a7a8fd-452f-48c1-a2d9-8dc311bf2cf1","last_modified":1562025250818},{"schema":1562025249333,"derHash":"N9IgpsdSJ5kCEZE0nBg/kXvhvoYmz5JrD9bgqGge4DE=","subject":"SERIALNUMBER=ZZZZZZAD,CN=Siemens Issuing CA EE Network Smartcard Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGxMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQUQxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTowOAYDVQQDDDFTaWVtZW5zIElzc3VpbmcgQ0EgRUUgTmV0d29yayBTbWFydGNhcmQgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"83492b707e3f19c0afa5426bfb86e053d1a36c3bb7f6b2a1fbbe180edc9522b1","size":2662,"filename":"ela416lvtgHOV0XkKFtPo_tjgfnex9VPmwFMF-IIdz4=.pem","location":"security-state-staging/intermediates/69464078-b92d-4ac6-a641-b03a66daeab5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ela416lvtgHOV0XkKFtPo/tjgfnex9VPmwFMF+IIdz4=","crlite_enrolled":false,"id":"ea3a7109-fc97-48d4-8817-07a2ab0f437f","last_modified":1562025250077},{"schema":1562025247810,"derHash":"LEkPUwE2ARY8fpunSHAYGYnaRwC9vK6ZrSFk6UKF+0E=","subject":"CN=MilleniumSign SSL Certificate CA ECC R2,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIFNTTCBDZXJ0aWZpY2F0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"388484e855dcfa09a1d7e93bed5665fdab3d7827d888db660bc23756917d5656","size":1402,"filename":"rZHx6oWsQ4M32pcJKskm--yrHi1znChiiNn-Hyx1h8M=.pem","location":"security-state-staging/intermediates/705ae7c2-bcc3-48a7-a342-3aa6bbff0d09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rZHx6oWsQ4M32pcJKskm++yrHi1znChiiNn+Hyx1h8M=","crlite_enrolled":false,"id":"50fb555a-6152-4dbe-945c-1397deedac59","last_modified":1562025248555},{"schema":1562025247064,"derHash":"yucvZtYa+5ppczjo9TWNgHG6+krk0nF8fmNftepD02U=","subject":"CN=CERTSIGN FOR BANKING SIMPLE SSL PRODUCTION CA V3,OU=Certificat de productie Production certificate,O=certSIGN,C=RO","subjectDN":"MIGUMQswCQYDVQQGEwJSTzERMA8GA1UECgwIY2VydFNJR04xNzA1BgNVBAsMLkNlcnRpZmljYXQgZGUgcHJvZHVjdGllIFByb2R1Y3Rpb24gY2VydGlmaWNhdGUxOTA3BgNVBAMMMENFUlRTSUdOIEZPUiBCQU5LSU5HIFNJTVBMRSBTU0wgUFJPRFVDVElPTiBDQSBWMw==","whitelist":false,"attachment":{"hash":"9c05002f5f1bd3a2e682040ad3ca45aa65b80fbea14f287d0b612d125aae2b87","size":1678,"filename":"dSEYX-UXMMv7WVy6VlLFnfcCjxt0nH-xwgRrYqDvmpA=.pem","location":"security-state-staging/intermediates/86434fba-a8fc-495a-9af1-290826501bfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dSEYX+UXMMv7WVy6VlLFnfcCjxt0nH+xwgRrYqDvmpA=","crlite_enrolled":false,"id":"9a546d40-8e30-4cfa-b711-298337b46008","last_modified":1562025247802},{"schema":1562025246330,"derHash":"3apfcuEP060HKtLA0hlY2/FwnnrtE7OMJkco/OXJuh4=","subject":"CN=Academy of Athens Client CA R1,O=Academy of Athens,L=Athens,C=GR","subjectDN":"MGMxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxGjAYBgNVBAoTEUFjYWRlbXkgb2YgQXRoZW5zMScwJQYDVQQDEx5BY2FkZW15IG9mIEF0aGVucyBDbGllbnQgQ0EgUjE=","whitelist":false,"attachment":{"hash":"738c602f730b5e939f0962cda747abb3d84044de87505427faa5ed30e21e2ffc","size":2507,"filename":"E3sk6OwcCzO2DS5RQD94etvklmoU-SzyHf0OMzBriOs=.pem","location":"security-state-staging/intermediates/0e543b1f-c433-4a49-9b06-a28052d1a2d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E3sk6OwcCzO2DS5RQD94etvklmoU+SzyHf0OMzBriOs=","crlite_enrolled":false,"id":"83b9cbcd-5447-49b5-9b7b-1016057c6718","last_modified":1562025247057},{"schema":1562025245561,"derHash":"qyicYDV+1pBQ3F6ZlX8xZMyc+so7Q+IMsVGYnXbjIBk=","subject":"CN=GoGetSSL RSA Codesigning CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MFUxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEkMCIGA1UEAxMbR29HZXRTU0wgUlNBIENvZGVzaWduaW5nIENB","whitelist":false,"attachment":{"hash":"56b2b32dff5d71ed02e3e1749067d61d2a4a19ce62f7b78032a17588c7de239f","size":2068,"filename":"OlrioTffYEv0uD6tvV0JN2CtnQFZNo8zTIfkc_7jV4k=.pem","location":"security-state-staging/intermediates/6ff3a14d-3bfb-4b39-a5de-5a8dd144f7d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OlrioTffYEv0uD6tvV0JN2CtnQFZNo8zTIfkc/7jV4k=","crlite_enrolled":false,"id":"0da20e8d-2bbd-4b52-a722-8736b486c6f2","last_modified":1562025246322},{"schema":1562025244064,"derHash":"Ns3MfI84P3SFZYRm/ZUOdT/LAZ4lD9G8GgbFmB2KQYg=","subject":"CN=InterCloud SSL Certificate CA ECC R2,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBTU0wgQ2VydGlmaWNhdGUgQ0EgRUNDIFIy","whitelist":false,"attachment":{"hash":"2cd63ff457b9092043714375c47ef5c79b689924fd883a1846c0ee4e9a49871d","size":1288,"filename":"YZPwIxnplYZBGJ6aDvGcMHWqSiLPmhSwJq2dfNdJpTs=.pem","location":"security-state-staging/intermediates/08672d16-76ef-46ff-aa4a-125020548103.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZPwIxnplYZBGJ6aDvGcMHWqSiLPmhSwJq2dfNdJpTs=","crlite_enrolled":false,"id":"9c2507f9-b425-4085-9b3c-64ab602d5412","last_modified":1562025244801},{"schema":1562025239559,"derHash":"fPdfAGzP+Now1uoqL3xQ0ER6olE/9KSje/KSRwu6jIU=","subject":"CN=FujiSSL Public Certification Authority - G1,O=Nijimo\\, Inc.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMRUwEwYDVQQKEwxOaWppbW8sIEluYy4xNDAyBgNVBAMTK0Z1amlTU0wgUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"cbb38aed230419e776913b69c50f5489e2883ea7de0a1c182db31c687d9a5917","size":1626,"filename":"QrPwZsEgVVVbnQwEikJnQTnAiO0XvqNOi9gKQj7Xt4Q=.pem","location":"security-state-staging/intermediates/4c7aeb8b-1028-40e6-ae83-98ccf972fed1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QrPwZsEgVVVbnQwEikJnQTnAiO0XvqNOi9gKQj7Xt4Q=","crlite_enrolled":true,"id":"fd898cc0-617c-40fc-bcda-7dbae1c4d2f6","last_modified":1562025240312},{"schema":1562025237334,"derHash":"YvT7eFosKeEJ3xAx70hMJERrkkoHQATp44PKZH+OsLo=","subject":"CN=Fuji Xerox Endorsement CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEsxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MScwJQYDVQQDEx5GdWppIFhlcm94IEVuZG9yc2VtZW50IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"0bb50bc4474c1ca0ef3bbc22a21bf0edf96e41de9c858df8b08a934e21799aa0","size":1492,"filename":"THZ4O6mY6jclidc9TcI2ggOB6Kjgqp1Yft1QUe3A3jU=.pem","location":"security-state-staging/intermediates/942e28d9-1950-44b5-bbd0-8cb87c3ac2ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"THZ4O6mY6jclidc9TcI2ggOB6Kjgqp1Yft1QUe3A3jU=","crlite_enrolled":false,"id":"b2054ca3-7428-4e5a-a9c9-22f757e254b3","last_modified":1562025238075},{"schema":1562025235807,"derHash":"eM28aqlcqlR0SDefjNOtAXIsrRwox80BbqMDIXi2+Q4=","subject":"CN=Trustico RSA Codesigning CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MHcxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxJDAiBgNVBAMTG1RydXN0aWNvIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"b39728ee3f57d600c272e6b0909784e9e2d5977b9e37926796e1b2fa95ed5211","size":2097,"filename":"Ug92Z2BWdjAeqBPInm_J2qZ7xpu0c9WPKfLenpi1D2E=.pem","location":"security-state-staging/intermediates/2b80c2a4-5245-46e5-b987-b293156a093f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ug92Z2BWdjAeqBPInm/J2qZ7xpu0c9WPKfLenpi1D2E=","crlite_enrolled":false,"id":"fd01dcdb-5d23-4b8b-a726-5631f3601fed","last_modified":1562025236542},{"schema":1562025235061,"derHash":"xCSF/f8jKRjjUqV58BiWUT/M1V8oe5lPL30MsaF9rvI=","subject":"SERIALNUMBER=201801,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAx","whitelist":false,"attachment":{"hash":"2e3e7c68603bc963d5ce38fcf7b7a0867d685fa12317d9ae8f34b7122733cd28","size":2333,"filename":"CLJidSOXyNp7QB-C-rgFknAe-a-PnfNwE0NWaNnWuhs=.pem","location":"security-state-staging/intermediates/663df175-b989-4842-abee-ef65aef3cdbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLJidSOXyNp7QB+C+rgFknAe+a+PnfNwE0NWaNnWuhs=","crlite_enrolled":false,"id":"02d7902f-27a7-4d28-96ee-40819eabe73f","last_modified":1562025235799},{"schema":1562025234319,"derHash":"ic+8j7/3/gJrbPLqaIQZvei7wftFEynIZdbGy89r0Jc=","subject":"CN=Optioncare CA,OU=Orion Health Direct Secure Messaging,O=Optioncare,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpPcHRpb25jYXJlMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxFjAUBgNVBAMTDU9wdGlvbmNhcmUgQ0E=","whitelist":false,"attachment":{"hash":"c5ec747cb1ece7fc513e3ffe6733e3f68858c6fd41a0df7bb58477429286e633","size":2255,"filename":"1cowHAof9qXhiitFN7riBHrm51fUMtgurbQOt2XdQSg=.pem","location":"security-state-staging/intermediates/db238548-ddd1-4d86-9ce7-662bcca2a1a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1cowHAof9qXhiitFN7riBHrm51fUMtgurbQOt2XdQSg=","crlite_enrolled":false,"id":"6dfdcc6d-af98-4e9a-844c-6ebaa3d2567d","last_modified":1562025235053},{"schema":1562025233549,"derHash":"MAO/iFNCfHuRAj91OYU9mHxY3E4Ru+BH0qkwXAGmFSw=","subject":"CN=certSIGN Non-Repudiation CA Class 4 G2,OU=certSIGN Non-Repudiation CA Class 4 G2,O=certSIGN,C=RO","subjectDN":"MIGCMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLzAtBgNVBAsTJmNlcnRTSUdOIE5vbi1SZXB1ZGlhdGlvbiBDQSBDbGFzcyA0IEcyMS8wLQYDVQQDEyZjZXJ0U0lHTiBOb24tUmVwdWRpYXRpb24gQ0EgQ2xhc3MgNCBHMg==","whitelist":false,"attachment":{"hash":"bb516b77cbf95fd334340bb2777b602490882a3aa757c5d82da5214f34585cda","size":1654,"filename":"5z5YTIwg2yLkx8NYmJAGw7XsuJfhisYA72CTV71K7Tc=.pem","location":"security-state-staging/intermediates/052ceaa4-fdf0-40d7-8242-4aa8fcb41d3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5z5YTIwg2yLkx8NYmJAGw7XsuJfhisYA72CTV71K7Tc=","crlite_enrolled":false,"id":"0d31579b-64f1-4e30-bf5f-c484b7588ede","last_modified":1562025234312},{"schema":1562025232809,"derHash":"Q1bGYhulfb0NN3DWzJiEcS3zZEQMBb+diFmwqAbdd/M=","subject":"SERIALNUMBER=201401,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"839021b1de60208540a9123dea7576e3773b96d12a1357c006d16c4aa25c7596","size":1402,"filename":"uihwVCIO6RorncQNk_rHAVOp0_Y9MCzVk-hzMA_tgMY=.pem","location":"security-state-staging/intermediates/39a1490f-f91b-4254-bbf7-a7d0b9bff451.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uihwVCIO6RorncQNk/rHAVOp0/Y9MCzVk+hzMA/tgMY=","crlite_enrolled":false,"id":"ae0b7dd9-df0c-4681-9ebc-abcc95a6d27a","last_modified":1562025233541},{"schema":1562025231317,"derHash":"A0+AFHT5ncDUIOdhFXGK4fZpRzkycmc7k2H9teKJN/w=","subject":"SERIALNUMBER=201905,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDU=","whitelist":false,"attachment":{"hash":"b628ed8414cbc809f0141003c3ea00ee92d3457c7ed6f91d2953e53243f6cac2","size":2337,"filename":"Uw1jSWXDQtfEXIm3dx0aXt7NdGNEukGrjvGgZ8NxRGc=.pem","location":"security-state-staging/intermediates/d8ee1247-7d8f-4043-af7f-c7115e3531ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uw1jSWXDQtfEXIm3dx0aXt7NdGNEukGrjvGgZ8NxRGc=","crlite_enrolled":false,"id":"5acf219e-ab7d-4369-a193-be85c2a1505f","last_modified":1562025232055},{"schema":1562025229059,"derHash":"6sumyWWYtKQf1T1pq57Z+7sTgRVMRTRWcgwXT/5XbR0=","subject":"CN=ICPEdu,OU=Gerencia de Servicos (GSer),O=Rede Nacional de Ensino e Pesquisa - RNP,L=Rio de Janeiro,ST=Rio de Janeiro,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNvcyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdQ==","whitelist":false,"attachment":{"hash":"c399340277a2b92eeb636040d4463ee38fe895ba4563359367c2497d50c84824","size":1833,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/df2eaa98-44e8-4093-9bfb-24b2af701dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"cca3b0f0-63dc-4374-bde8-b4fe6d44c0af","last_modified":1562025229802},{"schema":1562025226011,"derHash":"QVMi85cMjND1QxHg+TxfXDe6MFn9sQ9SQKwgk0cX+EA=","subject":"CN=Western Connecticut Health Network CA,OU=Orion Health Direct Secure Messaging,O=Western Connecticut Health Network,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzErMCkGA1UEChMiV2VzdGVybiBDb25uZWN0aWN1dCBIZWFsdGggTmV0d29yazEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMS4wLAYDVQQDEyVXZXN0ZXJuIENvbm5lY3RpY3V0IEhlYWx0aCBOZXR3b3JrIENB","whitelist":false,"attachment":{"hash":"ad34e17b2be6fc08447c7875e5f068cf3dd45d3ea5df594843ac89c847de456f","size":2341,"filename":"Iq5P_COu5eY2kCVZTJFfILRT5F6wWOLsVM192K5sD14=.pem","location":"security-state-staging/intermediates/d1e9c620-48f6-4c4a-bf6c-e4d32ec89be3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Iq5P/COu5eY2kCVZTJFfILRT5F6wWOLsVM192K5sD14=","crlite_enrolled":false,"id":"ebf707dd-ec7f-4c61-81fd-7b93ee38276a","last_modified":1562025226761},{"schema":1562025223722,"derHash":"yXeSPHceGmbJJaK29QFzLmeNyYh6/mv6rAOdHZpx8Ow=","subject":"CN=GlobalSign Timestamping CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3f735d53cbfc9c9cf464dca8c6fec3be339e6b3042e8ae4d78624f83a2135a3b","size":1475,"filename":"CB1u_HwQPTTVFNyruoDBDUle8-oPzUs0Sos_KZuLoSY=.pem","location":"security-state-staging/intermediates/bb2c1a75-d1fe-4b31-b963-c069bbd87014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CB1u/HwQPTTVFNyruoDBDUle8+oPzUs0Sos/KZuLoSY=","crlite_enrolled":true,"id":"79f0cde1-be3d-490c-9393-5d6adae7c88b","last_modified":1562025224469},{"schema":1562025221473,"derHash":"wH6QN8uBAS0wRmEyhcFLY6AoSWSk9agh/DsY7N66CmY=","subject":"CN=Indian Health Service-RPMS DIRECT Messaging CA,OU=directihs.net,O=Indian Health Service,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVJbmRpYW4gSGVhbHRoIFNlcnZpY2UxFjAUBgNVBAsTDWRpcmVjdGlocy5uZXQxNzA1BgNVBAMTLkluZGlhbiBIZWFsdGggU2VydmljZS1SUE1TIERJUkVDVCBNZXNzYWdpbmcgQ0E=","whitelist":false,"attachment":{"hash":"cfcfe7b0a5865bb762fcc4c690048647d5174092a26326b321a32e470af9ee79","size":2215,"filename":"5eKTKcGalwhgde85C8DNZVC8RLow23EfZRE9nPGBklk=.pem","location":"security-state-staging/intermediates/19418a87-7f85-49d7-8d1b-48a0ab485687.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5eKTKcGalwhgde85C8DNZVC8RLow23EfZRE9nPGBklk=","crlite_enrolled":false,"id":"820a6f72-9c51-491b-855e-1305b0e08ad5","last_modified":1562025222211},{"schema":1562025220729,"derHash":"DDtpZy66vh+WyvPL5Zj3dHwB94AUr2URkZUNZz/ZF4Q=","subject":"CN=Trafigura PTE DocuSign CA,O=Trafigura PTE,C=SG","subjectDN":"MEkxCzAJBgNVBAYTAlNHMRYwFAYDVQQKEw1UcmFmaWd1cmEgUFRFMSIwIAYDVQQDExlUcmFmaWd1cmEgUFRFIERvY3VTaWduIENB","whitelist":false,"attachment":{"hash":"5760d5ba17953454835f4fb2e9c885e596eb48574236b7e06e685ecad224f48a","size":5420,"filename":"tY3lwWb8C3Hpe9A51N8X716yDkdDsNb-UNhyod7-RYs=.pem","location":"security-state-staging/intermediates/c927acb3-ab62-4b1f-b81c-a42d0a6faa7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tY3lwWb8C3Hpe9A51N8X716yDkdDsNb+UNhyod7+RYs=","crlite_enrolled":false,"id":"fb955dbd-342c-4a10-9095-ad50f6ec1593","last_modified":1562025221465},{"schema":1562025216188,"derHash":"xCKrhsFynoifvK9c1z8hfgPCn+KsUCEvRRMH2RWGn0c=","subject":"CN=emSign ECC Time stamping CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MHQxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSkwJwYDVQQDEyBlbVNpZ24gRUNDIFRpbWUgc3RhbXBpbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"43563791245e66f7d04d4403f12dee8bbb8f7711661317ba5453f4c6e767bc3d","size":1183,"filename":"YoOJpTBtL_MN54SktLirvc0ScusOCm7NbSR29u1TcCo=.pem","location":"security-state-staging/intermediates/c327bd51-d114-4fdf-adb9-e757346beb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YoOJpTBtL/MN54SktLirvc0ScusOCm7NbSR29u1TcCo=","crlite_enrolled":false,"id":"0f491dc5-c66c-42dd-ad69-90150f1e3cfc","last_modified":1562025216956},{"schema":1562025213182,"derHash":"Sh/2u/SBFw07dzzsHzqE3jtQlldc2/iwhDIgkxjKD70=","subject":"CN=Amazon,OU=Server CA 1B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"c0bc37b96bec8011b8d307eeca3d00c574601d10020be55221559de429641537","size":1544,"filename":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=.pem","location":"security-state-staging/intermediates/a7a30d9c-6953-4f41-8b0e-5c00269c7884.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=","crlite_enrolled":true,"id":"5f8eb034-72cd-45a6-8a55-0c083afa34dd","last_modified":1562025213926},{"schema":1562025211675,"derHash":"RDyBWCZHEMC3aKgXDlm/H65AedK8OZOaefqDkXTtga4=","subject":"CN=SCHIEx Direct CA,OU=SCHIEx Direct Messaging,O=SCHIEx,ST=SC,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJTQzEPMA0GA1UEChMGU0NISUV4MSAwHgYDVQQLExdTQ0hJRXggRGlyZWN0IE1lc3NhZ2luZzEZMBcGA1UEAxMQU0NISUV4IERpcmVjdCBDQQ==","whitelist":false,"attachment":{"hash":"e1b38bc809d0be6e2f28dd9d87bf7af46bc55ec35074ec8a61ba5e97efc85679","size":2166,"filename":"lJMFEIPnHjQE1GKzbE6JzsSjl__N_NEFBDFqOtNsnjI=.pem","location":"security-state-staging/intermediates/69582fad-b5af-41e4-a398-1f36db772037.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lJMFEIPnHjQE1GKzbE6JzsSjl//N/NEFBDFqOtNsnjI=","crlite_enrolled":false,"id":"7551978d-4ce2-43d8-8b1a-c0b5d20b4978","last_modified":1562025212421},{"schema":1562025210934,"derHash":"9Rjwu3FlIfCib9tAwwT/m4L72+esvUa/DvI6GAGI61w=","subject":"CN=Apple Public Server RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"6dce70aef7f5bbcfc26a7b76bf285c6b1f15fd77bc1eb1294734cad5fb239722","size":1634,"filename":"GszFzuV0vZD9UeeCY9kvsItQltvQTZsjBfB9INf-GEk=.pem","location":"security-state-staging/intermediates/38288d50-1e5f-4fae-8d28-8249bf4ffc30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GszFzuV0vZD9UeeCY9kvsItQltvQTZsjBfB9INf+GEk=","crlite_enrolled":false,"id":"cc783f4c-70a8-49b7-b913-26b52dfbccbc","last_modified":1562025211668},{"schema":1562025209421,"derHash":"ubiFHCX2zDXUjhsrd+Pr8FftysmIWkF3rLWjlgRYJh4=","subject":"CN=COMODO/HP Secure Email CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH4xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSQwIgYDVQQDExtDT01PRE8vSFAgU2VjdXJlIEVtYWlsIENBIDI=","whitelist":false,"attachment":{"hash":"c2e03a2f920b43601df9788753597b0274b7e0641144be0fdf9aa2a4260f9f94","size":2129,"filename":"P0GLZRFPpkxNALwZ7Kj6O3PmIpBgliTbY_rTcBxfLB0=.pem","location":"security-state-staging/intermediates/18a8ce01-f094-4111-ab9e-0578a28dc363.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P0GLZRFPpkxNALwZ7Kj6O3PmIpBgliTbY/rTcBxfLB0=","crlite_enrolled":false,"id":"b4b7e711-5c6d-4248-b6b2-35bffa9748ae","last_modified":1562025210174},{"schema":1562025208671,"derHash":"+KplFlF7ONNQEltzHky6I6dQe/XN/T3vPbiRvR3C1Ak=","subject":"SERIALNUMBER=201811,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEx","whitelist":false,"attachment":{"hash":"5688ca317891d45d552cff0a5b80364d8be585ddc70976061e528244a5262255","size":2333,"filename":"-_BX4AN6l--82ldfEPa8Jt09pmz7zqnrp7P6A0cmnN8=.pem","location":"security-state-staging/intermediates/b549103e-cbc3-4b61-b560-80a0727877c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+/BX4AN6l++82ldfEPa8Jt09pmz7zqnrp7P6A0cmnN8=","crlite_enrolled":false,"id":"7303be73-95b7-47d9-9433-2c3c91042451","last_modified":1562025209413},{"schema":1562025203410,"derHash":"B/LOVcoapsuZJxmx5CPB0Cwep1mm4uq04VDIgoLiJVA=","subject":"CN=Certigna Services CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MH0xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBTZXJ2aWNlcyBDQQ==","whitelist":false,"attachment":{"hash":"daabfa439246bec01c439eeb12080417731f3b5fc130616edf23facbe1995d4b","size":2511,"filename":"Vvyvg4-bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB_uE=.pem","location":"security-state-staging/intermediates/eafb024c-95d9-45ad-af85-982024cc73e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vvyvg4+bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB/uE=","crlite_enrolled":true,"id":"42115fab-f048-4a66-92be-15d909da568b","last_modified":1562025204181},{"schema":1562025202667,"derHash":"myLn+gjT+MbW6fQg2PdWx5E15m0bLXCweQNyHwPb5bY=","subject":"CN=DOMENY SSL OV Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGEMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMS4wLAYDVQQDEyVET01FTlkgU1NMIE9WIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"6d124a8da18e0ea28bdde6bbae190816c6220594402c01c09264ca9940d4a150","size":2154,"filename":"y6RI9X1eeUkKidF2MrXM7RymKK9CUcax6TB8EJO15E4=.pem","location":"security-state-staging/intermediates/6219f215-f8b2-4671-94d1-1f28176da5df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y6RI9X1eeUkKidF2MrXM7RymKK9CUcax6TB8EJO15E4=","crlite_enrolled":true,"id":"ac25e523-d7a1-4700-87a8-f528654cc35b","last_modified":1562025203402},{"schema":1562025201928,"derHash":"MTH/29ln180dd3Qq+XcvEFH/TJrkE3WfQ0/h6BERngM=","subject":"CN=TrustOcean EV SSL CA - RSA - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=RSA Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gUlNBIC0gMjAxOQ==","whitelist":false,"attachment":{"hash":"bb57de69afc6d6f5f59b1c80758edf0ef1791b7a08530fed8903ef18cd25188e","size":2324,"filename":"uG18SfTnbrT8g2zCkpa7kWClIcTyqEW_1iPtChk9nTQ=.pem","location":"security-state-staging/intermediates/6020590f-b065-482b-9549-d56eb98c4b60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uG18SfTnbrT8g2zCkpa7kWClIcTyqEW/1iPtChk9nTQ=","crlite_enrolled":true,"id":"12413a5f-6a98-4669-8438-f936d9b86ea3","last_modified":1562025202660},{"schema":1562025200417,"derHash":"sQhhc3s+ybEfphVNI5cP+y2r/Ciuamv1bD8yBCZiOa0=","subject":"CN=SECOM Passport for Member PUB CA4,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTQ=","whitelist":false,"attachment":{"hash":"100ce60a3bd64526f68ff84f5c51cf0fabb69da5d8bf4709a02d9b8381cf053e","size":1695,"filename":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=.pem","location":"security-state-staging/intermediates/5fe7d18d-a5f7-47cc-b17d-78176befba8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=","crlite_enrolled":true,"id":"43cd6bcc-8fa9-4afc-8ef7-d30357eb5641","last_modified":1562025201171},{"schema":1562025198927,"derHash":"SWlaXw9+9u32mBk9me1Iuq3iDqRXQDwRzq1JLEWGZdo=","subject":"CN=TWCA Global EVSSL Certification Authority,OU=Global EVSSL Sub-CA,O=TAIWAN-CA,C=TW","subjectDN":"MHMxCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExHDAaBgNVBAsTE0dsb2JhbCBFVlNTTCBTdWItQ0ExMjAwBgNVBAMTKVRXQ0EgR2xvYmFsIEVWU1NMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"4f777697d0c427439f9282b53a652b4a868074c5e1ae55a6dfe51dc32d19b817","size":1955,"filename":"3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp-TY=.pem","location":"security-state-staging/intermediates/d4e10b9c-0b97-413b-97b1-5b93a2c878a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp+TY=","crlite_enrolled":true,"id":"b7f1ffd4-4c9e-4762-a0b9-1a840835047b","last_modified":1562025199670},{"schema":1562025196669,"derHash":"Uu+YG6hbwFTFl/CcbKyxNLffl9Yf6u4lF/Tb2Cv47Mo=","subject":"OU=\u7d44\u7e54\u53ca\u5718\u9ad4\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"ME0xCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxKjAoBgNVBAsMIee1hOe5lOWPiuWcmOmrlOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"b85fc65fd55253ce8f8d9427e4bc632f8277e15047e0e4a7d1babca0069e73ab","size":1853,"filename":"b7VNMgYVBy0ME-PSGiNUKsoQ56R9SOLrQt2AlaXwxvc=.pem","location":"security-state-staging/intermediates/fbbe5d3f-d9db-41ad-bfb6-ba438ae13b11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b7VNMgYVBy0ME+PSGiNUKsoQ56R9SOLrQt2AlaXwxvc=","crlite_enrolled":false,"id":"62db3b82-de0b-4257-93e2-1261643f7872","last_modified":1562025197408},{"schema":1562025195931,"derHash":"YoSgO6+uhhow46JaAwQoMG9+tSvQuld6HZYqgJqDDJ4=","subject":"CN=NetLock Min\u0151s\u00edtett Eat. (Class Q Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiAoQ2xhc3MgUSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"be44ba2f0e98d91976e0b376d14bfcfbf5e04990413aeb73457eb447f773a585","size":2203,"filename":"wbqAvjVExNzYgkWT-psQa7MDcYIscGSOYZa0cm5x83M=.pem","location":"security-state-staging/intermediates/602c1224-b665-4b69-848a-f07cbc00e0be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbqAvjVExNzYgkWT+psQa7MDcYIscGSOYZa0cm5x83M=","crlite_enrolled":true,"id":"73e86e8a-47ad-4f60-be1d-64ed2011a0bb","last_modified":1562025196662},{"schema":1562025193661,"derHash":"rtXdmlM5aF37Ap9tiaFDNallEsPKzFKymUr4trN/pNI=","subject":"CN=GlobalSign Extended Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTgwNgYDVQQDEy9HbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBTSEEyNTYgLSBHMw==","whitelist":false,"attachment":{"hash":"bbc372d9ecdf9fa392a04587c4d036f042f3f09c6f0914cc81e10d9e8e8a3a02","size":1577,"filename":"86fLIetopQLDNxFZ0uMI66Xpl1pFgLlHHn9v6kT0i4I=.pem","location":"security-state-staging/intermediates/a42b26ca-6177-4156-b30c-df67c447df2e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"86fLIetopQLDNxFZ0uMI66Xpl1pFgLlHHn9v6kT0i4I=","crlite_enrolled":true,"id":"6faa42a8-09b8-46c4-9167-2568ddb696c8","last_modified":1562025194416},{"schema":1562025192919,"derHash":"boFQk3bJP7znlHLIQ6Vo6IPLXSPs7qgpmly+nFe87hw=","subject":"CN=Atos TrustedRoot Mailgateway CA 2019,O=Atos,C=DE","subjectDN":"MEsxLTArBgNVBAMMJEF0b3MgVHJ1c3RlZFJvb3QgTWFpbGdhdGV3YXkgQ0EgMjAxOTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"66f8b8a94ed51f0047bea1a83138cfd3a5d139f5c67d0a0513a6ffab9d53aa8d","size":1930,"filename":"EQQkSccU6u9HYRYQa9ZtgDlg8dInLePxpauqH5cu3yk=.pem","location":"security-state-staging/intermediates/1392833e-1a88-42fa-b9ee-58bdaea81a4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EQQkSccU6u9HYRYQa9ZtgDlg8dInLePxpauqH5cu3yk=","crlite_enrolled":false,"id":"40af8905-ec8c-43f0-8c5c-3d64cbd00b59","last_modified":1562025193654},{"schema":1562025191421,"derHash":"BHIXdyBR0pIjjzNV9cVDXpuENkzNFD/En5wxzWBUOfA=","subject":"CN=TrustAsia Secure Email CA,OU=www.trustasia.com,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHQxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMRowGAYDVQQLExF3d3cudHJ1c3Rhc2lhLmNvbTEiMCAGA1UEAxMZVHJ1c3RBc2lhIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"d82324ec120fcf3fcfe7449f972f518f8bbf990131866eba4f7c7f561bcf6a0f","size":1699,"filename":"TjLSAwYTumO8ghSNmQQzwjA7CtZ3wO75cLt3bYVVIro=.pem","location":"security-state-staging/intermediates/d8683bc8-f975-48c3-94c9-f332895c7592.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TjLSAwYTumO8ghSNmQQzwjA7CtZ3wO75cLt3bYVVIro=","crlite_enrolled":false,"id":"28ed55e4-b148-4d29-9d8d-c9e528950d61","last_modified":1562025192172},{"schema":1562025186932,"derHash":"ecQJGwWxXBaDEot6NV4KrWLhu7w+Xzc1NwwGzE0a+0Q=","subject":"CN=CrossTrust OV CA5,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBNQ==","whitelist":false,"attachment":{"hash":"bd3caa1f305a9f0b5a55466e00fb389199886a78055b526ee4a8fd5a2c317e51","size":1642,"filename":"9QmSs2TRmBuBXXpRPhom-2y54_RQ3KsK4te_JED6g0Q=.pem","location":"security-state-staging/intermediates/0cd79666-328f-4d26-a58d-65b8203303df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9QmSs2TRmBuBXXpRPhom+2y54/RQ3KsK4te/JED6g0Q=","crlite_enrolled":true,"id":"b6b1d83f-6615-4c21-bf97-c5dba8c7d925","last_modified":1562025187668},{"schema":1562025186186,"derHash":"6u77CNVo5/bPbYksq2oi4U8gxvEOOkGM+0KxIwkzM2c=","subject":"CN=MHIN Direct CA,OU=www.mhin.com,O=Michiana Health Information Network,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMSwwKgYDVQQKEyNNaWNoaWFuYSBIZWFsdGggSW5mb3JtYXRpb24gTmV0d29yazEVMBMGA1UECxMMd3d3Lm1oaW4uY29tMRcwFQYDVQQDEw5NSElOIERpcmVjdCBDQQ==","whitelist":false,"attachment":{"hash":"623c45a2681ba34512932f4d0345ac733c2eff7148c61bfbd81939fd0dbde54a","size":2166,"filename":"yM7_IeYu7HtJ1cALcYpLZhIj1S7pQNxaHt7sIarSmPk=.pem","location":"security-state-staging/intermediates/d47781dd-8df0-46fb-ab8f-62555bc1bec2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yM7/IeYu7HtJ1cALcYpLZhIj1S7pQNxaHt7sIarSmPk=","crlite_enrolled":false,"id":"ee38fa45-bfe8-4470-8e7a-828569883e63","last_modified":1562025186923},{"schema":1562025183926,"derHash":"EmUF6SkzTMPHPugm5aThxK25DHEIBXWfbLaf+st2onY=","subject":"CN=Trust Provider B.V. RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEmMCQGA1UEAxMdVHJ1c3QgUHJvdmlkZXIgQi5WLiBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"e0afbf8c38e3854bdf1fa7f03733cec06fb616292b10ea38c79ba608c5a91db2","size":1695,"filename":"8zsd4iJkDVP9ORk6JvjRp3miQdmu0pE5mlQEcNsLlgw=.pem","location":"security-state-staging/intermediates/3af9fc7d-4e85-4eae-b097-00f4c9fcc597.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8zsd4iJkDVP9ORk6JvjRp3miQdmu0pE5mlQEcNsLlgw=","crlite_enrolled":false,"id":"b2561bcb-96c7-4c29-a072-a3ed78f089d7","last_modified":1562025184653},{"schema":1562025182429,"derHash":"zIW/mX0pKdOPwB6BIrMw+e++ONs789gBd9wSvVWQAsQ=","subject":"CN=XiPS CA2,O=XiPS,C=JP","subjectDN":"MC8xCzAJBgNVBAYTAkpQMQ0wCwYDVQQKEwRYaVBTMREwDwYDVQQDEwhYaVBTIENBMg==","whitelist":false,"attachment":{"hash":"5663f50d87b7c18b3c99b0b5ad1bf10363286a03fcb05ab9c0fb34760c55e21f","size":1561,"filename":"PaXj-eLR-CVXHDdDFA2h3HDdlslWT-0lS7xNjPnqusM=.pem","location":"security-state-staging/intermediates/ed9b6200-0079-4951-a12a-4ee37a29fadf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PaXj+eLR+CVXHDdDFA2h3HDdlslWT+0lS7xNjPnqusM=","crlite_enrolled":false,"id":"123b4df1-cf35-410b-bfd9-b8a9714c0056","last_modified":1562025183180},{"schema":1562025181676,"derHash":"P3hQJbzPrKRwGhc0zg97MM5BBpQsjZL0G3CwZ+1l01Q=","subject":"CN=KPN PKIoverheid Organisatie Persoon CA - G3,O=KPN Corporate Market B.V.,C=NL","subjectDN":"MGcxCzAJBgNVBAYTAk5MMSIwIAYDVQQKDBlLUE4gQ29ycG9yYXRlIE1hcmtldCBCLlYuMTQwMgYDVQQDDCtLUE4gUEtJb3ZlcmhlaWQgT3JnYW5pc2F0aWUgUGVyc29vbiBDQSAtIEcz","whitelist":false,"attachment":{"hash":"0e097c3463e82d7ba7f80fa33b0a12ba5995651fc226460fb6047bcb593fe4a7","size":2511,"filename":"z6o4qaIdcAF_cYD5IoV-HIyALNwwhBoQqpMK1NirbXg=.pem","location":"security-state-staging/intermediates/5becb1c9-6ed2-4cdd-bba9-0ecc641e7d12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z6o4qaIdcAF/cYD5IoV+HIyALNwwhBoQqpMK1NirbXg=","crlite_enrolled":false,"id":"9324909c-8842-426a-9bd9-339ea000a9a5","last_modified":1562025182421},{"schema":1562025179816,"derHash":"ZP1/ZrgF7w+uCdrAbq0amrXCjm8krQdZmW00mYf+5+I=","subject":"CN=HERTZ SHA256 CA - G2,O=The HERTZ Corporation,ST=Florida,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRhMR4wHAYDVQQKExVUaGUgSEVSVFogQ29ycG9yYXRpb24xHTAbBgNVBAMTFEhFUlRaIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"e265e407a875697a7f656b762252ca51920bf962f795981ca45b3df5305744ad","size":1841,"filename":"0mE9i9waw6FU7T9jthzR6RWqVlYfOZWnDt__W7w0MbE=.pem","location":"security-state-staging/intermediates/b47806d4-9344-4686-991c-48d34375975f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0mE9i9waw6FU7T9jthzR6RWqVlYfOZWnDt//W7w0MbE=","crlite_enrolled":false,"id":"aac644a1-6f9b-40fb-899e-d6c96e2ef1dc","last_modified":1562025180912},{"schema":1562025176064,"derHash":"8SJB7jTAOmCNNNvA6kZeG9GqEwkVVPnU0IYlP/POg9Q=","subject":"CN=DC Government SHA2 EV Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US","subjectDN":"MIGfMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMS4wLAYDVQQDEyVEQyBHb3Zlcm5tZW50IFNIQTIgRVYgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"14472d3dc922dcba7c834374f5b8121efcd08cab9d0778d052e329913bee403d","size":2073,"filename":"D6bVPPyHKUFV0WmvSS6nCMgaQId_SQKugGjOOT48QXE=.pem","location":"security-state-staging/intermediates/7e3f4ba8-098a-4f7e-a594-d98f5caa1fa9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D6bVPPyHKUFV0WmvSS6nCMgaQId/SQKugGjOOT48QXE=","crlite_enrolled":true,"id":"2316b3da-de73-40e0-8b36-7f2ad4206eec","last_modified":1562025176800},{"schema":1562025175329,"derHash":"Uc8P/8MlP8ATr3hvlbGQEJ+Mh/NN/RzsRMRYiHifU1U=","subject":"CN=GeoTrust DV SSL CA - G3,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"63a067013ea0d27be1b9a024be996607207d1aa923f90c6456d060fae4240284","size":1597,"filename":"l2yRLumd__mpm_WYi63mkNBZrNOpv-iqbuuqZHz2FZk=.pem","location":"security-state-staging/intermediates/ed2fd4a4-5cbc-463b-bc2a-b41bc797b801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l2yRLumd//mpm/WYi63mkNBZrNOpv+iqbuuqZHz2FZk=","crlite_enrolled":true,"id":"0fbfc5ef-c42c-4bdc-ad8a-b5c8aacf75c5","last_modified":1562025176056},{"schema":1562025173823,"derHash":"SC9pNhYtrE73dG5hz4HzVzwwip8M5rQatuLj+Jt59bo=","subject":"CN=MilleniumSign for ClientCert RSA,O=MilleniumSign Limited,C=MU","subjectDN":"MFgxCzAJBgNVBAYTAk1VMR4wHAYDVQQKDBVNaWxsZW5pdW1TaWduIExpbWl0ZWQxKTAnBgNVBAMMIE1pbGxlbml1bVNpZ24gZm9yIENsaWVudENlcnQgUlNB","whitelist":false,"attachment":{"hash":"222e53090c93ea7a3779daaa08cc08cf97e15f2266f97a6ad486be1ac818b4b2","size":2446,"filename":"7RR-mxCqu0zXAK2CPP57e8q0pE8ACz7Hfr7VCAPuMzs=.pem","location":"security-state-staging/intermediates/d35d4472-28b5-4102-be24-ddb035487984.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7RR+mxCqu0zXAK2CPP57e8q0pE8ACz7Hfr7VCAPuMzs=","crlite_enrolled":false,"id":"e8790135-766c-4bf9-83a4-b937fd0e2db0","last_modified":1562025174583},{"schema":1562025173067,"derHash":"kf3rUtQmUSC4Q7GV0bbNtc5hJRhlpFo+kg5hD92mYNM=","subject":"CN=DigiCert Federated ID L2 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMiBDQQ==","whitelist":false,"attachment":{"hash":"730111e89089443c53b0d835562133c99ad97378a9c7763e7061ed7377bd59ae","size":1825,"filename":"uFgNVuVHMiQAV8MwYU1yjg_jHUWYZx_q2sWdfqJ0Pfo=.pem","location":"security-state-staging/intermediates/8c127577-0572-4da9-9b18-64d923f10edb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uFgNVuVHMiQAV8MwYU1yjg/jHUWYZx/q2sWdfqJ0Pfo=","crlite_enrolled":false,"id":"eaa80a7d-defb-4cf5-94e8-a99a54278063","last_modified":1562025173815},{"schema":1562025172327,"derHash":"9051Cl3PANXoUWimDJY+wq69yjrbApHTKB2PUhumo70=","subject":"CN=SSL.com Code Signing Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNDAyBgNVBAMMK1NTTC5jb20gQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"5addb3224fc91346ad8299e095d7d8bb81f96f9f55d9ed65dae3f496519b4909","size":1264,"filename":"i4YxhNKtWxupjB-UY-D9fvW_PWFEagq-NIqDjFBiMww=.pem","location":"security-state-staging/intermediates/5e0dbc1f-6963-4872-9057-16ae085e9dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i4YxhNKtWxupjB+UY+D9fvW/PWFEagq+NIqDjFBiMww=","crlite_enrolled":false,"id":"fe2dcca1-885e-4fd3-99b5-2ac3a3ac9bf6","last_modified":1562025173060},{"schema":1562025171561,"derHash":"kdp6XKYTSHUAiZTCUNrZIh8MXi1OPglz95Ydy9+3Q+w=","subject":"CN=Sectigo ECC Client Authentication and Secure Email CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPjA8BgNVBAMTNVNlY3RpZ28gRUNDIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"77d9497e0c15f70b924892d7c86e086a085789309a6a79986df9aee018ada485","size":1325,"filename":"rYhp-cXTMtrastq0z_cB6bdqkXAleWeAfwJUCvBPVtw=.pem","location":"security-state-staging/intermediates/34a6b890-81a2-488f-a509-9e82908e5f74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rYhp+cXTMtrastq0z/cB6bdqkXAleWeAfwJUCvBPVtw=","crlite_enrolled":false,"id":"fa31210d-e75b-4ca0-a8d2-7401b0b5850f","last_modified":1562025172319},{"schema":1562025170804,"derHash":"Viy7y96+6zy1WUa9ziSMpKYj0rpud7Y7dU06Vx9n36I=","subject":"CN=Fraunhofer User CA - G02,OU=Fraunhofer Corporate PKI,O=Fraunhofer,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGMMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjETMBEGA1UECgwKRnJhdW5ob2ZlcjEhMB8GA1UECwwYRnJhdW5ob2ZlciBDb3Jwb3JhdGUgUEtJMSEwHwYDVQQDDBhGcmF1bmhvZmVyIFVzZXIgQ0EgLSBHMDI=","whitelist":false,"attachment":{"hash":"432002444ca45071e8819aab9fc1a1245de7b320fabca6185adea7a8e46ddb6f","size":2024,"filename":"tI25lyfua-OITC74D7J6Z7TyLi_ZfzDhng7frVgmB8Q=.pem","location":"security-state-staging/intermediates/50b461d3-a1bf-4841-8d0b-db184a8ef60c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tI25lyfua+OITC74D7J6Z7TyLi/ZfzDhng7frVgmB8Q=","crlite_enrolled":false,"id":"a40de547-e3aa-46b0-bb6e-12b28685b132","last_modified":1562025171553},{"schema":1562025168582,"derHash":"nmvF+ezFJGDo7cAsZE0b4cufIxb0Ha87YWoLIFgpSzE=","subject":"CN=Symantec Class 3 EV SSL CA - G3,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"608d82155649d760dc44ec6d53af4233429881ad64762476c94fdf570c9f572e","size":1853,"filename":"gMxWOrX4PMQesK9qFNbYBxjBfjUvlkn_vN1n-L9lE5E=.pem","location":"security-state-staging/intermediates/7e855262-9907-44b6-b613-7e7c05da23f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gMxWOrX4PMQesK9qFNbYBxjBfjUvlkn/vN1n+L9lE5E=","crlite_enrolled":true,"id":"01baeb08-779e-4097-bfb8-cb384ac992d8","last_modified":1562025169317},{"schema":1562025166063,"derHash":"4i5rJZCOEQemB68GDgsk5QxtlWL/BPRVvg+N9BpQMsA=","subject":"CN=SZAFIR Trusted CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL","subjectDN":"MFQxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRswGQYDVQQDDBJTWkFGSVIgVHJ1c3RlZCBDQTI=","whitelist":false,"attachment":{"hash":"b998d1830338d9ca1bada5e5e1a33ef3a5f89c9c13ccfa1b8ea7a2f3aea980a1","size":1825,"filename":"Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=.pem","location":"security-state-staging/intermediates/f9a9ee57-a010-4240-a6e4-f16037c4556f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=","crlite_enrolled":true,"id":"acce9c9e-9a82-41d4-b3c0-5cd8eeaf7bef","last_modified":1562025166794},{"schema":1562025165326,"derHash":"eNycpfTCkT8/t0rFLf/80jANpady/CuExToudEN+3SA=","subject":"CN=STRATO SSL - G2,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzI=","whitelist":false,"attachment":{"hash":"97b250a9bb08b735bbb140ac1e4a20bfc87008a831c5820e8596eafb6230e542","size":1524,"filename":"sHuZJYYMcPPO0syUwdicHEjFhiXf8r_Bt_cMNeh2WcA=.pem","location":"security-state-staging/intermediates/19be972c-855b-4247-9a3f-930662fc00db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHuZJYYMcPPO0syUwdicHEjFhiXf8r/Bt/cMNeh2WcA=","crlite_enrolled":false,"id":"01f90665-8998-4aa2-9af5-82d8cc7e756c","last_modified":1562025166055},{"schema":1562025162348,"derHash":"DOM6QnGx5Gz/tDLbg6T5xSYa+IvyRR2K75Ah9gsgvmU=","subject":"CN=Atos TrustedRoot Client-CA for equensWorldlinePartner 2019,O=Atos,C=DE","subjectDN":"MGExQzBBBgNVBAMMOkF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBlcXVlbnNXb3JsZGxpbmVQYXJ0bmVyIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"a0b74fdfcd60684e6ae62fd67423cdebb5cd9e677c08d4fd376a50429722dfac","size":1959,"filename":"iwM-2PVlSP6blr9vu-dLHZGkTj3xQhLSJ2vrN5miZ0Q=.pem","location":"security-state-staging/intermediates/06cc9ce9-20a6-4fd8-baf1-d9b6179addf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iwM+2PVlSP6blr9vu+dLHZGkTj3xQhLSJ2vrN5miZ0Q=","crlite_enrolled":false,"id":"d9d8d521-dd27-47c2-b709-26ac9a7fd92a","last_modified":1562025163074},{"schema":1562025161609,"derHash":"jXxJnX/p7uwF2etC8D7+QCgHkZgD6ObNbB8r9e9qfY8=","subject":"CN=GeoTrust Code Signing CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHUdlb1RydXN0IENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"249e928f4de591132364a871e84037a9815e30634a553077a2fe538b4236fdde","size":1796,"filename":"f8Aqq2cYQjeMInX4NF9BwX9DWyG90RZdekvgJeybb6E=.pem","location":"security-state-staging/intermediates/1193d8fc-a0a0-449e-813d-6f173f7abfcd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f8Aqq2cYQjeMInX4NF9BwX9DWyG90RZdekvgJeybb6E=","crlite_enrolled":false,"id":"436fecb6-3d28-4509-af27-78c80daf1fa7","last_modified":1562025162340},{"schema":1562025160859,"derHash":"rB7FVjGOPqcPjwTgOg8mM7/nOZI1moEBRf/fGkJzlu4=","subject":"CN=TeleSec ServerPass Class 2 CA,OU=T-Systems Trust Center,O=T-Systems International GmbH,POSTALCODE=57250,STREET=Untere Industriestr. 20,L=Netphen,ST=Nordrhein Westfalen,C=DE","subjectDN":"MIHfMQswCQYDVQQGEwJERTElMCMGA1UECgwcVC1TeXN0ZW1zIEludGVybmF0aW9uYWwgR21iSDEfMB0GA1UECwwWVC1TeXN0ZW1zIFRydXN0IENlbnRlcjEcMBoGA1UECAwTTm9yZHJoZWluIFdlc3RmYWxlbjEOMAwGA1UEEQwFNTcyNTAxEDAOBgNVBAcMB05ldHBoZW4xIDAeBgNVBAkMF1VudGVyZSBJbmR1c3RyaWVzdHIuIDIwMSYwJAYDVQQDDB1UZWxlU2VjIFNlcnZlclBhc3MgQ2xhc3MgMiBDQQ==","whitelist":false,"attachment":{"hash":"76978532a4380253c7bbfe0ea07b7f0f9f595824a78f411a83835514c3a8d76f","size":2052,"filename":"c3jf-L8VIAFQnJJDM6Mfb4MtI1JnhVS8JwZHMwJj28M=.pem","location":"security-state-staging/intermediates/54f348f3-2ed6-4b67-a108-3c418ed93826.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3jf+L8VIAFQnJJDM6Mfb4MtI1JnhVS8JwZHMwJj28M=","crlite_enrolled":true,"id":"b19a4517-16ee-477e-bdf2-a6c9a655f216","last_modified":1562025161601},{"schema":1562025160116,"derHash":"ApUjhC0j7zlfVynjUlIvgEJlhRgL02dowayt0i2Op9o=","subject":"CN=The University of Texas Health Science Center at Houston RSA CA,O=The University of Texas Health Science Center at Houston,L=Houston,ST=TX,C=US","subjectDN":"MIG5MQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xQTA/BgNVBAoTOFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIEhlYWx0aCBTY2llbmNlIENlbnRlciBhdCBIb3VzdG9uMUgwRgYDVQQDEz9UaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBIZWFsdGggU2NpZW5jZSBDZW50ZXIgYXQgSG91c3RvbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"14f00997a0e1aae935a7e964b272b85446ca14ca29a7f9a1a75c583f98a17633","size":2223,"filename":"X8zUA8bZTNKvwOf9_GKpmKtl4dD17EdNxWTm4nwRGgI=.pem","location":"security-state-staging/intermediates/2221c890-496b-4c16-b0bd-1ead2b97e050.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X8zUA8bZTNKvwOf9/GKpmKtl4dD17EdNxWTm4nwRGgI=","crlite_enrolled":false,"id":"987637d9-0c2e-42f7-b676-b2e53c0955f0","last_modified":1562025160852},{"schema":1562025159345,"derHash":"I7o6l8WA3ywxZiTX+l92Y1gCYcsgSBQsc6PoaxE+sm0=","subject":"CN=Mass HIway CA,OU=Orion Health Direct Secure Messaging,O=Massachusetts Health Information Highway (Mass HIway),C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzE+MDwGA1UEChM1TWFzc2FjaHVzZXR0cyBIZWFsdGggSW5mb3JtYXRpb24gSGlnaHdheSAoTWFzcyBISXdheSkxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEWMBQGA1UEAxMNTWFzcyBISXdheSBDQQ==","whitelist":false,"attachment":{"hash":"71b0cd912fe6d5f87208dacb9ba968dcd735896e9970ece8e45dd1ecf0cc4d6e","size":2239,"filename":"PVEW06JTRRwMsNF9P6Oq0ePQfB7-eaqQtzqjaUZbq3Y=.pem","location":"security-state-staging/intermediates/9410489c-fa40-4eaa-8d3b-da65e27f51ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PVEW06JTRRwMsNF9P6Oq0ePQfB7+eaqQtzqjaUZbq3Y=","crlite_enrolled":false,"id":"07055610-8ad6-4cb4-bbe5-1cd78eaed258","last_modified":1562025160109},{"schema":1562025158603,"derHash":"YGNr4vKU7AePTHJpZLTdUCscguCZz3dWMeiD/u5F+VE=","subject":"CN=EC-GENCAT,OU=Serveis Publics de Certificacio ECV-1+OU=Vegeu https://www.catcert.net/verCIC-1  (c)03+OU=Generalitat de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHpMQswCQYDVQQGEwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxLjAsBgNVBAsTJVNlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8gRUNWLTExNjA0BgNVBAsTLVZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlckNJQy0xICAoYykwMzEhMB8GA1UECxMYR2VuZXJhbGl0YXQgZGUgQ2F0YWx1bnlhMRIwEAYDVQQDEwlFQy1HRU5DQVQ=","whitelist":false,"attachment":{"hash":"ed647ac49271c35288aad77057c157edd24e55f000681fa746f99ab847142e8f","size":2629,"filename":"plh85tWIetVs5VcJnItuNLDy-XNaKKGitW1elxmTBeI=.pem","location":"security-state-staging/intermediates/93a7595b-5765-4a71-9a9d-ad56d74a8ce0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"plh85tWIetVs5VcJnItuNLDy+XNaKKGitW1elxmTBeI=","crlite_enrolled":false,"id":"1b234c30-ce6d-4884-9629-a002cc6d89fb","last_modified":1562025159338},{"schema":1562025156354,"derHash":"QZsMmta4cqixu4c0GvY+6S5psnuZZmLnMwMvEogQjfs=","subject":"CN=GeoTrust EV SSL CA - G6,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNg==","whitelist":false,"attachment":{"hash":"e3ace3997f5254862ba31b6b1b032f6e2ffc20f9bba4c0f616b8909fecf8009e","size":1906,"filename":"wrSQwdbHfW1CspprUJ7cm0XLtkDB3nyY2bZn6MZqHL8=.pem","location":"security-state-staging/intermediates/24479845-1d51-479a-8e01-ffa788643f1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrSQwdbHfW1CspprUJ7cm0XLtkDB3nyY2bZn6MZqHL8=","crlite_enrolled":false,"id":"3b445982-59e3-490a-8362-c15f65d89a41","last_modified":1562025157120},{"schema":1562025155566,"derHash":"tpG0appRDb1muYnamtBpBKwGRz2NDXnyGV1rE/+0oYM=","subject":"CN=TrustSign ECC OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"ec54abad16f8fa60b0a392691a78c2f7503476682a33ddb306dfe52826034ecf","size":1276,"filename":"zdcn7aFVDOpjk4ry7Di1KqCcZhqCF7892ueBmfuRY2g=.pem","location":"security-state-staging/intermediates/3a07e49f-0b15-4531-b4f7-785fc87be9ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdcn7aFVDOpjk4ry7Di1KqCcZhqCF7892ueBmfuRY2g=","crlite_enrolled":false,"id":"0a2ba468-3c5c-4619-add7-a43dba6c5dce","last_modified":1562025156346},{"schema":1562025154811,"derHash":"/alHIIv6MgOmxXuHFKZHtwCeUWjoiVE0VFCx0tP5Gn0=","subject":"CN=TERENA eScience Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDM=","whitelist":false,"attachment":{"hash":"7ea6124756c90b6331413e85db4359452c378d63911d5b07dbce10ad0631a783","size":1804,"filename":"D4s14JIoSBMzTNeUUcWADRb_-SykkRSe9uuLuoU5ots=.pem","location":"security-state-staging/intermediates/409968e6-3674-4763-a739-1304627ae2d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D4s14JIoSBMzTNeUUcWADRb/+SykkRSe9uuLuoU5ots=","crlite_enrolled":true,"id":"03f1b517-d8b6-4d50-8c17-fb4f5025f7b1","last_modified":1562025155558},{"schema":1562025153323,"derHash":"jNlTxQYii/HXTWBi6R5+CHPq67sZ+/IArK3CODAAa4M=","subject":"CN=TrustAsia RSA EV SSL Server CA,OU=Controlled by COMODO exclusively for TrustAsia Technologies,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MIG2MQswCQYDVQQGEwJDTjERMA8GA1UECBMIU2hhbmdoYWkxJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xRDBCBgNVBAsTO0NvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBUcnVzdEFzaWEgVGVjaG5vbG9naWVzMScwJQYDVQQDEx5UcnVzdEFzaWEgUlNBIEVWIFNTTCBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"70e45d2feec0fc507a7142b382526e399bb9e3bc67d30403aa926b3762d1921b","size":2263,"filename":"GxkkcEUvgSYWq0Iy2T9NnbqmBzYGl6Xday5FGhp66kM=.pem","location":"security-state-staging/intermediates/f9ebbc5b-f149-4a4f-8052-4b6f0b63152b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GxkkcEUvgSYWq0Iy2T9NnbqmBzYGl6Xday5FGhp66kM=","crlite_enrolled":false,"id":"e58a1d0e-c454-44c3-a00f-02c0d4483afc","last_modified":1562025154062},{"schema":1562025152565,"derHash":"Y1r2iJ9JBg/g57q8DyMxT7EY87GCQ90X9H2GR6aWhLE=","subject":"CN=Thawte Partner CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVRoYXd0ZSBQYXJ0bmVyIENB","whitelist":false,"attachment":{"hash":"60ece73007734d78c9e04b93695af5557289e36eb46cfe36246074d65ebbd645","size":1630,"filename":"W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=.pem","location":"security-state-staging/intermediates/b4cae8e4-1f4c-4f8f-8e6b-a5611240bcf7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=","crlite_enrolled":false,"id":"238b8a15-e417-4895-866a-8dc86bb8a4c8","last_modified":1562025153315},{"schema":1562025151821,"derHash":"lb5tPC4qOidpXzsxO26vDLoT7VRQ0gQdR9zVeu98e+s=","subject":"CN=MilleniumSign Code Signing Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGSMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTkwNwYDVQQDDDBNaWxsZW5pdW1TaWduIENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"aa16bf81f675c6d11a25b78e5994acc69a324c06f3cc278413284cf9ec7b3b19","size":2584,"filename":"l_0NH_ikSLrTCKMvvz6dkNzfx-BPk9wO2rAM1fHHEpE=.pem","location":"security-state-staging/intermediates/632dc22f-8e34-49f2-8ae9-bf7551b8d988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l/0NH/ikSLrTCKMvvz6dkNzfx+BPk9wO2rAM1fHHEpE=","crlite_enrolled":false,"id":"3dc118b2-773a-4754-a647-50c4ea325ca4","last_modified":1562025152558},{"schema":1562025150329,"derHash":"w2g/fZF1Qhna2k6Nww5LGL05KLU9Ork9BzhLxYcc41U=","subject":"CN=Cybertrust Japan Secure Server ECC CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGIxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEuMCwGA1UEAxMlQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"4ef5e6f2d2f8ff4b8ddd818cd5d7d27891e39644ea2ce02225a9d9ce00621aa3","size":1187,"filename":"QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT_YKfPuvVU=.pem","location":"security-state-staging/intermediates/e169883d-c67d-422b-9497-6e692391df75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT/YKfPuvVU=","crlite_enrolled":false,"id":"1add0595-65df-4e38-a378-f1ca21b6bd9f","last_modified":1562025151073},{"schema":1562025148047,"derHash":"o1f9tXSI6jf48c1poBa4Z3+thZJjKlGtqULEcVvxfh4=","subject":"CN=FUJIFILM Fnet CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEIxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR4wHAYDVQQDExVGVUpJRklMTSBGbmV0IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"7284b6f8f1a8e6cb3529c35f3bc5ec0859430fef3c6f8a621fc05d84037e0f40","size":1479,"filename":"7zYxtJ9jLwFb0WEOBLAAo-vuoQMJ0Xpx70rmlp9xdfY=.pem","location":"security-state-staging/intermediates/06378283-1c8c-45ce-a045-f2e678089f5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7zYxtJ9jLwFb0WEOBLAAo+vuoQMJ0Xpx70rmlp9xdfY=","crlite_enrolled":false,"id":"c88511d0-5e08-4e63-9656-6e16d27f3978","last_modified":1562025148790},{"schema":1562025146538,"derHash":"z28k/+SPhAinXPrfK2X4pOQXLzt8JMQbW3SB0kAYGXw=","subject":"CN=Symantec Class 3 Organizational CA - G3,OU=Symantec Trust Network+OU=Insattningsgaranti Service CA,O=Symantec Corporation,C=US","subjectDN":"MIGnMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxJjAkBgNVBAsTHUluc2F0dG5pbmdzZ2FyYW50aSBTZXJ2aWNlIENBMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"c79aef06bad6276fc86a2e31fb1c6f204f6e41a307a218d5e07fd3e65032588b","size":2097,"filename":"nqV8AzrYXrBySpqYUyy2yG0H7CWZY0WpjPUzO0eO4bE=.pem","location":"security-state-staging/intermediates/d5d01852-cb45-4081-80e5-4f7ff5e74906.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nqV8AzrYXrBySpqYUyy2yG0H7CWZY0WpjPUzO0eO4bE=","crlite_enrolled":false,"id":"649f0c89-bf4f-4775-9d3c-d22bb75f0d0c","last_modified":1562025147299},{"schema":1562025145776,"derHash":"0cIAnUcoNa+6lMyKywbdDHJxOK4ec4NDlNJ7DAbPEmU=","subject":"CN=KeystoneHIE KeyHIE CA,OU=Orion Health Direct Secure Messaging,O=Keystone Health Information Exchange (KeyHIE),C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzE2MDQGA1UEChMtS2V5c3RvbmUgSGVhbHRoIEluZm9ybWF0aW9uIEV4Y2hhbmdlIChLZXlISUUpMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxHjAcBgNVBAMTFUtleXN0b25lSElFIEtleUhJRSBDQQ==","whitelist":false,"attachment":{"hash":"98e266e29f1b0debc92e5f5f678ff38e4063e78bd781620b0312e9323a4d89b4","size":2316,"filename":"BqFOY5ec4fQq7Sh8blvP9sX_mHtMzqYivI5aRbj6LMc=.pem","location":"security-state-staging/intermediates/da472eb5-f686-41e8-ac2a-b967448f0e11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BqFOY5ec4fQq7Sh8blvP9sX/mHtMzqYivI5aRbj6LMc=","crlite_enrolled":false,"id":"66d93205-2931-4627-8a5d-ea5331932a90","last_modified":1562025146529},{"schema":1562025145009,"derHash":"VnmkMeedTrnulnxg2HA8fHj0Q/cduXFX5DBZ3kLYUN8=","subject":"CN=KPN BV PKIoverheid Organisatie Server CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHExCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNjA0BgNVBAMMLUtQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"afa70e68747e22a197469ee8aea83455014ad7e290fde28fd13e2f68a485c72c","size":2601,"filename":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn-TXs=.pem","location":"security-state-staging/intermediates/317d0f28-56a8-47b7-b730-5bc6a31489ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn+TXs=","crlite_enrolled":true,"id":"2780fe8e-e8a3-4eae-bb45-d2eddbf234bf","last_modified":1562025145768},{"schema":1562025142734,"derHash":"wAqBg8mGWghHwBFY94Wl813Li1lse/Rv1kl/cvAuXjI=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"6f175666ee2b368e75d584321a8ac5028a163f7f1f691e5f36e059f87f6f5015","size":1666,"filename":"0XL_diXmZHRX9sGpYNhcrViPrqHXxyYwucHs8TA_5W8=.pem","location":"security-state-staging/intermediates/8e6bf5f6-5604-4d8c-a6d9-257414f5b6cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0XL/diXmZHRX9sGpYNhcrViPrqHXxyYwucHs8TA/5W8=","crlite_enrolled":false,"id":"dd2b472f-d1f1-474f-b861-276f1cbec0eb","last_modified":1562025143470},{"schema":1562025141974,"derHash":"OLJs9FyTLqKAGdk+RArHK66D+cv1LWrZE2mLGPzIcX0=","subject":"CN=EINS/PKI Public Certification Authority V4,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjQ=","whitelist":false,"attachment":{"hash":"3b9ae4a74d5261ecc85f6b9d358b4c4079b49f0f3a8e227d829b9ac02d03ca98","size":1674,"filename":"hMBp2m4PvojCldfsrzoX4dPk_9MctmHJZLUZTqPmBYk=.pem","location":"security-state-staging/intermediates/dc89c814-2876-4b30-b10a-bc5d94abe445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMBp2m4PvojCldfsrzoX4dPk/9MctmHJZLUZTqPmBYk=","crlite_enrolled":true,"id":"179db5f9-cfdb-44f1-a333-5ce2db577865","last_modified":1562025142725},{"schema":1562025140477,"derHash":"gPWw0W+ujnK58TRv7deIg9SmKdE4L7z8aU9Uv8Hu3Tw=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"748e4489edca7296798a29e5a219a2b19349b29db773ac9e517d14e1ea4fe49b","size":1630,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/50ef58fd-9c22-4ac3-9f5e-c898ab5bfbe2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"8b6f71a8-715d-4aba-96bb-ca79f1ec64c7","last_modified":1562025141214},{"schema":1562025136731,"derHash":"vD8K3F/4aks3TcaR+P4nOxuH3HPkOCT1/n82w+AAgxE=","subject":"CN=STRATO SSL - G4,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzQ=","whitelist":false,"attachment":{"hash":"4e6d887b47fddc0e152fedf91f701e3e14afa9cb17d66c66aff6b81f3b2bf2b0","size":1618,"filename":"5oR-PNh3bknmMosEFMizpVd_K6NW9Mg35aMUY2g_tJ0=.pem","location":"security-state-staging/intermediates/082bceb0-77d7-47d4-9492-01e6b2283094.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5oR+PNh3bknmMosEFMizpVd/K6NW9Mg35aMUY2g/tJ0=","crlite_enrolled":false,"id":"f41316d7-e91d-4076-bd60-7bc27fef2ae5","last_modified":1562025137472},{"schema":1562025134484,"derHash":"Q8rDHvjouhtLFrggbkwKJsW62y/DqgnpAXDkG2bC/WQ=","subject":"CN=GoGetSSL RSA DV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"416a15c9d2f048314780b6da5dc96d6d118331d05d84edecee9e19189b209bfb","size":2085,"filename":"T-6uyT5C6WT480t2wqX2OJ3ZrNt2j8v52bWLj-XIvz8=.pem","location":"security-state-staging/intermediates/15643bb1-316f-4368-ab99-a8a038c5fe52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"T+6uyT5C6WT480t2wqX2OJ3ZrNt2j8v52bWLj+XIvz8=","crlite_enrolled":true,"id":"61d52502-e268-4365-9df4-7e0aacbfa38e","last_modified":1562025135235},{"schema":1562025133747,"derHash":"QqtNnxgJRU6+wkXY2wb/YaqCibBaJj3+6WYtrJFmYEM=","subject":"SERIALNUMBER=ZZZZZZA6,CN=Siemens Issuing CA Medium Strength Authentication 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIG2MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTYxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMT8wPQYDVQQDDDZTaWVtZW5zIElzc3VpbmcgQ0EgTWVkaXVtIFN0cmVuZ3RoIEF1dGhlbnRpY2F0aW9uIDIwMTY=","whitelist":false,"attachment":{"hash":"e0621966aec1e2621a278a766224cf528557ebcfab4270f199e7eea7d2675623","size":2653,"filename":"DrWu4Hq8850SEsM72-PVKQ1tYB6sBR3LCdZJGICQePQ=.pem","location":"security-state-staging/intermediates/272b7db7-0908-4ffc-840c-eef0cb622efd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DrWu4Hq8850SEsM72+PVKQ1tYB6sBR3LCdZJGICQePQ=","crlite_enrolled":false,"id":"2d630350-e60d-4235-9fda-8b0f08314a1c","last_modified":1562025134476},{"schema":1562025132263,"derHash":"6tDFB3yZ+PpAzFVtvC6spB9U6dmevUaJVq6ovsWq92o=","subject":"CN=SSL.com Client Certificate Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"c32940ffc93bbf65d67b3107fd8491c272d8a8bf1f1ee00f8ed0c79366ba5152","size":1301,"filename":"Z0cAXCbw1xo4sVpeEsdPDoiHdluFH7wEtczt9XdK7Sc=.pem","location":"security-state-staging/intermediates/7dc0f3f4-c262-4358-bf27-85f5085b55b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z0cAXCbw1xo4sVpeEsdPDoiHdluFH7wEtczt9XdK7Sc=","crlite_enrolled":false,"id":"9a625a71-583a-4afa-9248-664ad9eae363","last_modified":1562025133003},{"schema":1562025130010,"derHash":"uVrlT4OOOr8LV6zMGxJm3GjHo/p3QBX6Eo1gzdGq4oA=","subject":"CN=TeliaSonera Class 1 CA v2,O=TeliaSonera,C=FI","subjectDN":"MEcxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgQ2xhc3MgMSBDQSB2Mg==","whitelist":false,"attachment":{"hash":"158d92505eb3b45b3e6b4f6ad2ec4039c093d61b3bfe9fd73d31588465d0a2da","size":2532,"filename":"7iiRGudmfB5TF0Xjv7u_ECYjflwjOVVvuWfXqeDL9v8=.pem","location":"security-state-staging/intermediates/caafc12b-ae2e-4f72-b6dc-37355ce3511f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7iiRGudmfB5TF0Xjv7u/ECYjflwjOVVvuWfXqeDL9v8=","crlite_enrolled":false,"id":"08d229d0-4919-4ab4-9baa-f3b645c75af6","last_modified":1562025130755},{"schema":1562025129265,"derHash":"7T23SNbXju/wuUUrxqAuA5A5xVB1pDkyO4uoX7Ibndo=","subject":"CN=QuoVadis PKIoverheid EV CA,O=QuoVadis Trustlink BV,C=NL","subjectDN":"MFIxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVRdW9WYWRpcyBUcnVzdGxpbmsgQlYxIzAhBgNVBAMMGlF1b1ZhZGlzIFBLSW92ZXJoZWlkIEVWIENB","whitelist":false,"attachment":{"hash":"36c648cb7bd3c186d7d9e0859c485e365c65a8548541b6aa3bbf6e5145b6c94c","size":2422,"filename":"_4M8fiegSVHwMhxeXXG0hHTjicxrP4MocMfnDzRve4Y=.pem","location":"security-state-staging/intermediates/b4128fcb-cc63-4709-a527-2228c4e5c0e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/4M8fiegSVHwMhxeXXG0hHTjicxrP4MocMfnDzRve4Y=","crlite_enrolled":true,"id":"636a1114-c599-4e1e-9b78-725c0460b51e","last_modified":1562025130001},{"schema":1562025127747,"derHash":"F1cpGj19C7W5uc+IAvGyrhc+VrCTWXD8hrY6J0mdteI=","subject":"CN=Mississippi Division of Medicaid CA,OU=Orion Health Direct Secure Messaging,O=Mississippi Division of Medicaid,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgTWlzc2lzc2lwcGkgRGl2aXNpb24gb2YgTWVkaWNhaWQxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEsMCoGA1UEAxMjTWlzc2lzc2lwcGkgRGl2aXNpb24gb2YgTWVkaWNhaWQgQ0E=","whitelist":false,"attachment":{"hash":"cca273f49f71c1ff7f8f40ea75ee3f2df48645b9f0d620d081223e02dc8f3321","size":2316,"filename":"QSHb9BKVt3sbbZcpbsYhza74RWYYrCyW2TRiOuRYm24=.pem","location":"security-state-staging/intermediates/0a2a8364-6973-4442-8eef-5927bc28bcef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QSHb9BKVt3sbbZcpbsYhza74RWYYrCyW2TRiOuRYm24=","crlite_enrolled":false,"id":"cef1bd37-f531-4ab9-959c-5a8c3ce41d8a","last_modified":1562025128479},{"schema":1562025127010,"derHash":"0CxXxteEvH/1xNAzwizbpac6L4fZ4diA7HjNGuD4J04=","subject":"CN=TERENA eScience Personal CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDI=","whitelist":false,"attachment":{"hash":"e1127ebdc239f9dd82e4c2cde697bb33a369369a3c114af4dbb2d849aba0ddd1","size":2142,"filename":"PRDfx01D2tGMhHfAORezk6RxRuzL198DON5jY4n-V-4=.pem","location":"security-state-staging/intermediates/b176cf5c-6fd4-4e00-9e7b-cf987807af32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PRDfx01D2tGMhHfAORezk6RxRuzL198DON5jY4n+V+4=","crlite_enrolled":false,"id":"404f7c65-b381-4bf3-af34-70c1b2e70fba","last_modified":1562025127739},{"schema":1562025126254,"derHash":"IlETztpo+6teYo4CFKFaZRxHqn7nu/R2CZtuFC7syOw=","subject":"CN=SECOM TimeStamping CA2,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFUxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMR8wHQYDVQQDExZTRUNPTSBUaW1lU3RhbXBpbmcgQ0Ey","whitelist":false,"attachment":{"hash":"b79bcebbdbe1d9b2e2ea489fca18c99a683e821b17174c6fea226b5019dbe31c","size":1622,"filename":"kFsLMWudOm7QLAlLqDicbVVw7Daqh252pLGjqKrHPQ4=.pem","location":"security-state-staging/intermediates/3a2cfed7-d044-40b7-a016-e67672e57467.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kFsLMWudOm7QLAlLqDicbVVw7Daqh252pLGjqKrHPQ4=","crlite_enrolled":false,"id":"3f00218c-7886-47cf-8ee9-5b1518d9ef10","last_modified":1562025127002},{"schema":1562025121762,"derHash":"Q49HPr/IiE710+DVLSZM2+Vso4LZ6/xonXdIlAn1Wm4=","subject":"CN=Google CA1,O=Google\\, Inc.,L=Mountain View,ST=CA,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMRMwEQYDVQQDEwpHb29nbGUgQ0Ex","whitelist":false,"attachment":{"hash":"3af4c41659b8039f273a6dacdf6c94bac5d0c669051cf7c3193a04011fdc1079","size":1695,"filename":"JqNL7R3G-I-oNR0Uoa1_QE7RwLsPo10K2QlsnoYQ8eg=.pem","location":"security-state-staging/intermediates/f88caf87-4bc1-4a4c-a37c-266f3dbed491.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JqNL7R3G+I+oNR0Uoa1/QE7RwLsPo10K2QlsnoYQ8eg=","crlite_enrolled":false,"id":"9f917307-df70-4aef-9de2-d3f38129efe8","last_modified":1562025122497},{"schema":1562025120279,"derHash":"CgXEYnVjkN0fHV3YJ5TDAPBL54nc521+MS95DWj9OFo=","subject":"CN=InCommon RSA Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBSU0EgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"3959f96c1c3a6e88dfd1193a6ce41b3322674ad833793a0ff92f5a272c114f9f","size":2129,"filename":"b1JA6-4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=.pem","location":"security-state-staging/intermediates/ca260223-49d4-4648-b181-def80753276d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b1JA6+4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=","crlite_enrolled":true,"id":"4c82bc48-ddcd-4b3d-a03a-9eb182f2f7d6","last_modified":1562025121016},{"schema":1562025118745,"derHash":"N+micetHJck82vGDVix9fZ6o/BOfg3T/5BjXfTJCj+A=","subject":"CN=New Hampshire Health Information Organization CA,OU=Orion Health Direct Secure Messaging,O=New Hampshire Health Information Organization Corporation,C=US","subjectDN":"MIG7MQswCQYDVQQGEwJVUzFCMEAGA1UEChM5TmV3IEhhbXBzaGlyZSBIZWFsdGggSW5mb3JtYXRpb24gT3JnYW5pemF0aW9uIENvcnBvcmF0aW9uMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxOTA3BgNVBAMTME5ldyBIYW1wc2hpcmUgSGVhbHRoIEluZm9ybWF0aW9uIE9yZ2FuaXphdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"2922fb883b4e192002b98a3501ca3ae60c4ab145c5b910af0e2f4bd8c5fc8929","size":2369,"filename":"FcaQBKoKOodq4LMiSFEUzCJa0dFILZ6txuxivUIQWA4=.pem","location":"security-state-staging/intermediates/8f263fea-ce90-415d-94b7-527302ef2d65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FcaQBKoKOodq4LMiSFEUzCJa0dFILZ6txuxivUIQWA4=","crlite_enrolled":false,"id":"3b9c9c53-a91e-4f93-aeef-79ae47ea63fc","last_modified":1562025119531},{"schema":1562025118011,"derHash":"roIgH1ZeBDm39K1okydZTrl0pPeBsabL/tWb04IxfxM=","subject":"CN=Thawte TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"add9d8816c4153cd678d313dec7135ed32f3b5d71e1c1b6f73bf061cd4162394","size":1142,"filename":"Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO-bYvpiEQI=.pem","location":"security-state-staging/intermediates/5724bc90-8b80-4c0c-b710-f8b313c76589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO+bYvpiEQI=","crlite_enrolled":false,"id":"dff3760d-8e5d-4c69-8668-9cf682af48a9","last_modified":1562025118738},{"schema":1562025117267,"derHash":"xdgUZyz2W5U+b2nnAsfCOl69pFeWqliDQSHfsNBsCEY=","subject":"CN=thawte Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMScwJQYDVQQDEx50aGF3dGUgUHJpbWFyeSBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"d074ef6628a7cb58702f27da00b4aba9b3b74c4953ec5393a085dd2c691a1552","size":1313,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/89580d25-17ba-4667-ac01-e3e72a6b9158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"e8972f4c-b265-4859-871b-9a07bfcd532d","last_modified":1562025118003},{"schema":1562025116492,"derHash":"j+l3I5D20iqVPZjbzRl1SsvTQJILDHDdyh/v5Icyl1A=","subject":"CN=EINS/PKI Public Certification Authority V2,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjI=","whitelist":false,"attachment":{"hash":"991ddc8794f0daa071f015020faf9f96b617452fc700241d6b2e77450d2deaea","size":1597,"filename":"UAXhCsI8VFL2KFAMyEK1fRS-4Xo9P8T-q-ZMcJBfvcs=.pem","location":"security-state-staging/intermediates/29482520-eeb7-4ff7-b611-fda14001a03b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UAXhCsI8VFL2KFAMyEK1fRS+4Xo9P8T+q+ZMcJBfvcs=","crlite_enrolled":false,"id":"b388d70b-38e4-4ec1-9c8d-095362f5d6e3","last_modified":1562025117259},{"schema":1562025114922,"derHash":"qYyM7ZP5pDYxq+RXOGTgbFGSkAcj6X0e7SwNfGiy0Hk=","subject":"CN=Advanced Code Signing Class2 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGOMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExNjA0BgNVBAMMLUFkdmFuY2VkIENvZGUgU2lnbmluZyBDbGFzczIgZS1Temlnbm8gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"64067aab0874bc037193b6acdb923c5b3f8be5f6ce9e88eeefe2ebd7d958132b","size":2609,"filename":"xFdYXbpSYOTcKmpFvTeBEjUJFCvx6SNaltd9jtCg594=.pem","location":"security-state-staging/intermediates/8c58155b-730e-4bd1-a4a4-a9d2120083b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFdYXbpSYOTcKmpFvTeBEjUJFCvx6SNaltd9jtCg594=","crlite_enrolled":false,"id":"f3a00705-bb5f-44e5-aefb-59098a06f4e5","last_modified":1562025115705},{"schema":1562025114183,"derHash":"G6RA9+sEikAqhwkcSUB0BGJUmirzli+LxxhK0LBLgx0=","subject":"CN=University of Patras CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaVW5pdmVyc2l0eSBvZiBQYXRyYXMgQ0EgUjE=","whitelist":false,"attachment":{"hash":"21e16a0dccadb707cc68dc9e26f6d00380e449c017fe72bffa76423cc88355f7","size":2584,"filename":"yWuLmWbmLueFjc04Qp7TQPUOOX-6i8azb2QoXYNtOv8=.pem","location":"security-state-staging/intermediates/fb23a6f7-db94-4b12-a05d-b7c2f1a2c437.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yWuLmWbmLueFjc04Qp7TQPUOOX+6i8azb2QoXYNtOv8=","crlite_enrolled":true,"id":"ea530e37-2e6a-4377-bcbe-2c0bb0fb334f","last_modified":1562025114914},{"schema":1562025113418,"derHash":"91Qc9p0d4ayVOrwfrW94B6NO3+nhLBHmahlZMMI61sY=","subject":"CN=DigiCert Global CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMw==","whitelist":false,"attachment":{"hash":"caf0ca58fa4e543dbd0a13f2d28c0f3ba36a68e2ce4db8f05cbe1c0cc102e4ce","size":1106,"filename":"lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=.pem","location":"security-state-staging/intermediates/d3b97027-ab86-4c2f-bde3-30d9f0e79337.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=","crlite_enrolled":true,"id":"042596bd-887e-46b0-a897-969aef8e476a","last_modified":1562025114175},{"schema":1562025112681,"derHash":"buBlr1i3BDyyNy/GY540hjBPzQlNnLaDjXaojOIMMN0=","subject":"CN=USERTrust RSA Domain Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE5MDcGA1UEAxMwVVNFUlRydXN0IFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"f6e9d1e1c2c0f490e19c26afc850c4184e1f2eebd9f9245a8d6557c5030b419f","size":2170,"filename":"jPQXFCdXn0NxGIW3P3JUl22ASU1QS7BTE83baBiuZpc=.pem","location":"security-state-staging/intermediates/87e7a783-ce18-4cab-8226-a64514640d48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jPQXFCdXn0NxGIW3P3JUl22ASU1QS7BTE83baBiuZpc=","crlite_enrolled":true,"id":"37b1fced-36f9-4c04-b5ef-93347b78666e","last_modified":1562025113411},{"schema":1562025111941,"derHash":"e88cihLuCyhUobQQcGUrAyXn0MILnETUrOnGQzh/FDE=","subject":"CN=Class3 KET e-Szigno CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG0NsYXNzMyBLRVQgZS1Temlnbm8gQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"b8363cf53cbc0d53826cb443efcf270b8480d872fe5f866c272fe115ac7daa95","size":2227,"filename":"9cUMZguTNlS7SsqERbenmwQ2nFpq1XEyXFYq20LBYKQ=.pem","location":"security-state-staging/intermediates/1e730201-a474-4fd9-b805-d7a04496b3b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9cUMZguTNlS7SsqERbenmwQ2nFpq1XEyXFYq20LBYKQ=","crlite_enrolled":false,"id":"a393de41-fe5f-4381-951c-6e5fcf3cb617","last_modified":1562025112674},{"schema":1562025111185,"derHash":"nwMezP+1xfZqL3CFOCDqWrVKfa4bBzwGfQVI2Lx0vms=","subject":"CN=SecureCore RSA Secure Client and Email CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MHYxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxMjAwBgNVBAMTKVNlY3VyZUNvcmUgUlNBIFNlY3VyZSBDbGllbnQgYW5kIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"2bc5fded9a0980430c28b69a3f3a55e6fec28e75e562e0274a8eec10fca95c6d","size":2129,"filename":"KBLXQ9-jOdoOf7rJ1mS67CFv5GiWDtEk9tpsMiIQhZ4=.pem","location":"security-state-staging/intermediates/18a2a864-4b38-4e2d-a9ec-0a188a9bf902.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KBLXQ9+jOdoOf7rJ1mS67CFv5GiWDtEk9tpsMiIQhZ4=","crlite_enrolled":false,"id":"8530b5fa-bac9-4fe6-873e-22d0ae2c14a8","last_modified":1562025111933},{"schema":1562025110415,"derHash":"lcB041kCoUq9nRmvtuf4Dmaf+OI2MnBTnZY2E/BKqiE=","subject":"CN=GTS CA 1O1,O=Google Trust Services,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3QgU2VydmljZXMxEzARBgNVBAMTCkdUUyBDQSAxTzE=","whitelist":false,"attachment":{"hash":"6b83970dc396a58790e6b658e13c63e57dafec798ebdec22b4b70519932de38c","size":1548,"filename":"YZPgTZ-woNCCCIW3LH2CxQeLzB_1m42QcCTBSdgayjs=.pem","location":"security-state-staging/intermediates/d1df4cf2-b819-43ed-a6e3-59e264ed21b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZPgTZ+woNCCCIW3LH2CxQeLzB/1m42QcCTBSdgayjs=","crlite_enrolled":true,"id":"73b3dfa7-731a-4bfe-b218-d585c8e45d6d","last_modified":1562025111178},{"schema":1562025108184,"derHash":"A2oY9fDrndXuAreFTfXDOEVgHYk5z7e2B/adFCwB2Qk=","subject":"CN=TrustAsia TLS RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBSU0EgQ0EgRzg=","whitelist":false,"attachment":{"hash":"cbb7a86cf96f690954bcd21bb8c71a00ef436ee942cd65831bf21c11cbc25909","size":1687,"filename":"rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=.pem","location":"security-state-staging/intermediates/d04ab9f3-2fc4-47a8-931d-4b644bd07cbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=","crlite_enrolled":false,"id":"6687c4bb-a959-4fee-9b6b-63f4d03a8c85","last_modified":1562025108917},{"schema":1562025107419,"derHash":"WNehl/CabqVSuOprGlMYWgMKOtjVIiDADETj9FDk+5A=","subject":"CN=NETLOCK Trust CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFIxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMRkwFwYDVQQDDBBORVRMT0NLIFRydXN0IENB","whitelist":false,"attachment":{"hash":"162d2ef1f5f7a945a8033cb0bb83b55948d4915840c9e5f98f83b3666f2aec62","size":2060,"filename":"JNdSz2IBG96B7N8LkEnVH6myMdo7MCXP8kJ-NPi5A64=.pem","location":"security-state-staging/intermediates/645b58d9-0779-4656-9fe8-ac5478c57d4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JNdSz2IBG96B7N8LkEnVH6myMdo7MCXP8kJ+NPi5A64=","crlite_enrolled":false,"id":"9784e5cb-7f50-43e5-853d-bce88eb86d00","last_modified":1562025108176},{"schema":1562025105176,"derHash":"2C+H+T0x1fyBjdZr1Q5/MZrhefwcXQBUe2WOjrP0zlY=","subject":"CN=NETLOCK Trust Advanced CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFsxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSIwIAYDVQQDDBlORVRMT0NLIFRydXN0IEFkdmFuY2VkIENB","whitelist":false,"attachment":{"hash":"d2114d074fdd6d510393f4e4475f26c915693c1226b230324cdcc50ab4dec84b","size":2073,"filename":"vUlRVy11U4UcMGkV_J50oacQuaDzZcAvkc6eUz9yR9c=.pem","location":"security-state-staging/intermediates/ad1cf639-62d7-4f1c-ae01-76b1bce15693.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vUlRVy11U4UcMGkV/J50oacQuaDzZcAvkc6eUz9yR9c=","crlite_enrolled":false,"id":"4772163f-50e2-43cd-9d63-17d1e8176bd8","last_modified":1562025105914},{"schema":1562025102913,"derHash":"yJwktBWnLJQJZn6I+15ukqONVgnDyZ5V2ZtLHUWJkPk=","subject":"CN=certSIGN Qualified CA Class 3 G2,OU=certSIGN Qualified CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHYxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEpMCcGA1UECxMgY2VydFNJR04gUXVhbGlmaWVkIENBIENsYXNzIDMgRzIxKTAnBgNVBAMTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"8790a1c05eb34050a0518d6b450074d0a070eab4fdfc196e7812a7cc01b12fc8","size":1634,"filename":"UPMbIpu91S39VXXONt79PssKsPf6YLoNySvPP-qGdwY=.pem","location":"security-state-staging/intermediates/dcc54254-18e6-46af-8584-ac6c726a3de5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UPMbIpu91S39VXXONt79PssKsPf6YLoNySvPP+qGdwY=","crlite_enrolled":false,"id":"17f3db66-1a26-4fc2-b72b-4734ccc0cd35","last_modified":1562025103641},{"schema":1562025101431,"derHash":"XSh2HL8wTq/NEns01hT+F5rHdE8VUq8cMSmEJa0FonU=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"79fdcd0fdb21095bb95b3fb6c0d2e5a49a456e49968efb573d826c26b3cca0e5","size":1683,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/f1b50907-9001-4396-aa45-939f75f991c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"65d41ecf-d71f-4a7d-bf9b-57d8825ab674","last_modified":1562025102166},{"schema":1562025100681,"derHash":"V9i9zViVWlWQpXxqr6WB7ZuWvtdvr+6WmxORh8Wocsc=","subject":"CN=Sectigo RSA Extended Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"3c04f880fa1e0f0085d430978a6bc33abae6717b85151f854d3ff05199bf6410","size":2211,"filename":"hEJ5FNYP7ZpNILySZtJgiP6UtW3ClYUTRFxXGqWSWQ0=.pem","location":"security-state-staging/intermediates/37a9c68e-c8d4-4809-882d-5b941bdb7165.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hEJ5FNYP7ZpNILySZtJgiP6UtW3ClYUTRFxXGqWSWQ0=","crlite_enrolled":true,"id":"3b4f8ef4-d9a1-4755-85ba-fe5df21a98c3","last_modified":1562025101423},{"schema":1562025099203,"derHash":"3Nd+NLRtUwrvZFpRM4nNT/wPfRlqEVuPYqX9DVV9RsY=","subject":"CN=Hyperion SMIME CA 2018,O=Hyperion Services Ltd.,L=London,ST=London,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEfMB0GA1UEChMWSHlwZXJpb24gU2VydmljZXMgTHRkLjEfMB0GA1UEAxMWSHlwZXJpb24gU01JTUUgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"3fbf797d090a78ef888fdc499ae42541542cf7827762b8ccc489eb873eddc923","size":1873,"filename":"KZbbX3n6ko-IU98hurc1EgrFvk1o2vwDfC6xMZH_7aA=.pem","location":"security-state-staging/intermediates/2cfb2953-ca27-4ba1-9b23-acac7070e2e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KZbbX3n6ko+IU98hurc1EgrFvk1o2vwDfC6xMZH/7aA=","crlite_enrolled":false,"id":"22df953a-4459-4148-a0a1-a104c0645863","last_modified":1562025099933},{"schema":1562025097714,"derHash":"JHptgH/xZAMeDrIsqF3jKaOk5mA9vGID8MbigqnJ6oQ=","subject":"SERIALNUMBER=07945211006,CN=InfoCert Organization Validation CA 3,OU=WSA Trust Service Provider,O=InfoCert S.p.A.,C=IT","subjectDN":"MIGSMQswCQYDVQQGEwJJVDEYMBYGA1UECgwPSW5mb0NlcnQgUy5wLkEuMSMwIQYDVQQLDBpXU0EgVHJ1c3QgU2VydmljZSBQcm92aWRlcjEUMBIGA1UEBRMLMDc5NDUyMTEwMDYxLjAsBgNVBAMMJUluZm9DZXJ0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIDM=","whitelist":false,"attachment":{"hash":"f6ce0e2e3315e95e38e3c168f1b2993eea7b2b1811d7782d5cfe1f74278a911d","size":2942,"filename":"a-x8kAay98aATSdhIwydXnat5b0q__ixXZNoxswIZ1o=.pem","location":"security-state-staging/intermediates/2161ca2c-c902-4553-8e92-c331a903b4d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+x8kAay98aATSdhIwydXnat5b0q//ixXZNoxswIZ1o=","crlite_enrolled":true,"id":"0ad6adc0-7bae-4a0d-8a0a-ff78e01348df","last_modified":1562025098460},{"schema":1562025096209,"derHash":"6+ABXvZBxICVTtKmiEL8zSqKeSE67tg23fpigujqj2o=","subject":"CN=BlackCert\\, Inc. RSA EV Certification Authority,OU=Controlled by COMODO exclusively for BlackCert\\, Inc.,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIG9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMT0wOwYDVQQLEzRDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgQmxhY2tDZXJ0LCBJbmMuMTcwNQYDVQQDEy5CbGFja0NlcnQsIEluYy4gUlNBIEVWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"cc5e72b6d860c3d9cb108395e1dbe41b4443dcb561415f556b6aa1f3f763729b","size":2272,"filename":"nq1PHRuOp_qQ-vlMQDWIjBXQS9CPEsH5CLd-dlkam7U=.pem","location":"security-state-staging/intermediates/6e6eaa86-3ce0-4465-ab9e-337525dba314.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nq1PHRuOp/qQ+vlMQDWIjBXQS9CPEsH5CLd+dlkam7U=","crlite_enrolled":false,"id":"df82f80e-3b6f-455e-ae56-4770117ecbdb","last_modified":1562025096954},{"schema":1562025094676,"derHash":"kz5KLY2x/5/w5QjqfxY34HT2YP5vNloiM9/CtSyInZg=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=AlphaSSL","subjectDN":"MDcxETAPBgNVBAoTCEFscGhhU1NMMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"387ae998795c0cb5d04b22c0bbfb366d42adc2767c993a0b6254218326a44c7b","size":1512,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/0c0cebe7-5e9b-4eac-b906-9e157cfd6a82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"6044f076-a6cf-4215-82f0-8b5ff9aa3ffc","last_modified":1562025095417},{"schema":1562025093933,"derHash":"bjKjW1mekIe7GrNc5zAi7C4mrzS+OIkZQZyVcAzY5/s=","subject":"CN=Trusted Root CA G2,OU=Trusted Root,O=GlobalSign nv-sa,C=BE","subjectDN":"MFwxCzAJBgNVBAYTAkJFMRUwEwYDVQQLEwxUcnVzdGVkIFJvb3QxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExGzAZBgNVBAMTElRydXN0ZWQgUm9vdCBDQSBHMg==","whitelist":false,"attachment":{"hash":"c6c5a13b2392745618b20f994004aa62c9b088be893958a18f79135b156a42cb","size":1573,"filename":"W66tP4wePoAO-Y8UjUlgyqqFM7jqIJHVT7pIzmYXOtI=.pem","location":"security-state-staging/intermediates/744cf51d-71fb-49fc-8ab6-fe14dce35ca1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W66tP4wePoAO+Y8UjUlgyqqFM7jqIJHVT7pIzmYXOtI=","crlite_enrolled":true,"id":"7be6334e-99cf-4ea5-b61c-2c199025e86b","last_modified":1562025094668},{"schema":1562025093184,"derHash":"cLahDAynbeznrb6XC3ajfYoChXsTTHUFsYTr1fyk8+o=","subject":"CN=HARICA SSL RSA SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGGMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEgMB4GA1UEAwwXSEFSSUNBIFNTTCBSU0EgU3ViQ0EgUjM=","whitelist":false,"attachment":{"hash":"cedc43d39f09a719a27599d55f251f9b11242c16b81336fe59c19b7813994c1e","size":2503,"filename":"jBZXnMw3910qHNl4GpA8ufttU_ABxauO7Xs8rkNWmHE=.pem","location":"security-state-staging/intermediates/5542e9c0-bf1d-4c98-b99d-c78ac7be7cf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jBZXnMw3910qHNl4GpA8ufttU/ABxauO7Xs8rkNWmHE=","crlite_enrolled":true,"id":"6a0c4fba-c9c1-4273-b116-3435c8b09dd6","last_modified":1562025093925},{"schema":1562025092426,"derHash":"DnhDTsitZhNWLIOQ2LMwb8YIfgWTx9WsL6+a0mOHl0U=","subject":"CN=DigiCert Accredited Direct Med CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IEFjY3JlZGl0ZWQgRGlyZWN0IE1lZCBDQQ==","whitelist":false,"attachment":{"hash":"53d0dac262584f5d7ebc0923e541b5828cbf1d3a5c1e0cf334be28b3dd82033e","size":2300,"filename":"bJKSpALMZEtN8MtL5JhmKs5KNAAP3Z3m_oaeTa7A8vQ=.pem","location":"security-state-staging/intermediates/c074475f-6f2f-494a-a050-d78b1d741b26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJKSpALMZEtN8MtL5JhmKs5KNAAP3Z3m/oaeTa7A8vQ=","crlite_enrolled":false,"id":"28327394-cfae-4edb-aa78-e5f8d18caf65","last_modified":1562025093176},{"schema":1562025090182,"derHash":"EorBG0j05isu5XngkyLjmhc15zo9lk9eXXInF5b+CjY=","subject":"CN=Oregon State Treasury RSA Client CA,OU=Office of the State Treasurer,O=Oregon State Treasury,L=Salem,ST=Oregon,C=US","subjectDN":"MIGkMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMQ4wDAYDVQQHEwVTYWxlbTEeMBwGA1UEChMVT3JlZ29uIFN0YXRlIFRyZWFzdXJ5MSYwJAYDVQQLEx1PZmZpY2Ugb2YgdGhlIFN0YXRlIFRyZWFzdXJlcjEsMCoGA1UEAxMjT3JlZ29uIFN0YXRlIFRyZWFzdXJ5IFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"fff008b20f8ee90e4c5aaa17d09ef3f8aed6655a427538e3fb2d3504b6906b60","size":2174,"filename":"xv6VIcmRAUtsQmMX6xbFZdKy9CyqZlAGKv6q2fNSHWU=.pem","location":"security-state-staging/intermediates/4e1beacd-8dc6-4ec4-a0a1-34c554c6811c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xv6VIcmRAUtsQmMX6xbFZdKy9CyqZlAGKv6q2fNSHWU=","crlite_enrolled":false,"id":"52f6a804-6e60-45ab-9e53-115bc19880ea","last_modified":1562025090915},{"schema":1562025089412,"derHash":"fOHbfRbpv+gGkyFKPXxiY6okeJ45kBfmnt5IAuz29xE=","subject":"CN=NETLOCK Trust Qualified SCD CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMScwJQYDVQQDDB5ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBTQ0QgQ0E=","whitelist":false,"attachment":{"hash":"efcaaf465785dda6f37158642f960522b0fbb28b652b8dd1d415feb8b3843a40","size":2077,"filename":"e2y-IcyyWA7mZKQQFWLVH34cdYOha_33T_SE2Yj7jp8=.pem","location":"security-state-staging/intermediates/da84341e-9c4a-411d-81b2-cba5084edf77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e2y+IcyyWA7mZKQQFWLVH34cdYOha/33T/SE2Yj7jp8=","crlite_enrolled":false,"id":"33b62fc5-1349-4933-8a0b-bac57c2adc38","last_modified":1562025090175},{"schema":1562025085617,"derHash":"QyY5E7SD628LAgVA+Pe+Ch18nOdlL+D7R0PXITOTVRw=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,L=Tel Aviv-Jaffa,ST=Tel Aviv,C=IL","subjectDN":"MGgxCzAJBgNVBAYTAklMMREwDwYDVQQIEwhUZWwgQXZpdjEXMBUGA1UEBxMOVGVsIEF2aXYtSmFmZmExFTATBgNVBAoTDEJlYW1lLmlvIEx0ZDEWMBQGA1UEAxMNQmVhbWUuaW8gQ0EgMQ==","whitelist":false,"attachment":{"hash":"2ede44f6018db9de8c44fdb625cfc55d1f5acf992c2e1601671f84f30bf8b229","size":1800,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/75df26fa-72c6-408e-b18d-8816a9d5bcfd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"d73fd51e-4861-4081-91b1-760652365c4d","last_modified":1562025086359},{"schema":1562025083342,"derHash":"XIDlafzuk/FaK8BDUQKyagT1qh7JkSwToFiBwarVAtI=","subject":"CN=Cleverbase ID PKIoverheid Burger CA - G3,O=Cleverbase ID B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRswGQYDVQQKDBJDbGV2ZXJiYXNlIElEIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTY3NDE5OTI1MTEwLwYDVQQDDChDbGV2ZXJiYXNlIElEIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"aac14b1ffb25fc6fffba063081448afc1a36690e2d88f82e7b95e6c951203ba5","size":2515,"filename":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps_pS8BKM=.pem","location":"security-state-staging/intermediates/3ed57a24-3064-4897-9209-cdf438896a68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps/pS8BKM=","crlite_enrolled":false,"id":"0279ebd1-4242-44b7-a1a2-73190b4f1f39","last_modified":1562025084103},{"schema":1562025081828,"derHash":"yrnBLb3jrV0rwCAbVLGL4gnNXhRqqghau98kGwlt/0c=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"02738114b030370213ecaf8808b823088a25f270059a42ccf2185bd1d5cdbf7f","size":2170,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/fb6d60a1-e61a-44fd-961d-965bb7c9fb88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"6356ab18-9e19-400c-8782-0d5c6bbea774","last_modified":1562025082569},{"schema":1562025081075,"derHash":"PXdLZe6V/W79HIcytX5gfJvuQjw25G9uHMjKHwrmLiM=","subject":"CN=TrustAsia Secure Enterprise Email CA,OU=www.trustasia.com,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MH8xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMRowGAYDVQQLExF3d3cudHJ1c3Rhc2lhLmNvbTEtMCsGA1UEAxMkVHJ1c3RBc2lhIFNlY3VyZSBFbnRlcnByaXNlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"20b01b33815a02bfa2f3c548a9482ee66729f3a9eb6744f9b7b7a0a4acbf9d6f","size":1711,"filename":"5AZRODSr4yzVRSQdofdzrLh4-_fDra8nT16mH7dhrIA=.pem","location":"security-state-staging/intermediates/4a0d1ac7-535b-4466-a0e8-0dd4b614ecc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5AZRODSr4yzVRSQdofdzrLh4+/fDra8nT16mH7dhrIA=","crlite_enrolled":false,"id":"94318fe7-87ee-4ceb-b386-6938eb65acae","last_modified":1562025081815},{"schema":1562025077308,"derHash":"IxbQWi4tNH+hQRNbmO0J9W6B8c9WeXk9OzndbY5GGkg=","subject":"CN=D-TRUST CA 2-2 EV 2016,O=D-Trust GmbH,C=DE","subjectDN":"MF4xCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHzAdBgNVBAMTFkQtVFJVU1QgQ0EgMi0yIEVWIDIwMTYxFzAVBgNVBGETDk5UUkRFLUhSQjc0MzQ2","whitelist":false,"attachment":{"hash":"0825406b026a6a7eccc3247066b51626c668bc7f4c309505d5c1e32a1af60822","size":2182,"filename":"i6ujKRFlQ2Ig06L83VzPhB9sBlGOZCDwkUjNLjHtSJo=.pem","location":"security-state-staging/intermediates/8b7d4055-606f-43ea-83f8-a86a2a904797.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i6ujKRFlQ2Ig06L83VzPhB9sBlGOZCDwkUjNLjHtSJo=","crlite_enrolled":true,"id":"6fc15004-2622-45ba-a821-4bcba503d6f5","last_modified":1562025078039},{"schema":1562025076548,"derHash":"vzLalUVxZZqvcVwT7nA+NkPfy67uLYIRDKaOtXy2fOA=","subject":"CN=TUBITAK Kamu SM SSL Sertifika Hizmet Saglayicisi - Surum 1,OU=Kamu Sertifikasyon Merkezi - Kamu SM,O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK,L=Gebze - Kocaeli,C=TR","subjectDN":"MIHfMQswCQYDVQQGEwJUUjEYMBYGA1UEBwwPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKDDlUdXJraXllIEJpbGltc2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsMJEthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTFDMEEGA1UEAww6VFVCSVRBSyBLYW11IFNNIFNTTCBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpIC0gU3VydW0gMQ==","whitelist":false,"attachment":{"hash":"ab10fd30609bc30f75d3ede708f810cf2fdb009802424fd6ed3e4c6bf308db7c","size":2296,"filename":"FUrqo5K2woGDo0xUxDmAoLHpCJRt3-d67a7xGdVm1s8=.pem","location":"security-state-staging/intermediates/56f71156-d839-4560-9fe4-299ea364f331.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FUrqo5K2woGDo0xUxDmAoLHpCJRt3+d67a7xGdVm1s8=","crlite_enrolled":true,"id":"461c30ef-db33-4e0c-bcf1-c4fb264c2a61","last_modified":1562025077300},{"schema":1562025075778,"derHash":"zWwQig5kHyyhIqqm0D+CZ1nK58b4AOq/dtxItnzQg84=","subject":"CN=COMODO ECC Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"7facb26c244929edfadc101e9d19a9d34d32396b62ea53c5d23503e6bc13eb7d","size":1317,"filename":"x9SZw6TwIqfmvrLZ_kz1o0Ossjmn728BnBKpUFqGNVM=.pem","location":"security-state-staging/intermediates/fffcaf3e-173f-4e58-b6c4-9954f5874559.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x9SZw6TwIqfmvrLZ/kz1o0Ossjmn728BnBKpUFqGNVM=","crlite_enrolled":true,"id":"c6b2463c-5d7d-46a7-81b3-08d470deb2cb","last_modified":1562025076540},{"schema":1562025073491,"derHash":"x+l2qnfpJJHCaYQLLxRh5lFHorsYHuWatjvNhnBP5FY=","subject":"CN=SHECA RSA Code Signing CA G3,O=UniTrust,C=CN","subjectDN":"MEcxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDElMCMGA1UEAwwcU0hFQ0EgUlNBIENvZGUgU2lnbmluZyBDQSBHMw==","whitelist":false,"attachment":{"hash":"04a5c4549fb8f38d3d8667477114ebb450959d81527a986faab3d950083f6f57","size":1999,"filename":"1ZF5amwL4aSG-YZ86E54FJywudjHd13EF9RlMionCIk=.pem","location":"security-state-staging/intermediates/7f712404-bc1b-47a2-932b-37e11e83d004.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1ZF5amwL4aSG+YZ86E54FJywudjHd13EF9RlMionCIk=","crlite_enrolled":false,"id":"494cbaa5-812e-4b2f-955d-b47b33fc6092","last_modified":1562025074261},{"schema":1562025072011,"derHash":"UCx6hwNB175n2ybb+s+WR6/YmoVL+IEvpO9ww1bsE+U=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"bef7765a6512b8ca9ae0249e5ae13feb4bab372a421c7f5baac1aa38a4051dc3","size":2097,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/82a38024-ae36-439e-82e2-33dccd4b696e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"d70ce8a6-7038-4f00-b159-048f0e1bb4a7","last_modified":1562025072738},{"schema":1562025065222,"derHash":"Z7vZFEbTre+bIcBXaZbc2OZmjWsMEz8Ha5H6cc7mtCg=","subject":"CN=eMudhra ECC Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for eMudhra Technologies Ltd.,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIHhMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxSDBGBgNVBAsTP0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgZU11ZGhyYSBUZWNobm9sb2dpZXMgTHRkLjE5MDcGA1UEAxMwZU11ZGhyYSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"f4e2753836be21882cf81baaf3794e45c6251465fdc3122487eaf955a4717b2c","size":1475,"filename":"4ilprzeauYUkRwucZKCyuMuQcVH9en_FzR8kab23FUw=.pem","location":"security-state-staging/intermediates/5dde594d-faa8-45b6-b6dc-05a87417963b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ilprzeauYUkRwucZKCyuMuQcVH9en/FzR8kab23FUw=","crlite_enrolled":false,"id":"2a3b5d82-65bb-4191-8f82-c390f1255cee","last_modified":1562025065952},{"schema":1562025064486,"derHash":"n+MG5mPkWWRGRPYKcVOiIUNvuXAaDr2RJO74FZ0Vy0M=","subject":"CN=Volusion\\, Inc. DV SSL CA - G5,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEc1","whitelist":false,"attachment":{"hash":"d600675b0ea244526a7e982b0b42e29a9e2f8c443783402839710f9d61aa039d","size":1780,"filename":"0qaE-lR_HlMyGUft-kaWwHccbGBGkL_WTsxQSJfcsSY=.pem","location":"security-state-staging/intermediates/7aa3b67a-7df3-4fce-87db-ff1f1ed65a32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0qaE+lR/HlMyGUft+kaWwHccbGBGkL/WTsxQSJfcsSY=","crlite_enrolled":false,"id":"0a95c72f-274f-4fd6-82c2-b58fc7d5898c","last_modified":1562025065214},{"schema":1562025063738,"derHash":"DagZ5S3YXGv8iJljXIvbtq8PtPKDBK4R22eaZ+q2jtU=","subject":"CN=Gehirn Managed Certification Authority - RSA Code Signing,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMUIwQAYDVQQDEzlHZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBDb2RlIFNpZ25pbmc=","whitelist":false,"attachment":{"hash":"35d2dd8a48c50a74aef445ab0ec7bae08b2819039adc788c1de3b36cf7650cff","size":2146,"filename":"5rb709u6Spj2XvBxL9BirCoj9Rgkne_qaJSTgc_p_BE=.pem","location":"security-state-staging/intermediates/f20a11f5-df0f-477e-a442-c14708d9220b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rb709u6Spj2XvBxL9BirCoj9Rgkne/qaJSTgc/p/BE=","crlite_enrolled":false,"id":"7c6dfd39-8b1c-4df2-8ef3-b8c4f355d6db","last_modified":1562025064478},{"schema":1562025062950,"derHash":"z3z6T528y8ptIO/evq1OFzs052vaHrHmGfROBulfwgg=","subject":"CN=Wells Fargo Public Trust Certification Authority 01 G2,OU=Organization Validated TLS,O=Wells Fargo & Company,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVV2VsbHMgRmFyZ28gJiBDb21wYW55MSMwIQYDVQQLExpPcmdhbml6YXRpb24gVmFsaWRhdGVkIFRMUzE/MD0GA1UEAxM2V2VsbHMgRmFyZ28gUHVibGljIFRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDAxIEcy","whitelist":false,"attachment":{"hash":"6a95abe84c8fbfe5c918a8ab12dc0a36ee395740e96f9b6ac44f84ce7b6f2fd0","size":1727,"filename":"piL8cJbKkJ2PJeful08_TUBtZu6QcnuC-5qgNu13n_c=.pem","location":"security-state-staging/intermediates/997b2303-b010-4dfd-b758-6970b5ab0dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"piL8cJbKkJ2PJeful08/TUBtZu6QcnuC+5qgNu13n/c=","crlite_enrolled":true,"id":"a1e2fd83-de14-4ea7-89a4-a885aa53e074","last_modified":1562025063730},{"schema":1562025062205,"derHash":"/x4NIzGWt+wgvt/GWYjgrhmF7GrDMqea3/5xuGvAIIo=","subject":"CN=Trustwave Organization Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG1MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE9MDsGA1UEAxM0VHJ1c3R3YXZlIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"c4e85dd715d693fa9930a447454ded3d627e3d3b3b286d7920644bb09c1f9485","size":1788,"filename":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=.pem","location":"security-state-staging/intermediates/47da45ba-e89b-4a33-9469-9f4ccb00099f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=","crlite_enrolled":true,"id":"146dea34-1807-4e59-b4c6-47e194cb050a","last_modified":1562025062941},{"schema":1562025061470,"derHash":"ypcck2xpm8XWpgnSUp+QOmD24UGizxK+cjE9pQymThc=","subject":"CN=Entrust Certification Authority - L1C,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFD","whitelist":false,"attachment":{"hash":"e336697d6d6d247a3534a773c8f042c58cc674921c708305291fc08c2c8f71c1","size":1780,"filename":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS-Ui0bQ94=.pem","location":"security-state-staging/intermediates/05273d59-b2eb-4c09-919e-6bb3e8f76735.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS+Ui0bQ94=","crlite_enrolled":false,"id":"173e072b-5593-4d2c-a599-a3f87cc0518b","last_modified":1562025062198},{"schema":1562025059950,"derHash":"mxby9oDXxL1qZ/YJNA2mQWq/nkPxMmsBuYgZInHQtfI=","subject":"CN=TWCA Secure SSL Certification Authority,OU=Secure SSL Sub-CA,O=TAIWAN-CA,C=TW","subjectDN":"MG8xCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExGjAYBgNVBAsTEVNlY3VyZSBTU0wgU3ViLUNBMTAwLgYDVQQDEydUV0NBIFNlY3VyZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"acd717a163c1e31ec674bb2953f2f16be424838b5d36e703984df5d77c80d023","size":2032,"filename":"8hqbhsMMFPaPA8t81pxqFer9-neHBcQvO7-TAKjWkb0=.pem","location":"security-state-staging/intermediates/264eee83-19f9-4406-ab9f-ae5fc55e9a70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8hqbhsMMFPaPA8t81pxqFer9+neHBcQvO7+TAKjWkb0=","crlite_enrolled":true,"id":"2535f8ba-07ba-4b54-85a8-742db433036d","last_modified":1562025060710},{"schema":1562025058467,"derHash":"eUxj2yRLpz+yhvFdq40MpUJVCDgemIRJVOY4I7tdf3Q=","subject":"CN=TERENA Code Signing CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEkMCIGA1UEAxMbVEVSRU5BIENvZGUgU2lnbmluZyBDQSAzIEcz","whitelist":false,"attachment":{"hash":"67d12a6df588120ded0c554ece180c84351d42fc41dbf982b6948dab2df22467","size":1597,"filename":"FeQyg5uKifHhVqnOqFJSwfGgb8uYTvS8cKI3bV75nCc=.pem","location":"security-state-staging/intermediates/62b75d9a-a2dd-494d-a88d-c787419e47d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FeQyg5uKifHhVqnOqFJSwfGgb8uYTvS8cKI3bV75nCc=","crlite_enrolled":false,"id":"539ffd44-f8ec-443f-8e22-8157ceeced08","last_modified":1562025059208},{"schema":1562025056217,"derHash":"8crKarI1CnZowT5BlgkIaB2vzH42jcuNR/7PljE5BIE=","subject":"CN=TrustAsia ECC OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"6c1475f6577a7d8b8cd4032290f9d3b4f16ef261f5dea618390de753433264ba","size":1435,"filename":"Gk60bmqo_Mr2nOHuGjR4JqFa8B4v-ZsjwYEWTGOxLZ8=.pem","location":"security-state-staging/intermediates/80dd276f-7f90-4ae3-bab0-8c263d2a1ebf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gk60bmqo/Mr2nOHuGjR4JqFa8B4v+ZsjwYEWTGOxLZ8=","crlite_enrolled":true,"id":"63b7bdc2-0b6c-4e17-a4de-f25eb0e600ee","last_modified":1562025056958},{"schema":1562025054736,"derHash":"YaAep+jYAWzO+S/xPj2+CC4HecTLZL9vDDFiWNYhD1w=","subject":"CN=Postecom CS5,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT","subjectDN":"MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNQ==","whitelist":false,"attachment":{"hash":"f73449e65874ddaf76a68ad4ca913f3ef07165a4119dcb650289f8ff2ba6de0e","size":1821,"filename":"S7BcBDWMjWvsvh-sjH2B5aN-jXOOiQoUlhVMqtpLSWw=.pem","location":"security-state-staging/intermediates/cdd87641-44fd-450b-9842-0b4bacada09c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S7BcBDWMjWvsvh+sjH2B5aN+jXOOiQoUlhVMqtpLSWw=","crlite_enrolled":false,"id":"89689b27-7f23-4f31-a04c-fef27fbc6e21","last_modified":1562025055469},{"schema":1562025053217,"derHash":"1B0jxRVZ9l5cIlA9enq/XNll7DnGHGmKfZjXl69we0g=","subject":"CN=QuoVadis PKIoverheid Burger CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMzAyMzc0NTkxLDAqBgNVBAMMI1F1b1ZhZGlzIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"c7a9f074902a6aa68cc5daf09ea2342f7c79943b0a12ce3c81b74e5b11a70d93","size":2515,"filename":"yXbbq97SU3naAOm_9b7Z3abjalu8evwL90mvR5tYrxI=.pem","location":"security-state-staging/intermediates/31886e5b-8fc9-43a9-be21-dedceb3da392.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yXbbq97SU3naAOm/9b7Z3abjalu8evwL90mvR5tYrxI=","crlite_enrolled":false,"id":"6ff3e434-3089-4258-9de6-40967e5f4132","last_modified":1562025053958},{"schema":1562025050938,"derHash":"RN/NLFcxEOdL9OhZA1lfZgZQ7ZJbcwZULFToc5ZnHwM=","subject":"CN=Entrust Timestamping CA - TS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIGyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSYwJAYDVQQDEx1FbnRydXN0IFRpbWVzdGFtcGluZyBDQSAtIFRTMQ==","whitelist":false,"attachment":{"hash":"577dbd9da74652ee25974192c61a23516212a969fc34528add1fcc80925bd074","size":1821,"filename":"2ZRlUMP6KnCWtb1kDwzUvFMy7HFk7d75zoOnwZikIso=.pem","location":"security-state-staging/intermediates/d1400fc2-ba20-411a-a9ec-82f2036a0d41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZRlUMP6KnCWtb1kDwzUvFMy7HFk7d75zoOnwZikIso=","crlite_enrolled":true,"id":"2e96e934-bc60-4e45-b1ae-6ac3cd4d7192","last_modified":1562025051685},{"schema":1562025050182,"derHash":"WkmxWuYP9ifaJyqHQ9ZxYrrKEJYWggMhOs+CJ69MSUI=","subject":"CN=Herritar eta Erakundeen CA - CA de Ciudadanos y Entidades (3),OU=NZZ Ziurtagiri publikoa - Certificado publico SCI,O=IZENPE S.A.,C=ES","subjectDN":"MIGnMQswCQYDVQQGEwJFUzEUMBIGA1UEChMLSVpFTlBFIFMuQS4xOjA4BgNVBAsTMU5aWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0kxRjBEBgNVBAMTPUhlcnJpdGFyIGV0YSBFcmFrdW5kZWVuIENBIC0gQ0EgZGUgQ2l1ZGFkYW5vcyB5IEVudGlkYWRlcyAoMyk=","whitelist":false,"attachment":{"hash":"d85bcef74f09e1dbd2ce16da48da2ee5fc7a20a7fff9caa5dc49af6709f5f48c","size":2576,"filename":"bMhIINBfI65xm4qrUlaPfhKn2U2zsWEE7sOwUjKeoT8=.pem","location":"security-state-staging/intermediates/d89eb328-693b-4b24-90f8-34bf2e499dca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bMhIINBfI65xm4qrUlaPfhKn2U2zsWEE7sOwUjKeoT8=","crlite_enrolled":true,"id":"fb272741-7da4-469b-ab59-52ece6f412f9","last_modified":1562025050930},{"schema":1562025048669,"derHash":"O21wEzGoy4CUQ+QqcyutZ18iWxXMQ5rPJqCVh8iF7P0=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"dd8428516f7ee04d365e81abc17f14b27db1dd65e497858fb5076ee6a42789d1","size":1544,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/c43cbcd9-1879-4ef8-a529-ade872f5c07d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"76183d88-9a69-4233-a9d4-377d8af9daef","last_modified":1562025049405},{"schema":1562025045660,"derHash":"IR3fUFkimzV3dg1iPVFI25Ly0FJupTA+fuoDANn6/z8=","subject":"CN=GeoTrust SSL CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"4b9e0e629f273674af2b982675d640bf5da8b3cc39e14022da35f88d46659b08","size":1492,"filename":"QoTQx7p3k0wVLzWrcAjFS6UajzFlS4Lr9rtoIZxCk4g=.pem","location":"security-state-staging/intermediates/c774e78c-fcab-4c20-88c0-0ac1d943184e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QoTQx7p3k0wVLzWrcAjFS6UajzFlS4Lr9rtoIZxCk4g=","crlite_enrolled":false,"id":"eefd72ee-9737-4b19-895e-8b65b055fa5f","last_modified":1562025046407},{"schema":1562025044898,"derHash":"VIN+97WsSqI2BqFe8w3kbpu34j5g9u1PJhIJK5Ttxo8=","subject":"CN=Data Management Intermediate Certificate Authority,OU=Fresenius Kabi USA,O=Fresenius Kabi AG,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRnJlc2VuaXVzIEthYmkgQUcxGzAZBgNVBAsTEkZyZXNlbml1cyBLYWJpIFVTQTE7MDkGA1UEAxMyRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"e31d3bb304fdcef75199ff47761dd7a91e1a654cedec5485da203640dc0eee39","size":1748,"filename":"6tOYk51VDHXklgQiMTHvUHAqQsHRj8do_RweZi812do=.pem","location":"security-state-staging/intermediates/941016f3-c0dc-47ea-8440-1a189d509dbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6tOYk51VDHXklgQiMTHvUHAqQsHRj8do/RweZi812do=","crlite_enrolled":true,"id":"1e9a1998-a52f-498c-8217-0418e4aaeb12","last_modified":1562025045652},{"schema":1562025043405,"derHash":"umoMEXDhxzI4YHSbXnsO02WXXY/JB0CxXXD4Q6I5SUI=","subject":"CN=Secure Site Pro CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElNlY3VyZSBTaXRlIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"66b49fd854d0f3af5d909f8ce76dcf4b94b573305dd98b683cde0582e3dfb8c4","size":1674,"filename":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem","location":"security-state-staging/intermediates/c371d115-079f-4788-8e8b-6a4ee2c482b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=","crlite_enrolled":true,"id":"283d1332-2aae-4370-8412-97de93ae7f53","last_modified":1562025044153},{"schema":1562025041146,"derHash":"ayMo5//1mLKt+Qt/PqQrRfpgbXjisRe31g6Z6CjPdWU=","subject":"CN=SecurityMetrics DigiCert EV CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMScwJQYDVQQDEx5TZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgRVYgQ0E=","whitelist":false,"attachment":{"hash":"336f835546bcbd7bfe88c38d0c674fd47a6a5c5be1a5486d4daa23f269db4fcd","size":2316,"filename":"f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=.pem","location":"security-state-staging/intermediates/7c79f9fa-67cb-4c11-82e6-64052aec3db6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=","crlite_enrolled":false,"id":"628f9c50-cfa7-4a7f-b0c3-3351d5f5cf3a","last_modified":1562025041897},{"schema":1562025035890,"derHash":"ZJkbaYayLPAGSdr4+pIu2aFNyDBcznzYNyy/SGXmrzU=","subject":"CN=InCommon RSA Standard Assurance Client CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEyMDAGA1UEAxMpSW5Db21tb24gUlNBIFN0YW5kYXJkIEFzc3VyYW5jZSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"5516a3bdf31fbe862f6d40c679b1e72adff036e89dc6da16d3f805c225393b32","size":2146,"filename":"eMuPzKB_rex8LWz8BNirHFcDvwMQzLyJm8N3Lt63-H0=.pem","location":"security-state-staging/intermediates/993a6a3b-3703-47e1-b7d3-1b59393d7302.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eMuPzKB/rex8LWz8BNirHFcDvwMQzLyJm8N3Lt63+H0=","crlite_enrolled":true,"id":"f5dcc1de-de9d-438d-96d4-2168936f35d2","last_modified":1562025036647},{"schema":1562025035117,"derHash":"RCLpY+5TzVjMn4XNQL9f/sAJX98aFUU1ZhwcBrytxps=","subject":"CN=RapidSSL TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"69d032f5f19ec96ac1d0f6f0b439e8d2c2bfd00ab74cdabf88312932bac1b34f","size":1691,"filename":"E3tYcwo9CiqATmKtpMLW5V-pzIq-ZoDmpXSiJlXGmTo=.pem","location":"security-state-staging/intermediates/375bde0a-beb6-483a-9339-61f13f530c25.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E3tYcwo9CiqATmKtpMLW5V+pzIq+ZoDmpXSiJlXGmTo=","crlite_enrolled":true,"id":"59d85ee5-bf80-40cd-a805-345268365f1f","last_modified":1562025035883},{"schema":1562025032835,"derHash":"qOuP4Jnphs1iLWIRX+xzCnBUIvTTRlns8XvdbSZe+WQ=","subject":"SERIALNUMBER=201724,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI0","whitelist":false,"attachment":{"hash":"c362bc91d6eb297cf53c9ce9a9b934af9e305ffa3e0cc90c664c495fee09c6ff","size":2402,"filename":"YTmDkSKXvIVulXo3XSSMwIrhUc6vs-5me4IYjfUANq4=.pem","location":"security-state-staging/intermediates/c1485633-198e-4497-9bc4-30b5e3e29c77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YTmDkSKXvIVulXo3XSSMwIrhUc6vs+5me4IYjfUANq4=","crlite_enrolled":false,"id":"f7154206-f444-4a55-bee3-ce319dda62c2","last_modified":1562025033589},{"schema":1562025031339,"derHash":"ghzFXOfsXHT+u0L2JOtqNsR4IVox7Wfjz3I6Z+jHXro=","subject":"CN=cPanel\\, Inc. Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMS0wKwYDVQQDEyRjUGFuZWwsIEluYy4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"cc5ca55f55fe8db39161538d89c9181ab530eb451e3e3b5363c71f91b98190bd","size":2121,"filename":"hOF1upiO-xevnDEQ13g3aY3M3Uqa44RN5rVlwvU2WC8=.pem","location":"security-state-staging/intermediates/5083a119-aa5f-40e8-ad0e-86d5bc86d01f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hOF1upiO+xevnDEQ13g3aY3M3Uqa44RN5rVlwvU2WC8=","crlite_enrolled":true,"id":"7e0a7eb1-8624-47dc-a0e1-488b57b12c42","last_modified":1562025032080},{"schema":1562025030594,"derHash":"RbKjpNBu5lLpQPq8pc2HIcH7f+7Yt1sMx/Bn4dJuLP4=","subject":"CN=TrustAsia ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTVHJ1c3RBc2lhIEVDQyBDQSBHOQ==","whitelist":false,"attachment":{"hash":"bd06281ba8b65c487bcaf02e8c67fced703516ea1e968c14dad4048435006cb1","size":1158,"filename":"E_JWIAleox34urTjQsyJItGCeb7utaBK4A4Q4BxWn7Q=.pem","location":"security-state-staging/intermediates/53fd78cb-a50d-4f97-aae6-46787d4f5ee8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E/JWIAleox34urTjQsyJItGCeb7utaBK4A4Q4BxWn7Q=","crlite_enrolled":false,"id":"2c378a94-8c79-4f69-9f15-f546474cf1e0","last_modified":1562025031331},{"schema":1562025026869,"derHash":"Y0wIQiwQQdC0OZj4cgnfyt+ALReYKkGINkYQ47JwIuY=","subject":"CN=TrustOcean EV SSL CA - ECC - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=ECC Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gRUNDIC0gMjAxOQ==","whitelist":false,"attachment":{"hash":"c519d329637101adf8248c369a8ab756f60797499dbf135d441c9e2ce13d0271","size":1488,"filename":"Vc2_CgGqt67rbPDmVebdbcjW8DdUmegpdRVNRHMHKK8=.pem","location":"security-state-staging/intermediates/500b6284-ebaf-43a0-9c1b-6ef5e20dd053.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vc2/CgGqt67rbPDmVebdbcjW8DdUmegpdRVNRHMHKK8=","crlite_enrolled":false,"id":"bbdc2c26-85fe-4475-95d7-a38dbd368c3e","last_modified":1562025027604},{"schema":1562025022401,"derHash":"Jb/bHF/izOBR7G378rsk54yS+WmxuzeGfa7fk9Gnrn4=","subject":"CN=SHECA Extended Validation SSL CA,O=UniTrust,C=CN","subjectDN":"MEsxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEpMCcGA1UEAwwgU0hFQ0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"42b647c52ed57012729814fa390a3a85ee801287cea6820f002c3e2d0f8cb467","size":1959,"filename":"J1sjCSbhps4X1wNpt4UhFDB8y_McQPnMa3S-sE4q0u0=.pem","location":"security-state-staging/intermediates/270af4bc-d20d-421d-baa5-121348e70203.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J1sjCSbhps4X1wNpt4UhFDB8y/McQPnMa3S+sE4q0u0=","crlite_enrolled":false,"id":"d83176fc-a4d2-461d-84e7-446080d64684","last_modified":1562025023133},{"schema":1562025021661,"derHash":"vbeqKPFk5LwV1pIHM7Ij7ZjlUiCj5W87Hs/QTofTC3E=","subject":"CN=InCommon ECC Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBFQ0MgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"bd2692889db0e772b2adde17ac8a48c54a2d7f098304383c50e831df081e8097","size":1293,"filename":"8Ped1-_2NPqUB2Q-UJri8oBJaaIrldtkbw8LmkGTkrE=.pem","location":"security-state-staging/intermediates/c7b87f92-6e81-430b-96fe-25ebc26395bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Ped1+/2NPqUB2Q+UJri8oBJaaIrldtkbw8LmkGTkrE=","crlite_enrolled":true,"id":"f7abff5f-fd5e-4449-bd72-971145c852f0","last_modified":1562025022393},{"schema":1562025020924,"derHash":"qfjQ7GD3LYrIefbjzDgOUACYvACAwHrFOfrmglQ//AI=","subject":"CN=UbiquiTLS\u2122 DV ECC Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAwwdVWJpcXVpVExT4oSiIERWIEVDQyBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"1cf7f75e73f68c6177fe790e1d4a9c2fe8833648fe4b568093a3cd04201f3bce","size":1293,"filename":"PCnX_sRleYJP1z0cO3yKQbR6-NN9ywVZIPJzzytrEH8=.pem","location":"security-state-staging/intermediates/322e50ca-ba44-4200-89bd-bdf704bce13c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PCnX/sRleYJP1z0cO3yKQbR6+NN9ywVZIPJzzytrEH8=","crlite_enrolled":false,"id":"da8c9975-55f9-4df4-8621-e6a574681b68","last_modified":1562025021653},{"schema":1562025017923,"derHash":"d/6HahxHY0n165rpv1P3gUoK5BFWJmfFi37SeGnFQJE=","subject":"CN=Symantec Class 3 ECC 384 bit Extended Validation CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAMTM1N5bWFudGVjIENsYXNzIDMgRUNDIDM4NCBiaXQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"4d67dc1e033fc9d483ce72d6b2665130f2837b5d642207e8d127e5fa9124e5fb","size":1451,"filename":"Rj9-JX3TAMGFOmCkoBiFCNUGzpcbKCjKv1dH5mqR0wo=.pem","location":"security-state-staging/intermediates/0c746153-158f-4efa-a07b-d38f5298431c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rj9+JX3TAMGFOmCkoBiFCNUGzpcbKCjKv1dH5mqR0wo=","crlite_enrolled":false,"id":"f5db4a59-ac54-49e3-b94d-2b61159c94ce","last_modified":1562025018653},{"schema":1562025017174,"derHash":"Rh+0YuUdVKWaBBzVplF2CuhHrhwnwQOIfVLsCV9o5zw=","subject":"CN=Oracle RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMRkwFwYDVQQDExBPcmFjbGUgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"c6475b4f4c4fecb05c8501f5cc0843d9255b24c61d4ff8f2e5c97fbc6b780faf","size":1687,"filename":"5YjN9RnyFnf-H3-j50ooFCdGoEN44UPUyAMy2UFnZYY=.pem","location":"security-state-staging/intermediates/12c5bd58-7852-4637-a5cb-95ca447bc7e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5YjN9RnyFnf+H3+j50ooFCdGoEN44UPUyAMy2UFnZYY=","crlite_enrolled":false,"id":"0ee8a5b9-c069-43f3-ada0-e50684926783","last_modified":1562025017915},{"schema":1562025016420,"derHash":"S5bvoShnuKvyrZtO2/op2eCJsYO7XLfIG4OT+mlr0ME=","subject":"SERIALNUMBER=201901,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDE=","whitelist":false,"attachment":{"hash":"19844f98179cd99f2c77dee6696880e76d7b2450ccdd651197a6ff8fd22b5edd","size":2337,"filename":"42J41ut5RRKEnkyB1fMHY7UKcEEByr5294Y5ffs_a6Q=.pem","location":"security-state-staging/intermediates/30bef80e-101a-4453-bd8d-ac9065a9f125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"42J41ut5RRKEnkyB1fMHY7UKcEEByr5294Y5ffs/a6Q=","crlite_enrolled":false,"id":"93b323b4-b4ee-4918-b6e5-97943a6135df","last_modified":1562025017166},{"schema":1562025015677,"derHash":"LQaxtec1DZSaC9WAU9/tbwJgrlMV1BMqDMg/8Ilck8o=","subject":"CN=University of Texas Health Science Center at San Antonio RSA CA,O=The University of Texas Health Science Center at San Antonio,L=San Antonio,ST=TX,C=US","subjectDN":"MIHBMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxFDASBgNVBAcTC1NhbiBBbnRvbmlvMUUwQwYDVQQKEzxUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBIZWFsdGggU2NpZW5jZSBDZW50ZXIgYXQgU2FuIEFudG9uaW8xSDBGBgNVBAMTP1VuaXZlcnNpdHkgb2YgVGV4YXMgSGVhbHRoIFNjaWVuY2UgQ2VudGVyIGF0IFNhbiBBbnRvbmlvIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"b5fb6720dcb740e7f089749a940f3ceaa8902143d027d65eff3d9013fa534d8e","size":2231,"filename":"nuC4L1p-OVZKcOe0o9CULKzfd9QuBwKRkV8NDZkcSAg=.pem","location":"security-state-staging/intermediates/e6c015a5-266c-46ba-907e-17bb1e4fc7c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nuC4L1p+OVZKcOe0o9CULKzfd9QuBwKRkV8NDZkcSAg=","crlite_enrolled":false,"id":"8bda349b-e57d-4195-bbfb-0da391a25173","last_modified":1562025016412},{"schema":1562025014914,"derHash":"8y3q8iznJGYfU9UocxGv8lQes47K9J3Yd7lAI+OhGx8=","subject":"CN=SecurityMetrics DigiCert CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMSQwIgYDVQQDExtTZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgQ0E=","whitelist":false,"attachment":{"hash":"0970375d7d27699620d3d11d4a82a61d6886f73e51c1c1866db791381de6880f","size":2312,"filename":"m-VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=.pem","location":"security-state-staging/intermediates/291f4913-8df6-4e94-90b5-40989c03e635.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m+VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=","crlite_enrolled":false,"id":"27307236-88cc-41cc-9958-6934903e04cc","last_modified":1562025015669},{"schema":1562025013420,"derHash":"T/QE8C4s0AGI8V0cAPS20eOLWjlc+FMU6uuoVbamS3U=","subject":"CN=Microsoft IT TLS CA 1,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgMQ==","whitelist":false,"attachment":{"hash":"dce0811c755bec02d9ace622121eef2a9874cd68090b416d4540e1b26ea3b012","size":2036,"filename":"xjXxgkOYlag7jCtR5DreZm9b61iaIhd-J3-b2LiybIw=.pem","location":"security-state-staging/intermediates/b826eaa3-3ebe-4464-bcb2-be9746c24afd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xjXxgkOYlag7jCtR5DreZm9b61iaIhd+J3+b2LiybIw=","crlite_enrolled":true,"id":"4dca8bde-78f0-4bc1-85cc-35b0938a893a","last_modified":1562025014163},{"schema":1562025012668,"derHash":"Ke2X6fDrxVWu4P2KN1niFsmHoKQLPvQvEbTlKW3w+38=","subject":"SERIALNUMBER=201704,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNA==","whitelist":false,"attachment":{"hash":"05f39765de9a3b2c8e30da66ee7955b8b5c1c1e49f4d56492af3ea16cc171541","size":2154,"filename":"ABkwhuUeukpacod9kYjopDaXWUb8vzCg9Sj51UrwBKY=.pem","location":"security-state-staging/intermediates/10b90d8e-2ee1-4303-8ce4-db7d6b0ca543.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABkwhuUeukpacod9kYjopDaXWUb8vzCg9Sj51UrwBKY=","crlite_enrolled":false,"id":"767b3e09-f0c8-4aea-baa1-cf3c6d1f147c","last_modified":1562025013412},{"schema":1562025007428,"derHash":"klO/tmjz50OlJeSLX3UKimYDX4Bil8JfgTTcisljW9g=","subject":"CN=JCSI TLSSign Public CA,O=Cybertrust Japan Co.\\,Ltd.,C=JP","subjectDN":"MFIxCzAJBgNVBAYTAkpQMSIwIAYDVQQKExlDeWJlcnRydXN0IEphcGFuIENvLixMdGQuMR8wHQYDVQQDExZKQ1NJIFRMU1NpZ24gUHVibGljIENB","whitelist":false,"attachment":{"hash":"b6c1ba4e4707652fffa0f770954eae8f4d1bb58417950efc707c48d89d30379b","size":2044,"filename":"qU78sJ3fTvtBYPBxk_PfpIZWlA7ptK9MTP1UDx9LWdc=.pem","location":"security-state-staging/intermediates/27590e7a-01bd-4184-a4db-a987fa097a73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qU78sJ3fTvtBYPBxk/PfpIZWlA7ptK9MTP1UDx9LWdc=","crlite_enrolled":false,"id":"2038b122-978e-4534-b273-996f254ac1a8","last_modified":1562025008171},{"schema":1562025006676,"derHash":"ini5Zsc9dpBAwagcMhaM74ubnpbswtM8xKu1oM+MHGc=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzE=","whitelist":false,"attachment":{"hash":"bc63ae4e19f31debb6845226b79533d07f1386d720b838d6942383f100b944b4","size":1748,"filename":"oL6bQvdAH7Gl51lEx4-NJT-zVM6WKnbdLvbYv351Fbs=.pem","location":"security-state-staging/intermediates/d77d5ade-5702-4224-8823-39f280c0be1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oL6bQvdAH7Gl51lEx4+NJT+zVM6WKnbdLvbYv351Fbs=","crlite_enrolled":false,"id":"38109b7d-ce77-4cd9-8bf6-6b5796a2ed2c","last_modified":1562025007420},{"schema":1562025005179,"derHash":"LWArHxZtYxba/Ua0se3W3PxU0q+KlEvjWIWP1QSqoWs=","subject":"CN=Care360 Direct Intermediate CA,OU=Care360 Direct Messaging,O=Quest Diagnostics Care360,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlRdWVzdCBEaWFnbm9zdGljcyBDYXJlMzYwMSEwHwYDVQQLExhDYXJlMzYwIERpcmVjdCBNZXNzYWdpbmcxJzAlBgNVBAMTHkNhcmUzNjAgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"394755e945b33d461689f0afa1f1b626c96ad37e6df57aef74a65fd0c84c83db","size":2211,"filename":"4Vc-jglRQEtySvKvXdV2CykmL03fYouL0fdSgW7wqJQ=.pem","location":"security-state-staging/intermediates/532713a0-fee2-4438-97d6-ee210e310465.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Vc+jglRQEtySvKvXdV2CykmL03fYouL0fdSgW7wqJQ=","crlite_enrolled":false,"id":"7f28c5f6-4818-447e-93d8-79fc00dc0c4a","last_modified":1562025005925},{"schema":1562024994614,"derHash":"pDSq5OFaVRnpsRH9COwZD9Kt8Tu+MIFcbhYGVVyzFFA=","subject":"CN=SwissSign EV Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"ME4xCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKDAmBgNVBAMTH1N3aXNzU2lnbiBFViBHb2xkIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"6adec53afaeac81fd0e85e675219c92a638f9f249f381dfac8c6f8f4b591b137","size":2389,"filename":"mDKR5ptpp7PqVUefxx2Ftq5ymsEuzCEg-EVrLOrQFB8=.pem","location":"security-state-staging/intermediates/0cec1d67-bead-4bb6-85d5-a11312ecfaf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mDKR5ptpp7PqVUefxx2Ftq5ymsEuzCEg+EVrLOrQFB8=","crlite_enrolled":true,"id":"ef05a6b5-bda6-4917-a51a-a6ce6523d866","last_modified":1562024995347},{"schema":1562024993127,"derHash":"wUkuup9JLsv21OTxHTm8GpATYz/Ae17pYwHXrUY7128=","subject":"SERIALNUMBER=201911,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEx","whitelist":false,"attachment":{"hash":"d093c41f1c66976da5a572a9fb9b4b9208f861756be1e55d561bddec0254d48d","size":2333,"filename":"jRLIyyb8zq9aIC8U6liq7FbbVW4DdfKK62nTd3qe12w=.pem","location":"security-state-staging/intermediates/488eb0e2-16c6-4962-8e20-ebbc1a7c6761.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jRLIyyb8zq9aIC8U6liq7FbbVW4DdfKK62nTd3qe12w=","crlite_enrolled":false,"id":"99c80d37-3b7e-41e4-93f6-5362973877d1","last_modified":1562024993860},{"schema":1562024988613,"derHash":"4l3pcKqLaFzfVUF4l/Zd5kxjpV1h7p5LgwJh3Pu//7Q=","subject":"CN=MRO Direct Intermediate CA,OU=MRO HIE Solutions,O=MRO Corporation,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9NUk8gQ29ycG9yYXRpb24xGjAYBgNVBAsTEU1STyBISUUgU29sdXRpb25zMSMwIQYDVQQDExpNUk8gRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"403c39acc06a843ef717880f0c744c3f6ac52dd30b6649cca22a386369ec3ecd","size":2178,"filename":"MJuewyCldXsYBFl3uqjzMgQjNypJNP7P7ZPLxer309A=.pem","location":"security-state-staging/intermediates/2dfbb453-65fa-4e13-833b-1cec6684dbb7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MJuewyCldXsYBFl3uqjzMgQjNypJNP7P7ZPLxer309A=","crlite_enrolled":false,"id":"0d7367cd-10af-416d-b55b-0ed7e9bd4837","last_modified":1562024989346},{"schema":1562024987874,"derHash":"xW8PKGYYweew4RLJe57pb+tNceeUlsFR+h/oqM69Bs0=","subject":"CN=NetLock CodeSign CA,OU=Certification Services,O=NetLock Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTmV0TG9jayBMdGQuMR8wHQYDVQQLDBZDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMRwwGgYDVQQDDBNOZXRMb2NrIENvZGVTaWduIENB","whitelist":false,"attachment":{"hash":"a44be497ab772a1eb6e68b4bcd8d66f873262b6f8c218a461eb1a2916e56e4b6","size":2109,"filename":"e9x__uYSnevFMntPG5wGBZVLvAL83lTxZlVS9aGJ_-I=.pem","location":"security-state-staging/intermediates/3e50c772-6e6b-44a6-a9ca-2b159d8e0abb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e9x//uYSnevFMntPG5wGBZVLvAL83lTxZlVS9aGJ/+I=","crlite_enrolled":false,"id":"5f1127b1-8e1f-4f9e-9512-92bcde094385","last_modified":1562024988606},{"schema":1562024987134,"derHash":"Cziq5n+j6fbTIP4QuVM9i3roJkNf/DsWYC+HtpQszCQ=","subject":"CN=The University of Texas at Arlington RSA CA,O=The University of Texas at Arlington,L=Arlington,ST=TX,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEjAQBgNVBAcTCUFybGluZ3RvbjEtMCsGA1UEChMkVGhlIFVuaXZlcnNpdHkgb2YgVGV4YXMgYXQgQXJsaW5ndG9uMTQwMgYDVQQDEytUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBhdCBBcmxpbmd0b24gUlNBIENB","whitelist":false,"attachment":{"hash":"2e87cf020f45d832fc00b304e12e590eb787d2539a48b3bc2f6aff63a1a3cf09","size":2170,"filename":"wT2LAU5h7_aI1jsj78C99RVlZNnZPvQSzQqLGcbu7Uk=.pem","location":"security-state-staging/intermediates/cc09a6bf-8ff9-4fb9-ba26-61a14b27a987.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wT2LAU5h7/aI1jsj78C99RVlZNnZPvQSzQqLGcbu7Uk=","crlite_enrolled":false,"id":"f6f27ed3-c922-4dcb-b829-40b0606e9b95","last_modified":1562024987867},{"schema":1562024986357,"derHash":"g/LOgfLybg7KtSqVk16bQzzxBP0PORQ9ZV7D1M02tW8=","subject":"CN=Fnet CA,O=Fuji Xerox,C=JP","subjectDN":"MDQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MRAwDgYDVQQDEwdGbmV0IENB","whitelist":false,"attachment":{"hash":"448a08a68d7ed7754d89d12a72062cbf75a30c4bdeeb77d37613086121b56eb9","size":1451,"filename":"puqOSkJtbeGTV0fhGgxvlO9lSKK1aR1y6oqyJFioMi4=.pem","location":"security-state-staging/intermediates/d5ef565a-81ca-48d8-a11a-721cb32eb894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"puqOSkJtbeGTV0fhGgxvlO9lSKK1aR1y6oqyJFioMi4=","crlite_enrolled":false,"id":"404ee307-3112-4ff7-89cb-5fb71099a17f","last_modified":1562024987126},{"schema":1562024983335,"derHash":"Sv/k/vOUZNF4jGYK9ZHV5gGyYcSBHfCj3Z1hyv6OXtg=","subject":"CN=TrustAsia EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgRVYgVExTIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"9a34bc6ed9a54f81e18afe77e80e21229b781d54bc55db04519ecea2fb3e30f4","size":1658,"filename":"JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem","location":"security-state-staging/intermediates/76f83317-0be3-4d36-a0dc-2b78af79a99f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=","crlite_enrolled":true,"id":"75933b65-c630-416f-89b3-52bbbcf4d983","last_modified":1562024984092},{"schema":1562024982596,"derHash":"9ybIiRM2sbl8vIb1lvEmf8GAFSEiVz521RRafGTiz/c=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"4acbc7350c18a439fcd9681ed171a05b0aba786ddff1a08ac60f669b1f7794a5","size":1910,"filename":"CFimR36T4UVCwZbUriIJlppqe23sbqJ64330exu8p_E=.pem","location":"security-state-staging/intermediates/43af4419-cea4-45e7-84eb-b0074f3bc2fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CFimR36T4UVCwZbUriIJlppqe23sbqJ64330exu8p/E=","crlite_enrolled":true,"id":"a1648fd0-9e8b-4b9c-9d33-48ad6a04d424","last_modified":1562024983328},{"schema":1562024981077,"derHash":"8O5ZFO2UxyUtBYtOOYCK7m+o9izwl0+31tKp3xbjqH8=","subject":"CN=Microsoft IT TLS CA 5,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgNQ==","whitelist":false,"attachment":{"hash":"bc66460eac4ecba1a41893560649ac0a5935b0618344e6870fbfc87ef5c59e56","size":2036,"filename":"RCbqB-W8nwjznTeP4O6VjqcwdxIgI79eBpnBKRr32gc=.pem","location":"security-state-staging/intermediates/92736656-01e9-4228-8ea5-b1cfef7a3342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RCbqB+W8nwjznTeP4O6VjqcwdxIgI79eBpnBKRr32gc=","crlite_enrolled":true,"id":"45047569-986c-460d-82a8-316c641d6f88","last_modified":1562024981814},{"schema":1562024978115,"derHash":"ZVAQN34j5M3+LlLK9YzjDFwDlcxgRvgTvdvgey84VEg=","subject":"CN=KDDI Web Communications Certification Authority,O=KDDI Web Communications Inc.,C=JP","subjectDN":"MG4xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBJbmMuMTgwNgYDVQQDEy9LRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"378ac91ceeae997985a7faae969763fb3d5806a36440e8baeeca771c46b0aa15","size":1646,"filename":"2TEQYmL1HeKriROlREzt-6M8lVW8avv9NztuQOiIHJc=.pem","location":"security-state-staging/intermediates/be8f4741-ecef-4de6-9965-23801913e2a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2TEQYmL1HeKriROlREzt+6M8lVW8avv9NztuQOiIHJc=","crlite_enrolled":false,"id":"c9cc94c9-20c2-4321-9fa0-3872b56b5712","last_modified":1562024978848},{"schema":1562024975124,"derHash":"kbznVEFGkIq0vPnf9/mAZ2VaabDGQuEXoDHNIsfJoO4=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"0aed52ecc835b26d13f5c55cf98dedf45a8623cee6253f8013906f15eabdc316","size":1626,"filename":"-HZ42z-6jzbfrf-8zoB-rhhWo8lWk9UMNlhPseiUpJs=.pem","location":"security-state-staging/intermediates/e15b0493-c6fc-4d99-8375-9654323114dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HZ42z+6jzbfrf+8zoB+rhhWo8lWk9UMNlhPseiUpJs=","crlite_enrolled":true,"id":"de8d47ad-573c-43a2-991b-fc87c4e56b69","last_modified":1562024975861},{"schema":1562024973611,"derHash":"25mk8oTM8Qsm3nt6XWUXJbhXy8hx67MwKNZ7VVEO/Nk=","subject":"CN=Abbott Laboratories Secure Authentication CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xNTAzBgNVBAMTLEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIEF1dGhlbnRpY2F0aW9uIENB","whitelist":false,"attachment":{"hash":"13601b8d2aa24812d2d72f675f124723372e60d0db7dcd9dbd16be20186f8b46","size":1772,"filename":"S-zMrWUPK-hCylswDO1ieeWHUSws1lexaXMxp-YEjWA=.pem","location":"security-state-staging/intermediates/6392bedf-a3cb-40b5-99a3-490d9af06a71.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S+zMrWUPK+hCylswDO1ieeWHUSws1lexaXMxp+YEjWA=","crlite_enrolled":false,"id":"c68bc179-b841-4682-980d-88ac74913ba3","last_modified":1562024974352},{"schema":1562024971359,"derHash":"enfL1FjGKCtA8DN/0ESj5JqJzSexLFM9SDYViKQJ1OE=","subject":"SERIALNUMBER=201916,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE2","whitelist":false,"attachment":{"hash":"43eb426da20061d8e11cdc54684699286087e17729e81f3bf24d6525dd7985e3","size":2333,"filename":"2y31tlf1YoSIRQOCqKCNs6piLK00d-zLVvBxXCTMeP4=.pem","location":"security-state-staging/intermediates/fc5d3e6b-45ce-4919-90c0-55d81d291dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2y31tlf1YoSIRQOCqKCNs6piLK00d+zLVvBxXCTMeP4=","crlite_enrolled":false,"id":"c1ff1c6b-3e3b-420d-9cae-90bcf936a0a3","last_modified":1562024972112},{"schema":1562024970613,"derHash":"OKdSUCLJZYyq/GBgdk/VHGpcW+8jLT5sfkivB6CY3x4=","subject":"CN=Comodo Japan RSA DV CA,O=Comodo Japan\\, Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKQ2hpeW9kYS1rdTEbMBkGA1UEChMSQ29tb2RvIEphcGFuLCBJbmMuMR8wHQYDVQQDExZDb21vZG8gSmFwYW4gUlNBIERWIENB","whitelist":false,"attachment":{"hash":"7754006695792a630cfa6e7a5b8fe4f962d29eee1dd2bbc7b03206053e6f4be5","size":1658,"filename":"oGI3G9oW9P0H6HjREnI-teLBhK_5fC1XowTKkZ9VZXE=.pem","location":"security-state-staging/intermediates/4adec782-7ba7-4345-8a85-84d81c3c9fc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oGI3G9oW9P0H6HjREnI+teLBhK/5fC1XowTKkZ9VZXE=","crlite_enrolled":true,"id":"0e5bba7c-894d-4422-b61d-6d49e9b23b36","last_modified":1562024971351},{"schema":1562024969871,"derHash":"hJZThEmAOcyUWGEDGDA/nM/EUuI2eA+93EdIVn8FoO4=","subject":"CN=GoGetSSL ECC DV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"807962d5b256b434822d5d9ee5e1b629a71afab5fe9af4608367d7743aee656d","size":1244,"filename":"v7s8gnnUIPgE_G0J6878I42tOsH3uq3oEiIBuxWKvb0=.pem","location":"security-state-staging/intermediates/ccba3bfc-711d-4e2e-a31b-afcbae08c836.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v7s8gnnUIPgE/G0J6878I42tOsH3uq3oEiIBuxWKvb0=","crlite_enrolled":true,"id":"3a5b6d43-a56f-44c7-a487-449a4d8e3f0f","last_modified":1562024970606},{"schema":1562024969125,"derHash":"xNGOCljk7/0X7XfIQLYT7xX1UQduqSwrd/ZgmmwlV8c=","subject":"CN=thawte SHA256 Code Signing CA,O=thawte\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xJjAkBgNVBAMTHXRoYXd0ZSBTSEEyNTYgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"7a9762f73747c344e67453177689676cd25a9659658b4626a5d7842d1c01eb29","size":1654,"filename":"ojV9zYWXKz1QGxqVDyQznbwp3_f7lG2Vs-Z5lATJD2M=.pem","location":"security-state-staging/intermediates/8de8ac8a-71bf-46f1-830c-1ec0ce8056a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ojV9zYWXKz1QGxqVDyQznbwp3/f7lG2Vs+Z5lATJD2M=","crlite_enrolled":true,"id":"21e0f087-5d81-48a8-b990-98815b457492","last_modified":1562024969863},{"schema":1562024966122,"derHash":"OcedKkz/4Jxh3mnsFJkdjpXOcTTs9x7weZANCtVHjK0=","subject":"CN=BlackCert\\, Inc. ECC EV Certification Authority,OU=Controlled by COMODO exclusively for BlackCert\\, Inc.,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIG9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMT0wOwYDVQQLEzRDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgQmxhY2tDZXJ0LCBJbmMuMTcwNQYDVQQDEy5CbGFja0NlcnQsIEluYy4gRUNDIEVWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"3e9b2e222d9547e06e86f360ff56f36e2b15cde91ae5eb113a95f14ef5c1f462","size":1431,"filename":"YMJYGd5waNYmUtnRh_uwLFzS5lXUfdRoNphUMGKD7UY=.pem","location":"security-state-staging/intermediates/4174b4d5-c45c-40ea-b665-296b00f2ea1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YMJYGd5waNYmUtnRh/uwLFzS5lXUfdRoNphUMGKD7UY=","crlite_enrolled":false,"id":"6e42b6df-14db-44eb-9daf-29923f5c3a88","last_modified":1562024966861},{"schema":1562024964611,"derHash":"LQvIZWSOoHW6VI6/4WovmR6PlkX/IfZpX4YQeeqeIso=","subject":"SERIALNUMBER=201903,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDM=","whitelist":false,"attachment":{"hash":"88b1a3bb821a4aa6daecaa570343ddee62505d9f82cdfe9acc77cada464e44ae","size":2337,"filename":"TMl7JzGd02XF7Rijnv4x-FJ-6ciY9o6J9WjsDU6WBQE=.pem","location":"security-state-staging/intermediates/67e6e792-85bb-461f-b45f-ad508502c59a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TMl7JzGd02XF7Rijnv4x+FJ+6ciY9o6J9WjsDU6WBQE=","crlite_enrolled":false,"id":"b1e9bced-d3da-4da6-a020-71ab0611072e","last_modified":1562024965358},{"schema":1562024963870,"derHash":"7TyZFGbLxFtf0dooECj5WHuCGVI2R+DKG0fyxSfSkg8=","subject":"CN=AffirmTrust Extended Validation CA - EV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjE=","whitelist":false,"attachment":{"hash":"22bb58450c6234f294cba177f1dbd93e6d193576017408e8cdc292f4bc6a925e","size":1674,"filename":"xAD7ZgT8h1RQOQsz_6DxwKe17_oiwt-Jy6y1G1Akw00=.pem","location":"security-state-staging/intermediates/cfde6906-9b1c-47ff-a5d9-15c5809705bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xAD7ZgT8h1RQOQsz/6DxwKe17/oiwt+Jy6y1G1Akw00=","crlite_enrolled":true,"id":"ee7fb2cb-357d-4c77-afde-598161638058","last_modified":1562024964604},{"schema":1562024963124,"derHash":"sZGhVdUN2u+xLvX4KbzNXZ/oqeh3Z7c3S/XDbOdA/0o=","subject":"CN=TBS X509 CA persona 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGAMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR4wHAYDVQQDExVUQlMgWDUwOSBDQSBwZXJzb25hIDI=","whitelist":false,"attachment":{"hash":"a9859ca50ce84ad6bdf91b9d7c46e32fe61f11d14399189c7c6b462117149bc7","size":2142,"filename":"ubjhAc6yaPi98oC31QdS1V0UUGGet-1zQl2VpfOY61s=.pem","location":"security-state-staging/intermediates/eaf1e313-1e14-43ec-b8b1-51ccf3548f15.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ubjhAc6yaPi98oC31QdS1V0UUGGet+1zQl2VpfOY61s=","crlite_enrolled":false,"id":"462860d8-3e72-4f5d-b4eb-60c9db3e94ef","last_modified":1562024963862},{"schema":1562024962352,"derHash":"fp3eEfdWaw+sYiigCQWoTmNg6VAacBs+f8gy6juf2ng=","subject":"CN=Don Dominio / MrDomain RSA EV CA,OU=Controlled by COMODO CA for Soluciones Corporativas IP\\, SL,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIHQMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMUMwQQYDVQQLEzpDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBmb3IgU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"a1afd055411579d9c95224e1ed86afb5c615d247f595fa414519966b8ea70d3d","size":2296,"filename":"w0Shysnt57XAAwS7oiySGBbwyEZ1Xlrn5_wYfb_pOfc=.pem","location":"security-state-staging/intermediates/9ffa0a17-2adf-4743-a19e-380a5f3e825d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w0Shysnt57XAAwS7oiySGBbwyEZ1Xlrn5/wYfb/pOfc=","crlite_enrolled":false,"id":"4f9a8f8f-970a-480c-ab7f-f9d5a51599a8","last_modified":1562024963117},{"schema":1562024961614,"derHash":"dJzFKc2qua4oWBR8SwAa4dW+BY/BZcPnSvlwQTHF4cE=","subject":"CN=nazwaSSL,OU=http://nazwa.pl,O=nazwa.pl S.A.,C=PL","subjectDN":"MFIxCzAJBgNVBAYTAlBMMRYwFAYDVQQKDA1uYXp3YS5wbCBTLkEuMRgwFgYDVQQLDA9odHRwOi8vbmF6d2EucGwxETAPBgNVBAMMCG5hendhU1NM","whitelist":false,"attachment":{"hash":"897f59110ae0cae8614eb96580a96fd7cb3225869d9da4c4530b1281bf753e8a","size":1597,"filename":"sPhpJMOX1_QEIjMN_nLy-YioxkO0pBGSK7c-Mj9wybw=.pem","location":"security-state-staging/intermediates/ca6a636d-2b32-4c6b-91b3-5dba3a3cbee6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sPhpJMOX1/QEIjMN/nLy+YioxkO0pBGSK7c+Mj9wybw=","crlite_enrolled":false,"id":"d51ec63a-9f60-4dd7-b26b-29c22b1fe537","last_modified":1562024962345},{"schema":1562024960127,"derHash":"v6r5kLmNkWhGap8HV9wvFhS5+Tizp0URuZSiuFjhSQ4=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"e46a74573c0c8d261f43c664107450c8cb57b01ae5173762e958d2af50e63b9b","size":2089,"filename":"aLyS-WCb9RvbNJeSwszhasSrqQSVJntxtPR2ngWYjN4=.pem","location":"security-state-staging/intermediates/f35c712d-0fc6-4650-9043-5ad0afcd052e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aLyS+WCb9RvbNJeSwszhasSrqQSVJntxtPR2ngWYjN4=","crlite_enrolled":false,"id":"fd553303-b2b5-4e92-8d4a-684fe1d7afb0","last_modified":1562024960856},{"schema":1562024957869,"derHash":"/QI2IkTzEmbK/wBYGNEATsTrCPsjmq+qr/9HSX1gBdY=","subject":"CN=Certum Organization Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGLMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS8wLQYDVQQDEyZDZXJ0dW0gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"ee9903c59449e4d0acc7b6208d9d0397e473dfb4bdf3dca7397b4cf26911831b","size":1735,"filename":"51GveKNrpJjtGpXY5QDx03s3YTQwaQic6dWBqo3zX6s=.pem","location":"security-state-staging/intermediates/aec69216-92cf-49fb-ad18-7c895d138dbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"51GveKNrpJjtGpXY5QDx03s3YTQwaQic6dWBqo3zX6s=","crlite_enrolled":true,"id":"c76e2118-173c-4a95-bf4e-159a6ad00ee9","last_modified":1562024958614},{"schema":1562024956351,"derHash":"Pu122wpAy9GW3k+yfKQEgNKkKs4l/zYpHuHaECjWGQc=","subject":"CN=USERTrust RSA Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE6MDgGA1UEAxMxVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"aec6dfea40b2d04b6ee1fd349f0e964f718375be85967b2e3dfdd434447a0017","size":2203,"filename":"SVno834iaJ-fItrISzwy9bMXxU9xtlSDOEkUWWB44AY=.pem","location":"security-state-staging/intermediates/006c3f08-81d7-4a4a-82dc-53df3731dc3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SVno834iaJ+fItrISzwy9bMXxU9xtlSDOEkUWWB44AY=","crlite_enrolled":false,"id":"d02af984-79a3-414d-aec0-6fa0a598a299","last_modified":1562024957121},{"schema":1562024955607,"derHash":"FVf2W6YclYt076SlgruuvdYqbZtl/pWoDV7VGPRu2H8=","subject":"CN=EY LLP SHA256 CA - G2,O=Ernst & Young LLP,C=GB","subjectDN":"MEkxCzAJBgNVBAYTAkdCMRowGAYDVQQKDBFFcm5zdCAmIFlvdW5nIExMUDEeMBwGA1UEAxMVRVkgTExQIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3b35a96418cedad712c8b5fc962614860bf163aa01cf6e82be4b937ec1e0dc64","size":1833,"filename":"hd2ITqtCyMy8qkh7o5Jz3cR0DAFmxakpv2WbEWWJe5U=.pem","location":"security-state-staging/intermediates/0bcf042f-21c7-4509-9592-de8e0d2f9af4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hd2ITqtCyMy8qkh7o5Jz3cR0DAFmxakpv2WbEWWJe5U=","crlite_enrolled":false,"id":"3be1086f-07b3-4571-9167-80dd1baddcc3","last_modified":1562024956343},{"schema":1562024954119,"derHash":"j6xXZDnJ/T7xU7Ufnt0NOBtd97h1Wc6+ygQpfdRKY5s=","subject":"CN=DigiCert Global CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMg==","whitelist":false,"attachment":{"hash":"f974f77c91205dbd3c9e89bb41254df4a42a70a49efa60ce9c07db31dbcc3712","size":1634,"filename":"njN4rRG-22dNXAi-yb8e3UMypgzPUPHlv4-foULwl1g=.pem","location":"security-state-staging/intermediates/d91dd6ee-e83b-47b7-b9dd-835d20657b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"njN4rRG+22dNXAi+yb8e3UMypgzPUPHlv4+foULwl1g=","crlite_enrolled":true,"id":"a41a5511-de35-4c5d-af6a-1283493ecab1","last_modified":1562024954850},{"schema":1562024953354,"derHash":"lya+H9YsztPzIzYV3DJMoKfnh+tCJzyL5M4903m/nXA=","subject":"SERIALNUMBER=201815,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE1","whitelist":false,"attachment":{"hash":"9471b05e41efc78e40a6ced8077181e9a004a285dfd308ae6ab1cd57fe38d124","size":2333,"filename":"0xXaKHZeQsGiM_TY67qlJLl3VSY03py-NLYxVTNDz2g=.pem","location":"security-state-staging/intermediates/9e215d26-d89c-494e-8ab1-0238205d9a31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0xXaKHZeQsGiM/TY67qlJLl3VSY03py+NLYxVTNDz2g=","crlite_enrolled":false,"id":"37714fea-c69d-4735-a2af-5aedaeaec17f","last_modified":1562024954111},{"schema":1562024952617,"derHash":"Vh3Hg1H15+5aRkrG5YoNFk7ydo+Y8C5u5lUBEg/NnF4=","subject":"CN=SwissSign Server Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLDAqBgNVBAMTI1N3aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDE0IC0gRzIy","whitelist":false,"attachment":{"hash":"b44b7aee422e730e14cf3b845c69862c0c573458ff55af4b3a534005005b358a","size":2389,"filename":"skyozdmp140ljrHvjRijq3v2_yQ1nyfFyBiA9uOKuw8=.pem","location":"security-state-staging/intermediates/ef30ec5a-365b-47f4-b6c5-f11d5c720e99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"skyozdmp140ljrHvjRijq3v2/yQ1nyfFyBiA9uOKuw8=","crlite_enrolled":true,"id":"e9049b0c-8a98-4b05-abb3-fa6928effd62","last_modified":1562024953346},{"schema":1562024949623,"derHash":"RREUUPsx71E35LfP+e4r7yPou/0WUIbfvZPfLzKbeF4=","subject":"OU=\u5167\u653f\u90e8\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEcxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxJDAiBgNVBAsMG+WFp+aUv+mDqOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"1d2e89002031e2f067f634eb677f5895443049d3c69a01ca96c7142c7730442b","size":1845,"filename":"hqLmhgIEASticguKuke6YdSMZ139HmKHWRNfNRObcW4=.pem","location":"security-state-staging/intermediates/ca34cab1-fdc7-4bad-a028-8564f3760c53.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hqLmhgIEASticguKuke6YdSMZ139HmKHWRNfNRObcW4=","crlite_enrolled":false,"id":"b59c56ec-1e6c-4d20-a5df-9d80375a71e9","last_modified":1562024950356},{"schema":1562024948867,"derHash":"XLnp3jKxh+QLoU/fIA/aYse0+/iNZPd84C3W6+a8wbA=","subject":"CN=Hongkong Post e-Cert CA 1 - 15,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MHYxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEnMCUGA1UEAxMeSG9uZ2tvbmcgUG9zdCBlLUNlcnQgQ0EgMSAtIDE1","whitelist":false,"attachment":{"hash":"b1dec54f97f654e9b417aea0e0d23a22852001ddaf0a4b9b7a4c8d05cb468de6","size":1743,"filename":"nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=.pem","location":"security-state-staging/intermediates/75266247-0a7b-4385-ae5c-7bde1cbc59fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=","crlite_enrolled":true,"id":"143884ed-af2d-4415-8a20-84ab1314e2dc","last_modified":1562024949615},{"schema":1562024948125,"derHash":"66NMexCWcWFMNn4d4HUSTDlUzhn4X6z2EJDsMZ9/Gn8=","subject":"CN=GlobalSign CA 4 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDQgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"45bcc3a929864966eb19baeecc3aa340568be7939f1cd9bdae711d351e223a9f","size":2121,"filename":"Xj0OpiKM5fkJ7g__pfUXsKnp9Ggz3CaAgIY6QU_Ml6I=.pem","location":"security-state-staging/intermediates/52fadff7-e23b-4528-893e-fd86c53c6e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Xj0OpiKM5fkJ7g//pfUXsKnp9Ggz3CaAgIY6QU/Ml6I=","crlite_enrolled":false,"id":"1e71a145-4354-432c-a01b-1f3771722c5a","last_modified":1562024948860},{"schema":1562024947352,"derHash":"v4q+kn0Y62bvn7Ul7SDuCR63gqSP2m9M8jLQZo/NXMY=","subject":"CN=Technological Educational Institution of Thessaly CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGVMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgVGhlc3NhbHkgQ0EgUjI=","whitelist":false,"attachment":{"hash":"0ec1a3ac7824be699c0d1bf1d695a867cac5c011afa5daf8ebbdc748d654d68c","size":2645,"filename":"ErB7rPO_p1d_EBICC4d-nI1lPmPDMPf4n9dW9Nx2nu8=.pem","location":"security-state-staging/intermediates/6371394b-44d6-4eeb-be22-579f6186536f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ErB7rPO/p1d/EBICC4d+nI1lPmPDMPf4n9dW9Nx2nu8=","crlite_enrolled":true,"id":"a786d069-c3bd-425a-8944-bc17028a3e53","last_modified":1562024948117},{"schema":1562024945836,"derHash":"M4VzODYez8SFjd/2ue9ic+PbhWq5zqHA4sZZJdHIeXg=","subject":"CN=Entrust Class 3 Client CA - SHA256,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSswKQYDVQQDEyJFbnRydXN0IENsYXNzIDMgQ2xpZW50IENBIC0gU0hBMjU2","whitelist":false,"attachment":{"hash":"6deba95e7ac393b234997f0c4cd6212d2cb0447abafefd772a54537cf31c4507","size":1869,"filename":"9km003uGP3CTXdUQ8RZMVSb0qYwAyhU4oBMh8XI9xmc=.pem","location":"security-state-staging/intermediates/94f7fa6c-549d-4332-b94d-12a8c60a36c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9km003uGP3CTXdUQ8RZMVSb0qYwAyhU4oBMh8XI9xmc=","crlite_enrolled":false,"id":"3afa9f9b-e103-4f63-8488-e4fb026802cf","last_modified":1562024946596},{"schema":1562024944329,"derHash":"FZF8TLdLswHERaLgMM3SkJGMgDIDgQBpJ9IqQ/1B/9E=","subject":"SERIALNUMBER=201803,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAz","whitelist":false,"attachment":{"hash":"e75d3c411b9b5678ad1021ffbd8366c426026c0b8b6fdd4af5fd216c6cdbdc36","size":2333,"filename":"TOFoosa_0iP5q1cejoIgepaH1pVPDAFbd9NYScqLFhY=.pem","location":"security-state-staging/intermediates/1eaa8ed0-14ac-40e9-8ae8-f64252e79d83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TOFoosa/0iP5q1cejoIgepaH1pVPDAFbd9NYScqLFhY=","crlite_enrolled":false,"id":"6cc509c0-8aca-497b-8718-d4ff8163244b","last_modified":1562024945067},{"schema":1562024942072,"derHash":"x0It4hzryS7K5r6dzX5xHuZQ0wrtcR+7Dfayx4S2xPs=","subject":"CN=Digidentity BV PKIoverheid Organisatie Server CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPjA8BgNVBAMMNURpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFNlcnZlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"610bbc1d7e1b7d3eb20a159a94adbb060737aeebfce7662b453045c143b00aad","size":2625,"filename":"zm4euNC-JiW-4by3xDIvrjNA-47VRZb3MnFpy-xVE4E=.pem","location":"security-state-staging/intermediates/a5a5281d-d3a3-48cd-a934-751e77014391.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zm4euNC+JiW+4by3xDIvrjNA+47VRZb3MnFpy+xVE4E=","crlite_enrolled":true,"id":"cd3a32e6-e26e-49f5-ac44-49cbd2d4c344","last_modified":1562024942810},{"schema":1562024941330,"derHash":"MG6XOeNFj/RUaHe3BLLjkF5YsjXWTjL08CaskbcpXRU=","subject":"CN=GlobalSign CA 5 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDUgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"285c007491cf789ba43976f05e189adf64a0f29b5e14db89718cee363825ccba","size":2089,"filename":"QgVxWR5NsnuI7x6GKGlxVsQHK7mDlibMZigdzw2qsxU=.pem","location":"security-state-staging/intermediates/907deced-77e9-464c-98c8-40c0f0871333.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QgVxWR5NsnuI7x6GKGlxVsQHK7mDlibMZigdzw2qsxU=","crlite_enrolled":false,"id":"4d25ca1b-87f3-41f4-864a-04927784f280","last_modified":1562024942064},{"schema":1562024939817,"derHash":"xjVDcpo3DCaVK0fh0dGuqEyxsH8bD5ZML+3cUj/Xx5U=","subject":"CN=Advanced Class 2 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDIgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"b0b37eca6a850f10df2d2f0f58151a4dde91bb13056fb825499ebe669a693f7c","size":1768,"filename":"TldDn68qkoctgHZQtrMac-o1wa3jCibE3kU6UUsRCkk=.pem","location":"security-state-staging/intermediates/6cc7acac-4c52-41c2-aa25-5c066d9c2b1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TldDn68qkoctgHZQtrMac+o1wa3jCibE3kU6UUsRCkk=","crlite_enrolled":false,"id":"5f2ec7fc-3106-4948-a7e0-9fa8387772ef","last_modified":1562024940568},{"schema":1562024937487,"derHash":"GtUWhBmK+R6iQ525x5ID9Hp0nr2JYnm3fcYn+D/+SdY=","subject":"CN=Network Solutions DV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBEViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"52fbbb1f5aa39c3d13d1e3d0c45b2292cba37ce769970a1ceca9ed32e4131b1d","size":2150,"filename":"G8g19iXohPy9KZGriQ807A59lcylMu81Zi8hXz5xxsM=.pem","location":"security-state-staging/intermediates/6949f924-1eec-45ee-a7db-edf592b5bd93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G8g19iXohPy9KZGriQ807A59lcylMu81Zi8hXz5xxsM=","crlite_enrolled":true,"id":"c62bc944-30d0-4aec-98f6-e797e9e832cb","last_modified":1562024938279},{"schema":1562024936752,"derHash":"EleqwvTurGyklCwsg/C2e0GjtHEgxNU0KZKVE6ytRow=","subject":"CN=DFN-Verein Global Issuing CA,OU=DFN-PKI,O=Verein zur Foerderung eines Deutschen Forschungsnetzes e. V.,C=DE","subjectDN":"MIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"69e4d49fecfd6be962aff5ae8fab5ea53f3d878ed48ee7a692e4baadc6b9b1cc","size":2028,"filename":"2plWEFSbja5Tz0pERjlr4FL2fr0H4L48Rt0ZF3sKBEQ=.pem","location":"security-state-staging/intermediates/8de4ccb4-4260-4e43-8cbf-5a833dadfdd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2plWEFSbja5Tz0pERjlr4FL2fr0H4L48Rt0ZF3sKBEQ=","crlite_enrolled":true,"id":"93b2b132-1d87-4798-b133-b6722f1ba378","last_modified":1562024937479},{"schema":1562024932982,"derHash":"9HCuinNxgA/J85Tu1xZ7ReaqOOqwIAk4ZJhcFcHouMs=","subject":"CN=HARICA SSL Intermediate CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdSEFSSUNBIFNTTCBJbnRlcm1lZGlhdGUgQ0EgUjE=","whitelist":false,"attachment":{"hash":"997b5da84e547b4e65bbddcfe29ea4027d3d6ce01f5f270b51fe30c6cd9722b6","size":2280,"filename":"lDFmKX0HYK-C3X2D0e1_amheVD9e-SBgplm0VfZ1IZI=.pem","location":"security-state-staging/intermediates/5b577c97-5cb6-437b-a5de-28458c59e3bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lDFmKX0HYK+C3X2D0e1/amheVD9e+SBgplm0VfZ1IZI=","crlite_enrolled":true,"id":"dc04d826-cf54-4953-bf3c-7ba7846ef9f5","last_modified":1562024933717},{"schema":1562024931476,"derHash":"dKYa3Z8g+RRhicb328ifV3ViRP01ZmQQja44uCo7UlA=","subject":"CN=YourNet SSL for domain2,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEoxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSAwHgYDVQQDExdZb3VyTmV0IFNTTCBmb3IgZG9tYWluMg==","whitelist":false,"attachment":{"hash":"b7dad8429dcfc03d08d7ba14a861340cb74932bd40ccbada03ee17a7a6637fef","size":1597,"filename":"zd0UqyvGX7-jgJxlCj_Bzwg3ZZtVY-37N2N0HaQW9N8=.pem","location":"security-state-staging/intermediates/1469d0ba-cd8f-4e5e-b64a-17afac0c6c59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zd0UqyvGX7+jgJxlCj/Bzwg3ZZtVY+37N2N0HaQW9N8=","crlite_enrolled":false,"id":"977ddfb9-da2c-424d-958a-3172269a99e2","last_modified":1562024932228},{"schema":1562024930729,"derHash":"bqy5/qbMa/RZW0nCIsJgBNiTceuThK5I7Be5V4SUhlE=","subject":"CN=GENIOUS RSA Domain Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGPMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxNzA1BgNVBAMTLkdFTklPVVMgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e1cfbd7e1821deb85427599da6afff700f4fe6bbd50a6617c015a36c7081220d","size":2178,"filename":"fpm00n1Dh8cybnaCvT8lZPwH6X-P_MKtYFzCSSgBorQ=.pem","location":"security-state-staging/intermediates/ce167ca1-2411-4863-820e-956dec419f09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fpm00n1Dh8cybnaCvT8lZPwH6X+P/MKtYFzCSSgBorQ=","crlite_enrolled":false,"id":"34d6c620-1aeb-4e81-b738-dc70ae0d0f79","last_modified":1562024931469},{"schema":1562024929222,"derHash":"Z/kfJvW/v6SHOL4GeN0vj3X3uAdh1WVng8qLkgqqVlk=","subject":"CN=SwissSign Server Silver CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBTZXJ2ZXIgU2lsdmVyIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"a57cf71c0388c65ff88458240a3172504ec1bec49381cd3711b4403c60d9cd06","size":2393,"filename":"mJwcSA1WE5bfCsQ5o79wGCvasvwdVsznZlqR1H3YPdI=.pem","location":"security-state-staging/intermediates/7cd962f0-d1e7-4935-b0c3-8a88414cbafc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mJwcSA1WE5bfCsQ5o79wGCvasvwdVsznZlqR1H3YPdI=","crlite_enrolled":true,"id":"e5b5ea99-6ffd-494f-a33d-c7e05abcd103","last_modified":1562024929964},{"schema":1562024928479,"derHash":"ydaRPz/t3v8YTJ7h1+F8WuyQiG7tXMPW6YEFgxyMDgs=","subject":"CN=TERENA SSL CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGcxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEbMBkGA1UEAxMSVEVSRU5BIFNTTCBDQSAzIEcz","whitelist":false,"attachment":{"hash":"545222651c83bbd8eccbb5048089e729de4cba6f967e78628258418fa0ea02a4","size":1557,"filename":"CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=.pem","location":"security-state-staging/intermediates/c3c1fb06-2e31-41ec-8ec1-1a01c2fc381f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=","crlite_enrolled":false,"id":"e64924af-35f5-4a17-be7d-7a374e1f9cf9","last_modified":1562024929214},{"schema":1562024925387,"derHash":"z/qcAexZwp5xjQ3Q71R58JtRyVeAr7e9adPIBUr+TSg=","subject":"CN=Belgium Root CA2,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ey","whitelist":false,"attachment":{"hash":"6421003db92dad67986e00159b3cab338f36443058a88decb98d278a0b730b9c","size":1423,"filename":"-OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=.pem","location":"security-state-staging/intermediates/c45f186f-ef1c-4bec-a5dc-28abe0872ea5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=","crlite_enrolled":true,"id":"687db8f3-9aec-4b32-855e-3e940b432c69","last_modified":1562024926156},{"schema":1562024924614,"derHash":"gQUcNV7J9aifupHRpb0/BQHqzYDvk7IYAD2VzyUadnA=","subject":"CN=Trust Provider B.V. DV SSL CA - G2,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHcxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDErMCkGA1UEAxMiVHJ1c3QgUHJvdmlkZXIgQi5WLiBEViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"79e96ea8b4bed312f4e2620cb89f3da3150daf80c22aa93eee8d0cf97382d481","size":1674,"filename":"Ug7hbhTOgcIi7lxx_EXJNjbE7vY2XIM8TCIVY7FWyPM=.pem","location":"security-state-staging/intermediates/78a192bf-c52b-4e45-8953-0741da28873a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ug7hbhTOgcIi7lxx/EXJNjbE7vY2XIM8TCIVY7FWyPM=","crlite_enrolled":true,"id":"c35703ef-e86e-40c0-95b4-ccee1457e97a","last_modified":1562024925376},{"schema":1562024923845,"derHash":"1cAJMS+EXF7IUG6tVg1iRHv/SmCpwlIQURIXrW3nau0=","subject":"CN=Adobe Analytics - DigiCert CA,OU=Adobe Systems Incorporated\\, DMBU,O=Adobe Systems Incorporated,C=US","subjectDN":"MIGFMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxKTAnBgNVBAsTIEFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkLCBETUJVMSYwJAYDVQQDEx1BZG9iZSBBbmFseXRpY3MgLSBEaWdpQ2VydCBDQQ==","whitelist":false,"attachment":{"hash":"4524101b35f64af46493e4d82f8fb77b7173f9cc3a97eeea5fb649665c7fe151","size":1683,"filename":"j7zHvn8BNXTYE-Zg6cBClkcvbJgxCRanrqi66iJkxxo=.pem","location":"security-state-staging/intermediates/29a72042-a98e-4486-97aa-78d4b0c0c60a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j7zHvn8BNXTYE+Zg6cBClkcvbJgxCRanrqi66iJkxxo=","crlite_enrolled":false,"id":"5151b0c7-4782-496c-bb80-783f0674974d","last_modified":1562024924606},{"schema":1562024922323,"derHash":"lyIUU7shRkLB3Fq82nn+Tu218rA5RPACuBuEfDn4D+w=","subject":"CN=Trustico RSA Client CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MHIxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxHzAdBgNVBAMTFlRydXN0aWNvIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"0b4273439c52956ab9ed46383b38f3889b55a43dd0e5c392028e3b83cf98beb5","size":2105,"filename":"xnvxH2EA9Kd3kwOIpzC0bRhbt111r-GKHT4GfHQAyYY=.pem","location":"security-state-staging/intermediates/059c4a4d-bd05-446b-bf6c-5d06af8e64a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xnvxH2EA9Kd3kwOIpzC0bRhbt111r+GKHT4GfHQAyYY=","crlite_enrolled":false,"id":"514fb8e7-4b80-456a-821d-b96dd274be16","last_modified":1562024923058},{"schema":1562024920801,"derHash":"+7d3rIzcz3mT7zkk/4zQn5X7FnOQp4zB88hSwfFaZtM=","subject":"CN=MarketWare Secure Email / Client Authentication CA 2,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIGtMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xPTA7BgNVBAMTNE1hcmtldFdhcmUgU2VjdXJlIEVtYWlsIC8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIENBIDI=","whitelist":false,"attachment":{"hash":"de3143439ab3c01030021cca448210d408e58781f63a29dfb9094fa44dc57533","size":2203,"filename":"IjeaRrgYP7bL-bSu8xuukrup5xA-eP8RJIWT1wBPIDQ=.pem","location":"security-state-staging/intermediates/7b4805c7-0159-47ce-9559-bf93d0bd7e46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IjeaRrgYP7bL+bSu8xuukrup5xA+eP8RJIWT1wBPIDQ=","crlite_enrolled":false,"id":"a6626126-010b-4880-b496-85eb7715c636","last_modified":1562024921543},{"schema":1562024919307,"derHash":"IFFUt3ftxVpRRlhaXlTgVKcL5KrTuF0CMY2ie/gHrfE=","subject":"CN=Amazon,OU=Server CA 3A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAzQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"05a3b22929a248fe09c8e080b25d2e2076a990ab5c629c24916624485d790547","size":1008,"filename":"fFO133kTXZr2GV72u3OrmMLImVC4krGS3_14TbklpBw=.pem","location":"security-state-staging/intermediates/88877557-2163-4dde-bcc8-c9e7b0b12206.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fFO133kTXZr2GV72u3OrmMLImVC4krGS3/14TbklpBw=","crlite_enrolled":false,"id":"7760fae2-5a3c-4718-9149-d102bf58eb33","last_modified":1562024920055},{"schema":1562024918544,"derHash":"dkoNhNVVLNWHLHNGTzfwIXXNpwWIECsTraKgGZ/EA+k=","subject":"CN=QuoVadis QVRCA3G3 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTNHMyBTU0wgSUNB","whitelist":false,"attachment":{"hash":"0b6a1e6291e43621aa0cf422b683e1c4f2016acae9e2ca13b4b504d63ea22bab","size":2381,"filename":"GGH9ZFzlZtn0UI4iUubJxa5wjuMzMBq88DKTwhDzjDY=.pem","location":"security-state-staging/intermediates/c140db1c-419f-4e1f-a41d-5e757e022a04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GGH9ZFzlZtn0UI4iUubJxa5wjuMzMBq88DKTwhDzjDY=","crlite_enrolled":true,"id":"8208fd07-a06e-42eb-a618-7e951831700f","last_modified":1562024919299},{"schema":1562024917049,"derHash":"bN+dy/NRCju0AnYdYtDF5OevxR2c/wHwK9UyVtxWet8=","subject":"CN=GDCA TrustAUTH R4 DV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IERWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"6649636f2813ad008e8133da4658e92771065ef07c503f24fb1bf0e9efebc92c","size":1727,"filename":"cfsQj68ZkIybk1gX6hizWacoE7hvqJNujNu2E03n_3g=.pem","location":"security-state-staging/intermediates/38a31f82-83ee-41b4-80ac-dd89b54a7ece.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cfsQj68ZkIybk1gX6hizWacoE7hvqJNujNu2E03n/3g=","crlite_enrolled":true,"id":"93bffb7c-4c34-4987-80a0-4fcbf72ce0d6","last_modified":1562024917781},{"schema":1562024916313,"derHash":"9U9s7VbPaCtXCmyuwxPpSCdg3hLo+SiuMEUsTGasdho=","subject":"CN=GeoTrust Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSkwJwYDVQQDEyBHZW9UcnVzdCBQcmltYXJ5IFRyYW5zaXRpb24gUm9vdA==","whitelist":false,"attachment":{"hash":"2cfe9c1ecf88a44a669b657cddd2e2a0e0ab6a7d532af76b531f030235c27d6d","size":1695,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/b797792a-0c11-40a3-a801-622d9f8c11a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"ea98bddb-7dc4-4f7a-a7a0-7c56ac081855","last_modified":1562024917040},{"schema":1562024915551,"derHash":"kP/FFQzgU1Bp5+Xvlh5AR/sIYaFAcyyM7cfo1Y61m9E=","subject":"OU=\u5de5\u5546\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOW3peWVhuaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"49892e8be74428a0ec09f0541dce4e2ccb3e57d9c14435714a4659b3e422dede","size":1845,"filename":"G0Nm8-uK2OHaJz-7F_jtcJoRpm0-pac0NTsSs2ZA7uo=.pem","location":"security-state-staging/intermediates/fe5ab866-5d0d-4e4d-a1b6-e542c1902f86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G0Nm8+uK2OHaJz+7F/jtcJoRpm0+pac0NTsSs2ZA7uo=","crlite_enrolled":false,"id":"851210ea-741c-422f-9fe9-5eb4577556dc","last_modified":1562024916305},{"schema":1562024914016,"derHash":"rWEyfumbQGE+SAdRtWaRoJZBLGj3T0ASsp+g9Iu5JMk=","subject":"CN=COMODO SHA-256 Client Authentication and Secure Email CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGdMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDFDMEEGA1UEAxM6Q09NT0RPIFNIQS0yNTYgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EgMw==","whitelist":false,"attachment":{"hash":"41505d9d2e6bf1388086b3492cd202a6456bbb9c4959479a2a8caca9c66b3c4b","size":1699,"filename":"DTkS_gGeaXlwZz7Tk6HjzEMiE0e5gCVs3AQrkI99SgE=.pem","location":"security-state-staging/intermediates/0d4ea80a-907c-4083-8c4b-e70ff8c1a53c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DTkS/gGeaXlwZz7Tk6HjzEMiE0e5gCVs3AQrkI99SgE=","crlite_enrolled":false,"id":"0e0066de-bfb1-4731-a2b3-aaf190da061c","last_modified":1562024914790},{"schema":1562024913272,"derHash":"UEjbq/Qb2e99UAlAX0G2dxrIiN4+rJCzBY9VWWS35F8=","subject":"CN=eMudhra RSA Domain Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGVMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxNzA1BgNVBAMTLmVNdWRocmEgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"00d80076905e12a61bd293836d9efa12e45d6f81308bde3faf55d751f38d04b5","size":2186,"filename":"17G136GRsFqQDON1NPTY6yR_UA1QudGkzCd3wo7sczM=.pem","location":"security-state-staging/intermediates/38dffa99-f6ff-42b2-9d56-b21dbb250217.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"17G136GRsFqQDON1NPTY6yR/UA1QudGkzCd3wo7sczM=","crlite_enrolled":false,"id":"d2e8bfc6-485a-4d20-9405-978f2701ee3f","last_modified":1562024914008},{"schema":1562024912527,"derHash":"/x017UZAY9YDHHHkFCYswjEOjFR6t/fPKVXJ4DSeUz8=","subject":"CN=GeoTrust True Identity CA 2,OU=GeoTrust Authentication Services,O=GeoTrust Inc.,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSkwJwYDVQQLEyBHZW9UcnVzdCBBdXRoZW50aWNhdGlvbiBTZXJ2aWNlczEkMCIGA1UEAxMbR2VvVHJ1c3QgVHJ1ZSBJZGVudGl0eSBDQSAy","whitelist":false,"attachment":{"hash":"9e7e3dd482a7bdcb8d715576fc589613eb0fbcc6f9f72fee1cd6c9983cd5c477","size":1467,"filename":"Er8r3dSx8J_PXp27RON-7OVuMvwD0SXXfHReZYPBxZk=.pem","location":"security-state-staging/intermediates/3ea3e629-0567-49c6-8887-7e3cd5bed8f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Er8r3dSx8J/PXp27RON+7OVuMvwD0SXXfHReZYPBxZk=","crlite_enrolled":false,"id":"a6e16a57-0717-40f8-a342-1fc4a1910e9a","last_modified":1562024913264},{"schema":1562024911771,"derHash":"++rLHuW9XzNRXGSsdS/weCJNiO5AZHTDMflUPUtyGEY=","subject":"CN=Eastern Macedonia and Thrace Institute of Technology CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQzBBBgNVBAMTOkVhc3Rlcm4gTWFjZWRvbmlhIGFuZCBUaHJhY2UgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kgQ0EgUjE=","whitelist":false,"attachment":{"hash":"3e7b18ea08168c2467503f094fb014bcf205cd1d07595f29010fea2ccb0b995a","size":2905,"filename":"y2aPBkC8F76dsQ5qfH5V18duuXnA5-zq0P4A9k8kX6E=.pem","location":"security-state-staging/intermediates/9cb657da-04ae-45f1-9d33-7b531bf463ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y2aPBkC8F76dsQ5qfH5V18duuXnA5+zq0P4A9k8kX6E=","crlite_enrolled":false,"id":"40dc7a33-428e-4422-b0f7-34f7b111042c","last_modified":1562024912519},{"schema":1562024908759,"derHash":"Iar6t69YPihlmM/sqL1DWMN9es7Vy2NwrIEQuDmL5HY=","subject":"CN=Ensured Document Signing CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MHoxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xJDAiBgNVBAMTG0Vuc3VyZWQgRG9jdW1lbnQgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"efbe87dfeb2b83d30e35e6c5c075f7f20e9de0cfb5641f51604664608a01290c","size":6426,"filename":"1Zha9XtDFk7GUo708OAH26oRT9eyA9hRP_RqCmrxNXE=.pem","location":"security-state-staging/intermediates/f9f6418c-24fe-4995-8172-964073611677.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Zha9XtDFk7GUo708OAH26oRT9eyA9hRP/RqCmrxNXE=","crlite_enrolled":false,"id":"02d9cb51-9bed-4f96-ab41-c69994b18edc","last_modified":1562024909499},{"schema":1562024907269,"derHash":"Vu2G7YaauIYxFohjEruZFbidmaRWI+DwZfgcvVaTeRk=","subject":"CN=DOMENY CODE SIGNING Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGKMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMTQwMgYDVQQDEytET01FTlkgQ09ERSBTSUdOSU5HIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"31b35ca440069dcffe73ec5d1e038d21abe790f988c05d40aa78e21b0d3b5f6b","size":2142,"filename":"g-0D2wOqufSPZH-me0ymwpfpamM9jgCd7MkOiEusGXo=.pem","location":"security-state-staging/intermediates/a5765b22-16fc-422d-9560-37857b9737e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"g+0D2wOqufSPZH+me0ymwpfpamM9jgCd7MkOiEusGXo=","crlite_enrolled":false,"id":"9d5405c6-1956-4e48-928b-cdd098e7fcac","last_modified":1562024908001},{"schema":1562024904264,"derHash":"8YRCvt9wtNFSETVscrZZMyvtA//Tu6evqqvm3p1yMAI=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"310b7d0c2f7140dbbd2962b07906fd9f4eb3be23c393d130330bb6e59f58ed81","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/5b636dd9-7860-4f2d-a4f2-0410d642b8f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"88048931-9c43-47bf-a3ce-2295c41a573d","last_modified":1562024905000},{"schema":1562024903501,"derHash":"nyURoj5w2V+2J5hQimdsw4lkEAk2pubTyudxVMApDwI=","subject":"CN=thawte DV SSL CA - G2,OU=Domain Validated SSL,O=thawte\\, Inc.,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR4wHAYDVQQDExV0aGF3dGUgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"f71b79c8c35cf956e94a6b78786c73cbd2346bbd250a0683171d0423afef9a5d","size":1731,"filename":"Uu5hqMmQleSn68vgjrmAQIz2tFLJ3ra_RLK7zEgYYms=.pem","location":"security-state-staging/intermediates/7cd6c71a-dc1a-4a9a-b73c-14d4ba922009.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uu5hqMmQleSn68vgjrmAQIz2tFLJ3ra/RLK7zEgYYms=","crlite_enrolled":true,"id":"eff1a811-4b4d-4b86-8d1f-bababea8deae","last_modified":1562024904256},{"schema":1562024901246,"derHash":"/h7K297g5VgGjdvHszq3jdV9DcIvzBw2ARkBA3Wwphs=","subject":"CN=TrustCor Basic Secure Site (CA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGKMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxKTAnBgNVBAMMIFRydXN0Q29yIEJhc2ljIFNlY3VyZSBTaXRlIChDQTEp","whitelist":false,"attachment":{"hash":"0c4ee3d67969b7bf371502575c7bef43da7ea5edee6add68dfe802d1f2c36baf","size":2211,"filename":"kHJg-GOK0x_65nWqv_uV70OMsqljk0LjqTDnfjQ6eRQ=.pem","location":"security-state-staging/intermediates/dca168d0-9454-4b21-b712-c05956c90dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kHJg+GOK0x/65nWqv/uV70OMsqljk0LjqTDnfjQ6eRQ=","crlite_enrolled":true,"id":"eeb9f30c-488c-4fe2-93ea-864c9148aca8","last_modified":1562024901976},{"schema":1562024899001,"derHash":"SPyVnQBBkI2cUV2RnTJbxOxb5DMKJ8Kz+eksJAAu7ys=","subject":"SERIALNUMBER=201721,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE3MjE=","whitelist":false,"attachment":{"hash":"98ae387ad7d37d7bf83007c8ca8c278365e35ebb6b41eb3c75e62eed755f88cb","size":2402,"filename":"hGCOQw-9K-ytxK5hhBre3AMERQA7tOvG__AJlpFRH_E=.pem","location":"security-state-staging/intermediates/0e6eb2bb-7490-4624-b32e-43fc18094a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hGCOQw+9K+ytxK5hhBre3AMERQA7tOvG//AJlpFRH/E=","crlite_enrolled":false,"id":"29600948-951b-472f-8a33-6580a407ab3e","last_modified":1562024899747},{"schema":1562024896760,"derHash":"b/b2P2oNPWNEbNqlI9Jic7EmwC+SLgXXPEdI64m4Y5M=","subject":"CN=Volusion\\, Inc. DV SSL CA - G2,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"6c0bf8e4ade43f22681e0a5f5f70b6e770a636633f3800c6f35346253ffa38a1","size":1548,"filename":"wL1M1GDAtMuwpOcLt4IiLDqjQ5yipn_-RaBKCU2F-YI=.pem","location":"security-state-staging/intermediates/50fda369-641f-4a5a-8256-ccd79c520165.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wL1M1GDAtMuwpOcLt4IiLDqjQ5yipn/+RaBKCU2F+YI=","crlite_enrolled":false,"id":"2012eb92-99b2-46a4-8952-d6cf483cfcfb","last_modified":1562024897497},{"schema":1562024896021,"derHash":"KgFVMaXzpM5Ym9hTxx3QaVhzIvV02Fycm5+d+PhsB14=","subject":"CN=GlobalSign Partners Timestamping CA - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBhcnRuZXJzIFRpbWVzdGFtcGluZyBDQSAtIFNIQTM4NCAtIEc0","whitelist":false,"attachment":{"hash":"55fd7cdb607d62d8b1e1502661056767eac9a992e199601d101161e96d67bbfd","size":2272,"filename":"MV3IyrkNFIBvx9PowOoHv2BarAqZ3RsECQExDLC8gdA=.pem","location":"security-state-staging/intermediates/06afec3c-1c14-4055-9ca7-b51b1cd0e043.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MV3IyrkNFIBvx9PowOoHv2BarAqZ3RsECQExDLC8gdA=","crlite_enrolled":false,"id":"39acce96-ef65-4549-8e3c-54f9f3bf3d7e","last_modified":1562024896753},{"schema":1562024895272,"derHash":"gkB0wh8cKJfynCb/24Lk5ru4WWdqtVb/XJXGbG9YGMg=","subject":"SERIALNUMBER=201918,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE4","whitelist":false,"attachment":{"hash":"3899b94862bfa35c040a240dbb5dd3a8ee30015cac42cc3bff7ebae9452fa971","size":2333,"filename":"6Byf7EtTwdFgQUzD4t4l9RcQFmGVUYrB7tEJzMqqaSg=.pem","location":"security-state-staging/intermediates/003cc6b1-20a9-4b60-9df1-68e892602e8a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Byf7EtTwdFgQUzD4t4l9RcQFmGVUYrB7tEJzMqqaSg=","crlite_enrolled":false,"id":"17ba986d-94e9-4bb8-9c12-7f0f31e1300d","last_modified":1562024896012},{"schema":1562024893766,"derHash":"D0UXSH/QqLoxlKYSJFCnsyyYf/8W8tSvVObttv7Wjgg=","subject":"CN=Cloudflare ECC DV CA,O=Cloudflare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjEdMBsGA1UEAxMUQ2xvdWRmbGFyZSBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"6e91e6887bc3aa9215d3f27e6515378a675129324d6ddbde54d654d70a2bfe9e","size":1398,"filename":"TItdfwmeIeGsIvsAjHCM7VsLyRqqdj5W2ECpVF4S9pI=.pem","location":"security-state-staging/intermediates/34573d47-f19f-4053-b767-2aeb0f372e6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TItdfwmeIeGsIvsAjHCM7VsLyRqqdj5W2ECpVF4S9pI=","crlite_enrolled":false,"id":"c3e60f9b-aa45-41d4-9e47-576137eaf347","last_modified":1562024894503},{"schema":1562024893016,"derHash":"xBXOv6P8LvPHQJK4QmW61kw/yZlMkRd5ZWZ9er7pBYg=","subject":"OU=Security Communication RootCA2,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=","whitelist":false,"attachment":{"hash":"646b73a99fcc560ca1fe3ce6a321bf45c814a8676d3322ace82a7e7e8897f46a","size":1601,"filename":"M4BwmvOwlr48wqQFSBQsClIAKNsJ4st3riIGYWq2y7Q=.pem","location":"security-state-staging/intermediates/461fedad-31f0-49a0-8419-88fcb971810f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M4BwmvOwlr48wqQFSBQsClIAKNsJ4st3riIGYWq2y7Q=","crlite_enrolled":true,"id":"441e263c-474f-4706-8caf-067062a7022a","last_modified":1562024893759},{"schema":1562024892262,"derHash":"Um4w3ta/nVziFvUMgyQCtIq3DVWu2pGKGHOliD69sbU=","subject":"CN=Symantec Basic DV SSL CA - G1,OU=Symantec Trust Network+OU=Domain Validated SSL,O=Symantec Corporation,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSYwJAYDVQQDEx1TeW1hbnRlYyBCYXNpYyBEViBTU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"d57957d42aa2c6e0e84d528db5cf8a57338ce285705866b2655d9da23d3170af","size":1926,"filename":"ELaoZg6JkSInELBlz5pqy_4JobLWGrsC0OXAhqypqQI=.pem","location":"security-state-staging/intermediates/dec3f331-de15-4e97-9ad1-29047e1ac63f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ELaoZg6JkSInELBlz5pqy/4JobLWGrsC0OXAhqypqQI=","crlite_enrolled":false,"id":"cb5a05ef-ee16-4785-876e-987ea32b123e","last_modified":1562024893008},{"schema":1562024890738,"derHash":"vAh4y7xODa96naRkqxYmKiNb/a7TO5+VaboY/zSZdYA=","subject":"CN=TrustAsia EV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBFViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"9a649e99d2774f04cb0fae10618205891e66d84669058b04828430921f6da774","size":1691,"filename":"3zvhr9FLox_6HK-CLvR_wE4XKQjtqDvzNPxSr0M8jeY=.pem","location":"security-state-staging/intermediates/3b83a2b4-a052-4057-8763-f1e172ed3331.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3zvhr9FLox/6HK+CLvR/wE4XKQjtqDvzNPxSr0M8jeY=","crlite_enrolled":false,"id":"c43c72cc-d8f7-448e-b348-fab85a1d5fad","last_modified":1562024891481},{"schema":1562024889996,"derHash":"yXO+rKZUSUUeXEExVw0F5y800q3r2U2y5R6aVE4eAQE=","subject":"CN=University of the Peloponnese CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLDAqBgNVBAMTI1VuaXZlcnNpdHkgb2YgdGhlIFBlbG9wb25uZXNlIENBIFIy","whitelist":false,"attachment":{"hash":"547632361fdb2ec2e526aa18221cf86e10f3968c0f48f91c1a655af07e963108","size":2532,"filename":"KxXWghXPpQcg84tdgEguQr8nOCM52RJF_m1eSznAo90=.pem","location":"security-state-staging/intermediates/4741d96b-ad99-4071-94b3-1919ec36f478.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxXWghXPpQcg84tdgEguQr8nOCM52RJF/m1eSznAo90=","crlite_enrolled":true,"id":"d85352f9-9695-4bfe-89a2-ff7538e82f56","last_modified":1562024890730},{"schema":1562024889244,"derHash":"5TBRElnTP7Pt044OeZ/56PmdTbLaDe4I6vWm0VzOm/w=","subject":"CN=HARICA S/MIME RSA SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"aa6ee4b6bf9ece9b618b29f123445ced2df4d96772d25b1990276d8d2d624806","size":2194,"filename":"xM8U6lxZu3SNSAyNpbQ36H-EvxjEnARVpIOCGxsLfKk=.pem","location":"security-state-staging/intermediates/6078f10c-0713-49fb-9a6f-f79c11264457.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xM8U6lxZu3SNSAyNpbQ36H+EvxjEnARVpIOCGxsLfKk=","crlite_enrolled":false,"id":"15c738ed-e049-4949-a3f5-3ecff5b5e781","last_modified":1562024889988},{"schema":1562024888485,"derHash":"mrJcHnlchaMhQZ0wYvhLUhMrqo9xiEOoPjH7+Z/tw9c=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGoMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxFzAVBgNVBAMTDkRpZ2l0YWxTaWduIENB","whitelist":false,"attachment":{"hash":"a7bf3cbf3d969531a35ed1576876c52a36fedd914f4726823a39f4a86e4c2a2a","size":2991,"filename":"TTc5T1QJhP_HGF4fhXRILAEsILItrPkhDWbrKLF-g48=.pem","location":"security-state-staging/intermediates/df358802-1b62-4be3-af9c-0be569798451.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TTc5T1QJhP/HGF4fhXRILAEsILItrPkhDWbrKLF+g48=","crlite_enrolled":false,"id":"4e1247f1-3352-47d6-a70b-918f9ff41f43","last_modified":1562024889236},{"schema":1562024887746,"derHash":"SOWl4mSjzyYbv+Ay7d4d2LS0sPXdDdDJ/YXYbXg/fMk=","subject":"CN=Fuji Xerox Xnet CA - S2,O=Fuji Xerox,C=JP","subjectDN":"MEQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSAwHgYDVQQDExdGdWppIFhlcm94IFhuZXQgQ0EgLSBTMg==","whitelist":false,"attachment":{"hash":"ca7f1f00fc7733732971935188acb56d2f10501bcf1785f9529278c0af6da1e7","size":1597,"filename":"B7_wi5BX-cgrZ8uOuYuwLz2cFlyRGuCKCG8QhI13A_8=.pem","location":"security-state-staging/intermediates/ff8c919b-9df1-4a2d-a30a-dd1b88ea5a03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B7/wi5BX+cgrZ8uOuYuwLz2cFlyRGuCKCG8QhI13A/8=","crlite_enrolled":true,"id":"f12a157c-5c8a-4341-bb3e-fa661dc4fd0a","last_modified":1562024888478},{"schema":1562024880268,"derHash":"jCdFNSKJ6ZSz6jSURbHPZBjlF0DhYU+LVmfa0pkKrvs=","subject":"CN=Intermediate Certificate DV SSL CA,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MHwxCzAJBgNVBAYTAk5MMSEwHwYDVQQKExhJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSswKQYDVQQDEyJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgRFYgU1NMIENB","whitelist":false,"attachment":{"hash":"b4d9375ac158ea565d87e19563efe0bffa2d9b35d0a3ec1cb40439fcbf57c2b9","size":1585,"filename":"XtinDwVCH8wSv8pJHbNpWDeamHpqtaKQzHBMJWbcb0o=.pem","location":"security-state-staging/intermediates/c970cff7-e508-4abb-a23d-c648d2a7eb09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XtinDwVCH8wSv8pJHbNpWDeamHpqtaKQzHBMJWbcb0o=","crlite_enrolled":false,"id":"9ea12716-014d-47bb-96ee-1f04e7bc9e0f","last_modified":1562024881013},{"schema":1562024879513,"derHash":"f0UljqJ7Vv/P072WlaAdAIM1hbAsotQAHyB8rnB9TP0=","subject":"SERIALNUMBER=201810,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEw","whitelist":false,"attachment":{"hash":"f66ae0ff53aa01cd3d96a637d858b40b7dcb40083da89b0ed48517ba8002be4e","size":2333,"filename":"gYvJdgfG4RYNxCReph78bEwJe4ZMUTH4m5WdTSGBQO0=.pem","location":"security-state-staging/intermediates/f86f76f4-0c31-4f6e-a700-fd319376608e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gYvJdgfG4RYNxCReph78bEwJe4ZMUTH4m5WdTSGBQO0=","crlite_enrolled":false,"id":"c30168e6-4b85-420c-a9db-c6867770efbe","last_modified":1562024880259},{"schema":1562024878761,"derHash":"NkXg8F4ZW+js1FblGMjCPBuyWc1s9GkfKcdErvDBH90=","subject":"CN=HIN Health Info Net CA G2,O=Health Info Net AG,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTAzLjQ4OS4yMTgxGzAZBgNVBAoMEkhlYWx0aCBJbmZvIE5ldCBBRzEiMCAGA1UEAwwZSElOIEhlYWx0aCBJbmZvIE5ldCBDQSBHMg==","whitelist":false,"attachment":{"hash":"1f02a00631f077e6d497487633ace61595a152bb13130f7f948399a4ea859165","size":2426,"filename":"2qRzikSeSMqF3GAhuSwDDfCPaZ7WK5_fh-ltdqq_pHs=.pem","location":"security-state-staging/intermediates/dcf188ae-a660-4584-90f3-d516c6bb0812.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2qRzikSeSMqF3GAhuSwDDfCPaZ7WK5/fh+ltdqq/pHs=","crlite_enrolled":false,"id":"2c275aa5-fa4a-4954-9766-eb65a05fd92c","last_modified":1562024879504},{"schema":1562024878021,"derHash":"PHUECYgkhtZBUfTLtb1hQypKe/QvSKhRmNJFpkrqIRc=","subject":"CN=DigiCert Global CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFERpZ2lDZXJ0IEdsb2JhbCBDQS0x","whitelist":false,"attachment":{"hash":"5488bc0ff40136ae2cb36b9c6832c59747d8afaa43a7f76b52325e286d34753c","size":2377,"filename":"RvzX55Asf6l-cqO5SkbhR9BWb7l3-NErRBT107Elrz0=.pem","location":"security-state-staging/intermediates/91bf19a3-1e46-4902-9fb2-2c722c9e1323.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RvzX55Asf6l+cqO5SkbhR9BWb7l3+NErRBT107Elrz0=","crlite_enrolled":false,"id":"e6419a66-4917-4c6b-b43e-d95def76ef80","last_modified":1562024878754},{"schema":1562024875071,"derHash":"KwqXLcDa4hjpR3OW09gt64LeEYhn3Rnh0v/9lYy7bak=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzM=","whitelist":false,"attachment":{"hash":"5a448b983252a58eb053810201b198c8e0ca3708ef783d3d423dee742a47828d","size":1926,"filename":"KR5gTc0QATJ3BazYGPqHpEWyJKctmA4D8rAR_G5ZTDs=.pem","location":"security-state-staging/intermediates/74a045f9-4415-4b62-913a-1db386925e23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KR5gTc0QATJ3BazYGPqHpEWyJKctmA4D8rAR/G5ZTDs=","crlite_enrolled":false,"id":"15028061-f9e6-499d-821f-65d2a86999f4","last_modified":1562024875804},{"schema":1562024872072,"derHash":"WLOFt2/SjmH2ymHh1eQbMr0rb/UR0vWuoKQCkwT05Io=","subject":"SERIALNUMBER=201721,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIx","whitelist":false,"attachment":{"hash":"1aab2c75a3e101a669521b32a31699e957880a8fc9dcd0800083e61ec235ea1c","size":2402,"filename":"pA5xKViHaau-7Y9W7OAVG-tXBMCXmY-y21N9sBCDKfo=.pem","location":"security-state-staging/intermediates/dde7f3bf-969b-40ba-9d5d-5624e9ef8fd6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pA5xKViHaau+7Y9W7OAVG+tXBMCXmY+y21N9sBCDKfo=","crlite_enrolled":false,"id":"c2d88b2d-3ae6-4af0-855f-e79a625e0121","last_modified":1562024872816},{"schema":1562024869815,"derHash":"ZChKpfjchpfUPZc3z04mZiVBTkScAZZncUU3/37eMbc=","subject":"CN=Cerner Corporation Resonance Intermediate CA,OU=Cerner Resonance,O=Cerner Corporation,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJDZXJuZXIgQ29ycG9yYXRpb24xGTAXBgNVBAsTEENlcm5lciBSZXNvbmFuY2UxNTAzBgNVBAMTLENlcm5lciBDb3Jwb3JhdGlvbiBSZXNvbmFuY2UgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"9f624f222fa5cd4a2856e02e5004f9842d469f56e8872ab89c0f7bc51516c2ed","size":1991,"filename":"4C07Vx9oeNSH3l4niOhQm70ScZnmEeg8OqJMEHi4z9U=.pem","location":"security-state-staging/intermediates/f70d825c-cf4d-49f0-9b9c-d3f0ced63101.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4C07Vx9oeNSH3l4niOhQm70ScZnmEeg8OqJMEHi4z9U=","crlite_enrolled":false,"id":"20f6264e-9de5-41e5-a881-6e3b1f47e8fe","last_modified":1562024870559},{"schema":1562024869073,"derHash":"oaBOTPxW/RkX60gfxGYpouRmVnVvoI4iSH9Utk4co+c=","subject":"CN=GRnet Client RSA SubCA R1,O=Greek Research and Technology Network,L=Athens,C=GR","subjectDN":"MHIxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxLjAsBgNVBAoMJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsxIjAgBgNVBAMMGUdSbmV0IENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"4c50596281c571a054e43965332daf357b3937daf3f45b7d2f565f691bec1c33","size":2897,"filename":"MH1lWQOCumqlkszCNDBuz80yo8Fj_thQXg9jnFecWgc=.pem","location":"security-state-staging/intermediates/17214962-d27b-4854-babd-44e89df3ac9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MH1lWQOCumqlkszCNDBuz80yo8Fj/thQXg9jnFecWgc=","crlite_enrolled":false,"id":"509309e3-6189-400c-ae81-c45c2abac5d3","last_modified":1562024869808},{"schema":1562024868324,"derHash":"X3xuYEHapRPL/j1OB/3ITiMNohry3hhkYMnsBIFRbas=","subject":"CN=RTI SHA256 CA - G2,O=RTI International,ST=NC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJOQzEaMBgGA1UEChMRUlRJIEludGVybmF0aW9uYWwxGzAZBgNVBAMTElJUSSBTSEEyNTYgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"cbef60c762d29886a600043acf7949a95177ebc650a28e59784022968b60ab80","size":1825,"filename":"xFFKZx2Nrui3Dfx2WCyqmSMf_fKapm_iSGqD9HeReZ4=.pem","location":"security-state-staging/intermediates/e251dce3-60e0-45ea-bd46-4bb8e8ba5648.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFFKZx2Nrui3Dfx2WCyqmSMf/fKapm/iSGqD9HeReZ4=","crlite_enrolled":false,"id":"74348592-3637-4bdf-ba15-78a85d3d0e6b","last_modified":1562024869065},{"schema":1562024863814,"derHash":"UQRHBr0je5G4m3gTN+bWJlbGnw/P++jkN0E2eUgSeGI=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"dd0b79ea02b6563d3e84faf5dc0697b11407132275d90389c15a9ddd28522099","size":1857,"filename":"Aku_IBq7yK9olk3VEZXtYwXrnZNnmT_LG0IJShBEL8A=.pem","location":"security-state-staging/intermediates/a74bcd6c-f384-4fde-ad3b-504cc56e416a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Aku/IBq7yK9olk3VEZXtYwXrnZNnmT/LG0IJShBEL8A=","crlite_enrolled":true,"id":"ca7e6cd9-9ffa-4c56-b2cf-5e35e31952c1","last_modified":1562024864546},{"schema":1562024861561,"derHash":"KDymk5UwwbVQORUFGTY3iuNocZZ7A+TC58JD8Uln3rE=","subject":"CN=Advanced Code Signing Class3 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGOMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExNjA0BgNVBAMMLUFkdmFuY2VkIENvZGUgU2lnbmluZyBDbGFzczMgZS1Temlnbm8gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"12682a46c377cf0af1a09b1c08ef498ef4f1a96910c1f5442eb2b93d74c1a63c","size":2609,"filename":"IRoGHWUMgrIjO51yPcDjQ7km1QjZxz45uOOJou6I2pc=.pem","location":"security-state-staging/intermediates/fa8ed706-b516-4b1c-8125-839eea7101ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IRoGHWUMgrIjO51yPcDjQ7km1QjZxz45uOOJou6I2pc=","crlite_enrolled":false,"id":"0b5fdf3a-67b2-4466-b789-59a7d9a1889a","last_modified":1562024862308},{"schema":1562024860822,"derHash":"JiqVadYPuN5epRi4pxYib6dOsA3M6+zfq4e3cEr1Kxo=","subject":"CN=UIS-IsuB1-CA","subjectDN":"MFkxEzARBgoJkiaJk/IsZAEZFgNjb20xFjAUBgoJkiaJk/IsZAEZFgZ1bmlzeXMxEzARBgoJkiaJk/IsZAEZFgN1aXMxFTATBgNVBAMTDFVJUy1Jc3VCMS1DQQ==","whitelist":false,"attachment":{"hash":"a08272301840b097781c274e5446f676d117787159bb8f518efb6ddbed72cb4a","size":2487,"filename":"nPyHHj3iaTRtU8JqSy01uXEKmAdoIJseqjWg0UAG7tk=.pem","location":"security-state-staging/intermediates/a30aa611-1168-414f-a8bc-4c66f0ab693f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nPyHHj3iaTRtU8JqSy01uXEKmAdoIJseqjWg0UAG7tk=","crlite_enrolled":false,"id":"8410f360-6f88-469b-9196-dfbaf3acd285","last_modified":1562024861553},{"schema":1562024859332,"derHash":"KqvkLLVo6V1CjT+vWya+QHJOzfyZeEDgVVvVi2LE7yM=","subject":"CN=Sectigo ECC Extended Validation Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxODA2BgNVBAMTL1NlY3RpZ28gRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"9828e13ba39934a6990e6451aa9158a8e684732373e595b1c319b8df4be3ea5b","size":1313,"filename":"5JDYk2l2fSok8gLeyXpwC1pk8SkhbPX0CmZF5u-n-x4=.pem","location":"security-state-staging/intermediates/c642714a-7fa3-43bd-9bc7-a3fe279072c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5JDYk2l2fSok8gLeyXpwC1pk8SkhbPX0CmZF5u+n+x4=","crlite_enrolled":false,"id":"9271e1a4-5616-4363-8211-35732600e9ab","last_modified":1562024860073},{"schema":1562024858550,"derHash":"tfYuw4ExzRSx/JW4d/TSEL5L+sx+amqhQi2J40t6xME=","subject":"CN=GoGetSSL Domain Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGAMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxKzApBgNVBAMMIkdvR2V0U1NMIERvbWFpbiBWYWxpZGF0aW9uIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"1a7005883cb2d9190f4111d29fd64d2d6eb960cc76830263a72234e826bbf517","size":1748,"filename":"p185bYxiFO-ZwKAV-mIneHw-vuH2rqpYkDOyjKN7DyE=.pem","location":"security-state-staging/intermediates/eaf84a71-fc34-486e-afdf-26e1ecaca22a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p185bYxiFO+ZwKAV+mIneHw+vuH2rqpYkDOyjKN7DyE=","crlite_enrolled":true,"id":"35456425-adac-45ee-84d4-3a5c1b317e14","last_modified":1562024859324},{"schema":1562024857065,"derHash":"WTxKtgZs32GFBn9WJnf93/UzZW20vS1XdzUwFwQVAhg=","subject":"CN=HARICA S/MIME RSA SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjM=","whitelist":false,"attachment":{"hash":"a83f0a21e25c370f20d5b261f8c0144f52b2dbaee8bc152173328d14b5b5333d","size":2576,"filename":"mAFvZFLJVXz5g-NekMLk2KNs8YG2rW6wdyEVN_f39oo=.pem","location":"security-state-staging/intermediates/b247282b-5d94-4b53-9606-a3673633c9ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mAFvZFLJVXz5g+NekMLk2KNs8YG2rW6wdyEVN/f39oo=","crlite_enrolled":false,"id":"2a41a971-f7dc-43b7-8399-58834c275ffa","last_modified":1562024857807},{"schema":1562024856324,"derHash":"wWhWg/PIWQ6IWAGX8hnKuZ5UgqFWhjX1ltCYZ7L0Bb0=","subject":"CN=Postecom CS4,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT","subjectDN":"MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNA==","whitelist":false,"attachment":{"hash":"de76f670947dcff8a54c28b36c13874dd66e9d06b895c4db7e7d1a6f868e235c","size":1630,"filename":"PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=.pem","location":"security-state-staging/intermediates/bb160719-35aa-4b66-8da3-d888d2e69d82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=","crlite_enrolled":false,"id":"cfba4ef3-ee7d-4149-a5c5-2ee13435b22f","last_modified":1562024857057},{"schema":1562024855553,"derHash":"6BRDFB48EjLQZGXhG70fbKcYGj4Df4FbuPqurea+vtE=","subject":"CN=USERTrust ECC Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"73ad2394da4b0573e87030992e5584fa70d07050a7e76cd42001999693620fa7","size":1362,"filename":"H-5ErRMlCt-Y6SWx-LsLzsfdqO6rR8VCeSlgzeC0WN4=.pem","location":"security-state-staging/intermediates/9082d08a-28cc-471e-be19-5909cd26b697.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H+5ErRMlCt+Y6SWx+LsLzsfdqO6rR8VCeSlgzeC0WN4=","crlite_enrolled":true,"id":"e9b57d1a-9af1-4e57-9928-32303fcf43bb","last_modified":1562024856315},{"schema":1562024854039,"derHash":"WtzFRRSRawLb9eBllS6cEwvsWUIeD+oc6WR/AgULfsY=","subject":"CN=AffirmTrust Premium ECC Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE3MDUGA1UEAwwuQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"7c6fa8fcab000dee92f2ec0db7f18ca2b144e6a21ce56a5a139a14b4bbf233cd","size":1130,"filename":"wbpI9B7IKa-_o7qnyxj6V-kvQMgcCDHDVt0t5EmhFCU=.pem","location":"security-state-staging/intermediates/45dd76ee-2745-409b-bee9-161e415c43f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbpI9B7IKa+/o7qnyxj6V+kvQMgcCDHDVt0t5EmhFCU=","crlite_enrolled":false,"id":"b0b9a2da-1db8-477b-8f2d-fd982ccf1c1f","last_modified":1562024854781},{"schema":1562024851756,"derHash":"K/IbQe5Lg2ylXm8kcrh9DKPPSz/gpRtvrzwvLZx06tg=","subject":"CN=KAGOYA JAPAN Certification Authority,O=KAGOYA JAPAN Inc.,C=JP","subjectDN":"MFgxCzAJBgNVBAYTAkpQMRowGAYDVQQKExFLQUdPWUEgSkFQQU4gSW5jLjEtMCsGA1UEAxMkS0FHT1lBIEpBUEFOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"1a080603b98669a1a61cbd208ffc3f06e5b85723a23cbba442d7126215e92d9c","size":1601,"filename":"wsjiB7F9r4B6PJrOA__iDtqeFteT01LDiESeoSm0aZI=.pem","location":"security-state-staging/intermediates/fe7eede0-1dba-45e7-9192-31be08622204.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wsjiB7F9r4B6PJrOA//iDtqeFteT01LDiESeoSm0aZI=","crlite_enrolled":false,"id":"1a7227e1-a59c-4b29-ab18-0f65195a0fa1","last_modified":1562024852483},{"schema":1562024851020,"derHash":"dM6MFjHvnzjnpBl9o/VHTbw08AHylnwltZmVYrzIydQ=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"068ffe7d3845059cb2339b66db36d7eb98f9f4a3f6355a0096a5afacba936f8b","size":2235,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/e056a24a-4812-4978-a64d-ee15e4344a04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"b4215e2b-457b-4e7f-a5b1-31fb5a7d6a9b","last_modified":1562024851748},{"schema":1562024846502,"derHash":"MGKRjZ3WF5JScbx/gIC4pqXSGFu9iA94Yv1MBDsZQZE=","subject":"CN=Buypass Class 2 CA 5,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAyIENBIDU=","whitelist":false,"attachment":{"hash":"fd5a69fd438ea769861dbb346922f606e66c972bf1b76d0b4b699d88aef6ef6a","size":2170,"filename":"QlGZmcMUM6a8-CxL2TmTAfoYCm-fXAouAzzKYCxGoss=.pem","location":"security-state-staging/intermediates/d6a8096b-9b05-41b8-984a-b244edc193b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QlGZmcMUM6a8+CxL2TmTAfoYCm+fXAouAzzKYCxGoss=","crlite_enrolled":true,"id":"355287c5-30e3-4992-b72c-8013c887d757","last_modified":1562024847233},{"schema":1562024844261,"derHash":"c2uZbTOWhHKcQ8s5fRuysvP0p4FqXjxdWJID+IXF1Hw=","subject":"CN=Certigna Identity Plus CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEiMCAGA1UEAwwZQ2VydGlnbmEgSWRlbnRpdHkgUGx1cyBDQQ==","whitelist":false,"attachment":{"hash":"f191c1abecb352ea767687d0c74090ae61fb68eaf1b3c23628b26f00a9933fe1","size":2519,"filename":"ywhSp1oF34bfFheBzKO3KqbsXi-qQbyfXu94SMYBxwg=.pem","location":"security-state-staging/intermediates/ac1807a4-6a83-4902-a18f-cc1d275b7d34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ywhSp1oF34bfFheBzKO3KqbsXi+qQbyfXu94SMYBxwg=","crlite_enrolled":false,"id":"e7d0d7ea-579e-4b38-893f-de28d80bc3ba","last_modified":1562024844993},{"schema":1562024843491,"derHash":"91pNSaUrBD/HMkuPJjrIqbe9IqMohoWIvfyTfTw5brY=","subject":"CN=Belgium Root CA3,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ez","whitelist":false,"attachment":{"hash":"241dee2e8ef4e0f89c5b6071322dc968ba5e5de346e84839261ec88e12c3706e","size":1768,"filename":"x7xeSTcmu_Ux9i_F9VE6wD6tgTr03NRFszBbo9PVM3Q=.pem","location":"security-state-staging/intermediates/052d56a4-4cca-49d4-9fc4-3c121e75f3b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x7xeSTcmu/Ux9i/F9VE6wD6tgTr03NRFszBbo9PVM3Q=","crlite_enrolled":true,"id":"9d3cfb47-14a6-4dab-9b93-a2164cae62c4","last_modified":1562024844254},{"schema":1562024842011,"derHash":"Bq+ECc5a1B4bfs/c0yF3PhiGlafpD+eWM4VKBAsH8Io=","subject":"SERIALNUMBER=201909,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA5","whitelist":false,"attachment":{"hash":"155fee7f4485ec5abbb06ea19377003c4720b3678db5e8260b1327ab444e7b9a","size":2333,"filename":"HqqnLyY4pkP41GQ_CWZPTbAhR6NJ_qx2zkp_fCPzaqM=.pem","location":"security-state-staging/intermediates/d07f50ce-d0fe-4f38-b04d-fc8bb21111e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HqqnLyY4pkP41GQ/CWZPTbAhR6NJ/qx2zkp/fCPzaqM=","crlite_enrolled":false,"id":"637b4b4d-19c6-49e1-a72d-3cb503859a46","last_modified":1562024842745},{"schema":1562024841257,"derHash":"oF7kPlVsjCo4dm0Dd/tIaAbRaeoZXmnNhzOB2Oq3380=","subject":"OU=\u91ab\u4e8b\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOmGq+S6i+aGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"5aac98b3e8004b6852a1a3686b2d78a1cf8f9b3caf283358f17bead0b43dc7a8","size":1841,"filename":"shQPJLnlxje6ndMEVR9GtIQdN2YEIsFYAHMiwD_1bdE=.pem","location":"security-state-staging/intermediates/c36c8a14-915a-43a4-81be-aad60c6c0113.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"shQPJLnlxje6ndMEVR9GtIQdN2YEIsFYAHMiwD/1bdE=","crlite_enrolled":false,"id":"9db46b42-5447-4d92-b0f4-4701e9a0e1d9","last_modified":1562024842003},{"schema":1562024840500,"derHash":"ATeet7hfaO3CRltCQ4CXaH6+Hq5JMZY5v7NC78PO+h0=","subject":"CN=CERTSIGN FOR BANKING QUALIFIED DS TEST CA V3,OU=Certificat de test Test certificate,O=certSIGN,C=RO","subjectDN":"MIGFMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLDAqBgNVBAsTI0NlcnRpZmljYXQgZGUgdGVzdCBUZXN0IGNlcnRpZmljYXRlMTUwMwYDVQQDEyxDRVJUU0lHTiBGT1IgQkFOS0lORyBRVUFMSUZJRUQgRFMgVEVTVCBDQSBWMw==","whitelist":false,"attachment":{"hash":"bf0841437cff0c49b20954c90edf74119d9005723c6fac5a22f5b7e9949b7562","size":1658,"filename":"KWZVh2Uo0VJTsQaEe-fd3OibRGv0EhYSgphzM6kiYeY=.pem","location":"security-state-staging/intermediates/4e2829f2-e770-4a7b-bf5f-26dc917d6fd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KWZVh2Uo0VJTsQaEe+fd3OibRGv0EhYSgphzM6kiYeY=","crlite_enrolled":false,"id":"9ad29fec-b9bc-433a-96c0-21647e2caaa0","last_modified":1562024841250},{"schema":1562024839008,"derHash":"1eetJ1qin9TUXn+dPf9X78ywlPGFOxqhrSKWjLGLLMU=","subject":"CN=SECOM Passport for Code Signing CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTRUNPTSBQYXNzcG9ydCBmb3IgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"b1b8376a419f1cdb25298ba405e9601b0a8815e1b993c4cc0dba4d36e4cb899c","size":1613,"filename":"nbl62DjAbORsYtz-i6CUcy6Va4Bn0Wb6XbbJyf7h5t4=.pem","location":"security-state-staging/intermediates/5a196805-7716-4404-94c8-0d7c6d6fce7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nbl62DjAbORsYtz+i6CUcy6Va4Bn0Wb6XbbJyf7h5t4=","crlite_enrolled":false,"id":"b915a10c-dc02-4bcf-af1a-9f479bfa83fd","last_modified":1562024839746},{"schema":1562024836744,"derHash":"XCpjKbe9Gi//HB7dcyUxSJLfEUkbOUKoP08LE2lMzAE=","subject":"SERIALNUMBER=201730,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzMw","whitelist":false,"attachment":{"hash":"48e5e3e9a19fd493091deb28a383f2a979a45f74c5f56b81826daf977e48c075","size":2402,"filename":"MGswEonwdtFVVnhmZzb1mw5D9KJSfCyi_dRuQSn64sY=.pem","location":"security-state-staging/intermediates/7eb06311-8888-4d7c-8cc1-7b7b92e20d3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MGswEonwdtFVVnhmZzb1mw5D9KJSfCyi/dRuQSn64sY=","crlite_enrolled":false,"id":"80c699b8-5637-4698-b774-eefba7401a08","last_modified":1562024837488},{"schema":1562024834509,"derHash":"fTOuYYzWJVM3fSU9LryihdhOmKkk2J+Y1L5P7jH5Kqg=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"c9439a1dc15fd344909f598016e2c848de6e40651f0f2294891f78e59cb26f4a","size":2804,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/a4a5c871-1de7-4529-bc71-a59dfdc2f199.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"491aff6b-5922-48f6-b983-555e06fe0188","last_modified":1562024835254},{"schema":1562024833018,"derHash":"yIOz7MasDe51zdWF5zogkoe8DJ+dedSIhg9j4uqKfSw=","subject":"CN=GlobalSign EC Administration CA2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEVDIEFkbWluaXN0cmF0aW9uIENBMg==","whitelist":false,"attachment":{"hash":"fa6f0725fd87b33f403012750721939c96d5375455d0c99502d8483d16257b3e","size":1077,"filename":"zzbDiHfMkWT0L5Kqak7r2CbmLNItoOhMZrRdT1c4eHQ=.pem","location":"security-state-staging/intermediates/5a9babab-e54e-4213-a0a3-463e6b9c5fc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zzbDiHfMkWT0L5Kqak7r2CbmLNItoOhMZrRdT1c4eHQ=","crlite_enrolled":true,"id":"fc596052-49ff-470b-807f-143c5f421b18","last_modified":1562024833753},{"schema":1562024832266,"derHash":"kaMhrX/TyXgSFNdvXijrDTGshml+33AOmvlMdIX1tSE=","subject":"CN=GoGetSSL RSA EV CA,OU=Controlled by COMODO CA exclusively for GoGetSSL,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MIGHMQswCQYDVQQGEwJMVjENMAsGA1UEBxMEUmlnYTERMA8GA1UEChMIR29HZXRTU0wxOTA3BgNVBAsTMENvbnRyb2xsZWQgYnkgQ09NT0RPIENBIGV4Y2x1c2l2ZWx5IGZvciBHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"b3e85c26c77bebd92394771e7fb3c0466dd42cb33e30893cb845e25d76146b7f","size":2198,"filename":"kr1IBiy8TZumRDu-iU8HD2GILSEqTPUTw6G9jcHRek4=.pem","location":"security-state-staging/intermediates/a2855c8c-ae89-46bc-b28d-664f3cdf95d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kr1IBiy8TZumRDu+iU8HD2GILSEqTPUTw6G9jcHRek4=","crlite_enrolled":true,"id":"0e87223f-7e82-4b81-82ee-0ac036409b87","last_modified":1562024833010},{"schema":1562024830009,"derHash":"aNCy6Mhb8Am02zmsi14vqOH9n9HlAocE6pKIx+Ryqus=","subject":"CN=TrustAsia TLS ECC CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"7ee8d9739388c554cf3b1e8c694adbfcc8987281bc7d6e0e3f70e444d02785f6","size":1406,"filename":"x-B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=.pem","location":"security-state-staging/intermediates/c71c3a1a-6e42-4bc5-a94e-780ef1d291b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x+B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=","crlite_enrolled":false,"id":"70288a6a-8a68-4abd-90d8-88c8a920eafb","last_modified":1562024830748},{"schema":1562024829266,"derHash":"ahdFsxF2+sKEQgorzvZ7WeIqHTd1OrryzFGy9XKSJYg=","subject":"CN=Google S/MIME Authority,O=Google Inc,ST=California,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpHb29nbGUgSW5jMRMwEQYDVQQIEwpDYWxpZm9ybmlhMSAwHgYDVQQDExdHb29nbGUgUy9NSU1FIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"1e75e1f63fa5904dbac0ed5fd58f6d1fa0b06f2923a05d13e1a380f9de1994d7","size":1516,"filename":"6OsRXz4NaQTtHc0exgRVipVz12OxHvsJx91beGJIISY=.pem","location":"security-state-staging/intermediates/6905c2d3-33a3-4d80-820f-a4e4667c46ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6OsRXz4NaQTtHc0exgRVipVz12OxHvsJx91beGJIISY=","crlite_enrolled":false,"id":"af05d3d2-2dc9-4bc1-bb41-e70d4ddeebbb","last_modified":1562024830001},{"schema":1562024826951,"derHash":"ybBswIMYYiBhjmGodyZA+CTfadVhrVa9wVrVbQzghgg=","subject":"CN=Apple IST CA 2 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMTE0FwcGxlIElTVCBDQSAyIC0gRzExIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKEwpBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"d84962e6ad0e174b509f0b27d7aca095081588308e85148f0e798c3dcccfd511","size":1662,"filename":"tc-C1H75gj-ap48SMYbFLoh56oSw-CLJHYPgQnm3j9U=.pem","location":"security-state-staging/intermediates/811c650d-5339-4109-9f5c-e9b038422338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tc+C1H75gj+ap48SMYbFLoh56oSw+CLJHYPgQnm3j9U=","crlite_enrolled":true,"id":"acc298cc-782a-430e-96f7-3ba5d0bc27cf","last_modified":1562024827724},{"schema":1562024825471,"derHash":"FD3+ZYMuID5NKOww+2C6c77jru4wij+NGUu2Hn0dm8A=","subject":"CN=FujiSSL ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for Nijimo K.K.,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIG9MQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIE5pamltbyBLLksuMTcwNQYDVQQDEy5GdWppU1NMIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"7fd1609480c2d19f3b96f886987e7f05a7ffd31bd99533859f434d8cadcdc8d2","size":1427,"filename":"2e_93k3ZMkd5hB-WURSs0iPYqDfeY-hXB4RKemS8IaE=.pem","location":"security-state-staging/intermediates/9d3d3199-435c-45cd-86ba-6042d28ece9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2e/93k3ZMkd5hB+WURSs0iPYqDfeY+hXB4RKemS8IaE=","crlite_enrolled":false,"id":"3cfe9cd7-b3f2-44ad-a875-c7796e21f3a9","last_modified":1562024826204},{"schema":1562024823958,"derHash":"4ImK1mJHS591PHm+qHgDHJpdY0pJ7dYxC5YKsCPALA4=","subject":"CN=Symantec Class 3 Secure Server SHA256 SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxNTAzBgNVBAMTLFN5bWFudGVjIENsYXNzIDMgU2VjdXJlIFNlcnZlciBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"6856696d26dbf4f188099804b32d22a587d73027e302a1bade4f49e4827ad115","size":1894,"filename":"UUrclr9NL3MR9M9GTzAcVbt7zjo5AEKuhrEWmsJftnM=.pem","location":"security-state-staging/intermediates/adf7b301-8924-4c07-87fb-659291ed7d21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UUrclr9NL3MR9M9GTzAcVbt7zjo5AEKuhrEWmsJftnM=","crlite_enrolled":true,"id":"7376bf35-99c0-4599-b55b-4372cc68156e","last_modified":1562024824721},{"schema":1562024823207,"derHash":"2xKx0/jMUv/0h08Ki4Xp+2ogUIYbGxxhSBp0OsDTPVo=","subject":"CN=Rush Health CA,OU=Orion Health Direct Secure Messaging,O=Rush Health,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtSdXNoIEhlYWx0aDEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRcwFQYDVQQDEw5SdXNoIEhlYWx0aCBDQQ==","whitelist":false,"attachment":{"hash":"777756dbdf8987198ed063115b1af53ee0bec8ee20305ff10783615126df2832","size":2259,"filename":"H4lnk1fnK8QrG5dwIupUznM6vj1SaMgHe3uXgdSHJ-o=.pem","location":"security-state-staging/intermediates/06583537-d1cb-435e-b252-acc108705a5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H4lnk1fnK8QrG5dwIupUznM6vj1SaMgHe3uXgdSHJ+o=","crlite_enrolled":false,"id":"8d5c4590-b907-4274-953c-6e4dcad27053","last_modified":1562024823950},{"schema":1562024821713,"derHash":"MrSzdoylpNgOnfjVV7dCT4CvVWCxFI0FVI3D12p+1hk=","subject":"CN=Apple Public Client RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgQ2xpZW50IFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"29d465ec2e13b115b26b4088d20107aae09a74247d8056a2222d2c038b00e1a9","size":1593,"filename":"yARYMQ6SJG9XZEjFw3uGtG-NvMLIHJJ92EADe2HF4R8=.pem","location":"security-state-staging/intermediates/46b493f4-0121-4083-874f-08b85d4a39b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yARYMQ6SJG9XZEjFw3uGtG+NvMLIHJJ92EADe2HF4R8=","crlite_enrolled":false,"id":"19e6f602-273b-4858-ad46-71682dead98a","last_modified":1562024822460},{"schema":1562024817950,"derHash":"Zp53J6kr5y2XGOFpItwbwUkrGvM/pHk+aNh3jxmi6+A=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"a1bfe295fb75b101ae4073c6fbcf06f41c7f851774b0b9fd6b9cac8bea35926a","size":1573,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/29e7705d-08aa-4026-aa35-5039e8543166.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"b87cbd17-c73d-4c6b-a126-fb3cff29f8f3","last_modified":1562024818708},{"schema":1562024816467,"derHash":"L3IBnLRbB6sFyxu47MMHbXByZgtXop5C6+KqV7g7xgs=","subject":"CN=Symantec Class 3 Shared Public Organization CA - SHA256,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgU2hhcmVkIFB1YmxpYyBPcmdhbml6YXRpb24gQ0EgLSBTSEEyNTY=","whitelist":false,"attachment":{"hash":"a99b6543f5b69ea99d4f440cdea24736cc6e6c9b19053da4a191265ee6e04b02","size":1910,"filename":"-TjXJ8RrycvnPfZ2ADExTGcSG5sKLN4p4fett5kkFVc=.pem","location":"security-state-staging/intermediates/28645f83-6522-408d-967b-8b5b43d0b945.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+TjXJ8RrycvnPfZ2ADExTGcSG5sKLN4p4fett5kkFVc=","crlite_enrolled":false,"id":"edd90e50-1b90-45ae-834d-6d43597478f3","last_modified":1562024817197},{"schema":1562024815714,"derHash":"CJKAkjZZMWGXWfK4tE7Sq8Aw2K9sPDFJ+8sHx4qWzjY=","subject":"CN=SSLs.com RSA EV Secure Server CA,OU=Controlled by Sectigo exclusively for SSLs.com,O=SSLs.com (Namecheap\\, Inc.),L=Phoenix,ST=Arizona,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEQMA4GA1UEBxMHUGhvZW5peDEjMCEGA1UEChMaU1NMcy5jb20gKE5hbWVjaGVhcCwgSW5jLikxNzA1BgNVBAsTLkNvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgU1NMcy5jb20xKTAnBgNVBAMTIFNTTHMuY29tIFJTQSBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cf68f2c97f44e659a8fec4a8a0a3cf961eacf7dd93197d05df0d3970f3157ec6","size":2263,"filename":"e3CoG9n5TuSLIlY6MxPqo4fACcPQacL73N47EKEZh80=.pem","location":"security-state-staging/intermediates/45afb960-c21a-415e-a67c-c856bb993f2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e3CoG9n5TuSLIlY6MxPqo4fACcPQacL73N47EKEZh80=","crlite_enrolled":false,"id":"77895549-6665-42c1-957c-27c5953f4670","last_modified":1562024816459},{"schema":1562024814967,"derHash":"7r7fhG8dug6Iqba5qw/2Xwl/KEwGpkqTnujFyebzE/Q=","subject":"CN=WISeKey CertifyID Personal GB CA 1,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBQZXJzb25hbCBHQiBDQSAx","whitelist":false,"attachment":{"hash":"eeb8f2892ae58328e19191b4b5160a2d5d690fcb71232c4a0298be7be4686bee","size":1752,"filename":"O0NXa9mctJwNcofSAYnjRkrOXQmaULQorTfUS7KRo6c=.pem","location":"security-state-staging/intermediates/4c416bc6-29ca-4a1d-8453-554ce8e86371.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"O0NXa9mctJwNcofSAYnjRkrOXQmaULQorTfUS7KRo6c=","crlite_enrolled":false,"id":"85c5274a-871e-4fd7-80bf-bd6711023ec2","last_modified":1562024815705},{"schema":1562024814212,"derHash":"ZVXWYdN/JJSiPC1fg0eeeAUbbedqFHtQbWvqKIK00GY=","subject":"CN=DigiCert Secure Site Korea CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIENB","whitelist":false,"attachment":{"hash":"fc29957f16bdc0486d762dbf5aedac6a8beb9dcb70bffc98c77fdf64a61c982a","size":1646,"filename":"trjGmNMo7m2JbQME1aNrIcNXkG-fscWHZcrs2zCZOHg=.pem","location":"security-state-staging/intermediates/0494e722-cc07-4c6a-9de7-04ad4fe72e28.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"trjGmNMo7m2JbQME1aNrIcNXkG+fscWHZcrs2zCZOHg=","crlite_enrolled":false,"id":"1d1dcdf6-815c-4995-b5e9-5396aa70d4dc","last_modified":1562024814959},{"schema":1562024813469,"derHash":"xUgNe/+VLRvoYXj/cT8R9Rz3QjLuVnb8WhcNSmpv5Qo=","subject":"CN=IdenTrust ACES CA 2,OU=IdenTrust Public Sector,O=IdenTrust,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxIDAeBgNVBAsTF0lkZW5UcnVzdCBQdWJsaWMgU2VjdG9yMRwwGgYDVQQDExNJZGVuVHJ1c3QgQUNFUyBDQSAy","whitelist":false,"attachment":{"hash":"70fc07993b6ce80dd61ad20839fdb1f4a131a992c9111b6d78359f0a6afee877","size":2374,"filename":"IwMaflbabx_L7ZJzQfxYFjeJq6DfrV4DtdtBvNHuyNQ=.pem","location":"security-state-staging/intermediates/d40df6fc-5112-4daa-a568-3a1638209e5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IwMaflbabx/L7ZJzQfxYFjeJq6DfrV4DtdtBvNHuyNQ=","crlite_enrolled":true,"id":"0edeebe3-9085-404e-9104-ccf70090f4dc","last_modified":1562024814204},{"schema":1562024812732,"derHash":"pccVHarAwyimncZNZ3vWZwM3EIZ/0+IZ5H4qSeC7Qr8=","subject":"CN=MilleniumSign Code Signing Certificate CA RSA,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGPMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTYwNAYDVQQDDC1NaWxsZW5pdW1TaWduIENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDQSBSU0E=","whitelist":false,"attachment":{"hash":"aeaa40b5d73d509719af557963bf77aa71b1368ff2b832b2653f0c0046c65710","size":2568,"filename":"WdSLOooV5TQ8cmS2oXIK3QCY0LIp5kupdZbbUo5psYU=.pem","location":"security-state-staging/intermediates/5605ff36-2876-486c-8365-4842b367be04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WdSLOooV5TQ8cmS2oXIK3QCY0LIp5kupdZbbUo5psYU=","crlite_enrolled":false,"id":"8f581b38-d44e-4f78-8b77-d374d71b3718","last_modified":1562024813461},{"schema":1562024811611,"derHash":"1XuYcrHu+OgDKrLoyw5jtoXRZVxRxFTyP5l136Ktfgo=","subject":"CN=AffirmTrust Premium Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczEzMDEGA1UEAwwqQWZmaXJtVHJ1c3QgUHJlbWl1bSBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"0e5a29ad6919bb5ec5d101857ea182d71e759e19915b21684a1d1cde6ed06b13","size":2414,"filename":"3gMCuDMv_P0gIb194xpHJCsdZogzAhE3N6usv_7BXhk=.pem","location":"security-state-staging/intermediates/199b0582-a65b-42a8-ba15-7d0fbdcf2937.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3gMCuDMv/P0gIb194xpHJCsdZogzAhE3N6usv/7BXhk=","crlite_enrolled":false,"id":"17ae7da2-5633-4d3a-92b0-82782ee74321","last_modified":1562024812723},{"schema":1562024809754,"derHash":"7cc0xQFQHceidEj6AsdJMfhXi/KXsXPzS4QegsZpGSY=","subject":"CN=GlobalSign RSA EV QWAC CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIFJTQSBFViBRV0FDIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"e36e727ca82d6250ef1552ffd1b955b45f64f8d642e3b0b7c74440a913343a99","size":1959,"filename":"sHs4J5kRzSpOR8B4w5hjWaDPqfeO_b7HlAyT-cooapo=.pem","location":"security-state-staging/intermediates/3a1b3cff-c7d5-48dd-a11d-654a654eafc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHs4J5kRzSpOR8B4w5hjWaDPqfeO/b7HlAyT+cooapo=","crlite_enrolled":false,"id":"4f4e7833-37a9-4ab5-b9b6-773e1a6dd497","last_modified":1562024810490},{"schema":1562024808990,"derHash":"gP3kKCEq8MoKxTHu5u0t89PCpFV9/OhXBw/JR5IumyQ=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"73d01cd825755ae10a290835ef3db09ca9ed8937d4f11bcf9f033cd8a7315522","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/50c0d7df-0130-4f21-b8b8-42dd52838404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"fc1f6c56-2813-4b76-9707-d6f69619e349","last_modified":1562024809746},{"schema":1562024803886,"derHash":"VU464xSv8mTT/efyu8gY8uc02UszYgjt7+fDexYrapY=","subject":"CN=SSL.com EV Timestamping Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgVGltZXN0YW1waW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"1854e08a78906263193fd2a0a983ae57a216a24ba67d1eb24771dd1d729d9465","size":2511,"filename":"gaRV9R7xQa8c6ov_2Zq2uULuRvjacPoz06QTG4LB0h0=.pem","location":"security-state-staging/intermediates/a423da0f-3134-4795-a33f-2cf3af4e8559.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gaRV9R7xQa8c6ov/2Zq2uULuRvjacPoz06QTG4LB0h0=","crlite_enrolled":false,"id":"36d7107c-26e1-4e68-8d92-fcb78298673e","last_modified":1562024808982},{"schema":1562024803135,"derHash":"Kp0NAYu0n96hTWwW6boKlC8oM7mq3/utEwbjAbSVz7c=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"2ad03492e4239b9829ba99cbc77972e7aa518670367cb6c29b439894422fba8b","size":1817,"filename":"moFjHuv-moWxld4bAnXe_iuvG8CdWVGn1hd1j6npb7s=.pem","location":"security-state-staging/intermediates/aa96186c-483d-49db-ae7f-f3087565a3d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"moFjHuv+moWxld4bAnXe/iuvG8CdWVGn1hd1j6npb7s=","crlite_enrolled":false,"id":"6376e328-15c0-4ccf-9703-eebe193ffcc1","last_modified":1562024803879},{"schema":1562024800131,"derHash":"Ep+13lAeJAQc0UqBB1/RzeJXQI1KNT5jaRLji92i0/s=","subject":"CN=Certum Domain Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGFMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSkwJwYDVQQDEyBDZXJ0dW0gRG9tYWluIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"e25bdf92d0be8655e107328d6904320e57365813d9a19f81ea387cb5426c4296","size":1727,"filename":"S4AbJNGvyS57nzJwv8sPMUML8VHSqH1vbiBftdPcErI=.pem","location":"security-state-staging/intermediates/4ebda4af-1b27-4b52-bf3e-baac3a47d395.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S4AbJNGvyS57nzJwv8sPMUML8VHSqH1vbiBftdPcErI=","crlite_enrolled":true,"id":"61249918-c227-4afe-9de6-22348a31422d","last_modified":1562024800874},{"schema":1562024798615,"derHash":"sFBb8pR/CAerri1CwZND6vCNHd4/h0WwWJpXNieS5HA=","subject":"CN=DigiCert Secure Site Korea EV ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"8f3ba34bb39284e4eac1c23c6af465a31d3ec30f7896fbb885e6a74b38a9ce11","size":1427,"filename":"AdP_iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH-6k=.pem","location":"security-state-staging/intermediates/8ae1458e-7b25-4f7f-8570-16c7af6e2a7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AdP/iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH+6k=","crlite_enrolled":false,"id":"92ca13e1-2098-42b2-aa2b-5dbe4643c974","last_modified":1562024799347},{"schema":1562024797879,"derHash":"TJGYtnNVCFh5mtJ0TMCDwboAJ+d9O4/W1Wz1NiDQmeI=","subject":"CN=emSign Device CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRGV2aWNlIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"8956d067022b96359ff3d30c6bcb351e2ba5eb96b50837b275bedd8c2468cc4f","size":1585,"filename":"Ivw7wv5XpckfdFlOxj37SBDwiI0WAhkp1WOGE3r2BvU=.pem","location":"security-state-staging/intermediates/20d32f63-93e8-4cc0-9495-4924fe795c22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ivw7wv5XpckfdFlOxj37SBDwiI0WAhkp1WOGE3r2BvU=","crlite_enrolled":false,"id":"74cd2ebb-684e-40ec-a833-df95792630aa","last_modified":1562024798607},{"schema":1562024797128,"derHash":"L/GDLeb5UGqsnSx3V+oHV2TsaMyccKDs4z7MYWB8vkM=","subject":"CN=TERENA SSL CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"56a3b2875df755c4075fee31fc3820a0cdcd21908ed25a2a21a9e02e177112f2","size":2129,"filename":"PYHJ7Ok9y2OoV3yMZFAcH45HI64yll_qcT9kRYmQFTY=.pem","location":"security-state-staging/intermediates/ca22d756-cc29-4f7f-a172-a93147c9b473.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PYHJ7Ok9y2OoV3yMZFAcH45HI64yll/qcT9kRYmQFTY=","crlite_enrolled":false,"id":"d1f8117c-a369-49f0-88ac-e00cc462a0ab","last_modified":1562024797871},{"schema":1562024796371,"derHash":"FtgJ7RVcKsfpSJ4aIEEWydFu++TJH1M2lyWis5VTXig=","subject":"CN=WIPO CA - G4,OU=Class 2 Managed PKI Individual Subscriber CA,O=World Intellectual Property Organization,C=CH","subjectDN":"MIGOMQswCQYDVQQGEwJDSDExMC8GA1UEChMoV29ybGQgSW50ZWxsZWN0dWFsIFByb3BlcnR5IE9yZ2FuaXphdGlvbjE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExFTATBgNVBAMTDFdJUE8gQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"086054c0052cdacea72072357a2b79945d9bf92ef3447038cc5e5e68475271d3","size":2044,"filename":"PU8NkYLfLUTa_7ny2Z-c1CJ0H02QfjBsjXu9EWq22IM=.pem","location":"security-state-staging/intermediates/33189e7d-6c9b-4f44-bef2-771f215db497.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PU8NkYLfLUTa/7ny2Z+c1CJ0H02QfjBsjXu9EWq22IM=","crlite_enrolled":false,"id":"2d7e382f-d25c-4413-b71f-3ec5aeb49509","last_modified":1562024797121},{"schema":1562024794876,"derHash":"Hgo6uZMVdxcoHUKr+AHrZN7tUA5BaMpwbWpx2BA8c6I=","subject":"CN=DigiCert Grid Trust CA,OU=www.digicert.com,O=DigiCert Grid,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMR8wHQYDVQQDExZEaWdpQ2VydCBHcmlkIFRydXN0IENB","whitelist":false,"attachment":{"hash":"3be9651d72ef4f44fcb67274ba0d3e7ae2eb7c8388fcf0a3ab02a3a2c72077f8","size":2316,"filename":"TBKoZNHPiEWnnKpVqLc_CHX3Z3iNpZdilsVXHJhcqkw=.pem","location":"security-state-staging/intermediates/1ddc95cc-acc5-4a61-b546-b433d299fd22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TBKoZNHPiEWnnKpVqLc/CHX3Z3iNpZdilsVXHJhcqkw=","crlite_enrolled":false,"id":"a43ec252-2c43-4461-a2b2-56c2fe1b0e7a","last_modified":1562024795608},{"schema":1562024794135,"derHash":"phmVYVOcSoqwGesTaz/Q12kBddQa5/WKO/SKHwsTKCg=","subject":"CN=FujiSSL RSA Client Authentication and Secure Email CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIGIMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMT4wPAYDVQQDEzVGdWppU1NMIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"eb739dda586a45fc7a126da56fa0e1975b84e84d1a11dc5cf2a1e059668b71cd","size":2154,"filename":"XTsWwydKIeLgLUHk_CjpouCdZpEZv977b3O3Y6fz7A8=.pem","location":"security-state-staging/intermediates/bf387768-b33b-4aac-a92d-f931ea2d2f89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XTsWwydKIeLgLUHk/CjpouCdZpEZv977b3O3Y6fz7A8=","crlite_enrolled":false,"id":"1eb1cf61-0810-46cc-9db3-87bd5b0eda59","last_modified":1562024794868},{"schema":1562024793401,"derHash":"q/OAPNKTniaAPlIoCoH2fEbD4O51/Nux4w+wOjIaz60=","subject":"SERIALNUMBER=ZZZZZZA3,CN=Siemens Issuing CA EE Enc 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGeMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTMxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMScwJQYDVQQDDB5TaWVtZW5zIElzc3VpbmcgQ0EgRUUgRW5jIDIwMTY=","whitelist":false,"attachment":{"hash":"e179d01b41716c0c072162345534013646eeb1fc9debcf658c9fe6ecf951163f","size":2641,"filename":"27n7khZ5-Np87z6aLw4RQRXZ3DgzlUK97JppGYxBCL4=.pem","location":"security-state-staging/intermediates/0a84edea-9e19-41cc-b761-52eb6a135d6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"27n7khZ5+Np87z6aLw4RQRXZ3DgzlUK97JppGYxBCL4=","crlite_enrolled":true,"id":"efb1c9d1-30cf-4343-bcb1-91ee6610e777","last_modified":1562024794128},{"schema":1562024792628,"derHash":"cD6goXPiBCNV8d/rEHkpLUHqaMBGydRcxg3FQQEE9Hg=","subject":"CN=SSLs.com RSA DV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gUlNBIERWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"9ff134c8ecf90893574b07ad8b3c077f8d5360967fc1094e63da8fb49c97f7e3","size":2129,"filename":"rvbtHIVTfnQ4hhhu4JyOGPoRZ3c9W-uCcbjlRAfUPXM=.pem","location":"security-state-staging/intermediates/a97db1f4-38f2-4210-9c42-fd651e18de13.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rvbtHIVTfnQ4hhhu4JyOGPoRZ3c9W+uCcbjlRAfUPXM=","crlite_enrolled":false,"id":"a11d7ecc-7398-48bb-89de-0e90aa0466c9","last_modified":1562024793393},{"schema":1562024791880,"derHash":"alR0N7H1K3KnLMcwGTqHPKmz0D45krGj+uwQp4BU4qE=","subject":"CN=Fuji Xerox Xnet CA 2,O=Fuji Xerox,C=JP","subjectDN":"MEExCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR0wGwYDVQQDExRGdWppIFhlcm94IFhuZXQgQ0EgMg==","whitelist":false,"attachment":{"hash":"9217faaa39a466f5d9d9788fdda62aeff7af0b31e46484feab2f84c35486efa6","size":1471,"filename":"LnpLBgKouhAPdvkLl4dk97HUdhFGLO_43TBsKNajdA4=.pem","location":"security-state-staging/intermediates/f4af1e17-0334-407c-a8cb-77b3a44b5f11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LnpLBgKouhAPdvkLl4dk97HUdhFGLO/43TBsKNajdA4=","crlite_enrolled":false,"id":"010baff6-15c0-4fe2-915b-96e9c9e53168","last_modified":1562024792620},{"schema":1562024791135,"derHash":"Zd4yKh73r/7etzhxOMJgYIJbCMwn4Zkt2erIM3KXlXs=","subject":"CN=SpaceSSL CA,OU=SpaceSSL Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHIxCzAJBgNVBAYTAlBMMSIwIAYDVQQKDBlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMSkwJwYDVQQLDCBTcGFjZVNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEUMBIGA1UEAwwLU3BhY2VTU0wgQ0E=","whitelist":false,"attachment":{"hash":"52e6e18f68c49814eb88ea228460269803ebcae2f04a71366b605d06fd85ae21","size":1638,"filename":"AOXy6QeFRXr3Le2jy9VUHVc0TY6NofDQseFQcaDRlow=.pem","location":"security-state-staging/intermediates/189976ec-c00a-4ec0-bc47-3f11ee1374ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AOXy6QeFRXr3Le2jy9VUHVc0TY6NofDQseFQcaDRlow=","crlite_enrolled":true,"id":"a846caeb-4b0d-4bb1-af76-d203f6bd83ea","last_modified":1562024791871},{"schema":1562024789653,"derHash":"DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=","subject":"CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"e3d590ab4b71fbd20183713733b3253b32ef24a73382153319f8916fc66d3c1d","size":1678,"filename":"VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem","location":"security-state-staging/intermediates/222e4d33-ee5a-4885-add5-c30b4495b281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=","crlite_enrolled":true,"id":"92292d1f-471b-4db3-ba30-6f423a7d649b","last_modified":1562024790389},{"schema":1562024786680,"derHash":"/ikDnS1H0CkoTZqoz7He1yb/DiX955/oSpVAGHhktLc=","subject":"SERIALNUMBER=201819,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE5","whitelist":false,"attachment":{"hash":"05b1a5a6497b489b6d6a517b7b39506cb13e79efc9a9ba91d6c7fc2fc2c20683","size":2333,"filename":"-K9Xx7VSSzN1D6LkHvOiAdN5OId_n4uHBErF19bWM-A=.pem","location":"security-state-staging/intermediates/635f8211-242f-4cc5-8ffa-a716fe7af988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+K9Xx7VSSzN1D6LkHvOiAdN5OId/n4uHBErF19bWM+A=","crlite_enrolled":false,"id":"90bc409e-b5d7-4431-bbe4-21feadabcedd","last_modified":1562024787417},{"schema":1562024785925,"derHash":"Xwo1uk+Epl9osW1KM/ZRfAl3CDk+qv0oVvuak0GHGfQ=","subject":"CN=SGTRUST EMAIL AND CLIENT CA,O=SGssl,C=KR","subjectDN":"MEMxCzAJBgNVBAYTAktSMQ4wDAYDVQQKEwVTR3NzbDEkMCIGA1UEAxMbU0dUUlVTVCBFTUFJTCBBTkQgQ0xJRU5UIENB","whitelist":false,"attachment":{"hash":"17a9b911f686f237aa390ea2ff06319ae420ccb51198aeed267a5518db5715c4","size":1723,"filename":"gQN5MDXBIRQe70cFfEaNKKTh3AELpmBrtzu-04X41Po=.pem","location":"security-state-staging/intermediates/4fecef25-4c06-47de-9524-159f4379ebf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gQN5MDXBIRQe70cFfEaNKKTh3AELpmBrtzu+04X41Po=","crlite_enrolled":false,"id":"65f004f2-8ee7-4e50-a1d2-01f1ae7a9bd2","last_modified":1562024786673},{"schema":1562024783680,"derHash":"PKGOHtvmhg1wkU6aoNuOYeGT5+9UfNq4tN9UX0bexrs=","subject":"CN=BlackCert\\, Inc. ECC OV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBFQ0MgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"1f0b0920e94a21420191c41211ce3bcffb04a7ce995f0af6bd0b824c3b294700","size":1313,"filename":"bQkT-mQD0009MLZyZZBcx4FuOI9_hOoj322Ms-tQWFo=.pem","location":"security-state-staging/intermediates/7feaca48-406a-4093-b833-11b132d33bdd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bQkT+mQD0009MLZyZZBcx4FuOI9/hOoj322Ms+tQWFo=","crlite_enrolled":false,"id":"9e10f424-cd96-43ca-bfe4-a236bf60a4c6","last_modified":1562024784419},{"schema":1562024782184,"derHash":"xRuDoN5JogGl++lHAywEcC+Mp8LQKt8otz1CyKzRw2I=","subject":"CN=DigiCert SHA2 High Assurance Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNTAzBgNVBAMTLERpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"54b858a92a75d1898919ae2dbf0249a5192fa1abe37b3e993d38ef789c3653cc","size":1902,"filename":"SOMlUK5lwhJe91sGwPNVv0zyq01iywv_f4ztkbkD4Rs=.pem","location":"security-state-staging/intermediates/5ba14d1f-2ebf-414a-a378-e6c4bae24fd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SOMlUK5lwhJe91sGwPNVv0zyq01iywv/f4ztkbkD4Rs=","crlite_enrolled":true,"id":"e3b58caf-2eb9-4b25-9732-0c4502a01f62","last_modified":1562024782921},{"schema":1562024775415,"derHash":"1Dn4jo8vgKMG+RDc3lSNcbv9mahfxwNO+2EON0lVCTI=","subject":"CN=Cloudflare RSA DV CA,O=Cloudflare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjEdMBsGA1UEAxMUQ2xvdWRmbGFyZSBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"0937a5bef35a20366a9d1dce5f361e3ec0fce9ea799d8c4f053763a0f051e116","size":1634,"filename":"HyqqOGaeH9zg7Bg12wtuQNNUB5DZwfj2c0W_oWqDLI0=.pem","location":"security-state-staging/intermediates/c91a2caf-3079-4edb-9866-0831343c6e4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HyqqOGaeH9zg7Bg12wtuQNNUB5DZwfj2c0W/oWqDLI0=","crlite_enrolled":false,"id":"e4608891-f782-40aa-8ec9-06ab2e2cf7b0","last_modified":1562024776157},{"schema":1562024774677,"derHash":"U39guIoxdvSyFWdH23H34sEGaEUm2fp/UmtukUQXi1U=","subject":"CN=McAfee Code Signing CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEhMB8GA1UEAxMYTWNBZmVlIENvZGUgU2lnbmluZyBDQSAy","whitelist":false,"attachment":{"hash":"ae65196a88f85c709ece2d8f3936cb8d958a94c0968600b289b616617e38e411","size":2097,"filename":"UOb_aKj9K46D2KVYS2zC_0EO6gN1gKFCU77O9fiUQAI=.pem","location":"security-state-staging/intermediates/8811b1a8-349c-4b4e-8801-f5594cc329e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UOb/aKj9K46D2KVYS2zC/0EO6gN1gKFCU77O9fiUQAI=","crlite_enrolled":false,"id":"67bc7ab5-6413-4e91-b1c4-078571161042","last_modified":1562024775407},{"schema":1562024773191,"derHash":"n048Qvr+2jz4jAXMS0rwwK8wZBXDDT0e6+3r99F3qYI=","subject":"CN=Hostpoint DV SSL CA - G1,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSEwHwYDVQQDExhIb3N0cG9pbnQgRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"31c545df0c9287df1891ee7b1dfb383d83b9b321cd47a06cd0839a7276526477","size":1886,"filename":"KgLIfe7B9GImTO2eqwyHoxC8kpEMc7pC4vGNYZbchyA=.pem","location":"security-state-staging/intermediates/8daa3e79-7c44-475e-b300-0f7bce72bc93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KgLIfe7B9GImTO2eqwyHoxC8kpEMc7pC4vGNYZbchyA=","crlite_enrolled":false,"id":"ebd61b76-f146-485d-8454-4f96842fc39f","last_modified":1562024773933},{"schema":1562024772426,"derHash":"O4u3vuWk6yHqjZJ58/RWyvO4nFbW3Uxpo/vX+eTtnNM=","subject":"CN=SSLs.com ECC EV Secure Server CA,OU=Controlled by Sectigo exclusively for SSLs.com,O=SSLs.com (Namecheap\\, Inc.),L=Phoenix,ST=Arizona,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEQMA4GA1UEBxMHUGhvZW5peDEjMCEGA1UEChMaU1NMcy5jb20gKE5hbWVjaGVhcCwgSW5jLikxNzA1BgNVBAsTLkNvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgU1NMcy5jb20xKTAnBgNVBAMTIFNTTHMuY29tIEVDQyBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"153e25238ab589a8e93ff09e8b7ffa6150358fa68c68b93cc94f92faa5455a28","size":1423,"filename":"Ym-0KV9EAV6PC8waJvh5eI-QjQ_3STgXc-UH0obWlKM=.pem","location":"security-state-staging/intermediates/1dbfb594-d15e-4c6d-8944-fa5c1ca6d499.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ym+0KV9EAV6PC8waJvh5eI+QjQ/3STgXc+UH0obWlKM=","crlite_enrolled":false,"id":"e298cb45-294a-447d-a70e-9e33908895ee","last_modified":1562024773182},{"schema":1562024771685,"derHash":"1Ia/o/ANFl7iz2Jw/afQCBfljNot9Polbg8usSLPjwI=","subject":"CN=TeleSec PKS CA 8,OU=T-Systems Trust Center,O=T-Systems International GmbH,C=DE","subjectDN":"MHAxCzAJBgNVBAYTAkRFMSUwIwYDVQQKExxULVN5c3RlbXMgSW50ZXJuYXRpb25hbCBHbWJIMR8wHQYDVQQLExZULVN5c3RlbXMgVHJ1c3QgQ2VudGVyMRkwFwYDVQQDExBUZWxlU2VjIFBLUyBDQSA4","whitelist":false,"attachment":{"hash":"6429eb3f7af5f32d22260a3d57e029842bb6095362c3ccacc7482be3a501efcc","size":1597,"filename":"cQ5-P7xFNQKPQ_CQI4rTW9uBJQm8ZTcsHGP7IsAVuSM=.pem","location":"security-state-staging/intermediates/76092767-ec1d-46b8-804e-59e91f2d0727.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cQ5+P7xFNQKPQ/CQI4rTW9uBJQm8ZTcsHGP7IsAVuSM=","crlite_enrolled":false,"id":"8208c8e6-ee6a-4515-bd16-3d2ff082836a","last_modified":1562024772418},{"schema":1562024770934,"derHash":"UNPXH8DNfjatrjIiH+++jMKbJna6MmwJuPobJNvnVRQ=","subject":"CN=Plex Devices High Assurance CA2,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ey","whitelist":false,"attachment":{"hash":"67f35d42ba7361bbc47c1f3a29680a229ed60061b9fa502c40e4669b0794e8aa","size":1699,"filename":"ymL44ll2Q9SIPAQZkomkZ5uFqCHuOYoXpsbrXWfyZkg=.pem","location":"security-state-staging/intermediates/17ca09ba-dca0-4d29-ba41-22b2b69e084a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ymL44ll2Q9SIPAQZkomkZ5uFqCHuOYoXpsbrXWfyZkg=","crlite_enrolled":false,"id":"2a05f09e-4930-43ff-891b-351f3751cce6","last_modified":1562024771677},{"schema":1562024769411,"derHash":"6mljaWdQVkoiiz64jg/UMExdonp6+S0dQZk1elAHgxU=","subject":"CN=WoTrus EV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"fc57e3fad962bd4b00feeaae47893e01b5b42af32dadb1d3e0e55cad0d68a007","size":1691,"filename":"bfm30K2ufQC3gQINxl7OwREoFSQEJrK4ecMD3jy_Qlc=.pem","location":"security-state-staging/intermediates/744615e6-3b14-49f9-9fef-3d7691a5c6d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bfm30K2ufQC3gQINxl7OwREoFSQEJrK4ecMD3jy/Qlc=","crlite_enrolled":true,"id":"9cb658c6-3e52-4a94-b178-1d2ab7a03ad7","last_modified":1562024770176},{"schema":1562024768666,"derHash":"eErKEGO+RwCzpi9Fwvk7fu+L8jD7hpYQ6GT8Szoj0J8=","subject":"CN=GeoTrust DV SSL SHA256 CA,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZR2VvVHJ1c3QgRFYgU1NMIFNIQTI1NiBDQQ==","whitelist":false,"attachment":{"hash":"336b710bd635c00f02cb1abb4dfdd7642880004f653cb1e6b7aaa8dc272df643","size":1735,"filename":"jP-_jyFvpl2RHZrfgoObTO1xpirwu4KeuFSYhdPgDno=.pem","location":"security-state-staging/intermediates/c7c73925-4bfb-4972-94cf-7df88442e3bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jP+/jyFvpl2RHZrfgoObTO1xpirwu4KeuFSYhdPgDno=","crlite_enrolled":true,"id":"ace5b1a2-9c9e-48ab-8146-03a2d8f88d8f","last_modified":1562024769403},{"schema":1562024767927,"derHash":"UnpgsCq/OkpVGcT2L7vVYOMDQHTu7IuHmaqTaGk/420=","subject":"CN=SSL.com RSA SSL subCA,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMR4wHAYDVQQDDBVTU0wuY29tIFJTQSBTU0wgc3ViQ0E=","whitelist":false,"attachment":{"hash":"19883ec948ba65cabab87774d50633120945ef053a62f8362d2e09b43597fe1a","size":2292,"filename":"7LcB5Z8ATVz4rcQtIY5xJir8_-F3e_HPi8IDdCnjCaE=.pem","location":"security-state-staging/intermediates/23914bfd-6f12-4a9d-8c1a-a2c9e445a1bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7LcB5Z8ATVz4rcQtIY5xJir8/+F3e/HPi8IDdCnjCaE=","crlite_enrolled":true,"id":"b976a3a6-3c96-4aca-9c5f-fc654e3c4f6c","last_modified":1562024768658},{"schema":1562024767188,"derHash":"cx09nPqgYUh6HXFEWkL2ffCvyipsLS+Y/3s84RKx9Wg=","subject":"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMw==","whitelist":false,"attachment":{"hash":"657ef5d80546aa62cbfc4df47ce7b6d13a55f1a365959985c45ff6cd95bbba49","size":1983,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/56cc56ae-6c42-4e45-a1ee-4dff7ceb2ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"dd797093-8a63-4153-8bb1-7f1ad9eb78d4","last_modified":1562024767919},{"schema":1562024764929,"derHash":"wwmtIoGSEzUs3Jlx0brY2/2MGlwnflYHm9xLFfPC+IY=","subject":"SERIALNUMBER=201420,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MjA=","whitelist":false,"attachment":{"hash":"82baf28c8e8f2f5eed9bfa651ab576ae26debfdbe468a8da9e531007866fd3f4","size":2093,"filename":"BXPYBHLDcjLdWqfbeS-3Wn3FyXMcPOt4MLp_WZ3dNRE=.pem","location":"security-state-staging/intermediates/c37fe368-288e-403b-92f1-5f67e7fb18b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BXPYBHLDcjLdWqfbeS+3Wn3FyXMcPOt4MLp/WZ3dNRE=","crlite_enrolled":false,"id":"f5badd92-19cd-42f3-8fd9-bca16a2010de","last_modified":1562024765675},{"schema":1562024764185,"derHash":"OwstKZr3dNbDMrK/q7RfRNhmQyuVUuoJTVKbbtElBIs=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma Codesign II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHLMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEmMCQGA1UEAwwdQ2FtZXJmaXJtYSBDb2Rlc2lnbiBJSSAtIDIwMTQ=","whitelist":false,"attachment":{"hash":"f1869c6545bc1c6234532651e68563d726b9b578290681c53ff1d9eb8955d278","size":3011,"filename":"8es0CNrSdbjFtrocXsDOpgrVyEAq0-J-uvoksmifuDk=.pem","location":"security-state-staging/intermediates/a6d8c412-ac3b-422e-8b40-1476c1f2271d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8es0CNrSdbjFtrocXsDOpgrVyEAq0+J+uvoksmifuDk=","crlite_enrolled":false,"id":"de0d0798-3da0-4c1c-b5e2-d1f8d2450c88","last_modified":1562024764922},{"schema":1562024763424,"derHash":"f6T/aOwEqZ11KNUIX5SQf00d0cU4G6zcgy7VyWAhRnY=","subject":"CN=Sectigo RSA Domain Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGPMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c5bc13ba28e3fad9bb69c25f294e5bebe315acc4947330a5cd0d2ce7928e2994","size":2166,"filename":"4a6cPehI7OG6cuDZka5NDZ7FR8a60d3auda-sKfg4Ng=.pem","location":"security-state-staging/intermediates/c2e0bcef-51d3-4306-93e1-9a40a8e77b7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4a6cPehI7OG6cuDZka5NDZ7FR8a60d3auda+sKfg4Ng=","crlite_enrolled":false,"id":"6598d3bd-466d-49c7-b158-9ec07c6d53ac","last_modified":1562024764178},{"schema":1562024762680,"derHash":"k63XyEhr8VpBaUnhY3vCGaNFXjdODq+YAVMDWrF/PsU=","subject":"CN=HARICA Qualified Legal Entities SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAxMoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"bc6cc8a34a080067df5a211a1ee0cc3ef6a1dcf5be3086883e888f22e2186b93","size":2434,"filename":"3NY0njQdFfwxsQu3sKMmdqGNJfWSRtz3x_GJn2JrJSM=.pem","location":"security-state-staging/intermediates/0c53d623-ca04-458c-a73c-43feafde8b16.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3NY0njQdFfwxsQu3sKMmdqGNJfWSRtz3x/GJn2JrJSM=","crlite_enrolled":false,"id":"892e29c1-f423-4b27-9ee7-bc21c7e30e3d","last_modified":1562024763416},{"schema":1562024761185,"derHash":"XEvFlykauccCP7ZEX9YDgaZcYN3UBPEk5foUP+mLBfM=","subject":"CN=Trustwave S/MIME SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGkMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEsMCoGA1UEAxMjVHJ1c3R3YXZlIFMvTUlNRSBTSEEyNTYgQ0EsIExldmVsIDExHzAdBgkqhkiG9w0BCQEWEGNhQHRydXN0d2F2ZS5jb20=","whitelist":false,"attachment":{"hash":"ed83656947f250a6c5ddc676c7ae6695bbf83f8d233c9e01dcb0ae8574c80def","size":1833,"filename":"0ziypZGtbQSlJkd3bO6sa64Aaev_F9DMXoWrdIPMuic=.pem","location":"security-state-staging/intermediates/322a4690-6387-44f2-8714-f8ecfa2909cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0ziypZGtbQSlJkd3bO6sa64Aaev/F9DMXoWrdIPMuic=","crlite_enrolled":true,"id":"e02c5baa-af93-44fd-a07d-a4dc0f77962f","last_modified":1562024761923},{"schema":1562024760432,"derHash":"mZNeIEJFNewBbzN7K+aPE0neZszkylqzZ/jzc4IVuDM=","subject":"CN=DigiCert Secure Site ECC CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDQS0x","whitelist":false,"attachment":{"hash":"c1873c9110b38d6483be9516efcc79cdd751a74f8f10ff176ee411a27f5e6802","size":1374,"filename":"Z5_2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=.pem","location":"security-state-staging/intermediates/63cecafd-26c5-4442-a764-6a7ef05785ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z5/2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=","crlite_enrolled":true,"id":"38a4e0fc-47a6-4351-8c6e-d512e40ea47b","last_modified":1562024761178},{"schema":1562024759684,"derHash":"l4vPOcPDqs7+EEj6A2AoPcLr+lFQAkxeN4UU0+decpU=","subject":"CN=Ecclesiastical Academy of Vella Client RSA SubCA R1,O=University Ecclesiastical Academy of Vella of Ioannina,L=Ioannina,C=GR","subjectDN":"MIGfMQswCQYDVQQGEwJHUjERMA8GA1UEBwwISW9hbm5pbmExPzA9BgNVBAoMNlVuaXZlcnNpdHkgRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBvZiBJb2FubmluYTE8MDoGA1UEAwwzRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"1ea505bcb0b55faef63c1cc254b9f6612d99491beb1b6b0958f3ee1c4f3c1675","size":2463,"filename":"BMcD2w-cJB838WspMeM-A5JCa6C9qk45hCCtD2798To=.pem","location":"security-state-staging/intermediates/649a06eb-0758-4347-a0b6-aee78ce4e55a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BMcD2w+cJB838WspMeM+A5JCa6C9qk45hCCtD2798To=","crlite_enrolled":false,"id":"9598a752-8f67-4ba2-b7dc-4c47cdf017e6","last_modified":1562024760423},{"schema":1562024758184,"derHash":"rtqeEp5fuhJTynkRau2ZDd+qqyS9SKHMvZmn4Dyd25Y=","subject":"CN=WISeKey CertifyID Standard G1 CA,OU=Copyright (c) 2005 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGKMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKTAnBgNVBAMTIFdJU2VLZXkgQ2VydGlmeUlEIFN0YW5kYXJkIEcxIENB","whitelist":false,"attachment":{"hash":"99f53a0f0a04102d0dc798862f7cddb908d4b19a382c02d2a501e95f73f888a4","size":1796,"filename":"V-iy-tAeMX9lDedsiiJL_8dZxPz-eL1s19Q5oU1d1Vg=.pem","location":"security-state-staging/intermediates/6968a7e4-49ad-4bc8-966e-16c6348b8280.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V+iy+tAeMX9lDedsiiJL/8dZxPz+eL1s19Q5oU1d1Vg=","crlite_enrolled":true,"id":"7af2b755-f8c2-4221-b4d9-98a4a40d8f82","last_modified":1562024758924},{"schema":1562024757412,"derHash":"E++zmi9mVOjGe9BPTG1MkM1sq1CRvO3HN4f2t309P+c=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"2317985189faf07f31bc3c665a12f23068191e798992ad37652b74c99ac9bb73","size":1813,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/18eafa54-0261-4c50-a26c-e36ab1883d27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"760c1e85-d14f-45de-9089-5346d069bb23","last_modified":1562024758176},{"schema":1562024755893,"derHash":"fYmukYslr9+RA27uXBXljGAPQiZoZqjeAccdvGNcocA=","subject":"CN=AlwaysOnSSL CA - G2,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGIxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTQWx3YXlzT25TU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"5a3569b6f9543f3155c9ebc71c27e7c74e57fd312e089d9ad6781dcd5667723d","size":1646,"filename":"ssE7QqKUKKZNwPdkucGxKcejYYKjpfRsYXOHhO9vDYI=.pem","location":"security-state-staging/intermediates/97de2daa-b660-43e4-9979-80e4f6a0f540.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ssE7QqKUKKZNwPdkucGxKcejYYKjpfRsYXOHhO9vDYI=","crlite_enrolled":false,"id":"d788b871-e71a-4146-9d20-3e2d8c9eecac","last_modified":1562024756665},{"schema":1562024754381,"derHash":"XMXixoF272PUrFuyRW0vzBMohPpzVWgy+TJ1HXZdpy8=","subject":"SERIALNUMBER=201727,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI3","whitelist":false,"attachment":{"hash":"5a7146a77461838f5a1843035d4a48aa4c82961a25f1da94dc025a7f4abcdd8b","size":2402,"filename":"bB9c6AN2JnHasyK5D2eIB9oxCfM50LTPnnl3kB89YXE=.pem","location":"security-state-staging/intermediates/22cae430-9901-4519-aec3-bbc56ed82b06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB9c6AN2JnHasyK5D2eIB9oxCfM50LTPnnl3kB89YXE=","crlite_enrolled":false,"id":"0b86594c-f5d4-4575-b6f7-b68483bebf4b","last_modified":1562024755141},{"schema":1562024751078,"derHash":"CYa1occxTvsE+2SLnitXz0hC/R1DRdKOUglMkKn+y/4=","subject":"CN=NAESB Issuing CA - SHA384 - G3,O=GMO GlobalSign Inc.,L=Portsmouth,ST=New Hampshire,C=US","subjectDN":"MIGBMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTmV3IEhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0aDEcMBoGA1UEChMTR01PIEdsb2JhbFNpZ24gSW5jLjEnMCUGA1UEAxMeTkFFU0IgSXNzdWluZyBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"d49a532b85e082e491e221c8f33b16fe8422a94bea4c35c9948650604f3ca837","size":2073,"filename":"LV_Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=.pem","location":"security-state-staging/intermediates/d212f5ca-0adf-4e01-8ef0-908775f6b878.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LV/Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=","crlite_enrolled":false,"id":"7b2c039b-5a89-4f22-9b42-e0bd5d57c6b3","last_modified":1562024752817},{"schema":1562024749921,"derHash":"Lx4jkI1LNfslICo2QLpXBUvq3mextgcP+Jb+AQ9UYTs=","subject":"CN=FUJIFILM Fnet CA - S,O=FUJIFILM,C=JP","subjectDN":"MD8xCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEdMBsGA1UEAxMURlVKSUZJTE0gRm5ldCBDQSAtIFM=","whitelist":false,"attachment":{"hash":"1d23dc7789b794fe7d42ddcfba44e339a63d08faa95b81febad9709dab455441","size":1589,"filename":"HklRNHbqiczty-mu_7-EsslYyqJV5eL1EXnD11xrky0=.pem","location":"security-state-staging/intermediates/1eed61f6-1e57-4d9d-adb4-743c366a80ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HklRNHbqiczty+mu/7+EsslYyqJV5eL1EXnD11xrky0=","crlite_enrolled":false,"id":"4d214f92-f862-44fa-a108-b0165201355b","last_modified":1562024751070},{"schema":1562024749130,"derHash":"efH1q2l96/GV9bfaZflTmWgu2uuAEVudQqauXi+piAI=","subject":"CN=TrustAsia TLS RSA CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"9c4047b27b1b439594f0eb24b088e1d1ed2f32b8eaf4ad49dd4d2745b8add3f5","size":1683,"filename":"jzqM6_58ozsPRvxUzg0hzjM-GcfwhTbU_G0TCDvL7hU=.pem","location":"security-state-staging/intermediates/2c6b0e8d-5db7-43f4-ac20-43f2a3577b50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jzqM6/58ozsPRvxUzg0hzjM+GcfwhTbU/G0TCDvL7hU=","crlite_enrolled":false,"id":"985da675-4aa3-4fc4-a366-147d9cc6b52b","last_modified":1562024749914},{"schema":1562024743075,"derHash":"48UkTRX44LA09QCQO32hHFfBZWF1uGYIx/zcVh0IG/Y=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CFEA,OU=Certificados de Firma Electronica Avanzada,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGbMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMTMwMQYDVQQLDCpDZXJ0aWZpY2Fkb3MgZGUgRmlybWEgRWxlY3Ryb25pY2EgQXZhbnphZGExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAwwaQUMgRmlybWFwcm9mZXNpb25hbCAtIENGRUE=","whitelist":false,"attachment":{"hash":"388c7390fd655de86c6807905f53164ea046c0a2c453eea6afb6887f81eba392","size":2337,"filename":"KO9CWWzDLCHF2tkv_s3T4tkDZ1JcNCoaADD2wa1h9Es=.pem","location":"security-state-staging/intermediates/c1de4d24-123b-4648-9d5d-4b7609ce59a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KO9CWWzDLCHF2tkv/s3T4tkDZ1JcNCoaADD2wa1h9Es=","crlite_enrolled":false,"id":"17c9e6f6-0f5d-41db-af92-89fb0e502421","last_modified":1562024743816},{"schema":1562024742327,"derHash":"EjRl7sQJL4z3q/6SuMcBrAnqeaSY8dP2oCwXFPOahCM=","subject":"CN=DKHS Device CA,OU=GeoRoot Certification Authority,O=NTT DOCOMO\\, INC.,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBOVFQgRE9DT01PLCBJTkMuMSgwJgYDVQQLEx9HZW9Sb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRcwFQYDVQQDEw5ES0hTIERldmljZSBDQQ==","whitelist":false,"attachment":{"hash":"0dad32db64d125e5bd490ac9ead766806e1830e2dd3231d12e06165af78bc99f","size":1435,"filename":"2csLg17pewpYWpMoGlL9tpqZNfK0Xiyb8-ZdoxQJDfw=.pem","location":"security-state-staging/intermediates/215e95e7-dbc9-41ad-beca-82dc6583e809.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2csLg17pewpYWpMoGlL9tpqZNfK0Xiyb8+ZdoxQJDfw=","crlite_enrolled":false,"id":"1d5ac6e1-d38a-4677-b3a5-9433b4cd1a5a","last_modified":1562024743067},{"schema":1562024741573,"derHash":"fwEpH2i6JJHUuT3A+YPz27ahQ8MAeqs+ShIEPKtdOe0=","subject":"SERIALNUMBER=201806,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA2","whitelist":false,"attachment":{"hash":"d8c1a6a0b861a09c8788da6425106999f114b15b2b5e416683ce65f3f97232d2","size":2333,"filename":"HUkqo7ks9SSqrwVtx5-EbZ5_X2pu1urVxQlJdSbTQ6A=.pem","location":"security-state-staging/intermediates/eca3931d-d300-4dec-a61c-e938b033c589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HUkqo7ks9SSqrwVtx5+EbZ5/X2pu1urVxQlJdSbTQ6A=","crlite_enrolled":false,"id":"d6563e6e-19de-4000-b6b1-f6915fc1fa4e","last_modified":1562024742319},{"schema":1562024740056,"derHash":"RgOPYyYijNtWYZxSJmYT2gTIykmeDQOw7c/8EQ1c/HA=","subject":"CN=GlobalSign PersonalSign 2 ECC CA SHA 384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIEVDQyBDQSBTSEEgMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"c7d733918214f65618244169320b852165e4cf03e0cdcbb3c09a1516a67e706c","size":1317,"filename":"lna5HZAGsocA3Pju5zM06F95XywtOa-LxU5QUgC3EX8=.pem","location":"security-state-staging/intermediates/b72356d7-b40c-46a5-a245-76ee8e592a3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lna5HZAGsocA3Pju5zM06F95XywtOa+LxU5QUgC3EX8=","crlite_enrolled":false,"id":"ab4c9864-87dc-43a9-b4a5-f4d223bebbb7","last_modified":1562024740795},{"schema":1562024739285,"derHash":"/QKa3j96gKmNb//JQpBGWF7x2MuBk6F/YhQxfQZS18M=","subject":"CN=COMODO/HP Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSIwIAYDVQQDExlDT01PRE8vSFAgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"adb2966a8c1fc1a877edbb79b2d43109f804829872e34bd8667f85ba432153e5","size":1975,"filename":"VQkNSqdqPoVan53-i1N5YrjNCMnJRtvNFB7icXr9un8=.pem","location":"security-state-staging/intermediates/c3470c12-1607-4586-9888-c399a9291d93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VQkNSqdqPoVan53+i1N5YrjNCMnJRtvNFB7icXr9un8=","crlite_enrolled":false,"id":"851cd0f4-450c-474d-8fd8-6090b0b6f5f4","last_modified":1562024740048},{"schema":1562024737001,"derHash":"lylXMEAxI07Rdnn9y5dVbWFz1fK/Dm5m1hJoDKbndoU=","subject":"CN=UZI-register Medewerker niet op naam CA G3,O=CIBG,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEzMDEGA1UEAwwqVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgbmlldCBvcCBuYWFtIENBIEcz","whitelist":false,"attachment":{"hash":"a6ad25c671822cfc5a55526a91ef47c754a74a1c8a12fd7b454e85652c742c79","size":2645,"filename":"io70m-V_59D3apVL30ZLD4BQjGAhNUmM2cLS-be8t_s=.pem","location":"security-state-staging/intermediates/c7d2ec98-db00-4406-89b7-d86ce3937af3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"io70m+V/59D3apVL30ZLD4BQjGAhNUmM2cLS+be8t/s=","crlite_enrolled":false,"id":"74733176-ea07-49c5-b60a-dbd7c1256529","last_modified":1562024737740},{"schema":1562024733253,"derHash":"j6YC//WQ31g6NtUJwmX2w+qMNKnVbP+GKF+/6ZNr/FU=","subject":"CN=JCAN Sub Root CA0,OU=JCAN Sub Root CA0,O=JIPDEC,C=JP","subjectDN":"MFYxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxGjAYBgNVBAsTEUpDQU4gU3ViIFJvb3QgQ0EwMRowGAYDVQQDExFKQ0FOIFN1YiBSb290IENBMA==","whitelist":false,"attachment":{"hash":"871cbff3d95fe676c0cd3b4745350c714edd6aadf6d40bd13bf176dce9ea6e41","size":1382,"filename":"I02P_H74AjyBi_GfR4lBhtey51ZDKA2W-fOZZSid4V4=.pem","location":"security-state-staging/intermediates/7b2549ac-1575-477f-9793-1ddb62c1fd9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I02P/H74AjyBi/GfR4lBhtey51ZDKA2W+fOZZSid4V4=","crlite_enrolled":true,"id":"496c9bfb-8161-4544-af96-3b6e9fdff991","last_modified":1562024733996},{"schema":1562024730949,"derHash":"Y7BwFldXT8YPNIx4UFj4MKft0MhjxysSkPjUfV2Sh/s=","subject":"SERIALNUMBER=201803,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDM=","whitelist":false,"attachment":{"hash":"152a682a8ba56d789b2a9e4fca605dec1b7b9981f653fa67f030bcf66f10a6ad","size":2337,"filename":"K4GLd4lfZhixwmB0xbzzoe824xrytO-tH5fMEZ6ifsM=.pem","location":"security-state-staging/intermediates/9d8577c4-554c-403a-ac20-21abaafba3d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K4GLd4lfZhixwmB0xbzzoe824xrytO+tH5fMEZ6ifsM=","crlite_enrolled":false,"id":"77846c07-4d7d-4170-ba9e-bc880bed629a","last_modified":1562024731705},{"schema":1562024729465,"derHash":"2Haggfs4J7oipAh99nUSb/ipaquQNkvGH2LOjpUHqpM=","subject":"CN=Intermediate Certificate DV SSL CA - G2,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEhMB8GA1UEChMYSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEwMC4GA1UEAxMnSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"82dcd057921f6bd85130996e035be697fc268a9a31d1830d5ee055f355b2dee8","size":1577,"filename":"pJ9PrX4U-hWFvZYgO5Qo0PX4C-dnEo-R9p0ek-2ssDE=.pem","location":"security-state-staging/intermediates/bbbdb8ec-d55b-42f0-a90b-e0f5e445ce73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pJ9PrX4U+hWFvZYgO5Qo0PX4C+dnEo+R9p0ek+2ssDE=","crlite_enrolled":false,"id":"eca16d96-e44c-48e8-b1a7-205586e51810","last_modified":1562024730202},{"schema":1562024728714,"derHash":"DrvfFG5j9w+qWSfujlNG6clsXw2b3TISsE7WaHF5h00=","subject":"CN=AC Firmaprofesional - CA1,OU=Consulte http://www.firmaprofesional.com+OU=Jerarquia de Certificacion Firmaprofesional,O=Firmaprofesional S.A. NIF A-62634068,L=C/ Muntaner 244 Barcelona,C=ES","subjectDN":"MIIBFjELMAkGA1UEBhMCRVMxJzAlBgkqhkiG9w0BCQEWGGNhMUBmaXJtYXByb2Zlc2lvbmFsLmNvbTEiMCAGA1UEBxMZQy8gTXVudGFuZXIgMjQ0IEJhcmNlbG9uYTExMC8GA1UECxMoQ29uc3VsdGUgaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTE0MDIGA1UECxMrSmVyYXJxdWlhIGRlIENlcnRpZmljYWNpb24gRmlybWFwcm9mZXNpb25hbDEtMCsGA1UEChMkRmlybWFwcm9mZXNpb25hbCBTLkEuIE5JRiBBLTYyNjM0MDY4MSIwIAYDVQQDExlBQyBGaXJtYXByb2Zlc2lvbmFsIC0gQ0Ex","whitelist":false,"attachment":{"hash":"bbdd4921a8930b33ba74748b849b85b781995c1df4ff5eb07b3e4a285a958904","size":2093,"filename":"B_ap-qAli0QgK_GmwkqkWS5Ta20el3pYN4MTgORZMjo=.pem","location":"security-state-staging/intermediates/e4d22c71-7375-4c8e-a206-47116103869e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B/ap+qAli0QgK/GmwkqkWS5Ta20el3pYN4MTgORZMjo=","crlite_enrolled":true,"id":"dcfb6515-9873-4150-b71a-c2af481fddfe","last_modified":1562024729458},{"schema":1562024727955,"derHash":"BsJ0YcBBfVE84PY0+rWt0wyI7w4lyE/eDkISW4jKBHU=","subject":"CN=COMODO ECC Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"f0ed2d7d6e60382f01a548b254343b7f5848f74af3472fd2ceae1c155e23ddb0","size":1321,"filename":"YH3gQW7-dkqR106QZabQ1Aj-6wtLuy70aAZpWreNcBc=.pem","location":"security-state-staging/intermediates/15b589e4-c214-4d65-96a6-5424c2514a86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YH3gQW7+dkqR106QZabQ1Aj+6wtLuy70aAZpWreNcBc=","crlite_enrolled":true,"id":"acf6d715-9a75-4c95-8c4d-840c47d4fdfd","last_modified":1562024728706},{"schema":1562024724215,"derHash":"AzAobfNhLA6Wjc1RinoxbV4HkNHKMkuQaw7wF8C+Pqc=","subject":"CN=WoSign DV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"a75ee51db3cb9c7a4b54e1099fdadd77ab4124acdb08f7ba375a7b614929984f","size":1691,"filename":"G_V-4AYI9XAkNjdk4SZqLrWkylfZbgPG1S4cNnAU1F4=.pem","location":"security-state-staging/intermediates/d43405c6-d4c4-41e3-baac-5b53fab6891e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/V+4AYI9XAkNjdk4SZqLrWkylfZbgPG1S4cNnAU1F4=","crlite_enrolled":true,"id":"24d073eb-1380-4a6f-b7e1-f8821cd871c7","last_modified":1562024724959},{"schema":1562024722725,"derHash":"Ln5luxoBPa8L32k4UC5D44IX/gDXbKL5n3qp4pj0hTQ=","subject":"CN=STRATO SSL,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFUxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRMwEQYDVQQDEwpTVFJBVE8gU1NM","whitelist":false,"attachment":{"hash":"cb6ed07ea2573518382e2f2f838842a96f379ada0bbc5db15e4288b7b8384a9f","size":1532,"filename":"_LT0CMe5E7VgQyKeEQ6GlQp8nKPL1MNFw-rtCUA-0ak=.pem","location":"security-state-staging/intermediates/511003bd-4380-40cc-ac6c-e0ea641c6692.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/LT0CMe5E7VgQyKeEQ6GlQp8nKPL1MNFw+rtCUA+0ak=","crlite_enrolled":false,"id":"ad34bc25-64e6-458b-baf2-26022a492da8","last_modified":1562024723456},{"schema":1562024721984,"derHash":"pXbClIH1oqyx30dQBimmD5b2rKMk6Hj/3Pq9heVkmu8=","subject":"CN=The Koble Group CA,OU=Orion Health Direct Secure Messaging,O=The Koble Group\\, LLC,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRUaGUgS29ibGUgR3JvdXAsIExMQzEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRswGQYDVQQDExJUaGUgS29ibGUgR3JvdXAgQ0E=","whitelist":false,"attachment":{"hash":"26d2fe9de89376ac8e1c6629f7c329bd897418bfef5bfd6e1f96183eb3015d65","size":2276,"filename":"-bxu-yaG1XG4Y7p1WLTMN9VfkKOEpBn_Bsu7tJsi2U4=.pem","location":"security-state-staging/intermediates/60227b91-2842-47e3-8043-43cd17252c0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+bxu+yaG1XG4Y7p1WLTMN9VfkKOEpBn/Bsu7tJsi2U4=","crlite_enrolled":false,"id":"df4be940-d330-4c3a-9923-bafa52a3e054","last_modified":1562024722717},{"schema":1562024721169,"derHash":"SUKtBEEhiuwi2sQXrEmdfeTFTsvT0zXzSl+LBo9ubJY=","subject":"CN=Actalis Extended Validation Server CA G1,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MIGHMQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5vMQ8wDQYDVQQHDAZNaWxhbm8xIzAhBgNVBAoMGkFjdGFsaXMgUy5wLkEuLzAzMzU4NTIwOTY3MTEwLwYDVQQDDChBY3RhbGlzIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VydmVyIENBIEcx","whitelist":false,"attachment":{"hash":"9dca42b206384547c8a9ebe8126b177b165c1f506a22d83e63775bee433d5029","size":2243,"filename":"iiRAhRCKHfD_Hl73m_3kvrRJsjFUTTQ3Xaw6E8qVac4=.pem","location":"security-state-staging/intermediates/0bd6f9b1-1826-400c-9fc8-549c1432ff92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iiRAhRCKHfD/Hl73m/3kvrRJsjFUTTQ3Xaw6E8qVac4=","crlite_enrolled":true,"id":"d9a1301f-ca8e-47e1-b6ae-ce1d56900f3c","last_modified":1562024721910},{"schema":1562024719663,"derHash":"00E47RRYrn3k7eo27TmS5PRubsnPHmM+U43p/w84+OU=","subject":"CN=Orion Health Direct Secure Messaging Public HISP CA,OU=Orion Health Direct Secure Messaging,O=Orion Health Inc.,C=US","subjectDN":"MIGWMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRT3Jpb24gSGVhbHRoIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzE8MDoGA1UEAxMzT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nIFB1YmxpYyBISVNQIENB","whitelist":false,"attachment":{"hash":"94c25258c628090ccbfef78173fce5207a7b7d7d0786b01453aea545d1cc641f","size":2320,"filename":"_DkDZj8zqrqts7ngR8veYl3QLQiCdaFvI7j3ovLJLjQ=.pem","location":"security-state-staging/intermediates/e2ed17bc-c0a2-4f50-8600-d93fffa8427b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/DkDZj8zqrqts7ngR8veYl3QLQiCdaFvI7j3ovLJLjQ=","crlite_enrolled":false,"id":"a445528f-2000-4f16-a7e8-904d69b05da8","last_modified":1562024720406},{"schema":1562024718918,"derHash":"7qNsD/o/VP/bDPFLO9NKU+x7d19UBT3YsH39L4vskIM=","subject":"CN=Trustwave Extended Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE5MDcGA1UEAxMwVHJ1c3R3YXZlIEV4dGVuZGVkIFZhbGlkYXRpb24gU0hBMjU2IENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"621b7f65d119f8cacb26cf5956b7a206e1d42c2d931a41cf4311fdbc0bf8501e","size":1825,"filename":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=.pem","location":"security-state-staging/intermediates/1cd64f4c-6774-4383-aea2-1be395858f0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=","crlite_enrolled":true,"id":"3ba57112-f78c-4fa3-94f7-1eb77f9f8f2f","last_modified":1562024719654},{"schema":1562024717416,"derHash":"M+ik7UiTB2DOGtei1E8HmyL2YAUnU5dhCeb8dHUlUr0=","subject":"CN=TrustAsia OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgT1YgVExTIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"8f0250802a5effb55f9283f5becfe9736b17e0bdec2123b985d6c547798bc239","size":1666,"filename":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem","location":"security-state-staging/intermediates/2a54b660-4cce-4591-9297-660cc2220117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=","crlite_enrolled":true,"id":"4f9e9017-56da-4481-8083-248564e69585","last_modified":1562024718171},{"schema":1562024715170,"derHash":"nN/YJZbRusnkTT5JHiwH2NzJIEGZFf1vNhz3Ch5DOxA=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA - G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e43fe8619c09201ff336d2be7ea7b065245035b10edefc0d0c9cc445a0098b2d","size":1898,"filename":"jKeOrq37W9ZMRnlHh4gnOcrawDmxuqzbS5Om5m6Qyak=.pem","location":"security-state-staging/intermediates/73ad83c3-1e6c-4031-bb8e-e7800b1bb2b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jKeOrq37W9ZMRnlHh4gnOcrawDmxuqzbS5Om5m6Qyak=","crlite_enrolled":false,"id":"fd568972-755f-4a1e-8c44-f58d86c73a15","last_modified":1562024715911},{"schema":1562024714413,"derHash":"/IiJpBHRkQt6beFZ+zKPhN/9J1ajmnjpHLm7kMb+puQ=","subject":"CN=University of Crete CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHcxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEiMCAGA1UEAxMZVW5pdmVyc2l0eSBvZiBDcmV0ZSBDQSBSMw==","whitelist":false,"attachment":{"hash":"3f38972b3ba184fdd5a88bd5edfc309ffb146203c5e6710ef016700d3f649337","size":2775,"filename":"2tJ14hiF-3qIssF_Ns01wnvA9a1i8i26VjWdV82Wlq4=.pem","location":"security-state-staging/intermediates/9342a366-b470-4d8b-a331-808dee9e9d0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2tJ14hiF+3qIssF/Ns01wnvA9a1i8i26VjWdV82Wlq4=","crlite_enrolled":true,"id":"ea5f5ef2-9532-40eb-8804-ddc6a420ae90","last_modified":1562024715162},{"schema":1562024712927,"derHash":"HLRwcoz1bzAgA7sOTrBiQU+hHU+X4/BhFwyWyIBx1xE=","subject":"SERIALNUMBER=A11029279,CN=SIGNE Autoridad de Certificacion,O=SIGNE S.A.,L=Avenida de la Industria 18. Tres Cantos 28760-Madrid,C=ES","subjectDN":"MIGgMQswCQYDVQQGEwJFUzE9MDsGA1UEBww0QXZlbmlkYSBkZSBsYSBJbmR1c3RyaWEgMTguIFRyZXMgQ2FudG9zIDI4NzYwLU1hZHJpZDETMBEGA1UECgwKU0lHTkUgUy5BLjESMBAGA1UEBRMJQTExMDI5Mjc5MSkwJwYDVQQDDCBTSUdORSBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbg==","whitelist":false,"attachment":{"hash":"3f6d219cd54b538f11bc52eddaf32c9cbcb619f67f7a017b15a8e82efc886d08","size":2503,"filename":"ynelJ6-KsF0J-NiKpRriqZWi-wy8fLZiL_E1OPI9m7Q=.pem","location":"security-state-staging/intermediates/6843e057-b3a1-4c75-9cf3-558a38373e40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ynelJ6+KsF0J+NiKpRriqZWi+wy8fLZiL/E1OPI9m7Q=","crlite_enrolled":false,"id":"5871aa8f-9987-4d45-9022-05b4d7183a7e","last_modified":1562024713662},{"schema":1562024711406,"derHash":"NEe3S15QClSZg/os7XOlZC5qrseIKVRhWEN99m10Nbg=","subject":"CN=Entrust Certification Authority - L1J,OU=See www.entrust.net/legal-terms+OU=(c) 2016 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTYgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFK","whitelist":false,"attachment":{"hash":"2e07048ca86219c4ca3243524ce82f92bd4d6ee5a455e2f0788fa0719d8fec57","size":1414,"filename":"jI4Ykls9hjddSkzQ6huOlUndX7rjGTHuF5_d41IfoQg=.pem","location":"security-state-staging/intermediates/4cf5d4e3-3abb-470a-8f2f-a06b53c04f64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jI4Ykls9hjddSkzQ6huOlUndX7rjGTHuF5/d41IfoQg=","crlite_enrolled":true,"id":"b9f11e18-5206-4146-9bc4-ddabac60444f","last_modified":1562024712167},{"schema":1562024710635,"derHash":"/bNF0mk3ftnTQwi7eIVjKzDmH46vt+tedfgCTV/U4Yc=","subject":"CN=Actalis Extended Validation Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGSMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzI=","whitelist":false,"attachment":{"hash":"d7c5ffb611bebe89f018d16c77607820250f80793e311df76f8f922e05af8915","size":2324,"filename":"7BceCt47nBUwA0apsyAFMrAwZEtOsJ0HcCBwBjIkXMs=.pem","location":"security-state-staging/intermediates/f89bbfa9-5e8b-4f74-96f3-c9bd84205f7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7BceCt47nBUwA0apsyAFMrAwZEtOsJ0HcCBwBjIkXMs=","crlite_enrolled":true,"id":"d203afe2-d732-4a47-a358-8ca78084b518","last_modified":1562024711399},{"schema":1562024709882,"derHash":"3tsxy87F+Z046G7MTXaUXfQPLlR8lOSwEkCUh1r2pVg=","subject":"CN=GeoTrust DV SSL CA - G2,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"3439739bc1e7266a65a0e40c9f19967c1c86002e0c6cd9b795217957c2717c7c","size":1613,"filename":"mgUGy5n-uULtn7glVMU3OUXx8savFGjLQd6g3PsZv7U=.pem","location":"security-state-staging/intermediates/d591331f-b5b9-4283-9332-79fed3577527.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mgUGy5n+uULtn7glVMU3OUXx8savFGjLQd6g3PsZv7U=","crlite_enrolled":false,"id":"76e9e952-cf99-4bca-a810-f8e7f646e88e","last_modified":1562024710628},{"schema":1562024709140,"derHash":"QPR5Vb6j6nJsraxdP+YSl/57665bBQnh73spyDj0nSA=","subject":"CN=Atos TrustedRoot Client Issuing CA 2015,O=Atos,C=DE","subjectDN":"ME4xMDAuBgNVBAMMJ0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50IElzc3VpbmcgQ0EgMjAxNTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"dd579a2edbed1e53c1f47b7a826616a0d492b19006df01fe4ca95fec7212d82c","size":1569,"filename":"tjnIUgKXmzH2ph7qdeq_3nm1xMqgGPtNJ8mM19Zcu-M=.pem","location":"security-state-staging/intermediates/f292bc25-f1b7-45ff-9df5-d56c9893901c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tjnIUgKXmzH2ph7qdeq/3nm1xMqgGPtNJ8mM19Zcu+M=","crlite_enrolled":false,"id":"4f00eb7d-2e3c-402b-9dbb-97c1958dac20","last_modified":1562024709874},{"schema":1562024708399,"derHash":"wXYR23sxE2HiDXuCMarfR4vLf/oL5YXAbeIwkiPC74o=","subject":"CN=OMC,OU=ENTIDAD DE CERTIFICACION,O=ORGANIZACION MEDICA COLEGIAL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMSUwIwYDVQQKDBxPUkdBTklaQUNJT04gTUVESUNBIENPTEVHSUFMMSEwHwYDVQQLDBhFTlRJREFEIERFIENFUlRJRklDQUNJT04xDDAKBgNVBAMMA09NQw==","whitelist":false,"attachment":{"hash":"a803776f3d271b2b4cfdeef5d9a51f8db279dd9d598247889cc6742ab3d3d9ff","size":3165,"filename":"Lx99wFPK21XD3G9yPdiQ9625RbrSgNFJnI9V5mXPXkE=.pem","location":"security-state-staging/intermediates/12aab6e1-bfdf-437e-bbc8-fcb724a9ed52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lx99wFPK21XD3G9yPdiQ9625RbrSgNFJnI9V5mXPXkE=","crlite_enrolled":false,"id":"6cd35988-abd6-4b5b-ad02-7e3a0e83da05","last_modified":1562024709132},{"schema":1562024706892,"derHash":"Zj/elPiDah/r2DvoMQl5MS1l/4wbcWOU5o9B2COWwfg=","subject":"CN=Aristotle University of Thessaloniki Client RSA SubCA R1,O=Aristotle University of Thessaloniki,L=Thessaloniki,C=GR","subjectDN":"MIGWMQswCQYDVQQGEwJHUjEVMBMGA1UEBwwMVGhlc3NhbG9uaWtpMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxQTA/BgNVBAMMOEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"e884941029a92f7cc721cf8f87b2dacfc378d2d5a064c4b6ddba7ad39417d4ee","size":3027,"filename":"ytEFkkfmakfLzegbNdjrBvQKQbWEW2YFusfFkTp1XZ4=.pem","location":"security-state-staging/intermediates/a3aaecf9-aaf9-426f-bad7-768214675cd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ytEFkkfmakfLzegbNdjrBvQKQbWEW2YFusfFkTp1XZ4=","crlite_enrolled":false,"id":"5a75985c-ec69-4abe-a08c-8eaaa1d12c61","last_modified":1562024707639},{"schema":1562024706143,"derHash":"Pk8J1lQ4tc9+RWKIwI/p9H7U4+1mknnIGu+rC6+4agk=","subject":"CN=Louisiana Health Care Quality Forum CA,OU=Orion Health Direct Secure Messaging,O=Louisiana Health Care Quality Forum,C=US","subjectDN":"MIGbMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjTG91aXNpYW5hIEhlYWx0aCBDYXJlIFF1YWxpdHkgRm9ydW0xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEvMC0GA1UEAxMmTG91aXNpYW5hIEhlYWx0aCBDYXJlIFF1YWxpdHkgRm9ydW0gQ0E=","whitelist":false,"attachment":{"hash":"428c87d34cb911d650c2ead42003657d5e3523f033beb76ce916b9717250c2ef","size":2324,"filename":"0oFe6aMlwHnzOWvJ6PJOW1sZTMXgzyY1_0iznwf8fjM=.pem","location":"security-state-staging/intermediates/20dc63b8-33e7-40a2-a18f-047fda833f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0oFe6aMlwHnzOWvJ6PJOW1sZTMXgzyY1/0iznwf8fjM=","crlite_enrolled":false,"id":"5f45c22c-a691-4926-a7a5-bc9262b58299","last_modified":1562024706884},{"schema":1562024704660,"derHash":"wCLVzqonXypiaPp5rDVlOzpzDe+kH5zYgX1tFZvTMJc=","subject":"CN=DigiCert Secure Site Korea EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIENB","whitelist":false,"attachment":{"hash":"f253f14a706e3542ba2225ccb86204637d0ef708b5d912aeccc04e74d10e5e16","size":1699,"filename":"GU23iW3XanBnTnSB-qHY60G9W7OWfde0SLEvQJL9stY=.pem","location":"security-state-staging/intermediates/3311e594-a7f2-4770-9ef8-99ef2e365393.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GU23iW3XanBnTnSB+qHY60G9W7OWfde0SLEvQJL9stY=","crlite_enrolled":false,"id":"5839e0ee-6dfe-4352-a923-db68e62acab8","last_modified":1562024705394},{"schema":1562024703916,"derHash":"twIbzzRuhQKxJ1+ABX87l0Z6yLinYWCDQOz4SE7DhIw=","subject":"CN=Symantec Shared Individual Email Certificate Authority,OU=Symantec Trust Network+OU=Universal Root Managed PKI Individual Subscriber CA,O=Symantec Corporation,C=US","subjectDN":"MIHMMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAsTM1VuaXZlcnNhbCBSb290IE1hbmFnZWQgUEtJIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTE/MD0GA1UEAxM2U3ltYW50ZWMgU2hhcmVkIEluZGl2aWR1YWwgRW1haWwgQ2VydGlmaWNhdGUgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"0e66a63db740bfecf6042b8f34f2aab90907ba00e5cafe54ab3cc5faa750bc35","size":1999,"filename":"2ZRuq3rGjU72BNFg4TcN1Ix1HL_bYnlwehHZPK517-I=.pem","location":"security-state-staging/intermediates/40eebf4d-76e5-448b-8f3f-e6f66e68137d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZRuq3rGjU72BNFg4TcN1Ix1HL/bYnlwehHZPK517+I=","crlite_enrolled":false,"id":"c86ad407-3434-41bc-b9a3-1e139da7091e","last_modified":1562024704651},{"schema":1562024701623,"derHash":"uNXWXCP/nYyQL/5r7B3S8gaTryDpiuR3UfHsspgSe24=","subject":"CN=Certigna Wild CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHkxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRkwFwYDVQQDDBBDZXJ0aWduYSBXaWxkIENB","whitelist":false,"attachment":{"hash":"c9d1b633464898b551171e5655c6d033a8158730020ca58cbc318d75b497caf4","size":2503,"filename":"6PsBH2V6vxU_w6DnSyY4EpqQYeF8QrYgohY-fWMfhmE=.pem","location":"security-state-staging/intermediates/26d15fd4-439e-44a4-9647-68a200a9c445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6PsBH2V6vxU/w6DnSyY4EpqQYeF8QrYgohY+fWMfhmE=","crlite_enrolled":true,"id":"eea82515-872e-42a6-a344-f0b1c78abfca","last_modified":1562024702399},{"schema":1562024699344,"derHash":"Q3hZMD0Bg4Yqlvar+LA/KmnUy9MXIXZmAV4aujyEqhE=","subject":"CN=Alaska eHealth Network CA,OU=Orion Health Direct Secure Messaging,O=Alaska eHealth Network\\, Inc.,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzElMCMGA1UEChMcQWxhc2thIGVIZWFsdGggTmV0d29yaywgSW5jLjEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMSIwIAYDVQQDExlBbGFza2EgZUhlYWx0aCBOZXR3b3JrIENB","whitelist":false,"attachment":{"hash":"4091de3751ab313e7e649ce44c803e724201dd6805e79a8cbff59e9c013089eb","size":2300,"filename":"dfkE-bSHbmrjRBwkrMH5PQwaIQkos_AmfwEJJXYOIa0=.pem","location":"security-state-staging/intermediates/e5662ed0-eac1-4eab-9ce5-b207ced92959.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dfkE+bSHbmrjRBwkrMH5PQwaIQkos/AmfwEJJXYOIa0=","crlite_enrolled":false,"id":"56f1c6ae-fc7f-4290-82fb-07952074ad17","last_modified":1562024700095},{"schema":1562024698606,"derHash":"QzoJ/92y7tgu6p+RjIYMBMvqsTgaSN/ixI5C4T01r4E=","subject":"CN=RapidSSL Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGlJhcGlkU1NMIENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"000067152686f177585432d9dbf083f3ba0e9247714199a6a0a4dd88853060d8","size":1707,"filename":"A5Wm0DA34lHONfES5fxD574yGj-Q4hJ_2RLfym2qyMQ=.pem","location":"security-state-staging/intermediates/39d021b4-045d-4df0-bd97-f97c1c1ce4d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A5Wm0DA34lHONfES5fxD574yGj+Q4hJ/2RLfym2qyMQ=","crlite_enrolled":false,"id":"d9651719-df4a-45d3-b841-cec02ae95cdc","last_modified":1562024699336},{"schema":1562024697831,"derHash":"ZWldUAEX/XJw8QJ+0SHwWUJnAHVGHTN+7sf2pbdXpHo=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma TSA II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHGMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEhMB8GA1UEAwwYQ2FtZXJmaXJtYSBUU0EgSUkgLSAyMDE0","whitelist":false,"attachment":{"hash":"06cdf05da15710413bcdb3c16b8e3f0453970466f63bdc6906fdb88c05ed5da0","size":2987,"filename":"GnaOorQmNxUdFpJsmrLyIIkCM1_g9iZ0es7p5xqkBxY=.pem","location":"security-state-staging/intermediates/ee5ffdeb-6347-45c1-89a8-f3d1d0d39dc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnaOorQmNxUdFpJsmrLyIIkCM1/g9iZ0es7p5xqkBxY=","crlite_enrolled":false,"id":"31a8767d-3150-41ae-b216-4dca0fa22970","last_modified":1562024698597},{"schema":1562024697080,"derHash":"OOlHN3L2M8nct0O+Jx25JIgQYTqfiyh+Ld8Ns1l8jNs=","subject":"CN=UIS-IsuB1-CA","subjectDN":"MFkxEzARBgoJkiaJk/IsZAEZFgNjb20xFjAUBgoJkiaJk/IsZAEZFgZ1bmlzeXMxEzARBgoJkiaJk/IsZAEZFgN1aXMxFTATBgNVBAMTDFVJUy1Jc3VCMS1DQQ==","whitelist":false,"attachment":{"hash":"c2b1f3688781af36e6d27a330a09d939105128f808804a477bb1ecbd9f6eb250","size":2487,"filename":"vDj0a53UpusZTxtxcI-9ZUwj-RyW5jTHxGzrsv1qKs0=.pem","location":"security-state-staging/intermediates/12fc4555-cc24-4d7c-8d3f-2853ba40865b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vDj0a53UpusZTxtxcI+9ZUwj+RyW5jTHxGzrsv1qKs0=","crlite_enrolled":false,"id":"11cf500b-368e-4976-9070-e14a563874d2","last_modified":1562024697823},{"schema":1562024696338,"derHash":"25gZTlW5NtJubLP0YKJi62ymYzfnv/F6C/wIMlH2NiY=","subject":"CN=DigiCert Transition ECC Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gRUNDIFJvb3Q=","whitelist":false,"attachment":{"hash":"a503ee47d948586edc2de135a04ad0a5bf079f3430c38e4fa52765f5414feddd","size":1260,"filename":"fKyaD_MVOHdQuouv2xwrwps_C7oWNiypOpD4TaLfXz4=.pem","location":"security-state-staging/intermediates/1d50ac3c-c208-4965-8496-e94edb6ae235.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fKyaD/MVOHdQuouv2xwrwps/C7oWNiypOpD4TaLfXz4=","crlite_enrolled":false,"id":"8f14a185-27bb-46c9-8a7d-f062d9508611","last_modified":1562024697073},{"schema":1562024693355,"derHash":"4SHBaU2nN8F7hkSK7cYU7r15Rqe0uR+zACW2NgcCOeo=","subject":"CN=TU Dortmund Chipcard CA 2,O=Technische Universitaet Dortmund,C=DE","subjectDN":"MFwxCzAJBgNVBAYTAkRFMSkwJwYDVQQKDCBUZWNobmlzY2hlIFVuaXZlcnNpdGFldCBEb3J0bXVuZDEiMCAGA1UEAwwZVFUgRG9ydG11bmQgQ2hpcGNhcmQgQ0EgMg==","whitelist":false,"attachment":{"hash":"0bc67e75f1a550023d6bf6415f76c4bbfa22728373423b60d4e7e69eaa7bc87b","size":1967,"filename":"-p4rAAgYbHPbwWrr_BlNozrzb4GHt5BSuZwneaDRlOs=.pem","location":"security-state-staging/intermediates/41136d39-9edf-4465-ab5f-af073bc975d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+p4rAAgYbHPbwWrr/BlNozrzb4GHt5BSuZwneaDRlOs=","crlite_enrolled":false,"id":"f972f74e-4035-4b85-850c-b92110d4c782","last_modified":1562024694110},{"schema":1562024691129,"derHash":"wYxXFOSGGJ3Sw+b1Y8WpdDTQzgpTkzDyP1ghPrhWirI=","subject":"CN=The University of Texas at Dallas RSA CA,OU=Information Security Office,O=The University of Texas at Dallas,L=Richardson,ST=TX,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEzARBgNVBAcTClJpY2hhcmRzb24xKjAoBgNVBAoTIVRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIGF0IERhbGxhczEkMCIGA1UECxMbSW5mb3JtYXRpb24gU2VjdXJpdHkgT2ZmaWNlMTEwLwYDVQQDEyhUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBhdCBEYWxsYXMgUlNBIENB","whitelist":false,"attachment":{"hash":"d83db0100dd0651aed7a1f9d2f176811876df6ea0bbd93799a522ec2d121b897","size":2215,"filename":"oSg8JaDAQ9ImWQdr0rRFk3oUkfB2cH07F8NSCR7dQiw=.pem","location":"security-state-staging/intermediates/46cfac9c-1592-4289-82a4-76a735c25a0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oSg8JaDAQ9ImWQdr0rRFk3oUkfB2cH07F8NSCR7dQiw=","crlite_enrolled":false,"id":"1e473b20-47b2-43a7-a660-2f7f01c79bea","last_modified":1562024691858},{"schema":1562024690373,"derHash":"2Sv46fqGfb2LeUxqSeb/H8+scfPX9K5Vu5WH6ySsZIk=","subject":"CN=Intel External Issuing CA 7B,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDdC","whitelist":false,"attachment":{"hash":"3252f7b7ea0a73ee0dc29fb52054976ceefcfe385a3ed7d3230c1b17bc3b0a51","size":2584,"filename":"nNwmZpaXyiCdG3FOv6UayFdR2hD6Jp81-ByKuK4m0hc=.pem","location":"security-state-staging/intermediates/0635c17f-ed6f-4dda-9c17-ad7e86ea81de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nNwmZpaXyiCdG3FOv6UayFdR2hD6Jp81+ByKuK4m0hc=","crlite_enrolled":true,"id":"71f46dcf-1163-4ae4-82d0-70227f0d13aa","last_modified":1562024691121},{"schema":1562024689525,"derHash":"Fgi/h0FM3Pq0J5ECoZcC2dWZapEynj3y+ASVRzqthsY=","subject":"CN=GROB-WERKE GmbH und Co. KG SMIME CA,O=GROB-WERKE GmbH und Co. KG,L=Mindelheim,ST=Bayern,C=DE","subjectDN":"MIGGMQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5ZXJuMRMwEQYDVQQHEwpNaW5kZWxoZWltMSMwIQYDVQQKExpHUk9CLVdFUktFIEdtYkggdW5kIENvLiBLRzEsMCoGA1UEAxMjR1JPQi1XRVJLRSBHbWJIIHVuZCBDby4gS0cgU01JTUUgQ0E=","whitelist":false,"attachment":{"hash":"e902888764e15f459260d581daca513e4d9312ed891f8366f61cfa3a818da4eb","size":1898,"filename":"9C6CMkucrjEzjuHJ0_Yvi_3haIQNwSsvg6dURAGCvQw=.pem","location":"security-state-staging/intermediates/2eeedbc9-d767-4120-9f52-1b8596e7016e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9C6CMkucrjEzjuHJ0/Yvi/3haIQNwSsvg6dURAGCvQw=","crlite_enrolled":false,"id":"aa9c5926-0cf0-4383-8c7c-86fbb9e3275c","last_modified":1562024690364},{"schema":1562024688131,"derHash":"WWFWvCpDFet2jIJtfMoykVjK48b492BTaWW+58ra9u0=","subject":"CN=GENIOUS RSA Organization Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGVMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxPTA7BgNVBAMTNEdFTklPVVMgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"b67d95389481054676ee7593a657285e90ebc97092559fd2c290b35a70e6adb4","size":2186,"filename":"TGPK3krjByA1NGzfFpJE6yAuNxJS1sOdosy48yS34bY=.pem","location":"security-state-staging/intermediates/bb436925-661b-4c7d-b6d9-4cadc9fee665.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TGPK3krjByA1NGzfFpJE6yAuNxJS1sOdosy48yS34bY=","crlite_enrolled":false,"id":"1d14fc34-cfca-4720-bd7d-f6bab37335af","last_modified":1562024689517},{"schema":1562024682352,"derHash":"pahZzgMQqF9CpUEdpj+DtBROuUvIplqZdayGgvZn23c=","subject":"CN=KLASS3-SK 2016,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MIGGMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECwwYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEXMBUGA1UEAwwOS0xBU1MzLVNLIDIwMTY=","whitelist":false,"attachment":{"hash":"c86690eaf270e47aa47657df040ad7c00e44765f0541b6f39df22674b68d953a","size":2316,"filename":"xef4f3N5BNZP0Q0QcNP_K4mvKbkyVm6HUsu5v4fhkxw=.pem","location":"security-state-staging/intermediates/61e6fc9a-cbb9-46d0-a853-873ffe0a401b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xef4f3N5BNZP0Q0QcNP/K4mvKbkyVm6HUsu5v4fhkxw=","crlite_enrolled":false,"id":"f96d8ef1-2281-4fea-82fe-99e436804069","last_modified":1562024683335},{"schema":1562024680960,"derHash":"FaWN4H88JJ4m/o6pDWtxqWU210V50tO+z6ct66KP5uI=","subject":"SERIALNUMBER=201802,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDI=","whitelist":false,"attachment":{"hash":"97f5722cd07529a5c144cd8737c75d9df0894a3a632ef8cd9ed63f6dd432fd99","size":2337,"filename":"5Jza1_aAF2D2CllpCE_uElJfffYV4G7_ri5y_L78I7k=.pem","location":"security-state-staging/intermediates/81cbc5f5-72e7-4902-9d9c-06c7bc371cce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Jza1/aAF2D2CllpCE/uElJfffYV4G7/ri5y/L78I7k=","crlite_enrolled":false,"id":"a598405e-8a6e-4c07-a762-15192c3040d1","last_modified":1562024682344},{"schema":1562024675733,"derHash":"1AT6+kui9Ca2bNIZxtqE+RwPt8tYQp7IB34qdkMU1V0=","subject":"CN=SHECA RSA Extended Validation Code Signing CA,O=UniTrust,C=CN","subjectDN":"MFgxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE2MDQGA1UEAwwtU0hFQ0EgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"a15897802d23e699976d747ab51f10c55e3269b1d232e8dc8dfd3c1939062fec","size":2056,"filename":"FFIzlMw5Xc6E2LQuZDJSIUp6ilY_hMZ3pV79yOdqxT8=.pem","location":"security-state-staging/intermediates/072a73d3-de48-413f-ae4c-8ece54ee2d74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FFIzlMw5Xc6E2LQuZDJSIUp6ilY/hMZ3pV79yOdqxT8=","crlite_enrolled":false,"id":"651de304-28d1-4884-8d67-d193d89dce21","last_modified":1562024676798},{"schema":1562024670128,"derHash":"djFLQcutTTf+2gYd//UKywPsgAfmXTYsZSPOGcQaaho=","subject":"CN=SSL Blindado 2,OU=Certifica\u00e7\u00e3o Digital,O=Site Blindado S.A.,L=S\u00e3o Paulo,ST=SP,C=BR","subjectDN":"MIGGMQswCQYDVQQGEwJCUjELMAkGA1UECBMCU1AxEzARBgNVBAcMClPDo28gUGF1bG8xGzAZBgNVBAoTElNpdGUgQmxpbmRhZG8gUy5BLjEfMB0GA1UECwwWQ2VydGlmaWNhw6fDo28gRGlnaXRhbDEXMBUGA1UEAxMOU1NMIEJsaW5kYWRvIDI=","whitelist":false,"attachment":{"hash":"fa57ea713308d04440c58d4fa7a1500999cf041024985d5f8f20c47c1e4a3ee9","size":2162,"filename":"4-iqNnPo4Sq4xWzqc2uPKOdxlIAOrvZz-berOkTMMI4=.pem","location":"security-state-staging/intermediates/589c3c5b-ea54-467b-96cd-c34e117bb8a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4+iqNnPo4Sq4xWzqc2uPKOdxlIAOrvZz+berOkTMMI4=","crlite_enrolled":true,"id":"6d3bd155-89d6-4c5a-9aff-142261690ccc","last_modified":1562024671131},{"schema":1562024668446,"derHash":"rL+uvcvOGshMmM8kFAtgYalzGOkmIVQJ3Az0x75QZiA=","subject":"CN=Fraunhofer Service CA - G02,OU=Fraunhofer Corporate PKI,O=Fraunhofer,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGPMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjETMBEGA1UECgwKRnJhdW5ob2ZlcjEhMB8GA1UECwwYRnJhdW5ob2ZlciBDb3Jwb3JhdGUgUEtJMSQwIgYDVQQDDBtGcmF1bmhvZmVyIFNlcnZpY2UgQ0EgLSBHMDI=","whitelist":false,"attachment":{"hash":"f5d44378aebefee88f997f5baa67fce4e41c10b120f38a27f2ed2087d1347498","size":2028,"filename":"k3nI5IvSB1BwykyJ-lu8LZoHsTKb-Zq2JRhAXR7OjBU=.pem","location":"security-state-staging/intermediates/86390395-14c7-4e6b-8840-51150f08950a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3nI5IvSB1BwykyJ+lu8LZoHsTKb+Zq2JRhAXR7OjBU=","crlite_enrolled":true,"id":"97c725bf-dfc1-4940-bed8-defc980dd7a3","last_modified":1562024669293},{"schema":1562024663411,"derHash":"GPQ2j+k7PK4CUjC85+rTQP2Q+yf5oQ42/uifxFTyJ4g=","subject":"CN=CrossTrust DV CA5,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBNQ==","whitelist":false,"attachment":{"hash":"2095edba6d54418256b1c82c2499bd9f75e39608c3dc0e3b395dac7a8870a119","size":1642,"filename":"mfydQPGtsWNlYaYdaD2eprRgxX0MdeoAw0G537kLXzk=.pem","location":"security-state-staging/intermediates/779275d4-b98f-4e5c-9606-7d98a85e2d32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mfydQPGtsWNlYaYdaD2eprRgxX0MdeoAw0G537kLXzk=","crlite_enrolled":true,"id":"70cd95b5-008a-41bf-b38e-525ca51982fb","last_modified":1562024664425},{"schema":1562024662659,"derHash":"oEZpf7hZ8MJrsTYMDebkqRSzuujAYxpW7GiJI/lUHuo=","subject":"CN=Greek School Network CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaR3JlZWsgU2Nob29sIE5ldHdvcmsgQ0EgUjI=","whitelist":false,"attachment":{"hash":"80378669992df895fe7c174b9406850901e279fea75c842fd6b3c2ff6c14043b","size":2515,"filename":"98TGXZmp4DiQ3clcfPyaWFAMTYcQaD8IUO2NCCrpEK0=.pem","location":"security-state-staging/intermediates/01368076-14b4-4b4e-b1c1-b9b490b60ec0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"98TGXZmp4DiQ3clcfPyaWFAMTYcQaD8IUO2NCCrpEK0=","crlite_enrolled":true,"id":"589d8720-2ba2-4203-acda-9cb678c4e712","last_modified":1562024663402},{"schema":1562024661916,"derHash":"HyAocW4zWE8z+pIKgCR77s3D18smUZVUxkTOTExgd6k=","subject":"CN=Gandi Pro SSL CA 2,O=Gandi,L=Paris,ST=Paris,C=FR","subjectDN":"MFoxCzAJBgNVBAYTAkZSMQ4wDAYDVQQIEwVQYXJpczEOMAwGA1UEBxMFUGFyaXMxDjAMBgNVBAoTBUdhbmRpMRswGQYDVQQDExJHYW5kaSBQcm8gU1NMIENBIDI=","whitelist":false,"attachment":{"hash":"0b14e4838611e1040d16acabdae7756870a021f18844011f2f87c5ebfbf97f22","size":2101,"filename":"XQpYwYiHpVLml4eYccUVEZJpEOh5QrryTkXbWPum2FM=.pem","location":"security-state-staging/intermediates/da1204ed-4700-4361-bbeb-cffde787f323.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XQpYwYiHpVLml4eYccUVEZJpEOh5QrryTkXbWPum2FM=","crlite_enrolled":true,"id":"2e2be106-0cd8-423e-acc8-a99f0741c76c","last_modified":1562024662650},{"schema":1562024659671,"derHash":"o6MQwwU6lC/Rbc0oOqm5qYtOvFAShttTSERFwtQGQ5U=","subject":"SERIALNUMBER=201728,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI4","whitelist":false,"attachment":{"hash":"f88597ad972bcb415157d862d83d8ba205b08e3b6f81f186151e052143d9c2c1","size":2402,"filename":"Zm0n84A8Hfky-2Hxedi6vTc2e7xTRFGkgkHRccK9SQA=.pem","location":"security-state-staging/intermediates/1aa3c537-650e-493f-b57a-b13c3670115b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zm0n84A8Hfky+2Hxedi6vTc2e7xTRFGkgkHRccK9SQA=","crlite_enrolled":false,"id":"329c9535-9fd6-4a5d-b07b-307647627c7b","last_modified":1562024660408},{"schema":1562024655926,"derHash":"CA5+NrPH+pbsxn239NQc7OHRlEAa8ZakpHt5vcSXBXQ=","subject":"CN=FR03,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"ME4xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxDTALBgNVBAMMBEZSMDM=","whitelist":false,"attachment":{"hash":"0e878e377f71dc53a8708f58d1a029dab3d1ba19aae19818ecaa81b11ff7f98c","size":2361,"filename":"5aXOeu2kcFD4gRajILogB4nDzNx-0ZsGl_VZJJ4Bcck=.pem","location":"security-state-staging/intermediates/ed40f0b5-5f1f-4858-b1a9-0e0e454d7a2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5aXOeu2kcFD4gRajILogB4nDzNx+0ZsGl/VZJJ4Bcck=","crlite_enrolled":false,"id":"f6f0bd28-e216-439a-b50e-0eb0e9c39fd4","last_modified":1562024656668},{"schema":1562024654415,"derHash":"JEobcwyh11pppS9eX0IbtUfHl+JK++nPuZyZNIjNwnE=","subject":"CN=SSLs.com RSA OV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gUlNBIE9WIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d9c03b9d8ce926db05361c2a2e9ebb41169021361e35605f6762ed68c201c0f8","size":2129,"filename":"Zyd1gFi_OihMqmE83KKHmgjVpD3p-B1OSbDcm-Mh1HI=.pem","location":"security-state-staging/intermediates/5b7360a4-d5af-4db0-a175-6ac34f6f359c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zyd1gFi/OihMqmE83KKHmgjVpD3p+B1OSbDcm+Mh1HI=","crlite_enrolled":false,"id":"ede190ce-6e19-49ed-b777-76affc7a59c3","last_modified":1562024655178},{"schema":1562024653662,"derHash":"FcgTItoi8e58gjGswLUuTxenrmswgRui9mfmSP+C2Ko=","subject":"CN=GeoTrust Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkdlb1RydXN0IENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"35c33dbfaa3357dd26c043e304c3f067c93a1570a4a61d76b2cbd5f28ce68451","size":1658,"filename":"yQ3gGILmNT91r7IExWW0hjmSsOFoarXP2l8w_rCiqjI=.pem","location":"security-state-staging/intermediates/b9dc0b3e-4e93-4c74-a2a2-70baecda5ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yQ3gGILmNT91r7IExWW0hjmSsOFoarXP2l8w/rCiqjI=","crlite_enrolled":false,"id":"986f0086-4142-4ea7-a032-8318876fe49c","last_modified":1562024654408},{"schema":1562024650671,"derHash":"jP4TFbFn/L/IsanrVOl/Eygu4lB+DSOwFI0FOuhzb+M=","subject":"CN=Greek Academic Network CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTElMCMGA1UEAwwcR3JlZWsgQWNhZGVtaWMgTmV0d29yayBDQSBSMg==","whitelist":false,"attachment":{"hash":"afcea3835e49125880e2099105b71bc7371bb52e07197ab0d7790bdb0e1cdff8","size":2182,"filename":"oioxNDiUVFIA2kOPSehGUrby06Q-zdTupeexlqTUVGg=.pem","location":"security-state-staging/intermediates/27abd690-5eb8-49e0-b7dc-56479e0f2e1e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oioxNDiUVFIA2kOPSehGUrby06Q+zdTupeexlqTUVGg=","crlite_enrolled":true,"id":"d8c20a63-2574-4aa9-99cf-2c559248f49e","last_modified":1562024651416},{"schema":1562024648439,"derHash":"YBKTyiCwmgMpXRliVsaVP/nrqBHbjjzhQEE8G//pqGk=","subject":"CN=AC FNMT Usuarios,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MEsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGTAXBgNVBAMMEEFDIEZOTVQgVXN1YXJpb3M=","whitelist":false,"attachment":{"hash":"98c05c3829d90c10dc917b2cce8e171d89d2621e2a69fdf4104f2ca5c4e1d9b5","size":2434,"filename":"CyFyC5Hw5FxD8ufLGF9VLrfeftRrKsFy7jm1CEFxCm8=.pem","location":"security-state-staging/intermediates/c63e246e-e4a9-41cd-9d0c-d6bd4563f4d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CyFyC5Hw5FxD8ufLGF9VLrfeftRrKsFy7jm1CEFxCm8=","crlite_enrolled":false,"id":"e7b7334d-1c42-4373-af42-028c694f4f20","last_modified":1562024649177},{"schema":1562024647686,"derHash":"x5C0cShEfsC2DyK/y3ldccMm3ZEO4Sy7TMWoYZHrkbw=","subject":"CN=RapidSSL RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"8d48a4abde2999b864fb9607b6e2b43144a92714cdf63de21b44d83e923ae297","size":1687,"filename":"nKWcsYrc-y5I8vLf1VGByjbt-Hnasjl-9h8lNKJytoE=.pem","location":"security-state-staging/intermediates/fbead98d-cbd8-4432-90ef-c600588aad52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nKWcsYrc+y5I8vLf1VGByjbt+Hnasjl+9h8lNKJytoE=","crlite_enrolled":true,"id":"1bc7f624-5af1-4e32-adc2-850bcbe509c2","last_modified":1562024648431},{"schema":1562024646934,"derHash":"mMJUWiwFo0LtsiqfbHzMH+mNh1lWduOimK3pf3sBKR0=","subject":"CN=Telia Extended Validation CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFMxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEoMCYGA1UEAwwfVGVsaWEgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSB2Mw==","whitelist":false,"attachment":{"hash":"cfccad2513e8a79668b0439df943a8027f9cf6e9df609184e5a59ecb4652c42a","size":2357,"filename":"M64GXqmJRZS4-HYfzVBON86Fc4RrWpo0uUMAaJSGSoo=.pem","location":"security-state-staging/intermediates/976a3c1d-a72a-4df1-86ae-0d14b9abe958.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M64GXqmJRZS4+HYfzVBON86Fc4RrWpo0uUMAaJSGSoo=","crlite_enrolled":false,"id":"36618487-dec3-4f3c-bbcb-9c997d3da4cd","last_modified":1562024647677},{"schema":1562024645415,"derHash":"aGG71MvtoqoBBmv0dr+PL+bqnwCMsKyOF1Xioyj6WTM=","subject":"CN=GeoTrust SupremeSSL 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGYxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJTAjBgNVBAMTHEdlb1RydXN0IFN1cHJlbWVTU0wgMSBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"373aa2e25b056cec6efe1e730bddc90c02ef00673b9fcdbdecf27f45022767f5","size":1435,"filename":"MvWcqevnkZnFHxjKilcZrsSWbR8T5JBIZ9pHPT2t7c4=.pem","location":"security-state-staging/intermediates/e13233f4-f7b1-4bda-a820-d84b3227b772.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MvWcqevnkZnFHxjKilcZrsSWbR8T5JBIZ9pHPT2t7c4=","crlite_enrolled":false,"id":"d0d43bdc-8347-4819-898f-44ee3a2094bc","last_modified":1562024646178},{"schema":1562024643925,"derHash":"t9/cJ+X/nzXv7J9LxTLDX3J3ibackKBIm0AkcpnZcDg=","subject":"CN=NCC Group Secure Server CA G4,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"6bba8a4f7467c485c33229430bcdc46f0a8e260ecda70283cadc4c16d46d3efc","size":2259,"filename":"MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN-THyz125ar_w=.pem","location":"security-state-staging/intermediates/92243c0e-e056-4cbe-8c9c-46b2431e55f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN+THyz125ar/w=","crlite_enrolled":false,"id":"1be64318-c01e-4e05-9642-ba1a140b8f77","last_modified":1562024644659},{"schema":1562024643182,"derHash":"rYBqk1e4fR6x3YWlo8CS0CBLpEf/SzcU4/EDT0096KA=","subject":"CN=TrustAsia ECC DV SSL CA - G7,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGbMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJTAjBgNVBAMTHFRydXN0QXNpYSBFQ0MgRFYgU1NMIENBIC0gRzc=","whitelist":false,"attachment":{"hash":"ebbd88e3ff6a42d32837fa50a25dbd9d8cd0a7160b4513be3bff457a5f2f9a2e","size":1662,"filename":"HxpZpgA2aeZ4tewEwREYzhJ-jiwtTgrvLw0DLcn9Zuo=.pem","location":"security-state-staging/intermediates/73491823-ff56-4639-bfd4-809dcebab607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HxpZpgA2aeZ4tewEwREYzhJ+jiwtTgrvLw0DLcn9Zuo=","crlite_enrolled":false,"id":"c1afb7e3-58f3-4382-aff3-6da3ae7cf800","last_modified":1562024643918},{"schema":1562024641634,"derHash":"bLxbMwid37MlI3QGbYrgu+v7p3nbrldHJ5gmygzQXao=","subject":"SERIALNUMBER=201520,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MjA=","whitelist":false,"attachment":{"hash":"f8368bcc57ccb54a60e5cd5f771bae93885dd835ac9c7d93fb4bf0c6879f2be4","size":2093,"filename":"dUEUuB5jxCsvgh9iUJs0gNgF5SUPlP6kHDXYF6TI0qg=.pem","location":"security-state-staging/intermediates/b8123175-0124-4b42-9ca9-8fa735e58ffb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dUEUuB5jxCsvgh9iUJs0gNgF5SUPlP6kHDXYF6TI0qg=","crlite_enrolled":false,"id":"b66503e2-5ae2-40cd-9a39-31e70edc2fe8","last_modified":1562024642398},{"schema":1562024640879,"derHash":"7g9kewN50+S9JLTNpvhwe2fETVUR9aJbMd0pk+0TuZE=","subject":"CN=KeyNet Systems RSA Codesigning CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSowKAYDVQQDEyFLZXlOZXQgU3lzdGVtcyBSU0EgQ29kZXNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"d806fefd7fc730cee01857ae79aa61d872cec7e504d5fdc5b237d214bbe49a0e","size":2121,"filename":"yF0wtp1jCZD5CVHOt8FGpYuYs0KHDFYkMO7rLbCWnxs=.pem","location":"security-state-staging/intermediates/ea4041b7-4458-4530-b792-3dd083eb24ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yF0wtp1jCZD5CVHOt8FGpYuYs0KHDFYkMO7rLbCWnxs=","crlite_enrolled":false,"id":"b8a82aab-854e-43df-8a83-e56b2abc56a3","last_modified":1562024641626},{"schema":1562024640128,"derHash":"dKvl5czrdUkf9yxM8yVAXYrb/jkOGJz0MLpg5ieYh44=","subject":"CN=GlobalSign Qualified Time Stamping CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFF1YWxpZmllZCBUaW1lIFN0YW1waW5nIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"390e714997d51e1e6c2518f0577114169f70bf99bf7075c17ede8ab266418f8b","size":2333,"filename":"wa9IwR3KKWRyfMtS73Nt1hUWl63Qj3Pfg6VDVR2hZZc=.pem","location":"security-state-staging/intermediates/9d78e16e-5b65-4571-a961-a72d55244348.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wa9IwR3KKWRyfMtS73Nt1hUWl63Qj3Pfg6VDVR2hZZc=","crlite_enrolled":false,"id":"9e5df267-d269-49ba-accc-7148af1740ec","last_modified":1562024640872},{"schema":1562024639346,"derHash":"ce/DA7efYnc6YgZQkGKRCRN2Ftr6OBT3ZPKk8t4wjJc=","subject":"CN=Don Dominio / MrDomain RSA Codesigning CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGUMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMTIwMAYDVQQDEylEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"93809ce288569e0a80022d76b567f6111be181c1409952f6104a03054e439930","size":2158,"filename":"CrN64DaXdgi0ZeV86ffGFSIF8l-3irYcKimQA8lXRvc=.pem","location":"security-state-staging/intermediates/83703eb2-f064-48c1-a37b-48595cd66e27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CrN64DaXdgi0ZeV86ffGFSIF8l+3irYcKimQA8lXRvc=","crlite_enrolled":false,"id":"827ccb06-0216-48bc-9dc5-0e275639a416","last_modified":1562024640120},{"schema":1562024636330,"derHash":"6GvBbMZJHl9LmXYxOEKz0CyZ6iY66x3CI9iY+ofISEU=","subject":"CN=Intermediate Certificate DV SSL CA - G3,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEhMB8GA1UEChMYSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEwMC4GA1UEAxMnSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIERWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"195afb969c8619e4ae9d77e800d89622d5b5e6863724ca0b08cfc1acf51e176f","size":1752,"filename":"RttTLrYI9IiksyY9ikb6Z5G21gXd-PC6JavBmeoUhFQ=.pem","location":"security-state-staging/intermediates/3c8e4cea-ada4-4d01-99ef-c17583cd2e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RttTLrYI9IiksyY9ikb6Z5G21gXd+PC6JavBmeoUhFQ=","crlite_enrolled":false,"id":"19f456b7-aefd-4a74-bfc2-4c69c84b227b","last_modified":1562024637072},{"schema":1562024634825,"derHash":"/NczzyQ6oyLxiQoZuSL2+q3PM8RJhTcvH9QDYOXbRUA=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGOMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxOTA3BgNVBAMTMEhFQUwtTElOSyBIZWxsZW5pYyBBY2FkZW1pYyBMaWJyYXJpZXMgTGluayBDQSBSMg==","whitelist":false,"attachment":{"hash":"faa326d8a1f2b480e44d115d21b8ede6d23515f18895ccd916c77df67e3b3fe3","size":2572,"filename":"7sJ8RMpnyY2DImVRw5k-1OVZMBQjegMbRJJlc8JvQYw=.pem","location":"security-state-staging/intermediates/744082c5-b92f-4e8b-b2a4-62c76f2ed069.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7sJ8RMpnyY2DImVRw5k+1OVZMBQjegMbRJJlc8JvQYw=","crlite_enrolled":true,"id":"e3ec2766-2033-4174-b315-24dfed391391","last_modified":1562024635558},{"schema":1562024634083,"derHash":"k1abJqpTXj4HyJHGvS+p3Ak5wk20s3Jq2FMe2xfEl8o=","subject":"CN=Thawte EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBSU0EgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"aa41f2f1317c4207a1ce000f100f89792938ebbd08ccc7367391461f45499ac8","size":1662,"filename":"LrLVqGD-UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm_U=.pem","location":"security-state-staging/intermediates/96e7bbbb-d73b-4033-b2a1-e8243524a5bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LrLVqGD+UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm/U=","crlite_enrolled":true,"id":"85dafc08-0b93-4086-a997-de6c1c290cdb","last_modified":1562024634817},{"schema":1562024633327,"derHash":"EYDDOuHyMiiSP2rmmMnBDccp4NgR/IsuwCcm4twm4uQ=","subject":"CN=Mary Washington Healthcare CA,OU=Orion Health Direct Secure Messaging,O=Mary Washington Healthcare,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaTWFyeSBXYXNoaW5ndG9uIEhlYWx0aGNhcmUxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEmMCQGA1UEAxMdTWFyeSBXYXNoaW5ndG9uIEhlYWx0aGNhcmUgQ0E=","whitelist":false,"attachment":{"hash":"f27a0d7f7099ac8f18503b8f3e491b2a79d0e29e512d0183a401f13211fb332e","size":2308,"filename":"3fZZys3pCVAZzGIvFjCN9qPTAa_HZxcHFvElXaL0oEo=.pem","location":"security-state-staging/intermediates/90afa439-0588-4864-86ca-7342ec654bef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fZZys3pCVAZzGIvFjCN9qPTAa/HZxcHFvElXaL0oEo=","crlite_enrolled":false,"id":"7f4afbf6-84ea-4275-bf34-2df9f0ef7ec1","last_modified":1562024634075},{"schema":1562024631064,"derHash":"fwfBL/9GU9a7ZfnM/RoOnuRmiE6wdyd7ubtF12JDzCI=","subject":"CN=cPanel Extended Validation RSA Certification Authority,OU=Controlled by COMODO exclusively for cPanel\\, Inc.,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xFTATBgNVBAoTDGNQYW5lbCwgSW5jLjE6MDgGA1UECxMxQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIGNQYW5lbCwgSW5jLjE/MD0GA1UEAxM2Y1BhbmVsIEV4dGVuZGVkIFZhbGlkYXRpb24gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"d1bbc1da043caed75d76f28bd38fb18682563dac07cd7bf50225a2df8a59a870","size":2263,"filename":"KpHjtz2O9rMfP4azz-Q54sswiBTZMPXTpgqz8YbaLxY=.pem","location":"security-state-staging/intermediates/9f5ff8d2-5dad-434f-96b3-f774d101a4f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KpHjtz2O9rMfP4azz+Q54sswiBTZMPXTpgqz8YbaLxY=","crlite_enrolled":false,"id":"6210dc38-77f8-4be4-9d9d-dc0af9f6a298","last_modified":1562024631797},{"schema":1562024627331,"derHash":"yBksMve0nH8yocoAFZWn+eNsnnIFjW6qG6t3UqjBZxg=","subject":"CN=GlobalSign SMIME CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIFNNSU1FIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"60387e84f4510d6de07955c632fa7b57744fec7421e7a6c71b8146efbe767f1e","size":1646,"filename":"5METmo6RU7kSFFHasy87-Yr-zR3pFY6GNCY1M084qpg=.pem","location":"security-state-staging/intermediates/7f667502-8313-4684-ad31-beaae087ae6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5METmo6RU7kSFFHasy87+Yr+zR3pFY6GNCY1M084qpg=","crlite_enrolled":false,"id":"d6835983-aca8-442a-ad58-55908e0b7315","last_modified":1562024628080},{"schema":1562024626566,"derHash":"/CgbGiVMKgBz2Vk/GCOBvieHBl47UiE0VClMXC8RlTc=","subject":"CN=Sectigo RSA Extended Validation Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxODA2BgNVBAMTL1NlY3RpZ28gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"33e7c322675e7bdb5f32c2d6d1233bffe8d9634feda4861f4b95735289052139","size":2154,"filename":"Mn6dnrahNIa08AjqfJouU0xQyNvIF6P_y5xeJthQTwI=.pem","location":"security-state-staging/intermediates/e05a0dc7-704c-497d-8660-79aca583ade4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mn6dnrahNIa08AjqfJouU0xQyNvIF6P/y5xeJthQTwI=","crlite_enrolled":false,"id":"3af61df4-c217-4f92-90ea-5bb3de3f7043","last_modified":1562024627323},{"schema":1562024624262,"derHash":"S8xeI0/oHt5Or4g6oZwxM1sLJuheBmuZReTLYVPrIMI=","subject":"CN=Thawte TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"ab46e21b2e6e52647007f65c64b45ece54a6f9162bf19babfd723021d1ed126d","size":1634,"filename":"42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG-CipUmaM=.pem","location":"security-state-staging/intermediates/2deee9f5-6f96-4266-860b-0f80cf881111.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG+CipUmaM=","crlite_enrolled":true,"id":"30af8c0a-f879-42ef-9671-106eda3c7cbb","last_modified":1562024625011},{"schema":1562024623475,"derHash":"gNnttFt/WSzTAlTlW8MWu/ROR9/AwASjgygcA/NFujk=","subject":"CN=Volusion\\, Inc. DV SSL CA - G3,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"0898be28f7290da5c6273dfad054616ae1855f6aa5901d7922a67344d09f7763","size":1723,"filename":"RMqGtQ81XY6e9YblNqPQsG-I-Vl4drli249zNcNSNG8=.pem","location":"security-state-staging/intermediates/9634597d-175a-49aa-8c22-d757966db0e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RMqGtQ81XY6e9YblNqPQsG+I+Vl4drli249zNcNSNG8=","crlite_enrolled":false,"id":"6b1ed47e-c61a-4822-abd2-60fe59426945","last_modified":1562024624251},{"schema":1562024622714,"derHash":"ERAGN4r76OmbsCuoc5DKQp/KJ3P3TX9+tXRPXd9oAUs=","subject":"CN=COMODO RSA Organization Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE8MDoGA1UEAxMzQ09NT0RPIFJTQSBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"392b7ffb2a6d72092399d66449152de878985c5738c191f6ef26addba3d8eb50","size":2158,"filename":"EgNpQklEUNXn9Nl6RoIOC532j1g5-EFw0ZpLxxJq9Ms=.pem","location":"security-state-staging/intermediates/c80aa8eb-6981-4908-8d72-212d3bd441de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EgNpQklEUNXn9Nl6RoIOC532j1g5+EFw0ZpLxxJq9Ms=","crlite_enrolled":true,"id":"a6d34d17-e949-4454-abaa-0a9d4b0491c3","last_modified":1562024623466},{"schema":1562024621218,"derHash":"TywMFwG94Btr7tptF8M2BCQhr3MRcGM0f36Xt2rYl/U=","subject":"CN=GlobalSSL Secure E-Mail and Client Authentication CA,O=GlobalSSL,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlHbG9iYWxTU0wxPTA7BgNVBAMTNEdsb2JhbFNTTCBTZWN1cmUgRS1NYWlsIGFuZCBDbGllbnQgQXV0aGVudGljYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"b2019acf4321d57d1f4034c278f7761779e2fc130bbf2ca87aabbe5a7047c614","size":1760,"filename":"rvxRPOOErynHJj6lYghacyWHWiAPuUDhnQ7bzVQe7nA=.pem","location":"security-state-staging/intermediates/877ea40c-279d-4cd8-b03b-99944b427bcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rvxRPOOErynHJj6lYghacyWHWiAPuUDhnQ7bzVQe7nA=","crlite_enrolled":false,"id":"f9c9ddb7-531e-4937-a263-83d2c27d3642","last_modified":1562024621953},{"schema":1562024619702,"derHash":"EMP0Dpu+F7SPCzx8IpyrCiCHH86+zMz2orsyDwYAxV0=","subject":"CN=GENIOUS ECC Domain Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGPMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxNzA1BgNVBAMTLkdFTklPVVMgRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"f3a06e4e586746c718894b7aa2c2e9bd671253ab6b338d4df2627f4a2d14d8d7","size":1337,"filename":"1cqz0JJYdVUqvZUaW4P8qx8yIL49CzeX5G4oCYvH4Rk=.pem","location":"security-state-staging/intermediates/1a177cfa-33d9-4c35-9cdd-4a73c7973fc6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1cqz0JJYdVUqvZUaW4P8qx8yIL49CzeX5G4oCYvH4Rk=","crlite_enrolled":false,"id":"7c266e3a-9521-4d0f-9d73-3c71c87172f8","last_modified":1562024620466},{"schema":1562024618939,"derHash":"5z8fGaRFmmBnpF6E21hdbB348SpznXM/WyiZZUbxh1o=","subject":"CN=EID-SK 2016,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGAxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEUMBIGA1UEAwwLRUlELVNLIDIwMTY=","whitelist":false,"attachment":{"hash":"d1877d7e7d6896cdc30b2a96d22c25da8e88a3850982a8200030af501da20c0d","size":2446,"filename":"WjtwJIwch5NRyJIrp2ugEDPftPNWvNEABHOUTFt-3Ts=.pem","location":"security-state-staging/intermediates/7aa7841a-915a-45b2-ac5b-777c1b425ffa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WjtwJIwch5NRyJIrp2ugEDPftPNWvNEABHOUTFt+3Ts=","crlite_enrolled":false,"id":"77f687a7-202f-4434-8803-51beb26f0c1e","last_modified":1562024619694},{"schema":1562024617416,"derHash":"HnLYPtlJnLpoaWhFK+WRxIgW7JGBORpdA8H007oWWNw=","subject":"CN=Inland Empire Health Information Exchange,OU=Inland Empire Health Information Exchange,O=Inland Empire EHR Resource Center,C=US","subjectDN":"MIGhMQswCQYDVQQGEwJVUzEqMCgGA1UEChMhSW5sYW5kIEVtcGlyZSBFSFIgUmVzb3VyY2UgQ2VudGVyMTIwMAYDVQQLEylJbmxhbmQgRW1waXJlIEhlYWx0aCBJbmZvcm1hdGlvbiBFeGNoYW5nZTEyMDAGA1UEAxMpSW5sYW5kIEVtcGlyZSBIZWFsdGggSW5mb3JtYXRpb24gRXhjaGFuZ2U=","whitelist":false,"attachment":{"hash":"56a96226dc0a4ebcd492c2ba0a04368f7c5f5189a22e885261c55391d2562b9a","size":2333,"filename":"q6gCaPEu6hA3-78YqCU97RQxanv-hMImmAKou_5S3gk=.pem","location":"security-state-staging/intermediates/b63f11e8-55f8-4280-920f-f5c9455fdaef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6gCaPEu6hA3+78YqCU97RQxanv+hMImmAKou/5S3gk=","crlite_enrolled":false,"id":"38ae9eda-30d4-49fa-9452-56249cf4e96f","last_modified":1562024618180},{"schema":1562024616673,"derHash":"jMNOEcFnBFgkreYcSQemRA7bLEOY6ZwRKoWdZh+OK8c=","subject":"CN=GeoTrust RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"a013c9348417f4076dc717cab4baf557d42e0c77d49f5a42c13f09fafee4a167","size":1634,"filename":"zUIraRNo-4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=.pem","location":"security-state-staging/intermediates/be8a1d98-433a-4bf6-941e-c31bcf350d57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zUIraRNo+4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=","crlite_enrolled":true,"id":"5fa2fd0c-5f29-4a58-ab51-5fee7d3956b4","last_modified":1562024617409},{"schema":1562024615906,"derHash":"qyyT4BzCFYB/BM2/w2KAjYiUCnss7nAjjTVtjZSVbfk=","subject":"CN=COMODO RSA Extended Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGUMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE6MDgGA1UEAxMxQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"c9ffc8c4cf8f0c1b8f57788dbb13ef5542a34da4b3a7f581d414769ea5f86cde","size":2207,"filename":"_KV5PqHI-A-AHDl7BRjU7Yfi8xL4XtBw8FQAx1HWgH4=.pem","location":"security-state-staging/intermediates/0741c886-1069-4fed-ba52-8aa03fd43e8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/KV5PqHI+A+AHDl7BRjU7Yfi8xL4XtBw8FQAx1HWgH4=","crlite_enrolled":false,"id":"9d095dee-9b79-4c70-bbe1-b0414439ac0d","last_modified":1562024616665},{"schema":1562024612891,"derHash":"CBmY09n35M2dpqQpRwv11EKAMlJE+g4B7l+XLKGfSFI=","subject":"CN=D-TRUST CA 2-1 2015,O=D-Trust GmbH,L=Berlin,C=DE","subjectDN":"MFMxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHEwZCZXJsaW4xFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEcMBoGA1UEAxMTRC1UUlVTVCBDQSAyLTEgMjAxNQ==","whitelist":false,"attachment":{"hash":"3ee88758fbc42936cdbaed638d306033285f883f6fc602279794d4d88452d2fd","size":2064,"filename":"tBmQRPuFevsHIbhhN0kSgAJhEeKQhFq-DxUdV4m8qjA=.pem","location":"security-state-staging/intermediates/ec9f953f-facc-41f4-b5d0-2c6a1e31915a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tBmQRPuFevsHIbhhN0kSgAJhEeKQhFq+DxUdV4m8qjA=","crlite_enrolled":false,"id":"eaf29e12-56d5-477b-8328-1ce42f6733c7","last_modified":1562024613656},{"schema":1562024612131,"derHash":"QuDAWgD8Lkc9jQdu+0SnAXzv+/YEBisWrLZE7q4e//w=","subject":"CN=GoGetSSL RSA Client CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MFAxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEfMB0GA1UEAxMWR29HZXRTU0wgUlNBIENsaWVudCBDQQ==","whitelist":false,"attachment":{"hash":"2beb77fd6eea7febde47fc783ed0bf34a16601fd477256a11c28da821d02c17e","size":2077,"filename":"AZIBKLEh9RhLmf8irgJ9nlzVJAU1ySO6mTPIPOHqRuY=.pem","location":"security-state-staging/intermediates/55adcf08-23d6-4397-bed3-bd2a8d244e6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AZIBKLEh9RhLmf8irgJ9nlzVJAU1ySO6mTPIPOHqRuY=","crlite_enrolled":false,"id":"d2998b45-cbc9-462d-b3c6-e56dda5c943b","last_modified":1562024612884},{"schema":1562024001225,"derHash":"mQI8Yjbaexn/sUgzuCDZIGOTi4/OE2kMY8TAS2V/qy0=","subject":"SERIALNUMBER=PT507015851,CN=DIGITALSIGN QUALIFIED CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGyMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxITAfBgNVBAMTGERJR0lUQUxTSUdOIFFVQUxJRklFRCBDQQ==","whitelist":false,"attachment":{"hash":"b675985300d025f65fe9827dec53d33102a6f925454c266cf8c101e39ca1f3a1","size":3007,"filename":"XnyavelRFrecWitFpdKCH6tt4uvYXn4uWw85BpJFc8Q=.pem","location":"security-state-staging/intermediates/c244d547-6237-434a-b7ea-3dfbab9f0c2d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XnyavelRFrecWitFpdKCH6tt4uvYXn4uWw85BpJFc8Q=","crlite_enrolled":false,"id":"3691181e-ad54-44dd-b4b5-442c1cea58d0","last_modified":1562024612123},{"schema":1562023998218,"derHash":"g/bwF8JTbXRUt7mEhnTzZAEpz1Vd0H2D02KhfIG3Ul8=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - AAPP,OU=Certificados Digitales para la Administracion Publica,O=Firmaprofesional SA,C=ES","subjectDN":"MIGkMQswCQYDVQQGEwJFUzEcMBoGA1UEChMTRmlybWFwcm9mZXNpb25hbCBTQTE+MDwGA1UECxM1Q2VydGlmaWNhZG9zIERpZ2l0YWxlcyBwYXJhIGxhIEFkbWluaXN0cmFjaW9uIFB1YmxpY2ExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAxMaQUMgRmlybWFwcm9mZXNpb25hbCAtIEFBUFA=","whitelist":false,"attachment":{"hash":"b98bc5a31792d37a50d2b260b8ed96c230e3529f2d97f627c3072c493daca57e","size":2381,"filename":"hLz0sJLVz-CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=.pem","location":"security-state-staging/intermediates/ac3a8a6e-7ab4-4f2b-9899-75eafdb945b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hLz0sJLVz+CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=","crlite_enrolled":false,"id":"8f582949-0077-4497-9855-078b473ca565","last_modified":1562023998962},{"schema":1562023997464,"derHash":"t3h0inkrj5HwSwG6/DGjHtfvanEq/4C2YQ2are4get8=","subject":"CN=GlobalSign PersonalSign 2 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"55ef97771e1a5db3bed9a55930e18bfa8c515f42eed6a6898d2b9fe5be13bf50","size":1760,"filename":"moVGXeLu33Z1sQyVonZDRMiCGiG4C1YXJPZjuqaf0vE=.pem","location":"security-state-staging/intermediates/04ad1207-747d-4bbc-aec8-534ace9d0ce2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"moVGXeLu33Z1sQyVonZDRMiCGiG4C1YXJPZjuqaf0vE=","crlite_enrolled":true,"id":"b37f92b2-240f-4970-87fb-063ff1d871ed","last_modified":1562023998206},{"schema":1562023995947,"derHash":"eILZ+qSai7NR8Pxu1oXvH8UVQdDOCkIiB00dnhb9wws=","subject":"CN=TrustCor External PKI (ECA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGGMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxJTAjBgNVBAMMHFRydXN0Q29yIEV4dGVybmFsIFBLSSAoRUNBMSk=","whitelist":false,"attachment":{"hash":"f8c6a9c5a539d228e33a4f7d992ac66e08c7b640cc56f5001fc6d112058b9557","size":1841,"filename":"r8bpcGxaP_Y16yqulxob7gpE3Q_rlYtNW1KdjRa2f1s=.pem","location":"security-state-staging/intermediates/2bf859ab-2a88-4ff7-af17-307ea95d877a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r8bpcGxaP/Y16yqulxob7gpE3Q/rlYtNW1KdjRa2f1s=","crlite_enrolled":true,"id":"9284e1ce-82d9-41fe-905b-061a3bc6e3f9","last_modified":1562023996685},{"schema":1562023992214,"derHash":"bGa3bmjWx5+v5clOm30M91PHFcyFOH4RMjt5NfhhwYc=","subject":"CN=Symantec Class 3 EV SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"5a78e0580a5b4a406494a8640e18f7ea3ff821f8be3f9b0ee6a91001569a7da2","size":1853,"filename":"9vTUviB31wX_C0Yzx-HkTZxJmAcqoWvp_aPTgD-kyr8=.pem","location":"security-state-staging/intermediates/0135fea2-a052-473e-8cb6-2b987f16c6ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9vTUviB31wX/C0Yzx+HkTZxJmAcqoWvp/aPTgD+kyr8=","crlite_enrolled":false,"id":"fbb73ec4-342b-4aa9-9df7-3ca9f646f690","last_modified":1562023992953},{"schema":1562023989959,"derHash":"H5NmbaV+HuQ7Gec2f3IlFR1EqWZxhDrWJiKI20qoA3c=","subject":"CN=FujiSSL SHA2 Business Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHcxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xLTArBgNVBAMTJEZ1amlTU0wgU0hBMiBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"482afe899c6f0d8f22e431adaae4099bcc9ca90c82b6bbf311ea220ad7be3fbc","size":2142,"filename":"AapugBjS_xPRoLxwSH9ER41rNad1oyfyVH7OwZcxPkY=.pem","location":"security-state-staging/intermediates/eb5a1c32-ead7-49e1-a96f-02cc6acc3d51.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AapugBjS/xPRoLxwSH9ER41rNad1oyfyVH7OwZcxPkY=","crlite_enrolled":true,"id":"b25cf132-6ed5-42dd-95be-9a1049d9494f","last_modified":1562023990717},{"schema":1562023989217,"derHash":"oNFSOgv2Y1UOuQgem93toSgU+VcLdpfZXfLqU9T/deM=","subject":"CN=RapidSSL ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"ee5666095b0adbea4d0fc0e22f86c954e59f68c2eb5a347a7c6c3eaf8db0a25f","size":1410,"filename":"zJax49jXNWVm12ouj-dVmlW_r0Zw4NbjfsoCxV3-blM=.pem","location":"security-state-staging/intermediates/79d47d47-5626-42ac-99ee-cfbdac6397b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zJax49jXNWVm12ouj+dVmlW/r0Zw4NbjfsoCxV3+blM=","crlite_enrolled":true,"id":"763411e1-8114-46f4-8c40-92fecd1f7cc4","last_modified":1562023989952},{"schema":1562023988478,"derHash":"83b25b9mD2vtt2jc0TA+rdSpby7XqXcX6Hj65rtZWfo=","subject":"CN=thawte EV Code Signing CA,O=thawte\\, Inc.,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xIjAgBgNVBAMTGXRoYXd0ZSBFViBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"9f1b61ed157098a541e167d69899a6e220062c8853f21e51e158779d17889570","size":1792,"filename":"iHlBWPUQuLqy-fke8htnHN-RscOd6sowyaclmFVQdC8=.pem","location":"security-state-staging/intermediates/e9705c73-c0fc-4403-9fbc-82eb39aac338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iHlBWPUQuLqy+fke8htnHN+RscOd6sowyaclmFVQdC8=","crlite_enrolled":false,"id":"4cdf6681-6886-48ea-a0fa-e4c2dddbb9de","last_modified":1562023989209},{"schema":1562023987725,"derHash":"Q2/tMIldbH8NbcCdtiGrO4jsYyHFbKb9SdeYEeKlmMo=","subject":"CN=TBS X509 CA business 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGBMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR8wHQYDVQQDExZUQlMgWDUwOSBDQSBidXNpbmVzcyAy","whitelist":false,"attachment":{"hash":"10ac6fea486a331fa522b3ef2a2198adfa12ebeac4d525146320a9a4dc9c4ac0","size":2154,"filename":"SSBQnpJB4S4xChF_ht4nYT6NSI2ORtzmPESVfewnepc=.pem","location":"security-state-staging/intermediates/ec1f383e-adad-4dea-b81f-b702db7ee117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SSBQnpJB4S4xChF/ht4nYT6NSI2ORtzmPESVfewnepc=","crlite_enrolled":true,"id":"9ddcb45e-54b3-4bf4-979b-25e170de22f3","last_modified":1562023988470},{"schema":1562023986956,"derHash":"ZjpOZY+790/BmwFV8vrLEsybaXBY9EfveRF4/puNBz0=","subject":"CN=Trustico RSA EV CA,OU=Controlled by COMODO exclusively for The Trustico Group Ltd,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMRAwDgYDVQQHEwdDcm95ZG9uMR8wHQYDVQQKExZUaGUgVHJ1c3RpY28gR3JvdXAgTHRkMUQwQgYDVQQLEztDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgVGhlIFRydXN0aWNvIEdyb3VwIEx0ZDEbMBkGA1UEAxMSVHJ1c3RpY28gUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"eee3863ef1b6090102296c0bb3ae3aaa94c133aa41d948886a83f0d998f0ab01","size":2247,"filename":"KwL2fukG72afNxr2mfIc-zRSfV9FvVkQd67wLyLhGLY=.pem","location":"security-state-staging/intermediates/9063beaf-04d5-4fc4-9fe6-18bd29f50ff9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwL2fukG72afNxr2mfIc+zRSfV9FvVkQd67wLyLhGLY=","crlite_enrolled":true,"id":"720c9041-549b-4132-9f95-9f7f40057140","last_modified":1562023987718},{"schema":1562023985472,"derHash":"Abnz0I4xqejhYA0RjCq/2FaHXqYIJwIEaYZbokLuvhw=","subject":"CN=KIT-CA,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE","subjectDN":"MHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcMCUthcmxzcnVoZTEqMCgGA1UECgwhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MQ8wDQYDVQQDDAZLSVQtQ0E=","whitelist":false,"attachment":{"hash":"57d86dbb18c2e8959844b08e15275c9f4e998e6bdecb15b2b7a77730e1c220a5","size":2008,"filename":"DvZiVD0jtzGADZxUQnbhnHsFjD8JVapxjCjP6aLBeoY=.pem","location":"security-state-staging/intermediates/5e91cd24-d2d6-4885-96ae-f41fd7f2fa91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DvZiVD0jtzGADZxUQnbhnHsFjD8JVapxjCjP6aLBeoY=","crlite_enrolled":true,"id":"3131956b-39c5-40b6-93ef-b46c278f30de","last_modified":1562023986203},{"schema":1562023980906,"derHash":"y64nZ+6M1/tJtmK0Ivch20Ui62dM2/FstiCeRcxMuZ4=","subject":"CN=DigiCert Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"b9fa0a6f524e0d4ba96ac6f144f478c2eb0b8b3e26130eff45513a544d53f51a","size":1122,"filename":"zEmSNnW6fJ5Iqjj7nFju1Oo-THW233SD1mcA_AYTsIQ=.pem","location":"security-state-staging/intermediates/c1f0a12d-cef9-4764-926e-63bc50c9dc83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zEmSNnW6fJ5Iqjj7nFju1Oo+THW233SD1mcA/AYTsIQ=","crlite_enrolled":false,"id":"4cd2d258-9f4c-4594-8f6f-ffd1ffda2a7e","last_modified":1562023981651},{"schema":1562023979410,"derHash":"Vtpu/vHVBBNMcu7cOuRKp/oRuEiCDb+qhsqONdYO2wQ=","subject":"CN=FujiSSL Public Validation Authority - G3,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGcxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTEwLwYDVQQDEyhGdWppU1NMIFB1YmxpYyBWYWxpZGF0aW9uIEF1dGhvcml0eSAtIEcz","whitelist":false,"attachment":{"hash":"bbb89301ab3ea4fd79d1448f5c852927551328811eee186c33c831d20d5e0ae0","size":1674,"filename":"dzjq2willdWoAe9M1lz4AuLGmmFYgxAD2zYIXMhbzjo=.pem","location":"security-state-staging/intermediates/f2374571-0b80-42e0-8883-fda71075451e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzjq2willdWoAe9M1lz4AuLGmmFYgxAD2zYIXMhbzjo=","crlite_enrolled":true,"id":"77918a2e-3fdb-4dcf-8e32-cbe1b39f74f4","last_modified":1562023980153},{"schema":1562023978668,"derHash":"g4aYGG3Qb45zbDnK+95k5C1Yq6Y2zirZ3/jRhV6peQo=","subject":"SERIALNUMBER=201901,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAx","whitelist":false,"attachment":{"hash":"84159d3c932465ae7a84a6ccf35cde1f35966c191eeea2c094ac2d5ee1eac878","size":2333,"filename":"1CTr2EMZuVrTNlxyZgkW5swxcLs2mFupZgcP-OxRDww=.pem","location":"security-state-staging/intermediates/09b4f348-2689-46a4-8c8c-7f747f843a72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1CTr2EMZuVrTNlxyZgkW5swxcLs2mFupZgcP+OxRDww=","crlite_enrolled":false,"id":"dfa4b7da-e066-4c3e-baff-3786a59cfc48","last_modified":1562023979402},{"schema":1562023977920,"derHash":"BS8CbB5i5pekeRPgfOJN6DyIG/MAo8wkzAydRuyCR7s=","subject":"CN=TBS X509 CA pro hosting 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGEMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMSIwIAYDVQQDExlUQlMgWDUwOSBDQSBwcm8gaG9zdGluZyAy","whitelist":false,"attachment":{"hash":"993599686a8894c81c679246e879ef9412dfdb43d1397ad6267c2c8fed59290d","size":2162,"filename":"XVLXL83TODHCORI1qq2fNoRUOUkHLj4GCQZqTjJ6v8Q=.pem","location":"security-state-staging/intermediates/c78d6da1-ce01-48ea-a32a-17541a01fbfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XVLXL83TODHCORI1qq2fNoRUOUkHLj4GCQZqTjJ6v8Q=","crlite_enrolled":true,"id":"8599ae99-290a-4ccb-9b99-261d95b6f43f","last_modified":1562023978660},{"schema":1562023977173,"derHash":"3Ist7lDdR4qxNcrCac6miFFVepEpq82Y31ITsj2/s80=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"871e25e4b9ca85246a4b37ec76971395d8cc080cda844fd7e9419affa5171af1","size":2308,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/84a519a2-7323-495a-8f7c-1fb9364bc534.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"3413fc51-a47b-4ef2-ba0b-c5c737f0aa91","last_modified":1562023977912},{"schema":1562023976406,"derHash":"XbHSLXBmhPBxnokC+4azRrP8nk0aH5IoOkiLw9GgSEs=","subject":"CN=KPN PKIoverheid EV CA,O=KPN B.V.,C=NL","subjectDN":"MEAxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEeMBwGA1UEAwwVS1BOIFBLSW92ZXJoZWlkIEVWIENB","whitelist":false,"attachment":{"hash":"3223a6f20d3bcb5d806c34644dc513be43f488b74f0a98a8bd87b2f973f3e5e1","size":2398,"filename":"I3seYPBcqTLCDRX732wxVtBaCAQOzNasd4KqO6a0mHk=.pem","location":"security-state-staging/intermediates/e35603f8-d7e3-4a6f-9359-4ce261a49d75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I3seYPBcqTLCDRX732wxVtBaCAQOzNasd4KqO6a0mHk=","crlite_enrolled":true,"id":"574422ec-9c83-49c3-af28-f0b84daaad6f","last_modified":1562023977164},{"schema":1562023974115,"derHash":"TY60k4Dscqyf3yH+HG2y6UkMdr6t0fe1KMPM0nLI/ig=","subject":"CN=GlobalSign TSA CA for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"ME0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSMwIQYDVQQDExpHbG9iYWxTaWduIFRTQSBDQSBmb3IgQUFUTA==","whitelist":false,"attachment":{"hash":"b66664c300d9d856dd6eef13fa063334f34d358466c922d8c47b40ad0c0b0e44","size":2024,"filename":"49lIjSAnHwOuVWuOR-RTuElzQhgXaCC3y9iz_nrQN2I=.pem","location":"security-state-staging/intermediates/a857ed41-1550-4d26-8db7-818835c03d40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"49lIjSAnHwOuVWuOR+RTuElzQhgXaCC3y9iz/nrQN2I=","crlite_enrolled":false,"id":"e77711f5-130c-4fb9-ba65-f13cf7fe4e7a","last_modified":1562023974847},{"schema":1562023971865,"derHash":"ziMyOQIIdCoaymUTl0xMnbJpHq9FaLUz5KF+1d2pc+Y=","subject":"CN=QuoVadis PKIoverheid Organisatie Server CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTgwNgYDVQQDDC9RdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"9525b72d3221be1b9347991e7b0d27ed63304244a37e568e02a881198dd0e180","size":2625,"filename":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=.pem","location":"security-state-staging/intermediates/911f64d6-2761-4b8b-af66-93fe6683dfd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=","crlite_enrolled":true,"id":"1334321a-2837-4638-a78c-39d8abf02ec7","last_modified":1562023972605},{"schema":1562023971111,"derHash":"JbZjkN1CWGfsDeWKaxmPWYW+WKQ6RgXhoLjG81uS1+4=","subject":"CN=DigiCert Transition Issuing CA G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyFEaWdpQ2VydCBUcmFuc2l0aW9uIElzc3VpbmcgQ0EgRzM=","whitelist":false,"attachment":{"hash":"3db9cade05807e7d695419e46f030bf8947492fa115aa4f663b14352e0c42ac5","size":1666,"filename":"vWZ6uLUEEYECEjKFJEMsz_6EwAfw1zYwbvVxr4xS6Jg=.pem","location":"security-state-staging/intermediates/a9d455c2-351f-466e-86bd-080e8839a158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vWZ6uLUEEYECEjKFJEMsz/6EwAfw1zYwbvVxr4xS6Jg=","crlite_enrolled":false,"id":"204c48d8-5783-4bf9-b862-a37638c87cd4","last_modified":1562023971857},{"schema":1562023970347,"derHash":"CSIy5d8b+Ly/7Rr02R81U/JWYYTgky5L6vcdFqWa1sg=","subject":"SERIALNUMBER=201729,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI5","whitelist":false,"attachment":{"hash":"07d0f80c6b777643e464217a9b873097b3f26ba8bc375ca90b6908c3d7bcc0df","size":2402,"filename":"NcK6oyN11YK2iroVd4M8_YvV2-gLKHeDevPGXmnoWlk=.pem","location":"security-state-staging/intermediates/58253a8a-2a3d-4341-ad75-d94d0251c68c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NcK6oyN11YK2iroVd4M8/YvV2+gLKHeDevPGXmnoWlk=","crlite_enrolled":false,"id":"77d3b8ac-c30b-4922-ab9c-caf13765cb69","last_modified":1562023971104},{"schema":1562023969605,"derHash":"kfSGCmh2DlX08hWEeOZ/lYvWN7fA+2CT6ekE36RqwzQ=","subject":"CN=Intertek Document Signing Authority,O=Intertek Group plc,C=GB","subjectDN":"MFgxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJJbnRlcnRlayBHcm91cCBwbGMxLDAqBgNVBAMTI0ludGVydGVrIERvY3VtZW50IFNpZ25pbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"19af2bba948c39703d8d3595df8354c3acc80e9e5a764f484112a95dc145a505","size":1938,"filename":"YHxb7yqXsZo593tQi7lml-UbIYBZ-nRncrwmyt7z_jU=.pem","location":"security-state-staging/intermediates/3d7ae7b9-a9e4-46bd-99ae-9325d76b8bda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YHxb7yqXsZo593tQi7lml+UbIYBZ+nRncrwmyt7z/jU=","crlite_enrolled":false,"id":"aa97eece-537e-4d3c-8f70-b629fb852344","last_modified":1562023970339},{"schema":1562023968860,"derHash":"428WX/dznNkAolYnZ7Pq++Z6NMg8OoL0wh1fUcPtGR4=","subject":"CN=WoTrus DV Server CA,OU=Controlled by Sectigo exclusively for WoTrus CA Limited,O=WoTrus CA Limited,L=Shenzhen,ST=Guangdong,C=CN","subjectDN":"MIGwMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdkb25nMREwDwYDVQQHEwhTaGVuemhlbjEaMBgGA1UEChMRV29UcnVzIENBIExpbWl0ZWQxQDA+BgNVBAsTN0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgV29UcnVzIENBIExpbWl0ZWQxHDAaBgNVBAMTE1dvVHJ1cyBEViBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"ad4c5148267048017f28179ac20a4ea5bfdb82d16c59f8f2a51e279ab002cf1e","size":2203,"filename":"BhCtKhlg16YgpKtkvEyMb10W4rnVIagCz4ZLBicH1aQ=.pem","location":"security-state-staging/intermediates/1293d917-4168-4c3c-89cd-afa2186222ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BhCtKhlg16YgpKtkvEyMb10W4rnVIagCz4ZLBicH1aQ=","crlite_enrolled":false,"id":"324811d1-4f0b-4ec9-8ed5-314d562ded2c","last_modified":1562023969598},{"schema":1562023965880,"derHash":"jLMkgs2vON1o4yKrm0Q053ORDzOy9W+AItUVYghGVBc=","subject":"CN=SSL.com EV Code Signing Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"188db821b5f6a15b8ce89543363312e52cf935460178da5aef5d0ab64099ddec","size":1276,"filename":"weV6wI2oYtFTmDbezTHq8MAYi-4aJnVykEP6-ixWceA=.pem","location":"security-state-staging/intermediates/170e0ef4-125c-4da5-85a5-f176eaed09fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"weV6wI2oYtFTmDbezTHq8MAYi+4aJnVykEP6+ixWceA=","crlite_enrolled":false,"id":"0163c88a-9ef4-4162-9ca4-17556a156a94","last_modified":1562023966614},{"schema":1562023961331,"derHash":"EUdT6I0ADnWZYVqZB+Jrc7bYUTF/8rJ6yp24/FBWkqc=","subject":"CN=E-Tugra Organization Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIG1MQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxKjAoBgNVBAMMIUUtVHVncmEgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQQ==","whitelist":false,"attachment":{"hash":"c20540a909d14bde73c51dde53da2ff3fea4d75a0c875924065198ab7de00da3","size":2304,"filename":"2C9V2-VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=.pem","location":"security-state-staging/intermediates/375b6c2a-70ea-49da-8638-9e7de1fc7e9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2C9V2+VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=","crlite_enrolled":true,"id":"14fdc6a9-ae04-401c-9371-d01b4bbb58b9","last_modified":1562023962077},{"schema":1562023959068,"derHash":"6DVm5vWZSBZ4wNmYkhach/d5FMYh/fHmWccIV3LUpIc=","subject":"CN=Aristotle University of Thessaloniki Central CA R5,O=Aristotle University of Thessaloniki,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxOzA5BgNVBAMMMkFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBDZW50cmFsIENBIFI1","whitelist":false,"attachment":{"hash":"f877b8c5582fb9b976cbb608c45d7c53f404146e9e3ee07dd3debe10f13b2c90","size":2186,"filename":"ZJk1YGaQpyFBeYVERrAwWxnil7BDdshNsfqH9K0pdvo=.pem","location":"security-state-staging/intermediates/161bd307-4be8-4e31-b933-2e65f5bcb068.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZJk1YGaQpyFBeYVERrAwWxnil7BDdshNsfqH9K0pdvo=","crlite_enrolled":true,"id":"7fd49ce7-75fa-47b3-85d9-7a6cb059c9f9","last_modified":1562023959799},{"schema":1562023958320,"derHash":"L9Qqlsgw/SxVKywnZg7ukwfYRwbem3XPOa51DrIhue4=","subject":"CN=COMODO ECC Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSMwIQYDVQQDExpDT01PRE8gRUNDIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"ad1f4bf9e94339cc0664891d79fb8cf7ded16cf12929ccc6122ce1a2c2ccddbc","size":1256,"filename":"jBwB7HG5X1XDblx25nsCjVULW3dw9vJXmqth06gcMAw=.pem","location":"security-state-staging/intermediates/2694c0d7-dac9-4e5f-a10a-2c02e92f7442.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jBwB7HG5X1XDblx25nsCjVULW3dw9vJXmqth06gcMAw=","crlite_enrolled":false,"id":"59606746-4b04-433d-be2b-fe782421a43c","last_modified":1562023959061},{"schema":1562023956056,"derHash":"j9p6iBNUb5p8sGXNMtNlDVtWorf5QrlJmutCqGo+nVY=","subject":"CN=Volusion\\, Inc. DV SSL CA,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"6b16f64a748628562ece61ff4693d637b4798e23d8849bb6e47281bd75358aa8","size":1447,"filename":"5zFyfNsHCq6F08mNF-IWy_ZJ7qypkZPj-t1dA4DZi4E=.pem","location":"security-state-staging/intermediates/c96d8299-16b6-4c87-9985-df5013adb3e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5zFyfNsHCq6F08mNF+IWy/ZJ7qypkZPj+t1dA4DZi4E=","crlite_enrolled":false,"id":"ae81bf57-add1-4988-8063-af83aaa1406d","last_modified":1562023956793},{"schema":1562023955312,"derHash":"6ppDUV4Tj/d4L8rNucfo4aYc/R0XCW7V3dH0ANArA/U=","subject":"CN=certSIGN SSL DV CA Class 3 G2,OU=certSIGN SSL DV CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHAxCzAJBgNVBAYTAlJPMREwDwYDVQQKDAhjZXJ0U0lHTjEmMCQGA1UECwwdY2VydFNJR04gU1NMIERWIENBIENsYXNzIDMgRzIxJjAkBgNVBAMMHWNlcnRTSUdOIFNTTCBEViBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"27c0349500f0a3bb1a05e55a47d5c9fb8216d028bb4be566fb5acd95419f5850","size":1626,"filename":"FZ9KA10aaA0Pq9Q4xOxYK99jgxb3tQy47R4dIFgxFUo=.pem","location":"security-state-staging/intermediates/24cf3b35-2f29-40e6-9bca-d871a307ae78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZ9KA10aaA0Pq9Q4xOxYK99jgxb3tQy47R4dIFgxFUo=","crlite_enrolled":true,"id":"d4028f7a-433e-4118-9af5-f556af86871c","last_modified":1562023956048},{"schema":1562023953811,"derHash":"ChpSIfON1Fg2eiDVJ9sYgAgqzO72moVG+2fTAlP5CCQ=","subject":"CN=Atos TrustedRoot CodeSigning-CA 2013,O=Atos,C=DE","subjectDN":"MEsxLTArBgNVBAMMJEF0b3MgVHJ1c3RlZFJvb3QgQ29kZVNpZ25pbmctQ0EgMjAxMzENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"1fe6385ba0486b50631ee6ded9d813fe00c7b69915bb5ff98811bac7db2a494a","size":1565,"filename":"pxAruQtiJ4aLD27HqNd4qfvv07MUns2jaoeSYYi6OrQ=.pem","location":"security-state-staging/intermediates/54d610af-b3dc-447e-b948-7032624747a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pxAruQtiJ4aLD27HqNd4qfvv07MUns2jaoeSYYi6OrQ=","crlite_enrolled":true,"id":"d043bdbb-43b3-4701-b169-93da04b081aa","last_modified":1562023954561},{"schema":1562023952325,"derHash":"g8k180xQt2ZUCUBK/l36B63LXHtSsr7wrG6ZPABUXXY=","subject":"CN=Symantec Class 3 Registration Authority Intermediate CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgUmVnaXN0cmF0aW9uIEF1dGhvcml0eSBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"0a89ba17c46d9d5fd2bd15423a6b0a3bb0763fbd740bf73f58873f2a18d9d1cf","size":2194,"filename":"vO3_XaIzmqGtcOO2LQL_yHzKa4ueBDChpnLbfwpiu8c=.pem","location":"security-state-staging/intermediates/359077c3-cc8f-44fc-bdbe-4b64c1d935e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vO3/XaIzmqGtcOO2LQL/yHzKa4ueBDChpnLbfwpiu8c=","crlite_enrolled":false,"id":"02300412-fd6e-43bc-9cbd-ebe9ef836aa7","last_modified":1562023953055},{"schema":1562023951552,"derHash":"SMShxTleK0mdLj6+Ju76kdEc813V+hSTfu5egHov9Ic=","subject":"CN=TrustAsia RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTVHJ1c3RBc2lhIFJTQSBDQSBHOA==","whitelist":false,"attachment":{"hash":"ece1d5f1cba9be7739a5e4813740471d2c9732eb9a89dfa2e75b6222568df132","size":1695,"filename":"9SkVUsat-0_UDRvolgMzKIdw6JFpvrT-hOa-1EbArt8=.pem","location":"security-state-staging/intermediates/0a0070ca-9c1d-47fe-b759-75e6dfa7238e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9SkVUsat+0/UDRvolgMzKIdw6JFpvrT+hOa+1EbArt8=","crlite_enrolled":false,"id":"afe0b493-5e68-46df-9fdb-0eb4f37545a6","last_modified":1562023952317},{"schema":1562023950036,"derHash":"clY8yYraLF0hJlQqzJCBVK6x+db36DpVwJdEx9et3bo=","subject":"CN=RVBD Certificate Issuer,O=Riverbed Technology\\, Inc.,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlSaXZlcmJlZCBUZWNobm9sb2d5LCBJbmMuMSAwHgYDVQQDExdSVkJEIENlcnRpZmljYXRlIElzc3Vlcg==","whitelist":false,"attachment":{"hash":"071b981d1ae8525753515a159884613e388dc310fd76b561f152df246b6c732d","size":1829,"filename":"L2Gt7r61eOKqKfbZ0LwGLCzvrPMMGMdsveQQC5X4gOQ=.pem","location":"security-state-staging/intermediates/3ab21025-6c92-4a25-9b0e-4d9d46ea3cda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L2Gt7r61eOKqKfbZ0LwGLCzvrPMMGMdsveQQC5X4gOQ=","crlite_enrolled":false,"id":"666ea0f5-3d53-451c-908f-bbd0a6c22b1c","last_modified":1562023950800},{"schema":1562023949273,"derHash":"v0ZV8WqjONfH/yvclJpSS9R5e4s8g0HGCMn2XLHLgXc=","subject":"CN=Axesson Direct CA,OU=www.axesson.com,O=Axesson Inc.,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxBeGVzc29uIEluYy4xGDAWBgNVBAsTD3d3dy5heGVzc29uLmNvbTEaMBgGA1UEAxMRQXhlc3NvbiBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"e00a1132c4bf94763c577e4704af4bd328ddb8ee906a302c2ff86110798085ff","size":2146,"filename":"x2wj42-CVwbXi4SeWBzRyyv7rEjRu1AKF3yyj6_VNrM=.pem","location":"security-state-staging/intermediates/4eb92e47-69fe-4c31-b0c5-8f8304767c3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x2wj42+CVwbXi4SeWBzRyyv7rEjRu1AKF3yyj6/VNrM=","crlite_enrolled":false,"id":"01d796b9-a372-4e2b-b2c0-678b11ec5dc0","last_modified":1562023950010},{"schema":1562023947759,"derHash":"wj0BuOlYVhPiYOyOpIW/+PWYcpjV/ALAcGTFRGIj+cc=","subject":"CN=Fuji Xerox Xnet CA - C,O=Fuji Xerox,C=JP","subjectDN":"MEMxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR8wHQYDVQQDExZGdWppIFhlcm94IFhuZXQgQ0EgLSBD","whitelist":false,"attachment":{"hash":"3288f4c254a9b840d254a43033b88864319168b9ff573c3fa182d9cf4867edf6","size":1597,"filename":"Rctcx_fiaRRDpUcitk3vPz1ZUD7o5sV-LHA0YdyXVl4=.pem","location":"security-state-staging/intermediates/e5f2e418-ce6e-4298-b8e8-6373e43518f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rctcx/fiaRRDpUcitk3vPz1ZUD7o5sV+LHA0YdyXVl4=","crlite_enrolled":false,"id":"08956575-33ad-4922-a433-8c4193d67244","last_modified":1562023948487},{"schema":1562023947011,"derHash":"ATkyRl7k/CRI0Mmu7qBJ3pBjr153PopQGrYm8JV+E0U=","subject":"CN=HARICA Code Signing ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGPMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEpMCcGA1UEAwwgSEFSSUNBIENvZGUgU2lnbmluZyBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"b6cc45afa6490d756cabf21fa29ea89943fa6d3af2dce38e2cc35b97dde4cc34","size":1370,"filename":"outUmoUrqbkdis1hc4ahnCRx1jVCZxK-HiBp0_inK-8=.pem","location":"security-state-staging/intermediates/bfbea10f-5ad5-49e0-94d8-61a172b54ab2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"outUmoUrqbkdis1hc4ahnCRx1jVCZxK+HiBp0/inK+8=","crlite_enrolled":false,"id":"46837ec3-9bf7-4f67-9c60-6fef82636bf0","last_modified":1562023947751},{"schema":1562023946273,"derHash":"0tfUvuj/G33rpCd0AIHAf3sYai8poSNg1T+MINRVU40=","subject":"CN=TrustAsia RSA OV SSL Server CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBPViBTU0wgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cef0257132e6443d4fa6a6f012339e0c0a90ba4eb8ce5d8083038ca1f5461393","size":2133,"filename":"ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=.pem","location":"security-state-staging/intermediates/f5b72560-0bb5-40bd-b68b-381a9e82b9e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=","crlite_enrolled":false,"id":"e944087f-76e7-41f9-a1bb-8ef5a2cd787a","last_modified":1562023947003},{"schema":1562023944727,"derHash":"ODDbjqFSC2zfV+HgCl8Sl74R2eZDDINgcXYhL/hdLbg=","subject":"CN=TrustCor Enhanced Secure Site (CA2),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGNMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLDAqBgNVBAMMI1RydXN0Q29yIEVuaGFuY2VkIFNlY3VyZSBTaXRlIChDQTIp","whitelist":false,"attachment":{"hash":"26631969fe5fbc543132a914eb2829ace13e9b418495495a837a47d8936c69b6","size":2564,"filename":"gTvKBlqs6VknFEiItiUhp5K_Oy0UnzZd7vVB6Ko3ZeE=.pem","location":"security-state-staging/intermediates/e49aa502-2469-4f4f-b00b-3d32c9f282e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gTvKBlqs6VknFEiItiUhp5K/Oy0UnzZd7vVB6Ko3ZeE=","crlite_enrolled":true,"id":"7f04f0ef-3fdc-4bfa-9cc5-c76e75f35add","last_modified":1562023945471},{"schema":1562023943248,"derHash":"Cd5/pznuR8BikYRfLg6Knhx8wpAK01TPFnMW4COGvZs=","subject":"CN=Cerner Corporation Direct Intermediate CA,OU=Cerner Direct,O=Cerner Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJDZXJuZXIgQ29ycG9yYXRpb24xFjAUBgNVBAsTDUNlcm5lciBEaXJlY3QxMjAwBgNVBAMTKUNlcm5lciBDb3Jwb3JhdGlvbiBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"329d75edeca644875431ecdfbb5af45d15a5d4adf45ec91ae5b365a31878c6fc","size":2215,"filename":"tmPespZP4I0UhQJaBGkHjoK6goz4XFag5dWMseOeDQk=.pem","location":"security-state-staging/intermediates/6fceb1fd-4fdf-4c6b-a721-8f40ce85ab00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tmPespZP4I0UhQJaBGkHjoK6goz4XFag5dWMseOeDQk=","crlite_enrolled":false,"id":"8e67b7d0-aea3-4831-96a3-f712c2d261f8","last_modified":1562023943981},{"schema":1562023941722,"derHash":"edd4kk/Qj3FTEuV+EHVmqBYeoeaGSb1F6okYSqYuox4=","subject":"CN=CertAssure RSA Client Personal ID CA,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEBxMIU2FuIEpvc2UxGDAWBgNVBAoTD0NlcnRBc3N1cmUgSW5jLjEtMCsGA1UEAxMkQ2VydEFzc3VyZSBSU0EgQ2xpZW50IFBlcnNvbmFsIElEIENB","whitelist":false,"attachment":{"hash":"87b59b94993c9ea590060a739644ad092c822a230b0bb1cfbd3eae497e596c3e","size":2125,"filename":"_vhenjJborDchqObw9eZLKuYlEq8pfTiwJCmJYlaDZI=.pem","location":"security-state-staging/intermediates/3e846fdd-caff-49a4-bd01-ee3bbf26d40a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/vhenjJborDchqObw9eZLKuYlEq8pfTiwJCmJYlaDZI=","crlite_enrolled":false,"id":"88958b83-c5cb-4066-84f3-102a6c5c4376","last_modified":1562023942475},{"schema":1562023940958,"derHash":"0o20NeMSEqO9zPh2IPZUS5mpwCMov5g+iC/QYnodEw8=","subject":"CN=UZI-register Medewerker op naam CA G3,O=CIBG,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEuMCwGA1UEAwwlVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgb3AgbmFhbSBDQSBHMw==","whitelist":false,"attachment":{"hash":"a73ac4ff82e89f690fe1a921d0ad61b7d5629b27b30eea5b1c3ca475ef79e8ad","size":2560,"filename":"dCyrxAKUK8j5RoQJISk_QPQ9eWh1wvDZFjkJxvysY1M=.pem","location":"security-state-staging/intermediates/5c181d64-4ff2-4921-9364-d3cd368e9d22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dCyrxAKUK8j5RoQJISk/QPQ9eWh1wvDZFjkJxvysY1M=","crlite_enrolled":false,"id":"8c74a361-cbc0-45c9-a37d-003f782ada17","last_modified":1562023941715},{"schema":1562023940219,"derHash":"jIi6UQUptkJjzLIac9grpXJaVcFEbyVHvOMB/NxDFNs=","subject":"CN=STRATO SSL - G5,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzU=","whitelist":false,"attachment":{"hash":"c65817fb1a8da16ce1ca58346c65942c26cda3152c3eb9738efe79a6bda4f603","size":1756,"filename":"rO8kkFRlJlAkz68GeZxazuE37UKFGkLltXPH90hYNf4=.pem","location":"security-state-staging/intermediates/b2d5fa66-b400-4078-8efd-b61b8db30d33.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rO8kkFRlJlAkz68GeZxazuE37UKFGkLltXPH90hYNf4=","crlite_enrolled":false,"id":"5c8bab04-380f-453a-9c0a-b774af2e2428","last_modified":1562023940950},{"schema":1562023939469,"derHash":"0DSxh1G+4Qqq+UwvFDUNP2VOW5NNDdpZKzHlgYekiVI=","subject":"CN=emSign Device CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIERldmljZSBDQSAtIEMx","whitelist":false,"attachment":{"hash":"b85abdf53b134a2c1985785da850d5d78657dd1abcc923a85eeaf3cf7d536125","size":1540,"filename":"W7hjn_Iwl5OzSJsB1o-RIXEUKhNjgqs-85cgtFliENM=.pem","location":"security-state-staging/intermediates/7214b980-7213-4794-a274-6fe5036d46c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W7hjn/Iwl5OzSJsB1o+RIXEUKhNjgqs+85cgtFliENM=","crlite_enrolled":false,"id":"b06160c1-50d8-44e1-9e0d-33cf64458a5c","last_modified":1562023940210},{"schema":1562023937221,"derHash":"kFjVBl+PPppjqv5c6Jp2RHCw3vnc87nsfQWH+riP66A=","subject":"CN=QuoVadis QVRCA1G1 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTFHMSBTU0wgSUNB","whitelist":false,"attachment":{"hash":"472285bb2b9a0e36f7a8b4405e5b35d448a9333872ca825e8bdcd79a53f8a41b","size":2101,"filename":"oB-l9fuJRX8mzgRrGC4yGRLXF1IEiTrPchG7uV0y8-M=.pem","location":"security-state-staging/intermediates/be28a1da-7adf-4d5a-8b3e-a96a20b3fd9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oB+l9fuJRX8mzgRrGC4yGRLXF1IEiTrPchG7uV0y8+M=","crlite_enrolled":true,"id":"dadb9e8a-9a0b-4816-b5fc-66b000ef66cf","last_modified":1562023937947},{"schema":1562023936475,"derHash":"zJ+q2DwzUJQ9TkX6QWxPi8Vk96qUz0stK850IJ0EZMk=","subject":"CN=Mirth Direct Intermediate CA,OU=NextGen Share,O=Mirth,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQKEwVNaXJ0aDEWMBQGA1UECxMNTmV4dEdlbiBTaGFyZTElMCMGA1UEAxMcTWlydGggRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"539031ec4b7416b127f8b73f71eba2b81bda87c227f140052c0721557ef4488c","size":2162,"filename":"P70tJuapBoh4Tl7BeWUQnpl9vnyfhOQmuZVfj1BLPIg=.pem","location":"security-state-staging/intermediates/76c6f679-67dc-4207-b000-4770f729fc56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P70tJuapBoh4Tl7BeWUQnpl9vnyfhOQmuZVfj1BLPIg=","crlite_enrolled":false,"id":"f4127efd-aef8-424a-a432-057bf7e21c0f","last_modified":1562023937213},{"schema":1562023935734,"derHash":"vtDxntRtlJANKp/NfG9mC2H/dYjYtxz48nnV+qMCHM8=","subject":"CN=LuxTrust Global Qualified CA 3,O=LuxTrust S.A.,C=LU","subjectDN":"ME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMScwJQYDVQQDDB5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDM=","whitelist":false,"attachment":{"hash":"93020ca6fa27c7dae09b0247af1d912eac8f119d08b590855a6f996090d750ba","size":2296,"filename":"x3DBF1xU5o--Dvt6U6adkDhvC8kWrK1IWtJJZ5jBw18=.pem","location":"security-state-staging/intermediates/09d46878-7261-4162-8336-5e064910a9d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x3DBF1xU5o++Dvt6U6adkDhvC8kWrK1IWtJJZ5jBw18=","crlite_enrolled":true,"id":"738ef4a9-0311-42bb-beae-391d42ce751f","last_modified":1562023936464},{"schema":1562023934966,"derHash":"MBEZvOt6cufie4rYeV/JsursZXV/b/9PWroWGhomjoo=","subject":"CN=MilleniumSign Client Certificate CA ECC R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBFQ0MgUjM=","whitelist":false,"attachment":{"hash":"2b567d87b851810362c037e0cadc2da1bfc7a9dd2b898019e90062e63bcdd632","size":1447,"filename":"83d1IVr2xTvH_PaNkbnTL4kci6miUaFtd7QLI-w-A1w=.pem","location":"security-state-staging/intermediates/c9394921-1e7c-4fa2-9f34-0493b374d212.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"83d1IVr2xTvH/PaNkbnTL4kci6miUaFtd7QLI+w+A1w=","crlite_enrolled":false,"id":"f4d37b0b-9a53-48a5-9e2a-1d0c4bd49c5e","last_modified":1562023935726},{"schema":1562023933480,"derHash":"uQ4Xq0uHeLEPnyjLqnZk3i7j1m4a/FdNFo7dJKEDOf8=","subject":"CN=TrustAsia DV SSL CA - G6,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGXMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBHNg==","whitelist":false,"attachment":{"hash":"b6f89d614177e86c720fc91f770d85edcaff24350a854408afba9ab2b9d78c2f","size":1922,"filename":"MUj3ElSyDVu0X3TYBNY9f0axqYEtb7fmFTLy2Z8_l-Y=.pem","location":"security-state-staging/intermediates/bfe8252d-cbe0-4d5f-a88b-2792eb490b4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MUj3ElSyDVu0X3TYBNY9f0axqYEtb7fmFTLy2Z8/l+Y=","crlite_enrolled":false,"id":"57d894ba-559b-4b7e-95cd-c42a4377eb6b","last_modified":1562023934224},{"schema":1562023931233,"derHash":"jD+rWYVBF760BGZwH4nMgiQZakUOsXwvT9iNNJfqJoc=","subject":"CN=Domain The Net Technologies Ltd CA for Code Signing R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MHgxCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMT8wPQYDVQQDDDZEb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBDb2RlIFNpZ25pbmcgUjI=","whitelist":false,"attachment":{"hash":"6cd1244808cf3297acbc1db3a6698bcaeff589f795304830aad10b260c06c428","size":2515,"filename":"tQ28VcCBKgtvuytE6MNlMdLWjjmOUZ1OHheIJqaPxx0=.pem","location":"security-state-staging/intermediates/9444ad32-c97b-4b63-a2ca-32dc448a17e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tQ28VcCBKgtvuytE6MNlMdLWjjmOUZ1OHheIJqaPxx0=","crlite_enrolled":false,"id":"471e9599-0ffc-49b2-b37a-c79bfd133af1","last_modified":1562023931974},{"schema":1562023927515,"derHash":"/BbVMgO9kYfWnMmdLaVRB2tNyymBQNZ1H3oBKWbJn90=","subject":"CN=RapidSSL TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBFQ0MgQ0EgRzE=","whitelist":false,"attachment":{"hash":"5ab29482e9032bced4020a6ffd28ba40b857897ed628b88bc1554bc73e84f763","size":1199,"filename":"cBtUiO-mwdgMfNeEp_qKuEHswRn2nHp2FDUKVi_aTDw=.pem","location":"security-state-staging/intermediates/a7d241d1-10f7-486a-be9d-7d013030af11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cBtUiO+mwdgMfNeEp/qKuEHswRn2nHp2FDUKVi/aTDw=","crlite_enrolled":false,"id":"f21e7595-bb74-4d43-8765-075259ddef98","last_modified":1562023928253},{"schema":1562023926016,"derHash":"MZiW45VNUQ2jpLdTh+jIcLO8LDIo2FUJFuvpq9y3+SE=","subject":"CN=Oracle TLS RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRPcmFjbGUgVExTIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"450ac021db301c37c528daccbe40e94f74a28f7ae6f6ba039650b6aae3c3d13e","size":1678,"filename":"92UUNzSFrSZZ2mG20rm7eFX2MV_e3zCq8ck0jTA9zMw=.pem","location":"security-state-staging/intermediates/ab1e19a8-c972-4ca6-84ee-d4ca47a1a385.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"92UUNzSFrSZZ2mG20rm7eFX2MV/e3zCq8ck0jTA9zMw=","crlite_enrolled":false,"id":"c2b42df2-4fa8-48f7-8666-741d1b771779","last_modified":1562023926759},{"schema":1562023922211,"derHash":"hv/qQPNvppEyeHEP6rqbIG8yiNo/0cZSvFtYlaKxqHc=","subject":"CN=Oregon Health Authority Direct CA,O=Oregon Health Authority,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdPcmVnb24gSGVhbHRoIEF1dGhvcml0eTEqMCgGA1UEAxMhT3JlZ29uIEhlYWx0aCBBdXRob3JpdHkgRGlyZWN0IENB","whitelist":false,"attachment":{"hash":"c479fa9505d835f1638c400911242170ff9011865fabe90fab5ee2126ba98139","size":2170,"filename":"DNdYJRYEP9-HYWq0AW8zHl7xzEsYssaB1vCUHUipRQM=.pem","location":"security-state-staging/intermediates/5f655899-434c-4631-b137-de14b7b959a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DNdYJRYEP9+HYWq0AW8zHl7xzEsYssaB1vCUHUipRQM=","crlite_enrolled":false,"id":"35ca3b80-9261-4b67-9e34-b6b8216de1bc","last_modified":1562023922942},{"schema":1562023921473,"derHash":"OSWDVDuTsQ4FBt511pOZ/LvBRpyN45YGbHVgiLkiQdo=","subject":"CN=Apple Public Server RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"35b8ea0b8b208776616acd154fabbd1d3abade4a57f7a5e656ec072d1b474f8a","size":1654,"filename":"9Vw5Oz-M36bapAlDoz-njgwaF-AaQLrKSmhcZZnxAcY=.pem","location":"security-state-staging/intermediates/76b79706-32a3-45c2-94cf-fd61a2eb2c5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Vw5Oz+M36bapAlDoz+njgwaF+AaQLrKSmhcZZnxAcY=","crlite_enrolled":false,"id":"14809122-3e00-45ce-b8d8-b63bb3ff0adf","last_modified":1562023922204},{"schema":1562023920721,"derHash":"9t/e1h/4jvELnm3PvODxYV4Fhmzrr81tSK7oATLHA0c=","subject":"CN=WoSign EV Code Signing Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MFExCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEmMCQGA1UEAxMdV29TaWduIEVWIENvZGUgU2lnbmluZyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"8536611d113671c5cb3dc75d5e0bf12a809bddbed4952eaf259b6465f9545d7d","size":1731,"filename":"5zUpCObCLFLZgrnR6TGCOtmLjBBbI4mpEj9CP409UWY=.pem","location":"security-state-staging/intermediates/f5f030c6-0035-459e-81c9-43944f596b65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5zUpCObCLFLZgrnR6TGCOtmLjBBbI4mpEj9CP409UWY=","crlite_enrolled":false,"id":"e1447988-52dc-409e-b96d-b1fdba0c492c","last_modified":1562023921465},{"schema":1562023919958,"derHash":"XXTtYdCzEemBu88PQZo1+p+h7HD/Gut0LXO8/roGz/8=","subject":"CN=GeoTrust True Credentials CA 3,O=GeoTrust\\, Inc.,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEnMCUGA1UEAxMeR2VvVHJ1c3QgVHJ1ZSBDcmVkZW50aWFscyBDQSAz","whitelist":false,"attachment":{"hash":"b66df6fdfbd926e26674fc928d090142497594ed9f7d8d0cdbc90dff7e9ee618","size":1414,"filename":"o2dN2rQs101OU1N1FNLbW2U6i4ApoFhY-pI9wu1fcyw=.pem","location":"security-state-staging/intermediates/17b26a4b-cf0e-4d42-b68e-e4e72b00cb85.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o2dN2rQs101OU1N1FNLbW2U6i4ApoFhY+pI9wu1fcyw=","crlite_enrolled":false,"id":"3bc639af-b93f-4769-a1de-d9721dba182a","last_modified":1562023920713},{"schema":1562023919206,"derHash":"zJ9yVE/2F8FM6+goMZSnDx6Jgc8WPVo/2NzP2EbV3Bo=","subject":"CN=NetLock OnlineSSL (Class Online) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGwMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE+MDwGA1UEAww1TmV0TG9jayBPbmxpbmVTU0wgKENsYXNzIE9ubGluZSkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"72ae8f0a0087c7b13f79d2f02193b9bca142172f3053cad4b927af716cd0534a","size":2190,"filename":"He6eOdoX1CHCLhtg75AtdDdI18-x-VfWOYW5_LCt5kk=.pem","location":"security-state-staging/intermediates/6bab6451-8f63-49f3-a556-455c6b868bd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"He6eOdoX1CHCLhtg75AtdDdI18+x+VfWOYW5/LCt5kk=","crlite_enrolled":true,"id":"ca8f61c9-fe67-45a0-8bc2-f0a8348e2cdb","last_modified":1562023919950},{"schema":1562023917707,"derHash":"2GoYtfdpUrc26Jots/D9+QcHEUYBFLagjWScpieTXJY=","subject":"CN=COMODO SHA-256 Client Authentication and Secure Email CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGdMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDFDMEEGA1UEAxM6Q09NT0RPIFNIQS0yNTYgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EgMg==","whitelist":false,"attachment":{"hash":"047895ba02981d540016dd3f1b11f8959d568808c8392376e4f72812219bfd23","size":1719,"filename":"MV-oXptPSGVj-n7_WowdFiUjBX7WRZeHO7XdRoAt_Ro=.pem","location":"security-state-staging/intermediates/4b905e58-de32-42f6-9817-56b9d2cf0c30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MV+oXptPSGVj+n7/WowdFiUjBX7WRZeHO7XdRoAt/Ro=","crlite_enrolled":false,"id":"ef2f4901-d741-470a-9b1b-3be0635e43d9","last_modified":1562023918464},{"schema":1562023916205,"derHash":"XJfg/R69bhNqcWJvhgq11lt5fn7TwcG/TmU4IjdaRkQ=","subject":"CN=HARICA S/MIME RSA SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"d4e941ad40230b5c13c3996c883aa85ff7b6445f041b6bbd0143d744129cbd81","size":2564,"filename":"o79a142SfRPFvEK57ct8ocJ_tHYpTuDy-1a3i-te0aQ=.pem","location":"security-state-staging/intermediates/9c236c6d-f2eb-44ea-9409-6eae4d0e468d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o79a142SfRPFvEK57ct8ocJ/tHYpTuDy+1a3i+te0aQ=","crlite_enrolled":false,"id":"ed331ef0-35ea-4e53-9633-07cd14412686","last_modified":1562023916945},{"schema":1562023914706,"derHash":"nvyRAnEJS4hr2aj8njlNvyrlFHeMs3NUQIWvgVyr/i0=","subject":"CN=Go Daddy Secure Extended Validation Code Signing CA - G2,O=GoDaddy Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGOMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEVMBMGA1UEChMMR29EYWRkeSBJbmMuMUEwPwYDVQQDEzhHbyBEYWRkeSBTZWN1cmUgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"3517f89c468b80d775015979f32eb5377e091426aa65e2fe810ff308ae2351a7","size":1752,"filename":"UNzTXQQxA4weEEFceBlgOF0AeE9rV8ZoIXwFOgNm31I=.pem","location":"security-state-staging/intermediates/0f02d488-dc83-4cb0-9899-40a3ec673425.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNzTXQQxA4weEEFceBlgOF0AeE9rV8ZoIXwFOgNm31I=","crlite_enrolled":false,"id":"1515b6bc-9090-44ac-bbf4-00e69844929a","last_modified":1562023915452},{"schema":1562023913211,"derHash":"9bzzqnotFhoYISBPUlM3xs+UnnNa09M25HZLJadsKlo=","subject":"CN=TrustSign RSA DV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"e7641150501f3bf2c280ba7a371a352089b2a8c465adf46df5630b5d4e2d3556","size":2113,"filename":"jEvvAqAI3_5hDMtldisHHkOwAFpxjTzbkoL_r-GTKJU=.pem","location":"security-state-staging/intermediates/00ed82e9-9d56-4db6-bd16-63bf411f4e53.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jEvvAqAI3/5hDMtldisHHkOwAFpxjTzbkoL/r+GTKJU=","crlite_enrolled":false,"id":"f14daf92-a223-40b9-8d99-37d837b4cc5c","last_modified":1562023913938},{"schema":1562023912477,"derHash":"ewvDVj1DMJEY9WCmyZoiHDU5mxApP3O+QaEqygM4B18=","subject":"CN=WoSign Code Signing CA,O=WoSign CA Limited,C=CN","subjectDN":"MEoxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEfMB0GA1UEAwwWV29TaWduIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"308987b783a08ed974b3fb4505d7eaaa4169b07441c7afec1b5e1c24e45bc2ef","size":1687,"filename":"FZS0F__J7FHzpNqv22fhTZZ1ns8livqEaiB9NftdioU=.pem","location":"security-state-staging/intermediates/67e1b6cb-99f1-41b3-853e-8dbea4618741.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZS0F//J7FHzpNqv22fhTZZ1ns8livqEaiB9NftdioU=","crlite_enrolled":false,"id":"84a9e3a2-9105-45c4-b36d-4db6f5938b74","last_modified":1562023913204},{"schema":1562023910995,"derHash":"Qz0QPeCZzD80FNAE+HD02lyef0Gki6isuvP5Hu/LDWA=","subject":"CN=USERTrust RSA Client Authentication and Secure Email CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGaMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazFAMD4GA1UEAxM3VVNFUlRydXN0IFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"8f747b0e65ff509fb91eb3e429e3530a8e8fb3bd2c74bbbcb8af53fada5d42d3","size":2170,"filename":"GxuU4F5l6xPkmDYqjOmR8nS3Nr2bV2oJ0CV0Jx-NWD4=.pem","location":"security-state-staging/intermediates/55af3597-6627-40c7-8e2b-4e91e9bff09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GxuU4F5l6xPkmDYqjOmR8nS3Nr2bV2oJ0CV0Jx+NWD4=","crlite_enrolled":false,"id":"6c1153d9-3eb0-4419-a890-9743512226f3","last_modified":1562023911730},{"schema":1562023906470,"derHash":"l/QDkKXK4ljW+y/40COxmHdf9Haku+wdG6rBM05XtuE=","subject":"SERIALNUMBER=201804,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA0","whitelist":false,"attachment":{"hash":"abd99c8a6f8baad7db821237b5df895c2d6df0ba6af78ec83ff206eee062e281","size":2333,"filename":"jfS6UYK1YqR7g1U9V5MqubOAgnB-fPO0u-eN8q0c0yE=.pem","location":"security-state-staging/intermediates/109e6702-5f02-415c-bf5a-dc562a660188.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jfS6UYK1YqR7g1U9V5MqubOAgnB+fPO0u+eN8q0c0yE=","crlite_enrolled":false,"id":"ae00e3ac-d2d1-428e-852a-47f7e58676c3","last_modified":1562023907207},{"schema":1562023905731,"derHash":"J+CT6INgfk4OC7Hrq64snA5Vqc8CA3O/ojT+Bf4Lp0M=","subject":"CN=JPRS Domain Validation Authority - G1,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"1da93e47ca6470e85dad24c31ce916537588a3cf88f1d43d1fc9c4e57de8b5ff","size":1646,"filename":"WE8wuQpM8OwqLW_H3ejlZ_VMPcJMYTOA_ggrGWbSpNc=.pem","location":"security-state-staging/intermediates/6d6e0e82-8f55-40fc-8d62-72fab0b6a905.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WE8wuQpM8OwqLW/H3ejlZ/VMPcJMYTOA/ggrGWbSpNc=","crlite_enrolled":true,"id":"90de290c-9563-4a88-8fa6-d2179534ff34","last_modified":1562023906463},{"schema":1562023901967,"derHash":"zf8nr6Pa+fcGqnrFMCmDN+UgyLEKIvZRTgDiH9KHO3k=","subject":"CN=Ecclesiastical Academy of Vella SSL RSA SubCA R2,O=University Ecclesiastical Academy of Vella of Ioannina,L=Ioannina,C=GR","subjectDN":"MIGcMQswCQYDVQQGEwJHUjERMA8GA1UEBwwISW9hbm5pbmExPzA9BgNVBAoMNlVuaXZlcnNpdHkgRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBvZiBJb2FubmluYTE5MDcGA1UEAwwwRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBTU0wgUlNBIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"156b5156f2e0bc0a6ad31fb9b70bcedf0e5c8d29fe23f55ec3d22943f3bf990d","size":2995,"filename":"W-LP2L6GtiR5yYoztYP5ABaxz_faz3yBSub4W5M0wa4=.pem","location":"security-state-staging/intermediates/4236385b-60c6-4921-9be8-258e10ac5db3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W+LP2L6GtiR5yYoztYP5ABaxz/faz3yBSub4W5M0wa4=","crlite_enrolled":false,"id":"13c7f02d-d089-4c63-8bad-0087f66298cf","last_modified":1562023902725},{"schema":1562023901225,"derHash":"ZObglZJvUkdRFsFk1qhemyEyKitIZ99+cqHGMvjHQUM=","subject":"CN=GeoTrust Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkdlb1RydXN0IENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"b1a1311c8d0ca5a0ab5a0d77e54b396512314e1b99f25b6b72a10008ee7cd248","size":1122,"filename":"PidygEfLQ98SYkWF8QWGCdIeWhyfGPy00o2Y6-8L4Ug=.pem","location":"security-state-staging/intermediates/4bb37b11-2e9e-4e32-9e80-ce030b4910fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PidygEfLQ98SYkWF8QWGCdIeWhyfGPy00o2Y6+8L4Ug=","crlite_enrolled":false,"id":"32550637-f3c2-475b-a788-7ef9bd526589","last_modified":1562023901959},{"schema":1562023900475,"derHash":"XMofL/OaSokko2BgNtiq3i4jwCTvyv89wsZnWf73dvs=","subject":"CN=Symantec Class 3 Organizational CA - G5,OU=Symantec Trust Network+OU=Insattningsgaranti Service SHA256 CA,O=Symantec Corporation,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLTArBgNVBAsTJEluc2F0dG5pbmdzZ2FyYW50aSBTZXJ2aWNlIFNIQTI1NiBDQTEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ee77c69da5c00a9b0ba61a8658517885313b3b057bb2e374617159832a3c99dc","size":1959,"filename":"cBpmTzPT3skhhtGMrQJfEnBDG3RXp4d1W_TeftxNX5o=.pem","location":"security-state-staging/intermediates/aa26f891-6509-4035-811b-356b1da5cab9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cBpmTzPT3skhhtGMrQJfEnBDG3RXp4d1W/TeftxNX5o=","crlite_enrolled":false,"id":"b801a445-982a-48d0-9791-5fec6b93b05b","last_modified":1562023901218},{"schema":1562023899695,"derHash":"O/fPS2GSO651p8JX9VBwAD7Pcn4c2mufy4VR/GSdb+s=","subject":"CN=GlobeSSL DV Certification Authority 2,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEcMBoGA1UEChMTR2xvYmUgSG9zdGluZywgSW5jLjEuMCwGA1UEAxMlR2xvYmVTU0wgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"c70f8758f89a5a215393c93d186b22f43da0b0f148d6226d96c339271c9d9ad6","size":2150,"filename":"lQ_FKBR5nsUo6XzQqIOg6_wickZMgocia2x_uINY_uw=.pem","location":"security-state-staging/intermediates/70120228-d3eb-46ce-8660-044d1c900414.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lQ/FKBR5nsUo6XzQqIOg6/wickZMgocia2x/uINY/uw=","crlite_enrolled":true,"id":"78baa603-1046-4055-bcea-dbb019a819d2","last_modified":1562023900467},{"schema":1562023898952,"derHash":"N/a9m+4MdPYI3UdLVqcvgYMHffwmYq95v+PU+rzwscQ=","subject":"CN=thawte EV SSL CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHjAcBgNVBAMTFXRoYXd0ZSBFViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"cdc8303c392107878e951abcd532ced1f3ec3f8ad0b3e91a30dacf150ddcf945","size":1683,"filename":"UsnhaVdJ4pzPc4oJoB-DvYML3sL25lZj8K42HWaTu_M=.pem","location":"security-state-staging/intermediates/c940d8a5-f84d-43f4-ba77-b676afec2504.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UsnhaVdJ4pzPc4oJoB+DvYML3sL25lZj8K42HWaTu/M=","crlite_enrolled":false,"id":"cc6703a8-cebe-49cc-bd39-4e1a7a3f620e","last_modified":1562023899687},{"schema":1562023898215,"derHash":"9r+Isqjc1P60AVmE7C8UJ8gBfRQM9B8i7mieDWcYAS8=","subject":"CN=WoTrus OV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"ce4ba30cb7d9fab70ae32267594148013d61f09cd075d7e3e07f4792e46d517c","size":1691,"filename":"xxDKJ6WsrIZ1X_E1XI1IQgUNGc1SquSk5UkyOBHKq4I=.pem","location":"security-state-staging/intermediates/b8d761f5-e513-43c4-ba77-4138f539938e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xxDKJ6WsrIZ1X/E1XI1IQgUNGc1SquSk5UkyOBHKq4I=","crlite_enrolled":true,"id":"773ec055-4ebc-48c9-84a6-04ffd1e4b40d","last_modified":1562023898944},{"schema":1562023897472,"derHash":"WfjLfX6eE8t3j/YhmOvgVVG1FaWLu6LvGcM8dgyCORY=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"872450a43824a979c2e9576d217c927280ea4a1bfb4504ea3330e00aa649136e","size":1865,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/efda7551-5b7a-460b-a28b-26cdc37bca68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"696e4f33-7c3d-43d1-afc8-c045f8b1043c","last_modified":1562023898207},{"schema":1562023896701,"derHash":"9/veuCvpnUHNykGfyRhZ0+UobAdiBODpA9Z4uyE+2Js=","subject":"CN=Hostpoint TLS RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRIb3N0cG9pbnQgVExTIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"e06a612c20a2679cb1522f8e77265194fd2509fa105e19f74503f5f6e26acc68","size":1662,"filename":"Q5l5uNBWZnOf3EnCFMK3ciNhPZboa_YPtUtL6yZ_DvU=.pem","location":"security-state-staging/intermediates/c78cb670-c087-4971-a213-9724dc2bf071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q5l5uNBWZnOf3EnCFMK3ciNhPZboa/YPtUtL6yZ/DvU=","crlite_enrolled":false,"id":"71101667-ae1e-451f-a1e6-bbf37b5d1c15","last_modified":1562023897463},{"schema":1562023895955,"derHash":"MM5AljESCgxaxUir+yMXiahHQRw4GKVumwb+sXI855c=","subject":"OU=\u653f\u5e9c\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOaUv+W6nOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"136cce10aa7fe302678af5476af5c33cd4f4b62cc81c3a7400d01d1ad4402def","size":1845,"filename":"9SrSmq9hgCZP8N1M7kFgIC_97LEKOAceLOYuCEt3NPA=.pem","location":"security-state-staging/intermediates/7eaa26ca-66dc-4067-bf06-faea7b0778c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9SrSmq9hgCZP8N1M7kFgIC/97LEKOAceLOYuCEt3NPA=","crlite_enrolled":false,"id":"bb082824-c5dc-4766-82b5-bf6bca3cd472","last_modified":1562023896694},{"schema":1562023895217,"derHash":"fBQwkslrZFn1QwaU4m/C/TIE2z6l4joNhOFBBDHY86o=","subject":"CN=Sectigo ECC Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEkMCIGA1UEAxMbU2VjdGlnbyBFQ0MgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"9a2de842160f7d190ed3b3cba30dbb63769ac15807d220080a3a2bd9bd1b666f","size":1288,"filename":"w6yFEnzGbuGwNdmUt6sCUgKBh2h32AoeHYoMDYzuK_k=.pem","location":"security-state-staging/intermediates/0747832d-f5b5-4a97-a9bc-25a37db463a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w6yFEnzGbuGwNdmUt6sCUgKBh2h32AoeHYoMDYzuK/k=","crlite_enrolled":false,"id":"db0253fc-b96f-4659-99b7-c03a04b8abb8","last_modified":1562023895947},{"schema":1562023892959,"derHash":"qFyEoIJaoBncCPqaAsTDnj/UGTR7LpLfBGM+5CbZAHc=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign TSA CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGsMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxGzAZBgNVBAMTEkRpZ2l0YWxTaWduIFRTQSBDQQ==","whitelist":false,"attachment":{"hash":"b810a0659616ef9705eed08822a6adc2f20b3b1253e9c32d6a67b5d6516f3a48","size":2983,"filename":"14wpPqI0rKKu2wfgxtYzi79V21Q-G8MMRfL27MMj9Iw=.pem","location":"security-state-staging/intermediates/be9846a9-01e0-44bc-8be5-f15f96a33766.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"14wpPqI0rKKu2wfgxtYzi79V21Q+G8MMRfL27MMj9Iw=","crlite_enrolled":false,"id":"aa36797b-9b27-45db-b8cc-8675b7b7187e","last_modified":1562023893696},{"schema":1562023890715,"derHash":"F81lBLJ1pmNO4AFu/+U7Jr/8yiicfe1KHI9DU80FsJw=","subject":"CN=SSL.com Client Certificate Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMUUwQwYDVQQDDDxTU0wuY29tIENsaWVudCBDZXJ0aWZpY2F0ZSBFbnRlcnByaXNlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"6c7e49020c5475b9abc349acd61d6b88925429b682acd6e2e5abe999f3b60a83","size":2475,"filename":"h9sqkTNlvbHEc_SCe09NcuKt0lMiI1LoVjl_27pfS1w=.pem","location":"security-state-staging/intermediates/d4e928bc-793e-4205-bd4e-edef3135e988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h9sqkTNlvbHEc/SCe09NcuKt0lMiI1LoVjl/27pfS1w=","crlite_enrolled":false,"id":"64099b82-85e1-4bae-a95e-a86a258020a2","last_modified":1562023891466},{"schema":1562023889965,"derHash":"uoscVM+tNpROU5GJH2sP8P7BZTOXmEynDUHH1JJfloE=","subject":"CN=YourNet SSL for business2,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEwxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSIwIAYDVQQDExlZb3VyTmV0IFNTTCBmb3IgYnVzaW5lc3My","whitelist":false,"attachment":{"hash":"9e6dd2fa6e9bc32016adf0bfa400528e72306689a6ec1eca064f3dd27a85822f","size":1601,"filename":"oYqPK-xVUS7-RcUnQeCetmqmeRrQMdovxW4BWxh-Emk=.pem","location":"security-state-staging/intermediates/4bbf284e-2f36-40c1-bd92-f2b16be4d3ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oYqPK+xVUS7+RcUnQeCetmqmeRrQMdovxW4BWxh+Emk=","crlite_enrolled":false,"id":"c47d3556-f86b-4ab6-9b3d-f9af03cd2bd9","last_modified":1562023890707},{"schema":1562023889223,"derHash":"Z3dGRFHJm4WxKtMj9z9xNsgr9NE+F16VCCWPwTdcc8c=","subject":"CN=Technological Educational Institution of Central Macedonia CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGeMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxSTBHBgNVBAMTQFRlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgQ2VudHJhbCBNYWNlZG9uaWEgQ0EgUjM=","whitelist":false,"attachment":{"hash":"36ffb3046dd658ff9ccba6ea9eb4df83e4add8be6a87212bf86afc91550e4239","size":2576,"filename":"I0fdRdZ1pQ-XM4dJAEPngv0L1YgRqn0kogIzrBTN_tk=.pem","location":"security-state-staging/intermediates/5079f208-5c1b-44b7-a9f4-c02be180c2ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I0fdRdZ1pQ+XM4dJAEPngv0L1YgRqn0kogIzrBTN/tk=","crlite_enrolled":true,"id":"539cd105-51fc-4e3e-a033-4aacc41b639c","last_modified":1562023889956},{"schema":1562023888479,"derHash":"P+i+OSoIaEuZ9JfmGMfd9aAqQom/nQjllQRZMb+6gU8=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"551cf1c482303e95516618b5d32f583a46517b1ec9aad2cf0021a782aa675281","size":1959,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/c17b1b5f-620a-4306-968a-5c4260d25ab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"0314ca5c-23af-4a2b-bc71-b2e37c50ac54","last_modified":1562023889215},{"schema":1562023887737,"derHash":"RqKjoPEeA8A6QfPlF1/Vi+wQIvuB65NJMX4f26ZMw9Q=","subject":"CN=WISeKey CertifyID Advanced G1 CA,OU=Copyright (c) 2005 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGKMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKTAnBgNVBAMTIFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIEcxIENB","whitelist":false,"attachment":{"hash":"20233f4415718b169b238134dbe831bb4d946d37afb8c1b48c1adb10fe7ac94e","size":1792,"filename":"tv0EwdMH3jyu8FHFCeLpxbPmlyakqJMlF9pChboTB90=.pem","location":"security-state-staging/intermediates/09a7a43f-5d95-4f5a-8572-f43ac38325eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tv0EwdMH3jyu8FHFCeLpxbPmlyakqJMlF9pChboTB90=","crlite_enrolled":true,"id":"8cf5872b-da2d-4b66-ba16-f07b1a526a9c","last_modified":1562023888471},{"schema":1562023887003,"derHash":"owdxJdafyc2Ztdqnz+gKDvKy6YTm1x7QeL8kJOmmz9U=","subject":"CN=Hellenic Academic and Research Institutions AdminCA R6,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGUMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPzA9BgNVBAMTNkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQWRtaW5DQSBSNg==","whitelist":false,"attachment":{"hash":"e97b90c29ca08c32a29e1dcb3016225c5d29421decefc81fdce9995717f8465d","size":2767,"filename":"D6zzR3_KFUAa348dTG5H2yMt4bp9Pii8OwW14yQxJEM=.pem","location":"security-state-staging/intermediates/aca214f4-7536-4d5a-85ee-9a4aa5638493.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D6zzR3/KFUAa348dTG5H2yMt4bp9Pii8OwW14yQxJEM=","crlite_enrolled":true,"id":"f2248a36-d454-482f-958b-a9dc15720d84","last_modified":1562023887729},{"schema":1562023884749,"derHash":"hxHuU550IT9fQS60oYqYw7WNpiC01D51sFQq/Dn8YDM=","subject":"CN=Apple IST CA 8 - G1,O=Apple Inc.,C=US","subjectDN":"MEAxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExEzARBgNVBAoMCkFwcGxlIEluYy4xCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"2cd6b163c464a522511c510d8e9b798eae4d6dbe7d90880114a485a3a0e1f2a7","size":1142,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/64c1ffef-d9d4-4408-8e40-276c0ba9cfd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"f27a949a-d1d5-478e-9330-6841cb12ffa8","last_modified":1562023885487},{"schema":1562023883962,"derHash":"qbVpjFJjvv89YHINwYRMuV0W8G4EJovOO+TWAoKwHvk=","subject":"CN=KPN BV PKIoverheid Organisatie Persoon CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNzA1BgNVBAMMLktQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"2322b3b033011ddfda96b303a8450928d8781e9758dbd8686a93db915c70ebbc","size":2560,"filename":"8zXk1x8L1cy7ge8UwVX_L83jPq3uLmMVnaXX38tAKyU=.pem","location":"security-state-staging/intermediates/b202526e-54f8-4a28-b669-5130627cb3d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8zXk1x8L1cy7ge8UwVX/L83jPq3uLmMVnaXX38tAKyU=","crlite_enrolled":false,"id":"da1e6bb9-7ead-4982-b7d5-d844af089570","last_modified":1562023884741},{"schema":1562023882482,"derHash":"Wyroq/Xn5WO7w0yXoiVU6COT16zAnBdl5QSuCMFXtaw=","subject":"CN=GeoTrust EV SSL CA - G5,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNQ==","whitelist":false,"attachment":{"hash":"00efa1f665aec6aaf8d6c9e15cc2e0d9bc291c7fff5e9a1cadfc599437b40520","size":1553,"filename":"LIGFMT2Zjq8CjsXF7zcvXgMX9FcE9iAsUb9iDx11IOI=.pem","location":"security-state-staging/intermediates/43bb4adf-b41c-4f49-bb65-d43dc9c92894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LIGFMT2Zjq8CjsXF7zcvXgMX9FcE9iAsUb9iDx11IOI=","crlite_enrolled":false,"id":"dd7d6e8c-53bd-4231-93b3-7b92a36e951f","last_modified":1562023883212},{"schema":1562023881733,"derHash":"YcEGcIOuBE7x1knOWQu/CdnXOeAl2o0ZX3HPqtbrrmk=","subject":"CN=GlobalSign Timestamping CA - R3,OU=Timestamping CA,O=GlobalSign","subjectDN":"MFkxGDAWBgNVBAsTD1RpbWVzdGFtcGluZyBDQTETMBEGA1UEChMKR2xvYmFsU2lnbjEoMCYGA1UEAxMfR2xvYmFsU2lnbiBUaW1lc3RhbXBpbmcgQ0EgLSBSMw==","whitelist":false,"attachment":{"hash":"00f7896c16a21188e61de02a8277feaa52a4b1ce711c256892645e3a7a78fd28","size":1479,"filename":"6p1mBoam4p5pkVPKIbd2jwQWyu5AebEnipX-25eoiRg=.pem","location":"security-state-staging/intermediates/4ad73b23-357c-4ee7-a6d4-d7ae4fc9f8bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6p1mBoam4p5pkVPKIbd2jwQWyu5AebEnipX+25eoiRg=","crlite_enrolled":false,"id":"ab3640fa-d9d9-4510-b69b-b6ff0623c0c9","last_modified":1562023882474},{"schema":1562023880998,"derHash":"PsOaz5ZsvBfYm/zy4HsVW5sEcWzeynPNhkwm8rL6mnA=","subject":"CN=FujiSSL OV Code Signing CA (SHA2),O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHQxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKjAoBgNVBAMTIUZ1amlTU0wgT1YgQ29kZSBTaWduaW5nIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"c3ee0faf6bb6497407e15442afbf1069e1247899461c8c8cf1fa146a55f2d49e","size":2109,"filename":"H0gCzGcWIGHafa3ydC73l4EDYZ7SkdVJeqxNBsDIwiI=.pem","location":"security-state-staging/intermediates/4d2197a4-c1c3-40c8-883f-68f1ca50c471.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H0gCzGcWIGHafa3ydC73l4EDYZ7SkdVJeqxNBsDIwiI=","crlite_enrolled":false,"id":"b7cdd2ff-51a0-4519-a7a6-d23a1614880e","last_modified":1562023881725},{"schema":1562023880256,"derHash":"MEFZ/FBwfewu32ZazJeoH0Ojr8ok9K5anyEdl7VATGQ=","subject":"SERIALNUMBER=201402,CN=Government CA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IENBMQ8wDQYDVQQFEwYyMDE0MDI=","whitelist":false,"attachment":{"hash":"4e4514cdc5a28e277b3f89386cc021171cf1d2b50f73a6c8b73f5f77ca2d5f4d","size":2097,"filename":"xSTwUEQSIfxcbg4xCuj23Ya2b3QZup1o-rlGYv1hOiQ=.pem","location":"security-state-staging/intermediates/b8a1adb7-8ae3-4bbb-a046-664664ff0771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xSTwUEQSIfxcbg4xCuj23Ya2b3QZup1o+rlGYv1hOiQ=","crlite_enrolled":false,"id":"843b14ea-2a93-4f34-b1f5-453e4b96af8a","last_modified":1562023880990},{"schema":1562023879494,"derHash":"dFCEYqXCpPJb3LVcslkxCgVrfWI92OVTUfO0Lx0ySGs=","subject":"CN=TrustSign RSA OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"e4f8e4c2fc7a0eebc4bc552e536ebdd76c0b0553eb218e1bff323f7729969d80","size":2117,"filename":"chB881BfDWAiJ-J0Xbjx2_V5kxVs4F8Bof_rFzQm8kw=.pem","location":"security-state-staging/intermediates/3712897c-ea80-4f7b-a166-8193962ca35d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"chB881BfDWAiJ+J0Xbjx2/V5kxVs4F8Bof/rFzQm8kw=","crlite_enrolled":true,"id":"23cc5cfc-37c0-40fb-a746-f53e5d03c584","last_modified":1562023880249},{"schema":1562023875682,"derHash":"sJNdwEtOYMDELe9+xXobHY+VjReYjnHMgKjPXmNbpbQ=","subject":"CN=D-TRUST SSL Class 3 CA 1 EV 2009,O=D-Trust GmbH,C=DE","subjectDN":"ME8xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKTAnBgNVBAMMIEQtVFJVU1QgU1NMIENsYXNzIDMgQ0EgMSBFViAyMDA5","whitelist":false,"attachment":{"hash":"a0be570032309c0aac96a0960dbae7ab544e4e0e1377b894c66b261ef8bb0ed5","size":1886,"filename":"lv5BNZ5aWd27ooolULDolFTwIaaWjHvG4yyH3rss4X8=.pem","location":"security-state-staging/intermediates/b08f7a1d-1d7f-4bb2-943d-d367a79b03d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lv5BNZ5aWd27ooolULDolFTwIaaWjHvG4yyH3rss4X8=","crlite_enrolled":true,"id":"6a2eddcc-3e30-4ca4-9940-4edce439b163","last_modified":1562023876500},{"schema":1562023874934,"derHash":"cjnS93D6/zsc+L4qBewD7eqsBTtVT5DTaSEVW6gFGYE=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma AAPP II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHHMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEiMCAGA1UEAwwZQ2FtZXJmaXJtYSBBQVBQIElJIC0gMjAxNA==","whitelist":false,"attachment":{"hash":"0a86bcc0922d8e5aedf06717254f6bb2250c686e3881dcb8d9e29b4a3af1d342","size":3015,"filename":"LvwNZPeX39Q9uSy8R8xO89Ml4v-I1qwWGFHanFIzBuE=.pem","location":"security-state-staging/intermediates/3ec75359-9645-4c2e-be4e-fa2cd9e3db8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LvwNZPeX39Q9uSy8R8xO89Ml4v+I1qwWGFHanFIzBuE=","crlite_enrolled":true,"id":"25860e85-f410-4572-8308-d25aa0771aed","last_modified":1562023875674},{"schema":1562023873412,"derHash":"Xm0viPYX3IuAmu5xJEWkGzzeJq+HSiIancmOodxo49U=","subject":"CN=COMODO RSA Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSMwIQYDVQQDExpDT01PRE8gUlNBIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0689264a1352756f294e4a44cb5daff0f733aa53157d8380f3178406b9372a24","size":2097,"filename":"i8_I5MKP3MSfyB8JAq96_ACK-uEGN_MBobZRhsYHU98=.pem","location":"security-state-staging/intermediates/69c6bb50-ff62-440f-b50b-6465b81903ba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i8/I5MKP3MSfyB8JAq96/ACK+uEGN/MBobZRhsYHU98=","crlite_enrolled":true,"id":"fe9571ec-d486-4292-aac0-966f5f1838e7","last_modified":1562023874180},{"schema":1562023872662,"derHash":"j3JA8WCTbx/UBr8CizW11gm2SzvQ4x4TzG3Zq3yhLm8=","subject":"CN=GLOBE SSL SECURE EMAIL CA,O=GLOBE HOSTING CERTIFICATION AUTHORITY,C=RO","subjectDN":"MGExCzAJBgNVBAYTAlJPMS4wLAYDVQQKEyVHTE9CRSBIT1NUSU5HIENFUlRJRklDQVRJT04gQVVUSE9SSVRZMSIwIAYDVQQDExlHTE9CRSBTU0wgU0VDVVJFIEVNQUlMIENB","whitelist":false,"attachment":{"hash":"1cf3286ce0babb75314968445c3959acec4c2fb01d7342d74be3d80efd77125a","size":1764,"filename":"_eRFHz8wxXnTOa1eOct617RUUVoCS6wHVpWc2LKjvVg=.pem","location":"security-state-staging/intermediates/6ea4ccfe-618c-4d73-a015-3e42e8920b65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/eRFHz8wxXnTOa1eOct617RUUVoCS6wHVpWc2LKjvVg=","crlite_enrolled":false,"id":"da8a31fa-d3a3-48b0-bda4-897fb3c4ad78","last_modified":1562023873404},{"schema":1562023869671,"derHash":"+XXzzjruzi6EIWgumY669R3qIzk01r7QmAOW1OnTBfM=","subject":"SERIALNUMBER=201910,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEw","whitelist":false,"attachment":{"hash":"0fbf6add7408151179d37d5abe61f87abcdd4c99bab406623bb0febcb40eedc5","size":2333,"filename":"jW7wLbKuIJZUC7-BzA_NfMVouvtE6dzFjDevOw1XW6E=.pem","location":"security-state-staging/intermediates/77c35205-5000-4e7d-b8c5-c0c77986d218.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jW7wLbKuIJZUC7+BzA/NfMVouvtE6dzFjDevOw1XW6E=","crlite_enrolled":false,"id":"2d54b6a4-823a-43d6-a133-dec0ecd5ae88","last_modified":1562023870410},{"schema":1562023868924,"derHash":"w/kIp5zdgMEwJctTI7ERrHkJnrgBIvmZ27IvGqFmLdw=","subject":"CN=JPRS Domain Validation Authority - G2,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"16d77651077ea51b94f72d3624452d07aaab57511a1fe8d9e10625a11e43a9d7","size":1646,"filename":"p7rWc93y9zFUE3P3-6IYKwtnR1GvtybOoTPGXdSMN6A=.pem","location":"security-state-staging/intermediates/eab9d35c-019e-4c89-b21c-0c8b8c620889.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p7rWc93y9zFUE3P3+6IYKwtnR1GvtybOoTPGXdSMN6A=","crlite_enrolled":true,"id":"439235e2-cd11-4053-986f-d05773a53816","last_modified":1562023869663},{"schema":1562023868186,"derHash":"gmxqphDvGQvi18A+ItAyQFsomATjMZ4jPEw3/78wXxo=","subject":"CN=Allina Health Connect HIE Intermediate CA,OU=Information Services,O=Allina Health System,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBbGxpbmEgSGVhbHRoIFN5c3RlbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxMjAwBgNVBAMTKUFsbGluYSBIZWFsdGggQ29ubmVjdCBISUUgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"3fed557524a047ca7ae40592d462cee185e97808c1e5320c1eb52c5a7a4d8298","size":2227,"filename":"kuL4whKnDZSJ1xWg0SN5QgraxcT7tVGkaZ4bhp_RHE0=.pem","location":"security-state-staging/intermediates/e891c8b2-5e6d-48ee-83c8-adb90530ee92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kuL4whKnDZSJ1xWg0SN5QgraxcT7tVGkaZ4bhp/RHE0=","crlite_enrolled":false,"id":"d006724b-20f0-4f42-a4d0-36155fc63363","last_modified":1562023868916},{"schema":1562023866678,"derHash":"9s9db/hQ0U2wgsyc98BWvGDjax5U8cyj4kvfOTlIl40=","subject":"CN=thawte Primary Issuing CA G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExx0aGF3dGUgUHJpbWFyeSBJc3N1aW5nIENBIEcz","whitelist":false,"attachment":{"hash":"b1b90ae5480250915ff746025d104e268a490964caffb8c60f83a5cb64b9d82b","size":1674,"filename":"hMS-T3DAYkVPWmsj2FHZdA-NePI3o2weSSK33d653rE=.pem","location":"security-state-staging/intermediates/231cc96c-85ed-46e6-842c-512d94373031.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMS+T3DAYkVPWmsj2FHZdA+NePI3o2weSSK33d653rE=","crlite_enrolled":false,"id":"1d7a0db8-9a29-4c6a-b445-a3a7ae5430b2","last_modified":1562023867410},{"schema":1562023865931,"derHash":"/Zi0DrlKrAl2IhefHjrN2s0/PJUnzWl03DYU0JrTeq4=","subject":"CN=Actalis Domain Validation Server CA G1,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGQMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcx","whitelist":false,"attachment":{"hash":"6acbc0db9e14c20b7451ac6a4370d052bc7c3e5998ac0c9ffd0579f1e572ba26","size":2255,"filename":"BJJEqWcyIOaOIv8i-zwBwibnq29_3M0jCAjL4VG3bvU=.pem","location":"security-state-staging/intermediates/7dfd8c65-c838-4d5b-9e31-7514f9077c07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BJJEqWcyIOaOIv8i+zwBwibnq29/3M0jCAjL4VG3bvU=","crlite_enrolled":true,"id":"8508b975-2be6-4467-9f9f-2771caa111e4","last_modified":1562023866670},{"schema":1562023865184,"derHash":"yW8kxFET/ZGuL55A4QZlO/oP+8+gfiCVJMhE58jaQUg=","subject":"CN=CA Disig R2I2 Certification Service,O=Disig a.s.,L=Bratislava,C=SK","subjectDN":"MGUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMRMwEQYDVQQKDApEaXNpZyBhLnMuMSwwKgYDVQQDDCNDQSBEaXNpZyBSMkkyIENlcnRpZmljYXRpb24gU2VydmljZQ==","whitelist":false,"attachment":{"hash":"f15a1b6085ecf56bcc317ea1be8002f3c662d6a3a7e4bb6320daa95d1ef02dee","size":2142,"filename":"v1zylIDkrVcStoBb1ajeFz3xSjTmFzgYYMJDQsfaIxo=.pem","location":"security-state-staging/intermediates/74dc56b9-2278-47d0-9591-8771a0e9d98a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v1zylIDkrVcStoBb1ajeFz3xSjTmFzgYYMJDQsfaIxo=","crlite_enrolled":true,"id":"bf754a3f-1f3e-4515-933a-fcb359cafde5","last_modified":1562023865923},{"schema":1562023864420,"derHash":"y2/O5BxV4kd03wK+Nd5tQY6U71gR99sTc6+ICc9wfyo=","subject":"CN=E-Tugra Domain Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIGvMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJDAiBgNVBAMMG0UtVHVncmEgRG9tYWluIFZhbGlkYXRlZCBDQQ==","whitelist":false,"attachment":{"hash":"c6b2887b29d06c3a32442bacd3087e92f206a5fa698d64deded68c4d8bb5d347","size":2296,"filename":"DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=.pem","location":"security-state-staging/intermediates/570f1b75-429e-4c79-b0e9-d7653e227ce7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=","crlite_enrolled":true,"id":"feefbefd-6161-49d5-84fd-5b09c850c80c","last_modified":1562023865176},{"schema":1562023862132,"derHash":"rw42PK5t9Inyl2ooTRLUwzyUsTX6d/ieiSmNdJHpmXQ=","subject":"CN=DigiCert Universal Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBVbml2ZXJzYWwgVHJhbnNpdGlvbiBSb290","whitelist":false,"attachment":{"hash":"44f2ec36fe8de0e388d84737946813eb0731ca6601ec2a951ad5c73c0f6dc2e8","size":1325,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/8af928e7-9473-4306-ab1b-3e6f07091c8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"1405f90f-5565-4eaf-b839-4cc432f5d0d6","last_modified":1562023862873},{"schema":1562023861362,"derHash":"xbZ5EGlYFS+D+1iG3cQfB4UZPvZ8aXW+PlCfF/KbeoY=","subject":"CN=GlobalSign R6 Admin CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIFI2IEFkbWluIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"d411527b2215bfc1772e8bbc2166bf5747830130b17f09875dd24cc7a2e36616","size":2003,"filename":"2TuBICswiXipsvQWl-U2oY732gn0rOk3bqUON3nbD5I=.pem","location":"security-state-staging/intermediates/77f7915f-d31c-40af-b0b8-7aed1e3c67b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2TuBICswiXipsvQWl+U2oY732gn0rOk3bqUON3nbD5I=","crlite_enrolled":true,"id":"8056d838-0202-4784-ba86-3b2c1652b669","last_modified":1562023862124},{"schema":1562023860621,"derHash":"77Kj83Jz01iQR5GYJepTN+m5OKjBeLYcGMK0JwuWZaw=","subject":"CN=DigiCert Federated ID L4 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMNCBDQQ==","whitelist":false,"attachment":{"hash":"e33421e9de9bb46d59d4535e270f3a16d15114db462071faf04cdfb5ded34219","size":1922,"filename":"5fYPs_zqPfuLvwmwbyYHfEa_uzaWa2EbbczMDStZEYY=.pem","location":"security-state-staging/intermediates/bc53ef2a-bdb3-4134-a63e-f5e5443ce163.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fYPs/zqPfuLvwmwbyYHfEa/uzaWa2EbbczMDStZEYY=","crlite_enrolled":false,"id":"2b3c12c4-e1b4-4036-aea5-c8c07ccc99d3","last_modified":1562023861354},{"schema":1562023858358,"derHash":"GDWw5ILqZVNvwBDkvBPAYPZWaBZfupfi9ULOlspt/vw=","subject":"CN=Entrust Certification Authority - L1F,OU=See www.entrust.net/legal-terms+OU=(c) 2016 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTYgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFG","whitelist":false,"attachment":{"hash":"b215df35bd16df20092886331099193a624ea14d00398b12325bb57279cf4181","size":1410,"filename":"45FtWowsHe863G4x3FzC8qT3R9tgrLIVwZGjN5hwd80=.pem","location":"security-state-staging/intermediates/60dd4560-425b-4a39-9729-7bc1fc60adbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"45FtWowsHe863G4x3FzC8qT3R9tgrLIVwZGjN5hwd80=","crlite_enrolled":true,"id":"7cb091bb-e197-494b-8caa-a6f3725b7737","last_modified":1562023859119},{"schema":1562023856875,"derHash":"M3rFbzn7iHe58FJFVLdV0YNagH/8kFjfxt4bcH9pYSM=","subject":"CN=Certum Class I CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHYxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGjAYBgNVBAMTEUNlcnR1bSBDbGFzcyBJIENB","whitelist":false,"attachment":{"hash":"1c717a79efa6612fceeb4dd338a92b801131469bafdebec7a6c46a0ecbc22049","size":2414,"filename":"Wr7s1eee1m0JS_6tdr5Yu_rJOpqsjsb8IeNchmSjkL4=.pem","location":"security-state-staging/intermediates/475a2a7a-38fc-478b-ae6a-f0659a08775d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wr7s1eee1m0JS/6tdr5Yu/rJOpqsjsb8IeNchmSjkL4=","crlite_enrolled":false,"id":"b84bfc47-4590-4d6c-b85e-ceb5465f3c63","last_modified":1562023857605},{"schema":1562023856138,"derHash":"AJhxw6TGBzEeWukvAQlfm/dhALh5SrCppSEOZ5TIYHw=","subject":"CN=Trust Provider B.V. TLS RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEqMCgGA1UEAxMhVHJ1c3QgUHJvdmlkZXIgQi5WLiBUTFMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"be93cbc768b2a781054d69b3d1b32596d09aabb573a067ff44e5770bc18fb99e","size":1687,"filename":"DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN_FbGZLM=.pem","location":"security-state-staging/intermediates/00957b9f-f181-49ab-a3e6-7197b2141488.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN/FbGZLM=","crlite_enrolled":true,"id":"478147bd-3418-4c7f-8860-2be1d4c12427","last_modified":1562023856867},{"schema":1562023855404,"derHash":"B0VB7N+I7Zku1a3j7N3vJ6JrobREgKGVwKja2uJSHY4=","subject":"CN=GeoTrust SSL CA - G3,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"4e997aea59ed936c28e58cecab18f43ae0848c11ca0390f85e3cd97d9a16b9ee","size":1553,"filename":"PbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=.pem","location":"security-state-staging/intermediates/3a8a386b-c548-4e8c-a1a3-cc450d46c6e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=","crlite_enrolled":true,"id":"b3409488-e32c-4056-88d1-f4d89941e37e","last_modified":1562023856130},{"schema":1562023852415,"derHash":"/5EtVAP9psuxpyS+tgtK0bT5vllFJe4fFkiMA5840u4=","subject":"CN=BlackCert\\, Inc. RSA Client Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMTswOQYDVQQDEzJCbGFja0NlcnQsIEluYy4gUlNBIENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"820b9d9225f295df2cec72638271e9e4972f857ab19ffd4040452777bda1e8dc","size":2146,"filename":"J0cNZ23ANHAptnJJaXt70Dv2laxN8JC5meZIFs6ch2Q=.pem","location":"security-state-staging/intermediates/decccfcf-7e23-48b9-afd0-c27621db52cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J0cNZ23ANHAptnJJaXt70Dv2laxN8JC5meZIFs6ch2Q=","crlite_enrolled":false,"id":"64a81e56-72d4-4533-aad1-0048e8806a7a","last_modified":1562023853161},{"schema":1562023851676,"derHash":"Xxg5DyFJApKglf/zgPLokn3TFZIjp2ET7eNXqisxHB8=","subject":"CN=Gehirn Managed Certification Authority - ECC EV,OU=Controlled by COMODO CA exclusively for Gehirn Inc.,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIHAMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTwwOgYDVQQLEzNDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgR2VoaXJuIEluYy4xODA2BgNVBAMTL0dlaGlybiBNYW5hZ2VkIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUNDIEVW","whitelist":false,"attachment":{"hash":"9430085f782a8e581ee60b50f4aee87fd9ca49475d6c5378b586ff578827bbc5","size":1435,"filename":"qSizb9i49llI7pUZp1-Y6gXcrABhDgM-8a1v9VWvTnY=.pem","location":"security-state-staging/intermediates/52c95b67-44ae-45fe-a516-574047902f4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qSizb9i49llI7pUZp1+Y6gXcrABhDgM+8a1v9VWvTnY=","crlite_enrolled":false,"id":"2fece5dc-21db-4816-a010-1fbd706af66a","last_modified":1562023852406},{"schema":1562023850204,"derHash":"/yAcoSyHpvDLpkPpq7PJVMkVWt0xObLi6u0RS/n3XTE=","subject":"CN=COMODO RSA Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"c3af80c298bee7bb78b92a6907c2737f0f2499d7469ab1445b6ac2c3afca282e","size":2154,"filename":"EULHwYvGhknyznoBvyvgbidiBH3JX3eFHHlIO3YK8Ek=.pem","location":"security-state-staging/intermediates/8acfb92a-ce66-4fb5-b98b-4972b2012e02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EULHwYvGhknyznoBvyvgbidiBH3JX3eFHHlIO3YK8Ek=","crlite_enrolled":true,"id":"d7edf4f6-8ea9-48ae-8d08-69ed5736f29e","last_modified":1562023850930},{"schema":1562023847212,"derHash":"lA0vISoqOcyEvULQ9txPe6TEd+elqZIslrn17BTkpsg=","subject":"SERIALNUMBER=ZZZZZZA2,CN=Siemens Issuing CA EE Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGfMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTIxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMSgwJgYDVQQDDB9TaWVtZW5zIElzc3VpbmcgQ0EgRUUgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"1bc1c575c0c25eabed479a2d3598ce3f07b4fa37c821f8112919dea06b3659f9","size":2637,"filename":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=.pem","location":"security-state-staging/intermediates/c93ab0f3-290e-4e26-865c-fad95f2e5e95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=","crlite_enrolled":true,"id":"73d53000-4514-4e59-9781-f064a11afe8f","last_modified":1562023847950},{"schema":1562023846475,"derHash":"pq55WaGVdJyohzhvoESCvRadwRV+MS0wGw1cMz+vKwI=","subject":"CN=IBM New Zealand Limited Public CA,OU=Symantec Trust Network,O=IBM New Zealand Limited,C=NZ","subjectDN":"MHwxCzAJBgNVBAYTAk5aMSAwHgYDVQQKExdJQk0gTmV3IFplYWxhbmQgTGltaXRlZDEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEqMCgGA1UEAxMhSUJNIE5ldyBaZWFsYW5kIExpbWl0ZWQgUHVibGljIENB","whitelist":false,"attachment":{"hash":"e26288de5e13511bcb13ccfd1f3dfda1cb52a4b8d5f3b28f5c139bc3c2323669","size":1398,"filename":"Zq0nTmnMxQ4X8EbS5Miz_8_bZskoyMZcrqwzFr53uGY=.pem","location":"security-state-staging/intermediates/bbd5d60b-441a-4059-9ca1-2294ac6e4d52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zq0nTmnMxQ4X8EbS5Miz/8/bZskoyMZcrqwzFr53uGY=","crlite_enrolled":false,"id":"69507212-dd76-4998-9e40-0c068a88a0b1","last_modified":1562023847205},{"schema":1562023844992,"derHash":"GlzNcUq9fHr1Kg+pRrycj4aWvL8ifYEzlDDl0zlOzJc=","subject":"CN=TU Ilmenau CA G2,O=Technische Universitaet Ilmenau,C=DE","subjectDN":"MFIxCzAJBgNVBAYTAkRFMSgwJgYDVQQKDB9UZWNobmlzY2hlIFVuaXZlcnNpdGFldCBJbG1lbmF1MRkwFwYDVQQDDBBUVSBJbG1lbmF1IENBIEcy","whitelist":false,"attachment":{"hash":"ac88cae9a73fc870c8732cac7b3ef3c93112a4abcf6b7e4ed2de251558a6cd88","size":1951,"filename":"6SXfWL___HfILksBCAAWXWAQClUVsEeSl6Lg8jmVlWo=.pem","location":"security-state-staging/intermediates/4aa70727-c6f8-46b4-9a57-73a0a9d47ebd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6SXfWL///HfILksBCAAWXWAQClUVsEeSl6Lg8jmVlWo=","crlite_enrolled":true,"id":"4a92eec8-9b5a-4058-aff9-c75fd8949758","last_modified":1562023845732},{"schema":1562023844250,"derHash":"2uNDT2lvyfD2UuGypvabXpJz0J9DvTvdRxfWFB+M0sI=","subject":"OU=Public Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGAxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEsMCoGA1UECwwjUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"d35775690c65ebee8113249b23f19a293655d0ed08e999f64243089ed009db1b","size":2129,"filename":"tnFqrstaexEa6Zz-CVGGozhI8IF1FafM6uzX3zzHrUI=.pem","location":"security-state-staging/intermediates/07e9d719-440e-4db5-9e24-7f15cd5cee54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tnFqrstaexEa6Zz+CVGGozhI8IF1FafM6uzX3zzHrUI=","crlite_enrolled":true,"id":"9bae286e-930a-4285-8a27-54c6509f3077","last_modified":1562023844984},{"schema":1562023843492,"derHash":"8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=","subject":"CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN","subjectDN":"MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB","whitelist":false,"attachment":{"hash":"bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b","size":1963,"filename":"uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem","location":"security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=","crlite_enrolled":true,"id":"b2b776e5-2b2f-4c8e-819d-026b8d3855d2","last_modified":1562023844242},{"schema":1562023842756,"derHash":"OuaZ2U6P69rLhtT5DUCQMzNHjmXgZVxDJFEZfjP6B/I=","subject":"CN=DarkMatter High Assurance CA,O=DarkMatter LLC,C=AE","subjectDN":"ME0xCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzElMCMGA1UEAwwcRGFya01hdHRlciBIaWdoIEFzc3VyYW5jZSBDQQ==","whitelist":false,"attachment":{"hash":"29e18c8b9486962fd829de646542f3e70fd375aee342613cc9acf89995787849","size":2467,"filename":"eBpM8ukkUvPuAdDDgaQhTzkEFlw5CtvWH80RJE4Jstw=.pem","location":"security-state-staging/intermediates/11f4327c-4223-417d-ade5-2d4d436b18d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBpM8ukkUvPuAdDDgaQhTzkEFlw5CtvWH80RJE4Jstw=","crlite_enrolled":true,"id":"c5819102-1052-4780-bcdd-3eaa82f68270","last_modified":1562023843484},{"schema":1562023842017,"derHash":"aXDjlmIUF9zuMVqsKLteoxYfF1Ag9/Tpuhfa3ljbsI0=","subject":"CN=WoTrus DV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"c00640d76f2191d5d2fd5624662ed82ab5430015987a69f81f883cdc4d5a7b43","size":1691,"filename":"qo1QyzYCUCM6TTpkflyWle2ERuNQ8q7_99oCt1RmDgk=.pem","location":"security-state-staging/intermediates/ac244e93-fe89-4324-8196-d9da2b7bf0b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qo1QyzYCUCM6TTpkflyWle2ERuNQ8q7/99oCt1RmDgk=","crlite_enrolled":true,"id":"b97451e0-61f4-46a5-908d-5fd947861af6","last_modified":1562023842749},{"schema":1562023841259,"derHash":"tquNsRC19tNf2aa1/3Bx2EJmWBJsQlYpvHzaMTVPTNA=","subject":"CN=FUJIFILM Fnet CA - C,O=FUJIFILM,C=JP","subjectDN":"MD8xCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEdMBsGA1UEAxMURlVKSUZJTE0gRm5ldCBDQSAtIEM=","whitelist":false,"attachment":{"hash":"cdd8e18850561e92de8d49cb4cb56e71a16a242cdd3c288f43a03ddfa92e4412","size":1589,"filename":"BF0M6q5HK3EucyPuMYh1-P2tykWlFWnyzlFrzFQqvGQ=.pem","location":"security-state-staging/intermediates/2ec396dc-b563-4cbd-930d-7de56991f018.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BF0M6q5HK3EucyPuMYh1+P2tykWlFWnyzlFrzFQqvGQ=","crlite_enrolled":false,"id":"2fa5f637-6677-49f4-906f-ffde7b0d2f40","last_modified":1562023842008},{"schema":1562023839762,"derHash":"qmojgKfoJU2tRiCuCJXedAR/M/Umh1jc8nxNKAs4SlA=","subject":"CN=Trust Technologies Global Client CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT","subjectDN":"MIGWMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxLDAqBgNVBAMTI1RydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"a1ebd3c53dcb40baac891b57ab477f14d4b3afc34c91a62b5b8c580f800493e3","size":1707,"filename":"BbI65NDhxD_m5B-mPY1xvko26icvW3iWYISpR9SvWC8=.pem","location":"security-state-staging/intermediates/115c0963-8f7c-4505-be5a-c66871482aea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BbI65NDhxD/m5B+mPY1xvko26icvW3iWYISpR9SvWC8=","crlite_enrolled":false,"id":"f99c32e0-0924-4435-8934-7158db6251b8","last_modified":1562023840499},{"schema":1562023839017,"derHash":"RVTCEMdRrIIRtuIEa3n2iv/ICCJ0rqSJA4ZgYgxBgt0=","subject":"CN=SECOM Passport for Member PUB CA3,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTM=","whitelist":false,"attachment":{"hash":"96b4ebc82851db1b6b6ae2984c856e75f401999eefa282134fbfd11c3a759e77","size":1581,"filename":"MVOOkY-CSvhzP9Q_l-rKIx-_Qt7f3yC8pbQgH0FQpXQ=.pem","location":"security-state-staging/intermediates/436cd56f-7584-4ad0-a820-72c2b5a9f1f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MVOOkY+CSvhzP9Q/l+rKIx+/Qt7f3yC8pbQgH0FQpXQ=","crlite_enrolled":false,"id":"5b698c8f-82c1-4637-a282-76a058f19fab","last_modified":1562023839754},{"schema":1562023837538,"derHash":"9unOsfPDaJhR+IYFVTHacu0LxeVtFkkls65/3OhxfXA=","subject":"CN=KeyNet Systems RSA OV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"6834156d59e4d2f03dd0abbc702c34e050c4e798044b5f6fd911b3a37b351e43","size":2138,"filename":"yZ5Axfrz6TT2LCftMDwKgTE4QQ41sZW0CP1oieeztpI=.pem","location":"security-state-staging/intermediates/db3a4237-c968-435f-bb9d-f34cd5995771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yZ5Axfrz6TT2LCftMDwKgTE4QQ41sZW0CP1oieeztpI=","crlite_enrolled":false,"id":"f5924da9-0730-47bb-8e5a-9c4b647cc493","last_modified":1562023838272},{"schema":1562023834547,"derHash":"tgQCajWQOSq++2sY6BdkU2VhFdKgBg9xPhkan9B2Uyo=","subject":"CN=CompuGroup Medical Certificate Authority,OU=IT,O=Compugroup Medical\\, Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdDb21wdWdyb3VwIE1lZGljYWwsIEluYzELMAkGA1UECxMCSVQxMTAvBgNVBAMTKENvbXB1R3JvdXAgTWVkaWNhbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"3a3807e9e6c4883a2bab883da53e548b6e33e80835bb71a8d682deec8a1bc5a9","size":2207,"filename":"jiFd49hgJ7OqvKchE20pWzOluAN8L1TBxe0YBzN5oPc=.pem","location":"security-state-staging/intermediates/f37211f9-f5d2-4ab2-8d21-68f22e873847.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jiFd49hgJ7OqvKchE20pWzOluAN8L1TBxe0YBzN5oPc=","crlite_enrolled":false,"id":"7d0b7d8e-c334-41a4-92af-d211360e2f37","last_modified":1562023835290},{"schema":1562023831541,"derHash":"h38kznD0owR+TqcL7BvDG+m2Uzrf86OT/5v7PIEClEY=","subject":"CN=TrustAsia TLS ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBFQ0MgQ0EgRzk=","whitelist":false,"attachment":{"hash":"619365f9c59d0f0dcfcb64ba525d68621f75fadebe181e15429e3dc854262b7c","size":1191,"filename":"z_Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=.pem","location":"security-state-staging/intermediates/94070f05-b053-49e6-8de7-0b2dba8ba010.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z/Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=","crlite_enrolled":false,"id":"5ba8fcec-1524-40f5-bf99-0dd3b9641a19","last_modified":1562023832267},{"schema":1562023830806,"derHash":"V0NCratO1573gY6CmQWOHAcawOQx/kIcq7Yt9NTp5MU=","subject":"CN=Atos TrustedRoot Issuing CA for Primetals 2015,O=Atos,C=DE","subjectDN":"MFUxNzA1BgNVBAMMLkF0b3MgVHJ1c3RlZFJvb3QgSXNzdWluZyBDQSBmb3IgUHJpbWV0YWxzIDIwMTUxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"5ade36d683c37e2eead15d6a475ad0cea29346f577f4600faa9a32397f52bb2c","size":1581,"filename":"Ed79H7X5vQv3PR5-yCPH4ihzJhZFJlA-HsWA-xT7qAI=.pem","location":"security-state-staging/intermediates/8efad479-fc51-47cc-b880-7913a377291d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ed79H7X5vQv3PR5+yCPH4ihzJhZFJlA+HsWA+xT7qAI=","crlite_enrolled":false,"id":"05eaf66f-1805-4619-9d87-bf6d7bfd6e36","last_modified":1562023831534},{"schema":1562023828546,"derHash":"qClEStL7SAeaWV+72IxOZY7iCJpeEpuJqqzOhRGY/9c=","subject":"CN=Symantec Class 3 Shared Public Organization CA - SHA1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGNMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPjA8BgNVBAMTNVN5bWFudGVjIENsYXNzIDMgU2hhcmVkIFB1YmxpYyBPcmdhbml6YXRpb24gQ0EgLSBTSEEx","whitelist":false,"attachment":{"hash":"021a80512da52a65049663e34f330aa42c4e0cc02a4cee9b9008dadeb792a9d4","size":2194,"filename":"2U0T8GZhpLigHF6ChDBAZpgEBhCK4QPSSnTb09TAv6I=.pem","location":"security-state-staging/intermediates/e26d09a9-b1e2-47b9-b856-b66a98cf8a8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2U0T8GZhpLigHF6ChDBAZpgEBhCK4QPSSnTb09TAv6I=","crlite_enrolled":false,"id":"d2495fba-828e-4b4f-bc15-e38ee9827c0a","last_modified":1562023829273},{"schema":1562023826316,"derHash":"Aldk5uGdkLxsxwZpRFWT1T/A2YNve5QoA2IIYQtTmUM=","subject":"CN=TrustSign ECC EV CA,OU=Controlled by Sectigo exclusively for Ziwit,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MIGZMQswCQYDVQQGEwJGUjEQMA4GA1UECBMHSGVyYXVsdDEUMBIGA1UEBxMLTW9udHBlbGxpZXIxDjAMBgNVBAoTBVppd2l0MTQwMgYDVQQLEytDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFppd2l0MRwwGgYDVQQDExNUcnVzdFNpZ24gRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"eb2d6f05c96f188381bd1171d6fa4afb21d12035743de566ce609f7ca5bda596","size":1382,"filename":"JtXGnD_eYf2MNlncNj_WbCi9uD6VYCdIXyT735ieGbg=.pem","location":"security-state-staging/intermediates/1010923c-cbc6-4d1e-8ed2-ffce2c0fa2fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JtXGnD/eYf2MNlncNj/WbCi9uD6VYCdIXyT735ieGbg=","crlite_enrolled":false,"id":"04d89624-479a-4a19-a2f7-29d3230db81f","last_modified":1562023827049},{"schema":1562023825546,"derHash":"Yy/Wl7rK8e0jJRfsm3Yit8JeFEiwzGJrMyhnGeNRzoo=","subject":"CN=Giesecke and Devrient CA,OU=Corporate CA,O=Giesecke and Devrient,L=Munich,C=DE","subjectDN":"MHgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHEwZNdW5pY2gxHjAcBgNVBAoTFUdpZXNlY2tlIGFuZCBEZXZyaWVudDEVMBMGA1UECxMMQ29ycG9yYXRlIENBMSEwHwYDVQQDExhHaWVzZWNrZSBhbmQgRGV2cmllbnQgQ0E=","whitelist":false,"attachment":{"hash":"e464f73793737913979fd573cde24680aa6beb3d0a1536caf6f84d2dd0928efd","size":2832,"filename":"x-foNQ4x_jlYBHMXga5zVB0UNOMRxxnju5lOjtuhUmo=.pem","location":"security-state-staging/intermediates/3350d069-eb24-4e49-887f-4b126aa2bbcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x+foNQ4x/jlYBHMXga5zVB0UNOMRxxnju5lOjtuhUmo=","crlite_enrolled":false,"id":"c48b6fd8-b06a-407e-aa0d-d68bddb6bea1","last_modified":1562023826309},{"schema":1562023823312,"derHash":"+Tc4W4j2WYQJCUB7gOTrJfJcW0rq757ieYgO4L8F7e8=","subject":"CN=Certification Authority,OU=Ministry of Defense,O=Japanese Government,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRwwGgYDVQQLExNNaW5pc3RyeSBvZiBEZWZlbnNlMSAwHgYDVQQDExdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"98d0179cfafdd09af29ed667827cfc04e1bc4ad4d0f7eec2b6d464dd2cf6b378","size":1650,"filename":"KbQxsgiSt363tFvyQehFWksqyFq4Y5_GQHqCruQ7lPA=.pem","location":"security-state-staging/intermediates/313fc711-872f-4c90-bbdc-d86cea66d801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbQxsgiSt363tFvyQehFWksqyFq4Y5/GQHqCruQ7lPA=","crlite_enrolled":false,"id":"26fa37cb-aba7-4e95-8382-5b64698bfbee","last_modified":1562023824045},{"schema":1562023819546,"derHash":"u2YddQxTFmGBgHpomP1GQGXOWSmJhq1m2db//LvUc4o=","subject":"CN=NetLock Expressz Eat. (Class C Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG1MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFDMEEGA1UEAww6TmV0TG9jayBFeHByZXNzeiBFYXQuIChDbGFzcyBDIExlZ2FsKSBUYW7DunPDrXR2w6FueWtpYWTDsw==","whitelist":false,"attachment":{"hash":"cf7c4f8886152f1548287e1f1314115b3db7ea5a596a43daa585a1a0e2f9e79c","size":2198,"filename":"-QUSW1ozNhu9biYeUP4qycv4BLZu3JGAci7jNGIo4PI=.pem","location":"security-state-staging/intermediates/408172d6-6f39-4e21-9ed3-d79b6dd424a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+QUSW1ozNhu9biYeUP4qycv4BLZu3JGAci7jNGIo4PI=","crlite_enrolled":false,"id":"9ccfdb3e-9fe2-4d0c-a088-5e0ba1450d2e","last_modified":1562023820285},{"schema":1562023816556,"derHash":"KzDV6RKQY1jJrW+1f9ezaKAaeOOVtOwRZFxbmKCWfeg=","subject":"CN=KDDI Web Communications Certification Authority 3,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTowOAYDVQQDEzFLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAz","whitelist":false,"attachment":{"hash":"060dbe29951ae1012870c4ee26bb98926968e0fea64e43fdc0746acf31108a56","size":1687,"filename":"jIWLX2MDYLP12p947FUGxwdJR8AY8yPcYv_TpWUNDQQ=.pem","location":"security-state-staging/intermediates/a8e2cd0b-0920-44ce-9620-e32ff03bd8cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jIWLX2MDYLP12p947FUGxwdJR8AY8yPcYv/TpWUNDQQ=","crlite_enrolled":true,"id":"7fe81ac3-e601-4e9c-ac30-be5018f136a5","last_modified":1562023817313},{"schema":1562023815806,"derHash":"c/gpVfkx3GgCvQfF0d+UBBE/PCJPel5yBAvkQuQfMvw=","subject":"OU=Trustis FPS FF Issuing Authority,O=Trustis Limited,C=GB","subjectDN":"MFIxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9UcnVzdGlzIExpbWl0ZWQxKTAnBgNVBAsTIFRydXN0aXMgRlBTIEZGIElzc3VpbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"25f4051ff993ea304d7f826c473763beaba1048c4d81074983e9c6f45e52dd86","size":1951,"filename":"dcSuTd19rcEF97RhSta5TbUNWKHIOxrSRcDupjDbXZk=.pem","location":"security-state-staging/intermediates/cc33bc05-8ad8-4986-be9b-8acea0f3c2ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dcSuTd19rcEF97RhSta5TbUNWKHIOxrSRcDupjDbXZk=","crlite_enrolled":true,"id":"f6fd8e6c-c71d-462f-afa0-7dad266d9359","last_modified":1562023816547},{"schema":1562023814315,"derHash":"eZjyXc21sR/yrpRhu9mNAn3vIuCOW4LkuvvLYLeeziM=","subject":"SERIALNUMBER=201401,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwMQ==","whitelist":false,"attachment":{"hash":"b8bed1769b1a6ef9bcc9789fbb84f0881a40be844acb824e8b7f3703ba48b3a3","size":1402,"filename":"fvtABvaKOw2PF9nCsZUaEY9iC6VzN_FdQiP1jFR7a-s=.pem","location":"security-state-staging/intermediates/d5d9747a-bbb1-42d0-8885-da78b8cf26f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fvtABvaKOw2PF9nCsZUaEY9iC6VzN/FdQiP1jFR7a+s=","crlite_enrolled":false,"id":"dab01327-2eca-4caf-840f-1812c8c9f612","last_modified":1562023815061},{"schema":1562023813549,"derHash":"teRJHPHgoGwZRB+sKVtngiZClgP8xBTGJuIQsu/JXwA=","subject":"CN=Certigna Identity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MSIwIAYDVQRhDBlOVFJGUi0wMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBJZGVudGl0eSBDQQ==","whitelist":false,"attachment":{"hash":"8fffbc881ae6f4ef224bc772397cce665787accfbbd9be25a200ea93e8a42613","size":2515,"filename":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH_eJZlWjWo=.pem","location":"security-state-staging/intermediates/56d8fb27-0de0-4b61-ab41-299e1d0c14c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH/eJZlWjWo=","crlite_enrolled":true,"id":"52365c35-c17b-4e16-abb3-36a0687ea4c5","last_modified":1562023814306},{"schema":1562023812811,"derHash":"zhA5EhatpGw3a3MzcVd3p5LY1CK9fF4G/i63laANx+w=","subject":"CN=McAfee Client/Email CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEhMB8GA1UEAxMYTWNBZmVlIENsaWVudC9FbWFpbCBDQSAy","whitelist":false,"attachment":{"hash":"5bc268b7826fdc5d76c11010496322362492a8274003d0c6398bb7a54848e55a","size":2113,"filename":"TPnIj68eKdodJLOk1P1H6qztrjvIWD_sPyWq4s3vSGk=.pem","location":"security-state-staging/intermediates/1885f863-9e79-45a0-8f72-a556a1d3cb95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TPnIj68eKdodJLOk1P1H6qztrjvIWD/sPyWq4s3vSGk=","crlite_enrolled":false,"id":"55049def-d1d5-49b8-b27e-784120a1d096","last_modified":1562023813542},{"schema":1562023812053,"derHash":"a+fQTiD/wo8ZjKiPwMNkR4T9FWkDvweBMPuWTAJY26A=","subject":"CN=United Parcel Service\\, Inc. RSA OV CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjEuMCwGA1UEAxMlVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"392ca8f231a1c38f1201cf145dde7d73e1d632d11a6ea3ed9f59160e766185e2","size":2142,"filename":"SwXmbcFTOEV-82sxJhAl0R-uGVTqV9eWCnYAM12xQYs=.pem","location":"security-state-staging/intermediates/f3550763-54ff-4877-a395-498babc118ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SwXmbcFTOEV+82sxJhAl0R+uGVTqV9eWCnYAM12xQYs=","crlite_enrolled":false,"id":"9ef159f4-984f-41ba-974e-093e836bf9ed","last_modified":1562023812803},{"schema":1562023811314,"derHash":"U1cNBeQNxi+d+R0Vr7AVtWqqaAwgzBaObVfZRsnOJoQ=","subject":"CN=QuoVadis Swiss Regulated CA G1,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH4xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTEyLjIxMC4zNDkxJjAkBgNVBAoMHVF1b1ZhZGlzIFRydXN0bGluayBTY2h3ZWl6IEFHMScwJQYDVQQDDB5RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzE=","whitelist":false,"attachment":{"hash":"22b9742847b9ab6abdad54c699e9692ed9618e8671e4046c99fa2af1b0a3a426","size":2540,"filename":"60b_Hr5z04YiWfrcZlkQZtKfGEaLb5KOd9VjN9uVRks=.pem","location":"security-state-staging/intermediates/f24f46f5-7719-4f04-9db5-6e705c7e8bd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60b/Hr5z04YiWfrcZlkQZtKfGEaLb5KOd9VjN9uVRks=","crlite_enrolled":true,"id":"b33e1999-4a4d-4f36-a44d-123037de65e1","last_modified":1562023812045},{"schema":1562023809819,"derHash":"aQ7yFLwRTvHXJr1+8D5UbNbLe+W8I/rNORJjv/tXlwo=","subject":"CN=cPanel High Assurance RSA Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTowOAYDVQQDEzFjUGFuZWwgSGlnaCBBc3N1cmFuY2UgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"515ad74a8a9644ed7d7e651b809dee9f927e0c09028aa60161f5dd268ff3777d","size":6117,"filename":"btauesE0qNPMvYa1wCIsn_jg_om1G73FWer38Ur7kQE=.pem","location":"security-state-staging/intermediates/1a7b6383-a8d8-4f48-b6bb-f5a5cbc9883b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"btauesE0qNPMvYa1wCIsn/jg/om1G73FWer38Ur7kQE=","crlite_enrolled":true,"id":"97a2119a-a356-445c-8eb8-989fd062161b","last_modified":1562023810560},{"schema":1561997070297,"derHash":"gw/yBa5pSFBZw/sjdqfy+e4cKmHeJZ3QnQu2rWn4iDI=","subject":"SERIALNUMBER=Q2826004J,CN=AC Administraci\u00f3n P\u00fablica,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh","whitelist":false,"attachment":{"hash":"1a643193c39cf1aa75be19f71a124a43c4ff5403f87361b228eed95bdccebd66","size":2438,"filename":"uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem","location":"security-state-staging/intermediates/b2066e9b-2ccd-4607-b8f6-e71ba0621bca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=","crlite_enrolled":true,"id":"a37e40f6-ffa2-4d26-992d-432521bce7f9","last_modified":1562023808306},{"schema":1559867790401,"derHash":"x0YLDt2htEyOIWSyNOvsw5YqajepNrdKbn1GaCk48IQ=","subject":"CN=DigiCert EV Code Signing CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMik=","whitelist":false,"attachment":{"hash":"66fbaa9bc2d541bb65b103b1e7beea732f29148f830f01aa655d2aa8a2fe0db4","size":2393,"filename":"pcpyVjsv8yFFdFLHtUAzS7ZJt2VTimUM6OuTLzMOqPM=.pem","location":"security-state-staging/intermediates/07f62659-5a1e-4940-901b-98a97d5a2c45.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pcpyVjsv8yFFdFLHtUAzS7ZJt2VTimUM6OuTLzMOqPM=","crlite_enrolled":true,"id":"aa338e39-dbdc-4d4b-a5fe-9098e2a81760","last_modified":1559867791204},{"schema":1559867775772,"derHash":"2byXP4iQlpbaEIMxl5RMpYrEqIhHd5yRMzdCZxAO7Fg=","subject":"CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU=VeriSign Trust Network+OU=(c) 2006 VeriSign\\, Inc. - For authorized use only,O=VeriSign\\, Inc.,C=US","subjectDN":"MIHKMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA2IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHNQ==","whitelist":false,"attachment":{"hash":"8c27ef0472925897276a375939fcfb0a9923a56d945831850f7684af74691ced","size":2223,"filename":"JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=.pem","location":"security-state-staging/intermediates/26497f8c-d5cd-43b4-a151-49c3160d6679.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=","crlite_enrolled":true,"id":"ca224e06-34d2-4a49-b0ac-eb7f3ad7719a","last_modified":1559867776576},{"schema":1559867708766,"derHash":"WuT3d0JrvFqoWYbKSNMZJwxVNiENyOoaKNUC9rNZUTg=","subject":"CN=Inpriva Direct Federated CA,O=Inpriva Inc,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtJbnByaXZhIEluYzEkMCIGA1UEAxMbSW5wcml2YSBEaXJlY3QgRmVkZXJhdGVkIENB","whitelist":false,"attachment":{"hash":"f7ea7da994e7d75e4255611ed437f7a154e0e25a76711ae142337c1b96640839","size":2138,"filename":"EbPRGHnlhhe6ua7F4tDHdk9b21suw0adgBJmLt7jZrk=.pem","location":"security-state-staging/intermediates/352fbe3e-0fa8-4a62-b3f6-bed976b2f7e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EbPRGHnlhhe6ua7F4tDHdk9b21suw0adgBJmLt7jZrk=","crlite_enrolled":false,"id":"343e0db4-ae27-43dc-a56b-2ab4c75e4c98","last_modified":1559867709576},{"schema":1559867705094,"derHash":"U3xcgHI2PhR8hNIdDSJItrmamopDMRZZg17DOSbaKGA=","subject":"CN=thawte DV SSL SHA256 CA,OU=Domain Validated SSL,O=thawte\\, Inc.,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSAwHgYDVQQDExd0aGF3dGUgRFYgU1NMIFNIQTI1NiBDQQ==","whitelist":false,"attachment":{"hash":"7209c671afa40e770c49789601b57a8d17edff8f2a2e501da1b9703f954ca286","size":1743,"filename":"Rgf6Wnwbdv9nEsdxDeB2gCPXUB6C3Y3dDbU7tDwQ4Ic=.pem","location":"security-state-staging/intermediates/3584c5e9-3feb-421a-8dda-eee21cf023ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rgf6Wnwbdv9nEsdxDeB2gCPXUB6C3Y3dDbU7tDwQ4Ic=","crlite_enrolled":true,"id":"2ad7d7e1-56fc-4751-a1c3-0c70bb9794d2","last_modified":1559867705882},{"schema":1559867684823,"derHash":"9nIr5ErNrltaizsLSvn0v15fvDlhz1JsvZdp0cbhSFk=","subject":"CN=Sectigo ECC Domain Validation Secure Server CA 2,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"ad8ca4ef91dbda033c17e8dbf198a410d147227e58e0981a280cafe1867ccc27","size":1329,"filename":"Js263FpzCgFxGxbtSYGcowFcKG4SjKAkg5R8oucb6bk=.pem","location":"security-state-staging/intermediates/42ec9fe3-884f-4466-82dc-da23d6c795ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Js263FpzCgFxGxbtSYGcowFcKG4SjKAkg5R8oucb6bk=","crlite_enrolled":false,"id":"814ba8eb-43a2-4b3e-9b40-cf9cb1b220b3","last_modified":1559867685643},{"schema":1559867653200,"derHash":"TvqqEECsL0TT3uIG2VIqKI2E7Djd9ZKYySbgL0ydmu8=","subject":"CN=TrustCor Basic Secure Site 2048 (CA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGPMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLjAsBgNVBAMMJVRydXN0Q29yIEJhc2ljIFNlY3VyZSBTaXRlIDIwNDggKENBMSk=","whitelist":false,"attachment":{"hash":"da4d2d1acf769f58428741b22d18919f6c746cc708fc5aab39f601e0afbd27f6","size":1869,"filename":"eBBAlQ999Dnt37FkvhzStv4GMlSaWJN88WDxZob6g0Y=.pem","location":"security-state-staging/intermediates/6fc43816-7b30-430f-950f-7f7adea2e3d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBBAlQ999Dnt37FkvhzStv4GMlSaWJN88WDxZob6g0Y=","crlite_enrolled":true,"id":"1d9c258c-3953-4116-8203-74400019183e","last_modified":1559867653993},{"schema":1559867619107,"derHash":"ucMHOq10s2iDL1SXlY4nmx0nd8r4hBcTsoqxCkuqCBA=","subject":"CN=DigiCert Document Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IERvY3VtZW50IFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"f147cd6f9b30e75b6857e07676867168a2183790b5061a3544fa187e9c41df4e","size":2263,"filename":"d1lOi04HgnJxWnVWramDVXKL69TmdcUrD0KFSyHCY7M=.pem","location":"security-state-staging/intermediates/8b2d6f14-b216-4dec-b3ae-6faa8dc57067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d1lOi04HgnJxWnVWramDVXKL69TmdcUrD0KFSyHCY7M=","crlite_enrolled":false,"id":"fcc7df4d-c24e-429a-bdf8-9b73dadce6d1","last_modified":1559867619903},{"schema":1559867617469,"derHash":"e0ZNw4T9saUlwswnntDHz60kvs9yxGp9cJPRV8IXYH4=","subject":"CN=JCAN Public CA1 - G4,OU=JCAN Public CA1 - G4,O=JIPDEC,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxHTAbBgNVBAsTFEpDQU4gUHVibGljIENBMSAtIEc0MR0wGwYDVQQDExRKQ0FOIFB1YmxpYyBDQTEgLSBHNA==","whitelist":false,"attachment":{"hash":"30c35cbb85ffebbe17e8f88a88493ac33ccc34dfc4b87197d625a66ab72e0a78","size":1959,"filename":"3tMZPGsnKWPtXhCY57EqxEpfZ4PjoCUq1LLWjhMG9I8=.pem","location":"security-state-staging/intermediates/8f3170db-bb69-4c39-a416-2be83ba51135.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3tMZPGsnKWPtXhCY57EqxEpfZ4PjoCUq1LLWjhMG9I8=","crlite_enrolled":false,"id":"19617ac9-88d7-4f7a-967f-f43305320ae5","last_modified":1559867618287},{"schema":1559867612590,"derHash":"lrL4CiPKaOPLUzisX2izeqwZ4vPAhu79SlNBsR6uUIM=","subject":"SERIALNUMBER=201902,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDI=","whitelist":false,"attachment":{"hash":"cbd7381d18982609b76855fd51bb7687605553c2c1995b88a61490857c5f2586","size":2337,"filename":"NU7LgS9pQbEK9tCUN7bjxgyP0twtIeis03XF3HkJgko=.pem","location":"security-state-staging/intermediates/fa6b4ebc-c0e3-4078-aec5-1bc0ea106000.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NU7LgS9pQbEK9tCUN7bjxgyP0twtIeis03XF3HkJgko=","crlite_enrolled":false,"id":"06a6e126-9df4-4e5a-a8a0-9e1d0340a8c1","last_modified":1559867613377},{"schema":1559867554956,"derHash":"YbrWiZIy9kFd4N6i1DTqTs3A8E7ztpDXyiPSfUa7BRU=","subject":"CN=Digi-Sign CA Digi-Code,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHMxCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR8wHQYDVQQDExZEaWdpLVNpZ24gQ0EgRGlnaS1Db2Rl","whitelist":false,"attachment":{"hash":"ea5ce76b51e50b3bb54759596ed823dbf7f69f7a27c63ed3c45189716ca0a3a7","size":2109,"filename":"5jhR4E5Gjr25Cvky8Qt5e4EoRerWxLnksVkkE5tu9uo=.pem","location":"security-state-staging/intermediates/63f428cb-1cd8-493c-a2d7-46ccf1d6edcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5jhR4E5Gjr25Cvky8Qt5e4EoRerWxLnksVkkE5tu9uo=","crlite_enrolled":false,"id":"6b150bfe-21b9-4e05-a6d9-1ecfadbf8d34","last_modified":1559867555756},{"schema":1559867552520,"derHash":"i8G51978yhzNCbrNqI8ndiCS8e1KNK5eRgK7nMkVxQY=","subject":"CN=GeoTrust DV SSL CA - G4,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"0ab32076e7222afcf3887c9ad0bcc8513aa15c6353f66bfec1ca95e57c3b215f","size":1540,"filename":"47vMpYDaFnUzDRQdNlsSppZ2DbMBfK5uwhBNakbz2n4=.pem","location":"security-state-staging/intermediates/457a8046-b1c4-40d2-866e-01d5c77d468d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"47vMpYDaFnUzDRQdNlsSppZ2DbMBfK5uwhBNakbz2n4=","crlite_enrolled":false,"id":"cd7ae099-d32b-48df-9cc0-5f040e73307f","last_modified":1559867553330},{"schema":1559867489166,"derHash":"J83Wmd4V7oigW7EO2d8vxeTKJbX91CmIljo47IlA1Vo=","subject":"SERIALNUMBER=10810700152,CN=Intesa Sanpaolo Organization Validation CA,OU=WSA Trust Service Provider,O=Intesa Sanpaolo S.p.A.,C=IT","subjectDN":"MIGeMQswCQYDVQQGEwJJVDEfMB0GA1UECgwWSW50ZXNhIFNhbnBhb2xvIFMucC5BLjEjMCEGA1UECwwaV1NBIFRydXN0IFNlcnZpY2UgUHJvdmlkZXIxFDASBgNVBAUTCzEwODEwNzAwMTUyMTMwMQYDVQQDDCpJbnRlc2EgU2FucGFvbG8gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"521f6ad8cf11723e0d6a63d6246310675e5590a80d8e44dac4de2ecee9be0a46","size":2958,"filename":"DZug655eTUjrJRXnExUEtKkFrsw9LgUACiAkLII7f2s=.pem","location":"security-state-staging/intermediates/ac398d21-7a9d-46bf-9fd1-971750487c1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DZug655eTUjrJRXnExUEtKkFrsw9LgUACiAkLII7f2s=","crlite_enrolled":true,"id":"cdcb922e-b3df-4980-a0fd-4e03c4069b46","last_modified":1559867489952},{"schema":1559867484297,"derHash":"zFt6Dl1ncbo0jT12N1LwZnAms1McU5btviStzpMhVyM=","subject":"CN=Entrust Code Signing CA - OVCS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSgwJgYDVQQDEx9FbnRydXN0IENvZGUgU2lnbmluZyBDQSAtIE9WQ1Mx","whitelist":false,"attachment":{"hash":"cfac676380794f70d7d94b6076893414ccd8e2cee343208d8b11e8ba2a0ecc68","size":1833,"filename":"ZKpNzfvWKu9J0YxLZCHZ7ZuSkFgadPTP6L772QDWNs0=.pem","location":"security-state-staging/intermediates/73affa8d-5765-4e6f-9c74-ce08b71fecb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZKpNzfvWKu9J0YxLZCHZ7ZuSkFgadPTP6L772QDWNs0=","crlite_enrolled":true,"id":"7894d85e-6a23-4249-bc0a-35e6df37cf77","last_modified":1559867485088},{"schema":1559867458908,"derHash":"pSJvM0dLUzkmZSmLSPTmEpgk6YvU04304x67zxT6M80=","subject":"CN=Cal INDEX CA,OU=Orion Health Direct Secure Messaging,O=California Integrated Data Exchange\\, Inc.,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEyMDAGA1UEChMpQ2FsaWZvcm5pYSBJbnRlZ3JhdGVkIERhdGEgRXhjaGFuZ2UsIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEVMBMGA1UEAxMMQ2FsIElOREVYIENB","whitelist":false,"attachment":{"hash":"34264be5346b44e8b15bc7137a26395abb6e18063abe3ee90589cd695348b957","size":2300,"filename":"9GtwDsjMtADoYOwb1RfJrsaX3bJbRRZHhkQATNIEJgs=.pem","location":"security-state-staging/intermediates/04188e49-53db-4da6-8a95-bdc1c98aa34a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9GtwDsjMtADoYOwb1RfJrsaX3bJbRRZHhkQATNIEJgs=","crlite_enrolled":false,"id":"71693213-c8af-4415-8506-ccbce004ca0d","last_modified":1559867459702},{"schema":1559867457298,"derHash":"0OOap9L6U1gQCKFdglxX0lvUkkeDRDH4oieinCgKHAw=","subject":"CN=Advanced Pseudonymous e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGKMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xLzAtBgNVBAMMJkFkdmFuY2VkIFBzZXVkb255bW91cyBlLVN6aWdubyBDQSAyMDA5MR8wHQYJKoZIhvcNAQkBFhBpbmZvQGUtc3ppZ25vLmh1","whitelist":false,"attachment":{"hash":"28e4ef20b258d0cd99dc8ed4bbb7f34994c1e6d05e6098c32453f0ff79651007","size":1776,"filename":"32Xpx0UBvg8xkUwG8UN0XoE1SdCOILkoXK07BeFi7sc=.pem","location":"security-state-staging/intermediates/75abdb27-3ceb-4f0f-8207-29811aa50f7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"32Xpx0UBvg8xkUwG8UN0XoE1SdCOILkoXK07BeFi7sc=","crlite_enrolled":false,"id":"c4f80d62-a618-4681-a631-871006820e7b","last_modified":1559867458091},{"schema":1559867439398,"derHash":"WzErfhG3DQfBTgq5nwjQB0iWYJjFKqhaBqCCK75ZoCw=","subject":"CN=Telia Domain Validation CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MFExCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEmMCQGA1UEAwwdVGVsaWEgRG9tYWluIFZhbGlkYXRpb24gQ0EgdjI=","whitelist":false,"attachment":{"hash":"e50f92a6a1126e1974b698dc74b5324cb74a1bf0a656d8fa21ae230568387c3f","size":2328,"filename":"gB4lDqs5uw6KjxweLgOqWfxNkncJhFCg7rB3hEJ4fvo=.pem","location":"security-state-staging/intermediates/8258df94-c3d1-471b-9fb1-34f2157ac923.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gB4lDqs5uw6KjxweLgOqWfxNkncJhFCg7rB3hEJ4fvo=","crlite_enrolled":true,"id":"52f5910f-78f9-4bc2-b611-367c69c58d8d","last_modified":1559867440189},{"schema":1559867436992,"derHash":"R1EWKfK8O3z4Tv7J8yeYpDr2JS5VC2yudqOFWHEuN9g=","subject":"CN=DigiCert High Assurance Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNzA1BgNVBAMTLkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEludGVybWVkaWF0ZSBDQSAoU0hBMik=","whitelist":false,"attachment":{"hash":"cefb259a9f513a1d4ee0dc081cff6c0050d8cc359ce9c5db5ac79bc7fe7b2b8e","size":2442,"filename":"3tMIKnnueOFiBfBxInvJjOJo4QLv6wmIUMfKgDFmgvs=.pem","location":"security-state-staging/intermediates/8607ec3d-cee7-41e3-9bf2-dce699146209.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3tMIKnnueOFiBfBxInvJjOJo4QLv6wmIUMfKgDFmgvs=","crlite_enrolled":false,"id":"7eeef585-e240-41af-81bb-b177c89b7b32","last_modified":1559867437775},{"schema":1559867432168,"derHash":"EYj4MclJpi6c1PYONvclRPCvkk3gf52pkuJuRMmW7uA=","subject":"CN=DigiCert High Assurance EV CA-2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTI=","whitelist":false,"attachment":{"hash":"b145b565a9904eaa02b6a72abb75193f832000fd38aeafaa780db87365ff2c14","size":2259,"filename":"xIR53dzZj47wArExuiNyNGwPlWUfxINMgw3ePpMqhtM=.pem","location":"security-state-staging/intermediates/3743430c-e300-4654-9602-bfdefe2354b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xIR53dzZj47wArExuiNyNGwPlWUfxINMgw3ePpMqhtM=","crlite_enrolled":false,"id":"78f96e89-32b4-40fe-af94-7cb1e85e9957","last_modified":1559867432960},{"schema":1559867405286,"derHash":"QyArnocGWZIfnaJu2p5Hv2mQ2wMaC8CyOvoeeWjtPpk=","subject":"CN=Rochester RHIO Intermediate CA,OU=Rochester RHIO HISP,O=Rochester RHIO,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Sb2NoZXN0ZXIgUkhJTzEcMBoGA1UECxMTUm9jaGVzdGVyIFJISU8gSElTUDEnMCUGA1UEAxMeUm9jaGVzdGVyIFJISU8gSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"870292cce395c5649329f68463094135ea65bace91ee902f32f937816f15274d","size":2190,"filename":"OQ7Veo7DPNU0rXuY4y1SzFyKRrZc4T0S8rWwrqbKPVQ=.pem","location":"security-state-staging/intermediates/6691c4dc-77ad-402f-a799-57f985d82c4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OQ7Veo7DPNU0rXuY4y1SzFyKRrZc4T0S8rWwrqbKPVQ=","crlite_enrolled":false,"id":"6c3aaa16-0a8b-42c2-9f23-e3180b8d9479","last_modified":1559867406096},{"schema":1559867394636,"derHash":"q0gNj31yChYclnGEPq3qqqvFRH79nvjzRwh02SfMuGE=","subject":"CN=Hewlett Packard Enterprise Collaboration CA G22,OU=Class 2 Managed PKI Individual Subscriber CA,O=Hewlett Packard Enterprise Company,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzErMCkGA1UEChMiSGV3bGV0dCBQYWNrYXJkIEVudGVycHJpc2UgQ29tcGFueTE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExODA2BgNVBAMTL0hld2xldHQgUGFja2FyZCBFbnRlcnByaXNlIENvbGxhYm9yYXRpb24gQ0EgRzIy","whitelist":false,"attachment":{"hash":"4be6df8ee06a84caf5b78062f1a42d87be4b1918f83ac5ea7795f5f93eb25506","size":2081,"filename":"cFn8YV7QznqAeNsQc3EMF3ITUowUDECD7omXX1kLh0E=.pem","location":"security-state-staging/intermediates/e4f4b248-458f-4d2e-87fc-272e282734b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cFn8YV7QznqAeNsQc3EMF3ITUowUDECD7omXX1kLh0E=","crlite_enrolled":false,"id":"2c51902b-f7f1-41a4-bb72-5618f37b1dbf","last_modified":1559867395440},{"schema":1559867368777,"derHash":"hu5KL5MTfKiIdnQHizlAcPGJswSd0tJAU66SkkJUxmg=","subject":"CN=SHECA RSA Time Stamp Authority G1,O=UniTrust,C=CN","subjectDN":"MEwxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEqMCgGA1UEAwwhU0hFQ0EgUlNBIFRpbWUgU3RhbXAgQXV0aG9yaXR5IEcx","whitelist":false,"attachment":{"hash":"fdc548ebeba5d0a525e38967a6ebcf6047b11e25ea4b1a9b19e976873339445d","size":1991,"filename":"ksHDA5DDxQ9GXo8e3jhl08TIZyMS1ynjRcsLB6SLRH8=.pem","location":"security-state-staging/intermediates/e726ca51-983e-49a8-a4fc-fd76141f0092.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ksHDA5DDxQ9GXo8e3jhl08TIZyMS1ynjRcsLB6SLRH8=","crlite_enrolled":false,"id":"5518046d-1529-4ce9-94ef-3cf0e4622489","last_modified":1559867369577},{"schema":1559867329817,"derHash":"l9J2xf3y3JRTmrueF7w5lXMM1Rc56ulbD2eznpmQXxE=","subject":"CN=INTEGRIS Direct Intermediate CA,OU=INTEGRIS DIRECT Messaging HISP,O=INTEGRIS,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhJTlRFR1JJUzEnMCUGA1UECxMeSU5URUdSSVMgRElSRUNUIE1lc3NhZ2luZyBISVNQMSgwJgYDVQQDEx9JTlRFR1JJUyBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"3f8040fd714dac482df84f0d9e6f2c8de009105ca26473f8a3c3447ed69c8154","size":2198,"filename":"VIqwZkD738CQKqG0EwMQGMJq2KPiGa3oaemfSdZMHQU=.pem","location":"security-state-staging/intermediates/bc855478-972a-4e0c-a292-8e721c232afc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VIqwZkD738CQKqG0EwMQGMJq2KPiGa3oaemfSdZMHQU=","crlite_enrolled":false,"id":"bb561a33-9fcd-4d7a-aa33-413a7f86d171","last_modified":1559867330632},{"schema":1559867302256,"derHash":"BPehwRJgflk5KP7HhsxgIb1uvZUAHxxpO4xLOE6xn2o=","subject":"CN=TrustSign BR Certification Authority (DV) 2,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoRFYpIDI=","whitelist":false,"attachment":{"hash":"c0b20fc2f58fbdde9863a50434876955a72362820cb00b3c4b28524916c15ae3","size":2247,"filename":"BWKUCA6WpdRrjXTT5uzsuXJ6Gb81wQGRLjW5bslnp7k=.pem","location":"security-state-staging/intermediates/57ae4bf8-97bc-4406-a91c-b9050a07787e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BWKUCA6WpdRrjXTT5uzsuXJ6Gb81wQGRLjW5bslnp7k=","crlite_enrolled":true,"id":"2e0e37b3-09ed-4d09-9512-e4f61413080c","last_modified":1559867303051},{"schema":1559867247253,"derHash":"t6ivKkpD8KhrFWBN5kYSCcnNdolNiwdIvJnZp5cBO7A=","subject":"CN=thawte SSL CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xGzAZBgNVBAMTEnRoYXd0ZSBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"c454ede86932cb7288384504fd67f0db2369a6367c8a2aa8310001339c7f976a","size":1687,"filename":"aR6DUqN8qK4HQGhBpcDLVnkRAvOHH1behpQUU1Xl7fE=.pem","location":"security-state-staging/intermediates/ae73053a-5449-4b9b-904d-11588789fc75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aR6DUqN8qK4HQGhBpcDLVnkRAvOHH1behpQUU1Xl7fE=","crlite_enrolled":true,"id":"a1f2fc0b-8850-43fc-8db2-3f9e546df871","last_modified":1559867248041},{"schema":1559867226214,"derHash":"9kJBjk0MY97Hhclg76aLp0XziFF0TvgfIly4kwUxTVA=","subject":"CN=GlobalSign Timestamping CA - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTM4NCAtIEc0","whitelist":false,"attachment":{"hash":"a6ba61ac5f4cc0f9765d5d0f0def7f6c14969571829df90422bff82e1730c78b","size":2259,"filename":"bxL2hYprHPwXRcMzTOZMDGOgJ8V36UngBYWMNmpyTUA=.pem","location":"security-state-staging/intermediates/0431a6e2-dcab-4cb9-905c-49a692134a41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bxL2hYprHPwXRcMzTOZMDGOgJ8V36UngBYWMNmpyTUA=","crlite_enrolled":false,"id":"ef392ac2-e86d-44ea-9ba4-44c1128fd89f","last_modified":1559867227001},{"schema":1559867193847,"derHash":"B0hA46Z9zSYAtrAE4Rh6yAvf6JbK9JPflMw9mjymiBQ=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"45844bd66bf712d05a01885a5ed8fe191938dc90ceb1c6bb05a732c72ec77002","size":1703,"filename":"ffKwXiiyZfl8ltFLZ9k5urWtoCKNBNklL8cqiHHZUUQ=.pem","location":"security-state-staging/intermediates/c5276bf0-c900-4b43-8dd3-e46484423040.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ffKwXiiyZfl8ltFLZ9k5urWtoCKNBNklL8cqiHHZUUQ=","crlite_enrolled":false,"id":"c4144e37-5fca-4438-94df-2524de197266","last_modified":1559867194628},{"schema":1559867189046,"derHash":"FVSRh0kDFPUXdkHwvrMmNKoSMOss8sKK2cc5FPsYq6A=","subject":"CN=GlobalSign ECC384 EV SSL CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEVDQzM4NCBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7761a3e40e444b8b7f00e4e6441a2b460b5e4ae76245aa2678f0336e0e77d193","size":1150,"filename":"MjwImBXGPClGSmdJpCliwmnLG4rkiw8r8qhz04EBHZc=.pem","location":"security-state-staging/intermediates/3237ec26-03ed-426d-8bbb-f3fa278bb2fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MjwImBXGPClGSmdJpCliwmnLG4rkiw8r8qhz04EBHZc=","crlite_enrolled":false,"id":"353fb3cf-1f87-44ed-b343-5cb7de582468","last_modified":1559867189833},{"schema":1559867180142,"derHash":"x7V6Avk3rgvj4hAnAwWSydR6cNcBPrOqlNvDt7WrBmI=","subject":"CN=GeoTrust Extended Validation SSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"bbcdd9edbc938bb3f1c719ebf87a28c4a802a927298570655845e0d44a1d420f","size":1654,"filename":"Kd5qpztW2P94BhrmO1KRqfDixvm8E3VliyctI5P6oks=.pem","location":"security-state-staging/intermediates/6cd04e7b-d31a-4806-8481-dc02856dc1a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kd5qpztW2P94BhrmO1KRqfDixvm8E3VliyctI5P6oks=","crlite_enrolled":false,"id":"44491442-f7d8-45f4-8fa7-6e193c6865c9","last_modified":1559867180939},{"schema":1559867069047,"derHash":"BCEZUzoNtnjQMEJn359fHfGXlR4C9eXbLmCgFlgC4h4=","subject":"CN=TERENA Code Signing CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIENvZGUgU2lnbmluZyBDQSAy","whitelist":false,"attachment":{"hash":"5a4b2dc41430a1c37846768f9ed9f04a7107d359857715f5554bd632169998ee","size":2101,"filename":"G7K9EGaf5R7AraL3XsZSjPH6XvzQTbq95skwp70Gnx4=.pem","location":"security-state-staging/intermediates/c5775c4d-5958-4b2b-83ff-e5631228bb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G7K9EGaf5R7AraL3XsZSjPH6XvzQTbq95skwp70Gnx4=","crlite_enrolled":false,"id":"a366d93c-802b-490b-b7a2-ece154bf2242","last_modified":1559867069830},{"schema":1559867055312,"derHash":"9x2jKCMcMNfjwFnGJhQj0QxP8sjrkuuQk6XZr3Fgq1U=","subject":"CN=Democritus University of Thrace CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLjAsBgNVBAMTJURlbW9jcml0dXMgVW5pdmVyc2l0eSBvZiBUaHJhY2UgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c43aa72137f3367b18b9c9cdb80ca11d2b08d6aba913f5f508664257f1537f20","size":2536,"filename":"gPfhVfTSpL0dgTS2T3BMSUxNDeNWIjEDX2cYu3mNZOA=.pem","location":"security-state-staging/intermediates/daaa7c64-7a3f-43f5-96ea-26752c457e1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gPfhVfTSpL0dgTS2T3BMSUxNDeNWIjEDX2cYu3mNZOA=","crlite_enrolled":true,"id":"9a504e2c-d2ab-45f2-85da-d3bbb9ae038c","last_modified":1559867056099},{"schema":1559867028528,"derHash":"opwQSxAMOnkzRz5i5L5jcdZToWBNBO2q0CyVgGBlzuM=","subject":"CN=Advanced eIDAS Class2 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGHMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExLzAtBgNVBAMMJkFkdmFuY2VkIGVJREFTIENsYXNzMiBlLVN6aWdubyBDQSAyMDE2","whitelist":false,"attachment":{"hash":"bcff9a806f140a24db8d80fb25e53c8830ceeeeaad81257e333c72d97c0070d8","size":2597,"filename":"cnBaSiDjhxiyXuUvokBKGtmAg7IeqDnVkrWBvwTBrJU=.pem","location":"security-state-staging/intermediates/9fcf94ff-9fb8-4a24-a227-cc9c133af787.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cnBaSiDjhxiyXuUvokBKGtmAg7IeqDnVkrWBvwTBrJU=","crlite_enrolled":false,"id":"312fdb56-c1ae-466b-92aa-cce0b03303a3","last_modified":1559867029341},{"schema":1559867026115,"derHash":"TZYa7g0t0K30M7SqwmHOWHFmXPOfyhtIOK5mINpoUEY=","subject":"CN=HARICA Qualified Natural Entities ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGdMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE3MDUGA1UEAwwuSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIEVDQyBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"c5cfa630e56da489c7904c80eb445823e31980801b41160832fdce4a344a2109","size":1418,"filename":"cnhqpBVFEnKDZQ8sXe9NIGzIRWdFqCxZ68tJNsX30s0=.pem","location":"security-state-staging/intermediates/5540f483-9acf-43cb-991a-4867bc3a6abc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cnhqpBVFEnKDZQ8sXe9NIGzIRWdFqCxZ68tJNsX30s0=","crlite_enrolled":false,"id":"71f797a0-3380-4843-9f9a-7aba5ecb9a32","last_modified":1559867026905},{"schema":1559866996817,"derHash":"kUfDjgO0bIzl3dsCyqKTLx4WdcCgAVKRODNu0Q2ZmDo=","subject":"CN=COMODO RSA Domain Validation Secure Server CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDM=","whitelist":false,"attachment":{"hash":"3ba031befb11cb2e743b864c59c22110bcfd40f33272315977867894ca4b1fa5","size":2158,"filename":"InQsVwxFxCARGa9oRQJcZVg2VPAXkUYSVkDc3jhuVUM=.pem","location":"security-state-staging/intermediates/ea43abf3-9b67-42be-94ae-a65fa4d80a69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"InQsVwxFxCARGa9oRQJcZVg2VPAXkUYSVkDc3jhuVUM=","crlite_enrolled":false,"id":"d35555ee-80e5-40db-a2ef-82628963df98","last_modified":1559866997668},{"schema":1559866987126,"derHash":"Ak8WKx0J9qCGjDi0yLQlfB7qbFoxWJQW1SDPFiSRfrM=","subject":"CN=.NET Foundation Projects Code Signing CA,O=.NET Foundation,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw8uTkVUIEZvdW5kYXRpb24xMTAvBgNVBAMTKC5ORVQgRm91bmRhdGlvbiBQcm9qZWN0cyBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"fd0dab3f4c0a11b4e19fa79479ab2bfa7f47262b7b73263a5fdd5c73368352dd","size":1642,"filename":"OosLbidguElYKU6vSGfwNmwHxjVMbSr5S9pcbc5E6I0=.pem","location":"security-state-staging/intermediates/61ff11b3-dfff-4ceb-b1d4-cfc06f31e971.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OosLbidguElYKU6vSGfwNmwHxjVMbSr5S9pcbc5E6I0=","crlite_enrolled":false,"id":"05e74429-ac3c-4843-b05d-b405a1eebf3d","last_modified":1559866987914},{"schema":1559866984705,"derHash":"EdkzDRojmFCN1Q0wlOsosbRJANmSj4wisl73p4G9tAM=","subject":"CN=SecureTrust Organization Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGCMTgwNgYDVQQDEy9TZWN1cmVUcnVzdCBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"2fbb26d89a7df4499089ee4d2d7d54042f375261e865316c51caa6ea3d367c5f","size":1642,"filename":"naxobvdvRxrUbxomHwj81l5L4m0vZobqUIuxo5hwUQY=.pem","location":"security-state-staging/intermediates/db3a6f95-518e-4c87-a822-e3be67b873a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"naxobvdvRxrUbxomHwj81l5L4m0vZobqUIuxo5hwUQY=","crlite_enrolled":false,"id":"0446d2af-40a8-49d1-b3fe-9e83881afe72","last_modified":1559866985488},{"schema":1559866981460,"derHash":"70R46wlMSPuf6soJc2JwSZylLrBOP47kwbLtyZYDmP0=","subject":"CN=AlwaysOnSSL CA - G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGIxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTQWx3YXlzT25TU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"1040fe16193b9f02fff18e80e4c535f43ee66775f4e96c4201662bd96f48aa79","size":1882,"filename":"YtTxIzDWQbqdohOzNgNqrqMUDSKPiJZV2NK7zUOskPo=.pem","location":"security-state-staging/intermediates/c40d000c-7f78-42cf-9cf1-975d8ebb0b77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YtTxIzDWQbqdohOzNgNqrqMUDSKPiJZV2NK7zUOskPo=","crlite_enrolled":false,"id":"c979bd2e-d167-46e9-8799-de7753f057f0","last_modified":1559866982272},{"schema":1559866974197,"derHash":"W7I4LSDgmuVrTzpRV4OPe65J5C485TSE1m7rLAdH70o=","subject":"CN=GlobalSign Extended Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTgwNgYDVQQDEy9HbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBTSEEyNTYgLSBHMg==","whitelist":false,"attachment":{"hash":"3497281a6231e63615ec1be2b86c286a4a28fe2dd8a949446fcda3829105d665","size":1573,"filename":"LvRiGEjRqfzurezaWuj8Wie2gyHMrW5Q06LspMnox7A=.pem","location":"security-state-staging/intermediates/8908cf91-36bb-46af-a060-a0d350cf371a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LvRiGEjRqfzurezaWuj8Wie2gyHMrW5Q06LspMnox7A=","crlite_enrolled":false,"id":"422c153b-2663-4f06-8d24-a04ce31d1da3","last_modified":1559866974990},{"schema":1559866972593,"derHash":"3SM1XGHVmXBCMARyl5XK73ev2zl2enlXQNTgTLYVipk=","subject":"CN=SecureTrust Extended Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MH4xNDAyBgNVBAMTK1NlY3VyZVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExFDASBgNVBAoTC1NlY3VyZVRydXN0MRAwDgYDVQQHEwdDaGljYWdvMREwDwYDVQQIEwhJbGxpbm9pczELMAkGA1UEBhMCVVM=","whitelist":false,"attachment":{"hash":"d0105c5ecad0b2ab41480518899e2653e240f06b4a8927ca3d5283c60f63c72e","size":1634,"filename":"DfrsmfuM5QjUozBeqZ75qybJwEDwRIG64DTyM3Kx5Wg=.pem","location":"security-state-staging/intermediates/b46f9bc3-cb55-4302-b52b-e519808c0128.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DfrsmfuM5QjUozBeqZ75qybJwEDwRIG64DTyM3Kx5Wg=","crlite_enrolled":false,"id":"110bade2-6494-40e6-869c-71f45a348718","last_modified":1559866973381},{"schema":1559866970155,"derHash":"zx6hXcnAWrxyrw5ixI2TQ0rgJxsapDGL41RBJtJLYYQ=","subject":"CN=Certum Extended Validation CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGCMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQDEx1DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"e34ed85d8f7cd8d8572bc535cef388fdeca726b0b1f570db12ecb2c658c3cfaf","size":1727,"filename":"M9jfvUTOEXqakcClNZh0xICWc12quCpR9R8l41FetpI=.pem","location":"security-state-staging/intermediates/aa0b4687-ec1c-483c-878f-31363ebb0565.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M9jfvUTOEXqakcClNZh0xICWc12quCpR9R8l41FetpI=","crlite_enrolled":false,"id":"52a1bed3-2ae3-4c96-8566-936ef8a25df3","last_modified":1559866970939},{"schema":1559866925659,"derHash":"PUUR0KgKqUmm2ZslOhc0cXl8RFkYemMp5zbDfLVJPkY=","subject":"CN=emSign ECC Device CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEiMCAGA1UEAxMZZW1TaWduIEVDQyBEZXZpY2UgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"01af63ee9e2b37ec4c8865ff21ae0e4cdb096992d7907932ef24acf8eedfdc46","size":1098,"filename":"bpFe8tgoaUQ4GlAAa0fUVmVkLEKAO1rs9xELs8ndVnE=.pem","location":"security-state-staging/intermediates/1d4a8c13-e9b9-41ba-ab80-6e38c400e23f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bpFe8tgoaUQ4GlAAa0fUVmVkLEKAO1rs9xELs8ndVnE=","crlite_enrolled":false,"id":"e7091d6a-54ab-4e1a-ace6-0cf33cabe180","last_modified":1559866926464},{"schema":1559866729252,"derHash":"CtanM0paI8mGmA9v7NJQBrVjoLbxvKplwDRbotlpKNM=","subject":"CN=SGN FISGLOBAL PUBLIC CA,OU=Class 2 Managed PKI Individual Subscriber CA,O=Fidelity National Information Services\\, Inc.,C=US","subjectDN":"MIGdMQswCQYDVQQGEwJVUzE1MDMGA1UEChMsRmlkZWxpdHkgTmF0aW9uYWwgSW5mb3JtYXRpb24gU2VydmljZXMsIEluYy4xNTAzBgNVBAsTLENsYXNzIDIgTWFuYWdlZCBQS0kgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSAwHgYDVQQDExdTR04gRklTR0xPQkFMIFBVQkxJQyBDQQ==","whitelist":false,"attachment":{"hash":"0abf8df1e687f2286bcfbc92d9bfc4d0d5a85f3deab34f15b0928b32afd8f3c5","size":2064,"filename":"tjF4OWI3FI1EgkyujCVcvW3y0P7Ff83RiLHthEN0kg4=.pem","location":"security-state-staging/intermediates/2f6e2f02-425a-4545-a425-4709a1bf2225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tjF4OWI3FI1EgkyujCVcvW3y0P7Ff83RiLHthEN0kg4=","crlite_enrolled":false,"id":"25fce179-8c18-4b02-96e2-d10b51c7103d","last_modified":1559866730048},{"schema":1559866635925,"derHash":"eKle2CGAocM6nzTtt15ndP1Ltzqix8QSFFPdtifbG68=","subject":"CN=GeoTrust Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGEdlb1RydXN0IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0ebb76cc437a4875e1965d802d1ef4116c3f64f24eec194afb86a70ad1667e59","size":1869,"filename":"W2U41SQHEtuuIcPdtOMy4IlYKK8SkwxCszZpM88De1Y=.pem","location":"security-state-staging/intermediates/c65c285e-2d6e-46de-95f1-d00412600e1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W2U41SQHEtuuIcPdtOMy4IlYKK8SkwxCszZpM88De1Y=","crlite_enrolled":false,"id":"29f9902f-3092-43f3-9002-cb3213388a72","last_modified":1559866636749},{"schema":1559866615732,"derHash":"0fJlasg4JzmjsIfEerXKuUWjLxYrYUnDCHg8fgaviug=","subject":"CN=TeliaSonera Email CA v4,O=TeliaSonera,C=SE","subjectDN":"MEUxCzAJBgNVBAYTAlNFMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEgMB4GA1UEAwwXVGVsaWFTb25lcmEgRW1haWwgQ0EgdjQ=","whitelist":false,"attachment":{"hash":"50a551c554a5b7ee132109ae7bf90dc4b34f3526462e40e5e30612608a8a6257","size":2528,"filename":"t0Th3Tcrbh3qBKdPTiMoiViMapdZEGG29yWyhWFOnu8=.pem","location":"security-state-staging/intermediates/a4ac8e27-46ae-4971-8848-eb9b6cfdfa8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t0Th3Tcrbh3qBKdPTiMoiViMapdZEGG29yWyhWFOnu8=","crlite_enrolled":false,"id":"f80be745-7d54-490b-8882-57a4fbcdda3f","last_modified":1559866616522},{"schema":1559866583346,"derHash":"3GxErIo81cNFEnP0QxUmsu9mYGLudjJYqSj2C9COOf4=","subject":"CN=GlobalSign ECC384 SSL CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQzM4NCBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e381db75fa5b615dfa1e287a661d1ef2ff0990637741a94dcc8712b342a4f1a8","size":1146,"filename":"LhF0h0iYJokyuUHZnRxfXT7YSYW3qA1meoPEmJTNIfU=.pem","location":"security-state-staging/intermediates/b8ef29b4-3d13-4379-ac25-f77f41bfebe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LhF0h0iYJokyuUHZnRxfXT7YSYW3qA1meoPEmJTNIfU=","crlite_enrolled":false,"id":"21d88639-9ac9-4590-834c-f2ca7f76d6a7","last_modified":1559866584144},{"schema":1559866569358,"derHash":"aZ1Ut0gqXTKTMeoEFcwu3NYP2gHRnnHQVBlrzgZ3c1w=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"2503aecef7682dc86265404bb3212730e5bfa9316dbc827331274d72deee9383","size":1634,"filename":"19e9lxa6ojidVP5dVZZuTl4VDK62HtqIUx9aA4Kc3aw=.pem","location":"security-state-staging/intermediates/d382ff16-ea91-4cd3-a050-90c8d6613505.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"19e9lxa6ojidVP5dVZZuTl4VDK62HtqIUx9aA4Kc3aw=","crlite_enrolled":true,"id":"018fd818-2416-4ecf-bd00-0eae97797a59","last_modified":1559866570149},{"schema":1559866548393,"derHash":"2eDGSrJ6ZNeczPQqNOx1olGn5UM1PBnphKcOsvVGzf8=","subject":"CN=GeoTrust SHA256 SSL CA,O=GeoTrust Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR8wHQYDVQQDExZHZW9UcnVzdCBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"41395f394b5b7a1a1e7b37a2168f0c8b0544a4478ce5c008e2b0663391ae26c1","size":1715,"filename":"PuXtzNBJoFElmIPIBszvOE5GbIMi7uXkODinPrxfy5U=.pem","location":"security-state-staging/intermediates/52586f92-f320-4c76-aaa4-6210328fc3c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PuXtzNBJoFElmIPIBszvOE5GbIMi7uXkODinPrxfy5U=","crlite_enrolled":true,"id":"af213913-9965-48ef-8e0e-aed1b914c7c8","last_modified":1559866549194},{"schema":1559866541061,"derHash":"94rk1tq8dGQEkKrjY3V3p3LjzCffMiuWnDCXlVf1kg0=","subject":"SERIALNUMBER=201809,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA5","whitelist":false,"attachment":{"hash":"d046cdd580c6ff2d0057e1c6da6748bdb7c41b15d2ac26075435915b2a31a78e","size":2333,"filename":"fjrmK24DSG4huN9mrwx93lBvNqivEcAx2KuPtpwutKQ=.pem","location":"security-state-staging/intermediates/a1046294-5e59-48a1-aff1-9aa052f00742.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fjrmK24DSG4huN9mrwx93lBvNqivEcAx2KuPtpwutKQ=","crlite_enrolled":false,"id":"4ab2e721-a85d-44aa-9af2-f0c18f2c3671","last_modified":1559866541896},{"schema":1559866535109,"derHash":"UVh8hnv2bzXs5VSgjgpBwTuLvZtZ0mLSBKcDCaZyvuY=","subject":"CN=QuoVadis QVRCA1G3 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTFHMyBTU0wgSUNB","whitelist":false,"attachment":{"hash":"461a8ce2869e6d66752413bc1efe37ae1166b3ddb02f5fd89ee6f16b8ab72340","size":2381,"filename":"qHlqfHd5vL1EFqEmnKfLFiwdoWaMNSlifKAdh9Bgr6g=.pem","location":"security-state-staging/intermediates/796036c7-0924-44a1-8f29-5c91b93cfd73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHlqfHd5vL1EFqEmnKfLFiwdoWaMNSlifKAdh9Bgr6g=","crlite_enrolled":true,"id":"8983e814-f99a-4bfe-b043-6a5194bef244","last_modified":1559866535949},{"schema":1559866454656,"derHash":"16BtRir8gNcRg9lKOYstzIJYNefGbaXkVAVXLwSwWl0=","subject":"CN=Actalis Domain Validation Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGQMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcy","whitelist":false,"attachment":{"hash":"0199eefe8b3b2e90fd118ce82599499a60c5ed728bed0078537ce1245a0de359","size":2320,"filename":"MmeNHRDuDHyx0vNfPkV0ZBTuO5ScnOMjw2AkNv1Fs0c=.pem","location":"security-state-staging/intermediates/9ddd3d98-2360-458a-af24-f87fae1c19de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MmeNHRDuDHyx0vNfPkV0ZBTuO5ScnOMjw2AkNv1Fs0c=","crlite_enrolled":true,"id":"fe4ab240-fcee-45f1-b8d0-1b25ebe22007","last_modified":1559866455447},{"schema":1559866449762,"derHash":"vRk8R15OZ5OL7zQSK5i1WKKILn7ZQ2mmywETIO8VYjw=","subject":"CN=AlwaysOnSSL TLS ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIEVDQyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"499064f03f4574c2c427e17330ae382a5058acecff6c7f5b7cbdc36b9933961b","size":1175,"filename":"0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=.pem","location":"security-state-staging/intermediates/3d30c347-f98b-4558-b56e-baf0b4674e1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=","crlite_enrolled":false,"id":"6362cd69-7d81-45cb-a636-f824de74bb36","last_modified":1559866450581},{"schema":1559866428654,"derHash":"81DahhtR0XBWfbzg3nv2a7M0DfxFliFjENRmK8HeoFg=","subject":"CN=CertAssure RSA Code Signing CA,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEBxMIU2FuIEpvc2UxGDAWBgNVBAoTD0NlcnRBc3N1cmUgSW5jLjEnMCUGA1UEAxMeQ2VydEFzc3VyZSBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"d08d74bc10327226964aa652c768fce52a6591a2b4862e85a9d609f39ca1042b","size":2105,"filename":"weu0ISLSXTD6wlo6q1m3T52id0ynkK2BySe0U6d6YY0=.pem","location":"security-state-staging/intermediates/381e9263-c700-4217-b439-38ec819aa09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"weu0ISLSXTD6wlo6q1m3T52id0ynkK2BySe0U6d6YY0=","crlite_enrolled":false,"id":"a9831a62-e083-46ea-bf4e-f22664378357","last_modified":1559866429443},{"schema":1559866415399,"derHash":"mUQsj4OjxQkMpQwcCx3ksy7UGP8Kp8MkDpEjAVnz578=","subject":"CN=GDCA TrustAUTH R4 IV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IElWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"c9c27dde9ab53fa7533998d21fe575c8d337e49fedce536ed71cebe74d6a82cb","size":2052,"filename":"h9ljtPIsvf1wnqfE3LU5OJSEC20BaNan3CxC8wbqBnI=.pem","location":"security-state-staging/intermediates/b5bec3ea-ca92-493c-af9a-8fe3ef022434.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h9ljtPIsvf1wnqfE3LU5OJSEC20BaNan3CxC8wbqBnI=","crlite_enrolled":false,"id":"ae50a764-96b4-4d80-b152-ecb7f2d01363","last_modified":1559866416201},{"schema":1559866398418,"derHash":"Xey2HOk6UEC1tqToEdDlxuDxYW4MiZB3hlAUT7EdJXw=","subject":"CN=YourNet SSL for business,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEsxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSEwHwYDVQQDExhZb3VyTmV0IFNTTCBmb3IgYnVzaW5lc3M=","whitelist":false,"attachment":{"hash":"9280f070bd7ccd133be66b2af02627550abac320372a484ed962540661f58759","size":1492,"filename":"qnqdzr4K7xpxYew1TDa1ckxZsejonO8Q8GR4TeQmBYw=.pem","location":"security-state-staging/intermediates/0656eeb9-3387-4f80-bf11-98daf8e669e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qnqdzr4K7xpxYew1TDa1ckxZsejonO8Q8GR4TeQmBYw=","crlite_enrolled":false,"id":"2df52334-2163-4a35-bb33-5f7f57df2d91","last_modified":1559866399208},{"schema":1559866372407,"derHash":"T9b6UnFX7qRjaJ16TCuTTvIiJ5clQTiT2YRyQshcqd8=","subject":"CN=SHECA RSA Extended Validation Server CA,O=UniTrust,C=CN","subjectDN":"MFIxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEwMC4GA1UEAwwnU0hFQ0EgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VydmVyIENB","whitelist":false,"attachment":{"hash":"b58523d4da82d8049eb9b4115799b963aab05526caa6f6e0040ca88e05ad2be8","size":2012,"filename":"dSFJXz4vHOWleaG1OgAbLF3rUHbSM2AR6Viu9xdSol8=.pem","location":"security-state-staging/intermediates/ca826164-049f-4c05-91f0-9b1e9243437b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dSFJXz4vHOWleaG1OgAbLF3rUHbSM2AR6Viu9xdSol8=","crlite_enrolled":true,"id":"346f5cdb-b18d-404b-86c1-ae1ab80747f8","last_modified":1559866373200},{"schema":1559866343126,"derHash":"FUxDPEkZKcXvaG6DjjI2ZKAOag2CLMyVj7TasD5JoI8=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"6edb4a81fe4f8f9a18de8035d87dad2c701e2cc7fc5ce3832cbdce4468bd31f3","size":1646,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/2dade068-5ff0-4ce7-9d2b-b1fca06fd9e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"e8a303db-012e-4b10-88d9-69dca19e2f97","last_modified":1559866343924},{"schema":1559866340662,"derHash":"bQvW4awOw5juhTeQbZjzePx6tJweKWryMzdPpaJx2zQ=","subject":"CN=Symantec Class 3 Admin Intermediate Certificate Authority,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgQWRtaW4gSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"cb4c35653304cbbfbea275d095cbd84d649442d21ab4c00b648177f91feb4d65","size":2194,"filename":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=.pem","location":"security-state-staging/intermediates/353215d3-c3a1-49c1-ba8b-cb6140386874.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=","crlite_enrolled":false,"id":"366de8fc-cf57-431a-ba80-da16e22073d1","last_modified":1559866341455},{"schema":1559866293718,"derHash":"7gIE40wLTUXMg5zzuQFc7slGo2Yc8r8QlyM5Qmxg6Ak=","subject":"CN=SECOM Passport for Member PUB CA10,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGNMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSswKQYDVQQDEyJTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTEw","whitelist":false,"attachment":{"hash":"d95bc4e2ec72de93175628906114d8bd0f3ff59ffce75734d73b793fa608330a","size":1727,"filename":"XDUzAHVq4IiaHQw3QSgU1eRxAmLfVjwgS3LDYc5B1Rs=.pem","location":"security-state-staging/intermediates/2f5b94f0-6f0d-4e3d-b050-b1bff1646988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XDUzAHVq4IiaHQw3QSgU1eRxAmLfVjwgS3LDYc5B1Rs=","crlite_enrolled":false,"id":"fdb09588-35e0-4e80-b131-9a36bdcb8201","last_modified":1559866294504},{"schema":1559866270982,"derHash":"EoYXPm8BAve90ywvgwkQlTSJvyLBYpXYTdkKPaE3Fko=","subject":"CN=COMODO SHA-2 Pro Series Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDExMC8GA1UEAxMoQ09NT0RPIFNIQS0yIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"854a130598ea11463a70a791d66099b64bccbb45f4ed76af30c587e4646f7d96","size":1707,"filename":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=.pem","location":"security-state-staging/intermediates/9b47dd14-9620-411c-bf2a-407266084564.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=","crlite_enrolled":true,"id":"6f99857c-e0a6-49e1-9764-895a594d08cd","last_modified":1559866271774},{"schema":1559866232465,"derHash":"TApYiMNKoBt0X066JoaWssyz9KoxyO3LOv6PqEy3TME=","subject":"CN=iShare Medical Direct Intermediate CA,O=iShare Medical,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5pU2hhcmUgTWVkaWNhbDEuMCwGA1UEAxMlaVNoYXJlIE1lZGljYWwgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"16347dce0fe6fabddcac6b1ee3422faca2c7a11714ff833f84a2a28c0cd1e616","size":2166,"filename":"yCqFvFSoWlrlSkhYTl28RzjG38okJneuXy8b6cUfEV0=.pem","location":"security-state-staging/intermediates/b7278ac4-4783-40b3-8817-affe98a900a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yCqFvFSoWlrlSkhYTl28RzjG38okJneuXy8b6cUfEV0=","crlite_enrolled":false,"id":"290cdd36-d7c6-4c5b-aaee-b3f6b84c3e6b","last_modified":1559866233281},{"schema":1559866219394,"derHash":"qMCpKw2Q6CFszKNMGhaDs060dY1GDIksqMUSqKKswI8=","subject":"CN=Hostpoint RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MF4xCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRkwFwYDVQQDExBIb3N0cG9pbnQgUlNBIENB","whitelist":false,"attachment":{"hash":"bd0b77e1ad7c766478cf2792f2390fc6dbc81b708a0c71c36c53e208635a60a4","size":1670,"filename":"KdhTtQeOQpuAPS1eltTuWsDPY1eewAMFmlvc5UIbk4k=.pem","location":"security-state-staging/intermediates/b3c11b52-e6f8-45e1-ae00-9da7044abefc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KdhTtQeOQpuAPS1eltTuWsDPY1eewAMFmlvc5UIbk4k=","crlite_enrolled":false,"id":"62c93f86-ae45-4b99-a827-2170f2416255","last_modified":1559866220196},{"schema":1559866176457,"derHash":"GUzCtbBkk8DvCwqfqDdvlYviQqJ0ral0rLyRAjNoeNw=","subject":"CN=DOMENY SSL DV Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGEMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMS4wLAYDVQQDEyVET01FTlkgU1NMIERWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"4ae7713a7c33e45405293b35aa867f795213ba9becc489f35146c71f51673521","size":2154,"filename":"c4Z4xm0MVOlxzaOy4OXC86lTgsofdZML4CYOmaSpWYM=.pem","location":"security-state-staging/intermediates/8ecc0bf4-31de-41ef-b195-d3d4e799c302.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c4Z4xm0MVOlxzaOy4OXC86lTgsofdZML4CYOmaSpWYM=","crlite_enrolled":true,"id":"d5ea596c-6fe9-45d3-84b0-0f1eb9ea2b08","last_modified":1559866177285},{"schema":1559866168360,"derHash":"znrcGXdXpS5pogFMzgPZgGMlAnZHQsKSPXOAVo4hAKY=","subject":"CN=E-Tugra Extended Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJjAkBgNVBAMMHUUtVHVncmEgRXh0ZW5kZWQgVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"12ff7eb3fc7ad0d030464cfca8808d4239fab2f60c03f47a3f76ec1c962d10f8","size":2296,"filename":"CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=.pem","location":"security-state-staging/intermediates/b4924736-081c-4006-83d9-18747abe70b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=","crlite_enrolled":true,"id":"7c935540-4c03-4352-b768-16756b45aed8","last_modified":1559866169149},{"schema":1559866096673,"derHash":"pUK8oJxeRXnGGXdK5ZCCvOD4bSYcWnpaD2IXwQJ56nw=","subject":"CN=DigiCert SHA2 Assured ID CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQQ==","whitelist":false,"attachment":{"hash":"4e3c1ebfbeec02bf731c95b85a98fa732e6965367dac4484c3c1874f56b577ca","size":2247,"filename":"KFZYqX5VzrLyLTGNVQGlkHRFKrLkZ3UddPIGfeE7tKI=.pem","location":"security-state-staging/intermediates/73e8da81-d69e-4de2-ac9b-c40d075bd421.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KFZYqX5VzrLyLTGNVQGlkHRFKrLkZ3UddPIGfeE7tKI=","crlite_enrolled":true,"id":"f2f88f3f-b9b1-45b6-a155-beb11a1c37aa","last_modified":1559866097495},{"schema":1559866042836,"derHash":"NlH5s2odqYMgDG7k787PpN78BZRmaJ2qGm22hKVMnns=","subject":"CN=Actalis Organization Validated Server CA G1,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGVMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzE=","whitelist":false,"attachment":{"hash":"6abedb9881ea66af627c7960fe41956b260b02726a2719d0ac283185d97e16cf","size":2263,"filename":"pmKuxMFaLv7ve9PLjGilItvtdgTK9uISTaDGBZSO3kQ=.pem","location":"security-state-staging/intermediates/a33bcad3-47f9-4423-ab8e-92ad859cc5ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pmKuxMFaLv7ve9PLjGilItvtdgTK9uISTaDGBZSO3kQ=","crlite_enrolled":true,"id":"041225c6-347b-421b-89b7-20269162c1f4","last_modified":1559866043641},{"schema":1559866037153,"derHash":"Pmk2hUsVb7sV7phEye47v5L4SSiXp3L5CSxS7ShQfr8=","subject":"SERIALNUMBER=201913,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEz","whitelist":false,"attachment":{"hash":"14ef386b3d7bd03ea81423a233913c96bfeca45ba0cefee666bff7c27ba50b1e","size":2333,"filename":"Jsk0sModzjZIxYKO3IRJSdYqtPzqR6bbb8LX6PhSPwY=.pem","location":"security-state-staging/intermediates/2f6d5ee7-2efc-4fd2-aa08-a955d2c93f94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Jsk0sModzjZIxYKO3IRJSdYqtPzqR6bbb8LX6PhSPwY=","crlite_enrolled":false,"id":"e795ec9e-893e-4bd9-9c1a-075665a007e8","last_modified":1559866037946},{"schema":1559866019917,"derHash":"ACfIUuagp06thEtfrCQ0zCSWaFPITOYyEkaIgbYWZl0=","subject":"CN=SMBC Certificate Authority CA2,OU=SMBC Authority,O=Sumitomo Mitsui Banking Corporation,C=JP","subjectDN":"MH0xCzAJBgNVBAYTAkpQMSwwKgYDVQQKEyNTdW1pdG9tbyBNaXRzdWkgQmFua2luZyBDb3Jwb3JhdGlvbjEXMBUGA1UECxMOU01CQyBBdXRob3JpdHkxJzAlBgNVBAMTHlNNQkMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IENBMg==","whitelist":false,"attachment":{"hash":"a2117111540332765fe1764c3bf9435092c6e93c8fe8ee65054259b3a4832ed3","size":1674,"filename":"8DUaRM2LbmS8cveWB1rUODjdayFFeT7IHpAqhCLVI4c=.pem","location":"security-state-staging/intermediates/af2004b4-f64d-4c8e-9247-07ccfeacefb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8DUaRM2LbmS8cveWB1rUODjdayFFeT7IHpAqhCLVI4c=","crlite_enrolled":false,"id":"654df36c-da2e-4178-82ee-f75edff4129f","last_modified":1559866020722},{"schema":1559866009149,"derHash":"F1LCGdAzcBm8jBk0fJ8rvjcIH6bMGxsJoDdY5gwwfgk=","subject":"CN=Gehirn Managed Certification Authority - RSA DV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBEVg==","whitelist":false,"attachment":{"hash":"2a599a3d41037f018b5b829d6ebee32d6e3022d7811d0629fc6a1ab8cedfbbce","size":2158,"filename":"SWuXVKtSHOw5ZPbQM2Hw49GYwfpJkXf6azkkNwpZ9TQ=.pem","location":"security-state-staging/intermediates/d88294ca-5505-4a98-9cda-33ec41b77048.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWuXVKtSHOw5ZPbQM2Hw49GYwfpJkXf6azkkNwpZ9TQ=","crlite_enrolled":true,"id":"c2f8d5bf-b34e-4d22-b008-bc3dd0b9a6a4","last_modified":1559866009943},{"schema":1559865975116,"derHash":"ayP62JAYDDN7hkFV2uDem62e8L2njREvLL3D0CrReVY=","subject":"CN=NetLock \u00dczleti (Class B) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGpMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE3MDUGA1UEAwwuTmV0TG9jayDDnHpsZXRpIChDbGFzcyBCKSBUYW7DunPDrXR2w6FueWtpYWTDsw==","whitelist":false,"attachment":{"hash":"573f7ca4199a4ab7b67cf4b5b1c8e25a89da7c93d3296ece5e8301e5bf64c39b","size":2182,"filename":"1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=.pem","location":"security-state-staging/intermediates/5ae11eb3-59e2-4f2f-a3ad-09d610869295.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=","crlite_enrolled":true,"id":"1a8145a6-66a3-4c40-914b-e027086ea091","last_modified":1559865975919},{"schema":1559865954402,"derHash":"bGniAWVkQOuYzQh1dkoe0ZAV7YxEJ2Aaypxor6iXOVk=","subject":"CN=Abbott Laboratories Secure Server CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xLTArBgNVBAMTJEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"eff2021a84dc350c344035f14d9ace98bd2aff4df26812ac44f35532c31dc995","size":1670,"filename":"WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=.pem","location":"security-state-staging/intermediates/fd41a272-a56d-4cc1-8ab0-48e779b64f93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=","crlite_enrolled":false,"id":"dd1862ea-9ff3-42ff-907f-f83e355dd278","last_modified":1559865955200},{"schema":1559865922818,"derHash":"eBbHsFZrRng7HBXYoo2LDSDP6yCz0T95RG4VxKUckd8=","subject":"CN=Certum Extended Validation CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGCMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQDEx1DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"0705626e2fe60aaf3f2b067419aa1d9994ec7c33fd5519e98851d2477d71ba8e","size":2430,"filename":"rxmDSIbuiNS8fzkHrqwb5gM8fGXYXY7Egq5fLYyEn4s=.pem","location":"security-state-staging/intermediates/ad1b09ec-5983-4577-b17f-3bcdc6f7349d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rxmDSIbuiNS8fzkHrqwb5gM8fGXYXY7Egq5fLYyEn4s=","crlite_enrolled":true,"id":"a6162e7a-0ad4-4d74-9ccf-7528c89121b2","last_modified":1559865923624},{"schema":1559865909816,"derHash":"h6pxrwMuNr1p2vQBT8rY8nM6oA3quVkzWuOGbkttOh0=","subject":"CN=RapidSSL Enterprise CA,OU=For Internal Use Only,O=GeoTrust\\, Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEeMBwGA1UECxMVRm9yIEludGVybmFsIFVzZSBPbmx5MR8wHQYDVQQDExZSYXBpZFNTTCBFbnRlcnByaXNlIENB","whitelist":false,"attachment":{"hash":"d814cbeb3bba9c4301c57cac75040699c4d480925c5650fee8c11fffffdc68df","size":1508,"filename":"NU79QJ5AFUOrmQDTq80lNzSOHvYG8jU1KQoGfjQbehg=.pem","location":"security-state-staging/intermediates/6a07c4a8-7692-4de3-b7e2-381dbbbffdb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NU79QJ5AFUOrmQDTq80lNzSOHvYG8jU1KQoGfjQbehg=","crlite_enrolled":false,"id":"039f2d8c-c45f-47df-8c82-7db505c836b6","last_modified":1559865910620},{"schema":1559865898453,"derHash":"FRo1kbdl0Cw1nuycVu2N2tDFTnVqSX0Cv5efqN1dlbs=","subject":"CN=Catholic Health Initiatives CA,OU=Orion Health Direct Secure Messaging,O=Catholic Health Initiatives,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbQ2F0aG9saWMgSGVhbHRoIEluaXRpYXRpdmVzMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJzAlBgNVBAMTHkNhdGhvbGljIEhlYWx0aCBJbml0aWF0aXZlcyBDQQ==","whitelist":false,"attachment":{"hash":"ee6a309e0de6cb67ace3bdaab607e586d5285e59b539600424872e26eb2416c6","size":2304,"filename":"eGgIb9Mf8R2HbnNEy1RdxWcW2zycYmpZml33v8IU60Y=.pem","location":"security-state-staging/intermediates/cf1968f2-109b-48cb-b587-0b7b16705e3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eGgIb9Mf8R2HbnNEy1RdxWcW2zycYmpZml33v8IU60Y=","crlite_enrolled":false,"id":"e21eb37a-004c-4f2f-b310-00ae5b96e7e5","last_modified":1559865899247},{"schema":1559865897655,"derHash":"wmfcEV1X3QImJ5s0bfGVPdLAeoXLSKDYmf1XJPWvaB8=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA - G3,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"207fc06b42669c71ee04aa593840172f925d130cfd82a1c6286bbb57a47662ba","size":1902,"filename":"QVwcabwoERXIBspXIsZlwkJ7SmEfO8TMs3IiG5iwXM8=.pem","location":"security-state-staging/intermediates/303eb490-7274-4466-9fa5-888d4a682229.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QVwcabwoERXIBspXIsZlwkJ7SmEfO8TMs3IiG5iwXM8=","crlite_enrolled":false,"id":"43d4e068-b019-457b-a223-234db563b467","last_modified":1559865898440},{"schema":1559865883837,"derHash":"7toVugALAG6tSaIbvnafO6bOdckknwEU2N2ILfwPLBs=","subject":"CN=GoGetSSL Extended Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGCMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLTArBgNVBAMMJEdvR2V0U1NMIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"3f571450d63eacb78406320bff9a534186fb3c5714e38ef5e9421cc30dd0f091","size":1752,"filename":"BPECx6wNq90p8gu0YpJ1Fc0Dx7h0SmkteDK5xDmXT5Y=.pem","location":"security-state-staging/intermediates/69c28a8d-33ee-4e47-bb72-44abfc083dca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BPECx6wNq90p8gu0YpJ1Fc0Dx7h0SmkteDK5xDmXT5Y=","crlite_enrolled":false,"id":"30f7ecb1-568f-400d-8562-fef6ac31428f","last_modified":1559865884636},{"schema":1559865881436,"derHash":"xhApyO7jzgh1XVYrtQxfdeDvhJIUlwsTvZkYU2fR0Rk=","subject":"CN=DigiCert Provisional Direct Med CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IFByb3Zpc2lvbmFsIERpcmVjdCBNZWQgQ0E=","whitelist":false,"attachment":{"hash":"9db67e54d72b0ed5cb3af0e6d5ae65878c009c049543ecb722e8c2429928a21d","size":2138,"filename":"qrhUgzehJmpLBJORSXw5Rr74Be05U1eHnv0PnDNXUX4=.pem","location":"security-state-staging/intermediates/2fdc0c6f-f377-4cd0-acf8-21d1f34ac6a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qrhUgzehJmpLBJORSXw5Rr74Be05U1eHnv0PnDNXUX4=","crlite_enrolled":false,"id":"8ad399aa-03ed-477e-aefd-6f8675cf5313","last_modified":1559865882224},{"schema":1559865879001,"derHash":"V2XGaWoOtcgWRFcyPcQbYSmWHuXFWMEeygKagGdd4to=","subject":"CN=InCommon IGTF Server CA,OU=InCommon,O=Internet2,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMSAwHgYDVQQDExdJbkNvbW1vbiBJR1RGIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"adb731d717bfcd68bba75cde81004aa2c9510de557a9130c02d3f1b558d3dd61","size":2105,"filename":"eKK5WQ3iY2Qjww9Titbu9ylESXstB780TnTJBT7c0zI=.pem","location":"security-state-staging/intermediates/fc1eec87-d8f8-4300-91ea-b217ad53fb3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eKK5WQ3iY2Qjww9Titbu9ylESXstB780TnTJBT7c0zI=","crlite_enrolled":true,"id":"bab3a8d0-faa9-4a2d-9faa-bf897b48540b","last_modified":1559865879785},{"schema":1559865877396,"derHash":"2OJppusIy8M3rWV4xyE1eHSEyZ0vsIzO0CnoBr4QQPw=","subject":"CN=GeoTrust ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"ed3ea6d09c5ea1ee4aff94776f7636c5caa4a1f898b7cf38a7a51186ce041b2e","size":1362,"filename":"A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=.pem","location":"security-state-staging/intermediates/d91f6034-4d0e-4712-b034-11eafafca044.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=","crlite_enrolled":true,"id":"a4d953b4-251b-4c06-931a-1e3ed439794e","last_modified":1559865878190},{"schema":1559865862835,"derHash":"eFhUEwsU9vHun5hCV6urtiVbBajb77doDTNACsKP6Qk=","subject":"CN=certSIGN Code Signing CA Class 3 G2,OU=certSIGN Code Signing CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHwxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEsMCoGA1UECxMjY2VydFNJR04gQ29kZSBTaWduaW5nIENBIENsYXNzIDMgRzIxLDAqBgNVBAMTI2NlcnRTSUdOIENvZGUgU2lnbmluZyBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"979d813e8beb4bc5b97e32b32670bc7d542475a2869e021c2f5258073fc2683f","size":1723,"filename":"JfGTViyEYla3GTtoAL7NpEIwzj14wMFgtWvcWICwEsM=.pem","location":"security-state-staging/intermediates/729b520d-7781-44fd-a627-50fb1479e236.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JfGTViyEYla3GTtoAL7NpEIwzj14wMFgtWvcWICwEsM=","crlite_enrolled":false,"id":"586b6f01-c7f7-4a5e-ba71-e7dca3e77add","last_modified":1559865863642}]}
\ No newline at end of file
+{"data":[{"schema":1610351993623,"derHash":"Jv1MQ2fkY9OccXlq5AEOUzgNyTvBMvsBnWcYpoc+gfQ=","subject":"CN=SHECA RSA Organization Validation Server CA G3,O=UniTrust,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE3MDUGA1UEAwwuU0hFQ0EgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==","whitelist":false,"attachment":{"hash":"a02a5c8205e62c2ef5dc42345a1585558c86f166ed9875d861601a465bcc4651","size":2016,"filename":"0JA1q1ctk_4J8qS0t-GhJaG5egVDq9SB33oMY7SMpfs=.pem","location":"security-state-staging/intermediates/caec957d-379a-4c23-bf42-3bd122e7cf33.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0JA1q1ctk/4J8qS0t+GhJaG5egVDq9SB33oMY7SMpfs=","crlite_enrolled":false,"id":"10ec0271-99d5-4c06-a20d-1c03ccf7d780","last_modified":1610459931910},{"schema":1610351366814,"derHash":"VEpvYpl1bsreT3w0gRBUGBtqI8D/g+sKwaKM6/4Nrj4=","subject":"CN=DigiCert TLS ICA GeoTrust PCA-G2,O=DigiCert\\, Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwgSW5jLjEpMCcGA1UEAwwgRGlnaUNlcnQgVExTIElDQSBHZW9UcnVzdCBQQ0EtRzI=","whitelist":false,"attachment":{"hash":"00e542d0e9877f5102e0eb89a416335ccd3cc75c8bcbbb047083bb3eeee4c75b","size":1280,"filename":"6x30RuzH_PkHDnVOldX1g-KzUe-dgbggRwF4KJQ285Q=.pem","location":"security-state-staging/intermediates/bfe0d174-db9a-48fc-99f4-b5cb2e90f039.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6x30RuzH/PkHDnVOldX1g+KzUe+dgbggRwF4KJQ285Q=","crlite_enrolled":false,"id":"2da53828-c1ac-41a0-a435-992841f4686c","last_modified":1610351992733},{"schema":1610134892633,"derHash":"ClUqZfIv+CDn7D1Du/iLAqvDS9JH4MNQWJG2NC8WpfI=","subject":"CN=SHECA RSA Domain Validation Server CA G3,O=UniTrust,C=CN","subjectDN":"MFMxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDExMC8GA1UEAwwoU0hFQ0EgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlcnZlciBDQSBHMw==","whitelist":false,"attachment":{"hash":"42516b0068507cb60d6383aaefa05ac169921cff9e4616761151efe098d3e1fe","size":2008,"filename":"N6OrM0KKQgR1zORoDKkLLFEKAYCmS_84dpbLl_qNOnU=.pem","location":"security-state-staging/intermediates/525578e5-a94b-4525-b9e7-801be6e0ff89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N6OrM0KKQgR1zORoDKkLLFEKAYCmS/84dpbLl/qNOnU=","crlite_enrolled":true,"id":"4b6a2421-1677-41c0-8103-bc13fb7e09f9","last_modified":1610157523892},{"schema":1610053110240,"derHash":"tfYuw4ExzRSx/JW4d/TSEL5L+sx+amqhQi2J40t6xME=","subject":"CN=GoGetSSL Domain Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGAMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxKzApBgNVBAMMIkdvR2V0U1NMIERvbWFpbiBWYWxpZGF0aW9uIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"1a7005883cb2d9190f4111d29fd64d2d6eb960cc76830263a72234e826bbf517","size":1748,"filename":"p185bYxiFO-ZwKAV-mIneHw-vuH2rqpYkDOyjKN7DyE=.pem","location":"security-state-staging/intermediates/eaf84a71-fc34-486e-afdf-26e1ecaca22a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p185bYxiFO+ZwKAV+mIneHw+vuH2rqpYkDOyjKN7DyE=","crlite_enrolled":false,"id":"35456425-adac-45ee-84d4-3a5c1b317e14","last_modified":1610071145242},{"schema":1610052572719,"derHash":"Zz6P7rEWgnfQFTER0g7Tjp2lH0QL5/1QshhUCTd0Gkg=","subject":"CN=DigiCert QuoVadis TLS ICA QuoVadis Root CA 2,O=DigiCert\\, Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwgSW5jMTUwMwYDVQQDDCxEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFF1b1ZhZGlzIFJvb3QgQ0EgMg==","whitelist":false,"attachment":{"hash":"1972543fba2841f4a4d34b8431f1bd5c4f6ebc8c99b64d08cdf482a4c3962399","size":1975,"filename":"tZqVkxHOD3FG-_Ed3JNxf_Hs9TQHX1EhCqi5gjq2-HE=.pem","location":"security-state-staging/intermediates/8b90e2ec-7b60-42fb-8d9b-51fa5fa279be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tZqVkxHOD3FG+/Ed3JNxf/Hs9TQHX1EhCqi5gjq2+HE=","crlite_enrolled":false,"id":"3c1f2484-7cfc-487b-b0c0-63f29e6a8de5","last_modified":1610053109357},{"schema":1610052574278,"derHash":"oF/kUpqQVCR0C8Yedzx7gplRGJNOQJQhYyOXwf5tCUg=","subject":"CN=DigiCert QuoVadis TLS ICA QuoVadis RCA,O=DigiCert\\, Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwgSW5jMS8wLQYDVQQDDCZEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFF1b1ZhZGlzIFJDQQ==","whitelist":false,"attachment":{"hash":"61fb1e00c120b7d8eb29a55826f8925947f9053b6bbd5d3ffe964cc05e6d6dde","size":1683,"filename":"Bh60Y6NbOPMA-3_NfhiqlTDjW2fQRTnUly_tdwJWP90=.pem","location":"security-state-staging/intermediates/2ef170a4-24c1-4ae1-b6c9-847620f12f10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bh60Y6NbOPMA+3/NfhiqlTDjW2fQRTnUly/tdwJWP90=","crlite_enrolled":false,"id":"ab58fcb7-0eaf-4652-99c8-7753a75f235f","last_modified":1610053109345},{"schema":1610048984752,"derHash":"oF/kUpqQVCR0C8Yedzx7gplRGJNOQJQhYyOXwf5tCUg=","subject":"CN=DigiCert QuoVadis TLS ICA QuoVadis RCA,O=DigiCert\\, Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwgSW5jMS8wLQYDVQQDDCZEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFF1b1ZhZGlzIFJDQQ==","whitelist":false,"attachment":{"hash":"61fb1e00c120b7d8eb29a55826f8925947f9053b6bbd5d3ffe964cc05e6d6dde","size":1683,"filename":"Bh60Y6NbOPMA-3_NfhiqlTDjW2fQRTnUly_tdwJWP90=.pem","location":"security-state-staging/intermediates/edaf7e4f-93c0-431c-8fb2-7e01cb7c3a80.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bh60Y6NbOPMA+3/NfhiqlTDjW2fQRTnUly/tdwJWP90=","crlite_enrolled":false,"id":"0600918a-adab-4c3d-b3dc-9a7b6228f2ed","last_modified":1610049515593},{"schema":1610048986321,"derHash":"Zz6P7rEWgnfQFTER0g7Tjp2lH0QL5/1QshhUCTd0Gkg=","subject":"CN=DigiCert QuoVadis TLS ICA QuoVadis Root CA 2,O=DigiCert\\, Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKDA1EaWdpQ2VydCwgSW5jMTUwMwYDVQQDDCxEaWdpQ2VydCBRdW9WYWRpcyBUTFMgSUNBIFF1b1ZhZGlzIFJvb3QgQ0EgMg==","whitelist":false,"attachment":{"hash":"1972543fba2841f4a4d34b8431f1bd5c4f6ebc8c99b64d08cdf482a4c3962399","size":1975,"filename":"tZqVkxHOD3FG-_Ed3JNxf_Hs9TQHX1EhCqi5gjq2-HE=.pem","location":"security-state-staging/intermediates/bf574586-936d-4800-bb8e-1c163a869b5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tZqVkxHOD3FG+/Ed3JNxf/Hs9TQHX1EhCqi5gjq2+HE=","crlite_enrolled":false,"id":"de480be3-8754-46f9-9fbf-6b423796a971","last_modified":1610049515581},{"schema":1609443692100,"derHash":"TKNPcQp+EDdNpQYzfXVj/b2PraRt6PCm5SL9L6whNts=","subject":"CN=CrossTrust OV CA3,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBMw==","whitelist":false,"attachment":{"hash":"36e858212fd3a35823f7631743852eaacd6260657261d3400fb64bd1cbe22e7c","size":1581,"filename":"NRDKWT0450v5op6gvs41KoV3CLtbD8-8t8IphVrIvqM=.pem","location":"security-state-staging/intermediates/71e0b574-d31e-4f97-a406-ea5014ad14db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NRDKWT0450v5op6gvs41KoV3CLtbD8+8t8IphVrIvqM=","crlite_enrolled":false,"id":"6098095f-4cec-4428-9aa8-fa4e3e7c40fc","last_modified":1609444767338},{"schema":1609270892903,"derHash":"cj4fieqqwPVrn5OF8TEvbNvXVFQGl7pGNA3yrjDqWec=","subject":"CN=SSL.com High Assurance CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEiMCAGA1UEAxMZU1NMLmNvbSBIaWdoIEFzc3VyYW5jZSBDQQ==","whitelist":false,"attachment":{"hash":"71002c2662ef686fd97b1ed39205f25720a2a54c2d5da18fc7df07bfe9b794d0","size":2121,"filename":"Ck8cX6ydytkZDI6Az0ES3m8TykmMPRUEb5UVDjRtJ_w=.pem","location":"security-state-staging/intermediates/c9101671-f46c-4528-bbd3-0ebe60946c0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ck8cX6ydytkZDI6Az0ES3m8TykmMPRUEb5UVDjRtJ/w=","crlite_enrolled":false,"id":"28852233-ff69-424d-9c51-72ed58ffda41","last_modified":1609423089503},{"schema":1608861456264,"derHash":"p+OsttcN/1U2hSW8O+I2xgJSk/umCbPEQfSZRPoGAB8=","subject":"SERIALNUMBER=201510,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTA=","whitelist":false,"attachment":{"hash":"28e1ef70f8de2a776568ca7bdc90bf54323d92557e04219bd3266354c5029a9c","size":2093,"filename":"l6QMc6rTKdl0AehazkNhC6i7uekp05bi-O4TLl8ebbE=.pem","location":"security-state-staging/intermediates/ca92f10f-e298-4db4-9442-e61019866e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l6QMc6rTKdl0AehazkNhC6i7uekp05bi+O4TLl8ebbE=","crlite_enrolled":true,"id":"7c2ace93-b725-4eb3-93be-ed978b60fe4e","last_modified":1608904653190},{"schema":1608731356438,"derHash":"MlNBL9rUUjEIwJi7DuDv7df6/dAPsw5Hxrup/j4c24g=","subject":"CN=GDCA TrustAUTH R4 Primer CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IFByaW1lciBDQQ==","whitelist":false,"attachment":{"hash":"63e5b17371590f3ec401bd9eb3b8ed4d9589063e1d6eef4f8889c34e61e19155","size":2056,"filename":"0QPovc90TjBNTpee1IAatbvOdHFYmqVUPYNToEldWCY=.pem","location":"security-state-staging/intermediates/5786a959-598e-4837-8220-7a23733b51ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0QPovc90TjBNTpee1IAatbvOdHFYmqVUPYNToEldWCY=","crlite_enrolled":false,"id":"ac8f566c-4341-4d69-9204-a2ed8524ca5e","last_modified":1608731862281},{"schema":1608651068348,"derHash":"wWnWndPSbTbLgt8TXFf+M27P9+fqQB6Z484ZF6j7gYA=","subject":"CN=CSP SSL Service CA 5,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA1","whitelist":false,"attachment":{"hash":"a26a3bb69b8762ccb5f00b997d7f14a0fe3eccca50cf54a3b76508a75d97353c","size":2154,"filename":"feELO37IL4l2CJfivsLI0VTQkKQc7sskntJ5vxPVVW8=.pem","location":"security-state-staging/intermediates/adfaf648-0669-46cc-a5d4-251b1d33f435.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"feELO37IL4l2CJfivsLI0VTQkKQc7sskntJ5vxPVVW8=","crlite_enrolled":false,"id":"ee30cbe2-04fc-4d99-8ef4-c0cc6362bfcc","last_modified":1608688660806},{"schema":1608256159665,"derHash":"dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=","subject":"CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"11a50056d6027ba92a4d016bbdd72de6b8e7498171f12762ce2eda7a60762e6e","size":1483,"filename":"vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem","location":"security-state-staging/intermediates/7bf16759-da8d-43e0-b260-f55aac6a39b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=","crlite_enrolled":false,"id":"ce744321-7f4d-4f9c-9da1-63454f6d33bb","last_modified":1608321440489},{"schema":1608256158159,"derHash":"m/7T2dyVI2vP/LNdSxINsOOGf2Kx/QFako2gswOWZoM=","subject":"CN=DigiCert High Assurance TLS RSA SHA256 2020 CA1,O=DigiCert\\, Inc.,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE4MDYGA1UEAxMvRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"007b4991e764dfb6fc682cc922b8e457508cb343dfd1edc993260455daaf7c3b","size":1748,"filename":"KKzhMaY72_nD-ZVShAg153XyomvfRUrrKjaWxh3ZCRo=.pem","location":"security-state-staging/intermediates/d3e8c2ab-b791-4d1a-9686-b3075fe8b947.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KKzhMaY72/nD+ZVShAg153XyomvfRUrrKjaWxh3ZCRo=","crlite_enrolled":false,"id":"44ffb93f-8613-4234-ae12-7682b310843a","last_modified":1608321440478},{"schema":1608234551224,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"c0ac75ba366ac172e14ea829ea033e50cfad846dda99a812e6cc75e5ee716e26","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/7d4b43b6-4fd7-4438-a41f-6edb60308600.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"547c8ddc-885a-4577-b1a9-9c8488b81b16","last_modified":1608321440466},{"schema":1608256163558,"derHash":"YD23B6WEADvtbx1D3NTq4TzRjXmOgn3i86MfMZP8Daw=","subject":"CN=NII Open Domain CA - G7 RSA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSQwIgYDVQQDExtOSUkgT3BlbiBEb21haW4gQ0EgLSBHNyBSU0E=","whitelist":false,"attachment":{"hash":"c415b80eaca6cc1fe0d46f93c28c3f50a71fdc2d34c05596ad432c7d1071765c","size":1772,"filename":"gdcmbbO--ObnWtuH5s-3w7lzQiYlLeXyMGuHZ7bgaG0=.pem","location":"security-state-staging/intermediates/921112a4-f1b9-4d7d-ab3a-4e36fab6dc15.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gdcmbbO++ObnWtuH5s+3w7lzQiYlLeXyMGuHZ7bgaG0=","crlite_enrolled":true,"id":"8e4c3aba-f9c2-4fae-891a-3f9906c7f95d","last_modified":1608321440455},{"schema":1608191356989,"derHash":"7dT7pAzTq64U8XW732cGprcoAHprRthmyge3Z0Ov9Cw=","subject":"CN=FUJIFILM Fnet CA - S2,O=FUJIFILM,C=JP","subjectDN":"MEAxCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEeMBwGA1UEAxMVRlVKSUZJTE0gRm5ldCBDQSAtIFMy","whitelist":false,"attachment":{"hash":"47545f66891e5ed5a53c7991cbcd4359aa9cb6dec5626532dac2ca678d6e15d4","size":1593,"filename":"FoZrORtfOQVQIdnaO-pphxZC_MNQQ1WYobR981Jaydk=.pem","location":"security-state-staging/intermediates/63ad0bdd-0afc-4d0e-9d2c-da6d4dd9a811.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FoZrORtfOQVQIdnaO+pphxZC/MNQQ1WYobR981Jaydk=","crlite_enrolled":true,"id":"5c93d10c-ee60-4257-80b8-06c25ca75baf","last_modified":1608321440434},{"schema":1608000560645,"derHash":"xesadjm52NcLT4Kt2AeUF17ktqPbGGGzhxfJb8GRSSc=","subject":"CN=NAVER Secure Certification Authority 1,O=NAVER BUSINESS PLATFORM Corp.,C=KR","subjectDN":"MGYxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBDb3JwLjEvMC0GA1UEAwwmTkFWRVIgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDE=","whitelist":false,"attachment":{"hash":"99d81a11ba4ee9372795e89c14a2c5c6011f433176a402bb5dd5889a378b6c0b","size":1991,"filename":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=.pem","location":"security-state-staging/intermediates/d534a023-2aac-45ec-9bca-b6f031bcf4a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=","crlite_enrolled":true,"id":"9fe92629-6232-4af7-a10f-6fe9d20f1fa8","last_modified":1608001043200},{"schema":1607996964517,"derHash":"xesadjm52NcLT4Kt2AeUF17ktqPbGGGzhxfJb8GRSSc=","subject":"CN=NAVER Secure Certification Authority 1,O=NAVER BUSINESS PLATFORM Corp.,C=KR","subjectDN":"MGYxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBDb3JwLjEvMC0GA1UEAwwmTkFWRVIgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDE=","whitelist":false,"attachment":{"hash":"99d81a11ba4ee9372795e89c14a2c5c6011f433176a402bb5dd5889a378b6c0b","size":1991,"filename":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=.pem","location":"security-state-staging/intermediates/30dde061-e042-4d6a-b9ff-b5b063040817.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJ2mHuIKySslEdkckvymNSKxLhYRvvY9Z8ivbKik0Tg=","crlite_enrolled":true,"id":"b91d1139-0ac1-45fb-bf47-cea7ab32882e","last_modified":1607997452848},{"schema":1607715692979,"derHash":"/KiES2J8Nx3kp/kQpS6OkM3CmBOqJNY3Hf0e8MFKH4Y=","subject":"SERIALNUMBER=201507,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDc=","whitelist":false,"attachment":{"hash":"e08c53caafa23be5fba08037729fa1585b1cf96c14f77428038d77f5b1670e27","size":2093,"filename":"sTL0G6l0dolGcB2vAkf3KGdhh0Glca9lcMoxggaMDQs=.pem","location":"security-state-staging/intermediates/6dc6b7a6-cead-4228-b8e4-0e086a453f57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sTL0G6l0dolGcB2vAkf3KGdhh0Glca9lcMoxggaMDQs=","crlite_enrolled":true,"id":"499c3a9b-8ef3-47e9-a544-38e54edc5ba3","last_modified":1607759852380},{"schema":1607694534261,"derHash":"bzNd181Kqh2RQPKQ6eezSYp8w1okSqMA4Ua6LZ0CuWA=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"c382d90e02609513d21d5c25d700a6f8e6b01f00b16e0cc3be89ad8d2de7a642","size":1248,"filename":"V_K2Vnq-QG5Dg_lYp-FnfgtMGvtLYZ1qAfYtkKQAILg=.pem","location":"security-state-staging/intermediates/32b8806d-e3fb-4c24-838a-25c957f58b64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V/K2Vnq+QG5Dg/lYp+FnfgtMGvtLYZ1qAfYtkKQAILg=","crlite_enrolled":false,"id":"9d98e0ae-79dc-42dd-b2ab-457585b3b2e0","last_modified":1607695036009},{"schema":1607694531126,"derHash":"pgMsw1Lx4uNijhYqMEe8fWR+LWAaLA8myq+ar3pUI5w=","subject":"CN=GlobalSign Atlas R3 OV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"87bb6f2c47bbed017d590d273e3e104b9a51d89c90f2d746b6d5c6b22a32b5e5","size":1691,"filename":"q8RzYVnv8u4WxSzLeEvOffFfpsrmgSIHiNuWJdK7BlU=.pem","location":"security-state-staging/intermediates/45a9ec2b-ccc8-4abc-9d7c-a2ad83a3fca5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q8RzYVnv8u4WxSzLeEvOffFfpsrmgSIHiNuWJdK7BlU=","crlite_enrolled":false,"id":"5176fc36-9fd7-446d-aa9d-773e2d5f82c2","last_modified":1607695035994},{"schema":1607694532759,"derHash":"LrihMXKI8IIz5og86+Z+pqCYniKspCxY1Z9ag04CxRM=","subject":"CN=GlobalSign Atlas ECCR5 OV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"0da48dd5abf0b542d1a4a62dc458f758e9c3517117e8ec13525dc3dc3e0ac628","size":1248,"filename":"pE2Mn6zDBy5ZUUx_Fz25_Wr_c2YZWOT8FCJpeRfpTXQ=.pem","location":"security-state-staging/intermediates/c3fa086f-e7d9-478c-8836-1bc02ce096dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pE2Mn6zDBy5ZUUx/Fz25/Wr/c2YZWOT8FCJpeRfpTXQ=","crlite_enrolled":false,"id":"7313f33d-0022-4715-8279-106b6ce53a40","last_modified":1607695035982},{"schema":1607676521432,"derHash":"WfX/krYIoBGf8d18YD4OsW9P6tnUcXrDvGLShq45nNo=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"978bbc0b5187a94f5a992a6478523b1f397eaf3bfd62a8b8256dc53cc30af2bb","size":1691,"filename":"qHEiXUiOfz6Ni9Jz-z5RQSnsI3DqTIU9kw0X_YkfXsU=.pem","location":"security-state-staging/intermediates/15b5c177-d7da-4308-9c80-e5eb34a8193e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHEiXUiOfz6Ni9Jz+z5RQSnsI3DqTIU9kw0X/YkfXsU=","crlite_enrolled":false,"id":"93403c3f-2de2-47f2-9594-d1e0c59935f0","last_modified":1607677034093},{"schema":1607672928470,"derHash":"WfX/krYIoBGf8d18YD4OsW9P6tnUcXrDvGLShq45nNo=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020-12,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIwLTEy","whitelist":false,"attachment":{"hash":"978bbc0b5187a94f5a992a6478523b1f397eaf3bfd62a8b8256dc53cc30af2bb","size":1691,"filename":"qHEiXUiOfz6Ni9Jz-z5RQSnsI3DqTIU9kw0X_YkfXsU=.pem","location":"security-state-staging/intermediates/9e8e5ad0-dd70-48a0-9802-7115a4b06295.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHEiXUiOfz6Ni9Jz+z5RQSnsI3DqTIU9kw0X/YkfXsU=","crlite_enrolled":false,"id":"9ffa3358-512a-4c95-ac0f-0699656bcaad","last_modified":1607673449938},{"schema":1607241495452,"derHash":"RVtfptakcuI/CsDxwUqj9egFUyA8p/9CgPwRJQVFdP0=","subject":"CN=CrossTrust OV CA4,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBNA==","whitelist":false,"attachment":{"hash":"97a527f046f5624a30b63930ccf621cb3a3547798bbad1b604eb580bffb8488e","size":1589,"filename":"7cvw7u1H41D6YEAbLwb40cb22xC4hWT1GJJedbVdsVU=.pem","location":"security-state-staging/intermediates/ed8a8352-aa21-42b8-a131-1abe9284bf80.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7cvw7u1H41D6YEAbLwb40cb22xC4hWT1GJJedbVdsVU=","crlite_enrolled":false,"id":"47fc2392-f7e9-4142-bf2f-b04268d380c2","last_modified":1607263109979},{"schema":1607197292996,"derHash":"kAFLo7mQAYSoTKKkZW0DxgU1fyAu/z9ZF2ylTJgALLE=","subject":"CN=CrossTrust DV CA3,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBMw==","whitelist":false,"attachment":{"hash":"a4299ae8c6d64201f117d7faa1cc4ab82a9fd681134ae157d8e4d73f3048227e","size":1581,"filename":"qfSK-xETySSQi4hk8YejfqWMDWTFyNRPmj8rfRp62tA=.pem","location":"security-state-staging/intermediates/5ffe7bf6-caee-4f37-8a1b-a823dd866066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qfSK+xETySSQi4hk8YejfqWMDWTFyNRPmj8rfRp62tA=","crlite_enrolled":false,"id":"f345a14d-3b2d-4084-b276-a9357ebc2988","last_modified":1607241494575},{"schema":1607050675439,"derHash":"zx+PmJ+XXQUabw2VI65XMqOn4jRObFQPu2Q94pVRnmc=","subject":"CN=CSP SSL Service CA 4,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA0","whitelist":false,"attachment":{"hash":"5680447216a29294af84501384f90dd03d987feb70a168dc884d807c1ce6dcb1","size":2154,"filename":"6cmFGKSet-uN9lExNlA28Wy9f_epSW1jDhpODTW1QyI=.pem","location":"security-state-staging/intermediates/2efe3c65-93ec-4c6e-bc4f-8354baae1d21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6cmFGKSet+uN9lExNlA28Wy9f/epSW1jDhpODTW1QyI=","crlite_enrolled":false,"id":"fca3cb91-0e32-4135-a6e7-e231918a3734","last_modified":1607090289374},{"schema":1607050148986,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"68247409e722cb630f0449b14b3db230f4582f5b0b6b21e2acf7724783a35df9","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/ed532c05-a2de-4cc3-a825-b66ee8628364.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"0becdd95-da83-4547-ab7c-c6cbfee44235","last_modified":1607050674570},{"schema":1607046545967,"derHash":"RLVFqool5lpzyhXcJ/w20kwcuZU6BmU5sRWC3Eh7SDM=","subject":"CN=Hellenic Academic and Research Institutions ECC RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGqMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFEMEIGA1UEAxM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBFQ0MgUm9vdENBIDIwMTU=","whitelist":false,"attachment":{"hash":"68247409e722cb630f0449b14b3db230f4582f5b0b6b21e2acf7724783a35df9","size":1016,"filename":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o_A6r4kB3LoA=.pem","location":"security-state-staging/intermediates/57f1e4b9-a9f7-461b-ba56-09907e258ee8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u1IIbQY56NszJ3Wsj06ENdks6wD04k8o/A6r4kB3LoA=","crlite_enrolled":false,"id":"bfd16bc3-34f1-440a-a9fd-89a869068333","last_modified":1607047075462},{"schema":1606917474805,"derHash":"r+FZXnCXzN+0Ms6mOb3uhs8ldsJ982+caRzwPhMkwdQ=","subject":"CN=Trustico RSA OV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"4aaceec6690459b455ad73585e25a07a65b1b302c94a4e198062875402f68530","size":2113,"filename":"hZa79Z70L3tWUM25OQ658Ld4Rg65tj7Rn6OQXFiJPkg=.pem","location":"security-state-staging/intermediates/38b03aee-b8d2-4bb3-982e-18487f59c304.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hZa79Z70L3tWUM25OQ658Ld4Rg65tj7Rn6OQXFiJPkg=","crlite_enrolled":false,"id":"fff9a2df-08f2-4fef-b8f3-e1462f74c9dd","last_modified":1606939082092},{"schema":1606917034925,"derHash":"Efukp+5XnHDh1X+fm2qMIJ4SGcTx04Rvg//OdOnl4s4=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBFVg==","whitelist":false,"attachment":{"hash":"b45919819e02ad79724a514eaf858e77f666b1352e04efbd7b970ef878509a6a","size":1776,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/fa38118a-b0dd-4170-b25b-2077e50db1af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"036fbcb0-0139-4457-840c-cb0e018adfe6","last_modified":1606917473706},{"schema":1606916930155,"derHash":"Efukp+5XnHDh1X+fm2qMIJ4SGcTx04Rvg//OdOnl4s4=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBFVg==","whitelist":false,"attachment":{"hash":"b45919819e02ad79724a514eaf858e77f666b1352e04efbd7b970ef878509a6a","size":1776,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/2c39ac03-7820-4419-beb2-d08951cc6726.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"7f207e9f-d31a-4ba4-957d-09d4f8291836","last_modified":1606917473688},{"schema":1606916931468,"derHash":"q3SxQRrSPiIn+4iiqTBKGkWlxIQLNjXxA2pG6DdCeaw=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBPVg==","whitelist":false,"attachment":{"hash":"1289ff9c033377f8edc9f2ded9318205d7263d8c7040b70ff2db68630eaac699","size":1776,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/d46e5729-e1a1-4a1d-b398-9fae0f398bf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"c9dfa791-474d-4cd4-b016-5e238a4e2c8f","last_modified":1606917473670},{"schema":1606916931901,"derHash":"q3SxQRrSPiIn+4iiqTBKGkWlxIQLNjXxA2pG6DdCeaw=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBPVg==","whitelist":false,"attachment":{"hash":"1289ff9c033377f8edc9f2ded9318205d7263d8c7040b70ff2db68630eaac699","size":1776,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/7ff46c16-7f19-481d-b990-fd4bc6aabfe9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"3908bde0-cc20-4ee6-af97-f8c7e04833ac","last_modified":1606917473651},{"schema":1606916930579,"derHash":"uxcLOXhNAnhDJc6pONkjFMYX3egIyGfjPirRYdVLPoo=","subject":"CN=Soluti CA - EV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gRVY=","whitelist":false,"attachment":{"hash":"19fefd4f70ea48cb5d6ea309efe68d11ffa03632cea4cfeec8dc09417da36fa2","size":1837,"filename":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5-EeG0U=.pem","location":"security-state-staging/intermediates/d2973af0-94cb-4052-9f9a-a6c552deb9a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z6aApIGWlcMWZHFtBmP1FgZhyLKarTalSo0g5+EeG0U=","crlite_enrolled":true,"id":"cc2e3096-5b34-4e12-8901-72cacec6b510","last_modified":1606917473614},{"schema":1606916929707,"derHash":"5ukpyEVsAU6NpzOs5OmBRVInK4EXYFChPqRagjIAsUs=","subject":"CN=Soluti CA - OV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gT1Y=","whitelist":false,"attachment":{"hash":"19cb0ae44011765535de42c22ddec245a2178d13094aa7cc8d2ebfe5143caa64","size":1837,"filename":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=.pem","location":"security-state-staging/intermediates/801d6b0f-a466-4902-99e1-de0020c43f0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rCbpz2JPbnICZtM69Lt2eclqdTss0Mj0Z4ejXMF1nD4=","crlite_enrolled":true,"id":"e78a46ec-c8ec-4fbb-9d87-67247c3ba782","last_modified":1606917473595},{"schema":1606830635261,"derHash":"IIOI6/mbEhiIUvEd15Rme145laJ2etslXpuPXUz1BXY=","subject":"CN=CertCloud RSA EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"12724d564e2cbda02a9fc1327e4c62a1bc03b1b2e93f870d923346a811dc27a5","size":2109,"filename":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa_MxbJugEHms=.pem","location":"security-state-staging/intermediates/e4655ca7-9066-423f-985a-340112104daf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa/MxbJugEHms=","crlite_enrolled":true,"id":"172b1f94-1468-4b3a-8538-b1071e17c256","last_modified":1606831071215},{"schema":1606830533191,"derHash":"cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=","subject":"CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872","size":2081,"filename":"ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem","location":"security-state-staging/intermediates/3b08e799-b31b-4131-a15e-06ba6cd0b067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=","crlite_enrolled":true,"id":"1e513d59-b8f5-4b2d-b079-bf21291f788f","last_modified":1606831071197},{"schema":1606830635701,"derHash":"yYqJmVEeL2CJUFOv9MU5vRtnZXVOu3s1OJaz8pdO2D8=","subject":"CN=CertCloud ECC OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8ea4ce61b55373639b30bc8f5a9bc1599c0d2d52d91a015219632c719b540bb9","size":1240,"filename":"q6ASqDW7KvwqyTSX_m1w95QebvKZnwudV__ETDG8YTc=.pem","location":"security-state-staging/intermediates/50537f53-efe3-47c3-934b-9e406a3ffdce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6ASqDW7KvwqyTSX/m1w95QebvKZnwudV//ETDG8YTc=","crlite_enrolled":true,"id":"677706c1-d0ab-48a0-9227-8df475ae33b1","last_modified":1606831071178},{"schema":1606830532323,"derHash":"IIOI6/mbEhiIUvEd15Rme145laJ2etslXpuPXUz1BXY=","subject":"CN=CertCloud RSA EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"12724d564e2cbda02a9fc1327e4c62a1bc03b1b2e93f870d923346a811dc27a5","size":2109,"filename":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa_MxbJugEHms=.pem","location":"security-state-staging/intermediates/d12087b1-5f70-4a41-8e7f-7a3fdbda8505.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qtoy2s5rEsyXk3LyvPdOnjlq0FouOkWa/MxbJugEHms=","crlite_enrolled":true,"id":"02e3f60f-46b3-4774-9f8c-0bc4cc9893db","last_modified":1606831071159},{"schema":1606830531854,"derHash":"cQLZcsJOnKaNDm+f9TxfZYzZuGSfKOrY28M2wt9QSBE=","subject":"CN=CertCloud RSA OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgUlNBIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8d771de489696047446dd891e36b2c199bc714a871f4de9a134028e7dd330872","size":2081,"filename":"ORYJiVkIJCqtrNqVHJ4iw_q-R2u46OEMcFExxBr8_5Y=.pem","location":"security-state-staging/intermediates/85b0d8c2-29b3-4346-9080-e95bce35f8b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORYJiVkIJCqtrNqVHJ4iw/q+R2u46OEMcFExxBr8/5Y=","crlite_enrolled":true,"id":"b87a1d31-36bc-448e-ba4b-6a58e79386ba","last_modified":1606831071136},{"schema":1606830532756,"derHash":"yYqJmVEeL2CJUFOv9MU5vRtnZXVOu3s1OJaz8pdO2D8=","subject":"CN=CertCloud ECC OV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIE9WIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"8ea4ce61b55373639b30bc8f5a9bc1599c0d2d52d91a015219632c719b540bb9","size":1240,"filename":"q6ASqDW7KvwqyTSX_m1w95QebvKZnwudV__ETDG8YTc=.pem","location":"security-state-staging/intermediates/c59c8cb7-d94d-4f73-8a7f-702018c3797f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6ASqDW7KvwqyTSX/m1w95QebvKZnwudV//ETDG8YTc=","crlite_enrolled":true,"id":"577f165f-8a63-4889-afea-e7ee828bc7c3","last_modified":1606831071111},{"schema":1606787357745,"derHash":"I+ywPuwXM4xOM6a0ikHcPNoSKBu8P/gTwFidbMI4dSI=","subject":"CN=GTS CA 1C3,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUMz","whitelist":false,"attachment":{"hash":"88a6ecb70d888765711d7b8ea76f793d4b228fedad48e215e01fc948196b7baf","size":1995,"filename":"zCTnfLwLKbS9S2sbp-uFz4KZOocFvXxkV06Ce9O5M2w=.pem","location":"security-state-staging/intermediates/8274b76f-2423-4a90-b8c0-15fb22c3d9a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zCTnfLwLKbS9S2sbp+uFz4KZOocFvXxkV06Ce9O5M2w=","crlite_enrolled":true,"id":"bb2cfbac-beea-4199-9bfb-7822a906f054","last_modified":1606787861390},{"schema":1606787486997,"derHash":"ZOKGt2BjYCo3Lv1gzejbJlaknuFehCVLPW61/jj0KIs=","subject":"CN=GTS CA 1D4,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUQ0","whitelist":false,"attachment":{"hash":"3eeab8b593f9b526e5e441336b3c99ef183d6618c02890e5bab1825e1a95744b","size":1983,"filename":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=.pem","location":"security-state-staging/intermediates/a56bd323-af0f-48aa-9258-720471d08a2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=","crlite_enrolled":true,"id":"06a19215-a3f8-41c0-b91d-c0119027036e","last_modified":1606787861369},{"schema":1606753452631,"derHash":"ZOKGt2BjYCo3Lv1gzejbJlaknuFehCVLPW61/jj0KIs=","subject":"CN=GTS CA 1D4,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUQ0","whitelist":false,"attachment":{"hash":"3eeab8b593f9b526e5e441336b3c99ef183d6618c02890e5bab1825e1a95744b","size":1983,"filename":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=.pem","location":"security-state-staging/intermediates/2e90889f-7abd-4634-9a0e-0b6484068790.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cXjPgKdVe6iojP8s0YQJ3rtmDFHTnYZxcYvmYGFiYME=","crlite_enrolled":true,"id":"d80b8959-3c46-49da-8258-57d90d760838","last_modified":1606787861349},{"schema":1606787357308,"derHash":"I+ywPuwXM4xOM6a0ikHcPNoSKBu8P/gTwFidbMI4dSI=","subject":"CN=GTS CA 1C3,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMUMz","whitelist":false,"attachment":{"hash":"88a6ecb70d888765711d7b8ea76f793d4b228fedad48e215e01fc948196b7baf","size":1995,"filename":"zCTnfLwLKbS9S2sbp-uFz4KZOocFvXxkV06Ce9O5M2w=.pem","location":"security-state-staging/intermediates/d5e42a4e-f2c4-48cb-b4db-dff2bdeaa25a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zCTnfLwLKbS9S2sbp+uFz4KZOocFvXxkV06Ce9O5M2w=","crlite_enrolled":true,"id":"006e939d-ce4c-47b3-83b6-1106c0cbe038","last_modified":1606787861330},{"schema":1606744134795,"derHash":"kxqqHsmyug+lmoIwL0+DBijIbZstKlCk0bLOiVxMxkg=","subject":"CN=Actalis Organization Validated Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGJMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"71fafcd9a9832cc1330204b9331c40ce9c1fbcedeb9bd11114cd6cc2e1618b06","size":2645,"filename":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=.pem","location":"security-state-staging/intermediates/eedc60b7-37aa-42bf-bad4-6909eaa5094d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=","crlite_enrolled":false,"id":"62176a9a-7824-4b40-9921-687fd3033eb6","last_modified":1606744672041},{"schema":1606744133804,"derHash":"kxqqHsmyug+lmoIwL0+DBijIbZstKlCk0bLOiVxMxkg=","subject":"CN=Actalis Organization Validated Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGJMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"71fafcd9a9832cc1330204b9331c40ce9c1fbcedeb9bd11114cd6cc2e1618b06","size":2645,"filename":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=.pem","location":"security-state-staging/intermediates/6a86241e-e0c9-4fa3-9aa2-ff1afa4b55b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bX2Ri6lz4UqCdYdntmbFTrpmv0zVxEqhgCHCu9QV278=","crlite_enrolled":false,"id":"3107a9df-8e66-4472-ad36-f1062492c3e0","last_modified":1606744672021},{"schema":1606678892869,"derHash":"ROvwEj4n/x2wSXvS2uGBVbKkFOa82cbI+49IOYRJuek=","subject":"CN=TeleSec Business CA 1,OU=T-Systems Trust Center,O=T-Systems International GmbH,C=DE","subjectDN":"MHUxCzAJBgNVBAYTAkRFMSUwIwYDVQQKExxULVN5c3RlbXMgSW50ZXJuYXRpb25hbCBHbWJIMR8wHQYDVQQLExZULVN5c3RlbXMgVHJ1c3QgQ2VudGVyMR4wHAYDVQQDExVUZWxlU2VjIEJ1c2luZXNzIENBIDE=","whitelist":false,"attachment":{"hash":"5f456791aae0975819a267a4b01e2b4e0fcb12b375c5334b5a72562eefa58948","size":1947,"filename":"XmXOT9NXQoum_vwr876xEH0qCXmA3ZncBDyibtkXpQU=.pem","location":"security-state-staging/intermediates/085cace9-264b-4a9a-9330-f554e6585359.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XmXOT9NXQoum/vwr876xEH0qCXmA3ZncBDyibtkXpQU=","crlite_enrolled":false,"id":"eda28108-1b54-44e6-b8c5-1b6afcf10b67","last_modified":1606744671982},{"schema":1606506095774,"derHash":"G095TXcNxuBdx6QVhFD4JZVy621Z3mZ6PD++CNoBJIE=","subject":"CN=Global Trust CA - OV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"136048afa3b294583ccc15f0a0a6102dcca6cc9bf7d5c19811460c54c4e79fce","size":2089,"filename":"K6VGZ_ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV-Oe8U=.pem","location":"security-state-staging/intermediates/002c6e58-6238-435b-9b0d-7b0691d17ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K6VGZ/ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV+Oe8U=","crlite_enrolled":true,"id":"d6d94677-fd6d-4901-bbae-6817f8abcd97","last_modified":1606636669583},{"schema":1606333742190,"derHash":"M55rkr5UWfJqjcPF83IJM8g44jZgGwUASMBHoSPm+Oc=","subject":"CN=Sectigo Qualified Website Authentication CA Natural R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MG0xCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMUAwPgYDVQQDEzdTZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIE5hdHVyYWwgUjM1","whitelist":false,"attachment":{"hash":"2fdbc0c44bbbeb793ee6210c10f58a2b439a31b2c4f3ad98fc85188c1f0f7741","size":2272,"filename":"8SDm7JR9Lr5k8CRbSJ0R2_L6J0y30uLS_XkBNMdspCI=.pem","location":"security-state-staging/intermediates/af7fd13b-b101-4e0c-b915-c07e51012dae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8SDm7JR9Lr5k8CRbSJ0R2/L6J0y30uLS/XkBNMdspCI=","crlite_enrolled":false,"id":"6e195515-4482-4668-8fe4-f5027666c37a","last_modified":1606334252701},{"schema":1606333739838,"derHash":"qYQdLkfL5tcdj6/fODh/k/Q9dteSUE77F6IQIMWMC4k=","subject":"CN=Sectigo Qualified Website Authentication CA Natural E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MG0xCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMUAwPgYDVQQDEzdTZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIE5hdHVyYWwgRTM1","whitelist":false,"attachment":{"hash":"7444706a13ee3d249ce6a3beee972c7b398c8ea8de04ca1731c7f2a672dc84f2","size":1256,"filename":"_E4OWM1It5EGPdb8mrqad2xJL7i_-r8fvlJCYaFSPu8=.pem","location":"security-state-staging/intermediates/48775c2f-29fa-4215-9452-7af9caeaf04e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/E4OWM1It5EGPdb8mrqad2xJL7i/+r8fvlJCYaFSPu8=","crlite_enrolled":false,"id":"ffb4d38b-871d-4d95-90a0-f5a3af5f65aa","last_modified":1606334252687},{"schema":1606161750920,"derHash":"zAslEu4gKAw28w1XCErLa4Y22UtIF0LkJDNcd2fnWMY=","subject":"CN=SZCA OV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgT1YgU1NMIENB","whitelist":false,"attachment":{"hash":"f14773351856d24a716ac777ab1f49b20bc3e773a90bd6e81448699608ed3745","size":1756,"filename":"bJ62__O9KMouzGPMfpN1AzgR1FpzP3mVaUCWzzs5FjI=.pem","location":"security-state-staging/intermediates/2377fa54-4f75-4365-adcf-533a61b44d4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJ62//O9KMouzGPMfpN1AzgR1FpzP3mVaUCWzzs5FjI=","crlite_enrolled":true,"id":"31bbaba6-e6cc-4825-8c0e-724e8d0c9398","last_modified":1606298245517},{"schema":1606160494313,"derHash":"oX1hDWhKT/Iokus8AyW8b36ux4cUuHZyHsuwMzV2FyY=","subject":"CN=FujiSSL Public Certification Authority - G2,O=Nijimo\\, Inc.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMRUwEwYDVQQKEwxOaWppbW8sIEluYy4xNDAyBgNVBAMTK0Z1amlTU0wgUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"af126afe4039f135d0760332f28490f6b342c6bae42eabf97eb795c14726eb23","size":1626,"filename":"9JHVNVBfHJmPYVl2MYnHpVngU078_w25VD2RfhBP-xk=.pem","location":"security-state-staging/intermediates/39b0118b-e68a-47ca-8de4-28f23d41335a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9JHVNVBfHJmPYVl2MYnHpVngU078/w25VD2RfhBP+xk=","crlite_enrolled":false,"id":"6287a280-58bd-4c6c-8833-22c9b30a93d0","last_modified":1606161750117},{"schema":1605878542738,"derHash":"vf2E2QKq0BDE4IExd1r7c2VpTugcm4ri33ZBnz7fG+E=","subject":"CN=TrustSign BR Certification Authority (OV) 2,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoT1YpIDI=","whitelist":false,"attachment":{"hash":"d3dc3d5cc6b731efb8dd4582c2ff3a8a8908962642aa4824f4b90b58832e90cd","size":2251,"filename":"YH8nyVlvrD15SoA59nrCYN5KN2y2Xz-fJ5K-uBAfl1Y=.pem","location":"security-state-staging/intermediates/c00b8ed3-5bd7-4213-8c0b-7b171e5b524a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YH8nyVlvrD15SoA59nrCYN5KN2y2Xz+fJ5K+uBAfl1Y=","crlite_enrolled":true,"id":"4d16fbc3-1ed1-40c0-940d-7abe6b7f2408","last_modified":1605945559522},{"schema":1605772140734,"derHash":"M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=","subject":"CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"7b5d64467372b9a0fe18ac79c51920708cd6c7b9c0d147b7a4a34b03d00bb358","size":1325,"filename":"qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem","location":"security-state-staging/intermediates/0c3ef7f6-26b4-4d20-9cb8-4c3b14750242.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=","crlite_enrolled":true,"id":"0a6eb392-3c5c-43f2-b690-2b1aade1bd65","last_modified":1605772704241},{"schema":1605772140264,"derHash":"M47bBPuL6vB6EHSef05TjeBxXa+2R41YBj+3yL2www0=","subject":"CN=DigiCert Global G3 TLS ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMyBUTFMgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"7b5d64467372b9a0fe18ac79c51920708cd6c7b9c0d147b7a4a34b03d00bb358","size":1325,"filename":"qBRjZmOmkSNJL0p70zek7odSIzqs_muR4Jk9xYyCP-E=.pem","location":"security-state-staging/intermediates/502372d5-20f4-4deb-a9b8-3f30424dac2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qBRjZmOmkSNJL0p70zek7odSIzqs/muR4Jk9xYyCP+E=","crlite_enrolled":true,"id":"759b2da7-e5d3-4d7e-9ffe-d2f76b839a59","last_modified":1605772704220},{"schema":1605728373130,"derHash":"hDqnaDKJtx00jAh65vcaHIMTi0w5fzFtHnjJ2oZmC4Q=","subject":"SERIALNUMBER=201403,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDM=","whitelist":false,"attachment":{"hash":"2d7b611abc13145ddd774597f42e94c75815440e6a93c58100920eddebec906c","size":2093,"filename":"NOiJ9aKMOqQ8-vIWDKgcNhgjZvY5sEVcjdasO9aAZts=.pem","location":"security-state-staging/intermediates/7527cef8-47f2-4be7-82b5-ffbc4be18fa9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NOiJ9aKMOqQ8+vIWDKgcNhgjZvY5sEVcjdasO9aAZts=","crlite_enrolled":true,"id":"b255a018-1cfd-4cb0-a8c2-5afafbdcc29c","last_modified":1605772704200},{"schema":1605533478416,"derHash":"90w7LH5FXWVNnuWqpxJ4nMsme5YcGhzkimnIYM0ZNng=","subject":"CN=Thawte EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBFQ0MgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"029e038309e109b338a8e5d3d4e6300803b81c7d7d64ed413d523864ea9f6f9d","size":1390,"filename":"sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS_jwKtxLc=.pem","location":"security-state-staging/intermediates/c4cea83a-c04d-4940-8b0e-62cf421b3779.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHnhNNcEZAQ0U5qyqTUj5LjSA8SG8NfF7zS/jwKtxLc=","crlite_enrolled":true,"id":"fe536340-3673-4218-bc86-b13888ae9bf3","last_modified":1605578284427},{"schema":1605123695624,"derHash":"yTGg+FoFKQEjSlT9Rg1BfxqLY8OMSBH3m5jzrhwv6fs=","subject":"CN=SECOM Passport for Member PUB CA5,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTU=","whitelist":false,"attachment":{"hash":"c65635be2bd0d20a2b0fd6d70bd227a546782c46ab1e3c6b2394239fc8cfd6cb","size":1695,"filename":"v3h5R_3OzMC-NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=.pem","location":"security-state-staging/intermediates/de481d0f-d78a-4134-95c5-8978b12cffcd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3h5R/3OzMC+NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=","crlite_enrolled":false,"id":"8cc1c1a9-82f5-425d-bc26-7033cc45e093","last_modified":1605189460438},{"schema":1604950897176,"derHash":"E+oRBESaEaH4HLl9CYxILsEqK2CetTx+YVXtCEqosJM=","subject":"CN=SECOM Passport for Member PUB CA1,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTE=","whitelist":false,"attachment":{"hash":"cbe1744ff7c3b516662a7fcf7f98a6251c21968145cac4cedf9a9f3172ff0574","size":1581,"filename":"6cgk6TZAPcY4yIiIMAg1ccG9_fhHLRXTFVWj7IrvDq4=.pem","location":"security-state-staging/intermediates/b3a3dc5c-8be0-46e0-9329-c2253f02349f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6cgk6TZAPcY4yIiIMAg1ccG9/fhHLRXTFVWj7IrvDq4=","crlite_enrolled":false,"id":"3bda166d-f610-4dee-9b49-3b63bba2ef5b","last_modified":1605081484966},{"schema":1604908139751,"derHash":"15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=","subject":"CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"388fede353d5e81549d7a9a264bceab472ffc7eff4991123ac93299f4a9ebfe3","size":1536,"filename":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem","location":"security-state-staging/intermediates/14b3ab45-1d4e-450b-9224-99c237082b97.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=","crlite_enrolled":true,"id":"61051771-39c7-4792-994d-f7e1b8f69254","last_modified":1604908666929},{"schema":1604778093487,"derHash":"15otXgMpXA6f6uNtAh69UglwCrGp6BekPzD6PGb3jSE=","subject":"CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBIeWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"388fede353d5e81549d7a9a264bceab472ffc7eff4991123ac93299f4a9ebfe3","size":1536,"filename":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=.pem","location":"security-state-staging/intermediates/f4b4778a-4e0c-4756-bf8f-075982ede557.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0IRz5Tio3GA1Xs4fUVWmH1xHDiH2dMbVtCBSkOIdqM=","crlite_enrolled":true,"id":"2e597179-5b56-4fea-bf13-6d641de8d405","last_modified":1604908666908},{"schema":1604605293287,"derHash":"LmsV+e7R69YtJ1aR+T3JQ/kN0eCvEYkGYZxXfXUpi9o=","subject":"CN=CrossTrust DV CA4,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBNA==","whitelist":false,"attachment":{"hash":"e44f47a3381c3bd6aad3c0e85f6aac99405404d194c82777031a54eca4500dad","size":1589,"filename":"bzFxWlFhCb1TJC-ZiW0DXANo9uoO45khqSeMELmYpJ8=.pem","location":"security-state-staging/intermediates/2beceff3-685f-42a3-b31b-2f13ed3711f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bzFxWlFhCb1TJC+ZiW0DXANo9uoO45khqSeMELmYpJ8=","crlite_enrolled":false,"id":"22cc58f6-abf4-4039-92e1-6739f9c77c7d","last_modified":1604649438460},{"schema":1604524708530,"derHash":"3pjRCJ+u+Ol9jEKPIYrKDtF8Vc+zVxEl5aURiameKJg=","subject":"SERIALNUMBER=201502,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMg==","whitelist":false,"attachment":{"hash":"f6fd663baa7ee87b66e0d41b4d6d83d993a00817f1591bdd92cb0340672c10f5","size":2097,"filename":"JBmS5WYsQXSCs7cj9Y7nmmgLd8xpVrpdsZFXcnD15HU=.pem","location":"security-state-staging/intermediates/812ee2d5-773e-4345-ad5c-fa142a66fab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JBmS5WYsQXSCs7cj9Y7nmmgLd8xpVrpdsZFXcnD15HU=","crlite_enrolled":false,"id":"c2109866-4770-49a8-abec-da2ea0083799","last_modified":1604541499405},{"schema":1604389849675,"derHash":"JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=","subject":"CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"7f449f1e3178f1a2603b8177a108b02654caa02203944597174e3f46651ba513","size":1764,"filename":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem","location":"security-state-staging/intermediates/7485d12b-9344-4c47-ac5b-288655151f37.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=","crlite_enrolled":true,"id":"6261e4b7-bb37-4f81-98ea-f94e5bd6e51a","last_modified":1604390293643},{"schema":1604389737473,"derHash":"H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=","subject":"CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"be6d0e35f0c53e7c0af632d9bdf5dabd2be82214fc5e1c990c2bb46537d41287","size":1776,"filename":"Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem","location":"security-state-staging/intermediates/df6e4082-7b47-4af2-8d24-f1add41951d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=","crlite_enrolled":true,"id":"6dc04366-cd3f-4bd3-8b1e-25fcf12fb005","last_modified":1604390293622},{"schema":1604325493707,"derHash":"JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=","subject":"CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBSU0EgU0hBMjU2IDIwMjAgQ0Ex","whitelist":false,"attachment":{"hash":"7f449f1e3178f1a2603b8177a108b02654caa02203944597174e3f46651ba513","size":1764,"filename":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=.pem","location":"security-state-staging/intermediates/4017d719-9895-4e22-9126-8a0f51a90435.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RQeZkB42znUfsDIIFWIRiYEcKl7nHwNFwWCrnMMJbVc=","crlite_enrolled":true,"id":"574b122c-db71-4b2e-9e17-0037916e0d24","last_modified":1604390293602},{"schema":1604389736973,"derHash":"H4656ajgZsxbODPgazEpdktiJjnVsWP2AOHHkSC/Pu0=","subject":"CN=DigiCert Global G2 TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2JhbCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"be6d0e35f0c53e7c0af632d9bdf5dabd2be82214fc5e1c990c2bb46537d41287","size":1776,"filename":"Wec45nQiFwKvHtuHxSAMGkt19k-uPSw9JlEkxhvYPHk=.pem","location":"security-state-staging/intermediates/c4681dc7-0e43-4ac0-8bc3-34144df38b63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wec45nQiFwKvHtuHxSAMGkt19k+uPSw9JlEkxhvYPHk=","crlite_enrolled":true,"id":"35a1d22d-443b-417b-a403-ff057dc50c1c","last_modified":1604390293581},{"schema":1604163572112,"derHash":"qq/pPjWbFJpMngtXLVG/N/2jin6aNZv5A1m6nKqWqt8=","subject":"CN=Atos TrustedRoot Server-CA 2013,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgU2VydmVyLUNBIDIwMTMxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"3a6282f735ea66c38369711f7a511e7a8f40608ccbb6adb005af1b94bad5d4de","size":1561,"filename":"obLbX6ExWI0XXj12lo4-ITcs5rF7AE6dzl2X86Q8EpI=.pem","location":"security-state-staging/intermediates/69a41bd1-a437-463d-b4ba-83c2a65e4936.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"obLbX6ExWI0XXj12lo4+ITcs5rF7AE6dzl2X86Q8EpI=","crlite_enrolled":false,"id":"a25c486d-fc0f-4770-9864-911e40701c9b","last_modified":1604325492885},{"schema":1603979716226,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/bb2dc257-d008-42de-ac7f-5c5c5da83a16.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"1625200c-4327-47a5-ac76-3eeb94c77907","last_modified":1603983473695},{"schema":1603979451595,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/b446caf5-e02c-44cd-a182-fe46d91d9d58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"cfb41545-0746-4be6-8d75-5a993a4ac7f5","last_modified":1603983473670},{"schema":1603979907768,"derHash":"ACOT+gpoJfd+9obiCGILlxd3kfAvB9slGEgPvjfOe9g=","subject":"CN=Sectigo Qualified Website Authentication CA R35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIFIzNQ==","whitelist":false,"attachment":{"hash":"f3fd4f6e976f11c869a9af70485fa21943e3a8f8c535b2978a053f1c80c4a59c","size":2259,"filename":"KxJdQKV5G03wpSUMzFPrE_WdnS5RnO4gex-GeXPUDnw=.pem","location":"security-state-staging/intermediates/3aa18798-246a-4c38-aaf6-d0ba69875c58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxJdQKV5G03wpSUMzFPrE/WdnS5RnO4gex+GeXPUDnw=","crlite_enrolled":true,"id":"251b1a67-1d3e-4e59-83cb-1523c2461f64","last_modified":1603983473633},{"schema":1603789063900,"derHash":"ogZkT1ev0QuUFpSYhYmBwW1jOFjODIi1fPFPoqkqrP0=","subject":"CN=Secure Site Pro ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlNlY3VyZSBTaXRlIFBybyBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"e293173433a0678dd0c07a0432db8bc25e796896b84c9cfb996a1234d78528d2","size":1443,"filename":"jqgpMe3J72LhpK4BfQvcmwg-Oh-RwdZH-swdUvq8F9k=.pem","location":"security-state-staging/intermediates/9620ee73-5f68-44bd-b368-b0ca0bcc7153.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jqgpMe3J72LhpK4BfQvcmwg+Oh+RwdZH+swdUvq8F9k=","crlite_enrolled":false,"id":"d9d951a6-56f3-4229-8405-898b7f223384","last_modified":1603850281659},{"schema":1603849736165,"derHash":"fsjnqkIZXpo2uFjilmnqo31XsTr6IzG9rqah6/fkbn4=","subject":"CN=CertCenter Enterprise ECC EV CA,OU=Controlled by COMODO CA exclusively for CertCenter AG,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MIGyMQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMRAwDgYDVQQHEwdHaWVzc2VuMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgQ2VydENlbnRlciBBRzEoMCYGA1UEAxMfQ2VydENlbnRlciBFbnRlcnByaXNlIEVDQyBFViBDQQ==","whitelist":false,"attachment":{"hash":"ad13f4a2c2b0453bcad7768dfb8aa9dd9abf52d18d9b3381705fe30226d297cc","size":1414,"filename":"9IEsy6v-cBI7ee5Y4xt277Tel65rfvCSsKBMLrGfjVI=.pem","location":"security-state-staging/intermediates/4c478c30-a765-41e1-95bd-ee2f0924ed09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9IEsy6v+cBI7ee5Y4xt277Tel65rfvCSsKBMLrGfjVI=","crlite_enrolled":false,"id":"02b2f900-f9fa-411c-9402-75944e3fdbbf","last_modified":1603850281630},{"schema":1603741294890,"derHash":"PF45H9jKOyFhRJViSuWynzntBmEktZRDj5SUs0NDx5U=","subject":"CN=EuropeanSSL High Assurance Server CA 2,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MIGIMQswCQYDVQQGEwJERTEbMBkGA1UECAwSQmFkZW4tV8O8cnR0ZW1iZXJnMRQwEgYDVQQHEwtEdXJtZXJzaGVpbTEVMBMGA1UEChMMRVVORVRJQyBHbWJIMS8wLQYDVQQDEyZFdXJvcGVhblNTTCBIaWdoIEFzc3VyYW5jZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"b7ee97e44a0b08b84600f14d91999274d13538fbe487ae5bbe2ffeda760373f7","size":2166,"filename":"HhU8wZ-rl8VgXaRRv_XdnUCKI8eLRVXfTeY77HdaQ3Y=.pem","location":"security-state-staging/intermediates/f4cdda25-89ad-4ed5-8091-82787a46cd76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HhU8wZ+rl8VgXaRRv/XdnUCKI8eLRVXfTeY77HdaQ3Y=","crlite_enrolled":true,"id":"a64ae3ed-7e46-4997-83b9-78bead9c29f5","last_modified":1603785478255},{"schema":1603784937046,"derHash":"C9FHkYe6Aeo+k4p1DHveO28oXcEOu5lTA/ZmAbpbLSA=","subject":"CN=WebSpace-Forum Server CA II,O=WebSpace-Forum e.K.,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHMxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEcMBoGA1UEChMTV2ViU3BhY2UtRm9ydW0gZS5LLjEkMCIGA1UEAxMbV2ViU3BhY2UtRm9ydW0gU2VydmVyIENBIElJ","whitelist":false,"attachment":{"hash":"7768f5bec77dbbbde9e9572bc1c4098d4a05278998998904ac61c71b62987df1","size":2133,"filename":"5RYmGs6llHArO1X6YMpESuHfz0WJ0hjDErS2_5y9hWo=.pem","location":"security-state-staging/intermediates/892d5f14-b84e-460c-b541-1c43bd0b45f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5RYmGs6llHArO1X6YMpESuHfz0WJ0hjDErS2/5y9hWo=","crlite_enrolled":true,"id":"28961bab-dbd4-41f9-a1f3-d6fbd473a508","last_modified":1603785478231},{"schema":1603568492594,"derHash":"dnvCnbma9MKmJkkADRcvxswtCdQIxMq2qNmaHdXc99s=","subject":"CN=CertCenter Enterprise ECC DV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"f8716a70364bdbf780503d8d9ac1bacd7600d5f66e511193c3337cf92df9e24a","size":3756,"filename":"zuRQp-iYZxMyj8bp4pFJtJ30vMQId6DXMagFWZ9jfmU=.pem","location":"security-state-staging/intermediates/b0afc492-2be7-4ad1-923d-89b25034dc22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zuRQp+iYZxMyj8bp4pFJtJ30vMQId6DXMagFWZ9jfmU=","crlite_enrolled":false,"id":"719f84ba-e1e8-4bdd-a10b-76268634b5d7","last_modified":1603591065213},{"schema":1603504182613,"derHash":"3CcoMxMS51xNe0QvO92nkMt3qdashU1bzhisQ8pZkJo=","subject":"CN=ATT Atlas R3 OV TLS CA 2020,O=ATT Services Inc,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBBVFQgU2VydmljZXMgSW5jMSQwIgYDVQQDExtBVFQgQXRsYXMgUjMgT1YgVExTIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"e93ec3c93798a4c69c537ee7a488670b0c74cf8ea19467445243e440fc143d44","size":1699,"filename":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa-HSRf4=.pem","location":"security-state-staging/intermediates/e319120e-f55a-4fb8-acd8-2770716a5481.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa+HSRf4=","crlite_enrolled":true,"id":"461f5fb1-2c7d-4292-92b0-c3b6b9545359","last_modified":1603504658778},{"schema":1603504181937,"derHash":"3CcoMxMS51xNe0QvO92nkMt3qdashU1bzhisQ8pZkJo=","subject":"CN=ATT Atlas R3 OV TLS CA 2020,O=ATT Services Inc,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBBVFQgU2VydmljZXMgSW5jMSQwIgYDVQQDExtBVFQgQXRsYXMgUjMgT1YgVExTIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"e93ec3c93798a4c69c537ee7a488670b0c74cf8ea19467445243e440fc143d44","size":1699,"filename":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa-HSRf4=.pem","location":"security-state-staging/intermediates/38da369b-01f7-4c44-8faf-e99f6ec6cb1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gswJkaWI1c2mfCUfT3FpRjIef2nGdyV07Uoa+HSRf4=","crlite_enrolled":true,"id":"975baf8e-91bf-44e3-8f33-57c1e8df8a23","last_modified":1603504658759},{"schema":1603421850516,"derHash":"71ZjFC9bLWuCdFKbFX3y+WWnGHOlrlql4HICRPI5i28=","subject":"CN=CertCenter Enterprise RSA EV CA,OU=Controlled by COMODO CA exclusively for CertCenter AG,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MIGyMQswCQYDVQQGEwJERTEPMA0GA1UECBMGSGVzc2VuMRAwDgYDVQQHEwdHaWVzc2VuMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgQ2VydENlbnRlciBBRzEoMCYGA1UEAxMfQ2VydENlbnRlciBFbnRlcnByaXNlIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"64e8335938bbaaed651bd59a9b50e97bfe919c616430e117a5ab454247a4949e","size":2255,"filename":"CaGpyyfpmNg5jcDd5cWMfcPMbbqa5_5gKWvNRcBjqoA=.pem","location":"security-state-staging/intermediates/99b11aff-7143-4874-8b2d-03b88f194e89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CaGpyyfpmNg5jcDd5cWMfcPMbbqa5/5gKWvNRcBjqoA=","crlite_enrolled":false,"id":"74d7ba69-fd50-4a4a-947c-c4d634776f86","last_modified":1603504658740},{"schema":1603395693272,"derHash":"MkC4HG31Uq6hbXAinb/v8k1Q6qmiJyORiI9lvpW0UOM=","subject":"CN=CertCenter Enterprise RSA OV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"f0ef15c657a987fd884de4d2445f0e2311d7cecef612a3443bcc050eac65d0ae","size":2138,"filename":"ke_AQ9WF4UMSgAU_wMJhEjKM4oBlpoIH0lidCk0FTIM=.pem","location":"security-state-staging/intermediates/97f31fbd-c914-4077-9d2f-90ed3d7eec32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ke/AQ9WF4UMSgAU/wMJhEjKM4oBlpoIH0lidCk0FTIM=","crlite_enrolled":false,"id":"205e175a-96fc-44bc-b8ba-0dd4c7881485","last_modified":1603418262238},{"schema":1603417750565,"derHash":"wG7UFefe0G5aSgg6gCX2XkXU5GtjUema20feSLAvi+0=","subject":"CN=CertCenter Enterprise RSA DV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"73c39b45f6be720b687e13337fa318950c5887b8e1fae66aa0d7c83bd7b66dfe","size":2133,"filename":"FfDDB8UNFaSYYtmGpdb9uuU8NXG50-ypsKYjpMCN2c0=.pem","location":"security-state-staging/intermediates/8d50283b-4b41-4218-9f3b-5a1bdac55359.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FfDDB8UNFaSYYtmGpdb9uuU8NXG50+ypsKYjpMCN2c0=","crlite_enrolled":false,"id":"980e074c-1142-4749-9f90-b1d7d8e5f3b2","last_modified":1603418262218},{"schema":1603331414283,"derHash":"GLtw79o/kUOBFcnrTzM+tOxoNUVx5pSRlaCpHJ5vvNg=","subject":"CN=QuoVadis RCA1G3 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0ExRzMgVExTIENB","whitelist":false,"attachment":{"hash":"b3bb67e5eae26a4c94edb219c24b0b5e4b61ccf76dfc1f6b45000e822a22ceb3","size":2369,"filename":"oVTzYxEWPWmbDlo2GZhwL-6my7pLP_DO_Q5zS0j4erM=.pem","location":"security-state-staging/intermediates/0142a491-80f0-4728-bbff-4b23436aafa0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oVTzYxEWPWmbDlo2GZhwL+6my7pLP/DO/Q5zS0j4erM=","crlite_enrolled":false,"id":"6737f4c2-a14c-4b1d-8e0c-b062884b238a","last_modified":1603331864382},{"schema":1603331409918,"derHash":"7MDResMmOsahZNzbCPgtB+k/zqcj9muIsG7rqWeN8rs=","subject":"CN=QuoVadis RCA3G3 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzMgVExTIENB","whitelist":false,"attachment":{"hash":"fc4fc6584822834debd279e4a8481536c6bd26913df00dda003fbc4ed5facf42","size":2369,"filename":"HGG1eHmdWucI4rZV77-UwfI3jqj3-wm0NFUmWbyNZvs=.pem","location":"security-state-staging/intermediates/098ff8c0-cbd6-4de0-93e9-b29fc7971c7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGG1eHmdWucI4rZV77+UwfI3jqj3+wm0NFUmWbyNZvs=","crlite_enrolled":false,"id":"c4121d69-d075-4111-9d27-6dbed565f530","last_modified":1603331864371},{"schema":1603331412138,"derHash":"a7lkZHte5hWaKgKe5cfc0dnPOwiEUeCmjpDmB0w/XKM=","subject":"CN=QuoVadis RCA1G1 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0ExRzEgVExTIENB","whitelist":false,"attachment":{"hash":"34870e705e578bbcd98319ac5f84b11e5770d2ad43f4dfe76db0785c91777fdb","size":2089,"filename":"Qvjdi2jwbwNDElJ0tj6ROtrf4nU-v9QUSIl7Mk_pIgk=.pem","location":"security-state-staging/intermediates/d3959276-8446-44d6-bbf5-d30de62aeabd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qvjdi2jwbwNDElJ0tj6ROtrf4nU+v9QUSIl7Mk/pIgk=","crlite_enrolled":false,"id":"0e7c9134-ab1c-4f19-846d-30587aaac2be","last_modified":1603331864359},{"schema":1603331407633,"derHash":"OmbmSCEuYyH5TZ6rzJLAUuZ52ZLJmtRZak57ha3O5d4=","subject":"CN=QuoVadis RCA3G1 TLS CA,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzEgVExTIENB","whitelist":false,"attachment":{"hash":"e5c77c38ef33f161625bc3592afbf547db64bc8507aff887efbd2902cd674003","size":2361,"filename":"cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp_y4=.pem","location":"security-state-staging/intermediates/4251568a-3965-4fe1-81c3-100b6c736472.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp/y4=","crlite_enrolled":false,"id":"6eca33ec-4f64-4e1a-9686-48926a7dccbd","last_modified":1603331864347},{"schema":1603241851952,"derHash":"qmHCkn3InbIlypoX1gA3PQWPaW2G0Q4r17Xo9EqX7tE=","subject":"CN=WoSign OV SSL Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIE9WIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"afb1ffcaed2f65ba6080da16e771b2fd79536ffb5f81dc7fd0f22152661e7331","size":1666,"filename":"YgNpzwCbB-5jnp9Vn5xVC090y79oIjE_2P8pF1_4DMI=.pem","location":"security-state-staging/intermediates/4aef0608-20c1-4fb7-b413-e1f6b8d8ccf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YgNpzwCbB+5jnp9Vn5xVC090y79oIjE/2P8pF1/4DMI=","crlite_enrolled":false,"id":"ff45948b-1310-4371-a262-b582c5ad0bbb","last_modified":1603245450595},{"schema":1603205963547,"derHash":"kzuA97lyVd9c8dlaEj6QFyLdswtIGvOqg1SCARGe0wM=","subject":"CN=AC Firmaprofesional - Secure Web 2020,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGTMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxGjAYBgNVBAsMEVNlY3VyaXR5IFNlcnZpY2VzMS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gU2VjdXJlIFdlYiAyMDIw","whitelist":false,"attachment":{"hash":"52c3fc5e3b79e5116293a6f3f94714018b37170fcaad6cecb1a8528e12265be4","size":2304,"filename":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=.pem","location":"security-state-staging/intermediates/e90cca09-75a9-4de3-8a0c-95aee7b3a2d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=","crlite_enrolled":true,"id":"154de830-9906-4718-b472-7abb5a1a20f3","last_modified":1603209441493},{"schema":1603205802060,"derHash":"kzuA97lyVd9c8dlaEj6QFyLdswtIGvOqg1SCARGe0wM=","subject":"CN=AC Firmaprofesional - Secure Web 2020,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGTMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxGjAYBgNVBAsMEVNlY3VyaXR5IFNlcnZpY2VzMS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gU2VjdXJlIFdlYiAyMDIw","whitelist":false,"attachment":{"hash":"52c3fc5e3b79e5116293a6f3f94714018b37170fcaad6cecb1a8528e12265be4","size":2304,"filename":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=.pem","location":"security-state-staging/intermediates/a129dd72-36e3-442a-bd95-4a35a0dcec63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HLNGq69C6VUDfEsMKKHPJo4S4cvlTKeTx53VBUCO1JY=","crlite_enrolled":true,"id":"140dddc9-659c-426f-a0ae-c2d82202b637","last_modified":1603209441473},{"schema":1603133839564,"derHash":"LihhKJtczt7K5MMb8mLg+wwptsFTBXNEJzHKZdgh6QE=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"bf637313289e8c27077991be26a0d07e37b59838312f06c7099b3e967081ef81","size":1589,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/9a6d9b7e-8c6d-4c3a-a77c-3e8b76b81960.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"62e33177-52e4-4dd8-acfc-f9fd671aab01","last_modified":1603137438283},{"schema":1602961037868,"derHash":"qlf0gsvFFrTRDKQJfdkNmfWqcn0gcJDQfanDaZirua0=","subject":"CN=HydrantID SSL CA G3,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHDAaBgNVBAMME0h5ZHJhbnRJRCBTU0wgQ0EgRzM=","whitelist":false,"attachment":{"hash":"7e0808e92ebc33ef96558a3d7c46b9b86290ea9b9c814fe1b375dd5f6e94179f","size":2414,"filename":"CgDzm8Z-Gk0j7D6yq4U4IstjpiYpBiVqyPDYr-62oO8=.pem","location":"security-state-staging/intermediates/5cbfc23e-7d49-4372-82b5-58e1a0a3785e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CgDzm8Z+Gk0j7D6yq4U4IstjpiYpBiVqyPDYr+62oO8=","crlite_enrolled":true,"id":"b97f538d-34bf-41f2-ba3b-3ffa41cdfa5e","last_modified":1602964635139},{"schema":1602939433240,"derHash":"unmfMiWR3X0128WPSCByXwlPVDqhPLRYxVyR3Ia+Iv8=","subject":"CN=CERTDATA SSL EV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBFViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"817455fbcfc00bd641341d581d3a97196ae6a94a33f63590a5b540321bf458e8","size":2158,"filename":"cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=.pem","location":"security-state-staging/intermediates/498affb3-e1de-4edb-9347-ffb1561473e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cVSKuRG7oLetITEBYy5dH5QBCUayslF78ETJPRfzwkU=","crlite_enrolled":true,"id":"9b021867-2e4d-4bd5-ad39-3ba7645c4e76","last_modified":1602943040447},{"schema":1602917835280,"derHash":"dWqrkA4/XHYnNLZGH8MqndNB6h1KBCg0CSM8OXh6hn4=","subject":"CN=TrustAsia ECC OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzM=","whitelist":false,"attachment":{"hash":"2e493c5d02aaed01f99e9499d09f7808636cd52471c8ddfc79dfb5c64d83b8ac","size":1353,"filename":"tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=.pem","location":"security-state-staging/intermediates/5ea136cd-de72-4386-83f7-76fda17b499d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tbnWlmtVSEavKTtABU3v0aeisdNi3iLXhpU10YWnzRw=","crlite_enrolled":true,"id":"13e82017-a63b-46d6-8df5-d824c3250fcc","last_modified":1602921443410},{"schema":1602766682987,"derHash":"sIwZai7R6E+YktsbYSGc62QogkePObCHGWA9BzX6A9E=","subject":"CN=CA de Certificados SSL EV,OU=BZ Ziurtagiri publikoa - Certificado publico EV,O=IZENPE S.A.,C=ES","subjectDN":"MIGBMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xODA2BgNVBAsML0JaIFppdXJ0YWdpcmkgcHVibGlrb2EgLSBDZXJ0aWZpY2FkbyBwdWJsaWNvIEVWMSIwIAYDVQQDDBlDQSBkZSBDZXJ0aWZpY2Fkb3MgU1NMIEVW","whitelist":false,"attachment":{"hash":"388ad7bfbc659f5233cd21bf5d91654c878954f11b1f806a8471ebe1dc89e676","size":2515,"filename":"D0NbyGhND0J0g9UeFoaXmcD9hKK6WSHEogR1kaVlsfA=.pem","location":"security-state-staging/intermediates/3edc35f2-2f62-434a-b3d0-3fa02db4b362.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D0NbyGhND0J0g9UeFoaXmcD9hKK6WSHEogR1kaVlsfA=","crlite_enrolled":false,"id":"097e4515-9a01-4511-a66e-dd72a6a0a98c","last_modified":1602770278643},{"schema":1602723479783,"derHash":"eGeq6QXrjVVjX/67v4zwWmO5s5BmXeI2esEHPpKRNyg=","subject":"CN=Thawte CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHDAaBgNVBAMTE1RoYXd0ZSBDTiBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"6abb2fa6476c1d938c58f7d3648720a6cb3239b7fc026f82046b76d081192231","size":1825,"filename":"VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=.pem","location":"security-state-staging/intermediates/1ff4f374-cd06-4afa-af4e-4f8b3a444843.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMXglf2ljsL4aRTMSwEqaTOKsyr2QltUubbk10mUCT0=","crlite_enrolled":true,"id":"f1601a66-8fd4-4b53-9279-cb7e19b76aa6","last_modified":1602727076193},{"schema":1602647311437,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/beb6572f-d50f-49e3-b522-e0fe9eeab7fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"dca5191c-f858-49ca-a6b2-00f2b0f05703","last_modified":1602647874803},{"schema":1602647312961,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/474af47c-ab34-47f0-9db5-7040d594066b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"4e869e4f-53c6-4bd3-9258-7598c81fab2e","last_modified":1602647874790},{"schema":1602647309895,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/47f00ab7-e48a-442b-9784-5c0b868f566e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"4890ab90-0f29-46a1-b3dc-d52fa68f9372","last_modified":1602647874776},{"schema":1602647305364,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/eb498f2b-bc85-4f23-89cb-665499148b38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"41ca7b3f-d056-431f-9812-e3654e7b1240","last_modified":1602647874765},{"schema":1602647308368,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/a69eec9d-0275-4eaa-9b0a-e523fbdd3a8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"eea631ce-192d-4b2d-8672-08e5b2626a2c","last_modified":1602647874753},{"schema":1602647306905,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/a65de85c-368b-4cff-a210-dba348e6ce3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"1cefe49f-ef56-4996-bcdb-2fb9d9f3e0f1","last_modified":1602647874741},{"schema":1602647302024,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/0e071112-b7ec-44a8-bf67-d3723d6c9c8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"d709f323-b76c-451f-bf49-dabb2b709355","last_modified":1602647874718},{"schema":1602643717900,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/4588f17a-19a9-4b87-8bc7-cc7a8f3cd02a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"99222dda-57f4-496b-a40e-da86b57d52f1","last_modified":1602644269945},{"schema":1602643716484,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/b756e2ce-c3a3-4925-8863-6eb0770f170b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"3c36b8ef-d2ca-44ed-9c79-583632600361","last_modified":1602644269933},{"schema":1602643713481,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/c634aa09-48b7-4b62-a0cd-2ed068b25b24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"a25361d2-dff5-46fc-a564-b5747ef9506b","last_modified":1602644269922},{"schema":1602643710444,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/1c3c49e3-967d-4a9b-95ae-11369f856524.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"e210e9bd-6cc8-4831-b27f-5a9929687c99","last_modified":1602644269898},{"schema":1602643706774,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/c43aba38-0250-470d-bc16-4fa8ee7973cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"e3964c59-8391-4432-9624-9b3f841b6121","last_modified":1602644269887},{"schema":1602643708962,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/bd9bdd90-d095-4742-a046-a09c00d73663.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"d7b0cd98-f3ca-42ba-a858-0a8ddd93a881","last_modified":1602644269875},{"schema":1602643711912,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/4ad66af4-3592-47b1-8904-24809ee4969b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"6ecd7afb-009a-4d64-84bd-55a9b230d932","last_modified":1602644269863},{"schema":1602640122258,"derHash":"PtE/nRnlb1uhSSOFyoE/fdY7vrPPXFbbXDCc9OqpAXE=","subject":"CN=AlpiroSSL RSA EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"d8ed27e0fbef44ebfedcbc8e1705873016d400cc7d7c6a9eb9389e479fdabf18","size":2442,"filename":"LDLs3_RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=.pem","location":"security-state-staging/intermediates/1b89cfad-19e3-489b-b8c4-504e5e5e9475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LDLs3/RixO6BHgKBiz13AqqAeJBFICakKMCnDQ1sQ04=","crlite_enrolled":false,"id":"85dfcf61-54d1-481d-a21a-e7345029aab6","last_modified":1602640676802},{"schema":1602640115594,"derHash":"+C+LUJZ8ClLp2Bt5qQ/+uOUVt4FKXl3i8msPavb+dTE=","subject":"CN=AlpiroSSL ECC EV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"bf09308f3a01e9ddf3ae677edf6cd8e3a11e9e3c0c419fe2bfaa997e33c16acf","size":1293,"filename":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=.pem","location":"security-state-staging/intermediates/7609c1c4-b19b-4565-9720-dd5e6d124c41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnXFLd5ceheMJdGnZvJlKLtfXp4UjCGVFGe713NdmTc=","crlite_enrolled":false,"id":"6b3d1184-9e4d-4516-bfb4-06d823d81fc5","last_modified":1602640676790},{"schema":1602640108808,"derHash":"Vi1qW0sGdGX/0Pv8m7BXVc2s9Vte5cb5ELi1PbEo9Xo=","subject":"CN=Sectigo Qualified Website Authentication CA E35,O=Sectigo (Europe) SL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKExNTZWN0aWdvIChFdXJvcGUpIFNMMTgwNgYDVQQDEy9TZWN0aWdvIFF1YWxpZmllZCBXZWJzaXRlIEF1dGhlbnRpY2F0aW9uIENBIEUzNQ==","whitelist":false,"attachment":{"hash":"55ec2d5ec4b78d089d9860db6394ae011c61807312053911f31093c1f37a7471","size":1248,"filename":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=.pem","location":"security-state-staging/intermediates/c06db3d6-f723-43e2-99fe-fb7ab58beff9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTu6tENFs1xZQP1NiYhwg6AMeqalq2jUuwpowf0rQuY=","crlite_enrolled":false,"id":"3d87fa81-1922-410b-ad87-b072f825cf4c","last_modified":1602640676779},{"schema":1602640117836,"derHash":"DSzH5pc/gPoiU/uIgo72rLs7lf+nfEiWUMNWc19UtwY=","subject":"CN=AlpiroSSL ECC OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"ff2354ed7f035b8d871925675759f6b13bbda368e971c08e2f1a39847b74a408","size":1264,"filename":"X_kxO0BscKQlU9_xYyElfuh-DkcVP6lXeRrOBQPEQoo=.pem","location":"security-state-staging/intermediates/547e6227-750a-41af-8a1d-b3fdfc7ea5ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kxO0BscKQlU9/xYyElfuh+DkcVP6lXeRrOBQPEQoo=","crlite_enrolled":false,"id":"c6fc4ae3-a815-4a2e-988d-d8af1c74d123","last_modified":1602640676767},{"schema":1602640107298,"derHash":"b/IVlwTU6IaFmhQP/k4zRx5RQhdDCwPEz2yFxjf37LM=","subject":"CN=AlpiroSSL RSA DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"4d11311616c66072dc5bacbb6b155d283f17a79abd5b2fbb3a65e1b3c239ed39","size":2414,"filename":"DMHCW-wSFt63_5zZBrK0lQDZcM_mOSQpQa6ibF64R6U=.pem","location":"security-state-staging/intermediates/ee608fb0-eb77-46a5-87e7-b85b3d4f5999.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DMHCW+wSFt63/5zZBrK0lQDZcM/mOSQpQa6ibF64R6U=","crlite_enrolled":false,"id":"776212f2-5d11-4ced-aae1-d3525eafad9c","last_modified":1602640676744},{"schema":1602640119969,"derHash":"2+LWPb33b3G6YxNU4W7JfBbgFnkqo7nMnSjFgsrUick=","subject":"CN=AlpiroSSL ECC DV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"eb3d288ac2dd6b3d0b135d27bd25dbf9f91a95b47239a5aa2addc4b4da9205d3","size":1264,"filename":"wDnmANcSbDEP0jOnIAaMy-5juQ0SP1bWXgumTDhj_UI=.pem","location":"security-state-staging/intermediates/b1f46dae-b0b6-4395-8eb4-5e0562bccef1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wDnmANcSbDEP0jOnIAaMy+5juQ0SP1bWXgumTDhj/UI=","crlite_enrolled":false,"id":"8fc742ec-b377-4e41-a314-6542db51830c","last_modified":1602640676732},{"schema":1602640110933,"derHash":"Fk4Ac6dSAKWBaZG9wXxSbrohJx9xNXRGmE7SyApZ/Vo=","subject":"CN=AlpiroSSL RSA OV CA,O=Alpiro s.r.o.,C=CZ","subjectDN":"MEMxCzAJBgNVBAYTAkNaMRYwFAYDVQQKEw1BbHBpcm8gcy5yLm8uMRwwGgYDVQQDExNBbHBpcm9TU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"a4cf15fc523e6c61fa6a76d1cf2ce8bfe29411a0740a29bbae8a16ae71603611","size":2414,"filename":"1hrgtfhRJ0sL7i_z-MTaLFvHn7lkcHEPtbsneJ6QMSY=.pem","location":"security-state-staging/intermediates/f38b174b-fe67-499c-87e4-4179475f4305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hrgtfhRJ0sL7i/z+MTaLFvHn7lkcHEPtbsneJ6QMSY=","crlite_enrolled":false,"id":"bb05ed4d-3921-4bb5-b9fd-ad946be0f10d","last_modified":1602640676717},{"schema":1602298099827,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/96070886-41b8-49d7-bdc8-288a168b4d42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"55b23a55-20b5-4564-9301-19e1f6663e64","last_modified":1602298664805},{"schema":1602298101397,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/76c4ae03-cb6d-458e-86c7-67b6e175a4bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"647a58c6-8821-45ab-be6a-5060bc947663","last_modified":1602298664792},{"schema":1602295137997,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/c6fc6d45-b2fd-49ff-8537-ead6a452efe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"ca5a7b22-9e28-43dd-988a-2dce9d4cbc55","last_modified":1602298664780},{"schema":1602294982304,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/530644a0-1e30-447d-ae93-a1bc0d62a856.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"69151f48-9355-402a-a4f7-edc3bd8c245c","last_modified":1602298664768},{"schema":1602294980728,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/64d78a05-459d-490a-a9b7-710ea2e69e9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"c1ef662d-911d-4ee8-93a5-6897f5af1d2e","last_modified":1602298664756},{"schema":1602294812900,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/ca0daa91-d2da-46e1-8fad-ce93b4478be2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"6fa539e1-18ab-40f6-bd9c-235218cccb25","last_modified":1602298664744},{"schema":1602294704633,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/636064f0-6cbf-481c-ae6c-8786ed5ac5c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"8b4d5d9b-6f1f-4081-a0ec-313b4caf68b9","last_modified":1602298664733},{"schema":1602294814450,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/57373448-8114-4a2b-8088-f440a5659ce2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"90aadf13-6f41-4808-adf7-5d7b5a196ece","last_modified":1602298664721},{"schema":1602294606254,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/7ed8a5e9-d627-46e2-b8bd-3d94ebf324fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"dd950c26-9f72-4fcd-bde1-2853dba9a33d","last_modified":1602298664709},{"schema":1602294702179,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/3bff1db2-cec5-4117-9ae4-6f4c16dc8215.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"072e74df-3503-4c99-9403-75fb542972c6","last_modified":1602298664698},{"schema":1602295140467,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/3a6cebdc-e2d4-4f19-ba75-a61e1559cf91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"bf02c337-050a-43b5-a4eb-598b01c58812","last_modified":1602298664686},{"schema":1602294608115,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/80080d6b-3dc2-4a81-b302-4b52e36b835b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"ec700973-5e01-43ff-9d72-19f79ffb9c70","last_modified":1602298664674},{"schema":1602294515612,"derHash":"Qi+dTmgTTjYrdWnlKYoXPOxAx8cnSyJjqbyK2h0aI/o=","subject":"CN=Data Management Intermediate CA2,O=Fresenius Kabi AG,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFGcmVzZW5pdXMgS2FiaSBBRzEpMCcGA1UEAxMgRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDQTI=","whitelist":false,"attachment":{"hash":"94d5d2945162c4cb87b19a4b549f1b1711ada8c52af0d077de00da8def159dc0","size":1788,"filename":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=.pem","location":"security-state-staging/intermediates/c55dfd59-234e-4ff8-9459-d7d2b199d649.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhS3FkZCk36iI2tjewAoFwSeq0mVjOvTE5pZNBi0jqs=","crlite_enrolled":false,"id":"3c043e6a-b731-4ecc-a152-a94704a97068","last_modified":1602298664663},{"schema":1602294517394,"derHash":"R1nW9O1t8OCPxMqAGYbivhBZTbrzQbTEWrr6N0iIfSU=","subject":"CN=DigiCert Secure Auth CA2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGERpZ2lDZXJ0IFNlY3VyZSBBdXRoIENBMg==","whitelist":false,"attachment":{"hash":"a77265b7e079064772045ae5bc70c2578caebafaa3dd91205900e00a17140e4f","size":1772,"filename":"ZZR--hRloC8riD7MvWAr-1lIuMoIu6Nr3T5xJPP6HWw=.pem","location":"security-state-staging/intermediates/114b1d47-f6d2-4167-87f3-2820ec5baa1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZZR++hRloC8riD7MvWAr+1lIuMoIu6Nr3T5xJPP6HWw=","crlite_enrolled":false,"id":"37cd4ec9-5aa2-48af-b66b-9f4f4cda0b08","last_modified":1602298664651},{"schema":1602298103338,"derHash":"oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"efe10561bf3266c3b533e4642fc8dc3f95e0af6b13697751ab9e922af3013c4c","size":1804,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/cfaadb5b-e902-470e-923b-22b8d677a073.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"f6f1bda2-caaa-42ec-9ed1-a53b8a23db58","last_modified":1602298664631},{"schema":1602298102910,"derHash":"oUSKAV4TmcWokYEvDojG2EeyIdIfkyamYmukOg62Etk=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"efe10561bf3266c3b533e4642fc8dc3f95e0af6b13697751ab9e922af3013c4c","size":1804,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/5bb48710-2b16-46cb-89d2-50b66eb64107.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"50e4ca03-eb57-4ac4-8ed5-17d92d977986","last_modified":1602298664611},{"schema":1602298102487,"derHash":"ChY2AGMb1mJn+3rq0lxTiyt9cq1kFqK70oX2VLtkL20=","subject":"CN=Aetna Inc. Secure EV CA,O=Aetna Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxIDAeBgNVBAMTF0FldG5hIEluYy4gU2VjdXJlIEVWIENB","whitelist":false,"attachment":{"hash":"0be7b4b36e584af7c9c5b112ea58bd9a35c130ac60498f529685f3677950def8","size":1687,"filename":"0rv4XQwSpZni_0C8FcOJhSJNEzvghB5GUVNKhM-UmQE=.pem","location":"security-state-staging/intermediates/944a758d-2190-478d-9aaf-b72d3189ad0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0rv4XQwSpZni/0C8FcOJhSJNEzvghB5GUVNKhM+UmQE=","crlite_enrolled":true,"id":"2ebb6e61-790b-44fe-a28c-c32b851f947b","last_modified":1602298664591},{"schema":1602269869014,"derHash":"J3z0tl9TD8wHKF74nYMRiEiEAE5PLH2+fKAG6WU2zWI=","subject":"CN=Shoper\u00ae SSL,OU=Dreamcommerce S.A.,O=Dreamcommerce S.A.,C=PL","subjectDN":"MF4xCzAJBgNVBAYTAlBMMRswGQYDVQQKDBJEcmVhbWNvbW1lcmNlIFMuQS4xGzAZBgNVBAsMEkRyZWFtY29tbWVyY2UgUy5BLjEVMBMGA1UEAwwMU2hvcGVywq4gU1NM","whitelist":false,"attachment":{"hash":"e4b74658c87e531a9abfebbd57bf225a85f5e2a737dd73be3794a19bc905b06b","size":1613,"filename":"u2qzRrAdmNr-Meysupi9x7UNMaLYZzuT4OTThn_6xF4=.pem","location":"security-state-staging/intermediates/dee40a5f-efa0-4a09-8a63-181ab2062fb5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u2qzRrAdmNr+Meysupi9x7UNMaLYZzuT4OTThn/6xF4=","crlite_enrolled":false,"id":"5ffb5aee-a080-4a31-aec0-6301099b7425","last_modified":1602273466706},{"schema":1602248260747,"derHash":"7qFSzPdRfhZRMga3HBfiBPpAB8JsNgUexn30yUdGPPg=","subject":"CN=cPanel High Assurance ECC Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTowOAYDVQQDEzFjUGFuZWwgSGlnaCBBc3N1cmFuY2UgRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"82ee0338bc29f687ea9594b3ee05b3cacfd4b1890b1c95e3452bcfccd99f8c87","size":1297,"filename":"L4q9ILB-EyvjFKWbhrCSV_fq9CRcnS_EmX6BUSqw8Zo=.pem","location":"security-state-staging/intermediates/73d51902-463f-4e96-b2af-d79fd4da20cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L4q9ILB+EyvjFKWbhrCSV/fq9CRcnS/EmX6BUSqw8Zo=","crlite_enrolled":true,"id":"0d1ede70-4b26-4a54-919b-ffca9db0bb57","last_modified":1602251860240},{"schema":1602125315857,"derHash":"cwwb3NhfV85dwLunM+XxulqSWyp3HWQKJvekVCJNrTs=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"8467f9a9c499b547e02391a7fe31c469557c379b07852c2ca04ce3ecec676dea","size":1585,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/1f71d4c5-823d-4f6a-9fcf-107004848c43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"5d9dd4cf-783a-46de-885d-a4702103320f","last_modified":1602125863571},{"schema":1602125317285,"derHash":"Wo8W/aRI14NIHMpXokKNF02tjGCUPOso9mGuMf05pfo=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"9cd790ac13f6ba45dcb08a81db71c89d50e10474fcde7568d501e5893f538729","size":1585,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/a1dd6cdc-7cb6-4608-ad10-121c1417b86e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"2b30c13e-2cab-4b8c-883d-43f99052d539","last_modified":1602125863559},{"schema":1602121858033,"derHash":"Wo8W/aRI14NIHMpXokKNF02tjGCUPOso9mGuMf05pfo=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"9cd790ac13f6ba45dcb08a81db71c89d50e10474fcde7568d501e5893f538729","size":1585,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/4f471d30-f2da-4143-bbec-db772922e9d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"835f8581-8590-4a2f-80bc-f607c2264bc5","last_modified":1602122269012},{"schema":1602121856579,"derHash":"cwwb3NhfV85dwLunM+XxulqSWyp3HWQKJvekVCJNrTs=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"8467f9a9c499b547e02391a7fe31c469557c379b07852c2ca04ce3ecec676dea","size":1585,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/5b388518-029b-4136-9c78-d43474613fd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"6d11fad9-c414-48d6-b593-5cafd1758bc5","last_modified":1602122268992},{"schema":1602103701893,"derHash":"ks5+p0JLPnosFMJuDVcq29VW4F4rKovTdhxpUlQlWFY=","subject":"CN=AnsonNet TLS Issuing RSA CA R1,O=Anson Network Limited,L=London,ST=London,C=GB","subjectDN":"MHgxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEeMBwGA1UECgwVQW5zb24gTmV0d29yayBMaW1pdGVkMScwJQYDVQQDDB5BbnNvbk5ldCBUTFMgSXNzdWluZyBSU0EgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c2a431004a217db81281a2de2c05eb1e93eb5abc1d4a818825e74e917c6a7019","size":2556,"filename":"mPShRNkBUp1VgXuaiIbIdh-5lcY6nG4Evw-dwtjk06A=.pem","location":"security-state-staging/intermediates/cc65c814-7ae3-4f5b-b2db-27bad5f914d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mPShRNkBUp1VgXuaiIbIdh+5lcY6nG4Evw+dwtjk06A=","crlite_enrolled":false,"id":"20dd4e9a-8d90-4e64-9389-8d8a9c66c10d","last_modified":1602104258093},{"schema":1602103700443,"derHash":"N/0pxwHWl3mY8gUVPqikwumWNU3wctSYTcXYsfdaK2E=","subject":"CN=SwissNS TLS Issuing RSA CA R1,O=swissns GmbH,L=Luzern,ST=Luzern,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMQ8wDQYDVQQIDAZMdXplcm4xDzANBgNVBAcMBkx1emVybjEVMBMGA1UECgwMc3dpc3NucyBHbWJIMSYwJAYDVQQDDB1Td2lzc05TIFRMUyBJc3N1aW5nIFJTQSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"712a44aa441a1572aa92968b2b418a8c979bfb72b6b17653fed5888d76210828","size":2544,"filename":"KAda-LJFeGtGthCqCejer2EUArFZNe-fmlkLdhkdcJc=.pem","location":"security-state-staging/intermediates/2b761dc1-930d-4dc0-ba17-650c271bfb95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KAda+LJFeGtGthCqCejer2EUArFZNe+fmlkLdhkdcJc=","crlite_enrolled":false,"id":"32fe68ce-7d4c-4d54-bab1-b2aab2d02223","last_modified":1602104258081},{"schema":1602100118791,"derHash":"ks5+p0JLPnosFMJuDVcq29VW4F4rKovTdhxpUlQlWFY=","subject":"CN=AnsonNet TLS Issuing RSA CA R1,O=Anson Network Limited,L=London,ST=London,C=GB","subjectDN":"MHgxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEeMBwGA1UECgwVQW5zb24gTmV0d29yayBMaW1pdGVkMScwJQYDVQQDDB5BbnNvbk5ldCBUTFMgSXNzdWluZyBSU0EgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c2a431004a217db81281a2de2c05eb1e93eb5abc1d4a818825e74e917c6a7019","size":2556,"filename":"mPShRNkBUp1VgXuaiIbIdh-5lcY6nG4Evw-dwtjk06A=.pem","location":"security-state-staging/intermediates/34297edd-f3b2-4fef-999b-4d930d483b6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mPShRNkBUp1VgXuaiIbIdh+5lcY6nG4Evw+dwtjk06A=","crlite_enrolled":false,"id":"be5f22dc-d3c0-4ba9-8bab-7df502dfa36c","last_modified":1602100657898},{"schema":1602100117378,"derHash":"N/0pxwHWl3mY8gUVPqikwumWNU3wctSYTcXYsfdaK2E=","subject":"CN=SwissNS TLS Issuing RSA CA R1,O=swissns GmbH,L=Luzern,ST=Luzern,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMQ8wDQYDVQQIDAZMdXplcm4xDzANBgNVBAcMBkx1emVybjEVMBMGA1UECgwMc3dpc3NucyBHbWJIMSYwJAYDVQQDDB1Td2lzc05TIFRMUyBJc3N1aW5nIFJTQSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"712a44aa441a1572aa92968b2b418a8c979bfb72b6b17653fed5888d76210828","size":2544,"filename":"KAda-LJFeGtGthCqCejer2EUArFZNe-fmlkLdhkdcJc=.pem","location":"security-state-staging/intermediates/c7fb95b1-4e6e-44da-b797-1b64a448dbfb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KAda+LJFeGtGthCqCejer2EUArFZNe+fmlkLdhkdcJc=","crlite_enrolled":false,"id":"1c713ec1-22b4-4bb9-a642-d8188603e3c9","last_modified":1602100657886},{"schema":1601686641575,"derHash":"ZTkjWloflBgMUjPq+KXWcQLeqhbAdRrvNbPmfOVgfyk=","subject":"CN=University of Macedonia TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChVbml2ZXJzaXR5IG9mIE1hY2Vkb25pYSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"128df8a47dde21bf8cb684fe77d41c11d5bf09efa2af436a8f9cad4ff2a69844","size":2824,"filename":"Yr1zUmzXNRDeB9FlIE3oqt2RAilAhCi90mNw8jOw5j0=.pem","location":"security-state-staging/intermediates/6bf79ff6-7e88-4c7c-b114-96d5328c44c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yr1zUmzXNRDeB9FlIE3oqt2RAilAhCi90mNw8jOw5j0=","crlite_enrolled":true,"id":"87925423-9a51-40ac-ad0b-43800ff2c93f","last_modified":1601690248797},{"schema":1601672077933,"derHash":"KIs1Rm+44ii5iDIBnhp5Vqw+nxVCgMyXSG7Mjiycq8E=","subject":"CN=IdenTrust Public Sector Server CA 1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMSwwKgYDVQQDEyNJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBTZXJ2ZXIgQ0EgMQ==","whitelist":false,"attachment":{"hash":"76f53e60805d58cfdf8c7851caca2cc1b2e1d58ccecc5f8c3c4894a02b95a3fa","size":2393,"filename":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=.pem","location":"security-state-staging/intermediates/7b450fbd-7542-44c9-be47-022a4d7418ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=","crlite_enrolled":true,"id":"58959c17-11bd-4882-9810-171e73efdcf3","last_modified":1601675840485},{"schema":1601672000910,"derHash":"KIs1Rm+44ii5iDIBnhp5Vqw+nxVCgMyXSG7Mjiycq8E=","subject":"CN=IdenTrust Public Sector Server CA 1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMSwwKgYDVQQDEyNJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBTZXJ2ZXIgQ0EgMQ==","whitelist":false,"attachment":{"hash":"76f53e60805d58cfdf8c7851caca2cc1b2e1d58ccecc5f8c3c4894a02b95a3fa","size":2393,"filename":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=.pem","location":"security-state-staging/intermediates/b0475a24-c54a-415c-b8a5-508f00049e42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8tH7Dh4xfmk7Qci7zhMFmxVcpAzVMwFBeAsRhtLDaLg=","crlite_enrolled":true,"id":"a8eb67a0-8c64-4314-8f5d-f8052549076c","last_modified":1601675840461},{"schema":1601646741831,"derHash":"eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=","subject":"CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874","size":1707,"filename":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem","location":"security-state-staging/intermediates/87766a98-a2cc-464d-9b61-f38989d08aef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=","crlite_enrolled":true,"id":"679290b1-74f0-4692-85c0-80c7ed611f13","last_modified":1601647037525},{"schema":1601646862791,"derHash":"eMtRLeSM7c1xNN9XyXPB4aB2krj1QqRKzruLt3bVXVk=","subject":"CN=CrowdStrike GCC R3 TLS OV CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSowKAYDVQQDEyFDcm93ZFN0cmlrZSBHQ0MgUjMgVExTIE9WIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"4db0721974365af16dd868628e17ddb2016a9a91ef607ffb13a995ff49b25874","size":1707,"filename":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=.pem","location":"security-state-staging/intermediates/dffc1d44-5fa3-4cf0-8e03-6e735e18ca4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nyCr34aeGoF5NDljMipBAETTIQQ7RVPxD3A4z08s6S0=","crlite_enrolled":true,"id":"bd781195-4915-4ba3-9cc4-34433abaf5c9","last_modified":1601647037505},{"schema":1601628639979,"derHash":"OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=","subject":"CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"b11aaedbe5436f35dfaa91a1b599580a4875728df582882c8b0654b4695f6f8d","size":1752,"filename":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem","location":"security-state-staging/intermediates/3e01120a-d2e3-42a3-9d54-b75e73a5246a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=","crlite_enrolled":true,"id":"9cf120fd-788c-4296-bacc-d339a0c51529","last_modified":1601629035363},{"schema":1601628561952,"derHash":"OPc2R/HsruwPxa/misMODCYXHp8jL0UwcpQSQI/VNiY=","subject":"CN=DigiCert Baltimore TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEJhbHRpbW9yZSBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMQ==","whitelist":false,"attachment":{"hash":"b11aaedbe5436f35dfaa91a1b599580a4875728df582882c8b0654b4695f6f8d","size":1752,"filename":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9-UzsuNw=.pem","location":"security-state-staging/intermediates/93cb65fb-aaaa-48e2-98f3-414e208ebd02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cxJYF2dxgQBCK6TeOX11kvdv3gHxeJgxQeT9+UzsuNw=","crlite_enrolled":true,"id":"05b6f881-a4d5-4faf-891d-c599dd09284d","last_modified":1601629035343},{"schema":1601581756903,"derHash":"jlEFdfB6l9X62jv9phh+A+d9M5IxhFfqhxip0otDOWs=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"7c779081b9be519ff3d25e8772978950f385cb19f49a24a6057409137112bc14","size":1540,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/8847b089-d96c-4f13-acc0-18117749df17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"417742c5-f44f-46d5-972d-d38d206c0784","last_modified":1601582282303},{"schema":1601581755437,"derHash":"/udl2kys9TxxryAvifNhJCD9kw2ATiBP7u/J14CEu3s=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"5fc63297733d4d2adf06d7e52b3337147d888c5dd5442cb6ec2d88986bb1de4c","size":1540,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/988d8f38-2e00-41eb-a26c-76d18afbb2d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"36186b66-f98f-44f9-89fe-243c1b143997","last_modified":1601582282291},{"schema":1601581757962,"derHash":"vao4RyBgT/RlOwDaOHOoxUWZb/uKuR1hbxBJX8Am6Pw=","subject":"CN=cPanel\\, Inc. ECC Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTEwLwYDVQQDEyhjUGFuZWwsIEluYy4gRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"3abd6d4119adbd58f964bcd4518e31534b73279076cf34283e7839869f436dfb","size":1284,"filename":"1OWbvT5F8be0LIlW8C2KyzC-FMP8CzHyOolBvIgt6bc=.pem","location":"security-state-staging/intermediates/d08866e7-4949-4b27-9ef1-69593b3642dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1OWbvT5F8be0LIlW8C2KyzC+FMP8CzHyOolBvIgt6bc=","crlite_enrolled":true,"id":"e137294d-0311-4243-8e1c-d116db18b312","last_modified":1601582282261},{"schema":1601376714502,"derHash":"HjVoI/5AwOqsKfntVGO3stscCItj67BYdqLmMcEId5g=","subject":"CN=QuoVadis Enterprise Trust CA 2 G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFsxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEqMCgGA1UEAwwhUXVvVmFkaXMgRW50ZXJwcmlzZSBUcnVzdCBDQSAyIEc0","whitelist":false,"attachment":{"hash":"756cc72bf46fca106a4ae94315fc04ea6bbe1b93e3229513d02875b33ca13f45","size":2385,"filename":"z-lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=.pem","location":"security-state-staging/intermediates/97e9a258-06aa-43a7-8ada-49f8b85b4dc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z+lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=","crlite_enrolled":false,"id":"09667865-dc1f-4be8-b78d-5f3614672a9a","last_modified":1601517448053},{"schema":1601376711578,"derHash":"LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=","subject":"CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"f01753f65dd631ba19494a777a86712466e7e8b20994d581e672f52716f315bb","size":1873,"filename":"VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem","location":"security-state-staging/intermediates/920f9d58-4bbc-4b8c-9c0d-15d09f34ef1c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=","crlite_enrolled":true,"id":"493a41b4-bb0b-48eb-b54e-2a2d3b1343e4","last_modified":1601517448040},{"schema":1601376707030,"derHash":"DakU+3El9uZE63qiYd6euAncf5Jbayp9in7dhzY5i1s=","subject":"CN=Staat der Nederlanden Domein Server CA 2020,O=Staat der Nederlanden,C=NL","subjectDN":"MGMxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xNDAyBgNVBAMMK1N0YWF0IGRlciBOZWRlcmxhbmRlbiBEb21laW4gU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"2f30004a37d33d9c2a59bae9b9e7ae94f816bd331c1a88deabd4af0f028ec59e","size":2438,"filename":"N9-YluTCUa_HTXc60QxjUReBLpRniAkIK2N84DhgmW4=.pem","location":"security-state-staging/intermediates/1a840a62-8cd7-4d70-9975-b54d902e70f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9+YluTCUa/HTXc60QxjUReBLpRniAkIK2N84DhgmW4=","crlite_enrolled":false,"id":"aac1684b-0ef2-4e80-a504-29ddab6c3e72","last_modified":1601517448028},{"schema":1601376713050,"derHash":"N2EL91bKTDz6GGlsTBSXOOZEyp9nY4fsUBZzZdakXMo=","subject":"CN=Digidentity PKIoverheid Server CA 2020,O=Digidentity B.V.,C=NL","subjectDN":"MFkxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMS8wLQYDVQQDDCZEaWdpZGVudGl0eSBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"c6efc5a8dbba37f6c4ba76f0ccd0f86ceb94b6b66cfd390227a747d4d83ff0b3","size":2487,"filename":"DnmLzHZn-pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=.pem","location":"security-state-staging/intermediates/cd42a716-ce60-48c0-a709-ead47fce1fbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DnmLzHZn+pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=","crlite_enrolled":true,"id":"5f56fcf5-5fc3-476f-865b-5607ab67cac6","last_modified":1601517448016},{"schema":1601376708754,"derHash":"0zqEf2QDd74K4aQpFToH6HyIJ/pIQLUVi83LheEKRTo=","subject":"CN=VR IDENT EV SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMSAwHgYDVQQDDBdWUiBJREVOVCBFViBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a95e7ccf2ef4b020f65fbd061c44e49d966821be27623376e3f16a8a3ebd371f","size":2361,"filename":"te09bIALahNazDua57TEibeM7CatIkOAT8t-qu_Kdro=.pem","location":"security-state-staging/intermediates/e430be6f-1a38-4cff-9a26-75b9c1b40411.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"te09bIALahNazDua57TEibeM7CatIkOAT8t+qu/Kdro=","crlite_enrolled":true,"id":"c405cfcb-b5a3-404e-8080-a25fac8bd624","last_modified":1601517448004},{"schema":1601376705563,"derHash":"WS4aLwo0KEsOJvy0/tIq+FmEju6IIq22G0LatHov/cI=","subject":"CN=KPN PKIoverheid Server CA 2020,O=KPN B.V.,C=NL","subjectDN":"MEkxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEnMCUGA1UEAwweS1BOIFBLSW92ZXJoZWlkIFNlcnZlciBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d6c29637397d41ba732890b7381061d5aa7ce2b45a6658ec8cd3e1578ec36521","size":2463,"filename":"Yao-RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=.pem","location":"security-state-staging/intermediates/8f344132-b3c2-493d-9fdf-f15cdbe23305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yao+RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=","crlite_enrolled":true,"id":"d48b6ae2-446b-453a-8cc2-98b0a8e19be2","last_modified":1601517447991},{"schema":1601376701147,"derHash":"YDiLdz0z6RQWSGE/NrkUnwFaEUN4us8+NpSGT/2kJuw=","subject":"CN=HydrantID EV SSL CA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHzAdBgNVBAMMFkh5ZHJhbnRJRCBFViBTU0wgQ0EgRzI=","whitelist":false,"attachment":{"hash":"ba2cc602bd31081e17f7745ac462854773e79726958ff1b8a553cc7ecaba9db2","size":2389,"filename":"FpAps1LWs_UTm3xApHYkNccnnZX-7Wc_v8V0t70p6rg=.pem","location":"security-state-staging/intermediates/8c73b0d9-e8cd-4f65-9003-94df3b81af5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FpAps1LWs/UTm3xApHYkNccnnZX+7Wc/v8V0t70p6rg=","crlite_enrolled":true,"id":"0541e738-c47e-45c8-a4f1-9494790fa98e","last_modified":1601517447980},{"schema":1601376699741,"derHash":"a0+d4TZ4hGcw1Q6RSgjnvpt0LKOgp9U5M2eDC5Om9VM=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"8b796428cc5e4733630431ccd7284dbe8bae53efc39384f0fccbbf1b490e4d49","size":1788,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/970c219c-4540-4fd6-96a0-5a1b30eed570.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"1a842e90-819c-4e3f-989b-ff36631ffdd8","last_modified":1601517447967},{"schema":1601376702562,"derHash":"Euom9u7v7HarhZJUVAOriFFbAOJ12YiHE0B6hvxcf9c=","subject":"CN=e-Szigno Qualified Organization CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgT3JnYW5pemF0aW9uIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"2dcc501b643fe8ac38e3b36c6e87ffbb458e7d031117857c3d81511ee2eadfd8","size":1687,"filename":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=.pem","location":"security-state-staging/intermediates/77e2b395-5a50-4800-954e-b7b8417fdc14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=","crlite_enrolled":false,"id":"0b5e8fe1-4816-49b7-95bb-58d0f7ab520b","last_modified":1601517447955},{"schema":1601376698310,"derHash":"yKYQupQXdw0sAt4ivKjFakKK916ONU76NsVoIh3bfPw=","subject":"CN=WISeKey CertifyID SSL GB CA 2,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMg==","whitelist":false,"attachment":{"hash":"25f18c47254a897f57257e91e33dccd040b88a2d2805589a22993da2900db84f","size":1699,"filename":"ktJRzJxhVE71wdby3vum5K-dgm6QylD4z-l9CBGOUQU=.pem","location":"security-state-staging/intermediates/b23e58a4-ba88-4c87-a828-1c8dc6d99e89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ktJRzJxhVE71wdby3vum5K+dgm6QylD4z+l9CBGOUQU=","crlite_enrolled":true,"id":"3c319d1b-2657-423e-bbda-6ae5b1cb7599","last_modified":1601517447943},{"schema":1601376696895,"derHash":"FjzS/K0NaofI2vzgVvWU87U7kXwPkl1A2SJY6id/xPQ=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"d4292d809a630e5b57cdc50d9205799bd35a8b3a0c8cf33366d00d5e3e8cdf78","size":2499,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/f2c956b5-ac64-4fb1-ba98-32776090134e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"5281f41c-c9a7-4ac3-92ec-73db0e1bca22","last_modified":1601517447931},{"schema":1601376691138,"derHash":"yhTPmzCboDK7IZEMGu2uTSn+Bla0+L/6I8vpTUMcBnQ=","subject":"CN=Entrust Certification Authority - DE QWAC1,O=Entrust Datacard Deutschland GmbH,C=DE","subjectDN":"MIGIMTMwMQYDVQQDDCpFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gREUgUVdBQzExGDAWBgNVBGEMD1ZBVERFLTExOTI2NDMxNjEqMCgGA1UECgwhRW50cnVzdCBEYXRhY2FyZCBEZXV0c2NobGFuZCBHbWJIMQswCQYDVQQGEwJERQ==","whitelist":false,"attachment":{"hash":"4e133243cde83dcbe732252fbf43b8518690328d9c29c7647170c786d537e396","size":1792,"filename":"ZWhmaUZRaiEz-pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=.pem","location":"security-state-staging/intermediates/bc1603cf-b495-4c30-be21-9c90c1fc4057.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZWhmaUZRaiEz+pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=","crlite_enrolled":true,"id":"7a54c01d-7d1f-4f82-8016-dfab02e81156","last_modified":1601517447907},{"schema":1601376694051,"derHash":"Kyz67KvyJm/U+2UF8zQrklFOvm+nwIy2y9SYj2r9F70=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"399b1d081c0af091e4829f3801f90b9e266db1e4e3c5d6a03e438d33ecc67c14","size":2788,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/ed3be1ec-27c5-4877-a576-a88953808e0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"b5744a09-248a-49f5-a2f4-743d2e1c013d","last_modified":1601517447896},{"schema":1601376695464,"derHash":"J47PIR4lGOndmROvxYPusxJ8gYS8vu2q171k6J6MQxA=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"8e15c43f71096a592c3d5819db25f4547bb4ef4f8232293578abdf314d149392","size":2353,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/1aa7522d-26fc-4dab-a48f-37ed0f57c916.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"cffe3216-3de3-4c2c-ac7b-6674695cb014","last_modified":1601517447884},{"schema":1601376689641,"derHash":"vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=","subject":"CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4","size":1670,"filename":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem","location":"security-state-staging/intermediates/713a5d0b-40ac-4d69-8093-93d4bd2e61ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=","crlite_enrolled":true,"id":"20f1bea5-b08a-4583-bdc2-e4d66e4dbc30","last_modified":1601517447872},{"schema":1601376685072,"derHash":"rXtYw8XZWGvltieZwnksQRHJhSqW97BgciEmVxOVfhw=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMUMwQQYDVQQKEzpTaGFuZ2hhaSBFbGVjdHJvbmljIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQuMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"64ac68b2f5fcfe1eb5b26d7d052a52af0101c298fc359ab1870916a82601f563","size":1808,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/53d0ff76-6315-493d-b9a5-6b2d1230a9f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"fec31040-5c17-4c95-895a-afaebcb0a054","last_modified":1601517447861},{"schema":1601376692642,"derHash":"tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"0e8105a00963a2942951dacf763351b5c4f4fcffe32ab691c090848452d6b285","size":2377,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/e36cd675-51d4-45ae-9be5-01d1ee3cb3c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"14f0f77b-ba93-4761-a2d2-71f0ab726c4c","last_modified":1601517447849},{"schema":1601376703987,"derHash":"J1vwBG4CcBeLE7Z+TbFQoQGXy3H5oGH602s9dmOf4YY=","subject":"CN=Trustwave Global ECDSA P-256 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"b39b1eb52f8d651482f3d14bd9a033de3982f3cc3fa825ba761d2fefa3a11981","size":1325,"filename":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=.pem","location":"security-state-staging/intermediates/2c77b828-79f7-4649-86b4-c67b7672d80c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=","crlite_enrolled":true,"id":"32afcb9b-abe9-408d-b53f-79bb1fdee4cf","last_modified":1601517447837},{"schema":1601376687921,"derHash":"am8voTstnbu0CYAgAtM3BnJ2CiF42bjVaU1mBHQjH6Q=","subject":"CN=e-Szigno Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHkxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJjAkBgNVBAMMHWUtU3ppZ25vIFBzZXVkb255bW91cyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"4a22ba90a733131c2581c1d0dd2fbb9a8df38f518f2e5ba6ee0d10f4b3169c24","size":1670,"filename":"vqerAqvFBz-pP0lY3LKc96jOLcWu__imbw0SS3qBch8=.pem","location":"security-state-staging/intermediates/2334d610-446d-4e2b-baa4-aea8a7184032.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vqerAqvFBz+pP0lY3LKc96jOLcWu//imbw0SS3qBch8=","crlite_enrolled":false,"id":"ac246f90-eed2-4d87-83c3-1716f637a9e2","last_modified":1601517447824},{"schema":1601376682271,"derHash":"hIwDq2R9W9fg0MQ8C11nTMmJP4NquGOvjz8ThLVE2DM=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"caf1e07303de77d2971983851eb6cdc8b1662168dab0ef7c3dc3df46b70b3ec3","size":2300,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/01da7aaa-a363-4749-9396-bfdd094350f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"629163cc-e2d2-49d2-9179-b5f4a91ddbd5","last_modified":1601517447801},{"schema":1601376679409,"derHash":"ozAX2d9JTAnVhwkQdAOu5GG5Rh6BujlcKMNmk8J9GYY=","subject":"CN=GlobalSign GCC R3 UK EV QWAC CA 2020,O=GMO GlobalSign Ltd,C=GB","subjectDN":"MFkxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJHTU8gR2xvYmFsU2lnbiBMdGQxLTArBgNVBAMTJEdsb2JhbFNpZ24gR0NDIFIzIFVLIEVWIFFXQUMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"ef3f87aa1971aaebb3accc4f6b43e518068a070c3df5324fafc49bd6faea510d","size":2040,"filename":"_cLNIs90Pu4zrpnBuJdA-wTl2BrxEVUjup-MFOMyr1g=.pem","location":"security-state-staging/intermediates/7413dbb2-a053-4d05-8c07-e8013d4954f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/cLNIs90Pu4zrpnBuJdA+wTl2BrxEVUjup+MFOMyr1g=","crlite_enrolled":false,"id":"49bc5d61-3d39-432b-8401-09f5cf6fe8fb","last_modified":1601517447789},{"schema":1601376680877,"derHash":"FamHYevgEVVNo6RtIGsIEssutproeqoRpt1MuE7VFCo=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"b94f365e9c87f17f0cce2845177df14966cfe660eb761de3a71b860db6a98fd9","size":2121,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/24659b31-0ac7-4f82-a6b2-81b56170c56c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"a3070eea-daf1-4198-a69d-4f1b513e2e69","last_modified":1601517447777},{"schema":1601376677870,"derHash":"1KWUHHFB7RlJoMbOndRaCrlNwzeQLrChIJhSc47r6FQ=","subject":"CN=GlobalSign GCC R3 EV QWAC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIEdDQyBSMyBFViBRV0FDIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"9a306430e243544a1c823baa60388aa1b7c197ccafd79a5fd9847056d91f6d8b","size":2032,"filename":"6Vipkd7oFTwhj_Z54b71vjmwq0aEJc6KkharcmzGaV4=.pem","location":"security-state-staging/intermediates/078357e9-d9aa-4223-9fe2-9322058e368a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Vipkd7oFTwhj/Z54b71vjmwq0aEJc6KkharcmzGaV4=","crlite_enrolled":false,"id":"7e12f161-4f28-4ab5-b22b-2c4ce8de8d3d","last_modified":1601517447766},{"schema":1601376669443,"derHash":"ZZt6UYxsnrGKoes1rrp6AkeBe4mMH6GED5fSh32aIOQ=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"19f63552805d608f671589717902feefe03afc5da94e20c555f68ef484a23b46","size":1772,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/47eb68ae-22f7-4ab1-af83-1feca0168e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"7fae8ab0-1f93-4bb4-ad9e-d35322d05bb4","last_modified":1601517447754},{"schema":1601376672283,"derHash":"diU4Q5UJxBHEN9PFZ1Y+E3hnEoH8ShRkrdAxhwhDZ24=","subject":"CN=GlobalSign GCC R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEdDQyBSMyBEViBUTFMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a57c3388263edee7694a304c5fb1c3c28046d3d7c1493d3ddf93c385aaf9b3ad","size":1687,"filename":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=.pem","location":"security-state-staging/intermediates/0731bf19-eea4-42f6-9ac8-48a2b2d155aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=","crlite_enrolled":true,"id":"59416cc7-fedb-4bdf-ae06-52bfcce27e43","last_modified":1601517447731},{"schema":1601376675098,"derHash":"Z4LG6a2/khbiaDBtRjM/vGdL3t+GtnvndweeLA42iI4=","subject":"CN=Trustwave Global Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGOMTcwNQYDVQQDEy5UcnVzdHdhdmUgR2xvYmFsIERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"a1aae690e4bc653bc8dd049d0014c8bdf294c1327ae51c6f40d11e8b728cdee3","size":2499,"filename":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X-kFQNRrNSN8Cw=.pem","location":"security-state-staging/intermediates/bbb80e65-6dd1-4c6a-86dc-ed0eb42c9484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X+kFQNRrNSN8Cw=","crlite_enrolled":false,"id":"f70ebe3d-e7d1-4205-bda8-448b578f4005","last_modified":1601517447708},{"schema":1601376683642,"derHash":"/PJvvBsqJadqtOqSssvvNn4BMQkcgC2kmJj3iuVLMPg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"551d256b9e4988053973e8535709a6276d327de7d3ea6dd215e8c97deef2c69f","size":1768,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/fde06ce8-4602-4d76-892b-b6cf8d5e7df2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"c14d8dbc-33da-445a-9bf1-c590049e77e7","last_modified":1601517447696},{"schema":1601376665083,"derHash":"EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=","subject":"CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE","subjectDN":"MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl","whitelist":false,"attachment":{"hash":"a9f261d0ad4e87bacd12e03d772b19c478c501880901e13afa12424a3fa0819b","size":1906,"filename":"1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem","location":"security-state-staging/intermediates/8b44d61d-b858-43fa-b426-fbbbc968b95d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=","crlite_enrolled":false,"id":"e80bbded-a765-4025-b5d2-e47ce2297737","last_modified":1601517447684},{"schema":1601376676513,"derHash":"KXW6tR0A2GLQ4W7t74MGp1nGXNS58A2vUOzfy07DluQ=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"913a6555d1accfb6fad27f0850000c3dead37ef7c0c8683ab4771d4154dafae2","size":1329,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/7138d666-f219-4eca-9b68-3b6dbcfe02b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"8b0c2567-a21b-4543-a7b7-cafd2a3b2559","last_modified":1601517447666},{"schema":1601376663499,"derHash":"h9QhabJpNVHKIFzPF/BvbmZR9yGM1tJmB79bpN0vJvI=","subject":"CN=Trustwave Global ECDSA P-384 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8cd0dbed89841d6b6854301f7eecbbdcd40ac73d8c8347c1ea8a577a05c10603","size":1410,"filename":"91i1mhKwhcz0SKoJ9CzM_9ohVagG6cKG9Z_i4Ts1FFk=.pem","location":"security-state-staging/intermediates/9aa01a62-0930-4473-93bc-42f043cb480f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91i1mhKwhcz0SKoJ9CzM/9ohVagG6cKG9Z/i4Ts1FFk=","crlite_enrolled":false,"id":"a65d784a-aa65-4997-b67c-6e62f264ae5b","last_modified":1601517447619},{"schema":1601376660625,"derHash":"BMGHHGhgdRU4n6Owz7g9vmpK8F6MgOdFcClp8kBgbjY=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"22b4bbcfbe3f75b06e7578a6a45c84da9c0262d68c36a8114773ff9a455d842b","size":1788,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/1d629e89-02d9-4ab4-bff8-d297d4dae791.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"c5aa18ff-f49e-44c8-9396-c03197aa910d","last_modified":1601517447603},{"schema":1601376656232,"derHash":"Ek6q8m9XDE+02J9dYQePFbiFNF/K8MV/NHfYxjtasm8=","subject":"CN=Actalis Extended Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGGMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"332f65bf2214e30be6f0940dc3bde167397bf14fc227615cd42ca92857dd83bf","size":2641,"filename":"Qit8ertDRalW2_YZANpfGKsGuNxcSeZ5UXpPg8_gmpE=.pem","location":"security-state-staging/intermediates/fd033e38-cc55-468e-af90-2a082b309e20.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qit8ertDRalW2/YZANpfGKsGuNxcSeZ5UXpPg8/gmpE=","crlite_enrolled":true,"id":"a99821b6-4960-494c-8f67-232566a4edc4","last_modified":1601517447590},{"schema":1601376657738,"derHash":"T4OELx8Eqx4E1NjnUWZvyoLlGRyvwkBiv9H+d8AspLQ=","subject":"CN=e-Szigno Class3 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"71132024dc6f9eb4be8dbf1a0131b491fae4efd3d711ad58c399ed1ebdd355ef","size":1662,"filename":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=.pem","location":"security-state-staging/intermediates/c0d8ef6e-268f-48b3-a7fc-780d0dc7ea0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=","crlite_enrolled":false,"id":"77f03aac-ef84-4ca4-960c-68a37582c545","last_modified":1601517447577},{"schema":1601376659170,"derHash":"gpj8QnBMTtd0tNsxBSkmC1JKkHUlKh0Ks44G8bmoNJk=","subject":"CN=CertCloud RSA TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgUlNBIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"59bb133020146d20f0d963a09c0520755e8a49c60982dbc377b4072ee287be19","size":2073,"filename":"Wz3-4Wr1VbAmx0vpewGzhrRMM8dT5kZ8_PHc1S6WqYs=.pem","location":"security-state-staging/intermediates/19ad562b-8c2b-49a4-a53c-f8979d651b08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wz3+4Wr1VbAmx0vpewGzhrRMM8dT5kZ8/PHc1S6WqYs=","crlite_enrolled":false,"id":"58c4fe43-8482-4fd9-a504-3f27e47b56b9","last_modified":1601517447564},{"schema":1601376653303,"derHash":"EcaXh4cyBW3hfB2hNOnSttI88d6Vs/sKTRilF6tjIwo=","subject":"CN=GTS CA 2A1,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMkEx","whitelist":false,"attachment":{"hash":"66c35c0df4a124a571526bb96130bec322a6f7500769403d0c068726f5bf3b3c","size":1130,"filename":"dEp_Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=.pem","location":"security-state-staging/intermediates/34f43fc6-b91c-4d55-8672-e2ba29010b29.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dEp/Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=","crlite_enrolled":false,"id":"911255a8-a1cd-4edd-8e7e-f67154d601a8","last_modified":1601517447552},{"schema":1601376650517,"derHash":"pmUAegXv4YidZqQN7svGwaJx6RkAaBH9uNvX4GdSEtE=","subject":"CN=Siemens Issuing CA Internet Server 2020,O=Siemens,C=DE","subjectDN":"MFExMDAuBgNVBAMMJ1NpZW1lbnMgSXNzdWluZyBDQSBJbnRlcm5ldCBTZXJ2ZXIgMjAyMDEQMA4GA1UECgwHU2llbWVuczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"5ab8cb8a5146787aeb9025fd757a28e47c16893e2603c336459385a83349e955","size":1719,"filename":"uOU9UZhtVd_opiG5DbxESujdJ9UY8BLJblR-MMq9FbY=.pem","location":"security-state-staging/intermediates/e9295752-30ef-4d70-8969-fd3831ca87ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uOU9UZhtVd/opiG5DbxESujdJ9UY8BLJblR+MMq9FbY=","crlite_enrolled":true,"id":"0a08acd0-7a3a-448c-97ca-8b13d65bb4c7","last_modified":1601517447540},{"schema":1601376654768,"derHash":"QtyCf0b7XoXf+uR9PGkPUB7OJdV11ZelDY+Hj6Qq/Oo=","subject":"CN=e-Szigno Class2 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMiBDQSAyMDE3","whitelist":false,"attachment":{"hash":"24e4936e9492f5245f32e7f9b60258d25f2a4c8e36002f26691cdf9f19bb94f3","size":1662,"filename":"3TGdI2jR-PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=.pem","location":"security-state-staging/intermediates/e9ec773b-bb9c-4483-aaae-eed0307b52c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3TGdI2jR+PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=","crlite_enrolled":false,"id":"ad182baf-a664-418f-b166-97468c566a74","last_modified":1601517447528},{"schema":1601376649078,"derHash":"DTb2oimeniaPlK20nlfmcX1xPD9HuInEDc3Iz+lAy4A=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,C=IL","subjectDN":"MDwxCzAJBgNVBAYTAklMMRUwEwYDVQQKEwxCZWFtZS5pbyBMdGQxFjAUBgNVBAMTDUJlYW1lLmlvIENBIDE=","whitelist":false,"attachment":{"hash":"4b493757d7d299f8cc22b2765b16fa2d9bcc5aab6354a1aba37cad4f16162bf8","size":1727,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/c63ea01c-f085-4c51-8777-54e68bb926ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"1376d433-c704-4fdf-b6e5-2eb14d36c683","last_modified":1601517447517},{"schema":1601376647571,"derHash":"9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"f3d6221594115cd098f20f66a013d90aae3becd3c578a737a8e58a35230c208d","size":2016,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/d16f438d-3c35-419c-9f98-50f522b13cd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"ace44f60-2db3-4ac9-8da0-94488a7efde1","last_modified":1601517447505},{"schema":1601376662098,"derHash":"iwW2jMZZ5e0PyzjyyUL7/SAOby/5+F1jxplO9eCwJwE=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"0a551cc852c7b0f054ae4c9e72acb7a6b4b1a8bab2d598b21063ab92fc36ecb6","size":1577,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/632fc862-dd3b-4e49-9fcc-064d7ec3bed7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"6cf55332-76a4-433e-bf71-a3817eca7a01","last_modified":1601517447493},{"schema":1601376651889,"derHash":"8RRGn7gHeBM6H3Dk2DOO2rl91CzrjswByvtw1rh98R4=","subject":"CN=certSIGN Web CA,O=CERTSIGN SA,C=RO","subjectDN":"MFYxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEYMBYGA1UEAxMPY2VydFNJR04gV2ViIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d637585d0fa1d3a2b6cea2a2ab6f2b7d30229bc1eb350aeb2b8cc2f529b5998a","size":2308,"filename":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs_0ubJ68=.pem","location":"security-state-staging/intermediates/e722a8ed-95b5-4804-afae-33cfb565e784.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs/0ubJ68=","crlite_enrolled":true,"id":"bcbc78b3-6912-4320-9fcd-fdc468194871","last_modified":1601517447481},{"schema":1601376646054,"derHash":"E/ezfMH4RCqM4T57RCIhfY6JlXz+qFDDy751y+Vh53Q=","subject":"CN=CertCloud ECC EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"68a6d4de039d26f711386d924105e95da6fb2c74e019e46d3006b1d43a0281f3","size":1272,"filename":"S9iaDtfedpswiFg99kL_1fGIcuuU0gvf0uBHeNGHlmw=.pem","location":"security-state-staging/intermediates/da97892c-7184-4868-809e-e2de1fd11f77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S9iaDtfedpswiFg99kL/1fGIcuuU0gvf0uBHeNGHlmw=","crlite_enrolled":false,"id":"0b514bd5-5bab-4144-8394-f91d8e5083cb","last_modified":1601517447469},{"schema":1601376643176,"derHash":"l9QgA+EyVSlGCX8g75VfWxzVcKpDcteAAzpl775pdY0=","subject":"CN=GTS CA 1P5,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMVA1","whitelist":false,"attachment":{"hash":"6d39d26fa45c2aea9f3ecfb72ba0887e152ffd6f6a6dc6e197c57cefd4030fa0","size":1983,"filename":"81Wf12bcLlFHQAfJluxnzZ6Frg-oJ9PWY_Wrwur8viQ=.pem","location":"security-state-staging/intermediates/680da5a2-5a45-499e-9fe7-ad8478a1e4b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"81Wf12bcLlFHQAfJluxnzZ6Frg+oJ9PWY/Wrwur8viQ=","crlite_enrolled":true,"id":"0332f56b-8620-4d04-8c28-c92c27457a8d","last_modified":1601517447453},{"schema":1601376644621,"derHash":"zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=","subject":"CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey","whitelist":false,"attachment":{"hash":"3e5a1329226826601bdcf297eb985c9089c7df20bac76d529770ff0dcdc2bd3e","size":1752,"filename":"UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem","location":"security-state-staging/intermediates/8cd77c9b-486e-4100-9c8d-97ad44a4562c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=","crlite_enrolled":false,"id":"0ec526cd-a0ef-4c4a-8b3b-a754ccb19f72","last_modified":1601517447434},{"schema":1601376637469,"derHash":"X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"bd47e7c223bc2e656a7455d83b5877cd3dbf66c20fcb9f464190df0a25d15bdb","size":1760,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/c6186265-d36f-4c14-952e-e41d57172aba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"8c1bcef6-6009-4c63-9b0a-3c13dfdbc750","last_modified":1601517447421},{"schema":1601376641748,"derHash":"jJegCPfOIfdG6vsuOuBgleVX0omjEMgsbzwC2fch5fg=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"27785b9964ca41a7f924e4715e32d3827904bec2c860b8f2f76367447209d89d","size":2089,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/f5ede2b0-fb12-43ce-bedd-eb7497d73176.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"da4a208a-302a-4e48-b4c4-e13b959e3b91","last_modified":1601517447407},{"schema":1601376636030,"derHash":"kn6b/A11wxRgcMPzr91KLBD3ZSiRJJl8xSz9EgnnY8s=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"f1fff265badcfcfaa0e9addfdc7577271845c1a6c9766600e36f19dc9bb90333","size":1780,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/b3b041d6-10f4-47b8-9a9d-e23fc8550699.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"d6ebc2af-8b16-4c9e-a668-85bc3c6e5db3","last_modified":1601517447392},{"schema":1601376640357,"derHash":"a0O0wkOqLZlEDA8UvexSMe7GPoaq8jdspwAgKEWNxyY=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"b63de0fbdd8dbe519e4d6f674c13166625a717f8e6156297f07badf1c8b0d8fc","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/08efa28e-ac8e-4439-8571-25fa10e93a54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"336fa754-0327-4934-8691-767db2f8c4e8","last_modified":1601517447374},{"schema":1601376634613,"derHash":"AD9x3EggIWV1/Fqs/jsa63b3Kupbjo/O/IC59RekphI=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"312e807dea2263ef605990bfa0b57b238b64d9fea0fc945e37f48f3e6246d576","size":1329,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/2f5049d0-8147-4c75-8788-37b8cc132687.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"cac77e25-ef10-4186-8398-2e2c849f9861","last_modified":1601517447354},{"schema":1601376638894,"derHash":"bINDiPKg0GlJxj788w13eC4lqCUBNZOeVJYCFFQO6kU=","subject":"CN=Root CA - G3,O=Root Networks\\, LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxFTATBgNVBAMMDFJvb3QgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7a25b4650cf78598d30bd2fd71f98a9514917410a9123cf8351a487e3ed9a093","size":1678,"filename":"ujBfMmfTX_3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=.pem","location":"security-state-staging/intermediates/a716f279-b6d3-4fb2-95c8-c4be3eb17af2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ujBfMmfTX/3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=","crlite_enrolled":true,"id":"027c9cd4-cf00-448e-94e8-dd1d17b4a715","last_modified":1601517447337},{"schema":1601376633198,"derHash":"sarhvNVV6KPR492o7ITnV8VSZVNEzj/uu6+Y6JXb7aw=","subject":"CN=QuoVadis Europe SSL CA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEiMCAGA1UEAwwZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"dfb31ebff112bccbef0ba90c29987f9962823acb59f69bd984351d9e2c7e22df","size":2381,"filename":"XOogr9_VItHwTOA_JogutdX4V06tVw9btHQLa2tR0_A=.pem","location":"security-state-staging/intermediates/a64232dc-7d88-4d93-8ab8-1406e19a3244.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XOogr9/VItHwTOA/JogutdX4V06tVw9btHQLa2tR0/A=","crlite_enrolled":true,"id":"86ca8809-c9be-449b-953e-f7162dbeee9d","last_modified":1601517447320},{"schema":1601376628816,"derHash":"BeQAXbDDgvO9ZrR3KekBFXdgG/b3sofppSztcQ0lg0Y=","subject":"CN=Microsoft RSA TLS CA 02,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAy","whitelist":false,"attachment":{"hash":"b31f15756dd2424f4c72909e8e5489c3443c030299ab3270a47adebded78e565","size":1914,"filename":"1wMGTin0PoCN5O41h0-XIHXuzGRwDEa8ehHf7wSdSQE=.pem","location":"security-state-staging/intermediates/d2e5fdc3-84aa-4140-9187-817c95bd7ba2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1wMGTin0PoCN5O41h0+XIHXuzGRwDEa8ehHf7wSdSQE=","crlite_enrolled":true,"id":"0d0f8898-e508-48d6-9b66-e3b209767588","last_modified":1601517447304},{"schema":1601376627290,"derHash":"BN5Hqc3TCRz8Xvaqo7fUtT4TxNTcAjZPbAtAh0LsPHY=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGoxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxNTAzBgNVBAMTLFZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBBbHBoYVNTTCBDQSAyMDE4","whitelist":false,"attachment":{"hash":"d9ce06bfe7f10679316c826ca701910ff485eff604b066946a2f9397ac536aa7","size":1772,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/07ef1804-cfe6-4217-9420-629acd5754f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"2f75750f-796d-48e1-87ec-0f623cba8354","last_modified":1601517447288},{"schema":1601376631782,"derHash":"aeLQbDDzZhZhZekdaNHO5cxHWEqAIn52ZmCGwBByQes=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R2,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIyMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"a9f6d16a93aa62ba7dbf378a10c0719ad51755b8d8276a662013037d6fbe06d3","size":1353,"filename":"iie1VXtL7HzAMF-_PVPR9xzT80kQxdZeJ-zduCB3uj0=.pem","location":"security-state-staging/intermediates/359bf7c2-bdab-4656-a7f3-cdb3dc7672bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iie1VXtL7HzAMF+/PVPR9xzT80kQxdZeJ+zduCB3uj0=","crlite_enrolled":false,"id":"f3cb24be-3618-4b26-a4a6-1b25f3cf0023","last_modified":1601517447276},{"schema":1601376630285,"derHash":"CZg6JjLAM+uUScDr8h+bjUqZdcBvuOIPSlBC6eTMZBE=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"dffc20f5ea1b99f91d8665a18a15d299bddfa0b71cb6b19267a6efa7d6b7d6ed","size":12598,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/f4c29470-a6fd-43c0-a33a-5ff5f52725f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"d2f38b78-3b2b-479d-8f4c-a7f2f68fc57f","last_modified":1601517447261},{"schema":1601376624368,"derHash":"ffTT70V5j4xDhPxwK6UqRM571imLFBYo1Kurx2ePZGc=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"8d704ee294bd149733993801e0cbad6deaa30f162b02e59509443d2f13b07b74","size":2653,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/cc459e2e-5a1b-46ee-a8fb-e27ec23c89e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"79efde4e-0f38-47f1-818d-bc7ec34f652f","last_modified":1601517447248},{"schema":1601376622963,"derHash":"lJ1rS3YcoTStPnqFcRhvWA7oh/LGtWi1FA9BV/mNaN0=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"1a3bc0dfeb8f9e3f79809953a727d69dc11a315684b4cf57c35d226206502e31","size":1329,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/82ad1928-1b21-4c0d-ba0a-c3f04d6691cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"9bc8e3bb-0a99-4d29-a7f9-6256977d6e41","last_modified":1601517447236},{"schema":1601376625746,"derHash":"vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=","subject":"CN=GlobalSign Atlas R6 EV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"7a27c45b53bfd5690bb01873eeb250e11a9b84a706cbbd33be1cafcbad5ed9a5","size":2402,"filename":"P7xnWSLQVg6f_MMaRe-f9TBAwDOlwdoyxweVGx8v2hY=.pem","location":"security-state-staging/intermediates/abbc51d6-58ed-461b-a517-c72a39e10eb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P7xnWSLQVg6f/MMaRe+f9TBAwDOlwdoyxweVGx8v2hY=","crlite_enrolled":true,"id":"456d5875-ff1b-473b-bc56-e5be4f248b30","last_modified":1601517447225},{"schema":1601376620104,"derHash":"MCQkQ/aJWpRWDkjk3/cgU26vUWPLQvXod0AqveL4Ynw=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"63f37d712386cb1b4ab3fb0368f861aeb7ba74ec9b9bc7ecdd247bcf94725693","size":2373,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/22bf873e-f19a-445b-a1d8-616b8f871405.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"e101da6b-d1cb-4f14-badd-55bf7b2b98b3","last_modified":1601517447213},{"schema":1601376618691,"derHash":"jSXNlyKdv3A1a9pOs8xzQDHiTPAPr8/TLcdutYQcfqg=","subject":"CN=GTS Root R2,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMg==","whitelist":false,"attachment":{"hash":"4d0fda0d78fd282ab5f1cf69e3b3e458120a33cf3e5fdeb14796f324a389d74e","size":1910,"filename":"Vfd95BwDeSQo-NUYxVEEIlvkOlWY2SalKK1lPhzOx78=.pem","location":"security-state-staging/intermediates/18d175d2-d289-4938-9ea9-830a54586520.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vfd95BwDeSQo+NUYxVEEIlvkOlWY2SalKK1lPhzOx78=","crlite_enrolled":false,"id":"9c5a86fd-acfb-44e6-a965-16bd0489fce0","last_modified":1601517447198},{"schema":1601376621544,"derHash":"YIG+5bDfGRrE4mWsD294mfB4uMifBgVa4Wavkd9w1uA=","subject":"CN=e-Szigno Qualified QCP CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBRQ1AgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"280a786ca35892c86124fb11c5e02f70f1bf6cd40daa1e6538e054942241cdaf","size":1674,"filename":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=.pem","location":"security-state-staging/intermediates/0b5259bf-1e93-47a7-90b3-dca802d1f439.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=","crlite_enrolled":false,"id":"00fa2c99-0c09-488d-8cc5-539354f0043a","last_modified":1601517447186},{"schema":1601376617148,"derHash":"RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=","subject":"CN=Bloomberg TLS CA,O=Bloomberg LP,C=US","subjectDN":"MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=","whitelist":false,"attachment":{"hash":"e48dfa14c978c6bbeb5232c7e711afced2f56d20f367cd0a74a7100aac332138","size":1743,"filename":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem","location":"security-state-staging/intermediates/ab934801-da9e-47a4-9ebd-e248835633fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=","crlite_enrolled":false,"id":"14d2a1f9-84c0-4272-b5cc-bf8f1d0b1cef","last_modified":1601517447175},{"schema":1601376614329,"derHash":"ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=","subject":"CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0","size":1674,"filename":"qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem","location":"security-state-staging/intermediates/b21a2837-5b65-44b6-92b7-fec471d70713.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=","crlite_enrolled":true,"id":"2f5d27a3-cb0f-4f6b-b6b1-20c198d58fc8","last_modified":1601517447163},{"schema":1601376615736,"derHash":"BDerLsLCtIkClsE1A0sh2xRkNLgxfucDqoqpQ8XqUa4=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"2777739491d74eeced727118790444484a83437e4e704c6697aa928b36a78bbb","size":2653,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/0f03fd0a-27a3-4dc4-ae4b-cae63ccda207.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"9588f4b7-ef4c-454c-ae12-6fe792fd04fb","last_modified":1601517447151},{"schema":1601376612913,"derHash":"NJ36QFjF4mMSOzmK55VXPE4TE8g/5o+TVWzV6AMbPH0=","subject":"CN=GTS Root R4,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSNA==","whitelist":false,"attachment":{"hash":"5f621c613a2dfb4502a29efcba11f0a010ef7954ea3464006115a9c300bdcdc1","size":764,"filename":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=.pem","location":"security-state-staging/intermediates/162ddfd3-2b0d-4442-bcce-7da7e8bf6407.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=","crlite_enrolled":false,"id":"9e098de2-8eff-4563-8498-48674d36fd03","last_modified":1601517447140},{"schema":1601376608575,"derHash":"LK77tV5w31qJhf6bwQ3VakDD3tqz2hUwopaCAVxbfGY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"a45e27eb4ce4e2624d46479d0ecf5a612e520e17ac29d9b405427a94f6798f65","size":1512,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/3712ec43-ab3a-42ad-b264-a74c80ef69e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"3c689452-ab89-4bf2-8422-175cc12405ef","last_modified":1601517447128},{"schema":1601376610110,"derHash":"iPwYvQcb4fvFP/vIAfA/WyxNqHu6DAmOK0gI8Z6rBf4=","subject":"CN=RNP ICPEdu OV SSL CA 2019,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MGQxCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMSIwIAYDVQQDExlSTlAgSUNQRWR1IE9WIFNTTCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"292ae2e45b6a02ae65ded412e50c0abf3b623685bd49a8f6369bb4d5010c40d8","size":1784,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/2d768dc6-b376-4595-aa5f-511c0ca86bbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"13b1b2af-0a3e-4a0e-bd66-ac0c5569b5b2","last_modified":1601517447117},{"schema":1601376607092,"derHash":"l0uCB2FUzv9W7U21Yhhvc5SgL/OHqiBdY2eosI/3+qA=","subject":"CN=e-Szigno Online SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIE9ubGluZSBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"0abdd69f4b3ccf85097142e285b47d52e0f91c59aa3e684dfa3c25bb3c8d6039","size":1666,"filename":"G_JwHP_ydSe7pufWcUyNckBrxBbnQ6Kmqw_OFPPiQI0=.pem","location":"security-state-staging/intermediates/0db470e8-a13c-4fce-ba60-4c8e912112f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/JwHP/ydSe7pufWcUyNckBrxBbnQ6Kmqw/OFPPiQI0=","crlite_enrolled":false,"id":"be3dd44c-e4c2-4dea-82b9-1119b2b6f158","last_modified":1601517447105},{"schema":1601376611528,"derHash":"FkjOSrG7ZcSFyyI2x2j6u4ZRR9QmkVuSr7yoHpsu47w=","subject":"CN=e-Szigno Qualified Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgUHNldWRvbnltb3VzIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"babeb483e7bc13a161427464ff4aa32b126458a9b7bd684609420f8d1a7cb6ab","size":1687,"filename":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=.pem","location":"security-state-staging/intermediates/544f8df8-fe6c-4936-b396-e58147817864.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=","crlite_enrolled":false,"id":"88241fa1-e1ea-449a-89fc-9125fa95445b","last_modified":1601517447093},{"schema":1601376605658,"derHash":"GgdSmos/AdIx360qvfcYmSALtlzX4DxZ+oInJTM1W3Q=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"e7c443b15be49a4083c31378f2a1749ea59e73cd564b4d4e0465ea2d9d839146","size":1825,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/7295ba60-db16-49ff-8ccd-589f3c2d0632.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"9e2ed41b-4f49-45cf-b525-68dac3e4fc03","last_modified":1601517447080},{"schema":1601376602750,"derHash":"+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=","subject":"CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez","whitelist":false,"attachment":{"hash":"cc6eb0f3e51ae41188fd3477d2b097eb3bfd190c1e01766f9836d30c6d379aaa","size":1817,"filename":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem","location":"security-state-staging/intermediates/8a525834-15cd-4e6d-805f-40c255beee70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=","crlite_enrolled":false,"id":"2aeb4971-751b-44b1-b195-c573c242c491","last_modified":1601517447057},{"schema":1601376595585,"derHash":"kfGc5QPJ/n/5WH2O++9zFarud9wtFFJhJkk7Stb+gB8=","subject":"CN=Trusted Root TLS CA SHA256 G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1UcnVzdGVkIFJvb3QgVExTIENBIFNIQTI1NiBHMw==","whitelist":false,"attachment":{"hash":"9e03d57a2b38ff0564d3f320d536aae856aa3db18618f722e03e7da8e2a0d9eb","size":1674,"filename":"hMdIk_Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=.pem","location":"security-state-staging/intermediates/34bd21db-03ad-4d1f-8aac-923be9545dda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMdIk/Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=","crlite_enrolled":false,"id":"cfd4ef1e-3a44-4b12-b34e-4223ff9c39b2","last_modified":1601517447046},{"schema":1601376599850,"derHash":"5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"e080ccfbdfc6374397f903976e83dea4fdecc00a0a36cd72f9c882ceff09e62a","size":1902,"filename":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem","location":"security-state-staging/intermediates/ec813aa3-890f-4aaf-af70-891b2f9ac694.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=","crlite_enrolled":true,"id":"b6bfa80e-3f0f-4690-b7d7-23d34186cfc8","last_modified":1601517447035},{"schema":1601376601295,"derHash":"02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=","subject":"CN=GIAG4x,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=","whitelist":false,"attachment":{"hash":"7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50","size":1991,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/201e7f79-691e-483a-a577-cb5954177a09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"06dbcd12-25fc-4a32-8d4c-764f1fa66c80","last_modified":1601517447023},{"schema":1601376594131,"derHash":"2sqgn/rY9m7bbtaXB6gnyeRMH5fEjwF5SF8gbXB7Pis=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ef925783f986610c821619c78a724b477a9c2b4492f84e6446635c18799dc2f9","size":12623,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/8c3bcdfd-c7d2-4fdd-9211-dbb84bb4eb1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"929ecfd8-abd5-4745-9e8a-0a336c38b785","last_modified":1601517447012},{"schema":1601376598367,"derHash":"4iFgNk5W98JyNPVDXYR3saW7ugEQMpjzlUkJGA3wJ3g=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"ad86215f7ef8a6f4477d1e9ceb7ec59f0773886cebfee09bac4eb456aa559c8c","size":2085,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/ec4121ac-bc6c-4e56-a364-4f4fd043fe83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"36d968fe-300d-4647-a1dc-b69c50bd236f","last_modified":1601517447000},{"schema":1601376591167,"derHash":"1ehNmmd+bNpy3Rwbp62N38Je+sIgyKlXHOwnwQdVVwI=","subject":"CN=ICPEdu,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MFExCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMQ8wDQYDVQQDEwZJQ1BFZHU=","whitelist":false,"attachment":{"hash":"9b9ef56a8e9ed418407c8f8b194145af30c2c29e7dceb0b41ecc390660a45493","size":1735,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/023abc51-e443-459b-b3d5-6898ddf046fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"168d707f-83ff-429a-a54e-c3f9bb1c6afe","last_modified":1601517446973},{"schema":1601376588314,"derHash":"8Z1VzQij6kK9kVCAc4IxdN2SNwITwXf4JTF1badQilE=","subject":"CN=JPRS Domain Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"d1fbc1604b7b78d8673b6b7247a33b5d142c6ebaa41b8e0412cedc570a24b3d7","size":1780,"filename":"KbEUDafDNIUlOxLiaD-8KAlxp-gea65O57qq4l5SFl8=.pem","location":"security-state-staging/intermediates/d06f72b5-3ee5-451e-b19b-87a6d6e9d7ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbEUDafDNIUlOxLiaD+8KAlxp+gea65O57qq4l5SFl8=","crlite_enrolled":true,"id":"00b4fe55-009b-4329-870b-f41b82632937","last_modified":1601517446958},{"schema":1601376586918,"derHash":"XEUjNNnJyaLqQsx3pxZeF5XunYTrcMt4S0fqnZKlgtk=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBEVg==","whitelist":false,"attachment":{"hash":"8265936e7b87a7845ad3792c1bfbde5b8469f44276f048e773d7d306888e920a","size":1756,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/5d4ddc4f-7993-45bf-85a2-6ceec4bee87c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"099088c0-fda2-4d4e-8994-f1c2d2324da0","last_modified":1601517446944},{"schema":1601376592637,"derHash":"xj35YY+69IZiuhKr6HshLPd3wnpEag+lVdep0ZEUjtc=","subject":"CN=Trustwave Global ECDSA P-384 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"e81cc0a883e6e41a009a5d876bc62528cd6b26b1edd7421071b6ff434dca6265","size":1390,"filename":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l_zvmwptYjCgg=.pem","location":"security-state-staging/intermediates/7c9dffb0-6aeb-4bdf-b8db-f5e872badd2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l/zvmwptYjCgg=","crlite_enrolled":false,"id":"4ab5e3ff-7ca1-404f-8d51-ff0a87281a04","last_modified":1601517446930},{"schema":1601376585488,"derHash":"wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"f4d91481d1e4e17c44e796f180b7b4af9f0ae8e97cf8d41165640b3fdefd8f5d","size":1760,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/97d8919a-981a-48f8-aaf7-c8bb7fce029c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"a6bcf5b7-81c1-46f8-81ff-00adef177a8c","last_modified":1601517446898},{"schema":1601376580991,"derHash":"2UdDKr3nt/qQ/C5rWRAbEoDg4cfk5A+jxoh//1en9M8=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"56cc033ba7b1b7f111791affa1f1df410009c08c0b9a625d2bbe0a30aca502bb","size":1910,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/93ef7a02-e8d5-4844-979f-44ee6395f343.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"eb48188a-e93a-4e46-8709-36bdc859d240","last_modified":1601517446886},{"schema":1601376583949,"derHash":"RklOMDeQWd8YvlISQwXmBvxZBw5bIQds4ROVS2BRfNo=","subject":"CN=E1,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMQ==","whitelist":false,"attachment":{"hash":"14cf69c79f1a688b326247f724ad50a3b22de5e34daf12c66670e5a38b1273d0","size":1020,"filename":"J2_oqMTsdhFWW_n85tys6b4yDBtb6idZayIEBx7QTxA=.pem","location":"security-state-staging/intermediates/aed297e0-bd28-4811-8d38-5b759a3b3026.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J2/oqMTsdhFWW/n85tys6b4yDBtb6idZayIEBx7QTxA=","crlite_enrolled":false,"id":"1141e315-003d-455f-8db2-84954ef57b40","last_modified":1601517446875},{"schema":1601376582516,"derHash":"iZlLbZ2d3/9of6vT5zQs3YUi1mH1786Oar3rJaBPECM=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4446a8961707823fad23675d037ebcc454ecda2fe98586b7839466271d4521a2","size":2369,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/f260e4c6-6602-47d8-b091-aa180b906619.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"ac9b7c21-b5e0-4211-af9f-f972e93e12a6","last_modified":1601517446863},{"schema":1601376575218,"derHash":"TsQ5ZypENAGmbieUfMO1iX8TK2Z/cSzBo3AYo8yFsWo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"d6b88839e53fd1739f156f78254837d2b4b300f968dc9ab78c1f926d2648da2c","size":1508,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/e0df5215-e166-4b85-982c-ca84a269c0b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"b24f85ea-0f0f-4a8a-ab1e-ae3b2fcb9f7a","last_modified":1601517446852},{"schema":1601376579574,"derHash":"NNinPuII2bzbDZVlIJNLTkDmlIJZbotvc8hCawEKb0g=","subject":"CN=GTS Root R3,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMw==","whitelist":false,"attachment":{"hash":"3febe52108c8006fec57c9deeef32126e877134377f5fed563452d77eb20ce23","size":764,"filename":"QXnt2YHvdHR3tJYmQIr0Paosp6t_nggsEGD4QJZ3Q0g=.pem","location":"security-state-staging/intermediates/f16dce1f-4902-45b2-81af-f5793daff8e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QXnt2YHvdHR3tJYmQIr0Paosp6t/nggsEGD4QJZ3Q0g=","crlite_enrolled":false,"id":"183bf702-6f79-4eff-94c6-c38c248affbe","last_modified":1601517446840},{"schema":1601376578159,"derHash":"us3gRjBTzh1i+L50Nwu6551PyvGfwHZDrvGV5qWb1Xg=","subject":"CN=E2,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMg==","whitelist":false,"attachment":{"hash":"051882dab9b07102f7aba08eef5eb943e8b8096631074d7f98f9c7dcef77e86d","size":1020,"filename":"vZNucrIS7293MQLGt304-UKXMi78JTlrwyeUIuDIknA=.pem","location":"security-state-staging/intermediates/91546249-fef0-4823-a9ed-185c11ff8809.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vZNucrIS7293MQLGt304+UKXMi78JTlrwyeUIuDIknA=","crlite_enrolled":false,"id":"a9e072f6-e8b9-4cd0-bd25-18fc9624033e","last_modified":1601517446828},{"schema":1601376576656,"derHash":"3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"f0c9af66d96dd17fa4676b867f59ad47a1e282afe025a8c07064a4124e677b47","size":1800,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/c52a5d8c-8943-4eaa-bc48-88843df5b604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"80b0b822-d489-4a48-a0ea-77bb1d2013fc","last_modified":1601517446816},{"schema":1601376573787,"derHash":"NH0Y3Mwu/FGpIOen+7B7+9o1YTaB+C3KXExyuwyDwDU=","subject":"CN=VR IDENT SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MEoxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMR0wGwYDVQQDDBRWUiBJREVOVCBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"4158e246be129509cb8d8eb14b647517fea0196e81a9d593f4b8f64a11a6414f","size":2357,"filename":"fQUctsUYoew1aFnAFT0prf-kJmkVNqkPo2jJ5Jm9RaA=.pem","location":"security-state-staging/intermediates/b7b9a6e5-c886-4743-80e1-a004bb1d75fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fQUctsUYoew1aFnAFT0prf+kJmkVNqkPo2jJ5Jm9RaA=","crlite_enrolled":true,"id":"d7d2fa4e-5c2b-416e-8b89-ab9fdc251bbf","last_modified":1601517446797},{"schema":1601376570852,"derHash":"1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217","size":2121,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/e3b5ce85-565e-482f-b742-aae47955c01f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"8fc3b269-4824-4ae9-9b9d-2d5ab7099766","last_modified":1601517446782},{"schema":1601376569389,"derHash":"HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"2e0cee661a4a6fd3b4cc86995b705e916cb3c5b536a617c5d74956b4574cf947","size":1902,"filename":"WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem","location":"security-state-staging/intermediates/d00fd466-270b-4020-bcdc-6546fd39651d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=","crlite_enrolled":false,"id":"0fb16912-e152-4389-8528-af7e45b4a303","last_modified":1601517446770},{"schema":1601376567997,"derHash":"JMcpmGTgoqaWT1UcDo3yRhUy+oxI5Nu7YIBxZpHxkOU=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"1963ee36a9c20eb3169ad73cd42da09bfc6829eb50f71d6216925c6b9c2dddcb","size":2121,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/a7c93098-e1be-467b-b69f-faa129a552ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"476c2db8-a579-44d3-a747-000ac1f604c4","last_modified":1601517446759},{"schema":1601376563770,"derHash":"lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=","subject":"CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"6c7a7611b0ccd14478c030a701a6eee0909ea61c24f76a90cf4f5eaec2ddfd88","size":1873,"filename":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem","location":"security-state-staging/intermediates/2a18cd5e-bcf4-44b2-a1f9-a25d0729bb7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=","crlite_enrolled":true,"id":"1d6a3599-67f8-40a4-917a-3ab4dccd05ad","last_modified":1601517446748},{"schema":1601376566564,"derHash":"nGSppD6ZDpj7zoMXstTBwH/+bgMtqLttYKaW4v8Djx8=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"10551307f634eba8fbd03c34df0f74b6bf4e7d3b3857885e7e915dc171786627","size":1329,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/b60d08eb-819e-4b81-9b83-eeafe6a230a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"d0e47240-43a2-4706-a470-f44bd78b9892","last_modified":1601517446736},{"schema":1601376572369,"derHash":"aXKbjhWobvwXelevtxcd/GSt0owvyozxUH40RTzLFHA=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"df3c4c472795ccd5ca93453fa1024c35f64466f19536a34fb21d39c840e2e27b","size":789,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/8249b5fc-9f4b-4ce8-abcf-e69d8668a819.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"ec4c0f03-0d74-4029-98eb-969399ddf1b3","last_modified":1601517446713},{"schema":1601376562331,"derHash":"Z63RFmsCCuYbj1/JaBPATCqliZYHloZVcqPH5zdhPf0=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"c298ec17b9257dbfb7f36280caade22c6317186c146b5fdd5792bcb77afced29","size":1825,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/7e7a0279-0dad-4fd9-81d3-64173b7386bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"e559297e-5536-435f-919c-c382724f485b","last_modified":1601517446702},{"schema":1601376559371,"derHash":"GGJqO3IREo1WNGnGVFV9E8k2bX/OyLlNtPCqfgWUQEE=","subject":"CN=Trustwave Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGQMTkwNwYDVQQDEzBUcnVzdHdhdmUgR2xvYmFsIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"4e61dd89fb06d5da14f5a4b0f7a2328cd7ab2dea6544a50ea59b3e7d59167e32","size":2515,"filename":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=.pem","location":"security-state-staging/intermediates/40795e76-4053-4806-aaa7-a950a1cb31b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=","crlite_enrolled":true,"id":"6cfc11a9-c2ed-4bfa-9d64-f401bc35007b","last_modified":1601517446679},{"schema":1601376552121,"derHash":"xnDHm/J3r357NKaqT6MERBgzxr0Bpwp+m3otlMHB+SY=","subject":"CN=certSIGN Qualified CA,O=CERTSIGN SA,C=RO","subjectDN":"MFwxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEeMBwGA1UEAxMVY2VydFNJR04gUXVhbGlmaWVkIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"22d738f384d471ab73b8f3d1ec90fd80d0f61bf77294a7139dc772f58bb58e1a","size":2316,"filename":"hztK7Nl786SeQOWatriSlHoTSUt-1THcFFIGKRr08bk=.pem","location":"security-state-staging/intermediates/f1489932-a573-46d9-8a92-b0e3602d6b75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hztK7Nl786SeQOWatriSlHoTSUt+1THcFFIGKRr08bk=","crlite_enrolled":false,"id":"72fc535e-8f0d-4e88-93c6-72376b952d1a","last_modified":1601517446667},{"schema":1601376555038,"derHash":"MqTlVONjEW/kjiLwHawXNnUqcccg+Z9GLVZQItO60H0=","subject":"CN=DPDHL Global TLS CA - I5,O=Deutsche Post AG,C=DE","subjectDN":"MEsxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTU=","whitelist":false,"attachment":{"hash":"136f459d98a2f42f67f606dcf55c11198fea1f244cf8003c576d60d969cef1ac","size":1695,"filename":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7-_aukXzu-S0_M=.pem","location":"security-state-staging/intermediates/3efe881e-11a4-4301-908e-d7eee31dc4cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7+/aukXzu+S0/M=","crlite_enrolled":true,"id":"83a27672-fbfe-478b-b63b-a1ac28382021","last_modified":1601517446646},{"schema":1601376553578,"derHash":"BO7qjlC0d1s8JHlyYpF+5QAC7Ex1tWzfPuHBjPylulI=","subject":"CN=Microsoft RSA TLS CA 01,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAx","whitelist":false,"attachment":{"hash":"d21d673254fc1596b7b7c3a9a38e33ab09f786822535934e507dec3291deab5a","size":1914,"filename":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=.pem","location":"security-state-staging/intermediates/aa5247b7-b9cf-4225-87d6-0d81706e6bd2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=","crlite_enrolled":true,"id":"512871ef-52ae-48c3-9b77-a4853cd57ef7","last_modified":1601517446632},{"schema":1601376549115,"derHash":"PyJb2814jOkkhwyvkvgUt8b/Ttq6utk/HTqRdyUs8dE=","subject":"CN=QuoVadis Qualified Web ICA G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzM=","whitelist":false,"attachment":{"hash":"8eb4cfbfd4e31a971f563f4a974c582ecd679cc8c15604af9f0f24fb1daf720e","size":2385,"filename":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU_inT417rc=.pem","location":"security-state-staging/intermediates/7fee1a5f-8384-4340-9b00-3022795d91e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU/inT417rc=","crlite_enrolled":false,"id":"8c0d1791-073e-4560-9737-df4f28bdae8c","last_modified":1601517446609},{"schema":1601376557942,"derHash":"mRe/2FNziYXkbJIEGUEOlmwxaYJ2nnGBfifQOEu+Nnk=","subject":"CN=certSIGN Public CA,O=CERTSIGN SA,C=RO","subjectDN":"MFkxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEbMBkGA1UEAxMSY2VydFNJR04gUHVibGljIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d61a1b35a91c710f44d6b989faabe0cbe91a89dbc701983bdbf2602b85bf3038","size":2312,"filename":"IGxtWhsxuC58R149YREUyaqPK7jXR9no_MMC227zRVo=.pem","location":"security-state-staging/intermediates/1e86dd0e-4dbe-4e62-96a7-ff8105badaf4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IGxtWhsxuC58R149YREUyaqPK7jXR9no/MMC227zRVo=","crlite_enrolled":false,"id":"a8c42df1-8fa0-4806-b23c-c738e23dc581","last_modified":1601517446597},{"schema":1601376547689,"derHash":"PuAnjfcfo8ElxM1IfwHXdGlOb8V+DNlMJO/XaRM5GOU=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"a7e1e9af45661eb891874dbac46389428139246fe7050143e9b0fd233f74e236","size":1926,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/ce5580e6-ae0d-4210-908a-37cf76309cf0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"5aadf4a5-f650-462e-9a63-dc6992d5c308","last_modified":1601517446574},{"schema":1601376544904,"derHash":"LmPcG+z0J/mQK0neYzD9Po7r+IsU5lOzui431OSICWU=","subject":"CN=Trustwave Global Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGUMT0wOwYDVQQDEzRUcnVzdHdhdmUgR2xvYmFsIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"9d9bb0ca6a8a59110e9ecd8714e94894e0be5886e46f9c4e5265ffa83dcece40","size":2519,"filename":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=.pem","location":"security-state-staging/intermediates/d07f4614-6ee6-486f-a186-ba85e88f2762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=","crlite_enrolled":false,"id":"0b5e934d-aa20-488f-9bc5-23db1b6cf78f","last_modified":1601517446563},{"schema":1601376546320,"derHash":"WAuzqxJ/XhPpQK5zZePGmmKtIE1/36RRWS/nxH3AKpU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,O=Prodrive Technologies B.V.,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMSMwIQYDVQQKExpQcm9kcml2ZSBUZWNobm9sb2dpZXMgQi5WLjE1MDMGA1UEAxMsUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4gT1YgU1NMIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f33b1ca67bc2f7ef2190fc43c1d09060a4d6392a8969577007ae2dcf61b1b92a","size":1788,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/5ddd9e30-4510-471c-ab94-0d0e278ac61c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"2811956d-b0a4-4adf-900f-63b897378faf","last_modified":1601517446551},{"schema":1601376539008,"derHash":"tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"f6ba4b244d0f4d8748bdeb3905b09e20d0bb70b28d5fe8f7a5d9f622031a27cd","size":1687,"filename":"xW7Bujpo5E-lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=.pem","location":"security-state-staging/intermediates/6e62179d-8cf7-4dd3-8b7a-23c5f44fed60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xW7Bujpo5E+lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=","crlite_enrolled":false,"id":"e4665b3f-67e0-41db-a6da-e7462f9cf059","last_modified":1601517446528},{"schema":1601376543423,"derHash":"chMuzy+MdbXyFMAO0UVi4UkSt/L00mMxgPPkkYmA/sQ=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"cfbfd73e27f80ba2ca88e566c4433b91afffa3e781fa1bb6329edcdd18b007fb","size":1244,"filename":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=.pem","location":"security-state-staging/intermediates/2bfcb5a8-a759-447d-8ba5-a522f5ff7213.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=","crlite_enrolled":false,"id":"33b467c3-b884-40cf-8821-05ca09a4ebb6","last_modified":1601517446517},{"schema":1601376536064,"derHash":"9i41qtNF+yU4Y8/A5lgjrNPn8IRtGbgybXCceRmiLX4=","subject":"CN=Trustwave Global ECDSA P-256 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ce8879da72592af4bbeefb13d2c925ca1eed8e33ca17d960a29ad9ae0835124d","size":1305,"filename":"a-5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=.pem","location":"security-state-staging/intermediates/39ef4ea2-486e-4ed5-a449-bfd847e8ae82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=","crlite_enrolled":false,"id":"4651d4e2-a3a3-4ad4-a939-6f0a6e93d25f","last_modified":1601517446505},{"schema":1601376531791,"derHash":"KfjhBN845hK/T1BTZbXQsLIN1OickIMGSE64N0weZtg=","subject":"CN=Trustwave Global ECDSA P-384 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"53f8122b5a0fa5136d24ba312f1f8c41061bd774427e22f6d2a5e4fababcd5ea","size":1406,"filename":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=.pem","location":"security-state-staging/intermediates/ae0ef8cd-16e2-4b41-a4f9-28579d057043.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=","crlite_enrolled":true,"id":"83fb01e4-965f-4aa6-a108-09ee05b4bede","last_modified":1601517446494},{"schema":1601376537489,"derHash":"nOJ0/9oMxIdiy3GxLHQgScco5h37wHCOP5yHHp696iI=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"95cf8df7fb366c8a374ed3369242ba3db91973c2101055c3f8282a0abaae2334","size":2032,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/71bfbe43-67b3-4ff1-a0a0-520de046ac99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"d6ba73ad-526c-414a-927a-cc485bdb4ba3","last_modified":1601517446482},{"schema":1601376530391,"derHash":"f+uTdOqwjTknF8ZHQ22uBhdqJMAQYH/aHM5eXwEGtHI=","subject":"CN=QuoVadis Qualified Web ICA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzI=","whitelist":false,"attachment":{"hash":"c551ff3d69db56e747169ab80b2fdea513f1de4806de98e0e34ab04da70a7566","size":2385,"filename":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=.pem","location":"security-state-staging/intermediates/78fe6755-6ce9-4dd5-b75b-e9d055b6147f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=","crlite_enrolled":true,"id":"c8cbdc39-dfda-4e8d-8483-16a7e62a27fa","last_modified":1601517446471},{"schema":1601376528929,"derHash":"Kg4/KneoDcvlzVLVDWUHbr03+tUx2xDWoThaVX97cl0=","subject":"CN=e-Szigno Class2 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMiBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"bcb11e505804477ce4429c8ef9cc22d043e0f59d222d5e4524ec9158cc8e972b","size":1666,"filename":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=.pem","location":"security-state-staging/intermediates/ed1e06ed-dd51-4820-9ef9-0ec3fe1c0d7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=","crlite_enrolled":false,"id":"e2064836-6f61-4236-a0e4-ecf652bd4970","last_modified":1601517446459},{"schema":1601376527513,"derHash":"BYd+5cz+fPGrs8nt85BbX2FCx7eTnWfjJBHPiWMn+Yc=","subject":"CN=CertCloud ECC TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgRUNDIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"f8337f06d70a3f7f0f2ef60247a23ef7a2527a55578bd6069dab297153907ecc","size":1232,"filename":"-iSs_1O_biy_0c0nXxdAJJKe4jDCWam1eQs-GklMUgI=.pem","location":"security-state-staging/intermediates/70ceef02-e1d2-4132-979d-678f2f773e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+iSs/1O/biy/0c0nXxdAJJKe4jDCWam1eQs+GklMUgI=","crlite_enrolled":false,"id":"bc047e86-7084-42d2-8efc-a8163307861a","last_modified":1601517446445},{"schema":1601376526117,"derHash":"IcBmMy1rkt2aJT4mN2hKW8PjE1f4Y77XovmMhFmjO2I=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"d6663fad41c3d961839d1c3ba63881823a3ae0e79e492bcb4b89de356ba61449","size":1780,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/76332bc0-ade4-489e-8a7a-7408d1a0866b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"d3ccc38d-c16d-42a2-8bad-f6a2a9db6ea8","last_modified":1601517446433},{"schema":1601376542023,"derHash":"MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=","subject":"CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=","whitelist":false,"attachment":{"hash":"7ebde9e072e9a7bbb57c5810346275bf9ef461c815c5ae04aea58f3354aeb691","size":1873,"filename":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem","location":"security-state-staging/intermediates/1a609f96-bf52-4c1e-b5cd-8d41976209a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=","crlite_enrolled":true,"id":"0c7bee58-270f-4570-ad29-3d70aec91153","last_modified":1601517446422},{"schema":1601376534633,"derHash":"sIXXC5ZPGRpz5K8NVK56Dgeq/a+bcd0IYhOKtzJaJKI=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R4,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNDETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"babd66311bcbddf05b57e8c3547a7daa9175826a9288b0eddc4bce49d951e547","size":703,"filename":"CLOmM1_OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=.pem","location":"security-state-staging/intermediates/3f9c81ac-eb1d-4480-8098-04c2865620a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLOmM1/OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=","crlite_enrolled":false,"id":"806db0d2-addc-4b97-a56f-47f8f6ee463b","last_modified":1601517446411},{"schema":1601376523273,"derHash":"q7P/KZqhuu/BJ4gYxCQ4iu97KWUVlcYBlOeNlDaUaAs=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"d81fa5cb3c1ec6bbe8f1e276fd6412ef30e25f49781b84d8eb23f85d412845ef","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/a1d18e1f-643c-4eba-ac9d-259252860cb9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"261cd019-9a12-4ef0-9d64-3205805bcee7","last_modified":1601517446399},{"schema":1601376524722,"derHash":"iu/r2IvoejCxnGDFvQ+16fvNFdVYLV/Jp0mVeNaNzsA=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"54373e1e17726accdcc2879266317a44d0dc889c8003fa002f0337d0cd53627c","size":1788,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/cc028f24-b5cb-46d6-97d7-726ebda21925.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"41b336e4-b32b-436f-891e-66fbf1ad02f3","last_modified":1601517446388},{"schema":1601376520490,"derHash":"6ywqgGxp/JY8TiSlu+og7U47hq55hzC7TupRv53jMyU=","subject":"CN=QuoVadis PKIoverheid Server CA 2020,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MF0xCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEsMCoGA1UEAwwjUXVvVmFkaXMgUEtJb3ZlcmhlaWQgU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"ccde215eb034050ccfc37f9fd71517cfb10b5c84d583a98f618475edced4e91a","size":2491,"filename":"Uru4DWx-N-Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn-Y=.pem","location":"security-state-staging/intermediates/1ae6c747-3f6d-429e-9013-e01cf1ab4ce0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uru4DWx+N+Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn+Y=","crlite_enrolled":true,"id":"fee96d42-f02d-4455-be00-596e2c349fe8","last_modified":1601517446377},{"schema":1601376518910,"derHash":"jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"4af7bd8ab75b6ddf04593a19426b34042c0a2078cfaa4c0c6b54dba25cc4a74c","size":1902,"filename":"n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem","location":"security-state-staging/intermediates/f1b1f28b-139b-40e5-ab31-a425c3b7121f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=","crlite_enrolled":true,"id":"ffad931a-781d-4472-9d60-f6fbe37689c9","last_modified":1601517446365},{"schema":1601376515985,"derHash":"05zjn/b0SdTzOR7iAE1wXsIvmc/8pAqI+F2yZFSt29E=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"ce0b3cc7344615f4e2c08e375e5170baea84e9c13a2b7eab45e0eb275cfec111","size":2653,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/01188f2a-2433-4025-a1b5-a82cdada1811.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"02c14f6f-b36e-477e-b00c-4caa53ab7b3a","last_modified":1601517446343},{"schema":1601376521873,"derHash":"SP+LSUZox1IwS0i/6Bh1iYfe9lguXwm5IfS2C7PWqN0=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"b800befca1341c29912755ead3105bdab854e4517a96d3492de73bd48b6aca1c","size":2121,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/7038775d-bfdd-40ab-9cc3-51a112d8e5dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"a24284b8-b137-4a18-a2f8-d193c6197acc","last_modified":1601517446331},{"schema":1601376514564,"derHash":"TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=","subject":"CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"9b316d7bf93b9d342bdd4df71094c0e97165fde2c9cd97a6beca3f212dac4054","size":2479,"filename":"rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem","location":"security-state-staging/intermediates/3784123e-47c0-449e-a944-a3c098106179.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=","crlite_enrolled":false,"id":"d7056525-3689-4f09-8017-71e76770f63f","last_modified":1601517446320},{"schema":1601376511612,"derHash":"GKvW6cqQe7NnVNDARuu1Ddm5XVJ4JNlYGjG3UPz9uu8=","subject":"CN=Trustwave Global ECDSA P-256 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"f16bdfde574887cdf9b20fdd1a1ad5e789c2d8b5094a68dc63225d64c51f2d50","size":1329,"filename":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=.pem","location":"security-state-staging/intermediates/073d40fe-2052-4262-88bf-6f72a0fcaeb9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=","crlite_enrolled":false,"id":"b41c2405-7326-442a-9924-c50f3172fd29","last_modified":1601517446297},{"schema":1601376510177,"derHash":"qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f","size":2653,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/8493a5e1-2fe7-48d1-baff-5f6b9f29913f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"f45995f1-56b8-45c4-9465-14c646f731cc","last_modified":1601517446286},{"schema":1601376507194,"derHash":"Yk1VdqZSshMHaL/oS5Ze7//ZFgPSXNX3FVp9wnidrDg=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"2468274c7b25fd2b19d422592a89957967b1d0b2667a280258fa181e4990089d","size":1512,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/d5ffeea3-4d99-41bd-a872-5838d3443762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"382d6dd1-e459-49c6-860d-167823f42b12","last_modified":1601517446275},{"schema":1601376513034,"derHash":"YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"3ba8b83eb97ad48e9de41cf5e2bf4f6fdf72bd92b464134f8a11860b041476ae","size":1902,"filename":"inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem","location":"security-state-staging/intermediates/e93f7c27-0dfc-43ed-b6d8-be3651eb25e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=","crlite_enrolled":false,"id":"47925b35-99a1-43bf-951a-336125b4c6bf","last_modified":1601517446263},{"schema":1601376508724,"derHash":"NFC204KQw8pde7OLcUlbv3LG0MRNuikiRfm8qYQ6n/8=","subject":"CN=Actalis Domain Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGEMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"428ff62276c3ecb6dc5848fb6212834d3718a3c55c9f538eca07bc4998f52fe6","size":2637,"filename":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=.pem","location":"security-state-staging/intermediates/875e53bd-1442-40e4-b076-8d1b1fa6e8d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=","crlite_enrolled":true,"id":"7663fd6d-0a64-4aa0-b3f2-41b165083e59","last_modified":1601517446252},{"schema":1601376505726,"derHash":"y2Zmsyv/Lv7cxBh98Umm00pdELcWW5z/KmfA4xGu7tc=","subject":"CN=QuoVadis Europe EV SSL CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjElMCMGA1UEAwwcUXVvVmFkaXMgRXVyb3BlIEVWIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"990290f2ea4ff420df521c3b3851971e7be41a8508394faa2cb562a69bce9e55","size":2385,"filename":"WkWVWx1-X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=.pem","location":"security-state-staging/intermediates/b1596bae-e57e-470c-a3d6-2bfa8b281a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WkWVWx1+X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=","crlite_enrolled":true,"id":"024c5848-73e2-4816-9ebb-342c7407fa3c","last_modified":1601517446241},{"schema":1601376502834,"derHash":"FRo+WWnGYW62N6hyKxdM/ZU4eqznjVfDvSPwyzAIGGo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"3f94a2f59b7465d9ec3993abf5497a7454a624492a51b0f1af1453447008be7a","size":1508,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/9b67e543-818a-4165-8fb3-37301ea9deea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"49bdb04d-12f4-46e0-a161-dd632bc2b6db","last_modified":1601517446230},{"schema":1601376501391,"derHash":"Wr5YGPbQLwUQbGw1VUDhviF8I1S1Nc8lB7+FFeGmBEo=","subject":"CN=e-Szigno Qualified CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIzAhBgNVBAMMGmUtU3ppZ25vIFF1YWxpZmllZCBDQSAyMDE3","whitelist":false,"attachment":{"hash":"b1a685a82713fdb970ba0d46956ad6f758e20974ec4e06085ed70d31639c065a","size":1666,"filename":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n-mSxrdMylY=.pem","location":"security-state-staging/intermediates/b37a4a28-4db1-4035-813b-02db9e3f6071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n+mSxrdMylY=","crlite_enrolled":false,"id":"c8ec64d9-a492-4075-9411-af27b698120c","last_modified":1601517446218},{"schema":1601376504316,"derHash":"gBxSLTrROOTwXUZ+o2nBzCdgeL8oQBjQUl67vFNCyDY=","subject":"CN=JPRS Organization Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"5073da9684a445c50c1705a593be556ce4f1fa98e69b8c50acc426e2088d88b7","size":1788,"filename":"xOSyACYAjsQ-aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=.pem","location":"security-state-staging/intermediates/0624e1eb-5311-4f0c-888d-7e403179d070.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xOSyACYAjsQ+aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=","crlite_enrolled":true,"id":"df6b1845-7aef-405a-8ee7-cd3b62ac1cad","last_modified":1601517446207},{"schema":1601373119320,"derHash":"lYjvdBmeRazvzM/AxHAQ6fKjeh3UTGGk4cazNNpa9hQ=","subject":"CN=DigiCert EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"6c7a7611b0ccd14478c030a701a6eee0909ea61c24f76a90cf4f5eaec2ddfd88","size":1873,"filename":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=.pem","location":"security-state-staging/intermediates/04e13866-ca20-456a-a3bb-ba2db3470ae7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w9I8WrpHr1YAS0DugvLGsrI9Vm1yEkZAyllKxemXXf4=","crlite_enrolled":true,"id":"d70ee858-3159-4c5f-be64-8dd0f689e5f4","last_modified":1601517446196},{"schema":1601373115079,"derHash":"PyJb2814jOkkhwyvkvgUt8b/Ttq6utk/HTqRdyUs8dE=","subject":"CN=QuoVadis Qualified Web ICA G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzM=","whitelist":false,"attachment":{"hash":"8eb4cfbfd4e31a971f563f4a974c582ecd679cc8c15604af9f0f24fb1daf720e","size":2385,"filename":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU_inT417rc=.pem","location":"security-state-staging/intermediates/c2ab9b92-d500-4e7a-9bcc-5394c5c70aae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU/inT417rc=","crlite_enrolled":false,"id":"1a156366-309c-4a8a-ad9a-8b722dd7e8dd","last_modified":1601517446184},{"schema":1601373116456,"derHash":"HYDNGKeU8fSFDtwzxgSPAuhThqR/POg2l0qORSpg1/I=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"2e0cee661a4a6fd3b4cc86995b705e916cb3c5b536a617c5d74956b4574cf947","size":1902,"filename":"WcAfM-6Mq47-SAT2M-PbyDhIlS5ynmlHH9IlN6Jm0AQ=.pem","location":"security-state-staging/intermediates/86304c64-acdf-4c00-b9d2-09d524112cb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WcAfM+6Mq47+SAT2M+PbyDhIlS5ynmlHH9IlN6Jm0AQ=","crlite_enrolled":false,"id":"03e0208d-8abc-42a3-8849-5141d1c1217e","last_modified":1601517446173},{"schema":1601373112312,"derHash":"l9QgA+EyVSlGCX8g75VfWxzVcKpDcteAAzpl775pdY0=","subject":"CN=GTS CA 1P5,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMVA1","whitelist":false,"attachment":{"hash":"6d39d26fa45c2aea9f3ecfb72ba0887e152ffd6f6a6dc6e197c57cefd4030fa0","size":1983,"filename":"81Wf12bcLlFHQAfJluxnzZ6Frg-oJ9PWY_Wrwur8viQ=.pem","location":"security-state-staging/intermediates/85fa4716-33ed-4d5d-ae53-9235954b29df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"81Wf12bcLlFHQAfJluxnzZ6Frg+oJ9PWY/Wrwur8viQ=","crlite_enrolled":true,"id":"a7aa7953-bef4-44d7-9224-c3b2f6d04aa6","last_modified":1601517446162},{"schema":1601373113703,"derHash":"nGSppD6ZDpj7zoMXstTBwH/+bgMtqLttYKaW4v8Djx8=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"10551307f634eba8fbd03c34df0f74b6bf4e7d3b3857885e7e915dc171786627","size":1329,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/782e2f05-e5fd-466e-b95e-c9d281d07173.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"a7462d67-605a-4b39-b1d9-d9bcc225b615","last_modified":1601517446150},{"schema":1601373117853,"derHash":"jEPF40DsZA+T6ndKxTU8ypBC92T/g3+HDYtkdjxFikE=","subject":"CN=GeoTrust TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkdlb1RydXN0IFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"4af7bd8ab75b6ddf04593a19426b34042c0a2078cfaa4c0c6b54dba25cc4a74c","size":1902,"filename":"n5dIU-KFaI00Y_prmvaZhqXOquF72TlPANCLxCA9HE8=.pem","location":"security-state-staging/intermediates/87545501-5f6c-42fb-b550-4c586450cf1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n5dIU+KFaI00Y/prmvaZhqXOquF72TlPANCLxCA9HE8=","crlite_enrolled":true,"id":"6cc82c1a-ac75-4901-aaed-17c56d2f15ec","last_modified":1601517446138},{"schema":1601373110783,"derHash":"BYd+5cz+fPGrs8nt85BbX2FCx7eTnWfjJBHPiWMn+Yc=","subject":"CN=CertCloud ECC TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgRUNDIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"f8337f06d70a3f7f0f2ef60247a23ef7a2527a55578bd6069dab297153907ecc","size":1232,"filename":"-iSs_1O_biy_0c0nXxdAJJKe4jDCWam1eQs-GklMUgI=.pem","location":"security-state-staging/intermediates/e12a2935-1487-4453-8530-4d711142453e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+iSs/1O/biy/0c0nXxdAJJKe4jDCWam1eQs+GklMUgI=","crlite_enrolled":false,"id":"dcf8275c-d947-4783-80e2-d92f9c62e14b","last_modified":1601517446127},{"schema":1601373106595,"derHash":"tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"0e8105a00963a2942951dacf763351b5c4f4fcffe32ab691c090848452d6b285","size":2377,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/cc9d0a66-6a3b-4630-97a9-cef777fb6c74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"e5c0424f-e3f2-433c-b803-708744469857","last_modified":1601517446116},{"schema":1601373109415,"derHash":"IcBmMy1rkt2aJT4mN2hKW8PjE1f4Y77XovmMhFmjO2I=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"d6663fad41c3d961839d1c3ba63881823a3ae0e79e492bcb4b89de356ba61449","size":1780,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/ec00442d-0592-4095-a93c-2de7c8ad6498.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"d8c024a4-05d8-47b8-9ced-9ba0b9e802ee","last_modified":1601517446104},{"schema":1601373105225,"derHash":"chMuzy+MdbXyFMAO0UVi4UkSt/L00mMxgPPkkYmA/sQ=","subject":"CN=GlobalSign Atlas ECCR5 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"cfbfd73e27f80ba2ca88e566c4433b91afffa3e781fa1bb6329edcdd18b007fb","size":1244,"filename":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=.pem","location":"security-state-staging/intermediates/1930c81b-a47e-4196-aaf5-9bb9b253ef40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dvTEjD91RrZ8O39MMW9uMp3BsRpxlx5RWzL0vmoJRyc=","crlite_enrolled":false,"id":"23a49eff-8f01-4ad2-80b0-64b42dd5699e","last_modified":1601517446093},{"schema":1601373102382,"derHash":"RklOMDeQWd8YvlISQwXmBvxZBw5bIQds4ROVS2BRfNo=","subject":"CN=E1,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMQ==","whitelist":false,"attachment":{"hash":"14cf69c79f1a688b326247f724ad50a3b22de5e34daf12c66670e5a38b1273d0","size":1020,"filename":"J2_oqMTsdhFWW_n85tys6b4yDBtb6idZayIEBx7QTxA=.pem","location":"security-state-staging/intermediates/3a789ebf-1903-4ab8-b9cf-488af62cbf0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J2/oqMTsdhFWW/n85tys6b4yDBtb6idZayIEBx7QTxA=","crlite_enrolled":false,"id":"ab99130c-7c4f-494d-939c-89c4285b08b3","last_modified":1601517446082},{"schema":1601373103809,"derHash":"5vpISoWJQNEBl4VVRUqkZlMatsSrxK0rAAYmqqwNBPk=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjAgQ0EtMQ==","whitelist":false,"attachment":{"hash":"e080ccfbdfc6374397f903976e83dea4fdecc00a0a36cd72f9c882ceff09e62a","size":1902,"filename":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e-MVM7Rcis=.pem","location":"security-state-staging/intermediates/4faddda2-227d-409d-a1cd-1edcb045de63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"48hXNwn3laJAzsrIBprOcewUb097BGNL7e+MVM7Rcis=","crlite_enrolled":true,"id":"48991605-b48a-4d04-9db7-8a39fdd03db1","last_modified":1601517446071},{"schema":1601373108002,"derHash":"NFC204KQw8pde7OLcUlbv3LG0MRNuikiRfm8qYQ6n/8=","subject":"CN=Actalis Domain Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGEMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"428ff62276c3ecb6dc5848fb6212834d3718a3c55c9f538eca07bc4998f52fe6","size":2637,"filename":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=.pem","location":"security-state-staging/intermediates/0f25bf9e-ffcc-4a10-84f0-8cd86a7ae6b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hiyjWqnkYADYC0yxNwbD5MAi01UNWZQ5v2vsDd0s9Uo=","crlite_enrolled":true,"id":"35eb9d7f-ce65-41cf-b26c-080757a4a116","last_modified":1601517446059},{"schema":1601373100891,"derHash":"FamHYevgEVVNo6RtIGsIEssutproeqoRpt1MuE7VFCo=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"b94f365e9c87f17f0cce2845177df14966cfe660eb761de3a71b860db6a98fd9","size":2121,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/e70bfcd1-20f6-4b7c-b862-637c228984c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"ea3a37d8-31e6-48a8-aa7d-2107ac42c3a1","last_modified":1601517446047},{"schema":1601373097943,"derHash":"diU4Q5UJxBHEN9PFZ1Y+E3hnEoH8ShRkrdAxhwhDZ24=","subject":"CN=GlobalSign GCC R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEdDQyBSMyBEViBUTFMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a57c3388263edee7694a304c5fb1c3c28046d3d7c1493d3ddf93c385aaf9b3ad","size":1687,"filename":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=.pem","location":"security-state-staging/intermediates/23842d68-8107-429d-bb5a-283b0023bdc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Sc7wL4FfOw8ued5w3JOSzu5MzB471PfqdyN4hnMYbX4=","crlite_enrolled":true,"id":"2faa1882-c670-43e5-bb46-85e2017d2664","last_modified":1601517446036},{"schema":1601373099507,"derHash":"a0+d4TZ4hGcw1Q6RSgjnvpt0LKOgp9U5M2eDC5Om9VM=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"8b796428cc5e4733630431ccd7284dbe8bae53efc39384f0fccbbf1b490e4d49","size":1788,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/0c3aa131-41fa-45f6-b13d-f21f3c620bb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"6a3cbd3d-6d7b-4338-a7c0-623f3ebafa19","last_modified":1601517446025},{"schema":1601373095187,"derHash":"LmPcG+z0J/mQK0neYzD9Po7r+IsU5lOzui431OSICWU=","subject":"CN=Trustwave Global Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGUMT0wOwYDVQQDEzRUcnVzdHdhdmUgR2xvYmFsIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"9d9bb0ca6a8a59110e9ecd8714e94894e0be5886e46f9c4e5265ffa83dcece40","size":2519,"filename":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=.pem","location":"security-state-staging/intermediates/27248c41-4ea8-410d-a467-b8ab82ef29fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z4qrcPL95VQXuiBgseJjj0x2uKXj6NQcTxtcnoGWFyk=","crlite_enrolled":false,"id":"0f1ec6de-5bf9-4bc1-a695-3279e8b13a0b","last_modified":1601517446014},{"schema":1601373089423,"derHash":"0zqEf2QDd74K4aQpFToH6HyIJ/pIQLUVi83LheEKRTo=","subject":"CN=VR IDENT EV SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMSAwHgYDVQQDDBdWUiBJREVOVCBFViBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"a95e7ccf2ef4b020f65fbd061c44e49d966821be27623376e3f16a8a3ebd371f","size":2361,"filename":"te09bIALahNazDua57TEibeM7CatIkOAT8t-qu_Kdro=.pem","location":"security-state-staging/intermediates/d45a19a8-eb83-48c2-b5c8-9ce2608c9f2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"te09bIALahNazDua57TEibeM7CatIkOAT8t+qu/Kdro=","crlite_enrolled":true,"id":"7dfd117a-4bff-4a4a-8050-e2cf3a58ebae","last_modified":1601517446002},{"schema":1601373092298,"derHash":"EcaXh4cyBW3hfB2hNOnSttI88d6Vs/sKTRilF6tjIwo=","subject":"CN=GTS CA 2A1,O=Google Trust Services LLC,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRMwEQYDVQQDEwpHVFMgQ0EgMkEx","whitelist":false,"attachment":{"hash":"66c35c0df4a124a571526bb96130bec322a6f7500769403d0c068726f5bf3b3c","size":1130,"filename":"dEp_Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=.pem","location":"security-state-staging/intermediates/3a532dde-9f77-4149-85b5-6d89f2216f05.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dEp/Gc3Me0g2QnAtpHNcs692NFByRfF7Od0K2TuwG1Y=","crlite_enrolled":false,"id":"7fa7839c-ef0e-4a68-bb15-0b1884015b0a","last_modified":1601517445990},{"schema":1601373090891,"derHash":"Wr5YGPbQLwUQbGw1VUDhviF8I1S1Nc8lB7+FFeGmBEo=","subject":"CN=e-Szigno Qualified CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIzAhBgNVBAMMGmUtU3ppZ25vIFF1YWxpZmllZCBDQSAyMDE3","whitelist":false,"attachment":{"hash":"b1a685a82713fdb970ba0d46956ad6f758e20974ec4e06085ed70d31639c065a","size":1666,"filename":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n-mSxrdMylY=.pem","location":"security-state-staging/intermediates/6516a4b9-6493-4bfb-a2e3-23763dc5c0f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S3q9Rterro1Xg3DAezkzEPMCdEp1MvG6n+mSxrdMylY=","crlite_enrolled":false,"id":"c843833c-5c87-472d-adb2-b79ac1f9377d","last_modified":1601517445979},{"schema":1601373096569,"derHash":"BO7qjlC0d1s8JHlyYpF+5QAC7Ex1tWzfPuHBjPylulI=","subject":"CN=Microsoft RSA TLS CA 01,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAx","whitelist":false,"attachment":{"hash":"d21d673254fc1596b7b7c3a9a38e33ab09f786822535934e507dec3291deab5a","size":1914,"filename":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=.pem","location":"security-state-staging/intermediates/4e38e0db-da22-4304-ac1e-288010c3a100.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aJfLgiqk2RiMTiftDuK1Y2Y68uYH6daftf7O6r4ccks=","crlite_enrolled":true,"id":"49e9befa-5c1a-46b0-b4e6-cb23de9ad30c","last_modified":1601517445968},{"schema":1601373088050,"derHash":"J1vwBG4CcBeLE7Z+TbFQoQGXy3H5oGH602s9dmOf4YY=","subject":"CN=Trustwave Global ECDSA P-256 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"b39b1eb52f8d651482f3d14bd9a033de3982f3cc3fa825ba761d2fefa3a11981","size":1325,"filename":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=.pem","location":"security-state-staging/intermediates/f1b77292-94b4-4442-903d-9547feeb6e60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzpgcYxSKDnEVZ3T3h2obh9WsI9ICItWbAqh4SyCprA=","crlite_enrolled":true,"id":"7f2240ce-ea07-4998-8344-b13fb802637e","last_modified":1601517445956},{"schema":1601373093777,"derHash":"Euom9u7v7HarhZJUVAOriFFbAOJ12YiHE0B6hvxcf9c=","subject":"CN=e-Szigno Qualified Organization CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgT3JnYW5pemF0aW9uIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"2dcc501b643fe8ac38e3b36c6e87ffbb458e7d031117857c3d81511ee2eadfd8","size":1687,"filename":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=.pem","location":"security-state-staging/intermediates/80f7e08b-2813-4c53-b749-e5ae184d8e46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60e2cMobrxpGA71ke0o4H5luzpBPZvklmqnePPA8jxs=","crlite_enrolled":false,"id":"dc168871-d662-484e-80bb-0aaa4d482b71","last_modified":1601517445945},{"schema":1601373086550,"derHash":"3cu08wUdbmATEOsORrW7mcXouZ96U542eph96gMOMY4=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"f0c9af66d96dd17fa4676b867f59ad47a1e282afe025a8c07064a4124e677b47","size":1800,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/7a5d531c-a614-4a6e-ad99-fce2da57ac1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"71ef61b1-4863-49bb-a2a3-8bca78f3eec0","last_modified":1601517445934},{"schema":1601373082085,"derHash":"CZg6JjLAM+uUScDr8h+bjUqZdcBvuOIPSlBC6eTMZBE=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"dffc20f5ea1b99f91d8665a18a15d299bddfa0b71cb6b19267a6efa7d6b7d6ed","size":12598,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/c0315adb-4bd9-4968-8188-a004a1b8fade.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"21660b58-2f5d-4097-ae1e-aade60a55184","last_modified":1601517445922},{"schema":1601373083661,"derHash":"05zjn/b0SdTzOR7iAE1wXsIvmc/8pAqI+F2yZFSt29E=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"ce0b3cc7344615f4e2c08e375e5170baea84e9c13a2b7eab45e0eb275cfec111","size":2653,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/db00b4f0-c8f3-4700-913d-fb5588510249.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"db7da0b1-4700-40e5-8766-05564c2f1aaf","last_modified":1601517445911},{"schema":1601373080635,"derHash":"JMcpmGTgoqaWT1UcDo3yRhUy+oxI5Nu7YIBxZpHxkOU=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"1963ee36a9c20eb3169ad73cd42da09bfc6829eb50f71d6216925c6b9c2dddcb","size":2121,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/3a2e8b34-b640-409f-ba11-42410897c3c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"f4667d41-8d93-404a-85ac-348e9d27cbc4","last_modified":1601517445900},{"schema":1601373076427,"derHash":"TsQ5ZypENAGmbieUfMO1iX8TK2Z/cSzBo3AYo8yFsWo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"d6b88839e53fd1739f156f78254837d2b4b300f968dc9ab78c1f926d2648da2c","size":1508,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/a533ae98-4acc-4c4e-90e9-c1f73411f64b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"e164a6de-4f75-479e-b04f-54334c5235fd","last_modified":1601517445889},{"schema":1601373077828,"derHash":"h9QhabJpNVHKIFzPF/BvbmZR9yGM1tJmB79bpN0vJvI=","subject":"CN=Trustwave Global ECDSA P-384 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8cd0dbed89841d6b6854301f7eecbbdcd40ac73d8c8347c1ea8a577a05c10603","size":1410,"filename":"91i1mhKwhcz0SKoJ9CzM_9ohVagG6cKG9Z_i4Ts1FFk=.pem","location":"security-state-staging/intermediates/f260c10f-2e10-43a2-ac7a-1fff03473e79.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91i1mhKwhcz0SKoJ9CzM/9ohVagG6cKG9Z/i4Ts1FFk=","crlite_enrolled":false,"id":"3ebd415b-87d1-4a9d-b708-d59719c85d42","last_modified":1601517445866},{"schema":1601373073544,"derHash":"02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=","subject":"CN=GIAG4x,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=","whitelist":false,"attachment":{"hash":"7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50","size":1991,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/e4fc6359-81c9-49c3-ada7-2ec1bdf010a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"c20c0d70-6c96-450f-8ecf-8135b2f7766e","last_modified":1601517445844},{"schema":1601373070729,"derHash":"DakU+3El9uZE63qiYd6euAncf5Jbayp9in7dhzY5i1s=","subject":"CN=Staat der Nederlanden Domein Server CA 2020,O=Staat der Nederlanden,C=NL","subjectDN":"MGMxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xNDAyBgNVBAMMK1N0YWF0IGRlciBOZWRlcmxhbmRlbiBEb21laW4gU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"2f30004a37d33d9c2a59bae9b9e7ae94f816bd331c1a88deabd4af0f028ec59e","size":2438,"filename":"N9-YluTCUa_HTXc60QxjUReBLpRniAkIK2N84DhgmW4=.pem","location":"security-state-staging/intermediates/32515a04-77a4-49fa-83c0-36ae6f3a5dab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9+YluTCUa/HTXc60QxjUReBLpRniAkIK2N84DhgmW4=","crlite_enrolled":false,"id":"732efca5-8974-4190-8e83-bf82ff07f739","last_modified":1601517445832},{"schema":1601373066528,"derHash":"X4hpRhXkxhaG4Qa4TDM4xnIMU19g029hKC7RXhl33UQ=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"bd47e7c223bc2e656a7455d83b5877cd3dbf66c20fcb9f464190df0a25d15bdb","size":1760,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/1ee740d1-83dd-4bc7-a5a7-cb03a31c1763.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"5c31a860-b4ef-4791-8e42-f75e10d6c910","last_modified":1601517445821},{"schema":1601373074948,"derHash":"aXKbjhWobvwXelevtxcd/GSt0owvyozxUH40RTzLFHA=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"df3c4c472795ccd5ca93453fa1024c35f64466f19536a34fb21d39c840e2e27b","size":789,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/e3c85b2f-376b-4a02-af59-534857d8ea19.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"edd34046-1baa-49cb-8053-ff3025c65f81","last_modified":1601517445810},{"schema":1601373069295,"derHash":"LK77tV5w31qJhf6bwQ3VakDD3tqz2hUwopaCAVxbfGY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"a45e27eb4ce4e2624d46479d0ecf5a612e520e17ac29d9b405427a94f6798f65","size":1512,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/6ef0f203-a563-43fa-8eba-9b978890ca68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"e542d416-8008-4a93-9c04-69bcfd8087a2","last_modified":1601517445799},{"schema":1601373072113,"derHash":"us3gRjBTzh1i+L50Nwu6551PyvGfwHZDrvGV5qWb1Xg=","subject":"CN=E2,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJFMg==","whitelist":false,"attachment":{"hash":"051882dab9b07102f7aba08eef5eb943e8b8096631074d7f98f9c7dcef77e86d","size":1020,"filename":"vZNucrIS7293MQLGt304-UKXMi78JTlrwyeUIuDIknA=.pem","location":"security-state-staging/intermediates/582d2a81-663c-4e04-a8a6-341023b6be78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vZNucrIS7293MQLGt304+UKXMi78JTlrwyeUIuDIknA=","crlite_enrolled":false,"id":"a537077a-14c9-4783-a4e0-5a7ea2e660b9","last_modified":1601517445787},{"schema":1601373067917,"derHash":"am8voTstnbu0CYAgAtM3BnJ2CiF42bjVaU1mBHQjH6Q=","subject":"CN=e-Szigno Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHkxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJjAkBgNVBAMMHWUtU3ppZ25vIFBzZXVkb255bW91cyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"4a22ba90a733131c2581c1d0dd2fbb9a8df38f518f2e5ba6ee0d10f4b3169c24","size":1670,"filename":"vqerAqvFBz-pP0lY3LKc96jOLcWu__imbw0SS3qBch8=.pem","location":"security-state-staging/intermediates/f7567136-382e-42ac-a1c6-fff3eb13845f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vqerAqvFBz+pP0lY3LKc96jOLcWu//imbw0SS3qBch8=","crlite_enrolled":false,"id":"aed26e63-166d-44c2-99e2-e757b42d4182","last_modified":1601517445776},{"schema":1601373063695,"derHash":"xj35YY+69IZiuhKr6HshLPd3wnpEag+lVdep0ZEUjtc=","subject":"CN=Trustwave Global ECDSA P-384 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"e81cc0a883e6e41a009a5d876bc62528cd6b26b1edd7421071b6ff434dca6265","size":1390,"filename":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l_zvmwptYjCgg=.pem","location":"security-state-staging/intermediates/ecde76ec-b1ee-48ec-b2c6-2cda6bc52ba4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIbNiw79lRjCX7hAKe6oYePjjaaAQ9l/zvmwptYjCgg=","crlite_enrolled":false,"id":"e696ad4e-cdc6-4b17-8ee7-13c8bcb02291","last_modified":1601517445754},{"schema":1601373056407,"derHash":"jSXNlyKdv3A1a9pOs8xzQDHiTPAPr8/TLcdutYQcfqg=","subject":"CN=GTS Root R2,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMg==","whitelist":false,"attachment":{"hash":"4d0fda0d78fd282ab5f1cf69e3b3e458120a33cf3e5fdeb14796f324a389d74e","size":1910,"filename":"Vfd95BwDeSQo-NUYxVEEIlvkOlWY2SalKK1lPhzOx78=.pem","location":"security-state-staging/intermediates/95c47a1a-f461-4dc1-8420-4c32207900df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vfd95BwDeSQo+NUYxVEEIlvkOlWY2SalKK1lPhzOx78=","crlite_enrolled":false,"id":"bc7a2f54-60da-4bb6-96f3-795d0359d8f8","last_modified":1601517445731},{"schema":1601373062251,"derHash":"YIG+5bDfGRrE4mWsD294mfB4uMifBgVa4Wavkd9w1uA=","subject":"CN=e-Szigno Qualified QCP CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBRQ1AgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"280a786ca35892c86124fb11c5e02f70f1bf6cd40daa1e6538e054942241cdaf","size":1674,"filename":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=.pem","location":"security-state-staging/intermediates/bb8b8c4c-b637-4241-a27d-e3f497235709.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zohU4uap0ZYaGxznYnSZfimXMiL0fPpOwF3CBDSo608=","crlite_enrolled":false,"id":"0f3daffc-a656-4c5f-a71b-0db59222a014","last_modified":1601517445720},{"schema":1601373057866,"derHash":"ffgAB19SA8AXNk6BGVqayf8AxQfWSnD3N9jT6Ms/CEU=","subject":"CN=e-Szigno Qualified TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHmUtU3ppZ25vIFF1YWxpZmllZCBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"df20fd29ecb80ea583b981311eed6c99114bffa8ab98b5265dc4c8efcc1897f0","size":1674,"filename":"qd9EIyfp7CEtbkxafeyYAuC_8wQBWqGZflkLznwnuyc=.pem","location":"security-state-staging/intermediates/9528d3b9-a037-4f0f-b644-1e7827d3c927.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qd9EIyfp7CEtbkxafeyYAuC/8wQBWqGZflkLznwnuyc=","crlite_enrolled":true,"id":"4802c4c4-718e-4497-a9a5-c367fed873eb","last_modified":1601517445709},{"schema":1601373055050,"derHash":"1oMbpDYH9awZd41idTFWKvVRRfGRyrXvr6DgAFRCswI=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"eec823ad61a76103455ac29ab1ea726af33851691074cffd1fb703c49fe85217","size":2121,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/d49999e5-60cd-4c45-a970-e9462ab32f63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"9561182b-470d-459e-8d38-ee7e1b3ceed8","last_modified":1601517445698},{"schema":1601373060728,"derHash":"4iFgNk5W98JyNPVDXYR3saW7ugEQMpjzlUkJGA3wJ3g=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"ad86215f7ef8a6f4477d1e9ceb7ec59f0773886cebfee09bac4eb456aa559c8c","size":2085,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/8f810e8e-9b9b-4830-b261-6873c11e2437.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"0c6f5e09-6c3c-4747-b629-3d81788a49ae","last_modified":1601517445675},{"schema":1601373050792,"derHash":"rXtYw8XZWGvltieZwnksQRHJhSqW97BgciEmVxOVfhw=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMUMwQQYDVQQKEzpTaGFuZ2hhaSBFbGVjdHJvbmljIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQuMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"64ac68b2f5fcfe1eb5b26d7d052a52af0101c298fc359ab1870916a82601f563","size":1808,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/f52fd61a-cf0c-4458-a6a1-3cfe976c2304.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"cf8cce0e-bdf8-41ca-b618-b43f76dc9e43","last_modified":1601517445664},{"schema":1601373052202,"derHash":"MqTlVONjEW/kjiLwHawXNnUqcccg+Z9GLVZQItO60H0=","subject":"CN=DPDHL Global TLS CA - I5,O=Deutsche Post AG,C=DE","subjectDN":"MEsxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTU=","whitelist":false,"attachment":{"hash":"136f459d98a2f42f67f606dcf55c11198fea1f244cf8003c576d60d969cef1ac","size":1695,"filename":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7-_aukXzu-S0_M=.pem","location":"security-state-staging/intermediates/c1a36f1f-4324-4c38-822b-4955c7caa508.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90SkSHjn6UuYfQCvunxuVf7tHQJ3Y7+/aukXzu+S0/M=","crlite_enrolled":true,"id":"c33aa503-cce0-418b-b8e1-1cd25396b905","last_modified":1601517445653},{"schema":1601373043849,"derHash":"YGDqsYASLrFPIu3kZbSppw4p5w+xguvwHVsTM/LnMkI=","subject":"CN=RapidSSL TLS DV RSA Mixed SHA256 2021 CA-1,O=DigiCert Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKlJhcGlkU1NMIFRMUyBEViBSU0EgTWl4ZWQgU0hBMjU2IDIwMjEgQ0EtMQ==","whitelist":false,"attachment":{"hash":"3ba8b83eb97ad48e9de41cf5e2bf4f6fdf72bd92b464134f8a11860b041476ae","size":1902,"filename":"inFIEiXuCIo8SWXm9sdY-WQwNjNja_ms8JpF3Lq3T2w=.pem","location":"security-state-staging/intermediates/4f7289d9-3d0b-4bf7-9a5e-934f96747340.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"inFIEiXuCIo8SWXm9sdY+WQwNjNja/ms8JpF3Lq3T2w=","crlite_enrolled":false,"id":"02ce3313-f150-44ba-b7a1-9aee17e6d859","last_modified":1601517445642},{"schema":1601373048045,"derHash":"1KWUHHFB7RlJoMbOndRaCrlNwzeQLrChIJhSc47r6FQ=","subject":"CN=GlobalSign GCC R3 EV QWAC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIEdDQyBSMyBFViBRV0FDIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"9a306430e243544a1c823baa60388aa1b7c197ccafd79a5fd9847056d91f6d8b","size":2032,"filename":"6Vipkd7oFTwhj_Z54b71vjmwq0aEJc6KkharcmzGaV4=.pem","location":"security-state-staging/intermediates/54c37b8e-2d9f-4770-a6ee-08a7d4d11934.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Vipkd7oFTwhj/Z54b71vjmwq0aEJc6KkharcmzGaV4=","crlite_enrolled":false,"id":"16ddf1bb-a12f-4d95-a455-9e6a82d4469a","last_modified":1601517445631},{"schema":1601373049403,"derHash":"QtyCf0b7XoXf+uR9PGkPUB7OJdV11ZelDY+Hj6Qq/Oo=","subject":"CN=e-Szigno Class2 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMiBDQSAyMDE3","whitelist":false,"attachment":{"hash":"24e4936e9492f5245f32e7f9b60258d25f2a4c8e36002f26691cdf9f19bb94f3","size":1662,"filename":"3TGdI2jR-PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=.pem","location":"security-state-staging/intermediates/a0283198-a2ca-42e2-abee-9f579d7b9911.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3TGdI2jR+PvtWXO9N84WdfCRvr5nND75u1oGBVvPEl4=","crlite_enrolled":false,"id":"6df97aa6-df00-4c66-afdc-850ead7cdcec","last_modified":1601517445619},{"schema":1601373045250,"derHash":"lJ1rS3YcoTStPnqFcRhvWA7oh/LGtWi1FA9BV/mNaN0=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"1a3bc0dfeb8f9e3f79809953a727d69dc11a315684b4cf57c35d226206502e31","size":1329,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/471ff3d1-a234-44c3-9336-a3593480bf23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"46952ab6-744f-4ac4-8cd9-767a8ebaa351","last_modified":1601517445608},{"schema":1601373046633,"derHash":"wa13eHltILymXIiaJlUCEVZSi7Yv9fpD4bjlqD49Lqo=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"f4d91481d1e4e17c44e796f180b7b4af9f0ae8e97cf8d41165640b3fdefd8f5d","size":1760,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/17efd7bd-6142-4486-a521-1bac923f5f17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"e194894d-74fa-4e44-b5c9-c5bbb841d31a","last_modified":1601517445597},{"schema":1601373042464,"derHash":"DTb2oimeniaPlK20nlfmcX1xPD9HuInEDc3Iz+lAy4A=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,C=IL","subjectDN":"MDwxCzAJBgNVBAYTAklMMRUwEwYDVQQKEwxCZWFtZS5pbyBMdGQxFjAUBgNVBAMTDUJlYW1lLmlvIENBIDE=","whitelist":false,"attachment":{"hash":"4b493757d7d299f8cc22b2765b16fa2d9bcc5aab6354a1aba37cad4f16162bf8","size":1727,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/0491bd9a-2ff4-4f0a-a3b2-3bee78c50874.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"eef290b4-e4ac-424b-91d6-846b75957235","last_modified":1601517445586},{"schema":1601373038124,"derHash":"Z4LG6a2/khbiaDBtRjM/vGdL3t+GtnvndweeLA42iI4=","subject":"CN=Trustwave Global Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGOMTcwNQYDVQQDEy5UcnVzdHdhdmUgR2xvYmFsIERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"a1aae690e4bc653bc8dd049d0014c8bdf294c1327ae51c6f40d11e8b728cdee3","size":2499,"filename":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X-kFQNRrNSN8Cw=.pem","location":"security-state-staging/intermediates/10461dd8-f33a-4e82-b46a-5408f96b944a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8k0xQNnFdJBZpSXQ6W9OldaDSJ59X+kFQNRrNSN8Cw=","crlite_enrolled":false,"id":"beb516ed-cac1-4c3b-af61-f25c3202f32a","last_modified":1601517445563},{"schema":1601373039540,"derHash":"HjVoI/5AwOqsKfntVGO3stscCItj67BYdqLmMcEId5g=","subject":"CN=QuoVadis Enterprise Trust CA 2 G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFsxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEqMCgGA1UEAwwhUXVvVmFkaXMgRW50ZXJwcmlzZSBUcnVzdCBDQSAyIEc0","whitelist":false,"attachment":{"hash":"756cc72bf46fca106a4ae94315fc04ea6bbe1b93e3229513d02875b33ca13f45","size":2385,"filename":"z-lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=.pem","location":"security-state-staging/intermediates/8a9ec500-a3e8-4a94-a076-29717920b30a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z+lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=","crlite_enrolled":false,"id":"6d245b72-3e57-43e5-936f-1071536497e7","last_modified":1601517445552},{"schema":1601373033892,"derHash":"iu/r2IvoejCxnGDFvQ+16fvNFdVYLV/Jp0mVeNaNzsA=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"54373e1e17726accdcc2879266317a44d0dc889c8003fa002f0337d0cd53627c","size":1788,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/49c18a87-730f-412f-8285-71d4cd57b21e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"741c5f94-32f1-402f-ae6a-c183d5680da9","last_modified":1601517445540},{"schema":1601373035317,"derHash":"f+uTdOqwjTknF8ZHQ22uBhdqJMAQYH/aHM5eXwEGtHI=","subject":"CN=QuoVadis Qualified Web ICA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzI=","whitelist":false,"attachment":{"hash":"c551ff3d69db56e747169ab80b2fdea513f1de4806de98e0e34ab04da70a7566","size":2385,"filename":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=.pem","location":"security-state-staging/intermediates/4557b165-1b70-4b52-a1df-a31b5fcc16f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=","crlite_enrolled":true,"id":"70588538-20e7-4b9a-980d-0d1bd77ff052","last_modified":1601517445529},{"schema":1601373029586,"derHash":"GKvW6cqQe7NnVNDARuu1Ddm5XVJ4JNlYGjG3UPz9uu8=","subject":"CN=Trustwave Global ECDSA P-256 Organization Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGgMUkwRwYDVQQDE0BUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"f16bdfde574887cdf9b20fdd1a1ad5e789c2d8b5094a68dc63225d64c51f2d50","size":1329,"filename":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=.pem","location":"security-state-staging/intermediates/9a14c734-72c1-49ae-8503-ff362f4d20d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lZMwN7CwdUNqVdEULuLxoCtwEIC9qGjWWMelIDRtDNU=","crlite_enrolled":false,"id":"dc0e3a1b-af1b-4795-a306-b6671eafd75f","last_modified":1601517445517},{"schema":1601373032433,"derHash":"YDiLdz0z6RQWSGE/NrkUnwFaEUN4us8+NpSGT/2kJuw=","subject":"CN=HydrantID EV SSL CA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHzAdBgNVBAMMFkh5ZHJhbnRJRCBFViBTU0wgQ0EgRzI=","whitelist":false,"attachment":{"hash":"ba2cc602bd31081e17f7745ac462854773e79726958ff1b8a553cc7ecaba9db2","size":2389,"filename":"FpAps1LWs_UTm3xApHYkNccnnZX-7Wc_v8V0t70p6rg=.pem","location":"security-state-staging/intermediates/9a936f86-971e-4af3-ae70-ee94da9a5554.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FpAps1LWs/UTm3xApHYkNccnnZX+7Wc/v8V0t70p6rg=","crlite_enrolled":true,"id":"05c4f166-166c-46c7-853e-436884874fa9","last_modified":1601517445506},{"schema":1601373036712,"derHash":"T4OELx8Eqx4E1NjnUWZvyoLlGRyvwkBiv9H+d8AspLQ=","subject":"CN=e-Szigno Class3 CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHMxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxIDAeBgNVBAMMF2UtU3ppZ25vIENsYXNzMyBDQSAyMDE3","whitelist":false,"attachment":{"hash":"71132024dc6f9eb4be8dbf1a0131b491fae4efd3d711ad58c399ed1ebdd355ef","size":1662,"filename":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=.pem","location":"security-state-staging/intermediates/b983723e-4861-4166-a5e3-5b415cee2a65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X4MOqhXQM4obftW5dgADxiIIIaZwoNHvuYhRJq7eVe0=","crlite_enrolled":false,"id":"f369caa4-59c3-40ea-ab24-534bda082949","last_modified":1601517445495},{"schema":1601373022448,"derHash":"sarhvNVV6KPR492o7ITnV8VSZVNEzj/uu6+Y6JXb7aw=","subject":"CN=QuoVadis Europe SSL CA G2,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEiMCAGA1UEAwwZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"dfb31ebff112bccbef0ba90c29987f9962823acb59f69bd984351d9e2c7e22df","size":2381,"filename":"XOogr9_VItHwTOA_JogutdX4V06tVw9btHQLa2tR0_A=.pem","location":"security-state-staging/intermediates/d277bb95-8c7d-4bda-b42b-841c07743fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XOogr9/VItHwTOA/JogutdX4V06tVw9btHQLa2tR0/A=","crlite_enrolled":true,"id":"fbb49441-fc76-4afd-b067-1c2f1578798d","last_modified":1601517445484},{"schema":1601373026753,"derHash":"mRe/2FNziYXkbJIEGUEOlmwxaYJ2nnGBfifQOEu+Nnk=","subject":"CN=certSIGN Public CA,O=CERTSIGN SA,C=RO","subjectDN":"MFkxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEbMBkGA1UEAxMSY2VydFNJR04gUHVibGljIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d61a1b35a91c710f44d6b989faabe0cbe91a89dbc701983bdbf2602b85bf3038","size":2312,"filename":"IGxtWhsxuC58R149YREUyaqPK7jXR9no_MMC227zRVo=.pem","location":"security-state-staging/intermediates/f32e48dd-f449-4b02-b440-48880750748b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IGxtWhsxuC58R149YREUyaqPK7jXR9no/MMC227zRVo=","crlite_enrolled":false,"id":"c16caddc-a295-485f-a252-08d162ad74da","last_modified":1601517445472},{"schema":1601373025354,"derHash":"gpj8QnBMTtd0tNsxBSkmC1JKkHUlKh0Ks44G8bmoNJk=","subject":"CN=CertCloud RSA TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"MEoxCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMR0wGwYDVQQDExRDZXJ0Q2xvdWQgUlNBIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"59bb133020146d20f0d963a09c0520755e8a49c60982dbc377b4072ee287be19","size":2073,"filename":"Wz3-4Wr1VbAmx0vpewGzhrRMM8dT5kZ8_PHc1S6WqYs=.pem","location":"security-state-staging/intermediates/3f52eb76-c690-4e12-a4e3-67a11e5c69ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wz3+4Wr1VbAmx0vpewGzhrRMM8dT5kZ8/PHc1S6WqYs=","crlite_enrolled":false,"id":"63cade8d-29ec-4030-993f-05ec44965f59","last_modified":1601517445461},{"schema":1601373031043,"derHash":"ozAX2d9JTAnVhwkQdAOu5GG5Rh6BujlcKMNmk8J9GYY=","subject":"CN=GlobalSign GCC R3 UK EV QWAC CA 2020,O=GMO GlobalSign Ltd,C=GB","subjectDN":"MFkxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJHTU8gR2xvYmFsU2lnbiBMdGQxLTArBgNVBAMTJEdsb2JhbFNpZ24gR0NDIFIzIFVLIEVWIFFXQUMgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"ef3f87aa1971aaebb3accc4f6b43e518068a070c3df5324fafc49bd6faea510d","size":2040,"filename":"_cLNIs90Pu4zrpnBuJdA-wTl2BrxEVUjup-MFOMyr1g=.pem","location":"security-state-staging/intermediates/6aff1d72-b020-44ed-9747-7e0d0daeebe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/cLNIs90Pu4zrpnBuJdA+wTl2BrxEVUjup+MFOMyr1g=","crlite_enrolled":false,"id":"0de3a855-871f-4807-8a57-6455d04ddf13","last_modified":1601517445450},{"schema":1601373028185,"derHash":"NH0Y3Mwu/FGpIOen+7B7+9o1YTaB+C3KXExyuwyDwDU=","subject":"CN=VR IDENT SSL CA 2020,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MEoxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMR0wGwYDVQQDDBRWUiBJREVOVCBTU0wgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"4158e246be129509cb8d8eb14b647517fea0196e81a9d593f4b8f64a11a6414f","size":2357,"filename":"fQUctsUYoew1aFnAFT0prf-kJmkVNqkPo2jJ5Jm9RaA=.pem","location":"security-state-staging/intermediates/c5cd11fd-b913-4de0-8e55-2cba38801c23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fQUctsUYoew1aFnAFT0prf+kJmkVNqkPo2jJ5Jm9RaA=","crlite_enrolled":true,"id":"8b7ef937-682a-4391-bc17-7b736da1f754","last_modified":1601517445438},{"schema":1601373023867,"derHash":"ZZt6UYxsnrGKoes1rrp6AkeBe4mMH6GED5fSh32aIOQ=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"19f63552805d608f671589717902feefe03afc5da94e20c555f68ef484a23b46","size":1772,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/eb37192b-3adc-4149-a4a6-22c2a4989853.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"4c46f44e-56a4-4453-aa72-bde6a760e021","last_modified":1601517445427},{"schema":1601373021078,"derHash":"MCQkQ/aJWpRWDkjk3/cgU26vUWPLQvXod0AqveL4Ynw=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"63f37d712386cb1b4ab3fb0368f861aeb7ba74ec9b9bc7ecdd247bcf94725693","size":2373,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/39871409-2b2c-4c4c-bbfe-718a4f28b294.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"d6eb39bf-c00f-470b-b66d-4cbff41072d6","last_modified":1601517445416},{"schema":1601373015521,"derHash":"y2Zmsyv/Lv7cxBh98Umm00pdELcWW5z/KmfA4xGu7tc=","subject":"CN=QuoVadis Europe EV SSL CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MFYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjElMCMGA1UEAwwcUXVvVmFkaXMgRXVyb3BlIEVWIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"990290f2ea4ff420df521c3b3851971e7be41a8508394faa2cb562a69bce9e55","size":2385,"filename":"WkWVWx1-X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=.pem","location":"security-state-staging/intermediates/c109e409-4365-46b3-9ad9-fa7bfb71916e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WkWVWx1+X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=","crlite_enrolled":true,"id":"be8ee1dd-ae8d-4533-b3df-85448960d676","last_modified":1601517445405},{"schema":1601373018308,"derHash":"AD9x3EggIWV1/Fqs/jsa63b3Kupbjo/O/IC59RekphI=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"312e807dea2263ef605990bfa0b57b238b64d9fea0fc945e37f48f3e6246d576","size":1329,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/b67ac8d6-d3f8-4aff-a8b2-27648de5ca88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"8c986b7e-d08c-4c76-975d-f8d0f5c5e972","last_modified":1601517445383},{"schema":1601373019690,"derHash":"q7P/KZqhuu/BJ4gYxCQ4iu97KWUVlcYBlOeNlDaUaAs=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"d81fa5cb3c1ec6bbe8f1e276fd6412ef30e25f49781b84d8eb23f85d412845ef","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/399cee33-9586-41bb-bc42-6810dfa7af54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"57e04007-0e32-49c8-878b-c113ac0b0204","last_modified":1601517445372},{"schema":1601373014084,"derHash":"gBxSLTrROOTwXUZ+o2nBzCdgeL8oQBjQUl67vFNCyDY=","subject":"CN=JPRS Organization Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"5073da9684a445c50c1705a593be556ce4f1fa98e69b8c50acc426e2088d88b7","size":1788,"filename":"xOSyACYAjsQ-aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=.pem","location":"security-state-staging/intermediates/37978617-d633-4b10-9ad5-20fb1eb251e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xOSyACYAjsQ+aXD2iEFnKCVOcUsX8AVVqCGczMoh8lw=","crlite_enrolled":true,"id":"6e8f2f2b-bcba-4f33-94ec-0a957b820ea2","last_modified":1601517445361},{"schema":1601373009905,"derHash":"WAuzqxJ/XhPpQK5zZePGmmKtIE1/36RRWS/nxH3AKpU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,O=Prodrive Technologies B.V.,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMSMwIQYDVQQKExpQcm9kcml2ZSBUZWNobm9sb2dpZXMgQi5WLjE1MDMGA1UEAxMsUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4gT1YgU1NMIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f33b1ca67bc2f7ef2190fc43c1d09060a4d6392a8969577007ae2dcf61b1b92a","size":1788,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/cf2dd791-1cb8-4120-9b15-9753e5636426.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"4cc64cd6-766e-45df-8736-8ed3f0b8ed2b","last_modified":1601517445350},{"schema":1601373011329,"derHash":"FjzS/K0NaofI2vzgVvWU87U7kXwPkl1A2SJY6id/xPQ=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"d4292d809a630e5b57cdc50d9205799bd35a8b3a0c8cf33366d00d5e3e8cdf78","size":2499,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/c5792cf8-8999-4ef3-be9d-129c9886ac27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"732922a9-4172-428e-90da-844ecf1ead96","last_modified":1601517445339},{"schema":1601373012722,"derHash":"a0O0wkOqLZlEDA8UvexSMe7GPoaq8jdspwAgKEWNxyY=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"b63de0fbdd8dbe519e4d6f674c13166625a717f8e6156297f07badf1c8b0d8fc","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/fb391543-5f49-46ed-80a5-42df9aea0b5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"80645ecf-a0a4-4cd4-bda9-ff2edd1cad90","last_modified":1601517445327},{"schema":1601373006798,"derHash":"iZlLbZ2d3/9of6vT5zQs3YUi1mH1786Oar3rJaBPECM=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4446a8961707823fad23675d037ebcc454ecda2fe98586b7839466271d4521a2","size":2369,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/0e88e01d-3cf6-41bf-82fa-ec760632f6d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"3c925fcd-4777-4caf-95a1-e9b43fded89a","last_modified":1601517445305},{"schema":1601373000857,"derHash":"yhTPmzCboDK7IZEMGu2uTSn+Bla0+L/6I8vpTUMcBnQ=","subject":"CN=Entrust Certification Authority - DE QWAC1,O=Entrust Datacard Deutschland GmbH,C=DE","subjectDN":"MIGIMTMwMQYDVQQDDCpFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gREUgUVdBQzExGDAWBgNVBGEMD1ZBVERFLTExOTI2NDMxNjEqMCgGA1UECgwhRW50cnVzdCBEYXRhY2FyZCBEZXV0c2NobGFuZCBHbWJIMQswCQYDVQQGEwJERQ==","whitelist":false,"attachment":{"hash":"4e133243cde83dcbe732252fbf43b8518690328d9c29c7647170c786d537e396","size":1792,"filename":"ZWhmaUZRaiEz-pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=.pem","location":"security-state-staging/intermediates/caa2d710-6be9-4877-98e8-e7eb89e1ece1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZWhmaUZRaiEz+pmpHFYrrwb8L7sV4g8Lss57AOkaaLg=","crlite_enrolled":true,"id":"fb1542af-66aa-4793-a4a4-2ec82b62886f","last_modified":1601517445294},{"schema":1601373002455,"derHash":"jJegCPfOIfdG6vsuOuBgleVX0omjEMgsbzwC2fch5fg=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"27785b9964ca41a7f924e4715e32d3827904bec2c860b8f2f76367447209d89d","size":2089,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/7923969e-6dfe-452f-ad52-6c9e18f6b1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"35357782-dccb-4d60-914f-70a972059474","last_modified":1601517445272},{"schema":1601373003919,"derHash":"yKYQupQXdw0sAt4ivKjFakKK916ONU76NsVoIh3bfPw=","subject":"CN=WISeKey CertifyID SSL GB CA 2,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMg==","whitelist":false,"attachment":{"hash":"25f18c47254a897f57257e91e33dccd040b88a2d2805589a22993da2900db84f","size":1699,"filename":"ktJRzJxhVE71wdby3vum5K-dgm6QylD4z-l9CBGOUQU=.pem","location":"security-state-staging/intermediates/157b7e9c-098b-4150-9256-1327b4494c1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ktJRzJxhVE71wdby3vum5K+dgm6QylD4z+l9CBGOUQU=","crlite_enrolled":true,"id":"95dfd144-a5fe-481a-8864-499dbc671323","last_modified":1601517445261},{"schema":1601372999143,"derHash":"8RRGn7gHeBM6H3Dk2DOO2rl91CzrjswByvtw1rh98R4=","subject":"CN=certSIGN Web CA,O=CERTSIGN SA,C=RO","subjectDN":"MFYxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEYMBYGA1UEAxMPY2VydFNJR04gV2ViIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"d637585d0fa1d3a2b6cea2a2ab6f2b7d30229bc1eb350aeb2b8cc2f529b5998a","size":2308,"filename":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs_0ubJ68=.pem","location":"security-state-staging/intermediates/41d41219-98b5-42b0-af05-16477adebf5b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G6NjfcFmFAa5DouUTqNGb3I5tG34kmES3evs/0ubJ68=","crlite_enrolled":true,"id":"16c01cde-d169-45ca-b52b-e3c8ff102c4c","last_modified":1601517445250},{"schema":1601372996248,"derHash":"Kyz67KvyJm/U+2UF8zQrklFOvm+nwIy2y9SYj2r9F70=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"399b1d081c0af091e4829f3801f90b9e266db1e4e3c5d6a03e438d33ecc67c14","size":2788,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/bd9324bb-91f0-4fa2-9e2f-01a7635399bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"c146412b-6547-40f7-b3b1-14568ce07444","last_modified":1601517445239},{"schema":1601372993406,"derHash":"Kg4/KneoDcvlzVLVDWUHbr03+tUx2xDWoThaVX97cl0=","subject":"CN=e-Szigno Class2 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMiBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"bcb11e505804477ce4429c8ef9cc22d043e0f59d222d5e4524ec9158cc8e972b","size":1666,"filename":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=.pem","location":"security-state-staging/intermediates/30bc71d2-6f0d-4d55-8e79-2d8b4e3ca301.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HGXB7TIfcoLqLINF3LJD2A9t3V4VdHjcBv6LboViQMo=","crlite_enrolled":false,"id":"b35f777c-ccb5-4262-bd7b-171a05274855","last_modified":1601517445215},{"schema":1601372987894,"derHash":"kfGc5QPJ/n/5WH2O++9zFarud9wtFFJhJkk7Stb+gB8=","subject":"CN=Trusted Root TLS CA SHA256 G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1UcnVzdGVkIFJvb3QgVExTIENBIFNIQTI1NiBHMw==","whitelist":false,"attachment":{"hash":"9e03d57a2b38ff0564d3f320d536aae856aa3db18618f722e03e7da8e2a0d9eb","size":1674,"filename":"hMdIk_Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=.pem","location":"security-state-staging/intermediates/d02d6906-c341-4db4-8d1d-1e2fe228c6ba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMdIk/Qh87wkhjuY3vWYC85yuCKrEfbi9b3j7xJNPec=","crlite_enrolled":false,"id":"1b0ddc8f-9147-471c-b076-471f56173514","last_modified":1601517445204},{"schema":1601372992040,"derHash":"Z63RFmsCCuYbj1/JaBPATCqliZYHloZVcqPH5zdhPf0=","subject":"CN=R3,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSMw==","whitelist":false,"attachment":{"hash":"c298ec17b9257dbfb7f36280caade22c6317186c146b5fdd5792bcb77afced29","size":1825,"filename":"jQJTbIh0grw0_1TkHSumWb-Fs0Ggogr621gT3PvPKG0=.pem","location":"security-state-staging/intermediates/4d4b4f19-2a28-4629-813e-a946f8f93613.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=","crlite_enrolled":false,"id":"ceb5d877-bb7a-4afa-935a-747f6f6edb9a","last_modified":1601517445182},{"schema":1601372989273,"derHash":"nOJ0/9oMxIdiy3GxLHQgScco5h37wHCOP5yHHp696iI=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"95cf8df7fb366c8a374ed3369242ba3db91973c2101055c3f8282a0abaae2334","size":2032,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/5e3cbdc7-e03a-4759-8d05-acfd67cfe11d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"6abf86be-2d68-4ffb-8cc4-f106c8e6672a","last_modified":1601517445171},{"schema":1601372986478,"derHash":"LRQPILipbitNLxzFrKXloefcVqdJHlEJBpYPONLSGu8=","subject":"CN=GeoTrust EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVWIFJTQSBDQSBHMg==","whitelist":false,"attachment":{"hash":"f01753f65dd631ba19494a777a86712466e7e8b20994d581e672f52716f315bb","size":1873,"filename":"VHUagq80gsWdvnfHL_-2XSLZrAJk4I9d8fx6N8UvWGM=.pem","location":"security-state-staging/intermediates/478959ca-26d9-412d-85ae-28108bbb5141.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VHUagq80gsWdvnfHL/+2XSLZrAJk4I9d8fx6N8UvWGM=","crlite_enrolled":true,"id":"c79290ea-cb9f-41a0-978e-7fb294622f3c","last_modified":1601517445160},{"schema":1601372982248,"derHash":"BDerLsLCtIkClsE1A0sh2xRkNLgxfucDqoqpQ8XqUa4=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"2777739491d74eeced727118790444484a83437e4e704c6697aa928b36a78bbb","size":2653,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/775f7b60-b34b-4f8a-8784-5cb0bdf38b8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"51cc8cd9-87cd-4af4-bd26-441c2d7b0365","last_modified":1601517445149},{"schema":1601372983592,"derHash":"zby+8W43I3cC+sxLVdOrkqF8+heDXhM3eqTSug/UegI=","subject":"CN=Cisco Meraki CA2,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRkwFwYDVQQDExBDaXNjbyBNZXJha2kgQ0Ey","whitelist":false,"attachment":{"hash":"3e5a1329226826601bdcf297eb985c9089c7df20bac76d529770ff0dcdc2bd3e","size":1752,"filename":"UNvyYoiHE-TJr4GNRJRQQVYLfL7m_X0ULyrRNeeQaKE=.pem","location":"security-state-staging/intermediates/533dec71-3955-4ae6-a2ac-45d8bbb06f61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNvyYoiHE+TJr4GNRJRQQVYLfL7m/X0ULyrRNeeQaKE=","crlite_enrolled":false,"id":"3de29e4b-6106-495c-92fc-1daf069924d7","last_modified":1601517445138},{"schema":1601372990662,"derHash":"vLwYxGO2HzoDOxDHSXTtiiwyivzWejONmHFQajUVQZ8=","subject":"CN=e-Szigno Class3 SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIENsYXNzMyBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"141f708e3e75831bbe1ea4307dbbb1564e45c53708e07ce12ace8a2c364453d4","size":1670,"filename":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=.pem","location":"security-state-staging/intermediates/35bc1459-db4e-4fbe-b245-efb1d8b3e9e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"69Duo3nmlQnUEvqzlU27qTDaDY9K1yN0wfdopIs9Y7s=","crlite_enrolled":true,"id":"5bb86eed-d806-4423-a0c3-14872f739af8","last_modified":1601517445127},{"schema":1601372984986,"derHash":"PuAnjfcfo8ElxM1IfwHXdGlOb8V+DNlMJO/XaRM5GOU=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"a7e1e9af45661eb891874dbac46389428139246fe7050143e9b0fd233f74e236","size":1926,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/94d8f6ef-9901-4bbf-94da-34339f9a5963.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"91a079ca-bed6-440f-bcb5-bf985f4fa544","last_modified":1601517445115},{"schema":1601372976467,"derHash":"xnDHm/J3r357NKaqT6MERBgzxr0Bpwp+m3otlMHB+SY=","subject":"CN=certSIGN Qualified CA,O=CERTSIGN SA,C=RO","subjectDN":"MFwxCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEeMBwGA1UEAxMVY2VydFNJR04gUXVhbGlmaWVkIENBMRcwFQYDVQRhEw5WQVRSTy0xODI4ODI1MA==","whitelist":false,"attachment":{"hash":"22d738f384d471ab73b8f3d1ec90fd80d0f61bf77294a7139dc772f58bb58e1a","size":2316,"filename":"hztK7Nl786SeQOWatriSlHoTSUt-1THcFFIGKRr08bk=.pem","location":"security-state-staging/intermediates/f6b4147e-2d85-401b-b347-336b86f662e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hztK7Nl786SeQOWatriSlHoTSUt+1THcFFIGKRr08bk=","crlite_enrolled":false,"id":"1389ee32-b744-400a-ab40-13406b869a0f","last_modified":1601517445104},{"schema":1601372979267,"derHash":"/PJvvBsqJadqtOqSssvvNn4BMQkcgC2kmJj3iuVLMPg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGgxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"551d256b9e4988053973e8535709a6276d327de7d3ea6dd215e8c97deef2c69f","size":1768,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/f5bc3f86-9688-4e6c-ab8c-549cf8ae95c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"061b3372-2f09-4347-81b6-08192cd27c88","last_modified":1601517445093},{"schema":1601372977883,"derHash":"9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"f3d6221594115cd098f20f66a013d90aae3becd3c578a737a8e58a35230c208d","size":2016,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/a696b13d-038b-4610-9f8b-38652860e9c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"edd2b6b4-07a7-4a01-b28d-0dc72a371b84","last_modified":1601517445082},{"schema":1601372980668,"derHash":"NJ36QFjF4mMSOzmK55VXPE4TE8g/5o+TVWzV6AMbPH0=","subject":"CN=GTS Root R4,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSNA==","whitelist":false,"attachment":{"hash":"5f621c613a2dfb4502a29efcba11f0a010ef7954ea3464006115a9c300bdcdc1","size":764,"filename":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=.pem","location":"security-state-staging/intermediates/69f37a26-8b23-4ccd-8dfb-890714c89849.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mEflZT5enoR1FuXLgYYGqnVEoZvmf9c2bVBpiOjYQ0c=","crlite_enrolled":false,"id":"5431c1cf-28e7-4a86-9584-396994a62e7d","last_modified":1601517445068},{"schema":1601372969365,"derHash":"SP+LSUZox1IwS0i/6Bh1iYfe9lguXwm5IfS2C7PWqN0=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"b800befca1341c29912755ead3105bdab854e4517a96d3492de73bd48b6aca1c","size":2121,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/c268b46a-b13f-4845-b57c-817f59e5ddbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"0c4389a1-a439-4fb9-97da-d505176b0ce2","last_modified":1601517445044},{"schema":1601372970795,"derHash":"Yk1VdqZSshMHaL/oS5Ze7//ZFgPSXNX3FVp9wnidrDg=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"2468274c7b25fd2b19d422592a89957967b1d0b2667a280258fa181e4990089d","size":1512,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/cdd4bad1-dc39-4943-9512-33b9f4affd94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"eb66473b-5fea-4e7e-91ac-acc760eb3e08","last_modified":1601517445031},{"schema":1601372967809,"derHash":"iPwYvQcb4fvFP/vIAfA/WyxNqHu6DAmOK0gI8Z6rBf4=","subject":"CN=RNP ICPEdu OV SSL CA 2019,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MGQxCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMSIwIAYDVQQDExlSTlAgSUNQRWR1IE9WIFNTTCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"292ae2e45b6a02ae65ded412e50c0abf3b623685bd49a8f6369bb4d5010c40d8","size":1784,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/49b02dda-6993-4e4a-8639-8061b575e3f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"d785db77-6704-4e55-b637-4f5c27423ab9","last_modified":1601517444997},{"schema":1601372974968,"derHash":"WS4aLwo0KEsOJvy0/tIq+FmEju6IIq22G0LatHov/cI=","subject":"CN=KPN PKIoverheid Server CA 2020,O=KPN B.V.,C=NL","subjectDN":"MEkxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEnMCUGA1UEAwweS1BOIFBLSW92ZXJoZWlkIFNlcnZlciBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d6c29637397d41ba732890b7381061d5aa7ce2b45a6658ec8cd3e1578ec36521","size":2463,"filename":"Yao-RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=.pem","location":"security-state-staging/intermediates/950d42f2-c7e5-4243-a5d9-0abf3ca120c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yao+RgzIlYNhXc65ch9IpKzSRFUSiL01Et8c6sN4XLU=","crlite_enrolled":true,"id":"aeaffa76-1733-4a39-a25e-4c5a82a04937","last_modified":1601517444985},{"schema":1601372966279,"derHash":"sIXXC5ZPGRpz5K8NVK56Dgeq/a+bcd0IYhOKtzJaJKI=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R4,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNDETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"babd66311bcbddf05b57e8c3547a7daa9175826a9288b0eddc4bce49d951e547","size":703,"filename":"CLOmM1_OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=.pem","location":"security-state-staging/intermediates/92c74d74-33c3-442b-8f3d-283431becf54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLOmM1/OXvSPjw5UOYbAf9GKOxImEp9hhku9W90fHMk=","crlite_enrolled":false,"id":"f9805daa-ab6f-4827-8a6e-dfdda2f0530e","last_modified":1601517444974},{"schema":1601372972183,"derHash":"EDLGAB7WZKDNNDsTi8toYOIREBHD1fBlQPW+QRR4EqU=","subject":"CN=Legacy Technologies Intermediate,O=Legacy Technologies GmbH,C=DE","subjectDN":"MFsxCzAJBgNVBAYTAkRFMSEwHwYDVQQKExhMZWdhY3kgVGVjaG5vbG9naWVzIEdtYkgxKTAnBgNVBAMTIExlZ2FjeSBUZWNobm9sb2dpZXMgSW50ZXJtZWRpYXRl","whitelist":false,"attachment":{"hash":"a9f261d0ad4e87bacd12e03d772b19c478c501880901e13afa12424a3fa0819b","size":1906,"filename":"1IN_wrqE9VVL4qRI4B5j8xzAQgZ1Wap_tLlGGVYhcEc=.pem","location":"security-state-staging/intermediates/6aba6c2c-da6f-4f90-9dbc-856cf2fefcdd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IN/wrqE9VVL4qRI4B5j8xzAQgZ1Wap/tLlGGVYhcEc=","crlite_enrolled":false,"id":"de96a547-05fc-48e0-9eaf-ddeca013b4c1","last_modified":1601517444963},{"schema":1601372960748,"derHash":"l0uCB2FUzv9W7U21Yhhvc5SgL/OHqiBdY2eosI/3+qA=","subject":"CN=e-Szigno Online SSL CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG2UtU3ppZ25vIE9ubGluZSBTU0wgQ0EgMjAxNw==","whitelist":false,"attachment":{"hash":"0abdd69f4b3ccf85097142e285b47d52e0f91c59aa3e684dfa3c25bb3c8d6039","size":1666,"filename":"G_JwHP_ydSe7pufWcUyNckBrxBbnQ6Kmqw_OFPPiQI0=.pem","location":"security-state-staging/intermediates/9386bab7-f17e-4eab-807c-9bac2367686a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/JwHP/ydSe7pufWcUyNckBrxBbnQ6Kmqw/OFPPiQI0=","crlite_enrolled":false,"id":"492ac880-b573-41d2-9d22-5faff82d960e","last_modified":1601517444952},{"schema":1601372962115,"derHash":"pmUAegXv4YidZqQN7svGwaJx6RkAaBH9uNvX4GdSEtE=","subject":"CN=Siemens Issuing CA Internet Server 2020,O=Siemens,C=DE","subjectDN":"MFExMDAuBgNVBAMMJ1NpZW1lbnMgSXNzdWluZyBDQSBJbnRlcm5ldCBTZXJ2ZXIgMjAyMDEQMA4GA1UECgwHU2llbWVuczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"5ab8cb8a5146787aeb9025fd757a28e47c16893e2603c336459385a83349e955","size":1719,"filename":"uOU9UZhtVd_opiG5DbxESujdJ9UY8BLJblR-MMq9FbY=.pem","location":"security-state-staging/intermediates/35dbe988-7f8a-48f2-b67b-e95d314fa047.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uOU9UZhtVd/opiG5DbxESujdJ9UY8BLJblR+MMq9FbY=","crlite_enrolled":true,"id":"4e715493-0fb6-4d65-b11d-e75ae54c02e0","last_modified":1601517444941},{"schema":1601372963495,"derHash":"MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=","subject":"CN=Thawte EV RSA CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFViBSU0EgQ0EgRzI=","whitelist":false,"attachment":{"hash":"7ebde9e072e9a7bbb57c5810346275bf9ef461c815c5ae04aea58f3354aeb691","size":1873,"filename":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=.pem","location":"security-state-staging/intermediates/a37b7f8c-a3b5-430e-89cf-8fe6b38bb6b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BLOV1UJgeWCwCAR8qU9OWMMcRY8vXk1zqu0szJamQxw=","crlite_enrolled":true,"id":"07b39017-e019-4285-8987-c74c020ff536","last_modified":1601517444930},{"schema":1601372959354,"derHash":"TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=","subject":"CN=DigiCert Trusted G4 TLS RSA SHA384 2020 CA1,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IFRydXN0ZWQgRzQgVExTIFJTQSBTSEEzODQgMjAyMCBDQTE=","whitelist":false,"attachment":{"hash":"9b316d7bf93b9d342bdd4df71094c0e97165fde2c9cd97a6beca3f212dac4054","size":2479,"filename":"rjm2hHKNhSnI_7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=.pem","location":"security-state-staging/intermediates/e43a7840-9ea4-4b76-93c0-ab636088bcb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjm2hHKNhSnI/7YDoWFLmDSpnIwnr9n9bbNU0dhDiJg=","crlite_enrolled":false,"id":"7f65139b-c66f-48be-9e43-38f9d4c05309","last_modified":1601517444919},{"schema":1601372956559,"derHash":"ffTT70V5j4xDhPxwK6UqRM571imLFBYo1Kurx2ePZGc=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"8d704ee294bd149733993801e0cbad6deaa30f162b02e59509443d2f13b07b74","size":2653,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/4637d3ff-89aa-452e-a12e-c9c34c573108.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"0d9dd2b6-0308-43ef-9472-413931d00b4c","last_modified":1601517444908},{"schema":1601372957982,"derHash":"kn6b/A11wxRgcMPzr91KLBD3ZSiRJJl8xSz9EgnnY8s=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"f1fff265badcfcfaa0e9addfdc7577271845c1a6c9766600e36f19dc9bb90333","size":1780,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/e12f21c4-2828-41ca-8175-b204c12fa8e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"1b37cd2f-53fb-4ecf-a206-6d0e4afba506","last_modified":1601517444897},{"schema":1601372953629,"derHash":"NNinPuII2bzbDZVlIJNLTkDmlIJZbotvc8hCawEKb0g=","subject":"CN=GTS Root R3,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMw==","whitelist":false,"attachment":{"hash":"3febe52108c8006fec57c9deeef32126e877134377f5fed563452d77eb20ce23","size":764,"filename":"QXnt2YHvdHR3tJYmQIr0Paosp6t_nggsEGD4QJZ3Q0g=.pem","location":"security-state-staging/intermediates/b89eea26-3504-4cee-a2a0-c85c4b432b85.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QXnt2YHvdHR3tJYmQIr0Paosp6t/nggsEGD4QJZ3Q0g=","crlite_enrolled":false,"id":"89b91266-e037-419a-a184-4ab66dc534f2","last_modified":1601517444875},{"schema":1601372955108,"derHash":"2UdDKr3nt/qQ/C5rWRAbEoDg4cfk5A+jxoh//1en9M8=","subject":"CN=GTS Root R1,O=Google Trust Services LLC,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRQwEgYDVQQDEwtHVFMgUm9vdCBSMQ==","whitelist":false,"attachment":{"hash":"56cc033ba7b1b7f111791affa1f1df410009c08c0b9a625d2bbe0a30aca502bb","size":1910,"filename":"hxqRlPTu1bMS_0DITB1SSu0vd4u_8l8TjPgfaAp63Gc=.pem","location":"security-state-staging/intermediates/8f214a61-eaa8-4dfd-92f7-5caa2913bd08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hxqRlPTu1bMS/0DITB1SSu0vd4u/8l8TjPgfaAp63Gc=","crlite_enrolled":false,"id":"2aa716a5-b2ec-4655-ac65-199f085bd020","last_modified":1601517444864},{"schema":1601372952199,"derHash":"Ek6q8m9XDE+02J9dYQePFbiFNF/K8MV/NHfYxjtasm8=","subject":"CN=Actalis Extended Validation Server CA G3,O=Actalis S.p.A.,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGGMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEXMBUGA1UECgwOQWN0YWxpcyBTLnAuQS4xMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzM=","whitelist":false,"attachment":{"hash":"332f65bf2214e30be6f0940dc3bde167397bf14fc227615cd42ca92857dd83bf","size":2641,"filename":"Qit8ertDRalW2_YZANpfGKsGuNxcSeZ5UXpPg8_gmpE=.pem","location":"security-state-staging/intermediates/8479152b-cdd2-4fed-95c0-1c66f39292d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qit8ertDRalW2/YZANpfGKsGuNxcSeZ5UXpPg8/gmpE=","crlite_enrolled":true,"id":"f558856f-e8d1-44d9-810f-5e8dbdec4fed","last_modified":1601517444853},{"schema":1601372942202,"derHash":"vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=","subject":"CN=GlobalSign Atlas R6 EV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"7a27c45b53bfd5690bb01873eeb250e11a9b84a706cbbd33be1cafcbad5ed9a5","size":2402,"filename":"P7xnWSLQVg6f_MMaRe-f9TBAwDOlwdoyxweVGx8v2hY=.pem","location":"security-state-staging/intermediates/f027e922-5664-470d-ba39-6a79f14247f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P7xnWSLQVg6f/MMaRe+f9TBAwDOlwdoyxweVGx8v2hY=","crlite_enrolled":true,"id":"aa289f7c-0e5e-40b8-ba40-ac6f5788381c","last_modified":1601517444830},{"schema":1601372945081,"derHash":"N2EL91bKTDz6GGlsTBSXOOZEyp9nY4fsUBZzZdakXMo=","subject":"CN=Digidentity PKIoverheid Server CA 2020,O=Digidentity B.V.,C=NL","subjectDN":"MFkxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMS8wLQYDVQQDDCZEaWdpZGVudGl0eSBQS0lvdmVyaGVpZCBTZXJ2ZXIgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"c6efc5a8dbba37f6c4ba76f0ccd0f86ceb94b6b66cfd390227a747d4d83ff0b3","size":2487,"filename":"DnmLzHZn-pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=.pem","location":"security-state-staging/intermediates/757831dd-1795-41f0-85b5-3bdaf5cb5601.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DnmLzHZn+pLaQKZ9c6lYR5BOqhZMey469UF5T1hne2k=","crlite_enrolled":true,"id":"aaf24e45-19fe-4a12-a2f3-d98e7fc92964","last_modified":1601517444819},{"schema":1601372949425,"derHash":"XEUjNNnJyaLqQsx3pxZeF5XunYTrcMt4S0fqnZKlgtk=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,C=BR","subjectDN":"MF8xCzAJBgNVBAYTAkJSMTcwNQYDVQQKEy5TT0xVVEkgLSBTT0xVQ09FUyBFTSBORUdPQ0lPUyBJTlRFTElHRU5URVMgUy9BMRcwFQYDVQQDEw5Tb2x1dGkgQ0EgLSBEVg==","whitelist":false,"attachment":{"hash":"8265936e7b87a7845ad3792c1bfbde5b8469f44276f048e773d7d306888e920a","size":1756,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/4c65ee88-c3a0-444f-8224-2f3fbb1fde00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"6f0acdbe-0901-4b59-9d46-68ce3226c729","last_modified":1601517444808},{"schema":1601372946483,"derHash":"2sqgn/rY9m7bbtaXB6gnyeRMH5fEjwF5SF8gbXB7Pis=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ef925783f986610c821619c78a724b477a9c2b4492f84e6446635c18799dc2f9","size":12623,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/9f426597-caa0-4a27-92c0-7468bd0125b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"fb29665c-f0b3-4e26-bf78-cb609e14309f","last_modified":1601517444797},{"schema":1601372943635,"derHash":"iwW2jMZZ5e0PyzjyyUL7/SAOby/5+F1jxplO9eCwJwE=","subject":"CN=ISRG Root X2,O=Internet Security Research Group,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy","whitelist":false,"attachment":{"hash":"0a551cc852c7b0f054ae4c9e72acb7a6b4b1a8bab2d598b21063ab92fc36ecb6","size":1577,"filename":"diGVwiVYbubAI3RW4hB9xU8e_CH2GnkuvVFZE8zmgzI=.pem","location":"security-state-staging/intermediates/5715b967-abe0-4b73-a98a-855ba0fd7305.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"diGVwiVYbubAI3RW4hB9xU8e/CH2GnkuvVFZE8zmgzI=","crlite_enrolled":false,"id":"d12a8e04-5884-4328-a3e6-8c87d375a305","last_modified":1601517444786},{"schema":1601372940788,"derHash":"8Z1VzQij6kK9kVCAc4IxdN2SNwITwXf4JTF1badQilE=","subject":"CN=JPRS Domain Validation Authority - G4,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzQ=","whitelist":false,"attachment":{"hash":"d1fbc1604b7b78d8673b6b7247a33b5d142c6ebaa41b8e0412cedc570a24b3d7","size":1780,"filename":"KbEUDafDNIUlOxLiaD-8KAlxp-gea65O57qq4l5SFl8=.pem","location":"security-state-staging/intermediates/7a36f3a9-39e9-4ca5-9620-2343f7db4d81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbEUDafDNIUlOxLiaD+8KAlxp+gea65O57qq4l5SFl8=","crlite_enrolled":true,"id":"e816bed4-10ab-4c75-95fd-28eef887f190","last_modified":1601517444774},{"schema":1601372939433,"derHash":"aeLQbDDzZhZhZekdaNHO5cxHWEqAIn52ZmCGwBByQes=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R2,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIyMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"a9f6d16a93aa62ba7dbf378a10c0719ad51755b8d8276a662013037d6fbe06d3","size":1353,"filename":"iie1VXtL7HzAMF-_PVPR9xzT80kQxdZeJ-zduCB3uj0=.pem","location":"security-state-staging/intermediates/8d7aa4a5-2eaa-4bc6-9ce4-baf356fe12fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iie1VXtL7HzAMF+/PVPR9xzT80kQxdZeJ+zduCB3uj0=","crlite_enrolled":false,"id":"32fad39e-e70b-4cce-82ad-336077b42508","last_modified":1601517444763},{"schema":1601372938080,"derHash":"bINDiPKg0GlJxj788w13eC4lqCUBNZOeVJYCFFQO6kU=","subject":"CN=Root CA - G3,O=Root Networks\\, LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxFTATBgNVBAMMDFJvb3QgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7a25b4650cf78598d30bd2fd71f98a9514917410a9123cf8351a487e3ed9a093","size":1678,"filename":"ujBfMmfTX_3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=.pem","location":"security-state-staging/intermediates/70d0ee09-2bed-4e79-8b66-01b3f0e03488.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ujBfMmfTX/3dCWQV89ZY2Tw4qhFf2vkDZrrqzCdlxfU=","crlite_enrolled":true,"id":"3282e6f4-3c4c-4afc-990c-c8ea66eb46ae","last_modified":1601517444753},{"schema":1601372933832,"derHash":"BN5Hqc3TCRz8Xvaqo7fUtT4TxNTcAjZPbAtAh0LsPHY=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,O=VALID CERTIFICADORA DIGITAL,C=BR","subjectDN":"MGoxCzAJBgNVBAYTAkJSMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxNTAzBgNVBAMTLFZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBBbHBoYVNTTCBDQSAyMDE4","whitelist":false,"attachment":{"hash":"d9ce06bfe7f10679316c826ca701910ff485eff604b066946a2f9397ac536aa7","size":1772,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/05cdb21a-1510-4b11-bd15-1aa8167bf850.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"dc4f0d2e-5aa7-4bc9-aa1e-cc80241c3ea5","last_modified":1601517444742},{"schema":1601372932440,"derHash":"FkjOSrG7ZcSFyyI2x2j6u4ZRR9QmkVuSr7yoHpsu47w=","subject":"CN=e-Szigno Qualified Pseudonymous CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGDMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MTAwLgYDVQQDDCdlLVN6aWdubyBRdWFsaWZpZWQgUHNldWRvbnltb3VzIENBIDIwMTc=","whitelist":false,"attachment":{"hash":"babeb483e7bc13a161427464ff4aa32b126458a9b7bd684609420f8d1a7cb6ab","size":1687,"filename":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=.pem","location":"security-state-staging/intermediates/942e6499-d923-4703-afab-4b554cc059b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Mm86u4WwGKlrCcut3imyBIja3zt37WI7jdpaAucZOs=","crlite_enrolled":false,"id":"70bbc676-eea1-421c-94b2-ac63a2a914ee","last_modified":1601517444730},{"schema":1601372936606,"derHash":"KfjhBN845hK/T1BTZbXQsLIN1OickIMGSE64N0weZtg=","subject":"CN=Trustwave Global ECDSA P-384 Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGcMUUwQwYDVQQDEzxUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMzg0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"53f8122b5a0fa5136d24ba312f1f8c41061bd774427e22f6d2a5e4fababcd5ea","size":1406,"filename":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=.pem","location":"security-state-staging/intermediates/bf40f9cc-47d0-4977-b40d-52494d2164f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzssfumpi3rcJekwfVNUyE16SoxSUQ6SRbv3ubi21iE=","crlite_enrolled":true,"id":"d1f49640-2d22-442e-baeb-12b29866c49b","last_modified":1601517444720},{"schema":1601372929639,"derHash":"RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=","subject":"CN=Bloomberg TLS CA,O=Bloomberg LP,C=US","subjectDN":"MD8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxCbG9vbWJlcmcgTFAxGTAXBgNVBAMTEEJsb29tYmVyZyBUTFMgQ0E=","whitelist":false,"attachment":{"hash":"e48dfa14c978c6bbeb5232c7e711afced2f56d20f367cd0a74a7100aac332138","size":1743,"filename":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A-v0=.pem","location":"security-state-staging/intermediates/45a8ebc6-a06b-4bc7-929b-39e2e2281328.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wR5GLfX8HG7FhvZ7hnbmrGu1dPd6dkKlKYnCvd1A+v0=","crlite_enrolled":false,"id":"cab1b209-9a94-4919-b365-866f22bf712d","last_modified":1601517444697},{"schema":1601372931031,"derHash":"GgdSmos/AdIx360qvfcYmSALtlzX4DxZ+oInJTM1W3Q=","subject":"CN=R4,O=Let's Encrypt,C=US","subjectDN":"MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJSNA==","whitelist":false,"attachment":{"hash":"e7c443b15be49a4083c31378f2a1749ea59e73cd564b4d4e0465ea2d9d839146","size":1825,"filename":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX-WPd5kPLQM=.pem","location":"security-state-staging/intermediates/f67f63b4-6b9e-497c-9e0d-4d48d2fecb43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5VReIRNHJBiRxVSgOTTN6bdJZkpZ0m1hX+WPd5kPLQM=","crlite_enrolled":false,"id":"e3ad0bd5-3dd1-4ea1-82b3-0c0f94f6811c","last_modified":1601517444686},{"schema":1601372928289,"derHash":"+2BghIRAqkWU/oEJdB76tAxWcysmxnw21tyUW7L+E88=","subject":"CN=Plex Devices High Assurance CA3,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ez","whitelist":false,"attachment":{"hash":"cc6eb0f3e51ae41188fd3477d2b097eb3bfd190c1e01766f9836d30c6d379aaa","size":1817,"filename":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu-SVeew9nqo=.pem","location":"security-state-staging/intermediates/13dc02d5-16c2-4ff9-97ca-030b3dff8234.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7vFogPWQjRRrBULu9CTSZG05Zp5wI5psu+SVeew9nqo=","crlite_enrolled":false,"id":"4708e8c7-a3b5-479c-b5d0-134bee4102fa","last_modified":1601517444665},{"schema":1601372921280,"derHash":"hIwDq2R9W9fg0MQ8C11nTMmJP4NquGOvjz8ThLVE2DM=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"caf1e07303de77d2971983851eb6cdc8b1662168dab0ef7c3dc3df46b70b3ec3","size":2300,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/f6e7d27f-9711-4b7b-b226-a67deebbaadd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"c2d2bd34-f2d0-429f-94d4-dec518ff87f0","last_modified":1601517444654},{"schema":1601372925530,"derHash":"1ehNmmd+bNpy3Rwbp62N38Je+sIgyKlXHOwnwQdVVwI=","subject":"CN=ICPEdu,O=Rede Nacional de Ensino e Pesquisa - RNP,C=BR","subjectDN":"MFExCzAJBgNVBAYTAkJSMTEwLwYDVQQKEyhSZWRlIE5hY2lvbmFsIGRlIEVuc2lubyBlIFBlc3F1aXNhIC0gUk5QMQ8wDQYDVQQDEwZJQ1BFZHU=","whitelist":false,"attachment":{"hash":"9b9ef56a8e9ed418407c8f8b194145af30c2c29e7dceb0b41ecc390660a45493","size":1735,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/4d583b92-7ea5-4759-b075-69728740ce72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"b299bf16-90d0-453d-a0e2-c5d0e7350002","last_modified":1601517444643},{"schema":1601372922648,"derHash":"KXW6tR0A2GLQ4W7t74MGp1nGXNS58A2vUOzfy07DluQ=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"913a6555d1accfb6fad27f0850000c3dead37ef7c0c8683ab4771d4154dafae2","size":1329,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/66ae0166-605b-4a81-ab78-0398cec83309.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"89936832-2d17-42a8-a1db-8f59f5e125c4","last_modified":1601517444632},{"schema":1601372919901,"derHash":"E/ezfMH4RCqM4T57RCIhfY6JlXz+qFDDy751y+Vh53Q=","subject":"CN=CertCloud ECC EV TLS CA,O=CertCloud Pte. Ltd.,C=SG","subjectDN":"ME0xCzAJBgNVBAYTAlNHMRwwGgYDVQQKExNDZXJ0Q2xvdWQgUHRlLiBMdGQuMSAwHgYDVQQDExdDZXJ0Q2xvdWQgRUNDIEVWIFRMUyBDQQ==","whitelist":false,"attachment":{"hash":"68a6d4de039d26f711386d924105e95da6fb2c74e019e46d3006b1d43a0281f3","size":1272,"filename":"S9iaDtfedpswiFg99kL_1fGIcuuU0gvf0uBHeNGHlmw=.pem","location":"security-state-staging/intermediates/ef7d0921-b722-44bd-a037-89afdb97564f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S9iaDtfedpswiFg99kL/1fGIcuuU0gvf0uBHeNGHlmw=","crlite_enrolled":false,"id":"1f8cd9e7-71f5-4ee1-a557-c82739d93206","last_modified":1601517444615},{"schema":1601372917114,"derHash":"FRo+WWnGYW62N6hyKxdM/ZU4eqznjVfDvSPwyzAIGGo=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"3f94a2f59b7465d9ec3993abf5497a7454a624492a51b0f1af1453447008be7a","size":1508,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/4514e223-4a1f-49ef-a2c4-d139874f652c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"819dff23-74b0-426a-9138-e6825bedf0d4","last_modified":1601517444601},{"schema":1601372924077,"derHash":"9i41qtNF+yU4Y8/A5lgjrNPn8IRtGbgybXCceRmiLX4=","subject":"CN=Trustwave Global ECDSA P-256 Domain Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGaMUMwQQYDVQQDEzpUcnVzdHdhdmUgR2xvYmFsIEVDRFNBIFAtMjU2IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMSEwHwYDVQQKExhUcnVzdHdhdmUgSG9sZGluZ3MsIEluYy4xEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ce8879da72592af4bbeefb13d2c925ca1eed8e33ca17d960a29ad9ae0835124d","size":1305,"filename":"a-5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=.pem","location":"security-state-staging/intermediates/f37e490a-e2a3-407a-af53-85d666751ad9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+5FBlZcydYwIUikW5fVH6MjJzVRhdPbb586imNLagE=","crlite_enrolled":false,"id":"ee174cb7-2285-43f5-824c-7d7f5e2e30f7","last_modified":1601517444583},{"schema":1601372918495,"derHash":"GGJqO3IREo1WNGnGVFV9E8k2bX/OyLlNtPCqfgWUQEE=","subject":"CN=Trustwave Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGQMTkwNwYDVQQDEzBUcnVzdHdhdmUgR2xvYmFsIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"4e61dd89fb06d5da14f5a4b0f7a2328cd7ab2dea6544a50ea59b3e7d59167e32","size":2515,"filename":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=.pem","location":"security-state-staging/intermediates/77c9874e-b7a6-4206-8e33-ce46978876a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3f1xGezL0zYaRJqAhBzSKsvj3vEMlp9KGBwnV4be38=","crlite_enrolled":true,"id":"ace9be7d-afb4-4716-92de-ec68d8675c16","last_modified":1601517444570},{"schema":1601372915726,"derHash":"qzIDs+ogF9UJcmodgik+/8uMQs61LJrxwO7pa1wCvLo=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"dab72f8a61c3d1392090bfa1d53928ff5e675385a1b03742a601a3457a12342f","size":2653,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/cd6fd8ca-476d-4166-8171-47e097b3fba7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"cdcb7fdb-36d0-4d2b-b326-6537b6c0a255","last_modified":1601517444558},{"schema":1601372912986,"derHash":"6ywqgGxp/JY8TiSlu+og7U47hq55hzC7TupRv53jMyU=","subject":"CN=QuoVadis PKIoverheid Server CA 2020,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MF0xCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEsMCoGA1UEAwwjUXVvVmFkaXMgUEtJb3ZlcmhlaWQgU2VydmVyIENBIDIwMjA=","whitelist":false,"attachment":{"hash":"ccde215eb034050ccfc37f9fd71517cfb10b5c84d583a98f618475edced4e91a","size":2491,"filename":"Uru4DWx-N-Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn-Y=.pem","location":"security-state-staging/intermediates/cc1fdc96-5137-44e1-9e1a-08e1f30a8121.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uru4DWx+N+Ju1LMOBUHr8l1GFqUp0S2IeniNdUJMn+Y=","crlite_enrolled":true,"id":"92bb66a1-3ad5-4bf3-be95-3b89b37ac52a","last_modified":1601517444544},{"schema":1601372908508,"derHash":"J47PIR4lGOndmROvxYPusxJ8gYS8vu2q171k6J6MQxA=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"8e15c43f71096a592c3d5819db25f4547bb4ef4f8232293578abdf314d149392","size":2353,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/58908f21-7e94-469e-8aa3-665248306d7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"d92d6955-6093-4c7a-8e45-d0a418aedd2f","last_modified":1601517444533},{"schema":1601372911404,"derHash":"BMGHHGhgdRU4n6Owz7g9vmpK8F6MgOdFcClp8kBgbjY=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"22b4bbcfbe3f75b06e7578a6a45c84da9c0262d68c36a8114773ff9a455d842b","size":1788,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/0f69bb89-fec3-43e8-baca-4b3ed464ca4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"f9117b3e-e330-435a-a6d7-19d7e7d0173c","last_modified":1601517444511},{"schema":1601372909924,"derHash":"tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=","subject":"CN=GlobalSign Atlas R3 DV TLS CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"f6ba4b244d0f4d8748bdeb3905b09e20d0bb70b28d5fe8f7a5d9f622031a27cd","size":1687,"filename":"xW7Bujpo5E-lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=.pem","location":"security-state-staging/intermediates/2ce89d4c-981f-4db3-a423-8e54ac84e6e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xW7Bujpo5E+lsgAwIN5FP5ndgl7TMJJdKhiprnoOP6k=","crlite_enrolled":false,"id":"c5667f47-199d-42d7-93fc-7add87a67e78","last_modified":1601517444500},{"schema":1601372907081,"derHash":"BeQAXbDDgvO9ZrR3KekBFXdgG/b3sofppSztcQ0lg0Y=","subject":"CN=Microsoft RSA TLS CA 02,O=Microsoft Corporation,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xIDAeBgNVBAMTF01pY3Jvc29mdCBSU0EgVExTIENBIDAy","whitelist":false,"attachment":{"hash":"b31f15756dd2424f4c72909e8e5489c3443c030299ab3270a47adebded78e565","size":1914,"filename":"1wMGTin0PoCN5O41h0-XIHXuzGRwDEa8ehHf7wSdSQE=.pem","location":"security-state-staging/intermediates/2f4de690-8167-44de-9c57-c55ac9aad999.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1wMGTin0PoCN5O41h0+XIHXuzGRwDEa8ehHf7wSdSQE=","crlite_enrolled":true,"id":"d349fd50-98e3-4121-b014-e22fcf4058f0","last_modified":1601517444489},{"schema":1601473892209,"derHash":"DjTMNfZt4MBuHZAeJYCWFULsLi+rF1eDfQnP42VHlmw=","subject":"CN=ISSAuth RSA EV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"b03ac152020dfd148bdbce043b79cdde718f7f398e6c2974784e2d12ea728c21","size":2117,"filename":"JuVSbm2PtOMQrBijLX2uh7DV87h-dofG6_8CWgsoUso=.pem","location":"security-state-staging/intermediates/3c02cc5d-9eb8-44c2-b42c-833613b0c0de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JuVSbm2PtOMQrBijLX2uh7DV87h+dofG6/8CWgsoUso=","crlite_enrolled":false,"id":"9e780ac3-b573-43c8-957f-b2d5a2a57492","last_modified":1601517444478},{"schema":1601473893770,"derHash":"Roc0T0cTq9A9rZGZQoxq1qVhRGKsO9efsPDBpW9KIGU=","subject":"CN=ISSAuth ECC EV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBFViBDQQ==","whitelist":false,"attachment":{"hash":"bb49012e57337e767503078ee15ddaed516c3a49b29affe8504ebd31287ba003","size":1280,"filename":"CtBkdSMYFcbDm93WqDl2w4aG4lRl0t4pSXZrBwxP4NQ=.pem","location":"security-state-staging/intermediates/08f3f015-50b1-42f7-910b-1d194b7c172d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CtBkdSMYFcbDm93WqDl2w4aG4lRl0t4pSXZrBwxP4NQ=","crlite_enrolled":false,"id":"ae201e28-14a4-4ab0-abc8-83d58b676aa1","last_modified":1601517444466},{"schema":1601473896669,"derHash":"k3CbW9sMdo/JaftJZYaCGNbehqaib4E7cm/0aXZgfGQ=","subject":"CN=ISSAuth RSA OV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"4186dcf1884e739095a2e744c4ccd5de721687ea6575da4ea5b3d4c73f07d4a7","size":2085,"filename":"pedwg-t32CS6XTTc_JUBqMnUFDQfsrfFl-YRQXc_Jco=.pem","location":"security-state-staging/intermediates/30359a92-8a61-4c98-9bee-afe2d78656b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pedwg+t32CS6XTTc/JUBqMnUFDQfsrfFl+YRQXc/Jco=","crlite_enrolled":false,"id":"83964573-3e97-41f2-9ce8-bc7f7ce62667","last_modified":1601517444456},{"schema":1601473889131,"derHash":"fOuUWEQnVvQKSFww8rrwAQfB6e6F2wL6APQbpYRDZOU=","subject":"CN=ISSAuth ECC DV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBEViBDQQ==","whitelist":false,"attachment":{"hash":"43ee1efa5f0a207b149a67aaf0323e49197e5c769577b389eb3471c5539f8ad2","size":1248,"filename":"82GvRpB_uAZ2gBlFqbv5pwS1b52FWaLFTHSLLlPtkS4=.pem","location":"security-state-staging/intermediates/104f20f8-b19b-47ab-900b-8d1023c6ef8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"82GvRpB/uAZ2gBlFqbv5pwS1b52FWaLFTHSLLlPtkS4=","crlite_enrolled":false,"id":"5a3ba8e4-7aa8-42fe-b7d7-6a51a2cb824f","last_modified":1601517444445},{"schema":1601473895251,"derHash":"2dgcAVBdsZNxAhDZtCe2Uynv/yVhNfb7L+2+U+WTvwI=","subject":"CN=ISSAuth ECC OV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIEVDQyBPViBDQQ==","whitelist":false,"attachment":{"hash":"7c05b04c5a6bbda8889889dadcc4004f477b9429c2ca7085c924ef4cc7961804","size":1248,"filename":"GE-HA2pOP4xPkalzLKDvBn9-H2GvpzI92tTTxyspNKk=.pem","location":"security-state-staging/intermediates/df193818-a02b-4e4d-866a-66cc8dc89803.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GE+HA2pOP4xPkalzLKDvBn9+H2GvpzI92tTTxyspNKk=","crlite_enrolled":false,"id":"1ce8bbb0-2bde-459d-b3ef-f90049c4f3ae","last_modified":1601517444434},{"schema":1601473890650,"derHash":"YkukJyyJbPvlUSj+vm5NbSSMI6HI2zLReJyBGHL2/Dw=","subject":"CN=ISSAuth RSA DV CA,O=INTEGRITY Security Services LLC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSgwJgYDVQQKEx9JTlRFR1JJVFkgU2VjdXJpdHkgU2VydmljZXMgTExDMRowGAYDVQQDExFJU1NBdXRoIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"c006295568921093e5148e77673f798172fdb1b6b28d3ac7737f3b5b35f7c661","size":2085,"filename":"3EfOHBtoOcqfHn9qHOGL-BkHEhOKUfa0ttPxLO6OaUY=.pem","location":"security-state-staging/intermediates/9a72162b-3c00-4079-9ce1-0b08c6e23202.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3EfOHBtoOcqfHn9qHOGL+BkHEhOKUfa0ttPxLO6OaUY=","crlite_enrolled":false,"id":"db10a85d-fae6-4776-b901-d09000033eca","last_modified":1601517444423},{"schema":1601376757462,"derHash":"13V4SIfNvX6fyyqdWJ02egtiONoer1HcccmbibmSKeA=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"e32b53c148cbc70936170082c6ba25a772ef3d90af11a32176389625e0c0691d","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/9a10b1ed-2339-4fb1-a42a-f9909244eef5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"42958ff2-5fcd-4c14-8815-60ee31623d20","last_modified":1601517444371},{"schema":1601376740640,"derHash":"VMN6joU/0dY3jTeLk5MH7DIaMcwaWonnGAYzvBPxh2I=","subject":"CN=GlobalSign HV RSA DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEhWIFJTQSBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"1c5322edfdbb1b8079d8aca3070adf94e68b553d512f64c518c1a6271a4e3ebf","size":1613,"filename":"5J8n1iJ-aJofFJd3TQfvG3J_UdKG9lFZc5KF98adKQg=.pem","location":"security-state-staging/intermediates/b0d1d6d0-aa0f-4d67-8a2b-7b3a6a157f00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5J8n1iJ+aJofFJd3TQfvG3J/UdKG9lFZc5KF98adKQg=","crlite_enrolled":true,"id":"8fced961-4ed6-4ff4-9402-d3f6ee0f77a3","last_modified":1601517444353},{"schema":1601376745601,"derHash":"lbCdAhIvqK5iNXgPbqZQPnZ6wCGgh0/oMc6AOlDqj9c=","subject":"CN=GeoTrust EV SSL CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"f9cce53a2c02bfdd9b421931d8556b782c6ecd2333ff1759e7a701722351de47","size":1597,"filename":"owrR9U9FWDWtrFF-myoRIu75JwU4sJwzvhCNLZoY37g=.pem","location":"security-state-staging/intermediates/93d3a920-7dd2-4552-a9bb-3e52e0c6d380.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"owrR9U9FWDWtrFF+myoRIu75JwU4sJwzvhCNLZoY37g=","crlite_enrolled":false,"id":"ff691ba0-3a0c-45ac-b608-b75b65279543","last_modified":1601517444335},{"schema":1601376727385,"derHash":"Nmb4BJFA/cCmXoCbKBo747ENr+79drndwnKpPoPKW5k=","subject":"SERIALNUMBER=A82743287,CN=Chambers of Commerce Root - 2008,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=EU","subjectDN":"MIGuMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4","whitelist":false,"attachment":{"hash":"b4b436ef9231a9bbea04b3f960f93e2326676d0ee0cd4474684e42b776ddde11","size":2593,"filename":"ztQ5AqtftXtEIyLcDhcqT7VfcXi4CPlOeApv1sxr2Bg=.pem","location":"security-state-staging/intermediates/fd1a7011-0604-4a45-83c7-ca62f842fb8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ztQ5AqtftXtEIyLcDhcqT7VfcXi4CPlOeApv1sxr2Bg=","crlite_enrolled":false,"id":"0e5f4be2-73c5-4bf6-b6a2-45f1f07226d8","last_modified":1601517444317},{"schema":1601376755442,"derHash":"axQ8IAXVU5zCLqtfdy2yqf6HRn/v+gf88Kn30oJ0yno=","subject":"CN=Entrust Root Certification Authority - G2,OU=See www.entrust.net/legal-terms+OU=(c) 2009 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQDEylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMg==","whitelist":false,"attachment":{"hash":"d1674b1f7b1aef60543ae1256c7298ed99b5016d5a49c8ba8b9745c679003a0f","size":1792,"filename":"du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at_U=.pem","location":"security-state-staging/intermediates/90532b3e-aeb1-42ae-b53d-9b0794e82506.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at/U=","crlite_enrolled":false,"id":"512e1df0-26cc-48dd-9524-3c1d7aaf422b","last_modified":1601517444299},{"schema":1601376750957,"derHash":"Vsuw/8QU6IgipQ6fQtRoIDgdjCqu71bgVmgX7TDyeic=","subject":"CN=DKHS Device CA - G2,OU=GeoRoot Certification Authority,O=NTT DOCOMO\\, INC.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBOVFQgRE9DT01PLCBJTkMuMSgwJgYDVQQLEx9HZW9Sb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRwwGgYDVQQDExNES0hTIERldmljZSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"bde21987c9e3d549164d3f8bd906c3e0e7143f88e251c6d038487800c1df337d","size":1609,"filename":"XAKgtY9g-AuhN_1uwTUpgRjOYN5vJWan9jzWCnhebjw=.pem","location":"security-state-staging/intermediates/fc44b1b1-a48b-417b-911e-ce6d05512da2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XAKgtY9g+AuhN/1uwTUpgRjOYN5vJWan9jzWCnhebjw=","crlite_enrolled":false,"id":"23862319-a4da-4783-ae80-57929b6958f5","last_modified":1601517444281},{"schema":1601376775699,"derHash":"aGkkLNitKsd7wCiUe8fQxPbpy/CJnWVwmBDYn5S11w0=","subject":"CN=GDCA TrustAUTH R4 EV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IEVWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"2e1f89d236b55a9e53ce42bf4e6c979ac2d4e9d9e836793810d01c10dc91ff0f","size":1727,"filename":"GlfrRgw9jW9VNC7Y1aXDsTsHh6dUPAEud8fhzOO-EdY=.pem","location":"security-state-staging/intermediates/76ca0f35-dc5e-4a6b-a715-cae8b21ba328.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GlfrRgw9jW9VNC7Y1aXDsTsHh6dUPAEud8fhzOO+EdY=","crlite_enrolled":false,"id":"15d2f4f5-d5d0-4fc9-8825-8c5fcf5cbe4f","last_modified":1601517444263},{"schema":1601376779796,"derHash":"qDhAXrsD9d/Y1KlXKubg4/NW7E7BNDdaWdt7GV3D7EQ=","subject":"CN=GeoTrust TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBFQ0MgQ0EgRzE=","whitelist":false,"attachment":{"hash":"c0c946701c933eed603c99ac71fe696329ac344e1eb857450da9a3c6fc6b28e7","size":1146,"filename":"5UDBgr_RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=.pem","location":"security-state-staging/intermediates/8ff205f5-9e76-40e9-807e-5a7aa972ec40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5UDBgr/RVcJyUuNCNmS5AenhQ6TpdPBpf6CAGjUnD10=","crlite_enrolled":true,"id":"ff1f04eb-42ca-4339-9a6e-842a41a4be3c","last_modified":1601517444245},{"schema":1601376753403,"derHash":"V94Fg+/Ssm4DYdqZ2p30ZI3vfuhEHDtyivqbzeD5smo=","subject":"CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES","subjectDN":"MFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjg=","whitelist":false,"attachment":{"hash":"6d84cf680e962beda938e61164d5227272b5f42dc698ba20d2daf9fa5b01e5a4","size":2166,"filename":"Ow1ztL5KhUrcPlHX75-kiu-7LN2CTWe9x9fQmiq8LUM=.pem","location":"security-state-staging/intermediates/db0d57a0-e293-40b4-ac35-c505d0b77f4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ow1ztL5KhUrcPlHX75+kiu+7LN2CTWe9x9fQmiq8LUM=","crlite_enrolled":false,"id":"19461103-183f-4856-b2fe-be344c1f63e1","last_modified":1601517444223},{"schema":1601376741054,"derHash":"U6XjKsxXFO0gx3eMZV0e6X7AcVYHTIsBbiz8c+nScSs=","subject":"CN=DigiCert Global Root G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcz","whitelist":false,"attachment":{"hash":"b4887e6003a7f6553d3ac6da8c1ec7ddeec67cdeb9a3a2629953e71f2f779353","size":1297,"filename":"uUwZgwDOxcBXrQcntwu-kYFpkiVkOaezL0WYEZ3anJc=.pem","location":"security-state-staging/intermediates/a66116e2-f28d-4977-b407-ee74b5f52aac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uUwZgwDOxcBXrQcntwu+kYFpkiVkOaezL0WYEZ3anJc=","crlite_enrolled":false,"id":"8e9e5e57-79b3-4dd5-b6dc-59b075cc06ed","last_modified":1601517444204},{"schema":1601376777334,"derHash":"giK8T+ej3cqe8L8NaCrIiHmfh4ItFTMqVMC/38aFT3s=","subject":"CN=Staat der Nederlanden Organisatie Persoon CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOjA4BgNVBAMMMVN0YWF0IGRlciBOZWRlcmxhbmRlbiBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"0e3b37043e3f3aa596ff489e47e328fc72d538d552cc6714e820266d3bd25eb9","size":2239,"filename":"A8tEuTPX4UVR5S3b_DNaTVe_ZacDZntXrJYd4x46EG0=.pem","location":"security-state-staging/intermediates/416db4aa-c73c-4a15-9a7f-92977f67e9ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A8tEuTPX4UVR5S3b/DNaTVe/ZacDZntXrJYd4x46EG0=","crlite_enrolled":false,"id":"1222b1e8-48ad-44cf-9106-0db07c445fdd","last_modified":1601517444171},{"schema":1601376761177,"derHash":"Ukz3MxxO41PusezXTh+AGg8fCN+gMiCS9CIFr8OhdnU=","subject":"CN=DigiCert SHA-2 RADIUS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFNIQS0yIFJBRElVUyBDQQ==","whitelist":false,"attachment":{"hash":"27066a171b414ad64061c4d31e5004cbce8f4d7555ba47fca659f81f97acaaf9","size":1674,"filename":"yZwj8Xi_M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845-xQ=.pem","location":"security-state-staging/intermediates/0356953d-ca56-4ed4-b79b-6447b2d907ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yZwj8Xi/M8HwwIrk8zUJt2lZ5wy1IcLCTmo7r845+xQ=","crlite_enrolled":false,"id":"2b7210c5-6bef-4469-b9b2-3cf4a91afb14","last_modified":1601517444153},{"schema":1601376733088,"derHash":"ZHFyUK+LAo3Y5cC65MkULIsQNTJhK8SHCF/Twxn5wGc=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"73789188b1ff6dcd70442594b8ff119cb7b30d858c0e7f072cf8a014cd8f296a","size":2649,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/3785b85c-da3b-4b7b-bd12-2796cce60c04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"ee033ab1-7bfc-4f08-b26a-b3b2bce86767","last_modified":1601517444135},{"schema":1601376743119,"derHash":"P94NNuAmtujr4sKIg2B8hlHeEL1sH8rTZeVg9OovOwM=","subject":"CN=Entrust Root Certification Authority - EC1,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG/MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTMwMQYDVQQDEypFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBFQzE=","whitelist":false,"attachment":{"hash":"fa84991015956f299a21164f4a77c8da26802bb7bac4207eb696cc086ce715b0","size":1577,"filename":"_qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=.pem","location":"security-state-staging/intermediates/2827fb47-01de-4cf9-88b5-faa3f7464bf6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=","crlite_enrolled":false,"id":"10eb04ab-95e7-45a1-94b3-40bc33bad469","last_modified":1601517444117},{"schema":1601376774088,"derHash":"BTHIb3hZWJOf3FOZJNOV0e+kCTZOaCfTq5h2MR/7J7A=","subject":"CN=QuoVadis Enterprise Trust CA 1 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDEgRzM=","whitelist":false,"attachment":{"hash":"0838a224858164040768ee9fb8bab6de6efb11294b58f2c5db9fea5788b39bc7","size":2333,"filename":"8ZpHrAG1eQIQZnOeYn-p9E7tqq_yc1fiaSaeKR1BY2I=.pem","location":"security-state-staging/intermediates/360e077f-09bb-4788-bbfe-80bd616b8011.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8ZpHrAG1eQIQZnOeYn+p9E7tqq/yc1fiaSaeKR1BY2I=","crlite_enrolled":false,"id":"2a1565c1-b11e-4fb4-a545-99acd43e82cf","last_modified":1601517444099},{"schema":1601376769580,"derHash":"rY6zLJ2pHdyFXzgnRZkBR9xvI9n7sE/J1Hax7iD8cdg=","subject":"CN=DigiCert Trusted Root G4,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IFRydXN0ZWQgUm9vdCBHNA==","whitelist":false,"attachment":{"hash":"12cc0d0e07a0ce9a1fae8bc81a3c9918619e6044dedda6d70c56fec58c5aa0d5","size":2024,"filename":"Wd8xe_qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=.pem","location":"security-state-staging/intermediates/40ac2caf-9799-41cc-9949-62fe94bd7c8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wd8xe/qfTwq3ylFNd3IpaqLHZbh2ZNCLluVzmeNkcpw=","crlite_enrolled":false,"id":"9702b5ab-ac3b-478f-8641-763a8b97d8df","last_modified":1601517444080},{"schema":1601376751370,"derHash":"rev4P9PT+VRrt3+qtRbdkzfM+R4RmPdDN3aexo5ugm4=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMjU2IGJpdCBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"221a0273827a23e87c0dd7ce8626aa6c220b418e5234c22b3d0208d1d9f6dc1a","size":1394,"filename":"kNDz7bhhiRNqEf2UFG3eoPwdtsGjjYfGnZgWRkA10BI=.pem","location":"security-state-staging/intermediates/35791f89-9b45-419d-8e77-406b12700572.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kNDz7bhhiRNqEf2UFG3eoPwdtsGjjYfGnZgWRkA10BI=","crlite_enrolled":false,"id":"b0560908-0ea5-4fca-99b1-ce23985cb524","last_modified":1601517444062},{"schema":1601376774489,"derHash":"to1dm06mNZV8DDIVwg01siF7aeNJx6MExPl/IMQIH4g=","subject":"SERIALNUMBER=A82743287,CN=AC Camerfirma - 2009,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIGqMQswCQYDVQQGEwJFUzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcTQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEdMBsGA1UEAxMUQUMgQ2FtZXJmaXJtYSAtIDIwMDk=","whitelist":false,"attachment":{"hash":"197ccbfd7ec7b28f0f75167600f50b767843f9737a9e63f410e93c076cda6c09","size":2918,"filename":"wAh6UmDWkgJZX-MvtntK3hAjxzxC6tPEmrdc3IqHZl8=.pem","location":"security-state-staging/intermediates/3341ba59-f7ad-4982-bb52-733b1fd5490b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wAh6UmDWkgJZX+MvtntK3hAjxzxC6tPEmrdc3IqHZl8=","crlite_enrolled":false,"id":"48847bb5-0281-45c3-b2d3-e7f76ca2cb3b","last_modified":1601517444043},{"schema":1601376755836,"derHash":"joxuv3fcc9s+OOk/SAPmK2tZM761HuQVL2jXqhRCazE=","subject":"CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"3d68f4af65db5b779ba073b81f3674d2dd3df3323be8808d825116f4a0a129c3","size":1557,"filename":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq_Juw=.pem","location":"security-state-staging/intermediates/ad34e608-081b-4ce8-83f8-80bf15e28c0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq/Juw=","crlite_enrolled":false,"id":"35957622-8171-40c9-b5c6-f6630c77d128","last_modified":1601517444025},{"schema":1601376772500,"derHash":"l55f990lhUXx0dc3+UCPOlWud8j8bmHcR0JQ0sl5sFE=","subject":"OU=ePKI Root Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"001850d9f7cb0ad915c278964fe8db058918ef083cfdd108f313803de6710705","size":2560,"filename":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=.pem","location":"security-state-staging/intermediates/eba466f4-bb7c-4798-9986-b6b5eca4a446.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=","crlite_enrolled":false,"id":"478b2025-c6ad-416f-9ef4-0e96131f47a6","last_modified":1601517444008},{"schema":1601376742712,"derHash":"YO9BLqvnw/xjme7RtjO3d3R1FbKdchuWPdJYvEmKspI=","subject":"CN=SSL.com EV Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTQwMgYDVQQDDCtTU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRUND","whitelist":false,"attachment":{"hash":"ab3dfad3dda55fb2c174fabf92fc81f2757e57a915b1f78f5483d12dfaf50f76","size":1821,"filename":"NIdnza073SiyuN1TUa7DDGjOxc1p0nbfOCfbxPWAZGQ=.pem","location":"security-state-staging/intermediates/734df71e-5087-4844-aa75-47d2809181f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIdnza073SiyuN1TUa7DDGjOxc1p0nbfOCfbxPWAZGQ=","crlite_enrolled":false,"id":"b512360d-9f2f-4206-97ac-09aa8d521233","last_modified":1601517443989},{"schema":1601376752989,"derHash":"dp9v8Jp0Yqwnpugt53ABPTwCEzr92+WBrvzKGwoCkYA=","subject":"CN=TrustSign BR Certification Authority (EV) 2,OU=Controlled by COMODO for TrustSign Certificadora Digital,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIIBCDELMAkGA1UEBhMCQlIxEzARBgNVBAgMClPDo28gUGF1bG8xHjAcBgNVBAcMFVPDo28gSm9zw6kgZG9zIENhbXBvczFLMEkGA1UECgxCVHJ1c3RTaWduIENlcnRpZmljYWRvcmEgRGlnLiAmIFNvbHXDp8O1ZXMgU2VndXJhbsOnYSBkYSBJbmYuIEx0ZGEuMUEwPwYDVQQLEzhDb250cm9sbGVkIGJ5IENPTU9ETyBmb3IgVHJ1c3RTaWduIENlcnRpZmljYWRvcmEgRGlnaXRhbDE0MDIGA1UEAxMrVHJ1c3RTaWduIEJSIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IChFVikgMg==","whitelist":false,"attachment":{"hash":"ba4c3dbca2d5728e872bf00f09797aeef4e3eca1f8283c82bfa080bb528a8dc9","size":2373,"filename":"iKWK-FGvQxVzCQKwKOQ7Rd18KzTZXBBwxTbfJaG1qN0=.pem","location":"security-state-staging/intermediates/a1e03bb9-2c35-49c6-bd32-f0994e053167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iKWK+FGvQxVzCQKwKOQ7Rd18KzTZXBBwxTbfJaG1qN0=","crlite_enrolled":false,"id":"e0f723e6-76d1-4bee-9c67-8136e524719e","last_modified":1601517443971},{"schema":1601376730664,"derHash":"8oqXrCjP7RCpOn8Hj5eMj2IEydhFH3RdX+u9bgttTXw=","subject":"CN=Hellenic Academic and Research Institutions RootCA 2015,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGmMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxNQ==","whitelist":false,"attachment":{"hash":"599c4d3414fd09b7ab7a1692a79ac80f5e452adbeed9d0aecc7a05228a1b427e","size":2292,"filename":"UMyGupbbMmPHmkPq0HVT2fVmWeaQfnLYwCZjehzchdw=.pem","location":"security-state-staging/intermediates/9269078b-f3eb-4f59-b548-f9978d1786cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UMyGupbbMmPHmkPq0HVT2fVmWeaQfnLYwCZjehzchdw=","crlite_enrolled":false,"id":"f360da31-27aa-400f-8a47-3d517bae9327","last_modified":1601517443953},{"schema":1601376744781,"derHash":"asZkCS2bsVahECbk/nNNM3jIDe1FGYawul7KEcbfirs=","subject":"CN=KDDI Web Communications Certification Authority 2,O=KDDI Web Communications Inc.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBJbmMuMTowOAYDVQQDEzFLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAy","whitelist":false,"attachment":{"hash":"30e363da73774add76e38c29a61875ab860a411951b9f29e3ad90d7e3fbfe77f","size":1658,"filename":"aUNVAMKFhtzaVShUUcBbp8xP_plnuqaBn80TpHKVfNs=.pem","location":"security-state-staging/intermediates/1e7b2323-695f-4952-ad56-19f517a7246b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aUNVAMKFhtzaVShUUcBbp8xP/plnuqaBn80TpHKVfNs=","crlite_enrolled":false,"id":"d7768dd2-6b98-4ad2-886e-cac6d553ec16","last_modified":1601517443936},{"schema":1601376782713,"derHash":"H5sx+CCSnr+gMRfsK3e6aw+27MngJ2gqVZN42jEcVO8=","subject":"CN=Symantec Class 3 Extended Validation SHA256 SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxOzA5BgNVBAMTMlN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"73b3e2e12b6d805388d7894c35f9c43b08121eeddc974879d17a8b755870c43b","size":1894,"filename":"fb0Tfqir1HP3KpDb-G45zaPKd4IMWkZQgeiSsLeH8tk=.pem","location":"security-state-staging/intermediates/f1503402-4fce-4d76-96a3-ab24eed07569.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fb0Tfqir1HP3KpDb+G45zaPKd4IMWkZQgeiSsLeH8tk=","crlite_enrolled":false,"id":"27f99fc8-8d5d-4c73-ad31-4ef517e5ef06","last_modified":1601517443918},{"schema":1601376747224,"derHash":"uQ7q6THl4rfTNfFJ2mwiEJhgANIU/9tipy9zMtY3Ma8=","subject":"CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBWZXJpem9uIEJ1c2luZXNzMREwDwYDVQQLEwhPbW5pUm9vdDEfMB0GA1UEAxMWVmVyaXpvbiBHbG9iYWwgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"b2ff06177ee90557f82e4d2b65f87cbe3e37ef185fd9f5b2f7d8c654bf7eefbc","size":1760,"filename":"v-gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=.pem","location":"security-state-staging/intermediates/96d8b2a4-5c83-408a-aba1-f8c0818c74a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v+gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=","crlite_enrolled":false,"id":"90eff404-0514-42a4-b6bc-375d060840d8","last_modified":1601517443892},{"schema":1601376720802,"derHash":"2VgdvembOe7/bOXIDeFlDaDByKEJcF7ShsU7yV5mVeQ=","subject":"CN=Staat der Nederlanden Organisatie Services CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOzA5BgNVBAMMMlN0YWF0IGRlciBOZWRlcmxhbmRlbiBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"7e2d605d386b1377355070db06e788e514e057431cc7ff2c0772d4f9b8ff0e62","size":2324,"filename":"WoBMz_bIYMctSPZ5Zhje__eik13TeByHSK4zXYYEsAQ=.pem","location":"security-state-staging/intermediates/baa75ba7-d136-47a9-96af-8da37255a077.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoBMz/bIYMctSPZ5Zhje//eik13TeByHSK4zXYYEsAQ=","crlite_enrolled":false,"id":"ea6ff4e8-dc0c-4bf1-8751-7f9a6053af57","last_modified":1601517443861},{"schema":1601376719498,"derHash":"rPcY34OOZABRd30ZR/UWIOjYBLoYZVOuUvyYEbXTS4s=","subject":"CN=SSL.com Root Certification Authority RSA,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTEwLwYDVQQDDChTU0wuY29tIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNB","whitelist":false,"attachment":{"hash":"0be6061408140698708a3d3cb24d39ad6416effde544c39b9e52f40a1b6fe9cf","size":2085,"filename":"0cRTd-vc1hjNFlHcLgLCHXUeWqn80bNDH_bs9qMTSPo=.pem","location":"security-state-staging/intermediates/a9cbcbd0-800f-442e-8f52-903325a5ee23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0cRTd+vc1hjNFlHcLgLCHXUeWqn80bNDH/bs9qMTSPo=","crlite_enrolled":false,"id":"60def2d8-d623-4952-91b9-30913d09f7b4","last_modified":1601517443836},{"schema":1601376719951,"derHash":"RiJre4ngLKj12F1n7Yy0sZxIOCBYuxYkIZnVQMq+kmg=","subject":"CN=TeliaSonera Gateway CA v2,O=TeliaSonera,C=FI","subjectDN":"MEcxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgR2F0ZXdheSBDQSB2Mg==","whitelist":false,"attachment":{"hash":"a217b78c13516b7cdc64085ded0920414e8b497f59bb8ad9e4ba1202473f3e28","size":2532,"filename":"jaaJsNV10gkW5ui1mprnOhj0AU9JlvfHwfeE-4pG7Lg=.pem","location":"security-state-staging/intermediates/e2f9758e-b3b7-476a-a010-68d270baddb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jaaJsNV10gkW5ui1mprnOhj0AU9JlvfHwfeE+4pG7Lg=","crlite_enrolled":false,"id":"94fd3ab1-6743-43b7-b04b-f3ce9336a99b","last_modified":1601517443809},{"schema":1601376760342,"derHash":"RcKL5DQvByzWIZaYw+8qxtunPxngTazyBE0vaZPjQrQ=","subject":"CN=eMudhra RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for eMudhra Technologies Ltd.,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIHhMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxSDBGBgNVBAsTP0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgZU11ZGhyYSBUZWNobm9sb2dpZXMgTHRkLjE5MDcGA1UEAxMwZU11ZGhyYSBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"68e999dcfb6f85564fab0d02baa239b313d7e2dc8f5a4ecb6346e4afc6201b43","size":2316,"filename":"xIsOtN5uZ5ZZQRiHSu6NrXg36kenjPgaYZeoj9lRsXk=.pem","location":"security-state-staging/intermediates/e30be843-e47e-40e4-8d03-35c62a341392.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xIsOtN5uZ5ZZQRiHSu6NrXg36kenjPgaYZeoj9lRsXk=","crlite_enrolled":true,"id":"29d99702-edc8-413c-b8ca-77c56ea0181f","last_modified":1601517443782},{"schema":1601376721235,"derHash":"1Gkx4Bgt1lXqDBbm3Zn45hr/5AH3NMbKjqAFapaOr4E=","subject":"CN=DigiCert Baltimore EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEJhbHRpbW9yZSBFViBDQQ==","whitelist":false,"attachment":{"hash":"71b566b9248c134842c94e190eb959e767923e037257d37b3e855d67a010ab2d","size":1577,"filename":"VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=.pem","location":"security-state-staging/intermediates/fb866139-1efa-47a1-b0a2-afca62bb7d30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VOipUY1UDQFkU3SLv8yqRqnSAXgf2u64AGItxQco2LY=","crlite_enrolled":true,"id":"3395f234-9055-4caa-a4d5-11b4a7f375a3","last_modified":1601517443761},{"schema":1601376769979,"derHash":"EoGtj6vog/IJ6WNkSNGoDDc9qnaGyBOicPrUj19eWJo=","subject":"CN=Telia Server CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MEYxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEbMBkGA1UEAwwSVGVsaWEgU2VydmVyIENBIHYz","whitelist":false,"attachment":{"hash":"c49599398958207a50863ebc4e7e508a20b8551b440ae2d3d28ab90e317f5c12","size":2341,"filename":"TCgTLigAKZ2ouWM1T2dh92G9wUDP8Wlma6sqwmm3aVc=.pem","location":"security-state-staging/intermediates/bdcf129f-b3fa-4ce1-8a67-6da86c05d54f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TCgTLigAKZ2ouWM1T2dh92G9wUDP8Wlma6sqwmm3aVc=","crlite_enrolled":true,"id":"681d294f-17d7-400e-a4ca-507ee1d90a50","last_modified":1601517443744},{"schema":1601376746412,"derHash":"RksOwKYC8Bk9tfM5EYhaOmGSGtFtJmTiW++rEM+m7SU=","subject":"OU=Public Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MFsxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEnMCUGA1UECwweUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"49845caec147a9f80e7f49b5e4b2b8629653bccf72d7aa8dfa0b7029f5d75514","size":1934,"filename":"qMjf0br8Ay71_wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=.pem","location":"security-state-staging/intermediates/cabaf189-98ae-41ee-8da3-966fb99dbea2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qMjf0br8Ay71/wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=","crlite_enrolled":false,"id":"201bbcbe-98a9-4e1d-9ba8-1d91ccaef4d5","last_modified":1601517443722},{"schema":1601376782315,"derHash":"p+gwVumz2d2xgWuVUY9qXlod/foo9gUzschQhV6qQmM=","subject":"CN=Telia Domain Validation CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFExCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEmMCQGA1UEAwwdVGVsaWEgRG9tYWluIFZhbGlkYXRpb24gQ0EgdjM=","whitelist":false,"attachment":{"hash":"0f8c227df79307dbeec994ba6d8bd832268f9d2b0c636499e29d589ed747a88c","size":2353,"filename":"RU2jIfMztj4AADghygjY9gbxUkW13LXRSS7JeONgrxc=.pem","location":"security-state-staging/intermediates/f38aa272-1880-4c2f-b745-6c01a69b0614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RU2jIfMztj4AADghygjY9gbxUkW13LXRSS7JeONgrxc=","crlite_enrolled":true,"id":"b07c6446-0c44-4a00-bb56-ca8b2b55a54e","last_modified":1601517443698},{"schema":1601376730262,"derHash":"MBx2dQJ2GpCYk29sqnNsQ2QHQeDdmiaY9DoAHZfBZ/k=","subject":"CN=Fuji Xerox Certification Authority 2,O=Fuji Xerox,C=JP","subjectDN":"MFExCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MS0wKwYDVQQDEyRGdWppIFhlcm94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDI=","whitelist":false,"attachment":{"hash":"b2e83a0583235d0e89d877d8abbd4ddc71a9825998e2cd9c7aa40500a9f10667","size":1500,"filename":"jEakGI1jOC9M7t1p7b_cp7OOuFt2ovRpogRWrRVxQt8=.pem","location":"security-state-staging/intermediates/7ae7dfdd-6a6d-492e-9eba-8b861f68976a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jEakGI1jOC9M7t1p7b/cp7OOuFt2ovRpogRWrRVxQt8=","crlite_enrolled":false,"id":"c9552f3d-50c5-424d-aa0b-ddb2a0a0f796","last_modified":1601517443675},{"schema":1601376759931,"derHash":"pYmOW/uEKVwEPsQDQoivs34NWjhm8Xy2V7l/cty1O+w=","subject":"CN=EC-ACC,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verarrel (c)03+OU=Jerarquia Entitats de Certificacio Catalanes,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHzMQswCQYDVQQGEwJFUzE7MDkGA1UECgwyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsMH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsMLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLDCxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAwwGRUMtQUND","whitelist":false,"attachment":{"hash":"c91d4443f3c8f83a280186a047029b6b4b7ce659addce7f07caf597e11a9dc65","size":1902,"filename":"sh0qdDMYcSuhbzmRnZYaS6-6O8qaQ6dbH8_iLF1wyro=.pem","location":"security-state-staging/intermediates/dad2be5f-3b40-4362-a644-e7ed3ec0debd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sh0qdDMYcSuhbzmRnZYaS6+6O8qaQ6dbH8/iLF1wyro=","crlite_enrolled":false,"id":"96d98717-9a96-4d73-b156-2eb909eb5054","last_modified":1601517443658},{"schema":1601376776932,"derHash":"BrlyKmmcV9/xhp9DC0ebtutJquEYTqycUyXBM0o06kw=","subject":"CN=SSL.com Root Certification Authority ECC,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTEwLwYDVQQDDChTU0wuY29tIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRUND","whitelist":false,"attachment":{"hash":"3575f65e014fd8fa943566de2f3d7a42adc6b4e947cc86fb2028d533adc24ad9","size":1804,"filename":"oyD01TTXvpfBro3QSZc1vIlcMjrdLTiL_M9mLCPX-Zo=.pem","location":"security-state-staging/intermediates/34d6fd53-d5dd-4289-aa37-161e72f0a7e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oyD01TTXvpfBro3QSZc1vIlcMjrdLTiL/M9mLCPX+Zo=","crlite_enrolled":false,"id":"3ecf65b2-97c8-4b50-a416-2032e8bdbdf7","last_modified":1601517443636},{"schema":1601376768352,"derHash":"LU+tNFWrYTl0Aau7UYki+EM2tn4C/I0tsoOCXEq5gbs=","subject":"CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcy","whitelist":false,"attachment":{"hash":"0558647c4eeecfb355382c6706854b426612a1444f25dc3adfb7d56079fcf28d","size":1748,"filename":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl_s2uC_CY=.pem","location":"security-state-staging/intermediates/0b9f9a42-27c0-4853-935f-4345030e4d62.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl/s2uC/CY=","crlite_enrolled":false,"id":"06d0c87d-d5a6-47ab-ad28-8767585b4426","last_modified":1601517443609},{"schema":1601376743527,"derHash":"J1JOMrshd8u/CnFveKcSQnFPyS8KRHEw2RZmxxangQc=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"0dad756b753d0f88b83d8bc46c6d0a9066434d03ab6d72e1a0e9c0473e83eedd","size":1764,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/005152cc-aa3c-4406-b480-f4d2f2aef4e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":false,"id":"d07ede68-44a2-4cf4-beb9-f363bd8d953e","last_modified":1601517443590},{"schema":1601376738088,"derHash":"umub+7+WmK+R60xpNGZBQYGgACrVKP8VSUbVhqpdlEU=","subject":"CN=GoGetSSL ECC EV CA,OU=Controlled by COMODO CA exclusively for GoGetSSL,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MIGHMQswCQYDVQQGEwJMVjENMAsGA1UEBxMEUmlnYTERMA8GA1UEChMIR29HZXRTU0wxOTA3BgNVBAsTMENvbnRyb2xsZWQgYnkgQ09NT0RPIENBIGV4Y2x1c2l2ZWx5IGZvciBHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"9bbb40268769a0fb2d93f4ba28e208765ce02172266fd724354d40fe752d0187","size":1362,"filename":"og9uiCTdRwcFKbx11dQHwWx4x4btYdfYz4pKq5LpcoY=.pem","location":"security-state-staging/intermediates/13744076-d7ed-4f2f-b95b-985bbf7257dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"og9uiCTdRwcFKbx11dQHwWx4x4btYdfYz4pKq5LpcoY=","crlite_enrolled":false,"id":"073a888e-1813-4d8e-ba5d-23e7a79798b1","last_modified":1601517443573},{"schema":1601376734311,"derHash":"8Bwayjkogq8VLp8B7MzQr93YqjW/iVsAMZix6MdS3bg=","subject":"SERIALNUMBER=A82743287,CN=Global Chambersign Root - 2008,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=EU","subjectDN":"MIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwOA==","whitelist":false,"attachment":{"hash":"94f96c02a67a0946b9d781981a2662422e1f728a9316476f6561cd899b6e528d","size":2584,"filename":"knobhWIoBXbQSMUDIa2kPYcD0tlSGhjCi4xGzGquTv0=.pem","location":"security-state-staging/intermediates/0cbd049c-06d3-49b2-aae6-c0bcd5fa210c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"knobhWIoBXbQSMUDIa2kPYcD0tlSGhjCi4xGzGquTv0=","crlite_enrolled":false,"id":"81e99069-a8ad-46a8-b96f-c0e2cc7a5494","last_modified":1601517443555},{"schema":1601376768762,"derHash":"bay7iUUTex2tQhGwQ2774G8SrONpBJc7Ra4ldAgj02k=","subject":"CN=DigiCert Global Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENB","whitelist":false,"attachment":{"hash":"1a8c56af27223d777da24bba93b743c15e633c42f9ab430fc69c48fe2ac69bbb","size":1577,"filename":"r_mIkG3eEpVdm-u_ko_cwxzOMo1bk4TyHIlByibiA5E=.pem","location":"security-state-staging/intermediates/038b81ab-4eff-4d41-90a4-8f4f86b72f6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=","crlite_enrolled":false,"id":"39be0c8a-1350-49d8-95ce-b5095d2d226d","last_modified":1601517443537},{"schema":1601376736414,"derHash":"6VY1gecSspDyOnSTRlNesNmB49SjnVbWBGhM0LFpjIk=","subject":"CN=TeliaSonera Root CA v1,O=TeliaSonera","subjectDN":"MDcxFDASBgNVBAoMC1RlbGlhU29uZXJhMR8wHQYDVQQDDBZUZWxpYVNvbmVyYSBSb290IENBIHYx","whitelist":false,"attachment":{"hash":"dff294c7a5bf61855f4bf4688f93273254185339ca8c7fa141f0597c90fb4a8d","size":1963,"filename":"ELo0hcqLtogKuVMaQGPkABVVVhx_LgVRZfSbLXT8X2s=.pem","location":"security-state-staging/intermediates/a4200fb3-9012-4d6e-8f39-3a0ac6b62bf3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ELo0hcqLtogKuVMaQGPkABVVVhx/LgVRZfSbLXT8X2s=","crlite_enrolled":false,"id":"a5d1352e-4a82-433c-870e-ad8c58fc9bbb","last_modified":1601517443520},{"schema":1601376749293,"derHash":"2lRiUmoMLphSqGGGsCU5AVh1nNymriHwn3E8pqzN0fE=","subject":"CN=QuoVadis Enterprise Trust CA 3 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDMgRzM=","whitelist":false,"attachment":{"hash":"0b01ec78286d184607dd09e4cac9c4992d4af9f58534eb2cb8fea437481a6197","size":2333,"filename":"smsafMf1m1b-3NN_jssl3RMKHXok-GELWWNtG9vZEmA=.pem","location":"security-state-staging/intermediates/e3b263a6-dc7b-4bda-8acb-d8c10b677b2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"smsafMf1m1b+3NN/jssl3RMKHXok+GELWWNtG9vZEmA=","crlite_enrolled":false,"id":"b1c31974-0f71-4207-8532-82f8138e8ca8","last_modified":1601517443502},{"schema":1601376748042,"derHash":"wl8elgALw24qpc1UvyT0i3aJChYuGtjhBJkmUFEGJsI=","subject":"CN=TrustAsia DV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"8818c8f5c68801123839b3cc239cbd89d6750c3eebd094b7e193b8d4c008359f","size":1691,"filename":"kZD1rAhydUcYx_iHiwQ-xsh92idc5Cryvs4-2MeQnpk=.pem","location":"security-state-staging/intermediates/30df4c61-9f07-4a43-9956-25742af9cddb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kZD1rAhydUcYx/iHiwQ+xsh92idc5Cryvs4+2MeQnpk=","crlite_enrolled":false,"id":"2e43a311-dc6c-4644-b4fd-dabaca2c1929","last_modified":1601517443484},{"schema":1601376725349,"derHash":"KGibMOTDBqq1OwJ7KeNq1t0dz0uVOZRILKhL3B7KyZY=","subject":"CN=Starfield Services Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGYMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZpZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"f86af69b434af8ea5af1e027d56a7a38f6f22b387403ecb5009164accf5a6e79","size":1605,"filename":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6-oP5I=.pem","location":"security-state-staging/intermediates/901b5264-4d8d-44b2-9d34-a3510247f9db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6+oP5I=","crlite_enrolled":false,"id":"c0aa9228-9471-4d9a-a0df-1f91fd16b767","last_modified":1601517443467},{"schema":1601376729443,"derHash":"HparstZQK13OUY7AC1oeVDNJ79Lj9ovpq8ESiyVv7dc=","subject":"CN=GDCA TrustAUTH R4 SSL CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGQxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjEhMB8GA1UEAwwYR0RDQSBUcnVzdEFVVEggUjQgU1NMIENB","whitelist":false,"attachment":{"hash":"0c153a0a3e193285fb42bc65ed86726b6ce20e989c5ce61bee6ac0249ccc9114","size":2052,"filename":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb-nZvgw-0Who=.pem","location":"security-state-staging/intermediates/917af39e-808a-4852-8c1c-b2360829b69b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb+nZvgw+0Who=","crlite_enrolled":false,"id":"056dcecf-b54d-4dca-bd31-f6fa1134a775","last_modified":1601517443449},{"schema":1601376783927,"derHash":"5K8vrkEYfVjyCbAbHYdTwtzLP2Ac6GJz436HOMKlzLU=","subject":"CN=Oracle SSL CA - G2,OU=Symantec Trust Network,O=Oracle Corporation,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxGzAZBgNVBAMTEk9yYWNsZSBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"e494e978931ad5d02f062cfb56e8f25cd10bc3632a24ccafb9f97d68508fdd32","size":1829,"filename":"AifQ_vsDlH7aQOdXumUDNTzAh2cI97-83a1FqoQss7M=.pem","location":"security-state-staging/intermediates/a3eac2bb-9bb3-446e-bfb6-c8d463e48cb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AifQ/vsDlH7aQOdXumUDNTzAh2cI97+83a1FqoQss7M=","crlite_enrolled":false,"id":"d1739c52-6e71-43f0-a8c1-3fe9fa938594","last_modified":1601517443431},{"schema":1601376736833,"derHash":"uXF28htu1kYJJnstGiqfrwxN69RGRNyF62rphvyGfVY=","subject":"CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE3MDUGA1UEAwwuU1NMLmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQSBSMg==","whitelist":false,"attachment":{"hash":"26b0eb0f7d0c63890a8cb3bac26790139d109c65e18753a461b28633c51c86e3","size":2093,"filename":"fNZ8JI9p2D_C-bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=.pem","location":"security-state-staging/intermediates/cbc009ee-d95a-4c1a-b665-8d351c2f25cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fNZ8JI9p2D/C+bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=","crlite_enrolled":false,"id":"7b426af5-c32a-4108-a18c-9f524b01f83a","last_modified":1601517443414},{"schema":1601376766712,"derHash":"F04d53yNk8aOzSvS6m4ZG1hNuFAneoNKrImLfICpHHA=","subject":"CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM","subjectDN":"MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=","whitelist":false,"attachment":{"hash":"d0caddb97c0bc5c29f2e4a3313e5fcde643b44351f7d21145f14294c7d1ca9eb","size":2333,"filename":"U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem","location":"security-state-staging/intermediates/5219558a-ec4b-4733-86f9-13b9bf9c74ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=","crlite_enrolled":false,"id":"4faccf9d-b079-45fb-8618-5f3f864455de","last_modified":1601517443396},{"schema":1601376781071,"derHash":"RF7seLxhIVBEoDeWVqotXbXkL3bLcLjRTCB3qpQ9Trs=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R3,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIzMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"03136ae4f1cc15165e71fa5ef33f14d451ac52630098f060194f365a61a44a74","size":1553,"filename":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP-4A=.pem","location":"security-state-staging/intermediates/de87ee5e-fc90-47ae-a551-27f45867b68c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP+4A=","crlite_enrolled":false,"id":"61380e8f-ba33-418f-b251-e9adeb0d421b","last_modified":1601517443361},{"schema":1601376723250,"derHash":"3ajac2GH129PDtWl9me1TZmpiuBgkdDjoBcU6SIWla0=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R6,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"b41c9b2e15c3c244c322fbf94a4a850c7938223b476b1126737bdf2e5eec446a","size":1890,"filename":"aCdH-LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=.pem","location":"security-state-staging/intermediates/4d8959af-58c7-4dbf-b787-864dac9fdf64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aCdH+LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=","crlite_enrolled":false,"id":"ff319db3-4ac0-4406-9c29-03f632e42c98","last_modified":1601517443342},{"schema":1601376731061,"derHash":"GpkBn51BKmRFR0ntqo59xGZz1kTfPOFcxlVzXqDfhv4=","subject":"CN=thawte EV SSL CA - G3,O=thawte\\, Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHjAcBgNVBAMTFXRoYXd0ZSBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"1cf868355a40b245f6cc59c13c1382c34b4f199d60214e4df7096639b87717dc","size":1683,"filename":"L_6MoT_ohYSR0eSF5RZoAF17Gqj6vWJpWTK-FNgH0rM=.pem","location":"security-state-staging/intermediates/7544ec1b-5339-422e-9183-77c1d3ba8469.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L/6MoT/ohYSR0eSF5RZoAF17Gqj6vWJpWTK+FNgH0rM=","crlite_enrolled":false,"id":"4f72d4f2-5538-4d6c-82f9-01320834b544","last_modified":1601517443324},{"schema":1601376750539,"derHash":"krty8V63XeRnyEtDgYEDS9rpoBbsJkNL7jybutjNivA=","subject":"CN=Symantec Web PKI ECC Root - G1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEnMCUGA1UEAxMeU3ltYW50ZWMgV2ViIFBLSSBFQ0MgUm9vdCAtIEcx","whitelist":false,"attachment":{"hash":"488787a086889d5ac385a1e96db2cc8bd76c1015d9c3c1003c0ad97b8bd7d46a","size":898,"filename":"iduNzFNKpwYZ3se_XV-hXcbUonlLw09QPa6AYUwpu4M=.pem","location":"security-state-staging/intermediates/413ec41f-5315-44a7-add5-99589e58480c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iduNzFNKpwYZ3se/XV+hXcbUonlLw09QPa6AYUwpu4M=","crlite_enrolled":false,"id":"d00abc39-e08a-44f1-84d7-b68ac1d5334f","last_modified":1601517443307},{"schema":1601376757868,"derHash":"uCIQzend6g4UvimvZH5LMvlu0qnvGqW6qcxks4tsAco=","subject":"OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES","subjectDN":"MDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTQ==","whitelist":false,"attachment":{"hash":"dda828b4a97c8a8f24d378bef318af5d144be4d873ff73ba3f07303c1c298e49","size":1971,"filename":"L8VmekuaJnjtasatJUZfy_YJS_zZUECXx6j6R63l6Ig=.pem","location":"security-state-staging/intermediates/517b4707-ce8c-4711-b41b-f2251c5edd3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L8VmekuaJnjtasatJUZfy/YJS/zZUECXx6j6R63l6Ig=","crlite_enrolled":false,"id":"a16f609b-1af0-4b48-90e8-2d6a182ca81f","last_modified":1601517443289},{"schema":1601376729034,"derHash":"VuT0VNmC3NzmEbe3B9sSxTPqwpol9KUwfhwGVxOw3I4=","subject":"CN=DigiCert TLS ICA Thawte PCA-G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEnMCUGA1UEAxMeRGlnaUNlcnQgVExTIElDQSBUaGF3dGUgUENBLUcz","whitelist":false,"attachment":{"hash":"8bae35c0e06cb5fb2398f3147505a1a2ea437352eb1117c66f7060548a248981","size":1735,"filename":"1kuMMhuDt5uIGZpznnoQhtlIwlmJ85sNYnH0jX_yBUA=.pem","location":"security-state-staging/intermediates/3cfa0bee-444c-4508-9234-5f45d449c7c3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1kuMMhuDt5uIGZpznnoQhtlIwlmJ85sNYnH0jX/yBUA=","crlite_enrolled":true,"id":"abdee471-bc7c-45ce-a24e-e12b11d63ef9","last_modified":1601517443271},{"schema":1601376749709,"derHash":"LnoKOwxSfrIMUiU8jSJ4yhCBNqjKOk6iLae1m6yQZQo=","subject":"CN=Staat der Nederlanden Burger CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MFwxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xLTArBgNVBAMMJFN0YWF0IGRlciBOZWRlcmxhbmRlbiBCdXJnZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"333baabfa08d3f556b2b77e6fbd81a7c8d6eeffc79185f35ee1b9940de7adb0b","size":2219,"filename":"Ddtmy6Pa-pijb1fgZHrEBrRujNwcH920-5ucOhHG4yU=.pem","location":"security-state-staging/intermediates/1bef5ac3-89f5-4d09-bc35-4146f932b183.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ddtmy6Pa+pijb1fgZHrEBrRujNwcH920+5ucOhHG4yU=","crlite_enrolled":false,"id":"19a63c15-3c2a-4f1b-a4bf-f07b30de7c65","last_modified":1601517443254},{"schema":1601376755045,"derHash":"5x2MO69D9rM1LfV0qfDUogZb8D2heVFLH8xdm+yMj80=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"1f262ade87c1ad2a96c3e27c26a783f6daabfe4db8d38fe377fa18eb20f05c8a","size":1674,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/fbb7342f-2e0d-4f3b-8dc3-9f69e60e0638.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"5a0248e5-fd5a-426c-99c1-331ad9cd50b2","last_modified":1601517443236},{"schema":1601376747615,"derHash":"usTwPcY1va4Gf3v+d6sG2ItbpGaLD0YVflPWypMQB38=","subject":"CN=TrustSign RSA EV CA,OU=Controlled by Sectigo exclusively for Ziwit,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MIGZMQswCQYDVQQGEwJGUjEQMA4GA1UECBMHSGVyYXVsdDEUMBIGA1UEBxMLTW9udHBlbGxpZXIxDjAMBgNVBAoTBVppd2l0MTQwMgYDVQQLEytDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFppd2l0MRwwGgYDVQQDExNUcnVzdFNpZ24gUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"05a98cf5e38717d1c7e8544b531bdf4bfdf308c7625823a299e96ffed1c65683","size":2219,"filename":"8o6U66RqF4Lhi_AFVcFBCBGggA7zxR6NC-m3h-ZT7LQ=.pem","location":"security-state-staging/intermediates/5183544d-1fa9-4601-9ea1-3b4454090cc0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8o6U66RqF4Lhi/AFVcFBCBGggA7zxR6NC+m3h+ZT7LQ=","crlite_enrolled":true,"id":"24008211-7aff-4f54-8d10-3ca632141e41","last_modified":1601517443218},{"schema":1601376732692,"derHash":"rUk9boXsYIq4E6iHvcTUGWoLybM9JWWn+orEMPCKmaU=","subject":"CN=Staat der Nederlanden Autonome Apparaten CA - G3,O=Staat der Nederlanden,C=NL","subjectDN":"MGgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xOTA3BgNVBAMMMFN0YWF0IGRlciBOZWRlcmxhbmRlbiBBdXRvbm9tZSBBcHBhcmF0ZW4gQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"13422064a1f73d17cb471aba1692618580819b2905822f628fa9325f4b9e8af4","size":2235,"filename":"QWTrYSKIZOkhPgxgK-ugNhLAYPM-za6OF4Z2NVH_OxU=.pem","location":"security-state-staging/intermediates/f0af33f7-86d7-46b0-8317-bfb72df4322b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QWTrYSKIZOkhPgxgK+ugNhLAYPM+za6OF4Z2NVH/OxU=","crlite_enrolled":false,"id":"2d565bb4-689f-41cd-a84f-c3529232d0d5","last_modified":1601517443201},{"schema":1601376771244,"derHash":"EjXhOBK5dSFwzpvTo7YOZqyMDLRPnMtcdoWJ/Z8nufQ=","subject":"CN=GoGetSSL ECC OV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIE9WIENB","whitelist":false,"attachment":{"hash":"a7a310387416fb0d0327af048190b506d023a1f7b0790692246276e1948d468a","size":1244,"filename":"PrR6EH8Bm2wimAptoITpdhgeQfnUp4ASjI8FRS-Bq7E=.pem","location":"security-state-staging/intermediates/bc6d1c2b-c19f-42de-b2ec-11a97b643751.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PrR6EH8Bm2wimAptoITpdhgeQfnUp4ASjI8FRS+Bq7E=","crlite_enrolled":true,"id":"0bc47da0-e7f9-4d90-abc8-4a6d3f0c15c7","last_modified":1601517443179},{"schema":1601376763724,"derHash":"d+rEdkU8tzIlf/FmpevRZWyx9nO2jijfQXdBM5efoqQ=","subject":"CN=SHECA OV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"af175c34733f44cc96e00555374654c4f4d467bef0feb67039c31a3cd7232ef9","size":1886,"filename":"GvyQK0TA2Qh-B1rvOMI28XPmBiJD59lQrwz_N-iQO_U=.pem","location":"security-state-staging/intermediates/9b757196-34e5-4a3c-b276-4df8ae32ee65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GvyQK0TA2Qh+B1rvOMI28XPmBiJD59lQrwz/N+iQO/U=","crlite_enrolled":true,"id":"2f77cfd2-2ffb-4909-8714-3629bde7ad50","last_modified":1601517443152},{"schema":1601376770407,"derHash":"WaNFbnUOMl/LE1ncKegoGJtJgsEZxk+s/WcocRswUy8=","subject":"CN=www.lh.pl,OU=LH.pl,O=LH.pl Sp. z o.o.,C=PL","subjectDN":"MEwxCzAJBgNVBAYTAlBMMRkwFwYDVQQKDBBMSC5wbCBTcC4geiBvLm8uMQ4wDAYDVQQLDAVMSC5wbDESMBAGA1UEAwwJd3d3LmxoLnBs","whitelist":false,"attachment":{"hash":"402828757f41d8cffb0ca05dbda29cf243d74ac40d69868042f3c4704cefe6be","size":1589,"filename":"SPflJTPfbRg6NWYkxrOaqWFjkUz6d6fxe8POctPyEFo=.pem","location":"security-state-staging/intermediates/9852f8f4-698c-4682-be77-b302a242b445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SPflJTPfbRg6NWYkxrOaqWFjkUz6d6fxe8POctPyEFo=","crlite_enrolled":true,"id":"88fae53f-9c98-4491-98fc-5382066d04ba","last_modified":1601517443133},{"schema":1601376764928,"derHash":"RKFX2TSIYKfUznyS4aOJ5MwMpZZ/nbu9EmY5+bmARrc=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"a954c72f600501a139cda333d4ad599c7d80d5c9a2f820e99b478ea81e4bd705","size":2564,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/9b8b9500-5c8a-4fff-839f-ec8c5225007c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"d45a382a-27a0-4770-bd46-caa195365dc3","last_modified":1601517443115},{"schema":1601376758715,"derHash":"ZLNULRvJcvWKHRefPQuWUr5DTzrjhC4MRHiA1NYjpN4=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"47de0a95895055ce31d99d828b0db0f2ec2817ccee0b1699eac0fc8b4c0d7a15","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/b0359886-f578-4ff8-b6f6-68c9c49ac966.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"565f7b1a-68fa-497d-9c56-e9cd5a86b74e","last_modified":1601517443097},{"schema":1601376718312,"derHash":"y/j7d2YBZ+a6rNDfd82jl9ARfuK+6iO5NTF/i7W147A=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"382e8d24a379c01750353f084bffee84b45ad51b937a3bc8fdb300cd978bbeac","size":1593,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/007ae41e-e2a4-4671-8841-b6c69a70cb76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"c21f9364-fa90-4173-bcc3-ae3c385c1bb5","last_modified":1601517443080},{"schema":1601376737682,"derHash":"qtrdWoedLrjEGolZcpEpJwnUIFL1tjmVQcaUw7c1PNE=","subject":"CN=DigiCert Global Root G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcy","whitelist":false,"attachment":{"hash":"136d10cac076bac0accd9db250939ff676ec4c68b25d282e902afbdd7c69c034","size":1748,"filename":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl_s2uC_CY=.pem","location":"security-state-staging/intermediates/9e4f7a6a-f1d9-42ef-bd0b-185c9c60d805.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7WTqTvh0OioIruIfFR4kMPnBqrS2rdiVPl/s2uC/CY=","crlite_enrolled":false,"id":"2bb1ad45-bcec-4adb-b3ed-edb4f01d5b68","last_modified":1601517443045},{"schema":1601376728640,"derHash":"S9FvSVXz88nI6kjvmZUyTaUSFyT4mRXV8skesLrvIzc=","subject":"OU=Public Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MFsxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEnMCUGA1UECwweUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"689c7ab13bb497838c62b566e5da7f914f4cf9354f08643500263bcfb46a32a3","size":2105,"filename":"qMjf0br8Ay71_wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=.pem","location":"security-state-staging/intermediates/c2017a82-2237-4c28-8656-5764f263e185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qMjf0br8Ay71/wiJ0t25y4v3IWwirr3SF1bWHJzkbnE=","crlite_enrolled":false,"id":"a869aa70-b82b-40fc-b8b7-123af99bb58e","last_modified":1601517443027},{"schema":1601376778540,"derHash":"yU/t2k6GCJCFgLx/h7Q04DuyYuQvZMY4IKj1D7F8HOw=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R3,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFIzMRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"46ad75ae4d4b3ea866008e00969c44fcf11c5283b34097a140d1ce9577c0080a","size":1548,"filename":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP-4A=.pem","location":"security-state-staging/intermediates/ee510c0b-d1d8-40ba-bcca-1982d73cd1cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cGuxAXyFXFkWm61cF4HPWX8S0srS9j0aSqN0k4AP+4A=","crlite_enrolled":false,"id":"fa4a1c02-26b3-4bf5-8034-bb4cabca2a73","last_modified":1601517443010},{"schema":1601376724096,"derHash":"TKCAJjzkvCTxgRzvP/rKWl7zmPk+vQxbz1t70LrmfUo=","subject":"CN=BitCert RSA Business Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSwwKgYDVQQDEyNCaXRDZXJ0IFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"a40bf8b9f7a6cc399211e086cb3d8144ff7e721b1e16e5646fdc299974c39bc5","size":2133,"filename":"cz-x3ySlDQ6TKlRCvrhCFabpnRLASgrkOqGv8wQxW6A=.pem","location":"security-state-staging/intermediates/846ca5bb-c701-4333-a9a7-808ec99af5f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cz+x3ySlDQ6TKlRCvrhCFabpnRLASgrkOqGv8wQxW6A=","crlite_enrolled":true,"id":"c8d11d03-f57b-43e8-9309-17aa68d467a5","last_modified":1601517442992},{"schema":1601376762009,"derHash":"qNFOlF4+UVa8rl45c3z2obH1ECi7v5gvUM5fTAVWi00=","subject":"CN=Belgium Root CA3,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ez","whitelist":false,"attachment":{"hash":"27c08a789500d6de5e3c63a5f87e09d913bc798b43f41a68cb3e106a86c3feeb","size":1987,"filename":"x7xeSTcmu_Ux9i_F9VE6wD6tgTr03NRFszBbo9PVM3Q=.pem","location":"security-state-staging/intermediates/5c7c8389-3909-40c6-b8fe-11b4a28455ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x7xeSTcmu/Ux9i/F9VE6wD6tgTr03NRFszBbo9PVM3Q=","crlite_enrolled":false,"id":"c7e38a24-aefc-45fe-a666-c74ab61c8f39","last_modified":1601517442975},{"schema":1601376750124,"derHash":"raGI+DDDE/YEZIjsNB8e1K95PG3CjFhgBEXfvrQWN0Y=","subject":"CN=Thawte CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlRoYXd0ZSBDTiBSU0EgRVYgQ0EgRzE=","whitelist":false,"attachment":{"hash":"2e25caf70d87ee67fe15801e44af860291aeeb44a7970edffe70210cf856c3ba","size":1678,"filename":"Hn_AvJkahgLnROxUs8e4tPKOI2wS-n9H5P_jk0Cf2T4=.pem","location":"security-state-staging/intermediates/e792a27d-66e1-40ac-a2be-d23b05217ef8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Hn/AvJkahgLnROxUs8e4tPKOI2wS+n9H5P/jk0Cf2T4=","crlite_enrolled":false,"id":"2eabd45c-f82e-46d9-84d2-60e3b784ff6f","last_modified":1601517442957},{"schema":1601376781920,"derHash":"JJBRRb2bm/6ZxgNUtJlRvg5wnxY0z70ONw/rnwaO1sM=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"14cdeb20754749b93fa91fc1e30b4e9dfedfb7f4d7022c381688a63321e757cd","size":1674,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/d469a3f0-cf37-44b9-a3bf-95ac5492cd92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"fc237743-155a-442f-b754-e8fba2257bfe","last_modified":1601517442922},{"schema":1601376757069,"derHash":"cDV7nlbT+zxsAJw4xxgUVMRikI37zm1U1g3+HlBuFP0=","subject":"CN=TrustAsia ECC OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0EgRzI=","whitelist":false,"attachment":{"hash":"eef7786b39056fba3e747973ce4532b06a0cd3dc1326554703821b55ecdd5eff","size":1406,"filename":"zQ_SLNg_h_U_OTLMb3XQLYnyHZ7Y7Hk6_xyTVTSQekc=.pem","location":"security-state-staging/intermediates/48fd3053-a283-46d0-99e4-f89312258dce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zQ/SLNg/h/U/OTLMb3XQLYnyHZ7Y7Hk6/xyTVTSQekc=","crlite_enrolled":false,"id":"24ff0be6-616b-4ad5-8017-005dbb310bf7","last_modified":1601517442905},{"schema":1601376762852,"derHash":"aLnHYSGaWx8BMXhEdGZdthu9sQngDwXKn3QkTuX19Ss=","subject":"CN=USERTrust RSA Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwGA1UEAxMlVVNFUlRydXN0IFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"9e2ebbe76bfd34d023064438681d83355a539b5267b279ebe8789bff5deae232","size":1967,"filename":"x4QzPSC810K5_cMjb05Qm4k3Bw5zBn4lTdO_nEW_Td4=.pem","location":"security-state-staging/intermediates/4357dc68-fa1b-4e2f-83fd-69a438b26167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x4QzPSC810K5/cMjb05Qm4k3Bw5zBn4lTdO/nEW/Td4=","crlite_enrolled":false,"id":"637da9fa-bc0c-4f4b-becc-9710f0181efd","last_modified":1601517442888},{"schema":1601376741469,"derHash":"hQSgNQA2sYWUsfR7ajvTUT4osEW8fb/lsI2PMEnNPP4=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"22a1ae9da8ba7c77870bcf18a45bd22acc40f753e2f6febbfb77c1140ac63f95","size":1764,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/b046d24e-cefe-4131-8cfa-17dc7fa261e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":false,"id":"c37666f8-318b-4ea3-9931-8bf0653657d1","last_modified":1601517442870},{"schema":1601376764522,"derHash":"ie/rJQlrpMzUCvT7h1bwpIQ5lZdIIgIJFMToWdkyt/M=","subject":"CN=SSL.com EV Root Certification Authority RSA R2,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE3MDUGA1UEAwwuU1NMLmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQSBSMg==","whitelist":false,"attachment":{"hash":"c7680e4e47bb04f8515b20fc6fe36741515835bace47ef132f02922b0ea612ea","size":2113,"filename":"fNZ8JI9p2D_C-bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=.pem","location":"security-state-staging/intermediates/a586bb32-1766-40e6-bdd8-ba5e8bf95066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fNZ8JI9p2D/C+bsB3LH3rWejY9BGBDeW0JhMOiMfa7A=","crlite_enrolled":false,"id":"2dea51d4-7fea-4eb2-a507-7fa4ef9b5e26","last_modified":1601517442852},{"schema":1601376724524,"derHash":"yE4TeLl0qZGs3N1zNCHjBh5vohoEkciQK6/eOFXgBj4=","subject":"CN=GlobalSign,OU=GlobalSign Root CA - R6,O=GlobalSign","subjectDN":"MEwxIDAeBgNVBAsTF0dsb2JhbFNpZ24gUm9vdCBDQSAtIFI2MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu","whitelist":false,"attachment":{"hash":"bc273edde0aa009fa424378923565ab23426f40d786f1f743e2a80d94c8514a4","size":1902,"filename":"aCdH-LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=.pem","location":"security-state-staging/intermediates/cd783c76-a2d3-49bb-8aaf-dd09ffcf625c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aCdH+LpiG4fN07wpXtXKvOciocDANj0daLOJKNJ4fx4=","crlite_enrolled":false,"id":"8feb1032-85fe-4d8c-b444-3c69d47c6f6d","last_modified":1601517442835},{"schema":1601376771681,"derHash":"VgCvtrriqDtmucu+nO7I9T4mQgppk5pI3MbVa5l5CmM=","subject":"CN=GDCA TrustAUTH R4 OV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"9212a9d7e5c2bfcfbf43aaf53d8aa2e3501f467ef547dee098ab48f5d850d6ad","size":2052,"filename":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb-nZvgw-0Who=.pem","location":"security-state-staging/intermediates/4aa91fab-6b52-44a6-a3c1-ef65ee1e7d8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNDNK48i2z9IOnLBTQP6yg9UerUnpfpb+nZvgw+0Who=","crlite_enrolled":false,"id":"a463b3f5-089a-40a1-ac08-8bb23ab16b4c","last_modified":1601517442818},{"schema":1601376773694,"derHash":"idqttBummLs3iu6E6slhIdIPjC/KY+xobZMHIprT6y4=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"040d9900f833e268067238f80552cbc76f9b4e228c4b60e714c5fae8f85e3ff4","size":1743,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/95a26b1c-0192-4ed1-be8b-87bc4f2afbe7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"587ff666-b7af-4e54-b57e-854a5cbd3919","last_modified":1601517442800},{"schema":1601376738506,"derHash":"n2HQl2jaM/f5n35+rZNZAiJJQ7TJrQe2KfdFwLCEdbc=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"d77ee7751b6c931314693fd1c86891d4a8d25831eb4080427adfd11d77e84924","size":1715,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/aa0a44b0-c3d8-459e-a78d-df26e5aa1492.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"49fc0d95-3476-4729-bcc9-6946f161d1ed","last_modified":1601517442783},{"schema":1601376765799,"derHash":"2Wy8A7UjzTMVkYZRz0hiFiiH3VY6+yNS0/NLuUV2+T0=","subject":"CN=Verizon Global Root CA,OU=OmniRoot,O=Verizon Business,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRkwFwYDVQQKDBBWZXJpem9uIEJ1c2luZXNzMREwDwYDVQQLDAhPbW5pUm9vdDEfMB0GA1UEAwwWVmVyaXpvbiBHbG9iYWwgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"522a9129b746a60c4aa7d040da0f639b8349b1fee088f3f0ecf8b8101c7e452a","size":1760,"filename":"v-gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=.pem","location":"security-state-staging/intermediates/98a3c55c-3f5d-4937-9389-3ca882ba85cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v+gpCYcuRDTxFcUaVhaAGVlNDgPco2PZ87SDnQurzeU=","crlite_enrolled":false,"id":"62b74836-05bd-4881-9d60-b255969ce226","last_modified":1601517442759},{"schema":1601376780668,"derHash":"gCRH7lIcxmbNt7uuk6OF5V8gDXaj0TVqhURaxMvb7RI=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"0311ba514ea52c161164a44190d3ff8d3f21d7e178936261c9f0f3b873c30bc0","size":1317,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/3b96ff08-978c-47b1-9a08-f7894f3bb801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":false,"id":"cabdabb7-b6b6-4aac-8c2a-c5931f2fc460","last_modified":1601517442729},{"schema":1601376738922,"derHash":"LRK2GaZgzvsBMnGDHYkSE/xDTpgqIVaCVs9OLoYyS+o=","subject":"CN=Starfield Services Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGYMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE7MDkGA1UEAxMyU3RhcmZpZWxkIFNlcnZpY2VzIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"4c84e52a6f32fdac5b7a09a6c9cd30af89415d99ee94c615e420b34e67cffcb0","size":1605,"filename":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6-oP5I=.pem","location":"security-state-staging/intermediates/70be3983-3e8b-4df2-b609-e35f19408bbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwccWaCgrnaw6tsrrSO61FgLacNgG2MMLq8GE6+oP5I=","crlite_enrolled":false,"id":"f9243f28-e9ff-47ba-ae4a-e2657cce028c","last_modified":1601517442703},{"schema":1601376763286,"derHash":"0QjDSljA5KYWRJ+MSDGAI6IpyGzT3dXV/mBBpAHBahQ=","subject":"OU=ePKI Root Certification Authority,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"15e5931fc9e514bb8bf23b5f5c3c40bb3131ccf6ed8b0857416342b002b8db15","size":2645,"filename":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=.pem","location":"security-state-staging/intermediates/a894f5a2-8e74-4828-97c6-41052369ca59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YlVMFwBVQ7I3IV8EJo3NL9HEcCQK08hmDiWuLFljD1U=","crlite_enrolled":false,"id":"056b1bcf-53e9-405c-96eb-eea77dcff395","last_modified":1601517442680},{"schema":1601376720383,"derHash":"BxuLSxOteyvgn91/vfNIJGCDgJjCFRm4OzFQ+OkZgy0=","subject":"CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"aaca8a07803242bef149ceadff6a9f44dbefb42c36b2589988a8a242b9fd78a3","size":1622,"filename":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=.pem","location":"security-state-staging/intermediates/09507c13-a7e2-48de-8c37-88554ebc941e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=","crlite_enrolled":false,"id":"61372f59-c5ce-4c32-958a-7ee04c1dc8bb","last_modified":1601517442652},{"schema":1601376780263,"derHash":"GEZ8TmTVhshEpERm3lunptWWnHqShZpRHF/a11sDzc4=","subject":"CN=ePKI Root Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGMxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEvMC0GA1UEAwwmZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"6bf1025a0f2a333a3a9f9cf1fa26d326f099cad7c0d6658f30ea16733092bd7a","size":2621,"filename":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=.pem","location":"security-state-staging/intermediates/c7b2feb5-da29-4802-ba1d-e34f9184099c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tInMsiS5prgd0nTOr1IJwlKZjJp2r0jk9MUKByhGGCU=","crlite_enrolled":false,"id":"ca26521c-22ff-48b3-bd4d-3c06d4ffa75a","last_modified":1601517442632},{"schema":1601376767919,"derHash":"ps9k27TI1f0ZzkiJYGjbA7UzqNEzbGJWqH0Ay7Pe8+o=","subject":"CN=USERTrust ECC Certification Authority,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEuMCwGA1UEAxMlVVNFUlRydXN0IEVDQyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"3a7503777199e5b45661530654f7276cd82134eaa1ba8f391bb243e5a7a8bf47","size":1386,"filename":"ICGRfpgmOUXIWcQ_HXPLQTkFPEFPoDyjvH7ohhQpjzs=.pem","location":"security-state-staging/intermediates/8b43a741-845c-4f0d-9cb8-04371ae9c724.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ICGRfpgmOUXIWcQ/HXPLQTkFPEFPoDyjvH7ohhQpjzs=","crlite_enrolled":false,"id":"256c0067-d90e-4625-aa2a-4223c14c4995","last_modified":1601517442614},{"schema":1601376752583,"derHash":"n5dERjvhNxR1Tho77PmMCMwgXkqzICj04oMMShsndbg=","subject":"CN=Belgium Root CA2,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ey","whitelist":false,"attachment":{"hash":"6b1177b9cf6d097674388a839e23ad9fe6462ab73ca6a823af4fa3a196083069","size":1293,"filename":"-OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=.pem","location":"security-state-staging/intermediates/68bf58ba-15f5-4acc-982f-48b8b2e021fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=","crlite_enrolled":false,"id":"6f19a71d-8c52-477f-9ad5-ef93aab07c08","last_modified":1601517442593},{"schema":1601376772083,"derHash":"Hd/d+IPjlFsssk+luDeIN5xasFhCKrl532bHdHOYhoc=","subject":"CN=Aetna Inc. Secure EV CA2,O=Aetna Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxITAfBgNVBAMTGEFldG5hIEluYy4gU2VjdXJlIEVWIENBMg==","whitelist":false,"attachment":{"hash":"e6068e6a00cb2a48657b0008e9ab5e6e47917580dc4400c9d7210b278ef98854","size":1626,"filename":"u6NyIqjq8NgZ5VkAyKFRk6mJ-QeTmwgG2SNmXrkK7vE=.pem","location":"security-state-staging/intermediates/0a4750b1-d9fb-4d20-8e86-0a6d40d82ece.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u6NyIqjq8NgZ5VkAyKFRk6mJ+QeTmwgG2SNmXrkK7vE=","crlite_enrolled":true,"id":"d84be73b-937b-4c91-b80e-a6cd1de6e276","last_modified":1601517442569},{"schema":1601376726961,"derHash":"OrvmPa91bFAWtrhfUgFf2Oisvid8UIexJ6YFY6hB7Yo=","subject":"CN=Cloudflare Inc ECC CA-3,O=Cloudflare\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBFQ0MgQ0EtMw==","whitelist":false,"attachment":{"hash":"aae889b11427ea641ba5e6fa121be2cea21baf4f6c6e3a4a24696fb45f974223","size":1378,"filename":"FEzVOUp4dF3gI0ZVPRJhFbSJVXR-uQmMH65xhs1glH4=.pem","location":"security-state-staging/intermediates/27a31a42-feae-47ff-8d4e-647a896f9508.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FEzVOUp4dF3gI0ZVPRJhFbSJVXR+uQmMH65xhs1glH4=","crlite_enrolled":true,"id":"de14e899-d269-4989-b43a-525c56a62193","last_modified":1601517442545},{"schema":1601376751778,"derHash":"nHgvawVYrcscye+EUyDRRZLJIg/PADDAmA2ddTsGYk8=","subject":"CN=International Hellenic University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE7MDkGA1UEAwwySW50ZXJuYXRpb25hbCBIZWxsZW5pYyBVbml2ZXJzaXR5IFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"3b0bf8066566b2050bb810100d606b335370d03d1252c58e445985c84ba0a8df","size":2954,"filename":"i3AYNFBcJ3BXrQRfRHmas7YdtYYMFl9BDRWLHPQMDXo=.pem","location":"security-state-staging/intermediates/6d2a3494-4259-4df1-9701-4a86ccae3824.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i3AYNFBcJ3BXrQRfRHmas7YdtYYMFl9BDRWLHPQMDXo=","crlite_enrolled":true,"id":"dcc6fefb-dd5a-48f0-8fbf-f8c7a8ac06c0","last_modified":1601517442525},{"schema":1601376783522,"derHash":"MHiREhT4haTna0lROE9TIsM8ob88aIrPA0f0M6bna4s=","subject":"SERIALNUMBER=201604,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDQ=","whitelist":false,"attachment":{"hash":"5a2eb7557029c21a2d0310c86e2ae8eae55e2e98cbf96fd1eb53a71127e8eddf","size":2093,"filename":"4Seg4lVqXNpRcFpI-CnyaEL9ZiJxhk3QwyO0AUdDDGo=.pem","location":"security-state-staging/intermediates/705294e3-5b5c-4fee-bb7f-2e84dfea46f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Seg4lVqXNpRcFpI+CnyaEL9ZiJxhk3QwyO0AUdDDGo=","crlite_enrolled":false,"id":"0911d5fd-fce5-4da1-a223-d8a576f29a50","last_modified":1601517442507},{"schema":1601376762446,"derHash":"wKV48hCeb0LT2TmUje6rcpsg97I7Qjer2ElN9VTPmFw=","subject":"CN=emSign ECC EV SSL CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEiMCAGA1UEAxMZZW1TaWduIEVDQyBFViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"853ba62a0ec592eb9c2ee33d281011227250af71cdcbf9b0e894d233249115ca","size":1138,"filename":"UEYlLVSYKuv5nRGqAxngK1P6jpyy3oyLZGnFpQIPQFk=.pem","location":"security-state-staging/intermediates/81418df8-ee8d-48b2-804c-11c4866e8e31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UEYlLVSYKuv5nRGqAxngK1P6jpyy3oyLZGnFpQIPQFk=","crlite_enrolled":true,"id":"b968e489-d60c-472f-8f60-2e7fcd90e869","last_modified":1601517442490},{"schema":1601376772898,"derHash":"30vyBMyAZ3PtfRBa9IgwZqsmrcIpI5HJjnnXENGbT2c=","subject":"SERIALNUMBER=201409,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDk=","whitelist":false,"attachment":{"hash":"fb73c5f85843cf6be0d3dc997db1b00003baf1f7b523e507ab38c78a333f0449","size":2093,"filename":"2BoYdyaSF9u3Rypv_R3GF6bqtEh-S4UwMsMm_WkvQLU=.pem","location":"security-state-staging/intermediates/5b0bc508-a430-449a-a37a-7b1bc3209fc3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2BoYdyaSF9u3Rypv/R3GF6bqtEh+S4UwMsMm/WkvQLU=","crlite_enrolled":false,"id":"a23d52c7-7936-41be-8f46-9e9ca4464caa","last_modified":1601517442472},{"schema":1601376718715,"derHash":"DnpJwCo8FPnGvBbDgYBHXCOzPV6xp50OjHhUK8GxD0I=","subject":"SERIALNUMBER=201702,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMg==","whitelist":false,"attachment":{"hash":"0837b1571241ef7e3c08a48093f8379ebfaf41141ba72b772e9ec14261bd34c6","size":2154,"filename":"H5gPRidS80eiZb-FQHKd8rMNDdv3rm1Hm6AIX7qvyAo=.pem","location":"security-state-staging/intermediates/64a9cc69-47c4-483d-98c5-99e00158e56a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H5gPRidS80eiZb+FQHKd8rMNDdv3rm1Hm6AIX7qvyAo=","crlite_enrolled":false,"id":"e82dfd35-d2d7-4663-a2a3-40a07ad942ce","last_modified":1601517442454},{"schema":1601376758315,"derHash":"2df9kLkOwYhr3PZVGVWc1V7sP6qJstQbeVxOpLl2A14=","subject":"SERIALNUMBER=201607,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDc=","whitelist":false,"attachment":{"hash":"acacd408aa018f6c76af5f4a18d599c644b9f2353cc079074462f31ff777ec42","size":2093,"filename":"pRg9cPl95zPK0qA68ddGKi1dmweMxXLMBYHiTX7n4J0=.pem","location":"security-state-staging/intermediates/cbebd73e-a2be-4ca9-a531-bcc305c4ded0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRg9cPl95zPK0qA68ddGKi1dmweMxXLMBYHiTX7n4J0=","crlite_enrolled":false,"id":"41592bd5-4e42-443c-a3aa-aeb0ed864faf","last_modified":1601517442430},{"schema":1601376726155,"derHash":"vWKNNkRXh8p3Y3Sp/iUxdo9oiGory9001zewcCgONOY=","subject":"SERIALNUMBER=201503,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDM=","whitelist":false,"attachment":{"hash":"220be85a912b82c555c282848b582b9dccd3f786353662d697b99074d3e0b874","size":2093,"filename":"fcwvxBR_7dywvrrGWH54w2I5o2MWZNZJurHDsiPXY1w=.pem","location":"security-state-staging/intermediates/1edb624f-4dfa-4eee-ba74-aa6a7155be76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fcwvxBR/7dywvrrGWH54w2I5o2MWZNZJurHDsiPXY1w=","crlite_enrolled":false,"id":"f4f52d98-123a-46df-aeb4-6bfb8e484b5d","last_modified":1601517442391},{"schema":1601376779391,"derHash":"ReTBVe5IzKO/un0ggVB9lyAY6CKrqe3TREzAHdxMNCk=","subject":"SERIALNUMBER=201606,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDY=","whitelist":false,"attachment":{"hash":"0b8d76856fea354ea3c15ce6b88596f1684f7b7387bc2ef5bed74a1eed5eba50","size":2093,"filename":"QGnVUqqcNoQM84XsWCS5GovEHtb29uveMcAlBBZfXVY=.pem","location":"security-state-staging/intermediates/7c1bc0de-34b5-4fd5-946f-1da949e8371d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QGnVUqqcNoQM84XsWCS5GovEHtb29uveMcAlBBZfXVY=","crlite_enrolled":false,"id":"3dcf2d07-f7f6-450b-a888-b59d9c81fd99","last_modified":1601517442372},{"schema":1601376721639,"derHash":"oryx6FI/uyO5onevoLZ9ouYemti6wbkmpzOhrgfGfN4=","subject":"SERIALNUMBER=201404,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDQ=","whitelist":false,"attachment":{"hash":"85b83278cf6fd8d7e7662c4b50b777a2eee40d98edd6ea3566189611dc182e4f","size":2093,"filename":"59ldQ4_B5SEeeY5yyNfRUTT2h15K2xW1KqgBu6OoBU8=.pem","location":"security-state-staging/intermediates/053dea68-1653-4891-b126-132054c21dac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"59ldQ4/B5SEeeY5yyNfRUTT2h15K2xW1KqgBu6OoBU8=","crlite_enrolled":false,"id":"d77a4a26-a8a9-49c6-993f-e5713bcb231a","last_modified":1601517442355},{"schema":1601376722839,"derHash":"9vFZKGoUAd5Tl+IaAJBTSoX157n5j9SlpHsd/9S/3tQ=","subject":"CN=emSign EV SSL CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIEVWIFNTTCBDQSAtIEMx","whitelist":false,"attachment":{"hash":"6e8a3c81fcf028c7f31ff8a6ecf47b000e0c56f86618ee42c5ab92b7dd438a5f","size":1581,"filename":"bJpaGvT-ExoQi2_an1HG3Mo5yMrot02ORyF_NS5p5J8=.pem","location":"security-state-staging/intermediates/586120f4-7f7a-48aa-a621-1d452827f4f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJpaGvT+ExoQi2/an1HG3Mo5yMrot02ORyF/NS5p5J8=","crlite_enrolled":true,"id":"219bee21-4e35-434a-b98f-7a9cdbbf3432","last_modified":1601517442337},{"schema":1601376759122,"derHash":"s0pHXAGVUDWHE+0DXqAsXtw6ObL9X8ZOR+jsDM4frx8=","subject":"SERIALNUMBER=201708,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwOA==","whitelist":false,"attachment":{"hash":"f375406a2b6f58568b6c858fe21f9d564d1cf55fc594234237157747a4d3dc92","size":2154,"filename":"kLOxxy10NQkrCrh2qL5R2g-yx6mjlkwYCq44XF4JDnE=.pem","location":"security-state-staging/intermediates/eaee698e-518e-4ca6-a425-60d3f01f6de4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kLOxxy10NQkrCrh2qL5R2g+yx6mjlkwYCq44XF4JDnE=","crlite_enrolled":false,"id":"0ed3dc2d-dec7-4eef-8b35-a119fd18862e","last_modified":1601517442320},{"schema":1601376753803,"derHash":"B3Q+mECXm+IlPnqICW3y2MTs4PpbrIWs1gujtNtNijw=","subject":"SERIALNUMBER=201608,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDg=","whitelist":false,"attachment":{"hash":"8c0cbaae9526908b6f5e7c40992af9d535a7001ef6d181f7e72c214e621c827d","size":2093,"filename":"db1FmZo_iQKRN_DoaJ1EqbHbAgjTFPseNUqd5epdDlQ=.pem","location":"security-state-staging/intermediates/0c410741-518e-4f46-b761-90c573b9d339.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"db1FmZo/iQKRN/DoaJ1EqbHbAgjTFPseNUqd5epdDlQ=","crlite_enrolled":false,"id":"a37c7a69-bb5b-45df-95df-cc27e5d2d7bf","last_modified":1601517442303},{"schema":1601376737259,"derHash":"AqetTdXgue/AlzaNn8xQd7ibDy4tbqfOJ1EreP4jLcw=","subject":"SERIALNUMBER=201605,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDU=","whitelist":false,"attachment":{"hash":"5587fb6a2f9d49ffcdca5e46b1f4fe6990b3720eab5f405fa5c274655c54845a","size":2093,"filename":"mxzmcEmVZ7pbwgyakCsaNfIs0nO1a2ATXlWM3YDPSv4=.pem","location":"security-state-staging/intermediates/79266315-a547-48b7-8a8c-539dd98c4c81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mxzmcEmVZ7pbwgyakCsaNfIs0nO1a2ATXlWM3YDPSv4=","crlite_enrolled":false,"id":"0d05e044-702c-45d3-ad6f-6da64708138e","last_modified":1601517442285},{"schema":1601376778129,"derHash":"uvdk/pz9nDFLuXaGQbRcOhu6U1hqeqbdAUy2wJ+aBSA=","subject":"SERIALNUMBER=201503,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMw==","whitelist":false,"attachment":{"hash":"3e033e3994ee02f690af4a6e1dfc41b5ff5533912cf4d56880cb72398af497c1","size":2097,"filename":"XfHlidGGDVVOgzjUprEw8aIeQxYbnmOME26_9SaNpvE=.pem","location":"security-state-staging/intermediates/3d07716f-e548-4635-91fc-532fccbbb2d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XfHlidGGDVVOgzjUprEw8aIeQxYbnmOME26/9SaNpvE=","crlite_enrolled":false,"id":"9fd8a38a-216f-4d8b-9d09-d79bf14e30ed","last_modified":1601517442268},{"schema":1601376740238,"derHash":"ZfceS8/y742OALVAFT3EYctgLGFdSf89kSCbOHscJgo=","subject":"SERIALNUMBER=201703,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMw==","whitelist":false,"attachment":{"hash":"fcbdbb96bf0df55e19f16d9601414e7c0338df1eeef0d6de6ab4deffe63f2581","size":2154,"filename":"6rvgeyqeTZZdXHb3Ou7zqzk6_NHxF5QuumcKoawuk7k=.pem","location":"security-state-staging/intermediates/86de0db1-1ca7-46ac-9cfb-412953f84176.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rvgeyqeTZZdXHb3Ou7zqzk6/NHxF5QuumcKoawuk7k=","crlite_enrolled":false,"id":"293c6349-ae54-4ddd-8603-df8d4e0ff284","last_modified":1601517442250},{"schema":1601376719105,"derHash":"4KM1mSv89KKXon0Q/9nLnuCZbnxUiK2o2ureNFAlA7U=","subject":"SERIALNUMBER=201602,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDI=","whitelist":false,"attachment":{"hash":"8ed8c59d6f248090b9615d90830669f44c25dd87c173570e90df02cfb884effd","size":2093,"filename":"xoEAoF10JcsljWhXiwKwqchikB5LpWs5WsK8af_smGc=.pem","location":"security-state-staging/intermediates/a59db986-6cba-48b5-a4e6-31308dca10db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xoEAoF10JcsljWhXiwKwqchikB5LpWs5WsK8af/smGc=","crlite_enrolled":false,"id":"249e5ad1-b304-4642-91e7-fdeb791315f6","last_modified":1601517442232},{"schema":1601376744368,"derHash":"cQtQSTgw21Uk2z0n4hl2Yq3xl29x9TZLtA/f+EIFw7w=","subject":"SERIALNUMBER=201603,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMw==","whitelist":false,"attachment":{"hash":"4c9149541b8e9c4b674fa0ff33d8df3025f88a01f50933c9da4d3b40e69c096c","size":2097,"filename":"XBQTAIj5aGw-bAbL6VUInxFeRnki1PNjhKhT0LcTGrY=.pem","location":"security-state-staging/intermediates/f9479f29-2c37-41fa-8851-de53e17e6b8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XBQTAIj5aGw+bAbL6VUInxFeRnki1PNjhKhT0LcTGrY=","crlite_enrolled":false,"id":"abd3813e-1fdc-42f4-bf74-e1c2cc8aeaae","last_modified":1601517442215},{"schema":1601376748866,"derHash":"p0//9ShHGQU4UHOt85lwGbJvT68kvOkQKicuekSE5Lw=","subject":"CN=Soluti CA - DV,O=SOLUTI - SOLUCOES EM NEGOCIOS INTELIGENTES S/A,L=Goi\u00e2nia,ST=Goi\u00e1s,C=BR","subjectDN":"MIGDMQswCQYDVQQGEwJCUjEPMA0GA1UECAwGR29pw6FzMREwDwYDVQQHDAhHb2nDom5pYTE3MDUGA1UEChMuU09MVVRJIC0gU09MVUNPRVMgRU0gTkVHT0NJT1MgSU5URUxJR0VOVEVTIFMvQTEXMBUGA1UEAxMOU29sdXRpIENBIC0gRFY=","whitelist":false,"attachment":{"hash":"e2655aaf6aee7659f46b6845d4679fe00f2961d4f982179edfe793575137f826","size":1837,"filename":"kAzMeuwjUBWfPL5YEYfQG9qK_ABDxl0BMvPtzwEPN7E=.pem","location":"security-state-staging/intermediates/2f0964e2-f735-4725-9e68-4346c3123587.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kAzMeuwjUBWfPL5YEYfQG9qK/ABDxl0BMvPtzwEPN7E=","crlite_enrolled":true,"id":"d7891a3b-bf82-49b7-8ef7-c041d57dde7a","last_modified":1601517442198},{"schema":1601376760753,"derHash":"ivthwh4w3DDI9gwHsHg7nu0GhtyurJElhz/XyqjAvlw=","subject":"SERIALNUMBER=201603,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDM=","whitelist":false,"attachment":{"hash":"3d028d5c255fc3a1068076848710da8b3f843a8758c47228b6ac0486ac903f72","size":2093,"filename":"VaNDp0-GOXKCK5DMQUXXYJaetuE09YpOUENU9PNhSQY=.pem","location":"security-state-staging/intermediates/f4ae12b2-8eaa-4573-84c2-ed92fcac954c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VaNDp0+GOXKCK5DMQUXXYJaetuE09YpOUENU9PNhSQY=","crlite_enrolled":false,"id":"6a26c541-441f-4996-9f72-a867fe62b81f","last_modified":1601517442181},{"schema":1601376761610,"derHash":"+RqsoOTlM3R6CIC/z28mcg3B0FSUw5ONpoAikNWgmzI=","subject":"CN=emSign SSL CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFUxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEbMBkGA1UEAxMSZW1TaWduIFNTTCBDQSAtIEMx","whitelist":false,"attachment":{"hash":"371dbaddc94c282e8343a28dc05dcb74778a143ee818d5884a3116b27bd5028b","size":1577,"filename":"Vu8rCm62GhPpPUIskAEOlG-x_WJEzc46NqUrWffwTVo=.pem","location":"security-state-staging/intermediates/5c3885bb-cc4d-4eb7-8b65-2d767339453e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vu8rCm62GhPpPUIskAEOlG+x/WJEzc46NqUrWffwTVo=","crlite_enrolled":true,"id":"40ee5283-fd3d-4e3c-9d19-0ac5439365bb","last_modified":1601517442163},{"schema":1601376723649,"derHash":"+BdppSTluWI+F/P111gfpKQZKXf/TiRX+wAyONz2BBA=","subject":"SERIALNUMBER=201601,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDE=","whitelist":false,"attachment":{"hash":"af582fa89b43c20eb4a7f6f2c88ded4c302410d4af719b9206186aba8336ed67","size":2093,"filename":"84Za4kYwrRkyQwGdAI_OxURzEVfnTxcOpAabMr7iKM0=.pem","location":"security-state-staging/intermediates/7905a8bc-173d-40e7-92ed-b4a494401b4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"84Za4kYwrRkyQwGdAI/OxURzEVfnTxcOpAabMr7iKM0=","crlite_enrolled":false,"id":"37d95d8c-3513-4a11-b930-b8f47cf74952","last_modified":1601517442128},{"schema":1601376725753,"derHash":"GUrT6FS2tXfbgMnlg73fLap/gIFmmODMhRoAdoB9i5Q=","subject":"SERIALNUMBER=201709,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwOQ==","whitelist":false,"attachment":{"hash":"e13f921d77416a5ba55814e3a229c8b50d66c523580816ae7194e8c46cb533da","size":2154,"filename":"91_yXUHhaE8XQE7T4qtIwHduKC0gNiCwyt7acKtcMCg=.pem","location":"security-state-staging/intermediates/d1d09664-4aea-44d3-b3bb-521febdd9266.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"91/yXUHhaE8XQE7T4qtIwHduKC0gNiCwyt7acKtcMCg=","crlite_enrolled":false,"id":"06523722-fbe4-4e54-ad81-768c08b9b3a7","last_modified":1601517442111},{"schema":1601376745190,"derHash":"oGHURTmXFMOPwQGm6a+9s4HxEvpd59W8FJBFWNHtMnY=","subject":"CN=emSign ECC SSL CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIEVDQyBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"8c77ffa9b893c57610bd16e4953c97a408efab95236b88e9a574f1475ed5146e","size":1134,"filename":"TPymzs2gSTCnRzT83dxpTHxfGl2tdQ9snhCfXXcejy4=.pem","location":"security-state-staging/intermediates/86a79f6f-14ab-4ade-a0ec-33f05a4994dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TPymzs2gSTCnRzT83dxpTHxfGl2tdQ9snhCfXXcejy4=","crlite_enrolled":true,"id":"5dc47e36-cabd-43eb-ac61-417a710e88b8","last_modified":1601517442093},{"schema":1601376731471,"derHash":"a2qdHAN/d/qodOYQmkk/H4QJXB0VJNvihhjaSIdhtTA=","subject":"SERIALNUMBER=201610,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MTA=","whitelist":false,"attachment":{"hash":"acd0c347136ab560467f0971b7ba00b91a4f2ccf988d106e3712504bf18965f0","size":2093,"filename":"pPTKMyEFXY56k6Lx4t1g9b9VGfP81txv-Nmof3ELcXw=.pem","location":"security-state-staging/intermediates/ccc3a418-512b-4930-99d5-de8e5dd2f210.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pPTKMyEFXY56k6Lx4t1g9b9VGfP81txv+Nmof3ELcXw=","crlite_enrolled":false,"id":"a9d83d3b-fca9-4ea7-a503-58b614621e5b","last_modified":1601517442076},{"schema":1601376784332,"derHash":"J09FXfZsfa8EPXoj2Lb6tanx+PxchSe3yUybxFyoyac=","subject":"SERIALNUMBER=201602,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMg==","whitelist":false,"attachment":{"hash":"f3bbe5d03f98b86af0a98a1d89517f05aec2aebd9dc847f1545502d7af308d1f","size":2097,"filename":"BOBA5Twm4mitveGSW5FDlhbrXAX2Nzp9tI149Ez2o68=.pem","location":"security-state-staging/intermediates/e20288d5-796f-41b7-9189-9086d9e97ace.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BOBA5Twm4mitveGSW5FDlhbrXAX2Nzp9tI149Ez2o68=","crlite_enrolled":false,"id":"5798e19f-2072-453b-ad44-339f57379ab4","last_modified":1601517442059},{"schema":1601376735177,"derHash":"mwT9+YEhXzUdwOyFrh+BZZ/LSpo/5/nhq2IYovNuj64=","subject":"SERIALNUMBER=201703,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAz","whitelist":false,"attachment":{"hash":"1710c12d6adc6eb6e5a43eca12c2013dbe3a7eae7e9c830428ac3cc4377eeaea","size":2158,"filename":"LuxKcz3x6blC_Nkgqe95wYedyrYHgwj9WLLOX_aAPig=.pem","location":"security-state-staging/intermediates/33864ab7-757a-4de4-ab78-3ef8d1052e1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LuxKcz3x6blC/Nkgqe95wYedyrYHgwj9WLLOX/aAPig=","crlite_enrolled":false,"id":"06266cbb-b88c-4fad-8490-7408e17e2488","last_modified":1601517442042},{"schema":1601376774903,"derHash":"gKw1KTCHW6Cv5/cN04kTDI4ee+/9yWR3NWrSqeADrSs=","subject":"SERIALNUMBER=201710,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcxMA==","whitelist":false,"attachment":{"hash":"3af89870b8cd5676b0650cc634057a2d93e3823dd927c33ebc945573081a928a","size":2154,"filename":"ZCLFrfNE0YmOMDXn8TdGm9cXS6EtB4A-rRuWgSitNdg=.pem","location":"security-state-staging/intermediates/52e7a4e1-eb06-4a43-a509-8d6dbf521484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZCLFrfNE0YmOMDXn8TdGm9cXS6EtB4A+rRuWgSitNdg=","crlite_enrolled":false,"id":"f80d87d6-b1f3-44c6-857b-f6828b862fdf","last_modified":1601517442025},{"schema":1601376732293,"derHash":"kZ6sPkYMJraGLxPDpVgue6CI/MIUKOd98A7reCcaKas=","subject":"SERIALNUMBER=201701,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAx","whitelist":false,"attachment":{"hash":"263b1f66d8d54d280867fbc124be5a36fe7a73a5820533e7e232dbee9643c4e9","size":2158,"filename":"nQ35mJfWCjba_vijrSnf88AaEOz5U-zNipRR1TZQkSs=.pem","location":"security-state-staging/intermediates/1a6c42f3-a4b3-4fd3-9fc8-9572f932ddd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nQ35mJfWCjba/vijrSnf88AaEOz5U+zNipRR1TZQkSs=","crlite_enrolled":false,"id":"f0037444-3d10-48ef-b661-fb3d87999e3e","last_modified":1601517442008},{"schema":1601376756663,"derHash":"D20/jpLBQygVbG/pPPL4yqOZNfWAt3/qGbkz6UE2D0E=","subject":"SERIALNUMBER=201701,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwMQ==","whitelist":false,"attachment":{"hash":"13316f9b8a81c37d912c95bab9b1a75fe27e85c4e78bdc8565dbcc0b0e4a1556","size":2154,"filename":"EB_ThksEnKMJ2YVoHHvY5XyMHTzvC2P_L5G9CrSyfnE=.pem","location":"security-state-staging/intermediates/2c971077-3395-468f-85b2-6e07cfc04c2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EB/ThksEnKMJ2YVoHHvY5XyMHTzvC2P/L5G9CrSyfnE=","crlite_enrolled":false,"id":"ad12ea65-7f92-4b32-a337-6b02ee3bdc0c","last_modified":1601517441990},{"schema":1601376733494,"derHash":"g4jwUGW1mD+TLCvi5UiYTfca4H9susMxtkj1KIs3DXQ=","subject":"SERIALNUMBER=201702,CN=Foreigner CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MGExCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xFTATBgNVBAMTDEZvcmVpZ25lciBDQTEPMA0GA1UEBRMGMjAxNzAy","whitelist":false,"attachment":{"hash":"3676002f43efd0a0bf3b10e582b3755e5da23bce4442ce825d14540454c25e29","size":2158,"filename":"lOlKIyhajdx1Pv_UumL8AwhOIVSEc53cII6qCgzybVk=.pem","location":"security-state-staging/intermediates/f2aa5a07-7a1e-48fa-8dc8-77b88c525caa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lOlKIyhajdx1Pv/UumL8AwhOIVSEc53cII6qCgzybVk=","crlite_enrolled":false,"id":"b5fe7e45-4ee5-4d6a-8d20-7acc5f32c0d1","last_modified":1601517441972},{"schema":1601376722047,"derHash":"Ifxe6PnsM7qGAumyFnKblorF6ZfHAF+D5rIfjUkAuT8=","subject":"SERIALNUMBER=201707,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNw==","whitelist":false,"attachment":{"hash":"35d1b042d6b7f4876f0915a8b07bd424360c27093aa293ef221b3d067ade827e","size":2154,"filename":"3kBEsS8bJGqOcdSGOBcn3v3kGJVLwDpOs47luWkYCHg=.pem","location":"security-state-staging/intermediates/30760870-3ab9-4763-86af-d783516015c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kBEsS8bJGqOcdSGOBcn3v3kGJVLwDpOs47luWkYCHg=","crlite_enrolled":false,"id":"c8211913-3fd7-4bd5-88bc-38fcb5a06beb","last_modified":1601517441955},{"schema":1601376752186,"derHash":"CV6Eg9E+kLuL0koueaWte/Gps0k99ipIGnUdR7BE8TM=","subject":"SERIALNUMBER=201601,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTYwMQ==","whitelist":false,"attachment":{"hash":"d9a2af818638a1d86ad680c36ec904451911a7e715805edacb13ea0adc0866f2","size":2097,"filename":"RBcL06ULAF8SGk-hJRdj-ieBrxnrfENSen5Fejc3mXI=.pem","location":"security-state-staging/intermediates/fbe2a61c-6afe-4a84-9f3f-82ca320cd112.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RBcL06ULAF8SGk+hJRdj+ieBrxnrfENSen5Fejc3mXI=","crlite_enrolled":false,"id":"29ab9c28-65b1-4b04-92fa-c1216ae03460","last_modified":1601517441938},{"schema":1601376739342,"derHash":"MI5DTr7hlojys3UPsyH/9pGwT90OIF+zYmurAU8gAvU=","subject":"SERIALNUMBER=201609,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE2MDk=","whitelist":false,"attachment":{"hash":"f458b0f2c2365915054245f4299cac76f566e47f974c119a5ff84df844025876","size":2093,"filename":"KRgOg6mRpaWoXbaKdK3GrcmjYXMv-Efv_xGeSRFTYTY=.pem","location":"security-state-staging/intermediates/cf87470d-e1e4-4f10-acd2-3ff10bed17e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KRgOg6mRpaWoXbaKdK3GrcmjYXMv+Efv/xGeSRFTYTY=","crlite_enrolled":false,"id":"c1ccd3a8-0060-4e25-932a-6cf5aca04875","last_modified":1601517441921},{"schema":1601376724920,"derHash":"4KSpHFCvxPss7N60HtjK5yvwFE+w1ii0k/6sUREg/XM=","subject":"CN=Atos TrustedRoot Client-CA 2013,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTMxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"8f4098af61d8dad073dd0771e4efd2ee78f3b9dde5b20990c03fe1075bdd678a","size":1561,"filename":"x1544Iz8YLSNjqF0CQ1JdKEkifn0AZ3h_QZt_MioExg=.pem","location":"security-state-staging/intermediates/92c082b5-f8f5-4f02-a1a2-d0a7112d4a35.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x1544Iz8YLSNjqF0CQ1JdKEkifn0AZ3h/QZt/MioExg=","crlite_enrolled":false,"id":"8b0d5b38-6f90-4466-8606-bde07a3e12e8","last_modified":1601517441903},{"schema":1601376745997,"derHash":"a1HR3PTreu5CQYXLG5WAV0s5y5Y4Y94+wa0x3bB2zp8=","subject":"CN=emSign ECC SSL CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gRUNDIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"89e969a3a81606f2a36171383c4b70f380c4613a543363e819611910547c8eca","size":1183,"filename":"9O08XqhJ4GK5qjGNH9IY24XQxhGv8dsFbbZDBPNw1xA=.pem","location":"security-state-staging/intermediates/7b91ca89-e860-4ed9-a170-78aaec18ecf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9O08XqhJ4GK5qjGNH9IY24XQxhGv8dsFbbZDBPNw1xA=","crlite_enrolled":true,"id":"ed563635-4e2d-4c84-83bd-179c24abeb41","last_modified":1601517441886},{"schema":1601376741893,"derHash":"QzTusswRT4K+5vin5a6gOkLrLh9wy9ZhAuQU1y8AM7k=","subject":"CN=emSign EV SSL CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRVYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"d1a4e2a86d82be89bc5a8cdd12e0721917280f6b41222ff230bfd34bde486b4d","size":1626,"filename":"uyublT6SsX3mh_3EIO2_Tv5ftRcL40wCzJ0G9rOjYKE=.pem","location":"security-state-staging/intermediates/ba44d28c-de08-40a9-a1e1-21782eca68cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uyublT6SsX3mh/3EIO2/Tv5ftRcL40wCzJ0G9rOjYKE=","crlite_enrolled":true,"id":"c280c564-6ffb-47f0-ab87-127727d076a0","last_modified":1601517441869},{"schema":1601376773300,"derHash":"lW2vVrCgKjNqJ3dk4Pu/slaFZTHPap3udG2dYhsTG/M=","subject":"SERIALNUMBER=201406,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDY=","whitelist":false,"attachment":{"hash":"30638046bea6f155841dc365c841daedace83b0ded20d9c17bd46f73824c7891","size":2093,"filename":"qRU5F6qy_4wyi4HARkT-CYod607PlhyQSnMiBSD98fA=.pem","location":"security-state-staging/intermediates/2338e82d-fbfc-4bac-9e6c-1c5bb39b6e12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qRU5F6qy/4wyi4HARkT+CYod607PlhyQSnMiBSD98fA=","crlite_enrolled":false,"id":"56faeaf3-53f6-4608-ba25-57843acf584f","last_modified":1601517441851},{"schema":1601376770828,"derHash":"J/ob5PS1ahQqR6VqfpS3JQIFm0Ai5GI+dIyh7xUc8iI=","subject":"CN=Valid Certificadora Digital SSL EV CA 2018,OU=VALID SSL EV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIEVWMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRVYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"bc6b910f331f4825a9cdbd16a2115b7223ea010714fdf6974ca9412bdffc09e0","size":1886,"filename":"Fvvsf-SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=.pem","location":"security-state-staging/intermediates/e338d07c-10d0-4444-bd57-e0078726ad72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fvvsf+SjFcNThumRKUfh4Zsz4ZsXqkoWTiLt7iT8DBo=","crlite_enrolled":true,"id":"4a1b6514-22ff-49a9-be43-c6c364cbf909","last_modified":1601517441834},{"schema":1601376777737,"derHash":"ng7HCFncHr8Sc3agy/QGZVkzOJrRyZ9dDHHOcdkYaPw=","subject":"SERIALNUMBER=201512,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTI=","whitelist":false,"attachment":{"hash":"2484239d7a2b9e714612b99b1585d4488fa991e4441f3486e7199d6c718ecf77","size":2093,"filename":"QRGGHe2oDxCAjDkdNzdV6-xL36aDt6GV-GXVtBEkosM=.pem","location":"security-state-staging/intermediates/d2820bde-3f75-43bd-aead-4f4865442d63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QRGGHe2oDxCAjDkdNzdV6+xL36aDt6GV+GXVtBEkosM=","crlite_enrolled":false,"id":"0aa43ec4-32c2-47e5-aca1-d8075618de6d","last_modified":1601517441817},{"schema":1601376783115,"derHash":"5szJZRkoFxFKRGHEz+3DRFPewb3mOXDOIaZC+8OPujA=","subject":"SERIALNUMBER=201502,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDI=","whitelist":false,"attachment":{"hash":"428f2f9a51942c06ebed0f13b6c1f503c537da14065e552cddd6dc3aef00db50","size":2093,"filename":"59nRM6JR4L01zd4twLB_PFOYuHBhNCUYvIjVMyinlIE=.pem","location":"security-state-staging/intermediates/4ed92c45-caac-4b1a-910e-039ddc0393a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"59nRM6JR4L01zd4twLB/PFOYuHBhNCUYvIjVMyinlIE=","crlite_enrolled":false,"id":"369fd6ef-b877-41c7-a13d-85f997662997","last_modified":1601517441800},{"schema":1601376731860,"derHash":"lSP+dqG/dVGSFdLN6frnvBIqlbLZjw73XFL7Z48V2hI=","subject":"SERIALNUMBER=201405,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDU=","whitelist":false,"attachment":{"hash":"8a4bc54af51cb4e07200000c701dd8192e248fb98c77aeed37be83fcb14a6943","size":2093,"filename":"a5V9lhZQ8dgRturcVZOVCxuSonandHuH6Jgt6Zy0QIY=.pem","location":"security-state-staging/intermediates/e73b1326-10ed-4674-be98-cbfab7ab8b6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a5V9lhZQ8dgRturcVZOVCxuSonandHuH6Jgt6Zy0QIY=","crlite_enrolled":false,"id":"6b0f74f1-9348-4005-9a02-0991e4735ed4","last_modified":1601517441783},{"schema":1601376735991,"derHash":"Sg4PMPotGIaQ+cdSU6AXGV8hY+RcCQz10rc8YsRJp4I=","subject":"SERIALNUMBER=201407,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDc=","whitelist":false,"attachment":{"hash":"5eb830f3bd31118690d65594afbb9d6640f7fc39f7779806e57b7d09787ce1ac","size":2093,"filename":"6t5RgbwqR17MdH8G9oKG0nuWGXrgv23l5Vk707xd_w4=.pem","location":"security-state-staging/intermediates/bdfc8266-4f92-4d83-83b4-7e16937c5af8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6t5RgbwqR17MdH8G9oKG0nuWGXrgv23l5Vk707xd/w4=","crlite_enrolled":false,"id":"f99a3ff4-5bf0-4cd9-9dc2-1453caa92464","last_modified":1601517441765},{"schema":1601376729849,"derHash":"KgB0N17Gt742elO3btlKaNRfUQdgy3+eDPkjFK/7oqA=","subject":"SERIALNUMBER=201706,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNg==","whitelist":false,"attachment":{"hash":"34a1c01e6ea7d6294b23196003905fcfcd0afb39a48726902fe069d5692be888","size":2154,"filename":"P8H4tWILrwuL6Uguy479T0QJ1pdTn_DRNH-qJIbwJlc=.pem","location":"security-state-staging/intermediates/48234e98-f00e-4cf2-a19d-5f44294aaa12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P8H4tWILrwuL6Uguy479T0QJ1pdTn/DRNH+qJIbwJlc=","crlite_enrolled":false,"id":"ac01d2c3-ff22-4dd8-be8d-65f3d74f33c2","last_modified":1601517441748},{"schema":1601376776109,"derHash":"588SO/NMrj+IToDLEAuXJEsdOkWUTSoROUuZXEuPgSg=","subject":"SERIALNUMBER=201408,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDg=","whitelist":false,"attachment":{"hash":"33e224fe32c39a932baf3f274d5afc7e27a5bc5193dffb4623b01db89c667fc2","size":2093,"filename":"hQIjsSxVvTiuqkpzyrXb6OAXsPacyApugghiaf0blNQ=.pem","location":"security-state-staging/intermediates/45fa3321-3de9-45d6-9f73-917714717124.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hQIjsSxVvTiuqkpzyrXb6OAXsPacyApugghiaf0blNQ=","crlite_enrolled":false,"id":"60ec0b65-adf0-4bf9-a827-5a07e599f184","last_modified":1601517441731},{"schema":1601376735592,"derHash":"ARbxf5fN70reLmPPLBsGT9mfQE0rkUEAvCQfB4GFMyM=","subject":"CN=emSign ECC EV SSL CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG0xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSIwIAYDVQQDExllbVNpZ24gRUNDIEVWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"cf06e95703019f175db9c5a52f46e1ddea5ac2ad994d77248a0ec9479bc9be49","size":1183,"filename":"f01011qEaFf6Wqq3wyJQCu96P1p4Ia4fYG9V_7Q6Pu4=.pem","location":"security-state-staging/intermediates/98578ae6-b345-4b4a-9f77-0f821db4c50a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f01011qEaFf6Wqq3wyJQCu96P1p4Ia4fYG9V/7Q6Pu4=","crlite_enrolled":true,"id":"c3a3ece5-9d3e-4a95-9e75-88b6770383fc","last_modified":1601517441714},{"schema":1601376769178,"derHash":"zMDsSwDyec8NbQurLUhtwnSm5BDtNAZXiV9SMu6hdNU=","subject":"SERIALNUMBER=201506,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDY=","whitelist":false,"attachment":{"hash":"d6555d845c65379f6c99daf370954c2b157def962266ea8993272c465b58437e","size":2093,"filename":"fJUnTwcxiS8oV_WhpL3lY4VeVXdTSo1_3QD1YzWg8mM=.pem","location":"security-state-staging/intermediates/15d98a45-71c0-4188-a3c1-6096c75f137a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fJUnTwcxiS8oV/WhpL3lY4VeVXdTSo1/3QD1YzWg8mM=","crlite_enrolled":false,"id":"5e88bec2-48e1-407c-81f0-3e8ec8a1b182","last_modified":1601517441697},{"schema":1601376748460,"derHash":"cvmvIVgYG68W1gybTm9L18qNI0GtSK/bZ8tMgzLVRvY=","subject":"CN=Microsec e-Szigno Root CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"b90c76e81f578b8bc26b991192e309fc1f7c20f49cb20bf33c55c1455c1f615e","size":1557,"filename":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq_Juw=.pem","location":"security-state-staging/intermediates/1700e695-ab2e-4343-b33f-89b8ee9187a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWFnIBQzrqbI5eMHCvyvZ0kYj4FL0auxea6NrTq/Juw=","crlite_enrolled":false,"id":"4ac33a0c-1052-4702-874c-dc40ae073f75","last_modified":1601517441658},{"schema":1601376767113,"derHash":"pmyXrlnf+eoBXnPHRO5VIHRfEBo5XEl9GeHxaNOa/NA=","subject":"CN=DigiCert Secure Site Pro CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"5aded62775075d08acc444c1de87c126e2389b6c7642ebc86c4a8c12384e4285","size":1808,"filename":"BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB_bo=.pem","location":"security-state-staging/intermediates/721e23ad-72ff-4222-ae1d-d221eb1482a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BbkOPUFIMuqBj5SBjChDvpb1ZCdk3b9ZNDWOnKRB/bo=","crlite_enrolled":true,"id":"7a20a336-c213-4fd2-ad8c-92be449691f2","last_modified":1601517441636},{"schema":1601376726545,"derHash":"HJ0+jgzx5POcc00Z5Hmulx/DBmwAA1Oitq8yeVqX6hs=","subject":"CN=University of the Peloponnese TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5Vbml2ZXJzaXR5IG9mIHRoZSBQZWxvcG9ubmVzZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"b97f4a98dfcd061cff017369f0b4c03f42a54b33d6e77aea0c96e2e972f74092","size":3819,"filename":"D5AmHvgsz8nnufCXywDHL8VpnKB80L_QvVJn75tQULs=.pem","location":"security-state-staging/intermediates/4e78eb05-39f9-4129-b04a-377f0b320b0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D5AmHvgsz8nnufCXywDHL8VpnKB80L/QvVJn75tQULs=","crlite_enrolled":true,"id":"55ed86a1-d369-4516-b887-90a0eccdfd12","last_modified":1601517441618},{"schema":1601376722448,"derHash":"fsrKSjWFo7QOJVdEFVEtVrV5mbdTAXhW8qsV+h8h9tA=","subject":"CN=NETLOCK Trust Qualified EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBFViBDQSAz","whitelist":false,"attachment":{"hash":"5c9cd98f81f0d60b8f3c40b8be94209d25226eb7ebf1c126947da32ed3d21dbc","size":2215,"filename":"ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU_0=.pem","location":"security-state-staging/intermediates/be90d242-60d9-4a6b-aefe-8e8fb342b23e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ksEtUEbADR0V5fQig7YPrrgGcr2PovgbGzQx045WU/0=","crlite_enrolled":true,"id":"bf7893da-0baf-4aae-8bfc-282641a4dcff","last_modified":1601517441601},{"schema":1601376727778,"derHash":"NAylukAtFAtlosl2566BKKFQXCnRkODgNPWcyuepK8I=","subject":"CN=Apple Public EV Server RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"ea385fed15dbd58a3c6f6fafe8e1873268b80afe2586ec31c75f1eebd9fb7c21","size":1833,"filename":"9C7mf4J789KvLX59lcMyYpsH6bpdmoAGTByZNhcusLA=.pem","location":"security-state-staging/intermediates/f25279c5-ac9c-4d91-99fc-93ec4b61b575.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9C7mf4J789KvLX59lcMyYpsH6bpdmoAGTByZNhcusLA=","crlite_enrolled":true,"id":"e7170fbb-6ceb-4f32-b932-7da04ce6562c","last_modified":1601517441584},{"schema":1601376759524,"derHash":"nmyANcDxyKlFMQ5y2D5TGUe1cfkpLkKkJIo3C/ezBb4=","subject":"CN=VR IDENT EV SSL CA 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEYxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIDAeBgNVBAMTF1ZSIElERU5UIEVWIFNTTCBDQSAyMDIw","whitelist":false,"attachment":{"hash":"dc99c4f4f52985f008966e436a519a723e8fc97d68041786cb235d067d979c71","size":2556,"filename":"n2nZ8zPLSNKoerb6X9o01VOniH-YyahnTcdt2oR9ovw=.pem","location":"security-state-staging/intermediates/24db4e33-c897-4e54-9072-c201e9f0c903.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n2nZ8zPLSNKoerb6X9o01VOniH+YyahnTcdt2oR9ovw=","crlite_enrolled":true,"id":"911c16b5-610f-407c-95ae-d17b705f20c2","last_modified":1601517441567},{"schema":1601376734751,"derHash":"mmlizYwhtdzx9ws5qDbH85fsSV+IC+m5tpuLJyiOyxQ=","subject":"CN=KICA RSA OV CA,O=KICA,C=KR","subjectDN":"MDUxCzAJBgNVBAYTAktSMQ0wCwYDVQQKEwRLSUNBMRcwFQYDVQQDEw5LSUNBIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"7a548420d69a6edd334c25490c6cbe65e35a11c6a7454d19f074a9b28f83a11b","size":1569,"filename":"404SflxwLnJCxfU7K35IbTgipMzslOzUuXBgFjCXwfk=.pem","location":"security-state-staging/intermediates/ce4b3c0b-bbe0-4b2d-a0c5-ba035046a670.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"404SflxwLnJCxfU7K35IbTgipMzslOzUuXBgFjCXwfk=","crlite_enrolled":true,"id":"12bb20c3-03a9-4d9e-b748-09d93661963f","last_modified":1601517441550},{"schema":1601376766270,"derHash":"sjopwxKnqAsP5rTnG5CcrpKtZJ6Idm5Wye6OHXwBOUU=","subject":"CN=Trust Provider B.V. TLS RSA EV CA G2,O=Trust Provider B.V.,C=NL","subjectDN":"MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBSU0EgRVYgQ0EgRzI=","whitelist":false,"attachment":{"hash":"38af4377ab1fc22658f11e631b7b47777b04bb8fb15d4b189132d8502e7c0990","size":1756,"filename":"tbS_1veJrHW-X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=.pem","location":"security-state-staging/intermediates/5f9c71f9-ea8c-4afb-94cb-c8d606a8933d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tbS/1veJrHW+X3zzJhnpwaHOLn5kSHEHFyby1BZoZlg=","crlite_enrolled":true,"id":"784ae2c3-b573-43e8-b16e-5c7524b7e6bc","last_modified":1601517441532},{"schema":1601376743958,"derHash":"vaRnKkA8okUcdNfpPnpOcantIqKozNb5H4/prg5sqIE=","subject":"CN=Sectigo SHA-256 OV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBPViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"6fa5518098b61edaf23a4c92a1150dea5509453a08d15a05eadad2f245c4f1f3","size":1634,"filename":"XB8O6m4KrSEF6ajZf52dFtzGpdc9UJGKYYbXFCuXf7c=.pem","location":"security-state-staging/intermediates/f5d8cd57-5f94-40f5-b472-53aace47ac48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XB8O6m4KrSEF6ajZf52dFtzGpdc9UJGKYYbXFCuXf7c=","crlite_enrolled":true,"id":"e68d9c20-1ff8-4609-843d-a98cdbd6806b","last_modified":1601517441515},{"schema":1601376739819,"derHash":"TUUDnuzKEU1kgioKqAlE1m4I+u5isdJT8UAph2nyJ7Q=","subject":"CN=XinChaCha Trust SSL Domain Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHQxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xLTArBgNVBAMMJFhpbkNoYUNoYSBUcnVzdCBTU0wgRG9tYWluIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"68b6dde00d9409bcff41cb8d3a250a7199377a35f14c4af0235cb34b2ced91d2","size":1772,"filename":"d2LYPy24Y7JLfKDPVkl-Qxb3wvxf9gwxrL4YMYl4enA=.pem","location":"security-state-staging/intermediates/1d26950e-1533-4bb9-9e82-339b1a07f6c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d2LYPy24Y7JLfKDPVkl+Qxb3wvxf9gwxrL4YMYl4enA=","crlite_enrolled":true,"id":"d85db883-7604-4b25-88f2-ae094367a108","last_modified":1601517441498},{"schema":1601376754203,"derHash":"1u8+Cevg2TcOUfXAmlMrOscNPOgiJT+fyEwo6b+lUNU=","subject":"CN=Apple Public EV Server RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"f1a0bae2b273ddf514b8e42304f3dbb8040fd3721185f80ada46dd69c0ddd5de","size":1861,"filename":"4ZMBBKlWyhpdsKqKnbXEkuo4CnSxw6b7svlcKIJWfEA=.pem","location":"security-state-staging/intermediates/b422a0ee-0a04-4468-a9fa-5635e30c83bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ZMBBKlWyhpdsKqKnbXEkuo4CnSxw6b7svlcKIJWfEA=","crlite_enrolled":true,"id":"b3dc6b21-3ad1-4586-8cdb-5e2dd1c613bc","last_modified":1601517441481},{"schema":1601376781512,"derHash":"JYWSjSxb/ZUuAlvRLifGd2Ikz3Uuw2LTAxzdSTUYRNQ=","subject":"CN=Apple Public EV Server ECC CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMS0wKwYDVQQDEyRBcHBsZSBQdWJsaWMgRVYgU2VydmVyIEVDQyBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"0c68df98e690b7945017fb11b9de0a5e05c426b30a289db35a64ca96eb1ac781","size":1341,"filename":"Lr2fY89asbE9ohd7WW8tLI0pvoPLX-Wt_N7mP-ri3c0=.pem","location":"security-state-staging/intermediates/934c88bb-99cf-4fc7-8742-47d2064a1e39.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lr2fY89asbE9ohd7WW8tLI0pvoPLX+Wt/N7mP+ri3c0=","crlite_enrolled":true,"id":"6cb0600d-434e-4a59-a8d8-60ea5bf117e9","last_modified":1601517441464},{"schema":1601376767517,"derHash":"0OilGsqrmvgnZ+LvFlQ8LMY1VRtd4NriXWqsceeGKHA=","subject":"CN=TrustAsia OV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMw==","whitelist":false,"attachment":{"hash":"f3b5ebd05dd3f189c5ed69f72d96e308522771553df7feb6a4fcdace0c0745b0","size":1821,"filename":"tv1pIXiJEYFUrzxhRqxCjTL7S9s7y_PZbxYVnDOXeCI=.pem","location":"security-state-staging/intermediates/128dd01a-e1a1-4819-bc9a-043a0fa2563c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tv1pIXiJEYFUrzxhRqxCjTL7S9s7y/PZbxYVnDOXeCI=","crlite_enrolled":true,"id":"6d03d111-d670-4e12-9bbd-b3ecad0252cd","last_modified":1601517441447},{"schema":1601376775308,"derHash":"lyoYG2ApTroHMzucGYJEDUM5WrqR1FDsDvtIWu1J1ac=","subject":"CN=D-TRUST SSL CA 2 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHjAcBgNVBAMTFUQtVFJVU1QgU1NMIENBIDIgMjAyMA==","whitelist":false,"attachment":{"hash":"dff0ac820c6ed7f8e2a14edfc11acfc4f548f8a7afc8f0f31cf6e7cea3bd1ec8","size":1918,"filename":"Qw7yBnlh3ygQw2Ss4PCmfsq94Je-YAYnMuM9CpdMS0w=.pem","location":"security-state-staging/intermediates/2e9665a5-d214-4616-9a99-e5f11afc8ab6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qw7yBnlh3ygQw2Ss4PCmfsq94Je+YAYnMuM9CpdMS0w=","crlite_enrolled":true,"id":"c3a9fa2d-eff6-4044-8fbd-014bd0c42505","last_modified":1601517441430},{"schema":1601376746825,"derHash":"jAmUsq7QCF/lQoE+4DxLLXMuzcwleuZFMRTGyHWTO9Q=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGMMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFEMEIGA1UEAww7SEVBTC1MSU5LIEhlbGxlbmljIEFjYWRlbWljIExpYnJhcmllcyBMaW5rIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1ad892976d511047af18da5aab5153b607c353df841e532029d0341a6aaaed34","size":2946,"filename":"YAtUtdUCD9mINjDHhpnZ-aWI7q9rbr-ylz-Qj5YyuqM=.pem","location":"security-state-staging/intermediates/528a2b56-532f-4299-a341-4f138138bea8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YAtUtdUCD9mINjDHhpnZ+aWI7q9rbr+ylz+Qj5YyuqM=","crlite_enrolled":true,"id":"81e51c73-89cd-4657-860d-7cc2ce56eed2","last_modified":1601517441412},{"schema":1601376728241,"derHash":"wa/GWx6BOw5hRuaqU0FoEnKr6aONWfe9Gye3KYNKDZw=","subject":"CN=UCA Global G2 Root,O=UniTrust,C=CN","subjectDN":"MD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290","whitelist":false,"attachment":{"hash":"8b23b9246ee0e3e317646bd91f006eaccbe8145196df356203921598a861c41c","size":2093,"filename":"ElXKvoFS-mTflC96R0F-KflsHOEb-MhOy-KBXMEoCBA=.pem","location":"security-state-staging/intermediates/069b42b2-4592-4d14-8a72-aec786fb8af9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ElXKvoFS+mTflC96R0F+KflsHOEb+MhOy+KBXMEoCBA=","crlite_enrolled":false,"id":"343087f6-4b20-4a64-8815-bfd565b84a7e","last_modified":1601517441395},{"schema":1601376764120,"derHash":"ji0Hv8WRsU+jFGhuHMjZu19vjQkcBZUZSqLHWFuZGIc=","subject":"CN=XinChaCha Trust SSL Organization Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xMzAxBgNVBAMMKlhpbkNoYUNoYSBUcnVzdCBTU0wgT3JnYW5pemF0aW9uIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"ee098ec8d0e0db01810ca1c3b3201c226be5f7b8a356ca702dca8dd33aec3a43","size":1780,"filename":"RHqNaKq-7GhfAxN8i7T10nLSrr6EQCmPkPfRvnXA2S0=.pem","location":"security-state-staging/intermediates/5a268c9f-0c99-4ae8-8988-0610fa6a632a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RHqNaKq+7GhfAxN8i7T10nLSrr6EQCmPkPfRvnXA2S0=","crlite_enrolled":true,"id":"6ee147c4-6e70-4972-8a69-4e4ff8257c86","last_modified":1601517441378},{"schema":1601376733906,"derHash":"AHEIGUEV88iZ9U7mfLTahyde3B1nmNp4fgdYz6aulrE=","subject":"CN=VR IDENT SSL CA 2020,O=D-Trust GmbH,C=DE","subjectDN":"MEMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHTAbBgNVBAMTFFZSIElERU5UIFNTTCBDQSAyMDIw","whitelist":false,"attachment":{"hash":"1206315657f09d9afaec77ac85e998dd3c6cdcb66f3f2176acc53b52c01c503c","size":2519,"filename":"tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=.pem","location":"security-state-staging/intermediates/35f8e921-4fcb-4f84-9bbb-da548ebd9895.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tODlN5eWKJbzjaei8TSG0CEnvkryLLZvN3Yh2FucTVs=","crlite_enrolled":true,"id":"9a044a16-723a-4cf7-8fef-aef81b9007f6","last_modified":1601517441361},{"schema":1601376778985,"derHash":"vrUcj0UkJrK55nL33R7qSzPWw49MoqlpVs4kvQWww40=","subject":"CN=TrustCor DV SSL CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIERWIFNTTCBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"87f0868047f749fb388e8d44c43d08ee740544952b1d3dadbc73172c343a6e6d","size":1695,"filename":"eS9Oc92-qoeyy7FaGbRe6FO_VTah35Lxm0PDdpsLdHc=.pem","location":"security-state-staging/intermediates/5e2a99e7-7c31-46e5-9e47-d2efc550858a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eS9Oc92+qoeyy7FaGbRe6FO/VTah35Lxm0PDdpsLdHc=","crlite_enrolled":true,"id":"b6448c15-89fa-4f40-bfc4-08ede3de01a0","last_modified":1601517441343},{"schema":1592519325523,"derHash":"tf7ML2lshQMj/HqFxltQpMXhv7+CPiZqsKRvATssDrI=","subject":"CN=DigiCert Trust Service ECC CA G2,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENBIEcy","whitelist":false,"attachment":{"hash":"3ca0e82119ab2a0b243ffb803c5d18e55b693598fd856f1a7d0a948e1d69157c","size":1366,"filename":"4VdkcpY-ZOfUyYWEJvjLhuY_q1wbV_iIKsGc2tE5I3A=.pem","location":"security-state-staging/intermediates/71b44562-b362-4564-a50c-c4d248bc8403.pem","mimetype":"text/plain"},"pubKeyHash":"4VdkcpY+ZOfUyYWEJvjLhuY/q1wbV/iIKsGc2tE5I3A=","crlite_enrolled":false,"id":"0e1c5bc4-8ad7-4fc2-98de-26295e8e6c53","last_modified":1600461980986},{"schema":1592519324037,"derHash":"lnDMo2rzULm0at/mRu3rv6vOwBzPg7gZznx4ZO3LZsg=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Code Signing CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"465e1a9061e7e389d0ea9da9747262b81d40ae4e14cd9fb27a42f4945f02703f","size":2113,"filename":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=.pem","location":"security-state-staging/intermediates/dbbc83b8-f71f-442b-9caf-a0b071759042.pem","mimetype":"text/plain"},"pubKeyHash":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=","crlite_enrolled":false,"id":"e29dabe7-26f8-4b0e-9a74-744b01286fbd","last_modified":1600461980972},{"schema":1592519319465,"derHash":"gAd2ZTOKAJeJ+ELzQDZHpxU2wfsmTzXa7OwBk+ZQjg4=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Secure Email CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"ebd4f889c36301f375bca790983c878bebf65b6cb79bf50ad94757d9791e1129","size":2125,"filename":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=.pem","location":"security-state-staging/intermediates/f89f921c-a3c7-42c9-994a-462056a42c42.pem","mimetype":"text/plain"},"pubKeyHash":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=","crlite_enrolled":false,"id":"b031ea12-8aac-4bac-aee4-5d52d060d214","last_modified":1600461980958},{"schema":1592519320938,"derHash":"3LiusAU7pcUw9Hor4dHk93taB24diij202yPHv3nYaM=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 DV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBEViBDQQ==","whitelist":false,"attachment":{"hash":"fa4d3f7d98a36f15104d4476514f5038617b69c71d4e11bdfa0516941f5805c0","size":2125,"filename":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=.pem","location":"security-state-staging/intermediates/aa550fcc-4cab-4c33-991a-e69878ac8229.pem","mimetype":"text/plain"},"pubKeyHash":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=","crlite_enrolled":false,"id":"7dcd5c54-eebb-427c-bea4-620c6203e573","last_modified":1600461980945},{"schema":1592519322519,"derHash":"TJ55n+pib17TXY+RVI+2o5AFAwmfMrxJ3A+1ZrCg7zc=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 OV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBPViBDQQ==","whitelist":false,"attachment":{"hash":"a18c07e5eb226b53a94eddfaa604b8c410e66396eb63dba5ffff4555b00cab71","size":2125,"filename":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=.pem","location":"security-state-staging/intermediates/8c5cbc1b-7010-4279-9592-7bf449788484.pem","mimetype":"text/plain"},"pubKeyHash":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=","crlite_enrolled":false,"id":"80d031b5-a786-4d6f-92db-1187faf75cfc","last_modified":1600461980928},{"schema":1592519318021,"derHash":"UrbEsFs8Uhd0VXzVPupZVvNryUxktm2Z6KcpH8L8nDY=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 EV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBFViBDQQ==","whitelist":false,"attachment":{"hash":"0fbfbb9e88addc3cd5be14cbc4fc98ffaf71d3590e9528f71285f55e6da787dd","size":2158,"filename":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=.pem","location":"security-state-staging/intermediates/133bea84-438e-4b34-99c8-925e79eac21e.pem","mimetype":"text/plain"},"pubKeyHash":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=","crlite_enrolled":false,"id":"03d0ad68-4073-473a-808c-029a1be1de3c","last_modified":1600461980915},{"schema":1592518507191,"derHash":"UrbEsFs8Uhd0VXzVPupZVvNryUxktm2Z6KcpH8L8nDY=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 EV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBFViBDQQ==","whitelist":false,"attachment":{"hash":"0fbfbb9e88addc3cd5be14cbc4fc98ffaf71d3590e9528f71285f55e6da787dd","size":2158,"filename":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=.pem","location":"security-state-staging/intermediates/5e9b82e3-6498-46cb-ae02-ec6e85daa9d4.pem","mimetype":"text/plain"},"pubKeyHash":"9H6Ec6Gyc8uSo946YlOcaYTeoFYZA6Lk4LjvzAtZwR0=","crlite_enrolled":false,"id":"68fb8595-ab2e-4358-8b7f-2d8630f8d173","last_modified":1600461980903},{"schema":1592518505595,"derHash":"3LiusAU7pcUw9Hor4dHk93taB24diij202yPHv3nYaM=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 DV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBEViBDQQ==","whitelist":false,"attachment":{"hash":"fa4d3f7d98a36f15104d4476514f5038617b69c71d4e11bdfa0516941f5805c0","size":2125,"filename":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=.pem","location":"security-state-staging/intermediates/d0c9c8fe-9684-46f7-8bec-543fada2095a.pem","mimetype":"text/plain"},"pubKeyHash":"bVTZhSTxXd9oL6FqukK0jPVCRZZN4NKl8Nq2p5TLW1Y=","crlite_enrolled":false,"id":"03cebcec-948e-4495-a47e-70c600be3181","last_modified":1600461980889},{"schema":1592518500941,"derHash":"gAd2ZTOKAJeJ+ELzQDZHpxU2wfsmTzXa7OwBk+ZQjg4=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Secure Email CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"ebd4f889c36301f375bca790983c878bebf65b6cb79bf50ad94757d9791e1129","size":2125,"filename":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=.pem","location":"security-state-staging/intermediates/5cd1888e-6da6-4b26-982c-41ff0fcb648d.pem","mimetype":"text/plain"},"pubKeyHash":"hXTrdizZDVwP3rMfF243guACsDeLHsUDr6RQIV8SPO0=","crlite_enrolled":false,"id":"b5b51d7e-18c0-4051-990e-2227c2564998","last_modified":1600461980874},{"schema":1592518504135,"derHash":"lnDMo2rzULm0at/mRu3rv6vOwBzPg7gZznx4ZO3LZsg=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 Code Signing CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHsxCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxPTA7BgNVBAMMNOS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"465e1a9061e7e389d0ea9da9747262b81d40ae4e14cd9fb27a42f4945f02703f","size":2113,"filename":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=.pem","location":"security-state-staging/intermediates/f603f16e-856a-454f-b298-d24dd8fca252.pem","mimetype":"text/plain"},"pubKeyHash":"YSF8GH0zlEZHOUsW5ULvJI2HashoWaIc2mlfp016vMs=","crlite_enrolled":false,"id":"b797be80-d570-40a8-a654-8dabec0a9efd","last_modified":1600461980861},{"schema":1592518499324,"derHash":"tf7ML2lshQMj/HqFxltQpMXhv7+CPiZqsKRvATssDrI=","subject":"CN=DigiCert Trust Service ECC CA G2,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENBIEcy","whitelist":false,"attachment":{"hash":"3ca0e82119ab2a0b243ffb803c5d18e55b693598fd856f1a7d0a948e1d69157c","size":1366,"filename":"4VdkcpY-ZOfUyYWEJvjLhuY_q1wbV_iIKsGc2tE5I3A=.pem","location":"security-state-staging/intermediates/48219111-c4c3-46ea-8a9b-039c95dd8687.pem","mimetype":"text/plain"},"pubKeyHash":"4VdkcpY+ZOfUyYWEJvjLhuY/q1wbV/iIKsGc2tE5I3A=","crlite_enrolled":false,"id":"505a1a9d-4fd8-4405-8efd-ffeeb546927b","last_modified":1600461980847},{"schema":1592518502537,"derHash":"TJ55n+pib17TXY+RVI+2o5AFAwmfMrxJ3A+1ZrCg7zc=","subject":"CN=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8 OV CA,O=\u4e0a\u6d77\u9510\u6210\u4fe1\u606f\u79d1\u6280\u6709\u9650\u516c\u53f8,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMS0wKwYDVQQKDCTkuIrmtbfplJDmiJDkv6Hmga/np5HmioDmnInpmZDlhazlj7gxMzAxBgNVBAMMKuS4iua1t+mUkOaIkOS/oeaBr+enkeaKgOaciemZkOWFrOWPuCBPViBDQQ==","whitelist":false,"attachment":{"hash":"a18c07e5eb226b53a94eddfaa604b8c410e66396eb63dba5ffff4555b00cab71","size":2125,"filename":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=.pem","location":"security-state-staging/intermediates/6231d971-9aa9-41b5-a807-ac2ac34ed03e.pem","mimetype":"text/plain"},"pubKeyHash":"0I7ImSIwMSH6GsuawHstmkZIicesm0pcLLm6TH6V8Gg=","crlite_enrolled":false,"id":"d425ff0e-dd7f-46dd-bec7-e1a25ff6824a","last_modified":1600461980834},{"schema":1592519327887,"derHash":"HQzX7zwZJlUI4g5Ys1OJZPShGt7Ipx2KuKiv8VaDxq4=","subject":"CN=Trustwave XRamp Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE/MD0GA1UEAxM2VHJ1c3R3YXZlIFhSYW1wIEdsb2JhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"8a9ab9f7d0fa1dce10d8a47b00a029a25fdd07597d57eaa58121c3285bd1534f","size":1857,"filename":"bNKluS4Pu3ijZ1polhtHJPfB2HD5sR_s46h0NYeir6U=.pem","location":"security-state-staging/intermediates/5016e431-0390-45dc-8e65-2642b4718233.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bNKluS4Pu3ijZ1polhtHJPfB2HD5sR/s46h0NYeir6U=","crlite_enrolled":false,"id":"d9c54bdb-939c-4a86-a826-cc0f2f68da43","last_modified":1600461980813},{"schema":1592519327482,"derHash":"RbKwjhtYlIoCi+E6Z8DiDUskZq4rbsYlDrsQ/Wt/gjk=","subject":"CN=Trustwave Secure Global Extended Validation CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG4MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjFAMD4GA1UEAxM3VHJ1c3R3YXZlIFNlY3VyZSBHbG9iYWwgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"296ea0b36874faa2487773b3da5792b5b41278241a226affe7e50a6ba22c0e72","size":1784,"filename":"jyPoX5LnCMukfvFxrxuJWUrZycp69MmdphXiTrhpMU4=.pem","location":"security-state-staging/intermediates/3c07694f-03e7-4fdb-b353-876f81151fda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jyPoX5LnCMukfvFxrxuJWUrZycp69MmdphXiTrhpMU4=","crlite_enrolled":false,"id":"170a74a6-1485-4c35-aecb-8b37550de004","last_modified":1600461980794},{"schema":1592519327070,"derHash":"t1rumDb++8RG8oiilwuE/GCq+e+9LLn4L3WBeQ3kuNw=","subject":"CN=DigiCert Secure Site Pro EV CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"8f19662a936c31bb439790a003ca25e57b94197599e34213f653edb625e96dbe","size":1642,"filename":"2OVT1JHnI_dBAIq49zWtXoFiiSQRI-yC8zdls8oKK38=.pem","location":"security-state-staging/intermediates/2d3ad204-0ce2-4d05-9f72-d1c775ffbbf7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2OVT1JHnI/dBAIq49zWtXoFiiSQRI+yC8zdls8oKK38=","crlite_enrolled":true,"id":"009aa822-146e-46a3-a719-3dcd9bf7e8e3","last_modified":1600461980775},{"schema":1592519326661,"derHash":"avXE6sGAKJuUp3pdIx44Zf/pNPPmokv0h+tOK/2Amks=","subject":"CN=DigiCert Secure Site CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIENOIENBIEcz","whitelist":false,"attachment":{"hash":"743079f69e24d2afafbe5dd936ba2cfc2f9326699f40d7bb7f26e940a110daa9","size":1804,"filename":"TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=.pem","location":"security-state-staging/intermediates/8026b161-5f15-4e50-9e04-efeab78566fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TbrK7tI1CsyZLKNdMvoHsV863GbcuERLt4LWrjChCv0=","crlite_enrolled":true,"id":"ad68756a-4b01-4086-81fb-9969fb748de3","last_modified":1600461980756},{"schema":1591908256929,"derHash":"xssItdbf5GGuzpqjzwOvf+0TQcnm7gBSEpwnynVJM/I=","subject":"CN=HARICA Qualified Legal Entities SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAwwoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMw==","whitelist":false,"attachment":{"hash":"15186c02c3df74416fd0f87801be6425aa3a0e406c53fd492f830a54cc92d12e","size":2544,"filename":"e-dd9g8VZXXMsr7G7fKcXN7tMA9ukaEjSLgZF2ICfqc=.pem","location":"security-state-staging/intermediates/80dd46f5-d545-40df-895f-23e2ea8d22af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e+dd9g8VZXXMsr7G7fKcXN7tMA9ukaEjSLgZF2ICfqc=","crlite_enrolled":false,"id":"283da37c-85ac-496a-ba61-80ed629f1f7e","last_modified":1591908420097},{"schema":1591908255464,"derHash":"Z/YmZm9F8XvCPH3e/5joVqpvLhhJ9dfhOS0YnrZte7Y=","subject":"CN=TrustCor OV Code Signing CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MGQxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xLzAtBgNVBAMMJlRydXN0Q29yIE9WIENvZGUgU2lnbmluZyBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"ddfe34bed60cad4d57b2e8417bba93ac215d0d0e840345142b03f395008543ce","size":2410,"filename":"iNMsaPqm4Y4GBd1dQ8pIwhWcEiF-oQ5TSyxyIysvIrw=.pem","location":"security-state-staging/intermediates/9e5d4cf9-fb23-4745-9ce6-a087b871d619.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iNMsaPqm4Y4GBd1dQ8pIwhWcEiF+oQ5TSyxyIysvIrw=","crlite_enrolled":false,"id":"d28c346b-415c-4cc5-9c09-487a46fab821","last_modified":1591908420093},{"schema":1591908258704,"derHash":"Hdniosh1+Qbfh6dbuSG6ureyrFwNL3iXWz70TTiEQw8=","subject":"CN=TrustCor OV TSA CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIE9WIFRTQSBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"6ec3d34afb73dd44ae301e1e6f0a88bfab245afafd5ea585c3b265293a072f79","size":2373,"filename":"1jVOPg4ry58GnR2_TFxGoDvcplP9fgYirn7IFdbUyC8=.pem","location":"security-state-staging/intermediates/66f59a5b-00d0-4d69-ac6d-d179a9c00001.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jVOPg4ry58GnR2/TFxGoDvcplP9fgYirn7IFdbUyC8=","crlite_enrolled":false,"id":"a770b1e9-9624-43aa-8f7e-5bff4eb600b6","last_modified":1591908420089},{"schema":1591908251155,"derHash":"Xun1cEg2BnWCXDrJQ5R8wTnEpiNoWQ68GVZiBVVJx6A=","subject":"CN=TrustCor OV TSA CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIE9WIFRTQSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"69adbaf65c55ef987d6666699aecc848786f8f9f06e2d00ed3bc77f76a5b48c0","size":2483,"filename":"d_caspjhmZltcVsqecvlCTBnVD8N3iuX2zSiNPeUluk=.pem","location":"security-state-staging/intermediates/edc45158-fbf7-4c73-a277-ac4bd7ae90b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d/caspjhmZltcVsqecvlCTBnVD8N3iuX2zSiNPeUluk=","crlite_enrolled":false,"id":"8074dbab-0f4a-4d83-86d4-04f377d177ba","last_modified":1591908420086},{"schema":1591908252552,"derHash":"rdvoi0aBVM+Pd3MojIxQ92CHnkkIkqqScoFbgU5yHn0=","subject":"CN=HARICA Qualified Natural Entities SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAwwqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIz","whitelist":false,"attachment":{"hash":"6c52992f4d66e47d6bc189688395f1d9b653b4ee61b4f9e7ba93bdf82f90d707","size":2548,"filename":"Pms5vxD68EJwYxeOKxJ-6ilislMxv6HNu2tpcnKXIMU=.pem","location":"security-state-staging/intermediates/111e670d-debd-4ffe-a437-edb530691a7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Pms5vxD68EJwYxeOKxJ+6ilislMxv6HNu2tpcnKXIMU=","crlite_enrolled":false,"id":"6093d7f2-f99d-4c21-8ee3-9a9b80983545","last_modified":1591908420082},{"schema":1591908260103,"derHash":"Dxfjdv6U5YLW7mSc3FFv+XfnZcVhrgh/MaP16OZszs0=","subject":"CN=MULTICERT SSL Certification Authority 005,OU=Certification Authority,O=MULTICERT - Servi\u00e7os de Certifica\u00e7\u00e3o Electr\u00f3nica S.A.,C=PT","subjectDN":"MIGnMQswCQYDVQQGEwJQVDFCMEAGA1UECgw5TVVMVElDRVJUIC0gU2VydmnDp29zIGRlIENlcnRpZmljYcOnw6NvIEVsZWN0csOzbmljYSBTLkEuMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEyMDAGA1UEAwwpTVVMVElDRVJUIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAwMDU=","whitelist":false,"attachment":{"hash":"7c1eb5e82b6b98c5fbb2cc2e946e862c3e9603db9030601769545d27dfc680ab","size":2710,"filename":"SnDcth-CFMtKqv8C-vvYUiVswx8i9btebkBPGF9jAbg=.pem","location":"security-state-staging/intermediates/8a7a0501-5a3d-44a9-9174-ddbbcbe9051c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SnDcth+CFMtKqv8C+vvYUiVswx8i9btebkBPGF9jAbg=","crlite_enrolled":false,"id":"66431be4-4652-4565-bed9-271b8a5ecc9c","last_modified":1591908420078},{"schema":1591908243825,"derHash":"igI8COShqsySWzTFx5ZajQUnVlrqEwq7kV5QjNM6+0U=","subject":"CN=GeoTrust RSA CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"1c253f34ef8fb2a9d6743df4e53b8c564f86da911d0aee06adf0de306c22beb7","size":1792,"filename":"Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC-fWQBE=.pem","location":"security-state-staging/intermediates/da3b185f-0b51-4749-b8bc-791ebfd15fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z8gGiWQqJBlCkkMEDLNWwgA7ptFGYD644CqzC+fWQBE=","crlite_enrolled":false,"id":"9c0eb9aa-b6ce-452b-9c28-80f98e51306b","last_modified":1591908420075},{"schema":1591908254121,"derHash":"GYvM8E55tCt8oo88Hq75phQ5LsxDugAK6nd+PXCKsfw=","subject":"CN=TrustCor IV TSA CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIElWIFRTQSBDQSAtIEcy","whitelist":false,"attachment":{"hash":"e538e57c2db6d21be93f1f9d530ffe21255eb9564f89c4f57a8b5dfee1db83e6","size":1792,"filename":"BcOVIft6Aa3I0Epsv8lbkAjkC8BYiOf4PL9PpPN24ME=.pem","location":"security-state-staging/intermediates/ac3a4076-5275-48cb-b805-73ea185a8dd6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BcOVIft6Aa3I0Epsv8lbkAjkC8BYiOf4PL9PpPN24ME=","crlite_enrolled":false,"id":"4f5b63f1-53f9-473d-8f4b-9fb17c89e6b5","last_modified":1591908420071},{"schema":1591908249702,"derHash":"RwjdbQktf7WVj1tDUB9hc/uWae2wWv1LvM3dLVBo2NA=","subject":"CN=NBN CO Limited Public Issuing CA - G3,O=NBN Co Limited,C=AU","subjectDN":"MFYxCzAJBgNVBAYTAkFVMRcwFQYDVQQKEw5OQk4gQ28gTGltaXRlZDEuMCwGA1UEAxMlTkJOIENPIExpbWl0ZWQgUHVibGljIElzc3VpbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"35095ff447bac3e1f428c0d591589efb625ae06c8da9a3771bafa7a54eaa07ea","size":1979,"filename":"gN_XmPns3r-Tbn-lkGyIDLxbLl0lVx5A-u0anA34Css=.pem","location":"security-state-staging/intermediates/5c4df234-31b6-4f83-b408-9ea720930655.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gN/XmPns3r+Tbn+lkGyIDLxbLl0lVx5A+u0anA34Css=","crlite_enrolled":false,"id":"f2f582d9-505a-4589-a18d-d9f70347e84c","last_modified":1591908420067},{"schema":1591908246671,"derHash":"FhSDQzEmNqwQtnlG87RSRvrhCxiP10lEKfTlFBdwnjk=","subject":"CN=TrustCor IV Code Signing CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF4xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKTAnBgNVBAMMIFRydXN0Q29yIElWIENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"4d46a09d4ee7352f08502d4721c53275065e5acc36b5bc3396acb9aa1357bd49","size":1804,"filename":"NNZ-Qjfj6rAm3CfD2zqpQShEqkK41UzTIGWJhlN2bww=.pem","location":"security-state-staging/intermediates/8fc46347-ec1a-42b8-bbf5-4b52d947a95b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NNZ+Qjfj6rAm3CfD2zqpQShEqkK41UzTIGWJhlN2bww=","crlite_enrolled":false,"id":"7913159f-41dd-4bb6-acfc-cd380f6bf5cf","last_modified":1591908420064},{"schema":1591908239339,"derHash":"mOajHV3KWkpNVWV+35TdDUSBVUnuqmNgrWnVWCQdRro=","subject":"CN=TrustCor IV TSA CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIElWIFRTQSBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"8bfa506d32d10c6528ea412e42a0d855ba7723dfe606ff19f0e40fe5fde89031","size":1678,"filename":"CsfHattDE4htH2z5II2WNywRRT9YaOXpOx4wtM_8LlI=.pem","location":"security-state-staging/intermediates/45d1ffad-718a-40e3-88d2-f0114ef3d216.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CsfHattDE4htH2z5II2WNywRRT9YaOXpOx4wtM/8LlI=","crlite_enrolled":false,"id":"b7f95b53-bebf-41cf-b830-690df9cc21aa","last_modified":1591908420059},{"schema":1591908245176,"derHash":"UGWE8Z53dAahawtrgU5mmhH01Kqh5zhkvf2VuyPF+WE=","subject":"CN=TrustCor IV Code Signing CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MGQxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xLzAtBgNVBAMMJlRydXN0Q29yIElWIENvZGUgU2lnbmluZyBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"cf590adb24b61ce55d52164c9a4d6c27c2436330ff35fcb41ec4b62ddd3a7b1e","size":1715,"filename":"JBOYzlgICSKcHIvX9_5QkncM_Z34f2lDBKwwj4Jdjaw=.pem","location":"security-state-staging/intermediates/7772d5b3-5c72-4498-a98b-27e0bd4507f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JBOYzlgICSKcHIvX9/5QkncM/Z34f2lDBKwwj4Jdjaw=","crlite_enrolled":false,"id":"cb96c308-4047-4032-a68c-949e1f543ae3","last_modified":1591908420054},{"schema":1591908237803,"derHash":"3wJdzio2QRvl62WQwWHv0mUuwrP3DVxlH5DQI8RvOgA=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"349b15c3f214b888d6f6a4b46c954070b45c19cb06c1ab8d5e1ba9af1f45fdba","size":2003,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/b9978482-c255-4c65-b859-e48b280ba0b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"e4d0a3e7-9fd9-4cbd-88ed-66cdec39ce70","last_modified":1591908420049},{"schema":1591908240858,"derHash":"ZGFrYoINRY98ceNEnszz8+RzW3aHmGDBxmDfI0OGB+o=","subject":"CN=DigiCert Trust Service CA G1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0EgRzE=","whitelist":false,"attachment":{"hash":"8f3bd7702431a74663d155fff1053e6a21a12d31b04d933bf288ac32b921b34d","size":1833,"filename":"QxsK1VHNknY5S-B94-JqCZPJWfnMPftvWK4_FNOB6V0=.pem","location":"security-state-staging/intermediates/f6b4b592-197e-4d6d-8689-a50686e47427.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QxsK1VHNknY5S+B94+JqCZPJWfnMPftvWK4/FNOB6V0=","crlite_enrolled":false,"id":"542da68e-9ecf-40ae-95ca-47a2d82da288","last_modified":1591908420041},{"schema":1591908248234,"derHash":"Ut3on91vYQRz+TFMeosaxEL4qoM6pddzAG/adYyf8ew=","subject":"CN=GeoTrust ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"e06f12d6e0b15958641d81bbc87c7e33098dcc36413ea0b92cdc4e4543a9f083","size":1321,"filename":"htzU8zBrdwmMNFLvW_ZzkFTZcn95rIZbtuXmmiR6prc=.pem","location":"security-state-staging/intermediates/da92e448-1975-4ac4-8055-a07ffe8cc9d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"htzU8zBrdwmMNFLvW/ZzkFTZcn95rIZbtuXmmiR6prc=","crlite_enrolled":false,"id":"88abec4b-eb1e-406d-bc4b-5b94bef1b7d9","last_modified":1591908420022},{"schema":1591908242250,"derHash":"LJfYbJSXYjw80JindbmbUK4Kk6pXIjWLid9jbHOeqiQ=","subject":"CN=TrustCor OV Code Signing CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF4xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKTAnBgNVBAMMIFRydXN0Q29yIE9WIENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"ef0aab26ac8bd0928a9d66d5daef52f3a25eeb827d1e043a71c60577efd7bf90","size":2495,"filename":"8R2HhqEOvFRlo8eJ7ZRC7QNG2WAYSUwQZJ0DIpmsPTg=.pem","location":"security-state-staging/intermediates/92acae6d-6fa5-4775-a134-7b54bd6fce8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8R2HhqEOvFRlo8eJ7ZRC7QNG2WAYSUwQZJ0DIpmsPTg=","crlite_enrolled":false,"id":"013d2fce-1b00-4e3a-a1e6-8adb2b7f1539","last_modified":1591908420018},{"schema":1591908261553,"derHash":"VlyCcCtexjICdU1PS3bMO64ypMkUbtO+zXOkBP+tTN4=","subject":"CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls","whitelist":false,"attachment":{"hash":"1d9a2d179a6bd77673a2997822c24eb83c91358de300c97d4a73f66949753211","size":1674,"filename":"Laj56jRU0hFGRko_nQKNxMf7tXscUsc8KwVyovWZotM=.pem","location":"security-state-staging/intermediates/510154be-a7ff-4d30-ac0f-47117e4efac6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Laj56jRU0hFGRko/nQKNxMf7tXscUsc8KwVyovWZotM=","crlite_enrolled":false,"id":"f8a064f9-72f6-4b80-82ab-21209517e607","last_modified":1591908420004},{"schema":1591908261181,"derHash":"BwUxODzNEA0+nNlk2weqXoRaBoby6uO8imJ7GCBXsfE=","subject":"CN=WoTrus EV SSL Pro CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIEVWIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"7be2ec04c8313dc05a7e0bef9687e9b6f04e6acceb8e83e4058ae0bf0657219d","size":1845,"filename":"rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=.pem","location":"security-state-staging/intermediates/fb7112f9-ebcd-4924-94f2-c22ec2b2f71e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rBTvvFbWGhKxAPrEAJ1x8vttBOVCvRznd5h2iXt2ATs=","crlite_enrolled":false,"id":"2e485221-a36c-44c6-9a72-4f500ee13bf3","last_modified":1591908419995},{"schema":1591908262427,"derHash":"M3xiU3dZLx38xuZWMcYF64uW4AwUa0N/wfBnJoFU6Vk=","subject":"CN=CA Teknikoa - CA Tecnica,OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGCMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExITAfBgNVBAMMGENBIFRla25pa29hIC0gQ0EgVGVjbmljYQ==","whitelist":false,"attachment":{"hash":"0c9abfeebfbd944291d27dfed50b0748b9adc5e8a3e675787d264631975bf3fa","size":2523,"filename":"DQi2term9F9bDPt5Nfb1rvSpznThwvfs2UDIgalF_gU=.pem","location":"security-state-staging/intermediates/4f1d16ba-fc95-4a1f-a3f9-da34f76cd637.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DQi2term9F9bDPt5Nfb1rvSpznThwvfs2UDIgalF/gU=","crlite_enrolled":false,"id":"a8fcbf40-670e-4659-b931-283e4034014e","last_modified":1591908419993},{"schema":1591908261922,"derHash":"FOOEZJqkAfHRyr1fo9CKvoLxS32ubFYVsc191B6XUOM=","subject":"CN=UTN-USERFirst-Client Authentication and Email,OU=http://www.usertrust.com,O=The USERTRUST Network,L=Salt Lake City,ST=UT,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls","whitelist":false,"attachment":{"hash":"13e9b1674386c0c79e7249e0a15c3c2a7a26566c25cabf53498bce266477b0ab","size":1748,"filename":"Laj56jRU0hFGRko_nQKNxMf7tXscUsc8KwVyovWZotM=.pem","location":"security-state-staging/intermediates/27474a2a-2668-4899-9441-3d21b2a180a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Laj56jRU0hFGRko/nQKNxMf7tXscUsc8KwVyovWZotM=","crlite_enrolled":false,"id":"057b5891-6e79-4a5c-82ac-96cc6b60a971","last_modified":1591908419990},{"schema":1591167086514,"derHash":"nbCiDDBVQeFegYqIDQZXmHapyQG47s2WhILFjZun8Kc=","subject":"CN=TrustAsia EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMw==","whitelist":false,"attachment":{"hash":"4e4f81e693158e50a56fefb6a5aca6b3e4574f9fe988f6c8784cddc95d070ff8","size":1650,"filename":"qPCsIegto8XzD_ooUOSN32SyAwuprv0BX_QDRc0K3aI=.pem","location":"security-state-staging/intermediates/4ac60b8e-b3bd-4e52-a97e-bd3b83cc2ec5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qPCsIegto8XzD/ooUOSN32SyAwuprv0BX/QDRc0K3aI=","crlite_enrolled":false,"id":"0b7fb8d7-395a-4a87-bbca-e9f0494cbbd2","last_modified":1591199862516},{"schema":1591167089365,"derHash":"6h87+00ylrRn1LWCVZ1lGNZ21a/H0cJL6AJS95GRBG8=","subject":"CN=Thawte EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBFQ0MgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"6600278f549dbae28e5eccd7c6d67369706158aee73bf69487e3b23a4b7ddaf2","size":1349,"filename":"3GFGMg3yja_Gu8_Fov8gNPJ7b50vsniti0_Jy-xvY9A=.pem","location":"security-state-staging/intermediates/add88934-8005-4e38-b32f-7fc51dfffed1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3GFGMg3yja/Gu8/Fov8gNPJ7b50vsniti0/Jy+xvY9A=","crlite_enrolled":false,"id":"af76e31b-fcae-4185-b725-666687e288ef","last_modified":1591199862513},{"schema":1591167082089,"derHash":"77RIRPN+5t4/tMyNLAyDL8j+66lQYjfg0fx61FdKTMo=","subject":"CN=University of Western Macedonia TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE5MDcGA1UEAwwwVW5pdmVyc2l0eSBvZiBXZXN0ZXJuIE1hY2Vkb25pYSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"34785736752f18d257707426251597f0daa53471c56c0f47a301e173c27e43ba","size":2848,"filename":"kTSX_4RoREKHkIC-2xr1SaXHZsAeaVcmjRu6cQGraoE=.pem","location":"security-state-staging/intermediates/a44e6dfa-6c78-4c11-ad62-016557267d7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kTSX/4RoREKHkIC+2xr1SaXHZsAeaVcmjRu6cQGraoE=","crlite_enrolled":false,"id":"91a2b5ee-075a-4618-bd8f-4d04cf5ccddf","last_modified":1591199862511},{"schema":1591167083551,"derHash":"wwvJZn4nOTeDPDlq2F7jJd5jP0/MxRSDQXqcik4zs50=","subject":"CN=Baidu\\, Inc. EV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gRVYgQ0E=","whitelist":false,"attachment":{"hash":"296487ea789ddbc074c95c8a463b37b717d3a6c661a41bcb0dfd1a6ee7de489b","size":2097,"filename":"onoL2w__80DVMiDBAhLw1xZS_BfLNB7xpPDNOU-t5vE=.pem","location":"security-state-staging/intermediates/66b05ddd-742a-4677-a64c-14bc59b1ff6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"onoL2w//80DVMiDBAhLw1xZS/BfLNB7xpPDNOU+t5vE=","crlite_enrolled":false,"id":"48a4c34d-ae22-4bed-a3e3-7c45741571fe","last_modified":1591199862505},{"schema":1591167073329,"derHash":"bsjTVRvQRUsMxLnbh2Nmrgh2TF/PFbAPlBG94w1TNq4=","subject":"CN=Harokopio University Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHAMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChIYXJva29waW8gVW5pdmVyc2l0eSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"dba0350edbfdcc712ff95f2aa7545bf242512d280fbf9f00eb896c1adb172dfa","size":3108,"filename":"qyD-jU59xuSNhgaWYyihJ7dWdsGFxoMvakE0j5xjD58=.pem","location":"security-state-staging/intermediates/c71e16a6-5051-4aec-805d-bdf273356535.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qyD+jU59xuSNhgaWYyihJ7dWdsGFxoMvakE0j5xjD58=","crlite_enrolled":false,"id":"34b45359-b190-4d3f-9191-c6d59ac0eded","last_modified":1591199862502},{"schema":1591167080617,"derHash":"53rALbbqoOmmtXOpmHDG3029uDOd2jvEB4b3DivX9/Y=","subject":"CN=Athens University of Economics and Business Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHXMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUgwRgYDVQQDDD9BdGhlbnMgVW5pdmVyc2l0eSBvZiBFY29ub21pY3MgYW5kIEJ1c2luZXNzIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1e3cb2c9ecca76313a725db387ac067371fbea9fc0ce4ce7d60c9ede6f74bf54","size":2950,"filename":"3IfeeqbDX_0ezFEcTXsTFVdG9GzLQIlDyy4VhgHxzS4=.pem","location":"security-state-staging/intermediates/54bf59a7-d689-4acd-bf6e-3101a05ef2c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3IfeeqbDX/0ezFEcTXsTFVdG9GzLQIlDyy4VhgHxzS4=","crlite_enrolled":false,"id":"3aea72b3-3960-455b-b711-025fdab94667","last_modified":1591199862497},{"schema":1591167071907,"derHash":"5Xu/UHn5gpO0FC80iXLmjjUeUrkDc/BfRvCcyzCvW/A=","subject":"CN=Democritus University of Thrace Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHLMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTwwOgYDVQQDDDNEZW1vY3JpdHVzIFVuaXZlcnNpdHkgb2YgVGhyYWNlIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"ea40db8a47367dd54c7678ae623e536b940224acac4e453074d7530c35cb3164","size":3754,"filename":"3QvO-bCh_CHkx1PzWSKQKGbIBtURouotLTwEHyZIxdg=.pem","location":"security-state-staging/intermediates/532ef40b-a9e4-413d-a1e1-d0aa802e5956.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3QvO+bCh/CHkx1PzWSKQKGbIBtURouotLTwEHyZIxdg=","crlite_enrolled":false,"id":"2500e750-51f7-4bfa-b14c-410eee994700","last_modified":1591199862494},{"schema":1591167076191,"derHash":"WOifT3BBDaALQUc8+kE/oHN+0nKfPtd74pp/RwU3cUc=","subject":"CN=Thawte ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBFQ0MgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"4b60a802a42e6e4c05c687e45fc85a906f057a59607855889909b6b0d8b54554","size":1317,"filename":"0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY-X4H-exCnC0=.pem","location":"security-state-staging/intermediates/b6d2ca16-612a-4f12-b4de-bdc927f057ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0dJZS0XpXAP9EPdQcU6sdSVE8gQj1YnY+X4H+exCnC0=","crlite_enrolled":false,"id":"114db227-c822-4ad8-bc85-78ec38af7372","last_modified":1591199862491},{"schema":1591167085011,"derHash":"dayOQdmnzHWNOZj+Aw9jjP0ohVgj2k6bVpVM+94FTrY=","subject":"CN=DigiCert Trust Service CA,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgQ0E=","whitelist":false,"attachment":{"hash":"a6a66b7af55471e0b38711d7f08e2851582c3a9a4fa4a8c11ffd63d8796ffc4e","size":1849,"filename":"gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=.pem","location":"security-state-staging/intermediates/30d35091-2272-41b0-8d63-8aa9c6a7253d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gEh9s2cJ3MLV50ZxAV4m1LscTzkQpFmUa1bCYZBMYEM=","crlite_enrolled":false,"id":"f0d3ef47-0140-4de4-8a17-349ba642faf7","last_modified":1591199862488},{"schema":1591167077621,"derHash":"FtnelFpCgBH6OggyPaDkNHQ49a8c4+gCgyI+JaRsKp4=","subject":"CN=GEANT Personal CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEYxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRwwGgYDVQQDExNHRUFOVCBQZXJzb25hbCBDQSA0","whitelist":false,"attachment":{"hash":"73692dd6b71347619e873c420c2d14921c90d06d40eef62de1dd6e50b7f88c6c","size":2450,"filename":"gKNaaLTb-FNPxezlz9qfuHiINdFBc6WBAavUqmlBe6g=.pem","location":"security-state-staging/intermediates/7a3ca483-65a7-42ca-9486-496ebb6c28b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gKNaaLTb+FNPxezlz9qfuHiINdFBc6WBAavUqmlBe6g=","crlite_enrolled":false,"id":"230a150f-d7b7-4b76-a970-cc4f56ac6428","last_modified":1591199862485},{"schema":1591167087942,"derHash":"8La3WY3yeQRxVSYy66nN5tNJBl/G1mWVf57u9ae7JPI=","subject":"CN=TrustCor DV SSL CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"55baa0feb441643563e5145eadf1edc0e02ae8038105624c584bb56a289bf41d","size":1804,"filename":"joJVEgkWNcXOGzwqvqRUGUI1s5Dz-sm7yE2V6LjAa9A=.pem","location":"security-state-staging/intermediates/2eb164f7-eecd-451b-a136-542653e6f4f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"joJVEgkWNcXOGzwqvqRUGUI1s5Dz+sm7yE2V6LjAa9A=","crlite_enrolled":false,"id":"100d0005-d64d-4678-9a8a-b4bdf571825a","last_modified":1591199862482},{"schema":1591167070504,"derHash":"Ok7AN5MHig3sFN5w5XvX+wO/Yv8pzuK2FH44ogjXIak=","subject":"CN=Trust Italia Class 1 Consumer Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHExCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUQwQgYDVQQDEztUcnVzdCBJdGFsaWEgQ2xhc3MgMSBDb25zdW1lciBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e2adf285776a91d6521266dfe60be2a2db10c624e80bf05ae97589ba714509a6","size":1752,"filename":"dfgf335FqF0Y0eTCH64ilFM_xC3YeT00OdPeMai8sc4=.pem","location":"security-state-staging/intermediates/966eaf80-4841-49df-b8f9-750be2fd7f7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dfgf335FqF0Y0eTCH64ilFM/xC3YeT00OdPeMai8sc4=","crlite_enrolled":false,"id":"2a196fcc-f810-4d55-84e4-93d5649fc1e5","last_modified":1591199862480},{"schema":1591167068979,"derHash":"vUQgxZKm9/JSromBJOAC8bnP4fJTiGTVazSntN+zH8g=","subject":"CN=Greek Universities Network Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHGMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5HcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3538047cb62ad089be4f013252357132586b290e06995041bb69677e17b8b668","size":2881,"filename":"eClYCfzKv6P76tWqfScdObnNeoNSeykW6trew89MfYM=.pem","location":"security-state-staging/intermediates/b80462a6-6676-4df4-a32c-d62f8671081d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eClYCfzKv6P76tWqfScdObnNeoNSeykW6trew89MfYM=","crlite_enrolled":false,"id":"5432729e-8e88-4b49-8687-b320365e9e8a","last_modified":1591199862477},{"schema":1591167067557,"derHash":"/AG1j8eLnFkhF4TC4lvx0BKh4j8zchiEemLrQUXuSrY=","subject":"CN=GeoTrust EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"a71cb7825b1dcf648f03a80a46f1bd37d9455ca249fb68a85c6ecf9a15848e99","size":1370,"filename":"aDb4btQIVH2hsyd4IxUsJGinBpyh-phY6PF4IHasdAw=.pem","location":"security-state-staging/intermediates/c09c55b5-14e7-4603-a7a9-e7c0bc70e59b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aDb4btQIVH2hsyd4IxUsJGinBpyh+phY6PF4IHasdAw=","crlite_enrolled":true,"id":"4efbcf92-bf3d-47eb-a092-4b861635e97f","last_modified":1591199862471},{"schema":1591167058628,"derHash":"99utEui2K4N7p/agHhZymZz69pKWWbgbB/JTV2KB970=","subject":"CN=Microsoft Azure TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMg==","whitelist":false,"attachment":{"hash":"58df8d69047ece6fc6c0574d72432af6c16e5891bf2288364d4f01eebe585ad2","size":2276,"filename":"zAwfx2iFcQ5vMOCc9vt-MXLdLl08EquNsOWgDF0hOw8=.pem","location":"security-state-staging/intermediates/db52ffd9-3a42-42ba-8d9c-fc19090d2447.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zAwfx2iFcQ5vMOCc9vt+MXLdLl08EquNsOWgDF0hOw8=","crlite_enrolled":true,"id":"c8857033-8969-438b-9ca1-33b6315bf546","last_modified":1591199862469},{"schema":1591167064529,"derHash":"wCk9W8NXY05tfKK/u3qhGFUz0s4JqgiDPTevWEZhXFY=","subject":"CN=TrustCor OV Email CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF0xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKDAmBgNVBAMMH1RydXN0Q29yIE9WIEVtYWlsIENBIC0gRzIgLSBSU0E=","whitelist":false,"attachment":{"hash":"27952ee3cf848c1c572a7bc0277c75c118c8dbec11a0224bd318870efa2f642e","size":2385,"filename":"TcTNufQAyMrXUOohYwD5emGgQ5j6I9N3jwzAzPt28sE=.pem","location":"security-state-staging/intermediates/56545cc0-b857-4c4f-98ee-c974db77f53e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TcTNufQAyMrXUOohYwD5emGgQ5j6I9N3jwzAzPt28sE=","crlite_enrolled":false,"id":"5186c50e-d721-4e7b-af5f-3331785a2ac5","last_modified":1591199862466},{"schema":1591167061645,"derHash":"nDPLanZZZ1Kgx+UcctSAznh2x3J5Tr7lhB+gcDXm6OA=","subject":"CN=Telenor Norge AS Dealer G2 CA,O=Telenor Norge AS,C=NO","subjectDN":"MFAxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSYwJAYDVQQDEx1UZWxlbm9yIE5vcmdlIEFTIERlYWxlciBHMiBDQQ==","whitelist":false,"attachment":{"hash":"7845072fc6f1b355f9345a6ce52a2438a06f31436f734a5d5b37130bbdb64d31","size":1959,"filename":"9gdYrOp6FaFqRJ5-QJcz3vpuYebgu7hh-Vw15jpzzKk=.pem","location":"security-state-staging/intermediates/074f8517-9c34-4b75-88e0-2c24b553379c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9gdYrOp6FaFqRJ5+QJcz3vpuYebgu7hh+Vw15jpzzKk=","crlite_enrolled":false,"id":"25439fab-5fb0-406f-902f-84a905579e0f","last_modified":1591199862463},{"schema":1591167063096,"derHash":"LRskT6zq+tlHVbXpmqv3rJHFmdpzv6Rh7uuvtLlptck=","subject":"CN=Panteion Univ. of Social and Political Sciences Client SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHXMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUgwRgYDVQQDDD9QYW50ZWlvbiBVbml2LiBvZiBTb2NpYWwgYW5kIFBvbGl0aWNhbCBTY2llbmNlcyBDbGllbnQgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"9e41c8f1b7df552a4c991c34ef28ac4b6de98f4abf712a108a103a343b0ee714","size":3048,"filename":"xQvovgfn-eQF_oAgGtY1VdtWF8Cy81x6M6y01IOUqRQ=.pem","location":"security-state-staging/intermediates/803b8ba4-75d3-4b10-9089-3b52e7662628.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQvovgfn+eQF/oAgGtY1VdtWF8Cy81x6M6y01IOUqRQ=","crlite_enrolled":false,"id":"8213c2b2-aa66-4314-ae1d-26f7b9562096","last_modified":1591199862460},{"schema":1591167054203,"derHash":"6VKbQo+2c5C8ZFXXm6JDToFsVP5PNZkwy3Cdslb935Q=","subject":"CN=DigiCert High Assurance Trust Service ECC EV CA,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxODA2BgNVBAMTL0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"de06436b3a21e829632e0b079103d0155f88adbdbc35e4184178d5e16626e73e","size":1431,"filename":"MMkARzLCDka9T1FV6sAvs-cZUAaL2QbYfVCCeg3D0W8=.pem","location":"security-state-staging/intermediates/e2efbea3-a3f8-4d7b-9645-ba2d190125e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MMkARzLCDka9T1FV6sAvs+cZUAaL2QbYfVCCeg3D0W8=","crlite_enrolled":false,"id":"a9e0d855-db12-4790-a733-58040361f588","last_modified":1591199862458},{"schema":1591167060249,"derHash":"e2ugsXNlgQElA5XVR2QwN6aCFhVScLybpGs1jDt36Q4=","subject":"CN=Adobe Public Issuing CA,O=Adobe Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZG9iZSBJbmMxIDAeBgNVBAMTF0Fkb2JlIFB1YmxpYyBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"9fa10fb4c94ca524acfdaf55d748672b6bdf9af1d3bc554cecef45362e465647","size":1955,"filename":"m7KaH9Z-A0_S4XkUf0qbkb0a7hPwHRz8EHHcRjLCSMA=.pem","location":"security-state-staging/intermediates/3f6f7dda-b7e1-4553-aff4-1f18c36d0f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7KaH9Z+A0/S4XkUf0qbkb0a7hPwHRz8EHHcRjLCSMA=","crlite_enrolled":false,"id":"9e07316e-733c-4699-89c5-e189d67de109","last_modified":1591199862455},{"schema":1591167052726,"derHash":"1YwU+8AQDhHv5yCN1pFpYCVzPheG8acwOwYz4H9mHDk=","subject":"CN=CERTDATA SSL OV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBPViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"a7ba1f7c3b1be14cda8132b559c02a76768e4908267a62b581190dccbd617fe0","size":1297,"filename":"3fq1AiHgm5wPjtliqEAe6Hqe_TUKwGTHlpm_w85y2o4=.pem","location":"security-state-staging/intermediates/fa9997a5-72d8-43c8-bb04-befe0fe4ea62.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fq1AiHgm5wPjtliqEAe6Hqe/TUKwGTHlpm/w85y2o4=","crlite_enrolled":false,"id":"9d1610d0-eec4-4f89-b0f1-2c18a5a5fffa","last_modified":1591199862452},{"schema":1591167057183,"derHash":"jYPWn6YVqiaDsT14lEgsVCsLzxi7ktMPAV+0JHGvu2Y=","subject":"CN=TrustAsia ECC EV TLS Pro CA G3,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzM=","whitelist":false,"attachment":{"hash":"02177e95a053529e56a44df11a7524e3b40ddadc426f737c2d9c84e00dc43f28","size":1382,"filename":"xgkVHlf2XyODr7l-8b1HSx2m_0yRG8ZF5HdfiYwDwaY=.pem","location":"security-state-staging/intermediates/5b9163c5-db6d-4370-8fa7-c89bcf81e95b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xgkVHlf2XyODr7l+8b1HSx2m/0yRG8ZF5HdfiYwDwaY=","crlite_enrolled":false,"id":"b866ec0b-ef71-426c-8709-aab24aae0fbd","last_modified":1591199862449},{"schema":1591167055791,"derHash":"hg+OSYT8qqp4yH8HE/IDGBtX17VW/tl5zhTcoB/6SlQ=","subject":"CN=GEANT EV ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBFViBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"fc2b67c0063115937980d79c3e67247ea70cc6101c5985ad73310d907964164d","size":1264,"filename":"FFXxLheN9s893pVXnMlRnGpl8sSJRMnaghLMByYYI1Y=.pem","location":"security-state-staging/intermediates/ba5698b0-efb9-4bb2-b7c6-0a26fb3752a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FFXxLheN9s893pVXnMlRnGpl8sSJRMnaghLMByYYI1Y=","crlite_enrolled":false,"id":"49c9b36e-598e-45a0-8e4c-a7cf27e53b9a","last_modified":1591199862444},{"schema":1591167045220,"derHash":"405TXezfAKo3Tn1CiI5lCHTAOuKxW5oONNKJglXXFuA=","subject":"CN=TrustOcean Encryption365 Pro SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxLDAqBgNVBAMTI1RydXN0T2NlYW4gRW5jcnlwdGlvbjM2NSBQcm8gU1NMIENB","whitelist":false,"attachment":{"hash":"f786cc89df5476b284f6ebc8706f27d17d706e261be2f501c9fcce7d60c1386d","size":1260,"filename":"b73E5DRCm6VpQzKDNZJF6xWzf2fL62a-r0eJZj5f1_Y=.pem","location":"security-state-staging/intermediates/65f80d0b-45ab-4ac9-b896-274c7239ff7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b73E5DRCm6VpQzKDNZJF6xWzf2fL62a+r0eJZj5f1/Y=","crlite_enrolled":false,"id":"63e56db0-43ac-44a1-917f-aa5aaff3b271","last_modified":1591199862441},{"schema":1591167043562,"derHash":"0kGVxh+c2oVizXXpVWUZcJe9dN/AfOLR30FIi2mdxek=","subject":"CN=ZeroSSL ECC EV Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEcxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSYwJAYDVQQDEx1aZXJvU1NMIEVDQyBFViBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"823e3f2639582c72811e1ddf7900356ac05b194124fd81ee82b5aa37faa06fe4","size":1309,"filename":"A8f81KNlDx2NqB55PbT84Ofjg0xfNreLGekgTvDP594=.pem","location":"security-state-staging/intermediates/ccf60840-a6b7-4d19-9596-d073ce79f2df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A8f81KNlDx2NqB55PbT84Ofjg0xfNreLGekgTvDP594=","crlite_enrolled":false,"id":"34b2cd0f-9958-4f45-bdb3-24d3ba02ae86","last_modified":1591199862438},{"schema":1591167049789,"derHash":"TV9aea7wkkFf9oHZ+pWPJPv9dNJtP/0VO8YefBucmSA=","subject":"CN=Microsoft Azure TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNQ==","whitelist":false,"attachment":{"hash":"8532a51efeed07390debc1531004aa9806e82d2c1bda5e60b695ce6fe4671366","size":2276,"filename":"4i4h0jN9NROr1xKJI-TQ1Q_ZIfUjPMXtmWUsDR3Pjiw=.pem","location":"security-state-staging/intermediates/0452fd2e-1ec9-4596-8f27-0f60d31ce83f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4i4h0jN9NROr1xKJI+TQ1Q/ZIfUjPMXtmWUsDR3Pjiw=","crlite_enrolled":true,"id":"cd7edab9-0a83-4d7a-ac8f-b96aa4df559a","last_modified":1591199862435},{"schema":1591167048156,"derHash":"x3xf3ExlXJ3GkMucdvmPrtPD3s7wZMvNctQcWeVYf+s=","subject":"CN=TrustOcean Organization Validation SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMjAwBgNVBAMTKVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU1NMIENB","whitelist":false,"attachment":{"hash":"556a16e9adc4480fdb9e891eaeeed7d9e5985f01350398edeb90bb12a7902658","size":2109,"filename":"iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=.pem","location":"security-state-staging/intermediates/c2f7ee4a-a230-40fe-ae6d-7bac146e0fca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iuXy6C6fQ7WIvruSnxEwSvYjFOgeVw4HZdR0x0OFOVE=","crlite_enrolled":false,"id":"08d30c0e-cd9a-4c3e-b21d-ea273d69191b","last_modified":1591199862432},{"schema":1591167041835,"derHash":"6sATQ3DJ/6v8eutf0DwlFikPrlWFCBxAoI8ZyJq3v1s=","subject":"CN=Sectigo Partners - Client Authentication and Secure Email - ECC,O=Sectigo Limited,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxSDBGBgNVBAMTP1NlY3RpZ28gUGFydG5lcnMgLSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCAtIEVDQw==","whitelist":false,"attachment":{"hash":"41b0725f1556ca322a9a093945f10ac4a78ac9fd53f4f87424358588af90869e","size":1301,"filename":"3-iHJaeW0w8BOWRucLU59AureWRmw6oFBSFskSOxxFI=.pem","location":"security-state-staging/intermediates/920323a3-e248-43b6-a0ed-449746e19e5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3+iHJaeW0w8BOWRucLU59AureWRmw6oFBSFskSOxxFI=","crlite_enrolled":false,"id":"8bcfa0b2-e35e-49cd-844d-463a24f7f8b3","last_modified":1591199862430},{"schema":1591167040444,"derHash":"wv6s1nSHjHsMIyWi7O0KMz23eAqG3+w3WBAO/AEBxmU=","subject":"CN=GlobalSign Qualified Timestamping ECC CA 2020,O=GlobalSign nv-sa,C=BE","subjectDN":"MHsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFF1YWxpZmllZCBUaW1lc3RhbXBpbmcgRUNDIENBIDIwMjAxGTAXBgNVBGETEE5UUkJFLTA0NTkxMzQyNTY=","whitelist":false,"attachment":{"hash":"dfd5994848268b7d4c9f0e58d9d33bd62a38c8b8aa02ddff40fc64573747f716","size":1317,"filename":"vQb9MziuYR3JwsWUg7XIa11YjUtOFnw-FWOE5oq95uE=.pem","location":"security-state-staging/intermediates/ea9a711d-d96e-4a8f-ba89-26fdd8430750.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vQb9MziuYR3JwsWUg7XIa11YjUtOFnw+FWOE5oq95uE=","crlite_enrolled":false,"id":"ec8193b6-fea2-4dbb-aac4-1b1be84f8f6b","last_modified":1591199862427},{"schema":1591167046740,"derHash":"J38PyiY+EoVtuqTdCt8EIE9/mM/XLOnJOAfjd+NMiHY=","subject":"CN=GEANT eScience SSL CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBlU2NpZW5jZSBTU0wgQ0EgNA==","whitelist":false,"attachment":{"hash":"68075f9cd2cc60ade2eac547fc756af29513e6cfe214c0330fd8e350cd01b052","size":2458,"filename":"aMvT7rta1tsjwjUiL86lNQhPARjlTSPwT-vUCzjJnTM=.pem","location":"security-state-staging/intermediates/b4e71607-9e9f-44c1-bffc-f52f82c8345a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aMvT7rta1tsjwjUiL86lNQhPARjlTSPwT+vUCzjJnTM=","crlite_enrolled":true,"id":"7a3d933b-8c06-4e96-8918-dbe59b8b41b4","last_modified":1591199862424},{"schema":1591167038909,"derHash":"7tCpXn3jylPkpscqhrPxZMDCPjgPj2t5o0nvF4Q0LB8=","subject":"CN=Sectigo SHA-256 DV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBEViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"8ee56d8ef938ba4af2c0e70e0468c434181b9e82ca18f599691bb7386c8440de","size":1634,"filename":"HPMSsaUyVhFGoL9nU4W2uLB0hGaRXQ5DmhLQh_ivAOI=.pem","location":"security-state-staging/intermediates/2b7ba355-fdd1-40c5-931a-ab2ab80990db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HPMSsaUyVhFGoL9nU4W2uLB0hGaRXQ5DmhLQh/ivAOI=","crlite_enrolled":false,"id":"892ea545-f970-4099-82a0-cb0796cff322","last_modified":1591199862421},{"schema":1591167037484,"derHash":"K7RwAz1Xd9rC14r2E/HkZXkGvj31tuMx7Hn1zVNNh5s=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 05,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDU=","whitelist":false,"attachment":{"hash":"708973feef9a0edc66b4d44761ffe346c676de8fd48daf43a0b291c9f6e1d8d3","size":1479,"filename":"k09MzmwiRPkPmkpgmUtprMk_uALSVedNLtfOBkCMvXE=.pem","location":"security-state-staging/intermediates/61b61e47-26ee-4791-bd33-bd8d5c78ffbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k09MzmwiRPkPmkpgmUtprMk/uALSVedNLtfOBkCMvXE=","crlite_enrolled":false,"id":"76be9ace-5a84-46e5-ad9f-1035b065dfd0","last_modified":1591199862419},{"schema":1591167034523,"derHash":"HjNJzTZqk+We9BUqHkg9rGB2GExdRtTNoA5gk+/J5qM=","subject":"CN=University of West Attica TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTMwMQYDVQQDDCpVbml2ZXJzaXR5IG9mIFdlc3QgQXR0aWNhIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"ad55c1ebf554ac88c4ee7ca2a6ac10ede14cc708e9e9241628118eb06a7159ac","size":2820,"filename":"CyajdIEcy4Hr_cxQQqnu0qrnumFkHRMCTTcJDgIK41E=.pem","location":"security-state-staging/intermediates/70d67b10-99b6-4f51-b3b9-3f1e070e7f7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CyajdIEcy4Hr/cxQQqnu0qrnumFkHRMCTTcJDgIK41E=","crlite_enrolled":false,"id":"5c9fffc4-55de-4707-bf44-0dce68ff0d17","last_modified":1591199862416},{"schema":1591167036082,"derHash":"iDnSt3Z1HeaNMxJJjbtgjAiqT+cnpcMl2masgGTgV9M=","subject":"CN=Sectigo Partners - Code Signing - ECC,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gUGFydG5lcnMgLSBDb2RlIFNpZ25pbmcgLSBFQ0M=","whitelist":false,"attachment":{"hash":"88311f0ab36dc8818db8973c74ff16324387b6be5bd1ec65038a0fbb119eff0d","size":1256,"filename":"Mt57qGD4OmM1FA-J_hFGLzHI5GSYdHW8EafwJr2iBfk=.pem","location":"security-state-staging/intermediates/a19e812e-9cc8-45dd-8903-f7add99df475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mt57qGD4OmM1FA+J/hFGLzHI5GSYdHW8EafwJr2iBfk=","crlite_enrolled":false,"id":"763c8ffa-7dda-4f82-8a7f-98b654689f80","last_modified":1591199862406},{"schema":1591167032970,"derHash":"E5rDa9hTmLu7RYhofCDcNoJ9A6X0Kq34fwK+zEvpv8I=","subject":"CN=DigiCert Secure Site EV CN CA G3,O=DigiCert Inc,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIENOIENBIEcz","whitelist":false,"attachment":{"hash":"0b1f6ecad39cb939686ab17ee9e4168992c49d49dadf8783292a36743b0eabd0","size":1638,"filename":"q0mT-mtnAchq7xXJEtVo25yl_8a1e08EqUu2Ww5ybfQ=.pem","location":"security-state-staging/intermediates/1ce4670b-c3e7-4e29-9f89-30844efb4ed9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q0mT+mtnAchq7xXJEtVo25yl/8a1e08EqUu2Ww5ybfQ=","crlite_enrolled":false,"id":"bcd47841-6736-4533-bf49-4312192e3896","last_modified":1591199862403},{"schema":1591167027009,"derHash":"nGJKAXdk/Lo2NYZ5gEp1ys6V8ETwVd/fAlBfOwYBfzQ=","subject":"CN=Sectigo Partners - Server Authentication - ECC,O=Sectigo Limited,C=GB","subjectDN":"MGAxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUGFydG5lcnMgLSBTZXJ2ZXIgQXV0aGVudGljYXRpb24gLSBFQ0M=","whitelist":false,"attachment":{"hash":"965543ef4688c780b26fe4ee398172e77fae789ccc287dd22f669e4086c54e64","size":1280,"filename":"_WhZ_JfPDtfaL87jEAix_9CGklMDqSAXqw8H6I5WmaM=.pem","location":"security-state-staging/intermediates/1b383c95-777e-440f-b0ce-bee1a692cb46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/WhZ/JfPDtfaL87jEAix/9CGklMDqSAXqw8H6I5WmaM=","crlite_enrolled":false,"id":"7e08b5b4-31d8-4e72-8460-b0a5767bdada","last_modified":1591199862400},{"schema":1591167025307,"derHash":"89kW0bcyAfBJ7afll/4KXM1XEaaVj7wLem9/pk96/kc=","subject":"CN=National and Kapodistrian Univ. of Athens Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHVMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUYwRAYDVQQDDD1OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXYuIG9mIEF0aGVucyBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"f5375566c23535064bf73fff7c1447dfed381f69baaccfb60278db4b1df08068","size":2991,"filename":"po_dRQH7IGS9y25dkTis42QhTrBTBikFiq3x34kGvyg=.pem","location":"security-state-staging/intermediates/1604ec06-c741-4dcf-99b5-fb4336be8907.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"po/dRQH7IGS9y25dkTis42QhTrBTBikFiq3x34kGvyg=","crlite_enrolled":false,"id":"209b5f61-f0d0-43c6-b630-d4bc29799afb","last_modified":1591199862397},{"schema":1591167022088,"derHash":"hGT/6ymjrRfp1vRuSMXHJ8nXho2sAmK/JW4gs8+1WII=","subject":"CN=Sectigo SHA-256 EV Secure Server CA 2,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gU0hBLTI1NiBFViBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"49f7bd3efa4fcc0722a6f4605271d5fe0a5c1083d9dcbfbecd0ebf94310ad26e","size":1674,"filename":"ZFA27ke4TClASV6I0jW87lSWFo_b8drlh9D36Vzid1s=.pem","location":"security-state-staging/intermediates/0ae99740-9844-4cbd-9b4d-19f9519a49a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZFA27ke4TClASV6I0jW87lSWFo/b8drlh9D36Vzid1s=","crlite_enrolled":true,"id":"29f50ad4-1ef9-49cc-a491-3f8d8fdc0a06","last_modified":1591199862394},{"schema":1591167030041,"derHash":"S3BM2oDiRNQYaETw7yQrcMSxq02NiWFWjyjhLIl4TyM=","subject":"CN=Baidu\\, Inc. OV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gT1YgQ0E=","whitelist":false,"attachment":{"hash":"6ea162d68f2654682d4ebd9366bb52aa672edd57c7ae49ba447b5de53dccf6cc","size":2056,"filename":"YhO9UIj-GsxiTpBJJHAy3KMI3EVCiDbs7p2O02LNtXc=.pem","location":"security-state-staging/intermediates/fce8e914-285b-4edc-a752-7fac0e7445c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YhO9UIj+GsxiTpBJJHAy3KMI3EVCiDbs7p2O02LNtXc=","crlite_enrolled":true,"id":"ee7f153f-966e-43f0-8e29-7981b781986a","last_modified":1591199862392},{"schema":1591167028565,"derHash":"FGwc+bt9IxBg0Pq9mG6YUPAFAfWjt7asQsUbOMjiKiM=","subject":"CN=Inst. of Accelerating Systems and Applications TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGQMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFIMEYGA1UEAww/SW5zdC4gb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9ucyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3a570f3ca5ad4b439d7c8d33c6002d18626e99d07f0bf1e60eb24b7a1a11cd75","size":2946,"filename":"D7Xfk-7YUggnXZisbV8HX7kcYYgzDkMy57Y3cC1Fqqs=.pem","location":"security-state-staging/intermediates/ec795ad6-cbbb-4bad-9e87-bc160120bf58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D7Xfk+7YUggnXZisbV8HX7kcYYgzDkMy57Y3cC1Fqqs=","crlite_enrolled":false,"id":"d42142d3-081a-4ea8-8b46-ca780b098b0c","last_modified":1591199862389},{"schema":1591167015993,"derHash":"g8xQ4V0WmCSuvQvsv/r+c2vFWuIRvD7mM4+0c7kBWgc=","subject":"CN=TrustCor OV SSL CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFsxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJjAkBgNVBAMMHVRydXN0Q29yIE9WIFNTTCBDQSAtIEcyIC0gUlNB","whitelist":false,"attachment":{"hash":"0dc01364783a9271db505d8e1e3e6043cf875754d6bd36c6945e11fb53e02604","size":2385,"filename":"Mj3vTN7j1fDT_WCo762M8I9WedMYrlbBSvj8E4HDtuA=.pem","location":"security-state-staging/intermediates/173a1a2d-4f59-4194-99eb-916147b82f27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mj3vTN7j1fDT/WCo762M8I9WedMYrlbBSvj8E4HDtuA=","crlite_enrolled":false,"id":"38aa6198-2c05-4917-88c6-c6a161997f08","last_modified":1591199862386},{"schema":1591167018876,"derHash":"CDeZ6LK5AW5EcC6/m/NpziU/4fvrZQ5d8Q70TYe/O64=","subject":"CN=GEANT OV ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBPViBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"8192abe4c9a117dee4774f8edfcc12a8fb4c01e2f5d4fb1927f882b61391467b","size":1264,"filename":"nMY4vuFVgfkmWBODcb-TSGhs4sivegdluGYPGdmc-ac=.pem","location":"security-state-staging/intermediates/8ae9c209-ac28-4acd-9b6c-93323d2ba3cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nMY4vuFVgfkmWBODcb+TSGhs4sivegdluGYPGdmc+ac=","crlite_enrolled":true,"id":"e25e445b-40bc-4a3d-984e-f19238697009","last_modified":1591199862381},{"schema":1591167011546,"derHash":"ugMS97cva2S0zO40tfYoz2Wh87nxa43+etqQxU5HWhw=","subject":"CN=HARICA QWAC ECC SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),L=Athens,C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMSswKQYDVQQKDCJHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMRgwFgYDVQRhDA9WQVRHUi0wOTkwMjgyMjAxNzA1BgNVBAsMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExITAfBgNVBAMMGEhBUklDQSBRV0FDIEVDQyBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"3132a7793ecd22890d90a9b668b15a5bbb58368a0dde81dd5ab7909a6e210082","size":1435,"filename":"My5yT8M-8RZqS9wIe_1GKdv6BmFJetmYV8QXy2UQNVQ=.pem","location":"security-state-staging/intermediates/8c36ec80-60de-4cb2-8067-27d3459d9272.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"My5yT8M+8RZqS9wIe/1GKdv6BmFJetmYV8QXy2UQNVQ=","crlite_enrolled":false,"id":"e5adb388-5770-4b2d-ab78-9714ddd085c0","last_modified":1591199862378},{"schema":1591167009812,"derHash":"sdKb4BPPJ5gqqraUeFo+n1oWmmgvi404Z3aUZwxCgog=","subject":"CN=Volvo Car Corporation CA,O=Volvo Car Corporation AB,C=SE","subjectDN":"MFMxCzAJBgNVBAYTAlNFMSEwHwYDVQQKExhWb2x2byBDYXIgQ29ycG9yYXRpb24gQUIxITAfBgNVBAMTGFZvbHZvIENhciBDb3Jwb3JhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"a994d8a357cf9caa3a52dbedf3fa4253d4cae99e9da27e7249d2abb02c372362","size":1975,"filename":"UBZHXRQOIZeD5Wykj4uI2nNLlxdnTll9SO7dn-ejVYM=.pem","location":"security-state-staging/intermediates/398e9a7c-0468-4ca8-9ab4-9ea3b832ebe9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UBZHXRQOIZeD5Wykj4uI2nNLlxdnTll9SO7dn+ejVYM=","crlite_enrolled":false,"id":"8bf17c1a-a6d9-422b-adb9-93502ed40667","last_modified":1591199862375},{"schema":1591167017476,"derHash":"NFjH94fDD+mvPlinq2h3sZWat8wsRYGwcL3TjDm4Svc=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDE=","whitelist":false,"attachment":{"hash":"77d060f6db6e51cfdc717d3ed978a4be03a2a9b64b955fbecb64b0ccd4ced790","size":1479,"filename":"OZOx9JJC3JsSDSjFX2iEA3_ED6gCha3L1ZrOeRNoyx8=.pem","location":"security-state-staging/intermediates/6def578c-3064-4137-b8df-f2747fbfab93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OZOx9JJC3JsSDSjFX2iEA3/ED6gCha3L1ZrOeRNoyx8=","crlite_enrolled":true,"id":"4aac2f1d-7301-4a72-b32f-844df8079dc0","last_modified":1591199862373},{"schema":1591167014412,"derHash":"fogrHMVDm3+5WgWUPFqPQNrnWq27a2JMVe3ZRiTvoOM=","subject":"CN=ZIPAIR-Public-CA,O=ZIPAIR Tokyo\\, K.K.,C=JP","subjectDN":"MEUxCzAJBgNVBAYTAkpQMRswGQYDVQQKExJaSVBBSVIgVG9reW8sIEsuSy4xGTAXBgNVBAMTEFpJUEFJUi1QdWJsaWMtQ0E=","whitelist":false,"attachment":{"hash":"2c984e2131fa368ef2b5aa3b3e90a0922afa4740aabe97b5cb2019ab14830d37","size":1955,"filename":"PIUGed6DkU3CojfvzNyd5kHY3JiTqukpDDfDBatgs4g=.pem","location":"security-state-staging/intermediates/54e74715-f012-4611-b2a5-b2147fcad5bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PIUGed6DkU3CojfvzNyd5kHY3JiTqukpDDfDBatgs4g=","crlite_enrolled":false,"id":"169fb9d2-9eda-4150-b791-e966bdcafdda","last_modified":1591199862370},{"schema":1591167008071,"derHash":"U2ElE5cLnyZMpLzDv9hNvF/ndOPGKVs+u5nrnXQGnio=","subject":"CN=COMODO ECC Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIEVDQyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"dc36e4c286a9069d729c789a17603fc5652298f8bf2def86e601936c8873ae90","size":1382,"filename":"58qRu_uxh4gFezqAcERupSkRYBlBAvfcw7mEjGPLnNU=.pem","location":"security-state-staging/intermediates/6652ce0d-3c54-446e-ace4-ab3bf3abd2a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"58qRu/uxh4gFezqAcERupSkRYBlBAvfcw7mEjGPLnNU=","crlite_enrolled":false,"id":"8b11a693-e60e-4d6d-80ee-c38a1d65c423","last_modified":1591199862367},{"schema":1591167006644,"derHash":"zhW4jsoyo3HQtRs7BHWQVdao/ww9Gg1gSI3zVtwFDlU=","subject":"CN=STMicroelectronics Public User CA1,O=STMicroelectronics International N.V.,C=CH","subjectDN":"MGoxCzAJBgNVBAYTAkNIMS4wLAYDVQQKEyVTVE1pY3JvZWxlY3Ryb25pY3MgSW50ZXJuYXRpb25hbCBOLlYuMSswKQYDVQQDEyJTVE1pY3JvZWxlY3Ryb25pY3MgUHVibGljIFVzZXIgQ0Ex","whitelist":false,"attachment":{"hash":"18f50a255b00546467dd0cb80409b58291d5ab408250b7ea98a4d3dd53f0f322","size":2008,"filename":"gx_o4mBjRjGO5e2ioaSkT_ZBwzD0O9B-6SNRvTUnqMk=.pem","location":"security-state-staging/intermediates/648ed62b-e5f8-42d4-83ee-7ca6d40b6d44.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gx/o4mBjRjGO5e2ioaSkT/ZBwzD0O9B+6SNRvTUnqMk=","crlite_enrolled":false,"id":"540cc7e9-1df2-416a-96b6-d6176d4ee3ed","last_modified":1591199862364},{"schema":1591167023478,"derHash":"AMDLqVy/4eJwgUJ18ytQXW5ZFsK22mf69N0wnubobL4=","subject":"CN=DigiCert Secure Site ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"a51772df4a2b835008c2a8c8dc0deb86a5aaec98e9697ee63a20924af248b9b2","size":1337,"filename":"mpDMzjSYAgr-a1VhfWcSLkk3xG29zzCRDJISnBodNVg=.pem","location":"security-state-staging/intermediates/f09648f8-e528-485c-9101-53303017f3fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mpDMzjSYAgr+a1VhfWcSLkk3xG29zzCRDJISnBodNVg=","crlite_enrolled":false,"id":"2e3dc91b-19d5-4380-b3e9-3b54bf59c028","last_modified":1591199862361},{"schema":1591167003672,"derHash":"qv3O5Xk7XPS/LQxfYELYpCK8wzs5Zaxig9JzzGm0g3U=","subject":"CN=Sectigo SHA-256 EV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"bb0c7ed52a4ba2392ff048a5246e2367101f04ffd385b39e3f25798fd40060a7","size":1654,"filename":"KlGkFBm4cI6bwYi3-GIwgmgYzH3wAO3Gtlqk0GMInns=.pem","location":"security-state-staging/intermediates/7b9ca479-5606-4a77-b93a-fe3bb5a328c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KlGkFBm4cI6bwYi3+GIwgmgYzH3wAO3Gtlqk0GMInns=","crlite_enrolled":false,"id":"8f019901-9110-45b1-a5f0-88464c331fdf","last_modified":1591199862359},{"schema":1591166999172,"derHash":"fTW/BMhXKCtCLoUeqKYit10uzLq2XVumJZjB2koR1QI=","subject":"CN=University of West Attica Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHFMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTYwNAYDVQQDDC1Vbml2ZXJzaXR5IG9mIFdlc3QgQXR0aWNhIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"e76cfc440a5e991448c5b38f99766a4faa2a624e64bf18924a3a70f16a63e272","size":2901,"filename":"Bm78D1XrPXTGXm5_bdFOIATkxbrsQopzy-GvKlFzrUk=.pem","location":"security-state-staging/intermediates/6adea3d9-6cbe-4104-beb4-08ef22d8c125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bm78D1XrPXTGXm5/bdFOIATkxbrsQopzy+GvKlFzrUk=","crlite_enrolled":false,"id":"6eb82243-bae6-4111-a042-bcbbe5d9dd18","last_modified":1591199862356},{"schema":1591167012948,"derHash":"tBpIZPDU7E6mMtAbPn8jJ3XlXiKzv9hkLuEpIoDQ5Ho=","subject":"CN=DigiCert Basic EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"d2c3c0eb28e66976ac4acda4193e4e6b8892fa07ec37f9932f19408c824dc0a2","size":1654,"filename":"M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=.pem","location":"security-state-staging/intermediates/aae99adb-feec-4ec3-b8f8-06e4b7cc8071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M8wsUw9qVjgbOPT0Gb0ZignTvgWTwtAotFBG4daZQ1w=","crlite_enrolled":true,"id":"1a6503c7-0f5c-4cde-8e28-452c972f857e","last_modified":1591199862353},{"schema":1591167002071,"derHash":"SS7uizqm6sCMK3ipdvEz5+I6FDkhCAfcTHNPk1qvpbo=","subject":"CN=CERTDATA SMIME OV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHAxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMjAwBgNVBAMMKUNFUlREQVRBIFNNSU1FIE9WIENBICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"98241269a4b1f56f2d27a325260ce43c94609dbfaf15d3cede526f6777068c39","size":2117,"filename":"Dr3UcttDQ-gWx98s4F3mRweUcI5P3LlsRG88w3HyeDY=.pem","location":"security-state-staging/intermediates/c0410e24-a6b4-4f3e-b115-5cc80074fda2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dr3UcttDQ+gWx98s4F3mRweUcI5P3LlsRG88w3HyeDY=","crlite_enrolled":false,"id":"b03a064b-a5c5-43d1-ab97-33e8f885f4a7","last_modified":1591199862351},{"schema":1591166994812,"derHash":"k+M699owMFMNCQycVXYsrefq6UP4NDSdEFepDrZ/MGs=","subject":"CN=DigiCert QV TLS ICA G1,O=DigiCert\\, Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwgSW5jLjEfMB0GA1UEAwwWRGlnaUNlcnQgUVYgVExTIElDQSBHMQ==","whitelist":false,"attachment":{"hash":"e53ef7db1684caaae756089b951bc6e4365a4f5c50235345441db0a95fe9771c","size":1943,"filename":"z2OteA0mfCO56LKn5Y19lFMNUGHucFGGWmVD8x0rpLU=.pem","location":"security-state-staging/intermediates/04030cb6-4ee3-4cec-92bb-45022fc5c066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z2OteA0mfCO56LKn5Y19lFMNUGHucFGGWmVD8x0rpLU=","crlite_enrolled":false,"id":"e117a5f6-6353-4757-b12d-27c470add07c","last_modified":1591199862348},{"schema":1591166996250,"derHash":"DLZoT2AcQW+ZKolAmRSjKgwgmXFodfX3jsDEaxtXCZw=","subject":"CN=University of Western Macedonia Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHLMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTwwOgYDVQQDDDNVbml2ZXJzaXR5IG9mIFdlc3Rlcm4gTWFjZWRvbmlhIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"980754593a22fa62c9411e8446cb7058f9764009306b6036fb1346607ad0d57a","size":2926,"filename":"pe7vO9l5Xa6m3aQk0-_tXQkCapBdsBH-eRONUxuj8co=.pem","location":"security-state-staging/intermediates/1b7dc9d7-f2ed-44cb-a349-acd5e1892a99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pe7vO9l5Xa6m3aQk0+/tXQkCapBdsBH+eRONUxuj8co=","crlite_enrolled":false,"id":"53f37f97-31b5-44e3-85e5-e6ffef357ebd","last_modified":1591199862340},{"schema":1591166990437,"derHash":"F0S0dBAf5qkZNvXmAwfGPaWLiEBbBFMj3sjIwAF2r3c=","subject":"CN=National and Kapodistrian University of Athens TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGQMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFIMEYGA1UEAww/TmF0aW9uYWwgYW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"36053c828d125835e8d94289286aea2da2d611fec7d55eabcf9ed7ff6f47c393","size":2922,"filename":"PmFP9aUtjAk7nFzQ7X_3QtLDOEdeNBJ9s0RIbfOFB9Y=.pem","location":"security-state-staging/intermediates/54a5ee4d-75d7-428c-82ca-9a69b743198e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PmFP9aUtjAk7nFzQ7X/3QtLDOEdeNBJ9s0RIbfOFB9Y=","crlite_enrolled":false,"id":"bb3988df-aa14-46bc-8a96-cb5ed802ce77","last_modified":1591199862337},{"schema":1591166987528,"derHash":"ysBfTwUIEJkybc8nxNlwqKPqkU5nkq2swQSWEcntQ7o=","subject":"CN=SECOM Passport for Member PUB CodeSigning CA G1,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGaMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMTgwNgYDVQQDEy9TRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDb2RlU2lnbmluZyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"88cb4e998412b8161dd4cce63fae57821221160429b49ae302868eca99d858e1","size":2211,"filename":"svXZ_or9Iyq1IFvQhPesIt1V12hnn6Emvsxku1znTIQ=.pem","location":"security-state-staging/intermediates/b9f92943-09e8-4e6d-b04f-31095d30490d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"svXZ/or9Iyq1IFvQhPesIt1V12hnn6Emvsxku1znTIQ=","crlite_enrolled":false,"id":"cd8685fc-3e6f-4bb0-8774-0ae8d85693c5","last_modified":1591199862334},{"schema":1591166984645,"derHash":"l8S0QxYFXyalKh9mTOOFgAqWSoVSyZ0ryv1hjm2AdKA=","subject":"CN=DigiCert Basic ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"212fb078da2ffbb3ac1149f0dbd37bafc1c192f15595649f27ba9a328c516a96","size":1382,"filename":"Mg4fdox_AdxNXF8FVxl956AK4z_M3V3fNH5JYxAVfu4=.pem","location":"security-state-staging/intermediates/b674bdb2-2b94-4918-8068-2c0bcb83439d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mg4fdox/AdxNXF8FVxl956AK4z/M3V3fNH5JYxAVfu4=","crlite_enrolled":false,"id":"0c53b0b5-57c7-4119-9ba9-b6a454b96cfd","last_modified":1591199862328},{"schema":1591166993298,"derHash":"+4YtCEkljX2WtqKwFY0IFCJy5NPKglv/w2MF9dKBFsU=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 02,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDI=","whitelist":false,"attachment":{"hash":"089f758bacd904da828169799bc711fcbeb3ec968700dd5a8e37334f30a724e3","size":1479,"filename":"OhdUJ-wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=.pem","location":"security-state-staging/intermediates/ef80ac11-e55c-4e76-90b7-55a5776cb672.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OhdUJ+wrpPRtpX53tkyqVLKQoNpdCCWve8MQQaQDQ2A=","crlite_enrolled":false,"id":"747de98b-4252-4064-b892-7ad013087eee","last_modified":1591199862326},{"schema":1591166986072,"derHash":"N4NPpepA+/e2EZaVWWLhygVYhyQ15CBmU9P2IN2OmI4=","subject":"CN=GEANT OV RSA CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBPViBSU0EgQ0EgNA==","whitelist":false,"attachment":{"hash":"18b4437cd205bd9ac9702220d5adb3aa3cbabf10cec7c537606362b8d30ed943","size":2450,"filename":"j0qRK9S0oUba9b4ttZdKp42Q4T2J8S4FFKPNG5FTFVA=.pem","location":"security-state-staging/intermediates/cc610264-2385-48c0-8360-41da294451ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j0qRK9S0oUba9b4ttZdKp42Q4T2J8S4FFKPNG5FTFVA=","crlite_enrolled":true,"id":"91ec81f9-4c89-4c52-bf16-828510b256ac","last_modified":1591199862323},{"schema":1591166981675,"derHash":"9gbY3rJ8BAHzTntqN8jipR242gJr5YoH6FS2ht50xpo=","subject":"CN=KICA RSA DV CA,O=KICA,C=KR","subjectDN":"MDUxCzAJBgNVBAYTAktSMQ0wCwYDVQQKEwRLSUNBMRcwFQYDVQQDEw5LSUNBIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"318379d0564ebe89aa14dff5f62506a9553f6d9d680f10e82a54fa192e67f398","size":1569,"filename":"cK05Ok8jo8SXlxRdWcmPHjPUXO0-KqZKDWAQhEkCcCs=.pem","location":"security-state-staging/intermediates/d52fd294-49a6-40bb-a05a-5fdd485b772d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cK05Ok8jo8SXlxRdWcmPHjPUXO0+KqZKDWAQhEkCcCs=","crlite_enrolled":false,"id":"d1256819-e772-4787-a82e-3e8aaeb2120a","last_modified":1591199862320},{"schema":1591166988974,"derHash":"b+O0p6moUlWcHffqQH+vPZvxdvQOUaFF1XaQ+ih8BWs=","subject":"CN=Trust Italia Class 2 Consumer Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHExCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUQwQgYDVQQDEztUcnVzdCBJdGFsaWEgQ2xhc3MgMiBDb25zdW1lciBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7b226066c603caaf929b3d86c889809d734dce014b67e674ccd4a93d032dff0f","size":1752,"filename":"Y8cllDVPXsCqMnw5qEva_MDC_VRf4wx4J3MjppPCdmY=.pem","location":"security-state-staging/intermediates/0df5e9cd-f031-4578-a6e7-a9ffc40ef37b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y8cllDVPXsCqMnw5qEva/MDC/VRf4wx4J3MjppPCdmY=","crlite_enrolled":false,"id":"ba658967-ce3c-4045-b431-b94346eed3b3","last_modified":1591199862314},{"schema":1591166978625,"derHash":"2rP6DW6CEAb+cJrhIXarovOXcGzJxx9cHA0JgETa69w=","subject":"CN=HARICA QWAC RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),L=Athens,C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMSswKQYDVQQKDCJHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayAoR1VuZXQpMRgwFgYDVQRhDA9WQVRHUi0wOTkwMjgyMjAxNzA1BgNVBAsMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExITAfBgNVBAMMGEhBUklDQSBRV0FDIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"f227a120f73f7c94eea56c73047fd7bc0c8d6c1c7f2e43d3dc8bc4bfe55156dd","size":2568,"filename":"4_BwvJtY4Tb6_B1gdFJmSV4cG4FmBSDa7puZdnWS2Pk=.pem","location":"security-state-staging/intermediates/9864323a-90b7-4153-a038-810578cb55eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4/BwvJtY4Tb6/B1gdFJmSV4cG4FmBSDa7puZdnWS2Pk=","crlite_enrolled":false,"id":"310263a5-bb52-41c2-8048-2d24f253c95e","last_modified":1591199862312},{"schema":1591166977096,"derHash":"l6cYCCt47nSAl5shFtS6AhXGGqpSC0bKa5wqs3j0CCE=","subject":"CN=Sectigo SHA-256 OV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"7e3339701c1e2d499ba3def9492001c41adc810c4a458724657109305f3cec89","size":1613,"filename":"318hNJIiS7rMUgV2mjh-LHcZUnFNjtl4to5OuT2nr4s=.pem","location":"security-state-staging/intermediates/6f711398-7de9-46d1-bae2-5455d21b7f77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"318hNJIiS7rMUgV2mjh+LHcZUnFNjtl4to5OuT2nr4s=","crlite_enrolled":false,"id":"59c27eb3-4715-484a-82f5-7afdcdc2eedb","last_modified":1591199862306},{"schema":1591166972688,"derHash":"4cSwtb6SRx7sKI2yquyA++Bl+66MmppXaY172J8wcDE=","subject":"CN=CERTDATA SSL EV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBFViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"088b10c1c11e8d18ab606970a0a1d199bee8b60e73f3e3ace0f39fb2a23ad934","size":1325,"filename":"9vCfWQvK73Fpm-vFHRSFb1GMEe-jrHgkRGYDgnPa5M0=.pem","location":"security-state-staging/intermediates/64a98518-89e2-4dff-904a-5f9b145dff93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9vCfWQvK73Fpm+vFHRSFb1GMEe+jrHgkRGYDgnPa5M0=","crlite_enrolled":false,"id":"0971425c-d185-4d5e-bde8-ffbc73ce3ff6","last_modified":1591199862300},{"schema":1591166980064,"derHash":"nDXokHtUmiYAKUKnkY4y4URQP+NCJhsH2Cuw1J1z2RI=","subject":"CN=Trust Provider B.V. TLS ECC EV CA G1,O=Trust Provider B.V.,C=NL","subjectDN":"MFoxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMS0wKwYDVQQDEyRUcnVzdCBQcm92aWRlciBCLlYuIFRMUyBFQ0MgRVYgQ0EgRzE=","whitelist":false,"attachment":{"hash":"953d2f55cb4e36af74de0869d7a372e01732610473e423b3b655c9de264a2efd","size":1297,"filename":"lbgvzVAS_HD1uhWtKd_pFMrEGQXAJsWzN-B8qi3z2Jk=.pem","location":"security-state-staging/intermediates/9b32bfa2-9970-42cc-94f9-296198748c61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lbgvzVAS/HD1uhWtKd/pFMrEGQXAJsWzN+B8qi3z2Jk=","crlite_enrolled":false,"id":"3b26ac86-1633-45de-ac90-e6202efc1efe","last_modified":1591199862298},{"schema":1591166969828,"derHash":"6keT4uuBTUMmH4Borv3ng7g358AhrBnI6bCFUfLWyD8=","subject":"CN=University of the Peloponnese Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHJMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTowOAYDVQQDDDFVbml2ZXJzaXR5IG9mIHRoZSBQZWxvcG9ubmVzZSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"e434a384ec70a2f55224b8dba36988a5cc832b8efb47eff89c3e75c99a16d366","size":3897,"filename":"5FgD1hywYOFqq6q8GjfE0VbAd_BXMtIzKXSTe5rs_jU=.pem","location":"security-state-staging/intermediates/3c978eca-7a9d-4ea7-91c6-2b91b0add092.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5FgD1hywYOFqq6q8GjfE0VbAd/BXMtIzKXSTe5rs/jU=","crlite_enrolled":false,"id":"6efe66d3-a1a9-44c7-b6fb-84fed7ca0d86","last_modified":1591199862295},{"schema":1591166975559,"derHash":"ytA6WE5YU5uJGS7EnOp6bY7XJCrV3N+D+W0IfwnyMts=","subject":"CN=GEANT eScience SSL ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"ME4xCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSQwIgYDVQQDExtHRUFOVCBlU2NpZW5jZSBTU0wgRUNDIENBIDQ=","whitelist":false,"attachment":{"hash":"7db15ec19aae6dfd33627c70072ae0be041ec482c68931ac550f8e7ecbe82a38","size":1276,"filename":"nzYOlulDufoKXDgcAhC63BnT5t74_zG2ZFweTlq2pTA=.pem","location":"security-state-staging/intermediates/82fcc086-5e5e-43f4-b969-d11903a233b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nzYOlulDufoKXDgcAhC63BnT5t74/zG2ZFweTlq2pTA=","crlite_enrolled":false,"id":"3ae9678b-4310-42e4-8c4b-a2bd36359c71","last_modified":1591199862292},{"schema":1591166971277,"derHash":"MJ5sgAPP4bmr/d+86sK/24ftkniIl2Pk2MBvZgQGAfs=","subject":"CN=TrustOcean Organization Validation Pro SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxNjA0BgNVBAMTLVRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gUHJvIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"07bddd64aebedac19bab91ba8353765dd92a8b9a4f03b70b0a65f48dd0852316","size":1276,"filename":"wO_TPO2pacd9S4TXCA6ZK5sbowZLU3pvj1j4lewK054=.pem","location":"security-state-staging/intermediates/fadb40d2-243a-4c13-b44e-88de44fe0e39.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wO/TPO2pacd9S4TXCA6ZK5sbowZLU3pvj1j4lewK054=","crlite_enrolled":false,"id":"2f68d515-67c7-4d03-b155-933ce48d47a6","last_modified":1591199862289},{"schema":1591166966944,"derHash":"peSmK2AQBtwX5KyvSXd3v9fS8+Um/HDKHyIJTIyzkWY=","subject":"CN=Microsoft Azure ECC TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29mdCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDY=","whitelist":false,"attachment":{"hash":"7ddf736675486e01c80cd307d0f3193f2bbd4866fbd4cf47e6f478fe688f46a6","size":1479,"filename":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f_fOuKrsNiaSdA=.pem","location":"security-state-staging/intermediates/43b64ec8-51d9-48a3-8273-22a78716681e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yBjnrcmcUp2nylDRWnQvSPRspmhm1f/fOuKrsNiaSdA=","crlite_enrolled":false,"id":"f942e88e-4d39-4260-8629-7493a5de205f","last_modified":1591199862287},{"schema":1591166965541,"derHash":"vEicbcK94lP1hto0E01mQLi1g6MSCJzhCTPEvAP8XzM=","subject":"CN=University of Piraeus Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHBMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTIwMAYDVQQDDClVbml2ZXJzaXR5IG9mIFBpcmFldXMgQ2xpZW50IFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"0714cf4a610f08f71ee755e1a2bc9a6125e97457fc94bd11adbe1fbf13e199bc","size":2881,"filename":"aEyGET6vMUZ78LzXlMwp7zrJc54FqQbkEpltCsA0Ym0=.pem","location":"security-state-staging/intermediates/dbf2652a-44f6-4622-99f7-5a0260fb6902.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aEyGET6vMUZ78LzXlMwp7zrJc54FqQbkEpltCsA0Ym0=","crlite_enrolled":false,"id":"66be0711-b86b-410c-ba66-83267576a61b","last_modified":1591199862281},{"schema":1591166962590,"derHash":"ansqo0FAOaZj1di7q4JWo5eahMMyv14e6PbQ4K2oRmg=","subject":"CN=DigiCert QV EV TLS ICA G1,O=DigiCert\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKDA5EaWdpQ2VydCwgSW5jLjEiMCAGA1UEAwwZRGlnaUNlcnQgUVYgRVYgVExTIElDQSBHMQ==","whitelist":false,"attachment":{"hash":"da7ebd3537612c5ba7de71120be602b9e04c9127ce688075aa408dbe6025f441","size":1943,"filename":"WlGHvWN6kWbS5I0pZA1mzBa36H7tg_dkp0nOMyIfpIg=.pem","location":"security-state-staging/intermediates/fdd44b41-87a8-41b1-b24d-bc629efb1193.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WlGHvWN6kWbS5I0pZA1mzBa36H7tg/dkp0nOMyIfpIg=","crlite_enrolled":false,"id":"2b7934df-863e-4ca7-a586-c7e3f8289d51","last_modified":1591199862278},{"schema":1591166961182,"derHash":"mFFAkZNCI5yJCGsi38qkUIWQsRo94KQj4l68Pdr4kQ0=","subject":"CN=DigiCert Secure Site Pro ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLjAsBgNVBAMTJURpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFQ0MgQ04gQ0EgRzM=","whitelist":false,"attachment":{"hash":"abadc7dab3aa3ce9c3b3984b57de541e8e2155f1acb9659ec05255d0505f836a","size":1341,"filename":"ljUnYjVBy0mvbfWJdhWfQmd_OGXEqZ6sBA-BZTbrSVY=.pem","location":"security-state-staging/intermediates/69abe7b3-bea5-4ac4-b147-b7a9c256cfae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ljUnYjVBy0mvbfWJdhWfQmd/OGXEqZ6sBA+BZTbrSVY=","crlite_enrolled":false,"id":"d5251cce-28fd-44ee-97af-2b2fea57506d","last_modified":1591199862273},{"schema":1591166956588,"derHash":"xCTcOtYm1EP8rqlxA8tki552MryM2TyW2rsdYFk3IR0=","subject":"CN=Trust Italia Class 2 Managed PKI Individual Subscriber CA - G3,O=Trust Italia S.p.A.,C=IT","subjectDN":"MHQxCzAJBgNVBAYTAklUMRwwGgYDVQQKExNUcnVzdCBJdGFsaWEgUy5wLkEuMUcwRQYDVQQDEz5UcnVzdCBJdGFsaWEgQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"2b320fdd4d82aab2b8852ba0e230e7f6687512ad7a4d5bb5db260f796b144559","size":1756,"filename":"Y24lFs1PJyWMpmHV04a28-0WEzBV7ZwjGI-b6o_a1xE=.pem","location":"security-state-staging/intermediates/2607592c-0c94-43f5-88a4-9642f57c2771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y24lFs1PJyWMpmHV04a28+0WEzBV7ZwjGI+b6o/a1xE=","crlite_enrolled":false,"id":"1b18f8e1-bb52-4c71-a2b4-dd715bd30d34","last_modified":1591199862270},{"schema":1591166959669,"derHash":"e5d410LenRGp6AKurLE9W3D5CrT/fGPEEr7vQgJQElA=","subject":"CN=TrustOcean Encryption365 SSL CA,O=TrustOcean Limited,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxKDAmBgNVBAMTH1RydXN0T2NlYW4gRW5jcnlwdGlvbjM2NSBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"13a6ab9380accd50f6b136c0959380987299900d1e88f93608d04d9164ba247d","size":2093,"filename":"SQofq62FvYueQ205OJiQThWVUH_MQwaHQWw2twlwTDo=.pem","location":"security-state-staging/intermediates/fe167bbc-49ae-4867-b511-147e23b615bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SQofq62FvYueQ205OJiQThWVUH/MQwaHQWw2twlwTDo=","crlite_enrolled":false,"id":"958e59d8-df82-40f3-8891-c1afbc81139d","last_modified":1591199862267},{"schema":1591166958294,"derHash":"CE7KcKm0Dk4VY+NXdrcW5BCpcrsn7VHCSMSNMkL6ja8=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHWMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUcwRQYDVQQDDD5IRUFMLUxJTksgSGVsbGVuaWMgQWNhZGVtaWMgTGlicmFyaWVzIExpbmsgQ2xpZW50IFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"a6f0308fffdec71204189a96efafbbe956e995e60418265f274c6bd2476b8c78","size":3031,"filename":"_Kft_K_873z0mlP2VRjp4LH9H_mcuLMh9d5dMp190iM=.pem","location":"security-state-staging/intermediates/e9daf701-b37c-4436-a783-4b2fd35b7700.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Kft/K/873z0mlP2VRjp4LH9H/mcuLMh9d5dMp190iM=","crlite_enrolled":false,"id":"017d1e6a-3d57-4f28-bde8-d93e1818bf31","last_modified":1591199862264},{"schema":1591166952132,"derHash":"saj9QLQ33tly9XQ3BiLiu7L5uVk7wFBNfiAw8rJOZ/o=","subject":"CN=GEANT Personal ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBQZXJzb25hbCBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"bd13e9c72f30021203129679456a87eaec1c3ebc91620c3355c3c943cdf5c9d1","size":1272,"filename":"x9rdz7WXOhNwDB_vccBkt66zVPn9EqlDFEDj0tN29TE=.pem","location":"security-state-staging/intermediates/23ee9177-81be-49de-b088-b5e00cf4c5ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x9rdz7WXOhNwDB/vccBkt66zVPn9EqlDFEDj0tN29TE=","crlite_enrolled":false,"id":"d7220a44-b71d-43aa-aceb-9f6f42b35563","last_modified":1591199862262},{"schema":1591166953641,"derHash":"rgO5rRcQaih4WDCx3NY2eXxMZNgcuNFhWV26+DQz5kw=","subject":"CN=CrowdStrike OV SSL Issuing CA 2020,O=CrowdStrike Inc.,C=US","subjectDN":"MFUxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDcm93ZFN0cmlrZSBJbmMuMSswKQYDVQQDEyJDcm93ZFN0cmlrZSBPViBTU0wgSXNzdWluZyBDQSAyMDIw","whitelist":false,"attachment":{"hash":"d681fc0b6a1cbda829e8ebba97a30707ab2d95062c3ef6bce4b7e7555d3584cf","size":1792,"filename":"lHRUL7zqcHfSFUzbd0WqRZOXK57EqS8L6C4CJmQ5Npo=.pem","location":"security-state-staging/intermediates/8097ddb1-fac8-4626-acdd-d1b8ae316ae4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lHRUL7zqcHfSFUzbd0WqRZOXK57EqS8L6C4CJmQ5Npo=","crlite_enrolled":false,"id":"6aa2e51f-636d-455e-a044-c2edde8889f6","last_modified":1591199862259},{"schema":1591166947809,"derHash":"8bQTkri3zVpFay1Kkbe89szvIpS4tuYs/zj5w6J5bwY=","subject":"CN=GlobeSSL OV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIE9WIENB","whitelist":false,"attachment":{"hash":"6276193f8ef60a83e6b2a01cea8c469f7785960d98bb97c057e1ca2b3843e6a6","size":2085,"filename":"mfCBWjYYEugo1yhASbIoRwohL9WPkl5owslIdpTfCno=.pem","location":"security-state-staging/intermediates/4a4d3b84-603d-4f56-ae5f-96b87fd11076.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mfCBWjYYEugo1yhASbIoRwohL9WPkl5owslIdpTfCno=","crlite_enrolled":false,"id":"b2fe309b-8a3e-44b2-b214-099b8f793b32","last_modified":1591199862253},{"schema":1591166955049,"derHash":"IgBA3aN3yURCnozpE7fYGzbeNOvy3CGNIGY5PZSGNDk=","subject":"CN=Democritus University of Thrace TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTE5MDcGA1UEAwwwRGVtb2NyaXR1cyBVbml2ZXJzaXR5IG9mIFRocmFjZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"633a331af1df260887adfe035dd9a69e0eac22b2b0e008c5072c8e7173f0a5dd","size":3677,"filename":"hwhNNDnScyM0IPzP1QnWxg68NK1ZdubxLavxfWWRRq8=.pem","location":"security-state-staging/intermediates/eefd61d3-4ede-4b5b-8b11-2b05034967e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hwhNNDnScyM0IPzP1QnWxg68NK1ZdubxLavxfWWRRq8=","crlite_enrolled":false,"id":"f1b5b7ab-27cf-4b2f-8a24-24d137c1fd82","last_modified":1591199862251},{"schema":1591166946335,"derHash":"t+EkLZaU+1AlsJaWT6dq997Z9VrkpnpCCtxfnRGzrTM=","subject":"CN=CERTDATA SSL DV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHIxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNDAyBgNVBAMMK0NFUlREQVRBIFNTTCBEViBFQ0MgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"790d8b9e3ba565304aee9733ce4b0e0bfd2096f72e2e0601b8df408f07910a53","size":1293,"filename":"KCVGX9PZojp3nb42QFg8CInxwnSWCYZ4kG3HC87bf4o=.pem","location":"security-state-staging/intermediates/24bcf52a-aa3c-4d05-8236-9a1e72833516.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KCVGX9PZojp3nb42QFg8CInxwnSWCYZ4kG3HC87bf4o=","crlite_enrolled":false,"id":"404783d0-cde7-4f2f-a512-dc32c5183168","last_modified":1591199862248},{"schema":1591166941957,"derHash":"26wvrk+MlJsaMM+HHqtYlX9kILeXpRJVBrjO3Uj114Q=","subject":"CN=GEANT EV RSA CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMRowGAYDVQQDExFHRUFOVCBFViBSU0EgQ0EgNA==","whitelist":false,"attachment":{"hash":"a81d6464a4c6c0326479b46fc4a739c1ebd123cdfdd13ed5be6d44d55df9d953","size":2450,"filename":"BPjQDgce-sDBA1ay4Jv5JRXoEJZUq9x6xkxGPweoK8o=.pem","location":"security-state-staging/intermediates/957ee282-8db5-484b-b663-4f8f5fd4418b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BPjQDgce+sDBA1ay4Jv5JRXoEJZUq9x6xkxGPweoK8o=","crlite_enrolled":true,"id":"2d3008cc-2ef8-4483-8a08-556cf24cc117","last_modified":1591199862245},{"schema":1591166938789,"derHash":"tfTF0YWoyHx4tvZ9/c/U4buwc+d6JkRV2pYd2b6R0c4=","subject":"CN=ZeroSSL ECC Business Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"ME0xCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSwwKgYDVQQDEyNaZXJvU1NMIEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"f5c243c2a7e060190fd8f59984d77e4edc40f58294bf379fcdfdc67342935f80","size":1284,"filename":"joN60utJv0YtzK4dit_eZatsv9Qz7o9doV9ZOgCp2Y8=.pem","location":"security-state-staging/intermediates/922b61f4-a9a8-47c2-8bb5-04f65f00c145.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"joN60utJv0YtzK4dit/eZatsv9Qz7o9doV9ZOgCp2Y8=","crlite_enrolled":false,"id":"3a7be123-83ee-4956-b198-0fb8e0ba83f7","last_modified":1591199862242},{"schema":1591166949219,"derHash":"/nNANw1ZWjn/4Q3OIZdEfOZ8mL4o8DMMj8hd0DISSG0=","subject":"CN=XinChaCha Trust SSL Extended Validated,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xLzAtBgNVBAMMJlhpbkNoYUNoYSBUcnVzdCBTU0wgRXh0ZW5kZWQgVmFsaWRhdGVk","whitelist":false,"attachment":{"hash":"11c238131ce3dc238f6eaf26ec690ecf4d548a913c3c5bc452afce5fbc790b99","size":1776,"filename":"eMfyN-Ikg69beln4AW1OIVajdbo0bMtS7jlQTjdmeVM=.pem","location":"security-state-staging/intermediates/e6f8b0f0-9bb3-4ffd-b7bc-95b78916692e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eMfyN+Ikg69beln4AW1OIVajdbo0bMtS7jlQTjdmeVM=","crlite_enrolled":false,"id":"93b12a0d-0df4-4127-af9a-a1ef7dbef757","last_modified":1591199862239},{"schema":1591166943449,"derHash":"6tyA999jBWDMGzU/aOpmAVnOlm4i1ARYh4B4fAR20OQ=","subject":"CN=Greek School Network Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHAMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTEwLwYDVQQDDChHcmVlayBTY2hvb2wgTmV0d29yayBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"91da938723919124b3744b40cb7465eb0441bb9d657002500df3379c62df1aff","size":3356,"filename":"JZb0xnTbHxn3GgHZAAa8PyGC1eaFoUGTxOKLXnmjA5U=.pem","location":"security-state-staging/intermediates/681f152c-a338-407e-905a-352955fbadfa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JZb0xnTbHxn3GgHZAAa8PyGC1eaFoUGTxOKLXnmjA5U=","crlite_enrolled":false,"id":"95cec1f6-13e2-40e5-8b62-dbb5123c691d","last_modified":1591199862236},{"schema":1591166940293,"derHash":"PzsNaiB8UKWCnxsf4ca8O2YQYIV3RhTBIie3ZnKO0q4=","subject":"CN=ZeroSSL RSA EV Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEcxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSYwJAYDVQQDEx1aZXJvU1NMIFJTQSBFViBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"f28bd1dd2858c64b5c7d1c3058a2d544f0ea768abc37a7d72e159566eecca98e","size":2454,"filename":"25iQFhK1cn8vc_vird2SyolWQqiVsnbjTu9eZlX690I=.pem","location":"security-state-staging/intermediates/ddc002a3-f79f-459e-ac61-cdfd850062c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"25iQFhK1cn8vc/vird2SyolWQqiVsnbjTu9eZlX690I=","crlite_enrolled":false,"id":"c853522e-9668-40f2-8f15-ce50259bbbd8","last_modified":1591199862233},{"schema":1591166944923,"derHash":"cDQIhtCP4bCTFY8RpMwrKtRaZ/QCYyoEDpBnxuRH5P4=","subject":"CN=Telenor Norge AS OTL CA G2,O=Telenor Norge AS,C=NO","subjectDN":"ME0xCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSMwIQYDVQQDExpUZWxlbm9yIE5vcmdlIEFTIE9UTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"d438922f73cc95a79a030a5b88b1deff430948c8e65d26d6889657785975664c","size":1955,"filename":"XuXysKYz8525S8d1tzSylmtHnnsKgXMnjn2sP1DuoMo=.pem","location":"security-state-staging/intermediates/32ba931d-0b1a-4777-a7bd-9d236db04e41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XuXysKYz8525S8d1tzSylmtHnnsKgXMnjn2sP1DuoMo=","crlite_enrolled":false,"id":"d779a32d-7743-44cb-876e-eab354bd767c","last_modified":1591199862230},{"schema":1591166935697,"derHash":"aZGdgg7fWCrbz44JKpKE2QF3LuK0Geqd4fWHLHkfxvo=","subject":"CN=Thawte EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHzAdBgNVBAMTFlRoYXd0ZSBFViBSU0EgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"ce1818d94d078e469bacac8ce640901ec6f9ef4e08ee8ed1295da929ca3f4723","size":1626,"filename":"5jGxIiaHNj15fBcUBvvAsMfKNtiK_podXNf0YoRUoeI=.pem","location":"security-state-staging/intermediates/f5157a19-89e9-4513-9b51-b540e430b34c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5jGxIiaHNj15fBcUBvvAsMfKNtiK/podXNf0YoRUoeI=","crlite_enrolled":false,"id":"e05d537c-e98a-4c16-8476-344896c66748","last_modified":1591199862227},{"schema":1591166929792,"derHash":"ODkvF857aCwZjSnG5x0nQJZKIHTI0lWObP9kwngj8Sk=","subject":"CN=COMODO RSA Certification Authority,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIFJTQSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"f9fb67b8408e95dec2ccd730836629e9b9d21217185bc11efea7ba000d32c9b2","size":1963,"filename":"grX4Ta9HpZx6tSHkmCrvpApTQGo67CYDnvprLg5yRME=.pem","location":"security-state-staging/intermediates/866b660e-4e5e-4198-8a99-1bfad68e708d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"grX4Ta9HpZx6tSHkmCrvpApTQGo67CYDnvprLg5yRME=","crlite_enrolled":true,"id":"11673ac8-c50e-4666-a891-ff70f87c1a73","last_modified":1591199862224},{"schema":1591166937148,"derHash":"bKPl13ICFflFRFI+PEdLItppxzKuRV3IL49e4wLsVfw=","subject":"CN=Microsoft Azure TLS Issuing CA 01,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"9ed7588547d656029af2bccfd199a781d49253141c1b25fe3816f388e01a40ba","size":2276,"filename":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=.pem","location":"security-state-staging/intermediates/d1dd8476-0af4-4e05-ae35-f513f493a2a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NHwusbC7w844JzTmvIRIo8NL7D6StITK9phzFgtJi0w=","crlite_enrolled":true,"id":"54dcf0fb-88b2-43d1-b183-0d27f9f1ca7e","last_modified":1591199862221},{"schema":1591166925354,"derHash":"yE485bLKhdXfmHLf3awqoDrWJyV6/ZL39yCZLQA9hHw=","subject":"CN=TrustCor OV Email CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFcxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIjAgBgNVBAMMGVRydXN0Q29yIE9WIEVtYWlsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"81ae2e960751b130d0b99f592bb364874c086c4953fc4713f9acde4303430257","size":2487,"filename":"5_U9kCeaRySTk4HsUFuOXpJ_NJ08eeHqbukItZJ_DmA=.pem","location":"security-state-staging/intermediates/e7f12a82-e8f6-40a3-a1df-8d55d14e713e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5/U9kCeaRySTk4HsUFuOXpJ/NJ08eeHqbukItZJ/DmA=","crlite_enrolled":false,"id":"2bc63522-d07a-4d32-b1dc-4fa0c956f17c","last_modified":1591199862219},{"schema":1591166928355,"derHash":"vJE3miHnveEbRVvx1RGGMxaCgFpKNTqO4lj3oDcGxmQ=","subject":"CN=DigiCert Secure Site Pro EV ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMTAvBgNVBAMTKERpZ2lDZXJ0IFNlY3VyZSBTaXRlIFBybyBFViBFQ0MgQ04gQ0EgRzM=","whitelist":false,"attachment":{"hash":"175f55c6e184737a8ef08da7da2ba8eeb68ccb7a8f4c26cb4135728b20cc7228","size":1374,"filename":"ABohyUv2yKwrj07ViEB9SgfSMpe6-G4RvaB7869gYaQ=.pem","location":"security-state-staging/intermediates/62c0ef15-c0da-4ff8-958c-8a5f9420afe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABohyUv2yKwrj07ViEB9SgfSMpe6+G4RvaB7869gYaQ=","crlite_enrolled":false,"id":"0197f7a1-e219-43b2-b473-43a75d63a1a6","last_modified":1591199862216},{"schema":1591166931233,"derHash":"9lG1yq2Qm8SzM6TDzHN76crUmJD7ltItvB4h438NtVE=","subject":"CN=Sectigo Partners - Client Authentication and Secure Email - RSA,O=Sectigo Limited,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxSDBGBgNVBAMTP1NlY3RpZ28gUGFydG5lcnMgLSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCAtIFJTQQ==","whitelist":false,"attachment":{"hash":"45e2cb2916cebbc90466fd2304cb16497db3d816cf32d7d3cebe897ace744a9c","size":2280,"filename":"89Ol1fIDO-V67gTYc90uHy6AX2aUkT-e7bZJZPsPRDY=.pem","location":"security-state-staging/intermediates/46453155-431d-4965-a199-bbcc878c82de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"89Ol1fIDO+V67gTYc90uHy6AX2aUkT+e7bZJZPsPRDY=","crlite_enrolled":false,"id":"db218d0f-2b15-4354-b0c0-aa1aeb5bad5c","last_modified":1591199862213},{"schema":1591166934097,"derHash":"jG24FxrmeF8FQmrljD0291WTUiAukgm50psb1EeWHcg=","subject":"CN=SECOM Passport for Member PUB CA5,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTU=","whitelist":false,"attachment":{"hash":"778625b74bb48d643b387a0656870db1b5624e8da9cf6eb4625cb095b6badcbe","size":1833,"filename":"v3h5R_3OzMC-NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=.pem","location":"security-state-staging/intermediates/93efcc52-53a0-4409-91be-be430a0c43f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3h5R/3OzMC+NBXKj05v4LQG5laFzE9fB4KsGpwAMtk=","crlite_enrolled":true,"id":"54d7197f-50f6-43db-a133-6f98696362d5","last_modified":1591199862210},{"schema":1591166922501,"derHash":"BHeVeFzc/55uCuEiSS5be/CKnlxJdi4ry1J0fGkDFWE=","subject":"CN=NETLOCK Trust EV CA 3,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMR4wHAYDVQQDDBVORVRMT0NLIFRydXN0IEVWIENBIDM=","whitelist":false,"attachment":{"hash":"5baaa1ca8ca90156561df8c1bc2cd10801794f20c1984d55bbcedeb1417c7dd2","size":2203,"filename":"vRSkgbqFoy29lSNM6Ih557Nl-K07Rwh3GriW7t3fMJw=.pem","location":"security-state-staging/intermediates/7c1161bd-10bb-4642-b809-92c87a367bf2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vRSkgbqFoy29lSNM6Ih557Nl+K07Rwh3GriW7t3fMJw=","crlite_enrolled":false,"id":"75389d14-b6d9-4b99-8f96-a61e30aaa117","last_modified":1591199862208},{"schema":1591166926812,"derHash":"yYFBK1WBDDfBgm0kZn0ayos21uvwmm2MjlRZBT/hweU=","subject":"CN=CrazySSL ECC CA,O=TrustOcean Limited,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"747b534a20d09d3120dad524bafdfbf5cb11711b35f79294ed033004fb14560b","size":1232,"filename":"ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe-OCri6lbwMZgQ=.pem","location":"security-state-staging/intermediates/36d8be0c-e7bf-47dc-9c16-a44982c5b45a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZQQdhiUGJKIn2qNuTwRgNkaJQk3QRe+OCri6lbwMZgQ=","crlite_enrolled":false,"id":"fac0b4a6-912b-4c27-9d25-3f313e16c85e","last_modified":1591199862202},{"schema":1591166921097,"derHash":"iKuWH2T5No9MTRMH9Z1OWcXlcPhSpsUROo/yjgQxUVc=","subject":"CN=Atos TrustedRoot Client-CA for Worldline 2020,O=Atos,C=DE","subjectDN":"MFQxNjA0BgNVBAMMLUF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBXb3JsZGxpbmUgMjAyMDENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"8895b7aafb7411c125d5f5f5e5c9cc15845e1090369326b33c602d60f278f664","size":2008,"filename":"zPRLgkk0XdrL8_6Lzu5ze4i8hb4_92LoMI-3ehy---c=.pem","location":"security-state-staging/intermediates/197f3e64-6163-4266-a36d-a1f82bbc2ed3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zPRLgkk0XdrL8/6Lzu5ze4i8hb4/92LoMI+3ehy+++c=","crlite_enrolled":false,"id":"5bdbdd05-0f5d-45cc-8395-71ce201b26dc","last_modified":1591199862199},{"schema":1591166919650,"derHash":"TUC18q3mX5K6SHoN0TnaJ1YSIAwcBpVR1Vdh0xr+9U0=","subject":"CN=TrustOcean Organization Software Vendor CA,O=TrustOcean Limited,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxMzAxBgNVBAMTKlRydXN0T2NlYW4gT3JnYW5pemF0aW9uIFNvZnR3YXJlIFZlbmRvciBDQQ==","whitelist":false,"attachment":{"hash":"e39d05e5f9c53252def849bf70674041fa74e229d6f216deade7fa12494cb266","size":2081,"filename":"DNaN9ECmC5lN-TJRanHzxHgUnOqZKkkYnFou0gIs0Rs=.pem","location":"security-state-staging/intermediates/013ea5f1-eeed-4770-b182-f088fce7cf3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DNaN9ECmC5lN+TJRanHzxHgUnOqZKkkYnFou0gIs0Rs=","crlite_enrolled":false,"id":"12d3c939-3013-4a58-bb98-f8641d3f5b70","last_modified":1591199862196},{"schema":1591166923906,"derHash":"0DgqxYGfla0QI4y+bjxO09gkHNlU0mU/6kcKyfOQzU0=","subject":"CN=GEANT eScience Personal CA 4,O=GEANT Vereniging,C=NL","subjectDN":"ME8xCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSUwIwYDVQQDExxHRUFOVCBlU2NpZW5jZSBQZXJzb25hbCBDQSA0","whitelist":false,"attachment":{"hash":"0c9a8a1c3c7a80001a8265136dbe7ab0ca180b5cb986f88f590c1306ef88e1e4","size":2467,"filename":"E5rMC3LvWxbIbmC1yqxjOfCRXR4VmimCyZ810qKd2yc=.pem","location":"security-state-staging/intermediates/1865fc47-5288-451c-bc32-7bcf66172e9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E5rMC3LvWxbIbmC1yqxjOfCRXR4VmimCyZ810qKd2yc=","crlite_enrolled":false,"id":"2ad040cf-f92c-4396-a43f-3ff1ceaf2e87","last_modified":1591199862194},{"schema":1591166918242,"derHash":"OZWwGheACuz1SA6TnZ2kTtzMfPKTVlfGF51aHvol100=","subject":"CN=Athens University of Economics and Business TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGNMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFFMEMGA1UEAww8QXRoZW5zIFVuaXZlcnNpdHkgb2YgRWNvbm9taWNzIGFuZCBCdXNpbmVzcyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"11ea0406dfeeaa9f5ad947fa44f5668e897816a0cef799c302cf631508960b47","size":2877,"filename":"oHI6zIj2JBHJtqjt17sQSYylYI0zRaSACkBuS9578tg=.pem","location":"security-state-staging/intermediates/62628027-0ac7-4ce7-9faf-8e1d69efd621.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oHI6zIj2JBHJtqjt17sQSYylYI0zRaSACkBuS9578tg=","crlite_enrolled":false,"id":"73ad1e50-a261-4fd2-ad3f-4bdaad97c2af","last_modified":1591199862191},{"schema":1591166916773,"derHash":"YCHUo83r2Y1SmCNfWIH0uWnXHUPz7j3xVr8jYwsHrjs=","subject":"CN=GEANT eScience Personal ECC CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MFMxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSkwJwYDVQQDEyBHRUFOVCBlU2NpZW5jZSBQZXJzb25hbCBFQ0MgQ0EgNA==","whitelist":false,"attachment":{"hash":"a15cf405c7906db643b095bf625ec35404ec455eb1daec286aa2e13426ab47bb","size":1284,"filename":"2NMssuhH5JflFnMKpNfoZDqlv-C0lZhqf9O7FKDzn2k=.pem","location":"security-state-staging/intermediates/b482da9b-0ede-43e3-8d72-41cf5e16dc3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2NMssuhH5JflFnMKpNfoZDqlv+C0lZhqf9O7FKDzn2k=","crlite_enrolled":false,"id":"c2502c1a-de63-491e-865a-683fb594c4ee","last_modified":1591199862185},{"schema":1591166909159,"derHash":"f4FM0UVJAKwTMTZLa23ga4fMjLmTbsWDEAgichBX06M=","subject":"CN=Sectigo SHA-256 DV Secure Server CA,O=Sectigo Limited,C=GB","subjectDN":"MFUxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLDAqBgNVBAMTI1NlY3RpZ28gU0hBLTI1NiBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"96985e5b8fc9114fc1bf6fb46c70668299157f698f5a03a51844df4b86d1c687","size":1613,"filename":"VrhAF5b9APFDNaFQfbVHB1xrJSjOWlQAmlz3WdQFkqE=.pem","location":"security-state-staging/intermediates/95b7263b-b946-4b1b-97fc-588b469275fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VrhAF5b9APFDNaFQfbVHB1xrJSjOWlQAmlz3WdQFkqE=","crlite_enrolled":false,"id":"75e0caaf-9db0-4002-8fc9-28e0a8675dd8","last_modified":1591199862181},{"schema":1591166907750,"derHash":"Bf/GS4/FO3n1ucYpYevMrLoZMdUPNNAU6SnrACtb2DI=","subject":"CN=Sectigo Partners - Server Authentication - RSA,O=Sectigo Limited,C=GB","subjectDN":"MGAxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUGFydG5lcnMgLSBTZXJ2ZXIgQXV0aGVudGljYXRpb24gLSBSU0E=","whitelist":false,"attachment":{"hash":"34622395c087b9ecdf1001a6e9b02b94a16f0b8b5740c5fa10c266d6d293ea31","size":2255,"filename":"KnIj02v94up0vjV7A3aidbRS7a3ZTae0ANppOclqdzs=.pem","location":"security-state-staging/intermediates/702a1c60-d97b-4507-b9f5-08eb480da6df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KnIj02v94up0vjV7A3aidbRS7a3ZTae0ANppOclqdzs=","crlite_enrolled":false,"id":"adec9cb0-b198-46a2-8796-b1f419db6d26","last_modified":1591199862176},{"schema":1591166912114,"derHash":"ZfbCtEFU9cZCXzwcWyblyeNXF6/29FG9IWpiT0j6Br8=","subject":"CN=Microsoft Azure TLS Issuing CA 06,O=Microsoft Corporation,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKjAoBgNVBAMTIU1pY3Jvc29mdCBBenVyZSBUTFMgSXNzdWluZyBDQSAwNg==","whitelist":false,"attachment":{"hash":"d23b9e148f80dcabe98cab74d01cf619cd6c75b4f333e73266ccd4eda1a59efc","size":2276,"filename":"Wl8MFY-9zijGG8QgEHCAK5fhA-ydPZxaLQOFdiEPz3U=.pem","location":"security-state-staging/intermediates/c7b3c306-3cae-4f8c-9796-9857ff2613fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wl8MFY+9zijGG8QgEHCAK5fhA+ydPZxaLQOFdiEPz3U=","crlite_enrolled":true,"id":"67e78f14-8519-4508-b33f-9886e4cc3385","last_modified":1591199862173},{"schema":1591166901999,"derHash":"jNco+cM5G6Q2ChDGbKSEyAdlHWIH8QYzZp7YiB/pG/U=","subject":"CN=CrowdStrike Global EV CA,O=CrowdStrike\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRowGAYDVQQKExFDcm93ZFN0cmlrZSwgSW5jLjEhMB8GA1UEAxMYQ3Jvd2RTdHJpa2UgR2xvYmFsIEVWIENB","whitelist":false,"attachment":{"hash":"aeae72b6b6e2f2f8a2aa8ada26064ad98f11711c82a084d34471dd8ada45bc94","size":1853,"filename":"jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=.pem","location":"security-state-staging/intermediates/983271b4-b453-4809-8582-3af405f54fdc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jbtEGKuN8b5BZ9dJqvvW9XPxqqghhmKxB6nuThNyJd8=","crlite_enrolled":false,"id":"edfeea6f-0f8a-4a58-a196-634c0ea181e0","last_modified":1591199862165},{"schema":1591166913573,"derHash":"ApN5EY5XdSJsVNcYKjZ6JAtRdw9QEbs1F3z9F9myRFo=","subject":"CN=Deutsche Telekom AG secure email CA E02,O=Deutsche Telekom AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNEZXV0c2NoZSBUZWxla29tIEFHMTAwLgYDVQQDDCdEZXV0c2NoZSBUZWxla29tIEFHIHNlY3VyZSBlbWFpbCBDQSBFMDI=","whitelist":false,"attachment":{"hash":"6e88e41a6082feb041571a75be3c7b654d5697d0db3ceffb0299e4690d8d5fd4","size":2312,"filename":"212l6lxrSA898ktySyw4XkR_tW58YtsNEmSrE5hy0fc=.pem","location":"security-state-staging/intermediates/a35a70fa-aad1-4273-b4f6-96a9aff12f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"212l6lxrSA898ktySyw4XkR/tW58YtsNEmSrE5hy0fc=","crlite_enrolled":false,"id":"2b4e8679-20ae-4985-a806-2a5e63507ac3","last_modified":1591199862162},{"schema":1591166906381,"derHash":"HpU+FRI6leRwRL+vBrGXT7mXa4T0Nx69d/itge/QXAA=","subject":"CN=CEDEFOP Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIGzMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSQwIgYDVQQDDBtDRURFRk9QIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"5983f161ec520da3023c0007656827199a31a855fdd2eb9b90bdeaae9b89390a","size":2893,"filename":"uwdG75MlCgrDelaIfeRDM31eTTu4dGBtOwv0vvamoqA=.pem","location":"security-state-staging/intermediates/4c553782-18e1-4296-8988-79845d8a1322.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uwdG75MlCgrDelaIfeRDM31eTTu4dGBtOwv0vvamoqA=","crlite_enrolled":false,"id":"10207011-b3ed-4c07-806d-0ca7a15f67e7","last_modified":1591199862159},{"schema":1591166899084,"derHash":"pLK0dUVVn1//t83aehIg5i+3TRt6mk1NrLKyqDnOdFY=","subject":"CN=DigiCert Secure Site EV ECC CN CA G3,O=DigiCert Inc,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVWIEVDQyBDTiBDQSBHMw==","whitelist":false,"attachment":{"hash":"fe2667a1a90e9632c52d9fbaa7270f136842dcb2a58d926acb1094829bab3c83","size":1370,"filename":"k53DKcmdvTrcweDtMvf_MKTy3iBxavrlU-riK2LCoiQ=.pem","location":"security-state-staging/intermediates/b5412eae-7d6f-41c0-89be-66ca27c50b2d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k53DKcmdvTrcweDtMvf/MKTy3iBxavrlU+riK2LCoiQ=","crlite_enrolled":false,"id":"205d8820-e751-432c-9078-56282ef45802","last_modified":1591199862156},{"schema":1591166893168,"derHash":"Je7RMdcZNZfkjU42U2zFz/v56yBCxiVzrolo2KNpXxw=","subject":"CN=University of Piraeus TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHcxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS8wLQYDVQQDDCZVbml2ZXJzaXR5IG9mIFBpcmFldXMgVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"550cd132d0b40f0576ab9d26a6f5bf1dc59ff3e329b9631757e620752e685318","size":2800,"filename":"yoaRLzm23zeQXpsVd163dslqNpFi19V_XBBOcxeUJWo=.pem","location":"security-state-staging/intermediates/6c2fcd65-e0b3-4577-b113-10ecfe46cc56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yoaRLzm23zeQXpsVd163dslqNpFi19V/XBBOcxeUJWo=","crlite_enrolled":false,"id":"c232a4ca-24ba-45bd-88a7-77cd5d193f7e","last_modified":1591199862154},{"schema":1591166903471,"derHash":"ctD3y/RSm4DDSny7Q4vR0OH8JugOWcvU/XMU/N3w6ZQ=","subject":"CN=DigiCert High Assurance Trust Service EV CA,O=DigiCert Inc,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxNDAyBgNVBAMTK0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIFRydXN0IFNlcnZpY2UgRVYgQ0E=","whitelist":false,"attachment":{"hash":"0aa319cc69c625abdd0fac5d90509c1840a629bc7b17f7130b545c0bfd57c6eb","size":1699,"filename":"HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=.pem","location":"security-state-staging/intermediates/3af22c45-79a8-47ec-b3d0-1aeade14957b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HA5OXoZpETZhlPuW6jLvs2pyRrgxtQPRGRxa5tAQugE=","crlite_enrolled":false,"id":"581603f2-07f6-428c-bee1-1efb081ee0c2","last_modified":1591199862149},{"schema":1591166900577,"derHash":"YoBqPZQu1PbAkaEx5jY7E43WOlw830QT0AzIoMMzqfg=","subject":"CN=CERTDATA SSL OV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBPViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"2f80f47c488ec7412b055557852db65a46130e869818968c2e1abd16dfde9038","size":2129,"filename":"j329Y60dfipsfu2WQjIJzo3bfYjWBMO0L6-erwtRMEM=.pem","location":"security-state-staging/intermediates/ac48c1cf-d260-4b4a-beb7-599ef5ee1de8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j329Y60dfipsfu2WQjIJzo3bfYjWBMO0L6+erwtRMEM=","crlite_enrolled":false,"id":"538da95e-219e-4f04-9887-5ef9291a70ab","last_modified":1591199862143},{"schema":1591166887418,"derHash":"qONS2wyOJ7rlg9AVFG6Led7gkdVjj1g6DEQvO/Vd7rM=","subject":"CN=Inst. of Accelerating Sys and Applications Client RSA SubCA R2,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHWMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMUcwRQYDVQQDDD5JbnN0LiBvZiBBY2NlbGVyYXRpbmcgU3lzIGFuZCBBcHBsaWNhdGlvbnMgQ2xpZW50IFJTQSBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"13056507a245291565a35702e8a516a852c5655e71152a9aa83d1952fbc2e8ee","size":3019,"filename":"zgmH0SdYDJGk955F1_GyB2cxMwfYJTe5cQw86vwds4o=.pem","location":"security-state-staging/intermediates/af60a983-8e6b-42d9-8628-b6b31228e1b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zgmH0SdYDJGk955F1/GyB2cxMwfYJTe5cQw86vwds4o=","crlite_enrolled":false,"id":"091a0fcb-58b7-4cca-9ae4-c64ea842282e","last_modified":1591199862132},{"schema":1591166894678,"derHash":"2gxJgfYzbgbBKffoFDsqVKqFoUpjykT84s3cae7niMk=","subject":"CN=Ionian University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHMxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSswKQYDVQQDDCJJb25pYW4gVW5pdmVyc2l0eSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"86df2e731f35984856a01fe3f4dd74d61e7b0c1d84cd76b17bb01d4e0e90568a","size":2779,"filename":"tQEYBAU52znFOxCYz6CBZu4mfcBhcZVQIztFuFsaj5w=.pem","location":"security-state-staging/intermediates/2622e890-355a-4626-b276-90bc8df7aa57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tQEYBAU52znFOxCYz6CBZu4mfcBhcZVQIztFuFsaj5w=","crlite_enrolled":false,"id":"8abdff0c-264b-47ce-9085-9d5f2b8e9c0a","last_modified":1591199862129},{"schema":1591166896111,"derHash":"6kI/GzsbUp0cfbmiGvh9x43nJZVV4pi6JsY88SdakSw=","subject":"CN=Baidu\\, Inc. DV CA,O=Baidu\\, Inc.,C=CN","subjectDN":"MD8xCzAJBgNVBAYTAkNOMRQwEgYDVQQKEwtCYWlkdSwgSW5jLjEaMBgGA1UEAxMRQmFpZHUsIEluYy4gRFYgQ0E=","whitelist":false,"attachment":{"hash":"4d24e6e2737c306ddb3da55bc36a62f0205cbf4ede28147d78ad6ce31bd2a2b0","size":2056,"filename":"XDCvV-xbAMAx9ilt0xDgWpOhUuTMeTe4IRR7qYMYfJA=.pem","location":"security-state-staging/intermediates/44bb90ea-7bfd-4581-9df0-a2132775710d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XDCvV+xbAMAx9ilt0xDgWpOhUuTMeTe4IRR7qYMYfJA=","crlite_enrolled":false,"id":"fa66d869-faf6-42b8-b838-e3f95942d6cc","last_modified":1591199862126},{"schema":1591166890348,"derHash":"1hnzJXuYdW0ogR087pra2LyuG0Nnu7DHP2teVY+6RWM=","subject":"CN=DigiCert Basic EV ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IEJhc2ljIEVWIEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"41848d17b98767397ec8bf100d1dfe140c4770ad085d9c802b3d8c7b949b96e7","size":1378,"filename":"yE_naogfFzNf_bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=.pem","location":"security-state-staging/intermediates/134279b7-bda6-4c1c-8662-4961873f1071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yE/naogfFzNf/bv3qdwlxZJxaARkFaKc5DZu2mp6Q34=","crlite_enrolled":false,"id":"99330272-0e3e-4df5-9535-55e2097b7ee6","last_modified":1591199862124},{"schema":1591166884523,"derHash":"XdZh08sztQBcvtBFoiPdxERaqkHRrLXfcAiEytm6QZU=","subject":"CN=ZeroSSL ECC Domain Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEsxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSowKAYDVQQDEyFaZXJvU1NMIEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"de8d5b5ee9e74901d1bbcc4ad4e1c43a96d0797608f7d04820cdabfa0de24f33","size":1280,"filename":"3fLLVjRIWnCqDqIETU2OcnMP7EzmN_Z3Q_jQ8cIaAoc=.pem","location":"security-state-staging/intermediates/cc8a3501-4e66-4b5b-9d98-d401566c67e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fLLVjRIWnCqDqIETU2OcnMP7EzmN/Z3Q/jQ8cIaAoc=","crlite_enrolled":false,"id":"5f4e1d4e-6a23-4bbc-a9b9-366ff6016a5b","last_modified":1591199862121},{"schema":1591166888935,"derHash":"y1ez/yBAyyaUl2JbyQ+p17TtSTjG9g9C9pr99QisKZM=","subject":"CN=DigiCert Basic RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJDAiBgNVBAMTG0RpZ2lDZXJ0IEJhc2ljIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"af11309a3c20fa360cb678f8d6958ba267f86f202af25ff95cae834d95837fe4","size":1821,"filename":"ZckwC4fqIUCeiz1_ihqLY9TDek4tDc704HFPrhqylPo=.pem","location":"security-state-staging/intermediates/a293e696-ef17-4439-8b31-20962f5f352a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZckwC4fqIUCeiz1/ihqLY9TDek4tDc704HFPrhqylPo=","crlite_enrolled":true,"id":"f921edde-d8b6-430f-aa42-636c604bb2a3","last_modified":1591199862118},{"schema":1591166881281,"derHash":"lRQaNVpaKqPgESIcq5/nOBD9tdiBNYZPA+TYUr0Lvts=","subject":"CN=Thawte RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHDAaBgNVBAMTE1RoYXd0ZSBSU0EgQ04gQ0EgRzI=","whitelist":false,"attachment":{"hash":"419f063716d0b08e5119a943e2d8506a67bba9d8b72f725763a5b48b0911dfd3","size":1792,"filename":"hN3GzHyLopxOn8DxNQIEvpQa-NyS7R_1oQY0xsFsrOA=.pem","location":"security-state-staging/intermediates/0d05c78d-0f37-439e-b5d1-08268337d922.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hN3GzHyLopxOn8DxNQIEvpQa+NyS7R/1oQY0xsFsrOA=","crlite_enrolled":false,"id":"0810cb55-6c6a-4343-a322-9e5c9f7920af","last_modified":1591199862116},{"schema":1591166886003,"derHash":"8mmsALQQAD9y3GKK+z2VAnljDHxdDIIUig/STfTaQwE=","subject":"CN=DigiCert Trust Service ECC CA,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0IFNlcnZpY2UgRUNDIENB","whitelist":false,"attachment":{"hash":"75b96b01d9b932fb522e5615db087c64e2ee12af68af026235262358e0eeef91","size":1410,"filename":"447EOyTQJY3PyAbUMHr-SyrdqoPSJsxpM0Nf26eUpV0=.pem","location":"security-state-staging/intermediates/82c3a715-65dc-4dc7-9803-8e94ab1605f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"447EOyTQJY3PyAbUMHr+SyrdqoPSJsxpM0Nf26eUpV0=","crlite_enrolled":false,"id":"2184c07f-101d-4e6e-ab1a-f806fff4f1af","last_modified":1591199862113},{"schema":1591166873630,"derHash":"8AQ+n++zeup5TmkEN9wjnWvSxcoPtYoSJEVVoaiioBo=","subject":"CN=Panteion Univ. of Social and Political Sciences TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGRMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFJMEcGA1UEAwxAUGFudGVpb24gVW5pdi4gb2YgU29jaWFsIGFuZCBQb2xpdGljYWwgU2NpZW5jZXMgVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"be73f7729891ce22885d13e919d4708521fcefe4b74165aa08c8af1edd701af1","size":2970,"filename":"gPEc0jcCVlywHAUQHhYL3X5OqG89O9YInrCwyDjgJ1A=.pem","location":"security-state-staging/intermediates/9922f7a2-d69e-4d2d-a01d-3ea5abe1a1cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gPEc0jcCVlywHAUQHhYL3X5OqG89O9YInrCwyDjgJ1A=","crlite_enrolled":false,"id":"8d0bdf59-a81c-44d7-acc2-c7d6d72244e0","last_modified":1591199862110},{"schema":1591166882853,"derHash":"abCFmqwMqRvCm0IqPQS5/5D4e4Wje8BtuFMV9d5AvZU=","subject":"CN=CrazySSL RSA CA,O=TrustOcean Limited,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxGDAWBgNVBAMTD0NyYXp5U1NMIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"adc25f98c021da162cd92cb4b92db565ba5e5a23ac8adb3a819e65bfdb69adb9","size":2073,"filename":"oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=.pem","location":"security-state-staging/intermediates/2ce09943-1a2f-4726-b421-a52c2d8f6a91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oILpOhvA5LCMlaOiKW18m2FsNsgkjOkzuc7Rn4JSi0U=","crlite_enrolled":false,"id":"4934e39d-e79f-478e-a9b9-339c5922e0b8","last_modified":1591199862107},{"schema":1591166876495,"derHash":"T/V3/d4o5h5/XKT19CvLsSvheXAKT+8kSJznaEigg0Y=","subject":"CN=TrustCor OV SSL CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFUxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIDAeBgNVBAMMF1RydXN0Q29yIE9WIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"cf99b2b77fcf543c7c67e25d79c9076859c38851045d20b200bb357d806163bd","size":2499,"filename":"Wpyq4op-j7iz0FI6Mlw06h6hqo6X_DGLpRt7yAcPkVc=.pem","location":"security-state-staging/intermediates/a1a3157e-3254-4565-a991-e1fce05b4212.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wpyq4op+j7iz0FI6Mlw06h6hqo6X/DGLpRt7yAcPkVc=","crlite_enrolled":false,"id":"af05ac5f-9bff-4bd9-8cca-8a84c13ab21f","last_modified":1591199862105},{"schema":1591166872202,"derHash":"IuXm21yuQo7alq7QVk4rl3DsoswCUVjjep3e7eMfReU=","subject":"CN=Technical University of Crete Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHJMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTowOAYDVQQDDDFUZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"349f0200e3e31175b7f871f287144f5fc1b0f766e23da219f0e2eb7ad790f83a","size":2881,"filename":"_CQ8b_NnBc7JI0Y-BPaUM3fLCvTvHHR9e17XKVFxpKQ=.pem","location":"security-state-staging/intermediates/f3b2f230-d3a1-4a11-8cbb-3ed9df6cba12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/CQ8b/NnBc7JI0Y+BPaUM3fLCvTvHHR9e17XKVFxpKQ=","crlite_enrolled":false,"id":"0414d3b7-67d2-4ee4-ab18-cdc03115a996","last_modified":1591199862102},{"schema":1591166875099,"derHash":"iTfpDhSVyaeO+xgYLUP9xz/NKSq2NHoSuQd96HhTDmI=","subject":"CN=GeoTrust EV RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxITAfBgNVBAMTGEdlb1RydXN0IEVWIFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"dbcead7fd92db8003e615e6ab4e681c29b1f4e1f5a16537b11786c41b180f203","size":1646,"filename":"AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw_OD7I=.pem","location":"security-state-staging/intermediates/4f22de4a-5b44-4d18-bc10-7deaee7abcc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AKgAa8DfB2Gh8BJb5YJO995EeaGcs3vEecdkZw/OD7I=","crlite_enrolled":true,"id":"4af8f737-c4f7-4213-a097-781dca9addd3","last_modified":1591199862099},{"schema":1591166864681,"derHash":"J9b9r4ApeEbf7/guf1i5pIrJ4+6ToRKxu+JD7hqXRHw=","subject":"CN=GlobalSign PersonalSign 2 CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gU0hBMjU2IC0gRzQ=","whitelist":false,"attachment":{"hash":"72db62fc54a69dcc4b1a4901db76c47a55d537320160cc5a8fbb0927080ef6d0","size":1764,"filename":"Somjy3lQL3f4pdxt3-mUebYuNRJSdhkiZOiWMZfaFJk=.pem","location":"security-state-staging/intermediates/173ac902-1ec7-4f50-8515-83dd7b63fb48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Somjy3lQL3f4pdxt3+mUebYuNRJSdhkiZOiWMZfaFJk=","crlite_enrolled":false,"id":"e478fb02-efe1-44fa-8785-ca6be9105a6a","last_modified":1591199862097},{"schema":1591166877998,"derHash":"SkVVmtiWhLtDn80sxMXsD5LuBpLNa5djlX3jGi9GfMo=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"48223edca6350527ab420c9318720f7b18a516efb69f4d3a590a6036f911ea66","size":2020,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/ba6ce4e6-8bf6-4e20-b6c7-6627aa13effb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"0ab7ad33-dfba-49fa-853d-2ba541df6e11","last_modified":1591199862094},{"schema":1591166867546,"derHash":"cNK5bnwEC2Jw/yC7a6mEITEq035GK+y4O+lQK4PfVpc=","subject":"CN=CERTDATA SSL DV CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MG4xCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMDAuBgNVBAMMJ0NFUlREQVRBIFNTTCBEViBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"10d55d2c2cadcf08f96b96c50475b9f79aeea102d66ab44733cfbd5b499b113c","size":2129,"filename":"96wDgmEz6BSfBEFFYy6VQtjNjdFAvz3d60x4NuYW52A=.pem","location":"security-state-staging/intermediates/de9b3e8a-9359-4fdf-803d-cc3302061a0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"96wDgmEz6BSfBEFFYy6VQtjNjdFAvz3d60x4NuYW52A=","crlite_enrolled":false,"id":"3ce95fd6-d1f8-4199-9fa8-c95bac94f60f","last_modified":1591199862091},{"schema":1591166879750,"derHash":"9igmTHnb+9/P3sZDFxvcvU3nSD+cgOpZBoiHrkSaLkg=","subject":"CN=HARICA EV TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,L=Athens,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExIzAhBgNVBAMMGkhBUklDQSBFViBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"fceb3c305820e5740d776d78ddc750d3e1437be8b57d2d23a8d244530c7a9624","size":2475,"filename":"qQHYBA8HuHBDaaxDEsg5_SBSGWrd6XH3D7_lIoKEbz8=.pem","location":"security-state-staging/intermediates/f457a0bc-793c-495f-b9cf-cdda16dbe625.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qQHYBA8HuHBDaaxDEsg5/SBSGWrd6XH3D7/lIoKEbz8=","crlite_enrolled":false,"id":"93ed36ab-5394-4851-a2ff-ebe5055f9d98","last_modified":1591199862088},{"schema":1591166870531,"derHash":"iK+RXGbUJ/GTFVc6/jnFliyKEWju2z/4+KLtnbS+R5Q=","subject":"CN=TrustCor IV Email CA - G2,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MFcxCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xIjAgBgNVBAMMGVRydXN0Q29yIElWIEVtYWlsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"040c4a3d4b54a50ec78e9f5629b11f91e34e93c44a7405f344d01e4eabf67ee4","size":1796,"filename":"8Go2wmmhcWTAHDnpeLCjSIByzS-G4W6HtvLhlIVNNAA=.pem","location":"security-state-staging/intermediates/5c86b050-ff2b-4fd2-8968-cd839be57614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Go2wmmhcWTAHDnpeLCjSIByzS+G4W6HtvLhlIVNNAA=","crlite_enrolled":false,"id":"053c0da4-29be-41ad-96a3-db952c73a378","last_modified":1591199862086},{"schema":1591166869000,"derHash":"RM6X9clX3QVtRMPhvfzrLPmntCjtCJg5JkM2MDvKx+8=","subject":"CN=CEDEFOP TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MGkxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMSEwHwYDVQQDDBhDRURFRk9QIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"3026c201f734e5066c363d7aacffac89da4a95bf11bfcd83f195f70269ed6b89","size":2800,"filename":"56n8EMBsMqyH4pNbD4KmUsbeas26-ouP-jDHJMDFKcA=.pem","location":"security-state-staging/intermediates/258b19c6-10e8-4216-aa3d-5b45dfdfdd18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"56n8EMBsMqyH4pNbD4KmUsbeas26+ouP+jDHJMDFKcA=","crlite_enrolled":false,"id":"763a3427-7045-435e-bbc2-31346fc77265","last_modified":1591199862083},{"schema":1591166866080,"derHash":"48JCed1qM3+IGxvGkuh49KMa/pWFHyCPlIALDCTYjDg=","subject":"CN=GeoTrust RSA CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IFJTQSBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"ab4a0d2c2f5e08bd7983cd7ef5ded4ca8f1b29963790a87f297d00860979dc97","size":1813,"filename":"LYxGolhhMxT6m_MXQhVdp6zkEP-xK8sxXN4I4pBqtFs=.pem","location":"security-state-staging/intermediates/b2b450c3-0185-461d-8eb2-c785ac2b386e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LYxGolhhMxT6m/MXQhVdp6zkEP+xK8sxXN4I4pBqtFs=","crlite_enrolled":true,"id":"bb0939ee-0780-4a40-abd6-9461d85b0902","last_modified":1591199862080},{"schema":1591166863169,"derHash":"h6rZeKX+LulB5AaPmWPqKb2qWIeNJBIkmoLNIvgSbYI=","subject":"CN=University of Crete Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIG/MQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTAwLgYDVQQDDCdVbml2ZXJzaXR5IG9mIENyZXRlIENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"692b3293cf1a2c637247f3db6669e730f76949fccde9d90ac06bdcef756d76d2","size":3092,"filename":"H9OjMfo3b9PnK6ZODqvqQ8917lxRCk2emeK5O_WdnJ8=.pem","location":"security-state-staging/intermediates/376fbaf1-eb26-410a-9ba7-3e657a2a3097.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H9OjMfo3b9PnK6ZODqvqQ8917lxRCk2emeK5O/WdnJ8=","crlite_enrolled":false,"id":"58bc984c-12d9-448c-8fcb-884fca564508","last_modified":1591199862077},{"schema":1591166860318,"derHash":"TQ/0Ld2VUufnd6bFdpVzcJkMroNjcXXmV86Ez2riElw=","subject":"CN=TrustCor IV Email CA - G2 - RSA,O=TrustCor Systems S. de R.L.,C=PA","subjectDN":"MF0xCzAJBgNVBAYTAlBBMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xKDAmBgNVBAMMH1RydXN0Q29yIElWIEVtYWlsIENBIC0gRzIgLSBSU0E=","whitelist":false,"attachment":{"hash":"6831a4af86aa2fceccfa00b8de0f564eda083e00e5ed0d648ef7faeb5148b941","size":1691,"filename":"8ktLjVrByicgpMzqI7L7d5WdKCuRsMvvZdUgHPdSMMM=.pem","location":"security-state-staging/intermediates/3ab0441b-91be-4203-a0a7-a673f60b6614.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8ktLjVrByicgpMzqI7L7d5WdKCuRsMvvZdUgHPdSMMM=","crlite_enrolled":false,"id":"a253a65f-3afa-4490-96c8-b2fefa45a8ea","last_modified":1591199862074},{"schema":1591166857432,"derHash":"cB6yP5VWTNVWnNIOXwXCiIkAuum6A6v1q+V7/gS1SmA=","subject":"CN=HARICA EV TLS ECC SubCA R1,O=Hellenic Academic and Research Institutions CA,L=Athens,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExIzAhBgNVBAMMGkhBUklDQSBFViBUTFMgRUNDIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"2bdd6ee732808aea1903a2c083127ea36909183341515eb1c2d363248a76902d","size":1337,"filename":"guE2rUJ3slSQ9iYP0Ub25zrLqasAFng1eTC5H9BqTUg=.pem","location":"security-state-staging/intermediates/7fa0d0da-ae47-4777-b3fb-42cd8bced5c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"guE2rUJ3slSQ9iYP0Ub25zrLqasAFng1eTC5H9BqTUg=","crlite_enrolled":false,"id":"7946e404-ecf2-49eb-932a-103eedce84ab","last_modified":1591199862071},{"schema":1591166861744,"derHash":"ZgjoSOY6aCBgm4VcIjJPa4yxU+3MgBMyVNcVa8PToCY=","subject":"CN=TrustOcean Organization Client Certification CA,O=TrustOcean Limited,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJUcnVzdE9jZWFuIExpbWl0ZWQxODA2BgNVBAMTL1RydXN0T2NlYW4gT3JnYW5pemF0aW9uIENsaWVudCBDZXJ0aWZpY2F0aW9uIENB","whitelist":false,"attachment":{"hash":"65ea831c43dee9e586e0d0ae71fba096e656cdc1710cbec81161240dfaf2123c","size":2105,"filename":"YWMMSjIsV3sKAsZ1Dvh-XMo6c_3lrcidiB03ALvLATA=.pem","location":"security-state-staging/intermediates/0a25e298-0fdd-4f7e-bf45-bf211562056b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YWMMSjIsV3sKAsZ1Dvh+XMo6c/3lrcidiB03ALvLATA=","crlite_enrolled":false,"id":"0dba3544-d858-465f-b63e-47e4a678e132","last_modified":1591199862068},{"schema":1591166854460,"derHash":"DuACkMinHZheOL64TsrJ0Cm1WWcRnUfLy+NH8WTfS0o=","subject":"CN=GlobeSSL EV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIEVWIENB","whitelist":false,"attachment":{"hash":"0fd5faa4f58b29049d8b91e89fec33c6dc0dec4eb75a8a1762d58c678142084b","size":2113,"filename":"CxpahwRxk_rjFSnTogI-dPS7QQ16sQ0GM12A7ChwIS4=.pem","location":"security-state-staging/intermediates/60a23013-1e93-4dc8-b52b-246c4ad92a03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CxpahwRxk/rjFSnTogI+dPS7QQ16sQ0GM12A7ChwIS4=","crlite_enrolled":false,"id":"5bb075c8-70d6-4037-ac4b-2d7fe0e7d948","last_modified":1591199862065},{"schema":1591166851621,"derHash":"/UfLIwR4baJPhJ/KiKxcrUufwDf575LNt8YArxizKrg=","subject":"CN=MeSince Secure Email CA  [Run by the Issuer],O=MeSince Technology Limited,C=CN","subjectDN":"MGkxCzAJBgNVBAYTAkNOMSMwIQYDVQQKExpNZVNpbmNlIFRlY2hub2xvZ3kgTGltaXRlZDE1MDMGA1UEAwwsTWVTaW5jZSBTZWN1cmUgRW1haWwgQ0EgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"c5566f7d2a8434f0eddb8367a4cb46f563e2390f36ceac0355692ad81f11831d","size":2109,"filename":"YzIWVNY9JMWk52vFK7cRTkUR1BXsWaEnPD4uzbUepjc=.pem","location":"security-state-staging/intermediates/2ed8238c-f5b4-49af-a65c-37e040edf53b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YzIWVNY9JMWk52vFK7cRTkUR1BXsWaEnPD4uzbUepjc=","crlite_enrolled":false,"id":"dea24760-68b1-4097-9960-86d8d488aaed","last_modified":1591199862062},{"schema":1591166849966,"derHash":"nOYws1+K4sZBnnNK2dL6MEdt2ec5Sx6Tsn+D93agJOo=","subject":"CN=AC Unidades de Sellado de Tiempo,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MHUxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEpMCcGA1UEAwwgQUMgVW5pZGFkZXMgZGUgU2VsbGFkbyBkZSBUaWVtcG8=","whitelist":false,"attachment":{"hash":"671a59fe01d2cd2074dbea84483abb7c9c75db400f3b54d2aebd79a620add787","size":2836,"filename":"RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87-GT4=.pem","location":"security-state-staging/intermediates/ba299b7d-dc4a-4efd-b7d4-c67563ad72aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87+GT4=","crlite_enrolled":false,"id":"590c1b99-aca9-4c60-8b11-030c3d8071a5","last_modified":1591199862060},{"schema":1591166858926,"derHash":"JWQOYOqy1R//xDd28IewCzpzyFOa6EQKHL0BSHP+iCw=","subject":"CN=CERTDATA SMIME OV ECC CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHQxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExNjA0BgNVBAMMLUNFUlREQVRBIFNNSU1FIE9WIEVDQyBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"f7e54e3b9fd412e9b3097879572017a4abe1c6a15b59a5352aa1efbd5b7dd98c","size":1284,"filename":"B3SYowuqr6O2cz9jLEn6_2MBbD9I9YZYmd58lDVi-K0=.pem","location":"security-state-staging/intermediates/8e3d5211-286e-4f56-b365-1a73e696a4d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B3SYowuqr6O2cz9jLEn6/2MBbD9I9YZYmd58lDVi+K0=","crlite_enrolled":false,"id":"98be93bb-bc71-4fc9-8bdd-f2c9c7737238","last_modified":1591199862057},{"schema":1591166855957,"derHash":"bXsxthrbeOvGp2YpaIYgnqjnT0YA2uR7eNo/CL559OU=","subject":"CN=Enterprise Premium Public CA,O=Mitsubishi Electric Information Network Corporation,C=JP","subjectDN":"MHIxCzAJBgNVBAYTAkpQMTwwOgYDVQQKEzNNaXRzdWJpc2hpIEVsZWN0cmljIEluZm9ybWF0aW9uIE5ldHdvcmsgQ29ycG9yYXRpb24xJTAjBgNVBAMTHEVudGVycHJpc2UgUHJlbWl1bSBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"499764662760ff98d3639ab422aa0d20b4ef8daee619d174c63d3ba9e3f28abf","size":2003,"filename":"9lt_Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ_mLKiYOQ=.pem","location":"security-state-staging/intermediates/dadedae0-6925-4458-829e-3ca4f70bd690.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9lt/Fzns7hF03gLZXsgVEGOFYGx2FHKYDGJ/mLKiYOQ=","crlite_enrolled":false,"id":"38353e65-3a23-4c3e-8f3c-ed8f0e8dd8fd","last_modified":1591199862054},{"schema":1591166853045,"derHash":"ukJRIvMdm658vh5/ov9Det8oPgFDM0hfdpHLhWrsd2o=","subject":"CN=Harokopio University TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVIYXJva29waW8gVW5pdmVyc2l0eSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"cdf8c52a3037ef4ea0b094b6ba99c9767673ebc4fd1c01418360482d28225ddf","size":3031,"filename":"mTSefyaEu5Ue6uOHJdZVbu7WMV69SsHOEk-8P2x2eZw=.pem","location":"security-state-staging/intermediates/697fa4e3-d146-410d-a470-027574d10e7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mTSefyaEu5Ue6uOHJdZVbu7WMV69SsHOEk+8P2x2eZw=","crlite_enrolled":false,"id":"da737b54-eb2a-4dd0-92d6-87dc7f62e5ee","last_modified":1591199862051},{"schema":1591166845601,"derHash":"fK7saA5kl/xRCQc/g4FueY8n+JaKJmPByVcRtUgZLjU=","subject":"CN=GeoTrust ECC CN CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMg==","whitelist":false,"attachment":{"hash":"253b1b900adc6be80e90ac3862b020d22321e25976cb9c08fa7266318159ad58","size":1374,"filename":"5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem","location":"security-state-staging/intermediates/ff6fd4b8-f7d7-4779-922b-29b398cecef6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=","crlite_enrolled":true,"id":"c542f5dc-33cb-490b-9311-a1dadc26b605","last_modified":1591199862048},{"schema":1591166848442,"derHash":"gmV1bdXNijfuYeQDUSiOSxaondJIwexOuiWq8WGr9Jg=","subject":"CN=AC Sector P\u00fablico,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MGcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEbMBkGA1UEAwwSQUMgU2VjdG9yIFDDumJsaWNv","whitelist":false,"attachment":{"hash":"cfe09ce65e4dcbc8449292b7e92e1cdaacc6c228de14a49ccc6300fda8e73598","size":2816,"filename":"aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=.pem","location":"security-state-staging/intermediates/7f6c9b16-66e0-4bd8-bb34-a2812443ecfb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=","crlite_enrolled":false,"id":"72c55deb-6292-4294-b3d7-cd0eb0bc896a","last_modified":1591199862045},{"schema":1591166842796,"derHash":"Gvi01Jxae22lNt6pL9+vRXNiBa/KLa//rstxLanD69E=","subject":"CN=Technical University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MH8xCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTcwNQYDVQQDDC5UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBDcmV0ZSBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"900dcce8153813e7b2c906ae9d9fa6097afb0dc015d9e872eb1ab2b64a110ab5","size":2800,"filename":"t--9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=.pem","location":"security-state-staging/intermediates/c78cc87b-67ad-4dd7-a00f-ea7badd2fb2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t++9MaZjKuDEfu4IV5cTbN0TXadfwJu6Tn4gQDEWuoo=","crlite_enrolled":false,"id":"d8b67105-91c0-4a05-8e13-ccb8eacc591f","last_modified":1591199862043},{"schema":1591166841277,"derHash":"d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=","subject":"CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy","whitelist":false,"attachment":{"hash":"38c26b5824725648f58682db859677ed5f482b8a98476190e2f4b5cea965ce52","size":1918,"filename":"7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem","location":"security-state-staging/intermediates/84f2426b-c265-4fe5-8bcc-09e6d612433c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=","crlite_enrolled":true,"id":"d8d54086-08a6-43e4-94b4-1d46de796b92","last_modified":1591199862040},{"schema":1591166835191,"derHash":"0UBlCwqh/FTfkstGmFM3wGghRyd3CUfWeIWJpSAH6iA=","subject":"CN=GEANT Code Signing CA 4,O=GEANT Vereniging,C=NL","subjectDN":"MEoxCzAJBgNVBAYTAk5MMRkwFwYDVQQKExBHRUFOVCBWZXJlbmlnaW5nMSAwHgYDVQQDExdHRUFOVCBDb2RlIFNpZ25pbmcgQ0EgNA==","whitelist":false,"attachment":{"hash":"edc93cb9e5360feec50b43ae80da119d4e71408c3e9c92723064f3b2cc06cf8c","size":2446,"filename":"6rWABF2Zr2RIZW___Nsg04EsGouKiLCsOwLLFjWmcjI=.pem","location":"security-state-staging/intermediates/4e49cd28-5206-49f1-9fb9-df5b2bc7780d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rWABF2Zr2RIZW///Nsg04EsGouKiLCsOwLLFjWmcjI=","crlite_enrolled":false,"id":"a60ee48d-740a-4c85-a973-cb905e3ec7bf","last_modified":1591199862036},{"schema":1591166844241,"derHash":"hzBOlUqqHTzYf9dXT/8/YNmEhHdEObE+L3EHGiz9oJU=","subject":"CN=CERTDATA CODESIGN CA  [Run by the Issuer],O=CERTDATA SERVICOS DE INFORMACAO LTDA,C=BR","subjectDN":"MHAxCzAJBgNVBAYTAkJSMS0wKwYDVQQKEyRDRVJUREFUQSBTRVJWSUNPUyBERSBJTkZPUk1BQ0FPIExUREExMjAwBgNVBAMMKUNFUlREQVRBIENPREVTSUdOIENBICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"1c51a822d23a496a6903a26b1c85074c8be0264142891eeda4cd9a5cb80ad364","size":2105,"filename":"Lb_GZlDH8vWm-YzPSBkFTGAPcXFglJ0TRI1d5ylxKrY=.pem","location":"security-state-staging/intermediates/cc5c3cf7-c249-4d97-8a2f-f76d61d333e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lb/GZlDH8vWm+YzPSBkFTGAPcXFglJ0TRI1d5ylxKrY=","crlite_enrolled":false,"id":"fe08a0b2-fc6d-4141-8f1d-bc618e428b98","last_modified":1591199862033},{"schema":1591166833781,"derHash":"GYXnA415CbsDcMFplx+zPvcF+jvp+tG/iyrnwhTgST8=","subject":"CN=Sectigo Partners - Code Signing - RSA,O=Sectigo Limited,C=GB","subjectDN":"MFcxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxLjAsBgNVBAMTJVNlY3RpZ28gUGFydG5lcnMgLSBDb2RlIFNpZ25pbmcgLSBSU0E=","whitelist":false,"attachment":{"hash":"7a7ac856690ca8a49161e5fdc6c4dd5cb328afc0b9ac474458d175401361f4f8","size":2231,"filename":"uVuyzfpTK-HYz0FgOd2jzoYbT2MGEVb8eXyyy7nusfA=.pem","location":"security-state-staging/intermediates/524618c9-698b-4f29-bc7e-77e200e21e58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uVuyzfpTK+HYz0FgOd2jzoYbT2MGEVb8eXyyy7nusfA=","crlite_enrolled":false,"id":"d807888d-c6f2-4a81-9246-abd565f41150","last_modified":1591199862030},{"schema":1591166839860,"derHash":"z9/vA3z9vWuw4xHpuygcpgJxxdriaVMSAzgG+ksOlLc=","subject":"CN=Greek School Network TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVHcmVlayBTY2hvb2wgTmV0d29yayBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"dfe124f290af20e4aa698fc6a6d8efa83d2a2f2cf9a8704bc47d19592ed8888a","size":3275,"filename":"Qrg8oKp5CK8PmUjVC4rnbh8VZo2IQZkWRT9cewFmdNw=.pem","location":"security-state-staging/intermediates/e342d812-7acc-4bc9-aa30-015331e0e0db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qrg8oKp5CK8PmUjVC4rnbh8VZo2IQZkWRT9cewFmdNw=","crlite_enrolled":true,"id":"967aadb0-2c9f-4c7c-b505-fd576df66e1b","last_modified":1591199862023},{"schema":1591166838271,"derHash":"REzv7dg/YxXF7Iay8c1jsdvyOHz6K+sPtAAVPyr5QI8=","subject":"CN=University of Macedonia Client RSA SubCA R1,OU=Hellenic Academic and Research Institutions CA,O=Greek Universities Network (GUnet),C=GR","subjectDN":"MIHDMQswCQYDVQQGEwJHUjErMCkGA1UECgwiR3JlZWsgVW5pdmVyc2l0aWVzIE5ldHdvcmsgKEdVbmV0KTEYMBYGA1UEYQwPVkFUR1ItMDk5MDI4MjIwMTcwNQYDVQQLDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTQwMgYDVQQDDCtVbml2ZXJzaXR5IG9mIE1hY2Vkb25pYSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"3cb71d057e94e927b5ef03b43ad9a43ca78cb4663db298c5d097a9c5c989ae0d","size":2901,"filename":"8lsb1Oss51hyiC9R8zhI90GFGgrz-w6UmqlE_DbZuX4=.pem","location":"security-state-staging/intermediates/4f2758f5-69bb-4081-811e-affa0ea3cbf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8lsb1Oss51hyiC9R8zhI90GFGgrz+w6UmqlE/DbZuX4=","crlite_enrolled":false,"id":"9686b556-ebcc-448d-9ed4-fff34d4ae0c2","last_modified":1591199862020},{"schema":1591166836780,"derHash":"VtWLJvRb84eK9DlwFqlq9IbpiV9mxfO3MXUSCztOSkg=","subject":"CN=Telenor Norge AS EDC CA G2,O=Telenor Norge AS,C=NO","subjectDN":"ME0xCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSMwIQYDVQQDExpUZWxlbm9yIE5vcmdlIEFTIEVEQyBDQSBHMg==","whitelist":false,"attachment":{"hash":"0213f2f3333de40ecac4484546d04528fd3fd4e937d6bae029cdb7a55f97c3ab","size":1955,"filename":"7uuCeOn6U9gLfnVl6djAetEiPQL_HYdnX8odqQvPToY=.pem","location":"security-state-staging/intermediates/bc5ecf10-0122-4293-aaa0-a410bbc06f12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7uuCeOn6U9gLfnVl6djAetEiPQL/HYdnX8odqQvPToY=","crlite_enrolled":false,"id":"32ba5d1f-5bfb-44bb-b751-d686a7cc74d9","last_modified":1591199862017},{"schema":1591166832366,"derHash":"HhMjmuBLlxvd5lOv38cyRDi44UbFxIqBcDEibJV2RTk=","subject":"CN=GlobeSSL DV CA,O=CentralNic Luxembourg S\u00e0rl,C=LU","subjectDN":"MEwxCzAJBgNVBAYTAkxVMSQwIgYDVQQKDBtDZW50cmFsTmljIEx1eGVtYm91cmcgU8OgcmwxFzAVBgNVBAMTDkdsb2JlU1NMIERWIENB","whitelist":false,"attachment":{"hash":"46ff926f845cbf0b70cc18fe28ae6ecc15392b7bf6d30f53d5e62c20fc4a177b","size":2085,"filename":"z9mSm0UWyXCmP7GyKCI8befW1Y69hzCdVgD4FqXpCJY=.pem","location":"security-state-staging/intermediates/e7f0cdf9-77c2-4123-9a86-5c429ea6c98a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z9mSm0UWyXCmP7GyKCI8befW1Y69hzCdVgD4FqXpCJY=","crlite_enrolled":false,"id":"64111cc5-6679-4853-a02f-ad3d4544e923","last_modified":1591199862014},{"schema":1591166828107,"derHash":"dpIe23/lVTsM6d1DiMhBZinrwO0KGjmUFarVwFDpUKA=","subject":"CN=TrustID CA A13,O=IdenTrust,C=US","subjectDN":"MDoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAMTDlRydXN0SUQgQ0EgQTEz","whitelist":false,"attachment":{"hash":"9d6ffa6d28de01541ba5efbc6e4af6ad8ba66e234f6b7eb4b9dcc0b58dc5bdc5","size":2346,"filename":"ryhrFN5k_1-bedv_3wzS8mqzqbXS5FAb4dH-qLx8XhI=.pem","location":"security-state-staging/intermediates/4a7062e9-fc48-4b84-8615-7d355f7faa4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ryhrFN5k/1+bedv/3wzS8mqzqbXS5FAb4dH+qLx8XhI=","crlite_enrolled":false,"id":"746f8a3c-27b7-4e5a-9ed7-4a5e59633474","last_modified":1591199862011},{"schema":1591166829580,"derHash":"TjD4AEwY09eY7Fp3NDRrWl6+jVRCPOmCV/xXc1pvc40=","subject":"CN=DigiCert High Assurance CA-3b,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTNi","whitelist":false,"attachment":{"hash":"cc6e9717bc66f910a2529ed604fb79e0564914be23443f51afe962a3afe09891","size":2048,"filename":"1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=.pem","location":"security-state-staging/intermediates/6990bf85-33f3-4e45-a819-27baa0ed7dcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jqJVFODXrZURu0Yd9r3uRS24OAQ3A4Crn2vR8KpNT8=","crlite_enrolled":false,"id":"6fe7a90f-5366-4061-a9ed-581dae6a646b","last_modified":1591199862009},{"schema":1591166823456,"derHash":"3JmT3DOnH9lYCHh9GaS1VwTmAdV+vOrMiALHi1w29cc=","subject":"CN=Greek Universities Network TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHwxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTQwMgYDVQQDDCtHcmVlayBVbml2ZXJzaXRpZXMgTmV0d29yayBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"37aeafbaa92c269e67ec01c7b961f23ddae3ee344c134b4601de4378c0e7af0a","size":2800,"filename":"-Wo-2quCv6ywG-coso5aG2NSMQ-PKhucBmfbix2syuA=.pem","location":"security-state-staging/intermediates/67373d63-a254-4c05-8ac5-9407ec4d672e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+Wo+2quCv6ywG+coso5aG2NSMQ+PKhucBmfbix2syuA=","crlite_enrolled":false,"id":"1c09be64-b512-4449-834f-8ca5f3fa50ad","last_modified":1591199862005},{"schema":1591166819038,"derHash":"uE1wmCCo/rQc4YcuI3JgtEb5m9PMFY93ONkUaxP65k4=","subject":"CN=Thomson Reuters Special Services CA - G2,O=Thomson Reuters Special Services LLC,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMS0wKwYDVQQKEyRUaG9tc29uIFJldXRlcnMgU3BlY2lhbCBTZXJ2aWNlcyBMTEMxMTAvBgNVBAMTKFRob21zb24gUmV1dGVycyBTcGVjaWFsIFNlcnZpY2VzIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"9ba10b792ea0079372689444dff84857253c95f3026cc8b37b262818bc7a2535","size":2012,"filename":"YhdjD_JSKwUqNm1zwQIQCcIsBmHPhcQoPb28p5I61o0=.pem","location":"security-state-staging/intermediates/1793240d-0e71-4b88-944b-d72dd3cbfc93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YhdjD/JSKwUqNm1zwQIQCcIsBmHPhcQoPb28p5I61o0=","crlite_enrolled":false,"id":"edc96d6d-34ad-40e9-9a79-45ea18971be4","last_modified":1591199862002},{"schema":1591166825015,"derHash":"IazB29aUT5rBjHgstcMo1sKCHGtjcx+juJh/ViXeig0=","subject":"CN=ZeroSSL RSA Domain Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"MEsxCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSowKAYDVQQDEyFaZXJvU1NMIFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"2c3ace9b9a1c08d3905fc990df49b6936f78e356141ef0cd8969bdb44ec78bff","size":2430,"filename":"R3hcMOAGw0WFztuG2skTodoHp8IGid3Qg63Cn7YUYoM=.pem","location":"security-state-staging/intermediates/5681e683-bd54-4255-89fe-dce439358be4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R3hcMOAGw0WFztuG2skTodoHp8IGid3Qg63Cn7YUYoM=","crlite_enrolled":false,"id":"a8da5928-6b84-408c-9441-1ac7d1244157","last_modified":1591199861999},{"schema":1591166830965,"derHash":"XavaBGJy7siey5WmKX26kQ0BRPfutYFNBzrlSkqM9kY=","subject":"CN=University of Crete TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHUxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS0wKwYDVQQDDCRVbml2ZXJzaXR5IG9mIENyZXRlIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"1a950b8eac9bc2e6e71ab38a9bd317e2540c5b960b7ee7f5ef04e55f6503f36b","size":3011,"filename":"OiyYqIVTvazzKZtgPhUjzE_UUtrL4LTPfcYtNSGRrdI=.pem","location":"security-state-staging/intermediates/e011b9cd-3b7e-4057-a812-404fbb369589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OiyYqIVTvazzKZtgPhUjzE/UUtrL4LTPfcYtNSGRrdI=","crlite_enrolled":false,"id":"4617dbad-655a-4429-a26e-d3c7a2641c18","last_modified":1591199861996},{"schema":1591166826539,"derHash":"V1LF+9wDVD8M7GzSlM2WXY0yxOqpk9VQ8kSR7Pm3ODY=","subject":"CN=Telenor Norge AS NF CA G2,O=Telenor Norge AS,C=NO","subjectDN":"MEwxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMSIwIAYDVQQDExlUZWxlbm9yIE5vcmdlIEFTIE5GIENBIEcy","whitelist":false,"attachment":{"hash":"7e1fff6b49d5243587acf127f86270b07767650ad23faf0c11778a3edc03a380","size":1951,"filename":"3vqCc3GvO_KCc0HjvSktu5UdgOfPXvv9g0xLuhW7svg=.pem","location":"security-state-staging/intermediates/42892b56-dead-4e2d-823c-ff62093f319c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3vqCc3GvO/KCc0HjvSktu5UdgOfPXvv9g0xLuhW7svg=","crlite_enrolled":false,"id":"e9407fe4-846e-4c28-8e38-5e374b619d88","last_modified":1591199861993},{"schema":1591166821852,"derHash":"3aS+P3jG10KxABRsJgEbQXUq67gQwEWIw6+B8NNFERg=","subject":"CN=Telenor Norge B2B2 CA,O=Telenor Norge AS,C=NO","subjectDN":"MEgxCzAJBgNVBAYTAk5PMRkwFwYDVQQKExBUZWxlbm9yIE5vcmdlIEFTMR4wHAYDVQQDExVUZWxlbm9yIE5vcmdlIEIyQjIgQ0E=","whitelist":false,"attachment":{"hash":"6075146652fc2c8712240812655579c519cfa4dfc6c95b4fb2dcdb1b134a6cdd","size":1947,"filename":"m5f-WLbmqsgq9Tc-cBMKCyJTMDtguE7B72yjk-002fs=.pem","location":"security-state-staging/intermediates/7219b684-e0b2-4d03-8a8d-449dc5f93118.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m5f+WLbmqsgq9Tc+cBMKCyJTMDtguE7B72yjk+002fs=","crlite_enrolled":false,"id":"a8c73c58-80a6-4c4a-9371-adae40c783bf","last_modified":1591199861990},{"schema":1591166817594,"derHash":"NhledtZVmIiLBeOJnyESqcW+tngVXrgVwzccy6fDeBk=","subject":"CN=ZeroSSL RSA Business Secure Site CA,O=ZeroSSL,C=AT","subjectDN":"ME0xCzAJBgNVBAYTAkFUMRAwDgYDVQQKEwdaZXJvU1NMMSwwKgYDVQQDEyNaZXJvU1NMIFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"d98d4219b4cefa57646bea3e49feeb4adf39e63225477fe89ec365decf6cd3dc","size":2430,"filename":"-xzCearoGbvh_Q0yMU_NCkm14rjMFnaa57u3iwTvlBk=.pem","location":"security-state-staging/intermediates/c6ec3db2-572e-4487-b311-5e2bb57fa8ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+xzCearoGbvh/Q0yMU/NCkm14rjMFnaa57u3iwTvlBk=","crlite_enrolled":false,"id":"128d8a90-b885-4e90-b004-dcf4a4564270","last_modified":1591199861985},{"schema":1591167126696,"derHash":"DtmWPhu6BBfh/Be9OOkgYfllETuSHLNX8THxLwhTRVc=","subject":"CN=WoTrus OV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIE9WIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"42e74afbec45396f4ca75a68524ec41e4332f766126f2a85e7495b95deab1db7","size":2097,"filename":"B2o6KjBMvs-b5LG04FOX1d-Dw82KgV4aPdu-Q6Wq764=.pem","location":"security-state-staging/intermediates/92525c20-b370-4991-8043-7acb57900e5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B2o6KjBMvs+b5LG04FOX1d+Dw82KgV4aPdu+Q6Wq764=","crlite_enrolled":true,"id":"c4da2cdb-1ad8-4e7d-b6ba-ac427bb25786","last_modified":1591199861982},{"schema":1591167123560,"derHash":"J+/mgsdHnDgTOglDZm+8kQP8uxqRljTkOXEcvqfjz8c=","subject":"CN=WoTrus EV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIEVWIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"f9a24f721b157cb04a8b7d174607e009aac14567c63b22e7c3e17aa9f2d8fda5","size":2129,"filename":"7gcte6Sz2PaLDgthd1WawzH-5AZvEHps9kxV7G1Z6nU=.pem","location":"security-state-staging/intermediates/76d7666f-4a9f-47f3-bf8e-01730383b16c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7gcte6Sz2PaLDgthd1WawzH+5AZvEHps9kxV7G1Z6nU=","crlite_enrolled":true,"id":"82c567ab-3eb1-4255-b03a-4fe090b864b8","last_modified":1591199861980},{"schema":1591167113685,"derHash":"MJp4I7s9Hd9EpXPsC/n9UWZiX95zd2GExiIStMC06U4=","subject":"CN=Root Global CA - G2,O=Root Networks\\, LLC,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRswGQYDVQQKDBJSb290IE5ldHdvcmtzLCBMTEMxHDAaBgNVBAMME1Jvb3QgR2xvYmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"cfe4daa3fda4a067b507bc4e87a81144512c76604b39da965d2fd02591e76353","size":1715,"filename":"SWMEi8LaBMvhivSePD6iqXTAoaa_XCxGaHOnp0EwbRU=.pem","location":"security-state-staging/intermediates/21c96bd4-d994-48b4-8aaf-e1fc560e61ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWMEi8LaBMvhivSePD6iqXTAoaa/XCxGaHOnp0EwbRU=","crlite_enrolled":true,"id":"1416d740-c734-4daa-8679-a129b8a0cdb3","last_modified":1591199861974},{"schema":1591167110583,"derHash":"RnJ7kMWl9zN1CC2bG8nxe0RfUCCpXjff3x7yCyh8URU=","subject":"CN=University of Ioannina TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTAwLgYDVQQDDCdVbml2ZXJzaXR5IG9mIElvYW5uaW5hIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"2b27a5e354cb0f9e8d1cd07448eeb318b0abc320a26fb40bda7d124841bae222","size":2836,"filename":"PUZlCSUltdtmQPkFYuFiu4nfB3U5nmSRkJODEG7M5_U=.pem","location":"security-state-staging/intermediates/15ccea59-9c05-4ced-ac5a-7cc1be35692f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PUZlCSUltdtmQPkFYuFiu4nfB3U5nmSRkJODEG7M5/U=","crlite_enrolled":true,"id":"e529cfbf-9677-400f-b048-dcf098de3231","last_modified":1591199861972},{"schema":1591167114876,"derHash":"I9OqLFMTb3if98Ix6StiEPzHuA5dpCh8XfG8UltPRhI=","subject":"CN=Panteion University of Social and Political Sciences CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQzBBBgNVBAMTOlBhbnRlaW9uIFVuaXZlcnNpdHkgb2YgU29jaWFsIGFuZCBQb2xpdGljYWwgU2NpZW5jZXMgQ0EgUjE=","whitelist":false,"attachment":{"hash":"320da917aa844f5f9f72ad1a881171ff49ab6edc207d3bc18409b484b1b9bdfa","size":2560,"filename":"VMbQEJYB6stdyxcbVix1ggpyIpDl04eRjPtwyopAi3M=.pem","location":"security-state-staging/intermediates/e1bbdbc4-35da-419b-a610-9112dcfc0c44.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMbQEJYB6stdyxcbVix1ggpyIpDl04eRjPtwyopAi3M=","crlite_enrolled":false,"id":"bb2a53c8-67d7-40e4-bc04-8215a0a2f253","last_modified":1591199861969},{"schema":1591167101480,"derHash":"2v0lBqfpF8Em5ZBEeUOdd5UIfwT6e75hR5Zye5oWHW8=","subject":"CN=vTrus OV SSL CA G1,O=iTrusChina Co.\\, Ltd.,C=CN","subjectDN":"MEkxCzAJBgNVBAYTAkNOMR0wGwYDVQQKDBRpVHJ1c0NoaW5hIENvLiwgTHRkLjEbMBkGA1UEAwwSdlRydXMgT1YgU1NMIENBIEcx","whitelist":false,"attachment":{"hash":"6d43b5a68905a0f438a343d2b49648cb9b0920fd66cc6fcdd135b5e84025a94a","size":1715,"filename":"iJYYHEjYNccDf7l4rZqt8_6DdC728xy4x8RcQNOya3o=.pem","location":"security-state-staging/intermediates/f238a915-dd39-437d-96c4-daca3c66e661.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iJYYHEjYNccDf7l4rZqt8/6DdC728xy4x8RcQNOya3o=","crlite_enrolled":true,"id":"5a1bc619-eb90-4733-b11b-42fc5acbb075","last_modified":1591199861967},{"schema":1591167135744,"derHash":"5n0YY5NnxbKb96VoO1aw8MIxVcj+lFK8/lFoFDYCN0I=","subject":"CN=Abitab SSL Domain Validated,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MF0xCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMSQwIgYDVQQDDBtBYml0YWIgU1NMIERvbWFpbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"8256a9036481e14355f63a485a8508dd9d4b897eba0e2777a7ceada7c537c808","size":1699,"filename":"9wg1kxbl_ew-5-7tpattPPu_j9bgDctkucNkpOG-U6s=.pem","location":"security-state-staging/intermediates/8b5bc65e-d9cc-4c82-9694-c4d4d3657828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9wg1kxbl/ew+5+7tpattPPu/j9bgDctkucNkpOG+U6s=","crlite_enrolled":true,"id":"1568c2be-d6ba-48ba-b4b8-ce6ec52e0dbc","last_modified":1591199861964},{"schema":1591167122329,"derHash":"aX5BqFolPHZaMesYD3jH8QR0nWYsGlNMhDsOWDgFvjc=","subject":"CN=EINS/PKI Public Certification Authority V3,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjM=","whitelist":false,"attachment":{"hash":"cf959bad362e7e0decfbc518291b8dc872e98c2081554568f886e4a2eb24aae3","size":1622,"filename":"Vqrl6W9KGP-r7gtDX4gbt-n6LV6FCHcVDcRFRLJbrrE=.pem","location":"security-state-staging/intermediates/ab2b03cd-7a34-4a64-9be7-9fd364ce7517.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vqrl6W9KGP+r7gtDX4gbt+n6LV6FCHcVDcRFRLJbrrE=","crlite_enrolled":false,"id":"3a33f401-da1b-4241-a126-531a94e3c243","last_modified":1591199861940},{"schema":1591167117608,"derHash":"ltxhXR892QAu5eYosoAe7Qe5Hw5FrK3t7na8YT2gbL0=","subject":"CN=Gehirn Managed Certification Authority - RSA EV,OU=Controlled by COMODO CA exclusively for Gehirn Inc.,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIHAMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTwwOgYDVQQLEzNDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgR2VoaXJuIEluYy4xODA2BgNVBAMTL0dlaGlybiBNYW5hZ2VkIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gUlNBIEVW","whitelist":false,"attachment":{"hash":"bf7465d428608f121b033890ad1a75ce11462b529bb64e1998a64bae2c60d26e","size":2276,"filename":"MQrt-wrOan6w852uOuU2w7xe24wLLPV42Kyxv47Qm84=.pem","location":"security-state-staging/intermediates/6236a16a-b874-4440-b6ea-722270af5ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MQrt+wrOan6w852uOuU2w7xe24wLLPV42Kyxv47Qm84=","crlite_enrolled":false,"id":"8e8cddfa-e58f-4def-a0f9-af5024b733c8","last_modified":1591199861911},{"schema":1591167095567,"derHash":"q9bQU/2+NW0HUFAYFYawucK4wDKYq85kziXEBAHfOyI=","subject":"CN=Hostpoint DV SSL CA - G2,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSEwHwYDVQQDExhIb3N0cG9pbnQgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"87053a64d9eb3524427e4a3d04f8b5844ad96645dd5d5a59da38eafecbec5e2b","size":1654,"filename":"jjxkrzcP29b_8ZkP1-su2vb2ZcV_BkodMS4zGp_DloM=.pem","location":"security-state-staging/intermediates/0bd40108-386a-406c-80a3-b90b463997bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jjxkrzcP29b/8ZkP1+su2vb2ZcV/BkodMS4zGp/DloM=","crlite_enrolled":false,"id":"019b18c2-b025-4793-9449-53a85c827c76","last_modified":1591199861873},{"schema":1591167128660,"derHash":"KrTf9p11u/lUEGC0NM5a0MTay3rw2/IdNhavy0c3lt4=","subject":"CN=Certum Class I CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHsxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBDbGFzcyBJIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"42c093531894319de5b6736e8bb7302536bb599cd0c23045983bc8cdb0398cbf","size":1711,"filename":"DlML3IIZYmKbkc5sg_Vlwu7GmLOhTHxlwiDnuM8uXco=.pem","location":"security-state-staging/intermediates/537f9e86-0aa2-4487-ac82-d4e6d63a5030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DlML3IIZYmKbkc5sg/Vlwu7GmLOhTHxlwiDnuM8uXco=","crlite_enrolled":false,"id":"f0bd44f2-5281-42f1-ae71-9815dbe807b3","last_modified":1591199861864},{"schema":1591167103436,"derHash":"rv/kM17lZCLpJ/Rela4UK56zWXmnQAVprpvepsqrwdw=","subject":"CN=SHECA Global G3 SSL,O=UniTrust,ST=Shanghai,C=CN","subjectDN":"MFExCzAJBgNVBAYTAkNOMREwDwYDVQQIDAhTaGFuZ2hhaTERMA8GA1UECgwIVW5pVHJ1c3QxHDAaBgNVBAMME1NIRUNBIEdsb2JhbCBHMyBTU0w=","whitelist":false,"attachment":{"hash":"966814ad4c7925d39057eb115ca90947f532fe888d00abdd9884f26cad189f7d","size":1999,"filename":"-3DYv-zWynH_VKDDzSsG9R5GfeXFt--F4B8P0tAoRsU=.pem","location":"security-state-staging/intermediates/72f5db49-9653-406b-b129-7db8f562a09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+3DYv+zWynH/VKDDzSsG9R5GfeXFt++F4B8P0tAoRsU=","crlite_enrolled":false,"id":"9a5f7622-15ab-419e-9203-7b79dd0f844e","last_modified":1591199861813},{"schema":1591167118391,"derHash":"QT7CqkZXCIQ3XaAfo6LCNSzVzwK/rLnQAWJacTesbyw=","subject":"SERIALNUMBER=201504,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDQ=","whitelist":false,"attachment":{"hash":"becc7a19429c3fe510ce2088a493ef9860f8e74fc31f972b853d1a6d6d7ddec9","size":2093,"filename":"u-gqJoIpOdY1O3UZ68GeSClDGGp95Ws_umP8zyOohyA=.pem","location":"security-state-staging/intermediates/afe856e5-1628-4340-8086-2841883f1ebd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u+gqJoIpOdY1O3UZ68GeSClDGGp95Ws/umP8zyOohyA=","crlite_enrolled":true,"id":"6c785882-b0f8-4ced-9bdc-d7ab6d035040","last_modified":1591199861786},{"schema":1591167127871,"derHash":"whCHQWu/mDuf/kD11W7g/9lOseZmsEpTKt5ILsIB1nw=","subject":"CN=Wells Fargo Certificate Authority WS1,OU=Symantec Trust Network,O=Wells Fargo,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtXZWxscyBGYXJnbzEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEuMCwGA1UEAxMlV2VsbHMgRmFyZ28gQ2VydGlmaWNhdGUgQXV0aG9yaXR5IFdTMQ==","whitelist":false,"attachment":{"hash":"cba0f94ea2cabab47d4fc2cff80461a012e1384fdf9dae249dbda8696bac62da","size":1845,"filename":"1qvJcavhwfdLbQFNDvMFYaClqSTldkdYglp4N1CvDAE=.pem","location":"security-state-staging/intermediates/605850ac-8284-471d-b389-57594942215e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1qvJcavhwfdLbQFNDvMFYaClqSTldkdYglp4N1CvDAE=","crlite_enrolled":false,"id":"8dbc9b5b-c846-432c-87e4-5c44cbc82bce","last_modified":1591199861782},{"schema":1591167127088,"derHash":"j9FqF5lE1dHUIK8JQF7aer8qnHQog+jC+J4NkK+vdUs=","subject":"CN=AC Representaci\u00f3n,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"ME0xCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxGzAZBgNVBAMMEkFDIFJlcHJlc2VudGFjacOzbg==","whitelist":false,"attachment":{"hash":"fbb63f349bcc5868c551877141aadf4dc7c5f336ecd9ff3349ae89d79806d799","size":2438,"filename":"2ldsefSfkTU7GGXfz4iYiPnOUDkbKiYdUaPGd2du8EQ=.pem","location":"security-state-staging/intermediates/28006d3e-f7bf-4fec-b7d7-e7f43b6987e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ldsefSfkTU7GGXfz4iYiPnOUDkbKiYdUaPGd2du8EQ=","crlite_enrolled":false,"id":"4f3d1faf-a555-407d-bf85-71e6aa0c4bbe","last_modified":1591199861766},{"schema":1591167110971,"derHash":"vJ4iPMQidcwDQZDfLQF5tVtzLVrFMRN6e1Itz+BKBZI=","subject":"CN=GeoTrust Extended Validation SHA256 SSL CA,O=GeoTrust Inc.,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTMwMQYDVQQDEypHZW9UcnVzdCBFeHRlbmRlZCBWYWxpZGF0aW9uIFNIQTI1NiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"46ad52d45d9e44779ff98b1488cb499ecc79a96ca90bddbd6c76512c47d537ed","size":1735,"filename":"ETrxfY_aVptAHxW1VmC2WjDv0VLyOmN9vfVO45quBtg=.pem","location":"security-state-staging/intermediates/8511db0a-de1a-44fa-87cc-fd1e1fc95f78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ETrxfY/aVptAHxW1VmC2WjDv0VLyOmN9vfVO45quBtg=","crlite_enrolled":false,"id":"dcc3ee74-7f0b-4951-9f0e-c7d34097d1dc","last_modified":1591199861760},{"schema":1591167129850,"derHash":"w2i6rNq2w0pSPlfzn+Bx3oWm0a7f0d29Ivq7S3DaX0E=","subject":"CN=The University of Texas at Austin RSA CA,OU=Information Security Office,O=The University of Texas at Austin,L=Austin,ST=TX,C=US","subjectDN":"MIGwMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxDzANBgNVBAcTBkF1c3RpbjEqMCgGA1UEChMhVGhlIFVuaXZlcnNpdHkgb2YgVGV4YXMgYXQgQXVzdGluMSQwIgYDVQQLExtJbmZvcm1hdGlvbiBTZWN1cml0eSBPZmZpY2UxMTAvBgNVBAMTKFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIGF0IEF1c3RpbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"b0061b5cde3d079be7801311c889ce6fbf716ebb7e28e0dbf666e7beb7a18115","size":2207,"filename":"lLeKgz_ECOEUD_q5gE_wxHdQZwCGZUSX7XdxXEOzoG4=.pem","location":"security-state-staging/intermediates/d468242c-fc9f-4cb4-8acb-451892fc85cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lLeKgz/ECOEUD/q5gE/wxHdQZwCGZUSX7XdxXEOzoG4=","crlite_enrolled":true,"id":"89c34cc1-9032-4a6e-a795-1a0dcd125dfe","last_modified":1591199861733},{"schema":1591167135342,"derHash":"bo2VL9urrY3j1h4JQ5Nzm1pHNxpSvcsqPC+MQ2IvZA8=","subject":"CN=DigiCert Trusted Server CA G4,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IFRydXN0ZWQgU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"1b0227fb528c1325b07b31b6a5fb4aaae403cf52260bf9d9cd10243df1594c27","size":2263,"filename":"ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=.pem","location":"security-state-staging/intermediates/59a98e6a-d170-4c1b-a564-25e3d6f2bade.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ATJixqKjjVXHRkLEgfX09sgN3kdNds3rCsOQC264qlM=","crlite_enrolled":false,"id":"0af55fad-9862-4ab7-b10a-5e19e0d6a32c","last_modified":1591199861718},{"schema":1591167098714,"derHash":"twC6Sa9NGecvsVotrDwhO6RMMZ+n2pJ3KzaC4St4EJM=","subject":"CN=AffirmTrust Extended Validation CA - EV3,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjM=","whitelist":false,"attachment":{"hash":"2e254ce9b0bd7ecaa13ed912c586e0853458c939d61e8f564883c7f10f882aab","size":1674,"filename":"-TrM-YTWywZV8UwhobD51F1gyN0R9i8HSXRhwDUA_PQ=.pem","location":"security-state-staging/intermediates/1a96dd1e-3da0-45c3-af06-b3f0b4132469.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+TrM+YTWywZV8UwhobD51F1gyN0R9i8HSXRhwDUA/PQ=","crlite_enrolled":true,"id":"5c30def2-02f2-4f59-9e75-fb7cec21fda7","last_modified":1591199861716},{"schema":1591167115649,"derHash":"JOnyCsFnu48J3ooemWjMU/C186SUj1G4ZHtAsYbHXr4=","subject":"CN=DigiCert Secure Auth CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IFNlY3VyZSBBdXRoIENB","whitelist":false,"attachment":{"hash":"a64942af324b392768de8a32c2187db5660a414d7e770bda2812f1a9e980d44b","size":1792,"filename":"tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=.pem","location":"security-state-staging/intermediates/0500e928-1f83-4f99-a7e3-24b68820248d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tdoo0C0wiaEcgnWAQOcm5NMBHjL1VfpZl4892op9W2U=","crlite_enrolled":false,"id":"6526cd1b-5a23-40c2-b96c-e1680e2c0884","last_modified":1591199861714},{"schema":1591167115264,"derHash":"FHxEf+64YgK1AzFPyvADa+qu9DfDm1azWOxEap0gOH8=","subject":"CN=SHECA EV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"79e8a49ce016fdd9c0af03939862785c3c2d81031cbbf7fa59067b46edcfa51c","size":1886,"filename":"xi4INX1FNKxbnVAZdwTrMNDrumTwxFHJ81fg-e_d2lc=.pem","location":"security-state-staging/intermediates/89c1da85-ab0a-47e6-9779-d9122d19152f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xi4INX1FNKxbnVAZdwTrMNDrumTwxFHJ81fg+e/d2lc=","crlite_enrolled":false,"id":"ac6e22b1-b052-4a8c-8678-c546d37f748d","last_modified":1591199861695},{"schema":1591167133769,"derHash":"wKsH2QcaTMHTRAkXj4vKBYMQqLER3c+mVWWHYCJvUPk=","subject":"CN=WoSign EV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"70b0ebbc523a8c85dfbcba297ad8752536887543b61fafc141de629f096c6ef6","size":1691,"filename":"kUsaqEFcRNYeLMDaKST82jCK2fP2QzSDRUyN92iicvw=.pem","location":"security-state-staging/intermediates/77469872-4038-4fec-bc01-bcfacaf96e61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kUsaqEFcRNYeLMDaKST82jCK2fP2QzSDRUyN92iicvw=","crlite_enrolled":false,"id":"c63369ab-e91c-444e-ab6e-6400efdbc7ea","last_modified":1591199861686},{"schema":1591167104643,"derHash":"iKFeJAyJhzwddDxQPA9fTvcagrVsM1l8ake/CW2dO+Y=","subject":"SERIALNUMBER=201508,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDg=","whitelist":false,"attachment":{"hash":"2f79b1033df0522a67c163fc81ce2732e1f478e53059f30038d886faad2d198c","size":2093,"filename":"zduiwxJuZStrkO6Flv96lCWLQI-61C3s5N1jNhbIU7Y=.pem","location":"security-state-staging/intermediates/5e1a3c18-e372-498e-8f60-5f889e22773b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zduiwxJuZStrkO6Flv96lCWLQI+61C3s5N1jNhbIU7Y=","crlite_enrolled":true,"id":"f8a7b557-1b13-43a0-8b2b-3338f34c8383","last_modified":1591199861672},{"schema":1591167127479,"derHash":"eSC44Y0vwS2Bwvq5CmOxtSqzKc580ct8oJTN+dYA9JI=","subject":"CN=thawte Extended Validation SHA256 SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xMTAvBgNVBAMTKHRoYXd0ZSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNIQTI1NiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"563a21cfced81aebe67aac78ad46c393d97ccc5dfae514ccccedd89d53d40a37","size":1727,"filename":"o-9u8XvAYtT_uhU48fZ16spZWnwnEELUcZesUD4gsBA=.pem","location":"security-state-staging/intermediates/ef964011-0a45-44b3-9e70-8d05f1a139c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o+9u8XvAYtT/uhU48fZ16spZWnwnEELUcZesUD4gsBA=","crlite_enrolled":false,"id":"aef4d01c-2e71-497a-9152-77b111228724","last_modified":1591199861670},{"schema":1591167125522,"derHash":"OH1Ja5IgLUxEPNlP9C2hffLx5o4kTC+7p+KU290RNXs=","subject":"CN=WISeKey CertifyID Advanced GC CA 1,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBBZHZhbmNlZCBHQyBDQSAx","whitelist":false,"attachment":{"hash":"3847cc74ceb46d2e07d37b69b668ff50587428a43ef992473d4a3e433bcb1972","size":1293,"filename":"Y3IJxxxojxFKeXVhVUyyPE4P-7QrAbKt0viCWXpb1G8=.pem","location":"security-state-staging/intermediates/233bd648-66bc-440b-8b31-293196be1b49.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y3IJxxxojxFKeXVhVUyyPE4P+7QrAbKt0viCWXpb1G8=","crlite_enrolled":true,"id":"5905f153-1bda-44df-8205-013b8756834a","last_modified":1591199861664},{"schema":1591167102659,"derHash":"qK0cJcxYCyEx/Mb8bWUTdG846pm9FiyBtcU5NJUXWxg=","subject":"CN=STRATO TLS RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFwxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRowGAYDVQQDExFTVFJBVE8gVExTIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"d4b8e211872849d13a1e260cdc06a24464432a0fa7627e3f666d44abf76f5a34","size":1654,"filename":"_MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=.pem","location":"security-state-staging/intermediates/7bc0c334-aaef-4dcb-92c6-98e7cfab6209.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/MWDzTF0gP61A7lqJx1MUWKutcFHBAsAnAXlMwxjhKA=","crlite_enrolled":false,"id":"cede6dc8-3cb1-4e8b-840c-e51a697702ec","last_modified":1591199861662},{"schema":1591167118782,"derHash":"xVfZ3uOkUTRbCN6xeJYaHIDC+8NyMGfLGyM4DOfeiMA=","subject":"SERIALNUMBER=201511,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MTE=","whitelist":false,"attachment":{"hash":"00fb675f00181f478291ea1dc2ee08b8fcdfc0d519fcfa6402b4ff474fbd3eae","size":2093,"filename":"lj1vlZfMd2V_aT2U-5-kNFLhsBmFrR34EQm2OTMD3Y8=.pem","location":"security-state-staging/intermediates/7c090492-98db-41a5-b69d-8401237a3fe4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lj1vlZfMd2V/aT2U+5+kNFLhsBmFrR34EQm2OTMD3Y8=","crlite_enrolled":true,"id":"2372ca19-0a90-4964-a048-80f7a672471a","last_modified":1591199861653},{"schema":1591167112135,"derHash":"4+lOe+UyuUk/Sz7dUxHqCw1O63rYFd/Ljz5jVuHxy44=","subject":"SERIALNUMBER=201505,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDU=","whitelist":false,"attachment":{"hash":"34d10a97c4300798b8710e1fef33d7bbaf26eea241d30c38d827a8314fb24dab","size":2093,"filename":"RNe7v5CES3j8AJTjDjnXy97aI59Zwn09cBcYeuDXVk4=.pem","location":"security-state-staging/intermediates/33b81138-bc9d-4183-9c67-e85acf11ae6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RNe7v5CES3j8AJTjDjnXy97aI59Zwn09cBcYeuDXVk4=","crlite_enrolled":true,"id":"4acd2cb7-b56a-4ee2-9037-f765c2850803","last_modified":1591199861630},{"schema":1591167100293,"derHash":"OTuLFcq8OIb7LkFkldY8i63Y3K+HVSB2yKCpY3wk3kc=","subject":"CN=SHECA DV Secure Server CA,O=Shanghai Electronic Certificate Authority Center Co.\\, Ltd.,L=Shanghai,ST=Shanghai,C=CN","subjectDN":"MIGcMQswCQYDVQQGEwJDTjFDMEEGA1UEChM6U2hhbmdoYWkgRWxlY3Ryb25pYyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgQ2VudGVyIENvLiwgTHRkLjERMA8GA1UEBxMIU2hhbmdoYWkxETAPBgNVBAgTCFNoYW5naGFpMSIwIAYDVQQDExlTSEVDQSBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"80e794ca68f692fa483c4c5cb8e9806bc0ddce1148522be81196e5ad85e5b01b","size":1886,"filename":"vxQ5rrMProJi_--FvKOiNtV0E-SCmjf-g1jA2GXodec=.pem","location":"security-state-staging/intermediates/64c3d745-1d1f-48a0-b654-9371f223ad9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vxQ5rrMProJi/++FvKOiNtV0E+SCmjf+g1jA2GXodec=","crlite_enrolled":false,"id":"e5580962-2ff1-4674-881d-d2a669207187","last_modified":1591199861583},{"schema":1591167133382,"derHash":"nfd0iMS3SsMuPOxMZD0AHVw7q/pAAf/Rk9yhDIvlyzo=","subject":"CN=AffirmTrust Extended Validation CA - EV2,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjI=","whitelist":false,"attachment":{"hash":"89053e842a9e8970354492a7c4548abec7c0be523c780e0f953ea552f30a541f","size":2012,"filename":"x6O8qvzc0zILZCc4XHPUu67PSku6NJHUaXQY4KvAUgg=.pem","location":"security-state-staging/intermediates/3085f02a-64cc-4c75-9005-38f7daa19fab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x6O8qvzc0zILZCc4XHPUu67PSku6NJHUaXQY4KvAUgg=","crlite_enrolled":true,"id":"6b507c8d-2732-4c9b-9a07-d2512c0e2117","last_modified":1591199861568},{"schema":1591167107831,"derHash":"WBbG5AeZtbx/CxTJYUo206yncd9UoASUXw+Nfgsp/8o=","subject":"SERIALNUMBER=201501,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTUwMQ==","whitelist":false,"attachment":{"hash":"0d46e6a34f0da6a0c2fecffc0740218d25d513ae95664755de9d235bda5d9281","size":2097,"filename":"tRPCGioU3g7SQ_LnaZzP56f2x-Cn4zzeQuT-EjcFVwg=.pem","location":"security-state-staging/intermediates/57330922-3e65-46a3-be30-5c0d975f5b82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tRPCGioU3g7SQ/LnaZzP56f2x+Cn4zzeQuT+EjcFVwg=","crlite_enrolled":true,"id":"77d7942b-74d8-4b94-ab76-a0e65bd98d6c","last_modified":1591199861538},{"schema":1591167104251,"derHash":"7MKVtt3NCEunF5+1O90dQiy2wKjZTxVNSlsXeAtyee0=","subject":"CN=Amazon,OU=Server CA 3B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAzQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"c7c4797af7be4621b3d92ccb6bd9cb9b0dd0a450c089b66be3ba98c8bc4186e3","size":1008,"filename":"s5SRPmhQ_9M4pBTJFJbNff5De6KuZpZr6r1_ZkgUbbE=.pem","location":"security-state-staging/intermediates/72c3d6bb-f1e7-4495-af68-0ba087eda278.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"s5SRPmhQ/9M4pBTJFJbNff5De6KuZpZr6r1/ZkgUbbE=","crlite_enrolled":true,"id":"302e34c5-2646-4c4a-ac02-84ccf409fc91","last_modified":1591199861532},{"schema":1591167129058,"derHash":"bEDQf0cFpbTwTGrs3Fob9f040rbPLbfyEsolEHW+El0=","subject":"CN=Shuidi Webtrust SSL Extended Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMS8wLQYDVQQDDCZTaHVpZGkgV2VidHJ1c3QgU1NMIEV4dGVuZGVkIFZhbGlkYXRlZA==","whitelist":false,"attachment":{"hash":"15549ed43fba7dd4ac582772db414c06ac7f55ba18ecf419619290411515f7e8","size":1780,"filename":"YARY8M4pNVQjSsk5Xgw-N3b7ZaQssU3-Ml2q5c55P1Q=.pem","location":"security-state-staging/intermediates/63152062-fb6c-4aea-80be-e8ee9f7ee7e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YARY8M4pNVQjSsk5Xgw+N3b7ZaQssU3+Ml2q5c55P1Q=","crlite_enrolled":false,"id":"1944c7f1-bf0e-4729-a9ec-68ff7ce41381","last_modified":1591199861522},{"schema":1591167107052,"derHash":"MoxZkdg4PifQ6+kQv2bArz10ioXTARpS2I8djIY1ZH8=","subject":"CN=CloudFlare Inc RSA CA-1,O=CloudFlare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRGbGFyZSwgSW5jLjEgMB4GA1UEAxMXQ2xvdWRGbGFyZSBJbmMgUlNBIENBLTE=","whitelist":false,"attachment":{"hash":"f41ed47d0f43325c9f089d03415c972ce1d3f1ecab6e4d6260665baf3db3ccee","size":1597,"filename":"CfyancXuwYEHYRX3mmLJI3NFW6E8cydaCGS1D9wGhT4=.pem","location":"security-state-staging/intermediates/65650a0f-7c22-4c10-9744-2d67e301f5f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CfyancXuwYEHYRX3mmLJI3NFW6E8cydaCGS1D9wGhT4=","crlite_enrolled":false,"id":"872ce619-ac04-47e9-b4ac-7ff12d0ec19c","last_modified":1591199861498},{"schema":1591167116427,"derHash":"zeI6UjA8PKZ6S7vMlYL/XJIDqpjLDzhxOTCM4iiVBqI=","subject":"CN=AffirmTrust Extended Validation CA - EVEC1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGFMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMzAxBgNVBAMTKkFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVkVDMQ==","whitelist":false,"attachment":{"hash":"865dd39def93692e37eef786ad2c8cc23e7d0c975e5371aadd94657e67cbbcb9","size":1223,"filename":"EJPx6trc98AgGgNEdBceeQPzoTVw1_xu9uLPoj5Wczw=.pem","location":"security-state-staging/intermediates/48c70d0d-3354-46cd-857a-bedd9c0140c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EJPx6trc98AgGgNEdBceeQPzoTVw1/xu9uLPoj5Wczw=","crlite_enrolled":true,"id":"07decb3e-5474-49fb-8e4b-b0ce15e562f9","last_modified":1591199861471},{"schema":1591167129450,"derHash":"bmLL4+QqQcUEBbPi8aRCV2gyZ4VhhK+cAhEgcKyDaTY=","subject":"CN=Thawte ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBFQ0MgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"b720fd52f7eed374b2c5902c55a3d185a8cd84a9b4fada7958cae32b764e4368","size":1358,"filename":"3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0-ig=.pem","location":"security-state-staging/intermediates/f9d2835d-36a6-47e4-b9d6-addbf0a8d4cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3hiWxsgsNSgIwyt2ATwgEYbkxoaBEZb10lFKzoR0+ig=","crlite_enrolled":true,"id":"0bc07455-8ec5-41eb-ac5a-22460bb932e5","last_modified":1591199861461},{"schema":1591167132596,"derHash":"Or00nX/hQwXmlSQSNPn/lK6CGt9EZ7wWB6E+ES9ep2c=","subject":"CN=SSL.com Premium EV CA,OU=Controlled by COMODO exclusively for SSL.com+OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MIGMMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHU1NMLmNvbTE1MDMGA1UECxMsQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIFNTTC5jb20xFDASBgNVBAsTC3d3dy5zc2wuY29tMR4wHAYDVQQDExVTU0wuY29tIFByZW1pdW0gRVYgQ0E=","whitelist":false,"attachment":{"hash":"a9afa165fd6ff926ecdcac1b57b4aff26949c7339f1f27f14e96ba34ba7aed05","size":2231,"filename":"q9kHBA4OE40-HVkOIjyKiKBED3yDP_uskMLt3i9Z7e8=.pem","location":"security-state-staging/intermediates/b4c44040-4a0f-44f0-bafc-2ef091b752cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q9kHBA4OE40+HVkOIjyKiKBED3yDP/uskMLt3i9Z7e8=","crlite_enrolled":false,"id":"14597233-b2e4-409d-a2e8-143da66f07a4","last_modified":1591199861440},{"schema":1591167092722,"derHash":"fOza/GvmGKQPG6wmRiRjhHQS1nalxtI4mVUO6Xa+Mv4=","subject":"CN=SSL Blindado EV 2,OU=Controlled by COMODO exclusively for Site Blindado S.A.+OU=Certifica\u00e7\u00e3o Digital,O=Site Blindado S.A.,L=S\u00e3o Paulo,ST=SP,C=BR","subjectDN":"MIHLMQswCQYDVQQGEwJCUjELMAkGA1UECBMCU1AxEzARBgNVBAcMClPDo28gUGF1bG8xGzAZBgNVBAoTElNpdGUgQmxpbmRhZG8gUy5BLjFAMD4GA1UECxM3Q29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIFNpdGUgQmxpbmRhZG8gUy5BLjEfMB0GA1UECwwWQ2VydGlmaWNhw6fDo28gRGlnaXRhbDEaMBgGA1UEAxMRU1NMIEJsaW5kYWRvIEVWIDI=","whitelist":false,"attachment":{"hash":"259a41110133846c14d5ea5590dd8aa42d7531eaef59c1841a6b6f301cde5c42","size":2280,"filename":"oomAz8Bc3vA9i8i7dKzYpXEAA9hSHc_4c1uNOVpwL_s=.pem","location":"security-state-staging/intermediates/36e73adc-530e-402f-9d94-27f5e9c0cb96.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oomAz8Bc3vA9i8i7dKzYpXEAA9hSHc/4c1uNOVpwL/s=","crlite_enrolled":false,"id":"d082497c-c3b1-488e-a8a2-7474e38160a3","last_modified":1591199861436},{"schema":1591167119174,"derHash":"UnTMU7wGH5+YRDD0AanTujWiDO686I5t+nGyaafGQNI=","subject":"CN=Hongkong Post e-Cert CA 1 - 10,O=Hongkong Post,C=HK","subjectDN":"ME4xCzAJBgNVBAYTAkhLMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MScwJQYDVQQDEx5Ib25na29uZyBQb3N0IGUtQ2VydCBDQSAxIC0gMTA=","whitelist":false,"attachment":{"hash":"8da29ad05563050f363f59f064bea5f14050e76d2ade435bde02d43bf0465938","size":1175,"filename":"PfEWtMmnBuSczngTKHScBWoAorL7zO3kx7RNC29R4e0=.pem","location":"security-state-staging/intermediates/d2f47cd7-6af4-430b-8440-37887987872c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PfEWtMmnBuSczngTKHScBWoAorL7zO3kx7RNC29R4e0=","crlite_enrolled":true,"id":"472dc9b5-2882-40d9-8a50-9352050b4390","last_modified":1591199861425},{"schema":1591167130252,"derHash":"+lH+OfDzFukkEuEXARji1iqOStoPiOwjfzzmMfcL4pg=","subject":"CN=Noble Energy SHA256 CA - G2,O=Noble Energy\\, Inc.,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEQMA4GA1UEBxMHSG91c3RvbjEbMBkGA1UEChMSTm9ibGUgRW5lcmd5LCBJbmMuMSQwIgYDVQQDExtOb2JsZSBFbmVyZ3kgU0hBMjU2IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"90ad7e696dba8c1e23f6880f2f04e6cb6a14c58d040ee93ab47d30fa7e5d936a","size":1869,"filename":"E2apBiPMG_Zpvk8zbzKt5sh4sBj4KaAUi2QTkc8XsaM=.pem","location":"security-state-staging/intermediates/fb675c81-8e4b-4430-96db-09b12e43bdae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E2apBiPMG/Zpvk8zbzKt5sh4sBj4KaAUi2QTkc8XsaM=","crlite_enrolled":false,"id":"89546195-a930-4b5e-a9ea-1a504f1bdc72","last_modified":1591199861413},{"schema":1591167096355,"derHash":"ZUDPz3Q+hKstZ4ZvLxOlP+evLol3pcFoH+B6GGliDdE=","subject":"CN=NII Open Domain CA - G4,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MG0xCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc0","whitelist":false,"attachment":{"hash":"694b64628a7d5374fe0a1236dde0139e98c044d4e255e52f6e8890eaa0a4dea1","size":1646,"filename":"pkYOyiZbq6eiG3-fTHdQPKnpyBMSHLTdN87BtKobe2o=.pem","location":"security-state-staging/intermediates/9fddafa0-9c9d-4c6c-b696-f7502cb6768d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pkYOyiZbq6eiG3+fTHdQPKnpyBMSHLTdN87BtKobe2o=","crlite_enrolled":false,"id":"1f00a77e-a49f-4949-8809-b6e456e666ae","last_modified":1591199861401},{"schema":1591167109400,"derHash":"PQwrOOhcr0nDg7bDMoZA5fvobs+in6sTcVGs0bQu0Uk=","subject":"CN=EINS/PKI Public Certification Authority V3,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjM=","whitelist":false,"attachment":{"hash":"e4b8a6bf0eddbecf5ae45cdefa44dbaf3900507c7ec1f5f815078e0c1219f2f3","size":1618,"filename":"RnCQQs9ip0vyrhGBt2ogczNkSTqpuYCXhqgIL0RZGWQ=.pem","location":"security-state-staging/intermediates/f240b23f-faa7-4c5f-94ad-2b165f331e4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RnCQQs9ip0vyrhGBt2ogczNkSTqpuYCXhqgIL0RZGWQ=","crlite_enrolled":false,"id":"50fbb791-2793-42f8-bb20-6140333152f2","last_modified":1591199861395},{"schema":1591167111362,"derHash":"Cz5xovGFt21ghI+AWN8IXNSUtFu/+jSrt/4KTudRPtw=","subject":"SERIALNUMBER=201501,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDE=","whitelist":false,"attachment":{"hash":"22965e59ce07d01290e039c484a513333a3947d9ec580812b375f3d4f8a8f9a9","size":2093,"filename":"-PZGhNMpPNHJLO37ogEwXscavltZ_j_PtNOQVm_NWF8=.pem","location":"security-state-staging/intermediates/50e98f69-8a78-489c-99e2-51b3ef5607cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+PZGhNMpPNHJLO37ogEwXscavltZ/j/PtNOQVm/NWF8=","crlite_enrolled":true,"id":"3cdafee2-76f3-42c8-858b-e26661a6a9c9","last_modified":1591199861393},{"schema":1591167114082,"derHash":"TAE7iFRonLZibMCHtNT8ykUQTi1zv63zOml57RJLeDc=","subject":"CN=AlphaSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcz","whitelist":false,"attachment":{"hash":"5ec4d3d36a5abdd7e8f9f97d4fdfe971b778b6a3c00875e565acf06c59c855ed","size":1601,"filename":"yiytxmxVlqUkaojBswiPQ3AdtFgFdeR3-pfRgzPzjyc=.pem","location":"security-state-staging/intermediates/0ed13f7e-af76-4379-bca8-e1e23e23ba32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yiytxmxVlqUkaojBswiPQ3AdtFgFdeR3+pfRgzPzjyc=","crlite_enrolled":false,"id":"968f0c8d-ebe5-488a-8340-d5e4e9b76cc6","last_modified":1591199861383},{"schema":1591167134944,"derHash":"8U1VJtvE4hi048eJuAX6UD5MHgCPUbR4sx9ewsBGUFM=","subject":"SERIALNUMBER=201410,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MTA=","whitelist":false,"attachment":{"hash":"a755a413df5939715ef8ed2b03de59241eaf26b5b17fb53165acddacbe7fb37d","size":2093,"filename":"bpnQ2j55R3xHAVSt43XkvZK65UCBePG74mW3xb2U6bE=.pem","location":"security-state-staging/intermediates/900020b0-bc89-454b-9900-ea5cfd7cdf75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bpnQ2j55R3xHAVSt43XkvZK65UCBePG74mW3xb2U6bE=","crlite_enrolled":true,"id":"6e1e16c5-1f74-4570-b13f-fb8d4006e3d9","last_modified":1591199861339},{"schema":1591167119954,"derHash":"VvGgaYpGlIe4WKYsgccurHgTtqbmKh1ci0tofvRahsY=","subject":"SERIALNUMBER=201509,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MDk=","whitelist":false,"attachment":{"hash":"1382abc89dabcc879a78d635a83dfff7b7f8f4690017765fb959d56f15328322","size":2093,"filename":"YgUnZLend8A1dYQYIwzEwA7hgRZqcesd6yztVE5VXmQ=.pem","location":"security-state-staging/intermediates/a635f570-6367-4776-9303-d0f24e8d99d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YgUnZLend8A1dYQYIwzEwA7hgRZqcesd6yztVE5VXmQ=","crlite_enrolled":true,"id":"dbe5c709-506e-4280-897b-020eeea4ef49","last_modified":1591199861325},{"schema":1591167113296,"derHash":"iR7i4jKC5QdsmukEfejqkA4Gb4HW3Nm4Q8WQeLDxBbw=","subject":"CN=WoSign EV SSL Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29TaWduIEVWIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"07c937a29a0a69cd8357438132740524c5f2b962a315e7238630d95a61147284","size":1634,"filename":"pH1dud9XORPnyq8wyLWWIS773gVEO_1UuyQKQdv4xKg=.pem","location":"security-state-staging/intermediates/bfbf0539-e24d-4990-a202-fc97784d7f75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pH1dud9XORPnyq8wyLWWIS773gVEO/1UuyQKQdv4xKg=","crlite_enrolled":false,"id":"78e81458-dc94-491e-9bbd-82c797f01706","last_modified":1591199861316},{"schema":1591167125915,"derHash":"w4BN5R6MFwUiIK4crT04PlTVt9wohDxC8NvZkTwehlg=","subject":"CN=Secure Site Pro Extended Validation ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"0888b26cf00bcea2525da774e654b5c2ea18871782615c5140d3fb8b3541ab28","size":1463,"filename":"_Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB_j8=.pem","location":"security-state-staging/intermediates/c841c215-26a7-4218-8633-09f2ccc236bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Nqzn2CbpC436KXdkcnLpL18IA4yR1xWHjRW06xB/j8=","crlite_enrolled":false,"id":"19662870-223a-4691-9872-b58acbff1ebd","last_modified":1591199861310},{"schema":1591167124738,"derHash":"w+PC3uEb+M/qVv1ZAK/pXNQ41zkdylWge/9EFHo1qCg=","subject":"SERIALNUMBER=10810700152,CN=Intesa Sanpaolo Organization Validation 2019 CA,OU=WSA Trust Service Provider,O=Intesa Sanpaolo S.p.A.,C=IT","subjectDN":"MIGjMQswCQYDVQQGEwJJVDEfMB0GA1UECgwWSW50ZXNhIFNhbnBhb2xvIFMucC5BLjEjMCEGA1UECwwaV1NBIFRydXN0IFNlcnZpY2UgUHJvdmlkZXIxFDASBgNVBAUTCzEwODEwNzAwMTUyMTgwNgYDVQQDDC9JbnRlc2EgU2FucGFvbG8gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gMjAxOSBDQQ==","whitelist":false,"attachment":{"hash":"5f497951c07710b122718d697a85665edc20f8913fca4830c994f0a3d4543bf2","size":2706,"filename":"U8_hCRrBPyuCYZBzEVQyVIzTfQOQ9G2QXmqJbys0WpE=.pem","location":"security-state-staging/intermediates/79430411-6e34-4b98-ae2f-ec7ec3df0e00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U8/hCRrBPyuCYZBzEVQyVIzTfQOQ9G2QXmqJbys0WpE=","crlite_enrolled":true,"id":"72a4e0da-1359-4549-99b6-255fe0354d0e","last_modified":1591199861293},{"schema":1591167131032,"derHash":"Iy9jZ89WHgDIPhgKn8qFRrN3H7RQ68tKBSb4NJyMoTk=","subject":"CN=Entrust Certification Authority - L1E,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFF","whitelist":false,"attachment":{"hash":"fb13e64f68c20f1be87aefb4a955348c9604a4103426723d49f8029f9fbcc797","size":1833,"filename":"HeMEDmta9acr_zmjHkdP_dKlW5RaqBlmADFOqTG56eA=.pem","location":"security-state-staging/intermediates/703534c7-f828-4ce3-86b8-8655d652362c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HeMEDmta9acr/zmjHkdP/dKlW5RaqBlmADFOqTG56eA=","crlite_enrolled":true,"id":"4afefd58-c2fb-4ede-9f24-7a133bc67e03","last_modified":1591199861291},{"schema":1591167105053,"derHash":"62K/+my8gC5Nrm+MU5CAIL5/B3dKVeZ7vWPsw3Z53sg=","subject":"CN=Apple Public Client RSA CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBDbGllbnQgUlNBIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"0ac5fad4496d38d0d04fa4eb7fd0df675e54078a637db0a03dc61b5310fb81b1","size":1796,"filename":"W2tlxSBNBFn6yFefJU_iRsNK6Wx_D6jCbtOc0sr3dcM=.pem","location":"security-state-staging/intermediates/cff50670-bd2a-4c54-8946-9c3a2f2bf269.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W2tlxSBNBFn6yFefJU/iRsNK6Wx/D6jCbtOc0sr3dcM=","crlite_enrolled":true,"id":"4be325ba-4a50-48a4-a443-4817dedb5e8f","last_modified":1591199861263},{"schema":1591167121138,"derHash":"AQoQMqQflagsxaSrsJiAmbF5qa+zkusQOOlTuxxfeBM=","subject":"SERIALNUMBER=201401,CN=Government CA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IENBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"a5d0529635f9c3cff86ede1648e1e65a41e9f78e171871943131767a45c1fb70","size":2097,"filename":"ykSGWOpAu6O0UEhE_5QaIEVb1TdtAlxXyuYiXn95XsY=.pem","location":"security-state-staging/intermediates/494cc004-690d-4312-8e57-fdc940038998.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ykSGWOpAu6O0UEhE/5QaIEVb1TdtAlxXyuYiXn95XsY=","crlite_enrolled":false,"id":"4b2bbd7d-eba6-4808-83aa-09b3e1fa24ac","last_modified":1591199861253},{"schema":1591167120744,"derHash":"NxIsGj8+LSF0dAxCxrxfWFzTjYGwlS3LRXrMAQrHpOI=","subject":"SERIALNUMBER=07945211006,CN=InfoCert Organization Validation 2019 CA 3,OU=WSA Trust Service Provider,O=InfoCert S.p.A.,C=IT","subjectDN":"MIGXMQswCQYDVQQGEwJJVDEYMBYGA1UECgwPSW5mb0NlcnQgUy5wLkEuMSMwIQYDVQQLDBpXU0EgVHJ1c3QgU2VydmljZSBQcm92aWRlcjEUMBIGA1UEBRMLMDc5NDUyMTEwMDYxMzAxBgNVBAMMKkluZm9DZXJ0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIDIwMTkgQ0EgMw==","whitelist":false,"attachment":{"hash":"3a11138c7a600ec7442b5e4709ee0f88fa80829315e74b8e78d4a456fd849c4e","size":2690,"filename":"N9dUlTAT1o0Ai9rArJ9HdU0z5ynuQQbtzwjWvGFRrDo=.pem","location":"security-state-staging/intermediates/3c7379b5-17ba-43e5-bd15-542d1e08e93e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N9dUlTAT1o0Ai9rArJ9HdU0z5ynuQQbtzwjWvGFRrDo=","crlite_enrolled":true,"id":"8d2d8e23-ed85-48df-9c81-6f9ab4e4971b","last_modified":1591199861247},{"schema":1591167097159,"derHash":"vMOlTXCDEWMWzgO5pAyjbzNvSDmsWBhi1DEahPcBUU0=","subject":"CN=OKCERT R4 OV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IE9WIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"579d6f5ecf8bcd46d62a770353e586d532320b1e7caea44c51a03952e3fdadde","size":1776,"filename":"J_LNyLPuoW1JcAhG6eG-bHMYhGpN5b-M_HHHd56hnzU=.pem","location":"security-state-staging/intermediates/a65aafdc-334e-4b10-b8d7-597fbfe091bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J/LNyLPuoW1JcAhG6eG+bHMYhGpN5b+M/HHHd56hnzU=","crlite_enrolled":true,"id":"101d25a5-7aab-4b79-9230-e4cb060e9e42","last_modified":1591199861225},{"schema":1591167136138,"derHash":"i7L2iD/tKJpSG6J8R4SClQh04UPKzOxvwCWZDAxGgT4=","subject":"CN=HydrantID Server CA O1,OU=HydrantID Trusted Certificate Service,O=IdenTrust,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxLjAsBgNVBAsTJUh5ZHJhbnRJRCBUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2UxHzAdBgNVBAMTFkh5ZHJhbnRJRCBTZXJ2ZXIgQ0EgTzE=","whitelist":false,"attachment":{"hash":"5c37cd80ee6407081923d28c6774e88ec067942ade58ad3454319f095efcf4e3","size":2431,"filename":"EeppXTka8xyJcDQhuKdo9XL4LWROHEY7l1qZG55lMIo=.pem","location":"security-state-staging/intermediates/fc98d0bf-3fd0-4144-8840-b8ab888570c1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EeppXTka8xyJcDQhuKdo9XL4LWROHEY7l1qZG55lMIo=","crlite_enrolled":true,"id":"5b05b0f5-6f11-4694-90c1-40b4a6d81b2c","last_modified":1591199861222},{"schema":1591167093122,"derHash":"7vkGZCTCNQjpxl+EZxsU4W2hvsNY51/GOC7KBwroYb4=","subject":"CN=Abitab SSL Organization Validated,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MGMxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMSowKAYDVQQDDCFBYml0YWIgU1NMIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"c30af6395f2acc919d52e2b39391c424dfd9016f96111216e9bc5fd3dc34421c","size":1707,"filename":"E4GLDtTEwO7UCeAtO8ibbOu6FLZxSIUC_fBzIbM5mV4=.pem","location":"security-state-staging/intermediates/2cbc872a-e92a-4c95-ad98-01379cbdc630.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E4GLDtTEwO7UCeAtO8ibbOu6FLZxSIUC/fBzIbM5mV4=","crlite_enrolled":true,"id":"d02db623-261b-4357-8746-76ac75242c86","last_modified":1591199861175},{"schema":1591167121528,"derHash":"dqxae3TjELnmJOf30Rg4DKloW0DEFsa4meSm1Cm+ej8=","subject":"CN=TLS RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHExCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRcwFQYDVQQDDA5UTFMgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"88b7219cd2bfa1a2a982b183233cc928eff1d7978796768a60b207e4b616e009","size":2146,"filename":"U9LfjT2tp7DInjOaxZZKrKVVV0njtruyUezjKlI9ECI=.pem","location":"security-state-staging/intermediates/2fbb27ec-89ae-4aef-84d0-2750c73c7785.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U9LfjT2tp7DInjOaxZZKrKVVV0njtruyUezjKlI9ECI=","crlite_enrolled":true,"id":"fb7109db-c35b-44ca-bc73-d09688a86c9f","last_modified":1591199861157},{"schema":1591167097545,"derHash":"VYRK03slu02z/+fc3DkCOkGzxIikepX60fz61Qi3AoU=","subject":"CN=Dodo Sign TLS ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHIxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSEwHwYDVQQDDBhEb2RvIFNpZ24gVExTIElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"9bbab79fdec346cdda828bc4486cedf2582bee9d80c23587c1c2f05407854b6e","size":2438,"filename":"QBni1na5RD10V0ehoagk-O8mlEaC8kPw1gH8_uoYYTY=.pem","location":"security-state-staging/intermediates/512c8ed9-74cb-4a34-a0b5-79f8a0f953b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QBni1na5RD10V0ehoagk+O8mlEaC8kPw1gH8/uoYYTY=","crlite_enrolled":true,"id":"d63929e7-804a-4e7f-9657-ccb49438e6ad","last_modified":1591199861147},{"schema":1591167131818,"derHash":"G/2HAtj5uzQPNTggMwwLun5SLGMWTJHylUFNrHl/CGM=","subject":"CN=TI Trust Technologies OV CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSQwIgYDVQQDExtUSSBUcnVzdCBUZWNobm9sb2dpZXMgT1YgQ0E=","whitelist":false,"attachment":{"hash":"d1c5248d16ba7957e64d310b79c06f83962508230f7fda1e9cff52d1e9cc1998","size":2150,"filename":"nrqQiXIilvjVUSIRwooWc9ltG3vqAn5jSqfwOAWLI-I=.pem","location":"security-state-staging/intermediates/c2e929c5-0bcd-40c3-ac35-7ee70033ede9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nrqQiXIilvjVUSIRwooWc9ltG3vqAn5jSqfwOAWLI+I=","crlite_enrolled":true,"id":"758a2de9-5261-4baa-a5e8-7baf82981b7c","last_modified":1591199861118},{"schema":1591167132991,"derHash":"QeyAjjPMqGWerqgWcNbH3AFEZjbh8idWG2MHuAumOGI=","subject":"CN=ESTEID-SK 2011,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGQxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQQDDA5FU1RFSUQtU0sgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVl","whitelist":false,"attachment":{"hash":"5091662e698c754433563aee646a022ab0fdfa210abaebb1fd27a54e5f1655f2","size":1800,"filename":"skV85t_ThW7yfg-vIYodS-8kTmAl9PUd5o-azF1ck8g=.pem","location":"security-state-staging/intermediates/652c0f8c-f873-4a5b-8a4f-ab67ca5b5f73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"skV85t/ThW7yfg+vIYodS+8kTmAl9PUd5o+azF1ck8g=","crlite_enrolled":true,"id":"2212cd12-531d-4091-9a9f-ef40974684ee","last_modified":1591199861115},{"schema":1580831328676,"derHash":"KGdiAMQV2C0QJR9Senc+fnrJkCIy+rpD4aaMWtO32H0=","subject":"CN=GTS Y4,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTQ=","whitelist":false,"attachment":{"hash":"486ab74ff1c4972cd1baab20287fa21027e8baa01565310ad4a6b2ba09b0db74","size":1069,"filename":"HS03mRwbGwWTfk-g79L17_0GMn7Rd5Xac10BclJV8_Q=.pem","location":"security-state-staging/intermediates/39a2b6b1-2661-49d8-8ecb-62edfe0d4253.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HS03mRwbGwWTfk+g79L17/0GMn7Rd5Xac10BclJV8/Q=","crlite_enrolled":true,"id":"35ccfbf8-d14e-443c-9642-d4ee52e72bcc","last_modified":1580831371709},{"schema":1580831327306,"derHash":"kl7n1aIq1/vpurVNfI0LmnT341qK9q9kXi6MNRmnCS8=","subject":"CN=GlobalSign PersonalSign 2 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"49d234d4a3edd7b4cb0c75434e2e91f053274224b94175e4723db618636c4ec5","size":1719,"filename":"Uln62-9-5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=.pem","location":"security-state-staging/intermediates/4e4916ba-c892-4f63-80bf-933e7f5f1d4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uln62+9+5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=","crlite_enrolled":false,"id":"7bb75ff5-1b3b-4aab-b802-6f4a62094549","last_modified":1580831371706},{"schema":1580831325730,"derHash":"sf466/ljp4gOdLCwVWaB6osczOPmmn07EKaKy+huSKE=","subject":"CN=GlobalSign PersonalSign 3 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"9df8b037bf3f1247cda959357f2a0176035ad46da5184d24d3c0f8f89f56a218","size":1719,"filename":"6FXSznfWYgPxKc6WahR_l3YNNCjz1qGbLp4BZInCAps=.pem","location":"security-state-staging/intermediates/0fbd634e-c1ef-4d67-b5d7-96259d76e8cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FXSznfWYgPxKc6WahR/l3YNNCjz1qGbLp4BZInCAps=","crlite_enrolled":false,"id":"f9ed8c87-8e2b-4eaf-8d98-6760b04b86f1","last_modified":1580831371702},{"schema":1580831324294,"derHash":"lcanR90Lx1WhlBgn6JS4CDWSJBt5JUHi6xsw+5sT9X8=","subject":"CN=GlobalSign Timestamping CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"d8b1d98667f8f3b8858d8d8ce48e135b6b6babb05637d9da7ebef401cc352174","size":1634,"filename":"EWgZuHzMOb4ZdnGU9IxfHAPzzoePcjKG4e43x60fObk=.pem","location":"security-state-staging/intermediates/dbe4d218-3dd2-4d42-9aa1-e0cd1566f50a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWgZuHzMOb4ZdnGU9IxfHAPzzoePcjKG4e43x60fObk=","crlite_enrolled":false,"id":"e25bd43e-b8b0-44cd-96de-1e11f8c38cfd","last_modified":1580831371698},{"schema":1580831322835,"derHash":"Qavo+alRqJkPvc0+FM9HnUJkAbEV8BcBibZl6UDDYyw=","subject":"CN=Atos TrustedRoot Client-CA for Wintershall Dea 2020,O=Atos,C=DE","subjectDN":"MFoxPDA6BgNVBAMMM0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBXaW50ZXJzaGFsbCBEZWEgMjAyMDENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"4cdeea0f9b8c0d997d02497ca1ee85933ee9951ccb157373c44c4bc692a9b8df","size":1967,"filename":"zcJkvK7NculMD4JHrLZo49s5X520hjStrsqlpdtggCw=.pem","location":"security-state-staging/intermediates/d7592445-357a-4da3-8a7e-eca6e608fb9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zcJkvK7NculMD4JHrLZo49s5X520hjStrsqlpdtggCw=","crlite_enrolled":false,"id":"211419dc-84cb-45b0-8f04-eec2531753e9","last_modified":1580831371695},{"schema":1580831321448,"derHash":"wlxO28NuP7fD2Te+6fLSnjavsHz6MYgmLg1f3JGeDXc=","subject":"CN=DPDHL User CA I4,O=Deutsche Post AG,C=DE","subjectDN":"MEMxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMRkwFwYDVQQDExBEUERITCBVc2VyIENBIEk0","whitelist":false,"attachment":{"hash":"2284b18d3214c38aca82371dca2b990cd83a71d4db5f694b2c5db7ac5b811d0e","size":1618,"filename":"OWNuV6Vtom_Tl21u76ItEZifNmUFqyk8bIdhqTYbo0o=.pem","location":"security-state-staging/intermediates/588fe312-43ff-488f-a400-d053f2bece0f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OWNuV6Vtom/Tl21u76ItEZifNmUFqyk8bIdhqTYbo0o=","crlite_enrolled":false,"id":"03b918a8-4f61-4afe-803b-34daeebcdbc5","last_modified":1580831371691},{"schema":1580831314282,"derHash":"xMfENr2I6OaNsAKX34OsyBnhmGOboAUiyOMkWHaJhSM=","subject":"CN=NAESB Issuing CA - SHA384 - G4,O=GMO GlobalSign Inc.,C=US","subjectDN":"MFQxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNHTU8gR2xvYmFsU2lnbiBJbmMuMScwJQYDVQQDEx5OQUVTQiBJc3N1aW5nIENBIC0gU0hBMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"e422c75bd14759c6d943cddb3c942e6cb19ff73705f805417a8a2f8b7b0fa999","size":1995,"filename":"t0THBpo4KRCZCa973c4m7iljnz-pEFkuYmErlNe9hqM=.pem","location":"security-state-staging/intermediates/eaf540e0-1fbe-4611-8993-c52d3bef4f6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t0THBpo4KRCZCa973c4m7iljnz+pEFkuYmErlNe9hqM=","crlite_enrolled":false,"id":"3f6f60eb-e924-4cdc-a702-722960fe9832","last_modified":1580831371685},{"schema":1580831317160,"derHash":"Zz401+HmslwYfzkcxJE4tHIqkH4z9bdIe2E7tt/niQk=","subject":"CN=University of Patras TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHYxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMS4wLAYDVQQDDCVVbml2ZXJzaXR5IG9mIFBhdHJhcyBUTFMgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"0d52e770e64ec62a5d607f5c7443737f99e82d18a9a8f2a17529cad9f1efee82","size":2836,"filename":"rjG2r01snR1vtNko4nWlkriwJxHfOXpXBBH61kCBBWk=.pem","location":"security-state-staging/intermediates/18240d87-7e34-4a1d-91a9-dc48596e156c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rjG2r01snR1vtNko4nWlkriwJxHfOXpXBBH61kCBBWk=","crlite_enrolled":false,"id":"08c5fddf-3321-4860-b075-e3f26e028ae0","last_modified":1580831371679},{"schema":1580831320021,"derHash":"FU5INLKNT7H5D+6TXQ3eRsRaF3/BQloCjGhcMoVaha0=","subject":"CN=AbbVie AATL ICA 2020,O=AbbVie\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxBYmJWaWUsIEluYy4xHTAbBgNVBAMTFEFiYlZpZSBBQVRMIElDQSAyMDIw","whitelist":false,"attachment":{"hash":"ba9c71096f49bdde519be7fb7f247b426ff900568ff7a2ba2316f147a992cead","size":2434,"filename":"GI2Jkvlij3dVdDLgyRLzTDluE3sQAJFLYa_aA9xUM0c=.pem","location":"security-state-staging/intermediates/ae91d22f-44b3-413a-955d-a4f8a924a57e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GI2Jkvlij3dVdDLgyRLzTDluE3sQAJFLYa/aA9xUM0c=","crlite_enrolled":false,"id":"29a5d15e-9394-46f4-9880-8dceb939b8d1","last_modified":1580831371676},{"schema":1580831312622,"derHash":"Xn/LnJe9pWmTsWWNEgIydh1mWjZEU0MA+mpb7F4NV5U=","subject":"CN=Trafigura PTE Ltd S/MIME ICA 2020,O=Trafigura PTE Ltd,C=SG","subjectDN":"MFUxCzAJBgNVBAYTAlNHMRowGAYDVQQKExFUcmFmaWd1cmEgUFRFIEx0ZDEqMCgGA1UEAxMhVHJhZmlndXJhIFBURSBMdGQgUy9NSU1FIElDQSAyMDIw","whitelist":false,"attachment":{"hash":"250b875f651857d2b605dc8e52718c96fa970d9e56b6d9707052af92fb6cdfa2","size":1630,"filename":"M7IzU76VFwCyiys4kdB9s9rTtdHRcgivamjLj2kzia0=.pem","location":"security-state-staging/intermediates/53a4f63c-1629-4fd9-9f20-bfe3cd2b942b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M7IzU76VFwCyiys4kdB9s9rTtdHRcgivamjLj2kzia0=","crlite_enrolled":false,"id":"910675bd-2aaf-44d3-a72d-003713f103f5","last_modified":1580831371673},{"schema":1580831309740,"derHash":"Logg3A6vrj1tKFwFfs4URws3dDiwAs7dTHK080OlT0M=","subject":"CN=GlobalSign CA for AATL - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"06608a25d2fe312140d296f45b61f4e40a3f0c7008ae57216e239fb8cbdd14f8","size":1666,"filename":"NsJvmEwzvkjFIbS9AQUkdxT3pZQun6S6_bLxVOtwgPY=.pem","location":"security-state-staging/intermediates/dca9077d-3cc6-4e61-9348-5ca4fd9bd72b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NsJvmEwzvkjFIbS9AQUkdxT3pZQun6S6/bLxVOtwgPY=","crlite_enrolled":false,"id":"39f68ef8-75fb-467a-9830-b68adf4c7e9e","last_modified":1580831371670},{"schema":1580831308352,"derHash":"ETE43XshZyWEAjji1+7ss3ONsTkGSyTLhT/CcKSeYFc=","subject":"CN=LinQuest SMIME CA 2020,O=LinQuest Corporation,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRMaW5RdWVzdCBDb3Jwb3JhdGlvbjEfMB0GA1UEAxMWTGluUXVlc3QgU01JTUUgQ0EgMjAyMA==","whitelist":false,"attachment":{"hash":"1964c93083547483ce396c6b7394a6a320a45144235ba95d5d3f41767333748d","size":1662,"filename":"OTbNG9ctIq9fLcNWLKN-6TPCNxKIXtezx3cvW-VNjTw=.pem","location":"security-state-staging/intermediates/1ccd3681-1ed9-44af-90cf-e9ca70a463ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OTbNG9ctIq9fLcNWLKN+6TPCNxKIXtezx3cvW+VNjTw=","crlite_enrolled":false,"id":"5c4141c4-8b62-4cb1-bf86-432c9861196e","last_modified":1580831371667},{"schema":1580831306957,"derHash":"8GjeqhjMAtWovjXLgzgyeRApH25i5yFqk0dkoaukqAA=","subject":"CN=GlobalSign PersonalSign 1 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"92689792fad9cd14100ac0efc4e9c934a5d181ec306067de07973b086f7f08c0","size":1719,"filename":"YRypdHS0Ru4gIYd-v2Cul5vQVyh8seMxVJvPr2qLJOA=.pem","location":"security-state-staging/intermediates/b14cd6cf-79b6-4e53-a744-d93d0935a1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YRypdHS0Ru4gIYd+v2Cul5vQVyh8seMxVJvPr2qLJOA=","crlite_enrolled":false,"id":"3fc3c911-3c15-4079-bd82-f0a75e90547b","last_modified":1580831371664},{"schema":1580831304072,"derHash":"fixTc5fnuNmyTYfzBMluoFekB84R0LZtmbpLiiK7EWc=","subject":"CN=University of the Aegean TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMTcwNQYDVQQKDC5IZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENBMTIwMAYDVQQDDClVbml2ZXJzaXR5IG9mIHRoZSBBZWdlYW4gVExTIFJTQSBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"6da62caec34c8ba27123e839c8b9d42f2f11146e20354529cc5a9bff3a1a6f42","size":2816,"filename":"-2hOVMwfAeVZbcXurvYs9YQXog6eDjr_2LpDSHWN4k8=.pem","location":"security-state-staging/intermediates/3f60dcda-f35c-432b-9148-214d88b8bf88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+2hOVMwfAeVZbcXurvYs9YQXog6eDjr/2LpDSHWN4k8=","crlite_enrolled":false,"id":"8e460471-24d1-4c87-ae97-394153845668","last_modified":1580831371661},{"schema":1580831302660,"derHash":"TnB4Z5RqwFNDxrqP8SHqZqdYA3kTJXqO5JdDUNOaEDQ=","subject":"CN=GlobalSign PersonalSign Partners CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiBQYXJ0bmVycyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"1c645bcac68fa67210aa0c2da55360e71914c6ed7e5ac89b02c1a00e4e9d897a","size":1670,"filename":"F0bWPekPIC9_nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=.pem","location":"security-state-staging/intermediates/67048fec-2fba-43f3-8088-3d8e682cc628.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F0bWPekPIC9/nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=","crlite_enrolled":true,"id":"a44d553d-2d55-4d48-b6f0-79321a1a5f3c","last_modified":1580831371658},{"schema":1580831311193,"derHash":"Eo3tGorWDCS0JU4x25T8Q5K/k+1UNEcqpDoLmFYQYGg=","subject":"CN=NAESB Issuing CA - SHA384 - G3,O=GMO GlobalSign Inc.,L=Portsmouth,ST=New Hampshire,C=US","subjectDN":"MIGBMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTmV3IEhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0aDEcMBoGA1UEChMTR01PIEdsb2JhbFNpZ24gSW5jLjEnMCUGA1UEAxMeTkFFU0IgSXNzdWluZyBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"38bdf0865a2acc0ad3abac1f138e15080391b32d0a2516ec72427913339424f1","size":2251,"filename":"LV_Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=.pem","location":"security-state-staging/intermediates/db701e77-79df-4689-a701-eab7648377a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LV/Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=","crlite_enrolled":false,"id":"e94653b0-4ce9-48b9-95e6-a108f69af72e","last_modified":1580831371656},{"schema":1580831305601,"derHash":"ptmjeSc0nedGTI2mP2Ac5VwhS+/XsyRnnmThsw91zv8=","subject":"CN=SRI International CA - G3,O=SRI International,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRowGAYDVQQKExFTUkkgSW50ZXJuYXRpb25hbDEiMCAGA1UEAxMZU1JJIEludGVybmF0aW9uYWwgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"68736c3ea587d110029f29fab96f407ca21f42efed8b5a2dcd08d36ee102c762","size":1967,"filename":"6A_h_ePWgZWtzRg2oGoR7XWlHGi2tZLjeMmvfUXp4Jk=.pem","location":"security-state-staging/intermediates/9cdf9ab0-57bf-4725-9363-936388693103.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6A/h/ePWgZWtzRg2oGoR7XWlHGi2tZLjeMmvfUXp4Jk=","crlite_enrolled":false,"id":"4db81cce-52f9-4678-ba47-e88290532416","last_modified":1580831371653},{"schema":1580831297956,"derHash":"GB3Ivn6R7fFj5mzD+tFNl5ptrlO1Vtruj33KDhFMFPY=","subject":"CN=GTS Y3,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTM=","whitelist":false,"attachment":{"hash":"f539ab8855770bc8a9e8f1286baa54629b8813ded2d2972aa64a9f3e37d83152","size":1065,"filename":"LbcjaXDdzSbOmLRKWKuGWSqd6T4QuNVJwnA_RYD9a1k=.pem","location":"security-state-staging/intermediates/5e1d14ec-bfc9-439f-a503-78429b0b2596.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbcjaXDdzSbOmLRKWKuGWSqd6T4QuNVJwnA/RYD9a1k=","crlite_enrolled":true,"id":"e503815e-602e-4784-b2b8-996d3d90a704","last_modified":1580831371650},{"schema":1580831300864,"derHash":"rshjiY8oTWzUxqP2w+ZSNICjWcM9r2b60zgYSbi7AYs=","subject":"CN=Cloudflare Inc RSA CA-2,O=Cloudflare\\, Inc.,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDbG91ZGZsYXJlLCBJbmMuMSAwHgYDVQQDExdDbG91ZGZsYXJlIEluYyBSU0EgQ0EtMg==","whitelist":false,"attachment":{"hash":"842301a8382a5def37850ade1e06b5c25ea99a6c56136a48f896bd964b68090f","size":1654,"filename":"hS5jJ4P-iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=.pem","location":"security-state-staging/intermediates/a38d6897-15d6-441e-b9ae-07da1d37dbb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hS5jJ4P+iQUErBkvoWBQOd1T7VOAYlOVegvv1iMzpxA=","crlite_enrolled":false,"id":"57692346-8878-48fc-aea7-e7f609f4a9de","last_modified":1580831371647},{"schema":1580831291682,"derHash":"Ho8FHyIm+ZLRe3zxfw3s4Kp2mQLp/o0R81sZsYpaFPE=","subject":"CN=National Technical University of Athens TLS RSA SubCA R1,O=Hellenic Academic and Research Institutions CA,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDQTFBMD8GA1UEAww4TmF0aW9uYWwgVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2YgQXRoZW5zIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"5e004b9b1d085376feba71c29967263b5cdcc31cca7e606092c3f736254d0209","size":2889,"filename":"YiljC0xS2lPq3_MnjzPbKhYhVKBYFBS37Ng6sk1TQZA=.pem","location":"security-state-staging/intermediates/b378de2a-a5be-440b-bb97-be8c716f2e42.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YiljC0xS2lPq3/MnjzPbKhYhVKBYFBS37Ng6sk1TQZA=","crlite_enrolled":false,"id":"34feab45-913a-4dd1-84b7-d99d60446e72","last_modified":1580831371641},{"schema":1580831294634,"derHash":"TefMrLUJmUJkSVDyzIYTQBJWXGFNUap9MIf6wZaVihQ=","subject":"CN=e-Szigno TSA CA 2017,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHTAbBgNVBAMMFGUtU3ppZ25vIFRTQSBDQSAyMDE3","whitelist":false,"attachment":{"hash":"99eeb6166b538653a00b3b422cf44072341a5b8d18f5b0e12e8ec8a1a8760f47","size":1987,"filename":"-zUr-M0QExvXqqFmoTjEoyptTZT9_MSzDynC4xICVcw=.pem","location":"security-state-staging/intermediates/39b65a62-38b8-4d9c-869d-927659d4f92c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+zUr+M0QExvXqqFmoTjEoyptTZT9/MSzDynC4xICVcw=","crlite_enrolled":false,"id":"91caa638-4e14-4a27-b77c-09e6164f4747","last_modified":1580831371638},{"schema":1580831296037,"derHash":"qg6DtK4ANmeXA9FgO8fmOggEZKAzrkufRlg4rchcYe0=","subject":"CN=QuoVadis Belgium Issuing CA G2,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MHMxCzAJBgNVBAYTAkJFMRkwFwYDVQRhDBBOVFJCRS0wNTM3Njk4MzE4MSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEnMCUGA1UEAwweUXVvVmFkaXMgQmVsZ2l1bSBJc3N1aW5nIENBIEcy","whitelist":false,"attachment":{"hash":"22347539759669106f3a7765621fb849dad1b802618f047a90329fb3d5376e8f","size":2385,"filename":"4nY96le5C7s4z7Zn4U54gjJ0DBkcyRkQdgPUP_7jCug=.pem","location":"security-state-staging/intermediates/1a441015-13b3-4f5f-9e9f-0a828fcbb180.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4nY96le5C7s4z7Zn4U54gjJ0DBkcyRkQdgPUP/7jCug=","crlite_enrolled":true,"id":"a39fe513-6200-46a9-8bf3-1bcfd4a39f50","last_modified":1580831371635},{"schema":1580831293178,"derHash":"vjPRxX693ZJ7V722BL5Fe1Uv5Wjn89y6CTw57Rwwojk=","subject":"CN=GlobalSign Timestamping CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTI1NiAtIEcz","whitelist":false,"attachment":{"hash":"c80175b04163d7cc6c7d2e9c5545512450e2d6810fe45aa00ba94a8632fd95a8","size":1638,"filename":"0IJvE5elXx6yt0HsXWztwcpMm15CK7mQObUFIdbDWQA=.pem","location":"security-state-staging/intermediates/28332d18-1b84-4af3-b61b-e54f8d27de50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0IJvE5elXx6yt0HsXWztwcpMm15CK7mQObUFIdbDWQA=","crlite_enrolled":false,"id":"9ae52d06-d6e8-4b06-a154-7d811ca1d920","last_modified":1580831371632},{"schema":1580831290205,"derHash":"vh/8Dh/2CIEE9D4yfnx9xyqcp7DfBXkxI6vjLerO528=","subject":"CN=GlobalSign CA 6 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDYgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"90ada09c822f53f63600f66563831e5787d6a5e5019b3df727996081461170a0","size":1739,"filename":"T_CPVYCiPuMLEQIHPvaGV6XWv5XN7SPSvzuu2ITgIPA=.pem","location":"security-state-staging/intermediates/90f113d9-557a-46c1-9cce-85418c9cdbc0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"T/CPVYCiPuMLEQIHPvaGV6XWv5XN7SPSvzuu2ITgIPA=","crlite_enrolled":false,"id":"65450678-db0b-4efa-acf6-1b5f28c8c48b","last_modified":1580831371626},{"schema":1580831335038,"derHash":"+OO/Hv4I73AMTtv9xP8xnVjst4DfsN2n1RBHs5socY4=","subject":"CN=WoTrus DV Server CA  [Run by the Issuer],O=WoTrus CA Limited,C=CN","subjectDN":"MFwxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDExMC8GA1UEAwwoV29UcnVzIERWIFNlcnZlciBDQSAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"cb3db8844f4cf6e57c8cf55d76cc5f8f0b417e0ed22a9fc06cf2741ac0a55336","size":2101,"filename":"-VWlwEVcGawfAmx6yUXVECmp5xZpZ7uvqv3Jr-xEvE4=.pem","location":"security-state-staging/intermediates/6d8b593d-3f3a-4270-99f9-acc5c0f72b4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VWlwEVcGawfAmx6yUXVECmp5xZpZ7uvqv3Jr+xEvE4=","crlite_enrolled":true,"id":"00a2f6a9-b608-4e1c-87f2-7a5cfea1b7f1","last_modified":1580831371623},{"schema":1580831335834,"derHash":"GZ7lgAlVXa4s2gYmkxxkOR1qiMzLH58LLugLZn9YHAY=","subject":"CN=Cisco Meraki CA,O=Cisco Systems\\, Inc.,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNDaXNjbyBTeXN0ZW1zLCBJbmMuMRgwFgYDVQQDEw9DaXNjbyBNZXJha2kgQ0E=","whitelist":false,"attachment":{"hash":"7342f611caee0df18ce789033dc9e56f170d71c7d12b34b4fc9e466d18ae427d","size":1638,"filename":"GUIjMNe--V5-Oj0iDybPHPoFZBo3KkQeXR-6l1vJW34=.pem","location":"security-state-staging/intermediates/0ccbae70-0f86-469f-b039-43d5e133fcba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GUIjMNe++V5+Oj0iDybPHPoFZBo3KkQeXR+6l1vJW34=","crlite_enrolled":false,"id":"b4089320-2338-4364-9003-455eb7c3db79","last_modified":1580831371617},{"schema":1580831337070,"derHash":"ldmo0w9rHAacKWs+EGvDzgHrhK1Xhg0PRr9/FdBTscA=","subject":"CN=DigiCert TLS ICA GeoTrust PCA-G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEpMCcGA1UEAxMgRGlnaUNlcnQgVExTIElDQSBHZW9UcnVzdCBQQ0EtRzM=","whitelist":false,"attachment":{"hash":"4514cda38d635585a4a6d2254c3883dd54f1c32575f05f56e6eb49c1d11f3d6f","size":1711,"filename":"3RehXzWRn3R3fv3cusa5RRk9PlyTmd350YfJjNQPvrc=.pem","location":"security-state-staging/intermediates/27e7e058-1946-43a0-a9ac-2cc8952ea030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3RehXzWRn3R3fv3cusa5RRk9PlyTmd350YfJjNQPvrc=","crlite_enrolled":false,"id":"489a2b6c-03ce-4f5b-bd5e-7d870f6a3c38","last_modified":1580831371598},{"schema":1580831330114,"derHash":"ZjY2wD/QtbFx8rBEB8Pfdns0nIqZDYfOSFiYFm4rUSA=","subject":"CN=Symantec Class 3 ECC 256 bit EV CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMjU2IGJpdCBFViBDQSAtIEcy","whitelist":false,"attachment":{"hash":"9f762e9d208c868f54d1d9f22496087a7c2ddf82038a661413c0fcada8947697","size":1581,"filename":"PtK3zjOppRxW-hXzyuP7gC8Nt8hPS735XLgT-lQ1KTo=.pem","location":"security-state-staging/intermediates/ef5cc88d-3503-4e5e-bf8b-346475ed4c49.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PtK3zjOppRxW+hXzyuP7gC8Nt8hPS735XLgT+lQ1KTo=","crlite_enrolled":false,"id":"f82e3ad4-2109-405b-875a-44254587907f","last_modified":1580831371592},{"schema":1580831333860,"derHash":"iegKPtct9z5Y2yN0Tiyj7LwiX3UKYda+JoEk98leRls=","subject":"CN=TrustSafe Organization Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR","subjectDN":"MIGTMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxLDAqBgNVBAMMI1RydXN0U2FmZSBPcmdhbml6YXRpb24gVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"741eb73cef38e441d495e385775b23b7e66578c11dcfd91591514ce55e8d824d","size":2255,"filename":"F8P6yRGn6PHOPi3LHmd5_Awd3GeSxMlyfUhUwxtVaoU=.pem","location":"security-state-staging/intermediates/28295eb2-0fa4-40e0-b2af-e05ece3ff066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F8P6yRGn6PHOPi3LHmd5/Awd3GeSxMlyfUhUwxtVaoU=","crlite_enrolled":false,"id":"80b7ece4-c29e-4494-ad88-0dd9d4fd72bc","last_modified":1580831371589},{"schema":1580831333485,"derHash":"Ies3q0z274ll7BdmQJyna4suA/LRo4jfc0II6G3u5nk=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"d90539ef3ff76bf2ac792ae9bbc21d751d2ce841eab7781e291ab04fd791d950","size":2259,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/3211ad63-2e73-4235-916c-6b7f2a4c67d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"d468c05a-c173-4f74-855c-1e3eba3d2298","last_modified":1580831371587},{"schema":1580831339464,"derHash":"pBBtqF97NKbT3jeITRUokWuE8Eb/t9SqxSERewxplfM=","subject":"CN=Orion Health Direct Secure Messaging CA,OU=Orion Health Direct Secure Messaging,O=Orion Health Inc.,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRT3Jpb24gSGVhbHRoIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEwMC4GA1UEAxMnT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nIENB","whitelist":false,"attachment":{"hash":"8942a52d799e4407f98a25999571b12fe4fe70ec9e8c96715a5740c25bdb1d28","size":2239,"filename":"bDFIpmFQnVfXPxjH5kSmVzxV7SFcnyivqEmwWZSPF3U=.pem","location":"security-state-staging/intermediates/b59d9fc5-64da-4fb3-8e0b-33e5ae941228.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bDFIpmFQnVfXPxjH5kSmVzxV7SFcnyivqEmwWZSPF3U=","crlite_enrolled":false,"id":"39d3f04d-1e55-44d2-ac2c-207049c51797","last_modified":1580831371578},{"schema":1580831339070,"derHash":"LarG/frBbFSMU/8RmCVNfpN3YdIqHnzFwalGLpcUYfU=","subject":"CN=TrustAsia ECC EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"97a9ce8bbe9252f62216d67f4991a416a4fcdeaadd410a6256c49e9a395d1a3a","size":1427,"filename":"FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=.pem","location":"security-state-staging/intermediates/d7338706-64ff-461f-8703-a9d2acd7dd78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FM2DBzyPjxqgoESMdjtIkhgTqwpjNM94Fncf5hoKBAg=","crlite_enrolled":false,"id":"518e4647-08ec-44a9-941f-366feccac035","last_modified":1580831371575},{"schema":1580831334241,"derHash":"vzVY+HfonSfapg2pZxZ2Vw376yFdhKxaNxItZ3a3j24=","subject":"CN=GeoTrust EV ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"76fd10b988ddc4d10ef675e1353505739b36be3396db70baccebfc087010c5f1","size":1390,"filename":"KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4_NrxCA=.pem","location":"security-state-staging/intermediates/196ccf12-c8cc-45fb-8759-263709c412c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KZiLkK8HMbpxJlPzQa3CEz5YMCWvdd0o1cov4/NrxCA=","crlite_enrolled":false,"id":"840a78d8-f593-4732-8812-b23743799fe7","last_modified":1580831371556},{"schema":1580831332364,"derHash":"q47piksrl+WQXs6ApkMEwUOrONlQj/cob2gjXg22iic=","subject":"CN=Florida HIE Exchange CA G2,OU=Florida HIE,O=Harris Corp,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtIYXJyaXMgQ29ycDEUMBIGA1UECxMLRmxvcmlkYSBISUUxIzAhBgNVBAMTGkZsb3JpZGEgSElFIEV4Y2hhbmdlIENBIEcy","whitelist":false,"attachment":{"hash":"f3852aeda8f85636e7791041b0694b02b52d33de2a769be09274f1ca984f7733","size":1780,"filename":"1nUKEuk4dEhejnwcerLSNmjLvtZghm_IXhlNdSkF4cc=.pem","location":"security-state-staging/intermediates/305047b8-a83b-4757-a971-623606a36267.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1nUKEuk4dEhejnwcerLSNmjLvtZghm/IXhlNdSkF4cc=","crlite_enrolled":false,"id":"70561ed2-fa24-49f8-965b-a8c8a121ce7d","last_modified":1580831371552},{"schema":1580831334622,"derHash":"uPROSx+Gl99Uuz0PHmdZbOL+nauoWvTm8qLnQ5b4xW0=","subject":"CN=DigiCert Assured ID CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQ==","whitelist":false,"attachment":{"hash":"9f1924a62b10e5287c42ac43753e12a092080fb0e6308ba0aaff1cbf62b2da97","size":2402,"filename":"eabi0-qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=.pem","location":"security-state-staging/intermediates/542904ea-61fa-4fda-8838-3d7167d5a926.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eabi0+qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=","crlite_enrolled":false,"id":"621f1f02-ada1-4425-aee3-ad581ab0a99a","last_modified":1580831371550},{"schema":1580831332734,"derHash":"D7bOgJCdGa/uaojJWenpqmRmcVvOBcZEn+tTCghtrxQ=","subject":"CN=GeoTrust SupremeSSL EV 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJDAiBgNVBAMTG0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBDQQ==","whitelist":false,"attachment":{"hash":"384493a25bd899d9fdf55deb2a362135f4ec8be8dc34518f6004cef3e417556c","size":1691,"filename":"uG3aQXLPd55q_z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=.pem","location":"security-state-staging/intermediates/df7f43b0-32fb-48f8-a431-f2b77edc9607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uG3aQXLPd55q/z1RlGHWJQcDYD5HzCoVUz8Q5eD3Rlw=","crlite_enrolled":false,"id":"b7c4e0d2-c4b9-4872-b1e7-b9f4dc59e44c","last_modified":1580831371547},{"schema":1580831329745,"derHash":"NU/PxhYqDuIgXb72iTHngDPs6dEl4IJOSbrr+C390Wc=","subject":"CN=GeoTrust SupremeSSL 1 CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGIxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xITAfBgNVBAMTGEdlb1RydXN0IFN1cHJlbWVTU0wgMSBDQQ==","whitelist":false,"attachment":{"hash":"324604ce7c1feb1281d395804fd405d53c1027c74aaaa93ab18d05f841ca2630","size":1707,"filename":"SM-CBbHgVoJj8KYqNoXbUd-IGEbfvpomZR5lGHQ3qng=.pem","location":"security-state-staging/intermediates/a8e9d4d9-73f3-4a4e-a0dc-fdd198240404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SM+CBbHgVoJj8KYqNoXbUd+IGEbfvpomZR5lGHQ3qng=","crlite_enrolled":false,"id":"63d1b703-15d1-445c-b43c-64ca8d44bf0a","last_modified":1580831371545},{"schema":1580831336666,"derHash":"lNTs4u2aVFe5aaE7JgSJ6aX+R5CgQfJ6PrQSbIRBjvk=","subject":"CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c0d77ccda911d76f8c80ebf6c501b4dba9c6a787604981af5b3c3a9f954bac59","size":1642,"filename":"v2OX1FzmsvhGRs3vKv7P5R4N-Aly9A_qKXxfEauTwao=.pem","location":"security-state-staging/intermediates/b3abe3ee-8707-467d-8091-1ab64836b606.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v2OX1FzmsvhGRs3vKv7P5R4N+Aly9A/qKXxfEauTwao=","crlite_enrolled":false,"id":"86931689-a92f-49d4-a149-95fd2b1d44eb","last_modified":1580831371541},{"schema":1580831337881,"derHash":"UET2XhBCzTgLC5mX5CgzWPDe73hz2nLv228CR0rjfr4=","subject":"CN=QuoVadis Swiss Advanced CA G2,O=QuoVadis Trustlink Switzerland Ltd.,C=CH","subjectDN":"MGMxCzAJBgNVBAYTAkNIMSwwKgYDVQQKEyNRdW9WYWRpcyBUcnVzdGxpbmsgU3dpdHplcmxhbmQgTHRkLjEmMCQGA1UEAxMdUXVvVmFkaXMgU3dpc3MgQWR2YW5jZWQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"52468c6ff74eaacb84d6dd6f765d0298d7770b1dae8e98d5802a8d4f567db964","size":2003,"filename":"PCO7NaLxR0Lr-39nGUXqmY4h-pmQMueSQPa8s2l13l4=.pem","location":"security-state-staging/intermediates/57cd48b2-3a6e-4130-89c2-dc40d75c65c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PCO7NaLxR0Lr+39nGUXqmY4h+pmQMueSQPa8s2l13l4=","crlite_enrolled":false,"id":"bc7be9c4-1921-4c16-88a4-6eb56aade751","last_modified":1580831371532},{"schema":1580831331616,"derHash":"5bvcytVy7J0t2W4OXr8EmpGB8HDx4zzBY1rY7Eh9IXc=","subject":"CN=DigiCert Federated Trust CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBUcnVzdCBDQQ==","whitelist":false,"attachment":{"hash":"cf01aee2f6176035c8559ce184ffcfadec801283ea8db12c2b9e6f46a098ba52","size":2345,"filename":"uuhysnUgrwe87B8nb6rPmj9TeTzDQNfGrcbWD5032EE=.pem","location":"security-state-staging/intermediates/ecf46a97-981d-4937-b12f-8d513406ce38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uuhysnUgrwe87B8nb6rPmj9TeTzDQNfGrcbWD5032EE=","crlite_enrolled":false,"id":"8eeda8c2-f1aa-4f20-a564-47080b5d7906","last_modified":1580831371526},{"schema":1580831331985,"derHash":"wN0GD/jOVW81aD1WTg5mspBxeICGk/g/OqZCMmv20Mg=","subject":"CN=TrustAsia ECC EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MF0xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMScwJQYDVQQDEx5UcnVzdEFzaWEgRUNDIEVWIFRMUyBQcm8gQ0EgRzI=","whitelist":false,"attachment":{"hash":"0b22b379557262c177cd0df97c067db059c622c348c2768de211920a4cc62a97","size":1398,"filename":"6lJqHj6Al12YiHTPXbfLj9_MNtnpjUBiUvHLHqoVkTA=.pem","location":"security-state-staging/intermediates/7e4a29a7-3ed7-4e85-8e48-c24ebed06855.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6lJqHj6Al12YiHTPXbfLj9/MNtnpjUBiUvHLHqoVkTA=","crlite_enrolled":false,"id":"293e0ccd-71f9-42a4-ac96-f21584cc8fa2","last_modified":1580831371521},{"schema":1580831338677,"derHash":"V9jVuDJha3gjRmoMNydw0WpdzyRlgfD1g3PlHH4eUxY=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"80d4bb692e396cf3ccf6595d18d123459107363391f6c0e030d16cefc85308ba","size":2255,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/e98dee35-7b84-4d8f-9f01-3021b3339da7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"2a5f71dc-243b-43b6-918e-b6e20ae381aa","last_modified":1580831371512},{"schema":1580831335425,"derHash":"UW2FbQNTumn/65weugNdeAhEhXAG7OmcBR7BnBDDbNU=","subject":"CN=DigiCert TLS ICA GeoTrust Global,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEpMCcGA1UEAxMgRGlnaUNlcnQgVExTIElDQSBHZW9UcnVzdCBHbG9iYWw=","whitelist":false,"attachment":{"hash":"2b6a498e6adf7455626036e3d5498468dd85769c78b6b869202cdcc57038e0db","size":1593,"filename":"cAWbaZmut0LWOQOIkM3RvlL9I2y_OHNWu8-bB1lbGXM=.pem","location":"security-state-staging/intermediates/efd1d410-c75a-40cb-896e-c5e083e18935.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cAWbaZmut0LWOQOIkM3RvlL9I2y/OHNWu8+bB1lbGXM=","crlite_enrolled":false,"id":"a86bf8ec-bd1a-453e-982c-b25e4c008a5e","last_modified":1580831371502},{"schema":1580831330483,"derHash":"VEULJ4BS+pGRFgDLmPMQCg+1gVKNj+q5i2/++KSMmY4=","subject":"CN=Actalis Client Authentication CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGNMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLDAqBgNVBAMMI0FjdGFsaXMgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIENBIEcy","whitelist":false,"attachment":{"hash":"888db3995a9779092a92b32155ba48b8f752cb7e76586fcafb29157c596ba126","size":2316,"filename":"6-WU29fzcxxCr7poWUULZoDxQb7pJ5qJhne0S46pWb4=.pem","location":"security-state-staging/intermediates/26b55346-6fba-46c5-ab26-624533bc90b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6+WU29fzcxxCr7poWUULZoDxQb7pJ5qJhne0S46pWb4=","crlite_enrolled":true,"id":"856d2476-aec9-4824-b7ee-236a8f6d0fa0","last_modified":1580831371497},{"schema":1580831338274,"derHash":"wKShrAXgMJajsquKOFArOeJhThE5e+5z0KZris73ooM=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"e3909fbaebb8ef6af7bbffe333d52eafa063b31f216ab25a26f98adacb9b51f6","size":2349,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/202293f2-84fb-4a8c-b939-35ceaeb78a8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"4495c40e-442c-4744-bcea-962e2b93bfd0","last_modified":1580831371491},{"schema":1580831333108,"derHash":"Ql5yyH/yKFXZkItxq0xksNLySChwl2kMYv5zP2Md448=","subject":"CN=DigiCert Assured ID CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQ==","whitelist":false,"attachment":{"hash":"fbcee06cf0f489ec7dc8c26d9e8e072e5eb0c91534e3ec10e979ff1b101f86d8","size":2418,"filename":"eabi0-qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=.pem","location":"security-state-staging/intermediates/061ce3bb-6e51-49c7-a5f9-08a7b270fbdf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eabi0+qj3O40S8QpA1hE3oIeYI7XIBG9Prf9SID0GDQ=","crlite_enrolled":false,"id":"c866113d-8267-4723-993b-0f7fc4008f25","last_modified":1580831371480},{"schema":1580831331243,"derHash":"3LQArMJJ+4SDQV/CZQvJBIjKlmQxGMsOT0Qkshw6paQ=","subject":"CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=","whitelist":false,"attachment":{"hash":"7b2bb2e718615878d60921325a6b6a79bfcdb0076c093323e35de7dc5ccb5e1e","size":2259,"filename":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem","location":"security-state-staging/intermediates/dc2adf52-a65a-47f4-98df-90d1bc2795c0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=","crlite_enrolled":false,"id":"b1fa8b2a-9240-4c89-a31e-bbedfe18d2c1","last_modified":1580831371478},{"schema":1579028939007,"derHash":"bwHOS5alTzv287PwG8FFKQLoBm9+9HoEcdmUicwvhEw=","subject":"CN=DigitalTrust Assured CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGYxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE4MDYGA1UEAwwvRGlnaXRhbFRydXN0IEFzc3VyZWQgQ0EgRzMgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"e3f0a2228d028c7c2d686497c9827724f05379697bdaebfa9ab67fc93565b02b","size":1305,"filename":"9ZrELmXXgaRdMyl2s40R_lSll2UwWzKv_lc0T1G-S90=.pem","location":"security-state-staging/intermediates/df9de46d-ee97-4db0-92c5-106659dc6344.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9ZrELmXXgaRdMyl2s40R/lSll2UwWzKv/lc0T1G+S90=","crlite_enrolled":false,"id":"747489d6-2a1f-4621-b484-55e2f26e43de","last_modified":1579029043788},{"schema":1579028940448,"derHash":"vb9XvRAWOncbKNCdTJAYjVlgcsaZvYJ0/kYo0SUOSb0=","subject":"CN=DigitalTrust Secure CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGUxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE3MDUGA1UEAwwuRGlnaXRhbFRydXN0IFNlY3VyZSBDQSBHMyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"6a1034555007397b09db59427c8e6b61eb18ac3ecad29bdc8289511a2376368e","size":1317,"filename":"n7S9CUGXp7reMdZAD7cwkt9AngliimrF0ya3qfi_Tn0=.pem","location":"security-state-staging/intermediates/92dcc5d2-c2c7-42fd-a315-adf0a0c1e58a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n7S9CUGXp7reMdZAD7cwkt9AngliimrF0ya3qfi/Tn0=","crlite_enrolled":false,"id":"4e95b8dd-b52a-491c-b875-8bf748643131","last_modified":1579029043785},{"schema":1579028933319,"derHash":"0QEGJDi/sK8Fq6ed8A9N1J54uM79XtkpVlwjNhExAZE=","subject":"CN=Global Trust CA - OV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"a82660958c3ea8942f29245ff2b8ee8aec7c0394bfd0909b9fe76c5f958d64c7","size":1252,"filename":"oWD3L7oqjz3vUhAVyhQoyubwAtUDmmdDOlkahsKwP6M=.pem","location":"security-state-staging/intermediates/154a10aa-4805-4fd8-aa5d-4a0114f27a83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oWD3L7oqjz3vUhAVyhQoyubwAtUDmmdDOlkahsKwP6M=","crlite_enrolled":false,"id":"420f7c9b-46e0-4c2e-acf4-354a9e1e107f","last_modified":1579029043779},{"schema":1579028930299,"derHash":"9NaVrak2Ni3frtpkTHzO8k63TcQ404GiivqqEUd65n8=","subject":"CN=Global Trust CA - DV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBEViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"c7355ba281b86440b42869da1995f8827d941dd7f536e3597c74d5f9bf8bf1ec","size":1252,"filename":"LUbiRYLu1pSHTj3Z-ypCjtIr7U83tgAbsXPL2H-meVE=.pem","location":"security-state-staging/intermediates/39747309-5dcc-499d-b5fe-d02d1627de6a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LUbiRYLu1pSHTj3Z+ypCjtIr7U83tgAbsXPL2H+meVE=","crlite_enrolled":false,"id":"5d5a8603-5a22-40cc-bcf3-f79feed83467","last_modified":1579029043776},{"schema":1579028937540,"derHash":"TAjC+6lI1IQ3FLYzoYEmskFwONe3RdpB7RXqp6rnxZk=","subject":"CN=Global Trust CA - Client,O=Global Digital Inc.,C=TW","subjectDN":"ME4xCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSEwHwYDVQQDExhHbG9iYWwgVHJ1c3QgQ0EgLSBDbGllbnQ=","whitelist":false,"attachment":{"hash":"a3e006f755c53595620f6d0060a12fede2112d94f648dcd70d3d87b37675dd85","size":2073,"filename":"JgEFqnj4Eusn8_aqR2_HteSVCb6j5aYpdbZslup32ys=.pem","location":"security-state-staging/intermediates/235af0b7-680c-49da-ad9d-8e6a2e51f1fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JgEFqnj4Eusn8/aqR2/HteSVCb6j5aYpdbZslup32ys=","crlite_enrolled":false,"id":"a4200022-b213-44b7-8b23-b9230dd5c849","last_modified":1579029043773},{"schema":1579028934721,"derHash":"qK7gyk++CQh4qQHLVkElV07GS6KOnpApbtPkkrFgtNk=","subject":"CN=DNEncrypt SHA2 OV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgT1YgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"8ec77c856ada00bc203c0a2a7d135f1f333e047356ddccdecae96b4e7660d604","size":2454,"filename":"oTOjvcPyAYB-WsThLALbWlgbUUxVxj6xmmL3GnHrCkY=.pem","location":"security-state-staging/intermediates/08b4b6d3-6190-461c-ab2c-59d46d235160.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oTOjvcPyAYB+WsThLALbWlgbUUxVxj6xmmL3GnHrCkY=","crlite_enrolled":false,"id":"a6a0c891-36a3-44bb-b93e-90f730832f4a","last_modified":1579029043770},{"schema":1579028926994,"derHash":"mgaeR4zTQUSf8ot8d1LFSuz6usWOS1AoVhZJq0gggNs=","subject":"CN=DigitalTrust Secure CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGUxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE3MDUGA1UEAwwuRGlnaXRhbFRydXN0IFNlY3VyZSBDQSBHNCAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"ee227902a2765dd235ffb37849a132e5ace2b7361e7587f18cf42ce39977a16c","size":2467,"filename":"R683Qs6upExakQVDH-vmwK67rfyDMxBotLmYh7TobVA=.pem","location":"security-state-staging/intermediates/40000abd-9451-4eae-98e4-311a759d8645.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R683Qs6upExakQVDH+vmwK67rfyDMxBotLmYh7TobVA=","crlite_enrolled":false,"id":"2dde196f-ed22-44e8-a3a5-c2cf3108accd","last_modified":1579029043767},{"schema":1579028931778,"derHash":"DaILPAU4a9l1sdvTfw63aJ5qMjZDluBlP/qe7mBnlPU=","subject":"CN=Global Trust CA - DV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBEViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"5cdd0b9b0275f33beab775b37771a02bf084cef5c96a9cf78baff9e34cab1c37","size":2089,"filename":"hwddnilH_pWtWcAnCBvcpQEiJA8MsPuSY74GtASteIo=.pem","location":"security-state-staging/intermediates/8b16acf6-9f74-495d-a9f0-b039aa0c54b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hwddnilH/pWtWcAnCBvcpQEiJA8MsPuSY74GtASteIo=","crlite_enrolled":false,"id":"6224b875-5c34-475b-8cdf-aecad54173d7","last_modified":1579029043764},{"schema":1579028920989,"derHash":"iF6OHcrQdxTzuiysmtv2hxH7LlY2g/xOM0z5JNl8wkU=","subject":"CN=DNEncrypt SHA2 EV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgRVYgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"515389105a63e30072896ef76765146cfb695657c76de28794dd225b612049b3","size":2487,"filename":"EonOFaZgJpBcxWk-Gu5D6SKzi_Nbfzub6RHPOQrObVs=.pem","location":"security-state-staging/intermediates/84327d88-f8a0-4200-a3f7-98e74dd330d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EonOFaZgJpBcxWk+Gu5D6SKzi/Nbfzub6RHPOQrObVs=","crlite_enrolled":false,"id":"aea19046-d765-48b5-896c-bca4d813161f","last_modified":1579029043762},{"schema":1579028923899,"derHash":"6xRHA3Gwku0ggB4h6jllObTkKMFwirjJtwaDQjmdPIE=","subject":"CN=Global Trust CA - EV (RSA),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBFViAoUlNBKQ==","whitelist":false,"attachment":{"hash":"954e40ee7eb9c53e13a02c16f50f72b1a2bcc3abd5f5ca2cfda37936f3b26950","size":2117,"filename":"V2odnnJSCZapUukBa0XBQ7E-peZxS4qRJ22CftbyIG4=.pem","location":"security-state-staging/intermediates/9fd0a474-3344-4a18-81a8-6b47d22813f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V2odnnJSCZapUukBa0XBQ7E+peZxS4qRJ22CftbyIG4=","crlite_enrolled":false,"id":"ea836d76-6bc4-4cdb-8aa6-28726f31823c","last_modified":1579029043753},{"schema":1579028918130,"derHash":"lp4yAFIOssaalmdYfm3U0LI/KPUQzBMXZwqO02E+vq0=","subject":"CN=DigitalTrust High Assurance CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"e74dd2a02806fa7c508188e10a5f0c0712f1cfbccde8988e042626a766beecb4","size":2507,"filename":"LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=.pem","location":"security-state-staging/intermediates/df91fee1-b72c-4071-bb40-85741d9a30db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=","crlite_enrolled":false,"id":"82e3caed-61a5-46f8-b0a5-e0e5548b3eaa","last_modified":1579029043747},{"schema":1579028915292,"derHash":"A3GlU+Ss9AJFkQfo95M3nMVpEw8u4DxBL+2HtcFyQkQ=","subject":"CN=DNEncrypt ECC DV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBEViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"f33c1660f86553d61d7d2c9223b3d32b7720ca57b4c5c5a3542c544085b3ba13","size":1309,"filename":"cMgUafsF3Pj6CXkE48F1T9jPwW-ZXrmmryJ99sHNyYA=.pem","location":"security-state-staging/intermediates/73b1704d-b140-489e-a73d-4b23fc14264f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cMgUafsF3Pj6CXkE48F1T9jPwW+ZXrmmryJ99sHNyYA=","crlite_enrolled":false,"id":"626f9b82-c857-46cc-b90a-e7bcf3ac92cc","last_modified":1579029043744},{"schema":1579028919558,"derHash":"6ZOtZU1FhUS7Dk2n7HxfumDEZFebGyLGWSPd0UpngKw=","subject":"CN=DNEncrypt ECC EV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBFViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"0c64bd4a0285b5cf304cffc344c87492bc476b3a278216dda0ca3efb7367f40d","size":1341,"filename":"m7sp44VsyZf6_AVSHx-N3M0tXcbynVKIOugeitl06ZM=.pem","location":"security-state-staging/intermediates/ffd48335-dab5-42df-8a9e-44fa95bafa0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7sp44VsyZf6/AVSHx+N3M0tXcbynVKIOugeitl06ZM=","crlite_enrolled":false,"id":"777c1fad-dd5b-4d30-a1d2-2cea029d3253","last_modified":1579029043738},{"schema":1579028913702,"derHash":"Ot3JgkDiGnLZxA61BYkFqkDt+jRa3t3lhEzLD0YthPc=","subject":"CN=Global Trust CA - EV (ECC),O=Global Digital Inc.,C=TW","subjectDN":"MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBFViAoRUNDKQ==","whitelist":false,"attachment":{"hash":"a73482c81f3542c42bb1637ffc95ed5fd477eb92360c59b579ee3dcdf8374936","size":1280,"filename":"PRcljLZm-PUuo_QCHUFdjCyCwTjglb9Jg7caPjv8bI0=.pem","location":"security-state-staging/intermediates/1d3bd069-53ec-4918-9c0b-66e52af2eb8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PRcljLZm+PUuo/QCHUFdjCyCwTjglb9Jg7caPjv8bI0=","crlite_enrolled":false,"id":"fcad5a9e-1e6a-49e0-9041-34e4a071516c","last_modified":1579029043735},{"schema":1579028916680,"derHash":"yjd7GIZrI48xqASd/RNgnlSbdROQ7vzbmpoTUxJ/+zU=","subject":"CN=DNEncrypt ECC OV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE2MDQGA1UEAwwtRE5FbmNyeXB0IEVDQyBPViBTU0wvVExTICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"b7a060b2b07e92212754c63a106ae5c0f0264b8a9e50ae75feb93ab2437da7ff","size":1309,"filename":"Vqfldlh0sPrGbhkt70MsWwISyFbsgHXV3Scyfh6rREM=.pem","location":"security-state-staging/intermediates/b4b0e86a-be59-4d75-89d3-13042e2a838f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vqfldlh0sPrGbhkt70MsWwISyFbsgHXV3Scyfh6rREM=","crlite_enrolled":false,"id":"f546b858-d355-4107-834f-3c7e2949cc1d","last_modified":1579029043733},{"schema":1579028909294,"derHash":"FlLGbbZC0KUkv4n/3z7tWo6UsUpusH56ReqAxU+ehZM=","subject":"CN=DigitalTrust High Assurance CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEczICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"3e8bf279c9897937ae0931414eed45e94b47bdf7016de3722ff1cd06587daef8","size":1358,"filename":"mLgcAaWaR7874mBWx4gTZEcxbuqvMnF41qXNwAW8A1E=.pem","location":"security-state-staging/intermediates/14c76e24-e6f7-4004-8696-e7ffffd72208.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mLgcAaWaR7874mBWx4gTZEcxbuqvMnF41qXNwAW8A1E=","crlite_enrolled":false,"id":"4b4467a7-4c39-45a4-a5c8-00e3f9693711","last_modified":1579029043730},{"schema":1579028906281,"derHash":"dYQWlcYABAZgo9NyXlMdPc+vzNJvWIN16rLY0SmQR4U=","subject":"CN=DigitalTrust Assured CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MGYxCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE4MDYGA1UEAwwvRGlnaXRhbFRydXN0IEFzc3VyZWQgQ0EgRzQgIFtSdW4gYnkgdGhlIElzc3Vlcl0=","whitelist":false,"attachment":{"hash":"bbff348acb2ad27e947747edbb0636e41b1168d27439b5bfbfce18f743d587d2","size":2450,"filename":"wVc5iD8EbsOm6PnS6dmUMrpLPgr3_owf0Dl1X-4IYQ4=.pem","location":"security-state-staging/intermediates/9baa2709-0abc-4a36-827c-799f5de9c2af.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wVc5iD8EbsOm6PnS6dmUMrpLPgr3/owf0Dl1X+4IYQ4=","crlite_enrolled":false,"id":"86983387-0e43-46b3-9e47-6a40ed8f8619","last_modified":1579029043727},{"schema":1579028904846,"derHash":"qXQcP6RM+Xd6Sbb1Du1dDrh+lIHzpFCWw5VqXuG7iEQ=","subject":"CN=DigitalTrust CA G4  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MF4xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjEwMC4GA1UEAwwnRGlnaXRhbFRydXN0IENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"84f190959472ef5c60f53b166df0e32ccc218bd9a02ad1184c432a5c1187fd7c","size":2454,"filename":"3MPa3WIVqOW4yU6-w-ZSt3hKIEBpElbYDOX4tDWu1pI=.pem","location":"security-state-staging/intermediates/b67dbf30-2e5f-4572-9a51-963a2e41fcd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3MPa3WIVqOW4yU6+w+ZSt3hKIEBpElbYDOX4tDWu1pI=","crlite_enrolled":false,"id":"b8b2f836-8e81-4a67-8afc-877abf1c8895","last_modified":1579029043724},{"schema":1579028910703,"derHash":"nRkILiQzvlUB9GkSlXD1c4c7Lf6DhrH4qd+pjC+q3Ns=","subject":"CN=DNEncrypt SHA2 DV SSL/TLS  [Run by the Issuer],O=DNEncrypt\\, Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5ETkVuY3J5cHQsIEluYzE3MDUGA1UEAwwuRE5FbmNyeXB0IFNIQTIgRFYgU1NML1RMUyAgW1J1biBieSB0aGUgSXNzdWVyXQ==","whitelist":false,"attachment":{"hash":"a65bbd2c04e427655a0c45d1f82f7685ada08bc874a74ab4e09037ec98ac9d5a","size":2458,"filename":"3E1xVsnJnhe9i57XMuug-LOT83YzrJjC1N60Oln6OaU=.pem","location":"security-state-staging/intermediates/c1c68b60-29de-4cdf-8ba2-7adf17023d5a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3E1xVsnJnhe9i57XMuug+LOT83YzrJjC1N60Oln6OaU=","crlite_enrolled":false,"id":"66492022-3f9c-4abc-b14f-9bce674885fb","last_modified":1579029043721},{"schema":1579028903393,"derHash":"vg1slHe5ggklSa3T1cC9GejxPE9OhelHEpfhxeGax2g=","subject":"CN=DigitalTrust CA G3  [Run by the Issuer],O=Digital Trust L.L.C.,C=AE","subjectDN":"MF4xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjEwMC4GA1UEAwwnRGlnaXRhbFRydXN0IENBIEczICBbUnVuIGJ5IHRoZSBJc3N1ZXJd","whitelist":false,"attachment":{"hash":"eb78b6848ba5286d4224160e64392e5ad1c80330a158642dd0a826b312889cf6","size":1309,"filename":"0r9lDiNtrXm0xXuKfgPxSSDXNDGuK2HF29dk8BUZsCA=.pem","location":"security-state-staging/intermediates/5ba9312c-58e2-408d-ab65-a5b513dd2ccf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0r9lDiNtrXm0xXuKfgPxSSDXNDGuK2HF29dk8BUZsCA=","crlite_enrolled":false,"id":"f4a41986-65e8-483c-bdb5-1b551dcf0317","last_modified":1579029043719},{"schema":1579028942702,"derHash":"pXZN/QRUrToGQouQfbiqQ22mMXIJ6v1h3ULlaud/mxM=","subject":"CN=vTrus DV SSL CA G1,O=iTrusChina Co.\\, Ltd.,C=CN","subjectDN":"MEkxCzAJBgNVBAYTAkNOMR0wGwYDVQQKDBRpVHJ1c0NoaW5hIENvLiwgTHRkLjEbMBkGA1UEAwwSdlRydXMgRFYgU1NMIENBIEcx","whitelist":false,"attachment":{"hash":"2139889982ea46a63a464eeadd8924a0691d8a5aafe08c973053fa5c343bb807","size":1715,"filename":"Lh5Dl4rrZsfMQM9Q9U2BcmEKABgw3NzU5omS-Hb7j-E=.pem","location":"security-state-staging/intermediates/5381eea4-5663-4fb1-8a43-154a02daae8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lh5Dl4rrZsfMQM9Q9U2BcmEKABgw3NzU5omS+Hb7j+E=","crlite_enrolled":true,"id":"74de0e26-7443-4e36-b943-532a38006251","last_modified":1579029043713},{"schema":1579028944355,"derHash":"jlzqHRASUhwnpOEScHArx8mhFW8TUHPWyk5C7ugmJJ4=","subject":"CN=QuoVadis Europe Advanced CA G1,O=QuoVadis Trustlink Deutschland GmbH,C=DE","subjectDN":"MIGAMQswCQYDVQQGEwJERTEaMBgGA1UEYQwRVkFUREUtREUyOTY4OTgzODIxLDAqBgNVBAoMI1F1b1ZhZGlzIFRydXN0bGluayBEZXV0c2NobGFuZCBHbWJIMScwJQYDVQQDDB5RdW9WYWRpcyBFdXJvcGUgQWR2YW5jZWQgQ0EgRzE=","whitelist":false,"attachment":{"hash":"c2dcb9263638c8e20a18233f4f7774cbe2557b5e3f14dc6772a603042c2b5fb2","size":2471,"filename":"cFVZyGLFfkszy_X-hkVMcSVvZFH70X8fvwA5CnidJ9A=.pem","location":"security-state-staging/intermediates/4bb7a95b-e5ad-47af-8a74-99ab87c335aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cFVZyGLFfkszy/X+hkVMcSVvZFH70X8fvwA5CnidJ9A=","crlite_enrolled":true,"id":"98356c2d-a35c-4278-8d52-4deef1c5fa59","last_modified":1579029043711},{"schema":1579028943120,"derHash":"+xFH56uXopu5wRQKvz3oMfTF9g0RuQ/smZoIFjddhFc=","subject":"CN=DC Government SHA2 Assured ID Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US","subjectDN":"MIGnMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMTYwNAYDVQQDEy1EQyBHb3Zlcm5tZW50IFNIQTIgQXNzdXJlZCBJRCBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"0b2d79a38acd24c45b952101f6a70cb8f52427e090db11f7a958102e19ff5991","size":1938,"filename":"eBMo_2IweCsxeqG8ggZwOamIcoYP6_GqxtfdG-LT0UQ=.pem","location":"security-state-staging/intermediates/31697f1b-6613-4efe-9f5a-1c51e06249db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBMo/2IweCsxeqG8ggZwOamIcoYP6/GqxtfdG+LT0UQ=","crlite_enrolled":false,"id":"521e1353-a4bb-4e91-b7aa-955db2c75172","last_modified":1579029043704},{"schema":1579028942315,"derHash":"VJiWPf+mUWBPRn4QjmWhg0cPqbVXwSnd+MnYErTwv5Y=","subject":"CN=NETLOCK Trust Qualified CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSMwIQYDVQQDDBpORVRMT0NLIFRydXN0IFF1YWxpZmllZCBDQQ==","whitelist":false,"attachment":{"hash":"eca87866bec2d4554f1b58f8091c7337c82c9e65d743cf2eba31c9d2757e5244","size":2073,"filename":"fuUqgkkwOoU6AwXExGnKFu7G3knCONHh2ksz-wBRRbY=.pem","location":"security-state-staging/intermediates/5c604286-d66a-44d4-b654-de83a937b1a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fuUqgkkwOoU6AwXExGnKFu7G3knCONHh2ksz+wBRRbY=","crlite_enrolled":false,"id":"ce93fbf8-83be-4a31-acf0-fd669baf4f55","last_modified":1579029043697},{"schema":1579028944748,"derHash":"a6qwxDPXef1qS21W1jBNXm6l3mif41pDA4pAKPNF32A=","subject":"CN=TrustID Server CA O1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElEIFNlcnZlciBDQSBPMQ==","whitelist":false,"attachment":{"hash":"ff57c4d65b0b7547b7257b720248edc7df260a756f562751560760f5692ed85a","size":2398,"filename":"TpfnK_TFKAbtiqXG0BETu96LfmJwwZKETBR58_SIZnk=.pem","location":"security-state-staging/intermediates/cb7629a5-e914-4dfc-8b42-a9f8565378d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TpfnK/TFKAbtiqXG0BETu96LfmJwwZKETBR58/SIZnk=","crlite_enrolled":true,"id":"74822f06-6362-433e-a670-6209b0f88ebc","last_modified":1579029043693},{"schema":1577473661023,"derHash":"WtQYO1Tw4nYtqNkQ4efp8qsvG8TOamOPDbvzN+tKE58=","subject":"CN=Symantec Class 3 ECC 256 bit Extended Validation CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAMTM1N5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"a298322e090d871dee6a5377ed4d7372c1bd2c977bc9067c23d4471b8680577d","size":1406,"filename":"sofhbubvXHTCSb_u26mxxJyvvNAx0U-JADKlcpRG9WA=.pem","location":"security-state-staging/intermediates/cd1dd854-37d4-44b1-b0ea-eaa57fadb3ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sofhbubvXHTCSb/u26mxxJyvvNAx0U+JADKlcpRG9WA=","crlite_enrolled":false,"id":"0cec5b1f-5cf4-4d0d-95f5-f13f8a18d57e","last_modified":1577473769153},{"schema":1577473659233,"derHash":"ZOcWAfcFCSHe4DnANJNhXkiPEvw/zsut9DiqRn7h1Bo=","subject":"CN=GlobalSign PersonalSign 2 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"5fbdd9d4f35d177aa98a436994c97d3b3775ddb8c383c1eb9ef3dea1496456cb","size":1569,"filename":"Uln62-9-5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=.pem","location":"security-state-staging/intermediates/15861c41-dd2c-4e34-a1cf-2cb02237f06a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uln62+9+5Wt3xmkVju62Zqx1VcoZH7PCLXpxS0B8L4k=","crlite_enrolled":false,"id":"8d244824-310b-4dff-a724-1de13c98b0de","last_modified":1577473769150},{"schema":1577473662286,"derHash":"JUvpHBq8so215NZ1opoeeIRgsGWR8bqEl8vReDfier4=","subject":"CN=GlobalSign PersonalSign 1 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"bc9230903dfbbfdcd3c101efc4734db554a1b1c549cf25ffec6ac311d6f57552","size":1569,"filename":"YRypdHS0Ru4gIYd-v2Cul5vQVyh8seMxVJvPr2qLJOA=.pem","location":"security-state-staging/intermediates/eb2091ee-9a1e-4ade-96fc-d8ad4c4294c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YRypdHS0Ru4gIYd+v2Cul5vQVyh8seMxVJvPr2qLJOA=","crlite_enrolled":false,"id":"0b699a25-cbef-43aa-9d17-e10c820aba03","last_modified":1577473769134},{"schema":1577473661866,"derHash":"FQc8a73HRpmohRjCelfJVuXiPWypYZ5SGkaMeHPeT4o=","subject":"CN=QuoVadis PKIoverheid Organisatie Persoon CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGDMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTkwNwYDVQQDDDBRdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"28af41c11c70cf3e8ab413a31b4bfdda3463af11655163604adb33bc16fa601a","size":2584,"filename":"5V1JaYa-6v2oFoMXifuhrjdea3drxtVr9lqziPTCV9M=.pem","location":"security-state-staging/intermediates/13ac31b3-3b06-43f6-adbc-a093f09aa585.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5V1JaYa+6v2oFoMXifuhrjdea3drxtVr9lqziPTCV9M=","crlite_enrolled":true,"id":"7efaa58e-f86c-4e33-a478-1aba997bda84","last_modified":1577473769128},{"schema":1577473661458,"derHash":"m5xV1YbxX0/woS4+h6oq5fbAwhiFfg20zEobp05JP1Q=","subject":"CN=SSL.com Client Certificate Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"60c1324f1b4e8c85bb78e12327e3d72df8cb78ba2d2069292ebb40949c16575c","size":2454,"filename":"YeeUjd94ScdJ8i2-hpJwlv6sWAHbchQGz-Tc2OPHYTY=.pem","location":"security-state-staging/intermediates/65637eab-d23b-44cc-b000-271ee3dc8738.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YeeUjd94ScdJ8i2+hpJwlv6sWAHbchQGz+Tc2OPHYTY=","crlite_enrolled":true,"id":"09522f6d-b510-4a0e-aaf4-f4b95ad1504e","last_modified":1577473769122},{"schema":1576536065510,"derHash":"CCBMUq3aqXpv3vcC9s60uU5Xj4/BwwHJ1RNqs4HPp9k=","subject":"CN=QuoVadis Issuing CA G5,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBJc3N1aW5nIENBIEc1","whitelist":false,"attachment":{"hash":"66f3123973d39ccbf60d892e9ebde107446c11a5c53f318327323821448c1e41","size":2381,"filename":"3Fz_Px_gHN6RuC6dUox8MHiOEiVu0gRwp1hvGNsgDYo=.pem","location":"security-state-staging/intermediates/92f45ca6-dd81-4ea8-8d09-b4f49e9bf983.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3Fz/Px/gHN6RuC6dUox8MHiOEiVu0gRwp1hvGNsgDYo=","crlite_enrolled":false,"id":"7bc692ae-1a69-4513-ab7b-11be9685c440","last_modified":1576536534255},{"schema":1576536064064,"derHash":"6nb58huSvtaYEIVm9fCSEbIExQNcnQGUM8Y1jfoKc8o=","subject":"CN=TI Trust Technologies DV CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSQwIgYDVQQDExtUSSBUcnVzdCBUZWNobm9sb2dpZXMgRFYgQ0E=","whitelist":false,"attachment":{"hash":"c00194c16ee92968419bef2890e0a9f99c7ba4d5e671c1c2d6d8aa388428c9ea","size":2150,"filename":"_TQ1SdM_c-9Y7ggqiTm5AZCppmeqhMts_1_7qE6c-xM=.pem","location":"security-state-staging/intermediates/1b2efaae-5ec5-45f0-ad37-15376c4ec56f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/TQ1SdM/c+9Y7ggqiTm5AZCppmeqhMts/1/7qE6c+xM=","crlite_enrolled":false,"id":"25f9b537-5a44-42db-a613-3918314a6ff8","last_modified":1576536534251},{"schema":1576536062656,"derHash":"5hpIwzz5SqdiSmFEFhoHWmll5qTrTNEcXvvRx5eGLXU=","subject":"SERIALNUMBER=202016,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE2","whitelist":false,"attachment":{"hash":"e8dbb214f2c572f1efa48045b1982c3ecc9acc6245e47f1ef69beb6bbf4d7d20","size":2333,"filename":"nLR5xUKq0rdJtnZz181UU9uGySiik-vmQRP8KKXXm5Q=.pem","location":"security-state-staging/intermediates/d54f9898-1680-47bd-a9d3-899013d3bed5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nLR5xUKq0rdJtnZz181UU9uGySiik+vmQRP8KKXXm5Q=","crlite_enrolled":false,"id":"5e859662-94cb-44d3-8c1d-78e7e9ec6098","last_modified":1576536534247},{"schema":1576536061124,"derHash":"XtlQFWaEpjtyY4OpkIcZ2TFjuZhMPIYpIh8GE7ZRgUA=","subject":"CN=SECOM Passport for Web EV 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIEVWIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"dcd65eecda4a3dced1e4e4ad24854f9c5c361683698a129262cffcca2c3f7911","size":1626,"filename":"Wa2FjlVfGKwvkiH0LYWh-y-ihHlaTmVQ-gqZEsR3RwY=.pem","location":"security-state-staging/intermediates/de596f76-eb11-48b1-81fc-9fbb828ef964.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wa2FjlVfGKwvkiH0LYWh+y+ihHlaTmVQ+gqZEsR3RwY=","crlite_enrolled":true,"id":"a7834442-473f-4afa-8837-5fcba0ed97c0","last_modified":1576536534244},{"schema":1576536058303,"derHash":"DxVUwv1ZGwJWpgjhwTaoN+em4EFWHuCKkRsq/c08bBs=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"619239fa36d141159ca184a5846f04250cf658d2d441555c880bc314397cd6f9","size":1089,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/053b9ee7-c4d5-4804-9f95-f705688c379e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"08445463-0e37-4bbe-a1ed-f079c2145e45","last_modified":1576536534240},{"schema":1576536056853,"derHash":"sKbvA1DnxMYFa+6nr50thgue0QITe5cp08IyFtGVVGo=","subject":"CN=Advanced Class 3 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"0ed62164b86f37c69eb2018a4a79db046f2eae11bfb1c748569dff5da6e94178","size":1768,"filename":"VGt-HUDy6qey1Up5ZYyfXaLC_1Yy9l4AvJsHFIQXC5g=.pem","location":"security-state-staging/intermediates/912a52c5-97ea-4353-806f-dbf6b9c95e81.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VGt+HUDy6qey1Up5ZYyfXaLC/1Yy9l4AvJsHFIQXC5g=","crlite_enrolled":true,"id":"1d065829-106f-4cf5-a7ce-33874e651514","last_modified":1576536534237},{"schema":1576536055441,"derHash":"ZlZv7dYNs64QkQ8qiXB89RWQkgM6cadc2GhR1zWRlBE=","subject":"CN=AffirmTrust Premium Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczEzMDEGA1UEAwwqQWZmaXJtVHJ1c3QgUHJlbWl1bSBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"07e66a596ddcbc285e7ce2b1bcf7871dd6efe67086212e3bc3b716b226897194","size":2259,"filename":"3gMCuDMv_P0gIb194xpHJCsdZogzAhE3N6usv_7BXhk=.pem","location":"security-state-staging/intermediates/df155982-cf71-469c-b7b6-f9ec964f04d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3gMCuDMv/P0gIb194xpHJCsdZogzAhE3N6usv/7BXhk=","crlite_enrolled":false,"id":"3b6cb9bb-6102-43a3-a5ec-c29bd087081d","last_modified":1576536534233},{"schema":1576536054026,"derHash":"uJslas18i/xcE2qFcFdTUCGenVWHmoWn7AzAwSg8JKM=","subject":"CN=GeoTrust Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSkwJwYDVQQDEyBHZW9UcnVzdCBQcmltYXJ5IFRyYW5zaXRpb24gUm9vdA==","whitelist":false,"attachment":{"hash":"3b63926b8672802e6e86e795d069d9b8ebe0d873eda192eea364acc603da92ea","size":1321,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/fb461011-416d-431a-adcc-978da8bb647a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"6867e533-7324-4367-bc4f-614a4d65ee7e","last_modified":1576536534229},{"schema":1576536051207,"derHash":"vq9G0P9iZF9WvhGDDd78ZjN5YZ8zfoVxNJHIOuF5SB0=","subject":"CN=DigiCert High Assurance Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENvZGUgU2lnbmluZyBDQS0x","whitelist":false,"attachment":{"hash":"bcc6fa461c63e72b5b0bdc1f0528fcda516e2b2b7713c3adfd2e23e60cd2e4d3","size":2398,"filename":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=.pem","location":"security-state-staging/intermediates/c6968810-a29a-4b33-a240-69b369665d59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=","crlite_enrolled":false,"id":"a6c9e2a8-cd22-4f84-9e9f-9966c2232b36","last_modified":1576536534222},{"schema":1576536052576,"derHash":"c2CeaO6qi1KAjLUD+46mTt04kj2pxVrniAUatBbddZ4=","subject":"CN=Cybertrust Japan SureMail CA G4,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEoMCYGA1UEAxMfQ3liZXJ0cnVzdCBKYXBhbiBTdXJlTWFpbCBDQSBHNA==","whitelist":false,"attachment":{"hash":"c3fcdbacd6b54d25047ea8d3094785afc7d48a4287b00a64a28107c78a9b5252","size":1768,"filename":"M4LPRPbTPA3AGjc9JdVUp9Em24oAD5Kjau8R089zAB8=.pem","location":"security-state-staging/intermediates/c7a96d3d-04d0-42dd-865d-c5f45b51f284.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M4LPRPbTPA3AGjc9JdVUp9Em24oAD5Kjau8R089zAB8=","crlite_enrolled":false,"id":"6f4c9ab7-9848-46a5-9f9a-5edda5ee1d2f","last_modified":1576536534218},{"schema":1576536049752,"derHash":"22y7hzO+tJOvOccCqd0GdDFOLtMmDNUlCkkUgHV9jqI=","subject":"CN=EC-Ciutadania,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGGMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxFjAUBgNVBAMMDUVDLUNpdXRhZGFuaWE=","whitelist":false,"attachment":{"hash":"5c694da195ee633dd4f5eacef34a18111f5e53e6c9465f5b1f0838a7d708db50","size":2097,"filename":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM_BQAAwtDlBw0=.pem","location":"security-state-staging/intermediates/9b12aa4e-23ee-4d0a-a54c-66e324175fe8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM/BQAAwtDlBw0=","crlite_enrolled":false,"id":"0da25c82-2a82-44ca-9a30-70c090781a84","last_modified":1576536534211},{"schema":1576536046907,"derHash":"wtT9+72C9KHNrEcT46sJmVYJGNehcN3gP33b+aKI3Nw=","subject":"CN=SafeToOpen EV TLS ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"ME0xCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDElMCMGA1UEAwwcU2FmZVRvT3BlbiBFViBUTFMgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"d8dd280ca81928ac5d9f88d5ea7cd0bff13b2f2e60bb565232b7e0ab19fcc49e","size":2438,"filename":"wceoTySaLCXY7FAABlMa1eB4Fc2Vodc8zSQij-gt6Ko=.pem","location":"security-state-staging/intermediates/120899dd-21f2-4b40-a059-69ed9a6e0b01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wceoTySaLCXY7FAABlMa1eB4Fc2Vodc8zSQij+gt6Ko=","crlite_enrolled":false,"id":"18d7553d-a362-4364-81b1-d16f12ae4797","last_modified":1576536534207},{"schema":1576536044022,"derHash":"AL/lF32kDgQFBqBEF/tLgGSBa12HWFKgf8OjZwAJEIA=","subject":"CN=CSS Public Issuing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Common Securitization Solutions LLC,C=US","subjectDN":"MIGcMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjQ29tbW9uIFNlY3VyaXRpemF0aW9uIFNvbHV0aW9ucyBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEeMBwGA1UEAxMVQ1NTIFB1YmxpYyBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"9625d57fc7f6a49deb14728feb83cf7edb83bdf782a5b10e9f2bb3725331b3d9","size":2077,"filename":"rzb3PNwXMW__yJquQWI_mhropzVU1Kcapgx84gb4XHg=.pem","location":"security-state-staging/intermediates/2687e0e3-608a-4004-887b-71f74dececfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rzb3PNwXMW//yJquQWI/mhropzVU1Kcapgx84gb4XHg=","crlite_enrolled":false,"id":"727cccf2-d7e7-4e9c-9ffa-5778d62af14c","last_modified":1576536534204},{"schema":1576536036442,"derHash":"YPU+YDsO+nHGzDS26HwRRfcNyULIn3F2PZD+GOesWJ4=","subject":"CN=IBM Certification Authority G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=International Business Machines Corporation,C=US","subjectDN":"MIGtMQswCQYDVQQGEwJVUzE0MDIGA1UEChMrSW50ZXJuYXRpb25hbCBCdXNpbmVzcyBNYWNoaW5lcyBDb3Jwb3JhdGlvbjE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMScwJQYDVQQDEx5JQk0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzQ=","whitelist":false,"attachment":{"hash":"cfa1d134c87a2adf5d7fd6db4082a050b8ab05ed5a65606f7cb38a7e5dc61951","size":2097,"filename":"9CRueC2hB1f0IGH9tycGhgC7JiLlOmttZCFXZKjuVns=.pem","location":"security-state-staging/intermediates/d4118315-6f84-47da-b5e6-39d23274046f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9CRueC2hB1f0IGH9tycGhgC7JiLlOmttZCFXZKjuVns=","crlite_enrolled":false,"id":"c7140ad4-c587-413b-a16d-54eb6735efca","last_modified":1576536534182},{"schema":1576536034560,"derHash":"KHMACROLTh1tM0qPKAWmCqO+mWnVc7uy8FFjErt/NU4=","subject":"CN=OneSignSSL RSA DV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIFJTQSBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"4fb6ba778562a884883cc8f1c7ddf3cc76924b6c481f1238cd9d0d09eef988cd","size":2154,"filename":"9IAV2sm8fSQPPgrFDnJNElfd6K4uJrxTx15o5jJy9nA=.pem","location":"security-state-staging/intermediates/fd1c6268-0059-46b1-8058-e8765d252ba4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9IAV2sm8fSQPPgrFDnJNElfd6K4uJrxTx15o5jJy9nA=","crlite_enrolled":false,"id":"ec48a0f4-07fe-4af5-898f-dd29d59f3ea3","last_modified":1576536534175},{"schema":1576536031495,"derHash":"29+pGsxNuK2D/MeXjjXWL24y5VEIJzyOyZjjEzWA1mQ=","subject":"CN=TrustAsia OV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgT1YgVExTIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"62f07941ab31ac93b3aa011cf5c969d6144dfa3248c15cf83974bbad7d102dde","size":1821,"filename":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem","location":"security-state-staging/intermediates/01439ed9-c5df-42a3-bd51-09e6f0ab3467.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=","crlite_enrolled":true,"id":"2d04d337-69e3-44ad-9e68-0cfd2a4a4153","last_modified":1576536534164},{"schema":1576536028565,"derHash":"5StEzR5qmtoKBAnRzF1zpvQXYD1w5vXcVIOritrvPKQ=","subject":"CN=DigiCert Transition RSA Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gUlNBIFJvb3Q=","whitelist":false,"attachment":{"hash":"914596db391a90381989f75de44986a84111af1a86a6b47fea188272724fb77b","size":1305,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/476a40fc-77d9-4bbd-9c7f-f592807899f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"8a0d3f97-d849-409d-bcd3-af5446738f74","last_modified":1576536534153},{"schema":1576536022550,"derHash":"UoauHFWKgVN82YcPdJ2W76vC0ro5PfgY3+lep85kUKc=","subject":"CN=HydrantID Client ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMMF0h5ZHJhbnRJRCBDbGllbnQgSUNBIEcy","whitelist":false,"attachment":{"hash":"cb3984f4a713da4d2127e347745132b9485b6c954cea045b71d0577d7480d89d","size":2430,"filename":"8wG5JEK-6eyiSKMnSyu9H-Pc0UuAPV0a_kfNCqvHesw=.pem","location":"security-state-staging/intermediates/5f5ebd57-b000-419a-8646-fb81335b2cf0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8wG5JEK+6eyiSKMnSyu9H+Pc0UuAPV0a/kfNCqvHesw=","crlite_enrolled":false,"id":"c8d9b464-441d-4479-8062-9d2b30308c14","last_modified":1576536534149},{"schema":1576536018232,"derHash":"3BmD8UsAlvsSptgrSCJzDSOHecoFQ8Q8AV8kkklWTU0=","subject":"CN=IHI-EC International Corporation,O=IHI E&C International Corporation,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMSowKAYDVQQKDCFJSEkgRSZDIEludGVybmF0aW9uYWwgQ29ycG9yYXRpb24xKTAnBgNVBAMTIElISS1FQyBJbnRlcm5hdGlvbmFsIENvcnBvcmF0aW9u","whitelist":false,"attachment":{"hash":"e8e00a93568f3fa2e62aeb3a661d6a923d701ea84d6424fd27b3b4118ffb4c5d","size":2016,"filename":"1o2j5nZgvI5dVwmpYiHsdVUKWwz3kjk9zbDYvdSrsJo=.pem","location":"security-state-staging/intermediates/b7c27d63-0da5-4f18-bcef-f5ee1e72c875.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1o2j5nZgvI5dVwmpYiHsdVUKWwz3kjk9zbDYvdSrsJo=","crlite_enrolled":false,"id":"d9ce419c-1a2f-4273-8a12-4fc0839054f2","last_modified":1576536534137},{"schema":1576536016807,"derHash":"hV3KaPgZTW1byUpRzzZM3P/IOCWhItimLkehGEhNN0s=","subject":"CN=ITSO Ltd RSA DV,O=ITSO LTD,L=Milton Keynes,ST=Buckinghamshire,C=GB","subjectDN":"MGwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxFjAUBgNVBAcTDU1pbHRvbiBLZXluZXMxETAPBgNVBAoTCElUU08gTFREMRgwFgYDVQQDEw9JVFNPIEx0ZCBSU0EgRFY=","whitelist":false,"attachment":{"hash":"f7f8ae5a4d6c669308077f3d66de5bced3fc6ce838c89515e89a27eb62208b17","size":2129,"filename":"hoWbyI9IWnkDxapxLWOIsrvM58HKk5XQdT0Wk5A2ovs=.pem","location":"security-state-staging/intermediates/8855bb62-810b-4e29-aa2c-072a825e881a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hoWbyI9IWnkDxapxLWOIsrvM58HKk5XQdT0Wk5A2ovs=","crlite_enrolled":false,"id":"7e6c7559-1afe-4e48-aa16-564c45d842e6","last_modified":1576536534134},{"schema":1576536014868,"derHash":"hDeCMDBAv7M1dnZuFwBpbeD8FIh74pPXJl61ns5O2cw=","subject":"CN=BT Class 2 DigiCert PKI Platform CA,O=British Telecommunications plc,C=GB","subjectDN":"MGQxLDAqBgNVBAMMI0JUIENsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIENBMScwJQYDVQQKDB5Ccml0aXNoIFRlbGVjb21tdW5pY2F0aW9ucyBwbGMxCzAJBgNVBAYTAkdC","whitelist":false,"attachment":{"hash":"62ef2e16ec258184426b6b7eb77c56afc020739891f177c120b217fd8bfba3a2","size":2414,"filename":"oFI13M2pDTmr88JyQ06EE_PwqDFGIYNwj2EVxXS2dII=.pem","location":"security-state-staging/intermediates/d83477f2-d610-4eb1-8c9b-818352128513.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFI13M2pDTmr88JyQ06EE/PwqDFGIYNwj2EVxXS2dII=","crlite_enrolled":false,"id":"9b9d198c-a69d-446c-b648-eda5de768f4b","last_modified":1576536534130},{"schema":1576536011965,"derHash":"X6SbNsctA+QtqkMCUA1kbJSMh6w27TDMPb3bviTGRjM=","subject":"CN=WebNIC ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for WebNIC,O=WebNIC (Web Commerce Communications (Singapore) Pte. Ltd.),L=Singapore,C=SG","subjectDN":"MIHVMQswCQYDVQQGEwJTRzESMBAGA1UEBxMJU2luZ2Fwb3JlMUMwQQYDVQQKEzpXZWJOSUMgKFdlYiBDb21tZXJjZSBDb21tdW5pY2F0aW9ucyAoU2luZ2Fwb3JlKSBQdGUuIEx0ZC4pMTUwMwYDVQQLEyxDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFdlYk5JQzE2MDQGA1UEAxMtV2ViTklDIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"a2a7f841b5ca8fd57463ff8f1b27e4d11398c8605a0f4139ea461bd98ecdca69","size":1443,"filename":"wJUIwtfbQyb8AQ8i7WNkx5y7MTHHrQ3ILlCihfqdp-I=.pem","location":"security-state-staging/intermediates/6b627396-e558-45f3-9641-d84574e674e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wJUIwtfbQyb8AQ8i7WNkx5y7MTHHrQ3ILlCihfqdp+I=","crlite_enrolled":false,"id":"079aab15-46c4-4056-bf61-918aa3d1c397","last_modified":1576536534122},{"schema":1576536019673,"derHash":"wuQjbbG3V7Ubd5ITiO+oI+amAP1L2jC2Ord4hvJWGLc=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"80e5a75a2133c51ce0a9e5cb79192a969122aa9d0010027ed0919b87dfdf6905","size":1638,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/171b6f60-be37-44ac-913e-06a4514e36a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"f66e7da9-1a66-4dc3-b793-faca5bf40093","last_modified":1576536534119},{"schema":1576536010525,"derHash":"Z8RtwXdiZnhE8VlgiTdf9F4FwrMWyJSZ9uf6t4yPA3k=","subject":"CN=GlobalSign Issuing CA for AATL Partners 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTUwMwYDVQQDEyxHbG9iYWxTaWduIElzc3VpbmcgQ0EgZm9yIEFBVEwgUGFydG5lcnMgMjAxOQ==","whitelist":false,"attachment":{"hash":"8b06c8725c287688440cf9bd1330f4a6e7a1522a3af5778fa2d6840dc296bc16","size":2142,"filename":"Gsj1AO3cbWx61NJW93Qr6MNrKZrsf6R-7BgXSXF_iZE=.pem","location":"security-state-staging/intermediates/1e204c9a-f0e4-41c8-af6b-5e43de9851ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gsj1AO3cbWx61NJW93Qr6MNrKZrsf6R+7BgXSXF/iZE=","crlite_enrolled":false,"id":"00c11545-654a-4793-a31c-32844bb8119e","last_modified":1576536534115},{"schema":1576536009127,"derHash":"2FU6KIDpa3qkx0E92QOv09WAUEaV3SahaP1IzOexR0o=","subject":"CN=UZI-register Medewerker op naam CA G3,O=CIBG,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEuMCwGA1UEAwwlVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgb3AgbmFhbSBDQSBHMw==","whitelist":false,"attachment":{"hash":"0cb57be73bd621623092fefcb68872855290eb020523b0a53e53afd972a316e3","size":2544,"filename":"dCyrxAKUK8j5RoQJISk_QPQ9eWh1wvDZFjkJxvysY1M=.pem","location":"security-state-staging/intermediates/3be928bc-8d4b-4aa9-8cf4-f65d61cb6c76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dCyrxAKUK8j5RoQJISk/QPQ9eWh1wvDZFjkJxvysY1M=","crlite_enrolled":false,"id":"0903bf91-4b0c-4d03-945c-ee38128bff24","last_modified":1576536534111},{"schema":1576536006146,"derHash":"al9MFnjKZeWfBg1Xzf9mUGUxSGHVOo59FFDKktlsoQI=","subject":"CN=CRB Group SMIME CA 2019,O=CRB Group\\, Inc.,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9DUkIgR3JvdXAsIEluYy4xIDAeBgNVBAMTF0NSQiBHcm91cCBTTUlNRSBDQSAyMDE5","whitelist":false,"attachment":{"hash":"46bf4a65e1a1d6041a7fd486d3b111820fb297aa92a6aa5e32412d73b2175762","size":1849,"filename":"5uacCErrU9OKxrpS_6aTZMtadjLWMJFTodYoyJ4SiAY=.pem","location":"security-state-staging/intermediates/3379f57c-e87e-469a-ba90-3b4ebbe6718d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5uacCErrU9OKxrpS/6aTZMtadjLWMJFTodYoyJ4SiAY=","crlite_enrolled":false,"id":"83317d20-9d0d-4313-8faf-840701aeed1f","last_modified":1576536534103},{"schema":1576536001652,"derHash":"CUBFHf7LZ1tSBMiuBxidTk6QlXz9K6/c/zbbIMJ56Ro=","subject":"CN=SECOM Passport for Member PUB CA4,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTQ=","whitelist":false,"attachment":{"hash":"67bd2661144de940ff04d2ed4a8a7c1ef3c2122d9e3a8cd9a484dcb81a67f399","size":1601,"filename":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=.pem","location":"security-state-staging/intermediates/974ee8b6-e05b-45c0-b50d-b37049e98644.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=","crlite_enrolled":true,"id":"545f4ef1-6eac-4f67-adf9-fc62354d1a33","last_modified":1576536534099},{"schema":1576536003209,"derHash":"+AhlYjZyW1ZvByHFGBWKZ1bJaQPLcetI3dqO3f6g8mw=","subject":"CN=GRNET Client RSA SubCA R3,O=National Infrastructures for Research and Technology,L=Athens,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMT0wOwYDVQQKDDROYXRpb25hbCBJbmZyYXN0cnVjdHVyZXMgZm9yIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5MSIwIAYDVQQDDBlHUk5FVCBDbGllbnQgUlNBIFN1YkNBIFIz","whitelist":false,"attachment":{"hash":"9ce8e8721d5cca69e41940aaa10d38fe6b27f089228093b65e92232a18aa10eb","size":2913,"filename":"wnEjGCVxs6O7Ii9LxKLgiSA52mkxeYBv8ou6SCPwpvg=.pem","location":"security-state-staging/intermediates/b592e2e9-8c51-4362-9fd6-a000990cddc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wnEjGCVxs6O7Ii9LxKLgiSA52mkxeYBv8ou6SCPwpvg=","crlite_enrolled":false,"id":"76f424b7-5f52-4859-a914-ec79d2d35576","last_modified":1576536534096},{"schema":1576536004669,"derHash":"aSSk3YKUjaU/b7kz6JWg9lgcjb3rq7NvwRysJenAM1o=","subject":"CN=Telia Document Signing CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFAxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajElMCMGA1UEAwwcVGVsaWEgRG9jdW1lbnQgU2lnbmluZyBDQSB2Mw==","whitelist":false,"attachment":{"hash":"173b45b95c7e25dee728aa0b7e79bfa2b9b4a023c89e1f7f3b67e0b5f9426723","size":2365,"filename":"-YHiKkNgq-wtY5uDU57xDrTPWbMr0zXao2o9yt7I3XU=.pem","location":"security-state-staging/intermediates/7dba7569-1903-4086-beb4-3af36738b147.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+YHiKkNgq+wtY5uDU57xDrTPWbMr0zXao2o9yt7I3XU=","crlite_enrolled":false,"id":"d947c391-8bce-4ff2-b4a1-7a3ab55ca8f5","last_modified":1576536534092},{"schema":1576536000239,"derHash":"GY4zLxD6D1ivCDrpZLxkQfBs0PrTGbEjX+PtD3xur5M=","subject":"CN=WebNIC RSA Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for WebNIC,O=WebNIC (Web Commerce Communications (Singapore) Pte. Ltd.),L=Singapore,C=SG","subjectDN":"MIHVMQswCQYDVQQGEwJTRzESMBAGA1UEBxMJU2luZ2Fwb3JlMUMwQQYDVQQKEzpXZWJOSUMgKFdlYiBDb21tZXJjZSBDb21tdW5pY2F0aW9ucyAoU2luZ2Fwb3JlKSBQdGUuIEx0ZC4pMTUwMwYDVQQLEyxDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFdlYk5JQzE2MDQGA1UEAxMtV2ViTklDIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"d535c3739b449a27a1b6564d8aad501fab7d3100a592e443a8b7bd56a791e24e","size":2284,"filename":"DkUXONpZG5H7NGx6X1k9T9v4PYppUd35pZ3oginTOG0=.pem","location":"security-state-staging/intermediates/0f0215fa-7dbe-4e90-84a6-26597491f0ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DkUXONpZG5H7NGx6X1k9T9v4PYppUd35pZ3oginTOG0=","crlite_enrolled":false,"id":"03d2a8c2-61ca-4d46-9d5e-f60e5a03eb5a","last_modified":1576536534088},{"schema":1576535998723,"derHash":"j8FGm4AFv+vb9n9RTnlf4fF+ojmippNIV/JCitzm0k8=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"f6cba1367b384f4518e9f358bd8e3eb845860eaf88cf8a1cc5885c5a8ed426fa","size":2353,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/71bbf673-0978-4961-8f3b-f4d087f7a2fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"5e4b37fb-de99-4276-bab2-22314fb5af67","last_modified":1576536534084},{"schema":1576535995805,"derHash":"TCQc/j0/+2DKiNawalUqsc8O99jS4I2hUoK1UZLrvSk=","subject":"CN=Ford Motor Company - Enterprise Issuing CA01,O=Ford Motor Company,L=Dearborn,ST=Michigan,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEbMBkGA1UEChMSRm9yZCBNb3RvciBDb21wYW55MREwDwYDVQQHEwhEZWFyYm9ybjERMA8GA1UECBMITWljaGlnYW4xNTAzBgNVBAMTLEZvcmQgTW90b3IgQ29tcGFueSAtIEVudGVycHJpc2UgSXNzdWluZyBDQTAx","whitelist":false,"attachment":{"hash":"efb755d084ded13b3ac2b3f55c16b2160cdfaaf2b7cfcaf53d00f4a459b915e1","size":2938,"filename":"CqwsdVHa6T0W9pos5-f88X2UNjXr4wKHpQ8Muq3ipRA=.pem","location":"security-state-staging/intermediates/7fd0fc7b-3efd-4fcd-ac96-22557e159fe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CqwsdVHa6T0W9pos5+f88X2UNjXr4wKHpQ8Muq3ipRA=","crlite_enrolled":false,"id":"92464914-70b1-4378-b814-a132ec905cfd","last_modified":1576536534077},{"schema":1576535994452,"derHash":"2HqR2sJtZONllQcRnoCxG+N62oeo1sAeThdduzKxoNM=","subject":"CN=OSRAM Continental Secure Email CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=OSRAM Continental GmbH,C=DE","subjectDN":"MIGbMQswCQYDVQQGEwJERTEfMB0GA1UEChMWT1NSQU0gQ29udGluZW50YWwgR21iSDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSowKAYDVQQDEyFPU1JBTSBDb250aW5lbnRhbCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"5f68e368fd16e235475da58f55a2204584b88eac641e4ec557936b8042173d83","size":2073,"filename":"7wyniI0KLvACB3qDw45iTsE1UaQBDsAQZqKze49FvxU=.pem","location":"security-state-staging/intermediates/93f9172f-6795-44d1-96c8-6d2405099fcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7wyniI0KLvACB3qDw45iTsE1UaQBDsAQZqKze49FvxU=","crlite_enrolled":false,"id":"f0afa748-66b7-486a-8cf4-afd8f25070d0","last_modified":1576536534073},{"schema":1576535993029,"derHash":"HJc36Witnf+NjX/PmWoUS7l4UaGQEaAZDJQ8ro1Dz+A=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"b57a3d5029c97a35bb6880a05ad369fcc13be288c141ba5be144c0ae53d84579","size":1585,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/2c443791-49a4-46c3-a27f-7b2599e100bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"75e1b780-8583-4cab-9027-6f97f24c19ab","last_modified":1576536534069},{"schema":1576535991616,"derHash":"NX3sxWIviSOf/RyRwTZqCVG6TbX9OE9RjMSuhdLa46U=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"d6aa735f6570dd8eab1124e88a5ba575ee35143738f4392b74e86c8480049357","size":1821,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/49393096-c9ac-401e-8fbe-4e0947a3b892.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"c9f72111-46bb-4634-a3cb-ee00f147a31e","last_modified":1576536534065},{"schema":1576535990183,"derHash":"IQxPMHL4/Jg8HzpxDS/a86swTXv2z+X0ttpFf1cTLTE=","subject":"SERIALNUMBER=202014,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE0","whitelist":false,"attachment":{"hash":"20d695ce508b51f51bda71c5995f9c66d68083544a5344390d4a0f76c15d4521","size":2333,"filename":"U7zoSHg0PLA-Mg7Q6oQ_hupqX2qetdMjZL96ei27DEA=.pem","location":"security-state-staging/intermediates/72b82bcb-aeea-4515-a822-70d25282517a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U7zoSHg0PLA+Mg7Q6oQ/hupqX2qetdMjZL96ei27DEA=","crlite_enrolled":false,"id":"c0375a0f-d96b-4db0-aaad-58593a2c322a","last_modified":1576536534061},{"schema":1576535988714,"derHash":"cNyG+fd1C3Sx3sjNNS7CWDfDbmQPcUjghGTvWQHlpYk=","subject":"CN=Secure Site Pro Extended Validation ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIEVDQyBDQSBHMg==","whitelist":false,"attachment":{"hash":"35bebf4b8ef09fd9c565bc9f3a5ece74886943a8aa8f6a6fd56758beb70fe08c","size":1435,"filename":"XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=.pem","location":"security-state-staging/intermediates/6ae86321-38ae-410a-9975-233f0c20315a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XyodbDLzN0yp63I67N9JKajdWDFEOhrdzgg3hIfeExM=","crlite_enrolled":false,"id":"41c79e82-ac51-4718-90e4-42e605116e4a","last_modified":1576536534057},{"schema":1576535987339,"derHash":"dHz01wwMqeY99r9g7xzOtvlTn6ilNPtp8Fxh3flypBk=","subject":"CN=OneSignSSL ECC OV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIEVDQyBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cc9c83787b291373dbd2e3f059f539f92b2c5f65b1c6894deeab63306a0b5399","size":1313,"filename":"k5mlhqxcFc-cb0nNpLyym3e1yVLu33JKb1dKa-MuMjg=.pem","location":"security-state-staging/intermediates/64049552-b29b-4299-ac7c-a87b3186a1d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5mlhqxcFc+cb0nNpLyym3e1yVLu33JKb1dKa+MuMjg=","crlite_enrolled":false,"id":"bf594d1a-53f1-42fb-9dd0-379365307a1f","last_modified":1576536534054},{"schema":1576535984479,"derHash":"Ptv//DTroC4NupzRGdvPmNdJclc3evi8YhDYgQASCng=","subject":"CN=WebNIC ECC Domain Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF0xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEpMCcGA1UEAxMgV2ViTklDIEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"dba8424009d862179d68d2288ea0622dd0951d98a15c8c2596e223b755ce68ec","size":1252,"filename":"df4BU-36qEmkjB2K0NlnnriyUqYwdm9JiwyAOrs_dqk=.pem","location":"security-state-staging/intermediates/03cca880-f44b-4cdf-9623-58ce69906e26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"df4BU+36qEmkjB2K0NlnnriyUqYwdm9JiwyAOrs/dqk=","crlite_enrolled":false,"id":"9ffe1aa1-fafe-45e2-825b-4897086c8615","last_modified":1576536534045},{"schema":1576535983075,"derHash":"b2stSjCaFWxhl3+8z30qyfWWI//M6sPk7lqDoY2JUnU=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"579ba63d8e05c2f3a59978f656050ef48c8e602297091d1ed3a31125febe5170","size":1817,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/210a246c-98d2-41d9-a803-f82c201c8678.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"60144f18-ade4-4eba-8530-c82470db382f","last_modified":1576536534042},{"schema":1576535981674,"derHash":"/8ONKDRFlPVfG5qRjEVPy47Oxq6ZM/7xo9UJTupAa/g=","subject":"SERIALNUMBER=202004,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA0","whitelist":false,"attachment":{"hash":"126ef456a5bb89cfb4b28ccb59b42371458419f55f17444201b4a4ed3c51a096","size":2333,"filename":"SkEb8xbUUApSuC0FN2Cl9MIrkLC1W0ZZj0SmAGVRFhs=.pem","location":"security-state-staging/intermediates/77773575-9c9b-48cd-90d6-70d9b80b0e12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SkEb8xbUUApSuC0FN2Cl9MIrkLC1W0ZZj0SmAGVRFhs=","crlite_enrolled":false,"id":"4dffeaa7-6739-4da0-a61e-b415a1c9cdc8","last_modified":1576536534038},{"schema":1576535978841,"derHash":"uilZ+kSOmALIWfkMtdrHOO952/zM1NQHlDZR8LBFahM=","subject":"CN=OneSignSSL ECC EV Secure Server CA,OU=Controlled by Sectigo exclusively for One Sign Pte. Ltd.,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIHCMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjFBMD8GA1UECxM4Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBPbmUgU2lnbiBQdGUuIEx0ZC4xKzApBgNVBAMTIk9uZVNpZ25TU0wgRUNDIEVWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d117e83a464d541b97c043720e671efe1bbb754498b470212e04c2db573a1f09","size":1435,"filename":"zWWzic6NajzDYmdUGim_cTkcA88HtIi7aWRbwgP9kKU=.pem","location":"security-state-staging/intermediates/f6d7179c-d394-48c0-b210-7ecc25444e38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zWWzic6NajzDYmdUGim/cTkcA88HtIi7aWRbwgP9kKU=","crlite_enrolled":false,"id":"665b92bf-ffa1-450e-9fd8-73b6dfb09f83","last_modified":1576536534035},{"schema":1576535980267,"derHash":"iM5J46T6N+rijo41+P+M91aMqEVjnO87jf305Gk6wUo=","subject":"CN=GRNET TLS RSA SubCA R1,O=National Infrastructures for Research and Technology,L=Athens,C=GR","subjectDN":"MH4xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxPTA7BgNVBAoMNE5hdGlvbmFsIEluZnJhc3RydWN0dXJlcyBmb3IgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kxHzAdBgNVBAMMFkdSTkVUIFRMUyBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"875cc017e6ef92a89f7ebb1204cd67182ac3e07cb6d69df484965fe258b7686c","size":2930,"filename":"mRBQN6GrKf_OuCxLxwvdLuH0S0HerSNcK0j4LUEd3RM=.pem","location":"security-state-staging/intermediates/e12686fe-e47e-4b1f-82d6-533862fd6ef2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mRBQN6GrKf/OuCxLxwvdLuH0S0HerSNcK0j4LUEd3RM=","crlite_enrolled":false,"id":"a536c660-f8ee-4457-b327-7ca9444b5ea4","last_modified":1576536534027},{"schema":1576535976050,"derHash":"6ucutFS/bDl369KJ6XCy9SgpSRkAk9DSb5jQ8Napzxc=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"1f391e0925fd3c36dbc642db948b408638e24e1faec76c62a4c7c36240dbbdcb","size":1869,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/a3b1dab1-e810-4738-93a8-0fbb33f8a5d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"5eaa4972-8682-4d87-822f-e064c03bd257","last_modified":1576536534023},{"schema":1576535973202,"derHash":"ZokB5XZNfZCZq8ITSFmdn/NrkWyoObNR5odbGLFhML4=","subject":"CN=WebNIC RSA Domain Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF0xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEpMCcGA1UEAxMgV2ViTklDIFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"16d026d7e222b83b21f30fffd6c86d922e1bc13c0f20bb7a6760efc390c2a1be","size":2093,"filename":"-6H0JyfPfrRNWedIzjtNbJYDUqMxAM9vGdy4yFQ5yFI=.pem","location":"security-state-staging/intermediates/568e3b62-fb8c-462e-87f0-420b7b3c9dd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+6H0JyfPfrRNWedIzjtNbJYDUqMxAM9vGdy4yFQ5yFI=","crlite_enrolled":false,"id":"c67fab8d-6da0-439a-8323-77c7d8bf7a59","last_modified":1576536534019},{"schema":1576535971650,"derHash":"la2U6I9bhgTkDl//NrDTS+RsHVugbA5zW3KqOWc1xBU=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"1d98ed13e49faa1ac91f1c05a20ba514f612b0638b9446469f44c66fc6c8bda6","size":1821,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/18884e92-e13e-435d-b35a-fbc2c75c3ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":true,"id":"a07ca5be-944f-42e0-99d8-923c20190318","last_modified":1576536534005},{"schema":1576535974622,"derHash":"N9CApemlJmY+Vu4g3kvZ95UtrMNBSRQ5CAFnrV3RjKw=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"8084973f28f9bb8da2dddef1086d13c58d35fafd5b6cd1cf19b002ea327410a9","size":1577,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/cd733eb5-cc1a-4fa5-b47c-ba77042e0a43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"0d02c2ec-63df-4380-9e5d-1efee98dd704","last_modified":1576536533996},{"schema":1576535970291,"derHash":"kO5UjrrKyrQCB6YaN4zhhrlNJK58Vb/IMGXqlgcuKzg=","subject":"CN=JPRS Organization Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"367d165dd5eefba12617df9187cb1fb88671b8e377384841173261d966443745","size":1800,"filename":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A-XzOekYtqEbM=.pem","location":"security-state-staging/intermediates/149beeb6-544e-481e-b3be-c402c7431da4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czSVq7DFg6MhD0LtPxWJ2PxCsWfDS7A+XzOekYtqEbM=","crlite_enrolled":true,"id":"c46e9453-6f06-4a8c-9daf-3011076811b1","last_modified":1576536533991},{"schema":1576535967278,"derHash":"k5BxSx2Qn6PXDdx2gbOPB+1OY1bLXHGRXRvc1I/jNfg=","subject":"CN=QuoVadis Swiss Regulated CA G2,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH4xCzAJBgNVBAYTAkNIMSYwJAYDVQQKDB1RdW9WYWRpcyBUcnVzdGxpbmsgU2Nod2VpeiBBRzEeMBwGA1UEYQwVTlRSQ0gtQ0hFLTExMi4yMTAuMzQ5MScwJQYDVQQDDB5RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"cda3d8577bf0baf4725200eafbb5747ad79644550bd7c1c48d40b01fdc7946c9","size":2576,"filename":"040Y3nIF8mSEbEH2aHTk7ZBKjNtqGeuBX2HCAFKIdZk=.pem","location":"security-state-staging/intermediates/5bd77f72-723f-45bf-8207-34eacc0d7e58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"040Y3nIF8mSEbEH2aHTk7ZBKjNtqGeuBX2HCAFKIdZk=","crlite_enrolled":false,"id":"7d40a737-aaa0-4124-ba0e-ac49991f5cf8","last_modified":1576536533982},{"schema":1576535965828,"derHash":"DVG2zc80qfIhRHh/P9kg3IgA+2BJC/yNKJoZU+D72k0=","subject":"CN=TrustAsia EV TLS Pro CA G2,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgRVYgVExTIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"8410138c0818efe36c3c5e447194465f2a0b00c3453529916ca8fa0c0abaf130","size":1670,"filename":"JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem","location":"security-state-staging/intermediates/622cc492-e266-42bf-8807-edd1fafd23b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=","crlite_enrolled":true,"id":"0188e712-0f9b-4e95-8c28-48e3eaae9945","last_modified":1576536533978},{"schema":1576535964386,"derHash":"XCnb6pt8yLAkGPKMHIc2398XBmXQmO9oHZA752mH0kk=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"2d9d379dbd5d0002b3c68677e98b81199b8b1b9abba7cf87839774bbeb1339c0","size":1386,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/ce55fa72-c68e-4449-9da1-b8dd4268c16b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"d5fc3ad9-0ada-4751-b516-44478b4bd331","last_modified":1576536533975},{"schema":1576535962958,"derHash":"x29wmAWYxmqOMn4XtJWiJ2JlxLmjV176HVUFAqgj1ZE=","subject":"CN=Oracle SSL CA,OU=VeriSign Trust Network+OU=Class 3 MPKI Secure Server CA,O=Oracle Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEbMBkGA1UEChMST3JhY2xlIENvcnBvcmF0aW9uMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSYwJAYDVQQLEx1DbGFzcyAzIE1QS0kgU2VjdXJlIFNlcnZlciBDQTEWMBQGA1UEAxMNT3JhY2xlIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"e135ce0a3d08137664ff0e33244bb56fb9eb8cb6b54b086d79707974cac32e51","size":2133,"filename":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=.pem","location":"security-state-staging/intermediates/da453cab-a5b5-4f7e-86ec-fba0675fba01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=","crlite_enrolled":false,"id":"42ab6ded-b971-46f3-bdec-f470ccf5261a","last_modified":1576536533969},{"schema":1576535960132,"derHash":"9HHFZ8FAz4vNwKp2lSEyhx3QwH2qEeCYJDWnceMF7eU=","subject":"CN=OneSignSSL RSA OV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIFJTQSBPViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"6298cec88d94935e3b0f9c901e0273e3a8557c8f1311f9a010fd4932282f0ce1","size":2154,"filename":"GcCWGhSfB0XZcAsL42Mnp5VnYlDpXAIzW27AN4z6kJs=.pem","location":"security-state-staging/intermediates/5f3b260b-467e-4ea2-b6d4-faf33390a8e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GcCWGhSfB0XZcAsL42Mnp5VnYlDpXAIzW27AN4z6kJs=","crlite_enrolled":false,"id":"c5ab89f8-5496-43d8-b443-cb7b14df0f97","last_modified":1576536533966},{"schema":1576535961539,"derHash":"CFoHFFJN966ZGab1l4hEOeEqUz5hVS0p1qGMNQlvxUg=","subject":"CN=DigiCert SHA2 Extended Validation Server CA-3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MHkxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTE2MDQGA1UEAxMtRGlnaUNlcnQgU0hBMiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQS0z","whitelist":false,"attachment":{"hash":"15b5964a25d36b4473500f8cf513384d9fa90b6caa77e7007c1d32de791ca6ca","size":1719,"filename":"lwTPN61Qg5-1qAU-Mik9sFaDX5hLo2AHP80YR-IgN6M=.pem","location":"security-state-staging/intermediates/c25c1336-89eb-46c5-9de3-c6b8546dd191.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwTPN61Qg5+1qAU+Mik9sFaDX5hLo2AHP80YR+IgN6M=","crlite_enrolled":true,"id":"b1c9f693-7c29-4bbf-bf61-d0546487685b","last_modified":1576536533940},{"schema":1576535954460,"derHash":"BBFKVCPaXKegx4rci2PYiT4zQwhOEzZ8GvgyRybs+nM=","subject":"CN=WebNIC ECC Business Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF8xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzErMCkGA1UEAxMiV2ViTklDIEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"e3d85d4c5c0dece7c9b8791d2072ed443a160dccd558b3d399b08355f2948117","size":1256,"filename":"YUjFyuQK3Sa5iGXuitIqguBGtB0x_Lr2rwEwdRQVZWA=.pem","location":"security-state-staging/intermediates/a39bfba1-ad59-4493-95ba-ab7998a76e38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YUjFyuQK3Sa5iGXuitIqguBGtB0x/Lr2rwEwdRQVZWA=","crlite_enrolled":false,"id":"67bf15e5-26ad-4309-a7e5-22c36b2cb9cf","last_modified":1576536533929},{"schema":1576535951697,"derHash":"X2yqRKRmPEQd2SyLZlX7+Xz24daTTbj1+Nl633Az+qw=","subject":"CN=Ministerie van Defensie PKIoverheid Organisatie Persoon CA - G3,O=Ministerie van Defensie,C=NL","subjectDN":"MIGSMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXTWluaXN0ZXJpZSB2YW4gRGVmZW5zaWUxFzAVBgNVBGEMDk5UUk5MLTI3MzcwOTg1MUgwRgYDVQQDDD9NaW5pc3RlcmllIHZhbiBEZWZlbnNpZSBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"3934a8eae4fa88952cd3ddc4edf5c6254398638e6435b2c68d813a4f5fff7abb","size":2621,"filename":"7KYLzx5QRzu-au_gCwTTZqCh6FsSbJxUNaNe0NxbMUY=.pem","location":"security-state-staging/intermediates/efcc6a95-7e5a-4184-a7e2-2927ba00b55c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7KYLzx5QRzu+au/gCwTTZqCh6FsSbJxUNaNe0NxbMUY=","crlite_enrolled":false,"id":"24681fb4-628a-4460-90b9-0f14ba2293c4","last_modified":1576536533918},{"schema":1576535950273,"derHash":"HoZCeMIIgbZxwMbS4UthFQrR8Tz5LG7BS1UNy8R+FUE=","subject":"CN=GlobalSign Extended Validation CodeSigning CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MG4xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMUQwQgYDVQQDEztHbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZVNpZ25pbmcgQ0EgLSBTSEEyNTYgLSBHMg==","whitelist":false,"attachment":{"hash":"77455cfaed61330456ffaa7da32df0dd4731a0acaf6fe166bcac0b28f0aeb328","size":1674,"filename":"HNr6oOEerHtzaDCmff-4LbZgFDwyRlI4dx4JIztxd3s=.pem","location":"security-state-staging/intermediates/532ffdbf-57f8-42d1-a031-8a8275647a0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HNr6oOEerHtzaDCmff+4LbZgFDwyRlI4dx4JIztxd3s=","crlite_enrolled":false,"id":"6168888f-6929-4f40-b04f-33d9070bec84","last_modified":1576536533915},{"schema":1576535948851,"derHash":"Ly8AiBdxChCFtOa8XjM1R0RE2YMnLjOZWjMb4aTE/go=","subject":"CN=GDCA TrustAUTH R4 CodeSigning CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGwxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjEpMCcGA1UEAwwgR0RDQSBUcnVzdEFVVEggUjQgQ29kZVNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"e49b8906ff1d55085ab7bffeb8787da6f1f9f4546d283158c9622d150967f70e","size":2064,"filename":"5Zt41KtIYUpjoXvNDZtGlrN-S-X9juxZk0kJdwQpIlM=.pem","location":"security-state-staging/intermediates/76698902-bd03-4c1d-9344-a48278211966.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Zt41KtIYUpjoXvNDZtGlrN+S+X9juxZk0kJdwQpIlM=","crlite_enrolled":false,"id":"012b0afc-e805-47a0-ab53-af5bbbf79132","last_modified":1576536533911},{"schema":1576535945982,"derHash":"pjwTmLX43S1DL75MLBkUK+ptXQIh+ueUcYrnWXrMqW0=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"378f762af5809d2286eb016c78a51681c834fff84abc2ac05a6cb350bb81bbeb","size":1886,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/d658e22b-e2c2-4eaf-a261-dda71e485545.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"de84677c-3935-4ff1-ad12-b7f06ddaa458","last_modified":1576536533904},{"schema":1576535940122,"derHash":"MB6Mu4xmXKslbrGW9z9NKWycrSXzJ0SQQnnhsxgjPjs=","subject":"CN=Apple Public Client RSA CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBDbGllbnQgUlNBIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"887d323a9b612519f14d2640bdc97e2677c441bc5d92da332d0583d40e61e576","size":2182,"filename":"nhhSlUJJxG_ZM3LQ_T2Iz5U3Ps22YlhuUE1fscITI-E=.pem","location":"security-state-staging/intermediates/21666efd-84e2-47c7-bf9c-726c7f7f05a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nhhSlUJJxG/ZM3LQ/T2Iz5U3Ps22YlhuUE1fscITI+E=","crlite_enrolled":false,"id":"ed6766d4-f179-49da-8e26-9b08acdf55b7","last_modified":1576536533889},{"schema":1576535937184,"derHash":"9k0GlO2uBtGEkebp0xxnOZeaLIGiWo5jnf186N/bMWI=","subject":"CN=Dodo Sign EV TLS ICA ECC R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHUxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSQwIgYDVQQDDBtEb2RvIFNpZ24gRVYgVExTIElDQSBFQ0MgUjE=","whitelist":false,"attachment":{"hash":"b0add226615cad1733ff8c5b493bd754f9de850c3f1c8e2cca90816f49c5e1be","size":1305,"filename":"uaqYQ15j83wFQwwqS3bYDrjKrM800inzcvgnootnrYQ=.pem","location":"security-state-staging/intermediates/ffe612d9-45c5-4329-86af-79a0687b4338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uaqYQ15j83wFQwwqS3bYDrjKrM800inzcvgnootnrYQ=","crlite_enrolled":false,"id":"08c035d3-a0b3-448a-a866-9b7bd59b922b","last_modified":1576536533882},{"schema":1576535935756,"derHash":"cNud7ZRN011HTqFf8qpOJfOTqJPs2lQ1nTBbwxlkmBc=","subject":"CN=Apple Public Server ECC CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgRUNDIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"7b664a38a0036f3f518be6f71fd3dccba44bd002424257ded7f358d26fc7fc10","size":1366,"filename":"MxdHGRZ7LjsiyER0ypQ2XivrmpBgAU9_a6gf1ko2sQk=.pem","location":"security-state-staging/intermediates/58a031a8-c0ba-426e-a1de-b8e9854cc946.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MxdHGRZ7LjsiyER0ypQ2XivrmpBgAU9/a6gf1ko2sQk=","crlite_enrolled":true,"id":"20411773-904e-4e23-bf8b-23aa4d20b75d","last_modified":1576536533879},{"schema":1576535931554,"derHash":"H/oNH1XOSgUH6MOOi1V7iMvdaQ2QPZlrH3hQ2B1qSpM=","subject":"CN=Avaya Client Services Users CA 2,OU=Avaya IT+OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Avaya Inc,C=US","subjectDN":"MIGgMQswCQYDVQQGEwJVUzESMBAGA1UEChMJQXZheWEgSW5jMREwDwYDVQQLEwhBdmF5YSBJVDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSkwJwYDVQQDEyBBdmF5YSBDbGllbnQgU2VydmljZXMgVXNlcnMgQ0EgMg==","whitelist":false,"attachment":{"hash":"762a8ed6494b6d421f213b9cd99b97030ae64a5065989022b11dc9f26509453e","size":2097,"filename":"C7LniTwqz9SPKmkZKSXHUjuMCa0AK-H4ybIDe47Reik=.pem","location":"security-state-staging/intermediates/6199eb30-85b4-4e68-83f2-a4abb88247dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C7LniTwqz9SPKmkZKSXHUjuMCa0AK+H4ybIDe47Reik=","crlite_enrolled":false,"id":"47a63ece-4e39-4450-bcb5-d5cb581e733d","last_modified":1576536533868},{"schema":1576535930122,"derHash":"0zTTWamUSGS00I9rUJ43C743j3G97Qsjmjq4vgUqKW4=","subject":"CN=WebNIC Code Signing CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MFMxCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEfMB0GA1UEAxMWV2ViTklDIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"c88ea8edec48a2a9e100e3e3fd97b805b8b9797072d3efb198a2c439af86f188","size":2052,"filename":"LjMYKwzuWRO32yBUWdj18dPNxCqxzel-VbQgj6hHAmM=.pem","location":"security-state-staging/intermediates/70791cac-3c98-4f75-990d-6954d0219a0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LjMYKwzuWRO32yBUWdj18dPNxCqxzel+VbQgj6hHAmM=","crlite_enrolled":false,"id":"7791a584-5e29-4235-b416-b854d3c3a85f","last_modified":1576536533864},{"schema":1576535928721,"derHash":"HSQiK17scf6Zvp1wD6X/cjEts+sPy0pPO8wTXaNsE1U=","subject":"CN=QuoVadis EU Issuing Certification Authority G4,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEXMBUGA1UEYQwOTlRSTkwtMzAyMzc0NTkxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYuMTcwNQYDVQQDDC5RdW9WYWRpcyBFVSBJc3N1aW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEc0","whitelist":false,"attachment":{"hash":"abc8779ce19e7e1b723ea4b7569c06c7bcf6a1d55f0595dbae8c152d800dbfb8","size":2406,"filename":"N4NzF7zbHULFki3CS8POhVnUVvnENOs7cQO__vGsV3I=.pem","location":"security-state-staging/intermediates/c4f3c05f-b7ad-4dee-a5ff-e59984747cdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N4NzF7zbHULFki3CS8POhVnUVvnENOs7cQO//vGsV3I=","crlite_enrolled":true,"id":"e52f87f2-6917-4b55-a618-7063e3c0e4d3","last_modified":1576536533861},{"schema":1576535924422,"derHash":"ON7T/2gnV5AIr0iH65aYo8+pJ/qO1Z8GugkPuaY+LXc=","subject":"CN=UZI-register Medewerker niet op naam CA G3,O=CIBG,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEzMDEGA1UEAwwqVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgbmlldCBvcCBuYWFtIENBIEcz","whitelist":false,"attachment":{"hash":"fdf235b099b1f37447f060ecf05a38a7f2f77b7ed689f4bd3554bcbb87e84429","size":2645,"filename":"io70m-V_59D3apVL30ZLD4BQjGAhNUmM2cLS-be8t_s=.pem","location":"security-state-staging/intermediates/43cbf583-ed6b-42a6-b390-579b0f581372.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"io70m+V/59D3apVL30ZLD4BQjGAhNUmM2cLS+be8t/s=","crlite_enrolled":false,"id":"3ff5743e-265f-4d7a-bebb-a4404e593665","last_modified":1576536533845},{"schema":1576535922917,"derHash":"neYdQGDkzEOIcYLd1eYWlGqqN7QxbumMQkSQFg9sjKo=","subject":"CN=Dodo Sign EV TLS ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHUxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSQwIgYDVQQDDBtEb2RvIFNpZ24gRVYgVExTIElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"d54a7cdc1a94f8a39a42db730bf1d72281d7628995592515709e572163799782","size":2454,"filename":"1DY43lDb7xlJzDvOVPtYU5JGz5PGXMK4hqwmC0tfYpM=.pem","location":"security-state-staging/intermediates/9ed8d2c1-00de-4ffd-89ed-0cb1c60b4487.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1DY43lDb7xlJzDvOVPtYU5JGz5PGXMK4hqwmC0tfYpM=","crlite_enrolled":false,"id":"65100e6a-48de-4e6d-b0f8-394031300eea","last_modified":1576536533840},{"schema":1576535920130,"derHash":"f79dtJF2OZMAdqr/ePyR3aDv7qhsrTihjZiUfXzTaUg=","subject":"CN=SZCA EV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgRVYgU1NMIENB","whitelist":false,"attachment":{"hash":"e03f3052b8789db5fcf3cdcc2c99f637a46dfc7e75b7e90821532f0139858a50","size":1756,"filename":"m9Fzkl4nfip9REp7mGOZ4yhSFF4FL4A--9o7eUTYzMQ=.pem","location":"security-state-staging/intermediates/7c9c9455-5d39-4925-822c-e353ba07464d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m9Fzkl4nfip9REp7mGOZ4yhSFF4FL4A++9o7eUTYzMQ=","crlite_enrolled":false,"id":"26dd89a7-d444-4647-be98-393c4cd93ed5","last_modified":1576536533836},{"schema":1576535917274,"derHash":"do0Y37412P5mcS+Yd2I9FRB3G1P1u4GcYkoVZI8f5Qk=","subject":"CN=S/MIME RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFTL01JTUUgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"c1068b3b2ea8a0e2711bbbcf2ee76ab8b8d91745c4ab08f6436801acbfbcd677","size":2150,"filename":"nIOaO62AxFMW0JOKjsy1DZselooknRqTfmOxDEfM0sQ=.pem","location":"security-state-staging/intermediates/d98a7be1-b9c7-4085-83fd-776f5f6cbfab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nIOaO62AxFMW0JOKjsy1DZselooknRqTfmOxDEfM0sQ=","crlite_enrolled":false,"id":"db0531c3-1ffd-4acb-bb7c-522369de5914","last_modified":1576536533830},{"schema":1576535915880,"derHash":"xoxVme3roVwRJUOBsB0V8rxif924XjOkkgfjH+HxXQ0=","subject":"SERIALNUMBER=202017,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE3","whitelist":false,"attachment":{"hash":"22151c5f67954f7df4f45c9f49de95bcf1b4fb76f2717dfe75902e496d782508","size":2333,"filename":"IKjMrd9-Ii4IPuS5zV5KhZDFudzyr4xsb9_Cb4VwSS4=.pem","location":"security-state-staging/intermediates/d09d4bcc-90b3-44ad-ba6f-0e1ec07943f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IKjMrd9+Ii4IPuS5zV5KhZDFudzyr4xsb9/Cb4VwSS4=","crlite_enrolled":false,"id":"02d05a88-8534-4a6e-bbe1-c9dfae1a53c4","last_modified":1576536533826},{"schema":1576535914365,"derHash":"kDfZCQpjZkzuREvoYzEJdlyQqeDgAyo2xDfjuru5Tt4=","subject":"CN=SSL X Y & Z EV TLS CA ECC R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHMxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSUwIwYDVQQDDBxTU0wgWCBZICYgWiBFViBUTFMgQ0EgRUNDIFIx","whitelist":false,"attachment":{"hash":"a6e5424ce1469b72faaa4f808cfc02460b40b4084b8f825f82f4d6e09ed3a17a","size":1280,"filename":"Tgm74K8EbuCBKCktudG9C_UXO5irwHL8qNYuxdJv1B8=.pem","location":"security-state-staging/intermediates/2a7c27bf-35c8-427f-bf91-b620e767a6e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Tgm74K8EbuCBKCktudG9C/UXO5irwHL8qNYuxdJv1B8=","crlite_enrolled":false,"id":"6878d4f8-2f0a-4abe-ae4b-6e1572598927","last_modified":1576536533821},{"schema":1576535909746,"derHash":"yikDieDYxipAg/Yoo59S/j84tzGZz/r3wDcjeKRA+2o=","subject":"CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN","whitelist":false,"attachment":{"hash":"02e23f9b06e438417e4e71c8b9fb42a8e2da31ad266ad1ca50792fd36d7251b9","size":1829,"filename":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem","location":"security-state-staging/intermediates/3aae7952-dcc2-4419-b53f-9eac4094c51b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=","crlite_enrolled":true,"id":"d9a71e99-a2ad-4f36-b975-79dca9dd44f0","last_modified":1576536533809},{"schema":1576535918743,"derHash":"yMP/XemO82kvOhlooT69KoYLs/SG7EVDT46Qc8SpzWc=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"f1224f7660297ee13d77fcf353555cc0aacb21730c122ed72881ccaaa2d49833","size":1536,"filename":"-HZ42z-6jzbfrf-8zoB-rhhWo8lWk9UMNlhPseiUpJs=.pem","location":"security-state-staging/intermediates/7b3da4b3-c177-4a6e-b7a9-062e872bf107.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HZ42z+6jzbfrf+8zoB+rhhWo8lWk9UMNlhPseiUpJs=","crlite_enrolled":true,"id":"a9f66876-d086-446f-a12c-e9ee7c486c5e","last_modified":1576536533804},{"schema":1576535908358,"derHash":"peM8KOMBOnH192CuOxZZUJAEPS7FIJ7FKQPE+60lja0=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"fa8a56ce9427949481f533247ba9c60a2399344aa8e931f631f8a47245217c4d","size":1894,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/ef48945b-24c4-41bf-afdf-5d30c4725e72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"0bac52a2-0949-48f2-abb2-f09ac245fd7f","last_modified":1576536533799},{"schema":1576535906937,"derHash":"r8oz2sVEOJ49Iw2xKti6PufBqeTM8Mr/1+FsKi81zuU=","subject":"CN=EC-GENCAT,OU=Serveis Publics de Certificacio ECV-1+OU=Vegeu https://www.catcert.net/verCIC-1  (c)03+OU=Generalitat de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHpMQswCQYDVQQGEwJFUzE7MDkGA1UECgwyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxLjAsBgNVBAsMJVNlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8gRUNWLTExNjA0BgNVBAsMLVZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlckNJQy0xICAoYykwMzEhMB8GA1UECwwYR2VuZXJhbGl0YXQgZGUgQ2F0YWx1bnlhMRIwEAYDVQQDDAlFQy1HRU5DQVQ=","whitelist":false,"attachment":{"hash":"68020eeafb9e19fcbbb5e650b27c54a86372fc89f55eae47738a248afb78dd7e","size":2251,"filename":"plh85tWIetVs5VcJnItuNLDy-XNaKKGitW1elxmTBeI=.pem","location":"security-state-staging/intermediates/a2444857-efdc-427c-b27e-3219f87d774f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"plh85tWIetVs5VcJnItuNLDy+XNaKKGitW1elxmTBeI=","crlite_enrolled":false,"id":"f0031ace-b829-4f9f-bc0d-2388295555dd","last_modified":1576536533795},{"schema":1576535905508,"derHash":"HQgt3e0W1OTkkWOJPZJEl468VCKPS4ESeLVaspnExI4=","subject":"CN=Symantec Class 2 Employee CA - G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Symantec Corporation,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEqMCgGA1UEAxMhU3ltYW50ZWMgQ2xhc3MgMiBFbXBsb3llZSBDQSAtIEc0","whitelist":false,"attachment":{"hash":"0adbea35abde14e3bb65a4cf56dcfeccf401e8fbcdc72a4dbc92c98f155ce6d0","size":2068,"filename":"4UyOSF_VGPv56JpY5z0BV-AVEbPZZ1xvB4dYq2yDeYM=.pem","location":"security-state-staging/intermediates/0694ff66-1242-44e8-ae1f-d5b3147fdaae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4UyOSF/VGPv56JpY5z0BV+AVEbPZZ1xvB4dYq2yDeYM=","crlite_enrolled":false,"id":"9f2c8f1c-ef21-472e-af7e-202f6d9d5d2f","last_modified":1576536533788},{"schema":1576535901047,"derHash":"sm6zEPj68O9bDQtxqmXsBQ+jreKRNPtDirZEAoj6bmc=","subject":"CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"c9fd1a02e33e6fb6aa966212b051bc01d9763d43207f96cd14bd4d2ab77caf5e","size":1666,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/3c324156-7f22-4755-bd9d-801f027fb229.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"a72a5e79-3626-409e-b043-cd067d75f18f","last_modified":1576536533781},{"schema":1576535898184,"derHash":"fLHw8QPU7oLZrUH2kCPFlCEfUoXDlOh9VL8EdGIsgmU=","subject":"CN=WebNIC Assured ID CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MFExCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzEdMBsGA1UEAxMUV2ViTklDIEFzc3VyZWQgSUQgQ0E=","whitelist":false,"attachment":{"hash":"1f3fc0bed59983b040a2da0d18be6dc5f3fbb5f7e006a7b529e21595eb3fdce8","size":2060,"filename":"h2xdkR0tsowblgOKHnXoWz4HRd6TFdufPwK2kA5rZis=.pem","location":"security-state-staging/intermediates/a5ecf113-0411-470d-8892-a713b0040746.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h2xdkR0tsowblgOKHnXoWz4HRd6TFdufPwK2kA5rZis=","crlite_enrolled":false,"id":"08077971-3fdb-4c74-8da6-e19b41c8d0c3","last_modified":1576536533776},{"schema":1576535895349,"derHash":"6PoWk7ilm16fnt4fzEpIOv1BBeclV2MuTdQ12vQ2F18=","subject":"SERIALNUMBER=202003,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDM=","whitelist":false,"attachment":{"hash":"55f2cc3018c2099898a8f957abde4000e8cbf3bdd59e78af1b6baa2b915f7749","size":2337,"filename":"zorY5O9LVEFY683mlqVCo5VR0c9nqYIj4Rcn5gmEKbg=.pem","location":"security-state-staging/intermediates/7ce01a0e-78a4-4eb4-aa2b-49fcba780598.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zorY5O9LVEFY683mlqVCo5VR0c9nqYIj4Rcn5gmEKbg=","crlite_enrolled":false,"id":"5f7010e9-833f-4403-b47c-eb8cec371020","last_modified":1576536533772},{"schema":1576535896778,"derHash":"2qBDVAf6RMKKuTnmgjgTYFd5CThzqWZJrW4DsF0oYmw=","subject":"CN=Buypass Class 3 CA 2,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAzIENBIDI=","whitelist":false,"attachment":{"hash":"c3adfe4cbf2b1d7e9a605067bbec92b2d0430c2b1227c76517242204d270ea39","size":1849,"filename":"4ZQYrjRV6ScgdFiC0vn_Vy4QMIji7Tv-wkkEKEEQ6_I=.pem","location":"security-state-staging/intermediates/f4c24d5d-274d-468d-ad24-5434b0abf493.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ZQYrjRV6ScgdFiC0vn/Vy4QMIji7Tv+wkkEKEEQ6/I=","crlite_enrolled":true,"id":"a3808703-8211-46eb-9e79-a0dff56992fd","last_modified":1576536533765},{"schema":1576535892539,"derHash":"Y2WyXpKZtfOC6wBmhQYpCI682byzmPKGIhB2A8PBwn4=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - AAPP,OU=Certificados Digitales para la Administracion Publica,O=Firmaprofesional SA,C=ES","subjectDN":"MIGkMQswCQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTE+MDwGA1UECww1Q2VydGlmaWNhZG9zIERpZ2l0YWxlcyBwYXJhIGxhIEFkbWluaXN0cmFjaW9uIFB1YmxpY2ExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAwwaQUMgRmlybWFwcm9mZXNpb25hbCAtIEFBUFA=","whitelist":false,"attachment":{"hash":"b364c73112b234b54f2bbfcccc157ff6a6e56b1eb3642bba27e9a19807372305","size":2434,"filename":"hLz0sJLVz-CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=.pem","location":"security-state-staging/intermediates/088426b5-e7ac-44ac-ad09-766b42cb1607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hLz0sJLVz+CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=","crlite_enrolled":false,"id":"7a673029-7426-4fd2-aa04-1eead6f1048a","last_modified":1576536533761},{"schema":1576535891125,"derHash":"sU1QiQecHY92SduaXTzvsarAb2avxJIlxb4qoZ/UGjU=","subject":"CN=Entrust Certification Authority - L1N,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFO","whitelist":false,"attachment":{"hash":"2a107eb8056c22e82435858002ab7da59ecfe298d1cafd19ef86a74343e7a1bb","size":2207,"filename":"vJyqpf--OgJrh0WkGBWAggmVgZ5-o9t2KvyRdPxvIhs=.pem","location":"security-state-staging/intermediates/119f868d-4224-48fa-aca4-4e950d595c12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vJyqpf++OgJrh0WkGBWAggmVgZ5+o9t2KvyRdPxvIhs=","crlite_enrolled":false,"id":"b03bf780-0b68-4f48-9034-834ec2d038db","last_modified":1576536533758},{"schema":1576535893935,"derHash":"4MLr0fa61P6q4xoxB+aavukC2zi5374z8FcL2jSUwgo=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"5708992fbcf9481fd4654b18ba083f1c9225a94e396e861bbd592d38a6bee662","size":1626,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/48379e9d-8361-44d6-a4a7-eb48ae824248.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"d57a5e4c-dfdb-4c21-809b-ec5a60174f9c","last_modified":1576536533751},{"schema":1576535884083,"derHash":"IcrbfNgi6hO0luJau4FRx/sA77se5FijtKTzwWvDwW8=","subject":"CN=Digidentity BV PKIoverheid Burger CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MHUxCzAJBgNVBAYTAk5MMRkwFwYDVQQKDBBEaWdpZGVudGl0eSBCLlYuMRcwFQYDVQRhDA5OVFJOTC0yNzMyMjYzMTEyMDAGA1UEAwwpRGlnaWRlbnRpdHkgQlYgUEtJb3ZlcmhlaWQgQnVyZ2VyIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"c8ff04eeee6bce152e5e98c99dca5cf921fce2820ba60817a872fed0cb518838","size":2532,"filename":"k5vPHt_MdNtfcnpCDwqfEjdm4LB7gBM9vX2iTb0kIPM=.pem","location":"security-state-staging/intermediates/2912fe8c-837e-4193-8500-db273f27fb75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5vPHt/MdNtfcnpCDwqfEjdm4LB7gBM9vX2iTb0kIPM=","crlite_enrolled":false,"id":"55d018b4-4eb7-4d7f-bdf4-e4553efdc451","last_modified":1576536533743},{"schema":1576535888279,"derHash":"w0bZE34FJUxu6smawvZ0igxdOvxre5seAMQK302FZV0=","subject":"CN=CBMM SMIME CA 2019,O=COMPANHIA BRASILEIRA DE METALURGIA E MINERACAO,POSTALCODE=38183-903,STREET=RUA CORREGO DA MATA S/N,L=ARAXA,ST=MINAS GERAIS,C=BR","subjectDN":"MIHAMQswCQYDVQQGEwJCUjE3MDUGA1UEChMuQ09NUEFOSElBIEJSQVNJTEVJUkEgREUgTUVUQUxVUkdJQSBFIE1JTkVSQUNBTzEOMAwGA1UEBxMFQVJBWEExFTATBgNVBAgTDE1JTkFTIEdFUkFJUzEgMB4GA1UECRMXUlVBIENPUlJFR08gREEgTUFUQSBTL04xEjAQBgNVBBETCTM4MTgzLTkwMzEbMBkGA1UEAxMSQ0JNTSBTTUlNRSBDQSAyMDE5","whitelist":false,"attachment":{"hash":"fe3d14bd5254e0a39c15a733dad05e8c9bcd3953ff1d49f2715e7a6102a14c44","size":1983,"filename":"JgrysEOXcXWHyUdTbvFXqUmyd60uxVfkiQtywlZv_nE=.pem","location":"security-state-staging/intermediates/7cc1e4ac-bbbc-42b5-bca1-eee58338135b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JgrysEOXcXWHyUdTbvFXqUmyd60uxVfkiQtywlZv/nE=","crlite_enrolled":false,"id":"6db211d5-5b49-42f3-a1ba-e139fb5d1836","last_modified":1576536533739},{"schema":1576535885503,"derHash":"Rb8E3KXeemM58d+DW8kBNFe0h/20MI5AgMZCPI5LJwU=","subject":"CN=DigiCert Transition ECC Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gRUNDIFJvb3Q=","whitelist":false,"attachment":{"hash":"ec9ca1e7872737de9eba06d02d6f59709cc00db0519cdf3d07ec29275c2360e7","size":768,"filename":"fKyaD_MVOHdQuouv2xwrwps_C7oWNiypOpD4TaLfXz4=.pem","location":"security-state-staging/intermediates/2a8d9c82-4e74-4311-aac0-3155dcba518c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fKyaD/MVOHdQuouv2xwrwps/C7oWNiypOpD4TaLfXz4=","crlite_enrolled":false,"id":"5b349da4-d246-4360-a09a-7028a7bb4f8c","last_modified":1576536533736},{"schema":1576535879770,"derHash":"dPVuGrM52D6A8vbiZPiUd1tCbIm0RwPfT6ijIxFjor0=","subject":"CN=Trustwave Domain Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGvMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE3MDUGA1UEAxMuVHJ1c3R3YXZlIERvbWFpbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"f3dfc731d826e0d0984812c4ea4c6e2485418da6eea5873875262b9282480123","size":1792,"filename":"D2BA_wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=.pem","location":"security-state-staging/intermediates/ddbc7552-96a7-4b2e-91f9-ffb3835036ce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2BA/wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=","crlite_enrolled":true,"id":"ef25e7fa-720b-412c-bf83-aba79dc2aa8e","last_modified":1576536533732},{"schema":1576535878387,"derHash":"JCtpdC/LHlsqv5iJi5RXIYdUTltNmRF4ZXNiH2p0uCw=","subject":"CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2Mg==","whitelist":false,"attachment":{"hash":"6f399d9adcd59cadec87760241621f46a9daf25db3c442d61999a94042f01988","size":1951,"filename":"wrPDGkophQqo889HKhFp_3G0FlefakSC7HdEuD35iKw=.pem","location":"security-state-staging/intermediates/4c25a27e-2c0e-442f-893f-37ea349bb645.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrPDGkophQqo889HKhFp/3G0FlefakSC7HdEuD35iKw=","crlite_enrolled":false,"id":"f1dcb796-9a85-4f2d-a0fb-9b3f7b4c9089","last_modified":1576536533728},{"schema":1576535877021,"derHash":"3gqS5UNbYTII3ENezHFYvyj0IKk+CpHVlllyBT9SNUk=","subject":"CN=Cleverbase ID PKIoverheid Burger CA - G3,O=Cleverbase ID B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRswGQYDVQQKDBJDbGV2ZXJiYXNlIElEIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTY3NDE5OTI1MTEwLwYDVQQDDChDbGV2ZXJiYXNlIElEIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"43ba7b18219f05d870af64b48aedb5b0e035eedf35ae2f0fec42aba1789e5955","size":2532,"filename":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps_pS8BKM=.pem","location":"security-state-staging/intermediates/c27d2459-6f95-4c85-9ff7-8e14e05a2150.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps/pS8BKM=","crlite_enrolled":false,"id":"b6549aff-91bd-4c31-8324-526c379bbdfe","last_modified":1576536533724},{"schema":1576535875604,"derHash":"1sP8STus0d+KG6MPSuJiVLKkUo5IdggerMahagkKo2o=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"baf3c774613f8942857b2ad6d40766ac8a7a67fdbc624e9c4a17b50ca45bddd5","size":1792,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/f8d538de-5cc7-4991-8270-0a2d1d7d3b8b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"b1366715-e202-4ce8-9018-b39313524fe8","last_modified":1576536533719},{"schema":1576535871360,"derHash":"aitFjsogSy3av04m1G/Q+bvoZ9p6rDVTJROm5aT8ylg=","subject":"CN=TBS X509 CA Persona 3 (ECC),O=TBS INTERNET Ltd.,L=Douglas,ST=Isle of Man,C=IM","subjectDN":"MHcxCzAJBgNVBAYTAklNMRQwEgYDVQQIEwtJc2xlIG9mIE1hbjEQMA4GA1UEBxMHRG91Z2xhczEaMBgGA1UEChMRVEJTIElOVEVSTkVUIEx0ZC4xJDAiBgNVBAMTG1RCUyBYNTA5IENBIFBlcnNvbmEgMyAoRUNDKQ==","whitelist":false,"attachment":{"hash":"944dcf6a8c1ee8957b2a174f54675ec285a093b949a186d434f20d91f13a1365","size":1288,"filename":"r7xCTXIT-QWYjyxg-QtDiWm-o-0SPzjo9qjik4pHEhA=.pem","location":"security-state-staging/intermediates/ad0081bd-1851-4d54-91a9-d1a6326f8a6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r7xCTXIT+QWYjyxg+QtDiWm+o+0SPzjo9qjik4pHEhA=","crlite_enrolled":false,"id":"62e2b79f-f3c1-4952-b73d-ced0186eca23","last_modified":1576536533710},{"schema":1576535872699,"derHash":"Av7Tui5qeEOjGKmBvIRwYf0oLZ6IR/+p9U14W2uB1vM=","subject":"CN=Secure Site Pro CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVNlY3VyZSBTaXRlIFBybyBDQSBHMg==","whitelist":false,"attachment":{"hash":"5c18d3156506cd5355f4d18f1913e2bd2818958dce99153a650e7f3195877f83","size":1829,"filename":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem","location":"security-state-staging/intermediates/69603c20-57db-47e4-8db1-78012f614eb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=","crlite_enrolled":true,"id":"047bbf71-0e60-47f1-88fb-c8654e3e2fd6","last_modified":1576536533706},{"schema":1576535869920,"derHash":"3ZxUXWtkXCv74bbstgN2AGRk6XuxMEt5eM/oOkCZsic=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"22de8a87722574e5bae64f227adae54749a53ce2eb2247106a3a9a9137cc429b","size":2292,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/1bba8b1c-fe09-452a-8030-5299448f1616.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"ab862fa5-0269-4007-9bfc-154dc88f81fc","last_modified":1576536533702},{"schema":1576535868368,"derHash":"/s6a2nqknU/qnv8SNUIJWogMAE/Wkz+TZLArLjV06jg=","subject":"CN=Cybertrust Japan SureServer EV CA G3,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEtMCsGA1UEAxMkQ3liZXJ0cnVzdCBKYXBhbiBTdXJlU2VydmVyIEVWIENBIEcz","whitelist":false,"attachment":{"hash":"442ad2ef3f029c8ae0616647479fbe53d99e0e9ed017c893d2b5952cbf146f8f","size":1772,"filename":"zJoepoy-7XeJoRmjbR7_i8oZ1WEujOKGTD9NNM0uWHM=.pem","location":"security-state-staging/intermediates/5a528d23-16fc-4550-b70f-7b7202891213.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zJoepoy+7XeJoRmjbR7/i8oZ1WEujOKGTD9NNM0uWHM=","crlite_enrolled":true,"id":"9aa2bac0-292b-4549-8d79-e82841fe7262","last_modified":1576536533695},{"schema":1576535866783,"derHash":"9hSuKxAUhPFfZvTdpW7m60InKPF52UOZ7eGawdhai9M=","subject":"CN=Secure Site CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVNlY3VyZSBTaXRlIENBIEcy","whitelist":false,"attachment":{"hash":"ea9ed009cee9ad525cea31b09520df7f3327215055a5f8d38c27bc5eed479ab1","size":1825,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/f1eaf41b-8ddc-4230-8adb-5920c9c4ef35.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"0558d609-3bfb-4844-bf88-b93e9bd0dbdb","last_modified":1576536533692},{"schema":1576535863986,"derHash":"sXdPmya04tX3UXE2AP/rFjs0y3oUwsB5cE6VNk+8ykk=","subject":"CN=InCommon RSA Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBSU0EgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"a3ecf6ad18dd20e2bb3d0213cf639e3748842228ce2c96008b3f6da877409bcf","size":2129,"filename":"b1JA6-4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=.pem","location":"security-state-staging/intermediates/f130c14b-f812-4c68-9577-4859f57b2126.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b1JA6+4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=","crlite_enrolled":true,"id":"22533613-9108-4af4-8604-a14d14de2ada","last_modified":1576536533688},{"schema":1576535860850,"derHash":"txawif5OU9Gi73ulesheaOxyLPYQUsJaWWJq07FcX0A=","subject":"CN=Qu\u00e1litas Compa\u00f1\u00eda de Seguros S.A. de C.V.,O=QUALITAS COMPA\u00d1IA DE SEGUROS S.A. DE C.V.,POSTALCODE=05200,STREET=JOSE MARIA CASTORENA No. 426\\, SAN JOSE DE LOS CEDROS,L=CUAJIMALPA,ST=CIUDAD DE MEXICO,C=MX","subjectDN":"MIH4MQswCQYDVQQGEwJNWDEzMDEGA1UECgwqUVVBTElUQVMgQ09NUEHDkUlBIERFIFNFR1VST1MgUy5BLiBERSBDLlYuMRMwEQYDVQQHEwpDVUFKSU1BTFBBMRkwFwYDVQQIExBDSVVEQUQgREUgTUVYSUNPMT0wOwYDVQQJEzRKT1NFIE1BUklBIENBU1RPUkVOQSBOby4gNDI2LCBTQU4gSk9TRSBERSBMT1MgQ0VEUk9TMQ4wDAYDVQQREwUwNTIwMDE1MDMGA1UEAwwsUXXDoWxpdGFzIENvbXBhw7HDrWEgZGUgU2VndXJvcyBTLkEuIGRlIEMuVi4=","whitelist":false,"attachment":{"hash":"b4cc258aa16607dd839fa8f83252a629b07c1acdd5fa87f696c466297ca3c432","size":2093,"filename":"lxQankog6Tf_kuy51v0yHPp7VAlCmH0rA0RAvunUR2U=.pem","location":"security-state-staging/intermediates/85c27bd1-db7e-4507-b140-76bd7f1708d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lxQankog6Tf/kuy51v0yHPp7VAlCmH0rA0RAvunUR2U=","crlite_enrolled":false,"id":"8aff6d32-3b8c-46c2-82fd-fe7efd828486","last_modified":1576536533684},{"schema":1576535862557,"derHash":"3MVmIv8NIJH7n/yfZ8LTUEmWacYpjajemsQaSIu52eQ=","subject":"CN=KIBSTrust Issuing CA for e-Seals,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA+OU=KIBS AD Trust Services,O=KIBS AD Skopje,C=MK","subjectDN":"MIHLMQswCQYDVQQGEwJNSzEXMBUGA1UEChMOS0lCUyBBRCBTa29wamUxFjAUBgNVBGETDU5UUk1LLTU1Mjk1ODExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UECxMWS0lCUyBBRCBUcnVzdCBTZXJ2aWNlczEpMCcGA1UEAxMgS0lCU1RydXN0IElzc3VpbmcgQ0EgZm9yIGUtU2VhbHM=","whitelist":false,"attachment":{"hash":"8d7c38f00343d8c6a7932df61962f01724d42231ff99cb9d43e41b71980f219b","size":2418,"filename":"BHGCDczb35jf24uF9UQUIWbl37u3KH6m3tAW-DvKkBs=.pem","location":"security-state-staging/intermediates/aec25152-6938-41ba-83be-9d485724a1f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BHGCDczb35jf24uF9UQUIWbl37u3KH6m3tAW+DvKkBs=","crlite_enrolled":false,"id":"222af1d2-d2b2-43a7-bd2e-b11bafc80a2f","last_modified":1576536533680},{"schema":1576535859306,"derHash":"rVTYl5qhNun1aOASNKzKaMgabwD5YppxknU/dnUrymk=","subject":"SERIALNUMBER=D-059888-N,CN=Entitat de Certificaci\u00f3 de l'Administraci\u00f3 P\u00fablica Andorrana-19,O=M.I. Govern d'Andorra,L=Andorra la Vella,C=AD","subjectDN":"MIGqMQswCQYDVQQGEwJBRDEeMBwGA1UECgwVTS5JLiBHb3Zlcm4gZCdBbmRvcnJhMRMwEQYDVQQFEwpELTA1OTg4OC1OMRkwFwYDVQQHDBBBbmRvcnJhIGxhIFZlbGxhMUswSQYDVQQDDEJFbnRpdGF0IGRlIENlcnRpZmljYWNpw7MgZGUgbCdBZG1pbmlzdHJhY2nDsyBQw7pibGljYSBBbmRvcnJhbmEtMTk=","whitelist":false,"attachment":{"hash":"2439a9af8e105590273a7f8dabfeff7fe23363d87885f4c5d124c95547f557cc","size":2674,"filename":"8uKsf7ZcawPyLn1CLEss26WHE7eXoc3NID0KIkebeE0=.pem","location":"security-state-staging/intermediates/95f44cc1-b11a-4c39-a5a3-792b30b17a70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8uKsf7ZcawPyLn1CLEss26WHE7eXoc3NID0KIkebeE0=","crlite_enrolled":false,"id":"20a21317-92a5-4f06-a7ae-6ef34f6c2524","last_modified":1576536533677},{"schema":1576535857717,"derHash":"oTggpzh7360gRGPvqSFkFmObfnPDHcL0mfU/zU1NJcQ=","subject":"CN=GlobalSign CA 2 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDIgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"db9fd8cd368a78c90dd388eabe22ac3ee5212f6971941d7ade0a0962870b2211","size":1670,"filename":"VUXuJLG7arucp8FV8pQeMxfw0abKhW_SszycDbgPGng=.pem","location":"security-state-staging/intermediates/5aeeca9a-d281-461f-ad3c-0940396f589d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VUXuJLG7arucp8FV8pQeMxfw0abKhW/SszycDbgPGng=","crlite_enrolled":false,"id":"9e27f27f-9ae6-4c4d-9359-109637b37bd6","last_modified":1576536533673},{"schema":1576535854905,"derHash":"xFG++6hwFOzVeFHR5oJAPjymCWN3Ouf6oA/9b/rIsqM=","subject":"CN=Apple Public Server ECC CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgRUNDIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"159650c695404e21baee3c84c9de3b14321fc786ae0d79ab3c53f0265e742c3e","size":1179,"filename":"AW191Or9_rr7bm1xPdsvaWeUUt-lfxY77hstOrTylbc=.pem","location":"security-state-staging/intermediates/28078966-bfa4-4d0f-b3af-2e868d081f40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AW191Or9/rr7bm1xPdsvaWeUUt+lfxY77hstOrTylbc=","crlite_enrolled":false,"id":"b0ae8271-61f1-4d4d-89b4-39a4305bde48","last_modified":1576536533666},{"schema":1576535851987,"derHash":"lBuK7kvPHv6wR1+yef3dzzf8WyD2ToQs2doHcLFX6E0=","subject":"CN=QuoVadis Swiss Regulated CA G2x,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH8xCzAJBgNVBAYTAkNIMSYwJAYDVQQKDB1RdW9WYWRpcyBUcnVzdGxpbmsgU2Nod2VpeiBBRzEeMBwGA1UEYQwVTlRSQ0gtQ0hFLTExMi4yMTAuMzQ5MSgwJgYDVQQDDB9RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzJ4","whitelist":false,"attachment":{"hash":"6908125b6436fe504186ad05f08f9ca8c51425e59416e586f9f37633a09be7f3","size":2564,"filename":"17usyAuuwq4vUDVkKKvhX_ccE7giLJSP0KwWdGbb-0k=.pem","location":"security-state-staging/intermediates/4b426595-1c8d-43aa-aec0-68f7d34d8ff0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"17usyAuuwq4vUDVkKKvhX/ccE7giLJSP0KwWdGbb+0k=","crlite_enrolled":false,"id":"f756cd0f-1e3b-4dc2-b9ec-0b4d23c9557c","last_modified":1576536533658},{"schema":1576535850582,"derHash":"dOswenisfoVwzBuuHFEQKmBTyW8zMtcDKFp0O8vTXZ4=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"25db1a27864552963eca82334bf17c5f8a3fcd5136a534321802fe7faa031628","size":1878,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/3b4e1c8b-6df4-468d-811d-6f9716be92d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"f1c185b6-80ef-454d-904b-6d48cbff1b6f","last_modified":1576536533655},{"schema":1576535847703,"derHash":"DuTa9xqF2ELSP0kQ/UyQm3Jxhhkx8dX+rIaCJfUnAOI=","subject":"CN=Entrust Certification Authority - L1C,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFD","whitelist":false,"attachment":{"hash":"47190803db64ab25e51ba6527fc97063b52701bffd05aa298e45e7e5dabf9efd","size":1780,"filename":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS-Ui0bQ94=.pem","location":"security-state-staging/intermediates/af52194d-e2db-45ba-a919-c7d2518b2eb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS+Ui0bQ94=","crlite_enrolled":false,"id":"af3a7f96-b279-4002-b898-ea1e04bf6025","last_modified":1576536533651},{"schema":1576535844835,"derHash":"h7utTJFdVtLnTwRNciC5V9SoU9mhgYtS82JUF9tlXjo=","subject":"CN=DigiCert SHA2 Assured ID CA - G1,OU=DigiCert Organizational E-Mail Certificate,O=DigiCert Inc,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQLEypEaWdpQ2VydCBPcmdhbml6YXRpb25hbCBFLU1haWwgQ2VydGlmaWNhdGUxKTAnBgNVBAMTIERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQSAtIEcx","whitelist":false,"attachment":{"hash":"87c92053d9938823a56b4253352209b1d9d45591fa0b90354ba17bc2dd0e6c6a","size":2121,"filename":"3iSMgpA0YuQJvvYFlTcCIByASHD5ze38kI_HcGk_5V0=.pem","location":"security-state-staging/intermediates/16516982-ac58-46e6-b7ac-4ff348b045ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3iSMgpA0YuQJvvYFlTcCIByASHD5ze38kI/HcGk/5V0=","crlite_enrolled":false,"id":"f9614db0-e95f-45ec-9e6a-44a7d7451bb4","last_modified":1576536533644},{"schema":1576535843434,"derHash":"Yt3PoFpjrPt8IHCkNSY/ImvyA5/BHRzPxzZ5LkRmmDs=","subject":"CN=BitCert RSA Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for BitCert,O=\u6210\u90fd\u6570\u8bc1\u79d1\u6280\u6709\u9650\u516c\u53f8,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MIHLMQswCQYDVQQGEwJDTjEQMA4GA1UECBMHU2ljaHVhbjEQMA4GA1UEBxMHQ2hlbmdkdTEnMCUGA1UECgwe5oiQ6YO95pWw6K+B56eR5oqA5pyJ6ZmQ5YWs5Y+4MTYwNAYDVQQLEy1Db250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIEJpdENlcnQxNzA1BgNVBAMTLkJpdENlcnQgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"50c510f25b6df7566b8bdeb308314bae9b7f601ea6c791b72f5f9e4fc19c283d","size":2288,"filename":"zdcDW7Ob8cQk0OUfB1X4d7hxi0MhL_P6fBOYC60fvWs=.pem","location":"security-state-staging/intermediates/aedc46d5-227a-4543-b3d2-4bea3bd28a2b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdcDW7Ob8cQk0OUfB1X4d7hxi0MhL/P6fBOYC60fvWs=","crlite_enrolled":false,"id":"8ee705aa-0876-4478-adde-0bfd21573307","last_modified":1576536533640},{"schema":1576535841997,"derHash":"bGZXjclq0T63toi9wJ20ctX78Ds70hMJZlBSqIbX6bQ=","subject":"CN=Apple Public Server RSA CA 11 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgUlNBIENBIDExIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"961515735a466b16075e55c7da361418ee043d9647f04c36b42e00fdd5304fa3","size":2028,"filename":"xXDXs35ozcjwk0JgHOmIO-JXQxta1bb9rQ14FVEqdWE=.pem","location":"security-state-staging/intermediates/f51e2efe-1586-43cb-8513-42d7587139fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xXDXs35ozcjwk0JgHOmIO+JXQxta1bb9rQ14FVEqdWE=","crlite_enrolled":false,"id":"b906d89b-573b-4733-920c-a0796309ee22","last_modified":1576536533636},{"schema":1576535840600,"derHash":"exZmp5kc/Ci2TaNx8XFB29b1Mh8huDoaZY1qQQ03TgU=","subject":"CN=EID-SK 2011,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGExCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRQwEgYDVQQDDAtFSUQtU0sgMjAxMTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVl","whitelist":false,"attachment":{"hash":"89a20e4b68a5ddbe58c0227ee52ef3440a11519c35dff5be41948baf0eafaae1","size":1792,"filename":"TH9WdGlVHNg84FAVfGSYy4E-hezWZlRfg3kL9-E9txs=.pem","location":"security-state-staging/intermediates/3b232e22-80b5-4310-a0f3-ffe15d3325c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TH9WdGlVHNg84FAVfGSYy4E+hezWZlRfg3kL9+E9txs=","crlite_enrolled":false,"id":"2294a4d1-a1d8-4963-beaf-58bf195a5728","last_modified":1576536533632},{"schema":1576535839167,"derHash":"Vk28anZVD9LU9LrGRIoRV7M8vY4LP9dtchB1QJZKhbU=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"fde7df84fbe0edfbcf96535bc97d6525b3869212e9cada774905831935692c2f","size":1821,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/003fd367-2188-4dcf-9002-58cb555aca5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"72652e1b-dcd1-4778-8e82-d9e0cadea9d3","last_modified":1576536533628},{"schema":1576535849224,"derHash":"m7XMhCevJ2vyFqdIrSV4XResur3eQoLmBtpSYs2UDzg=","subject":"CN=Cybertrust Global Root,O=Cybertrust\\, Inc","subjectDN":"MDsxGDAWBgNVBAoTD0N5YmVydHJ1c3QsIEluYzEfMB0GA1UEAxMWQ3liZXJ0cnVzdCBHbG9iYWwgUm9vdA==","whitelist":false,"attachment":{"hash":"25ce176fa214e6e0fdebb7a1832dce5580bd8c52cea81154114f3b6cd553dbe6","size":1459,"filename":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=.pem","location":"security-state-staging/intermediates/12de7d43-38fd-47e4-abd4-cf2fd4a2bc1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"foeCwVDOOVL4AuY2AjpdPpW7XWjjPoWtsroXgSXOvxU=","crlite_enrolled":true,"id":"884a0690-da65-400c-9fab-d03457385b58","last_modified":1576536533624},{"schema":1576535836297,"derHash":"z4iRXPmWkywrTL4wOQdtEZu3KLTzHkm2OlAi/mVImhI=","subject":"CN=AffirmTrust Extended Validation CA - EV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjE=","whitelist":false,"attachment":{"hash":"59f97b75ff4aa85380593bee67266d9df3536810543f8906024dce481dec03a9","size":1662,"filename":"xAD7ZgT8h1RQOQsz_6DxwKe17_oiwt-Jy6y1G1Akw00=.pem","location":"security-state-staging/intermediates/2d7384a5-c21e-4c9c-bab1-09bac6329f82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xAD7ZgT8h1RQOQsz/6DxwKe17/oiwt+Jy6y1G1Akw00=","crlite_enrolled":true,"id":"de2d8ef8-81da-4d27-98dc-2aac5604a760","last_modified":1576536533616},{"schema":1576535831521,"derHash":"qpQuUStCh9W+7IWhxagcLd0TazzHBltoMPBoURBTBBI=","subject":"CN=FedEx Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=FedEx Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRmVkRXggQ29ycG9yYXRpb24xPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UEAxMWRmVkRXggUHVibGljIE9ubGluZSBDQQ==","whitelist":false,"attachment":{"hash":"5d96dd1daba1201584f62db2c1b9025798e5aaf6fa68c96d8f9fcbf8cba48a3a","size":2052,"filename":"_HtX-jLmvyksCJaoiBQGgnIqDG05H_g_Wm2PUhssqrc=.pem","location":"security-state-staging/intermediates/e46a68fc-41f3-4b6e-bdff-866d25e359cf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/HtX+jLmvyksCJaoiBQGgnIqDG05H/g/Wm2PUhssqrc=","crlite_enrolled":false,"id":"b8528abc-baa8-44b9-bd18-905904ccc434","last_modified":1576536533605},{"schema":1576535830116,"derHash":"Pr9f/sWC0nxpPRvDAQSmO7v8NlLHipUCfpG3+I2sY0U=","subject":"SERIALNUMBER=ZZZZZZV0,CN=Siemens Internet CA V1.0,OU=Copyright (C) Siemens AG 2011 All Rights Reserved,O=Siemens,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaVjAxOjA4BgNVBAsMMUNvcHlyaWdodCAoQykgU2llbWVucyBBRyAyMDExIEFsbCBSaWdodHMgUmVzZXJ2ZWQxITAfBgNVBAMMGFNpZW1lbnMgSW50ZXJuZXQgQ0EgVjEuMA==","whitelist":false,"attachment":{"hash":"74b68a212aa3556e43f111197ff49f0b49384f017d5a0bf0f7691f07af8f80df","size":1642,"filename":"rQOD_jrRH5t2JxCWlRagCWxoDrKXhsLELQ-GrW6LeRI=.pem","location":"security-state-staging/intermediates/a3a0159e-a06f-40cb-a535-7707bef95b3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQOD/jrRH5t2JxCWlRagCWxoDrKXhsLELQ+GrW6LeRI=","crlite_enrolled":false,"id":"0ed532dd-1eea-4b09-8cf1-7d776e31478a","last_modified":1576536533601},{"schema":1576535828734,"derHash":"z4qG5oA2cAGUyxeihzJWsMP0+HmxHpze2X+b2Um72s8=","subject":"SERIALNUMBER=202010,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEw","whitelist":false,"attachment":{"hash":"c489aec141409cafd97e5f1081ec7447e97a8cc115dee8bf2856b9cfdc6b6a20","size":2333,"filename":"1Gj2oYHo5bx6UB6N1ZWaYH9p_JKTNdy9svwFXrtPOrE=.pem","location":"security-state-staging/intermediates/39a5b788-3acd-4c5a-95dd-da0e047288c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Gj2oYHo5bx6UB6N1ZWaYH9p/JKTNdy9svwFXrtPOrE=","crlite_enrolled":false,"id":"5c92465d-48b2-42ad-883f-f60b197d738b","last_modified":1576536533597},{"schema":1576535827277,"derHash":"f3VdwrnumesC1xyxgFBZqqu16z6FWNyowJodDeJY12c=","subject":"CN=DigiCert PKI Platform Class 3 Shared SMIME Organization CA,O=DigiCert\\, Inc.,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFDMEEGA1UEAxM6RGlnaUNlcnQgUEtJIFBsYXRmb3JtIENsYXNzIDMgU2hhcmVkIFNNSU1FIE9yZ2FuaXphdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"962146c4389406a5837448504ee8917c15a34a91f062837c24aae8379a53f649","size":2129,"filename":"kIMb0w91fvtIKY9SWGVWsLBdmzYR7ulapDwjSpj_sUw=.pem","location":"security-state-staging/intermediates/99ab416c-3ec0-4538-882f-0a8f848c39ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kIMb0w91fvtIKY9SWGVWsLBdmzYR7ulapDwjSpj/sUw=","crlite_enrolled":false,"id":"085b8109-df05-4f60-9f5b-24a135c8e502","last_modified":1576536533594},{"schema":1576535822371,"derHash":"2HqtYV/nwjhQMiRNCM3+BusAVnWqGJLW5bgngPGfuH8=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"3e9b27c1653abd1f49b5189ccb18ea591194a9d481d1174341a7cfca58f3cecc","size":2239,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/401c0af2-b653-4020-b4fc-748c2eb73eb0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"e3ea9bb3-49c5-4737-8811-c946f0d12a7f","last_modified":1576536533586},{"schema":1576535825729,"derHash":"m+2DMyEROjZtb2zzecVtTY5w84AarBScRn3VR7lbgDA=","subject":"SERIALNUMBER=202001,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDE=","whitelist":false,"attachment":{"hash":"1a6c080cdf1e6925db74f55875bcc4c9b4dee5cdc065acb74b17d9d378823ff6","size":2337,"filename":"wTIgzVyDobl0UXdknuaJLn7IjhxQWstWSpX0gYZxwSc=.pem","location":"security-state-staging/intermediates/33367ce4-c7a5-4a00-9a19-f5a75f62ec4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wTIgzVyDobl0UXdknuaJLn7IjhxQWstWSpX0gYZxwSc=","crlite_enrolled":false,"id":"df664d63-b5f5-4b4c-9421-c7442a5e3d1f","last_modified":1576536533583},{"schema":1576535820935,"derHash":"M+8VHvsI0cRPuFzD8j7GhzAU6fiBaRvUk4t/JRWAtpQ=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"41d424d3da88a84293ad6feed475c1a513b2a30cd740e6d86c7ec641141bd50e","size":1313,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/e4bdfc10-cf3c-4f1d-8566-19d3353552f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"59fa6d74-626e-410e-a605-3508e34fb522","last_modified":1576536533576},{"schema":1576535815181,"derHash":"ScWCcPcPG+C3wZ0bwsLrxB4v3g1IhdT6Ze8DcKzsegA=","subject":"CN=Trustwave Extended Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE5MDcGA1UEAxMwVHJ1c3R3YXZlIEV4dGVuZGVkIFZhbGlkYXRpb24gU0hBMjU2IENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"8d10fdb281e7d06718cfb07684595820b2ba91fe916794f089027ecd08741ae9","size":1808,"filename":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=.pem","location":"security-state-staging/intermediates/ce6b6bbd-6319-4603-8b73-cca667b9433f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=","crlite_enrolled":true,"id":"9ae59d4e-7e03-474f-941d-3981e7735030","last_modified":1576536533565},{"schema":1576535813752,"derHash":"cqxCi7cV313Br4dXkwjozC6/pYhoa1Zykv1w7rD+6Lc=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"9f2cd48065c65b19c1567155587ee5b2ea12096fc059100e9dae031f046e8223","size":2247,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/80b2e6eb-6ab0-45b0-934a-0bd551103c17.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"5c8d7aa0-ea1f-4169-aad6-87d9f174d9b1","last_modified":1576536533561},{"schema":1576535810909,"derHash":"m1P2nYRHsBsB5FZbhT4oi2y4IpHagqW0G7wVwvOtZUg=","subject":"CN=OneSignSSL RSA EV Secure Server CA,OU=Controlled by Sectigo exclusively for One Sign Pte. Ltd.,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIHCMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjFBMD8GA1UECxM4Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBPbmUgU2lnbiBQdGUuIEx0ZC4xKzApBgNVBAMTIk9uZVNpZ25TU0wgUlNBIEVWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d526be8dbfd4f8a1f4fa720b72484238615a1d43b39f4d9644bcd8a645363d48","size":2276,"filename":"N8OD-hIuhMaCwngPwhlrWu8ly-IEZbRt_gL0S4FH9GU=.pem","location":"security-state-staging/intermediates/580704b8-c2d3-4b2b-ac3f-4f4088f817ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8OD+hIuhMaCwngPwhlrWu8ly+IEZbRt/gL0S4FH9GU=","crlite_enrolled":false,"id":"2f63765d-9e3e-4f03-9bc9-57612db1fbf6","last_modified":1576536533557},{"schema":1576535812375,"derHash":"Qx9jChtd5vD/G3MxjQGqqf5KEl8wJsHMMOJc9KXLuj8=","subject":"CN=BitCert RSA Domain Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSowKAYDVQQDEyFCaXRDZXJ0IFJTQSBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"6ffbd17583806cfd9f9461e1213cba2e87fa5d6150d467d60f1bea3a6057e527","size":2129,"filename":"cNE8mPePscWLEKBJVbelkXANOrn4fk_NgWvF39Zm9FU=.pem","location":"security-state-staging/intermediates/082754db-89db-4a21-b19c-beb0cea8ad0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cNE8mPePscWLEKBJVbelkXANOrn4fk/NgWvF39Zm9FU=","crlite_enrolled":false,"id":"67e2adbf-676e-4de8-b707-4616d1daef65","last_modified":1576536533550},{"schema":1576535808036,"derHash":"Fq1RJaCVWvAmQhhUXnSCfiw5oDLV0L9mWxfDv5nSNJY=","subject":"CN=BitCert ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for BitCert,O=\u6210\u90fd\u6570\u8bc1\u79d1\u6280\u6709\u9650\u516c\u53f8,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MIHLMQswCQYDVQQGEwJDTjEQMA4GA1UECBMHU2ljaHVhbjEQMA4GA1UEBxMHQ2hlbmdkdTEnMCUGA1UECgwe5oiQ6YO95pWw6K+B56eR5oqA5pyJ6ZmQ5YWs5Y+4MTYwNAYDVQQLEy1Db250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIEJpdENlcnQxNzA1BgNVBAMTLkJpdENlcnQgRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"0bf8e9bb5d7d37aa96702157cb3f2294932a83c08a9d1b6c2b943e541fc807fb","size":1451,"filename":"7tz57vvcF4mLPHC5kUb-dwbT09hTvQJZuiNDyCG4Swc=.pem","location":"security-state-staging/intermediates/ae19039d-8a97-4be8-9215-27223a283e1e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7tz57vvcF4mLPHC5kUb+dwbT09hTvQJZuiNDyCG4Swc=","crlite_enrolled":false,"id":"402c61da-df23-4bb5-9b05-933a5fcc8719","last_modified":1576536533546},{"schema":1576535806599,"derHash":"f9zjv0EDwmhLOtu1eSiEvUXHUJTCF3iIY5UDRveckKM=","subject":"CN=Let's Encrypt Authority X1,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMQ==","whitelist":false,"attachment":{"hash":"bbe724ea37646109cfdf462e31c712ce1860c42f0c33c899f330a39c44c47cc9","size":1674,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/ca8a4374-c876-45a5-a7e5-93bbf9babd0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"0638efef-e35a-421b-af37-979d39b08cbc","last_modified":1576536533543},{"schema":1576535805086,"derHash":"U2dpLs5it1jQTZt+bfsNswf4WevGpstfd/8kVh18wAQ=","subject":"CN=USERTrust RSA Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e824527655464dd31a8c05c4d0472f598ceba1ccfa4c8b6f1f82aacae141213f","size":2174,"filename":"8E_u4IJLStWPqhVEn4td_2Ae6WYCii1AmJC2dgTCj1s=.pem","location":"security-state-staging/intermediates/81cfbb36-b77a-44c7-b9d5-e2c1a3bdf3fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8E/u4IJLStWPqhVEn4td/2Ae6WYCii1AmJC2dgTCj1s=","crlite_enrolled":true,"id":"e80e13e0-9ae0-4852-86c7-1c266fe0906a","last_modified":1576536533536},{"schema":1576535803675,"derHash":"Hk/DTSbgeT1VnjIv4RHx4ZqdLjS8JdPEJ7AypI0sW2o=","subject":"CN=Encryption Everywhere ECC DV TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLDAqBgNVBAMTI0VuY3J5cHRpb24gRXZlcnl3aGVyZSBFQ0MgRFYgVExTIENB","whitelist":false,"attachment":{"hash":"b2e5666f89f6d4fcf8a08fb74f9c91de3fd68ec696f62a873e86e4f8f9820119","size":1402,"filename":"Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54_cJM=.pem","location":"security-state-staging/intermediates/e826a1f2-a878-4c8b-a4fe-e7e952f31ace.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y08hSYf9OdhKAGME14XuWUxmQaPENh7XTciOu54/cJM=","crlite_enrolled":false,"id":"088948ef-fc2d-4e5d-8116-9d744c2d517a","last_modified":1576536533532},{"schema":1576535802266,"derHash":"X6UFXyQNl2NCYTkfBp1nNWiQpmaZrDU8h5bAIIfD9iU=","subject":"SERIALNUMBER=202005,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDU=","whitelist":false,"attachment":{"hash":"a1d2ba4c6e094c13518e23442e78edfc498b63f04ef46e0ff1d638ec4611959f","size":2337,"filename":"yXbKpkevIJYstXu3Y8aQhnKxJCsgkPusJy_04jWrd9k=.pem","location":"security-state-staging/intermediates/da35fd7e-cb9e-45b0-b785-a3544f24944a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yXbKpkevIJYstXu3Y8aQhnKxJCsgkPusJy/04jWrd9k=","crlite_enrolled":false,"id":"719da943-9eca-48e7-a6f7-8fabfaa691eb","last_modified":1576536533527},{"schema":1576535800599,"derHash":"EaJ2cYciZURctyWOsoRO5hTRR3e59vc76VMhIvIfrQ0=","subject":"CN=JPRS Domain Validation Authority - G3,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzM=","whitelist":false,"attachment":{"hash":"4b63dd60cab5b91793fb269517be9ffd9aadf4f0d673182ce5c573d60f93a5f0","size":1792,"filename":"n1ufb8l1_ENW_uOKNKgHIeBe_NgVI39f0IzwWmCVHvE=.pem","location":"security-state-staging/intermediates/219df0bb-3a25-4e71-9a82-6e5b4dff8b72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"n1ufb8l1/ENW/uOKNKgHIeBe/NgVI39f0IzwWmCVHvE=","crlite_enrolled":true,"id":"fa314713-1710-4998-8e47-324d8a08bbcb","last_modified":1576536533524},{"schema":1576535799214,"derHash":"PX/nnGA3ySsvcebuMuqOSJe+DlJHE/pXZv5QcKuuNbQ=","subject":"CN=OneSign OV Code Signing CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MHcxCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSMwIQYDVQQDExpPbmVTaWduIE9WIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"d0d86e927bb45144063cad68a993a2989fc62706735c52f3bfe6e4f30652c741","size":2113,"filename":"5nYj6KpzYdmcxBc53ixNusk36BbU6mrGTXPVKqFZz4o=.pem","location":"security-state-staging/intermediates/6a639b4c-4c2d-449d-9944-d639bf15eea6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5nYj6KpzYdmcxBc53ixNusk36BbU6mrGTXPVKqFZz4o=","crlite_enrolled":false,"id":"9380b8fd-2e8a-4be6-8e33-2ac89816bd16","last_modified":1576536533520},{"schema":1576535797770,"derHash":"ceZTv79eclFbQJm71eyIcoErR8bsH6mt0yfhySyeoW0=","subject":"CN=Certigna Services CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MH0xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBTZXJ2aWNlcyBDQQ==","whitelist":false,"attachment":{"hash":"1e69d697d43d9ba8bb5bef41ca322d6effdfa8f6fb680b6b8c84759cb9c7151f","size":2170,"filename":"Vvyvg4-bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB_uE=.pem","location":"security-state-staging/intermediates/fd277823-b07c-41b0-bff8-0cdb90cd2145.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vvyvg4+bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB/uE=","crlite_enrolled":true,"id":"e83a378a-19a8-4110-bf0b-0f49b8965b01","last_modified":1576536533516},{"schema":1576535796324,"derHash":"l8ZzTlSpCzt8D1QCU39IH95CN5ndsub4WybuGqctITQ=","subject":"SERIALNUMBER=202002,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDI=","whitelist":false,"attachment":{"hash":"c0fa3dc15aeb9baebdbfdfe25bcfee4127a355c5cb6c09e43c562da3b547eeea","size":2337,"filename":"2rt-W6yXxYkYjTahsDT5hHsIBPVpVTxJQpmpCAktRXo=.pem","location":"security-state-staging/intermediates/da70c200-aa3a-489e-b91c-90be8cf90677.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2rt+W6yXxYkYjTahsDT5hHsIBPVpVTxJQpmpCAktRXo=","crlite_enrolled":false,"id":"47a787f1-e657-48ab-abc2-2282a260dd45","last_modified":1576536533512},{"schema":1576535793514,"derHash":"ndwuDVW0YeDHMigoLfVrK+8iTKI4VoHRe26MB3hSVzw=","subject":"CN=GlobalSign CA 4 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDQgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"1971e4bd393e616d4a85fc372108d3352c1321acd50f44ae8d74ec89a345738a","size":2089,"filename":"Xj0OpiKM5fkJ7g__pfUXsKnp9Ggz3CaAgIY6QU_Ml6I=.pem","location":"security-state-staging/intermediates/b5319024-9627-4d8d-b25c-c792f4e61e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Xj0OpiKM5fkJ7g//pfUXsKnp9Ggz3CaAgIY6QU/Ml6I=","crlite_enrolled":false,"id":"0e72f222-c8c3-4c56-8ae7-c680fea038a5","last_modified":1576536533509},{"schema":1576535791937,"derHash":"ixbUj3Id+rFXIUuazp3ajvuloGtO7ZAYBvCG0d+OrTc=","subject":"CN=Entrust Code Signing Certification Authority - L1D,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMTswOQYDVQQDEzJFbnRydXN0IENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxRA==","whitelist":false,"attachment":{"hash":"fdd58cea7e31810e5f8ba89b9c1c7613eb91f74984042fd3837aefe09410de81","size":1796,"filename":"q4FwU8-QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=.pem","location":"security-state-staging/intermediates/8aed1bf7-b11b-476e-823d-17c0cf8948ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q4FwU8+QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=","crlite_enrolled":false,"id":"1276d7f5-5c93-47a5-ba50-e376b6f24b77","last_modified":1576536533505},{"schema":1576535788951,"derHash":"OALkJFFveO6sMpqumx9gpBLb4dWwldesncDc3ePB9fs=","subject":"CN=Ford Motor Company - Enterprise Issuing CA01,O=Ford Motor Company,L=Dearborn,ST=Michigan,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEbMBkGA1UEChMSRm9yZCBNb3RvciBDb21wYW55MREwDwYDVQQHEwhEZWFyYm9ybjERMA8GA1UECBMITWljaGlnYW4xNTAzBgNVBAMTLEZvcmQgTW90b3IgQ29tcGFueSAtIEVudGVycHJpc2UgSXNzdWluZyBDQTAx","whitelist":false,"attachment":{"hash":"66305a50b272e38167edac50ea0ea4251e15c161604ba011e5ce7a459a47d597","size":2588,"filename":"CqwsdVHa6T0W9pos5-f88X2UNjXr4wKHpQ8Muq3ipRA=.pem","location":"security-state-staging/intermediates/7824b869-27a2-4934-a88c-9eb415787415.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CqwsdVHa6T0W9pos5+f88X2UNjXr4wKHpQ8Muq3ipRA=","crlite_enrolled":false,"id":"b7ef57bf-52b7-42de-ba58-d36fd3aa3e00","last_modified":1576536533498},{"schema":1576535794903,"derHash":"Xh2m6S4okrpqc/xQjkHzX5+SfkaEKCmA4XoBORii6lA=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"df9806c74f3765764c083de1480b0a52cd10e922c4f3954907a5dd627d515904","size":1707,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/2005e5a9-9e1a-4fdd-92da-332b6cf65fe2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"78dd32a3-453b-4588-8500-d6e3ba556e36","last_modified":1576536533495},{"schema":1576535787501,"derHash":"WXK5vUcQF9XzJwW+6RVwNiZXX4snCjnBwxLH+SRsENQ=","subject":"SERIALNUMBER=ZZZZZZA2,CN=Siemens Issuing CA EE Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGfMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTIxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMSgwJgYDVQQDDB9TaWVtZW5zIElzc3VpbmcgQ0EgRUUgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"b12e53720e7865f31d817d0aa08374ddea48a85382ed262c82bbeb55a1b88f0f","size":3133,"filename":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=.pem","location":"security-state-staging/intermediates/25f101de-ca3e-462b-ae08-6d5c61e71bdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=","crlite_enrolled":true,"id":"8555121f-5201-43c7-a55b-0a7a5c2bcaba","last_modified":1576536533491},{"schema":1576535784624,"derHash":"r2OdwLuxaO/3WxURfYiJN+tkwbBFPxaNG4xS7PBKy5M=","subject":"CN=AffirmTrust Networking Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgTmV0d29ya2luZyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"567c0deb382057dc9c24a94f806ff056b5ca63c56b30305ac6dbb6b17fc7c414","size":1581,"filename":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=.pem","location":"security-state-staging/intermediates/1e83b359-8021-4e03-997d-db1ee57d127d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=","crlite_enrolled":false,"id":"c50530e0-79bd-45c9-a333-3de7cc66a670","last_modified":1576536533484},{"schema":1576535780113,"derHash":"c50MOnG2w3fL0cQIrnzBlzLCy++GINY7Fsn9AYXfmnE=","subject":"CN=Atos TrustedRoot Client-CA for equensWorldlinePartner 2 2019,O=Atos,C=DE","subjectDN":"MGMxRTBDBgNVBAMMPEF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBlcXVlbnNXb3JsZGxpbmVQYXJ0bmVyIDIgMjAxOTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"ccd6bf64b0fe85f84a39efc0e01f5c14bd29d87d463cebcb319c05a721bb707b","size":1963,"filename":"mYzVJyiW8rCGgYKsa2ZqYeJxDrP-AP2AAx-gS-JpbgI=.pem","location":"security-state-staging/intermediates/a180baa5-7ae1-4c2f-b681-e2005c81c50d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mYzVJyiW8rCGgYKsa2ZqYeJxDrP+AP2AAx+gS+JpbgI=","crlite_enrolled":false,"id":"9300e6b6-6f08-4bef-a127-adb3c76eefe1","last_modified":1576536533472},{"schema":1576535777302,"derHash":"/TOu/TOhYfrAGQ5B353VDDM56IPAP0nEoqsriVbvVNQ=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"8bb58e69a554da25ed0e9a2e2c0f0b5c5c4a14229e342a65c32c6aac31ba5d3a","size":1894,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/eab13c01-ef46-422e-9972-eae0610179d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"ad42cc39-3cc7-493a-be53-30f0af27396d","last_modified":1576536533468},{"schema":1576535778745,"derHash":"djSK3uSOYdcynuSDEJZR6ksuC1wC998lg/4QdO2cb+w=","subject":"CN=SafeToOpen ClientCert ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MFExCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDEpMCcGA1UEAwwgU2FmZVRvT3BlbiBDbGllbnRDZXJ0IElDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"d2225a4c67341a1d2bb21c9161f9f20b36f3436d9503b4c0ed123d5c05200e9e","size":2483,"filename":"e9_bjft2byP0VwBVyMlQUiqIe4r0YRn4_rKl-kQ3Vt4=.pem","location":"security-state-staging/intermediates/3a631fc8-f14e-493b-9c86-1f3c36c6637d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e9/bjft2byP0VwBVyMlQUiqIe4r0YRn4/rKl+kQ3Vt4=","crlite_enrolled":false,"id":"709c1ccf-bcc4-4d2c-be64-a416ecaddacd","last_modified":1576536533464},{"schema":1576535771624,"derHash":"6H6ivtbGIDssVbAP5J0odvumRwIQWut0i4ZakYtcfSc=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"d4e7ca7e1402409ada7f0f5a43f305ef2e3e302c74d18ba940f4da00d03dc570","size":1569,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/9ee14808-899d-4024-8b79-c401b44fd1ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"9b7b6720-a2ad-489f-9c69-dfd96a8c27b1","last_modified":1576536533450},{"schema":1576535770260,"derHash":"2jvitqbZcVwSlaQr5SbgAB0Q5ddUDwbnYxs05kSTSEg=","subject":"CN=Secure Site Pro ECC CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIjAgBgNVBAMTGVNlY3VyZSBTaXRlIFBybyBFQ0MgQ0EgRzI=","whitelist":false,"attachment":{"hash":"788b2f3686e8970c3f5cfad0711b04ffb48ca9be4a2d82a766de64e5a7aa6248","size":1394,"filename":"SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=.pem","location":"security-state-staging/intermediates/f6d2b6fc-b4fb-4bad-81b8-9e27104a4e8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SM9Xyw9hNxw5i17xxTmtGrBPfKQFpQaYXQuRAEx9ygs=","crlite_enrolled":true,"id":"8353b3ca-43b2-48d1-87b8-c28fcd0ba0e3","last_modified":1576536533447},{"schema":1576535768847,"derHash":"O5HEzWer3x1Scu67Lienee8C2CDOAvZLU7ncXnhnQ7g=","subject":"CN=Document Signing ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MH4xCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSQwIgYDVQQDDBtEb2N1bWVudCBTaWduaW5nIEVDQyBJQ0EgUjE=","whitelist":false,"attachment":{"hash":"1d398f18501d3a5e09a31afee26764aead55237baa53a49993a4afaa2acaff8e","size":1366,"filename":"FZ8xakLVjVKD3n_pRB8V9qVb1lmJuM7JBY6uzwl3Ht0=.pem","location":"security-state-staging/intermediates/a5f07e80-dd03-4fbe-b113-0487d431c83b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZ8xakLVjVKD3n/pRB8V9qVb1lmJuM7JBY6uzwl3Ht0=","crlite_enrolled":false,"id":"c3150be2-0aba-41ac-86ce-a463eb088d4f","last_modified":1576536533443},{"schema":1576535767420,"derHash":"Bb3Zp8ZwbTnW2xpYCq/2fUZzAnts8B/RU2fY7YSokPA=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"ef5b81322c43753e4a9ea1ffbbe9bdcd81aa70b6aee06e7346ec6e8fab589497","size":2125,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/038fe9fc-bab4-43ca-832c-ef6d0f3ba1fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"96bc6b19-4307-4508-8c1f-7093ac0bcddc","last_modified":1576536533439},{"schema":1576535765971,"derHash":"679NxgDBfaBDgd79z8EZw/NO+0oE0IYJELgTx3ktdYU=","subject":"CN=Certigna Entity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHsxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRswGQYDVQQDDBJDZXJ0aWduYSBFbnRpdHkgQ0E=","whitelist":false,"attachment":{"hash":"ada86b610b9f472f00e1921d532cf509f6692c87cb45580cbdd6cdb13bc4ffbd","size":2170,"filename":"0Eiyrr-wFIp1JqShtXzNCtJt2yUU0-j_mDnLwk1-AHk=.pem","location":"security-state-staging/intermediates/f1c34a68-978a-4f12-85f8-06564ca3f194.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0Eiyrr+wFIp1JqShtXzNCtJt2yUU0+j/mDnLwk1+AHk=","crlite_enrolled":false,"id":"b641a082-df69-4132-a8a8-a1a801f83c2c","last_modified":1576536533436},{"schema":1576535764596,"derHash":"xa2jSGvdtUWzqn7JnGnBrtlCdNX+ynkz4BMuIS8CZnE=","subject":"CN=BitCert ECC Domain Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSowKAYDVQQDEyFCaXRDZXJ0IEVDQyBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"cf45883f3cb3aaa3f86e6fd95964673ab8be0ec688db38395556914cc50c457e","size":1288,"filename":"l03AMxIZai8wvW2nrYEfG_5pj3_oGL2PS1_B5kv47yg=.pem","location":"security-state-staging/intermediates/1dc1c5ba-377f-4791-bea6-1421a0da10d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l03AMxIZai8wvW2nrYEfG/5pj3/oGL2PS1/B5kv47yg=","crlite_enrolled":false,"id":"a06f0bc4-ae00-450f-9b23-5180ec001c0e","last_modified":1576536533432},{"schema":1576535763166,"derHash":"TElDueqhTqKmm4p+TY2okIHuoRyH6CKbm3T2inrTO3k=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"131d16f8a3827db506e21e62347e6935b0db5934f7cd31f78e3735432e71fcd8","size":2446,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/53ce7c2b-bdc9-4c39-8f4e-19e5a9954bb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"97d292c2-1d66-4cc8-8ec8-a8911cfaad9e","last_modified":1576536533429},{"schema":1576535759951,"derHash":"61fyBRE6WBFH4PHZcygnT7Aw7GnuyJyil9z1Wj+0Rjw=","subject":"CN=Cybertrust Japan Public CA G3,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEmMCQGA1UEAxMdQ3liZXJ0cnVzdCBKYXBhbiBQdWJsaWMgQ0EgRzM=","whitelist":false,"attachment":{"hash":"d0ce3f546a0b5b31ffeafd1b7b56cdfb890a2a42f77fbd7a34624bfeb1403b9e","size":1569,"filename":"QnKSPXOthAGsklSpx8zrmS9gtfzbJ28gPMA9AMjEoJc=.pem","location":"security-state-staging/intermediates/cfc9aae0-3939-46e2-b9b5-031113811434.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QnKSPXOthAGsklSpx8zrmS9gtfzbJ28gPMA9AMjEoJc=","crlite_enrolled":true,"id":"170fdc60-b3a3-4542-9702-1b3b2f475163","last_modified":1576536533421},{"schema":1576535758523,"derHash":"TM8XwMjBwQ1YduxeMoD+jRNN82rt2ERCibmQvDdB508=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CUALIFICADOS,OU=Certificados Cualificados,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGSMQswCQYDVQQGEwJFUzEeMBwGA1UEChMVRmlybWFwcm9mZXNpb25hbCBTLkEuMSIwIAYDVQQLExlDZXJ0aWZpY2Fkb3MgQ3VhbGlmaWNhZG9zMRIwEAYDVQQFEwlBNjI2MzQwNjgxKzApBgNVBAMTIkFDIEZpcm1hcHJvZmVzaW9uYWwgLSBDVUFMSUZJQ0FET1M=","whitelist":false,"attachment":{"hash":"b3e4e383491cfa05a6e5858dc73ac1a4018938ed5c15a0d37c708311bd252227","size":2251,"filename":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU-Y=.pem","location":"security-state-staging/intermediates/2b8e2bc0-c68e-4dce-9e23-322c77fed80d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU+Y=","crlite_enrolled":true,"id":"3a7a7325-7f7b-40b5-86ed-594919a759ac","last_modified":1576536533417},{"schema":1576535754283,"derHash":"A3YWMmo0L8B4DUr/tzRP8Okl0eD95Hgqt4L0q9W1MrA=","subject":"CN=Code Signing ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHoxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSAwHgYDVQQDDBdDb2RlIFNpZ25pbmcgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"36f68794088b135f677cebba75e488317c36d03d79ae9a05ab74f929ff5b8764","size":1329,"filename":"jZT0dnUpZ1-v9bahYwUFxf9JNVofQeMD_ZBqvCPnxLA=.pem","location":"security-state-staging/intermediates/8e437135-4819-4662-96a1-702396b42c86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jZT0dnUpZ1+v9bahYwUFxf9JNVofQeMD/ZBqvCPnxLA=","crlite_enrolled":false,"id":"090c1b74-da3c-4164-b879-475bec9c94e8","last_modified":1576536533413},{"schema":1576535752775,"derHash":"+/gAl7yu7qyhOf263rWt2YyRu2msHUpmnU3gPgg1TU8=","subject":"SERIALNUMBER=202006,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA2","whitelist":false,"attachment":{"hash":"9b87f4ed0a777f1fe45c49dfb7ca4daed55e7e7a233f5f373c4019fba5815a9c","size":2333,"filename":"tmU4vIMx2B_mhNc1TEZrX5KYbxjUTIs_Eu0mrAh0UJ0=.pem","location":"security-state-staging/intermediates/d60c2192-fd0b-4214-a308-ffdc49d9ef23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tmU4vIMx2B/mhNc1TEZrX5KYbxjUTIs/Eu0mrAh0UJ0=","crlite_enrolled":false,"id":"a470c28a-df12-4579-b9a6-1f16a4ca2214","last_modified":1576536533408},{"schema":1576535757125,"derHash":"A86bxxuR/bfLPFI1yuBwHLSGu9Yo1KreWEH8XwqjekY=","subject":"CN=DigiCert CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFURpZ2lDZXJ0IENOIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"595bf22b78664a42587deccbb284643462b25d170791f641b0fd546e4050d8f6","size":1829,"filename":"MIKoeatlSqVA3aCIrE0_JYoP9vF4XSCTPHy-c9vAsKk=.pem","location":"security-state-staging/intermediates/d17777aa-b2a4-484e-8441-343c9547032e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MIKoeatlSqVA3aCIrE0/JYoP9vF4XSCTPHy+c9vAsKk=","crlite_enrolled":true,"id":"03498728-f5b2-439d-81fe-b9e6d9610c07","last_modified":1576536533404},{"schema":1576535748430,"derHash":"9nh/qMrX0sJ5oDdL+1A4B8xq3MfCNwknPdWkBH0a73g=","subject":"CN=SZCA DV SSL CA,O=Shenzhen Digital Certificate Authority Center Co.\\, Ltd,C=CN","subjectDN":"MGcxCzAJBgNVBAYTAkNOMT8wPQYDVQQKDDZTaGVuemhlbiBEaWdpdGFsIENlcnRpZmljYXRlIEF1dGhvcml0eSBDZW50ZXIgQ28uLCBMdGQxFzAVBgNVBAMMDlNaQ0EgRFYgU1NMIENB","whitelist":false,"attachment":{"hash":"a9b2ca0380643dfb1ea6c1f34c39fa58988e778b07ffa23714878880023314a7","size":1756,"filename":"PPn3ERZq7pmEq4QyyPxBu8LvJxjiPlPsQLVTHYbOwbo=.pem","location":"security-state-staging/intermediates/da53fafc-fb80-458f-bfea-530aa2404b02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PPn3ERZq7pmEq4QyyPxBu8LvJxjiPlPsQLVTHYbOwbo=","crlite_enrolled":true,"id":"9edde23a-7218-41f2-abd4-607c025433f0","last_modified":1576536533388},{"schema":1576535745623,"derHash":"P4/Is8Q1eJGu6pafkGovTyLbVlRDYoMNAaQN/WmhezQ=","subject":"SERIALNUMBER=202019,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE5","whitelist":false,"attachment":{"hash":"934630bc6dc2e4108e88dabcc6340b616f8eacb0881c9e46119b1dc2a356f2e5","size":2333,"filename":"ocfITRRhsDIXLV159O4zK-dM7Mn-83WfdL1qjoaRY60=.pem","location":"security-state-staging/intermediates/7d403344-5dc7-4250-8e51-ffe66db08bd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ocfITRRhsDIXLV159O4zK+dM7Mn+83WfdL1qjoaRY60=","crlite_enrolled":false,"id":"85ec4838-2515-43b4-8bf6-1c66071fa3ed","last_modified":1576536533373},{"schema":1576535744191,"derHash":"4R4GhhxNMI/ZRL8Xvl6QcqA0xPkwNMtZwC1RLTD3/EU=","subject":"CN=COMODO SHA-2 Pro Series Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDExMC8GA1UEAxMoQ09NT0RPIFNIQS0yIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"20e0af1ce1afab12f371d4975120dcf56cf9ac794e09d91ed9f543ab66f3df9e","size":1691,"filename":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=.pem","location":"security-state-staging/intermediates/b573613e-98b2-442f-b706-7ff52a6c758a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=","crlite_enrolled":true,"id":"99771b0e-6ace-4444-871f-7a6c6e0bffa4","last_modified":1576536533370},{"schema":1576535742721,"derHash":"W2kOHNK8ABbk2yqrq1A3ReQfhrJEjy7AbSnySZnevKI=","subject":"CN=Symantec Class 3 Registration Authority Intermediate CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgUmVnaXN0cmF0aW9uIEF1dGhvcml0eSBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"ea664603ffb12d1a1345ffb13a3ca44d29711f5043c16a6488fa3b9f2b64f3ba","size":2198,"filename":"vO3_XaIzmqGtcOO2LQL_yHzKa4ueBDChpnLbfwpiu8c=.pem","location":"security-state-staging/intermediates/fdc9f14c-56b9-4103-a6c5-aaa28d69e0dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vO3/XaIzmqGtcOO2LQL/yHzKa4ueBDChpnLbfwpiu8c=","crlite_enrolled":false,"id":"abf5170f-a490-479a-a959-03b3ec607959","last_modified":1576536533366},{"schema":1576535739800,"derHash":"pmQixORJ1GXLAjp/x2M96O0YFphcpBCT/JazZj7XpDs=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"8e16299210c970b497a721b3efd1e8535900deef5b981db9c57146ed85f7ff39","size":1577,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/5f6d485b-b94c-40e9-8cc6-7345b0d7d030.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"01146bea-1246-4f33-8f61-a7813e0e2d87","last_modified":1576536533362},{"schema":1576535741259,"derHash":"nhLW4T3dU6iQorOjdCOuXkV3MaezShU5kvHvH1SJpF4=","subject":"CN=DigiCert Assured ID Client CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ2xpZW50IENBIEcy","whitelist":false,"attachment":{"hash":"aba4ac7f47cd3fa5c97a15e2f8e46b0e94ea9d901e60ab40b1dd3ef285a8e6ab","size":1922,"filename":"9uNJKUqEgsV_TXwKFsvy0WrHpWynY8_2cDPAxVlPKwc=.pem","location":"security-state-staging/intermediates/4ea199af-90de-4f71-87de-cb9cd99b0573.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9uNJKUqEgsV/TXwKFsvy0WrHpWynY8/2cDPAxVlPKwc=","crlite_enrolled":false,"id":"61689adb-2a3b-46ab-9ad9-da8f662c67aa","last_modified":1576536533357},{"schema":1576535734060,"derHash":"J84nIGUCAw46ELyW06IMPYiV+HH7ar4dgEdKtFbzGvU=","subject":"CN=BitCert ECC Business Secure Site CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSwwKgYDVQQDEyNCaXRDZXJ0IEVDQyBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"21b09c09247dfb82fcc1068e7b44ec24f339af2145e053fa304feaccc96b5143","size":1293,"filename":"WavFTPiAKmlGYUqrK6pToCjDxiEpoNAPMXa5dEGGoi0=.pem","location":"security-state-staging/intermediates/bf93fc43-be30-4713-89f4-6c568e6e35a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WavFTPiAKmlGYUqrK6pToCjDxiEpoNAPMXa5dEGGoi0=","crlite_enrolled":false,"id":"0a103d72-7904-480c-a650-b799dc30c443","last_modified":1576536533349},{"schema":1576535736902,"derHash":"SIVck1lFJzOdmESWifq3wxX/VGUGbFFsKdvc8YU5AdM=","subject":"CN=WebNIC RSA Business Secure Site CA,O=WebNIC,L=Singapore,C=SG","subjectDN":"MF8xCzAJBgNVBAYTAlNHMRIwEAYDVQQHEwlTaW5nYXBvcmUxDzANBgNVBAoTBldlYk5JQzErMCkGA1UEAxMiV2ViTklDIFJTQSBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"8d8a9aace8a73869057b9a3f4640419a8e8603f9acfbe1caa324a7884b5b0cdf","size":2093,"filename":"VEf8vFVDUxjsP3LYyFy549557yb431jkLHXGaJeeg0s=.pem","location":"security-state-staging/intermediates/3e1e18bc-6809-4b82-b004-81bb3abaf8d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VEf8vFVDUxjsP3LYyFy549557yb431jkLHXGaJeeg0s=","crlite_enrolled":false,"id":"5e2d4521-debf-4170-bfa2-c04516822e90","last_modified":1576536533345},{"schema":1576535730952,"derHash":"RWO5NuNauXV29a7xk12bx+mXeEHwVzvS4WvKyVNKavk=","subject":"CN=AffirmTrust Certificate Authority - DV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIERWMQ==","whitelist":false,"attachment":{"hash":"f469b6a26ab18f58e6fd0cfbda5e03e69cf3d3264a9c4790878f903d60151468","size":1674,"filename":"68BRY3XqvlKubfNnBJ64F_17BHUniDemUwxZNNvfdaA=.pem","location":"security-state-staging/intermediates/62e47fee-8839-40c8-9719-edf4a5d2615c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"68BRY3XqvlKubfNnBJ64F/17BHUniDemUwxZNNvfdaA=","crlite_enrolled":true,"id":"dd1c7414-0b47-4e26-8b61-6e686bc90126","last_modified":1576536533336},{"schema":1576535735514,"derHash":"rCuSLs/V4BcRdy/qjtNy3p0eIkX84/V6nNvsdylqQks=","subject":"CN=Apple IST CA 2 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMTE0FwcGxlIElTVCBDQSAyIC0gRzExIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKEwpBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"601b5385fb06a628528a738d6141af6a10c29b3d7659e002ba224353ca089d38","size":1532,"filename":"tc-C1H75gj-ap48SMYbFLoh56oSw-CLJHYPgQnm3j9U=.pem","location":"security-state-staging/intermediates/e3bbb057-9c2f-4ddc-a720-28c4ff04b318.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tc+C1H75gj+ap48SMYbFLoh56oSw+CLJHYPgQnm3j9U=","crlite_enrolled":true,"id":"0c58ca4b-21b3-473e-bddb-a75c77a17971","last_modified":1576536533332},{"schema":1576535729560,"derHash":"2n5XePYvh2Vbj9JKieZR5XMp3JwHZacRWM5WRDykTpU=","subject":"CN=DigiCert Extended Validation CA-3 G3,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEtMCsGA1UEAxMkRGlnaUNlcnQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQS0zIEcz","whitelist":false,"attachment":{"hash":"6844a48cc10ea1a880af9e0aea02a3fc4be2786b3ce299bd1644cd2fc49c1f64","size":1187,"filename":"epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t_u8=.pem","location":"security-state-staging/intermediates/5d0c77a4-ad61-4b2d-9500-0ed1ce697602.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"epA52XxQ9Mrum63GbS8dL1dkTIzeOueiCw6jHr7t/u8=","crlite_enrolled":true,"id":"9bd31525-cabf-4b0e-acc5-1952d08e7761","last_modified":1576536533328},{"schema":1576535726603,"derHash":"6k7i+qV65LU5tjl3/luyBbavsy96c7KzY+S+As2Kkek=","subject":"CN=AffirmTrust Certificate Authority - OV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIE9WMQ==","whitelist":false,"attachment":{"hash":"fc3aae931bd9e488d29bffc6c6628b5ba9b6c606359b942aad8056a2af13c8c0","size":1662,"filename":"RM5J-l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv-DsGM=.pem","location":"security-state-staging/intermediates/8c875b16-e424-4471-88e1-1af28bb1e98b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RM5J+l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv+DsGM=","crlite_enrolled":true,"id":"b68b971e-8343-4eb4-a930-a11700292076","last_modified":1576536533324},{"schema":1576535725125,"derHash":"lvvIq01wU+hwR4G6vuiaaY8yL87iAB0ezeriO1oN0NQ=","subject":"CN=SafeToOpen Code Signing ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MFMxCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDErMCkGA1UEAwwiU2FmZVRvT3BlbiBDb2RlIFNpZ25pbmcgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"6dc110fcc3fff1cd11570485a2e45474f51f761c2f9b590aae82ec5444111a10","size":2467,"filename":"pjQ3wML2cKErfco7LBCiW12IeMTd7OO0vxtR3O4OUJk=.pem","location":"security-state-staging/intermediates/31e48b05-fa3c-4d5e-88b8-e31faca46e6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pjQ3wML2cKErfco7LBCiW12IeMTd7OO0vxtR3O4OUJk=","crlite_enrolled":false,"id":"397e2ece-c82e-4f63-b9c9-9564ffbb0787","last_modified":1576536533319},{"schema":1576535728195,"derHash":"v99M8/FDrQ25EtirOnwS9he56mDOix9ORPdCcPshsZs=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"afa822a679ac53a1fe787fd1b3418ea474613a029a776a216762efa2b870ff8b","size":1581,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/0ff9bf8a-8c2d-458a-843f-714bb4ae0838.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"391141f8-c2c2-411c-b042-418ab514fd96","last_modified":1576536533315},{"schema":1576535720797,"derHash":"zteRflb0JG/xkH7v+SItfcgR0oZYOh8RbF9hdaiZX7E=","subject":"CN=Dodo Sign SMIME ICA RSA R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHQxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSMwIQYDVQQDDBpEb2RvIFNpZ24gU01JTUUgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"9c0526ad9bdea4d1b9fe223be445e0031426ba95b4c6d4f9d11ea0576f6ac9dd","size":2450,"filename":"aQV1CuJZgAKpjACerkGg_CxArZYPkL2zgDhkI8ka1lw=.pem","location":"security-state-staging/intermediates/661841db-d069-4d57-994a-4d79d8389bd0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aQV1CuJZgAKpjACerkGg/CxArZYPkL2zgDhkI8ka1lw=","crlite_enrolled":false,"id":"11b21bdc-d76d-4edc-8894-61264ce40ffc","last_modified":1576536533307},{"schema":1576535719414,"derHash":"iC4BRtFdNIPuWYHjUGfxRJ5WK4niLsw/3zcnTt0xTNo=","subject":"CN=GDCA TrustAUTH R4 EV CodeSigning CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHYxCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xLDAqBgNVBAMMI0dEQ0EgVHJ1c3RBVVRIIFI0IEVWIENvZGVTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"10f99f1db6de610fba982c5f65250fa8086ea7f1cdce17fd51e1059ad62997f3","size":2068,"filename":"K1O1P19UCSRwBq2Y5xce7r_TavF-pDYjmdSYRVYHFXI=.pem","location":"security-state-staging/intermediates/8227657d-5641-4c7a-aa33-89019ad18fdf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1O1P19UCSRwBq2Y5xce7r/TavF+pDYjmdSYRVYHFXI=","crlite_enrolled":false,"id":"072a60e3-e6bd-435f-8486-855b8b3b6efe","last_modified":1576536533298},{"schema":1576535718042,"derHash":"HfYFTWZBQEYzZBu1+jdC/afQdeJRSECrYeAMy7t9NB0=","subject":"CN=GlobalSign Root E46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgRTQ2","whitelist":false,"attachment":{"hash":"7e5ce727726952ca1f6cb21c02d6ca82c82baaaf53c5c69de963c2ddc3344595","size":1305,"filename":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR_g_0scfb9gXM=.pem","location":"security-state-staging/intermediates/06349813-d93c-441c-a351-17e576175b0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4EoCLOMvTM8sf2BGKHuCijKpCfXnUUR/g/0scfb9gXM=","crlite_enrolled":false,"id":"60de9866-3e99-4374-b830-17ad74f56f75","last_modified":1576536533289},{"schema":1576535714600,"derHash":"+QrKY8uLtE+NkbhkR0u0Kq4XfnP9/m9Ky9EqATpBXBU=","subject":"CN=MKB SubCA 5,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"ME0xCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMRQwEgYDVQQDDAtNS0IgU3ViQ0EgNQ==","whitelist":false,"attachment":{"hash":"d609fc9e466cfe1aecec6216a280e25bf274686799575f8c7edd8f7e8232e669","size":2146,"filename":"PGgGeTzLYgdsBfTyNhkEXF4J3GMzNhuKWFmeFINeefQ=.pem","location":"security-state-staging/intermediates/d62c8770-b09d-44d0-a7bb-d6c9b93fd6b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PGgGeTzLYgdsBfTyNhkEXF4J3GMzNhuKWFmeFINeefQ=","crlite_enrolled":false,"id":"875ecbce-accc-43a4-b056-d79c0f013227","last_modified":1576536533285},{"schema":1576535711746,"derHash":"k1BhvlLI6ojANLOa39UiuzFMv1ME5acGRzXdvaMkKq8=","subject":"CN=Certigna Entity Code Signing CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGIMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEoMCYGA1UEAwwfQ2VydGlnbmEgRW50aXR5IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"dfa52fac8680622c2c208aa337be1f107052398f893cb8cdaa1bc8ee0c3c1f93","size":2186,"filename":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=.pem","location":"security-state-staging/intermediates/a34d09dc-c1e9-4b35-bb0f-0c7ee3e64ad8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=","crlite_enrolled":false,"id":"90283279-5bef-4526-8705-37883c1dc2bc","last_modified":1576536533281},{"schema":1576535710282,"derHash":"X00sDgy6fR+2AO3TUG1DMchmoR8g0TcFTuOc9RRXZnk=","subject":"CN=SSL.com Timestamping Issuing RSA CA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLzAtBgNVBAMMJlNTTC5jb20gVGltZXN0YW1waW5nIElzc3VpbmcgUlNBIENBIFIx","whitelist":false,"attachment":{"hash":"21e71885a88fc5db9ef891b88f7821fb1e634323d90b65bdc3268d422b8350ab","size":2483,"filename":"SiW6P63hxKyk7kypaOzuu6Vn7Ki7UXJCZjkLtFIcPCE=.pem","location":"security-state-staging/intermediates/05741471-0868-4508-b20f-758afe2658b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SiW6P63hxKyk7kypaOzuu6Vn7Ki7UXJCZjkLtFIcPCE=","crlite_enrolled":false,"id":"af31000d-8c6b-4c8e-8969-c161e3b093b8","last_modified":1576536533277},{"schema":1576535713205,"derHash":"RUBA5JaQcEAcw1vffypOvOV5e7dpSucx2TqBFf1Zkpw=","subject":"CN=Starfield Root Certificate Authority - G2,OU=https://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHFMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE0MDIGA1UECxMraHR0cHM6Ly9jZXJ0cy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5LzEyMDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"9d2202937f8e54392d669c92cd8a75a53b1784157b44c73b0ce0c2614d485051","size":1735,"filename":"gI1os_q0iEpflxrOfRBVDXqVoWN3Tz7Dav_7IT--THQ=.pem","location":"security-state-staging/intermediates/25785222-2756-4269-a695-0a60c3918f3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=","crlite_enrolled":false,"id":"1515b293-9629-40ac-b90c-843783835be0","last_modified":1576536533268},{"schema":1576535705691,"derHash":"aB68GCKwebl+BATkaH2bbAwIksgg9Vc4ooKq5iUpvdg=","subject":"CN=Entrust Certification Authority - QTSP1,O=Entrust Datacard Europe S.L.,C=ES","subjectDN":"MIGAMTAwLgYDVQQDDCdFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gUVRTUDExGDAWBgNVBGEMD1ZBVEVTLUI4MTE4ODA0NzElMCMGA1UECgwcRW50cnVzdCBEYXRhY2FyZCBFdXJvcGUgUy5MLjELMAkGA1UEBhMCRVM=","whitelist":false,"attachment":{"hash":"1b36e574afaad2d084671e777c7351c3fb5ab139919e47a5ad362e0629f3d0a9","size":1784,"filename":"aZtZPtGaXbm8qg3lvpcFEicPNLfVwGoRKVgV17tW99k=.pem","location":"security-state-staging/intermediates/ba3c2414-b8f6-4b6f-b58a-13bd454deef5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aZtZPtGaXbm8qg3lvpcFEicPNLfVwGoRKVgV17tW99k=","crlite_enrolled":true,"id":"d64bc41f-40a9-4404-b8e7-977885a8b020","last_modified":1576536533260},{"schema":1576535704194,"derHash":"pEnbq21MA1+q/Z0EWJH+mKvXPShiaKioP4VBRVUWkuM=","subject":"CN=DigiCert Global Client CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEdsb2JhbCBDbGllbnQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"527e07fba3c052bc204844ca180ab6b407338b8d533f579a75968162d959aa09","size":1906,"filename":"kJGSyUHCVurpr4HjTqx1jU6HMmuaNzGu5ukKqGV0I-Q=.pem","location":"security-state-staging/intermediates/fb4825ba-30a6-4680-a666-5e92f0755810.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kJGSyUHCVurpr4HjTqx1jU6HMmuaNzGu5ukKqGV0I+Q=","crlite_enrolled":false,"id":"3c4a336f-4021-49ad-b28f-d8c1994bb54a","last_modified":1576536533257},{"schema":1576535701221,"derHash":"lMZj6epcJ+5PZBJ/m0JYY+mRqeFWwH3xoAgDrjF2QWI=","subject":"CN=DPDHL Global TLS CA - I4,O=Deutsche Post AG,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MHgxCzAJBgNVBAYTAkRFMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMQ0wCwYDVQQHEwRCb25uMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMSEwHwYDVQQDExhEUERITCBHbG9iYWwgVExTIENBIC0gSTQ=","whitelist":false,"attachment":{"hash":"82df1783f9ebe0247dd6ecbe16d4c18ae72f1dd07acc563c22457497332adccd","size":1687,"filename":"dDCzzRFNRKnMrHRFZT7PTt0huOU3tTdBT-09j4Qo0dw=.pem","location":"security-state-staging/intermediates/fd7aa6f3-e797-44a8-b182-386d30d9bae6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dDCzzRFNRKnMrHRFZT7PTt0huOU3tTdBT+09j4Qo0dw=","crlite_enrolled":true,"id":"4a157548-8ffc-4b18-9a39-6a3d034a4b20","last_modified":1576536533253},{"schema":1576535702771,"derHash":"fggrvFaXaxWdRpZUCpa2AUhhS6m14psgNfeJvs+/Blc=","subject":"CN=KPN BV PKIoverheid Organisatie Server CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHExCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNjA0BgNVBAMMLUtQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e14dfe0a090eadc281ff2db7ada84d99fae9eca05625d7c7e0e8301bff79fdd5","size":2584,"filename":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn-TXs=.pem","location":"security-state-staging/intermediates/5df062b7-6dbf-40fb-b4d3-69692b678a3d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn+TXs=","crlite_enrolled":true,"id":"256b5706-1f4a-4d46-bd99-cd98266a34c4","last_modified":1576536533248},{"schema":1576535698371,"derHash":"DzKEswasQimGyPVg6kYib9hCVRmm9hqpxVq1CCdLgtI=","subject":"CN=Solenis Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Solenis LLC,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLU29sZW5pcyBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEhMB8GA1UEAxMYU29sZW5pcyBQdWJsaWMgT25saW5lIENB","whitelist":false,"attachment":{"hash":"07c3a057b0a793ccc127ced6e4656951d395af324fbf13db505a5158e79cf5a1","size":2044,"filename":"FbUF4mDwk2lNgD-Pejjnol8xBCKJWyaJf_t3H9qx33E=.pem","location":"security-state-staging/intermediates/9dc2eb3c-f2a0-4921-b7ac-e9b351bc4271.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FbUF4mDwk2lNgD+Pejjnol8xBCKJWyaJf/t3H9qx33E=","crlite_enrolled":false,"id":"4eac52f2-55a9-4aad-a5ec-b460abc548b6","last_modified":1576536533244},{"schema":1576535699807,"derHash":"khi6uU59XR+B1i0Pwj4xyLvL7jVF0dfp0/0pswvBiMg=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"0be6834a2b742f4b697c05091ee7071ce8419abe4ed8eed05d569d2e0029ffc6","size":1187,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/52220f23-3b7c-41f2-8367-dacbf192340e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"6d2dd04d-c23f-4dde-8701-5d637684bb1f","last_modified":1576536533232},{"schema":1576535694050,"derHash":"VKiey5iaHcz0ATY584l0oLwHQsKZPftr0Mvx9GKWRQE=","subject":"CN=Buypass Class 2 CA 2,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAyIENBIDI=","whitelist":false,"attachment":{"hash":"0614048608f149da266521b3b029d5d9fbab892a53adc1151476ffbb67f64ea8","size":1849,"filename":"61MXD2Y0eBaJtXDtSP1wW5LIdaIPjtVmYYrVCM8GDDg=.pem","location":"security-state-staging/intermediates/807b4084-3ed6-4c3d-9105-8e356f3bdc73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"61MXD2Y0eBaJtXDtSP1wW5LIdaIPjtVmYYrVCM8GDDg=","crlite_enrolled":true,"id":"ef80dba5-2722-4073-94a2-06a8e7cf1eee","last_modified":1576536533226},{"schema":1576535692634,"derHash":"wt/7PBuwbeTBCSblF/82b5OJLV4C3G95CAJ121f9b8g=","subject":"CN=TI Trust Technologies EV CA,OU=Controlled by Sectigo exclusively for TI Trust Technologies,O=Telecom Italia Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MIHNMQswCQYDVQQGEwJJVDENMAsGA1UECBMEUm9tYTEQMA4GA1UEBxMHUG9tZXppYTExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuUi5MLjFEMEIGA1UECxM7Q29udHJvbGxlZCBieSBTZWN0aWdvIGV4Y2x1c2l2ZWx5IGZvciBUSSBUcnVzdCBUZWNobm9sb2dpZXMxJDAiBgNVBAMTG1RJIFRydXN0IFRlY2hub2xvZ2llcyBFViBDQQ==","whitelist":false,"attachment":{"hash":"f3a3288bc3b67208c3f1e4164cb00b27794763ac59477eb6171158b3507ab3e8","size":2288,"filename":"lG0jsaBDRslBBApGfnJu_ukJ5x3uoc841KUU1OMrO1E=.pem","location":"security-state-staging/intermediates/48b456c7-6568-4b6a-b3a6-e6d3c9384968.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lG0jsaBDRslBBApGfnJu/ukJ5x3uoc841KUU1OMrO1E=","crlite_enrolled":false,"id":"3eca5483-9836-4680-82c5-bb0774a0b4ad","last_modified":1576536533221},{"schema":1576535691263,"derHash":"j3Y2enra5GQiWOZYaiqWQqAPPsux63JfGLXnrT2Vrtk=","subject":"CN=Saudi Enaya Public Issuing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Saudi Enaya Cooperative Insurance Company,C=SA","subjectDN":"MIGqMQswCQYDVQQGEwJTQTEyMDAGA1UEChMpU2F1ZGkgRW5heWEgQ29vcGVyYXRpdmUgSW5zdXJhbmNlIENvbXBhbnkxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEmMCQGA1UEAxMdU2F1ZGkgRW5heWEgUHVibGljIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"f9a1cc1c0a4d31769022a32fa750c3366fb992b9cf15e57a75f7dec8fa1b0f43","size":2093,"filename":"cNHwIfttyOKzQurjMJbU9iw-zkVDSMIGzrkUphg-oZ8=.pem","location":"security-state-staging/intermediates/9a23fc37-8c51-4bb4-95e5-218e36e2fc5b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cNHwIfttyOKzQurjMJbU9iw+zkVDSMIGzrkUphg+oZ8=","crlite_enrolled":false,"id":"0faea224-cee9-4c13-9b49-037fb4c24a88","last_modified":1576536533217},{"schema":1576535689739,"derHash":"vkCBOGmrJ6Bx0SrWqIMFg+vDthjj8jRjWfSxGhyUNO4=","subject":"CN=GlobalSign CodeSigning CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"0e8e5deefe3f05a7aa5d9c40e35ec54cf376114dbb14eec1d7dd699f04481655","size":1650,"filename":"YAIydgGB-L3Y0NHNmsAGLQDXeo7ww8TLvpXGKFMPJ3s=.pem","location":"security-state-staging/intermediates/057a2b86-b448-4070-94c1-5f09ce2bfac7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YAIydgGB+L3Y0NHNmsAGLQDXeo7ww8TLvpXGKFMPJ3s=","crlite_enrolled":false,"id":"fe5a8e71-da19-42ab-acde-06d1d5cef1b9","last_modified":1576536533211},{"schema":1576535688336,"derHash":"4zB2/7UmffQZ9y3gbEbixspE/0ODtTFs99bmKOmNm/0=","subject":"CN=Saudi Telecom Company Email CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Saudi Telecom Company,C=SA","subjectDN":"MIGXMQswCQYDVQQGEwJTQTEeMBwGA1UEChMVU2F1ZGkgVGVsZWNvbSBDb21wYW55MT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExJzAlBgNVBAMTHlNhdWRpIFRlbGVjb20gQ29tcGFueSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"ec9e4ca56df4d26db8f71b689f200f5196410806d42b92ded254322d04471378","size":2068,"filename":"1tmevyCqnyAoinSCzwcqiqEsILe2CvKE2FskRnaTgXI=.pem","location":"security-state-staging/intermediates/f7d99d4a-d900-4eaf-978b-09f11eda8642.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1tmevyCqnyAoinSCzwcqiqEsILe2CvKE2FskRnaTgXI=","crlite_enrolled":false,"id":"1dd892f7-1bad-4b9b-a81d-e331f72cdbe8","last_modified":1576536533204},{"schema":1576535685544,"derHash":"Rcsdh0ywO9XFtuB5yPwp5RUh7lYoSGMBlkpB+Uuln4g=","subject":"CN=GlobalSign Root R46,O=GlobalSign nv-sa,C=BE","subjectDN":"MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2","whitelist":false,"attachment":{"hash":"6aeca6429f492ce0a1e976110a582cd7b8c66033c209b47b36f98a2ec75750f1","size":2231,"filename":"rn-WLLnmp9v3uDP7GPqbcaiRdd-UnCMrap73yz3yu_w=.pem","location":"security-state-staging/intermediates/7e4b802f-b595-45c5-b8c9-7a395c2592f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rn+WLLnmp9v3uDP7GPqbcaiRdd+UnCMrap73yz3yu/w=","crlite_enrolled":false,"id":"db71c7f0-2fac-43c3-ad72-dd258c250fa5","last_modified":1576536533196},{"schema":1576535678404,"derHash":"Ocdjqc8Z2SP5d9I2JquJBEmkRKuLeVyBXvHvgf68Hjg=","subject":"CN=Amazon,OU=Server CA 1A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"f399c4419d079a15a697f418e9a8d5ff90d3ac32db49507e30ee4a17491a1fd2","size":1544,"filename":"ZLtb2AMR-j9TvZlATKuHYq1uBIRH0Kl_IZ_OyhZh83w=.pem","location":"security-state-staging/intermediates/0bf45415-b984-4367-b6a5-c8d413da9d72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZLtb2AMR+j9TvZlATKuHYq1uBIRH0Kl/IZ/OyhZh83w=","crlite_enrolled":false,"id":"ad381075-9d54-4e8f-9730-7b932a4f8b90","last_modified":1576536533183},{"schema":1576535676932,"derHash":"lqWizTmADPtqKoMO5S3PR/uwD/GwMgTbNpFc6jHxM0I=","subject":"CN=GDCA TrustAUTH R4 EV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"d72e2007f8b0bdbb9bfdfca3bc7bdf7eebe0d9a1b5b3e0aa3c49210a42752f35","size":2056,"filename":"LA_cQZEhZA_J3pK28of_Jf7Wn0WmfSQvp4eYJW5o8NQ=.pem","location":"security-state-staging/intermediates/2b13103f-f111-4488-951a-d948d81a84f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LA/cQZEhZA/J3pK28of/Jf7Wn0WmfSQvp4eYJW5o8NQ=","crlite_enrolled":true,"id":"2a556f13-fd00-4e58-82e2-6de75321c936","last_modified":1576536533172},{"schema":1576535675523,"derHash":"SUYzfTlUMF82dw7oMX9nz+/zlDV2gov1XBU4R2tKINg=","subject":"CN=Nedbank Limited Public CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Nedbank Limited,C=ZA","subjectDN":"MIGMMQswCQYDVQQGEwJaQTEYMBYGA1UEChMPTmVkYmFuayBMaW1pdGVkMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExIjAgBgNVBAMTGU5lZGJhbmsgTGltaXRlZCBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"43afb828d2dd6d74b9f5df2475c5670452bceb66714a87118006a59ad1cf74c6","size":2040,"filename":"9mmBieouT_9Ouiv7FZSLvox_uvaz5I2XlSgCRjt0g4U=.pem","location":"security-state-staging/intermediates/24be1fad-b770-4eaa-9f19-6ee181105daa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9mmBieouT/9Ouiv7FZSLvox/uvaz5I2XlSgCRjt0g4U=","crlite_enrolled":false,"id":"ef1b8ccf-e9c6-4f39-bdfa-c80513385093","last_modified":1576536533165},{"schema":1576535672682,"derHash":"wjofgxVTioZRgW6ZMsBE64VsAf2ZdxaQyGNnHSLEhWQ=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"681c27ac05298a228c23d2463699b61b0aa53157638b6195793d2f53a4324aa3","size":1764,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/023b7b2a-88b0-4538-a665-37a504c10e0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"d6958925-96d0-4139-981d-d725a0cfcd01","last_modified":1576536533158},{"schema":1576535681283,"derHash":"piM+y3cFP3KTfolDcqYB7Tq+qQzDtdiVEnIL8//L3J0=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"42a159a44078e6c0428cd2a9784e5d8186a3da87350930ca5180f61690f4056b","size":1488,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/89ddf5ba-0659-4630-8b16-885ce7e6d764.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"fe1c2020-b88a-4748-9de2-7099a5ad0afb","last_modified":1576536533150},{"schema":1576535669802,"derHash":"nWEnnSIyqH4QjXir8uuhjSQRL4S1Y2ovQ7OaAPHqAHg=","subject":"CN=docSigning RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHgxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMR4wHAYDVQQDDBVkb2NTaWduaW5nIFJTQSBJQ0EgUjE=","whitelist":false,"attachment":{"hash":"5cd9fe248c1e6cfdd4496f76f7e9b0d9f810255c2d9fa5333ebee39edd8ffd14","size":2174,"filename":"xFyVKlUSjns3MjbWeJFTGcGIijP7GVc2KFJgm8bUeOc=.pem","location":"security-state-staging/intermediates/7109fecc-da82-4d0b-9fa5-b524a272ec72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFyVKlUSjns3MjbWeJFTGcGIijP7GVc2KFJgm8bUeOc=","crlite_enrolled":false,"id":"126ded4d-8431-41b1-8aaa-6c0ce484cc26","last_modified":1576536533139},{"schema":1576535674127,"derHash":"tIzzartJglw7fEB4ZpWMJAhck4xgx8GkihjQCFnKNIw=","subject":"CN=Duerr Group Global IT CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Duerr IT Service GmbH,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEeMBwGA1UEChMVRHVlcnIgSVQgU2VydmljZSBHbWJIMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExITAfBgNVBAMTGER1ZXJyIEdyb3VwIEdsb2JhbCBJVCBDQQ==","whitelist":false,"attachment":{"hash":"928dad68e0291b5a5f266a4c55be650b95b1211ff60094db0f2bb89e3e2ba03a","size":2060,"filename":"bnsFn2J9Leu9MsEXRbGO_q2R-jj5yi6VtDkLN6eGjeQ=.pem","location":"security-state-staging/intermediates/4accbbd5-64dc-41ec-b3a2-da410305e736.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bnsFn2J9Leu9MsEXRbGO/q2R+jj5yi6VtDkLN6eGjeQ=","crlite_enrolled":false,"id":"c4b02e84-aa88-460f-8418-ed2d4ce9c088","last_modified":1576536533131},{"schema":1576535668349,"derHash":"9QaMQpOiag5CDQKuS+8nAIN34+fs2OXPGUQoFi48QPQ=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"79bca702d17f54c89c8f1e54a7956e70ff158d4f2d61e7f721612a7f3e4bd4fa","size":2337,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/e6d61643-b154-4216-bc90-f92e5b6fee88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"e6faa6db-c65c-469e-908c-c757eb2ec1f2","last_modified":1576536533125},{"schema":1576535665468,"derHash":"MWAFjnKwWH51OssUyzfX+PZy17xTVJ9n1485yreGGCQ=","subject":"CN=SSL X Y & Z SMIME CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHIxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSQwIgYDVQQDDBtTU0wgWCBZICYgWiBTTUlNRSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"a097fe3436a48e1a1774823f1d3ec33dbaec7e073b22c598310479de26b737f6","size":2430,"filename":"MdoGDrhcCn8MTwSG3kgrfgj1b2G-u2wNnQpYY6Da_RI=.pem","location":"security-state-staging/intermediates/73a63257-cfe8-4332-909d-abd0ddfc4aff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MdoGDrhcCn8MTwSG3kgrfgj1b2G+u2wNnQpYY6Da/RI=","crlite_enrolled":false,"id":"5020f660-2bdc-4078-8c20-598e0bcc3837","last_modified":1576536533121},{"schema":1576535664030,"derHash":"VQdJ/141xAfVFdmLMnUEvEhP2q4opxOv5OIoKYa+BOg=","subject":"CN=Atos TrustedRoot Client-CA 2019,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"2763c7c0f3bcf025ec0ce357637ad9f89fd53a05004ea4e1da17b19062c0c5d2","size":1987,"filename":"CcXMYukvilEK0pDMWab7SEXh_fMs7tv1MLrQO9DXGDE=.pem","location":"security-state-staging/intermediates/d90a2b08-7306-4808-ad80-fe80b7cc54a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CcXMYukvilEK0pDMWab7SEXh/fMs7tv1MLrQO9DXGDE=","crlite_enrolled":false,"id":"326252ee-6763-4e00-9187-88a0d4172e5f","last_modified":1576536533108},{"schema":1576535662659,"derHash":"Gh+CWS4DO2IBlsuE5rYehctEiZJZXnDuKSR79cF3HYw=","subject":"SERIALNUMBER=202008,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA4","whitelist":false,"attachment":{"hash":"9ace3aac9b2541a7af8dfbb069619b62df30695152d476c2b4fd355300eb687e","size":2333,"filename":"psgf5vm4NPM1KfVsJMG2yfIKFfkuFfaruYmPA9y5EbU=.pem","location":"security-state-staging/intermediates/8cd8139f-8283-4cc1-92f7-5ae9c296893e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"psgf5vm4NPM1KfVsJMG2yfIKFfkuFfaruYmPA9y5EbU=","crlite_enrolled":false,"id":"1df62141-638d-4e30-b950-909f7bf55133","last_modified":1576536533102},{"schema":1576535661193,"derHash":"pP58fxUVXz8K73qqg89uBt65fKP5Cd+SCsFJCILUiO0=","subject":"CN=Apple IST CA 8 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKDApBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"10c037107309161edc52970a837e5b2cfb01393b7a295c3a8af53adb4fe2e7dc","size":1215,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/246c8ccb-37a5-4b40-8b4f-c83734302c40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"4702383e-8507-468f-8710-add08465230d","last_modified":1576536533099},{"schema":1576535658276,"derHash":"Vyv4mf13Q2LcGSGWJezBV7tVQ06lFm1XWNxLT4kNZlM=","subject":"CN=ACCVCA-130,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMzAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"3bcfe77948ebaa1fe7f7bfb31339eeaba3e27a506d01e1f6704b54ecb78cc54a","size":2686,"filename":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=.pem","location":"security-state-staging/intermediates/ebb99ee5-c251-4021-80eb-3e74471c91bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=","crlite_enrolled":false,"id":"b94aff1d-4802-4d47-9d29-833321cc8644","last_modified":1576536533095},{"schema":1576535659737,"derHash":"llvSWDiN3dTqe6r7d1TfSfiWzwLhW+CSXeM7ADjpkl8=","subject":"CN=ITsMine Document Signing CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=ITsMine LTD,C=IL","subjectDN":"MIGKMQswCQYDVQQGEwJJTDEUMBIGA1UEChMLSVRzTWluZSBMVEQxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEkMCIGA1UEAxMbSVRzTWluZSBEb2N1bWVudCBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"2c67f2b0b0186aec64088386089a58adb768c7499823baa61f1f8a11a70658d3","size":2048,"filename":"cPOXn2iF_axKs58wv5vJ7sPiY84mMQ63aDplTinh778=.pem","location":"security-state-staging/intermediates/b929354d-ee94-4466-9b96-48bee5a5f6ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cPOXn2iF/axKs58wv5vJ7sPiY84mMQ63aDplTinh778=","crlite_enrolled":false,"id":"0d633c6e-6482-476c-bcdb-4014ef17c4a3","last_modified":1576536533085},{"schema":1576535656889,"derHash":"IR8wg7nnegHQgoVliXoc6UXuquBJQszDaQh9gIDJ5KY=","subject":"CN=Certigna Wild CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHkxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRkwFwYDVQQDDBBDZXJ0aWduYSBXaWxkIENB","whitelist":false,"attachment":{"hash":"5496347e4439fb545ba2bee7caa37b999d7fbae9c05425339345faf2c1e52d1f","size":2166,"filename":"6PsBH2V6vxU_w6DnSyY4EpqQYeF8QrYgohY-fWMfhmE=.pem","location":"security-state-staging/intermediates/fc3270ce-2a3b-48cd-9a3c-dba02a58d9a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6PsBH2V6vxU/w6DnSyY4EpqQYeF8QrYgohY+fWMfhmE=","crlite_enrolled":true,"id":"fc74dd7b-d279-49bc-8b15-430100d07015","last_modified":1576536533078},{"schema":1576535655303,"derHash":"0gpAuxsFTRx0HPb0BHBUNoUfRo/ApFVklBzHx/dKEm8=","subject":"CN=BitCert SHA2 Assured ID CA,O=BitCert,L=Chengdu,ST=Sichuan,C=CN","subjectDN":"MGgxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdTaWNodWFuMRAwDgYDVQQHEwdDaGVuZ2R1MRAwDgYDVQQKEwdCaXRDZXJ0MSMwIQYDVQQDExpCaXRDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQQ==","whitelist":false,"attachment":{"hash":"cd452783d809de9bf053ff47432c701bae9479d5129875f8323deef141a7761e","size":2109,"filename":"Eb_J1AmK0wOeRgjXvartK-UnMX6tUpo4ieIOClF8g2Q=.pem","location":"security-state-staging/intermediates/61caf33f-9ace-4134-98fe-d165a8ec1c58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Eb/J1AmK0wOeRgjXvartK+UnMX6tUpo4ieIOClF8g2Q=","crlite_enrolled":false,"id":"3aa5477f-8d27-4d3f-b148-e830916ccc30","last_modified":1576536533075},{"schema":1576535653934,"derHash":"C0Bc/ppr6wmP+5aRIcX2cQ8/f6nqEBpkGPevIB09OTg=","subject":"CN=Apple Public Server RSA CA 12 - G1,O=Apple Inc.,ST=California,C=US","subjectDN":"MGQxKzApBgNVBAMTIkFwcGxlIFB1YmxpYyBTZXJ2ZXIgUlNBIENBIDEyIC0gRzExEzARBgNVBAoTCkFwcGxlIEluYy4xEzARBgNVBAgTCkNhbGlmb3JuaWExCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"2f8960fd8a1b0bc311f2c5d7bb7825254affcf347c165514fa071119dc28f794","size":1642,"filename":"1CC6SL5QjEUUEr5JiV4Zw8QxiSkGVmp2CRJ4mm1IhKU=.pem","location":"security-state-staging/intermediates/eb7ea53e-f578-4b8a-913a-dd87bcd7ab01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1CC6SL5QjEUUEr5JiV4Zw8QxiSkGVmp2CRJ4mm1IhKU=","crlite_enrolled":true,"id":"6acdc223-21b9-4ff8-847f-e22f72f1795a","last_modified":1576536533071},{"schema":1576535651001,"derHash":"8DhCHwfyDWOiDTaR5aF4q4RZ6+VwwWR7dpBVTvI4dqs=","subject":"OU=AC Componentes Inform\u00e1ticos,O=FNMT-RCM,C=ES","subjectDN":"MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==","whitelist":false,"attachment":{"hash":"711fb746c38ddfee6090169d62da5358968caf228ade2ad75cb8be4c4dd3832d","size":2430,"filename":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem","location":"security-state-staging/intermediates/0ab80520-1d1a-43c3-88ab-467f0681114b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=","crlite_enrolled":true,"id":"e28f2f6d-d594-43d7-8356-195ce9834fcf","last_modified":1576536533065},{"schema":1576535652494,"derHash":"tutPitGXBz/lID+Pzr/VxQnN6co6pl7FnSA4MUJBktQ=","subject":"CN=Secure Site Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJVNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzI=","whitelist":false,"attachment":{"hash":"1fe012e3f79fed86fcbc44ecbe0623dc6e29f5661b7a0c3e9fa7227ba2d32481","size":1699,"filename":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem","location":"security-state-staging/intermediates/6a40c4ce-bac6-44bf-8873-e22c2cf6735c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=","crlite_enrolled":true,"id":"d0ac7826-e8f7-4908-96fa-e77d77b7fca2","last_modified":1576536533061},{"schema":1576535649578,"derHash":"9swE4YU0YZ+y1l8ORbi0O8gVa11zzYets0fXPqgYDcE=","subject":"SERIALNUMBER=202005,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA1","whitelist":false,"attachment":{"hash":"13a3958f8e97bcc176573c94065b0838280266505f4e21d65dd4652ed1624007","size":2333,"filename":"lHjVx8leNZfTqDhJ3N-kjJRU57zR6fm4BDZ5v0rEF0o=.pem","location":"security-state-staging/intermediates/2d8c25c1-f2c9-4bd9-9c5a-9e6d8c25207a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lHjVx8leNZfTqDhJ3N+kjJRU57zR6fm4BDZ5v0rEF0o=","crlite_enrolled":false,"id":"6b0e77ce-e0d4-4ab7-8c1b-739e111d122b","last_modified":1576536533052},{"schema":1576535648114,"derHash":"QA5ehSTzVZh5hXYxLnWlRRQKTktzFMHIxT/X7IIOd7U=","subject":"CN=Cybertrust Japan EV CA G2,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFYxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEiMCAGA1UEAxMZQ3liZXJ0cnVzdCBKYXBhbiBFViBDQSBHMg==","whitelist":false,"attachment":{"hash":"12d7e73666399e1632382096136702c7f6ddd26eafb3f820e0d875b2159deb98","size":1581,"filename":"9xjmuIhAK6exitWv2xYUaN-6SVHIiB-Ru97-tkgiEaQ=.pem","location":"security-state-staging/intermediates/4fe4936e-6ee1-4086-9e1a-96626e262d90.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9xjmuIhAK6exitWv2xYUaN+6SVHIiB+Ru97+tkgiEaQ=","crlite_enrolled":true,"id":"e1a63b90-4f19-42c3-b7d2-78e446b0ec66","last_modified":1576536533044},{"schema":1576535646650,"derHash":"jLPSG7slXb/q+hon0dH3AyDchFZCl7zoLim48uRh8nA=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"620328d479e891c69d0c67a2ec66fd71909d1fe9036160c5d1b7bbe353e26461","size":1764,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/27eee13f-f193-44ab-8232-40eb1212232b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"bf2fe5fc-ec29-4166-b024-fc5fb8243944","last_modified":1576536533032},{"schema":1576535643788,"derHash":"7nk2QxmUdO1g79yMzeTTdEWSFoNZOqdRu/juSRo5Hpc=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"c96caf591ca234c790ecd0c0142086ce1cbad337effe808b85d29665b86b6406","size":1552,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/79818100-f277-4947-a852-dfbece0f18ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"624fd6dc-c0b6-4c85-8fb1-295b309ec7f8","last_modified":1576536533028},{"schema":1576535642291,"derHash":"wC2KMO1psvhk7Y+xpjo+clUoiSDKKUvcow9jiY+5GVw=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"084445d2bd7f8a0ad35589c511c54697c31173f9ad36a47aa142a7a1118fa204","size":2487,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/24de9566-9a8e-45bb-a121-561374a4c6fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"e84d58a8-f2a9-445a-9119-7dae1ad73849","last_modified":1576536533021},{"schema":1576535645226,"derHash":"my3U++6UH2UQ9xbASWmzZCiJJ2VGFwHvR9QbMolHXVA=","subject":"CN=DigiCert Global CA-3 G2,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEgMB4GA1UEAxMXRGlnaUNlcnQgR2xvYmFsIENBLTMgRzI=","whitelist":false,"attachment":{"hash":"757579da2f6f9930d26c82c4e92bc05ec07c1fcce3e1ee174551ff91391a2bd3","size":1662,"filename":"Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=.pem","location":"security-state-staging/intermediates/d3883f37-bd4a-41ad-8203-298556b22bf4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ydb2Ke2rGfceHSy4YbkTNE4A8k1rexJ2dXAXXYa9sgk=","crlite_enrolled":true,"id":"ec6de765-7e2e-48d2-89d5-fa17988865eb","last_modified":1576536533014},{"schema":1576535637770,"derHash":"WoF+raSteHNOuyz2dDUtl/Q1IpDEDq8Q52Sx6sB1sOY=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"9e22882f79ab3be980839bd320927657c042801062d09965a2ee7f9c37cb5ebb","size":1553,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/eeca1f4a-6a10-4a9d-9ee9-def181a418dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"7266f37e-582e-4266-8b74-bc9fb7fd3dd4","last_modified":1576536533008},{"schema":1576535639426,"derHash":"hGDMrqkbDoBatRx81G3fLowcSUgG2Isf4u0xPR1Ifi4=","subject":"CN=Belgium Root CA4,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0E0","whitelist":false,"attachment":{"hash":"c8eff8eef440160ccab900bf7031e1af09b3a4bef4d8c101696a37821bbec601","size":1768,"filename":"sVOKkHFwWpLZOOUGtzjaDK_Rrmauwu7dx1R51DO9h3Y=.pem","location":"security-state-staging/intermediates/f288db85-ff0a-4046-9f02-6da9c467e64f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sVOKkHFwWpLZOOUGtzjaDK/Rrmauwu7dx1R51DO9h3Y=","crlite_enrolled":false,"id":"b2169a79-3567-43ba-8939-fa49dd624174","last_modified":1576536533004},{"schema":1576535634959,"derHash":"T4E3iCtte38au8/e0AgvDlzeyHC6OSPvhNCN3kLkN0k=","subject":"CN=Alcon Public Online CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Alcon Vision\\, LLC,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRQWxjb24gVmlzaW9uLCBMTEMxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UEAxMWQWxjb24gUHVibGljIE9ubGluZSBDQQ==","whitelist":false,"attachment":{"hash":"af525935d6a89c209d6c44a4b29465804f968d30ea869b10f4edbb7b57813c09","size":2052,"filename":"WBomzJZ_qwkCDmRFxNmLqVSbWixOwsRY9u1EbzrMbPY=.pem","location":"security-state-staging/intermediates/7f8d798d-ec51-43f9-8b1a-a1597ea3a8a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WBomzJZ/qwkCDmRFxNmLqVSbWixOwsRY9u1EbzrMbPY=","crlite_enrolled":false,"id":"229edf78-3580-4ef7-b252-71bf9ceeb3c4","last_modified":1576536533000},{"schema":1576535640830,"derHash":"RCLjoUGFsWfX5NsIUbYwclshQjpBQIaDF9/r+z7BL4Y=","subject":"SERIALNUMBER=202001,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAx","whitelist":false,"attachment":{"hash":"a2cd59de0f5a95dd0fe8a1292a63d32d78185d5d4c846dd8a890d5e0e6d770aa","size":2333,"filename":"CI43x8FBUHvxfxoGbmHNltvH2MO4nkawMP-sUN2xS6Q=.pem","location":"security-state-staging/intermediates/7ff06f26-0a5b-405a-9d02-bd71339a3f76.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CI43x8FBUHvxfxoGbmHNltvH2MO4nkawMP+sUN2xS6Q=","crlite_enrolled":false,"id":"3d35aca1-8f69-4db1-8da3-924aa35ec02d","last_modified":1576536532997},{"schema":1576535631984,"derHash":"9cLyPGUY+dGbbzm+rqT7rhADG6ncmFzhVjpSDaCtQRY=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"fe5ad678578f0f457c9742e59bdd7a274fc2a2703d89bb47f109be35c9fb47c2","size":1796,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/a8904bd0-aa03-46a0-bade-1596b9597a4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"9e54305c-cd5d-4716-a6ac-2c9ac161fb04","last_modified":1576536532992},{"schema":1576535636372,"derHash":"Za3JxpHTIVXmjOjVGTvzcildJaBAdUV7Me6FoEQbI/g=","subject":"CN=TI Trust Technologies Client CA,O=TI Trust Technologies S.R.L.,L=Pomezia,ST=Roma,C=IT","subjectDN":"MH8xCzAJBgNVBAYTAklUMQ0wCwYDVQQIEwRSb21hMRAwDgYDVQQHEwdQb21lemlhMSUwIwYDVQQKExxUSSBUcnVzdCBUZWNobm9sb2dpZXMgUy5SLkwuMSgwJgYDVQQDEx9USSBUcnVzdCBUZWNobm9sb2dpZXMgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"d92ac436ba1cab3afb23073f014daa729cb95f0b615852f9ad3be08dcf2e2e6a","size":2142,"filename":"rQbgtNOOZtnMnXSS7fXZPfjIVzkUf2zOAwb-4IxU9Vc=.pem","location":"security-state-staging/intermediates/a3c72377-4d1f-40ea-9cb3-66cfd6d0ec67.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQbgtNOOZtnMnXSS7fXZPfjIVzkUf2zOAwb+4IxU9Vc=","crlite_enrolled":false,"id":"de55f04b-e0f9-4d47-a8f4-5bb1ca8d24af","last_modified":1576536532989},{"schema":1576535633463,"derHash":"jCQQ92sUnKBitCCrYRtr8KBubnmaKVh+TU7BbQU3t+o=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"251b1c75021f8bc991e5055b95dc85d55b230fe1e51032acec934db9388e32bb","size":1548,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/9f419b94-c769-4b88-9c1a-b128ea2e4c7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"d511b39d-be68-4a28-831e-12c61c4a9c8f","last_modified":1576536532983},{"schema":1576535630524,"derHash":"YTvHs5w3gkHulTuhpRno9f4wIjsEV/EMw14wpJM7oT8=","subject":"CN=EV TLS RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFFViBUTFMgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"450066ddb6401419478134c6cc21c49591122f709bfab4eac6795f340d7fb7c0","size":2162,"filename":"gBX99XA0NOEUd6rWyM2Sljn_RHatTUjnhh-CTUMNF9Y=.pem","location":"security-state-staging/intermediates/42108e76-498d-4cf5-ba7d-c870ef1380c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gBX99XA0NOEUd6rWyM2Sljn/RHatTUjnhh+CTUMNF9Y=","crlite_enrolled":false,"id":"c15cd20b-10b4-4541-8ab4-4bc8b11d1ba3","last_modified":1576536532977},{"schema":1576535629122,"derHash":"h3oG24ul2jvaQClnYHePwqwYuRj9jcDs5C+q+U4OfgE=","subject":"CN=Code Signing RSA ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHoxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMSAwHgYDVQQDDBdDb2RlIFNpZ25pbmcgUlNBIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"8e6d563b0f09cfa72c95f8a2d88bfd3916fae9d8695168d0808b7a763383c67e","size":2146,"filename":"K1lPt4REdICzUhMjxOlgDpqJPE3nn9EmNsiWORHNbF8=.pem","location":"security-state-staging/intermediates/8cf01f2e-8b7a-4d6c-b286-017322ec9948.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1lPt4REdICzUhMjxOlgDpqJPE3nn9EmNsiWORHNbF8=","crlite_enrolled":false,"id":"610aab37-a863-4feb-bdec-615fe799f373","last_modified":1576536532971},{"schema":1576535881203,"derHash":"/FUnD+zHzYsTnjTLDolmBrKwO79YSJMKUKJRNDo20Qw=","subject":"CN=SSL X Y & Z EV TLS CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHMxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSUwIwYDVQQDDBxTU0wgWCBZICYgWiBFViBUTFMgQ0EgUlNBIFIx","whitelist":false,"attachment":{"hash":"f056a95f23b4c48b57e03eb9655e5b2cdb76ae8ffb5a21b0c71900a4012e7ade","size":2446,"filename":"TJQd4p_Mb4gEcXc_faqyIKD02JVJuPcRmDP6eWrYj4U=.pem","location":"security-state-staging/intermediates/e7206eaf-5ba8-4318-9e57-7f0f7a5ab946.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TJQd4p/Mb4gEcXc/faqyIKD02JVJuPcRmDP6eWrYj4U=","crlite_enrolled":false,"id":"6cab8056-0a21-41cf-949d-aefefd3538ca","last_modified":1576536532962},{"schema":1576535627693,"derHash":"B3t19rf6cb5PgSHh7FL668oNCu0twBcRoPbc3Djnvzg=","subject":"CN=AffirmTrust Premium ECC Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE3MDUGA1UEAwwuQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"43b4e45ea693189a3d8c47075e8ca1933b10bcf2637194cee318ac943a3e3fb2","size":1284,"filename":"wbpI9B7IKa-_o7qnyxj6V-kvQMgcCDHDVt0t5EmhFCU=.pem","location":"security-state-staging/intermediates/9298955a-093a-4c5e-8b94-0cae2ef4d2f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbpI9B7IKa+/o7qnyxj6V+kvQMgcCDHDVt0t5EmhFCU=","crlite_enrolled":false,"id":"dc12948f-61be-42e3-928b-19b5d31626c6","last_modified":1576536532957},{"schema":1576535624708,"derHash":"fYm6d2TP9v4u6a1Eg41WxdV/Pdc2+WBo3psKFxD7PUc=","subject":"CN=Henkel Secure E-mail CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Henkel AG & Co. KGaA,C=DE","subjectDN":"MIGPMQswCQYDVQQGEwJERTEdMBsGA1UECgwUSGVua2VsIEFHICYgQ28uIEtHYUExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEgMB4GA1UEAwwXSGVua2VsIFNlY3VyZSBFLW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"294ab264e7b4ee55cfa9efb8ae4aea5f4996733a4807ee05c08cc6a41b60767c","size":2385,"filename":"UgDmKmS9-uOo8N_FB448s8_bWQidaNeI-pMnokDiLt8=.pem","location":"security-state-staging/intermediates/b2fbe93c-f81d-447a-8e42-a4fbb3cfb908.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgDmKmS9+uOo8N/FB448s8/bWQidaNeI+pMnokDiLt8=","crlite_enrolled":false,"id":"2c1552f1-bf67-4dd1-b718-1d94dca8ec29","last_modified":1576536532950},{"schema":1576535621506,"derHash":"dD4yjzKeGU2iUnEb9r/wDPY7akwKpmsuGWdxaRBniXE=","subject":"CN=TrustID Server CA E1,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR0wGwYDVQQDExRUcnVzdElEIFNlcnZlciBDQSBFMQ==","whitelist":false,"attachment":{"hash":"0bdc1e653dd27bde4924c78842f2ce8a676e17e94570bcb4d9a68dbb15842d8a","size":2398,"filename":"ddXHjYup7j8-aweO9eKo5dPHP_ulMVLc4zqjLbj0f6s=.pem","location":"security-state-staging/intermediates/a2c07257-f449-4845-8a46-396088d1f54d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ddXHjYup7j8+aweO9eKo5dPHP/ulMVLc4zqjLbj0f6s=","crlite_enrolled":false,"id":"3238adbc-8e16-4f0c-8de1-94a33d6b7601","last_modified":1576536532946},{"schema":1576535620060,"derHash":"GRHihJevksIKAdCKmO1CYcxLA1Vksxxv5J8zuUTv9KE=","subject":"SERIALNUMBER=202013,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEz","whitelist":false,"attachment":{"hash":"f711bb1c2c21ddbf0b2e54b19b1d218c32f69ec21cd4b5d142e882fbb86962c0","size":2333,"filename":"OYSO5rBxTAxhmALfXxoU_JmeXYPpNe7f9A8A7RlSMpE=.pem","location":"security-state-staging/intermediates/87eea63e-7839-4503-9b98-e116df917240.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OYSO5rBxTAxhmALfXxoU/JmeXYPpNe7f9A8A7RlSMpE=","crlite_enrolled":false,"id":"6995e0b8-1596-4485-b620-cdacc2d62dd0","last_modified":1576536532938},{"schema":1576535615726,"derHash":"7Cnv0MXdRFP5Ehu+TJzOvolZVerYc8ks/nQ4VPW48Jw=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"4b6def81757fa93692e39ad391d859a97a2588dbee94fc28099ded53ed43507a","size":1711,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/15da25c3-a3b9-4737-9e47-9c5c770f1a5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"0d24cbb7-5903-4eb4-90ae-67ba7e8ac227","last_modified":1576536532931},{"schema":1576535617235,"derHash":"I93wiyI3PYYVjrnJn9tTZrGYBFYFMTct0g3OP7dm9Ww=","subject":"CN=GeoTrust CN RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"286b2d63e30e027855db802c9e0539ca23b9a9060c9f3e3b810fc02209173191","size":1829,"filename":"4H6OXny7MqJPbCOTpHyS0fSSUeHk_I5nKbIyuQwnfsA=.pem","location":"security-state-staging/intermediates/8e773633-0151-43b1-93be-e2074d328d67.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4H6OXny7MqJPbCOTpHyS0fSSUeHk/I5nKbIyuQwnfsA=","crlite_enrolled":true,"id":"5e1984cb-9f6f-403f-98dc-ede2f85ccbae","last_modified":1576536532928},{"schema":1576535612816,"derHash":"3OsG4EanZwa9HZKPotuJPbVQ0pc5FIQ8XMXb4tnZt50=","subject":"CN=RISE Signing CA,OU=IT,O=RISE Research Institutes of Sweden AB,L=Goteborg,ST=Vastra Gotalands Lan,C=SE","subjectDN":"MIGWMQswCQYDVQQGEwJTRTEdMBsGA1UECBMUVmFzdHJhIEdvdGFsYW5kcyBMYW4xETAPBgNVBAcTCEdvdGVib3JnMQswCQYDVQQLEwJJVDEuMCwGA1UEChMlUklTRSBSZXNlYXJjaCBJbnN0aXR1dGVzIG9mIFN3ZWRlbiBBQjEYMBYGA1UEAxMPUklTRSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"0b3130a1bf94bcc09068abf71183511b68ea44796ff137283c0bb9befe436a08","size":2341,"filename":"ABereoS4tHlP22V2SwqX-_gSDxY5zscHpMnIBdDpp1Q=.pem","location":"security-state-staging/intermediates/59dec23c-71c4-4991-91c4-fc481fb67086.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABereoS4tHlP22V2SwqX+/gSDxY5zscHpMnIBdDpp1Q=","crlite_enrolled":false,"id":"46209f3f-7ba4-418d-bea7-e7fc955216a9","last_modified":1576536532924},{"schema":1576535609692,"derHash":"EAz34Tc+va4jPl+LGlOF/av+6KMfdS4zIZ00PeOvvJw=","subject":"CN=Ensured Root CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MG4xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xGDAWBgNVBAMTD0Vuc3VyZWQgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"dd7d8d5feb4991b7b316e15803451412027d152bba5f790538c890d7f73ad0a1","size":2020,"filename":"oFFz-dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=.pem","location":"security-state-staging/intermediates/e5746ff6-3f16-468a-b066-d3abf5428ab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFFz+dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=","crlite_enrolled":false,"id":"be465d19-94ce-4a45-8efa-c8ab0e3e3e75","last_modified":1576536532920},{"schema":1576535611170,"derHash":"7R/0Bw8IaOsgoDGfxgGRmAD25e/YI6YVayf4nLBLLCY=","subject":"CN=TLS ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHExCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRcwFQYDVQQDDA5UTFMgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"cdef2916796079c83b6dca7ea4057f6349122487ca8f75c47a08e663b83d0ac2","size":1329,"filename":"x0b-nG3FvmwYXc4hymUVggr-35gjXzG-RtqvVgdjLaY=.pem","location":"security-state-staging/intermediates/3953305c-dd4c-413f-9c24-c98b0e5a57c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x0b+nG3FvmwYXc4hymUVggr+35gjXzG+RtqvVgdjLaY=","crlite_enrolled":false,"id":"622d3ad6-978f-43e1-bfd5-8f6bebf7a53f","last_modified":1576536532916},{"schema":1576535614276,"derHash":"cFYQcjyWE/ZBMYHK33PVEHG9dh/aSRQj4avQAVAbZPM=","subject":"CN=Digidentity BV PKIoverheid Organisatie Server CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPjA8BgNVBAMMNURpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFNlcnZlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"ea3643e9caf068468406f4fccd9435feabff55ebc6e0969f16722f970943804b","size":2609,"filename":"zm4euNC-JiW-4by3xDIvrjNA-47VRZb3MnFpy-xVE4E=.pem","location":"security-state-staging/intermediates/3a61810b-d2ad-4815-aed1-a1d77b4594fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zm4euNC+JiW+4by3xDIvrjNA+47VRZb3MnFpy+xVE4E=","crlite_enrolled":true,"id":"5f89bdcc-376e-4489-9362-6be0bd69133c","last_modified":1576536532909},{"schema":1576535606746,"derHash":"OwzCA4StfyTrQ48rgMY+vgA/fyFbiHfkGOuwSEAo21c=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"87d3147517902aed8e819b14b1dacf02ee1294c4c3b31b4bb42a0369c1435b9f","size":1711,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/5cc18fd8-15e6-494b-a189-5e1a98f43e77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"ca408a50-c8da-4bfe-967d-1c1fd0bb946c","last_modified":1576536532905},{"schema":1576535605336,"derHash":"VfOjWfCibXL/JEwu45b9UbwkAOolDJHvw1Xi+BA8mTk=","subject":"CN=DigiCert PKI Platform C2 Shared SMIME Individual Subscriber CA,O=DigiCert\\, Inc.,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjFHMEUGA1UEAxM+RGlnaUNlcnQgUEtJIFBsYXRmb3JtIEMyIFNoYXJlZCBTTUlNRSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0E=","whitelist":false,"attachment":{"hash":"fd6efa96746cef0ca8ce8597e6e6fbc2f1cb6fa9dd9295250b112e46354ea94f","size":2182,"filename":"xCPd-4wOcg7RHCiFt8QndJQj0lTGpZNzZgqyMY0yEFw=.pem","location":"security-state-staging/intermediates/f079080e-f88e-4928-97ef-7f18e0a5938b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xCPd+4wOcg7RHCiFt8QndJQj0lTGpZNzZgqyMY0yEFw=","crlite_enrolled":false,"id":"e20477f8-f814-48f9-bd92-7e92a2bd12c3","last_modified":1576536532901},{"schema":1576535603787,"derHash":"gC4LEz1hRBoKaveZ3F5LJglymQ1ty4fcCs/FhdkIJhA=","subject":"CN=KAINOS-PUBLIC-TRUST,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Kainos Software Ltd,C=GB","subjectDN":"MIGKMQswCQYDVQQGEwJHQjEcMBoGA1UEChMTS2Fpbm9zIFNvZnR3YXJlIEx0ZDE/MD0GA1UECxM2Q2xhc3MgMiBEaWdpQ2VydCBQS0kgUGxhdGZvcm0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMRwwGgYDVQQDExNLQUlOT1MtUFVCTElDLVRSVVNU","whitelist":false,"attachment":{"hash":"f9b2ca117f05b362a6d654febf9b94ed53454c2fd3971b036e93ded0a1ca2a1e","size":2052,"filename":"c_Ep9MPvAU_vVs08JfE2_ztuEqYPDLwz_RD1oE_4__M=.pem","location":"security-state-staging/intermediates/e93cd091-763c-4dc9-a571-7c2da2b86a50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c/Ep9MPvAU/vVs08JfE2/ztuEqYPDLwz/RD1oE/4//M=","crlite_enrolled":false,"id":"46307b27-d96a-4832-a7c6-01140ad38819","last_modified":1576536532898},{"schema":1576535602401,"derHash":"Kosib1zF9+os4ESe64pxX4a7rSRB53XcX4m/f7BlphY=","subject":"SERIALNUMBER=202004,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDIwMDQ=","whitelist":false,"attachment":{"hash":"530c26605f6cc334c3b24de395cde5d524dc087c7e5d426c096ae73d47e5671b","size":2337,"filename":"YKoPQytsUiYv9XeHwk2Vn9vD9ArNj_LsZreUUWmHDPM=.pem","location":"security-state-staging/intermediates/f5b681e8-e2c0-4537-9b4a-5e7391c4a09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YKoPQytsUiYv9XeHwk2Vn9vD9ArNj/LsZreUUWmHDPM=","crlite_enrolled":false,"id":"28a75208-9a9a-47d5-8400-f79e047b5462","last_modified":1576536532894},{"schema":1576535600960,"derHash":"z7IiWXstBVtHh9pyOnSNfi9Dd9t8i5T3/ZmvW9IWP8k=","subject":"SERIALNUMBER=202002,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAy","whitelist":false,"attachment":{"hash":"513c238212527dc8f0129c6323cbf9607be77ea2434d5ba48063eaa65e8f1720","size":2333,"filename":"TXCiKaiHdI6ASTC6_M9mbHGeLbmkLX5hTPl45I7zvY8=.pem","location":"security-state-staging/intermediates/1ae2f1a9-4b9a-4207-8977-04f97bfd005b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TXCiKaiHdI6ASTC6/M9mbHGeLbmkLX5hTPl45I7zvY8=","crlite_enrolled":false,"id":"e579267f-82d9-4f4c-8aa0-323312c433c5","last_modified":1576536532887},{"schema":1576535597671,"derHash":"4VXr+WM055ri4ofVXPyRhd4kk1plPxPFugWv+Bh3G8Y=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"55655605c7ce9c971ab03390d8184fc277ae70699910a9e487994de27fd1e269","size":1638,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/dd061739-a439-406c-bc1c-c3dcf1a5c2c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"53fa801b-05d6-4051-90f3-4350385d8e6c","last_modified":1576536532883},{"schema":1576535594773,"derHash":"G8OytG+vAPCtjmleK3WTvZNHNl0savqxSQ42CJbvbko=","subject":"SERIALNUMBER=202009,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA5","whitelist":false,"attachment":{"hash":"3ce81fe0691ef3beea65fca4658bd6387ac10bbe5f14ec28000785c58f4950a5","size":2333,"filename":"DSlbVTwQBYvCao9cl8EkWAC1CjW7Fie6KKpzjPDp1Rw=.pem","location":"security-state-staging/intermediates/34f0e639-4d4d-47c8-9598-8259f59ee104.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DSlbVTwQBYvCao9cl8EkWAC1CjW7Fie6KKpzjPDp1Rw=","crlite_enrolled":false,"id":"274acd87-6025-4bce-bb40-37e93b78302b","last_modified":1576536532879},{"schema":1576535596263,"derHash":"ANuGpwh6dQzgezJV0NMSnoiMqeDuys+ecr2ydrFxR+8=","subject":"CN=KLASS3-SK 2010,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MG0xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSEwHwYDVQQLExhTZXJ0aWZpdHNlZXJpbWlzdGVlbnVzZWQxFzAVBgNVBAMTDktMQVNTMy1TSyAyMDEw","whitelist":false,"attachment":{"hash":"042b094c75aa054c83b0bfb76bf4cc6a362c77b88f8c7ddffc0770a77ea5ce75","size":1849,"filename":"21pSl8-gYIgzVrmihoLqfp4XlT3k97qo-M2ZGRQsy4Q=.pem","location":"security-state-staging/intermediates/8b165542-5819-4ea0-b9ec-4b1f31d1704c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"21pSl8+gYIgzVrmihoLqfp4XlT3k97qo+M2ZGRQsy4Q=","crlite_enrolled":false,"id":"c4e9303c-d86a-4819-adae-e6fbfe2cd985","last_modified":1576536532872},{"schema":1576535589142,"derHash":"ThU6WIh3aI8aDBA6CEwu2zrR2MSAzwPYq2/tR9kgQ3A=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"76d0b5a6bef0132806bae16a534cb1699d6f053ea10a73a6a9f121dd15765520","size":1626,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/0488e943-51c6-4a2a-9cc4-5979ebb4cc57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"f366897a-f2ea-4b9e-be08-13b01c4f215c","last_modified":1576536532868},{"schema":1576535586284,"derHash":"Pwrls9BWUkcqEIwoVGNksxtaM9AVKLVV/qshr667Wzo=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"61d3d2c76fff74929a739fafc9288572e7cb53a76ebc465347acb2c2000ca94c","size":1447,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/9c45e999-6dc2-4a83-b49b-687d87da1f29.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"5cb4733e-13a4-4279-81c5-5692b01bd879","last_modified":1576536532862},{"schema":1576535587654,"derHash":"yHzgOv+13mMZwhmXHy7S2Pb1OJ4tU7It0sVipcmCf8A=","subject":"CN=GeoTrust EV CN RSA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFUdlb1RydXN0IEVWIENOIFJTQSBHMQ==","whitelist":false,"attachment":{"hash":"d222797c82dd7127576a516cb679acc7149d876ca1871f151665584a65c8958e","size":1678,"filename":"_AbtYXa2JlKxQyB1FnBObb2Wv8Q-bUxjsGRIXvzcvpQ=.pem","location":"security-state-staging/intermediates/018708e8-2e71-4cdd-808d-b307f41e71a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/AbtYXa2JlKxQyB1FnBObb2Wv8Q+bUxjsGRIXvzcvpQ=","crlite_enrolled":true,"id":"dd86d747-415a-4663-841b-9d245710f0eb","last_modified":1576536532858},{"schema":1576535584747,"derHash":"cMfmgRnfrRKKiOHXr4501aGeKxmh9ejwCKnPUPRPLbs=","subject":"CN=SSL X Y & Z TLS CA RSA R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHAxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSIwIAYDVQQDDBlTU0wgWCBZICYgWiBUTFMgQ0EgUlNBIFIx","whitelist":false,"attachment":{"hash":"fa1303b719e1d84c2d575bdb34a549d866cb7136d850a3400cbfd89b2f4ccbe5","size":2430,"filename":"R4T7HX6pKZp9r7OGr6NyCYcdUsEH_aad6Zft_LMvyf0=.pem","location":"security-state-staging/intermediates/5bb7f143-7660-4b95-878e-f1341fea8ea6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R4T7HX6pKZp9r7OGr6NyCYcdUsEH/aad6Zft/LMvyf0=","crlite_enrolled":false,"id":"d62e32e9-67fb-4119-951f-c462ddffe4e7","last_modified":1576536532855},{"schema":1576535583284,"derHash":"2jvIEAX9u4U9aBp+lCZhrrojeJIRUl6vUiIfKFFMCcs=","subject":"CN=QuoVadis Issuing CA G4,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBJc3N1aW5nIENBIEc0","whitelist":false,"attachment":{"hash":"7b11a86250a18ac5dac6b4e9d9a5638069dc115c40cfdef38dc073726ccda870","size":1967,"filename":"Q3uGh6nrEU1_2eTHReUBvoLYNArYb3i7Qz286_nBn7Q=.pem","location":"security-state-staging/intermediates/35521446-cee1-4cf0-947c-c068c11acec1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q3uGh6nrEU1/2eTHReUBvoLYNArYb3i7Qz286/nBn7Q=","crlite_enrolled":true,"id":"13ab7e91-4d7f-417d-9099-ffcf9e4bf594","last_modified":1576536532851},{"schema":1576535581658,"derHash":"en2t4IVo/Tv/JFPmm3qE1b9Bc7S/WM0GQ/8GDDX5Fl0=","subject":"CN=SSL X Y & Z TLS CA ECC R1,O=SSL X Y & Z Corp.,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHAxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExGjAYBgNVBAoMEVNTTCBYIFkgJiBaIENvcnAuMSIwIAYDVQQDDBlTU0wgWCBZICYgWiBUTFMgQ0EgRUNDIFIx","whitelist":false,"attachment":{"hash":"d9454a599aefed353e8d1bead50ae07d5bd45c94c6729e3d59e8c4c72306ab4e","size":1268,"filename":"TC1hkMikhbNbWT7TjUDnHdt4hkFz4dY7ULwwF8-lf3I=.pem","location":"security-state-staging/intermediates/14e678e7-d2fe-4b48-a544-60cfa82b3275.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TC1hkMikhbNbWT7TjUDnHdt4hkFz4dY7ULwwF8+lf3I=","crlite_enrolled":false,"id":"fc0bb8ef-4095-4f5b-98eb-34c572664019","last_modified":1576536532843},{"schema":1576535578773,"derHash":"dO8zXl4YeIMH+52Jy3BL7BEqvSNIfb/0HE3tUHDyQdk=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"d127064c98a35e06b558457e35c1d15905d100eb14b73d7fd679b978441b5b0f","size":1589,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/a6c94cd4-4f33-46e2-8858-3eacc056bb12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"f4e16820-98b9-49a9-8e18-7494d1d0dd70","last_modified":1576536532836},{"schema":1576535580153,"derHash":"Bip25RluTGIgrKfTKqQZdhEBN0wRhmw2J9X4oFXs4s4=","subject":"CN=Symantec Class 3 Admin Intermediate Certificate Authority,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgQWRtaW4gSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"6e68121c7da618c74b2bf94b41b68161d9de0843f9a65350b2b41464efdd6c36","size":2203,"filename":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=.pem","location":"security-state-staging/intermediates/1ebad936-5863-490b-a667-2a96eb695a7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=","crlite_enrolled":false,"id":"9942326c-f86b-4922-895e-e23f9e021b32","last_modified":1576536532832},{"schema":1576535577287,"derHash":"80mVTo+21EARvLeJ2X2aLLIDK9XwtZjR+4oJn1hI1SM=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R5,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNTETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"8e31af76b6ffba628ef77f3869f8354882f946eb5ff2352cf52785a9787b247b","size":1325,"filename":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=.pem","location":"security-state-staging/intermediates/afbb8634-f114-41c2-98ab-86ef89d3a7f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=","crlite_enrolled":false,"id":"77a173f6-46fd-4be8-ba6f-c64b6308db3f","last_modified":1576536532829},{"schema":1576535575850,"derHash":"ZhFE0REXIkQICyTX/kp7zraow12gyZGMjppYY13Ekjw=","subject":"CN=Entrust Class 2 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDIgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"4277e2a7f71129a3837869b4dc2390a017ee5641def4a8640f1b4f673b8b643f","size":1760,"filename":"JloS0qeSNdA_zDy0D24iKRwsIsmYt-GFR_0g8UIjlUE=.pem","location":"security-state-staging/intermediates/eadd6041-e936-41dc-ae64-e03625e527ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JloS0qeSNdA/zDy0D24iKRwsIsmYt+GFR/0g8UIjlUE=","crlite_enrolled":true,"id":"f00a5631-60d1-4b34-9191-50b30924ed38","last_modified":1576536532825},{"schema":1576535572387,"derHash":"D+RlaG/uLc0BKaFqfVm6Kisz9lKbWYiXU7g+C+o7fgQ=","subject":"SERIALNUMBER=202007,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDA3","whitelist":false,"attachment":{"hash":"a5513b0fbc7d522403e4c0ca9a2ad46a72d21ee012f373b1b0db761e2ae7e601","size":2333,"filename":"sRTAvLuml1nZ25l3oqzol98ZuS1JG5EdhJ-TY63PwXo=.pem","location":"security-state-staging/intermediates/713bda9e-695b-47d5-bfb8-022892bf0b34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRTAvLuml1nZ25l3oqzol98ZuS1JG5EdhJ+TY63PwXo=","crlite_enrolled":false,"id":"7914b6fe-1a40-47cf-8d43-5b437aec1f07","last_modified":1576536532821},{"schema":1576535569402,"derHash":"IpdXDb0sDe8bBQ2ZJ/6oldsP0guCuFluCgoTJezgjQU=","subject":"CN=SECOM Passport for Web SR 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"e915fd41e3e3cc034825e2e513688643882df2dd79b58f8738fe092993109c81","size":1520,"filename":"0CzdK_GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=.pem","location":"security-state-staging/intermediates/5b3e9b4a-ea34-4675-849e-8adbd915a261.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0CzdK/GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=","crlite_enrolled":false,"id":"9ec6f3e5-9aab-41f6-9ccf-5ede8da74e5e","last_modified":1576536532814},{"schema":1576535570874,"derHash":"D1e5b6ezEkfsOcswfTjKK/Oyn1Sv1Qo1HRhTNSlRe0Y=","subject":"CN=DigiCert Transition Root G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBUcmFuc2l0aW9uIFJvb3QgRzM=","whitelist":false,"attachment":{"hash":"c080ef9080f906fa2c289ef910f8910848f4f26bfb328c0efd43ac77fcc52cc3","size":2040,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/ce901e54-cf68-4abc-b935-9640cec37430.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"fb9b4b7b-76ea-4ba8-b5f6-2f80547aa743","last_modified":1576536532811},{"schema":1576535567918,"derHash":"26EJdxDzximUPCPcdQOsgrkUKCXvBJ8cJlONs2tIBUk=","subject":"CN=thawte Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMScwJQYDVQQDEx50aGF3dGUgUHJpbWFyeSBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"89dee949e02c694fa984b3b8c8b7969c98ab3399e00e52dca4306446b0384992","size":1735,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/03b26244-8e28-4bfa-acb2-0df61add2abc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"af87efd1-445a-4171-8aef-7caaca23fb3f","last_modified":1576536532807},{"schema":1576535566488,"derHash":"KtkJUW/XLKcNgB7oMeS7heqvlsJSDI+Dy6aOm1Rz9Nk=","subject":"CN=TBS X509 CA Persona 3 (RSA),O=TBS INTERNET Ltd.,L=Douglas,ST=Isle of Man,C=IM","subjectDN":"MHcxCzAJBgNVBAYTAklNMRQwEgYDVQQIEwtJc2xlIG9mIE1hbjEQMA4GA1UEBxMHRG91Z2xhczEaMBgGA1UEChMRVEJTIElOVEVSTkVUIEx0ZC4xJDAiBgNVBAMTG1RCUyBYNTA5IENBIFBlcnNvbmEgMyAoUlNBKQ==","whitelist":false,"attachment":{"hash":"461a7cb9308661369347d20ce15e3c4d6ebfa7b32b74c4a2b3d2d306d0b9fe81","size":2125,"filename":"z3pEJKBoO1fdk2jCBPfRIop6ygjEkto5FhQko4yPR9A=.pem","location":"security-state-staging/intermediates/9f88bad7-8b3a-4092-9c6c-c850ef8cf5c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z3pEJKBoO1fdk2jCBPfRIop6ygjEkto5FhQko4yPR9A=","crlite_enrolled":false,"id":"b299de4d-2908-4fed-9755-f51ebc482510","last_modified":1576536532803},{"schema":1576535565134,"derHash":"x80C+uV4aHQ2n1NFdBbrcTNXFkf+kSIJ78Twd6jtcuM=","subject":"SERIALNUMBER=202015,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE1","whitelist":false,"attachment":{"hash":"51ef9ce4079b75fb93d27cb9af4ed07b2bcd7336b6f53687b00e904458dcf0b3","size":2333,"filename":"kY1t8IGrljcRfRgo1nuCJj6b5Qn9itJ695GG1Rd1Bro=.pem","location":"security-state-staging/intermediates/c31bd631-14e9-4399-b33e-79c247091349.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kY1t8IGrljcRfRgo1nuCJj6b5Qn9itJ695GG1Rd1Bro=","crlite_enrolled":false,"id":"5b90ea65-389e-4fb6-b10f-faef455a1c0b","last_modified":1576536532799},{"schema":1576535563725,"derHash":"6TJ6NHy+HLlM3JqlTLMbbkPWiWjRfQnOMmoJG/wvCxE=","subject":"CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"88d175177fc311fc5ad5e439d61dfabfbe6a0cc3dbf7be58654a104156ba2dae","size":2686,"filename":"qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem","location":"security-state-staging/intermediates/7b9e7264-b0e3-4c9e-bda1-908a922c5b3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=","crlite_enrolled":false,"id":"772a5e91-e4ab-4bc1-b2a7-9d88c0c7e9bf","last_modified":1576536532792},{"schema":1576535560876,"derHash":"j7iGQfTiMc6BQ2N1E4pbNtKgajzCpJ5bH0aZmBvh5FE=","subject":"CN=Absa Group Limited Public CA,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=Absa Group Limited,C=ZA","subjectDN":"MIGSMQswCQYDVQQGEwJaQTEbMBkGA1UEChMSQWJzYSBHcm91cCBMaW1pdGVkMT8wPQYDVQQLEzZDbGFzcyAyIERpZ2lDZXJ0IFBLSSBQbGF0Zm9ybSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExJTAjBgNVBAMTHEFic2EgR3JvdXAgTGltaXRlZCBQdWJsaWMgQ0E=","whitelist":false,"attachment":{"hash":"51736122794efa7bfecf956b04e07f42516a9ed8361aa4a44f250170f90cfb86","size":2048,"filename":"vRb7HqdoT5ixhzzRCvN6PNUCaEBVGzIOVNy1MyJgmZU=.pem","location":"security-state-staging/intermediates/07490972-9ddc-4a60-8439-1f434b2f63a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vRb7HqdoT5ixhzzRCvN6PNUCaEBVGzIOVNy1MyJgmZU=","crlite_enrolled":false,"id":"795ca4a8-041d-408c-99cf-62a09306cc8c","last_modified":1576536532788},{"schema":1576535558052,"derHash":"QNaZIOoFRW+gEX3mCLioATeQtUIJfjQ+wcvOLfuXE7A=","subject":"CN=Secure Site Pro Extended Validation CA G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKVNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENBIEcy","whitelist":false,"attachment":{"hash":"8020f42d89c841697f922651d0d7b35319708585b4dae12e24e03526e2a96f83","size":1703,"filename":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem","location":"security-state-staging/intermediates/adec223e-eda3-4d12-bdab-c4e535e58e79.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=","crlite_enrolled":true,"id":"982fce8e-e441-4c2f-a4a8-2304fb7e2ac2","last_modified":1576536532781},{"schema":1576535555127,"derHash":"sTGQXMciEnBhO1KayeeGqiMKv+FUoKy+RSvDUL0e/ks=","subject":"CN=DigiCert CN RSA EV CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGERpZ2lDZXJ0IENOIFJTQSBFViBDQSBHMQ==","whitelist":false,"attachment":{"hash":"4faf62df3f53a4fe26ac667c6b9d791fd8d952eec9c249782056ad06c4fead0d","size":1683,"filename":"mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=.pem","location":"security-state-staging/intermediates/20053df1-5626-4ba2-a024-3f6bb49f5e6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mGDyZVimaL1gSwtTqcpINStgZay1F9wruRyUZy0wI3g=","crlite_enrolled":true,"id":"5ed1b67e-597a-44c5-bbf4-973e53cc5889","last_modified":1576536532777},{"schema":1576535556567,"derHash":"zXMOU/5zLY8J1ows2/0e/ZioVfXhSQIcAcsu7h2Bhuc=","subject":"CN=COMODO RSA Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"7d2f460009e99bedb3ed4c894ebf320d7eed0cf7460a7d81e4eb7dcfd8793cf7","size":2158,"filename":"Fbr_5aSOo4KRal8YE49t4lc76IOnK_oto9NWV1cSKWM=.pem","location":"security-state-staging/intermediates/0e5c6bab-00ba-4b47-8e40-654d140bf187.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fbr/5aSOo4KRal8YE49t4lc76IOnK/oto9NWV1cSKWM=","crlite_enrolled":true,"id":"5db685fc-9b69-480f-8fc6-f5e4386636ad","last_modified":1576536532774},{"schema":1576535552192,"derHash":"38x3XGRNtKM61xKTQz9GPI4xBXziLLJn+dMaA1P0/C8=","subject":"CN=Amazon,OU=Server CA 0A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAwQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"beb147abe96d6e343843d2e2fd729d58e42b2dab74a3c0ccc41530639168e721","size":1666,"filename":"tYU57KoTkhzNuA0400h1_eZHHFoVnZvu8vpvmZg71hE=.pem","location":"security-state-staging/intermediates/e3003237-67fc-4118-adfa-35b22f4430b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYU57KoTkhzNuA0400h1/eZHHFoVnZvu8vpvmZg71hE=","crlite_enrolled":false,"id":"838bb94d-8f5e-4921-a93a-9035addc8ae6","last_modified":1576536532770},{"schema":1576535553697,"derHash":"I7zV16lqUTqYHq0nk25ZqAKKgHvXKGBBj2i1VaKRFnA=","subject":"CN=Certigna Identity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MSIwIAYDVQRhDBlOVFJGUi0wMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBJZGVudGl0eSBDQQ==","whitelist":false,"attachment":{"hash":"211c9fabe3b82a58caaded8a0e4fe51f77d8506e143103dc3f8db31704cb7e6e","size":2178,"filename":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH_eJZlWjWo=.pem","location":"security-state-staging/intermediates/00c1f21f-a695-478a-9e33-19d48f9525d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH/eJZlWjWo=","crlite_enrolled":true,"id":"f695b618-333e-4759-a681-19c5f52aeb16","last_modified":1576536532767},{"schema":1576535550809,"derHash":"U5wT1vJzElL5ndK69D1AVZxGxYV1jE/EQQx+xILb7Wk=","subject":"CN=OneSignSSL ECC DV Secure Server CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MH8xCzAJBgNVBAYTAlNHMRIwEAYDVQQIEwlTaW5nYXBvcmUxEjAQBgNVBAcTCVNpbmdhcG9yZTEbMBkGA1UEChMST25lIFNpZ24gUHRlLiBMdGQuMSswKQYDVQQDEyJPbmVTaWduU1NMIEVDQyBEViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0e21e684e88796f0f844928dd52cc107b1280c4c7eae78e1934ca07301495bb1","size":1313,"filename":"8vM1dUqGdSXi2UQvVgGUGNw0L1p0-y-yK8MC0MVE9Zs=.pem","location":"security-state-staging/intermediates/86301532-3955-416c-9e34-7bcb144c4837.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8vM1dUqGdSXi2UQvVgGUGNw0L1p0+y+yK8MC0MVE9Zs=","crlite_enrolled":false,"id":"e0e26920-5001-4bb2-b934-8e6f0697161c","last_modified":1576536532763},{"schema":1576535547841,"derHash":"LeYg8tEgCqkLFsPM9nD9ftFDeasG+osDHP742gUepaI=","subject":"CN=ACCVCA-120,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMjAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"edd78aa1bd6255d7f1003657a126700b8500239227d9aba192fc06dd0a8d1d6b","size":2686,"filename":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=.pem","location":"security-state-staging/intermediates/65d00951-3633-4568-89cc-188eb82084b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=","crlite_enrolled":true,"id":"cf7c93de-8a6e-4b12-b0aa-7dc5ef535f84","last_modified":1576536532759},{"schema":1576535549332,"derHash":"ORIgcFt1vPPtPNSzYxIT9WnSz4ImEB4XB5mlNUqxKGE=","subject":"CN=Amazon Root CA 1,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=","whitelist":false,"attachment":{"hash":"076400302106a1d71c433340807aa21af7fdcdd85ff586d57757cf6d6718dbc4","size":1646,"filename":"--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem","location":"security-state-staging/intermediates/3f9e0d02-5eec-434a-9f82-730c885b8a36.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=","crlite_enrolled":false,"id":"9cb19f7a-6a36-46ac-a938-502daee657ab","last_modified":1576536532756},{"schema":1576535546460,"derHash":"DcCb1929fCwKuKBoB0wVc3SIj/qXYpAFFM8NWfqvNL8=","subject":"SERIALNUMBER=202011,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEx","whitelist":false,"attachment":{"hash":"0bae1aae996ba5f02e57521b5020e6363bbc4090b93b9c08c78a8239a09bb853","size":2333,"filename":"q2i_RQ19XRNztaq5O0Vqrcxf0DOsBBy3DYkUcG-I2g0=.pem","location":"security-state-staging/intermediates/92c0c429-f2cd-4bb1-a505-09504e342281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q2i/RQ19XRNztaq5O0Vqrcxf0DOsBBy3DYkUcG+I2g0=","crlite_enrolled":false,"id":"4ae8957f-b111-42f2-88e8-6d2e0d084617","last_modified":1576536532752},{"schema":1576535544989,"derHash":"pfS4JqWGN/kStp/oWZByQ73+qnGgLcRCnQZk4hSgqds=","subject":"CN=EV TLS ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFFViBUTFMgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"a1b4c52e486a2016d66dc838bc590e59ddd948336f11ca09416ac685b53e9483","size":1341,"filename":"Hm-YeyBPf0CgyqM7jDoHDoSn9_W6pVfgP9SsXIGh6d4=.pem","location":"security-state-staging/intermediates/a3259a3d-6fb9-47b0-a295-0225b3cde342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Hm+YeyBPf0CgyqM7jDoHDoSn9/W6pVfgP9SsXIGh6d4=","crlite_enrolled":false,"id":"8c7f006c-01ed-40dc-a748-e934bdf889f9","last_modified":1576536532749},{"schema":1576535542013,"derHash":"Oi++kokeV/4F1XCH9I5zDxflpfU+9APWGOW3TXp+bss=","subject":"CN=Go Daddy Root Certificate Authority - G2,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMTAvBgNVBAMTKEdvIERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"28840eaf068daaa9dc2d390f16a3685d787b1538e5d8cb9b2977d2063d3719ba","size":1618,"filename":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=.pem","location":"security-state-staging/intermediates/9a9d5981-04f6-43af-9a85-cf7f8a3cfaf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=","crlite_enrolled":false,"id":"db9d1a57-7d79-44f0-a9c2-f880bce304dc","last_modified":1576536532745},{"schema":1576535540530,"derHash":"hTY6JMsbZubPYkTofSQ9u4MG9gc1fGFMucTCJKDgQ1g=","subject":"CN=QuoVadis PKIoverheid Organisatie Server CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTgwNgYDVQQDDC9RdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"2b9839d77bb3847c1706cb2e8bf87fef25e339114ceb10c8c50b05924d67ef9e","size":2609,"filename":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=.pem","location":"security-state-staging/intermediates/5d4f4104-270d-401d-8122-44c0c565d211.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=","crlite_enrolled":true,"id":"4cb231b7-c2c3-498a-b050-cb940c8ed420","last_modified":1576536532741},{"schema":1576535537496,"derHash":"xUU/fBRwFqmqD19LsdIX3r4cLTaMU890019VxSM8SYo=","subject":"CN=OKCERT R4 EV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IEVWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"7d588ca61738784840bbd7ff005ff17935bc0d1a36366ef3279871fa2e31ba71","size":1776,"filename":"fFdFUEieyjNs9DctpEE6fSI3FB56V1hzaJMiFIo0Rnk=.pem","location":"security-state-staging/intermediates/72d9b43e-856b-4662-a065-6f3500f76267.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fFdFUEieyjNs9DctpEE6fSI3FB56V1hzaJMiFIo0Rnk=","crlite_enrolled":false,"id":"ee0c36d3-570c-4d2a-a081-be514ff0a94b","last_modified":1576536532733},{"schema":1576535535906,"derHash":"hsZwe74nzeEhXiXT+BRqUiKB4YxF3yy4xvt6A8FzNRA=","subject":"CN=GDCA TrustAUTH R4 Generic CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MGgxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjElMCMGA1UEAwwcR0RDQSBUcnVzdEFVVEggUjQgR2VuZXJpYyBDQQ==","whitelist":false,"attachment":{"hash":"3b6dea215a5d301b1acaa2f77d6d9182513b6bf335cd1cfaa9683bc4efe3d224","size":2060,"filename":"mXaq2dsX_TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=.pem","location":"security-state-staging/intermediates/74e3a779-4648-4fc7-8e96-17622071ed2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mXaq2dsX/TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=","crlite_enrolled":false,"id":"6ed2cbdd-26bb-461a-81d7-712abefd1ddd","last_modified":1576536532726},{"schema":1576535530119,"derHash":"FPr8qEvbiw7DJxknK+cw/hjW/CkwHFz3iUAFluxCmv4=","subject":"CN=DigiCert Assured ID Client CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ2xpZW50IENBIEcz","whitelist":false,"attachment":{"hash":"139cbdece29a63f10575c4fd3db1782db101a13332f52498f6d746d203036116","size":1471,"filename":"OwnA3IH2SexQr1cTjKzw_Xj6O5qxksjv4SAEa7AYVio=.pem","location":"security-state-staging/intermediates/c08a5a8f-f3b4-4fdb-8c64-e237b98f8316.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OwnA3IH2SexQr1cTjKzw/Xj6O5qxksjv4SAEa7AYVio=","crlite_enrolled":false,"id":"5f7e3c26-5dc5-4bca-820b-89b0835e925a","last_modified":1576536532722},{"schema":1576535533020,"derHash":"YvaSt0R5U9QgWrMbTjTUWgKhLKRWVK+CcP7NieLbPkc=","subject":"CN=AffirmTrust Commercial Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgQ29tbWVyY2lhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"27a3e81bf9f6497aaae6fec88eedc3a72c99ce9e8c856dcb65308fc860687bbc","size":1581,"filename":"cP3S-p60iPGa8-tLw-iQ2NE3CAx2vu0EeyZs6EXiCyo=.pem","location":"security-state-staging/intermediates/e3ba7120-a042-4465-9b24-297a54fa1d86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cP3S+p60iPGa8+tLw+iQ2NE3CAx2vu0EeyZs6EXiCyo=","crlite_enrolled":false,"id":"4b12644e-fa2b-4185-8818-40f29402009d","last_modified":1576536532715},{"schema":1576535531565,"derHash":"JYR9Zo608E/dQLErawdAxWfafQJDCOtsLJb+QdneIY0=","subject":"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMw==","whitelist":false,"attachment":{"hash":"de6da669c1368f77b7e9d695474ed9aa592423603bbbe6a546b8bd3c90c2f2fb","size":1646,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/3df213e3-41eb-4ad7-9716-411dd9ac133d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"096b6a86-f254-4a09-9836-f98ddf792a1a","last_modified":1576536532711},{"schema":1576535527226,"derHash":"YNNVEG3WRk9qvlT/Wc3Gi5yWFei3FScfV/yZb2zvIdw=","subject":"CN=S/MIME ECC ICA R1,O=Public Key Infrastructure Ltd,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MHQxCzAJBgNVBAYTAlNDMQ4wDAYDVQQIDAVNYWjDqTERMA8GA1UEBwwIVmljdG9yaWExJjAkBgNVBAoMHVB1YmxpYyBLZXkgSW5mcmFzdHJ1Y3R1cmUgTHRkMRowGAYDVQQDDBFTL01JTUUgRUNDIElDQSBSMQ==","whitelist":false,"attachment":{"hash":"03d3ff16730384f2fc15daf75d20e0acad2849f2cee795ed8614e55a92fdd10f","size":1333,"filename":"KnJHdgWgUyBWr1LjNnzAFNzR0twTYLZWklBuL0-EpBY=.pem","location":"security-state-staging/intermediates/2f4e4051-4278-40b8-8687-b00bb9eb8d72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KnJHdgWgUyBWr1LjNnzAFNzR0twTYLZWklBuL0+EpBY=","crlite_enrolled":false,"id":"c4e0a4c3-c9a2-4571-bb3e-18933abcc323","last_modified":1576536532708},{"schema":1576535524269,"derHash":"AgcFbRcsgL37bcRb6eWAiEYHjR5u7xtu1wJZqzMqZME=","subject":"CN=Cybertrust Japan SureServer CA G4,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTdXJlU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"d14576fded8dc8bc2c5e4595b2e25160155f8f967c80541b129ff564174309bd","size":1768,"filename":"rS4Ex7fMz9dQhgdB6qjxP-jJJQwjIeb-7RhvvdO6xy8=.pem","location":"security-state-staging/intermediates/8d6e839e-9d33-48c2-a9d9-40c21c559dd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rS4Ex7fMz9dQhgdB6qjxP+jJJQwjIeb+7RhvvdO6xy8=","crlite_enrolled":true,"id":"278d6db3-b339-4446-8841-06784b687319","last_modified":1576536532704},{"schema":1576535525743,"derHash":"WOoGiLeQmqqOqqL/8287vo9KKtA71wJDs5A0adtIkPc=","subject":"CN=Trustwave Organization Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG1MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE9MDsGA1UEAxM0VHJ1c3R3YXZlIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"1844432d6d4b7a217e3b736de1419af2fca76a2f6ccc1ce30a69111d8d201479","size":1817,"filename":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=.pem","location":"security-state-staging/intermediates/cbb140b8-1fb0-4a2a-bd22-98b808d0732b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=","crlite_enrolled":true,"id":"d7fe49e4-283f-4e24-9961-b2cdc4d883ed","last_modified":1576536532690},{"schema":1576535519719,"derHash":"ARBV1IV/2QEDjrodDwNkCCvT94xpCwx3C/lEvCZLfrA=","subject":"CN=KIBSTrust Issuing CA for e-Signatures,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA+OU=KIBS AD Trust Services,O=KIBS AD Skopje,C=MK","subjectDN":"MIHQMQswCQYDVQQGEwJNSzEXMBUGA1UEChMOS0lCUyBBRCBTa29wamUxFjAUBgNVBGETDU5UUk1LLTU1Mjk1ODExPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEfMB0GA1UECxMWS0lCUyBBRCBUcnVzdCBTZXJ2aWNlczEuMCwGA1UEAxMlS0lCU1RydXN0IElzc3VpbmcgQ0EgZm9yIGUtU2lnbmF0dXJlcw==","whitelist":false,"attachment":{"hash":"3f7958374c60f55cb8c9663d8487e680d5ac5b648c0b81613f75565c21da0b6c","size":2422,"filename":"yElc8NruRg-2MsMcl1chcF1INgoayZ7Rv3q4mzfz458=.pem","location":"security-state-staging/intermediates/e36f4085-6521-4c0d-8616-a938793d117b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yElc8NruRg+2MsMcl1chcF1INgoayZ7Rv3q4mzfz458=","crlite_enrolled":false,"id":"edec88d7-e1c6-4300-b142-8b497d3afd5c","last_modified":1576536532686},{"schema":1576535518197,"derHash":"YJkw64B61CCv2iqKphtnSDA5FozXZuCZQqSL/n873BA=","subject":"OU=Public Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGAxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEsMCoGA1UECwwjUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"b2b74d8c5d2ce4f283391974773f823f1441c476105a4e78f1b99db3e02f9528","size":2117,"filename":"tnFqrstaexEa6Zz-CVGGozhI8IF1FafM6uzX3zzHrUI=.pem","location":"security-state-staging/intermediates/b062306c-bad7-433f-bcc1-81512b1194eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tnFqrstaexEa6Zz+CVGGozhI8IF1FafM6uzX3zzHrUI=","crlite_enrolled":true,"id":"4835ad01-5f2c-4639-abc1-05d2b5279fb5","last_modified":1576536532682},{"schema":1576535515302,"derHash":"lXG/6i8fVy7uNPnumfXlXMei7DobS1K3wyoihIK2zFc=","subject":"CN=Intertek Document Signing Authority,O=Intertek Group plc,C=GB","subjectDN":"MFgxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJJbnRlcnRlayBHcm91cCBwbGMxLDAqBgNVBAMTI0ludGVydGVrIERvY3VtZW50IFNpZ25pbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"d20e9af16fa1f1de11830ddd2702a3577e2bab498eace1eead436cb9b2e8b063","size":1938,"filename":"YHxb7yqXsZo593tQi7lml-UbIYBZ-nRncrwmyt7z_jU=.pem","location":"security-state-staging/intermediates/0ae0900f-5f8b-42d2-b2b6-8bfb7d688e75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YHxb7yqXsZo593tQi7lml+UbIYBZ+nRncrwmyt7z/jU=","crlite_enrolled":false,"id":"9687202f-e5b6-4ba7-bbed-0b1ec1daf218","last_modified":1576536532679},{"schema":1576535516747,"derHash":"U8D8e2Y0ObwCvBRspo7SeX1czEBqSgM3DYhIOA4cKZY=","subject":"CN=Dodo Sign TLS ICA ECC R1,O=Dodo Sign Ltd,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MHIxCzAJBgNVBAYTAk1VMRgwFgYDVQQIDA9QbGFpbmVzIFdpbGhlbXMxDjAMBgNVBAcMBUViZW5lMRYwFAYDVQQKDA1Eb2RvIFNpZ24gTHRkMSEwHwYDVQQDDBhEb2RvIFNpZ24gVExTIElDQSBFQ0MgUjE=","whitelist":false,"attachment":{"hash":"ec04a4b626598cf051a07300496777b8ce46ba637f9f30d3f1dd8b58ae418fe6","size":1288,"filename":"gfr73neHKDZwYTmqZKhKtCIUMzhBNbVvVRuE1GZiSaw=.pem","location":"security-state-staging/intermediates/4f3693ee-a00e-4bd8-8b08-9d368b3d9b64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gfr73neHKDZwYTmqZKhKtCIUMzhBNbVvVRuE1GZiSaw=","crlite_enrolled":false,"id":"b281f90d-4780-4454-a47e-7aa979cc9791","last_modified":1576536532675},{"schema":1576535513673,"derHash":"uP/ATIaxUEHbjzqtpH/q8JfoWQqvKKDlnNutt3VqZjQ=","subject":"CN=thawte Primary G3 Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyF0aGF3dGUgUHJpbWFyeSBHMyBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"dbc16836cd8731b78eb02f959a8c5a226e73133b8e253e8608ded9dd176ee060","size":1321,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/19fd9bb8-2f32-4d65-bc2f-3e4289158d4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"7cec5d36-de25-4e2c-92e5-f32afca6422f","last_modified":1576536532672},{"schema":1576535510916,"derHash":"MKqFj/PGdSZLs60Ed1feX8MHgZWswjh2tFjnqjUEmes=","subject":"SERIALNUMBER=202018,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDE4","whitelist":false,"attachment":{"hash":"6eee99c35c359ebfcd92b16092336017ae404339b3791de0aa56d50c02de20e9","size":2333,"filename":"F8qyHHv8MJtO-mb8tPNzX7jrf8zI4r_nHFRexuJgd9Q=.pem","location":"security-state-staging/intermediates/fda13208-5fb7-4d01-82e5-1b954ba9b283.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F8qyHHv8MJtO+mb8tPNzX7jrf8zI4r/nHFRexuJgd9Q=","crlite_enrolled":false,"id":"9dc1119e-7e46-4b76-915c-6a22a5706102","last_modified":1576536532668},{"schema":1576535509540,"derHash":"TJ0+I9iCkFiUl8NU8FIiA+8tlZ8/dgciV2rHxiIv5C0=","subject":"CN=OneSign RSA Client Authentication and Secure Email CA,O=One Sign Pte. Ltd.,L=Singapore,ST=Singapore,C=SG","subjectDN":"MIGSMQswCQYDVQQGEwJTRzESMBAGA1UECBMJU2luZ2Fwb3JlMRIwEAYDVQQHEwlTaW5nYXBvcmUxGzAZBgNVBAoTEk9uZSBTaWduIFB0ZS4gTHRkLjE+MDwGA1UEAxM1T25lU2lnbiBSU0EgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"0be83fe64c644cd30c1406de27e2a54ffe81b680b83cc329d886b1b2e95dfaf8","size":2166,"filename":"UbiEkYnpeEuDUAY38CtS5DK4aXovgdeK95X0LBk3N_o=.pem","location":"security-state-staging/intermediates/128a5920-e2e5-4b28-a24e-8acdf37e05fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UbiEkYnpeEuDUAY38CtS5DK4aXovgdeK95X0LBk3N/o=","crlite_enrolled":false,"id":"8da7888f-9413-4e57-a97f-aa917c25d4ca","last_modified":1576536532664},{"schema":1576535503850,"derHash":"ujYSYP8dRgMWhjBeCC3oNtSjIEZuDengE/AM3t3WIxc=","subject":"CN=DigiCert Global Client CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEdsb2JhbCBDbGllbnQgQ0EgRzM=","whitelist":false,"attachment":{"hash":"555946571b12b9ab7e2734e4ecebf68a7935cc0d40a358be3d6474d971b56c9f","size":1451,"filename":"QfXubDxBsxQ0e_T0TZ377rKOF8NOU9JZSTSOaOBNNVU=.pem","location":"security-state-staging/intermediates/87d0e70e-5e2c-4f1b-bdf9-c8443e1f3856.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QfXubDxBsxQ0e/T0TZ377rKOF8NOU9JZSTSOaOBNNVU=","crlite_enrolled":false,"id":"830a6fb0-b074-4eb8-85eb-85de0f03e55e","last_modified":1576536532650},{"schema":1576535499570,"derHash":"iKBwc9RScGncnpeAU/NXKXBcBYMCZI7QLl/OZWFFnmE=","subject":"CN=DigiCert Universal Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBVbml2ZXJzYWwgVHJhbnNpdGlvbiBSb290","whitelist":false,"attachment":{"hash":"d9217061d8cff01ff6b7275eb4591f00e32d8aadf1fb0695999ff14597211202","size":1756,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/b9e17518-7c43-41a2-855f-b4eec55fd32f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"00d91a48-e1b8-4d9a-b3fc-0a777a762044","last_modified":1576536532639},{"schema":1576535498133,"derHash":"QWeLiJfmNd6gO25IVl4me6Wqw7j03Et0t6CpdIz9014=","subject":"CN=DigitalSign Qualified CA - G4,OU=Class 2 DigiCert PKI Platform Individual Subscriber CA,O=DigitalSign - Certificadora Digital,C=PT","subjectDN":"MIGkMQswCQYDVQQGEwJQVDEsMCoGA1UEChMjRGlnaXRhbFNpZ24gLSBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxPzA9BgNVBAsTNkNsYXNzIDIgRGlnaUNlcnQgUEtJIFBsYXRmb3JtIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTEmMCQGA1UEAxMdRGlnaXRhbFNpZ24gUXVhbGlmaWVkIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"e56f4437043f71e151d0d3f245590c77186eac4683a312733e8a9677ed235dc9","size":2280,"filename":"HA7gqrL9Koo73WVyp4BRDRAeWpsT9I2GiRiBbpD0lMI=.pem","location":"security-state-staging/intermediates/41219887-d4bf-48c9-9a9e-bb89a747b0d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HA7gqrL9Koo73WVyp4BRDRAeWpsT9I2GiRiBbpD0lMI=","crlite_enrolled":false,"id":"a3996fb4-2015-4418-8297-05a8746272a2","last_modified":1576536532636},{"schema":1576535496701,"derHash":"uaiFMJ5s8yFvtmJJB8YGbZmZvDDREJyuT/M4gNXfNJQ=","subject":"SERIALNUMBER=202003,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDAz","whitelist":false,"attachment":{"hash":"58f58c3cf17d7945abc83902b9f2678a79391eb5456d2b1c3efd3e5443dce15e","size":2333,"filename":"UobzRk-EBZtLQBfzMMAEk5fOkG1ShzOH3Qlw34ErLsA=.pem","location":"security-state-staging/intermediates/2ddb692a-500f-4fba-ab72-4a6e8a4b0541.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UobzRk+EBZtLQBfzMMAEk5fOkG1ShzOH3Qlw34ErLsA=","crlite_enrolled":false,"id":"f5b1872a-fb99-4559-b0ee-faa1166caa4e","last_modified":1576536532632},{"schema":1576535493678,"derHash":"peJBV9FBq9Bp86I7wwVtxPRsZo+8GqbpwDCmOBYIkIY=","subject":"SERIALNUMBER=202012,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDEy","whitelist":false,"attachment":{"hash":"08c06e256f98afb4d9806d52e8f1a2b9cc165fa03702ad012b07cdd37f837621","size":2333,"filename":"3RdyBMMkedoxCUDA86JqdijXazSIloqW4_vNeBGZiCA=.pem","location":"security-state-staging/intermediates/cfdd00b1-4a8e-4641-bb24-31945e7273b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3RdyBMMkedoxCUDA86JqdijXazSIloqW4/vNeBGZiCA=","crlite_enrolled":false,"id":"37becd26-64a0-4453-b1a8-0eac48c4d3a3","last_modified":1576536532625},{"schema":1576535490873,"derHash":"Pq1PcvBvEFSIHSco3gM6jhP63mvRZQhAGOuUPBc3jao=","subject":"CN=UZI-register Zorgverlener CA G3,O=CIBG,C=NL","subjectDN":"MF8xCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEoMCYGA1UEAwwfVVpJLXJlZ2lzdGVyIFpvcmd2ZXJsZW5lciBDQSBHMw==","whitelist":false,"attachment":{"hash":"329164edbb1b27621bd02bae2add97fcdcdabe45f217ab352c27f446203676e1","size":2536,"filename":"LJbktDpUTtQFxix-TH4PidTGLrt1SGxWZUTWK8SCn9Q=.pem","location":"security-state-staging/intermediates/58e65d2f-9c20-46d6-8b43-0497398cbe0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LJbktDpUTtQFxix+TH4PidTGLrt1SGxWZUTWK8SCn9Q=","crlite_enrolled":false,"id":"7a4c15d1-a236-488f-9ad0-a2c5a64937bb","last_modified":1576536532618},{"schema":1576535500999,"derHash":"38zb8HfRQteSP2MW3UEeRix6i8BHgfK4cGWlxeJYp+A=","subject":"CN=SafeToOpen TLS ICA RSA R1,O=SafeToOpen Ltd,C=NZ","subjectDN":"MEoxCzAJBgNVBAYTAk5aMRcwFQYDVQQKDA5TYWZlVG9PcGVuIEx0ZDEiMCAGA1UEAwwZU2FmZVRvT3BlbiBUTFMgSUNBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"08e4db6360bbce20665833a4342083987eea5f8cdc3e66fc6fc0292fcb38b032","size":2434,"filename":"uQ4czJaJhrriBdIxl7SyPwX8Wy4z12aj9ZqCb3mdYpo=.pem","location":"security-state-staging/intermediates/8e22945f-abae-4998-9dd4-d3dd5f4f878d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uQ4czJaJhrriBdIxl7SyPwX8Wy4z12aj9ZqCb3mdYpo=","crlite_enrolled":true,"id":"74d8f446-fb98-4c65-8f25-c0c00d3aab68","last_modified":1576536532610},{"schema":1576535485113,"derHash":"GKQ8UdCBdMOm2F8cExi9KQl1PnXZHPZZn3M0ewBwKJA=","subject":"SERIALNUMBER=Q2826004J,CN=AC Administraci\u00f3n P\u00fablica,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh","whitelist":false,"attachment":{"hash":"b1b8087026dcff96160076000ab8ec70cb29448880359f0ce676c987951eea3d","size":2438,"filename":"uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem","location":"security-state-staging/intermediates/b3020299-7dbb-43c6-97f7-e87736a45fc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=","crlite_enrolled":true,"id":"aabec165-9b72-4d6a-8fa8-d4eeb29669f0","last_modified":1576536532600},{"schema":1576535483615,"derHash":"q8hnBsmNa/ZzcvkI7AGt9jGxkdczron4ND6wR7EIFEs=","subject":"CN=DexKo Global SMIME CA 2019,O=DexKo Global Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRowGAYDVQQKExFEZXhLbyBHbG9iYWwgSW5jLjEjMCEGA1UEAxMaRGV4S28gR2xvYmFsIFNNSU1FIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"6e6ef760c62377e53a22b0da3f25f97f7be656c23736dda53dea01102617cf95","size":1857,"filename":"AHjdlX8_el8CCLz5JKmfBOMMvmJPx7t19z58Cw9zbng=.pem","location":"security-state-staging/intermediates/f82a276e-7fa2-447c-aad5-a331e918bde9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AHjdlX8/el8CCLz5JKmfBOMMvmJPx7t19z58Cw9zbng=","crlite_enrolled":false,"id":"f14ded04-2e06-4b3e-b8ca-3d16e25391d6","last_modified":1576536532596},{"schema":1576535474803,"derHash":"7AxspJamehM0L+xSIfaNSz5Tsbwi9uS8zJxo8EFc3qQ=","subject":"CN=Let's Encrypt Authority X2,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMg==","whitelist":false,"attachment":{"hash":"f87a7fc64b76ec8ff49f94aa8ea389cf8c8b37040fca79f64dcbcac12a49586d","size":1674,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/68dfffac-ff48-4aca-935c-22a0f4d36894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"07674fee-0d0d-440e-a3a1-7f554318a8ca","last_modified":1576536532578},{"schema":1576535471694,"derHash":"SkDUvn+wsF+b3KYLzjg/tZLEkgbbxceE+BnNdPKge+M=","subject":"CN=EC-PARLAMENT,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verCIC-2 (c)03+OU=Parlament de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),L=Passatge de la Concepcio 11 08008 Barcelona,C=ES","subjectDN":"MIIBGTELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQwMgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzEfMB0GA1UECxMWUGFybGFtZW50IGRlIENhdGFsdW55YTEVMBMGA1UEAxMMRUMtUEFSTEFNRU5U","whitelist":false,"attachment":{"hash":"9a9ee63a0194dbc598a491404da83c06957163a8fe0c70b3649c45a680f332da","size":2320,"filename":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF-GQQrZtCBAentM=.pem","location":"security-state-staging/intermediates/83499263-b834-4622-bb97-580ab14ab723.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF+GQQrZtCBAentM=","crlite_enrolled":false,"id":"9b0777fb-4e6d-413b-a3dd-5ee301810d9b","last_modified":1576536532570},{"schema":1576535476283,"derHash":"p0sMMrZblf4sT48JiUemi2lQM77QtR3YuYTsrolXG7Y=","subject":"CN=Let's Encrypt Authority X4,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYNA==","whitelist":false,"attachment":{"hash":"86e7dd996382dd285f7661e48620de68d357e550b0745d5154781c7e4df1074e","size":1646,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/47db9996-ee4b-4494-92ef-73eda080d42a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"8d00314d-e387-477e-af43-6e68d3c1b1b6","last_modified":1576536532567},{"schema":1576535467347,"derHash":"9V+f/Lg8c0UyYWAcfgRNsVoPA0uTwFgw8oY174ic9nA=","subject":"CN=Amazon,OU=Server CA 1B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"37adce7ce3a304a9a05f1f1f66ba3242182c5165a762ea08dab41ed3eb9b76f3","size":1544,"filename":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=.pem","location":"security-state-staging/intermediates/e974e18f-9dbd-443f-ad0e-843d3b3588b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=","crlite_enrolled":true,"id":"aa9b7129-b8e6-4ae5-b00f-5a7d58046865","last_modified":1576536532563},{"schema":1576535464512,"derHash":"5XIIy/0obOlxgmfkRJHLW0NclbsJ3Jcg9bZLJax5dM0=","subject":"CN=DigiCert Assured ID Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBLTE=","whitelist":false,"attachment":{"hash":"7160a1203edefe6cdb7dde107be2606128ce7bed16da9e11d5999d17ec003921","size":2357,"filename":"RElq7qZGBSzuZ3oQFuu4t-dh5QqmqZDyU-EAqeRVfJ4=.pem","location":"security-state-staging/intermediates/8fc6e3b5-78f6-4638-8253-27ee2e7e031a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RElq7qZGBSzuZ3oQFuu4t+dh5QqmqZDyU+EAqeRVfJ4=","crlite_enrolled":false,"id":"339bd4fd-f044-40eb-b55d-92b7d38c137b","last_modified":1576536532560},{"schema":1576535470193,"derHash":"frRF6jikamQR8KEqDhbNPQc+kbElZ5l3BB/7zoO+PBo=","subject":"CN=OKCERT R4 DV SSL CA G2,OU=Kingnettech,O=Kingnet Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MHcxCzAJBgNVBAYTAkNOMTEwLwYDVQQKDChLaW5nbmV0IEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMRQwEgYDVQQLDAtLaW5nbmV0dGVjaDEfMB0GA1UEAwwWT0tDRVJUIFI0IERWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"857ccc0777952ba7b08a36e3f5c6ace78f7260f270402953c6a16a68d3690e2a","size":1776,"filename":"Y9JE2NiQ3ArheJd2k5RFD7JxnbQzgfJYS2Z0JfG64Uo=.pem","location":"security-state-staging/intermediates/4b034577-3c79-416d-9af6-374a4c0b5405.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y9JE2NiQ3ArheJd2k5RFD7JxnbQzgfJYS2Z0JfG64Uo=","crlite_enrolled":true,"id":"9dfe1a67-5cce-4d31-a077-99d8791d279d","last_modified":1576536532556},{"schema":1576535465886,"derHash":"UtnfGzqxncGd8MQFkagy0aNHMcKA4pZkS5YwpIYTUtw=","subject":"SERIALNUMBER=202020,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAyMDIw","whitelist":false,"attachment":{"hash":"efa4a8fe8f77910f0ba97261dd229810331d2057180f6a263b06ab238a56cce2","size":2333,"filename":"Dc-eCaAIIzKUTOxxbCJR_Q1XbU4XPdnAPaZrNBwsz4s=.pem","location":"security-state-staging/intermediates/5d61ee8f-24a7-4669-8345-a93e77ae00e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dc+eCaAIIzKUTOxxbCJR/Q1XbU4XPdnAPaZrNBwsz4s=","crlite_enrolled":false,"id":"5c2785f7-cb84-413d-8cc2-e7cd5ea85b3e","last_modified":1576536532552},{"schema":1576535468794,"derHash":"UmJRhV4femM3wPNyDJ8yOHCm4BTGj4jteWw/e2n1t5M=","subject":"CN=COMODO Name Constraints Testing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGFMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDErMCkGA1UEAxMiQ09NT0RPIE5hbWUgQ29uc3RyYWludHMgVGVzdGluZyBDQQ==","whitelist":false,"attachment":{"hash":"a1bc51c8f527415890294e4c206d2ee571e40e60ed19bb1e45e327745f2ec267","size":1951,"filename":"jqMnv-0IEzdGPwNerQxiv2wxmlCcGT7awRI5CPRdDmE=.pem","location":"security-state-staging/intermediates/ffb0c961-02cc-4fd0-b678-54d536adca31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jqMnv+0IEzdGPwNerQxiv2wxmlCcGT7awRI5CPRdDmE=","crlite_enrolled":false,"id":"b64380c5-1f6a-4f0a-bc6e-11a506873c41","last_modified":1576536532548},{"schema":1576535461580,"derHash":"k4xFV1ibcmPVmy8Pa4TL6yfvubI7pyTrPM1bfipYcW8=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"768970dda8922e6ebf07cc524aaa977361d022fe143b092afeba179ec36c7f8d","size":1602,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/ed9d84de-064e-41d2-8681-3ac181eebe73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"a87b472d-be5c-496b-a98b-6df181566b82","last_modified":1576536532545},{"schema":1576535460116,"derHash":"rxiY1/Bjh1HAddAULU4qDqcx/GIjJPFT/hvztq/ZrxM=","subject":"CN=DPDHL User CA I3,O=Deutsche Post,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MG0xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ0wCwYDVQQHEwRCb25uMRYwFAYDVQQKEw1EZXV0c2NoZSBQb3N0MRkwFwYDVQQDExBEUERITCBVc2VyIENBIEkz","whitelist":false,"attachment":{"hash":"db7cbd2598eed19261df59b9537f65a933ee5e3acf9d91abd8b284f4ddad2d90","size":4039,"filename":"U24C-tQ5-xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko_A=.pem","location":"security-state-staging/intermediates/88f7058d-853e-4eab-98bc-8195c5c54535.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U24C+tQ5+xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko/A=","crlite_enrolled":false,"id":"f20fecad-a88e-46ac-897b-f2f4f750d9b3","last_modified":1576536532540},{"schema":1576535463138,"derHash":"wBljBZBwyyMG9LSGzPFQM1kgnphJnIEMK0nibjGkvXQ=","subject":"CN=GlobalSign CA 3 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDMgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"9e1c97c3c6f261707f3456f641117268b30609284db6d243177b47277422c123","size":1670,"filename":"RI4ORwwbrz7iTK-Bub6gGw9N1yaxwBY2kdx8dAAXKBo=.pem","location":"security-state-staging/intermediates/35ce22d9-16b3-4623-83ae-2d36944c1604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RI4ORwwbrz7iTK+Bub6gGw9N1yaxwBY2kdx8dAAXKBo=","crlite_enrolled":false,"id":"0e67c136-94b1-4dff-9e85-e269cba38b1a","last_modified":1576536532537},{"schema":1576535458597,"derHash":"AsSjAKCcG4k7EflWdlmvlbu5u+eVOJPjbFuvF7VVzuM=","subject":"CN=Certigna Identity Plus CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEiMCAGA1UEAwwZQ2VydGlnbmEgSWRlbnRpdHkgUGx1cyBDQQ==","whitelist":false,"attachment":{"hash":"4f9b8c5d9910a9c5057de2bdaa15c263ccc9194055f0f6d438f7dd65e0000884","size":2178,"filename":"ywhSp1oF34bfFheBzKO3KqbsXi-qQbyfXu94SMYBxwg=.pem","location":"security-state-staging/intermediates/a9861ffb-3a18-416a-b622-b2317ad102ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ywhSp1oF34bfFheBzKO3KqbsXi+qQbyfXu94SMYBxwg=","crlite_enrolled":false,"id":"cd3a316e-5ab3-425f-9bd1-f6ef6ab8e077","last_modified":1576536532530},{"schema":1576536129891,"derHash":"JOVvSGBERtioNztDyinRocSXcuWquounwXZivWDajfY=","subject":"SERIALNUMBER=ZZZZZZV0,CN=Siemens Internet CA V1.0,OU=Copyright (C) Siemens AG 2011 All Rights Reserved,O=Siemens,C=DE","subjectDN":"MIGRMQswCQYDVQQGEwJERTEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaVjAxOjA4BgNVBAsMMUNvcHlyaWdodCAoQykgU2llbWVucyBBRyAyMDExIEFsbCBSaWdodHMgUmVzZXJ2ZWQxITAfBgNVBAMMGFNpZW1lbnMgSW50ZXJuZXQgQ0EgVjEuMA==","whitelist":false,"attachment":{"hash":"11c8c1af993fd49e1d65508fa79b88655f291aabdc36b8721da6f945bdc405bf","size":1752,"filename":"rQOD_jrRH5t2JxCWlRagCWxoDrKXhsLELQ-GrW6LeRI=.pem","location":"security-state-staging/intermediates/af88eecd-44f5-40b7-8894-4af88bccad18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rQOD/jrRH5t2JxCWlRagCWxoDrKXhsLELQ+GrW6LeRI=","crlite_enrolled":false,"id":"87540db7-8b67-47b6-9194-744d32ff9b43","last_modified":1576536532512},{"schema":1576536085205,"derHash":"zPSXrgDaWh5agidWuOjwOOANUtxD7S9dM2J5CXMr4L0=","subject":"CN=CertCenter Enterprise ECC OV CA,O=CertCenter AG,L=Giessen,ST=Hessen,C=DE","subjectDN":"MHIxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEDAOBgNVBAcTB0dpZXNzZW4xFjAUBgNVBAoTDUNlcnRDZW50ZXIgQUcxKDAmBgNVBAMTH0NlcnRDZW50ZXIgRW50ZXJwcmlzZSBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"ee2787fc54c594fa045213e347f917704a15e0ee9f6dba2054aafcfc80442b6d","size":1297,"filename":"bzjbLG4lOPyzYixFbEQ90vuRtQ04e0wlcXN7_CMDiqo=.pem","location":"security-state-staging/intermediates/b868b5dd-e624-413d-b9e5-61564e90b21f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bzjbLG4lOPyzYixFbEQ90vuRtQ04e0wlcXN7/CMDiqo=","crlite_enrolled":false,"id":"4ab3adfc-d739-4e1b-92c8-c0d1d2898090","last_modified":1576536532486},{"schema":1576536109129,"derHash":"ehQrGl4WIVGDoT6ECoYqQ34pPZNmkh2wfttU8TisDXg=","subject":"CN=TrustAsia OV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBPViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"bfb83a4526e35f2dc8e07512d6f16dfffedccf8e3263aebf657edd6423d54673","size":1691,"filename":"hEZRb0aBfyh_1yoi7II2m0TQ_JCkJgWwfLZni7lZUHY=.pem","location":"security-state-staging/intermediates/200bc2a0-44c0-40f1-b810-696bea5c140a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hEZRb0aBfyh/1yoi7II2m0TQ/JCkJgWwfLZni7lZUHY=","crlite_enrolled":false,"id":"c6d61ecf-df03-455e-b621-1a69e4c44ab9","last_modified":1576536532463},{"schema":1576536111049,"derHash":"F2rr8pcr1vRxee3j3mOEixVDtFrilUvqRRhbFSU3ucQ=","subject":"CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMXSG9uZ2tvbmcgUG9zdCBSb290IENBIDM=","whitelist":false,"attachment":{"hash":"b4ba7c31c249eb874c39b6a3e78147e6623a6ccbab1429cce2313067069229b7","size":2020,"filename":"JUHlO6WzsHrL5wl6xKA-BAwRz3ptSmfLIT1Vi1AWegY=.pem","location":"security-state-staging/intermediates/15934ce0-b66f-41d1-9cc3-4f83f0c22828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JUHlO6WzsHrL5wl6xKA+BAwRz3ptSmfLIT1Vi1AWegY=","crlite_enrolled":false,"id":"78e6c5d3-d8b9-4d7e-b67b-b08391bf0d23","last_modified":1576536532457},{"schema":1576536110684,"derHash":"BuXewxyR19M0NSAdLiIRbCBxk6h04KQmUyovaVMMhrU=","subject":"CN=SwissSign Server Silver CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFMxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLTArBgNVBAMTJFN3aXNzU2lnbiBTZXJ2ZXIgU2lsdmVyIENBIDIwMDggLSBHMg==","whitelist":false,"attachment":{"hash":"dae13d2d8c181bf4ec65a316a2ba892ac9d49b530d749454a41b697b93c0e4ad","size":2276,"filename":"pdw-szkFhaLHw56vsd_eV19nZd8tlYabs6ie9lk3vz0=.pem","location":"security-state-staging/intermediates/a8e67472-ca0f-418d-8e14-eded55f5c9b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pdw+szkFhaLHw56vsd/eV19nZd8tlYabs6ie9lk3vz0=","crlite_enrolled":false,"id":"626a64c6-27bd-4788-ac43-961a6c286a2f","last_modified":1576536532446},{"schema":1576536114489,"derHash":"ultuXf69rhyAvXJ5C8hbzGU4q0YTAj2nBs6CZBX15bM=","subject":"CN=DigiCert TLS ICA VRSN Universal,OU=www.digicert.com,O=DigiCert\\, Inc.,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEoMCYGA1UEAxMfRGlnaUNlcnQgVExTIElDQSBWUlNOIFVuaXZlcnNhbA==","whitelist":false,"attachment":{"hash":"aeb637f50e3be97e9cd0a8cd4338c79685bc9385f9eefd1c71be433f0880aafc","size":1760,"filename":"syraymM-04Pk6mIoR9bwWpSF7IexVaZZTkmETpWCe50=.pem","location":"security-state-staging/intermediates/583c8c31-1235-464a-bfaf-2066acd4e1ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"syraymM+04Pk6mIoR9bwWpSF7IexVaZZTkmETpWCe50=","crlite_enrolled":true,"id":"2bdacac2-2d88-4a2a-8592-2179c09c6c99","last_modified":1576536532435},{"schema":1576536097332,"derHash":"DWhporT133emr7A0Il6b7zRXQ88wbt827jW50Fr62Jw=","subject":"CN=emSign ECC CS CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRUNDIENTIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"5deb0c464051d5e32daa2afa7cbadc82f6c069bab3db03b8117ad1300b8efda4","size":1167,"filename":"ChGUm4JufQCgxfjTELLQ1T93-EAuA3QrcKKFUAlKCdo=.pem","location":"security-state-staging/intermediates/c488046a-1f5d-4763-bc70-ec75ed1cde37.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ChGUm4JufQCgxfjTELLQ1T93+EAuA3QrcKKFUAlKCdo=","crlite_enrolled":false,"id":"355bd93e-e57b-4170-916c-7d12208880f5","last_modified":1576536532411},{"schema":1576536130303,"derHash":"RS6EVSQQ1D3liEmeM7tdKNXnm4cXBklqP0JC6FS5Cls=","subject":"CN=Athens University of Economics and Business CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGPMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxOjA4BgNVBAMTMUF0aGVucyBVbml2ZXJzaXR5IG9mIEVjb25vbWljcyBhbmQgQnVzaW5lc3MgQ0EgUjI=","whitelist":false,"attachment":{"hash":"06410ad96ec056a34da29d0d86aca4b26e3a19fc5ae4df404e2443c0d36c688f","size":2552,"filename":"kE-j5ZgeypLRoFQ30V9GkRmfWhTimO6x5iKj24k9ovc=.pem","location":"security-state-staging/intermediates/fe193b1e-2de1-4771-9e79-df47a6e849de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kE+j5ZgeypLRoFQ30V9GkRmfWhTimO6x5iKj24k9ovc=","crlite_enrolled":true,"id":"60d94adc-b93d-44b3-8824-05e7d33b94e3","last_modified":1576536532398},{"schema":1576536118729,"derHash":"izWEZtZhJjEhIGRaWHWmpX48gdmEdqlnYEJEJU6sAPA=","subject":"CN=Amazon Root CA 2,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDI=","whitelist":false,"attachment":{"hash":"099a90f379b0ecca696c3cde0f60b64211dbaafa0ce4ae4b1b13e1dc145c4f27","size":1991,"filename":"f0KW_FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=.pem","location":"security-state-staging/intermediates/b138d0b5-195f-401a-8c97-1bd007ddf648.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f0KW/FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=","crlite_enrolled":false,"id":"4a7d284b-1295-4ae6-af24-7de01c05ab0d","last_modified":1576536532395},{"schema":1576536107246,"derHash":"cpVqHFql2RrGnNYxB6JaoYQ4Gd3CHFEI7B2X8yKWA84=","subject":"CN=USERTrust ECC Domain Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE5MDcGA1UEAxMwVVNFUlRydXN0IEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"2a6313c6f238488f62807d206801b298319fe9aadc79bea5d1cb52261d84102a","size":1333,"filename":"-orpYE2E52U2_GRvH4NTBMqU6WeiGaMHjrIRWT8JypY=.pem","location":"security-state-staging/intermediates/a4a30987-f9be-4178-80b7-093289d197b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+orpYE2E52U2/GRvH4NTBMqU6WeiGaMHjrIRWT8JypY=","crlite_enrolled":false,"id":"e697d669-10e9-4820-af92-62a85ce2e0a3","last_modified":1576536532387},{"schema":1576536081355,"derHash":"728p9jb2K91HUxIvQfNBnufCh3WHvkqYB631iUZFjn8=","subject":"CN=Telia Root CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2Mg==","whitelist":false,"attachment":{"hash":"ef7efd4cbf4031585f1a5951e9b5d6bac8a753a47e1861138b45eaaf0f441821","size":2284,"filename":"wrPDGkophQqo889HKhFp_3G0FlefakSC7HdEuD35iKw=.pem","location":"security-state-staging/intermediates/9808e62b-cdbd-44b3-941f-6f29f249116a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrPDGkophQqo889HKhFp/3G0FlefakSC7HdEuD35iKw=","crlite_enrolled":false,"id":"8adb25e4-ae4d-4bdd-aa24-a1b07637fb72","last_modified":1576536532385},{"schema":1576536095821,"derHash":"iyVXlJH4XPV37CFyz60tskyiJVdC5uU0HPBuLL7F2QY=","subject":"CN=EUNETIC - EuropeanSSL Extended Validation Server CA 2,OU=Controlled by COMODO exclusively for EUNETIC GmbH,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MIHTMQswCQYDVQQGEwJERTEbMBkGA1UECAwSQmFkZW4tV8O8cnR0ZW1iZXJnMRQwEgYDVQQHEwtEdXJtZXJzaGVpbTEVMBMGA1UEChMMRVVORVRJQyBHbWJIMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgRVVORVRJQyBHbWJIMT4wPAYDVQQDEzVFVU5FVElDIC0gRXVyb3BlYW5TU0wgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"b32469934418bb2a41ae410f7cf1b81f731ab25583637ac43feedf2f48d3db72","size":2284,"filename":"nWdB0jAAGzhZiLNjLocqdxL16ZnFE4xjHkhnauNoK-A=.pem","location":"security-state-staging/intermediates/ff46e186-87f9-434d-a8c8-dfe148c39f56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nWdB0jAAGzhZiLNjLocqdxL16ZnFE4xjHkhnauNoK+A=","crlite_enrolled":false,"id":"1c90cd8c-5291-49c3-afbf-9a91c6860b4b","last_modified":1576536532382},{"schema":1576536096203,"derHash":"n6n8tQDxqYNVCZ9wA0zw0u50Orpj9utn1VaF6pBlMos=","subject":"CN=GlobeSSL OV Certification Authority 2,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEcMBoGA1UEChMTR2xvYmUgSG9zdGluZywgSW5jLjEuMCwGA1UEAxMlR2xvYmVTU0wgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"e1ed99b56e89cca5568d4660da394400dfeaaad7eee9761ce8d918ba375252d3","size":2150,"filename":"iaAN4YIvVl4idrHfqCHBL-dZTUISZ2ANiVmgZiYqSUY=.pem","location":"security-state-staging/intermediates/9e584cc8-197d-4d8a-8610-9b7b49c2f306.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iaAN4YIvVl4idrHfqCHBL+dZTUISZ2ANiVmgZiYqSUY=","crlite_enrolled":false,"id":"d77ee3af-f063-4cbf-8b9b-f99976780075","last_modified":1576536532374},{"schema":1576536113725,"derHash":"h9zU3HRkCjIs0gVVJQbRvmTxJZYlgJZUSYa0hQvHJwY=","subject":"CN=Amazon Root CA 1,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=","whitelist":false,"attachment":{"hash":"8f2766bb42744fe0fcf37f433c66191277a29d9bd4641cc4121ccf842ecf940c","size":1646,"filename":"--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem","location":"security-state-staging/intermediates/6e41f0a0-496f-4745-a675-09b997850d04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=","crlite_enrolled":false,"id":"a3c4dda1-24a7-46e0-97f3-4ce13eb70857","last_modified":1576536532366},{"schema":1576536131430,"derHash":"1uoQYcKLPblv9bqhQKtXFOawtPXXGrzNJCpJubn03Cc=","subject":"CN=Trust Provider B.V. DV SSL CA - G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHcxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDErMCkGA1UEAxMiVHJ1c3QgUHJvdmlkZXIgQi5WLiBEViBTU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"6902fcbf7cbaa6113fef3012c5b4cb6b57eedbecb1246fd4d021980ddd8bb4a7","size":1910,"filename":"3XnCzH5cKkeCxK0I9DpYpRQZ9Cyf6P7e0ks_yr-wMIg=.pem","location":"security-state-staging/intermediates/1099e1c1-4d22-46ec-a2a6-2b6f7d5bc460.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3XnCzH5cKkeCxK0I9DpYpRQZ9Cyf6P7e0ks/yr+wMIg=","crlite_enrolled":false,"id":"d0259003-812c-49cc-bc2f-a76605c14baf","last_modified":1576536532363},{"schema":1576536088977,"derHash":"h8cVU0Res8M8PgcQcRuZ6cd3PwTZGsOKn0wILuJBAeo=","subject":"CN=GlobalSign ECC OV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBPViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"390a77060a6993d4717518c954c7ca27a2d0f5fbf0e41a6b5af1c798425dcc9c","size":1102,"filename":"KJpedoXG-Rd6IJnYeOJjxUjlaDEDI8K1vCBBgzeJkC4=.pem","location":"security-state-staging/intermediates/87b2c54d-9bb3-4349-af42-cefe085827c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KJpedoXG+Rd6IJnYeOJjxUjlaDEDI8K1vCBBgzeJkC4=","crlite_enrolled":true,"id":"9054318d-a1b1-4bd8-b4ea-20ce57f44d1f","last_modified":1576536532346},{"schema":1576536090109,"derHash":"myWmp71RvF9cTwbg0SGP03DdMfr9XNO2J8gvIC8bRlc=","subject":"CN=SSL.com EV SSL Enterprise Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOTA3BgNVBAMMMFNTTC5jb20gRVYgU1NMIEVudGVycHJpc2UgSW50ZXJtZWRpYXRlIENBIFJTQSBSMg==","whitelist":false,"attachment":{"hash":"6a19f551792254e07344f7d7c4e7e861f60d6567194233434f62adc62f595f4e","size":2454,"filename":"vcL6kVP3jP8hbTn5A-tyKe1IWIWBFnhvUva3qmvEG2I=.pem","location":"security-state-staging/intermediates/3fb0958a-3a98-489e-b496-28b535b8c59c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vcL6kVP3jP8hbTn5A+tyKe1IWIWBFnhvUva3qmvEG2I=","crlite_enrolled":false,"id":"65d2abf0-ea93-4b8d-9f45-2b5db33f4074","last_modified":1576536532324},{"schema":1576536101946,"derHash":"q6amXc6JVbrwaFq4iAm3aZwXRJbvnumRUzJRSU9DzhA=","subject":"CN=emSign ECC Class 1 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDEgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"08dbb6b7acb073d4854e540ae8a5b481d4a53af8dfa6bbd5167547bab1bbfd6c","size":1146,"filename":"Vi90DKA5oebj_na5AG-8ED2AOxp_ezxWTtviS14jpQ4=.pem","location":"security-state-staging/intermediates/6af4e353-16ba-477f-8e14-bcd1749fbc26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vi90DKA5oebj/na5AG+8ED2AOxp/ezxWTtviS14jpQ4=","crlite_enrolled":false,"id":"2f009cfb-439c-4999-9f3b-77b9f7f84299","last_modified":1576536532313},{"schema":1576536098122,"derHash":"D1XyiI0WPKxaC2jmzsEJjFgsPO4DiUeryibWMhpmrY8=","subject":"CN=Fuji Xerox Product CA 2 - S,O=Fuji Xerox,C=JP","subjectDN":"MEgxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSQwIgYDVQQDExtGdWppIFhlcm94IFByb2R1Y3QgQ0EgMiAtIFM=","whitelist":false,"attachment":{"hash":"4a691b4f9e237d7eaaea8136399d660fbe891126105e9bfe3f0956884bbd34fc","size":1601,"filename":"VB5huVvz3NIuvb6JobC09TJ-Z4tKvVOuqvLZ7m9792w=.pem","location":"security-state-staging/intermediates/ee8a45d5-2b62-47a3-a3bf-bd0a39f1b181.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VB5huVvz3NIuvb6JobC09TJ+Z4tKvVOuqvLZ7m9792w=","crlite_enrolled":false,"id":"08afddd5-844d-4c8d-99f7-fd8629fd2eb0","last_modified":1576536532303},{"schema":1576536090882,"derHash":"m6ZluG4nIfUe8GULcoVoqTwNabVtjTjmMFMOdF1mO08=","subject":"CN=MilleniumSign EV SSL Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIEVWIFNTTCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"c2d9efcecdb520559e5d07b646a51f926b8020b4f41b9f42712640a7ca83e215","size":2568,"filename":"Fd9SgizCQBs1fPfz5Y2Z-ByhTYsHK6yT0xbzqrSicsU=.pem","location":"security-state-staging/intermediates/bc7b9946-608d-4516-ab44-46715a90f0bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fd9SgizCQBs1fPfz5Y2Z+ByhTYsHK6yT0xbzqrSicsU=","crlite_enrolled":false,"id":"945a7a27-6220-4db0-a327-1b00830d3cab","last_modified":1576536532298},{"schema":1576536108745,"derHash":"81Ft3MivyAh4i9iw6EC9orXiPGJEJSyjAAu2yHFwQCo=","subject":"CN=Symantec SHA256 TimeStamping CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBDQQ==","whitelist":false,"attachment":{"hash":"f6d7d6142a404fb7f198a9deab5fa8cebdd00388a6f9ed5db9f9955c9d6c8783","size":1869,"filename":"-6bBVDoKjNHndL1ldZpf1QyIXiLIV4dUkciVo24ddLw=.pem","location":"security-state-staging/intermediates/0e83b85f-9d85-4404-8403-e9292f674f6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+6bBVDoKjNHndL1ldZpf1QyIXiLIV4dUkciVo24ddLw=","crlite_enrolled":false,"id":"8cf1f488-3cd4-4c5b-9414-22ff2ba90b1b","last_modified":1576536532288},{"schema":1576536124596,"derHash":"3IW4p987GGIXSqb8lxQ8npzCLW8Zp3bVxX5cHfcA2VE=","subject":"CN=SSL.com Object CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEaMBgGA1UEAxMRU1NMLmNvbSBPYmplY3QgQ0E=","whitelist":false,"attachment":{"hash":"20323ec6ee175231bf323239854623c13b6833fd8c9e755fa77925793b58ca26","size":2085,"filename":"HgdIFDIn7_8ksxHClkFmw9q0QEIK6fN7wZ7qkvDisFw=.pem","location":"security-state-staging/intermediates/ceccf42d-13a0-454c-a0db-f9e1976f0047.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HgdIFDIn7/8ksxHClkFmw9q0QEIK6fN7wZ7qkvDisFw=","crlite_enrolled":false,"id":"f309bff7-7186-4f3b-9b95-51df26462077","last_modified":1576536532278},{"schema":1576536121896,"derHash":"TptzFWcXfhd2qW1m2RILPesouACTfqRmJWWz717IAAs=","subject":"CN=emSign ECC Class 2 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"b2c9c934bd28c6cdde9ab4d84c6c8da067598d50410f83afa8df464ff780c749","size":1142,"filename":"e6icTYnqPAeqRyiV6T1Z-dePhAfjZW9RbzFi-_h840Q=.pem","location":"security-state-staging/intermediates/2a9db6d2-ba72-49aa-a083-f23d88661c4b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6icTYnqPAeqRyiV6T1Z+dePhAfjZW9RbzFi+/h840Q=","crlite_enrolled":false,"id":"6058b519-9e61-482a-8f27-01c5ffd80762","last_modified":1576536532275},{"schema":1576536094293,"derHash":"Maw0azEHPcDRNOKfwhLMShXtNTDuoe3PyNrLNkktXeQ=","subject":"CN=4fastssl.com,OU=3S2N Sp. z o.o.,O=3S2N Sp. z o.o.,C=PL","subjectDN":"MFgxCzAJBgNVBAYTAlBMMRgwFgYDVQQKDA8zUzJOIFNwLiB6IG8uby4xGDAWBgNVBAsMDzNTMk4gU3AuIHogby5vLjEVMBMGA1UEAwwMNGZhc3Rzc2wuY29t","whitelist":false,"attachment":{"hash":"cae137f6053594f20d796d4a5a5d5e9f305e814739d0e7870c9bd2f123fd1605","size":1630,"filename":"sN7Yv0qTyjW-BJTfkzdVvYxd1ExUFwl3cvwbLztk5Fc=.pem","location":"security-state-staging/intermediates/bea7e911-09b3-4259-995d-27e5b79f0dda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sN7Yv0qTyjW+BJTfkzdVvYxd1ExUFwl3cvwbLztk5Fc=","crlite_enrolled":false,"id":"49094aa8-a7a0-4644-bc88-83ff76b96f56","last_modified":1576536532272},{"schema":1576536123068,"derHash":"Vtj24UWykfX7op65iYz1Ir3nsUqziSnQpMTR3dq6Kmk=","subject":"CN=Sectigo RSA Time Stamping CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDElMCMGA1UEAxMcU2VjdGlnbyBSU0EgVGltZSBTdGFtcGluZyBDQQ==","whitelist":false,"attachment":{"hash":"56a8d17bc1d2247a5c19076e98bcbe74c2bf2b35c572ea145ef0bab20aeec262","size":2458,"filename":"HAzgkpPws05gdb_VUEsKyKptN9VTKZx6piTRmO_w1x8=.pem","location":"security-state-staging/intermediates/1f071dbb-1f95-42d5-b695-bf6623c56f06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HAzgkpPws05gdb/VUEsKyKptN9VTKZx6piTRmO/w1x8=","crlite_enrolled":false,"id":"50b19790-5758-49b6-b055-5e746d518437","last_modified":1576536532266},{"schema":1576536068013,"derHash":"0MrmlHvHfwtJXKgI1s3mhfzSAiXh5TC2NbET7UByjvM=","subject":"CN=GlobalSign Timestamping CA,OU=Timestamping CA,O=GlobalSign","subjectDN":"MFQxGDAWBgNVBAsTD1RpbWVzdGFtcGluZyBDQTETMBEGA1UEChMKR2xvYmFsU2lnbjEjMCEGA1UEAxMaR2xvYmFsU2lnbiBUaW1lc3RhbXBpbmcgQ0E=","whitelist":false,"attachment":{"hash":"7806ad293fa3eb0a436e9a8ee203d8340d736f8be793ab3d5c685c08b945c6dd","size":1483,"filename":"cJyzJQR9magyD5d9C2fLGru8Aqi-PgtEQD7TM2Dq-qI=.pem","location":"security-state-staging/intermediates/0144b6ca-d91d-42e8-ab16-043dfc8b9b9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJyzJQR9magyD5d9C2fLGru8Aqi+PgtEQD7TM2Dq+qI=","crlite_enrolled":false,"id":"e3f03587-8572-466f-981a-ea6ccff203c5","last_modified":1576536532261},{"schema":1576536085955,"derHash":"65T44sjQyDOLuLpA4erWIkuELLr8mfJp7vB2HoOcQaY=","subject":"CN=Western Digital Technologies Certification Authority,O=Western Digital Technologies,L=Irvine,ST=CA,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTElMCMGA1UEChMcV2VzdGVybiBEaWdpdGFsIFRlY2hub2xvZ2llczE9MDsGA1UEAxM0V2VzdGVybiBEaWdpdGFsIFRlY2hub2xvZ2llcyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"27bab012779245048bd280aa6bede454d41b18d63a1152020a3b837b9f5ad7fd","size":2869,"filename":"w5ZKTAj16cKbFb_ByP_gQe9CQupFYdX6HVmRkZZtm9w=.pem","location":"security-state-staging/intermediates/1eee0ce9-061c-466b-a247-b923fa34aa69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w5ZKTAj16cKbFb/ByP/gQe9CQupFYdX6HVmRkZZtm9w=","crlite_enrolled":false,"id":"7faa7ca0-252e-4c62-aa48-c3cd1eafa8e5","last_modified":1576536532253},{"schema":1576536135282,"derHash":"K3XMTzZ1nPxMZjex4OVDWUV9tX503k0txdAs3f8pYM8=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CUALIFICADOS,OU=Certificados Cualificados,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGSMQswCQYDVQQGEwJFUzEeMBwGA1UEChMVRmlybWFwcm9mZXNpb25hbCBTLkEuMSIwIAYDVQQLExlDZXJ0aWZpY2Fkb3MgQ3VhbGlmaWNhZG9zMRIwEAYDVQQFEwlBNjI2MzQwNjgxKzApBgNVBAMTIkFDIEZpcm1hcHJvZmVzaW9uYWwgLSBDVUFMSUZJQ0FET1M=","whitelist":false,"attachment":{"hash":"4d2dfe0fc860422f305f1ad6329bd436365d1605d8d9a03702b07b42faebbed8","size":2410,"filename":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU-Y=.pem","location":"security-state-staging/intermediates/0101c000-f69c-425a-97e2-af8490d77aba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xpW9XED3U765P2UyAqPWNU7eDdISlf2JSghpvjZnU+Y=","crlite_enrolled":true,"id":"971a56e0-c3e7-431a-840f-f4f65604621f","last_modified":1576536532235},{"schema":1576536136036,"derHash":"rAq5Y7tfPaBfvIaH+YwrbqC7SZ5hGMGpE2sbx8PHGms=","subject":"CN=GlobalSign CA for AATL - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"85c8ec5dd9e2aef22c301709411a40ca34de77ae66cdf3a22ea4e351f5965835","size":2251,"filename":"eXySzCsBWDIfmGF01cwDJgdAdt8Hj7D429qgL2aN-zU=.pem","location":"security-state-staging/intermediates/db81a002-ed02-457c-8ef2-9ceae481d3bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eXySzCsBWDIfmGF01cwDJgdAdt8Hj7D429qgL2aN+zU=","crlite_enrolled":false,"id":"4267e1b8-a619-4607-8632-9f4be3c8c3b3","last_modified":1576536532222},{"schema":1576536084428,"derHash":"g5Tj0H780el+psuiFMOgVcF92afr+N3gAg/N23byhlM=","subject":"CN=SSL.com EV SSL Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLjAsBgNVBAMMJVNTTC5jb20gRVYgU1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"ec67d7acaecbee9548bf5d3b578b728e2309b8a0884f20b3973a99b6a90d4f0a","size":1280,"filename":"d1tKuR2aFFnhw8eRBoNei7sB4YWR1iQmOEmGB337A0k=.pem","location":"security-state-staging/intermediates/2afb24cd-f81f-48bf-b601-fda65e8b7dcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d1tKuR2aFFnhw8eRBoNei7sB4YWR1iQmOEmGB337A0k=","crlite_enrolled":true,"id":"734d16c1-380a-4953-81ad-78c29e818910","last_modified":1576536532216},{"schema":1576536100444,"derHash":"noUsWd/G/Wq9ThfqgLX05W/AQZLRByWNVNqKklKGcNY=","subject":"CN=Certum Global Services CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGDMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MScwJQYDVQQDEx5DZXJ0dW0gR2xvYmFsIFNlcnZpY2VzIENBIFNIQTI=","whitelist":false,"attachment":{"hash":"8aa13e80c83c232b2f8047b3b1df764885c9c822e03078672b01899a2acd4a16","size":1723,"filename":"M7aD_Hmgy7CF8sTddr5so1MZWEBuNfLIdGe1jvy0X6E=.pem","location":"security-state-staging/intermediates/f51cd94a-f3bc-4f18-bbba-d7bc1b52c422.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M7aD/Hmgy7CF8sTddr5so1MZWEBuNfLIdGe1jvy0X6E=","crlite_enrolled":false,"id":"b69c3618-7b62-4d9b-ac74-c8f39cf75c4c","last_modified":1576536532214},{"schema":1576536132995,"derHash":"ZAF9eLXwwExBlzXWpKbVLsHSARUkOw18dFB+JX/6SkA=","subject":"CN=ABB ECC Intermediate CA 1,O=ABB","subjectDN":"MFwxEzARBgoJkiaJk/IsZAEZFgNDT00xEzARBgoJkiaJk/IsZAEZFgNBQkIxDDAKBgNVBAoTA0FCQjEiMCAGA1UEAxMZQUJCIEVDQyBJbnRlcm1lZGlhdGUgQ0EgMQ==","whitelist":false,"attachment":{"hash":"3bf4e56157209c6ae799aba198d716c87bb03db2fff0a948a5bf6c6f8312cd00","size":1902,"filename":"vtfN7uXcmYy-xpK14sDzgUP-IgxdWGzKLJ7P5ZVQFQg=.pem","location":"security-state-staging/intermediates/c8e925dd-10ad-45bc-8572-9fa64ce3655a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vtfN7uXcmYy+xpK14sDzgUP+IgxdWGzKLJ7P5ZVQFQg=","crlite_enrolled":false,"id":"78f90a7c-db0b-4ba1-bac5-6b8d2f8d842e","last_modified":1576536532209},{"schema":1576536116032,"derHash":"DYiQDbtoxspUcfZT/KzUB+vXsVGQRvnguM7TwnT9EaE=","subject":"CN=DigiCert Transition RSA Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gUlNBIFJvb3Q=","whitelist":false,"attachment":{"hash":"49bdab403720cb448ce0da5276c296f3e531dbc84f9b34389b2dd8ce3d71aed4","size":1756,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/04dff2a2-c62d-4f0e-912a-27aa436c85fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"844e0b7d-1eab-45a2-9c34-a8152b8a194d","last_modified":1576536532206},{"schema":1576536085589,"derHash":"FCFFg+X0nOLbiLk8/j99gbZ4yGr7ypJAuqS55M6Qvyw=","subject":"CN=Symantec Class 3 ECC 384 bit SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFQ0MgMzg0IGJpdCBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"e892cc0b4f7fa3b87f4a7469bf3e6a34084c3d9fec4e10943e11df05f74981b4","size":1435,"filename":"6WrpsMoYWnzd1kOPyS8f--FOclfP_jONLsXqcE6_5MU=.pem","location":"security-state-staging/intermediates/857e59e8-e4eb-4c38-9d55-324c35931b83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6WrpsMoYWnzd1kOPyS8f++FOclfP/jONLsXqcE6/5MU=","crlite_enrolled":false,"id":"0d8edf2b-c4b1-483c-8cb8-331321784db9","last_modified":1576536532203},{"schema":1576536139122,"derHash":"F4zizkHm0pkmyJNy7PAbESCte22YCtKYNUwu/TFB4Sk=","subject":"CN=GIAG4,O=Google Trust Services LLC,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ4wDAYDVQQDEwVHSUFHNA==","whitelist":false,"attachment":{"hash":"173627aa7b741915b72ac66ef4c36175e19527dc12a9e064793b587bc24840df","size":1557,"filename":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem","location":"security-state-staging/intermediates/0a69dac3-a94c-4464-9a5f-cb3c4dd4adcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=","crlite_enrolled":true,"id":"563d4e1b-cc04-4563-aa02-3a2f24d91ee9","last_modified":1576536532192},{"schema":1576536098902,"derHash":"FesKdcZzq/vc0vr8AoI8kf5svDbgB4hELIdU1yvsNxc=","subject":"CN=Encryption Everywhere DV TLS CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"6e79684a22734ca75ec32f3adf0f864295161310bce94980a2608da91fbdd285","size":1678,"filename":"GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=.pem","location":"security-state-staging/intermediates/f06c6294-7b8f-48d8-b0f8-2b14682e5159.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GI75anSEdkuHj05mreE0Sd9jE6dVqUIzzXRHHlZBVbI=","crlite_enrolled":true,"id":"0c722bda-522b-4e54-86de-6947716f1ec9","last_modified":1576536532190},{"schema":1576536127628,"derHash":"6UL/g/YzoI29ZeQ7VxmkNA3hPbfGG9aofNywuph1qWg=","subject":"CN=K Software Certificate Authority (OV) 2,O=K Software,L=Ashland,ST=KY,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLWTEQMA4GA1UEBxMHQXNobGFuZDETMBEGA1UEChMKSyBTb2Z0d2FyZTEwMC4GA1UEAxMnSyBTb2Z0d2FyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgKE9WKSAy","whitelist":false,"attachment":{"hash":"aefeae002e54508394d61079ca1d8477c613220626f0529d41aa1d0c8df5be3b","size":2138,"filename":"afXDX7F7Ynjqxjg6ewL0PMjH-QIuDGSiQQ1PAGTTkE4=.pem","location":"security-state-staging/intermediates/11514566-7d13-4edb-80cc-b5dffd44649f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"afXDX7F7Ynjqxjg6ewL0PMjH+QIuDGSiQQ1PAGTTkE4=","crlite_enrolled":false,"id":"22df7292-b32a-48e1-bf8a-dba558e5fb9a","last_modified":1576536532187},{"schema":1576536068766,"derHash":"gK2NJI1gE+/wAzZkVs3abPhbxHkaZ4FS4XjHK1p/Es0=","subject":"CN=InterCloud Ventures CA for CodeSigning,O=InterCloud Ventures Inc,C=SC","subjectDN":"MGAxCzAJBgNVBAYTAlNDMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEvMC0GA1UEAwwmSW50ZXJDbG91ZCBWZW50dXJlcyBDQSBmb3IgQ29kZVNpZ25pbmc=","whitelist":false,"attachment":{"hash":"58c167ecb8625f5ed88a6385c37aabfbe34ed011345c4a3c3bf6314f851bb37f","size":2381,"filename":"WTN_ayqlb7AXN8GdgPK1i40EqHGWA4uaGPFpRKCY18U=.pem","location":"security-state-staging/intermediates/c29cf028-60a7-4ae0-a6d9-6ae37269fb43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WTN/ayqlb7AXN8GdgPK1i40EqHGWA4uaGPFpRKCY18U=","crlite_enrolled":false,"id":"74797804-f7a2-4f5d-a135-11483ca97411","last_modified":1576536532158},{"schema":1576536127256,"derHash":"PzGbKv7UoPdRJ75ZklVQ0EKOaHY6CeJz62qf+NGNu1s=","subject":"CN=GlobalSign,OU=GlobalSign ECC Root CA - R5,O=GlobalSign","subjectDN":"MFAxJDAiBgNVBAsTG0dsb2JhbFNpZ24gRUNDIFJvb3QgQ0EgLSBSNTETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbg==","whitelist":false,"attachment":{"hash":"b003225e25a61e89168f5f77baef1eabcd91e2a9c9117c1f5602208a802290e3","size":1313,"filename":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=.pem","location":"security-state-staging/intermediates/8d1d0d1d-6a84-49b1-8a6d-74b898777b5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fg6tdrtoGdwvVFEahDVPboswe53YIFjqbABPAdndpd8=","crlite_enrolled":false,"id":"e97393c4-72ac-459c-8c42-ee0e57bd8a90","last_modified":1576536532144},{"schema":1576536096573,"derHash":"e9C9d7T7i2+CUz5OzsPHVl61IKP1NUnBerElNX//TFo=","subject":"CN=CertAssure RSA OV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIE9WIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"29c2f0e95cd6822b6a47aec4b666a7e3143b04825116f0db4a5268602ee77ea5","size":2166,"filename":"AFV-kOki635A1nbhk6e6ZQs4lmPcP6IboL5EBPOsVYE=.pem","location":"security-state-staging/intermediates/d75b1d9e-e92c-4e6a-8378-24a25dd4ed9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AFV+kOki635A1nbhk6e6ZQs4lmPcP6IboL5EBPOsVYE=","crlite_enrolled":false,"id":"ede04aed-0845-44f9-b1a8-03b4525fd10b","last_modified":1576536532124},{"schema":1576536125351,"derHash":"N2N3/R+vS4pbFHJkenC5QQOaYtdM/plEfkhhb41jqXg=","subject":"CN=DigiCert EV Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0eb4c47655aa0125f23ad7ce888e0b58b7d36dad717750fdf0a4fd40e8403de6","size":2385,"filename":"c7df1T6z2RjxaDctD21S-mkgZ71HlsdERYtYXJwYb1Y=.pem","location":"security-state-staging/intermediates/e5bcc777-d888-4a08-b42d-beffa2bd76b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c7df1T6z2RjxaDctD21S+mkgZ71HlsdERYtYXJwYb1Y=","crlite_enrolled":false,"id":"e71509c8-ac25-4827-b3b8-11b99c4357d4","last_modified":1576536532121},{"schema":1576536128757,"derHash":"VD2bf8KmRxzYT8pSws9hWd+D6/zYjYsIta8/iHN/UuY=","subject":"CN=Amazon Root CA 4,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDQ=","whitelist":false,"attachment":{"hash":"529e23adcf592c5f3ead786e4cade919e70e5ce97467aa24135ffedb958ca909","size":1410,"filename":"9-ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=.pem","location":"security-state-staging/intermediates/7e2813c8-5040-4edb-82d1-6727b462247e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9+ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=","crlite_enrolled":false,"id":"6fb12511-5167-469d-9692-07522e197a11","last_modified":1576536532102},{"schema":1576536112199,"derHash":"VYenKm9zjt7O9nOHEW3o0ZNw6vPGsnLEmvm6uheV/Yc=","subject":"CN=Intel External Issuing CA 6B,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDZC","whitelist":false,"attachment":{"hash":"730c860c6a1a3c3e77c108c43b0e00f56074e1d949ea0d71d28548bf7e864319","size":5302,"filename":"sCfIb8e9n-5ipNtw1OVRRBJh67L2MmLDTBHeYecn3kU=.pem","location":"security-state-staging/intermediates/13d73ff1-47cf-4d6e-8af3-9c233886a4fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sCfIb8e9n+5ipNtw1OVRRBJh67L2MmLDTBHeYecn3kU=","crlite_enrolled":false,"id":"16fc2ee5-bf2c-4cc5-8f57-bf1b29ba948f","last_modified":1576536532066},{"schema":1576536131064,"derHash":"nfDT1VQN6umWwbJtox0O1OYO/fOj2jm2P6g4HTuok9o=","subject":"CN=Ionian University SSL CA R1,O=Ionian University,L=Kerkyra,C=GR","subjectDN":"MGExCzAJBgNVBAYTAkdSMRAwDgYDVQQHEwdLZXJreXJhMRowGAYDVQQKExFJb25pYW4gVW5pdmVyc2l0eTEkMCIGA1UEAxMbSW9uaWFuIFVuaXZlcnNpdHkgU1NMIENBIFIx","whitelist":false,"attachment":{"hash":"364105dddbc9280a5dc7aac80e22fa9fd688d01ec8b0110999ac19afaded8a71","size":2454,"filename":"vBUhM35ax7DSrTLTDo3K4f4_Yd93zumJYU7QNR67YtU=.pem","location":"security-state-staging/intermediates/75df7b02-0780-4005-b8d8-783cc77d09c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vBUhM35ax7DSrTLTDo3K4f4/Yd93zumJYU7QNR67YtU=","crlite_enrolled":false,"id":"612dfa9e-2e51-4254-a17e-f34d2cae3b73","last_modified":1576536532052},{"schema":1576536100826,"derHash":"H9McZrC0X5PmZwk2XXYL9nAnax05z45waNSo4gu/8+A=","subject":"CN=Fuji Xerox Certification Authority - G2,O=Fuji Xerox,C=JP","subjectDN":"MFQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MTAwLgYDVQQDEydGdWppIFhlcm94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"ff0a48b0b443388798edbed20dce740060299f311eaec5dc02593af9d96d1bf1","size":1524,"filename":"wekvipZx96mzAem7jXzac4eapzJ0kMdCftv4NPCJWHI=.pem","location":"security-state-staging/intermediates/b38241d8-fdc6-4ea0-afb6-1b2e9733c067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wekvipZx96mzAem7jXzac4eapzJ0kMdCftv4NPCJWHI=","crlite_enrolled":false,"id":"d9de2a31-3c1a-49cf-94be-d01d8a121fc3","last_modified":1576536532047},{"schema":1576536077185,"derHash":"HXCbKITsCT5dd6UElx6IcWMERzT22nDJI6Tz/41OW0k=","subject":"CN=SECOM TimeStamping CA1,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFUxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMR8wHQYDVQQDExZTRUNPTSBUaW1lU3RhbXBpbmcgQ0Ex","whitelist":false,"attachment":{"hash":"2b40c9fd758859d4734cefde3fe5cd1175a48ac4ef24ea479ba390451fe539a5","size":1508,"filename":"bKZzNUt0-zNujbmPHn_6dYVxxpdXJumDRXx-2XvGdiU=.pem","location":"security-state-staging/intermediates/97e4eadc-10fe-4d84-9cec-1818af90d1b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bKZzNUt0+zNujbmPHn/6dYVxxpdXJumDRXx+2XvGdiU=","crlite_enrolled":false,"id":"07b884ce-8837-4df7-98be-ec07ec4647fe","last_modified":1576536532018},{"schema":1576536112576,"derHash":"F/MCIZ/Pzo/RjKwXL4sNRJa6Xajkn4cavB+dDKqjYOU=","subject":"CN=KLASS3-SK 2010,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MG0xCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSEwHwYDVQQLExhTZXJ0aWZpdHNlZXJpbWlzdGVlbnVzZWQxFzAVBgNVBAMTDktMQVNTMy1TSyAyMDEw","whitelist":false,"attachment":{"hash":"69e17cd00463182ef276c37a763b3e1a5148efde85621a344e83ef9f3a74623d","size":1678,"filename":"21pSl8-gYIgzVrmihoLqfp4XlT3k97qo-M2ZGRQsy4Q=.pem","location":"security-state-staging/intermediates/5a20865e-48b8-4068-bc47-0a2bb83948ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"21pSl8+gYIgzVrmihoLqfp4XlT3k97qo+M2ZGRQsy4Q=","crlite_enrolled":false,"id":"76af15b4-926a-4869-93cb-119affd2926c","last_modified":1576536532010},{"schema":1576536080221,"derHash":"m/WJZ1RZlhlFEtthdxUa/plwauo9o2/u562fizwFB8s=","subject":"CN=Go Daddy Root Certificate Authority - G2,OU=https://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGzMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLjAsBgNVBAsTJWh0dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8xMTAvBgNVBAMTKEdvIERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"f01b7da33411fa8ad18c3acbb3b660ca139a5179f86a05a17e7ed8579b7c64a1","size":1678,"filename":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=.pem","location":"security-state-staging/intermediates/32481f93-70cb-40f2-b608-39d1e40518fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ko8tivDrEjiY90yGasP6ZpBU4jwXvHqVvQI0GS3GNdA=","crlite_enrolled":false,"id":"e7caf81b-a272-4ba4-ab9e-23e7d0270c4e","last_modified":1576536532002},{"schema":1576536099289,"derHash":"5/FSbqnVFHt6Xhrmq+MXN6RmbR6PA+YzcDvTw9mx43Y=","subject":"CN=Gehirn Managed Certification Authority - ECC DV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDQyBEVg==","whitelist":false,"attachment":{"hash":"ba00e0cc1ef2c958c1e04e3258cb7126d14548e2dd931dcbef08cf72cc29b04e","size":1321,"filename":"gXehP87ukwK1hI7ZuoCGUFVeee8oPwN9F_lSos9o0ns=.pem","location":"security-state-staging/intermediates/f5997c64-0815-4e51-af66-9a8200623298.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gXehP87ukwK1hI7ZuoCGUFVeee8oPwN9F/lSos9o0ns=","crlite_enrolled":false,"id":"106fef5b-5aa0-42a1-9b57-e378ad429a2d","last_modified":1576536531983},{"schema":1576536111786,"derHash":"g8Hqnp78ooO4QOFn+ep5xOMqzTODT1nROPzaudiAayA=","subject":"CN=Symantec Time Stamping Services CA - G2,O=Symantec Corporation,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UEAxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNlcyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"5f5a445a9debe9c5e196f66f3b896b29dfaecc3edf8c69d98c4185b20314d170","size":1626,"filename":"oGumzLGyzl2o91wqGSYl0m7wwzZ3wViPyem6aWf2UBI=.pem","location":"security-state-staging/intermediates/fb9448bc-44dd-4282-85f1-c4aaf431ae38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oGumzLGyzl2o91wqGSYl0m7wwzZ3wViPyem6aWf2UBI=","crlite_enrolled":false,"id":"7e13165b-c802-4b83-850e-2830259615ae","last_modified":1576536531977},{"schema":1576536119484,"derHash":"9rtbeYWoc2WUwUZ5+jFgOBRQKq619CgqaZhdyEpFB3c=","subject":"CN=Symantec Web PKI RSA Root - G1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEnMCUGA1UEAxMeU3ltYW50ZWMgV2ViIFBLSSBSU0EgUm9vdCAtIEcx","whitelist":false,"attachment":{"hash":"64b574e42d99825dad6ef8f064e0287d85641837ec9f03bf1bf83090374436e9","size":2044,"filename":"Gtk3r1evlBrs0hG3fm3VoM19daHexDWP__OCmeeMr5M=.pem","location":"security-state-staging/intermediates/34f3de0a-0ed3-4749-b3b5-3627781c6d0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gtk3r1evlBrs0hG3fm3VoM19daHexDWP//OCmeeMr5M=","crlite_enrolled":false,"id":"91f64259-d321-4336-9692-f6d7385aee61","last_modified":1576536531975},{"schema":1576536091272,"derHash":"Ie5tT1/uSFrHoDXx1l3i/E3Q7SiXrNwqO2ecBNRZmug=","subject":"CN=DOMENY SSL EV Certification Authority,OU=Controlled by COMODO exclusively for DOMENY.PL sp. z o.o,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIHHMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMUEwPwYDVQQLEzhDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgRE9NRU5ZLlBMIHNwLiB6IG8ubzEuMCwGA1UEAxMlRE9NRU5ZIFNTTCBFViBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"6970cf0b963db7eef40d70e72633e4c8ce08e846f279520c4999c0506b87d77e","size":2292,"filename":"QKMgYhV5InRJvYzUJ1ylX-BvwC9fUdLVL_e6cCnbdGM=.pem","location":"security-state-staging/intermediates/85329473-fb73-4c5c-867f-1f579e8084dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QKMgYhV5InRJvYzUJ1ylX+BvwC9fUdLVL/e6cCnbdGM=","crlite_enrolled":false,"id":"3884c098-4ac5-4ebc-8315-ed00d73e0f3b","last_modified":1576536531969},{"schema":1576536113347,"derHash":"43IiEmajMN0T6xOI36rx+rEd8lS2M4XLY3v++PtftnU=","subject":"CN=QIDUOCA 2018 DV SSL,OU=Domain Validated SSL,O=Suzhou Qiduo Information Technology Co.\\, Ltd.,C=CN","subjectDN":"MIGCMQswCQYDVQQGEwJDTjE2MDQGA1UECgwtU3V6aG91IFFpZHVvIEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgQ28uLCBMdGQuMR0wGwYDVQQLDBREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAwwTUUlEVU9DQSAyMDE4IERWIFNTTA==","whitelist":false,"attachment":{"hash":"0ba2fb2707f62d2ab80d7dea9b69d32058ae47514caecd5cf221db84eb014577","size":1752,"filename":"HjT11uxb0dXXxZnh6FUmEWVHULtStPZ1LLzRYdkdoqY=.pem","location":"security-state-staging/intermediates/b6478416-94fe-4096-b983-23b33e8a6d14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HjT11uxb0dXXxZnh6FUmEWVHULtStPZ1LLzRYdkdoqY=","crlite_enrolled":false,"id":"774024b8-2afe-482e-ad94-a88d0107d630","last_modified":1576536531954},{"schema":1576536134135,"derHash":"E0fpe/W3HHjeAPKkSp0H33ji6ZfpjnA4t2JXZcl83Ec=","subject":"CN=InterCloud SSL Certificate CA RSA R2,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBTU0wgQ2VydGlmaWNhdGUgQ0EgUlNBIFIy","whitelist":false,"attachment":{"hash":"7e3b11492fce1b8ac408168e725129a5c774c0d4764c02c60d7e653acf1e4856","size":2454,"filename":"zp3iAFlKcyLAMqe-MJZjgpwhwmLrQYDlVEHNTCciBQw=.pem","location":"security-state-staging/intermediates/c1f1ee12-bac1-479c-8f15-6e35034b9672.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zp3iAFlKcyLAMqe+MJZjgpwhwmLrQYDlVEHNTCciBQw=","crlite_enrolled":false,"id":"c591d861-86f8-4939-8c1c-a0b83d61b88a","last_modified":1576536531926},{"schema":1576536119117,"derHash":"3U4MF5APP8Klt7dzrkAhitcyFrXOXShev/zogw0PA0o=","subject":"CN=TERENA Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDM=","whitelist":false,"attachment":{"hash":"ee4661bbdd2c4531f9ec0affb2c8462ab039ea1abc75584561047afbf60517fc","size":1792,"filename":"HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC_kcr3CVOg0=.pem","location":"security-state-staging/intermediates/3efac7ca-1e54-4d12-b5f9-b9a9bcb72512.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HOqz19sqhyR0ujgIsU9ml1UZS9cRaphqC/kcr3CVOg0=","crlite_enrolled":false,"id":"f823a65d-ac05-44a5-adb6-73f57c876206","last_modified":1576536531896},{"schema":1576536089732,"derHash":"h1b6/vsKedj/Nhx/46TbP5rVIGVS5xpJXfmKM85laTw=","subject":"CN=CertAssure RSA DV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIERWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"59e582ca4786d9959908ac2fdee355c16c187ee8353d64d2648b55b2d448272f","size":2166,"filename":"XUK4_mOFBsai_iVZvPajZozACtYX_1Rgy6ZjFieNpck=.pem","location":"security-state-staging/intermediates/c0a3d994-1f2c-424b-b5a4-7fd2569d8f40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XUK4/mOFBsai/iVZvPajZozACtYX/1Rgy6ZjFieNpck=","crlite_enrolled":false,"id":"0c8e5371-6bfd-4e3c-8fc1-214bbadc4181","last_modified":1576536531888},{"schema":1576536128385,"derHash":"nDBRZJbhJbPQkx9Jh14pUW2dwlRz5dahBsH8+GbTBts=","subject":"CN=GTS Y2,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTI=","whitelist":false,"attachment":{"hash":"e8c95c6e8334db472dd4dd81fc9057a756258573b6b2c815af66cdf0e960c6a0","size":1906,"filename":"zYGIkpoNQj_A8MrSV7BzubZdDqEk9LkLgAj8t8_U_ns=.pem","location":"security-state-staging/intermediates/4f5d4d0d-ab8d-454f-9170-45bee44c5db8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zYGIkpoNQj/A8MrSV7BzubZdDqEk9LkLgAj8t8/U/ns=","crlite_enrolled":true,"id":"510e0089-ae37-4b96-8605-c4ba8a4f38f3","last_modified":1576536531882},{"schema":1576536083630,"derHash":"1XCEwSeYcycess57hBWkHOkSa1RNhRi62H/xzlpgTaM=","subject":"CN=GTS CA 1D2,O=Google Trust Services,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3QgU2VydmljZXMxEzARBgNVBAMTCkdUUyBDQSAxRDI=","whitelist":false,"attachment":{"hash":"9111c956475abad64a74fc25f5dc5839249913246aeda37cded4b3651b45520e","size":1548,"filename":"qPerI4uMwY1VrtRE5aBY8jIQJopLUuBt2-GDUWMwZn4=.pem","location":"security-state-staging/intermediates/577bf05b-e334-4a66-bcb0-d3bb3cbb33d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qPerI4uMwY1VrtRE5aBY8jIQJopLUuBt2+GDUWMwZn4=","crlite_enrolled":true,"id":"21baac25-4dc6-42e5-813f-8cb5b1d60305","last_modified":1576536531880},{"schema":1576536096939,"derHash":"307LFhEO3qq6B6eB7Lk/41SWGzEx0tpQctNKvgt01bg=","subject":"CN=SecureCore RSA OV CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxHTAbBgNVBAMTFFNlY3VyZUNvcmUgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"2967d56ddac89aa3e10b2450061c6d5258252e83a4ea9ffd3e0c4453b315d01f","size":2113,"filename":"i9YotTNYIfvzcEXlwG2eor_v3IOO_LhM0dufRqOf7Dk=.pem","location":"security-state-staging/intermediates/4750431c-6e17-4977-8f5e-4aadf57f6f10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i9YotTNYIfvzcEXlwG2eor/v3IOO/LhM0dufRqOf7Dk=","crlite_enrolled":false,"id":"060fd0ef-9267-43a4-be6a-5844fda14113","last_modified":1576536531877},{"schema":1576536119880,"derHash":"vVY5dW8Ng32ZohBnKiEMZJsj6lm0+nbeDW5C/XutIbk=","subject":"CN=SECOM Passport for Web SR 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"d513ae4a2e1cd882559b7cef11ccc51bab7106fa40baff92662c011fc57d40a7","size":1609,"filename":"0CzdK_GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=.pem","location":"security-state-staging/intermediates/fc037576-199b-471d-9159-805b07c72b77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0CzdK/GELTntEyD4ub9b3f0cOshJkKpSgLbs7o9cHbA=","crlite_enrolled":false,"id":"c483233c-8b30-44c2-a3bc-bbba8ccd21f7","last_modified":1576536531859},{"schema":1576536087107,"derHash":"Dve4Y/qrw4SmlP9jLar5vTHO0j6SRlWaWezXRydUzOY=","subject":"CN=emSign Class 1 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDEgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"7794b1b190e82b18d7b5fa922d7bfc2eac719e69dd3bdb72cc135eddd69bc51c","size":1540,"filename":"tGZeupl-1fZilJwugiteFK3_QBrwzCRpRSZvX6uA41s=.pem","location":"security-state-staging/intermediates/1c8b5b0a-6ce6-460c-b68c-5b9e6dcd4acd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tGZeupl+1fZilJwugiteFK3/QBrwzCRpRSZvX6uA41s=","crlite_enrolled":false,"id":"3d7a069a-f29d-4118-9ac6-49aa45da46c3","last_modified":1576536531856},{"schema":1576536094670,"derHash":"NsfjKXUKQD2wuvBpyanzOWPlyYpmqKtXAW22+IzFYU0=","subject":"CN=MilleniumSign SSL Certificate CA RSA R2,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIFNTTCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"3c3182c3f974165726acb2e2b6c35f9306b120ba4684e22ac91eef26e5ef70a1","size":2552,"filename":"1jNByu9N5tc5kL0IfWW4-AIUQnp6ljVLB3ROX-cA6b4=.pem","location":"security-state-staging/intermediates/03421df1-3916-4c0a-87eb-0d83ea93a06f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1jNByu9N5tc5kL0IfWW4+AIUQnp6ljVLB3ROX+cA6b4=","crlite_enrolled":true,"id":"17e6f300-d0c1-4ef6-ae0f-36ecd026b133","last_modified":1576536531841},{"schema":1576536072963,"derHash":"pBaiukkMRU4juFvwh9t7E39PR9l0fmD4aS/0yN8OBis=","subject":"CN=TrustOcean Certification Authority,O=QiaoKr Corporation Limited,C=CN","subjectDN":"MF8xCzAJBgNVBAYTAkNOMSMwIQYDVQQKDBpRaWFvS3IgQ29ycG9yYXRpb24gTGltaXRlZDErMCkGA1UEAwwiVHJ1c3RPY2VhbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"40aa115c2456db45d24f826f71babce7e8711e6dadb79d51f81544b5cc127980","size":1703,"filename":"AqnxlVGHcuEywBdQxncOoMBd2w-idNlfoDEnTgEx5S4=.pem","location":"security-state-staging/intermediates/a719d773-6e0a-47c4-84e1-8f61cf95748f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AqnxlVGHcuEywBdQxncOoMBd2w+idNlfoDEnTgEx5S4=","crlite_enrolled":false,"id":"13b2016a-1e62-488b-bfaa-2c73a57c8dc9","last_modified":1576536531833},{"schema":1576536114857,"derHash":"LHPumlL/rQcWa4co12gdjL79makGYzRbJarPmx7x8zM=","subject":"CN=SignSec Certification Authority,OU=SSL Department,O=FBS Inc,L=Irvine,ST=CA,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTEQMA4GA1UEChMHRkJTIEluYzEXMBUGA1UECxMOU1NMIERlcGFydG1lbnQxKDAmBgNVBAMTH1NpZ25TZWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"62210923e47646adf9d060655571c4ce48eb821e4d6302a97121bed12dde39bc","size":2158,"filename":"41fzHe29HqEJ0_pGALXNvRuPsmNV1cP7w8L-2fi7OPc=.pem","location":"security-state-staging/intermediates/d72e3cd5-274b-4802-b95f-74a7558123ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"41fzHe29HqEJ0/pGALXNvRuPsmNV1cP7w8L+2fi7OPc=","crlite_enrolled":false,"id":"b5c03b14-145c-4893-ae49-ec141b83889c","last_modified":1576536531830},{"schema":1576536097708,"derHash":"QMgm/bIroyovnbT5R3D3K4sdqcj/2nsR5vJ68kXIm14=","subject":"CN=Amazon Root CA 3,O=Amazon,C=US","subjectDN":"MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDM=","whitelist":false,"attachment":{"hash":"527804e0cdb3a780b57c0f3f7429e1a5b42984b3bd67157b9fda6ba75cdc6d0a","size":1370,"filename":"NqvDJlas_GRcYbcWE8S_IceH9cq77kg0jVhZeAPXq8k=.pem","location":"security-state-staging/intermediates/52ba3866-d596-48e9-9a8f-b80188b6a77a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NqvDJlas/GRcYbcWE8S/IceH9cq77kg0jVhZeAPXq8k=","crlite_enrolled":false,"id":"249a688b-b665-4574-a1c8-43ac8cff8067","last_modified":1576536531740},{"schema":1576536137962,"derHash":"WuRkvS+DkB/DPvK1DNiA9RGMjb6x60pOlLL7BRKIBcI=","subject":"CN=TrustID CA A12,O=IdenTrust,C=US","subjectDN":"MDoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAMTDlRydXN0SUQgQ0EgQTEy","whitelist":false,"attachment":{"hash":"5643f5bf1bb2b2cce3b4d8ebe783772927119005e011155e3846f1bbdbd4b89f","size":2337,"filename":"Bl-cWNKzUJ_jTvgry8Yjj5Z5DS-raoYNAW6LXHJZf5I=.pem","location":"security-state-staging/intermediates/d6c0cf43-3179-4734-93d2-2708d847db07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bl+cWNKzUJ/jTvgry8Yjj5Z5DS+raoYNAW6LXHJZf5I=","crlite_enrolled":false,"id":"058ccc29-07c2-417f-93d5-b3629027f1f1","last_modified":1576536531734},{"schema":1576536075645,"derHash":"z20DM9C+LGmkLUU5YN7p4QnZ6IQ+owYaFnHW6vhet9g=","subject":"CN=emSign Class 1 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMSBDQSAtIEcx","whitelist":false,"attachment":{"hash":"266278533c3786da3d8865fcd54e0e8fbedf26868dc64378e368d49cb3b7817b","size":1589,"filename":"8eYpGcWTiEZyMyyg19Q9T-bCQt78vGjuJDkLU10HGx8=.pem","location":"security-state-staging/intermediates/ca8d7c44-0de7-4fdb-a4bb-a07b24618b68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8eYpGcWTiEZyMyyg19Q9T+bCQt78vGjuJDkLU10HGx8=","crlite_enrolled":false,"id":"1cb8aaf5-1bf5-4af2-992d-adeedaabcaa7","last_modified":1576536531692},{"schema":1576536075273,"derHash":"jxn/4C/Hle1wdl0UNq3fdy/g8Hc9pDbtvbQqLjDi6Cg=","subject":"CN=GlobalSign ECC EV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBFViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"f363653deddf2dfcf9778cf76ffb95c3df7a78ee504183ca843b0302e14a7651","size":1102,"filename":"OD_WDbD3VsfMwwNzzy9MWd9JXppKB77Vb3ST2wn9meg=.pem","location":"security-state-staging/intermediates/44d3815f-42a9-4cec-bf3e-876bdcd1f014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OD/WDbD3VsfMwwNzzy9MWd9JXppKB77Vb3ST2wn9meg=","crlite_enrolled":true,"id":"0fd62746-093f-43ab-bba0-8f8ee357a4e7","last_modified":1576536531682},{"schema":1576536080984,"derHash":"QtocVi+A5G2noyEkTvwj0Pqp/ru3qgN32WtC2eiKsgA=","subject":"CN=emSign Class 3 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMyBDQSAtIEcx","whitelist":false,"attachment":{"hash":"d7df1cc3c3cc232a8f51e22a5dd4ea1766aeacac640f8a976a7c227626346ed2","size":1589,"filename":"4d2pu0FN5HWVpPbYu-0cH1AeCZYz3dgz9eFeY0xuTh8=.pem","location":"security-state-staging/intermediates/dbf450a1-135d-4dc7-8677-00049ab4ecf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4d2pu0FN5HWVpPbYu+0cH1AeCZYz3dgz9eFeY0xuTh8=","crlite_enrolled":false,"id":"6f7f445a-9db3-41b6-8e6e-c97091de4b0d","last_modified":1576536531660},{"schema":1576536092403,"derHash":"6KfgjGL0C3iqD3Asx6b38M4L/ghgnSI0mJDDpYs//20=","subject":"CN=CrossTrust OV CA1,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBMQ==","whitelist":false,"attachment":{"hash":"0f7649880bfb97b342488531ab9f62e71f04e868a7191e8ae54b03b2526a7b31","size":1475,"filename":"qCy2EaMHB8FwmEDmszuH-bVZvMg1fSM10j8JL_PqoF8=.pem","location":"security-state-staging/intermediates/b797cd73-20ba-443a-a101-20abc2160b1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qCy2EaMHB8FwmEDmszuH+bVZvMg1fSM10j8JL/PqoF8=","crlite_enrolled":false,"id":"10c4381f-23c3-44d1-a6f7-2707055dca1d","last_modified":1576536531624},{"schema":1576536074509,"derHash":"/SmRsTTOV7+c1oaHiFSl7tXqZEMwAkUrpAOY2niEXKc=","subject":"CN=SwissSign Server Gold CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFExCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDA4IC0gRzI=","whitelist":false,"attachment":{"hash":"f15bb6ffc3798a8b4808913b8ac6cc390cb6a0a58fbd2d65caf2e689c58711c6","size":2268,"filename":"4wrJfevPFcxD_U4tiJM27RJ1g4zjbu-B3eTgC_qPxGg=.pem","location":"security-state-staging/intermediates/56bf7371-6dd1-4cf7-a321-74547c1d3616.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4wrJfevPFcxD/U4tiJM27RJ1g4zjbu+B3eTgC/qPxGg=","crlite_enrolled":false,"id":"6ea46eb8-ddab-4129-8cd8-2b50d6580b24","last_modified":1576536531598},{"schema":1576536084043,"derHash":"XbYMLWtr7PMUR3WJo6T7TM+EZJ1psLIbPWsquni9Nfs=","subject":"CN=GDCA TrustAUTH R4 Generic CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJTAjBgNVBAMMHEdEQ0EgVHJ1c3RBVVRIIFI0IEdlbmVyaWMgQ0E=","whitelist":false,"attachment":{"hash":"22066078c8b548595b3543e7f4efbc0819675c6d5799aab9f7eb51ee3085e95e","size":2056,"filename":"mXaq2dsX_TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=.pem","location":"security-state-staging/intermediates/874fedb4-3946-494c-8f65-a56d07cb81a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mXaq2dsX/TtlLffdUghF79fyMALXeMrXTTUzEgq6gv8=","crlite_enrolled":false,"id":"67740d97-16e0-48d6-9078-18385eaf1f0c","last_modified":1576536531581},{"schema":1576536100074,"derHash":"wijZPb5VNqEgrCTtk0RnutcpL4t+sgJjSxcHConF/ps=","subject":"CN=GlobalSign PersonalSign 3 CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSowKAYDVQQDEyFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"bf2a244863f255c9fd22a4c3444454a1bcccd8d89f263ecd2121ad83d9dd4cee","size":1569,"filename":"6FXSznfWYgPxKc6WahR_l3YNNCjz1qGbLp4BZInCAps=.pem","location":"security-state-staging/intermediates/41e39ce7-b2aa-4851-98bc-78caa2fa6bf2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FXSznfWYgPxKc6WahR/l3YNNCjz1qGbLp4BZInCAps=","crlite_enrolled":false,"id":"cb5f2e05-a07d-4855-b07c-6f225c2dc2da","last_modified":1576536531569},{"schema":1576536089348,"derHash":"aMGCyP43TVwJTmMllVny8HZKWJdDWD9KA+P2O3TXruo=","subject":"CN=WISeKey CertifyID Qualified G1 CA,OU=Copyright (c) 2006 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGLMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA2IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKjAoBgNVBAMTIVdJU2VLZXkgQ2VydGlmeUlEIFF1YWxpZmllZCBHMSBDQQ==","whitelist":false,"attachment":{"hash":"d121c53328227cbe05ca7fef5dd84f062e82ef7e4960906d63b965909c82c934","size":1792,"filename":"8rqHoUpCjtZnIU9Eqwsz8IZwJcJMjg593mwJBPG32DI=.pem","location":"security-state-staging/intermediates/6c5d5d70-f804-4ff4-ba96-0b7fbe2e30f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8rqHoUpCjtZnIU9Eqwsz8IZwJcJMjg593mwJBPG32DI=","crlite_enrolled":false,"id":"3687c07b-0800-4cc1-aa2b-1e6741bc3428","last_modified":1576536531556},{"schema":1576536104206,"derHash":"WpoD8tP+WJvmPNoRggqfJfB0ySA09RwEfTQibSUuwCU=","subject":"CN=emSign ECC Class 3 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAzIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"6a976c7c76045fe8433c1fea57e7ae1de19f27a18f1c7bac51939e901257ea89","size":1098,"filename":"7yfF5AdGH75Zx9ksuCGXlGlIQcXlTbPFVOh5ccaTF0o=.pem","location":"security-state-staging/intermediates/f7dc2c14-5d52-4c59-97e7-78062c62da07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7yfF5AdGH75Zx9ksuCGXlGlIQcXlTbPFVOh5ccaTF0o=","crlite_enrolled":false,"id":"0e7af0a7-8aa0-4cbb-960e-7f7436ef41ed","last_modified":1576536531553},{"schema":1576536138735,"derHash":"Uk5bOlWNX/AafEYCahS1jHfPne+6aR6sjkoX+sKjo7Y=","subject":"CN=ABB Intermediate CA 4,O=ABB","subjectDN":"MFgxEzARBgoJkiaJk/IsZAEZFgNDT00xEzARBgoJkiaJk/IsZAEZFgNBQkIxDDAKBgNVBAoTA0FCQjEeMBwGA1UEAxMVQUJCIEludGVybWVkaWF0ZSBDQSA0","whitelist":false,"attachment":{"hash":"bcf24b7da92702c711a274a90adbcc4eb31cc77e3005b0f0418c5b579b3dedbd","size":2690,"filename":"kaOrTzoe-Gh5cWt5XfatccAttrnblSCwYojFn7U0lhM=.pem","location":"security-state-staging/intermediates/914207d4-d1ef-4cdc-857d-aeea9ec81e43.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kaOrTzoe+Gh5cWt5XfatccAttrnblSCwYojFn7U0lhM=","crlite_enrolled":false,"id":"e8e0c38b-beec-4346-b2db-7c6cac67c695","last_modified":1576536531548},{"schema":1576536104947,"derHash":"dEaBgM5WS61+gSIQr3Q+hcqWy6RM9YUfoACCNBslNfU=","subject":"CN=GDCA TrustAUTH R4 DV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"7cfea5fa9465373b3b94affa9d9aab2c113c1118cc633be2b62f93987ea69fa5","size":2052,"filename":"iBHlL3zuDBffc94FLYVkQWUl8ghEY26YFGj-wm1psHY=.pem","location":"security-state-staging/intermediates/99cb19eb-1375-4867-90aa-b0b2d298c16c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iBHlL3zuDBffc94FLYVkQWUl8ghEY26YFGj+wm1psHY=","crlite_enrolled":false,"id":"66719d09-7132-4513-86df-72ef54bba5b6","last_modified":1576536531539},{"schema":1576536126868,"derHash":"928NitMwrP1MW9BaWKHPFV3gC+LJj054mb4k6AoqvL8=","subject":"CN=thawte SHA256 Code Signing CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MFExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xKzApBgNVBAMTInRoYXd0ZSBTSEEyNTYgQ29kZSBTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"8d1b6568e0c9f839594eb1d21126334c08330175fdd7aa0dd5ef87b386381f2b","size":1813,"filename":"KxgL7ZzAwOK6VyuRh0Qgl8AO3GNYmmtOAageweXe2HM=.pem","location":"security-state-staging/intermediates/6623e0a2-ca3f-42df-9aab-1ae957647958.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxgL7ZzAwOK6VyuRh0Qgl8AO3GNYmmtOAageweXe2HM=","crlite_enrolled":false,"id":"99881c4a-a35d-4f02-8c92-1bdb792da661","last_modified":1576536531530},{"schema":1576536077553,"derHash":"gQHDuvnQ7dcRgNHzfW11t3sOjPtZPTQsOjHkZ5hdSnQ=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign Primary CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGwMQswCQYDVQQGEwJQVDEqMCgGA1UECgwhRGlnaXRhbFNpZ24gQ2VydGlmaWNhZG9yYSBEaWdpdGFsMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTE+MDwGA1UEBww1R3VpbWFyYWVzIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5kaWdpdGFsc2lnbi5wdCkxHzAdBgNVBAMMFkRpZ2l0YWxTaWduIFByaW1hcnkgQ0E=","whitelist":false,"attachment":{"hash":"a83022b4b30a88628db0ac26c6a3b7fd1211de3741122d444a90773a7113a376","size":2978,"filename":"lGHa44HE2Tf2byLm_zbLjYVyWUTCuVjs85wVs0pjx_4=.pem","location":"security-state-staging/intermediates/3ebbcd56-4f53-4881-9eb6-501675f8fa48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lGHa44HE2Tf2byLm/zbLjYVyWUTCuVjs85wVs0pjx/4=","crlite_enrolled":false,"id":"7c2951dd-7bee-4774-8867-6403834d5206","last_modified":1576536531525},{"schema":1576536079076,"derHash":"20WR+Hj2Zy9bcHM6Zq18lTe5fm8K9cpJqrjsss4C+Gs=","subject":"CN=emSign ECC Class 2 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAyIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"6726d4cd8b74a9dc90a4a784c54671d69630f8fb6349c445e838be1cfccdce15","size":1098,"filename":"6nBouKNAQSAKbMyn22fCnI3dwxK0fiT4UvzcTjEMQKo=.pem","location":"security-state-staging/intermediates/e7df3325-60f1-4ee6-9ef7-fad0411247c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6nBouKNAQSAKbMyn22fCnI3dwxK0fiT4UvzcTjEMQKo=","crlite_enrolled":false,"id":"95e7d143-1acd-49b1-a78d-ad87dbf9fa68","last_modified":1576536531522},{"schema":1576536074889,"derHash":"2gr68VzTAONLUg+3ik+mjrQsRgHpObkD4LHXHfWWW/8=","subject":"CN=QuoVadis Code Signing CA G1,O=QuoVadis Limited,C=BM","subjectDN":"ME4xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSQwIgYDVQQDExtRdW9WYWRpcyBDb2RlIFNpZ25pbmcgQ0EgRzE=","whitelist":false,"attachment":{"hash":"0dc22657eb892ad49c75f643d992174fea2c22fdc850b5792b0259b076e66faa","size":2272,"filename":"VCr-eF6_xVmjgcXvq31J5dzsT0JrmClTQ6o74gj6qE8=.pem","location":"security-state-staging/intermediates/4656eb34-6036-4f00-9758-cc94462b55e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VCr+eF6/xVmjgcXvq31J5dzsT0JrmClTQ6o74gj6qE8=","crlite_enrolled":false,"id":"55cb4262-db0c-4e46-9de7-bd25df1c58d9","last_modified":1576536531519},{"schema":1576536111418,"derHash":"RZCrAULHhnEfVuh9+B6/mJGngEPNaNBwKUM/NRjsdss=","subject":"CN=WebSpace-Forum Essential CA II,O=WebSpace-Forum e.K.,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHYxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZCZXJsaW4xDzANBgNVBAcTBkJlcmxpbjEcMBoGA1UEChMTV2ViU3BhY2UtRm9ydW0gZS5LLjEnMCUGA1UEAxMeV2ViU3BhY2UtRm9ydW0gRXNzZW50aWFsIENBIElJ","whitelist":false,"attachment":{"hash":"93fcdf1909661393298dbc544f6986fede575481f68106dae6fa2e24691582ff","size":2138,"filename":"JLiByOVnWd2f8bAC0L_puQNtFwBfGt4XaQ6BRcqgrQ4=.pem","location":"security-state-staging/intermediates/1247d329-776e-42bb-8a64-e61a2c46e6e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JLiByOVnWd2f8bAC0L/puQNtFwBfGt4XaQ6BRcqgrQ4=","crlite_enrolled":false,"id":"fcf2e7fb-bc92-4de6-8e18-b79ce15100a5","last_modified":1576536531502},{"schema":1576536092777,"derHash":"dNNMp9NUf7PslV2O7+vE3PDLsK7z+XfhnFchIjxuW0M=","subject":"CN=InterCloud Code Signing Certificate CA RSA,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGHMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEzMDEGA1UEAwwqSW50ZXJDbG91ZCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGUgQ0EgUlNB","whitelist":false,"attachment":{"hash":"b6b52e4c73da45484c9e358a3b77a269cef709c7275e385f705525e41e5cd34f","size":2438,"filename":"kaEqLmvrlN2nJCNqgThzck5OGxBpaazwyCcRzxiCwdU=.pem","location":"security-state-staging/intermediates/cd8297a0-ead5-4928-9218-b14cf084fdfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kaEqLmvrlN2nJCNqgThzck5OGxBpaazwyCcRzxiCwdU=","crlite_enrolled":false,"id":"98c56f00-c9a1-49b1-8c3c-95dca890b9f9","last_modified":1576536531499},{"schema":1576536069912,"derHash":"QE5kPW7tO/z6/EnMV9bmvktt6ClxdsUZDxXgpe8R/pc=","subject":"SERIALNUMBER=A82743287,CN=AC Camerfirma Portugal - 2015,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=ES","subjectDN":"MIGrMQswCQYDVQQGEwJFUzEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxQzBBBgNVBAcMOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRkcmVzcykxJjAkBgNVBAMMHUFDIENhbWVyZmlybWEgUG9ydHVnYWwgLSAyMDE1","whitelist":false,"attachment":{"hash":"a879f554628862eeeb50ede2ef4f18fa09e2fe831a737a081bbf05239bbf32ea","size":2930,"filename":"w12hFjmf7dfqB7Th3bbHbZCxFIvO6PueH3VrEWkJdmE=.pem","location":"security-state-staging/intermediates/3f702bc9-3fdf-4d61-9947-f953f2f91225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w12hFjmf7dfqB7Th3bbHbZCxFIvO6PueH3VrEWkJdmE=","crlite_enrolled":false,"id":"d89ad2c7-c77a-4a8a-8d0a-d54c3b1492d7","last_modified":1576536531481},{"schema":1576536129511,"derHash":"9mCwwlZIHLK/xnZhweqP7uOVtxQbysNsNuBNCM2eFYI=","subject":"CN=DFN-Verein Certification Authority 2,OU=DFN-PKI,O=Verein zur Foerderung eines Deutschen Forschungsnetzes e. V.,C=DE","subjectDN":"MIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDI=","whitelist":false,"attachment":{"hash":"6a4a495a8e0a5d05743b1038d796e892b2588f6e493314ad4c9bd9091e0e5590","size":1817,"filename":"nKACHrGIK7Y2Rip247vWnOEfapF_v8H8rewd_Mzla8U=.pem","location":"security-state-staging/intermediates/97909fb6-ddc3-470e-be2b-383bf9c3f177.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nKACHrGIK7Y2Rip247vWnOEfapF/v8H8rewd/Mzla8U=","crlite_enrolled":false,"id":"3cfbb558-f1ba-418a-9513-9ebf4f15523d","last_modified":1576536531457},{"schema":1576536073722,"derHash":"fXQDQbUZP1PmdeOh47SxCV5gJQn2Wl+nV2sOOlRw+cY=","subject":"CN=GTS Y1,O=Google Trust Services LLC,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHVFMgWTE=","whitelist":false,"attachment":{"hash":"639a1475e5dc0801f220279c12f2a7afd908a3c78a3734cd6f1be16127a0c9d7","size":1906,"filename":"V7Wxjz1qgqxtHdP2QmPdLItv2zRjJ79Zl1N6X7TYHVA=.pem","location":"security-state-staging/intermediates/7190cdca-d03a-4a38-9344-112721e008fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V7Wxjz1qgqxtHdP2QmPdLItv2zRjJ79Zl1N6X7TYHVA=","crlite_enrolled":true,"id":"a7a48ed8-bb53-4eac-b5dd-e7e62ded4fd6","last_modified":1576536531429},{"schema":1576536128013,"derHash":"EercU3mxUsGpDR2+AHIsUxZbMgAx9bpGmt9ZAv2x+kU=","subject":"CN=SSL.com Code Signing Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMT8wPQYDVQQDDDZTU0wuY29tIENvZGUgU2lnbmluZyBFbnRlcnByaXNlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"09d53bf64faddcead2273649e4cb3fa12dc7c5c6b11e5b058c2da05851cfa6b0","size":2438,"filename":"-HKIj9tLIUqgEj0Y5m5tNgY4LWGaXWYKZ86BvcEzblM=.pem","location":"security-state-staging/intermediates/63a0dcc7-5d7b-4f91-b6d4-59aa5af2f7d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HKIj9tLIUqgEj0Y5m5tNgY4LWGaXWYKZ86BvcEzblM=","crlite_enrolled":false,"id":"e5ed27bc-521e-4e8c-a344-7fcf0bfa9290","last_modified":1576536531403},{"schema":1576536117580,"derHash":"pCOjNJOzGVMibflkd2J9vQVnVnBCEQAbYWH7X4KZ3Do=","subject":"CN=Government Root Certification Authority - G1.5,O=\u884c\u653f\u9662,C=TW","subjectDN":"MFoxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxNzA1BgNVBAMMLkdvdmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcxLjU=","whitelist":false,"attachment":{"hash":"bd641cbfea8a068b2460fd4b90519d206aaa857dfae47763af8e3c24467355c9","size":2296,"filename":"C-F4mFTVkarDabMlcY1XHBga4Nw59VzZ4uPejwqVOg0=.pem","location":"security-state-staging/intermediates/992aa19e-0103-45d3-bfc5-52baf8d7eab6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C+F4mFTVkarDabMlcY1XHBga4Nw59VzZ4uPejwqVOg0=","crlite_enrolled":false,"id":"a1cc2141-ced4-48dd-9b77-c0596f7d704f","last_modified":1576536531327},{"schema":1576536076791,"derHash":"BabbOJOR35LgvpP9+k2x489TkDkYuNnYWpw5bLVd8DA=","subject":"SERIALNUMBER=10688435,CN=Starfield Secure Certification Authority,OU=http://certificates.starfieldtech.com/repository,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHcMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjE5MDcGA1UECxMwaHR0cDovL2NlcnRpZmljYXRlcy5zdGFyZmllbGR0ZWNoLmNvbS9yZXBvc2l0b3J5MTEwLwYDVQQDEyhTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgxMDY4ODQzNQ==","whitelist":false,"attachment":{"hash":"37d7bba2be8f3a98a69a003482d6d53844e60252e23b914f5352656847af97ff","size":1804,"filename":"lpQNmRQZFRRQ0edfZiGPbyWU4d9K8xpa1nPJqHRoF84=.pem","location":"security-state-staging/intermediates/6300e821-542e-4fd8-affd-d5e6a763540c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lpQNmRQZFRRQ0edfZiGPbyWU4d9K8xpa1nPJqHRoF84=","crlite_enrolled":false,"id":"cad79643-368d-41c4-961a-f100b194b581","last_modified":1576536531299},{"schema":1576536109499,"derHash":"wWH1qt5A+8lyPwiS3pY9TRBAVWGmvcaacnmPkYvtGc0=","subject":"CN=GRnet SSL RSA SubCA R2,O=Greek Research and Technology Network,L=Athens,C=GR","subjectDN":"MG8xCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxLjAsBgNVBAoMJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsxHzAdBgNVBAMMFkdSbmV0IFNTTCBSU0EgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"69b971bbf7810fedfe1e5c31583714084300973264f6030e959f6e28b6f4374c","size":2861,"filename":"AC8xqpj5E7pReTXZrh3N31yqqxl7UQm0Z14O0g7xxVE=.pem","location":"security-state-staging/intermediates/d83f633b-df4f-4572-92e9-553a186319eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AC8xqpj5E7pReTXZrh3N31yqqxl7UQm0Z14O0g7xxVE=","crlite_enrolled":false,"id":"0d1c158e-15af-44d3-a9cf-1acb50435e20","last_modified":1576536531289},{"schema":1576536081735,"derHash":"5Wru6/KIBp7sLW4Ziifhn53zCRNQaM+pNUAmlD0k87E=","subject":"CN=InterCloud EV SSL Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBFViBTU0wgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"fbc3954b7d52a01d40cab42d2bc9fc08eff3e597a5d428992bb9581b7a8c94e0","size":2471,"filename":"hPLzG6Vy1gf1PMWWgLY8z_a0WyqyMoej9-buHprroIU=.pem","location":"security-state-staging/intermediates/f78a36aa-8e5c-4bf1-a835-3ab514fc45cc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hPLzG6Vy1gf1PMWWgLY8z/a0WyqyMoej9+buHprroIU=","crlite_enrolled":false,"id":"edb99a2d-ef3a-4ae0-bf49-a63992885a1e","last_modified":1576536531281},{"schema":1576536076033,"derHash":"o6/XI3XB16gzDmLVd+E1gbcjMsgGLfqc855RrmUIhYI=","subject":"CN=emSign ECC CS CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIEVDQyBDUyBDQSAtIEMz","whitelist":false,"attachment":{"hash":"e78db72b2b20a263d8c00cd39c67f567bc602deb614b1af569a52798597a55a9","size":1122,"filename":"Qh3k9ZQZLXq0iPvXe_T_63H5TS-rZeD7d7TMPYB2nDQ=.pem","location":"security-state-staging/intermediates/c11d4e0a-dc97-4886-8df9-bb636b532d84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Qh3k9ZQZLXq0iPvXe/T/63H5TS+rZeD7d7TMPYB2nDQ=","crlite_enrolled":false,"id":"0e5a0ce4-5b84-4080-a74e-7f228333f9b8","last_modified":1576536531267},{"schema":1576536126114,"derHash":"45ank0detv8VCmTWEzp+4KLHtndcvuumlbkNoB2BoEQ=","subject":"CN=Ensured Timestamping CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xIDAeBgNVBAMTF0Vuc3VyZWQgVGltZXN0YW1waW5nIENB","whitelist":false,"attachment":{"hash":"cad6a53fe8c841dabf9443dcb6b3d99b137f49b1af74207c6d31953d096f1df7","size":2389,"filename":"VgegaX7G8tbYRNCFSwpzrgTk_xEr-tyezX0fkrC6Opw=.pem","location":"security-state-staging/intermediates/a6e7795d-6715-4499-b681-96e97a4e8fc4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VgegaX7G8tbYRNCFSwpzrgTk/xEr+tyezX0fkrC6Opw=","crlite_enrolled":false,"id":"1712421f-df63-4c5b-b4ee-0359adde1aa5","last_modified":1576536531238},{"schema":1576536098501,"derHash":"7aycRZCfTex7tl8KT79qigN15Srt1m4GiI/tfj7exTc=","subject":"CN=SSL.com SSL Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNjA0BgNVBAMMLVNTTC5jb20gU1NMIEVudGVycHJpc2UgSW50ZXJtZWRpYXRlIENBIFJTQSBSMQ==","whitelist":false,"attachment":{"hash":"42a56861b5ab133e4979bc06ef0b003aa3dcaff205a11727c118fa7ddf6a0048","size":2438,"filename":"oKApNpDL2hzvB6fqN6yfWxbdoxF2lvnVZLw24c9MNWU=.pem","location":"security-state-staging/intermediates/81af418f-7a0f-4859-980a-b92c6e71ed11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oKApNpDL2hzvB6fqN6yfWxbdoxF2lvnVZLw24c9MNWU=","crlite_enrolled":false,"id":"1ffc4914-2a3d-42d2-af2c-8f6f9dfaa60c","last_modified":1576536531230},{"schema":1576536121479,"derHash":"abDdCbmPNqnMe9f/6KANzTGaX8lHycivcskolNjoEJI=","subject":"CN=emSign Class 3 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDMgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"3aa155eb8f98e023c61de4d46433bc4046b93234f688f14f6806cdbe52688ea5","size":1540,"filename":"196cBc4ZpZ-dgc2f9eiIzsTDKH1UcMUQklpeqjt81U8=.pem","location":"security-state-staging/intermediates/99544220-2852-47f5-be07-65330e576225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"196cBc4ZpZ+dgc2f9eiIzsTDKH1UcMUQklpeqjt81U8=","crlite_enrolled":false,"id":"b1870974-fb66-409f-a707-cfab57324858","last_modified":1576536531194},{"schema":1576536083268,"derHash":"itR/bXCkT6gK8PkxEl/+OnaHb/rSGaTUChPAONyF5p4=","subject":"CN=TWCA Global Root CA,OU=Root CA,O=TAIWAN-CA,C=TW","subjectDN":"MFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0E=","whitelist":false,"attachment":{"hash":"6e89794002729d6ef21257984707c517e72b2e5f2de8c602a8b0b3cdc1a90d19","size":1914,"filename":"xES1tmzl1x4bXkDyc4XJXL_SSgW1b3DKwJkvD1DDN5w=.pem","location":"security-state-staging/intermediates/9bf8c741-9386-401d-8c59-f5410390ae2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xES1tmzl1x4bXkDyc4XJXL/SSgW1b3DKwJkvD1DDN5w=","crlite_enrolled":false,"id":"954d0ac8-d979-4964-a8f1-6ae3ae761ebc","last_modified":1576536531183},{"schema":1576536078694,"derHash":"PzHbdYKNqpbk3luCoGeP4gI71bJGw/klDL9nGOEJWPU=","subject":"CN=Domain The Net Technologies Ltd CA for EV SSL R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MHIxCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMTkwNwYDVQQDDDBEb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBFViBTU0wgUjI=","whitelist":false,"attachment":{"hash":"cf5351124dd205109785f9b65c288b991342bec54071a6a24020c197870d64f5","size":2487,"filename":"Lk19AkNIC7AwHNF5HsU_phCEnUBI-eiA0mbFhxxeQsQ=.pem","location":"security-state-staging/intermediates/e3c32426-ee59-4729-9b1d-1ad5faa81c2c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lk19AkNIC7AwHNF5HsU/phCEnUBI+eiA0mbFhxxeQsQ=","crlite_enrolled":false,"id":"dafe281c-5c26-4b1e-b927-70b741e43b25","last_modified":1576536531160},{"schema":1576536136786,"derHash":"VyZLgqhk26HBHvP4CruUysNmBmKwwi9XH/mTs/vPdvs=","subject":"CN=GlobalSign R6 RSA EV SSL CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIFI2IFJTQSBFViBTU0wgQ0EgMjAxOQ==","whitelist":false,"attachment":{"hash":"3b45d522dacf5c2af31738aa7c87c46d04931ff0b15b7fac7f3a0f171300c60f","size":1963,"filename":"QOolPR845HC8Ff4855uLdJUjLioapW8oSD6M_yIMFwA=.pem","location":"security-state-staging/intermediates/8742ca82-49c0-4222-b980-771286d11f78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QOolPR845HC8Ff4855uLdJUjLioapW8oSD6M/yIMFwA=","crlite_enrolled":true,"id":"ce348e68-e297-4df6-86a7-02c8ed110b86","last_modified":1576536531157},{"schema":1576536106491,"derHash":"fb38a9RGPU4iR5vaTkqXP1islIRdsL+GwPaes9cZaRo=","subject":"CN=Entrust Certificate Authority - VMC1,OU=See www.entrust.net/legal-terms+OU=(c) 2018 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG5MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTggRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS0wKwYDVQQDEyRFbnRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIFZNQzE=","whitelist":false,"attachment":{"hash":"bb02397873f2c4d4ce4d00db9eb18931f8ed1d39d0b0013faf79e12d252bbf17","size":1845,"filename":"ccMHyN2s134FoF3tjZvYF97dSeZrfgLvt_bx5e-ZL6c=.pem","location":"security-state-staging/intermediates/3e0427b3-ebac-48e1-b923-b2775b46dba3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ccMHyN2s134FoF3tjZvYF97dSeZrfgLvt/bx5e+ZL6c=","crlite_enrolled":true,"id":"3817f2f2-2578-409e-ad5f-fe770e6cea9e","last_modified":1576536531128},{"schema":1576536084822,"derHash":"OrzpUwGd8lge2sq1i+jhQ/5pCn+Twow3PCB2J/gYJk4=","subject":"CN=University of Piraeus CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEkMCIGA1UEAxMbVW5pdmVyc2l0eSBvZiBQaXJhZXVzIENBIFIx","whitelist":false,"attachment":{"hash":"ba3408ac68d16d056b4d13b99108fdd4576e2f22a9d9433b1760f7042dff9c1e","size":2690,"filename":"2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=.pem","location":"security-state-staging/intermediates/2d1416fb-780b-4826-b492-392b31a4d840.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2SDXGPdNzKQhI4oHjk5oMhN0ay9cD5oHXhHLGzJftiI=","crlite_enrolled":true,"id":"512ea919-32ec-46b7-bb60-30d517367583","last_modified":1576536531112},{"schema":1576536070287,"derHash":"BbMLP8RPhXUzS9gS75+opSp1dD4ZvDWlvjkS7KYsRmk=","subject":"CN=emSign Class 2 CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEfMB0GA1UEAxMWZW1TaWduIENsYXNzIDIgQ0EgLSBDMQ==","whitelist":false,"attachment":{"hash":"9e607bd9110b39c805c7004ad3bfc08fe04b920a7b93635f51bf863efcf5e402","size":1540,"filename":"wS3fnwn6I-0aX-URrvRiO7hPWPjTnhX4ui6vAkztOls=.pem","location":"security-state-staging/intermediates/090d486e-d557-4442-bccd-17e9440798f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wS3fnwn6I+0aX+URrvRiO7hPWPjTnhX4ui6vAkztOls=","crlite_enrolled":false,"id":"2938bfef-51d8-4a22-8411-49848fd8bfc8","last_modified":1576536531087},{"schema":1576536072203,"derHash":"yvOiKdRUWX8mKTnwfhBWg6cf3PkWRvxgoyr2s1T+Uq4=","subject":"CN=GIAG4 ECC,O=Google Trust Services LLC,C=US","subjectDN":"MEUxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMRIwEAYDVQQDEwlHSUFHNCBFQ0M=","whitelist":false,"attachment":{"hash":"d250d9ee687cf9e4246b82644cb5630d09a6b047ffbc09e2710c262db5258086","size":1033,"filename":"BZc_5XFEr4iNHxqv9J30g896n5jT5IJLYZJnXyqUkIU=.pem","location":"security-state-staging/intermediates/0586b336-44bf-4b57-81a3-a597aa6ac696.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BZc/5XFEr4iNHxqv9J30g896n5jT5IJLYZJnXyqUkIU=","crlite_enrolled":true,"id":"6b4f13f9-70f4-409d-8480-f02c4bff0feb","last_modified":1576536531082},{"schema":1576536117185,"derHash":"JKyImXRpR4nb1OEl/uGku6kVMgVnlcBSRLtmQAqdAxY=","subject":"CN=Intel External Issuing CA 6A,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDZB","whitelist":false,"attachment":{"hash":"689c11e7ec910735efff604833048c221777eab4f3a869452217208a6496c697","size":5302,"filename":"62Bjz2wUDypDAJAdgOWO6g4Q-xvhF2S5V9Ub4WaF38c=.pem","location":"security-state-staging/intermediates/0eb0ede0-3b40-4914-b328-d867d46793d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"62Bjz2wUDypDAJAdgOWO6g4Q+xvhF2S5V9Ub4WaF38c=","crlite_enrolled":false,"id":"996fe70e-67a0-4e5f-bbb2-c6aa08b730f6","last_modified":1576536531076},{"schema":1576536109863,"derHash":"K2XkXqGBwcwhscyen7HhD1QSlDK7eJc/YIxmpBUfvw4=","subject":"CN=SwissSign Personal Gold CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFMxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLTArBgNVBAMTJFN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMDggLSBHMg==","whitelist":false,"attachment":{"hash":"598861c42588dab6e66731a8211dd284f0fd76066d4512d38abb614bf0c0fec1","size":2272,"filename":"H8wvfs1_9UKqnEqfWrRdcjdulVUeWxShhG-KY5EtdAA=.pem","location":"security-state-staging/intermediates/c3f9f87d-4c3d-46e8-a9e5-97afdf8a5d56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H8wvfs1/9UKqnEqfWrRdcjdulVUeWxShhG+KY5EtdAA=","crlite_enrolled":false,"id":"eebb6ed7-cb4d-4157-8fc3-1589b7cf744e","last_modified":1576536531073},{"schema":1576536134507,"derHash":"BMQG8UgFI5rZqnMOQEMJhCUGJjcjBPeIg8iy7sTh8Ow=","subject":"CN=CertAssure RSA EV Secure Server Certification Authority,OU=Controlled by COMODO exclusively for CertAssure Inc.,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xPTA7BgNVBAsTNENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBDZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgUlNBIEVWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"39f2469fbb8df9e31c6e1ac1d1f7adde9b94b1d93547c15a7bca015ee52b5be9","size":2284,"filename":"V-duof7YTC0BUw__nveYUxHnrma4qFXZJSOkbo7nmLA=.pem","location":"security-state-staging/intermediates/a6f51c91-d5c9-404f-a32f-c53011a17dcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V+duof7YTC0BUw//nveYUxHnrma4qFXZJSOkbo7nmLA=","crlite_enrolled":false,"id":"a2fccee2-f622-4d53-8bcc-821725ef9be7","last_modified":1576536531041},{"schema":1576536138351,"derHash":"z/m1TQAiAQAbZbHrdHSkXNGWV0DLrWqpMTxgovUo4Pc=","subject":"CN=InterCloud Code Signing Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGKMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzE2MDQGA1UEAwwtSW50ZXJDbG91ZCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"9e1ed4fa952f2f9b9a4fe771769f7256c676f3e12d757b982fdd175a6ede8bf3","size":2450,"filename":"yAZPLkv0qbo69hAf_tCw5gCcLyL1r_oksv9mX_yQPm4=.pem","location":"security-state-staging/intermediates/0f6e2365-6b15-47d3-96f2-37104310baf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yAZPLkv0qbo69hAf/tCw5gCcLyL1r/oksv9mX/yQPm4=","crlite_enrolled":false,"id":"d9ef7752-6373-47eb-8368-7254d44bc48d","last_modified":1576536531038},{"schema":1576536088599,"derHash":"k7KBvYHYPPmGZZ3/0K9XmTuS5uRhQWJTn3UFJM4Ru8s=","subject":"CN=Abitab SSL Extended Validation,OU=IDdigital,O=Abitab S.A.,C=UY","subjectDN":"MGAxCzAJBgNVBAYTAlVZMRQwEgYDVQQKDAtBYml0YWIgUy5BLjESMBAGA1UECwwJSURkaWdpdGFsMScwJQYDVQQDDB5BYml0YWIgU1NMIEV4dGVuZGVkIFZhbGlkYXRpb24=","whitelist":false,"attachment":{"hash":"a994aaf2225099f989467d317d95162a61ab0f2a8b48927a953540b65a87fe3e","size":1703,"filename":"y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=.pem","location":"security-state-staging/intermediates/972694b4-ca85-44f1-91f0-7e0a868a3149.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y2KaAsU1VfJfWRQYPeq3HVxO1GVrwSw4xGq7rSJtyII=","crlite_enrolled":false,"id":"04ee2b55-620a-4d2e-a4c7-00b5c73ec962","last_modified":1576536531027},{"schema":1576536117970,"derHash":"IqBmaJrJHHl9lwFGsLwTjhcDudqrpIFl/SVheSy3ApI=","subject":"CN=Ensured Root CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MG4xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xGDAWBgNVBAMTD0Vuc3VyZWQgUm9vdCBDQQ==","whitelist":false,"attachment":{"hash":"58c6b3f9590beaac8c847b51838c79979c51e03d2e6837c39bec42dd614f1bbb","size":2499,"filename":"oFFz-dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=.pem","location":"security-state-staging/intermediates/35e9d30a-5e67-4eb9-9300-626da1a8a5ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oFFz+dNXVxF2ZtWXUXfFMl3bcWWlI43L4JLhIemPN3w=","crlite_enrolled":false,"id":"b9b47555-b6c5-4ee0-a493-eddd58344aa5","last_modified":1576536531021},{"schema":1576536120269,"derHash":"cKsPoVhs3K9hbpRorYiZV9uIsvpRMmDVv7TXGGJLyas=","subject":"CN=InterCloud Client Certificate CA ECC R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgRUNDIFIz","whitelist":false,"attachment":{"hash":"15381690ccb8715220ee0f2d1bd5f129abc513efd4d1b81be9011a5cc970a66c","size":1313,"filename":"FAxGAbOZXGp0v7CYE5tx-qSnEMhHxrej_VYYc0sM8lM=.pem","location":"security-state-staging/intermediates/e5d3b545-57b5-48bb-b906-dee6c7d31674.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FAxGAbOZXGp0v7CYE5tx+qSnEMhHxrej/VYYc0sM8lM=","crlite_enrolled":false,"id":"7963f1dc-116f-42ab-9528-718e02a7037c","last_modified":1576536530984},{"schema":1576536095441,"derHash":"+tLphknxxgYVD1UmnrwDWuoi/6wTHeZLppAMddhEe34=","subject":"CN=emSign ECC Class 1 CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEjMCEGA1UEAxMaZW1TaWduIEVDQyBDbGFzcyAxIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"c516b0ad97b1477bff6c92128e355bb9684dfe454d1ed7edc1e2a015ab934271","size":1098,"filename":"EqlTjvAcH3DgHiMTTQZXlA45Cyry_ZcvmeEoRmnEl5k=.pem","location":"security-state-staging/intermediates/e0fbcccb-8a1c-4bef-bbd6-b6e85d8aa2bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EqlTjvAcH3DgHiMTTQZXlA45Cyry/ZcvmeEoRmnEl5k=","crlite_enrolled":false,"id":"aa27b627-8f3f-4f46-a72d-a321873e033e","last_modified":1576536530924},{"schema":1576536123465,"derHash":"n4sFE38grN6bmWQQ9NC/eXGhAG3JnglMNG0nm5PP964=","subject":"CN=Certum Trusted Network CA 2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGAMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBIDI=","whitelist":false,"attachment":{"hash":"2ed8b49464676c3582a67b99f3e5cd0dd098cf86ea3a380a08fdb723ecff73a6","size":2081,"filename":"aztX6eyI0bs9AWN_8zx2mLPJdYJV6fAeqRePPn87K1I=.pem","location":"security-state-staging/intermediates/33541c6c-eb11-48ef-a315-ad9ba3237f2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aztX6eyI0bs9AWN/8zx2mLPJdYJV6fAeqRePPn87K1I=","crlite_enrolled":false,"id":"a3bedf42-c492-4e6c-a5b0-121be9c27b82","last_modified":1576536530917},{"schema":1576536115651,"derHash":"PIsNXCrfL3CQqbj/RSpBQYM96qBbX0TpUT25S/3x1r0=","subject":"CN=DigiCert Assured ID Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ29kZSBTaWduaW5nIENBLTE=","whitelist":false,"attachment":{"hash":"e7bb74d116899e94bb94f4648506beb395c201e451b7a717b2597204d707f0da","size":2361,"filename":"RElq7qZGBSzuZ3oQFuu4t-dh5QqmqZDyU-EAqeRVfJ4=.pem","location":"security-state-staging/intermediates/00f269ef-41b3-49c1-a17f-997a67e72cc2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RElq7qZGBSzuZ3oQFuu4t+dh5QqmqZDyU+EAqeRVfJ4=","crlite_enrolled":false,"id":"5ad4c097-50a4-4cb9-96b5-464ffb534360","last_modified":1576536530901},{"schema":1576536132210,"derHash":"6j0fxryF0/KKJ5/s0nFu37JIAboKkXMdndT2HAAF3OA=","subject":"CN=InterCloud Client Certificate CA RSA,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgUlNB","whitelist":false,"attachment":{"hash":"492e0463351fa0afda4ce4b8d543ce8bd04f92b6af7eb48b1ae6e6acc0a873d7","size":2458,"filename":"bTbQPhmklBVN2-MAzB_0isQMRAbBSvu6grjyvXYmNoA=.pem","location":"security-state-staging/intermediates/e0bfc4c4-4509-4b19-b44a-520e027bb6bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bTbQPhmklBVN2+MAzB/0isQMRAbBSvu6grjyvXYmNoA=","crlite_enrolled":false,"id":"7591fdc5-75b0-4980-b1f3-1a16f824a8d2","last_modified":1576536530898},{"schema":1576536071043,"derHash":"qvJSMNAwHa37HdV2g/rSUxk15z06evkfiMIJLfZPHlU=","subject":"CN=Sectigo RSA Client Authentication and Secure Email CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPjA8BgNVBAMTNVNlY3RpZ28gUlNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"972372f27d0e8a57aebece9d4ffd182cfe091eb2da10dc63ef24fb3e99505316","size":2162,"filename":"P4e3-L27Gol5FEOf4FvS1VtqCeuUHIS2ggBLqq2iVno=.pem","location":"security-state-staging/intermediates/51e4090e-a587-4bb4-95dd-3a21896e60ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P4e3+L27Gol5FEOf4FvS1VtqCeuUHIS2ggBLqq2iVno=","crlite_enrolled":true,"id":"79b1007e-6c07-4d7e-917c-835771f2207e","last_modified":1576536530893},{"schema":1576536101197,"derHash":"n0PVLoCMIK/2ngL6rCBarGhOaXUhPWYg+sZL3l/KtLw=","subject":"CN=Starfield Root Certificate Authority - G2,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"789b9056f79d6141a6214c6b990151b3e4959ece572fb2004fd731b195d33a79","size":1662,"filename":"gI1os_q0iEpflxrOfRBVDXqVoWN3Tz7Dav_7IT--THQ=.pem","location":"security-state-staging/intermediates/f18299c6-f4da-4af4-9ec8-a8d711749b1c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gI1os/q0iEpflxrOfRBVDXqVoWN3Tz7Dav/7IT++THQ=","crlite_enrolled":false,"id":"bd0ecefd-cffd-4cd5-8a92-4ea3a0be8a89","last_modified":1576536530882},{"schema":1576536093158,"derHash":"PEa4r0DrgqOjMNjFvQfhy2FrRrHXAReeAls+aGbjyJ4=","subject":"CN=SECOM Passport for Web MH CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSUwIwYDVQQDExxTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIE1IIENB","whitelist":false,"attachment":{"hash":"1e77e83301dcd18767f1427a54e0da0cf6cfcca8d5a86931141a03a6aeeded7a","size":1630,"filename":"-WHNrFdX4L0XyuQsW7J364wRog3UU202mTVvLAgf0-Q=.pem","location":"security-state-staging/intermediates/df21fb52-0b48-4442-a551-4721b94d9185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+WHNrFdX4L0XyuQsW7J364wRog3UU202mTVvLAgf0+Q=","crlite_enrolled":false,"id":"af3b1462-5642-48da-b488-f8d9f455609b","last_modified":1576536530854},{"schema":1576536126483,"derHash":"C62pebcUAv6GBpYDLPQOnSo/Qcy10DvjP7uUqA1//Hw=","subject":"CN=emSign ECC EV CS CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGwxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSEwHwYDVQQDExhlbVNpZ24gRUNDIEVWIENTIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"ced67ca3e556805fc8dff2f88fe0a7eb2085c52e69c4487451bc0751f3fdd556","size":1171,"filename":"EJmcyHOC7lF3LeT2tA6NEeiAraOIeA9S1UYpt02xkfM=.pem","location":"security-state-staging/intermediates/cbb4de63-2aae-4252-8c82-60ec375b9f75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EJmcyHOC7lF3LeT2tA6NEeiAraOIeA9S1UYpt02xkfM=","crlite_enrolled":false,"id":"ac6b7097-8d8e-48f7-95dd-c5b3f779e44b","last_modified":1576536530846},{"schema":1576536102706,"derHash":"+BMqOx0ZAlxebrPBt2tTRljBGlvmkETp1ER7V5Rju0U=","subject":"CN=SecureCore RSA EV CA,OU=Controlled by COMODO exclusively for SecureCore,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MIGbMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFT1NBS0ExDjAMBgNVBAcTBU9TQUtBMRMwEQYDVQQKEwpTZWN1cmVDb3JlMTgwNgYDVQQLEy9Db250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgU2VjdXJlQ29yZTEdMBsGA1UEAxMUU2VjdXJlQ29yZSBSU0EgRVYgQ0E=","whitelist":false,"attachment":{"hash":"5c3979464fc2a18f34c71294f923f114dd13022b37f77d094c13eeaebc622af7","size":2227,"filename":"4oLlji5ovjgkWA95bS8h_Ik9hO3Fy_mgx1aM3Jv7Bn0=.pem","location":"security-state-staging/intermediates/3b845211-4906-4376-af9c-f6badae8bcae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4oLlji5ovjgkWA95bS8h/Ik9hO3Fy/mgx1aM3Jv7Bn0=","crlite_enrolled":false,"id":"ee5c06bc-0408-4c89-9c71-e4c6f1e26161","last_modified":1576536530832},{"schema":1576536077934,"derHash":"FFEKshf93SD6POLxcVg6RMXFP2ytCIa60Kkc+2ZmMtg=","subject":"CN=Fuji Xerox Xnet CA - S,O=Fuji Xerox,C=JP","subjectDN":"MEMxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR8wHQYDVQQDExZGdWppIFhlcm94IFhuZXQgQ0EgLSBT","whitelist":false,"attachment":{"hash":"57dab81e035f1e449c6b003fbfe4285e15046b4a31eb117a8b448089a24297e2","size":1597,"filename":"gAO3JhjiAz1Zf0po-cZL3EE5-B8ldkQ96CMkLA6pwic=.pem","location":"security-state-staging/intermediates/e24ff5fa-e62b-4eda-8e09-f1f1ba2a144f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gAO3JhjiAz1Zf0po+cZL3EE5+B8ldkQ96CMkLA6pwic=","crlite_enrolled":false,"id":"6f18cf19-a326-40aa-92df-d8dd2db7b375","last_modified":1576536530823},{"schema":1576536102337,"derHash":"gAQlY9tfFi5FVjK1icYBUPN+9/7bd0xtwu1bpvuGUSA=","subject":"CN=Fuji Xerox Product CA - S,O=Fuji Xerox,C=JP","subjectDN":"MEYxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSIwIAYDVQQDExlGdWppIFhlcm94IFByb2R1Y3QgQ0EgLSBT","whitelist":false,"attachment":{"hash":"2bd8c47808af695a6613fd3fda43e5e89156aa141086ccc13c4c478f1db0e222","size":1601,"filename":"cC-MmfQjJ6-hHwnk1ddR_Ki1Ompz1JMISw5dkaAcWHU=.pem","location":"security-state-staging/intermediates/6d9a5767-2099-402d-afb9-4293160f950e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cC+MmfQjJ6+hHwnk1ddR/Ki1Ompz1JMISw5dkaAcWHU=","crlite_enrolled":false,"id":"be853ae0-909e-4510-9fd8-ad6fb1bf7e15","last_modified":1576536530792},{"schema":1576536082122,"derHash":"V8B4jlHXvRRHDPnk830z+8EEx3UB69lXFm0U9ExRbDA=","subject":"CN=eMudhra RSA Organization Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGbMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPTA7BgNVBAMTNGVNdWRocmEgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"1dc5009b8a187d80f4c2d4b64c686bc21f7c5271889d102e7e57b598f0844b51","size":2190,"filename":"D9NZ6oWac3feaXj7Ii5NCfiL5RG3s0UIV08ecGxPgtc=.pem","location":"security-state-staging/intermediates/86678ec4-fa06-4337-ae60-af7ccb4a876d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D9NZ6oWac3feaXj7Ii5NCfiL5RG3s0UIV08ecGxPgtc=","crlite_enrolled":true,"id":"141d5b09-0e83-42ba-ae07-12fff6f057fe","last_modified":1576536530789},{"schema":1576536090496,"derHash":"tm0ozXDm0bMhaI4cR+Y8Q8dqxQMSkJ1OMNePCLLtYFo=","subject":"CN=Gehirn Managed Certification Authority - RSA OV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBPVg==","whitelist":false,"attachment":{"hash":"cc9bd6f9b4c416502e6664e834588afc8e552cabdfcd1da1a05bb57e4a8d208b","size":2158,"filename":"sshJv9IEWk4-_PzdkseeN0rxfdOaGYVax8sZbKeQegY=.pem","location":"security-state-staging/intermediates/1164b7bb-5691-4323-ad2c-7fdcd5cc1406.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sshJv9IEWk4+/PzdkseeN0rxfdOaGYVax8sZbKeQegY=","crlite_enrolled":false,"id":"070c5338-70b0-43f6-af7a-47b4b217d8b6","last_modified":1576536530783},{"schema":1576536082901,"derHash":"cGag9C9TDg21r+5yo7BN5hTn0jBcZ9EsdWuyFeN8uXU=","subject":"CN=emSign ECC Class 3 CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG4xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSMwIQYDVQQDExplbVNpZ24gRUNDIENsYXNzIDMgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"a70534399006c5c9656d36fab666a70380eef9fb1048307630726609ee92f9e0","size":1146,"filename":"jCaXOAfJZSEcZ2svKHJ5NTIJpwnQiYsnkj_rOSON6UU=.pem","location":"security-state-staging/intermediates/87469897-2f9a-45ba-aabb-01e0de7e07a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jCaXOAfJZSEcZ2svKHJ5NTIJpwnQiYsnkj/rOSON6UU=","crlite_enrolled":false,"id":"a029188c-564e-4bac-988a-0d1d88ede978","last_modified":1576536530747},{"schema":1576536079836,"derHash":"dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=","subject":"CN=NetLock K\u00f6zjegyz\u0151i (Class A) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz","whitelist":false,"attachment":{"hash":"4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d","size":2190,"filename":"RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem","location":"security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=","crlite_enrolled":false,"id":"a76d3004-9787-484d-a4d9-2e5555cd8b56","last_modified":1576536530731},{"schema":1576536091651,"derHash":"t8br3CobZe8YNtwAJQxE4VcDEhBSwatrnQOFoFgVOuM=","subject":"CN=TERENA Code Signing CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIENvZGUgU2lnbmluZyBDQSAz","whitelist":false,"attachment":{"hash":"9595df35a7756d2f24d866de1c547105fb2d1a23c92599127ec1619cec0e5882","size":1829,"filename":"USGSmlpkcecWrLB5M3IEvxRSpeUQQE1OwxGf996ZYQc=.pem","location":"security-state-staging/intermediates/7b8f4903-0cfd-41f6-bf07-2c11090076ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"USGSmlpkcecWrLB5M3IEvxRSpeUQQE1OwxGf996ZYQc=","crlite_enrolled":false,"id":"93337ced-e601-42f7-8544-8ca9911b970e","last_modified":1576536530728},{"schema":1576536137180,"derHash":"18DvgKPaxNpcfpU8YlVVlmlZ3KkxIvInKIUL6q8XQa8=","subject":"CN=InterCloud Ventures CA for ClientCert RSA,O=InterCloud Ventures Inc,C=SC","subjectDN":"MGMxCzAJBgNVBAYTAlNDMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEyMDAGA1UEAwwpSW50ZXJDbG91ZCBWZW50dXJlcyBDQSBmb3IgQ2xpZW50Q2VydCBSU0E=","whitelist":false,"attachment":{"hash":"1a61b2027ba9e04f54ba2c1975baba6a7302e88dad005b69309298f28dcbb069","size":2418,"filename":"DVzxlQQTcDaxRb7Thp47SkJtXlhSGa2iHgnSPgAIcKY=.pem","location":"security-state-staging/intermediates/8798e2e6-3fd7-4fe3-9d33-05761fe4f040.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DVzxlQQTcDaxRb7Thp47SkJtXlhSGa2iHgnSPgAIcKY=","crlite_enrolled":false,"id":"b868818e-a798-4e90-a5b7-9df711eb98fb","last_modified":1576536530720},{"schema":1576536129132,"derHash":"AH0sixV4YjK6wOqjH2Cq4G3FcpIbrQ1Gx3EH2MLcpLM=","subject":"CN=DigiCert High Assurance Code Signing CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMjAwBgNVBAMTKURpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENvZGUgU2lnbmluZyBDQS0x","whitelist":false,"attachment":{"hash":"82dca5587e213be35931a42824ef1b9490aed5a1516174a65dd432e88de10d4b","size":2402,"filename":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=.pem","location":"security-state-staging/intermediates/547f9b3e-e076-4477-b8bb-03322f731f5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ri51OBAOoLg9jnSXfa68LI5ByJkcEGrPLItVgWCXEi0=","crlite_enrolled":false,"id":"9653732b-f401-488c-af29-94e5348433f1","last_modified":1576536530696},{"schema":1576536073348,"derHash":"IBwGF8wzEMfyn8vka1dFm8Z4aouidTAY6yfB6AAWii4=","subject":"SERIALNUMBER=A82743287,CN=GLOBAL CORPORATE SERVER,O=AC Camerfirma S.A.,L=Madrid (see current address at www.camerfirma.com/address),C=ES","subjectDN":"MIGlMQswCQYDVQQGEwJFUzFDMEEGA1UEBww6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxIDAeBgNVBAMMF0dMT0JBTCBDT1JQT1JBVEUgU0VSVkVS","whitelist":false,"attachment":{"hash":"793fb09204775121a36d94490bb1db8fac7223f956e39839e78312ddbc396881","size":2918,"filename":"cm983EKKIFObkQXG4Px6wK6fhcnGoOnGmpdiszhdgnc=.pem","location":"security-state-staging/intermediates/92d9580d-4cd2-40d0-b184-d1288a6e9346.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cm983EKKIFObkQXG4Px6wK6fhcnGoOnGmpdiszhdgnc=","crlite_enrolled":false,"id":"ca7f15aa-576e-4c11-b2ff-ab17d8fc59e4","last_modified":1576536530670},{"schema":1576536116411,"derHash":"Y6g2ncgkpCvHrm7l0mqv0y30r2d8oYuUG3pX4zseNVk=","subject":"CN=emSign Class 2 CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGoxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR8wHQYDVQQDExZlbVNpZ24gQ2xhc3MgMiBDQSAtIEcx","whitelist":false,"attachment":{"hash":"eed8ae8522e552261846735911703422edcda86f9319535078afc6d728d2a768","size":1585,"filename":"3bEiK1EHsF_yyH5kHV9snYO-hS_ijijvRBCS1wrrAuc=.pem","location":"security-state-staging/intermediates/d8c04dd9-2d2c-4510-a92e-286b8f977661.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3bEiK1EHsF/yyH5kHV9snYO+hS/ijijvRBCS1wrrAuc=","crlite_enrolled":false,"id":"26f75550-6f7c-4915-a0c5-6ce0fc78a16b","last_modified":1576536530666},{"schema":1576536103822,"derHash":"oEpRS7gRTAPLa9uYFyNgzwvmgun6EdXYBnMJztEVGHI=","subject":"CN=InterCloud Client Certificate CA RSA R3,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGEMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEwMC4GA1UEAwwnSW50ZXJDbG91ZCBDbGllbnQgQ2VydGlmaWNhdGUgQ0EgUlNBIFIz","whitelist":false,"attachment":{"hash":"d2ef1ad672c2124bb41aa28b4a68e4170c1d21b11ba0de3bce99cfad4c2d6ea4","size":2475,"filename":"RU7z7Sf2d5WOjWnAl8q-nWTzHsG_NR5njeswcm4xFwU=.pem","location":"security-state-staging/intermediates/49e4a997-d0fd-423c-bc13-8792ddab3f48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RU7z7Sf2d5WOjWnAl8q+nWTzHsG/NR5njeswcm4xFwU=","crlite_enrolled":false,"id":"8404d0aa-3718-4f57-ba78-f9cc2e58060e","last_modified":1576536530599},{"schema":1576536112949,"derHash":"EdXvRg2rNYK3QhIxJxJ9VAQPscIG4m8CXLWEWPIlERo=","subject":"CN=HARICA SSL ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGGMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEgMB4GA1UEAwwXSEFSSUNBIFNTTCBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"90ccc75b0a6ae9b340199fa07f14417de52268b581d41473e2ece14b411f9423","size":1370,"filename":"nYO5UGTgmkq1Vf1wcAVPqg8McgUqLIhjZ8R8zTDqvQI=.pem","location":"security-state-staging/intermediates/937e41c4-b81a-4546-a469-03b67c321ff2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nYO5UGTgmkq1Vf1wcAVPqg8McgUqLIhjZ8R8zTDqvQI=","crlite_enrolled":true,"id":"03d21865-516a-4a83-bbed-64f440fbc75e","last_modified":1576536530589},{"schema":1576536134890,"derHash":"2OGKZa94RUhUyqKPsvXnm1fsFB8BBCO8yKcav8BJbCw=","subject":"CN=GENIOUS RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"dc505a925299ceeea43e708019d0fb1086a320d0a035fb0cf585b7e376d7e4f6","size":2304,"filename":"ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=.pem","location":"security-state-staging/intermediates/ae100f8d-c411-4912-908b-ef0fe59832c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=","crlite_enrolled":false,"id":"51c58311-bdec-4aab-a6cb-4a4f8e10e262","last_modified":1576536530584},{"schema":1576536110295,"derHash":"kK8R5XfHLJQLQOwvPVBQcxAJHuYZbJwWsiiIImSk2Ag=","subject":"CN=GeoTrust SSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"49be8c4efb07895b3f53c063b0bdc42ec090d8ac6a5a50f4736bdd2382107b65","size":1569,"filename":"reIKrQPC-mmj-0OSUhJW0gQmUxXSm2O3N3bhso_ENzs=.pem","location":"security-state-staging/intermediates/739c1736-bb09-4fcb-a77b-16a00919c4aa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"reIKrQPC+mmj+0OSUhJW0gQmUxXSm2O3N3bhso/ENzs=","crlite_enrolled":false,"id":"39fd6999-98ad-4452-91c5-c5d5b9161f71","last_modified":1576536530579},{"schema":1576536133765,"derHash":"1I6qVcMuSUMaUxmHdr7HGeXDNZ2Mte5AYBbBhIFdBCk=","subject":"CN=UIS-IntB-CA","subjectDN":"MBYxFDASBgNVBAMTC1VJUy1JbnRCLUNB","whitelist":false,"attachment":{"hash":"de24f135c7bca2cfda41bd1611ddc001fad23d8819325dec4bf6e386b932447e","size":1711,"filename":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh-Hk3l6PItp34=.pem","location":"security-state-staging/intermediates/12455f4c-5005-4b7d-99a6-4f1d40b5c5b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ijOSli4ZzEAaB9BJofum10hbmy0ANTh+Hk3l6PItp34=","crlite_enrolled":false,"id":"bfc29d7b-32c1-4544-908c-31f1a7428c70","last_modified":1576536530571},{"schema":1576536082514,"derHash":"UZEcAlmKOaJFWUp4F2j5UDxUaz7tsbcmGv4PpDbjN08=","subject":"CN=InCommon RSA Code Signing CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMSUwIwYDVQQDExxJbkNvbW1vbiBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"719dda28e517227192940bf007a71318f0a32088f45d10ea1d875d6e8f7672fc","size":2113,"filename":"4tLfAbj1F8M2w2h5CGAbNDdfguBIooQNoy7lajKrCZc=.pem","location":"security-state-staging/intermediates/043a58d3-97e0-428f-8f70-1cbb17254c84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4tLfAbj1F8M2w2h5CGAbNDdfguBIooQNoy7lajKrCZc=","crlite_enrolled":false,"id":"556b9e93-5a6e-4158-a233-de0b8973e7c4","last_modified":1576536530558},{"schema":1562108705166,"derHash":"SVfe00EFRkETnLqzuWAGVF0JTUSVkPsIrpp40FpAvYM=","subject":"CN=LAWtrust2048 CA2,O=LAWtrust,C=ZA","subjectDN":"MDsxCzAJBgNVBAYTAlpBMREwDwYDVQQKEwhMQVd0cnVzdDEZMBcGA1UEAxMQTEFXdHJ1c3QyMDQ4IENBMg==","whitelist":false,"attachment":{"hash":"81d17bc1193286f68eb9189a96132eec7b01b9df70c5c0c8be545b723a8b9c97","size":1825,"filename":"tF23S1M73lGV_qIXyJDgt7QyCjnORfV2T1KQKOCPDnY=.pem","location":"security-state-staging/intermediates/c78792ca-adea-456a-8b5d-5e8ff14b0cd2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tF23S1M73lGV/qIXyJDgt7QyCjnORfV2T1KQKOCPDnY=","crlite_enrolled":false,"id":"211f757d-d852-4415-81e8-e7707c0574e6","last_modified":1562108762611},{"schema":1562108592560,"derHash":"GR4LSLeLfvpIIqRlrWmzRAW4eNEL2FPY5Xy4udnlC4s=","subject":"CN=Trust Technologies Global CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT","subjectDN":"MIGPMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxJTAjBgNVBAMTHFRydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ0E=","whitelist":false,"attachment":{"hash":"564c57bdee05db70d390e6bcb2f79dd54852bdaa6b303ee4de5c564d29d262a2","size":1683,"filename":"kCvviSGuWkulE1Rv-GhY_fjUuT622_2qjrGk96XfS6A=.pem","location":"security-state-staging/intermediates/a8b72e50-2b9d-4f2e-be8d-f11ffd8c9f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kCvviSGuWkulE1Rv+GhY/fjUuT622/2qjrGk96XfS6A=","crlite_enrolled":true,"id":"5c03ce12-486e-4b06-811e-bb3df097bbb5","last_modified":1562108593320},{"schema":1562108591793,"derHash":"cdLuTdolHZJE9858bUeOxVLUJO9xnwK3EDDyghtryFM=","subject":"CN=emSign ECC Time stamping CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEpMCcGA1UEAxMgZW1TaWduIEVDQyBUaW1lIHN0YW1waW5nIENBIC0gQzM=","whitelist":false,"attachment":{"hash":"ee2704d9b62a381d492b93995f8499745a688f458d3d292b4698475ed59f68c3","size":1134,"filename":"dcrqDFOyJxfpksjz9CO_ISerP6wmX7VYiV8TT8U2I8I=.pem","location":"security-state-staging/intermediates/3b0e96f2-8f14-48a7-bd67-cf26d4d5fabe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dcrqDFOyJxfpksjz9CO/ISerP6wmX7VYiV8TT8U2I8I=","crlite_enrolled":false,"id":"a64f2de2-3dce-4c3e-be2c-670cf9edd067","last_modified":1562108592552},{"schema":1562108591033,"derHash":"pKfQXyloVnnjwAoyLOa2zVf92l8u9CxsbnNYHIpHEHc=","subject":"CN=Trusted Secure ECC Certificate Authority DV,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTE0MDIGA1UEAxMrVHJ1c3RlZCBTZWN1cmUgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eSBEVg==","whitelist":false,"attachment":{"hash":"a2edd0806e645f467b7b84c89a97ef301a4be56527999553d91e8ed132b3063b","size":1333,"filename":"qaGgP6zdlL_vHNs7F1JoC4tyJv8eGtwjguHkPQZ2HYg=.pem","location":"security-state-staging/intermediates/00575f53-f32f-4c7d-8588-1006e713455a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qaGgP6zdlL/vHNs7F1JoC4tyJv8eGtwjguHkPQZ2HYg=","crlite_enrolled":false,"id":"bb1af08a-d563-4c13-b15f-03b3860103a2","last_modified":1562108591785},{"schema":1562108590272,"derHash":"Oyffndk8ESqgiwYqauOXP355pRkdfpuV1wgXgODWrOo=","subject":"CN=certSIGN Enterprise CA Class 3 G2,OU=certSIGN Enterprise CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHgxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEqMCgGA1UECxMhY2VydFNJR04gRW50ZXJwcmlzZSBDQSBDbGFzcyAzIEcyMSowKAYDVQQDEyFjZXJ0U0lHTiBFbnRlcnByaXNlIENBIENsYXNzIDMgRzI=","whitelist":false,"attachment":{"hash":"b4245e3bdf682d3b5991b85df5dc0d5234efbfa10c3e6191331eafc4de6d44b3","size":1638,"filename":"NgZU2Z5HKX3Ynzv2v13QXVNlTGQrS2rrCCv2W4gJn_o=.pem","location":"security-state-staging/intermediates/50534563-bc40-4117-a35e-c5f2825173e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NgZU2Z5HKX3Ynzv2v13QXVNlTGQrS2rrCCv2W4gJn/o=","crlite_enrolled":true,"id":"44fdaa59-55ab-4b5a-9584-878de01ee51f","last_modified":1562108591025},{"schema":1562108589509,"derHash":"X2ZcusweNxceqD6oXFcPmGHK93usiIarxLsZs2mMCUo=","subject":"CN=DigiCert Governmental Direct CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEdvdmVybm1lbnRhbCBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"75cddcda9026b56305335b2fdbe4d7f15d3018e1a8d4ece32129f4dc33a90ca6","size":2109,"filename":"6TqJ4tJCAmwNBt54ibBuljs7KG-F8NTbgZ5U4gcrbnk=.pem","location":"security-state-staging/intermediates/74ab5016-866c-42c7-ba70-6936c7c09121.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6TqJ4tJCAmwNBt54ibBuljs7KG+F8NTbgZ5U4gcrbnk=","crlite_enrolled":false,"id":"93219782-f847-4e1d-a437-b056f1a40b47","last_modified":1562108590264},{"schema":1562108587986,"derHash":"vsBvVTRMPeTxLNXYCJBs3idSNJUb4BdqeH5ijivn1R8=","subject":"CN=GDCA TrustAUTH R4 Extended Validation CodeSigning CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MIGAMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpR1VBTkcgRE9ORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkgQ08uLExURC4xPTA7BgNVBAMMNEdEQ0EgVHJ1c3RBVVRIIFI0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZVNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"504b1a2b2ef9230c71054bc7a026d1827d3f8d8b714b5492dc42264973ecb432","size":2105,"filename":"K1O1P19UCSRwBq2Y5xce7r_TavF-pDYjmdSYRVYHFXI=.pem","location":"security-state-staging/intermediates/292a44cc-36e5-4678-b2da-b286cf71965d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K1O1P19UCSRwBq2Y5xce7r/TavF+pDYjmdSYRVYHFXI=","crlite_enrolled":false,"id":"08dade63-03e8-4738-af5e-1139634ccf0f","last_modified":1562108588742},{"schema":1562108586421,"derHash":"XN2AnPRPX4Zl6sFQVVBMWwa3h6wYKUUFvbq0p35Q13Y=","subject":"CN=GlobalSign PersonalSign 2 RSA CA SHA 384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIFJTQSBDQSBTSEEgMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"5b298699387d70fa85da876e97c713c9b5f9d078e4f99d1aa8d2b372b1b2635c","size":2458,"filename":"qrYYY1IgVc8P6057Z-sQtrV3gsdG77COpxcpk5ExuDQ=.pem","location":"security-state-staging/intermediates/bb0e1ae1-8c37-4a42-9ca5-f39d3c77b419.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qrYYY1IgVc8P6057Z+sQtrV3gsdG77COpxcpk5ExuDQ=","crlite_enrolled":false,"id":"68e18044-c154-4952-88f5-513ffe55be79","last_modified":1562108587216},{"schema":1562108584875,"derHash":"aTBkc0LACuYloDhnMICQOmpUMaGPrmRAOuufSoOCibQ=","subject":"CN=COMODO ECC Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIEVDQyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"e6b81f970e0aebdf005be203087db76baba49f82e43eebe6ce07930d859c3a12","size":1305,"filename":"ztEQWck30AphjrV693Uu-2ykUUMpLPaPTr3q8O6AbrA=.pem","location":"security-state-staging/intermediates/e1042655-8614-4230-91ec-d6a21ec4ad1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ztEQWck30AphjrV693Uu+2ykUUMpLPaPTr3q8O6AbrA=","crlite_enrolled":false,"id":"e22721ff-a0b1-47e9-b5b6-7c3c74b2432b","last_modified":1562108585623},{"schema":1562108584121,"derHash":"8AMiyXtXzqbWSmodNlxsa38OujCJh2wUMOEGPoqCpnY=","subject":"CN=UbiquiTLS\u2122 DV RSA Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAwwdVWJpcXVpVExT4oSiIERWIFJTQSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"34402ac995c9387b9c9835b6d19bbf5f738839e57491436e8fb9d880eabb284d","size":2129,"filename":"4FOjiY6IYxhWCosn04P8_UB9mAXrdVXjkoJw0SF4xqM=.pem","location":"security-state-staging/intermediates/8314b196-222a-4ea4-b73e-05d946a6b0f3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4FOjiY6IYxhWCosn04P8/UB9mAXrdVXjkoJw0SF4xqM=","crlite_enrolled":false,"id":"6a542733-c365-45a6-88e1-581fbf55eea9","last_modified":1562108584867},{"schema":1562108583348,"derHash":"jPY11qdHdQzxND6WNqptpBWMfOCbIG0Qgzuv5eTuBLM=","subject":"SERIALNUMBER=201905,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA1","whitelist":false,"attachment":{"hash":"e20bc7cc8f53ffc223962f9bd966b021032bdfadb38bba1b518d8a4b5473fc84","size":2333,"filename":"STwxc4DljeWjithRB7fUiXJ-Av3LzSL1RArniQiNF8Y=.pem","location":"security-state-staging/intermediates/702560cb-abeb-40ac-8efe-9be95e6e64dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"STwxc4DljeWjithRB7fUiXJ+Av3LzSL1RArniQiNF8Y=","crlite_enrolled":false,"id":"8ed0efa3-f0d7-42e8-a20a-cf5d56da716b","last_modified":1562108584113},{"schema":1562108578013,"derHash":"cqNKwrQkrtP2sLBHVbiMwCfczIBv3bIrTNfEd3OXPsA=","subject":"CN=Sectigo RSA Organization Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGVMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPTA7BgNVBAMTNFNlY3RpZ28gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"8b4a6a5a2f7b4562478f11cef6a2950d91dc8f9f63844b556396576c712a7556","size":2174,"filename":"RkhWTcfJAQN_YxOR12VkPo-PhmIoSfWd_JVkg44einY=.pem","location":"security-state-staging/intermediates/a5de32a1-0075-4479-b9c7-902f76532ee6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RkhWTcfJAQN/YxOR12VkPo+PhmIoSfWd/JVkg44einY=","crlite_enrolled":true,"id":"3137331f-d637-4d45-a845-5baf38ea0ae4","last_modified":1562108578764},{"schema":1562108576476,"derHash":"z8tgwfAYDGjj6l0ktKBenZkA2Hw9g9UDzhaQs8FlZFg=","subject":"CN=Qualified e-Szigno QCP CA 2012,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHlF1YWxpZmllZCBlLVN6aWdubyBRQ1AgQ0EgMjAxMjEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"0918a8dff15d27cbb4e8b360eb83374b19fa2947fb8fabb2c8200569d2b9b5ca","size":1780,"filename":"xa1dpEOu-k1shciGkpd-djS0kvHJPOmnvqja-16S2o0=.pem","location":"security-state-staging/intermediates/edcd1fb2-b2cf-4e62-a12a-5ba7788690ad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xa1dpEOu+k1shciGkpd+djS0kvHJPOmnvqja+16S2o0=","crlite_enrolled":false,"id":"0f39cd6a-43ef-4feb-8856-6d300edaa87c","last_modified":1562108577246},{"schema":1562108574941,"derHash":"ksdI7NEnrmBVsYCEZPO7ETzFGuAHNZGzaB7FJ8YXzIA=","subject":"CN=cPanel\\, Inc. Certification Authority 2,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMS8wLQYDVQQDEyZjUGFuZWwsIEluYy4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"78d6f3be5c00899b98ae15d4fa3abf96f1139ea90f126dddc735831fa0309e49","size":2138,"filename":"HVDLzoiDeh9hx-Qx4o0Fjy44bVZy8Qv7zwbUSS7r4dQ=.pem","location":"security-state-staging/intermediates/8e628e92-767a-4b9c-9320-e85932918fc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HVDLzoiDeh9hx+Qx4o0Fjy44bVZy8Qv7zwbUSS7r4dQ=","crlite_enrolled":false,"id":"dcd0fd78-79ac-4a9e-9cff-563f4bf1ce79","last_modified":1562108575720},{"schema":1562108568778,"derHash":"vmoNnh0RXyKT9qvxGz7I6ILiRCbu6wmqpQNZeZPneiU=","subject":"CN=TERENA SSL High Assurance CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHMxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEnMCUGA1UEAxMeVEVSRU5BIFNTTCBIaWdoIEFzc3VyYW5jZSBDQSAz","whitelist":false,"attachment":{"hash":"effd0b7540a7b55bbbeb9e6a80bcdbd3b388bcd57d806539c76f81519c9d7595","size":1752,"filename":"XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx-hQBmJ54WmCs=.pem","location":"security-state-staging/intermediates/1bbb351c-9d45-49c1-b318-f589af9d1196.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XaQOs7GKv4Gx4JRA8ZmihabSl9wxIPx+hQBmJ54WmCs=","crlite_enrolled":true,"id":"181cc0ed-5e29-45f4-8d8a-642c6de7cd5e","last_modified":1562108569549},{"schema":1562108568021,"derHash":"93zhWdOIjqK8w13UZHLO2MwzAH4NpsiROc06Jw2JADM=","subject":"CN=JPRS Organization Validation Authority - G1,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"92d9886b691320b334b799e6516c3dd2b5983372bd2bcc7f08fc2d333da9d9c1","size":1654,"filename":"L5ieGJdPRxC_98J-9PhsO1f9uxRZOzwq8bdfg4akGmk=.pem","location":"security-state-staging/intermediates/e7a0f9c3-8c87-4bc7-9d6f-14e84b6a4cac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L5ieGJdPRxC/98J+9PhsO1f9uxRZOzwq8bdfg4akGmk=","crlite_enrolled":true,"id":"462bd0e2-8618-4ee3-9643-5aae497bb252","last_modified":1562108568770},{"schema":1562108567270,"derHash":"HcpluGpXM2ulr7chSjb31u3mmOtPAzh8s61rvTqTurY=","subject":"CN=AlphaSSL CA - G2,O=AlphaSSL","subjectDN":"MC4xETAPBgNVBAoTCEFscGhhU1NMMRkwFwYDVQQDExBBbHBoYVNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3a19247e72c0620bdf6ef309d6d8385eabd2ef9e5c5b61ab6fd98d4878db9492","size":1512,"filename":"yxgiWGK--SFB9ySwt3M3qpn5HO0ZLFY5D-h-G_vcT_c=.pem","location":"security-state-staging/intermediates/9bc85edc-cae8-4042-b29e-895b1be37f71.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yxgiWGK++SFB9ySwt3M3qpn5HO0ZLFY5D+h+G/vcT/c=","crlite_enrolled":false,"id":"86b16dc2-9cb9-4271-acfe-4a80959ea5ea","last_modified":1562108568014},{"schema":1562108564189,"derHash":"XO2pkfE2Rtcy3832wQtjallx9FSxBxcswDtb7k0pBrs=","subject":"CN=Fuji Xerox Xnet CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSAwHgYDVQQDExdGdWppIFhlcm94IFhuZXQgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"3f6deb7e20788638c3fd1a97de5a5390c10da49774515d8e6f3c11da176731a6","size":1483,"filename":"SWBebvlsLulUhE9tf8Z1RbIcTJY-kLhXO_sAB63M6tA=.pem","location":"security-state-staging/intermediates/89038819-ab40-47c3-ab8e-f9fba8ab86a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWBebvlsLulUhE9tf8Z1RbIcTJY+kLhXO/sAB63M6tA=","crlite_enrolled":false,"id":"ef301980-b77f-412d-8a81-1db73953b696","last_modified":1562108564939},{"schema":1562108561881,"derHash":"KWyeU1fJwfIekGSjENG389qNEN7Eq96nw3K7TDdbm74=","subject":"SERIALNUMBER=201814,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE0","whitelist":false,"attachment":{"hash":"fc14a5e8664374b8b9e73e78f636f520ad6627705388366008910d6dad4e0aea","size":2333,"filename":"YZlVjG_9bo_7G1Ld_UML44gp8CBlrnAhNWrF-z8r_Uk=.pem","location":"security-state-staging/intermediates/f34b8e30-671d-497f-a7a4-9c1fd484d573.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZlVjG/9bo/7G1Ld/UML44gp8CBlrnAhNWrF+z8r/Uk=","crlite_enrolled":false,"id":"6d13d21e-c95b-4e10-bca3-e345c83ad59e","last_modified":1562108562629},{"schema":1562108558832,"derHash":"xKhCQ0rbUoCVJrbR6GmiZfU1tpuxZFSjAWZ8yUJnjVg=","subject":"CN=North Carolina Health Information Exchange CA,OU=Orion Health Direct Secure Messaging,O=North Carolina Health Information Exchange,C=US","subjectDN":"MIGpMQswCQYDVQQGEwJVUzEzMDEGA1UEChMqTm9ydGggQ2Fyb2xpbmEgSGVhbHRoIEluZm9ybWF0aW9uIEV4Y2hhbmdlMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxNjA0BgNVBAMTLU5vcnRoIENhcm9saW5hIEhlYWx0aCBJbmZvcm1hdGlvbiBFeGNoYW5nZSBDQQ==","whitelist":false,"attachment":{"hash":"033ec8c8c6591c333e976876a9b2dd85541a10a3a81cce7795dd6b11a2ff26db","size":2373,"filename":"sKMwLCLBC5txNEjL5HsQSJ1AllsHjsrcGecmnUBdJ_8=.pem","location":"security-state-staging/intermediates/abc29b05-2731-4492-a337-a40ee72b26ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sKMwLCLBC5txNEjL5HsQSJ1AllsHjsrcGecmnUBdJ/8=","crlite_enrolled":false,"id":"b56d935b-ae8c-4513-81f9-94e429220804","last_modified":1562108559596},{"schema":1562108558073,"derHash":"vxyw4hPY08cLrolCn8Ft4sdPdVlj0bm0iL0CYNvJG5w=","subject":"CN=DigiCert Baltimore CA-1 G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0xIEcy","whitelist":false,"attachment":{"hash":"8c3b20ef21e5a0850702c5b36f4116d9340de8e2ea3746b1051c95ee4a4615ff","size":1581,"filename":"EppRiUi9P-L8-u3LNh2t2P4La8TbSH4Xh_DCYKPwqts=.pem","location":"security-state-staging/intermediates/bbbed6f4-b330-448c-a685-127194973cd5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EppRiUi9P+L8+u3LNh2t2P4La8TbSH4Xh/DCYKPwqts=","crlite_enrolled":false,"id":"23c18ab5-afb4-4915-9211-0b1bc495e783","last_modified":1562108558823},{"schema":1562108557320,"derHash":"CSgpQz0jGUn0qbxmbL9Us6on1768oEjXXlkJPhWnLqU=","subject":"CN=TeliaSonera Class 2 CA v2,O=TeliaSonera,C=SE","subjectDN":"MEcxCzAJBgNVBAYTAlNFMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgQ2xhc3MgMiBDQSB2Mg==","whitelist":false,"attachment":{"hash":"a3a1b4dfa388dfe0d25ab5674cfaeaf78ef03e5364e2cd9de1328b58f2a891b3","size":2528,"filename":"lqMfOTYct9rMx_Y2LpHI8aZt9xgWHX_TwLLQ51NQl04=.pem","location":"security-state-staging/intermediates/d6d3711a-b7d2-4f85-a846-aca44739e149.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lqMfOTYct9rMx/Y2LpHI8aZt9xgWHX/TwLLQ51NQl04=","crlite_enrolled":false,"id":"0edb2d0c-78d4-4869-9399-77844e0f7698","last_modified":1562108558066},{"schema":1562108553418,"derHash":"BqV9HNWHn7ohNWEN2NclzCaNKm3opGPUJMS52omEhpY=","subject":"CN=MULTICERT SSL Certification Authority 001,OU=Certification Authority,O=MULTICERT - Servi\u00e7os de Certifica\u00e7\u00e3o Electr\u00f3nica S.A.,C=PT","subjectDN":"MIGnMQswCQYDVQQGEwJQVDFCMEAGA1UECgw5TVVMVElDRVJUIC0gU2VydmnDp29zIGRlIENlcnRpZmljYcOnw6NvIEVsZWN0csOzbmljYSBTLkEuMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEyMDAGA1UEAwwpTVVMVElDRVJUIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAwMDE=","whitelist":false,"attachment":{"hash":"a4edffa6966beade48281eb732dd7be86742b1a9c74b4388c4d184c5f3707d9f","size":2970,"filename":"yxq9jBkkvQNgcVw-gq6-E8-0_Z-HVCg1PJ12mz_Ot1M=.pem","location":"security-state-staging/intermediates/9af4dc8b-5d79-4fe4-91a7-1f528e522c34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yxq9jBkkvQNgcVw+gq6+E8+0/Z+HVCg1PJ12mz/Ot1M=","crlite_enrolled":true,"id":"82333ba7-d875-4700-9521-e3450b26f275","last_modified":1562108554178},{"schema":1562108547322,"derHash":"0YY7VaBinzKl2thn0C3x0aRVCyOsQitTWB555Uj9Zhc=","subject":"CN=COMODO RSA Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE3MDUGA1UEAxMuQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"37c8cc316edcb62d120bb0cdb7f6d376a41995100929c1faae633cc5bbd5db9b","size":2186,"filename":"o0YMd50JaO9KHQa59-yeJR7mqkmBME4Yb2KrDeMsVpo=.pem","location":"security-state-staging/intermediates/638df8c9-7c2c-43c8-aa37-e137759f5495.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o0YMd50JaO9KHQa59+yeJR7mqkmBME4Yb2KrDeMsVpo=","crlite_enrolled":false,"id":"41915ab2-d4a7-472f-9c9c-1aa184245482","last_modified":1562108548066},{"schema":1562108546547,"derHash":"snRdCptx2UjzTpIa9Z80Kt9uQH2IvFHTisUrWDoOvRU=","subject":"CN=Symantec Class 3 EV SSL SGC CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEsMCoGA1UEAxMjU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgU0dDIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"87eaf82db6f5848ee292c8bbd616cd095dc400e5299454872db01db7b0ce908f","size":1930,"filename":"RpiK7rBfp_gM93kpBie2lazUf8UesNcTJ-aL6W-Q06M=.pem","location":"security-state-staging/intermediates/634c9f70-8695-4f35-ab1c-be88bffa111f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RpiK7rBfp/gM93kpBie2lazUf8UesNcTJ+aL6W+Q06M=","crlite_enrolled":false,"id":"7ec41ffd-3b17-4b9b-ae03-cf4034674eda","last_modified":1562108547314},{"schema":1562108543508,"derHash":"kuN3Cx60T4TC8ssAl8L9cSa9IStBwmEOeN39iUZ2Fzg=","subject":"CN=Cybertrust Japan ECC EV CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEjMCEGA1UEAxMaQ3liZXJ0cnVzdCBKYXBhbiBFQ0MgRVYgQ0E=","whitelist":false,"attachment":{"hash":"f1536ae14b59510b0a578ef86b18c2742aeecff181da96be873249c707dce9a0","size":1171,"filename":"DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz-uWIQs=.pem","location":"security-state-staging/intermediates/4177e11b-b581-4577-a6bf-acb75730661d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DR7QtcOJm6feIAao37U2Se9iaEVNLbTu7mKFz+uWIQs=","crlite_enrolled":false,"id":"0792354e-832d-44b5-86f7-9d8759ed1b08","last_modified":1562108544257},{"schema":1562108542761,"derHash":"4Yz41SmRiHUrFvPjw82Gc2GQRuLxueCI2rXTEWrqYb0=","subject":"CN=TrustAsia RSA Secure Client and Email CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHoxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjExMC8GA1UEAxMoVHJ1c3RBc2lhIFJTQSBTZWN1cmUgQ2xpZW50IGFuZCBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"7385ded00c38eddd52d86a832caf6912d588fab55cfa476313cc762a9ee84eeb","size":2133,"filename":"rtkg6RrvnlbQH5J_vZPqsgnI9zzjiHs9IjqKSD9m6wA=.pem","location":"security-state-staging/intermediates/9e0c407a-c81b-4c6c-afca-584b65500eab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rtkg6RrvnlbQH5J/vZPqsgnI9zzjiHs9IjqKSD9m6wA=","crlite_enrolled":false,"id":"aebb965c-2a24-466b-a16b-3c0dae236232","last_modified":1562108543500},{"schema":1562108539744,"derHash":"qXyhN1uRlT5TalVHawrERMcIapUeSQo6PRNjChn0DNQ=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"6aaaa07d5c201417999a0e22e73d6ede06b3ae7309353301a6d321d172316983","size":1703,"filename":"bqhl3DAHcc4Kg-bxpYCIoIh4Tjx38mrpuN4vD6gDaHY=.pem","location":"security-state-staging/intermediates/a7eca8e3-d4e8-42fd-97a7-7b7589b511a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bqhl3DAHcc4Kg+bxpYCIoIh4Tjx38mrpuN4vD6gDaHY=","crlite_enrolled":false,"id":"53671fd7-9e3a-4f0c-a8fb-99fc788cacba","last_modified":1562108540486},{"schema":1562108538966,"derHash":"OYmjFwLp5qlIXzySp30hsYUsf2ci8j1EuMvnKpJuyFQ=","subject":"CN=Trustico ECC DV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIEVDQyBEViBDQQ==","whitelist":false,"attachment":{"hash":"8b1dd84a5acfc99c935c7937a7a736233a80c299b2fa9f230d20070f92594aa8","size":1272,"filename":"siFWwL8GHh0KXgWfKS8Gt9laNL7edvX8IB7dl6zLe-o=.pem","location":"security-state-staging/intermediates/d1d2f9ef-7d30-4f5a-a80c-8f0414545ab3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"siFWwL8GHh0KXgWfKS8Gt9laNL7edvX8IB7dl6zLe+o=","crlite_enrolled":false,"id":"7a3a1349-6283-418e-8d1b-090ce11da3f7","last_modified":1562108539733},{"schema":1562108538217,"derHash":"BXRs6sgws4RAWrc81iOd5Czp9IdVPvP6iwoGTleSaDw=","subject":"CN=WISeKey CertifyID Policy GA CA 1,O=WISeKey,C=CH","subjectDN":"MEoxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSkwJwYDVQQDEyBXSVNlS2V5IENlcnRpZnlJRCBQb2xpY3kgR0EgQ0EgMQ==","whitelist":false,"attachment":{"hash":"2a6ff225010bbc9464e5d31c320657c525c3f0a392977f50123d28559f13fa21","size":1804,"filename":"xfM0VsUhSI6vKknRncbTW9di7pj0_a_oYa-o46JnDHQ=.pem","location":"security-state-staging/intermediates/d62ddced-fc46-4718-bdce-87c1b2f05042.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xfM0VsUhSI6vKknRncbTW9di7pj0/a/oYa+o46JnDHQ=","crlite_enrolled":false,"id":"82dadb91-864a-43ad-a206-42c281b95f08","last_modified":1562108538958},{"schema":1562108535152,"derHash":"SOJsWQSXTWoi5EL66IoqQYKQ4AY3uJhyChPyFDrNjrY=","subject":"SERIALNUMBER=201805,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDU=","whitelist":false,"attachment":{"hash":"ea45f8bf2666fc6e58e70aeda7b9ff6120dfa479bad56c7031ba318d09590473","size":2337,"filename":"0kb6t7LFkL6D6CBvoNnXYZ6COh6vj_xxmWb-ywmnExU=.pem","location":"security-state-staging/intermediates/4a069aba-7636-41cb-85d9-b37bfbf913c3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0kb6t7LFkL6D6CBvoNnXYZ6COh6vj/xxmWb+ywmnExU=","crlite_enrolled":false,"id":"5ff661bc-0b12-45ef-9197-4095d0f03d00","last_modified":1562108535892},{"schema":1562108532768,"derHash":"4M5cTvXSGGlj0rBK3kYSu694fhYEiltGj3Nnd2w6A94=","subject":"CN=GlobalSign ECC HV S/MIME CA 1,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQyBIViBTL01JTUUgQ0EgMQ==","whitelist":false,"attachment":{"hash":"f7b7f1d2226533661c96045673837ee5eb504e816404882aa7cab4d769be6ab2","size":1154,"filename":"pAR30VcYn-nY7bGwPT-4qhHggma7QWdsp1QPL8x_YMk=.pem","location":"security-state-staging/intermediates/90d68223-dc0d-417b-82e9-fc789af959ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pAR30VcYn+nY7bGwPT+4qhHggma7QWdsp1QPL8x/YMk=","crlite_enrolled":false,"id":"5ae5ab8e-6ce3-43fb-8540-fb4edf7170b7","last_modified":1562108533536},{"schema":1562108532023,"derHash":"9XCaLS9otTv29kW7F4rflTRvif2lxjv94IBComSSqrI=","subject":"CN=GlobalSign Qualified CA 1,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAx","whitelist":false,"attachment":{"hash":"babdcd192e71c8b4c902d934518dcdf6ade0f8849accbf5f4b2633dbc59ae640","size":2109,"filename":"JLSkiSNPvaX8_Ng2Eq17tQJcAp2P6PnM2B-Ojyo8nYg=.pem","location":"security-state-staging/intermediates/56b7b3ba-16d7-43e7-9144-0bd4054c8b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JLSkiSNPvaX8/Ng2Eq17tQJcAp2P6PnM2B+Ojyo8nYg=","crlite_enrolled":false,"id":"842bb917-00d1-4d4d-b1dc-1cc655bce329","last_modified":1562108532760},{"schema":1562108529754,"derHash":"Elpf18ZA1eWfXOV2PNjJMvXll93cTq8dWWZ89LVWojc=","subject":"CN=USERTrust RSA Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"094e42381d9f1d18441d7220fac73d64fd68198174b849e5d674adb912d6ccec","size":2174,"filename":"8E_u4IJLStWPqhVEn4td_2Ae6WYCii1AmJC2dgTCj1s=.pem","location":"security-state-staging/intermediates/307f6f1b-9a38-4046-97d3-4d36958e0f86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8E/u4IJLStWPqhVEn4td/2Ae6WYCii1AmJC2dgTCj1s=","crlite_enrolled":true,"id":"49f70812-6671-41b7-a5d2-73cdf9cea32f","last_modified":1562108530510},{"schema":1562108525881,"derHash":"NXVUztPEm6E93VWlaCYptvzirPxFGasr4Es6hgGlny8=","subject":"CN=HARICA Qualified Natural Entities SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAxMqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"bc6e90f6d202ea8d62cd470c2ea31d41ed599f457738d82b87cdab0e3a3a439f","size":2438,"filename":"c5tJhzRUh_mULK82PkMvvJo7eF3WcNRab2OwHVToIzo=.pem","location":"security-state-staging/intermediates/8793bf9d-751b-47d1-8043-947b65b5b2fa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c5tJhzRUh/mULK82PkMvvJo7eF3WcNRab2OwHVToIzo=","crlite_enrolled":false,"id":"ed4c1bcb-36d5-4f02-98c1-028cbb6c8eee","last_modified":1562108526678},{"schema":1562108524365,"derHash":"NcC4pXfRHJS6Zl4kLeRdZodSKlMeORu02ZXSYfOCmrc=","subject":"CN=certSIGN CA Class 2 G2,OU=certSIGN CA Class 2 G2,O=certSIGN,C=RO","subjectDN":"MGIxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEfMB0GA1UECxMWY2VydFNJR04gQ0EgQ2xhc3MgMiBHMjEfMB0GA1UEAxMWY2VydFNJR04gQ0EgQ2xhc3MgMiBHMg==","whitelist":false,"attachment":{"hash":"df0ec1a6797109126df83a75e016edf4ec5eae8f6a58946debcf2ddee8cf2524","size":1609,"filename":"noYGcVGJvDlxvfPLFE31WgvXSwkoZGrfCEpsm_L3qt4=.pem","location":"security-state-staging/intermediates/e03925b7-c8a0-4286-aa06-57ae5c110937.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"noYGcVGJvDlxvfPLFE31WgvXSwkoZGrfCEpsm/L3qt4=","crlite_enrolled":false,"id":"a0571407-53b3-407c-bbd4-0be77d0d2d3e","last_modified":1562108525121},{"schema":1562108523614,"derHash":"cBtDKsDN1NnPlbS4hMMr9cypDUTgFhq9E7k01o44BHI=","subject":"CN=GlobalSign PersonalSign 3 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAzIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"458cc82369b9a1032b78405e6806b74fd2952d39402bf697575b5d831cad259a","size":1670,"filename":"TB1kEWAFK_CTRZQanxy7YzsEBTcqSK49DqMWi8bxAek=.pem","location":"security-state-staging/intermediates/b62b5389-9e04-4c32-83bc-4bf85ed12fb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TB1kEWAFK/CTRZQanxy7YzsEBTcqSK49DqMWi8bxAek=","crlite_enrolled":false,"id":"27438f07-1327-49d9-acd2-a58622706d5c","last_modified":1562108524357},{"schema":1562108522832,"derHash":"ztQGeH82ZG2JfkaLe4tdyuEDDDp1rxybEFUUuV7G6nA=","subject":"CN=GENIOUS ECC Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0fdfe942ae38cec3fd4541c8578f5bb84c77d30b5d71964f0ddb9f5393c40ca8","size":1463,"filename":"lGB7vG_pOqUpHiqWKO7WQg8lfxBsfGVE0yulTTjMgJg=.pem","location":"security-state-staging/intermediates/2b90024e-92c3-45de-bb5a-9d61b0b7cf4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lGB7vG/pOqUpHiqWKO7WQg8lfxBsfGVE0yulTTjMgJg=","crlite_enrolled":false,"id":"c3d27779-fe8a-421f-97c2-5d4a5bee385c","last_modified":1562108523606},{"schema":1562108522078,"derHash":"MA6zIZBXi5rFeOGh0oAEIZFFaYzjtj8p3yHuTFQsCIU=","subject":"CN=WISeKey Qualified Services CA 2,OU=Copyright (c) 2013 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGJMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDEzIFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKDAmBgNVBAMTH1dJU2VLZXkgUXVhbGlmaWVkIFNlcnZpY2VzIENBIDI=","whitelist":false,"attachment":{"hash":"9807abddce6407d40c4c5529a15b7709518ba11092a254a7adc5d65af922e8d0","size":1800,"filename":"TONsHZMTU75SEOmQ_8UnWZ1dToH3MjqDXKqHFFbSot0=.pem","location":"security-state-staging/intermediates/a0e40893-99c0-437f-a615-8d710f969d3c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TONsHZMTU75SEOmQ/8UnWZ1dToH3MjqDXKqHFFbSot0=","crlite_enrolled":false,"id":"0a716af8-e441-4f96-a8d7-aff6571d96e0","last_modified":1562108522824},{"schema":1562108521318,"derHash":"YA6XYBsLvF8FbwTu9nHvWA8qhYPG0tP61AG52CCqiDY=","subject":"CN=Valid Certificadora Digital SSL OV CA 2018,OU=VALID SSL OV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIE9WMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgT1YgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"c4a550d79bb2b71f8c0928d49e7c96a982b4c362b1b8092cbbb975ca5e51df26","size":1886,"filename":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD-PwRf3XtFUUtLw=.pem","location":"security-state-staging/intermediates/1d251274-286b-4c35-be80-189120f190ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOlpcVGqLfZfl2rK7MdW2Ff6TMhVD+PwRf3XtFUUtLw=","crlite_enrolled":true,"id":"a9c8bb82-a5e4-41bd-9be3-20842827e5bc","last_modified":1562108522070},{"schema":1562108518267,"derHash":"2NOC430vk4Eao9lA7vTG7qR7s7pQJxqL8ujCTN05PFY=","subject":"CN=SSL.com EV Code Signing Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"002fe1bcd61684d28427eba68ab1788bba7ded78e7dfbd283510a07be6c4fc4e","size":2511,"filename":"F9hW0k1yFI5zXeeLFdAPTsm--My7hmT-Wp09KwmK0Ic=.pem","location":"security-state-staging/intermediates/2e1d37e8-d5e8-4de3-b2d8-2b3181322a9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F9hW0k1yFI5zXeeLFdAPTsm++My7hmT+Wp09KwmK0Ic=","crlite_enrolled":false,"id":"f78ed066-8405-4a9e-a213-031511e661b5","last_modified":1562108519012},{"schema":1562108517488,"derHash":"z25rgsmXy1zBpVBmr19gyqx3WU6xBvtNSYvFDs3rijo=","subject":"CN=Beame.io CA 2,O=Beame.io Ltd,L=Tel Aviv-Jaffa,ST=Tel Aviv,C=IL","subjectDN":"MGgxCzAJBgNVBAYTAklMMREwDwYDVQQIEwhUZWwgQXZpdjEXMBUGA1UEBxMOVGVsIEF2aXYtSmFmZmExFTATBgNVBAoTDEJlYW1lLmlvIEx0ZDEWMBQGA1UEAxMNQmVhbWUuaW8gQ0EgMg==","whitelist":false,"attachment":{"hash":"0a359e91716bb249722632341e4f85f71d631e20e2ff0ee6379d782c54961a3c","size":1800,"filename":"9MtJhPjYwOW02TcCqan-4J_RHNT32dQraMIk0Pbgtsw=.pem","location":"security-state-staging/intermediates/ed0044e8-a7b6-4b07-ac80-b80f5eae9913.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9MtJhPjYwOW02TcCqan+4J/RHNT32dQraMIk0Pbgtsw=","crlite_enrolled":false,"id":"2cc06889-bf33-4a96-9d85-f0e243c76990","last_modified":1562108518259},{"schema":1562108515960,"derHash":"C4ljPxIvdYIZUK4n4LrdQNSbtQ8Msbde5PRmKs5Ms9g=","subject":"CN=Technological Educational Institute of Western Greece CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRlIG9mIFdlc3Rlcm4gR3JlZWNlIENBIFIx","whitelist":false,"attachment":{"hash":"d72696baad4643eb2d91dc268912327ed7fb5884f5fece72129c12a63a001e02","size":3328,"filename":"UHwj56cjJKum0BUjKMff1Ap3nL75-poJyKuT3GJwRPk=.pem","location":"security-state-staging/intermediates/c2e8bc36-2a68-4e45-84df-07e79a971076.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UHwj56cjJKum0BUjKMff1Ap3nL75+poJyKuT3GJwRPk=","crlite_enrolled":true,"id":"e7d5456b-323b-464b-9a57-3595df77606b","last_modified":1562108516718},{"schema":1562108515200,"derHash":"Ze7AzGyXDMHNc2WRFdyNkE5vEubcj9Tdo51UyzAiR4A=","subject":"CN=GlobalSign Organization Validated ECC CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMT8wPQYDVQQDEzZHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgRUNDIENBIC0gU0hBMjU2IC0gRzQ=","whitelist":false,"attachment":{"hash":"865c9143e047b0121c8b2a402263e27dd9fbbd276406fe62b420613e3e28edda","size":1394,"filename":"4Xv9MflABt7Iaf_CjuYWBVtq_uG5yZJdQ3s5VSjCGoM=.pem","location":"security-state-staging/intermediates/cb10ff6b-2fd7-4bd4-b66d-314238afca50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Xv9MflABt7Iaf/CjuYWBVtq/uG5yZJdQ3s5VSjCGoM=","crlite_enrolled":false,"id":"d1ef766b-9934-4f69-b604-dcdd7cc578aa","last_modified":1562108515952},{"schema":1562108513681,"derHash":"JJvmXwx6sP47dkizDODrPPaRQCxy2stAzxRinGA8ujY=","subject":"CN=BlackCert\\, Inc. RSA DV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBSU0EgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"d44215866949fb5ebbd47bf41f766c1cbccb5645c0bcc8ba38d8fb1bf6079e0d","size":2154,"filename":"dnTrbfgvJOGlJse4RxYg30jhwWfQfKyNYkL6SpGs_1I=.pem","location":"security-state-staging/intermediates/8b6b285b-820a-4bb9-95a5-2caace235136.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dnTrbfgvJOGlJse4RxYg30jhwWfQfKyNYkL6SpGs/1I=","crlite_enrolled":false,"id":"bc7c0580-5018-49e7-9009-b95e7f33663f","last_modified":1562108514431},{"schema":1562108511407,"derHash":"qV8jtSrxCJWIb7ZTI9KamHbqfTlvgF5MooDVYcJuPa0=","subject":"CN=Certyfikat SSL,O=home.pl S.A.,C=PL","subjectDN":"MD0xCzAJBgNVBAYTAlBMMRUwEwYDVQQKDAxob21lLnBsIFMuQS4xFzAVBgNVBAMMDkNlcnR5ZmlrYXQgU1NM","whitelist":false,"attachment":{"hash":"45a923fe0feea027c9100ec2d0aa873a99af0b2acd334a796bd4d4b8399213b0","size":1565,"filename":"5PJ4jB1sjJ5kx3a0Ds2noJPc07ZOb_y1vR1tN1t5FsQ=.pem","location":"security-state-staging/intermediates/907a7262-b883-4896-bb78-a84247ab3ab1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5PJ4jB1sjJ5kx3a0Ds2noJPc07ZOb/y1vR1tN1t5FsQ=","crlite_enrolled":true,"id":"2c153960-0405-4d5f-8576-a05ed26e5b62","last_modified":1562108512178},{"schema":1562108509878,"derHash":"Yelzden22pgv9cGeL5TmbE41toN847kU0iRcf19lgl8=","subject":"CN=Sectigo ECC Domain Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGPMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"4d1b7deaa365566deaed85adb3c7b35bb377cf800b13c07a8ae1e78b76e74645","size":1329,"filename":"6YBE8kK4d5J1qu1wEjyoKqzEIvyRY5HyM_NB2wKdcZo=.pem","location":"security-state-staging/intermediates/6cf98cdf-f1ba-4bfe-9130-5511f8e29381.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6YBE8kK4d5J1qu1wEjyoKqzEIvyRY5HyM/NB2wKdcZo=","crlite_enrolled":false,"id":"b57ef74e-655f-4231-a30d-f2cfe2066f04","last_modified":1562108510628},{"schema":1562108509119,"derHash":"TWP4dHqWgPgYgrYtD6mTwzWB0xTFtZb6Nz35Kyxl1P8=","subject":"CN=HARICA Client Authentication ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEyMDAGA1UEAwwpSEFSSUNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"32fe726d359401c573765c4caa155f44aeac7ff0db07e6c99717c13fd4d7a82f","size":1382,"filename":"RkjJ3_AfR7WnTEAv46GxRy7Zz598VYGQ238SwVsbHEc=.pem","location":"security-state-staging/intermediates/70f65e99-e8b2-48ee-bf42-4801c36cb68d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RkjJ3/AfR7WnTEAv46GxRy7Zz598VYGQ238SwVsbHEc=","crlite_enrolled":false,"id":"7048b675-56a5-4d07-87e6-3c72293658a5","last_modified":1562108509869},{"schema":1562108508335,"derHash":"XYHQqjR29IpaZ11tPmq3Zr3IqhZ6GpTXnfkbQlEIL6Q=","subject":"CN=Symantec Class 3 Managed PKI Administrator CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxOzA5BgNVBAMTMlN5bWFudGVjIENsYXNzIDMgTWFuYWdlZCBQS0kgQWRtaW5pc3RyYXRvciBDQSAtIEc0","whitelist":false,"attachment":{"hash":"a2a98936c029075a8a6b565f8abca868b55374cab948eec361bad48dc9d73bd0","size":2162,"filename":"uIRohYy30h0StjFaVDICGnRrRRAkdbt9s-ofq2uF76o=.pem","location":"security-state-staging/intermediates/b173c1dc-300c-45c7-823f-87a260239e8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uIRohYy30h0StjFaVDICGnRrRRAkdbt9s+ofq2uF76o=","crlite_enrolled":false,"id":"713b1d86-1417-4497-a763-6c7a9a07b477","last_modified":1562108509111},{"schema":1562108503735,"derHash":"OP32JQfO3uFrFFXpa9I9XG9sVlTWjH47JyONLHN0SoY=","subject":"CN=DigiCert Extended Validation CG CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0cgQ0E=","whitelist":false,"attachment":{"hash":"a8bdae9244ca24b0d8b09a70bc032e9b5362540edd5a59cdeccad12958d1c5d5","size":1585,"filename":"eXcE_FEH8E-PslVO5TCIbyP752KLqMYODNwbD-LCR-E=.pem","location":"security-state-staging/intermediates/12975646-7816-4709-882d-0143bf1a5283.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eXcE/FEH8E+PslVO5TCIbyP752KLqMYODNwbD+LCR+E=","crlite_enrolled":false,"id":"9f5c8ac4-b008-49c0-b9bc-863426c26d90","last_modified":1562108504480},{"schema":1562108502976,"derHash":"7bc1PhgR5fN4UcYgz8fUWugoiZ6wV35P53Z0yGjcuJA=","subject":"CN=BlackCert\\, Inc. RSA Codesigning Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMUAwPgYDVQQDEzdCbGFja0NlcnQsIEluYy4gUlNBIENvZGVzaWduaW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"83e714d2ebb72b6cd5797087fdeaa549882b84d809b88d45d29814a2953cf6e7","size":2138,"filename":"E7ZaNnwy2IYB-cbZdmFmsDqLQpBsyfd8D0Wla2IcsN0=.pem","location":"security-state-staging/intermediates/0945ea41-2704-48b4-b317-eefbc1b38066.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E7ZaNnwy2IYB+cbZdmFmsDqLQpBsyfd8D0Wla2IcsN0=","crlite_enrolled":false,"id":"957cbb11-8361-4b15-b3eb-c82267f47a38","last_modified":1562108503727},{"schema":1562108499185,"derHash":"VBrwGZYXYO8Z6PtBNObUMIW15eCH8wGX3EKyCX4QSH4=","subject":"CN=DigiCert High Assurance EV CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTE=","whitelist":false,"attachment":{"hash":"cee9a5df6d83eab591096fe1d9a6f43cc80dad8b8a159436b567f21161cbc901","size":2450,"filename":"suo4a3Sz765--hurzLhgwqwpR8K0KVkwTarqwwCDJB4=.pem","location":"security-state-staging/intermediates/b9c4edc6-247c-4b69-b0a5-a85ec816d3f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"suo4a3Sz765++hurzLhgwqwpR8K0KVkwTarqwwCDJB4=","crlite_enrolled":false,"id":"ac2d44fb-7f7c-4ba9-91ea-9fb4a5225f72","last_modified":1562108499932},{"schema":1562108498428,"derHash":"E0qWmWjHDkdlE7N7AT2ME4whEEZpta1i1NX6sWhpueo=","subject":"CN=WISeKey CertifyID Standard Services CA 2,OU=Copyright (c) 2012 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDEyIFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIFN0YW5kYXJkIFNlcnZpY2VzIENBIDI=","whitelist":false,"attachment":{"hash":"e48e0619d7002605f182e4ca2eb951af933322592b7bf6ada875554550da1467","size":1813,"filename":"d_Kor69hknpIfroNumzs6NkLxxCUNhMn46dzck_SZSQ=.pem","location":"security-state-staging/intermediates/abde4617-8fc5-4d49-8840-cd067fafc1be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d/Kor69hknpIfroNumzs6NkLxxCUNhMn46dzck/SZSQ=","crlite_enrolled":false,"id":"3f228a15-48bd-4095-9b49-153752372cad","last_modified":1562108499177},{"schema":1562108494477,"derHash":"7A6RbnSr8VDXJpuoha5sdB5IeFXP3QAhsfklDg8CQKQ=","subject":"CN=Digi-Sign CA Digi-SSL,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHIxCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR4wHAYDVQQDExVEaWdpLVNpZ24gQ0EgRGlnaS1TU0w=","whitelist":false,"attachment":{"hash":"b97246136be3d99d20bf2f7603175d44195ddb23d6b06dc54798dbf020e157c7","size":2133,"filename":"SjhfW8JOPoS_CGVE2In9gc0KODUuyPow9mwTaYtMEq0=.pem","location":"security-state-staging/intermediates/8b3ac03e-2dd2-4039-a6c7-c35f9b0a128d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SjhfW8JOPoS/CGVE2In9gc0KODUuyPow9mwTaYtMEq0=","crlite_enrolled":true,"id":"6b2da634-a178-4fe0-a67a-69c7a80a110a","last_modified":1562108495264},{"schema":1562108492940,"derHash":"wTFJn9hrIT213vqv1TERwoot2vS6RlyCZactbPc5tmg=","subject":"CN=GeoTrust ECC EV SSL CA,O=GeoTrust\\, Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEfMB0GA1UEAxMWR2VvVHJ1c3QgRUNDIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"588ba7e7e84de78bd2ee165c7c1929bd7112e182bf928a3c226efe5c273d8534","size":1370,"filename":"OO0Iaj51W5pVJ0cy2PVRI2a7tHdEEIid5kv96_bdYG0=.pem","location":"security-state-staging/intermediates/2d6eb50e-d96b-494b-b34f-d3b38e2fa2d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OO0Iaj51W5pVJ0cy2PVRI2a7tHdEEIid5kv96/bdYG0=","crlite_enrolled":false,"id":"ca75d5de-dcb0-4e6c-906a-28cbb856e74b","last_modified":1562108493682},{"schema":1562108492186,"derHash":"fg4WwAVvQan0xh9XFQPDvPB54r3bIovyIZrDEgBJa1w=","subject":"CN=COMODO RSA Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"40fed6ab131f22b397c3c2ecb13e30bb474e343301e79a2b101da728c8f7e725","size":2158,"filename":"Fbr_5aSOo4KRal8YE49t4lc76IOnK_oto9NWV1cSKWM=.pem","location":"security-state-staging/intermediates/26792b4c-be44-42ef-b451-acdb85008cae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fbr/5aSOo4KRal8YE49t4lc76IOnK/oto9NWV1cSKWM=","crlite_enrolled":true,"id":"42a678eb-ad85-4ddf-9bde-2a36dbf7e3f1","last_modified":1562108492932},{"schema":1562108489881,"derHash":"VJq1JOiGreznC92WoEtVSULDdL58KcDugYtjC98gDuE=","subject":"CN=COMODO ECC Organization Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE8MDoGA1UEAxMzQ09NT0RPIEVDQyBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"6ff6976ecc5dc7e323e439ed8c254a856da8c9eb0f1d4d4530e0dc455cdeb727","size":1321,"filename":"ORuXcQB__xhdb52by_Vmo_qhrTuazztSjlMMhaafJZ0=.pem","location":"security-state-staging/intermediates/2ed754b8-5dad-47c1-9bf2-d49c86f2db2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ORuXcQB//xhdb52by/Vmo/qhrTuazztSjlMMhaafJZ0=","crlite_enrolled":true,"id":"b68c9aa1-a037-426c-872e-e863b1da96e0","last_modified":1562108490643},{"schema":1562108489123,"derHash":"vhOl0vXHj0QBGdSExxBCcyXrEM6pYj72IAyxGwT2UOE=","subject":"CN=Apple Public Client RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgQ2xpZW50IFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"830fdd81ad376da5b83348ff96f33463a23ca58c58f45698a8cc7234d1ec4f2a","size":1613,"filename":"HI6y3qp-41VQ3mL9AJrkQaSsUBgehHMaI9RZeWJdLmk=.pem","location":"security-state-staging/intermediates/0e7aa9ac-77b4-49f7-9899-54a03c0c2d60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HI6y3qp+41VQ3mL9AJrkQaSsUBgehHMaI9RZeWJdLmk=","crlite_enrolled":false,"id":"db20381e-1c9e-4baf-aab2-f2b9c195e30b","last_modified":1562108489873},{"schema":1562108488345,"derHash":"2w2hYDLxZDoklv3nQuK76B2spYzXYSBhQg4VTOG84r0=","subject":"OU=AC Componentes Inform\u00e1ticos,O=FNMT-RCM,C=ES","subjectDN":"MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==","whitelist":false,"attachment":{"hash":"9667524969985c4cb1aa76f3e3c434be6441809f9c3d2bad6265165a0b509b08","size":2430,"filename":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem","location":"security-state-staging/intermediates/5bc2733e-1751-448d-9db9-b1e6c1f4afc4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=","crlite_enrolled":true,"id":"43dee182-4f7e-46ed-8e3c-f6b84da2e351","last_modified":1562108489116},{"schema":1562108487565,"derHash":"2y8BlO3LeMup0br0w9uo1Wg32XsgIz1hfdULcTvTE8g=","subject":"CN=JPRS Organization Validation Authority - G2,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xNDAyBgNVBAMTK0pQUlMgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"eaa0461d01871fe7efef1f6dd76aeadd5f6a7fa6294b55d75e3356efb3bfffbc","size":1654,"filename":"54eZQ4rB3O8NcogAUW0xb-Kj8mUlz1CXsQbqAv5JoyE=.pem","location":"security-state-staging/intermediates/0d2373da-abe4-4f76-9197-bd953b05bcbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"54eZQ4rB3O8NcogAUW0xb+Kj8mUlz1CXsQbqAv5JoyE=","crlite_enrolled":true,"id":"90ba5f7f-c6e6-46f1-9eed-ed13ab24ea34","last_modified":1562108488337},{"schema":1562108486020,"derHash":"dCZArGf41xssR3dQdK2MYLriwBI6sYNUwkwXGTLYYYM=","subject":"CN=eMudhra ECC Organization Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGbMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPTA7BgNVBAMTNGVNdWRocmEgRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e34a770b073f3a5213a76f49963f984357b1953c6da5947b47e936a4e630f73b","size":1353,"filename":"1Mpue8qB6gEzwG3fbKc1IdTydXsa-PS26DWSlP08NHA=.pem","location":"security-state-staging/intermediates/a4456a24-aeff-4e5b-8141-b75819e0c374.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Mpue8qB6gEzwG3fbKc1IdTydXsa+PS26DWSlP08NHA=","crlite_enrolled":false,"id":"2bf88053-7706-4881-a7fb-ac030ad0b530","last_modified":1562108486759},{"schema":1562108482958,"derHash":"8RiVmlrV6zfO2xJRjiNEiZ3thXwDTh1mYERGfHsq7Ck=","subject":"SERIALNUMBER=201722,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE3MjI=","whitelist":false,"attachment":{"hash":"0018cff73afd9fc80f48f5b2b28aa9e874f42ec1eadda135b207f08ab903561f","size":2402,"filename":"Mq0HXzU9lbGXxDh3OAHAmEOs6t-zrh0AMpitBhEV-go=.pem","location":"security-state-staging/intermediates/c6eae6ec-2815-40ed-ad49-db25026f1f41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mq0HXzU9lbGXxDh3OAHAmEOs6t+zrh0AMpitBhEV+go=","crlite_enrolled":false,"id":"369b0e86-2ce9-4e05-b98d-508abd7b4c38","last_modified":1562108483725},{"schema":1562108479933,"derHash":"wY1Tv5hk3Qm8vKz9Zy4lZtTIH2iJ42313UJcBCEdB2M=","subject":"CN=Hongkong Post e-Cert EV SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MH0xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEuMCwGA1UEAxMlSG9uZ2tvbmcgUG9zdCBlLUNlcnQgRVYgU1NMIENBIDMgLSAxNw==","whitelist":false,"attachment":{"hash":"e4408c6b03e1deb0777ad20ea8b3466779565bcb2d92a17de6ac350bdaa5de18","size":2097,"filename":"shxxZc44F1hF3pjKzr0Oaoq-CwRFBKIr0_noGHUYkjA=.pem","location":"security-state-staging/intermediates/5092f509-515e-460e-b9cb-d9cdaff53b24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"shxxZc44F1hF3pjKzr0Oaoq+CwRFBKIr0/noGHUYkjA=","crlite_enrolled":true,"id":"8a76611a-1aeb-45ed-90ff-d235f7264a64","last_modified":1562108480674},{"schema":1562108479189,"derHash":"oqZEIzcPKdJbx6jjGHumTn65rSxpSzKwpgSDt3ZKipk=","subject":"SERIALNUMBER=201726,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI2","whitelist":false,"attachment":{"hash":"493a8723d33b245fb73ba475b1b71ef35f27d668af43408d38e274218fc62e66","size":2402,"filename":"CJitrQ5Xyw0ivYWDlDkdZhYGrR9n2v_BiXArqHx0E3k=.pem","location":"security-state-staging/intermediates/1be9953d-1cde-405a-b00c-7ba2d663a689.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CJitrQ5Xyw0ivYWDlDkdZhYGrR9n2v/BiXArqHx0E3k=","crlite_enrolled":false,"id":"a1acb403-444a-4209-85b5-81f33f7e1947","last_modified":1562108479925},{"schema":1562108477627,"derHash":"ci1Qh02kVJbQKZYnQJd3YDqHNBpflDuInDLnuSgKj3E=","subject":"CN=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda. RSA DV CA,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIG3MQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xRzBFBgNVBAMMPk1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4gUlNBIERWIENB","whitelist":false,"attachment":{"hash":"3ba8b2665039d7c2a7cf679634516d8d507d0415ddd08b1e41ac4a9c6c867605","size":2231,"filename":"0xvEIcXteNs-TYPZ7GyhN_WFNSBPpaBsyCLFCdhQQY0=.pem","location":"security-state-staging/intermediates/3319dc26-2db5-4b0e-ae5b-4709b309e91f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0xvEIcXteNs+TYPZ7GyhN/WFNSBPpaBsyCLFCdhQQY0=","crlite_enrolled":true,"id":"0b17a42e-ae1c-45f8-9f54-f23d38b3a873","last_modified":1562108478417},{"schema":1562108476077,"derHash":"JT48lzLfiHTD1U2lIsFxEULJjCzqdmRjUVKomgPuk2Q=","subject":"CN=Optum Public Trust CA 1,O=Optum,L=Minneapolis,ST=Minnesota,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExFDASBgNVBAcTC01pbm5lYXBvbGlzMQ4wDAYDVQQKEwVPcHR1bTEgMB4GA1UEAxMXT3B0dW0gUHVibGljIFRydXN0IENBIDE=","whitelist":false,"attachment":{"hash":"e28866c72d971df063ce52b61094d04901ae33bf5dac1c98cee5f231443b1820","size":1796,"filename":"vKi3BXeuhSDWdRuvjranv-RWto4k9Z05PXzhtTz0LnA=.pem","location":"security-state-staging/intermediates/488fc2c3-5bb3-412f-813e-a4df6c553ea4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vKi3BXeuhSDWdRuvjranv+RWto4k9Z05PXzhtTz0LnA=","crlite_enrolled":false,"id":"1c890a1b-6c30-4168-b0b3-e6f8888a7ef6","last_modified":1562108476867},{"schema":1562108475274,"derHash":"wKHKNkddM7Rx5OWOVXTdkpTTVMRXKVlU21VbJOrSqks=","subject":"CN=COMODO/PKWARE Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAxMdQ09NT0RPL1BLV0FSRSBTZWN1cmUgRW1haWwgQ0E=","whitelist":false,"attachment":{"hash":"536d387994d2fcf3c04c848acb66841104d87c9b0b1ed73ccec9768bd275d362","size":1979,"filename":"javoiDXitAWxKnEeWWJB_XeluETyAl8SAu8OHaB7Q0c=.pem","location":"security-state-staging/intermediates/6124ffbf-c334-4b41-82f5-92517e8e488e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"javoiDXitAWxKnEeWWJB/XeluETyAl8SAu8OHaB7Q0c=","crlite_enrolled":false,"id":"c7a0609a-ed94-40e7-b2ce-ac3e72d18619","last_modified":1562108476061},{"schema":1562108474475,"derHash":"SKfJxaNnNPyeIE1jzmu7zZ4hwZeGBHYM2NMNb0xntnw=","subject":"CN=Plex Devices High Assurance CA,O=Plex\\, Inc.,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMScwJQYDVQQDEx5QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0E=","whitelist":false,"attachment":{"hash":"3729070872ea8b8dcd9408300fc6e7708a388c0ab4515de46054748a7dbd7915","size":1670,"filename":"vLeOEXjDgoNqSXwuYXRAIm7pApi-S-w8e2zLIwsC76A=.pem","location":"security-state-staging/intermediates/9297fd9c-adef-430a-a45f-6a0e7715a25e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vLeOEXjDgoNqSXwuYXRAIm7pApi+S+w8e2zLIwsC76A=","crlite_enrolled":false,"id":"c99ad4f1-7ce1-4835-9f30-07a94e50f3dd","last_modified":1562108475266},{"schema":1562108472186,"derHash":"kgy86b1V08qNRGgIpZ7fPCIq1XZ6RFPGhu48b5T1W84=","subject":"CN=The University of Texas-Pan American RSA CA,OU=Information Technology,O=The University of Texas-Pan American,L=Edinburg,ST=TX,C=US","subjectDN":"MIGzMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxETAPBgNVBAcTCEVkaW5idXJnMS0wKwYDVQQKEyRUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcy1QYW4gQW1lcmljYW4xHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxNDAyBgNVBAMTK1RoZSBVbml2ZXJzaXR5IG9mIFRleGFzLVBhbiBBbWVyaWNhbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"68a204c4713144af9e565ce675099fc7333de3ce90a145da40d7e88cf87f1992","size":2211,"filename":"zDuCL0MFlm-s2lxuioDRbpVXq3F1pIFe3Ogdl6yJbPc=.pem","location":"security-state-staging/intermediates/93cc4789-ad8f-42af-a3d7-ba55126aae58.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zDuCL0MFlm+s2lxuioDRbpVXq3F1pIFe3Ogdl6yJbPc=","crlite_enrolled":false,"id":"803e4821-11f5-4be0-b520-db82af50d777","last_modified":1562108472928},{"schema":1562108470681,"derHash":"xJw1DlqCBeBj50xVSplDNbhDXJllJ9TvGisMe1FYSy0=","subject":"CN=Buypass Class 3 CA 3,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAzIENBIDM=","whitelist":false,"attachment":{"hash":"954fa22283314bcbe40077bc8cee7655cbcfce4fb215854858c5599d8c8b498f","size":1723,"filename":"b2TqrhO3HsQ2hHTQB23iQnAAL127LlWqd3L_IgvgTtk=.pem","location":"security-state-staging/intermediates/379744b3-624d-49d1-b082-83d5b607dc72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b2TqrhO3HsQ2hHTQB23iQnAAL127LlWqd3L/IgvgTtk=","crlite_enrolled":true,"id":"636e348f-d4b7-425a-aabb-4eab295a6c6e","last_modified":1562108471419},{"schema":1562108469933,"derHash":"geBxsB8B3EPuRYwOG9y8hItHRiwmtM4Z7pAVQWvG34k=","subject":"CN=DigiCert Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"7669ec2c677f7c33ea164f3d8991239b21a5698efb50b48e0cb9ac939a508051","size":1658,"filename":"iHVCWDAkTkDEQzK_sRixqnC3Qp1KI3tOEHgKB14IEjE=.pem","location":"security-state-staging/intermediates/8c415eed-4867-4bda-81c4-10a03eb5b973.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iHVCWDAkTkDEQzK/sRixqnC3Qp1KI3tOEHgKB14IEjE=","crlite_enrolled":false,"id":"8fa42d62-2705-4c2b-8527-12fff6081ec6","last_modified":1562108470673},{"schema":1562108469181,"derHash":"T9c0GQRvkIaIJtWBU2kx0i5UlD680FnLdiE5TXSTQ8U=","subject":"CN=STRATO SSL - G3,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzM=","whitelist":false,"attachment":{"hash":"651a5cc911bb69e9769352cd79204ebad0b8c18a0618514fbc2f3b18fbf1985f","size":1699,"filename":"qvSFQBzCFM6BzrM7CfDEVTkxQPTvaKcxyp8jRACn-_g=.pem","location":"security-state-staging/intermediates/fe9022e1-381b-43c0-bf53-e4e296637182.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qvSFQBzCFM6BzrM7CfDEVTkxQPTvaKcxyp8jRACn+/g=","crlite_enrolled":false,"id":"f362a89a-ec51-4c83-b355-5992a88e47e8","last_modified":1562108469925},{"schema":1562108468428,"derHash":"P994ilpl5qKdjBVQ2CRJBqO4p7fT2pve3XSOQYOnY8k=","subject":"CN=GeoTrust DV SSL SHA256 CA - G2,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEnMCUGA1UEAxMeR2VvVHJ1c3QgRFYgU1NMIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"c021152fa65496c7d3044515d2b06d1fae2374b0af0f3a15b7898923ab81ec9b","size":1723,"filename":"1i8gOxF9EpNXxb95VRtBODr-LfSjs4yA5TdHoH3gAeI=.pem","location":"security-state-staging/intermediates/6513678f-bcad-46a9-9e10-82fa65ea35db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1i8gOxF9EpNXxb95VRtBODr+LfSjs4yA5TdHoH3gAeI=","crlite_enrolled":false,"id":"1d033b5b-0c9c-49e6-8018-fe710f401820","last_modified":1562108469174},{"schema":1562108466881,"derHash":"tuTI2dV1phQE3laOJ71vMEjXsPgDBl4vZSYmC9yj0hE=","subject":"CN=Hewlett Packard Enterprise Collaboration CA G21,OU=Class 2 Managed PKI Individual Subscriber CA,O=Hewlett Packard Enterprise Company,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzErMCkGA1UEChMiSGV3bGV0dCBQYWNrYXJkIEVudGVycHJpc2UgQ29tcGFueTE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExODA2BgNVBAMTL0hld2xldHQgUGFja2FyZCBFbnRlcnByaXNlIENvbGxhYm9yYXRpb24gQ0EgRzIx","whitelist":false,"attachment":{"hash":"96b02933ee42ce251c97ba41e496414d33f3c5e1c2a412abc53c2e02a4188766","size":2093,"filename":"Z90auS_kRdRG5Ao7y14bu7yNh6EQunNHlS4BvcxrXqg=.pem","location":"security-state-staging/intermediates/ca9b4a36-f032-4648-9039-916ec02a384f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z90auS/kRdRG5Ao7y14bu7yNh6EQunNHlS4BvcxrXqg=","crlite_enrolled":false,"id":"d6eec88c-c2ad-4bbc-8fa8-2a3910ffb27c","last_modified":1562108467674},{"schema":1562108465327,"derHash":"8BflEJGLd9pn5NAg4rdqQkYYdugi9iDFVzvLw7uzdAY=","subject":"CN=Gandi Secure Email CA,O=GANDI SAS,C=FR","subjectDN":"MEExCzAJBgNVBAYTAkZSMRIwEAYDVQQKEwlHQU5ESSBTQVMxHjAcBgNVBAMTFUdhbmRpIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"7374bb117a04dbe56b2af679a65a85a2c734afce7e88acb81917ecd528ba648e","size":1719,"filename":"iFIEeQ06wWLDY4tmZC6npViJr_VFbFCHUdRkqmIc7OY=.pem","location":"security-state-staging/intermediates/dec7936f-0abc-4ce6-95ac-65368ca76b94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iFIEeQ06wWLDY4tmZC6npViJr/VFbFCHUdRkqmIc7OY=","crlite_enrolled":false,"id":"8561ee44-dd28-4da1-ad1c-2cd801669b4f","last_modified":1562108466116},{"schema":1562108464555,"derHash":"oloZVGgZ0EgADvnGV3xLzY0hVbHkNGpFmdbIt5eZ1KE=","subject":"CN=DarkMatter Secure CA,O=DarkMatter LLC,C=AE","subjectDN":"MEUxCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzEdMBsGA1UEAwwURGFya01hdHRlciBTZWN1cmUgQ0E=","whitelist":false,"attachment":{"hash":"17a8659515054ccd708b7578033a8260071fbc5776d9f8d781877d7eb0ab17fc","size":2446,"filename":"_NdsyiNH5c1bOTR_Uc9DZUtpor_JBzZwpr5H2HAebg4=.pem","location":"security-state-staging/intermediates/aae3464a-97e3-430d-abca-3a3589b81fef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/NdsyiNH5c1bOTR/Uc9DZUtpor/JBzZwpr5H2HAebg4=","crlite_enrolled":true,"id":"fb7a603d-e9a8-4251-ba50-4366055db1f3","last_modified":1562108465319},{"schema":1562108462256,"derHash":"jXNz845j2DDAzqosMzMPIaLHdAjuPPvFlcDS89MvQiQ=","subject":"CN=AlwaysOnSSL ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGQxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVQWx3YXlzT25TU0wgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"6cd13823e7a07d0b6d63d3b9c92770bf894f5e25fefc4e8199730c15424c4112","size":1142,"filename":"40Fa99C7P_qSeG5RhWDK4bUcBBT4PiEO_gqhJF0vZqQ=.pem","location":"security-state-staging/intermediates/edeee72e-1d4e-43f0-b5b0-f8cdf445085f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"40Fa99C7P/qSeG5RhWDK4bUcBBT4PiEO/gqhJF0vZqQ=","crlite_enrolled":false,"id":"c9f1fa0d-0267-4cae-9099-43d21b02ada0","last_modified":1562108463012},{"schema":1562108461484,"derHash":"kPqY1kbdXwBgLWjRfddrVe5RzaPTki8NvdEEgPWZCs0=","subject":"O=Government Root Certification Authority,C=TW","subjectDN":"MD8xCzAJBgNVBAYTAlRXMTAwLgYDVQQKDCdHb3Zlcm5tZW50IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"461fb473d9abcb1549d2bb8dc7f25d3d5d8ffcd271bcfd212d9339e162d6e4cf","size":2259,"filename":"pRovOgUOg4pQUGlleNu-2qwaEH7i2dSPrlBdGNDaXPg=.pem","location":"security-state-staging/intermediates/cd7dee2a-eebb-414f-bd65-a154eaf83a0f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pRovOgUOg4pQUGlleNu+2qwaEH7i2dSPrlBdGNDaXPg=","crlite_enrolled":true,"id":"80730951-6e3a-4fd6-83ff-a24e2b107f4f","last_modified":1562108462248},{"schema":1562108460724,"derHash":"uzlJcDXtlYPShs3nD7ZE65WAZZgJKx6NjxG8A116R2o=","subject":"CN=Riverbed Certificate Issuer,O=Riverbed Technology\\, Inc.,C=US","subjectDN":"MFcxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlSaXZlcmJlZCBUZWNobm9sb2d5LCBJbmMuMSQwIgYDVQQDExtSaXZlcmJlZCBDZXJ0aWZpY2F0ZSBJc3N1ZXI=","whitelist":false,"attachment":{"hash":"380d64120c38a475d1d02f25161d62ca2438dd34d22cc5fdc5ff8914d2ee748e","size":1837,"filename":"mLNcfRP6zZz8Ur0uU9bhIs_pxrgspWgbw-3oVVm2LZM=.pem","location":"security-state-staging/intermediates/51c4f2c3-b6a5-4cf4-9883-a9fc87d42f7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mLNcfRP6zZz8Ur0uU9bhIs/pxrgspWgbw+3oVVm2LZM=","crlite_enrolled":false,"id":"b91bef53-0465-4340-bc6f-1b264e20858f","last_modified":1562108461476},{"schema":1562108459225,"derHash":"GUAL5bejH7czkXcAeJ0vCiRxwMnVBsDlBMBsFtfLF8A=","subject":"CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJkRpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"97ebf8501ebeef539292b72802d284d4a90895579053c7ca04829988d01099fd","size":1687,"filename":"k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K-59sNQws=.pem","location":"security-state-staging/intermediates/c00739e2-a5f0-4bfc-bd66-49b848083fe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k2v657xBsOVe1PQRwOsHsw3bsGT2VzIqz5K+59sNQws=","crlite_enrolled":true,"id":"6bad67e8-353f-45a0-88bf-f84ca74f9d08","last_modified":1562108459963},{"schema":1562108457728,"derHash":"TJ4FOPmFaQ3p1c4cOPFsJLTDmhcQwIgc2wbir9t1e00=","subject":"CN=Deutscher Bundestag CA - G02,O=Deutscher Bundestag,L=Berlin,ST=Berlin,C=DE","subjectDN":"MHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCZXJsaW4xDzANBgNVBAcMBkJlcmxpbjEcMBoGA1UECgwTRGV1dHNjaGVyIEJ1bmRlc3RhZzElMCMGA1UEAwwcRGV1dHNjaGVyIEJ1bmRlc3RhZyBDQSAtIEcwMg==","whitelist":false,"attachment":{"hash":"691728107bc477123f2b50cf26ee2991f3ba95b969683fd4fe04926cd388a729","size":1999,"filename":"p-DGsZUedDpJ0iAR6valV2XZykAPIyB_t6FdqCpsNck=.pem","location":"security-state-staging/intermediates/801fd9f6-afcf-4260-913d-7cedfb8d1f69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p+DGsZUedDpJ0iAR6valV2XZykAPIyB/t6FdqCpsNck=","crlite_enrolled":true,"id":"4b7cd555-ac58-4744-b9ae-1f90ccfdbd42","last_modified":1562108458465},{"schema":1562108456943,"derHash":"KFJhsTo5JkWtzcIueVlPj8qLbvgVyW6iUI2MaJs11JA=","subject":"SERIALNUMBER=201917,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE3","whitelist":false,"attachment":{"hash":"b4c42fc4159a8e09a7be7d92b67f375fe8a4a1289555b5146e634c922dfebc7c","size":2333,"filename":"pJ115qaM3iy0fBjotKRhuL4ZOLmB8hkeEaSrcQjAX-E=.pem","location":"security-state-staging/intermediates/94254f29-2c38-49e2-aa81-74e7a43490e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pJ115qaM3iy0fBjotKRhuL4ZOLmB8hkeEaSrcQjAX+E=","crlite_enrolled":false,"id":"2e788e05-bc12-4ee0-993f-0e4ce6728971","last_modified":1562108457720},{"schema":1562108455439,"derHash":"vzmkJB9C1SI2iUSz3FPtnqpax3NeJC4GJ8DdW7pxRIQ=","subject":"CN=VR IDENT EV SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEgMB4GA1UEAwwXVlIgSURFTlQgRVYgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"771df57314c0ff60060e643c897bc3d2c750306ce65c3893ac7971eccbfaa626","size":2101,"filename":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi_HzF0=.pem","location":"security-state-staging/intermediates/26d00339-07ff-4371-8b44-fe90949d947d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WDFtLnObNhLxa9b3x6LeuoWAZeafyD6K2Il4Wi/HzF0=","crlite_enrolled":true,"id":"d028614d-4a78-4253-b0be-7dafb1e46f70","last_modified":1562108456185},{"schema":1562108449412,"derHash":"hXYPd9sP0Nk8Ie4DZLjqsJuCz0m3hJgxA4IJtbEIE2M=","subject":"CN=DigiCert Federated ID L3 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMyBDQQ==","whitelist":false,"attachment":{"hash":"7688296a490812398f07da4054aa6c862d6971d10625571f6f958e6dcf89cf40","size":1861,"filename":"D_y1VvJ2qndIKmqJ6xcIr7CNwy7j0tZxmfALqY3I9DY=.pem","location":"security-state-staging/intermediates/dbf7ff78-daad-447b-9fd4-d935233f7746.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D/y1VvJ2qndIKmqJ6xcIr7CNwy7j0tZxmfALqY3I9DY=","crlite_enrolled":false,"id":"50c11f47-25d1-43c8-a40c-7dbbed4dec9b","last_modified":1562108450170},{"schema":1562108447119,"derHash":"7zVswpmqY3kWyBpIiRtbovMzogZNk6iboU9joUqmslE=","subject":"CN=Go Daddy Secure Code Signing Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEZMBcGA1UEChMQR29EYWRkeS5jb20sIExMQzEtMCsGA1UECxMkaHR0cDovL2NlcnRzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMUAwPgYDVQQDEzdHbyBEYWRkeSBTZWN1cmUgQ29kZSBTaWduaW5nIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"2a9da51343ba17fc69416527b4e61c230d78d040f1a4f4a653929473419fc67c","size":1776,"filename":"ZKrsHPc_itlBFX0ia7RhbHINkdKu7eJaRcSBtF1rbBk=.pem","location":"security-state-staging/intermediates/2354bf54-5e88-4dad-8baa-b8c573e7c4b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZKrsHPc/itlBFX0ia7RhbHINkdKu7eJaRcSBtF1rbBk=","crlite_enrolled":false,"id":"f9148830-33ed-4e5a-9e6a-dc463e9110ab","last_modified":1562108447878},{"schema":1562108446333,"derHash":"IOPoh0eo2I4RpSdSEDLcjK6SvDO0XJPu4E9iSnDckgo=","subject":"CN=Huntsville Hospital System CA,OU=Orion Health Direct Secure Messaging,O=Huntsville Hospital System,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaSHVudHN2aWxsZSBIb3NwaXRhbCBTeXN0ZW0xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEmMCQGA1UEAxMdSHVudHN2aWxsZSBIb3NwaXRhbCBTeXN0ZW0gQ0E=","whitelist":false,"attachment":{"hash":"4f9fab69c2825ed8051a167e929634c1a24478267e05efe7c084c5d300c59d25","size":2308,"filename":"4jZ0K-YfJqocNa6Q3OoluSDNkSjq0ytpvAtrDgTqLuQ=.pem","location":"security-state-staging/intermediates/8cf75bef-731d-4866-a120-e05cba8d7698.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4jZ0K+YfJqocNa6Q3OoluSDNkSjq0ytpvAtrDgTqLuQ=","crlite_enrolled":false,"id":"048d5070-4d74-42a3-bdd2-1e5791e0b347","last_modified":1562108447112},{"schema":1562108445570,"derHash":"gN2eNJfzVOMLis850EbdT1phj3iJI26zT3jVTRXNalA=","subject":"CN=Amazon,OU=Server CA 1A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"f502b13e5af94af796e88c4080574a5ad68c2787ff0f7bdb34061720b135d3eb","size":1544,"filename":"ZLtb2AMR-j9TvZlATKuHYq1uBIRH0Kl_IZ_OyhZh83w=.pem","location":"security-state-staging/intermediates/b9e331a0-e39f-41ce-a5d3-a151079adcca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZLtb2AMR+j9TvZlATKuHYq1uBIRH0Kl/IZ/OyhZh83w=","crlite_enrolled":false,"id":"dd706920-48c4-43c2-ad79-708be9e0d652","last_modified":1562108446325},{"schema":1562108441761,"derHash":"RYRGunXZMukU8jwrV7fRku3bwhgdlY4Rga1SUXR6Hug=","subject":"CN=DigiCert ECC Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEVDQyBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"b2bcbebe7e27673d1a6a02cea251d16fb5d61462c14b4e5f2959e1d241a38778","size":1333,"filename":"PZXN3lRAy-8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=.pem","location":"security-state-staging/intermediates/64f57389-f6e8-4703-a733-9ac4ef7d0e9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PZXN3lRAy+8tBKk2Ox6F7jIlnzr2Yzmwqc3JnyfXoCw=","crlite_enrolled":true,"id":"ec135dce-52fb-4ab9-b488-075172498a7c","last_modified":1562108442503},{"schema":1562108441013,"derHash":"ljBWsNlB2dviesd4BT2F5DzHn0dq00z915nCfjgYQOs=","subject":"CN=NCC Group Secure Server CA G3,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcz","whitelist":false,"attachment":{"hash":"f16945e38e9d095d6f815613d6e34ba2de58cb018adf71a2eaff1dc03a45d3c5","size":1110,"filename":"o054ddOknAfLTeuaAC1q42pNk8GmJ-eXYrMMmlOPyUc=.pem","location":"security-state-staging/intermediates/75e73199-e46f-4f99-82bd-6bb22c48adc2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o054ddOknAfLTeuaAC1q42pNk8GmJ+eXYrMMmlOPyUc=","crlite_enrolled":false,"id":"90a2cf68-57ab-4964-a059-d6e9ca04d487","last_modified":1562108441753},{"schema":1562108438751,"derHash":"G9nTNskEXcF0JrmawmUvrjHLncKsPhmwQ5DCSwvUqKA=","subject":"CN=SSL.com NAESB Client Authentication Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMUMwQQYDVQQDDDpTU0wuY29tIE5BRVNCIENsaWVudCBBdXRoZW50aWNhdGlvbiBJbnRlcm1lZGlhdGUgQ0EgRUNDIFIy","whitelist":false,"attachment":{"hash":"025ec4ec422a32861ce2ee1ff6519ff877f45473617ddfbc0cc4d2d65a1f3403","size":1284,"filename":"-XFI74y_3Si13bQVqU7peqlv_Bm1B62UTJzvE6VW0eg=.pem","location":"security-state-staging/intermediates/86db5367-7cdb-43be-bc89-89822bb5d464.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+XFI74y/3Si13bQVqU7peqlv/Bm1B62UTJzvE6VW0eg=","crlite_enrolled":false,"id":"f5fb2bf8-c421-4d28-86ec-271b94f105e5","last_modified":1562108439491},{"schema":1562108437991,"derHash":"MoTgNczXH3odBjrpjimx5ZEjEa2fbZEYhMr513HTfE0=","subject":"CN=BlackCert\\, Inc. RSA OV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBSU0EgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"a606699a644f90e31cdac13ce9ab6fe654fc1b68e04d29ed2be0f02b771c6ddb","size":2150,"filename":"B5IV9Zui5uDR_htFQKKJviedASQLhuhY2W547xasQvc=.pem","location":"security-state-staging/intermediates/65c4a648-66cf-4447-ad46-c424ead1c1d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B5IV9Zui5uDR/htFQKKJviedASQLhuhY2W547xasQvc=","crlite_enrolled":false,"id":"50ca3b4d-bf64-427e-b5f2-60f0150b7f77","last_modified":1562108438743},{"schema":1562108436479,"derHash":"2oVGgW2JHBJB6Th95DbRuffqcNuh6z0l9YJxzoFqerw=","subject":"CN=Apple Public Server ECC CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIEVDQyBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"96414faae6fe080e422a2e6dffda79775450c27bd46afac2672914234e85706a","size":1358,"filename":"kKxRozcrd_eR6KCzq3nM59ZL2rXyJMQOx5NjXVurVaw=.pem","location":"security-state-staging/intermediates/08d896b9-e7d5-440e-a842-0552e86ff576.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kKxRozcrd/eR6KCzq3nM59ZL2rXyJMQOx5NjXVurVaw=","crlite_enrolled":false,"id":"1d2ac87d-efa3-4196-9b3d-7656b94384ac","last_modified":1562108437238},{"schema":1562108433427,"derHash":"NWpfTZlOnvp8rvxJF2iRHWXsJZd0ZbYQ4vKapEcmMcM=","subject":"CN=EC-SectorPublic,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGIMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxGDAWBgNVBAMMD0VDLVNlY3RvclB1YmxpYw==","whitelist":false,"attachment":{"hash":"8aa452217d865dd183b477c08181966ceab5ca68b4abe8ee3224d4a860effb60","size":2101,"filename":"VMk3U3j_saU9dzdCeDTxe0MSzuZR2tplayTBfNxG2oQ=.pem","location":"security-state-staging/intermediates/8e636754-d680-47c7-8862-2e0d71bd6568.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VMk3U3j/saU9dzdCeDTxe0MSzuZR2tplayTBfNxG2oQ=","crlite_enrolled":true,"id":"8a63a6e7-575b-46fb-bdf4-944f8aa5edcc","last_modified":1562108434176},{"schema":1562108432677,"derHash":"KMu04NnE7m0ErI8UcXYFrjpL2Mv40IGyevbtsvPXajI=","subject":"CN=DigiCert Grid Trust CA G2,OU=www.digicert.com,O=DigiCert Grid,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExlEaWdpQ2VydCBHcmlkIFRydXN0IENBIEcy","whitelist":false,"attachment":{"hash":"2030c0b03af2fba71a3c252cde6988edc7bbd22d1d2515bf5da0d0ccf16c5a03","size":1796,"filename":"5TmPqy9bKSAy0zKN0Mz_yBIgKGk_pgZ4TMaSTFRh9xw=.pem","location":"security-state-staging/intermediates/062c27f3-e7a5-48a0-8734-535cb038e150.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5TmPqy9bKSAy0zKN0Mz/yBIgKGk/pgZ4TMaSTFRh9xw=","crlite_enrolled":true,"id":"0aee0acd-3e30-437a-b011-55d61c8d46c4","last_modified":1562108433420},{"schema":1562108431893,"derHash":"PtCuZ6FDLIPYIQHeabLuXn8gMCcJ2VeQc6MC2pD0hTM=","subject":"CN=TrustSafe Domain Validated CA,OU=SSL Department,O=Isimtescil Bilisim Anonim Sirketi,L=Istanbul,C=TR","subjectDN":"MIGNMQswCQYDVQQGEwJUUjERMA8GA1UEBwwISXN0YW5idWwxKjAoBgNVBAoMIUlzaW10ZXNjaWwgQmlsaXNpbSBBbm9uaW0gU2lya2V0aTEXMBUGA1UECwwOU1NMIERlcGFydG1lbnQxJjAkBgNVBAMMHVRydXN0U2FmZSBEb21haW4gVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"748834790eb69db784c3f00d7f2ef2b64cf353435e5de3e69ac4ca2c81299276","size":2247,"filename":"90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0-Sun5o=.pem","location":"security-state-staging/intermediates/32d1002c-6eee-400e-a7ec-8b0235165445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"90w8QxLDw7OA3WHogRdF8WutmwS2zB2cr21T0+Sun5o=","crlite_enrolled":true,"id":"29a0cb2e-7719-4c2f-9360-00c82a4a3c72","last_modified":1562108432669},{"schema":1562108430382,"derHash":"bEfTZcE7yMw9be9djwerjb6jyNSUXWUaqYVKnJo8xxw=","subject":"CN=Certum Extended Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGHMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSswKQYDVQQDEyJDZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSBTSEEy","whitelist":false,"attachment":{"hash":"0c8cfb3c29a92dbd2d2289a8b8babc8b12040ee59493a752f19f90d04a232032","size":1731,"filename":"HYLX8fqXEbN3Nn7-5kDCagbbzZnSoXsP-rAxbZJ4isM=.pem","location":"security-state-staging/intermediates/d9eaba09-d66e-487d-9974-8980bc0a838e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HYLX8fqXEbN3Nn7+5kDCagbbzZnSoXsP+rAxbZJ4isM=","crlite_enrolled":true,"id":"53f85a16-b4c6-49b5-b7ae-79f9a96b81be","last_modified":1562108431124},{"schema":1562108429620,"derHash":"d9bCr1p7hvY9mRjIdTN3nyrwjTXPoU2kk4yAP1PeGKE=","subject":"CN=SwissSign Personal Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBQZXJzb25hbCBHb2xkIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"37ef04fb6f6156e237c6f04ae3b383028744a07d5a6a4197c49d3411c82108f0","size":2389,"filename":"l5kY-a2-qCNGMn7LXb_lGEENF-dZOLccQOZBKr40wVE=.pem","location":"security-state-staging/intermediates/6a316d67-95bd-4ab5-aef3-82bd300391d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l5kY+a2+qCNGMn7LXb/lGEENF+dZOLccQOZBKr40wVE=","crlite_enrolled":true,"id":"26a70827-d9ed-46cc-8952-77eb4121605e","last_modified":1562108430373},{"schema":1562108428868,"derHash":"CzOSEtfP8XosWeNWabWOdzUBM3UKeNqUBHcO3UcN73Y=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"0e6fef16a9dfd3b1fc541bf1ed445460dda807a212171958df2ea10863a94d13","size":1581,"filename":"IQBnNBEiFuhj-8x6X8XLgh01V9Ic5_V3IRQLNFFc7v4=.pem","location":"security-state-staging/intermediates/c31bd046-861b-47b4-b83f-7da8f65eb61e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IQBnNBEiFuhj+8x6X8XLgh01V9Ic5/V3IRQLNFFc7v4=","crlite_enrolled":true,"id":"065d9c56-c2d7-42eb-8986-f6e198626d65","last_modified":1562108429611},{"schema":1562108428107,"derHash":"xhkwd8YYnR37v4E7h9x8vwSYrPcniHvH7FQyCQbem8g=","subject":"CN=Deutsche Telekom AG Issuing CA 01,OU=Trust Center,O=Deutsche Telekom AG,C=DE","subjectDN":"MG4xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNEZXV0c2NoZSBUZWxla29tIEFHMRUwEwYDVQQLDAxUcnVzdCBDZW50ZXIxKjAoBgNVBAMMIURldXRzY2hlIFRlbGVrb20gQUcgSXNzdWluZyBDQSAwMQ==","whitelist":false,"attachment":{"hash":"42323bfb5127113b4438824fb58d3af80732c28856150ce28e9ba8a079d9df2d","size":2333,"filename":"6FKZ0XUSLykGJ_GTHFYeoN0IGYULT_v-FT0CIQgo_9k=.pem","location":"security-state-staging/intermediates/eb470e98-5598-4d83-8575-ea122484a072.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6FKZ0XUSLykGJ/GTHFYeoN0IGYULT/v+FT0CIQgo/9k=","crlite_enrolled":false,"id":"3aa58b0f-f271-443e-b359-6c266dbd9ca7","last_modified":1562108428860},{"schema":1562108427352,"derHash":"FfrEJaqEQEs2L6NInrZ9BV1donb4aFxNaY2hgw1CDw8=","subject":"CN=COMODO RSA Client Authentication and Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGXMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE9MDsGA1UEAxM0Q09NT0RPIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"6d952d782fa2f84e580c545480b40eeae3fab20a3eba7b734b158271c48b1117","size":2105,"filename":"mHI0vDHAQ12vglM3cO2DlsvGPmhqena8_DpLQz3BaYs=.pem","location":"security-state-staging/intermediates/df4e2dce-92b3-41f1-8479-4de071dddbfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mHI0vDHAQ12vglM3cO2DlsvGPmhqena8/DpLQz3BaYs=","crlite_enrolled":true,"id":"e9149e45-f71f-4714-887f-be55784c958e","last_modified":1562108428099},{"schema":1562108425846,"derHash":"qbrrbzgUtMNDENqE3tOsOC2gErhNIH1KObFnHPWB9ME=","subject":"CN=Gehirn Managed Certification Authority - RSA Digital ID,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGKMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMUAwPgYDVQQDEzdHZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBEaWdpdGFsIElE","whitelist":false,"attachment":{"hash":"9d3dd522c6781ec5c3a2a5d0e4fe04233096cafc6063899f7128d1dba3ae9a00","size":2158,"filename":"UbDxt_jWD-1wTemqPnXtZYGyWnVxg1DGdCspV6DLqOI=.pem","location":"security-state-staging/intermediates/d473bf66-6ea1-4118-ab26-b32ab412136a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UbDxt/jWD+1wTemqPnXtZYGyWnVxg1DGdCspV6DLqOI=","crlite_enrolled":false,"id":"52cca6b4-44db-46a4-a159-3fb79dc4e263","last_modified":1562108426596},{"schema":1562108425078,"derHash":"NFcQZ1JAAhKQOjVFyjsu84SkVpcr2VHY2EDBsKN576E=","subject":"CN=Sectigo ECC Organization Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGVMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPTA7BgNVBAMTNFNlY3RpZ28gRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"5b59d79497cc46bd9ade87bc119d6b5080a06bda160f1f1455a641a59af50c9d","size":1337,"filename":"NodEgLRdUtj_Cm5LdQFzr6BIONhbXlzcV7NAqMo879U=.pem","location":"security-state-staging/intermediates/81767626-1716-426f-855f-3a063a5ec84a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NodEgLRdUtj/Cm5LdQFzr6BIONhbXlzcV7NAqMo879U=","crlite_enrolled":true,"id":"5ce2d1bd-9d4d-4ded-b4fb-dfd347048cf8","last_modified":1562108425838},{"schema":1562108423559,"derHash":"kemNCUfBJUlOqvKjjQh74Hga8g2KFO6MOf7NxILPX4I=","subject":"CN=JCAN Public CA1 - G3,OU=JCAN Public CA1 - G3,O=JIPDEC,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxHTAbBgNVBAsTFEpDQU4gUHVibGljIENBMSAtIEczMR0wGwYDVQQDExRKQ0FOIFB1YmxpYyBDQTEgLSBHMw==","whitelist":false,"attachment":{"hash":"8715c938f66a00c894f04f3ef621c7b599a8b2e13eb998f7287d00d756bc284b","size":1618,"filename":"9VucP103hsLA3O6-YdMs0Xb-Ebf2eG--F7ZVgCe-B7w=.pem","location":"security-state-staging/intermediates/fc3bc551-be4c-4643-b4a8-9c47defcf8e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9VucP103hsLA3O6+YdMs0Xb+Ebf2eG++F7ZVgCe+B7w=","crlite_enrolled":false,"id":"40053026-a20d-4902-a676-37e6280f263b","last_modified":1562108424314},{"schema":1562108422021,"derHash":"6GX1g6kozLanKGuU55IO4fSZjAMLQ4aJ6Vg7zNasUmE=","subject":"CN=Symantec SAS EV Code Signing CA,O=Symantec Corporation,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfU3ltYW50ZWMgU0FTIEVWIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"337db3cb21f94b91820cbcc8f642633962faa317942d17c576ac1c2794189bff","size":1585,"filename":"ZxpdBOLTJS_kzdVgZXygrgtlyU-prl3vrT0h-s-62rw=.pem","location":"security-state-staging/intermediates/a306f3fa-06db-436a-a5c4-9e567203cfa7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZxpdBOLTJS/kzdVgZXygrgtlyU+prl3vrT0h+s+62rw=","crlite_enrolled":false,"id":"1570212f-0a9d-4cdc-8dc3-23b95d91c327","last_modified":1562108422770},{"schema":1562108420475,"derHash":"E8a3OVvGT8Bs7yzlP2bUuYAMUs2IFu43Uy86skuBZcw=","subject":"CN=K Software Certificate Authority (DV) 2,O=K Software,L=Ashland,ST=KY,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLWTEQMA4GA1UEBxMHQXNobGFuZDETMBEGA1UEChMKSyBTb2Z0d2FyZTEwMC4GA1UEAxMnSyBTb2Z0d2FyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgKERWKSAy","whitelist":false,"attachment":{"hash":"b5bebedbc80eec959a6861be597ae614a1b9569ca5c08388b478dd281dd1e7a7","size":2138,"filename":"fL2WqC2l5uf2-UsREkC4vpvX1l1w6N47XmmbDTOPHoM=.pem","location":"security-state-staging/intermediates/6f39f731-4c07-4245-b48d-2f223af99539.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fL2WqC2l5uf2+UsREkC4vpvX1l1w6N47XmmbDTOPHoM=","crlite_enrolled":true,"id":"02bd1d38-93b5-4067-ba88-0ff77d58e2b1","last_modified":1562108421264},{"schema":1562108419697,"derHash":"F06drmVEoHySXOrjoACgPJJUJpOlVcH8nmC5js06wX4=","subject":"SERIALNUMBER=201912,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEy","whitelist":false,"attachment":{"hash":"5b8b8402870a642d23670d933707eb7f84aa868a1d4eefc7cf0662245aa3ad21","size":2333,"filename":"xNZ3P4W2umfy0BWer-9Vg-Vb0i62qHEzfsjbZ50ayLs=.pem","location":"security-state-staging/intermediates/2d27de25-cdcc-4a6f-a95e-0256cdc2d762.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xNZ3P4W2umfy0BWer+9Vg+Vb0i62qHEzfsjbZ50ayLs=","crlite_enrolled":false,"id":"2613d4d8-6244-44f1-908d-c456ecf17c6e","last_modified":1562108420466},{"schema":1562108418936,"derHash":"zHI8pITxsETH1CotSfFz93pUdi5d3qRM5HtTHwSPMzo=","subject":"SERIALNUMBER=201816,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE2","whitelist":false,"attachment":{"hash":"a44d57c6928b5d6fe4358c55101521dde08dec3196b3e455157ab3064e29e159","size":2333,"filename":"iZcoQqVY1Shs4RFS4buBmKFfplxRq_qotaDZ_dizH5s=.pem","location":"security-state-staging/intermediates/e402cac3-292a-4520-a48d-abe845e4e403.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iZcoQqVY1Shs4RFS4buBmKFfplxRq/qotaDZ/dizH5s=","crlite_enrolled":false,"id":"9db6356b-6c7b-4d8b-b48e-4766d60776cd","last_modified":1562108419689},{"schema":1562108418187,"derHash":"QRRL1BdMMVLhylJvd9n5zonevE66bHePgVwhFktRAdM=","subject":"CN=WISeKey CertifyID Advanced Services CA 4,OU=Copyright (c) 2016 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDE2IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIFNlcnZpY2VzIENBIDQ=","whitelist":false,"attachment":{"hash":"95344e4cd8faaef89e2c2b2a1e95b7a3f7cb66fe9f8125d2ad51a3eebb0fd966","size":1865,"filename":"czPh4iiE8c9phL0gdQlH3pi0J03JPqAzh4UnwUPK_Ho=.pem","location":"security-state-staging/intermediates/47311600-cf24-4f24-a91a-b0372535414e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"czPh4iiE8c9phL0gdQlH3pi0J03JPqAzh4UnwUPK/Ho=","crlite_enrolled":true,"id":"1d7c7208-5af5-41ba-bdf5-ba68ae6bfe91","last_modified":1562108418928},{"schema":1562108416654,"derHash":"nkNiqRiokAmHfHuLGQ52OuASrUfBzKX8zxZvwJK8Kt4=","subject":"CN=NETLOCK Trust Qualified QSCD CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSgwJgYDVQQDDB9ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBRU0NEIENB","whitelist":false,"attachment":{"hash":"a9db5eb17262cb517f68c8b87a2d5cdf87701cef4f06e04fc0682b56add2277d","size":2081,"filename":"olqhNjTm2Sp9m1ZCWJdK_014dkyXVLKhU2hA03JqJDI=.pem","location":"security-state-staging/intermediates/e8f32acc-3396-4ecf-80ac-5467edd7dc61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"olqhNjTm2Sp9m1ZCWJdK/014dkyXVLKhU2hA03JqJDI=","crlite_enrolled":false,"id":"2a3597e8-9e52-40c9-8dcc-bdcde662da91","last_modified":1562108417422},{"schema":1562108415879,"derHash":"zHJT696ffpLLope1ut7Rsi5c6spSXiAbTcQQ9PNQS14=","subject":"CN=CFCA EV OCA,O=China Financial Certification Authority,C=CN","subjectDN":"MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgRVYgT0NB","whitelist":false,"attachment":{"hash":"74214137d4d8e9fcca062824947ddab76b72e3385e4e90362d532dea748a76cf","size":1898,"filename":"Ub-bKk6h-qrzcElkX07080gHiz8CDNkXagA7GJtPu0I=.pem","location":"security-state-staging/intermediates/7b653369-09f2-4882-9c83-209a35b305e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ub+bKk6h+qrzcElkX07080gHiz8CDNkXagA7GJtPu0I=","crlite_enrolled":true,"id":"2f50d8ff-d71a-4851-afa7-4fb7a4e14792","last_modified":1562108416646},{"schema":1562108414362,"derHash":"3VusTxu1NWrpjT8MjiTFnfhBmaVvePHBYRlqrXAoMJQ=","subject":"CN=HARICA Qualified Legal Entities ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGbMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE1MDMGA1UEAwwsSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"a4cd0b48e010309b799dbe232f333f24ec85e074e6fd8da5a72edd0e25b44499","size":1414,"filename":"gEkeI7w_XC0tO__4tVBt-LIgmfNb_WGyHCLBVLOc6dM=.pem","location":"security-state-staging/intermediates/1a8c88f8-0214-411b-ba36-7189845bcd0d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gEkeI7w/XC0tO//4tVBt+LIgmfNb/WGyHCLBVLOc6dM=","crlite_enrolled":false,"id":"c6f7214a-3948-4a66-9853-a1cd614541b8","last_modified":1562108415116},{"schema":1562108410570,"derHash":"YHXaXOzRXWWExVYDItXAn8IZnlLep5IdkQQKp1JIZy4=","subject":"CN=NCC Group Secure Server CA G2,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEcy","whitelist":false,"attachment":{"hash":"f12f3260268153b74fe5f7a70e593d2e60ab8a06d81aedc45bbc58dfba23d7b3","size":1593,"filename":"I00VnH3kFOOpwcnmh-WRlnA_EFwJgSkqGVgxV5O2veg=.pem","location":"security-state-staging/intermediates/8e1d6726-9296-4299-8659-1eaa656eb71c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I00VnH3kFOOpwcnmh+WRlnA/EFwJgSkqGVgxV5O2veg=","crlite_enrolled":true,"id":"9690b65c-a95f-41d0-b2fb-794178af9721","last_modified":1562108411311},{"schema":1562108409064,"derHash":"JBE2Mn3ArshJc9H6my0NwCd5cDeuPtZUVk47hfx9siE=","subject":"CN=AffirmTrust Commercial Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgQ29tbWVyY2lhbCBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"3d38da18b7f343201573fda5c10ce7e844328f110190ddaa3e93682e93c4f324","size":1581,"filename":"cP3S-p60iPGa8-tLw-iQ2NE3CAx2vu0EeyZs6EXiCyo=.pem","location":"security-state-staging/intermediates/e3f6fafa-7ce4-4548-9824-9e111896a9f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cP3S+p60iPGa8+tLw+iQ2NE3CAx2vu0EeyZs6EXiCyo=","crlite_enrolled":false,"id":"c5710470-cd77-44c2-83de-2a5580439c6a","last_modified":1562108409809},{"schema":1562108407555,"derHash":"TLXLcF1JUkl7TtfEaoVk6lyRNyefOMhre8qOiIOGiwk=","subject":"CN=Atos TrustedRoot Client-CA 2012,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIDIwMTIxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"237c2a98d0510ae3a9b74e7c36f58c7ec853417862f70d9eb1c558c23bcff6d9","size":1544,"filename":"QmoGZPrbEdG8ih-gUVH1279QqNMzEBlTyT6SsmZm4wo=.pem","location":"security-state-staging/intermediates/33f056bb-fc6e-4125-8eda-19f374d949e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QmoGZPrbEdG8ih+gUVH1279QqNMzEBlTyT6SsmZm4wo=","crlite_enrolled":false,"id":"44de3fa2-feb4-4729-b8cc-b010e83aeb80","last_modified":1562108408307},{"schema":1562108406771,"derHash":"YrSPUeWGhnb9ebndnbmLqShJS6c0QDxYM5PELOAK1Eg=","subject":"CN=Valid Certificadora Digital SSL DV CA 2018,OU=VALID SSL DV,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEVMBMGA1UECxMMVkFMSUQgU1NMIERWMSQwIgYDVQQKExtWQUxJRCBDRVJUSUZJQ0FET1JBIERJR0lUQUwxMzAxBgNVBAMTKlZhbGlkIENlcnRpZmljYWRvcmEgRGlnaXRhbCBTU0wgRFYgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"de35a9e8e654d603d0f474837e0d281de2ee85cb77fc4e646d172e507ed6d447","size":1886,"filename":"2UPUODmQxMZsvFIsK7JgdFSPY-kZ_qKP-7aXPh1_bx8=.pem","location":"security-state-staging/intermediates/f3d5b520-757c-47d4-ad47-ad1a07b45316.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2UPUODmQxMZsvFIsK7JgdFSPY+kZ/qKP+7aXPh1/bx8=","crlite_enrolled":true,"id":"bee64529-5dc9-4da4-a777-437f3b51e31b","last_modified":1562108407547},{"schema":1562108404463,"derHash":"uITtZSdDNodifTUVfpBGkNLf9qXc084me7rxWcBvUFQ=","subject":"CN=Qualified e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MH4xCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEjMCEGA1UEAwwaUXVhbGlmaWVkIGUtU3ppZ25vIENBIDIwMDkxHzAdBgkqhkiG9w0BCQEWEGluZm9AZS1zemlnbm8uaHU=","whitelist":false,"attachment":{"hash":"bf48fc2c3b14d73b262a97912ba1131615bfc904ad5308aa6b2e6cf791f65740","size":1756,"filename":"Z91mM3fIfALcmTPBS54fQeHpI3uGuUg9kgkk7DDv-Fc=.pem","location":"security-state-staging/intermediates/177a6f68-3005-4b93-8a1d-b32344504ae0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z91mM3fIfALcmTPBS54fQeHpI3uGuUg9kgkk7DDv+Fc=","crlite_enrolled":false,"id":"88820ee2-60db-4e83-807f-ac34e6f6689a","last_modified":1562108405220},{"schema":1562108402917,"derHash":"pfL9DWbbTdd6KRTtPHR8vZfnNM9OK28hf7QapOr96tI=","subject":"CN=NetLock Min\u0151s\u00edtett Eat. Spec. (Class Q Legal Spec.) Kiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG3MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFFMEMGA1UEAww8TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiBTcGVjLiAoQ2xhc3MgUSBMZWdhbCBTcGVjLikgS2lhZMOz","whitelist":false,"attachment":{"hash":"960b0e99960f66aedab8032a321d21b1ee47b83c0bf8a84a35997f846a5cb818","size":2203,"filename":"ZFsXBjpAqEkgk5r4JAL_ikmxkDiIWah9rrr4UEJ-IYE=.pem","location":"security-state-staging/intermediates/f4f080e9-09db-4a3b-b6ca-670808743e87.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZFsXBjpAqEkgk5r4JAL/ikmxkDiIWah9rrr4UEJ+IYE=","crlite_enrolled":false,"id":"b99f664a-470e-47f9-8280-2596d76a8af8","last_modified":1562108403692},{"schema":1562108402151,"derHash":"Gu3a3cHtdIVD6vWWDflq1R4hoxZPMKBkDLBzI2XTkGI=","subject":"CN=DigiCert Direct Non-Provider CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IERpcmVjdCBOb24tUHJvdmlkZXIgQ0E=","whitelist":false,"attachment":{"hash":"d70798a706e24279bc01aec7ee38e8a6f268c696909fd27a60301559bd6cac7c","size":2028,"filename":"P-Xat14QLgbjUjCT7mpCpRhoSz0DbCWgcxqMJ-N0cF4=.pem","location":"security-state-staging/intermediates/bda76267-a787-4598-8441-1baec31cfa9e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P+Xat14QLgbjUjCT7mpCpRhoSz0DbCWgcxqMJ+N0cF4=","crlite_enrolled":false,"id":"baa93922-a81d-4284-9799-aba68348f2b1","last_modified":1562108402909},{"schema":1562108399777,"derHash":"D2ctkqCwbO6UjwOyclAmAsbjfSoq1pSjHV3jExlukoI=","subject":"CN=Certum Digital Identification CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGKMQswCQYDVQQGEwJQTDEiMCAGA1UECgwZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECwweQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDDCVDZXJ0dW0gRGlnaXRhbCBJZGVudGlmaWNhdGlvbiBDQSBTSEEy","whitelist":false,"attachment":{"hash":"dba1fd363ac38cad212628cf7ec587f5e6478eb1b348d0b671e2f4ecad1116ce","size":1731,"filename":"QdcqIv2OPNsD75w32d9tMDyai2-ClzSRt_49i0WYwbU=.pem","location":"security-state-staging/intermediates/a1b2a835-7618-44f6-a32a-dbdc1ae40941.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QdcqIv2OPNsD75w32d9tMDyai2+ClzSRt/49i0WYwbU=","crlite_enrolled":true,"id":"8110be87-231b-42a7-80a7-db15071d3b5a","last_modified":1562108400573},{"schema":1562108396760,"derHash":"OFE1qxjdGQoDvMBgGspvg86jZmQnkevgov2wWcL3dQo=","subject":"CN=Valid Certificadora Digital AlphaSSL CA 2018,OU=VALID AlphaSSL,O=VALID CERTIFICADORA DIGITAL,L=S\u00c3O PAULO,ST=S\u00c3O PAULO,C=BR","subjectDN":"MIGtMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8ODTyBQQVVMTzETMBEGA1UEBwwKU8ODTyBQQVVMTzEXMBUGA1UECxMOVkFMSUQgQWxwaGFTU0wxJDAiBgNVBAoTG1ZBTElEIENFUlRJRklDQURPUkEgRElHSVRBTDE1MDMGA1UEAxMsVmFsaWQgQ2VydGlmaWNhZG9yYSBEaWdpdGFsIEFscGhhU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"1d845c0c12f1aa29e304d16f0a848dd922bec000e52dd07fd07e93aa887204fb","size":1894,"filename":"sXlIJeJFOOvNqrgfAHM5544oX_ySPnrWUt8M7eFF0BM=.pem","location":"security-state-staging/intermediates/ddbf549d-2f5c-4a1f-838b-8b58934c19ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sXlIJeJFOOvNqrgfAHM5544oX/ySPnrWUt8M7eFF0BM=","crlite_enrolled":true,"id":"1b4a7649-9862-4267-8efa-0fe6bf75a335","last_modified":1562108397499},{"schema":1562108393006,"derHash":"WUXcU0sLHzdzXVrtTrXWZBcvKFruYKnnsYJFqg4RmPY=","subject":"CN=FujiSSL SHA2 Domain Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHUxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKzApBgNVBAMTIkZ1amlTU0wgU0hBMiBEb21haW4gU2VjdXJlIFNpdGUgQ0E=","whitelist":false,"attachment":{"hash":"e26de9b3dc4701004f0c895f5950b7c3b99233b7974b7618e6c960f0736fd2ed","size":2138,"filename":"vaPiW3esM9sfzdxIpWhz2dO053le6lZAjqtv-y_vZN8=.pem","location":"security-state-staging/intermediates/c8cb6374-215c-4f0c-bd04-6477b7579404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vaPiW3esM9sfzdxIpWhz2dO053le6lZAjqtv+y/vZN8=","crlite_enrolled":false,"id":"16682234-e483-4e72-9b5a-9a6efd36c796","last_modified":1562108393755},{"schema":1562108391480,"derHash":"ThB8mBtCrL5BwBBn4W1E22SBTUGT5XIxfqBLh8ecR18=","subject":"CN=Microsoft IT TLS CA 2,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgMg==","whitelist":false,"attachment":{"hash":"fa0452ec65893af4305ad26caace601ac42397ffc2e9e076caf9a35747718fb4","size":2036,"filename":"wBdPad95AU7OgLRs0FU_E6ILO1MSCM84kJ9y0H-TT7s=.pem","location":"security-state-staging/intermediates/c642cb8e-2b2e-4332-a8a6-2d5d2c3b16d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wBdPad95AU7OgLRs0FU/E6ILO1MSCM84kJ9y0H+TT7s=","crlite_enrolled":true,"id":"e5c4430f-8a00-49dd-acc5-6d71f306197e","last_modified":1562108392249},{"schema":1562108389969,"derHash":"yeQPToM5bzSnyGGBe07as9wfi6xpn9UMsmH6kSPVXvQ=","subject":"CN=SwissSign Personal Silver CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxMDAuBgNVBAMTJ1N3aXNzU2lnbiBQZXJzb25hbCBTaWx2ZXIgQ0EgMjAxNCAtIEcyMg==","whitelist":false,"attachment":{"hash":"8b3dff1c600553b50452dcbd5783cbfaa219a177d66705c2de0f41eb51b439a5","size":2398,"filename":"m0Mz3XVaph4DGN-UfcVV7i83DtSCwW0evxwDvZf_j18=.pem","location":"security-state-staging/intermediates/2b6e11e8-fc81-45eb-9865-4123414df1e4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m0Mz3XVaph4DGN+UfcVV7i83DtSCwW0evxwDvZf/j18=","crlite_enrolled":true,"id":"59ced421-04b9-4022-85c6-56f10093da01","last_modified":1562108390730},{"schema":1562108387700,"derHash":"O7dLHmfyh2k2ivEdxJmzH04EWaeG87DYSbautZ0JJAI=","subject":"CN=SSLs.com ECC OV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gRUNDIE9WIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"4939e1795fca3391bc0db9bc8f5811b9b0e674f81acfea9231d664951a81cb88","size":1293,"filename":"8OVFe7aea8Jz58DI1YaYq0kntK7F4fquqS_LHwOMg5o=.pem","location":"security-state-staging/intermediates/495221d4-c8f4-46e1-af68-9c7206d5a087.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8OVFe7aea8Jz58DI1YaYq0kntK7F4fquqS/LHwOMg5o=","crlite_enrolled":false,"id":"e7f1ddc8-069b-4e0c-bc6d-e01d625d6a08","last_modified":1562108388457},{"schema":1562108386186,"derHash":"wwglzEhNigQOU88UmxrJfd23UxuquaApSZVd0ZOpI00=","subject":"CN=MilleniumSign Client Certificate CA RSA,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBSU0E=","whitelist":false,"attachment":{"hash":"a54a84bb2453ebc048576af4fc423e61caeb9cdcd2fda841b2f06fa4c827ce22","size":2576,"filename":"hOFjGAY71ZLu8PPt7a2bECwp5eQ64MVhmY-YMuRoz9g=.pem","location":"security-state-staging/intermediates/16d6a3de-3853-4c67-bfb2-b55faf4ac55d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hOFjGAY71ZLu8PPt7a2bECwp5eQ64MVhmY+YMuRoz9g=","crlite_enrolled":false,"id":"b5e87096-07f0-434a-a474-cca6d773c227","last_modified":1562108386929},{"schema":1562108385424,"derHash":"LYGa85fiidxBcJxKr22jsZBHScN6mVhgdFgDcW19VpA=","subject":"CN=Greek Federation of Judicial Officers Client SubCA R1,O=Greek Federation of Judicial Officers,L=Athens,C=GR","subjectDN":"MIGOMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMS4wLAYDVQQKDCVHcmVlayBGZWRlcmF0aW9uIG9mIEp1ZGljaWFsIE9mZmljZXJzMT4wPAYDVQQDDDVHcmVlayBGZWRlcmF0aW9uIG9mIEp1ZGljaWFsIE9mZmljZXJzIENsaWVudCBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"0906c63c05fc31a8f79768dd10295ea5c4df3a910c3c3f60bacd569952f373aa","size":2653,"filename":"sUxJeFBsILOAdDVzCbynXcS6cAmOTI2zpF9_nG1gGVA=.pem","location":"security-state-staging/intermediates/ffb8f4dd-ad63-4ca3-a907-f70c1586c828.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sUxJeFBsILOAdDVzCbynXcS6cAmOTI2zpF9/nG1gGVA=","crlite_enrolled":false,"id":"6d3f8d5a-8bd5-4e16-a08b-1dd8bcf34dee","last_modified":1562108386178},{"schema":1562108383131,"derHash":"wG4wf3z8HTL6cqTAM8h7kAGa8hbwd11kl4ouymyKIw4=","subject":"CN=GeoTrust TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFkdlb1RydXN0IFRMUyBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"79eaef52d1cceae208d6f4e81408cb6e81bd7358789d8d112f8acbab4bbf4f9c","size":1638,"filename":"SDG5orEv8iX6MNenIAxa8nQFNpROB_6-llsZdXHZNqs=.pem","location":"security-state-staging/intermediates/bbd8d31a-289d-443b-8947-9b039ab58447.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SDG5orEv8iX6MNenIAxa8nQFNpROB/6+llsZdXHZNqs=","crlite_enrolled":true,"id":"7c77748b-8cf1-488f-82d1-6b8f1e0d0a79","last_modified":1562108383872},{"schema":1562108376267,"derHash":"gi49jOlkYrTRnLaqwvzW0BvIAvknqYgBvuQaYAar2wg=","subject":"CN=MilleniumSign for Code Signing,O=MilleniumSign Limited,C=MU","subjectDN":"MFYxCzAJBgNVBAYTAk1VMR4wHAYDVQQKDBVNaWxsZW5pdW1TaWduIExpbWl0ZWQxJzAlBgNVBAMMHk1pbGxlbml1bVNpZ24gZm9yIENvZGUgU2lnbmluZw==","whitelist":false,"attachment":{"hash":"0e4a98b456f055fcf5a701286182d62ceff18ce1934e29b1deadf3935437f5e0","size":2410,"filename":"qlXmtrIuqV9vnNsJSci6M_sJhZlMGXPnHJYHEN04TTk=.pem","location":"security-state-staging/intermediates/63c67f55-7a99-421c-b700-926ab61fe6a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qlXmtrIuqV9vnNsJSci6M/sJhZlMGXPnHJYHEN04TTk=","crlite_enrolled":false,"id":"9d070cd0-86dd-4c32-85c2-3a3f935d9318","last_modified":1562108377012},{"schema":1562108373975,"derHash":"DXcmr9BKeUiHGS2L5nVUxnqWJrZ8aYlrarFNk7b1IIY=","subject":"SERIALNUMBER=201813,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEz","whitelist":false,"attachment":{"hash":"25d4248de319a28014ec0cf686ef1ddc39672abf62dc8c4f119a8b5b211c5176","size":2333,"filename":"gROmlz_cKoI7EYRQWxyKlftDUTbm3X5KMEAtOpzPXcU=.pem","location":"security-state-staging/intermediates/b5542973-393c-4d34-aecf-bc7d0c94f780.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gROmlz/cKoI7EYRQWxyKlftDUTbm3X5KMEAtOpzPXcU=","crlite_enrolled":false,"id":"65a12163-eb84-4ce9-b597-ed03a1cda6e8","last_modified":1562108374721},{"schema":1562108373221,"derHash":"zXQZjUwj5HAd6leYkjIbnk9HoIvYN0cQuJmq0UlaSzU=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - INFRAESTRUCTURA,OU=Security Services,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGNMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRowGAYDVQQLDBFTZWN1cml0eSBTZXJ2aWNlczESMBAGA1UEBRMJQTYyNjM0MDY4MS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gSU5GUkFFU1RSVUNUVVJB","whitelist":false,"attachment":{"hash":"8f2caf097fcff03e0699cc947be66db51b738d2ae4d9481b13fef2c166fac062","size":2487,"filename":"bB8VW561_UmK2rypmzhiK744upv6JxAcWmqJ9U-BKSI=.pem","location":"security-state-staging/intermediates/1cf6f683-a938-4991-9e52-8f8c6761d4a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB8VW561/UmK2rypmzhiK744upv6JxAcWmqJ9U+BKSI=","crlite_enrolled":true,"id":"9e8d85f9-dacd-4a25-bb9f-968c95b025bb","last_modified":1562108373967},{"schema":1562108370940,"derHash":"BhmQXJLK7Il4jbVXqxd7CkzVBTHj7Vfyc3C37I2sG1o=","subject":"CN=CEDEFOP CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MGsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEWMBQGA1UEAxMNQ0VERUZPUCBDQSBSMQ==","whitelist":false,"attachment":{"hash":"595d6d2bf45a14ddc1ffd60f66b695249fe00d29fb53b62b1e1bcc2e0a9331d6","size":2853,"filename":"YuB-mSHGYquM5m3YPwjXfls_-AzEjXJZ5KYgzqCxIhA=.pem","location":"security-state-staging/intermediates/ba1f239b-a655-4016-97f1-a4013595e819.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YuB+mSHGYquM5m3YPwjXfls/+AzEjXJZ5KYgzqCxIhA=","crlite_enrolled":true,"id":"17daabb6-2075-4349-9159-d5089bab2f15","last_modified":1562108371712},{"schema":1562108369419,"derHash":"50ZE9Gzd7kcfz81lSMXzM9vRIspKTmfWUtWxaZ4Udnk=","subject":"SERIALNUMBER=201808,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA4","whitelist":false,"attachment":{"hash":"5ed7b09bd6e807a0a0a1b54c2def32df4bd844cc32727d659412c47d8d7300ee","size":2333,"filename":"bVohMFSMdT-k3psWkA0KlSPrIugikcLKV_UR1XtURGc=.pem","location":"security-state-staging/intermediates/343127c6-0767-4e2a-b078-bb03764a6aeb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bVohMFSMdT+k3psWkA0KlSPrIugikcLKV/UR1XtURGc=","crlite_enrolled":false,"id":"cfed6e41-e0df-488e-942e-aa80872d1f16","last_modified":1562108370177},{"schema":1562108368659,"derHash":"8i22V6GpKYQavKxSZxpc7op9BpWGr4XOFt4rBd2iIlI=","subject":"CN=KPN BV PKIoverheid Organisatie Services CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHMxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExODA2BgNVBAMML0tQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"55c902d78023e31283d149be854a3bbbbc37c60fa0b2039ba9f502851c94e5a3","size":2658,"filename":"R1jl1Axf32rFh-a9lHscwaUbU7s51_fPXWqGaLybSy4=.pem","location":"security-state-staging/intermediates/8a71784b-c95a-4df8-8a2d-fbb12104a39d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"R1jl1Axf32rFh+a9lHscwaUbU7s51/fPXWqGaLybSy4=","crlite_enrolled":false,"id":"373e81fd-20d6-4770-afa2-1ca53260afa4","last_modified":1562108369411},{"schema":1562108367880,"derHash":"UH22DSY9PQnSg94uOqQ139h3XlK8M1cC44Mru1fsHL0=","subject":"CN=UZI-register Zorgverlener CA G3,O=CIBG,C=NL","subjectDN":"MF8xCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEoMCYGA1UEAwwfVVpJLXJlZ2lzdGVyIFpvcmd2ZXJsZW5lciBDQSBHMw==","whitelist":false,"attachment":{"hash":"075195032f66084393a80e78ea0276fb17f7871b6e35672e94580ec0b3e8eca5","size":2552,"filename":"LJbktDpUTtQFxix-TH4PidTGLrt1SGxWZUTWK8SCn9Q=.pem","location":"security-state-staging/intermediates/b35760a9-b8ff-4af3-a942-4c05ac26f0ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LJbktDpUTtQFxix+TH4PidTGLrt1SGxWZUTWK8SCn9Q=","crlite_enrolled":false,"id":"fcc67e61-43b8-4146-9df6-e8af510e8ca5","last_modified":1562108368651},{"schema":1562108366331,"derHash":"R7LvvDZw59tLQfIsUfwC7oT7Lb8wgqSfLCaIEi6SEKE=","subject":"CN=emSign SSL CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGYxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRswGQYDVQQDExJlbVNpZ24gU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"99a70855fffb043bc441083724ab6299ce68f28ce7c76547b9782e13a92d30ce","size":1622,"filename":"qvzNg6-PS7JbCFR-FL-eAfFZOiN6pXXsH1tc9auHlF8=.pem","location":"security-state-staging/intermediates/bc26b3e5-5243-4ed4-89a5-ee29b7471158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qvzNg6+PS7JbCFR+FL+eAfFZOiN6pXXsH1tc9auHlF8=","crlite_enrolled":true,"id":"136071c8-bc0a-49f6-9eed-0f027892d327","last_modified":1562108367113},{"schema":1562108365569,"derHash":"01M7cypRim2mjvJmCF4R39EUwOsAks1DUwpE1UuRPtE=","subject":"CN=Secure Site CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xFzAVBgNVBAMTDlNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"93b4a44bb6fe2449a59754db745e41e1157b80bf49f3c2f364ac5f13eaca7195","size":1662,"filename":"3mc_12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=.pem","location":"security-state-staging/intermediates/23ace4b9-0495-4126-8dd9-71f058704b6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3mc/12C2pwvtV5JjfcxLmbbWYQSbj9yqSWLXKfZcMUw=","crlite_enrolled":true,"id":"3901ad61-ba32-4e7e-985a-e7e654c02bf8","last_modified":1562108366323},{"schema":1562108364782,"derHash":"odJdKJQfr8DCpuueWWpUeG5zHQpKjjIdufHPLCT91gk=","subject":"CN=Actalis Authentication CA G3,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MHsxCzAJBgNVBAYTAklUMQ8wDQYDVQQIDAZNaWxhbm8xDzANBgNVBAcMBk1pbGFubzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxJTAjBgNVBAMMHEFjdGFsaXMgQXV0aGVudGljYXRpb24gQ0EgRzM=","whitelist":false,"attachment":{"hash":"460a8caeba0a48e1b86b9aa61e29fe8358616f76304f1fbd67cb2527e77b9037","size":2243,"filename":"qqFYlKc1lGtPZDV3-S2Iiq7okt-fD5tWC2AM1QEBmEg=.pem","location":"security-state-staging/intermediates/8b0fb3aa-de5c-498b-ab03-3d295c24ca08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qqFYlKc1lGtPZDV3+S2Iiq7okt+fD5tWC2AM1QEBmEg=","crlite_enrolled":true,"id":"0fdbe9d5-d2f3-4438-9a51-df510e92865a","last_modified":1562108365561},{"schema":1562108363263,"derHash":"2TUmaeKTSTKa9HRcVabBWdyXmrdFklFwoZgGaDgqy8A=","subject":"CN=Trusted Secure ECC Certificate Authority,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTExMC8GA1UEAxMoVHJ1c3RlZCBTZWN1cmUgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"cfc396ec00d40088987be5a9ba74a98ac12898fa4a619448bddb134a79e30a67","size":1325,"filename":"qk3cnu1avJacTvFxrZGIIPiymx-oSzPLYsolI21B5Vc=.pem","location":"security-state-staging/intermediates/af01c122-e4e5-4b49-94d0-0ac4f64457b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qk3cnu1avJacTvFxrZGIIPiymx+oSzPLYsolI21B5Vc=","crlite_enrolled":true,"id":"7a73afd8-6e01-43c6-b272-bf633048a56e","last_modified":1562108364018},{"schema":1562108362489,"derHash":"Z5dDYhTv7mfN59cDWNTYsA37941ch8YrSn55DXPde9k=","subject":"CN=DigiCert Federated ID US L4 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJzAlBgNVBAMTHkRpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBVUyBMNCBDQQ==","whitelist":false,"attachment":{"hash":"339cbbd71fc5cd220030216ee58f63f6971ca0554de6c15b8e71f2baa14c5b3f","size":1930,"filename":"B8z1mybAVZ9w8W-4h2REOU9xSFadYswGsHsY67HszP8=.pem","location":"security-state-staging/intermediates/baed048b-daf3-4094-8898-29a31f22df0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B8z1mybAVZ9w8W+4h2REOU9xSFadYswGsHsY67HszP8=","crlite_enrolled":false,"id":"3326c102-8dd1-4eb1-aa2d-5c7f1b62cb2f","last_modified":1562108363256},{"schema":1562108360956,"derHash":"AqtX5OZ6DLSN0v80gw6KxA9EdvsIymvj9c2Eb2RoQPA=","subject":"CN=COMODO RSA Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE2MDQGA1UEAxMtQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"39df71b20e752359b043877384440f181016fcba83909d1f0480b6b13d1238b7","size":2150,"filename":"klO23nT2ehFDXCfx3eHTDRESMz3asj1muO-4aIdjiuY=.pem","location":"security-state-staging/intermediates/e401cab5-bdc2-42ca-a7cd-4612737cdb04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"klO23nT2ehFDXCfx3eHTDRESMz3asj1muO+4aIdjiuY=","crlite_enrolled":true,"id":"85dd2e16-bfc0-4ca0-8489-e28bc98da7e2","last_modified":1562108361731},{"schema":1562108355542,"derHash":"ufIWQyNjjc4LkiGLQ8QcGysmljiTKdsZ9c961Jtcs3I=","subject":"CN=Gandi Standard SSL CA 2,O=Gandi,L=Paris,ST=Paris,C=FR","subjectDN":"MF8xCzAJBgNVBAYTAkZSMQ4wDAYDVQQIEwVQYXJpczEOMAwGA1UEBxMFUGFyaXMxDjAMBgNVBAoTBUdhbmRpMSAwHgYDVQQDExdHYW5kaSBTdGFuZGFyZCBTU0wgQ0EgMg==","whitelist":false,"attachment":{"hash":"8b8a18be1cbca4662145d1b20e4f1e0f1394d7a0bcacd4d74108106348147956","size":2109,"filename":"WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV-nNm1r4=.pem","location":"security-state-staging/intermediates/63de5a2b-d709-4e92-b743-8310ba76d460.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=","crlite_enrolled":true,"id":"75d81643-efbd-4a64-a1d1-bc45d79dc4bc","last_modified":1562108356326},{"schema":1562108354774,"derHash":"CU94xT7F2AgrxdWq0bEdXflSvlaTM1jb9ZY1QpE6UM0=","subject":"CN=HARICA Qualified Natural Entities SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEzMDEGA1UEAwwqSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"ed8b5c559e2fdf67dc679531bb2002bd0c1dcf26404c524d1707664a75852b12","size":2605,"filename":"ac0teCLoYEgCWHxksbpmW-G4cqCFgOJn4OxagiS1C-8=.pem","location":"security-state-staging/intermediates/b83579aa-a5ff-4575-adac-59e8ff66b1ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ac0teCLoYEgCWHxksbpmW+G4cqCFgOJn4OxagiS1C+8=","crlite_enrolled":false,"id":"edaf0f56-3588-493d-821d-fd24d28bc8c8","last_modified":1562108355535},{"schema":1562108354022,"derHash":"KvmI8m9u8Nq5BVaX8JQftOXEIkfKmCgmiV7ymYXTDNY=","subject":"CN=Apple Public Server ECC CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIEVDQyBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"9965d9b518d900e8daeab6fe08b6e6227a1114bb092251f35ffa9176cc753453","size":1163,"filename":"jT8fGVx6BA9z4arxOCBTK2xfhH6Uhco7diQx-k5Yo38=.pem","location":"security-state-staging/intermediates/782181df-19dc-4eb7-bc29-2f853bbcd8f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jT8fGVx6BA9z4arxOCBTK2xfhH6Uhco7diQx+k5Yo38=","crlite_enrolled":false,"id":"fdfcd022-f30c-40bf-a845-ed9f60c08730","last_modified":1562108354766},{"schema":1562108353265,"derHash":"kMZx4I5oI7hkbC7BgCN2msD8NDijPBAfZoO5XeMYBSQ=","subject":"CN=COMODO ECC Extended Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGUMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE6MDgGA1UEAxMxQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"c9c170b80feb89e0a62d9e1bc3a6e7612dcba1cdbb90d3e362acefa08fbc39b8","size":1366,"filename":"8BVB_xN70KohDkSwXqSXWyZjE3Wl2yUIqPlb8CShV54=.pem","location":"security-state-staging/intermediates/89831d8e-226f-4cf8-8e53-94bbf49b2c8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8BVB/xN70KohDkSwXqSXWyZjE3Wl2yUIqPlb8CShV54=","crlite_enrolled":false,"id":"8544bcc4-1d96-4822-a172-bfaedf576aa9","last_modified":1562108354014},{"schema":1562108352498,"derHash":"bmzMzdeogw6iKI01dgUylUJcBfXunbS3JjKh4mnd0MM=","subject":"CN=United Parcel Service\\, Inc. RSA Codesigning CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjE3MDUGA1UEAxMuVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"4f65ee96ef6dbaf15ab703424d981e03c5b84da1123c789b217310553578e58a","size":2125,"filename":"RPhKvLLQGKteXTbVCCrOIPDyAFANSXGqusA4X-LA8NE=.pem","location":"security-state-staging/intermediates/5f7d9e0e-c92a-47cf-bd97-24ecd52cfb08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RPhKvLLQGKteXTbVCCrOIPDyAFANSXGqusA4X+LA8NE=","crlite_enrolled":false,"id":"cf08ce37-7a22-489d-80a6-bd86c0596d6b","last_modified":1562108353258},{"schema":1562108350087,"derHash":"GFwK5HBCO51GeKfBBVtbSNkHBVBbeU4hXAY4UTNpgfQ=","subject":"CN=GeoTrust EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0dlb1RydXN0IEVWIFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"a0a4b49c90bff29d9b9a8c5f2ef42bb769f854311f7a16f1b9861161f8870867","size":1666,"filename":"yWulDX8E5Q0XG4-9jVDljmO2FvAVzIRhn2MppW4vyUM=.pem","location":"security-state-staging/intermediates/7f58a4e2-a3f0-4b3c-bce7-96138c4ad930.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yWulDX8E5Q0XG4+9jVDljmO2FvAVzIRhn2MppW4vyUM=","crlite_enrolled":true,"id":"da405d05-6b42-461a-ad4d-d8e77fcc80a3","last_modified":1562108350832},{"schema":1562108349322,"derHash":"XmCWWARGGTCsJ7bb40RWeerkExwir7iK96z2oZF7Wro=","subject":"CN=SecureTrust Domain Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHwxMjAwBgNVBAMTKVNlY3VyZVRydXN0IERvbWFpbiBWYWxpZGF0aW9uIENBLCBMZXZlbCAxMRQwEgYDVQQKEwtTZWN1cmVUcnVzdDEQMA4GA1UEBxMHQ2hpY2FnbzERMA8GA1UECBMISWxsaW5vaXMxCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"808680a0c2b3da12440074c2cecf8ba7b7a50796c469c901bf2bae7963658f5d","size":1618,"filename":"3MJ7kgH4AG-ip6CMzIBTeYe9X-9dSxFjCbnEIuYJlWA=.pem","location":"security-state-staging/intermediates/cfd0f4ac-b77c-4563-aeb5-243676326507.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3MJ7kgH4AG+ip6CMzIBTeYe9X+9dSxFjCbnEIuYJlWA=","crlite_enrolled":false,"id":"9bc337d9-2ebf-4b9a-a405-087a0a528af3","last_modified":1562108350078},{"schema":1562108348554,"derHash":"96hOJOjg2JFUh0chxbZB9Ioe8P87GY9TvgIdtT8Je9A=","subject":"CN=GeoTrust Primary Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtHZW9UcnVzdCBQcmltYXJ5IElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"4de8a182cd4692f539e1d1dd8938d2138d6e2c5e38b08e367a1f5223133d6790","size":1670,"filename":"N-1Ur2ovpcaBJa_gbazCpyWohrWTdX7YCwfN2n8jSvQ=.pem","location":"security-state-staging/intermediates/87eb41dc-9c52-4580-ad5c-4a0b65a013eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N+1Ur2ovpcaBJa/gbazCpyWohrWTdX7YCwfN2n8jSvQ=","crlite_enrolled":false,"id":"ef45312a-79cb-4973-8c28-14dc799a414c","last_modified":1562108349314},{"schema":1562108347772,"derHash":"nwIC1JJY2uQREYrxPwVebQxuh239KUMJeiveVFI1YJg=","subject":"SERIALNUMBER=201906,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA2","whitelist":false,"attachment":{"hash":"6be84562c866325f09ab7303e3c1001be8bb3c68f97aaab49df216cedbbb00ab","size":2333,"filename":"NgK9fKJF5ODcUC7yeq9jYkJgOh_aHc2YrfRLKoa7i20=.pem","location":"security-state-staging/intermediates/092e8bca-4b27-4d32-ab96-d805edc41385.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NgK9fKJF5ODcUC7yeq9jYkJgOh/aHc2YrfRLKoa7i20=","crlite_enrolled":false,"id":"6b470922-d941-49d7-a9f2-333a66bd4a69","last_modified":1562108348545},{"schema":1562108344661,"derHash":"Cqny59lccYt9HrfM29AWToYFeunWaSK8YPmQP5Sg8O8=","subject":"CN=GlobalSign Qualified CA 3,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAz","whitelist":false,"attachment":{"hash":"71031147564393ba600fd320c83c634a774e41ba086cc8f9e545656fcdabcef3","size":2109,"filename":"Jq1QOk-soKGVmobJu53tx3FfjSDpUS8-6JHMIRiTfyY=.pem","location":"security-state-staging/intermediates/9f11ba63-2039-4037-aeaa-70bbf201813d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Jq1QOk+soKGVmobJu53tx3FfjSDpUS8+6JHMIRiTfyY=","crlite_enrolled":false,"id":"2566de5f-27d3-4c41-a2ac-70e1afaa43f0","last_modified":1562108345474},{"schema":1562108341582,"derHash":"uhMFYzTMdV9dJ6qwvpnly5cJ0DQ7QF4c5GlkMxu1xF8=","subject":"SERIALNUMBER=201722,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIy","whitelist":false,"attachment":{"hash":"6c705a1aa9f045020109076b1368ee11c791ad581eae0d24f9ab47fce2b136c8","size":2402,"filename":"RPN8fKuwvw-VE_LlASEpAHzv7y7CFqofIc36APwmf6U=.pem","location":"security-state-staging/intermediates/4ea45b42-7029-4fa2-9cfa-12aa1c0511dd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RPN8fKuwvw+VE/LlASEpAHzv7y7CFqofIc36APwmf6U=","crlite_enrolled":false,"id":"fe9eaa47-9e17-4a54-93e3-7e3ede93033a","last_modified":1562108342333},{"schema":1562108339272,"derHash":"GPzgkvo93kVUIjrnmwxJmiD0EUw2MHnSPY6v3JZzk2k=","subject":"CN=eMudhra ECC Domain Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGVMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxNzA1BgNVBAMTLmVNdWRocmEgRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"201778bdc7d2f1a79fae87f89e7f3c87563fb5ae692e5bef6d8a17870194a3d0","size":1345,"filename":"-OTJ6M1upuT7uMaCSaNjlP_D0AMYrqjwUWCEue0H24E=.pem","location":"security-state-staging/intermediates/776486c5-65f5-4d53-a6e6-5d510795f51c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OTJ6M1upuT7uMaCSaNjlP/D0AMYrqjwUWCEue0H24E=","crlite_enrolled":false,"id":"7c0ed329-430c-4414-a659-6daec3ec0bc0","last_modified":1562108340038},{"schema":1562108336263,"derHash":"7AICWhoVeywCrEn1Wai2zwchJvg3lJn658Uu0YPakBI=","subject":"CN=WISeKey CertifyID SSL GB CA 1,O=WISeKey,C=CH","subjectDN":"MEcxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSYwJAYDVQQDEx1XSVNlS2V5IENlcnRpZnlJRCBTU0wgR0IgQ0EgMQ==","whitelist":false,"attachment":{"hash":"91c04850b4728e964f0c7a22327101d5caa482b389819d5ea41e8347b3216573","size":1711,"filename":"V3yMbpIwzARH7Q8FlejONqe3Rck6-AsElwszbRCUyLw=.pem","location":"security-state-staging/intermediates/180c7361-b19f-476a-9846-dea89f9af2d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V3yMbpIwzARH7Q8FlejONqe3Rck6+AsElwszbRCUyLw=","crlite_enrolled":true,"id":"9d6c25a5-7949-4e2e-8ac2-d9926d5afd5f","last_modified":1562108337008},{"schema":1562108335514,"derHash":"CKJ3P5CLieNfg9wnCvuLxl6NGS8N0ktSEWFxaNYN06s=","subject":"CN=University of Western Macedonia CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLjAsBgNVBAMTJVVuaXZlcnNpdHkgb2YgV2VzdGVybiBNYWNlZG9uaWEgQ0EgUjM=","whitelist":false,"attachment":{"hash":"07a622c0054b947f643760306b50788cd9b381b0bfd2964a2a8bd78522022944","size":2536,"filename":"Ju8opIlP7q0-XAVutfqY3EgIGywyoMGPTAIfDTzsO3g=.pem","location":"security-state-staging/intermediates/189eb95b-2376-4f85-9562-34baa90ec24b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ju8opIlP7q0+XAVutfqY3EgIGywyoMGPTAIfDTzsO3g=","crlite_enrolled":true,"id":"cd81df63-b9f1-4a6f-8aca-f1449a8779f7","last_modified":1562108336255},{"schema":1562108334757,"derHash":"gOE6LoAIR1GeAj1k9PnPILQ8rdHUa6SBHSas4x4pX7s=","subject":"CN=SECOM Passport for Member PUB CA2,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTI=","whitelist":false,"attachment":{"hash":"1602b83b6e798319142c013cdb2fe6a89a8b210d20430e1a52898b81763211ad","size":1581,"filename":"3kJ__srPn_Y0kPQ-6atqtlJmgndIlfmZnUwsK0S0epg=.pem","location":"security-state-staging/intermediates/fde92bcb-5acc-4c45-bd04-b6f99f59a57c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kJ//srPn/Y0kPQ+6atqtlJmgndIlfmZnUwsK0S0epg=","crlite_enrolled":false,"id":"48e148bb-b6f8-45af-8c91-54771ca04156","last_modified":1562108335506},{"schema":1562108332475,"derHash":"s5xKRZbTGRr6Oz0lTSjlxIL80NUA4Kkzf5knfLii7vg=","subject":"CN=TrustID Server CA A52,OU=TrustID Server,O=IdenTrust,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxFzAVBgNVBAsTDlRydXN0SUQgU2VydmVyMR4wHAYDVQQDExVUcnVzdElEIFNlcnZlciBDQSBBNTI=","whitelist":false,"attachment":{"hash":"98d3cfa7dab9b95ecb8cc38637e485c249a12ae6ca445e96105f2708a82c09fa","size":2442,"filename":"baHWPQeCjK_t6GB-okH73C13ZXVDr2QAVt6jQTsq2Ys=.pem","location":"security-state-staging/intermediates/6d66de8a-8c0b-4ade-8054-7f91cdf6accb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"baHWPQeCjK/t6GB+okH73C13ZXVDr2QAVt6jQTsq2Ys=","crlite_enrolled":true,"id":"aa0a2c54-cd68-43b3-be06-0831027e3b6b","last_modified":1562108333245},{"schema":1562108330945,"derHash":"YXLXoZlsvvcaAYLdRLmenANXQqnr0DEapzqkczNExaY=","subject":"CN=CloudFlare Inc ECC CA-2,O=CloudFlare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRGbGFyZSwgSW5jLjEgMB4GA1UEAxMXQ2xvdWRGbGFyZSBJbmMgRUNDIENBLTI=","whitelist":false,"attachment":{"hash":"847a716b6f6114e3d4f88a0a3e8e573fce99330a3de33aadc98997578166aad9","size":1321,"filename":"3kcNJzkUJ1RqMXJzFX4Zxux5WfETK-uL6Viq9lJNn4o=.pem","location":"security-state-staging/intermediates/2aee9ab7-0837-4213-bf07-b65e7a210ea5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3kcNJzkUJ1RqMXJzFX4Zxux5WfETK+uL6Viq9lJNn4o=","crlite_enrolled":true,"id":"4f654672-7696-4bd6-84a2-503a66c6cfe4","last_modified":1562108331718},{"schema":1562108330185,"derHash":"chMOOyiQA0khRhf01vP7hdCEde54vwlcWUWKFNGCiGY=","subject":"CN=Amazon,OU=Server CA 2A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAyQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"2a82794488d990d2916a320c0881fba10016362c3188bf9954c30bf6848d39ec","size":2235,"filename":"G9pa__g3gTgL9wgZj599LbHgZ_FLuep7rnCqwLAwXns=.pem","location":"security-state-staging/intermediates/83918488-ba2c-4ac0-8d46-0bf63d394383.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G9pa//g3gTgL9wgZj599LbHgZ/FLuep7rnCqwLAwXns=","crlite_enrolled":false,"id":"b35b0a67-1556-41a4-a319-97a50209d163","last_modified":1562108330937},{"schema":1562108327127,"derHash":"ykOJyJ3fwxvsJsdLRKhJjFiy2DhRb6AbFPE5NinlikA=","subject":"CN=AffirmTrust Certificate Authority - DV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIERWMQ==","whitelist":false,"attachment":{"hash":"24062c77649490466b59b727862356b7b091396ef80b8d336e7a301146304ddf","size":1662,"filename":"68BRY3XqvlKubfNnBJ64F_17BHUniDemUwxZNNvfdaA=.pem","location":"security-state-staging/intermediates/4683bd6d-bd49-4e42-b154-69a18d94d8c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"68BRY3XqvlKubfNnBJ64F/17BHUniDemUwxZNNvfdaA=","crlite_enrolled":true,"id":"dcda7a02-af57-41d8-9206-72360ea3f7c1","last_modified":1562108327880},{"schema":1562108325586,"derHash":"Go15Cvmys0191q9htapM8TgLhglcusK8qzW9Vm0BgMM=","subject":"CN=Secure Site Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIlNlY3VyZSBTaXRlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"8c560a22b1260bcb7f9b8c62c6d191f6064d6125f0146ef483820a79ada1e21a","size":1687,"filename":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy_rpnLc=.pem","location":"security-state-staging/intermediates/d890ff8b-cd56-49f2-b11e-4effc32732b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GQ1NxZwFxMspL6F7W34V3JpBp8emVEoKYr5gy/rpnLc=","crlite_enrolled":true,"id":"2bbb4638-a2e8-488a-919c-7ebe87b2d089","last_modified":1562108326359},{"schema":1562108324809,"derHash":"4fLpUAD4FeEcgUkEMLXQLI2B0NJWyF32i1FtbCd2GSY=","subject":"CN=SECOM Passport for Web EV 2.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIEVWIDIuMCBDQQ==","whitelist":false,"attachment":{"hash":"11b2cc7c19c9ea658d73d93b55ba2118401c64553f83df52d6c23d8bb092eba4","size":1618,"filename":"Wa2FjlVfGKwvkiH0LYWh-y-ihHlaTmVQ-gqZEsR3RwY=.pem","location":"security-state-staging/intermediates/13abab2d-5558-442e-9c8c-9f54f283182e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wa2FjlVfGKwvkiH0LYWh+y+ihHlaTmVQ+gqZEsR3RwY=","crlite_enrolled":true,"id":"7310f222-43d0-494d-aa65-443d9a816261","last_modified":1562108325576},{"schema":1562108324028,"derHash":"cjdtWQ2aZl05alHSrqkzRjj9SxPW9emTKYMi80Tyt54=","subject":"CN=TrustSign ECC DV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"c7de9b26efc4eb3648124f025156bdbc60d2ee4df9bc5f2b40e0f3889a11aa13","size":1276,"filename":"DuV9kinKceC5mT-5PkiRrL4kz_gqWVCOloO5GTLSA8I=.pem","location":"security-state-staging/intermediates/829cc9be-f9c4-483a-8537-7de6820e7357.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DuV9kinKceC5mT+5PkiRrL4kz/gqWVCOloO5GTLSA8I=","crlite_enrolled":false,"id":"cd8781e3-476c-41fc-b598-6657d68d188e","last_modified":1562108324796},{"schema":1562108323189,"derHash":"SytyugviemNHjCc6DFtS9puJ42marU86Gg6v5muZUmU=","subject":"CN=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda. RSA EV CA,OU=Controlled by COMODO exclusively for MarketWare,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIHxMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xODA2BgNVBAsTL0NvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBNYXJrZXRXYXJlMUcwRQYDVQQDDD5NYXJrZXRXYXJlIC0gU29sdcOnw7VlcyBwYXJhIE1lcmNhZG9zIERpZ2l0YWlzLCBMZGEuIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"43c29684fc1791cf7a701d66ef4aad6b8f263f4f9493176e519013a2a3477626","size":2341,"filename":"qCF-PPuByTYruFr6MIeAiLpr2ebZPZHBVpg73sPCJwI=.pem","location":"security-state-staging/intermediates/9baba706-ea2c-4038-ab33-bc9d68d0a446.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qCF+PPuByTYruFr6MIeAiLpr2ebZPZHBVpg73sPCJwI=","crlite_enrolled":true,"id":"df37aefa-7686-4f4a-add4-d68ea15fb1a2","last_modified":1562108324019},{"schema":1562108321668,"derHash":"OXFmwBiQoBUCgI2sxcjf1L8v383BpqzDyxQh2WzzOP0=","subject":"CN=Servision Certification Authority,O=Servision Inc.,C=JP","subjectDN":"MFIxCzAJBgNVBAYTAkpQMRcwFQYDVQQKEw5TZXJ2aXNpb24gSW5jLjEqMCgGA1UEAxMhU2VydmlzaW9uIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"b4a562f44b51aeba750b02340947d52861ec82d00fb13a3c4dba87c57c923205","size":1504,"filename":"kWvg0ZVt3GHilKKOdxJccr8EU2CMQ_ITo4JOlWmPamo=.pem","location":"security-state-staging/intermediates/dd6d3c00-964b-4bdf-8c35-9a318050af9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kWvg0ZVt3GHilKKOdxJccr8EU2CMQ/ITo4JOlWmPamo=","crlite_enrolled":false,"id":"ccf0f9ed-32a8-4b69-bdeb-0fb197d51839","last_modified":1562108322404},{"schema":1562108320882,"derHash":"jNWR8zFL1XusdLP67i1wRxtdmWpP4ZfmQ4Crr56LMTM=","subject":"CN=Trend Micro S2 CA,O=Trend Micro Inc,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxGjAYBgNVBAMMEVRyZW5kIE1pY3JvIFMyIENB","whitelist":false,"attachment":{"hash":"660470ac98e8eeae43c687e25c3224ed8bd61fa05d1c8a53bdd72e466955e2f4","size":1609,"filename":"BuGwKUFbAtZDGEd6cE3s5OqR23M2h4ZmIiGT_aw3TpM=.pem","location":"security-state-staging/intermediates/5e931958-8e44-432d-ba06-12c98f350199.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BuGwKUFbAtZDGEd6cE3s5OqR23M2h4ZmIiGT/aw3TpM=","crlite_enrolled":false,"id":"81f56af1-98ca-4c3e-89b4-27e8810e31fe","last_modified":1562108321659},{"schema":1562108319370,"derHash":"kdAFBjP2JXL2eWFIhnZE7jEUCtciZuD5MFp8b9QED58=","subject":"CN=COMODO ECC Domain Validation Secure Server CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDM=","whitelist":false,"attachment":{"hash":"32e13862aeb900961956b459740f0146d3e1e95489bfd8fad22c21965d884d6e","size":1317,"filename":"yRx6JkdTon5X6I6GmE6-8BL0QUZRKbcRvDM_vt2Beyg=.pem","location":"security-state-staging/intermediates/cd53a4d9-0989-4748-90f0-77a5b878e898.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yRx6JkdTon5X6I6GmE6+8BL0QUZRKbcRvDM/vt2Beyg=","crlite_enrolled":false,"id":"9e611c86-fc3a-4ab7-b7e5-7c09eb2cf86a","last_modified":1562108320119},{"schema":1562108317833,"derHash":"VMP1AQQs3MCa6BQ8sZK9XlckyciKarOVqUoaevwmznw=","subject":"CN=DigiCert Federated Healthcare CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IEZlZGVyYXRlZCBIZWFsdGhjYXJlIENB","whitelist":false,"attachment":{"hash":"fa3f2859e516d877140c95ce6b6cfcc20adcc0576479bd8660cd9467da8d8558","size":2182,"filename":"flPZhpoPaXju4AbnPIUI-vdHW4h2ksR2LklMnV9MpzE=.pem","location":"security-state-staging/intermediates/df4a48bc-c9d4-4f52-9280-98ca919d2d3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"flPZhpoPaXju4AbnPIUI+vdHW4h2ksR2LklMnV9MpzE=","crlite_enrolled":false,"id":"8e0543db-7ee5-46cb-b691-0ecaa2627aa2","last_modified":1562108318607},{"schema":1562108317082,"derHash":"NyuPTOc77fyIcYxAe7az5tj5p5vpVxkNDnEBx7DvmjI=","subject":"CN=NetLock Expressz (Class C) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGqMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE4MDYGA1UEAwwvTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"96ba448b3b21c633bd5e293f4383a8b88b67e802476a48d48ba20ffa8359a5ce","size":2182,"filename":"KS2adY6eMaWNhbLW6JREO3Oo34Qy_UvmA5f-f4ROpYw=.pem","location":"security-state-staging/intermediates/6380c544-10af-435b-ae2d-adad842694a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KS2adY6eMaWNhbLW6JREO3Oo34Qy/UvmA5f+f4ROpYw=","crlite_enrolled":true,"id":"522256d0-e9e9-44e9-b35d-221ddf453cad","last_modified":1562108317826},{"schema":1562108316330,"derHash":"MMwfzLvsAuaJkblkWSD5qZbBJ8L8vQeVhPHXjYh1kbc=","subject":"SERIALNUMBER=201723,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIz","whitelist":false,"attachment":{"hash":"e4164234795efd76a9f953b98749a822314de01401d5c5078837c4d956d5ba3f","size":2402,"filename":"qVzRfQ2NKawghyfy2P967HGyMNOAxaW-lqGIKQbYwb4=.pem","location":"security-state-staging/intermediates/df4f4f25-4ed1-4bf7-b1ea-24e88ce80fb3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qVzRfQ2NKawghyfy2P967HGyMNOAxaW+lqGIKQbYwb4=","crlite_enrolled":false,"id":"e3ba5f2e-ca62-462e-8dd5-91bc77510b2a","last_modified":1562108317074},{"schema":1562108314030,"derHash":"StuBnCUKLhgzE0BUmdhzUpnIj5cKUBmidWayflgY9Bs=","subject":"CN=DigiCert SHA2 Assured ID Code Signing,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmc=","whitelist":false,"attachment":{"hash":"9e9e20d7379e013d029c65c1b9f114e35b9cb392ec440ae8c6a13c462abaf8ff","size":1748,"filename":"-8NGthsZ4RousKQeaozXeiZJDbaHhZwcd6xncoIcZDs=.pem","location":"security-state-staging/intermediates/16ec3e96-c579-4008-bc71-57e4816d320d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+8NGthsZ4RousKQeaozXeiZJDbaHhZwcd6xncoIcZDs=","crlite_enrolled":false,"id":"41e0a36c-c55e-4508-a53e-8813c0916ed2","last_modified":1562108314770},{"schema":1562108312519,"derHash":"ZIU2E8JDY5lgPQ1WC1LwS7j4GoF0bkI4mIOk9ZpFZNU=","subject":"CN=Secure Site Starter DV SSL CA - G2,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxKzApBgNVBAMTIlNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"aa3fd009b6c5b5c9c5458fc4dc6385393a7200967a4b5c20281e2f99cfcb3d8f","size":1788,"filename":"eDTKI6X9vxY2k_ZfHbRQ6gLLPTAmRP5hH5orVWntz8U=.pem","location":"security-state-staging/intermediates/8506f034-f774-4313-ae85-555f9a9aa758.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eDTKI6X9vxY2k/ZfHbRQ6gLLPTAmRP5hH5orVWntz8U=","crlite_enrolled":false,"id":"00c0da63-9255-49cb-9d1e-16085032d2d9","last_modified":1562108313269},{"schema":1562108311015,"derHash":"98fij7XnnzFKqsa7upMvFeGnIGn0NdTJ5wf5PKFILuM=","subject":"CN=Qualified e-Szigno TLS CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHlF1YWxpZmllZCBlLVN6aWdubyBUTFMgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"f62124b291cbf9f0ce787625de446e21f2feb0426a05212dbc6111779c02cb02","size":2231,"filename":"B-kJdgVu-sQKTRurO5lOkBlDQ-2-UfVcgWNPVcJ2soQ=.pem","location":"security-state-staging/intermediates/b048750f-1cf2-47ec-9890-3fbaec58d1eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B+kJdgVu+sQKTRurO5lOkBlDQ+2+UfVcgWNPVcJ2soQ=","crlite_enrolled":true,"id":"eb56311d-499d-4871-aa3c-4d3359fc4ec0","last_modified":1562108311758},{"schema":1562108310265,"derHash":"VHMudAahOPpIra7c2jFWGXKG1lLgiwB3MFc9ntTgOmQ=","subject":"CN=Entrust Class 1 Client CA,OU=www.entrust.net/CPS is incorporated by reference+OU=(c) 2010 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGlMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L0NQUyBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAxMCBFbnRydXN0LCBJbmMuMSIwIAYDVQQDExlFbnRydXN0IENsYXNzIDEgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"a8c67b40b563cf63c41b06a70037ad190e434c4ef19f56e4e425fce1a0f1c1c0","size":1760,"filename":"Uhene3DQaQrqKhOQL-xFNX9JZl3IsIFfWho3SE3EtBQ=.pem","location":"security-state-staging/intermediates/50703850-cc99-4156-803a-48fed64fa2df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uhene3DQaQrqKhOQL+xFNX9JZl3IsIFfWho3SE3EtBQ=","crlite_enrolled":false,"id":"08551b17-2765-4c9f-abf8-ea28abf8f427","last_modified":1562108311008},{"schema":1562108308734,"derHash":"qonEZunQaILA2q9yvg8PvP58HvKqrRkGQMStRPVRfzQ=","subject":"CN=GlobalSign CA for AATL - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENBIGZvciBBQVRMIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"faa26183cd8190e64a0334a9d0bc1653de74cdfe0addd4bd510ee4563a0b2664","size":1561,"filename":"Am8KjiB_BfHxcttxPcItD0PI_w1pckqm-saoOT32JQg=.pem","location":"security-state-staging/intermediates/d8f0e2b3-c3e9-4f66-a477-5ce6ec6be13f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Am8KjiB/BfHxcttxPcItD0PI/w1pckqm+saoOT32JQg=","crlite_enrolled":true,"id":"f3363149-33ea-4e28-8538-b42875404ad1","last_modified":1562108309489},{"schema":1562108307971,"derHash":"ABds2DVvL0kt0EqJMAHG72ELHry7E8Yf38O3BUY6B8w=","subject":"SERIALNUMBER=201725,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI1","whitelist":false,"attachment":{"hash":"92297ee53b100e26523fc1571e27142df221f691610b0e32df6e7afdf38e391e","size":2402,"filename":"P9ABMJpYdeY2_BVGAlcWULo2ZAn_I1lSLzQRDQ2Dduk=.pem","location":"security-state-staging/intermediates/6f729466-79f4-4719-8d47-79130027ab63.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P9ABMJpYdeY2/BVGAlcWULo2ZAn/I1lSLzQRDQ2Dduk=","crlite_enrolled":false,"id":"d0b10adf-94cf-4423-947b-ba7caf6fa8a8","last_modified":1562108308726},{"schema":1562108306455,"derHash":"gptouX8R3uNEhXrBLrQM5QLuUmARIwFv3r8UIAkaQEg=","subject":"CN=Actalis Organization Validated Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGVMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzI=","whitelist":false,"attachment":{"hash":"a6d698bddb2882ffe01874cc8b31fb4cd7cb7b59e5753aba4899ac8735e1c3d7","size":2328,"filename":"7OrVER1djNO1n973ik5pn3X3z2McXLh4_UHg4gcP8Qs=.pem","location":"security-state-staging/intermediates/a016d22f-4259-4a3a-a259-0b096b9d9603.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7OrVER1djNO1n973ik5pn3X3z2McXLh4/UHg4gcP8Qs=","crlite_enrolled":true,"id":"33150e34-4a0c-4a16-8c20-614694dcacbc","last_modified":1562108307204},{"schema":1562108305694,"derHash":"tuRKaTQthDY6sSGC8tK4iFAbBjp2vrADUOON3HRxUDQ=","subject":"CN=SSL.com Client Certificate Intermediate CA RSA R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBSU0EgUjI=","whitelist":false,"attachment":{"hash":"70033e723115a4788e75a0975cdeef29d5401951abddea70bbbf2d85524897b8","size":2463,"filename":"i08jg0QBQmEM-JqJgQx323fDRPRGdVoqKp1H7yz79IY=.pem","location":"security-state-staging/intermediates/327c4e9b-94d6-4642-b0c8-34c09ab42569.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i08jg0QBQmEM+JqJgQx323fDRPRGdVoqKp1H7yz79IY=","crlite_enrolled":false,"id":"b29278b7-cf9f-4a99-ac8c-29557d9756be","last_modified":1562108306447},{"schema":1562108304934,"derHash":"wrS770oaZD8zTtCFD5KIdtKuOuNkK5hgFNaMZzwE0IE=","subject":"CN=DigiCert Assured ID Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEFzc3VyZWQgSUQgSW50ZXJtZWRpYXRlIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"b1d19ffd1ee53e7e96ff68523c9665541c7f0ad33953b984c40344cfd1b1b610","size":2414,"filename":"39FMK3AAz8IFXNAeBgxX6wMg9P7FiRLFT8ZlWfn_yN4=.pem","location":"security-state-staging/intermediates/310bb2a7-3082-4ca1-9b38-806b747f54a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"39FMK3AAz8IFXNAeBgxX6wMg9P7FiRLFT8ZlWfn/yN4=","crlite_enrolled":false,"id":"aff53e0c-f01a-44b2-8421-76ed33a192d6","last_modified":1562108305686},{"schema":1562108304182,"derHash":"gq1G7N6IJBMQaxyD72XcAtsMZbOHD290S2IoPfb6HVY=","subject":"CN=DigiCert SHA1 Assured ID Code Signing CA - G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTEgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"7231d127229533342baeaa15873fec434cf18f783b1e0d40608577aef1cbf7c9","size":1898,"filename":"0w_4AUxe0Bd0wAJYMdu6EnJD9JmcIGhTrapIAusbp8g=.pem","location":"security-state-staging/intermediates/d099988a-680a-48ad-b2cb-9367e335da89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0w/4AUxe0Bd0wAJYMdu6EnJD9JmcIGhTrapIAusbp8g=","crlite_enrolled":false,"id":"dd18bf6f-8293-49a7-b238-5944b684f761","last_modified":1562108304925},{"schema":1562108301877,"derHash":"RMUKyA7b6eVS48ls5b0RyDfHD1ajOsq88Y2Neps1Dgc=","subject":"CN=EC-PARLAMENT,OU=Serveis Publics de Certificacio+OU=Vegeu https://www.catcert.net/verCIC-2 (c)03+OU=Parlament de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),L=Passatge de la Concepcio 11 08008 Barcelona,C=ES","subjectDN":"MIIBGTELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQwMgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzEfMB0GA1UECxMWUGFybGFtZW50IGRlIENhdGFsdW55YTEVMBMGA1UEAxMMRUMtUEFSTEFNRU5U","whitelist":false,"attachment":{"hash":"17e9173c46bb2384dba7fcb7a0f710c7b429cf4600461a89fba90b1af0a62645","size":2698,"filename":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF-GQQrZtCBAentM=.pem","location":"security-state-staging/intermediates/210f4610-3bf6-4547-b850-5fccce210bc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LbXnRYPxl6yNMAXHjj6wiyi3rAmcF+GQQrZtCBAentM=","crlite_enrolled":false,"id":"8a3a7743-6b95-491c-a7fd-c508a3a3588e","last_modified":1562108302644},{"schema":1562108301127,"derHash":"Ol9O91ja1i5DaSRkReBo5Nrf3Uhi3Nw1LLyj9YyxAoo=","subject":"CN=University of Ioannina CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTElMCMGA1UEAxMcVW5pdmVyc2l0eSBvZiBJb2FubmluYSBDQSBSMg==","whitelist":false,"attachment":{"hash":"e55385a6a99893ba059ad902f14cf08fc7e50c21f0767e96dade7ae8ff26f9f3","size":2519,"filename":"3Z_Xeh-0zD0mx1ntkdzF2uRggW2jjvRv4YohPdsTyH0=.pem","location":"security-state-staging/intermediates/07946fd8-678e-432f-88dd-926d7a5b0651.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3Z/Xeh+0zD0mx1ntkdzF2uRggW2jjvRv4YohPdsTyH0=","crlite_enrolled":true,"id":"5b78a2dc-204e-4f05-87aa-7d9a687db350","last_modified":1562108301868},{"schema":1562108299591,"derHash":"yVqUJkEOEecO7ZR4Bv2H9vDed7mPHEVL4Q01xEQtwd0=","subject":"CN=Ionian University Client CA R1,O=Ionian University,L=Kerkyra,C=GR","subjectDN":"MGQxCzAJBgNVBAYTAkdSMRAwDgYDVQQHEwdLZXJreXJhMRowGAYDVQQKExFJb25pYW4gVW5pdmVyc2l0eTEnMCUGA1UEAxMeSW9uaWFuIFVuaXZlcnNpdHkgQ2xpZW50IENBIFIx","whitelist":false,"attachment":{"hash":"421344cbf9de9ea4c9deeba9fd22a377f8a6001c222e3d8cf3cdfa2a7da4ebaa","size":2491,"filename":"BKdxsSIs-ijJFbyYWEdpq7cKm2wjAKYw1xIPkxhoTzY=.pem","location":"security-state-staging/intermediates/6b710da6-690c-4e56-9130-7542629ed94f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BKdxsSIs+ijJFbyYWEdpq7cKm2wjAKYw1xIPkxhoTzY=","crlite_enrolled":false,"id":"72505e52-9154-41da-9415-e855003b7e6e","last_modified":1562108300343},{"schema":1562108298809,"derHash":"fmr1Cjqd0Bc3IE2RK3ch98CAnMzmQoRXiZIEmqzjSws=","subject":"CN=DigiCert Transition Root G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBUcmFuc2l0aW9uIFJvb3QgRzM=","whitelist":false,"attachment":{"hash":"1744c43c724806504fbec8f1f008c72fec893abcf74097d2a9736fa436694410","size":1305,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/c140c6ab-92f6-4c11-8843-daf10323b427.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"93532867-ac56-4307-89f7-2dd212381524","last_modified":1562108299582},{"schema":1562108298021,"derHash":"HhdBoS642ivXbqlsBPUgNZg5cQ9iDoCVL0jdAkChLNg=","subject":"CN=GlobalSign Organization Validated CA - SHA256 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTswOQYDVQQDEzJHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgQ0EgLSBTSEEyNTYgLSBHNA==","whitelist":false,"attachment":{"hash":"f56fe012352f32771440b0a10b06d66c2f469fb83a06518748eaa15ab9720834","size":1622,"filename":"S7kwF_US-qCLAH7QPb4nX6Ms8I_NUy0GV9_-wVRxQe4=.pem","location":"security-state-staging/intermediates/30b37c7c-3a4d-4dfb-b2c4-e2d5477cf21a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S7kwF/US+qCLAH7QPb4nX6Ms8I/NUy0GV9/+wVRxQe4=","crlite_enrolled":false,"id":"8957e3a4-614b-4b99-a5c4-476646f00273","last_modified":1562108298801},{"schema":1562108297261,"derHash":"OYsUmc4Aol9hysPYvuVxYBiAgj7yiL6XcqTRM5hCJZU=","subject":"CN=Prodrive Technologies B.V. OV SSL Issuing CA,OU=IT Services,O=Prodrive Technologies B.V.,L=Son,ST=Noord-Brabant,C=NL","subjectDN":"MIGlMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtQnJhYmFudDEMMAoGA1UEBxMDU29uMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UEChMaUHJvZHJpdmUgVGVjaG5vbG9naWVzIEIuVi4xNTAzBgNVBAMTLFByb2RyaXZlIFRlY2hub2xvZ2llcyBCLlYuIE9WIFNTTCBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"60af9aca37322fa5579658de5c5e1492cee409be5bf7326842071c595027df3f","size":1882,"filename":"-wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO-yIp2mXFvWw=.pem","location":"security-state-staging/intermediates/11e8a6e5-dba1-4063-8a86-8ec3c096498d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+wd4uhPIbo8yHwCQuKSPir6tNrh9C4xO+yIp2mXFvWw=","crlite_enrolled":true,"id":"45dbad78-4cd0-4991-b5b2-47889daaaef8","last_modified":1562108298013},{"schema":1562108296484,"derHash":"Rx5dC46FdFDELa80KT6Dl2m6qpZkUQoVpIuDM2vvCmw=","subject":"CN=CSP Code Signing Service CA 2,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MIGIMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xFDASBgNVBAcTC1NoaW5qdWt1LWt1MSswKQYDVQQKEyJDRU5UUkFMIFNFQ1VSSVRZIFBBVFJPTFMgQ08uLCBMVEQuMSYwJAYDVQQDEx1DU1AgQ29kZSBTaWduaW5nIFNlcnZpY2UgQ0EgMg==","whitelist":false,"attachment":{"hash":"f3e215956535f23892f1f0bb74d9a78f5bb4021380b7e080da65339c11dfadd0","size":2138,"filename":"l_awPKBJ4UEI-z9_U5Rbx8t0nJMnpt5Zthvcoiu0J78=.pem","location":"security-state-staging/intermediates/23ecae1d-dd6b-4b7a-a260-e41bd9437c08.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l/awPKBJ4UEI+z9/U5Rbx8t0nJMnpt5Zthvcoiu0J78=","crlite_enrolled":false,"id":"e71b7abd-b38b-4bdf-9596-8523c7cccf32","last_modified":1562108297253},{"schema":1562108295734,"derHash":"gCwq0dIV5XzckBDqQ3rOOZtlcZT71A47teALCA5klt8=","subject":"CN=DigiCert Extended Validation Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xPDA6BgNVBAMTM0RpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gSW50ZXJtZWRpYXRlIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"73904237d7f0a3a17b5f2c3f1b1275dae7eb95972b2f9bb854178fdf1f3c93ef","size":2450,"filename":"N8yNUCoqmVQZ-ft-5WHTEDP44ZaqSGYV9krPU-6GKxE=.pem","location":"security-state-staging/intermediates/946ac930-af2f-46ae-ba2b-8469d6da4d27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N8yNUCoqmVQZ+ft+5WHTEDP44ZaqSGYV9krPU+6GKxE=","crlite_enrolled":false,"id":"00d32bfb-1f50-4f9a-b001-bcb7956c75f4","last_modified":1562108296476},{"schema":1562108294970,"derHash":"xunpk8JYtyEkqtPJwGi27yNXYVXzELMFczNh4gsXyUM=","subject":"CN=Entrust Class 1 Client CA - SHA256,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSswKQYDVQQDEyJFbnRydXN0IENsYXNzIDEgQ2xpZW50IENBIC0gU0hBMjU2","whitelist":false,"attachment":{"hash":"79a53ad927c3de7c40691b9a6c3fb0d4a6a204940ea279fea186b55c6e73d429","size":1857,"filename":"lH0dapXaEQzIObJaHxVa7uB4l8j3w-wHYQbHKgXEZkQ=.pem","location":"security-state-staging/intermediates/49d12b14-17cb-4217-85c7-65e635580b00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lH0dapXaEQzIObJaHxVa7uB4l8j3w+wHYQbHKgXEZkQ=","crlite_enrolled":false,"id":"3564ed73-7524-4710-8e3c-8934b9358650","last_modified":1562108295725},{"schema":1562108293455,"derHash":"rY1JjAjaJJk2urzdoHIGwTxx510WvjEgvqLY5XIMC7E=","subject":"CN=TrustID SAIC Public Email Issuing CA,O=SAIC,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMQ0wCwYDVQQKEwRTQUlDMS0wKwYDVQQDEyRUcnVzdElEIFNBSUMgUHVibGljIEVtYWlsIElzc3VpbmcgQ0E=","whitelist":false,"attachment":{"hash":"fe515a59c69804f303e416010886b99083e0d92387cf3175e7ad76b66b8064f5","size":2866,"filename":"xQtvQZq-EB3EN98Z5s79c3Oet8M4exlYihCVvU05dDc=.pem","location":"security-state-staging/intermediates/1118623a-93a7-4be6-89a9-07a8f0a9f4d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQtvQZq+EB3EN98Z5s79c3Oet8M4exlYihCVvU05dDc=","crlite_enrolled":false,"id":"c05d6677-609b-422a-ac39-28f20ba92e8a","last_modified":1562108294207},{"schema":1562108292695,"derHash":"mHpclYS0a1mHjkJGD4Pk1h9MJyI2aUbU0hbzNqbxKPc=","subject":"CN=BlackCert\\, Inc. ECC DV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBFQ0MgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"4851b2159dadaebd9610ff68cc3a0abe70105ceae03d43c0259bae336294d8c6","size":1313,"filename":"UHhlKE9aTixVYvtmCIINV9nOgVj-gicuzrl4dZJypeA=.pem","location":"security-state-staging/intermediates/299ba25a-3c88-4a56-99fc-8d482eacf964.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UHhlKE9aTixVYvtmCIINV9nOgVj+gicuzrl4dZJypeA=","crlite_enrolled":false,"id":"aec144f1-19f3-4440-b9b2-ca0cfb03eabd","last_modified":1562108293448},{"schema":1562108290423,"derHash":"G5em8Nu9kMEgcKSyJFDIntfangDRsMHTLHOfkfBUQ2k=","subject":"CN=USERTrust ECC Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE6MDgGA1UEAxMxVVNFUlRydXN0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"26dd31cde7427387d296f148833077d4fe20c284013c0fd9f15f8008f135d303","size":1362,"filename":"i7uClAe3_3wAhizAhhVydHbblUIZ4CnIbmP_37X1MDI=.pem","location":"security-state-staging/intermediates/6fd0a630-610a-4944-95e2-537aa76a82fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i7uClAe3/3wAhizAhhVydHbblUIZ4CnIbmP/37X1MDI=","crlite_enrolled":false,"id":"c0e9c3ff-136b-4bae-bd6f-a2afc53d7dbc","last_modified":1562108291176},{"schema":1562108285841,"derHash":"dcFVADsRQcWwn9fdAy4vQTxHGV07ml2vbEUQOFzXsNo=","subject":"CN=SecureCore RSA Code Signing CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxJzAlBgNVBAMTHlNlY3VyZUNvcmUgUlNBIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"fb6fbc5f3a298360a9e790f55bf514d36e1065ad69d9250a0546434fd60e20ef","size":2097,"filename":"axW2YlMTDWWhbpiLWaU3zkErVvrZfY_GQ6cyk5u5luY=.pem","location":"security-state-staging/intermediates/1730ea7b-88b9-4db4-a901-15e5a1fae90e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"axW2YlMTDWWhbpiLWaU3zkErVvrZfY/GQ6cyk5u5luY=","crlite_enrolled":false,"id":"3e6d940e-6a54-426f-aa37-1484d14106e9","last_modified":1562108286598},{"schema":1562025729992,"derHash":"6o4gUWI+TkcQ/Vvyek0s4L5lsXoeVDm4+rdOAcyoFXU=","subject":"CN=COMODO Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGOMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE0MDIGA1UEAxMrQ09NT0RPIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"3d0e7c87aafe299697e93ab682a1740b5e0301d829f1f0172b1c96434892d004","size":1849,"filename":"U76LrE_Rijw5XfoXk5OQHHM69VvOLx93TdrIf4lbJe0=.pem","location":"security-state-staging/intermediates/b77966b0-d8a8-461b-82c0-0b542d6d45b8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U76LrE/Rijw5XfoXk5OQHHM69VvOLx93TdrIf4lbJe0=","crlite_enrolled":false,"id":"ca6e3949-96ed-4927-a7ec-aa6983f017ca","last_modified":1562025730731},{"schema":1562025726215,"derHash":"3JRVykf1/Zvzu6u+rPiPPes7WL+oWvQE39IWF86QoN0=","subject":"CN=Academy of Athens SSL SubCA R2,O=Academy of Athens,L=Athens,C=GR","subjectDN":"MGMxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxGjAYBgNVBAoMEUFjYWRlbXkgb2YgQXRoZW5zMScwJQYDVQQDDB5BY2FkZW15IG9mIEF0aGVucyBTU0wgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"f72510e5379e821a4e63803bde1b2d0379bf113c2844ef59caf0def0e2469437","size":2771,"filename":"JSBgh4-dzeoIV9S02ySUrHvvy_rDBARUsVV1tnTxX34=.pem","location":"security-state-staging/intermediates/3e79bdae-5627-434e-bea2-8834a203d78b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSBgh4+dzeoIV9S02ySUrHvvy/rDBARUsVV1tnTxX34=","crlite_enrolled":false,"id":"cee3e6e9-42ed-4283-993c-cb0045e6be5b","last_modified":1562025726974},{"schema":1562025724722,"derHash":"L7qP6RVBUEmqlChXy1MTf/09nlpHsntXgtq5tNp9Yk0=","subject":"CN=GeoTrust SupremeSSL EV 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xKDAmBgNVBAMTH0dlb1RydXN0IFN1cHJlbWVTU0wgRVYgMSBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"41ecc5811611c2cca06c08009be39d0f651319e8cea2f6913a6d81897be776be","size":1423,"filename":"A97Lx6chFTH9FkG_Io5Uc5oemCnN0d8O2NjR9d-Pr0w=.pem","location":"security-state-staging/intermediates/baa9711d-751b-4f52-b6fb-eae863fd4185.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A97Lx6chFTH9FkG/Io5Uc5oemCnN0d8O2NjR9d+Pr0w=","crlite_enrolled":false,"id":"abb039f2-2555-43ce-acd5-8385099aac50","last_modified":1562025725454},{"schema":1562025723206,"derHash":"sM1q57niDsX4MP7gH2ZtXZDm4inQa8RqMKzO3+yIlkg=","subject":"CN=GlobalSign ECC CloudSSL CA - SHA384 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEVDQyBDbG91ZFNTTCBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"de1af3b87a33aa08369966e57403b2c34643335f40db514a7afc6b97b106c162","size":1394,"filename":"jvkkZQCW-mhUvg-i2GTn-E3FaOYoVhJ1eCS-o6Q4yNk=.pem","location":"security-state-staging/intermediates/9cc4ce11-6d6f-43c7-bb98-74044eaff317.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jvkkZQCW+mhUvg+i2GTn+E3FaOYoVhJ1eCS+o6Q4yNk=","crlite_enrolled":false,"id":"64bc9cda-86f9-4b20-91ec-08b77c65c922","last_modified":1562025723952},{"schema":1562025722450,"derHash":"fAkS5d6EeLuG6OpGulrmXcOHC878vC9GeV7uz2SM++c=","subject":"CN=DigiCert Extended Validation CA G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgRzM=","whitelist":false,"attachment":{"hash":"a9b8d926d5c6840a9c7cfbb16d22ea65f23628c6fdb4af615cb30e7d3ceaa1f1","size":1158,"filename":"26Ut6iLcm-3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=.pem","location":"security-state-staging/intermediates/d9eb8ff7-9305-49b0-b4e6-9b4a86ebd7f6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"26Ut6iLcm+3yJllopC51FzYrG4EvCSFIv9j5aRSvwvk=","crlite_enrolled":true,"id":"afc3f6a7-6865-4035-9978-68f1eaa2e5dc","last_modified":1562025723199},{"schema":1562025721682,"derHash":"daZZy9u+bJV+VBTbB4ySEm9jQ4IYnaG/XAojgP4MAVQ=","subject":"SERIALNUMBER=201902,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAy","whitelist":false,"attachment":{"hash":"4b65325d9d02469390d5b023e714e4e9c753ef0799e3f6a10e5916619c16dcc1","size":2333,"filename":"UwHbo6A5SENp-x9peFd6eLRH2pPK2OEh1Opi66naGmE=.pem","location":"security-state-staging/intermediates/3c472536-c16a-4f6a-8075-bc11e7725343.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UwHbo6A5SENp+x9peFd6eLRH2pPK2OEh1Opi66naGmE=","crlite_enrolled":false,"id":"8b83b14e-f66d-4d00-b7e1-4b8f9adff491","last_modified":1562025722443},{"schema":1562025718618,"derHash":"pIeewPNs+EtvLth65X7juUoHhcaGIjjNRUgQhNFS6xg=","subject":"CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==","whitelist":false,"attachment":{"hash":"95a08802015a5ec4188aae43d624318718b33b1845abd2cc08cde2dd08795dda","size":1898,"filename":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem","location":"security-state-staging/intermediates/c20f4e11-fb50-446a-a3bf-298dcc6d3e94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=","crlite_enrolled":true,"id":"d60313ed-86f7-4c58-b298-f728a4d599dd","last_modified":1562025719366},{"schema":1562025714026,"derHash":"zxCWu5Mj2XLcMktnNx3AT/nYGPgyX5sUJPr/xIYWF94=","subject":"CN=MilleniumSign Client Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"66dc6cdcca92c736db22d6b0528e851eca29640b778a93b8e2ca01e136e44de9","size":2597,"filename":"rxjVY4zcTYKtIONSk7n6L7MrJYe_ND2NwaXtNQUP5TM=.pem","location":"security-state-staging/intermediates/73e81b8a-cb82-42dc-a82c-b44aa5531cff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rxjVY4zcTYKtIONSk7n6L7MrJYe/ND2NwaXtNQUP5TM=","crlite_enrolled":false,"id":"f4577da3-a2f0-4bf9-8805-1bf7390a8200","last_modified":1562025714778},{"schema":1562025713265,"derHash":"M9VzWYMfh3VObnVda1tW5+cSl93f6h1jlwhmBCgPb/w=","subject":"CN=Cybertrust Japan Secure Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MF4xCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEqMCgGA1UEAxMhQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"3d3d273966feacef23b9bad6f99c08f1cc7d487295361ce8cc0b10c724baf67a","size":1711,"filename":"bVyC1r63wwzb47rnbZ46v-604DOoFUXTp4JA0srlZRE=.pem","location":"security-state-staging/intermediates/aa91ff40-8753-4ea6-bc6c-9c2f51e7c6a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bVyC1r63wwzb47rnbZ46v+604DOoFUXTp4JA0srlZRE=","crlite_enrolled":true,"id":"03556fa4-abec-492c-a31c-149b44f3f991","last_modified":1562025714019},{"schema":1562025711764,"derHash":"hDJGhhPZjK3s3wgWxJ6it/aZ9KEc7AD1eMK6NnsmHAg=","subject":"CN=XiPS CA,O=XiPS,C=JP","subjectDN":"MC4xCzAJBgNVBAYTAkpQMQ0wCwYDVQQKEwRYaVBTMRAwDgYDVQQDEwdYaVBTIENB","whitelist":false,"attachment":{"hash":"3b65f8702240ac2d635ce5225969970a6e8557d2b9dd5eb165f96cadc14bfdc6","size":1455,"filename":"aqVWvShe1mzkhWFbetNw9nGqpsrVqF3oxvVKvhsIlK8=.pem","location":"security-state-staging/intermediates/5190658d-b50b-4f85-9700-87cd6e9064bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aqVWvShe1mzkhWFbetNw9nGqpsrVqF3oxvVKvhsIlK8=","crlite_enrolled":false,"id":"f181d5e2-48b8-4d91-a36f-3d0f2d8ee54b","last_modified":1562025712505},{"schema":1562025711016,"derHash":"H/7OCWgvhwJKKkSyyYex/M7jsrXPAh788jhpIkpMoVQ=","subject":"CN=Sectigo ECC Extended Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"fd85716a6add00125b582d3433c00b0de6d6b0b552bfd0c8ca14d4b009f89167","size":1374,"filename":"tMfg7Fo2Cq1tZyZLF7qjiWh-5J3kMiUXlIyn4Vr5nX4=.pem","location":"security-state-staging/intermediates/41bc169c-72dd-4bf8-b3cb-64ed94baec4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMfg7Fo2Cq1tZyZLF7qjiWh+5J3kMiUXlIyn4Vr5nX4=","crlite_enrolled":true,"id":"c6c4f0ce-0b29-4979-9287-aeced0243644","last_modified":1562025711756},{"schema":1562025708768,"derHash":"jSKvzLIsm24kJnzkILKZZVyB9dceKs/5B/5SqqU3qFg=","subject":"SERIALNUMBER=201802,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAy","whitelist":false,"attachment":{"hash":"102da7f31c535ea34d89635c806e2f2a5b759361e5b43ab595e6034e13660279","size":2333,"filename":"60YC4wjR2aMWmgm6s6gc7QNiw4QMHharRlBVWIH_dEE=.pem","location":"security-state-staging/intermediates/4afbb779-dbbc-4b0b-89c7-7381a2898294.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60YC4wjR2aMWmgm6s6gc7QNiw4QMHharRlBVWIH/dEE=","crlite_enrolled":false,"id":"9f54a066-75df-4d37-ade1-4dde85e658ea","last_modified":1562025709507},{"schema":1562025708011,"derHash":"FwFvanA1ZeKKsd9+Kai5iNLjW42DKBeh+TediK1xFBE=","subject":"SERIALNUMBER=201801,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDE=","whitelist":false,"attachment":{"hash":"e366da3a353529ab9e5aa4af9c4efab7baca0c8c3d39aac37cc5493de9185065","size":2337,"filename":"r1BqawCRtfiaTeSiVNjGZXvqScB9gfO7G-0GeWVXm80=.pem","location":"security-state-staging/intermediates/32f8564a-c764-4da5-a3f7-7bfa055ea02f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r1BqawCRtfiaTeSiVNjGZXvqScB9gfO7G+0GeWVXm80=","crlite_enrolled":false,"id":"514257fc-5422-4e69-b26c-e204e375c4a0","last_modified":1562025708760},{"schema":1562025707263,"derHash":"JbdJ1yKw/IhOac9afqobCx/vHiWdbQfwi3mOb++CPgI=","subject":"CN=eMudhra RSA Client Authentication and Secure Email CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGcMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxPjA8BgNVBAMTNWVNdWRocmEgUlNBIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"c27ec82343f0d00259fda513c138c7d65d666bc8fe8ef949140eb37491534dd1","size":2182,"filename":"iBP3IIWrGNTEuOlANBTEQYR6YtaX4fTgxoiY4wfOsAE=.pem","location":"security-state-staging/intermediates/549b17f7-c9e3-4a71-a5d4-4b62bb4e1916.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iBP3IIWrGNTEuOlANBTEQYR6YtaX4fTgxoiY4wfOsAE=","crlite_enrolled":false,"id":"c68ae40e-0221-459c-9b5b-4816b26eec06","last_modified":1562025708004},{"schema":1562025706478,"derHash":"dcWz8B/R9RosRHq3x4XXLmn6nEcsCFcefq3zuOq65ww=","subject":"CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN","whitelist":false,"attachment":{"hash":"0f6a7a76e82068b37ee6c3f29a6d0c18baf727d5d7df2bb42b93f0257d84d61a","size":1853,"filename":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem","location":"security-state-staging/intermediates/4c299a33-dc8e-4885-82a2-d1b50cc80a72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=","crlite_enrolled":true,"id":"d372a7cc-1a5d-4429-8b38-67272cb151ed","last_modified":1562025707255},{"schema":1562025704941,"derHash":"0E25J8ZjqoyFPVRxbdbcKksv75w64b+yUER/xdd3Hlc=","subject":"CN=Entrust Extended Validation Code Signing CA - EVCS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTwwOgYDVQQDEzNFbnRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENBIC0gRVZDUzE=","whitelist":false,"attachment":{"hash":"1bf84b7a3f77f8f67f9e51d9336139cbd80e4db10cc4953df2414b0be4f645fe","size":1861,"filename":"GcPkbBB-ik0_z7Ti-5ln9eO4LtiY-qTd63BI9Hcr__o=.pem","location":"security-state-staging/intermediates/0e96ba5e-bdf5-4987-9558-5a42128bc3f2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GcPkbBB+ik0/z7Ti+5ln9eO4LtiY+qTd63BI9Hcr//o=","crlite_enrolled":true,"id":"a2bd91d4-dd54-4a7c-92d7-9fff7bf0db8c","last_modified":1562025705694},{"schema":1562025703410,"derHash":"wzO2FjiwMV+oAcziHMTqlu9/ZaOZlFAYapnRm7IBKPc=","subject":"CN=Yandex CA,OU=Yandex Certification Authority,O=Yandex LLC,C=RU","subjectDN":"MF8xCzAJBgNVBAYTAlJVMRMwEQYDVQQKEwpZYW5kZXggTExDMScwJQYDVQQLEx5ZYW5kZXggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxEjAQBgNVBAMTCVlhbmRleCBDQQ==","whitelist":false,"attachment":{"hash":"af258c6dfdfa092e5143efddb130a9995d357d1ad61ae4f796479ef04168a7a4","size":1674,"filename":"LNFe-yc4_NZbJVynpxAeAd-brU3EPwGbtwF6VeUjI_Y=.pem","location":"security-state-staging/intermediates/479968c7-7027-4f7e-8b5c-3222fd1e1b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LNFe+yc4/NZbJVynpxAeAd+brU3EPwGbtwF6VeUjI/Y=","crlite_enrolled":true,"id":"bf9d3f01-d8b6-4d86-8653-747e081c93a4","last_modified":1562025704179},{"schema":1562025701871,"derHash":"KkG6gZ62Elr1y0uLDp6VTs55jCp+5D3Nr305WYfE1VI=","subject":"CN=AlwaysOnSSL TLS RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"60ae06b06554f13d49fcd4ab75f5917d8c57dc17bd11f157428e11c66db10d22","size":1670,"filename":"DOdL2thyQw2ljWo5qhqUbm1_3EZBtYXxLKw14G9PO30=.pem","location":"security-state-staging/intermediates/a5955525-beea-41cd-bc30-2fdc381e930d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DOdL2thyQw2ljWo5qhqUbm1/3EZBtYXxLKw14G9PO30=","crlite_enrolled":false,"id":"47d5ce96-0aef-4db0-a607-a2e1c9d545d8","last_modified":1562025702639},{"schema":1562025701131,"derHash":"+WkIgIGfBs3MCy8iSyB/KvYAP7VzObhnmhYPqVII1i0=","subject":"CN=DigiCert Baltimore CA-2 G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEJhbHRpbW9yZSBDQS0yIEcy","whitelist":false,"attachment":{"hash":"bd36d2274e9da51b8bdff6a5034236a8cd4be11b09a0484694bb0d5786f90c06","size":1581,"filename":"56higu_MFWb_c2b0avLE5oN2ECS2C43RvzSUgx_2xIE=.pem","location":"security-state-staging/intermediates/95cd362d-50b9-447c-9a65-f2618e6ef5a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"56higu/MFWb/c2b0avLE5oN2ECS2C43RvzSUgx/2xIE=","crlite_enrolled":true,"id":"25183d60-3420-4e98-9619-5f0eec8fee1d","last_modified":1562025701864},{"schema":1562025699565,"derHash":"vOtfbxkOdDBvdGmeK/bfPaO4MnTJTaYnMHfexjAkvCs=","subject":"CN=USERTrust Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGQMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE2MDQGA1UEAxMtVVNFUlRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"00ea6e2039bc7a594fce068cab36473f438d4d297b6a0dc47aefbfa0e23e48d6","size":1845,"filename":"qmiXmivqVtgR0GyawcxUjKYGCU2FpsPYSvuOnjXIl7A=.pem","location":"security-state-staging/intermediates/72c86bfc-7240-48e0-8b9e-f36bed44515a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qmiXmivqVtgR0GyawcxUjKYGCU2FpsPYSvuOnjXIl7A=","crlite_enrolled":false,"id":"6a69c8b2-71af-4964-b1b2-8cf7a40252ae","last_modified":1562025700328},{"schema":1562025698800,"derHash":"e+x4J+BdGTHdgmia9rLxmj9eTHVu+hYr1wjJJ50ank4=","subject":"CN=Hellenic Academic and Research Institutions AdminCA R5,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGUMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPzA9BgNVBAMTNkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQWRtaW5DQSBSNQ==","whitelist":false,"attachment":{"hash":"8ca53e2983ea3a48eebfa803f1747e95b415a1cb5d2480b8f436856a80d4faaa","size":2938,"filename":"AreUX-bchtedTom4SB7dY0hDFUCi6QqZHbrsRYdMV5w=.pem","location":"security-state-staging/intermediates/e9bb19e6-d0ac-490f-a20c-8c91408b1553.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AreUX+bchtedTom4SB7dY0hDFUCi6QqZHbrsRYdMV5w=","crlite_enrolled":true,"id":"002552b1-47b6-4410-a854-a48b4b40c244","last_modified":1562025699557},{"schema":1562025696418,"derHash":"gwy0Q+kSkB77qP+Pjhu86XAyqpEjjoGdi9bq/NWFLVA=","subject":"CN=SSLs.com ECC DV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gRUNDIERWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c384b3ab12ff6ea1b44a206f1afe0a9e294295d9b659f35735ad3b8f63df3777","size":1293,"filename":"dxXXi-wgMRVEkMxf8oNkW9S3knJacN3pyTKktpz6CO8=.pem","location":"security-state-staging/intermediates/e058b6fd-1598-40fa-bfc8-88653250ee88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dxXXi+wgMRVEkMxf8oNkW9S3knJacN3pyTKktpz6CO8=","crlite_enrolled":false,"id":"f9d6e124-3ddc-44f9-bbe1-dbb93eca419a","last_modified":1562025697178},{"schema":1562025694846,"derHash":"q97sUxSQmPigsH79lys0Wom+3o7eaXXmG+le4Cbafvo=","subject":"CN=Actalis Client Authentication CA G1,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MIGCMQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5vMQ8wDQYDVQQHDAZNaWxhbm8xIzAhBgNVBAoMGkFjdGFsaXMgUy5wLkEuLzAzMzU4NTIwOTY3MSwwKgYDVQQDDCNBY3RhbGlzIENsaWVudCBBdXRoZW50aWNhdGlvbiBDQSBHMQ==","whitelist":false,"attachment":{"hash":"737f0f0ce1590b65bb7efa52f0521e84ec1ac16313c8b4c6cd288064af2d127d","size":2235,"filename":"YsqG87ugr7iITRNFFaHeNX5oMmY80JlEVuqBCxAhZAM=.pem","location":"security-state-staging/intermediates/5df58a07-e383-4a1a-8af4-9471aa61c013.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YsqG87ugr7iITRNFFaHeNX5oMmY80JlEVuqBCxAhZAM=","crlite_enrolled":true,"id":"621a2382-280e-48de-b859-5293ba5379b7","last_modified":1562025695624},{"schema":1562025691799,"derHash":"Dc3Afsq7v+OKRga6ZjmHzbO9mBf8Z9HdDPCUrIyieH0=","subject":"CN=RapidSSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRkwFwYDVQQDExBSYXBpZFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"aa7fa595813e97a484acd6547bac20c9e71b2d410cc8c1411ce7c8dff477d7d9","size":1561,"filename":"ECmYCLPqKAHbhvlT_55ArJLWPUg2ET7VnEs9qxe4WMY=.pem","location":"security-state-staging/intermediates/954d8841-1fdb-4c14-b270-208ca50318c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ECmYCLPqKAHbhvlT/55ArJLWPUg2ET7VnEs9qxe4WMY=","crlite_enrolled":false,"id":"43b0aa37-7f19-4ef9-a14a-884ae615c7ad","last_modified":1562025692543},{"schema":1562025690289,"derHash":"6Y3cwNFYh2g2zUtq2CbES/ClmjY4ls4mbJ8ObO3AQLw=","subject":"CN=SSL.com EV Code Signing Intermediate CA RSA R3,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"32169e8329c248fa74da3ecdba2cb2ab5ddb103e65d9b25269226afcf1726058","size":2442,"filename":"A0PvmC7MDwMStpG2AMOTBGRwFSj4zczHavxDSYtMrUU=.pem","location":"security-state-staging/intermediates/29e6ec48-04e0-4511-8814-f046fc5fd80b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A0PvmC7MDwMStpG2AMOTBGRwFSj4zczHavxDSYtMrUU=","crlite_enrolled":false,"id":"2195f4e0-79ea-4388-98b0-6f42f8589dc9","last_modified":1562025691031},{"schema":1562025688012,"derHash":"sFR/1Gj7tuM3/gGwEINOU7TFsSZJ7O52+uw4uGQPiHg=","subject":"CN=Sectigo RSA Pro Series Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGIMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxMDAuBgNVBAMTJ1NlY3RpZ28gUlNBIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"21a5a5d98c08860c8bbdac09ecacbf28db1bf7fd896db33c56327c2680b27302","size":1699,"filename":"xTMa5n3gNYAxLuPmUb1OHXP8yMoC1p7qRTc2QnDh85w=.pem","location":"security-state-staging/intermediates/680c172b-fc67-4690-b97d-d1dea9a9f9be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xTMa5n3gNYAxLuPmUb1OHXP8yMoC1p7qRTc2QnDh85w=","crlite_enrolled":false,"id":"dce12f32-7494-4a0b-a01f-b3b7fcaa5481","last_modified":1562025688751},{"schema":1562025687263,"derHash":"3izLCHRurwKZjmyV4ko9LPtv9KPUHq+/g/1XAGby8qg=","subject":"CN=Network Solutions OV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBPViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"523a86b5180b5ec7c1414d69ac133130ee5d4575bd013804765541e369aae790","size":2150,"filename":"hIBbkSty62Y4PvvLLkYxEHhqoAK2s9JgMSFHh6HeR60=.pem","location":"security-state-staging/intermediates/97e3a8c1-f036-4137-9c18-5bdaae60b5d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hIBbkSty62Y4PvvLLkYxEHhqoAK2s9JgMSFHh6HeR60=","crlite_enrolled":true,"id":"fdf54b28-a69b-460f-a7af-12df7c5b6620","last_modified":1562025688004},{"schema":1562025682694,"derHash":"7gnUnHz0QYQNpRWNDnDUxsrrT8z+Z1juTMRccaKH3zk=","subject":"CN=Shuidi Webtrust SSL Organization Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MH4xCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMTMwMQYDVQQDDCpTaHVpZGkgV2VidHJ1c3QgU1NMIE9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"f975da322d7fcdc38e3cb51f4091077525b9e851b700830f29f444cceea7c7ca","size":1788,"filename":"bQEpVS_P2TaJBIhgpEXBC8jHqXLloS9b4EkKf3WILE8=.pem","location":"security-state-staging/intermediates/08ed8214-4b33-43b4-8ba3-b97456144534.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bQEpVS/P2TaJBIhgpEXBC8jHqXLloS9b4EkKf3WILE8=","crlite_enrolled":true,"id":"5ac2630d-d43f-4a21-8de4-363eea88f44e","last_modified":1562025683468},{"schema":1562025681943,"derHash":"SyTFIcR2AOg4AKP/DC1Y3ALIF3732ml8WoDB1IZ6Zt0=","subject":"CN=KPN CM PKIoverheid EV CA,O=KPN Corporate Market B.V.,C=NL","subjectDN":"MFQxCzAJBgNVBAYTAk5MMSIwIAYDVQQKDBlLUE4gQ29ycG9yYXRlIE1hcmtldCBCLlYuMSEwHwYDVQQDDBhLUE4gQ00gUEtJb3ZlcmhlaWQgRVYgQ0E=","whitelist":false,"attachment":{"hash":"a099dffc591861b7aafbe0f0a05c8b1f7bf81f559c01699413024d9884a31de1","size":2422,"filename":"LTKzfVX5csoVECsYSoKgWD8fCxvpkV_QvnpzmSXD67E=.pem","location":"security-state-staging/intermediates/133d0516-cda0-41bf-b11e-001d82752fbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LTKzfVX5csoVECsYSoKgWD8fCxvpkV/QvnpzmSXD67E=","crlite_enrolled":false,"id":"571566e8-e55e-4901-b8d3-2549845c752d","last_modified":1562025682686},{"schema":1562025681184,"derHash":"12QgV8oX4AY1zEEFPxSRmYSIjmVwvi2Wah+ug6ZKTjA=","subject":"CN=Thawte Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGFRoYXd0ZSBDbGFzcyAzIEVDQyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"19920e1734805d1433e4ddbcc6556c5621f82552ecd3b1267802075ffe89b5bc","size":1118,"filename":"74qDh4tduGxF1WQBec7yb2TVAkVDQcZtSGFT6Fv2rKU=.pem","location":"security-state-staging/intermediates/b6b109d9-029d-47cb-9143-2b3f88a80822.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"74qDh4tduGxF1WQBec7yb2TVAkVDQcZtSGFT6Fv2rKU=","crlite_enrolled":false,"id":"511368c0-9bad-4168-ba0e-8752f57a500e","last_modified":1562025681935},{"schema":1562025678880,"derHash":"tBq4Rcq025yx/mUFdl82oIaK3F30GbOJeftqT+QTH3A=","subject":"CN=TrustAsia DV SSL CA - G5,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGXMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBHNQ==","whitelist":false,"attachment":{"hash":"3bf080b95af149ffd2e506772a96b0a2877c5d8652f00df4e6bcc0cbb8a66cd9","size":1930,"filename":"IiSbZ4pMDEyXvtl7Lg8K3FNmJcTAhKUTrB2FQOaAO_s=.pem","location":"security-state-staging/intermediates/92184c22-dea5-4c8a-a75f-4d675f372117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IiSbZ4pMDEyXvtl7Lg8K3FNmJcTAhKUTrB2FQOaAO/s=","crlite_enrolled":false,"id":"acd0d2d4-f089-4bc5-b759-b139cb3901cc","last_modified":1562025679624},{"schema":1562025678128,"derHash":"CQ3xIgpg6Ohl+GB7miS8O+ANkz1Dj7aGoxc978W/u0A=","subject":"CN=SecureTrust Timestamping CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IFRpbWVzdGFtcGluZyBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"4b45073fb2635b629bbf1095fb23e052ca68b981e23461115b479b6f22314bac","size":1691,"filename":"j2P1Z0mLSp4GAoBeesMfnj__nZWEBzdTPjXQKs135uY=.pem","location":"security-state-staging/intermediates/94b365b9-ee57-47ab-ae3e-0869f15a6ffc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j2P1Z0mLSp4GAoBeesMfnj//nZWEBzdTPjXQKs135uY=","crlite_enrolled":false,"id":"7b52d53f-2f70-4371-93de-fb4749b36a27","last_modified":1562025678867},{"schema":1562025677364,"derHash":"Pzr5ycwsdZnvj23XylFs/BeX19EgAiVPO/0NTQ/p3oY=","subject":"CN=thawte SHA256 SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAMTFHRoYXd0ZSBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"b784117d8a3ab57799dc2c072d17609dee8c92bc8067b1e11b8a4900f0e83e05","size":1711,"filename":"_36ymPAVaJl3QDyB1lUkVf9GqJNug0R8JJPDN6348p8=.pem","location":"security-state-staging/intermediates/4e0ed124-2d83-43f1-9448-6fb4dd45e482.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/36ymPAVaJl3QDyB1lUkVf9GqJNug0R8JJPDN6348p8=","crlite_enrolled":true,"id":"943e3610-ed29-496d-9a3e-cbb01e1ef005","last_modified":1562025678120},{"schema":1562025675802,"derHash":"EL7dxICqJ1Y0gLG8qrbCW1KZXqg26aKs6D+PWSBuJJY=","subject":"CN=New Mexico Health Information Collaborative CA,OU=Orion Health Direct Secure Messaging,O=New Mexico Health Information Collaborative,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzE0MDIGA1UEChMrTmV3IE1leGljbyBIZWFsdGggSW5mb3JtYXRpb24gQ29sbGFib3JhdGl2ZTEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMTcwNQYDVQQDEy5OZXcgTWV4aWNvIEhlYWx0aCBJbmZvcm1hdGlvbiBDb2xsYWJvcmF0aXZlIENB","whitelist":false,"attachment":{"hash":"3b860277584fea9df4295aab0745f897464dbf5e91296f9d2538f97974e21939","size":2349,"filename":"1m6_yYaaSZddN2cNjj0VawaRiHpS64DzwthprWkjdg8=.pem","location":"security-state-staging/intermediates/86f2c550-3b2e-4b7e-af76-e2becc64f74f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1m6/yYaaSZddN2cNjj0VawaRiHpS64DzwthprWkjdg8=","crlite_enrolled":false,"id":"f0a27a30-b268-4bf4-b255-1744ec057719","last_modified":1562025676587},{"schema":1562025673533,"derHash":"2N9+EYPW3vVh2E1W5iGm82oGXccX85Wbs7r8gkVW1Iw=","subject":"CN=NII Open Domain S/MIME CA,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MG8xCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIjAgBgNVBAMTGU5JSSBPcGVuIERvbWFpbiBTL01JTUUgQ0E=","whitelist":false,"attachment":{"hash":"4e6542a6648b4213a588d591b628e5dc92a54b95e08df2450f8821dc95d1784d","size":1654,"filename":"F9TkBe88zcRKkRsEqLE6JxhxN-bsw3hDKVMLUDn2y1M=.pem","location":"security-state-staging/intermediates/e43ae758-2dfb-4c9a-928e-c083c6da465e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F9TkBe88zcRKkRsEqLE6JxhxN+bsw3hDKVMLUDn2y1M=","crlite_enrolled":false,"id":"da5348e6-9e70-459c-bb07-1d2af71e7daf","last_modified":1562025674279},{"schema":1562025672771,"derHash":"6cUco5FHtXOPZPg1Jp0DTBAEc3VaQWnpbB/CNGmCGw4=","subject":"SERIALNUMBER=201820,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODIw","whitelist":false,"attachment":{"hash":"d2d13671c68a60835e1e652999025d0de6c631132ed3998cf5f6ee83d3144875","size":2333,"filename":"mL7LZxrYZ14X6ReGlhJRjYKddvqFCFZVLs-CL3gWAb8=.pem","location":"security-state-staging/intermediates/7338f0e5-344e-473a-93cb-121d6783b136.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mL7LZxrYZ14X6ReGlhJRjYKddvqFCFZVLs+CL3gWAb8=","crlite_enrolled":false,"id":"b9608c79-4ea9-44ef-8289-87b4489939bf","last_modified":1562025673525},{"schema":1562025670493,"derHash":"DOv5fR+rxkdTeZ96mlCMfF8rWLko+xs83GxBCcDPLpk=","subject":"CN=Thawte SGC CA - G2,O=Thawte\\, Inc.,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxUaGF3dGUsIEluYy4xGzAZBgNVBAMTElRoYXd0ZSBTR0MgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"484ba258f69f5a37429f7d0b9ef2ef46b4d8b05206ce0450b1081e696c815fe5","size":1723,"filename":"W6zRQBarVwwnzzEuDHuqu0dzg_srzfCimk7kZe_lXt0=.pem","location":"security-state-staging/intermediates/c3d071a4-89cc-4281-9735-9bdbad9e3f93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W6zRQBarVwwnzzEuDHuqu0dzg/srzfCimk7kZe/lXt0=","crlite_enrolled":false,"id":"d5dd4bbc-e6c1-4112-8b6a-c0dd8f5aed77","last_modified":1562025671254},{"schema":1562025669735,"derHash":"75E4mTZU35LS+1hg4o3ogYqfSdtW7LaJpnp/wtWIHdI=","subject":"CN=DigiCert Secure Site Korea ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"4b5bb15272048ea3f749dc2fa5eba0a04f9588364d8744af5fa74ba1eeced218","size":1410,"filename":"DqywqWwTJGFOkcrnV9IPNGtEO_GJMB1Y28mAQyChmRY=.pem","location":"security-state-staging/intermediates/9b369138-ca7e-43fa-806c-9e6cd4beea06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DqywqWwTJGFOkcrnV9IPNGtEO/GJMB1Y28mAQyChmRY=","crlite_enrolled":false,"id":"df60b489-c782-4306-b537-e7d0761c45ae","last_modified":1562025670486},{"schema":1562025668215,"derHash":"VTJKmDJRL8bJnxW/Dp7T1r60OYzO4ZS3/4SdltkTDUQ=","subject":"CN=GDCA TrustAUTH R4 Extended Validation SSL CA,O=GUANG DONG CERTIFICATE AUTHORITY CO.\\,LTD.,C=CN","subjectDN":"MHgxCzAJBgNVBAYTAkNOMTIwMAYDVQQKDClHVUFORyBET05HIENFUlRJRklDQVRFIEFVVEhPUklUWSBDTy4sTFRELjE1MDMGA1UEAwwsR0RDQSBUcnVzdEFVVEggUjQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"b7f589fd332a96773c813b272dcd486bc1231918f0643ed0662f171680cc3963","size":2093,"filename":"LA_cQZEhZA_J3pK28of_Jf7Wn0WmfSQvp4eYJW5o8NQ=.pem","location":"security-state-staging/intermediates/f42f0088-3a96-4549-833e-5948b8098639.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LA/cQZEhZA/J3pK28of/Jf7Wn0WmfSQvp4eYJW5o8NQ=","crlite_enrolled":true,"id":"eee3bb7d-8e10-46cc-af2c-14e1ec4763e3","last_modified":1562025668953},{"schema":1562025667477,"derHash":"WBTmy1Tq6VND2FmZKgFjD1krFVrxdSQx48G/OwVWJlA=","subject":"CN=CSP SSL Service CA 6,O=CENTRAL SECURITY PATROLS CO.\\, LTD.,L=Shinjuku-ku,ST=Tokyo,C=JP","subjectDN":"MH8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzEUMBIGA1UEBxMLU2hpbmp1a3Uta3UxKzApBgNVBAoTIkNFTlRSQUwgU0VDVVJJVFkgUEFUUk9MUyBDTy4sIExURC4xHTAbBgNVBAMTFENTUCBTU0wgU2VydmljZSBDQSA2","whitelist":false,"attachment":{"hash":"ea11110864b5c9817abbf5aa566a8057805deaf75f9481b604f2331ea70e98dc","size":2138,"filename":"q7drg9v6vXmd5nzhVcopuDRYMQ_LMZeqBynfhpYbHOk=.pem","location":"security-state-staging/intermediates/df60022f-853f-4111-a78b-4f89480bba48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q7drg9v6vXmd5nzhVcopuDRYMQ/LMZeqBynfhpYbHOk=","crlite_enrolled":false,"id":"5042a531-0af6-42d0-813f-e9ced7e21003","last_modified":1562025668207},{"schema":1562025665967,"derHash":"t6roJv/3LeP9azGIGlYiHXB3w9VcZLOUDO37ev0NzjU=","subject":"CN=Sectigo RSA Document Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxKDAmBgNVBAMTH1NlY3RpZ28gUlNBIERvY3VtZW50IFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"1afce422c54b00d30a903b931affa5c308ec9659de65c8cd7d9e68a0f9d83799","size":2190,"filename":"-Oc83wrXpHfiURh-sv35nT6kTLieb8t5m99W0qLHamc=.pem","location":"security-state-staging/intermediates/f747522e-7e39-4df3-aa39-2ef6d207958b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+Oc83wrXpHfiURh+sv35nT6kTLieb8t5m99W0qLHamc=","crlite_enrolled":false,"id":"a628600a-3dd2-4224-8076-be7ce8f30dae","last_modified":1562025666707},{"schema":1562025664465,"derHash":"G2gobe/OA2USpdrHbIq9Bn0zoH1ODe93BwicmAB14ZI=","subject":"CN=Highmark Tapestry HIE CA,OU=Orion Health Direct Secure Messaging,O=High Mark HIE\\, LLC,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJIaWdoIE1hcmsgSElFLCBMTEMxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEhMB8GA1UEAxMYSGlnaG1hcmsgVGFwZXN0cnkgSElFIENB","whitelist":false,"attachment":{"hash":"5e734fa19464bfd827dba86f076eeb3d032d3ce3f019eee75129e92a6dd81e20","size":2284,"filename":"tvN1gIKzR86qPSQ2AwrqugmOi6GtrIpoHkme7sem91Y=.pem","location":"security-state-staging/intermediates/f6c02c5c-dc08-47eb-899a-ae6b83749d80.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tvN1gIKzR86qPSQ2AwrqugmOi6GtrIpoHkme7sem91Y=","crlite_enrolled":false,"id":"a6432f10-db63-4211-8287-ee5b3019add5","last_modified":1562025665206},{"schema":1562025663727,"derHash":"6tYvQrs2ndQ89hMawtjXLk+f7oXmnUXar/4yaqwqRvE=","subject":"CN=thawte ECC EV SSL CA,O=thawte\\, Inc.,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAMTFHRoYXd0ZSBFQ0MgRVYgU1NMIENB","whitelist":false,"attachment":{"hash":"b9896b22533f91f08e44fd0d913e570893beda53a7ddaabc17bb5de4ac3715fa","size":1272,"filename":"v3yOKQDQnYnr9hQ5ns91kotLui5ZZWuKHuumsGg2skg=.pem","location":"security-state-staging/intermediates/7a20713d-c595-454a-aa10-6a71cb4cb5fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v3yOKQDQnYnr9hQ5ns91kotLui5ZZWuKHuumsGg2skg=","crlite_enrolled":false,"id":"9294ecd4-a4c2-4786-9f0b-a20345e54442","last_modified":1562025664458},{"schema":1562025662215,"derHash":"P7oKpJ+94cgUyoMIeO0Dx9JDI/Y0g+Ut7o/0LBU8I08=","subject":"CN=GlobeSSL EV Certification Authority 2,OU=Controlled by COMODO exclusively for Globe Hosting\\, Inc.,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xHDAaBgNVBAoTE0dsb2JlIEhvc3RpbmcsIEluYy4xQTA/BgNVBAsTOENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBHbG9iZSBIb3N0aW5nLCBJbmMuMS4wLAYDVQQDEyVHbG9iZVNTTCBFViBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAy","whitelist":false,"attachment":{"hash":"8081c701056c43713db349d2808d99c5a352629faf0a60a54c7e2008170fc91c","size":2276,"filename":"iQ6SmjjdklCphf7sBBL9m4lWWf44bngHmvy7B8dl6XQ=.pem","location":"security-state-staging/intermediates/a35dab3a-08bf-43e8-b264-b1f7fa410a12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iQ6SmjjdklCphf7sBBL9m4lWWf44bngHmvy7B8dl6XQ=","crlite_enrolled":true,"id":"4fc9e088-612e-4c87-9986-7ef73542a266","last_modified":1562025662944},{"schema":1562025661465,"derHash":"wGiop8wvCL4Omh3bDfAeL3rnm/5QMSLFUrt7M2of1vQ=","subject":"CN=LuxTrust SSL CA 5,O=LuxTrust S.A.,C=LU","subjectDN":"MEExCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMRowGAYDVQQDDBFMdXhUcnVzdCBTU0wgQ0EgNQ==","whitelist":false,"attachment":{"hash":"07e1eb74359b90ce357ff15b2837652122ed2943ca4724c19f4a3192da301b57","size":2288,"filename":"bcglypvVD9g3zJapYfU5_6QrN_GcvIy5NZ1p98WA-tU=.pem","location":"security-state-staging/intermediates/3be807ca-d51c-486c-9724-945c312574a2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bcglypvVD9g3zJapYfU5/6QrN/GcvIy5NZ1p98WA+tU=","crlite_enrolled":true,"id":"412b16c9-e9a4-4fdd-8e97-755cf0cd9015","last_modified":1562025662207},{"schema":1562025659950,"derHash":"CCskMEe/APWEQB9Ti1BLrp7AYOAH//KLFZwIQXBoZU4=","subject":"CN=GlobalSign Organization Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"e673e3e0c445d31eaaf7607090b13063ce93218b2424fad674db3bc682f6265e","size":1634,"filename":"OqqTlivI4taTCDJE1oq61tAsdnSQ_13Ibp0QKE1H7tc=.pem","location":"security-state-staging/intermediates/d2a682c5-e5d3-4d5f-8e12-1a3cbf600d6b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OqqTlivI4taTCDJE1oq61tAsdnSQ/13Ibp0QKE1H7tc=","crlite_enrolled":false,"id":"d5374ecb-80ce-47e5-b059-bece1cff031d","last_modified":1562025660705},{"schema":1562025658474,"derHash":"sZHt60y3cseYMVDAR1F/UL2SIcjLyTSaEdDMPn73K/0=","subject":"CN=CA A7,O=DST,C=US","subjectDN":"MCsxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNEU1QxDjAMBgNVBAMTBUNBIEE3","whitelist":false,"attachment":{"hash":"234f347bea5e6f979a5a03efb10ec2fdad80a05a5cf9ded51547fb01294a97f9","size":1114,"filename":"pIEW0Ptmy7_0EoTnwa5tDDgFuFD-p6-tNOU0O__34jM=.pem","location":"security-state-staging/intermediates/2df0a451-ff09-4261-a690-b21e121528de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pIEW0Ptmy7/0EoTnwa5tDDgFuFD+p6+tNOU0O//34jM=","crlite_enrolled":false,"id":"fb10dfd0-dceb-4cf8-99d9-966518cbbe69","last_modified":1562025659202},{"schema":1562025656956,"derHash":"cC25BNQaA4wMkpXPdD/DHy0OoXzEIou/z4Hle5oTmPk=","subject":"CN=COMODO ECC Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE3MDUGA1UEAxMuQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"86ad7eec9fe49f2da6658c805ff49b8cd4c0d919c347cd6ee2446088aacb544b","size":1345,"filename":"WD9JjqhTQMxwDO7l8vVZLuQPr1qlVa6IiVp1QVlgeRM=.pem","location":"security-state-staging/intermediates/7ad82a21-1226-4e6c-a4d1-f54dc95a4952.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WD9JjqhTQMxwDO7l8vVZLuQPr1qlVa6IiVp1QVlgeRM=","crlite_enrolled":false,"id":"ff63e1e4-f2df-4c1f-912d-140d9482d281","last_modified":1562025657724},{"schema":1562025656215,"derHash":"vTgAKIBt7svIM2r4cLeat0/5gsKOPn/wnbI2MARL3tk=","subject":"CN=CrossTrust DV CA1,O=CrossTrust,C=JP","subjectDN":"MD4xCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpDcm9zc1RydXN0MRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBMQ==","whitelist":false,"attachment":{"hash":"fec40cd025070029bdff6f3e4e23cc05a21fc2f02394834d05664e175bed593a","size":1475,"filename":"H7SdZc_IEjlBeqVzFuiez9bEZDA35H1qoMvWqNj3cTg=.pem","location":"security-state-staging/intermediates/9a1c5eae-ad1b-4c59-8e67-068aa1271cbe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H7SdZc/IEjlBeqVzFuiez9bEZDA35H1qoMvWqNj3cTg=","crlite_enrolled":false,"id":"5229c4ed-b6d6-49aa-ac06-ff9409e3fe51","last_modified":1562025656948},{"schema":1562025655469,"derHash":"3MpxYWfwKaqaMJ7oyj/x9AF9Gh89GYG9/55a8/UDaCo=","subject":"CN=Booz Allen Hamilton BA CA 01,OU=TrustID,O=IdenTrust,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxEDAOBgNVBAsTB1RydXN0SUQxJTAjBgNVBAMTHEJvb3ogQWxsZW4gSGFtaWx0b24gQkEgQ0EgMDE=","whitelist":false,"attachment":{"hash":"909f0042606279a43c7d642c24bb37ea7161ec199ee60c8c634d754172b1ea23","size":2040,"filename":"UdncogVDGpmz7WJo4cgW3yRJEEC_B94goUWpdotXqis=.pem","location":"security-state-staging/intermediates/5c0368c0-92c7-4bdf-a1bd-6456c1a67422.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UdncogVDGpmz7WJo4cgW3yRJEEC/B94goUWpdotXqis=","crlite_enrolled":false,"id":"f48c0b76-fdb4-48ef-8265-f5936ac95931","last_modified":1562025656207},{"schema":1562025654686,"derHash":"t2ovsWJyFiIq+ksCXPTaey5Oyh7HvPdcXH8E+gnIJjo=","subject":"CN=TrustOcean SSL CA - ECC - 2018,OU=ECC Domain Validation Secure Server - 2018,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIGjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMTMwMQYDVQQLEypFQ0MgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTgxJzAlBgNVBAMTHlRydXN0T2NlYW4gU1NMIENBIC0gRUNDIC0gMjAxOA==","whitelist":false,"attachment":{"hash":"8563213d0beedc0bfe2aeaf6eea186a61ed41cc23c14a763c1ba2c84517a3a00","size":1362,"filename":"PKd-ld-FuxfPZ5wgPJhWwsUah7IUyvrd0dVMuPAcCHw=.pem","location":"security-state-staging/intermediates/dcc8872f-13cc-416b-b26c-72c8733ead48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PKd+ld+FuxfPZ5wgPJhWwsUah7IUyvrd0dVMuPAcCHw=","crlite_enrolled":true,"id":"90f1d6dd-0284-4beb-9154-f681754b0384","last_modified":1562025655462},{"schema":1562025647187,"derHash":"6sJBwEQKNoMBETgzNrwgysdAnCD26I1PhPSCe+kZ4zg=","subject":"CN=e-Szigno SSL CA 2014,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHgxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEdMBsGA1UEAwwUZS1Temlnbm8gU1NMIENBIDIwMTQxHzAdBgkqhkiG9w0BCQEWEGluZm9AZS1zemlnbm8uaHU=","whitelist":false,"attachment":{"hash":"a0cfba79ba47c056ad89715d67ca81adb743a5af504f88e8533bb086aa28c2a6","size":2268,"filename":"DuvXKXobTisU7ufJpGVYzPTgBJ3Vjeta2kpZtG9qXc8=.pem","location":"security-state-staging/intermediates/632fc789-8c70-460e-a724-365f1a2f468b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DuvXKXobTisU7ufJpGVYzPTgBJ3Vjeta2kpZtG9qXc8=","crlite_enrolled":true,"id":"b199af11-7ea2-49db-8145-22cd545ac30f","last_modified":1562025647917},{"schema":1562025646434,"derHash":"j3zEVemlUHgEEgZV1xORhiU+Q7AEIuc0JjoHadL4n30=","subject":"CN=ACCVCA-130,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMzAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"c7a672c81ca3a88f9f1026542e8a440443a8270bb0d1179ac7f197bfae1d5169","size":2686,"filename":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=.pem","location":"security-state-staging/intermediates/45659546-7b93-4a34-9576-89edb332e236.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y4wPdQMFev6SAz6Zy7McH45VYp5uADyuOVtFnivRtu4=","crlite_enrolled":false,"id":"fdbfe4a6-8fe3-4795-a5fa-49db19f65800","last_modified":1562025647179},{"schema":1562025644937,"derHash":"IxukAuKLNJXzvgythweNm4+9hgQRFq+bgEfnsc/6gtA=","subject":"CN=Medicity Direct CA,OU=www.medicity.com,O=Medicity Inc.,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1NZWRpY2l0eSBJbmMuMRkwFwYDVQQLExB3d3cubWVkaWNpdHkuY29tMRswGQYDVQQDExJNZWRpY2l0eSBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"a8fe64d502cfb57f08bdf2b32b5b90927e134d559471c8aad19c666b7d29ebbc","size":2154,"filename":"Kcbe6mdTGz7kGQXiuqkZB-C5l9pbNG9BpLKyFU6s8MI=.pem","location":"security-state-staging/intermediates/1638d79d-0fa1-4196-828b-4100a5c9634d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kcbe6mdTGz7kGQXiuqkZB+C5l9pbNG9BpLKyFU6s8MI=","crlite_enrolled":false,"id":"c64e8b9f-acff-4734-8fac-8fd5810cd9cd","last_modified":1562025645673},{"schema":1562025640410,"derHash":"D9marh/81dnwrXbt3cvva4hMyFwWv8+ktSRhVdZZftY=","subject":"CN=EC-Ciutadania,OU=Serveis P\u00fablics de Certificaci\u00f3,O=CONSORCI ADMINISTRACIO OBERTA DE CATALUNYA,C=ES","subjectDN":"MIGGMQswCQYDVQQGEwJFUzEzMDEGA1UECgwqQ09OU09SQ0kgQURNSU5JU1RSQUNJTyBPQkVSVEEgREUgQ0FUQUxVTllBMSowKAYDVQQLDCFTZXJ2ZWlzIFDDumJsaWNzIGRlIENlcnRpZmljYWNpw7MxFjAUBgNVBAMMDUVDLUNpdXRhZGFuaWE=","whitelist":false,"attachment":{"hash":"159d49dde4802a499bf0db5648ce2298fe56a96ce3f2e2800785445ea996088e","size":2097,"filename":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM_BQAAwtDlBw0=.pem","location":"security-state-staging/intermediates/df04e35c-a63e-447a-a80e-73770c3aef84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"N2E0VULCCzFKdEp8VKghUqKDvpzc2iM/BQAAwtDlBw0=","crlite_enrolled":false,"id":"dca24481-e123-47e7-97bb-84d938fe8132","last_modified":1562025641172},{"schema":1562025637342,"derHash":"d6vmXfS+lOXsIi/JBeEjP4x31rOuKTM0agwvw7Lx9WA=","subject":"CN=Oklahoma State Department of Health CA,OU=Orion Health Direct Secure Messaging,O=Oklahoma State Department of Health,C=US","subjectDN":"MIGbMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjT2tsYWhvbWEgU3RhdGUgRGVwYXJ0bWVudCBvZiBIZWFsdGgxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEvMC0GA1UEAxMmT2tsYWhvbWEgU3RhdGUgRGVwYXJ0bWVudCBvZiBIZWFsdGggQ0E=","whitelist":false,"attachment":{"hash":"03627595711bc45e6bb6e4689b2bbe75b2cea7c9fd224b0697209dadce2df2d3","size":2324,"filename":"xQRTlo6N9UfoVMjpnJGZtpJr06LdDBpWpY-8ECdpOkk=.pem","location":"security-state-staging/intermediates/f4576b6f-cb28-441b-aa43-161c2d12c329.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xQRTlo6N9UfoVMjpnJGZtpJr06LdDBpWpY+8ECdpOkk=","crlite_enrolled":false,"id":"797ff527-d050-47f9-8c3d-7f29381409db","last_modified":1562025638143},{"schema":1562025636604,"derHash":"ir/8+n0+Cd9TGnL/FkBls6bYCnfjPOxDbunT9g+EEzs=","subject":"CN=InterContinental Hotels Group RSA Client CA,O=Six Continents Hotels\\, Inc.,L=Dunwoody,ST=GA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExETAPBgNVBAcTCER1bndvb2R5MSQwIgYDVQQKExtTaXggQ29udGluZW50cyBIb3RlbHMsIEluYy4xNDAyBgNVBAMTK0ludGVyQ29udGluZW50YWwgSG90ZWxzIEdyb3VwIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"5128156a66f41cfb94c396626f58c95d45092d39232a2feee7a7f2663ae33066","size":2138,"filename":"qv_cktSW8maQyApxu-hdyO0fqYE834dm-HuXQIPLkOo=.pem","location":"security-state-staging/intermediates/f700690a-57b2-42f5-8f69-7b97adf26565.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qv/cktSW8maQyApxu+hdyO0fqYE834dm+HuXQIPLkOo=","crlite_enrolled":false,"id":"1f3a6742-4807-4da5-8b58-7b88abdece12","last_modified":1562025637335},{"schema":1562025635854,"derHash":"SJzJ8M0OKTehCtlqI3XAvRAxs+zFS9Bk1YWMwGK0GxA=","subject":"SERIALNUMBER=201812,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEy","whitelist":false,"attachment":{"hash":"209782e4f2ac908d3abdd1e2c651c9a94332adacb8ef3bed6f67ee015f73a1f6","size":2333,"filename":"K_y7Bld60S98GQkoxgI2sf4UHNiS90hGcdg2ZT9Sv2g=.pem","location":"security-state-staging/intermediates/ccf20a3e-8818-446c-bec4-8f650112c804.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K/y7Bld60S98GQkoxgI2sf4UHNiS90hGcdg2ZT9Sv2g=","crlite_enrolled":false,"id":"43c10a9f-ecd2-4c0b-b6c2-3c51ffbe80c8","last_modified":1562025636597},{"schema":1562025635117,"derHash":"RtO1D+3PjDa19nIjnMOi6eAu0V8zy9wMJiqGR4SUA/Q=","subject":"CN=USERTrust ECC Organization Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE/MD0GA1UEAxM2VVNFUlRydXN0IEVDQyBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"0b8353c2d7776cd1f3b5e4ebc5145432dc3af3be23f68d2a3eaf204e02a02b17","size":1337,"filename":"kRGhnbdY7rR4yOa8G3EFT4gmen6uTLPFQPPk_s1vl-M=.pem","location":"security-state-staging/intermediates/ca9f4481-d288-4f5b-80c8-2bd10db0c543.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kRGhnbdY7rR4yOa8G3EFT4gmen6uTLPFQPPk/s1vl+M=","crlite_enrolled":false,"id":"a4586dee-7ea9-4b73-90f6-cb41b7b9cdfe","last_modified":1562025635846},{"schema":1562025634359,"derHash":"eqRdb1sU2rHGhEwZwoBOFLWBHm7eHwKwrvBlp7NZxo8=","subject":"CN=ATT Organization Validated CA 2019,OU=ATT Business Wi-Fi Services,O=ATT Services Inc,L=Austin,ST=Texas,C=US","subjectDN":"MIGcMQswCQYDVQQGEwJVUzEZMBcGA1UEChMQQVRUIFNlcnZpY2VzIEluYzEkMCIGA1UECxMbQVRUIEJ1c2luZXNzIFdpLUZpIFNlcnZpY2VzMQ8wDQYDVQQHEwZBdXN0aW4xDjAMBgNVBAgTBVRleGFzMSswKQYDVQQDEyJBVFQgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQSAyMDE5","whitelist":false,"attachment":{"hash":"ce151b1a5253a78fd23ad82efdd0ffb88b59b41f34a9871b6e2f3552df194f91","size":1735,"filename":"YOMvMe2Iot921yxSyd-8wLY-a8b_zYZmd31zENECyFE=.pem","location":"security-state-staging/intermediates/412a704f-f9d7-4f8f-8eb9-faf3eb2b7c8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YOMvMe2Iot921yxSyd+8wLY+a8b/zYZmd31zENECyFE=","crlite_enrolled":true,"id":"126186e4-fe3d-4610-a378-9d6ddff47030","last_modified":1562025635109},{"schema":1562025633607,"derHash":"ZeeA3/y1OHDqTtnhhLz5v8pGSEi00n5e7fY5GOabO4c=","subject":"CN=Don Dominio / MrDomain RSA OV CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"14cfac3f01120e8fab0ace79a95549801b13c469346a2d0e6aee4c6c99a8f967","size":2170,"filename":"PDA9PcTMXiEjxDxKYS1P_SinvLjX1xMCDWv1_fCl8_Q=.pem","location":"security-state-staging/intermediates/27edf606-4cc9-4094-b4bf-458c740217ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PDA9PcTMXiEjxDxKYS1P/SinvLjX1xMCDWv1/fCl8/Q=","crlite_enrolled":false,"id":"116c9082-ffba-4a57-92f9-73cd7e530aaa","last_modified":1562025634351},{"schema":1562025632851,"derHash":"ppxZlm67zf7H9P8CiMhv9gNW+nhgIIuTtDoJWwYAzB4=","subject":"CN=nazwaSSL,OU=http://nazwa.pl,O=nazwa.pl sp. z o.o.,C=PL","subjectDN":"MFgxCzAJBgNVBAYTAlBMMRwwGgYDVQQKDBNuYXp3YS5wbCBzcC4geiBvLm8uMRgwFgYDVQQLDA9odHRwOi8vbmF6d2EucGwxETAPBgNVBAMMCG5hendhU1NM","whitelist":false,"attachment":{"hash":"882b6da025cdfc61d89e03806a350163dfdfc251470ff6e5f8433ca8370adea9","size":1605,"filename":"AW6U8qPqk114rfl2sAhiEim2Pf0mq_Rb_BeWSlVAiP4=.pem","location":"security-state-staging/intermediates/4a692d29-8a7d-4aa6-b0fa-426ad6f59300.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AW6U8qPqk114rfl2sAhiEim2Pf0mq/Rb/BeWSlVAiP4=","crlite_enrolled":true,"id":"bbeb9d9e-3dd2-4546-8c96-d7fc9be4f2e6","last_modified":1562025633599},{"schema":1562025631337,"derHash":"KaTsi8oy3ZHxEg3hT1u0OTVtSO2AEg3xo6hmF+pIS8g=","subject":"CN=KeyNet Systems ECC DV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"05956e2bbe03a04e21687f1c9ca0133edafbb9211cbc05d0b3a5a99a07c8284b","size":1297,"filename":"BUAXj7DRPY9FwGYzytth18HC8DBDa4DvU_tIIX5dMkI=.pem","location":"security-state-staging/intermediates/a89204d4-8ae2-4fce-b46a-2384b1364511.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BUAXj7DRPY9FwGYzytth18HC8DBDa4DvU/tIIX5dMkI=","crlite_enrolled":false,"id":"3e638609-9645-46cf-88c9-263cbcf1d0e0","last_modified":1562025632090},{"schema":1562025629816,"derHash":"UFG9aeGdbNA2FHlJrFu8+Zg0Vh8Rn2DceTgkjWHHe70=","subject":"CN=Sectigo RSA Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEkMCIGA1UEAxMbU2VjdGlnbyBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"b8513c9c5b4db1eb407ce93a963c2fdb99d70689e74421029f245511fb2897fd","size":2125,"filename":"Ez_HDfkC0S25jJCRx4IUnR4y_p77QuYeiWPHVhWZbQU=.pem","location":"security-state-staging/intermediates/cbc4d51d-ac52-4ef3-8e1c-7c0fd3382973.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ez/HDfkC0S25jJCRx4IUnR4y/p77QuYeiWPHVhWZbQU=","crlite_enrolled":true,"id":"c2a4d5c5-1885-48b1-9bb9-b33f5686ec39","last_modified":1562025630576},{"schema":1562025629070,"derHash":"13N+Xy0//KQpkC6fOIz9bFlZzTWg/BA87i9+k9HGalI=","subject":"CN=DigiCert Assured ID TLS CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENB","whitelist":false,"attachment":{"hash":"3acfd29ff87e4c65c2f222ef3a9d1cf2386bb9c35bc8466e5ff9d4b21ca177bf","size":1735,"filename":"wcEQuH5mngysd8OrgXuw0roT-SkrGkVZxVSpoNafgws=.pem","location":"security-state-staging/intermediates/0bd20a8e-99cf-4d4b-af90-c59deca2697a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wcEQuH5mngysd8OrgXuw0roT+SkrGkVZxVSpoNafgws=","crlite_enrolled":true,"id":"1a882256-e765-4db1-820b-0d4c76dcf9a5","last_modified":1562025629808},{"schema":1562025627540,"derHash":"M88fXJOW1+6egoOy529ADlBFBXXrFa0CyVbBxVdbGE0=","subject":"CN=MobileMD Direct Intermediate CA,OU=MobileMD,O=MobileMD Health Services,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhNb2JpbGVNRCBIZWFsdGggU2VydmljZXMxETAPBgNVBAsTCE1vYmlsZU1EMSgwJgYDVQQDEx9Nb2JpbGVNRCBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"35d053969fc5821037b137191551940bcf7fc50bfa0647a305746da9e582adeb","size":2190,"filename":"KF8mfWmAHOhFnWmjw7qocu6GmfRi8m7LPwwcVgTMS7s=.pem","location":"security-state-staging/intermediates/a811cee7-9306-41ed-ac9d-dd0f6360c358.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KF8mfWmAHOhFnWmjw7qocu6GmfRi8m7LPwwcVgTMS7s=","crlite_enrolled":false,"id":"59b4f0d3-d12e-4839-9c4d-373f62ed31ef","last_modified":1562025628306},{"schema":1562025626775,"derHash":"JTA8/QvxuqHvJIwp8HP//C58gVgu4jtFx/HDsy40Gtg=","subject":"CN=EAEko HAetako langileen CA - CA personal de AAPP vascas (2),OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGlMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExRDBCBgNVBAMMO0VBRWtvIEhBZXRha28gbGFuZ2lsZWVuIENBIC0gQ0EgcGVyc29uYWwgZGUgQUFQUCB2YXNjYXMgKDIp","whitelist":false,"attachment":{"hash":"33e5893bceb45f8047a84fd02b68d534b9290eb9deebc53433c7defcf5607d2c","size":2572,"filename":"fIoFCop2r5Hw838PL7crV4ts16Lq1s1xjk7E-I98dE8=.pem","location":"security-state-staging/intermediates/9635a458-c14c-408e-9445-8e8074645a18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fIoFCop2r5Hw838PL7crV4ts16Lq1s1xjk7E+I98dE8=","crlite_enrolled":true,"id":"ca492503-140b-4ef0-895d-d6ffd21fe324","last_modified":1562025627531},{"schema":1562025624539,"derHash":"vD8DpDYkDtul+DcU9vZ340s3+bHwwIweVY2YHieeggk=","subject":"CN=RapidSSL SHA256 CA - G3,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"6e37822b18adbba04ed1ed6f1d2b14f9a4d268516dd949736146f64d645e0617","size":1496,"filename":"6X0iNAQtPIjXKEVcqZBwyMcRwq1yW60549axatu3oDE=.pem","location":"security-state-staging/intermediates/f9e93d0f-a61e-467e-8adb-526e38c507be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6X0iNAQtPIjXKEVcqZBwyMcRwq1yW60549axatu3oDE=","crlite_enrolled":false,"id":"20d5332c-be89-418c-a8bb-b3fa2467c0f1","last_modified":1562025625274},{"schema":1562025623789,"derHash":"9kDlZDxAwfMp4QBDjijJV2ka+opT5AWjJvev63DCO8E=","subject":"CN=itsme Sign Issuing CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MG0xCzAJBgNVBAYTAkJFMRkwFwYDVQRhDBBOVFJCRS0wNTM3Njk4MzE4MSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEhMB8GA1UEAwwYaXRzbWUgU2lnbiBJc3N1aW5nIENBIEcx","whitelist":false,"attachment":{"hash":"b2592a909119953ff1445030e304e8ee3639a647ff3a126baef272b71727b5d0","size":2467,"filename":"nUS99ZApOt7vAjJaTRPLXupkkwz8777d3Be6QJ9XmXI=.pem","location":"security-state-staging/intermediates/db061d36-ae08-416c-9b85-54031ca3196d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nUS99ZApOt7vAjJaTRPLXupkkwz8777d3Be6QJ9XmXI=","crlite_enrolled":false,"id":"32e98d40-0e1a-4f96-bbd6-8cea5f34753c","last_modified":1562025624531},{"schema":1562025622305,"derHash":"HlW5BHmnN+eLVvOctXBRSisdy9mvJJwGGIaDeph8aVg=","subject":"CN=NII Open Domain Code Signing CA,O=National Institute of Informatics,L=Academe,C=JP","subjectDN":"MHUxCzAJBgNVBAYTAkpQMRAwDgYDVQQHEwdBY2FkZW1lMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxKDAmBgNVBAMTH05JSSBPcGVuIERvbWFpbiBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"1cf70e67f36acabb305f46fa93fe5f445a8d376d8408160bbec5c9104908fd83","size":1638,"filename":"m3mE8ZnK8HZ9jzJz9euIeftEUmi37GkgQPeuCCQJI8o=.pem","location":"security-state-staging/intermediates/d2643bff-aec0-4b5e-b8ae-f32d7a258f21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m3mE8ZnK8HZ9jzJz9euIeftEUmi37GkgQPeuCCQJI8o=","crlite_enrolled":false,"id":"ba200c93-1e24-4cf0-b8ae-4f284461de5d","last_modified":1562025623035},{"schema":1562025620792,"derHash":"HMNYpt+gp2u1RwZg1487JfI8zWOVZn5JzPyCAdo9GS0=","subject":"CN=Certigna Entity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHsxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRswGQYDVQQDDBJDZXJ0aWduYSBFbnRpdHkgQ0E=","whitelist":false,"attachment":{"hash":"61a81d4d9681c5c86696195f2dcb40c8e795f9b490e5f72a7fa8ab4d6fd0ada9","size":2507,"filename":"0Eiyrr-wFIp1JqShtXzNCtJt2yUU0-j_mDnLwk1-AHk=.pem","location":"security-state-staging/intermediates/bfaf2dab-dfcf-4771-bf64-700aa69c0281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0Eiyrr+wFIp1JqShtXzNCtJt2yUU0+j/mDnLwk1+AHk=","crlite_enrolled":false,"id":"7c421e3b-f390-4235-af5f-e8a08ad5b7b3","last_modified":1562025621531},{"schema":1562025618556,"derHash":"VGyv+QYO7zD08+AiVfv1Ex5lfBcQyaZQAgEzqBi+wcg=","subject":"CN=GeoTrust EV SSL CA - G7,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNw==","whitelist":false,"attachment":{"hash":"819ac09e5307805d7bca58b450e383b8d795a443c6fe0c3ad0f26bdea6357767","size":1906,"filename":"mSUoTJHVFJsXYTXqbA1e3I1MK46Hl_VXGBvp5bWWW4c=.pem","location":"security-state-staging/intermediates/abc5e6d5-4632-4219-b8c8-fd208ce1314d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mSUoTJHVFJsXYTXqbA1e3I1MK46Hl/VXGBvp5bWWW4c=","crlite_enrolled":false,"id":"cbbe38e9-ee0e-4003-9c25-ae1e817de1e1","last_modified":1562025619303},{"schema":1562025617811,"derHash":"Zc+Tj9n7NCAMn235Pe1zqltxw2nMdKfEkfDkeh1edL4=","subject":"CN=MarketWare Server CA 2,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIGPMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xHzAdBgNVBAMTFk1hcmtldFdhcmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"f386a64f34b7c17cb08c2a7db308298366857c0b6c8c079eb54b64e3e52da778","size":2174,"filename":"nDi1HIiT115x0MuCzNMX50C66I0SdrTtqTFxWKBs9TA=.pem","location":"security-state-staging/intermediates/db573702-d4d2-4f8b-8424-67deaebcb59b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nDi1HIiT115x0MuCzNMX50C66I0SdrTtqTFxWKBs9TA=","crlite_enrolled":true,"id":"564405bd-7e8b-4930-98d8-7e9a66a09631","last_modified":1562025618549},{"schema":1562025616317,"derHash":"eO4jersjVKpnyo+14r+puRegv1Pi87PKs9rOweLDYeE=","subject":"CN=Gehirn Managed Certification Authority - ECC OV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDQyBPVg==","whitelist":false,"attachment":{"hash":"cacee93de389613e7f6636cfe013384ae68d256770ea28771d8a6196b104fee6","size":1321,"filename":"oARzv0l1Eo_Mizi_3scY3T6AQ1Zfy7sDSJO-oLT0O0g=.pem","location":"security-state-staging/intermediates/eec8e59e-ea66-4a29-82fe-6c948d312095.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oARzv0l1Eo/Mizi/3scY3T6AQ1Zfy7sDSJO+oLT0O0g=","crlite_enrolled":false,"id":"648ea664-8a0e-4b8c-b41f-de5c67be76d9","last_modified":1562025617054},{"schema":1562025614822,"derHash":"WKqSlhweA1BUrdpk6IO/rhshQ5y/etYeM/Z9xW4pX2o=","subject":"CN=National and Kapodistrian University of Athens CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGSMQswCQYDVQQGEwJHUjFEMEIGA1UECgw7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPTA7BgNVBAMMNE5hdGlvbmFsIGFuZCBLYXBvZGlzdHJpYW4gVW5pdmVyc2l0eSBvZiBBdGhlbnMgQ0EgUjI=","whitelist":false,"attachment":{"hash":"5789381e4fdcbc89485d0d084b116ecc57eab7a3411841e4acba28a4454b7219","size":2207,"filename":"a-9SzP1XJW2jpz0QniNws25_KvsEBfsN9xrkka1dChc=.pem","location":"security-state-staging/intermediates/b5f529a5-f373-4883-8c9c-9d8f165824f1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+9SzP1XJW2jpz0QniNws25/KvsEBfsN9xrkka1dChc=","crlite_enrolled":true,"id":"2e2e2899-2ea5-4d68-b3d0-0c2c1ed211c9","last_modified":1562025615555},{"schema":1562025613331,"derHash":"WMldF5B+dD4SHO9H1IBk17OvMrUUvqPvdNKQpS1wuWw=","subject":"CN=Trend Micro CA,O=Trend Micro Inc,C=US","subjectDN":"MEAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKDA9UcmVuZCBNaWNybyBJbmMxFzAVBgNVBAMMDlRyZW5kIE1pY3JvIENB","whitelist":false,"attachment":{"hash":"33f2077021a616b53e063fdb38858c8315f1fa59cc4a6030f8c6a347c168de22","size":1459,"filename":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=.pem","location":"security-state-staging/intermediates/263841e5-4107-4fe7-9f25-0ff66db32773.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qczcaUM72BvrELfBo2n2WlYnwx7A5w4eV0dgYXXe1Bk=","crlite_enrolled":false,"id":"e5df1dae-0e71-4c7f-8ed1-4926351e8dea","last_modified":1562025614072},{"schema":1562025611813,"derHash":"Js3s3ROkRt6hoLehqs8Xu4BRtoUJ6ZAK0lQdBFSgP/U=","subject":"SERIALNUMBER=201914,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE0","whitelist":false,"attachment":{"hash":"33f2d6b3dab769a53325ffbb9013e62f16a787048391ec59be9889656248794f","size":2333,"filename":"PaxxgvdBQW_hDijSBTN-csj_vsanAzF9gsjoa6ic5w4=.pem","location":"security-state-staging/intermediates/ed61ec49-d0f8-412c-9387-8b9b3409e56f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PaxxgvdBQW/hDijSBTN+csj/vsanAzF9gsjoa6ic5w4=","crlite_enrolled":false,"id":"17cb40e4-54d0-4f35-b236-070f94f267f4","last_modified":1562025612546},{"schema":1562025611073,"derHash":"ml7s7px9iYvYHcO/Bm2vau+42xxZZ2IG0r/daCMSxvY=","subject":"CN=Thawte RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElRoYXd0ZSBSU0EgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"5ab0596aa7dd3f7d6cf1c6d2df754c46aa3f5872ff617e4f9336bde88379619b","size":1634,"filename":"S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=.pem","location":"security-state-staging/intermediates/289fd54c-d874-4e7c-966c-99955002ec14.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0mHTmqv2QhJEfy5vyPVERSnyMEliJzdC8RXduOjhAs=","crlite_enrolled":true,"id":"d280501b-539b-4cdb-87d5-dd02b98025b3","last_modified":1562025611805},{"schema":1562025606564,"derHash":"p7dwK9Ju9/BnodOXXsFyC0bW4B/RAayTQi7rDW3iXzI=","subject":"CN=SecureCore RSA DV CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxHTAbBgNVBAMTFFNlY3VyZUNvcmUgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"b3944ffa540226fa1a9e53714f5357803617cd5ef1176c921cf08e37c5a1f503","size":2113,"filename":"CrV-DCuu__rnw7hOV-VT2e3k97fReT_N7f4coJTynlM=.pem","location":"security-state-staging/intermediates/fb5448bb-8cd8-4448-abe0-785a2c069d60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CrV+DCuu//rnw7hOV+VT2e3k97fReT/N7f4coJTynlM=","crlite_enrolled":true,"id":"9e84ec55-93b1-412d-b1ec-dd9a2fa6d851","last_modified":1562025607312},{"schema":1562025605823,"derHash":"YvubbNJjO5LZHbJkzmeKmxnFdUFKsQrUbRV/B7uibv8=","subject":"CN=GeoTrust Secure Site Starter DV SSL CA - G1,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK0dlb1RydXN0IFNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"7fbb720621a1148fa1c1e47a4c221a58b477ab69560c12e200af131f56d400e8","size":1743,"filename":"INyHMxZOziIERyiIqDLB0VLBBRvnFowehelheu9bdZY=.pem","location":"security-state-staging/intermediates/4da4baa6-3ba3-4f18-b318-e556016cb10e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"INyHMxZOziIERyiIqDLB0VLBBRvnFowehelheu9bdZY=","crlite_enrolled":false,"id":"a2c4298c-6d7d-4e67-82d6-bba4f0fb4f9e","last_modified":1562025606556},{"schema":1562025602757,"derHash":"pesHtCHfz+1qnF4ucq5xBeKayGdaiWsrUijjVXYfr7Y=","subject":"CN=Digi-Sign CA Digi-ID,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHExCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR0wGwYDVQQDExREaWdpLVNpZ24gQ0EgRGlnaS1JRA==","whitelist":false,"attachment":{"hash":"49174c7fb3a07c4ee6bdd8f6d6366142a26863f173d39f278180b7de9c574c7a","size":2121,"filename":"lSWsBqNnQ74d1GG7ux7ThmLopqXERYuHcDLuXouxsyU=.pem","location":"security-state-staging/intermediates/975bf464-9aac-4785-9db4-bf6f599f9dfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lSWsBqNnQ74d1GG7ux7ThmLopqXERYuHcDLuXouxsyU=","crlite_enrolled":false,"id":"c9ba0d28-eb09-4617-9b02-8109a727b905","last_modified":1562025603528},{"schema":1562025601957,"derHash":"XxqCwJy64jnU4/BwTJcHVVR+U+PPKQ+Uef5+mGZf7w8=","subject":"CN=Abbott Laboratories Secure Code Signing CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xMzAxBgNVBAMTKkFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"c53bc185adf65cc1c3297afab1f667bf42bc5da4e68e8e1b18794a9385973297","size":1878,"filename":"Vgcwr9WVl0WnsAApvKgxDZM4Q7HznM_pP7X9u4ESS1I=.pem","location":"security-state-staging/intermediates/3ae5fbf0-e0db-481a-baad-a316a45d945a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vgcwr9WVl0WnsAApvKgxDZM4Q7HznM/pP7X9u4ESS1I=","crlite_enrolled":false,"id":"776078c7-791c-4564-8ce2-eb27e585f7b1","last_modified":1562025602746},{"schema":1562025600414,"derHash":"0roL/sQ/p4A4YM3mszd0IbH1Y+wSS1HZCEFbDpNzI+Y=","subject":"CN=QuoVadis Time-Stamping Authority CA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHkxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xLzAtBgNVBAMMJlF1b1ZhZGlzIFRpbWUtU3RhbXBpbmcgQXV0aG9yaXR5IENBIEcx","whitelist":false,"attachment":{"hash":"26a4176be473a14f31de29d1da3b12f02f12be34041e77269c5979e00db43293","size":2418,"filename":"6o4kS9EEt21KPoxCFXRoGxaVWapw68wCcDeVHVAcpik=.pem","location":"security-state-staging/intermediates/1b3a0d87-9421-4607-a1d3-7692122d7547.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6o4kS9EEt21KPoxCFXRoGxaVWapw68wCcDeVHVAcpik=","crlite_enrolled":false,"id":"a14b051b-7d8e-4751-a0be-ea7845db3846","last_modified":1562025601175},{"schema":1562025597404,"derHash":"9ooj65c3qMdE7mcRLy/AJKrcUDu7sE8lze1PJXbJNIU=","subject":"CN=The Code Project Secure Email (S/mime) CA,O=The Code Project,C=CA","subjectDN":"MFwxCzAJBgNVBAYTAkNBMRkwFwYDVQQKExBUaGUgQ29kZSBQcm9qZWN0MTIwMAYDVQQDEylUaGUgQ29kZSBQcm9qZWN0IFNlY3VyZSBFbWFpbCAoUy9taW1lKSBDQQ==","whitelist":false,"attachment":{"hash":"e34a2353b9ea221ccf98cccc3d39c3562f1daceb776f42298bbc37afdd4fc54a","size":1752,"filename":"xtYGt02m4umLJCyy0kfaczCboF12WILjsGOb1umDfX0=.pem","location":"security-state-staging/intermediates/6a587b25-39c3-4ac6-95d6-78df25a40d97.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xtYGt02m4umLJCyy0kfaczCboF12WILjsGOb1umDfX0=","crlite_enrolled":false,"id":"9533ae64-4d6c-4fcd-bdaa-fbcf2aaf2775","last_modified":1562025598133},{"schema":1562025596661,"derHash":"Xyt9WujUNLYt/EOqPjZ+iF993t2aQ6QtGGk5BAD7MUY=","subject":"SERIALNUMBER=201904,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA0","whitelist":false,"attachment":{"hash":"c993ae91e5b73aeec9e80128be6a3eb8363cce5a8b6c955a24aa9c094b3764b8","size":2333,"filename":"_Eevym_zrvrIKVw8p8WS5pcOrGxY2QoyYX8eTm_Qcns=.pem","location":"security-state-staging/intermediates/98f269e6-220e-4aac-b625-a3681b2126a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/Eevym/zrvrIKVw8p8WS5pcOrGxY2QoyYX8eTm/Qcns=","crlite_enrolled":false,"id":"72c868f6-7898-4524-8d73-77ed61951b94","last_modified":1562025597396},{"schema":1562025595171,"derHash":"zo4QUBzRiNIn73StCjQtl3ZDvS3j8hcWG17S/7BYEac=","subject":"CN=Don Dominio / MrDomain RSA Client CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGPMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMS0wKwYDVQQDEyREb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"b532c1793ab65aa624c09708e7ebac6c4a98303c286d5b180809d182d9d544f3","size":2162,"filename":"bZXUokABdjKvAlZHkn4TVSe5U8voAYQQKs7PqX-3PkA=.pem","location":"security-state-staging/intermediates/0f7549c3-9c5e-48fd-b0c1-8791638b7e0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bZXUokABdjKvAlZHkn4TVSe5U8voAYQQKs7PqX+3PkA=","crlite_enrolled":false,"id":"41d33eac-fc49-4e82-8895-d1613fe6d882","last_modified":1562025595903},{"schema":1562025594407,"derHash":"FDY4IlF+KYmwh9DJpC7vE0p3S9CyoGZNRVr3hLwI9NA=","subject":"CN=Trusted Secure Certificate Authority 5,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTEvMC0GA1UEAxMmVHJ1c3RlZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDU=","whitelist":false,"attachment":{"hash":"8a6494ec2603c5d7fa49b972528dee5f7e5ba0c42c069f06d9aeab2c7f90c7fa","size":2166,"filename":"PzYLl5g5RZkQsPcG4YUX6vzXQf86rOUEcSAhn7JxzNo=.pem","location":"security-state-staging/intermediates/e96bc34e-fa49-44d4-8bed-d0620ff47065.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PzYLl5g5RZkQsPcG4YUX6vzXQf86rOUEcSAhn7JxzNo=","crlite_enrolled":true,"id":"f9fe88db-9db6-4383-b17b-864a507f7e22","last_modified":1562025595163},{"schema":1562025591410,"derHash":"tnb/oxeeiBIJOhter+6HauemqvIxB42tG/shzSiTdko=","subject":"CN=GlobalSign RSA OV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"4a0e56bd3b0d5e1f85efac014a7e99c83489b11c4826b602e42b144c4f6e91da","size":1553,"filename":"hETpgVvaLC0bvcGG3t0cuqiHvr4XyP2MTwCiqhgRWwU=.pem","location":"security-state-staging/intermediates/3f1383e4-4860-4b8b-bf8b-eac0b66ceb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hETpgVvaLC0bvcGG3t0cuqiHvr4XyP2MTwCiqhgRWwU=","crlite_enrolled":true,"id":"5ec3f078-2414-46ca-aaf8-e9630ae2109a","last_modified":1562025592175},{"schema":1562025590674,"derHash":"CQM/4jmW/kpZxMD1I9JWDjHf5MF9jqFAPUKalx9L1lo=","subject":"CN=WoTrus OV SSL Pro CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEgxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1RydXMgQ0EgTGltaXRlZDEdMBsGA1UEAxMUV29UcnVzIE9WIFNTTCBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"0e6c76a6d70346ff239c0a9320d8ebda8b750ae57610ff62a44fb8e221319a31","size":1861,"filename":"zACNb3_D6r-GIH58_Q4EDalNSChXFVVFbUJICvq7SIQ=.pem","location":"security-state-staging/intermediates/b1a606fe-50b5-4825-a5cc-14e050d9c0ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zACNb3/D6r+GIH58/Q4EDalNSChXFVVFbUJICvq7SIQ=","crlite_enrolled":true,"id":"633e504e-6010-4677-ba99-3052463cf02f","last_modified":1562025591403},{"schema":1562025589184,"derHash":"d3T6t1SJgiYrL+u0hmQ5sw+Ey7LRA1ed+esZ10tn/u4=","subject":"SERIALNUMBER=201919,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE5","whitelist":false,"attachment":{"hash":"61e72b9bfdca750e62c110c66bf30a3e69326deb6d793993bc4a88ba37a6e64d","size":2333,"filename":"tMuaH8MohBI08k1zTBkJ34YXWEOTQLc48i1wOMHbmdE=.pem","location":"security-state-staging/intermediates/37c38782-e0a8-4754-9a6f-655f6a72e086.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMuaH8MohBI08k1zTBkJ34YXWEOTQLc48i1wOMHbmdE=","crlite_enrolled":false,"id":"1c7d8111-6d2b-43cc-9d4f-8ac30ea4fe05","last_modified":1562025589921},{"schema":1562025586185,"derHash":"cQAks3vZ8OFTfBikwg+aMcS0hdEkjGQ/ILTADzcWuoU=","subject":"CN=DigiCert EV Server CA G4,OU=www.digicert.com,O=DigiCert  Inc,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCAgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBFViBTZXJ2ZXIgQ0EgRzQ=","whitelist":false,"attachment":{"hash":"bfda2140f26102c7934ae20783fd8234f2b2f5bbbfe9aa291f7d91bb80b6078a","size":1951,"filename":"rSOteFVbBeX8qJ_1s6WFayDHdgaEKLjbWQS5PZDkdvg=.pem","location":"security-state-staging/intermediates/5b85823c-270a-414c-ab27-7a62b77143d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rSOteFVbBeX8qJ/1s6WFayDHdgaEKLjbWQS5PZDkdvg=","crlite_enrolled":true,"id":"66f62e6d-0c5f-4d24-80c0-b99829e532cb","last_modified":1562025586928},{"schema":1562025585399,"derHash":"cJvk6rCjchI28osquA92/aJRMwsygvUV6l4LbHmuZyk=","subject":"CN=RUB-Chipcard CA G2,O=Ruhr-Universitaet Bochum,C=DE","subjectDN":"ME0xCzAJBgNVBAYTAkRFMSEwHwYDVQQKDBhSdWhyLVVuaXZlcnNpdGFldCBCb2NodW0xGzAZBgNVBAMMElJVQi1DaGlwY2FyZCBDQSBHMg==","whitelist":false,"attachment":{"hash":"5b3189496744b3baca10b9e288920f3c93f91a4cb9238792c8a84cb327282206","size":1947,"filename":"1LhrLd2v38EP1hLDpF6VhNqMjyRxu9cRaZL0r98r04o=.pem","location":"security-state-staging/intermediates/f9495b7a-e1af-4b97-bc3c-208ef9ce1a7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1LhrLd2v38EP1hLDpF6VhNqMjyRxu9cRaZL0r98r04o=","crlite_enrolled":false,"id":"25ac7183-b98c-44a4-b022-6d05aaf05e96","last_modified":1562025586178},{"schema":1562025584632,"derHash":"TRCTIKejRvitcC3/8ad1jvy2E1v7L6OCQRclafAzLIM=","subject":"CN=COMODO Extended Validation Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGNMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEzMDEGA1UEAxMqQ09NT0RPIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"8e7517a2e51225db3888dceafbd6ffe6b128140e61feec75ab7d84d1927194ce","size":1849,"filename":"7Hf58eWzQ6pqWMtrBn80g3KJoxUpyCJ8oVoYdu4VSr0=.pem","location":"security-state-staging/intermediates/cc2c49d0-3326-4e77-88c2-da405ccf308c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7Hf58eWzQ6pqWMtrBn80g3KJoxUpyCJ8oVoYdu4VSr0=","crlite_enrolled":false,"id":"3d00ad4a-5f8d-4f77-b665-1308530ca883","last_modified":1562025585390},{"schema":1562025581604,"derHash":"8DdiFAXg81ZQfiOfrdZHhC07UIV8PP+ECFkXT3L2/Rg=","subject":"CN=DPDHL User CA I3,O=Deutsche Post,L=Bonn,ST=Nordrhein-Westfalen,C=DE","subjectDN":"MG0xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ0wCwYDVQQHEwRCb25uMRYwFAYDVQQKEw1EZXV0c2NoZSBQb3N0MRkwFwYDVQQDExBEUERITCBVc2VyIENBIEkz","whitelist":false,"attachment":{"hash":"aa3ab0230e44f321498e54339387e4d5d251084f2d2be80234f5d282fff8ef58","size":4356,"filename":"U24C-tQ5-xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko_A=.pem","location":"security-state-staging/intermediates/cc9371be-8d27-4657-9e1d-c89b3c6e3e4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"U24C+tQ5+xqZXjJsjWmKnA3KCkx84xBNSPzVCzpko/A=","crlite_enrolled":false,"id":"cf8eb580-18e7-4ef4-851c-a3845809da47","last_modified":1562025582348},{"schema":1562025578554,"derHash":"F7TgrQSCo9An9YvfyKm9Vfdcq8jfBZpAVqFsyN7lM+8=","subject":"CN=University of Macedonia CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdVW5pdmVyc2l0eSBvZiBNYWNlZG9uaWEgQ0EgUjE=","whitelist":false,"attachment":{"hash":"7827466be49a6ae3b8dcac1383f0357eeae5507bb485fc1f144a41c7f8a6aa64","size":2519,"filename":"Q3wUDE_KGR_qsDlo3z3iA92yNVJJgXo3pVbkHKiMh-g=.pem","location":"security-state-staging/intermediates/529eeb7b-a51a-4cc6-b552-835ff75ba795.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q3wUDE/KGR/qsDlo3z3iA92yNVJJgXo3pVbkHKiMh+g=","crlite_enrolled":true,"id":"ce7d0110-67fe-41f1-92bf-c23fa3f7d1e5","last_modified":1562025579301},{"schema":1562025577754,"derHash":"hZlo+SeLTcgu4w/RGKXSl9KEtofLZM+XVauKnTjytw8=","subject":"CN=Trustwave Domain Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGvMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE3MDUGA1UEAxMuVHJ1c3R3YXZlIERvbWFpbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"9eada92e3a97dd020d1e54af280aa60bf3400d8c05725aec56aa8357bd9c9bed","size":1768,"filename":"D2BA_wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=.pem","location":"security-state-staging/intermediates/9e9ff0f0-f45d-41dc-8a17-414e7c15f484.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2BA/wGfRVRt6vATeLdkNJ0B3ckV2GlyUIDdWUqCSDQ=","crlite_enrolled":true,"id":"60bc13d6-1760-488c-b696-f2dd9d3df1a2","last_modified":1562025578546},{"schema":1562025575484,"derHash":"JhjEFcFGupil8K1+pJiqWHgLpV+o47By0TwzDUEBBxc=","subject":"CN=EuropeanSSL Client CA,O=EUNETIC GmbH,C=DE","subjectDN":"MEQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxFVU5FVElDIEdtYkgxHjAcBgNVBAMTFUV1cm9wZWFuU1NMIENsaWVudCBDQQ==","whitelist":false,"attachment":{"hash":"939382e857302d9c045c2918ffbab03973b2a29f5c566cfdd7e53388636562f6","size":1723,"filename":"6rE_4fpPwsenurNcVvOyU8xh7Vp9kamSGTFA4_9ffGI=.pem","location":"security-state-staging/intermediates/bfff1194-870c-47b2-ba6e-1180017f2936.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6rE/4fpPwsenurNcVvOyU8xh7Vp9kamSGTFA4/9ffGI=","crlite_enrolled":false,"id":"1b741d5d-51c9-4a71-92ad-b421a5c2824e","last_modified":1562025576254},{"schema":1562025573252,"derHash":"cLm6WVQSz4YUt2dH/Wg8yidZ9CZCFkg0++/diFBcTxw=","subject":"CN=emSign ECC Device CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MG0xCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSIwIAYDVQQDExllbVNpZ24gRUNDIERldmljZSBDQSAtIEcz","whitelist":false,"attachment":{"hash":"d7af7c53238ed1dc9fffed6f3e5bce922f646c3ff9a60630c499d766352973cc","size":1142,"filename":"yETFaiH0jqwEN-yzu6pHbtmjgE5XzT3dvmi_Wzb31hM=.pem","location":"security-state-staging/intermediates/b6e31f0d-7208-4e42-8621-2efeaacbb876.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yETFaiH0jqwEN+yzu6pHbtmjgE5XzT3dvmi/Wzb31hM=","crlite_enrolled":false,"id":"c71399ad-5c58-4c11-9f7a-9147f50eae00","last_modified":1562025573987},{"schema":1562025571754,"derHash":"jZkhf/gtYOTfWb6KESFiXN/8TyLyHhJjod8G0twLVA4=","subject":"CN=QuoVadis QVRCA3G1 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTNHMSBTU0wgSUNB","whitelist":false,"attachment":{"hash":"4de419e355223a24032129dc3cd0fc679d92fcf36397afb5432936371479b9f5","size":2373,"filename":"m7H4WXNR3iGdK5BvRMFrKs78WAc-SoBCaPH-fLXigIw=.pem","location":"security-state-staging/intermediates/4ff3d1f9-4d98-4fa8-be76-8e1e5434cbdb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m7H4WXNR3iGdK5BvRMFrKs78WAc+SoBCaPH+fLXigIw=","crlite_enrolled":true,"id":"7be166ff-6cb1-402e-a354-a7337b7f2b7a","last_modified":1562025572488},{"schema":1562025571006,"derHash":"cG7LIbCW9v/M3J6+WqG3dvZNuPrn8KXAMscQQeUCuY8=","subject":"CN=AlwaysOnSSL RSA CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGQxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEeMBwGA1UEAxMVQWx3YXlzT25TU0wgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"0f46d6d2cca30792c370bd3b90969ec1e9cea56ad57621f2bd0fbf01ad6694cf","size":1678,"filename":"e7puxxctXmI2MqLnC-hc5AHDs-k8kQisdTcQbwxeeVw=.pem","location":"security-state-staging/intermediates/3d06736e-8267-4a12-a633-3600f98ff6fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e7puxxctXmI2MqLnC+hc5AHDs+k8kQisdTcQbwxeeVw=","crlite_enrolled":false,"id":"e19127f4-02c2-4c09-a41d-a8487ab8ba3e","last_modified":1562025571746},{"schema":1562025570263,"derHash":"GpSMtekceQdDCTBFiJGmWg+q/o+zrweCSrY38iD2bSk=","subject":"CN=SecureTrust Secure Email CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IFNlY3VyZSBFbWFpbCBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"ab9d76d98b7e15ddaff1cc6705503cc27e91b1c04e31e806f4bcea03dd345850","size":1707,"filename":"BGO27QFH6rNm9gr94hQ_pwpry227wWtyTaec9ZnAQMM=.pem","location":"security-state-staging/intermediates/4d0c7b73-fb1b-4ba2-852c-7b073f9b829c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BGO27QFH6rNm9gr94hQ/pwpry227wWtyTaec9ZnAQMM=","crlite_enrolled":false,"id":"b9dc7d52-8b0e-46d8-9878-51762ccd2aae","last_modified":1562025570998},{"schema":1562025567263,"derHash":"mp/DkCmr4TLWdNAy0ZnLhDGqyHjavObp4a7LgeyZ9Mw=","subject":"CN=thawte Primary Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSIwIAYDVQQDExl0aGF3dGUgUHJpbWFyeSBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"bafc005b16bae347d59a3a7bf07a0c9eaf0f0e42cd9942af7404ef78c1b79f57","size":1662,"filename":"GeZLo-BA_Z6e8rPBE9nX-x6kAYZSVx3EtzJm0kkmCi8=.pem","location":"security-state-staging/intermediates/058fe399-3919-4528-8452-fe055f2b4630.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GeZLo+BA/Z6e8rPBE9nX+x6kAYZSVx3EtzJm0kkmCi8=","crlite_enrolled":false,"id":"89d303d5-9a8c-4a13-8200-40cec4505421","last_modified":1562025567998},{"schema":1562025566502,"derHash":"W4fiIvIDRvo2KIFu1s5x+qughX+4vLpzd26h+lbNAFc=","subject":"CN=RapidSSL SHA256 CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"cee3d5e53c8fb88912d492c3a976adf689082cc7d09d8f1ad43ff0ab0ea3e52c","size":1670,"filename":"aef6IF2UF6jNEwA2pNmP7kpgT6NFSdt7Tqf5HzaIGWI=.pem","location":"security-state-staging/intermediates/e3b45219-1226-4cd3-b74a-ba627fc772be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aef6IF2UF6jNEwA2pNmP7kpgT6NFSdt7Tqf5HzaIGWI=","crlite_enrolled":false,"id":"21950fe4-3bac-4f48-8082-d93e1d39f57f","last_modified":1562025567256},{"schema":1562025562772,"derHash":"32UwhcjtX4RMuwkWG4rgvy82gi+Te/e7Gmicb8i9V5o=","subject":"CN=cPanel Extended Validation ECC Certification Authority,OU=Controlled by COMODO exclusively for cPanel\\, Inc.,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xFTATBgNVBAoTDGNQYW5lbCwgSW5jLjE6MDgGA1UECxMxQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIGNQYW5lbCwgSW5jLjE/MD0GA1UEAxM2Y1BhbmVsIEV4dGVuZGVkIFZhbGlkYXRpb24gRUNDIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"8a86e6f0dba359bf8534a11ef39bc706ea74fe3c37ef6c1ddc14e0fcf3a44a82","size":1427,"filename":"M0KI4Ko0g5TclE_ltD5sgAvt8tWcj6K5Je7fmwLXcmg=.pem","location":"security-state-staging/intermediates/ce27d567-565e-4cf1-97c8-01a6e490337d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M0KI4Ko0g5TclE/ltD5sgAvt8tWcj6K5Je7fmwLXcmg=","crlite_enrolled":false,"id":"7c78c5c2-4088-45e8-b0ba-2ab26ea31e01","last_modified":1562025563524},{"schema":1562025560509,"derHash":"ftGTYa1zTXA/ut8Cn1LsO2ZI2N1WuroIhO1PhZtbk3U=","subject":"CN=Herritar eta Erakundeen CA - CA de Ciudadanos y Entidades (4),OU=NZZ Ziurtagiri publikoa - Certificado publico SCI,O=IZENPE S.A.,C=ES","subjectDN":"MIGnMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMU5aWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0kxRjBEBgNVBAMMPUhlcnJpdGFyIGV0YSBFcmFrdW5kZWVuIENBIC0gQ0EgZGUgQ2l1ZGFkYW5vcyB5IEVudGlkYWRlcyAoNCk=","whitelist":false,"attachment":{"hash":"4e2f85a9143fff0c499621d1b49e3f60d3c41d4a5456e8430b978d6171ec3334","size":2576,"filename":"psxZHe33uBE3X2CLur2frMJV_OKLVcjyPVVShpA--N4=.pem","location":"security-state-staging/intermediates/5cd6b31f-ffd5-4d52-a9e8-fa36ce7bbed8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"psxZHe33uBE3X2CLur2frMJV/OKLVcjyPVVShpA++N4=","crlite_enrolled":true,"id":"9827f84e-7c8f-4336-952d-450a06e83326","last_modified":1562025561262},{"schema":1562025559768,"derHash":"m9+zg/lrCktUtdbBxMweogWCub7Cu8YzkEzeh+6u29E=","subject":"CN=SECOM Passport for Member PUB CA7,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTc=","whitelist":false,"attachment":{"hash":"2f01f21ca9e48571a30e9933457faf8d617a0fc0544b0e36c7d42ba4165df819","size":1695,"filename":"K_7TdwdfqZgQqXEvsippKe857WFIJ7-iGlYgYdHo0c8=.pem","location":"security-state-staging/intermediates/fea86beb-fe7e-4048-9530-d96971843fc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K/7TdwdfqZgQqXEvsippKe857WFIJ7+iGlYgYdHo0c8=","crlite_enrolled":false,"id":"7770d262-2bdb-4ef7-8e57-a12893469529","last_modified":1562025560501},{"schema":1562025559020,"derHash":"XekVK+0x+gUV3R/HRhM/EydWLvcqhM8tJAPnSKYE0NQ=","subject":"CN=Let's Encrypt Authority X4,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYNA==","whitelist":false,"attachment":{"hash":"c715837b5cfccee20ea9dee2bf1248b0c86b0a49131fefcbe9dc28ff63dc5df4","size":1983,"filename":"sRHdihwgkaib1P1gxX8HFszlD-7_gTfNvuAybgLPNis=.pem","location":"security-state-staging/intermediates/fa35ef4b-12d7-45e2-b335-c02f0d599219.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sRHdihwgkaib1P1gxX8HFszlD+7/gTfNvuAybgLPNis=","crlite_enrolled":false,"id":"6c3e369b-f720-45e1-9370-4ea8065c7c95","last_modified":1562025559758},{"schema":1562025558267,"derHash":"nNBykOi+3ZnPc5f5TLASsi7sE9pS7ZTzAXoupBRuqY0=","subject":"CN=HARICA S/MIME ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"f66d479e18356da82e4d231247d8bd5278e9884bf74c3118df07be05c95aa7b6","size":1443,"filename":"axmO2GJ2kjqEicyms7TJ0lABBqiozjItK6Zso_S1D9M=.pem","location":"security-state-staging/intermediates/bc7fd8b5-70e3-49e4-8c10-9d9d29b1eb10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"axmO2GJ2kjqEicyms7TJ0lABBqiozjItK6Zso/S1D9M=","crlite_enrolled":false,"id":"11cc2bb1-fc7d-4194-a61a-fddbefb3ca1c","last_modified":1562025559012},{"schema":1562025556764,"derHash":"KAu8NKmMx5YGqJaQ5Sq3L9xf/yddw2bEgnsWVjE+l5A=","subject":"CN=Don Dominio / MrDomain RSA DV CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"f6b7422faba44515b2fbf75aa4b06572f321cea63e5a19794440c400e5ac0cc9","size":2170,"filename":"k5zZlzm-7Ha5WKka7Wov4zebiiAPJ0-9cRslSNnRFWA=.pem","location":"security-state-staging/intermediates/356a0d2d-83bc-4215-8e84-dfade5405db5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k5zZlzm+7Ha5WKka7Wov4zebiiAPJ0+9cRslSNnRFWA=","crlite_enrolled":true,"id":"f9c8f2af-446a-4150-9b8c-e06c472f9754","last_modified":1562025557503},{"schema":1562025555273,"derHash":"Y+2VsX/9y3rjD+rGqHRlMJkmTiGyaNg22VeWbwsEvkM=","subject":"CN=Ericsson NL Individual CA v3,O=Ericsson,C=SE","subjectDN":"MEcxCzAJBgNVBAYTAlNFMREwDwYDVQQKDAhFcmljc3NvbjElMCMGA1UEAwwcRXJpY3Nzb24gTkwgSW5kaXZpZHVhbCBDQSB2Mw==","whitelist":false,"attachment":{"hash":"fbc57ea9c1b2e224c728dfb5633827b206e81886f616d127c7638d4158c30ee6","size":2402,"filename":"gdwzJYc_pmK1jRgbaVo-CtT9QF4X6E1CcSK_5j-CHnc=.pem","location":"security-state-staging/intermediates/0c3604ee-ea79-46ad-8e68-81764865032e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gdwzJYc/pmK1jRgbaVo+CtT9QF4X6E1CcSK/5j+CHnc=","crlite_enrolled":false,"id":"9e2198dd-7423-466f-bd25-622f89d43770","last_modified":1562025556016},{"schema":1562025553755,"derHash":"LoFrz4UtgwJF3cNTS8+FpTsLGZkaUlzTKGJv10pA/II=","subject":"CN=GIS CA,OU=CA,O=GAZINFORMSERVICE Company limited,C=RU","subjectDN":"MFYxCzAJBgNVBAYTAlJVMSkwJwYDVQQKDCBHQVpJTkZPUk1TRVJWSUNFIENvbXBhbnkgbGltaXRlZDELMAkGA1UECwwCQ0ExDzANBgNVBAMMBkdJUyBDQQ==","whitelist":false,"attachment":{"hash":"4cedd57a38da64d6828aeb1b9ecfff34356abc080d413388c1ee191b7f2655dd","size":1601,"filename":"Bmyhj612-woocGRpHnc19r3dxL8Sz3qG4LDIr6VB3hY=.pem","location":"security-state-staging/intermediates/1c1b4e26-24a6-4505-9e5b-06e5e18d585a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Bmyhj612+woocGRpHnc19r3dxL8Sz3qG4LDIr6VB3hY=","crlite_enrolled":false,"id":"03ccc153-2946-4d3d-be6c-b0881bebecf6","last_modified":1562025554496},{"schema":1562025551490,"derHash":"vbz+EZP7uSOr7hTKZiKP7IkLGOAhAsDZqY7y6GJuyns=","subject":"CN=Technical University of Crete CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjFEMEIGA1UECgw7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLDAqBgNVBAMMI1RlY2huaWNhbCBVbml2ZXJzaXR5IG9mIENyZXRlIENBIFIx","whitelist":false,"attachment":{"hash":"3db47bbdd3795e85ad600eb6fe393b0fcb6ae8991ef4af2e9bd7628b6f48f23b","size":2182,"filename":"ANwGE0ZaMhJXXiuIMDohCrwQWZohBpNfhyCEYW4H3dc=.pem","location":"security-state-staging/intermediates/9ac9ad25-52e0-46ee-a3e4-271e8e52c034.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ANwGE0ZaMhJXXiuIMDohCrwQWZohBpNfhyCEYW4H3dc=","crlite_enrolled":true,"id":"434a2f0e-2e97-40ee-b3ed-3b4161a532f7","last_modified":1562025552255},{"schema":1562025549998,"derHash":"1yERA4jKbyC7qf0ajbpO+4wWOSo9662XxVPurwrKyqw=","subject":"CN=TeliaSonera Server CA v2,O=TeliaSonera,C=FI","subjectDN":"MEYxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2VydmVyIENBIHYy","whitelist":false,"attachment":{"hash":"2f9dcba71811d0e494412cb5ac40c7215fd1e0e68794cf9d419462eb22bfdd4d","size":2528,"filename":"Fq3YMR2ibLgpoD509egJDn5cPXPfnXC5MUd2IWwV_qA=.pem","location":"security-state-staging/intermediates/e40e2f56-df5c-40a6-85f6-694d1d00f167.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Fq3YMR2ibLgpoD509egJDn5cPXPfnXC5MUd2IWwV/qA=","crlite_enrolled":true,"id":"3082ff87-55fc-4380-b33c-8f226a13dcec","last_modified":1562025550741},{"schema":1562025548476,"derHash":"resKwbN/XaRKaEjhS3NZcPkg/5x2JdqKoJmonqbXfHI=","subject":"CN=Technological Educational Institution of Thessaloniki CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGZMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgVGhlc3NhbG9uaWtpIENBIFIz","whitelist":false,"attachment":{"hash":"5b159fe11a04b001c33c5ad2e26f8314521fe4ba8377ff1dfa35fbb0d1c364c9","size":2576,"filename":"qVNET7_Zz6zS9i8KHh-GZOmKOFwBKjPuzYbBnMqBfRo=.pem","location":"security-state-staging/intermediates/747153bd-4eb6-4465-8e57-ed57495ed0a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qVNET7/Zz6zS9i8KHh+GZOmKOFwBKjPuzYbBnMqBfRo=","crlite_enrolled":true,"id":"b3fb74cf-8af2-47cc-b99e-55a1850ec31a","last_modified":1562025549240},{"schema":1562025547725,"derHash":"9BppSzgllC24lSPpd1+Zfbn6KZg5jcOadLcmcNrP1Gg=","subject":"CN=Starfield Secure Extended Validation Code Signing CA - G2,O=Starfield Technologies\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGeMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UEChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMUIwQAYDVQQDEzlTdGFyZmllbGQgU2VjdXJlIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"88f852539dedf76ad7544f8aeb8a7d5aec509c504852a87b3cd5ddb9ce509469","size":1813,"filename":"43LAOVcZZKWCk7veYuyGUt0baGZdRZsfIBAmB7OlE8s=.pem","location":"security-state-staging/intermediates/e9ab7ece-e153-4d24-ba09-e51a29208528.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"43LAOVcZZKWCk7veYuyGUt0baGZdRZsfIBAmB7OlE8s=","crlite_enrolled":false,"id":"32ab8607-6d98-4de9-aee6-d3993cd8c627","last_modified":1562025548468},{"schema":1562025546979,"derHash":"YD1pgiOBoL/CdLvtZwCbx98TPLkC+iQs9Yv3J9I9VJU=","subject":"CN=Sutter Health CA,OU=Orion Health Direct Secure Messaging,O=Sutter Health\\, a California nonprofit public benefit corporation,C=US","subjectDN":"MIGiMQswCQYDVQQGEwJVUzFJMEcGA1UEChNAU3V0dGVyIEhlYWx0aCwgYSBDYWxpZm9ybmlhIG5vbnByb2ZpdCBwdWJsaWMgYmVuZWZpdCBjb3Jwb3JhdGlvbjEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRkwFwYDVQQDExBTdXR0ZXIgSGVhbHRoIENB","whitelist":false,"attachment":{"hash":"261d3dcbc380cdce3b0985f015ff39b28f560089caa3fe079b37d1dc1fd7db9c","size":2337,"filename":"5tfROj-rDBEjz6--464WIXkKw55dhqqzPscv3mBSipM=.pem","location":"security-state-staging/intermediates/7b819190-fb9a-4041-bc3b-78febdf0c849.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5tfROj+rDBEjz6++464WIXkKw55dhqqzPscv3mBSipM=","crlite_enrolled":false,"id":"edd6bf94-d421-4767-a0cc-afc7defb5666","last_modified":1562025547718},{"schema":1562025546244,"derHash":"FEIqG9WpHtunOXuGmJIjabavaYT/h6z2E52qkZ55WhQ=","subject":"CN=Hongkong Post e-Cert CA 1 - 14,O=Hongkong Post,C=HK","subjectDN":"ME4xCzAJBgNVBAYTAkhLMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MScwJQYDVQQDEx5Ib25na29uZyBQb3N0IGUtQ2VydCBDQSAxIC0gMTQ=","whitelist":false,"attachment":{"hash":"5a4d38e1effb5367e3fd8c4536f7e3be9e065be0cb93778e4484d32658a3c99c","size":1626,"filename":"vSKE_tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=.pem","location":"security-state-staging/intermediates/44f50bf9-a77b-4072-997d-ecb9e4196036.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vSKE/tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=","crlite_enrolled":false,"id":"05017875-8b94-4416-a852-fb1978415050","last_modified":1562025546971},{"schema":1562025544009,"derHash":"LmQsC+E6XeC8b7Pr5Cofrdt2Io0k3k/ruVtsOlSVM+s=","subject":"CN=United Parcel Service\\, Inc. RSA Client CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjEyMDAGA1UEAxMpVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"16a99f6659e69c9ae43dce74e5f55c2821e4c4b8102837c4e4b42be118238fe0","size":2133,"filename":"ADxdm5JW4ZAlMiTPdTtze13AoPKn5Ek4CVg8v3KP1aY=.pem","location":"security-state-staging/intermediates/9378362f-f38c-4094-b57e-66057d63456e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ADxdm5JW4ZAlMiTPdTtze13AoPKn5Ek4CVg8v3KP1aY=","crlite_enrolled":false,"id":"213eee19-f9c9-4440-b1e9-e14ae86ebf53","last_modified":1562025544746},{"schema":1562025538762,"derHash":"yo0PRzZFSuy+xd7sgJmMnr9B0Gxyjzx2zKJBUbxi1GM=","subject":"CN=DigiCert SHA2 Assured ID Timestamping CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBUaW1lc3RhbXBpbmcgQ0E=","whitelist":false,"attachment":{"hash":"cd22b462d7f7734d96e2f18ec558531d69e068abc2e4e91aaf88f0e849995c68","size":1861,"filename":"HXt5TooTUF4biA-m_h8zYOgpzJhFWnTDzgXfFqp3j3U=.pem","location":"security-state-staging/intermediates/2214d2c0-44ec-41b4-9661-48f9f5cfec31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HXt5TooTUF4biA+m/h8zYOgpzJhFWnTDzgXfFqp3j3U=","crlite_enrolled":true,"id":"89a2403e-23bf-426d-882a-8055a3e89d86","last_modified":1562025539506},{"schema":1562025537279,"derHash":"3/WD46HtNeV9lRBIF62CPAVfuQcc1ABDW1/HTmkggds=","subject":"CN=Symantec Basic DV SSL CA - G2,OU=Symantec Trust Network+OU=Domain Validated SSL,O=Symantec Corporation,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSYwJAYDVQQDEx1TeW1hbnRlYyBCYXNpYyBEViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"847aebbd5575a61f84be32bdb3dd7939184b251b0eb1611ef8ddb3440581e832","size":1918,"filename":"vJ6JGRfCsYINcfiUwxxg4vmkhmQOTi3jksgxCavebo8=.pem","location":"security-state-staging/intermediates/9e75dfa5-ba9c-402f-96de-7b864ea83342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vJ6JGRfCsYINcfiUwxxg4vmkhmQOTi3jksgxCavebo8=","crlite_enrolled":false,"id":"ae09b3e0-9e79-444e-995b-db575d939ffd","last_modified":1562025538011},{"schema":1562025535060,"derHash":"k8OBywezU6kgwqe+1r6/GVxoJ53QUn038gvdDZnDMPo=","subject":"CN=DigiCert Assured ID CA G2,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzI=","whitelist":false,"attachment":{"hash":"b7c018817ad0fe311c0e3f46cb59e0998110a056304537716c2436a17916b212","size":1654,"filename":"dnPPE-JM_ZaNCC1Q198LELhQiAdfMsEPXi1LVYU-aPQ=.pem","location":"security-state-staging/intermediates/dd6dcf5a-a932-4645-be43-cc51dd5ef65c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dnPPE+JM/ZaNCC1Q198LELhQiAdfMsEPXi1LVYU+aPQ=","crlite_enrolled":true,"id":"a29b66e0-76d3-421c-90a3-3ed1083fe7a9","last_modified":1562025535793},{"schema":1562025532067,"derHash":"9ujsmwB3XMNnEDaToAFW/6WrhE5kB7HShTsIQfRRlG8=","subject":"CN=TrustOcean SSL CA - RSA - 2018,OU=RSA Domain Validation Secure Server - 2018,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIGjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMTMwMQYDVQQLEypSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTgxJzAlBgNVBAMTHlRydXN0T2NlYW4gU1NMIENBIC0gUlNBIC0gMjAxOA==","whitelist":false,"attachment":{"hash":"ed8dcc0f133ed1d1d3a53ead175c2642a1c5993820e97d74208cf3d363b608c5","size":2203,"filename":"e6xirxtNeGowerSlFMxXXnPAZUkXIXVu3FhkcvhvI7w=.pem","location":"security-state-staging/intermediates/a505f7ec-abe1-4afe-9a42-cad25bf7f8cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6xirxtNeGowerSlFMxXXnPAZUkXIXVu3FhkcvhvI7w=","crlite_enrolled":true,"id":"3a66312e-40aa-4141-b4bb-23159586906d","last_modified":1562025532803},{"schema":1562025529824,"derHash":"4F7UqeTHczCKk+hJhhIlrjSakrvUus3UkArU5zsTEQA=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"10b46479f6babe96f43e63ab11f87d973a00150e7dc2e9e4b6ce7b5e22ab3005","size":1634,"filename":"Rhcj0dcdOovISeMPXTWpuUDiNf1EzyxSHeMUK0lfoR8=.pem","location":"security-state-staging/intermediates/ae31b0a6-8423-4c86-a060-ba964c79794d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rhcj0dcdOovISeMPXTWpuUDiNf1EzyxSHeMUK0lfoR8=","crlite_enrolled":true,"id":"6ccb21c1-806e-410f-a6cb-594456ae82c0","last_modified":1562025530558},{"schema":1562025528330,"derHash":"eCbeG+QU5FTPyuDRexf/DK0S7mjPSH81ezhJnidLAXE=","subject":"CN=certSIGN SSL EV CA Class 3 G2,OU=certSIGN SSL EV CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHAxCzAJBgNVBAYTAlJPMREwDwYDVQQKDAhjZXJ0U0lHTjEmMCQGA1UECwwdY2VydFNJR04gU1NMIEVWIENBIENsYXNzIDMgRzIxJjAkBgNVBAMMHWNlcnRTSUdOIFNTTCBFViBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"bc1a9e940bb65deb19b1cb6d6aa4d8f360fdb2b2ae863c58bbf437c0cc0a4c6e","size":1626,"filename":"Yhf8lB-ohgsX4JNEP0LyfAgUEVbH6pn046hso3mF6Hg=.pem","location":"security-state-staging/intermediates/6017afd4-09df-42e0-9159-080ef3054310.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yhf8lB+ohgsX4JNEP0LyfAgUEVbH6pn046hso3mF6Hg=","crlite_enrolled":false,"id":"092ca645-852e-4f2a-85d5-1fdaa3bbb874","last_modified":1562025529063},{"schema":1562025524408,"derHash":"qcjpcSWaLtbmX3IeB6qWfHLHzbR8e+EojYe/CNLzWA0=","subject":"CN=Accenture Federal Services External CA,O=Accenture Federal Services LLC,ST=DE,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTEnMCUGA1UEChMeQWNjZW50dXJlIEZlZGVyYWwgU2VydmljZXMgTExDMS8wLQYDVQQDEyZBY2NlbnR1cmUgRmVkZXJhbCBTZXJ2aWNlcyBFeHRlcm5hbCBDQQ==","whitelist":false,"attachment":{"hash":"65c088044cd4735247c82fee610957f89cac4992c45e988b083aeb47757d5c08","size":1869,"filename":"k3Rb5ZqNYk6_1pEsnBWNNE1yn9vfIlJ90ZV3vqb7oEU=.pem","location":"security-state-staging/intermediates/a12744fd-3faa-416a-921b-d4943319e43c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3Rb5ZqNYk6/1pEsnBWNNE1yn9vfIlJ90ZV3vqb7oEU=","crlite_enrolled":false,"id":"c540bcea-ae3d-4bd9-ae0d-918e2ffbdbaa","last_modified":1562025525188},{"schema":1562025523636,"derHash":"C/jSeHGiXvvMcPVsJoyAxC0oxfHRimnAGA2YmyuNZxo=","subject":"CN=CertAssure ECC EV Secure Server Certification Authority,OU=Controlled by COMODO exclusively for CertAssure Inc.,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIHIMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xPTA7BgNVBAsTNENvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBDZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgRUNDIEVWIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"61bf81b404a388537069a6ca1778291879f9ac51e8f78d42e4e640af887d27ee","size":1443,"filename":"ok9f2xbTTMytgvbxoAC3WVM2u44IiamlaLqKpKO_Se0=.pem","location":"security-state-staging/intermediates/713b734a-dcb5-4488-8c91-fb386062b7b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ok9f2xbTTMytgvbxoAC3WVM2u44IiamlaLqKpKO/Se0=","crlite_enrolled":false,"id":"64061b54-c2b8-41e0-9026-003c9204d5c4","last_modified":1562025524400},{"schema":1562025522880,"derHash":"6BsB+fVpLPOCPG/TWIZUK/ru/F6pT04kbkLEqfxf6Ks=","subject":"CN=GDCA TrustAUTH R4 OV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IE9WIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"62f632973d4566730fb0c215f361db0c6377f4fe7015f37d2f43bbbff8b9422b","size":1727,"filename":"X_kDRJGyo1gr5XgS4hGkA1JH19Rbn0-jAdxRkGwOfis=.pem","location":"security-state-staging/intermediates/b0587fd9-8f56-4f2e-bb41-45600e3dd3f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X/kDRJGyo1gr5XgS4hGkA1JH19Rbn0+jAdxRkGwOfis=","crlite_enrolled":true,"id":"242f8001-c709-472f-8e95-69caf24cb984","last_modified":1562025523628},{"schema":1562025522128,"derHash":"/UwrmT4DVukNT5+9I2He8aSYN4zuzrkt12/grX4sexY=","subject":"CN=LLB Root CA public v3,O=Liechtensteinische Landesbank AG,C=LI","subjectDN":"MFgxCzAJBgNVBAYTAkxJMSkwJwYDVQQKDCBMaWVjaHRlbnN0ZWluaXNjaGUgTGFuZGVzYmFuayBBRzEeMBwGA1UEAwwVTExCIFJvb3QgQ0EgcHVibGljIHYz","whitelist":false,"attachment":{"hash":"225f216bec9fd5f148f91a91fed5f24692bf9e5c51303a7c1e90b008dd44d103","size":2962,"filename":"NRgw95tt85HJuu4CfCZX4-xKo5pkkTNI_W6Iv9pV3vs=.pem","location":"security-state-staging/intermediates/6e7b78f9-c4f1-4ea2-80c7-6fdb9a4be85c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NRgw95tt85HJuu4CfCZX4+xKo5pkkTNI/W6Iv9pV3vs=","crlite_enrolled":false,"id":"5aaa9313-aa3d-449a-8c77-2cb032c7ce53","last_modified":1562025522872},{"schema":1562025521355,"derHash":"Kl6ti0GnzdwSaxDtJIou7+2oVWYDQvIio4zGYF1EPiI=","subject":"CN=InComm Agent Solutions Inc Root Certificate Authority,O=InComm Agent Solutions Inc,ST=Florida,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEjMCEGA1UEChMaSW5Db21tIEFnZW50IFNvbHV0aW9ucyBJbmMxPjA8BgNVBAMTNUluQ29tbSBBZ2VudCBTb2x1dGlvbnMgSW5jIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"31c63a5f2d41e64fcaf44e0f09cb40d2b97a4cf96133e3e1218bd242f642bdef","size":3279,"filename":"gjRan45dFolfE5atUzE5YRyiRP-Ume28jutJGa4F52Q=.pem","location":"security-state-staging/intermediates/96a22330-b050-4b28-a9d7-0bf6f1c758b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gjRan45dFolfE5atUzE5YRyiRP+Ume28jutJGa4F52Q=","crlite_enrolled":false,"id":"b128a011-ab73-48c6-9a91-ff4aacf63d67","last_modified":1562025522120},{"schema":1562025519874,"derHash":"CtdB2YqEw7nE51UuFb/x42m2gGg5RV26/KxjgSTV8QA=","subject":"CN=WISeKey CertifyID Advanced Services CA 2,OU=Copyright 2011 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGOMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZQ29weXJpZ2h0IDIwMTEgV0lTZUtleSBTQTEWMBQGA1UECxMNSW50ZXJuYXRpb25hbDExMC8GA1UEAxMoV0lTZUtleSBDZXJ0aWZ5SUQgQWR2YW5jZWQgU2VydmljZXMgQ0EgMg==","whitelist":false,"attachment":{"hash":"81fd96040b579082dcb68419d1094eb56463e3e20c10bd3fa17c3e16517983af","size":1804,"filename":"zdMfiH6IA0YPkhIz4JIAAig1qn2rsNG01lIg77-0Q_g=.pem","location":"security-state-staging/intermediates/7a9e18cd-0dc1-4345-8090-c78b5e715132.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdMfiH6IA0YPkhIz4JIAAig1qn2rsNG01lIg77+0Q/g=","crlite_enrolled":false,"id":"e8a2ac9e-74de-4224-956d-e36511c05c5c","last_modified":1562025520610},{"schema":1562025518366,"derHash":"IELjj8VziPHbMiLHq1vhHG7bfkVL9FSHrkT/LWordkU=","subject":"CN=Symantec Class 3 SHA256 Code Signing CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxNTAzBgNVBAMTLFN5bWFudGVjIENsYXNzIDMgU0hBMjU2IENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3603898500215969498b71d7763fd6c80194030c78e89cbe2cc4cd898da098a3","size":1890,"filename":"XTtvxiBTPOwi4pqFOHdXIcPbd4ypovT6ppPkiD6IopI=.pem","location":"security-state-staging/intermediates/5039c1ab-fbed-4c1c-85f8-8711a9c342ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XTtvxiBTPOwi4pqFOHdXIcPbd4ypovT6ppPkiD6IopI=","crlite_enrolled":true,"id":"18f77514-7954-4db7-97e6-ce50963c0834","last_modified":1562025519122},{"schema":1562025516726,"derHash":"SqgmR2MAt/BKTLjqBKPTTu/dczFwaqorN3DHY8bpgpw=","subject":"SERIALNUMBER=201920,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTIw","whitelist":false,"attachment":{"hash":"8be56415b479c3bd71fb4fa3f906ea2c8bee529abda29077c2168bb7dcec9bc3","size":2333,"filename":"agd4jcgZ7U9vszAHzkitYhaMypP6S1xWEdOio1i7XWk=.pem","location":"security-state-staging/intermediates/344fdd15-e8b8-4f4c-b0f7-32deb35dc5f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"agd4jcgZ7U9vszAHzkitYhaMypP6S1xWEdOio1i7XWk=","crlite_enrolled":false,"id":"a2b8c57d-821b-48be-bfd6-98b56202d19c","last_modified":1562025517463},{"schema":1562025515964,"derHash":"hXQ66mqXwTRF4IJMLh/lArl63RJKl+9RIP4H9VgS/DM=","subject":"CN=thawte Primary G3 Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyF0aGF3dGUgUHJpbWFyeSBHMyBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"b966d0608f7e57b49cc48ab7642ec205cb99622392d0c5e8bbd97d67cac8c981","size":1752,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/42f7fa9a-d4c9-4632-8f9a-43a30673af04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"f8329b3a-3b2c-4155-93af-3674f94626d3","last_modified":1562025516717},{"schema":1562025515215,"derHash":"MWImoQ0g2iJE0dqLwLKCg1ral92pT5AVPDy/n9UI8/s=","subject":"CN=TERENA eScience SSL CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"8581fa18f42b8918adea2532a23e06d00eb6673184af2b360f632d8d8810a0bf","size":2162,"filename":"oc7AIKwh7i1ZIjRUXdABQp1IDxMtDZil5mONjuWhNrw=.pem","location":"security-state-staging/intermediates/3d28f7d6-c877-4952-b501-934e0e63e91d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oc7AIKwh7i1ZIjRUXdABQp1IDxMtDZil5mONjuWhNrw=","crlite_enrolled":false,"id":"6e49815a-23d0-44f5-acfb-3db27567251c","last_modified":1562025515957},{"schema":1562025512974,"derHash":"b5Cl/ZiPrszsWxflYS/zbRmciEVR85TzGquk+SHkKgU=","subject":"CN=WISeKey CertifyID Advanced Services CA 3,OU=Copyright (c) 2015 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGSMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDE1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxMTAvBgNVBAMTKFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIFNlcnZpY2VzIENBIDM=","whitelist":false,"attachment":{"hash":"4393e05ab02178bc2ca8fb8233dcc75ea5ab977476ca3a1daac3f35467ee3bd1","size":1861,"filename":"LflM69jQUklvy4-1K0y670OKi5J-qdDMKD65BbHBC1w=.pem","location":"security-state-staging/intermediates/3f6ce260-ca71-4404-84a1-def903f8b228.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LflM69jQUklvy4+1K0y670OKi5J+qdDMKD65BbHBC1w=","crlite_enrolled":false,"id":"e371c1c1-08ab-45e5-808d-ac065dbcc687","last_modified":1562025513720},{"schema":1562025512184,"derHash":"X/rEPg3cW0rytpb2vE236R3zFLuP4NBxOgsaetKmj6w=","subject":"CN=Microsoft IT TLS CA 4,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgNA==","whitelist":false,"attachment":{"hash":"0a5d12cc2a6e89cac85a5cf8b44505305622b7fc2728ecbb1e917f31fa71a931","size":2036,"filename":"wUY9EOTJmS7Aj4fDVCu_KeE--mV7FgIcbn4WhMz1I2k=.pem","location":"security-state-staging/intermediates/585005f9-618d-4eba-8492-bc8713587608.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wUY9EOTJmS7Aj4fDVCu/KeE++mV7FgIcbn4WhMz1I2k=","crlite_enrolled":true,"id":"0978a1e0-b34b-4599-902a-03b07addc358","last_modified":1562025512966},{"schema":1562025509913,"derHash":"Qs/dpvZguOW0wcQRllpFGTElWeMmL422nS2uF7JrO6M=","subject":"CN=RNP ICPEdu OV SSL CA 2019,OU=Gerencia de Servicos (GSer),O=Rede Nacional de Ensino e Pesquisa - RNP,L=Rio de Janeiro,ST=Rio de Janeiro,C=BR","subjectDN":"MIG8MQswCQYDVQQGEwJCUjExMC8GA1UEChMoUmVkZSBOYWNpb25hbCBkZSBFbnNpbm8gZSBQZXNxdWlzYSAtIFJOUDEkMCIGA1UECxMbR2VyZW5jaWEgZGUgU2Vydmljb3MgKEdTZXIpMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xIjAgBgNVBAMTGVJOUCBJQ1BFZHUgT1YgU1NMIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"8ed792d583fe417ecf576ea9ba51a3b76f0ca1d1979263b866fdc1d260e49731","size":1934,"filename":"34rLDmx5N4tFlu_FTyuZjezXxhR4lhOmxmSZ9Pjypro=.pem","location":"security-state-staging/intermediates/99d3faaf-d109-49f0-af7e-ace9ffabe9e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"34rLDmx5N4tFlu/FTyuZjezXxhR4lhOmxmSZ9Pjypro=","crlite_enrolled":true,"id":"dfb5e774-316b-43b6-a38e-c65e551ede8b","last_modified":1562025510662},{"schema":1562025509177,"derHash":"2IiPSoT3TJdN/7Vzob9bu6zRcTuQUJb46wFQYr85bE0=","subject":"CN=DarkMatter Assured CA,O=DarkMatter LLC,C=AE","subjectDN":"MEYxCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzEeMBwGA1UEAwwVRGFya01hdHRlciBBc3N1cmVkIENB","whitelist":false,"attachment":{"hash":"9ece1aca56a9484d62b81c93e6164987204a80f2f56507875c374fb0142f2469","size":2454,"filename":"wO0gU0a7veButWD1zuAqNjTiR0p-ds-PvvVjuxF90OM=.pem","location":"security-state-staging/intermediates/174ee1b5-dff7-441d-b8ae-bac7a4ea7395.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wO0gU0a7veButWD1zuAqNjTiR0p+ds+PvvVjuxF90OM=","crlite_enrolled":false,"id":"1eb36774-4682-48b8-99f8-89ba65d1dffb","last_modified":1562025509905},{"schema":1562025506918,"derHash":"3IYqPwJe9/JS+pQTy2DeJeV+aqfh+x3Ke1nSwiFxBuo=","subject":"CN=Staat der Nederlanden EV Intermediair CA,O=Staat der Nederlanden,C=NL","subjectDN":"MGAxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xMTAvBgNVBAMMKFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBJbnRlcm1lZGlhaXIgQ0E=","whitelist":false,"attachment":{"hash":"20b32e71047d03130c5abee6c17e94b54266c39387aaeb2f3f20ab2a00293064","size":2385,"filename":"F2qGHcawUpLrFM3Bakvv1HLNsSuhZ3AjWvwFk_fsUlQ=.pem","location":"security-state-staging/intermediates/7c8c1e28-85f4-4b11-beb8-53223276d75f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F2qGHcawUpLrFM3Bakvv1HLNsSuhZ3AjWvwFk/fsUlQ=","crlite_enrolled":true,"id":"ee67625f-1d82-4696-87f0-db1c529812ba","last_modified":1562025507665},{"schema":1562025506179,"derHash":"Xk/zRijavtaFm6zy4SioB6CPSbDCWdm+LjP+4Gasevc=","subject":"CN=SecureTrust Code Signing CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MHcxLTArBgNVBAMTJFNlY3VyZVRydXN0IENvZGUgU2lnbmluZyBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"8309159fb3e9a032b16f326c2f3864df8c1f92301ff507d2950a27bea11c67f9","size":1613,"filename":"qWYqJU73KHoO_zICSkIr0M7QWK84NnIZGRhLvRLHocc=.pem","location":"security-state-staging/intermediates/a0f3e90d-4808-4c29-9d90-b6c75dd0bcea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qWYqJU73KHoO/zICSkIr0M7QWK84NnIZGRhLvRLHocc=","crlite_enrolled":false,"id":"80dce9dc-0e12-4410-be32-0a76c54ab462","last_modified":1562025506910},{"schema":1562025505422,"derHash":"m/lJZ3fRRCXtAIbBuywHB7YqYcGUxRYuTwdjev8Wa3Y=","subject":"CN=GlobalSign Timestamping CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"ce3ed3382cfca8726ebcc664e631bed0756c90bb7140cddbdd109b12175fdab5","size":1475,"filename":"qNR-DwyanLNyMurMwcUpVijQXK6JlGydxz7b2CNJx5k=.pem","location":"security-state-staging/intermediates/f32b145b-de9c-4e75-9666-414e3c647a20.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qNR+DwyanLNyMurMwcUpVijQXK6JlGydxz7b2CNJx5k=","crlite_enrolled":true,"id":"eed033d2-f12a-4125-92b7-1990e51d7913","last_modified":1562025506171},{"schema":1562025502424,"derHash":"CsK2CG6xDbVXajobjrDkNECCwbfYMlBPy/laSATVGDQ=","subject":"CN=CERTSIGN FOR BANKING SIMPLE SSL TEST CA V3,OU=Certificat de test Test certificate,O=certSIGN,C=RO","subjectDN":"MIGDMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLDAqBgNVBAsTI0NlcnRpZmljYXQgZGUgdGVzdCBUZXN0IGNlcnRpZmljYXRlMTMwMQYDVQQDEypDRVJUU0lHTiBGT1IgQkFOS0lORyBTSU1QTEUgU1NMIFRFU1QgQ0EgVjM=","whitelist":false,"attachment":{"hash":"301362625731dac5eb7b81495d7d67c27b4fb1d65a5cd95523b7a30f919868a6","size":1658,"filename":"BvkH8t9guVZzP7noiYDJM6l1ZztKvb9J8-54ik-6WFk=.pem","location":"security-state-staging/intermediates/de79005d-2e2f-4dc0-86e8-f105ed580da7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BvkH8t9guVZzP7noiYDJM6l1ZztKvb9J8+54ik+6WFk=","crlite_enrolled":false,"id":"1489788e-e63f-4fdc-8e4e-1a06fd2d279c","last_modified":1562025503177},{"schema":1562025500927,"derHash":"+p1t8a8CdTANUqSF0DawVDtT37REG+wLjJoN/4EbbYg=","subject":"CN=Entrust Code Signing Certification Authority - L1D,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMTswOQYDVQQDEzJFbnRydXN0IENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEwxRA==","whitelist":false,"attachment":{"hash":"3ab4f99522d4a1ebba62378e60fa3d93d465e523147db6f431462224a0e1fed6","size":1796,"filename":"q4FwU8-QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=.pem","location":"security-state-staging/intermediates/7f63a308-cc37-4aa4-a0df-341d3c227db8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q4FwU8+QScEfhsNqympCne6e65ZASaL3iUkrlGsfLn4=","crlite_enrolled":false,"id":"bab7ff8a-caf1-417f-8c18-45de6956da8b","last_modified":1562025501666},{"schema":1562025500166,"derHash":"6uWboswzKBpc3exQz7/Z3QylVl8872mMk2ahDOwIf5c=","subject":"CN=Domain The Net Technologies Ltd CA for SSL R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MG8xCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMTYwNAYDVQQDDC1Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBTU0wgUjI=","whitelist":false,"attachment":{"hash":"dc6270566751505a7936c7847e06bc81b9c0a9ca4b21fd6512fbeaa3d7d3bc7d","size":2483,"filename":"1FBqLyRsP8ibxXXsW64LYWGTeYMGSsUTMFEetUQakD8=.pem","location":"security-state-staging/intermediates/c052ede4-8c2e-4eed-97b4-5d3e127c78f8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1FBqLyRsP8ibxXXsW64LYWGTeYMGSsUTMFEetUQakD8=","crlite_enrolled":true,"id":"461724c9-5ae7-4021-be3d-b5c081e3b8d7","last_modified":1562025500918},{"schema":1562025498622,"derHash":"kY0pldob4hnjp+S6La+hGgJe6/TUo1o6iy25nnksaH4=","subject":"CN=Institute of Accelerating Systems and Applications SSL CA R1,O=Institute of Accelerating Systems and Applications,L=Athens,C=GR","subjectDN":"MIGiMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMTswOQYDVQQKEzJJbnN0aXR1dGUgb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9uczFFMEMGA1UEAxM8SW5zdGl0dXRlIG9mIEFjY2VsZXJhdGluZyBTeXN0ZW1zIGFuZCBBcHBsaWNhdGlvbnMgU1NMIENBIFIx","whitelist":false,"attachment":{"hash":"3227d4cd9162632a3344b5bf40179e61028d95d502e5747d6ff997f99e1464eb","size":2584,"filename":"at9jK6417LeuNsZ615BVxxLWrLPtoJLdMBfDe4WPAzQ=.pem","location":"security-state-staging/intermediates/bbefa09c-cafc-4275-a3e2-b647f7076851.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"at9jK6417LeuNsZ615BVxxLWrLPtoJLdMBfDe4WPAzQ=","crlite_enrolled":true,"id":"a1191fee-2efa-4764-8e64-b63579b09235","last_modified":1562025499398},{"schema":1562025497127,"derHash":"/CJFvlncZGHUEZw6Bu2+5NKIVWvYjEeeMO1fPoFhZGk=","subject":"CN=MPG CA - G02,O=Max-Planck-Gesellschaft,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MGoxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZCYXllcm4xETAPBgNVBAcMCE11ZW5jaGVuMSAwHgYDVQQKDBdNYXgtUGxhbmNrLUdlc2VsbHNjaGFmdDEVMBMGA1UEAwwMTVBHIENBIC0gRzAy","whitelist":false,"attachment":{"hash":"43c1869e7e9b39a3e88534fec1a8ad7b6aa63eab2ad5f1a0dc457dc65ab08804","size":1983,"filename":"KEB9gT0zG0ZMgr0_mhORKVvNbNKMDEvo89gurjLLzYk=.pem","location":"security-state-staging/intermediates/608fe6af-14bc-4de0-83bc-a7b26be45449.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KEB9gT0zG0ZMgr0/mhORKVvNbNKMDEvo89gurjLLzYk=","crlite_enrolled":true,"id":"271d3f60-f00e-48ab-a3ed-13509369476e","last_modified":1562025497855},{"schema":1562025496364,"derHash":"ek/LoHn1vdzwp2w7A6N34VWlMAlHShs+uPNJYaU72pw=","subject":"CN=SECOM Passport for Member PUB CA8,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTg=","whitelist":false,"attachment":{"hash":"c0684ee95f098f8e4e9d458872bee1f661763e16e08e9d6468a417a6866b21c0","size":1695,"filename":"knWHoMFrEpDYcH_bcs_miCxeOB-UDZ0Od9J53hcgFTo=.pem","location":"security-state-staging/intermediates/edd28ea1-49ec-45fe-9115-70331fce9330.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"knWHoMFrEpDYcH/bcs/miCxeOB+UDZ0Od9J53hcgFTo=","crlite_enrolled":false,"id":"d9b97f0b-1f33-4059-afc0-b9b22421d0da","last_modified":1562025497120},{"schema":1562025495613,"derHash":"uxwB6ITdCRmrlNWvVXXNb+tx5WCytYc1p4sVChDVS/M=","subject":"CN=AAMC Direct Intermediate CA,OU=AAMC Direct Messaging,O=Anne Arundel Medical Center,C=US","subjectDN":"MHkxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtBbm5lIEFydW5kZWwgTWVkaWNhbCBDZW50ZXIxHjAcBgNVBAsTFUFBTUMgRGlyZWN0IE1lc3NhZ2luZzEkMCIGA1UEAxMbQUFNQyBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"286bfecb53b0d9b29d26533c7d51c5fb420701ea2fd97d77c8c2e35b5527c23c","size":2203,"filename":"MX1pC2RK37-NPr5PI1QhpoQO1JlFoVx4eAWyShJegwo=.pem","location":"security-state-staging/intermediates/26ef4eb5-e69e-4422-ba08-cba5446f95be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MX1pC2RK37+NPr5PI1QhpoQO1JlFoVx4eAWyShJegwo=","crlite_enrolled":false,"id":"a9d06cda-c795-4dae-8f8d-e612bb618904","last_modified":1562025496356},{"schema":1562025493351,"derHash":"+gCOFtHli+acfT5VNTz0/KJtqc5D51sYJs7xabdxlk4=","subject":"SERIALNUMBER=201903,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAz","whitelist":false,"attachment":{"hash":"3d9efb2320ac377e39214a083ef728e608468f15ac940b44b5ec026f6b5f5dd1","size":2333,"filename":"_ptmGnIhGIL555v-VzrWrwWliXZG-_Gtjaw3U9yq0Dk=.pem","location":"security-state-staging/intermediates/493165da-23b3-4744-a175-3a3659e553c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/ptmGnIhGIL555v+VzrWrwWliXZG+/Gtjaw3U9yq0Dk=","crlite_enrolled":false,"id":"122cfda9-8350-4bd2-b226-92d6ec264cdd","last_modified":1562025494102},{"schema":1562025490333,"derHash":"tEwGMAOfZeXc5XF6fLCMvtg+EDtHFTWBkcxLIgeTBbo=","subject":"SERIALNUMBER=201907,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA3","whitelist":false,"attachment":{"hash":"c4e57b87ffc99bca0261b099a9b314f1391c296d7b6d6fa3734ffe823fcb2976","size":2333,"filename":"gfBNwfL6MEQDNCljm2FFypvqnLrJmZGMO3sW47AmZDA=.pem","location":"security-state-staging/intermediates/23d7f272-7d2b-42c7-a799-ce1d5b201e01.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gfBNwfL6MEQDNCljm2FFypvqnLrJmZGMO3sW47AmZDA=","crlite_enrolled":false,"id":"b42c7c68-9e0f-4fe8-8a25-e74156a8a1a3","last_modified":1562025491074},{"schema":1562025489551,"derHash":"uo7RkOkyWu1DgsaERjECUB+DG5b2PojKNfL+G7yMIsA=","subject":"CN=Piraeus University of Applied Sciences CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGKMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxNTAzBgNVBAMTLFBpcmFldXMgVW5pdmVyc2l0eSBvZiBBcHBsaWVkIFNjaWVuY2VzIENBIFIx","whitelist":false,"attachment":{"hash":"9da0c9629fca6be2e40503371efd3345089214f1c51772ce5424419163e0d8f2","size":2743,"filename":"yLZQpI_8sbjP1vWxETUhe0HsHKYOrjE111-yrrS8VHw=.pem","location":"security-state-staging/intermediates/bddc57bd-9002-4ae5-bbf1-5bc8f7478e4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yLZQpI/8sbjP1vWxETUhe0HsHKYOrjE111+yrrS8VHw=","crlite_enrolled":false,"id":"b46c4aee-89d5-489f-952e-a0be25381950","last_modified":1562025490325},{"schema":1562025488811,"derHash":"hdsL7tBmjQTXB0AA+Y6EsI0P1UKf9KJi3ny8FSihodo=","subject":"CN=SSL.com EV SSL Intermediate CA RSA R3,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxLjAsBgNVBAMMJVNTTC5jb20gRVYgU1NMIEludGVybWVkaWF0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"c46e4dd819439f5a2d9a5d2211601d40b993e06abd5d732d23a35bb22ba8c164","size":2442,"filename":"4V6KJv09j4wCTdB1kG8-rfM7XCExYEpiXCGzJNL58IQ=.pem","location":"security-state-staging/intermediates/d130da26-d0a0-4e38-8c36-21ff44017d65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4V6KJv09j4wCTdB1kG8+rfM7XCExYEpiXCGzJNL58IQ=","crlite_enrolled":true,"id":"2e55d70f-46c9-4052-8db4-0a4d5811bae2","last_modified":1562025489544},{"schema":1562025486585,"derHash":"5mg+iDFc0ctAPAzqSQ98S0yCyRzUhQN0iarbqpCDn2E=","subject":"CN=RapidSSL SHA256 CA,O=GeoTrust Inc.,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJSYXBpZFNTTCBTSEEyNTYgQ0E=","whitelist":false,"attachment":{"hash":"0c427bb269700930378fdff9222a8084e44be120208a9d1c85da1818c55ccc4f","size":1553,"filename":"Slt48iBVTjuRQJTjbzopminRrHSGtndY0_sj0lFf9Qk=.pem","location":"security-state-staging/intermediates/51d0ad57-d709-4fd6-878e-800853fe44a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Slt48iBVTjuRQJTjbzopminRrHSGtndY0/sj0lFf9Qk=","crlite_enrolled":true,"id":"a1d663ba-8d2d-47cc-a3cf-348370fe97e5","last_modified":1562025487320},{"schema":1562025484343,"derHash":"Dugs637KJBzMKdTliAYsQ+RH7ebGlvE1rMQRlmEmuoM=","subject":"CN=Aristotle University of Thessaloniki SSL RSA SubCA R2,O=Aristotle University of Thessaloniki,L=Thessaloniki,C=GR","subjectDN":"MIGTMQswCQYDVQQGEwJHUjEVMBMGA1UEBwwMVGhlc3NhbG9uaWtpMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxPjA8BgNVBAMMNUFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBTU0wgUlNBIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"01ab73a33c9d719f58a09c3705ba3a27f08494d6b98a58a3c1cf1a8b73c04830","size":2962,"filename":"MOR9elaY2GOSXRQ0lkPZuOKdFNjk0evRDxZV72l0G6Y=.pem","location":"security-state-staging/intermediates/ae130e5d-a17e-4033-9421-9945a803151d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MOR9elaY2GOSXRQ0lkPZuOKdFNjk0evRDxZV72l0G6Y=","crlite_enrolled":true,"id":"0cfe3154-7bb3-4615-b637-5cd7a868f07c","last_modified":1562025485073},{"schema":1562025478331,"derHash":"iHH5nI9khT2RZEZOWa+z6th7brIPmGSbSweghO5sEk4=","subject":"SERIALNUMBER=201402,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwMg==","whitelist":false,"attachment":{"hash":"ec26f368737875a2881f23314886b24f9df446cc2759a1b454a725b37cc0fb48","size":1402,"filename":"5MRz3xew1J2eodt0I8LbElqYaptWQ2dbe84uXbsXefE=.pem","location":"security-state-staging/intermediates/fe54a667-4e34-4f87-9fa8-661cf2939604.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5MRz3xew1J2eodt0I8LbElqYaptWQ2dbe84uXbsXefE=","crlite_enrolled":false,"id":"4a757875-256e-4611-9250-7948cffd2e85","last_modified":1562025479062},{"schema":1562025477573,"derHash":"ICi1Ih3id+8elh9OMYKjxQDuWqZ79bVE06bVil6md30=","subject":"CN=RU-CENTER High Assurance Services CA 2,O=RU-Center (\u0417\u0410\u041e \u0420\u0435\u0433\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0421\u0435\u0442\u0435\u0432\u043e\u0439 \u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0439 \u0426\u0435\u043d\u0442\u0440),L=Moscow,ST=Moscow,C=RU","subjectDN":"MIHNMQswCQYDVQQGEwJSVTEPMA0GA1UECBMGTW9zY293MQ8wDQYDVQQHEwZNb3Njb3cxazBpBgNVBAoMYlJVLUNlbnRlciAo0JfQkNCeINCg0LXQs9C40L7QvdCw0LvRjNC90YvQuSDQodC10YLQtdCy0L7QuSDQmNC90YTQvtGA0LzQsNGG0LjQvtC90L3Ri9C5INCm0LXQvdGC0YApMS8wLQYDVQQDEyZSVS1DRU5URVIgSGlnaCBBc3N1cmFuY2UgU2VydmljZXMgQ0EgMg==","whitelist":false,"attachment":{"hash":"2084d64f65967c43d9b17db5f8cdd4e5657fa8117b7544e8e70885c3ba03dc4d","size":2259,"filename":"Y8qWv3kk8QX9ecEOiluI35bMi7sfrRJPiD5ZnUYgq-g=.pem","location":"security-state-staging/intermediates/31475041-d093-493a-941d-b3b3020753fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Y8qWv3kk8QX9ecEOiluI35bMi7sfrRJPiD5ZnUYgq+g=","crlite_enrolled":true,"id":"8dae2c43-6457-4056-9435-7fd37736a650","last_modified":1562025478323},{"schema":1562025476821,"derHash":"vJI+nHvr5T9VyXMrFvUdU7dyAzmkSBtCgaQBP2Ypn7Y=","subject":"CN=SSL.com DV CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEWMBQGA1UEAxMNU1NMLmNvbSBEViBDQQ==","whitelist":false,"attachment":{"hash":"c5707914003f2e3348b2d819e8a3f836ef2d4b8d2553ceb75fe22a2b62af054c","size":2105,"filename":"Csnhxeh1vsuMPZmVPaq9zufjZbtCA2WDcjROo3ZMJmY=.pem","location":"security-state-staging/intermediates/641c5dbf-a4d3-4f33-854a-1c71bb717a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Csnhxeh1vsuMPZmVPaq9zufjZbtCA2WDcjROo3ZMJmY=","crlite_enrolled":true,"id":"4af93016-ef93-484b-9fb5-971506f15e7e","last_modified":1562025477565},{"schema":1562025476076,"derHash":"W49+r3XRjWdK5nBf+rQ8q6YISpWm8Z4YCPBvCwzTfw0=","subject":"SERIALNUMBER=PT507015851,CN=DIGITALSIGN QUALIFIED TSA CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIG2MRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxJTAjBgNVBAMTHERJR0lUQUxTSUdOIFFVQUxJRklFRCBUU0EgQ0E=","whitelist":false,"attachment":{"hash":"de61aef599e63efcfa0754fb2e8a3dd87ffb49069188a24c4c267b8330852af3","size":2999,"filename":"eba3Dm8gkeBOmAEPMEXJUQJqoFAZpTSW0dUTpoKiXiU=.pem","location":"security-state-staging/intermediates/6ba896c9-1dbc-4dbb-a2b0-7b367394ce1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eba3Dm8gkeBOmAEPMEXJUQJqoFAZpTSW0dUTpoKiXiU=","crlite_enrolled":false,"id":"533f7578-20dd-4424-9067-dcd3cd960b25","last_modified":1562025476813},{"schema":1562025475338,"derHash":"vs/eEkzt00TZJctV7dpmLZqcBoj6mghwzj27baQxPk4=","subject":"CN=QuoVadis PKIoverheid Organisatie Services CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGEMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTowOAYDVQQDDDFRdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2aWNlcyBDQSAtIEcz","whitelist":false,"attachment":{"hash":"ba1fd2a539b87d0e6ce58d2ff164fa4995802e3187facea07d2d4a47e2554906","size":2682,"filename":"Dd3dL3h7MwKL57AT7SDAXLcnBsv-F-NSsju9HDfnIUM=.pem","location":"security-state-staging/intermediates/c00199d1-677f-403e-a72f-6661d2766c66.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Dd3dL3h7MwKL57AT7SDAXLcnBsv+F+NSsju9HDfnIUM=","crlite_enrolled":false,"id":"eada2bb2-7eee-4182-8069-0d14b9b2911e","last_modified":1562025476068},{"schema":1562025474587,"derHash":"I5/6htcQM7olWRR4IFfYfoQhrt1ZELeGkotqEkjD40E=","subject":"CN=CA Disig R2I3 Certification Service,O=Disig a.s.,L=Bratislava,C=SK","subjectDN":"MGUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMRMwEQYDVQQKDApEaXNpZyBhLnMuMSwwKgYDVQQDDCNDQSBEaXNpZyBSMkkzIENlcnRpZmljYXRpb24gU2VydmljZQ==","whitelist":false,"attachment":{"hash":"3420f786d68e2c9b43dcb43b746ca258b7a646ade27a146a00fe8af877df4f59","size":2142,"filename":"QUf9pBcUZxnKMgP_Op4uLhRku-x-b_JvkEQPmCrNbZY=.pem","location":"security-state-staging/intermediates/ccf776b5-dad9-4394-b424-8c2cacda75f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QUf9pBcUZxnKMgP/Op4uLhRku+x+b/JvkEQPmCrNbZY=","crlite_enrolled":false,"id":"85d742bd-cad8-4921-b914-8cb3b1931d2c","last_modified":1562025475330},{"schema":1562025473063,"derHash":"/SlUprx/R91EP2Fk2EVCRbsM/pz1Ws4327NbjkiVp9k=","subject":"CN=Technological Educational Institute of Epirus CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGRMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPDA6BgNVBAMTM1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRlIG9mIEVwaXJ1cyBDQSBSMw==","whitelist":false,"attachment":{"hash":"258f0ec659e411b76f696a63b9b54690d12b54e96a2fb86e896474db260f8cae","size":2560,"filename":"ifNtHuGOosnfWP8xv-35qett4I3b7lw-i4hIbE8TRKQ=.pem","location":"security-state-staging/intermediates/d58bdb06-bf59-4f47-a90c-3aedbe736775.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ifNtHuGOosnfWP8xv+35qett4I3b7lw+i4hIbE8TRKQ=","crlite_enrolled":true,"id":"818fa4ff-655c-4317-9fc1-6f97a7945f56","last_modified":1562025473803},{"schema":1562025472316,"derHash":"TWcjeyz6z/893IPC/xySqOCpinG9BO05+K/0Kq+ZNx0=","subject":"CN=Shuidi Webtrust SSL Domain Validated,O=Shanghai Ping An Credit Reference Company Limited,C=CN","subjectDN":"MHgxCzAJBgNVBAYTAkNOMTowOAYDVQQKDDFTaGFuZ2hhaSBQaW5nIEFuIENyZWRpdCBSZWZlcmVuY2UgQ29tcGFueSBMaW1pdGVkMS0wKwYDVQQDDCRTaHVpZGkgV2VidHJ1c3QgU1NMIERvbWFpbiBWYWxpZGF0ZWQ=","whitelist":false,"attachment":{"hash":"63bdeba64d270d7fe2be7ee4b7e9a192c4f735067578e4fd400929b5b7d868b1","size":1780,"filename":"z8UvZVIyaOTkJosl2Vn8Hbcn7ChKCosFEmKBgvRLh6U=.pem","location":"security-state-staging/intermediates/8c50117d-cf04-4cb1-a7c7-4359f02fe4df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z8UvZVIyaOTkJosl2Vn8Hbcn7ChKCosFEmKBgvRLh6U=","crlite_enrolled":true,"id":"d35f58a2-ee1e-4379-a992-e748ce904d72","last_modified":1562025473055},{"schema":1562025471549,"derHash":"HZNobKQscDlPvcK8H5hGHRmHHCoAB4uBVJkxLtn2/gw=","subject":"CN=NetLock \u00dczleti Eat. (Class B Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG0MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFCMEAGA1UEAww5TmV0TG9jayDDnHpsZXRpIEVhdC4gKENsYXNzIEIgTGVnYWwpIFRhbsO6c8OtdHbDoW55a2lhZMOz","whitelist":false,"attachment":{"hash":"4fba3ae97dd053930e8514eb3fdcdbc3ccccbadc3b59f72c390b9e8968b894f8","size":2198,"filename":"_vwER7WMeggAoauXgB8U4heDYF3dmMm_S99ZfAayhZ8=.pem","location":"security-state-staging/intermediates/77e0aaee-29fa-489c-be2e-6dfde8a27857.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/vwER7WMeggAoauXgB8U4heDYF3dmMm/S99ZfAayhZ8=","crlite_enrolled":false,"id":"7174ab51-9ffe-493a-89bf-49620f52a798","last_modified":1562025472308},{"schema":1562025470795,"derHash":"igrdrk8s+dLCTXpJ7tXIbIsd8chbpz3lxHfLFPoNE+k=","subject":"CN=TeleSec ServerPass Extended Validation Class 3 CA,OU=T-Systems Trust Center,O=T-Systems International GmbH,POSTALCODE=57250,STREET=Untere Industriestr. 20,L=Netphen,ST=Nordrhein Westfalen,C=DE","subjectDN":"MIHzMQswCQYDVQQGEwJERTElMCMGA1UECgwcVC1TeXN0ZW1zIEludGVybmF0aW9uYWwgR21iSDEfMB0GA1UECwwWVC1TeXN0ZW1zIFRydXN0IENlbnRlcjEcMBoGA1UECAwTTm9yZHJoZWluIFdlc3RmYWxlbjEOMAwGA1UEEQwFNTcyNTAxEDAOBgNVBAcMB05ldHBoZW4xIDAeBgNVBAkMF1VudGVyZSBJbmR1c3RyaWVzdHIuIDIwMTowOAYDVQQDDDFUZWxlU2VjIFNlcnZlclBhc3MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDbGFzcyAzIENB","whitelist":false,"attachment":{"hash":"6a9bc970754ff10c0c32a05c6c462115e39db917fcb15d1f1100b01b47dd134b","size":2081,"filename":"MTsGouOKFT5kWxvdmCP_-h4QV7TzhyPSvGXJhG-g5f0=.pem","location":"security-state-staging/intermediates/05b2e8d3-5c0a-4ac8-a431-6bdcf5338f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MTsGouOKFT5kWxvdmCP/+h4QV7TzhyPSvGXJhG+g5f0=","crlite_enrolled":true,"id":"a0ea2a21-fe38-42f0-9e75-2978ac3f1b2b","last_modified":1562025471541},{"schema":1562025469311,"derHash":"E0XC05rktlzKceiOmispxx3JE/lS6TWoErAE26eueVc=","subject":"CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"e6da6a137d62a7acc06ba43bbecbca249317995ef2a5821be7c4c3e4904d11cd","size":2649,"filename":"qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem","location":"security-state-staging/intermediates/27528fc3-b963-415a-a99a-4f327d7d7c83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=","crlite_enrolled":false,"id":"4dff9826-c4f5-4bad-9c0b-ef5d5c0bc30d","last_modified":1562025470044},{"schema":1562025468558,"derHash":"ZOtX2jVJwmWF6CxePNUpfaAGZWPNtISlVcVS/HZ3piA=","subject":"SERIALNUMBER=201804,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDQ=","whitelist":false,"attachment":{"hash":"fe1e835417bcb19ae6c16ab3e8a48ce53769d1e1bdfb3714b59bd2df2331e973","size":2337,"filename":"LzTtPR8Oe31ePAty2U7CsncdK3ci20JcLZlNrvPd6qQ=.pem","location":"security-state-staging/intermediates/2295f504-6018-4bf5-ae72-802108de8889.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LzTtPR8Oe31ePAty2U7CsncdK3ci20JcLZlNrvPd6qQ=","crlite_enrolled":false,"id":"9e0dab9a-1aa8-4da7-91a7-97d2690aa2f7","last_modified":1562025469304},{"schema":1562025467075,"derHash":"z8CPv6IZg+Ql6/lszMSnKsCehze6gUICoNaL34wVfCI=","subject":"CN=TrustAsia RSA Code Signing CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MG8xCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEmMCQGA1UEAxMdVHJ1c3RBc2lhIFJTQSBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"af7f22b3550a9db54d3cbd9e01b7c2e6a303d300c2051effaeb73379580070c4","size":2105,"filename":"uYRmb4FygkQFPiA00xhe4MbHYAXdVv1gWA73i6X9SiE=.pem","location":"security-state-staging/intermediates/e4543cc9-e587-4ab6-843b-44246185720c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uYRmb4FygkQFPiA00xhe4MbHYAXdVv1gWA73i6X9SiE=","crlite_enrolled":false,"id":"1a94f983-ff93-4236-9e20-5cc280aab20d","last_modified":1562025467809},{"schema":1562025464817,"derHash":"ORLFhecn8rB3iI9njwQ/2N3O6ekeZiimJFsbjrvMORI=","subject":"CN=Class2 e-Szigno SSL CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEcMBoGA1UEYQwTVkFUSFUtMjM1ODQ0OTctMi00MTEkMCIGA1UEAwwbQ2xhc3MyIGUtU3ppZ25vIFNTTCBDQSAyMDE2","whitelist":false,"attachment":{"hash":"98b37ae1cc647006d33e1b0891b42ab2c5f41787f32cce3681803aba7fb66524","size":2580,"filename":"NZP4aC4bQmjlxXRAcygA6LF8yzeZlyKkTTGIC7B9glM=.pem","location":"security-state-staging/intermediates/410dd037-e90b-43ec-967e-bcf28d2920e0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NZP4aC4bQmjlxXRAcygA6LF8yzeZlyKkTTGIC7B9glM=","crlite_enrolled":true,"id":"7c942e26-4b79-4354-935f-aa9e284f0568","last_modified":1562025465559},{"schema":1562025464078,"derHash":"JZptXtJOsgfNtf0U6tyHi94RHMt8y/uCdof3ecEYthI=","subject":"SERIALNUMBER=201404,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwNA==","whitelist":false,"attachment":{"hash":"889019d5ab04ba92e625e9b5cdc1390f99751d5c4a648649397c10e68edc795f","size":2097,"filename":"FvxdlGm9nh2LfyplssKej4AhCOWYExNd3MU9X-6cfPI=.pem","location":"security-state-staging/intermediates/1c5b7331-8fbe-451b-b06b-103d0b79a2b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FvxdlGm9nh2LfyplssKej4AhCOWYExNd3MU9X+6cfPI=","crlite_enrolled":false,"id":"f4b85424-2c51-497a-8bbf-1463f03e920b","last_modified":1562025464810},{"schema":1562025462586,"derHash":"2VEjGV+gLBzEBXMzbmTI36IQsXc+PGEQtusm5UN+I6U=","subject":"CN=McAfee OV SSL CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEbMBkGA1UEAxMSTWNBZmVlIE9WIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"1f4e1d5a686d456d53d5b5d7a9fcd1f0721fd2a598fe72d3071f05cc432b1bdd","size":2117,"filename":"KKKPHEdd8Vi-l7k78OoSVKsWZubT8CNhOr4ZCATqRXU=.pem","location":"security-state-staging/intermediates/2324e47a-771c-434f-a1f7-fd50942664f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KKKPHEdd8Vi+l7k78OoSVKsWZubT8CNhOr4ZCATqRXU=","crlite_enrolled":true,"id":"aab5604f-ab34-4e84-a719-7f0aed1db11d","last_modified":1562025463317},{"schema":1562025461841,"derHash":"PSkoopiCJ85OvDGao05lUunZiDnVziEU55+PXsK/neA=","subject":"CN=Jax HR Saint Vincents HIE CA,OU=Orion Health Direct Secure Messaging,O=Jax Health Records - SV HIE,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbSmF4IEhlYWx0aCBSZWNvcmRzIC0gU1YgSElFMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJTAjBgNVBAMTHEpheCBIUiBTYWludCBWaW5jZW50cyBISUUgQ0E=","whitelist":false,"attachment":{"hash":"f03905d542a9fefa6497381ee3132f9939c39d55d0cc647dcf61331e4aba8e20","size":2300,"filename":"7TZ-ZhVf1UwnhC-sgYAt2zg5_E6FaYgFktauJbqafHQ=.pem","location":"security-state-staging/intermediates/3b25f76c-ae83-4275-88b5-ca42f7b985d8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7TZ+ZhVf1UwnhC+sgYAt2zg5/E6FaYgFktauJbqafHQ=","crlite_enrolled":false,"id":"d1c3009a-63fb-421f-9ad2-a297af5df98e","last_modified":1562025462578},{"schema":1562025457260,"derHash":"ku8vW1U1cGB9wpyAEOerwWKD/jVflVokglQpCiYKnrs=","subject":"CN=RapidSSL SHA256 CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEyNTYgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"b94d4cf0a2a3415cd22cc29ae5ef73b31f0116f5e5eb61e676261b110cbcd64e","size":1691,"filename":"hKt_n8XrJnP3czMTKgZLx5NhiiXfYrdLodt3B3OSBA4=.pem","location":"security-state-staging/intermediates/8633f6bc-e397-45d0-9bda-05a8c8b7ef4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hKt/n8XrJnP3czMTKgZLx5NhiiXfYrdLodt3B3OSBA4=","crlite_enrolled":true,"id":"64a37cce-9a75-4f11-a71a-39c90d2fd63f","last_modified":1562025458022},{"schema":1562025456487,"derHash":"Irbr3umwptpcn6ztJ7+dzgmAPCr8EfdrXAvPR7f31WA=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - OTC,OU=Certificados de un solo uso,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGLMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMSQwIgYDVQQLDBtDZXJ0aWZpY2Fkb3MgZGUgdW4gc29sbyB1c28xEjAQBgNVBAUTCUE2MjYzNDA2ODEiMCAGA1UEAwwZQUMgRmlybWFwcm9mZXNpb25hbCAtIE9UQw==","whitelist":false,"attachment":{"hash":"76dd537d45ecc45c75cf9dbe89c64546ab6cf31e13c36fa01e475159f98cf4dd","size":2312,"filename":"D2ZFPMrSYrfEIs9VT_eGkCEQbRZnAyvXpiKOfaN8FXQ=.pem","location":"security-state-staging/intermediates/d6327b17-6e10-4392-90ec-a8d158fe27a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D2ZFPMrSYrfEIs9VT/eGkCEQbRZnAyvXpiKOfaN8FXQ=","crlite_enrolled":false,"id":"0275846e-4b4d-4542-ad90-89c87fb603c5","last_modified":1562025457253},{"schema":1562025454957,"derHash":"Uabi7UEECq6OCJ+6v+JqONZW9bCFVjU1L+6VmChrsCE=","subject":"CN=MedicaSoft Direct Intermediate CA,OU=MedicaSoft Direct Messaging,O=MedicaSoft LLC,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5NZWRpY2FTb2Z0IExMQzEkMCIGA1UECxMbTWVkaWNhU29mdCBEaXJlY3QgTWVzc2FnaW5nMSowKAYDVQQDEyFNZWRpY2FTb2Z0IERpcmVjdCBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"daa2982cf7723c68da56f4044c110649777655603b75f03d055fbeb78ba7d7e5","size":2211,"filename":"V8jIbRTZ2Jcwh--xqrc07Wq7g1sX8qz4m2pdzkAfWc8=.pem","location":"security-state-staging/intermediates/3cb00065-23fe-4e73-b235-f88a1f25319e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V8jIbRTZ2Jcwh++xqrc07Wq7g1sX8qz4m2pdzkAfWc8=","crlite_enrolled":false,"id":"271f87bb-11bf-4a8f-af6d-f6ec1a72b45f","last_modified":1562025455725},{"schema":1562025453478,"derHash":"bWPqpzGCPYDkdiS+YLr6t52eQDDUPj0C4YW9W3fkZls=","subject":"CN=RapidSSL Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGlJhcGlkU1NMIENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"2828a0ce5ac1a03d861de6a22cb781b8b05e9bd6f6a3e313f25c9f1c8758c0ee","size":1171,"filename":"lsi38yOVz7rsuYInzpsbotgnNxIGE0MBWmOuuxHxyzg=.pem","location":"security-state-staging/intermediates/77ea1cda-330e-46da-9e4f-65f7eac889a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lsi38yOVz7rsuYInzpsbotgnNxIGE0MBWmOuuxHxyzg=","crlite_enrolled":false,"id":"e6c236d1-ffda-4acc-b341-2a7298a038e3","last_modified":1562025454210},{"schema":1562025452715,"derHash":"JvettyHMLT4m3wY6b+KHOYlLGEcGDDUdxvUxHFffC18=","subject":"CN=Harokopio University CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaSGFyb2tvcGlvIFVuaXZlcnNpdHkgQ0EgUjE=","whitelist":false,"attachment":{"hash":"54fc0649f327645e7044c8770a3bfba482784645cec24ffe4fcafdaedea25473","size":2775,"filename":"1hHFX5m3nX4IdanFE39sr-FVsRg1eVo-ThXvmiegp7I=.pem","location":"security-state-staging/intermediates/34bb8603-35d5-4679-9a06-6af37df069cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1hHFX5m3nX4IdanFE39sr+FVsRg1eVo+ThXvmiegp7I=","crlite_enrolled":true,"id":"7946af96-326b-4ccb-a095-2e84cf59af33","last_modified":1562025453470},{"schema":1562025451214,"derHash":"L2iJlhp8pwZ+i6EDws+bmpJPjKKT8RF44joZeNLxM9M=","subject":"CN=DigiCert Cloud Services CA-1,O=DigiCert Inc,C=US","subjectDN":"MEsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJTAjBgNVBAMTHERpZ2lDZXJ0IENsb3VkIFNlcnZpY2VzIENBLTE=","whitelist":false,"attachment":{"hash":"a24b6873f5cedd0745b28d5b998ebab8816abfbde4a85fc3dfe456d4dedec97f","size":1646,"filename":"UgpUVparimk8QCjtWQaUQ7EGrtrykc_L8N66EhFY3VE=.pem","location":"security-state-staging/intermediates/ba6a6d30-b17d-4b39-9b81-2d721ab76ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UgpUVparimk8QCjtWQaUQ7EGrtrykc/L8N66EhFY3VE=","crlite_enrolled":true,"id":"d3fb3bfb-718d-4849-a53c-b80f49b89818","last_modified":1562025451944},{"schema":1562025450459,"derHash":"LNS3kUOdL0Zf/G/a+SXgB0q1C61Olxev1fXRvNnkh78=","subject":"CN=CertAssure ECC OV Secure Server Certification Authority,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExETAPBgNVBAcTCFNhbiBKb3NlMRgwFgYDVQQKEw9DZXJ0QXNzdXJlIEluYy4xQDA+BgNVBAMTN0NlcnRBc3N1cmUgRUNDIE9WIFNlY3VyZSBTZXJ2ZXIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"ca79bd3721de515408fb2058459249c5b588a11756f3a9e50e91639438ddac55","size":1329,"filename":"RHKZjmRhs4WSRd8tMaFGldq7b6_ydn4V_z1gGMLw964=.pem","location":"security-state-staging/intermediates/deb41aaf-0afe-42e7-91f4-fb74aff5a9ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RHKZjmRhs4WSRd8tMaFGldq7b6/ydn4V/z1gGMLw964=","crlite_enrolled":false,"id":"027ee554-14f3-42b9-ae64-9bcbb2e51d23","last_modified":1562025451206},{"schema":1562025448935,"derHash":"iExR1kO+ESbnLzsbcji6V+AmjB1sSiKs3WJJwXWKU7Y=","subject":"CN=International Hellenic University CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGFMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxMDAuBgNVBAMTJ0ludGVybmF0aW9uYWwgSGVsbGVuaWMgVW5pdmVyc2l0eSBDQSBSMQ==","whitelist":false,"attachment":{"hash":"2796768ed94ab3131e06d64b6e4987fe576a2d613a5f396c616d09ef2dd46087","size":2556,"filename":"a-PXNvvwvG42Rv9bcpQohzLWt4DAOP3eKSIq1DrsZ4k=.pem","location":"security-state-staging/intermediates/daab4b93-62db-4a6b-bc6f-f46b286e4fee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+PXNvvwvG42Rv9bcpQohzLWt4DAOP3eKSIq1DrsZ4k=","crlite_enrolled":true,"id":"abae3c7c-83c7-4697-a147-205cb29d7079","last_modified":1562025449682},{"schema":1562025448185,"derHash":"3Syy7sUvXparHLhDCVL7Vsjmq9/yHqzXaEsc1ziqzP8=","subject":"CN=E-Tu\u011fra Nitelikli Elektronik Sertifika Hizmet Sa\u011flay\u0131c\u0131s\u0131 v2,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIHVMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQUUtVHXEn3JhIE5pdGVsaWtsaSBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIHYy","whitelist":false,"attachment":{"hash":"d1b6e6e0491d73a71d4ad42658703114017fc34ddf82211704a567e8a79c91cd","size":2532,"filename":"fBnYIiBq8xqr_eWatE8_Qu_RG3xGQvVyMbLEBpH6IaQ=.pem","location":"security-state-staging/intermediates/72c4e87b-00b8-4b94-a865-6ba2f2366e87.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fBnYIiBq8xqr/eWatE8/Qu/RG3xGQvVyMbLEBpH6IaQ=","crlite_enrolled":true,"id":"dbbda893-cc25-40e9-aa54-1d6afced3764","last_modified":1562025448928},{"schema":1562025445182,"derHash":"LmoMx4U6PnkmrnQQ6cF+UnpoGcLn3T3pe6LOH2lYtAs=","subject":"SERIALNUMBER=201705,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNQ==","whitelist":false,"attachment":{"hash":"74b6e406eb7ac2bec1e58082e3ff46de50ed63b02ee3bd0365de88b16b813eda","size":2154,"filename":"19L-zJeDluxT1FLE36D0RrY9R7OicvzFnd7jRtuX_ls=.pem","location":"security-state-staging/intermediates/5d60b5c0-1b6e-4174-a75c-c9224f584b9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"19L+zJeDluxT1FLE36D0RrY9R7OicvzFnd7jRtuX/ls=","crlite_enrolled":false,"id":"4627de1d-e106-4813-9f62-b85ac8e53227","last_modified":1562025445931},{"schema":1562025441417,"derHash":"ug4ra/LJjtLDscHAihu9yvknCsUooxlDAd0qC2tnubM=","subject":"CN=GlobalSign Domain Validation CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"b7c827e445973f494efe9677b4f9b1b7c035e10603815e752de4b506960b41f1","size":1479,"filename":"TEb9SdyV5a_KjM7PCm4dOji-92ekxy7uuBKyI1Gg5v4=.pem","location":"security-state-staging/intermediates/14161f5e-9367-4112-8960-f50cd50f3475.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TEb9SdyV5a/KjM7PCm4dOji+92ekxy7uuBKyI1Gg5v4=","crlite_enrolled":false,"id":"83447c12-f983-4f66-882b-bddaa6e4cd07","last_modified":1562025442176},{"schema":1562025440674,"derHash":"x2wI1+IYJ0x92stO0VxzUGt5QvOFHxh+XfpH8l6pV9U=","subject":"CN=SECOM Passport for Member PUB CA6,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTY=","whitelist":false,"attachment":{"hash":"c1024033ff8c20229e3f55fdfb0c9cb4089d0a286659024908308d6dcc485400","size":1695,"filename":"NnvJfXhU4z942ew_zWnITNVe12dq-KCFhcLn4ho0g8c=.pem","location":"security-state-staging/intermediates/18e2fcf0-545a-4a7c-8f38-feb7ce6a5e4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NnvJfXhU4z942ew/zWnITNVe12dq+KCFhcLn4ho0g8c=","crlite_enrolled":false,"id":"12bf1fe5-ecba-49ad-9f42-1346d9ee9c9c","last_modified":1562025441409},{"schema":1562025439186,"derHash":"8wHcxRgblBCQqRd+n/q0eVt66afSNg6m/aPM4M8N5Jo=","subject":"CN=TrustAsia RSA DV SSL Server CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBEViBTU0wgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"fcc7d966960447b3bda63af26542a4c1033c73ed22b3ac2fbee0dba7c662ad3d","size":2133,"filename":"tBDWSaHOpgXo2ifK2nGQRAAdZWCfbS8D7IHof7Oj_VA=.pem","location":"security-state-staging/intermediates/0a629b5b-de56-4242-9a30-96c616e9eb5e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tBDWSaHOpgXo2ifK2nGQRAAdZWCfbS8D7IHof7Oj/VA=","crlite_enrolled":true,"id":"63bd0518-b42e-4edb-8fff-b0224b41d592","last_modified":1562025439917},{"schema":1562025437676,"derHash":"Y0/fJsmU52opGNnvxMq5xvyzRO9kKnnIkZK82g7VL0w=","subject":"CN=DigiCert Assured ID CA G3,O=DigiCert Inc,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxIjAgBgNVBAMTGURpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EgRzM=","whitelist":false,"attachment":{"hash":"e8fa45fec67bc1318a3819405f1bfb0e74f616a1846f577a9fcdd141b182ce2d","size":1118,"filename":"PvaHuwE2jRHMyjTCq1y7W0C__z4Wjsb057DegXU0Ars=.pem","location":"security-state-staging/intermediates/1b00f9cd-0690-430b-a511-38456b5cf3a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PvaHuwE2jRHMyjTCq1y7W0C//z4Wjsb057DegXU0Ars=","crlite_enrolled":true,"id":"7bbbdeb7-763b-47bd-9665-cddbe3976c31","last_modified":1562025438409},{"schema":1562025436923,"derHash":"XYvXudy+UOEcFjgLt+HFnUYsW3LpC38hCmghLsD5QAw=","subject":"SERIALNUMBER=201904,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDQ=","whitelist":false,"attachment":{"hash":"91cf290158b38a029004e1e0ea7b17dda428f83a36f6b66fec3ebb782d024586","size":2337,"filename":"EoHXS07Vl2TiboKoTMwp40itNbiL0bRHZ1TdPrhGiY0=.pem","location":"security-state-staging/intermediates/1bf6c6fe-dcef-4e8e-9218-dba53d3ba51e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EoHXS07Vl2TiboKoTMwp40itNbiL0bRHZ1TdPrhGiY0=","crlite_enrolled":false,"id":"6bcffa6d-4137-4799-89aa-464eceb8efaa","last_modified":1562025437669},{"schema":1562025436165,"derHash":"vrjv6bGnPIQbN1qQ5f/4BIhI46KvZvbE3XuTjW/oxdg=","subject":"CN=TERENA SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAz","whitelist":false,"attachment":{"hash":"9d893e798bf07b02ee964606c0d5c4fc736a3465312d4895a2e8e195edc18959","size":1788,"filename":"8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=.pem","location":"security-state-staging/intermediates/6bd257cc-8279-4f32-8333-4b6a39355c56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8651wEkMkH5ftiaLp57oqmx3KHTFzDgp7ZeJXR0ToBs=","crlite_enrolled":true,"id":"1ca7f3e4-205e-41e8-ba7a-68ea492d0f45","last_modified":1562025436916},{"schema":1562025433930,"derHash":"WDRT7ArdhSaAHmL7hQePCySEXwtnYSgw3al+wOgp9B0=","subject":"CN=Trusted Secure Certificate Authority DV,O=Corporation Service Company,L=Wilmington,ST=DE,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCREUxEzARBgNVBAcTCldpbG1pbmd0b24xJDAiBgNVBAoTG0NvcnBvcmF0aW9uIFNlcnZpY2UgQ29tcGFueTEwMC4GA1UEAxMnVHJ1c3RlZCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IERW","whitelist":false,"attachment":{"hash":"f504ba38fe591f0922dfc156b69cdcec8b16d9d143a6817c39f7ae33cef29428","size":2166,"filename":"tMbtz8E47Nvp7rWcxBxJwWfSw3stezSqn-KyFA3dAqo=.pem","location":"security-state-staging/intermediates/d7b06aac-8e2d-419e-ad53-1ef35a1631a9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tMbtz8E47Nvp7rWcxBxJwWfSw3stezSqn+KyFA3dAqo=","crlite_enrolled":true,"id":"5df16760-5ec9-4015-87fa-a2ef4bc3bed6","last_modified":1562025434671},{"schema":1562025430931,"derHash":"7c2Itr13/IomgOLsuP+6xFiY36D96YNCXg8b6wWMBLY=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzI=","whitelist":false,"attachment":{"hash":"a14f5dac8d6f50ed84b645b9217e55446e7d75de6489c65e580ab2df2e4bb02d","size":1804,"filename":"6YC6rxi_m1VJU_goQfoSx50MPPhsiwz8zgwBht5WJBI=.pem","location":"security-state-staging/intermediates/e0f10167-e74d-4bfb-9146-e178b6346fd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6YC6rxi/m1VJU/goQfoSx50MPPhsiwz8zgwBht5WJBI=","crlite_enrolled":false,"id":"b0a5917e-e060-4bff-9f8a-89d9957be49e","last_modified":1562025431667},{"schema":1562025430186,"derHash":"OIPm3kkXpGtZTswtKsapXUPn6qjgiakfm8EE/xbfjeY=","subject":"CN=Secure Site Pro Extended Validation CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLzAtBgNVBAMTJlNlY3VyZSBTaXRlIFBybyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"873a9affb573886082637d5874421893f652b55adfa77a32cb7cd76d35bb12b5","size":1695,"filename":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA-yu6a9MbQBI=.pem","location":"security-state-staging/intermediates/1ded7fc2-cc24-4baa-9054-88cf1ffdb23f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"C5iNVr6DMrTBS2Wvb08zPxdCQnB0DSWA+yu6a9MbQBI=","crlite_enrolled":true,"id":"21893de7-b8e7-47a3-b253-4e26a2326ac3","last_modified":1562025430923},{"schema":1562025428680,"derHash":"MafFefJNVWLNsgP6Fanyw/9dwfLmv3wL2V+8sBFMjSE=","subject":"CN=QuoVadis Swiss Advanced CA G3,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH0xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTEyLjIxMC4zNDkxJjAkBgNVBAoMHVF1b1ZhZGlzIFRydXN0bGluayBTY2h3ZWl6IEFHMSYwJAYDVQQDDB1RdW9WYWRpcyBTd2lzcyBBZHZhbmNlZCBDQSBHMw==","whitelist":false,"attachment":{"hash":"4c229971fe06e9adf8da15571ba88a33b97732bcd7efb4c3096b84bafb019de0","size":2467,"filename":"KLQihRcKGkB7ukIgVMH3JF7JqQfl2YglDju59t5S7xc=.pem","location":"security-state-staging/intermediates/7560f454-7151-41fc-8d5c-cc244ed8aee2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KLQihRcKGkB7ukIgVMH3JF7JqQfl2YglDju59t5S7xc=","crlite_enrolled":false,"id":"3dff3c65-da33-4800-8dc5-549bfceca08d","last_modified":1562025429424},{"schema":1562025427924,"derHash":"jtUXtLzfL1DgXow27dMXMukt5m+9OAE5nCxj3PlkqRs=","subject":"SERIALNUMBER=201817,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE3","whitelist":false,"attachment":{"hash":"a87ea56cf878c4276c1f26db6f637964720a10b7fae2d35c645f81023350615c","size":2333,"filename":"kOdfzgDjsNVfydhVydVGyjvTw2nLr0bCdjn9_f-zdz8=.pem","location":"security-state-staging/intermediates/3dfa861d-ea88-4904-978a-0310ac3284bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kOdfzgDjsNVfydhVydVGyjvTw2nLr0bCdjn9/f+zdz8=","crlite_enrolled":false,"id":"f70b9a27-dfae-440f-b8b5-f77e5300d527","last_modified":1562025428672},{"schema":1562025426418,"derHash":"TY7Uo7Xzz3T+yHXoIEISpyGX1x3aOgeuX6W+/rYeycY=","subject":"CN=Trustico ECC EV CA,OU=Controlled by COMODO exclusively for The Trustico Group Ltd,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMRAwDgYDVQQHEwdDcm95ZG9uMR8wHQYDVQQKExZUaGUgVHJ1c3RpY28gR3JvdXAgTHRkMUQwQgYDVQQLEztDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgVGhlIFRydXN0aWNvIEdyb3VwIEx0ZDEbMBkGA1UEAxMSVHJ1c3RpY28gRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"442ba57bab9a7615f627b29e8f745bcc614a03a9a8babdc8c7460def49d525da","size":1406,"filename":"oSp7zLM2UdmSs3L-sF5vVgDPO3AMbxo2i3f5JYu4BYI=.pem","location":"security-state-staging/intermediates/9e0b0416-befa-4ad0-a1a0-07c5bc86cb3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oSp7zLM2UdmSs3L+sF5vVgDPO3AMbxo2i3f5JYu4BYI=","crlite_enrolled":false,"id":"7e4c32a3-05e2-466f-a302-2d4cb7a34e45","last_modified":1562025427178},{"schema":1562025425668,"derHash":"4bKV4UZcJOCVHsC5D799owtnjp6c5EF9/+nzQELfQ4Y=","subject":"CN=TU Dresden CA,O=Technische Universitaet Dresden,L=Dresden,ST=Sachsen,C=DE","subjectDN":"MHMxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdTYWNoc2VuMRAwDgYDVQQHDAdEcmVzZGVuMSgwJgYDVQQKDB9UZWNobmlzY2hlIFVuaXZlcnNpdGFldCBEcmVzZGVuMRYwFAYDVQQDDA1UVSBEcmVzZGVuIENB","whitelist":false,"attachment":{"hash":"4bb4a85a2aef8c2bbc7477ee066a25d177f13127df617d2caa763c5c9f3f5c92","size":1995,"filename":"dc-5wn2Qr-3zgoir8SQHWj7HfNM321MTym4ESb5GtH0=.pem","location":"security-state-staging/intermediates/d5d6b138-b20a-438c-bed9-6af0e662b862.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dc+5wn2Qr+3zgoir8SQHWj7HfNM321MTym4ESb5GtH0=","crlite_enrolled":true,"id":"5aecaad6-1f2a-4e95-82f0-497d2e825f43","last_modified":1562025426410},{"schema":1562025424927,"derHash":"VvMhZ/AD2PLLc4qzhsNcoVJlzCmpjuEGbNPhrFVsoVw=","subject":"CN=WISeKey CertifyID Personal GB CA 2,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBQZXJzb25hbCBHQiBDQSAy","whitelist":false,"attachment":{"hash":"fcd1020e802ce305dd5335ac117db1394ba35eb66280a7147e781bbc14a2fd48","size":1719,"filename":"PWvk9TZyRU9m6dOhEkswhdztMm-gtB5E3LzgPz8CQ6c=.pem","location":"security-state-staging/intermediates/f115ee94-ac0c-470b-a0c0-cb926fb24dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PWvk9TZyRU9m6dOhEkswhdztMm+gtB5E3LzgPz8CQ6c=","crlite_enrolled":false,"id":"fb909118-cd1d-4213-9faf-c66239f756d9","last_modified":1562025425660},{"schema":1562025424183,"derHash":"IQbMeQfGS4pdovwzjulN//EO9xHe27T8aU7gkuxTKx0=","subject":"CN=TrustCubes ICA G1,OU=www.trustcubes.com,O=TRUSTCUBES LIMITED,C=GB","subjectDN":"MIGhMQswCQYDVQQGEwJHQjEbMBkGA1UEChMSVFJVU1RDVUJFUyBMSU1JVEVEMRcwFQYIKwYBBAGEBwETCTIyMzAxMzcwMTEjMCEGCSsGAQQBg5gqARMUOTg0NTAwNTA1RkU4MENEME5FNTgxGzAZBgNVBAsTEnd3dy50cnVzdGN1YmVzLmNvbTEaMBgGA1UEAxMRVHJ1c3RDdWJlcyBJQ0EgRzE=","whitelist":false,"attachment":{"hash":"002d39d549b3edc3243fc8849e44a7320b6faab7fec61dbc7a17973a224b8dd3","size":1756,"filename":"WQNVf79ywhoSIaihn1jQE-5z8UKENBfhCeJcnklN0YQ=.pem","location":"security-state-staging/intermediates/0a4ef028-7d3c-4559-bee0-36cdd53068ab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WQNVf79ywhoSIaihn1jQE+5z8UKENBfhCeJcnklN0YQ=","crlite_enrolled":true,"id":"84388c52-0b35-4c7c-aa4f-ad6fe76d6235","last_modified":1562025424920},{"schema":1562025423432,"derHash":"4b5ru7cPWiQec2/ETGohYL9s4ZuV7dZ7976JboN3h0U=","subject":"CN=TERENA eScience SSL CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIGVTY2llbmNlIFNTTCBDQSAz","whitelist":false,"attachment":{"hash":"b0d4a431134fa5326c4d8941ca00bc9e05a182f5314e22010ce190dafef3b64a","size":1800,"filename":"mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=.pem","location":"security-state-staging/intermediates/fb0d63fa-26c1-48ef-b408-173776b4675b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mNPoBotkTew6fh29COIk7FfA9rKbI3N7z9F5Tl9pcMQ=","crlite_enrolled":true,"id":"788f8e47-0819-4adb-a11b-e91c396886c0","last_modified":1562025424175},{"schema":1562025422689,"derHash":"eBrNIJ07hz8Uj12zHGgK2tztQCONjBvxotVTOR+l0PM=","subject":"CN=Certigna Entity Code Signing CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGIMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEoMCYGA1UEAwwfQ2VydGlnbmEgRW50aXR5IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"08a562df9f7a4bc1c71eb903365f2523a36f48e8c67b7ab282f68e32bc060c3f","size":2523,"filename":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=.pem","location":"security-state-staging/intermediates/2eb117ef-3a3b-4901-9201-beb77a5e0cc8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"u3ZvFIlkZqOQDQbj9Abh3WXDOESr4pASOdoob9Oo2YI=","crlite_enrolled":false,"id":"0fb33d2f-f64b-456b-ac79-80910985aadd","last_modified":1562025423424},{"schema":1562025421934,"derHash":"Bb+2YF1IUWpXG6+af/dTdhMEcNpe5/9oTCZy6qDAyK0=","subject":"SERIALNUMBER=ZZZZZZA5,CN=Siemens Issuing CA Multi Purpose 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGlMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTUxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMS4wLAYDVQQDDCVTaWVtZW5zIElzc3VpbmcgQ0EgTXVsdGkgUHVycG9zZSAyMDE2","whitelist":false,"attachment":{"hash":"af0f17b404fbe18f86b9a08fbf3a7290623dc40dfadc1ac8c5d13b301a225fb7","size":2629,"filename":"GXTRtJ2VY1qQoBilPBeqP3z474KaNpz5Yeg65lNpPkg=.pem","location":"security-state-staging/intermediates/dc6ad260-c1eb-49e3-8419-9c2c0123af72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GXTRtJ2VY1qQoBilPBeqP3z474KaNpz5Yeg65lNpPkg=","crlite_enrolled":false,"id":"1e840493-34d2-4a03-9e0f-4ab3736899a3","last_modified":1562025422681},{"schema":1562025420418,"derHash":"BRwjj618HcD860rvecrpf+SagtqJFqSgkg8weqzWD4E=","subject":"CN=GDCA TrustAUTH R4 CodeSigning CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHMxCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xKTAnBgNVBAMMIEdEQ0EgVHJ1c3RBVVRIIFI0IENvZGVTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"7af1e6c6f9dd99eac7019162f8379c26901b03968413c1d8c3c8744bfff66c86","size":2060,"filename":"5Zt41KtIYUpjoXvNDZtGlrN-S-X9juxZk0kJdwQpIlM=.pem","location":"security-state-staging/intermediates/9201b15f-d676-42cb-8b9d-46172588682e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Zt41KtIYUpjoXvNDZtGlrN+S+X9juxZk0kJdwQpIlM=","crlite_enrolled":false,"id":"9e86f345-8b64-4b98-bb28-df4a1df1da0b","last_modified":1562025421177},{"schema":1562025418924,"derHash":"e+0pJ2rL7Z8Xbzi7o6Z85YFbXL8VIse7WezYawnhbtI=","subject":"CN=Amazon,OU=Server CA 4A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSA0QTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"80e7ade2cfaf2410560723bc955bfee6189c0738bf29f0cbef746f8ab6211ff5","size":1089,"filename":"F3CN_yt_rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=.pem","location":"security-state-staging/intermediates/e35a1354-e5b2-4212-a952-670b71886c48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F3CN/yt/rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=","crlite_enrolled":false,"id":"e892e888-930b-4d65-ac61-bac8ebb2adc5","last_modified":1562025419658},{"schema":1562025417416,"derHash":"5/vS2obeMa5/4FHGQ/xF0x5nRUsqXNjkPG1lZyOujOo=","subject":"CN=FujiSSL SHA2 Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for Nijimo K.K.,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIG+MQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIE5pamltbyBLLksuMTgwNgYDVQQDEy9GdWppU1NMIFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"5234da30ba635d594351c8f25c9d98755ed276e3fda91212595e2b9141b6a270","size":2268,"filename":"yGo0I_1jRNcQKZcAyqa4MRLItXyEYd7pWVmh6m8y4C4=.pem","location":"security-state-staging/intermediates/18b98149-a8eb-4ec8-80fc-928d1983db68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yGo0I/1jRNcQKZcAyqa4MRLItXyEYd7pWVmh6m8y4C4=","crlite_enrolled":false,"id":"742b99e6-7240-40bc-8afc-bf1d45a1a9bf","last_modified":1562025418168},{"schema":1562025416678,"derHash":"asFZtMK8jnKfO4RkLvEoa8yA13X+J4x0CtpGjVlDkCU=","subject":"CN=D-TRUST SSL Class 3 CA 1 2009,O=D-Trust GmbH,C=DE","subjectDN":"MEwxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJjAkBgNVBAMMHUQtVFJVU1QgU1NMIENsYXNzIDMgQ0EgMSAyMDA5","whitelist":false,"attachment":{"hash":"554db3f3f6728e13a10d546724cfe973f631696acc81d3d80206909beb978612","size":1861,"filename":"9w0QP9HzLXkfs-4zENaUFq2XKcQON1oyksoJ-Gg2AZE=.pem","location":"security-state-staging/intermediates/bb452f94-c0b6-479f-b577-d019a89c31d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9w0QP9HzLXkfs+4zENaUFq2XKcQON1oyksoJ+Gg2AZE=","crlite_enrolled":true,"id":"37dde6cf-08e9-4e8e-bad3-9c993d870f8d","last_modified":1562025417408},{"schema":1562025415204,"derHash":"BkM/yp91OYC1JiNt1yhG7Bsgdwv8x9MYjdZ7wOz7d4I=","subject":"CN=Greenville Health System CA,OU=Orion Health Direct Secure Messaging,O=Greenville Health System,C=US","subjectDN":"MIGFMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYR3JlZW52aWxsZSBIZWFsdGggU3lzdGVtMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJDAiBgNVBAMTG0dyZWVudmlsbGUgSGVhbHRoIFN5c3RlbSBDQQ==","whitelist":false,"attachment":{"hash":"940f74f14744addbb8dcb7659509701cf0f713a02960e673bee265fefeaadb89","size":2300,"filename":"yPuMwpJMeMLa4pEq0C8FL_ugpU7_x3Zj_5fmOCHtRhI=.pem","location":"security-state-staging/intermediates/a9c6671b-774f-41f4-a46e-ff017860e2a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yPuMwpJMeMLa4pEq0C8FL/ugpU7/x3Zj/5fmOCHtRhI=","crlite_enrolled":false,"id":"91d209d2-e7c2-47b4-bd68-058b8adbda03","last_modified":1562025415931},{"schema":1562025414466,"derHash":"khDT/rax8B7K+McmESV1iQW/iH6NCygkjKf6coTC9zk=","subject":"CN=USERTrust RSA Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEmMCQGA1UEAxMdVVNFUlRydXN0IFJTQSBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"d865305420305a96e03553e0290021ab08fd6bef8d5bf1f6233a13f4349c2159","size":2142,"filename":"PWFYjBN92SersAqUUJzfJ8E4Pj9cxCTLluiO-_6xWqc=.pem","location":"security-state-staging/intermediates/8a270672-a325-421c-aa0c-d8056f155544.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PWFYjBN92SersAqUUJzfJ8E4Pj9cxCTLluiO+/6xWqc=","crlite_enrolled":true,"id":"1f1fa5d7-28c2-4016-a238-a255210ad688","last_modified":1562025415197},{"schema":1562025411468,"derHash":"//4HdQP9cvDlM4sKe04hjn0f+C5JPn6FKuUaocdYXRc=","subject":"CN=GlobalSign CodeSigning CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"f95ebdf17b6cf9f6ae57dab7480084843c2e7cc2cad146c563a2ee1a97bad6eb","size":1646,"filename":"bAToA1Qda7M7XsA72vR3vK2dwxV3EtiPeCfwswnDh44=.pem","location":"security-state-staging/intermediates/6fe38bdc-2f4e-4fcd-8665-de39d97dc15c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bAToA1Qda7M7XsA72vR3vK2dwxV3EtiPeCfwswnDh44=","crlite_enrolled":false,"id":"36efdaf9-8a7f-4d68-be5e-eae0852be93d","last_modified":1562025412213},{"schema":1562025410725,"derHash":"3eS+vyYsnY31y1T+T1mVGR6vWK3Lkv5a7TEorA0ZFsc=","subject":"CN=Symantec Class 3 Organizational CA - G2,OU=VeriSign Trust Network+OU=Terms of use at https://www.verisign.com/rpa (c)11,O=Symantec Corporation,C=US","subjectDN":"MIG8MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTExMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"2073f18bd8b760997037f65cea8c6463d57c287eeaf37cd78e0afde81beb50ad","size":2008,"filename":"8Vaa7hyPgvofrzXh1bAlF62L9kQg_5tbO-89MDeNtLQ=.pem","location":"security-state-staging/intermediates/ca6cba07-b0ed-4b09-9c57-b753df3f5d0c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Vaa7hyPgvofrzXh1bAlF62L9kQg/5tbO+89MDeNtLQ=","crlite_enrolled":false,"id":"472a34bc-59f2-4e7d-ab34-7e991d5266c8","last_modified":1562025411460},{"schema":1562025409209,"derHash":"64T8C0A9m2iSl6XYPqGGg447d3vGGO/aFip1t/6mZsE=","subject":"CN=DigiCert Federated ID US L3 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJzAlBgNVBAMTHkRpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBVUyBMMyBDQQ==","whitelist":false,"attachment":{"hash":"56a86bb48ed696de350c2df65d97e8c04077813d4858bfbee431f3e3a7b1e6f4","size":1869,"filename":"14vZQlpwjgYpJ-P-OWrCLfFBSxrpJvtuhoFlwDkZfKw=.pem","location":"security-state-staging/intermediates/d381d1d1-fd9f-4813-a5aa-4b22e940bbe5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"14vZQlpwjgYpJ+P+OWrCLfFBSxrpJvtuhoFlwDkZfKw=","crlite_enrolled":false,"id":"b6ac63f3-779d-4f02-888a-0f181a3001d2","last_modified":1562025409946},{"schema":1562025407732,"derHash":"rjc+SI3RPe9xYR1S8LUXndZIJBo4H2eoBzT2YV/25so=","subject":"CN=LuxTrust Corporate CA,O=LuxTrust S.A.,C=LU","subjectDN":"MEUxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMR4wHAYDVQQDExVMdXhUcnVzdCBDb3Jwb3JhdGUgQ0E=","whitelist":false,"attachment":{"hash":"14cabf521e5bbb849b1939229c0aaf15cee63afe34b235bcb187079f1ed2c596","size":2276,"filename":"1IJLHql-hNTPjvXDc2RSsXxNiuzg24zvLWDesq51de8=.pem","location":"security-state-staging/intermediates/f3beac36-1b74-49d5-9904-dcd3444e6570.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1IJLHql+hNTPjvXDc2RSsXxNiuzg24zvLWDesq51de8=","crlite_enrolled":false,"id":"b6d2831c-8bb2-45c7-8018-5016141d7585","last_modified":1562025408461},{"schema":1562025406966,"derHash":"SKL31+gNQucip1LYkjgcBu7EQUFVydZFKqUG7qTtQ/Y=","subject":"CN=Trustico ECC OV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIEVDQyBPViBDQQ==","whitelist":false,"attachment":{"hash":"db16d66287fc83d7c7d389ce4e8d312e54908daf51f80a248788c398e0b5d751","size":1272,"filename":"WBn6yHQKpmzXFlZmp92hV73p71SuDLIwooOX99zzGBs=.pem","location":"security-state-staging/intermediates/d37260dd-6fc7-4943-aefe-3a877dde4827.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WBn6yHQKpmzXFlZmp92hV73p71SuDLIwooOX99zzGBs=","crlite_enrolled":false,"id":"dfad7acc-b54c-4fdb-9e08-0579d8b51981","last_modified":1562025407723},{"schema":1562025406218,"derHash":"d1N2gumgssW9XmK8HLNezrOPy+v30twyb35CDw3b7bM=","subject":"CN=RelayHealth Direct CA,O=RelayHealth,C=US","subjectDN":"MEMxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtSZWxheUhlYWx0aDEeMBwGA1UEAxMVUmVsYXlIZWFsdGggRGlyZWN0IENB","whitelist":false,"attachment":{"hash":"7b8ec633ea8e4ffb238a02aaa13742373bff1c0a3eca844f96bd5fdcf1a5858c","size":2101,"filename":"8r_WvGnNYwiJkaujqkp9w8Cx_ydDtfGWD-u4L_ZVBUU=.pem","location":"security-state-staging/intermediates/99b1a459-48a1-4e6c-b286-32402da52a8a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8r/WvGnNYwiJkaujqkp9w8Cx/ydDtfGWD+u4L/ZVBUU=","crlite_enrolled":false,"id":"0433b918-a448-4953-9835-5d211669a194","last_modified":1562025406959},{"schema":1562025404691,"derHash":"K/TxtAQNvCkMF68cF3QVsV3nt6BeXWk9Gq2zSRmeknE=","subject":"CN=SSL.com Client Authentication and Email CA,OU=www.ssl.com,O=SSL.com,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdTU0wuY29tMRQwEgYDVQQLEwt3d3cuc3NsLmNvbTEzMDEGA1UEAxMqU1NMLmNvbSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"4a7e55df2d04b4fbf8ceb238621c3522b71ae629ff4a52cbdb209642962ced24","size":2129,"filename":"o-Stjubrf3fOy2A5YfQYHaRKuUFlHp7EwXfRxi0LD1M=.pem","location":"security-state-staging/intermediates/5ce5a3e3-2971-43e9-adc8-23ac4dbe924a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o+Stjubrf3fOy2A5YfQYHaRKuUFlHp7EwXfRxi0LD1M=","crlite_enrolled":false,"id":"6f2b7763-47bc-435d-90f4-e167839a82c1","last_modified":1562025405472},{"schema":1562025403937,"derHash":"YmFumxG9Djo1g2DIO3jbxb7qV1yQuX5oJEgz+zBDfGs=","subject":"CN=TERENA Personal CA,O=TERENA,C=NL","subjectDN":"MDsxCzAJBgNVBAYTAk5MMQ8wDQYDVQQKEwZURVJFTkExGzAZBgNVBAMTElRFUkVOQSBQZXJzb25hbCBDQQ==","whitelist":false,"attachment":{"hash":"b540a4b8690142678f25aaa6f34207fd3c4298612d40cac2034f5049aa748c3b","size":1711,"filename":"GrQOOcgaiD1vs9vGDvRaVMQKNDQm2_Nj7lPXTk4s2F0=.pem","location":"security-state-staging/intermediates/e89a4382-1535-4c37-8a30-6afc7db29ba0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GrQOOcgaiD1vs9vGDvRaVMQKNDQm2/Nj7lPXTk4s2F0=","crlite_enrolled":false,"id":"415dc948-b9c5-49ef-96c2-e37830540e67","last_modified":1562025404683},{"schema":1562025402414,"derHash":"YipCooytyD2WJ3HZ0JvTB4d9SrUTtP4M8uWFHnn/pv4=","subject":"CN=DigiCert Universal Issuing CA,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSYwJAYDVQQDEx1EaWdpQ2VydCBVbml2ZXJzYWwgSXNzdWluZyBDQQ==","whitelist":false,"attachment":{"hash":"f1a1ffb6fdb69d7a3855904617a2703d1eeacea8fdb96c2618a5d48d7cec562f","size":1678,"filename":"rpECg98Pqf-LyUsBhAF2Y2Or1rqJfjhDeTy2ZQhmgGI=.pem","location":"security-state-staging/intermediates/edab92da-32c4-4827-9208-230a7c26ad84.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rpECg98Pqf+LyUsBhAF2Y2Or1rqJfjhDeTy2ZQhmgGI=","crlite_enrolled":false,"id":"b7cfacc8-6fd6-4e82-8bc6-24d3074d4f66","last_modified":1562025403178},{"schema":1562025400184,"derHash":"Af1z715w9Sb8nBH2X+Lub3Els2k5SSJ//Y5Fnlg8RYo=","subject":"CN=Trusted Root CA SHA256 G2,OU=Trusted Root,O=GlobalSign nv-sa,C=BE","subjectDN":"MGMxCzAJBgNVBAYTAkJFMRUwEwYDVQQLEwxUcnVzdGVkIFJvb3QxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExIjAgBgNVBAMTGVRydXN0ZWQgUm9vdCBDQSBTSEEyNTYgRzI=","whitelist":false,"attachment":{"hash":"0176070032bd2aad1dd44b838d42fdda701908895fbf143871d5d749253510f1","size":1573,"filename":"HHWscHR-mXReMKBRZxCvqEg6wDv6HAbPzKN7NlLvq4c=.pem","location":"security-state-staging/intermediates/989c40e2-7ad5-4b2b-8323-8e4496275666.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HHWscHR+mXReMKBRZxCvqEg6wDv6HAbPzKN7NlLvq4c=","crlite_enrolled":true,"id":"6cfd8096-2b5c-403d-8580-437aceb14b2e","last_modified":1562025400918},{"schema":1562025399410,"derHash":"L8wAmq/bKOklZDBBCm+m52rwkwGxBE/qqsqwAhWqOeE=","subject":"CN=Secure Site Starter DV SSL CA - G3,OU=Domain Validated SSL,O=GeoTrust\\, Inc.,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxKzApBgNVBAMTIlNlY3VyZSBTaXRlIFN0YXJ0ZXIgRFYgU1NMIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"92ee49d649aaf20a97caf2d91e00782df1925655b89795b19a68aa987d986f4f","size":1650,"filename":"pevGgdMM_FHMatT2CPKUmJVunG4EypGCZJqawFp8J-I=.pem","location":"security-state-staging/intermediates/3c4ee093-9c34-4fd0-816d-87fdc7c5588d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pevGgdMM/FHMatT2CPKUmJVunG4EypGCZJqawFp8J+I=","crlite_enrolled":false,"id":"ddc005b0-cf67-41f1-aae0-2e1f3912a13b","last_modified":1562025400176},{"schema":1562025397124,"derHash":"Js+iBnU+lq7Xww9WdOfG9aDLL5ODevahWWwveZxyU4U=","subject":"CN=Starfield Secure Code Signing Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, LLC,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHSMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEkMCIGA1UEChMbU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgTExDMTMwMQYDVQQLEypodHRwOi8vY2VydHMuc3RhcmZpZWxkdGVjaC5jb20vcmVwb3NpdG9yeS8xQTA/BgNVBAMTOFN0YXJmaWVsZCBTZWN1cmUgQ29kZSBTaWduaW5nIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"e67baffceaaae8a33973769e8a0fee09f33d86447facacab10005c1e9966f816","size":1841,"filename":"pdrFwFVE08-U0RMwwjTWvOzvNV6eV6GCx6Vc3g5O3qQ=.pem","location":"security-state-staging/intermediates/bd7d360c-039c-441f-b5c0-01b65c968a68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pdrFwFVE08+U0RMwwjTWvOzvNV6eV6GCx6Vc3g5O3qQ=","crlite_enrolled":false,"id":"3783c081-1bbe-4271-a451-0a0cd17eccac","last_modified":1562025397888},{"schema":1562025396359,"derHash":"rRSmi+yUnoT2BjQZ1jRl0TfCrdPjqF4A6ePuguW0AY8=","subject":"CN=DigiCert Secure Site Japan CA,OU=www.digicert.co.jp,O=DigiCert Japan G.K.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNEaWdpQ2VydCBKYXBhbiBHLksuMRswGQYDVQQLExJ3d3cuZGlnaWNlcnQuY28uanAxJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEphcGFuIENB","whitelist":false,"attachment":{"hash":"df60eb3da080f2840db9acafe44fcdcacda6ee46054e6e24d7990e36214d5715","size":1658,"filename":"RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=.pem","location":"security-state-staging/intermediates/59fe3a3f-e4cb-48ed-85fc-b4682138e5d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RuOIM5KDx0FCWTkQrZiunZ5syXM7en8mBJBWgs2ZzpE=","crlite_enrolled":false,"id":"18f06aa2-9015-4337-ac7b-12dfa481edb4","last_modified":1562025397117},{"schema":1562025395609,"derHash":"L1CGD5aAU6fboXhRNBdZsNXAQS+FeizRnzcx3TvtG2s=","subject":"CN=SecureTrust Client Authentication CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGAMTYwNAYDVQQDEy1TZWN1cmVUcnVzdCBDbGllbnQgQXV0aGVudGljYXRpb24gQ0EsIExldmVsIDExFDASBgNVBAoTC1NlY3VyZVRydXN0MRAwDgYDVQQHEwdDaGljYWdvMREwDwYDVQQIEwhJbGxpbm9pczELMAkGA1UEBhMCVVM=","whitelist":false,"attachment":{"hash":"7597ddd7590ab3bc97a1c2993f821d497d01ca156227cc8dd5576381cf270f76","size":1626,"filename":"mwNPmB4uqglX9MTEystm7SE6EITvH7E-j8zAmqo2488=.pem","location":"security-state-staging/intermediates/d1cfcb15-db46-4713-a13c-1c0c9d27bf59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mwNPmB4uqglX9MTEystm7SE6EITvH7E+j8zAmqo2488=","crlite_enrolled":false,"id":"d86224d9-6318-425c-9d3d-655fbc029085","last_modified":1562025396352},{"schema":1562025394125,"derHash":"srsm0nHcgrtkc1S29xjQq/G01nQRoO2v8aqVm+Xe034=","subject":"CN=STRATO RSA CA,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFgxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRYwFAYDVQQDEw1TVFJBVE8gUlNBIENB","whitelist":false,"attachment":{"hash":"d842b8e25f120d3ec31470876c77959fcf153a53f4a6457032a5ed3a0b71fa9a","size":1662,"filename":"oq0kkPtB7DgGV2afHdfrfKYwd5HqSWcvdyQogYh9c1A=.pem","location":"security-state-staging/intermediates/c5305a44-babf-450b-8d0a-a867e9e4e1db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oq0kkPtB7DgGV2afHdfrfKYwd5HqSWcvdyQogYh9c1A=","crlite_enrolled":false,"id":"acc31af2-0f15-4651-81d6-75626778da0f","last_modified":1562025394863},{"schema":1562025390366,"derHash":"XKBOk6WgfXTG+0r+Gz1NvGLCXOdNhhfH7mbLVDi6ZX8=","subject":"CN=KeyNet Systems ECC OV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"fa718efade37d1ce6617cd424eb885b934990185cacf99b396a71b3ae4a20df9","size":1297,"filename":"px8fWni3abLFLZV9MOsgswaWeefS4bTPmddWxtEXiag=.pem","location":"security-state-staging/intermediates/9c7bf4e4-f185-47c3-8165-17f826f18051.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"px8fWni3abLFLZV9MOsgswaWeefS4bTPmddWxtEXiag=","crlite_enrolled":false,"id":"38fecd26-fc2d-4f68-b8af-3bc270e6db61","last_modified":1562025391119},{"schema":1562025388878,"derHash":"8mA2cL7erR2XfWmS+mVU5spZW8UPOwP0Ftzw8g2sNsI=","subject":"CN=NETLOCK Trust Advanced Plus CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMScwJQYDVQQDDB5ORVRMT0NLIFRydXN0IEFkdmFuY2VkIFBsdXMgQ0E=","whitelist":false,"attachment":{"hash":"540e442f30e4d92cc77c092424cd284037ee17d43f66a1f403d30efc07c2135e","size":2077,"filename":"mgqek_kZMpAjKUdlEROIUnDVMUVD0aenZnLSASM3iuY=.pem","location":"security-state-staging/intermediates/51f17241-57ee-4ea5-a20b-800c39580154.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mgqek/kZMpAjKUdlEROIUnDVMUVD0aenZnLSASM3iuY=","crlite_enrolled":false,"id":"b922d207-71dc-413f-b0fe-110a94999f23","last_modified":1562025389609},{"schema":1562025388126,"derHash":"zW65N+4Xqfz/YKeQ+L3gypq8oHs+9GB03Rl48Lyk1Ek=","subject":"CN=EAEko Herri Administrazioen CA - CA AAPP Vascas (2),OU=AZZ Ziurtagiri publikoa - Certificado publico SCA,O=IZENPE S.A.,C=ES","subjectDN":"MIGdMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xOjA4BgNVBAsMMUFaWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0ExPDA6BgNVBAMMM0VBRWtvIEhlcnJpIEFkbWluaXN0cmF6aW9lbiBDQSAtIENBIEFBUFAgVmFzY2FzICgyKQ==","whitelist":false,"attachment":{"hash":"8a1839dcde98a8a35e268cfeba8b062ef97d7715e9cc268450315ee23cfb2c2c","size":2560,"filename":"1du3EfOp93FwG10en54tLejZ-LiGC4VDvyvFeaa50D8=.pem","location":"security-state-staging/intermediates/9e4524c0-0fc8-4de5-bb45-2b4a4446d9a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1du3EfOp93FwG10en54tLejZ+LiGC4VDvyvFeaa50D8=","crlite_enrolled":true,"id":"ae24e0ff-b8b9-4d71-8508-3ceac79ef326","last_modified":1562025388871},{"schema":1562025385874,"derHash":"zSZAlXz4hhBHDO/UCdhdm+BZYvfWwpmcT0MavMw0EYw=","subject":"CN=Corepoint Direct Intermediate CA,O=Corepoint Health,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBDb3JlcG9pbnQgSGVhbHRoMSkwJwYDVQQDEyBDb3JlcG9pbnQgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"cc2a17a1ba1f2e38700e08a8b7dab378470299c34a9c211c703448e725d29381","size":2158,"filename":"pcwA2IetNTivVxDNYKmF_fNcmwNsIBxp87A1i9fW_gU=.pem","location":"security-state-staging/intermediates/ed6cd416-0abe-4039-9b98-dc18290ffe88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pcwA2IetNTivVxDNYKmF/fNcmwNsIBxp87A1i9fW/gU=","crlite_enrolled":false,"id":"01be0b37-1a80-45ba-b618-581f8d1328e9","last_modified":1562025386617},{"schema":1562025380611,"derHash":"9dLSumgXp6mqDiE1S78Ob5XF4ofuiM8vJ58P/sTtrBU=","subject":"CN=GlobalSign PersonalSign 1 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAxIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"e9535932b8ce7d0bcef6a5462309da7a327feffdbd8c14e093b83b0b4776caf3","size":1650,"filename":"iMfFHGybWVH4E_m1d7Ieopj7M_3ilnXGAP523KziGTA=.pem","location":"security-state-staging/intermediates/3ae8b875-d65b-4139-9c40-0ca7a4303014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iMfFHGybWVH4E/m1d7Ieopj7M/3ilnXGAP523KziGTA=","crlite_enrolled":true,"id":"90b74927-605a-46c7-859e-2feb24cd258f","last_modified":1562025381350},{"schema":1562025379866,"derHash":"yyEJeZJAIJcDN64y2lw/mBqeBXFOwiuxw0If5pXlFXo=","subject":"CN=emSign ECC EV CS CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEhMB8GA1UEAxMYZW1TaWduIEVDQyBFViBDUyBDQSAtIEMz","whitelist":false,"attachment":{"hash":"aa29641172fa5da3efadfcea19729a3a0972cd59a4c482c07d9a8f59a9c97b65","size":1122,"filename":"FTdvRLCxhXvzdqcyZyetYe4NaeD_whho2peMBnvy3_0=.pem","location":"security-state-staging/intermediates/29775bdf-351a-4b9a-b8b8-09ec37b40fe8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FTdvRLCxhXvzdqcyZyetYe4NaeD/whho2peMBnvy3/0=","crlite_enrolled":false,"id":"5caabcbd-5f17-4a1a-a3e9-8c20b1c1e213","last_modified":1562025380604},{"schema":1562025379117,"derHash":"d1MwBWSsZl1W/vW9r9mciKcxwh6tjjmWyzc+ea39v9w=","subject":"CN=SignSec High-Assurance OV Authority,OU=SSL Department,O=FBS Inc,L=Irvine,ST=CA,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcTBklydmluZTEQMA4GA1UEChMHRkJTIEluYzEXMBUGA1UECxMOU1NMIERlcGFydG1lbnQxLDAqBgNVBAMTI1NpZ25TZWMgSGlnaC1Bc3N1cmFuY2UgT1YgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"2ee05e9e143fedbf63ea31b25f8a8a197a00c108b7da824449f25fbee96ca62d","size":2162,"filename":"-NJzGF6Gew8FPxWa8xRHx0tz0t0bJjNH38uDaSIgIqI=.pem","location":"security-state-staging/intermediates/87e188d2-04c0-4db5-8bc2-d4a9c755752d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+NJzGF6Gew8FPxWa8xRHx0tz0t0bJjNH38uDaSIgIqI=","crlite_enrolled":false,"id":"f00ff66e-82b8-4bdc-9031-f7847d7239b7","last_modified":1562025379858},{"schema":1562025377619,"derHash":"wYlJ42Wf998isw7E2mtDQa+L7gDkF3p/hv9ZvEa2ukA=","subject":"CN=TrustAsia Technologies\\, Inc. DV SSL CA - G2,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGJMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK1RydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4gRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"e6cbbd0f9a61cf86b9fd7623d20287f4ac3e43cb278f02f2894ed63fec82069e","size":1703,"filename":"g64L97C6AazxVe3Bk6Wn6SXfqUejdhEXe57ga44NS3c=.pem","location":"security-state-staging/intermediates/2ff3c56d-10d9-4b33-a883-344736f96843.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"g64L97C6AazxVe3Bk6Wn6SXfqUejdhEXe57ga44NS3c=","crlite_enrolled":false,"id":"de1e3c3e-b52c-47c5-b13a-b6c6fe5ba8f9","last_modified":1562025378352},{"schema":1562025376125,"derHash":"lItxEa9C9UbVec/1ziveyCE03ZkUhCvdsMUocutgTjk=","subject":"CN=SSL.com SSL Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxKzApBgNVBAMMIlNTTC5jb20gU1NMIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"29138ba36283c37133babfb45ad6da91b908056c4bc777229a9b6114c29bb9d7","size":1264,"filename":"zGgA4OU4DjJdvpRYUqbi5Vh2g9W5Oc_PgKihy9mkLsE=.pem","location":"security-state-staging/intermediates/583bc538-020a-40af-92a9-40c3653a90e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zGgA4OU4DjJdvpRYUqbi5Vh2g9W5Oc/PgKihy9mkLsE=","crlite_enrolled":true,"id":"a0acdb7c-e477-4e0c-8f54-b838e76497f5","last_modified":1562025376857},{"schema":1562025375368,"derHash":"O8UYVgQK1/9mg6qFoNNPnqaAzSPDfLigQjsPiaJEBbk=","subject":"CN=ACCVCA-120,OU=PKIACCV,O=ACCV,C=ES","subjectDN":"MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMjAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT","whitelist":false,"attachment":{"hash":"5c48e95a58a4d10758544929296f57524a51140212f8479daff1c315fe338caf","size":2686,"filename":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=.pem","location":"security-state-staging/intermediates/fd767b1f-850e-4779-ad1c-fcb1520983b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XH3Wh5FuH9ZeZcCdLZM0VbsyQg3aeFV1wujvNEYNRQ8=","crlite_enrolled":true,"id":"ea1bd9a0-1903-47bb-b8fb-ecb8955b6d38","last_modified":1562025376117},{"schema":1562025373104,"derHash":"+GhNKBK6mKUv6UUoxMsVI3ii1zqCiBCox7hSmHXGRnQ=","subject":"CN=Qualified Pseudonymous e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGLMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xMDAuBgNVBAMMJ1F1YWxpZmllZCBQc2V1ZG9ueW1vdXMgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"347542aaaf94389452ec241deb4e9b0659bd7e3fbfa082767360ebd2bdc7f554","size":1776,"filename":"Q-MM9a5IVpTJcjzEB7Wyr_KGLpH4y_1V4wt5h4NJjQc=.pem","location":"security-state-staging/intermediates/84a1e40e-aa66-419a-a6e0-b29ad9504f47.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q+MM9a5IVpTJcjzEB7Wyr/KGLpH4y/1V4wt5h4NJjQc=","crlite_enrolled":false,"id":"2bda9927-7780-4c65-80cf-88e65081a941","last_modified":1562025373847},{"schema":1562025372359,"derHash":"xcX8r25L0K2VvYvr0a6/Fl0dv0SagS8Swatuq2zHkV4=","subject":"CN=KeyNet Systems RSA DV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"fb85ea9df4ce4fb7563cf8ffdcd79a5d2a7b3e955ba403f48d67f4e38d6ad1b0","size":2138,"filename":"VTJmz2gVhXT9nFPyCAVJ7HDpV4Rfyg-dNTgE3kbMShE=.pem","location":"security-state-staging/intermediates/a488d2fa-2e4f-4f72-aeaf-6d6787bb87bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VTJmz2gVhXT9nFPyCAVJ7HDpV4Rfyg+dNTgE3kbMShE=","crlite_enrolled":false,"id":"7db20a5a-a12b-4255-adc3-47c77bc3c921","last_modified":1562025373097},{"schema":1562025370878,"derHash":"MdqiXRQtCLkOZA1LxQsknw/jl4XJjV5T4jMlnA+uk5g=","subject":"CN=Online e-Szigno SSL CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHwxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEcMBoGA1UEYQwTVkFUSFUtMjM1ODQ0OTctMi00MTEkMCIGA1UEAwwbT25saW5lIGUtU3ppZ25vIFNTTCBDQSAyMDE2","whitelist":false,"attachment":{"hash":"a70c67eb66b82e4075e34248c87882934b44064980cd89b1e783b12797290157","size":2580,"filename":"x0t02qhpw-MVPvpI409gZ7KlO9C8TZ6yqNYTYIDmB98=.pem","location":"security-state-staging/intermediates/168326d2-eb32-4449-8388-890b59e9496f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x0t02qhpw+MVPvpI409gZ7KlO9C8TZ6yqNYTYIDmB98=","crlite_enrolled":true,"id":"2f2ec8eb-d0d3-4ccb-bfe9-6771b302aa0e","last_modified":1562025371611},{"schema":1562025367867,"derHash":"EYJiwgiO4VKOINg20gcIVHB8DY+OgPvjlvns1LkUG1s=","subject":"CN=GlobalSign PersonalSign Partners CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiBQYXJ0bmVycyBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"a54cee1e50e97652bc6ebb1bf9a786f65fb993c0da0a2f5ca227f33c14524401","size":1577,"filename":"F0bWPekPIC9_nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=.pem","location":"security-state-staging/intermediates/22cd08f8-f4e5-4acd-b7cf-81fafc4917c8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F0bWPekPIC9/nkgAJD7EPawdSSYBw9Bv3fNGdTH1Brg=","crlite_enrolled":true,"id":"dd412308-f307-4318-883b-63990c7dea29","last_modified":1562025368603},{"schema":1562025366345,"derHash":"s5nv5CwBoFvcOJeER6eOlQRneT+xHBtrQmxBmg/HORE=","subject":"CN=BEKB - BCBE Issuing CA G2,OU=Issuing Certification Authority,O=Berner Kantonalbank AG,C=CH","subjectDN":"MHwxCzAJBgNVBAYTAkNIMR8wHQYDVQQKExZCZXJuZXIgS2FudG9uYWxiYW5rIEFHMSgwJgYDVQQLEx9Jc3N1aW5nIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIwIAYDVQQDExlCRUtCIC0gQkNCRSBJc3N1aW5nIENBIEcy","whitelist":false,"attachment":{"hash":"79f462ae20c0a610ce0ab12fc2fd9ca90da21f17887100f85355c97675d7b986","size":2434,"filename":"EEAYW3FK7bntpT70XsEpdNLi9KK69z7ix9M0UPRAGKc=.pem","location":"security-state-staging/intermediates/6bdb371b-20a1-42c8-86dd-bf77318e8c7a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EEAYW3FK7bntpT70XsEpdNLi9KK69z7ix9M0UPRAGKc=","crlite_enrolled":false,"id":"d0dbcc6e-4eba-4b25-a0b6-c8e83527e696","last_modified":1562025367118},{"schema":1562025365609,"derHash":"20djOcy/zJ5L0dbLYGyifwBnnh74pYHnI2MJudY//jc=","subject":"CN=CA de Certificados SSL EV,OU=BZ Ziurtagiri publikoa - Certificado publico EV,O=IZENPE S.A.,C=ES","subjectDN":"MIGBMQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xODA2BgNVBAsML0JaIFppdXJ0YWdpcmkgcHVibGlrb2EgLSBDZXJ0aWZpY2FkbyBwdWJsaWNvIEVWMSIwIAYDVQQDDBlDQSBkZSBDZXJ0aWZpY2Fkb3MgU1NMIEVW","whitelist":false,"attachment":{"hash":"6fa0a579644b4f4e2520de6c187e3d213f16c5035b15ab14690651899dbc5ca9","size":2523,"filename":"BjaOlbGE-OH8-vlWV2hZE4pvFyfXCm2QvaM1twHCrYk=.pem","location":"security-state-staging/intermediates/2ea9cda5-c628-44e6-aa94-ad77c8ed451b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BjaOlbGE+OH8+vlWV2hZE4pvFyfXCm2QvaM1twHCrYk=","crlite_enrolled":true,"id":"e6c4396d-16a0-4773-a029-036b775926fd","last_modified":1562025366337},{"schema":1562025364848,"derHash":"DgJX8GBri+586ev0UCPKT9ohooMMBJxG7Sr66bKGB8I=","subject":"SERIALNUMBER=201401,CN=Government AA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IEFBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"d4f0990c106c419b6d20070f298a396846b330490701c9ca58136a2a2e4202d5","size":2097,"filename":"zrqsI0LYhlXwV2fOwnlFX_c-r936bwTFFC4u2Tdf-98=.pem","location":"security-state-staging/intermediates/d3d76b39-0f66-4732-a4a7-8ad736b104df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zrqsI0LYhlXwV2fOwnlFX/c+r936bwTFFC4u2Tdf+98=","crlite_enrolled":false,"id":"d9480fb9-51ff-4517-9cc8-92edd9a9ca6a","last_modified":1562025365601},{"schema":1562025364107,"derHash":"L6MV3BVMIT3AwW/RL6Ahupl08MmuFC4kvzrtFQp85vw=","subject":"CN=CA A8,O=DST,C=US","subjectDN":"MCsxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNEU1QxDjAMBgNVBAMTBUNBIEE4","whitelist":false,"attachment":{"hash":"8ad25b6dba8e6a3e3eca82e8365e4be66a513461f80510fe2ad4afcf84a4b772","size":1114,"filename":"pMXM3on84rb3AQQVIojjeyZgOk0b95eNmbuYHSssTTQ=.pem","location":"security-state-staging/intermediates/ebd92230-8819-4a34-b485-619e524048de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pMXM3on84rb3AQQVIojjeyZgOk0b95eNmbuYHSssTTQ=","crlite_enrolled":false,"id":"4f938f2f-addb-409f-807b-7832954e7976","last_modified":1562025364841},{"schema":1562025360337,"derHash":"QD4GKiZTBZETKFuvgKDUrkIshIyfePrQH8lLxbh/7xo=","subject":"CN=DigiCert SHA2 Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNDAyBgNVBAMTK0RpZ2lDZXJ0IFNIQTIgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"a542625d5511b8e15e375edee06b6d656bea32f3a9e2fd08246b0b447f1dea45","size":1695,"filename":"RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn_yOhI_y-ho=.pem","location":"security-state-staging/intermediates/15c21eca-d96f-43c9-94b1-fd4217f81575.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=","crlite_enrolled":true,"id":"ac18b0e8-cf04-4b62-9dde-6c8bb64149e8","last_modified":1562025361073},{"schema":1562025359563,"derHash":"w6qJpPn3DBiw/qXN/bNeSH2gLBCrbT9g3nmtTJSuKEw=","subject":"CN=GoGetSSL RSA OV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIE9WIENB","whitelist":false,"attachment":{"hash":"fd420f93d752f6ead1f685f98f4967e9d026eca00d116052e6b9968a41b636a5","size":2085,"filename":"hvk5zQ4_wW8fexIq-RQp19DbNh0mDLs7XtlPnYskzOc=.pem","location":"security-state-staging/intermediates/a9a7e749-c9b5-4bd8-9269-90fbfcbcdf38.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hvk5zQ4/wW8fexIq+RQp19DbNh0mDLs7XtlPnYskzOc=","crlite_enrolled":true,"id":"5aa56c83-a91d-4f50-92ea-251d98d465d1","last_modified":1562025360329},{"schema":1562025357329,"derHash":"rUeIOkjIajRp4yyXKzmj7hVYBNMr9T/wAgALyhHSldk=","subject":"CN=NetLock K\u00f6zjegyz\u0151i Eat. (Class A Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBLw7Z6amVneXrFkWkgRWF0LiAoQ2xhc3MgQSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"98303cceb1fcd3ad4d4b766a36ae284b0b6b241967294bab6fa6f499c160964b","size":2203,"filename":"EZuZGAg4_KSV7oRx6yGMpZK9lx1i1gH3UJCYV6YepzM=.pem","location":"security-state-staging/intermediates/00bf4a30-9a87-4885-a9ec-6c5c8d3d8a9a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EZuZGAg4/KSV7oRx6yGMpZK9lx1i1gH3UJCYV6YepzM=","crlite_enrolled":false,"id":"a705c138-e0f7-4581-9978-d55ab5621403","last_modified":1562025358063},{"schema":1562025355822,"derHash":"F2qui91d0Gp9vUKGLcFzvYOP/jATEDsJe5Zxw3umrhQ=","subject":"CN=Certum Extended Validation Code Signing CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGUMQswCQYDVQQGEwJQTDEiMCAGA1UECgwZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECwweQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTgwNgYDVQQDDC9DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"29d062f3902f4c9626af092bcc8aead3944e31783d2e8c305ab8d18685552360","size":1776,"filename":"KmFi5E38OAi9iIt74jct7iJHQ0ASbjOOwdK57OFDu8U=.pem","location":"security-state-staging/intermediates/93162f40-a74d-43ed-b57a-2be36de6b390.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KmFi5E38OAi9iIt74jct7iJHQ0ASbjOOwdK57OFDu8U=","crlite_enrolled":false,"id":"79034794-4993-4207-9a13-888fe3887be9","last_modified":1562025356564},{"schema":1562025354324,"derHash":"Uz/pfrRfztJASeQe/p2yVKXdnZDf1TyVEsYgftsh2Cw=","subject":"CN=Digidentity BV PKIoverheid Organisatie Persoon CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPzA9BgNVBAMMNkRpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFBlcnNvb24gQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"24f901fd76e07be5ca74ae59a1209d08e86fd511e3a76ea3542c5285750f7541","size":2601,"filename":"MjKBWfIUno5zpHZcoox_zRpAEZ7AAFwqwtLT51BhL-Y=.pem","location":"security-state-staging/intermediates/0424da4d-ff44-499a-93e0-aa4ca3226dcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MjKBWfIUno5zpHZcoox/zRpAEZ7AAFwqwtLT51BhL+Y=","crlite_enrolled":false,"id":"2a0dcf45-1337-46ef-a43e-971523626591","last_modified":1562025355065},{"schema":1562025352786,"derHash":"TFbKejwQ61h2Xg/8+ANcV8nzvbAUhi9nZ1bPeJGT8Q4=","subject":"CN=Sonavation IoT CA,OU=sonavation.com,O=Sonavation\\, Inc.,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMRkwFwYDVQQKExBTb25hdmF0aW9uLCBJbmMuMRcwFQYDVQQLEw5zb25hdmF0aW9uLmNvbTEaMBgGA1UEAxMRU29uYXZhdGlvbiBJb1QgQ0E=","whitelist":false,"attachment":{"hash":"18ab135d1a2faf6a0b5c5c5d02d5b9070887cd3dd8d6c059c6956151b5af592a","size":1695,"filename":"vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=.pem","location":"security-state-staging/intermediates/a3f91b25-e0b3-450f-8129-2c07431d1e59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vVP8FQS5b7BRuCncy0juht2sjHUUGqg1uuyGap7EMKI=","crlite_enrolled":false,"id":"67cfe98d-cc06-44e2-84e3-4aeab1b20424","last_modified":1562025353534},{"schema":1562025352049,"derHash":"BOy6j5K/90WMSl58aSYfx+LvUtWvVPvdkrFxQbvgZR8=","subject":"CN=QuoVadis Qualified Web ICA G1,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRcwFQYDVQRhDA5OVFJOTC0zMDIzNzQ1OTEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xJjAkBgNVBAMMHVF1b1ZhZGlzIFF1YWxpZmllZCBXZWIgSUNBIEcx","whitelist":false,"attachment":{"hash":"af6f343ca612b312217ca30cee00b9efa009722998fd072580bde0f44d349962","size":2487,"filename":"EWJY2DWEXe27fystTVa-0cHUmGdi6igRAeyxOTlgFDY=.pem","location":"security-state-staging/intermediates/c5ad5e32-69bd-4133-b577-c545ff03e7de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EWJY2DWEXe27fystTVa+0cHUmGdi6igRAeyxOTlgFDY=","crlite_enrolled":true,"id":"e93aa26a-ab72-42de-ac2b-960617064295","last_modified":1562025352778},{"schema":1562025351312,"derHash":"k6B4mNibLMoWa6bx+KFBOM5Dgo5JG4MZJryCR9ORzHI=","subject":"CN=Starfield Secure Certificate Authority - G2,OU=http://certs.starfieldtech.com/repository/,O=Starfield Technologies\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHGMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEzMDEGA1UECxMqaHR0cDovL2NlcnRzLnN0YXJmaWVsZHRlY2guY29tL3JlcG9zaXRvcnkvMTQwMgYDVQQDEytTdGFyZmllbGQgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"4283da4ef9b6b21e475fb4a88aff9532a5c74e35282cb5459a20ee419646571c","size":1792,"filename":"8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe_w=.pem","location":"security-state-staging/intermediates/f0b4b8ab-658e-452d-a259-15b15f68060a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8kGWrpQHhmc0jwLo43RYo6bmqtHgsNxhARjM5yFCe/w=","crlite_enrolled":true,"id":"eda1d6cc-95f3-4925-b185-1972acc69e5a","last_modified":1562025352042},{"schema":1562025350573,"derHash":"Fp2vg8CHCriSfJnT/Ad03fNPuiiwK4gdzQtjO21xsro=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGMMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPTA7BgNVBAMTNFN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"2238ffd72ef99d7a932f6493708f5024fbb4da32672fc7a40feea3e027effdad","size":1938,"filename":"zktT0aLlN3tuuQeEOrKYTII7ybGAXJcvbxNyvqGo1dQ=.pem","location":"security-state-staging/intermediates/db401534-395d-4f9b-8dff-298f6e23b3a8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zktT0aLlN3tuuQeEOrKYTII7ybGAXJcvbxNyvqGo1dQ=","crlite_enrolled":false,"id":"eda0f897-de94-418d-a287-4a4be71422cd","last_modified":1562025351305},{"schema":1562025348314,"derHash":"0oAzSTpc/vQJwq6oWbnUL3azhlkVj47bs/tPilh6SJE=","subject":"CN=YourNet SSL for domain,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEkxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMR8wHQYDVQQDExZZb3VyTmV0IFNTTCBmb3IgZG9tYWlu","whitelist":false,"attachment":{"hash":"0d491f1c30a69a0f0803421936a5ebe0b20f2c5ee70ff5705f7fbb8af76a895d","size":1492,"filename":"w0rNtXTKlMHqqX8us7SezMP-EqOqUzMJ5-x9IOvyYjs=.pem","location":"security-state-staging/intermediates/e9645405-ee30-48c7-b9cf-7be06e589c2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w0rNtXTKlMHqqX8us7SezMP+EqOqUzMJ5+x9IOvyYjs=","crlite_enrolled":false,"id":"7e641533-b4be-442b-bb14-aced7bf58fdb","last_modified":1562025349057},{"schema":1562025347548,"derHash":"Ce1umR/DJz2P6jF9M5wCBBhhlzVJz6bhVY9BHxEhGqM=","subject":"SERIALNUMBER=07969287,CN=Go Daddy Secure Certification Authority,OU=http://certificates.godaddy.com/repository,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIHKMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4Nw==","whitelist":false,"attachment":{"hash":"3336e31997f16a6b0c8e3b2ca5641682721662f5ee9f648956959daaf8b8ab8d","size":1748,"filename":"MrZLZnJ6IGPkBm87lYywqu5Xal7O_ZUzmbuIdHMdlYc=.pem","location":"security-state-staging/intermediates/9d9449dc-fc0a-41b3-8e29-e1185a4d4526.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MrZLZnJ6IGPkBm87lYywqu5Xal7O/ZUzmbuIdHMdlYc=","crlite_enrolled":true,"id":"dbfd9482-8c71-4e1a-b80a-37fbb3beee31","last_modified":1562025348307},{"schema":1562025346055,"derHash":"zfJ+6gw6VRI2kQj9dGNdLUz1DpTWyhmb7X3oGw0JozY=","subject":"CN=HARICA Qualified Legal Entities SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAwwoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"8a0bdbb8b96dee2791a488b9ce949588e7f3341a346c5b8cc52119c67b607537","size":2605,"filename":"aP4JUCD4l8Gb5cKoQl0ai7usQVAOHgsjtOGEe__rD5I=.pem","location":"security-state-staging/intermediates/8dac66c0-21aa-435e-9911-91551650b659.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aP4JUCD4l8Gb5cKoQl0ai7usQVAOHgsjtOGEe//rD5I=","crlite_enrolled":false,"id":"ee438ee6-5459-4f0f-94e6-ccd27fac2655","last_modified":1562025346789},{"schema":1562025344551,"derHash":"WC3B2Xp5DvBP4lZ7HsiMJrA79umZN8rmoLUDl60gu/g=","subject":"CN=Symantec Class 3 SHA256 Code Signing CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBTSEEyNTYgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"82513c1a54e82926dd75722ae90d375351d27823d1ce05f32bf41a71f2d4218f","size":1914,"filename":"s8kzVzbZoCJLMAVvClIf4wDT-C0efzYgJqpBI0uFLh8=.pem","location":"security-state-staging/intermediates/aa02826e-48b4-4d27-b078-6d7e1b49f241.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"s8kzVzbZoCJLMAVvClIf4wDT+C0efzYgJqpBI0uFLh8=","crlite_enrolled":true,"id":"969300bd-569a-4e2c-abfc-86ab18116743","last_modified":1562025345310},{"schema":1562025343069,"derHash":"nomO0D+kaWlpDa1zxylmdQRf+bWgEAo5m+uENamPUYU=","subject":"CN=GlobalSign RSA DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIFJTQSBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"cca208f1e570c01764f76eb5afafc8222abf5a3e3cc7d91541a8791abf93a1dd","size":1609,"filename":"zf-i_fasW4ALe6PM9XFmRtKN_HFCpamlq2FK8z_Vuvs=.pem","location":"security-state-staging/intermediates/1cfc6d0a-1bef-47dd-8656-2dd4ebf008d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zf+i/fasW4ALe6PM9XFmRtKN/HFCpamlq2FK8z/Vuvs=","crlite_enrolled":true,"id":"99897585-23f4-4f35-9dd3-4022885dd187","last_modified":1562025343805},{"schema":1562025342325,"derHash":"bs9ljM6ospvmDIWQT0rdfMt5UM9YyXu/YNV86kmicD0=","subject":"CN=North Dakota Information Technology Department CA,OU=Orion Health Direct Secure Messaging,O=North Dakota Information Technology Department,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzE3MDUGA1UEChMuTm9ydGggRGFrb3RhIEluZm9ybWF0aW9uIFRlY2hub2xvZ3kgRGVwYXJ0bWVudDEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMTowOAYDVQQDEzFOb3J0aCBEYWtvdGEgSW5mb3JtYXRpb24gVGVjaG5vbG9neSBEZXBhcnRtZW50IENB","whitelist":false,"attachment":{"hash":"5f9cc0ce3c5d93329379d369ff1e0047e498fe1ffedc203f830e46ad0b803c71","size":2357,"filename":"e6QJ3uaxtddKrpwxGhdDIibY-LwCvEaQVA-SewcDHuw=.pem","location":"security-state-staging/intermediates/0decedaf-e893-43bf-8eb8-39ecf09e9125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e6QJ3uaxtddKrpwxGhdDIibY+LwCvEaQVA+SewcDHuw=","crlite_enrolled":false,"id":"7e063cdc-6733-4883-9098-251e456f3adc","last_modified":1562025343058},{"schema":1562025339315,"derHash":"lqB17d0HKQVakyquJYcPfR9c+eOQGn3CzY6RbMbisQs=","subject":"SERIALNUMBER=201807,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA3","whitelist":false,"attachment":{"hash":"7e4d7c6e3a95158f919f57bb217238677995616ec31959d9d20ad76ed10aa9a5","size":2333,"filename":"Via59R_X7HXx5CA2nQ7ywLT26zw0YGiYBhwVzUuDX_s=.pem","location":"security-state-staging/intermediates/9d6bef93-9690-4c8b-a6fb-c17565b52221.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Via59R/X7HXx5CA2nQ7ywLT26zw0YGiYBhwVzUuDX/s=","crlite_enrolled":false,"id":"35982461-e9d0-4e1e-aabe-25f6f5f51428","last_modified":1562025340065},{"schema":1562025337828,"derHash":"tc/msLKqhhoLNnwMBTlaU4rUk6nfARVEqO/EaH/bLMg=","subject":"CN=NQ-SK 2016,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MF8xCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzETMBEGA1UEAwwKTlEtU0sgMjAxNg==","whitelist":false,"attachment":{"hash":"b9044318369543a1b181fe0448d08b456293cdbd66d3eb0cf081c7c872466eb7","size":2272,"filename":"-_v9mzheDZaz7Hjj0hmoJAfy8SckawyPQ6Kx_01hio4=.pem","location":"security-state-staging/intermediates/376ae8a1-60ca-43e7-b0fb-7acb9896ba24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+/v9mzheDZaz7Hjj0hmoJAfy8SckawyPQ6Kx/01hio4=","crlite_enrolled":false,"id":"b2430e92-ecf6-470a-82d0-ee268da554fa","last_modified":1562025338559},{"schema":1562025337064,"derHash":"qlNFLViQaevZFCODT+woinisxqe51NDxQ9jJLguD2Ok=","subject":"CN=CERTSIGN FOR BANKING QUALIFIED DS PRODUCTION CA V3,OU=Certificat de productie Production certificate,O=certSIGN,C=RO","subjectDN":"MIGWMQswCQYDVQQGEwJSTzERMA8GA1UECgwIY2VydFNJR04xNzA1BgNVBAsMLkNlcnRpZmljYXQgZGUgcHJvZHVjdGllIFByb2R1Y3Rpb24gY2VydGlmaWNhdGUxOzA5BgNVBAMMMkNFUlRTSUdOIEZPUiBCQU5LSU5HIFFVQUxJRklFRCBEUyBQUk9EVUNUSU9OIENBIFYz","whitelist":false,"attachment":{"hash":"eaa0de7b4753356246d652e36cc56d60e8a923001719aa842e83a1fbfb036ca1","size":1683,"filename":"lgaybEWhquJ9CUpEl0ci8n7TT_mQu7ls6VLD9gC0u2g=.pem","location":"security-state-staging/intermediates/b16e7431-1a00-4dad-9c47-46be383bcfe4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lgaybEWhquJ9CUpEl0ci8n7TT/mQu7ls6VLD9gC0u2g=","crlite_enrolled":false,"id":"515bc65f-fec1-4f6b-98db-30c867438ca2","last_modified":1562025337821},{"schema":1562025334820,"derHash":"ZOshqAA2VUiOliDtwrIXy81VklPEU+c15VJwZpXOGHg=","subject":"CN=TrustID HID Enterprise CA 1,O=HID Global,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpISUQgR2xvYmFsMSQwIgYDVQQDExtUcnVzdElEIEhJRCBFbnRlcnByaXNlIENBIDE=","whitelist":false,"attachment":{"hash":"3675fee67c57748a850ca3d25b38e888d086b6e291f15e60fc5955aae4ebdbd8","size":2858,"filename":"cpBDVSnEXaonbErjbbQ5nxA8Mek-w3LsQ6tRL149lGg=.pem","location":"security-state-staging/intermediates/ac3b37a3-2818-4aa7-8d6c-957f5d5ddfd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cpBDVSnEXaonbErjbbQ5nxA8Mek+w3LsQ6tRL149lGg=","crlite_enrolled":false,"id":"536b01cb-8380-4de7-9d91-20f761c15500","last_modified":1562025335558},{"schema":1562025334072,"derHash":"S3M04diZmCK6+o/2iIElOJsYpOWrJv+mJMf2j9yB8Ms=","subject":"CN=GlobalSign CloudSSL CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIENsb3VkU1NMIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"2d52ef3ad1bf79d364b9204631f8b1fedcd6e4e13aadf92c4b6af52d751e96dd","size":1634,"filename":"-VZJxHgrOOiVyUxgMRbfoo-GIWrMKd4aellBBHtBcKg=.pem","location":"security-state-staging/intermediates/67867c84-32d8-4600-aa2f-a51493938ab0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+VZJxHgrOOiVyUxgMRbfoo+GIWrMKd4aellBBHtBcKg=","crlite_enrolled":true,"id":"8f1617bd-0e32-4828-b630-2a3c510a24ef","last_modified":1562025334812},{"schema":1562025333317,"derHash":"wSP1r6zJ+QloCYUDVeW/eMqTdzSBEbUWepZN3twETek=","subject":"CN=TERENA Personal CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGwxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEgMB4GA1UEAxMXVEVSRU5BIFBlcnNvbmFsIENBIDMgRzM=","whitelist":false,"attachment":{"hash":"d97fd351c70f4186ab1a1b6d07d4d7cd23c138d05ff6501f8793a7a457d714a0","size":1561,"filename":"YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=.pem","location":"security-state-staging/intermediates/465904a4-0fb5-43d2-a5c9-9857ba6ecc74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YT82u8O68j48N4ShltJlLRPwW9t8uCpdZikMmWEu9ro=","crlite_enrolled":false,"id":"834c434b-e007-4e04-818f-bd61ceb2e53a","last_modified":1562025334065},{"schema":1562025331082,"derHash":"j8HBdj9jF6sJBhxaeNTp1nAB7+Cnn+QFc7BIwG6yFlg=","subject":"CN=Thawte Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGFRoYXd0ZSBDbGFzcyAzIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"81ef8a4772629958118da223f884373db6f97ecd96c968ed91322150dc9cf583","size":1654,"filename":"YYguLfuEMtW11fy4mtQV_FlyFQDLr4EfWdDyGPSae9A=.pem","location":"security-state-staging/intermediates/47b2de9a-7c71-4e03-9275-544fee336f55.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YYguLfuEMtW11fy4mtQV/FlyFQDLr4EfWdDyGPSae9A=","crlite_enrolled":false,"id":"1e02fcc7-2993-47ca-940f-86653e3cecbe","last_modified":1562025331813},{"schema":1562025330338,"derHash":"fo+RQRm7EJDWIEkI5a4fQL4kwUkc19XPtqk2GMvAD9k=","subject":"CN=GlobalSign Partners TSA CA for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MFYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSwwKgYDVQQDEyNHbG9iYWxTaWduIFBhcnRuZXJzIFRTQSBDQSBmb3IgQUFUTA==","whitelist":false,"attachment":{"hash":"ac692c130dd61ad078ca128601e56417964e4f3c303740c7446aef653a0bf756","size":2036,"filename":"H92PKGXpuffyCKbwBGAY4e4XY990BbquJeNZ072shzw=.pem","location":"security-state-staging/intermediates/79bbb0c5-7608-426c-a235-c0262afa84a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H92PKGXpuffyCKbwBGAY4e4XY990BbquJeNZ072shzw=","crlite_enrolled":false,"id":"0471bdec-38ad-4b8d-86bd-3f137555792b","last_modified":1562025331074},{"schema":1562025329599,"derHash":"9AUHfHF0cDuXgceVRKe+mUJjhU0VFz5hqNGaKM96SrE=","subject":"CN=TERENA eScience Personal CA,O=TERENA,C=NL","subjectDN":"MEQxCzAJBgNVBAYTAk5MMQ8wDQYDVQQKEwZURVJFTkExJDAiBgNVBAMTG1RFUkVOQSBlU2NpZW5jZSBQZXJzb25hbCBDQQ==","whitelist":false,"attachment":{"hash":"0ff25cb8ace98409f31247ecb59b650b17e31d145ec2485517081e2ac1dfa4fb","size":1743,"filename":"rfAIoQEXwIYxHVXIaa2COA8XlDmE8FsumvzEWCU7MfU=.pem","location":"security-state-staging/intermediates/8dd56ca7-dc47-487f-bb0a-fde60bbeab18.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rfAIoQEXwIYxHVXIaa2COA8XlDmE8FsumvzEWCU7MfU=","crlite_enrolled":false,"id":"707787e0-3c77-41ba-a894-946cb1999932","last_modified":1562025330331},{"schema":1562025328112,"derHash":"ZuricJtUzdFpMXexMy/wNs3Q9yPbMDntMRVVpsv1/z4=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma Corporate Server II - 2015,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHTMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEuMCwGA1UEAwwlQ2FtZXJmaXJtYSBDb3Jwb3JhdGUgU2VydmVyIElJIC0gMjAxNQ==","whitelist":false,"attachment":{"hash":"df2d8a40bc28188df68d3c6579cec37ec903635f58cc869dcf759dfef7fa0eaf","size":3031,"filename":"m6nepCtxe9G9HhpXqQbCc7VSQX41KwYqD6LqFDqntKk=.pem","location":"security-state-staging/intermediates/4e0e9856-a536-495f-8223-f662f7a6e556.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m6nepCtxe9G9HhpXqQbCc7VSQX41KwYqD6LqFDqntKk=","crlite_enrolled":true,"id":"f3d9c664-5684-4d40-b74b-f45fc70887d8","last_modified":1562025328852},{"schema":1562025327350,"derHash":"sayM+xgbnJNU4Xdfy9/P54mMXMmhfXYxW1fBEu7lUjQ=","subject":"CN=Encryption Everywhere DV TLS CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"c75d6fc5179d7bb7baea5ffe48d9fda3810fdcb1340a3ca83e1e7b97a4af6478","size":1678,"filename":"gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX-qzRMqb9Xoa1w=.pem","location":"security-state-staging/intermediates/36b3d43a-f83c-40a5-af78-851b6283fd64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gxeKFFaZ2HFJIsTdTjEl6nVo3ckTCX+qzRMqb9Xoa1w=","crlite_enrolled":false,"id":"0d9d974c-bea1-4d7f-9958-e5dd76763236","last_modified":1562025328104},{"schema":1562025326608,"derHash":"AB14v0Ck2vlM1WS0IZRVg3sAVtMhayu4/3kZZrQbE24=","subject":"CN=Intel External Issuing CA 7A,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDdB","whitelist":false,"attachment":{"hash":"d813527cd54737fcfb5de10708464c3c058ae6b88a50b01c6d0f86657fd1e6ff","size":2588,"filename":"F1nC3g4x7xWb67o-xWeC3pUpqn2PqsssGrUzVFcrPlM=.pem","location":"security-state-staging/intermediates/5b73c6e2-ee41-4b2d-9a29-be9bf1eb744f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"F1nC3g4x7xWb67o+xWeC3pUpqn2PqsssGrUzVFcrPlM=","crlite_enrolled":false,"id":"d1150731-818c-4e50-9788-d789004759e5","last_modified":1562025327343},{"schema":1562025325869,"derHash":"hgm9zvleSk1CZJe1zY7UsAHJU6XBRHHKr1j7ZQ34q/A=","subject":"CN=Spirit AeroSystems SHA256 CA - G2,O=Spirit AeroSystems\\, Inc.,ST=KS,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJLUzEhMB8GA1UEChMYU3Bpcml0IEFlcm9TeXN0ZW1zLCBJbmMuMSowKAYDVQQDEyFTcGlyaXQgQWVyb1N5c3RlbXMgU0hBMjU2IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"2102b7e34260128aa8eddddcb68a23f8f43ef3852bbd09e6ddf31829ea3f4e94","size":1857,"filename":"-eZm38gBRNSIDBYrgLDj3YjRs2ABUSD5_ssqnCDgYlM=.pem","location":"security-state-staging/intermediates/45b38ccd-17b9-415e-a888-2b1631eceec9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+eZm38gBRNSIDBYrgLDj3YjRs2ABUSD5/ssqnCDgYlM=","crlite_enrolled":false,"id":"d0de06c4-5ab3-460f-8fcb-23b27889568f","last_modified":1562025326601},{"schema":1562025322865,"derHash":"CbwbE3wDEjnveIZz6U6xf18+yrB9Otv7SF51q/qvO5o=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"4827709bafd08a7e0584c4d4411937345e9fa8505ca1a15d2c4483e729c804a6","size":1626,"filename":"1kflsxIeB1bcxW1C61yFNdNQjO_xuF0ORdL9EtMe-Rs=.pem","location":"security-state-staging/intermediates/fdb62a70-c092-4d32-81b3-d72418696f57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1kflsxIeB1bcxW1C61yFNdNQjO/xuF0ORdL9EtMe+Rs=","crlite_enrolled":true,"id":"1c345873-cf2f-48aa-a6a3-93a5661939df","last_modified":1562025323597},{"schema":1562025322116,"derHash":"C8OTcHISi55bzDosak5VMe/T2W0wLByKDfVQ/geKCDo=","subject":"SERIALNUMBER=201915,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE1","whitelist":false,"attachment":{"hash":"3b8b7b4968d2d4a4042e69f27592e569862bdc2f143e41ebbe1a0c11736d81f0","size":2333,"filename":"kM1AzUSn_oORQFEI2x5nOsi3ZlZJxf6FjYmxYSu74Co=.pem","location":"security-state-staging/intermediates/66b03c59-a25d-40f2-8d5f-dae76d3270d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kM1AzUSn/oORQFEI2x5nOsi3ZlZJxf6FjYmxYSu74Co=","crlite_enrolled":false,"id":"5e3b9614-e826-466b-8b48-3c5f863463b1","last_modified":1562025322857},{"schema":1562025319082,"derHash":"Lkph5SOOVW6M7bzAtPPeIXgkVmSgvhlbOFW0yF297v8=","subject":"CN=USERTrust RSA Organization Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE/MD0GA1UEAxM2VVNFUlRydXN0IFJTQSBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"261660739939209c93938fbc278a1e17a758bea711e15624adbd1203f98c95d1","size":2178,"filename":"qmZOfgEUaNPh43JyVsa1dSCvAFxPKkxkytll6bY4_4E=.pem","location":"security-state-staging/intermediates/00deca06-8d9c-4815-b9cd-3365ade55c61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qmZOfgEUaNPh43JyVsa1dSCvAFxPKkxkytll6bY4/4E=","crlite_enrolled":true,"id":"f52a51f2-1d8f-4dee-b214-c65760473054","last_modified":1562025319823},{"schema":1562025318342,"derHash":"GJWNA6+0CWh6G8Jjhg0Nc1oloASrYODw5F1jM1h0N64=","subject":"CN=GoGetSSL Business Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGCMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLTArBgNVBAMMJEdvR2V0U1NMIEJ1c2luZXNzIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"bbda288904603261a16251c2a9b280cba6dabc71d51dcff1d3c4f6b0447c1a3b","size":1752,"filename":"WhJb1Rhj6-UXftVUkeVV5CiOZwfWF4gdskEVvyWpNxM=.pem","location":"security-state-staging/intermediates/1ce075cb-f977-4ccb-b47f-6aedf5a3162b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WhJb1Rhj6+UXftVUkeVV5CiOZwfWF4gdskEVvyWpNxM=","crlite_enrolled":false,"id":"bf5482ce-06f3-4976-a653-c8d2aced7246","last_modified":1562025319075},{"schema":1562025317595,"derHash":"lzpBJ2/9AeAnoqrUnjTDeEbT6Xb/amILZxLjODIEGqY=","subject":"CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\\, Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcy","whitelist":false,"attachment":{"hash":"a111efc20329e87b541cfc3e7f526fc54bb24624fddf210f4347b9fadfb1ab6b","size":1727,"filename":"8Rw90Ej3Ttt8RRkrg-WYDS9n7IS03bk5bjP_UXPtaY8=.pem","location":"security-state-staging/intermediates/a2a04dfe-6201-4d0a-b8cf-80d2975bfb51.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Rw90Ej3Ttt8RRkrg+WYDS9n7IS03bk5bjP/UXPtaY8=","crlite_enrolled":true,"id":"549c92e2-3738-4c8c-ae37-407e4e6158ce","last_modified":1562025318334},{"schema":1562025314617,"derHash":"eZ4gVk1FSE36DyjtcmA3/wcNZsUd6OI0MoTeyrD8mZE=","subject":"CN=Network Solutions EV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBFViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"e31f1427ec6db92529d090d990064b3f8fd08dc7b1f02e0b68d1ef7ff9e4505c","size":1857,"filename":"uY4iOhjFT5ZJncBPVcvV4Vp7MzDa5mJyEdEtzpD6i28=.pem","location":"security-state-staging/intermediates/397f2aa1-bd87-47da-b308-5ddefa3c9e3c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uY4iOhjFT5ZJncBPVcvV4Vp7MzDa5mJyEdEtzpD6i28=","crlite_enrolled":true,"id":"3b08d1c1-eaa3-447e-a837-aa1abd1be8a4","last_modified":1562025315352},{"schema":1562025313862,"derHash":"tf1vgAM09WUDawmZ+DELWwvXJoOV2LJnAFaXr3MBxeg=","subject":"CN=AffirmTrust Certificate Authority - OV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGCMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0FmZmlybVRydXN0IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIE9WMQ==","whitelist":false,"attachment":{"hash":"0444cfdbccd513e2a46e37f1768b21669333660cb0c9e2802b9e5041b414be02","size":1674,"filename":"RM5J-l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv-DsGM=.pem","location":"security-state-staging/intermediates/eb61a73a-5fdb-41c0-848b-e07b9e3a24e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RM5J+l4IeDRKjL4ZuWGG2Jt3Wae0v4pWKttrQv+DsGM=","crlite_enrolled":true,"id":"be2ceaf1-8ba0-4cab-bd2a-0cdb7f118523","last_modified":1562025314608},{"schema":1562025313115,"derHash":"x/VG8Mdsmg2pmS6YhOYki3yiu2reg4vXoDqMQe4qMGQ=","subject":"CN=WoSign OV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"048dba35914e23e206772fb60d80b4ca80d87cf337af50dd6dc2287381e3e76a","size":1691,"filename":"MZKD2c60FHEBoj-uZNlegylIGvCafu0tBZ2eUHao0-0=.pem","location":"security-state-staging/intermediates/b60c5c46-1be6-40b6-8d56-cd82c562287f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MZKD2c60FHEBoj+uZNlegylIGvCafu0tBZ2eUHao0+0=","crlite_enrolled":true,"id":"2a6ed91a-06ad-49ae-94d2-9fd509326fda","last_modified":1562025313853},{"schema":1562025310863,"derHash":"b1h9G+4vFhxPwuZiBT35z/7+URRM6SfTFD5KTDSLhWc=","subject":"CN=GENIOUS ECC Organization Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGVMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxPTA7BgNVBAMTNEdFTklPVVMgRUNDIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"a15ce7808aa99574fda608941c7b79aeebab97da5fdca6096ca97147951f3fab","size":1345,"filename":"9JEABMnN_SwMIz1lP1QSJXAr9u9DfOC_51G3sB_hgvg=.pem","location":"security-state-staging/intermediates/11e95b57-aa8c-455b-bf47-2ce89665585e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9JEABMnN/SwMIz1lP1QSJXAr9u9DfOC/51G3sB/hgvg=","crlite_enrolled":false,"id":"eba108e8-2131-4af1-aa97-148aa27d0bbd","last_modified":1562025311599},{"schema":1562025307101,"derHash":"jDhVsKoIU/ZTfHcnrEFqJHYcioE54n2B4Ssz67dzhdg=","subject":"SERIALNUMBER=201908,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA4","whitelist":false,"attachment":{"hash":"cccaf9299dbfe420f3015ef4d158c1965fe160e99937c153a0290d2f9bc45873","size":2333,"filename":"Yuh8cRCxqhDPCJCNLDTVXWmhSaBY8Jl6YlQFhDVMYrU=.pem","location":"security-state-staging/intermediates/261862b1-2bce-41b6-ad40-c999c0dfa834.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Yuh8cRCxqhDPCJCNLDTVXWmhSaBY8Jl6YlQFhDVMYrU=","crlite_enrolled":false,"id":"2f9d0c1d-b80d-43af-a476-95278b1e87b8","last_modified":1562025307842},{"schema":1562025305606,"derHash":"3QwL6c4JBB8Wty1rPWKluPU4Qn7BpC2DMa8bWd/mlEY=","subject":"CN=AffirmTrust Networking Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGKMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE2MDQGA1UEAwwtQWZmaXJtVHJ1c3QgTmV0d29ya2luZyBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"c7b2667e5d9802f3d9c42a37d05f6c68fba7119a56843956b872ec74a1115970","size":1581,"filename":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=.pem","location":"security-state-staging/intermediates/9050ab70-b46f-45d7-90b4-edff1e8b4d24.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DJdCClyMUYAHIPZVCPPJWty8pFkigRmSqua8RS8UJpk=","crlite_enrolled":false,"id":"4db21147-aaec-40a6-b50d-3790bbcfd4f4","last_modified":1562025306340},{"schema":1562025304867,"derHash":"450+2Iblo68mudarYIAovG+8UuWZyzI9p+nndbUwM3w=","subject":"CN=Amazon,OU=Server CA 0A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAwQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"a68a630350b255e6f2fc6123fbd732917d5259386f485d3136d80a777271ef2a","size":1666,"filename":"tYU57KoTkhzNuA0400h1_eZHHFoVnZvu8vpvmZg71hE=.pem","location":"security-state-staging/intermediates/ad29234d-055c-47ec-b5fb-78bb146b74e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tYU57KoTkhzNuA0400h1/eZHHFoVnZvu8vpvmZg71hE=","crlite_enrolled":false,"id":"e243a4ba-3208-4938-97f4-f4fe00c73c5e","last_modified":1562025305598},{"schema":1562025303361,"derHash":"43EPDGZ+WJ3o5K6jfnAa+vP7tidXYub+o/1mKVRCedY=","subject":"CN=Symantec Class 3 Organizational CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"a14b89bb2062f598bd836c642489dc372a04cf0bc46001ed6613adf12484de00","size":1849,"filename":"uNzZ9PuqZ750aAgYLpKabu6MjXW-QU_Qg4jjBcbvEik=.pem","location":"security-state-staging/intermediates/0eafa101-533d-4a28-a0f1-4d0fe9c795a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uNzZ9PuqZ750aAgYLpKabu6MjXW+QU/Qg4jjBcbvEik=","crlite_enrolled":false,"id":"4ad1dc4a-0a9b-4057-867a-1d1aaef8e793","last_modified":1562025304109},{"schema":1562025302614,"derHash":"3Bqx78ogg/4eptDT3Ep4edXMbT2j8KgelMhpnTqnyw4=","subject":"CN=Institute of Accelerating Systems and Applications Client CA R1,O=Institute of Accelerating Systems and Applications,L=Athens,C=GR","subjectDN":"MIGlMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMTswOQYDVQQKEzJJbnN0aXR1dGUgb2YgQWNjZWxlcmF0aW5nIFN5c3RlbXMgYW5kIEFwcGxpY2F0aW9uczFIMEYGA1UEAxM/SW5zdGl0dXRlIG9mIEFjY2VsZXJhdGluZyBTeXN0ZW1zIGFuZCBBcHBsaWNhdGlvbnMgQ2xpZW50IENBIFIx","whitelist":false,"attachment":{"hash":"3c6264fd3d686bf2adb8496b232e035774c7efe61bb19a690633eaeb3995552c","size":2621,"filename":"IhXE146qQEkPE3NDCXQL_XCLpRiVTVuOAnKEHxg0A3w=.pem","location":"security-state-staging/intermediates/a6fe91af-3457-4d40-97b4-e7ac3e0bf68a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IhXE146qQEkPE3NDCXQL/XCLpRiVTVuOAnKEHxg0A3w=","crlite_enrolled":false,"id":"c10c0ae5-e174-4d1e-8333-c111ab28da33","last_modified":1562025303351},{"schema":1562025298880,"derHash":"rftaDyWTCRIrzR8DAmAHmIJRclX1s40z+Nq5c8tg4LY=","subject":"CN=FujiSSL ECC Domain Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHQxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKjAoBgNVBAMTIUZ1amlTU0wgRUNDIERvbWFpbiBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"a956c6214bc00a3983c1ec59a5c5b4fef7452a3a94862da4f2b186ac1f059736","size":1297,"filename":"2rgbkrRXysWSf_k1kOj6EDKWKuKW-YVR38ExFhGbHac=.pem","location":"security-state-staging/intermediates/bfdd4e7d-8b03-4761-b3d1-ab4103ab8df3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2rgbkrRXysWSf/k1kOj6EDKWKuKW+YVR38ExFhGbHac=","crlite_enrolled":false,"id":"f1917f9a-0c69-4510-a86a-08ce3db84cf9","last_modified":1562025299610},{"schema":1562025295880,"derHash":"6QSgV9g5vL5jEJK0IV3YzE+ISbqHtRqvJyi3HmSs51E=","subject":"CN=DREAMHOST SECURE EMAIL CA,O=DREAMHOST CERTIFICATION AUTHORITY,C=US","subjectDN":"MF0xCzAJBgNVBAYTAlVTMSowKAYDVQQKEyFEUkVBTUhPU1QgQ0VSVElGSUNBVElPTiBBVVRIT1JJVFkxIjAgBgNVBAMTGURSRUFNSE9TVCBTRUNVUkUgRU1BSUwgQ0E=","whitelist":false,"attachment":{"hash":"bd46e6b3068ecccbabe7da0273be8a3d35a413fdfcca05bc18847e7402db16fa","size":1756,"filename":"63NWnCfq1JadpotgYBS_ORAIQ4nhhoHBm9FjkLxi1nA=.pem","location":"security-state-staging/intermediates/f2757c69-e3af-4940-ab12-328e5089e118.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"63NWnCfq1JadpotgYBS/ORAIQ4nhhoHBm9FjkLxi1nA=","crlite_enrolled":false,"id":"1c2b0263-fa38-44fa-be13-95992ca973b2","last_modified":1562025296626},{"schema":1562025295127,"derHash":"7WeTcIOwc58wI5b5dK+0G/umSEc5Z3gLLFm4isQSGtQ=","subject":"CN=Volusion\\, Inc. DV SSL CA - G4,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEc0","whitelist":false,"attachment":{"hash":"2345f19d6cfb45db379df441b2cdc6a5cfc3cb08f620d38c40c9b1efd1aae341","size":1642,"filename":"2vpFY_GsHi5tYScV5TkSw7SuQkJ1Qtyos25uI1C0Cok=.pem","location":"security-state-staging/intermediates/b12a2c62-5974-4e93-b3de-d12852b5fe03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2vpFY/GsHi5tYScV5TkSw7SuQkJ1Qtyos25uI1C0Cok=","crlite_enrolled":false,"id":"d468c55f-58fb-4439-a16d-69f3fafd2500","last_modified":1562025295872},{"schema":1562025292866,"derHash":"dK/O7OBzFYe0XDzae8IQ/JF1AqMjQB6TLoZbw9eX56s=","subject":"CN=Atos TrustedRoot Issuing CA for WWE 2015,O=Atos,C=DE","subjectDN":"ME8xMTAvBgNVBAMMKEF0b3MgVHJ1c3RlZFJvb3QgSXNzdWluZyBDQSBmb3IgV1dFIDIwMTUxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"0c5d1ea52b767af0853d6af41c73f1d188589a66e9c919e2858bc429241f4ffc","size":1573,"filename":"IA32tKC4ljNAfmi44SQR9xeWWNipPKjmUmjtzoT6pkY=.pem","location":"security-state-staging/intermediates/345d4a3f-ed22-4e47-af57-c4da221aa0cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IA32tKC4ljNAfmi44SQR9xeWWNipPKjmUmjtzoT6pkY=","crlite_enrolled":false,"id":"69330f6b-0bbf-4528-a402-c89b6262cce4","last_modified":1562025293606},{"schema":1562025292126,"derHash":"K/lNoe25VOkofJ5F4p/2ptKvuPiJDPJzO9dkEdV9vv4=","subject":"SERIALNUMBER=201402,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDI=","whitelist":false,"attachment":{"hash":"ae7283dfb872e87e5821a01f3bc4d8820099528e2f30c0e7e063e4d650afe62e","size":1402,"filename":"0EXmMnZ8pOr9XL2evHgo2vhHefnCt2aq-aHmDVgtjKU=.pem","location":"security-state-staging/intermediates/614d38fd-2482-4116-9af6-e749766cd34f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0EXmMnZ8pOr9XL2evHgo2vhHefnCt2aq+aHmDVgtjKU=","crlite_enrolled":false,"id":"f1f158d2-8546-42eb-9aba-1e797216092b","last_modified":1562025292859},{"schema":1562025291368,"derHash":"/ToPPdRIAJK21FBHPeuSAaCzCKiAeDOjxzj4oH64HtM=","subject":"CN=GlobalSign Qualified CA 2,O=GlobalSign nv-sa,C=BE","subjectDN":"MEwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlHbG9iYWxTaWduIFF1YWxpZmllZCBDQSAy","whitelist":false,"attachment":{"hash":"666808b17b5d5c0349aaa78a66212cf4825a5213929f0923b1a7e7ad57f22de8","size":2109,"filename":"6gTNFHlwskoXv_3BC7UG_CElyhyz-r3yoROD5FPGkK0=.pem","location":"security-state-staging/intermediates/adcf2001-8f21-4761-be6c-9e62f61e8388.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6gTNFHlwskoXv/3BC7UG/CElyhyz+r3yoROD5FPGkK0=","crlite_enrolled":false,"id":"e1f44dc0-1060-4ef8-9484-d4260f68e10d","last_modified":1562025292119},{"schema":1562025290627,"derHash":"K97vpzX/cAXf6C5mZBdy2CXno2GbvKyxPP4gEGYOPZ0=","subject":"CN=FujiSSL ECC Business Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHYxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xLDAqBgNVBAMTI0Z1amlTU0wgRUNDIEJ1c2luZXNzIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"a386eaf0d14a248038d2dbe1176d0e3ce1059635e00d20a970a14c70e2aea71e","size":1301,"filename":"VSIhlyLVTq0piI3j7ajNA5ZmdmgumlgTW-MV_okesCc=.pem","location":"security-state-staging/intermediates/931dec64-f845-46f7-8d31-c72027306d9c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VSIhlyLVTq0piI3j7ajNA5ZmdmgumlgTW+MV/okesCc=","crlite_enrolled":false,"id":"5e423d91-6fa8-4e19-9256-bcceaf49c94a","last_modified":1562025291360},{"schema":1562025287648,"derHash":"f2iJ/+iwIEXiysmaLy7k9MLu0kk0tlIYctNL+BJnHEs=","subject":"CN=Oracle SSL CA,OU=VeriSign Trust Network+OU=Class 3 MPKI Secure Server CA,O=Oracle Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEbMBkGA1UEChMST3JhY2xlIENvcnBvcmF0aW9uMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMSYwJAYDVQQLEx1DbGFzcyAzIE1QS0kgU2VjdXJlIFNlcnZlciBDQTEWMBQGA1UEAxMNT3JhY2xlIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"7ee4ae6d41d1ebeeccf162c75257607ac06eccb9355c405dd9feb4a7974e24a3","size":1760,"filename":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=.pem","location":"security-state-staging/intermediates/78a7a038-46d1-4bda-b8d6-a3b6d6b8054b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jAlQJcRUeMgTS65SuJLkC6qE2B093mGImtHccMYGG44=","crlite_enrolled":false,"id":"87511250-6e4a-46a5-b783-2c8da9c8699a","last_modified":1562025288390},{"schema":1562025285415,"derHash":"Ut/XNdStpK6sstd5aPlxEUP7DDxag7UKxN65h6h45Qk=","subject":"CN=USERTrust ECC Client Authentication and Secure Email CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGaMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazFAMD4GA1UEAxM3VVNFUlRydXN0IEVDQyBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"502ff44158f951d41a26530bc84cf7795c28a1df29c855cfcef1ccac9b79ffea","size":1329,"filename":"vjKVj54qS0DDdeD0OJ1UYEfRr3NvN4Z5QRmAX66bxB8=.pem","location":"security-state-staging/intermediates/fceaa33d-3b3c-40c0-9a8f-8de7dc41a6c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vjKVj54qS0DDdeD0OJ1UYEfRr3NvN4Z5QRmAX66bxB8=","crlite_enrolled":false,"id":"de9349f5-db91-4241-8540-d0370d7c4de3","last_modified":1562025286167},{"schema":1562025284669,"derHash":"OZfHIYk7OSbTk4oxHKB6Jhsq4i4B3Fh/GB3/FbmLTqY=","subject":"CN=TrustAsia Technologies\\, Inc. DV SSL CA - G1,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGJMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxNDAyBgNVBAMTK1RydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4gRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"11872ef0761a794cdfd0a48bdcaf7cd23daea461861f20c6fd25fe349bf445b0","size":1934,"filename":"OOzymZtqtOUPeO7RggB8hPhhnT-cN00YxTIniP-3dbM=.pem","location":"security-state-staging/intermediates/2198bb6c-f4f0-49d8-a771-38b6a5d3d95f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OOzymZtqtOUPeO7RggB8hPhhnT+cN00YxTIniP+3dbM=","crlite_enrolled":false,"id":"990db375-32be-4512-98dd-189df3712cf5","last_modified":1562025285408},{"schema":1562025283917,"derHash":"+jl96NtvEQp/o00QG6yKkUdQ9TsCI6i9L7gS51cVXCA=","subject":"CN=SwissSign Personal Silver CA 2008 - G2,O=SwissSign AG,C=CH","subjectDN":"MFUxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLzAtBgNVBAMTJlN3aXNzU2lnbiBQZXJzb25hbCBTaWx2ZXIgQ0EgMjAwOCAtIEcy","whitelist":false,"attachment":{"hash":"c1c9d52213575e65ceed56f35a6ed33a249d8d1c3a280659df44920339ef7ffe","size":2280,"filename":"jyhVT5llCBR7-xwGoq2SlKQcMasWHqmouxTYUO1Fhiw=.pem","location":"security-state-staging/intermediates/ea4ea5bd-3a75-4cd2-a235-c3e8ef18c8c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jyhVT5llCBR7+xwGoq2SlKQcMasWHqmouxTYUO1Fhiw=","crlite_enrolled":false,"id":"4f348dc6-e98b-4a77-a839-d0327398fe7f","last_modified":1562025284661},{"schema":1562025283171,"derHash":"U8Ra7/0YwhQHTBmDD/T1u0+g9sQkUIt7wEMhZThoXlo=","subject":"SERIALNUMBER=201805,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA1","whitelist":false,"attachment":{"hash":"e34007490624a17574e785aa940bb4a087283cee6f3c794ed80db3caecae05b0","size":2333,"filename":"ioQjHVX2Sgc0RK99U3WoHL7qOrrxLgG4Vk0NB28dfkU=.pem","location":"security-state-staging/intermediates/e1e9dbef-94d9-4968-b370-92830e644fe3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ioQjHVX2Sgc0RK99U3WoHL7qOrrxLgG4Vk0NB28dfkU=","crlite_enrolled":false,"id":"c1417a0b-e2ff-4c67-bbcb-92f31268a84c","last_modified":1562025283909},{"schema":1562025282408,"derHash":"fjI2jiSizEjT0p6IOyYOQM7aIq+XGJx4/FuShITpoBA=","subject":"CN=COMODO ECC Domain Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE2MDQGA1UEAxMtQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"abc0795848f66d2488b81a62506ef09e4d6d926185ae30b0ab7290d81e4c61f4","size":1313,"filename":"EohwrK1N7rr3bRQphPj4j2cel-B2d0NNbM9PWHNDXpM=.pem","location":"security-state-staging/intermediates/6f4d4854-993d-42ab-936d-589d8c7fd633.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EohwrK1N7rr3bRQphPj4j2cel+B2d0NNbM9PWHNDXpM=","crlite_enrolled":true,"id":"693849c2-1989-4277-9217-80926c45cb4f","last_modified":1562025283163},{"schema":1562025280120,"derHash":"M8+wYs0pUeTdGiVr7RVr6lPykNA53u+4W+leGQEhajY=","subject":"CN=Trustico RSA DV CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MG4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxGzAZBgNVBAMTElRydXN0aWNvIFJTQSBEViBDQQ==","whitelist":false,"attachment":{"hash":"02328d098993eca5c1b5bf2cc236d3f542a361cb3ed4b2e31d3d3ae57be6d2d2","size":2113,"filename":"B_bkhTDI5DJw6nXXzz0RfEQettWUxxESQlnc8VMZ4uk=.pem","location":"security-state-staging/intermediates/087c9b71-a0a9-4909-9e5f-c7b1e4f77ee3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B/bkhTDI5DJw6nXXzz0RfEQettWUxxESQlnc8VMZ4uk=","crlite_enrolled":true,"id":"7e702c67-68fb-441f-a66f-cf0a09acdafd","last_modified":1562025280864},{"schema":1562025279350,"derHash":"dNmS05ELz340uLXNKPkerrT0Hz2mOU14uMQ2ctQ/Tw8=","subject":"CN=ESTEID-SK 2015,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGMxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEXMBUGA1UEAwwORVNURUlELVNLIDIwMTU=","whitelist":false,"attachment":{"hash":"e79288e6283a6cf8e401f46b989c7aba65f6bce135c24772fae33f54a7339c1e","size":2292,"filename":"cl4xfKuRdlBntQEBobDSd3nPt8GamO_lYQLJgp-QIK8=.pem","location":"security-state-staging/intermediates/3e90d73f-3a85-419c-8bab-c12f148d4549.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cl4xfKuRdlBntQEBobDSd3nPt8GamO/lYQLJgp+QIK8=","crlite_enrolled":false,"id":"d4fae966-1bfe-4fcc-858e-bd9b0868c507","last_modified":1562025280113},{"schema":1562025278609,"derHash":"g/yJGzUNng1+vm3Spr/j0LD0ZT/KBIYVpd7rvAOaP2Y=","subject":"CN=GlobalSign AATL Partners CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEFBVEwgUGFydG5lcnMgQ0EgMjAxOQ==","whitelist":false,"attachment":{"hash":"d000e3224251910e8fb77335b40609ff5b3d0205b628feaf700f6e228504357a","size":2320,"filename":"lhJQC7F2rtgQWIaZBt4zOXO4E9P82bsb47uEijI-pcM=.pem","location":"security-state-staging/intermediates/9525d4df-8f6a-4b8f-b69e-ce869574f13c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lhJQC7F2rtgQWIaZBt4zOXO4E9P82bsb47uEijI+pcM=","crlite_enrolled":false,"id":"643f92c8-d792-43c2-a342-b580ba9e0749","last_modified":1562025279342},{"schema":1562025277127,"derHash":"wSRamgOcxRG8+zpQvh2JqYmTNDHyXA+WZbqXf5T4dsE=","subject":"CN=TeliaSonera Mobile ID CA v2,O=TeliaSonera Finland Oyj,C=FI","subjectDN":"MFUxCzAJBgNVBAYTAkZJMSAwHgYDVQQKDBdUZWxpYVNvbmVyYSBGaW5sYW5kIE95ajEkMCIGA1UEAwwbVGVsaWFTb25lcmEgTW9iaWxlIElEIENBIHYy","whitelist":false,"attachment":{"hash":"eaf431cf6c23f62a0ea543c5ad0adc1419e73f94ab2cab3d87029b9c730e91b4","size":2418,"filename":"cDMfyugvFsXyMurrO5J9HB6avAWXo9wMS1nT_8Mt7KA=.pem","location":"security-state-staging/intermediates/ada98906-2009-431a-ae1c-97f895b6b074.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cDMfyugvFsXyMurrO5J9HB6avAWXo9wMS1nT/8Mt7KA=","crlite_enrolled":false,"id":"10063ad2-f0b0-4c5f-96ba-842b66ad98f5","last_modified":1562025277858},{"schema":1562025276325,"derHash":"2eRFsixvyzeylvzRMxSGVpZRqNuYBxdT/vxz0sl79zI=","subject":"CN=Qualified KET e-Szigno CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHoxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJzAlBgNVBAMMHlF1YWxpZmllZCBLRVQgZS1Temlnbm8gQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"6b304876a14dedb4738c9754f4bc04eec54cc78cd3212181152603a8af2bcd15","size":2231,"filename":"oknJfA6HpIW3Guv29R8tlmS5hAgGjhhUfpBsZPu2Pds=.pem","location":"security-state-staging/intermediates/2563636d-ab39-462e-8e03-eeda6388ea2a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oknJfA6HpIW3Guv29R8tlmS5hAgGjhhUfpBsZPu2Pds=","crlite_enrolled":false,"id":"0a5a0741-ed12-460d-8ae6-94cb14567a42","last_modified":1562025277120},{"schema":1562025273330,"derHash":"TmKiUlkvnXH/4gN3V/hV1KAjXWY4vRBenvFwhs4rvCU=","subject":"CN=SECOM Passport for Web MH CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSUwIwYDVQQDExxTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIE1IIENB","whitelist":false,"attachment":{"hash":"4325c7065bb83e9d92f3718a9948fddc4a55dc191e11a5d9b3164c843c5def37","size":1670,"filename":"q9I-r-WPX4f6FsDftbkgFglISBQJtf5Dqt8hXHPa7-U=.pem","location":"security-state-staging/intermediates/4c0cdeb1-6b0a-4cc1-8425-c5d64b1a5c3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q9I+r+WPX4f6FsDftbkgFglISBQJtf5Dqt8hXHPa7+U=","crlite_enrolled":true,"id":"a48f8f7b-e4c4-4695-b74a-c002a3d4d4c9","last_modified":1562025274069},{"schema":1562025270327,"derHash":"JNBrln5wvIziH/yv0+tbaaTi4suvNruc1k6rzdFCPE4=","subject":"CN=Ericsson NL Individual CA v2,O=Ericsson","subjectDN":"MDoxETAPBgNVBAoMCEVyaWNzc29uMSUwIwYDVQQDDBxFcmljc3NvbiBOTCBJbmRpdmlkdWFsIENBIHYy","whitelist":false,"attachment":{"hash":"9bd44a9602e69344b4bafda91c3b4a8dd3d025582daf9faf359359dd39289296","size":2385,"filename":"w-D6Z-19kKBN5dh4sJv7cmEtM_38D_ZKyomDU56r6Gs=.pem","location":"security-state-staging/intermediates/0ae9ba0f-5da4-47f6-be43-46d84e790e1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w+D6Z+19kKBN5dh4sJv7cmEtM/38D/ZKyomDU56r6Gs=","crlite_enrolled":false,"id":"643acb4e-7965-4eb4-98eb-22787679daf9","last_modified":1562025271070},{"schema":1562025267327,"derHash":"nG0IkzIBQH+/KxJUC2fMDkyWZvEy4VBHYqcXy66PP9Y=","subject":"CN=HydrantID SSL ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBTU0wgSUNBIEcy","whitelist":false,"attachment":{"hash":"c4fbca9a15eb275e83118896e4839aba070abde056cf047aa1a57afdd78af927","size":2406,"filename":"400Fim9IQe4j-Gj-Ci4R44M3gA6J1_TRh8LlPSLF3I8=.pem","location":"security-state-staging/intermediates/a6966be8-fd40-411c-9f57-e4027bd92592.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"400Fim9IQe4j+Gj+Ci4R44M3gA6J1/TRh8LlPSLF3I8=","crlite_enrolled":true,"id":"c6e5ffe6-a302-4ac5-a6b6-3b6b960d5347","last_modified":1562025268059},{"schema":1562025265805,"derHash":"CCf2v9u/MOoP6s8be9Bu72XbJxrNfptdJpoPLzcrIek=","subject":"CN=EuropeanSSL Server CA 2,O=EUNETIC GmbH,L=Durmersheim,ST=Baden-W\u00fcrttemberg,C=DE","subjectDN":"MHkxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1Xw7xydHRlbWJlcmcxFDASBgNVBAcTC0R1cm1lcnNoZWltMRUwEwYDVQQKEwxFVU5FVElDIEdtYkgxIDAeBgNVBAMTF0V1cm9wZWFuU1NMIFNlcnZlciBDQSAy","whitelist":false,"attachment":{"hash":"09d22bba9126989782eb2682c0b1fab55cbf0dc7dc8b1afbd39bcf120f1c52fe","size":2142,"filename":"voGNYzoU7vT-Rbv9zjL5yL6Z294ZkClnxHkt0bjiTWM=.pem","location":"security-state-staging/intermediates/0e75900a-af17-4c88-b8e2-a11d13588bd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"voGNYzoU7vT+Rbv9zjL5yL6Z294ZkClnxHkt0bjiTWM=","crlite_enrolled":true,"id":"497678fd-cecb-41ae-8247-6870a5a994e1","last_modified":1562025266548},{"schema":1562025264327,"derHash":"aezbwxR/WB39y1Itne+yYLJnhK1JVcdOalJSLMxMRAg=","subject":"CN=Hongkong Post e-Cert SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MHoxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDErMCkGA1UEAxMiSG9uZ2tvbmcgUG9zdCBlLUNlcnQgU1NMIENBIDMgLSAxNw==","whitelist":false,"attachment":{"hash":"d819d0da20d45c8f93a0efb0d37fd86e274107134845bf5480d9b3697bb0711d","size":2093,"filename":"SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65_DY=.pem","location":"security-state-staging/intermediates/b1839acb-c26b-4d29-aa46-65f25e6250c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65/DY=","crlite_enrolled":true,"id":"4d1c3055-4469-4d11-a7a0-e646d9c6bd59","last_modified":1562025265062},{"schema":1562025263575,"derHash":"yrAWxeoyBhvQZf4TpVpA+mEFiyezSn+NF19xAe4GPjs=","subject":"CN=DigiCert Federated ID L1 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMSBDQQ==","whitelist":false,"attachment":{"hash":"7a2334ef63e735c7a9de8317fb1bbca56541bf3f0d2bd5aa7df6733294d35767","size":1845,"filename":"PUDyhbzncnmmUQ8SN4OwZj01ukzlqryo_kEquVWErUo=.pem","location":"security-state-staging/intermediates/ddd65303-64d3-475c-8530-62101b203d10.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PUDyhbzncnmmUQ8SN4OwZj01ukzlqryo/kEquVWErUo=","crlite_enrolled":false,"id":"97566edd-1d57-4cb3-8126-4a4c2b0482b8","last_modified":1562025264319},{"schema":1562025262823,"derHash":"F+9vtce+3y8P555xsbzMjYnnWgreFvVuo6qt3x0BLtg=","subject":"SERIALNUMBER=201818,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE4","whitelist":false,"attachment":{"hash":"1974a713335bdf0f88de6d1870fe48c4da9b47a0591e661657ce8e67bc14c9b4","size":2333,"filename":"Kb5-3Axv89fCYAIhhiEJWD0TJRRx0BZ7FLrkwQkAMBA=.pem","location":"security-state-staging/intermediates/dcc6ed3d-ff66-4c1a-97b7-b513478a0679.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kb5+3Axv89fCYAIhhiEJWD0TJRRx0BZ7FLrkwQkAMBA=","crlite_enrolled":false,"id":"8f13126f-ea09-4860-bb62-7c3995e356bf","last_modified":1562025263567},{"schema":1562025262072,"derHash":"/ciYbPrE818azVF+D2G4eYgq4HbiuoC3e9Pw/lzviGI=","subject":"CN=DigiCert ECC Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMzAxBgNVBAMTKkRpZ2lDZXJ0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"31ecd5e8057fdfa62dc602519feac045085c66fc65b202627b24662a21a6de2f","size":1414,"filename":"WOINGBsGlG95B7s_6U7XB_KM7U73y-sXgtLqZpn3G88=.pem","location":"security-state-staging/intermediates/60a912ac-30e3-4cf3-b9c7-b3c3a357755f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WOINGBsGlG95B7s/6U7XB/KM7U73y+sXgtLqZpn3G88=","crlite_enrolled":true,"id":"7ea2d3a5-3815-43a7-93ac-94921c661784","last_modified":1562025262816},{"schema":1562025261328,"derHash":"Sw0TktORVzUyB6ZMyxRoPd6dLO0ftYsW4Di+VwfCeBM=","subject":"CN=GlobalSign HV ECC DV SSL CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEhWIEVDQyBEViBTU0wgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"1acd32da9feed3e2e4ee157a2618013352d326fef642f7bfd585f8ae92c7d2ed","size":1163,"filename":"0fnBFUmy_VBjGa_Pg7kDaXRGAe4mSax_PZ77vht_SZk=.pem","location":"security-state-staging/intermediates/0463ef18-4ed8-456d-b684-8528412f482c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0fnBFUmy/VBjGa/Pg7kDaXRGAe4mSax/PZ77vht/SZk=","crlite_enrolled":false,"id":"8ada5368-0eb6-43b5-9561-ebab68b2417b","last_modified":1562025262065},{"schema":1562025258340,"derHash":"NFpS8WTfYTRjyHKIQmytJGurAoJFKU3b+mGMa7O+PDw=","subject":"CN=USERTrust ECC Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEmMCQGA1UEAxMdVVNFUlRydXN0IEVDQyBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"6d2fff64af8033e0034b6470f651280afccd50ced99453f4d67c9f2930b76ba3","size":1301,"filename":"0pKpvg7zRQ3q1ij8opewIS6KAUpC33v2uz9IDAj7Vm8=.pem","location":"security-state-staging/intermediates/0945ec2b-c44f-4f2b-a547-56c1007278dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0pKpvg7zRQ3q1ij8opewIS6KAUpC33v2uz9IDAj7Vm8=","crlite_enrolled":false,"id":"b8be43b3-c5c5-42cd-9032-02ad84857d12","last_modified":1562025259081},{"schema":1562025254563,"derHash":"EEUVQJRXCA2yCi6SH0e71q+nd1Wa272Xz8KtnXtBO2M=","subject":"CN=TERENA Personal CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGkxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEdMBsGA1UEAxMUVEVSRU5BIFBlcnNvbmFsIENBIDI=","whitelist":false,"attachment":{"hash":"ab5e9dc41345f4e069db5085e2e2163cca665a1acb76e2027588a96dfe55d4c1","size":2109,"filename":"lYumc4BVxXiIXDsLhm-7RneF4K3-Oq0Y7tWzE53jpdY=.pem","location":"security-state-staging/intermediates/f6cf20f8-9d99-4e75-86db-8ea4091ef3a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lYumc4BVxXiIXDsLhm+7RneF4K3+Oq0Y7tWzE53jpdY=","crlite_enrolled":false,"id":"e2f6d9c6-6f0b-4bc2-a31b-53a2c110e920","last_modified":1562025255321},{"schema":1562025253083,"derHash":"q0nGSsXSf5s2iMqAqjiSfxw3zRZZZBQIY/NDJ84FAiw=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma TSA - 2013,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIGrMQswCQYDVQQGEwJFUzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcTQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEeMBwGA1UEAxMVQ2FtZXJmaXJtYSBUU0EgLSAyMDEz","whitelist":false,"attachment":{"hash":"06bc7202aab2c07f1258303519c61f00bb59c17c80441fdb907ded166ba74a1b","size":2922,"filename":"EUdCx9qvs_LbJR4oy_CzU4P-rk_mcz-RAiT7758aSxE=.pem","location":"security-state-staging/intermediates/2ca3ac52-97ea-42f0-ac7f-0cceb0f6b524.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EUdCx9qvs/LbJR4oy/CzU4P+rk/mcz+RAiT7758aSxE=","crlite_enrolled":false,"id":"e582d41c-4c40-4138-8e0e-bab122025d20","last_modified":1562025253818},{"schema":1562025251569,"derHash":"CP1BixGIU0hP0bBm8ZIqgPVx2P/3Jo1Ziwht8YtYCtg=","subject":"CN=Atos TrustedRoot Server-CA 2019,O=Atos,C=DE","subjectDN":"MEYxKDAmBgNVBAMMH0F0b3MgVHJ1c3RlZFJvb3QgU2VydmVyLUNBIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"e9026c05fca12f79a992b5c8a7d90af2ccafac750d96e6d2a420590a55a54e3c","size":1922,"filename":"SD8O2olCwqFt3wL6_lvBiVzprjUyo7vWr7bIS3B3am8=.pem","location":"security-state-staging/intermediates/c310d05d-c0b0-4149-9d40-04e0f46a1fab.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SD8O2olCwqFt3wL6/lvBiVzprjUyo7vWr7bIS3B3am8=","crlite_enrolled":true,"id":"4f5ba09a-4228-4ae3-b9fb-e261273f7b68","last_modified":1562025252319},{"schema":1562025250085,"derHash":"YK+eXznYc7I2vhQrxwbaVxhJrtf65jX8WhRhoM90WcU=","subject":"CN=Qualified e-Szigno Organization CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGIMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExMDAuBgNVBAMMJ1F1YWxpZmllZCBlLVN6aWdubyBPcmdhbml6YXRpb24gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"dc2952bb2d73640240643f13334e8d01c2d9e778dde282b5c91837df5e8fae4e","size":2601,"filename":"WWpF25055wfjcZBv75P1HqErKnpSgGY5RThLltVZ-uo=.pem","location":"security-state-staging/intermediates/4a7927f3-053b-4fb2-b88a-f0952955b74b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WWpF25055wfjcZBv75P1HqErKnpSgGY5RThLltVZ+uo=","crlite_enrolled":false,"id":"e0a7a8fd-452f-48c1-a2d9-8dc311bf2cf1","last_modified":1562025250818},{"schema":1562025249333,"derHash":"N9IgpsdSJ5kCEZE0nBg/kXvhvoYmz5JrD9bgqGge4DE=","subject":"SERIALNUMBER=ZZZZZZAD,CN=Siemens Issuing CA EE Network Smartcard Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGxMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQUQxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTowOAYDVQQDDDFTaWVtZW5zIElzc3VpbmcgQ0EgRUUgTmV0d29yayBTbWFydGNhcmQgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"83492b707e3f19c0afa5426bfb86e053d1a36c3bb7f6b2a1fbbe180edc9522b1","size":2662,"filename":"ela416lvtgHOV0XkKFtPo_tjgfnex9VPmwFMF-IIdz4=.pem","location":"security-state-staging/intermediates/69464078-b92d-4ac6-a641-b03a66daeab5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ela416lvtgHOV0XkKFtPo/tjgfnex9VPmwFMF+IIdz4=","crlite_enrolled":false,"id":"ea3a7109-fc97-48d4-8817-07a2ab0f437f","last_modified":1562025250077},{"schema":1562025247810,"derHash":"LEkPUwE2ARY8fpunSHAYGYnaRwC9vK6ZrSFk6UKF+0E=","subject":"CN=MilleniumSign SSL Certificate CA ECC R2,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGJMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTAwLgYDVQQDDCdNaWxsZW5pdW1TaWduIFNTTCBDZXJ0aWZpY2F0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"388484e855dcfa09a1d7e93bed5665fdab3d7827d888db660bc23756917d5656","size":1402,"filename":"rZHx6oWsQ4M32pcJKskm--yrHi1znChiiNn-Hyx1h8M=.pem","location":"security-state-staging/intermediates/705ae7c2-bcc3-48a7-a342-3aa6bbff0d09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rZHx6oWsQ4M32pcJKskm++yrHi1znChiiNn+Hyx1h8M=","crlite_enrolled":false,"id":"50fb555a-6152-4dbe-945c-1397deedac59","last_modified":1562025248555},{"schema":1562025247064,"derHash":"yucvZtYa+5ppczjo9TWNgHG6+krk0nF8fmNftepD02U=","subject":"CN=CERTSIGN FOR BANKING SIMPLE SSL PRODUCTION CA V3,OU=Certificat de productie Production certificate,O=certSIGN,C=RO","subjectDN":"MIGUMQswCQYDVQQGEwJSTzERMA8GA1UECgwIY2VydFNJR04xNzA1BgNVBAsMLkNlcnRpZmljYXQgZGUgcHJvZHVjdGllIFByb2R1Y3Rpb24gY2VydGlmaWNhdGUxOTA3BgNVBAMMMENFUlRTSUdOIEZPUiBCQU5LSU5HIFNJTVBMRSBTU0wgUFJPRFVDVElPTiBDQSBWMw==","whitelist":false,"attachment":{"hash":"9c05002f5f1bd3a2e682040ad3ca45aa65b80fbea14f287d0b612d125aae2b87","size":1678,"filename":"dSEYX-UXMMv7WVy6VlLFnfcCjxt0nH-xwgRrYqDvmpA=.pem","location":"security-state-staging/intermediates/86434fba-a8fc-495a-9af1-290826501bfc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dSEYX+UXMMv7WVy6VlLFnfcCjxt0nH+xwgRrYqDvmpA=","crlite_enrolled":false,"id":"9a546d40-8e30-4cfa-b711-298337b46008","last_modified":1562025247802},{"schema":1562025246330,"derHash":"3apfcuEP060HKtLA0hlY2/FwnnrtE7OMJkco/OXJuh4=","subject":"CN=Academy of Athens Client CA R1,O=Academy of Athens,L=Athens,C=GR","subjectDN":"MGMxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxGjAYBgNVBAoTEUFjYWRlbXkgb2YgQXRoZW5zMScwJQYDVQQDEx5BY2FkZW15IG9mIEF0aGVucyBDbGllbnQgQ0EgUjE=","whitelist":false,"attachment":{"hash":"738c602f730b5e939f0962cda747abb3d84044de87505427faa5ed30e21e2ffc","size":2507,"filename":"E3sk6OwcCzO2DS5RQD94etvklmoU-SzyHf0OMzBriOs=.pem","location":"security-state-staging/intermediates/0e543b1f-c433-4a49-9b06-a28052d1a2d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E3sk6OwcCzO2DS5RQD94etvklmoU+SzyHf0OMzBriOs=","crlite_enrolled":false,"id":"83b9cbcd-5447-49b5-9b7b-1016057c6718","last_modified":1562025247057},{"schema":1562025245561,"derHash":"qyicYDV+1pBQ3F6ZlX8xZMyc+so7Q+IMsVGYnXbjIBk=","subject":"CN=GoGetSSL RSA Codesigning CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MFUxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEkMCIGA1UEAxMbR29HZXRTU0wgUlNBIENvZGVzaWduaW5nIENB","whitelist":false,"attachment":{"hash":"56b2b32dff5d71ed02e3e1749067d61d2a4a19ce62f7b78032a17588c7de239f","size":2068,"filename":"OlrioTffYEv0uD6tvV0JN2CtnQFZNo8zTIfkc_7jV4k=.pem","location":"security-state-staging/intermediates/6ff3a14d-3bfb-4b39-a5de-5a8dd144f7d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OlrioTffYEv0uD6tvV0JN2CtnQFZNo8zTIfkc/7jV4k=","crlite_enrolled":false,"id":"0da20e8d-2bbd-4b52-a722-8736b486c6f2","last_modified":1562025246322},{"schema":1562025244064,"derHash":"Ns3MfI84P3SFZYRm/ZUOdT/LAZ4lD9G8GgbFmB2KQYg=","subject":"CN=InterCloud SSL Certificate CA ECC R2,O=InterCloud Ventures Inc,L=Victoria,ST=Mah\u00e9,C=SC","subjectDN":"MIGBMQswCQYDVQQGEwJTQzEOMAwGA1UECAwFTWFow6kxETAPBgNVBAcMCFZpY3RvcmlhMSAwHgYDVQQKDBdJbnRlckNsb3VkIFZlbnR1cmVzIEluYzEtMCsGA1UEAwwkSW50ZXJDbG91ZCBTU0wgQ2VydGlmaWNhdGUgQ0EgRUNDIFIy","whitelist":false,"attachment":{"hash":"2cd63ff457b9092043714375c47ef5c79b689924fd883a1846c0ee4e9a49871d","size":1288,"filename":"YZPwIxnplYZBGJ6aDvGcMHWqSiLPmhSwJq2dfNdJpTs=.pem","location":"security-state-staging/intermediates/08672d16-76ef-46ff-aa4a-125020548103.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZPwIxnplYZBGJ6aDvGcMHWqSiLPmhSwJq2dfNdJpTs=","crlite_enrolled":false,"id":"9c2507f9-b425-4085-9b3c-64ab602d5412","last_modified":1562025244801},{"schema":1562025239559,"derHash":"fPdfAGzP+Now1uoqL3xQ0ER6olE/9KSje/KSRwu6jIU=","subject":"CN=FujiSSL Public Certification Authority - G1,O=Nijimo\\, Inc.,C=JP","subjectDN":"MFoxCzAJBgNVBAYTAkpQMRUwEwYDVQQKEwxOaWppbW8sIEluYy4xNDAyBgNVBAMTK0Z1amlTU0wgUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"cbb38aed230419e776913b69c50f5489e2883ea7de0a1c182db31c687d9a5917","size":1626,"filename":"QrPwZsEgVVVbnQwEikJnQTnAiO0XvqNOi9gKQj7Xt4Q=.pem","location":"security-state-staging/intermediates/4c7aeb8b-1028-40e6-ae83-98ccf972fed1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QrPwZsEgVVVbnQwEikJnQTnAiO0XvqNOi9gKQj7Xt4Q=","crlite_enrolled":true,"id":"fd898cc0-617c-40fc-bcda-7dbae1c4d2f6","last_modified":1562025240312},{"schema":1562025237334,"derHash":"YvT7eFosKeEJ3xAx70hMJERrkkoHQATp44PKZH+OsLo=","subject":"CN=Fuji Xerox Endorsement CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEsxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MScwJQYDVQQDEx5GdWppIFhlcm94IEVuZG9yc2VtZW50IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"0bb50bc4474c1ca0ef3bbc22a21bf0edf96e41de9c858df8b08a934e21799aa0","size":1492,"filename":"THZ4O6mY6jclidc9TcI2ggOB6Kjgqp1Yft1QUe3A3jU=.pem","location":"security-state-staging/intermediates/942e28d9-1950-44b5-bbd0-8cb87c3ac2ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"THZ4O6mY6jclidc9TcI2ggOB6Kjgqp1Yft1QUe3A3jU=","crlite_enrolled":false,"id":"b2054ca3-7428-4e5a-a9c9-22f757e254b3","last_modified":1562025238075},{"schema":1562025235807,"derHash":"eM28aqlcqlR0SDefjNOtAXIsrRwox80BbqMDIXi2+Q4=","subject":"CN=Trustico RSA Codesigning CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MHcxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxJDAiBgNVBAMTG1RydXN0aWNvIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"b39728ee3f57d600c272e6b0909784e9e2d5977b9e37926796e1b2fa95ed5211","size":2097,"filename":"Ug92Z2BWdjAeqBPInm_J2qZ7xpu0c9WPKfLenpi1D2E=.pem","location":"security-state-staging/intermediates/2b80c2a4-5245-46e5-b987-b293156a093f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ug92Z2BWdjAeqBPInm/J2qZ7xpu0c9WPKfLenpi1D2E=","crlite_enrolled":false,"id":"fd01dcdb-5d23-4b8b-a726-5631f3601fed","last_modified":1562025236542},{"schema":1562025235061,"derHash":"xCSF/f8jKRjjUqV58BiWUT/M1V8oe5lPL30MsaF9rvI=","subject":"SERIALNUMBER=201801,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAx","whitelist":false,"attachment":{"hash":"2e3e7c68603bc963d5ce38fcf7b7a0867d685fa12317d9ae8f34b7122733cd28","size":2333,"filename":"CLJidSOXyNp7QB-C-rgFknAe-a-PnfNwE0NWaNnWuhs=.pem","location":"security-state-staging/intermediates/663df175-b989-4842-abee-ef65aef3cdbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CLJidSOXyNp7QB+C+rgFknAe+a+PnfNwE0NWaNnWuhs=","crlite_enrolled":false,"id":"02d7902f-27a7-4d28-96ee-40819eabe73f","last_modified":1562025235799},{"schema":1562025234319,"derHash":"ic+8j7/3/gJrbPLqaIQZvei7wftFEynIZdbGy89r0Jc=","subject":"CN=Optioncare CA,OU=Orion Health Direct Secure Messaging,O=Optioncare,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpPcHRpb25jYXJlMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxFjAUBgNVBAMTDU9wdGlvbmNhcmUgQ0E=","whitelist":false,"attachment":{"hash":"c5ec747cb1ece7fc513e3ffe6733e3f68858c6fd41a0df7bb58477429286e633","size":2255,"filename":"1cowHAof9qXhiitFN7riBHrm51fUMtgurbQOt2XdQSg=.pem","location":"security-state-staging/intermediates/db238548-ddd1-4d86-9ce7-662bcca2a1a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1cowHAof9qXhiitFN7riBHrm51fUMtgurbQOt2XdQSg=","crlite_enrolled":false,"id":"6dfdcc6d-af98-4e9a-844c-6ebaa3d2567d","last_modified":1562025235053},{"schema":1562025233549,"derHash":"MAO/iFNCfHuRAj91OYU9mHxY3E4Ru+BH0qkwXAGmFSw=","subject":"CN=certSIGN Non-Repudiation CA Class 4 G2,OU=certSIGN Non-Repudiation CA Class 4 G2,O=certSIGN,C=RO","subjectDN":"MIGCMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLzAtBgNVBAsTJmNlcnRTSUdOIE5vbi1SZXB1ZGlhdGlvbiBDQSBDbGFzcyA0IEcyMS8wLQYDVQQDEyZjZXJ0U0lHTiBOb24tUmVwdWRpYXRpb24gQ0EgQ2xhc3MgNCBHMg==","whitelist":false,"attachment":{"hash":"bb516b77cbf95fd334340bb2777b602490882a3aa757c5d82da5214f34585cda","size":1654,"filename":"5z5YTIwg2yLkx8NYmJAGw7XsuJfhisYA72CTV71K7Tc=.pem","location":"security-state-staging/intermediates/052ceaa4-fdf0-40d7-8242-4aa8fcb41d3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5z5YTIwg2yLkx8NYmJAGw7XsuJfhisYA72CTV71K7Tc=","crlite_enrolled":false,"id":"0d31579b-64f1-4e30-bf5f-c484b7588ede","last_modified":1562025234312},{"schema":1562025232809,"derHash":"Q1bGYhulfb0NN3DWzJiEcS3zZEQMBb+diFmwqAbdd/M=","subject":"SERIALNUMBER=201401,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MDE=","whitelist":false,"attachment":{"hash":"839021b1de60208540a9123dea7576e3773b96d12a1357c006d16c4aa25c7596","size":1402,"filename":"uihwVCIO6RorncQNk_rHAVOp0_Y9MCzVk-hzMA_tgMY=.pem","location":"security-state-staging/intermediates/39a1490f-f91b-4254-bbf7-a7d0b9bff451.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uihwVCIO6RorncQNk/rHAVOp0/Y9MCzVk+hzMA/tgMY=","crlite_enrolled":false,"id":"ae0b7dd9-df0c-4681-9ebc-abcc95a6d27a","last_modified":1562025233541},{"schema":1562025231317,"derHash":"A0+AFHT5ncDUIOdhFXGK4fZpRzkycmc7k2H9teKJN/w=","subject":"SERIALNUMBER=201905,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDU=","whitelist":false,"attachment":{"hash":"b628ed8414cbc809f0141003c3ea00ee92d3457c7ed6f91d2953e53243f6cac2","size":2337,"filename":"Uw1jSWXDQtfEXIm3dx0aXt7NdGNEukGrjvGgZ8NxRGc=.pem","location":"security-state-staging/intermediates/d8ee1247-7d8f-4043-af7f-c7115e3531ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uw1jSWXDQtfEXIm3dx0aXt7NdGNEukGrjvGgZ8NxRGc=","crlite_enrolled":false,"id":"5acf219e-ab7d-4369-a193-be85c2a1505f","last_modified":1562025232055},{"schema":1562025229059,"derHash":"6sumyWWYtKQf1T1pq57Z+7sTgRVMRTRWcgwXT/5XbR0=","subject":"CN=ICPEdu,OU=Gerencia de Servicos (GSer),O=Rede Nacional de Ensino e Pesquisa - RNP,L=Rio de Janeiro,ST=Rio de Janeiro,C=BR","subjectDN":"MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNvcyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVzcXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdQ==","whitelist":false,"attachment":{"hash":"c399340277a2b92eeb636040d4463ee38fe895ba4563359367c2497d50c84824","size":1833,"filename":"m_Zke2f6Q6acou-ZOFg-8OdSCzint_5uosSYaFXE3EM=.pem","location":"security-state-staging/intermediates/df2eaa98-44e8-4093-9bfb-24b2af701dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m/Zke2f6Q6acou+ZOFg+8OdSCzint/5uosSYaFXE3EM=","crlite_enrolled":true,"id":"cca3b0f0-63dc-4374-bde8-b4fe6d44c0af","last_modified":1562025229802},{"schema":1562025226011,"derHash":"QVMi85cMjND1QxHg+TxfXDe6MFn9sQ9SQKwgk0cX+EA=","subject":"CN=Western Connecticut Health Network CA,OU=Orion Health Direct Secure Messaging,O=Western Connecticut Health Network,C=US","subjectDN":"MIGZMQswCQYDVQQGEwJVUzErMCkGA1UEChMiV2VzdGVybiBDb25uZWN0aWN1dCBIZWFsdGggTmV0d29yazEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMS4wLAYDVQQDEyVXZXN0ZXJuIENvbm5lY3RpY3V0IEhlYWx0aCBOZXR3b3JrIENB","whitelist":false,"attachment":{"hash":"ad34e17b2be6fc08447c7875e5f068cf3dd45d3ea5df594843ac89c847de456f","size":2341,"filename":"Iq5P_COu5eY2kCVZTJFfILRT5F6wWOLsVM192K5sD14=.pem","location":"security-state-staging/intermediates/d1e9c620-48f6-4c4a-bf6c-e4d32ec89be3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Iq5P/COu5eY2kCVZTJFfILRT5F6wWOLsVM192K5sD14=","crlite_enrolled":false,"id":"ebf707dd-ec7f-4c61-81fd-7b93ee38276a","last_modified":1562025226761},{"schema":1562025223722,"derHash":"yXeSPHceGmbJJaK29QFzLmeNyYh6/mv6rAOdHZpx8Ow=","subject":"CN=GlobalSign Timestamping CA - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3f735d53cbfc9c9cf464dca8c6fec3be339e6b3042e8ae4d78624f83a2135a3b","size":1475,"filename":"CB1u_HwQPTTVFNyruoDBDUle8-oPzUs0Sos_KZuLoSY=.pem","location":"security-state-staging/intermediates/bb2c1a75-d1fe-4b31-b963-c069bbd87014.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CB1u/HwQPTTVFNyruoDBDUle8+oPzUs0Sos/KZuLoSY=","crlite_enrolled":true,"id":"79f0cde1-be3d-490c-9393-5d6adae7c88b","last_modified":1562025224469},{"schema":1562025221473,"derHash":"wH6QN8uBAS0wRmEyhcFLY6AoSWSk9agh/DsY7N66CmY=","subject":"CN=Indian Health Service-RPMS DIRECT Messaging CA,OU=directihs.net,O=Indian Health Service,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVJbmRpYW4gSGVhbHRoIFNlcnZpY2UxFjAUBgNVBAsTDWRpcmVjdGlocy5uZXQxNzA1BgNVBAMTLkluZGlhbiBIZWFsdGggU2VydmljZS1SUE1TIERJUkVDVCBNZXNzYWdpbmcgQ0E=","whitelist":false,"attachment":{"hash":"cfcfe7b0a5865bb762fcc4c690048647d5174092a26326b321a32e470af9ee79","size":2215,"filename":"5eKTKcGalwhgde85C8DNZVC8RLow23EfZRE9nPGBklk=.pem","location":"security-state-staging/intermediates/19418a87-7f85-49d7-8d1b-48a0ab485687.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5eKTKcGalwhgde85C8DNZVC8RLow23EfZRE9nPGBklk=","crlite_enrolled":false,"id":"820a6f72-9c51-491b-855e-1305b0e08ad5","last_modified":1562025222211},{"schema":1562025220729,"derHash":"DDtpZy66vh+WyvPL5Zj3dHwB94AUr2URkZUNZz/ZF4Q=","subject":"CN=Trafigura PTE DocuSign CA,O=Trafigura PTE,C=SG","subjectDN":"MEkxCzAJBgNVBAYTAlNHMRYwFAYDVQQKEw1UcmFmaWd1cmEgUFRFMSIwIAYDVQQDExlUcmFmaWd1cmEgUFRFIERvY3VTaWduIENB","whitelist":false,"attachment":{"hash":"5760d5ba17953454835f4fb2e9c885e596eb48574236b7e06e685ecad224f48a","size":5420,"filename":"tY3lwWb8C3Hpe9A51N8X716yDkdDsNb-UNhyod7-RYs=.pem","location":"security-state-staging/intermediates/c927acb3-ab62-4b1f-b81c-a42d0a6faa7d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tY3lwWb8C3Hpe9A51N8X716yDkdDsNb+UNhyod7+RYs=","crlite_enrolled":false,"id":"fb955dbd-342c-4a10-9095-ad50f6ec1593","last_modified":1562025221465},{"schema":1562025216188,"derHash":"xCKrhsFynoifvK9c1z8hfgPCn+KsUCEvRRMH2RWGn0c=","subject":"CN=emSign ECC Time stamping CA - G3,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MHQxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMSkwJwYDVQQDEyBlbVNpZ24gRUNDIFRpbWUgc3RhbXBpbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"43563791245e66f7d04d4403f12dee8bbb8f7711661317ba5453f4c6e767bc3d","size":1183,"filename":"YoOJpTBtL_MN54SktLirvc0ScusOCm7NbSR29u1TcCo=.pem","location":"security-state-staging/intermediates/c327bd51-d114-4fdf-adb9-e757346beb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YoOJpTBtL/MN54SktLirvc0ScusOCm7NbSR29u1TcCo=","crlite_enrolled":false,"id":"0f491dc5-c66c-42dd-ad69-90150f1e3cfc","last_modified":1562025216956},{"schema":1562025213182,"derHash":"Sh/2u/SBFw07dzzsHzqE3jtQlldc2/iwhDIgkxjKD70=","subject":"CN=Amazon,OU=Server CA 1B,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQjEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"c0bc37b96bec8011b8d307eeca3d00c574601d10020be55221559de429641537","size":1544,"filename":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=.pem","location":"security-state-staging/intermediates/a7a30d9c-6953-4f41-8b0e-5c00269c7884.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JSMzqOOrtyOT1kmau6zKhgT676hGgczD5VMdRMyJZFA=","crlite_enrolled":true,"id":"5f8eb034-72cd-45a6-8a55-0c083afa34dd","last_modified":1562025213926},{"schema":1562025211675,"derHash":"RDyBWCZHEMC3aKgXDlm/H65AedK8OZOaefqDkXTtga4=","subject":"CN=SCHIEx Direct CA,OU=SCHIEx Direct Messaging,O=SCHIEx,ST=SC,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJTQzEPMA0GA1UEChMGU0NISUV4MSAwHgYDVQQLExdTQ0hJRXggRGlyZWN0IE1lc3NhZ2luZzEZMBcGA1UEAxMQU0NISUV4IERpcmVjdCBDQQ==","whitelist":false,"attachment":{"hash":"e1b38bc809d0be6e2f28dd9d87bf7af46bc55ec35074ec8a61ba5e97efc85679","size":2166,"filename":"lJMFEIPnHjQE1GKzbE6JzsSjl__N_NEFBDFqOtNsnjI=.pem","location":"security-state-staging/intermediates/69582fad-b5af-41e4-a398-1f36db772037.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lJMFEIPnHjQE1GKzbE6JzsSjl//N/NEFBDFqOtNsnjI=","crlite_enrolled":false,"id":"7551978d-4ce2-43d8-8b1a-c0b5d20b4978","last_modified":1562025212421},{"schema":1562025210934,"derHash":"9Rjwu3FlIfCib9tAwwT/m4L72+esvUa/DvI6GAGI61w=","subject":"CN=Apple Public Server RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"6dce70aef7f5bbcfc26a7b76bf285c6b1f15fd77bc1eb1294734cad5fb239722","size":1634,"filename":"GszFzuV0vZD9UeeCY9kvsItQltvQTZsjBfB9INf-GEk=.pem","location":"security-state-staging/intermediates/38288d50-1e5f-4fae-8d28-8249bf4ffc30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GszFzuV0vZD9UeeCY9kvsItQltvQTZsjBfB9INf+GEk=","crlite_enrolled":false,"id":"cc783f4c-70a8-49b7-b913-26b52dfbccbc","last_modified":1562025211668},{"schema":1562025209421,"derHash":"ubiFHCX2zDXUjhsrd+Pr8FftysmIWkF3rLWjlgRYJh4=","subject":"CN=COMODO/HP Secure Email CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH4xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSQwIgYDVQQDExtDT01PRE8vSFAgU2VjdXJlIEVtYWlsIENBIDI=","whitelist":false,"attachment":{"hash":"c2e03a2f920b43601df9788753597b0274b7e0641144be0fdf9aa2a4260f9f94","size":2129,"filename":"P0GLZRFPpkxNALwZ7Kj6O3PmIpBgliTbY_rTcBxfLB0=.pem","location":"security-state-staging/intermediates/18a8ce01-f094-4111-ab9e-0578a28dc363.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P0GLZRFPpkxNALwZ7Kj6O3PmIpBgliTbY/rTcBxfLB0=","crlite_enrolled":false,"id":"b4b7e711-5c6d-4248-b6b2-35bffa9748ae","last_modified":1562025210174},{"schema":1562025208671,"derHash":"+KplFlF7ONNQEltzHky6I6dQe/XN/T3vPbiRvR3C1Ak=","subject":"SERIALNUMBER=201811,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEx","whitelist":false,"attachment":{"hash":"5688ca317891d45d552cff0a5b80364d8be585ddc70976061e528244a5262255","size":2333,"filename":"-_BX4AN6l--82ldfEPa8Jt09pmz7zqnrp7P6A0cmnN8=.pem","location":"security-state-staging/intermediates/b549103e-cbc3-4b61-b560-80a0727877c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+/BX4AN6l++82ldfEPa8Jt09pmz7zqnrp7P6A0cmnN8=","crlite_enrolled":false,"id":"7303be73-95b7-47d9-9433-2c3c91042451","last_modified":1562025209413},{"schema":1562025203410,"derHash":"B/LOVcoapsuZJxmx5CPB0Cwep1mm4uq04VDIgoLiJVA=","subject":"CN=Certigna Services CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MH0xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBTZXJ2aWNlcyBDQQ==","whitelist":false,"attachment":{"hash":"daabfa439246bec01c439eeb12080417731f3b5fc130616edf23facbe1995d4b","size":2511,"filename":"Vvyvg4-bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB_uE=.pem","location":"security-state-staging/intermediates/eafb024c-95d9-45ad-af85-982024cc73e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vvyvg4+bOEbI6aO7K28ioVsUfckLqCSKqlIqZTEB/uE=","crlite_enrolled":true,"id":"42115fab-f048-4a66-92be-15d909da568b","last_modified":1562025204181},{"schema":1562025202667,"derHash":"myLn+gjT+MbW6fQg2PdWx5E15m0bLXCweQNyHwPb5bY=","subject":"CN=DOMENY SSL OV Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGEMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMS4wLAYDVQQDEyVET01FTlkgU1NMIE9WIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"6d124a8da18e0ea28bdde6bbae190816c6220594402c01c09264ca9940d4a150","size":2154,"filename":"y6RI9X1eeUkKidF2MrXM7RymKK9CUcax6TB8EJO15E4=.pem","location":"security-state-staging/intermediates/6219f215-f8b2-4671-94d1-1f28176da5df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y6RI9X1eeUkKidF2MrXM7RymKK9CUcax6TB8EJO15E4=","crlite_enrolled":true,"id":"ac25e523-d7a1-4700-87a8-f528654cc35b","last_modified":1562025203402},{"schema":1562025201928,"derHash":"MTH/29ln180dd3Qq+XcvEFH/TJrkE3WfQ0/h6BERngM=","subject":"CN=TrustOcean EV SSL CA - RSA - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=RSA Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gUlNBIC0gMjAxOQ==","whitelist":false,"attachment":{"hash":"bb57de69afc6d6f5f59b1c80758edf0ef1791b7a08530fed8903ef18cd25188e","size":2324,"filename":"uG18SfTnbrT8g2zCkpa7kWClIcTyqEW_1iPtChk9nTQ=.pem","location":"security-state-staging/intermediates/6020590f-b065-482b-9549-d56eb98c4b60.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uG18SfTnbrT8g2zCkpa7kWClIcTyqEW/1iPtChk9nTQ=","crlite_enrolled":true,"id":"12413a5f-6a98-4669-8438-f936d9b86ea3","last_modified":1562025202660},{"schema":1562025200417,"derHash":"sQhhc3s+ybEfphVNI5cP+y2r/Ciuamv1bD8yBCZiOa0=","subject":"CN=SECOM Passport for Member PUB CA4,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTQ=","whitelist":false,"attachment":{"hash":"100ce60a3bd64526f68ff84f5c51cf0fabb69da5d8bf4709a02d9b8381cf053e","size":1695,"filename":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=.pem","location":"security-state-staging/intermediates/5fe7d18d-a5f7-47cc-b17d-78176befba8d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e0UlwaDksSng0NsuhQLDMdL3HdRLRk89Csk7QJK7Xm4=","crlite_enrolled":true,"id":"43cd6bcc-8fa9-4afc-8ef7-d30357eb5641","last_modified":1562025201171},{"schema":1562025198927,"derHash":"SWlaXw9+9u32mBk9me1Iuq3iDqRXQDwRzq1JLEWGZdo=","subject":"CN=TWCA Global EVSSL Certification Authority,OU=Global EVSSL Sub-CA,O=TAIWAN-CA,C=TW","subjectDN":"MHMxCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExHDAaBgNVBAsTE0dsb2JhbCBFVlNTTCBTdWItQ0ExMjAwBgNVBAMTKVRXQ0EgR2xvYmFsIEVWU1NMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"4f777697d0c427439f9282b53a652b4a868074c5e1ae55a6dfe51dc32d19b817","size":1955,"filename":"3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp-TY=.pem","location":"security-state-staging/intermediates/d4e10b9c-0b97-413b-97b1-5b93a2c878a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp+TY=","crlite_enrolled":true,"id":"b7f1ffd4-4c9e-4762-a0b9-1a840835047b","last_modified":1562025199670},{"schema":1562025196669,"derHash":"Uu+YG6hbwFTFl/CcbKyxNLffl9Yf6u4lF/Tb2Cv47Mo=","subject":"OU=\u7d44\u7e54\u53ca\u5718\u9ad4\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"ME0xCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxKjAoBgNVBAsMIee1hOe5lOWPiuWcmOmrlOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"b85fc65fd55253ce8f8d9427e4bc632f8277e15047e0e4a7d1babca0069e73ab","size":1853,"filename":"b7VNMgYVBy0ME-PSGiNUKsoQ56R9SOLrQt2AlaXwxvc=.pem","location":"security-state-staging/intermediates/fbbe5d3f-d9db-41ad-bfb6-ba438ae13b11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b7VNMgYVBy0ME+PSGiNUKsoQ56R9SOLrQt2AlaXwxvc=","crlite_enrolled":false,"id":"62db3b82-de0b-4257-93e2-1261643f7872","last_modified":1562025197408},{"schema":1562025195931,"derHash":"YoSgO6+uhhow46JaAwQoMG9+tSvQuld6HZYqgJqDDJ4=","subject":"CN=NetLock Min\u0151s\u00edtett Eat. (Class Q Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG5MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFHMEUGA1UEAww+TmV0TG9jayBNaW7FkXPDrXRldHQgRWF0LiAoQ2xhc3MgUSBMZWdhbCkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"be44ba2f0e98d91976e0b376d14bfcfbf5e04990413aeb73457eb447f773a585","size":2203,"filename":"wbqAvjVExNzYgkWT-psQa7MDcYIscGSOYZa0cm5x83M=.pem","location":"security-state-staging/intermediates/602c1224-b665-4b69-848a-f07cbc00e0be.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbqAvjVExNzYgkWT+psQa7MDcYIscGSOYZa0cm5x83M=","crlite_enrolled":true,"id":"73e86e8a-47ad-4f60-be1d-64ed2011a0bb","last_modified":1562025196662},{"schema":1562025193661,"derHash":"rtXdmlM5aF37Ap9tiaFDNallEsPKzFKymUr4trN/pNI=","subject":"CN=GlobalSign Extended Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTgwNgYDVQQDEy9HbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBTSEEyNTYgLSBHMw==","whitelist":false,"attachment":{"hash":"bbc372d9ecdf9fa392a04587c4d036f042f3f09c6f0914cc81e10d9e8e8a3a02","size":1577,"filename":"86fLIetopQLDNxFZ0uMI66Xpl1pFgLlHHn9v6kT0i4I=.pem","location":"security-state-staging/intermediates/a42b26ca-6177-4156-b30c-df67c447df2e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"86fLIetopQLDNxFZ0uMI66Xpl1pFgLlHHn9v6kT0i4I=","crlite_enrolled":true,"id":"6faa42a8-09b8-46c4-9167-2568ddb696c8","last_modified":1562025194416},{"schema":1562025192919,"derHash":"boFQk3bJP7znlHLIQ6Vo6IPLXSPs7qgpmly+nFe87hw=","subject":"CN=Atos TrustedRoot Mailgateway CA 2019,O=Atos,C=DE","subjectDN":"MEsxLTArBgNVBAMMJEF0b3MgVHJ1c3RlZFJvb3QgTWFpbGdhdGV3YXkgQ0EgMjAxOTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"66f8b8a94ed51f0047bea1a83138cfd3a5d139f5c67d0a0513a6ffab9d53aa8d","size":1930,"filename":"EQQkSccU6u9HYRYQa9ZtgDlg8dInLePxpauqH5cu3yk=.pem","location":"security-state-staging/intermediates/1392833e-1a88-42fa-b9ee-58bdaea81a4e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EQQkSccU6u9HYRYQa9ZtgDlg8dInLePxpauqH5cu3yk=","crlite_enrolled":false,"id":"40af8905-ec8c-43f0-8c5c-3d64cbd00b59","last_modified":1562025193654},{"schema":1562025191421,"derHash":"BHIXdyBR0pIjjzNV9cVDXpuENkzNFD/En5wxzWBUOfA=","subject":"CN=TrustAsia Secure Email CA,OU=www.trustasia.com,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHQxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMRowGAYDVQQLExF3d3cudHJ1c3Rhc2lhLmNvbTEiMCAGA1UEAxMZVHJ1c3RBc2lhIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"d82324ec120fcf3fcfe7449f972f518f8bbf990131866eba4f7c7f561bcf6a0f","size":1699,"filename":"TjLSAwYTumO8ghSNmQQzwjA7CtZ3wO75cLt3bYVVIro=.pem","location":"security-state-staging/intermediates/d8683bc8-f975-48c3-94c9-f332895c7592.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TjLSAwYTumO8ghSNmQQzwjA7CtZ3wO75cLt3bYVVIro=","crlite_enrolled":false,"id":"28ed55e4-b148-4d29-9d8d-c9e528950d61","last_modified":1562025192172},{"schema":1562025186932,"derHash":"ecQJGwWxXBaDEot6NV4KrWLhu7w+Xzc1NwwGzE0a+0Q=","subject":"CN=CrossTrust OV CA5,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMRowGAYDVQQDExFDcm9zc1RydXN0IE9WIENBNQ==","whitelist":false,"attachment":{"hash":"bd3caa1f305a9f0b5a55466e00fb389199886a78055b526ee4a8fd5a2c317e51","size":1642,"filename":"9QmSs2TRmBuBXXpRPhom-2y54_RQ3KsK4te_JED6g0Q=.pem","location":"security-state-staging/intermediates/0cd79666-328f-4d26-a58d-65b8203303df.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9QmSs2TRmBuBXXpRPhom+2y54/RQ3KsK4te/JED6g0Q=","crlite_enrolled":true,"id":"b6b1d83f-6615-4c21-bf97-c5dba8c7d925","last_modified":1562025187668},{"schema":1562025186186,"derHash":"6u77CNVo5/bPbYksq2oi4U8gxvEOOkGM+0KxIwkzM2c=","subject":"CN=MHIN Direct CA,OU=www.mhin.com,O=Michiana Health Information Network,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMSwwKgYDVQQKEyNNaWNoaWFuYSBIZWFsdGggSW5mb3JtYXRpb24gTmV0d29yazEVMBMGA1UECxMMd3d3Lm1oaW4uY29tMRcwFQYDVQQDEw5NSElOIERpcmVjdCBDQQ==","whitelist":false,"attachment":{"hash":"623c45a2681ba34512932f4d0345ac733c2eff7148c61bfbd81939fd0dbde54a","size":2166,"filename":"yM7_IeYu7HtJ1cALcYpLZhIj1S7pQNxaHt7sIarSmPk=.pem","location":"security-state-staging/intermediates/d47781dd-8df0-46fb-ab8f-62555bc1bec2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yM7/IeYu7HtJ1cALcYpLZhIj1S7pQNxaHt7sIarSmPk=","crlite_enrolled":false,"id":"ee38fa45-bfe8-4470-8e7a-828569883e63","last_modified":1562025186923},{"schema":1562025183926,"derHash":"EmUF6SkzTMPHPugm5aThxK25DHEIBXWfbLaf+st2onY=","subject":"CN=Trust Provider B.V. RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEmMCQGA1UEAxMdVHJ1c3QgUHJvdmlkZXIgQi5WLiBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"e0afbf8c38e3854bdf1fa7f03733cec06fb616292b10ea38c79ba608c5a91db2","size":1695,"filename":"8zsd4iJkDVP9ORk6JvjRp3miQdmu0pE5mlQEcNsLlgw=.pem","location":"security-state-staging/intermediates/3af9fc7d-4e85-4eae-b097-00f4c9fcc597.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8zsd4iJkDVP9ORk6JvjRp3miQdmu0pE5mlQEcNsLlgw=","crlite_enrolled":false,"id":"b2561bcb-96c7-4c29-a072-a3ed78f089d7","last_modified":1562025184653},{"schema":1562025182429,"derHash":"zIW/mX0pKdOPwB6BIrMw+e++ONs789gBd9wSvVWQAsQ=","subject":"CN=XiPS CA2,O=XiPS,C=JP","subjectDN":"MC8xCzAJBgNVBAYTAkpQMQ0wCwYDVQQKEwRYaVBTMREwDwYDVQQDEwhYaVBTIENBMg==","whitelist":false,"attachment":{"hash":"5663f50d87b7c18b3c99b0b5ad1bf10363286a03fcb05ab9c0fb34760c55e21f","size":1561,"filename":"PaXj-eLR-CVXHDdDFA2h3HDdlslWT-0lS7xNjPnqusM=.pem","location":"security-state-staging/intermediates/ed9b6200-0079-4951-a12a-4ee37a29fadf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PaXj+eLR+CVXHDdDFA2h3HDdlslWT+0lS7xNjPnqusM=","crlite_enrolled":false,"id":"123b4df1-cf35-410b-bfd9-b8a9714c0056","last_modified":1562025183180},{"schema":1562025181676,"derHash":"P3hQJbzPrKRwGhc0zg97MM5BBpQsjZL0G3CwZ+1l01Q=","subject":"CN=KPN PKIoverheid Organisatie Persoon CA - G3,O=KPN Corporate Market B.V.,C=NL","subjectDN":"MGcxCzAJBgNVBAYTAk5MMSIwIAYDVQQKDBlLUE4gQ29ycG9yYXRlIE1hcmtldCBCLlYuMTQwMgYDVQQDDCtLUE4gUEtJb3ZlcmhlaWQgT3JnYW5pc2F0aWUgUGVyc29vbiBDQSAtIEcz","whitelist":false,"attachment":{"hash":"0e097c3463e82d7ba7f80fa33b0a12ba5995651fc226460fb6047bcb593fe4a7","size":2511,"filename":"z6o4qaIdcAF_cYD5IoV-HIyALNwwhBoQqpMK1NirbXg=.pem","location":"security-state-staging/intermediates/5becb1c9-6ed2-4cdd-bba9-0ecc641e7d12.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z6o4qaIdcAF/cYD5IoV+HIyALNwwhBoQqpMK1NirbXg=","crlite_enrolled":false,"id":"9324909c-8842-426a-9bd9-339ea000a9a5","last_modified":1562025182421},{"schema":1562025179816,"derHash":"ZP1/ZrgF7w+uCdrAbq0amrXCjm8krQdZmW00mYf+5+I=","subject":"CN=HERTZ SHA256 CA - G2,O=The HERTZ Corporation,ST=Florida,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRhMR4wHAYDVQQKExVUaGUgSEVSVFogQ29ycG9yYXRpb24xHTAbBgNVBAMTFEhFUlRaIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"e265e407a875697a7f656b762252ca51920bf962f795981ca45b3df5305744ad","size":1841,"filename":"0mE9i9waw6FU7T9jthzR6RWqVlYfOZWnDt__W7w0MbE=.pem","location":"security-state-staging/intermediates/b47806d4-9344-4686-991c-48d34375975f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0mE9i9waw6FU7T9jthzR6RWqVlYfOZWnDt//W7w0MbE=","crlite_enrolled":false,"id":"aac644a1-6f9b-40fb-899e-d6c96e2ef1dc","last_modified":1562025180912},{"schema":1562025176064,"derHash":"8SJB7jTAOmCNNNvA6kZeG9GqEwkVVPnU0IYlP/POg9Q=","subject":"CN=DC Government SHA2 EV Intermediate CA,OU=Office of the Chief Technology Officer,O=Government of the District of Columbia,C=US","subjectDN":"MIGfMQswCQYDVQQGEwJVUzEvMC0GA1UEChMmR292ZXJubWVudCBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExLzAtBgNVBAsTJk9mZmljZSBvZiB0aGUgQ2hpZWYgVGVjaG5vbG9neSBPZmZpY2VyMS4wLAYDVQQDEyVEQyBHb3Zlcm5tZW50IFNIQTIgRVYgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"14472d3dc922dcba7c834374f5b8121efcd08cab9d0778d052e329913bee403d","size":2073,"filename":"D6bVPPyHKUFV0WmvSS6nCMgaQId_SQKugGjOOT48QXE=.pem","location":"security-state-staging/intermediates/7e3f4ba8-098a-4f7e-a594-d98f5caa1fa9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D6bVPPyHKUFV0WmvSS6nCMgaQId/SQKugGjOOT48QXE=","crlite_enrolled":true,"id":"2316b3da-de73-40e0-8b36-7f2ad4206eec","last_modified":1562025176800},{"schema":1562025175329,"derHash":"Uc8P/8MlP8ATr3hvlbGQEJ+Mh/NN/RzsRMRYiHifU1U=","subject":"CN=GeoTrust DV SSL CA - G3,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"63a067013ea0d27be1b9a024be996607207d1aa923f90c6456d060fae4240284","size":1597,"filename":"l2yRLumd__mpm_WYi63mkNBZrNOpv-iqbuuqZHz2FZk=.pem","location":"security-state-staging/intermediates/ed2fd4a4-5cbc-463b-bc2a-b41bc797b801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l2yRLumd//mpm/WYi63mkNBZrNOpv+iqbuuqZHz2FZk=","crlite_enrolled":true,"id":"0fbfc5ef-c42c-4bdc-ad8a-b5c8aacf75c5","last_modified":1562025176056},{"schema":1562025173823,"derHash":"SC9pNhYtrE73dG5hz4HzVzwwip8M5rQatuLj+Jt59bo=","subject":"CN=MilleniumSign for ClientCert RSA,O=MilleniumSign Limited,C=MU","subjectDN":"MFgxCzAJBgNVBAYTAk1VMR4wHAYDVQQKDBVNaWxsZW5pdW1TaWduIExpbWl0ZWQxKTAnBgNVBAMMIE1pbGxlbml1bVNpZ24gZm9yIENsaWVudENlcnQgUlNB","whitelist":false,"attachment":{"hash":"222e53090c93ea7a3779daaa08cc08cf97e15f2266f97a6ad486be1ac818b4b2","size":2446,"filename":"7RR-mxCqu0zXAK2CPP57e8q0pE8ACz7Hfr7VCAPuMzs=.pem","location":"security-state-staging/intermediates/d35d4472-28b5-4102-be24-ddb035487984.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7RR+mxCqu0zXAK2CPP57e8q0pE8ACz7Hfr7VCAPuMzs=","crlite_enrolled":false,"id":"e8790135-766c-4bf9-83a4-b937fd0e2db0","last_modified":1562025174583},{"schema":1562025173067,"derHash":"kf3rUtQmUSC4Q7GV0bbNtc5hJRhlpFo+kg5hD92mYNM=","subject":"CN=DigiCert Federated ID L2 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMMiBDQQ==","whitelist":false,"attachment":{"hash":"730111e89089443c53b0d835562133c99ad97378a9c7763e7061ed7377bd59ae","size":1825,"filename":"uFgNVuVHMiQAV8MwYU1yjg_jHUWYZx_q2sWdfqJ0Pfo=.pem","location":"security-state-staging/intermediates/8c127577-0572-4da9-9b18-64d923f10edb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uFgNVuVHMiQAV8MwYU1yjg/jHUWYZx/q2sWdfqJ0Pfo=","crlite_enrolled":false,"id":"eaa80a7d-defb-4cf5-94e8-a99a54278063","last_modified":1562025173815},{"schema":1562025172327,"derHash":"9051Cl3PANXoUWimDJY+wq69yjrbApHTKB2PUhumo70=","subject":"CN=SSL.com Code Signing Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNDAyBgNVBAMMK1NTTC5jb20gQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"5addb3224fc91346ad8299e095d7d8bb81f96f9f55d9ed65dae3f496519b4909","size":1264,"filename":"i4YxhNKtWxupjB-UY-D9fvW_PWFEagq-NIqDjFBiMww=.pem","location":"security-state-staging/intermediates/5e0dbc1f-6963-4872-9057-16ae085e9dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i4YxhNKtWxupjB+UY+D9fvW/PWFEagq+NIqDjFBiMww=","crlite_enrolled":false,"id":"fe2dcca1-885e-4fd3-99b5-2ac3a3ac9bf6","last_modified":1562025173060},{"schema":1562025171561,"derHash":"kdp6XKYTSHUAiZTCUNrZIh8MXi1OPglz95Ydy9+3Q+w=","subject":"CN=Sectigo ECC Client Authentication and Secure Email CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxPjA8BgNVBAMTNVNlY3RpZ28gRUNDIENsaWVudCBBdXRoZW50aWNhdGlvbiBhbmQgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"77d9497e0c15f70b924892d7c86e086a085789309a6a79986df9aee018ada485","size":1325,"filename":"rYhp-cXTMtrastq0z_cB6bdqkXAleWeAfwJUCvBPVtw=.pem","location":"security-state-staging/intermediates/34a6b890-81a2-488f-a509-9e82908e5f74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rYhp+cXTMtrastq0z/cB6bdqkXAleWeAfwJUCvBPVtw=","crlite_enrolled":false,"id":"fa31210d-e75b-4ca0-a8d2-7401b0b5850f","last_modified":1562025172319},{"schema":1562025170804,"derHash":"Viy7y96+6zy1WUa9ziSMpKYj0rpud7Y7dU06Vx9n36I=","subject":"CN=Fraunhofer User CA - G02,OU=Fraunhofer Corporate PKI,O=Fraunhofer,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGMMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjETMBEGA1UECgwKRnJhdW5ob2ZlcjEhMB8GA1UECwwYRnJhdW5ob2ZlciBDb3Jwb3JhdGUgUEtJMSEwHwYDVQQDDBhGcmF1bmhvZmVyIFVzZXIgQ0EgLSBHMDI=","whitelist":false,"attachment":{"hash":"432002444ca45071e8819aab9fc1a1245de7b320fabca6185adea7a8e46ddb6f","size":2024,"filename":"tI25lyfua-OITC74D7J6Z7TyLi_ZfzDhng7frVgmB8Q=.pem","location":"security-state-staging/intermediates/50b461d3-a1bf-4841-8d0b-db184a8ef60c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tI25lyfua+OITC74D7J6Z7TyLi/ZfzDhng7frVgmB8Q=","crlite_enrolled":false,"id":"a40de547-e3aa-46b0-bb6e-12b28685b132","last_modified":1562025171553},{"schema":1562025168582,"derHash":"nmvF+ezFJGDo7cAsZE0b4cufIxb0Ha87YWoLIFgpSzE=","subject":"CN=Symantec Class 3 EV SSL CA - G3,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"608d82155649d760dc44ec6d53af4233429881ad64762476c94fdf570c9f572e","size":1853,"filename":"gMxWOrX4PMQesK9qFNbYBxjBfjUvlkn_vN1n-L9lE5E=.pem","location":"security-state-staging/intermediates/7e855262-9907-44b6-b613-7e7c05da23f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gMxWOrX4PMQesK9qFNbYBxjBfjUvlkn/vN1n+L9lE5E=","crlite_enrolled":true,"id":"01baeb08-779e-4097-bfb8-cb384ac992d8","last_modified":1562025169317},{"schema":1562025166063,"derHash":"4i5rJZCOEQemB68GDgsk5QxtlWL/BPRVvg+N9BpQMsA=","subject":"CN=SZAFIR Trusted CA2,O=Krajowa Izba Rozliczeniowa S.A.,C=PL","subjectDN":"MFQxCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRswGQYDVQQDDBJTWkFGSVIgVHJ1c3RlZCBDQTI=","whitelist":false,"attachment":{"hash":"b998d1830338d9ca1bada5e5e1a33ef3a5f89c9c13ccfa1b8ea7a2f3aea980a1","size":1825,"filename":"Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=.pem","location":"security-state-staging/intermediates/f9a9ee57-a010-4240-a6e4-f16037c4556f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ea2smccTC5mFDdTrs5gKD6HaYthL4lhPx97QmLgbFQc=","crlite_enrolled":true,"id":"acce9c9e-9a82-41d4-b3c0-5cd8eeaf7bef","last_modified":1562025166794},{"schema":1562025165326,"derHash":"eNycpfTCkT8/t0rFLf/80jANpady/CuExToudEN+3SA=","subject":"CN=STRATO SSL - G2,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzI=","whitelist":false,"attachment":{"hash":"97b250a9bb08b735bbb140ac1e4a20bfc87008a831c5820e8596eafb6230e542","size":1524,"filename":"sHuZJYYMcPPO0syUwdicHEjFhiXf8r_Bt_cMNeh2WcA=.pem","location":"security-state-staging/intermediates/19be972c-855b-4247-9a3f-930662fc00db.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHuZJYYMcPPO0syUwdicHEjFhiXf8r/Bt/cMNeh2WcA=","crlite_enrolled":false,"id":"01f90665-8998-4aa2-9af5-82d8cc7e756c","last_modified":1562025166055},{"schema":1562025162348,"derHash":"DOM6QnGx5Gz/tDLbg6T5xSYa+IvyRR2K75Ah9gsgvmU=","subject":"CN=Atos TrustedRoot Client-CA for equensWorldlinePartner 2019,O=Atos,C=DE","subjectDN":"MGExQzBBBgNVBAMMOkF0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50LUNBIGZvciBlcXVlbnNXb3JsZGxpbmVQYXJ0bmVyIDIwMTkxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"a0b74fdfcd60684e6ae62fd67423cdebb5cd9e677c08d4fd376a50429722dfac","size":1959,"filename":"iwM-2PVlSP6blr9vu-dLHZGkTj3xQhLSJ2vrN5miZ0Q=.pem","location":"security-state-staging/intermediates/06cc9ce9-20a6-4fd8-baf1-d9b6179addf9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iwM+2PVlSP6blr9vu+dLHZGkTj3xQhLSJ2vrN5miZ0Q=","crlite_enrolled":false,"id":"d9d8d521-dd27-47c2-b709-26ac9a7fd92a","last_modified":1562025163074},{"schema":1562025161609,"derHash":"jXxJnX/p7uwF2etC8D7+QCgHkZgD6ObNbB8r9e9qfY8=","subject":"CN=GeoTrust Code Signing CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHUdlb1RydXN0IENvZGUgU2lnbmluZyBDQSAtIEcy","whitelist":false,"attachment":{"hash":"249e928f4de591132364a871e84037a9815e30634a553077a2fe538b4236fdde","size":1796,"filename":"f8Aqq2cYQjeMInX4NF9BwX9DWyG90RZdekvgJeybb6E=.pem","location":"security-state-staging/intermediates/1193d8fc-a0a0-449e-813d-6f173f7abfcd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f8Aqq2cYQjeMInX4NF9BwX9DWyG90RZdekvgJeybb6E=","crlite_enrolled":false,"id":"436fecb6-3d28-4509-af27-78c80daf1fa7","last_modified":1562025162340},{"schema":1562025160859,"derHash":"rB7FVjGOPqcPjwTgOg8mM7/nOZI1moEBRf/fGkJzlu4=","subject":"CN=TeleSec ServerPass Class 2 CA,OU=T-Systems Trust Center,O=T-Systems International GmbH,POSTALCODE=57250,STREET=Untere Industriestr. 20,L=Netphen,ST=Nordrhein Westfalen,C=DE","subjectDN":"MIHfMQswCQYDVQQGEwJERTElMCMGA1UECgwcVC1TeXN0ZW1zIEludGVybmF0aW9uYWwgR21iSDEfMB0GA1UECwwWVC1TeXN0ZW1zIFRydXN0IENlbnRlcjEcMBoGA1UECAwTTm9yZHJoZWluIFdlc3RmYWxlbjEOMAwGA1UEEQwFNTcyNTAxEDAOBgNVBAcMB05ldHBoZW4xIDAeBgNVBAkMF1VudGVyZSBJbmR1c3RyaWVzdHIuIDIwMSYwJAYDVQQDDB1UZWxlU2VjIFNlcnZlclBhc3MgQ2xhc3MgMiBDQQ==","whitelist":false,"attachment":{"hash":"76978532a4380253c7bbfe0ea07b7f0f9f595824a78f411a83835514c3a8d76f","size":2052,"filename":"c3jf-L8VIAFQnJJDM6Mfb4MtI1JnhVS8JwZHMwJj28M=.pem","location":"security-state-staging/intermediates/54f348f3-2ed6-4b67-a108-3c418ed93826.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3jf+L8VIAFQnJJDM6Mfb4MtI1JnhVS8JwZHMwJj28M=","crlite_enrolled":true,"id":"b19a4517-16ee-477e-bdf2-a6c9a655f216","last_modified":1562025161601},{"schema":1562025160116,"derHash":"ApUjhC0j7zlfVynjUlIvgEJlhRgL02dowayt0i2Op9o=","subject":"CN=The University of Texas Health Science Center at Houston RSA CA,O=The University of Texas Health Science Center at Houston,L=Houston,ST=TX,C=US","subjectDN":"MIG5MQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xQTA/BgNVBAoTOFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIEhlYWx0aCBTY2llbmNlIENlbnRlciBhdCBIb3VzdG9uMUgwRgYDVQQDEz9UaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBIZWFsdGggU2NpZW5jZSBDZW50ZXIgYXQgSG91c3RvbiBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"14f00997a0e1aae935a7e964b272b85446ca14ca29a7f9a1a75c583f98a17633","size":2223,"filename":"X8zUA8bZTNKvwOf9_GKpmKtl4dD17EdNxWTm4nwRGgI=.pem","location":"security-state-staging/intermediates/2221c890-496b-4c16-b0bd-1ead2b97e050.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"X8zUA8bZTNKvwOf9/GKpmKtl4dD17EdNxWTm4nwRGgI=","crlite_enrolled":false,"id":"987637d9-0c2e-42f7-b676-b2e53c0955f0","last_modified":1562025160852},{"schema":1562025159345,"derHash":"I7o6l8WA3ywxZiTX+l92Y1gCYcsgSBQsc6PoaxE+sm0=","subject":"CN=Mass HIway CA,OU=Orion Health Direct Secure Messaging,O=Massachusetts Health Information Highway (Mass HIway),C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzE+MDwGA1UEChM1TWFzc2FjaHVzZXR0cyBIZWFsdGggSW5mb3JtYXRpb24gSGlnaHdheSAoTWFzcyBISXdheSkxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEWMBQGA1UEAxMNTWFzcyBISXdheSBDQQ==","whitelist":false,"attachment":{"hash":"71b0cd912fe6d5f87208dacb9ba968dcd735896e9970ece8e45dd1ecf0cc4d6e","size":2239,"filename":"PVEW06JTRRwMsNF9P6Oq0ePQfB7-eaqQtzqjaUZbq3Y=.pem","location":"security-state-staging/intermediates/9410489c-fa40-4eaa-8d3b-da65e27f51ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PVEW06JTRRwMsNF9P6Oq0ePQfB7+eaqQtzqjaUZbq3Y=","crlite_enrolled":false,"id":"07055610-8ad6-4cb4-bbe5-1cd78eaed258","last_modified":1562025160109},{"schema":1562025158603,"derHash":"YGNr4vKU7AePTHJpZLTdUCscguCZz3dWMeiD/u5F+VE=","subject":"CN=EC-GENCAT,OU=Serveis Publics de Certificacio ECV-1+OU=Vegeu https://www.catcert.net/verCIC-1  (c)03+OU=Generalitat de Catalunya,O=Agencia Catalana de Certificacio (NIF Q-0801176-I),C=ES","subjectDN":"MIHpMQswCQYDVQQGEwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYtSSkxLjAsBgNVBAsTJVNlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8gRUNWLTExNjA0BgNVBAsTLVZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlckNJQy0xICAoYykwMzEhMB8GA1UECxMYR2VuZXJhbGl0YXQgZGUgQ2F0YWx1bnlhMRIwEAYDVQQDEwlFQy1HRU5DQVQ=","whitelist":false,"attachment":{"hash":"ed647ac49271c35288aad77057c157edd24e55f000681fa746f99ab847142e8f","size":2629,"filename":"plh85tWIetVs5VcJnItuNLDy-XNaKKGitW1elxmTBeI=.pem","location":"security-state-staging/intermediates/93a7595b-5765-4a71-9a9d-ad56d74a8ce0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"plh85tWIetVs5VcJnItuNLDy+XNaKKGitW1elxmTBeI=","crlite_enrolled":false,"id":"1b234c30-ce6d-4884-9629-a002cc6d89fb","last_modified":1562025159338},{"schema":1562025156354,"derHash":"QZsMmta4cqixu4c0GvY+6S5psnuZZmLnMwMvEogQjfs=","subject":"CN=GeoTrust EV SSL CA - G6,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNg==","whitelist":false,"attachment":{"hash":"e3ace3997f5254862ba31b6b1b032f6e2ffc20f9bba4c0f616b8909fecf8009e","size":1906,"filename":"wrSQwdbHfW1CspprUJ7cm0XLtkDB3nyY2bZn6MZqHL8=.pem","location":"security-state-staging/intermediates/24479845-1d51-479a-8e01-ffa788643f1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wrSQwdbHfW1CspprUJ7cm0XLtkDB3nyY2bZn6MZqHL8=","crlite_enrolled":false,"id":"3b445982-59e3-490a-8362-c15f65d89a41","last_modified":1562025157120},{"schema":1562025155566,"derHash":"tpG0appRDb1muYnamtBpBKwGRz2NDXnyGV1rE/+0oYM=","subject":"CN=TrustSign ECC OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBFQ0MgT1YgQ0E=","whitelist":false,"attachment":{"hash":"ec54abad16f8fa60b0a392691a78c2f7503476682a33ddb306dfe52826034ecf","size":1276,"filename":"zdcn7aFVDOpjk4ry7Di1KqCcZhqCF7892ueBmfuRY2g=.pem","location":"security-state-staging/intermediates/3a07e49f-0b15-4531-b4f7-785fc87be9ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zdcn7aFVDOpjk4ry7Di1KqCcZhqCF7892ueBmfuRY2g=","crlite_enrolled":false,"id":"0a2ba468-3c5c-4619-add7-a43dba6c5dce","last_modified":1562025156346},{"schema":1562025154811,"derHash":"/alHIIv6MgOmxXuHFKZHtwCeUWjoiVE0VFCx0tP5Gn0=","subject":"CN=TERENA eScience Personal CA 3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDM=","whitelist":false,"attachment":{"hash":"7ea6124756c90b6331413e85db4359452c378d63911d5b07dbce10ad0631a783","size":1804,"filename":"D4s14JIoSBMzTNeUUcWADRb_-SykkRSe9uuLuoU5ots=.pem","location":"security-state-staging/intermediates/409968e6-3674-4763-a739-1304627ae2d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D4s14JIoSBMzTNeUUcWADRb/+SykkRSe9uuLuoU5ots=","crlite_enrolled":true,"id":"03f1b517-d8b6-4d50-8c17-fb4f5025f7b1","last_modified":1562025155558},{"schema":1562025153323,"derHash":"jNlTxQYii/HXTWBi6R5+CHPq67sZ+/IArK3CODAAa4M=","subject":"CN=TrustAsia RSA EV SSL Server CA,OU=Controlled by COMODO exclusively for TrustAsia Technologies,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MIG2MQswCQYDVQQGEwJDTjERMA8GA1UECBMIU2hhbmdoYWkxJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xRDBCBgNVBAsTO0NvbnRyb2xsZWQgYnkgQ09NT0RPIGV4Y2x1c2l2ZWx5IGZvciBUcnVzdEFzaWEgVGVjaG5vbG9naWVzMScwJQYDVQQDEx5UcnVzdEFzaWEgUlNBIEVWIFNTTCBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"70e45d2feec0fc507a7142b382526e399bb9e3bc67d30403aa926b3762d1921b","size":2263,"filename":"GxkkcEUvgSYWq0Iy2T9NnbqmBzYGl6Xday5FGhp66kM=.pem","location":"security-state-staging/intermediates/f9ebbc5b-f149-4a4f-8052-4b6f0b63152b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GxkkcEUvgSYWq0Iy2T9NnbqmBzYGl6Xday5FGhp66kM=","crlite_enrolled":false,"id":"e58a1d0e-c454-44c3-a00f-02c0d4483afc","last_modified":1562025154062},{"schema":1562025152565,"derHash":"Y1r2iJ9JBg/g57q8DyMxT7EY87GCQ90X9H2GR6aWhLE=","subject":"CN=Thawte Partner CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGjAYBgNVBAMTEVRoYXd0ZSBQYXJ0bmVyIENB","whitelist":false,"attachment":{"hash":"60ece73007734d78c9e04b93695af5557289e36eb46cfe36246074d65ebbd645","size":1630,"filename":"W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=.pem","location":"security-state-staging/intermediates/b4cae8e4-1f4c-4f8f-8e6b-a5611240bcf7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W91BaGXmCLPVN1dHiQP6qf3bRnkklNI0e470b1Yl6Hc=","crlite_enrolled":false,"id":"238b8a15-e417-4895-866a-8dc86bb8a4c8","last_modified":1562025153315},{"schema":1562025151821,"derHash":"lb5tPC4qOidpXzsxO26vDLoT7VRQ0gQdR9zVeu98e+s=","subject":"CN=MilleniumSign Code Signing Certificate CA RSA R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGSMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTkwNwYDVQQDDDBNaWxsZW5pdW1TaWduIENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDQSBSU0EgUjM=","whitelist":false,"attachment":{"hash":"aa16bf81f675c6d11a25b78e5994acc69a324c06f3cc278413284cf9ec7b3b19","size":2584,"filename":"l_0NH_ikSLrTCKMvvz6dkNzfx-BPk9wO2rAM1fHHEpE=.pem","location":"security-state-staging/intermediates/632dc22f-8e34-49f2-8ae9-bf7551b8d988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"l/0NH/ikSLrTCKMvvz6dkNzfx+BPk9wO2rAM1fHHEpE=","crlite_enrolled":false,"id":"3dc118b2-773a-4754-a647-50c4ea325ca4","last_modified":1562025152558},{"schema":1562025150329,"derHash":"w2g/fZF1Qhna2k6Nww5LGL05KLU9Ork9BzhLxYcc41U=","subject":"CN=Cybertrust Japan Secure Server ECC CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGIxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEuMCwGA1UEAxMlQ3liZXJ0cnVzdCBKYXBhbiBTZWN1cmUgU2VydmVyIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"4ef5e6f2d2f8ff4b8ddd818cd5d7d27891e39644ea2ce02225a9d9ce00621aa3","size":1187,"filename":"QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT_YKfPuvVU=.pem","location":"security-state-staging/intermediates/e169883d-c67d-422b-9497-6e692391df75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QNrgssEKlwJV3LCOAwSPpkc3S6pOvGY2WT/YKfPuvVU=","crlite_enrolled":false,"id":"1add0595-65df-4e38-a378-f1ca21b6bd9f","last_modified":1562025151073},{"schema":1562025148047,"derHash":"o1f9tXSI6jf48c1poBa4Z3+thZJjKlGtqULEcVvxfh4=","subject":"CN=FUJIFILM Fnet CA - G2,O=Fuji Xerox,C=JP","subjectDN":"MEIxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR4wHAYDVQQDExVGVUpJRklMTSBGbmV0IENBIC0gRzI=","whitelist":false,"attachment":{"hash":"7284b6f8f1a8e6cb3529c35f3bc5ec0859430fef3c6f8a621fc05d84037e0f40","size":1479,"filename":"7zYxtJ9jLwFb0WEOBLAAo-vuoQMJ0Xpx70rmlp9xdfY=.pem","location":"security-state-staging/intermediates/06378283-1c8c-45ce-a045-f2e678089f5f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7zYxtJ9jLwFb0WEOBLAAo+vuoQMJ0Xpx70rmlp9xdfY=","crlite_enrolled":false,"id":"c88511d0-5e08-4e63-9656-6e16d27f3978","last_modified":1562025148790},{"schema":1562025146538,"derHash":"z28k/+SPhAinXPrfK2X4pOQXLzt8JMQbW3SB0kAYGXw=","subject":"CN=Symantec Class 3 Organizational CA - G3,OU=Symantec Trust Network+OU=Insattningsgaranti Service CA,O=Symantec Corporation,C=US","subjectDN":"MIGnMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxJjAkBgNVBAsTHUluc2F0dG5pbmdzZ2FyYW50aSBTZXJ2aWNlIENBMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIE9yZ2FuaXphdGlvbmFsIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"c79aef06bad6276fc86a2e31fb1c6f204f6e41a307a218d5e07fd3e65032588b","size":2097,"filename":"nqV8AzrYXrBySpqYUyy2yG0H7CWZY0WpjPUzO0eO4bE=.pem","location":"security-state-staging/intermediates/d5d01852-cb45-4081-80e5-4f7ff5e74906.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nqV8AzrYXrBySpqYUyy2yG0H7CWZY0WpjPUzO0eO4bE=","crlite_enrolled":false,"id":"649f0c89-bf4f-4775-9d3c-d22bb75f0d0c","last_modified":1562025147299},{"schema":1562025145776,"derHash":"0cIAnUcoNa+6lMyKywbdDHJxOK4ec4NDlNJ7DAbPEmU=","subject":"CN=KeystoneHIE KeyHIE CA,OU=Orion Health Direct Secure Messaging,O=Keystone Health Information Exchange (KeyHIE),C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzE2MDQGA1UEChMtS2V5c3RvbmUgSGVhbHRoIEluZm9ybWF0aW9uIEV4Y2hhbmdlIChLZXlISUUpMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxHjAcBgNVBAMTFUtleXN0b25lSElFIEtleUhJRSBDQQ==","whitelist":false,"attachment":{"hash":"98e266e29f1b0debc92e5f5f678ff38e4063e78bd781620b0312e9323a4d89b4","size":2316,"filename":"BqFOY5ec4fQq7Sh8blvP9sX_mHtMzqYivI5aRbj6LMc=.pem","location":"security-state-staging/intermediates/da472eb5-f686-41e8-ac2a-b967448f0e11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BqFOY5ec4fQq7Sh8blvP9sX/mHtMzqYivI5aRbj6LMc=","crlite_enrolled":false,"id":"66d93205-2931-4627-8a5d-ea5331932a90","last_modified":1562025146529},{"schema":1562025145009,"derHash":"VnmkMeedTrnulnxg2HA8fHj0Q/cduXFX5DBZ3kLYUN8=","subject":"CN=KPN BV PKIoverheid Organisatie Server CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHExCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNjA0BgNVBAMMLUtQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"afa70e68747e22a197469ee8aea83455014ad7e290fde28fd13e2f68a485c72c","size":2601,"filename":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn-TXs=.pem","location":"security-state-staging/intermediates/317d0f28-56a8-47b7-b730-5bc6a31489ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rW1GnpJmh2k9F6uNIGFDm27MmL0j4O1CwybyyFn+TXs=","crlite_enrolled":true,"id":"2780fe8e-e8a3-4eae-bb45-d2eddbf234bf","last_modified":1562025145768},{"schema":1562025142734,"derHash":"wAqBg8mGWghHwBFY94Wl813Li1lse/Rv1kl/cvAuXjI=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"6f175666ee2b368e75d584321a8ac5028a163f7f1f691e5f36e059f87f6f5015","size":1666,"filename":"0XL_diXmZHRX9sGpYNhcrViPrqHXxyYwucHs8TA_5W8=.pem","location":"security-state-staging/intermediates/8e6bf5f6-5604-4d8c-a6d9-257414f5b6cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0XL/diXmZHRX9sGpYNhcrViPrqHXxyYwucHs8TA/5W8=","crlite_enrolled":false,"id":"dd2b472f-d1f1-474f-b861-276f1cbec0eb","last_modified":1562025143470},{"schema":1562025141974,"derHash":"OLJs9FyTLqKAGdk+RArHK66D+cv1LWrZE2mLGPzIcX0=","subject":"CN=EINS/PKI Public Certification Authority V4,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjQ=","whitelist":false,"attachment":{"hash":"3b9ae4a74d5261ecc85f6b9d358b4c4079b49f0f3a8e227d829b9ac02d03ca98","size":1674,"filename":"hMBp2m4PvojCldfsrzoX4dPk_9MctmHJZLUZTqPmBYk=.pem","location":"security-state-staging/intermediates/dc89c814-2876-4b30-b10a-bc5d94abe445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMBp2m4PvojCldfsrzoX4dPk/9MctmHJZLUZTqPmBYk=","crlite_enrolled":true,"id":"179db5f9-cfdb-44f1-a333-5ce2db577865","last_modified":1562025142725},{"schema":1562025140477,"derHash":"gPWw0W+ujnK58TRv7deIg9SmKdE4L7z8aU9Uv8Hu3Tw=","subject":"CN=NII Open Domain CA - G5,O=National Institute of Informatics,C=JP","subjectDN":"MFsxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxIDAeBgNVBAMTF05JSSBPcGVuIERvbWFpbiBDQSAtIEc1","whitelist":false,"attachment":{"hash":"748e4489edca7296798a29e5a219a2b19349b29db773ac9e517d14e1ea4fe49b","size":1630,"filename":"aj-4mbqOOY7cgtDqWtgGaLG69EShl59AQocV--hJAk8=.pem","location":"security-state-staging/intermediates/50ef58fd-9c22-4ac3-9f5e-c898ab5bfbe2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aj+4mbqOOY7cgtDqWtgGaLG69EShl59AQocV++hJAk8=","crlite_enrolled":true,"id":"8b6f71a8-715d-4aba-96bb-ca79f1ec64c7","last_modified":1562025141214},{"schema":1562025136731,"derHash":"vD8K3F/4aks3TcaR+P4nOxuH3HPkOCT1/n82w+AAgxE=","subject":"CN=STRATO SSL - G4,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzQ=","whitelist":false,"attachment":{"hash":"4e6d887b47fddc0e152fedf91f701e3e14afa9cb17d66c66aff6b81f3b2bf2b0","size":1618,"filename":"5oR-PNh3bknmMosEFMizpVd_K6NW9Mg35aMUY2g_tJ0=.pem","location":"security-state-staging/intermediates/082bceb0-77d7-47d4-9492-01e6b2283094.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5oR+PNh3bknmMosEFMizpVd/K6NW9Mg35aMUY2g/tJ0=","crlite_enrolled":false,"id":"f41316d7-e91d-4076-bd60-7bc27fef2ae5","last_modified":1562025137472},{"schema":1562025134484,"derHash":"Q8rDHvjouhtLFrggbkwKJsW62y/DqgnpAXDkG2bC/WQ=","subject":"CN=GoGetSSL RSA DV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIERWIENB","whitelist":false,"attachment":{"hash":"416a15c9d2f048314780b6da5dc96d6d118331d05d84edecee9e19189b209bfb","size":2085,"filename":"T-6uyT5C6WT480t2wqX2OJ3ZrNt2j8v52bWLj-XIvz8=.pem","location":"security-state-staging/intermediates/15643bb1-316f-4368-ab99-a8a038c5fe52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"T+6uyT5C6WT480t2wqX2OJ3ZrNt2j8v52bWLj+XIvz8=","crlite_enrolled":true,"id":"61d52502-e268-4365-9df4-7e0aacbfa38e","last_modified":1562025135235},{"schema":1562025133747,"derHash":"QqtNnxgJRU6+wkXY2wb/YaqCibBaJj3+6WYtrJFmYEM=","subject":"SERIALNUMBER=ZZZZZZA6,CN=Siemens Issuing CA Medium Strength Authentication 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIG2MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTYxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMT8wPQYDVQQDDDZTaWVtZW5zIElzc3VpbmcgQ0EgTWVkaXVtIFN0cmVuZ3RoIEF1dGhlbnRpY2F0aW9uIDIwMTY=","whitelist":false,"attachment":{"hash":"e0621966aec1e2621a278a766224cf528557ebcfab4270f199e7eea7d2675623","size":2653,"filename":"DrWu4Hq8850SEsM72-PVKQ1tYB6sBR3LCdZJGICQePQ=.pem","location":"security-state-staging/intermediates/272b7db7-0908-4ffc-840c-eef0cb622efd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DrWu4Hq8850SEsM72+PVKQ1tYB6sBR3LCdZJGICQePQ=","crlite_enrolled":false,"id":"2d630350-e60d-4235-9fda-8b0f08314a1c","last_modified":1562025134476},{"schema":1562025132263,"derHash":"6tDFB3yZ+PpAzFVtvC6spB9U6dmevUaJVq6ovsWq92o=","subject":"CN=SSL.com Client Certificate Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxOjA4BgNVBAMMMVNTTC5jb20gQ2xpZW50IENlcnRpZmljYXRlIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"c32940ffc93bbf65d67b3107fd8491c272d8a8bf1f1ee00f8ed0c79366ba5152","size":1301,"filename":"Z0cAXCbw1xo4sVpeEsdPDoiHdluFH7wEtczt9XdK7Sc=.pem","location":"security-state-staging/intermediates/7dc0f3f4-c262-4358-bf27-85f5085b55b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z0cAXCbw1xo4sVpeEsdPDoiHdluFH7wEtczt9XdK7Sc=","crlite_enrolled":false,"id":"9a625a71-583a-4afa-9248-664ad9eae363","last_modified":1562025133003},{"schema":1562025130010,"derHash":"uVrlT4OOOr8LV6zMGxJm3GjHo/p3QBX6Eo1gzdGq4oA=","subject":"CN=TeliaSonera Class 1 CA v2,O=TeliaSonera,C=FI","subjectDN":"MEcxCzAJBgNVBAYTAkZJMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEiMCAGA1UEAwwZVGVsaWFTb25lcmEgQ2xhc3MgMSBDQSB2Mg==","whitelist":false,"attachment":{"hash":"158d92505eb3b45b3e6b4f6ad2ec4039c093d61b3bfe9fd73d31588465d0a2da","size":2532,"filename":"7iiRGudmfB5TF0Xjv7u_ECYjflwjOVVvuWfXqeDL9v8=.pem","location":"security-state-staging/intermediates/caafc12b-ae2e-4f72-b6dc-37355ce3511f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7iiRGudmfB5TF0Xjv7u/ECYjflwjOVVvuWfXqeDL9v8=","crlite_enrolled":false,"id":"08d229d0-4919-4ab4-9baa-f3b645c75af6","last_modified":1562025130755},{"schema":1562025129265,"derHash":"7T23SNbXju/wuUUrxqAuA5A5xVB1pDkyO4uoX7Ibndo=","subject":"CN=QuoVadis PKIoverheid EV CA,O=QuoVadis Trustlink BV,C=NL","subjectDN":"MFIxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVRdW9WYWRpcyBUcnVzdGxpbmsgQlYxIzAhBgNVBAMMGlF1b1ZhZGlzIFBLSW92ZXJoZWlkIEVWIENB","whitelist":false,"attachment":{"hash":"36c648cb7bd3c186d7d9e0859c485e365c65a8548541b6aa3bbf6e5145b6c94c","size":2422,"filename":"_4M8fiegSVHwMhxeXXG0hHTjicxrP4MocMfnDzRve4Y=.pem","location":"security-state-staging/intermediates/b4128fcb-cc63-4709-a527-2228c4e5c0e6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/4M8fiegSVHwMhxeXXG0hHTjicxrP4MocMfnDzRve4Y=","crlite_enrolled":true,"id":"636a1114-c599-4e1e-9b78-725c0460b51e","last_modified":1562025130001},{"schema":1562025127747,"derHash":"F1cpGj19C7W5uc+IAvGyrhc+VrCTWXD8hrY6J0mdteI=","subject":"CN=Mississippi Division of Medicaid CA,OU=Orion Health Direct Secure Messaging,O=Mississippi Division of Medicaid,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgTWlzc2lzc2lwcGkgRGl2aXNpb24gb2YgTWVkaWNhaWQxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEsMCoGA1UEAxMjTWlzc2lzc2lwcGkgRGl2aXNpb24gb2YgTWVkaWNhaWQgQ0E=","whitelist":false,"attachment":{"hash":"cca273f49f71c1ff7f8f40ea75ee3f2df48645b9f0d620d081223e02dc8f3321","size":2316,"filename":"QSHb9BKVt3sbbZcpbsYhza74RWYYrCyW2TRiOuRYm24=.pem","location":"security-state-staging/intermediates/0a2a8364-6973-4442-8eef-5927bc28bcef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QSHb9BKVt3sbbZcpbsYhza74RWYYrCyW2TRiOuRYm24=","crlite_enrolled":false,"id":"cef1bd37-f531-4ab9-959c-5a8c3ce41d8a","last_modified":1562025128479},{"schema":1562025127010,"derHash":"0CxXxteEvH/1xNAzwizbpac6L4fZ4diA7HjNGuD4J04=","subject":"CN=TERENA eScience Personal CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEmMCQGA1UEAxMdVEVSRU5BIGVTY2llbmNlIFBlcnNvbmFsIENBIDI=","whitelist":false,"attachment":{"hash":"e1127ebdc239f9dd82e4c2cde697bb33a369369a3c114af4dbb2d849aba0ddd1","size":2142,"filename":"PRDfx01D2tGMhHfAORezk6RxRuzL198DON5jY4n-V-4=.pem","location":"security-state-staging/intermediates/b176cf5c-6fd4-4e00-9e7b-cf987807af32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PRDfx01D2tGMhHfAORezk6RxRuzL198DON5jY4n+V+4=","crlite_enrolled":false,"id":"404f7c65-b381-4bf3-af34-70c1b2e70fba","last_modified":1562025127739},{"schema":1562025126254,"derHash":"IlETztpo+6teYo4CFKFaZRxHqn7nu/R2CZtuFC7syOw=","subject":"CN=SECOM TimeStamping CA2,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFUxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMR8wHQYDVQQDExZTRUNPTSBUaW1lU3RhbXBpbmcgQ0Ey","whitelist":false,"attachment":{"hash":"b79bcebbdbe1d9b2e2ea489fca18c99a683e821b17174c6fea226b5019dbe31c","size":1622,"filename":"kFsLMWudOm7QLAlLqDicbVVw7Daqh252pLGjqKrHPQ4=.pem","location":"security-state-staging/intermediates/3a2cfed7-d044-40b7-a016-e67672e57467.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kFsLMWudOm7QLAlLqDicbVVw7Daqh252pLGjqKrHPQ4=","crlite_enrolled":false,"id":"3f00218c-7886-47cf-8ee9-5b1518d9ef10","last_modified":1562025127002},{"schema":1562025121762,"derHash":"Q49HPr/IiE710+DVLSZM2+Vso4LZ6/xonXdIlAn1Wm4=","subject":"CN=Google CA1,O=Google\\, Inc.,L=Mountain View,ST=CA,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEVMBMGA1UEChMMR29vZ2xlLCBJbmMuMRMwEQYDVQQDEwpHb29nbGUgQ0Ex","whitelist":false,"attachment":{"hash":"3af4c41659b8039f273a6dacdf6c94bac5d0c669051cf7c3193a04011fdc1079","size":1695,"filename":"JqNL7R3G-I-oNR0Uoa1_QE7RwLsPo10K2QlsnoYQ8eg=.pem","location":"security-state-staging/intermediates/f88caf87-4bc1-4a4c-a37c-266f3dbed491.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JqNL7R3G+I+oNR0Uoa1/QE7RwLsPo10K2QlsnoYQ8eg=","crlite_enrolled":false,"id":"9f917307-df70-4aef-9de2-d3f38129efe8","last_modified":1562025122497},{"schema":1562025120279,"derHash":"CgXEYnVjkN0fHV3YJ5TDAPBL54nc521+MS95DWj9OFo=","subject":"CN=InCommon RSA Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBSU0EgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"3959f96c1c3a6e88dfd1193a6ce41b3322674ad833793a0ff92f5a272c114f9f","size":2129,"filename":"b1JA6-4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=.pem","location":"security-state-staging/intermediates/ca260223-49d4-4648-b181-def80753276d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"b1JA6+4svjmZnxGjAiQY3RS0A9FtjKLCWaRlVmCPM28=","crlite_enrolled":true,"id":"4c82bc48-ddcd-4b3d-a03a-9eb182f2f7d6","last_modified":1562025121016},{"schema":1562025118745,"derHash":"N+micetHJck82vGDVix9fZ6o/BOfg3T/5BjXfTJCj+A=","subject":"CN=New Hampshire Health Information Organization CA,OU=Orion Health Direct Secure Messaging,O=New Hampshire Health Information Organization Corporation,C=US","subjectDN":"MIG7MQswCQYDVQQGEwJVUzFCMEAGA1UEChM5TmV3IEhhbXBzaGlyZSBIZWFsdGggSW5mb3JtYXRpb24gT3JnYW5pemF0aW9uIENvcnBvcmF0aW9uMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxOTA3BgNVBAMTME5ldyBIYW1wc2hpcmUgSGVhbHRoIEluZm9ybWF0aW9uIE9yZ2FuaXphdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"2922fb883b4e192002b98a3501ca3ae60c4ab145c5b910af0e2f4bd8c5fc8929","size":2369,"filename":"FcaQBKoKOodq4LMiSFEUzCJa0dFILZ6txuxivUIQWA4=.pem","location":"security-state-staging/intermediates/8f263fea-ce90-415d-94b7-527302ef2d65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FcaQBKoKOodq4LMiSFEUzCJa0dFILZ6txuxivUIQWA4=","crlite_enrolled":false,"id":"3b9c9c53-a91e-4f93-aeef-79ae47ea63fc","last_modified":1562025119531},{"schema":1562025118011,"derHash":"roIgH1ZeBDm39K1okydZTrl0pPeBsabL/tWb04IxfxM=","subject":"CN=Thawte TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"add9d8816c4153cd678d313dec7135ed32f3b5d71e1c1b6f73bf061cd4162394","size":1142,"filename":"Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO-bYvpiEQI=.pem","location":"security-state-staging/intermediates/5724bc90-8b80-4c0c-b710-f8b313c76589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z2FuypjaQ1wWJ4YxsCzQZPBTleqi8I6cEO+bYvpiEQI=","crlite_enrolled":false,"id":"dff3760d-8e5d-4c69-8668-9cf682af48a9","last_modified":1562025118738},{"schema":1562025117267,"derHash":"xdgUZyz2W5U+b2nnAsfCOl69pFeWqliDQSHfsNBsCEY=","subject":"CN=thawte Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMScwJQYDVQQDEx50aGF3dGUgUHJpbWFyeSBUcmFuc2l0aW9uIFJvb3Q=","whitelist":false,"attachment":{"hash":"d074ef6628a7cb58702f27da00b4aba9b3b74c4953ec5393a085dd2c691a1552","size":1313,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/89580d25-17ba-4667-ac01-e3e72a6b9158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"e8972f4c-b265-4859-871b-9a07bfcd532d","last_modified":1562025118003},{"schema":1562025116492,"derHash":"j+l3I5D20iqVPZjbzRl1SsvTQJILDHDdyh/v5Icyl1A=","subject":"CN=EINS/PKI Public Certification Authority V2,O=INTEC INC.,C=JP","subjectDN":"MFcxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpJTlRFQyBJTkMuMTMwMQYDVQQDEypFSU5TL1BLSSBQdWJsaWMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgVjI=","whitelist":false,"attachment":{"hash":"991ddc8794f0daa071f015020faf9f96b617452fc700241d6b2e77450d2deaea","size":1597,"filename":"UAXhCsI8VFL2KFAMyEK1fRS-4Xo9P8T-q-ZMcJBfvcs=.pem","location":"security-state-staging/intermediates/29482520-eeb7-4ff7-b611-fda14001a03b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UAXhCsI8VFL2KFAMyEK1fRS+4Xo9P8T+q+ZMcJBfvcs=","crlite_enrolled":false,"id":"b388d70b-38e4-4ec1-9c8d-095362f5d6e3","last_modified":1562025117259},{"schema":1562025114922,"derHash":"qYyM7ZP5pDYxq+RXOGTgbFGSkAcj6X0e7SwNfGiy0Hk=","subject":"CN=Advanced Code Signing Class2 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGOMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExNjA0BgNVBAMMLUFkdmFuY2VkIENvZGUgU2lnbmluZyBDbGFzczIgZS1Temlnbm8gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"64067aab0874bc037193b6acdb923c5b3f8be5f6ce9e88eeefe2ebd7d958132b","size":2609,"filename":"xFdYXbpSYOTcKmpFvTeBEjUJFCvx6SNaltd9jtCg594=.pem","location":"security-state-staging/intermediates/8c58155b-730e-4bd1-a4a4-a9d2120083b4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFdYXbpSYOTcKmpFvTeBEjUJFCvx6SNaltd9jtCg594=","crlite_enrolled":false,"id":"f3a00705-bb5f-44e5-aefb-59098a06f4e5","last_modified":1562025115705},{"schema":1562025114183,"derHash":"G6RA9+sEikAqhwkcSUB0BGJUmirzli+LxxhK0LBLgx0=","subject":"CN=University of Patras CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaVW5pdmVyc2l0eSBvZiBQYXRyYXMgQ0EgUjE=","whitelist":false,"attachment":{"hash":"21e16a0dccadb707cc68dc9e26f6d00380e449c017fe72bffa76423cc88355f7","size":2584,"filename":"yWuLmWbmLueFjc04Qp7TQPUOOX-6i8azb2QoXYNtOv8=.pem","location":"security-state-staging/intermediates/fb23a6f7-db94-4b12-a05d-b7c2f1a2c437.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yWuLmWbmLueFjc04Qp7TQPUOOX+6i8azb2QoXYNtOv8=","crlite_enrolled":true,"id":"ea530e37-2e6a-4377-bcbe-2c0bb0fb334f","last_modified":1562025114914},{"schema":1562025113418,"derHash":"91Qc9p0d4ayVOrwfrW94B6NO3+nhLBHmahlZMMI61sY=","subject":"CN=DigiCert Global CA G3,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMw==","whitelist":false,"attachment":{"hash":"caf0ca58fa4e543dbd0a13f2d28c0f3ba36a68e2ce4db8f05cbe1c0cc102e4ce","size":1106,"filename":"lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=.pem","location":"security-state-staging/intermediates/d3b97027-ab86-4c2f-bde3-30d9f0e79337.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lh6fRVDi7gDQENRcjLNsiTdmqn9awnJtmhUMzPTx6FM=","crlite_enrolled":true,"id":"042596bd-887e-46b0-a897-969aef8e476a","last_modified":1562025114175},{"schema":1562025112681,"derHash":"buBlr1i3BDyyNy/GY540hjBPzQlNnLaDjXaojOIMMN0=","subject":"CN=USERTrust RSA Domain Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE5MDcGA1UEAxMwVVNFUlRydXN0IFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"f6e9d1e1c2c0f490e19c26afc850c4184e1f2eebd9f9245a8d6557c5030b419f","size":2170,"filename":"jPQXFCdXn0NxGIW3P3JUl22ASU1QS7BTE83baBiuZpc=.pem","location":"security-state-staging/intermediates/87e7a783-ce18-4cab-8226-a64514640d48.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jPQXFCdXn0NxGIW3P3JUl22ASU1QS7BTE83baBiuZpc=","crlite_enrolled":true,"id":"37b1fced-36f9-4c04-b5ef-93347b78666e","last_modified":1562025113411},{"schema":1562025111941,"derHash":"e88cihLuCyhUobQQcGUrAyXn0MILnETUrOnGQzh/FDE=","subject":"CN=Class3 KET e-Szigno CA 2018,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MHcxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxJDAiBgNVBAMMG0NsYXNzMyBLRVQgZS1Temlnbm8gQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"b8363cf53cbc0d53826cb443efcf270b8480d872fe5f866c272fe115ac7daa95","size":2227,"filename":"9cUMZguTNlS7SsqERbenmwQ2nFpq1XEyXFYq20LBYKQ=.pem","location":"security-state-staging/intermediates/1e730201-a474-4fd9-b805-d7a04496b3b5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9cUMZguTNlS7SsqERbenmwQ2nFpq1XEyXFYq20LBYKQ=","crlite_enrolled":false,"id":"a393de41-fe5f-4381-951c-6e5fcf3cb617","last_modified":1562025112674},{"schema":1562025111185,"derHash":"nwMezP+1xfZqL3CFOCDqWrVKfa4bBzwGfQVI2Lx0vms=","subject":"CN=SecureCore RSA Secure Client and Email CA,O=SecureCore,L=OSAKA,ST=OSAKA,C=JP","subjectDN":"MHYxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVPU0FLQTEOMAwGA1UEBxMFT1NBS0ExEzARBgNVBAoTClNlY3VyZUNvcmUxMjAwBgNVBAMTKVNlY3VyZUNvcmUgUlNBIFNlY3VyZSBDbGllbnQgYW5kIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"2bc5fded9a0980430c28b69a3f3a55e6fec28e75e562e0274a8eec10fca95c6d","size":2129,"filename":"KBLXQ9-jOdoOf7rJ1mS67CFv5GiWDtEk9tpsMiIQhZ4=.pem","location":"security-state-staging/intermediates/18a2a864-4b38-4e2d-a9ec-0a188a9bf902.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KBLXQ9+jOdoOf7rJ1mS67CFv5GiWDtEk9tpsMiIQhZ4=","crlite_enrolled":false,"id":"8530b5fa-bac9-4fe6-873e-22d0ae2c14a8","last_modified":1562025111933},{"schema":1562025110415,"derHash":"lcB041kCoUq9nRmvtuf4Dmaf+OI2MnBTnZY2E/BKqiE=","subject":"CN=GTS CA 1O1,O=Google Trust Services,C=US","subjectDN":"MEIxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVHb29nbGUgVHJ1c3QgU2VydmljZXMxEzARBgNVBAMTCkdUUyBDQSAxTzE=","whitelist":false,"attachment":{"hash":"6b83970dc396a58790e6b658e13c63e57dafec798ebdec22b4b70519932de38c","size":1548,"filename":"YZPgTZ-woNCCCIW3LH2CxQeLzB_1m42QcCTBSdgayjs=.pem","location":"security-state-staging/intermediates/d1df4cf2-b819-43ed-a6e3-59e264ed21b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YZPgTZ+woNCCCIW3LH2CxQeLzB/1m42QcCTBSdgayjs=","crlite_enrolled":true,"id":"73b3dfa7-731a-4bfe-b218-d585c8e45d6d","last_modified":1562025111178},{"schema":1562025108184,"derHash":"A2oY9fDrndXuAreFTfXDOEVgHYk5z7e2B/adFCwB2Qk=","subject":"CN=TrustAsia TLS RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBSU0EgQ0EgRzg=","whitelist":false,"attachment":{"hash":"cbb7a86cf96f690954bcd21bb8c71a00ef436ee942cd65831bf21c11cbc25909","size":1687,"filename":"rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=.pem","location":"security-state-staging/intermediates/d04ab9f3-2fc4-47a8-931d-4b644bd07cbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rnv8EixdQFjoJF2hhedxVmsIlmFhW2jkp1llCWfHEvw=","crlite_enrolled":false,"id":"6687c4bb-a959-4fee-9b6b-63f4d03a8c85","last_modified":1562025108917},{"schema":1562025107419,"derHash":"WNehl/CabqVSuOprGlMYWgMKOtjVIiDADETj9FDk+5A=","subject":"CN=NETLOCK Trust CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFIxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMRkwFwYDVQQDDBBORVRMT0NLIFRydXN0IENB","whitelist":false,"attachment":{"hash":"162d2ef1f5f7a945a8033cb0bb83b55948d4915840c9e5f98f83b3666f2aec62","size":2060,"filename":"JNdSz2IBG96B7N8LkEnVH6myMdo7MCXP8kJ-NPi5A64=.pem","location":"security-state-staging/intermediates/645b58d9-0779-4656-9fe8-ac5478c57d4f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JNdSz2IBG96B7N8LkEnVH6myMdo7MCXP8kJ+NPi5A64=","crlite_enrolled":false,"id":"9784e5cb-7f50-43e5-853d-bce88eb86d00","last_modified":1562025108176},{"schema":1562025105176,"derHash":"2C+H+T0x1fyBjdZr1Q5/MZrhefwcXQBUe2WOjrP0zlY=","subject":"CN=NETLOCK Trust Advanced CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MFsxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMSIwIAYDVQQDDBlORVRMT0NLIFRydXN0IEFkdmFuY2VkIENB","whitelist":false,"attachment":{"hash":"d2114d074fdd6d510393f4e4475f26c915693c1226b230324cdcc50ab4dec84b","size":2073,"filename":"vUlRVy11U4UcMGkV_J50oacQuaDzZcAvkc6eUz9yR9c=.pem","location":"security-state-staging/intermediates/ad1cf639-62d7-4f1c-ae01-76b1bce15693.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vUlRVy11U4UcMGkV/J50oacQuaDzZcAvkc6eUz9yR9c=","crlite_enrolled":false,"id":"4772163f-50e2-43cd-9d63-17d1e8176bd8","last_modified":1562025105914},{"schema":1562025102913,"derHash":"yJwktBWnLJQJZn6I+15ukqONVgnDyZ5V2ZtLHUWJkPk=","subject":"CN=certSIGN Qualified CA Class 3 G2,OU=certSIGN Qualified CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHYxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEpMCcGA1UECxMgY2VydFNJR04gUXVhbGlmaWVkIENBIENsYXNzIDMgRzIxKTAnBgNVBAMTIGNlcnRTSUdOIFF1YWxpZmllZCBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"8790a1c05eb34050a0518d6b450074d0a070eab4fdfc196e7812a7cc01b12fc8","size":1634,"filename":"UPMbIpu91S39VXXONt79PssKsPf6YLoNySvPP-qGdwY=.pem","location":"security-state-staging/intermediates/dcc54254-18e6-46af-8584-ac6c726a3de5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UPMbIpu91S39VXXONt79PssKsPf6YLoNySvPP+qGdwY=","crlite_enrolled":false,"id":"17f3db66-1a26-4fc2-b72b-4734ccc0cd35","last_modified":1562025103641},{"schema":1562025101431,"derHash":"XSh2HL8wTq/NEns01hT+F5rHdE8VUq8cMSmEJa0FonU=","subject":"CN=Aetna Inc. Secure CA2,O=Aetna Inc,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlBZXRuYSBJbmMxHjAcBgNVBAMTFUFldG5hIEluYy4gU2VjdXJlIENBMg==","whitelist":false,"attachment":{"hash":"79fdcd0fdb21095bb95b3fb6c0d2e5a49a456e49968efb573d826c26b3cca0e5","size":1683,"filename":"NIgvyyhcGFo7vlL_K_w6cn8iFWO9ftJXWrIU77O5hMI=.pem","location":"security-state-staging/intermediates/f1b50907-9001-4396-aa45-939f75f991c6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NIgvyyhcGFo7vlL/K/w6cn8iFWO9ftJXWrIU77O5hMI=","crlite_enrolled":true,"id":"65d41ecf-d71f-4a7d-bf9b-57d8825ab674","last_modified":1562025102166},{"schema":1562025100681,"derHash":"V9i9zViVWlWQpXxqr6WB7ZuWvtdvr+6WmxORh8Wocsc=","subject":"CN=Sectigo RSA Extended Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"3c04f880fa1e0f0085d430978a6bc33abae6717b85151f854d3ff05199bf6410","size":2211,"filename":"hEJ5FNYP7ZpNILySZtJgiP6UtW3ClYUTRFxXGqWSWQ0=.pem","location":"security-state-staging/intermediates/37a9c68e-c8d4-4809-882d-5b941bdb7165.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hEJ5FNYP7ZpNILySZtJgiP6UtW3ClYUTRFxXGqWSWQ0=","crlite_enrolled":true,"id":"3b4f8ef4-d9a1-4755-85ba-fe5df21a98c3","last_modified":1562025101423},{"schema":1562025099203,"derHash":"3Nd+NLRtUwrvZFpRM4nNT/wPfRlqEVuPYqX9DVV9RsY=","subject":"CN=Hyperion SMIME CA 2018,O=Hyperion Services Ltd.,L=London,ST=London,C=GB","subjectDN":"MHExCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEfMB0GA1UEChMWSHlwZXJpb24gU2VydmljZXMgTHRkLjEfMB0GA1UEAxMWSHlwZXJpb24gU01JTUUgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"3fbf797d090a78ef888fdc499ae42541542cf7827762b8ccc489eb873eddc923","size":1873,"filename":"KZbbX3n6ko-IU98hurc1EgrFvk1o2vwDfC6xMZH_7aA=.pem","location":"security-state-staging/intermediates/2cfb2953-ca27-4ba1-9b23-acac7070e2e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KZbbX3n6ko+IU98hurc1EgrFvk1o2vwDfC6xMZH/7aA=","crlite_enrolled":false,"id":"22df953a-4459-4148-a0a1-a104c0645863","last_modified":1562025099933},{"schema":1562025097714,"derHash":"JHptgH/xZAMeDrIsqF3jKaOk5mA9vGID8MbigqnJ6oQ=","subject":"SERIALNUMBER=07945211006,CN=InfoCert Organization Validation CA 3,OU=WSA Trust Service Provider,O=InfoCert S.p.A.,C=IT","subjectDN":"MIGSMQswCQYDVQQGEwJJVDEYMBYGA1UECgwPSW5mb0NlcnQgUy5wLkEuMSMwIQYDVQQLDBpXU0EgVHJ1c3QgU2VydmljZSBQcm92aWRlcjEUMBIGA1UEBRMLMDc5NDUyMTEwMDYxLjAsBgNVBAMMJUluZm9DZXJ0IE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIDM=","whitelist":false,"attachment":{"hash":"f6ce0e2e3315e95e38e3c168f1b2993eea7b2b1811d7782d5cfe1f74278a911d","size":2942,"filename":"a-x8kAay98aATSdhIwydXnat5b0q__ixXZNoxswIZ1o=.pem","location":"security-state-staging/intermediates/2161ca2c-c902-4553-8e92-c331a903b4d7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"a+x8kAay98aATSdhIwydXnat5b0q//ixXZNoxswIZ1o=","crlite_enrolled":true,"id":"0ad6adc0-7bae-4a0d-8a0a-ff78e01348df","last_modified":1562025098460},{"schema":1562025096209,"derHash":"6+ABXvZBxICVTtKmiEL8zSqKeSE67tg23fpigujqj2o=","subject":"CN=BlackCert\\, Inc. RSA EV Certification Authority,OU=Controlled by COMODO exclusively for BlackCert\\, Inc.,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIG9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMT0wOwYDVQQLEzRDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgQmxhY2tDZXJ0LCBJbmMuMTcwNQYDVQQDEy5CbGFja0NlcnQsIEluYy4gUlNBIEVWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"cc5e72b6d860c3d9cb108395e1dbe41b4443dcb561415f556b6aa1f3f763729b","size":2272,"filename":"nq1PHRuOp_qQ-vlMQDWIjBXQS9CPEsH5CLd-dlkam7U=.pem","location":"security-state-staging/intermediates/6e6eaa86-3ce0-4465-ab9e-337525dba314.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nq1PHRuOp/qQ+vlMQDWIjBXQS9CPEsH5CLd+dlkam7U=","crlite_enrolled":false,"id":"df82f80e-3b6f-455e-ae56-4770117ecbdb","last_modified":1562025096954},{"schema":1562025094676,"derHash":"kz5KLY2x/5/w5QjqfxY34HT2YP5vNloiM9/CtSyInZg=","subject":"CN=AlphaSSL CA - SHA256 - G2,O=AlphaSSL","subjectDN":"MDcxETAPBgNVBAoTCEFscGhhU1NMMSIwIAYDVQQDExlBbHBoYVNTTCBDQSAtIFNIQTI1NiAtIEcy","whitelist":false,"attachment":{"hash":"387ae998795c0cb5d04b22c0bbfb366d42adc2767c993a0b6254218326a44c7b","size":1512,"filename":"amMeV6gb9QNx0Zf7FtJ19Wa_t2B7KpCF_1n2Js3UuSU=.pem","location":"security-state-staging/intermediates/0c0cebe7-5e9b-4eac-b906-9e157cfd6a82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"amMeV6gb9QNx0Zf7FtJ19Wa/t2B7KpCF/1n2Js3UuSU=","crlite_enrolled":true,"id":"6044f076-a6cf-4215-82f0-8b5ff9aa3ffc","last_modified":1562025095417},{"schema":1562025093933,"derHash":"bjKjW1mekIe7GrNc5zAi7C4mrzS+OIkZQZyVcAzY5/s=","subject":"CN=Trusted Root CA G2,OU=Trusted Root,O=GlobalSign nv-sa,C=BE","subjectDN":"MFwxCzAJBgNVBAYTAkJFMRUwEwYDVQQLEwxUcnVzdGVkIFJvb3QxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExGzAZBgNVBAMTElRydXN0ZWQgUm9vdCBDQSBHMg==","whitelist":false,"attachment":{"hash":"c6c5a13b2392745618b20f994004aa62c9b088be893958a18f79135b156a42cb","size":1573,"filename":"W66tP4wePoAO-Y8UjUlgyqqFM7jqIJHVT7pIzmYXOtI=.pem","location":"security-state-staging/intermediates/744cf51d-71fb-49fc-8ab6-fe14dce35ca1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W66tP4wePoAO+Y8UjUlgyqqFM7jqIJHVT7pIzmYXOtI=","crlite_enrolled":true,"id":"7be6334e-99cf-4ea5-b61c-2c199025e86b","last_modified":1562025094668},{"schema":1562025093184,"derHash":"cLahDAynbeznrb6XC3ajfYoChXsTTHUFsYTr1fyk8+o=","subject":"CN=HARICA SSL RSA SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGGMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEgMB4GA1UEAwwXSEFSSUNBIFNTTCBSU0EgU3ViQ0EgUjM=","whitelist":false,"attachment":{"hash":"cedc43d39f09a719a27599d55f251f9b11242c16b81336fe59c19b7813994c1e","size":2503,"filename":"jBZXnMw3910qHNl4GpA8ufttU_ABxauO7Xs8rkNWmHE=.pem","location":"security-state-staging/intermediates/5542e9c0-bf1d-4c98-b99d-c78ac7be7cf1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jBZXnMw3910qHNl4GpA8ufttU/ABxauO7Xs8rkNWmHE=","crlite_enrolled":true,"id":"6a0c4fba-c9c1-4273-b116-3435c8b09dd6","last_modified":1562025093925},{"schema":1562025092426,"derHash":"DnhDTsitZhNWLIOQ2LMwb8YIfgWTx9WsL6+a0mOHl0U=","subject":"CN=DigiCert Accredited Direct Med CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKjAoBgNVBAMTIURpZ2lDZXJ0IEFjY3JlZGl0ZWQgRGlyZWN0IE1lZCBDQQ==","whitelist":false,"attachment":{"hash":"53d0dac262584f5d7ebc0923e541b5828cbf1d3a5c1e0cf334be28b3dd82033e","size":2300,"filename":"bJKSpALMZEtN8MtL5JhmKs5KNAAP3Z3m_oaeTa7A8vQ=.pem","location":"security-state-staging/intermediates/c074475f-6f2f-494a-a050-d78b1d741b26.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bJKSpALMZEtN8MtL5JhmKs5KNAAP3Z3m/oaeTa7A8vQ=","crlite_enrolled":false,"id":"28327394-cfae-4edb-aa78-e5f8d18caf65","last_modified":1562025093176},{"schema":1562025090182,"derHash":"EorBG0j05isu5XngkyLjmhc15zo9lk9eXXInF5b+CjY=","subject":"CN=Oregon State Treasury RSA Client CA,OU=Office of the State Treasurer,O=Oregon State Treasury,L=Salem,ST=Oregon,C=US","subjectDN":"MIGkMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMQ4wDAYDVQQHEwVTYWxlbTEeMBwGA1UEChMVT3JlZ29uIFN0YXRlIFRyZWFzdXJ5MSYwJAYDVQQLEx1PZmZpY2Ugb2YgdGhlIFN0YXRlIFRyZWFzdXJlcjEsMCoGA1UEAxMjT3JlZ29uIFN0YXRlIFRyZWFzdXJ5IFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"fff008b20f8ee90e4c5aaa17d09ef3f8aed6655a427538e3fb2d3504b6906b60","size":2174,"filename":"xv6VIcmRAUtsQmMX6xbFZdKy9CyqZlAGKv6q2fNSHWU=.pem","location":"security-state-staging/intermediates/4e1beacd-8dc6-4ec4-a0a1-34c554c6811c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xv6VIcmRAUtsQmMX6xbFZdKy9CyqZlAGKv6q2fNSHWU=","crlite_enrolled":false,"id":"52f6a804-6e60-45ab-9e53-115bc19880ea","last_modified":1562025090915},{"schema":1562025089412,"derHash":"fOHbfRbpv+gGkyFKPXxiY6okeJ45kBfmnt5IAuz29xE=","subject":"CN=NETLOCK Trust Qualified SCD CA,O=NETLOCK Ltd.,L=Budapest,C=HU","subjectDN":"MGAxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTkVUTE9DSyBMdGQuMScwJQYDVQQDDB5ORVRMT0NLIFRydXN0IFF1YWxpZmllZCBTQ0QgQ0E=","whitelist":false,"attachment":{"hash":"efcaaf465785dda6f37158642f960522b0fbb28b652b8dd1d415feb8b3843a40","size":2077,"filename":"e2y-IcyyWA7mZKQQFWLVH34cdYOha_33T_SE2Yj7jp8=.pem","location":"security-state-staging/intermediates/da84341e-9c4a-411d-81b2-cba5084edf77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e2y+IcyyWA7mZKQQFWLVH34cdYOha/33T/SE2Yj7jp8=","crlite_enrolled":false,"id":"33b62fc5-1349-4933-8a0b-bac57c2adc38","last_modified":1562025090175},{"schema":1562025085617,"derHash":"QyY5E7SD628LAgVA+Pe+Ch18nOdlL+D7R0PXITOTVRw=","subject":"CN=Beame.io CA 1,O=Beame.io Ltd,L=Tel Aviv-Jaffa,ST=Tel Aviv,C=IL","subjectDN":"MGgxCzAJBgNVBAYTAklMMREwDwYDVQQIEwhUZWwgQXZpdjEXMBUGA1UEBxMOVGVsIEF2aXYtSmFmZmExFTATBgNVBAoTDEJlYW1lLmlvIEx0ZDEWMBQGA1UEAxMNQmVhbWUuaW8gQ0EgMQ==","whitelist":false,"attachment":{"hash":"2ede44f6018db9de8c44fdb625cfc55d1f5acf992c2e1601671f84f30bf8b229","size":1800,"filename":"5fxJ002g5Il0LSaAZtiEC7BeF8z-cxBoMLk7llE9WeI=.pem","location":"security-state-staging/intermediates/75df26fa-72c6-408e-b18d-8816a9d5bcfd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fxJ002g5Il0LSaAZtiEC7BeF8z+cxBoMLk7llE9WeI=","crlite_enrolled":false,"id":"d73fd51e-4861-4081-91b1-760652365c4d","last_modified":1562025086359},{"schema":1562025083342,"derHash":"XIDlafzuk/FaK8BDUQKyagT1qh7JkSwToFiBwarVAtI=","subject":"CN=Cleverbase ID PKIoverheid Burger CA - G3,O=Cleverbase ID B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRswGQYDVQQKDBJDbGV2ZXJiYXNlIElEIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTY3NDE5OTI1MTEwLwYDVQQDDChDbGV2ZXJiYXNlIElEIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"aac14b1ffb25fc6fffba063081448afc1a36690e2d88f82e7b95e6c951203ba5","size":2515,"filename":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps_pS8BKM=.pem","location":"security-state-staging/intermediates/3ed57a24-3064-4897-9209-cdf438896a68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c3WqQNTp8NSwj6Ar5Z3bAzdLCkLGhqGXOVps/pS8BKM=","crlite_enrolled":false,"id":"0279ebd1-4242-44b7-a1a2-73190b4f1f39","last_modified":1562025084103},{"schema":1562025081828,"derHash":"yrnBLb3jrV0rwCAbVLGL4gnNXhRqqghau98kGwlt/0c=","subject":"CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==","whitelist":false,"attachment":{"hash":"02738114b030370213ecaf8808b823088a25f270059a42ccf2185bd1d5cdbf7f","size":2170,"filename":"KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem","location":"security-state-staging/intermediates/fb6d60a1-e61a-44fd-961d-965bb7c9fb88.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=","crlite_enrolled":true,"id":"6356ab18-9e19-400c-8782-0d5c6bbea774","last_modified":1562025082569},{"schema":1562025081075,"derHash":"PXdLZe6V/W79HIcytX5gfJvuQjw25G9uHMjKHwrmLiM=","subject":"CN=TrustAsia Secure Enterprise Email CA,OU=www.trustasia.com,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MH8xCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMRowGAYDVQQLExF3d3cudHJ1c3Rhc2lhLmNvbTEtMCsGA1UEAxMkVHJ1c3RBc2lhIFNlY3VyZSBFbnRlcnByaXNlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"20b01b33815a02bfa2f3c548a9482ee66729f3a9eb6744f9b7b7a0a4acbf9d6f","size":1711,"filename":"5AZRODSr4yzVRSQdofdzrLh4-_fDra8nT16mH7dhrIA=.pem","location":"security-state-staging/intermediates/4a0d1ac7-535b-4466-a0e8-0dd4b614ecc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5AZRODSr4yzVRSQdofdzrLh4+/fDra8nT16mH7dhrIA=","crlite_enrolled":false,"id":"94318fe7-87ee-4ceb-b386-6938eb65acae","last_modified":1562025081815},{"schema":1562025077308,"derHash":"IxbQWi4tNH+hQRNbmO0J9W6B8c9WeXk9OzndbY5GGkg=","subject":"CN=D-TRUST CA 2-2 EV 2016,O=D-Trust GmbH,C=DE","subjectDN":"MF4xCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxHzAdBgNVBAMTFkQtVFJVU1QgQ0EgMi0yIEVWIDIwMTYxFzAVBgNVBGETDk5UUkRFLUhSQjc0MzQ2","whitelist":false,"attachment":{"hash":"0825406b026a6a7eccc3247066b51626c668bc7f4c309505d5c1e32a1af60822","size":2182,"filename":"i6ujKRFlQ2Ig06L83VzPhB9sBlGOZCDwkUjNLjHtSJo=.pem","location":"security-state-staging/intermediates/8b7d4055-606f-43ea-83f8-a86a2a904797.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i6ujKRFlQ2Ig06L83VzPhB9sBlGOZCDwkUjNLjHtSJo=","crlite_enrolled":true,"id":"6fc15004-2622-45ba-a821-4bcba503d6f5","last_modified":1562025078039},{"schema":1562025076548,"derHash":"vzLalUVxZZqvcVwT7nA+NkPfy67uLYIRDKaOtXy2fOA=","subject":"CN=TUBITAK Kamu SM SSL Sertifika Hizmet Saglayicisi - Surum 1,OU=Kamu Sertifikasyon Merkezi - Kamu SM,O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK,L=Gebze - Kocaeli,C=TR","subjectDN":"MIHfMQswCQYDVQQGEwJUUjEYMBYGA1UEBwwPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKDDlUdXJraXllIEJpbGltc2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsMJEthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTFDMEEGA1UEAww6VFVCSVRBSyBLYW11IFNNIFNTTCBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpIC0gU3VydW0gMQ==","whitelist":false,"attachment":{"hash":"ab10fd30609bc30f75d3ede708f810cf2fdb009802424fd6ed3e4c6bf308db7c","size":2296,"filename":"FUrqo5K2woGDo0xUxDmAoLHpCJRt3-d67a7xGdVm1s8=.pem","location":"security-state-staging/intermediates/56f71156-d839-4560-9fe4-299ea364f331.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FUrqo5K2woGDo0xUxDmAoLHpCJRt3+d67a7xGdVm1s8=","crlite_enrolled":true,"id":"461c30ef-db33-4e0c-bcf1-c4fb264c2a61","last_modified":1562025077300},{"schema":1562025075778,"derHash":"zWwQig5kHyyhIqqm0D+CZ1nK58b4AOq/dtxItnzQg84=","subject":"CN=COMODO ECC Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"7facb26c244929edfadc101e9d19a9d34d32396b62ea53c5d23503e6bc13eb7d","size":1317,"filename":"x9SZw6TwIqfmvrLZ_kz1o0Ossjmn728BnBKpUFqGNVM=.pem","location":"security-state-staging/intermediates/fffcaf3e-173f-4e58-b6c4-9954f5874559.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x9SZw6TwIqfmvrLZ/kz1o0Ossjmn728BnBKpUFqGNVM=","crlite_enrolled":true,"id":"c6b2463c-5d7d-46a7-81b3-08d470deb2cb","last_modified":1562025076540},{"schema":1562025073491,"derHash":"x+l2qnfpJJHCaYQLLxRh5lFHorsYHuWatjvNhnBP5FY=","subject":"CN=SHECA RSA Code Signing CA G3,O=UniTrust,C=CN","subjectDN":"MEcxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDElMCMGA1UEAwwcU0hFQ0EgUlNBIENvZGUgU2lnbmluZyBDQSBHMw==","whitelist":false,"attachment":{"hash":"04a5c4549fb8f38d3d8667477114ebb450959d81527a986faab3d950083f6f57","size":1999,"filename":"1ZF5amwL4aSG-YZ86E54FJywudjHd13EF9RlMionCIk=.pem","location":"security-state-staging/intermediates/7f712404-bc1b-47a2-932b-37e11e83d004.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1ZF5amwL4aSG+YZ86E54FJywudjHd13EF9RlMionCIk=","crlite_enrolled":false,"id":"494cbaa5-812e-4b2f-955d-b47b33fc6092","last_modified":1562025074261},{"schema":1562025072011,"derHash":"UCx6hwNB175n2ybb+s+WR6/YmoVL+IEvpO9ww1bsE+U=","subject":"CN=VR IDENT SSL CA 2018,OU=VR IDENT,O=Fiducia & GAD IT AG,C=DE","subjectDN":"MF0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMREwDwYDVQQLDAhWUiBJREVOVDEdMBsGA1UEAwwUVlIgSURFTlQgU1NMIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"bef7765a6512b8ca9ae0249e5ae13feb4bab372a421c7f5baac1aa38a4051dc3","size":2097,"filename":"9frFyfDp-D9WCFjQblKwXUi5EgVRtx22594YJETOc_Y=.pem","location":"security-state-staging/intermediates/82a38024-ae36-439e-82e2-33dccd4b696e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9frFyfDp+D9WCFjQblKwXUi5EgVRtx22594YJETOc/Y=","crlite_enrolled":true,"id":"d70ce8a6-7038-4f00-b159-048f0e1bb4a7","last_modified":1562025072738},{"schema":1562025065222,"derHash":"Z7vZFEbTre+bIcBXaZbc2OZmjWsMEz8Ha5H6cc7mtCg=","subject":"CN=eMudhra ECC Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for eMudhra Technologies Ltd.,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIHhMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxSDBGBgNVBAsTP0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgZU11ZGhyYSBUZWNobm9sb2dpZXMgTHRkLjE5MDcGA1UEAxMwZU11ZGhyYSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"f4e2753836be21882cf81baaf3794e45c6251465fdc3122487eaf955a4717b2c","size":1475,"filename":"4ilprzeauYUkRwucZKCyuMuQcVH9en_FzR8kab23FUw=.pem","location":"security-state-staging/intermediates/5dde594d-faa8-45b6-b6dc-05a87417963b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4ilprzeauYUkRwucZKCyuMuQcVH9en/FzR8kab23FUw=","crlite_enrolled":false,"id":"2a3b5d82-65bb-4191-8f82-c390f1255cee","last_modified":1562025065952},{"schema":1562025064486,"derHash":"n+MG5mPkWWRGRPYKcVOiIUNvuXAaDr2RJO74FZ0Vy0M=","subject":"CN=Volusion\\, Inc. DV SSL CA - G5,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEc1","whitelist":false,"attachment":{"hash":"d600675b0ea244526a7e982b0b42e29a9e2f8c443783402839710f9d61aa039d","size":1780,"filename":"0qaE-lR_HlMyGUft-kaWwHccbGBGkL_WTsxQSJfcsSY=.pem","location":"security-state-staging/intermediates/7aa3b67a-7df3-4fce-87db-ff1f1ed65a32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0qaE+lR/HlMyGUft+kaWwHccbGBGkL/WTsxQSJfcsSY=","crlite_enrolled":false,"id":"0a95c72f-274f-4fd6-82c2-b58fc7d5898c","last_modified":1562025065214},{"schema":1562025063738,"derHash":"DagZ5S3YXGv8iJljXIvbtq8PtPKDBK4R22eaZ+q2jtU=","subject":"CN=Gehirn Managed Certification Authority - RSA Code Signing,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMUIwQAYDVQQDEzlHZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBDb2RlIFNpZ25pbmc=","whitelist":false,"attachment":{"hash":"35d2dd8a48c50a74aef445ab0ec7bae08b2819039adc788c1de3b36cf7650cff","size":2146,"filename":"5rb709u6Spj2XvBxL9BirCoj9Rgkne_qaJSTgc_p_BE=.pem","location":"security-state-staging/intermediates/f20a11f5-df0f-477e-a442-c14708d9220b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rb709u6Spj2XvBxL9BirCoj9Rgkne/qaJSTgc/p/BE=","crlite_enrolled":false,"id":"7c6dfd39-8b1c-4df2-8ef3-b8c4f355d6db","last_modified":1562025064478},{"schema":1562025062950,"derHash":"z3z6T528y8ptIO/evq1OFzs052vaHrHmGfROBulfwgg=","subject":"CN=Wells Fargo Public Trust Certification Authority 01 G2,OU=Organization Validated TLS,O=Wells Fargo & Company,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzEeMBwGA1UECgwVV2VsbHMgRmFyZ28gJiBDb21wYW55MSMwIQYDVQQLExpPcmdhbml6YXRpb24gVmFsaWRhdGVkIFRMUzE/MD0GA1UEAxM2V2VsbHMgRmFyZ28gUHVibGljIFRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IDAxIEcy","whitelist":false,"attachment":{"hash":"6a95abe84c8fbfe5c918a8ab12dc0a36ee395740e96f9b6ac44f84ce7b6f2fd0","size":1727,"filename":"piL8cJbKkJ2PJeful08_TUBtZu6QcnuC-5qgNu13n_c=.pem","location":"security-state-staging/intermediates/997b2303-b010-4dfd-b758-6970b5ab0dad.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"piL8cJbKkJ2PJeful08/TUBtZu6QcnuC+5qgNu13n/c=","crlite_enrolled":true,"id":"a1e2fd83-de14-4ea7-89a4-a885aa53e074","last_modified":1562025063730},{"schema":1562025062205,"derHash":"/x4NIzGWt+wgvt/GWYjgrhmF7GrDMqea3/5xuGvAIIo=","subject":"CN=Trustwave Organization Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIG1MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE9MDsGA1UEAxM0VHJ1c3R3YXZlIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNIQTI1NiBDQSwgTGV2ZWwgMTEfMB0GCSqGSIb3DQEJARYQY2FAdHJ1c3R3YXZlLmNvbQ==","whitelist":false,"attachment":{"hash":"c4e85dd715d693fa9930a447454ded3d627e3d3b3b286d7920644bb09c1f9485","size":1788,"filename":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=.pem","location":"security-state-staging/intermediates/47da45ba-e89b-4a33-9469-9f4ccb00099f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OSqnIRIhJQGKEtc7abZMpS4Y3djh39opzqI2WqlYVqM=","crlite_enrolled":true,"id":"146dea34-1807-4e59-b4c6-47e194cb050a","last_modified":1562025062941},{"schema":1562025061470,"derHash":"ypcck2xpm8XWpgnSUp+QOmD24UGizxK+cjE9pQymThc=","subject":"CN=Entrust Certification Authority - L1C,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\\, Inc.,O=Entrust\\, Inc.,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFD","whitelist":false,"attachment":{"hash":"e336697d6d6d247a3534a773c8f042c58cc674921c708305291fc08c2c8f71c1","size":1780,"filename":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS-Ui0bQ94=.pem","location":"security-state-staging/intermediates/05273d59-b2eb-4c09-919e-6bb3e8f76735.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VFv5NemtodoRftw8KsvFb8AoCWwOJL6bOJS+Ui0bQ94=","crlite_enrolled":false,"id":"173e072b-5593-4d2c-a599-a3f87cc0518b","last_modified":1562025062198},{"schema":1562025059950,"derHash":"mxby9oDXxL1qZ/YJNA2mQWq/nkPxMmsBuYgZInHQtfI=","subject":"CN=TWCA Secure SSL Certification Authority,OU=Secure SSL Sub-CA,O=TAIWAN-CA,C=TW","subjectDN":"MG8xCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExGjAYBgNVBAsTEVNlY3VyZSBTU0wgU3ViLUNBMTAwLgYDVQQDEydUV0NBIFNlY3VyZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"acd717a163c1e31ec674bb2953f2f16be424838b5d36e703984df5d77c80d023","size":2032,"filename":"8hqbhsMMFPaPA8t81pxqFer9-neHBcQvO7-TAKjWkb0=.pem","location":"security-state-staging/intermediates/264eee83-19f9-4406-ab9f-ae5fc55e9a70.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8hqbhsMMFPaPA8t81pxqFer9+neHBcQvO7+TAKjWkb0=","crlite_enrolled":true,"id":"2535f8ba-07ba-4b54-85a8-742db433036d","last_modified":1562025060710},{"schema":1562025058467,"derHash":"eUxj2yRLpz+yhvFdq40MpUJVCDgemIRJVOY4I7tdf3Q=","subject":"CN=TERENA Code Signing CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MHAxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEkMCIGA1UEAxMbVEVSRU5BIENvZGUgU2lnbmluZyBDQSAzIEcz","whitelist":false,"attachment":{"hash":"67d12a6df588120ded0c554ece180c84351d42fc41dbf982b6948dab2df22467","size":1597,"filename":"FeQyg5uKifHhVqnOqFJSwfGgb8uYTvS8cKI3bV75nCc=.pem","location":"security-state-staging/intermediates/62b75d9a-a2dd-494d-a88d-c787419e47d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FeQyg5uKifHhVqnOqFJSwfGgb8uYTvS8cKI3bV75nCc=","crlite_enrolled":false,"id":"539ffd44-f8ec-443f-8e22-8157ceeced08","last_modified":1562025059208},{"schema":1562025056217,"derHash":"8crKarI1CnZowT5BlgkIaB2vzH42jcuNR/7PljE5BIE=","subject":"CN=TrustAsia ECC OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVzdEFzaWEgRUNDIE9WIFRMUyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"6c1475f6577a7d8b8cd4032290f9d3b4f16ef261f5dea618390de753433264ba","size":1435,"filename":"Gk60bmqo_Mr2nOHuGjR4JqFa8B4v-ZsjwYEWTGOxLZ8=.pem","location":"security-state-staging/intermediates/80dd276f-7f90-4ae3-bab0-8c263d2a1ebf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Gk60bmqo/Mr2nOHuGjR4JqFa8B4v+ZsjwYEWTGOxLZ8=","crlite_enrolled":true,"id":"63b7bdc2-0b6c-4e17-a4de-f25eb0e600ee","last_modified":1562025056958},{"schema":1562025054736,"derHash":"YaAep+jYAWzO+S/xPj2+CC4HecTLZL9vDDFiWNYhD1w=","subject":"CN=Postecom CS5,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT","subjectDN":"MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNQ==","whitelist":false,"attachment":{"hash":"f73449e65874ddaf76a68ad4ca913f3ef07165a4119dcb650289f8ff2ba6de0e","size":1821,"filename":"S7BcBDWMjWvsvh-sjH2B5aN-jXOOiQoUlhVMqtpLSWw=.pem","location":"security-state-staging/intermediates/cdd87641-44fd-450b-9842-0b4bacada09c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S7BcBDWMjWvsvh+sjH2B5aN+jXOOiQoUlhVMqtpLSWw=","crlite_enrolled":false,"id":"89689b27-7f23-4f31-a04c-fef27fbc6e21","last_modified":1562025055469},{"schema":1562025053217,"derHash":"1B0jxRVZ9l5cIlA9enq/XNll7DnGHGmKfZjXl69we0g=","subject":"CN=QuoVadis PKIoverheid Burger CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMzAyMzc0NTkxLDAqBgNVBAMMI1F1b1ZhZGlzIFBLSW92ZXJoZWlkIEJ1cmdlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"c7a9f074902a6aa68cc5daf09ea2342f7c79943b0a12ce3c81b74e5b11a70d93","size":2515,"filename":"yXbbq97SU3naAOm_9b7Z3abjalu8evwL90mvR5tYrxI=.pem","location":"security-state-staging/intermediates/31886e5b-8fc9-43a9-be21-dedceb3da392.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yXbbq97SU3naAOm/9b7Z3abjalu8evwL90mvR5tYrxI=","crlite_enrolled":false,"id":"6ff3e434-3089-4258-9de6-40967e5f4132","last_modified":1562025053958},{"schema":1562025050938,"derHash":"RN/NLFcxEOdL9OhZA1lfZgZQ7ZJbcwZULFToc5ZnHwM=","subject":"CN=Entrust Timestamping CA - TS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIGyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSYwJAYDVQQDEx1FbnRydXN0IFRpbWVzdGFtcGluZyBDQSAtIFRTMQ==","whitelist":false,"attachment":{"hash":"577dbd9da74652ee25974192c61a23516212a969fc34528add1fcc80925bd074","size":1821,"filename":"2ZRlUMP6KnCWtb1kDwzUvFMy7HFk7d75zoOnwZikIso=.pem","location":"security-state-staging/intermediates/d1400fc2-ba20-411a-a9ec-82f2036a0d41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZRlUMP6KnCWtb1kDwzUvFMy7HFk7d75zoOnwZikIso=","crlite_enrolled":true,"id":"2e96e934-bc60-4e45-b1ae-6ac3cd4d7192","last_modified":1562025051685},{"schema":1562025050182,"derHash":"WkmxWuYP9ifaJyqHQ9ZxYrrKEJYWggMhOs+CJ69MSUI=","subject":"CN=Herritar eta Erakundeen CA - CA de Ciudadanos y Entidades (3),OU=NZZ Ziurtagiri publikoa - Certificado publico SCI,O=IZENPE S.A.,C=ES","subjectDN":"MIGnMQswCQYDVQQGEwJFUzEUMBIGA1UEChMLSVpFTlBFIFMuQS4xOjA4BgNVBAsTMU5aWiBaaXVydGFnaXJpIHB1Ymxpa29hIC0gQ2VydGlmaWNhZG8gcHVibGljbyBTQ0kxRjBEBgNVBAMTPUhlcnJpdGFyIGV0YSBFcmFrdW5kZWVuIENBIC0gQ0EgZGUgQ2l1ZGFkYW5vcyB5IEVudGlkYWRlcyAoMyk=","whitelist":false,"attachment":{"hash":"d85bcef74f09e1dbd2ce16da48da2ee5fc7a20a7fff9caa5dc49af6709f5f48c","size":2576,"filename":"bMhIINBfI65xm4qrUlaPfhKn2U2zsWEE7sOwUjKeoT8=.pem","location":"security-state-staging/intermediates/d89eb328-693b-4b24-90f8-34bf2e499dca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bMhIINBfI65xm4qrUlaPfhKn2U2zsWEE7sOwUjKeoT8=","crlite_enrolled":true,"id":"fb272741-7da4-469b-ab59-52ece6f412f9","last_modified":1562025050930},{"schema":1562025048669,"derHash":"O21wEzGoy4CUQ+QqcyutZ18iWxXMQ5rPJqCVh8iF7P0=","subject":"CN=Symantec Class 3 ECC 256 bit SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVjIENsYXNzIDMgRUNDIDI1NiBiaXQgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"dd8428516f7ee04d365e81abc17f14b27db1dd65e497858fb5076ee6a42789d1","size":1544,"filename":"pvsOo_07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=.pem","location":"security-state-staging/intermediates/c43cbcd9-1879-4ef8-a529-ade872f5c07d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pvsOo/07kXBfe36yjJgm6H46EJRe7gurjSAeunJgFyg=","crlite_enrolled":true,"id":"76183d88-9a69-4233-a9d4-377d8af9daef","last_modified":1562025049405},{"schema":1562025045660,"derHash":"IR3fUFkimzV3dg1iPVFI25Ly0FJupTA+fuoDANn6/z8=","subject":"CN=GeoTrust SSL CA - G4,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"4b9e0e629f273674af2b982675d640bf5da8b3cc39e14022da35f88d46659b08","size":1492,"filename":"QoTQx7p3k0wVLzWrcAjFS6UajzFlS4Lr9rtoIZxCk4g=.pem","location":"security-state-staging/intermediates/c774e78c-fcab-4c20-88c0-0ac1d943184e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QoTQx7p3k0wVLzWrcAjFS6UajzFlS4Lr9rtoIZxCk4g=","crlite_enrolled":false,"id":"eefd72ee-9737-4b19-895e-8b65b055fa5f","last_modified":1562025046407},{"schema":1562025044898,"derHash":"VIN+97WsSqI2BqFe8w3kbpu34j5g9u1PJhIJK5Ttxo8=","subject":"CN=Data Management Intermediate Certificate Authority,OU=Fresenius Kabi USA,O=Fresenius Kabi AG,C=US","subjectDN":"MIGDMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRRnJlc2VuaXVzIEthYmkgQUcxGzAZBgNVBAsTEkZyZXNlbml1cyBLYWJpIFVTQTE7MDkGA1UEAxMyRGF0YSBNYW5hZ2VtZW50IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"e31d3bb304fdcef75199ff47761dd7a91e1a654cedec5485da203640dc0eee39","size":1748,"filename":"6tOYk51VDHXklgQiMTHvUHAqQsHRj8do_RweZi812do=.pem","location":"security-state-staging/intermediates/941016f3-c0dc-47ea-8440-1a189d509dbf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6tOYk51VDHXklgQiMTHvUHAqQsHRj8do/RweZi812do=","crlite_enrolled":true,"id":"1e9a1998-a52f-498c-8217-0418e4aaeb12","last_modified":1562025045652},{"schema":1562025043405,"derHash":"umoMEXDhxzI4YHSbXnsO02WXXY/JB0CxXXD4Q6I5SUI=","subject":"CN=Secure Site Pro CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xGzAZBgNVBAMTElNlY3VyZSBTaXRlIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"66b49fd854d0f3af5d909f8ce76dcf4b94b573305dd98b683cde0582e3dfb8c4","size":1674,"filename":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=.pem","location":"security-state-staging/intermediates/c371d115-079f-4788-8e8b-6a4ee2c482b2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yFzqzO6UfU8CG8Xw6hrhKs8Wc7kjwaPPHpMW5A4WT3k=","crlite_enrolled":true,"id":"283d1332-2aae-4370-8412-97de93ae7f53","last_modified":1562025044153},{"schema":1562025041146,"derHash":"ayMo5//1mLKt+Qt/PqQrRfpgbXjisRe31g6Z6CjPdWU=","subject":"CN=SecurityMetrics DigiCert EV CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMScwJQYDVQQDEx5TZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgRVYgQ0E=","whitelist":false,"attachment":{"hash":"336f835546bcbd7bfe88c38d0c674fd47a6a5c5be1a5486d4daa23f269db4fcd","size":2316,"filename":"f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=.pem","location":"security-state-staging/intermediates/7c79f9fa-67cb-4c11-82e6-64052aec3db6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f8vazxLVGT76Jd96F8flimC6GezMF1z65oKBNglhwWI=","crlite_enrolled":false,"id":"628f9c50-cfa7-4a7f-b0c3-3351d5f5cf3a","last_modified":1562025041897},{"schema":1562025035890,"derHash":"ZJkbaYayLPAGSdr4+pIu2aFNyDBcznzYNyy/SGXmrzU=","subject":"CN=InCommon RSA Standard Assurance Client CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEyMDAGA1UEAxMpSW5Db21tb24gUlNBIFN0YW5kYXJkIEFzc3VyYW5jZSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"5516a3bdf31fbe862f6d40c679b1e72adff036e89dc6da16d3f805c225393b32","size":2146,"filename":"eMuPzKB_rex8LWz8BNirHFcDvwMQzLyJm8N3Lt63-H0=.pem","location":"security-state-staging/intermediates/993a6a3b-3703-47e1-b7d3-1b59393d7302.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eMuPzKB/rex8LWz8BNirHFcDvwMQzLyJm8N3Lt63+H0=","crlite_enrolled":true,"id":"f5dcc1de-de9d-438d-96d4-2168936f35d2","last_modified":1562025036647},{"schema":1562025035117,"derHash":"RCLpY+5TzVjMn4XNQL9f/sAJX98aFUU1ZhwcBrytxps=","subject":"CN=RapidSSL TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBSU0EgQ0EgRzE=","whitelist":false,"attachment":{"hash":"69d032f5f19ec96ac1d0f6f0b439e8d2c2bfd00ab74cdabf88312932bac1b34f","size":1691,"filename":"E3tYcwo9CiqATmKtpMLW5V-pzIq-ZoDmpXSiJlXGmTo=.pem","location":"security-state-staging/intermediates/375bde0a-beb6-483a-9339-61f13f530c25.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E3tYcwo9CiqATmKtpMLW5V+pzIq+ZoDmpXSiJlXGmTo=","crlite_enrolled":true,"id":"59d85ee5-bf80-40cd-a805-345268365f1f","last_modified":1562025035883},{"schema":1562025032835,"derHash":"qOuP4Jnphs1iLWIRX+xzCnBUIvTTRlns8XvdbSZe+WQ=","subject":"SERIALNUMBER=201724,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI0","whitelist":false,"attachment":{"hash":"c362bc91d6eb297cf53c9ce9a9b934af9e305ffa3e0cc90c664c495fee09c6ff","size":2402,"filename":"YTmDkSKXvIVulXo3XSSMwIrhUc6vs-5me4IYjfUANq4=.pem","location":"security-state-staging/intermediates/c1485633-198e-4497-9bc4-30b5e3e29c77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YTmDkSKXvIVulXo3XSSMwIrhUc6vs+5me4IYjfUANq4=","crlite_enrolled":false,"id":"f7154206-f444-4a55-bee3-ce319dda62c2","last_modified":1562025033589},{"schema":1562025031339,"derHash":"ghzFXOfsXHT+u0L2JOtqNsR4IVox7Wfjz3I6Z+jHXro=","subject":"CN=cPanel\\, Inc. Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMS0wKwYDVQQDEyRjUGFuZWwsIEluYy4gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"cc5ca55f55fe8db39161538d89c9181ab530eb451e3e3b5363c71f91b98190bd","size":2121,"filename":"hOF1upiO-xevnDEQ13g3aY3M3Uqa44RN5rVlwvU2WC8=.pem","location":"security-state-staging/intermediates/5083a119-aa5f-40e8-ad0e-86d5bc86d01f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hOF1upiO+xevnDEQ13g3aY3M3Uqa44RN5rVlwvU2WC8=","crlite_enrolled":true,"id":"7e0a7eb1-8624-47dc-a0e1-488b57b12c42","last_modified":1562025032080},{"schema":1562025030594,"derHash":"RbKjpNBu5lLpQPq8pc2HIcH7f+7Yt1sMx/Bn4dJuLP4=","subject":"CN=TrustAsia ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTVHJ1c3RBc2lhIEVDQyBDQSBHOQ==","whitelist":false,"attachment":{"hash":"bd06281ba8b65c487bcaf02e8c67fced703516ea1e968c14dad4048435006cb1","size":1158,"filename":"E_JWIAleox34urTjQsyJItGCeb7utaBK4A4Q4BxWn7Q=.pem","location":"security-state-staging/intermediates/53fd78cb-a50d-4f97-aae6-46787d4f5ee8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"E/JWIAleox34urTjQsyJItGCeb7utaBK4A4Q4BxWn7Q=","crlite_enrolled":false,"id":"2c378a94-8c79-4f69-9f15-f546474cf1e0","last_modified":1562025031331},{"schema":1562025026869,"derHash":"Y0wIQiwQQdC0OZj4cgnfyt+ALReYKkGINkYQ47JwIuY=","subject":"CN=TrustOcean EV SSL CA - ECC - 2019,OU=Controlled by Sectigo exclusively for TrustOcean Ltd.+OU=ECC Extended Validation Secure Server - 2019,O=TrustOcean Ltd.,L=Denver,ST=CO,C=US","subjectDN":"MIHoMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPVHJ1c3RPY2VhbiBMdGQuMT4wPAYDVQQLEzVDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFRydXN0T2NlYW4gTHRkLjE1MDMGA1UECxMsRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciAtIDIwMTkxKjAoBgNVBAMTIVRydXN0T2NlYW4gRVYgU1NMIENBIC0gRUNDIC0gMjAxOQ==","whitelist":false,"attachment":{"hash":"c519d329637101adf8248c369a8ab756f60797499dbf135d441c9e2ce13d0271","size":1488,"filename":"Vc2_CgGqt67rbPDmVebdbcjW8DdUmegpdRVNRHMHKK8=.pem","location":"security-state-staging/intermediates/500b6284-ebaf-43a0-9c1b-6ef5e20dd053.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Vc2/CgGqt67rbPDmVebdbcjW8DdUmegpdRVNRHMHKK8=","crlite_enrolled":false,"id":"bbdc2c26-85fe-4475-95d7-a38dbd368c3e","last_modified":1562025027604},{"schema":1562025022401,"derHash":"Jb/bHF/izOBR7G378rsk54yS+WmxuzeGfa7fk9Gnrn4=","subject":"CN=SHECA Extended Validation SSL CA,O=UniTrust,C=CN","subjectDN":"MEsxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEpMCcGA1UEAwwgU0hFQ0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTU0wgQ0E=","whitelist":false,"attachment":{"hash":"42b647c52ed57012729814fa390a3a85ee801287cea6820f002c3e2d0f8cb467","size":1959,"filename":"J1sjCSbhps4X1wNpt4UhFDB8y_McQPnMa3S-sE4q0u0=.pem","location":"security-state-staging/intermediates/270af4bc-d20d-421d-baa5-121348e70203.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J1sjCSbhps4X1wNpt4UhFDB8y/McQPnMa3S+sE4q0u0=","crlite_enrolled":false,"id":"d83176fc-a4d2-461d-84e7-446080d64684","last_modified":1562025023133},{"schema":1562025021661,"derHash":"vbeqKPFk5LwV1pIHM7Ij7ZjlUiCj5W87Hs/QTofTC3E=","subject":"CN=InCommon ECC Server CA,OU=InCommon,O=Internet2,L=Ann Arbor,ST=MI,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNSTESMBAGA1UEBxMJQW5uIEFyYm9yMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMR8wHQYDVQQDExZJbkNvbW1vbiBFQ0MgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"bd2692889db0e772b2adde17ac8a48c54a2d7f098304383c50e831df081e8097","size":1293,"filename":"8Ped1-_2NPqUB2Q-UJri8oBJaaIrldtkbw8LmkGTkrE=.pem","location":"security-state-staging/intermediates/c7b87f92-6e81-430b-96fe-25ebc26395bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8Ped1+/2NPqUB2Q+UJri8oBJaaIrldtkbw8LmkGTkrE=","crlite_enrolled":true,"id":"f7abff5f-fd5e-4449-bd72-971145c852f0","last_modified":1562025022393},{"schema":1562025020924,"derHash":"qfjQ7GD3LYrIefbjzDgOUACYvACAwHrFOfrmglQ//AI=","subject":"CN=UbiquiTLS\u2122 DV ECC Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGAMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEmMCQGA1UEAwwdVWJpcXVpVExT4oSiIERWIEVDQyBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"1cf7f75e73f68c6177fe790e1d4a9c2fe8833648fe4b568093a3cd04201f3bce","size":1293,"filename":"PCnX_sRleYJP1z0cO3yKQbR6-NN9ywVZIPJzzytrEH8=.pem","location":"security-state-staging/intermediates/322e50ca-ba44-4200-89bd-bdf704bce13c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PCnX/sRleYJP1z0cO3yKQbR6+NN9ywVZIPJzzytrEH8=","crlite_enrolled":false,"id":"da8c9975-55f9-4df4-8621-e6a574681b68","last_modified":1562025021653},{"schema":1562025017923,"derHash":"d/6HahxHY0n165rpv1P3gUoK5BFWJmfFi37SeGnFQJE=","subject":"CN=Symantec Class 3 ECC 384 bit Extended Validation CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAMTM1N5bWFudGVjIENsYXNzIDMgRUNDIDM4NCBiaXQgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"4d67dc1e033fc9d483ce72d6b2665130f2837b5d642207e8d127e5fa9124e5fb","size":1451,"filename":"Rj9-JX3TAMGFOmCkoBiFCNUGzpcbKCjKv1dH5mqR0wo=.pem","location":"security-state-staging/intermediates/0c746153-158f-4efa-a07b-d38f5298431c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rj9+JX3TAMGFOmCkoBiFCNUGzpcbKCjKv1dH5mqR0wo=","crlite_enrolled":false,"id":"f5db4a59-ac54-49e3-b94d-2b61159c94ce","last_modified":1562025018653},{"schema":1562025017174,"derHash":"Rh+0YuUdVKWaBBzVplF2CuhHrhwnwQOIfVLsCV9o5zw=","subject":"CN=Oracle RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMRkwFwYDVQQDExBPcmFjbGUgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"c6475b4f4c4fecb05c8501f5cc0843d9255b24c61d4ff8f2e5c97fbc6b780faf","size":1687,"filename":"5YjN9RnyFnf-H3-j50ooFCdGoEN44UPUyAMy2UFnZYY=.pem","location":"security-state-staging/intermediates/12c5bd58-7852-4637-a5cb-95ca447bc7e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5YjN9RnyFnf+H3+j50ooFCdGoEN44UPUyAMy2UFnZYY=","crlite_enrolled":false,"id":"0ee8a5b9-c069-43f3-ada0-e50684926783","last_modified":1562025017915},{"schema":1562025016420,"derHash":"S5bvoShnuKvyrZtO2/op2eCJsYO7XLfIG4OT+mlr0ME=","subject":"SERIALNUMBER=201901,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDE=","whitelist":false,"attachment":{"hash":"19844f98179cd99f2c77dee6696880e76d7b2450ccdd651197a6ff8fd22b5edd","size":2337,"filename":"42J41ut5RRKEnkyB1fMHY7UKcEEByr5294Y5ffs_a6Q=.pem","location":"security-state-staging/intermediates/30bef80e-101a-4453-bd8d-ac9065a9f125.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"42J41ut5RRKEnkyB1fMHY7UKcEEByr5294Y5ffs/a6Q=","crlite_enrolled":false,"id":"93b323b4-b4ee-4918-b6e5-97943a6135df","last_modified":1562025017166},{"schema":1562025015677,"derHash":"LQaxtec1DZSaC9WAU9/tbwJgrlMV1BMqDMg/8Ilck8o=","subject":"CN=University of Texas Health Science Center at San Antonio RSA CA,O=The University of Texas Health Science Center at San Antonio,L=San Antonio,ST=TX,C=US","subjectDN":"MIHBMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxFDASBgNVBAcTC1NhbiBBbnRvbmlvMUUwQwYDVQQKEzxUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBIZWFsdGggU2NpZW5jZSBDZW50ZXIgYXQgU2FuIEFudG9uaW8xSDBGBgNVBAMTP1VuaXZlcnNpdHkgb2YgVGV4YXMgSGVhbHRoIFNjaWVuY2UgQ2VudGVyIGF0IFNhbiBBbnRvbmlvIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"b5fb6720dcb740e7f089749a940f3ceaa8902143d027d65eff3d9013fa534d8e","size":2231,"filename":"nuC4L1p-OVZKcOe0o9CULKzfd9QuBwKRkV8NDZkcSAg=.pem","location":"security-state-staging/intermediates/e6c015a5-266c-46ba-907e-17bb1e4fc7c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nuC4L1p+OVZKcOe0o9CULKzfd9QuBwKRkV8NDZkcSAg=","crlite_enrolled":false,"id":"8bda349b-e57d-4195-bbfb-0da391a25173","last_modified":1562025016412},{"schema":1562025014914,"derHash":"8y3q8iznJGYfU9UocxGv8lQes47K9J3Yd7lAI+OhGx8=","subject":"CN=SecurityMetrics DigiCert CA,OU=www.securitymetrics.com,O=SecurityMetrics,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9TZWN1cml0eU1ldHJpY3MxIDAeBgNVBAsTF3d3dy5zZWN1cml0eW1ldHJpY3MuY29tMSQwIgYDVQQDExtTZWN1cml0eU1ldHJpY3MgRGlnaUNlcnQgQ0E=","whitelist":false,"attachment":{"hash":"0970375d7d27699620d3d11d4a82a61d6886f73e51c1c1866db791381de6880f","size":2312,"filename":"m-VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=.pem","location":"security-state-staging/intermediates/291f4913-8df6-4e94-90b5-40989c03e635.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"m+VKH0mPQWihT4uaJ80flL4auSAFAu5yhBL9G2W29xk=","crlite_enrolled":false,"id":"27307236-88cc-41cc-9958-6934903e04cc","last_modified":1562025015669},{"schema":1562025013420,"derHash":"T/QE8C4s0AGI8V0cAPS20eOLWjlc+FMU6uuoVbamS3U=","subject":"CN=Microsoft IT TLS CA 1,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgMQ==","whitelist":false,"attachment":{"hash":"dce0811c755bec02d9ace622121eef2a9874cd68090b416d4540e1b26ea3b012","size":2036,"filename":"xjXxgkOYlag7jCtR5DreZm9b61iaIhd-J3-b2LiybIw=.pem","location":"security-state-staging/intermediates/b826eaa3-3ebe-4464-bcb2-be9746c24afd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xjXxgkOYlag7jCtR5DreZm9b61iaIhd+J3+b2LiybIw=","crlite_enrolled":true,"id":"4dca8bde-78f0-4bc1-85cc-35b0938a893a","last_modified":1562025014163},{"schema":1562025012668,"derHash":"Ke2X6fDrxVWu4P2KN1niFsmHoKQLPvQvEbTlKW3w+38=","subject":"SERIALNUMBER=201704,CN=Citizen CA,O=http://repository.eid.belgium.be/,C=BE","subjectDN":"MF8xCzAJBgNVBAYTAkJFMSowKAYDVQQKEyFodHRwOi8vcmVwb3NpdG9yeS5laWQuYmVsZ2l1bS5iZS8xEzARBgNVBAMTCkNpdGl6ZW4gQ0ExDzANBgNVBAUTBjIwMTcwNA==","whitelist":false,"attachment":{"hash":"05f39765de9a3b2c8e30da66ee7955b8b5c1c1e49f4d56492af3ea16cc171541","size":2154,"filename":"ABkwhuUeukpacod9kYjopDaXWUb8vzCg9Sj51UrwBKY=.pem","location":"security-state-staging/intermediates/10b90d8e-2ee1-4303-8ce4-db7d6b0ca543.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ABkwhuUeukpacod9kYjopDaXWUb8vzCg9Sj51UrwBKY=","crlite_enrolled":false,"id":"767b3e09-f0c8-4aea-baa1-cf3c6d1f147c","last_modified":1562025013412},{"schema":1562025007428,"derHash":"klO/tmjz50OlJeSLX3UKimYDX4Bil8JfgTTcisljW9g=","subject":"CN=JCSI TLSSign Public CA,O=Cybertrust Japan Co.\\,Ltd.,C=JP","subjectDN":"MFIxCzAJBgNVBAYTAkpQMSIwIAYDVQQKExlDeWJlcnRydXN0IEphcGFuIENvLixMdGQuMR8wHQYDVQQDExZKQ1NJIFRMU1NpZ24gUHVibGljIENB","whitelist":false,"attachment":{"hash":"b6c1ba4e4707652fffa0f770954eae8f4d1bb58417950efc707c48d89d30379b","size":2044,"filename":"qU78sJ3fTvtBYPBxk_PfpIZWlA7ptK9MTP1UDx9LWdc=.pem","location":"security-state-staging/intermediates/27590e7a-01bd-4184-a4db-a987fa097a73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qU78sJ3fTvtBYPBxk/PfpIZWlA7ptK9MTP1UDx9LWdc=","crlite_enrolled":false,"id":"2038b122-978e-4534-b273-996f254ac1a8","last_modified":1562025008171},{"schema":1562025006676,"derHash":"ini5Zsc9dpBAwagcMhaM74ubnpbswtM8xKu1oM+MHGc=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzE=","whitelist":false,"attachment":{"hash":"bc63ae4e19f31debb6845226b79533d07f1386d720b838d6942383f100b944b4","size":1748,"filename":"oL6bQvdAH7Gl51lEx4-NJT-zVM6WKnbdLvbYv351Fbs=.pem","location":"security-state-staging/intermediates/d77d5ade-5702-4224-8823-39f280c0be1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oL6bQvdAH7Gl51lEx4+NJT+zVM6WKnbdLvbYv351Fbs=","crlite_enrolled":false,"id":"38109b7d-ce77-4cd9-8bf6-6b5796a2ed2c","last_modified":1562025007420},{"schema":1562025005179,"derHash":"LWArHxZtYxba/Ua0se3W3PxU0q+KlEvjWIWP1QSqoWs=","subject":"CN=Care360 Direct Intermediate CA,OU=Care360 Direct Messaging,O=Quest Diagnostics Care360,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlRdWVzdCBEaWFnbm9zdGljcyBDYXJlMzYwMSEwHwYDVQQLExhDYXJlMzYwIERpcmVjdCBNZXNzYWdpbmcxJzAlBgNVBAMTHkNhcmUzNjAgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"394755e945b33d461689f0afa1f1b626c96ad37e6df57aef74a65fd0c84c83db","size":2211,"filename":"4Vc-jglRQEtySvKvXdV2CykmL03fYouL0fdSgW7wqJQ=.pem","location":"security-state-staging/intermediates/532713a0-fee2-4438-97d6-ee210e310465.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4Vc+jglRQEtySvKvXdV2CykmL03fYouL0fdSgW7wqJQ=","crlite_enrolled":false,"id":"7f28c5f6-4818-447e-93d8-79fc00dc0c4a","last_modified":1562025005925},{"schema":1562024994614,"derHash":"pDSq5OFaVRnpsRH9COwZD9Kt8Tu+MIFcbhYGVVyzFFA=","subject":"CN=SwissSign EV Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"ME4xCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKDAmBgNVBAMTH1N3aXNzU2lnbiBFViBHb2xkIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"6adec53afaeac81fd0e85e675219c92a638f9f249f381dfac8c6f8f4b591b137","size":2389,"filename":"mDKR5ptpp7PqVUefxx2Ftq5ymsEuzCEg-EVrLOrQFB8=.pem","location":"security-state-staging/intermediates/0cec1d67-bead-4bb6-85d5-a11312ecfaf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mDKR5ptpp7PqVUefxx2Ftq5ymsEuzCEg+EVrLOrQFB8=","crlite_enrolled":true,"id":"ef05a6b5-bda6-4917-a51a-a6ce6523d866","last_modified":1562024995347},{"schema":1562024993127,"derHash":"wUkuup9JLsv21OTxHTm8GpATYz/Ae17pYwHXrUY7128=","subject":"SERIALNUMBER=201911,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEx","whitelist":false,"attachment":{"hash":"d093c41f1c66976da5a572a9fb9b4b9208f861756be1e55d561bddec0254d48d","size":2333,"filename":"jRLIyyb8zq9aIC8U6liq7FbbVW4DdfKK62nTd3qe12w=.pem","location":"security-state-staging/intermediates/488eb0e2-16c6-4962-8e20-ebbc1a7c6761.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jRLIyyb8zq9aIC8U6liq7FbbVW4DdfKK62nTd3qe12w=","crlite_enrolled":false,"id":"99c80d37-3b7e-41e4-93f6-5362973877d1","last_modified":1562024993860},{"schema":1562024988613,"derHash":"4l3pcKqLaFzfVUF4l/Zd5kxjpV1h7p5LgwJh3Pu//7Q=","subject":"CN=MRO Direct Intermediate CA,OU=MRO HIE Solutions,O=MRO Corporation,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9NUk8gQ29ycG9yYXRpb24xGjAYBgNVBAsTEU1STyBISUUgU29sdXRpb25zMSMwIQYDVQQDExpNUk8gRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"403c39acc06a843ef717880f0c744c3f6ac52dd30b6649cca22a386369ec3ecd","size":2178,"filename":"MJuewyCldXsYBFl3uqjzMgQjNypJNP7P7ZPLxer309A=.pem","location":"security-state-staging/intermediates/2dfbb453-65fa-4e13-833b-1cec6684dbb7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MJuewyCldXsYBFl3uqjzMgQjNypJNP7P7ZPLxer309A=","crlite_enrolled":false,"id":"0d7367cd-10af-416d-b55b-0ed7e9bd4837","last_modified":1562024989346},{"schema":1562024987874,"derHash":"xW8PKGYYweew4RLJe57pb+tNceeUlsFR+h/oqM69Bs0=","subject":"CN=NetLock CodeSign CA,OU=Certification Services,O=NetLock Ltd.,L=Budapest,C=HU","subjectDN":"MHYxCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEVMBMGA1UECgwMTmV0TG9jayBMdGQuMR8wHQYDVQQLDBZDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzMRwwGgYDVQQDDBNOZXRMb2NrIENvZGVTaWduIENB","whitelist":false,"attachment":{"hash":"a44be497ab772a1eb6e68b4bcd8d66f873262b6f8c218a461eb1a2916e56e4b6","size":2109,"filename":"e9x__uYSnevFMntPG5wGBZVLvAL83lTxZlVS9aGJ_-I=.pem","location":"security-state-staging/intermediates/3e50c772-6e6b-44a6-a9ca-2b159d8e0abb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e9x//uYSnevFMntPG5wGBZVLvAL83lTxZlVS9aGJ/+I=","crlite_enrolled":false,"id":"5f1127b1-8e1f-4f9e-9512-92bcde094385","last_modified":1562024988606},{"schema":1562024987134,"derHash":"Cziq5n+j6fbTIP4QuVM9i3roJkNf/DsWYC+HtpQszCQ=","subject":"CN=The University of Texas at Arlington RSA CA,O=The University of Texas at Arlington,L=Arlington,ST=TX,C=US","subjectDN":"MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEjAQBgNVBAcTCUFybGluZ3RvbjEtMCsGA1UEChMkVGhlIFVuaXZlcnNpdHkgb2YgVGV4YXMgYXQgQXJsaW5ndG9uMTQwMgYDVQQDEytUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBhdCBBcmxpbmd0b24gUlNBIENB","whitelist":false,"attachment":{"hash":"2e87cf020f45d832fc00b304e12e590eb787d2539a48b3bc2f6aff63a1a3cf09","size":2170,"filename":"wT2LAU5h7_aI1jsj78C99RVlZNnZPvQSzQqLGcbu7Uk=.pem","location":"security-state-staging/intermediates/cc09a6bf-8ff9-4fb9-ba26-61a14b27a987.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wT2LAU5h7/aI1jsj78C99RVlZNnZPvQSzQqLGcbu7Uk=","crlite_enrolled":false,"id":"f6f27ed3-c922-4dcb-b829-40b0606e9b95","last_modified":1562024987867},{"schema":1562024986357,"derHash":"g/LOgfLybg7KtSqVk16bQzzxBP0PORQ9ZV7D1M02tW8=","subject":"CN=Fnet CA,O=Fuji Xerox,C=JP","subjectDN":"MDQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MRAwDgYDVQQDEwdGbmV0IENB","whitelist":false,"attachment":{"hash":"448a08a68d7ed7754d89d12a72062cbf75a30c4bdeeb77d37613086121b56eb9","size":1451,"filename":"puqOSkJtbeGTV0fhGgxvlO9lSKK1aR1y6oqyJFioMi4=.pem","location":"security-state-staging/intermediates/d5ef565a-81ca-48d8-a11a-721cb32eb894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"puqOSkJtbeGTV0fhGgxvlO9lSKK1aR1y6oqyJFioMi4=","crlite_enrolled":false,"id":"404ee307-3112-4ff7-89cb-5fb71099a17f","last_modified":1562024987126},{"schema":1562024983335,"derHash":"Sv/k/vOUZNF4jGYK9ZHV5gGyYcSBHfCj3Z1hyv6OXtg=","subject":"CN=TrustAsia EV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgRVYgVExTIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"9a34bc6ed9a54f81e18afe77e80e21229b781d54bc55db04519ecea2fb3e30f4","size":1658,"filename":"JTqDYh_WILx03HF-qMSr0wy2uDSoWh4uqNea4MnbzZ8=.pem","location":"security-state-staging/intermediates/76f83317-0be3-4d36-a0dc-2b78af79a99f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JTqDYh/WILx03HF+qMSr0wy2uDSoWh4uqNea4MnbzZ8=","crlite_enrolled":true,"id":"75933b65-c630-416f-89b3-52bbbcf4d983","last_modified":1562024984092},{"schema":1562024982596,"derHash":"9ybIiRM2sbl8vIb1lvEmf8GAFSEiVz521RRafGTiz/c=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"4acbc7350c18a439fcd9681ed171a05b0aba786ddff1a08ac60f669b1f7794a5","size":1910,"filename":"CFimR36T4UVCwZbUriIJlppqe23sbqJ64330exu8p_E=.pem","location":"security-state-staging/intermediates/43af4419-cea4-45e7-84eb-b0074f3bc2fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CFimR36T4UVCwZbUriIJlppqe23sbqJ64330exu8p/E=","crlite_enrolled":true,"id":"a1648fd0-9e8b-4b9c-9d33-48ad6a04d424","last_modified":1562024983328},{"schema":1562024981077,"derHash":"8O5ZFO2UxyUtBYtOOYCK7m+o9izwl0+31tKp3xbjqH8=","subject":"CN=Microsoft IT TLS CA 5,OU=Microsoft IT,O=Microsoft Corporation,L=Redmond,ST=Washington,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMRUwEwYDVQQLEwxNaWNyb3NvZnQgSVQxHjAcBgNVBAMTFU1pY3Jvc29mdCBJVCBUTFMgQ0EgNQ==","whitelist":false,"attachment":{"hash":"bc66460eac4ecba1a41893560649ac0a5935b0618344e6870fbfc87ef5c59e56","size":2036,"filename":"RCbqB-W8nwjznTeP4O6VjqcwdxIgI79eBpnBKRr32gc=.pem","location":"security-state-staging/intermediates/92736656-01e9-4228-8ea5-b1cfef7a3342.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RCbqB+W8nwjznTeP4O6VjqcwdxIgI79eBpnBKRr32gc=","crlite_enrolled":true,"id":"45047569-986c-460d-82a8-316c641d6f88","last_modified":1562024981814},{"schema":1562024978115,"derHash":"ZVAQN34j5M3+LlLK9YzjDFwDlcxgRvgTvdvgey84VEg=","subject":"CN=KDDI Web Communications Certification Authority,O=KDDI Web Communications Inc.,C=JP","subjectDN":"MG4xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBJbmMuMTgwNgYDVQQDEy9LRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"378ac91ceeae997985a7faae969763fb3d5806a36440e8baeeca771c46b0aa15","size":1646,"filename":"2TEQYmL1HeKriROlREzt-6M8lVW8avv9NztuQOiIHJc=.pem","location":"security-state-staging/intermediates/be8f4741-ecef-4de6-9965-23801913e2a3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2TEQYmL1HeKriROlREzt+6M8lVW8avv9NztuQOiIHJc=","crlite_enrolled":false,"id":"c9cc94c9-20c2-4321-9fa0-3872b56b5712","last_modified":1562024978848},{"schema":1562024975124,"derHash":"kbznVEFGkIq0vPnf9/mAZ2VaabDGQuEXoDHNIsfJoO4=","subject":"CN=SECOM Passport for Web SR 3.0 CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF8xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSkwJwYDVQQDEyBTRUNPTSBQYXNzcG9ydCBmb3IgV2ViIFNSIDMuMCBDQQ==","whitelist":false,"attachment":{"hash":"0aed52ecc835b26d13f5c55cf98dedf45a8623cee6253f8013906f15eabdc316","size":1626,"filename":"-HZ42z-6jzbfrf-8zoB-rhhWo8lWk9UMNlhPseiUpJs=.pem","location":"security-state-staging/intermediates/e15b0493-c6fc-4d99-8375-9654323114dc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+HZ42z+6jzbfrf+8zoB+rhhWo8lWk9UMNlhPseiUpJs=","crlite_enrolled":true,"id":"de8d47ad-573c-43a2-991b-fc87c4e56b69","last_modified":1562024975861},{"schema":1562024973611,"derHash":"25mk8oTM8Qsm3nt6XWUXJbhXy8hx67MwKNZ7VVEO/Nk=","subject":"CN=Abbott Laboratories Secure Authentication CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xNTAzBgNVBAMTLEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIEF1dGhlbnRpY2F0aW9uIENB","whitelist":false,"attachment":{"hash":"13601b8d2aa24812d2d72f675f124723372e60d0db7dcd9dbd16be20186f8b46","size":1772,"filename":"S-zMrWUPK-hCylswDO1ieeWHUSws1lexaXMxp-YEjWA=.pem","location":"security-state-staging/intermediates/6392bedf-a3cb-40b5-99a3-490d9af06a71.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S+zMrWUPK+hCylswDO1ieeWHUSws1lexaXMxp+YEjWA=","crlite_enrolled":false,"id":"c68bc179-b841-4682-980d-88ac74913ba3","last_modified":1562024974352},{"schema":1562024971359,"derHash":"enfL1FjGKCtA8DN/0ESj5JqJzSexLFM9SDYViKQJ1OE=","subject":"SERIALNUMBER=201916,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE2","whitelist":false,"attachment":{"hash":"43eb426da20061d8e11cdc54684699286087e17729e81f3bf24d6525dd7985e3","size":2333,"filename":"2y31tlf1YoSIRQOCqKCNs6piLK00d-zLVvBxXCTMeP4=.pem","location":"security-state-staging/intermediates/fc5d3e6b-45ce-4919-90c0-55d81d291dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2y31tlf1YoSIRQOCqKCNs6piLK00d+zLVvBxXCTMeP4=","crlite_enrolled":false,"id":"c1ff1c6b-3e3b-420d-9cae-90bcf936a0a3","last_modified":1562024972112},{"schema":1562024970613,"derHash":"OKdSUCLJZYyq/GBgdk/VHGpcW+8jLT5sfkivB6CY3x4=","subject":"CN=Comodo Japan RSA DV CA,O=Comodo Japan\\, Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKQ2hpeW9kYS1rdTEbMBkGA1UEChMSQ29tb2RvIEphcGFuLCBJbmMuMR8wHQYDVQQDExZDb21vZG8gSmFwYW4gUlNBIERWIENB","whitelist":false,"attachment":{"hash":"7754006695792a630cfa6e7a5b8fe4f962d29eee1dd2bbc7b03206053e6f4be5","size":1658,"filename":"oGI3G9oW9P0H6HjREnI-teLBhK_5fC1XowTKkZ9VZXE=.pem","location":"security-state-staging/intermediates/4adec782-7ba7-4345-8a85-84d81c3c9fc1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oGI3G9oW9P0H6HjREnI+teLBhK/5fC1XowTKkZ9VZXE=","crlite_enrolled":true,"id":"0e5bba7c-894d-4422-b61d-6d49e9b23b36","last_modified":1562024971351},{"schema":1562024969871,"derHash":"hJZThEmAOcyUWGEDGDA/nM/EUuI2eA+93EdIVn8FoO4=","subject":"CN=GoGetSSL ECC DV CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MEwxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgRUNDIERWIENB","whitelist":false,"attachment":{"hash":"807962d5b256b434822d5d9ee5e1b629a71afab5fe9af4608367d7743aee656d","size":1244,"filename":"v7s8gnnUIPgE_G0J6878I42tOsH3uq3oEiIBuxWKvb0=.pem","location":"security-state-staging/intermediates/ccba3bfc-711d-4e2e-a31b-afcbae08c836.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v7s8gnnUIPgE/G0J6878I42tOsH3uq3oEiIBuxWKvb0=","crlite_enrolled":true,"id":"3a5b6d43-a56f-44c7-a487-449a4d8e3f0f","last_modified":1562024970606},{"schema":1562024969125,"derHash":"xNGOCljk7/0X7XfIQLYT7xX1UQduqSwrd/ZgmmwlV8c=","subject":"CN=thawte SHA256 Code Signing CA,O=thawte\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xJjAkBgNVBAMTHXRoYXd0ZSBTSEEyNTYgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"7a9762f73747c344e67453177689676cd25a9659658b4626a5d7842d1c01eb29","size":1654,"filename":"ojV9zYWXKz1QGxqVDyQznbwp3_f7lG2Vs-Z5lATJD2M=.pem","location":"security-state-staging/intermediates/8de8ac8a-71bf-46f1-830c-1ec0ce8056a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ojV9zYWXKz1QGxqVDyQznbwp3/f7lG2Vs+Z5lATJD2M=","crlite_enrolled":true,"id":"21e0f087-5d81-48a8-b990-98815b457492","last_modified":1562024969863},{"schema":1562024966122,"derHash":"OcedKkz/4Jxh3mnsFJkdjpXOcTTs9x7weZANCtVHjK0=","subject":"CN=BlackCert\\, Inc. ECC EV Certification Authority,OU=Controlled by COMODO exclusively for BlackCert\\, Inc.,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIG9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMT0wOwYDVQQLEzRDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgQmxhY2tDZXJ0LCBJbmMuMTcwNQYDVQQDEy5CbGFja0NlcnQsIEluYy4gRUNDIEVWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"3e9b2e222d9547e06e86f360ff56f36e2b15cde91ae5eb113a95f14ef5c1f462","size":1431,"filename":"YMJYGd5waNYmUtnRh_uwLFzS5lXUfdRoNphUMGKD7UY=.pem","location":"security-state-staging/intermediates/4174b4d5-c45c-40ea-b665-296b00f2ea1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YMJYGd5waNYmUtnRh/uwLFzS5lXUfdRoNphUMGKD7UY=","crlite_enrolled":false,"id":"6e42b6df-14db-44eb-9daf-29923f5c3a88","last_modified":1562024966861},{"schema":1562024964611,"derHash":"LQvIZWSOoHW6VI6/4WovmR6PlkX/IfZpX4YQeeqeIso=","subject":"SERIALNUMBER=201903,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDM=","whitelist":false,"attachment":{"hash":"88b1a3bb821a4aa6daecaa570343ddee62505d9f82cdfe9acc77cada464e44ae","size":2337,"filename":"TMl7JzGd02XF7Rijnv4x-FJ-6ciY9o6J9WjsDU6WBQE=.pem","location":"security-state-staging/intermediates/67e6e792-85bb-461f-b45f-ad508502c59a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TMl7JzGd02XF7Rijnv4x+FJ+6ciY9o6J9WjsDU6WBQE=","crlite_enrolled":false,"id":"b1e9bced-d3da-4da6-a020-71ab0611072e","last_modified":1562024965358},{"schema":1562024963870,"derHash":"7TyZFGbLxFtf0dooECj5WHuCGVI2R+DKG0fyxSfSkg8=","subject":"CN=AffirmTrust Extended Validation CA - EV1,OU=See www.affirmtrust.com/repository,O=AffirmTrust,C=CA","subjectDN":"MIGDMQswCQYDVQQGEwJDQTEUMBIGA1UEChMLQWZmaXJtVHJ1c3QxKzApBgNVBAsTIlNlZSB3d3cuYWZmaXJtdHJ1c3QuY29tL3JlcG9zaXRvcnkxMTAvBgNVBAMTKEFmZmlybVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBFVjE=","whitelist":false,"attachment":{"hash":"22bb58450c6234f294cba177f1dbd93e6d193576017408e8cdc292f4bc6a925e","size":1674,"filename":"xAD7ZgT8h1RQOQsz_6DxwKe17_oiwt-Jy6y1G1Akw00=.pem","location":"security-state-staging/intermediates/cfde6906-9b1c-47ff-a5d9-15c5809705bd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xAD7ZgT8h1RQOQsz/6DxwKe17/oiwt+Jy6y1G1Akw00=","crlite_enrolled":true,"id":"ee7fb2cb-357d-4c77-afde-598161638058","last_modified":1562024964604},{"schema":1562024963124,"derHash":"sZGhVdUN2u+xLvX4KbzNXZ/oqeh3Z7c3S/XDbOdA/0o=","subject":"CN=TBS X509 CA persona 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGAMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR4wHAYDVQQDExVUQlMgWDUwOSBDQSBwZXJzb25hIDI=","whitelist":false,"attachment":{"hash":"a9859ca50ce84ad6bdf91b9d7c46e32fe61f11d14399189c7c6b462117149bc7","size":2142,"filename":"ubjhAc6yaPi98oC31QdS1V0UUGGet-1zQl2VpfOY61s=.pem","location":"security-state-staging/intermediates/eaf1e313-1e14-43ec-b8b1-51ccf3548f15.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ubjhAc6yaPi98oC31QdS1V0UUGGet+1zQl2VpfOY61s=","crlite_enrolled":false,"id":"462860d8-3e72-4f5d-b4eb-60c9db3e94ef","last_modified":1562024963862},{"schema":1562024962352,"derHash":"fp3eEfdWaw+sYiigCQWoTmNg6VAacBs+f8gy6juf2ng=","subject":"CN=Don Dominio / MrDomain RSA EV CA,OU=Controlled by COMODO CA for Soluciones Corporativas IP\\, SL,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIHQMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMUMwQQYDVQQLEzpDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBmb3IgU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMSkwJwYDVQQDEyBEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBFViBDQQ==","whitelist":false,"attachment":{"hash":"a1afd055411579d9c95224e1ed86afb5c615d247f595fa414519966b8ea70d3d","size":2296,"filename":"w0Shysnt57XAAwS7oiySGBbwyEZ1Xlrn5_wYfb_pOfc=.pem","location":"security-state-staging/intermediates/9ffa0a17-2adf-4743-a19e-380a5f3e825d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w0Shysnt57XAAwS7oiySGBbwyEZ1Xlrn5/wYfb/pOfc=","crlite_enrolled":false,"id":"4f9a8f8f-970a-480c-ab7f-f9d5a51599a8","last_modified":1562024963117},{"schema":1562024961614,"derHash":"dJzFKc2qua4oWBR8SwAa4dW+BY/BZcPnSvlwQTHF4cE=","subject":"CN=nazwaSSL,OU=http://nazwa.pl,O=nazwa.pl S.A.,C=PL","subjectDN":"MFIxCzAJBgNVBAYTAlBMMRYwFAYDVQQKDA1uYXp3YS5wbCBTLkEuMRgwFgYDVQQLDA9odHRwOi8vbmF6d2EucGwxETAPBgNVBAMMCG5hendhU1NM","whitelist":false,"attachment":{"hash":"897f59110ae0cae8614eb96580a96fd7cb3225869d9da4c4530b1281bf753e8a","size":1597,"filename":"sPhpJMOX1_QEIjMN_nLy-YioxkO0pBGSK7c-Mj9wybw=.pem","location":"security-state-staging/intermediates/ca6a636d-2b32-4c6b-91b3-5dba3a3cbee6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sPhpJMOX1/QEIjMN/nLy+YioxkO0pBGSK7c+Mj9wybw=","crlite_enrolled":false,"id":"d51ec63a-9f60-4dd7-b26b-29c22b1fe537","last_modified":1562024962345},{"schema":1562024960127,"derHash":"v6r5kLmNkWhGap8HV9wvFhS5+Tizp0URuZSiuFjhSQ4=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"e46a74573c0c8d261f43c664107450c8cb57b01ae5173762e958d2af50e63b9b","size":2089,"filename":"aLyS-WCb9RvbNJeSwszhasSrqQSVJntxtPR2ngWYjN4=.pem","location":"security-state-staging/intermediates/f35c712d-0fc6-4650-9043-5ad0afcd052e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aLyS+WCb9RvbNJeSwszhasSrqQSVJntxtPR2ngWYjN4=","crlite_enrolled":false,"id":"fd553303-b2b5-4e92-8d4a-684fe1d7afb0","last_modified":1562024960856},{"schema":1562024957869,"derHash":"/QI2IkTzEmbK/wBYGNEATsTrCPsjmq+qr/9HSX1gBdY=","subject":"CN=Certum Organization Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGLMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS8wLQYDVQQDEyZDZXJ0dW0gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"ee9903c59449e4d0acc7b6208d9d0397e473dfb4bdf3dca7397b4cf26911831b","size":1735,"filename":"51GveKNrpJjtGpXY5QDx03s3YTQwaQic6dWBqo3zX6s=.pem","location":"security-state-staging/intermediates/aec69216-92cf-49fb-ad18-7c895d138dbb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"51GveKNrpJjtGpXY5QDx03s3YTQwaQic6dWBqo3zX6s=","crlite_enrolled":true,"id":"c76e2118-173c-4a95-bf4e-159a6ad00ee9","last_modified":1562024958614},{"schema":1562024956351,"derHash":"Pu122wpAy9GW3k+yfKQEgNKkKs4l/zYpHuHaECjWGQc=","subject":"CN=USERTrust RSA Extended Validation Code Signing CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE6MDgGA1UEAxMxVVNFUlRydXN0IFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"aec6dfea40b2d04b6ee1fd349f0e964f718375be85967b2e3dfdd434447a0017","size":2203,"filename":"SVno834iaJ-fItrISzwy9bMXxU9xtlSDOEkUWWB44AY=.pem","location":"security-state-staging/intermediates/006c3f08-81d7-4a4a-82dc-53df3731dc3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SVno834iaJ+fItrISzwy9bMXxU9xtlSDOEkUWWB44AY=","crlite_enrolled":false,"id":"d02af984-79a3-414d-aec0-6fa0a598a299","last_modified":1562024957121},{"schema":1562024955607,"derHash":"FVf2W6YclYt076SlgruuvdYqbZtl/pWoDV7VGPRu2H8=","subject":"CN=EY LLP SHA256 CA - G2,O=Ernst & Young LLP,C=GB","subjectDN":"MEkxCzAJBgNVBAYTAkdCMRowGAYDVQQKDBFFcm5zdCAmIFlvdW5nIExMUDEeMBwGA1UEAxMVRVkgTExQIFNIQTI1NiBDQSAtIEcy","whitelist":false,"attachment":{"hash":"3b35a96418cedad712c8b5fc962614860bf163aa01cf6e82be4b937ec1e0dc64","size":1833,"filename":"hd2ITqtCyMy8qkh7o5Jz3cR0DAFmxakpv2WbEWWJe5U=.pem","location":"security-state-staging/intermediates/0bcf042f-21c7-4509-9592-de8e0d2f9af4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hd2ITqtCyMy8qkh7o5Jz3cR0DAFmxakpv2WbEWWJe5U=","crlite_enrolled":false,"id":"3be1086f-07b3-4571-9167-80dd1baddcc3","last_modified":1562024956343},{"schema":1562024954119,"derHash":"j6xXZDnJ/T7xU7Ufnt0NOBtd97h1Wc6+ygQpfdRKY5s=","subject":"CN=DigiCert Global CA G2,O=DigiCert Inc,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEdsb2JhbCBDQSBHMg==","whitelist":false,"attachment":{"hash":"f974f77c91205dbd3c9e89bb41254df4a42a70a49efa60ce9c07db31dbcc3712","size":1634,"filename":"njN4rRG-22dNXAi-yb8e3UMypgzPUPHlv4-foULwl1g=.pem","location":"security-state-staging/intermediates/d91dd6ee-e83b-47b7-b9dd-835d20657b98.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"njN4rRG+22dNXAi+yb8e3UMypgzPUPHlv4+foULwl1g=","crlite_enrolled":true,"id":"a41a5511-de35-4c5d-af6a-1283493ecab1","last_modified":1562024954850},{"schema":1562024953354,"derHash":"lya+H9YsztPzIzYV3DJMoKfnh+tCJzyL5M4903m/nXA=","subject":"SERIALNUMBER=201815,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE1","whitelist":false,"attachment":{"hash":"9471b05e41efc78e40a6ced8077181e9a004a285dfd308ae6ab1cd57fe38d124","size":2333,"filename":"0xXaKHZeQsGiM_TY67qlJLl3VSY03py-NLYxVTNDz2g=.pem","location":"security-state-staging/intermediates/9e215d26-d89c-494e-8ab1-0238205d9a31.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0xXaKHZeQsGiM/TY67qlJLl3VSY03py+NLYxVTNDz2g=","crlite_enrolled":false,"id":"37714fea-c69d-4735-a2af-5aedaeaec17f","last_modified":1562024954111},{"schema":1562024952617,"derHash":"Vh3Hg1H15+5aRkrG5YoNFk7ydo+Y8C5u5lUBEg/NnF4=","subject":"CN=SwissSign Server Gold CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLDAqBgNVBAMTI1N3aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDE0IC0gRzIy","whitelist":false,"attachment":{"hash":"b44b7aee422e730e14cf3b845c69862c0c573458ff55af4b3a534005005b358a","size":2389,"filename":"skyozdmp140ljrHvjRijq3v2_yQ1nyfFyBiA9uOKuw8=.pem","location":"security-state-staging/intermediates/ef30ec5a-365b-47f4-b6c5-f11d5c720e99.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"skyozdmp140ljrHvjRijq3v2/yQ1nyfFyBiA9uOKuw8=","crlite_enrolled":true,"id":"e9049b0c-8a98-4b05-abb3-fa6928effd62","last_modified":1562024953346},{"schema":1562024949623,"derHash":"RREUUPsx71E35LfP+e4r7yPou/0WUIbfvZPfLzKbeF4=","subject":"OU=\u5167\u653f\u90e8\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEcxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxJDAiBgNVBAsMG+WFp+aUv+mDqOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"1d2e89002031e2f067f634eb677f5895443049d3c69a01ca96c7142c7730442b","size":1845,"filename":"hqLmhgIEASticguKuke6YdSMZ139HmKHWRNfNRObcW4=.pem","location":"security-state-staging/intermediates/ca34cab1-fdc7-4bad-a028-8564f3760c53.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hqLmhgIEASticguKuke6YdSMZ139HmKHWRNfNRObcW4=","crlite_enrolled":false,"id":"b59c56ec-1e6c-4d20-a5df-9d80375a71e9","last_modified":1562024950356},{"schema":1562024948867,"derHash":"XLnp3jKxh+QLoU/fIA/aYse0+/iNZPd84C3W6+a8wbA=","subject":"CN=Hongkong Post e-Cert CA 1 - 15,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK","subjectDN":"MHYxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEnMCUGA1UEAxMeSG9uZ2tvbmcgUG9zdCBlLUNlcnQgQ0EgMSAtIDE1","whitelist":false,"attachment":{"hash":"b1dec54f97f654e9b417aea0e0d23a22852001ddaf0a4b9b7a4c8d05cb468de6","size":1743,"filename":"nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=.pem","location":"security-state-staging/intermediates/75266247-0a7b-4385-ae5c-7bde1cbc59fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=","crlite_enrolled":true,"id":"143884ed-af2d-4415-8a20-84ab1314e2dc","last_modified":1562024949615},{"schema":1562024948125,"derHash":"66NMexCWcWFMNn4d4HUSTDlUzhn4X6z2EJDsMZ9/Gn8=","subject":"CN=GlobalSign CA 4 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDQgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"45bcc3a929864966eb19baeecc3aa340568be7939f1cd9bdae711d351e223a9f","size":2121,"filename":"Xj0OpiKM5fkJ7g__pfUXsKnp9Ggz3CaAgIY6QU_Ml6I=.pem","location":"security-state-staging/intermediates/52fadff7-e23b-4528-893e-fd86c53c6e69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Xj0OpiKM5fkJ7g//pfUXsKnp9Ggz3CaAgIY6QU/Ml6I=","crlite_enrolled":false,"id":"1e71a145-4354-432c-a01b-1f3771722c5a","last_modified":1562024948860},{"schema":1562024947352,"derHash":"v4q+kn0Y62bvn7Ul7SDuCR63gqSP2m9M8jLQZo/NXMY=","subject":"CN=Technological Educational Institution of Thessaly CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGVMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN1RlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgVGhlc3NhbHkgQ0EgUjI=","whitelist":false,"attachment":{"hash":"0ec1a3ac7824be699c0d1bf1d695a867cac5c011afa5daf8ebbdc748d654d68c","size":2645,"filename":"ErB7rPO_p1d_EBICC4d-nI1lPmPDMPf4n9dW9Nx2nu8=.pem","location":"security-state-staging/intermediates/6371394b-44d6-4eeb-be22-579f6186536f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ErB7rPO/p1d/EBICC4d+nI1lPmPDMPf4n9dW9Nx2nu8=","crlite_enrolled":true,"id":"a786d069-c3bd-425a-8944-bc17028a3e53","last_modified":1562024948117},{"schema":1562024945836,"derHash":"M4VzODYez8SFjd/2ue9ic+PbhWq5zqHA4sZZJdHIeXg=","subject":"CN=Entrust Class 3 Client CA - SHA256,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG3MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSswKQYDVQQDEyJFbnRydXN0IENsYXNzIDMgQ2xpZW50IENBIC0gU0hBMjU2","whitelist":false,"attachment":{"hash":"6deba95e7ac393b234997f0c4cd6212d2cb0447abafefd772a54537cf31c4507","size":1869,"filename":"9km003uGP3CTXdUQ8RZMVSb0qYwAyhU4oBMh8XI9xmc=.pem","location":"security-state-staging/intermediates/94f7fa6c-549d-4332-b94d-12a8c60a36c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9km003uGP3CTXdUQ8RZMVSb0qYwAyhU4oBMh8XI9xmc=","crlite_enrolled":false,"id":"3afa9f9b-e103-4f63-8488-e4fb026802cf","last_modified":1562024946596},{"schema":1562024944329,"derHash":"FZF8TLdLswHERaLgMM3SkJGMgDIDgQBpJ9IqQ/1B/9E=","subject":"SERIALNUMBER=201803,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODAz","whitelist":false,"attachment":{"hash":"e75d3c411b9b5678ad1021ffbd8366c426026c0b8b6fdd4af5fd216c6cdbdc36","size":2333,"filename":"TOFoosa_0iP5q1cejoIgepaH1pVPDAFbd9NYScqLFhY=.pem","location":"security-state-staging/intermediates/1eaa8ed0-14ac-40e9-8ae8-f64252e79d83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TOFoosa/0iP5q1cejoIgepaH1pVPDAFbd9NYScqLFhY=","crlite_enrolled":false,"id":"6cc509c0-8aca-497b-8718-d4ff8163244b","last_modified":1562024945067},{"schema":1562024942072,"derHash":"x0It4hzryS7K5r6dzX5xHuZQ0wrtcR+7Dfayx4S2xPs=","subject":"CN=Digidentity BV PKIoverheid Organisatie Server CA - G3,O=Digidentity B.V.,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEZMBcGA1UECgwQRGlnaWRlbnRpdHkgQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjczMjI2MzExPjA8BgNVBAMMNURpZ2lkZW50aXR5IEJWIFBLSW92ZXJoZWlkIE9yZ2FuaXNhdGllIFNlcnZlciBDQSAtIEcz","whitelist":false,"attachment":{"hash":"610bbc1d7e1b7d3eb20a159a94adbb060737aeebfce7662b453045c143b00aad","size":2625,"filename":"zm4euNC-JiW-4by3xDIvrjNA-47VRZb3MnFpy-xVE4E=.pem","location":"security-state-staging/intermediates/a5a5281d-d3a3-48cd-a934-751e77014391.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zm4euNC+JiW+4by3xDIvrjNA+47VRZb3MnFpy+xVE4E=","crlite_enrolled":true,"id":"cd3a32e6-e26e-49f5-ac44-49cbd2d4c344","last_modified":1562024942810},{"schema":1562024941330,"derHash":"MG6XOeNFj/RUaHe3BLLjkF5YsjXWTjL08CaskbcpXRU=","subject":"CN=GlobalSign CA 5 for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIENBIDUgZm9yIEFBVEw=","whitelist":false,"attachment":{"hash":"285c007491cf789ba43976f05e189adf64a0f29b5e14db89718cee363825ccba","size":2089,"filename":"QgVxWR5NsnuI7x6GKGlxVsQHK7mDlibMZigdzw2qsxU=.pem","location":"security-state-staging/intermediates/907deced-77e9-464c-98c8-40c0f0871333.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QgVxWR5NsnuI7x6GKGlxVsQHK7mDlibMZigdzw2qsxU=","crlite_enrolled":false,"id":"4d25ca1b-87f3-41f4-864a-04927784f280","last_modified":1562024942064},{"schema":1562024939817,"derHash":"xjVDcpo3DCaVK0fh0dGuqEyxsH8bD5ZML+3cUj/Xx5U=","subject":"CN=Advanced Class 2 e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGFMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xKjAoBgNVBAMMIUFkdmFuY2VkIENsYXNzIDIgZS1Temlnbm8gQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odQ==","whitelist":false,"attachment":{"hash":"b0b37eca6a850f10df2d2f0f58151a4dde91bb13056fb825499ebe669a693f7c","size":1768,"filename":"TldDn68qkoctgHZQtrMac-o1wa3jCibE3kU6UUsRCkk=.pem","location":"security-state-staging/intermediates/6cc7acac-4c52-41c2-aa25-5c066d9c2b1d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TldDn68qkoctgHZQtrMac+o1wa3jCibE3kU6UUsRCkk=","crlite_enrolled":false,"id":"5f2ec7fc-3106-4948-a7e0-9fa8387772ef","last_modified":1562024940568},{"schema":1562024937487,"derHash":"GtUWhBmK+R6iQ525x5ID9Hp0nr2JYnm3fcYn+D/+SdY=","subject":"CN=Network Solutions DV Server CA 2,O=Network Solutions L.L.C.,L=Herndon,ST=VA,C=US","subjectDN":"MHoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTEQMA4GA1UEBxMHSGVybmRvbjEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMSkwJwYDVQQDEyBOZXR3b3JrIFNvbHV0aW9ucyBEViBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"52fbbb1f5aa39c3d13d1e3d0c45b2292cba37ce769970a1ceca9ed32e4131b1d","size":2150,"filename":"G8g19iXohPy9KZGriQ807A59lcylMu81Zi8hXz5xxsM=.pem","location":"security-state-staging/intermediates/6949f924-1eec-45ee-a7db-edf592b5bd93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G8g19iXohPy9KZGriQ807A59lcylMu81Zi8hXz5xxsM=","crlite_enrolled":true,"id":"c62bc944-30d0-4aec-98f6-e797e9e832cb","last_modified":1562024938279},{"schema":1562024936752,"derHash":"EleqwvTurGyklCwsg/C2e0GjtHEgxNU0KZKVE6ytRow=","subject":"CN=DFN-Verein Global Issuing CA,OU=DFN-PKI,O=Verein zur Foerderung eines Deutschen Forschungsnetzes e. V.,C=DE","subjectDN":"MIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENB","whitelist":false,"attachment":{"hash":"69e4d49fecfd6be962aff5ae8fab5ea53f3d878ed48ee7a692e4baadc6b9b1cc","size":2028,"filename":"2plWEFSbja5Tz0pERjlr4FL2fr0H4L48Rt0ZF3sKBEQ=.pem","location":"security-state-staging/intermediates/8de4ccb4-4260-4e43-8cbf-5a833dadfdd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2plWEFSbja5Tz0pERjlr4FL2fr0H4L48Rt0ZF3sKBEQ=","crlite_enrolled":true,"id":"93b2b132-1d87-4798-b133-b6722f1ba378","last_modified":1562024937479},{"schema":1562024932982,"derHash":"9HCuinNxgA/J85Tu1xZ7ReaqOOqwIAk4ZJhcFcHouMs=","subject":"CN=HARICA SSL Intermediate CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHsxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEmMCQGA1UEAxMdSEFSSUNBIFNTTCBJbnRlcm1lZGlhdGUgQ0EgUjE=","whitelist":false,"attachment":{"hash":"997b5da84e547b4e65bbddcfe29ea4027d3d6ce01f5f270b51fe30c6cd9722b6","size":2280,"filename":"lDFmKX0HYK-C3X2D0e1_amheVD9e-SBgplm0VfZ1IZI=.pem","location":"security-state-staging/intermediates/5b577c97-5cb6-437b-a5de-28458c59e3bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lDFmKX0HYK+C3X2D0e1/amheVD9e+SBgplm0VfZ1IZI=","crlite_enrolled":true,"id":"dc04d826-cf54-4953-bf3c-7ba7846ef9f5","last_modified":1562024933717},{"schema":1562024931476,"derHash":"dKYa3Z8g+RRhicb328ifV3ViRP01ZmQQja44uCo7UlA=","subject":"CN=YourNet SSL for domain2,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEoxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSAwHgYDVQQDExdZb3VyTmV0IFNTTCBmb3IgZG9tYWluMg==","whitelist":false,"attachment":{"hash":"b7dad8429dcfc03d08d7ba14a861340cb74932bd40ccbada03ee17a7a6637fef","size":1597,"filename":"zd0UqyvGX7-jgJxlCj_Bzwg3ZZtVY-37N2N0HaQW9N8=.pem","location":"security-state-staging/intermediates/1469d0ba-cd8f-4e5e-b64a-17afac0c6c59.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zd0UqyvGX7+jgJxlCj/Bzwg3ZZtVY+37N2N0HaQW9N8=","crlite_enrolled":false,"id":"977ddfb9-da2c-424d-958a-3172269a99e2","last_modified":1562024932228},{"schema":1562024930729,"derHash":"bqy5/qbMa/RZW0nCIsJgBNiTceuThK5I7Be5V4SUhlE=","subject":"CN=GENIOUS RSA Domain Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGPMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxNzA1BgNVBAMTLkdFTklPVVMgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"e1cfbd7e1821deb85427599da6afff700f4fe6bbd50a6617c015a36c7081220d","size":2178,"filename":"fpm00n1Dh8cybnaCvT8lZPwH6X-P_MKtYFzCSSgBorQ=.pem","location":"security-state-staging/intermediates/ce167ca1-2411-4863-820e-956dec419f09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fpm00n1Dh8cybnaCvT8lZPwH6X+P/MKtYFzCSSgBorQ=","crlite_enrolled":false,"id":"34d6c620-1aeb-4e81-b738-dc70ae0d0f79","last_modified":1562024931469},{"schema":1562024929222,"derHash":"Z/kfJvW/v6SHOL4GeN0vj3X3uAdh1WVng8qLkgqqVlk=","subject":"CN=SwissSign Server Silver CA 2014 - G22,O=SwissSign AG,C=CH","subjectDN":"MFQxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxLjAsBgNVBAMTJVN3aXNzU2lnbiBTZXJ2ZXIgU2lsdmVyIENBIDIwMTQgLSBHMjI=","whitelist":false,"attachment":{"hash":"a57cf71c0388c65ff88458240a3172504ec1bec49381cd3711b4403c60d9cd06","size":2393,"filename":"mJwcSA1WE5bfCsQ5o79wGCvasvwdVsznZlqR1H3YPdI=.pem","location":"security-state-staging/intermediates/7cd962f0-d1e7-4935-b0c3-8a88414cbafc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mJwcSA1WE5bfCsQ5o79wGCvasvwdVsznZlqR1H3YPdI=","crlite_enrolled":true,"id":"e5b5ea99-6ffd-494f-a33d-c7e05abcd103","last_modified":1562024929964},{"schema":1562024928479,"derHash":"ydaRPz/t3v8YTJ7h1+F8WuyQiG7tXMPW6YEFgxyMDgs=","subject":"CN=TERENA SSL CA 3 G3,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGcxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEbMBkGA1UEAxMSVEVSRU5BIFNTTCBDQSAzIEcz","whitelist":false,"attachment":{"hash":"545222651c83bbd8eccbb5048089e729de4cba6f967e78628258418fa0ea02a4","size":1557,"filename":"CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=.pem","location":"security-state-staging/intermediates/c3c1fb06-2e31-41ec-8ec1-1a01c2fc381f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CZ7AmTfjAN5e7IHESKlD7oZew2o25fDM7eqsgsH2OSk=","crlite_enrolled":false,"id":"e64924af-35f5-4a17-be7d-7a374e1f9cf9","last_modified":1562024929214},{"schema":1562024925387,"derHash":"z/qcAexZwp5xjQ3Q71R58JtRyVeAr7e9adPIBUr+TSg=","subject":"CN=Belgium Root CA2,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ey","whitelist":false,"attachment":{"hash":"6421003db92dad67986e00159b3cab338f36443058a88decb98d278a0b730b9c","size":1423,"filename":"-OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=.pem","location":"security-state-staging/intermediates/c45f186f-ef1c-4bec-a5dc-28abe0872ea5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+OX5BbyTmREme4PVCBSpAyO1Hhg2KdtS1PwtVGilpXg=","crlite_enrolled":true,"id":"687db8f3-9aec-4b32-855e-3e940b432c69","last_modified":1562024926156},{"schema":1562024924614,"derHash":"gQUcNV7J9aifupHRpb0/BQHqzYDvk7IYAD2VzyUadnA=","subject":"CN=Trust Provider B.V. DV SSL CA - G2,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHcxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDErMCkGA1UEAxMiVHJ1c3QgUHJvdmlkZXIgQi5WLiBEViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"79e96ea8b4bed312f4e2620cb89f3da3150daf80c22aa93eee8d0cf97382d481","size":1674,"filename":"Ug7hbhTOgcIi7lxx_EXJNjbE7vY2XIM8TCIVY7FWyPM=.pem","location":"security-state-staging/intermediates/78a192bf-c52b-4e45-8953-0741da28873a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ug7hbhTOgcIi7lxx/EXJNjbE7vY2XIM8TCIVY7FWyPM=","crlite_enrolled":true,"id":"c35703ef-e86e-40c0-95b4-ccee1457e97a","last_modified":1562024925376},{"schema":1562024923845,"derHash":"1cAJMS+EXF7IUG6tVg1iRHv/SmCpwlIQURIXrW3nau0=","subject":"CN=Adobe Analytics - DigiCert CA,OU=Adobe Systems Incorporated\\, DMBU,O=Adobe Systems Incorporated,C=US","subjectDN":"MIGFMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxKTAnBgNVBAsTIEFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkLCBETUJVMSYwJAYDVQQDEx1BZG9iZSBBbmFseXRpY3MgLSBEaWdpQ2VydCBDQQ==","whitelist":false,"attachment":{"hash":"4524101b35f64af46493e4d82f8fb77b7173f9cc3a97eeea5fb649665c7fe151","size":1683,"filename":"j7zHvn8BNXTYE-Zg6cBClkcvbJgxCRanrqi66iJkxxo=.pem","location":"security-state-staging/intermediates/29a72042-a98e-4486-97aa-78d4b0c0c60a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"j7zHvn8BNXTYE+Zg6cBClkcvbJgxCRanrqi66iJkxxo=","crlite_enrolled":false,"id":"5151b0c7-4782-496c-bb80-783f0674974d","last_modified":1562024924606},{"schema":1562024922323,"derHash":"lyIUU7shRkLB3Fq82nn+Tu218rA5RPACuBuEfDn4D+w=","subject":"CN=Trustico RSA Client CA,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MHIxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xEDAOBgNVBAcTB0Nyb3lkb24xHzAdBgNVBAoTFlRoZSBUcnVzdGljbyBHcm91cCBMdGQxHzAdBgNVBAMTFlRydXN0aWNvIFJTQSBDbGllbnQgQ0E=","whitelist":false,"attachment":{"hash":"0b4273439c52956ab9ed46383b38f3889b55a43dd0e5c392028e3b83cf98beb5","size":2105,"filename":"xnvxH2EA9Kd3kwOIpzC0bRhbt111r-GKHT4GfHQAyYY=.pem","location":"security-state-staging/intermediates/059c4a4d-bd05-446b-bf6c-5d06af8e64a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xnvxH2EA9Kd3kwOIpzC0bRhbt111r+GKHT4GfHQAyYY=","crlite_enrolled":false,"id":"514fb8e7-4b80-456a-821d-b96dd274be16","last_modified":1562024923058},{"schema":1562024920801,"derHash":"+7d3rIzcz3mT7zkk/4zQn5X7FnOQp4zB88hSwfFaZtM=","subject":"CN=MarketWare Secure Email / Client Authentication CA 2,O=MarketWare - Solu\u00e7\u00f5es para Mercados Digitais\\, Lda.,L=Lisboa,ST=Lisboa,C=PT","subjectDN":"MIGtMQswCQYDVQQGEwJQVDEPMA0GA1UECBMGTGlzYm9hMQ8wDQYDVQQHEwZMaXNib2ExPTA7BgNVBAoMNE1hcmtldFdhcmUgLSBTb2x1w6fDtWVzIHBhcmEgTWVyY2Fkb3MgRGlnaXRhaXMsIExkYS4xPTA7BgNVBAMTNE1hcmtldFdhcmUgU2VjdXJlIEVtYWlsIC8gQ2xpZW50IEF1dGhlbnRpY2F0aW9uIENBIDI=","whitelist":false,"attachment":{"hash":"de3143439ab3c01030021cca448210d408e58781f63a29dfb9094fa44dc57533","size":2203,"filename":"IjeaRrgYP7bL-bSu8xuukrup5xA-eP8RJIWT1wBPIDQ=.pem","location":"security-state-staging/intermediates/7b4805c7-0159-47ce-9559-bf93d0bd7e46.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IjeaRrgYP7bL+bSu8xuukrup5xA+eP8RJIWT1wBPIDQ=","crlite_enrolled":false,"id":"a6626126-010b-4880-b496-85eb7715c636","last_modified":1562024921543},{"schema":1562024919307,"derHash":"IFFUt3ftxVpRRlhaXlTgVKcL5KrTuF0CMY2ie/gHrfE=","subject":"CN=Amazon,OU=Server CA 3A,O=Amazon,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAzQTEPMA0GA1UEAxMGQW1hem9u","whitelist":false,"attachment":{"hash":"05a3b22929a248fe09c8e080b25d2e2076a990ab5c629c24916624485d790547","size":1008,"filename":"fFO133kTXZr2GV72u3OrmMLImVC4krGS3_14TbklpBw=.pem","location":"security-state-staging/intermediates/88877557-2163-4dde-bcc8-c9e7b0b12206.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fFO133kTXZr2GV72u3OrmMLImVC4krGS3/14TbklpBw=","crlite_enrolled":false,"id":"7760fae2-5a3c-4718-9149-d102bf58eb33","last_modified":1562024920055},{"schema":1562024918544,"derHash":"dkoNhNVVLNWHLHNGTzfwIXXNpwWIECsTraKgGZ/EA+k=","subject":"CN=QuoVadis QVRCA3G3 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTNHMyBTU0wgSUNB","whitelist":false,"attachment":{"hash":"0b6a1e6291e43621aa0cf422b683e1c4f2016acae9e2ca13b4b504d63ea22bab","size":2381,"filename":"GGH9ZFzlZtn0UI4iUubJxa5wjuMzMBq88DKTwhDzjDY=.pem","location":"security-state-staging/intermediates/c140db1c-419f-4e1f-a41d-5e757e022a04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GGH9ZFzlZtn0UI4iUubJxa5wjuMzMBq88DKTwhDzjDY=","crlite_enrolled":true,"id":"8208fd07-a06e-42eb-a618-7e951831700f","last_modified":1562024919299},{"schema":1562024917049,"derHash":"bN+dy/NRCju0AnYdYtDF5OevxR2c/wHwK9UyVtxWet8=","subject":"CN=GDCA TrustAUTH R4 DV SSL CA G2,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJzAlBgNVBAMMHkdEQ0EgVHJ1c3RBVVRIIFI0IERWIFNTTCBDQSBHMg==","whitelist":false,"attachment":{"hash":"6649636f2813ad008e8133da4658e92771065ef07c503f24fb1bf0e9efebc92c","size":1727,"filename":"cfsQj68ZkIybk1gX6hizWacoE7hvqJNujNu2E03n_3g=.pem","location":"security-state-staging/intermediates/38a31f82-83ee-41b4-80ac-dd89b54a7ece.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cfsQj68ZkIybk1gX6hizWacoE7hvqJNujNu2E03n/3g=","crlite_enrolled":true,"id":"93bffb7c-4c34-4987-80a0-4fcbf72ce0d6","last_modified":1562024917781},{"schema":1562024916313,"derHash":"9U9s7VbPaCtXCmyuwxPpSCdg3hLo+SiuMEUsTGasdho=","subject":"CN=GeoTrust Primary Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSkwJwYDVQQDEyBHZW9UcnVzdCBQcmltYXJ5IFRyYW5zaXRpb24gUm9vdA==","whitelist":false,"attachment":{"hash":"2cfe9c1ecf88a44a669b657cddd2e2a0e0ab6a7d532af76b531f030235c27d6d","size":1695,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/b797792a-0c11-40a3-a801-622d9f8c11a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"ea98bddb-7dc4-4f7a-a7a0-7c56ac081855","last_modified":1562024917040},{"schema":1562024915551,"derHash":"kP/FFQzgU1Bp5+Xvlh5AR/sIYaFAcyyM7cfo1Y61m9E=","subject":"OU=\u5de5\u5546\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOW3peWVhuaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"49892e8be74428a0ec09f0541dce4e2ccb3e57d9c14435714a4659b3e422dede","size":1845,"filename":"G0Nm8-uK2OHaJz-7F_jtcJoRpm0-pac0NTsSs2ZA7uo=.pem","location":"security-state-staging/intermediates/fe5ab866-5d0d-4e4d-a1b6-e542c1902f86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G0Nm8+uK2OHaJz+7F/jtcJoRpm0+pac0NTsSs2ZA7uo=","crlite_enrolled":false,"id":"851210ea-741c-422f-9fe9-5eb4577556dc","last_modified":1562024916305},{"schema":1562024914016,"derHash":"rWEyfumbQGE+SAdRtWaRoJZBLGj3T0ASsp+g9Iu5JMk=","subject":"CN=COMODO SHA-256 Client Authentication and Secure Email CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGdMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDFDMEEGA1UEAxM6Q09NT0RPIFNIQS0yNTYgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EgMw==","whitelist":false,"attachment":{"hash":"41505d9d2e6bf1388086b3492cd202a6456bbb9c4959479a2a8caca9c66b3c4b","size":1699,"filename":"DTkS_gGeaXlwZz7Tk6HjzEMiE0e5gCVs3AQrkI99SgE=.pem","location":"security-state-staging/intermediates/0d4ea80a-907c-4083-8c4b-e70ff8c1a53c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DTkS/gGeaXlwZz7Tk6HjzEMiE0e5gCVs3AQrkI99SgE=","crlite_enrolled":false,"id":"0e0066de-bfb1-4731-a2b3-aaf190da061c","last_modified":1562024914790},{"schema":1562024913272,"derHash":"UEjbq/Qb2e99UAlAX0G2dxrIiN4+rJCzBY9VWWS35F8=","subject":"CN=eMudhra RSA Domain Validation Secure Server CA,O=eMudhra Technologies Limited,L=Bengaluru,ST=Karnataka,C=IN","subjectDN":"MIGVMQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCZW5nYWx1cnUxJTAjBgNVBAoTHGVNdWRocmEgVGVjaG5vbG9naWVzIExpbWl0ZWQxNzA1BgNVBAMTLmVNdWRocmEgUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"00d80076905e12a61bd293836d9efa12e45d6f81308bde3faf55d751f38d04b5","size":2186,"filename":"17G136GRsFqQDON1NPTY6yR_UA1QudGkzCd3wo7sczM=.pem","location":"security-state-staging/intermediates/38dffa99-f6ff-42b2-9d56-b21dbb250217.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"17G136GRsFqQDON1NPTY6yR/UA1QudGkzCd3wo7sczM=","crlite_enrolled":false,"id":"d2e8bfc6-485a-4d20-9405-978f2701ee3f","last_modified":1562024914008},{"schema":1562024912527,"derHash":"/x017UZAY9YDHHHkFCYswjEOjFR6t/fPKVXJ4DSeUz8=","subject":"CN=GeoTrust True Identity CA 2,OU=GeoTrust Authentication Services,O=GeoTrust Inc.,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSkwJwYDVQQLEyBHZW9UcnVzdCBBdXRoZW50aWNhdGlvbiBTZXJ2aWNlczEkMCIGA1UEAxMbR2VvVHJ1c3QgVHJ1ZSBJZGVudGl0eSBDQSAy","whitelist":false,"attachment":{"hash":"9e7e3dd482a7bdcb8d715576fc589613eb0fbcc6f9f72fee1cd6c9983cd5c477","size":1467,"filename":"Er8r3dSx8J_PXp27RON-7OVuMvwD0SXXfHReZYPBxZk=.pem","location":"security-state-staging/intermediates/3ea3e629-0567-49c6-8887-7e3cd5bed8f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Er8r3dSx8J/PXp27RON+7OVuMvwD0SXXfHReZYPBxZk=","crlite_enrolled":false,"id":"a6e16a57-0717-40f8-a342-1fc4a1910e9a","last_modified":1562024913264},{"schema":1562024911771,"derHash":"++rLHuW9XzNRXGSsdS/weCJNiO5AZHTDMflUPUtyGEY=","subject":"CN=Eastern Macedonia and Thrace Institute of Technology CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGYMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQzBBBgNVBAMTOkVhc3Rlcm4gTWFjZWRvbmlhIGFuZCBUaHJhY2UgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kgQ0EgUjE=","whitelist":false,"attachment":{"hash":"3e7b18ea08168c2467503f094fb014bcf205cd1d07595f29010fea2ccb0b995a","size":2905,"filename":"y2aPBkC8F76dsQ5qfH5V18duuXnA5-zq0P4A9k8kX6E=.pem","location":"security-state-staging/intermediates/9cb657da-04ae-45f1-9d33-7b531bf463ee.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"y2aPBkC8F76dsQ5qfH5V18duuXnA5+zq0P4A9k8kX6E=","crlite_enrolled":false,"id":"40dc7a33-428e-4422-b0f7-34f7b111042c","last_modified":1562024912519},{"schema":1562024908759,"derHash":"Iar6t69YPihlmM/sqL1DWMN9es7Vy2NwrIEQuDmL5HY=","subject":"CN=Ensured Document Signing CA,O=Ensured B.V.,L=Heerhugowaard,ST=Noord-Holland,C=NL","subjectDN":"MHoxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRYwFAYDVQQHEw1IZWVyaHVnb3dhYXJkMRUwEwYDVQQKEwxFbnN1cmVkIEIuVi4xJDAiBgNVBAMTG0Vuc3VyZWQgRG9jdW1lbnQgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"efbe87dfeb2b83d30e35e6c5c075f7f20e9de0cfb5641f51604664608a01290c","size":6426,"filename":"1Zha9XtDFk7GUo708OAH26oRT9eyA9hRP_RqCmrxNXE=.pem","location":"security-state-staging/intermediates/f9f6418c-24fe-4995-8172-964073611677.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1Zha9XtDFk7GUo708OAH26oRT9eyA9hRP/RqCmrxNXE=","crlite_enrolled":false,"id":"02d9cb51-9bed-4f96-ab41-c69994b18edc","last_modified":1562024909499},{"schema":1562024907269,"derHash":"Vu2G7YaauIYxFohjEruZFbidmaRWI+DwZfgcvVaTeRk=","subject":"CN=DOMENY CODE SIGNING Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGKMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMTQwMgYDVQQDEytET01FTlkgQ09ERSBTSUdOSU5HIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"31b35ca440069dcffe73ec5d1e038d21abe790f988c05d40aa78e21b0d3b5f6b","size":2142,"filename":"g-0D2wOqufSPZH-me0ymwpfpamM9jgCd7MkOiEusGXo=.pem","location":"security-state-staging/intermediates/a5765b22-16fc-422d-9560-37857b9737e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"g+0D2wOqufSPZH+me0ymwpfpamM9jgCd7MkOiEusGXo=","crlite_enrolled":false,"id":"9d5405c6-1956-4e48-928b-cdd098e7fcac","last_modified":1562024908001},{"schema":1562024904264,"derHash":"8YRCvt9wtNFSETVscrZZMyvtA//Tu6evqqvm3p1yMAI=","subject":"CN=QuoVadis EV SSL ICA G3,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBFViBTU0wgSUNBIEcz","whitelist":false,"attachment":{"hash":"310b7d0c2f7140dbbd2962b07906fd9f4eb3be23c393d130330bb6e59f58ed81","size":2389,"filename":"S0SyfMJffMM5SZRx8KboH82naxKe-XlFltR_gu3qSzg=.pem","location":"security-state-staging/intermediates/5b636dd9-7860-4f2d-a4f2-0410d642b8f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S0SyfMJffMM5SZRx8KboH82naxKe+XlFltR/gu3qSzg=","crlite_enrolled":true,"id":"88048931-9c43-47bf-a3ce-2295c41a573d","last_modified":1562024905000},{"schema":1562024903501,"derHash":"nyURoj5w2V+2J5hQimdsw4lkEAk2pubTyudxVMApDwI=","subject":"CN=thawte DV SSL CA - G2,OU=Domain Validated SSL,O=thawte\\, Inc.,C=US","subjectDN":"MGMxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR4wHAYDVQQDExV0aGF3dGUgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"f71b79c8c35cf956e94a6b78786c73cbd2346bbd250a0683171d0423afef9a5d","size":1731,"filename":"Uu5hqMmQleSn68vgjrmAQIz2tFLJ3ra_RLK7zEgYYms=.pem","location":"security-state-staging/intermediates/7cd6c71a-dc1a-4a9a-b73c-14d4ba922009.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Uu5hqMmQleSn68vgjrmAQIz2tFLJ3ra/RLK7zEgYYms=","crlite_enrolled":true,"id":"eff1a811-4b4d-4b86-8d1f-bababea8deae","last_modified":1562024904256},{"schema":1562024901246,"derHash":"/h7K297g5VgGjdvHszq3jdV9DcIvzBw2ARkBA3Wwphs=","subject":"CN=TrustCor Basic Secure Site (CA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGKMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxKTAnBgNVBAMMIFRydXN0Q29yIEJhc2ljIFNlY3VyZSBTaXRlIChDQTEp","whitelist":false,"attachment":{"hash":"0c4ee3d67969b7bf371502575c7bef43da7ea5edee6add68dfe802d1f2c36baf","size":2211,"filename":"kHJg-GOK0x_65nWqv_uV70OMsqljk0LjqTDnfjQ6eRQ=.pem","location":"security-state-staging/intermediates/dca168d0-9454-4b21-b712-c05956c90dd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kHJg+GOK0x/65nWqv/uV70OMsqljk0LjqTDnfjQ6eRQ=","crlite_enrolled":true,"id":"eeb9f30c-488c-4fe2-93ea-864c9148aca8","last_modified":1562024901976},{"schema":1562024899001,"derHash":"SPyVnQBBkI2cUV2RnTJbxOxb5DMKJ8Kz+eksJAAu7ys=","subject":"SERIALNUMBER=201721,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE3MjE=","whitelist":false,"attachment":{"hash":"98ae387ad7d37d7bf83007c8ca8c278365e35ebb6b41eb3c75e62eed755f88cb","size":2402,"filename":"hGCOQw-9K-ytxK5hhBre3AMERQA7tOvG__AJlpFRH_E=.pem","location":"security-state-staging/intermediates/0e6eb2bb-7490-4624-b32e-43fc18094a3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hGCOQw+9K+ytxK5hhBre3AMERQA7tOvG//AJlpFRH/E=","crlite_enrolled":false,"id":"29600948-951b-472f-8a33-6580a407ab3e","last_modified":1562024899747},{"schema":1562024896760,"derHash":"b/b2P2oNPWNEbNqlI9Jic7EmwC+SLgXXPEdI64m4Y5M=","subject":"CN=Volusion\\, Inc. DV SSL CA - G2,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"6c0bf8e4ade43f22681e0a5f5f70b6e770a636633f3800c6f35346253ffa38a1","size":1548,"filename":"wL1M1GDAtMuwpOcLt4IiLDqjQ5yipn_-RaBKCU2F-YI=.pem","location":"security-state-staging/intermediates/50fda369-641f-4a5a-8256-ccd79c520165.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wL1M1GDAtMuwpOcLt4IiLDqjQ5yipn/+RaBKCU2F+YI=","crlite_enrolled":false,"id":"2012eb92-99b2-46a4-8952-d6cf483cfcfb","last_modified":1562024897497},{"schema":1562024896021,"derHash":"KgFVMaXzpM5Ym9hTxx3QaVhzIvV02Fycm5+d+PhsB14=","subject":"CN=GlobalSign Partners Timestamping CA - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTowOAYDVQQDEzFHbG9iYWxTaWduIFBhcnRuZXJzIFRpbWVzdGFtcGluZyBDQSAtIFNIQTM4NCAtIEc0","whitelist":false,"attachment":{"hash":"55fd7cdb607d62d8b1e1502661056767eac9a992e199601d101161e96d67bbfd","size":2272,"filename":"MV3IyrkNFIBvx9PowOoHv2BarAqZ3RsECQExDLC8gdA=.pem","location":"security-state-staging/intermediates/06afec3c-1c14-4055-9ca7-b51b1cd0e043.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MV3IyrkNFIBvx9PowOoHv2BarAqZ3RsECQExDLC8gdA=","crlite_enrolled":false,"id":"39acce96-ef65-4549-8e3c-54f9f3bf3d7e","last_modified":1562024896753},{"schema":1562024895272,"derHash":"gkB0wh8cKJfynCb/24Lk5ru4WWdqtVb/XJXGbG9YGMg=","subject":"SERIALNUMBER=201918,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTE4","whitelist":false,"attachment":{"hash":"3899b94862bfa35c040a240dbb5dd3a8ee30015cac42cc3bff7ebae9452fa971","size":2333,"filename":"6Byf7EtTwdFgQUzD4t4l9RcQFmGVUYrB7tEJzMqqaSg=.pem","location":"security-state-staging/intermediates/003cc6b1-20a9-4b60-9df1-68e892602e8a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6Byf7EtTwdFgQUzD4t4l9RcQFmGVUYrB7tEJzMqqaSg=","crlite_enrolled":false,"id":"17ba986d-94e9-4bb8-9c12-7f0f31e1300d","last_modified":1562024896012},{"schema":1562024893766,"derHash":"D0UXSH/QqLoxlKYSJFCnsyyYf/8W8tSvVObttv7Wjgg=","subject":"CN=Cloudflare ECC DV CA,O=Cloudflare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjEdMBsGA1UEAxMUQ2xvdWRmbGFyZSBFQ0MgRFYgQ0E=","whitelist":false,"attachment":{"hash":"6e91e6887bc3aa9215d3f27e6515378a675129324d6ddbde54d654d70a2bfe9e","size":1398,"filename":"TItdfwmeIeGsIvsAjHCM7VsLyRqqdj5W2ECpVF4S9pI=.pem","location":"security-state-staging/intermediates/34573d47-f19f-4053-b767-2aeb0f372e6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TItdfwmeIeGsIvsAjHCM7VsLyRqqdj5W2ECpVF4S9pI=","crlite_enrolled":false,"id":"c3e60f9b-aa45-41d4-9e47-576137eaf347","last_modified":1562024894503},{"schema":1562024893016,"derHash":"xBXOv6P8LvPHQJK4QmW61kw/yZlMkRd5ZWZ9er7pBYg=","subject":"OU=Security Communication RootCA2,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MF0xCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTI=","whitelist":false,"attachment":{"hash":"646b73a99fcc560ca1fe3ce6a321bf45c814a8676d3322ace82a7e7e8897f46a","size":1601,"filename":"M4BwmvOwlr48wqQFSBQsClIAKNsJ4st3riIGYWq2y7Q=.pem","location":"security-state-staging/intermediates/461fedad-31f0-49a0-8419-88fcb971810f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M4BwmvOwlr48wqQFSBQsClIAKNsJ4st3riIGYWq2y7Q=","crlite_enrolled":true,"id":"441e263c-474f-4706-8caf-067062a7022a","last_modified":1562024893759},{"schema":1562024892262,"derHash":"Um4w3ta/nVziFvUMgyQCtIq3DVWu2pGKGHOliD69sbU=","subject":"CN=Symantec Basic DV SSL CA - G1,OU=Symantec Trust Network+OU=Domain Validated SSL,O=Symantec Corporation,C=US","subjectDN":"MIGUMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSYwJAYDVQQDEx1TeW1hbnRlYyBCYXNpYyBEViBTU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"d57957d42aa2c6e0e84d528db5cf8a57338ce285705866b2655d9da23d3170af","size":1926,"filename":"ELaoZg6JkSInELBlz5pqy_4JobLWGrsC0OXAhqypqQI=.pem","location":"security-state-staging/intermediates/dec3f331-de15-4e97-9ad1-29047e1ac63f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ELaoZg6JkSInELBlz5pqy/4JobLWGrsC0OXAhqypqQI=","crlite_enrolled":false,"id":"cb5a05ef-ee16-4785-876e-987ea32b123e","last_modified":1562024893008},{"schema":1562024890738,"derHash":"vAh4y7xODa96naRkqxYmKiNb/a7TO5+VaboY/zSZdYA=","subject":"CN=TrustAsia EV SSL CA - C3,O=TrustAsia Technologies Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSQwIgYDVQQKDBtUcnVzdEFzaWEgVGVjaG5vbG9naWVzIEluYy4xITAfBgNVBAMMGFRydXN0QXNpYSBFViBTU0wgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"9a649e99d2774f04cb0fae10618205891e66d84669058b04828430921f6da774","size":1691,"filename":"3zvhr9FLox_6HK-CLvR_wE4XKQjtqDvzNPxSr0M8jeY=.pem","location":"security-state-staging/intermediates/3b83a2b4-a052-4057-8763-f1e172ed3331.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3zvhr9FLox/6HK+CLvR/wE4XKQjtqDvzNPxSr0M8jeY=","crlite_enrolled":false,"id":"c43c72cc-d8f7-448e-b348-fab85a1d5fad","last_modified":1562024891481},{"schema":1562024889996,"derHash":"yXO+rKZUSUUeXEExVw0F5y800q3r2U2y5R6aVE4eAQE=","subject":"CN=University of the Peloponnese CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGBMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLDAqBgNVBAMTI1VuaXZlcnNpdHkgb2YgdGhlIFBlbG9wb25uZXNlIENBIFIy","whitelist":false,"attachment":{"hash":"547632361fdb2ec2e526aa18221cf86e10f3968c0f48f91c1a655af07e963108","size":2532,"filename":"KxXWghXPpQcg84tdgEguQr8nOCM52RJF_m1eSznAo90=.pem","location":"security-state-staging/intermediates/4741d96b-ad99-4071-94b3-1919ec36f478.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KxXWghXPpQcg84tdgEguQr8nOCM52RJF/m1eSznAo90=","crlite_enrolled":true,"id":"d85352f9-9695-4bfe-89a2-ff7538e82f56","last_modified":1562024890730},{"schema":1562024889244,"derHash":"5TBRElnTP7Pt044OeZ/56PmdTbLaDe4I6vWm0VzOm/w=","subject":"CN=HARICA S/MIME RSA SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"aa6ee4b6bf9ece9b618b29f123445ced2df4d96772d25b1990276d8d2d624806","size":2194,"filename":"xM8U6lxZu3SNSAyNpbQ36H-EvxjEnARVpIOCGxsLfKk=.pem","location":"security-state-staging/intermediates/6078f10c-0713-49fb-9a6f-f79c11264457.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xM8U6lxZu3SNSAyNpbQ36H+EvxjEnARVpIOCGxsLfKk=","crlite_enrolled":false,"id":"15c738ed-e049-4949-a3f5-3ecff5b5e781","last_modified":1562024889988},{"schema":1562024888485,"derHash":"mrJcHnlchaMhQZ0wYvhLUhMrqo9xiEOoPjH7+Z/tw9c=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGoMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxFzAVBgNVBAMTDkRpZ2l0YWxTaWduIENB","whitelist":false,"attachment":{"hash":"a7bf3cbf3d969531a35ed1576876c52a36fedd914f4726823a39f4a86e4c2a2a","size":2991,"filename":"TTc5T1QJhP_HGF4fhXRILAEsILItrPkhDWbrKLF-g48=.pem","location":"security-state-staging/intermediates/df358802-1b62-4be3-af9c-0be569798451.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TTc5T1QJhP/HGF4fhXRILAEsILItrPkhDWbrKLF+g48=","crlite_enrolled":false,"id":"4e1247f1-3352-47d6-a70b-918f9ff41f43","last_modified":1562024889236},{"schema":1562024887746,"derHash":"SOWl4mSjzyYbv+Ay7d4d2LS0sPXdDdDJ/YXYbXg/fMk=","subject":"CN=Fuji Xerox Xnet CA - S2,O=Fuji Xerox,C=JP","subjectDN":"MEQxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MSAwHgYDVQQDExdGdWppIFhlcm94IFhuZXQgQ0EgLSBTMg==","whitelist":false,"attachment":{"hash":"ca7f1f00fc7733732971935188acb56d2f10501bcf1785f9529278c0af6da1e7","size":1597,"filename":"B7_wi5BX-cgrZ8uOuYuwLz2cFlyRGuCKCG8QhI13A_8=.pem","location":"security-state-staging/intermediates/ff8c919b-9df1-4a2d-a30a-dd1b88ea5a03.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B7/wi5BX+cgrZ8uOuYuwLz2cFlyRGuCKCG8QhI13A/8=","crlite_enrolled":true,"id":"f12a157c-5c8a-4341-bb3e-fa661dc4fd0a","last_modified":1562024888478},{"schema":1562024880268,"derHash":"jCdFNSKJ6ZSz6jSURbHPZBjlF0DhYU+LVmfa0pkKrvs=","subject":"CN=Intermediate Certificate DV SSL CA,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MHwxCzAJBgNVBAYTAk5MMSEwHwYDVQQKExhJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSswKQYDVQQDEyJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgRFYgU1NMIENB","whitelist":false,"attachment":{"hash":"b4d9375ac158ea565d87e19563efe0bffa2d9b35d0a3ec1cb40439fcbf57c2b9","size":1585,"filename":"XtinDwVCH8wSv8pJHbNpWDeamHpqtaKQzHBMJWbcb0o=.pem","location":"security-state-staging/intermediates/c970cff7-e508-4abb-a23d-c648d2a7eb09.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XtinDwVCH8wSv8pJHbNpWDeamHpqtaKQzHBMJWbcb0o=","crlite_enrolled":false,"id":"9ea12716-014d-47bb-96ee-1f04e7bc9e0f","last_modified":1562024881013},{"schema":1562024879513,"derHash":"f0UljqJ7Vv/P072WlaAdAIM1hbAsotQAHyB8rnB9TP0=","subject":"SERIALNUMBER=201810,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODEw","whitelist":false,"attachment":{"hash":"f66ae0ff53aa01cd3d96a637d858b40b7dcb40083da89b0ed48517ba8002be4e","size":2333,"filename":"gYvJdgfG4RYNxCReph78bEwJe4ZMUTH4m5WdTSGBQO0=.pem","location":"security-state-staging/intermediates/f86f76f4-0c31-4f6e-a700-fd319376608e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gYvJdgfG4RYNxCReph78bEwJe4ZMUTH4m5WdTSGBQO0=","crlite_enrolled":false,"id":"c30168e6-4b85-420c-a9db-c6867770efbe","last_modified":1562024880259},{"schema":1562024878761,"derHash":"NkXg8F4ZW+js1FblGMjCPBuyWc1s9GkfKcdErvDBH90=","subject":"CN=HIN Health Info Net CA G2,O=Health Info Net AG,C=CH","subjectDN":"MG4xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTAzLjQ4OS4yMTgxGzAZBgNVBAoMEkhlYWx0aCBJbmZvIE5ldCBBRzEiMCAGA1UEAwwZSElOIEhlYWx0aCBJbmZvIE5ldCBDQSBHMg==","whitelist":false,"attachment":{"hash":"1f02a00631f077e6d497487633ace61595a152bb13130f7f948399a4ea859165","size":2426,"filename":"2qRzikSeSMqF3GAhuSwDDfCPaZ7WK5_fh-ltdqq_pHs=.pem","location":"security-state-staging/intermediates/dcf188ae-a660-4584-90f3-d516c6bb0812.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2qRzikSeSMqF3GAhuSwDDfCPaZ7WK5/fh+ltdqq/pHs=","crlite_enrolled":false,"id":"2c275aa5-fa4a-4954-9766-eb65a05fd92c","last_modified":1562024879504},{"schema":1562024878021,"derHash":"PHUECYgkhtZBUfTLtb1hQypKe/QvSKhRmNJFpkrqIRc=","subject":"CN=DigiCert Global CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFERpZ2lDZXJ0IEdsb2JhbCBDQS0x","whitelist":false,"attachment":{"hash":"5488bc0ff40136ae2cb36b9c6832c59747d8afaa43a7f76b52325e286d34753c","size":2377,"filename":"RvzX55Asf6l-cqO5SkbhR9BWb7l3-NErRBT107Elrz0=.pem","location":"security-state-staging/intermediates/91bf19a3-1e46-4902-9fb2-2c722c9e1323.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RvzX55Asf6l+cqO5SkbhR9BWb7l3+NErRBT107Elrz0=","crlite_enrolled":false,"id":"e6419a66-4917-4c6b-b43e-d95def76ef80","last_modified":1562024878754},{"schema":1562024875071,"derHash":"KwqXLcDa4hjpR3OW09gt64LeEYhn3Rnh0v/9lYy7bak=","subject":"CN=DigiCert EV Code Signing CA (SHA2) G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLjAsBgNVBAMTJURpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMikgRzM=","whitelist":false,"attachment":{"hash":"5a448b983252a58eb053810201b198c8e0ca3708ef783d3d423dee742a47828d","size":1926,"filename":"KR5gTc0QATJ3BazYGPqHpEWyJKctmA4D8rAR_G5ZTDs=.pem","location":"security-state-staging/intermediates/74a045f9-4415-4b62-913a-1db386925e23.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KR5gTc0QATJ3BazYGPqHpEWyJKctmA4D8rAR/G5ZTDs=","crlite_enrolled":false,"id":"15028061-f9e6-499d-821f-65d2a86999f4","last_modified":1562024875804},{"schema":1562024872072,"derHash":"WLOFt2/SjmH2ymHh1eQbMr0rb/UR0vWuoKQCkwT05Io=","subject":"SERIALNUMBER=201721,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzIx","whitelist":false,"attachment":{"hash":"1aab2c75a3e101a669521b32a31699e957880a8fc9dcd0800083e61ec235ea1c","size":2402,"filename":"pA5xKViHaau-7Y9W7OAVG-tXBMCXmY-y21N9sBCDKfo=.pem","location":"security-state-staging/intermediates/dde7f3bf-969b-40ba-9d5d-5624e9ef8fd6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pA5xKViHaau+7Y9W7OAVG+tXBMCXmY+y21N9sBCDKfo=","crlite_enrolled":false,"id":"c2d88b2d-3ae6-4af0-855f-e79a625e0121","last_modified":1562024872816},{"schema":1562024869815,"derHash":"ZChKpfjchpfUPZc3z04mZiVBTkScAZZncUU3/37eMbc=","subject":"CN=Cerner Corporation Resonance Intermediate CA,OU=Cerner Resonance,O=Cerner Corporation,C=US","subjectDN":"MHwxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJDZXJuZXIgQ29ycG9yYXRpb24xGTAXBgNVBAsTEENlcm5lciBSZXNvbmFuY2UxNTAzBgNVBAMTLENlcm5lciBDb3Jwb3JhdGlvbiBSZXNvbmFuY2UgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"9f624f222fa5cd4a2856e02e5004f9842d469f56e8872ab89c0f7bc51516c2ed","size":1991,"filename":"4C07Vx9oeNSH3l4niOhQm70ScZnmEeg8OqJMEHi4z9U=.pem","location":"security-state-staging/intermediates/f70d825c-cf4d-49f0-9b9c-d3f0ced63101.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4C07Vx9oeNSH3l4niOhQm70ScZnmEeg8OqJMEHi4z9U=","crlite_enrolled":false,"id":"20f6264e-9de5-41e5-a881-6e3b1f47e8fe","last_modified":1562024870559},{"schema":1562024869073,"derHash":"oaBOTPxW/RkX60gfxGYpouRmVnVvoI4iSH9Utk4co+c=","subject":"CN=GRnet Client RSA SubCA R1,O=Greek Research and Technology Network,L=Athens,C=GR","subjectDN":"MHIxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHDAZBdGhlbnMxLjAsBgNVBAoMJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsxIjAgBgNVBAMMGUdSbmV0IENsaWVudCBSU0EgU3ViQ0EgUjE=","whitelist":false,"attachment":{"hash":"4c50596281c571a054e43965332daf357b3937daf3f45b7d2f565f691bec1c33","size":2897,"filename":"MH1lWQOCumqlkszCNDBuz80yo8Fj_thQXg9jnFecWgc=.pem","location":"security-state-staging/intermediates/17214962-d27b-4854-babd-44e89df3ac9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MH1lWQOCumqlkszCNDBuz80yo8Fj/thQXg9jnFecWgc=","crlite_enrolled":false,"id":"509309e3-6189-400c-ae81-c45c2abac5d3","last_modified":1562024869808},{"schema":1562024868324,"derHash":"X3xuYEHapRPL/j1OB/3ITiMNohry3hhkYMnsBIFRbas=","subject":"CN=RTI SHA256 CA - G2,O=RTI International,ST=NC,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJOQzEaMBgGA1UEChMRUlRJIEludGVybmF0aW9uYWwxGzAZBgNVBAMTElJUSSBTSEEyNTYgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"cbef60c762d29886a600043acf7949a95177ebc650a28e59784022968b60ab80","size":1825,"filename":"xFFKZx2Nrui3Dfx2WCyqmSMf_fKapm_iSGqD9HeReZ4=.pem","location":"security-state-staging/intermediates/e251dce3-60e0-45ea-bd46-4bb8e8ba5648.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xFFKZx2Nrui3Dfx2WCyqmSMf/fKapm/iSGqD9HeReZ4=","crlite_enrolled":false,"id":"74348592-3637-4bdf-ba15-78a85d3d0e6b","last_modified":1562024869065},{"schema":1562024863814,"derHash":"UQRHBr0je5G4m3gTN+bWJlbGnw/P++jkN0E2eUgSeGI=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"dd0b79ea02b6563d3e84faf5dc0697b11407132275d90389c15a9ddd28522099","size":1857,"filename":"Aku_IBq7yK9olk3VEZXtYwXrnZNnmT_LG0IJShBEL8A=.pem","location":"security-state-staging/intermediates/a74bcd6c-f384-4fde-ad3b-504cc56e416a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Aku/IBq7yK9olk3VEZXtYwXrnZNnmT/LG0IJShBEL8A=","crlite_enrolled":true,"id":"ca7e6cd9-9ffa-4c56-b2cf-5e35e31952c1","last_modified":1562024864546},{"schema":1562024861561,"derHash":"KDymk5UwwbVQORUFGTY3iuNocZZ7A+TC58JD8Uln3rE=","subject":"CN=Advanced Code Signing Class3 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGOMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExNjA0BgNVBAMMLUFkdmFuY2VkIENvZGUgU2lnbmluZyBDbGFzczMgZS1Temlnbm8gQ0EgMjAxNg==","whitelist":false,"attachment":{"hash":"12682a46c377cf0af1a09b1c08ef498ef4f1a96910c1f5442eb2b93d74c1a63c","size":2609,"filename":"IRoGHWUMgrIjO51yPcDjQ7km1QjZxz45uOOJou6I2pc=.pem","location":"security-state-staging/intermediates/fa8ed706-b516-4b1c-8125-839eea7101ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IRoGHWUMgrIjO51yPcDjQ7km1QjZxz45uOOJou6I2pc=","crlite_enrolled":false,"id":"0b5fdf3a-67b2-4466-b789-59a7d9a1889a","last_modified":1562024862308},{"schema":1562024860822,"derHash":"JiqVadYPuN5epRi4pxYib6dOsA3M6+zfq4e3cEr1Kxo=","subject":"CN=UIS-IsuB1-CA","subjectDN":"MFkxEzARBgoJkiaJk/IsZAEZFgNjb20xFjAUBgoJkiaJk/IsZAEZFgZ1bmlzeXMxEzARBgoJkiaJk/IsZAEZFgN1aXMxFTATBgNVBAMTDFVJUy1Jc3VCMS1DQQ==","whitelist":false,"attachment":{"hash":"a08272301840b097781c274e5446f676d117787159bb8f518efb6ddbed72cb4a","size":2487,"filename":"nPyHHj3iaTRtU8JqSy01uXEKmAdoIJseqjWg0UAG7tk=.pem","location":"security-state-staging/intermediates/a30aa611-1168-414f-a8bc-4c66f0ab693f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nPyHHj3iaTRtU8JqSy01uXEKmAdoIJseqjWg0UAG7tk=","crlite_enrolled":false,"id":"8410f360-6f88-469b-9196-dfbaf3acd285","last_modified":1562024861553},{"schema":1562024859332,"derHash":"KqvkLLVo6V1CjT+vWya+QHJOzfyZeEDgVVvVi2LE7yM=","subject":"CN=Sectigo ECC Extended Validation Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxODA2BgNVBAMTL1NlY3RpZ28gRUNDIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"9828e13ba39934a6990e6451aa9158a8e684732373e595b1c319b8df4be3ea5b","size":1313,"filename":"5JDYk2l2fSok8gLeyXpwC1pk8SkhbPX0CmZF5u-n-x4=.pem","location":"security-state-staging/intermediates/c642714a-7fa3-43bd-9bc7-a3fe279072c4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5JDYk2l2fSok8gLeyXpwC1pk8SkhbPX0CmZF5u+n+x4=","crlite_enrolled":false,"id":"9271e1a4-5616-4363-8211-35732600e9ab","last_modified":1562024860073},{"schema":1562024857065,"derHash":"WTxKtgZs32GFBn9WJnf93/UzZW20vS1XdzUwFwQVAhg=","subject":"CN=HARICA S/MIME RSA SubCA R3,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjM=","whitelist":false,"attachment":{"hash":"a83f0a21e25c370f20d5b261f8c0144f52b2dbaee8bc152173328d14b5b5333d","size":2576,"filename":"mAFvZFLJVXz5g-NekMLk2KNs8YG2rW6wdyEVN_f39oo=.pem","location":"security-state-staging/intermediates/b247282b-5d94-4b53-9606-a3673633c9ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mAFvZFLJVXz5g+NekMLk2KNs8YG2rW6wdyEVN/f39oo=","crlite_enrolled":false,"id":"2a41a971-f7dc-43b7-8399-58834c275ffa","last_modified":1562024857807},{"schema":1562024856324,"derHash":"wWhWg/PIWQ6IWAGX8hnKuZ5UgqFWhjX1ltCYZ7L0Bb0=","subject":"CN=Postecom CS4,OU=Servizi di Certificazione,O=Postecom S.p.A.,C=IT","subjectDN":"MGIxCzAJBgNVBAYTAklUMRgwFgYDVQQKEw9Qb3N0ZWNvbSBTLnAuQS4xIjAgBgNVBAsTGVNlcnZpemkgZGkgQ2VydGlmaWNhemlvbmUxFTATBgNVBAMTDFBvc3RlY29tIENTNA==","whitelist":false,"attachment":{"hash":"de76f670947dcff8a54c28b36c13874dd66e9d06b895c4db7e7d1a6f868e235c","size":1630,"filename":"PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=.pem","location":"security-state-staging/intermediates/bb160719-35aa-4b66-8da3-d888d2e69d82.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PBHUzxe1k4g4H4IZx6Fgmys4v5LbfykzxSURHhuSvZU=","crlite_enrolled":false,"id":"cfba4ef3-ee7d-4149-a5c5-2ee13435b22f","last_modified":1562024857057},{"schema":1562024855553,"derHash":"6BRDFB48EjLQZGXhG70fbKcYGj4Df4FbuPqurea+vtE=","subject":"CN=USERTrust ECC Extended Validation Secure Server CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGVMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazE7MDkGA1UEAxMyVVNFUlRydXN0IEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"73ad2394da4b0573e87030992e5584fa70d07050a7e76cd42001999693620fa7","size":1362,"filename":"H-5ErRMlCt-Y6SWx-LsLzsfdqO6rR8VCeSlgzeC0WN4=.pem","location":"security-state-staging/intermediates/9082d08a-28cc-471e-be19-5909cd26b697.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H+5ErRMlCt+Y6SWx+LsLzsfdqO6rR8VCeSlgzeC0WN4=","crlite_enrolled":true,"id":"e9b57d1a-9af1-4e57-9928-32303fcf43bb","last_modified":1562024856315},{"schema":1562024854039,"derHash":"WtzFRRSRawLb9eBllS6cEwvsWUIeD+oc6WR/AgULfsY=","subject":"CN=AffirmTrust Premium ECC Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczE3MDUGA1UEAwwuQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"7c6fa8fcab000dee92f2ec0db7f18ca2b144e6a21ce56a5a139a14b4bbf233cd","size":1130,"filename":"wbpI9B7IKa-_o7qnyxj6V-kvQMgcCDHDVt0t5EmhFCU=.pem","location":"security-state-staging/intermediates/45dd76ee-2745-409b-bee9-161e415c43f9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wbpI9B7IKa+/o7qnyxj6V+kvQMgcCDHDVt0t5EmhFCU=","crlite_enrolled":false,"id":"b0b9a2da-1db8-477b-8f2d-fd982ccf1c1f","last_modified":1562024854781},{"schema":1562024851756,"derHash":"K/IbQe5Lg2ylXm8kcrh9DKPPSz/gpRtvrzwvLZx06tg=","subject":"CN=KAGOYA JAPAN Certification Authority,O=KAGOYA JAPAN Inc.,C=JP","subjectDN":"MFgxCzAJBgNVBAYTAkpQMRowGAYDVQQKExFLQUdPWUEgSkFQQU4gSW5jLjEtMCsGA1UEAxMkS0FHT1lBIEpBUEFOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"1a080603b98669a1a61cbd208ffc3f06e5b85723a23cbba442d7126215e92d9c","size":1601,"filename":"wsjiB7F9r4B6PJrOA__iDtqeFteT01LDiESeoSm0aZI=.pem","location":"security-state-staging/intermediates/fe7eede0-1dba-45e7-9192-31be08622204.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wsjiB7F9r4B6PJrOA//iDtqeFteT01LDiESeoSm0aZI=","crlite_enrolled":false,"id":"1a7227e1-a59c-4b29-ab18-0f65195a0fa1","last_modified":1562024852483},{"schema":1562024851020,"derHash":"dM6MFjHvnzjnpBl9o/VHTbw08AHylnwltZmVYrzIydQ=","subject":"CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM","subjectDN":"MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==","whitelist":false,"attachment":{"hash":"068ffe7d3845059cb2339b66db36d7eb98f9f4a3f6355a0096a5afacba936f8b","size":2235,"filename":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem","location":"security-state-staging/intermediates/e056a24a-4812-4978-a64d-ee15e4344a04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=","crlite_enrolled":true,"id":"b4215e2b-457b-4e7f-a5b1-31fb5a7d6a9b","last_modified":1562024851748},{"schema":1562024846502,"derHash":"MGKRjZ3WF5JScbx/gIC4pqXSGFu9iA94Yv1MBDsZQZE=","subject":"CN=Buypass Class 2 CA 5,O=Buypass AS-983163327,C=NO","subjectDN":"MEsxCzAJBgNVBAYTAk5PMR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFzcyBDbGFzcyAyIENBIDU=","whitelist":false,"attachment":{"hash":"fd5a69fd438ea769861dbb346922f606e66c972bf1b76d0b4b699d88aef6ef6a","size":2170,"filename":"QlGZmcMUM6a8-CxL2TmTAfoYCm-fXAouAzzKYCxGoss=.pem","location":"security-state-staging/intermediates/d6a8096b-9b05-41b8-984a-b244edc193b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QlGZmcMUM6a8+CxL2TmTAfoYCm+fXAouAzzKYCxGoss=","crlite_enrolled":true,"id":"355287c5-30e3-4992-b72c-8013c887d757","last_modified":1562024847233},{"schema":1562024844261,"derHash":"c2uZbTOWhHKcQ8s5fRuysvP0p4FqXjxdWJID+IXF1Hw=","subject":"CN=Certigna Identity Plus CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQRhDBROVFJGUi00ODE0NjMwODEwMDAzNjEiMCAGA1UEAwwZQ2VydGlnbmEgSWRlbnRpdHkgUGx1cyBDQQ==","whitelist":false,"attachment":{"hash":"f191c1abecb352ea767687d0c74090ae61fb68eaf1b3c23628b26f00a9933fe1","size":2519,"filename":"ywhSp1oF34bfFheBzKO3KqbsXi-qQbyfXu94SMYBxwg=.pem","location":"security-state-staging/intermediates/ac1807a4-6a83-4902-a18f-cc1d275b7d34.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ywhSp1oF34bfFheBzKO3KqbsXi+qQbyfXu94SMYBxwg=","crlite_enrolled":false,"id":"e7d0d7ea-579e-4b38-893f-de28d80bc3ba","last_modified":1562024844993},{"schema":1562024843491,"derHash":"91pNSaUrBD/HMkuPJjrIqbe9IqMohoWIvfyTfTw5brY=","subject":"CN=Belgium Root CA3,C=BE","subjectDN":"MCgxCzAJBgNVBAYTAkJFMRkwFwYDVQQDExBCZWxnaXVtIFJvb3QgQ0Ez","whitelist":false,"attachment":{"hash":"241dee2e8ef4e0f89c5b6071322dc968ba5e5de346e84839261ec88e12c3706e","size":1768,"filename":"x7xeSTcmu_Ux9i_F9VE6wD6tgTr03NRFszBbo9PVM3Q=.pem","location":"security-state-staging/intermediates/052d56a4-4cca-49d4-9fc4-3c121e75f3b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x7xeSTcmu/Ux9i/F9VE6wD6tgTr03NRFszBbo9PVM3Q=","crlite_enrolled":true,"id":"9d3cfb47-14a6-4dab-9b93-a2164cae62c4","last_modified":1562024844254},{"schema":1562024842011,"derHash":"Bq+ECc5a1B4bfs/c0yF3PhiGlafpD+eWM4VKBAsH8Io=","subject":"SERIALNUMBER=201909,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTA5","whitelist":false,"attachment":{"hash":"155fee7f4485ec5abbb06ea19377003c4720b3678db5e8260b1327ab444e7b9a","size":2333,"filename":"HqqnLyY4pkP41GQ_CWZPTbAhR6NJ_qx2zkp_fCPzaqM=.pem","location":"security-state-staging/intermediates/d07f50ce-d0fe-4f38-b04d-fc8bb21111e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HqqnLyY4pkP41GQ/CWZPTbAhR6NJ/qx2zkp/fCPzaqM=","crlite_enrolled":false,"id":"637b4b4d-19c6-49e1-a72d-3cb503859a46","last_modified":1562024842745},{"schema":1562024841257,"derHash":"oF7kPlVsjCo4dm0Dd/tIaAbRaeoZXmnNhzOB2Oq3380=","subject":"OU=\u91ab\u4e8b\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOmGq+S6i+aGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"5aac98b3e8004b6852a1a3686b2d78a1cf8f9b3caf283358f17bead0b43dc7a8","size":1841,"filename":"shQPJLnlxje6ndMEVR9GtIQdN2YEIsFYAHMiwD_1bdE=.pem","location":"security-state-staging/intermediates/c36c8a14-915a-43a4-81be-aad60c6c0113.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"shQPJLnlxje6ndMEVR9GtIQdN2YEIsFYAHMiwD/1bdE=","crlite_enrolled":false,"id":"9db46b42-5447-4d92-b0f4-4701e9a0e1d9","last_modified":1562024842003},{"schema":1562024840500,"derHash":"ATeet7hfaO3CRltCQ4CXaH6+Hq5JMZY5v7NC78PO+h0=","subject":"CN=CERTSIGN FOR BANKING QUALIFIED DS TEST CA V3,OU=Certificat de test Test certificate,O=certSIGN,C=RO","subjectDN":"MIGFMQswCQYDVQQGEwJSTzERMA8GA1UEChMIY2VydFNJR04xLDAqBgNVBAsTI0NlcnRpZmljYXQgZGUgdGVzdCBUZXN0IGNlcnRpZmljYXRlMTUwMwYDVQQDEyxDRVJUU0lHTiBGT1IgQkFOS0lORyBRVUFMSUZJRUQgRFMgVEVTVCBDQSBWMw==","whitelist":false,"attachment":{"hash":"bf0841437cff0c49b20954c90edf74119d9005723c6fac5a22f5b7e9949b7562","size":1658,"filename":"KWZVh2Uo0VJTsQaEe-fd3OibRGv0EhYSgphzM6kiYeY=.pem","location":"security-state-staging/intermediates/4e2829f2-e770-4a7b-bf5f-26dc917d6fd4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KWZVh2Uo0VJTsQaEe+fd3OibRGv0EhYSgphzM6kiYeY=","crlite_enrolled":false,"id":"9ad29fec-b9bc-433a-96c0-21647e2caaa0","last_modified":1562024841250},{"schema":1562024839008,"derHash":"1eetJ1qin9TUXn+dPf9X78ywlPGFOxqhrSKWjLGLLMU=","subject":"CN=SECOM Passport for Code Signing CA,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGExCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTRUNPTSBQYXNzcG9ydCBmb3IgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"b1b8376a419f1cdb25298ba405e9601b0a8815e1b993c4cc0dba4d36e4cb899c","size":1613,"filename":"nbl62DjAbORsYtz-i6CUcy6Va4Bn0Wb6XbbJyf7h5t4=.pem","location":"security-state-staging/intermediates/5a196805-7716-4404-94c8-0d7c6d6fce7f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nbl62DjAbORsYtz+i6CUcy6Va4Bn0Wb6XbbJyf7h5t4=","crlite_enrolled":false,"id":"b915a10c-dc02-4bcf-af1a-9f479bfa83fd","last_modified":1562024839746},{"schema":1562024836744,"derHash":"XCpjKbe9Gi//HB7dcyUxSJLfEUkbOUKoP08LE2lMzAE=","subject":"SERIALNUMBER=201730,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzMw","whitelist":false,"attachment":{"hash":"48e5e3e9a19fd493091deb28a383f2a979a45f74c5f56b81826daf977e48c075","size":2402,"filename":"MGswEonwdtFVVnhmZzb1mw5D9KJSfCyi_dRuQSn64sY=.pem","location":"security-state-staging/intermediates/7eb06311-8888-4d7c-8cc1-7b7b92e20d3e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MGswEonwdtFVVnhmZzb1mw5D9KJSfCyi/dRuQSn64sY=","crlite_enrolled":false,"id":"80c699b8-5637-4698-b774-eefba7401a08","last_modified":1562024837488},{"schema":1562024834509,"derHash":"fTOuYYzWJVM3fSU9LryihdhOmKkk2J+Y1L5P7jH5Kqg=","subject":"SERIALNUMBER=ZZZZZZB9,CN=Siemens Issuing CA Internet Server 2017,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGnMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQjkxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMTAwLgYDVQQDDCdTaWVtZW5zIElzc3VpbmcgQ0EgSW50ZXJuZXQgU2VydmVyIDIwMTc=","whitelist":false,"attachment":{"hash":"c9439a1dc15fd344909f598016e2c848de6e40651f0f2294891f78e59cb26f4a","size":2804,"filename":"f4p5PJI5fILNPQJUbuMdNzd-JMnwHZgjMi4ZjRUXTTk=.pem","location":"security-state-staging/intermediates/a4a5c871-1de7-4529-bc71-a59dfdc2f199.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"f4p5PJI5fILNPQJUbuMdNzd+JMnwHZgjMi4ZjRUXTTk=","crlite_enrolled":true,"id":"491aff6b-5922-48f6-b983-555e06fe0188","last_modified":1562024835254},{"schema":1562024833018,"derHash":"yIOz7MasDe51zdWF5zogkoe8DJ+dedSIhg9j4uqKfSw=","subject":"CN=GlobalSign EC Administration CA2,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEVDIEFkbWluaXN0cmF0aW9uIENBMg==","whitelist":false,"attachment":{"hash":"fa6f0725fd87b33f403012750721939c96d5375455d0c99502d8483d16257b3e","size":1077,"filename":"zzbDiHfMkWT0L5Kqak7r2CbmLNItoOhMZrRdT1c4eHQ=.pem","location":"security-state-staging/intermediates/5a9babab-e54e-4213-a0a3-463e6b9c5fc7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zzbDiHfMkWT0L5Kqak7r2CbmLNItoOhMZrRdT1c4eHQ=","crlite_enrolled":true,"id":"fc596052-49ff-470b-807f-143c5f421b18","last_modified":1562024833753},{"schema":1562024832266,"derHash":"kaMhrX/TyXgSFNdvXijrDTGshml+33AOmvlMdIX1tSE=","subject":"CN=GoGetSSL RSA EV CA,OU=Controlled by COMODO CA exclusively for GoGetSSL,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MIGHMQswCQYDVQQGEwJMVjENMAsGA1UEBxMEUmlnYTERMA8GA1UEChMIR29HZXRTU0wxOTA3BgNVBAsTMENvbnRyb2xsZWQgYnkgQ09NT0RPIENBIGV4Y2x1c2l2ZWx5IGZvciBHb0dldFNTTDEbMBkGA1UEAxMSR29HZXRTU0wgUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"b3e85c26c77bebd92394771e7fb3c0466dd42cb33e30893cb845e25d76146b7f","size":2198,"filename":"kr1IBiy8TZumRDu-iU8HD2GILSEqTPUTw6G9jcHRek4=.pem","location":"security-state-staging/intermediates/a2855c8c-ae89-46bc-b28d-664f3cdf95d9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kr1IBiy8TZumRDu+iU8HD2GILSEqTPUTw6G9jcHRek4=","crlite_enrolled":true,"id":"0e87223f-7e82-4b81-82ee-0ac036409b87","last_modified":1562024833010},{"schema":1562024830009,"derHash":"aNCy6Mhb8Am02zmsi14vqOH9n9HlAocE6pKIx+Ryqus=","subject":"CN=TrustAsia TLS ECC CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"7ee8d9739388c554cf3b1e8c694adbfcc8987281bc7d6e0e3f70e444d02785f6","size":1406,"filename":"x-B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=.pem","location":"security-state-staging/intermediates/c71c3a1a-6e42-4bc5-a94e-780ef1d291b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x+B4VfwG1Q5TkeQLpvUFHvsaT9cd8FIf8sfKwgA4sCE=","crlite_enrolled":false,"id":"70288a6a-8a68-4abd-90d8-88c8a920eafb","last_modified":1562024830748},{"schema":1562024829266,"derHash":"ahdFsxF2+sKEQgorzvZ7WeIqHTd1OrryzFGy9XKSJYg=","subject":"CN=Google S/MIME Authority,O=Google Inc,ST=California,C=US","subjectDN":"MFkxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpHb29nbGUgSW5jMRMwEQYDVQQIEwpDYWxpZm9ybmlhMSAwHgYDVQQDExdHb29nbGUgUy9NSU1FIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"1e75e1f63fa5904dbac0ed5fd58f6d1fa0b06f2923a05d13e1a380f9de1994d7","size":1516,"filename":"6OsRXz4NaQTtHc0exgRVipVz12OxHvsJx91beGJIISY=.pem","location":"security-state-staging/intermediates/6905c2d3-33a3-4d80-820f-a4e4667c46ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6OsRXz4NaQTtHc0exgRVipVz12OxHvsJx91beGJIISY=","crlite_enrolled":false,"id":"af05d3d2-2dc9-4bc1-bb41-e70d4ddeebbb","last_modified":1562024830001},{"schema":1562024826951,"derHash":"ybBswIMYYiBhjmGodyZA+CTfadVhrVa9wVrVbQzghgg=","subject":"CN=Apple IST CA 2 - G1,OU=Certification Authority,O=Apple Inc.,C=US","subjectDN":"MGIxHDAaBgNVBAMTE0FwcGxlIElTVCBDQSAyIC0gRzExIDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQKEwpBcHBsZSBJbmMuMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"d84962e6ad0e174b509f0b27d7aca095081588308e85148f0e798c3dcccfd511","size":1662,"filename":"tc-C1H75gj-ap48SMYbFLoh56oSw-CLJHYPgQnm3j9U=.pem","location":"security-state-staging/intermediates/811c650d-5339-4109-9f5c-e9b038422338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tc+C1H75gj+ap48SMYbFLoh56oSw+CLJHYPgQnm3j9U=","crlite_enrolled":true,"id":"acc298cc-782a-430e-96f7-3ba5d0bc27cf","last_modified":1562024827724},{"schema":1562024825471,"derHash":"FD3+ZYMuID5NKOww+2C6c77jru4wij+NGUu2Hn0dm8A=","subject":"CN=FujiSSL ECC Extended Validation Secure Site CA,OU=Controlled by Sectigo exclusively for Nijimo K.K.,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIG9MQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMTowOAYDVQQLEzFDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIE5pamltbyBLLksuMTcwNQYDVQQDEy5GdWppU1NMIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTaXRlIENB","whitelist":false,"attachment":{"hash":"7fd1609480c2d19f3b96f886987e7f05a7ffd31bd99533859f434d8cadcdc8d2","size":1427,"filename":"2e_93k3ZMkd5hB-WURSs0iPYqDfeY-hXB4RKemS8IaE=.pem","location":"security-state-staging/intermediates/9d3d3199-435c-45cd-86ba-6042d28ece9d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2e/93k3ZMkd5hB+WURSs0iPYqDfeY+hXB4RKemS8IaE=","crlite_enrolled":false,"id":"3cfe9cd7-b3f2-44ad-a875-c7796e21f3a9","last_modified":1562024826204},{"schema":1562024823958,"derHash":"4ImK1mJHS591PHm+qHgDHJpdY0pJ7dYxC5YKsCPALA4=","subject":"CN=Symantec Class 3 Secure Server SHA256 SSL CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGEMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxNTAzBgNVBAMTLFN5bWFudGVjIENsYXNzIDMgU2VjdXJlIFNlcnZlciBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"6856696d26dbf4f188099804b32d22a587d73027e302a1bade4f49e4827ad115","size":1894,"filename":"UUrclr9NL3MR9M9GTzAcVbt7zjo5AEKuhrEWmsJftnM=.pem","location":"security-state-staging/intermediates/adf7b301-8924-4c07-87fb-659291ed7d21.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UUrclr9NL3MR9M9GTzAcVbt7zjo5AEKuhrEWmsJftnM=","crlite_enrolled":true,"id":"7376bf35-99c0-4599-b55b-4372cc68156e","last_modified":1562024824721},{"schema":1562024823207,"derHash":"2xKx0/jMUv/0h08Ki4Xp+2ogUIYbGxxhSBp0OsDTPVo=","subject":"CN=Rush Health CA,OU=Orion Health Direct Secure Messaging,O=Rush Health,C=US","subjectDN":"MGsxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtSdXNoIEhlYWx0aDEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRcwFQYDVQQDEw5SdXNoIEhlYWx0aCBDQQ==","whitelist":false,"attachment":{"hash":"777756dbdf8987198ed063115b1af53ee0bec8ee20305ff10783615126df2832","size":2259,"filename":"H4lnk1fnK8QrG5dwIupUznM6vj1SaMgHe3uXgdSHJ-o=.pem","location":"security-state-staging/intermediates/06583537-d1cb-435e-b252-acc108705a5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H4lnk1fnK8QrG5dwIupUznM6vj1SaMgHe3uXgdSHJ+o=","crlite_enrolled":false,"id":"8d5c4590-b907-4274-953c-6e4dcad27053","last_modified":1562024823950},{"schema":1562024821713,"derHash":"MrSzdoylpNgOnfjVV7dCT4CvVWCxFI0FVI3D12p+1hk=","subject":"CN=Apple Public Client RSA CA 2 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgQ2xpZW50IFJTQSBDQSAyIC0gRzE=","whitelist":false,"attachment":{"hash":"29d465ec2e13b115b26b4088d20107aae09a74247d8056a2222d2c038b00e1a9","size":1593,"filename":"yARYMQ6SJG9XZEjFw3uGtG-NvMLIHJJ92EADe2HF4R8=.pem","location":"security-state-staging/intermediates/46b493f4-0121-4083-874f-08b85d4a39b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yARYMQ6SJG9XZEjFw3uGtG+NvMLIHJJ92EADe2HF4R8=","crlite_enrolled":false,"id":"19e6f602-273b-4858-ad46-71682dead98a","last_modified":1562024822460},{"schema":1562024817950,"derHash":"Zp53J6kr5y2XGOFpItwbwUkrGvM/pHk+aNh3jxmi6+A=","subject":"CN=GlobalSign Domain Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzI=","whitelist":false,"attachment":{"hash":"a1bfe295fb75b101ae4073c6fbcf06f41c7f851774b0b9fd6b9cac8bea35926a","size":1573,"filename":"PL1_TTDEe9Cm2lb2X0tixyQC7zaPREm_V0IHJscTCmw=.pem","location":"security-state-staging/intermediates/29e7705d-08aa-4026-aa35-5039e8543166.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PL1/TTDEe9Cm2lb2X0tixyQC7zaPREm/V0IHJscTCmw=","crlite_enrolled":true,"id":"b87cbd17-c73d-4c6b-a126-fb3cff29f8f3","last_modified":1562024818708},{"schema":1562024816467,"derHash":"L3IBnLRbB6sFyxu47MMHbXByZgtXop5C6+KqV7g7xgs=","subject":"CN=Symantec Class 3 Shared Public Organization CA - SHA256,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgU2hhcmVkIFB1YmxpYyBPcmdhbml6YXRpb24gQ0EgLSBTSEEyNTY=","whitelist":false,"attachment":{"hash":"a99b6543f5b69ea99d4f440cdea24736cc6e6c9b19053da4a191265ee6e04b02","size":1910,"filename":"-TjXJ8RrycvnPfZ2ADExTGcSG5sKLN4p4fett5kkFVc=.pem","location":"security-state-staging/intermediates/28645f83-6522-408d-967b-8b5b43d0b945.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+TjXJ8RrycvnPfZ2ADExTGcSG5sKLN4p4fett5kkFVc=","crlite_enrolled":false,"id":"edd90e50-1b90-45ae-834d-6d43597478f3","last_modified":1562024817197},{"schema":1562024815714,"derHash":"CJKAkjZZMWGXWfK4tE7Sq8Aw2K9sPDFJ+8sHx4qWzjY=","subject":"CN=SSLs.com RSA EV Secure Server CA,OU=Controlled by Sectigo exclusively for SSLs.com,O=SSLs.com (Namecheap\\, Inc.),L=Phoenix,ST=Arizona,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEQMA4GA1UEBxMHUGhvZW5peDEjMCEGA1UEChMaU1NMcy5jb20gKE5hbWVjaGVhcCwgSW5jLikxNzA1BgNVBAsTLkNvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgU1NMcy5jb20xKTAnBgNVBAMTIFNTTHMuY29tIFJTQSBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cf68f2c97f44e659a8fec4a8a0a3cf961eacf7dd93197d05df0d3970f3157ec6","size":2263,"filename":"e3CoG9n5TuSLIlY6MxPqo4fACcPQacL73N47EKEZh80=.pem","location":"security-state-staging/intermediates/45afb960-c21a-415e-a67c-c856bb993f2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"e3CoG9n5TuSLIlY6MxPqo4fACcPQacL73N47EKEZh80=","crlite_enrolled":false,"id":"77895549-6665-42c1-957c-27c5953f4670","last_modified":1562024816459},{"schema":1562024814967,"derHash":"7r7fhG8dug6Iqba5qw/2Xwl/KEwGpkqTnujFyebzE/Q=","subject":"CN=WISeKey CertifyID Personal GB CA 1,O=WISeKey,C=CH","subjectDN":"MEwxCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSswKQYDVQQDEyJXSVNlS2V5IENlcnRpZnlJRCBQZXJzb25hbCBHQiBDQSAx","whitelist":false,"attachment":{"hash":"eeb8f2892ae58328e19191b4b5160a2d5d690fcb71232c4a0298be7be4686bee","size":1752,"filename":"O0NXa9mctJwNcofSAYnjRkrOXQmaULQorTfUS7KRo6c=.pem","location":"security-state-staging/intermediates/4c416bc6-29ca-4a1d-8453-554ce8e86371.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"O0NXa9mctJwNcofSAYnjRkrOXQmaULQorTfUS7KRo6c=","crlite_enrolled":false,"id":"85c5274a-871e-4fd7-80bf-bd6711023ec2","last_modified":1562024815705},{"schema":1562024814212,"derHash":"ZVXWYdN/JJSiPC1fg0eeeAUbbedqFHtQbWvqKIK00GY=","subject":"CN=DigiCert Secure Site Korea CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIENB","whitelist":false,"attachment":{"hash":"fc29957f16bdc0486d762dbf5aedac6a8beb9dcb70bffc98c77fdf64a61c982a","size":1646,"filename":"trjGmNMo7m2JbQME1aNrIcNXkG-fscWHZcrs2zCZOHg=.pem","location":"security-state-staging/intermediates/0494e722-cc07-4c6a-9de7-04ad4fe72e28.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"trjGmNMo7m2JbQME1aNrIcNXkG+fscWHZcrs2zCZOHg=","crlite_enrolled":false,"id":"1d1dcdf6-815c-4995-b5e9-5396aa70d4dc","last_modified":1562024814959},{"schema":1562024813469,"derHash":"xUgNe/+VLRvoYXj/cT8R9Rz3QjLuVnb8WhcNSmpv5Qo=","subject":"CN=IdenTrust ACES CA 2,OU=IdenTrust Public Sector,O=IdenTrust,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJZGVuVHJ1c3QxIDAeBgNVBAsTF0lkZW5UcnVzdCBQdWJsaWMgU2VjdG9yMRwwGgYDVQQDExNJZGVuVHJ1c3QgQUNFUyBDQSAy","whitelist":false,"attachment":{"hash":"70fc07993b6ce80dd61ad20839fdb1f4a131a992c9111b6d78359f0a6afee877","size":2374,"filename":"IwMaflbabx_L7ZJzQfxYFjeJq6DfrV4DtdtBvNHuyNQ=.pem","location":"security-state-staging/intermediates/d40df6fc-5112-4daa-a568-3a1638209e5c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"IwMaflbabx/L7ZJzQfxYFjeJq6DfrV4DtdtBvNHuyNQ=","crlite_enrolled":true,"id":"0edeebe3-9085-404e-9104-ccf70090f4dc","last_modified":1562024814204},{"schema":1562024812732,"derHash":"pccVHarAwyimncZNZ3vWZwM3EIZ/0+IZ5H4qSeC7Qr8=","subject":"CN=MilleniumSign Code Signing Certificate CA RSA,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGPMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTYwNAYDVQQDDC1NaWxsZW5pdW1TaWduIENvZGUgU2lnbmluZyBDZXJ0aWZpY2F0ZSBDQSBSU0E=","whitelist":false,"attachment":{"hash":"aeaa40b5d73d509719af557963bf77aa71b1368ff2b832b2653f0c0046c65710","size":2568,"filename":"WdSLOooV5TQ8cmS2oXIK3QCY0LIp5kupdZbbUo5psYU=.pem","location":"security-state-staging/intermediates/5605ff36-2876-486c-8365-4842b367be04.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WdSLOooV5TQ8cmS2oXIK3QCY0LIp5kupdZbbUo5psYU=","crlite_enrolled":false,"id":"8f581b38-d44e-4f78-8b77-d374d71b3718","last_modified":1562024813461},{"schema":1562024811611,"derHash":"1XuYcrHu+OgDKrLoyw5jtoXRZVxRxFTyP5l136Ktfgo=","subject":"CN=AffirmTrust Premium Extended Validation CA,OU=http://www.affirmtrust.com/resources,O=AffirmTrust,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEUMBIGA1UECgwLQWZmaXJtVHJ1c3QxLTArBgNVBAsMJGh0dHA6Ly93d3cuYWZmaXJtdHJ1c3QuY29tL3Jlc291cmNlczEzMDEGA1UEAwwqQWZmaXJtVHJ1c3QgUHJlbWl1bSBFeHRlbmRlZCBWYWxpZGF0aW9uIENB","whitelist":false,"attachment":{"hash":"0e5a29ad6919bb5ec5d101857ea182d71e759e19915b21684a1d1cde6ed06b13","size":2414,"filename":"3gMCuDMv_P0gIb194xpHJCsdZogzAhE3N6usv_7BXhk=.pem","location":"security-state-staging/intermediates/199b0582-a65b-42a8-ba15-7d0fbdcf2937.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3gMCuDMv/P0gIb194xpHJCsdZogzAhE3N6usv/7BXhk=","crlite_enrolled":false,"id":"17ae7da2-5633-4d3a-92b0-82782ee74321","last_modified":1562024812723},{"schema":1562024809754,"derHash":"7cc0xQFQHceidEj6AsdJMfhXi/KXsXPzS4QegsZpGSY=","subject":"CN=GlobalSign RSA EV QWAC CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIFJTQSBFViBRV0FDIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"e36e727ca82d6250ef1552ffd1b955b45f64f8d642e3b0b7c74440a913343a99","size":1959,"filename":"sHs4J5kRzSpOR8B4w5hjWaDPqfeO_b7HlAyT-cooapo=.pem","location":"security-state-staging/intermediates/3a1b3cff-c7d5-48dd-a11d-654a654eafc5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"sHs4J5kRzSpOR8B4w5hjWaDPqfeO/b7HlAyT+cooapo=","crlite_enrolled":false,"id":"4f4e7833-37a9-4ab5-b9b6-773e1a6dd497","last_modified":1562024810490},{"schema":1562024808990,"derHash":"gP3kKCEq8MoKxTHu5u0t89PCpFV9/OhXBw/JR5IumyQ=","subject":"CN=HydrantID EV SSL ICA G1,O=HydrantID (Avalanche Cloud Corporation),C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxIDAeBgNVBAMTF0h5ZHJhbnRJRCBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"73d01cd825755ae10a290835ef3db09ca9ed8937d4f11bcf9f033cd8a7315522","size":2438,"filename":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=.pem","location":"security-state-staging/intermediates/50c0d7df-0130-4f21-b8b8-42dd52838404.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EnmchGPCp5YYVoSwFIxrS6A7RJUxstcXt8NlMXfA6Tw=","crlite_enrolled":true,"id":"fc1f6c56-2813-4b76-9707-d6f69619e349","last_modified":1562024809746},{"schema":1562024803886,"derHash":"VU464xSv8mTT/efyu8gY8uc02UszYgjt7+fDexYrapY=","subject":"CN=SSL.com EV Timestamping Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgVGltZXN0YW1waW5nIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"1854e08a78906263193fd2a0a983ae57a216a24ba67d1eb24771dd1d729d9465","size":2511,"filename":"gaRV9R7xQa8c6ov_2Zq2uULuRvjacPoz06QTG4LB0h0=.pem","location":"security-state-staging/intermediates/a423da0f-3134-4795-a33f-2cf3af4e8559.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gaRV9R7xQa8c6ov/2Zq2uULuRvjacPoz06QTG4LB0h0=","crlite_enrolled":false,"id":"36d7107c-26e1-4e68-8d92-fcb78298673e","last_modified":1562024808982},{"schema":1562024803135,"derHash":"Kp0NAYu0n96hTWwW6boKlC8oM7mq3/utEwbjAbSVz7c=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA - G2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"2ad03492e4239b9829ba99cbc77972e7aa518670367cb6c29b439894422fba8b","size":1817,"filename":"moFjHuv-moWxld4bAnXe_iuvG8CdWVGn1hd1j6npb7s=.pem","location":"security-state-staging/intermediates/aa96186c-483d-49db-ae7f-f3087565a3d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"moFjHuv+moWxld4bAnXe/iuvG8CdWVGn1hd1j6npb7s=","crlite_enrolled":false,"id":"6376e328-15c0-4ccf-9703-eebe193ffcc1","last_modified":1562024803879},{"schema":1562024800131,"derHash":"Ep+13lAeJAQc0UqBB1/RzeJXQI1KNT5jaRLji92i0/s=","subject":"CN=Certum Domain Validation CA SHA2,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGFMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSkwJwYDVQQDEyBDZXJ0dW0gRG9tYWluIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"e25bdf92d0be8655e107328d6904320e57365813d9a19f81ea387cb5426c4296","size":1727,"filename":"S4AbJNGvyS57nzJwv8sPMUML8VHSqH1vbiBftdPcErI=.pem","location":"security-state-staging/intermediates/4ebda4af-1b27-4b52-bf3e-baac3a47d395.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"S4AbJNGvyS57nzJwv8sPMUML8VHSqH1vbiBftdPcErI=","crlite_enrolled":true,"id":"61249918-c227-4afe-9de6-22348a31422d","last_modified":1562024800874},{"schema":1562024798615,"derHash":"sFBb8pR/CAerri1CwZND6vCNHd4/h0WwWJpXNieS5HA=","subject":"CN=DigiCert Secure Site Korea EV ECC CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xLTArBgNVBAMTJERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIEVDQyBDQQ==","whitelist":false,"attachment":{"hash":"8f3ba34bb39284e4eac1c23c6af465a31d3ec30f7896fbb885e6a74b38a9ce11","size":1427,"filename":"AdP_iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH-6k=.pem","location":"security-state-staging/intermediates/8ae1458e-7b25-4f7f-8570-16c7af6e2a7c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AdP/iRzhlqZTNB5kWPVQycXqelrhzOIKeur3cseH+6k=","crlite_enrolled":false,"id":"92ca13e1-2098-42b2-aa2b-5dbe4643c974","last_modified":1562024799347},{"schema":1562024797879,"derHash":"TJGYtnNVCFh5mtJ0TMCDwboAJ+d9O4/W1Wz1NiDQmeI=","subject":"CN=emSign Device CA - G1,OU=emSign PKI,O=eMudhra Technologies Limited,C=IN","subjectDN":"MGkxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMR4wHAYDVQQDExVlbVNpZ24gRGV2aWNlIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"8956d067022b96359ff3d30c6bcb351e2ba5eb96b50837b275bedd8c2468cc4f","size":1585,"filename":"Ivw7wv5XpckfdFlOxj37SBDwiI0WAhkp1WOGE3r2BvU=.pem","location":"security-state-staging/intermediates/20d32f63-93e8-4cc0-9495-4924fe795c22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ivw7wv5XpckfdFlOxj37SBDwiI0WAhkp1WOGE3r2BvU=","crlite_enrolled":false,"id":"74cd2ebb-684e-40ec-a833-df95792630aa","last_modified":1562024798607},{"schema":1562024797128,"derHash":"L/GDLeb5UGqsnSx3V+oHV2TsaMyccKDs4z7MYWB8vkM=","subject":"CN=TERENA SSL CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MGQxCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEYMBYGA1UEAxMPVEVSRU5BIFNTTCBDQSAy","whitelist":false,"attachment":{"hash":"56a3b2875df755c4075fee31fc3820a0cdcd21908ed25a2a21a9e02e177112f2","size":2129,"filename":"PYHJ7Ok9y2OoV3yMZFAcH45HI64yll_qcT9kRYmQFTY=.pem","location":"security-state-staging/intermediates/ca22d756-cc29-4f7f-a172-a93147c9b473.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PYHJ7Ok9y2OoV3yMZFAcH45HI64yll/qcT9kRYmQFTY=","crlite_enrolled":false,"id":"d1f8117c-a369-49f0-88ac-e00cc462a0ab","last_modified":1562024797871},{"schema":1562024796371,"derHash":"FtgJ7RVcKsfpSJ4aIEEWydFu++TJH1M2lyWis5VTXig=","subject":"CN=WIPO CA - G4,OU=Class 2 Managed PKI Individual Subscriber CA,O=World Intellectual Property Organization,C=CH","subjectDN":"MIGOMQswCQYDVQQGEwJDSDExMC8GA1UEChMoV29ybGQgSW50ZWxsZWN0dWFsIFByb3BlcnR5IE9yZ2FuaXphdGlvbjE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExFTATBgNVBAMTDFdJUE8gQ0EgLSBHNA==","whitelist":false,"attachment":{"hash":"086054c0052cdacea72072357a2b79945d9bf92ef3447038cc5e5e68475271d3","size":2044,"filename":"PU8NkYLfLUTa_7ny2Z-c1CJ0H02QfjBsjXu9EWq22IM=.pem","location":"security-state-staging/intermediates/33189e7d-6c9b-4f44-bef2-771f215db497.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PU8NkYLfLUTa/7ny2Z+c1CJ0H02QfjBsjXu9EWq22IM=","crlite_enrolled":false,"id":"2d7e382f-d25c-4413-b71f-3ec5aeb49509","last_modified":1562024797121},{"schema":1562024794876,"derHash":"Hgo6uZMVdxcoHUKr+AHrZN7tUA5BaMpwbWpx2BA8c6I=","subject":"CN=DigiCert Grid Trust CA,OU=www.digicert.com,O=DigiCert Grid,C=US","subjectDN":"MGExCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCBHcmlkMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMR8wHQYDVQQDExZEaWdpQ2VydCBHcmlkIFRydXN0IENB","whitelist":false,"attachment":{"hash":"3be9651d72ef4f44fcb67274ba0d3e7ae2eb7c8388fcf0a3ab02a3a2c72077f8","size":2316,"filename":"TBKoZNHPiEWnnKpVqLc_CHX3Z3iNpZdilsVXHJhcqkw=.pem","location":"security-state-staging/intermediates/1ddc95cc-acc5-4a61-b546-b433d299fd22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TBKoZNHPiEWnnKpVqLc/CHX3Z3iNpZdilsVXHJhcqkw=","crlite_enrolled":false,"id":"a43ec252-2c43-4461-a2b2-56c2fe1b0e7a","last_modified":1562024795608},{"schema":1562024794135,"derHash":"phmVYVOcSoqwGesTaz/Q12kBddQa5/WKO/SKHwsTKCg=","subject":"CN=FujiSSL RSA Client Authentication and Secure Email CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MIGIMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTClNoaWJ1eWEta3UxFDASBgNVBAoTC05pamltbyBLLksuMT4wPAYDVQQDEzVGdWppU1NMIFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"eb739dda586a45fc7a126da56fa0e1975b84e84d1a11dc5cf2a1e059668b71cd","size":2154,"filename":"XTsWwydKIeLgLUHk_CjpouCdZpEZv977b3O3Y6fz7A8=.pem","location":"security-state-staging/intermediates/bf387768-b33b-4aac-a92d-f931ea2d2f89.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XTsWwydKIeLgLUHk/CjpouCdZpEZv977b3O3Y6fz7A8=","crlite_enrolled":false,"id":"1eb1cf61-0810-46cc-9db3-87bd5b0eda59","last_modified":1562024794868},{"schema":1562024793401,"derHash":"q/OAPNKTniaAPlIoCoH2fEbD4O51/Nux4w+wOjIaz60=","subject":"SERIALNUMBER=ZZZZZZA3,CN=Siemens Issuing CA EE Enc 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGeMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTMxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMScwJQYDVQQDDB5TaWVtZW5zIElzc3VpbmcgQ0EgRUUgRW5jIDIwMTY=","whitelist":false,"attachment":{"hash":"e179d01b41716c0c072162345534013646eeb1fc9debcf658c9fe6ecf951163f","size":2641,"filename":"27n7khZ5-Np87z6aLw4RQRXZ3DgzlUK97JppGYxBCL4=.pem","location":"security-state-staging/intermediates/0a84edea-9e19-41cc-b761-52eb6a135d6c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"27n7khZ5+Np87z6aLw4RQRXZ3DgzlUK97JppGYxBCL4=","crlite_enrolled":true,"id":"efb1c9d1-30cf-4343-bcb1-91ee6610e777","last_modified":1562024794128},{"schema":1562024792628,"derHash":"cD6goXPiBCNV8d/rEHkpLUHqaMBGydRcxg3FQQEE9Hg=","subject":"CN=SSLs.com RSA DV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gUlNBIERWIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"9ff134c8ecf90893574b07ad8b3c077f8d5360967fc1094e63da8fb49c97f7e3","size":2129,"filename":"rvbtHIVTfnQ4hhhu4JyOGPoRZ3c9W-uCcbjlRAfUPXM=.pem","location":"security-state-staging/intermediates/a97db1f4-38f2-4210-9c42-fd651e18de13.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rvbtHIVTfnQ4hhhu4JyOGPoRZ3c9W+uCcbjlRAfUPXM=","crlite_enrolled":false,"id":"a11d7ecc-7398-48bb-89de-0e90aa0466c9","last_modified":1562024793393},{"schema":1562024791880,"derHash":"alR0N7H1K3KnLMcwGTqHPKmz0D45krGj+uwQp4BU4qE=","subject":"CN=Fuji Xerox Xnet CA 2,O=Fuji Xerox,C=JP","subjectDN":"MEExCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR0wGwYDVQQDExRGdWppIFhlcm94IFhuZXQgQ0EgMg==","whitelist":false,"attachment":{"hash":"9217faaa39a466f5d9d9788fdda62aeff7af0b31e46484feab2f84c35486efa6","size":1471,"filename":"LnpLBgKouhAPdvkLl4dk97HUdhFGLO_43TBsKNajdA4=.pem","location":"security-state-staging/intermediates/f4af1e17-0334-407c-a8cb-77b3a44b5f11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LnpLBgKouhAPdvkLl4dk97HUdhFGLO/43TBsKNajdA4=","crlite_enrolled":false,"id":"010baff6-15c0-4fe2-915b-96e9c9e53168","last_modified":1562024792620},{"schema":1562024791135,"derHash":"Zd4yKh73r/7etzhxOMJgYIJbCMwn4Zkt2erIM3KXlXs=","subject":"CN=SpaceSSL CA,OU=SpaceSSL Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHIxCzAJBgNVBAYTAlBMMSIwIAYDVQQKDBlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMSkwJwYDVQQLDCBTcGFjZVNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEUMBIGA1UEAwwLU3BhY2VTU0wgQ0E=","whitelist":false,"attachment":{"hash":"52e6e18f68c49814eb88ea228460269803ebcae2f04a71366b605d06fd85ae21","size":1638,"filename":"AOXy6QeFRXr3Le2jy9VUHVc0TY6NofDQseFQcaDRlow=.pem","location":"security-state-staging/intermediates/189976ec-c00a-4ec0-bc47-3f11ee1374ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AOXy6QeFRXr3Le2jy9VUHVc0TY6NofDQseFQcaDRlow=","crlite_enrolled":true,"id":"a846caeb-4b0d-4bb1-af76-d203f6bd83ea","last_modified":1562024791871},{"schema":1562024789653,"derHash":"DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=","subject":"CN=Cybertrust Japan Extended Validation Server CA,O=Cybertrust Japan Co.\\, Ltd.,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjE3MDUGA1UEAxMuQ3liZXJ0cnVzdCBKYXBhbiBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"e3d590ab4b71fbd20183713733b3253b32ef24a73382153319f8916fc66d3c1d","size":1678,"filename":"VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8_yf2AOohCgqgk=.pem","location":"security-state-staging/intermediates/222e4d33-ee5a-4885-add5-c30b4495b281.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VfKdH3KeIRG8iIljlHEf2ck5OXG4Z8/yf2AOohCgqgk=","crlite_enrolled":true,"id":"92292d1f-471b-4db3-ba30-6f423a7d649b","last_modified":1562024790389},{"schema":1562024786680,"derHash":"/ikDnS1H0CkoTZqoz7He1yb/DiX955/oSpVAGHhktLc=","subject":"SERIALNUMBER=201819,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODE5","whitelist":false,"attachment":{"hash":"05b1a5a6497b489b6d6a517b7b39506cb13e79efc9a9ba91d6c7fc2fc2c20683","size":2333,"filename":"-K9Xx7VSSzN1D6LkHvOiAdN5OId_n4uHBErF19bWM-A=.pem","location":"security-state-staging/intermediates/635f8211-242f-4cc5-8ffa-a716fe7af988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+K9Xx7VSSzN1D6LkHvOiAdN5OId/n4uHBErF19bWM+A=","crlite_enrolled":false,"id":"90bc409e-b5d7-4431-bbe4-21feadabcedd","last_modified":1562024787417},{"schema":1562024785925,"derHash":"Xwo1uk+Epl9osW1KM/ZRfAl3CDk+qv0oVvuak0GHGfQ=","subject":"CN=SGTRUST EMAIL AND CLIENT CA,O=SGssl,C=KR","subjectDN":"MEMxCzAJBgNVBAYTAktSMQ4wDAYDVQQKEwVTR3NzbDEkMCIGA1UEAxMbU0dUUlVTVCBFTUFJTCBBTkQgQ0xJRU5UIENB","whitelist":false,"attachment":{"hash":"17a9b911f686f237aa390ea2ff06319ae420ccb51198aeed267a5518db5715c4","size":1723,"filename":"gQN5MDXBIRQe70cFfEaNKKTh3AELpmBrtzu-04X41Po=.pem","location":"security-state-staging/intermediates/4fecef25-4c06-47de-9524-159f4379ebf8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gQN5MDXBIRQe70cFfEaNKKTh3AELpmBrtzu+04X41Po=","crlite_enrolled":false,"id":"65f004f2-8ee7-4e50-a1d2-01f1ae7a9bd2","last_modified":1562024786673},{"schema":1562024783680,"derHash":"PKGOHtvmhg1wkU6aoNuOYeGT5+9UfNq4tN9UX0bexrs=","subject":"CN=BlackCert\\, Inc. ECC OV Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDTzEPMA0GA1UEBxMGRGVudmVyMRgwFgYDVQQKEw9CbGFja0NlcnQsIEluYy4xNzA1BgNVBAMTLkJsYWNrQ2VydCwgSW5jLiBFQ0MgT1YgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"1f0b0920e94a21420191c41211ce3bcffb04a7ce995f0af6bd0b824c3b294700","size":1313,"filename":"bQkT-mQD0009MLZyZZBcx4FuOI9_hOoj322Ms-tQWFo=.pem","location":"security-state-staging/intermediates/7feaca48-406a-4093-b833-11b132d33bdd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bQkT+mQD0009MLZyZZBcx4FuOI9/hOoj322Ms+tQWFo=","crlite_enrolled":false,"id":"9e10f424-cd96-43ca-bfe4-a236bf60a4c6","last_modified":1562024784419},{"schema":1562024782184,"derHash":"xRuDoN5JogGl++lHAywEcC+Mp8LQKt8otz1CyKzRw2I=","subject":"CN=DigiCert SHA2 High Assurance Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNTAzBgNVBAMTLERpZ2lDZXJ0IFNIQTIgSGlnaCBBc3N1cmFuY2UgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"54b858a92a75d1898919ae2dbf0249a5192fa1abe37b3e993d38ef789c3653cc","size":1902,"filename":"SOMlUK5lwhJe91sGwPNVv0zyq01iywv_f4ztkbkD4Rs=.pem","location":"security-state-staging/intermediates/5ba14d1f-2ebf-414a-a378-e6c4bae24fd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SOMlUK5lwhJe91sGwPNVv0zyq01iywv/f4ztkbkD4Rs=","crlite_enrolled":true,"id":"e3b58caf-2eb9-4b25-9732-0c4502a01f62","last_modified":1562024782921},{"schema":1562024775415,"derHash":"1Dn4jo8vgKMG+RDc3lSNcbv9mahfxwNO+2EON0lVCTI=","subject":"CN=Cloudflare RSA DV CA,O=Cloudflare\\, Inc.,L=San Francisco,ST=CA,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEZMBcGA1UEChMQQ2xvdWRmbGFyZSwgSW5jLjEdMBsGA1UEAxMUQ2xvdWRmbGFyZSBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"0937a5bef35a20366a9d1dce5f361e3ec0fce9ea799d8c4f053763a0f051e116","size":1634,"filename":"HyqqOGaeH9zg7Bg12wtuQNNUB5DZwfj2c0W_oWqDLI0=.pem","location":"security-state-staging/intermediates/c91a2caf-3079-4edb-9866-0831343c6e4a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HyqqOGaeH9zg7Bg12wtuQNNUB5DZwfj2c0W/oWqDLI0=","crlite_enrolled":false,"id":"e4608891-f782-40aa-8ec9-06ab2e2cf7b0","last_modified":1562024776157},{"schema":1562024774677,"derHash":"U39guIoxdvSyFWdH23H34sEGaEUm2fp/UmtukUQXi1U=","subject":"CN=McAfee Code Signing CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEhMB8GA1UEAxMYTWNBZmVlIENvZGUgU2lnbmluZyBDQSAy","whitelist":false,"attachment":{"hash":"ae65196a88f85c709ece2d8f3936cb8d958a94c0968600b289b616617e38e411","size":2097,"filename":"UOb_aKj9K46D2KVYS2zC_0EO6gN1gKFCU77O9fiUQAI=.pem","location":"security-state-staging/intermediates/8811b1a8-349c-4b4e-8801-f5594cc329e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UOb/aKj9K46D2KVYS2zC/0EO6gN1gKFCU77O9fiUQAI=","crlite_enrolled":false,"id":"67bc7ab5-6413-4e91-b1c4-078571161042","last_modified":1562024775407},{"schema":1562024773191,"derHash":"n048Qvr+2jz4jAXMS0rwwK8wZBXDDT0e6+3r99F3qYI=","subject":"CN=Hostpoint DV SSL CA - G1,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGYxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSEwHwYDVQQDExhIb3N0cG9pbnQgRFYgU1NMIENBIC0gRzE=","whitelist":false,"attachment":{"hash":"31c545df0c9287df1891ee7b1dfb383d83b9b321cd47a06cd0839a7276526477","size":1886,"filename":"KgLIfe7B9GImTO2eqwyHoxC8kpEMc7pC4vGNYZbchyA=.pem","location":"security-state-staging/intermediates/8daa3e79-7c44-475e-b300-0f7bce72bc93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KgLIfe7B9GImTO2eqwyHoxC8kpEMc7pC4vGNYZbchyA=","crlite_enrolled":false,"id":"ebd61b76-f146-485d-8454-4f96842fc39f","last_modified":1562024773933},{"schema":1562024772426,"derHash":"O4u3vuWk6yHqjZJ58/RWyvO4nFbW3Uxpo/vX+eTtnNM=","subject":"CN=SSLs.com ECC EV Secure Server CA,OU=Controlled by Sectigo exclusively for SSLs.com,O=SSLs.com (Namecheap\\, Inc.),L=Phoenix,ST=Arizona,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEQMA4GA1UEBxMHUGhvZW5peDEjMCEGA1UEChMaU1NMcy5jb20gKE5hbWVjaGVhcCwgSW5jLikxNzA1BgNVBAsTLkNvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgU1NMcy5jb20xKTAnBgNVBAMTIFNTTHMuY29tIEVDQyBFViBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"153e25238ab589a8e93ff09e8b7ffa6150358fa68c68b93cc94f92faa5455a28","size":1423,"filename":"Ym-0KV9EAV6PC8waJvh5eI-QjQ_3STgXc-UH0obWlKM=.pem","location":"security-state-staging/intermediates/1dbfb594-d15e-4c6d-8944-fa5c1ca6d499.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ym+0KV9EAV6PC8waJvh5eI+QjQ/3STgXc+UH0obWlKM=","crlite_enrolled":false,"id":"e298cb45-294a-447d-a70e-9e33908895ee","last_modified":1562024773182},{"schema":1562024771685,"derHash":"1Ia/o/ANFl7iz2Jw/afQCBfljNot9Polbg8usSLPjwI=","subject":"CN=TeleSec PKS CA 8,OU=T-Systems Trust Center,O=T-Systems International GmbH,C=DE","subjectDN":"MHAxCzAJBgNVBAYTAkRFMSUwIwYDVQQKExxULVN5c3RlbXMgSW50ZXJuYXRpb25hbCBHbWJIMR8wHQYDVQQLExZULVN5c3RlbXMgVHJ1c3QgQ2VudGVyMRkwFwYDVQQDExBUZWxlU2VjIFBLUyBDQSA4","whitelist":false,"attachment":{"hash":"6429eb3f7af5f32d22260a3d57e029842bb6095362c3ccacc7482be3a501efcc","size":1597,"filename":"cQ5-P7xFNQKPQ_CQI4rTW9uBJQm8ZTcsHGP7IsAVuSM=.pem","location":"security-state-staging/intermediates/76092767-ec1d-46b8-804e-59e91f2d0727.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cQ5+P7xFNQKPQ/CQI4rTW9uBJQm8ZTcsHGP7IsAVuSM=","crlite_enrolled":false,"id":"8208c8e6-ee6a-4515-bd16-3d2ff082836a","last_modified":1562024772418},{"schema":1562024770934,"derHash":"UNPXH8DNfjatrjIiH+++jMKbJna6MmwJuPobJNvnVRQ=","subject":"CN=Plex Devices High Assurance CA2,O=Plex\\, Inc.,C=US","subjectDN":"MEwxCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpQbGV4LCBJbmMuMSgwJgYDVQQDEx9QbGV4IERldmljZXMgSGlnaCBBc3N1cmFuY2UgQ0Ey","whitelist":false,"attachment":{"hash":"67f35d42ba7361bbc47c1f3a29680a229ed60061b9fa502c40e4669b0794e8aa","size":1699,"filename":"ymL44ll2Q9SIPAQZkomkZ5uFqCHuOYoXpsbrXWfyZkg=.pem","location":"security-state-staging/intermediates/17ca09ba-dca0-4d29-ba41-22b2b69e084a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ymL44ll2Q9SIPAQZkomkZ5uFqCHuOYoXpsbrXWfyZkg=","crlite_enrolled":false,"id":"2a05f09e-4930-43ff-891b-351f3751cce6","last_modified":1562024771677},{"schema":1562024769411,"derHash":"6mljaWdQVkoiiz64jg/UMExdonp6+S0dQZk1elAHgxU=","subject":"CN=WoTrus EV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIEVWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"fc57e3fad962bd4b00feeaae47893e01b5b42af32dadb1d3e0e55cad0d68a007","size":1691,"filename":"bfm30K2ufQC3gQINxl7OwREoFSQEJrK4ecMD3jy_Qlc=.pem","location":"security-state-staging/intermediates/744615e6-3b14-49f9-9fef-3d7691a5c6d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bfm30K2ufQC3gQINxl7OwREoFSQEJrK4ecMD3jy/Qlc=","crlite_enrolled":true,"id":"9cb658c6-3e52-4a94-b178-1d2ab7a03ad7","last_modified":1562024770176},{"schema":1562024768666,"derHash":"eErKEGO+RwCzpi9Fwvk7fu+L8jD7hpYQ6GT8Szoj0J8=","subject":"CN=GeoTrust DV SSL SHA256 CA,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZR2VvVHJ1c3QgRFYgU1NMIFNIQTI1NiBDQQ==","whitelist":false,"attachment":{"hash":"336b710bd635c00f02cb1abb4dfdd7642880004f653cb1e6b7aaa8dc272df643","size":1735,"filename":"jP-_jyFvpl2RHZrfgoObTO1xpirwu4KeuFSYhdPgDno=.pem","location":"security-state-staging/intermediates/c7c73925-4bfb-4972-94cf-7df88442e3bb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jP+/jyFvpl2RHZrfgoObTO1xpirwu4KeuFSYhdPgDno=","crlite_enrolled":true,"id":"ace5b1a2-9c9e-48ab-8146-03a2d8f88d8f","last_modified":1562024769403},{"schema":1562024767927,"derHash":"UnpgsCq/OkpVGcT2L7vVYOMDQHTu7IuHmaqTaGk/420=","subject":"CN=SSL.com RSA SSL subCA,O=SSL Corporation,L=Houston,ST=Texas,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMR4wHAYDVQQDDBVTU0wuY29tIFJTQSBTU0wgc3ViQ0E=","whitelist":false,"attachment":{"hash":"19883ec948ba65cabab87774d50633120945ef053a62f8362d2e09b43597fe1a","size":2292,"filename":"7LcB5Z8ATVz4rcQtIY5xJir8_-F3e_HPi8IDdCnjCaE=.pem","location":"security-state-staging/intermediates/23914bfd-6f12-4a9d-8c1a-a2c9e445a1bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7LcB5Z8ATVz4rcQtIY5xJir8/+F3e/HPi8IDdCnjCaE=","crlite_enrolled":true,"id":"b976a3a6-3c96-4aca-9c5f-fc654e3c4f6c","last_modified":1562024768658},{"schema":1562024767188,"derHash":"cx09nPqgYUh6HXFEWkL2ffCvyipsLS+Y/3s84RKx9Wg=","subject":"CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US","subjectDN":"MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQDExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMw==","whitelist":false,"attachment":{"hash":"657ef5d80546aa62cbfc4df47ce7b6d13a55f1a365959985c45ff6cd95bbba49","size":1983,"filename":"YLh1dUR9y6Kja30RrAn7JKnbQG_uEtLMkBgFF2Fuihg=.pem","location":"security-state-staging/intermediates/56cc56ae-6c42-4e45-a1ee-4dff7ceb2ed4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YLh1dUR9y6Kja30RrAn7JKnbQG/uEtLMkBgFF2Fuihg=","crlite_enrolled":false,"id":"dd797093-8a63-4153-8bb1-7f1ad9eb78d4","last_modified":1562024767919},{"schema":1562024764929,"derHash":"wwmtIoGSEzUs3Jlx0brY2/2MGlwnflYHm9xLFfPC+IY=","subject":"SERIALNUMBER=201420,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE0MjA=","whitelist":false,"attachment":{"hash":"82baf28c8e8f2f5eed9bfa651ab576ae26debfdbe468a8da9e531007866fd3f4","size":2093,"filename":"BXPYBHLDcjLdWqfbeS-3Wn3FyXMcPOt4MLp_WZ3dNRE=.pem","location":"security-state-staging/intermediates/c37fe368-288e-403b-92f1-5f67e7fb18b0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BXPYBHLDcjLdWqfbeS+3Wn3FyXMcPOt4MLp/WZ3dNRE=","crlite_enrolled":false,"id":"f5badd92-19cd-42f3-8fd9-bca16a2010de","last_modified":1562024765675},{"schema":1562024764185,"derHash":"OwstKZr3dNbDMrK/q7RfRNhmQyuVUuoJTVKbbtElBIs=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma Codesign II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHLMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEmMCQGA1UEAwwdQ2FtZXJmaXJtYSBDb2Rlc2lnbiBJSSAtIDIwMTQ=","whitelist":false,"attachment":{"hash":"f1869c6545bc1c6234532651e68563d726b9b578290681c53ff1d9eb8955d278","size":3011,"filename":"8es0CNrSdbjFtrocXsDOpgrVyEAq0-J-uvoksmifuDk=.pem","location":"security-state-staging/intermediates/a6d8c412-ac3b-422e-8b40-1476c1f2271d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8es0CNrSdbjFtrocXsDOpgrVyEAq0+J+uvoksmifuDk=","crlite_enrolled":false,"id":"de0d0798-3da0-4c1c-b5e2-d1f8d2450c88","last_modified":1562024764922},{"schema":1562024763424,"derHash":"f6T/aOwEqZ11KNUIX5SQf00d0cU4G6zcgy7VyWAhRnY=","subject":"CN=Sectigo RSA Domain Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGPMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxNzA1BgNVBAMTLlNlY3RpZ28gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"c5bc13ba28e3fad9bb69c25f294e5bebe315acc4947330a5cd0d2ce7928e2994","size":2166,"filename":"4a6cPehI7OG6cuDZka5NDZ7FR8a60d3auda-sKfg4Ng=.pem","location":"security-state-staging/intermediates/c2e0bcef-51d3-4306-93e1-9a40a8e77b7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4a6cPehI7OG6cuDZka5NDZ7FR8a60d3auda+sKfg4Ng=","crlite_enrolled":false,"id":"6598d3bd-466d-49c7-b158-9ec07c6d53ac","last_modified":1562024764178},{"schema":1562024762680,"derHash":"k63XyEhr8VpBaUnhY3vCGaNFXjdODq+YAVMDWrF/PsU=","subject":"CN=HARICA Qualified Legal Entities SubCA R1,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGXMQswCQYDVQQGEwJHUjEPMA0GA1UEBxMGQXRoZW5zMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTExMC8GA1UEAxMoSEFSSUNBIFF1YWxpZmllZCBMZWdhbCBFbnRpdGllcyBTdWJDQSBSMQ==","whitelist":false,"attachment":{"hash":"bc6cc8a34a080067df5a211a1ee0cc3ef6a1dcf5be3086883e888f22e2186b93","size":2434,"filename":"3NY0njQdFfwxsQu3sKMmdqGNJfWSRtz3x_GJn2JrJSM=.pem","location":"security-state-staging/intermediates/0c53d623-ca04-458c-a73c-43feafde8b16.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3NY0njQdFfwxsQu3sKMmdqGNJfWSRtz3x/GJn2JrJSM=","crlite_enrolled":false,"id":"892e29c1-f423-4b27-9ee7-bc21c7e30e3d","last_modified":1562024763416},{"schema":1562024761185,"derHash":"XEvFlykauccCP7ZEX9YDgaZcYN3UBPEk5foUP+mLBfM=","subject":"CN=Trustwave S/MIME SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGkMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjEsMCoGA1UEAxMjVHJ1c3R3YXZlIFMvTUlNRSBTSEEyNTYgQ0EsIExldmVsIDExHzAdBgkqhkiG9w0BCQEWEGNhQHRydXN0d2F2ZS5jb20=","whitelist":false,"attachment":{"hash":"ed83656947f250a6c5ddc676c7ae6695bbf83f8d233c9e01dcb0ae8574c80def","size":1833,"filename":"0ziypZGtbQSlJkd3bO6sa64Aaev_F9DMXoWrdIPMuic=.pem","location":"security-state-staging/intermediates/322a4690-6387-44f2-8714-f8ecfa2909cb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0ziypZGtbQSlJkd3bO6sa64Aaev/F9DMXoWrdIPMuic=","crlite_enrolled":true,"id":"e02c5baa-af93-44fd-a07d-a4dc0f77962f","last_modified":1562024761923},{"schema":1562024760432,"derHash":"mZNeIEJFNewBbzN7K+aPE0neZszkylqzZ/jzc4IVuDM=","subject":"CN=DigiCert Secure Site ECC CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJjAkBgNVBAMTHURpZ2lDZXJ0IFNlY3VyZSBTaXRlIEVDQyBDQS0x","whitelist":false,"attachment":{"hash":"c1873c9110b38d6483be9516efcc79cdd751a74f8f10ff176ee411a27f5e6802","size":1374,"filename":"Z5_2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=.pem","location":"security-state-staging/intermediates/63cecafd-26c5-4442-a764-6a7ef05785ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Z5/2RtWXrCvvJsLXdZ4t9HEaVg21e9AhczULn9tmg4M=","crlite_enrolled":true,"id":"38a4e0fc-47a6-4351-8c6e-d512e40ea47b","last_modified":1562024761178},{"schema":1562024759684,"derHash":"l4vPOcPDqs7+EEj6A2AoPcLr+lFQAkxeN4UU0+decpU=","subject":"CN=Ecclesiastical Academy of Vella Client RSA SubCA R1,O=University Ecclesiastical Academy of Vella of Ioannina,L=Ioannina,C=GR","subjectDN":"MIGfMQswCQYDVQQGEwJHUjERMA8GA1UEBwwISW9hbm5pbmExPzA9BgNVBAoMNlVuaXZlcnNpdHkgRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBvZiBJb2FubmluYTE8MDoGA1UEAwwzRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"1ea505bcb0b55faef63c1cc254b9f6612d99491beb1b6b0958f3ee1c4f3c1675","size":2463,"filename":"BMcD2w-cJB838WspMeM-A5JCa6C9qk45hCCtD2798To=.pem","location":"security-state-staging/intermediates/649a06eb-0758-4347-a0b6-aee78ce4e55a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BMcD2w+cJB838WspMeM+A5JCa6C9qk45hCCtD2798To=","crlite_enrolled":false,"id":"9598a752-8f67-4ba2-b7dc-4c47cdf017e6","last_modified":1562024760423},{"schema":1562024758184,"derHash":"rtqeEp5fuhJTynkRau2ZDd+qqyS9SKHMvZmn4Dyd25Y=","subject":"CN=WISeKey CertifyID Standard G1 CA,OU=Copyright (c) 2005 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGKMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKTAnBgNVBAMTIFdJU2VLZXkgQ2VydGlmeUlEIFN0YW5kYXJkIEcxIENB","whitelist":false,"attachment":{"hash":"99f53a0f0a04102d0dc798862f7cddb908d4b19a382c02d2a501e95f73f888a4","size":1796,"filename":"V-iy-tAeMX9lDedsiiJL_8dZxPz-eL1s19Q5oU1d1Vg=.pem","location":"security-state-staging/intermediates/6968a7e4-49ad-4bc8-966e-16c6348b8280.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"V+iy+tAeMX9lDedsiiJL/8dZxPz+eL1s19Q5oU1d1Vg=","crlite_enrolled":true,"id":"7af2b755-f8c2-4221-b4d9-98a4a40d8f82","last_modified":1562024758924},{"schema":1562024757412,"derHash":"E++zmi9mVOjGe9BPTG1MkM1sq1CRvO3HN4f2t309P+c=","subject":"CN=Entrust Certification Authority - L1K,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFL","whitelist":false,"attachment":{"hash":"2317985189faf07f31bc3c665a12f23068191e798992ad37652b74c99ac9bb73","size":1813,"filename":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=.pem","location":"security-state-staging/intermediates/18eafa54-0261-4c50-a26c-e36ab1883d27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"980Ionqp3wkYtN9SZVgMzuWQzJta1nfxNPwTem1X0uc=","crlite_enrolled":true,"id":"760c1e85-d14f-45de-9089-5346d069bb23","last_modified":1562024758176},{"schema":1562024755893,"derHash":"fYmukYslr9+RA27uXBXljGAPQiZoZqjeAccdvGNcocA=","subject":"CN=AlwaysOnSSL CA - G2,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGIxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTQWx3YXlzT25TU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"5a3569b6f9543f3155c9ebc71c27e7c74e57fd312e089d9ad6781dcd5667723d","size":1646,"filename":"ssE7QqKUKKZNwPdkucGxKcejYYKjpfRsYXOHhO9vDYI=.pem","location":"security-state-staging/intermediates/97de2daa-b660-43e4-9979-80e4f6a0f540.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ssE7QqKUKKZNwPdkucGxKcejYYKjpfRsYXOHhO9vDYI=","crlite_enrolled":false,"id":"d788b871-e71a-4146-9d20-3e2d8c9eecac","last_modified":1562024756665},{"schema":1562024754381,"derHash":"XMXixoF272PUrFuyRW0vzBMohPpzVWgy+TJ1HXZdpy8=","subject":"SERIALNUMBER=201727,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI3","whitelist":false,"attachment":{"hash":"5a7146a77461838f5a1843035d4a48aa4c82961a25f1da94dc025a7f4abcdd8b","size":2402,"filename":"bB9c6AN2JnHasyK5D2eIB9oxCfM50LTPnnl3kB89YXE=.pem","location":"security-state-staging/intermediates/22cae430-9901-4519-aec3-bbc56ed82b06.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bB9c6AN2JnHasyK5D2eIB9oxCfM50LTPnnl3kB89YXE=","crlite_enrolled":false,"id":"0b86594c-f5d4-4575-b6f7-b68483bebf4b","last_modified":1562024755141},{"schema":1562024751078,"derHash":"CYa1occxTvsE+2SLnitXz0hC/R1DRdKOUglMkKn+y/4=","subject":"CN=NAESB Issuing CA - SHA384 - G3,O=GMO GlobalSign Inc.,L=Portsmouth,ST=New Hampshire,C=US","subjectDN":"MIGBMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTmV3IEhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0aDEcMBoGA1UEChMTR01PIEdsb2JhbFNpZ24gSW5jLjEnMCUGA1UEAxMeTkFFU0IgSXNzdWluZyBDQSAtIFNIQTM4NCAtIEcz","whitelist":false,"attachment":{"hash":"d49a532b85e082e491e221c8f33b16fe8422a94bea4c35c9948650604f3ca837","size":2073,"filename":"LV_Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=.pem","location":"security-state-staging/intermediates/d212f5ca-0adf-4e01-8ef0-908775f6b878.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LV/Lp60GpBfNPlUINSof9qendyj5Iph8haNKt4Ks1OU=","crlite_enrolled":false,"id":"7b2c039b-5a89-4f22-9b42-e0bd5d57c6b3","last_modified":1562024752817},{"schema":1562024749921,"derHash":"Lx4jkI1LNfslICo2QLpXBUvq3mextgcP+Jb+AQ9UYTs=","subject":"CN=FUJIFILM Fnet CA - S,O=FUJIFILM,C=JP","subjectDN":"MD8xCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEdMBsGA1UEAxMURlVKSUZJTE0gRm5ldCBDQSAtIFM=","whitelist":false,"attachment":{"hash":"1d23dc7789b794fe7d42ddcfba44e339a63d08faa95b81febad9709dab455441","size":1589,"filename":"HklRNHbqiczty-mu_7-EsslYyqJV5eL1EXnD11xrky0=.pem","location":"security-state-staging/intermediates/1eed61f6-1e57-4d9d-adb4-743c366a80ed.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HklRNHbqiczty+mu/7+EsslYyqJV5eL1EXnD11xrky0=","crlite_enrolled":false,"id":"4d214f92-f862-44fa-a108-b0165201355b","last_modified":1562024751070},{"schema":1562024749130,"derHash":"efH1q2l96/GV9bfaZflTmWgu2uuAEVudQqauXi+piAI=","subject":"CN=TrustAsia TLS RSA CA,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHIxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEdMBsGA1UEAxMUVHJ1c3RBc2lhIFRMUyBSU0EgQ0E=","whitelist":false,"attachment":{"hash":"9c4047b27b1b439594f0eb24b088e1d1ed2f32b8eaf4ad49dd4d2745b8add3f5","size":1683,"filename":"jzqM6_58ozsPRvxUzg0hzjM-GcfwhTbU_G0TCDvL7hU=.pem","location":"security-state-staging/intermediates/2c6b0e8d-5db7-43f4-ac20-43f2a3577b50.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jzqM6/58ozsPRvxUzg0hzjM+GcfwhTbU/G0TCDvL7hU=","crlite_enrolled":false,"id":"985da675-4aa3-4fc4-a366-147d9cc6b52b","last_modified":1562024749914},{"schema":1562024743075,"derHash":"48UkTRX44LA09QCQO32hHFfBZWF1uGYIx/zcVh0IG/Y=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - CFEA,OU=Certificados de Firma Electronica Avanzada,O=Firmaprofesional S.A.,C=ES","subjectDN":"MIGbMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMTMwMQYDVQQLDCpDZXJ0aWZpY2Fkb3MgZGUgRmlybWEgRWxlY3Ryb25pY2EgQXZhbnphZGExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAwwaQUMgRmlybWFwcm9mZXNpb25hbCAtIENGRUE=","whitelist":false,"attachment":{"hash":"388c7390fd655de86c6807905f53164ea046c0a2c453eea6afb6887f81eba392","size":2337,"filename":"KO9CWWzDLCHF2tkv_s3T4tkDZ1JcNCoaADD2wa1h9Es=.pem","location":"security-state-staging/intermediates/c1de4d24-123b-4648-9d5d-4b7609ce59a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KO9CWWzDLCHF2tkv/s3T4tkDZ1JcNCoaADD2wa1h9Es=","crlite_enrolled":false,"id":"17c9e6f6-0f5d-41db-af92-89fb0e502421","last_modified":1562024743816},{"schema":1562024742327,"derHash":"EjRl7sQJL4z3q/6SuMcBrAnqeaSY8dP2oCwXFPOahCM=","subject":"CN=DKHS Device CA,OU=GeoRoot Certification Authority,O=NTT DOCOMO\\, INC.,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBOVFQgRE9DT01PLCBJTkMuMSgwJgYDVQQLEx9HZW9Sb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRcwFQYDVQQDEw5ES0hTIERldmljZSBDQQ==","whitelist":false,"attachment":{"hash":"0dad32db64d125e5bd490ac9ead766806e1830e2dd3231d12e06165af78bc99f","size":1435,"filename":"2csLg17pewpYWpMoGlL9tpqZNfK0Xiyb8-ZdoxQJDfw=.pem","location":"security-state-staging/intermediates/215e95e7-dbc9-41ad-beca-82dc6583e809.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2csLg17pewpYWpMoGlL9tpqZNfK0Xiyb8+ZdoxQJDfw=","crlite_enrolled":false,"id":"1d5ac6e1-d38a-4677-b3a5-9433b4cd1a5a","last_modified":1562024743067},{"schema":1562024741573,"derHash":"fwEpH2i6JJHUuT3A+YPz27ahQ8MAeqs+ShIEPKtdOe0=","subject":"SERIALNUMBER=201806,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA2","whitelist":false,"attachment":{"hash":"d8c1a6a0b861a09c8788da6425106999f114b15b2b5e416683ce65f3f97232d2","size":2333,"filename":"HUkqo7ks9SSqrwVtx5-EbZ5_X2pu1urVxQlJdSbTQ6A=.pem","location":"security-state-staging/intermediates/eca3931d-d300-4dec-a61c-e938b033c589.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HUkqo7ks9SSqrwVtx5+EbZ5/X2pu1urVxQlJdSbTQ6A=","crlite_enrolled":false,"id":"d6563e6e-19de-4000-b6b1-f6915fc1fa4e","last_modified":1562024742319},{"schema":1562024740056,"derHash":"RgOPYyYijNtWYZxSJmYT2gTIykmeDQOw7c/8EQ1c/HA=","subject":"CN=GlobalSign PersonalSign 2 ECC CA SHA 384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIEVDQyBDQSBTSEEgMzg0IC0gRzQ=","whitelist":false,"attachment":{"hash":"c7d733918214f65618244169320b852165e4cf03e0cdcbb3c09a1516a67e706c","size":1317,"filename":"lna5HZAGsocA3Pju5zM06F95XywtOa-LxU5QUgC3EX8=.pem","location":"security-state-staging/intermediates/b72356d7-b40c-46a5-a245-76ee8e592a3a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lna5HZAGsocA3Pju5zM06F95XywtOa+LxU5QUgC3EX8=","crlite_enrolled":false,"id":"ab4c9864-87dc-43a9-b4a5-f4d223bebbb7","last_modified":1562024740795},{"schema":1562024739285,"derHash":"/QKa3j96gKmNb//JQpBGWF7x2MuBk6F/YhQxfQZS18M=","subject":"CN=COMODO/HP Secure Email CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSIwIAYDVQQDExlDT01PRE8vSFAgU2VjdXJlIEVtYWlsIENB","whitelist":false,"attachment":{"hash":"adb2966a8c1fc1a877edbb79b2d43109f804829872e34bd8667f85ba432153e5","size":1975,"filename":"VQkNSqdqPoVan53-i1N5YrjNCMnJRtvNFB7icXr9un8=.pem","location":"security-state-staging/intermediates/c3470c12-1607-4586-9888-c399a9291d93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VQkNSqdqPoVan53+i1N5YrjNCMnJRtvNFB7icXr9un8=","crlite_enrolled":false,"id":"851cd0f4-450c-474d-8fd8-6090b0b6f5f4","last_modified":1562024740048},{"schema":1562024737001,"derHash":"lylXMEAxI07Rdnn9y5dVbWFz1fK/Dm5m1hJoDKbndoU=","subject":"CN=UZI-register Medewerker niet op naam CA G3,O=CIBG,C=NL","subjectDN":"MGoxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEzMDEGA1UEAwwqVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgbmlldCBvcCBuYWFtIENBIEcz","whitelist":false,"attachment":{"hash":"a6ad25c671822cfc5a55526a91ef47c754a74a1c8a12fd7b454e85652c742c79","size":2645,"filename":"io70m-V_59D3apVL30ZLD4BQjGAhNUmM2cLS-be8t_s=.pem","location":"security-state-staging/intermediates/c7d2ec98-db00-4406-89b7-d86ce3937af3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"io70m+V/59D3apVL30ZLD4BQjGAhNUmM2cLS+be8t/s=","crlite_enrolled":false,"id":"74733176-ea07-49c5-b60a-dbd7c1256529","last_modified":1562024737740},{"schema":1562024733253,"derHash":"j6YC//WQ31g6NtUJwmX2w+qMNKnVbP+GKF+/6ZNr/FU=","subject":"CN=JCAN Sub Root CA0,OU=JCAN Sub Root CA0,O=JIPDEC,C=JP","subjectDN":"MFYxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxGjAYBgNVBAsTEUpDQU4gU3ViIFJvb3QgQ0EwMRowGAYDVQQDExFKQ0FOIFN1YiBSb290IENBMA==","whitelist":false,"attachment":{"hash":"871cbff3d95fe676c0cd3b4745350c714edd6aadf6d40bd13bf176dce9ea6e41","size":1382,"filename":"I02P_H74AjyBi_GfR4lBhtey51ZDKA2W-fOZZSid4V4=.pem","location":"security-state-staging/intermediates/7b2549ac-1575-477f-9793-1ddb62c1fd9f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I02P/H74AjyBi/GfR4lBhtey51ZDKA2W+fOZZSid4V4=","crlite_enrolled":true,"id":"496c9bfb-8161-4544-af96-3b6e9fdff991","last_modified":1562024733996},{"schema":1562024730949,"derHash":"Y7BwFldXT8YPNIx4UFj4MKft0MhjxysSkPjUfV2Sh/s=","subject":"SERIALNUMBER=201803,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDM=","whitelist":false,"attachment":{"hash":"152a682a8ba56d789b2a9e4fca605dec1b7b9981f653fa67f030bcf66f10a6ad","size":2337,"filename":"K4GLd4lfZhixwmB0xbzzoe824xrytO-tH5fMEZ6ifsM=.pem","location":"security-state-staging/intermediates/9d8577c4-554c-403a-ac20-21abaafba3d0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"K4GLd4lfZhixwmB0xbzzoe824xrytO+tH5fMEZ6ifsM=","crlite_enrolled":false,"id":"77846c07-4d7d-4170-ba9e-bc880bed629a","last_modified":1562024731705},{"schema":1562024729465,"derHash":"2Haggfs4J7oipAh99nUSb/ipaquQNkvGH2LOjpUHqpM=","subject":"CN=Intermediate Certificate DV SSL CA - G2,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEhMB8GA1UEChMYSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEwMC4GA1UEAxMnSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIERWIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"82dcd057921f6bd85130996e035be697fc268a9a31d1830d5ee055f355b2dee8","size":1577,"filename":"pJ9PrX4U-hWFvZYgO5Qo0PX4C-dnEo-R9p0ek-2ssDE=.pem","location":"security-state-staging/intermediates/bbbdb8ec-d55b-42f0-a90b-e0f5e445ce73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pJ9PrX4U+hWFvZYgO5Qo0PX4C+dnEo+R9p0ek+2ssDE=","crlite_enrolled":false,"id":"eca16d96-e44c-48e8-b1a7-205586e51810","last_modified":1562024730202},{"schema":1562024728714,"derHash":"DrvfFG5j9w+qWSfujlNG6clsXw2b3TISsE7WaHF5h00=","subject":"CN=AC Firmaprofesional - CA1,OU=Consulte http://www.firmaprofesional.com+OU=Jerarquia de Certificacion Firmaprofesional,O=Firmaprofesional S.A. NIF A-62634068,L=C/ Muntaner 244 Barcelona,C=ES","subjectDN":"MIIBFjELMAkGA1UEBhMCRVMxJzAlBgkqhkiG9w0BCQEWGGNhMUBmaXJtYXByb2Zlc2lvbmFsLmNvbTEiMCAGA1UEBxMZQy8gTXVudGFuZXIgMjQ0IEJhcmNlbG9uYTExMC8GA1UECxMoQ29uc3VsdGUgaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTE0MDIGA1UECxMrSmVyYXJxdWlhIGRlIENlcnRpZmljYWNpb24gRmlybWFwcm9mZXNpb25hbDEtMCsGA1UEChMkRmlybWFwcm9mZXNpb25hbCBTLkEuIE5JRiBBLTYyNjM0MDY4MSIwIAYDVQQDExlBQyBGaXJtYXByb2Zlc2lvbmFsIC0gQ0Ex","whitelist":false,"attachment":{"hash":"bbdd4921a8930b33ba74748b849b85b781995c1df4ff5eb07b3e4a285a958904","size":2093,"filename":"B_ap-qAli0QgK_GmwkqkWS5Ta20el3pYN4MTgORZMjo=.pem","location":"security-state-staging/intermediates/e4d22c71-7375-4c8e-a206-47116103869e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"B/ap+qAli0QgK/GmwkqkWS5Ta20el3pYN4MTgORZMjo=","crlite_enrolled":true,"id":"dcfb6515-9873-4150-b71a-c2af481fddfe","last_modified":1562024729458},{"schema":1562024727955,"derHash":"BsJ0YcBBfVE84PY0+rWt0wyI7w4lyE/eDkISW4jKBHU=","subject":"CN=COMODO ECC Extended Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIEVDQyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"f0ed2d7d6e60382f01a548b254343b7f5848f74af3472fd2ceae1c155e23ddb0","size":1321,"filename":"YH3gQW7-dkqR106QZabQ1Aj-6wtLuy70aAZpWreNcBc=.pem","location":"security-state-staging/intermediates/15b589e4-c214-4d65-96a6-5424c2514a86.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YH3gQW7+dkqR106QZabQ1Aj+6wtLuy70aAZpWreNcBc=","crlite_enrolled":true,"id":"acf6d715-9a75-4c95-8c4d-840c47d4fdfd","last_modified":1562024728706},{"schema":1562024724215,"derHash":"AzAobfNhLA6Wjc1RinoxbV4HkNHKMkuQaw7wF8C+Pqc=","subject":"CN=WoSign DV SSL CA,O=WoSign CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29TaWduIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"a75ee51db3cb9c7a4b54e1099fdadd77ab4124acdb08f7ba375a7b614929984f","size":1691,"filename":"G_V-4AYI9XAkNjdk4SZqLrWkylfZbgPG1S4cNnAU1F4=.pem","location":"security-state-staging/intermediates/d43405c6-d4c4-41e3-baac-5b53fab6891e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G/V+4AYI9XAkNjdk4SZqLrWkylfZbgPG1S4cNnAU1F4=","crlite_enrolled":true,"id":"24d073eb-1380-4a6f-b7e1-f8821cd871c7","last_modified":1562024724959},{"schema":1562024722725,"derHash":"Ln5luxoBPa8L32k4UC5D44IX/gDXbKL5n3qp4pj0hTQ=","subject":"CN=STRATO SSL,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFUxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRMwEQYDVQQDEwpTVFJBVE8gU1NM","whitelist":false,"attachment":{"hash":"cb6ed07ea2573518382e2f2f838842a96f379ada0bbc5db15e4288b7b8384a9f","size":1532,"filename":"_LT0CMe5E7VgQyKeEQ6GlQp8nKPL1MNFw-rtCUA-0ak=.pem","location":"security-state-staging/intermediates/511003bd-4380-40cc-ac6c-e0ea641c6692.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/LT0CMe5E7VgQyKeEQ6GlQp8nKPL1MNFw+rtCUA+0ak=","crlite_enrolled":false,"id":"ad34bc25-64e6-458b-baf2-26022a492da8","last_modified":1562024723456},{"schema":1562024721984,"derHash":"pXbClIH1oqyx30dQBimmD5b2rKMk6Hj/3Pq9heVkmu8=","subject":"CN=The Koble Group CA,OU=Orion Health Direct Secure Messaging,O=The Koble Group\\, LLC,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRUaGUgS29ibGUgR3JvdXAsIExMQzEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMRswGQYDVQQDExJUaGUgS29ibGUgR3JvdXAgQ0E=","whitelist":false,"attachment":{"hash":"26d2fe9de89376ac8e1c6629f7c329bd897418bfef5bfd6e1f96183eb3015d65","size":2276,"filename":"-bxu-yaG1XG4Y7p1WLTMN9VfkKOEpBn_Bsu7tJsi2U4=.pem","location":"security-state-staging/intermediates/60227b91-2842-47e3-8043-43cd17252c0b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+bxu+yaG1XG4Y7p1WLTMN9VfkKOEpBn/Bsu7tJsi2U4=","crlite_enrolled":false,"id":"df4be940-d330-4c3a-9923-bafa52a3e054","last_modified":1562024722717},{"schema":1562024721169,"derHash":"SUKtBEEhiuwi2sQXrEmdfeTFTsvT0zXzSl+LBo9ubJY=","subject":"CN=Actalis Extended Validation Server CA G1,O=Actalis S.p.A./03358520967,L=Milano,ST=Milano,C=IT","subjectDN":"MIGHMQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5vMQ8wDQYDVQQHDAZNaWxhbm8xIzAhBgNVBAoMGkFjdGFsaXMgUy5wLkEuLzAzMzU4NTIwOTY3MTEwLwYDVQQDDChBY3RhbGlzIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VydmVyIENBIEcx","whitelist":false,"attachment":{"hash":"9dca42b206384547c8a9ebe8126b177b165c1f506a22d83e63775bee433d5029","size":2243,"filename":"iiRAhRCKHfD_Hl73m_3kvrRJsjFUTTQ3Xaw6E8qVac4=.pem","location":"security-state-staging/intermediates/0bd6f9b1-1826-400c-9fc8-549c1432ff92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iiRAhRCKHfD/Hl73m/3kvrRJsjFUTTQ3Xaw6E8qVac4=","crlite_enrolled":true,"id":"d9a1301f-ca8e-47e1-b6ae-ce1d56900f3c","last_modified":1562024721910},{"schema":1562024719663,"derHash":"00E47RRYrn3k7eo27TmS5PRubsnPHmM+U43p/w84+OU=","subject":"CN=Orion Health Direct Secure Messaging Public HISP CA,OU=Orion Health Direct Secure Messaging,O=Orion Health Inc.,C=US","subjectDN":"MIGWMQswCQYDVQQGEwJVUzEaMBgGA1UEChMRT3Jpb24gSGVhbHRoIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzE8MDoGA1UEAxMzT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nIFB1YmxpYyBISVNQIENB","whitelist":false,"attachment":{"hash":"94c25258c628090ccbfef78173fce5207a7b7d7d0786b01453aea545d1cc641f","size":2320,"filename":"_DkDZj8zqrqts7ngR8veYl3QLQiCdaFvI7j3ovLJLjQ=.pem","location":"security-state-staging/intermediates/e2ed17bc-c0a2-4f50-8600-d93fffa8427b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/DkDZj8zqrqts7ngR8veYl3QLQiCdaFvI7j3ovLJLjQ=","crlite_enrolled":false,"id":"a445528f-2000-4f16-a7e8-904d69b05da8","last_modified":1562024720406},{"schema":1562024718918,"derHash":"7qNsD/o/VP/bDPFLO9NKU+x7d19UBT3YsH39L4vskIM=","subject":"CN=Trustwave Extended Validation SHA256 CA\\, Level 1,O=Trustwave Holdings\\, Inc.,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGxMQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE5MDcGA1UEAxMwVHJ1c3R3YXZlIEV4dGVuZGVkIFZhbGlkYXRpb24gU0hBMjU2IENBLCBMZXZlbCAxMR8wHQYJKoZIhvcNAQkBFhBjYUB0cnVzdHdhdmUuY29t","whitelist":false,"attachment":{"hash":"621b7f65d119f8cacb26cf5956b7a206e1d42c2d931a41cf4311fdbc0bf8501e","size":1825,"filename":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=.pem","location":"security-state-staging/intermediates/1cd64f4c-6774-4383-aea2-1be395858f0e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zE8XYBj3Yf6nXNVdTry0tXUx6LGqIbwnbyd7rIOKue0=","crlite_enrolled":true,"id":"3ba57112-f78c-4fa3-94f7-1eb77f9f8f2f","last_modified":1562024719654},{"schema":1562024717416,"derHash":"M+ik7UiTB2DOGtei1E8HmyL2YAUnU5dhCeb8dHUlUr0=","subject":"CN=TrustAsia OV TLS Pro CA,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MFYxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSAwHgYDVQQDExdUcnVzdEFzaWEgT1YgVExTIFBybyBDQQ==","whitelist":false,"attachment":{"hash":"8f0250802a5effb55f9283f5becfe9736b17e0bdec2123b985d6c547798bc239","size":1666,"filename":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb-Gx3Y=.pem","location":"security-state-staging/intermediates/2a54b660-4cce-4591-9297-660cc2220117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cJhQtqu9DZRLxNRS1bDaM1E3d1GuJZmxfwKcfb+Gx3Y=","crlite_enrolled":true,"id":"4f9e9017-56da-4481-8083-248564e69585","last_modified":1562024718171},{"schema":1562024715170,"derHash":"nN/YJZbRusnkTT5JHiwH2NzJIEGZFf1vNhz3Ch5DOxA=","subject":"CN=DigiCert SHA2 Assured ID Code Signing CA - G3,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNjA0BgNVBAMTLURpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDb2RlIFNpZ25pbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e43fe8619c09201ff336d2be7ea7b065245035b10edefc0d0c9cc445a0098b2d","size":1898,"filename":"jKeOrq37W9ZMRnlHh4gnOcrawDmxuqzbS5Om5m6Qyak=.pem","location":"security-state-staging/intermediates/73ad83c3-1e6c-4031-bb8e-e7800b1bb2b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jKeOrq37W9ZMRnlHh4gnOcrawDmxuqzbS5Om5m6Qyak=","crlite_enrolled":false,"id":"fd568972-755f-4a1e-8c44-f58d86c73a15","last_modified":1562024715911},{"schema":1562024714413,"derHash":"/IiJpBHRkQt6beFZ+zKPhN/9J1ajmnjpHLm7kMb+puQ=","subject":"CN=University of Crete CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHcxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEiMCAGA1UEAxMZVW5pdmVyc2l0eSBvZiBDcmV0ZSBDQSBSMw==","whitelist":false,"attachment":{"hash":"3f38972b3ba184fdd5a88bd5edfc309ffb146203c5e6710ef016700d3f649337","size":2775,"filename":"2tJ14hiF-3qIssF_Ns01wnvA9a1i8i26VjWdV82Wlq4=.pem","location":"security-state-staging/intermediates/9342a366-b470-4d8b-a331-808dee9e9d0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2tJ14hiF+3qIssF/Ns01wnvA9a1i8i26VjWdV82Wlq4=","crlite_enrolled":true,"id":"ea5f5ef2-9532-40eb-8804-ddc6a420ae90","last_modified":1562024715162},{"schema":1562024712927,"derHash":"HLRwcoz1bzAgA7sOTrBiQU+hHU+X4/BhFwyWyIBx1xE=","subject":"SERIALNUMBER=A11029279,CN=SIGNE Autoridad de Certificacion,O=SIGNE S.A.,L=Avenida de la Industria 18. Tres Cantos 28760-Madrid,C=ES","subjectDN":"MIGgMQswCQYDVQQGEwJFUzE9MDsGA1UEBww0QXZlbmlkYSBkZSBsYSBJbmR1c3RyaWEgMTguIFRyZXMgQ2FudG9zIDI4NzYwLU1hZHJpZDETMBEGA1UECgwKU0lHTkUgUy5BLjESMBAGA1UEBRMJQTExMDI5Mjc5MSkwJwYDVQQDDCBTSUdORSBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbg==","whitelist":false,"attachment":{"hash":"3f6d219cd54b538f11bc52eddaf32c9cbcb619f67f7a017b15a8e82efc886d08","size":2503,"filename":"ynelJ6-KsF0J-NiKpRriqZWi-wy8fLZiL_E1OPI9m7Q=.pem","location":"security-state-staging/intermediates/6843e057-b3a1-4c75-9cf3-558a38373e40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ynelJ6+KsF0J+NiKpRriqZWi+wy8fLZiL/E1OPI9m7Q=","crlite_enrolled":false,"id":"5871aa8f-9987-4d45-9022-05b4d7183a7e","last_modified":1562024713662},{"schema":1562024711406,"derHash":"NEe3S15QClSZg/os7XOlZC5qrseIKVRhWEN99m10Nbg=","subject":"CN=Entrust Certification Authority - L1J,OU=See www.entrust.net/legal-terms+OU=(c) 2016 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTYgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFK","whitelist":false,"attachment":{"hash":"2e07048ca86219c4ca3243524ce82f92bd4d6ee5a455e2f0788fa0719d8fec57","size":1414,"filename":"jI4Ykls9hjddSkzQ6huOlUndX7rjGTHuF5_d41IfoQg=.pem","location":"security-state-staging/intermediates/4cf5d4e3-3abb-470a-8f2f-a06b53c04f64.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jI4Ykls9hjddSkzQ6huOlUndX7rjGTHuF5/d41IfoQg=","crlite_enrolled":true,"id":"b9f11e18-5206-4146-9bc4-ddabac60444f","last_modified":1562024712167},{"schema":1562024710635,"derHash":"/bNF0mk3ftnTQwi7eIVjKzDmH46vt+tedfgCTV/U4Yc=","subject":"CN=Actalis Extended Validation Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGSMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxMTAvBgNVBAMMKEFjdGFsaXMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZXJ2ZXIgQ0EgRzI=","whitelist":false,"attachment":{"hash":"d7c5ffb611bebe89f018d16c77607820250f80793e311df76f8f922e05af8915","size":2324,"filename":"7BceCt47nBUwA0apsyAFMrAwZEtOsJ0HcCBwBjIkXMs=.pem","location":"security-state-staging/intermediates/f89bbfa9-5e8b-4f74-96f3-c9bd84205f7e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7BceCt47nBUwA0apsyAFMrAwZEtOsJ0HcCBwBjIkXMs=","crlite_enrolled":true,"id":"d203afe2-d732-4a47-a358-8ca78084b518","last_modified":1562024711399},{"schema":1562024709882,"derHash":"3tsxy87F+Z046G7MTXaUXfQPLlR8lOSwEkCUh1r2pVg=","subject":"CN=GeoTrust DV SSL CA - G2,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzI=","whitelist":false,"attachment":{"hash":"3439739bc1e7266a65a0e40c9f19967c1c86002e0c6cd9b795217957c2717c7c","size":1613,"filename":"mgUGy5n-uULtn7glVMU3OUXx8savFGjLQd6g3PsZv7U=.pem","location":"security-state-staging/intermediates/d591331f-b5b9-4283-9332-79fed3577527.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mgUGy5n+uULtn7glVMU3OUXx8savFGjLQd6g3PsZv7U=","crlite_enrolled":false,"id":"76e9e952-cf99-4bca-a810-f8e7f646e88e","last_modified":1562024710628},{"schema":1562024709140,"derHash":"QPR5Vb6j6nJsraxdP+YSl/57665bBQnh73spyDj0nSA=","subject":"CN=Atos TrustedRoot Client Issuing CA 2015,O=Atos,C=DE","subjectDN":"ME4xMDAuBgNVBAMMJ0F0b3MgVHJ1c3RlZFJvb3QgQ2xpZW50IElzc3VpbmcgQ0EgMjAxNTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"dd579a2edbed1e53c1f47b7a826616a0d492b19006df01fe4ca95fec7212d82c","size":1569,"filename":"tjnIUgKXmzH2ph7qdeq_3nm1xMqgGPtNJ8mM19Zcu-M=.pem","location":"security-state-staging/intermediates/f292bc25-f1b7-45ff-9df5-d56c9893901c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tjnIUgKXmzH2ph7qdeq/3nm1xMqgGPtNJ8mM19Zcu+M=","crlite_enrolled":false,"id":"4f00eb7d-2e3c-402b-9dbb-97c1958dac20","last_modified":1562024709874},{"schema":1562024708399,"derHash":"wXYR23sxE2HiDXuCMarfR4vLf/oL5YXAbeIwkiPC74o=","subject":"CN=OMC,OU=ENTIDAD DE CERTIFICACION,O=ORGANIZACION MEDICA COLEGIAL,C=ES","subjectDN":"MGUxCzAJBgNVBAYTAkVTMSUwIwYDVQQKDBxPUkdBTklaQUNJT04gTUVESUNBIENPTEVHSUFMMSEwHwYDVQQLDBhFTlRJREFEIERFIENFUlRJRklDQUNJT04xDDAKBgNVBAMMA09NQw==","whitelist":false,"attachment":{"hash":"a803776f3d271b2b4cfdeef5d9a51f8db279dd9d598247889cc6742ab3d3d9ff","size":3165,"filename":"Lx99wFPK21XD3G9yPdiQ9625RbrSgNFJnI9V5mXPXkE=.pem","location":"security-state-staging/intermediates/12aab6e1-bfdf-437e-bbc8-fcb724a9ed52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Lx99wFPK21XD3G9yPdiQ9625RbrSgNFJnI9V5mXPXkE=","crlite_enrolled":false,"id":"6cd35988-abd6-4b5b-ad02-7e3a0e83da05","last_modified":1562024709132},{"schema":1562024706892,"derHash":"Zj/elPiDah/r2DvoMQl5MS1l/4wbcWOU5o9B2COWwfg=","subject":"CN=Aristotle University of Thessaloniki Client RSA SubCA R1,O=Aristotle University of Thessaloniki,L=Thessaloniki,C=GR","subjectDN":"MIGWMQswCQYDVQQGEwJHUjEVMBMGA1UEBwwMVGhlc3NhbG9uaWtpMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxQTA/BgNVBAMMOEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBDbGllbnQgUlNBIFN1YkNBIFIx","whitelist":false,"attachment":{"hash":"e884941029a92f7cc721cf8f87b2dacfc378d2d5a064c4b6ddba7ad39417d4ee","size":3027,"filename":"ytEFkkfmakfLzegbNdjrBvQKQbWEW2YFusfFkTp1XZ4=.pem","location":"security-state-staging/intermediates/a3aaecf9-aaf9-426f-bad7-768214675cd3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ytEFkkfmakfLzegbNdjrBvQKQbWEW2YFusfFkTp1XZ4=","crlite_enrolled":false,"id":"5a75985c-ec69-4abe-a08c-8eaaa1d12c61","last_modified":1562024707639},{"schema":1562024706143,"derHash":"Pk8J1lQ4tc9+RWKIwI/p9H7U4+1mknnIGu+rC6+4agk=","subject":"CN=Louisiana Health Care Quality Forum CA,OU=Orion Health Direct Secure Messaging,O=Louisiana Health Care Quality Forum,C=US","subjectDN":"MIGbMQswCQYDVQQGEwJVUzEsMCoGA1UEChMjTG91aXNpYW5hIEhlYWx0aCBDYXJlIFF1YWxpdHkgRm9ydW0xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEvMC0GA1UEAxMmTG91aXNpYW5hIEhlYWx0aCBDYXJlIFF1YWxpdHkgRm9ydW0gQ0E=","whitelist":false,"attachment":{"hash":"428c87d34cb911d650c2ead42003657d5e3523f033beb76ce916b9717250c2ef","size":2324,"filename":"0oFe6aMlwHnzOWvJ6PJOW1sZTMXgzyY1_0iznwf8fjM=.pem","location":"security-state-staging/intermediates/20dc63b8-33e7-40a2-a18f-047fda833f52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0oFe6aMlwHnzOWvJ6PJOW1sZTMXgzyY1/0iznwf8fjM=","crlite_enrolled":false,"id":"5f45c22c-a691-4926-a7a5-bc9262b58299","last_modified":1562024706884},{"schema":1562024704660,"derHash":"wCLVzqonXypiaPp5rDVlOzpzDe+kH5zYgX1tFZvTMJc=","subject":"CN=DigiCert Secure Site Korea EV CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKTAnBgNVBAMTIERpZ2lDZXJ0IFNlY3VyZSBTaXRlIEtvcmVhIEVWIENB","whitelist":false,"attachment":{"hash":"f253f14a706e3542ba2225ccb86204637d0ef708b5d912aeccc04e74d10e5e16","size":1699,"filename":"GU23iW3XanBnTnSB-qHY60G9W7OWfde0SLEvQJL9stY=.pem","location":"security-state-staging/intermediates/3311e594-a7f2-4770-9ef8-99ef2e365393.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GU23iW3XanBnTnSB+qHY60G9W7OWfde0SLEvQJL9stY=","crlite_enrolled":false,"id":"5839e0ee-6dfe-4352-a923-db68e62acab8","last_modified":1562024705394},{"schema":1562024703916,"derHash":"twIbzzRuhQKxJ1+ABX87l0Z6yLinYWCDQOz4SE7DhIw=","subject":"CN=Symantec Shared Individual Email Certificate Authority,OU=Symantec Trust Network+OU=Universal Root Managed PKI Individual Subscriber CA,O=Symantec Corporation,C=US","subjectDN":"MIHMMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPDA6BgNVBAsTM1VuaXZlcnNhbCBSb290IE1hbmFnZWQgUEtJIEluZGl2aWR1YWwgU3Vic2NyaWJlciBDQTE/MD0GA1UEAxM2U3ltYW50ZWMgU2hhcmVkIEluZGl2aWR1YWwgRW1haWwgQ2VydGlmaWNhdGUgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"0e66a63db740bfecf6042b8f34f2aab90907ba00e5cafe54ab3cc5faa750bc35","size":1999,"filename":"2ZRuq3rGjU72BNFg4TcN1Ix1HL_bYnlwehHZPK517-I=.pem","location":"security-state-staging/intermediates/40eebf4d-76e5-448b-8f3f-e6f66e68137d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZRuq3rGjU72BNFg4TcN1Ix1HL/bYnlwehHZPK517+I=","crlite_enrolled":false,"id":"c86ad407-3434-41bc-b9a3-1e139da7091e","last_modified":1562024704651},{"schema":1562024701623,"derHash":"uNXWXCP/nYyQL/5r7B3S8gaTryDpiuR3UfHsspgSe24=","subject":"CN=Certigna Wild CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MHkxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxHTAbBgNVBGEMFE5UUkZSLTQ4MTQ2MzA4MTAwMDM2MRkwFwYDVQQDDBBDZXJ0aWduYSBXaWxkIENB","whitelist":false,"attachment":{"hash":"c9d1b633464898b551171e5655c6d033a8158730020ca58cbc318d75b497caf4","size":2503,"filename":"6PsBH2V6vxU_w6DnSyY4EpqQYeF8QrYgohY-fWMfhmE=.pem","location":"security-state-staging/intermediates/26d15fd4-439e-44a4-9647-68a200a9c445.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6PsBH2V6vxU/w6DnSyY4EpqQYeF8QrYgohY+fWMfhmE=","crlite_enrolled":true,"id":"eea82515-872e-42a6-a344-f0b1c78abfca","last_modified":1562024702399},{"schema":1562024699344,"derHash":"Q3hZMD0Bg4Yqlvar+LA/KmnUy9MXIXZmAV4aujyEqhE=","subject":"CN=Alaska eHealth Network CA,OU=Orion Health Direct Secure Messaging,O=Alaska eHealth Network\\, Inc.,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzElMCMGA1UEChMcQWxhc2thIGVIZWFsdGggTmV0d29yaywgSW5jLjEtMCsGA1UECxMkT3Jpb24gSGVhbHRoIERpcmVjdCBTZWN1cmUgTWVzc2FnaW5nMSIwIAYDVQQDExlBbGFza2EgZUhlYWx0aCBOZXR3b3JrIENB","whitelist":false,"attachment":{"hash":"4091de3751ab313e7e649ce44c803e724201dd6805e79a8cbff59e9c013089eb","size":2300,"filename":"dfkE-bSHbmrjRBwkrMH5PQwaIQkos_AmfwEJJXYOIa0=.pem","location":"security-state-staging/intermediates/e5662ed0-eac1-4eab-9ce5-b207ced92959.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dfkE+bSHbmrjRBwkrMH5PQwaIQkos/AmfwEJJXYOIa0=","crlite_enrolled":false,"id":"56f1c6ae-fc7f-4290-82fb-07952074ad17","last_modified":1562024700095},{"schema":1562024698606,"derHash":"QzoJ/92y7tgu6p+RjIYMBMvqsTgaSN/ixI5C4T01r4E=","subject":"CN=RapidSSL Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGlJhcGlkU1NMIENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"000067152686f177585432d9dbf083f3ba0e9247714199a6a0a4dd88853060d8","size":1707,"filename":"A5Wm0DA34lHONfES5fxD574yGj-Q4hJ_2RLfym2qyMQ=.pem","location":"security-state-staging/intermediates/39d021b4-045d-4df0-bd97-f97c1c1ce4d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A5Wm0DA34lHONfES5fxD574yGj+Q4hJ/2RLfym2qyMQ=","crlite_enrolled":false,"id":"d9651719-df4a-45d3-b841-cec02ae95cdc","last_modified":1562024699336},{"schema":1562024697831,"derHash":"ZWldUAEX/XJw8QJ+0SHwWUJnAHVGHTN+7sf2pbdXpHo=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma TSA II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHGMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEhMB8GA1UEAwwYQ2FtZXJmaXJtYSBUU0EgSUkgLSAyMDE0","whitelist":false,"attachment":{"hash":"06cdf05da15710413bcdb3c16b8e3f0453970466f63bdc6906fdb88c05ed5da0","size":2987,"filename":"GnaOorQmNxUdFpJsmrLyIIkCM1_g9iZ0es7p5xqkBxY=.pem","location":"security-state-staging/intermediates/ee5ffdeb-6347-45c1-89a8-f3d1d0d39dc9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GnaOorQmNxUdFpJsmrLyIIkCM1/g9iZ0es7p5xqkBxY=","crlite_enrolled":false,"id":"31a8767d-3150-41ae-b216-4dca0fa22970","last_modified":1562024698597},{"schema":1562024697080,"derHash":"OOlHN3L2M8nct0O+Jx25JIgQYTqfiyh+Ld8Ns1l8jNs=","subject":"CN=UIS-IsuB1-CA","subjectDN":"MFkxEzARBgoJkiaJk/IsZAEZFgNjb20xFjAUBgoJkiaJk/IsZAEZFgZ1bmlzeXMxEzARBgoJkiaJk/IsZAEZFgN1aXMxFTATBgNVBAMTDFVJUy1Jc3VCMS1DQQ==","whitelist":false,"attachment":{"hash":"c2b1f3688781af36e6d27a330a09d939105128f808804a477bb1ecbd9f6eb250","size":2487,"filename":"vDj0a53UpusZTxtxcI-9ZUwj-RyW5jTHxGzrsv1qKs0=.pem","location":"security-state-staging/intermediates/12fc4555-cc24-4d7c-8d3f-2853ba40865b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vDj0a53UpusZTxtxcI+9ZUwj+RyW5jTHxGzrsv1qKs0=","crlite_enrolled":false,"id":"11cf500b-368e-4976-9070-e14a563874d2","last_modified":1562024697823},{"schema":1562024696338,"derHash":"25gZTlW5NtJubLP0YKJi62ymYzfnv/F6C/wIMlH2NiY=","subject":"CN=DigiCert Transition ECC Root,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IFRyYW5zaXRpb24gRUNDIFJvb3Q=","whitelist":false,"attachment":{"hash":"a503ee47d948586edc2de135a04ad0a5bf079f3430c38e4fa52765f5414feddd","size":1260,"filename":"fKyaD_MVOHdQuouv2xwrwps_C7oWNiypOpD4TaLfXz4=.pem","location":"security-state-staging/intermediates/1d50ac3c-c208-4965-8496-e94edb6ae235.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fKyaD/MVOHdQuouv2xwrwps/C7oWNiypOpD4TaLfXz4=","crlite_enrolled":false,"id":"8f14a185-27bb-46c9-8a7d-f062d9508611","last_modified":1562024697073},{"schema":1562024693355,"derHash":"4SHBaU2nN8F7hkSK7cYU7r15Rqe0uR+zACW2NgcCOeo=","subject":"CN=TU Dortmund Chipcard CA 2,O=Technische Universitaet Dortmund,C=DE","subjectDN":"MFwxCzAJBgNVBAYTAkRFMSkwJwYDVQQKDCBUZWNobmlzY2hlIFVuaXZlcnNpdGFldCBEb3J0bXVuZDEiMCAGA1UEAwwZVFUgRG9ydG11bmQgQ2hpcGNhcmQgQ0EgMg==","whitelist":false,"attachment":{"hash":"0bc67e75f1a550023d6bf6415f76c4bbfa22728373423b60d4e7e69eaa7bc87b","size":1967,"filename":"-p4rAAgYbHPbwWrr_BlNozrzb4GHt5BSuZwneaDRlOs=.pem","location":"security-state-staging/intermediates/41136d39-9edf-4465-ab5f-af073bc975d6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+p4rAAgYbHPbwWrr/BlNozrzb4GHt5BSuZwneaDRlOs=","crlite_enrolled":false,"id":"f972f74e-4035-4b85-850c-b92110d4c782","last_modified":1562024694110},{"schema":1562024691129,"derHash":"wYxXFOSGGJ3Sw+b1Y8WpdDTQzgpTkzDyP1ghPrhWirI=","subject":"CN=The University of Texas at Dallas RSA CA,OU=Information Security Office,O=The University of Texas at Dallas,L=Richardson,ST=TX,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEzARBgNVBAcTClJpY2hhcmRzb24xKjAoBgNVBAoTIVRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIGF0IERhbGxhczEkMCIGA1UECxMbSW5mb3JtYXRpb24gU2VjdXJpdHkgT2ZmaWNlMTEwLwYDVQQDEyhUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBhdCBEYWxsYXMgUlNBIENB","whitelist":false,"attachment":{"hash":"d83db0100dd0651aed7a1f9d2f176811876df6ea0bbd93799a522ec2d121b897","size":2215,"filename":"oSg8JaDAQ9ImWQdr0rRFk3oUkfB2cH07F8NSCR7dQiw=.pem","location":"security-state-staging/intermediates/46cfac9c-1592-4289-82a4-76a735c25a0a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oSg8JaDAQ9ImWQdr0rRFk3oUkfB2cH07F8NSCR7dQiw=","crlite_enrolled":false,"id":"1e473b20-47b2-43a7-a660-2f7f01c79bea","last_modified":1562024691858},{"schema":1562024690373,"derHash":"2Sv46fqGfb2LeUxqSeb/H8+scfPX9K5Vu5WH6ySsZIk=","subject":"CN=Intel External Issuing CA 7B,O=Intel Corporation,L=Santa Clara,ST=CA,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExGjAYBgNVBAoTEUludGVsIENvcnBvcmF0aW9uMSUwIwYDVQQDExxJbnRlbCBFeHRlcm5hbCBJc3N1aW5nIENBIDdC","whitelist":false,"attachment":{"hash":"3252f7b7ea0a73ee0dc29fb52054976ceefcfe385a3ed7d3230c1b17bc3b0a51","size":2584,"filename":"nNwmZpaXyiCdG3FOv6UayFdR2hD6Jp81-ByKuK4m0hc=.pem","location":"security-state-staging/intermediates/0635c17f-ed6f-4dda-9c17-ad7e86ea81de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nNwmZpaXyiCdG3FOv6UayFdR2hD6Jp81+ByKuK4m0hc=","crlite_enrolled":true,"id":"71f46dcf-1163-4ae4-82d0-70227f0d13aa","last_modified":1562024691121},{"schema":1562024689525,"derHash":"Fgi/h0FM3Pq0J5ECoZcC2dWZapEynj3y+ASVRzqthsY=","subject":"CN=GROB-WERKE GmbH und Co. KG SMIME CA,O=GROB-WERKE GmbH und Co. KG,L=Mindelheim,ST=Bayern,C=DE","subjectDN":"MIGGMQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5ZXJuMRMwEQYDVQQHEwpNaW5kZWxoZWltMSMwIQYDVQQKExpHUk9CLVdFUktFIEdtYkggdW5kIENvLiBLRzEsMCoGA1UEAxMjR1JPQi1XRVJLRSBHbWJIIHVuZCBDby4gS0cgU01JTUUgQ0E=","whitelist":false,"attachment":{"hash":"e902888764e15f459260d581daca513e4d9312ed891f8366f61cfa3a818da4eb","size":1898,"filename":"9C6CMkucrjEzjuHJ0_Yvi_3haIQNwSsvg6dURAGCvQw=.pem","location":"security-state-staging/intermediates/2eeedbc9-d767-4120-9f52-1b8596e7016e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9C6CMkucrjEzjuHJ0/Yvi/3haIQNwSsvg6dURAGCvQw=","crlite_enrolled":false,"id":"aa9c5926-0cf0-4383-8c7c-86fbb9e3275c","last_modified":1562024690364},{"schema":1562024688131,"derHash":"WWFWvCpDFet2jIJtfMoykVjK48b492BTaWW+58ra9u0=","subject":"CN=GENIOUS RSA Organization Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGVMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxPTA7BgNVBAMTNEdFTklPVVMgUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"b67d95389481054676ee7593a657285e90ebc97092559fd2c290b35a70e6adb4","size":2186,"filename":"TGPK3krjByA1NGzfFpJE6yAuNxJS1sOdosy48yS34bY=.pem","location":"security-state-staging/intermediates/bb436925-661b-4c7d-b6d9-4cadc9fee665.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TGPK3krjByA1NGzfFpJE6yAuNxJS1sOdosy48yS34bY=","crlite_enrolled":false,"id":"1d14fc34-cfca-4720-bd7d-f6bab37335af","last_modified":1562024689517},{"schema":1562024682352,"derHash":"pahZzgMQqF9CpUEdpj+DtBROuUvIplqZdayGgvZn23c=","subject":"CN=KLASS3-SK 2016,OU=Sertifitseerimisteenused,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MIGGMQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEhMB8GA1UECwwYU2VydGlmaXRzZWVyaW1pc3RlZW51c2VkMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEXMBUGA1UEAwwOS0xBU1MzLVNLIDIwMTY=","whitelist":false,"attachment":{"hash":"c86690eaf270e47aa47657df040ad7c00e44765f0541b6f39df22674b68d953a","size":2316,"filename":"xef4f3N5BNZP0Q0QcNP_K4mvKbkyVm6HUsu5v4fhkxw=.pem","location":"security-state-staging/intermediates/61e6fc9a-cbb9-46d0-a853-873ffe0a401b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xef4f3N5BNZP0Q0QcNP/K4mvKbkyVm6HUsu5v4fhkxw=","crlite_enrolled":false,"id":"f96d8ef1-2281-4fea-82fe-99e436804069","last_modified":1562024683335},{"schema":1562024680960,"derHash":"FaWN4H88JJ4m/o6pDWtxqWU210V50tO+z6ct66KP5uI=","subject":"SERIALNUMBER=201802,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE4MDI=","whitelist":false,"attachment":{"hash":"97f5722cd07529a5c144cd8737c75d9df0894a3a632ef8cd9ed63f6dd432fd99","size":2337,"filename":"5Jza1_aAF2D2CllpCE_uElJfffYV4G7_ri5y_L78I7k=.pem","location":"security-state-staging/intermediates/81cbc5f5-72e7-4902-9d9c-06c7bc371cce.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5Jza1/aAF2D2CllpCE/uElJfffYV4G7/ri5y/L78I7k=","crlite_enrolled":false,"id":"a598405e-8a6e-4c07-a762-15192c3040d1","last_modified":1562024682344},{"schema":1562024675733,"derHash":"1AT6+kui9Ca2bNIZxtqE+RwPt8tYQp7IB34qdkMU1V0=","subject":"CN=SHECA RSA Extended Validation Code Signing CA,O=UniTrust,C=CN","subjectDN":"MFgxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDE2MDQGA1UEAwwtU0hFQ0EgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"a15897802d23e699976d747ab51f10c55e3269b1d232e8dc8dfd3c1939062fec","size":2056,"filename":"FFIzlMw5Xc6E2LQuZDJSIUp6ilY_hMZ3pV79yOdqxT8=.pem","location":"security-state-staging/intermediates/072a73d3-de48-413f-ae4c-8ece54ee2d74.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FFIzlMw5Xc6E2LQuZDJSIUp6ilY/hMZ3pV79yOdqxT8=","crlite_enrolled":false,"id":"651de304-28d1-4884-8d67-d193d89dce21","last_modified":1562024676798},{"schema":1562024670128,"derHash":"djFLQcutTTf+2gYd//UKywPsgAfmXTYsZSPOGcQaaho=","subject":"CN=SSL Blindado 2,OU=Certifica\u00e7\u00e3o Digital,O=Site Blindado S.A.,L=S\u00e3o Paulo,ST=SP,C=BR","subjectDN":"MIGGMQswCQYDVQQGEwJCUjELMAkGA1UECBMCU1AxEzARBgNVBAcMClPDo28gUGF1bG8xGzAZBgNVBAoTElNpdGUgQmxpbmRhZG8gUy5BLjEfMB0GA1UECwwWQ2VydGlmaWNhw6fDo28gRGlnaXRhbDEXMBUGA1UEAxMOU1NMIEJsaW5kYWRvIDI=","whitelist":false,"attachment":{"hash":"fa57ea713308d04440c58d4fa7a1500999cf041024985d5f8f20c47c1e4a3ee9","size":2162,"filename":"4-iqNnPo4Sq4xWzqc2uPKOdxlIAOrvZz-berOkTMMI4=.pem","location":"security-state-staging/intermediates/589c3c5b-ea54-467b-96cd-c34e117bb8a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4+iqNnPo4Sq4xWzqc2uPKOdxlIAOrvZz+berOkTMMI4=","crlite_enrolled":true,"id":"6d3bd155-89d6-4c5a-9aff-142261690ccc","last_modified":1562024671131},{"schema":1562024668446,"derHash":"rL+uvcvOGshMmM8kFAtgYalzGOkmIVQJ3Az0x75QZiA=","subject":"CN=Fraunhofer Service CA - G02,OU=Fraunhofer Corporate PKI,O=Fraunhofer,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGPMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjETMBEGA1UECgwKRnJhdW5ob2ZlcjEhMB8GA1UECwwYRnJhdW5ob2ZlciBDb3Jwb3JhdGUgUEtJMSQwIgYDVQQDDBtGcmF1bmhvZmVyIFNlcnZpY2UgQ0EgLSBHMDI=","whitelist":false,"attachment":{"hash":"f5d44378aebefee88f997f5baa67fce4e41c10b120f38a27f2ed2087d1347498","size":2028,"filename":"k3nI5IvSB1BwykyJ-lu8LZoHsTKb-Zq2JRhAXR7OjBU=.pem","location":"security-state-staging/intermediates/86390395-14c7-4e6b-8840-51150f08950a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3nI5IvSB1BwykyJ+lu8LZoHsTKb+Zq2JRhAXR7OjBU=","crlite_enrolled":true,"id":"97c725bf-dfc1-4940-bed8-defc980dd7a3","last_modified":1562024669293},{"schema":1562024663411,"derHash":"GPQ2j+k7PK4CUjC85+rTQP2Q+yf5oQ42/uifxFTyJ4g=","subject":"CN=CrossTrust DV CA5,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MFAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMRowGAYDVQQDExFDcm9zc1RydXN0IERWIENBNQ==","whitelist":false,"attachment":{"hash":"2095edba6d54418256b1c82c2499bd9f75e39608c3dc0e3b395dac7a8870a119","size":1642,"filename":"mfydQPGtsWNlYaYdaD2eprRgxX0MdeoAw0G537kLXzk=.pem","location":"security-state-staging/intermediates/779275d4-b98f-4e5c-9606-7d98a85e2d32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mfydQPGtsWNlYaYdaD2eprRgxX0MdeoAw0G537kLXzk=","crlite_enrolled":true,"id":"70cd95b5-008a-41bf-b38e-525ca51982fb","last_modified":1562024664425},{"schema":1562024662659,"derHash":"oEZpf7hZ8MJrsTYMDebkqRSzuujAYxpW7GiJI/lUHuo=","subject":"CN=Greek School Network CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHgxCzAJBgNVBAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAxMaR3JlZWsgU2Nob29sIE5ldHdvcmsgQ0EgUjI=","whitelist":false,"attachment":{"hash":"80378669992df895fe7c174b9406850901e279fea75c842fd6b3c2ff6c14043b","size":2515,"filename":"98TGXZmp4DiQ3clcfPyaWFAMTYcQaD8IUO2NCCrpEK0=.pem","location":"security-state-staging/intermediates/01368076-14b4-4b4e-b1c1-b9b490b60ec0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"98TGXZmp4DiQ3clcfPyaWFAMTYcQaD8IUO2NCCrpEK0=","crlite_enrolled":true,"id":"589d8720-2ba2-4203-acda-9cb678c4e712","last_modified":1562024663402},{"schema":1562024661916,"derHash":"HyAocW4zWE8z+pIKgCR77s3D18smUZVUxkTOTExgd6k=","subject":"CN=Gandi Pro SSL CA 2,O=Gandi,L=Paris,ST=Paris,C=FR","subjectDN":"MFoxCzAJBgNVBAYTAkZSMQ4wDAYDVQQIEwVQYXJpczEOMAwGA1UEBxMFUGFyaXMxDjAMBgNVBAoTBUdhbmRpMRswGQYDVQQDExJHYW5kaSBQcm8gU1NMIENBIDI=","whitelist":false,"attachment":{"hash":"0b14e4838611e1040d16acabdae7756870a021f18844011f2f87c5ebfbf97f22","size":2101,"filename":"XQpYwYiHpVLml4eYccUVEZJpEOh5QrryTkXbWPum2FM=.pem","location":"security-state-staging/intermediates/da1204ed-4700-4361-bbeb-cffde787f323.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XQpYwYiHpVLml4eYccUVEZJpEOh5QrryTkXbWPum2FM=","crlite_enrolled":true,"id":"2e2be106-0cd8-423e-acc8-a99f0741c76c","last_modified":1562024662650},{"schema":1562024659671,"derHash":"o6MQwwU6lC/Rbc0oOqm5qYtOvFAShttTSERFwtQGQ5U=","subject":"SERIALNUMBER=201728,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI4","whitelist":false,"attachment":{"hash":"f88597ad972bcb415157d862d83d8ba205b08e3b6f81f186151e052143d9c2c1","size":2402,"filename":"Zm0n84A8Hfky-2Hxedi6vTc2e7xTRFGkgkHRccK9SQA=.pem","location":"security-state-staging/intermediates/1aa3c537-650e-493f-b57a-b13c3670115b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zm0n84A8Hfky+2Hxedi6vTc2e7xTRFGkgkHRccK9SQA=","crlite_enrolled":false,"id":"329c9535-9fd6-4a5d-b07b-307647627c7b","last_modified":1562024660408},{"schema":1562024655926,"derHash":"CA5+NrPH+pbsxn239NQc7OHRlEAa8ZakpHt5vcSXBXQ=","subject":"CN=FR03,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"ME4xCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlESElNWU9USVMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxDTALBgNVBAMMBEZSMDM=","whitelist":false,"attachment":{"hash":"0e878e377f71dc53a8708f58d1a029dab3d1ba19aae19818ecaa81b11ff7f98c","size":2361,"filename":"5aXOeu2kcFD4gRajILogB4nDzNx-0ZsGl_VZJJ4Bcck=.pem","location":"security-state-staging/intermediates/ed40f0b5-5f1f-4858-b1a9-0e0e454d7a2f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5aXOeu2kcFD4gRajILogB4nDzNx+0ZsGl/VZJJ4Bcck=","crlite_enrolled":false,"id":"f6f0bd28-e216-439a-b50e-0eb0e9c39fd4","last_modified":1562024656668},{"schema":1562024654415,"derHash":"JEobcwyh11pppS9eX0IbtUfHl+JK++nPuZyZNIjNwnE=","subject":"CN=SSLs.com RSA OV Secure Server CA,O=SSLs.com,L=Phoenix,ST=Arizona,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRAwDgYDVQQHEwdQaG9lbml4MREwDwYDVQQKEwhTU0xzLmNvbTEpMCcGA1UEAxMgU1NMcy5jb20gUlNBIE9WIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"d9c03b9d8ce926db05361c2a2e9ebb41169021361e35605f6762ed68c201c0f8","size":2129,"filename":"Zyd1gFi_OihMqmE83KKHmgjVpD3p-B1OSbDcm-Mh1HI=.pem","location":"security-state-staging/intermediates/5b7360a4-d5af-4db0-a175-6ac34f6f359c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zyd1gFi/OihMqmE83KKHmgjVpD3p+B1OSbDcm+Mh1HI=","crlite_enrolled":false,"id":"ede190ce-6e19-49ed-b777-76affc7a59c3","last_modified":1562024655178},{"schema":1562024653662,"derHash":"FcgTItoi8e58gjGswLUuTxenrmswgRui9mfmSP+C2Ko=","subject":"CN=GeoTrust Class 3 RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkdlb1RydXN0IENsYXNzIDMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"35c33dbfaa3357dd26c043e304c3f067c93a1570a4a61d76b2cbd5f28ce68451","size":1658,"filename":"yQ3gGILmNT91r7IExWW0hjmSsOFoarXP2l8w_rCiqjI=.pem","location":"security-state-staging/intermediates/b9dc0b3e-4e93-4c74-a2a2-70baecda5ec8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yQ3gGILmNT91r7IExWW0hjmSsOFoarXP2l8w/rCiqjI=","crlite_enrolled":false,"id":"986f0086-4142-4ea7-a032-8318876fe49c","last_modified":1562024654408},{"schema":1562024650671,"derHash":"jP4TFbFn/L/IsanrVOl/Eygu4lB+DSOwFI0FOuhzb+M=","subject":"CN=Greek Academic Network CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MHoxCzAJBgNVBAYTAkdSMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTElMCMGA1UEAwwcR3JlZWsgQWNhZGVtaWMgTmV0d29yayBDQSBSMg==","whitelist":false,"attachment":{"hash":"afcea3835e49125880e2099105b71bc7371bb52e07197ab0d7790bdb0e1cdff8","size":2182,"filename":"oioxNDiUVFIA2kOPSehGUrby06Q-zdTupeexlqTUVGg=.pem","location":"security-state-staging/intermediates/27abd690-5eb8-49e0-b7dc-56479e0f2e1e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oioxNDiUVFIA2kOPSehGUrby06Q+zdTupeexlqTUVGg=","crlite_enrolled":true,"id":"d8c20a63-2574-4aa9-99cf-2c559248f49e","last_modified":1562024651416},{"schema":1562024648439,"derHash":"YBKTyiCwmgMpXRliVsaVP/nrqBHbjjzhQEE8G//pqGk=","subject":"CN=AC FNMT Usuarios,OU=Ceres,O=FNMT-RCM,C=ES","subjectDN":"MEsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGTAXBgNVBAMMEEFDIEZOTVQgVXN1YXJpb3M=","whitelist":false,"attachment":{"hash":"98c05c3829d90c10dc917b2cce8e171d89d2621e2a69fdf4104f2ca5c4e1d9b5","size":2434,"filename":"CyFyC5Hw5FxD8ufLGF9VLrfeftRrKsFy7jm1CEFxCm8=.pem","location":"security-state-staging/intermediates/c63e246e-e4a9-41cd-9d0c-d6bd4563f4d5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CyFyC5Hw5FxD8ufLGF9VLrfeftRrKsFy7jm1CEFxCm8=","crlite_enrolled":false,"id":"e7b7334d-1c42-4373-af42-028c694f4f20","last_modified":1562024649177},{"schema":1562024647686,"derHash":"x5C0cShEfsC2DyK/y3ldccMm3ZEO4Sy7TMWoYZHrkbw=","subject":"CN=RapidSSL RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"8d48a4abde2999b864fb9607b6e2b43144a92714cdf63de21b44d83e923ae297","size":1687,"filename":"nKWcsYrc-y5I8vLf1VGByjbt-Hnasjl-9h8lNKJytoE=.pem","location":"security-state-staging/intermediates/fbead98d-cbd8-4432-90ef-c600588aad52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"nKWcsYrc+y5I8vLf1VGByjbt+Hnasjl+9h8lNKJytoE=","crlite_enrolled":true,"id":"1bc7f624-5af1-4e32-adc2-850bcbe509c2","last_modified":1562024648431},{"schema":1562024646934,"derHash":"mMJUWiwFo0LtsiqfbHzMH+mNh1lWduOimK3pf3sBKR0=","subject":"CN=Telia Extended Validation CA v3,O=Telia Finland Oyj,C=FI","subjectDN":"MFMxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEoMCYGA1UEAwwfVGVsaWEgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQSB2Mw==","whitelist":false,"attachment":{"hash":"cfccad2513e8a79668b0439df943a8027f9cf6e9df609184e5a59ecb4652c42a","size":2357,"filename":"M64GXqmJRZS4-HYfzVBON86Fc4RrWpo0uUMAaJSGSoo=.pem","location":"security-state-staging/intermediates/976a3c1d-a72a-4df1-86ae-0d14b9abe958.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M64GXqmJRZS4+HYfzVBON86Fc4RrWpo0uUMAaJSGSoo=","crlite_enrolled":false,"id":"36618487-dec3-4f3c-bbcb-9c997d3da4cd","last_modified":1562024647677},{"schema":1562024645415,"derHash":"aGG71MvtoqoBBmv0dr+PL+bqnwCMsKyOF1Xioyj6WTM=","subject":"CN=GeoTrust SupremeSSL 1 ECC CA,OU=www.supremessl.com,O=SupremeSSL,C=NL","subjectDN":"MGYxCzAJBgNVBAYTAk5MMRMwEQYDVQQKEwpTdXByZW1lU1NMMRswGQYDVQQLExJ3d3cuc3VwcmVtZXNzbC5jb20xJTAjBgNVBAMTHEdlb1RydXN0IFN1cHJlbWVTU0wgMSBFQ0MgQ0E=","whitelist":false,"attachment":{"hash":"373aa2e25b056cec6efe1e730bddc90c02ef00673b9fcdbdecf27f45022767f5","size":1435,"filename":"MvWcqevnkZnFHxjKilcZrsSWbR8T5JBIZ9pHPT2t7c4=.pem","location":"security-state-staging/intermediates/e13233f4-f7b1-4bda-a820-d84b3227b772.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MvWcqevnkZnFHxjKilcZrsSWbR8T5JBIZ9pHPT2t7c4=","crlite_enrolled":false,"id":"d0d43bdc-8347-4819-898f-44ee3a2094bc","last_modified":1562024646178},{"schema":1562024643925,"derHash":"t9/cJ+X/nzXv7J9LxTLDX3J3ibackKBIm0AkcpnZcDg=","subject":"CN=NCC Group Secure Server CA G4,O=NCC Group,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlOQ0MgR3JvdXAxJjAkBgNVBAMTHU5DQyBHcm91cCBTZWN1cmUgU2VydmVyIENBIEc0","whitelist":false,"attachment":{"hash":"6bba8a4f7467c485c33229430bcdc46f0a8e260ecda70283cadc4c16d46d3efc","size":2259,"filename":"MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN-THyz125ar_w=.pem","location":"security-state-staging/intermediates/92243c0e-e056-4cbe-8c9c-46b2431e55f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MVk5FViYCK7Pj5OrMzdLFaJfz4vqivN+THyz125ar/w=","crlite_enrolled":false,"id":"1be64318-c01e-4e05-9642-ba1a140b8f77","last_modified":1562024644659},{"schema":1562024643182,"derHash":"rYBqk1e4fR6x3YWlo8CS0CBLpEf/SzcU4/EDT0096KA=","subject":"CN=TrustAsia ECC DV SSL CA - G7,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGbMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJTAjBgNVBAMTHFRydXN0QXNpYSBFQ0MgRFYgU1NMIENBIC0gRzc=","whitelist":false,"attachment":{"hash":"ebbd88e3ff6a42d32837fa50a25dbd9d8cd0a7160b4513be3bff457a5f2f9a2e","size":1662,"filename":"HxpZpgA2aeZ4tewEwREYzhJ-jiwtTgrvLw0DLcn9Zuo=.pem","location":"security-state-staging/intermediates/73491823-ff56-4639-bfd4-809dcebab607.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"HxpZpgA2aeZ4tewEwREYzhJ+jiwtTgrvLw0DLcn9Zuo=","crlite_enrolled":false,"id":"c1afb7e3-58f3-4382-aff3-6da3ae7cf800","last_modified":1562024643918},{"schema":1562024641634,"derHash":"bLxbMwid37MlI3QGbYrgu+v7p3nbrldHJ5gmygzQXao=","subject":"SERIALNUMBER=201520,CN=Citizen CA,C=BE","subjectDN":"MDMxCzAJBgNVBAYTAkJFMRMwEQYDVQQDEwpDaXRpemVuIENBMQ8wDQYDVQQFEwYyMDE1MjA=","whitelist":false,"attachment":{"hash":"f8368bcc57ccb54a60e5cd5f771bae93885dd835ac9c7d93fb4bf0c6879f2be4","size":2093,"filename":"dUEUuB5jxCsvgh9iUJs0gNgF5SUPlP6kHDXYF6TI0qg=.pem","location":"security-state-staging/intermediates/b8123175-0124-4b42-9ca9-8fa735e58ffb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dUEUuB5jxCsvgh9iUJs0gNgF5SUPlP6kHDXYF6TI0qg=","crlite_enrolled":false,"id":"b66503e2-5ae2-40cd-9a39-31e70edc2fe8","last_modified":1562024642398},{"schema":1562024640879,"derHash":"7g9kewN50+S9JLTNpvhwe2fETVUR9aJbMd0pk+0TuZE=","subject":"CN=KeyNet Systems RSA Codesigning CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSowKAYDVQQDEyFLZXlOZXQgU3lzdGVtcyBSU0EgQ29kZXNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"d806fefd7fc730cee01857ae79aa61d872cec7e504d5fdc5b237d214bbe49a0e","size":2121,"filename":"yF0wtp1jCZD5CVHOt8FGpYuYs0KHDFYkMO7rLbCWnxs=.pem","location":"security-state-staging/intermediates/ea4041b7-4458-4530-b792-3dd083eb24ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yF0wtp1jCZD5CVHOt8FGpYuYs0KHDFYkMO7rLbCWnxs=","crlite_enrolled":false,"id":"b8a82aab-854e-43df-8a83-e56b2abc56a3","last_modified":1562024641626},{"schema":1562024640128,"derHash":"dKvl5czrdUkf9yxM8yVAXYrb/jkOGJz0MLpg5ieYh44=","subject":"CN=GlobalSign Qualified Time Stamping CA 2019,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFF1YWxpZmllZCBUaW1lIFN0YW1waW5nIENBIDIwMTk=","whitelist":false,"attachment":{"hash":"390e714997d51e1e6c2518f0577114169f70bf99bf7075c17ede8ab266418f8b","size":2333,"filename":"wa9IwR3KKWRyfMtS73Nt1hUWl63Qj3Pfg6VDVR2hZZc=.pem","location":"security-state-staging/intermediates/9d78e16e-5b65-4571-a961-a72d55244348.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"wa9IwR3KKWRyfMtS73Nt1hUWl63Qj3Pfg6VDVR2hZZc=","crlite_enrolled":false,"id":"9e5df267-d269-49ba-accc-7148af1740ec","last_modified":1562024640872},{"schema":1562024639346,"derHash":"ce/DA7efYnc6YgZQkGKRCRN2Ftr6OBT3ZPKk8t4wjJc=","subject":"CN=Don Dominio / MrDomain RSA Codesigning CA,O=Soluciones Corporativas IP\\, SL,L=Manacor,ST=Illes Balears,C=ES","subjectDN":"MIGUMQswCQYDVQQGEwJFUzEWMBQGA1UECBMNSWxsZXMgQmFsZWFyczEQMA4GA1UEBxMHTWFuYWNvcjEnMCUGA1UEChMeU29sdWNpb25lcyBDb3Jwb3JhdGl2YXMgSVAsIFNMMTIwMAYDVQQDEylEb24gRG9taW5pbyAvIE1yRG9tYWluIFJTQSBDb2Rlc2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"93809ce288569e0a80022d76b567f6111be181c1409952f6104a03054e439930","size":2158,"filename":"CrN64DaXdgi0ZeV86ffGFSIF8l-3irYcKimQA8lXRvc=.pem","location":"security-state-staging/intermediates/83703eb2-f064-48c1-a37b-48595cd66e27.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CrN64DaXdgi0ZeV86ffGFSIF8l+3irYcKimQA8lXRvc=","crlite_enrolled":false,"id":"827ccb06-0216-48bc-9dc5-0e275639a416","last_modified":1562024640120},{"schema":1562024636330,"derHash":"6GvBbMZJHl9LmXYxOEKz0CyZ6iY66x3CI9iY+ofISEU=","subject":"CN=Intermediate Certificate DV SSL CA - G3,OU=Domain Validated SSL,O=Intermediate Certificate,C=NL","subjectDN":"MIGBMQswCQYDVQQGEwJOTDEhMB8GA1UEChMYSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEwMC4GA1UEAxMnSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIERWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"195afb969c8619e4ae9d77e800d89622d5b5e6863724ca0b08cfc1acf51e176f","size":1752,"filename":"RttTLrYI9IiksyY9ikb6Z5G21gXd-PC6JavBmeoUhFQ=.pem","location":"security-state-staging/intermediates/3c8e4cea-ada4-4d01-99ef-c17583cd2e32.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RttTLrYI9IiksyY9ikb6Z5G21gXd+PC6JavBmeoUhFQ=","crlite_enrolled":false,"id":"19f456b7-aefd-4a74-bfc2-4c69c84b227b","last_modified":1562024637072},{"schema":1562024634825,"derHash":"/NczzyQ6oyLxiQoZuSL2+q3PM8RJhTcvH9QDYOXbRUA=","subject":"CN=HEAL-LINK Hellenic Academic Libraries Link CA R2,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGOMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxOTA3BgNVBAMTMEhFQUwtTElOSyBIZWxsZW5pYyBBY2FkZW1pYyBMaWJyYXJpZXMgTGluayBDQSBSMg==","whitelist":false,"attachment":{"hash":"faa326d8a1f2b480e44d115d21b8ede6d23515f18895ccd916c77df67e3b3fe3","size":2572,"filename":"7sJ8RMpnyY2DImVRw5k-1OVZMBQjegMbRJJlc8JvQYw=.pem","location":"security-state-staging/intermediates/744082c5-b92f-4e8b-b2a4-62c76f2ed069.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"7sJ8RMpnyY2DImVRw5k+1OVZMBQjegMbRJJlc8JvQYw=","crlite_enrolled":true,"id":"e3ec2766-2033-4174-b315-24dfed391391","last_modified":1562024635558},{"schema":1562024634083,"derHash":"k1abJqpTXj4HyJHGvS+p3Ak5wk20s3Jq2FMe2xfEl8o=","subject":"CN=Thawte EV RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHjAcBgNVBAMTFVRoYXd0ZSBFViBSU0EgQ0EgMjAxOA==","whitelist":false,"attachment":{"hash":"aa41f2f1317c4207a1ce000f100f89792938ebbd08ccc7367391461f45499ac8","size":1662,"filename":"LrLVqGD-UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm_U=.pem","location":"security-state-staging/intermediates/96e7bbbb-d73b-4033-b2a1-e8243524a5bf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LrLVqGD+UOnCQjaFUpgBUORdtTIaWwBeJtZ2JTpAm/U=","crlite_enrolled":true,"id":"85dafc08-0b93-4086-a997-de6c1c290cdb","last_modified":1562024634817},{"schema":1562024633327,"derHash":"EYDDOuHyMiiSP2rmmMnBDccp4NgR/IsuwCcm4twm4uQ=","subject":"CN=Mary Washington Healthcare CA,OU=Orion Health Direct Secure Messaging,O=Mary Washington Healthcare,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaTWFyeSBXYXNoaW5ndG9uIEhlYWx0aGNhcmUxLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEmMCQGA1UEAxMdTWFyeSBXYXNoaW5ndG9uIEhlYWx0aGNhcmUgQ0E=","whitelist":false,"attachment":{"hash":"f27a0d7f7099ac8f18503b8f3e491b2a79d0e29e512d0183a401f13211fb332e","size":2308,"filename":"3fZZys3pCVAZzGIvFjCN9qPTAa_HZxcHFvElXaL0oEo=.pem","location":"security-state-staging/intermediates/90afa439-0588-4864-86ca-7342ec654bef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3fZZys3pCVAZzGIvFjCN9qPTAa/HZxcHFvElXaL0oEo=","crlite_enrolled":false,"id":"7f4afbf6-84ea-4275-bf34-2df9f0ef7ec1","last_modified":1562024634075},{"schema":1562024631064,"derHash":"fwfBL/9GU9a7ZfnM/RoOnuRmiE6wdyd7ubtF12JDzCI=","subject":"CN=cPanel Extended Validation RSA Certification Authority,OU=Controlled by COMODO exclusively for cPanel\\, Inc.,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MIHAMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVFgxEDAOBgNVBAcTB0hvdXN0b24xFTATBgNVBAoTDGNQYW5lbCwgSW5jLjE6MDgGA1UECxMxQ29udHJvbGxlZCBieSBDT01PRE8gZXhjbHVzaXZlbHkgZm9yIGNQYW5lbCwgSW5jLjE/MD0GA1UEAxM2Y1BhbmVsIEV4dGVuZGVkIFZhbGlkYXRpb24gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"d1bbc1da043caed75d76f28bd38fb18682563dac07cd7bf50225a2df8a59a870","size":2263,"filename":"KpHjtz2O9rMfP4azz-Q54sswiBTZMPXTpgqz8YbaLxY=.pem","location":"security-state-staging/intermediates/9f5ff8d2-5dad-434f-96b3-f774d101a4f0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KpHjtz2O9rMfP4azz+Q54sswiBTZMPXTpgqz8YbaLxY=","crlite_enrolled":false,"id":"6210dc38-77f8-4be4-9d9d-dc0af9f6a298","last_modified":1562024631797},{"schema":1562024627331,"derHash":"yBksMve0nH8yocoAFZWn+eNsnnIFjW6qG6t3UqjBZxg=","subject":"CN=GlobalSign SMIME CA 2018,O=GlobalSign nv-sa,C=BE","subjectDN":"MEsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSEwHwYDVQQDExhHbG9iYWxTaWduIFNNSU1FIENBIDIwMTg=","whitelist":false,"attachment":{"hash":"60387e84f4510d6de07955c632fa7b57744fec7421e7a6c71b8146efbe767f1e","size":1646,"filename":"5METmo6RU7kSFFHasy87-Yr-zR3pFY6GNCY1M084qpg=.pem","location":"security-state-staging/intermediates/7f667502-8313-4684-ad31-beaae087ae6e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5METmo6RU7kSFFHasy87+Yr+zR3pFY6GNCY1M084qpg=","crlite_enrolled":false,"id":"d6835983-aca8-442a-ad58-55908e0b7315","last_modified":1562024628080},{"schema":1562024626566,"derHash":"/CgbGiVMKgBz2Vk/GCOBvieHBl47UiE0VClMXC8RlTc=","subject":"CN=Sectigo RSA Extended Validation Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGQMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxODA2BgNVBAMTL1NlY3RpZ28gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"33e7c322675e7bdb5f32c2d6d1233bffe8d9634feda4861f4b95735289052139","size":2154,"filename":"Mn6dnrahNIa08AjqfJouU0xQyNvIF6P_y5xeJthQTwI=.pem","location":"security-state-staging/intermediates/e05a0dc7-704c-497d-8660-79aca583ade4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Mn6dnrahNIa08AjqfJouU0xQyNvIF6P/y5xeJthQTwI=","crlite_enrolled":false,"id":"3af61df4-c217-4f92-90ea-5bb3de3f7043","last_modified":1562024627323},{"schema":1562024624262,"derHash":"S8xeI0/oHt5Or4g6oZwxM1sLJuheBmuZReTLYVPrIMI=","subject":"CN=Thawte TLS RSA CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFRoYXd0ZSBUTFMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"ab46e21b2e6e52647007f65c64b45ece54a6f9162bf19babfd723021d1ed126d","size":1634,"filename":"42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG-CipUmaM=.pem","location":"security-state-staging/intermediates/2deee9f5-6f96-4266-860b-0f80cf881111.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"42b9RNOnyb3tlC0KYtNPA3KKpJluskyU6aG+CipUmaM=","crlite_enrolled":true,"id":"30af8c0a-f879-42ef-9671-106eda3c7cbb","last_modified":1562024625011},{"schema":1562024623475,"derHash":"gNnttFt/WSzTAlTlW8MWu/ROR9/AwASjgygcA/NFujk=","subject":"CN=Volusion\\, Inc. DV SSL CA - G3,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxJjAkBgNVBAMTHVZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQSAtIEcz","whitelist":false,"attachment":{"hash":"0898be28f7290da5c6273dfad054616ae1855f6aa5901d7922a67344d09f7763","size":1723,"filename":"RMqGtQ81XY6e9YblNqPQsG-I-Vl4drli249zNcNSNG8=.pem","location":"security-state-staging/intermediates/9634597d-175a-49aa-8c22-d757966db0e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"RMqGtQ81XY6e9YblNqPQsG+I+Vl4drli249zNcNSNG8=","crlite_enrolled":false,"id":"6b1ed47e-c61a-4822-abd2-60fe59426945","last_modified":1562024624251},{"schema":1562024622714,"derHash":"ERAGN4r76OmbsCuoc5DKQp/KJ3P3TX9+tXRPXd9oAUs=","subject":"CN=COMODO RSA Organization Validation Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGWMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE8MDoGA1UEAxMzQ09NT0RPIFJTQSBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"392b7ffb2a6d72092399d66449152de878985c5738c191f6ef26addba3d8eb50","size":2158,"filename":"EgNpQklEUNXn9Nl6RoIOC532j1g5-EFw0ZpLxxJq9Ms=.pem","location":"security-state-staging/intermediates/c80aa8eb-6981-4908-8d72-212d3bd441de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EgNpQklEUNXn9Nl6RoIOC532j1g5+EFw0ZpLxxJq9Ms=","crlite_enrolled":true,"id":"a6d34d17-e949-4454-abaa-0a9d4b0491c3","last_modified":1562024623466},{"schema":1562024621218,"derHash":"TywMFwG94Btr7tptF8M2BCQhr3MRcGM0f36Xt2rYl/U=","subject":"CN=GlobalSSL Secure E-Mail and Client Authentication CA,O=GlobalSSL,C=DE","subjectDN":"MGAxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlHbG9iYWxTU0wxPTA7BgNVBAMTNEdsb2JhbFNTTCBTZWN1cmUgRS1NYWlsIGFuZCBDbGllbnQgQXV0aGVudGljYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"b2019acf4321d57d1f4034c278f7761779e2fc130bbf2ca87aabbe5a7047c614","size":1760,"filename":"rvxRPOOErynHJj6lYghacyWHWiAPuUDhnQ7bzVQe7nA=.pem","location":"security-state-staging/intermediates/877ea40c-279d-4cd8-b03b-99944b427bcb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rvxRPOOErynHJj6lYghacyWHWiAPuUDhnQ7bzVQe7nA=","crlite_enrolled":false,"id":"f9c9ddb7-531e-4937-a263-83d2c27d3642","last_modified":1562024621953},{"schema":1562024619702,"derHash":"EMP0Dpu+F7SPCzx8IpyrCiCHH86+zMz2orsyDwYAxV0=","subject":"CN=GENIOUS ECC Domain Validation Secure Server CA,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA","subjectDN":"MIGPMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxNzA1BgNVBAMTLkdFTklPVVMgRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"f3a06e4e586746c718894b7aa2c2e9bd671253ab6b338d4df2627f4a2d14d8d7","size":1337,"filename":"1cqz0JJYdVUqvZUaW4P8qx8yIL49CzeX5G4oCYvH4Rk=.pem","location":"security-state-staging/intermediates/1a177cfa-33d9-4c35-9cdd-4a73c7973fc6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1cqz0JJYdVUqvZUaW4P8qx8yIL49CzeX5G4oCYvH4Rk=","crlite_enrolled":false,"id":"7c266e3a-9521-4d0f-9d73-3c71c87172f8","last_modified":1562024620466},{"schema":1562024618939,"derHash":"5z8fGaRFmmBnpF6E21hdbB348SpznXM/WyiZZUbxh1o=","subject":"CN=EID-SK 2016,O=AS Sertifitseerimiskeskus,C=EE","subjectDN":"MGAxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRcwFQYDVQRhDA5OVFJFRS0xMDc0NzAxMzEUMBIGA1UEAwwLRUlELVNLIDIwMTY=","whitelist":false,"attachment":{"hash":"d1877d7e7d6896cdc30b2a96d22c25da8e88a3850982a8200030af501da20c0d","size":2446,"filename":"WjtwJIwch5NRyJIrp2ugEDPftPNWvNEABHOUTFt-3Ts=.pem","location":"security-state-staging/intermediates/7aa7841a-915a-45b2-ac5b-777c1b425ffa.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WjtwJIwch5NRyJIrp2ugEDPftPNWvNEABHOUTFt+3Ts=","crlite_enrolled":false,"id":"77f687a7-202f-4434-8803-51beb26f0c1e","last_modified":1562024619694},{"schema":1562024617416,"derHash":"HnLYPtlJnLpoaWhFK+WRxIgW7JGBORpdA8H007oWWNw=","subject":"CN=Inland Empire Health Information Exchange,OU=Inland Empire Health Information Exchange,O=Inland Empire EHR Resource Center,C=US","subjectDN":"MIGhMQswCQYDVQQGEwJVUzEqMCgGA1UEChMhSW5sYW5kIEVtcGlyZSBFSFIgUmVzb3VyY2UgQ2VudGVyMTIwMAYDVQQLEylJbmxhbmQgRW1waXJlIEhlYWx0aCBJbmZvcm1hdGlvbiBFeGNoYW5nZTEyMDAGA1UEAxMpSW5sYW5kIEVtcGlyZSBIZWFsdGggSW5mb3JtYXRpb24gRXhjaGFuZ2U=","whitelist":false,"attachment":{"hash":"56a96226dc0a4ebcd492c2ba0a04368f7c5f5189a22e885261c55391d2562b9a","size":2333,"filename":"q6gCaPEu6hA3-78YqCU97RQxanv-hMImmAKou_5S3gk=.pem","location":"security-state-staging/intermediates/b63f11e8-55f8-4280-920f-f5c9455fdaef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"q6gCaPEu6hA3+78YqCU97RQxanv+hMImmAKou/5S3gk=","crlite_enrolled":false,"id":"38ae9eda-30d4-49fa-9452-56249cf4e96f","last_modified":1562024618180},{"schema":1562024616673,"derHash":"jMNOEcFnBFgkreYcSQemRA7bLEOY6ZwRKoWdZh+OK8c=","subject":"CN=GeoTrust RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IFJTQSBDQSAyMDE4","whitelist":false,"attachment":{"hash":"a013c9348417f4076dc717cab4baf557d42e0c77d49f5a42c13f09fafee4a167","size":1634,"filename":"zUIraRNo-4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=.pem","location":"security-state-staging/intermediates/be8a1d98-433a-4bf6-941e-c31bcf350d57.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zUIraRNo+4JoAYA7ROeWjARtIoN4rIEbCpfCRQT6N6A=","crlite_enrolled":true,"id":"5fa2fd0c-5f29-4a58-ab51-5fee7d3956b4","last_modified":1562024617409},{"schema":1562024615906,"derHash":"qyyT4BzCFYB/BM2/w2KAjYiUCnss7nAjjTVtjZSVbfk=","subject":"CN=COMODO RSA Extended Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGUMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE6MDgGA1UEAxMxQ09NT0RPIFJTQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"c9ffc8c4cf8f0c1b8f57788dbb13ef5542a34da4b3a7f581d414769ea5f86cde","size":2207,"filename":"_KV5PqHI-A-AHDl7BRjU7Yfi8xL4XtBw8FQAx1HWgH4=.pem","location":"security-state-staging/intermediates/0741c886-1069-4fed-ba52-8aa03fd43e8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/KV5PqHI+A+AHDl7BRjU7Yfi8xL4XtBw8FQAx1HWgH4=","crlite_enrolled":false,"id":"9d095dee-9b79-4c70-bbe1-b0414439ac0d","last_modified":1562024616665},{"schema":1562024612891,"derHash":"CBmY09n35M2dpqQpRwv11EKAMlJE+g4B7l+XLKGfSFI=","subject":"CN=D-TRUST CA 2-1 2015,O=D-Trust GmbH,L=Berlin,C=DE","subjectDN":"MFMxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHEwZCZXJsaW4xFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEcMBoGA1UEAxMTRC1UUlVTVCBDQSAyLTEgMjAxNQ==","whitelist":false,"attachment":{"hash":"3ee88758fbc42936cdbaed638d306033285f883f6fc602279794d4d88452d2fd","size":2064,"filename":"tBmQRPuFevsHIbhhN0kSgAJhEeKQhFq-DxUdV4m8qjA=.pem","location":"security-state-staging/intermediates/ec9f953f-facc-41f4-b5d0-2c6a1e31915a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tBmQRPuFevsHIbhhN0kSgAJhEeKQhFq+DxUdV4m8qjA=","crlite_enrolled":false,"id":"eaf29e12-56d5-477b-8328-1ce42f6733c7","last_modified":1562024613656},{"schema":1562024612131,"derHash":"QuDAWgD8Lkc9jQdu+0SnAXzv+/YEBisWrLZE7q4e//w=","subject":"CN=GoGetSSL RSA Client CA,O=GoGetSSL,L=Riga,C=LV","subjectDN":"MFAxCzAJBgNVBAYTAkxWMQ0wCwYDVQQHEwRSaWdhMREwDwYDVQQKEwhHb0dldFNTTDEfMB0GA1UEAxMWR29HZXRTU0wgUlNBIENsaWVudCBDQQ==","whitelist":false,"attachment":{"hash":"2beb77fd6eea7febde47fc783ed0bf34a16601fd477256a11c28da821d02c17e","size":2077,"filename":"AZIBKLEh9RhLmf8irgJ9nlzVJAU1ySO6mTPIPOHqRuY=.pem","location":"security-state-staging/intermediates/55adcf08-23d6-4397-bed3-bd2a8d244e6f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AZIBKLEh9RhLmf8irgJ9nlzVJAU1ySO6mTPIPOHqRuY=","crlite_enrolled":false,"id":"d2998b45-cbc9-462d-b3c6-e56dda5c943b","last_modified":1562024612884},{"schema":1562024001225,"derHash":"mQI8Yjbaexn/sUgzuCDZIGOTi4/OE2kMY8TAS2V/qy0=","subject":"SERIALNUMBER=PT507015851,CN=DIGITALSIGN QUALIFIED CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGyMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxITAfBgNVBAMTGERJR0lUQUxTSUdOIFFVQUxJRklFRCBDQQ==","whitelist":false,"attachment":{"hash":"b675985300d025f65fe9827dec53d33102a6f925454c266cf8c101e39ca1f3a1","size":3007,"filename":"XnyavelRFrecWitFpdKCH6tt4uvYXn4uWw85BpJFc8Q=.pem","location":"security-state-staging/intermediates/c244d547-6237-434a-b7ea-3dfbab9f0c2d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XnyavelRFrecWitFpdKCH6tt4uvYXn4uWw85BpJFc8Q=","crlite_enrolled":false,"id":"3691181e-ad54-44dd-b4b5-442c1cea58d0","last_modified":1562024612123},{"schema":1562023998218,"derHash":"g/bwF8JTbXRUt7mEhnTzZAEpz1Vd0H2D02KhfIG3Ul8=","subject":"SERIALNUMBER=A62634068,CN=AC Firmaprofesional - AAPP,OU=Certificados Digitales para la Administracion Publica,O=Firmaprofesional SA,C=ES","subjectDN":"MIGkMQswCQYDVQQGEwJFUzEcMBoGA1UEChMTRmlybWFwcm9mZXNpb25hbCBTQTE+MDwGA1UECxM1Q2VydGlmaWNhZG9zIERpZ2l0YWxlcyBwYXJhIGxhIEFkbWluaXN0cmFjaW9uIFB1YmxpY2ExEjAQBgNVBAUTCUE2MjYzNDA2ODEjMCEGA1UEAxMaQUMgRmlybWFwcm9mZXNpb25hbCAtIEFBUFA=","whitelist":false,"attachment":{"hash":"b98bc5a31792d37a50d2b260b8ed96c230e3529f2d97f627c3072c493daca57e","size":2381,"filename":"hLz0sJLVz-CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=.pem","location":"security-state-staging/intermediates/ac3a8a6e-7ab4-4f2b-9899-75eafdb945b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hLz0sJLVz+CYXLdvw4BHmbCD3Gt3C5gAep7ycaEAChw=","crlite_enrolled":false,"id":"8f582949-0077-4497-9855-078b473ca565","last_modified":1562023998962},{"schema":1562023997464,"derHash":"t3h0inkrj5HwSwG6/DGjHtfvanEq/4C2YQ2are4get8=","subject":"CN=GlobalSign PersonalSign 2 CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYDVQQDEypHbG9iYWxTaWduIFBlcnNvbmFsU2lnbiAyIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"55ef97771e1a5db3bed9a55930e18bfa8c515f42eed6a6898d2b9fe5be13bf50","size":1760,"filename":"moVGXeLu33Z1sQyVonZDRMiCGiG4C1YXJPZjuqaf0vE=.pem","location":"security-state-staging/intermediates/04ad1207-747d-4bbc-aec8-534ace9d0ce2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"moVGXeLu33Z1sQyVonZDRMiCGiG4C1YXJPZjuqaf0vE=","crlite_enrolled":true,"id":"b37f92b2-240f-4970-87fb-063ff1d871ed","last_modified":1562023998206},{"schema":1562023995947,"derHash":"eILZ+qSai7NR8Pxu1oXvH8UVQdDOCkIiB00dnhb9wws=","subject":"CN=TrustCor External PKI (ECA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGGMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxJTAjBgNVBAMMHFRydXN0Q29yIEV4dGVybmFsIFBLSSAoRUNBMSk=","whitelist":false,"attachment":{"hash":"f8c6a9c5a539d228e33a4f7d992ac66e08c7b640cc56f5001fc6d112058b9557","size":1841,"filename":"r8bpcGxaP_Y16yqulxob7gpE3Q_rlYtNW1KdjRa2f1s=.pem","location":"security-state-staging/intermediates/2bf859ab-2a88-4ff7-af17-307ea95d877a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"r8bpcGxaP/Y16yqulxob7gpE3Q/rlYtNW1KdjRa2f1s=","crlite_enrolled":true,"id":"9284e1ce-82d9-41fe-905b-061a3bc6e3f9","last_modified":1562023996685},{"schema":1562023992214,"derHash":"bGa3bmjWx5+v5clOm30M91PHFcyFOH4RMjt5NfhhwYc=","subject":"CN=Symantec Class 3 EV SSL CA - G2,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MHcxCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UEAxMfU3ltYW50ZWMgQ2xhc3MgMyBFViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"5a78e0580a5b4a406494a8640e18f7ea3ff821f8be3f9b0ee6a91001569a7da2","size":1853,"filename":"9vTUviB31wX_C0Yzx-HkTZxJmAcqoWvp_aPTgD-kyr8=.pem","location":"security-state-staging/intermediates/0135fea2-a052-473e-8cb6-2b987f16c6ef.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9vTUviB31wX/C0Yzx+HkTZxJmAcqoWvp/aPTgD+kyr8=","crlite_enrolled":false,"id":"fbb73ec4-342b-4aa9-9df7-3ca9f646f690","last_modified":1562023992953},{"schema":1562023989959,"derHash":"H5NmbaV+HuQ7Gec2f3IlFR1EqWZxhDrWJiKI20qoA3c=","subject":"CN=FujiSSL SHA2 Business Secure Site CA,O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHcxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xLTArBgNVBAMTJEZ1amlTU0wgU0hBMiBCdXNpbmVzcyBTZWN1cmUgU2l0ZSBDQQ==","whitelist":false,"attachment":{"hash":"482afe899c6f0d8f22e431adaae4099bcc9ca90c82b6bbf311ea220ad7be3fbc","size":2142,"filename":"AapugBjS_xPRoLxwSH9ER41rNad1oyfyVH7OwZcxPkY=.pem","location":"security-state-staging/intermediates/eb5a1c32-ead7-49e1-a96f-02cc6acc3d51.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"AapugBjS/xPRoLxwSH9ER41rNad1oyfyVH7OwZcxPkY=","crlite_enrolled":true,"id":"b25cf132-6ed5-42dd-95be-9a1049d9494f","last_modified":1562023990717},{"schema":1562023989217,"derHash":"oNFSOgv2Y1UOuQgem93toSgU+VcLdpfZXfLqU9T/deM=","subject":"CN=RapidSSL ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFFJhcGlkU1NMIEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"ee5666095b0adbea4d0fc0e22f86c954e59f68c2eb5a347a7c6c3eaf8db0a25f","size":1410,"filename":"zJax49jXNWVm12ouj-dVmlW_r0Zw4NbjfsoCxV3-blM=.pem","location":"security-state-staging/intermediates/79d47d47-5626-42ac-99ee-cfbdac6397b1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zJax49jXNWVm12ouj+dVmlW/r0Zw4NbjfsoCxV3+blM=","crlite_enrolled":true,"id":"763411e1-8114-46f4-8c40-92fecd1f7cc4","last_modified":1562023989952},{"schema":1562023988478,"derHash":"83b25b9mD2vtt2jc0TA+rdSpby7XqXcX6Hj65rtZWfo=","subject":"CN=thawte EV Code Signing CA,O=thawte\\, Inc.,C=US","subjectDN":"MEgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xIjAgBgNVBAMTGXRoYXd0ZSBFViBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"9f1b61ed157098a541e167d69899a6e220062c8853f21e51e158779d17889570","size":1792,"filename":"iHlBWPUQuLqy-fke8htnHN-RscOd6sowyaclmFVQdC8=.pem","location":"security-state-staging/intermediates/e9705c73-c0fc-4403-9fbc-82eb39aac338.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"iHlBWPUQuLqy+fke8htnHN+RscOd6sowyaclmFVQdC8=","crlite_enrolled":false,"id":"4cdf6681-6886-48ea-a0fa-e4c2dddbb9de","last_modified":1562023989209},{"schema":1562023987725,"derHash":"Q2/tMIldbH8NbcCdtiGrO4jsYyHFbKb9SdeYEeKlmMo=","subject":"CN=TBS X509 CA business 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGBMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR8wHQYDVQQDExZUQlMgWDUwOSBDQSBidXNpbmVzcyAy","whitelist":false,"attachment":{"hash":"10ac6fea486a331fa522b3ef2a2198adfa12ebeac4d525146320a9a4dc9c4ac0","size":2154,"filename":"SSBQnpJB4S4xChF_ht4nYT6NSI2ORtzmPESVfewnepc=.pem","location":"security-state-staging/intermediates/ec1f383e-adad-4dea-b81f-b702db7ee117.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SSBQnpJB4S4xChF/ht4nYT6NSI2ORtzmPESVfewnepc=","crlite_enrolled":true,"id":"9ddcb45e-54b3-4bf4-979b-25e170de22f3","last_modified":1562023988470},{"schema":1562023986956,"derHash":"ZjpOZY+790/BmwFV8vrLEsybaXBY9EfveRF4/puNBz0=","subject":"CN=Trustico RSA EV CA,OU=Controlled by COMODO exclusively for The Trustico Group Ltd,O=The Trustico Group Ltd,L=Croydon,ST=London,C=GB","subjectDN":"MIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMRAwDgYDVQQHEwdDcm95ZG9uMR8wHQYDVQQKExZUaGUgVHJ1c3RpY28gR3JvdXAgTHRkMUQwQgYDVQQLEztDb250cm9sbGVkIGJ5IENPTU9ETyBleGNsdXNpdmVseSBmb3IgVGhlIFRydXN0aWNvIEdyb3VwIEx0ZDEbMBkGA1UEAxMSVHJ1c3RpY28gUlNBIEVWIENB","whitelist":false,"attachment":{"hash":"eee3863ef1b6090102296c0bb3ae3aaa94c133aa41d948886a83f0d998f0ab01","size":2247,"filename":"KwL2fukG72afNxr2mfIc-zRSfV9FvVkQd67wLyLhGLY=.pem","location":"security-state-staging/intermediates/9063beaf-04d5-4fc4-9fe6-18bd29f50ff9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KwL2fukG72afNxr2mfIc+zRSfV9FvVkQd67wLyLhGLY=","crlite_enrolled":true,"id":"720c9041-549b-4132-9f95-9f7f40057140","last_modified":1562023987718},{"schema":1562023985472,"derHash":"Abnz0I4xqejhYA0RjCq/2FaHXqYIJwIEaYZbokLuvhw=","subject":"CN=KIT-CA,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE","subjectDN":"MHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcMCUthcmxzcnVoZTEqMCgGA1UECgwhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MQ8wDQYDVQQDDAZLSVQtQ0E=","whitelist":false,"attachment":{"hash":"57d86dbb18c2e8959844b08e15275c9f4e998e6bdecb15b2b7a77730e1c220a5","size":2008,"filename":"DvZiVD0jtzGADZxUQnbhnHsFjD8JVapxjCjP6aLBeoY=.pem","location":"security-state-staging/intermediates/5e91cd24-d2d6-4885-96ae-f41fd7f2fa91.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DvZiVD0jtzGADZxUQnbhnHsFjD8JVapxjCjP6aLBeoY=","crlite_enrolled":true,"id":"3131956b-39c5-40b6-93ef-b46c278f30de","last_modified":1562023986203},{"schema":1562023980906,"derHash":"y64nZ+6M1/tJtmK0Ivch20Ui62dM2/FstiCeRcxMuZ4=","subject":"CN=DigiCert Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkRpZ2lDZXJ0IENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"b9fa0a6f524e0d4ba96ac6f144f478c2eb0b8b3e26130eff45513a544d53f51a","size":1122,"filename":"zEmSNnW6fJ5Iqjj7nFju1Oo-THW233SD1mcA_AYTsIQ=.pem","location":"security-state-staging/intermediates/c1f0a12d-cef9-4764-926e-63bc50c9dc83.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"zEmSNnW6fJ5Iqjj7nFju1Oo+THW233SD1mcA/AYTsIQ=","crlite_enrolled":false,"id":"4cd2d258-9f4c-4594-8f6f-ffd1ffda2a7e","last_modified":1562023981651},{"schema":1562023979410,"derHash":"Vtpu/vHVBBNMcu7cOuRKp/oRuEiCDb+qhsqONdYO2wQ=","subject":"CN=FujiSSL Public Validation Authority - G3,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MGcxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTEwLwYDVQQDEyhGdWppU1NMIFB1YmxpYyBWYWxpZGF0aW9uIEF1dGhvcml0eSAtIEcz","whitelist":false,"attachment":{"hash":"bbb89301ab3ea4fd79d1448f5c852927551328811eee186c33c831d20d5e0ae0","size":1674,"filename":"dzjq2willdWoAe9M1lz4AuLGmmFYgxAD2zYIXMhbzjo=.pem","location":"security-state-staging/intermediates/f2374571-0b80-42e0-8883-fda71075451e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dzjq2willdWoAe9M1lz4AuLGmmFYgxAD2zYIXMhbzjo=","crlite_enrolled":true,"id":"77918a2e-3fdb-4dcf-8e32-cbe1b39f74f4","last_modified":1562023980153},{"schema":1562023978668,"derHash":"g4aYGG3Qb45zbDnK+95k5C1Yq6Y2zirZ3/jRhV6peQo=","subject":"SERIALNUMBER=201901,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTAx","whitelist":false,"attachment":{"hash":"84159d3c932465ae7a84a6ccf35cde1f35966c191eeea2c094ac2d5ee1eac878","size":2333,"filename":"1CTr2EMZuVrTNlxyZgkW5swxcLs2mFupZgcP-OxRDww=.pem","location":"security-state-staging/intermediates/09b4f348-2689-46a4-8c8c-7f747f843a72.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1CTr2EMZuVrTNlxyZgkW5swxcLs2mFupZgcP+OxRDww=","crlite_enrolled":false,"id":"dfa4b7da-e066-4c3e-baff-3786a59cfc48","last_modified":1562023979402},{"schema":1562023977920,"derHash":"BS8CbB5i5pekeRPgfOJN6DyIG/MAo8wkzAydRuyCR7s=","subject":"CN=TBS X509 CA pro hosting 2,OU=TBS INTERNET CA,O=TBS INTERNET,L=Caen,ST=Calvados,C=FR","subjectDN":"MIGEMQswCQYDVQQGEwJGUjERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNVBAcTBENhZW4xFTATBgNVBAoTDFRCUyBJTlRFUk5FVDEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMSIwIAYDVQQDExlUQlMgWDUwOSBDQSBwcm8gaG9zdGluZyAy","whitelist":false,"attachment":{"hash":"993599686a8894c81c679246e879ef9412dfdb43d1397ad6267c2c8fed59290d","size":2162,"filename":"XVLXL83TODHCORI1qq2fNoRUOUkHLj4GCQZqTjJ6v8Q=.pem","location":"security-state-staging/intermediates/c78d6da1-ce01-48ea-a32a-17541a01fbfe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XVLXL83TODHCORI1qq2fNoRUOUkHLj4GCQZqTjJ6v8Q=","crlite_enrolled":true,"id":"8599ae99-290a-4ccb-9b99-261d95b6f43f","last_modified":1562023978660},{"schema":1562023977173,"derHash":"3Ist7lDdR4qxNcrCac6miFFVepEpq82Y31ITsj2/s80=","subject":"CN=QuoVadis Europe SSL CA G1,O=QuoVadis Trustlink BVBA,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMSAwHgYDVQQKExdRdW9WYWRpcyBUcnVzdGxpbmsgQlZCQTEiMCAGA1UEAxMZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMQ==","whitelist":false,"attachment":{"hash":"871e25e4b9ca85246a4b37ec76971395d8cc080cda844fd7e9419affa5171af1","size":2308,"filename":"k3XnEYQCK79AtL9GYnT_nyhsabas03V-bhRQYHQbpXU=.pem","location":"security-state-staging/intermediates/84a519a2-7323-495a-8f7c-1fb9364bc534.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"k3XnEYQCK79AtL9GYnT/nyhsabas03V+bhRQYHQbpXU=","crlite_enrolled":true,"id":"3413fc51-a47b-4ef2-ba0b-c5c737f0aa91","last_modified":1562023977912},{"schema":1562023976406,"derHash":"XbHSLXBmhPBxnokC+4azRrP8nk0aH5IoOkiLw9GgSEs=","subject":"CN=KPN PKIoverheid EV CA,O=KPN B.V.,C=NL","subjectDN":"MEAxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEeMBwGA1UEAwwVS1BOIFBLSW92ZXJoZWlkIEVWIENB","whitelist":false,"attachment":{"hash":"3223a6f20d3bcb5d806c34644dc513be43f488b74f0a98a8bd87b2f973f3e5e1","size":2398,"filename":"I3seYPBcqTLCDRX732wxVtBaCAQOzNasd4KqO6a0mHk=.pem","location":"security-state-staging/intermediates/e35603f8-d7e3-4a6f-9359-4ce261a49d75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I3seYPBcqTLCDRX732wxVtBaCAQOzNasd4KqO6a0mHk=","crlite_enrolled":true,"id":"574422ec-9c83-49c3-af28-f0b84daaad6f","last_modified":1562023977164},{"schema":1562023974115,"derHash":"TY60k4Dscqyf3yH+HG2y6UkMdr6t0fe1KMPM0nLI/ig=","subject":"CN=GlobalSign TSA CA for AATL,O=GlobalSign nv-sa,C=BE","subjectDN":"ME0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSMwIQYDVQQDExpHbG9iYWxTaWduIFRTQSBDQSBmb3IgQUFUTA==","whitelist":false,"attachment":{"hash":"b66664c300d9d856dd6eef13fa063334f34d358466c922d8c47b40ad0c0b0e44","size":2024,"filename":"49lIjSAnHwOuVWuOR-RTuElzQhgXaCC3y9iz_nrQN2I=.pem","location":"security-state-staging/intermediates/a857ed41-1550-4d26-8db7-818835c03d40.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"49lIjSAnHwOuVWuOR+RTuElzQhgXaCC3y9iz/nrQN2I=","crlite_enrolled":false,"id":"e77711f5-130c-4fb9-ba65-f13cf7fe4e7a","last_modified":1562023974847},{"schema":1562023971865,"derHash":"ziMyOQIIdCoaymUTl0xMnbJpHq9FaLUz5KF+1d2pc+Y=","subject":"CN=QuoVadis PKIoverheid Organisatie Server CA - G3,O=QuoVadis Trustlink B.V.,C=NL","subjectDN":"MIGCMQswCQYDVQQGEwJOTDEgMB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xFzAVBgNVBGEMDk5UUk5MLTMwMjM3NDU5MTgwNgYDVQQDDC9RdW9WYWRpcyBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBTZXJ2ZXIgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"9525b72d3221be1b9347991e7b0d27ed63304244a37e568e02a881198dd0e180","size":2625,"filename":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=.pem","location":"security-state-staging/intermediates/911f64d6-2761-4b8b-af66-93fe6683dfd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0RDPmiZ5chLjLl0zHCAarPh4229A9O3S02zEXEMOZL4=","crlite_enrolled":true,"id":"1334321a-2837-4638-a78c-39d8abf02ec7","last_modified":1562023972605},{"schema":1562023971111,"derHash":"JbZjkN1CWGfsDeWKaxmPWYW+WKQ6RgXhoLjG81uS1+4=","subject":"CN=DigiCert Transition Issuing CA G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSowKAYDVQQDEyFEaWdpQ2VydCBUcmFuc2l0aW9uIElzc3VpbmcgQ0EgRzM=","whitelist":false,"attachment":{"hash":"3db9cade05807e7d695419e46f030bf8947492fa115aa4f663b14352e0c42ac5","size":1666,"filename":"vWZ6uLUEEYECEjKFJEMsz_6EwAfw1zYwbvVxr4xS6Jg=.pem","location":"security-state-staging/intermediates/a9d455c2-351f-466e-86bd-080e8839a158.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vWZ6uLUEEYECEjKFJEMsz/6EwAfw1zYwbvVxr4xS6Jg=","crlite_enrolled":false,"id":"204c48d8-5783-4bf9-b862-a37638c87cd4","last_modified":1562023971857},{"schema":1562023970347,"derHash":"CSIy5d8b+Ly/7Rr02R81U/JWYYTgky5L6vcdFqWa1sg=","subject":"SERIALNUMBER=201729,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxNzI5","whitelist":false,"attachment":{"hash":"07d0f80c6b777643e464217a9b873097b3f26ba8bc375ca90b6908c3d7bcc0df","size":2402,"filename":"NcK6oyN11YK2iroVd4M8_YvV2-gLKHeDevPGXmnoWlk=.pem","location":"security-state-staging/intermediates/58253a8a-2a3d-4341-ad75-d94d0251c68c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NcK6oyN11YK2iroVd4M8/YvV2+gLKHeDevPGXmnoWlk=","crlite_enrolled":false,"id":"77d3b8ac-c30b-4922-ab9c-caf13765cb69","last_modified":1562023971104},{"schema":1562023969605,"derHash":"kfSGCmh2DlX08hWEeOZ/lYvWN7fA+2CT6ekE36RqwzQ=","subject":"CN=Intertek Document Signing Authority,O=Intertek Group plc,C=GB","subjectDN":"MFgxCzAJBgNVBAYTAkdCMRswGQYDVQQKExJJbnRlcnRlayBHcm91cCBwbGMxLDAqBgNVBAMTI0ludGVydGVrIERvY3VtZW50IFNpZ25pbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"19af2bba948c39703d8d3595df8354c3acc80e9e5a764f484112a95dc145a505","size":1938,"filename":"YHxb7yqXsZo593tQi7lml-UbIYBZ-nRncrwmyt7z_jU=.pem","location":"security-state-staging/intermediates/3d7ae7b9-a9e4-46bd-99ae-9325d76b8bda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YHxb7yqXsZo593tQi7lml+UbIYBZ+nRncrwmyt7z/jU=","crlite_enrolled":false,"id":"aa97eece-537e-4d3c-8f70-b629fb852344","last_modified":1562023970339},{"schema":1562023968860,"derHash":"428WX/dznNkAolYnZ7Pq++Z6NMg8OoL0wh1fUcPtGR4=","subject":"CN=WoTrus DV Server CA,OU=Controlled by Sectigo exclusively for WoTrus CA Limited,O=WoTrus CA Limited,L=Shenzhen,ST=Guangdong,C=CN","subjectDN":"MIGwMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdkb25nMREwDwYDVQQHEwhTaGVuemhlbjEaMBgGA1UEChMRV29UcnVzIENBIExpbWl0ZWQxQDA+BgNVBAsTN0NvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgV29UcnVzIENBIExpbWl0ZWQxHDAaBgNVBAMTE1dvVHJ1cyBEViBTZXJ2ZXIgQ0E=","whitelist":false,"attachment":{"hash":"ad4c5148267048017f28179ac20a4ea5bfdb82d16c59f8f2a51e279ab002cf1e","size":2203,"filename":"BhCtKhlg16YgpKtkvEyMb10W4rnVIagCz4ZLBicH1aQ=.pem","location":"security-state-staging/intermediates/1293d917-4168-4c3c-89cd-afa2186222ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BhCtKhlg16YgpKtkvEyMb10W4rnVIagCz4ZLBicH1aQ=","crlite_enrolled":false,"id":"324811d1-4f0b-4ec9-8ed5-314d562ded2c","last_modified":1562023969598},{"schema":1562023965880,"derHash":"jLMkgs2vON1o4yKrm0Q053ORDzOy9W+AItUVYghGVBc=","subject":"CN=SSL.com EV Code Signing Intermediate CA ECC R2,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MHsxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjERMA8GA1UECgwIU1NMIENvcnAxNzA1BgNVBAMMLlNTTC5jb20gRVYgQ29kZSBTaWduaW5nIEludGVybWVkaWF0ZSBDQSBFQ0MgUjI=","whitelist":false,"attachment":{"hash":"188db821b5f6a15b8ce89543363312e52cf935460178da5aef5d0ab64099ddec","size":1276,"filename":"weV6wI2oYtFTmDbezTHq8MAYi-4aJnVykEP6-ixWceA=.pem","location":"security-state-staging/intermediates/170e0ef4-125c-4da5-85a5-f176eaed09fd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"weV6wI2oYtFTmDbezTHq8MAYi+4aJnVykEP6+ixWceA=","crlite_enrolled":false,"id":"0163c88a-9ef4-4162-9ca4-17556a156a94","last_modified":1562023966614},{"schema":1562023961331,"derHash":"EUdT6I0ADnWZYVqZB+Jrc7bYUTF/8rJ6yp24/FBWkqc=","subject":"CN=E-Tugra Organization Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIG1MQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxKjAoBgNVBAMMIUUtVHVncmEgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBDQQ==","whitelist":false,"attachment":{"hash":"c20540a909d14bde73c51dde53da2ff3fea4d75a0c875924065198ab7de00da3","size":2304,"filename":"2C9V2-VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=.pem","location":"security-state-staging/intermediates/375b6c2a-70ea-49da-8638-9e7de1fc7e9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2C9V2+VZ5v93wYg0HupOPel5wBqM8YEDtTLQWSkHjis=","crlite_enrolled":true,"id":"14fdc6a9-ae04-401c-9371-d01b4bbb58b9","last_modified":1562023962077},{"schema":1562023959068,"derHash":"6DVm5vWZSBZ4wNmYkhach/d5FMYh/fHmWccIV3LUpIc=","subject":"CN=Aristotle University of Thessaloniki Central CA R5,O=Aristotle University of Thessaloniki,C=GR","subjectDN":"MHkxCzAJBgNVBAYTAkdSMS0wKwYDVQQKDCRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fsb25pa2kxOzA5BgNVBAMMMkFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraSBDZW50cmFsIENBIFI1","whitelist":false,"attachment":{"hash":"f877b8c5582fb9b976cbb608c45d7c53f404146e9e3ee07dd3debe10f13b2c90","size":2186,"filename":"ZJk1YGaQpyFBeYVERrAwWxnil7BDdshNsfqH9K0pdvo=.pem","location":"security-state-staging/intermediates/161bd307-4be8-4e31-b933-2e65f5bcb068.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZJk1YGaQpyFBeYVERrAwWxnil7BDdshNsfqH9K0pdvo=","crlite_enrolled":true,"id":"7fd49ce7-75fa-47b3-85d9-7a6cb059c9f9","last_modified":1562023959799},{"schema":1562023958320,"derHash":"L9Qqlsgw/SxVKywnZg7ukwfYRwbem3XPOa51DrIhue4=","subject":"CN=COMODO ECC Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSMwIQYDVQQDExpDT01PRE8gRUNDIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"ad1f4bf9e94339cc0664891d79fb8cf7ded16cf12929ccc6122ce1a2c2ccddbc","size":1256,"filename":"jBwB7HG5X1XDblx25nsCjVULW3dw9vJXmqth06gcMAw=.pem","location":"security-state-staging/intermediates/2694c0d7-dac9-4e5f-a10a-2c02e92f7442.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jBwB7HG5X1XDblx25nsCjVULW3dw9vJXmqth06gcMAw=","crlite_enrolled":false,"id":"59606746-4b04-433d-be2b-fe782421a43c","last_modified":1562023959061},{"schema":1562023956056,"derHash":"j9p6iBNUb5p8sGXNMtNlDVtWorf5QrlJmutCqGo+nVY=","subject":"CN=Volusion\\, Inc. DV SSL CA,OU=Domain Validated SSL,O=Volusion\\, Inc.,C=US","subjectDN":"MGgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Wb2x1c2lvbiwgSW5jLjEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFZvbHVzaW9uLCBJbmMuIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"6b16f64a748628562ece61ff4693d637b4798e23d8849bb6e47281bd75358aa8","size":1447,"filename":"5zFyfNsHCq6F08mNF-IWy_ZJ7qypkZPj-t1dA4DZi4E=.pem","location":"security-state-staging/intermediates/c96d8299-16b6-4c87-9985-df5013adb3e5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5zFyfNsHCq6F08mNF+IWy/ZJ7qypkZPj+t1dA4DZi4E=","crlite_enrolled":false,"id":"ae81bf57-add1-4988-8063-af83aaa1406d","last_modified":1562023956793},{"schema":1562023955312,"derHash":"6ppDUV4Tj/d4L8rNucfo4aYc/R0XCW7V3dH0ANArA/U=","subject":"CN=certSIGN SSL DV CA Class 3 G2,OU=certSIGN SSL DV CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHAxCzAJBgNVBAYTAlJPMREwDwYDVQQKDAhjZXJ0U0lHTjEmMCQGA1UECwwdY2VydFNJR04gU1NMIERWIENBIENsYXNzIDMgRzIxJjAkBgNVBAMMHWNlcnRTSUdOIFNTTCBEViBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"27c0349500f0a3bb1a05e55a47d5c9fb8216d028bb4be566fb5acd95419f5850","size":1626,"filename":"FZ9KA10aaA0Pq9Q4xOxYK99jgxb3tQy47R4dIFgxFUo=.pem","location":"security-state-staging/intermediates/24cf3b35-2f29-40e6-9bca-d871a307ae78.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZ9KA10aaA0Pq9Q4xOxYK99jgxb3tQy47R4dIFgxFUo=","crlite_enrolled":true,"id":"d4028f7a-433e-4118-9af5-f556af86871c","last_modified":1562023956048},{"schema":1562023953811,"derHash":"ChpSIfON1Fg2eiDVJ9sYgAgqzO72moVG+2fTAlP5CCQ=","subject":"CN=Atos TrustedRoot CodeSigning-CA 2013,O=Atos,C=DE","subjectDN":"MEsxLTArBgNVBAMMJEF0b3MgVHJ1c3RlZFJvb3QgQ29kZVNpZ25pbmctQ0EgMjAxMzENMAsGA1UECgwEQXRvczELMAkGA1UEBhMCREU=","whitelist":false,"attachment":{"hash":"1fe6385ba0486b50631ee6ded9d813fe00c7b69915bb5ff98811bac7db2a494a","size":1565,"filename":"pxAruQtiJ4aLD27HqNd4qfvv07MUns2jaoeSYYi6OrQ=.pem","location":"security-state-staging/intermediates/54d610af-b3dc-447e-b948-7032624747a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pxAruQtiJ4aLD27HqNd4qfvv07MUns2jaoeSYYi6OrQ=","crlite_enrolled":true,"id":"d043bdbb-43b3-4701-b169-93da04b081aa","last_modified":1562023954561},{"schema":1562023952325,"derHash":"g8k180xQt2ZUCUBK/l36B63LXHtSsr7wrG6ZPABUXXY=","subject":"CN=Symantec Class 3 Registration Authority Intermediate CA,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGPMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQDA+BgNVBAMTN1N5bWFudGVjIENsYXNzIDMgUmVnaXN0cmF0aW9uIEF1dGhvcml0eSBJbnRlcm1lZGlhdGUgQ0E=","whitelist":false,"attachment":{"hash":"0a89ba17c46d9d5fd2bd15423a6b0a3bb0763fbd740bf73f58873f2a18d9d1cf","size":2194,"filename":"vO3_XaIzmqGtcOO2LQL_yHzKa4ueBDChpnLbfwpiu8c=.pem","location":"security-state-staging/intermediates/359077c3-cc8f-44fc-bdbe-4b64c1d935e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"vO3/XaIzmqGtcOO2LQL/yHzKa4ueBDChpnLbfwpiu8c=","crlite_enrolled":false,"id":"02300412-fd6e-43bc-9cbd-ebe9ef836aa7","last_modified":1562023953055},{"schema":1562023951552,"derHash":"SMShxTleK0mdLj6+Ju76kdEc813V+hSTfu5egHov9Ic=","subject":"CN=TrustAsia RSA CA G8,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHExCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTVHJ1c3RBc2lhIFJTQSBDQSBHOA==","whitelist":false,"attachment":{"hash":"ece1d5f1cba9be7739a5e4813740471d2c9732eb9a89dfa2e75b6222568df132","size":1695,"filename":"9SkVUsat-0_UDRvolgMzKIdw6JFpvrT-hOa-1EbArt8=.pem","location":"security-state-staging/intermediates/0a0070ca-9c1d-47fe-b759-75e6dfa7238e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9SkVUsat+0/UDRvolgMzKIdw6JFpvrT+hOa+1EbArt8=","crlite_enrolled":false,"id":"afe0b493-5e68-46df-9fdb-0eb4f37545a6","last_modified":1562023952317},{"schema":1562023950036,"derHash":"clY8yYraLF0hJlQqzJCBVK6x+db36DpVwJdEx9et3bo=","subject":"CN=RVBD Certificate Issuer,O=Riverbed Technology\\, Inc.,C=US","subjectDN":"MFMxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlSaXZlcmJlZCBUZWNobm9sb2d5LCBJbmMuMSAwHgYDVQQDExdSVkJEIENlcnRpZmljYXRlIElzc3Vlcg==","whitelist":false,"attachment":{"hash":"071b981d1ae8525753515a159884613e388dc310fd76b561f152df246b6c732d","size":1829,"filename":"L2Gt7r61eOKqKfbZ0LwGLCzvrPMMGMdsveQQC5X4gOQ=.pem","location":"security-state-staging/intermediates/3ab21025-6c92-4a25-9b0e-4d9d46ea3cda.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"L2Gt7r61eOKqKfbZ0LwGLCzvrPMMGMdsveQQC5X4gOQ=","crlite_enrolled":false,"id":"666ea0f5-3d53-451c-908f-bbd0a6c22b1c","last_modified":1562023950800},{"schema":1562023949273,"derHash":"v0ZV8WqjONfH/yvclJpSS9R5e4s8g0HGCMn2XLHLgXc=","subject":"CN=Axesson Direct CA,OU=www.axesson.com,O=Axesson Inc.,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxBeGVzc29uIEluYy4xGDAWBgNVBAsTD3d3dy5heGVzc29uLmNvbTEaMBgGA1UEAxMRQXhlc3NvbiBEaXJlY3QgQ0E=","whitelist":false,"attachment":{"hash":"e00a1132c4bf94763c577e4704af4bd328ddb8ee906a302c2ff86110798085ff","size":2146,"filename":"x2wj42-CVwbXi4SeWBzRyyv7rEjRu1AKF3yyj6_VNrM=.pem","location":"security-state-staging/intermediates/4eb92e47-69fe-4c31-b0c5-8f8304767c3f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x2wj42+CVwbXi4SeWBzRyyv7rEjRu1AKF3yyj6/VNrM=","crlite_enrolled":false,"id":"01d796b9-a372-4e2b-b2c0-678b11ec5dc0","last_modified":1562023950010},{"schema":1562023947759,"derHash":"wj0BuOlYVhPiYOyOpIW/+PWYcpjV/ALAcGTFRGIj+cc=","subject":"CN=Fuji Xerox Xnet CA - C,O=Fuji Xerox,C=JP","subjectDN":"MEMxCzAJBgNVBAYTAkpQMRMwEQYDVQQKEwpGdWppIFhlcm94MR8wHQYDVQQDExZGdWppIFhlcm94IFhuZXQgQ0EgLSBD","whitelist":false,"attachment":{"hash":"3288f4c254a9b840d254a43033b88864319168b9ff573c3fa182d9cf4867edf6","size":1597,"filename":"Rctcx_fiaRRDpUcitk3vPz1ZUD7o5sV-LHA0YdyXVl4=.pem","location":"security-state-staging/intermediates/e5f2e418-ce6e-4298-b8e8-6373e43518f4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rctcx/fiaRRDpUcitk3vPz1ZUD7o5sV+LHA0YdyXVl4=","crlite_enrolled":false,"id":"08956575-33ad-4922-a433-8c4193d67244","last_modified":1562023948487},{"schema":1562023947011,"derHash":"ATkyRl7k/CRI0Mmu7qBJ3pBjr153PopQGrYm8JV+E0U=","subject":"CN=HARICA Code Signing ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGPMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEpMCcGA1UEAwwgSEFSSUNBIENvZGUgU2lnbmluZyBFQ0MgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"b6cc45afa6490d756cabf21fa29ea89943fa6d3af2dce38e2cc35b97dde4cc34","size":1370,"filename":"outUmoUrqbkdis1hc4ahnCRx1jVCZxK-HiBp0_inK-8=.pem","location":"security-state-staging/intermediates/bfbea10f-5ad5-49e0-94d8-61a172b54ab2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"outUmoUrqbkdis1hc4ahnCRx1jVCZxK+HiBp0/inK+8=","crlite_enrolled":false,"id":"46837ec3-9bf7-4f67-9c60-6fef82636bf0","last_modified":1562023947751},{"schema":1562023946273,"derHash":"0tfUvuj/G33rpCd0AIHAf3sYai8poSNg1T+MINRVU40=","subject":"CN=TrustAsia RSA OV SSL Server CA,O=TrustAsia Technologies\\, Inc.,ST=Shanghai,C=CN","subjectDN":"MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBPViBTU0wgU2VydmVyIENB","whitelist":false,"attachment":{"hash":"cef0257132e6443d4fa6a6f012339e0c0a90ba4eb8ce5d8083038ca1f5461393","size":2133,"filename":"ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=.pem","location":"security-state-staging/intermediates/f5b72560-0bb5-40bd-b68b-381a9e82b9e3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=","crlite_enrolled":false,"id":"e944087f-76e7-41f9-a1bb-8ef5a2cd787a","last_modified":1562023947003},{"schema":1562023944727,"derHash":"ODDbjqFSC2zfV+HgCl8Sl74R2eZDDINgcXYhL/hdLbg=","subject":"CN=TrustCor Enhanced Secure Site (CA2),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGNMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLDAqBgNVBAMMI1RydXN0Q29yIEVuaGFuY2VkIFNlY3VyZSBTaXRlIChDQTIp","whitelist":false,"attachment":{"hash":"26631969fe5fbc543132a914eb2829ace13e9b418495495a837a47d8936c69b6","size":2564,"filename":"gTvKBlqs6VknFEiItiUhp5K_Oy0UnzZd7vVB6Ko3ZeE=.pem","location":"security-state-staging/intermediates/e49aa502-2469-4f4f-b00b-3d32c9f282e8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gTvKBlqs6VknFEiItiUhp5K/Oy0UnzZd7vVB6Ko3ZeE=","crlite_enrolled":true,"id":"7f04f0ef-3fdc-4bfa-9cc5-c76e75f35add","last_modified":1562023945471},{"schema":1562023943248,"derHash":"Cd5/pznuR8BikYRfLg6Knhx8wpAK01TPFnMW4COGvZs=","subject":"CN=Cerner Corporation Direct Intermediate CA,OU=Cerner Direct,O=Cerner Corporation,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMRswGQYDVQQKExJDZXJuZXIgQ29ycG9yYXRpb24xFjAUBgNVBAsTDUNlcm5lciBEaXJlY3QxMjAwBgNVBAMTKUNlcm5lciBDb3Jwb3JhdGlvbiBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"329d75edeca644875431ecdfbb5af45d15a5d4adf45ec91ae5b365a31878c6fc","size":2215,"filename":"tmPespZP4I0UhQJaBGkHjoK6goz4XFag5dWMseOeDQk=.pem","location":"security-state-staging/intermediates/6fceb1fd-4fdf-4c6b-a721-8f40ce85ab00.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tmPespZP4I0UhQJaBGkHjoK6goz4XFag5dWMseOeDQk=","crlite_enrolled":false,"id":"8e67b7d0-aea3-4831-96a3-f712c2d261f8","last_modified":1562023943981},{"schema":1562023941722,"derHash":"edd4kk/Qj3FTEuV+EHVmqBYeoeaGSb1F6okYSqYuox4=","subject":"CN=CertAssure RSA Client Personal ID CA,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MHYxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEBxMIU2FuIEpvc2UxGDAWBgNVBAoTD0NlcnRBc3N1cmUgSW5jLjEtMCsGA1UEAxMkQ2VydEFzc3VyZSBSU0EgQ2xpZW50IFBlcnNvbmFsIElEIENB","whitelist":false,"attachment":{"hash":"87b59b94993c9ea590060a739644ad092c822a230b0bb1cfbd3eae497e596c3e","size":2125,"filename":"_vhenjJborDchqObw9eZLKuYlEq8pfTiwJCmJYlaDZI=.pem","location":"security-state-staging/intermediates/3e846fdd-caff-49a4-bd01-ee3bbf26d40a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/vhenjJborDchqObw9eZLKuYlEq8pfTiwJCmJYlaDZI=","crlite_enrolled":false,"id":"88958b83-c5cb-4066-84f3-102a6c5c4376","last_modified":1562023942475},{"schema":1562023940958,"derHash":"0o20NeMSEqO9zPh2IPZUS5mpwCMov5g+iC/QYnodEw8=","subject":"CN=UZI-register Medewerker op naam CA G3,O=CIBG,C=NL","subjectDN":"MGUxCzAJBgNVBAYTAk5MMQ0wCwYDVQQKDARDSUJHMRcwFQYDVQRhDA5OVFJOTC01MDAwMDUzNTEuMCwGA1UEAwwlVVpJLXJlZ2lzdGVyIE1lZGV3ZXJrZXIgb3AgbmFhbSBDQSBHMw==","whitelist":false,"attachment":{"hash":"a73ac4ff82e89f690fe1a921d0ad61b7d5629b27b30eea5b1c3ca475ef79e8ad","size":2560,"filename":"dCyrxAKUK8j5RoQJISk_QPQ9eWh1wvDZFjkJxvysY1M=.pem","location":"security-state-staging/intermediates/5c181d64-4ff2-4921-9364-d3cd368e9d22.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dCyrxAKUK8j5RoQJISk/QPQ9eWh1wvDZFjkJxvysY1M=","crlite_enrolled":false,"id":"8c74a361-cbc0-45c9-a37d-003f782ada17","last_modified":1562023941715},{"schema":1562023940219,"derHash":"jIi6UQUptkJjzLIac9grpXJaVcFEbyVHvOMB/NxDFNs=","subject":"CN=STRATO SSL - G5,OU=Domain Validated SSL,O=STRATO AG,C=DE","subjectDN":"MFoxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlTVFJBVE8gQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRgwFgYDVQQDEw9TVFJBVE8gU1NMIC0gRzU=","whitelist":false,"attachment":{"hash":"c65817fb1a8da16ce1ca58346c65942c26cda3152c3eb9738efe79a6bda4f603","size":1756,"filename":"rO8kkFRlJlAkz68GeZxazuE37UKFGkLltXPH90hYNf4=.pem","location":"security-state-staging/intermediates/b2d5fa66-b400-4078-8efd-b61b8db30d33.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rO8kkFRlJlAkz68GeZxazuE37UKFGkLltXPH90hYNf4=","crlite_enrolled":false,"id":"5c8bab04-380f-453a-9c0a-b774af2e2428","last_modified":1562023940950},{"schema":1562023939469,"derHash":"0DSxh1G+4Qqq+UwvFDUNP2VOW5NNDdpZKzHlgYekiVI=","subject":"CN=emSign Device CA - C1,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEeMBwGA1UEAxMVZW1TaWduIERldmljZSBDQSAtIEMx","whitelist":false,"attachment":{"hash":"b85abdf53b134a2c1985785da850d5d78657dd1abcc923a85eeaf3cf7d536125","size":1540,"filename":"W7hjn_Iwl5OzSJsB1o-RIXEUKhNjgqs-85cgtFliENM=.pem","location":"security-state-staging/intermediates/7214b980-7213-4794-a274-6fe5036d46c7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W7hjn/Iwl5OzSJsB1o+RIXEUKhNjgqs+85cgtFliENM=","crlite_enrolled":false,"id":"b06160c1-50d8-44e1-9e0d-33cf64458a5c","last_modified":1562023940210},{"schema":1562023937221,"derHash":"kFjVBl+PPppjqv5c6Jp2RHCw3vnc87nsfQWH+riP66A=","subject":"CN=QuoVadis QVRCA1G1 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTFHMSBTU0wgSUNB","whitelist":false,"attachment":{"hash":"472285bb2b9a0e36f7a8b4405e5b35d448a9333872ca825e8bdcd79a53f8a41b","size":2101,"filename":"oB-l9fuJRX8mzgRrGC4yGRLXF1IEiTrPchG7uV0y8-M=.pem","location":"security-state-staging/intermediates/be28a1da-7adf-4d5a-8b3e-a96a20b3fd9b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oB+l9fuJRX8mzgRrGC4yGRLXF1IEiTrPchG7uV0y8+M=","crlite_enrolled":true,"id":"dadb9e8a-9a0b-4816-b5fc-66b000ef66cf","last_modified":1562023937947},{"schema":1562023936475,"derHash":"zJ+q2DwzUJQ9TkX6QWxPi8Vk96qUz0stK850IJ0EZMk=","subject":"CN=Mirth Direct Intermediate CA,OU=NextGen Share,O=Mirth,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMQ4wDAYDVQQKEwVNaXJ0aDEWMBQGA1UECxMNTmV4dEdlbiBTaGFyZTElMCMGA1UEAxMcTWlydGggRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"539031ec4b7416b127f8b73f71eba2b81bda87c227f140052c0721557ef4488c","size":2162,"filename":"P70tJuapBoh4Tl7BeWUQnpl9vnyfhOQmuZVfj1BLPIg=.pem","location":"security-state-staging/intermediates/76c6f679-67dc-4207-b000-4770f729fc56.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"P70tJuapBoh4Tl7BeWUQnpl9vnyfhOQmuZVfj1BLPIg=","crlite_enrolled":false,"id":"f4127efd-aef8-424a-a432-057bf7e21c0f","last_modified":1562023937213},{"schema":1562023935734,"derHash":"vtDxntRtlJANKp/NfG9mC2H/dYjYtxz48nnV+qMCHM8=","subject":"CN=LuxTrust Global Qualified CA 3,O=LuxTrust S.A.,C=LU","subjectDN":"ME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMScwJQYDVQQDDB5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDM=","whitelist":false,"attachment":{"hash":"93020ca6fa27c7dae09b0247af1d912eac8f119d08b590855a6f996090d750ba","size":2296,"filename":"x3DBF1xU5o--Dvt6U6adkDhvC8kWrK1IWtJJZ5jBw18=.pem","location":"security-state-staging/intermediates/09d46878-7261-4162-8336-5e064910a9d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x3DBF1xU5o++Dvt6U6adkDhvC8kWrK1IWtJJZ5jBw18=","crlite_enrolled":true,"id":"738ef4a9-0311-42bb-beae-391d42ce751f","last_modified":1562023936464},{"schema":1562023934966,"derHash":"MBEZvOt6cufie4rYeV/JsursZXV/b/9PWroWGhomjoo=","subject":"CN=MilleniumSign Client Certificate CA ECC R3,O=MilleniumSign Limited,L=Ebene,ST=Plaines Wilhems,C=MU","subjectDN":"MIGMMQswCQYDVQQGEwJNVTEYMBYGA1UECAwPUGxhaW5lcyBXaWxoZW1zMQ4wDAYDVQQHDAVFYmVuZTEeMBwGA1UECgwVTWlsbGVuaXVtU2lnbiBMaW1pdGVkMTMwMQYDVQQDDCpNaWxsZW5pdW1TaWduIENsaWVudCBDZXJ0aWZpY2F0ZSBDQSBFQ0MgUjM=","whitelist":false,"attachment":{"hash":"2b567d87b851810362c037e0cadc2da1bfc7a9dd2b898019e90062e63bcdd632","size":1447,"filename":"83d1IVr2xTvH_PaNkbnTL4kci6miUaFtd7QLI-w-A1w=.pem","location":"security-state-staging/intermediates/c9394921-1e7c-4fa2-9f34-0493b374d212.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"83d1IVr2xTvH/PaNkbnTL4kci6miUaFtd7QLI+w+A1w=","crlite_enrolled":false,"id":"f4d37b0b-9a53-48a5-9e2a-1d0c4bd49c5e","last_modified":1562023935726},{"schema":1562023933480,"derHash":"uQ4Xq0uHeLEPnyjLqnZk3i7j1m4a/FdNFo7dJKEDOf8=","subject":"CN=TrustAsia DV SSL CA - G6,OU=Symantec Trust Network+OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MIGXMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEdMBsGA1UECxMURG9tYWluIFZhbGlkYXRlZCBTU0wxITAfBgNVBAMTGFRydXN0QXNpYSBEViBTU0wgQ0EgLSBHNg==","whitelist":false,"attachment":{"hash":"b6f89d614177e86c720fc91f770d85edcaff24350a854408afba9ab2b9d78c2f","size":1922,"filename":"MUj3ElSyDVu0X3TYBNY9f0axqYEtb7fmFTLy2Z8_l-Y=.pem","location":"security-state-staging/intermediates/bfe8252d-cbe0-4d5f-a88b-2792eb490b4d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MUj3ElSyDVu0X3TYBNY9f0axqYEtb7fmFTLy2Z8/l+Y=","crlite_enrolled":false,"id":"57d894ba-559b-4b7e-95cd-c42a4377eb6b","last_modified":1562023934224},{"schema":1562023931233,"derHash":"jD+rWYVBF760BGZwH4nMgiQZakUOsXwvT9iNNJfqJoc=","subject":"CN=Domain The Net Technologies Ltd CA for Code Signing R2,O=Domain The Net Technologies Ltd,C=IL","subjectDN":"MHgxCzAJBgNVBAYTAklMMSgwJgYDVQQKDB9Eb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkMT8wPQYDVQQDDDZEb21haW4gVGhlIE5ldCBUZWNobm9sb2dpZXMgTHRkIENBIGZvciBDb2RlIFNpZ25pbmcgUjI=","whitelist":false,"attachment":{"hash":"6cd1244808cf3297acbc1db3a6698bcaeff589f795304830aad10b260c06c428","size":2515,"filename":"tQ28VcCBKgtvuytE6MNlMdLWjjmOUZ1OHheIJqaPxx0=.pem","location":"security-state-staging/intermediates/9444ad32-c97b-4b63-a2ca-32dc448a17e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tQ28VcCBKgtvuytE6MNlMdLWjjmOUZ1OHheIJqaPxx0=","crlite_enrolled":false,"id":"471e9599-0ffc-49b2-b37a-c79bfd133af1","last_modified":1562023931974},{"schema":1562023927515,"derHash":"/BbVMgO9kYfWnMmdLaVRB2tNyymBQNZ1H3oBKWbJn90=","subject":"CN=RapidSSL TLS ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGAxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHzAdBgNVBAMTFlJhcGlkU1NMIFRMUyBFQ0MgQ0EgRzE=","whitelist":false,"attachment":{"hash":"5ab29482e9032bced4020a6ffd28ba40b857897ed628b88bc1554bc73e84f763","size":1199,"filename":"cBtUiO-mwdgMfNeEp_qKuEHswRn2nHp2FDUKVi_aTDw=.pem","location":"security-state-staging/intermediates/a7d241d1-10f7-486a-be9d-7d013030af11.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cBtUiO+mwdgMfNeEp/qKuEHswRn2nHp2FDUKVi/aTDw=","crlite_enrolled":false,"id":"f21e7595-bb74-4d43-8765-075259ddef98","last_modified":1562023928253},{"schema":1562023926016,"derHash":"MZiW45VNUQ2jpLdTh+jIcLO8LDIo2FUJFuvpq9y3+SE=","subject":"CN=Oracle TLS RSA CA G1,OU=Organization Validated SSL,O=Oracle Corporation,C=US","subjectDN":"MG4xCzAJBgNVBAYTAlVTMRswGQYDVQQKExJPcmFjbGUgQ29ycG9yYXRpb24xIzAhBgNVBAsTGk9yZ2FuaXphdGlvbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRPcmFjbGUgVExTIFJTQSBDQSBHMQ==","whitelist":false,"attachment":{"hash":"450ac021db301c37c528daccbe40e94f74a28f7ae6f6ba039650b6aae3c3d13e","size":1678,"filename":"92UUNzSFrSZZ2mG20rm7eFX2MV_e3zCq8ck0jTA9zMw=.pem","location":"security-state-staging/intermediates/ab1e19a8-c972-4ca6-84ee-d4ca47a1a385.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"92UUNzSFrSZZ2mG20rm7eFX2MV/e3zCq8ck0jTA9zMw=","crlite_enrolled":false,"id":"c2b42df2-4fa8-48f7-8666-741d1b771779","last_modified":1562023926759},{"schema":1562023922211,"derHash":"hv/qQPNvppEyeHEP6rqbIG8yiNo/0cZSvFtYlaKxqHc=","subject":"CN=Oregon Health Authority Direct CA,O=Oregon Health Authority,C=US","subjectDN":"MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdPcmVnb24gSGVhbHRoIEF1dGhvcml0eTEqMCgGA1UEAxMhT3JlZ29uIEhlYWx0aCBBdXRob3JpdHkgRGlyZWN0IENB","whitelist":false,"attachment":{"hash":"c479fa9505d835f1638c400911242170ff9011865fabe90fab5ee2126ba98139","size":2170,"filename":"DNdYJRYEP9-HYWq0AW8zHl7xzEsYssaB1vCUHUipRQM=.pem","location":"security-state-staging/intermediates/5f655899-434c-4631-b137-de14b7b959a1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DNdYJRYEP9+HYWq0AW8zHl7xzEsYssaB1vCUHUipRQM=","crlite_enrolled":false,"id":"35ca3b80-9261-4b67-9e34-b6b8216de1bc","last_modified":1562023922942},{"schema":1562023921473,"derHash":"OSWDVDuTsQ4FBt511pOZ/LvBRpyN45YGbHVgiLkiQdo=","subject":"CN=Apple Public Server RSA CA 1 - G1,O=Apple Inc.,C=US","subjectDN":"ME4xCzAJBgNVBAYTAlVTMRMwEQYDVQQKEwpBcHBsZSBJbmMuMSowKAYDVQQDEyFBcHBsZSBQdWJsaWMgU2VydmVyIFJTQSBDQSAxIC0gRzE=","whitelist":false,"attachment":{"hash":"35b8ea0b8b208776616acd154fabbd1d3abade4a57f7a5e656ec072d1b474f8a","size":1654,"filename":"9Vw5Oz-M36bapAlDoz-njgwaF-AaQLrKSmhcZZnxAcY=.pem","location":"security-state-staging/intermediates/76b79706-32a3-45c2-94cf-fd61a2eb2c5d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9Vw5Oz+M36bapAlDoz+njgwaF+AaQLrKSmhcZZnxAcY=","crlite_enrolled":false,"id":"14809122-3e00-45ce-b8d8-b63bb3ff0adf","last_modified":1562023922204},{"schema":1562023920721,"derHash":"9t/e1h/4jvELnm3PvODxYV4Fhmzrr81tSK7oATLHA0c=","subject":"CN=WoSign EV Code Signing Pro CA,O=WoSign CA Limited,C=CN","subjectDN":"MFExCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEmMCQGA1UEAxMdV29TaWduIEVWIENvZGUgU2lnbmluZyBQcm8gQ0E=","whitelist":false,"attachment":{"hash":"8536611d113671c5cb3dc75d5e0bf12a809bddbed4952eaf259b6465f9545d7d","size":1731,"filename":"5zUpCObCLFLZgrnR6TGCOtmLjBBbI4mpEj9CP409UWY=.pem","location":"security-state-staging/intermediates/f5f030c6-0035-459e-81c9-43944f596b65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5zUpCObCLFLZgrnR6TGCOtmLjBBbI4mpEj9CP409UWY=","crlite_enrolled":false,"id":"e1447988-52dc-409e-b96d-b1fdba0c492c","last_modified":1562023921465},{"schema":1562023919958,"derHash":"XXTtYdCzEemBu88PQZo1+p+h7HD/Gut0LXO8/roGz/8=","subject":"CN=GeoTrust True Credentials CA 3,O=GeoTrust\\, Inc.,C=US","subjectDN":"ME8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEnMCUGA1UEAxMeR2VvVHJ1c3QgVHJ1ZSBDcmVkZW50aWFscyBDQSAz","whitelist":false,"attachment":{"hash":"b66df6fdfbd926e26674fc928d090142497594ed9f7d8d0cdbc90dff7e9ee618","size":1414,"filename":"o2dN2rQs101OU1N1FNLbW2U6i4ApoFhY-pI9wu1fcyw=.pem","location":"security-state-staging/intermediates/17b26a4b-cf0e-4d42-b68e-e4e72b00cb85.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o2dN2rQs101OU1N1FNLbW2U6i4ApoFhY+pI9wu1fcyw=","crlite_enrolled":false,"id":"3bc639af-b93f-4769-a1de-d9721dba182a","last_modified":1562023920713},{"schema":1562023919206,"derHash":"zJ9yVE/2F8FM6+goMZSnDx6Jgc8WPVo/2NzP2EbV3Bo=","subject":"CN=NetLock OnlineSSL (Class Online) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGwMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE+MDwGA1UEAww1TmV0TG9jayBPbmxpbmVTU0wgKENsYXNzIE9ubGluZSkgVGFuw7pzw610dsOhbnlraWFkw7M=","whitelist":false,"attachment":{"hash":"72ae8f0a0087c7b13f79d2f02193b9bca142172f3053cad4b927af716cd0534a","size":2190,"filename":"He6eOdoX1CHCLhtg75AtdDdI18-x-VfWOYW5_LCt5kk=.pem","location":"security-state-staging/intermediates/6bab6451-8f63-49f3-a556-455c6b868bd1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"He6eOdoX1CHCLhtg75AtdDdI18+x+VfWOYW5/LCt5kk=","crlite_enrolled":true,"id":"ca8f61c9-fe67-45a0-8bc2-f0a8348e2cdb","last_modified":1562023919950},{"schema":1562023917707,"derHash":"2GoYtfdpUrc26Jots/D9+QcHEUYBFLagjWScpieTXJY=","subject":"CN=COMODO SHA-256 Client Authentication and Secure Email CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGdMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDFDMEEGA1UEAxM6Q09NT0RPIFNIQS0yNTYgQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBTZWN1cmUgRW1haWwgQ0EgMg==","whitelist":false,"attachment":{"hash":"047895ba02981d540016dd3f1b11f8959d568808c8392376e4f72812219bfd23","size":1719,"filename":"MV-oXptPSGVj-n7_WowdFiUjBX7WRZeHO7XdRoAt_Ro=.pem","location":"security-state-staging/intermediates/4b905e58-de32-42f6-9817-56b9d2cf0c30.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MV+oXptPSGVj+n7/WowdFiUjBX7WRZeHO7XdRoAt/Ro=","crlite_enrolled":false,"id":"ef2f4901-d741-470a-9b1b-3be0635e43d9","last_modified":1562023918464},{"schema":1562023916205,"derHash":"XJfg/R69bhNqcWJvhgq11lt5fn7TwcG/TmU4IjdaRkQ=","subject":"CN=HARICA S/MIME RSA SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGJMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEjMCEGA1UEAwwaSEFSSUNBIFMvTUlNRSBSU0EgU3ViQ0EgUjI=","whitelist":false,"attachment":{"hash":"d4e941ad40230b5c13c3996c883aa85ff7b6445f041b6bbd0143d744129cbd81","size":2564,"filename":"o79a142SfRPFvEK57ct8ocJ_tHYpTuDy-1a3i-te0aQ=.pem","location":"security-state-staging/intermediates/9c236c6d-f2eb-44ea-9409-6eae4d0e468d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"o79a142SfRPFvEK57ct8ocJ/tHYpTuDy+1a3i+te0aQ=","crlite_enrolled":false,"id":"ed331ef0-35ea-4e53-9633-07cd14412686","last_modified":1562023916945},{"schema":1562023914706,"derHash":"nvyRAnEJS4hr2aj8njlNvyrlFHeMs3NUQIWvgVyr/i0=","subject":"CN=Go Daddy Secure Extended Validation Code Signing CA - G2,O=GoDaddy Inc.,L=Scottsdale,ST=Arizona,C=US","subjectDN":"MIGOMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEVMBMGA1UEChMMR29EYWRkeSBJbmMuMUEwPwYDVQQDEzhHbyBEYWRkeSBTZWN1cmUgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"3517f89c468b80d775015979f32eb5377e091426aa65e2fe810ff308ae2351a7","size":1752,"filename":"UNzTXQQxA4weEEFceBlgOF0AeE9rV8ZoIXwFOgNm31I=.pem","location":"security-state-staging/intermediates/0f02d488-dc83-4cb0-9899-40a3ec673425.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UNzTXQQxA4weEEFceBlgOF0AeE9rV8ZoIXwFOgNm31I=","crlite_enrolled":false,"id":"1515b6bc-9090-44ac-bbf4-00e69844929a","last_modified":1562023915452},{"schema":1562023913211,"derHash":"9bzzqnotFhoYISBPUlM3xs+UnnNa09M25HZLJadsKlo=","subject":"CN=TrustSign RSA DV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgRFYgQ0E=","whitelist":false,"attachment":{"hash":"e7641150501f3bf2c280ba7a371a352089b2a8c465adf46df5630b5d4e2d3556","size":2113,"filename":"jEvvAqAI3_5hDMtldisHHkOwAFpxjTzbkoL_r-GTKJU=.pem","location":"security-state-staging/intermediates/00ed82e9-9d56-4db6-bd16-63bf411f4e53.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jEvvAqAI3/5hDMtldisHHkOwAFpxjTzbkoL/r+GTKJU=","crlite_enrolled":false,"id":"f14daf92-a223-40b9-8d99-37d837b4cc5c","last_modified":1562023913938},{"schema":1562023912477,"derHash":"ewvDVj1DMJEY9WCmyZoiHDU5mxApP3O+QaEqygM4B18=","subject":"CN=WoSign Code Signing CA,O=WoSign CA Limited,C=CN","subjectDN":"MEoxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1NpZ24gQ0EgTGltaXRlZDEfMB0GA1UEAwwWV29TaWduIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"308987b783a08ed974b3fb4505d7eaaa4169b07441c7afec1b5e1c24e45bc2ef","size":1687,"filename":"FZS0F__J7FHzpNqv22fhTZZ1ns8livqEaiB9NftdioU=.pem","location":"security-state-staging/intermediates/67e1b6cb-99f1-41b3-853e-8dbea4618741.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"FZS0F//J7FHzpNqv22fhTZZ1ns8livqEaiB9NftdioU=","crlite_enrolled":false,"id":"84a9e3a2-9105-45c4-b36d-4db6f5938b74","last_modified":1562023913204},{"schema":1562023910995,"derHash":"Qz0QPeCZzD80FNAE+HD02lyef0Gki6isuvP5Hu/LDWA=","subject":"CN=USERTrust RSA Client Authentication and Secure Email CA,O=The USERTRUST Network,L=Jersey City,ST=New Jersey,C=US","subjectDN":"MIGaMQswCQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEUMBIGA1UEBxMLSmVyc2V5IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazFAMD4GA1UEAxM3VVNFUlRydXN0IFJTQSBDbGllbnQgQXV0aGVudGljYXRpb24gYW5kIFNlY3VyZSBFbWFpbCBDQQ==","whitelist":false,"attachment":{"hash":"8f747b0e65ff509fb91eb3e429e3530a8e8fb3bd2c74bbbcb8af53fada5d42d3","size":2170,"filename":"GxuU4F5l6xPkmDYqjOmR8nS3Nr2bV2oJ0CV0Jx-NWD4=.pem","location":"security-state-staging/intermediates/55af3597-6627-40c7-8e2b-4e91e9bff09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"GxuU4F5l6xPkmDYqjOmR8nS3Nr2bV2oJ0CV0Jx+NWD4=","crlite_enrolled":false,"id":"6c1153d9-3eb0-4419-a890-9743512226f3","last_modified":1562023911730},{"schema":1562023906470,"derHash":"l/QDkKXK4ljW+y/40COxmHdf9Haku+wdG6rBM05XtuE=","subject":"SERIALNUMBER=201804,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA0","whitelist":false,"attachment":{"hash":"abd99c8a6f8baad7db821237b5df895c2d6df0ba6af78ec83ff206eee062e281","size":2333,"filename":"jfS6UYK1YqR7g1U9V5MqubOAgnB-fPO0u-eN8q0c0yE=.pem","location":"security-state-staging/intermediates/109e6702-5f02-415c-bf5a-dc562a660188.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jfS6UYK1YqR7g1U9V5MqubOAgnB+fPO0u+eN8q0c0yE=","crlite_enrolled":false,"id":"ae00e3ac-d2d1-428e-852a-47f7e58676c3","last_modified":1562023907207},{"schema":1562023905731,"derHash":"J+CT6INgfk4OC7Hrq64snA5Vqc8CA3O/ojT+Bf4Lp0M=","subject":"CN=JPRS Domain Validation Authority - G1,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzE=","whitelist":false,"attachment":{"hash":"1da93e47ca6470e85dad24c31ce916537588a3cf88f1d43d1fc9c4e57de8b5ff","size":1646,"filename":"WE8wuQpM8OwqLW_H3ejlZ_VMPcJMYTOA_ggrGWbSpNc=.pem","location":"security-state-staging/intermediates/6d6e0e82-8f55-40fc-8d62-72fab0b6a905.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WE8wuQpM8OwqLW/H3ejlZ/VMPcJMYTOA/ggrGWbSpNc=","crlite_enrolled":true,"id":"90de290c-9563-4a88-8fa6-d2179534ff34","last_modified":1562023906463},{"schema":1562023901967,"derHash":"zf8nr6Pa+fcGqnrFMCmDN+UgyLEKIvZRTgDiH9KHO3k=","subject":"CN=Ecclesiastical Academy of Vella SSL RSA SubCA R2,O=University Ecclesiastical Academy of Vella of Ioannina,L=Ioannina,C=GR","subjectDN":"MIGcMQswCQYDVQQGEwJHUjERMA8GA1UEBwwISW9hbm5pbmExPzA9BgNVBAoMNlVuaXZlcnNpdHkgRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBvZiBJb2FubmluYTE5MDcGA1UEAwwwRWNjbGVzaWFzdGljYWwgQWNhZGVteSBvZiBWZWxsYSBTU0wgUlNBIFN1YkNBIFIy","whitelist":false,"attachment":{"hash":"156b5156f2e0bc0a6ad31fb9b70bcedf0e5c8d29fe23f55ec3d22943f3bf990d","size":2995,"filename":"W-LP2L6GtiR5yYoztYP5ABaxz_faz3yBSub4W5M0wa4=.pem","location":"security-state-staging/intermediates/4236385b-60c6-4921-9be8-258e10ac5db3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W+LP2L6GtiR5yYoztYP5ABaxz/faz3yBSub4W5M0wa4=","crlite_enrolled":false,"id":"13c7f02d-d089-4c63-8bad-0087f66298cf","last_modified":1562023902725},{"schema":1562023901225,"derHash":"ZObglZJvUkdRFsFk1qhemyEyKitIZ99+cqHGMvjHQUM=","subject":"CN=GeoTrust Class 3 ECC CA G1,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIzAhBgNVBAMTGkdlb1RydXN0IENsYXNzIDMgRUNDIENBIEcx","whitelist":false,"attachment":{"hash":"b1a1311c8d0ca5a0ab5a0d77e54b396512314e1b99f25b6b72a10008ee7cd248","size":1122,"filename":"PidygEfLQ98SYkWF8QWGCdIeWhyfGPy00o2Y6-8L4Ug=.pem","location":"security-state-staging/intermediates/4bb37b11-2e9e-4e32-9e80-ce030b4910fc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PidygEfLQ98SYkWF8QWGCdIeWhyfGPy00o2Y6+8L4Ug=","crlite_enrolled":false,"id":"32550637-f3c2-475b-a788-7ef9bd526589","last_modified":1562023901959},{"schema":1562023900475,"derHash":"XMofL/OaSokko2BgNtiq3i4jwCTvyv89wsZnWf73dvs=","subject":"CN=Symantec Class 3 Organizational CA - G5,OU=Symantec Trust Network+OU=Insattningsgaranti Service SHA256 CA,O=Symantec Corporation,C=US","subjectDN":"MIGuMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLTArBgNVBAsTJEluc2F0dG5pbmdzZ2FyYW50aSBTZXJ2aWNlIFNIQTI1NiBDQTEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBPcmdhbml6YXRpb25hbCBDQSAtIEc1","whitelist":false,"attachment":{"hash":"ee77c69da5c00a9b0ba61a8658517885313b3b057bb2e374617159832a3c99dc","size":1959,"filename":"cBpmTzPT3skhhtGMrQJfEnBDG3RXp4d1W_TeftxNX5o=.pem","location":"security-state-staging/intermediates/aa26f891-6509-4035-811b-356b1da5cab9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cBpmTzPT3skhhtGMrQJfEnBDG3RXp4d1W/TeftxNX5o=","crlite_enrolled":false,"id":"b801a445-982a-48d0-9791-5fec6b93b05b","last_modified":1562023901218},{"schema":1562023899695,"derHash":"O/fPS2GSO651p8JX9VBwAD7Pcn4c2mufy4VR/GSdb+s=","subject":"CN=GlobeSSL DV Certification Authority 2,O=Globe Hosting\\, Inc.,L=Wilmington,ST=DE,C=US","subjectDN":"MH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEcMBoGA1UEChMTR2xvYmUgSG9zdGluZywgSW5jLjEuMCwGA1UEAxMlR2xvYmVTU0wgRFYgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMg==","whitelist":false,"attachment":{"hash":"c70f8758f89a5a215393c93d186b22f43da0b0f148d6226d96c339271c9d9ad6","size":2150,"filename":"lQ_FKBR5nsUo6XzQqIOg6_wickZMgocia2x_uINY_uw=.pem","location":"security-state-staging/intermediates/70120228-d3eb-46ce-8660-044d1c900414.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lQ/FKBR5nsUo6XzQqIOg6/wickZMgocia2x/uINY/uw=","crlite_enrolled":true,"id":"78baa603-1046-4055-bcea-dbb019a819d2","last_modified":1562023900467},{"schema":1562023898952,"derHash":"N/a9m+4MdPYI3UdLVqcvgYMHffwmYq95v+PU+rzwscQ=","subject":"CN=thawte EV SSL CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHjAcBgNVBAMTFXRoYXd0ZSBFViBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"cdc8303c392107878e951abcd532ced1f3ec3f8ad0b3e91a30dacf150ddcf945","size":1683,"filename":"UsnhaVdJ4pzPc4oJoB-DvYML3sL25lZj8K42HWaTu_M=.pem","location":"security-state-staging/intermediates/c940d8a5-f84d-43f4-ba77-b676afec2504.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"UsnhaVdJ4pzPc4oJoB+DvYML3sL25lZj8K42HWaTu/M=","crlite_enrolled":false,"id":"cc6703a8-cebe-49cc-bd39-4e1a7a3f620e","last_modified":1562023899687},{"schema":1562023898215,"derHash":"9r+Isqjc1P60AVmE7C8UJ8gBfRQM9B8i7mieDWcYAS8=","subject":"CN=WoTrus OV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIE9WIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"ce4ba30cb7d9fab70ae32267594148013d61f09cd075d7e3e07f4792e46d517c","size":1691,"filename":"xxDKJ6WsrIZ1X_E1XI1IQgUNGc1SquSk5UkyOBHKq4I=.pem","location":"security-state-staging/intermediates/b8d761f5-e513-43c4-ba77-4138f539938e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xxDKJ6WsrIZ1X/E1XI1IQgUNGc1SquSk5UkyOBHKq4I=","crlite_enrolled":true,"id":"773ec055-4ebc-48c9-84a6-04ffd1e4b40d","last_modified":1562023898944},{"schema":1562023897472,"derHash":"WfjLfX6eE8t3j/YhmOvgVVG1FaWLu6LvGcM8dgyCORY=","subject":"CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MH4xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEvMC0GA1UEAxMmU3ltYW50ZWMgQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"872450a43824a979c2e9576d217c927280ea4a1bfb4504ea3330e00aa649136e","size":1865,"filename":"9n0izTnSRF-W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=.pem","location":"security-state-staging/intermediates/efda7551-5b7a-460b-a28b-26cdc37bca68.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9n0izTnSRF+W4W4JTq51avSXkWhQB8duS2bxVLfzXsY=","crlite_enrolled":true,"id":"696e4f33-7c3d-43d1-afc8-c045f8b1043c","last_modified":1562023898207},{"schema":1562023896701,"derHash":"9/veuCvpnUHNykGfyRhZ0+UobAdiBODpA9Z4uyE+2Js=","subject":"CN=Hostpoint TLS RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MGIxCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMR0wGwYDVQQDExRIb3N0cG9pbnQgVExTIFJTQSBDQQ==","whitelist":false,"attachment":{"hash":"e06a612c20a2679cb1522f8e77265194fd2509fa105e19f74503f5f6e26acc68","size":1662,"filename":"Q5l5uNBWZnOf3EnCFMK3ciNhPZboa_YPtUtL6yZ_DvU=.pem","location":"security-state-staging/intermediates/c78cb670-c087-4971-a213-9724dc2bf071.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Q5l5uNBWZnOf3EnCFMK3ciNhPZboa/YPtUtL6yZ/DvU=","crlite_enrolled":false,"id":"71101667-ae1e-451f-a1e6-bbf37b5d1c15","last_modified":1562023897463},{"schema":1562023895955,"derHash":"MM5AljESCgxaxUir+yMXiahHQRw4GKVumwb+sXI855c=","subject":"OU=\u653f\u5e9c\u6191\u8b49\u7ba1\u7406\u4e2d\u5fc3,O=\u884c\u653f\u9662,C=TW","subjectDN":"MEQxCzAJBgNVBAYTAlRXMRIwEAYDVQQKDAnooYzmlL/pmaIxITAfBgNVBAsMGOaUv+W6nOaGkeitieeuoeeQhuS4reW/gw==","whitelist":false,"attachment":{"hash":"136cce10aa7fe302678af5476af5c33cd4f4b62cc81c3a7400d01d1ad4402def","size":1845,"filename":"9SrSmq9hgCZP8N1M7kFgIC_97LEKOAceLOYuCEt3NPA=.pem","location":"security-state-staging/intermediates/7eaa26ca-66dc-4067-bf06-faea7b0778c2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9SrSmq9hgCZP8N1M7kFgIC/97LEKOAceLOYuCEt3NPA=","crlite_enrolled":false,"id":"bb082824-c5dc-4766-82b5-bf6bca3cd472","last_modified":1562023896694},{"schema":1562023895217,"derHash":"fBQwkslrZFn1QwaU4m/C/TIE2z6l4joNhOFBBDHY86o=","subject":"CN=Sectigo ECC Code Signing CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MHwxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDEkMCIGA1UEAxMbU2VjdGlnbyBFQ0MgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"9a2de842160f7d190ed3b3cba30dbb63769ac15807d220080a3a2bd9bd1b666f","size":1288,"filename":"w6yFEnzGbuGwNdmUt6sCUgKBh2h32AoeHYoMDYzuK_k=.pem","location":"security-state-staging/intermediates/0747832d-f5b5-4a97-a9bc-25a37db463a6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"w6yFEnzGbuGwNdmUt6sCUgKBh2h32AoeHYoMDYzuK/k=","crlite_enrolled":false,"id":"db0253fc-b96f-4659-99b7-c03a04b8abb8","last_modified":1562023895947},{"schema":1562023892959,"derHash":"qFyEoIJaoBncCPqaAsTDnj/UGTR7LpLfBGM+5CbZAHc=","subject":"SERIALNUMBER=PT507015851,CN=DigitalSign TSA CA,O=DigitalSign Certificadora Digital,L=Guimaraes (see current address at www.digitalsign.pt),C=PT","subjectDN":"MIGsMRQwEgYDVQQFEwtQVDUwNzAxNTg1MTELMAkGA1UEBhMCUFQxPjA8BgNVBAcTNUd1aW1hcmFlcyAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuZGlnaXRhbHNpZ24ucHQpMSowKAYDVQQKEyFEaWdpdGFsU2lnbiBDZXJ0aWZpY2Fkb3JhIERpZ2l0YWwxGzAZBgNVBAMTEkRpZ2l0YWxTaWduIFRTQSBDQQ==","whitelist":false,"attachment":{"hash":"b810a0659616ef9705eed08822a6adc2f20b3b1253e9c32d6a67b5d6516f3a48","size":2983,"filename":"14wpPqI0rKKu2wfgxtYzi79V21Q-G8MMRfL27MMj9Iw=.pem","location":"security-state-staging/intermediates/be9846a9-01e0-44bc-8be5-f15f96a33766.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"14wpPqI0rKKu2wfgxtYzi79V21Q+G8MMRfL27MMj9Iw=","crlite_enrolled":false,"id":"aa36797b-9b27-45db-b8cc-8675b7b7187e","last_modified":1562023893696},{"schema":1562023890715,"derHash":"F81lBLJ1pmNO4AFu/+U7Jr/8yiicfe1KHI9DU80FsJw=","subject":"CN=SSL.com Client Certificate Enterprise Intermediate CA RSA R1,O=SSL Corp,L=Houston,ST=Texas,C=US","subjectDN":"MIGJMQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xETAPBgNVBAoMCFNTTCBDb3JwMUUwQwYDVQQDDDxTU0wuY29tIENsaWVudCBDZXJ0aWZpY2F0ZSBFbnRlcnByaXNlIEludGVybWVkaWF0ZSBDQSBSU0EgUjE=","whitelist":false,"attachment":{"hash":"6c7e49020c5475b9abc349acd61d6b88925429b682acd6e2e5abe999f3b60a83","size":2475,"filename":"h9sqkTNlvbHEc_SCe09NcuKt0lMiI1LoVjl_27pfS1w=.pem","location":"security-state-staging/intermediates/d4e928bc-793e-4205-bd4e-edef3135e988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h9sqkTNlvbHEc/SCe09NcuKt0lMiI1LoVjl/27pfS1w=","crlite_enrolled":false,"id":"64099b82-85e1-4bae-a95e-a86a258020a2","last_modified":1562023891466},{"schema":1562023889965,"derHash":"uoscVM+tNpROU5GJH2sP8P7BZTOXmEynDUHH1JJfloE=","subject":"CN=YourNet SSL for business2,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEwxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSIwIAYDVQQDExlZb3VyTmV0IFNTTCBmb3IgYnVzaW5lc3My","whitelist":false,"attachment":{"hash":"9e6dd2fa6e9bc32016adf0bfa400528e72306689a6ec1eca064f3dd27a85822f","size":1601,"filename":"oYqPK-xVUS7-RcUnQeCetmqmeRrQMdovxW4BWxh-Emk=.pem","location":"security-state-staging/intermediates/4bbf284e-2f36-40c1-bd92-f2b16be4d3ae.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"oYqPK+xVUS7+RcUnQeCetmqmeRrQMdovxW4BWxh+Emk=","crlite_enrolled":false,"id":"c47d3556-f86b-4ab6-9b3d-f9af03cd2bd9","last_modified":1562023890707},{"schema":1562023889223,"derHash":"Z3dGRFHJm4WxKtMj9z9xNsgr9NE+F16VCCWPwTdcc8c=","subject":"CN=Technological Educational Institution of Central Macedonia CA R3,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGeMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxSTBHBgNVBAMTQFRlY2hub2xvZ2ljYWwgRWR1Y2F0aW9uYWwgSW5zdGl0dXRpb24gb2YgQ2VudHJhbCBNYWNlZG9uaWEgQ0EgUjM=","whitelist":false,"attachment":{"hash":"36ffb3046dd658ff9ccba6ea9eb4df83e4add8be6a87212bf86afc91550e4239","size":2576,"filename":"I0fdRdZ1pQ-XM4dJAEPngv0L1YgRqn0kogIzrBTN_tk=.pem","location":"security-state-staging/intermediates/5079f208-5c1b-44b7-a9f4-c02be180c2ac.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"I0fdRdZ1pQ+XM4dJAEPngv0L1YgRqn0kogIzrBTN/tk=","crlite_enrolled":true,"id":"539cd105-51fc-4e3e-a033-4aacc41b639c","last_modified":1562023889956},{"schema":1562023888479,"derHash":"P+i+OSoIaEuZ9JfmGMfd9aAqQom/nQjllQRZMb+6gU8=","subject":"CN=QuoVadis EV SSL ICA G1,O=QuoVadis Limited,C=BM","subjectDN":"MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDExZRdW9WYWRpcyBFViBTU0wgSUNBIEcx","whitelist":false,"attachment":{"hash":"551cf1c482303e95516618b5d32f583a46517b1ec9aad2cf0021a782aa675281","size":1959,"filename":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=.pem","location":"security-state-staging/intermediates/c17b1b5f-620a-4306-968a-5c4260d25ab8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2ZnCTNQBrKShr4c1olKfwNG53KiL6qoNcQi65YGRBn8=","crlite_enrolled":true,"id":"0314ca5c-23af-4a2b-bc71-b2e37c50ac54","last_modified":1562023889215},{"schema":1562023887737,"derHash":"RqKjoPEeA8A6QfPlF1/Vi+wQIvuB65NJMX4f26ZMw9Q=","subject":"CN=WISeKey CertifyID Advanced G1 CA,OU=Copyright (c) 2005 WISeKey SA+OU=International,O=WISeKey,C=CH","subjectDN":"MIGKMQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEmMCQGA1UECxMdQ29weXJpZ2h0IChjKSAyMDA1IFdJU2VLZXkgU0ExFjAUBgNVBAsTDUludGVybmF0aW9uYWwxKTAnBgNVBAMTIFdJU2VLZXkgQ2VydGlmeUlEIEFkdmFuY2VkIEcxIENB","whitelist":false,"attachment":{"hash":"20233f4415718b169b238134dbe831bb4d946d37afb8c1b48c1adb10fe7ac94e","size":1792,"filename":"tv0EwdMH3jyu8FHFCeLpxbPmlyakqJMlF9pChboTB90=.pem","location":"security-state-staging/intermediates/09a7a43f-5d95-4f5a-8572-f43ac38325eb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tv0EwdMH3jyu8FHFCeLpxbPmlyakqJMlF9pChboTB90=","crlite_enrolled":true,"id":"8cf5872b-da2d-4b66-ba16-f07b1a526a9c","last_modified":1562023888471},{"schema":1562023887003,"derHash":"owdxJdafyc2Ztdqnz+gKDvKy6YTm1x7QeL8kJOmmz9U=","subject":"CN=Hellenic Academic and Research Institutions AdminCA R6,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGUMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxPzA9BgNVBAMTNkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQWRtaW5DQSBSNg==","whitelist":false,"attachment":{"hash":"e97b90c29ca08c32a29e1dcb3016225c5d29421decefc81fdce9995717f8465d","size":2767,"filename":"D6zzR3_KFUAa348dTG5H2yMt4bp9Pii8OwW14yQxJEM=.pem","location":"security-state-staging/intermediates/aca214f4-7536-4d5a-85ee-9a4aa5638493.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"D6zzR3/KFUAa348dTG5H2yMt4bp9Pii8OwW14yQxJEM=","crlite_enrolled":true,"id":"f2248a36-d454-482f-958b-a9dc15720d84","last_modified":1562023887729},{"schema":1562023884749,"derHash":"hxHuU550IT9fQS60oYqYw7WNpiC01D51sFQq/Dn8YDM=","subject":"CN=Apple IST CA 8 - G1,O=Apple Inc.,C=US","subjectDN":"MEAxHDAaBgNVBAMME0FwcGxlIElTVCBDQSA4IC0gRzExEzARBgNVBAoMCkFwcGxlIEluYy4xCzAJBgNVBAYTAlVT","whitelist":false,"attachment":{"hash":"2cd6b163c464a522511c510d8e9b798eae4d6dbe7d90880114a485a3a0e1f2a7","size":1142,"filename":"4k-OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=.pem","location":"security-state-staging/intermediates/64c1ffef-d9d4-4408-8e40-276c0ba9cfd9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4k+OjCGF2i9eiNRXnoF8R79ur7yFBfD5YP1aDfRHOtM=","crlite_enrolled":true,"id":"f27a949a-d1d5-478e-9330-6841cb12ffa8","last_modified":1562023885487},{"schema":1562023883962,"derHash":"qbVpjFJjvv89YHINwYRMuV0W8G4EJovOO+TWAoKwHvk=","subject":"CN=KPN BV PKIoverheid Organisatie Persoon CA - G3,O=KPN B.V.,C=NL","subjectDN":"MHIxCzAJBgNVBAYTAk5MMREwDwYDVQQKDAhLUE4gQi5WLjEXMBUGA1UEYQwOTlRSTkwtMjcxMjQ3MDExNzA1BgNVBAMMLktQTiBCViBQS0lvdmVyaGVpZCBPcmdhbmlzYXRpZSBQZXJzb29uIENBIC0gRzM=","whitelist":false,"attachment":{"hash":"2322b3b033011ddfda96b303a8450928d8781e9758dbd8686a93db915c70ebbc","size":2560,"filename":"8zXk1x8L1cy7ge8UwVX_L83jPq3uLmMVnaXX38tAKyU=.pem","location":"security-state-staging/intermediates/b202526e-54f8-4a28-b669-5130627cb3d3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8zXk1x8L1cy7ge8UwVX/L83jPq3uLmMVnaXX38tAKyU=","crlite_enrolled":false,"id":"da1e6bb9-7ead-4982-b7d5-d844af089570","last_modified":1562023884741},{"schema":1562023882482,"derHash":"Wyroq/Xn5WO7w0yXoiVU6COT16zAnBdl5QSuCMFXtaw=","subject":"CN=GeoTrust EV SSL CA - G5,O=GeoTrust Inc.,C=US","subjectDN":"MEcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdHZW9UcnVzdCBFViBTU0wgQ0EgLSBHNQ==","whitelist":false,"attachment":{"hash":"00efa1f665aec6aaf8d6c9e15cc2e0d9bc291c7fff5e9a1cadfc599437b40520","size":1553,"filename":"LIGFMT2Zjq8CjsXF7zcvXgMX9FcE9iAsUb9iDx11IOI=.pem","location":"security-state-staging/intermediates/43bb4adf-b41c-4f49-bb65-d43dc9c92894.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LIGFMT2Zjq8CjsXF7zcvXgMX9FcE9iAsUb9iDx11IOI=","crlite_enrolled":false,"id":"dd7d6e8c-53bd-4231-93b3-7b92a36e951f","last_modified":1562023883212},{"schema":1562023881733,"derHash":"YcEGcIOuBE7x1knOWQu/CdnXOeAl2o0ZX3HPqtbrrmk=","subject":"CN=GlobalSign Timestamping CA - R3,OU=Timestamping CA,O=GlobalSign","subjectDN":"MFkxGDAWBgNVBAsTD1RpbWVzdGFtcGluZyBDQTETMBEGA1UEChMKR2xvYmFsU2lnbjEoMCYGA1UEAxMfR2xvYmFsU2lnbiBUaW1lc3RhbXBpbmcgQ0EgLSBSMw==","whitelist":false,"attachment":{"hash":"00f7896c16a21188e61de02a8277feaa52a4b1ce711c256892645e3a7a78fd28","size":1479,"filename":"6p1mBoam4p5pkVPKIbd2jwQWyu5AebEnipX-25eoiRg=.pem","location":"security-state-staging/intermediates/4ad73b23-357c-4ee7-a6d4-d7ae4fc9f8bc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6p1mBoam4p5pkVPKIbd2jwQWyu5AebEnipX+25eoiRg=","crlite_enrolled":false,"id":"ab3640fa-d9d9-4510-b69b-b6ff0623c0c9","last_modified":1562023882474},{"schema":1562023880998,"derHash":"PsOaz5ZsvBfYm/zy4HsVW5sEcWzeynPNhkwm8rL6mnA=","subject":"CN=FujiSSL OV Code Signing CA (SHA2),O=Nijimo K.K.,L=Shibuya-ku,ST=Tokyo,C=JP","subjectDN":"MHQxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIEwVUb2t5bzETMBEGA1UEBxMKU2hpYnV5YS1rdTEUMBIGA1UEChMLTmlqaW1vIEsuSy4xKjAoBgNVBAMTIUZ1amlTU0wgT1YgQ29kZSBTaWduaW5nIENBIChTSEEyKQ==","whitelist":false,"attachment":{"hash":"c3ee0faf6bb6497407e15442afbf1069e1247899461c8c8cf1fa146a55f2d49e","size":2109,"filename":"H0gCzGcWIGHafa3ydC73l4EDYZ7SkdVJeqxNBsDIwiI=.pem","location":"security-state-staging/intermediates/4d2197a4-c1c3-40c8-883f-68f1ca50c471.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"H0gCzGcWIGHafa3ydC73l4EDYZ7SkdVJeqxNBsDIwiI=","crlite_enrolled":false,"id":"b7cdd2ff-51a0-4519-a7a6-d23a1614880e","last_modified":1562023881725},{"schema":1562023880256,"derHash":"MEFZ/FBwfewu32ZazJeoH0Ojr8ok9K5anyEdl7VATGQ=","subject":"SERIALNUMBER=201402,CN=Government CA,C=BE","subjectDN":"MDYxCzAJBgNVBAYTAkJFMRYwFAYDVQQDEw1Hb3Zlcm5tZW50IENBMQ8wDQYDVQQFEwYyMDE0MDI=","whitelist":false,"attachment":{"hash":"4e4514cdc5a28e277b3f89386cc021171cf1d2b50f73a6c8b73f5f77ca2d5f4d","size":2097,"filename":"xSTwUEQSIfxcbg4xCuj23Ya2b3QZup1o-rlGYv1hOiQ=.pem","location":"security-state-staging/intermediates/b8a1adb7-8ae3-4bbb-a046-664664ff0771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xSTwUEQSIfxcbg4xCuj23Ya2b3QZup1o+rlGYv1hOiQ=","crlite_enrolled":false,"id":"843b14ea-2a93-4f34-b1f5-453e4b96af8a","last_modified":1562023880990},{"schema":1562023879494,"derHash":"dFCEYqXCpPJb3LVcslkxCgVrfWI92OVTUfO0Lx0ySGs=","subject":"CN=TrustSign RSA OV CA,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MGMxCzAJBgNVBAYTAkZSMRAwDgYDVQQIEwdIZXJhdWx0MRQwEgYDVQQHEwtNb250cGVsbGllcjEOMAwGA1UEChMFWml3aXQxHDAaBgNVBAMTE1RydXN0U2lnbiBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"e4f8e4c2fc7a0eebc4bc552e536ebdd76c0b0553eb218e1bff323f7729969d80","size":2117,"filename":"chB881BfDWAiJ-J0Xbjx2_V5kxVs4F8Bof_rFzQm8kw=.pem","location":"security-state-staging/intermediates/3712897c-ea80-4f7b-a166-8193962ca35d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"chB881BfDWAiJ+J0Xbjx2/V5kxVs4F8Bof/rFzQm8kw=","crlite_enrolled":true,"id":"23cc5cfc-37c0-40fb-a746-f53e5d03c584","last_modified":1562023880249},{"schema":1562023875682,"derHash":"sJNdwEtOYMDELe9+xXobHY+VjReYjnHMgKjPXmNbpbQ=","subject":"CN=D-TRUST SSL Class 3 CA 1 EV 2009,O=D-Trust GmbH,C=DE","subjectDN":"ME8xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKTAnBgNVBAMMIEQtVFJVU1QgU1NMIENsYXNzIDMgQ0EgMSBFViAyMDA5","whitelist":false,"attachment":{"hash":"a0be570032309c0aac96a0960dbae7ab544e4e0e1377b894c66b261ef8bb0ed5","size":1886,"filename":"lv5BNZ5aWd27ooolULDolFTwIaaWjHvG4yyH3rss4X8=.pem","location":"security-state-staging/intermediates/b08f7a1d-1d7f-4bb2-943d-d367a79b03d1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lv5BNZ5aWd27ooolULDolFTwIaaWjHvG4yyH3rss4X8=","crlite_enrolled":true,"id":"6a2eddcc-3e30-4ca4-9940-4edce439b163","last_modified":1562023876500},{"schema":1562023874934,"derHash":"cjnS93D6/zsc+L4qBewD7eqsBTtVT5DTaSEVW6gFGYE=","subject":"SERIALNUMBER=A82743287,CN=Camerfirma AAPP II - 2014,OU=AC CAMERFIRMA,O=AC Camerfirma S.A.,L=Madrid (see current address at https://www.camerfirma.com/address),C=ES","subjectDN":"MIHHMQswCQYDVQQGEwJFUzEWMBQGA1UECwwNQUMgQ0FNRVJGSVJNQTEbMBkGA1UECgwSQUMgQ2FtZXJmaXJtYSBTLkEuMRIwEAYDVQQFEwlBODI3NDMyODcxSzBJBgNVBAcMQk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCBodHRwczovL3d3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTEiMCAGA1UEAwwZQ2FtZXJmaXJtYSBBQVBQIElJIC0gMjAxNA==","whitelist":false,"attachment":{"hash":"0a86bcc0922d8e5aedf06717254f6bb2250c686e3881dcb8d9e29b4a3af1d342","size":3015,"filename":"LvwNZPeX39Q9uSy8R8xO89Ml4v-I1qwWGFHanFIzBuE=.pem","location":"security-state-staging/intermediates/3ec75359-9645-4c2e-be4e-fa2cd9e3db8c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LvwNZPeX39Q9uSy8R8xO89Ml4v+I1qwWGFHanFIzBuE=","crlite_enrolled":true,"id":"25860e85-f410-4572-8308-d25aa0771aed","last_modified":1562023875674},{"schema":1562023873412,"derHash":"Xm0viPYX3IuAmu5xJEWkGzzeJq+HSiIancmOodxo49U=","subject":"CN=COMODO RSA Code Signing CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSMwIQYDVQQDExpDT01PRE8gUlNBIENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0689264a1352756f294e4a44cb5daff0f733aa53157d8380f3178406b9372a24","size":2097,"filename":"i8_I5MKP3MSfyB8JAq96_ACK-uEGN_MBobZRhsYHU98=.pem","location":"security-state-staging/intermediates/69c6bb50-ff62-440f-b50b-6465b81903ba.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"i8/I5MKP3MSfyB8JAq96/ACK+uEGN/MBobZRhsYHU98=","crlite_enrolled":true,"id":"fe9571ec-d486-4292-aac0-966f5f1838e7","last_modified":1562023874180},{"schema":1562023872662,"derHash":"j3JA8WCTbx/UBr8CizW11gm2SzvQ4x4TzG3Zq3yhLm8=","subject":"CN=GLOBE SSL SECURE EMAIL CA,O=GLOBE HOSTING CERTIFICATION AUTHORITY,C=RO","subjectDN":"MGExCzAJBgNVBAYTAlJPMS4wLAYDVQQKEyVHTE9CRSBIT1NUSU5HIENFUlRJRklDQVRJT04gQVVUSE9SSVRZMSIwIAYDVQQDExlHTE9CRSBTU0wgU0VDVVJFIEVNQUlMIENB","whitelist":false,"attachment":{"hash":"1cf3286ce0babb75314968445c3959acec4c2fb01d7342d74be3d80efd77125a","size":1764,"filename":"_eRFHz8wxXnTOa1eOct617RUUVoCS6wHVpWc2LKjvVg=.pem","location":"security-state-staging/intermediates/6ea4ccfe-618c-4d73-a015-3e42e8920b65.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"/eRFHz8wxXnTOa1eOct617RUUVoCS6wHVpWc2LKjvVg=","crlite_enrolled":false,"id":"da8a31fa-d3a3-48b0-bda4-897fb3c4ad78","last_modified":1562023873404},{"schema":1562023869671,"derHash":"+XXzzjruzi6EIWgumY669R3qIzk01r7QmAOW1OnTBfM=","subject":"SERIALNUMBER=201910,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEw","whitelist":false,"attachment":{"hash":"0fbf6add7408151179d37d5abe61f87abcdd4c99bab406623bb0febcb40eedc5","size":2333,"filename":"jW7wLbKuIJZUC7-BzA_NfMVouvtE6dzFjDevOw1XW6E=.pem","location":"security-state-staging/intermediates/77c35205-5000-4e7d-b8c5-c0c77986d218.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jW7wLbKuIJZUC7+BzA/NfMVouvtE6dzFjDevOw1XW6E=","crlite_enrolled":false,"id":"2d54b6a4-823a-43d6-a133-dec0ecd5ae88","last_modified":1562023870410},{"schema":1562023868924,"derHash":"w/kIp5zdgMEwJctTI7ERrHkJnrgBIvmZ27IvGqFmLdw=","subject":"CN=JPRS Domain Validation Authority - G2,O=Japan Registry Services Co.\\, Ltd.,C=JP","subjectDN":"MGkxCzAJBgNVBAYTAkpQMSowKAYDVQQKEyFKYXBhbiBSZWdpc3RyeSBTZXJ2aWNlcyBDby4sIEx0ZC4xLjAsBgNVBAMTJUpQUlMgRG9tYWluIFZhbGlkYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"16d77651077ea51b94f72d3624452d07aaab57511a1fe8d9e10625a11e43a9d7","size":1646,"filename":"p7rWc93y9zFUE3P3-6IYKwtnR1GvtybOoTPGXdSMN6A=.pem","location":"security-state-staging/intermediates/eab9d35c-019e-4c89-b21c-0c8b8c620889.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"p7rWc93y9zFUE3P3+6IYKwtnR1GvtybOoTPGXdSMN6A=","crlite_enrolled":true,"id":"439235e2-cd11-4053-986f-d05773a53816","last_modified":1562023869663},{"schema":1562023868186,"derHash":"gmxqphDvGQvi18A+ItAyQFsomATjMZ4jPEw3/78wXxo=","subject":"CN=Allina Health Connect HIE Intermediate CA,OU=Information Services,O=Allina Health System,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMR0wGwYDVQQKExRBbGxpbmEgSGVhbHRoIFN5c3RlbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxMjAwBgNVBAMTKUFsbGluYSBIZWFsdGggQ29ubmVjdCBISUUgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"3fed557524a047ca7ae40592d462cee185e97808c1e5320c1eb52c5a7a4d8298","size":2227,"filename":"kuL4whKnDZSJ1xWg0SN5QgraxcT7tVGkaZ4bhp_RHE0=.pem","location":"security-state-staging/intermediates/e891c8b2-5e6d-48ee-83c8-adb90530ee92.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"kuL4whKnDZSJ1xWg0SN5QgraxcT7tVGkaZ4bhp/RHE0=","crlite_enrolled":false,"id":"d006724b-20f0-4f42-a4d0-36155fc63363","last_modified":1562023868916},{"schema":1562023866678,"derHash":"9s9db/hQ0U2wgsyc98BWvGDjax5U8cyj4kvfOTlIl40=","subject":"CN=thawte Primary Issuing CA G3,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExx0aGF3dGUgUHJpbWFyeSBJc3N1aW5nIENBIEcz","whitelist":false,"attachment":{"hash":"b1b90ae5480250915ff746025d104e268a490964caffb8c60f83a5cb64b9d82b","size":1674,"filename":"hMS-T3DAYkVPWmsj2FHZdA-NePI3o2weSSK33d653rE=.pem","location":"security-state-staging/intermediates/231cc96c-85ed-46e6-842c-512d94373031.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"hMS+T3DAYkVPWmsj2FHZdA+NePI3o2weSSK33d653rE=","crlite_enrolled":false,"id":"1d7a0db8-9a29-4c6a-b445-a3a7ae5430b2","last_modified":1562023867410},{"schema":1562023865931,"derHash":"/Zi0DrlKrAl2IhefHjrN2s0/PJUnzWl03DYU0JrTeq4=","subject":"CN=Actalis Domain Validation Server CA G1,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGQMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcx","whitelist":false,"attachment":{"hash":"6acbc0db9e14c20b7451ac6a4370d052bc7c3e5998ac0c9ffd0579f1e572ba26","size":2255,"filename":"BJJEqWcyIOaOIv8i-zwBwibnq29_3M0jCAjL4VG3bvU=.pem","location":"security-state-staging/intermediates/7dfd8c65-c838-4d5b-9e31-7514f9077c07.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BJJEqWcyIOaOIv8i+zwBwibnq29/3M0jCAjL4VG3bvU=","crlite_enrolled":true,"id":"8508b975-2be6-4467-9f9f-2771caa111e4","last_modified":1562023866670},{"schema":1562023865184,"derHash":"yW8kxFET/ZGuL55A4QZlO/oP+8+gfiCVJMhE58jaQUg=","subject":"CN=CA Disig R2I2 Certification Service,O=Disig a.s.,L=Bratislava,C=SK","subjectDN":"MGUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMRMwEQYDVQQKDApEaXNpZyBhLnMuMSwwKgYDVQQDDCNDQSBEaXNpZyBSMkkyIENlcnRpZmljYXRpb24gU2VydmljZQ==","whitelist":false,"attachment":{"hash":"f15a1b6085ecf56bcc317ea1be8002f3c662d6a3a7e4bb6320daa95d1ef02dee","size":2142,"filename":"v1zylIDkrVcStoBb1ajeFz3xSjTmFzgYYMJDQsfaIxo=.pem","location":"security-state-staging/intermediates/74dc56b9-2278-47d0-9591-8771a0e9d98a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"v1zylIDkrVcStoBb1ajeFz3xSjTmFzgYYMJDQsfaIxo=","crlite_enrolled":true,"id":"bf754a3f-1f3e-4515-933a-fcb359cafde5","last_modified":1562023865923},{"schema":1562023864420,"derHash":"y2/O5BxV4kd03wK+Nd5tQY6U71gR99sTc6+ICc9wfyo=","subject":"CN=E-Tugra Domain Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIGvMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJDAiBgNVBAMMG0UtVHVncmEgRG9tYWluIFZhbGlkYXRlZCBDQQ==","whitelist":false,"attachment":{"hash":"c6b2887b29d06c3a32442bacd3087e92f206a5fa698d64deded68c4d8bb5d347","size":2296,"filename":"DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=.pem","location":"security-state-staging/intermediates/570f1b75-429e-4c79-b0e9-d7653e227ce7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DReMCzHTvlRp8z0vjOXH2lx0lpHIz5iXick53RZbRT8=","crlite_enrolled":true,"id":"feefbefd-6161-49d5-84fd-5b09c850c80c","last_modified":1562023865176},{"schema":1562023862132,"derHash":"rw42PK5t9Inyl2ooTRLUwzyUsTX6d/ieiSmNdJHpmXQ=","subject":"CN=DigiCert Universal Transition Root,OU=www.digicert.com,O=DigiCert\\, Inc,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1EaWdpQ2VydCwgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBVbml2ZXJzYWwgVHJhbnNpdGlvbiBSb290","whitelist":false,"attachment":{"hash":"44f2ec36fe8de0e388d84737946813eb0731ca6601ec2a951ad5c73c0f6dc2e8","size":1325,"filename":"rFC1-3OK7Wy3gcw1-__3eG93EJrafAiGfASlc_1c-e4=.pem","location":"security-state-staging/intermediates/8af928e7-9473-4306-ab1b-3e6f07091c8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rFC1+3OK7Wy3gcw1+//3eG93EJrafAiGfASlc/1c+e4=","crlite_enrolled":false,"id":"1405f90f-5565-4eaf-b839-4cc432f5d0d6","last_modified":1562023862873},{"schema":1562023861362,"derHash":"xbZ5EGlYFS+D+1iG3cQfB4UZPvZ8aXW+PlCfF/KbeoY=","subject":"CN=GlobalSign R6 Admin CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIFI2IEFkbWluIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"d411527b2215bfc1772e8bbc2166bf5747830130b17f09875dd24cc7a2e36616","size":2003,"filename":"2TuBICswiXipsvQWl-U2oY732gn0rOk3bqUON3nbD5I=.pem","location":"security-state-staging/intermediates/77f7915f-d31c-40af-b0b8-7aed1e3c67b3.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2TuBICswiXipsvQWl+U2oY732gn0rOk3bqUON3nbD5I=","crlite_enrolled":true,"id":"8056d838-0202-4784-ba86-3b2c1652b669","last_modified":1562023862124},{"schema":1562023860621,"derHash":"77Kj83Jz01iQR5GYJepTN+m5OKjBeLYcGMK0JwuWZaw=","subject":"CN=DigiCert Federated ID L4 CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IEZlZGVyYXRlZCBJRCBMNCBDQQ==","whitelist":false,"attachment":{"hash":"e33421e9de9bb46d59d4535e270f3a16d15114db462071faf04cdfb5ded34219","size":1922,"filename":"5fYPs_zqPfuLvwmwbyYHfEa_uzaWa2EbbczMDStZEYY=.pem","location":"security-state-staging/intermediates/bc53ef2a-bdb3-4134-a63e-f5e5443ce163.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5fYPs/zqPfuLvwmwbyYHfEa/uzaWa2EbbczMDStZEYY=","crlite_enrolled":false,"id":"2b3c12c4-e1b4-4036-aea5-c8c07ccc99d3","last_modified":1562023861354},{"schema":1562023858358,"derHash":"GDWw5ILqZVNvwBDkvBPAYPZWaBZfupfi9ULOlspt/vw=","subject":"CN=Entrust Certification Authority - L1F,OU=See www.entrust.net/legal-terms+OU=(c) 2016 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTYgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFG","whitelist":false,"attachment":{"hash":"b215df35bd16df20092886331099193a624ea14d00398b12325bb57279cf4181","size":1410,"filename":"45FtWowsHe863G4x3FzC8qT3R9tgrLIVwZGjN5hwd80=.pem","location":"security-state-staging/intermediates/60dd4560-425b-4a39-9729-7bc1fc60adbc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"45FtWowsHe863G4x3FzC8qT3R9tgrLIVwZGjN5hwd80=","crlite_enrolled":true,"id":"7cb091bb-e197-494b-8caa-a6f3725b7737","last_modified":1562023859119},{"schema":1562023856875,"derHash":"M3rFbzn7iHe58FJFVLdV0YNagH/8kFjfxt4bcH9pYSM=","subject":"CN=Certum Class I CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MHYxCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGjAYBgNVBAMTEUNlcnR1bSBDbGFzcyBJIENB","whitelist":false,"attachment":{"hash":"1c717a79efa6612fceeb4dd338a92b801131469bafdebec7a6c46a0ecbc22049","size":2414,"filename":"Wr7s1eee1m0JS_6tdr5Yu_rJOpqsjsb8IeNchmSjkL4=.pem","location":"security-state-staging/intermediates/475a2a7a-38fc-478b-ae6a-f0659a08775d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Wr7s1eee1m0JS/6tdr5Yu/rJOpqsjsb8IeNchmSjkL4=","crlite_enrolled":false,"id":"b84bfc47-4590-4d6c-b85e-ceb5465f3c63","last_modified":1562023857605},{"schema":1562023856138,"derHash":"AJhxw6TGBzEeWukvAQlfm/dhALh5SrCppSEOZ5TIYHw=","subject":"CN=Trust Provider B.V. TLS RSA CA G1,OU=Domain Validated SSL,O=Trust Provider B.V.,C=NL","subjectDN":"MHYxCzAJBgNVBAYTAk5MMRwwGgYDVQQKExNUcnVzdCBQcm92aWRlciBCLlYuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEqMCgGA1UEAxMhVHJ1c3QgUHJvdmlkZXIgQi5WLiBUTFMgUlNBIENBIEcx","whitelist":false,"attachment":{"hash":"be93cbc768b2a781054d69b3d1b32596d09aabb573a067ff44e5770bc18fb99e","size":1687,"filename":"DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN_FbGZLM=.pem","location":"security-state-staging/intermediates/00957b9f-f181-49ab-a3e6-7197b2141488.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DZ2CNIcIqZj3arOg4dqY2nkxRPJTRypLcTMN/FbGZLM=","crlite_enrolled":true,"id":"478147bd-3418-4c7f-8860-2be1d4c12427","last_modified":1562023856867},{"schema":1562023855404,"derHash":"B0VB7N+I7Zku1a3j7N3vJ6JrobREgKGVwKja2uJSHY4=","subject":"CN=GeoTrust SSL CA - G3,O=GeoTrust Inc.,C=US","subjectDN":"MEQxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQDExRHZW9UcnVzdCBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"4e997aea59ed936c28e58cecab18f43ae0848c11ca0390f85e3cd97d9a16b9ee","size":1553,"filename":"PbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=.pem","location":"security-state-staging/intermediates/3a8a386b-c548-4e8c-a1a3-cc450d46c6e2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=","crlite_enrolled":true,"id":"b3409488-e32c-4056-88d1-f4d89941e37e","last_modified":1562023856130},{"schema":1562023852415,"derHash":"/5EtVAP9psuxpyS+tgtK0bT5vllFJe4fFkiMA5840u4=","subject":"CN=BlackCert\\, Inc. RSA Client Certification Authority,O=BlackCert\\, Inc.,L=Denver,ST=CO,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08xDzANBgNVBAcTBkRlbnZlcjEYMBYGA1UEChMPQmxhY2tDZXJ0LCBJbmMuMTswOQYDVQQDEzJCbGFja0NlcnQsIEluYy4gUlNBIENsaWVudCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"820b9d9225f295df2cec72638271e9e4972f857ab19ffd4040452777bda1e8dc","size":2146,"filename":"J0cNZ23ANHAptnJJaXt70Dv2laxN8JC5meZIFs6ch2Q=.pem","location":"security-state-staging/intermediates/decccfcf-7e23-48b9-afd0-c27621db52cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"J0cNZ23ANHAptnJJaXt70Dv2laxN8JC5meZIFs6ch2Q=","crlite_enrolled":false,"id":"64a81e56-72d4-4533-aad1-0048e8806a7a","last_modified":1562023853161},{"schema":1562023851676,"derHash":"Xxg5DyFJApKglf/zgPLokn3TFZIjp2ET7eNXqisxHB8=","subject":"CN=Gehirn Managed Certification Authority - ECC EV,OU=Controlled by COMODO CA exclusively for Gehirn Inc.,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIHAMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTwwOgYDVQQLEzNDb250cm9sbGVkIGJ5IENPTU9ETyBDQSBleGNsdXNpdmVseSBmb3IgR2VoaXJuIEluYy4xODA2BgNVBAMTL0dlaGlybiBNYW5hZ2VkIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUNDIEVW","whitelist":false,"attachment":{"hash":"9430085f782a8e581ee60b50f4aee87fd9ca49475d6c5378b586ff578827bbc5","size":1435,"filename":"qSizb9i49llI7pUZp1-Y6gXcrABhDgM-8a1v9VWvTnY=.pem","location":"security-state-staging/intermediates/52c95b67-44ae-45fe-a516-574047902f4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qSizb9i49llI7pUZp1+Y6gXcrABhDgM+8a1v9VWvTnY=","crlite_enrolled":false,"id":"2fece5dc-21db-4816-a010-1fbd706af66a","last_modified":1562023852406},{"schema":1562023850204,"derHash":"/yAcoSyHpvDLpkPpq7PJVMkVWt0xObLi6u0RS/n3XTE=","subject":"CN=COMODO RSA Domain Validation Secure Server CA 2,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDI=","whitelist":false,"attachment":{"hash":"c3af80c298bee7bb78b92a6907c2737f0f2499d7469ab1445b6ac2c3afca282e","size":2154,"filename":"EULHwYvGhknyznoBvyvgbidiBH3JX3eFHHlIO3YK8Ek=.pem","location":"security-state-staging/intermediates/8acfb92a-ce66-4fb5-b98b-4972b2012e02.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EULHwYvGhknyznoBvyvgbidiBH3JX3eFHHlIO3YK8Ek=","crlite_enrolled":true,"id":"d7edf4f6-8ea9-48ae-8d08-69ed5736f29e","last_modified":1562023850930},{"schema":1562023847212,"derHash":"lA0vISoqOcyEvULQ9txPe6TEd+elqZIslrn17BTkpsg=","subject":"SERIALNUMBER=ZZZZZZA2,CN=Siemens Issuing CA EE Auth 2016,OU=Siemens Trust Center,O=Siemens,L=Muenchen,ST=Bayern,C=DE","subjectDN":"MIGfMQswCQYDVQQGEwJERTEPMA0GA1UECAwGQmF5ZXJuMREwDwYDVQQHDAhNdWVuY2hlbjEQMA4GA1UECgwHU2llbWVuczERMA8GA1UEBRMIWlpaWlpaQTIxHTAbBgNVBAsMFFNpZW1lbnMgVHJ1c3QgQ2VudGVyMSgwJgYDVQQDDB9TaWVtZW5zIElzc3VpbmcgQ0EgRUUgQXV0aCAyMDE2","whitelist":false,"attachment":{"hash":"1bc1c575c0c25eabed479a2d3598ce3f07b4fa37c821f8112919dea06b3659f9","size":2637,"filename":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=.pem","location":"security-state-staging/intermediates/c93ab0f3-290e-4e26-865c-fad95f2e5e95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"mK19rDzuSvRGMEDPJLlMOI0yXJx2HMcqf75ficQsHb4=","crlite_enrolled":true,"id":"73d53000-4514-4e59-9781-f064a11afe8f","last_modified":1562023847950},{"schema":1562023846475,"derHash":"pq55WaGVdJyohzhvoESCvRadwRV+MS0wGw1cMz+vKwI=","subject":"CN=IBM New Zealand Limited Public CA,OU=Symantec Trust Network,O=IBM New Zealand Limited,C=NZ","subjectDN":"MHwxCzAJBgNVBAYTAk5aMSAwHgYDVQQKExdJQk0gTmV3IFplYWxhbmQgTGltaXRlZDEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEqMCgGA1UEAxMhSUJNIE5ldyBaZWFsYW5kIExpbWl0ZWQgUHVibGljIENB","whitelist":false,"attachment":{"hash":"e26288de5e13511bcb13ccfd1f3dfda1cb52a4b8d5f3b28f5c139bc3c2323669","size":1398,"filename":"Zq0nTmnMxQ4X8EbS5Miz_8_bZskoyMZcrqwzFr53uGY=.pem","location":"security-state-staging/intermediates/bbd5d60b-441a-4059-9ca1-2294ac6e4d52.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Zq0nTmnMxQ4X8EbS5Miz/8/bZskoyMZcrqwzFr53uGY=","crlite_enrolled":false,"id":"69507212-dd76-4998-9e40-0c068a88a0b1","last_modified":1562023847205},{"schema":1562023844992,"derHash":"GlzNcUq9fHr1Kg+pRrycj4aWvL8ifYEzlDDl0zlOzJc=","subject":"CN=TU Ilmenau CA G2,O=Technische Universitaet Ilmenau,C=DE","subjectDN":"MFIxCzAJBgNVBAYTAkRFMSgwJgYDVQQKDB9UZWNobmlzY2hlIFVuaXZlcnNpdGFldCBJbG1lbmF1MRkwFwYDVQQDDBBUVSBJbG1lbmF1IENBIEcy","whitelist":false,"attachment":{"hash":"ac88cae9a73fc870c8732cac7b3ef3c93112a4abcf6b7e4ed2de251558a6cd88","size":1951,"filename":"6SXfWL___HfILksBCAAWXWAQClUVsEeSl6Lg8jmVlWo=.pem","location":"security-state-staging/intermediates/4aa70727-c6f8-46b4-9a57-73a0a9d47ebd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"6SXfWL///HfILksBCAAWXWAQClUVsEeSl6Lg8jmVlWo=","crlite_enrolled":true,"id":"4a92eec8-9b5a-4058-aff9-c75fd8949758","last_modified":1562023845732},{"schema":1562023844250,"derHash":"2uNDT2lvyfD2UuGypvabXpJz0J9DvTvdRxfWFB+M0sI=","subject":"OU=Public Certification Authority - G2,O=Chunghwa Telecom Co.\\, Ltd.,C=TW","subjectDN":"MGAxCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEsMCoGA1UECwwjUHVibGljIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzI=","whitelist":false,"attachment":{"hash":"d35775690c65ebee8113249b23f19a293655d0ed08e999f64243089ed009db1b","size":2129,"filename":"tnFqrstaexEa6Zz-CVGGozhI8IF1FafM6uzX3zzHrUI=.pem","location":"security-state-staging/intermediates/07e9d719-440e-4db5-9e24-7f15cd5cee54.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tnFqrstaexEa6Zz+CVGGozhI8IF1FafM6uzX3zzHrUI=","crlite_enrolled":true,"id":"9bae286e-930a-4285-8a27-54c6509f3077","last_modified":1562023844984},{"schema":1562023843492,"derHash":"8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=","subject":"CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN","subjectDN":"MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB","whitelist":false,"attachment":{"hash":"bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b","size":1963,"filename":"uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem","location":"security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=","crlite_enrolled":true,"id":"b2b776e5-2b2f-4c8e-819d-026b8d3855d2","last_modified":1562023844242},{"schema":1562023842756,"derHash":"OuaZ2U6P69rLhtT5DUCQMzNHjmXgZVxDJFEZfjP6B/I=","subject":"CN=DarkMatter High Assurance CA,O=DarkMatter LLC,C=AE","subjectDN":"ME0xCzAJBgNVBAYTAkFFMRcwFQYDVQQKDA5EYXJrTWF0dGVyIExMQzElMCMGA1UEAwwcRGFya01hdHRlciBIaWdoIEFzc3VyYW5jZSBDQQ==","whitelist":false,"attachment":{"hash":"29e18c8b9486962fd829de646542f3e70fd375aee342613cc9acf89995787849","size":2467,"filename":"eBpM8ukkUvPuAdDDgaQhTzkEFlw5CtvWH80RJE4Jstw=.pem","location":"security-state-staging/intermediates/11f4327c-4223-417d-ade5-2d4d436b18d2.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBpM8ukkUvPuAdDDgaQhTzkEFlw5CtvWH80RJE4Jstw=","crlite_enrolled":true,"id":"c5819102-1052-4780-bcdd-3eaa82f68270","last_modified":1562023843484},{"schema":1562023842017,"derHash":"aXDjlmIUF9zuMVqsKLteoxYfF1Ag9/Tpuhfa3ljbsI0=","subject":"CN=WoTrus DV SSL CA,O=WoTrus CA Limited,C=CN","subjectDN":"MEQxCzAJBgNVBAYTAkNOMRowGAYDVQQKDBFXb1RydXMgQ0EgTGltaXRlZDEZMBcGA1UEAwwQV29UcnVzIERWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"c00640d76f2191d5d2fd5624662ed82ab5430015987a69f81f883cdc4d5a7b43","size":1691,"filename":"qo1QyzYCUCM6TTpkflyWle2ERuNQ8q7_99oCt1RmDgk=.pem","location":"security-state-staging/intermediates/ac244e93-fe89-4324-8196-d9da2b7bf0b9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qo1QyzYCUCM6TTpkflyWle2ERuNQ8q7/99oCt1RmDgk=","crlite_enrolled":true,"id":"b97451e0-61f4-46a5-908d-5fd947861af6","last_modified":1562023842749},{"schema":1562023841259,"derHash":"tquNsRC19tNf2aa1/3Bx2EJmWBJsQlYpvHzaMTVPTNA=","subject":"CN=FUJIFILM Fnet CA - C,O=FUJIFILM,C=JP","subjectDN":"MD8xCzAJBgNVBAYTAkpQMREwDwYDVQQKEwhGVUpJRklMTTEdMBsGA1UEAxMURlVKSUZJTE0gRm5ldCBDQSAtIEM=","whitelist":false,"attachment":{"hash":"cdd8e18850561e92de8d49cb4cb56e71a16a242cdd3c288f43a03ddfa92e4412","size":1589,"filename":"BF0M6q5HK3EucyPuMYh1-P2tykWlFWnyzlFrzFQqvGQ=.pem","location":"security-state-staging/intermediates/2ec396dc-b563-4cbd-930d-7de56991f018.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BF0M6q5HK3EucyPuMYh1+P2tykWlFWnyzlFrzFQqvGQ=","crlite_enrolled":false,"id":"2fa5f637-6677-49f4-906f-ffde7b0d2f40","last_modified":1562023842008},{"schema":1562023839762,"derHash":"qmojgKfoJU2tRiCuCJXedAR/M/Umh1jc8nxNKAs4SlA=","subject":"CN=Trust Technologies Global Client CA,OU=Digital Identity and Security,O=Telecom Italia Trust Technologies S.r.l.,C=IT","subjectDN":"MIGWMQswCQYDVQQGEwJJVDExMC8GA1UEChMoVGVsZWNvbSBJdGFsaWEgVHJ1c3QgVGVjaG5vbG9naWVzIFMuci5sLjEmMCQGA1UECxMdRGlnaXRhbCBJZGVudGl0eSBhbmQgU2VjdXJpdHkxLDAqBgNVBAMTI1RydXN0IFRlY2hub2xvZ2llcyBHbG9iYWwgQ2xpZW50IENB","whitelist":false,"attachment":{"hash":"a1ebd3c53dcb40baac891b57ab477f14d4b3afc34c91a62b5b8c580f800493e3","size":1707,"filename":"BbI65NDhxD_m5B-mPY1xvko26icvW3iWYISpR9SvWC8=.pem","location":"security-state-staging/intermediates/115c0963-8f7c-4505-be5a-c66871482aea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BbI65NDhxD/m5B+mPY1xvko26icvW3iWYISpR9SvWC8=","crlite_enrolled":false,"id":"f99c32e0-0924-4435-8934-7158db6251b8","last_modified":1562023840499},{"schema":1562023839017,"derHash":"RVTCEMdRrIIRtuIEa3n2iv/ICCJ0rqSJA4ZgYgxBgt0=","subject":"CN=SECOM Passport for Member PUB CA3,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGMMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSowKAYDVQQDEyFTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTM=","whitelist":false,"attachment":{"hash":"96b4ebc82851db1b6b6ae2984c856e75f401999eefa282134fbfd11c3a759e77","size":1581,"filename":"MVOOkY-CSvhzP9Q_l-rKIx-_Qt7f3yC8pbQgH0FQpXQ=.pem","location":"security-state-staging/intermediates/436cd56f-7584-4ad0-a820-72c2b5a9f1f7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MVOOkY+CSvhzP9Q/l+rKIx+/Qt7f3yC8pbQgH0FQpXQ=","crlite_enrolled":false,"id":"5b698c8f-82c1-4637-a282-76a058f19fab","last_modified":1562023839754},{"schema":1562023837538,"derHash":"9unOsfPDaJhR+IYFVTHacu0LxeVtFkkls65/3OhxfXA=","subject":"CN=KeyNet Systems RSA OV CA,O=KeyNet Systems LLC,L=Las Vegas,ST=Nevada,C=US","subjectDN":"MHIxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZOZXZhZGExEjAQBgNVBAcTCUxhcyBWZWdhczEbMBkGA1UEChMSS2V5TmV0IFN5c3RlbXMgTExDMSEwHwYDVQQDExhLZXlOZXQgU3lzdGVtcyBSU0EgT1YgQ0E=","whitelist":false,"attachment":{"hash":"6834156d59e4d2f03dd0abbc702c34e050c4e798044b5f6fd911b3a37b351e43","size":2138,"filename":"yZ5Axfrz6TT2LCftMDwKgTE4QQ41sZW0CP1oieeztpI=.pem","location":"security-state-staging/intermediates/db3a4237-c968-435f-bb9d-f34cd5995771.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yZ5Axfrz6TT2LCftMDwKgTE4QQ41sZW0CP1oieeztpI=","crlite_enrolled":false,"id":"f5924da9-0730-47bb-8e5a-9c4b647cc493","last_modified":1562023838272},{"schema":1562023834547,"derHash":"tgQCajWQOSq++2sY6BdkU2VhFdKgBg9xPhkan9B2Uyo=","subject":"CN=CompuGroup Medical Certificate Authority,OU=IT,O=Compugroup Medical\\, Inc,C=US","subjectDN":"MG8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdDb21wdWdyb3VwIE1lZGljYWwsIEluYzELMAkGA1UECxMCSVQxMTAvBgNVBAMTKENvbXB1R3JvdXAgTWVkaWNhbCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHk=","whitelist":false,"attachment":{"hash":"3a3807e9e6c4883a2bab883da53e548b6e33e80835bb71a8d682deec8a1bc5a9","size":2207,"filename":"jiFd49hgJ7OqvKchE20pWzOluAN8L1TBxe0YBzN5oPc=.pem","location":"security-state-staging/intermediates/f37211f9-f5d2-4ab2-8d21-68f22e873847.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jiFd49hgJ7OqvKchE20pWzOluAN8L1TBxe0YBzN5oPc=","crlite_enrolled":false,"id":"7d0b7d8e-c334-41a4-92af-d211360e2f37","last_modified":1562023835290},{"schema":1562023831541,"derHash":"h38kznD0owR+TqcL7BvDG+m2Uzrf86OT/5v7PIEClEY=","subject":"CN=TrustAsia TLS ECC CA G9,OU=Domain Validated SSL,O=TrustAsia Technologies\\, Inc.,C=CN","subjectDN":"MHUxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXVHJ1c3RBc2lhIFRMUyBFQ0MgQ0EgRzk=","whitelist":false,"attachment":{"hash":"619365f9c59d0f0dcfcb64ba525d68621f75fadebe181e15429e3dc854262b7c","size":1191,"filename":"z_Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=.pem","location":"security-state-staging/intermediates/94070f05-b053-49e6-8de7-0b2dba8ba010.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"z/Y0aMrBs7J0RBthUJnRbIqFivDK0vBrLe1Q3OF0GjQ=","crlite_enrolled":false,"id":"5ba8fcec-1524-40f5-bf99-0dd3b9641a19","last_modified":1562023832267},{"schema":1562023830806,"derHash":"V0NCratO1573gY6CmQWOHAcawOQx/kIcq7Yt9NTp5MU=","subject":"CN=Atos TrustedRoot Issuing CA for Primetals 2015,O=Atos,C=DE","subjectDN":"MFUxNzA1BgNVBAMMLkF0b3MgVHJ1c3RlZFJvb3QgSXNzdWluZyBDQSBmb3IgUHJpbWV0YWxzIDIwMTUxDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRF","whitelist":false,"attachment":{"hash":"5ade36d683c37e2eead15d6a475ad0cea29346f577f4600faa9a32397f52bb2c","size":1581,"filename":"Ed79H7X5vQv3PR5-yCPH4ihzJhZFJlA-HsWA-xT7qAI=.pem","location":"security-state-staging/intermediates/8efad479-fc51-47cc-b880-7913a377291d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Ed79H7X5vQv3PR5+yCPH4ihzJhZFJlA+HsWA+xT7qAI=","crlite_enrolled":false,"id":"05eaf66f-1805-4619-9d87-bf6d7bfd6e36","last_modified":1562023831534},{"schema":1562023828546,"derHash":"qClEStL7SAeaWV+72IxOZY7iCJpeEpuJqqzOhRGY/9c=","subject":"CN=Symantec Class 3 Shared Public Organization CA - SHA1,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGNMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxPjA8BgNVBAMTNVN5bWFudGVjIENsYXNzIDMgU2hhcmVkIFB1YmxpYyBPcmdhbml6YXRpb24gQ0EgLSBTSEEx","whitelist":false,"attachment":{"hash":"021a80512da52a65049663e34f330aa42c4e0cc02a4cee9b9008dadeb792a9d4","size":2194,"filename":"2U0T8GZhpLigHF6ChDBAZpgEBhCK4QPSSnTb09TAv6I=.pem","location":"security-state-staging/intermediates/e26d09a9-b1e2-47b9-b856-b66a98cf8a8f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"2U0T8GZhpLigHF6ChDBAZpgEBhCK4QPSSnTb09TAv6I=","crlite_enrolled":false,"id":"d2495fba-828e-4b4f-bc15-e38ee9827c0a","last_modified":1562023829273},{"schema":1562023826316,"derHash":"Aldk5uGdkLxsxwZpRFWT1T/A2YNve5QoA2IIYQtTmUM=","subject":"CN=TrustSign ECC EV CA,OU=Controlled by Sectigo exclusively for Ziwit,O=Ziwit,L=Montpellier,ST=Herault,C=FR","subjectDN":"MIGZMQswCQYDVQQGEwJGUjEQMA4GA1UECBMHSGVyYXVsdDEUMBIGA1UEBxMLTW9udHBlbGxpZXIxDjAMBgNVBAoTBVppd2l0MTQwMgYDVQQLEytDb250cm9sbGVkIGJ5IFNlY3RpZ28gZXhjbHVzaXZlbHkgZm9yIFppd2l0MRwwGgYDVQQDExNUcnVzdFNpZ24gRUNDIEVWIENB","whitelist":false,"attachment":{"hash":"eb2d6f05c96f188381bd1171d6fa4afb21d12035743de566ce609f7ca5bda596","size":1382,"filename":"JtXGnD_eYf2MNlncNj_WbCi9uD6VYCdIXyT735ieGbg=.pem","location":"security-state-staging/intermediates/1010923c-cbc6-4d1e-8ed2-ffce2c0fa2fb.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JtXGnD/eYf2MNlncNj/WbCi9uD6VYCdIXyT735ieGbg=","crlite_enrolled":false,"id":"04d89624-479a-4a19-a2f7-29d3230db81f","last_modified":1562023827049},{"schema":1562023825546,"derHash":"Yy/Wl7rK8e0jJRfsm3Yit8JeFEiwzGJrMyhnGeNRzoo=","subject":"CN=Giesecke and Devrient CA,OU=Corporate CA,O=Giesecke and Devrient,L=Munich,C=DE","subjectDN":"MHgxCzAJBgNVBAYTAkRFMQ8wDQYDVQQHEwZNdW5pY2gxHjAcBgNVBAoTFUdpZXNlY2tlIGFuZCBEZXZyaWVudDEVMBMGA1UECxMMQ29ycG9yYXRlIENBMSEwHwYDVQQDExhHaWVzZWNrZSBhbmQgRGV2cmllbnQgQ0E=","whitelist":false,"attachment":{"hash":"e464f73793737913979fd573cde24680aa6beb3d0a1536caf6f84d2dd0928efd","size":2832,"filename":"x-foNQ4x_jlYBHMXga5zVB0UNOMRxxnju5lOjtuhUmo=.pem","location":"security-state-staging/intermediates/3350d069-eb24-4e49-887f-4b126aa2bbcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"x+foNQ4x/jlYBHMXga5zVB0UNOMRxxnju5lOjtuhUmo=","crlite_enrolled":false,"id":"c48b6fd8-b06a-407e-aa0d-d68bddb6bea1","last_modified":1562023826309},{"schema":1562023823312,"derHash":"+Tc4W4j2WYQJCUB7gOTrJfJcW0rq757ieYgO4L8F7e8=","subject":"CN=Certification Authority,OU=Ministry of Defense,O=Japanese Government,C=JP","subjectDN":"MGsxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRwwGgYDVQQLExNNaW5pc3RyeSBvZiBEZWZlbnNlMSAwHgYDVQQDExdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"98d0179cfafdd09af29ed667827cfc04e1bc4ad4d0f7eec2b6d464dd2cf6b378","size":1650,"filename":"KbQxsgiSt363tFvyQehFWksqyFq4Y5_GQHqCruQ7lPA=.pem","location":"security-state-staging/intermediates/313fc711-872f-4c90-bbdc-d86cea66d801.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KbQxsgiSt363tFvyQehFWksqyFq4Y5/GQHqCruQ7lPA=","crlite_enrolled":false,"id":"26fa37cb-aba7-4e95-8382-5b64698bfbee","last_modified":1562023824045},{"schema":1562023819546,"derHash":"u2YddQxTFmGBgHpomP1GQGXOWSmJhq1m2db//LvUc4o=","subject":"CN=NetLock Expressz Eat. (Class C Legal) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIG1MQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTFDMEEGA1UEAww6TmV0TG9jayBFeHByZXNzeiBFYXQuIChDbGFzcyBDIExlZ2FsKSBUYW7DunPDrXR2w6FueWtpYWTDsw==","whitelist":false,"attachment":{"hash":"cf7c4f8886152f1548287e1f1314115b3db7ea5a596a43daa585a1a0e2f9e79c","size":2198,"filename":"-QUSW1ozNhu9biYeUP4qycv4BLZu3JGAci7jNGIo4PI=.pem","location":"security-state-staging/intermediates/408172d6-6f39-4e21-9ed3-d79b6dd424a4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"+QUSW1ozNhu9biYeUP4qycv4BLZu3JGAci7jNGIo4PI=","crlite_enrolled":false,"id":"9ccfdb3e-9fe2-4d0c-a088-5e0ba1450d2e","last_modified":1562023820285},{"schema":1562023816556,"derHash":"KzDV6RKQY1jJrW+1f9ezaKAaeOOVtOwRZFxbmKCWfeg=","subject":"CN=KDDI Web Communications Certification Authority 3,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MHAxCzAJBgNVBAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMTowOAYDVQQDEzFLRERJIFdlYiBDb21tdW5pY2F0aW9ucyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAz","whitelist":false,"attachment":{"hash":"060dbe29951ae1012870c4ee26bb98926968e0fea64e43fdc0746acf31108a56","size":1687,"filename":"jIWLX2MDYLP12p947FUGxwdJR8AY8yPcYv_TpWUNDQQ=.pem","location":"security-state-staging/intermediates/a8e2cd0b-0920-44ce-9620-e32ff03bd8cd.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"jIWLX2MDYLP12p947FUGxwdJR8AY8yPcYv/TpWUNDQQ=","crlite_enrolled":true,"id":"7fe81ac3-e601-4e9c-ac30-be5018f136a5","last_modified":1562023817313},{"schema":1562023815806,"derHash":"c/gpVfkx3GgCvQfF0d+UBBE/PCJPel5yBAvkQuQfMvw=","subject":"OU=Trustis FPS FF Issuing Authority,O=Trustis Limited,C=GB","subjectDN":"MFIxCzAJBgNVBAYTAkdCMRgwFgYDVQQKEw9UcnVzdGlzIExpbWl0ZWQxKTAnBgNVBAsTIFRydXN0aXMgRlBTIEZGIElzc3VpbmcgQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"25f4051ff993ea304d7f826c473763beaba1048c4d81074983e9c6f45e52dd86","size":1951,"filename":"dcSuTd19rcEF97RhSta5TbUNWKHIOxrSRcDupjDbXZk=.pem","location":"security-state-staging/intermediates/cc33bc05-8ad8-4986-be9b-8acea0f3c2ea.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dcSuTd19rcEF97RhSta5TbUNWKHIOxrSRcDupjDbXZk=","crlite_enrolled":true,"id":"f6fd8e6c-c71d-462f-afa0-7dad266d9359","last_modified":1562023816547},{"schema":1562023814315,"derHash":"eZjyXc21sR/yrpRhu9mNAn3vIuCOW4LkuvvLYLeeziM=","subject":"SERIALNUMBER=201401,CN=Foreigner CA,C=BE","subjectDN":"MDUxCzAJBgNVBAYTAkJFMRUwEwYDVQQDEwxGb3JlaWduZXIgQ0ExDzANBgNVBAUTBjIwMTQwMQ==","whitelist":false,"attachment":{"hash":"b8bed1769b1a6ef9bcc9789fbb84f0881a40be844acb824e8b7f3703ba48b3a3","size":1402,"filename":"fvtABvaKOw2PF9nCsZUaEY9iC6VzN_FdQiP1jFR7a-s=.pem","location":"security-state-staging/intermediates/d5d9747a-bbb1-42d0-8885-da78b8cf26f5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fvtABvaKOw2PF9nCsZUaEY9iC6VzN/FdQiP1jFR7a+s=","crlite_enrolled":false,"id":"dab01327-2eca-4caf-840f-1812c8c9f612","last_modified":1562023815061},{"schema":1562023813549,"derHash":"teRJHPHgoGwZRB+sKVtngiZClgP8xBTGJuIQsu/JXwA=","subject":"CN=Certigna Identity CA,OU=0002 48146308100036,O=DHIMYOTIS,C=FR","subjectDN":"MIGCMQswCQYDVQQGEwJGUjESMBAGA1UECgwJREhJTVlPVElTMRwwGgYDVQQLDBMwMDAyIDQ4MTQ2MzA4MTAwMDM2MSIwIAYDVQRhDBlOVFJGUi0wMDAyIDQ4MTQ2MzA4MTAwMDM2MR0wGwYDVQQDDBRDZXJ0aWduYSBJZGVudGl0eSBDQQ==","whitelist":false,"attachment":{"hash":"8fffbc881ae6f4ef224bc772397cce665787accfbbd9be25a200ea93e8a42613","size":2515,"filename":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH_eJZlWjWo=.pem","location":"security-state-staging/intermediates/56d8fb27-0de0-4b61-ab41-299e1d0c14c9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"lwJkDQYtogkGJEFJMX5DjskCXh2W7dNBRH/eJZlWjWo=","crlite_enrolled":true,"id":"52365c35-c17b-4e16-abb3-36a0687ea4c5","last_modified":1562023814306},{"schema":1562023812811,"derHash":"zhA5EhatpGw3a3MzcVd3p5LY1CK9fF4G/i63laANx+w=","subject":"CN=McAfee Client/Email CA 2,O=McAfee\\, Inc.,L=Santa Clara,ST=CA,C=US","subjectDN":"MGoxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExFTATBgNVBAoTDE1jQWZlZSwgSW5jLjEhMB8GA1UEAxMYTWNBZmVlIENsaWVudC9FbWFpbCBDQSAy","whitelist":false,"attachment":{"hash":"5bc268b7826fdc5d76c11010496322362492a8274003d0c6398bb7a54848e55a","size":2113,"filename":"TPnIj68eKdodJLOk1P1H6qztrjvIWD_sPyWq4s3vSGk=.pem","location":"security-state-staging/intermediates/1885f863-9e79-45a0-8f72-a556a1d3cb95.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"TPnIj68eKdodJLOk1P1H6qztrjvIWD/sPyWq4s3vSGk=","crlite_enrolled":false,"id":"55049def-d1d5-49b8-b27e-784120a1d096","last_modified":1562023813542},{"schema":1562023812053,"derHash":"a+fQTiD/wo8ZjKiPwMNkR4T9FWkDvweBMPuWTAJY26A=","subject":"CN=United Parcel Service\\, Inc. RSA OV CA,O=United Parcel Service\\, Inc.,L=Atlanta,ST=GA,C=US","subjectDN":"MIGCMQswCQYDVQQGEwJVUzELMAkGA1UECBMCR0ExEDAOBgNVBAcTB0F0bGFudGExJDAiBgNVBAoTG1VuaXRlZCBQYXJjZWwgU2VydmljZSwgSW5jLjEuMCwGA1UEAxMlVW5pdGVkIFBhcmNlbCBTZXJ2aWNlLCBJbmMuIFJTQSBPViBDQQ==","whitelist":false,"attachment":{"hash":"392ca8f231a1c38f1201cf145dde7d73e1d632d11a6ea3ed9f59160e766185e2","size":2142,"filename":"SwXmbcFTOEV-82sxJhAl0R-uGVTqV9eWCnYAM12xQYs=.pem","location":"security-state-staging/intermediates/f3550763-54ff-4877-a395-498babc118ff.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SwXmbcFTOEV+82sxJhAl0R+uGVTqV9eWCnYAM12xQYs=","crlite_enrolled":false,"id":"9ef159f4-984f-41ba-974e-093e836bf9ed","last_modified":1562023812803},{"schema":1562023811314,"derHash":"U1cNBeQNxi+d+R0Vr7AVtWqqaAwgzBaObVfZRsnOJoQ=","subject":"CN=QuoVadis Swiss Regulated CA G1,O=QuoVadis Trustlink Schweiz AG,C=CH","subjectDN":"MH4xCzAJBgNVBAYTAkNIMR4wHAYDVQRhDBVOVFJDSC1DSEUtMTEyLjIxMC4zNDkxJjAkBgNVBAoMHVF1b1ZhZGlzIFRydXN0bGluayBTY2h3ZWl6IEFHMScwJQYDVQQDDB5RdW9WYWRpcyBTd2lzcyBSZWd1bGF0ZWQgQ0EgRzE=","whitelist":false,"attachment":{"hash":"22b9742847b9ab6abdad54c699e9692ed9618e8671e4046c99fa2af1b0a3a426","size":2540,"filename":"60b_Hr5z04YiWfrcZlkQZtKfGEaLb5KOd9VjN9uVRks=.pem","location":"security-state-staging/intermediates/f24f46f5-7719-4f04-9db5-6e705c7e8bd8.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"60b/Hr5z04YiWfrcZlkQZtKfGEaLb5KOd9VjN9uVRks=","crlite_enrolled":true,"id":"b33e1999-4a4d-4f36-a44d-123037de65e1","last_modified":1562023812045},{"schema":1562023809819,"derHash":"aQ7yFLwRTvHXJr1+8D5UbNbLe+W8I/rNORJjv/tXlwo=","subject":"CN=cPanel High Assurance RSA Certification Authority,O=cPanel\\, Inc.,L=Houston,ST=TX,C=US","subjectDN":"MH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUWDEQMA4GA1UEBxMHSG91c3RvbjEVMBMGA1UEChMMY1BhbmVsLCBJbmMuMTowOAYDVQQDEzFjUGFuZWwgSGlnaCBBc3N1cmFuY2UgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"515ad74a8a9644ed7d7e651b809dee9f927e0c09028aa60161f5dd268ff3777d","size":6117,"filename":"btauesE0qNPMvYa1wCIsn_jg_om1G73FWer38Ur7kQE=.pem","location":"security-state-staging/intermediates/1a7b6383-a8d8-4f48-b6bb-f5a5cbc9883b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"btauesE0qNPMvYa1wCIsn/jg/om1G73FWer38Ur7kQE=","crlite_enrolled":true,"id":"97a2119a-a356-445c-8eb8-989fd062161b","last_modified":1562023810560},{"schema":1561997070297,"derHash":"gw/yBa5pSFBZw/sjdqfy+e4cKmHeJZ3QnQu2rWn4iDI=","subject":"SERIALNUMBER=Q2826004J,CN=AC Administraci\u00f3n P\u00fablica,OU=CERES,O=FNMT-RCM,C=ES","subjectDN":"MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh","whitelist":false,"attachment":{"hash":"1a643193c39cf1aa75be19f71a124a43c4ff5403f87361b228eed95bdccebd66","size":2438,"filename":"uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem","location":"security-state-staging/intermediates/b2066e9b-2ccd-4607-b8f6-e71ba0621bca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=","crlite_enrolled":true,"id":"a37e40f6-ffa2-4d26-992d-432521bce7f9","last_modified":1562023808306},{"schema":1559867790401,"derHash":"x0YLDt2htEyOIWSyNOvsw5YqajepNrdKbn1GaCk48IQ=","subject":"CN=DigiCert EV Code Signing CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IEVWIENvZGUgU2lnbmluZyBDQSAoU0hBMik=","whitelist":false,"attachment":{"hash":"66fbaa9bc2d541bb65b103b1e7beea732f29148f830f01aa655d2aa8a2fe0db4","size":2393,"filename":"pcpyVjsv8yFFdFLHtUAzS7ZJt2VTimUM6OuTLzMOqPM=.pem","location":"security-state-staging/intermediates/07f62659-5a1e-4940-901b-98a97d5a2c45.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pcpyVjsv8yFFdFLHtUAzS7ZJt2VTimUM6OuTLzMOqPM=","crlite_enrolled":true,"id":"aa338e39-dbdc-4d4b-a5fe-9098e2a81760","last_modified":1559867791204},{"schema":1559867775772,"derHash":"2byXP4iQlpbaEIMxl5RMpYrEqIhHd5yRMzdCZxAO7Fg=","subject":"CN=VeriSign Class 3 Public Primary Certification Authority - G5,OU=VeriSign Trust Network+OU=(c) 2006 VeriSign\\, Inc. - For authorized use only,O=VeriSign\\, Inc.,C=US","subjectDN":"MIHKMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA2IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHNQ==","whitelist":false,"attachment":{"hash":"8c27ef0472925897276a375939fcfb0a9923a56d945831850f7684af74691ced","size":2223,"filename":"JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=.pem","location":"security-state-staging/intermediates/26497f8c-d5cd-43b4-a151-49c3160d6679.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JbQbUG5JMJUoI6brnx0x3vZF6jilxsapbXGVfjhN8Fg=","crlite_enrolled":true,"id":"ca224e06-34d2-4a49-b0ac-eb7f3ad7719a","last_modified":1559867776576},{"schema":1559867708766,"derHash":"WuT3d0JrvFqoWYbKSNMZJwxVNiENyOoaKNUC9rNZUTg=","subject":"CN=Inpriva Direct Federated CA,O=Inpriva Inc,C=US","subjectDN":"MEkxCzAJBgNVBAYTAlVTMRQwEgYDVQQKEwtJbnByaXZhIEluYzEkMCIGA1UEAxMbSW5wcml2YSBEaXJlY3QgRmVkZXJhdGVkIENB","whitelist":false,"attachment":{"hash":"f7ea7da994e7d75e4255611ed437f7a154e0e25a76711ae142337c1b96640839","size":2138,"filename":"EbPRGHnlhhe6ua7F4tDHdk9b21suw0adgBJmLt7jZrk=.pem","location":"security-state-staging/intermediates/352fbe3e-0fa8-4a62-b3f6-bed976b2f7e7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"EbPRGHnlhhe6ua7F4tDHdk9b21suw0adgBJmLt7jZrk=","crlite_enrolled":false,"id":"343e0db4-ae27-43dc-a56b-2ab4c75e4c98","last_modified":1559867709576},{"schema":1559867705094,"derHash":"U3xcgHI2PhR8hNIdDSJItrmamopDMRZZg17DOSbaKGA=","subject":"CN=thawte DV SSL SHA256 CA,OU=Domain Validated SSL,O=thawte\\, Inc.,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMSAwHgYDVQQDExd0aGF3dGUgRFYgU1NMIFNIQTI1NiBDQQ==","whitelist":false,"attachment":{"hash":"7209c671afa40e770c49789601b57a8d17edff8f2a2e501da1b9703f954ca286","size":1743,"filename":"Rgf6Wnwbdv9nEsdxDeB2gCPXUB6C3Y3dDbU7tDwQ4Ic=.pem","location":"security-state-staging/intermediates/3584c5e9-3feb-421a-8dda-eee21cf023ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Rgf6Wnwbdv9nEsdxDeB2gCPXUB6C3Y3dDbU7tDwQ4Ic=","crlite_enrolled":true,"id":"2ad7d7e1-56fc-4751-a1c3-0c70bb9794d2","last_modified":1559867705882},{"schema":1559867684823,"derHash":"9nIr5ErNrltaizsLSvn0v15fvDlhz1JsvZdp0cbhSFk=","subject":"CN=Sectigo ECC Domain Validation Secure Server CA 2,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGRMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxOTA3BgNVBAMTMFNlY3RpZ28gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EgMg==","whitelist":false,"attachment":{"hash":"ad8ca4ef91dbda033c17e8dbf198a410d147227e58e0981a280cafe1867ccc27","size":1329,"filename":"Js263FpzCgFxGxbtSYGcowFcKG4SjKAkg5R8oucb6bk=.pem","location":"security-state-staging/intermediates/42ec9fe3-884f-4466-82dc-da23d6c795ca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Js263FpzCgFxGxbtSYGcowFcKG4SjKAkg5R8oucb6bk=","crlite_enrolled":false,"id":"814ba8eb-43a2-4b3e-9b40-cf9cb1b220b3","last_modified":1559867685643},{"schema":1559867653200,"derHash":"TvqqEECsL0TT3uIG2VIqKI2E7Djd9ZKYySbgL0ydmu8=","subject":"CN=TrustCor Basic Secure Site 2048 (CA1),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA","subjectDN":"MIGPMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLjAsBgNVBAMMJVRydXN0Q29yIEJhc2ljIFNlY3VyZSBTaXRlIDIwNDggKENBMSk=","whitelist":false,"attachment":{"hash":"da4d2d1acf769f58428741b22d18919f6c746cc708fc5aab39f601e0afbd27f6","size":1869,"filename":"eBBAlQ999Dnt37FkvhzStv4GMlSaWJN88WDxZob6g0Y=.pem","location":"security-state-staging/intermediates/6fc43816-7b30-430f-950f-7f7adea2e3d4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eBBAlQ999Dnt37FkvhzStv4GMlSaWJN88WDxZob6g0Y=","crlite_enrolled":true,"id":"1d9c258c-3953-4116-8203-74400019183e","last_modified":1559867653993},{"schema":1559867619107,"derHash":"ucMHOq10s2iDL1SXlY4nmx0nd8r4hBcTsoqxCkuqCBA=","subject":"CN=DigiCert Document Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IERvY3VtZW50IFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"f147cd6f9b30e75b6857e07676867168a2183790b5061a3544fa187e9c41df4e","size":2263,"filename":"d1lOi04HgnJxWnVWramDVXKL69TmdcUrD0KFSyHCY7M=.pem","location":"security-state-staging/intermediates/8b2d6f14-b216-4dec-b3ae-6faa8dc57067.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"d1lOi04HgnJxWnVWramDVXKL69TmdcUrD0KFSyHCY7M=","crlite_enrolled":false,"id":"fcc7df4d-c24e-429a-bdf8-9b73dadce6d1","last_modified":1559867619903},{"schema":1559867617469,"derHash":"e0ZNw4T9saUlwswnntDHz60kvs9yxGp9cJPRV8IXYH4=","subject":"CN=JCAN Public CA1 - G4,OU=JCAN Public CA1 - G4,O=JIPDEC,C=JP","subjectDN":"MFwxCzAJBgNVBAYTAkpQMQ8wDQYDVQQKEwZKSVBERUMxHTAbBgNVBAsTFEpDQU4gUHVibGljIENBMSAtIEc0MR0wGwYDVQQDExRKQ0FOIFB1YmxpYyBDQTEgLSBHNA==","whitelist":false,"attachment":{"hash":"30c35cbb85ffebbe17e8f88a88493ac33ccc34dfc4b87197d625a66ab72e0a78","size":1959,"filename":"3tMZPGsnKWPtXhCY57EqxEpfZ4PjoCUq1LLWjhMG9I8=.pem","location":"security-state-staging/intermediates/8f3170db-bb69-4c39-a416-2be83ba51135.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3tMZPGsnKWPtXhCY57EqxEpfZ4PjoCUq1LLWjhMG9I8=","crlite_enrolled":false,"id":"19617ac9-88d7-4f7a-967f-f43305320ae5","last_modified":1559867618287},{"schema":1559867612590,"derHash":"lrL4CiPKaOPLUzisX2izeqwZ4vPAhu79SlNBsR6uUIM=","subject":"SERIALNUMBER=201902,CN=Foreigner CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjEVMBMGA1UEAxMMRm9yZWlnbmVyIENBMQ8wDQYDVQQFEwYyMDE5MDI=","whitelist":false,"attachment":{"hash":"cbd7381d18982609b76855fd51bb7687605553c2c1995b88a61490857c5f2586","size":2337,"filename":"NU7LgS9pQbEK9tCUN7bjxgyP0twtIeis03XF3HkJgko=.pem","location":"security-state-staging/intermediates/fa6b4ebc-c0e3-4078-aec5-1bc0ea106000.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NU7LgS9pQbEK9tCUN7bjxgyP0twtIeis03XF3HkJgko=","crlite_enrolled":false,"id":"06a6e126-9df4-4e5a-a8a0-9e1d0340a8c1","last_modified":1559867613377},{"schema":1559867554956,"derHash":"YbrWiZIy9kFd4N6i1DTqTs3A8E7ztpDXyiPSfUa7BRU=","subject":"CN=Digi-Sign CA Digi-Code,O=Digi-Sign Limited,L=Dublin,ST=County Dublin,C=IE","subjectDN":"MHMxCzAJBgNVBAYTAklFMRYwFAYDVQQIEw1Db3VudHkgRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xGjAYBgNVBAoTEURpZ2ktU2lnbiBMaW1pdGVkMR8wHQYDVQQDExZEaWdpLVNpZ24gQ0EgRGlnaS1Db2Rl","whitelist":false,"attachment":{"hash":"ea5ce76b51e50b3bb54759596ed823dbf7f69f7a27c63ed3c45189716ca0a3a7","size":2109,"filename":"5jhR4E5Gjr25Cvky8Qt5e4EoRerWxLnksVkkE5tu9uo=.pem","location":"security-state-staging/intermediates/63f428cb-1cd8-493c-a2d7-46ccf1d6edcf.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5jhR4E5Gjr25Cvky8Qt5e4EoRerWxLnksVkkE5tu9uo=","crlite_enrolled":false,"id":"6b150bfe-21b9-4e05-a6d9-1ecfadbf8d34","last_modified":1559867555756},{"schema":1559867552520,"derHash":"i8G51978yhzNCbrNqI8ndiCS8e1KNK5eRgK7nMkVxQY=","subject":"CN=GeoTrust DV SSL CA - G4,OU=Domain Validated SSL,O=GeoTrust Inc.,C=US","subjectDN":"MGYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEgMB4GA1UEAxMXR2VvVHJ1c3QgRFYgU1NMIENBIC0gRzQ=","whitelist":false,"attachment":{"hash":"0ab32076e7222afcf3887c9ad0bcc8513aa15c6353f66bfec1ca95e57c3b215f","size":1540,"filename":"47vMpYDaFnUzDRQdNlsSppZ2DbMBfK5uwhBNakbz2n4=.pem","location":"security-state-staging/intermediates/457a8046-b1c4-40d2-866e-01d5c77d468d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"47vMpYDaFnUzDRQdNlsSppZ2DbMBfK5uwhBNakbz2n4=","crlite_enrolled":false,"id":"cd7ae099-d32b-48df-9cc0-5f040e73307f","last_modified":1559867553330},{"schema":1559867489166,"derHash":"J83Wmd4V7oigW7EO2d8vxeTKJbX91CmIljo47IlA1Vo=","subject":"SERIALNUMBER=10810700152,CN=Intesa Sanpaolo Organization Validation CA,OU=WSA Trust Service Provider,O=Intesa Sanpaolo S.p.A.,C=IT","subjectDN":"MIGeMQswCQYDVQQGEwJJVDEfMB0GA1UECgwWSW50ZXNhIFNhbnBhb2xvIFMucC5BLjEjMCEGA1UECwwaV1NBIFRydXN0IFNlcnZpY2UgUHJvdmlkZXIxFDASBgNVBAUTCzEwODEwNzAwMTUyMTMwMQYDVQQDDCpJbnRlc2EgU2FucGFvbG8gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0E=","whitelist":false,"attachment":{"hash":"521f6ad8cf11723e0d6a63d6246310675e5590a80d8e44dac4de2ecee9be0a46","size":2958,"filename":"DZug655eTUjrJRXnExUEtKkFrsw9LgUACiAkLII7f2s=.pem","location":"security-state-staging/intermediates/ac398d21-7a9d-46bf-9fd1-971750487c1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DZug655eTUjrJRXnExUEtKkFrsw9LgUACiAkLII7f2s=","crlite_enrolled":true,"id":"cdcb922e-b3df-4980-a0fd-4e03c4069b46","last_modified":1559867489952},{"schema":1559867484297,"derHash":"zFt6Dl1ncbo0jT12N1LwZnAms1McU5btviStzpMhVyM=","subject":"CN=Entrust Code Signing CA - OVCS1,OU=See www.entrust.net/legal-terms+OU=(c) 2015 Entrust\\, Inc. - for authorized use only,O=Entrust\\, Inc.,C=US","subjectDN":"MIG0MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTUgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MSgwJgYDVQQDEx9FbnRydXN0IENvZGUgU2lnbmluZyBDQSAtIE9WQ1Mx","whitelist":false,"attachment":{"hash":"cfac676380794f70d7d94b6076893414ccd8e2cee343208d8b11e8ba2a0ecc68","size":1833,"filename":"ZKpNzfvWKu9J0YxLZCHZ7ZuSkFgadPTP6L772QDWNs0=.pem","location":"security-state-staging/intermediates/73affa8d-5765-4e6f-9c74-ce08b71fecb1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ZKpNzfvWKu9J0YxLZCHZ7ZuSkFgadPTP6L772QDWNs0=","crlite_enrolled":true,"id":"7894d85e-6a23-4249-bc0a-35e6df37cf77","last_modified":1559867485088},{"schema":1559867458908,"derHash":"pSJvM0dLUzkmZSmLSPTmEpgk6YvU04304x67zxT6M80=","subject":"CN=Cal INDEX CA,OU=Orion Health Direct Secure Messaging,O=California Integrated Data Exchange\\, Inc.,C=US","subjectDN":"MIGHMQswCQYDVQQGEwJVUzEyMDAGA1UEChMpQ2FsaWZvcm5pYSBJbnRlZ3JhdGVkIERhdGEgRXhjaGFuZ2UsIEluYy4xLTArBgNVBAsTJE9yaW9uIEhlYWx0aCBEaXJlY3QgU2VjdXJlIE1lc3NhZ2luZzEVMBMGA1UEAxMMQ2FsIElOREVYIENB","whitelist":false,"attachment":{"hash":"34264be5346b44e8b15bc7137a26395abb6e18063abe3ee90589cd695348b957","size":2300,"filename":"9GtwDsjMtADoYOwb1RfJrsaX3bJbRRZHhkQATNIEJgs=.pem","location":"security-state-staging/intermediates/04188e49-53db-4da6-8a95-bdc1c98aa34a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"9GtwDsjMtADoYOwb1RfJrsaX3bJbRRZHhkQATNIEJgs=","crlite_enrolled":false,"id":"71693213-c8af-4415-8506-ccbce004ca0d","last_modified":1559867459702},{"schema":1559867457298,"derHash":"0OOap9L6U1gQCKFdglxX0lvUkkeDRDH4oieinCgKHAw=","subject":"CN=Advanced Pseudonymous e-Szigno CA 2009,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGKMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xLzAtBgNVBAMMJkFkdmFuY2VkIFBzZXVkb255bW91cyBlLVN6aWdubyBDQSAyMDA5MR8wHQYJKoZIhvcNAQkBFhBpbmZvQGUtc3ppZ25vLmh1","whitelist":false,"attachment":{"hash":"28e4ef20b258d0cd99dc8ed4bbb7f34994c1e6d05e6098c32453f0ff79651007","size":1776,"filename":"32Xpx0UBvg8xkUwG8UN0XoE1SdCOILkoXK07BeFi7sc=.pem","location":"security-state-staging/intermediates/75abdb27-3ceb-4f0f-8207-29811aa50f7b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"32Xpx0UBvg8xkUwG8UN0XoE1SdCOILkoXK07BeFi7sc=","crlite_enrolled":false,"id":"c4f80d62-a618-4681-a631-871006820e7b","last_modified":1559867458091},{"schema":1559867439398,"derHash":"WzErfhG3DQfBTgq5nwjQB0iWYJjFKqhaBqCCK75ZoCw=","subject":"CN=Telia Domain Validation CA v2,O=Telia Finland Oyj,C=FI","subjectDN":"MFExCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEmMCQGA1UEAwwdVGVsaWEgRG9tYWluIFZhbGlkYXRpb24gQ0EgdjI=","whitelist":false,"attachment":{"hash":"e50f92a6a1126e1974b698dc74b5324cb74a1bf0a656d8fa21ae230568387c3f","size":2328,"filename":"gB4lDqs5uw6KjxweLgOqWfxNkncJhFCg7rB3hEJ4fvo=.pem","location":"security-state-staging/intermediates/8258df94-c3d1-471b-9fb1-34f2157ac923.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gB4lDqs5uw6KjxweLgOqWfxNkncJhFCg7rB3hEJ4fvo=","crlite_enrolled":true,"id":"52f5910f-78f9-4bc2-b611-367c69c58d8d","last_modified":1559867440189},{"schema":1559867436992,"derHash":"R1EWKfK8O3z4Tv7J8yeYpDr2JS5VC2yudqOFWHEuN9g=","subject":"CN=DigiCert High Assurance Intermediate CA (SHA2),OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MHgxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xNzA1BgNVBAMTLkRpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEludGVybWVkaWF0ZSBDQSAoU0hBMik=","whitelist":false,"attachment":{"hash":"cefb259a9f513a1d4ee0dc081cff6c0050d8cc359ce9c5db5ac79bc7fe7b2b8e","size":2442,"filename":"3tMIKnnueOFiBfBxInvJjOJo4QLv6wmIUMfKgDFmgvs=.pem","location":"security-state-staging/intermediates/8607ec3d-cee7-41e3-9bf2-dce699146209.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"3tMIKnnueOFiBfBxInvJjOJo4QLv6wmIUMfKgDFmgvs=","crlite_enrolled":false,"id":"7eeef585-e240-41af-81bb-b177c89b7b32","last_modified":1559867437775},{"schema":1559867432168,"derHash":"EYj4MclJpi6c1PYONvclRPCvkk3gf52pkuJuRMmW7uA=","subject":"CN=DigiCert High Assurance EV CA-2,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGkxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKDAmBgNVBAMTH0RpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIEVWIENBLTI=","whitelist":false,"attachment":{"hash":"b145b565a9904eaa02b6a72abb75193f832000fd38aeafaa780db87365ff2c14","size":2259,"filename":"xIR53dzZj47wArExuiNyNGwPlWUfxINMgw3ePpMqhtM=.pem","location":"security-state-staging/intermediates/3743430c-e300-4654-9602-bfdefe2354b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"xIR53dzZj47wArExuiNyNGwPlWUfxINMgw3ePpMqhtM=","crlite_enrolled":false,"id":"78f96e89-32b4-40fe-af94-7cb1e85e9957","last_modified":1559867432960},{"schema":1559867405286,"derHash":"QyArnocGWZIfnaJu2p5Hv2mQ2wMaC8CyOvoeeWjtPpk=","subject":"CN=Rochester RHIO Intermediate CA,OU=Rochester RHIO HISP,O=Rochester RHIO,C=US","subjectDN":"MG0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5Sb2NoZXN0ZXIgUkhJTzEcMBoGA1UECxMTUm9jaGVzdGVyIFJISU8gSElTUDEnMCUGA1UEAxMeUm9jaGVzdGVyIFJISU8gSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"870292cce395c5649329f68463094135ea65bace91ee902f32f937816f15274d","size":2190,"filename":"OQ7Veo7DPNU0rXuY4y1SzFyKRrZc4T0S8rWwrqbKPVQ=.pem","location":"security-state-staging/intermediates/6691c4dc-77ad-402f-a799-57f985d82c4c.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OQ7Veo7DPNU0rXuY4y1SzFyKRrZc4T0S8rWwrqbKPVQ=","crlite_enrolled":false,"id":"6c3aaa16-0a8b-42c2-9f23-e3180b8d9479","last_modified":1559867406096},{"schema":1559867394636,"derHash":"q0gNj31yChYclnGEPq3qqqvFRH79nvjzRwh02SfMuGE=","subject":"CN=Hewlett Packard Enterprise Collaboration CA G22,OU=Class 2 Managed PKI Individual Subscriber CA,O=Hewlett Packard Enterprise Company,C=US","subjectDN":"MIGrMQswCQYDVQQGEwJVUzErMCkGA1UEChMiSGV3bGV0dCBQYWNrYXJkIEVudGVycHJpc2UgQ29tcGFueTE1MDMGA1UECxMsQ2xhc3MgMiBNYW5hZ2VkIFBLSSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExODA2BgNVBAMTL0hld2xldHQgUGFja2FyZCBFbnRlcnByaXNlIENvbGxhYm9yYXRpb24gQ0EgRzIy","whitelist":false,"attachment":{"hash":"4be6df8ee06a84caf5b78062f1a42d87be4b1918f83ac5ea7795f5f93eb25506","size":2081,"filename":"cFn8YV7QznqAeNsQc3EMF3ITUowUDECD7omXX1kLh0E=.pem","location":"security-state-staging/intermediates/e4f4b248-458f-4d2e-87fc-272e282734b6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cFn8YV7QznqAeNsQc3EMF3ITUowUDECD7omXX1kLh0E=","crlite_enrolled":false,"id":"2c51902b-f7f1-41a4-bb72-5618f37b1dbf","last_modified":1559867395440},{"schema":1559867368777,"derHash":"hu5KL5MTfKiIdnQHizlAcPGJswSd0tJAU66SkkJUxmg=","subject":"CN=SHECA RSA Time Stamp Authority G1,O=UniTrust,C=CN","subjectDN":"MEwxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEqMCgGA1UEAwwhU0hFQ0EgUlNBIFRpbWUgU3RhbXAgQXV0aG9yaXR5IEcx","whitelist":false,"attachment":{"hash":"fdc548ebeba5d0a525e38967a6ebcf6047b11e25ea4b1a9b19e976873339445d","size":1991,"filename":"ksHDA5DDxQ9GXo8e3jhl08TIZyMS1ynjRcsLB6SLRH8=.pem","location":"security-state-staging/intermediates/e726ca51-983e-49a8-a4fc-fd76141f0092.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ksHDA5DDxQ9GXo8e3jhl08TIZyMS1ynjRcsLB6SLRH8=","crlite_enrolled":false,"id":"5518046d-1529-4ce9-94ef-3cf0e4622489","last_modified":1559867369577},{"schema":1559867329817,"derHash":"l9J2xf3y3JRTmrueF7w5lXMM1Rc56ulbD2eznpmQXxE=","subject":"CN=INTEGRIS Direct Intermediate CA,OU=INTEGRIS DIRECT Messaging HISP,O=INTEGRIS,C=US","subjectDN":"MHMxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhJTlRFR1JJUzEnMCUGA1UECxMeSU5URUdSSVMgRElSRUNUIE1lc3NhZ2luZyBISVNQMSgwJgYDVQQDEx9JTlRFR1JJUyBEaXJlY3QgSW50ZXJtZWRpYXRlIENB","whitelist":false,"attachment":{"hash":"3f8040fd714dac482df84f0d9e6f2c8de009105ca26473f8a3c3447ed69c8154","size":2198,"filename":"VIqwZkD738CQKqG0EwMQGMJq2KPiGa3oaemfSdZMHQU=.pem","location":"security-state-staging/intermediates/bc855478-972a-4e0c-a292-8e721c232afc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"VIqwZkD738CQKqG0EwMQGMJq2KPiGa3oaemfSdZMHQU=","crlite_enrolled":false,"id":"bb561a33-9fcd-4d7a-aa33-413a7f86d171","last_modified":1559867330632},{"schema":1559867302256,"derHash":"BPehwRJgflk5KP7HhsxgIb1uvZUAHxxpO4xLOE6xn2o=","subject":"CN=TrustSign BR Certification Authority (DV) 2,O=TrustSign Certificadora Dig. & Solu\u00e7\u00f5es Seguran\u00e7a da Inf. Ltda.,L=S\u00e3o Jos\u00e9 dos Campos,ST=S\u00e3o Paulo,C=BR","subjectDN":"MIHFMQswCQYDVQQGEwJCUjETMBEGA1UECAwKU8OjbyBQYXVsbzEeMBwGA1UEBwwVU8OjbyBKb3PDqSBkb3MgQ2FtcG9zMUswSQYDVQQKDEJUcnVzdFNpZ24gQ2VydGlmaWNhZG9yYSBEaWcuICYgU29sdcOnw7VlcyBTZWd1cmFuw6dhIGRhIEluZi4gTHRkYS4xNDAyBgNVBAMTK1RydXN0U2lnbiBCUiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAoRFYpIDI=","whitelist":false,"attachment":{"hash":"c0b20fc2f58fbdde9863a50434876955a72362820cb00b3c4b28524916c15ae3","size":2247,"filename":"BWKUCA6WpdRrjXTT5uzsuXJ6Gb81wQGRLjW5bslnp7k=.pem","location":"security-state-staging/intermediates/57ae4bf8-97bc-4406-a91c-b9050a07787e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BWKUCA6WpdRrjXTT5uzsuXJ6Gb81wQGRLjW5bslnp7k=","crlite_enrolled":true,"id":"2e0e37b3-09ed-4d09-9512-e4f61413080c","last_modified":1559867303051},{"schema":1559867247253,"derHash":"t6ivKkpD8KhrFWBN5kYSCcnNdolNiwdIvJnZp5cBO7A=","subject":"CN=thawte SSL CA - G2,O=thawte\\, Inc.,C=US","subjectDN":"MEExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xGzAZBgNVBAMTEnRoYXd0ZSBTU0wgQ0EgLSBHMg==","whitelist":false,"attachment":{"hash":"c454ede86932cb7288384504fd67f0db2369a6367c8a2aa8310001339c7f976a","size":1687,"filename":"aR6DUqN8qK4HQGhBpcDLVnkRAvOHH1behpQUU1Xl7fE=.pem","location":"security-state-staging/intermediates/ae73053a-5449-4b9b-904d-11588789fc75.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"aR6DUqN8qK4HQGhBpcDLVnkRAvOHH1behpQUU1Xl7fE=","crlite_enrolled":true,"id":"a1f2fc0b-8850-43fc-8db2-3f9e546df871","last_modified":1559867248041},{"schema":1559867226214,"derHash":"9kJBjk0MY97Hhclg76aLp0XziFF0TvgfIly4kwUxTVA=","subject":"CN=GlobalSign Timestamping CA - SHA384 - G4,O=GlobalSign nv-sa,C=BE","subjectDN":"MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIFRpbWVzdGFtcGluZyBDQSAtIFNIQTM4NCAtIEc0","whitelist":false,"attachment":{"hash":"a6ba61ac5f4cc0f9765d5d0f0def7f6c14969571829df90422bff82e1730c78b","size":2259,"filename":"bxL2hYprHPwXRcMzTOZMDGOgJ8V36UngBYWMNmpyTUA=.pem","location":"security-state-staging/intermediates/0431a6e2-dcab-4cb9-905c-49a692134a41.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bxL2hYprHPwXRcMzTOZMDGOgJ8V36UngBYWMNmpyTUA=","crlite_enrolled":false,"id":"ef392ac2-e86d-44ea-9ba4-44c1128fd89f","last_modified":1559867227001},{"schema":1559867193847,"derHash":"B0hA46Z9zSYAtrAE4Rh6yAvf6JbK9JPflMw9mjymiBQ=","subject":"CN=TWCA InfoSec User CA,OU=User CA,O=TAIWAN-CA Inc.,C=TW","subjectDN":"MFcxCzAJBgNVBAYTAlRXMRcwFQYDVQQKEw5UQUlXQU4tQ0EgSW5jLjEQMA4GA1UECxMHVXNlciBDQTEdMBsGA1UEAxMUVFdDQSBJbmZvU2VjIFVzZXIgQ0E=","whitelist":false,"attachment":{"hash":"45844bd66bf712d05a01885a5ed8fe191938dc90ceb1c6bb05a732c72ec77002","size":1703,"filename":"ffKwXiiyZfl8ltFLZ9k5urWtoCKNBNklL8cqiHHZUUQ=.pem","location":"security-state-staging/intermediates/c5276bf0-c900-4b43-8dd3-e46484423040.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"ffKwXiiyZfl8ltFLZ9k5urWtoCKNBNklL8cqiHHZUUQ=","crlite_enrolled":false,"id":"c4144e37-5fca-4438-94df-2524de197266","last_modified":1559867194628},{"schema":1559867189046,"derHash":"FVSRh0kDFPUXdkHwvrMmNKoSMOss8sKK2cc5FPsYq6A=","subject":"CN=GlobalSign ECC384 EV SSL CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFMxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSkwJwYDVQQDEyBHbG9iYWxTaWduIEVDQzM4NCBFViBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"7761a3e40e444b8b7f00e4e6441a2b460b5e4ae76245aa2678f0336e0e77d193","size":1150,"filename":"MjwImBXGPClGSmdJpCliwmnLG4rkiw8r8qhz04EBHZc=.pem","location":"security-state-staging/intermediates/3237ec26-03ed-426d-8bbb-f3fa278bb2fe.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MjwImBXGPClGSmdJpCliwmnLG4rkiw8r8qhz04EBHZc=","crlite_enrolled":false,"id":"353fb3cf-1f87-44ed-b343-5cb7de582468","last_modified":1559867189833},{"schema":1559867180142,"derHash":"x7V6Avk3rgvj4hAnAwWSydR6cNcBPrOqlNvDt7WrBmI=","subject":"CN=GeoTrust Extended Validation SSL CA - G2,O=GeoTrust Inc.,C=US","subjectDN":"MFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQSAtIEcy","whitelist":false,"attachment":{"hash":"bbcdd9edbc938bb3f1c719ebf87a28c4a802a927298570655845e0d44a1d420f","size":1654,"filename":"Kd5qpztW2P94BhrmO1KRqfDixvm8E3VliyctI5P6oks=.pem","location":"security-state-staging/intermediates/6cd04e7b-d31a-4806-8481-dc02856dc1a7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Kd5qpztW2P94BhrmO1KRqfDixvm8E3VliyctI5P6oks=","crlite_enrolled":false,"id":"44491442-f7d8-45f4-8fa7-6e193c6865c9","last_modified":1559867180939},{"schema":1559867069047,"derHash":"BCEZUzoNtnjQMEJn359fHfGXlR4C9eXbLmCgFlgC4h4=","subject":"CN=TERENA Code Signing CA 2,O=TERENA,L=Amsterdam,ST=Noord-Holland,C=NL","subjectDN":"MG0xCzAJBgNVBAYTAk5MMRYwFAYDVQQIEw1Ob29yZC1Ib2xsYW5kMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEhMB8GA1UEAxMYVEVSRU5BIENvZGUgU2lnbmluZyBDQSAy","whitelist":false,"attachment":{"hash":"5a4b2dc41430a1c37846768f9ed9f04a7107d359857715f5554bd632169998ee","size":2101,"filename":"G7K9EGaf5R7AraL3XsZSjPH6XvzQTbq95skwp70Gnx4=.pem","location":"security-state-staging/intermediates/c5775c4d-5958-4b2b-83ff-e5631228bb61.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"G7K9EGaf5R7AraL3XsZSjPH6XvzQTbq95skwp70Gnx4=","crlite_enrolled":false,"id":"a366d93c-802b-490b-b7a2-ece154bf2242","last_modified":1559867069830},{"schema":1559867055312,"derHash":"9x2jKCMcMNfjwFnGJhQj0QxP8sjrkuuQk6XZr3Fgq1U=","subject":"CN=Democritus University of Thrace CA R1,O=Hellenic Academic and Research Institutions Cert. Authority,C=GR","subjectDN":"MIGDMQswCQYDVQQGEwJHUjFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxLjAsBgNVBAMTJURlbW9jcml0dXMgVW5pdmVyc2l0eSBvZiBUaHJhY2UgQ0EgUjE=","whitelist":false,"attachment":{"hash":"c43aa72137f3367b18b9c9cdb80ca11d2b08d6aba913f5f508664257f1537f20","size":2536,"filename":"gPfhVfTSpL0dgTS2T3BMSUxNDeNWIjEDX2cYu3mNZOA=.pem","location":"security-state-staging/intermediates/daaa7c64-7a3f-43f5-96ea-26752c457e1f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"gPfhVfTSpL0dgTS2T3BMSUxNDeNWIjEDX2cYu3mNZOA=","crlite_enrolled":true,"id":"9a504e2c-d2ab-45f2-85da-d3bbb9ae038c","last_modified":1559867056099},{"schema":1559867028528,"derHash":"opwQSxAMOnkzRz5i5L5jcdZToWBNBO2q0CyVgGBlzuM=","subject":"CN=Advanced eIDAS Class2 e-Szigno CA 2016,O=Microsec Ltd.,L=Budapest,C=HU","subjectDN":"MIGHMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xHDAaBgNVBGEME1ZBVEhVLTIzNTg0NDk3LTItNDExLzAtBgNVBAMMJkFkdmFuY2VkIGVJREFTIENsYXNzMiBlLVN6aWdubyBDQSAyMDE2","whitelist":false,"attachment":{"hash":"bcff9a806f140a24db8d80fb25e53c8830ceeeeaad81257e333c72d97c0070d8","size":2597,"filename":"cnBaSiDjhxiyXuUvokBKGtmAg7IeqDnVkrWBvwTBrJU=.pem","location":"security-state-staging/intermediates/9fcf94ff-9fb8-4a24-a227-cc9c133af787.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cnBaSiDjhxiyXuUvokBKGtmAg7IeqDnVkrWBvwTBrJU=","crlite_enrolled":false,"id":"312fdb56-c1ae-466b-92aa-cce0b03303a3","last_modified":1559867029341},{"schema":1559867026115,"derHash":"TZYa7g0t0K30M7SqwmHOWHFmXPOfyhtIOK5mINpoUEY=","subject":"CN=HARICA Qualified Natural Entities ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR","subjectDN":"MIGdMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE3MDUGA1UEAwwuSEFSSUNBIFF1YWxpZmllZCBOYXR1cmFsIEVudGl0aWVzIEVDQyBTdWJDQSBSMg==","whitelist":false,"attachment":{"hash":"c5cfa630e56da489c7904c80eb445823e31980801b41160832fdce4a344a2109","size":1418,"filename":"cnhqpBVFEnKDZQ8sXe9NIGzIRWdFqCxZ68tJNsX30s0=.pem","location":"security-state-staging/intermediates/5540f483-9acf-43cb-991a-4867bc3a6abc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"cnhqpBVFEnKDZQ8sXe9NIGzIRWdFqCxZ68tJNsX30s0=","crlite_enrolled":false,"id":"71f797a0-3380-4843-9f9a-7aba5ecb9a32","last_modified":1559867026905},{"schema":1559866996817,"derHash":"kUfDjgO0bIzl3dsCyqKTLx4WdcCgAVKRODNu0Q2ZmDo=","subject":"CN=COMODO RSA Domain Validation Secure Server CA 3,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGSMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDE4MDYGA1UEAxMvQ09NT0RPIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBIDM=","whitelist":false,"attachment":{"hash":"3ba031befb11cb2e743b864c59c22110bcfd40f33272315977867894ca4b1fa5","size":2158,"filename":"InQsVwxFxCARGa9oRQJcZVg2VPAXkUYSVkDc3jhuVUM=.pem","location":"security-state-staging/intermediates/ea43abf3-9b67-42be-94ae-a65fa4d80a69.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"InQsVwxFxCARGa9oRQJcZVg2VPAXkUYSVkDc3jhuVUM=","crlite_enrolled":false,"id":"d35555ee-80e5-40db-a2ef-82628963df98","last_modified":1559866997668},{"schema":1559866987126,"derHash":"Ak8WKx0J9qCGjDi0yLQlfB7qbFoxWJQW1SDPFiSRfrM=","subject":"CN=.NET Foundation Projects Code Signing CA,O=.NET Foundation,C=US","subjectDN":"MFoxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw8uTkVUIEZvdW5kYXRpb24xMTAvBgNVBAMTKC5ORVQgRm91bmRhdGlvbiBQcm9qZWN0cyBDb2RlIFNpZ25pbmcgQ0E=","whitelist":false,"attachment":{"hash":"fd0dab3f4c0a11b4e19fa79479ab2bfa7f47262b7b73263a5fdd5c73368352dd","size":1642,"filename":"OosLbidguElYKU6vSGfwNmwHxjVMbSr5S9pcbc5E6I0=.pem","location":"security-state-staging/intermediates/61ff11b3-dfff-4ceb-b1d4-cfc06f31e971.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"OosLbidguElYKU6vSGfwNmwHxjVMbSr5S9pcbc5E6I0=","crlite_enrolled":false,"id":"05e74429-ac3c-4843-b05d-b405a1eebf3d","last_modified":1559866987914},{"schema":1559866984705,"derHash":"EdkzDRojmFCN1Q0wlOsosbRJANmSj4wisl73p4G9tAM=","subject":"CN=SecureTrust Organization Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MIGCMTgwNgYDVQQDEy9TZWN1cmVUcnVzdCBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBDQSwgTGV2ZWwgMTEUMBIGA1UEChMLU2VjdXJlVHJ1c3QxEDAOBgNVBAcTB0NoaWNhZ28xETAPBgNVBAgTCElsbGlub2lzMQswCQYDVQQGEwJVUw==","whitelist":false,"attachment":{"hash":"2fbb26d89a7df4499089ee4d2d7d54042f375261e865316c51caa6ea3d367c5f","size":1642,"filename":"naxobvdvRxrUbxomHwj81l5L4m0vZobqUIuxo5hwUQY=.pem","location":"security-state-staging/intermediates/db3a6f95-518e-4c87-a822-e3be67b873a0.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"naxobvdvRxrUbxomHwj81l5L4m0vZobqUIuxo5hwUQY=","crlite_enrolled":false,"id":"0446d2af-40a8-49d1-b3fe-9e83881afe72","last_modified":1559866985488},{"schema":1559866981460,"derHash":"70R46wlMSPuf6soJc2JwSZylLrBOP47kwbLtyZYDmP0=","subject":"CN=AlwaysOnSSL CA - G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGIxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEcMBoGA1UEAxMTQWx3YXlzT25TU0wgQ0EgLSBHMQ==","whitelist":false,"attachment":{"hash":"1040fe16193b9f02fff18e80e4c535f43ee66775f4e96c4201662bd96f48aa79","size":1882,"filename":"YtTxIzDWQbqdohOzNgNqrqMUDSKPiJZV2NK7zUOskPo=.pem","location":"security-state-staging/intermediates/c40d000c-7f78-42cf-9cf1-975d8ebb0b77.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"YtTxIzDWQbqdohOzNgNqrqMUDSKPiJZV2NK7zUOskPo=","crlite_enrolled":false,"id":"c979bd2e-d167-46e9-8799-de7753f057f0","last_modified":1559866982272},{"schema":1559866974197,"derHash":"W7I4LSDgmuVrTzpRV4OPe65J5C485TSE1m7rLAdH70o=","subject":"CN=GlobalSign Extended Validation CA - SHA256 - G2,O=GlobalSign nv-sa,C=BE","subjectDN":"MGIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTgwNgYDVQQDEy9HbG9iYWxTaWduIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgLSBTSEEyNTYgLSBHMg==","whitelist":false,"attachment":{"hash":"3497281a6231e63615ec1be2b86c286a4a28fe2dd8a949446fcda3829105d665","size":1573,"filename":"LvRiGEjRqfzurezaWuj8Wie2gyHMrW5Q06LspMnox7A=.pem","location":"security-state-staging/intermediates/8908cf91-36bb-46af-a060-a0d350cf371a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LvRiGEjRqfzurezaWuj8Wie2gyHMrW5Q06LspMnox7A=","crlite_enrolled":false,"id":"422c153b-2663-4f06-8d24-a04ce31d1da3","last_modified":1559866974990},{"schema":1559866972593,"derHash":"3SM1XGHVmXBCMARyl5XK73ev2zl2enlXQNTgTLYVipk=","subject":"CN=SecureTrust Extended Validation CA\\, Level 1,O=SecureTrust,L=Chicago,ST=Illinois,C=US","subjectDN":"MH4xNDAyBgNVBAMTK1NlY3VyZVRydXN0IEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EsIExldmVsIDExFDASBgNVBAoTC1NlY3VyZVRydXN0MRAwDgYDVQQHEwdDaGljYWdvMREwDwYDVQQIEwhJbGxpbm9pczELMAkGA1UEBhMCVVM=","whitelist":false,"attachment":{"hash":"d0105c5ecad0b2ab41480518899e2653e240f06b4a8927ca3d5283c60f63c72e","size":1634,"filename":"DfrsmfuM5QjUozBeqZ75qybJwEDwRIG64DTyM3Kx5Wg=.pem","location":"security-state-staging/intermediates/b46f9bc3-cb55-4302-b52b-e519808c0128.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DfrsmfuM5QjUozBeqZ75qybJwEDwRIG64DTyM3Kx5Wg=","crlite_enrolled":false,"id":"110bade2-6494-40e6-869c-71f45a348718","last_modified":1559866973381},{"schema":1559866970155,"derHash":"zx6hXcnAWrxyrw5ixI2TQ0rgJxsapDGL41RBJtJLYYQ=","subject":"CN=Certum Extended Validation CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGCMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQDEx1DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"e34ed85d8f7cd8d8572bc535cef388fdeca726b0b1f570db12ecb2c658c3cfaf","size":1727,"filename":"M9jfvUTOEXqakcClNZh0xICWc12quCpR9R8l41FetpI=.pem","location":"security-state-staging/intermediates/aa0b4687-ec1c-483c-878f-31363ebb0565.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"M9jfvUTOEXqakcClNZh0xICWc12quCpR9R8l41FetpI=","crlite_enrolled":false,"id":"52a1bed3-2ae3-4c96-8566-936ef8a25df3","last_modified":1559866970939},{"schema":1559866925659,"derHash":"PUUR0KgKqUmm2ZslOhc0cXl8RFkYemMp5zbDfLVJPkY=","subject":"CN=emSign ECC Device CA - C3,OU=emSign PKI,O=eMudhra Inc,C=US","subjectDN":"MFwxCzAJBgNVBAYTAlVTMRMwEQYDVQQLEwplbVNpZ24gUEtJMRQwEgYDVQQKEwtlTXVkaHJhIEluYzEiMCAGA1UEAxMZZW1TaWduIEVDQyBEZXZpY2UgQ0EgLSBDMw==","whitelist":false,"attachment":{"hash":"01af63ee9e2b37ec4c8865ff21ae0e4cdb096992d7907932ef24acf8eedfdc46","size":1098,"filename":"bpFe8tgoaUQ4GlAAa0fUVmVkLEKAO1rs9xELs8ndVnE=.pem","location":"security-state-staging/intermediates/1d4a8c13-e9b9-41ba-ab80-6e38c400e23f.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"bpFe8tgoaUQ4GlAAa0fUVmVkLEKAO1rs9xELs8ndVnE=","crlite_enrolled":false,"id":"e7091d6a-54ab-4e1a-ace6-0cf33cabe180","last_modified":1559866926464},{"schema":1559866729252,"derHash":"CtanM0paI8mGmA9v7NJQBrVjoLbxvKplwDRbotlpKNM=","subject":"CN=SGN FISGLOBAL PUBLIC CA,OU=Class 2 Managed PKI Individual Subscriber CA,O=Fidelity National Information Services\\, Inc.,C=US","subjectDN":"MIGdMQswCQYDVQQGEwJVUzE1MDMGA1UEChMsRmlkZWxpdHkgTmF0aW9uYWwgSW5mb3JtYXRpb24gU2VydmljZXMsIEluYy4xNTAzBgNVBAsTLENsYXNzIDIgTWFuYWdlZCBQS0kgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBMSAwHgYDVQQDExdTR04gRklTR0xPQkFMIFBVQkxJQyBDQQ==","whitelist":false,"attachment":{"hash":"0abf8df1e687f2286bcfbc92d9bfc4d0d5a85f3deab34f15b0928b32afd8f3c5","size":2064,"filename":"tjF4OWI3FI1EgkyujCVcvW3y0P7Ff83RiLHthEN0kg4=.pem","location":"security-state-staging/intermediates/2f6e2f02-425a-4545-a425-4709a1bf2225.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"tjF4OWI3FI1EgkyujCVcvW3y0P7Ff83RiLHthEN0kg4=","crlite_enrolled":false,"id":"25fce179-8c18-4b02-96e2-d10b51c7103d","last_modified":1559866730048},{"schema":1559866635925,"derHash":"eKle2CGAocM6nzTtt15ndP1Ltzqix8QSFFPdtifbG68=","subject":"CN=GeoTrust Code Signing CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xITAfBgNVBAMTGEdlb1RydXN0IENvZGUgU2lnbmluZyBDQQ==","whitelist":false,"attachment":{"hash":"0ebb76cc437a4875e1965d802d1ef4116c3f64f24eec194afb86a70ad1667e59","size":1869,"filename":"W2U41SQHEtuuIcPdtOMy4IlYKK8SkwxCszZpM88De1Y=.pem","location":"security-state-staging/intermediates/c65c285e-2d6e-46de-95f1-d00412600e1b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"W2U41SQHEtuuIcPdtOMy4IlYKK8SkwxCszZpM88De1Y=","crlite_enrolled":false,"id":"29f9902f-3092-43f3-9002-cb3213388a72","last_modified":1559866636749},{"schema":1559866615732,"derHash":"0fJlasg4JzmjsIfEerXKuUWjLxYrYUnDCHg8fgaviug=","subject":"CN=TeliaSonera Email CA v4,O=TeliaSonera,C=SE","subjectDN":"MEUxCzAJBgNVBAYTAlNFMRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEgMB4GA1UEAwwXVGVsaWFTb25lcmEgRW1haWwgQ0EgdjQ=","whitelist":false,"attachment":{"hash":"50a551c554a5b7ee132109ae7bf90dc4b34f3526462e40e5e30612608a8a6257","size":2528,"filename":"t0Th3Tcrbh3qBKdPTiMoiViMapdZEGG29yWyhWFOnu8=.pem","location":"security-state-staging/intermediates/a4ac8e27-46ae-4971-8848-eb9b6cfdfa8e.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"t0Th3Tcrbh3qBKdPTiMoiViMapdZEGG29yWyhWFOnu8=","crlite_enrolled":false,"id":"f80be745-7d54-490b-8882-57a4fbcdda3f","last_modified":1559866616522},{"schema":1559866583346,"derHash":"3GxErIo81cNFEnP0QxUmsu9mYGLudjJYqSj2C9COOf4=","subject":"CN=GlobalSign ECC384 SSL CA - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MFAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1HbG9iYWxTaWduIEVDQzM4NCBTU0wgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"e381db75fa5b615dfa1e287a661d1ef2ff0990637741a94dcc8712b342a4f1a8","size":1146,"filename":"LhF0h0iYJokyuUHZnRxfXT7YSYW3qA1meoPEmJTNIfU=.pem","location":"security-state-staging/intermediates/b8ef29b4-3d13-4379-ac25-f77f41bfebe1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"LhF0h0iYJokyuUHZnRxfXT7YSYW3qA1meoPEmJTNIfU=","crlite_enrolled":false,"id":"21d88639-9ac9-4590-834c-f2ca7f76d6a7","last_modified":1559866584144},{"schema":1559866569358,"derHash":"aZ1Ut0gqXTKTMeoEFcwu3NYP2gHRnnHQVBlrzgZ3c1w=","subject":"CN=GlobalSign Organization Validation CA - SHA256 - G3,O=GlobalSign nv-sa,C=BE","subjectDN":"MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzM=","whitelist":false,"attachment":{"hash":"2503aecef7682dc86265404bb3212730e5bfa9316dbc827331274d72deee9383","size":1634,"filename":"19e9lxa6ojidVP5dVZZuTl4VDK62HtqIUx9aA4Kc3aw=.pem","location":"security-state-staging/intermediates/d382ff16-ea91-4cd3-a050-90c8d6613505.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"19e9lxa6ojidVP5dVZZuTl4VDK62HtqIUx9aA4Kc3aw=","crlite_enrolled":true,"id":"018fd818-2416-4ecf-bd00-0eae97797a59","last_modified":1559866570149},{"schema":1559866548393,"derHash":"2eDGSrJ6ZNeczPQqNOx1olGn5UM1PBnphKcOsvVGzf8=","subject":"CN=GeoTrust SHA256 SSL CA,O=GeoTrust Inc.,C=US","subjectDN":"MEYxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR8wHQYDVQQDExZHZW9UcnVzdCBTSEEyNTYgU1NMIENB","whitelist":false,"attachment":{"hash":"41395f394b5b7a1a1e7b37a2168f0c8b0544a4478ce5c008e2b0663391ae26c1","size":1715,"filename":"PuXtzNBJoFElmIPIBszvOE5GbIMi7uXkODinPrxfy5U=.pem","location":"security-state-staging/intermediates/52586f92-f320-4c76-aaa4-6210328fc3c5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"PuXtzNBJoFElmIPIBszvOE5GbIMi7uXkODinPrxfy5U=","crlite_enrolled":true,"id":"af213913-9965-48ef-8e0e-aed1b914c7c8","last_modified":1559866549194},{"schema":1559866541061,"derHash":"94rk1tq8dGQEkKrjY3V3p3LjzCffMiuWnDCXlVf1kg0=","subject":"SERIALNUMBER=201809,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxODA5","whitelist":false,"attachment":{"hash":"d046cdd580c6ff2d0057e1c6da6748bdb7c41b15d2ac26075435915b2a31a78e","size":2333,"filename":"fjrmK24DSG4huN9mrwx93lBvNqivEcAx2KuPtpwutKQ=.pem","location":"security-state-staging/intermediates/a1046294-5e59-48a1-aff1-9aa052f00742.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"fjrmK24DSG4huN9mrwx93lBvNqivEcAx2KuPtpwutKQ=","crlite_enrolled":false,"id":"4ab2e721-a85d-44aa-9af2-f0c18f2c3671","last_modified":1559866541896},{"schema":1559866535109,"derHash":"UVh8hnv2bzXs5VSgjgpBwTuLvZtZ0mLSBKcDCaZyvuY=","subject":"CN=QuoVadis QVRCA1G3 SSL ICA,O=QuoVadis Limited,C=BM","subjectDN":"MEwxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSIwIAYDVQQDDBlRdW9WYWRpcyBRVlJDQTFHMyBTU0wgSUNB","whitelist":false,"attachment":{"hash":"461a8ce2869e6d66752413bc1efe37ae1166b3ddb02f5fd89ee6f16b8ab72340","size":2381,"filename":"qHlqfHd5vL1EFqEmnKfLFiwdoWaMNSlifKAdh9Bgr6g=.pem","location":"security-state-staging/intermediates/796036c7-0924-44a1-8f29-5c91b93cfd73.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qHlqfHd5vL1EFqEmnKfLFiwdoWaMNSlifKAdh9Bgr6g=","crlite_enrolled":true,"id":"8983e814-f99a-4bfe-b043-6a5194bef244","last_modified":1559866535949},{"schema":1559866454656,"derHash":"16BtRir8gNcRg9lKOYstzIJYNefGbaXkVAVXLwSwWl0=","subject":"CN=Actalis Domain Validation Server CA G2,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGQMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxLzAtBgNVBAMMJkFjdGFsaXMgRG9tYWluIFZhbGlkYXRpb24gU2VydmVyIENBIEcy","whitelist":false,"attachment":{"hash":"0199eefe8b3b2e90fd118ce82599499a60c5ed728bed0078537ce1245a0de359","size":2320,"filename":"MmeNHRDuDHyx0vNfPkV0ZBTuO5ScnOMjw2AkNv1Fs0c=.pem","location":"security-state-staging/intermediates/9ddd3d98-2360-458a-af24-f87fae1c19de.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"MmeNHRDuDHyx0vNfPkV0ZBTuO5ScnOMjw2AkNv1Fs0c=","crlite_enrolled":true,"id":"fe4ab240-fcee-45f1-b8d0-1b25ebe22007","last_modified":1559866455447},{"schema":1559866449762,"derHash":"vRk8R15OZ5OL7zQSK5i1WKKILn7ZQ2mmywETIO8VYjw=","subject":"CN=AlwaysOnSSL TLS ECC CA G1,OU=Domain Validated SSL,O=CertCenter AG,C=DE","subjectDN":"MGgxCzAJBgNVBAYTAkRFMRYwFAYDVQQKEw1DZXJ0Q2VudGVyIEFHMR0wGwYDVQQLExREb21haW4gVmFsaWRhdGVkIFNTTDEiMCAGA1UEAxMZQWx3YXlzT25TU0wgVExTIEVDQyBDQSBHMQ==","whitelist":false,"attachment":{"hash":"499064f03f4574c2c427e17330ae382a5058acecff6c7f5b7cbdc36b9933961b","size":1175,"filename":"0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=.pem","location":"security-state-staging/intermediates/3d30c347-f98b-4558-b56e-baf0b4674e1a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"0W9t3LKpNLN0CxCis6AJXuaxxouX1FIp8IEuXgow59U=","crlite_enrolled":false,"id":"6362cd69-7d81-45cb-a636-f824de74bb36","last_modified":1559866450581},{"schema":1559866428654,"derHash":"81DahhtR0XBWfbzg3nv2a7M0DfxFliFjENRmK8HeoFg=","subject":"CN=CertAssure RSA Code Signing CA,O=CertAssure Inc.,L=San Jose,ST=CA,C=US","subjectDN":"MHAxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTERMA8GA1UEBxMIU2FuIEpvc2UxGDAWBgNVBAoTD0NlcnRBc3N1cmUgSW5jLjEnMCUGA1UEAxMeQ2VydEFzc3VyZSBSU0EgQ29kZSBTaWduaW5nIENB","whitelist":false,"attachment":{"hash":"d08d74bc10327226964aa652c768fce52a6591a2b4862e85a9d609f39ca1042b","size":2105,"filename":"weu0ISLSXTD6wlo6q1m3T52id0ynkK2BySe0U6d6YY0=.pem","location":"security-state-staging/intermediates/381e9263-c700-4217-b439-38ec819aa09a.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"weu0ISLSXTD6wlo6q1m3T52id0ynkK2BySe0U6d6YY0=","crlite_enrolled":false,"id":"a9831a62-e083-46ea-bf4e-f22664378357","last_modified":1559866429443},{"schema":1559866415399,"derHash":"mUQsj4OjxQkMpQwcCx3ksy7UGP8Kp8MkDpEjAVnz578=","subject":"CN=GDCA TrustAUTH R4 IV SSL CA,O=Global Digital Cybersecurity Authority Co.\\, Ltd.,C=CN","subjectDN":"MG4xCzAJBgNVBAYTAkNOMTkwNwYDVQQKDDBHbG9iYWwgRGlnaXRhbCBDeWJlcnNlY3VyaXR5IEF1dGhvcml0eSBDby4sIEx0ZC4xJDAiBgNVBAMMG0dEQ0EgVHJ1c3RBVVRIIFI0IElWIFNTTCBDQQ==","whitelist":false,"attachment":{"hash":"c9c27dde9ab53fa7533998d21fe575c8d337e49fedce536ed71cebe74d6a82cb","size":2052,"filename":"h9ljtPIsvf1wnqfE3LU5OJSEC20BaNan3CxC8wbqBnI=.pem","location":"security-state-staging/intermediates/b5bec3ea-ca92-493c-af9a-8fe3ef022434.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"h9ljtPIsvf1wnqfE3LU5OJSEC20BaNan3CxC8wbqBnI=","crlite_enrolled":false,"id":"ae50a764-96b4-4d80-b152-ecb7f2d01363","last_modified":1559866416201},{"schema":1559866398418,"derHash":"Xey2HOk6UEC1tqToEdDlxuDxYW4MiZB3hlAUT7EdJXw=","subject":"CN=YourNet SSL for business,O=FreeBit Co.\\,Ltd.,C=JP","subjectDN":"MEsxCzAJBgNVBAYTAkpQMRkwFwYDVQQKExBGcmVlQml0IENvLixMdGQuMSEwHwYDVQQDExhZb3VyTmV0IFNTTCBmb3IgYnVzaW5lc3M=","whitelist":false,"attachment":{"hash":"9280f070bd7ccd133be66b2af02627550abac320372a484ed962540661f58759","size":1492,"filename":"qnqdzr4K7xpxYew1TDa1ckxZsejonO8Q8GR4TeQmBYw=.pem","location":"security-state-staging/intermediates/0656eeb9-3387-4f80-bf11-98daf8e669e9.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qnqdzr4K7xpxYew1TDa1ckxZsejonO8Q8GR4TeQmBYw=","crlite_enrolled":false,"id":"2df52334-2163-4a35-bb33-5f7f57df2d91","last_modified":1559866399208},{"schema":1559866372407,"derHash":"T9b6UnFX7qRjaJ16TCuTTvIiJ5clQTiT2YRyQshcqd8=","subject":"CN=SHECA RSA Extended Validation Server CA,O=UniTrust,C=CN","subjectDN":"MFIxCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEwMC4GA1UEAwwnU0hFQ0EgUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gU2VydmVyIENB","whitelist":false,"attachment":{"hash":"b58523d4da82d8049eb9b4115799b963aab05526caa6f6e0040ca88e05ad2be8","size":2012,"filename":"dSFJXz4vHOWleaG1OgAbLF3rUHbSM2AR6Viu9xdSol8=.pem","location":"security-state-staging/intermediates/ca826164-049f-4c05-91f0-9b1e9243437b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"dSFJXz4vHOWleaG1OgAbLF3rUHbSM2AR6Viu9xdSol8=","crlite_enrolled":true,"id":"346f5cdb-b18d-404b-86c1-ae1ab80747f8","last_modified":1559866373200},{"schema":1559866343126,"derHash":"FUxDPEkZKcXvaG6DjjI2ZKAOag2CLMyVj7TasD5JoI8=","subject":"CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US","subjectDN":"ME0xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"6edb4a81fe4f8f9a18de8035d87dad2c701e2cc7fc5ce3832cbdce4468bd31f3","size":1646,"filename":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=.pem","location":"security-state-staging/intermediates/2dade068-5ff0-4ce7-9d2b-b1fca06fd9e1.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"5kJvNEMw0KjrCAu7eXY5HZdvyCS13BbA0VJG1RSP91w=","crlite_enrolled":true,"id":"e8a303db-012e-4b10-88d9-69dca19e2f97","last_modified":1559866343924},{"schema":1559866340662,"derHash":"bQvW4awOw5juhTeQbZjzePx6tJweKWryMzdPpaJx2zQ=","subject":"CN=Symantec Class 3 Admin Intermediate Certificate Authority,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgQWRtaW4gSW50ZXJtZWRpYXRlIENlcnRpZmljYXRlIEF1dGhvcml0eQ==","whitelist":false,"attachment":{"hash":"cb4c35653304cbbfbea275d095cbd84d649442d21ab4c00b648177f91feb4d65","size":2194,"filename":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=.pem","location":"security-state-staging/intermediates/353215d3-c3a1-49c1-ba8b-cb6140386874.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"DIqmg6q0EEYaGDu2kzw3JDDctRJMyX5PRKKp2nBoL5I=","crlite_enrolled":false,"id":"366de8fc-cf57-431a-ba80-da16e22073d1","last_modified":1559866341455},{"schema":1559866293718,"derHash":"7gIE40wLTUXMg5zzuQFc7slGo2Yc8r8QlyM5Qmxg6Ak=","subject":"CN=SECOM Passport for Member PUB CA10,OU=SECOM Passport for Member 2.0 PUB,O=SECOM Trust Systems CO.\\,LTD.,C=JP","subjectDN":"MIGNMQswCQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU0VDT00gUGFzc3BvcnQgZm9yIE1lbWJlciAyLjAgUFVCMSswKQYDVQQDEyJTRUNPTSBQYXNzcG9ydCBmb3IgTWVtYmVyIFBVQiBDQTEw","whitelist":false,"attachment":{"hash":"d95bc4e2ec72de93175628906114d8bd0f3ff59ffce75734d73b793fa608330a","size":1727,"filename":"XDUzAHVq4IiaHQw3QSgU1eRxAmLfVjwgS3LDYc5B1Rs=.pem","location":"security-state-staging/intermediates/2f5b94f0-6f0d-4e3d-b050-b1bff1646988.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"XDUzAHVq4IiaHQw3QSgU1eRxAmLfVjwgS3LDYc5B1Rs=","crlite_enrolled":false,"id":"fdb09588-35e0-4e80-b131-9a36bdcb8201","last_modified":1559866294504},{"schema":1559866270982,"derHash":"EoYXPm8BAve90ywvgwkQlTSJvyLBYpXYTdkKPaE3Fko=","subject":"CN=COMODO SHA-2 Pro Series Secure Server CA,O=COMODO CA Limited,L=Salford,ST=Greater Manchester,C=GB","subjectDN":"MIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDExMC8GA1UEAxMoQ09NT0RPIFNIQS0yIFBybyBTZXJpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"854a130598ea11463a70a791d66099b64bccbb45f4ed76af30c587e4646f7d96","size":1707,"filename":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=.pem","location":"security-state-staging/intermediates/9b47dd14-9620-411c-bf2a-407266084564.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"4gSqIYIbYqiQ1NfKCAfvkzCzqmOipsGL9CFJJdH7Ms4=","crlite_enrolled":true,"id":"6f99857c-e0a6-49e1-9764-895a594d08cd","last_modified":1559866271774},{"schema":1559866232465,"derHash":"TApYiMNKoBt0X066JoaWssyz9KoxyO3LOv6PqEy3TME=","subject":"CN=iShare Medical Direct Intermediate CA,O=iShare Medical,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5pU2hhcmUgTWVkaWNhbDEuMCwGA1UEAxMlaVNoYXJlIE1lZGljYWwgRGlyZWN0IEludGVybWVkaWF0ZSBDQQ==","whitelist":false,"attachment":{"hash":"16347dce0fe6fabddcac6b1ee3422faca2c7a11714ff833f84a2a28c0cd1e616","size":2166,"filename":"yCqFvFSoWlrlSkhYTl28RzjG38okJneuXy8b6cUfEV0=.pem","location":"security-state-staging/intermediates/b7278ac4-4783-40b3-8817-affe98a900a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"yCqFvFSoWlrlSkhYTl28RzjG38okJneuXy8b6cUfEV0=","crlite_enrolled":false,"id":"290cdd36-d7c6-4c5b-aaee-b3f6b84c3e6b","last_modified":1559866233281},{"schema":1559866219394,"derHash":"qMCpKw2Q6CFszKNMGhaDs060dY1GDIksqMUSqKKswI8=","subject":"CN=Hostpoint RSA CA,OU=Domain Validated SSL,O=Hostpoint AG,C=CH","subjectDN":"MF4xCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxIb3N0cG9pbnQgQUcxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0ZWQgU1NMMRkwFwYDVQQDExBIb3N0cG9pbnQgUlNBIENB","whitelist":false,"attachment":{"hash":"bd0b77e1ad7c766478cf2792f2390fc6dbc81b708a0c71c36c53e208635a60a4","size":1670,"filename":"KdhTtQeOQpuAPS1eltTuWsDPY1eewAMFmlvc5UIbk4k=.pem","location":"security-state-staging/intermediates/b3c11b52-e6f8-45e1-ae00-9da7044abefc.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KdhTtQeOQpuAPS1eltTuWsDPY1eewAMFmlvc5UIbk4k=","crlite_enrolled":false,"id":"62c93f86-ae45-4b99-a827-2170f2416255","last_modified":1559866220196},{"schema":1559866176457,"derHash":"GUzCtbBkk8DvCwqfqDdvlYviQqJ0ral0rLyRAjNoeNw=","subject":"CN=DOMENY SSL DV Certification Authority,O=DOMENY.PL sp. z o.o,L=Krak\u00f3w,ST=Ma\u0142opolskie,C=PL","subjectDN":"MIGEMQswCQYDVQQGEwJQTDEVMBMGA1UECAwMTWHFgm9wb2xza2llMRAwDgYDVQQHDAdLcmFrw7N3MRwwGgYDVQQKExNET01FTlkuUEwgc3AuIHogby5vMS4wLAYDVQQDEyVET01FTlkgU1NMIERWIENlcnRpZmljYXRpb24gQXV0aG9yaXR5","whitelist":false,"attachment":{"hash":"4ae7713a7c33e45405293b35aa867f795213ba9becc489f35146c71f51673521","size":2154,"filename":"c4Z4xm0MVOlxzaOy4OXC86lTgsofdZML4CYOmaSpWYM=.pem","location":"security-state-staging/intermediates/8ecc0bf4-31de-41ef-b195-d3d4e799c302.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"c4Z4xm0MVOlxzaOy4OXC86lTgsofdZML4CYOmaSpWYM=","crlite_enrolled":true,"id":"d5ea596c-6fe9-45d3-84b0-0f1eb9ea2b08","last_modified":1559866177285},{"schema":1559866168360,"derHash":"znrcGXdXpS5pogFMzgPZgGMlAnZHQsKSPXOAVo4hAKY=","subject":"CN=E-Tugra Extended Validated CA,OU=E-Tu\u011fra Sertifikasyon Merkezi,O=E-Tu\u011fra EBG Bili\u015fim Teknolojileri ve Hizmetleri A.\u015e.,L=Ankara,C=TR","subjectDN":"MIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMUAwPgYDVQQKDDdFLVR1xJ9yYSBFQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMScwJQYDVQQLDB5FLVR1xJ9yYSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxJjAkBgNVBAMMHUUtVHVncmEgRXh0ZW5kZWQgVmFsaWRhdGVkIENB","whitelist":false,"attachment":{"hash":"12ff7eb3fc7ad0d030464cfca8808d4239fab2f60c03f47a3f76ec1c962d10f8","size":2296,"filename":"CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=.pem","location":"security-state-staging/intermediates/b4924736-081c-4006-83d9-18747abe70b7.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"CbsSUO015uoyaPW3UoozNFDyIZuKJooRSCguLZLEHjg=","crlite_enrolled":true,"id":"7c935540-4c03-4352-b768-16756b45aed8","last_modified":1559866169149},{"schema":1559866096673,"derHash":"pUK8oJxeRXnGGXdK5ZCCvOD4bSYcWnpaD2IXwQJ56nw=","subject":"CN=DigiCert SHA2 Assured ID CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGUxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJDAiBgNVBAMTG0RpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBDQQ==","whitelist":false,"attachment":{"hash":"4e3c1ebfbeec02bf731c95b85a98fa732e6965367dac4484c3c1874f56b577ca","size":2247,"filename":"KFZYqX5VzrLyLTGNVQGlkHRFKrLkZ3UddPIGfeE7tKI=.pem","location":"security-state-staging/intermediates/73e8da81-d69e-4de2-ac9b-c40d075bd421.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"KFZYqX5VzrLyLTGNVQGlkHRFKrLkZ3UddPIGfeE7tKI=","crlite_enrolled":true,"id":"f2f88f3f-b9b1-45b6-a155-beb11a1c37aa","last_modified":1559866097495},{"schema":1559866042836,"derHash":"NlH5s2odqYMgDG7k787PpN78BZRmaJ2qGm22hKVMnns=","subject":"CN=Actalis Organization Validated Server CA G1,O=Actalis S.p.A./03358520967,L=Ponte San Pietro,ST=Bergamo,C=IT","subjectDN":"MIGVMQswCQYDVQQGEwJJVDEQMA4GA1UECAwHQmVyZ2FtbzEZMBcGA1UEBwwQUG9udGUgU2FuIFBpZXRybzEjMCEGA1UECgwaQWN0YWxpcyBTLnAuQS4vMDMzNTg1MjA5NjcxNDAyBgNVBAMMK0FjdGFsaXMgT3JnYW5pemF0aW9uIFZhbGlkYXRlZCBTZXJ2ZXIgQ0EgRzE=","whitelist":false,"attachment":{"hash":"6abedb9881ea66af627c7960fe41956b260b02726a2719d0ac283185d97e16cf","size":2263,"filename":"pmKuxMFaLv7ve9PLjGilItvtdgTK9uISTaDGBZSO3kQ=.pem","location":"security-state-staging/intermediates/a33bcad3-47f9-4423-ab8e-92ad859cc5ec.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"pmKuxMFaLv7ve9PLjGilItvtdgTK9uISTaDGBZSO3kQ=","crlite_enrolled":true,"id":"041225c6-347b-421b-89b7-20269162c1f4","last_modified":1559866043641},{"schema":1559866037153,"derHash":"Pmk2hUsVb7sV7phEye47v5L4SSiXp3L5CSxS7ShQfr8=","subject":"SERIALNUMBER=201913,CN=Citizen CA,O=Certipost N.V./S.A.,L=Brussels,C=BE","subjectDN":"MGQxCzAJBgNVBAYTAkJFMREwDwYDVQQHEwhCcnVzc2VsczEcMBoGA1UEChMTQ2VydGlwb3N0IE4uVi4vUy5BLjETMBEGA1UEAxMKQ2l0aXplbiBDQTEPMA0GA1UEBRMGMjAxOTEz","whitelist":false,"attachment":{"hash":"14ef386b3d7bd03ea81423a233913c96bfeca45ba0cefee666bff7c27ba50b1e","size":2333,"filename":"Jsk0sModzjZIxYKO3IRJSdYqtPzqR6bbb8LX6PhSPwY=.pem","location":"security-state-staging/intermediates/2f6d5ee7-2efc-4fd2-aa08-a955d2c93f94.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"Jsk0sModzjZIxYKO3IRJSdYqtPzqR6bbb8LX6PhSPwY=","crlite_enrolled":false,"id":"e795ec9e-893e-4bd9-9c1a-075665a007e8","last_modified":1559866037946},{"schema":1559866019917,"derHash":"ACfIUuagp06thEtfrCQ0zCSWaFPITOYyEkaIgbYWZl0=","subject":"CN=SMBC Certificate Authority CA2,OU=SMBC Authority,O=Sumitomo Mitsui Banking Corporation,C=JP","subjectDN":"MH0xCzAJBgNVBAYTAkpQMSwwKgYDVQQKEyNTdW1pdG9tbyBNaXRzdWkgQmFua2luZyBDb3Jwb3JhdGlvbjEXMBUGA1UECxMOU01CQyBBdXRob3JpdHkxJzAlBgNVBAMTHlNNQkMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IENBMg==","whitelist":false,"attachment":{"hash":"a2117111540332765fe1764c3bf9435092c6e93c8fe8ee65054259b3a4832ed3","size":1674,"filename":"8DUaRM2LbmS8cveWB1rUODjdayFFeT7IHpAqhCLVI4c=.pem","location":"security-state-staging/intermediates/af2004b4-f64d-4c8e-9247-07ccfeacefb4.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"8DUaRM2LbmS8cveWB1rUODjdayFFeT7IHpAqhCLVI4c=","crlite_enrolled":false,"id":"654df36c-da2e-4178-82ee-f75edff4129f","last_modified":1559866020722},{"schema":1559866009149,"derHash":"F1LCGdAzcBm8jBk0fJ8rvjcIH6bMGxsJoDdY5gwwfgk=","subject":"CN=Gehirn Managed Certification Authority - RSA DV,O=Gehirn Inc.,L=Chiyoda-ku,ST=Tokyo,C=JP","subjectDN":"MIGCMQswCQYDVQQGEwJKUDEOMAwGA1UECBMFVG9reW8xEzARBgNVBAcTCkNoaXlvZGEta3UxFDASBgNVBAoTC0dlaGlybiBJbmMuMTgwNgYDVQQDEy9HZWhpcm4gTWFuYWdlZCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIFJTQSBEVg==","whitelist":false,"attachment":{"hash":"2a599a3d41037f018b5b829d6ebee32d6e3022d7811d0629fc6a1ab8cedfbbce","size":2158,"filename":"SWuXVKtSHOw5ZPbQM2Hw49GYwfpJkXf6azkkNwpZ9TQ=.pem","location":"security-state-staging/intermediates/d88294ca-5505-4a98-9cda-33ec41b77048.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"SWuXVKtSHOw5ZPbQM2Hw49GYwfpJkXf6azkkNwpZ9TQ=","crlite_enrolled":true,"id":"c2f8d5bf-b34e-4d22-b008-bc3dd0b9a6a4","last_modified":1559866009943},{"schema":1559865975116,"derHash":"ayP62JAYDDN7hkFV2uDem62e8L2njREvLL3D0CrReVY=","subject":"CN=NetLock \u00dczleti (Class B) Tan\u00fas\u00edtv\u00e1nykiad\u00f3,OU=Tan\u00fas\u00edtv\u00e1nykiad\u00f3k (Certification Services),O=NetLock Kft.,L=Budapest,C=HU","subjectDN":"MIGpMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE3MDUGA1UEAwwuTmV0TG9jayDDnHpsZXRpIChDbGFzcyBCKSBUYW7DunPDrXR2w6FueWtpYWTDsw==","whitelist":false,"attachment":{"hash":"573f7ca4199a4ab7b67cf4b5b1c8e25a89da7c93d3296ece5e8301e5bf64c39b","size":2182,"filename":"1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=.pem","location":"security-state-staging/intermediates/5ae11eb3-59e2-4f2f-a3ad-09d610869295.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"1YROuDznuNvrat3sL9gwGR124PRLocGQQWd6IoM50Ls=","crlite_enrolled":true,"id":"1a8145a6-66a3-4c40-914b-e027086ea091","last_modified":1559865975919},{"schema":1559865954402,"derHash":"bGniAWVkQOuYzQh1dkoe0ZAV7YxEJ2Aaypxor6iXOVk=","subject":"CN=Abbott Laboratories Secure Server CA,O=Abbott Laboratories Inc.,C=US","subjectDN":"MF8xCzAJBgNVBAYTAlVTMSEwHwYDVQQKExhBYmJvdHQgTGFib3JhdG9yaWVzIEluYy4xLTArBgNVBAMTJEFiYm90dCBMYWJvcmF0b3JpZXMgU2VjdXJlIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"eff2021a84dc350c344035f14d9ace98bd2aff4df26812ac44f35532c31dc995","size":1670,"filename":"WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=.pem","location":"security-state-staging/intermediates/fd41a272-a56d-4cc1-8ab0-48e779b64f93.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"WLek4rSUF1hqMCGoR58aNhDKwFpMOcmhWVSaGRqkM5Y=","crlite_enrolled":false,"id":"dd1862ea-9ff3-42ff-907f-f83e355dd278","last_modified":1559865955200},{"schema":1559865922818,"derHash":"eBbHsFZrRng7HBXYoo2LDSDP6yCz0T95RG4VxKUckd8=","subject":"CN=Certum Extended Validation CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL","subjectDN":"MIGCMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSYwJAYDVQQDEx1DZXJ0dW0gRXh0ZW5kZWQgVmFsaWRhdGlvbiBDQQ==","whitelist":false,"attachment":{"hash":"0705626e2fe60aaf3f2b067419aa1d9994ec7c33fd5519e98851d2477d71ba8e","size":2430,"filename":"rxmDSIbuiNS8fzkHrqwb5gM8fGXYXY7Egq5fLYyEn4s=.pem","location":"security-state-staging/intermediates/ad1b09ec-5983-4577-b17f-3bcdc6f7349d.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"rxmDSIbuiNS8fzkHrqwb5gM8fGXYXY7Egq5fLYyEn4s=","crlite_enrolled":true,"id":"a6162e7a-0ad4-4d74-9ccf-7528c89121b2","last_modified":1559865923624},{"schema":1559865909816,"derHash":"h6pxrwMuNr1p2vQBT8rY8nM6oA3quVkzWuOGbkttOh0=","subject":"CN=RapidSSL Enterprise CA,OU=For Internal Use Only,O=GeoTrust\\, Inc.,C=US","subjectDN":"MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEeMBwGA1UECxMVRm9yIEludGVybmFsIFVzZSBPbmx5MR8wHQYDVQQDExZSYXBpZFNTTCBFbnRlcnByaXNlIENB","whitelist":false,"attachment":{"hash":"d814cbeb3bba9c4301c57cac75040699c4d480925c5650fee8c11fffffdc68df","size":1508,"filename":"NU79QJ5AFUOrmQDTq80lNzSOHvYG8jU1KQoGfjQbehg=.pem","location":"security-state-staging/intermediates/6a07c4a8-7692-4de3-b7e2-381dbbbffdb6.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"NU79QJ5AFUOrmQDTq80lNzSOHvYG8jU1KQoGfjQbehg=","crlite_enrolled":false,"id":"039f2d8c-c45f-47df-8c82-7db505c836b6","last_modified":1559865910620},{"schema":1559865898453,"derHash":"FRo1kbdl0Cw1nuycVu2N2tDFTnVqSX0Cv5efqN1dlbs=","subject":"CN=Catholic Health Initiatives CA,OU=Orion Health Direct Secure Messaging,O=Catholic Health Initiatives,C=US","subjectDN":"MIGLMQswCQYDVQQGEwJVUzEkMCIGA1UEChMbQ2F0aG9saWMgSGVhbHRoIEluaXRpYXRpdmVzMS0wKwYDVQQLEyRPcmlvbiBIZWFsdGggRGlyZWN0IFNlY3VyZSBNZXNzYWdpbmcxJzAlBgNVBAMTHkNhdGhvbGljIEhlYWx0aCBJbml0aWF0aXZlcyBDQQ==","whitelist":false,"attachment":{"hash":"ee6a309e0de6cb67ace3bdaab607e586d5285e59b539600424872e26eb2416c6","size":2304,"filename":"eGgIb9Mf8R2HbnNEy1RdxWcW2zycYmpZml33v8IU60Y=.pem","location":"security-state-staging/intermediates/cf1968f2-109b-48cb-b587-0b7b16705e3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eGgIb9Mf8R2HbnNEy1RdxWcW2zycYmpZml33v8IU60Y=","crlite_enrolled":false,"id":"e21eb37a-004c-4f2f-b310-00ae5b96e7e5","last_modified":1559865899247},{"schema":1559865897655,"derHash":"wmfcEV1X3QImJ5s0bfGVPdLAeoXLSKDYmf1XJPWvaB8=","subject":"CN=Symantec Class 3 Extended Validation Code Signing CA - G3,OU=Symantec Trust Network,O=Symantec Corporation,C=US","subjectDN":"MIGRMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxQjBABgNVBAMTOVN5bWFudGVjIENsYXNzIDMgRXh0ZW5kZWQgVmFsaWRhdGlvbiBDb2RlIFNpZ25pbmcgQ0EgLSBHMw==","whitelist":false,"attachment":{"hash":"207fc06b42669c71ee04aa593840172f925d130cfd82a1c6286bbb57a47662ba","size":1902,"filename":"QVwcabwoERXIBspXIsZlwkJ7SmEfO8TMs3IiG5iwXM8=.pem","location":"security-state-staging/intermediates/303eb490-7274-4466-9fa5-888d4a682229.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"QVwcabwoERXIBspXIsZlwkJ7SmEfO8TMs3IiG5iwXM8=","crlite_enrolled":false,"id":"43d4e068-b019-457b-a223-234db563b467","last_modified":1559865898440},{"schema":1559865883837,"derHash":"7toVugALAG6tSaIbvnafO6bOdckknwEU2N2ILfwPLBs=","subject":"CN=GoGetSSL Extended Validation CA SHA2,OU=GoGetSSL Certification Authority,O=EnVers Group SIA,C=LV","subjectDN":"MIGCMQswCQYDVQQGEwJMVjEZMBcGA1UECgwQRW5WZXJzIEdyb3VwIFNJQTEpMCcGA1UECwwgR29HZXRTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxLTArBgNVBAMMJEdvR2V0U1NMIEV4dGVuZGVkIFZhbGlkYXRpb24gQ0EgU0hBMg==","whitelist":false,"attachment":{"hash":"3f571450d63eacb78406320bff9a534186fb3c5714e38ef5e9421cc30dd0f091","size":1752,"filename":"BPECx6wNq90p8gu0YpJ1Fc0Dx7h0SmkteDK5xDmXT5Y=.pem","location":"security-state-staging/intermediates/69c28a8d-33ee-4e47-bb72-44abfc083dca.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"BPECx6wNq90p8gu0YpJ1Fc0Dx7h0SmkteDK5xDmXT5Y=","crlite_enrolled":false,"id":"30f7ecb1-568f-400d-8562-fef6ac31428f","last_modified":1559865884636},{"schema":1559865881436,"derHash":"xhApyO7jzgh1XVYrtQxfdeDvhJIUlwsTvZkYU2fR0Rk=","subject":"CN=DigiCert Provisional Direct Med CA,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MGwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xKzApBgNVBAMTIkRpZ2lDZXJ0IFByb3Zpc2lvbmFsIERpcmVjdCBNZWQgQ0E=","whitelist":false,"attachment":{"hash":"9db67e54d72b0ed5cb3af0e6d5ae65878c009c049543ecb722e8c2429928a21d","size":2138,"filename":"qrhUgzehJmpLBJORSXw5Rr74Be05U1eHnv0PnDNXUX4=.pem","location":"security-state-staging/intermediates/2fdc0c6f-f377-4cd0-acf8-21d1f34ac6a5.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"qrhUgzehJmpLBJORSXw5Rr74Be05U1eHnv0PnDNXUX4=","crlite_enrolled":false,"id":"8ad399aa-03ed-477e-aefd-6f8675cf5313","last_modified":1559865882224},{"schema":1559865879001,"derHash":"V2XGaWoOtcgWRFcyPcQbYSmWHuXFWMEeygKagGdd4to=","subject":"CN=InCommon IGTF Server CA,OU=InCommon,O=Internet2,C=US","subjectDN":"MFYxCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlJbnRlcm5ldDIxETAPBgNVBAsTCEluQ29tbW9uMSAwHgYDVQQDExdJbkNvbW1vbiBJR1RGIFNlcnZlciBDQQ==","whitelist":false,"attachment":{"hash":"adb731d717bfcd68bba75cde81004aa2c9510de557a9130c02d3f1b558d3dd61","size":2105,"filename":"eKK5WQ3iY2Qjww9Titbu9ylESXstB780TnTJBT7c0zI=.pem","location":"security-state-staging/intermediates/fc1eec87-d8f8-4300-91ea-b217ad53fb3b.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"eKK5WQ3iY2Qjww9Titbu9ylESXstB780TnTJBT7c0zI=","crlite_enrolled":true,"id":"bab3a8d0-faa9-4a2d-9faa-bf897b48540b","last_modified":1559865879785},{"schema":1559865877396,"derHash":"2OJppusIy8M3rWV4xyE1eHSEyZ0vsIzO0CnoBr4QQPw=","subject":"CN=GeoTrust ECC CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US","subjectDN":"MF4xCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xHTAbBgNVBAMTFEdlb1RydXN0IEVDQyBDQSAyMDE4","whitelist":false,"attachment":{"hash":"ed3ea6d09c5ea1ee4aff94776f7636c5caa4a1f898b7cf38a7a51186ce041b2e","size":1362,"filename":"A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=.pem","location":"security-state-staging/intermediates/d91f6034-4d0e-4712-b034-11eafafca044.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"A0W8sBH3jBrKa3ukj8kse0jYSSeQM5e5tb8obnMQvak=","crlite_enrolled":true,"id":"a4d953b4-251b-4c06-931a-1e3ed439794e","last_modified":1559865878190},{"schema":1559865862835,"derHash":"eFhUEwsU9vHun5hCV6urtiVbBajb77doDTNACsKP6Qk=","subject":"CN=certSIGN Code Signing CA Class 3 G2,OU=certSIGN Code Signing CA Class 3 G2,O=certSIGN,C=RO","subjectDN":"MHwxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEsMCoGA1UECxMjY2VydFNJR04gQ29kZSBTaWduaW5nIENBIENsYXNzIDMgRzIxLDAqBgNVBAMTI2NlcnRTSUdOIENvZGUgU2lnbmluZyBDQSBDbGFzcyAzIEcy","whitelist":false,"attachment":{"hash":"979d813e8beb4bc5b97e32b32670bc7d542475a2869e021c2f5258073fc2683f","size":1723,"filename":"JfGTViyEYla3GTtoAL7NpEIwzj14wMFgtWvcWICwEsM=.pem","location":"security-state-staging/intermediates/729b520d-7781-44fd-a627-50fb1479e236.pem","mimetype":"application/x-pem-file"},"pubKeyHash":"JfGTViyEYla3GTtoAL7NpEIwzj14wMFgtWvcWICwEsM=","crlite_enrolled":false,"id":"586b6f01-c7f7-4a5e-ba71-e7dca3e77add","last_modified":1559865863642}]}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/services/sync/golden_gate/Cargo.toml firefox-85.0+build1/services/sync/golden_gate/Cargo.toml
--- firefox-84.0.2+build1/services/sync/golden_gate/Cargo.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/golden_gate/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 
 [dependencies]
 atomic_refcell = "0.1"
-cstr = "0.1"
+cstr = "0.2"
 interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f" }
 log = "0.4"
 moz_task = { path = "../../../xpcom/rust/moz_task" }
diff -Nru firefox-84.0.2+build1/services/sync/modules/constants.js firefox-85.0+build1/services/sync/modules/constants.js
--- firefox-84.0.2+build1/services/sync/modules/constants.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/services/sync/modules/constants.js	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 for (let [key, val] of Object.entries({
   // Don't manually modify this line, as it is automatically replaced on merge day
   // by the gecko_migration.py script.
-  WEAVE_VERSION: "1.86.0",
+  WEAVE_VERSION: "1.87.0",
 
   // Sync Server API version that the client supports.
   SYNC_API_VERSION: "1.5",
diff -Nru firefox-84.0.2+build1/services/sync/modules/engines/bookmarks.js firefox-85.0+build1/services/sync/modules/engines/bookmarks.js
--- firefox-84.0.2+build1/services/sync/modules/engines/bookmarks.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/modules/engines/bookmarks.js	2021-01-18 19:58:19.000000000 +0000
@@ -920,11 +920,6 @@
       return;
     }
 
-    // Ignore favicon changes to avoid unnecessary churn.
-    if (property == "favicon") {
-      return;
-    }
-
     this._log.trace(
       "onItemChanged: " +
         itemId +
@@ -963,7 +958,6 @@
       this._batchSawScoreIncrement = false;
     }
   },
-  onItemVisited() {},
 };
 
 /**
diff -Nru firefox-84.0.2+build1/services/sync/modules/engines/history.js firefox-85.0+build1/services/sync/modules/engines/history.js
--- firefox-84.0.2+build1/services/sync/modules/engines/history.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/modules/engines/history.js	2021-01-18 19:58:19.000000000 +0000
@@ -610,7 +610,6 @@
 
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
-  onPageChanged() {},
   onTitleChanged() {},
   onBeforeDeleteURI() {},
 };
diff -Nru firefox-84.0.2+build1/services/sync/modules/engines/passwords.js firefox-85.0+build1/services/sync/modules/engines/passwords.js
--- firefox-84.0.2+build1/services/sync/modules/engines/passwords.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/modules/engines/passwords.js	2021-01-18 19:58:19.000000000 +0000
@@ -411,7 +411,7 @@
   },
 
   async wipe() {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   },
 };
 
@@ -463,8 +463,18 @@
         }
         break;
 
+      // Bug 1613620: We iterate through the removed logins and track them to ensure
+      // the logins are deleted across synced devices/accounts
       case "removeAllLogins":
-        this._log.trace(data);
+        subject.QueryInterface(Ci.nsIArrayExtensions);
+        let count = subject.Count();
+        for (let i = 0; i < count; i++) {
+          let currentSubject = subject.GetElementAt(i);
+          let tracked = await this._trackLogin(currentSubject);
+          if (tracked) {
+            this._log.trace(data + ": " + currentSubject.guid);
+          }
+        }
         this.score += SCORE_INCREMENT_XLARGE;
         break;
     }
diff -Nru firefox-84.0.2+build1/services/sync/tests/unit/head_helpers.js firefox-85.0+build1/services/sync/tests/unit/head_helpers.js
--- firefox-84.0.2+build1/services/sync/tests/unit/head_helpers.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/tests/unit/head_helpers.js	2021-01-18 19:58:19.000000000 +0000
@@ -640,7 +640,6 @@
         done("removed", uri.spec);
       },
       onClearHistory() {},
-      onPageChanged() {},
       onDeleteVisits() {},
     };
     PlacesUtils.history.addObserver(observer, false);
diff -Nru firefox-84.0.2+build1/services/sync/tests/unit/test_password_tracker.js firefox-85.0+build1/services/sync/tests/unit/test_password_tracker.js
--- firefox-84.0.2+build1/services/sync/tests/unit/test_password_tracker.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/tests/unit/test_password_tracker.js	2021-01-18 19:58:19.000000000 +0000
@@ -106,3 +106,51 @@
     await tracker.stop();
   }
 });
+
+add_task(async function test_removeAllLogins() {
+  let recordNum = 0;
+  _("Verify that all tracked logins are removed.");
+
+  async function createPassword() {
+    _("RECORD NUM: " + recordNum);
+    let record = {
+      id: "GUID" + recordNum,
+      hostname: "http://foo.bar.com",
+      formSubmitURL: "http://foo.bar.com",
+      username: "john" + recordNum,
+      password: "smith",
+      usernameField: "username",
+      passwordField: "password",
+    };
+    recordNum++;
+    let login = store._nsLoginInfoFromRecord(record);
+    Services.logins.addLogin(login);
+    await tracker.asyncObserver.promiseObserversComplete();
+  }
+  try {
+    _("Tell tracker to start tracking changes");
+    tracker.start();
+    await createPassword();
+    await createPassword();
+    let changes = await tracker.getChangedIDs();
+    do_check_attribute_count(changes, 2);
+    Assert.equal(tracker.score, SCORE_INCREMENT_XLARGE * 2);
+
+    await tracker.clearChangedIDs();
+    changes = await tracker.getChangedIDs();
+    do_check_attribute_count(changes, 0);
+
+    _("Tell sync to remove all logins");
+    Services.logins.removeAllUserFacingLogins();
+    await tracker.asyncObserver.promiseObserversComplete();
+    changes = await tracker.getChangedIDs();
+    do_check_attribute_count(changes, 2);
+    Assert.equal(tracker.score, SCORE_INCREMENT_XLARGE * 5);
+  } finally {
+    _("Clean up.");
+    await store.wipe();
+    await tracker.clearChangedIDs();
+    tracker.resetScore();
+    await tracker.stop();
+  }
+});
diff -Nru firefox-84.0.2+build1/services/sync/tests/unit/test_service_verifyLogin.js firefox-85.0+build1/services/sync/tests/unit/test_service_verifyLogin.js
--- firefox-84.0.2+build1/services/sync/tests/unit/test_service_verifyLogin.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/services/sync/tests/unit/test_service_verifyLogin.js	2021-01-18 19:58:19.000000000 +0000
@@ -30,7 +30,7 @@
 
 add_task(async function test_verifyLogin() {
   // This test expects a clean slate -- no saved passphrase.
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   let johnHelper = track_collections_helper();
   let johnU = johnHelper.with_updated_collection;
 
diff -Nru firefox-84.0.2+build1/servo/components/derive_common/cg.rs firefox-85.0+build1/servo/components/derive_common/cg.rs
--- firefox-84.0.2+build1/servo/components/derive_common/cg.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/derive_common/cg.rs	2021-01-18 19:58:19.000000000 +0000
@@ -360,7 +360,7 @@
             }
         }
         if !first {
-            result.push_str("-");
+            result.push('-');
         }
         first = false;
         result.push_str(&segment.to_lowercase());
diff -Nru firefox-84.0.2+build1/servo/components/fallible/lib.rs firefox-85.0+build1/servo/components/fallible/lib.rs
--- firefox-84.0.2+build1/servo/components/fallible/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/fallible/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -86,78 +86,34 @@
 impl<T: Array> FallibleVec<T::Item> for SmallVec<T> {
     #[inline(always)]
     fn try_push(&mut self, val: T::Item) -> Result<(), FailedAllocationError> {
-        #[cfg(feature = "known_system_malloc")]
-        {
-            if self.capacity() == self.len() {
-                try_double_small_vec(self)?;
-                debug_assert!(self.capacity() > self.len());
-            }
+        if self.capacity() == self.len() {
+            try_grow_small_vec(self)?;
+            debug_assert!(self.capacity() > self.len());
         }
         self.push(val);
         Ok(())
     }
 }
 
-// Double the capacity of |svec|, or fail to do so due to lack of memory.
-// Returns Ok(()) on success, Err(..) on failure.
+// Grow the capacity of |svec|, or fail to do so due to lack of memory.
 #[cfg(feature = "known_system_malloc")]
 #[inline(never)]
 #[cold]
-fn try_double_small_vec<T>(svec: &mut SmallVec<T>) -> Result<(), FailedAllocationError>
+fn try_grow_small_vec<T>(svec: &mut SmallVec<T>) -> Result<(), FailedAllocationError>
 where
     T: Array,
 {
-    use std::mem;
-    use std::ptr::copy_nonoverlapping;
-
-    let old_ptr = svec.as_mut_ptr();
-    let old_len = svec.len();
-
-    let old_cap: usize = svec.capacity();
-    let new_cap: usize = if old_cap == 0 {
-        4
-    } else {
-        old_cap
-            .checked_mul(2)
-            .ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?
+    let error = match svec.try_reserve(1) {
+        Ok(..) => return Ok(()),
+        Err(e) => e,
     };
 
-    // This surely shouldn't fail, if |old_cap| was previously accepted as a
-    // valid value.  But err on the side of caution.
-    let old_size_bytes = old_cap
-        .checked_mul(mem::size_of::<T>())
-        .ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?;
-
-    let new_size_bytes = new_cap
-        .checked_mul(mem::size_of::<T>())
-        .ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?;
-
-    let new_ptr;
-    if svec.spilled() {
-        // There's an old block to free, and, presumably, old contents to
-        // copy.  realloc takes care of both aspects.
-        unsafe {
-            new_ptr = alloc::realloc(old_ptr as *mut u8, new_size_bytes);
-        }
-    } else {
-        // There's no old block to free.  There may be old contents to copy.
-        unsafe {
-            new_ptr = alloc::alloc(new_size_bytes, 0);
-            if !new_ptr.is_null() && old_size_bytes > 0 {
-                copy_nonoverlapping(old_ptr as *const u8, new_ptr as *mut u8, old_size_bytes);
-            }
-        }
-    }
-
-    if new_ptr.is_null() {
-        return Err(FailedAllocationError::new(
+    Err(match error {
+        smallvec::CollectionAllocErr::AllocErr { .. } => FailedAllocationError::new(
             "out of memory when allocating SmallVec",
-        ));
-    }
-
-    let new_vec = unsafe { Vec::from_raw_parts(new_ptr as *mut T::Item, old_len, new_cap) };
-
-    let new_svec = SmallVec::from_vec(new_vec);
-    mem::forget(mem::replace(svec, new_svec));
-    Ok(())
+        ),
+        smallvec::CollectionAllocErr::CapacityOverflow => FailedAllocationError::new(
+            "capacity overflow for SmallVec",
+        ),
+    })
 }
diff -Nru firefox-84.0.2+build1/servo/components/selectors/attr.rs firefox-85.0+build1/servo/components/selectors/attr.rs
--- firefox-84.0.2+build1/servo/components/selectors/attr.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/attr.rs	2021-01-18 19:58:19.000000000 +0000
@@ -134,7 +134,7 @@
 }
 
 /// The definition of whitespace per CSS Selectors Level 3 § 4.
-pub static SELECTOR_WHITESPACE: &'static [char] = &[' ', '\t', '\n', '\r', '\x0C'];
+pub static SELECTOR_WHITESPACE: &[char] = &[' ', '\t', '\n', '\r', '\x0C'];
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, ToShmem)]
 pub enum ParsedCaseSensitivity {
diff -Nru firefox-84.0.2+build1/servo/components/selectors/build.rs firefox-85.0+build1/servo/components/selectors/build.rs
--- firefox-84.0.2+build1/servo/components/selectors/build.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/build.rs	2021-01-18 19:58:19.000000000 +0000
@@ -27,7 +27,7 @@
 }
 
 /// <https://html.spec.whatwg.org/multipage/#selectors>
-static ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES: &'static str = r#"
+static ASCII_CASE_INSENSITIVE_HTML_ATTRIBUTES: &str = r#"
     accept
     accept-charset
     align
diff -Nru firefox-84.0.2+build1/servo/components/selectors/context.rs firefox-85.0+build1/servo/components/selectors/context.rs
--- firefox-84.0.2+build1/servo/components/selectors/context.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/context.rs	2021-01-18 19:58:19.000000000 +0000
@@ -286,6 +286,6 @@
     /// against.
     #[inline]
     pub fn shadow_host(&self) -> Option<OpaqueElement> {
-        self.current_host.clone()
+        self.current_host
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/selectors/matching.rs firefox-85.0+build1/servo/components/selectors/matching.rs
--- firefox-84.0.2+build1/servo/components/selectors/matching.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/matching.rs	2021-01-18 19:58:19.000000000 +0000
@@ -334,10 +334,7 @@
     let result =
         matches_complex_selector_internal(iter, element, context, flags_setter, Rightmost::Yes);
 
-    match result {
-        SelectorMatchingResult::Matched => true,
-        _ => false,
-    }
+    matches!(result, SelectorMatchingResult::Matched)
 }
 
 #[inline]
@@ -915,9 +912,11 @@
             element,
             is_of_type,
             is_from_end,
-            cache.as_mut().map(|s| &mut **s),
+            cache.as_deref_mut(),
         );
-        cache.as_mut().map(|c| c.insert(element.opaque(), i));
+        if let Some(c) = cache.as_mut() {
+            c.insert(element.opaque(), i)
+        }
         i
     };
     debug_assert_eq!(
diff -Nru firefox-84.0.2+build1/servo/components/selectors/nth_index_cache.rs firefox-85.0+build1/servo/components/selectors/nth_index_cache.rs
--- firefox-84.0.2+build1/servo/components/selectors/nth_index_cache.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/nth_index_cache.rs	2021-01-18 19:58:19.000000000 +0000
@@ -37,7 +37,7 @@
 impl NthIndexCacheInner {
     /// Does a lookup for a given element in the cache.
     pub fn lookup(&mut self, el: OpaqueElement) -> Option<i32> {
-        self.0.get(&el).map(|x| *x)
+        self.0.get(&el).copied()
     }
 
     /// Inserts an entry into the cache.
diff -Nru firefox-84.0.2+build1/servo/components/selectors/parser.rs firefox-85.0+build1/servo/components/selectors/parser.rs
--- firefox-84.0.2+build1/servo/components/selectors/parser.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/parser.rs	2021-01-18 19:58:19.000000000 +0000
@@ -10,15 +10,15 @@
 use crate::context::QuirksMode;
 use crate::sink::Push;
 pub use crate::visitor::SelectorVisitor;
-use cssparser::{parse_nth, serialize_identifier};
+use cssparser::parse_nth;
 use cssparser::{BasicParseError, BasicParseErrorKind, ParseError, ParseErrorKind};
 use cssparser::{CowRcStr, Delimiter, SourceLocation};
-use cssparser::{CssStringWriter, Parser as CssParser, ToCss, Token};
+use cssparser::{Parser as CssParser, ToCss, Token};
 use precomputed_hash::PrecomputedHash;
 use servo_arc::ThinArc;
 use smallvec::SmallVec;
 use std::borrow::{Borrow, Cow};
-use std::fmt::{self, Debug, Display, Write};
+use std::fmt::{self, Debug};
 use std::iter::Rev;
 use std::slice;
 
@@ -197,8 +197,6 @@
             type ExtraMatchingData: Sized + Default + 'static;
             type AttrValue: $($InSelector)*;
             type Identifier: $($InSelector)*;
-            type ClassName: $($InSelector)*;
-            type PartName: $($InSelector)*;
             type LocalName: $($InSelector)* + Borrow<Self::BorrowedLocalName>;
             type NamespaceUrl: $($CommonBounds)* + Default + Borrow<Self::BorrowedNamespaceUrl>;
             type NamespacePrefix: $($InSelector)* + Default;
@@ -218,7 +216,7 @@
 macro_rules! with_bounds {
     ( [ $( $CommonBounds: tt )* ] [ $( $FromStr: tt )* ]) => {
         with_all_bounds! {
-            [$($CommonBounds)* + $($FromStr)* + Display]
+            [$($CommonBounds)* + $($FromStr)* + ToCss]
             [$($CommonBounds)*]
             [$($FromStr)*]
         }
@@ -462,7 +460,6 @@
 ) -> bool
 where
     Impl::Identifier: PrecomputedHash,
-    Impl::ClassName: PrecomputedHash,
     Impl::LocalName: PrecomputedHash,
     Impl::NamespaceUrl: PrecomputedHash,
 {
@@ -493,10 +490,8 @@
                 // :where and :is OR their selectors, so we can't put any hash
                 // in the filter if there's more than one selector, as that'd
                 // exclude elements that may match one of the other selectors.
-                if list.len() == 1 {
-                    if !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len) {
-                        return false;
-                    }
+                if list.len() == 1 && !collect_ancestor_hashes(list[0].iter(), quirks_mode, hashes, len) {
+                    return false;
                 }
                 continue;
             },
@@ -516,7 +511,6 @@
     pub fn new<Impl: SelectorImpl>(selector: &Selector<Impl>, quirks_mode: QuirksMode) -> Self
     where
         Impl::Identifier: PrecomputedHash,
-        Impl::ClassName: PrecomputedHash,
         Impl::LocalName: PrecomputedHash,
         Impl::NamespaceUrl: PrecomputedHash,
     {
@@ -595,7 +589,7 @@
     }
 
     #[inline]
-    pub fn parts(&self) -> Option<&[Impl::PartName]> {
+    pub fn parts(&self) -> Option<&[Impl::Identifier]> {
         if !self.is_part() {
             return None;
         }
@@ -1014,7 +1008,7 @@
     LocalName(LocalName<Impl>),
 
     ID(#[shmem(field_bound)] Impl::Identifier),
-    Class(#[shmem(field_bound)] Impl::ClassName),
+    Class(#[shmem(field_bound)] Impl::Identifier),
 
     AttributeInNoNamespaceExists {
         #[shmem(field_bound)]
@@ -1063,7 +1057,7 @@
     Slotted(Selector<Impl>),
     /// The `::part` pseudo-element.
     ///   https://drafts.csswg.org/css-shadow-parts/#part
-    Part(#[shmem(field_bound)] Box<[Impl::PartName]>),
+    Part(#[shmem(field_bound)] Box<[Impl::Identifier]>),
     /// The `:host` pseudo-class:
     ///
     /// https://drafts.csswg.org/css-scoping/#host-selector
@@ -1472,18 +1466,18 @@
                     if i != 0 {
                         dest.write_char(' ')?;
                     }
-                    display_to_css_identifier(name, dest)?;
+                    name.to_css(dest)?;
                 }
                 dest.write_char(')')
             },
             PseudoElement(ref p) => p.to_css(dest),
             ID(ref s) => {
                 dest.write_char('#')?;
-                display_to_css_identifier(s, dest)
+                s.to_css(dest)
             },
             Class(ref s) => {
                 dest.write_char('.')?;
-                display_to_css_identifier(s, dest)
+                s.to_css(dest)
             },
             LocalName(ref s) => s.to_css(dest),
             ExplicitUniversalType => dest.write_char('*'),
@@ -1492,13 +1486,13 @@
             ExplicitNoNamespace => dest.write_char('|'),
             ExplicitAnyNamespace => dest.write_str("*|"),
             Namespace(ref prefix, _) => {
-                display_to_css_identifier(prefix, dest)?;
+                prefix.to_css(dest)?;
                 dest.write_char('|')
             },
 
             AttributeInNoNamespaceExists { ref local_name, .. } => {
                 dest.write_char('[')?;
-                display_to_css_identifier(local_name, dest)?;
+                local_name.to_css(dest)?;
                 dest.write_char(']')
             },
             AttributeInNoNamespace {
@@ -1509,10 +1503,10 @@
                 ..
             } => {
                 dest.write_char('[')?;
-                display_to_css_identifier(local_name, dest)?;
+                local_name.to_css(dest)?;
                 operator.to_css(dest)?;
                 dest.write_char('"')?;
-                write!(CssStringWriter::new(dest), "{}", value)?;
+                value.to_css(dest)?;
                 dest.write_char('"')?;
                 match case_sensitivity {
                     ParsedCaseSensitivity::CaseSensitive |
@@ -1525,14 +1519,6 @@
             AttributeOther(ref attr_selector) => attr_selector.to_css(dest),
 
             // Pseudo-classes
-            Negation(ref arg) => {
-                dest.write_str(":not(")?;
-                for component in arg.iter() {
-                    component.to_css(dest)?;
-                }
-                dest.write_str(")")
-            },
-
             FirstChild => dest.write_str(":first-child"),
             LastChild => dest.write_str(":last-child"),
             OnlyChild => dest.write_str(":only-child"),
@@ -1562,10 +1548,11 @@
                 write_affine(dest, a, b)?;
                 dest.write_char(')')
             },
-            Is(ref list) | Where(ref list) => {
+            Is(ref list) | Where(ref list) | Negation(ref list) => {
                 match *self {
                     Where(..) => dest.write_str(":where(")?,
                     Is(..) => dest.write_str(":is(")?,
+                    Negation(..) => dest.write_str(":not(")?,
                     _ => unreachable!(),
                 }
                 serialize_selector_list(list.iter(), dest)?;
@@ -1584,13 +1571,13 @@
         dest.write_char('[')?;
         match self.namespace {
             Some(NamespaceConstraint::Specific((ref prefix, _))) => {
-                display_to_css_identifier(prefix, dest)?;
+                prefix.to_css(dest)?;
                 dest.write_char('|')?
             },
             Some(NamespaceConstraint::Any) => dest.write_str("*|")?,
             None => {},
         }
-        display_to_css_identifier(&self.local_name, dest)?;
+        self.local_name.to_css(dest)?;
         match self.operation {
             ParsedAttrSelectorOperation::Exists => {},
             ParsedAttrSelectorOperation::WithValue {
@@ -1600,7 +1587,7 @@
             } => {
                 operator.to_css(dest)?;
                 dest.write_char('"')?;
-                write!(CssStringWriter::new(dest), "{}", expected_value)?;
+                expected_value.to_css(dest)?;
                 dest.write_char('"')?;
                 match case_sensitivity {
                     ParsedCaseSensitivity::CaseSensitive |
@@ -1619,29 +1606,10 @@
     where
         W: fmt::Write,
     {
-        display_to_css_identifier(&self.name, dest)
+        self.name.to_css(dest)
     }
 }
 
-/// Serialize the output of Display as a CSS identifier
-fn display_to_css_identifier<T: Display, W: fmt::Write>(x: &T, dest: &mut W) -> fmt::Result {
-    // FIXME(SimonSapin): it is possible to avoid this heap allocation
-    // by creating a stream adapter like cssparser::CssStringWriter
-    // that holds and writes to `&mut W` and itself implements `fmt::Write`.
-    //
-    // I haven’t done this yet because it would require somewhat complex and fragile state machine
-    // to support in `fmt::Write::write_char` cases that,
-    // in `serialize_identifier` (which has the full value as a `&str` slice),
-    // can be expressed as
-    // `string.starts_with("--")`, `string == "-"`, `string.starts_with("-")`, etc.
-    //
-    // And I don’t even know if this would be a performance win: jemalloc is good at what it does
-    // and the state machine might be slower than `serialize_identifier` as currently written.
-    let string = x.to_string();
-
-    serialize_identifier(&string, dest)
-}
-
 /// Build up a Selector.
 /// selector : simple_selector_sequence [ combinator simple_selector_sequence ]* ;
 ///
@@ -1812,7 +1780,7 @@
     SimpleSelector(Component<Impl>),
     PseudoElement(Impl::PseudoElement),
     SlottedPseudo(Selector<Impl>),
-    PartPseudo(Box<[Impl::PartName]>),
+    PartPseudo(Box<[Impl::Identifier]>),
 }
 
 #[derive(Debug)]
@@ -2607,10 +2575,8 @@
 
     impl SelectorImpl for DummySelectorImpl {
         type ExtraMatchingData = ();
-        type AttrValue = DummyAtom;
+        type AttrValue = DummyAttrValue;
         type Identifier = DummyAtom;
-        type ClassName = DummyAtom;
-        type PartName = DummyAtom;
         type LocalName = DummyAtom;
         type NamespaceUrl = DummyAtom;
         type NamespacePrefix = DummyAtom;
@@ -2621,11 +2587,34 @@
     }
 
     #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
+    pub struct DummyAttrValue(String);
+
+    impl ToCss for DummyAttrValue {
+        fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+        where
+            W: fmt::Write,
+        {
+            use std::fmt::Write;
+
+            write!(cssparser::CssStringWriter::new(dest), "{}", &self.0)
+        }
+    }
+
+    impl<'a> From<&'a str> for DummyAttrValue {
+        fn from(string: &'a str) -> Self {
+            Self(string.into())
+        }
+    }
+
+    #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
     pub struct DummyAtom(String);
 
-    impl fmt::Display for DummyAtom {
-        fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-            <String as fmt::Display>::fmt(&self.0, fmt)
+    impl ToCss for DummyAtom {
+        fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+        where
+            W: fmt::Write,
+        {
+            serialize_identifier(&self.0, dest)
         }
     }
 
@@ -2777,8 +2766,8 @@
         assert!(list.is_ok());
     }
 
-    const MATHML: &'static str = "http://www.w3.org/1998/Math/MathML";
-    const SVG: &'static str = "http://www.w3.org/2000/svg";
+    const MATHML: &str = "http://www.w3.org/1998/Math/MathML";
+    const SVG: &str = "http://www.w3.org/2000/svg";
 
     #[test]
     fn test_parsing() {
@@ -3110,7 +3099,7 @@
                 vec![Component::AttributeInNoNamespace {
                     local_name: DummyAtom::from("attr"),
                     operator: AttrSelectorOperator::DashMatch,
-                    value: DummyAtom::from("foo"),
+                    value: DummyAttrValue::from("foo"),
                     never_matches: false,
                     case_sensitivity: ParsedCaseSensitivity::CaseSensitive,
                 }],
diff -Nru firefox-84.0.2+build1/servo/components/selectors/tree.rs firefox-85.0+build1/servo/components/selectors/tree.rs
--- firefox-84.0.2+build1/servo/components/selectors/tree.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/selectors/tree.rs	2021-01-18 19:58:19.000000000 +0000
@@ -113,7 +113,7 @@
 
     fn has_class(
         &self,
-        name: &<Self::Impl as SelectorImpl>::ClassName,
+        name: &<Self::Impl as SelectorImpl>::Identifier,
         case_sensitivity: CaseSensitivity,
     ) -> bool;
 
@@ -121,10 +121,10 @@
     /// direction, that is, in an outer-tree -> inner-tree direction.
     fn imported_part(
         &self,
-        name: &<Self::Impl as SelectorImpl>::PartName,
-    ) -> Option<<Self::Impl as SelectorImpl>::PartName>;
+        name: &<Self::Impl as SelectorImpl>::Identifier,
+    ) -> Option<<Self::Impl as SelectorImpl>::Identifier>;
 
-    fn is_part(&self, name: &<Self::Impl as SelectorImpl>::PartName) -> bool;
+    fn is_part(&self, name: &<Self::Impl as SelectorImpl>::Identifier) -> bool;
 
     /// Returns whether this element matches `:empty`.
     ///
diff -Nru firefox-84.0.2+build1/servo/components/servo_arc/lib.rs firefox-85.0+build1/servo/components/servo_arc/lib.rs
--- firefox-84.0.2+build1/servo/components/servo_arc/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/servo_arc/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -771,7 +771,7 @@
                 // We should have consumed the buffer exactly, maybe accounting
                 // for some padding from the alignment.
                 debug_assert!(
-                    (buffer.offset(size as isize) as usize - current as *mut u8 as usize) <
+                    (buffer.add(size) as usize - current as *mut u8 as usize) <
                         inner_align
                 );
             }
@@ -858,8 +858,8 @@
     /// Creates a new HeaderWithLength.
     pub fn new(header: H, length: usize) -> Self {
         HeaderWithLength {
-            header: header,
-            length: length,
+            header,
+            length,
         }
     }
 }
@@ -1102,7 +1102,7 @@
 impl<T> Drop for RawOffsetArc<T> {
     fn drop(&mut self) {
         let _ = Arc::from_raw_offset(RawOffsetArc {
-            ptr: self.ptr.clone(),
+            ptr: self.ptr,
         });
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/style/dom_apis.rs firefox-85.0+build1/servo/components/style/dom_apis.rs
--- firefox-84.0.2+build1/servo/components/style/dom_apis.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/dom_apis.rs	2021-01-18 19:58:19.000000000 +0000
@@ -10,7 +10,7 @@
 use crate::invalidation::element::invalidation_map::Dependency;
 use crate::invalidation::element::invalidator::{DescendantInvalidationLists, Invalidation};
 use crate::invalidation::element::invalidator::{InvalidationProcessor, InvalidationVector};
-use crate::Atom;
+use crate::values::AtomIdent;
 use selectors::attr::CaseSensitivity;
 use selectors::matching::{self, MatchingContext, MatchingMode};
 use selectors::parser::{Combinator, Component, LocalName, SelectorImpl};
@@ -276,7 +276,7 @@
 /// or shadow root that `root` is connected to.
 fn fast_connected_elements_with_id<'a, N>(
     root: N,
-    id: &Atom,
+    id: &AtomIdent,
     quirks_mode: QuirksMode,
 ) -> Result<&'a [N::ConcreteElement], ()>
 where
@@ -305,7 +305,7 @@
 /// Collects elements with a given id under `root`, that pass `filter`.
 fn collect_elements_with_id<E, Q, F>(
     root: E::ConcreteNode,
-    id: &Atom,
+    id: &AtomIdent,
     results: &mut Q::Output,
     quirks_mode: QuirksMode,
     mut filter: F,
@@ -398,7 +398,7 @@
 }
 
 enum SimpleFilter<'a, Impl: SelectorImpl> {
-    Class(&'a Atom),
+    Class(&'a AtomIdent),
     LocalName(&'a LocalName<Impl>),
 }
 
diff -Nru firefox-84.0.2+build1/servo/components/style/dom.rs firefox-85.0+build1/servo/components/style/dom.rs
--- firefox-84.0.2+build1/servo/components/style/dom.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/dom.rs	2021-01-18 19:58:19.000000000 +0000
@@ -20,7 +20,8 @@
 use crate::shared_lock::{Locked, SharedRwLock};
 use crate::stylist::CascadeData;
 use crate::traversal_flags::TraversalFlags;
-use crate::{Atom, LocalName, Namespace, WeakAtom};
+use crate::values::AtomIdent;
+use crate::{LocalName, Namespace, WeakAtom};
 use atomic_refcell::{AtomicRef, AtomicRefMut};
 use selectors::matching::{ElementSelectorFlags, QuirksMode, VisitedHandlingMode};
 use selectors::sink::Push;
@@ -121,7 +122,7 @@
     /// return an empty slice.
     fn elements_with_id<'a>(
         &self,
-        _id: &Atom,
+        _id: &AtomIdent,
     ) -> Result<&'a [<Self::ConcreteNode as TNode>::ConcreteElement], ()>
     where
         Self: 'a,
@@ -344,7 +345,7 @@
     /// return an empty slice.
     fn elements_with_id<'a>(
         &self,
-        _id: &Atom,
+        _id: &AtomIdent,
     ) -> Result<&'a [<Self::ConcreteNode as TNode>::ConcreteElement], ()>
     where
         Self: 'a,
@@ -520,20 +521,20 @@
     /// Internal iterator for the classes of this element.
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom);
+        F: FnMut(&AtomIdent);
 
     /// Internal iterator for the part names of this element.
     fn each_part<F>(&self, _callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
     }
 
     /// Internal iterator for the part names that this element exports for a
     /// given part name.
-    fn each_exported_part<F>(&self, _name: &Atom, _callback: F)
+    fn each_exported_part<F>(&self, _name: &AtomIdent, _callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
     }
 
diff -Nru firefox-84.0.2+build1/servo/components/style/element_state.rs firefox-85.0+build1/servo/components/style/element_state.rs
--- firefox-84.0.2+build1/servo/components/style/element_state.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/element_state.rs	2021-01-18 19:58:19.000000000 +0000
@@ -144,6 +144,8 @@
         const IN_MOZINERT_STATE = 1 << 54;
         /// State for the topmost dialog element in top layer
         const IN_TOPMOST_MODAL_DIALOG_STATE = 1 << 55;
+        /// Non-standard & undocumented.
+        const IN_HANDLER_NOPLUGINS = 1 << 56;
     }
 }
 
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/media_features.rs firefox-85.0+build1/servo/components/style/gecko/media_features.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/media_features.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/media_features.rs	2021-01-18 19:58:19.000000000 +0000
@@ -107,7 +107,12 @@
     query_value: Option<Ratio>,
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
-    eval_aspect_ratio_for(device, query_value, range_or_operator, Device::au_viewport_size)
+    eval_aspect_ratio_for(
+        device,
+        query_value,
+        range_or_operator,
+        Device::au_viewport_size,
+    )
 }
 
 /// https://drafts.csswg.org/mediaqueries-4/#device-aspect-ratio
@@ -244,7 +249,8 @@
     range_or_operator: Option<RangeOrOperator>,
 ) -> bool {
     // For color devices we should return 0.
-    let depth = unsafe { bindings::Gecko_MediaFeatures_GetMonochromeBitsPerPixel(device.document()) };
+    let depth =
+        unsafe { bindings::Gecko_MediaFeatures_GetMonochromeBitsPerPixel(device.document()) };
     RangeOrOperator::evaluate(range_or_operator, query_value, depth)
 }
 
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/media_queries.rs firefox-85.0+build1/servo/components/style/gecko/media_queries.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/media_queries.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/media_queries.rs	2021-01-18 19:58:19.000000000 +0000
@@ -4,12 +4,12 @@
 
 //! Gecko's media-query device and expression representation.
 
+use crate::context::QuirksMode;
 use crate::custom_properties::CssEnvironment;
 use crate::gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor};
 use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs;
 use crate::media_queries::MediaType;
-use crate::context::QuirksMode;
 use crate::properties::ComputedValues;
 use crate::string_cache::Atom;
 use crate::values::computed::Length;
@@ -20,8 +20,8 @@
 use euclid::default::Size2D;
 use euclid::{Scale, SideOffsets2D};
 use servo_arc::Arc;
-use std::{cmp, fmt};
 use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
+use std::{cmp, fmt};
 use style_traits::viewport::ViewportConstraints;
 use style_traits::{CSSPixel, DevicePixel};
 
@@ -275,7 +275,7 @@
         };
 
         if pc.mIsRootPaginatedDocument() != 0 {
-            return self.page_size_minus_default_margin(pc)
+            return self.page_size_minus_default_margin(pc);
         }
 
         let size = &pc.mSizeForViewportUnits;
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/non_ts_pseudo_class_list.rs firefox-85.0+build1/servo/components/style/gecko/non_ts_pseudo_class_list.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/non_ts_pseudo_class_list.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/non_ts_pseudo_class_list.rs	2021-01-18 19:58:19.000000000 +0000
@@ -72,6 +72,8 @@
                 ("-moz-handler-disabled", MozHandlerDisabled, IN_HANDLER_DISABLED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-handler-blocked", MozHandlerBlocked, IN_HANDLER_BLOCKED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
                 ("-moz-handler-crashed", MozHandlerCrashed, IN_HANDLER_CRASHED_STATE, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+                ("-moz-handler-noplugins", MozHandlerNoPlugins, IN_HANDLER_NOPLUGINS, PSEUDO_CLASS_ENABLED_IN_UA_SHEETS_AND_CHROME),
+
                 ("-moz-math-increment-script-level", MozMathIncrementScriptLevel, IN_INCREMENT_SCRIPT_LEVEL_STATE, _),
 
                 ("required", Required, IN_REQUIRED_STATE, _),
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/selector_parser.rs firefox-85.0+build1/servo/components/style/gecko/selector_parser.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/selector_parser.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/selector_parser.rs	2021-01-18 19:58:19.000000000 +0000
@@ -11,11 +11,11 @@
 use crate::selector_parser::{Direction, SelectorParser};
 use crate::str::starts_with_ignore_ascii_case;
 use crate::string_cache::{Atom, Namespace, WeakAtom, WeakNamespace};
-use crate::values::serialize_atom_identifier;
+use crate::values::{AtomIdent, AtomString};
 use cssparser::{BasicParseError, BasicParseErrorKind, Parser};
 use cssparser::{CowRcStr, SourceLocation, ToCss, Token};
-use selectors::parser::{SelectorParseErrorKind, ParseErrorRecovery};
 use selectors::parser::{self as selector_parser, Selector};
+use selectors::parser::{ParseErrorRecovery, SelectorParseErrorKind};
 use selectors::visitor::SelectorVisitor;
 use selectors::SelectorList;
 use std::fmt;
@@ -39,7 +39,7 @@
 }
 
 /// The type used to store the language argument to the `:lang` pseudo-class.
-pub type Lang = Atom;
+pub type Lang = AtomIdent;
 
 macro_rules! pseudo_class_name {
     ([$(($css:expr, $name:ident, $state:tt, $flags:tt),)*]) => {
@@ -77,7 +77,7 @@
                     $(NonTSPseudoClass::$name => concat!(":", $css),)*
                     NonTSPseudoClass::Lang(ref s) => {
                         dest.write_str(":lang(")?;
-                        serialize_atom_identifier(s, dest)?;
+                        s.to_css(dest)?;
                         return dest.write_char(')');
                     },
                     NonTSPseudoClass::MozLocaleDir(ref dir) => {
@@ -269,12 +269,10 @@
 
 impl ::selectors::SelectorImpl for SelectorImpl {
     type ExtraMatchingData = InvalidationMatchingData;
-    type AttrValue = Atom;
-    type Identifier = Atom;
-    type ClassName = Atom;
-    type PartName = Atom;
-    type LocalName = Atom;
-    type NamespacePrefix = Atom;
+    type AttrValue = AtomString;
+    type Identifier = AtomIdent;
+    type LocalName = AtomIdent;
+    type NamespacePrefix = AtomIdent;
     type NamespaceUrl = Namespace;
     type BorrowedNamespaceUrl = WeakNamespace;
     type BorrowedLocalName = WeakAtom;
@@ -385,7 +383,7 @@
         let pseudo_class = match_ignore_ascii_case! { &name,
             "lang" => {
                 let name = parser.expect_ident_or_string()?;
-                NonTSPseudoClass::Lang(Atom::from(name.as_ref()))
+                NonTSPseudoClass::Lang(Lang::from(name.as_ref()))
             },
             "-moz-locale-dir" => {
                 NonTSPseudoClass::MozLocaleDir(Direction::parse(parser)?)
@@ -474,7 +472,7 @@
         self.namespaces.default.clone()
     }
 
-    fn namespace_for_prefix(&self, prefix: &Atom) -> Option<Namespace> {
+    fn namespace_for_prefix(&self, prefix: &AtomIdent) -> Option<Namespace> {
         self.namespaces.prefixes.get(prefix).cloned()
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/snapshot_helpers.rs firefox-85.0+build1/servo/components/style/gecko/snapshot_helpers.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/snapshot_helpers.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/snapshot_helpers.rs	2021-01-18 19:58:19.000000000 +0000
@@ -6,7 +6,9 @@
 
 use crate::gecko_bindings::bindings;
 use crate::gecko_bindings::structs::{self, nsAtom};
-use crate::string_cache::{Atom, WeakAtom};
+use crate::string_cache::WeakAtom;
+use crate::values::AtomIdent;
+use crate::Atom;
 use crate::CaseSensitivityExt;
 use selectors::attr::CaseSensitivity;
 
@@ -85,8 +87,8 @@
 #[inline(always)]
 pub(super) fn each_exported_part(
     attrs: &[structs::AttrArray_InternalAttr],
-    name: &Atom,
-    mut callback: impl FnMut(&Atom),
+    name: &AtomIdent,
+    mut callback: impl FnMut(&AtomIdent),
 ) {
     let attr = match find_attr(attrs, &atom!("exportparts")) {
         Some(attr) => attr,
@@ -100,7 +102,7 @@
 
     unsafe {
         for atom in std::slice::from_raw_parts(atoms, length) {
-            Atom::with(*atom, &mut callback)
+            AtomIdent::with(*atom, &mut callback)
         }
     }
 }
@@ -108,21 +110,21 @@
 #[inline(always)]
 pub(super) fn imported_part(
     attrs: &[structs::AttrArray_InternalAttr],
-    name: &Atom,
-) -> Option<Atom> {
+    name: &AtomIdent,
+) -> Option<AtomIdent> {
     let attr = find_attr(attrs, &atom!("exportparts"))?;
     let atom = unsafe { bindings::Gecko_Element_ImportedPart(attr, name.as_ptr()) };
     if atom.is_null() {
         return None;
     }
-    Some(unsafe { Atom::from_raw(atom) })
+    Some(AtomIdent(unsafe { Atom::from_raw(atom) }))
 }
 
 /// Given a class or part name, a case sensitivity, and an array of attributes,
 /// returns whether the attribute has that name.
 #[inline(always)]
 pub fn has_class_or_part(
-    name: &Atom,
+    name: &AtomIdent,
     case_sensitivity: CaseSensitivity,
     attr: &structs::nsAttrValue,
 ) -> bool {
@@ -147,15 +149,15 @@
 #[inline(always)]
 pub fn each_class_or_part<F>(attr: &structs::nsAttrValue, mut callback: F)
 where
-    F: FnMut(&Atom),
+    F: FnMut(&AtomIdent),
 {
     unsafe {
         match get_class_or_part_from_attr(attr) {
             Class::None => {},
-            Class::One(atom) => Atom::with(atom, callback),
+            Class::One(atom) => AtomIdent::with(atom, callback),
             Class::More(atoms) => {
                 for atom in atoms {
-                    Atom::with(atom.mRawPtr, &mut callback)
+                    AtomIdent::with(atom.mRawPtr, &mut callback)
                 }
             },
         }
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/snapshot.rs firefox-85.0+build1/servo/components/style/gecko/snapshot.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/snapshot.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/snapshot.rs	2021-01-18 19:58:19.000000000 +0000
@@ -14,7 +14,10 @@
 use crate::gecko_bindings::structs::ServoElementSnapshotFlags as Flags;
 use crate::gecko_bindings::structs::ServoElementSnapshotTable;
 use crate::invalidation::element::element_wrapper::ElementSnapshot;
+use crate::selector_parser::AttrValue;
 use crate::string_cache::{Atom, Namespace};
+use crate::values::{AtomIdent, AtomString};
+use crate::LocalName;
 use crate::WeakAtom;
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -74,10 +77,10 @@
     #[inline]
     pub fn each_attr_changed<F>(&self, mut callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         for attr in self.mChangedAttrNames.iter() {
-            unsafe { Atom::with(attr.mRawPtr, &mut callback) }
+            unsafe { AtomIdent::with(attr.mRawPtr, &mut callback) }
         }
     }
 
@@ -85,8 +88,8 @@
     pub fn attr_matches(
         &self,
         ns: &NamespaceConstraint<&Namespace>,
-        local_name: &Atom,
-        operation: &AttrSelectorOperation<&Atom>,
+        local_name: &LocalName,
+        operation: &AttrSelectorOperation<&AttrValue>,
     ) -> bool {
         unsafe {
             match *operation {
@@ -188,7 +191,7 @@
     }
 
     #[inline]
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         let attr = match snapshot_helpers::find_attr(&*self.mAttrs, &atom!("part")) {
             Some(attr) => attr,
             None => return false,
@@ -198,12 +201,12 @@
     }
 
     #[inline]
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         snapshot_helpers::imported_part(&*self.mAttrs, name)
     }
 
     #[inline]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         if !self.has_any(Flags::MaybeClass) {
             return false;
         }
@@ -214,7 +217,7 @@
     #[inline]
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         if !self.has_any(Flags::MaybeClass) {
             return;
@@ -224,12 +227,12 @@
     }
 
     #[inline]
-    fn lang_attr(&self) -> Option<Atom> {
+    fn lang_attr(&self) -> Option<AtomString> {
         let ptr = unsafe { bindings::Gecko_SnapshotLangValue(self) };
         if ptr.is_null() {
             None
         } else {
-            Some(unsafe { Atom::from_addrefed(ptr) })
+            Some(AtomString(unsafe { Atom::from_addrefed(ptr) }))
         }
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/url.rs firefox-85.0+build1/servo/components/style/gecko/url.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/url.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/url.rs	2021-01-18 19:58:19.000000000 +0000
@@ -109,7 +109,7 @@
     /// Returns true if this URL looks like a fragment.
     /// See https://drafts.csswg.org/css-values/#local-urls
     pub fn is_fragment(&self) -> bool {
-        self.as_str().chars().next().map_or(false, |c| c == '#')
+        self.as_str().as_bytes().iter().next().map_or(false, |b| *b == b'#')
     }
 
     /// Return the unresolved url as string, or the empty string if it's
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko/wrapper.rs firefox-85.0+build1/servo/components/style/gecko/wrapper.rs
--- firefox-84.0.2+build1/servo/components/style/gecko/wrapper.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko/wrapper.rs	2021-01-18 19:58:19.000000000 +0000
@@ -70,7 +70,9 @@
 use crate::values::computed::font::GenericFontFamily;
 use crate::values::computed::Length;
 use crate::values::specified::length::FontBaseSize;
+use crate::values::{AtomIdent, AtomString};
 use crate::CaseSensitivityExt;
+use crate::LocalName;
 use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
 use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -130,7 +132,7 @@
     }
 
     #[inline]
-    fn elements_with_id<'a>(&self, id: &Atom) -> Result<&'a [GeckoElement<'ld>], ()>
+    fn elements_with_id<'a>(&self, id: &AtomIdent) -> Result<&'a [GeckoElement<'ld>], ()>
     where
         Self: 'a,
     {
@@ -186,7 +188,7 @@
     }
 
     #[inline]
-    fn elements_with_id<'a>(&self, id: &Atom) -> Result<&'a [GeckoElement<'lr>], ()>
+    fn elements_with_id<'a>(&self, id: &AtomIdent) -> Result<&'a [GeckoElement<'lr>], ()>
     where
         Self: 'a,
     {
@@ -801,7 +803,7 @@
             return false;
         }
         let host = self.containing_shadow_host().unwrap();
-        host.is_svg_element() && host.local_name() == &*local_name!("use")
+        host.is_svg_element() && host.local_name() == &**local_name!("use")
     }
 
     fn css_transitions_info(&self) -> FxHashMap<LonghandId, Arc<AnimationValue>> {
@@ -1250,11 +1252,17 @@
         }
     }
 
-    fn animation_rule(&self, _: &SharedStyleContext) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
+    fn animation_rule(
+        &self,
+        _: &SharedStyleContext,
+    ) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
         get_animation_rule(self, CascadeLevel::Animations)
     }
 
-    fn transition_rule(&self, _: &SharedStyleContext) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
+    fn transition_rule(
+        &self,
+        _: &SharedStyleContext,
+    ) -> Option<Arc<Locked<PropertyDeclarationBlock>>> {
         get_animation_rule(self, CascadeLevel::Transitions)
     }
 
@@ -1264,7 +1272,7 @@
     }
 
     #[inline]
-    fn has_attr(&self, namespace: &Namespace, attr: &Atom) -> bool {
+    fn has_attr(&self, namespace: &Namespace, attr: &AtomIdent) -> bool {
         unsafe { bindings::Gecko_HasAttr(self.0, namespace.0.as_ptr(), attr.as_ptr()) }
     }
 
@@ -1291,7 +1299,7 @@
 
     fn each_class<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         let attr = match self.get_class_attr() {
             Some(c) => c,
@@ -1302,16 +1310,16 @@
     }
 
     #[inline]
-    fn each_exported_part<F>(&self, name: &Atom, callback: F)
+    fn each_exported_part<F>(&self, name: &AtomIdent, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         snapshot_helpers::each_exported_part(self.attrs(), name, callback)
     }
 
     fn each_part<F>(&self, callback: F)
     where
-        F: FnMut(&Atom),
+        F: FnMut(&AtomIdent),
     {
         let attr = match self.get_part_attr() {
             Some(c) => c,
@@ -1609,7 +1617,7 @@
         if ptr.is_null() {
             None
         } else {
-            Some(unsafe { Atom::from_addrefed(ptr) })
+            Some(AtomString(unsafe { Atom::from_addrefed(ptr) }))
         }
     }
 
@@ -1617,8 +1625,8 @@
         // Gecko supports :lang() from CSS Selectors 3, which only accepts a
         // single language tag, and which performs simple dash-prefix matching
         // on it.
-        let override_lang_ptr = match &override_lang {
-            &Some(Some(ref atom)) => atom.as_ptr(),
+        let override_lang_ptr = match override_lang {
+            Some(Some(ref atom)) => atom.as_ptr(),
             _ => ptr::null_mut(),
         };
         unsafe {
@@ -1632,7 +1640,7 @@
     }
 
     fn is_html_document_body_element(&self) -> bool {
-        if self.local_name() != &*local_name!("body") {
+        if self.local_name() != &**local_name!("body") {
             return false;
         }
 
@@ -1889,8 +1897,8 @@
     fn attr_matches(
         &self,
         ns: &NamespaceConstraint<&Namespace>,
-        local_name: &Atom,
-        operation: &AttrSelectorOperation<&Atom>,
+        local_name: &LocalName,
+        operation: &AttrSelectorOperation<&AttrValue>,
     ) -> bool {
         unsafe {
             match *operation {
@@ -2040,6 +2048,7 @@
             NonTSPseudoClass::MozHandlerClickToPlay |
             NonTSPseudoClass::MozHandlerVulnerableUpdatable |
             NonTSPseudoClass::MozHandlerVulnerableNoUpdate |
+            NonTSPseudoClass::MozHandlerNoPlugins |
             NonTSPseudoClass::MozMathIncrementScriptLevel |
             NonTSPseudoClass::InRange |
             NonTSPseudoClass::OutOfRange |
@@ -2173,7 +2182,7 @@
     }
 
     #[inline]
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         if !self.has_id() {
             return false;
         }
@@ -2187,7 +2196,7 @@
     }
 
     #[inline]
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         let attr = match self.get_part_attr() {
             Some(c) => c,
             None => return false,
@@ -2197,12 +2206,12 @@
     }
 
     #[inline]
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         snapshot_helpers::imported_part(self.attrs(), name)
     }
 
     #[inline(always)]
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         let attr = match self.get_class_attr() {
             Some(c) => c,
             None => return false,
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko_string_cache/mod.rs firefox-85.0+build1/servo/components/style/gecko_string_cache/mod.rs
--- firefox-84.0.2+build1/servo/components/style/gecko_string_cache/mod.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko_string_cache/mod.rs	2021-01-18 19:58:19.000000000 +0000
@@ -42,12 +42,6 @@
 
 pub use self::namespace::{Namespace, WeakNamespace};
 
-macro_rules! local_name {
-    ($s:tt) => {
-        atom!($s)
-    };
-}
-
 /// A handle to a Gecko atom. This is a type that can represent either:
 ///
 ///  * A strong reference to a dynamic atom (an `nsAtom` pointer), in which case
diff -Nru firefox-84.0.2+build1/servo/components/style/gecko_string_cache/namespace.rs firefox-85.0+build1/servo/components/style/gecko_string_cache/namespace.rs
--- firefox-84.0.2+build1/servo/components/style/gecko_string_cache/namespace.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/gecko_string_cache/namespace.rs	2021-01-18 19:58:19.000000000 +0000
@@ -47,18 +47,9 @@
 }
 
 /// A Gecko WeakNamespace is a wrapped WeakAtom.
-#[derive(Hash)]
+#[derive(Hash, Deref)]
 pub struct WeakNamespace(WeakAtom);
 
-impl Deref for WeakNamespace {
-    type Target = WeakAtom;
-
-    #[inline]
-    fn deref(&self) -> &WeakAtom {
-        &self.0
-    }
-}
-
 impl Deref for Namespace {
     type Target = WeakNamespace;
 
diff -Nru firefox-84.0.2+build1/servo/components/style/invalidation/element/element_wrapper.rs firefox-85.0+build1/servo/components/style/invalidation/element/element_wrapper.rs
--- firefox-84.0.2+build1/servo/components/style/invalidation/element/element_wrapper.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/invalidation/element/element_wrapper.rs	2021-01-18 19:58:19.000000000 +0000
@@ -9,7 +9,8 @@
 use crate::element_state::ElementState;
 use crate::selector_parser::{AttrValue, NonTSPseudoClass, PseudoElement, SelectorImpl};
 use crate::selector_parser::{Snapshot, SnapshotMap};
-use crate::{Atom, CaseSensitivityExt, LocalName, Namespace, WeakAtom};
+use crate::values::AtomIdent;
+use crate::{CaseSensitivityExt, LocalName, Namespace, WeakAtom};
 use selectors::attr::{AttrSelectorOperation, CaseSensitivity, NamespaceConstraint};
 use selectors::matching::{ElementSelectorFlags, MatchingContext};
 use selectors::{Element, OpaqueElement};
@@ -56,20 +57,20 @@
 
     /// Whether this snapshot contains the class `name`. Should only be called
     /// if `has_attrs()` returns true.
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool;
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool;
 
     /// Whether this snapshot represents the part named `name`. Should only be
     /// called if `has_attrs()` returns true.
-    fn is_part(&self, name: &Atom) -> bool;
+    fn is_part(&self, name: &AtomIdent) -> bool;
 
     /// See Element::imported_part.
-    fn imported_part(&self, name: &Atom) -> Option<Atom>;
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent>;
 
     /// A callback that should be called for each class of the snapshot. Should
     /// only be called if `has_attrs()` returns true.
     fn each_class<F>(&self, _: F)
     where
-        F: FnMut(&Atom);
+        F: FnMut(&AtomIdent);
 
     /// The `xml:lang=""` or `lang=""` attribute value per this snapshot.
     fn lang_attr(&self) -> Option<AttrValue>;
@@ -361,7 +362,7 @@
         }
     }
 
-    fn has_id(&self, id: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_id(&self, id: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot
                 .id_attr()
@@ -370,21 +371,21 @@
         }
     }
 
-    fn is_part(&self, name: &Atom) -> bool {
+    fn is_part(&self, name: &AtomIdent) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.is_part(name),
             _ => self.element.is_part(name),
         }
     }
 
-    fn imported_part(&self, name: &Atom) -> Option<Atom> {
+    fn imported_part(&self, name: &AtomIdent) -> Option<AtomIdent> {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.imported_part(name),
             _ => self.element.imported_part(name),
         }
     }
 
-    fn has_class(&self, name: &Atom, case_sensitivity: CaseSensitivity) -> bool {
+    fn has_class(&self, name: &AtomIdent, case_sensitivity: CaseSensitivity) -> bool {
         match self.snapshot() {
             Some(snapshot) if snapshot.has_attrs() => snapshot.has_class(name, case_sensitivity),
             _ => self.element.has_class(name, case_sensitivity),
diff -Nru firefox-84.0.2+build1/servo/components/style/invalidation/element/invalidation_map.rs firefox-85.0+build1/servo/components/style/invalidation/element/invalidation_map.rs
--- firefox-84.0.2+build1/servo/components/style/invalidation/element/invalidation_map.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/invalidation/element/invalidation_map.rs	2021-01-18 19:58:19.000000000 +0000
@@ -478,7 +478,7 @@
                     Component::Class(..) => &mut self.map.class_to_selector,
                     _ => unreachable!(),
                 };
-                let entry = match map.try_entry(atom.clone(), self.quirks_mode) {
+                let entry = match map.try_entry(atom.0.clone(), self.quirks_mode) {
                     Ok(entry) => entry,
                     Err(err) => {
                         *self.alloc_error = Some(err);
diff -Nru firefox-84.0.2+build1/servo/components/style/invalidation/element/state_and_attributes.rs firefox-85.0+build1/servo/components/style/invalidation/element/state_and_attributes.rs
--- firefox-84.0.2+build1/servo/components/style/invalidation/element/state_and_attributes.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/invalidation/element/state_and_attributes.rs	2021-01-18 19:58:19.000000000 +0000
@@ -216,13 +216,13 @@
             // TODO(emilio): Do this more efficiently!
             snapshot.each_class(|c| {
                 if !element.has_class(c, CaseSensitivity::CaseSensitive) {
-                    classes_removed.push(c.clone())
+                    classes_removed.push(c.0.clone())
                 }
             });
 
             element.each_class(|c| {
                 if !snapshot.has_class(c, CaseSensitivity::CaseSensitive) {
-                    classes_added.push(c.clone())
+                    classes_added.push(c.0.clone())
                 }
             })
         }
diff -Nru firefox-84.0.2+build1/servo/components/style/invalidation/stylesheets.rs firefox-85.0+build1/servo/components/style/invalidation/stylesheets.rs
--- firefox-84.0.2+build1/servo/components/style/invalidation/stylesheets.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/invalidation/stylesheets.rs	2021-01-18 19:58:19.000000000 +0000
@@ -17,6 +17,7 @@
 use crate::shared_lock::SharedRwLockReadGuard;
 use crate::stylesheets::{CssRule, StylesheetInDocument};
 use crate::stylesheets::{EffectiveRules, EffectiveRulesIterator};
+use crate::values::AtomIdent;
 use crate::Atom;
 use crate::LocalName as SelectorLocalName;
 use selectors::parser::{Component, LocalName, Selector};
@@ -43,9 +44,9 @@
 #[derive(Debug, Eq, Hash, MallocSizeOf, PartialEq)]
 enum Invalidation {
     /// An element with a given id.
-    ID(Atom),
+    ID(AtomIdent),
     /// An element with a given class name.
-    Class(Atom),
+    Class(AtomIdent),
     /// An element with a given local name.
     LocalName {
         name: SelectorLocalName,
@@ -468,14 +469,14 @@
     ) -> bool {
         match invalidation {
             Invalidation::Class(c) => {
-                let entry = match self.classes.try_entry(c, quirks_mode) {
+                let entry = match self.classes.try_entry(c.0, quirks_mode) {
                     Ok(e) => e,
                     Err(..) => return false,
                 };
                 *entry.or_insert(InvalidationKind::None) |= kind;
             },
             Invalidation::ID(i) => {
-                let entry = match self.ids.try_entry(i, quirks_mode) {
+                let entry = match self.ids.try_entry(i.0, quirks_mode) {
                     Ok(e) => e,
                     Err(..) => return false,
                 };
diff -Nru firefox-84.0.2+build1/servo/components/style/lib.rs firefox-85.0+build1/servo/components/style/lib.rs
--- firefox-84.0.2+build1/servo/components/style/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -134,10 +134,10 @@
 pub use crate::gecko_string_cache::Atom;
 /// The namespace prefix type for Gecko, which is just an atom.
 #[cfg(feature = "gecko")]
-pub type Prefix = crate::gecko_string_cache::Atom;
+pub type Prefix = crate::values::AtomIdent;
 /// The local name of an element for Gecko, which is just an atom.
 #[cfg(feature = "gecko")]
-pub type LocalName = crate::gecko_string_cache::Atom;
+pub type LocalName = crate::values::AtomIdent;
 #[cfg(feature = "gecko")]
 pub use crate::gecko_string_cache::Namespace;
 
diff -Nru firefox-84.0.2+build1/servo/components/style/macros.rs firefox-85.0+build1/servo/components/style/macros.rs
--- firefox-84.0.2+build1/servo/components/style/macros.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/macros.rs	2021-01-18 19:58:19.000000000 +0000
@@ -133,3 +133,10 @@
 macro_rules! profiler_label {
     ($label_type:ident) => {};
 }
+
+#[cfg(feature = "gecko")]
+macro_rules! local_name {
+    ($s:tt) => {
+        $crate::values::AtomIdent(atom!($s))
+    };
+}
diff -Nru firefox-84.0.2+build1/servo/components/style/matching.rs firefox-85.0+build1/servo/components/style/matching.rs
--- firefox-84.0.2+build1/servo/components/style/matching.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/matching.rs	2021-01-18 19:58:19.000000000 +0000
@@ -421,11 +421,12 @@
             new_values,
             /* pseudo_element = */ None,
         ) {
-            let after_change_style = if self.has_css_transitions(context.shared, /* pseudo_element = */ None) {
-                self.after_change_style(context, new_values)
-            } else {
-                None
-            };
+            let after_change_style =
+                if self.has_css_transitions(context.shared, /* pseudo_element = */ None) {
+                    self.after_change_style(context, new_values)
+                } else {
+                    None
+                };
 
             // In order to avoid creating a SequentialTask for transitions which
             // may not be updated, we check it per property to make sure Gecko
diff -Nru firefox-84.0.2+build1/servo/components/style/parser.rs firefox-85.0+build1/servo/components/style/parser.rs
--- firefox-84.0.2+build1/servo/components/style/parser.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/parser.rs	2021-01-18 19:58:19.000000000 +0000
@@ -188,7 +188,7 @@
 
 impl<T> Parse for Box<T>
 where
-    T: Parse
+    T: Parse,
 {
     fn parse<'i, 't>(
         context: &ParserContext,
diff -Nru firefox-84.0.2+build1/servo/components/style/rule_collector.rs firefox-85.0+build1/servo/components/style/rule_collector.rs
--- firefox-84.0.2+build1/servo/components/style/rule_collector.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/rule_collector.rs	2021-01-18 19:58:19.000000000 +0000
@@ -13,7 +13,6 @@
 use crate::shared_lock::Locked;
 use crate::stylesheets::Origin;
 use crate::stylist::{AuthorStylesEnabled, Rule, RuleInclusion, Stylist};
-use crate::Atom;
 use selectors::matching::{ElementSelectorFlags, MatchingContext, MatchingMode};
 use servo_arc::ArcBorrow;
 use smallvec::SmallVec;
@@ -43,7 +42,7 @@
     loop {
         let host = shadow.host();
         let host_is_svg_use_element =
-            host.is_svg_element() && host.local_name() == &*local_name!("use");
+            host.is_svg_element() && host.local_name() == &**local_name!("use");
         if !host_is_svg_use_element {
             return Some(shadow);
         }
@@ -319,7 +318,7 @@
             };
 
             hash_target.each_part(|part| {
-                if let Some(part_rules) = part_rules.get(part) {
+                if let Some(part_rules) = part_rules.get(&part.0) {
                     collector.collect_rules_in_list(part_rules, cascade_level);
                 }
             });
@@ -377,7 +376,7 @@
 
         let mut shadow_cascade_order = ShadowCascadeOrder::for_innermost_containing_tree();
 
-        let mut parts = SmallVec::<[Atom; 3]>::new();
+        let mut parts = SmallVec::<[_; 3]>::new();
         self.rule_hash_target.each_part(|p| parts.push(p.clone()));
 
         loop {
@@ -405,7 +404,7 @@
                 };
                 self.in_tree(containing_host, |collector| {
                     for p in &parts {
-                        if let Some(part_rules) = part_rules.get(p) {
+                        if let Some(part_rules) = part_rules.get(&p.0) {
                             collector.collect_rules_in_list(part_rules, cascade_level);
                         }
                     }
diff -Nru firefox-84.0.2+build1/servo/components/style/sharing/mod.rs firefox-85.0+build1/servo/components/style/sharing/mod.rs
--- firefox-84.0.2+build1/servo/components/style/sharing/mod.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/sharing/mod.rs	2021-01-18 19:58:19.000000000 +0000
@@ -73,7 +73,7 @@
 use crate::rule_tree::StrongRuleNode;
 use crate::style_resolver::{PrimaryStyle, ResolvedElementStyles};
 use crate::stylist::Stylist;
-use crate::Atom;
+use crate::values::AtomIdent;
 use atomic_refcell::{AtomicRefCell, AtomicRefMut};
 use owning_ref::OwningHandle;
 use selectors::matching::{ElementSelectorFlags, VisitedHandlingMode};
@@ -126,13 +126,13 @@
     ///
     /// TODO(emilio): Maybe check whether rules for these classes apply to the
     /// element?
-    class_list: Option<SmallVec<[Atom; 5]>>,
+    class_list: Option<SmallVec<[AtomIdent; 5]>>,
 
     /// The part list of this element.
     ///
     /// TODO(emilio): Maybe check whether rules with these part names apply to
     /// the element?
-    part_list: Option<SmallVec<[Atom; 5]>>,
+    part_list: Option<SmallVec<[AtomIdent; 5]>>,
 
     /// The list of presentational attributes of the element.
     pres_hints: Option<SmallVec<[ApplicableDeclarationBlock; 5]>>,
@@ -168,7 +168,7 @@
     }
 
     /// Get or compute the part-list associated with this element.
-    pub fn part_list<E>(&mut self, element: E) -> &[Atom]
+    pub fn part_list<E>(&mut self, element: E) -> &[AtomIdent]
     where
         E: TElement,
     {
@@ -176,7 +176,7 @@
             return &[];
         }
         self.part_list.get_or_insert_with(|| {
-            let mut list = SmallVec::<[Atom; 5]>::new();
+            let mut list = SmallVec::<[_; 5]>::new();
             element.each_part(|p| list.push(p.clone()));
             // See below for the reasoning.
             if !list.spilled() {
@@ -187,12 +187,12 @@
     }
 
     /// Get or compute the class-list associated with this element.
-    pub fn class_list<E>(&mut self, element: E) -> &[Atom]
+    pub fn class_list<E>(&mut self, element: E) -> &[AtomIdent]
     where
         E: TElement,
     {
         self.class_list.get_or_insert_with(|| {
-            let mut list = SmallVec::<[Atom; 5]>::new();
+            let mut list = SmallVec::<[_; 5]>::new();
             element.each_class(|c| list.push(c.clone()));
             // Assuming there are a reasonable number of classes (we use the
             // inline capacity as "reasonable number"), sort them to so that
@@ -294,12 +294,12 @@
 
 impl<E: TElement> StyleSharingCandidate<E> {
     /// Get the classlist of this candidate.
-    fn class_list(&mut self) -> &[Atom] {
+    fn class_list(&mut self) -> &[AtomIdent] {
         self.validation_data.class_list(self.element)
     }
 
     /// Get the part list of this candidate.
-    fn part_list(&mut self) -> &[Atom] {
+    fn part_list(&mut self) -> &[AtomIdent] {
         self.validation_data.part_list(self.element)
     }
 
@@ -361,11 +361,11 @@
         }
     }
 
-    fn class_list(&mut self) -> &[Atom] {
+    fn class_list(&mut self) -> &[AtomIdent] {
         self.validation_data.class_list(self.element)
     }
 
-    fn part_list(&mut self) -> &[Atom] {
+    fn part_list(&mut self) -> &[AtomIdent] {
         self.validation_data.part_list(self.element)
     }
 
diff -Nru firefox-84.0.2+build1/servo/components/style/style_adjuster.rs firefox-85.0+build1/servo/components/style/style_adjuster.rs
--- firefox-84.0.2+build1/servo/components/style/style_adjuster.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/style_adjuster.rs	2021-01-18 19:58:19.000000000 +0000
@@ -169,14 +169,14 @@
     /// NOTE: If this or the pointer-events tweak is removed, then
     /// minimal-xul.css and the scrollbar style caching need to be tweaked.
     fn adjust_for_inert(&mut self) {
+        use crate::values::specified::ui::CursorKind;
+        use crate::values::specified::ui::UserSelect;
         use properties::longhands::_moz_inert::computed_value::T as Inert;
         use properties::longhands::_moz_user_focus::computed_value::T as UserFocus;
         use properties::longhands::_moz_user_input::computed_value::T as UserInput;
         use properties::longhands::_moz_user_modify::computed_value::T as UserModify;
-        use properties::longhands::pointer_events::computed_value::T as PointerEvents;
         use properties::longhands::cursor::computed_value::T as Cursor;
-        use crate::values::specified::ui::CursorKind;
-        use crate::values::specified::ui::UserSelect;
+        use properties::longhands::pointer_events::computed_value::T as PointerEvents;
 
         let needs_update = {
             let ui = self.style.get_inherited_ui();
@@ -806,7 +806,7 @@
                 return;
             }
             let is_html_select_element = element.map_or(false, |e| {
-                e.is_html_element() && e.local_name() == &*local_name!("select")
+                e.is_html_element() && e.local_name() == &*atom!("select")
             });
             if !is_html_select_element {
                 return;
diff -Nru firefox-84.0.2+build1/servo/components/style/style_resolver.rs firefox-85.0+build1/servo/components/style/style_resolver.rs
--- firefox-84.0.2+build1/servo/components/style/style_resolver.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/style_resolver.rs	2021-01-18 19:58:19.000000000 +0000
@@ -139,13 +139,17 @@
         return false;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE) &&
+    if !style
+        .flags
+        .intersects(ComputedValueFlags::DISPLAY_DEPENDS_ON_INHERITED_STYLE) &&
         style.get_box().clone_display() == Display::None
     {
         return true;
     }
 
-    if !style.flags.intersects(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE) &&
+    if !style
+        .flags
+        .intersects(ComputedValueFlags::CONTENT_DEPENDS_ON_INHERITED_STYLE) &&
         style.ineffective_content_property()
     {
         return true;
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheets/cascading_at_rule.rs firefox-85.0+build1/servo/components/style/stylesheets/cascading_at_rule.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheets/cascading_at_rule.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheets/cascading_at_rule.rs	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,70 @@
+/* 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 https://mozilla.org/MPL/2.0/. */
+
+//! Cascading at-rule types and traits
+
+use crate::stylesheets::Origin;
+use std::fmt::{self, Write};
+use style_traits::{CssWriter, ToCss};
+
+/// Computes the cascade precedence as according to
+/// <http://dev.w3.org/csswg/css-cascade/#cascade-origin>
+#[inline]
+fn cascade_precendence(origin: Origin, important: bool) -> u8 {
+    match (origin, important) {
+        (Origin::UserAgent, true) => 1,
+        (Origin::User, true) => 2,
+        (Origin::Author, true) => 3,
+        (Origin::Author, false) => 4,
+        (Origin::User, false) => 5,
+        (Origin::UserAgent, false) => 6,
+    }
+}
+
+/// Cascading rule descriptor implementation.
+/// This is only used for at-rules which can cascade. These are @viewport and
+/// @page, although we don't currently implement @page as such.
+#[derive(Clone, Debug, MallocSizeOf, PartialEq, ToShmem)]
+pub struct DescriptorDeclaration<T> {
+    /// Origin of the declaration
+    pub origin: Origin,
+    /// Declaration value
+    pub descriptor: T,
+    /// Indicates the presence of a !important property.
+    pub important: bool,
+}
+
+impl<T> DescriptorDeclaration<T> {
+    #[allow(missing_docs)]
+    pub fn new(origin: Origin, descriptor: T, important: bool) -> Self {
+        Self {
+            origin,
+            descriptor,
+            important,
+        }
+    }
+    /// Returns true iff self is equal or higher precedence to the other.
+    pub fn higher_or_equal_precendence(&self, other: &Self) -> bool {
+        let self_precedence = cascade_precendence(self.origin, self.important);
+        let other_precedence = cascade_precendence(other.origin, other.important);
+
+        self_precedence <= other_precedence
+    }
+}
+
+impl<T> ToCss for DescriptorDeclaration<T>
+where
+    T: ToCss,
+{
+    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
+    where
+        W: Write,
+    {
+        self.descriptor.to_css(dest)?;
+        if self.important {
+            dest.write_str(" !important")?;
+        }
+        dest.write_char(';')
+    }
+}
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheets/mod.rs firefox-85.0+build1/servo/components/style/stylesheets/mod.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheets/mod.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheets/mod.rs	2021-01-18 19:58:19.000000000 +0000
@@ -4,6 +4,7 @@
 
 //! Style sheets and their CSS rules.
 
+mod cascading_at_rule;
 mod counter_style_rule;
 mod document_rule;
 mod font_face_rule;
@@ -56,7 +57,9 @@
 pub use self::rule_list::{CssRules, CssRulesHelpers};
 pub use self::rule_parser::{InsertRuleContext, State, TopLevelRuleParser};
 pub use self::rules_iterator::{AllRules, EffectiveRules};
-pub use self::rules_iterator::{NestedRuleIterationCondition, EffectiveRulesIterator, RulesIterator};
+pub use self::rules_iterator::{
+    EffectiveRulesIterator, NestedRuleIterationCondition, RulesIterator,
+};
 pub use self::style_rule::StyleRule;
 pub use self::stylesheet::{AllowImportRules, SanitizationData, SanitizationKind};
 pub use self::stylesheet::{DocumentStyleSheet, Namespaces, Stylesheet};
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheets/rules_iterator.rs firefox-85.0+build1/servo/components/style/stylesheets/rules_iterator.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheets/rules_iterator.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheets/rules_iterator.rs	2021-01-18 19:58:19.000000000 +0000
@@ -130,7 +130,13 @@
             };
 
             let mut effective = true;
-            let children = children_of_rule::<C>(rule, self.device, self.quirks_mode, self.guard, &mut effective);
+            let children = children_of_rule::<C>(
+                rule,
+                self.device,
+                self.quirks_mode,
+                self.guard,
+                &mut effective,
+            );
             if !effective {
                 continue;
             }
@@ -197,7 +203,7 @@
     ) -> bool {
         match *rule {
             CssRule::Import(ref import_rule) => {
-            let import_rule = import_rule.read_with(guard);
+                let import_rule = import_rule.read_with(guard);
                 Self::process_import(guard, device, quirks_mode, import_rule)
             },
             CssRule::Document(ref doc_rule) => {
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheets/stylesheet.rs firefox-85.0+build1/servo/components/style/stylesheets/stylesheet.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheets/stylesheet.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheets/stylesheet.rs	2021-01-18 19:58:19.000000000 +0000
@@ -243,7 +243,12 @@
     where
         C: NestedRuleIterationCondition,
     {
-        RulesIterator::new(device, self.quirks_mode(guard), guard, self.rules(guard).iter())
+        RulesIterator::new(
+            device,
+            self.quirks_mode(guard),
+            guard,
+            self.rules(guard).iter(),
+        )
     }
 
     /// Returns whether the style-sheet applies for the current device.
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheets/viewport_rule.rs firefox-85.0+build1/servo/components/style/stylesheets/viewport_rule.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheets/viewport_rule.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheets/viewport_rule.rs	2021-01-18 19:58:19.000000000 +0000
@@ -17,6 +17,7 @@
 use crate::shared_lock::{SharedRwLockReadGuard, StylesheetGuards, ToCssWithGuard};
 use crate::str::CssStringWriter;
 use crate::stylesheets::{Origin, StylesheetInDocument};
+use crate::stylesheets::cascading_at_rule::DescriptorDeclaration;
 use crate::values::computed::{Context, ToComputedValue};
 use crate::values::generics::length::LengthPercentageOrAuto;
 use crate::values::generics::NonNegative;
@@ -225,42 +226,8 @@
     context: &'a ParserContext<'b>,
 }
 
-#[derive(Clone, Debug, PartialEq, ToShmem)]
-#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
 #[allow(missing_docs)]
-pub struct ViewportDescriptorDeclaration {
-    pub origin: Origin,
-    pub descriptor: ViewportDescriptor,
-    pub important: bool,
-}
-
-impl ViewportDescriptorDeclaration {
-    #[allow(missing_docs)]
-    pub fn new(
-        origin: Origin,
-        descriptor: ViewportDescriptor,
-        important: bool,
-    ) -> ViewportDescriptorDeclaration {
-        ViewportDescriptorDeclaration {
-            origin: origin,
-            descriptor: descriptor,
-            important: important,
-        }
-    }
-}
-
-impl ToCss for ViewportDescriptorDeclaration {
-    fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
-    where
-        W: Write,
-    {
-        self.descriptor.to_css(dest)?;
-        if self.important {
-            dest.write_str(" !important")?;
-        }
-        dest.write_str(";")
-    }
-}
+pub type ViewportDescriptorDeclaration = DescriptorDeclaration<ViewportDescriptor>;
 
 fn parse_shorthand<'i, 't>(
     context: &ParserContext,
@@ -554,28 +521,6 @@
     }
 }
 
-/// Computes the cascade precedence as according to
-/// <http://dev.w3.org/csswg/css-cascade/#cascade-origin>
-fn cascade_precendence(origin: Origin, important: bool) -> u8 {
-    match (origin, important) {
-        (Origin::UserAgent, true) => 1,
-        (Origin::User, true) => 2,
-        (Origin::Author, true) => 3,
-        (Origin::Author, false) => 4,
-        (Origin::User, false) => 5,
-        (Origin::UserAgent, false) => 6,
-    }
-}
-
-impl ViewportDescriptorDeclaration {
-    fn higher_or_equal_precendence(&self, other: &ViewportDescriptorDeclaration) -> bool {
-        let self_precedence = cascade_precendence(self.origin, self.important);
-        let other_precedence = cascade_precendence(other.origin, other.important);
-
-        self_precedence <= other_precedence
-    }
-}
-
 #[allow(missing_docs)]
 pub struct Cascade {
     declarations: Vec<Option<(usize, ViewportDescriptorDeclaration)>>,
diff -Nru firefox-84.0.2+build1/servo/components/style/stylesheet_set.rs firefox-85.0+build1/servo/components/style/stylesheet_set.rs
--- firefox-84.0.2+build1/servo/components/style/stylesheet_set.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylesheet_set.rs	2021-01-18 19:58:19.000000000 +0000
@@ -5,11 +5,13 @@
 //! A centralized set of stylesheets for a document.
 
 use crate::dom::TElement;
-use crate::invalidation::stylesheets::{StylesheetInvalidationSet, RuleChangeKind};
+use crate::invalidation::stylesheets::{RuleChangeKind, StylesheetInvalidationSet};
 use crate::media_queries::Device;
 use crate::selector_parser::SnapshotMap;
 use crate::shared_lock::SharedRwLockReadGuard;
-use crate::stylesheets::{CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument};
+use crate::stylesheets::{
+    CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument,
+};
 use std::{mem, slice};
 
 /// Entry for a StylesheetSet.
@@ -465,9 +467,9 @@
                 // Insertion / Removals need to rebuild both the cascade and
                 // invalidation data. For generic changes this is conservative,
                 // could be optimized on a per-case basis.
-                RuleChangeKind::Generic |
-                RuleChangeKind::Insertion |
-                RuleChangeKind::Removal => DataValidity::FullyInvalid,
+                RuleChangeKind::Generic | RuleChangeKind::Insertion | RuleChangeKind::Removal => {
+                    DataValidity::FullyInvalid
+                },
                 // TODO(emilio): This, in theory, doesn't need to invalidate
                 // style data, if the rule we're modifying is actually in the
                 // CascadeData already.
@@ -536,9 +538,9 @@
     /// Returns whether the given set has changed from the last flush.
     pub fn has_changed(&self) -> bool {
         !self.invalidations.is_empty() ||
-        self.collections
-            .iter_origins()
-            .any(|(collection, _)| collection.dirty)
+            self.collections
+                .iter_origins()
+                .any(|(collection, _)| collection.dirty)
     }
 
     /// Flush the current set, unmarking it as dirty, and returns a
diff -Nru firefox-84.0.2+build1/servo/components/style/stylist.rs firefox-85.0+build1/servo/components/style/stylist.rs
--- firefox-84.0.2+build1/servo/components/style/stylist.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/stylist.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1651,7 +1651,7 @@
                 //
                 // NOTE(emilio): See the comment regarding on when this may
                 // break in visit_complex_selector.
-                self.mapped_ids.insert(id.clone());
+                self.mapped_ids.insert(id.0.clone());
             },
             _ => {},
         }
@@ -2078,7 +2078,7 @@
                             self.part_rules
                                 .get_or_insert_with(|| Box::new(Default::default()))
                                 .for_insertion(pseudo_element)
-                                .try_entry(parts.last().unwrap().clone())?
+                                .try_entry(parts.last().unwrap().clone().0)?
                                 .or_insert_with(SmallVec::new)
                                 .try_push(rule)?;
                         } else {
diff -Nru firefox-84.0.2+build1/servo/components/style/values/computed/box.rs firefox-85.0+build1/servo/components/style/values/computed/box.rs
--- firefox-84.0.2+build1/servo/components/style/values/computed/box.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/computed/box.rs	2021-01-18 19:58:19.000000000 +0000
@@ -11,9 +11,9 @@
 use crate::values::generics::box_::VerticalAlign as GenericVerticalAlign;
 use crate::values::specified::box_ as specified;
 
+pub use crate::values::specified::box_::Clear as SpecifiedClear;
 pub use crate::values::specified::box_::{AnimationName, Appearance, BreakBetween, BreakWithin};
-pub use crate::values::specified::box_::{Clear as SpecifiedClear};
-pub use crate::values::specified::box_::{Float as SpecifiedFloat, Contain, Display, Overflow};
+pub use crate::values::specified::box_::{Contain, Display, Float as SpecifiedFloat, Overflow};
 pub use crate::values::specified::box_::{OverflowAnchor, OverflowClipBox, OverscrollBehavior};
 pub use crate::values::specified::box_::{
     ScrollSnapAlign, ScrollSnapAxis, ScrollSnapStrictness, ScrollSnapType,
diff -Nru firefox-84.0.2+build1/servo/components/style/values/computed/font.rs firefox-85.0+build1/servo/components/style/values/computed/font.rs
--- firefox-84.0.2+build1/servo/components/style/values/computed/font.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/computed/font.rs	2021-01-18 19:58:19.000000000 +0000
@@ -35,9 +35,9 @@
 use to_shmem::{self, SharedMemoryBuilder, ToShmem};
 
 pub use crate::values::computed::Length as MozScriptMinSize;
-pub use crate::values::specified::Integer as SpecifiedInteger;
 pub use crate::values::specified::font::{FontSynthesis, MozScriptSizeMultiplier};
 pub use crate::values::specified::font::{XLang, XTextZoom};
+pub use crate::values::specified::Integer as SpecifiedInteger;
 
 /// A value for the font-weight property per:
 ///
diff -Nru firefox-84.0.2+build1/servo/components/style/values/computed/image.rs firefox-85.0+build1/servo/components/style/values/computed/image.rs
--- firefox-84.0.2+build1/servo/components/style/values/computed/image.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/computed/image.rs	2021-01-18 19:58:19.000000000 +0000
@@ -7,8 +7,8 @@
 //!
 //! [image]: https://drafts.csswg.org/css-images/#image-values
 
-use crate::values::computed::position::Position;
 use crate::values::computed::percentage::Percentage;
+use crate::values::computed::position::Position;
 use crate::values::computed::url::ComputedImageUrl;
 #[cfg(feature = "gecko")]
 use crate::values::computed::NumberOrPercentage;
diff -Nru firefox-84.0.2+build1/servo/components/style/values/generics/image.rs firefox-85.0+build1/servo/components/style/values/generics/image.rs
--- firefox-84.0.2+build1/servo/components/style/values/generics/image.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/generics/image.rs	2021-01-18 19:58:19.000000000 +0000
@@ -71,14 +71,7 @@
 /// A `<percent> | none` value. Represents optional percentage values
 /// assosicated with cross-fade images.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C, u8)]
 pub enum PercentOrNone<Percentage> {
@@ -91,14 +84,7 @@
 
 /// An optional percent and a cross fade image.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss,
 )]
 #[repr(C)]
 pub struct GenericCrossFadeElement<Image, Color, Percentage> {
@@ -112,15 +98,7 @@
 /// An image or a color. `cross-fade` takes either when blending
 /// images together.
 #[derive(
-    Clone,
-    Debug,
-    MallocSizeOf,
-    PartialEq,
-    ToComputedValue,
-    ToResolvedValue,
-    ToShmem,
-    ToCss,
-    Parse,
+    Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem, ToCss, Parse,
 )]
 #[repr(C, u8)]
 pub enum GenericCrossFadeImage<I, C> {
diff -Nru firefox-84.0.2+build1/servo/components/style/values/generics/position.rs firefox-85.0+build1/servo/components/style/values/generics/position.rs
--- firefox-84.0.2+build1/servo/components/style/values/generics/position.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/generics/position.rs	2021-01-18 19:58:19.000000000 +0000
@@ -174,7 +174,7 @@
 
 impl<N> ToCss for Ratio<N>
 where
-    N: ToCss
+    N: ToCss,
 {
     fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
     where
diff -Nru firefox-84.0.2+build1/servo/components/style/values/generics/transform.rs firefox-85.0+build1/servo/components/style/values/generics/transform.rs
--- firefox-84.0.2+build1/servo/components/style/values/generics/transform.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/generics/transform.rs	2021-01-18 19:58:19.000000000 +0000
@@ -496,9 +496,7 @@
                 let t = t.to_pixel_length(reference_height)? as f64;
                 Transform3D::translation(0., t, 0.)
             },
-            TranslateZ(ref z) => {
-                Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64)
-            },
+            TranslateZ(ref z) => Transform3D::translation(0., 0., z.to_pixel_length(None)? as f64),
             Skew(theta_x, theta_y) => Transform3D::skew(
                 euclid::Angle::radians(theta_x.radians64()),
                 euclid::Angle::radians(theta_y.radians64()),
diff -Nru firefox-84.0.2+build1/servo/components/style/values/mod.rs firefox-85.0+build1/servo/components/style/values/mod.rs
--- firefox-84.0.2+build1/servo/components/style/values/mod.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/mod.rs	2021-01-18 19:58:19.000000000 +0000
@@ -13,6 +13,7 @@
 use crate::Atom;
 pub use cssparser::{serialize_identifier, serialize_name, CowRcStr, Parser};
 pub use cssparser::{SourceLocation, Token, RGBA};
+use precomputed_hash::PrecomputedHash;
 use selectors::parser::SelectorParseErrorKind;
 use std::fmt::{self, Debug, Write};
 use std::hash;
@@ -84,6 +85,112 @@
     serialize_name(&ident, dest)
 }
 
+/// A CSS string stored as an `Atom`.
+#[repr(transparent)]
+#[derive(
+    Clone,
+    Debug,
+    Default,
+    Deref,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+pub struct AtomString(pub Atom);
+
+impl cssparser::ToCss for AtomString {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: Write,
+    {
+        self.0
+            .with_str(|s| cssparser::CssStringWriter::new(dest).write_str(s))
+    }
+}
+
+impl PrecomputedHash for AtomString {
+    #[inline]
+    fn precomputed_hash(&self) -> u32 {
+        self.0.precomputed_hash()
+    }
+}
+
+impl<'a> From<&'a str> for AtomString {
+    #[inline]
+    fn from(string: &str) -> Self {
+        Self(Atom::from(string))
+    }
+}
+
+/// A CSS `<ident>` stored as an `Atom`.
+#[repr(transparent)]
+#[derive(
+    Clone,
+    Debug,
+    Default,
+    Deref,
+    Eq,
+    Hash,
+    MallocSizeOf,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToResolvedValue,
+    ToShmem,
+)]
+pub struct AtomIdent(pub Atom);
+
+impl cssparser::ToCss for AtomIdent {
+    fn to_css<W>(&self, dest: &mut W) -> fmt::Result
+    where
+        W: Write,
+    {
+        serialize_atom_identifier(&self.0, dest)
+    }
+}
+
+impl PrecomputedHash for AtomIdent {
+    #[inline]
+    fn precomputed_hash(&self) -> u32 {
+        self.0.precomputed_hash()
+    }
+}
+
+impl<'a> From<&'a str> for AtomIdent {
+    #[inline]
+    fn from(string: &str) -> Self {
+        Self(Atom::from(string))
+    }
+}
+
+impl AtomIdent {
+    /// Like `Atom::with` but for `AtomIdent`.
+    #[cfg(feature = "gecko")]
+    pub unsafe fn with<F, R>(ptr: *const crate::gecko_bindings::structs::nsAtom, callback: F) -> R
+    where
+        F: FnOnce(&Self) -> R,
+    {
+        Atom::with(ptr, |atom: &Atom| {
+            // safety: repr(transparent)
+            let atom = atom as *const Atom as *const AtomIdent;
+            callback(&*atom)
+        })
+    }
+}
+
+#[cfg(feature = "gecko")]
+impl std::borrow::Borrow<crate::gecko_string_cache::WeakAtom> for AtomIdent {
+    #[inline]
+    fn borrow(&self) -> &crate::gecko_string_cache::WeakAtom {
+        self.0.borrow()
+    }
+}
+
 /// Serialize a normalized value into percentage.
 pub fn serialize_percentage<W>(value: CSSFloat, dest: &mut CssWriter<W>) -> fmt::Result
 where
diff -Nru firefox-84.0.2+build1/servo/components/style/values/specified/box.rs firefox-85.0+build1/servo/components/style/values/specified/box.rs
--- firefox-84.0.2+build1/servo/components/style/values/specified/box.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/specified/box.rs	2021-01-18 19:58:19.000000000 +0000
@@ -40,7 +40,7 @@
         return servo_config::prefs::pref_map()
             .get("layout.flexbox.enabled")
             .as_bool()
-            .unwrap_or(false)
+            .unwrap_or(false);
     }
 
     true
@@ -109,12 +109,6 @@
     #[cfg(feature = "gecko")]
     MozBox,
     #[cfg(feature = "gecko")]
-    MozGrid,
-    #[cfg(feature = "gecko")]
-    MozGridGroup,
-    #[cfg(feature = "gecko")]
-    MozGridLine,
-    #[cfg(feature = "gecko")]
     MozStack,
     #[cfg(feature = "gecko")]
     MozDeck,
@@ -232,12 +226,6 @@
     #[cfg(feature = "gecko")]
     pub const MozInlineBox: Self = Self::new(DisplayOutside::Inline, DisplayInside::MozBox);
     #[cfg(feature = "gecko")]
-    pub const MozGrid: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGrid);
-    #[cfg(feature = "gecko")]
-    pub const MozGridGroup: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridGroup);
-    #[cfg(feature = "gecko")]
-    pub const MozGridLine: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozGridLine);
-    #[cfg(feature = "gecko")]
     pub const MozStack: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozStack);
     #[cfg(feature = "gecko")]
     pub const MozDeck: Self = Self::new(DisplayOutside::XUL, DisplayInside::MozDeck);
@@ -616,12 +604,6 @@
             #[cfg(feature = "gecko")]
             "-moz-inline-box" if moz_box_display_values_enabled(context) => Display::MozInlineBox,
             #[cfg(feature = "gecko")]
-            "-moz-grid" if moz_display_values_enabled(context) => Display::MozGrid,
-            #[cfg(feature = "gecko")]
-            "-moz-grid-group" if moz_display_values_enabled(context) => Display::MozGridGroup,
-            #[cfg(feature = "gecko")]
-            "-moz-grid-line" if moz_display_values_enabled(context) => Display::MozGridLine,
-            #[cfg(feature = "gecko")]
             "-moz-stack" if moz_display_values_enabled(context) => Display::MozStack,
             #[cfg(feature = "gecko")]
             "-moz-deck" if moz_display_values_enabled(context) => Display::MozDeck,
@@ -1189,7 +1171,7 @@
     /// Values for the `touch-action` property.
     #[derive(MallocSizeOf, SpecifiedValueInfo, ToComputedValue, ToResolvedValue, ToShmem)]
     /// These constants match Gecko's `NS_STYLE_TOUCH_ACTION_*` constants.
-    #[value_info(other_values = "auto,none,manipulation,pan-x,pan-y")]
+    #[value_info(other_values = "auto,none,manipulation,pan-x,pan-y,pinch-zoom")]
     #[repr(C)]
     pub struct TouchAction: u8 {
         /// `none` variant
@@ -1202,6 +1184,8 @@
         const PAN_Y = 1 << 3;
         /// `manipulation` variant
         const MANIPULATION = 1 << 4;
+        /// `pinch-zoom` variant
+        const PINCH_ZOOM = 1 << 5;
     }
 }
 
@@ -1218,43 +1202,70 @@
     where
         W: Write,
     {
-        match *self {
-            TouchAction::NONE => dest.write_str("none"),
-            TouchAction::AUTO => dest.write_str("auto"),
-            TouchAction::MANIPULATION => dest.write_str("manipulation"),
-            _ if self.contains(TouchAction::PAN_X | TouchAction::PAN_Y) => {
-                dest.write_str("pan-x pan-y")
-            },
-            _ if self.contains(TouchAction::PAN_X) => dest.write_str("pan-x"),
-            _ if self.contains(TouchAction::PAN_Y) => dest.write_str("pan-y"),
-            _ => panic!("invalid touch-action value"),
+        if self.contains(TouchAction::AUTO) {
+            return dest.write_str("auto");
+        }
+        if self.contains(TouchAction::NONE) {
+            return dest.write_str("none");
+        }
+        if self.contains(TouchAction::MANIPULATION) {
+            return dest.write_str("manipulation");
+        }
+
+        let mut has_any = false;
+        macro_rules! maybe_write_value {
+            ($ident:path => $str:expr) => {
+                if self.contains($ident) {
+                    if has_any {
+                        dest.write_str(" ")?;
+                    }
+                    has_any = true;
+                    dest.write_str($str)?;
+                }
+            };
         }
+        maybe_write_value!(TouchAction::PAN_X => "pan-x");
+        maybe_write_value!(TouchAction::PAN_Y => "pan-y");
+        maybe_write_value!(TouchAction::PINCH_ZOOM => "pinch-zoom");
+
+        debug_assert!(has_any);
+        Ok(())
     }
 }
 
 impl Parse for TouchAction {
+    /// auto | none | [ pan-x || pan-y || pinch-zoom ] | manipulation
     fn parse<'i, 't>(
         _context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<TouchAction, ParseError<'i>> {
-        try_match_ident_ignore_ascii_case! { input,
-            "auto" => Ok(TouchAction::AUTO),
-            "none" => Ok(TouchAction::NONE),
-            "manipulation" => Ok(TouchAction::MANIPULATION),
-            "pan-x" => {
-                if input.try_parse(|i| i.expect_ident_matching("pan-y")).is_ok() {
-                    Ok(TouchAction::PAN_X | TouchAction::PAN_Y)
-                } else {
-                    Ok(TouchAction::PAN_X)
-                }
-            },
-            "pan-y" => {
-                if input.try_parse(|i| i.expect_ident_matching("pan-x")).is_ok() {
-                    Ok(TouchAction::PAN_X | TouchAction::PAN_Y)
-                } else {
-                    Ok(TouchAction::PAN_Y)
-                }
-            },
+        let mut result = TouchAction::empty();
+        while let Ok(name) = input.try_parse(|i| i.expect_ident_cloned()) {
+            let flag = match_ignore_ascii_case! { &name,
+                "pan-x" => Some(TouchAction::PAN_X),
+                "pan-y" => Some(TouchAction::PAN_Y),
+                "pinch-zoom" => Some(TouchAction::PINCH_ZOOM),
+                "none" if result.is_empty() => return Ok(TouchAction::NONE),
+                "manipulation" if result.is_empty() => return Ok(TouchAction::MANIPULATION),
+                "auto" if result.is_empty() => return Ok(TouchAction::AUTO),
+                _ => None
+            };
+
+            let flag = match flag {
+                Some(flag) if !result.contains(flag) => flag,
+                _ => {
+                    return Err(
+                        input.new_custom_error(SelectorParseErrorKind::UnexpectedIdent(name))
+                    );
+                },
+            };
+            result.insert(flag);
+        }
+
+        if !result.is_empty() {
+            Ok(result)
+        } else {
+            Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
         }
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/style/values/specified/font.rs firefox-85.0+build1/servo/components/style/values/specified/font.rs
--- firefox-84.0.2+build1/servo/components/style/values/specified/font.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/specified/font.rs	2021-01-18 19:58:19.000000000 +0000
@@ -2317,14 +2317,18 @@
         context: &ParserContext,
         input: &mut Parser<'i, 't>,
     ) -> Result<MathDepth, ParseError<'i>> {
-        if input.try_parse(|i| i.expect_ident_matching("auto-add")).is_ok() {
+        if input
+            .try_parse(|i| i.expect_ident_matching("auto-add"))
+            .is_ok()
+        {
             return Ok(MathDepth::AutoAdd);
         }
         if let Ok(math_depth_value) = input.try_parse(|input| Integer::parse(context, input)) {
             return Ok(MathDepth::Absolute(math_depth_value));
         }
         input.expect_function_matching("add")?;
-        let math_depth_delta_value = input.parse_nested_block(|input| Integer::parse(context, input))?;
+        let math_depth_delta_value =
+            input.parse_nested_block(|input| Integer::parse(context, input))?;
         Ok(MathDepth::Add(math_depth_delta_value))
     }
 }
diff -Nru firefox-84.0.2+build1/servo/components/style/values/specified/image.rs firefox-85.0+build1/servo/components/style/values/specified/image.rs
--- firefox-84.0.2+build1/servo/components/style/values/specified/image.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style/values/specified/image.rs	2021-01-18 19:58:19.000000000 +0000
@@ -64,16 +64,6 @@
 type LengthPercentageItemList = crate::OwnedSlice<generic::GradientItem<Color, LengthPercentage>>;
 
 #[cfg(feature = "gecko")]
-fn conic_gradients_enabled() -> bool {
-    static_prefs::pref!("layout.css.conic-gradient.enabled")
-}
-
-#[cfg(feature = "servo")]
-fn conic_gradients_enabled() -> bool {
-    false
-}
-
-#[cfg(feature = "gecko")]
 fn cross_fade_enabled() -> bool {
     static_prefs::pref!("layout.css.cross-fade.enabled")
 }
@@ -102,11 +92,9 @@
             "-webkit-repeating-radial-gradient",
             "-moz-repeating-radial-gradient",
             "-webkit-gradient",
+            "conic-gradient",
+            "repeating-conic-gradient",
         ]);
-
-        if conic_gradients_enabled() {
-            f(&["conic-gradient", "repeating-conic-gradient"]);
-        }
     }
 }
 
@@ -269,16 +257,14 @@
 }
 
 impl PercentOrNone {
-    fn parse_or_none<'i, 't>(
-        context: &ParserContext,
-        input: &mut Parser<'i, 't>,
-    ) -> Self {
+    fn parse_or_none<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) -> Self {
         // We clamp our values here as this is the way that Safari and
         // Chrome's implementation handle out-of-bounds percentages
         // but whether or not this behavior follows the specification
         // is still being discussed. See:
         // <https://github.com/w3c/csswg-drafts/issues/5333>
-        if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input)) {
+        if let Ok(percent) = input.try_parse(|input| Percentage::parse_non_negative(context, input))
+        {
             Self::Percent(percent.clamp_to_hundred())
         } else {
             Self::None
@@ -339,10 +325,10 @@
             "-moz-repeating-radial-gradient" => {
                 (Shape::Radial, true, GradientCompatMode::Moz)
             },
-            "conic-gradient" if conic_gradients_enabled() => {
+            "conic-gradient" => {
                 (Shape::Conic, false, GradientCompatMode::Modern)
             },
-            "repeating-conic-gradient" if conic_gradients_enabled() => {
+            "repeating-conic-gradient" => {
                 (Shape::Conic, true, GradientCompatMode::Modern)
             },
             "-webkit-gradient" => {
diff -Nru firefox-84.0.2+build1/servo/components/style_derive/to_css.rs firefox-85.0+build1/servo/components/style_derive/to_css.rs
--- firefox-84.0.2+build1/servo/components/style_derive/to_css.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/style_derive/to_css.rs	2021-01-18 19:58:19.000000000 +0000
@@ -105,7 +105,7 @@
         }
     } else if let Some(function) = variant_attrs.function {
         let mut identifier = function.explicit().map_or(identifier, |name| name);
-        identifier.push_str("(");
+        identifier.push('(');
         expr = quote! {
             std::fmt::Write::write_str(dest, #identifier)?;
             #expr?;
diff -Nru firefox-84.0.2+build1/servo/components/to_shmem/lib.rs firefox-85.0+build1/servo/components/to_shmem/lib.rs
--- firefox-84.0.2+build1/servo/components/to_shmem/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/components/to_shmem/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -180,7 +180,7 @@
         assert!(end <= self.capacity);
 
         self.index = end;
-        unsafe { self.buffer.offset(start as isize) as *mut T }
+        unsafe { self.buffer.add(start) as *mut T }
     }
 }
 
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/Cargo.toml firefox-85.0+build1/servo/ports/geckolib/Cargo.toml
--- firefox-84.0.2+build1/servo/ports/geckolib/Cargo.toml	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -17,7 +17,7 @@
 atomic_refcell = "0.1"
 bincode = "1.0"
 cssparser = "0.28"
-cstr = "0.1.2"
+cstr = "0.2"
 libc = "0.2"
 log = {version = "0.4", features = ["release_max_level_info"]}
 malloc_size_of = {path = "../../components/malloc_size_of"}
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/cbindgen.toml firefox-85.0+build1/servo/ports/geckolib/cbindgen.toml
--- firefox-84.0.2+build1/servo/ports/geckolib/cbindgen.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/cbindgen.toml	2021-01-18 19:58:19.000000000 +0000
@@ -65,7 +65,7 @@
 derive_tagged_enum_copy_constructor = true
 derive_tagged_enum_copy_assignment = true
 private_default_tagged_enum_constructor = true
-cast_assert_name = "MOZ_ASSERT"
+cast_assert_name = "MOZ_DIAGNOSTIC_ASSERT"
 
 [export]
 prefix = "Style"
@@ -838,6 +838,7 @@
     return HasRatio() && ratio.AsRatio().ToLayoutRatio();
   }
   bool BehavesAsAuto() const { return auto_ || !HasFiniteRatio(); }
+  inline AspectRatio ToLayoutRatio() const;
 
   static StyleGenericAspectRatio Auto() {
     return {true, StylePreferredRatio<N>::None()};
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/error_reporter.rs firefox-85.0+build1/servo/ports/geckolib/error_reporter.rs
--- firefox-84.0.2+build1/servo/ports/geckolib/error_reporter.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/error_reporter.rs	2021-01-18 19:58:19.000000000 +0000
@@ -38,9 +38,8 @@
     ) -> Option<Self> {
         let mut window_id = 0;
 
-        let enabled = unsafe {
-            bindings::Gecko_ErrorReportingEnabled(sheet, loader, &mut window_id)
-        };
+        let enabled =
+            unsafe { bindings::Gecko_ErrorReportingEnabled(sheet, loader, &mut window_id) };
 
         if !enabled {
             return None;
@@ -374,7 +373,7 @@
             ContextualParseError::InvalidMediaRule(_, ref err) => {
                 let err: &CStr = match err.kind {
                     ParseErrorKind::Custom(StyleParseErrorKind::MediaQueryExpectedFeatureName(
-                        ..
+                        ..,
                     )) => cstr!("PEMQExpectedFeatureName"),
                     ParseErrorKind::Custom(StyleParseErrorKind::MediaQueryExpectedFeatureValue) => {
                         cstr!("PEMQExpectedFeatureValue")
@@ -430,7 +429,8 @@
             Action::Drop => cstr!("PEDeclDropped").as_ptr(),
         };
         let selector_list = error.selector_list().map(|l| l.to_css_string());
-        let selector_list_ptr = selector_list.as_ref().map_or(ptr::null(), |s| s.as_ptr()) as *const _;
+        let selector_list_ptr =
+            selector_list.as_ref().map_or(ptr::null(), |s| s.as_ptr()) as *const _;
         let params = error.error_params();
         let param = params.main_param;
         let pre_param = params.prefix_param;
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/glue.rs firefox-85.0+build1/servo/ports/geckolib/glue.rs
--- firefox-84.0.2+build1/servo/ports/geckolib/glue.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/glue.rs	2021-01-18 19:58:19.000000000 +0000
@@ -136,10 +136,9 @@
 use style::values::animated::{Animate, Procedure, ToAnimatedZero};
 use style::values::computed::{self, Context, ToComputedValue};
 use style::values::distance::ComputeSquaredDistance;
-use style::values::specified;
 use style::values::specified::gecko::IntersectionObserverRootMargin;
 use style::values::specified::source_size_list::SourceSizeList;
-use style::values::{CustomIdent, KeyframesName};
+use style::values::{specified, AtomIdent, CustomIdent, KeyframesName};
 use style_traits::{CssWriter, ParsingMode, StyleParseErrorKind, ToCss};
 use to_shmem::SharedMemoryBuilder;
 
@@ -2738,7 +2737,9 @@
 #[no_mangle]
 pub extern "C" fn Servo_NamespaceRule_GetPrefix(rule: &RawServoNamespaceRule) -> *mut nsAtom {
     read_locked_arc(rule, |rule: &NamespaceRule| {
-        rule.prefix.as_ref().unwrap_or(&atom!("")).as_ptr()
+        rule.prefix
+            .as_ref()
+            .map_or(atom!("").as_ptr(), |a| a.as_ptr())
     })
 }
 
@@ -4122,10 +4123,7 @@
 }
 
 #[no_mangle]
-pub extern "C" fn Servo_ParseEasing(
-    easing: &nsAString,
-    output: &mut nsTimingFunction,
-) -> bool {
+pub extern "C" fn Servo_ParseEasing(easing: &nsAString, output: &mut nsTimingFunction) -> bool {
     use style::properties::longhands::transition_timing_function;
 
     let context = ParserContext::new(
@@ -6253,7 +6251,7 @@
     let element = GeckoElement(element);
 
     unsafe {
-        Atom::with(local_name, |atom| {
+        AtomIdent::with(local_name, |atom| {
             data.stylist.any_applicable_rule_data(element, |data| {
                 data.might_have_attribute_dependency(atom)
             })
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/stylesheet_loader.rs firefox-85.0+build1/servo/ports/geckolib/stylesheet_loader.rs
--- firefox-84.0.2+build1/servo/ports/geckolib/stylesheet_loader.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/stylesheet_loader.rs	2021-01-18 19:58:19.000000000 +0000
@@ -19,8 +19,8 @@
 use style::media_queries::MediaList;
 use style::parser::ParserContext;
 use style::shared_lock::{Locked, SharedRwLock};
-use style::stylesheets::AllowImportRules;
 use style::stylesheets::import_rule::ImportSheet;
+use style::stylesheets::AllowImportRules;
 use style::stylesheets::{ImportRule, Origin, StylesheetLoader as StyleStylesheetLoader};
 use style::stylesheets::{StylesheetContents, UrlExtraData};
 use style::use_counters::UseCounters;
@@ -59,14 +59,7 @@
         // so this raw pointer will still be valid.
 
         let child_sheet = unsafe {
-            Gecko_LoadStyleSheet(
-                self.0,
-                self.1,
-                self.2,
-                self.3,
-                &url,
-                media.into_strong(),
-            )
+            Gecko_LoadStyleSheet(self.0, self.1, self.2, self.3, &url, media.into_strong())
         };
 
         debug_assert!(
diff -Nru firefox-84.0.2+build1/servo/ports/geckolib/tests/Cargo.toml firefox-85.0+build1/servo/ports/geckolib/tests/Cargo.toml
--- firefox-84.0.2+build1/servo/ports/geckolib/tests/Cargo.toml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/servo/ports/geckolib/tests/Cargo.toml	2021-01-18 19:58:19.000000000 +0000
@@ -12,8 +12,8 @@
 [dependencies]
 atomic_refcell = "0.1"
 cssparser = "0.28"
-cstr = "0.1.2"
-env_logger = { version = "0.6", default-features = false }
+cstr = "0.2"
+env_logger = { version = "0.8", default-features = false }
 geckoservo = {path = "../../../ports/geckolib"}
 libc = "0.2"
 log = {version = "0.4", features = ["release_max_level_info"]}
diff -Nru firefox-84.0.2+build1/SOURCE_CHANGESET firefox-85.0+build1/SOURCE_CHANGESET
--- firefox-84.0.2+build1/SOURCE_CHANGESET	2021-01-06 11:23:28.000000000 +0000
+++ firefox-85.0+build1/SOURCE_CHANGESET	2021-01-18 19:58:30.000000000 +0000
@@ -1 +1 @@
-7e22d68e1ebfc0839092237feeefad46cfbd8651
\ No newline at end of file
+cd908cffd02e1563b2218d985873f958a2e2c55d
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/startupcache/StartupCache.cpp firefox-85.0+build1/startupcache/StartupCache.cpp
--- firefox-84.0.2+build1/startupcache/StartupCache.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/startupcache/StartupCache.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -34,6 +34,7 @@
 #include "nsIProtocolHandler.h"
 #include "GeckoProfiler.h"
 #include "nsAppRunner.h"
+#include "xpcpublic.h"
 
 #if defined(XP_WIN)
 #  include <windows.h>
diff -Nru firefox-84.0.2+build1/storage/mozStorageAsyncStatementExecution.cpp firefox-85.0+build1/storage/mozStorageAsyncStatementExecution.cpp
--- firefox-84.0.2+build1/storage/mozStorageAsyncStatementExecution.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageAsyncStatementExecution.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -20,6 +20,10 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Telemetry.h"
 
+#ifndef MOZ_STORAGE_SORTWARNING_SQL_DUMP
+extern mozilla::LazyLogModule gStorageLog;
+#endif
+
 namespace mozilla {
 namespace storage {
 
diff -Nru firefox-84.0.2+build1/storage/mozStorageAsyncStatementParams.cpp firefox-85.0+build1/storage/mozStorageAsyncStatementParams.cpp
--- firefox-84.0.2+build1/storage/mozStorageAsyncStatementParams.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageAsyncStatementParams.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -4,13 +4,17 @@
  * 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 "mozStorageAsyncStatementParams.h"
+
 #include "nsJSUtils.h"
 #include "nsMemory.h"
 #include "nsString.h"
 
 #include "jsapi.h"
 
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/MozStorageAsyncStatementParamsBinding.h"
+#include "mozStorageAsyncStatement.h"
 #include "mozStoragePrivateHelpers.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/storage/mozStorageAsyncStatementParams.h firefox-85.0+build1/storage/mozStorageAsyncStatementParams.h
--- firefox-84.0.2+build1/storage/mozStorageAsyncStatementParams.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageAsyncStatementParams.h	2021-01-18 19:58:19.000000000 +0000
@@ -8,11 +8,12 @@
 #define mozilla_storage_mozStorageAsyncStatementParams_h_
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace storage {
 
 class AsyncStatement;
diff -Nru firefox-84.0.2+build1/storage/mozStorageBindingParamsArray.h firefox-85.0+build1/storage/mozStorageBindingParamsArray.h
--- firefox-84.0.2+build1/storage/mozStorageBindingParamsArray.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageBindingParamsArray.h	2021-01-18 19:58:19.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef mozStorageBindingParamsArray_h
 #define mozStorageBindingParamsArray_h
 
+#include "nsCOMPtr.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 
diff -Nru firefox-84.0.2+build1/storage/mozStorageConnection.cpp firefox-85.0+build1/storage/mozStorageConnection.cpp
--- firefox-84.0.2+build1/storage/mozStorageConnection.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageConnection.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -19,6 +19,7 @@
 #include "mozilla/Unused.h"
 #include "mozilla/dom/quota/QuotaObject.h"
 #include "mozilla/ScopeExit.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_storage.h"
 
 #include "mozIStorageCompletionCallback.h"
diff -Nru firefox-84.0.2+build1/storage/mozStoragePrivateHelpers.cpp firefox-85.0+build1/storage/mozStoragePrivateHelpers.cpp
--- firefox-84.0.2+build1/storage/mozStoragePrivateHelpers.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStoragePrivateHelpers.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -225,8 +225,6 @@
       NS_WARNING("Unsupported variant type");
       return nullptr;
   }
-
-  return nullptr;
 }
 
 namespace {
diff -Nru firefox-84.0.2+build1/storage/mozStorageRow.cpp firefox-85.0+build1/storage/mozStorageRow.cpp
--- firefox-84.0.2+build1/storage/mozStorageRow.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageRow.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -4,12 +4,13 @@
  * 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 "mozStorageRow.h"
+
 #include "nsString.h"
 
 #include "sqlite3.h"
 #include "mozStoragePrivateHelpers.h"
 #include "Variant.h"
-#include "mozStorageRow.h"
 
 namespace mozilla {
 namespace storage {
diff -Nru firefox-84.0.2+build1/storage/mozStorageService.cpp firefox-85.0+build1/storage/mozStorageService.cpp
--- firefox-84.0.2+build1/storage/mozStorageService.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageService.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 #include "mozStorageService.h"
 #include "mozStorageConnection.h"
diff -Nru firefox-84.0.2+build1/storage/mozStorageStatementJSHelper.cpp firefox-85.0+build1/storage/mozStorageStatementJSHelper.cpp
--- firefox-84.0.2+build1/storage/mozStorageStatementJSHelper.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageStatementJSHelper.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozStorageStatementParams.h"
 
 #include "jsapi.h"
+#include "js/Value.h"
 
 #include "xpc_make_class.h"
 
diff -Nru firefox-84.0.2+build1/storage/mozStorageStatementParams.cpp firefox-85.0+build1/storage/mozStorageStatementParams.cpp
--- firefox-84.0.2+build1/storage/mozStorageStatementParams.cpp	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageStatementParams.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -4,14 +4,18 @@
  * 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 "mozStorageStatementParams.h"
+
 #include "nsJSUtils.h"
 #include "nsMemory.h"
 #include "nsString.h"
 
 #include "jsapi.h"
 
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/MozStorageStatementParamsBinding.h"
 #include "mozStoragePrivateHelpers.h"
+#include "mozStorageStatement.h"
 
 namespace mozilla {
 namespace storage {
diff -Nru firefox-84.0.2+build1/storage/mozStorageStatementParams.h firefox-85.0+build1/storage/mozStorageStatementParams.h
--- firefox-84.0.2+build1/storage/mozStorageStatementParams.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageStatementParams.h	2021-01-18 19:58:19.000000000 +0000
@@ -8,11 +8,12 @@
 #define MOZSTORAGESTATEMENTPARAMS_H
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace storage {
 
 class Statement;
diff -Nru firefox-84.0.2+build1/storage/mozStorageStatementRow.cpp firefox-85.0+build1/storage/mozStorageStatementRow.cpp
--- firefox-84.0.2+build1/storage/mozStorageStatementRow.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageStatementRow.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -7,12 +7,14 @@
 #include "nsMemory.h"
 #include "nsString.h"
 
+#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/MozStorageStatementRowBinding.h"
 #include "mozStorageStatementRow.h"
 #include "mozStorageStatement.h"
 
 #include "jsapi.h"
 #include "js/Array.h"  // JS::NewArrayObject
+#include "js/Value.h"
 
 #include "xpc_make_class.h"
 
diff -Nru firefox-84.0.2+build1/storage/mozStorageStatementRow.h firefox-85.0+build1/storage/mozStorageStatementRow.h
--- firefox-84.0.2+build1/storage/mozStorageStatementRow.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/mozStorageStatementRow.h	2021-01-18 19:58:19.000000000 +0000
@@ -8,11 +8,12 @@
 #define MOZSTORAGESTATEMENTROW_H
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace storage {
 
 class Statement;
diff -Nru firefox-84.0.2+build1/storage/test/gtest/storage_test_harness.h firefox-85.0+build1/storage/test/gtest/storage_test_harness.h
--- firefox-84.0.2+build1/storage/test/gtest/storage_test_harness.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/test/gtest/storage_test_harness.h	2021-01-18 19:58:19.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsMemory.h"
 #include "nsServiceManagerUtils.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "mozilla/ReentrantMonitor.h"
 
diff -Nru firefox-84.0.2+build1/storage/test/gtest/test_binding_params.cpp firefox-85.0+build1/storage/test/gtest/test_binding_params.cpp
--- firefox-84.0.2+build1/storage/test/gtest/test_binding_params.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/test/gtest/test_binding_params.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "storage_test_harness.h"
 
+#include "mozilla/ArrayUtils.h"
 #include "mozStorageHelper.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/storage/VacuumManager.cpp firefox-85.0+build1/storage/VacuumManager.cpp
--- firefox-84.0.2+build1/storage/VacuumManager.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/VacuumManager.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -19,6 +19,7 @@
 
 #include "mozStorageConnection.h"
 #include "mozIStorageStatement.h"
+#include "mozIStorageStatementCallback.h"
 #include "mozIStorageAsyncStatement.h"
 #include "mozIStoragePendingStatement.h"
 #include "mozIStorageError.h"
diff -Nru firefox-84.0.2+build1/storage/Variant.cpp firefox-85.0+build1/storage/Variant.cpp
--- firefox-84.0.2+build1/storage/Variant.cpp	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/Variant.cpp	2021-01-18 19:58:19.000000000 +0000
@@ -6,6 +6,8 @@
 
 #include "Variant.h"
 
+#include "nsCOMPtr.h"
+
 extern "C" {
 
 using namespace mozilla::storage;
diff -Nru firefox-84.0.2+build1/storage/Variant_inl.h firefox-85.0+build1/storage/Variant_inl.h
--- firefox-84.0.2+build1/storage/Variant_inl.h	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/storage/Variant_inl.h	2021-01-18 19:58:19.000000000 +0000
@@ -12,6 +12,9 @@
 #  error "Do not include this file directly!"
 #endif
 
+#include "js/RootingAPI.h"
+#include "js/Value.h"
+
 namespace mozilla {
 namespace storage {
 
diff -Nru firefox-84.0.2+build1/taskcluster/ci/build/linux-base-toolchains.yml firefox-85.0+build1/taskcluster/ci/build/linux-base-toolchains.yml
--- firefox-84.0.2+build1/taskcluster/ci/build/linux-base-toolchains.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/build/linux-base-toolchains.yml	2021-01-18 19:58:19.000000000 +0000
@@ -38,7 +38,7 @@
         toolchain:
             - linux64-clang-5.0
             - linux64-gcc-7
-            - linux64-rust-1.43
+            - linux64-rust-1.47
             - linux64-cbindgen
             - linux64-dump-syms
             - linux64-sccache
@@ -80,7 +80,7 @@
         toolchain:
             - linux64-clang-5.0
             - linux64-gcc-7
-            - linux64-rust-1.43
+            - linux64-rust-1.47
             - linux64-cbindgen
             - linux64-dump-syms
             - linux64-sccache
@@ -121,7 +121,7 @@
         toolchain:
             - linux64-binutils
             - linux64-clang-5.0
-            - linux64-rust-1.43
+            - linux64-rust-1.47
             - linux64-cbindgen
             - linux64-dump-syms
             - linux64-nasm-2.14.02
@@ -160,7 +160,7 @@
         toolchain:
             - linux64-binutils
             - linux64-clang-5.0
-            - linux64-rust-1.43
+            - linux64-rust-1.47
             - linux64-cbindgen
             - linux64-dump-syms
             - linux64-nasm-2.14.02
diff -Nru firefox-84.0.2+build1/taskcluster/ci/build/macosx-native.yml firefox-85.0+build1/taskcluster/ci/build/macosx-native.yml
--- firefox-84.0.2+build1/taskcluster/ci/build/macosx-native.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/build/macosx-native.yml	2021-01-18 19:58:19.000000000 +0000
@@ -10,5 +10,66 @@
         max-run-time: 7200
     run:
         using: mozharness
-        actions: [get-secrets, build]
         script: "mozharness/scripts/fx_desktop_build.py"
+
+macosx64-plain/opt:
+    description: "MacOS X x64 Opt Plain"
+    index:
+        job-name: macosx64-plain-opt
+    treeherder:
+        symbol: Bp
+        platform: osx/opt
+        tier: 2
+    worker:
+        env:
+            PERFHERDER_EXTRA_OPTIONS: plain
+    run:
+        actions: [build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/taskcluster_base_macosx.py
+        extra-config:
+            disable_package_metrics: true
+            stage_platform: macosx64
+            mozconfig_platform: macosx64
+        mozconfig-variant: plain-opt
+    run-on-projects: ['mozilla-central']
+    fetches:
+        toolchain:
+            - macosx64-cbindgen
+            - macosx64-nasm
+            - macosx64-node
+            - macosx64-rust
+    optimization:
+        skip-unless-expanded: null
+
+macosx64-plain/debug:
+    description: "MacOS X x64 Debug Plain"
+    index:
+        job-name: macosx64-plain-debug
+    treeherder:
+        symbol: Bp
+        platform: osx/debug
+        tier: 2
+    worker:
+        env:
+            PERFHERDER_EXTRA_OPTIONS: plain
+    run:
+        actions: [build]
+        config:
+            - builds/releng_base_firefox.py
+            - builds/taskcluster_base_macosx.py
+        extra-config:
+            disable_package_metrics: true
+            stage_platform: macosx64
+            mozconfig_platform: macosx64
+        mozconfig-variant: plain-debug
+    run-on-projects: ['trunk']
+    fetches:
+        toolchain:
+            - macosx64-cbindgen
+            - macosx64-nasm
+            - macosx64-node
+            - macosx64-rust
+    optimization:
+        skip-unless-expanded: null
diff -Nru firefox-84.0.2+build1/taskcluster/ci/build/macosx.yml firefox-85.0+build1/taskcluster/ci/build/macosx.yml
--- firefox-84.0.2+build1/taskcluster/ci/build/macosx.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/build/macosx.yml	2021-01-18 19:58:19.000000000 +0000
@@ -142,21 +142,21 @@
     optimization:
         skip-unless-expanded: null
 
-macosx64-devedition/opt:
+macosx64-x64-devedition/opt:
     description: "MacOS X Dev Edition x64 (shippable)"
     use-pgo: macosx64-shippable/opt
     attributes:
-        shippable: true
         enable-full-crashsymbols: true
+        skip-verify-test-packaging: true
     shipping-phase: build
     shipping-product: devedition
     index:
         product: devedition
-        job-name: macosx64-opt
+        job-name: macosx64-x64-opt
         type: shippable
     treeherder:
         platform: osx-cross-devedition/opt
-        symbol: B
+        symbol: Bx
         tier: 1
     worker:
         max-run-time: 7200
@@ -177,6 +177,193 @@
             - linux64-clang-macosx-cross
             - wasi-sysroot
 
+macosx64-aarch64-devedition/opt:
+    description: "MacOS X Dev Edition Aarch64 (shippable)"
+    use-pgo: macosx64-shippable/opt
+    attributes:
+        enable-full-crashsymbols: true
+        skip-verify-test-packaging: true
+    shipping-phase: build
+    shipping-product: devedition
+    index:
+        product: devedition
+        job-name: macosx64-aarch64-opt
+        type: shippable
+    treeherder:
+        platform: osx-aarch64-devedition/opt
+        symbol: B
+        tier: 1
+    worker:
+        max-run-time: 7200
+        env:
+            TOOLTOOL_MANIFEST: ""
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
+            PERFHERDER_EXTRA_OPTIONS: aarch64
+    run:
+        config:
+            - builds/releng_base_firefox.py
+            - builds/releng_base_mac_64_cross_builds.py
+            - taskcluster_nightly.py
+        extra-config:
+            stage_platform: macosx64-aarch64-devedition
+            mozconfig_platform: macosx64-aarch64
+        mozconfig-variant: devedition
+    run-on-projects: ['mozilla-beta']
+    dependencies:
+        linux64-rust-macos-1.49: toolchain-linux64-rust-macos-1.49
+    fetches:
+        toolchain:
+            - linux64-cctools-port
+            - linux64-clang-macosx-aarch64-cross
+            - macosx64-sdk-11.0
+        # Because job-defaults contain linux64-rust-macos, which we can't
+        # remove, and that would extract to the same directory, with no
+        # guaranteed order,we need to manually extract to a different
+        # directory, and make the build use that instead, until we can use
+        # a stable rust.
+        linux64-rust-macos-1.49:
+            - artifact: rustc.tar.zst
+              dest: rustc-1.49
+
+macosx64-devedition/opt:
+    description: "MacOS X Dev Edition Universal"
+    attributes:
+        shippable: true
+        enable-build-signing: true
+        skip-upload-crashsymbols: true
+        skip-verify-test-packaging: true
+    shipping-phase: build
+    shipping-product: devedition
+    index:
+        product: devedition
+        job-name: macosx64-opt
+        type: shippable
+    treeherder:
+        platform: osx-cross-devedition/opt
+        symbol: B
+        tier: 1
+    run-on-projects: ['mozilla-beta']
+    worker:
+        max-run-time: 1800
+    run:
+        job-script: taskcluster/scripts/misc/unify.sh
+        config:
+            - builds/releng_base_firefox.py
+    dependencies:
+        macosx64-x64-devedition-opt: build-macosx64-x64-devedition/opt
+        macosx64-aarch64-devedition-opt: build-macosx64-aarch64-devedition/opt
+    fetches:
+        macosx64-x64-devedition-opt:
+            - artifact: target.dmg
+              extract: false
+              dest: x64
+            - artifact: buildhub.json
+              extract: false
+              dest: ../artifacts
+            - artifact: host/bin/mar
+              extract: false
+              dest: ../artifacts/host/bin
+            - artifact: host/bin/mbsdiff
+              extract: false
+              dest: ../artifacts/host/bin
+            - artifact: target.txt
+              extract: false
+              dest: ../artifacts
+            - artifact: target_info.txt
+              extract: false
+              dest: ../artifacts
+            - artifact: target.json
+              extract: false
+              dest: ../artifacts
+            - artifact: target.mozinfo.json
+              extract: false
+              dest: ../artifacts
+            - artifact: target.test_packages.json
+              extract: false
+              dest: ../artifacts
+            - artifact: target.perftests.tests.tar.gz
+              extract: false
+              dest: ../artifacts
+            - artifact: target.common.tests.tar.gz
+              dest: x64/common
+            - artifact: target.cppunittest.tests.tar.gz
+              dest: x64/cppunittest
+            - artifact: target.gtest.tests.tar.gz
+              dest: x64/gtest
+            - artifact: target.jittest.tests.tar.gz
+              dest: x64/jittest
+            - artifact: target.jsreftest.tests.tar.gz
+              dest: x64/jsreftest
+            - artifact: target.mochitest.tests.tar.gz
+              dest: x64/mochitest
+            - artifact: target.reftest.tests.tar.gz
+              dest: x64/reftest
+            - artifact: target.talos.tests.tar.gz
+              dest: x64/talos
+            - artifact: target.raptor.tests.tar.gz
+              dest: x64/raptor
+            - artifact: target.condprof.tests.tar.gz
+              dest: x64/confprof
+            - artifact: target.awsy.tests.tar.gz
+              dest: x64/awsy
+            - artifact: target.xpcshell.tests.tar.gz
+              dest: x64/xpcshell
+            - artifact: target.web-platform.tests.tar.gz
+              dest: x64/web-platform
+            - artifact: target.updater-dep.tests.tar.gz
+              dest: x64/updater-dep
+            - artifact: target.crashreporter-symbols.zip
+              dest: x64/crashreporter-symbols
+            - artifact: target.jsshell.zip
+              dest: x64/jsshell
+            - artifact: target.generated-files.tar.gz
+              extract: false
+              dest: ../artifacts
+            - artifact: target.langpack.xpi
+              extract: false
+              dest: ../artifacts
+            - artifact: mozharness.zip
+              extract: false
+              dest: ../artifacts
+        macosx64-aarch64-devedition-opt:
+            - artifact: target.dmg
+              extract: false
+              dest: aarch64
+            - artifact: target.common.tests.tar.gz
+              dest: aarch64/common
+            - artifact: target.cppunittest.tests.tar.gz
+              dest: aarch64/cppunittest
+            - artifact: target.gtest.tests.tar.gz
+              dest: aarch64/gtest
+            - artifact: target.jittest.tests.tar.gz
+              dest: aarch64/jittest
+            - artifact: target.jsreftest.tests.tar.gz
+              dest: aarch64/jsreftest
+            - artifact: target.mochitest.tests.tar.gz
+              dest: aarch64/mochitest
+            - artifact: target.reftest.tests.tar.gz
+              dest: aarch64/reftest
+            - artifact: target.talos.tests.tar.gz
+              dest: aarch64/talos
+            - artifact: target.raptor.tests.tar.gz
+              dest: aarch64/raptor
+            - artifact: target.condprof.tests.tar.gz
+              dest: aarch64/confprof
+            - artifact: target.awsy.tests.tar.gz
+              dest: aarch64/awsy
+            - artifact: target.xpcshell.tests.tar.gz
+              dest: aarch64/xpcshell
+            - artifact: target.web-platform.tests.tar.gz
+              dest: aarch64/web-platform
+            - artifact: target.updater-dep.tests.tar.gz
+              dest: aarch64/updater-dep
+            - artifact: target.crashreporter-symbols.zip
+              dest: aarch64/crashreporter-symbols
+            - artifact: target.jsshell.zip
+              dest: aarch64/jsshell
+        toolchain:
+            - linux64-cctools-port
+
 macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
@@ -289,7 +476,7 @@
         extra-config:
             mozconfig_platform: macosx64-aarch64
     dependencies:
-        linux64-rust-macos-beta: toolchain-linux64-rust-macos-beta
+        linux64-rust-macos-1.49: toolchain-linux64-rust-macos-1.49
     fetches:
         toolchain:
             - linux64-cctools-port
@@ -300,9 +487,9 @@
         # guaranteed order,we need to manually extract to a different
         # directory, and make the build use that instead, until we can use
         # a stable rust.
-        linux64-rust-macos-beta:
+        linux64-rust-macos-1.49:
             - artifact: rustc.tar.zst
-              dest: rustc-beta
+              dest: rustc-1.49
 
 macosx64-shippable/opt:
     description: "MacOS X Universal"
@@ -359,6 +546,9 @@
             - artifact: target.test_packages.json
               extract: false
               dest: ../artifacts
+            - artifact: target.perftests.tests.tar.gz
+              extract: false
+              dest: ../artifacts
             - artifact: target.common.tests.tar.gz
               dest: x64/common
             - artifact: target.cppunittest.tests.tar.gz
diff -Nru firefox-84.0.2+build1/taskcluster/ci/build/windows.yml firefox-85.0+build1/taskcluster/ci/build/windows.yml
--- firefox-84.0.2+build1/taskcluster/ci/build/windows.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/build/windows.yml	2021-01-18 19:58:19.000000000 +0000
@@ -181,34 +181,47 @@
         platform: windows2012-64/debug
         symbol: Bf
         tier: 1
-    worker-type: b-win2012
+    worker-type: b-linux
     worker:
+        docker-image: {in-tree: debian10-amd64-build}
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: fuzzing
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
+        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
+            - builds/releng_base_linux_64_builds.py
             - builds/taskcluster_sub_win64/debug.py
+        extra-config:
+            mozconfig_platform: win64
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         mozconfig-variant: debug-fuzzing
     run-on-projects: ['trunk']
     use-sccache: true
     fetches:
         toolchain:
-            - win64-clang-cl
-            - win64-rust
-            - win64-rust-size
-            - win64-cbindgen
-            - win64-sccache
-            - win64-nasm
-            - win64-node
-            - win64-winchecksec
+            - linux64-binutils
+            - linux64-clang-win-cross
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-sccache
+            - linux64-dump-syms
+            - linux64-wine
+            - linux64-liblowercase
+            - linux64-winchecksec
+        fetch:
+            - nsis-3.01-win
+            - upx-3.95-win
     optimization:
         skip-unless-expanded: null
 
@@ -891,37 +904,46 @@
         platform: windows2012-64/asan
         symbol: Bd
         tier: 1
-    worker-type: b-win2012
+    worker-type: b-linux
     worker:
+        docker-image: {in-tree: debian10-amd64-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "debug asan"
     run:
+        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
+            - builds/releng_base_linux_64_builds.py
             - builds/taskcluster_sub_win64/asan_debug.py
+        extra-config:
+            mozconfig_platform: win64
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         mozconfig-variant: debug-asan
     use-sccache: true
     fetches:
         toolchain:
-            - win64-clang-cl
-            - win64-rust
-            - win64-rust-size
-            - win64-cbindgen
-            - win64-sccache
-            - win64-nasm
-            - win64-node
-            # `fix-stacks` is needed because xpcshell self tests run as part of
-            # the build step. Once bug 1614626 moves them to the xpcshell task,
-            # this dependency can be removed.
-            - win32-fix-stacks
-            - win64-winchecksec
+            - linux64-binutils
+            - linux64-clang-win-cross
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-sccache
+            - linux64-dump-syms
+            - linux64-wine
+            - linux64-liblowercase
+            - linux64-winchecksec
+        fetch:
+            - nsis-3.01-win
+            - upx-3.95-win
     optimization:
         skip-unless-expanded: null
 
@@ -934,35 +956,47 @@
         platform: windows2012-64/asan
         symbol: Bo
         tier: 1
-    worker-type: b-win2012
+    worker-type: b-linux
     worker:
+        docker-image: {in-tree: debian10-amd64-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "opt asan"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
+        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
+            - builds/releng_base_linux_64_builds.py
         extra-config:
             stage_platform: win64-asan
+            mozconfig_platform: win64
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         mozconfig-variant: nightly-asan
     use-sccache: true
     fetches:
         toolchain:
-            - win64-clang-cl
-            - win64-rust
-            - win64-rust-size
-            - win64-cbindgen
-            - win64-sccache
-            - win64-nasm
-            - win64-node
-            - win64-winchecksec
+            - linux64-binutils
+            - linux64-clang-win-cross
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-sccache
+            - linux64-dump-syms
+            - linux64-wine
+            - linux64-liblowercase
+            - linux64-winchecksec
+        fetch:
+            - nsis-3.01-win
+            - upx-3.95-win
 
 win64-asan-reporter-shippable/opt:
     description: "Win64 Opt ASAN Reporter (Shippable)"
@@ -979,25 +1013,30 @@
     treeherder:
         platform: win64-asan-reporter/opt
         symbol: BoR
-    worker-type: b-win2012
+    worker-type: b-linux
     worker:
+        docker-image: {in-tree: debian10-amd64-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "asan-reporter"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
+        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
+            - builds/releng_base_linux_64_builds.py
             - builds/taskcluster_sub_win64/asan_reporter_opt.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64-asan-reporter
+            mozconfig_platform: win64
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         mozconfig-variant: nightly-asan-reporter
         mar-channel-id:
             firefox-mozilla-central-asan
@@ -1006,13 +1045,20 @@
     run-on-projects: ['mozilla-central']
     fetches:
         toolchain:
-            - win64-clang-cl
-            - win64-rust
-            - win64-rust-size
-            - win64-cbindgen
-            - win64-nasm
-            - win64-node
-            - win64-winchecksec
+            - linux64-binutils
+            - linux64-clang-win-cross
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-dump-syms
+            - linux64-wine
+            - linux64-liblowercase
+            - linux64-winchecksec
+        fetch:
+            - nsis-3.01-win
+            - upx-3.95-win
 
 win64-asan-fuzzing/opt:
     description: "Win64 Fuzzing Opt ASAN"
@@ -1022,34 +1068,46 @@
     treeherder:
         platform: windows2012-64/asan
         symbol: Bof
-    worker-type: b-win2012
+    worker-type: b-linux
     worker:
+        docker-image: {in-tree: debian10-amd64-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: fuzzing-asan
     run:
+        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - builds/taskcluster_base_win64.py
+            - builds/releng_base_linux_64_builds.py
         extra-config:
             stage_platform: win64-fuzzing-asan
+            mozconfig_platform: win64
+            env:
+                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         mozconfig-variant: nightly-fuzzing-asan
     use-sccache: true
     fetches:
         toolchain:
-            - win64-clang-cl
-            - win64-rust
-            - win64-rust-size
-            - win64-cbindgen
-            - win64-sccache
-            - win64-nasm
-            - win64-node
-            - win64-winchecksec
+            - linux64-binutils
+            - linux64-clang-win-cross
+            - linux64-rust-cross
+            - linux64-rust-size
+            - linux64-nasm
+            - linux64-node
+            - linux64-cbindgen
+            - linux64-sccache
+            - linux64-dump-syms
+            - linux64-wine
+            - linux64-liblowercase
+            - linux64-winchecksec
+        fetch:
+            - nsis-3.01-win
+            - upx-3.95-win
     optimization:
         skip-unless-expanded: null
 
diff -Nru firefox-84.0.2+build1/taskcluster/ci/config.yml firefox-85.0+build1/taskcluster/ci/config.yml
--- firefox-84.0.2+build1/taskcluster/ci/config.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/config.yml	2021-01-18 19:58:19.000000000 +0000
@@ -209,7 +209,6 @@
             - 'sm-msan-linux64'
             - 'sm-fuzzing-linux64'
             - 'sm-rust-bindings-linux64'
-            - 'sm-nowarp-linux64'
         'win32':
             - 'sm-plain-win32'
             - 'sm-compacting-win32'
@@ -568,14 +567,6 @@
                 by-level:
                     '3': 'gecko-3-b-osx-1015'
                     default: 'gecko-1-b-osx-1015'
-        t-osx-1014-pgo:
-            provisioner: releng-hardware
-            implementation: generic-worker
-            os: macosx
-            worker-type:
-                by-level:
-                    '3': 'gecko-{level}-t-osx-1014'
-                    default: 'gecko-t-osx-1014'
         t-win10-64(|-gpu-s|-source):
             provisioner: '{trust-domain}-t'
             implementation: generic-worker
diff -Nru firefox-84.0.2+build1/taskcluster/ci/docker-image/kind.yml firefox-85.0+build1/taskcluster/ci/docker-image/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/docker-image/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/docker-image/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -22,8 +22,11 @@
         symbol: I(ib)
     debian10-test:
         symbol: I(deb10-test)
+    ubuntu1804-test-base:
+        symbol: I(ub18-test-base)
     ubuntu1804-test:
         symbol: I(ub18-test)
+        parent: ubuntu1804-test-base
     # Neither the debian8-*raw nor the debian8-*packages images can have
     # packages dependencies.
     debian8-raw:
@@ -58,6 +61,7 @@
             - deb8-mercurial
             - deb8-python3.6
             - deb8-python3-defaults
+            - deb8-python-psutil
             - deb8-python-zstandard
             - deb8-xz-utils
     deb8-toolchain-build:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/fetch/browsertime.yml firefox-85.0+build1/taskcluster/ci/fetch/browsertime.yml
--- firefox-84.0.2+build1/taskcluster/ci/fetch/browsertime.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/fetch/browsertime.yml	2021-01-18 19:58:19.000000000 +0000
@@ -37,36 +37,6 @@
         sha256: 461919e080e19335a34224e2d353b96b07c7d068621aa940f9c136e86d090047
         size: 5404417
 
-win32-chromedriver-84:
-    description: 'Win32 chromedriver v84'
-    fetch:
-        type: static-url
-        artifact-name: chromedriver_win32_84.tar.zst
-        add-prefix: '84'
-        url: https://chromedriver.storage.googleapis.com/84.0.4147.30/chromedriver_win32.zip
-        sha256: 533994dba537979e16e04eb6537ca851c6cee241716cceccc76703fbabf0f12c
-        size: 4851011
-
-linux64-chromedriver-84:
-    description: 'Linux64 chromedriver v84'
-    fetch:
-        type: static-url
-        artifact-name: chromedriver_linux64_84.tar.zst
-        add-prefix: '84'
-        url: https://chromedriver.storage.googleapis.com/84.0.4147.30/chromedriver_linux64.zip
-        sha256: 160531e8f98f13b486411cd6445ec0e3c56cd4d4b2839e3e9a0fda09a279797a
-        size: 5306126
-
-mac64-chromedriver-84:
-    description: 'Mac64 chromedriver v84'
-    fetch:
-        type: static-url
-        artifact-name: chromedriver_mac64_84.tar.zst
-        add-prefix: '84'
-        url: https://chromedriver.storage.googleapis.com/84.0.4147.30/chromedriver_mac64.zip
-        sha256: 1bed996247f5f93eed28110927a10b45f01a7deeda4ab1b1acfd6bb66784acc5
-        size: 7332572
-
 win32-chromedriver-85:
     description: 'Win32 chromedriver v85'
     fetch:
@@ -126,3 +96,33 @@
         url: https://chromedriver.storage.googleapis.com/86.0.4240.22/chromedriver_mac64.zip
         sha256: 351ae30e9feab7ca6ccb94a549afcd62d6355561b78b8386cd4271d480a2fdc6
         size: 7796598
+
+win32-chromedriver-87:
+    description: 'Win32 chromedriver v87'
+    fetch:
+        type: static-url
+        artifact-name: chromedriver_win32_87.tar.zst
+        add-prefix: '87'
+        url: https://chromedriver.storage.googleapis.com/87.0.4280.20/chromedriver_win32.zip
+        sha256: 0aba7f547ea4941169a9a0b4e3463459900a3d3ae74e2f5646ed732c0c40598b
+        size: 5429367
+
+linux64-chromedriver-87:
+    description: 'Linux64 chromedriver v87'
+    fetch:
+        type: static-url
+        artifact-name: chromedriver_linux64_87.tar.zst
+        add-prefix: '87'
+        url: https://chromedriver.storage.googleapis.com/87.0.4280.20/chromedriver_linux64.zip
+        sha256: a3248aa7308727fe1116b7e937511c3486b4efd45da9c50e3b6a7c31563df3b2
+        size: 5564194
+
+mac64-chromedriver-87:
+    description: 'Mac64 chromedriver v87'
+    fetch:
+        type: static-url
+        artifact-name: chromedriver_mac64_87.tar.zst
+        add-prefix: '87'
+        url: https://chromedriver.storage.googleapis.com/87.0.4280.20/chromedriver_mac64.zip
+        sha256: 99e98317a5f883d53973a044778f81abe71b42c570fb35f75786f86ea617bd1a
+        size: 7897737
diff -Nru firefox-84.0.2+build1/taskcluster/ci/fetch/toolchains.yml firefox-85.0+build1/taskcluster/ci/fetch/toolchains.yml
--- firefox-84.0.2+build1/taskcluster/ci/fetch/toolchains.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/fetch/toolchains.yml	2021-01-18 19:58:19.000000000 +0000
@@ -366,7 +366,7 @@
     fetch:
         type: git
         repo: https://git.code.sf.net/p/mingw-w64/mingw-w64
-        revision: bd8ca6c303658659496d0c440cf9f2baa8f7a5f0
+        revision: 660e09f3cb20f181b6d6435cb623d65a3922a063
 
 libunwind:
     description: libunwind source code
@@ -387,7 +387,7 @@
     fetch:
         type: git
         repo: https://github.com/jamienicol/android-rs-glue
-        revision: 7a57ad320de79c74a57a8ce02b1dc69b1ea7332a
+        revision: 86d9cb4db7bf7a8052e6765d9f8caae6009107cb
 
 clang-5.0:
     description: clang 5.0.2 source code
@@ -431,6 +431,13 @@
         repo: https://github.com/llvm/llvm-project
         revision: 176249bd6732a8044d457092ed932768724a6f06
 
+rust-1.47.0-dev:
+    description: Rust 1.47.0-dev source code
+    fetch:
+        type: git
+        repo: https://github.com/rust-lang/rust/
+        revision: 18bf6b4f01a6feaf7259ba7cdae58031af1b7b39
+
 wasi-sdk:
     description: wasi-sdk source code
     fetch:
@@ -464,7 +471,7 @@
     fetch:
         type: git
         repo: https://github.com/PLSysSec/lucet_sandbox_compiler/
-        revision: 477d8fc53a64705a9d3fbcce9de92f4988558525
+        revision: cd07861d1c92147b35b538e6f94fde7d1986f9ad
 
 dump-syms:
     description: dump_syms source code
diff -Nru firefox-84.0.2+build1/taskcluster/ci/generate-profile/kind.yml firefox-85.0+build1/taskcluster/ci/generate-profile/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/generate-profile/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/generate-profile/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -35,6 +35,7 @@
             platform: linux32-shippable/opt
         worker-type: b-linux
         worker:
+            chain-of-trust: true
             env:
                 NEED_XVFB: "true"
             max-run-time: 1200
@@ -65,6 +66,7 @@
             platform: linux64-shippable/opt
         worker-type: b-linux
         worker:
+            chain-of-trust: true
             env:
                 NEED_XVFB: "true"
             max-run-time: 1200
@@ -94,7 +96,8 @@
             platform: android-4-0-armv7-api16/pgo
         worker-type: t-linux-xlarge-pgo
         worker:
-            max-run-time: 1800
+            chain-of-trust: true
+            max-run-time: 2700
             docker-image: {in-tree: ubuntu1804-test}
             env:
                 WORKING_DIR: "/builds/worker"
@@ -130,6 +133,7 @@
             platform: windows2012-32-shippable/opt
         worker-type: b-win2012
         worker:
+            chain-of-trust: true
             max-run-time: 1200
             env:
                 UPLOAD_PATH: "artifacts"
@@ -158,6 +162,7 @@
             platform: windows2012-64-shippable/opt
         worker-type: b-win2012
         worker:
+            chain-of-trust: true
             max-run-time: 1200
             env:
                 UPLOAD_PATH: "artifacts"
@@ -184,8 +189,9 @@
             job-name: macosx64-profile
         treeherder:
             platform: macosx1014-64-shippable/opt
-        worker-type: t-osx-1014-pgo
+        worker-type: b-osx-1015
         worker:
+            chain-of-trust: true
             max-run-time: 7200
             env:
                 SHELL: "/bin/bash"
diff -Nru firefox-84.0.2+build1/taskcluster/ci/openh264-plugin/kind.yml firefox-85.0+build1/taskcluster/ci/openh264-plugin/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/openh264-plugin/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/openh264-plugin/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -43,11 +43,11 @@
             script: mozharness/scripts/openh264_build.py
             config:
                 - openh264/linux32.py
-            tooltool-downloads: public
         fetches:
             toolchain:
                 - linux64-binutils
                 - linux64-clang
+                - linux64-dump-syms
                 - linux64-nasm
     linux64/opt:
         attributes:
@@ -67,11 +67,11 @@
             script: mozharness/scripts/openh264_build.py
             config:
                 - openh264/linux64.py
-            tooltool-downloads: public
         fetches:
             toolchain:
                 - linux64-binutils
                 - linux64-clang
+                - linux64-dump-syms
                 - linux64-nasm
     macosx64/opt:
         attributes:
@@ -96,6 +96,31 @@
             toolchain:
                 - linux64-cctools-port
                 - linux64-clang
+                - linux64-dump-syms
+    macosx64-aarch64/opt:
+        attributes:
+            build_platform: macosx64-aarch64
+            build_type: opt
+        treeherder:
+            platform: macosx64-aarch64/opt
+        worker-type: b-linux
+        worker:
+            max-run-time: 1800
+            artifacts:
+                - name: private/openh264
+                  path: /builds/worker/workspace/openh264/artifacts
+                  type: directory
+        run:
+            using: mozharness
+            script: mozharness/scripts/openh264_build.py
+            config:
+                - openh264/macosx64-aarch64.py
+        fetches:
+            toolchain:
+                - linux64-cctools-port
+                - linux64-clang
+                - linux64-dump-syms
+                - macosx64-sdk-11.0
     win32/opt:
         attributes:
             build_platform: win32
@@ -118,6 +143,7 @@
         fetches:
             toolchain:
                 - win64-clang-cl
+                - win64-dump-syms
     win64/opt:
         attributes:
             build_platform: win64
@@ -140,6 +166,7 @@
         fetches:
             toolchain:
                 - win64-clang-cl
+                - win64-dump-syms
     win64-aarch64/opt:
         attributes:
             build_platform: win64-aarch64
@@ -162,3 +189,4 @@
         fetches:
             toolchain:
                 - win64-clang-cl
+                - win64-dump-syms
diff -Nru firefox-84.0.2+build1/taskcluster/ci/packages/kind.yml firefox-85.0+build1/taskcluster/ci/packages/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/packages/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/packages/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -141,26 +141,12 @@
         description: "Valgrind for Debian jessie"
         treeherder:
             symbol: Deb8(valgrind)
-        worker:
-            env:
-                VERSION: 3.16.1
-                COMMIT: 24f63fd435e7bdab5058f2ab52953eb53a768010
         run:
             using: debian-package
             dsc:
-                url: http://snapshot.debian.org/archive/debian/20190714T155055Z/pool/main/v/valgrind/valgrind_3.15.0-1.dsc
-                sha256: 2bd467ec486302060ed4e91452231b2c0a09afcd51c25d4ba8d3028218328681
-            packages:
-                - deb8-git
+                url: http://snapshot.debian.org/archive/debian/20200628T204444Z/pool/main/v/valgrind/valgrind_3.16.1-1.dsc
+                sha256: bd9b1bf5454da3d93d2dfab8de44df0c3aebe0371022c4f00aef6850aa0b4e07
             patch: valgrind-jessie.diff
-            pre-build-command: >-
-                git clone -n git://sourceware.org/git/valgrind.git ../valgrind-git &&
-                git -C ../valgrind-git archive --format=tar --prefix=valgrind-$VERSION/ $COMMIT | bzip2 > ../valgrind_$VERSION.orig.tar.bz2 &&
-                tar -C .. -jxf ../valgrind_$VERSION.orig.tar.bz2 &&
-                cp -r debian ../valgrind-$VERSION &&
-                cd ../valgrind-$VERSION &&
-                sed -i '/07_fix-spelling-in-binary.patch/d;/08_fix-spelling-in-manpage.patch/d;/11_arm64-cache-flush.patch/d' debian/patches/series &&
-                debchange -v 1:$VERSION-1.deb8moz1 --distribution jessie "Mozilla backport of 3.16.1." < /dev/null
 
     deb8-dh-python:
         description: "dh-python for Debian jessie"
@@ -207,6 +193,20 @@
                 sha256: 9727dcb3d6b655e4f2a92110f5db076a490aa50b739804be239905ecff3aacc8
             patch: gdb-jessie.diff
 
+    deb8-python-psutil:
+        description: "python-psutil rebuild for python 3.6 in Debian jessie"
+        treeherder:
+            symbol: Deb8(python-psutil)
+        run:
+            using: debian-package
+            dsc:
+                url: http://snapshot.debian.org/archive/debian/20150815T034233Z/pool/main/p/python-psutil/python-psutil_2.2.1-3.dsc
+                sha256: b47d1fc92094dfd5525cff7d0af5855f7c5335ade9de4c0e738ed490aa5bee7c
+            packages:
+                - deb8-dh-python
+                - deb8-python3.6
+                - deb8-python3-defaults
+
     deb8-python-zstandard:
         description: "python-zstandard for Debian jessie"
         treeherder:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/perftest/android.yml firefox-85.0+build1/taskcluster/ci/perftest/android.yml
--- firefox-84.0.2+build1/taskcluster/ci/perftest/android.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/perftest/android.yml	2021-01-18 19:58:19.000000000 +0000
@@ -159,7 +159,7 @@
         symbol: perftest(main-fenix)
     platform: android-hw-g5-7-0-arm7-api-16/opt
     attributes:
-        cron: true
+        cron: false
     run:
         command: >-
             mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
@@ -191,7 +191,7 @@
         symbol: perftest(main-fenix)
     platform: android-hw-p2-8-0-android-aarch64/opt
     attributes:
-        cron: true
+        cron: false
     run:
         command: >-
             mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
diff -Nru firefox-84.0.2+build1/taskcluster/ci/perftest/linux.yml firefox-85.0+build1/taskcluster/ci/perftest/linux.yml
--- firefox-84.0.2+build1/taskcluster/ci/perftest/linux.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/perftest/linux.yml	2021-01-18 19:58:19.000000000 +0000
@@ -182,3 +182,27 @@
             --perfherder-simplify-names
             --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
             --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.8 python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox-bin
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
diff -Nru firefox-84.0.2+build1/taskcluster/ci/perftest/macosx.yml firefox-85.0+build1/taskcluster/ci/perftest/macosx.yml
--- firefox-84.0.2+build1/taskcluster/ci/perftest/macosx.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/perftest/macosx.yml	2021-01-18 19:58:19.000000000 +0000
@@ -18,6 +18,8 @@
     platform: macosx64-shippable/opt
     require-build:
         macosx64-shippable/opt: build-macosx64-shippable/opt
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
 
 try-xpcshell:
     description: Run ./mach perftest on macOs
@@ -189,3 +191,29 @@
             --perfherder-simplify-names
             --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
             --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3 -m venv . &&
+            python3 python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/target.dmg
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/bin/node
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver
+            --output $MOZ_FETCHES_DIR/../artifacts
diff -Nru firefox-84.0.2+build1/taskcluster/ci/perftest/windows.yml firefox-85.0+build1/taskcluster/ci/perftest/windows.yml
--- firefox-84.0.2+build1/taskcluster/ci/perftest/windows.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/perftest/windows.yml	2021-01-18 19:58:19.000000000 +0000
@@ -14,6 +14,8 @@
     platform: win64-shippable/opt
     require-build:
         win64-shippable/opt: build-win64-shippable/opt
+    scopes:
+        - secrets:get:project/releng/gecko/build/level-{level}/conditioned-profiles
 
 try-browsertime:
     description: Run ./mach perftest on windows
@@ -138,4 +140,29 @@
             --perfherder-simplify-names
             --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
             --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
+            --output $MOZ_FETCHES_DIR/../artifacts
+
+controlled:
+    description: Controlled performance testing
+    treeherder:
+        symbol: perftest(controlled)
+    attributes:
+        batch: false
+        cron: true
+    run:
+        command: >-
+            mkdir -p $MOZ_FETCHES_DIR/../artifacts &&
+            cd $MOZ_FETCHES_DIR &&
+            python3.exe python/mozperftest/mozperftest/runner.py
+            netwerk/test/perf/perftest_http3_controlled.js
+            --browsertime-binary ${MOZ_FETCHES_DIR}/firefox/firefox.exe
+            --browsertime-iterations 1
+            --browsertime-cycles 96
+            --hooks netwerk/test/perf/hooks_throttling.py
+            --flavor desktop-browser
+            --perfherder
+            --perfherder-metrics name:navigationTiming,unit:ms name:pageTimings,unit:ms name:resources,unit:ms name:firstPaint,unit:ms name:timeToContentfulPaint,unit:ms
+            --perfherder-simplify-names
+            --browsertime-geckodriver ${MOZ_FETCHES_DIR}/geckodriver.exe
+            --browsertime-node ${MOZ_FETCHES_DIR}/node/node.exe
             --output $MOZ_FETCHES_DIR/../artifacts
diff -Nru firefox-84.0.2+build1/taskcluster/ci/post-update-verify-dummy/kind.yml firefox-85.0+build1/taskcluster/ci/post-update-verify-dummy/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/post-update-verify-dummy/kind.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/post-update-verify-dummy/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,21 @@
+# 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/.
+---
+loader: taskgraph.loader.single_dep:loader
+
+transforms:
+    - taskgraph.transforms.per_platform_dummy:transforms
+    - taskgraph.transforms.reverse_chunk_deps:transforms
+    - taskgraph.transforms.task:transforms
+
+kind-dependencies:
+    - release-update-verify
+
+job-template:
+    description: Dummy task to deal with max_dependencies
+    run-on-projects: []
+    shipping-phase: promote
+    worker-type: succeed
+    worker:
+        implementation: succeed
diff -Nru firefox-84.0.2+build1/taskcluster/ci/release-beetmover-push-to-release/kind.yml firefox-85.0+build1/taskcluster/ci/release-beetmover-push-to-release/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/release-beetmover-push-to-release/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/release-beetmover-push-to-release/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -11,7 +11,7 @@
 
 kind-dependencies:
     - release-generate-checksums-beetmover
-    - release-update-verify
+    - post-update-verify-dummy
 
 job-defaults:
     run-on-projects: []
diff -Nru firefox-84.0.2+build1/taskcluster/ci/release-update-verify/kind.yml firefox-85.0+build1/taskcluster/ci/release-update-verify/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/release-update-verify/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/release-update-verify/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -73,6 +73,8 @@
         shipping-product: firefox
         attributes:
             build_platform: macosx64-shippable
+        extra:
+            chunks: 30
 
     devedition-linux64:
         description: linux64 update verify
@@ -109,3 +111,5 @@
         shipping-product: devedition
         attributes:
             build_platform: macosx64-devedition
+        extra:
+            chunks: 30
diff -Nru firefox-84.0.2+build1/taskcluster/ci/source-test/clang.yml firefox-85.0+build1/taskcluster/ci/source-test/clang.yml
--- firefox-84.0.2+build1/taskcluster/ci/source-test/clang.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/source-test/clang.yml	2021-01-18 19:58:19.000000000 +0000
@@ -93,7 +93,7 @@
             ./mach --log-no-times static-analysis check --checks="-*,mozilla-civet-*" --outgoing --output $HOME/clang-tidy.json --format json
     fetches:
         toolchain:
-            - linux-clang-tidy-external
+            - linux64-clang-tidy-external
     worker:
         artifacts:
             - type: file
diff -Nru firefox-84.0.2+build1/taskcluster/ci/source-test/remote.yml firefox-85.0+build1/taskcluster/ci/source-test/remote.yml
--- firefox-84.0.2+build1/taskcluster/ci/source-test/remote.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/source-test/remote.yml	2021-01-18 19:58:19.000000000 +0000
@@ -32,6 +32,8 @@
             - type: file
               name: public/remote/pup_raw.log
               path: /builds/worker/pup_raw.log
+    optimization:
+        skip-unless-expanded: null
 
 puppeteer:
     description: Puppeteer tests against Firefox CDP-based remote protocol
diff -Nru firefox-84.0.2+build1/taskcluster/ci/spidermonkey/linux.yml firefox-85.0+build1/taskcluster/ci/spidermonkey/linux.yml
--- firefox-84.0.2+build1/taskcluster/ci/spidermonkey/linux.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/spidermonkey/linux.yml	2021-01-18 19:58:19.000000000 +0000
@@ -70,16 +70,6 @@
     run:
         spidermonkey-variant: plain
 
-sm-nowarp-linux64/debug:
-    description: "Spidermonkey No Warp"
-    index:
-        job-name: sm-plain-linux64-nowarp
-    treeherder:
-        platform: linux64/debug
-        symbol: SM(nowarp)
-    run:
-        spidermonkey-variant: nowarpdebug
-
 sm-smoosh-linux64/debug:
     description: "Spidermonkey SmooshMonkey"
     index:
@@ -118,18 +108,6 @@
             - linux64-dump-syms
     run-on-projects: ['mozilla-central']
 
-sm-warp-linux64/debug:
-    description: "Spidermonkey WarpBuilder"
-    index:
-        job-name: sm-warp-linux64-debug
-    treeherder:
-        platform: linux64/debug
-        symbol: SM(warp)
-        tier: 2
-    run:
-        spidermonkey-variant: warpdebug
-    run-on-projects: ['mozilla-central']
-
 sm-nojit-linux64/opt:
     description: "Spidermonkey no JIT"
     index:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/awsy.yml firefox-85.0+build1/taskcluster/ci/test/awsy.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/awsy.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/awsy.yml	2021-01-18 19:58:19.000000000 +0000
@@ -31,7 +31,8 @@
     run-on-projects:
         by-test-platform:
             .*-devedition/.*: []  # don't run on devedition
-            (linux|win|mac)(?!.*shippable).*/opt: []
+            windows7-32.*/opt: []
+            (linux|windows10|mac)(?!.*shippable).*/opt: []
             default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
     test-manifest-loader: null  # don't load tests in the taskgraph
     fission-run-on-projects:
@@ -53,7 +54,8 @@
         by-test-platform:
             .*-ccov.*/.*: []  # don't run on coverage
             .*-devedition/.*: []  # don't run on devedition
-            (linux|win|mac)(?!.*shippable)(?!.*ccov).*/opt: []
+            windows7-32.*/opt: []
+            (linux|windows10|mac)(?!.*shippable)(?!.*ccov).*/opt: []
             default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
     mozharness:
         extra-options:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/browsertime-mobile.yml firefox-85.0+build1/taskcluster/ci/test/browsertime-mobile.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/browsertime-mobile.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/browsertime-mobile.yml	2021-01-18 19:58:19.000000000 +0000
@@ -68,6 +68,7 @@
             - --browsertime
             # Bug 1635749, disable window recorder temporarily
             - --browsertime-no-ffwindowrecorder
+            - --no-conditioned-profile
     optimization:
         skip-unless-backstop: null
     variants:
@@ -336,6 +337,7 @@
                 - youtube
                 - [youtube-watch, youtube-w]
     apps: ["fenix", "chrome-m", "geckoview"]
+    run-on-projects: []
     webrender-run-on-projects:
         by-app:
             geckoview:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/misc.yml firefox-85.0+build1/taskcluster/ci/test/misc.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/misc.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/misc.yml	2021-01-18 19:58:19.000000000 +0000
@@ -8,7 +8,7 @@
 geckoview-junit:
     description: "Geckoview junit run"
     suite: geckoview-junit
-    variants: ["geckoview-e10s-single", "geckoview-fission"]
+    variants: ["geckoview-e10s-multi", "geckoview-fission"]
     treeherder-symbol: gv-junit
     loopback-video: true
     e10s: true
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/mochitest.yml firefox-85.0+build1/taskcluster/ci/test/mochitest.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/mochitest.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/mochitest.yml	2021-01-18 19:58:19.000000000 +0000
@@ -555,7 +555,8 @@
         by-test-platform:
             .*mingw.*: ["release"]
             .*shippable.*: ["mozilla-central"]
-            default: ["trunk"]
+            (!-shippable).*-qr.*: ["trunk"]
+            default: []
     tier: default
     max-run-time:
         by-test-platform:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/raptor.yml firefox-85.0+build1/taskcluster/ci/test/raptor.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/raptor.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/raptor.yml	2021-01-18 19:58:19.000000000 +0000
@@ -25,21 +25,24 @@
                         by-pageload:
                             warm:
                                 by-test-platform:
-                                    (linux|windows|macos)(?!.*shippable).*: []
+                                    windows7-32.*/opt: []
+                                    (linux|windows10|macos)(?!.*shippable).*: []
                                     linux.*shippable.*: []
                                     macos.*shippable.*: []
                                     default: ["mozilla-central"]
                             cold:
                                 by-test-platform:
+                                    windows7-32.*/opt: []
                                     macosx.*64(?:-qr)?/opt: ["mozilla-central"]
-                                    (linux|windows|macos)(?!.*shippable).*: []
+                                    (linux|windows10|macos)(?!.*shippable).*: []
                                     linux.*shippable.*: []
                                     macos.*shippable.*: []
                                     default: ["trunk", "mozilla-beta"]
                     default:
                         by-test-platform:
+                            windows7-32.*/opt: []
                             macosx.*64(?:-qr)?/opt: ["mozilla-central"]
-                            (linux|windows|macos)(?!.*shippable).*: []
+                            (linux|windows10|macos)(?!.*shippable).*: []
                             default: ["trunk", "mozilla-beta"]
             chrome: []
             chromium: []
@@ -47,12 +50,14 @@
                 by-test-name:
                     raptor-.*-profiling.*:
                         by-test-platform:
-                            (linux|windows|macos)(?!.*shippable).*: []
+                            windows7-32.*/opt: []
+                            (linux|windows10|macos)(?!.*shippable).*: []
                             default: ["mozilla-central"]
                     default:
                         by-test-platform:
+                            windows7-32.*/opt: []
                             macosx.*64(?:-qr)?/opt: ["mozilla-central"]
-                            (linux|windows|macos)(?!.*shippable).*: []
+                            (linux|windows10|macos)(?!.*shippable).*: []
                             default: ["trunk", "mozilla-beta"]
     limit-platforms:
         by-app:
@@ -220,12 +225,14 @@
         by-pageload:
             warm:
                 by-test-platform:
-                    (linux|windows|macos)(?!.*shippable).*: []
+                    windows7-32.*/opt: []
+                    (linux|windows10|macos)(?!.*shippable).*: []
                     default: ["mozilla-central"]
             cold:
                 by-test-platform:
+                    windows7-32.*/opt: []
                     macosx.*64(?:-qr)?/opt: ["mozilla-central"]
-                    (linux|windows|macos)(?!.*shippable).*: []
+                    (linux|windows10|macos)(?!.*shippable).*: []
                     default: ["mozilla-central", "autoland"]
     tier: 2
     mozharness:
@@ -612,8 +619,9 @@
     treeherder-symbol: Rap(ytp-h264-sfr)
     run-on-projects:
         by-test-platform:
+            windows7-32.*/opt: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time:
         by-test-platform:
@@ -630,8 +638,9 @@
     treeherder-symbol: Rap(ytp-hfr)
     run-on-projects:
         by-test-platform:
+            windows7-32.*/opt: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time: 3600
     tier: 2
@@ -646,8 +655,9 @@
     treeherder-symbol: Rap(ytp-vp9-sfr)
     run-on-projects:
         by-test-platform:
+            windows7-32.*/opt: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time:
         by-test-platform:
@@ -666,8 +676,9 @@
     treeherder-symbol: Rap(ytp-widevine-hfr)
     run-on-projects:
         by-test-platform:
+            windows7-32.*/opt: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time:
         by-test-platform:
@@ -684,8 +695,9 @@
     treeherder-symbol: Rap(ytp-widevine-h264-sfr)
     run-on-projects:
         by-test-platform:
+            windows7-32.*/opt: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time:
         by-test-platform:
@@ -743,7 +755,8 @@
     treeherder-symbol: Rap(js2)
     run-on-projects:
         by-test-platform:
-            (linux|windows|macos)(?!.*shippable).*: []
+            windows7-32.*/opt: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     tier: 3
     max-run-time: 8000
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/talos.yml firefox-85.0+build1/taskcluster/ci/test/talos.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/talos.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/talos.yml	2021-01-18 19:58:19.000000000 +0000
@@ -35,13 +35,15 @@
         by-test-name:
             talos-.*-profiling:
                 by-test-platform:
-                    (linux|windows|macos)(?!.*shippable).*: []
+                    windows7-32.*: []
+                    (linux|windows10|macos)(?!.*shippable).*: []
                     .*(?:shippable-qr).*: []
-                    windows.*(?!shippable-qr)shippable.*: []
+                    windows10.*(?!shippable-qr)shippable.*: []
                     default: ['mozilla-central']
             default:
                 by-test-platform:
-                    (linux|windows|macos)(?!.*shippable).*: []
+                    windows7-32.*: []
+                    (linux|windows10|macos)(?!.*shippable).*: []
                     default: ['mozilla-beta', 'trunk']
     fission-run-on-projects:
         by-test-platform:
@@ -54,15 +56,16 @@
     treeherder-symbol: T(bcv)
     variants:
         by-test-platform:
-            (linux64|windows|macos).*-qr.*: ['fission', 'webrender-sw']
+            (linux64|windows10|macos).*-qr.*: ['fission', 'webrender-sw']
             default: ['fission']
     run-on-projects:
         by-test-platform:
-            .*(?:shippable-qr|-qr)/.*:
+            .(linux|windows10|macos)(?:shippable-qr|-qr)/.*:
                 by-variant:
                     webrender-sw: ['trunk']
                     default: []
-            (linux|windows|macos)(?!.*shippable)(?!.*-qr).*: []
+            windows7-32.*: []
+            (linux|windows10|macos)(?!.*shippable)(?!.*-qr).*: []
             default: ['mozilla-beta', 'trunk']
     max-run-time: 1800
     mozharness:
@@ -76,8 +79,9 @@
     tier: 2
     run-on-projects:
         by-test-platform:
+            windows7-32.*: []
             .*(?:shippable-qr|-qr)/.*: []
-            (linux|windows|macos)(?!.*shippable)(?!.*-qr).*: []
+            (linux|windows10|macos)(?!.*shippable)(?!.*-qr).*: []
             windows10-64-shippable/opt: []
             default: ['mozilla-central']
     max-run-time: 1800
@@ -177,7 +181,8 @@
     tier: 3
     run-on-projects:
         by-test-platform:
-            (linux|windows|macos)(?!.*shippable).*: []
+            windows7-32.*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time: 1800
     mozharness:
@@ -191,7 +196,8 @@
     tier: 3
     run-on-projects:
         by-test-platform:
-            (linux|windows|macos)(?!.*shippable).*: []
+            windows7-32.*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time: 1800
     mozharness:
@@ -259,12 +265,14 @@
     treeherder-symbol: T(g4)
     variants:
         by-test-platform:
-            (linux64|windows|macos).*-qr.*: ['fission', 'webrender-sw']
+            windows7-32.*: []
+            (linux64|windows10|macos).*-qr.*: ['fission', 'webrender-sw']
             default: ['fission']
     run-on-projects:
         by-test-platform:
+            windows7-32.*: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-beta', 'trunk']
     max-run-time:
         by-test-platform:
@@ -410,7 +418,8 @@
             default: ['fission']
     run-on-projects:
         by-test-platform:
-            (linux|windows|macos)(?!.*shippable).*: []
+            windows7-32.*/opt: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-central']
     max-run-time: 1500
     mozharness:
@@ -552,13 +561,15 @@
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
-            (linux64|windows|macos).*-qr.*: ['webgl-ipc', 'webrender-sw']
+            windows7-32.*: []
+            (linux64|windows10|macos).*-qr.*: ['webgl-ipc', 'webrender-sw']
             windows10-64-ccov-qr/opt: []
             default: ['webgl-ipc']
     run-on-projects:
         by-test-platform:
+            windows7-32.*: []
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
-            (linux|windows|macos)(?!.*shippable).*: []
+            (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-beta', 'trunk']
     max-run-time: 1800
     mozharness:
@@ -575,6 +586,7 @@
         by-test-platform:
             .*-ccov.*/.*: []
             android.*: []
+            windows7-32.*: []
             default: ['webgl-ipc']
     max-run-time: 1800
     mozharness:
@@ -598,7 +610,7 @@
             default: ['fission']
     run-on-projects:
         by-test-platform:
-            windows7-32-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk']
+            windows7-32-shippable(?:-qr)?/.*: []
             windows10-64-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk']
             default: []
     tier:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/test-platforms.yml firefox-85.0+build1/taskcluster/ci/test/test-platforms.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/test-platforms.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/test-platforms.yml	2021-01-18 19:58:19.000000000 +0000
@@ -212,14 +212,14 @@
 
 # win7 qr builds for try purposes
 windows7-32-qr/debug:
-    build-platform: win64/debug
+    build-platform: win32/debug
     test-sets:
         - mochitest-webgpu
         - windows-qr-tests
         - web-platform-tests
 
 windows7-32-qr/opt:
-    build-platform: win64/opt
+    build-platform: win32/opt
     test-sets:
         - awsy
         - windows-qr-tests
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/test-sets.yml firefox-85.0+build1/taskcluster/ci/test/test-sets.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/test-sets.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/test-sets.yml	2021-01-18 19:58:19.000000000 +0000
@@ -551,6 +551,7 @@
     - browsertime-unity-webgl-mobile
 
 linux-tsan-tests:
+    - mochitest-browser-chrome
     - mochitest-media
     - mochitest-plain
     - xpcshell
diff -Nru firefox-84.0.2+build1/taskcluster/ci/test/web-platform.yml firefox-85.0+build1/taskcluster/ci/test/web-platform.yml
--- firefox-84.0.2+build1/taskcluster/ci/test/web-platform.yml	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/test/web-platform.yml	2021-01-18 19:58:19.000000000 +0000
@@ -78,7 +78,8 @@
     run-on-projects:
         by-test-platform:
             linux1804-32-shippable/opt: ['release']  # skip integration, Bug 1599197
-            .*-qr/.*: ['release']  # skip on integration branches due to high load
+            linux.*-qr/.*: ['release']  # skip on integration branches due to high load
+            windows.*-qr/.*: ['release']  # skip on integration branches due to high load
             default: built-projects
     mozharness:
         chunked: true
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/clang-tidy-external.yml firefox-85.0+build1/taskcluster/ci/toolchain/clang-tidy-external.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/clang-tidy-external.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/clang-tidy-external.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +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/.
----
-job-defaults:
-    description: "Clang-tidy build"
-    attributes:
-        local-toolchain: true
-    index:
-        product: static-analysis
-    worker-type: b-linux-large
-    worker:
-        max-run-time: 3600
-    run:
-        toolchain-artifact: public/build/clang-tidy.tar.zst
-        resources:
-            - 'build/clang-plugin/**/*.cpp'
-            - 'build/clang-plugin/**/*.h'
-            - 'build/clang-plugin/*.inc'
-            - 'build/clang-plugin/*.py'
-            - 'build/clang-plugin/moz.build'
-            - 'build/clang-plugin/Makefile.in'
-            - 'build/build-clang/build-clang.py'
-    fetches:
-        fetch:
-            - clang-10
-
-linux-clang-tidy-external:
-    attributes:
-        local-toolchain: false
-    index:
-        job-name: linux-clang-tidy-external
-    treeherder:
-        symbol: TL(linux-clang-tidy-external)
-    worker:
-        artifacts:
-            - name: project/civet/clang-tidy.tar.zst
-              path: /builds/worker/private-artifacts/clang-tidy.tar.zst
-              type: file
-    run:
-        toolchain-artifact: project/civet/clang-tidy.tar.zst
-        script: build-clang-tidy-external.sh
-        arguments:
-            - 'build/build-clang/clang-tidy-external-linux64.json'
-        resources:
-            - 'build/build-clang/clang-tidy-external-linux64.json'
-    run-on-projects: []
-    fetches:
-        fetch:
-            - civet-source
-        toolchain:
-            - linux64-binutils
-            - linux64-gcc-7
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/clang-tidy.yml firefox-85.0+build1/taskcluster/ci/toolchain/clang-tidy.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/clang-tidy.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/clang-tidy.yml	2021-01-18 19:58:19.000000000 +0000
@@ -23,7 +23,7 @@
             - 'build/build-clang/build-clang.py'
     fetches:
         fetch:
-            - clang-10
+            - clang-11
 
 linux64-clang-tidy:
     index:
@@ -66,8 +66,8 @@
     fetches:
         toolchain:
             - linux64-binutils
-            - linux64-cctools-port-clang-10
-            - linux64-clang-10
+            - linux64-cctools-port-clang-11
+            - linux64-clang-11-macosx-cross
             - linux64-gcc-7
             - linux64-node
 
@@ -96,3 +96,30 @@
         fetch:
             - cmake
             - ninja
+
+linux64-clang-tidy-external:
+    attributes:
+        local-toolchain: false
+    index:
+        job-name: linux64-clang-tidy-external
+    treeherder:
+        symbol: TL(clang-tidy-e)
+    worker:
+        artifacts:
+            - name: project/civet/clang-tidy.tar.zst
+              path: /builds/worker/private-artifacts/clang-tidy.tar.zst
+              type: file
+    run:
+        toolchain-artifact: project/civet/clang-tidy.tar.zst
+        script: build-clang-tidy-external.sh
+        arguments:
+            - 'build/build-clang/clang-tidy-external-linux64.json'
+        resources:
+            - 'build/build-clang/clang-tidy-external-linux64.json'
+    run-on-projects: []
+    fetches:
+        fetch:
+            - civet-source
+        toolchain:
+            - linux64-binutils
+            - linux64-gcc-7
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/clang.yml firefox-85.0+build1/taskcluster/ci/toolchain/clang.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/clang.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/clang.yml	2021-01-18 19:58:19.000000000 +0000
@@ -445,7 +445,7 @@
     worker:
         max-run-time: 3600
         env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng-12.manifest"
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run-on-projects:
         - trunk
     run:
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/dump-syms.yml firefox-85.0+build1/taskcluster/ci/toolchain/dump-syms.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/dump-syms.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/dump-syms.yml	2021-01-18 19:58:19.000000000 +0000
@@ -25,7 +25,7 @@
         toolchain:
             - linux64-binutils
             - linux64-clang-9
-            - linux64-rust
+            - linux64-rust-1.47
 
 macosx64-dump-syms:
     treeherder:
@@ -42,7 +42,7 @@
         toolchain-artifact: public/build/dump_syms.tar.xz
     fetches:
         toolchain:
-            - linux64-rust-macos
+            - linux64-rust-macos-1.47
             - linux64-clang-9
             - linux64-cctools-port-clang-9
             - linux64-llvm-dsymutil
@@ -62,4 +62,4 @@
         tooltool-downloads: internal
     fetches:
         toolchain:
-            - win64-rust
+            - win64-rust-1.47
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/fix-stacks.yml firefox-85.0+build1/taskcluster/ci/toolchain/fix-stacks.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/fix-stacks.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/fix-stacks.yml	2021-01-18 19:58:19.000000000 +0000
@@ -27,7 +27,7 @@
         toolchain:
             - linux64-binutils
             - linux64-clang-9
-            - linux64-rust
+            - linux64-rust-1.47
 
 macosx64-fix-stacks:
     treeherder:
@@ -45,7 +45,7 @@
         toolchain:
             - linux64-cctools-port-clang-9
             - linux64-clang-9
-            - linux64-rust-macos
+            - linux64-rust-macos-1.47
 
 win32-fix-stacks:
     treeherder:
@@ -63,4 +63,4 @@
         toolchain:
             - linux64-clang-9
             - linux64-liblowercase
-            - linux64-rust-windows
+            - linux64-rust-windows-1.47
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/kind.yml firefox-85.0+build1/taskcluster/ci/toolchain/kind.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/kind.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/kind.yml	2021-01-18 19:58:19.000000000 +0000
@@ -27,7 +27,6 @@
     - cbindgen.yml
     - cctools-port.yml
     - clang-tidy.yml
-    - clang-tidy-external.yml
     - clang.yml
     - dump-syms.yml
     - fix-stacks.yml
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/minidump_stackwalk.yml firefox-85.0+build1/taskcluster/ci/toolchain/minidump_stackwalk.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/minidump_stackwalk.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/minidump_stackwalk.yml	2021-01-18 19:58:19.000000000 +0000
@@ -15,7 +15,6 @@
         resources:
             - 'build/moz.configure'
             - 'config/external/zlib'
-            - 'mfbt'
             - 'moz.configure'
             - 'toolkit/crashreporter'
             - 'toolkit/crashreporter/google-breakpad/src/common'
@@ -31,7 +30,7 @@
         symbol: TL(stackwalk)
     fetches:
         toolchain:
-            - linux64-clang-9
+            - linux64-clang-11
             - linux64-binutils
             - linux64-rust-1.47
 
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/misc.yml firefox-85.0+build1/taskcluster/ci/toolchain/misc.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/misc.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/misc.yml	2021-01-18 19:58:19.000000000 +0000
@@ -92,7 +92,6 @@
         toolchain-artifact: public/build/mar-tools.tar.xz
         resources:
             - build/moz.configure
-            - mfbt
             - modules/libmar/
             - moz.configure
             - other-licenses/bsdiff/
@@ -197,7 +196,7 @@
         fetch:
             - android-rs-glue
         toolchain:
-            - linux64-rust-1.43  # whatever m-c is built with
+            - linux64-rust-1.47  # whatever m-c is built with
 
 wgpu-deps:
     description: "Downloads all the crates needed for testing wgpu"
@@ -215,7 +214,7 @@
         fetch:
             - android-rs-glue
         toolchain:
-            - linux64-rust-1.43  # whatever m-c is built with
+            - linux64-rust-1.47  # whatever m-c is built with
 
 linux64-lucetc:
     description: "lucetc build process"
@@ -355,7 +354,7 @@
     run:
         script: pack.sh
         arguments:
-            - /Applications/Xcode-12.2.Release.Candidate.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
+            - /Applications/Xcode-12.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk
         toolchain-artifact: project/gecko/mac-sdk/MacOSX11.0.sdk.tar.zst
     # Expiry similar to that of fetches
     expires-after: 1000 years
diff -Nru firefox-84.0.2+build1/taskcluster/ci/toolchain/rust.yml firefox-85.0+build1/taskcluster/ci/toolchain/rust.yml
--- firefox-84.0.2+build1/taskcluster/ci/toolchain/rust.yml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/ci/toolchain/rust.yml	2021-01-18 19:58:19.000000000 +0000
@@ -11,24 +11,28 @@
         script: repack_rust.py
         toolchain-artifact: public/build/rustc.tar.zst
 
-linux64-rust-1.43:
+linux64-rust-1.47:
     treeherder:
-        symbol: TL(rust-1.43)
+        symbol: TL(rust-1.47)
     run:
         arguments: [
-            '--channel', '1.43.0',
+            '--channel', '1.47.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'aarch64-unknown-linux-gnu',
+            '--compiler-builtins-hack',
         ]
+    fetches:
+        toolchain:
+            - linux64-clang
 
-linux64-rust-1.47:
+linux64-rust-1.48:
     treeherder:
         symbol: TL(rust)
     run:
         arguments: [
-            '--channel', '1.47.0',
+            '--channel', '1.48.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -48,19 +52,40 @@
         arguments: [
             # Last nightly with version 1.48.0. See bug #1672094 why
             # we're using this rather than the first with version 1.48.0.
-            '--channel', 'nightly-2020-10-03',
+            '--channel', 'nightly-2020-11-14',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
         ]
 
-linux64-rust-cross-1.47:
+linux64-rust-dev:
+    description: "build rust from source"
+    worker-type: b-linux-large
+    treeherder:
+        symbol: TL(rust-dev)
+    run:
+        arguments: [
+            '--patch', 'example.patch',
+            '--channel', 'dev',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--compiler-builtins-hack',
+        ]
+    fetches:
+        fetch:
+            - rust-1.47.0-dev
+        toolchain:
+            - linux64-clang
+            - linux64-binutils
+
+
+linux64-rust-cross-1.48:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.47.0',
+            '--channel', '1.48.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -88,7 +113,7 @@
 linux64-rust-macos-1.47:
     description: "rust repack with macos-cross support"
     treeherder:
-        symbol: TL(rust-macos)
+        symbol: TL(rust-macos-1.47)
     run:
         arguments: [
             '--channel', '1.47.0',
@@ -96,28 +121,40 @@
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
+
+linux64-rust-macos-1.48:
+    description: "rust repack with macos-cross support"
+    treeherder:
+        symbol: TL(rust-macos)
+    run:
+        arguments: [
+            '--channel', '1.48.0',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-apple-darwin',
+        ]
         toolchain-alias: linux64-rust-macos
 
-linux64-rust-macos-beta:
+linux64-rust-macos-1.49:
     description: "rust repack with macos-cross support"
     treeherder:
-        symbol: TL(rust-macos-beta)
+        symbol: TL(rust-macos-1.49)
     run:
         arguments: [
-            '--channel', 'beta-2020-11-26',
+            '--channel', '1.49.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
             '--target', 'aarch64-apple-darwin',
         ]
 
-linux64-rust-android-1.47:
+linux64-rust-android-1.48:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.47.0',
+            '--channel', '1.48.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -135,7 +172,7 @@
 linux64-rust-windows-1.47:
     description: "rust repack with windows-cross support"
     treeherder:
-        symbol: TL(rust-win)
+        symbol: TL(rust-win-1.47)
     run:
         arguments: [
             '--channel', '1.47.0',
@@ -144,11 +181,24 @@
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
+
+linux64-rust-windows-1.48:
+    description: "rust repack with windows-cross support"
+    treeherder:
+        symbol: TL(rust-win)
+    run:
+        arguments: [
+            '--channel', '1.48.0',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-pc-windows-msvc',
+            '--target', 'i686-pc-windows-msvc',
+        ]
         toolchain-alias: linux64-rust-windows
 
 win64-rust-1.47:
     treeherder:
-        symbol: TW64(rust)
+        symbol: TW64(rust-1.47)
     run:
         arguments: [
             '--channel', '1.47.0',
@@ -157,17 +207,53 @@
             '--target', 'i686-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
         ]
+
+win64-rust-1.48:
+    treeherder:
+        symbol: TW64(rust)
+    run:
+        arguments: [
+            '--channel', '1.48.0',
+            '--host', 'x86_64-pc-windows-msvc',
+            '--target', 'x86_64-pc-windows-msvc',
+            '--target', 'i686-pc-windows-msvc',
+            '--target', 'aarch64-pc-windows-msvc',
+        ]
         toolchain-alias: win64-rust
 
+macosx64-rust-1.48:
+    treeherder:
+        symbol: TM(rust)
+    run:
+        arguments: [
+            '--channel', '1.48.0',
+            '--host', 'x86_64-apple-darwin',
+            '--target', 'x86_64-apple-darwin',
+        ]
+        toolchain-alias: macosx64-rust
+
 mingw32-rust-1.47:
     treeherder:
-        symbol: TMW(rust)
+        symbol: TMW(rust-1.47)
     run:
         arguments: [
             '--channel', '1.47.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
+            '--target', 'x86_64-pc-windows-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+        ]
+
+mingw32-rust-1.48:
+    treeherder:
+        symbol: TMW(rust)
+    run:
+        arguments: [
+            '--channel', '1.48.0',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'i686-unknown-linux-gnu',
+            '--target', 'i686-pc-windows-gnu',
             '--target', 'x86_64-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
         ]
diff -Nru firefox-84.0.2+build1/taskcluster/docker/debian-base/Dockerfile firefox-85.0+build1/taskcluster/docker/debian-base/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/debian-base/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/debian-base/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -43,6 +43,8 @@
       python3-minimal \
       python-zstandard \
       python3-zstandard \
+      python-psutil \
+      python3-psutil \
       vim-tiny \
       xz-utils
 
diff -Nru firefox-84.0.2+build1/taskcluster/docker/decision/system-setup.sh firefox-85.0+build1/taskcluster/docker/decision/system-setup.sh
--- firefox-84.0.2+build1/taskcluster/docker/decision/system-setup.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/decision/system-setup.sh	2021-01-18 19:58:19.000000000 +0000
@@ -10,7 +10,9 @@
     python \
     sudo \
     python3 \
-    python3-yaml
+    python3-yaml \
+    python-psutil \
+    python3-psutil
 
 BUILD=/root/build
 mkdir "$BUILD"
diff -Nru firefox-84.0.2+build1/taskcluster/docker/decision/VERSION firefox-85.0+build1/taskcluster/docker/decision/VERSION
--- firefox-84.0.2+build1/taskcluster/docker/decision/VERSION	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/decision/VERSION	2021-01-18 19:58:19.000000000 +0000
@@ -1 +1 @@
-2.2.1
+2.2.2
diff -Nru firefox-84.0.2+build1/taskcluster/docker/firefox-flatpak/Dockerfile firefox-85.0+build1/taskcluster/docker/firefox-flatpak/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/firefox-flatpak/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/firefox-flatpak/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,4 @@
-FROM freedesktopsdk/flatpak:19.08-x86_64
+FROM freedesktopsdk/flatpak:20.08-x86_64
 MAINTAINER release@mozilla.com
 
 RUN mkdir /scripts/
diff -Nru firefox-84.0.2+build1/taskcluster/docker/firefox-flatpak/runme.sh firefox-85.0+build1/taskcluster/docker/firefox-flatpak/runme.sh
--- firefox-84.0.2+build1/taskcluster/docker/firefox-flatpak/runme.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/firefox-flatpak/runme.sh	2021-01-18 19:58:19.000000000 +0000
@@ -25,8 +25,8 @@
 SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TARGET_TAR_XZ_FULL_PATH="$ARTIFACTS_DIR/target.flatpak.tar.xz"
 SOURCE_DEST="${WORKSPACE}/source"
-FREEDESKTOP_VERSION="19.08"
-FIREFOX_BASEAPP_CHANNEL="stable"
+FREEDESKTOP_VERSION="20.08"
+FIREFOX_BASEAPP_CHANNEL="20.08"
 
 
 # XXX: these commands are temporarily, there's an upcoming fix in the upstream Docker image
@@ -75,12 +75,12 @@
 
 flatpak remote-add --user --if-not-exists --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 # XXX: added --user to `flatpak install` to avoid ambiguity
-flatpak install --user -y flathub org.mozilla.Firefox.BaseApp//${FIREFOX_BASEAPP_CHANNEL} --no-deps
+flatpak install --user -y flathub org.mozilla.firefox.BaseApp//${FIREFOX_BASEAPP_CHANNEL} --no-deps
 
 # XXX: this command is temporarily, there's an upcoming fix in the upstream Docker image
 # that we work on top of, from `freedesktopsdk`, that will make these two lines go away eventually
 mkdir -p build
-cp -r ~/.local/share/flatpak/app/org.mozilla.Firefox.BaseApp/current/active/files build/files
+cp -r ~/.local/share/flatpak/app/org.mozilla.firefox.BaseApp/current/active/files build/files
 
 ARCH=$(flatpak --default-arch)
 cat <<EOF > build/metadata
@@ -88,8 +88,7 @@
 name=org.mozilla.firefox
 runtime=org.freedesktop.Platform/${ARCH}/${FREEDESKTOP_VERSION}
 sdk=org.freedesktop.Sdk/${ARCH}/${FREEDESKTOP_VERSION}
-base=app/org.mozilla.Firefox.BaseApp/${ARCH}/${FIREFOX_BASEAPP_CHANNEL}
-
+base=app/org.mozilla.firefox.BaseApp/${ARCH}/${FIREFOX_BASEAPP_CHANNEL}
 [Extension org.mozilla.firefox.Locale]
 directory=share/runtime/langpack
 autodelete=true
diff -Nru firefox-84.0.2+build1/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in firefox-85.0+build1/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in
--- firefox-84.0.2+build1/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/firefox-snap/firefox.snapcraft.yaml.in	2021-01-18 19:58:19.000000000 +0000
@@ -18,6 +18,7 @@
       GTK_USE_PORTAL: 1
     slots:
       - dbus-daemon
+      - mpris
     plugs:
       - avahi-observe
       - browser-sandbox
diff -Nru firefox-84.0.2+build1/taskcluster/docker/mingw32-build/Dockerfile firefox-85.0+build1/taskcluster/docker/mingw32-build/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/mingw32-build/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/mingw32-build/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -27,6 +27,7 @@
       libucl1 \
       libxml2 \
       patch \
+      python3-dev \
       p7zip-full \
       scons \
       tar \
diff -Nru firefox-84.0.2+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh firefox-85.0+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh
--- firefox-84.0.2+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,167 @@
+#!/usr/bin/env bash
+
+set -ve
+
+test "$(whoami)" == 'root'
+
+# To speed up docker image build times as well as number of network/disk I/O
+# build a list of packages to be installed nad call it in one go.
+apt_packages=()
+
+apt_packages+=('autoconf2.13')
+apt_packages+=('bluez-cups')
+apt_packages+=('build-essential')
+apt_packages+=('ca-certificates')
+apt_packages+=('ccache')
+apt_packages+=('compiz')
+apt_packages+=('curl')
+apt_packages+=('fontconfig')
+apt_packages+=('fonts-kacst')
+apt_packages+=('fonts-kacst-one')
+apt_packages+=('fonts-liberation')
+apt_packages+=('fonts-stix')
+apt_packages+=('fonts-unfonts-core')
+apt_packages+=('fonts-unfonts-extra')
+apt_packages+=('fonts-vlgothic')
+apt_packages+=('g++-multilib')
+apt_packages+=('gcc-multilib')
+apt_packages+=('gir1.2-gnomebluetooth-1.0')
+apt_packages+=('git')
+apt_packages+=('gnome-icon-theme')
+apt_packages+=('gstreamer1.0-gtk3')
+apt_packages+=('gstreamer1.0-plugins-base')
+apt_packages+=('gstreamer1.0-plugins-good')
+apt_packages+=('gstreamer1.0-tools')
+apt_packages+=('gstreamer1.0-pulseaudio')
+apt_packages+=('language-pack-en-base')
+apt_packages+=('libc6-dbg')
+apt_packages+=('libasound2-dev')
+apt_packages+=('libavcodec-extra57')
+apt_packages+=('libcanberra-gtk3-module')
+apt_packages+=('libcanberra-pulse')
+apt_packages+=('libcurl4-openssl-dev')
+apt_packages+=('libdbus-1-dev')
+apt_packages+=('libdbus-glib-1-dev')
+apt_packages+=('libfreetype6')
+apt_packages+=('libgconf2-dev')
+apt_packages+=('libgl1-mesa-dri')
+apt_packages+=('libgl1-mesa-glx')
+apt_packages+=('libgstreamer-plugins-base1.0-dev')
+apt_packages+=('libgstreamer1.0-dev')
+apt_packages+=('libgtk2.0-dev')
+apt_packages+=('libgtk-3-0')
+apt_packages+=('libiw-dev')
+apt_packages+=('libx11-xcb1')
+apt_packages+=('libxcb1')
+apt_packages+=('libxcb-render0')
+apt_packages+=('libxcb-shm0')
+apt_packages+=('libxcb-glx0')
+apt_packages+=('libxcb-shape0')
+apt_packages+=('libnotify-dev')
+apt_packages+=('libpulse0')
+apt_packages+=('libpulse-dev')
+apt_packages+=('libxt-dev')
+apt_packages+=('libxxf86vm1')
+apt_packages+=('llvm')
+apt_packages+=('llvm-dev')
+apt_packages+=('llvm-runtime')
+apt_packages+=('mesa-common-dev')
+apt_packages+=('net-tools')
+apt_packages+=('pulseaudio')
+apt_packages+=('pulseaudio-module-bluetooth')
+apt_packages+=('pulseaudio-module-gconf')
+apt_packages+=('python-dev')
+apt_packages+=('python-pip')
+apt_packages+=('python3-pip')
+apt_packages+=('qemu-kvm')
+apt_packages+=('rlwrap')
+apt_packages+=('screen')
+apt_packages+=('software-properties-common')
+apt_packages+=('sudo')
+apt_packages+=('ttf-dejavu')
+apt_packages+=('ubuntu-desktop')
+apt_packages+=('unzip')
+apt_packages+=('uuid')
+apt_packages+=('wget')
+apt_packages+=('xvfb')
+apt_packages+=('xwit')
+apt_packages+=('yasm')
+apt_packages+=('zip')
+
+# xvinfo for test-linux.sh to monitor Xvfb startup
+apt_packages+=('x11-utils')
+
+# Bug 1232407 - this allows the user to start vnc
+apt_packages+=('x11vnc')
+
+# Bug 1176031 - need `xset` to disable screensavers
+apt_packages+=('x11-xserver-utils')
+
+# Build a list of packages to install from the multiverse repo.
+apt_packages+=('ubuntu-restricted-extras')
+
+# APT update takes very long on Ubuntu. Run it at the last possible minute.
+apt-get update
+
+# This allows ubuntu-desktop to be installed without human interaction.
+# Also force the cleanup after installation of packages to reduce image size.
+export DEBIAN_FRONTEND=noninteractive
+apt-get install -y --allow-downgrades -f "${apt_packages[@]}"
+
+# Enable i386 packages
+dpkg --add-architecture i386
+apt-get update
+
+# Make sure we have libraries for 32-bit tests
+apt_packages=()
+apt_packages+=('libavcodec-extra57:i386')
+apt_packages+=('libdbus-glib-1-2:i386')
+apt_packages+=('libpulse0:i386')
+apt_packages+=('libxt6:i386')
+apt_packages+=('libxtst6:i386')
+apt_packages+=('libsecret-1-0:i386')
+apt_packages+=('libgtk2.0-0:i386')
+apt_packages+=('libgtk-3-0:i386')
+apt_packages+=('libx11-xcb1:i386')
+apt_packages+=('libxcb1:i386')
+
+apt-get install -y --allow-downgrades -f "${apt_packages[@]}"
+rm -rf /var/lib/apt/lists/*
+
+# Build a list of packages to purge from the image.
+apt_packages=()
+apt_packages+=('*cheese*')
+apt_packages+=('example-content')
+apt_packages+=('git')
+apt_packages+=('gnome-calendar')
+apt_packages+=('gnome-initial-setup')
+apt_packages+=('gnome-mahjongg')
+apt_packages+=('gnome-mines')
+apt_packages+=('gnome-sudoku')
+apt_packages+=('libx11-doc')
+apt_packages+=('manpages-dev')
+apt_packages+=('orca')
+apt_packages+=('rhythmbox')
+apt_packages+=('thunderbird')
+apt_packages+=('ubuntu-release-upgrader*')
+apt_packages+=('update-manager-core')
+apt_packages+=('update-manager')
+apt_packages+=('yelp')
+
+# Purge unnecessary packages
+apt-get purge -y -f "${apt_packages[@]}"
+
+# Clear apt cache one last time
+rm -rf /var/cache/apt/archives
+
+# We don't need no docs!
+rm -rf /usr/share/help /usr/share/doc /usr/share/man
+
+# Remove all locale files other than en_US.UTF-8
+rm -rf /usr/share/locale/   /usr/share/locale-langpack/     /usr/share/locales/
+
+# Further cleanup
+apt-get -y autoremove
+apt-get clean
+apt-get autoclean
+rm -f "$0"
diff -Nru firefox-84.0.2+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh firefox-85.0+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh
--- firefox-84.0.2+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/recipes/ubuntu1804-test-system-setup.sh	2021-01-18 19:58:19.000000000 +0000
@@ -4,133 +4,8 @@
 
 test "$(whoami)" == 'root'
 
-mkdir -p /setup
 cd /setup
 
-# To speed up docker image build times as well as number of network/disk I/O
-# build a list of packages to be installed nad call it in one go.
-apt_packages=()
-
-apt_packages+=('autoconf2.13')
-apt_packages+=('bluez-cups')
-apt_packages+=('build-essential')
-apt_packages+=('ca-certificates')
-apt_packages+=('ccache')
-apt_packages+=('compiz')
-apt_packages+=('curl')
-apt_packages+=('fontconfig')
-apt_packages+=('fonts-kacst')
-apt_packages+=('fonts-kacst-one')
-apt_packages+=('fonts-liberation')
-apt_packages+=('fonts-stix')
-apt_packages+=('fonts-unfonts-core')
-apt_packages+=('fonts-unfonts-extra')
-apt_packages+=('fonts-vlgothic')
-apt_packages+=('g++-multilib')
-apt_packages+=('gcc-multilib')
-apt_packages+=('gir1.2-gnomebluetooth-1.0')
-apt_packages+=('git')
-apt_packages+=('gnome-icon-theme')
-apt_packages+=('gstreamer1.0-gtk3')
-apt_packages+=('gstreamer1.0-plugins-base')
-apt_packages+=('gstreamer1.0-plugins-good')
-apt_packages+=('gstreamer1.0-tools')
-apt_packages+=('gstreamer1.0-pulseaudio')
-apt_packages+=('language-pack-en-base')
-apt_packages+=('libc6-dbg')
-apt_packages+=('libasound2-dev')
-apt_packages+=('libavcodec-extra57')
-apt_packages+=('libcanberra-gtk3-module')
-apt_packages+=('libcanberra-pulse')
-apt_packages+=('libcurl4-openssl-dev')
-apt_packages+=('libdbus-1-dev')
-apt_packages+=('libdbus-glib-1-dev')
-apt_packages+=('libfreetype6')
-apt_packages+=('libgconf2-dev')
-apt_packages+=('libgl1-mesa-dri')
-apt_packages+=('libgl1-mesa-glx')
-apt_packages+=('libgstreamer-plugins-base1.0-dev')
-apt_packages+=('libgstreamer1.0-dev')
-apt_packages+=('libgtk2.0-dev')
-apt_packages+=('libgtk-3-0')
-apt_packages+=('libiw-dev')
-apt_packages+=('libx11-xcb1')
-apt_packages+=('libxcb1')
-apt_packages+=('libxcb-render0')
-apt_packages+=('libxcb-shm0')
-apt_packages+=('libxcb-glx0')
-apt_packages+=('libxcb-shape0')
-apt_packages+=('libnotify-dev')
-apt_packages+=('libpulse0')
-apt_packages+=('libpulse-dev')
-apt_packages+=('libxt-dev')
-apt_packages+=('libxxf86vm1')
-apt_packages+=('llvm')
-apt_packages+=('llvm-dev')
-apt_packages+=('llvm-runtime')
-apt_packages+=('mesa-common-dev')
-apt_packages+=('net-tools')
-apt_packages+=('pulseaudio')
-apt_packages+=('pulseaudio-module-bluetooth')
-apt_packages+=('pulseaudio-module-gconf')
-apt_packages+=('python-dev')
-apt_packages+=('python-pip')
-apt_packages+=('python3-pip')
-apt_packages+=('qemu-kvm')
-apt_packages+=('rlwrap')
-apt_packages+=('screen')
-apt_packages+=('software-properties-common')
-apt_packages+=('sudo')
-apt_packages+=('ttf-dejavu')
-apt_packages+=('ubuntu-desktop')
-apt_packages+=('unzip')
-apt_packages+=('uuid')
-apt_packages+=('wget')
-apt_packages+=('xvfb')
-apt_packages+=('xwit')
-apt_packages+=('yasm')
-apt_packages+=('zip')
-
-# xvinfo for test-linux.sh to monitor Xvfb startup
-apt_packages+=('x11-utils')
-
-# Bug 1232407 - this allows the user to start vnc
-apt_packages+=('x11vnc')
-
-# Bug 1176031 - need `xset` to disable screensavers
-apt_packages+=('x11-xserver-utils')
-
-# Build a list of packages to install from the multiverse repo.
-apt_packages+=('ubuntu-restricted-extras')
-
-# APT update takes very long on Ubuntu. Run it at the last possible minute.
-apt-get update
-
-# This allows ubuntu-desktop to be installed without human interaction.
-# Also force the cleanup after installation of packages to reduce image size.
-export DEBIAN_FRONTEND=noninteractive
-apt-get install -y -f "${apt_packages[@]}"
-
-# Enable i386 packages
-dpkg --add-architecture i386
-apt-get update
-
-# Make sure we have libraries for 32-bit tests
-apt_packages=()
-apt_packages+=('libavcodec-extra57:i386')
-apt_packages+=('libdbus-glib-1-2:i386')
-apt_packages+=('libpulse0:i386')
-apt_packages+=('libxt6:i386')
-apt_packages+=('libxtst6:i386')
-apt_packages+=('libsecret-1-0:i386')
-apt_packages+=('libgtk2.0-0:i386')
-apt_packages+=('libgtk-3-0:i386')
-apt_packages+=('libx11-xcb1:i386')
-apt_packages+=('libxcb1:i386')
-
-apt-get install -y -f "${apt_packages[@]}"
-rm -rf /var/lib/apt/lists/*
-
 # Install tooltool, mercurial and node now that dependencies are in place.
 . /setup/common.sh
 . /setup/install-mercurial.sh
@@ -144,42 +19,10 @@
 pip install zstandard==0.13.0
 pip3 install zstandard==0.13.0
 
-# Build a list of packages to purge from the image.
-apt_packages=()
-apt_packages+=('*cheese*')
-apt_packages+=('example-content')
-apt_packages+=('git')
-apt_packages+=('gnome-calendar')
-apt_packages+=('gnome-initial-setup')
-apt_packages+=('gnome-mahjongg')
-apt_packages+=('gnome-mines')
-apt_packages+=('gnome-sudoku')
-apt_packages+=('libx11-doc')
-apt_packages+=('manpages-dev')
-apt_packages+=('orca')
-apt_packages+=('rhythmbox')
-apt_packages+=('thunderbird')
-apt_packages+=('ubuntu-release-upgrader*')
-apt_packages+=('update-manager-core')
-apt_packages+=('update-manager')
-apt_packages+=('yelp')
-
-# Purge unnecessary packages
-apt-get purge -y -f "${apt_packages[@]}"
-
-# Clear apt cache one last time
-rm -rf /var/cache/apt/archives
-
-# We don't need no docs!
-rm -rf /usr/share/help /usr/share/doc /usr/share/man
-
-# Remove all locale files other than en_US.UTF-8
-rm -rf /usr/share/locale/   /usr/share/locale-langpack/     /usr/share/locales/
+pip install psutil==5.7.0
+pip3 install psutil==5.7.0
 
-# Further cleanup
+# Cleanup
 cd /
 rm -rf /setup ~/.ccache ~/.cache ~/.npm
-apt-get -y autoremove
-apt-get clean
-apt-get autoclean
 rm -f "$0"
diff -Nru firefox-84.0.2+build1/taskcluster/docker/static-analysis-build/Dockerfile firefox-85.0+build1/taskcluster/docker/static-analysis-build/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/static-analysis-build/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/static-analysis-build/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -39,9 +39,11 @@
       patch \
       p7zip-full \
       procps \
+      python-dev \
       python-pip \
       python-setuptools \
       python-virtualenv \
+      python3-dev \
       rsync \
       screen \
       tar \
diff -Nru firefox-84.0.2+build1/taskcluster/docker/toolchain-build/Dockerfile firefox-85.0+build1/taskcluster/docker/toolchain-build/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/toolchain-build/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/toolchain-build/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -33,6 +33,7 @@
       libucl-dev \
       ninja-build \
       p7zip-full \
+      pkg-config \
       procps \
       python-pip \
       python-setuptools \
diff -Nru firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test/Dockerfile firefox-85.0+build1/taskcluster/docker/ubuntu1804-test/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test/Dockerfile	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/ubuntu1804-test/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,4 @@
-FROM          ubuntu:bionic-20200112
+FROM          $DOCKER_IMAGE_PARENT
 MAINTAINER    Edwin Takahashi <egao@mozilla.com>
 
 # Create necessary directories and worker user account
@@ -93,12 +93,6 @@
 ADD taskcluster-interactive-shell /bin/taskcluster-interactive-shell
 RUN     chmod +x /bin/taskcluster-interactive-shell
 
-# gnome-keyring-daemon is configured to have the IPC_LOCK capability (to lock pages with secrets in
-# memory), but docker isn't run with that capability granted. So, if we were to try running
-# gnome-keyring-daemon without first clearing the capability, it would just exit with the message
-# "Operation not permitted". Luckily it doesn't actually require the capability.
-RUN     setcap -r /usr/bin/gnome-keyring-daemon
-
 # Bug 1638183 - increase xserver maximum client count
 COPY     dot-files/config/xorg/99-serverflags.conf     /usr/share/X11/xorg.conf.d/
 
diff -Nru firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test-base/apt-prefs firefox-85.0+build1/taskcluster/docker/ubuntu1804-test-base/apt-prefs
--- firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test-base/apt-prefs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/ubuntu1804-test-base/apt-prefs	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,18 @@
+# Make bionic-security and bionic take precedence over bionic-updates for
+# libc packages to the point of forcing downgrades. This works around the
+# update somehow turning a gst-launch fatal warning into a crash randomly.
+Package: libc-dev*
+Pin: release a=bionic-security
+Pin-Priority: 1001
+
+Package: libc6*
+Pin: release a=bionic-security
+Pin-Priority: 1001
+
+Package: libc-dev*
+Pin: release a=bionic
+Pin-Priority: 1001
+
+Package: libc6*
+Pin: release a=bionic
+Pin-Priority: 1001
diff -Nru firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test-base/Dockerfile firefox-85.0+build1/taskcluster/docker/ubuntu1804-test-base/Dockerfile
--- firefox-84.0.2+build1/taskcluster/docker/ubuntu1804-test-base/Dockerfile	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/ubuntu1804-test-base/Dockerfile	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,22 @@
+# This docker image only sets up packages on top of the original Ubuntu image.
+# Everything else is setup is a child docker image derived from this one, such
+# that changes to our scripts don't trigger the rebuild of this base image,
+# possibly leading to breakage. (See bug 1503756 and bug 1678451 for examples
+# of such recent breakages)
+FROM          ubuntu:bionic-20200112
+MAINTAINER    Edwin Takahashi <egao@mozilla.com>
+
+ADD     apt-prefs /etc/apt/preferences.d/custom
+
+# %include taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh
+ADD topsrcdir/taskcluster/docker/recipes/ubuntu1804-test-system-setup-base.sh /setup/system-setup.sh
+RUN     bash /setup/system-setup.sh
+
+# gnome-keyring-daemon is configured to have the IPC_LOCK capability (to lock pages with secrets in
+# memory), but docker isn't run with that capability granted. So, if we were to try running
+# gnome-keyring-daemon without first clearing the capability, it would just exit with the message
+# "Operation not permitted". Luckily it doesn't actually require the capability.
+RUN     setcap -r /usr/bin/gnome-keyring-daemon
+
+# Set a default command useful for debugging
+CMD ["/bin/bash", "--login"]
diff -Nru firefox-84.0.2+build1/taskcluster/docker/visual-metrics/run-visual-metrics.py firefox-85.0+build1/taskcluster/docker/visual-metrics/run-visual-metrics.py
--- firefox-84.0.2+build1/taskcluster/docker/visual-metrics/run-visual-metrics.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docker/visual-metrics/run-visual-metrics.py	2021-01-18 19:58:19.000000000 +0000
@@ -337,8 +337,6 @@
                 )
                 failed_runs += 1
             else:
-                # Python 3.5 requires a str object (not 3.6+)
-                res = json.loads(res.decode("utf8"))
                 for name, value in res.items():
                     append_result(
                         log, suites, job.test_name, name, value, job.extra_options
@@ -401,7 +399,32 @@
         str(job.video_path),
     ]
     cmd.extend(options)
-    return run_command(log, cmd, job.count)
+    rc, res = run_command(log, cmd, job.count)
+
+    if rc == 0:
+        # Python 3.5 requires a str object (not 3.6+)
+        res = json.loads(res.decode("utf8"))
+
+        # Ensure that none of these values are at 0 which
+        # is indicative of a failling test
+        monitored_tests = [
+            "contentfulspeedindex",
+            "lastvisualchange",
+            "perceptualspeedindex",
+            "speedindex",
+        ]
+        failed_tests = []
+        for metric, val in res.items():
+            if metric.lower() in monitored_tests and val == 0:
+                failed_tests.append(metric)
+        if failed_tests:
+            log.error(
+                "[TEST-UNEXPECTED-FAIL] Some visual metrics have an erroneous value of 0."
+            )
+            log.info("Tests which failed: %s" % str(failed_tests))
+            rc += 1
+
+    return rc, res
 
 
 if __name__ == "__main__":
diff -Nru firefox-84.0.2+build1/taskcluster/docs/kinds.rst firefox-85.0+build1/taskcluster/docs/kinds.rst
--- firefox-84.0.2+build1/taskcluster/docs/kinds.rst	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/docs/kinds.rst	2021-01-18 19:58:19.000000000 +0000
@@ -611,6 +611,10 @@
 -------------------
 Dummy tasks to consolidate language pack beetmover dependencies to avoid taskcluster limits on number of dependencies per task.
 
+post-update-verify-dummy
+------------------------
+Dummy tasks to consolidate update verify dependencies to avoid taskcluster limits on number of dependencies per task.
+
 fetch
 -----
 Tasks that obtain something from a remote service and re-expose it as a
diff -Nru firefox-84.0.2+build1/taskcluster/mach_commands.py firefox-85.0+build1/taskcluster/mach_commands.py
--- firefox-84.0.2+build1/taskcluster/mach_commands.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/mach_commands.py	2021-01-18 19:58:19.000000000 +0000
@@ -624,7 +624,6 @@
         "or mozilla-inbound)",
     )
     def load_image(self, image_name, task_id, tag):
-        self._ensure_zstd()
         from taskgraph.docker import load_image_by_name, load_image_by_task_id
 
         if not image_name and not task_id:
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/builder/build-l10n.sh firefox-85.0+build1/taskcluster/scripts/builder/build-l10n.sh
--- firefox-84.0.2+build1/taskcluster/scripts/builder/build-l10n.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/builder/build-l10n.sh	2021-01-18 19:58:19.000000000 +0000
@@ -99,7 +99,10 @@
 
 cd /builds/worker
 
-$GECKO_PATH/mach python $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
+$GECKO_PATH/mach python \
+  --requirements $GECKO_PATH/taskcluster/scripts/builder/requirements.txt \
+  -- \
+  $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
   ${config_path_cmds} \
   ${config_cmds} \
   $actions \
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/builder/build-linux.sh firefox-85.0+build1/taskcluster/scripts/builder/build-linux.sh
--- firefox-84.0.2+build1/taskcluster/scripts/builder/build-linux.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/builder/build-linux.sh	2021-01-18 19:58:19.000000000 +0000
@@ -114,7 +114,10 @@
 
 cd /builds/worker
 
-$GECKO_PATH/mach python $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
+$GECKO_PATH/mach python \
+  --requirements $GECKO_PATH/taskcluster/scripts/builder/requirements.txt \
+  -- \
+  $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
   ${config_path_cmds} \
   ${config_cmds} \
   $debug_flag \
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/builder/requirements.txt firefox-85.0+build1/taskcluster/scripts/builder/requirements.txt
--- firefox-84.0.2+build1/taskcluster/scripts/builder/requirements.txt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/builder/requirements.txt	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1 @@
+psutil==5.7.0
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-compiler-rt.sh firefox-85.0+build1/taskcluster/scripts/misc/build-compiler-rt.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-compiler-rt.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-compiler-rt.sh	2021-01-18 19:58:19.000000000 +0000
@@ -4,6 +4,8 @@
 
 [ "$1" != "aarch64-apple-darwin" ] && echo $1 is not supported yet && exit 1
 
+export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
+
 mkdir compiler-rt
 cd compiler-rt
 
@@ -18,8 +20,8 @@
   -DCMAKE_BUILD_TYPE=Release \
   -DLLVM_ENABLE_ASSERTIONS=OFF \
   -DLLVM_CONFIG_PATH=$MOZ_FETCHES_DIR/clang/bin/llvm-config \
-  -DCMAKE_C_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -B $MOZ_FETCHES_DIR/cctools/bin -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \
-  -DCMAKE_CXX_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -B $MOZ_FETCHES_DIR/cctools/bin -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \
+  -DCMAKE_C_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \
+  -DCMAKE_CXX_FLAGS="-target aarch64-apple-darwin -mcpu=apple-a12 -isysroot $MOZ_FETCHES_DIR/MacOSX11.0.sdk" \
   -DCMAKE_SYSTEM_NAME=Darwin \
   -DCMAKE_SYSTEM_VERSION=11.0 \
   -DDARWIN_osx_ARCHS=arm64 \
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-dump-syms.sh firefox-85.0+build1/taskcluster/scripts/misc/build-dump-syms.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-dump-syms.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-dump-syms.sh	2021-01-18 19:58:19.000000000 +0000
@@ -35,13 +35,14 @@
         export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
         export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
         export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
-        export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk -stdlib=libc++"
+        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
+        export TARGET_CXX="$MOZ_FETCHES_DIR/clang/bin/clang++ -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk -stdlib=libc++"
         cargo build --verbose --release --target $TARGET
     else
         export RUSTFLAGS=-Clinker=clang++
         export CC=clang
         export CXX=clang++
+        export CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
         export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
         cargo build --verbose --release --features "vendored-openssl"
     fi
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-fix-stacks.sh firefox-85.0+build1/taskcluster/scripts/misc/build-fix-stacks.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-fix-stacks.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-fix-stacks.sh	2021-01-18 19:58:19.000000000 +0000
@@ -27,8 +27,8 @@
     export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
     export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
     export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
-    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
-    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
+    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
+    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
     ;;
 i686-pc-windows-msvc)
     # Cross-compiling for Windows on Linux.
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh firefox-85.0+build1/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh	2021-01-18 19:58:19.000000000 +0000
@@ -11,7 +11,7 @@
 build_dir=$GECKO_PATH/build
 data_dir=$GECKO_PATH/build/unix/build-gcc
 
-sixgill_rev=e21b1fa688ce
+sixgill_rev=88d1a251c92a
 sixgill_repo=https://hg.mozilla.org/users/sfink_mozilla.com/sixgill
 
 . $data_dir/build-gcc.sh
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-gn-macosx.sh firefox-85.0+build1/taskcluster/scripts/misc/build-gn-macosx.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-gn-macosx.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-gn-macosx.sh	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 COMPRESS_EXT=xz
 
 CROSS_CCTOOLS_PATH=$MOZ_FETCHES_DIR/cctools
-CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.11.sdk
+CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX10.12.sdk
 
 export CC=$MOZ_FETCHES_DIR/clang/bin/clang
 export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-minidump-stackwalk.sh firefox-85.0+build1/taskcluster/scripts/misc/build-minidump-stackwalk.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-minidump-stackwalk.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-minidump-stackwalk.sh	2021-01-18 19:58:19.000000000 +0000
@@ -21,7 +21,7 @@
 macosx64)
     TOOLCHAINS="cctools rustc clang"
     echo ac_add_options --target=x86_64-apple-darwin >> .mozconfig
-    echo ac_add_options --with-macos-sdk=$MOZ_FETCHES_DIR/MacOSX10.11.sdk >> .mozconfig
+    echo ac_add_options --with-macos-sdk=$MOZ_FETCHES_DIR/MacOSX10.12.sdk >> .mozconfig
     ;;
 mingw32)
     TOOLCHAINS="binutils rustc clang"
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-nasm.sh firefox-85.0+build1/taskcluster/scripts/misc/build-nasm.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-nasm.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-nasm.sh	2021-01-18 19:58:19.000000000 +0000
@@ -17,7 +17,7 @@
     macosx64)
         export PATH="$MOZ_FETCHES_DIR/clang/bin:$MOZ_FETCHES_DIR/cctools/bin:$PATH"
         export LD_LIBRARY_PATH="$MOZ_FETCHES_DIR/clang/lib"
-        ./configure CC="clang --target=x86_64-apple-darwin -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk" --host=x86_64-apple-darwin
+        ./configure CC="clang --target=x86_64-apple-darwin -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk" --host=x86_64-apple-darwin
 	cat config.log
         EXE=
 	;;
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/build-sccache.sh firefox-85.0+build1/taskcluster/scripts/misc/build-sccache.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/build-sccache.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/build-sccache.sh	2021-01-18 19:58:19.000000000 +0000
@@ -38,7 +38,7 @@
         export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
         export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
         export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
-        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk"
+        export TARGET_CC="$MOZ_FETCHES_DIR/clang/bin/clang -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
         cargo build --features "all $COMMON_FEATURES" --verbose --release --target $TARGET
     else
         cargo build --features "all dist-server openssl/vendored $COMMON_FEATURES" --verbose --release
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/osx-cross-linker firefox-85.0+build1/taskcluster/scripts/misc/osx-cross-linker
--- firefox-84.0.2+build1/taskcluster/scripts/misc/osx-cross-linker	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/osx-cross-linker	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 exec $MOZ_FETCHES_DIR/clang/bin/clang -v \
   -fuse-ld=$MOZ_FETCHES_DIR/cctools/bin/x86_64-apple-darwin-ld \
-  -mmacosx-version-min=10.11 \
+  -mmacosx-version-min=10.12 \
   -target $TARGET \
   -B $MOZ_FETCHES_DIR/cctools/bin \
-  -isysroot $MOZ_FETCHES_DIR/MacOSX10.11.sdk \
+  -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk \
   "$@"
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/repack-clang-linux-win-cross.sh firefox-85.0+build1/taskcluster/scripts/misc/repack-clang-linux-win-cross.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/repack-clang-linux-win-cross.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/repack-clang-linux-win-cross.sh	2021-01-18 19:58:19.000000000 +0000
@@ -9,7 +9,7 @@
 # We have a non-extracted clang-cl/clang.tar.zst for Windows clang-cl that we need to extract
 # files from.
 
-$GECKO_PATH/taskcluster/scripts/misc/zstdpy -d clang-cl/clang.tar.zst | tar -x --wildcards clang/lib/clang/*/lib/windows clang/bin/clang-cl.exe
+$GECKO_PATH/taskcluster/scripts/misc/zstdpy -d clang-cl/clang.tar.zst | tar -x --wildcards clang/lib/clang/*/lib/windows clang/bin/clang-cl.exe clang/bin/llvm-symbolizer.exe
 chmod +x clang/bin/clang-cl.exe
 tar -c clang | $GECKO_PATH/taskcluster/scripts/misc/zstdpy > clang.tar.zst
 
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/repack_rust.py firefox-85.0+build1/taskcluster/scripts/misc/repack_rust.py
--- firefox-84.0.2+build1/taskcluster/scripts/misc/repack_rust.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/repack_rust.py	2021-01-18 19:58:19.000000000 +0000
@@ -21,6 +21,7 @@
 from contextlib import contextmanager
 import tarfile
 import tempfile
+import textwrap
 
 import requests
 import pytoml as toml
@@ -29,7 +30,7 @@
 
 
 def log(msg):
-    print("repack: %s" % msg)
+    print("repack: %s" % msg, flush=True)
 
 
 def fetch_file(url):
@@ -348,45 +349,159 @@
     return manifest
 
 
-def repack(
-    host, targets, channel="stable", cargo_channel=None, compiler_builtins_hack=False
-):
-    log("Repacking rust for %s supporting %s..." % (host, targets))
+def patch_src(patch, module):
+    log("Patching Rust src... {} with {}".format(module, patch))
+    patch = os.path.realpath(patch)
+    subprocess.check_call(["patch", "-d", module, "-p1", "-i", patch, "--fuzz=0", "-s"])
 
-    manifest = fetch_manifest(channel, host, targets)
-    log("Using manifest for rust %s as of %s." % (channel, manifest["date"]))
-    if cargo_channel == channel:
-        cargo_manifest = manifest
-    else:
-        cargo_manifest = fetch_manifest(cargo_channel, host, targets)
-        log(
-            "Using manifest for cargo %s as of %s."
-            % (cargo_channel, cargo_manifest["date"])
-        )
 
-    log("Fetching packages...")
-    rustc = fetch_package(manifest, "rustc", host)
-    cargo = fetch_package(cargo_manifest, "cargo", host)
-    stds = fetch_std(manifest, targets)
-    rustsrc = fetch_package(manifest, "rust-src", host)
-    rustfmt = fetch_optional(manifest, "rustfmt-preview", host)
+def build_src(install_dir, host, targets, patch):
+    install_dir = os.path.abspath(install_dir)
+    fetches = os.environ["MOZ_FETCHES_DIR"]
+    rust_dir = os.path.join(fetches, "rust")
+    patch_dir = os.path.join(os.environ["GECKO_PATH"], "build", "build-rust")
 
-    log("Installing packages...")
-    install_dir = "rustc"
-    # Clear any previous install directory.
+    # Clear and remake any previous install directory.
     try:
         shutil.rmtree(install_dir)
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise
-    install(os.path.basename(rustc["url"]), install_dir)
-    install(os.path.basename(cargo["url"]), install_dir)
-    install(os.path.basename(rustsrc["url"]), install_dir)
-    if rustfmt:
-        install(os.path.basename(rustfmt["url"]), install_dir)
-    for std in stds:
-        install(os.path.basename(std["url"]), install_dir)
-        pass
+    os.makedirs(install_dir)
+
+    # Patch the src (see the --patch flag's description for details)
+    if patch:
+        for p in patch:
+            module, colon, file = p.partition(":")
+            if not colon:
+                module, file = "", p
+            patch_file = os.path.join(patch_dir, file)
+            patch_module = os.path.join(rust_dir, module)
+            patch_src(patch_file, patch_module)
+
+    log("Building Rust...")
+
+    # Rust builds are configured primarily through a config.toml file.
+    #
+    # `sysconfdir` is overloaded to be relative instead of absolute.
+    # This is the default of `install.sh`, but for whatever reason
+    # `x.py install` has its own default of `/etc` which we don't want.
+    #
+    # `missing-tools` is set so `rustfmt` is allowed to fail. This means
+    # we can "succeed" at building Rust while failing to build, say, Cargo.
+    # Ideally the build system would have better granularity:
+    # https://github.com/rust-lang/rust/issues/79249
+    base_config = textwrap.dedent(
+        """
+        [build]
+        extended = true
+        tools = ["analysis", "cargo", "rustfmt", "src"]
+
+        [install]
+        prefix = "{prefix}"
+        sysconfdir = "etc"
+
+        [dist]
+        missing-tools = true
+
+        """.format(
+            prefix=install_dir
+        )
+    )
+
+    # Rust requires these to be specified per-target
+    target_config = textwrap.dedent(
+        """
+        [target.{target}]
+        cc = "clang"
+        cxx = "clang++"
+        linker = "clang"
+
+        """
+    )
+
+    final_config = base_config
+    for target in sorted(set(targets) | set([host])):
+        final_config = final_config + target_config.format(target=target)
+
+    with open(os.path.join(rust_dir, "config.toml"), "w") as file:
+        file.write(final_config)
+
+    # Setup the env so compilers and toolchains are visible
+    binutils = os.path.join(fetches, "binutils", "bin")
+    clang = os.path.join(fetches, "clang")
+    clang_bin = os.path.join(clang, "bin")
+    clang_lib = os.path.join(clang, "lib")
+
+    env = os.environ.copy()
+    env.update(
+        {
+            "PATH": os.pathsep.join((binutils, clang_bin, os.environ["PATH"])),
+            "LD_LIBRARY_PATH": clang_lib,
+        }
+    )
+
+    # x.py install does everything we need for us.
+    # If you're running into issues, consider using `-vv` to debug it.
+    command = ["python3", "x.py", "install", "-v", "--host", host]
+    for target in targets:
+        command.extend(["--target", target])
+
+    subprocess.check_call(command, stderr=subprocess.STDOUT, env=env, cwd=rust_dir)
+
+
+def repack(
+    host,
+    targets,
+    channel="stable",
+    cargo_channel=None,
+    compiler_builtins_hack=False,
+    patch=None,
+):
+    install_dir = "rustc"
+    if channel == "dev":
+        build_src(install_dir, host, targets, patch)
+    else:
+        if patch:
+            raise ValueError(
+                'Patch specified, but channel "%s" is not "dev"!'
+                "\nPatches are only for building from source." % channel
+            )
+        log("Repacking rust for %s supporting %s..." % (host, targets))
+        manifest = fetch_manifest(channel, host, targets)
+        log("Using manifest for rust %s as of %s." % (channel, manifest["date"]))
+        if cargo_channel == channel:
+            cargo_manifest = manifest
+        else:
+            cargo_manifest = fetch_manifest(cargo_channel, host, targets)
+            log(
+                "Using manifest for cargo %s as of %s."
+                % (cargo_channel, cargo_manifest["date"])
+            )
+
+        log("Fetching packages...")
+        rustc = fetch_package(manifest, "rustc", host)
+        cargo = fetch_package(cargo_manifest, "cargo", host)
+        stds = fetch_std(manifest, targets)
+        rustsrc = fetch_package(manifest, "rust-src", host)
+        rustfmt = fetch_optional(manifest, "rustfmt-preview", host)
+
+        log("Installing packages...")
+
+        # Clear any previous install directory.
+        try:
+            shutil.rmtree(install_dir)
+        except OSError as e:
+            if e.errno != errno.ENOENT:
+                raise
+        install(os.path.basename(rustc["url"]), install_dir)
+        install(os.path.basename(cargo["url"]), install_dir)
+        install(os.path.basename(rustsrc["url"]), install_dir)
+        if rustfmt:
+            install(os.path.basename(rustfmt["url"]), install_dir)
+        for std in stds:
+            install(os.path.basename(std["url"]), install_dir)
+            pass
     # Workaround for https://github.com/rust-lang/rust/issues/74657:
     # Remove the .llvmbc and .llvmcmd sections (sections for the LLVM bitcode)
     # from the compiler_builtins rlib.
@@ -544,10 +659,21 @@
         "--channel",
         help="Release channel to use:"
         " 1.xx.y, beta-yyyy-mm-dd,"
-        " or nightly-yyyy-mm-dd.",
+        " nightly-yyyy-mm-dd,"
+        " bors-$rev (grab a build from rust's CI),"
+        " or dev (build from source).",
         required=True,
     )
     parser.add_argument(
+        "--patch",
+        nargs="+",
+        help="apply the given patch file to a dev build."
+        " Patch files should be placed in /build/build-rust."
+        " Patches can be prefixed with `module-path:` to specify they"
+        " apply to that git submodule in the Rust source."
+        " e.g. `src/llvm-project:mypatch.diff` patches rust's llvm.",
+    )
+    parser.add_argument(
         "--cargo-channel",
         help="Release channel version to use for cargo."
         " Defaults to the same as --channel.",
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh firefox-85.0+build1/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh
--- firefox-84.0.2+build1/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/misc/wr-macos-cross-build-setup.sh	2021-01-18 19:58:19.000000000 +0000
@@ -5,7 +5,7 @@
 
 source "${GECKO_PATH}/taskcluster/scripts/misc/tooltool-download.sh"
 
-MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX10.11.sdk"
+MACOS_SYSROOT="${MOZ_FETCHES_DIR}/MacOSX10.12.sdk"
 CLANGDIR="${MOZ_FETCHES_DIR}/clang"
 
 # Deploy the wrench dependencies
diff -Nru firefox-84.0.2+build1/taskcluster/scripts/tester/test-linux.sh firefox-85.0+build1/taskcluster/scripts/tester/test-linux.sh
--- firefox-84.0.2+build1/taskcluster/scripts/tester/test-linux.sh	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/scripts/tester/test-linux.sh	2021-01-18 19:58:19.000000000 +0000
@@ -75,6 +75,7 @@
 
 if [ $MOZ_ENABLE_WAYLAND ]; then
   NEED_XVFB=true
+  NEED_WINDOW_MANAGER=true
 fi
 
 # make sure artifact directories exist
@@ -98,12 +99,12 @@
       # To share X issues
       cp "$HOME/.xsession-errors" "$WORKING_DIR/artifacts/public/xsession-errors.log"
     fi
-    if $NEED_XVFB; then
-        cleanup_xvfb
-    fi
     if [ $MOZ_ENABLE_WAYLAND ]; then
         cleanup_mutter
     fi
+    if $NEED_XVFB; then
+        cleanup_xvfb
+    fi
     exit $rv
 }
 trap cleanup EXIT INT
@@ -155,10 +156,6 @@
     # note that this file is not available when run under native-worker
     . $HOME/scripts/xvfb.sh
     start_xvfb '1600x1200x24' 0
-    if [ $MOZ_ENABLE_WAYLAND ]; then
-        mutter --wayland &
-        export WAYLAND_DISPLAY=wayland-0
-    fi
 fi
 
 if $START_VNC; then
@@ -175,7 +172,6 @@
         echo export XDG_CURRENT_DESKTOP=GNOME > $HOME/.xsessionrc
         if [ $MOZ_ENABLE_WAYLAND ]; then
             echo export XDG_SESSION_TYPE=wayland >> $HOME/.xsessionrc
-            echo export XDG_RUNTIME_DIR=/run/user/$(id -u) >> $HOME/.xsessionrc
         else
             echo export XDG_SESSION_TYPE=x11 >> $HOME/.xsessionrc
         fi
@@ -204,6 +200,26 @@
         eval `dbus-launch --sh-syntax`
     fi
     eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
+
+    # Run mutter as nested wayland compositor to provide Wayland environment
+    # on top of XVfb.
+    if [ $MOZ_ENABLE_WAYLAND ]; then
+      env | grep "DISPLAY"
+      export XDG_RUNTIME_DIR=$WORKING_DIR
+      mutter --display=:0 --wayland --nested &
+      export WAYLAND_DISPLAY=wayland-0
+      retry_count=0
+      max_retries=5
+      until [ $retry_count -gt $max_retries ]; do
+        if [ -S "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]; then
+            retry_count=$(($max_retries + 1))
+        else
+            retry_count=$(($retry_count + 1))
+            echo "Waiting for Mutter, retry: $retry_count"
+            sleep 2
+        fi
+      done
+    fi
 fi
 
 if [[ $NEED_COMPIZ == true ]]  && [[ $RELEASE == 16.04 ]]; then
@@ -239,7 +255,7 @@
 
 # Use |mach python| if a source checkout exists so in-tree packages are
 # available.
-[[ -x "${GECKO_PATH}/mach" ]] && python="python2.7 ${GECKO_PATH}/mach python" || python="python2.7"
+[[ -x "${GECKO_PATH}/mach" ]] && python="${PYTHON:-python2.7} ${GECKO_PATH}/mach python" || python="${PYTHON:-python2.7}"
 
 # Save the computed mozharness command to a binary which is useful for
 # interactive mode.
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/actions/backfill.py firefox-85.0+build1/taskcluster/taskgraph/actions/backfill.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/actions/backfill.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/actions/backfill.py	2021-01-18 19:58:19.000000000 +0000
@@ -8,6 +8,7 @@
 
 import json
 import logging
+import re
 import sys
 from functools import partial
 
@@ -24,6 +25,8 @@
 )
 
 logger = logging.getLogger(__name__)
+SYMBOL_REGEX = re.compile("^(.*)-[a-z0-9]{11}-bk$")
+GROUP_SYMBOL_REGEX = re.compile("^(.*)-bk$")
 
 
 def input_for_support_action(revision, task, times=1):
@@ -54,9 +57,7 @@
     name="backfill",
     permission="backfill",
     symbol="Bk",
-    description=(
-        "Given a task schedule it " "on previous pushes in the same project. "
-    ),
+    description=("Given a task schedule it on previous pushes in the same project."),
     order=200,
     context=[{}],  # This will be available for all tasks
     schema={
@@ -89,7 +90,7 @@
                 "maximum": 10,
                 "title": "Times",
                 "description": (
-                    "The number of times to execute each job " "you are backfilling."
+                    "The number of times to execute each job you are backfilling."
                 ),
             },
         },
@@ -139,31 +140,36 @@
         sys.exit(1)
 
 
+def add_backfill_suffix(regex, symbol, suffix):
+    m = regex.match(symbol)
+    if m is None:
+        symbol += suffix
+    return symbol
+
+
 def test_manifests_modifier(task, label, symbol, revision, test_manifests):
     """In the case of test tasks we can modify the test paths they execute."""
     if task.label != label:
         return task
 
-    try:
-        logger.debug("Modifying test_manifests for {}".format(task.label))
-        test_manifests = test_manifests
-        task.attributes["test_manifests"] = test_manifests
-        task.task["payload"]["env"]["MOZHARNESS_TEST_PATHS"] = json.dumps(
-            test_manifests
+    logger.debug("Modifying test_manifests for {}".format(task.label))
+    test_manifests = test_manifests
+    task.attributes["test_manifests"] = test_manifests
+    task.task["payload"]["env"]["MOZHARNESS_TEST_PATHS"] = json.dumps(test_manifests)
+    # The name/label might have been modify in new_label, thus, change it here as well
+    task.task["metadata"]["name"] = task.label
+    th_info = task.task["extra"]["treeherder"]
+    # Use a job symbol of the originating task as defined in the backfill action
+    th_info["symbol"] = add_backfill_suffix(
+        SYMBOL_REGEX, th_info["symbol"], "-{}-bk".format(revision[0:11])
+    )
+    if th_info.get("groupSymbol"):
+        # Group all backfilled tasks together
+        th_info["groupSymbol"] = add_backfill_suffix(
+            GROUP_SYMBOL_REGEX, th_info["groupSymbol"], "-bk"
         )
-        # The name/label might have been modify in new_label, thus, change it here as well
-        task.task["metadata"]["name"] = task.label
-        th_info = task.task["extra"]["treeherder"]
-        # Use a job symbol of the originating task as defined in the backfill action
-        th_info["symbol"] = "{}-{}-bk".format(symbol, revision[0:11])
-        if th_info.get("groupSymbol"):
-            # Group all backfilled tasks together
-            th_info["groupSymbol"] = "{}-bk".format(th_info["groupSymbol"])
-    except KeyError as e:
-        logger.exception(e)
-        logger.warning("The task will be scheduled without intended modifications.")
-    finally:
-        return task
+    task.task["tags"]["action"] = "backfill-task"
+    return task
 
 
 def do_not_modify(task):
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/actions/retrigger.py firefox-85.0+build1/taskcluster/taskgraph/actions/retrigger.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/actions/retrigger.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/actions/retrigger.py	2021-01-18 19:58:19.000000000 +0000
@@ -57,6 +57,7 @@
         {"kind": "decision-task"},
         {"kind": "action-callback"},
         {"kind": "cron-task"},
+        {"action": "backfill-task"},
     ],
 )
 def retrigger_decision_action(parameters, graph_config, input, task_group_id, task_id):
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/actions/util.py firefox-85.0+build1/taskcluster/taskgraph/actions/util.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/actions/util.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/actions/util.py	2021-01-18 19:58:19.000000000 +0000
@@ -67,7 +67,6 @@
     """
     if task_id:
         tags = get_task_definition(task_id).get("tags")
-    action = None
 
     for _action in actions_json["actions"]:
         if action_name != _action["name"]:
@@ -76,21 +75,16 @@
         context = _action.get("context", [])
         # Ensure the task is within the context of the action
         if task_id and tags and _tags_within_context(tags, context):
-            action = _action
+            return _action
         elif context == []:
-            action = _action
+            return _action
 
-    if not action:
-        available_actions = ", ".join(
-            sorted({a["name"] for a in actions_json["actions"]})
+    available_actions = ", ".join(sorted({a["name"] for a in actions_json["actions"]}))
+    raise LookupError(
+        "{} action is not available for this task. Available: {}".format(
+            action_name, available_actions
         )
-        raise LookupError(
-            "{} action is not available for this task. Available: {}".format(
-                action_name, available_actions
-            )
-        )
-
-    return action
+    )
 
 
 def trigger_action(action_name, decision_task_id, task_id=None, input={}):
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/optimize/strategies.py firefox-85.0+build1/taskcluster/taskgraph/optimize/strategies.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/optimize/strategies.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/optimize/strategies.py	2021-01-18 19:58:19.000000000 +0000
@@ -12,7 +12,7 @@
 
 from taskgraph import files_changed
 from taskgraph.optimize import register_strategy, OptimizationStrategy
-from taskgraph.util.taskcluster import find_task_id
+from taskgraph.util.taskcluster import find_task_id, status_task
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +35,9 @@
         for index_path in index_paths:
             try:
                 task_id = find_task_id(index_path)
-                return task_id
+                status = status_task(task_id)
+                if status not in ("exception", "failed"):
+                    return task_id
             except KeyError:
                 # 404 will end up here and go on to the next index path
                 pass
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/target_tasks.py firefox-85.0+build1/taskcluster/taskgraph/target_tasks.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/target_tasks.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/target_tasks.py	2021-01-18 19:58:19.000000000 +0000
@@ -1332,6 +1332,6 @@
         if task.kind != "perftest":
             continue
         if task.attributes.get("cron", False) and any(
-            test_name in name for test_name in ["view", "main"]
+            test_name in name for test_name in ["view"]
         ):
             yield name
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/test/conftest.py firefox-85.0+build1/taskcluster/taskgraph/test/conftest.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/test/conftest.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/test/conftest.py	2021-01-18 19:58:19.000000000 +0000
@@ -3,11 +3,17 @@
 
 from __future__ import absolute_import
 
-from mach.logging import LoggingManager
+import os
 
 import pytest
+from mach.logging import LoggingManager
 from responses import RequestsMock
 
+from taskgraph import GECKO
+from taskgraph.actions import render_actions_json
+from taskgraph.config import load_graph_config
+from taskgraph.parameters import Parameters
+
 
 @pytest.fixture
 def responses():
@@ -33,3 +39,14 @@
     """Ensure logs from taskgraph are displayed when a test fails."""
     lm = LoggingManager()
     lm.add_terminal_logging()
+
+
+@pytest.fixture(scope="session")
+def graph_config():
+    return load_graph_config(os.path.join(GECKO, "taskcluster", "ci"))
+
+
+@pytest.fixture(scope="session")
+def actions_json(graph_config):
+    decision_task_id = "abcdef"
+    return render_actions_json(Parameters(strict=False), graph_config, decision_task_id)
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/test/test_actions_util.py firefox-85.0+build1/taskcluster/taskgraph/test/test_actions_util.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/test/test_actions_util.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/test/test_actions_util.py	2021-01-18 19:58:19.000000000 +0000
@@ -6,13 +6,19 @@
 
 import unittest
 import json
+from pprint import pprint
+
+import pytest
 from mock import patch
 from mozunit import main, MockedOpen
+
+from taskgraph import actions, create
 from taskgraph.decision import read_artifact
 from taskgraph.actions.util import (
-    relativize_datestamps,
     combine_task_graph_files,
+    relativize_datestamps,
 )
+from taskgraph.util import taskcluster
 
 TASK_DEF = {
     "created": "2017-10-10T18:33:03.460Z",
@@ -33,6 +39,12 @@
 }
 
 
+@pytest.fixture(scope="module", autouse=True)
+def enable_test_mode():
+    create.testing = True
+    taskcluster.testing = True
+
+
 class TestRelativize(unittest.TestCase):
     def test_relativize(self):
         rel = relativize_datestamps(TASK_DEF)
@@ -96,5 +108,75 @@
             )
 
 
+def is_subset(subset, superset):
+    if isinstance(subset, dict):
+        return all(
+            key in superset and is_subset(val, superset[key])
+            for key, val in subset.items()
+        )
+
+    if isinstance(subset, list) or isinstance(subset, set):
+        return all(
+            any(is_subset(subitem, superitem) for superitem in superset)
+            for subitem in subset
+        )
+
+    if isinstance(subset, str):
+        return subset in superset
+
+    # assume that subset is a plain value if none of the above match
+    return subset == superset
+
+
+@pytest.mark.parametrize(
+    "task_def,expected",
+    [
+        pytest.param(
+            {"tags": {"kind": "decision-task"}},
+            {
+                "hookPayload": {
+                    "decision": {
+                        "action": {"cb_name": "retrigger-decision"},
+                    },
+                },
+            },
+            id="retrigger_decision",
+        ),
+        pytest.param(
+            {"tags": {"action": "backfill-task"}},
+            {
+                "hookPayload": {
+                    "decision": {
+                        "action": {"cb_name": "retrigger-decision"},
+                    },
+                },
+            },
+            id="retrigger_backfill",
+        ),
+    ],
+)
+def test_extract_applicable_action(
+    responses, monkeypatch, actions_json, task_def, expected
+):
+    base_url = "https://taskcluster"
+    decision_task_id = "dddd"
+    task_id = "tttt"
+
+    monkeypatch.setenv("TASK_ID", task_id)
+    monkeypatch.setenv("TASKCLUSTER_ROOT_URL", base_url)
+    monkeypatch.setenv("TASKCLUSTER_PROXY_URL", base_url)
+    responses.add(
+        responses.GET,
+        "{}/api/queue/v1/task/{}".format(base_url, task_id),
+        status=200,
+        json=task_def,
+    )
+    action = actions.util._extract_applicable_action(
+        actions_json, "retrigger", decision_task_id, task_id
+    )
+    pprint(action, indent=2)
+    assert is_subset(expected, action)
+
+
 if __name__ == "__main__":
     main()
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/test/test_morph.py firefox-85.0+build1/taskcluster/taskgraph/test/test_morph.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/test/test_morph.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/test/test_morph.py	2021-01-18 19:58:19.000000000 +0000
@@ -4,13 +4,10 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import os
-
 import pytest
 import six
 
-from taskgraph import morph, GECKO
-from taskgraph.config import load_graph_config
+from taskgraph import morph
 from taskgraph.graph import Graph
 from taskgraph.parameters import Parameters
 from taskgraph.taskgraph import TaskGraph
@@ -19,11 +16,6 @@
 from mozunit import main
 
 
-@pytest.fixture(scope="module")
-def graph_config():
-    return load_graph_config(os.path.join(GECKO, "taskcluster", "ci"))
-
-
 @pytest.fixture
 def make_taskgraph():
     def inner(tasks):
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/transforms/build.py firefox-85.0+build1/taskcluster/taskgraph/transforms/build.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/transforms/build.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/transforms/build.py	2021-01-18 19:58:19.000000000 +0000
@@ -34,13 +34,9 @@
         )
         worker = job.setdefault("worker", {})
         worker.setdefault("env", {})
+        worker["chain-of-trust"] = True
         if worker_os == "linux":
             worker.setdefault("docker-image", {"in-tree": "debian8-amd64-build"})
-            worker["chain-of-trust"] = True
-        elif worker_os == "windows":
-            worker["chain-of-trust"] = True
-        if worker_os == "macosx":
-            job["worker"]["env"].setdefault("SHELL", "/bin/bash")
 
         yield job
 
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/mozharness.py firefox-85.0+build1/taskcluster/taskgraph/transforms/job/mozharness.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/mozharness.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/transforms/job/mozharness.py	2021-01-18 19:58:19.000000000 +0000
@@ -297,21 +297,22 @@
             "Windows and macOS"
         )
 
+    mh_command = []
     if job["worker"]["os"] == "windows":
-        mh_command = [
-            "c:/mozilla-build/python/python.exe",
-            "%GECKO_PATH%/testing/{}".format(run.pop("script")),
-        ]
+        mh_command.append("c:/mozilla-build/python3/python3.exe")
+        gecko_path = "%GECKO_PATH%"
     else:
-        mh_command = [
-            "$GECKO_PATH/mach",
-            "python",
-            "--no-activate",
-            "$GECKO_PATH/testing/{}".format(run.pop("script")),
-        ]
+        gecko_path = "$GECKO_PATH"
+
+    mh_command += [
+        "{}/mach".format(gecko_path),
+        "python",
+        "--no-activate",
+        "{}/testing/{}".format(gecko_path, run.pop("script")),
+    ]
 
     for path in run.pop("config-paths", []):
-        mh_command.append("--extra-config-path %GECKO_PATH%/{}".format(path))
+        mh_command.append("--extra-config-path {}/{}".format(gecko_path, path))
 
     for cfg in run.pop("config"):
         mh_command.extend(("--config", cfg))
@@ -347,20 +348,6 @@
     if job["worker"]["os"] == "macosx":
         return
 
-    # TODO We should run the mozharness script with `mach python` so these
-    # modules are automatically available, but doing so somehow caused hangs in
-    # Windows ccov builds (see bug 1543149).
-    mozbase_dir = "{}/testing/mozbase".format(env["GECKO_PATH"])
-    env["PYTHONPATH"] = ";".join(
-        [
-            "{}/manifestparser".format(mozbase_dir),
-            "{}/mozinfo".format(mozbase_dir),
-            "{}/mozfile".format(mozbase_dir),
-            "{}/mozprocess".format(mozbase_dir),
-            "{}/third_party/python/six".format(env["GECKO_PATH"]),
-        ]
-    )
-
     if taskdesc.get("use-sccache"):
         worker["command"] = (
             [
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py firefox-85.0+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py	2021-01-18 19:58:19.000000000 +0000
@@ -141,6 +141,9 @@
         }
     )
 
+    if test.get("python-3"):
+        env["PYTHON"] = "python3"
+
     # Legacy linux64 tests rely on compiz.
     if test.get("docker-image", {}).get("in-tree") == "desktop1604-test":
         env.update({"NEED_COMPIZ": "true"})
@@ -352,31 +355,42 @@
             "artifact-reference": "<decision/public/tests-by-manifest.json.gz>"
         }
 
+    py_3 = test.get("python-3", False)
+
     if is_windows:
+        py_binary = "c:\\mozilla-build\\{python}\\{python}.exe".format(
+            python="python3" if py_3 else "python"
+        )
         mh_command = [
-            "c:\\mozilla-build\\python\\python.exe",
+            py_binary,
             "-u",
             "mozharness\\scripts\\" + normpath(mozharness["script"]),
         ]
     elif is_bitbar:
+        py_binary = "python3" if py_3 else "python"
         mh_command = ["bash", "./{}".format(bitbar_script)]
     elif is_macosx and "macosx1014-64" in test["test-platform"]:
+        py_binary = "/usr/local/bin/{}".format("python3" if py_3 else "python2")
         mh_command = [
-            "/usr/local/bin/python2",
+            py_binary,
             "-u",
             "mozharness/scripts/" + mozharness["script"],
         ]
     else:
         # is_linux or is_macosx
+        py_binary = "/usr/bin/{}".format("python3" if py_3 else "python2")
         mh_command = [
             # Using /usr/bin/python2.7 rather than python2.7 because
             # /usr/local/bin/python2.7 is broken on the mac workers.
             # See bug #1547903.
-            "/usr/bin/python2.7",
+            py_binary,
             "-u",
             "mozharness/scripts/" + mozharness["script"],
         ]
 
+    if py_3:
+        env["PYTHON"] = py_binary
+
     for mh_config in mozharness["config"]:
         cfg_path = "mozharness/configs/" + mh_config
         if is_windows:
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/toolchain.py firefox-85.0+build1/taskcluster/taskgraph/transforms/job/toolchain.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/transforms/job/toolchain.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/transforms/job/toolchain.py	2021-01-18 19:58:19.000000000 +0000
@@ -175,6 +175,7 @@
     run = job["run"]
 
     worker = taskdesc["worker"] = job["worker"]
+    worker["chain-of-trust"] = True
 
     # Allow the job to specify where artifacts come from, but add
     # public/build if it's not there already.
@@ -183,9 +184,6 @@
         generic_worker_add_artifacts(config, job, taskdesc)
 
     if job["worker"]["os"] == "windows":
-        # mac workers don't support chain-of-trust yet.
-        worker["chain-of-trust"] = True
-
         # There were no caches on generic-worker before bug 1519472, and they cause
         # all sorts of problems with Windows toolchain tasks, disable them until
         # tasks are ready.
diff -Nru firefox-84.0.2+build1/taskcluster/taskgraph/transforms/tests.py firefox-85.0+build1/taskcluster/taskgraph/transforms/tests.py
--- firefox-84.0.2+build1/taskcluster/taskgraph/transforms/tests.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/taskcluster/taskgraph/transforms/tests.py	2021-01-18 19:58:19.000000000 +0000
@@ -162,7 +162,7 @@
     return match_run_on_projects("mozilla-central", task["run-on-projects"])
 
 
-def gv_e10s_filter(task):
+def gv_e10s_multi_filter(task):
     return get_mobile_project(task) == "geckoview" and task["e10s"]
 
 
@@ -175,24 +175,24 @@
 
 
 TEST_VARIANTS = {
-    "geckoview-e10s-single": {
-        "description": "{description} with single-process e10s",
-        "filterfn": gv_e10s_filter,
+    "geckoview-e10s-multi": {
+        "description": "{description} with e10s-multi enabled",
+        "filterfn": gv_e10s_multi_filter,
         "replace": {
             "run-on-projects": ["trunk"],
         },
-        "suffix": "e10s-single",
+        "suffix": "e10s-multi",
         "merge": {
             "mozharness": {
                 "extra-options": [
-                    "--setpref=dom.ipc.processCount=1",
+                    "--setpref=dom.ipc.processCount=3",
                 ],
             },
         },
     },
     "geckoview-fission": {
         "description": "{description} with fission enabled",
-        "filterfn": gv_e10s_filter,
+        "filterfn": gv_e10s_multi_filter,
         "suffix": "fis",
         "merge": {
             # Ensures the default state is to not run anywhere.
@@ -286,12 +286,13 @@
         },
     },
     "webgl-ipc": {
-        # TODO: After November 1st 2020, verify this variant is still needed.
+        # TODO: After 2021-02-01, verify this variant is still needed.
         "description": "{description} with WebGL IPC process enabled",
         "suffix": "gli",
         "replace": {
             "run-on-projects": {
                 "by-test-platform": {
+                    "linux.*-64.*": ["trunk"],
                     "mac.*": ["trunk"],
                     "win.*": ["trunk"],
                     "default": [],
@@ -571,6 +572,8 @@
         Optional("fetches"): {
             text_type: optionally_keyed_by("test-platform", [text_type])
         },
+        # Opt-in to Python 3 support
+        Optional("python-3"): bool,
     }
 )
 
@@ -921,6 +924,7 @@
                 "macosx1014-64/debug",
                 "macosx1014-64-shippable/opt",
                 "macosx1014-64-devedition/opt",
+                "macosx1014-64-devedition-qr/opt",
                 "macosx1014-64-qr/opt",
                 "macosx1014-64-shippable-qr/opt",
                 "macosx1014-64-qr/debug",
@@ -1047,34 +1051,34 @@
 
         cd_fetches = {
             "android.*": [
-                "linux64-chromedriver-84",
                 "linux64-chromedriver-85",
                 "linux64-chromedriver-86",
+                "linux64-chromedriver-87",
             ],
             "linux.*": [
-                "linux64-chromedriver-84",
                 "linux64-chromedriver-85",
                 "linux64-chromedriver-86",
+                "linux64-chromedriver-87",
             ],
             "macosx.*": [
-                "mac64-chromedriver-84",
                 "mac64-chromedriver-85",
                 "mac64-chromedriver-86",
+                "mac64-chromedriver-87",
             ],
             "windows.*aarch64.*": [
-                "win32-chromedriver-84",
                 "win32-chromedriver-85",
                 "win32-chromedriver-86",
+                "win32-chromedriver-87",
             ],
             "windows.*-32.*": [
-                "win32-chromedriver-84",
                 "win32-chromedriver-85",
                 "win32-chromedriver-86",
+                "win32-chromedriver-87",
             ],
             "windows.*-64.*": [
-                "win32-chromedriver-84",
                 "win32-chromedriver-85",
                 "win32-chromedriver-86",
+                "win32-chromedriver-87",
             ],
         }
 
diff -Nru firefox-84.0.2+build1/testing/awsy/awsy/awsy_test_case.py firefox-85.0+build1/testing/awsy/awsy/awsy_test_case.py
--- firefox-84.0.2+build1/testing/awsy/awsy/awsy_test_case.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/awsy/awsy/awsy_test_case.py	2021-01-18 19:58:19.000000000 +0000
@@ -19,7 +19,6 @@
 import mozlog.structured
 
 from marionette_driver import Wait
-from marionette_driver.legacy_actions import Actions
 from marionette_driver.errors import JavascriptException, ScriptTimeoutException
 from marionette_driver.keys import Keys
 from marionette_harness import MarionetteTestCase
@@ -380,10 +379,13 @@
         browser will see the user as becoming inactive and trigger
         appropriate GCs, as would have happened in real use.
         """
-        action = Actions(self.marionette)
-        action.key_down(Keys.SHIFT)
-        action.key_up(Keys.SHIFT)
-        action.perform()
+        try:
+            action = self.marionette.actions.sequence("key", "keyboard_id")
+            action.key_down(Keys.SHIFT)
+            action.key_up(Keys.SHIFT)
+            action.perform()
+        finally:
+            self.marionette.actions.release()
 
     def open_pages(self):
         """
diff -Nru firefox-84.0.2+build1/testing/awsy/awsy/__init__.py firefox-85.0+build1/testing/awsy/awsy/__init__.py
--- firefox-84.0.2+build1/testing/awsy/awsy/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/awsy/awsy/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Maximum number of tabs to open
 MAX_TABS = 30
 
diff -Nru firefox-84.0.2+build1/testing/condprofile/condprof/customization/__init__.py firefox-85.0+build1/testing/condprofile/condprof/customization/__init__.py
--- firefox-84.0.2+build1/testing/condprofile/condprof/customization/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/condprof/customization/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 import os
 import json
diff -Nru firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/full.py firefox-85.0+build1/testing/condprofile/condprof/scenarii/full.py
--- firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/full.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/condprof/scenarii/full.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import random
 import os
 import asyncio
diff -Nru firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/__init__.py firefox-85.0+build1/testing/condprofile/condprof/scenarii/__init__.py
--- firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/condprof/scenarii/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 from condprof.scenarii.full import full
diff -Nru firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/settled2.py firefox-85.0+build1/testing/condprofile/condprof/scenarii/settled2.py
--- firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/settled2.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/condprof/scenarii/settled2.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import asyncio
 
 
diff -Nru firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/settled.py firefox-85.0+build1/testing/condprofile/condprof/scenarii/settled.py
--- firefox-84.0.2+build1/testing/condprofile/condprof/scenarii/settled.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/condprof/scenarii/settled.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import asyncio
 
 
diff -Nru firefox-84.0.2+build1/testing/condprofile/setup.py firefox-85.0+build1/testing/condprofile/setup.py
--- firefox-84.0.2+build1/testing/condprofile/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/condprofile/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 import sys
 from setuptools import setup, find_packages
diff -Nru firefox-84.0.2+build1/testing/config/marionette_requirements.txt firefox-85.0+build1/testing/config/marionette_requirements.txt
--- firefox-84.0.2+build1/testing/config/marionette_requirements.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/config/marionette_requirements.txt	2021-01-18 19:58:19.000000000 +0000
@@ -2,7 +2,7 @@
 
 ../tools/wptserve
 ../tools/wpt_third_party/certifi
-../tools/wpt_third_party/enum
+../tools/wpt_third_party/enum ; python_version < '3'
 ../tools/wpt_third_party/h2
 ../tools/wpt_third_party/hyperframe
 ../tools/wpt_third_party/hpack
diff -Nru firefox-84.0.2+build1/testing/config/tooltool-manifests/linux64/hostutils.manifest firefox-85.0+build1/testing/config/tooltool-manifests/linux64/hostutils.manifest
--- firefox-84.0.2+build1/testing/config/tooltool-manifests/linux64/hostutils.manifest	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/config/tooltool-manifests/linux64/hostutils.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -2,9 +2,9 @@
   {
     "algorithm": "sha512",
     "visibility": "public",
-    "filename": "host-utils-77.0a1.en-US.linux-x86_64.tar.gz",
+    "filename": "host-utils-85.0a1.en-US.linux-x86_64.tar.gz",
     "unpack": true,
-    "digest": "3aa2390122e3b2e4710b4cb20700b874e06c7fd3d9e3c4e5997eb84402aaf18a46b4e71ab8b6cfeae75542e1628c4f0b7085bb00d17587282257a82126020695",
-    "size": 102554873
+    "digest": "16aba07f0ad34a5cc5fa30236f3d8c01e189e279f4ee3d0f0e76b7efd75ed462f2b46871a1d7c159e008e7627239c70be92209788a2ef6f912d8be04774e22f7",
+    "size": 102045456
   }
 ]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/config/tooltool-manifests/macosx64/hostutils.manifest firefox-85.0+build1/testing/config/tooltool-manifests/macosx64/hostutils.manifest
--- firefox-84.0.2+build1/testing/config/tooltool-manifests/macosx64/hostutils.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/config/tooltool-manifests/macosx64/hostutils.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -2,9 +2,9 @@
   {
     "algorithm": "sha512",
     "visibility": "public",
-    "filename": "host-utils-76.0a1.en-US.mac.tar.gz",
+    "filename": "host-utils-85.0a1.en-US.mac.tar.gz",
     "unpack": true,
-    "digest": "13b4162cb9dfddf3d7463a4f087a6a042d9f49d7a5dd17f93cd892fe44847bf51e4995e55641f76aea910fff8ae543262fd4c98536e766690453bb9ae8398742",
-    "size": 92410622
+    "digest": "c5a6b258c6270cd310b9815b76301cca4cd90a77f2eb6be649dff744c523b7ba2f8dee846fe2908659146e971b71f4195030b54405719a5e65095256e74a9223",
+    "size": 152791224
   }
 ]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/config/tooltool-manifests/win32/hostutils.manifest firefox-85.0+build1/testing/config/tooltool-manifests/win32/hostutils.manifest
--- firefox-84.0.2+build1/testing/config/tooltool-manifests/win32/hostutils.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/config/tooltool-manifests/win32/hostutils.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -2,9 +2,9 @@
   {
     "algorithm": "sha512",
     "visibility": "public",
-    "filename": "host-utils-79.0a1.en-US.win32.tar.gz",
+    "filename": "host-utils-85.0a1.en-US.win32.tar.gz",
     "unpack": true,
-    "digest": "05f9d48ac73aa3e5c5433f39821df0eba85c0c6a39ec3a334d4d0e64b10e352c0d46602ef0eb93dcda744dab8715a308dd8d8d7ca51a360c64a9f7c3bb2f4eb4",
-    "size": 61113183
+    "digest": "557a6c9eaee3dfe694901b9f30b02a158c873fb99f624c48d41c9715ddcd82591eb88b5b5f72d24958c499f5b572b962af7c17af235133703a065841822cb9f3",
+    "size": 65012620
   }
-]
+]
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/cppunittest.ini firefox-85.0+build1/testing/cppunittest.ini
--- firefox-84.0.2+build1/testing/cppunittest.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/cppunittest.ini	2021-01-18 19:58:19.000000000 +0000
@@ -28,6 +28,7 @@
 [TestFloatingPoint]
 [TestFunctionRef]
 [TestFunctionTypeTraits]
+[TestHashTable]
 [TestIATPatcher]
 skip-if = os != 'win'
 [TestIntegerPrintfMacros]
diff -Nru firefox-84.0.2+build1/testing/crashtest/crashtests.list firefox-85.0+build1/testing/crashtest/crashtests.list
--- firefox-84.0.2+build1/testing/crashtest/crashtests.list	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/crashtest/crashtests.list	2021-01-18 19:58:19.000000000 +0000
@@ -59,7 +59,6 @@
 include ../../layout/svg/crashtests/crashtests.list
 include ../../layout/tables/crashtests/crashtests.list
 include ../../layout/xul/crashtests/crashtests.list
-include ../../layout/xul/grid/crashtests/crashtests.list
 include ../../layout/xul/tree/crashtests/crashtests.list
 
 include ../../media/libpng/crashtests/crashtests.list
diff -Nru firefox-84.0.2+build1/testing/docs/ci-configs/index.md firefox-85.0+build1/testing/docs/ci-configs/index.md
--- firefox-84.0.2+build1/testing/docs/ci-configs/index.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/docs/ci-configs/index.md	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,65 @@
+# Configuration Changes
+
+This process outlines how Mozilla will handle configuration changes.  For a list of configuration changes, please see the [schedule](schedule.html)
+
+## Infrastructure setup (2-4 weeks)
+
+This is behind the scenes, when there is a need for a configuration change (upgrade or addition of a new platform), the first step
+is to build a machine and work to get the OS working with taskcluster.  This is work for hardware/cloud is done by IT.  Sometimes
+this is as simple as installing a package or changing an OS setting on an existing machine, but this requires automation and documentation.
+
+In some cases there is little to no work as the CI change is running tests with different runtime settings (environment variables or preferences).
+
+
+## Setting up a pool on try server (1 week)
+
+The next step is getting some machines available on try server.  This is where we add some code in tree to support the new config
+(a new worker type, test variant, etc.) and validate any setup done by IT works with taskcluster client.  Then Releng ensures the target tests
+can run at a basic level (mozharness, testharness, os environment, logging, something passes).
+
+
+## Green up tests (1 week)
+
+This is a stage where Releng will run all the target tests on try server and disable, skip, fail-if all tests that are not passing or frequently
+intermittent.  Typically there are a dozen or so iterations of this because a crash on one test means we don't run the rest of the tests in the
+manifest.
+
+
+## Turn on new config as tier-2 (1/2 week)
+
+We will time this at the start of a new release.
+
+Releng will land changes to manifests for all non passing tests and then schedule the new jobs by default.  This will be tier-2 for a couple reasons:
+ * it is a new config with a lot of tests that still need attention
+ * in many cases there is a previous config (lets say upgrading windows 10 from 1803 -> 1903) which is still running in parallel as tier-1
+
+This will now run on central and integration and be available on try server.  In a few cases where there are limited machines (android phones),
+there will be needs to turn off the old config, or make the try server access hidden behind `./mach try --full`
+
+
+## Turn on new backstop jobs which run the skipped tests (1/2 week)
+
+Releng will turn on a new temporary job that will run the tests which are not green by default.  These will run as tier-2 on mozilla-central and be sheriffed.
+
+The goal here is to find tests that are now passing and should be run by default.  By doing this we are effectively running all the tests instead of
+disabling dozens of tests and forgetting about them.
+
+
+## Handoff to developers (1 week)
+
+Releng will file bugs for all failing tests (one bug per manifest) and needinfo the triage owner to raise awareness that one or more tests in their area need
+attention.  At this point, Releng is done and will move onto other work.  Developers can reproduce the failures on try server and when fixed edit the manifest
+as appropriate.
+
+There will be at least 6 weeks to investigate and fix the tests before they are promoted to tier-1.
+
+
+## move config to tier-1 (6-7 weeks later)
+
+After the config has been running as tier-2 makes it to beta and then to the release branch (i.e. 2 new releases later), Releng will:
+ * turn off the old tier-1 tests (if applicable)
+ * promote the tier-2 jobs to tier-1
+ * turn off the backstop jobs
+
+This allows developers to schedule time in a 6 weeks period to investigate and fix any test failures.
+
diff -Nru firefox-84.0.2+build1/testing/docs/ci-configs/schedule.md firefox-85.0+build1/testing/docs/ci-configs/schedule.md
--- firefox-84.0.2+build1/testing/docs/ci-configs/schedule.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/docs/ci-configs/schedule.md	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,48 @@
+# Schedule
+
+For each CI config change, we need to follow:
+ * scope of work (what will run, how frequently)
+ * capacity planning (cost, physical space limitations)
+ * will this replace anything or is this 100% new
+ * puppet/deployment scripts or documentation
+ * setup pool on try server
+ * documented updated on this page, communicate with release management and others as appropriate
+
+
+## Current / Future CI config changes
+
+Start Date | Completed | Tracking Bug | Description
+--- | --- | --- | ---
+October 2020  | TBD | [Bug 1665012](https://bugzilla.mozilla.org/show_bug.cgi?id=1665012) | add samsung S7 phones for perf testing
+November 2020 | TBD | [Bug 1676850](https://bugzilla.mozilla.org/show_bug.cgi?id=1676850) | Windows tests migrate from AWS -> Datacenter/Azure and 1803 -> 1903
+November 2020 | TBD | TBD | upgrade datacenter linux perf machines from ubuntu 16.04 to 18.04
+TBD  | TBD | [Bug 1665012](https://bugzilla.mozilla.org/show_bug.cgi?id=1665012) | Android phones upgrade from version 7 -> 10
+October 2020  | TBD | [Bug 1673067](https://bugzilla.mozilla.org/show_bug.cgi?id=1673067) | Run tests on MacOSX BigSur (subset in parallel)
+October 2020  | TBD | [Bug 1673067](https://bugzilla.mozilla.org/show_bug.cgi?id=1673067) | Run tests on MacOSX Aarch64 (subset in parallel)
+December 2020 | TBD | TBD | Migrate OSX from Mac Mini R7, OSX 10.14 (Mojave) -> Mac Mini R8, OSX 10.15 (Catalina)
+TBD  | TBD | TBD | Migrate more coverage of OSX from 10.14 to BigSur/aarch64
+TBD  | TBD | TBD | Upgrade ubuntu from 18.04 to 20.04
+TBD  | TBD | TBD | Upgrade android emulators to modern version
+September 2020 | TBD | [Bug 1548264](https://bugzilla.mozilla.org/show_bug.cgi?id=1548264) | Python 2.7 -> 3.6 migration in CI
+TBD  | TBD | [Bug 1665010](https://bugzilla.mozilla.org/show_bug.cgi?id=1665010) | Add more android phone hardware (replace moto g5 and probably pixel 2)
+TBD  | TBD | TBD | Upgrade datacenter hardware for windows/linux (primarily perf)
+TBD  | TBD | TBD | Add Linux ARM64 worker in AWS (as it is close to Apple Silicon)
+
+
+## Completed CI config changes
+
+Start Date | Completed | Tracking Bug | Description
+--- | --- | --- | ---
+July 2020 | October 2020| [Bug 1653344](https://bugzilla.mozilla.org/show_bug.cgi?id=1653344) | Remove EDID dongles from MacOSX machines
+August 2020 | September 2020 | [Bug 1643689](https://bugzilla.mozilla.org/show_bug.cgi?id=1643689) | Schedule tests by test selection/manifest
+June 2020 | August 2020 | [Bug 1486004](https://bugzilla.mozilla.org/show_bug.cgi?id=1486004) | Android hardware tests running without rooted phones
+August 2019 | January 2020 | [Bug 1572242](https://bugzilla.mozilla.org/show_bug.cgi?id=1572242) | Upgrade Ubuntu from 16.04 to 18.04 (finished in January)
+
+
+## Appendix:
+ * *OS*: base operating system such as Android, Linux, Mac OSX, Windows
+ * *Hardware*: specific cpu/memory/disk/graphics/display/inputs that we are using, could be physical hardware we own or manage, or it could be a cloud provider.
+ * *Platform*: a combination of hardware and OS
+ * *Configuration*: what we change on a platform (can be runtime with flags), installed OS software updates (service pack), tools (python/node/etc.), hardware or OS settings (anti aliasing, display resolution, background processes, clipboard), environment variables, 
+ * *Test Failure*: a test doesn’t report the expected result (if we expect fail and we crash, that is unexpected).  Typically this is a failure, but it can be a timeout, crash, not run, or even pass
+ * *Greening up*: Assuming all tests return expected results (passing), they are green.  When tests fail, they are orange.  We need to find a way to get all tests green by investigating test failures.
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/cookies/cookie_single.html firefox-85.0+build1/testing/firefox-ui/resources/cookies/cookie_single.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/cookies/cookie_single.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/cookies/cookie_single.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_community.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_community.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_community.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_community.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_contribute.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_contribute.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_contribute.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_contribute.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_governance.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_governance.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_governance.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_governance.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_grants.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_grants.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_grants.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_grants.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_mission.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_mission.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_mission.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_mission.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_organizations.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_organizations.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_organizations.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_organizations.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_projects.html firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_projects.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/layout/mozilla_projects.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/layout/mozilla_projects.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/private_browsing/about.html firefox-85.0+build1/testing/firefox-ui/resources/private_browsing/about.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/private_browsing/about.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/private_browsing/about.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/support.html firefox-85.0+build1/testing/firefox-ui/resources/support.html
--- firefox-84.0.2+build1/testing/firefox-ui/resources/support.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/support.html	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+<!-- 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/. -->
+
 <!DOCTYPE html>
 <html>
 <head>
diff -Nru firefox-84.0.2+build1/testing/firefox-ui/resources/update/snippet_empty.xml firefox-85.0+build1/testing/firefox-ui/resources/update/snippet_empty.xml
--- firefox-84.0.2+build1/testing/firefox-ui/resources/update/snippet_empty.xml	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/firefox-ui/resources/update/snippet_empty.xml	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
 <?xml version="1.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/. -->
+
 <updates>
 </updates>
diff -Nru firefox-84.0.2+build1/testing/geckodriver/build.rs firefox-85.0+build1/testing/geckodriver/build.rs
--- firefox-84.0.2+build1/testing/geckodriver/build.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/build.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Writes build information to ${OUT_DIR}/build-info.rs which is included in
 // the program during compilation:
 //
@@ -42,13 +46,11 @@
         Box::new(Hg {})
     } else if Path::exists(&dir.join(".git")) {
         Box::new(Git {})
+    } else if let Some(parent) = dir.parent() {
+        get_build_info(parent)
     } else {
-        if let Some(parent) = dir.parent() {
-            get_build_info(parent)
-        } else {
-            eprintln!("unable to detect vcs");
-            Box::new(Noop {})
-        }
+        eprintln!("unable to detect vcs");
+        Box::new(Noop {})
     }
 }
 
diff -Nru firefox-84.0.2+build1/testing/geckodriver/doc/Capabilities.md firefox-85.0+build1/testing/geckodriver/doc/Capabilities.md
--- firefox-84.0.2+build1/testing/geckodriver/doc/Capabilities.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/doc/Capabilities.md	2021-01-18 19:58:19.000000000 +0000
@@ -8,6 +8,52 @@
 concerns that normal users should not care about:
 
 
+`moz:debuggerAddress`
+--------------------
+
+A boolean value to indicate if Firefox has to be started with the
+[Remote Protocol] enabled, which is a low-level debugging interface that
+implements a subset of the [Chrome DevTools Protocol] (CDP).
+
+When enabled the returned `moz:debuggerAddress` capability of the `New Session`
+command is the `host:port` combination of a server that supports the following
+HTTP endpoints:
+
+### GET /json/version
+
+The browser version metadata:
+
+    {
+        "Browser": "Firefox/84.0a1",
+        "Protocol-Version": "1.0",
+        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:84.0) Gecko/20100101 Firefox/84.0",
+        "V8-Version": "1.0",
+        "WebKit-Version": "1.0",
+        "webSocketDebuggerUrl": "ws://localhost:9222/devtools/browser/fe507083-2960-a442-bbd7-7dfe1f111c05"
+    }
+
+### GET /json/list
+
+A list of all available websocket targets:
+
+    [ {
+        "description": "",
+        "devtoolsFrontendUrl": null,
+        "faviconUrl": "",
+        "id": "ecbf9028-676a-1b40-8596-a5edc0e2875b",
+        "type": "page",
+        "url": "https://www.mozilla.org/en-US/",
+        "browsingContextId": 29,
+        "webSocketDebuggerUrl": "ws://localhost:9222/devtools/page/ecbf9028-676a-1b40-8596-a5edc0e2875b"
+    } ]
+
+The contained `webSocketDebuggerUrl` entries can be used to connect to the
+websocket and interact with the browser by using the CDP protocol.
+
+[Remote Protocol]: /testing/remote/doc/
+[Chrome DevTools Protocol]: https://chromedevtools.github.io/devtools-protocol/
+
+
 `moz:useNonSpecCompliantPointerOrigin`
 --------------------------------------
 
diff -Nru firefox-84.0.2+build1/testing/geckodriver/doc/Flags.md firefox-85.0+build1/testing/geckodriver/doc/Flags.md
--- firefox-84.0.2+build1/testing/geckodriver/doc/Flags.md	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/doc/Flags.md	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 Flags
 =====
 
-#### <code>--android-storage <var>ANDROID_STORAGE</var></code>
+#### <code>&#x2D;&#x2D;android-storage <var>ANDROID_STORAGE</var></code>
 
 Selects the test data location on the Android device, eg. the Firefox profile.
 By default `auto` is used.
@@ -47,7 +47,7 @@
 </table>
 
 
-#### <code>-b <var>BINARY</var></code> / <code>--binary <var>BINARY</var></code>
+#### <code>-b <var>BINARY</var></code> / <code>&#x2D;&#x2D;binary <var>BINARY</var></code>
 
 Path to the Firefox binary to use.  By default geckodriver tries to
 find and use the system installation of Firefox, but that behaviour
@@ -74,7 +74,7 @@
 [whereis(1)]: http://www.manpagez.com/man/1/whereis/
 
 
-#### <code>--connect-existing</code>
+#### <code>&#x2D;&#x2D;connect-existing</code>
 
 Connect geckodriver to an existing Firefox instance.  This means
 geckodriver will abstain from the default of starting a new Firefox
@@ -85,29 +85,29 @@
 `-marionette` flag.  Unless the `marionette.port` preference
 has been user-set, Marionette will listen on port 2828.  So when
 using `--connect-existing` it is likely you will also have to use
-[`--marionette-port`] to set the correct port.
+`--marionette-port` to set the correct port.
 
-[`--marionette-port`]: #marionette-port
+[`&#x2D;&#x2D;marionette-port`]: #marionette-port
 
 
-#### <code>--host <var>HOST</var></code>
+#### <code>&#x2D;&#x2D;host <var>HOST</var></code>
 
 Host to use for the WebDriver server.  Defaults to 127.0.0.1.
 
 
-#### <code>--log <var>LEVEL</var></code>
+#### <code>&#x2D;&#x2D;log <var>LEVEL</var></code>
 
 Set the Gecko and geckodriver log level.  Possible values are `fatal`,
 `error`, `warn`, `info`, `config`, `debug`, and `trace`.
 
 
-#### <code>--marionette-host <var>HOST</var></code>
+#### <code>&#x2D;&#x2D;marionette-host <var>HOST</var></code>
 
 Selects the host for geckodriver’s connection to the [Marionette]
 remote protocol. Defaults to 127.0.0.1.
 
 
-#### <code>--marionette-port <var>PORT</var></code>
+#### <code>&#x2D;&#x2D;marionette-port <var>PORT</var></code>
 
 Selects the port for geckodriver’s connection to the [Marionette]
 remote protocol.
@@ -116,13 +116,13 @@
 process, it will pick a free port assigned by the system and set the
 `marionette.port` preference in the profile.
 
-When [`--connect-existing`] is used and the Firefox process is not
+When `--connect-existing` is used and the Firefox process is not
 under geckodriver’s control, it will simply connect to <var>PORT</var>.
 
 [`--connect-existing`]: #connect-existing
 
 
-#### <code>-p <var>PORT</var></code> / <code>--port <var>PORT</var></code>
+#### <code>-p <var>PORT</var></code> / <code>&#x2D;&#x2D;port <var>PORT</var></code>
 
 Port to use for the WebDriver server.  Defaults to 4444.
 
@@ -130,7 +130,7 @@
 system to atomically assign a free port.
 
 
-#### <code>--jsdebugger</code>
+#### <code>&#x2D;&#x2D;jsdebugger</code>
 
 Attach [browser toolbox] debugger when Firefox starts.  This is
 useful for debugging [Marionette] internals.
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/common.rs firefox-85.0+build1/testing/geckodriver/marionette/src/common.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/common.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/common.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::ser::SerializeMap;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/error.rs firefox-85.0+build1/testing/geckodriver/marionette/src/error.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/error.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/error.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 std::error;
 use std::fmt;
 
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/lib.rs firefox-85.0+build1/testing/geckodriver/marionette/src/lib.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 pub mod error;
 
 pub mod common;
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/marionette.rs firefox-85.0+build1/testing/geckodriver/marionette/src/marionette.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/marionette.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/marionette.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::{Deserialize, Serialize};
 
 use crate::common::BoolValue;
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/message.rs firefox-85.0+build1/testing/geckodriver/marionette/src/message.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/message.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/message.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::de::{self, SeqAccess, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::{Map, Value};
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/result.rs firefox-85.0+build1/testing/geckodriver/marionette/src/result.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/result.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/result.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::de;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/test.rs firefox-85.0+build1/testing/geckodriver/marionette/src/test.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/test.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/test.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 pub static ELEMENT_KEY: &'static str = "element-6066-11e4-a52e-4f735466cecf";
 
 pub fn assert_ser_de<T>(data: &T, json: serde_json::Value)
diff -Nru firefox-84.0.2+build1/testing/geckodriver/marionette/src/webdriver.rs firefox-85.0+build1/testing/geckodriver/marionette/src/webdriver.rs
--- firefox-84.0.2+build1/testing/geckodriver/marionette/src/webdriver.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/marionette/src/webdriver.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::{Deserialize, Serialize};
 use serde_json::Value;
 
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/build.rs firefox-85.0+build1/testing/geckodriver/src/build.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/build.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/build.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde_json::Value;
 use std::fmt;
 
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/capabilities.rs firefox-85.0+build1/testing/geckodriver/src/capabilities.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/capabilities.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/capabilities.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::command::LogOptions;
 use crate::logging::Level;
 use base64;
@@ -313,6 +317,14 @@
                     ));
                 }
             }
+            "moz:debuggerAddress" => {
+                if !value.is_boolean() {
+                    return Err(WebDriverError::new(
+                        ErrorStatus::InvalidArgument,
+                        "moz:debuggerAddress is not a boolean",
+                    ));
+                }
+            }
             _ => {
                 return Err(WebDriverError::new(
                     ErrorStatus::InvalidArgument,
@@ -397,6 +409,35 @@
             rv.profile = FirefoxOptions::load_profile(&options)?;
         }
 
+        if let Some(json) = matched.remove("moz:debuggerAddress") {
+            let use_web_socket = json.as_bool().ok_or_else(|| {
+                WebDriverError::new(
+                    ErrorStatus::InvalidArgument,
+                    "moz:debuggerAddress is not a boolean",
+                )
+            })?;
+
+            if use_web_socket {
+                let mut remote_args = Vec::new();
+                remote_args.push("--remote-debugging-port".to_owned());
+                remote_args.push("0".to_owned());
+
+                if let Some(ref mut args) = rv.args {
+                    args.append(&mut remote_args);
+                } else {
+                    rv.args = Some(remote_args);
+                }
+
+                // Force Fission disabled until Remote Agent is compatible,
+                // and preference hasn't been already set
+                let has_fission_pref = rv.prefs.iter().find(|&x| x.0 == "fission.autostart");
+                if has_fission_pref.is_none() {
+                    rv.prefs
+                        .push(("fission.autostart".to_owned(), Pref::new(false)));
+                }
+            }
+        }
+
         Ok(rv)
     }
 
@@ -755,6 +796,57 @@
     }
 
     #[test]
+    fn fx_options_from_capabilities_with_debugger_address_not_set() {
+        let mut caps = Capabilities::new();
+
+        let opts = FirefoxOptions::from_capabilities(None, AndroidStorageInput::Auto, &mut caps)
+            .expect("Valid Firefox options");
+
+        assert!(
+            opts.args.is_none(),
+            "CLI arguments for Firefox unexpectedly found"
+        );
+    }
+
+    #[test]
+    fn fx_options_from_capabilities_with_debugger_address_false() {
+        let mut caps = Capabilities::new();
+        caps.insert("moz:debuggerAddress".into(), json!(false));
+
+        let opts = FirefoxOptions::from_capabilities(None, AndroidStorageInput::Auto, &mut caps)
+            .expect("Valid Firefox options");
+
+        assert!(
+            opts.args.is_none(),
+            "CLI arguments for remote protocol unexpectedly found"
+        );
+    }
+
+    #[test]
+    fn fx_options_from_capabilities_with_debugger_address_true() {
+        let mut caps = Capabilities::new();
+        caps.insert("moz:debuggerAddress".into(), json!(true));
+
+        let opts = FirefoxOptions::from_capabilities(None, AndroidStorageInput::Auto, &mut caps)
+            .expect("Valid Firefox options");
+
+        if let Some(args) = opts.args {
+            let mut iter = args.iter();
+            assert!(iter
+                .find(|&arg| arg == &"--remote-debugging-port".to_owned())
+                .is_some());
+            assert_eq!(iter.next(), Some(&"0".to_owned()));
+        } else {
+            assert!(false, "CLI arguments for remote protocol not found");
+        }
+
+        assert!(opts
+            .prefs
+            .iter()
+            .any(|pref| pref == &("fission.autostart".to_owned(), Pref::new(false))));
+    }
+
+    #[test]
     fn fx_options_from_capabilities_with_invalid_caps() {
         let mut caps = Capabilities::new();
         caps.insert("moz:firefoxOptions".into(), json!(42));
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/command.rs firefox-85.0+build1/testing/geckodriver/src/command.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/command.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/command.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::logging;
 use base64;
 use hyper::Method;
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/logging.rs firefox-85.0+build1/testing/geckodriver/src/logging.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/logging.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/logging.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 //! Gecko-esque logger implementation for the [`log`] crate.
 //!
 //! The [`log`] crate provides a single logging API that abstracts over the
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/marionette.rs firefox-85.0+build1/testing/geckodriver/src/marionette.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/marionette.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/marionette.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::android::AndroidHandler;
 use crate::command::{
     AddonInstallParameters, AddonUninstallParameters, GeckoContextParameters,
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/prefs.rs firefox-85.0+build1/testing/geckodriver/src/prefs.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/prefs.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/prefs.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 mozprofile::preferences::Pref;
 
 // ALL CHANGES TO THIS FILE MUST HAVE REVIEW FROM A GECKODRIVER PEER!
diff -Nru firefox-84.0.2+build1/testing/geckodriver/src/test.rs firefox-85.0+build1/testing/geckodriver/src/test.rs
--- firefox-84.0.2+build1/testing/geckodriver/src/test.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/geckodriver/src/test.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 pub fn assert_de<T>(data: &T, json: serde_json::Value)
 where
     T: std::fmt::Debug,
diff -Nru firefox-84.0.2+build1/testing/marionette/actors/MarionetteCommandsChild.jsm firefox-85.0+build1/testing/marionette/actors/MarionetteCommandsChild.jsm
--- firefox-84.0.2+build1/testing/marionette/actors/MarionetteCommandsChild.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/actors/MarionetteCommandsChild.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -6,7 +6,7 @@
 
 "use strict";
 
-const EXPORTED_SYMBOLS = ["MarionetteCommandsChild"];
+const EXPORTED_SYMBOLS = ["MarionetteCommandsChild", "clearActionInputState"];
 
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
@@ -28,12 +28,14 @@
 
 XPCOMUtils.defineLazyGetter(this, "logger", () => Log.get());
 
+let inputStateIsDirty = false;
+
 class MarionetteCommandsChild extends JSWindowActorChild {
   constructor() {
     super();
 
     // sandbox storage and name of the current sandbox
-    this.sandboxes = new Sandboxes(() => this.contentWindow);
+    this.sandboxes = new Sandboxes(() => this.document.defaultView);
   }
 
   get innerWindowId() {
@@ -59,27 +61,36 @@
 
     // Listen for click event to indicate one click has happened, so actions
     // code can send dblclick event
-    this.contentWindow.addEventListener(
+    this.document.defaultView.addEventListener(
       "click",
       event.DoubleClickTracker.setClick
     );
-    this.contentWindow.addEventListener(
+    this.document.defaultView.addEventListener(
       "dblclick",
       event.DoubleClickTracker.resetClick
     );
-    this.contentWindow.addEventListener(
+    this.document.defaultView.addEventListener(
       "unload",
       event.DoubleClickTracker.resetClick,
       true
     );
+    clearActionInputState();
   }
 
   async receiveMessage(msg) {
+    if (!this.contentWindow) {
+      throw new DOMException("Actor is no longer active", "InactiveActor");
+    }
+
     try {
       let result;
 
       const { name, data: serializedData } = msg;
-      const data = evaluate.fromJSON(serializedData, null, this.contentWindow);
+      const data = evaluate.fromJSON(
+        serializedData,
+        null,
+        this.document.defaultView
+      );
 
       switch (name) {
         case "MarionetteCommandsParent:clearElement":
@@ -202,7 +213,7 @@
     if (opts.sandboxName) {
       sb = this.sandboxes.get(opts.sandboxName, opts.newSandbox);
     } else {
-      sb = sandbox.createMutable(this.contentWindow);
+      sb = sandbox.createMutable(this.document.defaultView);
     }
 
     return evaluate.sandbox(sb, script, args, opts);
@@ -224,7 +235,7 @@
 
     opts.all = false;
 
-    const container = { frame: this.contentWindow };
+    const container = { frame: this.document.defaultView };
     return element.find(container, strategy, selector, opts);
   }
 
@@ -244,7 +255,7 @@
 
     opts.all = true;
 
-    const container = { frame: this.contentWindow };
+    const container = { frame: this.document.defaultView };
     return element.find(container, strategy, selector, opts);
   }
 
@@ -264,7 +275,7 @@
    * Get the current URL.
    */
   async getCurrentUrl() {
-    return this.contentWindow.location.href;
+    return this.document.defaultView.location.href;
   }
 
   /**
@@ -299,8 +310,8 @@
 
     const rect = elem.getBoundingClientRect();
     return {
-      x: rect.x + this.contentWindow.pageXOffset,
-      y: rect.y + this.contentWindow.pageYOffset,
+      x: rect.x + this.document.defaultView.pageXOffset,
+      y: rect.y + this.document.defaultView.pageYOffset,
       width: rect.width,
       height: rect.height,
     };
@@ -321,7 +332,7 @@
   async getElementText(options = {}) {
     const { elem } = options;
 
-    return atom.getElementText(elem, this.contentWindow);
+    return atom.getElementText(elem, this.document.defaultView);
   }
 
   /**
@@ -330,7 +341,7 @@
   async getElementValueOfCssProperty(options = {}) {
     const { name, elem } = options;
 
-    const style = this.contentWindow.getComputedStyle(elem);
+    const style = this.document.defaultView.getComputedStyle(elem);
     return style.getPropertyValue(name);
   }
 
@@ -364,7 +375,9 @@
    */
   async getScreenshotRect(options = {}) {
     const { elem, full = true, scroll = true } = options;
-    const win = elem ? this.contentWindow : this.browsingContext.top.window;
+    const win = elem
+      ? this.document.defaultView
+      : this.browsingContext.top.window;
 
     let rect;
 
@@ -439,9 +452,11 @@
 
     await action.dispatch(
       action.Chain.fromJSON(actions),
-      this.contentWindow,
+      this.document.defaultView,
       !capabilities["moz:useNonSpecCompliantPointerOrigin"]
     );
+    inputStateIsDirty =
+      action.inputsToCancel.length || action.inputStateMap.size;
   }
 
   /**
@@ -454,10 +469,9 @@
     await action.dispatchTickActions(
       action.inputsToCancel.reverse(),
       0,
-      this.contentWindow
+      this.document.defaultView
     );
-    action.inputsToCancel.length = 0;
-    action.inputStateMap.clear();
+    clearActionInputState();
 
     event.DoubleClickTracker.resetClick();
   }
@@ -533,3 +547,15 @@
     return { browsingContextId: browsingContext.id };
   }
 }
+
+/**
+ * Reset Action API input state
+ */
+function clearActionInputState() {
+  // Avoid loading the action module before it is needed by a command
+  if (inputStateIsDirty) {
+    action.inputStateMap.clear();
+    action.inputsToCancel.length = 0;
+    inputStateIsDirty = false;
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/marionette/actors/MarionetteCommandsParent.jsm firefox-85.0+build1/testing/marionette/actors/MarionetteCommandsParent.jsm
--- firefox-84.0.2+build1/testing/marionette/actors/MarionetteCommandsParent.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/actors/MarionetteCommandsParent.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -8,6 +8,8 @@
   "clearElementIdCache",
   "getMarionetteCommandsActorProxy",
   "MarionetteCommandsParent",
+  "registerCommandsActor",
+  "unregisterCommandsActor",
 ];
 
 const { XPCOMUtils } = ChromeUtils.import(
@@ -333,8 +335,9 @@
               const result = await actor[methodName](...args);
               return result;
             } catch (e) {
-              if (e.name !== "AbortError") {
-                // Only AbortError(s) are retried, let any other error through.
+              if (!["AbortError", "InactiveActor"].includes(e.name)) {
+                // Only retry when the JSWindowActor pair gets destroyed, or
+                // gets inactive eg. when the page is moved into bfcache.
                 throw e;
               }
 
@@ -345,10 +348,13 @@
               if (++attempts > MAX_ATTEMPTS) {
                 const browsingContextId = browsingContextFn()?.id;
                 logger.trace(
-                  `[${browsingContextId}] Query "${methodName}" reached the limit of retry attempts (${MAX_ATTEMPTS})`
+                  `[${browsingContextId}] Querying "${methodName} "` +
+                    `reached the limit of retry attempts (${MAX_ATTEMPTS})`
                 );
                 throw e;
               }
+
+              logger.trace(`Retrying "${methodName}", attempt: ${attempts}`);
             }
           }
         };
@@ -356,3 +362,35 @@
     }
   );
 }
+
+/**
+ * Register the MarionetteCommands actor that holds all the commands.
+ */
+function registerCommandsActor() {
+  try {
+    ChromeUtils.registerWindowActor("MarionetteCommands", {
+      kind: "JSWindowActor",
+      parent: {
+        moduleURI:
+          "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
+      },
+      child: {
+        moduleURI:
+          "chrome://marionette/content/actors/MarionetteCommandsChild.jsm",
+      },
+
+      allFrames: true,
+      includeChrome: true,
+    });
+  } catch (e) {
+    if (e.name === "NotSupportedError") {
+      logger.warn(`MarionetteCommands actor is already registered!`);
+    } else {
+      throw e;
+    }
+  }
+}
+
+function unregisterCommandsActor() {
+  ChromeUtils.unregisterWindowActor("MarionetteCommands");
+}
diff -Nru firefox-84.0.2+build1/testing/marionette/actors/MarionetteReftestChild.jsm firefox-85.0+build1/testing/marionette/actors/MarionetteReftestChild.jsm
--- firefox-84.0.2+build1/testing/marionette/actors/MarionetteReftestChild.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/actors/MarionetteReftestChild.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -91,7 +91,9 @@
     const hasReftestWait = documentElement.classList.contains("reftest-wait");
 
     logger.debug("Waiting for event loop to spin");
-    await new Promise(resolve => this.contentWindow.setTimeout(resolve, 0));
+    await new Promise(resolve =>
+      this.document.defaultView.setTimeout(resolve, 0)
+    );
 
     await this.paintComplete(useRemote);
 
@@ -103,8 +105,8 @@
       await this.paintComplete(useRemote);
     }
     if (
-      this.contentWindow.innerWidth < documentElement.scrollWidth ||
-      this.contentWindow.innerHeight < documentElement.scrollHeight
+      this.document.defaultView.innerWidth < documentElement.scrollWidth ||
+      this.document.defaultView.innerHeight < documentElement.scrollHeight
     ) {
       logger.warn(
         `${url} overflows viewport (width: ${documentElement.scrollWidth}, height: ${documentElement.scrollHeight})`
@@ -115,7 +117,7 @@
 
   paintComplete(useRemote) {
     logger.debug("Waiting for rendering");
-    let windowUtils = this.contentWindow.windowUtils;
+    let windowUtils = this.document.defaultView.windowUtils;
     return new Promise(resolve => {
       let maybeResolve = () => {
         this.flushRendering();
@@ -127,14 +129,18 @@
 
         if (windowUtils.isMozAfterPaintPending) {
           logger.debug("isMozAfterPaintPending: true");
-          this.contentWindow.addEventListener("MozAfterPaint", maybeResolve, {
-            once: true,
-          });
+          this.document.defaultView.addEventListener(
+            "MozAfterPaint",
+            maybeResolve,
+            {
+              once: true,
+            }
+          );
         } else {
           // resolve at the start of the next frame in case of leftover paints
           logger.debug("isMozAfterPaintPending: false");
-          this.contentWindow.requestAnimationFrame(() => {
-            this.contentWindow.requestAnimationFrame(resolve);
+          this.document.defaultView.requestAnimationFrame(() => {
+            this.document.defaultView.requestAnimationFrame(resolve);
           });
         }
       };
@@ -146,17 +152,17 @@
     logger.debug("Waiting for reftest-wait removal");
     return new Promise(resolve => {
       const documentElement = this.document.documentElement;
-      let observer = new this.contentWindow.MutationObserver(() => {
+      let observer = new this.document.defaultView.MutationObserver(() => {
         if (!documentElement.classList.contains("reftest-wait")) {
           observer.disconnect();
           logger.debug("reftest-wait removed");
-          this.contentWindow.setTimeout(resolve, 0);
+          this.document.defaultView.setTimeout(resolve, 0);
         }
       });
       if (documentElement.classList.contains("reftest-wait")) {
         observer.observe(documentElement, { attributes: true });
       } else {
-        this.contentWindow.setTimeout(resolve, 0);
+        this.document.defaultView.setTimeout(resolve, 0);
       }
     });
   }
@@ -164,7 +170,7 @@
   flushRendering() {
     let anyPendingPaintsGeneratedInDescendants = false;
 
-    let windowUtils = this.contentWindow.windowUtils;
+    let windowUtils = this.document.defaultView.windowUtils;
 
     function flushWindow(win) {
       let utils = win.windowUtils;
@@ -188,7 +194,7 @@
         flushWindow(win.frames[i]);
       }
     }
-    flushWindow(this.contentWindow);
+    flushWindow(this.document.defaultView);
 
     if (
       anyPendingPaintsGeneratedInDescendants &&
diff -Nru firefox-84.0.2+build1/testing/marionette/browser.js firefox-85.0+build1/testing/marionette/browser.js
--- firefox-84.0.2+build1/testing/marionette/browser.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/browser.js	2021-01-18 19:58:19.000000000 +0000
@@ -94,6 +94,10 @@
     });
     this.window.document.dispatchEvent(event);
   }
+
+  get selectedBrowser() {
+    return this.selectedTab.linkedBrowser;
+  }
 }
 
 /**
@@ -158,8 +162,6 @@
     // and MobileTabBrowser in GeckoView.
     this.tabBrowser = browser.getTabBrowser(this.window);
 
-    this.knownFrames = [];
-
     // Used to set curFrameId upon new session
     this.newSession = true;
 
@@ -462,79 +464,26 @@
    * if it is not already assigned, and if a) we already have a session
    * or b) we're starting a new session and it is the right start frame.
    *
-   * @param {string} uid
-   *     Frame uid for use by Marionette.
    * @param {xul:browser} target
    *     The <xul:browser> that was the target of the originating message.
    */
-  register(uid, target) {
-    if (this.tabBrowser) {
-      // If we're setting up a new session on Firefox, we only process the
-      // registration for this frame if it belongs to the current tab.
-      if (!this.tab) {
-        this.switchToTab();
-      }
-
-      if (target === this.contentBrowser) {
-        this.updateIdForBrowser(this.contentBrowser, uid);
-      }
+  register(target) {
+    if (!this.tabBrowser) {
+      return;
     }
 
-    // used to delete sessions
-    this.knownFrames.push(uid);
-  }
-};
-
-/**
- * The window storage is used to save browsing context ids mapped to weak
- * references of Window objects.
- *
- * Usage:
- *
- *     let wins = new browser.Windows();
- *     wins.set(browser.browsingContext.id, window);
- *
- *     ...
- *
- *     let win = wins.get(browser.browsingContext.id);
- *
- */
-browser.Windows = class extends Map {
-  /**
-   * Save a weak reference to the Window object.
-   *
-   * @param {string} id
-   *     Browsing context id.
-   * @param {Window} win
-   *     Window object to save.
-   *
-   * @return {browser.Windows}
-   *     Instance of self.
-   */
-  set(id, win) {
-    let wref = Cu.getWeakReference(win);
-    super.set(id, wref);
-    return this;
-  }
+    // If we're setting up a new session on Firefox, we only process the
+    // registration for this frame if it belongs to the current tab.
+    if (!this.tab) {
+      this.switchToTab();
+    }
 
-  /**
-   * Get the window object stored by provided |id|.
-   *
-   * @param {string} id
-   *     Browsing context id.
-   *
-   * @return {Window}
-   *     Saved window object.
-   *
-   * @throws {RangeError}
-   *     If |id| is not in the store.
-   */
-  get(id) {
-    let wref = super.get(id);
-    if (!wref) {
-      throw new RangeError();
+    if (target === this.contentBrowser) {
+      // Note that browsing contexts can be swapped during navigation in which
+      // case this id would no longer match the target. See Bug 1680479.
+      const uid = target.browsingContext.id;
+      this.updateIdForBrowser(this.contentBrowser, uid);
     }
-    return wref.get();
   }
 };
 
diff -Nru firefox-84.0.2+build1/testing/marionette/client/marionette_driver/geckoinstance.py firefox-85.0+build1/testing/marionette/client/marionette_driver/geckoinstance.py
--- firefox-84.0.2+build1/testing/marionette/client/marionette_driver/geckoinstance.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/client/marionette_driver/geckoinstance.py	2021-01-18 19:58:19.000000000 +0000
@@ -572,8 +572,6 @@
         "browser.startup.homepage_override.mstone": "ignore",
         # Start with a blank page by default
         "browser.startup.page": 0,
-        # Bug 1557457: Disable because modal dialogs might not appear in Firefox
-        "browser.tabs.remote.separatePrivilegedContentProcess": False,
         # Don't unload tabs when available memory is running low
         "browser.tabs.unloadOnLowMemory": False,
         # Do not warn when closing all open tabs
diff -Nru firefox-84.0.2+build1/testing/marionette/client/marionette_driver/keys.py firefox-85.0+build1/testing/marionette/client/marionette_driver/keys.py
--- firefox-84.0.2+build1/testing/marionette/client/marionette_driver/keys.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/client/marionette_driver/keys.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # copyright 2008-2009 WebDriver committers
 # Copyright 2008-2009 Google Inc.
 #
diff -Nru firefox-84.0.2+build1/testing/marionette/client/marionette_driver/transport.py firefox-85.0+build1/testing/marionette/client/marionette_driver/transport.py
--- firefox-84.0.2+build1/testing/marionette/client/marionette_driver/transport.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/client/marionette_driver/transport.py	2021-01-18 19:58:19.000000000 +0000
@@ -305,8 +305,10 @@
                 if exc.errno not in (57, 107):
                     raise
 
-            self._sock.close()
-            self._sock = None
+            if self._sock:
+                # Guard against unclean shutdown.
+                self._sock.close()
+                self._sock = None
 
     def __del__(self):
         self.close()
diff -Nru firefox-84.0.2+build1/testing/marionette/driver.js firefox-85.0+build1/testing/marionette/driver.js
--- firefox-84.0.2+build1/testing/marionette/driver.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/driver.js	2021-01-18 19:58:19.000000000 +0000
@@ -26,6 +26,8 @@
   ChromeWebElement: "chrome://marionette/content/element.js",
   clearElementIdCache:
     "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
+  clearActionInputState:
+    "chrome://marionette/content/actors/MarionetteCommandsChild.jsm",
   Context: "chrome://marionette/content/browser.js",
   cookie: "chrome://marionette/content/cookie.js",
   DebounceCallback: "chrome://marionette/content/sync.js",
@@ -47,10 +49,14 @@
   print: "chrome://marionette/content/print.js",
   proxy: "chrome://marionette/content/proxy.js",
   reftest: "chrome://marionette/content/reftest.js",
+  registerCommandsActor:
+    "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
   Sandboxes: "chrome://marionette/content/evaluate.js",
   TimedPromise: "chrome://marionette/content/sync.js",
   Timeouts: "chrome://marionette/content/capabilities.js",
   UnhandledPromptBehavior: "chrome://marionette/content/capabilities.js",
+  unregisterCommandsActor:
+    "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
   waitForEvent: "chrome://marionette/content/sync.js",
   waitForLoadEvent: "chrome://marionette/content/sync.js",
   waitForObserverTopic: "chrome://marionette/content/sync.js",
@@ -113,7 +119,6 @@
   this._server = server;
 
   this.sessionID = null;
-  this.wins = new browser.Windows();
   this.browsers = {};
 
   // Maps permanentKey to browsing context id: WeakMap.<Object, number>
@@ -271,6 +276,11 @@
 ]);
 
 GeckoDriver.prototype.init = function() {
+  if (MarionettePrefs.useActors) {
+    // When using JSWindowActors, we should not rely on framescript events
+    return;
+  }
+
   this.mm.addMessageListener("Marionette:ListenersAttached", this);
   this.mm.addMessageListener("Marionette:Register", this);
   this.mm.addMessageListener("Marionette:switchedToFrame", this);
@@ -279,6 +289,10 @@
 };
 
 GeckoDriver.prototype.uninit = function() {
+  if (MarionettePrefs.useActors) {
+    return;
+  }
+
   this.mm.removeMessageListener("Marionette:ListenersAttached", this);
   this.mm.removeMessageListener("Marionette:Register", this);
   this.mm.removeMessageListener("Marionette:switchedToFrame", this);
@@ -502,11 +516,6 @@
 
   this.browsers[winId] = context;
   this.curBrowser = this.browsers[winId];
-  if (!this.wins.has(winId)) {
-    // add this to seenItems so we can guarantee
-    // the user will get winId as this window's id
-    this.wins.set(winId, win);
-  }
 };
 
 /**
@@ -599,8 +608,10 @@
 /**
  * Handles registration of new content listener browsers.  Depending on
  * their type they are either accepted or ignored.
+ *
+ * @param {xul:browser} browserElement
  */
-GeckoDriver.prototype.registerBrowser = function(id, be) {
+GeckoDriver.prototype.registerBrowser = function(browserElement) {
   // We want to ignore frames that are XUL browsers that aren't in the "main"
   // tabbrowser, but accept things on Fennec (which doesn't have a
   // xul:tabbrowser), and accept HTML iframes (because tests depend on it),
@@ -608,17 +619,12 @@
   // keep track of browsers a different way.
   if (
     this.appId != APP_ID_FIREFOX ||
-    be.namespaceURI != XUL_NS ||
-    be.nodeName != "browser" ||
-    be.getTabBrowser()
+    browserElement.namespaceURI != XUL_NS ||
+    browserElement.nodeName != "browser" ||
+    browserElement.getTabBrowser()
   ) {
-    // curBrowser holds all the registered frames in knownFrames
-    this.curBrowser.register(id, be);
+    this.curBrowser.register(browserElement);
   }
-
-  this.wins.set(id, BrowsingContext.get(id).currentWindowGlobal);
-
-  return id;
 };
 
 GeckoDriver.prototype.registerPromise = function() {
@@ -626,8 +632,7 @@
 
   return new Promise(resolve => {
     let cb = ({ json, target }) => {
-      let { frameId } = json;
-      this.registerBrowser(frameId, target);
+      this.registerBrowser(target);
 
       if (this.curBrowser.frameRegsPending > 0) {
         this.curBrowser.frameRegsPending--;
@@ -638,7 +643,7 @@
         resolve();
       }
 
-      return { frameId };
+      return { frameId: json.frameId };
     };
     this.mm.addMessageListener(li, cb);
   });
@@ -797,8 +802,11 @@
     logger.info("Preemptively starting accessibility service in Chrome");
   }
 
-  let registerBrowsers = this.registerPromise();
-  let browserListening = this.listeningPromise();
+  let registerBrowsers, browserListening;
+  if (!MarionettePrefs.useActors) {
+    registerBrowsers = this.registerPromise();
+    browserListening = this.listeningPromise();
+  }
 
   let waitForWindow = function() {
     let windowTypes;
@@ -862,25 +870,24 @@
     throw new error.WebDriverError("Session already running");
   }
 
-  await registerBrowsers;
-  await browserListening;
-
   if (MarionettePrefs.useActors) {
-    // Register the JSWindowActor pair that holds all the commands.
-    ChromeUtils.registerWindowActor("MarionetteCommands", {
-      kind: "JSWindowActor",
-      parent: {
-        moduleURI:
-          "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
-      },
-      child: {
-        moduleURI:
-          "chrome://marionette/content/actors/MarionetteCommandsChild.jsm",
-      },
+    for (let win of this.windows) {
+      const tabBrowser = browser.getTabBrowser(win);
 
-      allFrames: true,
-      includeChrome: true,
-    });
+      if (tabBrowser) {
+        for (const tab of tabBrowser.tabs) {
+          const contentBrowser = browser.getBrowserForTab(tab);
+          this.registerBrowser(contentBrowser);
+        }
+      }
+    }
+  } else {
+    await registerBrowsers;
+    await browserListening;
+  }
+
+  if (MarionettePrefs.useActors) {
+    registerCommandsActor();
   }
 
   if (this.mainFrame) {
@@ -897,6 +904,8 @@
   this.dialogObserver = new modal.DialogObserver(this);
   this.dialogObserver.add(this.handleModalDialog.bind(this));
 
+  Services.obs.addObserver(this, "browsing-context-attached");
+
   // Check if there is already an open dialog for the selected browser window.
   this.dialog = modal.findModalDialogs(this.curBrowser);
 
@@ -906,6 +915,40 @@
   };
 };
 
+GeckoDriver.prototype.observe = function(subject, topic, data) {
+  switch (topic) {
+    case "browsing-context-attached":
+      // For cross-group navigations the complete browsing context tree of a tab
+      // gets replaced. An indication for that is when the newly attached
+      // browsing context has the same browserId as the currently selected
+      // content browsing context, and doesn't have a parent.
+      //
+      // Also the current content browsing context gets only updated when it's
+      // the top-level one to not automatically switch away from the currently
+      // selected frame.
+      if (
+        subject.browserId == this.contentBrowsingContext?.browserId &&
+        !subject.parent &&
+        !this.contentBrowsingContext?.parent
+      ) {
+        logger.trace(
+          "Remoteness change detected. Set new top-level browsing context " +
+            `to ${subject.id}`
+        );
+        this.contentBrowsingContext = subject;
+        if (MarionettePrefs.useActors) {
+          // When using the framescript, the new browsing context created after
+          // a remoteness change will self-register. With JSWindowActors, we
+          // manually update the stored browsing context id.
+          // Switching to browserId instead of browsingContext.id would make
+          // this call unnecessary. See Bug 1681973.
+          this.updateIdForBrowser(this.curBrowser.contentBrowser, subject.id);
+        }
+      }
+      break;
+  }
+};
+
 /**
  * Send the current session's capabilities to the client.
  *
@@ -1191,10 +1234,18 @@
   }
 
   // Switch to the top-level browsing context before navigating
-  await this.listener.switchToFrame();
+  if (MarionettePrefs.useActors) {
+    this.contentBrowsingContext = browsingContext;
+  } else {
+    await this.listener.switchToFrame();
+  }
 
-  const currentURL = await this._getCurrentURL();
-  const loadEventExpected = navigate.isLoadEventExpected(currentURL, validURL);
+  const loadEventExpected = navigate.isLoadEventExpected(
+    await this._getCurrentURL(),
+    {
+      future: validURL,
+    }
+  );
 
   await navigate.waitForNavigationCompleted(
     this,
@@ -1365,8 +1416,12 @@
   const browsingContext = assert.open(this.getBrowsingContext({ top: true }));
   await this._handleUserPrompts();
 
-  // Switch to the top-level browsiing context before navigating
-  await this.listener.switchToFrame();
+  // Switch to the top-level browsing context before navigating
+  if (MarionettePrefs.useActors) {
+    this.contentBrowsingContext = browsingContext;
+  } else {
+    await this.listener.switchToFrame();
+  }
 
   await navigate.waitForNavigationCompleted(this, () => {
     navigate.refresh(browsingContext);
@@ -1607,15 +1662,6 @@
     try {
       await this.setWindowHandle(found, focus);
       selected = true;
-
-      // Temporarily inform the framescript of the current browsing context to
-      // allow sending the correct page load events. This has to be done until
-      // the framescript is no longer in use (bug 1669172).
-      if (this.context == Context.Content) {
-        await this.listener.setBrowsingContextId(
-          this.contentBrowsingContext.id
-        );
-      }
     } catch (e) {
       logger.error(e);
     }
@@ -1630,7 +1676,7 @@
  * Find a specific window according to some filter function.
  *
  * @param {Iterable.<Window>} winIterable
- *     Iterable that emits Windows.
+ *     Iterable that emits Window objects.
  * @param {function(Window, number): boolean} filter
  *     A callback function taking two arguments; the window and
  *     the outerId of the window, and returning a boolean indicating
@@ -1692,7 +1738,7 @@
     // Initialise Marionette if the current chrome window has not been seen
     // before. Also register the initial tab, if one exists.
     let registerBrowsers, browserListening;
-    if (winProperties.hasTabBrowser) {
+    if (!MarionettePrefs.useActors && winProperties.hasTabBrowser) {
       registerBrowsers = this.registerPromise();
       browserListening = this.listeningPromise();
     }
@@ -1701,12 +1747,23 @@
 
     this.chromeBrowsingContext = this.mainFrame.browsingContext;
 
-    if (registerBrowsers && browserListening) {
+    if (!winProperties.hasTabBrowser) {
+      this.contentBrowsingContext = null;
+    } else if (MarionettePrefs.useActors) {
+      const tabBrowser = browser.getTabBrowser(winProperties.win);
+
+      // For chrome windows such as a reftest window, `getTabBrowser` is not
+      // a tabbrowser, it is the content browser which should be used here.
+      const contentBrowser = tabBrowser.tabs
+        ? tabBrowser.selectedBrowser
+        : tabBrowser;
+
+      this.contentBrowsingContext = contentBrowser.browsingContext;
+      this.registerBrowser(contentBrowser);
+    } else {
       await registerBrowsers;
       const id = await browserListening;
       this.contentBrowsingContext = BrowsingContext.get(id);
-    } else {
-      this.contentBrowsingContext = null;
     }
   } else {
     // Otherwise switch to the known chrome window
@@ -1751,14 +1808,6 @@
 
   if (MarionettePrefs.useActors) {
     this.contentBrowsingContext = browsingContext;
-
-    // Temporarily inform the framescript of the current browsing context to
-    // allow sending the correct page load events. This has to be done until
-    // the web progress listener is used (bug 1664165).
-    if (this.context == Context.Content) {
-      await this.listener.setBrowsingContextId(browsingContext.id);
-    }
-
     return;
   }
 
@@ -1806,14 +1855,6 @@
     );
 
     this.contentBrowsingContext = browsingContext;
-
-    // Temporarily inform the framescript of the current browsing context to
-    // allow sending the correct page load events. This has to be done until
-    // the web progress listener is used (bug 1664165).
-    if (this.context == Context.Content) {
-      await this.listener.setBrowsingContextId(browsingContext.id);
-    }
-
     return;
   }
 
@@ -2197,7 +2238,7 @@
  *     A modal dialog is open, blocking this operation.
  */
 GeckoDriver.prototype.clickElement = async function(cmd) {
-  assert.open(this.getBrowsingContext());
+  const browsingContext = assert.open(this.getBrowsingContext());
   await this._handleUserPrompts();
 
   let id = assert.string(cmd.parameters.id);
@@ -2206,12 +2247,19 @@
   if (MarionettePrefs.useActors) {
     const actor = this.getActor();
 
-    const target = await actor.getElementAttribute(webEl, "target");
+    const loadEventExpected = navigate.isLoadEventExpected(
+      await this._getCurrentURL(),
+      {
+        browsingContext,
+        target: await actor.getElementAttribute(webEl, "target"),
+      }
+    );
+
     await navigate.waitForNavigationCompleted(
       this,
       () => actor.clickElement(webEl, this.capabilities),
       {
-        loadEventExpected: target !== "_blank",
+        loadEventExpected,
         // The click might trigger a navigation, so don't count on it.
         requireBeforeUnload: false,
       }
@@ -2226,13 +2274,19 @@
       break;
 
     case Context.Content:
-      const target = await this.listener.getElementAttribute(webEl, "target");
+      const loadEventExpected = navigate.isLoadEventExpected(
+        await this._getCurrentURL(),
+        {
+          browsingContext,
+          target: this.listener.getElementAttribute(webEl, "target"),
+        }
+      );
 
       await navigate.waitForNavigationCompleted(
         this,
         () => this.listener.clickElement(webEl, this.capabilities),
         {
-          loadEventExpected: target !== "_blank",
+          loadEventExpected,
           // The click might trigger a navigation, so don't count on it.
           requireBeforeUnload: false,
         }
@@ -3030,8 +3084,9 @@
 
   if (MarionettePrefs.useActors) {
     clearElementIdCache();
+    clearActionInputState();
 
-    ChromeUtils.unregisterWindowActor("MarionetteCommands");
+    unregisterCommandsActor();
   }
 
   // reset to the top-most frame, and clear browsing context references
@@ -3044,6 +3099,10 @@
     this.dialogObserver = null;
   }
 
+  try {
+    Services.obs.removeObserver(this, "browsing-context-attached");
+  } catch (e) {}
+
   this.sandboxes.clear();
   allowAllCerts.disable();
 
@@ -3642,11 +3701,14 @@
       break;
 
     case "Marionette:Register":
-      let { frameId } = message.json;
-      this.registerBrowser(frameId, message.target);
-      return { frameId };
+      this.registerBrowser(message.target);
+      return { frameId: message.json.frameId };
 
     case "Marionette:ListenersAttached":
+      if (MarionettePrefs.useActors) {
+        return;
+      }
+
       if (message.json.frameId === this.curBrowser.curFrameId) {
         const browsingContext = BrowsingContext.get(message.json.frameId);
 
diff -Nru firefox-84.0.2+build1/testing/marionette/element.js firefox-85.0+build1/testing/marionette/element.js
--- firefox-84.0.2+build1/testing/marionette/element.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/element.js	2021-01-18 19:58:19.000000000 +0000
@@ -235,7 +235,7 @@
       delete this.els[webEl.uuid];
     }
 
-    if (el === null || element.isStale(el, win)) {
+    if (element.isStale(el, win)) {
       throw new error.StaleElementReferenceError(
         pprint`The element reference of ${el || webEl.uuid} is stale; ` +
           "either the element is no longer attached to the DOM, " +
@@ -800,27 +800,31 @@
  * @param {ElementIdentifier} id
  *     The identifier generated via ContentDOMReference.get for a DOM element.
  *
- * @param {WindowProxy=} win
- *     Current window global, which may differ from the associated
- *     window global of <var>el</var>.  When retrieving XUL
- *     elements, this is optional.
+ * @param {WindowProxy} win
+ *     Current window, which may differ from the associated
+ *     window of <var>el</var>.
  *
  * @return {Element} The DOM element that the identifier was generated for, or
  *     null if the element does not still exist.
  *
+ * @throws {NoSuchElementError}
+ *     If element represented by reference <var>id</var> doesn't exist
+ *     in the current browsing context.
  * @throws {StaleElementReferenceError}
  *     If the element has gone stale, indicating it is no longer
  *     attached to the DOM, or its node document is no longer the
  *     active document.
  */
-element.resolveElement = function(id, win = undefined) {
-  const el = ContentDOMReference.resolve(id);
-  if (el === null) {
-    // the element is unknown in the current browsing context
+element.resolveElement = function(id, win) {
+  // Don't allow elements whose browsing context differs from the current one.
+  if (id.browsingContextId != win?.browsingContext.id) {
     throw new error.NoSuchElementError(
       `Web element reference not seen before: ${JSON.stringify(id.webElRef)}`
     );
   }
+
+  const el = ContentDOMReference.resolve(id);
+
   if (element.isStale(el, win)) {
     throw new error.StaleElementReferenceError(
       pprint`The element reference of ${el || JSON.stringify(id.webElRef)} ` +
@@ -873,7 +877,9 @@
  * browsing context such as an <tt>&lt;iframe&gt;</tt>.
  *
  * @param {Element=} el
- *     DOM element to check for staleness.
+ *     DOM element to check for staleness.  If null, which may be
+ *     the case if the element has been unwrapped from a weak
+ *     reference, it is always considered stale.
  * @param {WindowProxy=} win
  *     Current window global, which may differ from the associated
  *     window global of <var>el</var>.  When retrieving XUL
@@ -883,13 +889,10 @@
  *     True if <var>el</var> is stale, false otherwise.
  */
 element.isStale = function(el, win = undefined) {
-  if (!el) {
-    throw new TypeError(`Expected Element got ${el}`);
-  }
   if (typeof win == "undefined") {
     win = el.ownerGlobal;
   }
-  if (!el.ownerGlobal || el.ownerDocument !== win.document) {
+  if (el === null || !el.ownerGlobal || el.ownerDocument !== win.document) {
     return true;
   }
 
diff -Nru firefox-84.0.2+build1/testing/marionette/.eslintrc.js firefox-85.0+build1/testing/marionette/.eslintrc.js
--- firefox-84.0.2+build1/testing/marionette/.eslintrc.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/.eslintrc.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 // inherits from ../../tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/__init__.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/__init__.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -15,6 +15,7 @@
     skip,
     skip_if_chrome,
     skip_if_desktop,
+    skip_if_framescript,
     SkipTest,
     skip_unless_browser_pref,
     skip_unless_protocol,
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/marionette_test/decorators.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/marionette_test/decorators.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/marionette_test/decorators.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/marionette_test/decorators.py	2021-01-18 19:58:19.000000000 +0000
@@ -102,6 +102,24 @@
     return decorator
 
 
+def skip_if_framescript(reason):
+    """Decorator which skips a test if the framescript implementation is used."""
+
+    def decorator(test_item):
+        if not isinstance(test_item, types.FunctionType):
+            raise Exception("Decorator only supported for functions")
+
+        @functools.wraps(test_item)
+        def skip_wrapper(self, *args, **kwargs):
+            if self.marionette.get_pref("marionette.actors.enabled") is False:
+                raise SkipTest(reason)
+            return test_item(self, *args, **kwargs)
+
+        return skip_wrapper
+
+    return decorator
+
+
 def skip_unless_browser_pref(reason, pref, predicate=bool):
     """Decorator which skips a test based on the value of a browser preference.
 
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/marionette_test/__init__.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/marionette_test/__init__.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/marionette_test/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/marionette_test/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -17,6 +17,7 @@
     run_if_manage_instance,
     skip_if_chrome,
     skip_if_desktop,
+    skip_if_framescript,
     skip_unless_browser_pref,
     skip_unless_protocol,
     with_parameters,
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py	2021-01-18 19:58:19.000000000 +0000
@@ -15,6 +15,7 @@
 from marionette_harness import (
     MarionetteTestCase,
     run_if_manage_instance,
+    skip_if_framescript,
     skip_unless_browser_pref,
     WindowManagerMixin,
 )
@@ -185,36 +186,6 @@
         self.marionette.navigate(self.test_page_frameset)
         self.marionette.find_element(By.NAME, "third")
 
-    def test_navigate_top_frame_from_nested_context(self):
-        sub_frame = inline(
-            """
-          <title>bar</title>
-          <a href="{}" target="_top">consume top frame</a>
-        """.format(
-                self.test_page_remote
-            )
-        )
-        top_frame = inline(
-            """
-          <title>foo</title>
-          <iframe src="{}">
-        """.format(
-                sub_frame
-            )
-        )
-
-        self.marionette.navigate(top_frame)
-        frame = self.marionette.find_element(By.TAG_NAME, "iframe")
-        self.marionette.switch_to_frame(frame)
-
-        link = self.marionette.find_element(By.TAG_NAME, "a")
-        link.click()
-
-        Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
-            lambda mn: mn.get_url() == self.test_page_remote,
-            message="{} hasn't been loaded".format(self.test_page_remote),
-        )
-
     def test_invalid_url(self):
         with self.assertRaises(errors.MarionetteException):
             self.marionette.navigate("foo")
@@ -915,6 +886,7 @@
 
         super(TestPageLoadStrategy, self).tearDown()
 
+    @skip_if_framescript("Bug 1675173: Won't be fixed for framescript mode")
     def test_none(self):
         self.marionette.delete_session()
         self.marionette.start_session({"pageLoadStrategy": "none"})
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py	2021-01-18 19:58:19.000000000 +0000
@@ -192,3 +192,22 @@
         self.assertEqual(self.marionette.current_window_handle, new_pb_tab)
 
         self.marionette.execute_script(" return true; ")
+
+    def test_switch_to_window_after_remoteness_change(self):
+        # Test that after a remoteness change (and a browsing context swap)
+        # marionette can still switch to tabs correctly.
+        with self.marionette.using_context("content"):
+            # about:robots runs in a different process and will trigger a
+            # remoteness change with or without fission.
+            self.marionette.navigate("about:robots")
+
+        about_robots_tab = self.marionette.current_window_handle
+
+        # Open a new tab and switch to it before trying to switch back to the
+        # initial tab.
+        tab2 = self.open_tab(focus=True)
+        self.marionette.switch_to_window(tab2)
+        self.marionette.close()
+
+        self.marionette.switch_to_window(about_robots_tab)
+        self.assertEqual(self.marionette.current_window_handle, about_robots_tab)
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_chrome.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_chrome.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_chrome.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_chrome.py	2021-01-18 19:58:19.000000000 +0000
@@ -4,12 +4,9 @@
 
 from __future__ import absolute_import
 
-import types
-
 import six
 
 from marionette_driver import errors
-
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
 
 
@@ -137,6 +134,27 @@
             self.marionette.current_chrome_window_handle, self.start_window
         )
 
+    def test_chrome_window_handles_after_session_created(self):
+        new_window = self.open_chrome_window(self.chrome_dialog)
+        self.assert_window_handles()
+        self.assertEqual(
+            len(self.marionette.chrome_window_handles), len(self.start_windows) + 1
+        )
+        self.assertIn(new_window, self.marionette.chrome_window_handles)
+        self.assertEqual(
+            self.marionette.current_chrome_window_handle, self.start_window
+        )
+
+        chrome_window_handles = self.marionette.chrome_window_handles
+
+        self.marionette.delete_session()
+        self.marionette.start_session()
+
+        self.assert_window_handles()
+        self.assertEqual(chrome_window_handles, self.marionette.chrome_window_handles)
+
+        self.marionette.switch_to_window(new_window)
+
     def test_window_handles_after_opening_new_tab(self):
         with self.marionette.using_context("content"):
             new_tab = self.open_tab()
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_content.py firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_content.py
--- firefox-84.0.2+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_content.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/marionette_harness/tests/unit/test_window_handles_content.py	2021-01-18 19:58:19.000000000 +0000
@@ -4,13 +4,10 @@
 
 from __future__ import absolute_import
 
-import types
-
 import six
 from six.moves.urllib.parse import quote
 
 from marionette_driver import errors
-
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
 
 
@@ -25,6 +22,7 @@
         self.chrome_dialog = "chrome://marionette/content/test_dialog.xhtml"
 
     def tearDown(self):
+        self.close_all_windows()
         self.close_all_tabs()
 
         super(TestWindowHandles, self).tearDown()
@@ -40,7 +38,7 @@
         for handle in self.marionette.window_handles:
             self.assertIsInstance(handle, six.string_types)
 
-    def tst_window_handles_after_opening_new_tab(self):
+    def test_window_handles_after_opening_new_tab(self):
         new_tab = self.open_tab()
         self.assert_window_handles()
         self.assertEqual(len(self.marionette.window_handles), len(self.start_tabs) + 1)
@@ -62,7 +60,7 @@
         self.assert_window_handles()
         self.assertEqual(self.marionette.current_window_handle, self.start_tab)
 
-    def tst_window_handles_after_opening_new_browser_window(self):
+    def test_window_handles_after_opening_new_browser_window(self):
         new_tab = self.open_window()
         self.assert_window_handles()
         self.assertEqual(len(self.marionette.window_handles), len(self.start_tabs) + 1)
@@ -81,7 +79,7 @@
         self.assert_window_handles()
         self.assertEqual(self.marionette.current_window_handle, self.start_tab)
 
-    def tst_window_handles_after_opening_new_non_browser_window(self):
+    def test_window_handles_after_opening_new_non_browser_window(self):
         new_window = self.open_chrome_window(self.chrome_dialog)
         self.assert_window_handles()
         self.assertEqual(len(self.marionette.window_handles), len(self.start_tabs))
@@ -106,6 +104,23 @@
         self.assert_window_handles()
         self.assertEqual(self.marionette.current_window_handle, self.start_tab)
 
+    def test_window_handles_after_session_created(self):
+        new_window = self.open_chrome_window(self.chrome_dialog)
+        self.assert_window_handles()
+        self.assertEqual(len(self.marionette.window_handles), len(self.start_tabs))
+        self.assertEqual(self.marionette.current_window_handle, self.start_tab)
+        self.assertNotIn(new_window, self.marionette.window_handles)
+
+        window_handles = self.marionette.window_handles
+
+        self.marionette.delete_session()
+        self.marionette.start_session()
+
+        self.assert_window_handles()
+        self.assertEqual(window_handles, self.marionette.window_handles)
+
+        self.marionette.switch_to_window(new_window)
+
     def test_window_handles_after_closing_original_tab(self):
         new_tab = self.open_tab()
         self.assert_window_handles()
@@ -122,6 +137,6 @@
         self.assert_window_handles()
         self.assertEqual(self.marionette.current_window_handle, new_tab)
 
-    def tst_window_handles_after_closing_last_tab(self):
+    def test_window_handles_after_closing_last_tab(self):
         self.close_all_tabs()
         self.assertEqual(self.marionette.close(), [])
diff -Nru firefox-84.0.2+build1/testing/marionette/harness/setup.py firefox-85.0+build1/testing/marionette/harness/setup.py
--- firefox-84.0.2+build1/testing/marionette/harness/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/harness/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import os
diff -Nru firefox-84.0.2+build1/testing/marionette/listener.js firefox-85.0+build1/testing/marionette/listener.js
--- firefox-84.0.2+build1/testing/marionette/listener.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/listener.js	2021-01-18 19:58:19.000000000 +0000
@@ -144,7 +144,6 @@
 let multiActionFn = dispatch(multiAction);
 let executeScriptFn = dispatch(executeScript);
 let sendKeysToElementFn = dispatch(sendKeysToElement);
-let setBrowsingContextIdFn = dispatch(setBrowsingContextId);
 
 function startListeners() {
   if (!MarionettePrefs.useActors) {
@@ -185,7 +184,6 @@
   addMessageListener("Marionette:releaseActions", releaseActionsFn);
   addMessageListener("Marionette:sendKeysToElement", sendKeysToElementFn);
   addMessageListener("Marionette:Session:Delete", deleteSession);
-  addMessageListener("Marionette:setBrowsingContextId", setBrowsingContextIdFn);
   addMessageListener("Marionette:singleTap", singleTapFn);
   addMessageListener("Marionette:switchToFrame", switchToFrame);
   addMessageListener("Marionette:switchToParentFrame", switchToParentFrame);
@@ -234,10 +232,6 @@
   removeMessageListener("Marionette:releaseActions", releaseActionsFn);
   removeMessageListener("Marionette:sendKeysToElement", sendKeysToElementFn);
   removeMessageListener("Marionette:Session:Delete", deleteSession);
-  removeMessageListener(
-    "Marionette:setBrowsingContextId",
-    setBrowsingContextIdFn
-  );
   removeMessageListener("Marionette:singleTap", singleTapFn);
   removeMessageListener("Marionette:switchToFrame", switchToFrame);
   removeMessageListener("Marionette:switchToParentFrame", switchToParentFrame);
@@ -251,12 +245,6 @@
   curContainer.frame.focus();
 
   legacyactions.touchIds = {};
-  if (action.inputStateMap !== undefined) {
-    action.inputStateMap.clear();
-  }
-  if (action.inputsToCancel !== undefined) {
-    action.inputsToCancel.length = 0;
-  }
 }
 
 /**
@@ -629,17 +617,6 @@
 }
 
 /**
- * Set the current browsing context.
- *
- * @param {number} browsingContextId
- *     Id of the current BrowsingContext.
- */
-function setBrowsingContextId(browsingContextId) {
-  const bc = BrowsingContext.get(browsingContextId);
-  curContainer.frame = bc.window;
-}
-
-/**
  * Return the current visible URL.
  *
  * @return {string}
@@ -1088,8 +1065,6 @@
 
   sandboxes.clear();
   legacyactions.mouseEventsOnly = false;
-  action.inputStateMap = new Map();
-  action.inputsToCancel = [];
 
   let reply = sendSyncMessage("Marionette:Register", {
     frameId: contentId,
diff -Nru firefox-84.0.2+build1/testing/marionette/navigate.js firefox-85.0+build1/testing/marionette/navigate.js
--- firefox-84.0.2+build1/testing/marionette/navigate.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/navigate.js	2021-01-18 19:58:19.000000000 +0000
@@ -98,8 +98,13 @@
  *
  * @param {URL} current
  *     URL the browser is currently visiting.
- * @param {URL=} future
+ * @param {Object} options
+ * @param {BrowsingContext=} options.browsingContext
+ *     The current browsing context. Needed for targets of _parent and _top.
+ * @param {URL=} options.future
  *     Destination URL, if known.
+ * @param {target=} options.target
+ *     Link target, if known.
  *
  * @return {boolean}
  *     Full page load would be expected if future is followed.
@@ -108,12 +113,28 @@
  *     If <code>current</code> is not defined, or any of
  *     <code>current</code> or <code>future</code>  are invalid URLs.
  */
-navigate.isLoadEventExpected = function(current, future = undefined) {
-  // assume we will go somewhere exciting
+navigate.isLoadEventExpected = function(current, options = {}) {
+  const { browsingContext, future, target } = options;
+
   if (typeof current == "undefined") {
     throw new TypeError("Expected at least one URL");
   }
 
+  if (["_parent", "_top"].includes(target) && !browsingContext) {
+    throw new TypeError(
+      "Expected browsingContext when target is _parent or _top"
+    );
+  }
+
+  // Don't wait if the navigation happens in a different browsing context
+  if (
+    target === "_blank" ||
+    (target === "_parent" && browsingContext.parent) ||
+    (target === "_top" && browsingContext.top != browsingContext)
+  ) {
+    return false;
+  }
+
   // Assume we will go somewhere exciting
   if (typeof future == "undefined") {
     return true;
@@ -188,12 +209,12 @@
   options = {}
 ) {
   const {
-    browsingContext = driver.getBrowsingContext(),
+    browsingContextFn = driver.getBrowsingContext.bind(driver),
     loadEventExpected = true,
     requireBeforeUnload = true,
   } = options;
 
-  const chromeWindow = browsingContext.topChromeWindow;
+  const chromeWindow = browsingContextFn().topChromeWindow;
   const pageLoadStrategy = driver.capabilities.get("pageLoadStrategy");
 
   // Return immediately if no load event is expected
@@ -267,10 +288,12 @@
       // Only care about navigation events from the actor of the current frame.
       // Bug 1674329: Always use the currently active browsing context,
       // and not the original one to not cause hangs for remoteness changes.
-      if (data.browsingContext != driver.getBrowsingContext()) {
+      if (data.browsingContext != browsingContextFn()) {
         return;
       }
-    } else if (data.browsingContext.browserId != browsingContext.browserId) {
+    } else if (
+      data.browsingContext.browserId != browsingContextFn().browserId
+    ) {
       return;
     }
 
@@ -306,10 +329,10 @@
   const onBrowsingContextDiscarded = (subject, topic) => {
     // With the currentWindowGlobal gone the browsing context hasn't been
     // replaced due to a remoteness change but closed.
-    if (subject == browsingContext && !subject.currentWindowGlobal) {
+    if (subject == browsingContextFn() && !subject.currentWindowGlobal) {
       logger.trace(
         "Canceled page load listener " +
-          `because frame with id ${subject.id} has been removed`
+          `because browsing context with id ${subject.id} has been removed`
       );
       checkDone({ finished: true });
     }
diff -Nru firefox-84.0.2+build1/testing/marionette/test/unit/test_actors.js firefox-85.0+build1/testing/marionette/test/unit/test_actors.js
--- firefox-84.0.2+build1/testing/marionette/test/unit/test_actors.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/test/unit/test_actors.js	2021-01-18 19:58:19.000000000 +0000
@@ -11,17 +11,33 @@
 XPCOMUtils.defineLazyModuleGetters(this, {
   EventDispatcher:
     "chrome://marionette/content/actors/MarionetteEventsParent.jsm",
+  registerCommandsActor:
+    "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
   registerEventsActor:
     "chrome://marionette/content/actors/MarionetteEventsParent.jsm",
+  unregisterCommandsActor:
+    "chrome://marionette/content/actors/MarionetteCommandsParent.jsm",
   unregisterEventsActor:
     "chrome://marionette/content/actors/MarionetteEventsParent.jsm",
 });
 
 registerCleanupFunction(function() {
+  unregisterCommandsActor();
   unregisterEventsActor();
 });
 
-add_test(function test_registering_event_actor() {
+add_test(function test_commandsActor_register() {
+  registerCommandsActor();
+  unregisterCommandsActor();
+
+  registerCommandsActor();
+  registerCommandsActor();
+  unregisterCommandsActor();
+
+  run_next_test();
+});
+
+add_test(function test_eventsActor_register() {
   registerEventsActor();
   unregisterEventsActor();
 
diff -Nru firefox-84.0.2+build1/testing/marionette/test/unit/test_navigate.js firefox-85.0+build1/testing/marionette/test/unit/test_navigate.js
--- firefox-84.0.2+build1/testing/marionette/test/unit/test_navigate.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/marionette/test/unit/test_navigate.js	2021-01-18 19:58:19.000000000 +0000
@@ -11,26 +11,77 @@
   "chrome://marionette/content/navigate.js"
 );
 
-add_test(function test_isLoadEventExpected() {
+const topContext = {
+  id: 7,
+  get top() {
+    return this;
+  },
+};
+
+const nestedContext = {
+  id: 8,
+  parent: topContext,
+  top: topContext,
+};
+
+add_test(function test_isLoadEventExpectedForCurrent() {
   Assert.throws(
     () => navigate.isLoadEventExpected(undefined),
     /Expected at least one URL/
   );
 
+  ok(navigate.isLoadEventExpected(new URL("http://a/")));
+
+  run_next_test();
+});
+
+add_test(function test_isLoadEventExpectedForFuture() {
+  const data = [
+    { current: "http://a/", future: undefined, expected: true },
+    { current: "http://a/", future: "http://a/", expected: true },
+    { current: "http://a/", future: "http://a/#", expected: true },
+    { current: "http://a/#", future: "http://a/", expected: true },
+    { current: "http://a/#a", future: "http://a/#A", expected: true },
+    { current: "http://a/#a", future: "http://a/#a", expected: false },
+    { current: "http://a/", future: "javascript:whatever", expected: false },
+  ];
+
+  for (const entry of data) {
+    const current = new URL(entry.current);
+    const future = entry.future ? new URL(entry.future) : undefined;
+    equal(navigate.isLoadEventExpected(current, { future }), entry.expected);
+  }
+
+  run_next_test();
+});
+
+add_test(function test_isLoadEventExpectedForTarget() {
+  for (const target of ["_parent", "_top"]) {
+    Assert.throws(
+      () => navigate.isLoadEventExpected(new URL("http://a"), { target }),
+      /Expected browsingContext when target is _parent or _top/
+    );
+  }
+
   const data = [
-    { cur: "http://a/", fut: undefined, expected: true },
-    { cur: "http://a/", fut: "http://a/", expected: true },
-    { cur: "http://a/", fut: "http://a/#", expected: true },
-    { cur: "http://a/#", fut: "http://a/", expected: true },
-    { cur: "http://a/#a", fut: "http://a/#A", expected: true },
-    { cur: "http://a/#a", fut: "http://a/#a", expected: false },
-    { cur: "http://a/", fut: "javascript:whatever", expected: false },
+    { cur: "http://a/", target: "", expected: true },
+    { cur: "http://a/", target: "_blank", expected: false },
+    { cur: "http://a/", target: "_parent", bc: topContext, expected: true },
+    { cur: "http://a/", target: "_parent", bc: nestedContext, expected: false },
+    { cur: "http://a/", target: "_self", expected: true },
+    { cur: "http://a/", target: "_top", bc: topContext, expected: true },
+    { cur: "http://a/", target: "_top", bc: nestedContext, expected: false },
   ];
 
   for (const entry of data) {
     const current = entry.cur ? new URL(entry.cur) : undefined;
-    const future = entry.fut ? new URL(entry.fut) : undefined;
-    equal(navigate.isLoadEventExpected(current, future), entry.expected);
+    equal(
+      navigate.isLoadEventExpected(current, {
+        target: entry.target,
+        browsingContext: entry.bc,
+      }),
+      entry.expected
+    );
   }
 
   run_next_test();
diff -Nru firefox-84.0.2+build1/testing/mochitest/browser-test.js firefox-85.0+build1/testing/mochitest/browser-test.js
--- firefox-84.0.2+build1/testing/mochitest/browser-test.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/browser-test.js	2021-01-18 19:58:19.000000000 +0000
@@ -1527,7 +1527,7 @@
 
 function decorateTaskFn(fn) {
   fn = fn.bind(this);
-  fn.skip = () => (fn.__skipMe = true);
+  fn.skip = (val = true) => (fn.__skipMe = val);
   fn.only = () => (this.__runOnlyThisTask = fn);
   return fn;
 }
diff -Nru firefox-84.0.2+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm firefox-85.0+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
--- firefox-84.0.2+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -34,7 +34,6 @@
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   ContentTask: "resource://testing-common/ContentTask.jsm",
-  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetters(this, {
@@ -470,7 +469,11 @@
           }
 
           case "unload":
-            reject();
+            reject(
+              new Error(
+                "The window unloaded while we were waiting for the browser to load - this should never happen."
+              )
+            );
             break;
 
           default:
@@ -839,21 +842,8 @@
           );
 
           if (url) {
-            let browser = win.gBrowser.selectedBrowser;
-
-            if (
-              win.gMultiProcessBrowser &&
-              !E10SUtils.canLoadURIInRemoteType(
-                url,
-                win.gFissionBrowser,
-                browser.remoteType
-              )
-            ) {
-              await this.waitForEvent(browser, "XULFrameLoaderCreated");
-            }
-
             let loadPromise = this.browserLoaded(
-              browser,
+              win.gBrowser.selectedBrowser,
               false,
               url,
               maybeErrorPage
@@ -881,41 +871,17 @@
   },
 
   /**
-   * Loads a new URI in the given browser and waits until we really started
-   * loading. In e10s browser.loadURI() can be an asynchronous operation due
-   * to having to switch the browser's remoteness and keep its shistory data.
+   * Loads a new URI in the given browser, triggered by the system principal.
    *
    * @param {xul:browser} browser
    *        A xul:browser.
    * @param {string} uri
    *        The URI to load.
-   *
-   * @return {Promise}
-   * @resolves When we started loading the given URI.
    */
-  async loadURI(browser, uri) {
-    // Load the new URI.
+  loadURI(browser, uri) {
     browser.loadURI(uri, {
       triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
     });
-
-    // Nothing to do in non-e10s mode.
-    if (!browser.ownerGlobal.gMultiProcessBrowser) {
-      return;
-    }
-
-    // If the new URI can't load in the browser's current process then we
-    // should wait for the new frameLoader to be created. This will happen
-    // asynchronously when the browser's remoteness changes.
-    if (
-      !E10SUtils.canLoadURIInRemoteType(
-        uri,
-        browser.ownerGlobal.gFissionBrowser,
-        browser.remoteType
-      )
-    ) {
-      await this.waitForEvent(browser, "XULFrameLoaderCreated");
-    }
   },
 
   /**
@@ -1413,9 +1379,6 @@
 
   /**
    * Like browserLoaded, but waits for an error page to appear.
-   * This explicitly deals with cases where the browser is not currently remote and a
-   * remoteness switch will occur before the error page is loaded, which is tricky
-   * because error pages don't fire 'regular' load events that we can rely on.
    *
    * @param {xul:browser} browser
    *        A xul:browser.
@@ -1424,27 +1387,13 @@
    * @resolves When an error page has been loaded in the browser.
    */
   waitForErrorPage(browser) {
-    let waitForLoad = () =>
-      this.waitForContentEvent(browser, "AboutNetErrorLoad", false, null, true);
-
-    let win = browser.ownerGlobal;
-    let tab = win.gBrowser.getTabForBrowser(browser);
-    if (!tab || browser.isRemoteBrowser || !win.gMultiProcessBrowser) {
-      return waitForLoad();
-    }
-
-    // We're going to switch remoteness when loading an error page. We need to be
-    // quite careful in order to make sure we're adding the listener in time to
-    // get this event:
-    return new Promise((resolve, reject) => {
-      tab.addEventListener(
-        "TabRemotenessChange",
-        function() {
-          waitForLoad().then(resolve, reject);
-        },
-        { once: true }
-      );
-    });
+    return this.waitForContentEvent(
+      browser,
+      "AboutNetErrorLoad",
+      false,
+      null,
+      true
+    );
   },
 
   /**
@@ -1463,83 +1412,61 @@
   waitForDocLoadAndStopIt(expectedURL, browser, checkFn) {
     let isHttp = url => /^https?:/.test(url);
 
-    let stoppedDocLoadPromise = () => {
-      return new Promise(resolve => {
-        // Redirect non-http URIs to http://mochi.test:8888/, so we can still
-        // use http-on-before-connect to listen for loads. Since we're
-        // aborting the load as early as possible, it doesn't matter whether the
-        // server handles it sensibly or not. However, this also means that this
-        // helper shouldn't be used to load local URIs (about pages, chrome://
-        // URIs, etc).
-        let proxyFilter;
-        if (!isHttp(expectedURL)) {
-          proxyFilter = {
-            proxyInfo: ProtocolProxyService.newProxyInfo(
-              "http",
-              "mochi.test",
-              8888,
-              "",
-              "",
-              0,
-              4096,
-              null
-            ),
-
-            applyFilter(channel, defaultProxyInfo, callback) {
-              callback.onProxyFilterResult(
-                isHttp(channel.URI.spec) ? defaultProxyInfo : this.proxyInfo
-              );
-            },
-          };
+    return new Promise(resolve => {
+      // Redirect non-http URIs to http://mochi.test:8888/, so we can still
+      // use http-on-before-connect to listen for loads. Since we're
+      // aborting the load as early as possible, it doesn't matter whether the
+      // server handles it sensibly or not. However, this also means that this
+      // helper shouldn't be used to load local URIs (about pages, chrome://
+      // URIs, etc).
+      let proxyFilter;
+      if (!isHttp(expectedURL)) {
+        proxyFilter = {
+          proxyInfo: ProtocolProxyService.newProxyInfo(
+            "http",
+            "mochi.test",
+            8888,
+            "",
+            "",
+            0,
+            4096,
+            null
+          ),
+
+          applyFilter(channel, defaultProxyInfo, callback) {
+            callback.onProxyFilterResult(
+              isHttp(channel.URI.spec) ? defaultProxyInfo : this.proxyInfo
+            );
+          },
+        };
 
-          ProtocolProxyService.registerChannelFilter(proxyFilter, 0);
-        }
+        ProtocolProxyService.registerChannelFilter(proxyFilter, 0);
+      }
 
-        function observer(chan) {
-          chan.QueryInterface(Ci.nsIHttpChannel);
-          if (!chan.originalURI || chan.originalURI.spec !== expectedURL) {
-            return;
-          }
-          if (checkFn && !checkFn(chan)) {
-            return;
-          }
+      function observer(chan) {
+        chan.QueryInterface(Ci.nsIHttpChannel);
+        if (!chan.originalURI || chan.originalURI.spec !== expectedURL) {
+          return;
+        }
+        if (checkFn && !checkFn(chan)) {
+          return;
+        }
 
-          // TODO: We should check that the channel's BrowsingContext matches
-          // the browser's. See bug 1587114.
+        // TODO: We should check that the channel's BrowsingContext matches
+        // the browser's. See bug 1587114.
 
-          try {
-            chan.cancel(Cr.NS_BINDING_ABORTED);
-          } finally {
-            if (proxyFilter) {
-              ProtocolProxyService.unregisterChannelFilter(proxyFilter);
-            }
-            Services.obs.removeObserver(observer, "http-on-before-connect");
-            resolve();
+        try {
+          chan.cancel(Cr.NS_BINDING_ABORTED);
+        } finally {
+          if (proxyFilter) {
+            ProtocolProxyService.unregisterChannelFilter(proxyFilter);
           }
+          Services.obs.removeObserver(observer, "http-on-before-connect");
+          resolve();
         }
+      }
 
-        Services.obs.addObserver(observer, "http-on-before-connect");
-      });
-    };
-
-    let win = browser.ownerGlobal;
-    let tab = win.gBrowser.getTabForBrowser(browser);
-    let { mustChangeProcess } = E10SUtils.shouldLoadURIInBrowser(
-      browser,
-      expectedURL
-    );
-    if (!tab || !win.gMultiProcessBrowser || !mustChangeProcess) {
-      return stoppedDocLoadPromise();
-    }
-
-    return new Promise((resolve, reject) => {
-      tab.addEventListener(
-        "TabRemotenessChange",
-        function() {
-          stoppedDocLoadPromise().then(resolve, reject);
-        },
-        { once: true }
-      );
+      Services.obs.addObserver(observer, "http-on-before-connect");
     });
   },
 
diff -Nru firefox-84.0.2+build1/testing/mochitest/chrome/chrome.ini firefox-85.0+build1/testing/mochitest/chrome/chrome.ini
--- firefox-84.0.2+build1/testing/mochitest/chrome/chrome.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/chrome/chrome.ini	2021-01-18 19:58:19.000000000 +0000
@@ -6,7 +6,7 @@
 
 [test_sample.xhtml]
 [test_sanityEventUtils.xhtml]
-[test_sanityPluginUtils.html]
+fail-if = headless # Bug 1678303
 [test_sanityException.xhtml]
 [test_sanityException2.xhtml]
 [test_sanityManifest.xhtml]
diff -Nru firefox-84.0.2+build1/testing/mochitest/chrome/test_sanityPluginUtils.html firefox-85.0+build1/testing/mochitest/chrome/test_sanityPluginUtils.html
--- firefox-84.0.2+build1/testing/mochitest/chrome/test_sanityPluginUtils.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/chrome/test_sanityPluginUtils.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <script type="text/javascript">
-  var start = new Date();
-  </script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript">
-  var loadTime = new Date();
-  </script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
-</head>
-<body onload="starttest()">
-<!-- load the test plugin defined at $(DIST)/bin/plugins/Test.plugin/ -->
-<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-<script class="testbody" type="text/javascript">
-info("\nProfile::PluginUtilsLoadTime: " + (loadTime - start) + "\n");
-function starttest() {
-  SimpleTest.waitForExplicitFinish();
-  var startTime = new Date();
-  // increase the runtime of the test so it is detectible, otherwise we get 0-1ms
-  let runtimes = 100;
-  function runTest(plugin) {
-    is(plugin.version, "1.0.0.0", "Make sure version is correct");
-    is(plugin.name, "Test Plug-in");
-  }
-  while (runtimes > 0) {
-    ok(PluginUtils.withTestPlugin(runTest), "Test plugin should be found");
-    --runtimes;
-  }
-  var endTime = new Date();
-  info("\nProfile::PluginUtilsRunTime: " + (endTime - startTime) + "\n");
-  SimpleTest.finish();
-}
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/mochitest/runtests.py firefox-85.0+build1/testing/mochitest/runtests.py
--- firefox-84.0.2+build1/testing/mochitest/runtests.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/runtests.py	2021-01-18 19:58:19.000000000 +0000
@@ -382,7 +382,18 @@
     """front-end function to mozprocess.ProcessHandler"""
     # TODO: upstream -> mozprocess
     # https://bugzilla.mozilla.org/show_bug.cgi?id=791383
-    process = mozprocess.ProcessHandler(*args, **kwargs)
+    log = get_proxy_logger("mochitest")
+
+    def on_output(line):
+        log.process_output(
+            process=process.pid,
+            data=line.decode("utf8", "replace"),
+            command=process.commandline,
+        )
+
+    process = mozprocess.ProcessHandlerMixin(
+        *args, processOutputLine=on_output, **kwargs
+    )
     process.run()
     return process.wait()
 
@@ -864,6 +875,7 @@
     subprocess.check_call(
         [
             gst,
+            "--no-fault",
             "videotestsrc",
             "pattern=green",
             "num-buffers=1",
@@ -2137,6 +2149,15 @@
             self.log.info("Increasing default timeout to 90 seconds")
             prefs["testing.browserTestHarness.timeout"] = 90
 
+        # tsan builds need even more time
+        if (
+            mozinfo.info["tsan"]
+            and options.flavor == "browser"
+            and options.timeout is None
+        ):
+            self.log.info("Increasing default timeout to 120 seconds")
+            prefs["testing.browserTestHarness.timeout"] = 120
+
         if mozinfo.info["os"] == "win" and mozinfo.info["processor"] == "aarch64":
             extended_timeout = self.DEFAULT_TIMEOUT * 4
             self.log.info(
diff -Nru firefox-84.0.2+build1/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html firefox-85.0+build1/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
--- firefox-84.0.2+build1/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html	2021-01-18 19:58:19.000000000 +0000
@@ -38,7 +38,7 @@
 info("\nProfile::EventUtilsLoadTime: " + (loadTime - start) + "\n");
 function starttest() {
   SimpleTest.waitForFocus(
-    function () {
+    async function () {
       SimpleTest.waitForExplicitFinish();
       var startTime = new Date();
       var check = false;
@@ -479,6 +479,44 @@
       $("textBoxB").removeEventListener("keydown", onKeyDown);
       $("textBoxB").removeEventListener("keyup", onKeyUp);
 
+
+      // Async event synthesizing.
+      // On Android this does not work.
+      if (navigator.userAgent.includes("Android")) {
+        SimpleTest.finish();
+        return;
+      }
+
+      await (async function () {
+        await SpecialPowers.pushPrefEnv({set: [["test.events.async.enabled", true]]});
+        try {
+          disableNonTestMouseEvents(true);
+          let mouseMoveCount = 0;
+          let waitForAllSynthesizedMouseMove =
+            new Promise(resolve => {
+              window.addEventListener("mousemove", function onMouseMove(aEvent) {
+                mouseMoveCount++;
+                is(aEvent.target, $("testMouseEvent"),
+                  `The mousemove event target of ${
+                    mouseMoveCount
+                  } should be the input#testMouseEvent, but ${
+                    aEvent.target.nodeName
+                  }`);
+                if (mouseMoveCount === 30) {
+                  window.removeEventListener("mousemove", onMouseMove, { capture: true });
+                  resolve();
+                }
+              }, { capture: true });
+            });
+          for (let i = 0; i < 30; i++) {
+            synthesizeMouse($("testMouseEvent"), 3 + i % 2, 3 + i % 2, { type: "mousemove" });
+          }
+          await waitForAllSynthesizedMouseMove;
+        } finally {
+          disableNonTestMouseEvents(false);
+        }
+      })();
+
       SimpleTest.finish();
     }
   );
diff -Nru firefox-84.0.2+build1/testing/mochitest/tests/SimpleTest/EventUtils.js firefox-85.0+build1/testing/mochitest/tests/SimpleTest/EventUtils.js
--- firefox-84.0.2+build1/testing/mochitest/tests/SimpleTest/EventUtils.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/tests/SimpleTest/EventUtils.js	2021-01-18 19:58:19.000000000 +0000
@@ -2414,19 +2414,30 @@
  *                 selection root.
  * @param aLength  The length of the text.  If the length is too long,
  *                 the extra length is ignored.
+ * @param aIsRelative   Optional (If true, aOffset is relative to start of
+ *                      composition if there is, or start of selection.)
  * @param aWindow  Optional (If null, current |window| will be used)
  * @return         An nsIQueryContentEventResult object.  If this failed,
  *                 the result might be null.
  */
-function synthesizeQueryTextRect(aOffset, aLength, aWindow) {
+function synthesizeQueryTextRect(aOffset, aLength, aIsRelative, aWindow) {
+  if (aIsRelative !== undefined && typeof aIsRelative !== "boolean") {
+    throw new Error(
+      "Maybe, you set Window object to the 3rd argument, but it should be a boolean value"
+    );
+  }
   var utils = _getDOMWindowUtils(aWindow);
+  let flags = QUERY_CONTENT_FLAG_USE_NATIVE_LINE_BREAK;
+  if (aIsRelative === true) {
+    flags |= QUERY_CONTENT_FLAG_OFFSET_RELATIVE_TO_INSERTION_POINT;
+  }
   return utils.sendQueryContentEvent(
     utils.QUERY_TEXT_RECT,
     aOffset,
     aLength,
     0,
     0,
-    QUERY_CONTENT_FLAG_USE_NATIVE_LINE_BREAK
+    flags
   );
 }
 
@@ -3304,25 +3315,6 @@
   return result;
 }
 
-var PluginUtils = {
-  withTestPlugin(callback) {
-    var ph = _EU_Cc["@mozilla.org/plugin/host;1"].getService(
-      _EU_Ci.nsIPluginHost
-    );
-    var tags = ph.getPluginTags();
-
-    // Find the test plugin
-    for (var i = 0; i < tags.length; i++) {
-      if (tags[i].name == "Test Plug-in") {
-        callback(tags[i]);
-        return true;
-      }
-    }
-    todo(false, "Need a test plugin on this platform");
-    return false;
-  },
-};
-
 class EventCounter {
   constructor(aTarget, aType, aOptions = {}) {
     this.target = aTarget;
diff -Nru firefox-84.0.2+build1/testing/mochitest/tests/SimpleTest/SimpleTest.js firefox-85.0+build1/testing/mochitest/tests/SimpleTest/SimpleTest.js
--- firefox-84.0.2+build1/testing/mochitest/tests/SimpleTest/SimpleTest.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mochitest/tests/SimpleTest/SimpleTest.js	2021-01-18 19:58:19.000000000 +0000
@@ -1180,6 +1180,27 @@
 };
 /* eslint-enable mozilla/use-services */
 
+SimpleTest.stripLinebreaksAndWhitespaceAfterTags = function(aString) {
+  return aString.replace(/(>\s*(\r\n|\n|\r)*\s*)/gm, ">");
+};
+
+/*
+ * `navigator.platform` should include this, when the platform is Windows.
+ */
+const kPlatformWindows = "Win";
+
+/*
+ * See `SimpleTest.waitForClipboard`.
+ */
+const kTextHtmlPrefixClipboardDataWindows =
+  "<html><body>\n<!--StartFragment-->";
+
+/*
+ * See `SimpleTest.waitForClipboard`.
+ */
+const kTextHtmlSuffixClipboardDataWindows =
+  "<!--EndFragment-->\n</body>\n</html>";
+
 /*
  * Polls the clipboard waiting for the expected value. A known value different than
  * the expected value is put on the clipboard first (and also polled for) so we
@@ -1194,8 +1215,8 @@
  *        as LineFeed.  Therefore, you cannot include CarriageReturn to the
  *        string.
  *        If you specify string value and expect "text/html" data, this wraps
- *        the expected value with "<html><body>\n<!--StartFragment-->" and
- *        "<!--EndFragment-->\n</body>\n</html>" only when it runs on Windows
+ *        the expected value with `kTextHtmlPrefixClipboardDataWindows` and
+ *        `kTextHtmlSuffixClipboardDataWindows` only when it runs on Windows
  *        because they are appended only by nsDataObj.cpp for Windows.
  *        https://searchfox.org/mozilla-central/rev/8f7b017a31326515cb467e69eef1f6c965b4f00e/widget/windows/nsDataObj.cpp#1798-1805,1839-1840,1842
  *        Therefore, you can specify selected (copied) HTML data simply on any
@@ -1283,7 +1304,9 @@
       inputValidatorFn = function(aData) {
         return (
           aData.replace(/\r\n?/g, "\n") ===
-          `<html><body>\n<!--StartFragment-->${aExpectedStringOrValidatorFn}<!--EndFragment-->\n</body>\n</html>`
+          kTextHtmlPrefixClipboardDataWindows +
+            aExpectedStringOrValidatorFn +
+            kTextHtmlSuffixClipboardDataWindows
         );
       };
     } else {
diff -Nru firefox-84.0.2+build1/testing/modules/MockRegistry.jsm firefox-85.0+build1/testing/modules/MockRegistry.jsm
--- firefox-84.0.2+build1/testing/modules/MockRegistry.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/modules/MockRegistry.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 "use strict";
 
 var EXPORTED_SYMBOLS = ["MockRegistry"];
diff -Nru firefox-84.0.2+build1/testing/modules/Sinon.jsm firefox-85.0+build1/testing/modules/Sinon.jsm
--- firefox-84.0.2+build1/testing/modules/Sinon.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/modules/Sinon.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 "use strict";
 
 var EXPORTED_SYMBOLS = ["sinon"];
diff -Nru firefox-84.0.2+build1/testing/mozbase/docs/_static/structured_example.py firefox-85.0+build1/testing/mozbase/docs/_static/structured_example.py
--- firefox-84.0.2+build1/testing/mozbase/docs/_static/structured_example.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/docs/_static/structured_example.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import argparse
diff -Nru firefox-84.0.2+build1/testing/mozbase/manifestparser/setup.py firefox-85.0+build1/testing/mozbase/manifestparser/setup.py
--- firefox-84.0.2+build1/testing/mozbase/manifestparser/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/manifestparser/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -11,7 +11,7 @@
 
 DEPS = [
     "mozlog >= 6.0",
-    "six >= 1.10.0",
+    "six >= 1.13.0",
 ]
 setup(
     name=PACKAGE_NAME,
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozdevice/mozdevice/adb.py firefox-85.0+build1/testing/mozbase/mozdevice/mozdevice/adb.py
--- firefox-84.0.2+build1/testing/mozbase/mozdevice/mozdevice/adb.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozdevice/mozdevice/adb.py	2021-01-18 19:58:19.000000000 +0000
@@ -1048,9 +1048,7 @@
                     "attached and no device specified"
                 )
             if len(devices) == 0:
-                # We could error here, but this way we'll wait-for-device before we next
-                # run a command, which seems more friendly
-                return None
+                raise ADBError("No connected devices found.")
             device = devices[0]
 
         # Allow : in device serial if it matches a tcpip device serial.
@@ -1974,8 +1972,15 @@
             self._logger.warning(
                 "retryable logcat clear error?: {}. Retrying...".format(str(e))
             )
-            self.command_output(cmds, timeout=timeout)
-            self.shell_output("log logcat cleared", timeout=timeout)
+            try:
+                self.command_output(cmds, timeout=timeout)
+                self.shell_output("log logcat cleared", timeout=timeout)
+            except ADBProcessError as e2:
+                if "failed to clear" not in str(e):
+                    raise
+                self._logger.warning(
+                    "Ignoring failure to clear logcat: {}.".format(str(e2))
+                )
 
     def get_logcat(
         self,
@@ -3564,6 +3569,7 @@
                 "android.permission.ACCESS_FINE_LOCATION",
                 "android.permission.CAMERA",
                 "android.permission.RECORD_AUDIO",
+                "android.permission.ACCESS_WIFI_STATE",
             ]
             self._logger.info("Granting important runtime permissions to %s" % app_name)
             for permission in permissions:
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozdevice/setup.py firefox-85.0+build1/testing/mozbase/mozdevice/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozdevice/setup.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozdevice/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 PACKAGE_NAME = "mozdevice"
-PACKAGE_VERSION = "4.0.2"
+PACKAGE_VERSION = "4.0.3"
 
 deps = ["mozlog >= 6.0"]
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozfile/setup.py firefox-85.0+build1/testing/mozbase/mozfile/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozfile/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozfile/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -29,6 +29,6 @@
     packages=["mozfile"],
     include_package_data=True,
     zip_safe=False,
-    install_requires=["six >= 1.10.0"],
+    install_requires=["six >= 1.13.0"],
     tests_require=["wptserve"],
 )
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozhttpd/setup.py firefox-85.0+build1/testing/mozbase/mozhttpd/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozhttpd/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozhttpd/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -7,7 +7,7 @@
 from setuptools import setup
 
 PACKAGE_VERSION = "0.7.1"
-deps = ["moznetwork >= 0.24", "mozinfo >= 1.0.0", "six >= 1.10.0"]
+deps = ["moznetwork >= 0.24", "mozinfo >= 1.0.0", "six >= 1.13.0"]
 
 setup(
     name="mozhttpd",
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozinstall/setup.py firefox-85.0+build1/testing/mozbase/mozinstall/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozinstall/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozinstall/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -13,13 +13,13 @@
 except IOError:
     description = None
 
-PACKAGE_VERSION = "2.0.0"
+PACKAGE_VERSION = "2.0.1"
 
 deps = [
     "mozinfo >= 0.7",
     "mozfile >= 1.0",
     "requests",
-    "six >= 1.10.0",
+    "six >= 1.13.0",
 ]
 
 setup(
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/capture.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/capture.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/capture.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/capture.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/html/html.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/html/html.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/html/html.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/html/html.py	2021-01-18 19:58:19.000000000 +0000
@@ -6,7 +6,6 @@
 from __future__ import absolute_import
 
 import base64
-import cgi
 from datetime import datetime
 import os
 import json
@@ -19,6 +18,11 @@
 html = None
 raw = None
 
+if six.PY2:
+    from cgi import escape
+else:
+    from html import escape
+
 base_path = os.path.split(__file__)[0]
 
 
@@ -226,9 +230,9 @@
                         line.lower().find("error") != -1
                         or line.lower().find("exception") != -1
                     ):
-                        log.append(html.span(raw(cgi.escape(line)), class_="error"))
+                        log.append(html.span(raw(escape(line)), class_="error"))
                     else:
-                        log.append(raw(cgi.escape(line)))
+                        log.append(raw(escape(line)))
                 log.append(html.br())
             additional_html.append(log)
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/html/__init__.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/html/__init__.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/html/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/html/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 from .html import HTMLFormatter
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/xunit.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/xunit.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/formatters/xunit.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/formatters/xunit.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 from xml.etree import ElementTree
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/format.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/format.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/format.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/format.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import argparse
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/__init__.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/__init__.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/__init__.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 
 from __future__ import absolute_import
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/logmerge.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/logmerge.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/logmerge.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/logmerge.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import, print_function
 
 import argparse
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/unstable.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/unstable.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/scripts/unstable.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/scripts/unstable.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import, print_function
 
 import argparse
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/stdadapter.py firefox-85.0+build1/testing/mozbase/mozlog/mozlog/stdadapter.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/mozlog/stdadapter.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/mozlog/stdadapter.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import logging
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozlog/setup.py firefox-85.0+build1/testing/mozbase/mozlog/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozlog/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozlog/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -7,11 +7,12 @@
 from setuptools import setup, find_packages
 
 PACKAGE_NAME = "mozlog"
-PACKAGE_VERSION = "7.0"
+PACKAGE_VERSION = "7.0.1"
 DEPS = [
     "blessings>=1.3",
     "mozterm",
-    "six >= 1.10.0",
+    "mozfile",
+    "six >= 1.13.0",
 ]
 
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozprocess/mozprocess/winprocess.py firefox-85.0+build1/testing/mozbase/mozprocess/mozprocess/winprocess.py
--- firefox-84.0.2+build1/testing/mozbase/mozprocess/mozprocess/winprocess.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozprocess/mozprocess/winprocess.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # A module to expose various thread/process/job related structures and
 # methods from kernel32
 #
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozprofile/mozprofile/diff.py firefox-85.0+build1/testing/mozbase/mozprofile/mozprofile/diff.py
--- firefox-84.0.2+build1/testing/mozbase/mozprofile/mozprofile/diff.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozprofile/mozprofile/diff.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 
 """
 diff two profile summaries
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozprofile/mozprofile/view.py firefox-85.0+build1/testing/mozbase/mozprofile/mozprofile/view.py
--- firefox-84.0.2+build1/testing/mozbase/mozprofile/mozprofile/view.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozprofile/mozprofile/view.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 
 """
 script to view mozilla profiles
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozprofile/setup.py firefox-85.0+build1/testing/mozbase/mozprofile/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozprofile/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozprofile/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -12,7 +12,7 @@
 deps = [
     "mozfile>=1.2",
     "mozlog>=6.0",
-    "six>=1.10.0,<2",
+    "six>=1.13.0,<2",
 ]
 
 setup(
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitmproxy_requirements.txt firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitmproxy_requirements.txt
--- firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitmproxy_requirements.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitmproxy_requirements.txt	2021-01-18 19:58:19.000000000 +0000
@@ -28,7 +28,7 @@
 PyYAML==3.12
 requests==2.13.0
 ruamel.yaml==0.13.14
-six==1.10.0
+six==1.13.0
 sortedcontainers==1.5.7
 tornado==4.4.3
 urwid==1.3.1
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py
--- firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py	2021-01-18 19:58:19.000000000 +0000
@@ -386,7 +386,7 @@
                             "values": data["replay-confidence"],
                             "subtest-prefix-type": False,
                             "unit": "%",
-                            "shouldAlert": True,
+                            "shouldAlert": False,
                             "lowerIsBetter": False,
                         },
                         "recording-proportion-used": {
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/alternate-server-replay.py firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/alternate-server-replay.py
--- firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/alternate-server-replay.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/alternate-server-replay.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 file was copied from  mitmproxy/mitmproxy/addons/serverplayback.py release tag 4.0.4
 # and modified by Florin Strugariu
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/inject-deterministic.py firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/inject-deterministic.py
--- firefox-84.0.2+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/inject-deterministic.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozproxy/mozproxy/backends/mitm/scripts/inject-deterministic.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import, print_function
 
 import base64
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozrunner/mozrunner/base/__init__.py firefox-85.0+build1/testing/mozbase/mozrunner/mozrunner/base/__init__.py
--- firefox-84.0.2+build1/testing/mozbase/mozrunner/mozrunner/base/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozrunner/mozrunner/base/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # flake8: noqa
 from __future__ import absolute_import
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozrunner/setup.py firefox-85.0+build1/testing/mozbase/mozrunner/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozrunner/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozrunner/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -18,7 +18,7 @@
     "mozlog>=6.0",
     "mozprocess>=1.2.0,<2",
     "mozprofile~=2.3",
-    "six>=1.10.0,<2",
+    "six>=1.13.0,<2",
 ]
 
 EXTRAS_REQUIRE = {"crash": ["mozcrash >= 2.0"]}
diff -Nru firefox-84.0.2+build1/testing/mozbase/mozversion/setup.py firefox-85.0+build1/testing/mozbase/mozversion/setup.py
--- firefox-84.0.2+build1/testing/mozbase/mozversion/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/mozversion/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -26,7 +26,7 @@
     packages=["mozversion"],
     include_package_data=True,
     zip_safe=False,
-    install_requires=["mozlog >= 6.0", "six >= 1.10.0"],
+    install_requires=["mozlog >= 6.0", "six >= 1.13.0"],
     entry_points="""
       # -*- Entry points: -*-
       [console_scripts]
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/adb.rs firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/adb.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/adb.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/adb.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 #[derive(Debug, PartialEq)]
 pub enum SyncCommand {
     Data,
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/lib.rs firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/lib.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 #[macro_use]
 extern crate log;
 extern crate once_cell;
@@ -615,7 +619,7 @@
         let mut am_start = format!("am start -W -n {}/{}", package, activity);
 
         for arg in am_start_args {
-            am_start.push_str(" ");
+            am_start.push(' ');
             if SYNC_REGEX.is_match(arg.as_ref()) {
                 am_start.push_str(&format!("\"{}\"", &shell::escape(arg.as_ref())));
             } else {
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/test.rs firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/test.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozdevice/src/test.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozdevice/src/test.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::*;
 
 // Currently the mozdevice API is not safe for multiple requests at the same
@@ -69,9 +73,9 @@
     encode_message(&"a".repeat(65536)).expect_err("string lengths exceeds 4 bytes");
 }
 
-fn run_device_test<F>(test: F) -> ()
+fn run_device_test<F>(test: F)
 where
-    F: FnOnce(&Device, &TempDir, &Path) -> () + panic::UnwindSafe,
+    F: FnOnce(&Device, &TempDir, &Path) + panic::UnwindSafe,
 {
     let host = Host {
         ..Default::default()
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/lib.rs firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/lib.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/lib.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,7 @@
 #![forbid(unsafe_code)]
+/* 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/. */
 
 extern crate tempfile;
 
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/preferences.rs firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/preferences.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/preferences.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/preferences.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 std::collections::BTreeMap;
 
 pub type Preferences = BTreeMap<String, Pref>;
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/prefreader.rs firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/prefreader.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/prefreader.rs	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/prefreader.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::preferences::{Pref, PrefValue, Preferences};
 use std::borrow::Borrow;
 use std::borrow::Cow;
@@ -301,10 +305,7 @@
     }
 
     fn is_space(c: char) -> bool {
-        match c {
-            ' ' | '\t' | '\r' | '\n' => true,
-            _ => false,
-        }
+        matches!(c, ' ' | '\t' | '\r' | '\n')
     }
 
     fn skip_whitespace(&mut self) -> Option<char> {
@@ -775,7 +776,7 @@
             data_buf.reserve(data.len() + 4);
             data_buf.push_str("/*");
             data_buf.push_str(data.borrow());
-            data_buf.push_str("*");
+            data_buf.push('*');
             &*data_buf
         }
         PrefToken::CommentLine(ref data, _) => {
@@ -786,7 +787,7 @@
         }
         PrefToken::CommentBashLine(ref data, _) => {
             data_buf.reserve(data.len() + 1);
-            data_buf.push_str("#");
+            data_buf.push('#');
             data_buf.push_str(data.borrow());
             &*data_buf
         }
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/profile.rs firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/profile.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozprofile/src/profile.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozprofile/src/profile.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::preferences::{Pref, Preferences};
 use crate::prefreader::{parse, serialize, PrefReaderError};
 use std::collections::btree_map::Iter;
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/bin/firefox-default-path.rs firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/bin/firefox-default-path.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/bin/firefox-default-path.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/bin/firefox-default-path.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 extern crate mozrunner;
 
 use mozrunner::runner::platform;
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/firefox_args.rs firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/firefox_args.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/firefox_args.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/firefox_args.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 //! Argument string parsing and matching functions for Firefox.
 //!
 //! Which arguments Firefox accepts and in what style depends on the platform.
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/lib.rs firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/lib.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,7 @@
 #![forbid(unsafe_code)]
+/* 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/. */
 
 #[macro_use]
 extern crate log;
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/path.rs firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/path.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/path.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/path.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 //! Provides utilities for searching the system path.
 
 use std::env;
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/runner.rs firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/runner.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozrunner/src/runner.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozrunner/src/runner.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 mozprofile::prefreader::PrefReaderError;
 use mozprofile::profile::Profile;
 use std::collections::HashMap;
@@ -156,16 +160,16 @@
     fn kill(&mut self) -> io::Result<process::ExitStatus> {
         match self.try_wait() {
             // child has already exited, reap its exit code
-            Ok(Some(status)) => return Ok(status),
+            Ok(Some(status)) => Ok(status),
 
             // child still running, kill it
             Ok(None) => {
                 debug!("Killing process {}", self.process.id());
                 self.process.kill()?;
-                return self.process.wait();
+                self.process.wait()
             }
 
-            Err(e) => return Err(e),
+            Err(e) => Err(e),
         }
     }
 }
diff -Nru firefox-84.0.2+build1/testing/mozbase/rust/mozversion/src/lib.rs firefox-85.0+build1/testing/mozbase/rust/mozversion/src/lib.rs
--- firefox-84.0.2+build1/testing/mozbase/rust/mozversion/src/lib.rs	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozbase/rust/mozversion/src/lib.rs	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,7 @@
 #![forbid(unsafe_code)]
+/* 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/. */
 
 extern crate ini;
 extern crate regex;
@@ -141,7 +144,7 @@
             {
                 version.patch = x
             }
-            if let Some(_) = captures.name("esr") {
+            if captures.name("esr").is_some() {
                 version.esr = true;
             }
             if let Some(pre_0) = captures.name("pre0").map(|x| x.as_str().to_string()) {
@@ -163,9 +166,10 @@
                 }
             }
         } else {
-            return Err(Error::VersionError(
-                format!("Failed to parse {} as version string", version_string).into(),
-            ));
+            return Err(Error::VersionError(format!(
+                "Failed to parse {} as version string",
+                version_string
+            )));
         }
         Ok(version)
     }
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/androidarm_4_3.py firefox-85.0+build1/testing/mozharness/configs/android/androidarm_4_3.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/androidarm_4_3.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/androidarm_4_3.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # mozharness configuration for Android 4.3 unit tests
 #
 # This configuration should be combined with suite definitions and other
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/android_common.py firefox-85.0+build1/testing/mozharness/configs/android/android_common.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/android_common.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/android_common.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Shared/common mozharness configuration for Android unit tests.
 #
 # This configuration should be combined with platform-specific mozharness
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/android_hw.py firefox-85.0+build1/testing/mozharness/configs/android/android_hw.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/android_hw.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/android_hw.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # mozharness configuration for Android hardware unit tests
 #
 # This configuration should be combined with suite definitions and other
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/android_pgo.py firefox-85.0+build1/testing/mozharness/configs/android/android_pgo.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/android_pgo.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/android_pgo.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Mozharness configuration for Android PGO.
 #
 # This configuration should be combined with platform-specific mozharness
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/androidx86_7_0.py firefox-85.0+build1/testing/mozharness/configs/android/androidx86_7_0.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/androidx86_7_0.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/androidx86_7_0.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # mozharness configuration for Android x86/x86_64 7.0 unit tests
 #
 # This configuration should be combined with suite definitions and other
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/android/wrench.py firefox-85.0+build1/testing/mozharness/configs/android/wrench.py
--- firefox-84.0.2+build1/testing/mozharness/configs/android/wrench.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/android/wrench.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # mozharness configuration for Android x86 7.0 wrench tests
 #
 # This configuration should be combined with suite definitions and other
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/awsy/linux_config.py firefox-85.0+build1/testing/mozharness/configs/awsy/linux_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/awsy/linux_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/awsy/linux_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 PYTHON = "/usr/bin/env python"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/awsy/macosx_config.py firefox-85.0+build1/testing/mozharness/configs/awsy/macosx_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/awsy/macosx_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/awsy/macosx_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 PYTHON = "/usr/bin/env python"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/awsy/taskcluster_windows_config.py firefox-85.0+build1/testing/mozharness/configs/awsy/taskcluster_windows_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/awsy/taskcluster_windows_config.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/awsy/taskcluster_windows_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import sys
 import mozharness
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/balrog/production.py firefox-85.0+build1/testing/mozharness/configs/balrog/production.py
--- firefox-84.0.2+build1/testing/mozharness/configs/balrog/production.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/balrog/production.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "balrog_servers": [
         {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/balrog/staging.py firefox-85.0+build1/testing/mozharness/configs/balrog/staging.py
--- firefox-84.0.2+build1/testing/mozharness/configs/balrog/staging.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/balrog/staging.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "balrog_servers": [
         {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/build_pool_specifics.py firefox-85.0+build1/testing/mozharness/configs/builds/build_pool_specifics.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/build_pool_specifics.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/build_pool_specifics.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 is a dict of pool specific keys/values. As this fills up and more
 # fx build factories are ported, we might deal with this differently
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_android_64_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_android_64_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_android_64_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_android_64_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_firefox.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_firefox.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_firefox.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_firefox.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "app_name": "browser",
 }
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_linux_32_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_linux_32_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_linux_32_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_linux_64_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_linux_64_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_linux_64_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_windows_64_mingw_builds.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_windows_64_mingw_builds.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_base_windows_64_mingw_builds.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_base_windows_64_mingw_builds.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-aarch64-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/debug-beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-aarch64",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-aarch64-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/debug",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_aarch64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-aarch64",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-aarch64/nightly",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/debug-beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_ccov.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_ccov.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_ccov.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_ccov.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-debug-ccov",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/debug-ccov",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/debug",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_searchfox.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_searchfox.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_searchfox.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_debug_searchfox.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-debug",
     "env": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_gradle_dependencies.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-gradle-dependencies",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16-gradle-dependencies/nightly",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_partner_sample1.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16-partner-sample1",
     "src_mozconfig": None,  # use manifest to determine mozconfig src
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_profile_generate.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_profile_generate.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_profile_generate.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_profile_generate.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/profile-generate",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-api-16",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/nightly",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_geckoview_docs.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-geckoview-docs",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-api-16/nightly-android-lints",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86_64-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/debug-beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86_64",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86_64-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/debug",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_fuzzing_asan.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_fuzzing_asan.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_fuzzing_asan.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64_fuzzing_asan.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86_64-asan-fuzzing",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/nightly-fuzzing-asan",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86_64",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86_64/nightly",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/debug-beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/beta",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/debug",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_fuzzing_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_fuzzing_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_fuzzing_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_fuzzing_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86-fuzzing-debug",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/debug-fuzzing",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_android_configs/64_x86.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "android-x86",
     "src_mozconfig": "mobile/android/config/mozconfigs/android-x86/nightly",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_tsan_tc.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_tsan_tc.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_tsan_tc.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_tsan_tc.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_source.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "default_actions": ["package-source"],
     "stage_platform": "source",  # Not used, but required by the script
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan_tc.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan_tc.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan_tc.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_tsan_tc.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_opt.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_code_coverage_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_asan.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_fuzzing_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_mingwclang.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "platform": "win32-mingwclang",
     "stage_platform": "win32-mingwclang",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/releng_sub_windows_configs/64_mingwclang.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "platform": "win64-mingwclang",
     "stage_platform": "win64-mingwclang",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_macosx.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_macosx.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_macosx.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_macosx.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_win32.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_win32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_win32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_win32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "platform": "win32",
     "mozconfig_platform": "win32",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_win64.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_win64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_win64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_win64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "platform": "win64",
     "mozconfig_platform": "win64",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_windows.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_windows.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_base_windows.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_base_windows.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win32-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win32/noopt_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win32-noopt-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-asan-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_reporter_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_reporter_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_reporter_opt.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/asan_reporter_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-asan-reporter",
     "mozconfig_variant": "nightly-asan-reporter",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_opt.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/ccov_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-ccov",
     "env": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/noopt_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-noopt-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_opt.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/plain_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "default_actions": [
         "build",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "default_actions": [
         "build",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py
--- firefox-84.0.2+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/builds/taskcluster_sub_win64/searchfox_debug.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "stage_platform": "win64-st-an-debug",
     "debug_build": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/developer_config.py firefox-85.0+build1/testing/mozharness/configs/developer_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/developer_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/developer_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 config file can be appended to any other mozharness job
 running under treeherder. The purpose of this config is to
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
--- firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Default configuration as used by Mozmill CI (Jenkins)
 
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/releng_release.py firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/releng_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/releng_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/releng_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Default configuration as used by Release Engineering for testing release/beta builds
 
 import os
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py
--- firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_mac.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Configuration over-rides for taskcluter.py, for osx
 config = {
     "tooltool_cache": "/builds/tooltool_cache",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster.py firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
--- firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Config file for firefox ui tests run via TaskCluster.
 
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py
--- firefox-84.0.2+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Config file for firefox ui tests run via TaskCluster.
 
 import os
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/jamun.py firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/jamun.py
--- firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/jamun.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/jamun.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 
 MULTI_REPO = "projects/jamun"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-beta.py firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-beta.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 
 MULTI_REPO = "releases/mozilla-beta"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-central.py firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-central.py
--- firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-central.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-central.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 
 MULTI_REPO = "mozilla-central"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py
--- firefox-84.0.2+build1/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/l10n_bumper/mozilla-esr68.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 
 MULTI_REPO = "releases/mozilla-esr68"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/marionette/mac_taskcluster_config.py firefox-85.0+build1/testing/mozharness/configs/marionette/mac_taskcluster_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/marionette/mac_taskcluster_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/marionette/mac_taskcluster_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # Configuration over-rides for prod_config.py, for osx
 
 # OS Specifics
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/marionette/prod_config.py firefox-85.0+build1/testing/mozharness/configs/marionette/prod_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/marionette/prod_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/marionette/prod_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 is a template config file for marionette production.
 HG_SHARE_BASE_DIR = "/builds/hg-shared"
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/marionette/windows_config.py firefox-85.0+build1/testing/mozharness/configs/marionette/windows_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/marionette/windows_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/marionette/windows_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 is a template config file for marionette production on Windows.
 config = {
     # marionette options
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/marionette/windows_taskcluster_config.py firefox-85.0+build1/testing/mozharness/configs/marionette/windows_taskcluster_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/marionette/windows_taskcluster_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/marionette/windows_taskcluster_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 is a template config file for marionette production on Windows.
 import os
 import platform
@@ -86,7 +90,7 @@
             "cmd": [
                 "powershell",
                 "-command",
-                "\"&{$p='HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance';if(!(Test-Path -Path $p)){&New-Item -Path $p -Force}&Set-ItemProperty -Path $p -Name Enabled -Value 0}\"",  # noqa
+                r"\"&{$p='HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance';if(!(Test-Path -Path $p)){&New-Item -Path $p -Force}&Set-ItemProperty -Path $p -Name Enabled -Value 0}\"",  # noqa
             ],
             "architectures": ["32bit", "64bit"],
             "halt_on_failure": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/beta_to_release.py firefox-85.0+build1/testing/mozharness/configs/merge_day/beta_to_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/beta_to_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/beta_to_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/bump_central.py firefox-85.0+build1/testing/mozharness/configs/merge_day/bump_central.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/bump_central.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/bump_central.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/bump_esr.py firefox-85.0+build1/testing/mozharness/configs/merge_day/bump_esr.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/bump_esr.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/bump_esr.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/central_to_beta.py firefox-85.0+build1/testing/mozharness/configs/merge_day/central_to_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/central_to_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/central_to_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/early_to_late_beta.py firefox-85.0+build1/testing/mozharness/configs/merge_day/early_to_late_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/early_to_late_beta.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/early_to_late_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 config is for `mach try release` to support beta simulations.
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/release_to_esr.py firefox-85.0+build1/testing/mozharness/configs/merge_day/release_to_esr.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/release_to_esr.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/release_to_esr.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/merge_day/staging_beta_migration.py firefox-85.0+build1/testing/mozharness/configs/merge_day/staging_beta_migration.py
--- firefox-84.0.2+build1/testing/mozharness/configs/merge_day/staging_beta_migration.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/merge_day/staging_beta_migration.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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 this script in conjunction with aurora_to_beta.py.
 # mozharness/scripts/merge_day/gecko_migration.py -c \
 #   mozharness/configs/merge_day/aurora_to_beta.py -c
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/linux32.py firefox-85.0+build1/testing/mozharness/configs/openh264/linux32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/linux32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/linux32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 import mozharness
@@ -8,13 +12,11 @@
 )
 
 config = {
-    "tooltool_manifest_file": "linux.manifest",
-    "tooltool_cache": "/builds/tooltool_cache",
     "exes": {
         "gittool.py": [os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "python2.7",
     },
-    "dump_syms_binary": "dump_syms",
+    "dump_syms_binary": "{}/dump_syms/dump_syms".format(os.environ["MOZ_FETCHES_DIR"]),
     "arch": "x86",
     "avoid_avx2": True,
     "operating_system": "linux",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/linux64.py firefox-85.0+build1/testing/mozharness/configs/openh264/linux64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/linux64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/linux64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 import mozharness
@@ -8,13 +12,11 @@
 )
 
 config = {
-    "tooltool_manifest_file": "linux.manifest",
-    "tooltool_cache": "/builds/tooltool_cache",
     "exes": {
         "gittool.py": [os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "python2.7",
     },
-    "dump_syms_binary": "dump_syms",
+    "dump_syms_binary": "{}/dump_syms/dump_syms".format(os.environ["MOZ_FETCHES_DIR"]),
     "arch": "x64",
     "avoid_avx2": True,
     "operating_system": "linux",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/macosx64-aarch64.py firefox-85.0+build1/testing/mozharness/configs/openh264/macosx64-aarch64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/macosx64-aarch64.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/macosx64-aarch64.py	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,42 @@
+# 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/.
+
+import os
+
+import mozharness
+
+external_tools_path = os.path.join(
+    os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
+    "external_tools",
+)
+
+config = {
+    "exes": {
+        "gittool.py": [os.path.join(external_tools_path, "gittool.py")],
+        "python2.7": "python2.7",
+    },
+    "dump_syms_binary": "{}/dump_syms/dump_syms".format(os.environ["MOZ_FETCHES_DIR"]),
+    "arch": "aarch64",
+    "use_yasm": True,
+    "operating_system": "darwin",
+    "partial_env": {
+        "CFLAGS": (
+            "-target aarch64-apple-darwin -mcpu=apple-a12 "
+            "-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format(
+                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
+            )
+        ),
+        "LDFLAGS": (
+            "-target aarch64-apple-darwin -mcpu=apple-a12 "
+            "-isysroot {MOZ_FETCHES_DIR}/MacOSX11.0.sdk".format(
+                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
+            )
+        ),
+        "PATH": (
+            "{MOZ_FETCHES_DIR}/clang/bin/:{MOZ_FETCHES_DIR}/cctools/bin/:%(PATH)s".format(
+                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
+            )
+        ),
+    },
+}
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/macosx64.py firefox-85.0+build1/testing/mozharness/configs/openh264/macosx64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/macosx64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/macosx64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 import mozharness
@@ -14,29 +18,23 @@
         "gittool.py": [os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "python2.7",
     },
-    "dump_syms_binary": "dump_syms",
+    "dump_syms_binary": "{}/dump_syms/dump_syms".format(os.environ["MOZ_FETCHES_DIR"]),
     "arch": "x64",
     "use_yasm": True,
     "operating_system": "darwin",
     "partial_env": {
         "CXXFLAGS": (
             "-target x86_64-apple-darwin "
-            "-B {MOZ_FETCHES_DIR}/cctools/bin "
             "-isysroot %(abs_work_dir)s/MacOSX10.11.sdk "
-            "-mmacosx-version-min=10.11".format(
-                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
-            )
+            "-mmacosx-version-min=10.11"
         ),
         "LDFLAGS": (
             "-target x86_64-apple-darwin "
-            "-B {MOZ_FETCHES_DIR}/cctools/bin "
             "-isysroot %(abs_work_dir)s/MacOSX10.11.sdk "
-            "-mmacosx-version-min=10.11".format(
-                MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
-            )
+            "-mmacosx-version-min=10.11"
         ),
         "PATH": (
-            "{MOZ_FETCHES_DIR}/clang/bin/:%(PATH)s".format(
+            "{MOZ_FETCHES_DIR}/clang/bin/:{MOZ_FETCHES_DIR}/cctools/bin/:%(PATH)s".format(
                 MOZ_FETCHES_DIR=os.environ["MOZ_FETCHES_DIR"]
             )
         ),
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/linux.manifest firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/linux.manifest
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/linux.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/linux.manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-[
-  {
-    "size": 9507240,
-    "visibility": "public",
-    "digest": "3cf69a10dca3969bcd2873b96b0207de01ce13f299b2af37f424f21959be849c0e729d5f74cca41f33e0c59bc87b2329a07ac9f901b4a0a9672e6441ceca704d",
-    "algorithm": "sha512",
-    "filename": "dump_syms"
-  }
-]
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/osx.manifest firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/osx.manifest
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/osx.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/osx.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -1,12 +1,5 @@
 [
   {
-    "size": 475508,
-    "visibility": "public",
-    "digest": "d705fb149fd7ec6a0833000224f802bd8cbb0f3ecf96efa558010e63db691ff03a95180d9525229e7055e8810c528bf3d7f1a1ab97aecadab3c7c7de8668ab30",
-    "algorithm": "sha512",
-    "filename": "dump_syms"
-  },
-  {
     "size": 34094283,
     "visibility": "internal",
     "digest": "8811050fe375bcc566c8b85173d86b8a87aa2148edfed93023735c2de44b66a5a28cbaa1cfd396032447fd803e03f308ed941a200c0e2a1ad9fbe16b5606ee7c",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/win64-aarch64.manifest firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/win64-aarch64.manifest
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/win64-aarch64.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/win64-aarch64.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -1,12 +1,5 @@
 [
   {
-    "size": 56832,
-    "visibility": "public",
-    "digest": "01e6bd936ef008061b95a94008682869ebf2a29d1c035e49cd6579b1a020d0d195431221577f127eb52b97137337efe30e6de6c5a2f4b6a87ff2a990e9874e8e",
-    "algorithm": "sha512",
-    "filename": "dump_syms.exe"
-  },
-  {
     "version": "Visual Studio 2017 15.9.6 / SDK 10.0.17134.0",
     "size": 490015895,
     "visibility": "internal",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/win.manifest firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/win.manifest
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/tooltool-manifests/win.manifest	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/tooltool-manifests/win.manifest	2021-01-18 19:58:19.000000000 +0000
@@ -1,12 +1,5 @@
 [
   {
-    "size": 56832,
-    "visibility": "public",
-    "digest": "01e6bd936ef008061b95a94008682869ebf2a29d1c035e49cd6579b1a020d0d195431221577f127eb52b97137337efe30e6de6c5a2f4b6a87ff2a990e9874e8e",
-    "algorithm": "sha512",
-    "filename": "dump_syms.exe"
-  },
-  {
     "version": "Visual Studio 2017 15.8.4 / SDK 10.0.17134.0",
     "digest": "ecf1e03f6f98f86775059a43f9e7dc7e326f6643d7c08962d9f614e4f5a65b1ca63fa1cfeb0f1a3c2474bf0d4318dda960b378beb2a44ecf8a91111207f4ece5",
     "size": 349626009,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/win32.py firefox-85.0+build1/testing/mozharness/configs/openh264/win32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/win32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/win32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 import os
 
@@ -15,7 +19,9 @@
         "gittool.py": [sys.executable, os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "c:\\mozilla-build\\python\\python.exe",
     },
-    "dump_syms_binary": "dump_syms.exe",
+    "dump_syms_binary": "{}/dump_syms/dump_syms.exe".format(
+        os.environ["MOZ_FETCHES_DIR"]
+    ),
     "arch": "x86",
     "use_yasm": True,
     "partial_env": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/win64-aarch64.py firefox-85.0+build1/testing/mozharness/configs/openh264/win64-aarch64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/win64-aarch64.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/win64-aarch64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 import os
 
@@ -15,7 +19,9 @@
         "gittool.py": [sys.executable, os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "c:\\mozilla-build\\python\\python.exe",
     },
-    "dump_syms_binary": "dump_syms.exe",
+    "dump_syms_binary": "{}/dump_syms/dump_syms.exe".format(
+        os.environ["MOZ_FETCHES_DIR"]
+    ),
     "arch": "aarch64",
     "use_yasm": False,
     "partial_env": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/openh264/win64.py firefox-85.0+build1/testing/mozharness/configs/openh264/win64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/openh264/win64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/openh264/win64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import sys
 import os
 
@@ -15,7 +19,9 @@
         "gittool.py": [sys.executable, os.path.join(external_tools_path, "gittool.py")],
         "python2.7": "c:\\mozilla-build\\python\\python.exe",
     },
-    "dump_syms_binary": "dump_syms.exe",
+    "dump_syms_binary": "{}/dump_syms/dump_syms.exe".format(
+        os.environ["MOZ_FETCHES_DIR"]
+    ),
     "arch": "x64",
     "use_yasm": True,
     "partial_env": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop_EME-free.py firefox-85.0+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop_EME-free.py
--- firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop_EME-free.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop_EME-free.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py firefox-85.0+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py
--- firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/partner_repacks/release_mozilla-release_desktop.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py firefox-85.0+build1/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py
--- firefox-84.0.2+build1/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/partner_repacks/staging_release_mozilla-release_desktop.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "appName": "Firefox",
     "log_name": "partner_repack",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/android_hw_config.py firefox-85.0+build1/testing/mozharness/configs/raptor/android_hw_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/android_hw_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/android_hw_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/linux64_config_taskcluster.py firefox-85.0+build1/testing/mozharness/configs/raptor/linux64_config_taskcluster.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/linux64_config_taskcluster.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/linux64_config_taskcluster.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,28 +1,32 @@
-import os
-import sys
-
-PYTHON = sys.executable
-VENV_PATH = "%s/build/venv" % os.getcwd()
-
-exes = {
-    "python": PYTHON,
-}
-ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
-INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
-
-config = {
-    "log_name": "raptor",
-    "installer_path": INSTALLER_PATH,
-    "virtualenv_path": VENV_PATH,
-    "exes": exes,
-    "title": os.uname()[1].lower().split(".")[0],
-    "default_actions": [
-        "clobber",
-        "download-and-extract",
-        "populate-webroot",
-        "create-virtualenv",
-        "install",
-        "run-tests",
-    ],
-    "tooltool_cache": "/builds/worker/tooltool-cache",
-}
+# 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/.
+
+import os
+import sys
+
+PYTHON = sys.executable
+VENV_PATH = "%s/build/venv" % os.getcwd()
+
+exes = {
+    "python": PYTHON,
+}
+ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
+INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
+
+config = {
+    "log_name": "raptor",
+    "installer_path": INSTALLER_PATH,
+    "virtualenv_path": VENV_PATH,
+    "exes": exes,
+    "title": os.uname()[1].lower().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install",
+        "run-tests",
+    ],
+    "tooltool_cache": "/builds/worker/tooltool-cache",
+}
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/linux_config.py firefox-85.0+build1/testing/mozharness/configs/raptor/linux_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/linux_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/linux_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 VENV_PATH = "%s/build/venv" % os.getcwd()
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/mac_config.py firefox-85.0+build1/testing/mozharness/configs/raptor/mac_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/mac_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/mac_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 VENV_PATH = "%s/build/venv" % os.getcwd()
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/windows_config.py firefox-85.0+build1/testing/mozharness/configs/raptor/windows_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/windows_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/windows_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import socket
 import sys
@@ -10,7 +14,7 @@
     "log_name": "raptor",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
-    "virtualenv_modules": ["pywin32", "raptor", "mozinstall"],
+    "virtualenv_modules": ["pypiwin32==219", "raptor", "mozinstall"],
     "exes": {
         "python": PYTHON,
         "easy_install": [
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/raptor/windows_vm_config.py firefox-85.0+build1/testing/mozharness/configs/raptor/windows_vm_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/raptor/windows_vm_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/raptor/windows_vm_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import socket
 import sys
@@ -10,7 +14,7 @@
     "log_name": "raptor",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
-    "virtualenv_modules": ["pywin32", "raptor", "mozinstall"],
+    "virtualenv_modules": ["pypiwin32==219", "raptor", "mozinstall"],
     "exes": {
         "python": PYTHON,
         "easy_install": [
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_beta.py firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # lint_ignore=E501
 config = {
     "products": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_devedition.py firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_devedition.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_devedition.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_devedition.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # lint_ignore=E501
 config = {
     "products": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_esr.py firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_esr.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_esr.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_esr.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # lint_ignore=E501
 config = {
     "products": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_nightly.py firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_nightly.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_nightly.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_nightly.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # lint_ignore=E501
 config = {
     "products": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_release.py firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/bouncer_firefox_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/bouncer_firefox_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 # lint_ignore=E501
 config = {
     "products": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_beta.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     # maple is used for staging mozilla-beta
     "log_name": "bump_maple",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_release.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_fennec_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "bump_release_dev",
     "version_files": [
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     # date is used for staging mozilla-beta
     "log_name": "bump_date",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release_birch.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release_birch.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release_birch.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release_birch.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "bump_release_dev",
     "version_files": [
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_postrelease_firefox_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "bump_release_dev",
     "version_files": [
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_beta.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "bump_beta_dev",
     # TODO: use real repo
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_devedition.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_devedition.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_devedition.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_devedition.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_devedition",
     # TODO: use real repo
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_release_birch.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_release_birch.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_release_birch.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_release_birch.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_release_dev",
     # TODO: use real repo
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_release.py firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/dev_updates_firefox_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/dev_updates_firefox_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_release_dev",
     # TODO: use real repo
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_beta.py firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_beta.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_beta.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_beta.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_beta",
     "repo": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_devedition.py firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_devedition.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_devedition.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_devedition.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_devedition",
     "repo": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_release.py firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_release.py
--- firefox-84.0.2+build1/testing/mozharness/configs/releases/updates_firefox_release.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/releases/updates_firefox_release.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "log_name": "updates_release",
     "repo": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/remove_executables.py firefox-85.0+build1/testing/mozharness/configs/remove_executables.py
--- firefox-84.0.2+build1/testing/mozharness/configs/remove_executables.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/remove_executables.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     # We bake this directly into the tester image now...
     "nodejs_path": "/usr/local/bin/node",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/base.py firefox-85.0+build1/testing/mozharness/configs/repackage/base.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/base.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/base.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/linux32_signed.py firefox-85.0+build1/testing/mozharness/configs/repackage/linux32_signed.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/linux32_signed.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/linux32_signed.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "linux32"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/linux64_signed.py firefox-85.0+build1/testing/mozharness/configs/repackage/linux64_signed.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/linux64_signed.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/linux64_signed.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "linux64"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/osx_partner.py firefox-85.0+build1/testing/mozharness/configs/repackage/osx_partner.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/osx_partner.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/osx_partner.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/osx_signed.py firefox-85.0+build1/testing/mozharness/configs/repackage/osx_signed.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/osx_signed.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/osx_signed.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_partner.py firefox-85.0+build1/testing/mozharness/configs/repackage/win32_partner.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_partner.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win32_partner.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "win32"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_sfx_stub.py firefox-85.0+build1/testing/mozharness/configs/repackage/win32_sfx_stub.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_sfx_stub.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win32_sfx_stub.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "sfx-stub": "other-licenses/7zstub/firefox/7zSD.Win32.sfx",
 }
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_signed.py firefox-85.0+build1/testing/mozharness/configs/repackage/win32_signed.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win32_signed.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win32_signed.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "win32"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64-aarch64_sfx_stub.py firefox-85.0+build1/testing/mozharness/configs/repackage/win64-aarch64_sfx_stub.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64-aarch64_sfx_stub.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win64-aarch64_sfx_stub.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "sfx-stub": "other-licenses/7zstub/firefox/7zSD.ARM64.sfx",
 }
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64_partner.py firefox-85.0+build1/testing/mozharness/configs/repackage/win64_partner.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64_partner.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win64_partner.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "win64"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64_signed.py firefox-85.0+build1/testing/mozharness/configs/repackage/win64_signed.py
--- firefox-84.0.2+build1/testing/mozharness/configs/repackage/win64_signed.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/repackage/win64_signed.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 platform = "win64"
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/servo/mac.py firefox-85.0+build1/testing/mozharness/configs/servo/mac.py
--- firefox-84.0.2+build1/testing/mozharness/configs/servo/mac.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/servo/mac.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "concurrency": 6,
 }
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/devedition.py firefox-85.0+build1/testing/mozharness/configs/single_locale/devedition.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/devedition.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/devedition.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "app_name": "browser",
     "mozconfig_variant": "l10n-mozconfig-devedition",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/firefox.py firefox-85.0+build1/testing/mozharness/configs/single_locale/firefox.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/firefox.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/firefox.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "app_name": "browser",
     "mozconfig_variant": "l10n-mozconfig",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/linux32.py firefox-85.0+build1/testing/mozharness/configs/single_locale/linux32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/linux32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/linux32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "linux32",
     "log_name": "single_locale",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/linux64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/linux64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/linux64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/linux64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "linux64",
     "vcs_share_base": "/builds/hg-shared",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/macosx64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/macosx64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/macosx64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/macosx64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "macosx64",
     "upload_env_extra": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_android-api-16.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_android-api-16.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_android-api-16.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_android-api-16.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "locales_dir": "mobile/android/locales",
     "ignore_locales": ["en-US"],
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_common.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_common.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_common.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_common.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "simple_name_move": True,
     "vcs_share_base": "/builds/hg-shared",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_linux32.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_linux32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_linux32.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_linux32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_linux_common.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_linux_common.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_linux_common.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_linux_common.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_macosx64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_macosx64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_macosx64.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_macosx64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_win32.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_win32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_win32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_win32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_win64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_win64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/tc_win64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/tc_win64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 config = {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win32.py firefox-85.0+build1/testing/mozharness/configs/single_locale/win32.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win32.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/win32.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "win32",
     "log_name": "single_locale",
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win64-aarch64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/win64-aarch64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win64-aarch64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/win64-aarch64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "win64-aarch64",
     # l10n
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win64.py firefox-85.0+build1/testing/mozharness/configs/single_locale/win64.py
--- firefox-84.0.2+build1/testing/mozharness/configs/single_locale/win64.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/single_locale/win64.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "mozconfig_platform": "win64",
     # l10n
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/linux64_config_taskcluster.py firefox-85.0+build1/testing/mozharness/configs/talos/linux64_config_taskcluster.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/linux64_config_taskcluster.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/linux64_config_taskcluster.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,28 +1,32 @@
-import os
-import sys
-
-PYTHON = sys.executable
-VENV_PATH = "%s/build/venv" % os.getcwd()
-
-exes = {
-    "python": PYTHON,
-}
-ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
-INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
-
-config = {
-    "log_name": "talos",
-    "installer_path": INSTALLER_PATH,
-    "virtualenv_path": VENV_PATH,
-    "exes": exes,
-    "title": os.uname()[1].lower().split(".")[0],
-    "default_actions": [
-        "clobber",
-        "download-and-extract",
-        "populate-webroot",
-        "create-virtualenv",
-        "install",
-        "run-tests",
-    ],
-    "tooltool_cache": "/builds/worker/tooltool-cache",
-}
+# 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/.
+
+import os
+import sys
+
+PYTHON = sys.executable
+VENV_PATH = "%s/build/venv" % os.getcwd()
+
+exes = {
+    "python": PYTHON,
+}
+ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
+INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.tar.bz2")
+
+config = {
+    "log_name": "talos",
+    "installer_path": INSTALLER_PATH,
+    "virtualenv_path": VENV_PATH,
+    "exes": exes,
+    "title": os.uname()[1].lower().split(".")[0],
+    "default_actions": [
+        "clobber",
+        "download-and-extract",
+        "populate-webroot",
+        "create-virtualenv",
+        "install",
+        "run-tests",
+    ],
+    "tooltool_cache": "/builds/worker/tooltool-cache",
+}
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/linux_config.py firefox-85.0+build1/testing/mozharness/configs/talos/linux_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/linux_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/linux_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 VENV_PATH = "%s/build/venv" % os.getcwd()
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/mac_config.py firefox-85.0+build1/testing/mozharness/configs/talos/mac_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/mac_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/mac_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 VENV_PATH = "%s/build/venv" % os.getcwd()
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_config.py firefox-85.0+build1/testing/mozharness/configs/talos/windows_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/windows_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import socket
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_taskcluster_config.py firefox-85.0+build1/testing/mozharness/configs/talos/windows_taskcluster_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_taskcluster_config.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/windows_taskcluster_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import socket
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_vm_config.py firefox-85.0+build1/testing/mozharness/configs/talos/windows_vm_config.py
--- firefox-84.0.2+build1/testing/mozharness/configs/talos/windows_vm_config.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/talos/windows_vm_config.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import socket
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/taskcluster_nightly.py firefox-85.0+build1/testing/mozharness/configs/taskcluster_nightly.py
--- firefox-84.0.2+build1/testing/mozharness/configs/taskcluster_nightly.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/taskcluster_nightly.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 config = {
     "nightly_build": True,
     "taskcluster_nightly": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/unittests/linux_unittest.py firefox-85.0+build1/testing/mozharness/configs/unittests/linux_unittest.py
--- firefox-84.0.2+build1/testing/mozharness/configs/unittests/linux_unittest.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/unittests/linux_unittest.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import platform
 
@@ -30,6 +34,7 @@
 #####
 config = {
     ###
+    "virtualenv_modules": ["six==1.13.0", "vcversioner==2.16.0.0"],
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/unittests/mac_unittest.py firefox-85.0+build1/testing/mozharness/configs/unittests/mac_unittest.py
--- firefox-84.0.2+build1/testing/mozharness/configs/unittests/mac_unittest.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/unittests/mac_unittest.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 
 # OS Specifics
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/unittests/win_unittest.py firefox-85.0+build1/testing/mozharness/configs/unittests/win_unittest.py
--- firefox-84.0.2+build1/testing/mozharness/configs/unittests/win_unittest.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/unittests/win_unittest.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import platform
 import sys
@@ -34,7 +38,7 @@
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
-    "virtualenv_modules": ["pypiwin32", "six==1.13.0", "vcversioner==2.16.0.0"],
+    "virtualenv_modules": ["pypiwin32==219", "six==1.13.0", "vcversioner==2.16.0.0"],
     "virtualenv_path": "venv",
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
diff -Nru firefox-84.0.2+build1/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py firefox-85.0+build1/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
--- firefox-84.0.2+build1/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py	2021-01-18 19:58:19.000000000 +0000
@@ -74,7 +74,7 @@
             "cmd": [
                 "powershell",
                 "-command",
-                "\"&{$p='HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance';if(!(Test-Path -Path $p)){&New-Item -Path $p -Force}&Set-ItemProperty -Path $p -Name Enabled -Value 0}\"",  # noqa
+                r"\"&{$p='HKCU:SOFTWARE\Microsoft\Windows\CurrentVersion\Notifications\Settings\Windows.SystemToast.SecurityAndMaintenance';if(!(Test-Path -Path $p)){&New-Item -Path $p -Force}&Set-ItemProperty -Path $p -Name Enabled -Value 0}\"",  # noqa
             ],
             "architectures": ["32bit", "64bit"],
             "halt_on_failure": True,
diff -Nru firefox-84.0.2+build1/testing/mozharness/examples/action_config_script.py firefox-85.0+build1/testing/mozharness/examples/action_config_script.py
--- firefox-84.0.2+build1/testing/mozharness/examples/action_config_script.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/examples/action_config_script.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env python -u
+# 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/.
+
 """action_config_script.py
 
 Demonstrate actions and config.
diff -Nru firefox-84.0.2+build1/testing/mozharness/examples/silent_script.py firefox-85.0+build1/testing/mozharness/examples/silent_script.py
--- firefox-84.0.2+build1/testing/mozharness/examples/silent_script.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/examples/silent_script.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 """ This script is an example of why I care so much about Mozharness' 2nd core
 concept, logging.  http://escapewindow.dreamwidth.org/230853.html
 """
diff -Nru firefox-84.0.2+build1/testing/mozharness/examples/venv.py firefox-85.0+build1/testing/mozharness/examples/venv.py
--- firefox-84.0.2+build1/testing/mozharness/examples/venv.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/examples/venv.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 """venv.py
 
 Test virtualenv creation. This installs talos in the local venv; that's it.
diff -Nru firefox-84.0.2+build1/testing/mozharness/examples/verbose_script.py firefox-85.0+build1/testing/mozharness/examples/verbose_script.py
--- firefox-84.0.2+build1/testing/mozharness/examples/verbose_script.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/examples/verbose_script.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 """verbose_script.py
 
 Contrast to silent_script.py.
diff -Nru firefox-84.0.2+build1/testing/mozharness/external_tools/extract_and_run_command.py firefox-85.0+build1/testing/mozharness/external_tools/extract_and_run_command.py
--- firefox-84.0.2+build1/testing/mozharness/external_tools/extract_and_run_command.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/external_tools/extract_and_run_command.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 """
 Usage: extract_and_run_command.py [-j N] [command to run] -- [files and/or directories]
     -j is the number of workers to start, defaulting to 1.
diff -Nru firefox-84.0.2+build1/testing/mozharness/external_tools/gittool.py firefox-85.0+build1/testing/mozharness/external_tools/gittool.py
--- firefox-84.0.2+build1/testing/mozharness/external_tools/gittool.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/external_tools/gittool.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 ### Compressed module sources ###
 module_sources = [
     (
diff -Nru firefox-84.0.2+build1/testing/mozharness/external_tools/mouse_and_screen_resolution.py firefox-85.0+build1/testing/mozharness/external_tools/mouse_and_screen_resolution.py
--- firefox-84.0.2+build1/testing/mozharness/external_tools/mouse_and_screen_resolution.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/external_tools/mouse_and_screen_resolution.py	2021-01-18 19:58:19.000000000 +0000
@@ -164,18 +164,18 @@
     CDS_FULLSCREEN = 0x00000004
     SIZEOF_DEVMODE = 148
 
-    DevModeData = struct.calcsize("32BHH") * "\x00"
+    DevModeData = struct.calcsize("32BHH") * b"\x00"
     DevModeData += struct.pack("H", SIZEOF_DEVMODE)
-    DevModeData += struct.calcsize("H") * "\x00"
+    DevModeData += struct.calcsize("H") * b"\x00"
     dwFields = (
         (xres and DM_PELSWIDTH or 0)
         | (yres and DM_PELSHEIGHT or 0)
         | (BitsPerPixel and DM_BITSPERPEL or 0)
     )
     DevModeData += struct.pack("L", dwFields)
-    DevModeData += struct.calcsize("l9h32BHL") * "\x00"
+    DevModeData += struct.calcsize("l9h32BHL") * b"\x00"
     DevModeData += struct.pack("LLL", BitsPerPixel or 0, xres or 0, yres or 0)
-    DevModeData += struct.calcsize("8L") * "\x00"
+    DevModeData += struct.calcsize("8L") * b"\x00"
 
     return windll.user32.ChangeDisplaySettingsA(DevModeData, 0)
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/external_tools/packagesymbols.py firefox-85.0+build1/testing/mozharness/external_tools/packagesymbols.py
--- firefox-84.0.2+build1/testing/mozharness/external_tools/packagesymbols.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/external_tools/packagesymbols.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 
 from __future__ import print_function
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/external_tools/performance-artifact-schema.json firefox-85.0+build1/testing/mozharness/external_tools/performance-artifact-schema.json
--- firefox-84.0.2+build1/testing/mozharness/external_tools/performance-artifact-schema.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/external_tools/performance-artifact-schema.json	2021-01-18 19:58:19.000000000 +0000
@@ -123,7 +123,7 @@
                     "description": "Similar to extraOptions, except it does not break existing performance data series",
                     "items": {
                         "type": "string",
-                        "pattern": "^[a-zA-Z0-9]{1,24}$"
+                        "pattern": "^[a-zA-Z0-9-]{1,24}$"
                     },
                     "uniqueItems": true,
                     "maxItems": 14
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/base/diskutils.py firefox-85.0+build1/testing/mozharness/mozharness/base/diskutils.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/base/diskutils.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/base/diskutils.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 """Disk utility module, no mixins here!
 
     examples:
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/base/vcs/gittool.py firefox-85.0+build1/testing/mozharness/mozharness/base/vcs/gittool.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/base/vcs/gittool.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/base/vcs/gittool.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import re
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/__init__.py firefox-85.0+build1/testing/mozharness/mozharness/__init__.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/__init__.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,2 +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/.
+
 version = (0, 7)
 version_string = ".".join(["%d" % i for i in version])
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/bouncer/submitter.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/bouncer/submitter.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/bouncer/submitter.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/bouncer/submitter.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import base64
 import socket
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/building/buildbase.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/building/buildbase.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/building/buildbase.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/building/buildbase.py	2021-01-18 19:58:19.000000000 +0000
@@ -673,7 +673,7 @@
             # explicitly
             if c.get("update_channel"):
                 update_channel = c["update_channel"]
-                if isinstance(update_channel, six.text_type):
+                if six.PY2 and isinstance(update_channel, six.text_type):
                     update_channel = update_channel.encode("utf-8")
                 env["MOZ_UPDATE_CHANNEL"] = update_channel
             else:  # let's just give the generic channel based on branch
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/checksums.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/checksums.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/checksums.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/checksums.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import six
 
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/merkle.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/merkle.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/merkle.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/merkle.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import struct
 
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/mozbase.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/mozbase.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/mozbase.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/mozbase.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 from mozharness.base.script import PreScriptAction
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/repo_manipulation.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/repo_manipulation.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/repo_manipulation.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/repo_manipulation.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import ConfigParser
 import json
 import os
diff -Nru firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/tooltool.py firefox-85.0+build1/testing/mozharness/mozharness/mozilla/tooltool.py
--- firefox-84.0.2+build1/testing/mozharness/mozharness/mozilla/tooltool.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/mozharness/mozilla/tooltool.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 """module for tooltool operations"""
 import os
 import sys
diff -Nru firefox-84.0.2+build1/testing/mozharness/scripts/desktop_unittest.py firefox-85.0+build1/testing/mozharness/scripts/desktop_unittest.py
--- firefox-84.0.2+build1/testing/mozharness/scripts/desktop_unittest.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/scripts/desktop_unittest.py	2021-01-18 19:58:19.000000000 +0000
@@ -926,7 +926,9 @@
         try:
             import psutil
 
-            path = os.path.join(dir, "system-info.log")
+            path = os.path.join(
+                self.query_abs_dirs()["abs_blob_upload_dir"], "system-info.log"
+            )
             with open(path, "w") as f:
                 f.write("System info collected at %s\n\n" % datetime.now())
                 f.write("\nBoot time %s\n" % datetime.fromtimestamp(psutil.boot_time()))
diff -Nru firefox-84.0.2+build1/testing/mozharness/scripts/openh264_build.py firefox-85.0+build1/testing/mozharness/scripts/openh264_build.py
--- firefox-84.0.2+build1/testing/mozharness/scripts/openh264_build.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/scripts/openh264_build.py	2021-01-18 19:58:19.000000000 +0000
@@ -177,7 +177,7 @@
             self.error("missing a required key.")
 
     def query_package_name(self):
-        if self.config["arch"] == "x64":
+        if self.config["arch"] in ("x64", "aarch64"):
             bits = "64"
         else:
             bits = "32"
@@ -189,8 +189,11 @@
                     version=version, arch=self.config["arch"]
                 )
             elif self.config.get("operating_system") == "darwin":
-                return "openh264-macosx{bits}-{version}.zip".format(
-                    version=version, bits=bits
+                suffix = ""
+                if self.config["arch"] != "x64":
+                    suffix = "-" + self.config["arch"]
+                return "openh264-macosx{bits}{suffix}-{version}.zip".format(
+                    version=version, bits=bits, suffix=suffix
                 )
             else:
                 return "openh264-linux{bits}-{version}.zip".format(
@@ -218,15 +221,18 @@
         else:
             retval.append("ENABLE64BIT=No")
 
+        if self.config["arch"] == "x86":
+            retval.append("ARCH=x86")
+        elif self.config["arch"] == "x64":
+            retval.append("ARCH=x86_64")
+        elif self.config["arch"] == "aarch64":
+            retval.append("ARCH=arm64")
+        else:
+            self.fatal("Unknown arch: {}".format(self.config["arch"]))
+
         if "operating_system" in self.config:
             retval.append("OS=%s" % self.config["operating_system"])
             if self.config["operating_system"] == "android":
-                if self.config["arch"] == "x86":
-                    retval.append("ARCH=x86")
-                elif self.config["arch"] == "aarch64":
-                    retval.append("ARCH=arm64")
-                else:
-                    retval.append("ARCH=arm")
                 retval.append("TARGET=invalid")
                 retval.append("NDKLEVEL=%s" % self.config["min_sdk"])
                 retval.append("NDKROOT=%s/android-ndk" % os.environ["MOZ_FETCHES_DIR"])
@@ -242,14 +248,10 @@
             retval.append("CC=clang-cl")
             retval.append("CXX=clang-cl")
             if self.config["arch"] == "x86":
-                retval.append("ARCH=x86")
                 retval.append("CFLAGS=-m32")
             elif self.config["arch"] == "aarch64":
-                retval.append("ARCH=arm64")
                 retval.append("CFLAGS=--target=aarch64-windows-msvc")
                 retval.append("CXX_LINK_O=-nologo --target=aarch64-windows-msvc -Fe$@")
-            else:
-                retval.append("ARCH=x86_64")
         else:
             retval.append("CC=clang")
             retval.append("CXX=clang++")
diff -Nru firefox-84.0.2+build1/testing/mozharness/scripts/release/generate-checksums.py firefox-85.0+build1/testing/mozharness/scripts/release/generate-checksums.py
--- firefox-84.0.2+build1/testing/mozharness/scripts/release/generate-checksums.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/scripts/release/generate-checksums.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import binascii
 import hashlib
 import os
diff -Nru firefox-84.0.2+build1/testing/mozharness/scripts/release/update-verify-config-creator.py firefox-85.0+build1/testing/mozharness/scripts/release/update-verify-config-creator.py
--- firefox-84.0.2+build1/testing/mozharness/scripts/release/update-verify-config-creator.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/scripts/release/update-verify-config-creator.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from distutils.version import LooseVersion
 import json
 import math
diff -Nru firefox-84.0.2+build1/testing/mozharness/scripts/repackage.py firefox-85.0+build1/testing/mozharness/scripts/repackage.py
--- firefox-84.0.2+build1/testing/mozharness/scripts/repackage.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/scripts/repackage.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import sys
 
diff -Nru firefox-84.0.2+build1/testing/mozharness/setup.py firefox-85.0+build1/testing/mozharness/setup.py
--- firefox-84.0.2+build1/testing/mozharness/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/mozharness/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 from setuptools import setup, find_packages
 
diff -Nru firefox-84.0.2+build1/testing/perfdocs/generated/mozperftest.rst firefox-85.0+build1/testing/perfdocs/generated/mozperftest.rst
--- firefox-84.0.2+build1/testing/perfdocs/generated/mozperftest.rst	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/perfdocs/generated/mozperftest.rst	2021-01-18 19:58:19.000000000 +0000
@@ -39,6 +39,15 @@
 
 **User-journey live site test for cloudflare blog.**
 
+perftest_http3_controlled.js
+============================
+
+:owner: Network Team
+:name: controlled
+:tags: throttlable
+
+**User-journey live site test for controlled server**
+
 perftest_http3_facebook_scroll.js
 =================================
 
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_android_main.js firefox-85.0+build1/testing/performance/perftest_android_main.js
--- firefox-84.0.2+build1/testing/performance/perftest_android_main.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_android_main.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 /* eslint-env node */
 
 async function test(context, commands) {
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_bbc_link.js firefox-85.0+build1/testing/performance/perftest_bbc_link.js
--- firefox-84.0.2+build1/testing/performance/perftest_bbc_link.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_bbc_link.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   let rootUrl = "https://www.bbc.com/";
 
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_facebook.js firefox-85.0+build1/testing/performance/perftest_facebook.js
--- firefox-84.0.2+build1/testing/performance/perftest_facebook.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_facebook.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   await commands.navigate("https://www.example.com");
   await commands.wait.byTime(15000);
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_jsconf_cold.js firefox-85.0+build1/testing/performance/perftest_jsconf_cold.js
--- firefox-84.0.2+build1/testing/performance/perftest_jsconf_cold.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_jsconf_cold.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   let rootUrl = "https://2019.jsconf.eu/";
 
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_jsconf_warm.js firefox-85.0+build1/testing/performance/perftest_jsconf_warm.js
--- firefox-84.0.2+build1/testing/performance/perftest_jsconf_warm.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_jsconf_warm.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   let rootUrl = "https://2019.jsconf.eu/";
 
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_pageload.js firefox-85.0+build1/testing/performance/perftest_pageload.js
--- firefox-84.0.2+build1/testing/performance/perftest_pageload.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_pageload.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function setUp(context) {
   context.log.info("setUp example!");
 }
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_politico_link.js firefox-85.0+build1/testing/performance/perftest_politico_link.js
--- firefox-84.0.2+build1/testing/performance/perftest_politico_link.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_politico_link.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   let rootUrl = "https://www.politico.com/";
 
diff -Nru firefox-84.0.2+build1/testing/performance/perftest_youtube_link.js firefox-85.0+build1/testing/performance/perftest_youtube_link.js
--- firefox-84.0.2+build1/testing/performance/perftest_youtube_link.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/performance/perftest_youtube_link.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 async function test(context, commands) {
   let rootUrl = "https://www.politico.com/";
 
diff -Nru firefox-84.0.2+build1/testing/profiles/base/user.js firefox-85.0+build1/testing/profiles/base/user.js
--- firefox-84.0.2+build1/testing/profiles/base/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/base/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Empty base preferences file used by everything.
 // This is useful for testing a pref on try.
 /* globals user_pref */
diff -Nru firefox-84.0.2+build1/testing/profiles/common/user.js firefox-85.0+build1/testing/profiles/common/user.js
--- firefox-84.0.2+build1/testing/profiles/common/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/common/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Common preferences file used by both unittest and perf harnesses.
 /* globals user_pref */
 user_pref("app.update.checkInstallTime", false);
diff -Nru firefox-84.0.2+build1/testing/profiles/geckoview-junit/user.js firefox-85.0+build1/testing/profiles/geckoview-junit/user.js
--- firefox-84.0.2+build1/testing/profiles/geckoview-junit/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/geckoview-junit/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file used by the mochitest
 /* globals user_pref */
 /* eslint quotes: 0 */
diff -Nru firefox-84.0.2+build1/testing/profiles/perf/user.js firefox-85.0+build1/testing/profiles/perf/user.js
--- firefox-84.0.2+build1/testing/profiles/perf/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/perf/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file used by performance harnesses
 /* globals user_pref */
 user_pref("app.normandy.api_url", "https://127.0.0.1/selfsupport-dummy/");
diff -Nru firefox-84.0.2+build1/testing/profiles/profileserver/user.js firefox-85.0+build1/testing/profiles/profileserver/user.js
--- firefox-84.0.2+build1/testing/profiles/profileserver/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/profileserver/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Preferences file for profileserver.
 /* globals user_pref */
 // Turn off budget throttling for the profile server
diff -Nru firefox-84.0.2+build1/testing/profiles/raptor/user.js firefox-85.0+build1/testing/profiles/raptor/user.js
--- firefox-84.0.2+build1/testing/profiles/raptor/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/raptor/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Preferences file used by the raptor harness
 /* globals user_pref */
 // prevents normandy from running updates during the tests
diff -Nru firefox-84.0.2+build1/testing/profiles/raptor-android/user.js firefox-85.0+build1/testing/profiles/raptor-android/user.js
--- firefox-84.0.2+build1/testing/profiles/raptor-android/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/raptor-android/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Preferences file used by the raptor harness exclusively on android
 /* globals user_pref */
 
diff -Nru firefox-84.0.2+build1/testing/profiles/unittest-features/user.js firefox-85.0+build1/testing/profiles/unittest-features/user.js
--- firefox-84.0.2+build1/testing/profiles/unittest-features/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/unittest-features/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file for enabling unittest features.
 // Not enabling these features cause many unittests that
 // expect these prefs to be set to fail.
diff -Nru firefox-84.0.2+build1/testing/profiles/unittest-required/user.js firefox-85.0+build1/testing/profiles/unittest-required/user.js
--- firefox-84.0.2+build1/testing/profiles/unittest-required/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/unittest-required/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file to allow unittests to run successfully.
 // NOTE: Toggling prefs for testing features should happen in
 // unittest-features/user.js or in harness/test manifests, not here!
diff -Nru firefox-84.0.2+build1/testing/profiles/web-platform/user.js firefox-85.0+build1/testing/profiles/web-platform/user.js
--- firefox-84.0.2+build1/testing/profiles/web-platform/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/web-platform/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file for web-platform-tests.
 /* globals user_pref */
 // Don't use the new tab page but about:blank for opened tabs
diff -Nru firefox-84.0.2+build1/testing/profiles/xpcshell/user.js firefox-85.0+build1/testing/profiles/xpcshell/user.js
--- firefox-84.0.2+build1/testing/profiles/xpcshell/user.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/profiles/xpcshell/user.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Base preferences file used by the xpcshell harness
 /* globals user_pref */
 /* eslint quotes: 0 */
diff -Nru firefox-84.0.2+build1/testing/raptor/browsertime/browsertime_pageload.js firefox-85.0+build1/testing/raptor/browsertime/browsertime_pageload.js
--- firefox-84.0.2+build1/testing/raptor/browsertime/browsertime_pageload.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/browsertime/browsertime_pageload.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 /* eslint-env node */
 
 module.exports = async function(context, commands) {
diff -Nru firefox-84.0.2+build1/testing/raptor/browsertime/browsertime_scenario.js firefox-85.0+build1/testing/raptor/browsertime/browsertime_scenario.js
--- firefox-84.0.2+build1/testing/raptor/browsertime/browsertime_scenario.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/browsertime/browsertime_scenario.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 /* eslint-env node */
 
 module.exports = async function(context, commands) {
diff -Nru firefox-84.0.2+build1/testing/raptor/.eslintrc.js firefox-85.0+build1/testing/raptor/.eslintrc.js
--- firefox-84.0.2+build1/testing/raptor/.eslintrc.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/.eslintrc.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 module.exports = {
diff -Nru firefox-84.0.2+build1/testing/raptor/mach_commands.py firefox-85.0+build1/testing/raptor/mach_commands.py
--- firefox-84.0.2+build1/testing/raptor/mach_commands.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/mach_commands.py	2021-01-18 19:58:19.000000000 +0000
@@ -301,9 +301,16 @@
             ):  # Equivalent to 'run_local' = True.
                 return 1
 
-        debug_command = "--debug-command"
-        if debug_command in sys.argv:
-            sys.argv.remove(debug_command)
+        # Remove mach global arguments from sys.argv to prevent them
+        # from being consumed by raptor. Treat any item in sys.argv
+        # occuring before "raptor" as a mach global argument.
+        argv = []
+        in_mach = True
+        for arg in sys.argv:
+            if not in_mach:
+                argv.append(arg)
+            if arg.startswith("raptor"):
+                in_mach = False
 
         raptor = self._spawn(RaptorRunner)
         device = None
@@ -312,7 +319,7 @@
             if kwargs["power_test"] and is_android:
                 device = ADBDeviceFactory(verbose=True)
                 disable_charging(device)
-            return raptor.run_test(sys.argv[2:], kwargs)
+            return raptor.run_test(argv, kwargs)
         except BinaryNotFoundException as e:
             self.log(logging.ERROR, "raptor", {"error": str(e)}, "ERROR: {error}")
             self.log(logging.INFO, "raptor", {"help": e.help()}, "{help}")
diff -Nru firefox-84.0.2+build1/testing/raptor/raptor/browsertime/base.py firefox-85.0+build1/testing/raptor/raptor/browsertime/base.py
--- firefox-84.0.2+build1/testing/raptor/raptor/browsertime/base.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/raptor/browsertime/base.py	2021-01-18 19:58:19.000000000 +0000
@@ -226,6 +226,8 @@
             "--skipHar",
             "--pageLoadStrategy",
             "none",
+            "--webdriverPageload",
+            "true",
             "--firefox.disableBrowsertimeExtension",
             "true",
             "--pageCompleteCheckStartWait",
@@ -267,6 +269,8 @@
                     [
                         "--firefox.windowRecorder",
                         "false",
+                        "--xvfbParams.display",
+                        "0",
                     ]
                 )
                 LOG.info(
diff -Nru firefox-84.0.2+build1/testing/raptor/raptor/browsertime/desktop.py firefox-85.0+build1/testing/raptor/raptor/browsertime/desktop.py
--- firefox-84.0.2+build1/testing/raptor/raptor/browsertime/desktop.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/raptor/browsertime/desktop.py	2021-01-18 19:58:19.000000000 +0000
@@ -34,8 +34,6 @@
                 "chrome",
                 "--chrome.binaryPath",
                 binary_path,
-                "--xvfbParams.display",
-                "0",
             ]
         return args_list + [
             "--browser",
diff -Nru firefox-84.0.2+build1/testing/raptor/raptor/gecko_profile.py firefox-85.0+build1/testing/raptor/raptor/gecko_profile.py
--- firefox-84.0.2+build1/testing/raptor/raptor/gecko_profile.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/raptor/gecko_profile.py	2021-01-18 19:58:19.000000000 +0000
@@ -7,6 +7,7 @@
 """
 from __future__ import absolute_import
 
+import gzip
 import json
 import os
 import tempfile
@@ -96,8 +97,12 @@
     def _save_gecko_profile(self, symbolicator, missing_symbols_zip, profile_path):
         LOG.info("Symbolicating profile at %s" % profile_path)
         try:
-            with open(profile_path, "r") as profile_file:
-                profile = json.load(profile_file)
+            if profile_path.endswith(".gz"):
+                with gzip.open(profile_path, "r") as profile_file:
+                    profile = json.load(profile_file)
+            else:
+                with open(profile_path, "r") as profile_file:
+                    profile = json.load(profile_file)
             symbolicator.dump_and_integrate_missing_symbols(
                 profile, missing_symbols_zip
             )
@@ -120,7 +125,7 @@
         if self.raptor_config.get("browsertime"):
             topdir = self.raptor_config.get("browsertime_result_dir")
             for root, dirnames, filenames in os.walk(topdir):
-                for filename in fnmatch.filter(filenames, "geckoProfile*.json"):
+                for filename in fnmatch.filter(filenames, "geckoProfile*.json*"):
                     res.append(os.path.join(root, filename))
         else:
             # Collect all individual profiles that the test
diff -Nru firefox-84.0.2+build1/testing/raptor/raptor/results.py firefox-85.0+build1/testing/raptor/raptor/results.py
--- firefox-84.0.2+build1/testing/raptor/raptor/results.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/raptor/results.py	2021-01-18 19:58:19.000000000 +0000
@@ -772,9 +772,6 @@
                     new_result = _new_standard_result(
                         new_result, subtest_unit=test.get("subtest_unit", "ms")
                     )
-                    # XXX Is this still needed?
-                    if self.app != "firefox":
-                        new_result["extra_options"].append(self.app)
 
                     LOG.info("parsed new benchmark result: %s" % str(new_result))
                     return new_result
diff -Nru firefox-84.0.2+build1/testing/raptor/requirements.txt firefox-85.0+build1/testing/raptor/requirements.txt
--- firefox-84.0.2+build1/testing/raptor/requirements.txt	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/raptor/requirements.txt	2021-01-18 19:58:20.000000000 +0000
@@ -4,7 +4,6 @@
 manifestparser >= 1.1
 wptserve ~= 2.0
 mozdevice >= 4.0.0
-mozproxy >= 1.0
 pyyaml ~= 3.1
 mozpower >= 1.0.0
 mozversion >= 1.0
diff -Nru firefox-84.0.2+build1/testing/specialpowers/content/MockFilePicker.jsm firefox-85.0+build1/testing/specialpowers/content/MockFilePicker.jsm
--- firefox-84.0.2+build1/testing/specialpowers/content/MockFilePicker.jsm	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/specialpowers/content/MockFilePicker.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -183,7 +183,7 @@
 MockFilePickerInstance.prototype = {
   QueryInterface: ChromeUtils.generateQI(["nsIFilePicker"]),
   init(aParent, aTitle, aMode) {
-    MockFilePicker.mode = aMode;
+    this.mode = aMode;
     this.filterIndex = MockFilePicker.filterIndex;
     this.parent = aParent;
   },
diff -Nru firefox-84.0.2+build1/testing/talos/.eslintrc.js firefox-85.0+build1/testing/talos/.eslintrc.js
--- firefox-84.0.2+build1/testing/talos/.eslintrc.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/.eslintrc.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 module.exports = {
diff -Nru firefox-84.0.2+build1/testing/talos/INSTALL.py firefox-85.0+build1/testing/talos/INSTALL.py
--- firefox-84.0.2+build1/testing/talos/INSTALL.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/INSTALL.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,8 @@
 #!/usr/bin/env 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/.
+
 
 """
 installation script for talos. This script:
diff -Nru firefox-84.0.2+build1/testing/talos/setup.py firefox-85.0+build1/testing/talos/setup.py
--- firefox-84.0.2+build1/testing/talos/setup.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/setup.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import os
diff -Nru firefox-84.0.2+build1/testing/talos/talos/bootstrap.js firefox-85.0+build1/testing/talos/talos/bootstrap.js
--- firefox-84.0.2+build1/testing/talos/talos/bootstrap.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/bootstrap.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 /* globals initializeBrowser */
diff -Nru firefox-84.0.2+build1/testing/talos/talos/cmanager_base.py firefox-85.0+build1/testing/talos/talos/cmanager_base.py
--- firefox-84.0.2+build1/testing/talos/talos/cmanager_base.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/cmanager_base.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,26 +1,30 @@
-from __future__ import absolute_import
-
-
-class CounterManager(object):
-
-    counterDict = {}
-
-    def __init__(self):
-        self.allCounters = {}
-        self.registeredCounters = {}
-
-    def _loadCounters(self):
-        """Loads all of the counters defined in the counterDict"""
-        for counter in self.counterDict.keys():
-            self.allCounters[counter] = self.counterDict[counter]
-
-    def registerCounters(self, counters):
-        """Registers a list of counters that will be monitoring.
-        Only counters whose names are found in allCounters will be added
-        """
-        for counter in counters:
-            if counter in self.allCounters:
-                self.registeredCounters[counter] = [self.allCounters[counter], []]
-
-    def getCounterValue(self, counterName):
-        """Returns the last value of the counter 'counterName'"""
+# 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/.
+
+from __future__ import absolute_import
+
+
+class CounterManager(object):
+
+    counterDict = {}
+
+    def __init__(self):
+        self.allCounters = {}
+        self.registeredCounters = {}
+
+    def _loadCounters(self):
+        """Loads all of the counters defined in the counterDict"""
+        for counter in self.counterDict.keys():
+            self.allCounters[counter] = self.counterDict[counter]
+
+    def registerCounters(self, counters):
+        """Registers a list of counters that will be monitoring.
+        Only counters whose names are found in allCounters will be added
+        """
+        for counter in counters:
+            if counter in self.allCounters:
+                self.registeredCounters[counter] = [self.allCounters[counter], []]
+
+    def getCounterValue(self, counterName):
+        """Returns the last value of the counter 'counterName'"""
diff -Nru firefox-84.0.2+build1/testing/talos/talos/filter.py firefox-85.0+build1/testing/talos/talos/filter.py
--- firefox-84.0.2+build1/testing/talos/talos/filter.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/filter.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import math
diff -Nru firefox-84.0.2+build1/testing/talos/talos/getinfooffline/background.js firefox-85.0+build1/testing/talos/talos/getinfooffline/background.js
--- firefox-84.0.2+build1/testing/talos/talos/getinfooffline/background.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/getinfooffline/background.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // We've run once, and hopefully bypassed any network connections that add-ons
 // might have tried to make after first install. Now let's uninstall ourselves
 // so that subsequent starts run in online mode.
diff -Nru firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/a11y.js firefox-85.0+build1/testing/talos/talos/pageloader/chrome/a11y.js
--- firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/a11y.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/pageloader/chrome/a11y.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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() {
   let gAccService = 0;
 
diff -Nru firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js firefox-85.0+build1/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js
--- firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/pageloader/chrome/MozillaFileLogger.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 /**
  * MozillaFileLogger, a log listener that can write to a local file.
  */
diff -Nru firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/tscroll.js firefox-85.0+build1/testing/talos/talos/pageloader/chrome/tscroll.js
--- firefox-84.0.2+build1/testing/talos/talos/pageloader/chrome/tscroll.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/pageloader/chrome/tscroll.js	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 // Note: This file is used at both tscrollx and tp5o_scroll. With the former as
 //       unprivileged code.
 // - Please make sure that any changes apply cleanly to all use cases.
diff -Nru firefox-84.0.2+build1/testing/talos/talos/scripts/report.py firefox-85.0+build1/testing/talos/talos/scripts/report.py
--- firefox-84.0.2+build1/testing/talos/talos/scripts/report.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/scripts/report.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import argparse
diff -Nru firefox-84.0.2+build1/testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js firefox-85.0+build1/testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js
--- firefox-84.0.2+build1/testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 {
   "windows": [
     {
diff -Nru firefox-84.0.2+build1/testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js firefox-85.0+build1/testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js
--- firefox-84.0.2+build1/testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 {
     "version": ["sessionrestore", 1],
     "windows": [{
diff -Nru firefox-84.0.2+build1/testing/talos/talos/talosconfig.py firefox-85.0+build1/testing/talos/talos/talosconfig.py
--- firefox-84.0.2+build1/testing/talos/talos/talosconfig.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/talosconfig.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import, print_function
 
 import json
diff -Nru firefox-84.0.2+build1/testing/talos/talos/test.py firefox-85.0+build1/testing/talos/talos/test.py
--- firefox-84.0.2+build1/testing/talos/talos/test.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/test.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import os
diff -Nru firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadChild.jsm firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadChild.jsm
--- firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadChild.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadChild.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,17 @@
+/* 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/. */
+
+/* eslint-disable no-restricted-globals */
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["DampLoadChild"];
+
+class DampLoadChild extends JSWindowActorChild {
+  handleEvent(evt) {
+    this.sendAsyncMessage("DampLoadChild:PageShow", {
+      browsingContext: this.browsingContext,
+    });
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadParent.jsm firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadParent.jsm
--- firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadParent.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/actors/DampLoadParent.jsm	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,28 @@
+/* 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 EXPORTED_SYMBOLS = ["DampLoadParent", "EventDispatcher"];
+
+const { EventEmitter } = ChromeUtils.import(
+  "resource://gre/modules/EventEmitter.jsm"
+);
+
+// Global event emitter to avoid listening to individual JSWindowActor instances.
+// For a single load, several pairs of JSWindowActors might be created in quick
+// succession, so listening to events on individual actor instances is usually
+// not enough to monitor a load.
+const EventDispatcher = {};
+EventEmitter.decorate(EventDispatcher);
+
+// Simple JSWindow actor pair to listen to page show events.
+class DampLoadParent extends JSWindowActorParent {
+  async receiveMessage(msg) {
+    const { name, data } = msg;
+    if (name === "DampLoadChild:PageShow") {
+      EventDispatcher.emit("DampLoadParent:PageShow", data);
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/damp.js firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/damp.js
--- firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/damp.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/damp.js	2021-01-18 19:58:19.000000000 +0000
@@ -28,66 +28,6 @@
   return Services.wm.getMostRecentWindow("navigator:browser");
 }
 
-let gmm = window.getGroupMessageManager("browsers");
-
-const frameScript =
-  "data:," +
-  encodeURIComponent(
-    `(${function() {
-      addEventListener(
-        "load",
-        function(event) {
-          let subframe = event.target != content.document;
-          sendAsyncMessage("browser-test-utils:loadEvent", {
-            subframe,
-            url: event.target.documentURI,
-          });
-        },
-        true
-      );
-    }})()`
-  );
-
-gmm.loadFrameScript(frameScript, true);
-
-// This is duplicated from BrowserTestUtils.jsm
-function awaitBrowserLoaded(
-  browser,
-  includeSubFrames = false,
-  wantLoad = null
-) {
-  // If browser belongs to tabbrowser-tab, ensure it has been
-  // inserted into the document.
-  let tabbrowser = browser.ownerGlobal.gBrowser;
-  if (tabbrowser && tabbrowser.getTabForBrowser) {
-    tabbrowser._insertBrowser(tabbrowser.getTabForBrowser(browser));
-  }
-
-  function isWanted(url) {
-    if (!wantLoad) {
-      return true;
-    } else if (typeof wantLoad == "function") {
-      return wantLoad(url);
-    }
-    // It's a string.
-    return wantLoad == url;
-  }
-
-  return new Promise(resolve => {
-    let mm = browser.ownerGlobal.messageManager;
-    mm.addMessageListener("browser-test-utils:loadEvent", function onLoad(msg) {
-      if (
-        msg.target == browser &&
-        (!msg.data.subframe || includeSubFrames) &&
-        isWanted(msg.data.url)
-      ) {
-        mm.removeMessageListener("browser-test-utils:loadEvent", onLoad);
-        resolve(msg.data.url);
-      }
-    });
-  });
-}
-
 /* globals res:true */
 
 function Damp() {}
@@ -223,7 +163,7 @@
       { skipAnimation: true }
     ));
     let browser = tab.linkedBrowser;
-    await awaitBrowserLoaded(browser);
+    await this._awaitBrowserLoaded(browser);
     return tab;
   },
 
@@ -251,7 +191,7 @@
       if (typeof onReload == "function") {
         onReload().then(resolve);
       } else {
-        resolve(awaitBrowserLoaded(browser));
+        resolve(this._awaitBrowserLoaded(browser));
       }
       browser.reload();
     });
@@ -408,6 +348,8 @@
 
     ChromeUtils.addProfilerMarker("DAMP", this._startTimestamp);
     this.TalosParentProfiler.pause();
+
+    this._unregisterDampLoadActors();
   },
 
   startAllocationTracker() {
@@ -480,12 +422,15 @@
     let promise = new Promise(resolve => {
       this.testDone = resolve;
     });
+
     this.rootURI = rootURI;
     try {
       dump("Initialize the head file with a reference to this DAMP instance\n");
       let head = require(rootURI.resolve("content/tests/head.js"));
       head.initialize(this);
 
+      this._registerDampLoadActors();
+
       this._win = Services.wm.getMostRecentWindow("navigator:browser");
       this._dampTab = this._win.gBrowser.selectedTab;
       this._win.gBrowser.selectedBrowser.focus(); // Unfocus the URL bar to avoid caret blink
@@ -531,4 +476,64 @@
 
     return promise;
   },
+
+  /**
+   * Wait for a page-show/load event on the provided browser element, using the
+   * JSWindowActor pair at content/actors/DampLoad.
+   */
+  _awaitBrowserLoaded(browser) {
+    dump(
+      `Wait for a pageshow event for browsing context ${browser.browsingContext.id}\n`
+    );
+    return new Promise(resolve => {
+      const eventDispatcher = this._getDampLoadEventDispatcher();
+      const onPageShow = (eventName, data) => {
+        dump(`Received pageshow event for ${data.browsingContext.id}\n`);
+        if (data.browsingContext !== browser.browsingContext) {
+          return;
+        }
+
+        eventDispatcher.off("DampLoadParent:PageShow", onPageShow);
+        resolve();
+      };
+
+      eventDispatcher.on("DampLoadParent:PageShow", onPageShow);
+    });
+  },
+
+  _registerDampLoadActors() {
+    dump(`[DampLoad helper] Register DampLoad actors\n`);
+    ChromeUtils.registerWindowActor("DampLoad", {
+      kind: "JSWindowActor",
+      parent: {
+        moduleURI: this.rootURI.resolve("content/actors/DampLoadParent.jsm"),
+      },
+      child: {
+        moduleURI: this.rootURI.resolve("content/actors/DampLoadChild.jsm"),
+        events: {
+          pageshow: { mozSystemGroup: true },
+        },
+      },
+
+      // Only listen to top level content frame load.
+      allFrames: false,
+      includeChrome: false,
+    });
+  },
+
+  _unregisterDampLoadActors() {
+    dump(`[DampLoad helper] Unregister DampLoad actors\n`);
+    ChromeUtils.unregisterWindowActor("DampLoad");
+  },
+
+  _getDampLoadEventDispatcher() {
+    if (!this._dampLoadEventDispatcher) {
+      const DampLoadParentModule = ChromeUtils.import(
+        this.rootURI.resolve("content/actors/DampLoadParent.jsm")
+      );
+      this._dampLoadEventDispatcher = DampLoadParentModule.EventDispatcher;
+    }
+
+    return this._dampLoadEventDispatcher;
+  },
 };
diff -Nru firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/damp-tests.js firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/damp-tests.js
--- firefox-84.0.2+build1/testing/talos/talos/tests/devtools/addon/content/damp-tests.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/tests/devtools/addon/content/damp-tests.js	2021-01-18 19:58:19.000000000 +0000
@@ -4,8 +4,10 @@
 
 "use strict";
 
-/* globals module */
+/* globals module, require */
 
+const Services = require("Services");
+const isFissionEnabled = Services.appinfo.fissionAutostart;
 /**
  * This is the registry for all DAMP tests. Tests will be run in the order specified by
  * the DAMP_TESTS array.
@@ -100,13 +102,15 @@
     description:
       "Measure open/close toolbox on webconsole panel against complicated document",
   },
-  // Bug 1503499 - disable for frequent failures on fission
-  // {
-  //  name: "complicated.inspector",
-  //  path: "inspector/complicated.js",
-  //  description:
-  //    "Measure open/close toolbox on inspector panel against complicated document",
-  // },
+  {
+    name: "complicated.inspector",
+    path: "inspector/complicated.js",
+    description:
+      "Measure open/close toolbox on inspector panel against complicated document",
+    // Bug 1503499 & 1677587 - disable for frequent failures on fission
+    // Linked to ThreadActor race conditions, see Bug 1678741.
+    disabled: isFissionEnabled,
+  },
   {
     name: "complicated.debugger",
     path: "debugger/complicated.js",
@@ -118,12 +122,18 @@
     path: "styleeditor/complicated.js",
     description:
       "Measure open/close toolbox on style editor panel against complicated document",
+    // Bug 1677587 - disable for frequent failures on fission
+    // Linked to ThreadActor race conditions, see Bug 1678741.
+    disabled: isFissionEnabled,
   },
   {
     name: "complicated.netmonitor",
     path: "netmonitor/complicated.js",
     description:
       "Measure open/close toolbox on network monitor panel against complicated document",
+    // Bug 1574417 - disable for frequent failures on fission.
+    // Linked to ThreadActor race conditions, see Bug 1678741.
+    disabled: isFissionEnabled,
   },
   // Run all tests against a document specific to each tool
   {
diff -Nru firefox-84.0.2+build1/testing/talos/talos/tests/tart/addon/api.js firefox-85.0+build1/testing/talos/talos/tests/tart/addon/api.js
--- firefox-84.0.2+build1/testing/talos/talos/tests/tart/addon/api.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/tests/tart/addon/api.js	2021-01-18 19:58:19.000000000 +0000
@@ -85,7 +85,9 @@
         break;
 
       case "runTest":
-        new win.Tart().startTest(sendResult, command.data);
+        win.gBrowserInit.idleTasksFinishedPromise.then(() => {
+          new win.Tart().startTest(sendResult, command.data);
+        });
         break;
 
       case "setASAP":
diff -Nru firefox-84.0.2+build1/testing/talos/talos/unittests/conftest.py firefox-85.0+build1/testing/talos/talos/unittests/conftest.py
--- firefox-84.0.2+build1/testing/talos/talos/unittests/conftest.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/unittests/conftest.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,46 +1,50 @@
-from __future__ import absolute_import
-
-import os
-
-here = os.path.realpath(__file__)
-__TESTS_DIR = os.path.join(os.path.dirname(os.path.dirname(here)), "tests")
-
-
-def remove_develop_files(starting_dir=__TESTS_DIR):
-    for file_name in os.listdir(starting_dir):
-
-        file_path = os.path.join(starting_dir, file_name)
-
-        if file_name.endswith(".develop") and os.path.isfile(file_path):
-            os.remove(file_path)
-        elif os.path.isdir(file_path):
-            remove_develop_files(file_path)
-
-
-def patched_build_manifest(config, manifestName):
-    # for unit testing, we aren't downloading the tp5 pageset; therefore
-    # manifest file doesn't exist; create a dummy one so we can continue
-    if not os.path.exists(manifestName):
-        try:
-            if not os.path.exists(os.path.dirname(manifestName)):
-                os.makedirs(os.path.dirname(manifestName))
-            f = open(manifestName, "w")
-            f.close()
-        except Exception as e:
-            raise (e)
-
-    # read manifest lines
-    with open(manifestName, "r") as fHandle:
-        manifestLines = fHandle.readlines()
-
-    # write modified manifest lines
-    with open(manifestName + ".develop", "w") as newHandle:
-        for line in manifestLines:
-            newline = line.replace("localhost", config["webserver"])
-            newline = newline.replace("page_load_test", "tests")
-            newHandle.write(newline)
-
-    newManifestName = manifestName + ".develop"
-
-    # return new manifest
-    return newManifestName
+# 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/.
+
+from __future__ import absolute_import
+
+import os
+
+here = os.path.realpath(__file__)
+__TESTS_DIR = os.path.join(os.path.dirname(os.path.dirname(here)), "tests")
+
+
+def remove_develop_files(starting_dir=__TESTS_DIR):
+    for file_name in os.listdir(starting_dir):
+
+        file_path = os.path.join(starting_dir, file_name)
+
+        if file_name.endswith(".develop") and os.path.isfile(file_path):
+            os.remove(file_path)
+        elif os.path.isdir(file_path):
+            remove_develop_files(file_path)
+
+
+def patched_build_manifest(config, manifestName):
+    # for unit testing, we aren't downloading the tp5 pageset; therefore
+    # manifest file doesn't exist; create a dummy one so we can continue
+    if not os.path.exists(manifestName):
+        try:
+            if not os.path.exists(os.path.dirname(manifestName)):
+                os.makedirs(os.path.dirname(manifestName))
+            f = open(manifestName, "w")
+            f.close()
+        except Exception as e:
+            raise (e)
+
+    # read manifest lines
+    with open(manifestName, "r") as fHandle:
+        manifestLines = fHandle.readlines()
+
+    # write modified manifest lines
+    with open(manifestName + ".develop", "w") as newHandle:
+        for line in manifestLines:
+            newline = line.replace("localhost", config["webserver"])
+            newline = newline.replace("page_load_test", "tests")
+            newHandle.write(newline)
+
+    newManifestName = manifestName + ".develop"
+
+    # return new manifest
+    return newManifestName
diff -Nru firefox-84.0.2+build1/testing/talos/talos/webextensions/dummy/background.js firefox-85.0+build1/testing/talos/talos/webextensions/dummy/background.js
--- firefox-84.0.2+build1/testing/talos/talos/webextensions/dummy/background.js	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/webextensions/dummy/background.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 /* eslint-env webextensions */
diff -Nru firefox-84.0.2+build1/testing/talos/talos/webextensions/dummy/content.js firefox-85.0+build1/testing/talos/talos/webextensions/dummy/content.js
--- firefox-84.0.2+build1/testing/talos/talos/webextensions/dummy/content.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/webextensions/dummy/content.js	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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";
 
 /* eslint-env webextensions */
diff -Nru firefox-84.0.2+build1/testing/talos/talos/xtalos/__init__.py firefox-85.0+build1/testing/talos/talos/xtalos/__init__.py
--- firefox-84.0.2+build1/testing/talos/talos/xtalos/__init__.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/xtalos/__init__.py	2021-01-18 19:58:19.000000000 +0000
@@ -1 +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/.
+
 from __future__ import absolute_import
diff -Nru firefox-84.0.2+build1/testing/talos/talos/xtalos/xperf_whitelist.json firefox-85.0+build1/testing/talos/talos/xtalos/xperf_whitelist.json
--- firefox-84.0.2+build1/testing/talos/talos/xtalos/xperf_whitelist.json	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos/xtalos/xperf_whitelist.json	2021-01-18 19:58:19.000000000 +0000
@@ -608,6 +608,12 @@
     "minbytes": 0,
     "maxbytes": 608
   },
+  "{profile}\\xulstore\\data.safe.bin": {
+    "mincount": 0,
+    "maxcount": 4,
+    "minbytes": 0,
+    "maxbytes": 574
+  },
   "{talos}\\talos\\tests\\{tp5n_files}": {
     "mincount": 0,
     "maxcount": 2,
diff -Nru firefox-84.0.2+build1/testing/talos/talos.json firefox-85.0+build1/testing/talos/talos.json
--- firefox-84.0.2+build1/testing/talos/talos.json	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/talos/talos.json	2021-01-18 19:58:19.000000000 +0000
@@ -46,10 +46,7 @@
             "benchmark_zip": "jetstream.zip"
         },
         "svgr": {
-            "tests": ["tsvgx", "tsvgr_opacity", "tscrollx", "tsvg_static"]
-        },
-        "svgr_disabled_see_bug1651311": {
-            "tests": ["tart"]
+            "tests": ["tsvgx", "tsvgr_opacity", "tscrollx", "tsvg_static", "tart"]
         },
         "perf-reftest": {
             "tests": ["perf_reftest"]
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/actions.rs firefox-85.0+build1/testing/webdriver/src/actions.rs
--- firefox-84.0.2+build1/testing/webdriver/src/actions.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/actions.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::common::{WebElement, ELEMENT_KEY};
 use serde::de::{self, Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/capabilities.rs firefox-85.0+build1/testing/webdriver/src/capabilities.rs
--- firefox-84.0.2+build1/testing/webdriver/src/capabilities.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/capabilities.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::common::MAX_SAFE_INTEGER;
 use crate::error::{ErrorStatus, WebDriverError, WebDriverResult};
 use serde_json::{Map, Value};
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/command.rs firefox-85.0+build1/testing/webdriver/src/command.rs
--- firefox-84.0.2+build1/testing/webdriver/src/command.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/command.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::actions::ActionSequence;
 use crate::capabilities::{
     BrowserCapabilities, Capabilities, CapabilitiesMatching, LegacyNewSessionParameters,
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/common.rs firefox-85.0+build1/testing/webdriver/src/common.rs
--- firefox-84.0.2+build1/testing/webdriver/src/common.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/common.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde::ser::{Serialize, Serializer};
 use serde::{Deserialize, Deserializer};
 use std::collections::HashMap;
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/error.rs firefox-85.0+build1/testing/webdriver/src/error.rs
--- firefox-84.0.2+build1/testing/webdriver/src/error.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/error.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 base64::DecodeError;
 use http::StatusCode;
 use serde::de::{Deserialize, Deserializer};
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/httpapi.rs firefox-85.0+build1/testing/webdriver/src/httpapi.rs
--- firefox-84.0.2+build1/testing/webdriver/src/httpapi.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/httpapi.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 http::Method;
 use serde_json::Value;
 
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/lib.rs firefox-85.0+build1/testing/webdriver/src/lib.rs
--- firefox-84.0.2+build1/testing/webdriver/src/lib.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/lib.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,7 @@
 #![allow(non_snake_case)]
+/* 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/. */
 #![forbid(unsafe_code)]
 
 extern crate base64;
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/macros.rs firefox-85.0+build1/testing/webdriver/src/macros.rs
--- firefox-84.0.2+build1/testing/webdriver/src/macros.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/macros.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 macro_rules! try_opt {
     ($expr:expr, $err_type:expr, $err_msg:expr) => {{
         match $expr {
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/response.rs firefox-85.0+build1/testing/webdriver/src/response.rs
--- firefox-84.0.2+build1/testing/webdriver/src/response.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/response.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 crate::common::Cookie;
 use serde::ser::{Serialize, Serializer};
 use serde_json::Value;
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/server.rs firefox-85.0+build1/testing/webdriver/src/server.rs
--- firefox-84.0.2+build1/testing/webdriver/src/server.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/server.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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 serde_json;
 use std::marker::PhantomData;
 use std::net::{SocketAddr, TcpListener as StdTcpListener};
diff -Nru firefox-84.0.2+build1/testing/webdriver/src/test.rs firefox-85.0+build1/testing/webdriver/src/test.rs
--- firefox-84.0.2+build1/testing/webdriver/src/test.rs	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/webdriver/src/test.rs	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 pub fn assert_ser_de<T>(data: &T, json: serde_json::Value)
 where
     T: std::fmt::Debug,
diff -Nru firefox-84.0.2+build1/testing/web-platform/manifestdownload.py firefox-85.0+build1/testing/web-platform/manifestdownload.py
--- firefox-84.0.2+build1/testing/web-platform/manifestdownload.py	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/manifestdownload.py	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import os
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/client-hints/accept-ch-feature-policy-navigation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/client-hints/accept-ch-feature-policy-navigation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/client-hints/accept-ch-feature-policy-navigation.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/client-hints/accept-ch-feature-policy-navigation.https.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,8 @@
 [accept-ch-feature-policy-navigation.https.html]
   max-asserts: 2
   expected:
-    if (os == "android") and not webrender and debug: ["OK", "CRASH"]
+    if (os == "android") and not webrender and not debug: ["OK", "TIMEOUT", "CRASH"]
+    if (os == "android") and not webrender and debug: ["OK", "TIMEOUT", "CRASH"]
     if (os == "android") and webrender: ["OK", "TIMEOUT"]
   [Client hints loaded on cross-origin iframe request with feature policy.]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-iframe.https.html.ini firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-iframe.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-iframe.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-iframe.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[viewport-width-iframe.https.html]
-  [viewport-width-iframe]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-subresource.https.html.ini firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-subresource.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-subresource.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-subresource.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[viewport-width-subresource.https.html]
-  [viewport-width-subresource]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-window-different-dimensions.https.html.ini firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-window-different-dimensions.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-window-different-dimensions.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-window-different-dimensions.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[viewport-width-window-different-dimensions.https.html]
-  [viewport-width-window-different-dimensions]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-window.https.html.ini firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-window.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/client-hints/viewport-width-window.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/client-hints/viewport-width-window.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[viewport-width-window.https.html]
-  [viewport-width-window]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/compression/compression-with-detach.tentative.any.js.ini firefox-85.0+build1/testing/web-platform/meta/compression/compression-with-detach.tentative.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/compression/compression-with-detach.tentative.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/compression/compression-with-detach.tentative.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,19 @@
+[compression-with-detach.tentative.any.worker.html]
+  [data should be correctly compressed even if input is detached partway]
+    expected: FAIL
+
+
+[compression-with-detach.tentative.any.serviceworker.html]
+  [data should be correctly compressed even if input is detached partway]
+    expected: FAIL
+
+
+[compression-with-detach.tentative.any.html]
+  [data should be correctly compressed even if input is detached partway]
+    expected: FAIL
+
+
+[compression-with-detach.tentative.any.sharedworker.html]
+  [data should be correctly compressed even if input is detached partway]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/compression/decompression-with-detach.tentative.any.js.ini firefox-85.0+build1/testing/web-platform/meta/compression/decompression-with-detach.tentative.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/compression/decompression-with-detach.tentative.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/compression/decompression-with-detach.tentative.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,19 @@
+[decompression-with-detach.tentative.any.worker.html]
+  [data should be correctly decompressed even if input is detached partway]
+    expected: FAIL
+
+
+[decompression-with-detach.tentative.any.sharedworker.html]
+  [data should be correctly decompressed even if input is detached partway]
+    expected: FAIL
+
+
+[decompression-with-detach.tentative.any.html]
+  [data should be correctly decompressed even if input is detached partway]
+    expected: FAIL
+
+
+[decompression-with-detach.tentative.any.serviceworker.html]
+  [data should be correctly decompressed even if input is detached partway]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,5 @@
+[report-uri-does-not-respect-base-uri.sub.html]
+  [Violation report status OK.]
+    expected:
+      if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/content-security-policy/inheritance/iframe-all-local-schemes-inherit-self.sub.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,9 +1,9 @@
 [iframe-all-local-schemes-inherit-self.sub.html]
   expected:
-    if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "OK"]
+    if (os == "mac") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [<iframe>'s about:blank inherits policy.]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "PASS"]
+      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,8 +1,7 @@
 [href-location-blocked.sub.html]
   [Violation report status OK.]
     expected:
-      if (os == "android") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "android") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "android") and not debug and webrender: ["PASS", "FAIL"]
+      if (os == "android") and debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/form-get-blank.https.html.ini firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/form-get-blank.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/form-get-blank.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/form-get-blank.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,7 @@
 [form-get-blank.https.html]
   prefs: [network.cookie.sameSite.laxByDefault:true, network.cookie.sameSite.noneRequiresSecure:true]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to subdomain top-level form GETs are strictly same-site]
     expected: FAIL
 
@@ -9,6 +11,8 @@
 
 [form-get-blank.https.html?legacy-samesite]
   prefs: [network.cookie.sameSite.laxByDefault:false, network.cookie.sameSite.noneRequiresSecure:false]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to subdomain top-level form GETs are strictly same-site]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/form-post-blank.https.html.ini firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/form-post-blank.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/form-post-blank.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/form-post-blank.https.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,7 @@
 [form-post-blank.https.html]
   prefs: [network.cookie.sameSite.laxByDefault:true, network.cookie.sameSite.noneRequiresSecure:true]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to same-host top-level form POSTs are strictly same-site]
     expected: FAIL
 
@@ -9,6 +11,8 @@
 
 [form-post-blank.https.html?legacy-samesite]
   prefs: [network.cookie.sameSite.laxByDefault:false, network.cookie.sameSite.noneRequiresSecure:false]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to same-host top-level form POSTs are strictly same-site]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/img.https.html.ini firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/img.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/img.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/img.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,7 @@
 [img.https.html]
   prefs: [network.cookie.sameSite.laxByDefault:true, network.cookie.sameSite.noneRequiresSecure:true]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to same-host images are strictly same-site]
     expected: FAIL
 
@@ -9,6 +11,8 @@
 
 [img.https.html?legacy-samesite]
   prefs: [network.cookie.sameSite.laxByDefault:false, network.cookie.sameSite.noneRequiresSecure:false]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-site redirecting to same-host images are strictly same-site]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/window-open.https.html.ini firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/window-open.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cookies/samesite/window-open.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cookies/samesite/window-open.https.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,5 @@
+[window-open.https.html]
+
+[window-open.https.html?legacy-samesite]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cors/cors-safelisted-request-header.any.js.ini firefox-85.0+build1/testing/web-platform/meta/cors/cors-safelisted-request-header.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cors/cors-safelisted-request-header.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cors/cors-safelisted-request-header.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,5 @@
+[cors-safelisted-request-header.any.worker.html]
+  expected:
+    if (os == "android") and debug and not webrender: ["OK", "TIMEOUT"]
+
+[cors-safelisted-request-header.any.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cors/late-upload-events.htm.ini firefox-85.0+build1/testing/web-platform/meta/cors/late-upload-events.htm.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cors/late-upload-events.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cors/late-upload-events.htm.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[late-upload-events.htm]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/cors/redirect-origin.htm.ini firefox-85.0+build1/testing/web-platform/meta/cors/redirect-origin.htm.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/cors/redirect-origin.htm.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/cors/redirect-origin.htm.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,6 @@
 [redirect-origin.htm]
   disabled:
-    if (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1023162
+    if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1023162
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
+    if (os == "android") and debug and not webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/credential-management/otpcredential-iframe.https.html.ini firefox-85.0+build1/testing/web-platform/meta/credential-management/otpcredential-iframe.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/credential-management/otpcredential-iframe.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/credential-management/otpcredential-iframe.https.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,10 @@
 [otpcredential-iframe.https.html]
-  [Test OTPCredential disabled in cross origin iframes]
+  [Test OTPCredential enabled in same origin iframes]
     expected: FAIL
 
-  [Test OTPCredential enabled in same origin iframes]
+  [OTPCredential enabled in cross origin iframes with permissions policy]
+    expected: FAIL
+
+  [OTPCredential disabled in cross origin iframes without permissions policy]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini firefox-85.0+build1/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/compositing/root-element-opacity-change.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [root-element-opacity-change.html]
   expected:
-    if webrender and (os == "win") and debug: ["PASS", "FAIL"]
     if webrender and (os == "win") and not debug: ["PASS", "FAIL"]
+    if webrender and (os == "win") and debug: ["PASS", "FAIL"]
     if webrender and (os == "mac"): ["PASS", "FAIL"]
     if webrender and (os == "linux"): ["PASS", "FAIL"]
     if webrender and (os == "android"): ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,7 +2,7 @@
   expected:
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if (os == "android") and not e10s: FAIL
     if (os == "android") and e10s: PASS
   fuzzy:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-001.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-001.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-001.xht.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-001.xht.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
 [background-position-001.xht]
   expected:
-    if (os == "win") and not webrender: FAIL
+    if (os == "win") and (bits != 32) and not webrender: FAIL
     if (os == "mac") and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-002.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-002.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-002.xht.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/backgrounds/background-position-002.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,4 @@
 [background-position-002.xht]
   expected:
-    if (os == "win") and not webrender: FAIL
+    if (os == "win") and (bits != 32) and not webrender: FAIL
     if (os == "mac") and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/floats/hit-test-floats-005.html.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/floats/hit-test-floats-005.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/floats/hit-test-floats-005.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/floats/hit-test-floats-005.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[hit-test-floats-005.html]
+  expected:
+    if (os == "android") and not debug and not webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/floats/remove-float-in-first-line.html.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/floats/remove-float-in-first-line.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/floats/remove-float-in-first-line.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/floats/remove-float-in-first-line.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[remove-float-in-first-line.html]
+  expected:
+    if (os == "android") and not debug and not webrender: ["OK", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,18 +1,6 @@
 [margin-em-inherit-001.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if (os == 'win' and processor == 'aarch64'): PASS # bug 1538012
+    if not webrender and (os == "win"): PASS
+    if webrender and (os == "win") and (bits == 64): PASS
     if (os == 'linux' and os_version == '18.04'): PASS
     FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/positioning/relpos-percentage-top-in-scrollable.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,8 +1,7 @@
 [relpos-percentage-top-in-scrollable.html]
   [Top percentage resolved correctly for overflow contribution]
     expected:
-      if (os == "android") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug and not webrender: ["FAIL", "PASS"]
-      if (os == "android") and not debug and webrender: ["FAIL", "PASS"]
-      if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "android") and not debug and webrender: [FAIL, PASS]
+      if (os == "android") and not debug and not webrender: [PASS, FAIL]
+      if (os == "android") and debug: [FAIL, PASS]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-003.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-003.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-003.xht.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-003.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,4 @@
-[text-transform-bicameral-003.xht]
-  expected:
-    if webrender and (os == "android"): FAIL
+[text-transform-bicameral-003.xht]
+  expected:
+    if (os == "win") and (processor == "x86") and debug: ["FAIL", "PASS"]
+    if (os == "android") and webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-004.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-004.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-004.xht.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/CSS2/text/text-transform-bicameral-004.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,5 @@
 [text-transform-bicameral-004.xht]
   expected:
-    if webrender and (os == "mac"): FAIL
-    if webrender and (os == "win"): FAIL
+    if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
+    if (os == "win") and webrender: FAIL
+    if (os == "mac") and webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-animations/transform-animation-under-large-scale.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-animations/transform-animation-under-large-scale.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-animations/transform-animation-under-large-scale.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-animations/transform-animation-under-large-scale.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,11 @@
+[transform-animation-under-large-scale.html]
+  expected:
+    if (os == "android") and debug and webrender: ["TIMEOUT", "PASS"]
+    if (os == "android") and debug and not webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["TIMEOUT", "PASS"]
+    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
+    if (os == "win") and webrender and debug: ["TIMEOUT", "PASS"]
+    if (os == "mac") and debug and webrender: PASS
+    if (os == "linux") and debug and webrender: ["TIMEOUT", "PASS"]
+    if (os == "linux") and not debug and webrender: ["TIMEOUT", "PASS"]
+    TIMEOUT
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-3.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,5 +2,5 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if not webrender and (os == "mac"): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-4.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,5 +2,5 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if not webrender and (os == "mac"): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-color-5.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,5 +2,5 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if not webrender and (os == "mac"): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-2.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,4 +2,4 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,6 +2,6 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if (os == "android") and not e10s: FAIL
     if (os == "android") and e10s: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-4.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,4 +2,4 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-5.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -4,4 +4,4 @@
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-scroll-positioning-1.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -2,4 +2,4 @@
   expected:
     if (os == "win" and processor == "aarch64" and not debug): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,6 @@
 [child-move-reveals-parent-background.html]
   expected:
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
+    if not webrender and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if (os == "android") and not e10s: FAIL
     if (os == "android") and e10s: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/__dir__.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/__dir__.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,2 +1 @@
-prefs: [layout.css.conic-gradient.enabled:true]
 leak-threshold: [default:51200]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/parsing/border-image-source-computed.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/parsing/border-image-source-computed.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-backgrounds/parsing/border-image-source-computed.sub.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-backgrounds/parsing/border-image-source-computed.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1 @@
 [border-image-source-computed.sub.html]
-  prefs: [layout.css.conic-gradient.enabled:true]
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/block-001-wm-vlr-print.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/block-001-wm-vlr-print.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/block-001-wm-vlr-print.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/block-001-wm-vlr-print.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[block-001-wm-vlr-print.html]
+  fuzzy: maxDifference=0-76;totalPixels=0-120
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/borders-007.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/borders-007.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/borders-007.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/borders-007.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[borders-007.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/break-at-end-container-edge-000.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/break-at-end-container-edge-000.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/break-at-end-container-edge-000.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/break-at-end-container-edge-000.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,2 @@
 [break-at-end-container-edge-000.html]
-  expected:
-    if (os == "linux") and not debug and not webrender: ["PASS", "TIMEOUT"]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/line-pushed-by-float-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/line-pushed-by-float-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/line-pushed-by-float-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/line-pushed-by-float-001.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[line-pushed-by-float-001.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-001.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[widows-001.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-orphans-006.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-orphans-006.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-orphans-006.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-orphans-006.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[widows-orphans-006.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-orphans-007.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-orphans-007.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-break/widows-orphans-007.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-break/widows-orphans-007.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[widows-orphans-007.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-012.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-012.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-012.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-012.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,3 @@
 [content-visibility-012.html]
   expected:
-    if (os == "win") and not webrender: FAIL
+    if (os == "win") and (bits != 32) and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-014.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-014.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-014.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-014.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,3 @@
 [content-visibility-014.html]
   expected:
-    if (os == "win") and not webrender: FAIL
+    if (os == "win") and (bits != 32) and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[content-visibility-077.html]
+  [Content-visibility is not animatable]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.tentative.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-077.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[content-visibility-077.tentative.html]
-  [Content-visibility is not animatable]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-078.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-078.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-078.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-contain/content-visibility/content-visibility-078.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[content-visibility-078.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-content/quotes-016.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-content/quotes-016.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-content/quotes-016.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-content/quotes-016.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,3 @@
 [quotes-016.html]
   expected:
-    if (processor == "x86") and not debug: ["FAIL", "PASS"]
+    if (processor == "x86") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-prefix-suffix-syntax.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-prefix-suffix-syntax.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-prefix-suffix-syntax.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-prefix-suffix-syntax.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,19 @@
+[counter-style-prefix-suffix-syntax.html]
+  [@counter-style 'suffix: linear-gradient(yellow, blue)' is valid]
+    expected: FAIL
+
+  [@counter-style 'prefix: url("https://example.com/foo.png")' is valid]
+    expected: FAIL
+
+  [@counter-style 'suffix: url("https://example.com/foo.png")' is valid]
+    expected: FAIL
+
+  [@counter-style 'prefix: linear-gradient(yellow, blue)' is valid]
+    expected: FAIL
+
+  [@counter-style 'suffix: url(https://example.com/foo.png)' is valid]
+    expected: FAIL
+
+  [@counter-style 'prefix: url(https://example.com/foo.png)' is valid]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-speak-as-syntax.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-speak-as-syntax.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-speak-as-syntax.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-speak-as-syntax.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,4 @@
+[counter-style-speak-as-syntax.html]
+  [@counter-style 'speak-as: spell-out' is valid]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-symbols-syntax.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-symbols-syntax.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-symbols-syntax.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-counter-styles/counter-style-symbols-syntax.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,4 @@
+[counter-style-symbols-syntax.html]
+  [@counter-style 'symbols: ident "X" url("foo.jpg")' is valid]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -3,6 +3,7 @@
     if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1520847
   expected:
     if webrender and (os == 'android'): FAIL
-    if (os == "win"): FAIL
+    if webrender and (os == "win"): FAIL
+    if not webrender and (os == "win") and (bits != 32): FAIL
   fuzzy:
     if (os == "mac") and webrender: maxDifference=0-1;totalPixels=0-1054
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-flex-cross-size.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-flex-cross-size.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-flex-cross-size.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-flex-cross-size.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[table-as-item-flex-cross-size.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-stretch-cross-size.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-stretch-cross-size.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-stretch-cross-size.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-flexbox/table-as-item-stretch-cross-size.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[table-as-item-stretch-cross-size.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-font-loading/fontface-override-descriptor-getter-setter.sub.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,7 @@
 [fontface-override-descriptor-getter-setter.sub.html]
   expected:
+    if (os == "win") and debug and not webrender and (processor == "x86_64"): ["TIMEOUT", "OK"]
     if (os == "win") and debug and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if (os == "win") and debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
     if (os == "win") and debug and webrender: ["TIMEOUT", "OK"]
     if (os == "win") and not debug: ["TIMEOUT", "OK"]
   [Initialize lineGapOverride with 'normal' should succeed]
@@ -16,12 +16,12 @@
   [Initialize lineGapOverride with a negative percentage should fail]
     expected:
       if (os == "win") and ccov: [PASS, NOTRUN]
-      if (os == "win") and not debug and (processor == "x86_64") and webrender and not fission: ["NOTRUN", "TIMEOUT"]
-      if (os == "win") and not debug and (processor == "x86_64") and webrender and fission: TIMEOUT
-      if (os == "win") and not debug and (processor == "x86_64") and not webrender: TIMEOUT
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["NOTRUN", "FAIL", "TIMEOUT"]
       if (os == "win") and debug and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL", "NOTRUN"]
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT", "NOTRUN"]
-      if (os == "win") and not debug and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL", "NOTRUN"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): TIMEOUT
+      if (os == "win") and not debug and webrender and not fission: ["TIMEOUT", "FAIL", "NOTRUN"]
+      if (os == "win") and not debug and webrender and fission: ["TIMEOUT", "FAIL"]
       if (os == "win") and debug and webrender: ["FAIL", "TIMEOUT", "NOTRUN"]
       FAIL
 
@@ -37,15 +37,17 @@
   [Initialize descentOverride with a non-percentage should fail]
     expected:
       if (os == "win") and ccov: [PASS, NOTRUN]
-      if (os == "win") and not debug and not fission and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if (os == "win") and not debug and not fission and webrender: ["TIMEOUT", "FAIL"]
+      if (os == "win") and not debug and not fission and not webrender and (processor == "x86"): ["FAIL", "TIMEOUT"]
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["TIMEOUT", "FAIL", "NOTRUN"]
+      if (os == "win") and debug and not webrender and (processor == "x86"): ["FAIL", "TIMEOUT", "NOTRUN"]
+      if (os == "win") and not debug and not fission and webrender: ["FAIL", "TIMEOUT"]
       if (os == "win") and debug and webrender: ["FAIL", "TIMEOUT", "NOTRUN"]
-      if (os == "win") and debug and not webrender: ["FAIL", "TIMEOUT", "NOTRUN"]
       FAIL
 
   [Initialize descentOverride with a negative percentage should fail]
     expected:
       if (os == "win") and ccov: [PASS, TIMEOUT]
+      if (os == "win") and debug and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
       FAIL
 
   [Initialize descentOverride with 'normal' should succeed]
@@ -71,11 +73,12 @@
 
   [Initialize lineGapOverride with a non-percentage should fail]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT", "NOTRUN", "PASS"]
-      if (os == "win") and debug and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "FAIL"]
-      if (os == "win") and debug and webrender: ["TIMEOUT", "PASS", "FAIL", "NOTRUN"]
-      if (os == "win") and not debug and (processor == "x86_64"): ["NOTRUN", "PASS", "FAIL"]
-      if (os == "win") and not debug and (processor == "x86"): ["NOTRUN", "PASS", "FAIL", "TIMEOUT"]
+      if (os == "win") and not webrender and debug and (processor == "x86"): ["NOTRUN", "PASS", "FAIL"]
+      if (os == "win") and not webrender and debug and (processor == "x86_64"): ["NOTRUN", "PASS", "FAIL", "TIMEOUT"]
+      if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["NOTRUN", "PASS", "FAIL"]
+      if (os == "win") and not webrender and not debug and (processor == "x86"): ["NOTRUN", "PASS", "FAIL", "TIMEOUT"]
+      if (os == "win") and webrender and not debug: ["NOTRUN", "PASS", "FAIL", "TIMEOUT"]
+      if (os == "win") and webrender and debug: ["TIMEOUT", "PASS", "FAIL", "NOTRUN"]
       FAIL
 
   [Initialize ascentOverride with a percentage should succeed]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[replaced-alignment-with-aspect-ratio-001.tentative.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[replaced-alignment-with-aspect-ratio-002.tentative.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[grid-auto-margin-and-replaced-item-001.html]
+  expected: [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/css/css-images/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-images/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-prefs: [layout.css.conic-gradient.enabled:true]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[image-orientation-background-properties-border-radius.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/tiled-gradients.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-images/tiled-gradients.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-images/tiled-gradients.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-images/tiled-gradients.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
 [tiled-gradients.html]
   expected:
-    if webrender and (os == "win"): FAIL
-    if webrender and (os == "mac"): FAIL # bug 1646043
+    if webrender and not (os == "mac"): FAIL
+  bug: 1646043
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-lists/list-style-image-zoom-dynamic.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,7 @@
 [list-style-image-zoom-dynamic.html]
   expected:
-    if (os == "mac") and webrender and not debug: ["PASS", "FAIL"]
-    if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
-    if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
+    if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
+    if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
+    if (os == "android") and not debug and webrender: ["PASS", "FAIL"]
+    if (os == "mac") and not debug: ["PASS", "FAIL"]
     [FAIL, PASS]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-masking/clip-path/clip-path-descendant-text-mutated-001.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,7 +1,6 @@
 [clip-path-descendant-text-mutated-001.html]
   expected:
-    if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL", "ERROR"]
-    if (os == "win") and not webrender and debug and (processor == "x86_64"): ["PASS", "FAIL", "ERROR"]
-    if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["FAIL", "PASS", "ERROR"]
-    if (os == "win") and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL", "ERROR"]
+    if (os == "win") and not webrender and (processor == "x86_64") and debug: ["FAIL", "PASS", "ERROR"]
+    if (os == "win") and not webrender and (processor == "x86_64") and not debug: ["FAIL", "PASS", "ERROR"]
+    if (os == "win") and not webrender and (processor == "x86"): ["PASS", "FAIL", "ERROR"]
     [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-masking/mask-image/mask-image-ib-split.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-masking/mask-image/mask-image-ib-split.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-masking/mask-image/mask-image-ib-split.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-masking/mask-image/mask-image-ib-split.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,2 @@
 [mask-image-ib-split.html]
-  max-asserts: 33
+  max-asserts: 40
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-000.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-000.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-000.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-000.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[balance-break-avoidance-000.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/balance-break-avoidance-001.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[balance-break-avoidance-001.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/increase-prev-sibling-height.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/increase-prev-sibling-height.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/increase-prev-sibling-height.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/increase-prev-sibling-height.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,4 @@
 [increase-prev-sibling-height.html]
   expected:
     if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+    if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-002.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-002.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-002.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[multicol-breaking-002.html]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-005.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-005.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-005.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-breaking-005.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[multicol-breaking-005.html]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-nested-000.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-nested-000.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-nested-000.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-nested-000.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[multicol-fill-balance-nested-000.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-height-002-print.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-height-002-print.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-multicol/multicol-height-002-print.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-multicol/multicol-height-002-print.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[multicol-height-002-print.xht]
+  expected:
+    if os == "mac": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom/getComputedStyle-insets-absolute.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[getComputedStyle-insets-absolute.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/cssom-view-img-attributes-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/cssom-view-img-attributes-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/cssom-view-img-attributes-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/cssom-view-img-attributes-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[cssom-view-img-attributes-001.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/getClientRects-br-vrl-ltr.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/getClientRects-br-vrl-ltr.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/getClientRects-br-vrl-ltr.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/getClientRects-br-vrl-ltr.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[getClientRects-br-vrl-ltr.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-element.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -10,6 +10,7 @@
 
   [Element with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected:
+      if (os == "mac") and debug: ["PASS", "FAIL"]
       if (os == "linux") and webrender: ["PASS", "FAIL"]
 
   [Element with smooth scroll-behavior ; scroll() with default behavior]
@@ -24,3 +25,11 @@
     expected:
       if (os == "mac") and debug: ["PASS", "FAIL"]
 
+  [Element with smooth scroll-behavior ; scrollIntoView() with auto behavior]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
+  [Element with smooth scroll-behavior ; scroll() with auto behavior]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -9,8 +9,8 @@
     expected:
       if not webrender and (os == "win") and not debug and (processor == "x86"): PASS
       if not webrender and (os == "win") and debug: PASS
-      if not webrender and (os == "linux"): PASS
       if not webrender and (os == "android"): PASS
+      if not webrender and (os == "linux"): PASS
       [PASS, FAIL]
 
   [Set scrollLeft to frame with smooth scroll-behavior]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,27 +1,23 @@
 [scroll-behavior-main-frame-window.html]
   [Main frame with smooth scroll-behavior ; scroll() with default behavior]
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
       if (os == "linux") and webrender: ["PASS", "FAIL"]
 
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
+      if (os == "win") and not debug and webrender and not fission: ["PASS", "FAIL"]
       if (os == "linux") and webrender: ["PASS", "FAIL"]
 
-  [Main frame with smooth scroll-behavior ; scrollBy() with smooth behavior]
-    expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
-
   [Main frame with auto scroll-behavior ; scrollTo() with smooth behavior]
     expected:
-      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
+      if (os == "win") and webrender and debug: ["PASS", "FAIL"]
 
   [Main frame with smooth scroll-behavior ; scrollTo() with default behavior]
     expected:
-      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
+      if (os == "win") and webrender and debug: ["PASS", "FAIL"]
 
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-smooth-positions.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -5,8 +5,8 @@
 
   [Scroll positions when performing smooth scrolling from (0, 0) to (500, 250) using scroll() ]
     expected:
-      if webrender and not fission and (os == "win") and debug: ["PASS", "FAIL"]
-      if webrender and not fission and (os == "linux"): ["PASS", "FAIL"]
+      if webrender and (os == "win") and debug: ["PASS", "FAIL"]
+      if webrender and (os == "linux") and not fission: ["PASS", "FAIL"]
 
   [Scroll positions when performing smooth scrolling from (1000, 500) to (500, 250) using scrollBy() ]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,9 @@
 [scroll-behavior-subframe-window.html]
   [Main frame with smooth scroll-behavior ; scroll() with default behavior]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and not fission: [PASS, FAIL]
+
+  [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
+    expected:
+      if (os == "mac") and debug: [PASS, FAIL]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,16 +1,16 @@
 [scrollIntoView-smooth.html]
   expected:
-    if webrender and not fission and (os == "win") and not debug: ["OK", "TIMEOUT"]
+    if (os == "win") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
   [Smooth scrollIntoView should scroll the element to the 'end' position]
     disabled:
       if debug and e10s and (os == "linux") and (processor == "x86"): wpt-sync Bug 1461151
     expected:
-      if (os == "win") and webrender and not fission and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
       if os == "android": FAIL
 
   [Smooth scrollIntoView should scroll the element to the 'center' position]
     expected:
-      if (os == "win") and webrender and not fission and not debug: ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
       if os == "android": FAIL
 
   [Smooth scrollIntoView should scroll the element to the 'nearest' position]
@@ -19,5 +19,6 @@
 
   [Smooth scrollIntoView should scroll the element to the 'start' position]
     expected:
+      if (os == "win") and fission: ["PASS", "FAIL"]
       if os == "android": FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-overflow/input-scrollable-region-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[input-scrollable-region-001.html]
+  expected:
+    if (processor == "x86") and debug: [FAIL, PASS]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-overflow/overflow-clip-scroll-size.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-overflow/overflow-clip-scroll-size.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-overflow/overflow-clip-scroll-size.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-overflow/overflow-clip-scroll-size.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,4 @@
+[overflow-clip-scroll-size.html]
+  [scroll size should take into account border size and overflow-clip-margin]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/color-custom-property-animation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/color-custom-property-animation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/color-custom-property-animation.https.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/color-custom-property-animation.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,2 @@
 [color-custom-property-animation.https.html]
-  expected: FAIL
+  expected: TIMEOUT
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/two-element-custom-property-animation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/two-element-custom-property-animation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/two-element-custom-property-animation.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/two-element-custom-property-animation.https.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[two-element-custom-property-animation.https.html]
+  expected: TIMEOUT
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/two-element-one-custom-property-animation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/two-element-one-custom-property-animation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-paint-api/two-element-one-custom-property-animation.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-paint-api/two-element-one-custom-property-animation.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[two-element-one-custom-property-animation.https.html]
+  expected: TIMEOUT
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-pseudo/marker-content-011.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-pseudo/marker-content-011.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-pseudo/marker-content-011.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-pseudo/marker-content-011.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
 [marker-content-011.tentative.html]
   prefs: [layout.css.marker.restricted:false]
   expected:
-    if (processor == "x86") and debug: ["FAIL", "PASS"]
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-pseudo/selection-contenteditable-011.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-pseudo/selection-contenteditable-011.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-pseudo/selection-contenteditable-011.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-pseudo/selection-contenteditable-011.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[selection-contenteditable-011.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,7 @@
   expected:
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
+    if not webrender and (os == "win") and (bits == 64): FAIL
     if os == "mac" and not webrender: FAIL
     if webrender and (os == 'android'): PASS
-    if (os == "android") and not e10s: FAIL
-    if (os == "android") and e10s: FAIL
+    if (os == "android"): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-003.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,4 +1,5 @@
 [shape-outside-linear-gradient-003.html]
   expected:
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-011.html]
   expected:
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-012.html]
   expected:
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-013.html]
   expected:
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-014.html]
   expected:
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-015.html]
   expected:
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,6 @@
 [shape-outside-linear-gradient-016.html]
   expected:
-    if (os == "win") and webrender and debug: ["FAIL", "PASS"]
-    if (os == "win") and webrender and not debug: ["FAIL", "PASS"]
+    if (os == "win") and webrender and debug: [FAIL, PASS]
     if (os == "mac") and not webrender: FAIL
+    if (os == "win") and webrender and not debug and not fission: [FAIL, PASS]
+    if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/aspect-ratio/abspos-004.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/aspect-ratio/abspos-004.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/aspect-ratio/abspos-004.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/aspect-ratio/abspos-004.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[abspos-004.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/range-percent-intrinsic-size-1.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,5 @@
 [range-percent-intrinsic-size-1.html]
   expected:
-    if (os == "win") and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL"]
     if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
+    if (os == "win") and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL"]
     if (os == "win") and not webrender and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/table-percentage-min-width-beside-float.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/table-percentage-min-width-beside-float.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-sizing/table-percentage-min-width-beside-float.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-sizing/table-percentage-min-width-beside-float.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[table-percentage-min-width-beside-float.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-normal.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,29 +1,30 @@
 [css-text-line-break-ja-po-normal.html]
   [2035  REVERSED PRIME may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
+      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
 
   [2109  DEGREE FAHRENHEIT may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [FE6A  SMALL PERCENT SIGN may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2103  DEGREE CELSIUS may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2030  PER MILLE SIGN may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2032  PRIME may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2033  DOUBLE PRIME may NOT appear at line start if ja and normal]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/i18n/ja/css-text-line-break-ja-po-strict.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,30 +1,31 @@
 [css-text-line-break-ja-po-strict.html]
   [2035  REVERSED PRIME may NOT appear at line start if ja and strict]
     expected:
-      if (os == "win") and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if not webrender and (os == "win") and debug and (processor == "x86"): ["PASS", "FAIL"]
+      if not webrender and (os == "win") and not debug and (processor == "x86"): ["PASS", "FAIL"]
+      if not webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
 
   [2030  PER MILLE SIGN may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2032  PRIME may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2103  DEGREE CELSIUS may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [FE6A  SMALL PERCENT SIGN may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2109  DEGREE FAHRENHEIT may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [2033  DOUBLE PRIME may NOT appear at line start if ja and strict]
     expected:
-      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/full-width-leading-spaces-004.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/full-width-leading-spaces-004.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/full-width-leading-spaces-004.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/full-width-leading-spaces-004.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[full-width-leading-spaces-004.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[seg-break-transformation-018.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-018.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[seg-break-transformation-018.tentative.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[seg-break-transformation-019.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/seg-break-transformation-019.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,2 @@
+[seg-break-transformation-019.tentative.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-001.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[trailing-ogham-001.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-002.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-002.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-002.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[trailing-ogham-002.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-003.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-003.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-003.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text/white-space/trailing-ogham-003.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[trailing-ogham-003.html]
-  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-text-decor/text-underline-offset-overline-vertical.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[text-underline-offset-overline-vertical.html]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-transitions/CSSTransition-effect.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-transitions/CSSTransition-effect.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-transitions/CSSTransition-effect.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-transitions/CSSTransition-effect.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,9 @@
 [CSSTransition-effect.tentative.html]
   [After setting a transition's effect to null, a new transition can be started]
     expected:
-      if (os == "linux") and fission and debug: ["FAIL", "PASS"]
-      if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
-      if (os == "linux") and not fission: ["FAIL", "PASS"]
+      if (os == "linux") and debug and webrender and fission: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug: ["FAIL", "PASS"]
       if os == "mac": ["FAIL", "PASS"]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-will-change/will-change-transform-zero-size-child-overflow-visible.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,3 @@
 [will-change-transform-zero-size-child-overflow-visible.html]
   expected:
-    if (os == "win") and not webrender: FAIL
+    if (os == "win") and (bits != 32) and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,20 +1,8 @@
 [box-offsets-rel-pos-vrl-004.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if (os == "android") and not e10s: PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+    if not webrender and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
+    if (os == "win") and (bits == 64): PASS
     if (os == "win") and (processor == "aarch64"): PASS
-    if (os == "android") and e10s: PASS
+    if (os == "android"): PASS
     if (os == 'linux' and os_version == '18.04'): PASS
     FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[row-progression-slr-023.xht]
+  expected:
+    if (processor == "x86") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[row-progression-slr-029.xht]
+  expected:
+    if (processor == "x86") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-sideways-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-sideways-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-sideways-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-sideways-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[text-combine-upright-sideways-001.html]
+  expected:
+    if (processor == "x86") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-001.html.ini firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,7 @@
 [effect-reference-feimage-001.html]
   expected:
-    if webrender and (os == "win") and not debug: ["PASS", "FAIL", "ERROR"]
+    if webrender and (os == "android") and debug: ["PASS", "FAIL"]
     if webrender and (os == "win") and debug: ["PASS", "FAIL", "ERROR"]
-    if webrender and (os == "mac"): ["PASS", "FAIL", "ERROR"]
+    if webrender and (os == "win") and not debug: ["PASS", "FAIL", "ERROR"]
     if webrender and (os == "linux"): ["PASS", "FAIL", "ERROR"]
+    if webrender and (os == "mac"): ["PASS", "FAIL", "ERROR"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-002.html.ini firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-002.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-002.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,5 @@
 [effect-reference-feimage-002.html]
   expected:
-    if (os == "mac") and debug and webrender: ["PASS", "FAIL"]
     if (os == "win") and webrender and debug: ["PASS", "FAIL"]
     if (os == "win") and webrender and not debug: ["PASS", "FAIL", "ERROR"]
     if (os == "linux") and webrender: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/filter-effects/effect-reference-feimage-003.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,6 +1,5 @@
 [effect-reference-feimage-003.html]
   expected:
-    if webrender and (os == "mac") and debug: ["PASS", "FAIL"]
-    if webrender and (os == "win") and debug: ["PASS", "FAIL"]
-    if webrender and (os == "win") and not debug: ["FAIL", "PASS"]
+    if webrender and (os == "android") and debug: ["PASS", "FAIL"]
+    if webrender and (os == "win"): ["PASS", "FAIL"]
     if webrender and (os == "linux"): ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/motion/offset-rotate-005.html.ini firefox-85.0+build1/testing/web-platform/meta/css/motion/offset-rotate-005.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/motion/offset-rotate-005.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/motion/offset-rotate-005.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,3 +1,4 @@
 [offset-rotate-005.html]
   fuzzy:
     if (os == "linux") and webrender: maxDifference=1;totalPixels=0-3
+    if (os == "android") and webrender: maxDifference=1;totalPixels=0-3
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/css/selectors/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/selectors/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1,3 @@
 prefs: [layout.css.focus-visible.enabled:true]
+lsan-disabled: true
+leak-threshold: [tab:460800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/focus-visible-003.html.ini firefox-85.0+build1/testing/web-platform/meta/css/selectors/focus-visible-003.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/focus-visible-003.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/selectors/focus-visible-003.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,7 @@
+[focus-visible-003.html]
+  expected:
+    if os == "android": TIMEOUT
+  [Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible]
+    expected:
+      if os == "android": TIMEOUT
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/focus-visible-007.html.ini firefox-85.0+build1/testing/web-platform/meta/css/selectors/focus-visible-007.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/focus-visible-007.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/selectors/focus-visible-007.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,5 +1,4 @@
 [focus-visible-007.html]
-  expected: ERROR
   [Using keyboard while element is focused should trigger :focus-visible; using mouse without moving focus should not cancel it; moving focus using mouse should cancel it.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/parsing/parse-not.html.ini firefox-85.0+build1/testing/web-platform/meta/css/selectors/parsing/parse-not.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/selectors/parsing/parse-not.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/selectors/parsing/parse-not.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[parse-not.html]
-  [":not(span.a, div.b)" should be a valid selector]
-    expected: FAIL
-
-  [":not(.a .b ~ c, .d .e)" should be a valid selector]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html.ini firefox-85.0+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[moz-css21-row-page-break-inside-avoid-1-print.html]
+  expected:
+    if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[multicol-height-002-print.xht]
-  expected:
-    if os == "mac": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-authoritative-001.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-authoritative-001.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-authoritative-001.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-authoritative-001.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-authoritative-001.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-001.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-001.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-001.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-001.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-encoding-001.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-004.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-004.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-004.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-004.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-encoding-004.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-006.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-006.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-006.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-encoding-006.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-encoding-006.xht]
+  expected:
+    if (processor == "x86") and debug: ["FAIL", "PASS"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-002.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-002.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-002.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-002.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-002.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-006.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-006.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-006.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-006.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-006.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-007.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-007.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-007.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-007.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-007.xht]
+  expected:
+    if (processor == "x86") and debug: ["FAIL", "PASS"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-008.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-008.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-008.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-008.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-008.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-009.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-009.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-009.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-009.xht.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-009.xht]
+  expected:
+    if (processor == "x86") and debug: ["FAIL", "PASS"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-013.xht.ini firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-013.xht.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-013.xht.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/css/WOFF2/metadatadisplay-schema-copyright-013.xht.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,3 @@
+[metadatadisplay-schema-copyright-013.xht]
+  expected:
+    if (processor == "x86") and debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/abort/addEventListenerAbortController.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/abort/addEventListenerAbortController.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/abort/addEventListenerAbortController.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/abort/addEventListenerAbortController.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[addEventListenerAbortController.tentative.html]
-  [Tests support for EventController to cancel event listeners in addEventListener.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/events/AddEventListenerOptions-signal.any.js.ini firefox-85.0+build1/testing/web-platform/meta/dom/events/AddEventListenerOptions-signal.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/events/AddEventListenerOptions-signal.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/events/AddEventListenerOptions-signal.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,34 @@
+[AddEventListenerOptions-signal.any.html]
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
+
+[AddEventListenerOptions-signal.any.worker.html]
+  expected: ERROR
+  [Passing an AbortSignal to addEventListener works with the once flag]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener works with the capture flag]
+    expected: FAIL
+
+  [Aborting from a listener does not call future listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to multiple listeners]
+    expected: FAIL
+
+  [Passing an AbortSignal to addEventListener options should allow removing a listener]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/input-text-scroll-event-when-using-arrow-keys.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[input-text-scroll-event-when-using-arrow-keys.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-programmatic-scroll.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,13 +1,13 @@
 [scrollend-event-fired-for-programmatic-scroll.html]
   expected:
-    if (os == "win") and not debug and (processor == "x86_64") and webrender and fission: ["OK", "TIMEOUT"]
-    if (os == "win") and not debug and (processor == "x86_64") and not webrender: ["OK", "TIMEOUT"]
+    if (os == "win") and not fission and not debug and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if (os == "win") and fission: [OK, TIMEOUT]
   [Tests scrollend event for calling scroll functions.]
     expected: FAIL
 
   [Tests scrollend event for changing scroll attributes.]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64") and webrender and fission: ["FAIL", "TIMEOUT"]
-      if (os == "win") and not debug and (processor == "x86_64") and not webrender: ["FAIL", "TIMEOUT"]
+      if (os == "win") and not fission and not debug and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if (os == "win") and fission: [FAIL, TIMEOUT]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-fired-for-scrollIntoView.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,11 +1,11 @@
 [scrollend-event-fired-for-scrollIntoView.html]
   expected:
-    if fission and (os == "win"): ["OK", "TIMEOUT"]
+    if fission and (os == "win"): [OK, TIMEOUT]
   [Tests scrollend event for scrollIntoView.]
     expected: FAIL
 
   [Tests scrollend event for nested scrollIntoView.]
     expected:
-      if fission and (os == "win"): ["FAIL", "TIMEOUT"]
+      if fission and (os == "win"): [FAIL, TIMEOUT]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-for-user-scroll.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-for-user-scroll.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-for-user-scroll.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/events/scrolling/scrollend-event-for-user-scroll.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,8 @@
 [scrollend-event-for-user-scroll.html]
   expected:
     if (os == "win") and ccov: [ERROR, OK]
-    if (os == "win") and debug: ERROR
     if (os == "mac") and debug: ERROR
+    if (os == "win") and debug: ERROR
     if os == "android": OK
     TIMEOUT
   [Tests that the target_div gets scrollend event when send DOWN key to target.]
@@ -12,28 +12,27 @@
 
   [Tests that the target_div gets scrollend event when click scrollbar on target.]
     expected:
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
       if (os == "linux") and not debug and webrender: ["NOTRUN", "FAIL", "TIMEOUT"]
       if (os == "linux") and debug: ["FAIL", "TIMEOUT", "NOTRUN"]
       if os == "android": ["FAIL", "NOTRUN"]
-      if os == "mac": NOTRUN
       [NOTRUN, FAIL]
 
   [Tests that the target_div gets scrollend event when drag the thumb of target.]
     expected:
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "TIMEOUT"]
       if (os == "linux") and not debug and webrender: ["NOTRUN", "TIMEOUT"]
-      if os == "android": ["FAIL", "TIMEOUT", "NOTRUN"]
+      if os == "mac": ["NOTRUN", "TIMEOUT"]
       if os == "win": ["NOTRUN", "FAIL"]
-      if os == "mac": NOTRUN
+      if os == "android": ["FAIL", "TIMEOUT", "NOTRUN"]
       [TIMEOUT, NOTRUN]
 
   [Tests that the target_div gets scrollend event when dragging scroll on target.]
     expected:
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
       if (os == "linux") and not debug and webrender: ["TIMEOUT", "FAIL"]
-      if os == "mac": TIMEOUT
+      if os == "mac": ["TIMEOUT", "FAIL"]
       if os == "win": ["TIMEOUT", "FAIL"]
       [FAIL, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/nodes/Element-siblingElement-null-svg.svg.ini firefox-85.0+build1/testing/web-platform/meta/dom/nodes/Element-siblingElement-null-svg.svg.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/nodes/Element-siblingElement-null-svg.svg.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/nodes/Element-siblingElement-null-svg.svg.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[Element-siblingElement-null-svg.svg]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/dom/nodes/Node-cloneNode.html.ini firefox-85.0+build1/testing/web-platform/meta/dom/nodes/Node-cloneNode.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/dom/nodes/Node-cloneNode.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/dom/nodes/Node-cloneNode.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,4 @@
 [Node-cloneNode.html]
   prefs: [dom.dialog_element.enabled:true]
-
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/editing/run/bold.html.ini firefox-85.0+build1/testing/web-platform/meta/editing/run/bold.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/editing/run/bold.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/editing/run/bold.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -290,3 +290,4 @@
 
   [[["stylewithcss","false"\],["bold",""\]\] "<span style=font-weight:100>fo[o</span><span style=font-weight:200>b\]ar</span>" queryCommandState("bold") after]
     expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/editing/run/caret-navigation-around-line-break.html.ini firefox-85.0+build1/testing/web-platform/meta/editing/run/caret-navigation-around-line-break.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/editing/run/caret-navigation-around-line-break.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/editing/run/caret-navigation-around-line-break.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -5,13 +5,17 @@
       FAIL
 
   [no separator - move up]
-    expected: FAIL
+    expected:
+      if (os == "mac") and debug: ["FAIL", "PASS"]
+      FAIL
 
   [<span> separator - move down]
     expected:
+      if debug and (os == "linux") and webrender and fission: ["FAIL", "PASS"]
+      if debug and (os == "linux") and webrender and not fission: ["PASS", "FAIL"]
+      if debug and (os == "linux") and not webrender: ["FAIL", "PASS"]
       if debug and (os == "android"): ["FAIL", "PASS"]
       if debug and (os == "mac"): ["FAIL", "PASS"]
-      if debug and (os == "linux"): ["FAIL", "PASS"]
       if debug and (os == "win"): ["FAIL", "PASS"]
       FAIL
 
@@ -25,12 +29,14 @@
 
   [<wbr> separator - move right]
     expected:
-      if (os == "linux") and debug and webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and webrender: ["FAIL", "PASS"]
+      if debug and (os == "mac"): ["FAIL", "PASS"]
       FAIL
 
   [<wbr> separator - move left]
     expected:
-      if (os == "linux") and debug and webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and webrender: ["FAIL", "PASS"]
+      if debug and (os == "mac"): ["FAIL", "PASS"]
       FAIL
 
   [<wbr> separator - move up]
@@ -50,3 +56,7 @@
   [<br> separator - move up]
     expected: FAIL
 
+  [<br> separator - move right]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/element-timing/fixed-id-identifier.html.ini firefox-85.0+build1/testing/web-platform/meta/element-timing/fixed-id-identifier.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/element-timing/fixed-id-identifier.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/element-timing/fixed-id-identifier.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [fixed-id-identifier.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [PerformanceElementTiming id and identifier do not change when Element changes.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/encoding/encodeInto.any.js.ini firefox-85.0+build1/testing/web-platform/meta/encoding/encodeInto.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/encoding/encodeInto.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/encoding/encodeInto.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -525,8 +525,8 @@
     expected: FAIL
 
   [encodeInto() into SharedArrayBuffer with �A and destination length 3, offset 4, filler 128]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1561594
+    expected: FAIL
 
   [encodeInto() into SharedArrayBuffer with U+d834AU+df06AÂ¥Hi and destination length 10, offset 4, filler 0]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.ini firefox-85.0+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -7,6 +7,808 @@
 [euckr-encode-form.html?1001-2000]
 
 [euckr-encode-form.html?16001-17000]
+  expected:
+    if (os == "mac") and debug: ["OK", "TIMEOUT"]
+  [U+F9C9 柳 %EA%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FF 刺 %F4%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97E 量 %E5%D6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F1 隣 %EC%E4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF07 ＇ %A3%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98E 年 %E6%C4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E1 李 %EC%B0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D9 慄 %EB%D0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF23 ï¼£ %A3%C3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D3 陸 %EB%C1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1E ＞ %A3%BE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98C 歷 %E6%B8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9ED 吝 %EC%D5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B1 鈴 %E7%CB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97A 梁 %E5%C4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98A 力 %E6%B3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A9 囹 %E7%AA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A6 簾 %E7%A1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D4 倫 %EB%C2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FB 炙 %EE%DB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2B Ｋ %A3%CB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F985 礪 %E6%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98D � %E6%BC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DC 隆 %EB%D8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA01 � %F6%F4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F986 閭 %E6%AD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98B 曆 %E6%B7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF04 ＄ %A3%A4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99E 咽 %E6%EC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9EF 璘 %EC%DE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B0 聆 %E7%C7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F982 廬 %E5%FE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9EB 匿 %EC%C9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A0 裂 %E6%F1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF33 ï¼³ %A3%D3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1C ＜ %A3%BC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F996 練 %E6%DF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CA 流 %EA%FC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CC 琉 %EB%A4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CB 溜 %EA%FE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BE 料 %E8%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B6 禮 %E7%DF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A7 獵 %E7%A6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FC 識 %F2%BD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CD � %EB%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF01 � %A3%A1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF10 � %A3%B0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C5 暈 %E9%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F7 立 %ED%A1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A3 念 %E6%F6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA03 糖 %F7%B8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0D � %A3%AD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2C Ｌ %A3%CC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D6 淪 %EB%C7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9EA 離 %EC%C6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF25 ï¼¥ %A3%C5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA0A 見 %FA%E6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C1 � %E8%FE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AE 瑩 %E7%C1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2F Ｏ %A3%CF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99F 烈 %E6%EF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C8 杻 %EA%F4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF13 ３ %A3%B3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF16 ï¼– %A3%B6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97B 糧 %E5%CE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F992 漣 %E6%D2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D1 六 %EB%BB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F991 撚 %E6%CA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF03 ＃ %A3%A3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA09 降 %FA%A2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E6 罹 %EC%BA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F994 璉 %E6%D9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FD 什 %F2%FA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F98F � %E6%C6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C6 阮 %EA%C1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F8 笠 %ED%A2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0E ． %A3%AE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BB 僚 %E8%E8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF15 ５ %A3%B5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B7 醴 %E7%E4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E5 痢 %EC%B8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9EC 溺 %EC%CA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0B ＋ %A3%AB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A4 捻 %E6%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D2 戮 %EB%BD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F989 黎 %E6%B1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF24 Ｄ %A3%C4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF22 ï¼¢ %A3%C2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F980 呂 %E5%FB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF17 ï¼— %A3%B7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C7 劉 %EA%E5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E2 梨 %EC%B1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA04 宅 %F7%C8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2A Ｊ %A3%CA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F0 藺 %EC%E1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DE 吏 %EC%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AB 嶺 %E7%AD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D0 � %EB%BA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF20 ï¼  %A3%C0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF34 ï¼´ %A3%D4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E3 泥 %EC%B2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AF 羚 %E7%C6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F979 凉 %E5%BC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F983 旅 %E6%A1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F999 蓮 %E6%E5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BC 寮 %E8%F0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA06 暴 %F8%DB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AA 寧 %E7%AC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AD 玲 %E7%BF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CF � %EB%AA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FE 茶 %F3%B1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF08 （ %A3%A8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2E ï¼® %A3%CE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97D 諒 %E5%D2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA07 輻 %F8%F0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C4 龍 %E9%CC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F984 濾 %E6%A4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F998 輦 %E6%E4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9FA 狀 %ED%EE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B4 領 %E7%D0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F4 林 %EC%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F987 驪 %E6%AF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF12 ï¼’ %A3%B2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF21 Ａ %A3%C1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F3 麟 %EC%E8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D8 律 %EB%CF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9EE 燐 %EC%DD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D5 崙 %EB%C6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF26 Ｆ %A3%C6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF06 ＆ %A3%A6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99A 連 %E6%E6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E7 裏 %EC%C0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA05 洞 %F7%D3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF19 ï¼™ %A3%B9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA00 切 %F4%EE]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B2 零 %E7%CD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BD 尿 %E8%F1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0F � %A3%AF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF29 Ｉ %A3%C9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C3 遼 %E9%AC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF2D ï¼­ %A3%CD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F6 臨 %EC%FA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DB 率 %EB%D2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F990 � %E6%C7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BA 了 %E8%E7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1B ï¼› %A3%BB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B5 例 %E7%D3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E4 理 %EC%B5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F2 鱗 %EC%E7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF28 Ｈ %A3%C8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9CE 硫 %EB%A9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DD � %EC%A6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF02 ＂ %A3%A2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF09 ） %A3%A9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99D � %E6%EB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF18 ８ %A3%B8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E0 易 %EC%AF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F978 兩 %E5%BB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0C ， %A3%AC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B9 惡 %E7%F7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C2 蓼 %E9%A7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF0A ＊ %A3%AA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF05 ï¼… %A3%A5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA08 行 %FA%A1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F997 聯 %E6%E1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF27 Ｇ %A3%C7]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99C 列 %E6%EA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F981 � %E5%FC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B8 隸 %E7%E6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DA 栗 %EB%D1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9AC 怜 %E7%B0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97F 勵 %E5%FA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1F ？ %A3%BF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A1 說 %E6%F2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1D � %A3%BD]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF30 ï¼° %A3%D0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F5 淋 %EC%F8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF11 １ %A3%B1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A8 令 %E7%A9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E8 裡 %EC%C1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9C0 燎 %E8%FB]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9BF 樂 %E8%F9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF1A ： %A3%BA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9D7 輪 %EB%CC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9DF 履 %EC%AA]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF31 ï¼± %A3%D1]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA02 拓 %F6%F6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A5 殮 %E6%F9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF14 ï¼” %A3%B4]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9E9 里 %EC%C5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9A2 廉 %E6%F5]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F97C 良 %E5%D0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FA0B 廓 %FC%A9]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F99B 鍊 %E6%E8]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F995 秊 %E6%DC]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9B3 靈 %E7%CF]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+FF32 ï¼² %A3%D2]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F993 煉 %E6%D6]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F9F9 粒 %ED%A3]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
+  [U+F988 麗 %E6%B0]
+    expected:
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+
 
 [euckr-encode-form.html?9001-10000]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini firefox-85.0+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-ksc_5601.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,37 @@
+[euckr-encode-form-ksc_5601.html?8001-9000]
+
+[euckr-encode-form-ksc_5601.html?10001-11000]
+
+[euckr-encode-form-ksc_5601.html?2001-3000]
+
+[euckr-encode-form-ksc_5601.html?11001-12000]
+
+[euckr-encode-form-ksc_5601.html?12001-13000]
+
+[euckr-encode-form-ksc_5601.html?7001-8000]
+
+[euckr-encode-form-ksc_5601.html?6001-7000]
+
+[euckr-encode-form-ksc_5601.html?1001-2000]
+
+[euckr-encode-form-ksc_5601.html?13001-14000]
+
+[euckr-encode-form-ksc_5601.html?15001-16000]
+
+[euckr-encode-form-ksc_5601.html?16001-17000]
+
+[euckr-encode-form-ksc_5601.html?14001-15000]
+
+[euckr-encode-form-ksc_5601.html?3001-4000]
+  expected:
+    if (os == "linux") and debug and webrender and not fission: ["OK", "CRASH"]
+
+[euckr-encode-form-ksc_5601.html?17001-last]
+
+[euckr-encode-form-ksc_5601.html?4001-5000]
+
+[euckr-encode-form-ksc_5601.html?9001-10000]
+
+[euckr-encode-form-ksc_5601.html?1-1000]
+
+[euckr-encode-form-ksc_5601.html?5001-6000]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,5 +4,5 @@
   max-asserts: 2
   [Feature policy "payment" can be enabled in same-origin iframe using allow="payment" attribute]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,5 +4,5 @@
   max-asserts: 2
   [Feature-Policy allow="payment" allows same-origin navigation in an iframe.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-allowed-by-feature-policy.https.sub.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -4,11 +4,11 @@
   max-asserts: 2
   [Feature-Policy header {"payment" : ["*"\]} allows the top-level document.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [Feature-Policy header {"payment" : ["*"\]} allows same-origin iframes.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [Feature-Policy header {"payment" : ["*"\]} disallows cross-origin iframes.]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-default-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-default-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-default-feature-policy.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-default-feature-policy.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,14 +4,14 @@
   max-asserts: 2
   [Default "payment" feature policy ["self"\] allows the top-level document.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [Default "payment" feature policy ["self"\] allows same-origin iframes.]
     expected: PASS
 
   [Default "payment" feature policy ["self"\] allows same-origin iframes.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [Default "payment" feature policy ["self"\] disallows cross-origin iframes.]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-disabled-by-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-disabled-by-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/payment-disabled-by-feature-policy.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/payment-disabled-by-feature-policy.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,5 +4,5 @@
   max-asserts: 2
   [Feature-Policy header {"payment" : [\]} disallows the top-level document.]
     expected:
-      if not webrender and (os == "linux") and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/reporting/payment-reporting.https.html.ini firefox-85.0+build1/testing/web-platform/meta/feature-policy/reporting/payment-reporting.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/feature-policy/reporting/payment-reporting.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/feature-policy/reporting/payment-reporting.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,5 +4,5 @@
   max-asserts: 2
   [PaymentRequest Report Format]
     expected:
-      if (os == "linux") and not webrender and not debug: [FAIL, PASS]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/abort/general.any.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/api/abort/general.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/abort/general.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/api/abort/general.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -21,6 +21,10 @@
     expected:
       if fission and (os == "linux") and not debug: ["PASS", "FAIL"]
 
+  [Stream errors once aborted. Underlying connection closed.]
+    expected:
+      if (processor == "x86") and (os == "linux"): ["PASS", "FAIL"]
+
 
 [general.any.sharedworker.html]
   [Stream will not error if body is empty. It's closed with an empty queue before it errors.]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,15 @@
+[cors-preflight-referrer.any.html]
+  [Referrer policy: "" and referrer: 'myreferrer']
+    expected: FAIL
+
+  [Referrer policy: "" and referrer: default]
+    expected: FAIL
+
+
+[cors-preflight-referrer.any.worker.html]
+  [Referrer policy: "" and referrer: 'myreferrer']
+    expected: FAIL
+
+  [Referrer policy: "" and referrer: default]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/api/response/response-cancel-stream.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,34 +1,33 @@
 [response-cancel-stream.any.sharedworker.html]
   expected:
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+    if os == "mac": ["OK", "TIMEOUT"]
   [Cancelling a closed Response stream]
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if os == "mac": ["PASS", "FAIL", "TIMEOUT"]
 
 
 [response-cancel-stream.any.html]
   expected:
-    if (os == "mac") and not debug: ["OK", "ERROR", "TIMEOUT"]
+    if (os == "mac") and not debug: ["ERROR", "OK", "TIMEOUT"]
+    if (os == "mac") and debug: ["OK", "ERROR", "TIMEOUT"]
   [Cancelling a closed Response stream]
     expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if os == "mac": ["FAIL", "PASS", "TIMEOUT"]
 
 
 [response-cancel-stream.any.serviceworker.html]
   expected:
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+    if os == "mac": ["OK", "TIMEOUT"]
   [Cancelling a closed Response stream]
     expected:
+      if (os == "mac") and debug: ["PASS", "FAIL", "TIMEOUT"]
       if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
-      if (os == "mac") and debug: ["PASS", "FAIL"]
 
 
 [response-cancel-stream.any.worker.html]
   expected:
-    if (os == "mac") and not debug: ["OK", "ERROR", "TIMEOUT"]
+    if os == "mac": ["OK", "ERROR", "TIMEOUT"]
   [Cancelling a closed Response stream]
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if os == "mac": ["PASS", "FAIL", "TIMEOUT"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/content-type/script.window.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/content-type/script.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/content-type/script.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/content-type/script.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -23,11 +23,13 @@
 
   [separate text/javascript ]
     expected:
-      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "win") and webrender and debug: ["PASS", "FAIL"]
+      if (os == "win") and webrender: ["PASS", "FAIL"]
 
   [combined x/x text/javascript]
     expected:
       if (processor == "x86") and debug: ["PASS", "FAIL"]
 
+  [combined text/javascript;" x/x]
+    expected:
+      if fission and (os == "win"): ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/cors-rfc1918/non-secure-context.window.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/cors-rfc1918/non-secure-context.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/cors-rfc1918/non-secure-context.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/cors-rfc1918/non-secure-context.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[non-secure-context.window.html]
+  [Public non secure page fetches local page.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/http-cache/304-update.any.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/http-cache/304-update.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/http-cache/304-update.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/http-cache/304-update.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -8,26 +8,25 @@
 [304-update.any.worker.html]
   [HTTP cache updates stored headers from a Last-Modified 304]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["FAIL", "PASS"]
-      if (os == "win") and webrender and debug: PASS
       if (os == "win") and not webrender: PASS
-      if (os == "mac") and debug: PASS
+      if (os == "linux") and (processor == "x86"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
 
 [304-update.any.serviceworker.html]
   [HTTP cache updates stored headers from a Last-Modified 304]
     expected:
-      if (os == "linux") and not fission and (processor == "x86_64") and debug and webrender: ["FAIL", "PASS"]
-      if (os == "mac") and not debug: PASS
-      if os == "win": PASS
+      if (os == "linux") and fission and debug: ["FAIL", "PASS"]
+      if (os == "win") and not fission: PASS
+      if (os == "mac") and debug: PASS
       [PASS, FAIL]
 
 
 [304-update.any.sharedworker.html]
   [HTTP cache updates stored headers from a Last-Modified 304]
     expected:
-      if os == "win": PASS
+      if (os == "android") and debug and not webrender: ["FAIL", "PASS"]
+      if (os == "win") and not fission: PASS
       if os == "mac": PASS
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/http-cache/cc-request.any.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/http-cache/cc-request.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/http-cache/cc-request.any.js.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/http-cache/cc-request.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,11 +2,19 @@
   [HTTP cache generates 504 status code when nothing is in cache and request contains Cache-Control: only-if-cached]
     expected: FAIL
 
+  [HTTP cache doesn't use aged but fresh response when request contains Cache-Control: max-age=1]
+    expected:
+      if os == "android" and debug: [PASS, FAIL]
+
 
 [cc-request.any.sharedworker.html]
   [HTTP cache generates 504 status code when nothing is in cache and request contains Cache-Control: only-if-cached]
     expected: FAIL
 
+  [HTTP cache doesn't use aged but fresh response when request contains Cache-Control: max-age=1]
+    expected:
+      if os == "android" and debug: [PASS, FAIL]
+
 
 [cc-request.any.html]
   [HTTP cache generates 504 status code when nothing is in cache and request contains Cache-Control: only-if-cached]
@@ -17,3 +25,6 @@
   [HTTP cache generates 504 status code when nothing is in cache and request contains Cache-Control: only-if-cached]
     expected: FAIL
 
+  [HTTP cache doesn't use aged but fresh response when request contains Cache-Control: max-age=1]
+    expected:
+      if os == "android" and debug: [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/form.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/form.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/form.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/form.https.sub.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[form.https.sub.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/history.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/history.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/history.https.sub.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/history.https.sub.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[history.https.sub.html]
-  disabled:
-    if fission: https://bugzilla.mozilla.org/show_bug.cgi?id=1656208
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/iframe.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/iframe.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/iframe.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/iframe.https.sub.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[iframe.https.sub.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.sub.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/redirect/redirect-https-downgrade.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[redirect-https-downgrade.sub.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/window-open.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/window-open.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/metadata/window-open.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/metadata/window-open.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,12 +1,10 @@
 [window-open.https.sub.html]
   expected:
-    if os == "mac": ERROR
-    if os == "win": ERROR
-    [ERROR, OK]
+    if os == "mac": OK
+    if os == "win": OK
+    [OK, ERROR]
   [Cross-site window, forced, reloaded]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["FAIL", "PASS"]
-      [PASS, FAIL]
+    expected: [PASS, FAIL]
 
   [Same-site window, forced, reloaded]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fetch/origin/assorted.window.js.ini firefox-85.0+build1/testing/web-platform/meta/fetch/origin/assorted.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fetch/origin/assorted.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fetch/origin/assorted.window.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,10 +1,4 @@
 [assorted.window.html]
-  [Origin header and 308 redirect]
-    expected: FAIL
-
-  [Origin header and POST navigation]
-    expected: FAIL
-
   [Origin header and POST same-origin fetch cors mode with Referrer-Policy no-referrer]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-form-controls.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-form-controls.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-form-controls.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-form-controls.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,16 @@
+[send-file-form-controls.tentative.html]
+  [Upload file-for-upload-in-form-LF-CR-[\n\r\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-LF-[\n\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-CR-LF-[\r\n\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-CR-[\r\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-NUL-[\x00\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-controls.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-controls.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-controls.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-controls.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,16 @@
+[send-file-formdata-controls.tentative.html]
+  [Upload file-for-upload-in-form-NUL-[\x00\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-LF-[\n\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-CR-[\r\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-LF-CR-[\n\r\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
+  [Upload file-for-upload-in-form-CR-LF-[\r\n\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-punctuation.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-punctuation.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-punctuation.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-formdata-punctuation.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,7 @@
+[send-file-formdata-punctuation.tentative.html]
+  [Upload file-for-upload-in-form-QUOTATION-MARK-["\].txt (ASCII) in fetch with FormData]
+    expected: FAIL
+
+  [Upload "file-for-upload-in-form-double-quoted.txt" (ASCII) in fetch with FormData]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-form-punctuation.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-form-punctuation.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/file/send-file-form-punctuation.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/FileAPI/file/send-file-form-punctuation.tentative.html.ini	2021-01-18 19:58:19.000000000 +0000
@@ -0,0 +1,7 @@
+[send-file-form-punctuation.tentative.html]
+  [Upload file-for-upload-in-form-QUOTATION-MARK-["\].txt (ASCII) in UTF-8 form]
+    expected: FAIL
+
+  [Upload "file-for-upload-in-form-double-quoted.txt" (ASCII) in UTF-8 form]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/url/url-format.any.js.ini firefox-85.0+build1/testing/web-platform/meta/FileAPI/url/url-format.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/FileAPI/url/url-format.any.js.ini	2021-01-06 11:23:16.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/FileAPI/url/url-format.any.js.ini	2021-01-18 19:58:19.000000000 +0000
@@ -1,11 +1,7 @@
 [url-format.any.html]
   disabled:
-    if (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1433190
-  [Blob URL parses correctly]
-    expected:
-      if (os == "mac"): FAIL
-
+    if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1433190
 
 [url-format.any.worker.html]
   disabled:
-    if (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1433190
+    if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1433190
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/activeelement-after-focusing-different-site-iframe-contentwindow.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[activeelement-after-focusing-different-site-iframe-contentwindow.html]
-  [Check more trailing events]
-    expected:
-      if fission: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/activeelement-after-immediately-focusing-same-site-iframe.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/activeelement-after-immediately-focusing-same-site-iframe.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/activeelement-after-immediately-focusing-same-site-iframe.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/activeelement-after-immediately-focusing-same-site-iframe.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[activeelement-after-immediately-focusing-same-site-iframe.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-event-after-focusing-iframes.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/focus-event-after-focusing-iframes.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-event-after-focusing-iframes.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/focus-event-after-focusing-iframes.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[focus-event-after-focusing-iframes.html]
+  [Check focus event after focusing same site iframe]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,5 +2,7 @@
   disabled:
     if (os == "linux") or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1642889
   [Check result]
-    expected: [PASS, FAIL]
+    expected:
+      if fission: ["FAIL", "PASS"]
+      [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-different-site-iframes-window.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,9 @@
+[focus-restoration-in-different-site-iframes-window.html]
+  disabled:
+    if (os == "linux") or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1642889
+  [Check result]
+    expected:
+      if webrender and (os == "win") and fission: ["FAIL", "PASS"]
+      if webrender and (os == "win") and not fission: ["PASS", "FAIL"]
+      if webrender and (os == "mac"): ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/focus/focus-restoration-in-same-site-iframes-window.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,8 @@
+[focus-restoration-in-same-site-iframes-window.html]
+  disabled:
+    if (os == "linux") or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1642889
+  [Check result]
+    expected:
+      if (os == "win") and fission: ["FAIL", "PASS"]
+      if os == "mac": ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser-multiple.tentative.manual.https.html.ini firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser-multiple.tentative.manual.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser-multiple.tentative.manual.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser-multiple.tentative.manual.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[font_access-chooser-multiple.tentative.manual.https.html]
+  [showFontChooser multiple choosers]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.https.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[font_access-chooser.tentative.https.window.html]
-  [font_access-chooser]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.manual.https.html.ini firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.manual.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.manual.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/font-access/font_access-chooser.tentative.manual.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[font_access-chooser.tentative.manual.https.html]
+  [showFontChooser works]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[forced-colors-mode-04.html]
-  [Checks hyperlinks are overridden in forced colors mode.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-31.html.ini firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-31.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-31.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-31.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[forced-colors-mode-31.html]
+  expected:
+    if (processor == "x86") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-40.html.ini firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-40.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-40.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-40.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,40 @@
+[forced-colors-mode-40.html]
+  [Forced colors aren't applied at computed value time for -webkit-text-emphasis-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for -webkit-tap-highlight-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for border-left-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for outline-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for stroke]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for border-bottom-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for column-rule-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for text-decoration-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for border-top-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for border-right-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for background-color]
+    expected: FAIL
+
+  [Forced colors aren't applied at computed value time for fill]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-41.html.ini firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-41.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-41.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-41.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,22 @@
+[forced-colors-mode-41.html]
+  [Forced colors affects the resolved value of border-left-color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of background-color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of outline-color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of border-top-color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of border-right-color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of color]
+    expected: FAIL
+
+  [Forced colors affects the resolved value of border-bottom-color]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini firefox-85.0+build1/testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,5 @@
 [document-exit-fullscreen-nested-shadow-dom.html]
   expected:
-    if not debug and (os == "android") and webrender: ["OK", "ERROR"]
-    if debug and (os == "android") and webrender: ["OK", "ERROR"]
-    if debug and (os == "linux"): ERROR
-    if debug and (os == "win"): ERROR
-    [ERROR, OK]
+    if debug and (os == "linux"): OK
+    if debug and (os == "win"): OK
+    [OK, ERROR]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [001.html]
   expected:
-    if fission and debug: ["OK", "ERROR"]
+    if fission and debug: [OK, ERROR]
   [pushState must not be allowed to create cross-origin URLs (about:blank)]
     expected: FAIL
 
@@ -12,45 +12,45 @@
 
   [state data should be a clone of the original object, not a reference to it]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [popstate event should fire when navigation occurs]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [pushState must not alter location.hash when no URL is provided]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [popstate event should pass the state data]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [traversing history must also traverse hash changes]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [history.state should be identical to the object passed to the event handler unless history.state is updated]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [history.state should also reference a clone of the original object (2)]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [pushState must remove any tasks queued by the history traversal task source]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [state data should cope with circular object references]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [location.hash must be allowed to change (part 2)]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [pushState must remove all history after the current state]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/002.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -14,21 +14,21 @@
 
   [.go must queue a task with the history traversal task source (run asynchronously)]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: ["FAIL", "PASS"]
 
   [replaceState must replace the existing state and not add an extra one]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: ["FAIL", "PASS"]
 
   [replaceState must not remove any tasks queued by the history traversal task source]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: ["FAIL", "PASS"]
 
   [replaceState must replace the existing state without altering the forward history]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: ["FAIL", "PASS"]
 
   [hash should not change when replaceState is called without a URL]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: ["FAIL", "PASS"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-history-interface/005.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,9 @@
 [005.html]
   [<body onpopstate="..."> should register a listener for the popstate event]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
   [window.onpopstate should register a listener for the popstate event]
     expected:
-      if fission and debug: ["PASS", "FAIL"]
+      if fission and debug: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/history/the-session-history-of-browsing-contexts/navigation-in-onload.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[navigation-in-onload.tentative.html]
-  [Navigation in onload handler]
-    expected:
-      if fission and debug: ["PASS", "FAIL"]
-      if fission and not debug: ["PASS", "FAIL"]
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/sandboxing/sandbox-navigation-timing.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[sandbox-navigation-timing.tentative.html]
-  [setting sandbox attribute should not affect current document in iframe]
-    expected:
-      if processor == "aarch64": PASS
-      FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.js.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [no_window_open_when_term_nesting_level_nonzero.window.html]
   expected:
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "TIMEOUT", "CRASH"]
     if (os == "linux") and webrender and not debug and fission: ["ERROR", "TIMEOUT", "CRASH"]
+    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "TIMEOUT", "CRASH"]
     if (os == "linux") and webrender and debug: ["ERROR", "TIMEOUT", "CRASH"]
     ERROR
   [no popups from synchronously reachable window]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,46 +3,37 @@
     if webrender and not debug: bug 1425588
   [features "innerwidth=405e-1" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405*3" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405.5" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405e1" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405.32" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405  " should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405LLl" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405/5" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [features "innerwidth=405^4" should set "width=405"]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,7 +2,7 @@
 
 [window-open-noopener.html?indexed]
   expected:
-    if webrender and debug and (os == "linux") and not fission: ["OK", "CRASH"]
+    if (os == "linux") and debug and webrender and not fission: ["OK", "CRASH"]
   [noopener=1 means the same as noopener]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/window-properties.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/window-properties.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/the-window-object/window-properties.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/the-window-object/window-properties.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -7,26 +7,29 @@
 
   [Window method: print]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "android") and e10s: FAIL
+      if os == "android": FAIL
 
   [Window unforgeable attribute: window]
-    expected:
-      if nightly_build: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1510437
+    expected:
+      if release_or_beta: PASS
+      FAIL
 
   [Window unforgeable attribute: document]
-    expected:
-      if nightly_build: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1510437
+    expected:
+      if release_or_beta: PASS
+      FAIL
 
   [Window unforgeable attribute: location]
-    expected:
-      if nightly_build: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1510437
+    expected:
+      if release_or_beta: PASS
+      FAIL
 
   [Window unforgeable attribute: top]
-    expected:
-      if nightly_build: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1510437
+    expected:
+      if release_or_beta: PASS
+      FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,8 +3,8 @@
     if (os == "linux") and (bits == 32) and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1483696
   expected:
     if debug and (os == "win") and not webrender: ["OK", "TIMEOUT"]
-    if debug and (os == "linux") and fission: ["OK", "TIMEOUT"]
     if debug and (os == "linux") and not fission: ["OK", "TIMEOUT"]
+    if debug and (os == "linux") and fission: ["OK", "TIMEOUT"]
   [Auxiliary browsing context created via `window.open` and setting `window.opener` to `null` should report `window.opener` `null`]
     expected:
       if debug and (os == "win") and not webrender: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/windows/iframe-nested-print.html.ini firefox-85.0+build1/testing/web-platform/meta/html/browsers/windows/iframe-nested-print.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/browsers/windows/iframe-nested-print.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/browsers/windows/iframe-nested-print.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[iframe-nested-print.html]
+  expected:
+    if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[2d.fillRect.shadow.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,4 @@
 [2d.text.draw.fontface.notinpage.html]
   [@font-face fonts should work even if they are not used in the page]
-    expected:
-      if (os == "linux") and webrender and not fission: ["FAIL", "PASS"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      if (os == "win") and (processor == "x86"): ["FAIL", "PASS"]
-      if os == "android": ["FAIL", "PASS"]
-      [PASS, FAIL]
+    expected: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.fillStyle.parse.invalid.hex2.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[2d.fillStyle.parse.invalid.hex2.html]
+  [Canvas test: 2d.fillStyle.parse.invalid.hex2]
+    expected:
+      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/fill-and-stroke-styles/2d.pattern.modify.image2.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[2d.pattern.modify.image2.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.condensed.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.expanded.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.extra-condensed.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.extra-expanded.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[canvas.2d.fontStretch.normal.html]
+  expected:
+    if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.semi-condensed.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.semi-expanded.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.ultra-condensed.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[canvas.2d.fontStretch.ultra-expanded.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -5,9 +5,6 @@
   [Test putImageData(imagedata, dx, dy): e-SRGB canvas, SRGB U8 ImageData]
     expected: FAIL
 
-  [Test cretateImageData(width, height) from SRGB canvas ]
-    expected: FAIL
-
   [Test putImageData(imagedata, dx, dy): SRGB canvas, e-SRGB F32 ImageData]
     expected: FAIL
 
@@ -35,9 +32,6 @@
   [Test createImageData(imagedata): e-SRGB canvas, e-SRGB F32 ImageData]
     expected: FAIL
 
-  [Test cretateImageData(width, height) from e-SRGB canvas ]
-    expected: FAIL
-
   [Test createImageData(imagedata): e-SRGB canvas, e-SRGB U16 ImageData]
     expected: FAIL
 
@@ -65,3 +59,9 @@
   [Test putImageData(imagedata, dx, dy): SRGB canvas, e-SRGB U16 ImageData]
     expected: FAIL
 
+  [Test createImageData(width, height) from e-SRGB canvas ]
+    expected: FAIL
+
+  [Test createImageData(width, height) from SRGB canvas ]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.arc.empty.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.arc.empty.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.arc.empty.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.arc.empty.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[2d.path.arc.empty.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.bezierCurveTo.nonfinite.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[2d.path.bezierCurveTo.nonfinite.html]
+  [bezierCurveTo() with Infinity/NaN is ignored]
+    expected:
+      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/element/path-objects/2d.path.isPointInPath.basic.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[2d.path.isPointInPath.basic.html]
-  disabled:
-    if (os == "win") and webrender and not debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1661920
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.destination-in.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.composite.uncovered.pattern.destination-in.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.composite.uncovered.pattern.source-out.worker.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "CRASH"]
   [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-hsl-5.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.css-color-4-hsl-5.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [OffscreenCanvas test: 2d.fillStyle.parse.css-color-4-hsl-5]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.css-color-4-rgb-1.worker.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.css-color-4-rgb-1.worker.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [2d]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.invalid.css-color-4-rgb-1.worker.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [2d]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgb-2.worker.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.invalid.rgb-2.worker.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [2d]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.invalid.rgba-3.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [OffscreenCanvas test: 2d.fillStyle.parse.invalid.rgba-3]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/fill-and-stroke-styles/2d.fillStyle.parse.invalid.rgba-3.worker.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [2d.fillStyle.parse.invalid.rgba-3.worker.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
   [2d]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.w.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,11 +1,7 @@
 [offscreencanvas.commit.w.html]
   expected:
-    if (os == "win") and (processor == "x86_64") and webrender and not debug and fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and debug and not fission: ["ERROR", "OK"]
-    if (os == "win") and (processor == "x86_64") and webrender and debug: ["ERROR", "OK"]
-    if (os == "linux") and webrender and not debug: ["ERROR", "OK"]
-    if (os == "linux") and not webrender and not debug: ["ERROR", "OK"]
-    if (os == "win") and (processor == "x86") and debug: ["ERROR", "OK"]
+    if (os == "linux") and webrender and not fission and not debug: ["ERROR", "OK"]
+    if (os == "mac") and debug: ["ERROR", "OK"]
     if (os == "mac") and not debug: ["ERROR", "OK"]
     [OK, ERROR]
   [Test that calling OffscreenCanvas's commit pushes its contents to its placeholder.]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,3 @@
 prefs: [browser.tabs.remote.useCrossOriginEmbedderPolicy:true]
 lsan-allowed: [Alloc, Malloc, Then, mozilla::BasePrincipal::CreateContentPrincipal, mozilla::dom::DocGroup::Create, mozilla::dom::ServiceWorkerJobQueue::RunJob, mozilla::dom::ServiceWorkerManager::Unregister, mozilla::dom::ServiceWorkerRegistrationMainThread::Unregister, mozilla::dom::UnregisterCallback::UnregisterCallback, mozilla::net::nsStandardURL::TemplatedMutator, operator]
+leak-threshold: [tab:51200]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[require-corp.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-embedder-policy/require-corp-load-from-cache-storage.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[require-corp-load-from-cache-storage.https.html]
+  expected:
+    if (os == "android") and not debug and not webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,8 +3,8 @@
     expected:
       if (os == "win") and webrender and not debug and fission: PASS
       if (os == "win") and webrender and debug: PASS
-      if (os == "linux") and fission: PASS
       if (os == "win") and not webrender: PASS
+      if (os == "linux") and fission: PASS
       [PASS, FAIL]
 
   [CSP: sandbox allow-popups allow-scripts; CSP sandbox popup navigate to Cross-Origin-Opener-Policy document should work]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/header-parsing.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/header-parsing.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/header-parsing.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/header-parsing.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[header-parsing.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/historical/popup-same-site-with-same-site.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[popup-same-site-with-same-site.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[iframe-popup-same-origin-to-same-origin.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[iframe-popup-unsafe-none-to-same-origin.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-redirect-cache.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-redirect-cache.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-redirect-cache.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-redirect-cache.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,27 @@
+[popup-redirect-cache.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+  [same-origin document opening popup redirect from https://www1.web-platform.test:8443 to https://not-web-platform.test:8443 with redirectCache true and destCache false]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
+  [same-origin document opening popup redirect from https://web-platform.test:8443 to https://not-web-platform.test:8443 with redirectCache true and destCache true]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
+  [same-origin document opening popup redirect from https://not-web-platform.test:8443 to https://web-platform.test:8443 with redirectCache true and destCache true]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
+  [same-origin document opening popup redirect from https://www1.web-platform.test:8443 to https://not-web-platform.test:8443 with redirectCache false and destCache true]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
+  [same-origin document opening popup redirect from https://www1.web-platform.test:8443 to https://not-web-platform.test:8443 with redirectCache true and destCache true]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
+  [same-origin document opening popup redirect from https://not-web-platform.test:8443 to https://web-platform.test:8443 with redirectCache true and destCache false]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,10 @@
 [popup-same-origin-allow-popups-with-cross-origin.https.html]
   expected:
-    if (os == "linux") and not fission and not debug and not webrender: ["OK", "CRASH"]
-    if (os == "linux") and not fission and debug and webrender: ["OK", "CRASH"]
-    if (os == "win") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
-    if (os == "win") and webrender and not debug and fission: ["OK", "TIMEOUT"]
-    if (os == "win") and webrender and debug: ["OK", "CRASH"]
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+    if (os == "win") and not webrender and not debug and (processor == "x86"): [OK, TIMEOUT, CRASH]
+    if (os == "linux") and not fission and webrender and debug: [OK, CRASH]
+    if (os == "linux") and not fission and webrender and not debug: [OK, TIMEOUT]
+    if (os == "linux") and not fission and not webrender and not debug: [OK, CRASH]
+    if (os == "win") and webrender and not debug: [OK, TIMEOUT]
+    if (os == "win") and webrender and debug: [OK, TIMEOUT, CRASH]
+    if (os == "linux") and fission and not debug: [OK, TIMEOUT]
+    if (os == "mac") and not debug: [OK, TIMEOUT]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/popup-unspecified-with-same-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[popup-unspecified-with-same-origin.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1652926
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[reporting-coop-navigated-opener.https.html]
+  expected: TIMEOUT
+  [navigation-report-from-opener-navigation]
+    expected: TIMEOUT
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,28 +3,32 @@
     if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if debug: OK
-    [TIMEOUT, OK]
+    if not debug and not webrender and (os == "linux") and (processor == "x86"): ["TIMEOUT", "OK"]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if not debug and not webrender and (os == "win"): TIMEOUT
+    if not debug and webrender: TIMEOUT
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin, require-corp, , ]
     expected:
       if (os == "win") and ccov: FAIL
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
       if debug: FAIL
-      [NOTRUN, FAIL, TIMEOUT]
+      NOTRUN
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin-allow-popups; report-to="coop-popup-report-endpoint", require-corp, , ]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): ["TIMEOUT", "FAIL"]
       if debug: FAIL
-      [TIMEOUT, FAIL]
+      TIMEOUT
 
   [verify remaining reports]
     expected:
       if ccov: [NOTRUN, PASS]
-      if not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if debug: PASS
-      [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): ["NOTRUN", "PASS"]
+      if not debug and not webrender and (os == "win"): NOTRUN
+      if not debug and webrender: NOTRUN
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,28 +1,32 @@
 [reporting-popup-same-origin.https.html]
+  expected:
+    if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and not webrender and (os == "win"): TIMEOUT
+    if not debug and webrender: TIMEOUT
   disabled:
     if (os == "win") and (processor == "x86_64"): random test
-  expected:
-    if not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if debug: OK
-    [TIMEOUT, OK]
   [coop reporting test reporting same origin to SAME_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
       if (os == "linux") and ccov: [TIMEOUT, FAIL]
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
+      TIMEOUT
 
   [coop reporting test reporting same origin to CROSS_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, FAIL, TIMEOUT]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, NOTRUN, TIMEOUT]
       if debug: FAIL
-      [NOTRUN, FAIL, TIMEOUT]
+      NOTRUN
 
   [verify remaining reports]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if debug: PASS
-      [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and not webrender and (os == "win"): NOTRUN
+      if not debug and webrender: NOTRUN
 
   [coop reporting test reporting same origin to CROSS_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
@@ -30,7 +34,8 @@
   [coop reporting test reporting same origin to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
       if (os == "win") and ccov: TIMEOUT
-      if not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if debug: PASS
-      [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and not webrender and (os == "win"): NOTRUN
+      if not debug and webrender: NOTRUN
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,44 +3,49 @@
     if os == "win": random test
     if (os == "linux") and fission: https://bugzilla.mozilla.org/show_bug.cgi?id=1661876
   expected:
-    if webrender and not debug: TIMEOUT
-    [TIMEOUT, OK]
+    if debug and (os == "linux") and not webrender: ["TIMEOUT", "OK"]
+    if debug and (os == "linux") and webrender: ["TIMEOUT", "OK"]
+    if not debug and not webrender: ["TIMEOUT", "OK", "CRASH"]
+    if debug and (os == "mac"): ["TIMEOUT", "OK"]
+    TIMEOUT
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with unsafe-none, , , ]
     expected:
-      if not webrender and (processor == "x86_64") and not debug: ["TIMEOUT", "NOTRUN", "FAIL"]
-      if not webrender and (processor == "x86_64") and debug: ["TIMEOUT", "FAIL", "NOTRUN"]
-      if not webrender and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
-      if webrender and debug: TIMEOUT
+      if webrender and debug and (os == "linux"): ["TIMEOUT", "FAIL"]
+      if webrender and debug and (os == "mac"): TIMEOUT
+      if not webrender and not debug and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
+      if not webrender and not debug and (processor == "x86_64"): ["TIMEOUT", "NOTRUN", "FAIL"]
+      if not webrender and debug: ["TIMEOUT", "FAIL", "NOTRUN"]
       NOTRUN
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
-      if (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if (os == "linux") and webrender: ["TIMEOUT", "FAIL"]
-      if (os == "mac") and not debug: TIMEOUT
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
+      if (os == "linux") and not debug and webrender: ["TIMEOUT", "FAIL"]
       if (os == "mac") and debug: FAIL
+      if (os == "mac") and not debug: TIMEOUT
       [FAIL, TIMEOUT]
 
   [verify remaining reports]
     expected:
-      if not webrender: ["NOTRUN", "PASS"]
-      NOTRUN
+      if webrender and (os == "linux") and not debug: NOTRUN
+      if webrender and (os == "mac"): NOTRUN
+      [NOTRUN, PASS]
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", require-corp, , ]
     expected:
-      if webrender and (os == "mac") and not debug: NOTRUN
-      if webrender and (os == "mac") and debug: FAIL
-      if webrender and (os == "linux"): ["NOTRUN", "TIMEOUT"]
-      if not webrender and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN", "TIMEOUT"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["NOTRUN", "FAIL", "TIMEOUT"]
+      if (os == "linux") and not debug and webrender: ["NOTRUN", "TIMEOUT"]
+      if (os == "mac") and debug: FAIL
+      if (os == "mac") and not debug: NOTRUN
       [FAIL, TIMEOUT, NOTRUN]
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with unsafe-none; report-to="coop-popup-report-endpoint", , , ]
     expected:
-      if not webrender and (processor == "x86_64") and not debug: ["FAIL", "NOTRUN"]
-      if not webrender and (processor == "x86_64") and debug: ["FAIL", "NOTRUN"]
-      if not webrender and (processor == "x86"): ["NOTRUN", "FAIL"]
+      if not webrender and not debug and (processor == "x86"): ["NOTRUN", "FAIL"]
+      if webrender and not debug: NOTRUN
       if webrender and debug: FAIL
-      NOTRUN
+      [FAIL, NOTRUN]
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: [FAIL, PASS]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,31 +1,35 @@
 [reporting-popup-unsafe-none-report-to.https.html]
-  disabled:
-    if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if debug: OK
-    [TIMEOUT, OK]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and not webrender and (os == "win"): TIMEOUT
+    if not debug and webrender: TIMEOUT
+  disabled:
+    if (os == "win") and (processor == "x86_64"): random test
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected:
       if ccov: FAIL
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
-      if not debug and (os == "win"): ["NOTRUN", "FAIL", "TIMEOUT"]
-      if debug: FAIL
-      [NOTRUN, FAIL]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, FAIL]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, NOTRUN]
+      if not debug and not webrender and (os == "win"): [NOTRUN, FAIL, TIMEOUT]
+      if not debug and webrender: [NOTRUN, FAIL]
+      FAIL
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin, , , ]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if debug: FAIL
-      [TIMEOUT, FAIL]
+      TIMEOUT
 
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if debug: PASS
-      [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and not webrender and (os == "win"): NOTRUN
+      if not debug and webrender: NOTRUN
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with same-origin; report-to="coop-popup-report-endpoint", , , ]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,16 +1,18 @@
 [report-only-from-unsafe-none.https.html]
-  disabled:
-    if (os == "win") and (processor == "x86_64"): random test
   expected:
     if (os == "win") and ccov: OK
-    if not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if debug: OK
-    [TIMEOUT, OK]
+    if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and not webrender and (os == "win"): TIMEOUT
+    if not debug and webrender: TIMEOUT
+  disabled:
+    if (os == "win") and (processor == "x86_64"): random test
   [coop reporting test Report only tests for an opener without any COOP/COOP report only set to CROSS_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
-      if not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [TIMEOUT, FAIL]
       if debug: FAIL
-      [TIMEOUT, FAIL]
+      TIMEOUT
 
   [coop reporting test Report only tests for an opener without any COOP/COOP report only set to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected: FAIL
@@ -18,9 +20,8 @@
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS"]
-      if not debug and (os == "mac"): ["NOTRUN", "PASS"]
-      if not debug and (os == "win"): ["NOTRUN", "PASS", "TIMEOUT"]
+      if not debug and not webrender and (os == "linux") and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and not webrender and (os == "linux") and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and not webrender and (os == "win"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and webrender: [NOTRUN, PASS]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,19 +1,19 @@
 [report-only-same-origin.https.html]
   expected:
-    if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "win") and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if not debug and (os == "win") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "linux") and webrender: ["TIMEOUT", "OK"]
-    if not debug and (os == "win") and webrender: ["TIMEOUT", "OK"]
+    if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "win") and not fission and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "win") and not fission and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "linux") and webrender: [TIMEOUT, OK]
+    if not debug and (os == "win") and fission: [TIMEOUT, OK]
     if not debug and (os == "mac"): TIMEOUT
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", require-corp]
     expected:
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender: ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86"): ["TIMEOUT", "FAIL"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "linux") and webrender: [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86_64"): [FAIL, TIMEOUT]
       if not debug and (os == "mac"): TIMEOUT
       FAIL
 
@@ -22,11 +22,11 @@
 
   [verify remaining reports]
     expected:
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN", "TIMEOUT"]
-      if not debug and (os == "win") and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "win") and not webrender and (processor == "x86_64"): ["PASS", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS"]
-      if not debug and (os == "win") and webrender: ["TIMEOUT", "PASS", "NOTRUN"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN, TIMEOUT]
+      if not debug and (os == "win") and not fission and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "win") and not fission and (processor == "x86_64"): [PASS, TIMEOUT, NOTRUN]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS]
+      if not debug and (os == "win") and fission: [TIMEOUT, PASS, NOTRUN]
       if not debug and (os == "mac"): NOTRUN
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,35 +1,39 @@
 [report-only-same-origin-report-to.https.html]
   expected:
     if (os == "win") and ccov: OK
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if debug: OK
-    [TIMEOUT, OK]
+    if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, OK]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [OK, TIMEOUT]
+    if not debug and (os == "linux") and webrender: [TIMEOUT, OK]
+    if not debug and (os == "mac"): TIMEOUT
+    if not debug and (os == "win"): [TIMEOUT, OK]
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender: ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86"): ["TIMEOUT", "FAIL"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "mac"): ["TIMEOUT", "FAIL"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "linux") and webrender: [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86"): [TIMEOUT, FAIL]
+      if not debug and (os == "win") and (processor == "x86_64"): [FAIL, TIMEOUT]
+      if not debug and (os == "mac"): TIMEOUT
       FAIL
 
   [coop reporting test reporting same origin with report-to to SAME_ORIGIN with , , same-origin; report-to="coop-popup-report-only-endpoint", ]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender: ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "win") and (processor == "x86_64"): ["TIMEOUT", "PASS", "NOTRUN"]
-      if not debug and (os == "win") and (processor == "x86"): ["NOTRUN", "PASS", "TIMEOUT"]
-      if not debug and (os == "mac"): ["NOTRUN", "PASS", "TIMEOUT"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86"): [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "win") and (processor == "x86_64"): [TIMEOUT, PASS, NOTRUN]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS, TIMEOUT]
+      if not debug and (os == "mac"): NOTRUN
 
   [verify remaining reports]
     expected:
       if (os == "win") and ccov: PASS
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if debug: PASS
-      [NOTRUN, PASS]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): [NOTRUN, PASS]
+      if not debug and (os == "linux") and webrender: [NOTRUN, PASS]
+      if not debug and (os == "win"): [NOTRUN, PASS]
+      if not debug and (os == "mac"): NOTRUN
 
   [coop reporting test reporting same origin with report-to to CROSS_ORIGIN with , , , ]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/resource-popup.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/resource-popup.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/cross-origin-opener-policy/resource-popup.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/cross-origin-opener-policy/resource-popup.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,14 +1,10 @@
 [resource-popup.https.html]
   expected:
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["OK", "TIMEOUT", "CRASH"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86"): ["OK", "TIMEOUT", "CRASH"]
-    if (os == "linux") and not webrender and debug: ["OK", "TIMEOUT", "CRASH"]
+    if (os == "linux") and not webrender: ["OK", "TIMEOUT", "CRASH"]
     [OK, TIMEOUT]
   [/common/dummy.xml - parent COOP: ""; child COOP: "same-origin"]
     expected:
-      if debug and (os == "linux") and webrender: ["FAIL", "PASS"]
-      if debug and (os == "win") and webrender: ["FAIL", "PASS"]
-      if debug and (os == "mac"): ["FAIL", "PASS"]
+      if debug and fission: ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [/images/red.png - parent COOP: ""; child COOP: "same-origin"]
@@ -19,3 +15,7 @@
   [/media/2x2-green.mp4 - parent COOP: ""; child COOP: "same-origin"]
     expected: [PASS, TIMEOUT]
 
+  [/common/text-plain.txt - parent COOP: "same-origin"; child COOP: ""]
+    expected:
+      if fission and debug: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/dom/idlharness.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/dom/idlharness.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/dom/idlharness.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/dom/idlharness.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -57,21 +57,12 @@
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "direction" with the proper type]
     expected: FAIL
 
-  [ApplicationCache interface: constant UPDATEREADY on interface prototype object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute globalCompositeOperation]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onprogress]
-    expected: FAIL
-
   [VideoTrack interface: attribute kind]
     expected: FAIL
 
-  [ApplicationCache interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation restore()]
     expected: FAIL
 
@@ -84,21 +75,12 @@
   [CanvasRenderingContext2D interface: operation scrollPathIntoView()]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onnoupdate]
-    expected: FAIL
-
   [AudioTrackList interface: operation getTrackById(DOMString)]
     expected: FAIL
 
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "getContextAttributes()" with the proper type]
     expected: FAIL
 
-  [ApplicationCache interface: constant OBSOLETE on interface prototype object]
-    expected: FAIL
-
-  [ApplicationCache interface: constant OBSOLETE on interface object]
-    expected: FAIL
-
   [TextMetrics interface: attribute ideographicBaseline]
     expected: FAIL
 
@@ -132,9 +114,6 @@
   [Location interface: window.location must have own property "ancestorOrigins"]
     expected: FAIL
 
-  [ApplicationCache interface: constant UNCACHED on interface object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute filter]
     expected: FAIL
 
@@ -147,18 +126,12 @@
   [OffscreenCanvasRenderingContext2D interface: operation isPointInStroke(unrestricted double, unrestricted double)]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onupdateready]
-    expected: FAIL
-
   [External interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [CanvasRenderingContext2D interface: operation scrollPathIntoView(Path2D)]
     expected: FAIL
 
-  [ApplicationCache interface object name]
-    expected: FAIL
-
   [DOMStringList interface: calling item(unsigned long) on location.ancestorOrigins with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -192,9 +165,6 @@
   [VideoTrackList interface: operation getTrackById(DOMString)]
     expected: FAIL
 
-  [ApplicationCache interface object length]
-    expected: FAIL
-
   [BarProp interface: attribute visible]
     expected: FAIL
 
@@ -207,9 +177,6 @@
   [VideoTrackList interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onchecking]
-    expected: FAIL
-
   [SVGElement interface: attribute onsecuritypolicyviolation]
     expected: FAIL
 
@@ -246,15 +213,6 @@
   [SVGSVGElement interface: attribute onunload]
     expected: FAIL
 
-  [ApplicationCache interface: existence and properties of interface object]
-    expected: FAIL
-
-  [ApplicationCache interface: constant CHECKING on interface prototype object]
-    expected: FAIL
-
-  [ApplicationCache interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation drawImage(CanvasImageSource, unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
@@ -276,12 +234,6 @@
   [OffscreenCanvas interface: attribute width]
     expected: FAIL
 
-  [ApplicationCache interface: constant CHECKING on interface object]
-    expected: FAIL
-
-  [ApplicationCache interface: constant DOWNLOADING on interface object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation stroke()]
     expected: FAIL
 
@@ -309,9 +261,6 @@
   [OffscreenCanvasRenderingContext2D interface: attribute shadowBlur]
     expected: FAIL
 
-  [Stringification of window.applicationCache]
-    expected: FAIL
-
   [VideoTrack interface: attribute language]
     expected: FAIL
 
@@ -327,9 +276,6 @@
   [SVGSVGElement interface: attribute onmessage]
     expected: FAIL
 
-  [ApplicationCache interface: attribute ondownloading]
-    expected: FAIL
-
   [OffscreenCanvas interface: attribute height]
     expected: FAIL
 
@@ -375,18 +321,12 @@
   [OffscreenCanvasRenderingContext2D interface: existence and properties of interface object]
     expected: FAIL
 
-  [ApplicationCache interface: attribute oncached]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation commit()]
     expected: FAIL
 
   [OffscreenCanvasRenderingContext2D interface: operation getTransform()]
     expected: FAIL
 
-  [ApplicationCache interface: attribute status]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute textAlign]
     expected: FAIL
 
@@ -402,9 +342,6 @@
   [ElementInternals interface: attribute form]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onerror]
-    expected: FAIL
-
   [Navigator interface: operation unregisterProtocolHandler(DOMString, USVString)]
     expected: FAIL
 
@@ -414,15 +351,9 @@
   [SVGSVGElement interface: attribute onhashchange]
     expected: FAIL
 
-  [ApplicationCache interface: constant IDLE on interface prototype object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation createImageData(long, long)]
     expected: FAIL
 
-  [ApplicationCache interface: constant DOWNLOADING on interface prototype object]
-    expected: FAIL
-
   [DOMStringList must be primary interface of location.ancestorOrigins]
     expected: FAIL
 
@@ -432,9 +363,6 @@
   [AudioTrackList interface: attribute onchange]
     expected: FAIL
 
-  [ApplicationCache interface: operation update()]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute font]
     expected: FAIL
 
@@ -459,15 +387,9 @@
   [TextMetrics interface: attribute hangingBaseline]
     expected: FAIL
 
-  [ApplicationCache interface: constant UNCACHED on interface prototype object]
-    expected: FAIL
-
   [VideoTrackList interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [ApplicationCache interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [AudioTrackList interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -507,9 +429,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation stroke(Path2D)]
     expected: FAIL
 
-  [ApplicationCache interface: window.applicationCache must inherit property "abort()" with the proper type]
-    expected: FAIL
-
   [AudioTrack interface: existence and properties of interface object]
     expected: FAIL
 
@@ -549,9 +468,6 @@
   [TextMetrics interface: attribute fontBoundingBoxDescent]
     expected: FAIL
 
-  [ApplicationCache must be primary interface of window.applicationCache]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute textBaseline]
     expected: FAIL
 
@@ -561,9 +477,6 @@
   [AudioTrack interface: attribute label]
     expected: FAIL
 
-  [ApplicationCache interface: constant UPDATEREADY on interface object]
-    expected: FAIL
-
   [Navigator interface: window.navigator must inherit property "unregisterProtocolHandler(DOMString, USVString)" with the proper type]
     expected: FAIL
 
@@ -594,9 +507,6 @@
   [VideoTrack interface object name]
     expected: FAIL
 
-  [ApplicationCache interface: constant IDLE on interface object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute fillStyle]
     expected: FAIL
 
@@ -612,18 +522,12 @@
   [AudioTrackList interface: attribute length]
     expected: FAIL
 
-  [ApplicationCache interface: operation abort()]
-    expected: FAIL
-
   [VideoTrack interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [VideoTrack interface: attribute id]
     expected: FAIL
 
-  [ApplicationCache interface: operation swapCache()]
-    expected: FAIL
-
   [AudioTrack interface: attribute enabled]
     expected: FAIL
 
@@ -636,9 +540,6 @@
   [ElementInternals interface: attribute validationMessage]
     expected: FAIL
 
-  [ApplicationCache interface: attribute onobsolete]
-    expected: FAIL
-
   [AudioTrack interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/safe-passing-of-structured-data/shared-array-buffers/blob-data.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,7 @@
 implementation-status: backlog
 bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613912
 [blob-data.https.html]
-  expected:
-    if os == "mac": ["TIMEOUT", "OK"]
-    [OK, TIMEOUT]
+  expected: [OK, TIMEOUT]
   [data frame: self.isSecureContext]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -45,10 +45,10 @@
 
 [utf-16be.html?include=workers]
   expected:
-    if webrender and (os == "linux") and debug and not fission: ["TIMEOUT", "OK"]
-    if webrender and (os == "linux") and not debug and fission: ["TIMEOUT", "OK"]
-    if webrender and (os == "mac") and debug: ["TIMEOUT", "OK"]
-    if webrender and (os == "win") and fission: ["TIMEOUT", "OK"]
+    if (os == "win") and (processor == "x86_64") and not webrender and not debug: ["TIMEOUT", "OK"]
+    if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "OK"]
+    if (os == "linux") and debug and not webrender: ["TIMEOUT", "OK"]
+    if (os == "mac") and not debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
@@ -58,10 +58,10 @@
 
   [SharedWorker constructor]
     expected:
-      if webrender and (os == "linux") and debug and not fission: ["TIMEOUT", "PASS"]
-      if webrender and (os == "linux") and not debug and fission: ["TIMEOUT", "PASS"]
-      if webrender and (os == "mac") and debug: ["TIMEOUT", "PASS"]
-      if webrender and (os == "win") and fission: ["TIMEOUT", "PASS"]
+      if (os == "win") and (processor == "x86_64") and not webrender and not debug: ["TIMEOUT", "PASS"]
+      if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "PASS"]
+      if (os == "linux") and debug and not webrender: ["TIMEOUT", "PASS"]
+      if (os == "mac") and not debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-16le.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -43,7 +43,7 @@
 
 [utf-16le.html?include=workers]
   expected:
-    if (os == "linux") and fission and not debug: ["TIMEOUT", "OK"]
+    if (os == "linux") and (processor == "x86_64") and not debug and webrender and not fission: ["TIMEOUT", "OK"]
     if (os == "mac") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
@@ -51,13 +51,14 @@
 
   [importScripts() in a shared worker]
     expected:
-      if not webrender and (os == "win") and (processor == "x86"): ["FAIL", "TIMEOUT"]
-      if not webrender and (os == "linux"): ["FAIL", "TIMEOUT"]
+      if (processor == "x86_64") and (os == "mac") and debug: ["FAIL", "TIMEOUT"]
+      if (processor == "x86_64") and (os == "linux") and not webrender: ["FAIL", "TIMEOUT"]
+      if processor == "x86": ["FAIL", "TIMEOUT"]
       FAIL
 
   [SharedWorker constructor]
     expected:
-      if (os == "linux") and fission and not debug: ["TIMEOUT", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and not debug and webrender and not fission: ["TIMEOUT", "PASS"]
       if (os == "mac") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/utf-8.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -33,8 +33,9 @@
 
 [utf-8.html?include=workers]
   expected:
-    if webrender and (os == "linux") and not debug and fission: ["TIMEOUT", "OK"]
-    if not webrender and not debug and (processor == "x86"): ["TIMEOUT", "OK"]
+    if (os == "linux") and (processor == "x86_64") and debug and not webrender: ["TIMEOUT", "OK"]
+    if (os == "linux") and (processor == "x86_64") and not debug and webrender: ["TIMEOUT", "OK"]
+    if (os == "mac") and debug: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
@@ -46,8 +47,9 @@
 
   [SharedWorker constructor]
     expected:
-      if webrender and (os == "linux") and not debug and fission: ["TIMEOUT", "PASS"]
-      if not webrender and not debug and (processor == "x86"): ["TIMEOUT", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and not debug and webrender: ["TIMEOUT", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and debug and not webrender: ["TIMEOUT", "PASS"]
+      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1251.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -287,11 +287,7 @@
 
 [windows-1251.html?include=workers]
   expected:
-    if (os == "win") and not debug and not fission and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
-    if (os == "win") and not debug and not fission and webrender: ["TIMEOUT", "OK"]
-    if (os == "android") and not debug and webrender: ["TIMEOUT", "OK"]
-    if (os == "linux") and not webrender and debug: ["TIMEOUT", "OK"]
-    if (os == "mac") and debug: ["TIMEOUT", "OK"]
+    if (os == "linux") and (processor == "x86"): ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
@@ -303,11 +299,7 @@
 
   [SharedWorker constructor]
     expected:
-      if (os == "win") and not debug and not fission and not webrender and (processor == "x86"): ["TIMEOUT", "PASS"]
-      if (os == "win") and not debug and not fission and webrender: ["TIMEOUT", "PASS"]
-      if (os == "android") and not debug and webrender: ["TIMEOUT", "PASS"]
-      if (os == "linux") and not webrender and debug: ["TIMEOUT", "PASS"]
-      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
+      if (os == "linux") and (processor == "x86"): ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
@@ -315,8 +307,9 @@
 
   [Worker() in a shared worker]
     expected:
-      if not webrender and (os == "win") and (processor == "x86"): ["PASS", "TIMEOUT"]
-      if not webrender and (os == "linux"): ["PASS", "TIMEOUT"]
+      if (processor == "x86_64") and (os == "mac") and debug: ["PASS", "TIMEOUT"]
+      if (processor == "x86_64") and (os == "linux") and not webrender: ["PASS", "TIMEOUT"]
+      if processor == "x86": ["PASS", "TIMEOUT"]
 
 
 [windows-1251.html?include=scheme]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/infrastructure/urls/resolving-urls/query-encoding/windows-1252.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -115,9 +115,7 @@
 
 [windows-1252.html?include=workers]
   expected:
-    if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "OK"]
-    if (os == "win") and (processor == "x86") and debug: ["TIMEOUT", "OK"]
-    if (os == "mac") and debug: ["TIMEOUT", "OK"]
+    if (os == "linux") and (processor == "x86_64") and debug and webrender and not fission: ["TIMEOUT", "OK"]
     [OK, TIMEOUT]
   [SharedWorker() in a shared worker]
     expected: FAIL
@@ -130,9 +128,7 @@
 
   [SharedWorker constructor]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "PASS"]
-      if (os == "win") and (processor == "x86") and debug: ["TIMEOUT", "PASS"]
-      if (os == "mac") and debug: ["TIMEOUT", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and debug and webrender and not fission: ["TIMEOUT", "PASS"]
       [PASS, TIMEOUT]
 
   [SharedWorker() in a dedicated worker]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/sequential-focus-navigation-and-the-tabindex-attribute/focus-tabindex-order.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[focus-tabindex-order.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,8 @@
 [first.html]
   [The first autofocus element in the document should win.]
     expected:
-      if (os == "win") and not fission and not debug and not webrender and (processor == "x86"): PASS
-      if (os == "linux") and debug and webrender and fission: PASS
-      if (os == "linux") and debug and not webrender: PASS
-      if (os == "win") and not fission and debug: PASS
-      if (os == "win") and fission: ["FAIL", "PASS"]
+      if debug and (os == "linux") and webrender and fission: PASS
+      if debug and (os == "linux") and not webrender: PASS
+      if debug and (os == "win"): PASS
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later-but-before.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,8 @@
 [first-when-later-but-before.html]
   [The temporally first autofocus in the document wins, even if an element is inserted later that is previous in the document tree.]
     expected:
-      if not debug and (os == "win") and not webrender: PASS
       if debug and (os == "win") and not webrender: PASS
+      if not debug and (os == "win") and not webrender: PASS
       if debug and (os == "android"): PASS
       if debug and (os == "linux"): PASS
       [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/first-when-later.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,4 @@
 [first-when-later.html]
   [The first autofocus in the document wins, even if elements are inserted later.]
-    expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
-      if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
+    expected: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/no-autofocus-on-changing-input-type.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,7 @@
 [no-autofocus-on-changing-input-type.html]
   [Changing input type should not refocus on the element.]
     expected:
-      if not debug and (os == "win") and webrender and not fission: ["FAIL", "PASS"]
-      if debug and not webrender and (os == "linux"): PASS
-      if debug and not webrender and (os == "win"): PASS
+      if (os == "win") and debug and not webrender: PASS
+      if (os == "linux") and debug and not webrender: PASS
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html.ini firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/interaction/focus/the-autofocus-attribute/queue-non-focusable.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,10 @@
 [queue-non-focusable.html]
   [If the first autofocus element is not focusable, but becomes focusable before a frame, it should be focused.]
     expected:
-      if (os == "win") and not fission and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
-      if (os == "win") and fission: ["PASS", "FAIL"]
-      if os == "mac": ["PASS", "FAIL"]
+      if not debug and (os == "win") and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if not debug and (os == "win") and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if not debug and (os == "android") and not webrender: ["PASS", "FAIL"]
+      if not debug and (os == "win") and webrender: ["PASS", "FAIL"]
+      if not debug and (os == "linux") and not webrender: ["PASS", "FAIL"]
+      if not debug and (os == "mac"): ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html.ini firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/tables/table-valign-baseline-ascii-case-insensitive.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[table-valign-baseline-ascii-case-insensitive.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html.ini firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[fieldset-max-block-size.html]
+  expected:
+    if (os == "win") and not webrender: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html.ini firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,5 @@
 [iframe-scrolling-attribute-values.html]
   expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-    if (os == "win") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
-    if (os == "win") and not debug and webrender: ["PASS", "FAIL"]
-    if (os == "win") and debug: ["PASS", "FAIL"]
+    if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
+    if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
+    if (os == "win") and (processor == "x86_64"): ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/document-metadata/interactions-of-styling-and-scripting/conditionally-block-rendering-on-link-media-attr.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[conditionally-block-rendering-on-link-media-attr.html]
+  expected:
+    if (os == "android") and debug and not webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,2 @@
 implementation-status: backlog
 [autoplay-allowed-by-feature-policy-attribute.https.sub.html]
-  expected: ERROR
-  [Feature policy "autoplay" can be enabled in cross-origin iframe using allow="autoplay" attribute]
-    expected: TIMEOUT
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,5 @@
 implementation-status: backlog
 [autoplay-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html]
-  expected: ERROR
   [Feature-Policy allow="autoplay" disallows cross-origin navigation in an iframe.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,2 @@
 implementation-status: backlog
 [autoplay-allowed-by-feature-policy.https.sub.html]
-  expected: ERROR
-  [Feature-Policy header: autoplay * allows same-origin iframes.]
-    expected: TIMEOUT
-
-  [Feature-Policy header: autoplay * allows cross-origin iframes.]
-    expected: TIMEOUT
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,5 @@
 implementation-status: backlog
 [autoplay-default-feature-policy.https.sub.html]
-  expected: ERROR
-  [Default "autoplay" feature policy ["self"\] allows same-origin iframes.]
-    expected: TIMEOUT
-
   [Default "autoplay" feature policy ["self"\] disallows cross-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,8 @@
 implementation-status: backlog
 [autoplay-disabled-by-feature-policy.https.sub.html]
-  expected: ERROR
   [Feature-Policy header: autoplay "none" disallows same-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Feature-Policy header: autoplay "none" disallows cross-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_canplaythrough.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[event_canplaythrough.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_order_canplay_playing.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[event_order_canplay_playing.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/event_timeupdate_noautoplay.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,3 @@
 [event_timeupdate_noautoplay.html]
-  [calling play() on a sufficiently long audio should trigger timeupdate event]
-    expected:
-      if processor == "aarch64": ["PASS", "FAIL"]
-
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/readyState_initial.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/readyState_initial.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/readyState_initial.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/readyState_initial.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[readyState_initial.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-line-position.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[track-webvtt-line-position.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-webvtt-valign.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[track-webvtt-valign.html]
+  expected:
+    if (os == "linux") and debug and webrender and not fission: ["OK", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-change.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-change.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-change.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-change.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,9 @@
 [image-compositing-change.html]
   expected:
-    if not webrender and (os == "win") and not debug and (processor == "x86_64"): ["TIMEOUT", "PASS"]
-    if not webrender and (os == "win") and not debug and (processor == "x86"): ["PASS", "TIMEOUT"]
-    if not webrender and (os == "win") and debug: ["TIMEOUT", "PASS"]
-    if not webrender and (os == "android") and not debug: ["TIMEOUT", "PASS"]
+    if not webrender and (os == "win") and not debug and (processor == "x86"): ["TIMEOUT", "PASS"]
+    if not webrender and (os == "win") and not debug and (processor == "x86_64"): ["PASS", "TIMEOUT"]
     if not webrender and (os == "android") and debug: ["TIMEOUT", "PASS"]
-    if not webrender and (os == "mac"): ["TIMEOUT", "PASS"]
+    if not webrender and (os == "android") and not debug: ["PASS", "TIMEOUT"]
+    if not webrender and (os == "win") and debug: ["TIMEOUT", "PASS"]
+    if not webrender and (os == "mac"): TIMEOUT
     if not webrender and (os == "linux"): ["TIMEOUT", "PASS"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [image-compositing-large-scale-change.html]
   expected:
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
-    if (os == "android") and debug: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "win") and not webrender: FAIL
+    if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow-aspect-ratio.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [image-loading-lazy-slow-aspect-ratio.html]
   expected:
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT", "FAIL"]
     if (os == "android") and not debug and webrender: ["PASS", "FAIL", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT", "FAIL"]
     if (os == "android") and debug: ["PASS", "FAIL", "TIMEOUT"]
     [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-lazy-slow.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [image-loading-lazy-slow.html]
   expected:
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT", "FAIL"]
+    if (os == "android") and not debug and not webrender: ["PASS", "FAIL", "TIMEOUT"]
     if (os == "android") and not debug and webrender: ["PASS", "FAIL", "TIMEOUT"]
     if (os == "win") and (processor == "x86") and not debug: PASS
     if (os == "android") and debug: ["PASS", "FAIL", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/image-loading-subpixel-clip.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [image-loading-subpixel-clip.html]
   expected:
-    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "win") and webrender and debug: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-img-element/sizes/sizes-dynamic-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,5 @@
 [sizes-dynamic-001.html]
   expected:
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_absolute.htm.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,5 @@
 [video_dynamic_poster_absolute.htm]
   expected:
-    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_dynamic_poster_relative.htm.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,5 @@
 [video_dynamic_poster_relative.htm]
   expected:
-    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_initially_paused.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_initially_paused.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_initially_paused.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_initially_paused.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [video_initially_paused.html]
   expected:
     if (os == "android") and not debug and webrender: ["FAIL", "PASS", "TIMEOUT"]
-    if (os == "android") and not debug and not webrender: ["FAIL", "TIMEOUT", "PASS"]
+    if (os == "android") and not debug and not webrender: ["FAIL", "PASS", "TIMEOUT"]
     if (os == "android") and debug: ["FAIL", "PASS", "TIMEOUT"]
     FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video-poster-shown-preload-auto.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [video-poster-shown-preload-auto.html]
   expected:
-    if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
     if (os == "android") and not debug and not webrender: ["PASS", "TIMEOUT"]
+    if (os == "android") and not debug and webrender: ["PASS", "TIMEOUT"]
+    if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
     if (os == "android") and debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-rangeUnderflow.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[form-validation-validity-rangeUnderflow.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/constraints/input-number-validity-dynamic-value-no-change.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[input-number-validity-dynamic-value-no-change.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/form-submission-0/newline-normalization.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/form-submission-0/newline-normalization.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/form-submission-0/newline-normalization.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/form-submission-0/newline-normalization.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,19 @@
+[newline-normalization.html]
+  [Form newline normalization: \\n\\r in the name becomes \\r\\n\\r\\n]
+    expected: FAIL
+
+  [Form newline normalization: \\n in the name becomes \\r\\n]
+    expected: FAIL
+
+  [Form newline normalization: \\n\\r in the value becomes \\r\\n\\r\\n]
+    expected: FAIL
+
+  [Form newline normalization: \\r in the value becomes \\r\\n]
+    expected: FAIL
+
+  [Form newline normalization: \\r in the name becomes \\r\\n]
+    expected: FAIL
+
+  [Form newline normalization: \\n in the value becomes \\r\\n]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/input-change-event-properties.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,15 +1,21 @@
 [input-change-event-properties.html]
   expected:
-    if os == "android": ["OK", "ERROR"]
+    if (os == "android") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and debug and webrender: [OK, ERROR]
+    if (os == "android") and not debug: [OK, ERROR]
   [<select> pressing down arrow]
     expected:
-      if (os == "android") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and not debug and not webrender: ["FAIL", "PASS"]
-      if (os == "android") and debug: FAIL
+      if (os == "android") and not webrender and debug: FAIL
+      if (os == "android") and not webrender and not debug: [FAIL, PASS]
+      if (os == "android") and webrender and not debug: [PASS, FAIL]
+      if (os == "android") and webrender and debug: [FAIL, PASS]
       if os == "mac": FAIL
 
   [<textarea></textarea> typing]
     expected:
-      if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug: ["PASS", "FAIL"]
+      if os == "android": [PASS, FAIL]
+
+  [<input type="number"> typing]
+    expected:
+      if (os == "android") and debug: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/select-event.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,4 @@
 [select-event.html]
-  [textarea: select()]
-    expected: FAIL
-
   [textarea: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -20,9 +17,6 @@
   [textarea: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: select()]
-    expected: FAIL
-
   [input type text: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -41,9 +35,6 @@
   [input type text: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: select()]
-    expected: FAIL
-
   [input type search: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -62,9 +53,6 @@
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: select()]
-    expected: FAIL
-
   [input type tel: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -83,9 +71,6 @@
   [input type tel: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: select()]
-    expected: FAIL
-
   [input type url: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -104,9 +89,6 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: select()]
-    expected: FAIL
-
   [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
@@ -125,3 +107,57 @@
   [input type password: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
+  [textarea: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection-not-application-textarea.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection-not-application-textarea.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection-not-application-textarea.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/textfieldselection/selection-not-application-textarea.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[selection-not-application-textarea.html]
-  [text field selection for the input textarea]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-fieldset-element/HTMLFieldSetElement.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[HTMLFieldSetElement.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-form-element/form-nameditem.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-form-element/form-nameditem.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-form-element/form-nameditem.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-form-element/form-nameditem.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[form-nameditem.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-height.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-height.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-height.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-height.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[input-height.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-setcustomvalidity.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-setcustomvalidity.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-setcustomvalidity.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-setcustomvalidity.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[input-setcustomvalidity.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-valueasnumber.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-valueasnumber.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-valueasnumber.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/input-valueasnumber.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[input-valueasnumber.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/reset.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/reset.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/reset.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/reset.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,4 @@
 [reset.html]
   max-asserts: 3
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/selection-pointer.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/selection-pointer.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/selection-pointer.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-input-element/selection-pointer.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -22,5 +22,5 @@
 
   [Selecting texts across <input type=url> should not cancel selection]
     expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT", "NOTRUN"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/forms/the-label-element/proxy-click-to-associated-element.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,4 @@
 [proxy-click-to-associated-element.html]
   max-asserts: 22
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/contextmenu-historical.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/contextmenu-historical.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/contextmenu-historical.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/contextmenu-historical.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-[contextmenu-historical.html]
-  [HTMLMenuItemElement must not be not present]
-    expected: FAIL
-
-  [onshow must not be present on the GlobalEventHandlers locations]
-    expected: FAIL
-
-  [el.contextMenu must not be present]
-    expected: FAIL
-
-  [menu.type must not exist or reflect the content attribute]
-    expected: FAIL
-
-  [menu.label must not exist or reflect the content attribute]
-    expected: FAIL
-
-  [The user-agent stylesheet must leave type="context" menus as block display like other menus]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,4 @@
 [abspos-dialog-layout.html]
-  [Dialog should be recentered if showModal() is called after removing 'open'.]
-    expected: FAIL
-
   [Dialog should still be centered when removed, and re-added to the document.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/centering.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/centering.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/interactive-elements/the-dialog-element/centering.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[centering.html]
-  [vertical-rl: tall viewport]
-    expected: FAIL
-
-  [vertical-lr: tall viewport]
-    expected: FAIL
-
-  [horizontal-tb (container vertical-rl): tall viewport]
-    expected: FAIL
-
-  [vertical-rl (container horizontal-tb) (dialog vertical-rl): tall viewport]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,4 @@
 [target_blank_implicit_noopener_base.html]
   expected:
-    if (os == "android") and not debug: ["OK", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["OK", "TIMEOUT"]
+    if (os == "android") and not debug and webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.js.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/json-module/non-object.tentative.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -50,8 +50,6 @@
 
 
 [non-object.tentative.any.serviceworker.html]
-  expected:
-    if (os == "linux") and fission and not debug and not webrender: ["OK", "TIMEOUT"]
   [Non-object: null]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-1.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-1.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-1.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-1.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[evaluation-order-1.html]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1676612
+  prefs: [javascript.options.experimental.top_level_await:false]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-4-tla.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-4-tla.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-4-tla.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-order-4-tla.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
 [evaluation-order-4-tla.html]
+  prefs: [javascript.options.experimental.top_level_await:true]
   [Test evaluation order of modules]
     expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -5,7 +5,7 @@
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
+      if (os == "mac") and not debug: PASS
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-fetch-error-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [<script> error: Move fetch-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-parse-error-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [window error: Move parse-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
@@ -12,8 +12,8 @@
   [<script> load: Move parse-error external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [Eval: Move success external classic script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-createHTMLDocument-success-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [<script> load: Move success external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
@@ -12,8 +12,8 @@
   [Eval: Move success external module script to createHTMLDocument after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,19 +2,19 @@
   [<script> load: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: PASS
       if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
       FAIL
 
   [window error: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
@@ -24,10 +24,10 @@
   [<script> error: Move parse-error external classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: PASS
-      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
       if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
-      if (os == "mac") and not debug: FAIL
       if (os == "win") and not debug: FAIL
       if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "mac") and not debug: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -5,9 +5,9 @@
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["FAIL", "PASS"]
-      if (os == "win") and not debug: FAIL
-      if (os == "linux") and debug: ["PASS", "FAIL"]
       if (os == "mac") and not debug: FAIL
+      if (os == "linux") and debug: ["PASS", "FAIL"]
+      if (os == "win") and not debug: FAIL
 
   [window error: Move parse-error external module script to iframe after-prepare]
     expected:
@@ -15,19 +15,19 @@
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug: ["FAIL", "PASS"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
+      if (os == "linux") and debug: ["FAIL", "PASS"]
       FAIL
 
   [<script> load: Move parse-error external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
-      if (os == "win") and not debug: PASS
       if (os == "linux") and debug: ["FAIL", "PASS"]
+      if (os == "win") and not debug: PASS
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-parse-error-inline-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [window error: Move parse-error inline classic script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -16,8 +16,8 @@
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
       if (os == "win") and not debug: PASS
+      if (os == "linux") and debug: ["FAIL", "PASS"]
       FAIL
 
   [Eval: Move success external classic script to iframe after-prepare]
@@ -27,7 +27,7 @@
       if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
-      if (os == "linux") and debug: ["FAIL", "PASS"]
       if (os == "win") and not debug: PASS
+      if (os == "linux") and debug: ["FAIL", "PASS"]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/after-prepare-iframe-success-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [<script> load: Move success external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and not debug: PASS
       if (os == "win") and not debug: PASS
@@ -13,11 +13,11 @@
   [Eval: Move success external module script to iframe after-prepare]
     expected:
       if (os == "win") and ccov: FAIL
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "linux") and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug: ["FAIL", "PASS"]
       if (os == "mac") and not debug: PASS
+      if (os == "linux") and debug: ["FAIL", "PASS"]
       if (os == "win") and not debug: PASS
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-fetch-error-external-classic.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,10 +3,11 @@
     if (os == "win") and debug and webrender: ["OK", "ERROR"]
   [<script> error: Move fetch-error external classic script to iframe before-prepare]
     expected:
+      if (os == "linux") and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "win") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and webrender: ["PASS", "FAIL"]
       if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and webrender: ["PASS", "FAIL"]
 
   [Eval: Move fetch-error external classic script to iframe before-prepare]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/moving-between-documents/before-prepare-iframe-parse-error-external-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,9 +3,11 @@
     if (os == "win") and debug and webrender: ["OK", "ERROR"]
   [<script> error: Move parse-error external module script to iframe before-prepare]
     expected:
+      if (os == "linux") and not fission and debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not fission and debug and not webrender: ["PASS", "FAIL"]
       if (os == "win") and debug and webrender: ["PASS", "NOTRUN"]
+      if (os == "linux") and not fission and not debug: ["PASS", "FAIL"]
       if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "linux") and not fission: ["PASS", "FAIL"]
 
   [<script> load: Move parse-error external module script to iframe before-prepare]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/user-activation/no-activation-thru-escape-key.html.ini firefox-85.0+build1/testing/web-platform/meta/html/user-activation/no-activation-thru-escape-key.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/user-activation/no-activation-thru-escape-key.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/user-activation/no-activation-thru-escape-key.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[no-activation-thru-escape-key.html]
+  ['Escape' key doesn't activate a page.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/050.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/050.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/050.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/050.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[050.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[module-delayed.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-dynamic-import.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,5 @@
 [module-dynamic-import.html]
+  prefs: [javascript.options.experimental.top_level_await:true]
   [document.write in an imported module]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,9 @@
 [module-tla-delayed.html]
-  expected: TIMEOUT
+  prefs: [javascript.options.experimental.top_level_await:true]
+  expected:
+    if release_or_beta: TIMEOUT
+    OK
   [document.write in an imported module]
-    expected: TIMEOUT
-
+    expected:
+      if release_or_beta: TIMEOUT
+      PASS
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-immediate-promise.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,11 @@
 [module-tla-immediate-promise.html]
-  expected: TIMEOUT
+  prefs: [javascript.options.experimental.top_level_await:true]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1678052
+  expected:
+    if release_or_beta: TIMEOUT
+    [OK, FAIL]
   [document.write in an imported module]
-    expected: TIMEOUT
+    expected:
+      if release_or_beta: TIMEOUT
+      [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/dynamic-markup-insertion/document-write/module-tla-import.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,11 @@
 [module-tla-import.html]
-  expected: TIMEOUT
+  prefs: [javascript.options.experimental.top_level_await:true]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1678052
+  expected:
+    if release_or_beta: TIMEOUT
+    [OK, FAIL]
   [document.write in an imported module]
-    expected: TIMEOUT
+    expected:
+      if release_or_beta: TIMEOUT
+      [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html.ini firefox-85.0+build1/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,19 @@
+[navigator-window-controls-overlay.html]
+  [getBoundingClientRect should be a method of the windowControlsOverlay object]
+    expected: FAIL
+
+  [visible should be false]
+    expected: FAIL
+
+  [getBoundingClientRect return type should be DOMRect]
+    expected: FAIL
+
+  [visible should be a member of the windowControlsOverlay object]
+    expected: FAIL
+
+  [the windowControlsOverlay object should exist on the navigator object]
+    expected: FAIL
+
+  [getBoundingClientRect should return a empty DOMRect]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/import-maps/data-driven/resolving.https.html.ini firefox-85.0+build1/testing/web-platform/meta/import-maps/data-driven/resolving.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/import-maps/data-driven/resolving.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/import-maps/data-driven/resolving.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -116,9 +116,6 @@
   [Relative URL scope keys: An empty string scope is a scope with import map base URL: a]
     expected: FAIL
 
-  [URL-like specifiers: Ordinal URL-like specifiers: https://example.com/dotdotrelative/foo.mjs]
-    expected: FAIL
-
   [Package-like scenarios: Fallback to toplevel or not, depending on trailing slash match: moment]
     expected: FAIL
 
@@ -161,12 +158,6 @@
   [Package-like scenarios: package names that end in a slash should just pass through: moment/]
     expected: FAIL
 
-  [URL-like specifiers: Ordinal URL-like specifiers: https://example.com/lib/foo.mjs]
-    expected: FAIL
-
-  [URL-like specifiers: Ordinal URL-like specifiers: https://example.com/app/dotrelative/foo.mjs]
-    expected: FAIL
-
   [Exact vs. prefix based matching: Scopes with and without trailing slash: Subpath base URL (prefix match): moment/foo]
     expected: FAIL
 
@@ -185,9 +176,6 @@
   [Package-like scenarios: Base URLs outside a scope shouldn't use the scope even if the scope has matching keys: lodash-dotdot]
     expected: FAIL
 
-  [URL-like specifiers: Ordinal URL-like specifiers: https://///example.com/lib/foo.mjs]
-    expected: FAIL
-
   [Package-like scenarios: package submodules: lodash-dotdot/foo]
     expected: FAIL
 
@@ -221,21 +209,12 @@
   [Relative URL scope keys: './' scope is a scope with import map base URL's directory: a]
     expected: FAIL
 
-  [URL-like specifiers: Ordinal URL-like specifiers: ../app/dotrelative/foo.mjs]
-    expected: FAIL
-
   [Exact vs. prefix based matching: Scopes with and without trailing slash: Non-trailing-slash base URL (exact match): moment/foo]
     expected: FAIL
 
   [Entries with errors shouldn't allow fallback: No fallback to less-specific prefixes: prefix-resolution-error/x]
     expected: FAIL
 
-  [URL-like specifiers: Ordinal URL-like specifiers: /lib/foo.mjs]
-    expected: FAIL
-
-  [URL-like specifiers: Ordinal URL-like specifiers: ../dotdotrelative/foo.mjs]
-    expected: FAIL
-
   [URL-like specifiers: Import map entries just composed from / and .: ../app/]
     expected: FAIL
 
@@ -278,3 +257,54 @@
   [Fallback to toplevel and between scopes: should use a direct scope override: d]
     expected: FAIL
 
+  [URL-like specifiers: Ordinary URL-like specifiers: /lib/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: https://example.com/lib/foo.mjs]
+    expected: FAIL
+
+  [Package-like scenarios: backtracking via ..: mapped/path/]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (absolute URLs): https://example.com/test/../../backtrack]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (absolute URLs): https://example.com/test/..]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: https://example.com/app/dotrelative/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: https://///example.com/lib/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: https://example.com/dotdotrelative/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (relative URLs): /test/..]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: ../app/dotrelative/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: Ordinary URL-like specifiers: ../dotdotrelative/foo.mjs]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (relative URLs): /test/../../backtrack]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (absolute URLs): https://example.com/test/../backtrack]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (relative URLs): /test/../../../backtrack]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (absolute URLs): https://example.com/test/../../../backtrack]
+    expected: FAIL
+
+  [Package-like scenarios: backtracking via ..: mapped/path]
+    expected: FAIL
+
+  [URL-like specifiers: backtracking (relative URLs): /test/../backtrack]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/import-maps/data-driven/resolving-internal.https.html.ini firefox-85.0+build1/testing/web-platform/meta/import-maps/data-driven/resolving-internal.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/import-maps/data-driven/resolving-internal.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/import-maps/data-driven/resolving-internal.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -14,3 +14,66 @@
   [non-fetch scheme absolute URLs: javascript:non-fetch-scheme]
     expected: FAIL
 
+  [URL-like specifiers: Non-special vs. special schemes: data:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: about:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: blob:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: http:text/foo]
+    expected: FAIL
+
+  [non-fetch scheme absolute URLs: about:fetch-scheme]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: file:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: wss:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: wss:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: about:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: ftp:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: http:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: ftp:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: blob:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: ws:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: blah:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: https:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: file:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: ws:text/foo]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: data:text/javascript,console.log('foo')]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: blah:text/]
+    expected: FAIL
+
+  [URL-like specifiers: Non-special vs. special schemes: https:text/]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/inert/inert-retargeting-iframe.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/inert/inert-retargeting-iframe.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/inert/inert-retargeting-iframe.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/inert/inert-retargeting-iframe.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,8 @@
 [inert-retargeting-iframe.tentative.html]
   expected:
-    if os == "android": OK
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
+    if (os == "android") and debug and not webrender: OK
+    if (os == "android") and not debug: OK
     if os == "win": OK
     ERROR
   [Tests that any mouse event on an inert element is targeted to the nearest non-inert ancestor at the same coordinates]
@@ -10,7 +12,8 @@
     disabled:
       if webrender and debug and (os == "linux"): wpt-sync Bug 1564668
     expected:
-      if (os == "win"): ["PASS", "FAIL"]
+      if os == "android": PASS
+      [PASS, FAIL]
 
   [Tests that any pointer event on an inert element is targeted to the nearest non-inert ancestor at the same coordinates]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/inert/inert-retargeting.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/inert/inert-retargeting.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/inert/inert-retargeting.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/inert/inert-retargeting.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,7 @@
 [inert-retargeting.tentative.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and debug and not webrender: ["ERROR", "TIMEOUT"]
+    ERROR
   [Tests that any mouse event on an inert element is targeted to the nearest non-inert ancestor at the same coordinates]
     expected: FAIL
 
@@ -11,6 +13,5 @@
 
   [Tests that any mouse event on a non-inert element is correctly targeted to that element]
     expected:
-      if not fission and (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
-      if fission and (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/infrastructure/testdriver/actions/mouseClickCount.html.ini firefox-85.0+build1/testing/web-platform/meta/infrastructure/testdriver/actions/mouseClickCount.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/infrastructure/testdriver/actions/mouseClickCount.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/infrastructure/testdriver/actions/mouseClickCount.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[mouseClickCount.html]
+  [TestDriver actions: test the mouse click counts at different cases]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/input-events/input-events-get-target-ranges.html.ini firefox-85.0+build1/testing/web-platform/meta/input-events/input-events-get-target-ranges.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/input-events/input-events-get-target-ranges.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/input-events/input-events-get-target-ranges.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,17 @@
+[input-events-get-target-ranges.html]
+  expected: TIMEOUT
+  [Textarea should have empty target range.]
+    expected: NOTRUN
+
+  [Actions other than deletion should have current selection as target ranges.]
+    expected:
+      if os == "mac": NOTRUN
+      if os == "linux": NOTRUN
+      TIMEOUT
+
+  [getTargetRanges() returns correct range and cleared after dispatch.]
+    expected:
+      if os == "mac": TIMEOUT
+      if os == "linux": TIMEOUT
+      FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/intersection-observer/timestamp.html.ini firefox-85.0+build1/testing/web-platform/meta/intersection-observer/timestamp.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/intersection-observer/timestamp.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/intersection-observer/timestamp.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,5 @@
 prefs: [privacy.reduceTimerPrecision:false]
 [timestamp.html]
   [Generate notifications.]
-    expected:
-      if (os == "linux") and (processor == "x86_64") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and (processor == "x86_64") and not debug and not webrender: ["PASS", "FAIL"]
-      if (os == "linux") and (processor == "x86"): ["PASS", "FAIL"]
+    expected: [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js.ini firefox-85.0+build1/testing/web-platform/meta/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/js/builtins/weakrefs/finalizationregistry-cleanupCallback-gets-a-microtask.optional.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -8,14 +8,11 @@
     expected:
       if (os == "win") and ccov: [FAIL, PASS]
       if (os == "linux") and not fission and webrender and debug: ["FAIL", "PASS"]
+      if (os == "linux") and not fission and not webrender: ["FAIL", "PASS"]
       if (os == "linux") and fission and debug: PASS
       if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
-      if (os == "linux") and not fission and not webrender: ["FAIL", "PASS"]
-      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "android") and debug and webrender: ["FAIL", "PASS"]
-      if (os == "android") and debug and not webrender: PASS
-      if (os == "android") and not debug and not webrender: ["PASS", "FAIL"]
-      if (os == "android") and not debug and webrender: PASS
+      if (os == "win") and debug and webrender: ["FAIL", "PASS"]
       if (os == "mac") and debug: PASS
+      if os == "android": ["PASS", "FAIL"]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/largest-contentful-paint/placeholder-image.html.ini firefox-85.0+build1/testing/web-platform/meta/largest-contentful-paint/placeholder-image.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/largest-contentful-paint/placeholder-image.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/largest-contentful-paint/placeholder-image.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[placeholder-image.html]
+  [Largest Contentful Paint: changing src causes a new entry to be dispatched.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-offscreen.html.ini firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-offscreen.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-offscreen.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-offscreen.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[content-visibility-auto-offscreen.html]
+  [off-screen content-visibility:auto]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-onscreen.html.ini firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-onscreen.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-onscreen.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-onscreen.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[content-visibility-auto-onscreen.html]
+  [on-screen content-visibility:auto]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-auto-resize.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[content-visibility-auto-resize.html]
+  [off-screen content-visibility:auto]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-hidden.html.ini firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-hidden.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/layout-instability/content-visibility-hidden.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/layout-instability/content-visibility-hidden.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[content-visibility-hidden.html]
+  [on-screen content-visibility:auto]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/crashtests/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/mathml/crashtests/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/crashtests/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/crashtests/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1 @@
+leak-threshold: [default:51200]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/crashtests/multicol-on-token-elements.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/crashtests/multicol-on-token-elements.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/crashtests/multicol-on-token-elements.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/crashtests/multicol-on-token-elements.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[multicol-on-token-elements.html]
+  expected:
+    if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,3 @@
 [frac-bar-001.html]
   expected:
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not webrender and (os == "win"): FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-001.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,7 @@
 [operator-dictionary-spacing-001.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["FAIL", "PASS"]
-      if os == "android": ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [Operator dictionary chunk 3 - lspace/rspace]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-002.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,13 @@
 [operator-dictionary-spacing-002.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
-      if os == "android": ["FAIL", "PASS"]
+      if debug and (os == "linux") and not fission and webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and not fission and not webrender: ["FAIL", "PASS"]
+      if debug and (os == "mac"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [Operator dictionary chunk 3 - lspace/rspace]
-    expected: [PASS, FAIL]
+    expected:
+      if (os == "mac") and debug: ["FAIL", "PASS"]
+      [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-003.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,12 +1,10 @@
 [operator-dictionary-spacing-003.html]
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if os == "mac": ["PASS", "FAIL"]
 
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if debug and (os == "linux") and webrender and not fission: ["FAIL", "PASS"]
-      if debug and (os == "mac"): ["FAIL", "PASS"]
+      if (os == "linux") and debug and webrender and not fission: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-004.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,14 +4,14 @@
       if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1668892
     expected:
       if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["PASS", "FAIL"]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
 
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and debug and webrender and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
-      if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not fission and not webrender: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not fission and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and debug and fission: ["PASS", "FAIL"]
       if (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-005.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [operator-dictionary-spacing-005.html]
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and not fission and (processor == "x86_64") and debug and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and webrender and debug and not fission: ["FAIL", "PASS"]
       [PASS, FAIL]
 
   [Operator dictionary chunk 1 - lspace/rspace]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/presentation-markup/operators/operator-dictionary-spacing-006.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,19 +1,22 @@
 [operator-dictionary-spacing-006.html]
   [Operator dictionary chunk 3 - lspace/rspace]
     expected:
-      if (os == "linux") and (processor == "x86_64") and debug and webrender and not fission: ["PASS", "FAIL"]
-      if (os == "linux") and (processor == "x86_64") and debug and webrender and fission: ["PASS", "FAIL"]
-      if (os == "linux") and (processor == "x86_64") and debug and not webrender: ["FAIL", "PASS"]
-      if (os == "linux") and (processor == "x86_64") and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and webrender and not fission: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and webrender and fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not fission and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not fission and not webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and debug and fission: ["PASS", "FAIL"]
       if (os == "mac") and debug: ["FAIL", "PASS"]
       if (os == "mac") and not debug: ["PASS", "FAIL"]
-      if (os == "linux") and (processor == "x86"): ["PASS", "FAIL"]
 
   [Operator dictionary chunk 1 - lspace/rspace]
     expected:
-      if debug and (os == "win") and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
-      if debug and (os == "linux") and not webrender: ["FAIL", "PASS"]
-      if debug and (os == "win") and webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and not fission and not webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and not fission and webrender: ["FAIL", "PASS"]
+      if not debug and (os == "linux") and webrender and not fission: ["FAIL", "PASS"]
+      if debug and (os == "win") and (processor == "x86"): ["FAIL", "PASS"]
+      if debug and (os == "win") and (processor == "x86_64"): ["FAIL", "PASS"]
       if debug and (os == "mac"): ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/relations/css-styling/not-participating-to-parent-layout.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/relations/css-styling/not-participating-to-parent-layout.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/relations/css-styling/not-participating-to-parent-layout.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/relations/css-styling/not-participating-to-parent-layout.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -120,17 +120,27 @@
     expected: FAIL
 
   [ms layout is not affected by children with "position: fixed" style]
-    expected: FAIL
+    expected:
+      if os == "mac": ["FAIL", "PASS"]
+      FAIL
 
   [mn layout is not affected by children with "position: fixed" style]
-    expected: FAIL
+    expected:
+      if os == "mac": ["FAIL", "PASS"]
+      FAIL
 
   [mtext layout is not affected by children with "position: fixed" style]
-    expected: FAIL
+    expected:
+      if os == "mac": ["FAIL", "PASS"]
+      FAIL
 
   [mo layout is not affected by children with "position: fixed" style]
-    expected: FAIL
+    expected:
+      if os == "mac": ["FAIL", "PASS"]
+      FAIL
 
   [mi layout is not affected by children with "position: fixed" style]
-    expected: FAIL
+    expected:
+      if os == "mac": ["FAIL", "PASS"]
+      FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mathml/relations/html5-tree/tabindex-002.html.ini firefox-85.0+build1/testing/web-platform/meta/mathml/relations/html5-tree/tabindex-002.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mathml/relations/html5-tree/tabindex-002.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mathml/relations/html5-tree/tabindex-002.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[tabindex-002.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/detached.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/detached.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/detached.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/detached.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,7 @@
+[detached.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+    TIMEOUT
+  [performance.measureMemory URLs within a cross-site iframe.]
+    expected: TIMEOUT
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/detached.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/detached.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/detached.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/detached.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[detached.tentative.window.html]
-  [performance.measureMemory URLs within a cross-site iframe.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/idlharness.tentative.any.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/idlharness.tentative.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/idlharness.tentative.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/idlharness.tentative.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,19 @@
+[idlharness.tentative.any.sharedworker.html]
+  [Performance interface: operation measureMemory()]
+    expected: FAIL
+
+
+[idlharness.tentative.any.worker.html]
+  [Performance interface: operation measureMemory()]
+    expected: FAIL
+
+
+[idlharness.tentative.any.serviceworker.html]
+  [Performance interface: operation measureMemory()]
+    expected: FAIL
+
+
+[idlharness.tentative.any.html]
+  [Performance interface: operation measureMemory()]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[iframe.cross-origin.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory URLs within a cross-origin iframe.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-origin.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[iframe.cross-origin.tentative.window.html]
-  [performance.measureMemory URLs within a cross-origin iframe.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[iframe.cross-site.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory URLs within a cross-site iframe.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.cross-site.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[iframe.cross-site.tentative.window.html]
-  [performance.measureMemory URLs within a cross-site iframe.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[iframe.same-origin.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [Well-formed result of performance.measureMemory with same-origin iframes.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.window.js.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/iframe.same-origin.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[iframe.same-origin.tentative.window.html]
-  [Well-formed result of performance.measureMemory with same-origin iframes.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[main-frame-and-worker.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [Well-formed result of performance.measureMemory.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame-and-worker.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[main-frame-and-worker.tentative.window.html]
-  [Well-formed result of performance.measureMemory.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[main-frame.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [Well-formed result of performance.measureMemory.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/main-frame.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[main-frame.tentative.window.html]
-  [Well-formed result of performance.measureMemory.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[redirect.client.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory does not leak client redirected URL.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.client.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[redirect.client.tentative.window.html]
-  [performance.measureMemory does not leak client redirected URL.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[redirect.server.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory does not leak server redirected URL.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/redirect.server.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[redirect.server.tentative.window.html]
-  [performance.measureMemory does not leak server redirected URL.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[window-open.cross-origin.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory does not leak URL of cross-origin window.open.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-origin.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[window-open.cross-origin.tentative.window.html]
-  [performance.measureMemory does not leak URL of cross-origin window.open.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[window-open.cross-site.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [performance.measureMemory does not leak URL of cross-site window.open.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.cross-site.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[window-open.cross-site.tentative.window.html]
-  [performance.measureMemory does not leak URL of cross-site window.open.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,7 @@
+[window-open.mix.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+    TIMEOUT
+  [performance.measureMemory does not leak URLs in cross-origin iframes and windows.]
+    expected: TIMEOUT
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.mix.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[window-open.mix.tentative.window.html]
-  [performance.measureMemory does not leak URLs in cross-origin iframes and windows.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[window-open.same-origin.tentative.https.window.html]
+  expected:
+    if os == "android": ERROR
+  [Well-formed result of performance.measureMemory with same-origin window.open.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.window.js.ini firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/measure-memory/window-open.same-origin.tentative.window.js.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[window-open.same-origin.tentative.window.html]
-  [Well-formed result of performance.measureMemory with same-origin window.open.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-fromelement/creation.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-fromelement/creation.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-fromelement/creation.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-fromelement/creation.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [creation.html]
   expected:
-    if (os == "linux") and webrender and not debug: ["OK", "CRASH"]
+    if (os == "linux") and webrender and not debug: [OK, CRASH]
   [creation]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-image/MediaStreamTrack-clone.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-image/MediaStreamTrack-clone.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-image/MediaStreamTrack-clone.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-image/MediaStreamTrack-clone.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,11 @@
+[MediaStreamTrack-clone.https.html]
+  expected: ERROR
+  [checks MediaStreamTrack.clone() gets same settings]
+    expected: FAIL
+
+  [checks MediaStreamTrack.clone() gets same applied constraints]
+    expected: FAIL
+
+  [checks MediaStreamTrack.clone() gets same capabilities]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,3 @@
 prefs: [media.navigator.permission.disabled:true, media.navigator.streams.fake:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true]
 lsan-allowed: [NewSegment, mozilla::layers::BufferTextureData::CreateInternal]
+leak-threshold: [default:3020800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-bitrate.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[MediaRecorder-bitrate.https.html]
+  expected:
+    if (os == "linux") and not fission and (processor == "x86_64") and debug and webrender: [OK, ERROR]
+    if (os == "linux") and not fission and (processor == "x86_64") and not debug and not webrender: [OK, ERROR]
+    if (os == "linux") and fission and not debug: [OK, ERROR, CRASH]
+    if (os == "android") and debug: OK
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[MediaRecorder-creation.https.html]
+  expected:
+    if (os == "linux") and webrender and debug and fission: ["OK", "CRASH"]
+    if (os == "linux") and webrender and debug and not fission: ["OK", "CRASH"]
+    if (os == "linux") and webrender and not debug and not fission: ["OK", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-destroy-script-execution.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-destroy-script-execution.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-destroy-script-execution.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-destroy-script-execution.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[MediaRecorder-destroy-script-execution.html]
+  expected:
+    if (os == "linux") and debug and webrender and not fission: ["OK", "ERROR", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-detached-context.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-detached-context.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-detached-context.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-detached-context.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,8 @@
 [MediaRecorder-detached-context.html]
+  expected:
+    if (os == "linux") and debug and webrender and not fission: ["OK", "ERROR"]
+    if (os == "linux") and not debug and webrender and not fission: ["OK", "CRASH"]
+    if (os == "linux") and debug and not webrender: ["OK", "ERROR", "CRASH"]
   [MediaRecorder creation with detached context]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-disabled-tracks.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[MediaRecorder-disabled-tracks.https.html]
+  expected:
+    if (os == "linux") and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not webrender: [OK, ERROR, CRASH]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-mimetype.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,27 +1,29 @@
 [MediaRecorder-mimetype.html]
   expected:
-    if webrender and (os == "win") and not debug: ["OK", "TIMEOUT"]
+    if (os == "win") and webrender and not debug: [OK, TIMEOUT]
+    if (os == "linux") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not webrender: [OK, ERROR, CRASH]
   [MediaRecorder doesn't fire 'onstart' multiple times for video]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder doesn't fire 'onstart' multiple times for audio/video]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder formats mimeType well after 'start' for audio]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder doesn't fire 'onstart' multiple times for audio]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, TIMEOUT]
 
   [MediaRecorder formats mimeType well after 'start' for audio/video]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
   [MediaRecorder formats mimeType well after 'start' for video]
     expected:
-      if webrender and not fission and (os == "win") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-no-sink.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-[MediaRecorder-no-sink.https.html]
-  expected:
-    if release_or_beta and (os == "android"): [OK, TIMEOUT]
-    if os == "android" and nightly_build: TIMEOUT
-  [PeerConnection MediaRecorder records video from PeerConnection without sinks]
-    expected:
-      if release_or_beta and (os == "android"): [PASS, TIMEOUT]
-      if os == "android" and nightly_build: TIMEOUT
-
-  [PeerConnection MediaRecorder records audio/video from PeerConnection without sinks]
-    expected:
-      if release_or_beta and (os == "android"): [PASS, NOTRUN]
-      if os == "android" and nightly_build: NOTRUN
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,86 +1,70 @@
 [MediaRecorder-peerconnection.https.html]
   expected:
-    if (os == "android") and nightly_build: ["TIMEOUT", "CRASH", "ERROR"]
-
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format \[passthrough\].]
-    expected:
-      if os == "android" and nightly_build: TIMEOUT
-
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format \[passthrough\].]
-    expected:
-      if os == "android" and nightly_build: NOTRUN
-
-  [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format \[passthrough\].]
-    expected:
-      if os == "android" and nightly_build: NOTRUN
-
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format \[passthrough\].]
-    expected:
-      if os == "android" and nightly_build: NOTRUN
-
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format \[passthrough\].]
+    if (os == "linux") and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not webrender: [OK, ERROR, CRASH]
+    if (os == "android") and nightly_build: [TIMEOUT, ERROR, CRASH]
+  [PeerConnection MediaRecorder receives data after onstart, {"video":{}} mimeType ""]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
+      if (os == "android") and nightly_build: TIMEOUT
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format \[passthrough\].]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"video":{}} mimeType ""]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder receives data after onstart, {"audio":{}} mimeType ""]
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"audio":{}} mimeType ""]
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder receives data after onstart, {"video":{},"audio":{}} mimeType ""]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"video":{},"audio":{}} mimeType ""]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder receives data after onstart, {"audio":{}} mimeType "audio/webm;codecs=opus"]
     expected:
-      if os == "android" and nightly_build: NOTRUN
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp8.]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"audio":{}} mimeType "audio/webm;codecs=opus"]
     expected:
-      if os == "android" and nightly_build: NOTRUN
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":false,"audio":true} with format video/webm;codecs=vp9.]
+  [PeerConnection MediaRecorder receives data after onstart, {"video":{}} mimeType "video/webm;codecs=vp8"]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":false,"audio":true} with format video/webm;codecs=vp9.]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"video":{}} mimeType "video/webm;codecs=vp8"]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":false} with format video/webm;codecs=vp9.]
+  [PeerConnection MediaRecorder receives data after onstart, {"video":{},"audio":{}} mimeType "video/webm;codecs=vp8,opus"]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":false} with format video/webm;codecs=vp9.]
+  [PeerConnection MediaRecorder gets ondata on stopping tracks, {"video":{},"audio":{}} mimeType "video/webm;codecs=vp8,opus"]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder receives data after onstart, {"video":true,"audio":true} with format video/webm;codecs=vp9.]
+  [MediaRecorder constructor throws on no support, {"video":{}} mimeType "video/webm;codecs=vp9"]
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
-  [PeerConnection MediaRecorder gets ondata on stopping recorded tracks {"video":true,"audio":true} with format video/webm;codecs=vp9.]
+  [MediaRecorder constructor throws on no support, {"video":{},"audio":{}} mimeType "video/webm;codecs=vp9,opus"]
     expected:
-      if os == "android" and nightly_build: NOTRUN
-      FAIL
+      if (os == "android") and nightly_build: NOTRUN
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,9 @@
+[MediaRecorder-peerconnection-no-sink.https.html]
+  expected:
+    if (os == "linux") and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not webrender: [OK, ERROR]
+    if (os == "android") and nightly_build: TIMEOUT
+  [MediaRecorder records from PeerConnection without sinks, {"video":{}}]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-record/MediaRecorder-stop.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[MediaRecorder-stop.html]
+  expected:
+    if (os == "linux") and webrender and fission: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and webrender and not fission: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and not webrender: ["OK", "ERROR", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-streams/GUM-deny.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-streams/GUM-deny.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-streams/GUM-deny.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-streams/GUM-deny.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,2 @@
 [GUM-deny.https.html]
-  prefs: [media.navigator.permission.disabled:false,media.getusermedia.camera.deny:true]
+  prefs: [media.navigator.permission.disabled:false, media.getusermedia.camera.deny:true]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-streams/idlharness.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/mediacapture-streams/idlharness.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mediacapture-streams/idlharness.https.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mediacapture-streams/idlharness.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -53,3 +53,33 @@
   [Stringification of audioinput]
     expected: FAIL
 
+  [OverconstrainedError interface: attribute constraint]
+    expected: FAIL
+
+  [OverconstrainedError must be primary interface of new OverconstrainedError("constraint")]
+    expected: FAIL
+
+  [Stringification of new OverconstrainedError("constraint")]
+    expected: FAIL
+
+  [OverconstrainedError interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [OverconstrainedError interface object length]
+    expected: FAIL
+
+  [OverconstrainedError interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [OverconstrainedError interface: new OverconstrainedError("constraint") must inherit property "constraint" with the proper type]
+    expected: FAIL
+
+  [OverconstrainedError interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [OverconstrainedError interface: existence and properties of interface object]
+    expected: FAIL
+
+  [OverconstrainedError interface object name]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/merchant-validation/constructortentative..http.html.ini firefox-85.0+build1/testing/web-platform/meta/merchant-validation/constructortentative..http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/merchant-validation/constructortentative..http.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/merchant-validation/constructortentative..http.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[constructortentative..http.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini firefox-85.0+build1/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mimesniff/mime-types/charset-parameter.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,11 +1,9 @@
 [charset-parameter.window.html]
   expected:
-    if (processor == "x86_64") and not debug and (os == "win") and webrender and fission: ["OK", "TIMEOUT"]
-    if (processor == "x86_64") and not debug and (os == "linux") and not webrender: ["OK", "TIMEOUT"]
-    if (processor == "x86_64") and not debug and (os == "win") and not webrender: ["OK", "TIMEOUT"]
-    if (processor == "x86") and (os == "win") and debug: ["OK", "TIMEOUT"]
-    if (processor == "x86") and (os == "win") and not debug: ["OK", "TIMEOUT"]
-    if (processor == "x86") and (os == "linux"): ["OK", "TIMEOUT"]
+    if (processor == "x86_64") and not debug and (os == "win") and webrender and fission: [OK, TIMEOUT]
+    if (processor == "x86_64") and not debug and (os == "win") and not webrender: [OK, TIMEOUT]
+    if (processor == "x86_64") and not debug and (os == "linux") and not webrender: [OK, TIMEOUT]
+    if processor == "x86": [OK, TIMEOUT]
   [text/html;charset=gbk(]
     expected: FAIL
 
@@ -32,23 +30,23 @@
 
   [text/html;charset=\x0cgbk]
     expected:
-      if not webrender and (os == "win") and debug and (processor == "x86"): ["FAIL", "TIMEOUT"]
-      if not webrender and (os == "linux") and not debug: ["FAIL", "TIMEOUT"]
+      if not webrender and (os == "win") and debug and (processor == "x86"): [FAIL, TIMEOUT]
+      if not webrender and (os == "linux") and not debug: [FAIL, TIMEOUT]
       FAIL
 
   [text/html;charset="gbk"]
     expected:
-      if (processor == "x86") and not debug: ["PASS", "TIMEOUT"]
+      if (processor == "x86") and not debug: [PASS, TIMEOUT]
 
   [text/html;charset='gbk]
     expected:
-      if fission and (os == "win"): ["PASS", "TIMEOUT"]
+      if fission and (os == "win"): [PASS, TIMEOUT]
 
   [text/html;test;charset=gbk]
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "TIMEOUT"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, TIMEOUT]
 
   [text/html;;;;charset=gbk]
     expected:
-      if (processor == "x86") and (os == "win") and not debug: ["PASS", "TIMEOUT"]
+      if (processor == "x86") and not debug: [PASS, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/sharedworker-import.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [sharedworker-import.https.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "ERROR"]
   [Mixed-Content: Expects allowed for sharedworker-import to same-https origin and no-redirect redirection from https context.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini firefox-85.0+build1/testing/web-platform/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mixed-content/gen/top.meta/unset/fetch.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[fetch.https.html]
+  [Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context.]
+    expected:
+      if (os == "android") and debug and webrender: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/audio-upgrade.https.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,13 @@
 [audio-upgrade.https.sub.html]
   expected:
-    if (os == "android") and not debug: ["OK", "TIMEOUT"]
+    if (os == "linux") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
+    if (os == "win") and (processor == "x86") and debug: ["OK", "TIMEOUT"]
+    if (os == "win") and (processor == "x86") and not debug: ["OK", "TIMEOUT"]
+    if os == "android": ["OK", "TIMEOUT"]
   [Audio autoupgraded]
     expected:
-      if (os == "android") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "linux") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
+      if (os == "win") and (processor == "x86") and debug: ["PASS", "TIMEOUT"]
+      if (os == "win") and (processor == "x86") and not debug: ["PASS", "TIMEOUT"]
+      if os == "android": ["PASS", "TIMEOUT"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mixed-content/tentative/autoupgrades/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1 @@
-prefs: [security.mixed_content.upgrade_display_content:true]
\ No newline at end of file
+prefs: [security.mixed_content.upgrade_display_content:true]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/mozilla-sync firefox-85.0+build1/testing/web-platform/meta/mozilla-sync
--- firefox-84.0.2+build1/testing/web-platform/meta/mozilla-sync	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/mozilla-sync	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1 @@
-local: c1be28b9a5b779d788d11fe9458fe8608b68dee9
-upstream: 8ac9c3e6d5275922760b01889aac6be48b69fbdd
+upstream: b464d69274950c7707855c0b29729d58b9a8d492
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/native-file-system/showPicker-errors.https.window.js.ini firefox-85.0+build1/testing/web-platform/meta/native-file-system/showPicker-errors.https.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/native-file-system/showPicker-errors.https.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/native-file-system/showPicker-errors.https.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -62,9 +62,123 @@
   [showOpenFilePicker: File picker requires at least one accepted type.]
     expected: FAIL
 
-  [showOpenFilePicker: extension has to start with ".".]
+  [showOpenFilePicker: invalid extension ".{txt}". illegal characters "{" and "}".]
     expected: FAIL
 
-  [showSaveFilePicker: extension has to start with ".".]
+  [showOpenFilePicker: invalid extension "txt". extenstion does not start with ".".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".tæxt". non-ASCII character "æ".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension "txt". extenstion does not start with ".".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt?". illegal character "?".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".t/xt". illegal character "".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".קו�". non-ASCII character "קו�".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".extensiontoolong". extension length more than 16..]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt*". illegal character "*".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".{txt". illegal character "{".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".\txt". illegal character "/".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".$txt". illegal character "$".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".t<xt". illegal character "<".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension " .txt". illegal whitespace at front of extension.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt?". illegal character "?".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ". txt". illegal whitespace in extension.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt.". extenstion ends with ".".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".{txt". illegal character "{".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".‮txt‮". illegal RTL character.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".\txt". illegal character "/".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".tæxt". non-ASCII character "æ".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt🙂". non-ASCII character "🙂".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt\\". illegal characters "\\".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".קו�". non-ASCII character "קו�".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".t/xt". illegal character "".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt ". illegal whitespace at end of extension.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".t<xt". illegal character "<".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".extensiontoolong". extension length more than 16..]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension " .txt". illegal whitespace at front of extension.]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".{txt}". illegal characters "{" and "}".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt ". illegal whitespace at end of extension.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".}txt". illegal character "}".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ". txt". illegal whitespace in extension.]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".txt🙂". non-ASCII character "🙂".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt.". extenstion ends with ".".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".}txt". illegal character "}".]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt\\". illegal characters "\\".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".‮txt‮". illegal RTL character.]
+    expected: FAIL
+
+  [showSaveFilePicker: invalid extension ".txt*". illegal character "*".]
+    expected: FAIL
+
+  [showOpenFilePicker: invalid extension ".$txt". illegal character "$".]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/navigation-timing/secure_connection_start_non_zero.https.html.ini firefox-85.0+build1/testing/web-platform/meta/navigation-timing/secure_connection_start_non_zero.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/navigation-timing/secure_connection_start_non_zero.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/navigation-timing/secure_connection_start_non_zero.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,8 +3,8 @@
     expected:
       if (os == "win") and ccov: [FAIL, PASS]
       if (os == "win") and not debug and not webrender and (processor == "x86"): PASS
-      if (os == "linux") and debug and webrender and fission: PASS
       if (os == "win") and not debug and webrender: PASS
+      if (os == "linux") and fission and debug: PASS
       if os == "mac": PASS
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini firefox-85.0+build1/testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/origin-policy/content-security/double-content-security.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [double-content-security.https.html]
   expected:
-    if (os == "win") and not debug and not fission and (processor == "x86_64"): ["TIMEOUT", "OK"]
-    if os == "linux": OK
+    if (os == "linux") and debug and webrender: OK
+    if (os == "linux") and not debug: OK
     [OK, TIMEOUT]
   [img loading must be disallowed]
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/content-security/valid-with-semicolon.https.html.ini firefox-85.0+build1/testing/web-platform/meta/origin-policy/content-security/valid-with-semicolon.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/content-security/valid-with-semicolon.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/origin-policy/content-security/valid-with-semicolon.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,5 @@
 [valid-with-semicolon.https.html]
-  expected:
-    if fission and (os == "win"): ["TIMEOUT", "OK"]
-    [OK, TIMEOUT]
+  expected: [OK, TIMEOUT]
   [img loading must be disallowed]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/ids/mix-of-ids.https.html.ini firefox-85.0+build1/testing/web-platform/meta/origin-policy/ids/mix-of-ids.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/origin-policy/ids/mix-of-ids.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/origin-policy/ids/mix-of-ids.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,5 @@
 [mix-of-ids.https.html]
-  expected:
-    if (processor == "x86_64") and (os == "win") and debug and webrender: ["TIMEOUT", "OK"]
-    if (processor == "x86") and (os == "linux"): ["TIMEOUT", "OK"]
-    [OK, TIMEOUT]
+  expected: [OK, TIMEOUT]
   [Expected originPolicyIDs check]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/compat/pointerevent_touch-action-verification.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/compat/pointerevent_touch-action-verification.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/compat/pointerevent_touch-action-verification.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/compat/pointerevent_touch-action-verification.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,7 @@
 [pointerevent_touch-action-verification.html]
   [explicit-pinch-zoom-pan-x-pan-up]
     expected: FAIL
-
-  [explicit-pinch-zoom]
-    expected: FAIL
-
+    
   [explicit-pinch-zoom-pan-x-pan-y]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_auxclick_is_a_pointerevent.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_auxclick_is_a_pointerevent.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_auxclick_is_a_pointerevent.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_auxclick_is_a_pointerevent.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,2 @@
 [pointerevent_auxclick_is_a_pointerevent.html]
-  [auxclick is a PointerEvent]
-    expected: FAIL
-
+  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_capture_suppressing_mouse.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_capture_suppressing_mouse.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_capture_suppressing_mouse.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_capture_suppressing_mouse.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,8 @@
+[pointerevent_capture_suppressing_mouse.html]
+  expected: TIMEOUT
+  [pointerout event after lostpointercapture received]
+    expected: NOTRUN
+
+  [pointerleave event after lostpointercapture received]
+    expected: NOTRUN
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,2 @@
 [pointerevent_click_is_a_pointerevent.html]
-  [click is a PointerEvent]
-    expected: FAIL
-
+  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_fractional_coordinates.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_fractional_coordinates.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_fractional_coordinates.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_fractional_coordinates.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[pointerevent_fractional_coordinates.html]
+  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,8 @@
 [pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html]
   prefs: [layout.reflow.synthMouseMove:true]
+  expected:
+    if (os == "mac") and debug: ["OK", "TIMEOUT"]
+  [lostpointercapture is dispatched on the document when shadow dom capturing element is removed]
+    expected:
+      if (os == "mac") and debug: ["PASS", "TIMEOUT"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[pointerevent_pointercapture-not-lost-in-chorded-buttons.html]
-  expected: ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerevent_setpointercapture_inactive_button_mouse.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,9 +4,11 @@
     if verify and (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1668959
   expected:
     if not fission and (os == "linux") and webrender and not debug: ["OK", "TIMEOUT"]
-    if fission and (os == "linux") and not debug: ["TIMEOUT", "OK"]
+    if not fission and (os == "win") and webrender and not debug: ["OK", "TIMEOUT"]
+    if fission and not debug: ["OK", "TIMEOUT"]
   [setPointerCapture + inactive button state]
     expected:
       if not fission and (os == "linux") and webrender and not debug: ["PASS", "NOTRUN"]
-      if fission and (os == "linux") and not debug: ["NOTRUN", "PASS"]
+      if not fission and (os == "win") and webrender and not debug: ["PASS", "NOTRUN"]
+      if fission and not debug: ["PASS", "NOTRUN"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,4 @@
 [pointerevent_coordinates_when_locked.html]
-  expected: ERROR
   [mouse Test pointerevent coordinates when pointer is locked]
     expected:
       if (os == "linux") and webrender: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,10 @@
 [pointerevent_getCoalescedEvents_when_pointerlocked.html]
   [mouse pointermove getCoalescedEvents when lock test]
     expected:
-      if (os == "win") and not fission and not webrender and (processor == "x86") and debug: ["FAIL", "PASS"]
-      if (os == "win") and not fission and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
-      if (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
-      if (os == "linux") and webrender: ["FAIL", "PASS"]
+      if (os == "linux") and webrender and debug and fission: ["FAIL", "PASS"]
+      if (os == "linux") and webrender and not debug and not fission: ["FAIL", "PASS"]
+      if (os == "win") and not debug and webrender and fission: ["FAIL", "PASS"]
+      if (os == "win") and not debug and webrender and not fission: ["FAIL", "PASS"]
+      if (os == "win") and debug: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,12 +1,11 @@
 [pointerevent_movementxy_with_pointerlock.html]
   expected:
-    if (os == "linux") and webrender and not debug and not fission: ["OK", "ERROR"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["ERROR", "OK"]
-    if (os == "win") and webrender and not debug and not fission: ["ERROR", "OK"]
-    if (os == "mac") and not debug: ["ERROR", "OK", "TIMEOUT"]
-    ERROR
+    if (os == "win") and webrender and not debug and not fission: ["OK", "ERROR"]
+    if (os == "linux") and not debug and webrender: ["OK", "ERROR", "TIMEOUT"]
+    if (os == "linux") and not debug and not webrender: ["OK", "ERROR"]
+    if os == "mac": ["OK", "ERROR", "TIMEOUT"]
   [mouse pointerevent movementX/Y with pointerlock test]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["FAIL", "PASS", "TIMEOUT"]
-      [TIMEOUT, PASS, FAIL]
+      if (os == "linux") and webrender and not fission and debug: ["FAIL", "PASS", "TIMEOUT"]
+      [PASS, FAIL, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,10 @@
 [pointerevent_pointerlock_supercedes_capture.html]
   [mouse no pointercapture while pointerlock]
     expected:
-      if (os == "linux") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "linux") and not fission and debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and not fission and debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and not fission and not debug and not webrender: ["PASS", "FAIL"]
-      if os == "mac": ["PASS", "FAIL"]
+      if (os == "win") and not fission and debug and webrender: [PASS, FAIL]
+      if (os == "win") and not fission and not debug and not webrender: [PASS, FAIL]
+      if (os == "linux") and debug and not fission and webrender: [PASS, FAIL]
+      if (os == "linux") and debug and not fission and not webrender: [PASS, FAIL]
+      if (os == "linux") and not debug and webrender and not fission: [PASS, FAIL]
+      if os == "mac": [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_in_pointerlock.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -8,3 +8,7 @@
     expected:
       if (os == "mac") and debug: ["PASS", "FAIL"]
 
+  [pointermove event received]
+    expected:
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/pointerlock/mouse_buttons_back_forward.html.ini firefox-85.0+build1/testing/web-platform/meta/pointerlock/mouse_buttons_back_forward.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/pointerlock/mouse_buttons_back_forward.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/pointerlock/mouse_buttons_back_forward.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,8 @@
 [mouse_buttons_back_forward.html]
-  expected: ERROR
+  expected:
+    if (os == "linux") and webrender and not debug and not fission: ["OK", "ERROR"]
   max-asserts: 2
+  [Tests that when pointer is locked, the mouseup is preventable.]
+    expected:
+      if (os == "linux") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/preload/link-header-preload-delay-onload.html.ini firefox-85.0+build1/testing/web-platform/meta/preload/link-header-preload-delay-onload.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/preload/link-header-preload-delay-onload.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/preload/link-header-preload-delay-onload.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,6 @@
 [link-header-preload-delay-onload.html]
   [Makes sure that Link headers preload resources and block window.onload after resource discovery]
     expected:
-      if not debug and (os == "win") and not webrender and (processor == "x86_64"): PASS
-      if not debug and (os == "android") and not webrender: PASS
       if debug: PASS
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/quirks/body-fills-html-quirk.html.ini firefox-85.0+build1/testing/web-platform/meta/quirks/body-fills-html-quirk.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/quirks/body-fills-html-quirk.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/quirks/body-fills-html-quirk.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[body-fills-html-quirk.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/quirks/body-fills-html-quirk-vertical.html.ini firefox-85.0+build1/testing/web-platform/meta/quirks/body-fills-html-quirk-vertical.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/quirks/body-fills-html-quirk-vertical.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/quirks/body-fills-html-quirk-vertical.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[body-fills-html-quirk-vertical.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk.html.ini firefox-85.0+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[html-fills-viewport-quirk.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk-vertical.html.ini firefox-85.0+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk-vertical.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk-vertical.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/quirks/html-fills-viewport-quirk-vertical.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,2 @@
+[html-fills-viewport-quirk-vertical.html]
+  expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/default/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/iframe.meta/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/srcdoc.meta/default/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.http-rp/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/default/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/a-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[a-tag.http.html]
+  [Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/fetch.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[fetch.http.html]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/iframe-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[iframe-tag.http.html]
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/img-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[img-tag.http.html]
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/script-tag.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[script-tag.http.html]
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/xhr.http.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/top.meta/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,31 @@
+[xhr.http.html]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
+    expected: FAIL
+
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,37 +1,37 @@
 [fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,37 +1,37 @@
 [xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,37 +1,37 @@
 [fetch.http.html]
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,37 +1,37 @@
 [xhr.http.html]
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.]
     expected: FAIL
 
-  [Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.]
+  [Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-about-blank.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,7 @@
 [iframe-inheritance-about-blank.html]
   expected:
-    if (os == "linux") and not fission and (processor == "x86_64") and webrender and not debug: ["OK", "TIMEOUT"]
-    if (os == "linux") and not fission and (processor == "x86_64") and not webrender and not debug: ["OK", "TIMEOUT"]
-    if (os == "linux") and not fission and (processor == "x86_64") and not webrender and debug: ["OK", "TIMEOUT"]
     if (os == "android") and not debug and webrender: ["OK", "TIMEOUT"]
+    if (os == "android") and not debug and not webrender: ["OK", "TIMEOUT"]
     [TIMEOUT, OK]
   [The value of document.referrer in an about:blank iframe is the outer document's full URL, regardless of referrer policy]
     expected: FAIL
@@ -13,9 +11,7 @@
 
   [A subresource fetched from an about:blank iframe is fetched with no 'Referer' header]
     expected:
-      if (os == "linux") and not fission and (processor == "x86_64") and not webrender and debug: ["PASS", "NOTRUN"]
-      if (os == "linux") and not fission and (processor == "x86_64") and not webrender and not debug: ["PASS", "NOTRUN"]
-      if (os == "linux") and not fission and (processor == "x86_64") and webrender and not debug: ["PASS", "NOTRUN"]
+      if (os == "android") and not debug and not webrender: ["PASS", "NOTRUN"]
       if (os == "android") and not debug and webrender: ["PASS", "NOTRUN"]
       [NOTRUN, PASS]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,4 @@
 [iframe-inheritance-javascript-child.html]
-  [Referrer Policy: iframes with javascript url reuse referrer policy]
-    expected: FAIL
-
   [Referrer Policy: iframes with javascript url reuse referrer policy 1]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html.ini firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,6 +2,3 @@
   [Referrer Policy: iframes with javascript url reuse referrer policy]
     expected: FAIL
 
-  [Referrer Policy: iframes with javascript url reuse referrer policy 1]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/reporting/nestedReport.html.ini firefox-85.0+build1/testing/web-platform/meta/reporting/nestedReport.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/reporting/nestedReport.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/reporting/nestedReport.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,8 @@
 [nestedReport.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and debug and webrender: ["ERROR", "TIMEOUT"]
+    if (os == "android") and debug and not webrender: ["ERROR", "TIMEOUT"]
+    ERROR
   [Nested report]
     expected: TIMEOUT
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/reporting/order.html.ini firefox-85.0+build1/testing/web-platform/meta/reporting/order.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/reporting/order.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/reporting/order.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,8 @@
 [order.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and debug and webrender: ["ERROR", "TIMEOUT"]
+    if (os == "android") and debug and not webrender: ["ERROR", "TIMEOUT"]
+    ERROR
   [Order]
     expected: TIMEOUT
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini firefox-85.0+build1/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resize-observer/change-layout-in-error.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,10 @@
 [change-layout-in-error.html]
   [Changing layout in window error handler should not result in lifecyle loop when resize observer loop limit is reached.]
     expected:
-      if debug and (os == "win") and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if not debug and (os == "linux") and webrender and not fission: ["PASS", "FAIL"]
-      if not debug and (os == "android") and webrender: ["PASS", "FAIL"]
-      if not debug and (os == "win") and not fission: ["PASS", "FAIL"]
+      if not debug and (os == "win") and not fission and (processor == "x86"): ["PASS", "FAIL"]
+      if not debug and (os == "linux") and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if not debug and (os == "android") and not webrender: ["PASS", "FAIL"]
+      if not debug and (os == "win") and fission: ["PASS", "FAIL"]
       if not debug and (os == "mac"): ["PASS", "FAIL"]
       [FAIL, PASS]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/eventloop.html.ini firefox-85.0+build1/testing/web-platform/meta/resize-observer/eventloop.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/eventloop.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resize-observer/eventloop.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,9 +3,9 @@
     if (os == "linux") and webrender: ["OK", "TIMEOUT"]
   [test0: multiple notifications inside same event loop]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "linux") and webrender and not debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and webrender and debug: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
 
   [guard]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/idlharness.window.js.ini firefox-85.0+build1/testing/web-platform/meta/resize-observer/idlharness.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resize-observer/idlharness.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resize-observer/idlharness.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -11,3 +11,23 @@
   [ResizeObserverEntry interface: entry must inherit property "borderBoxSize" with the proper type]
     expected: FAIL
 
+  [ResizeObserverEntry must be primary interface of entry]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
+  [Stringification of entry]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
+  [ResizeObserverEntry interface: entry must inherit property "target" with the proper type]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
+  [ResizeObserverEntry creator]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
+  [ResizeObserverEntry interface: entry must inherit property "contentRect" with the proper type]
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resource-timing/resource-reload-TAO.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,13 +1,15 @@
 [resource-reload-TAO.sub.html]
   expected:
-    if (os == "win") and not debug and fission: ["TIMEOUT", "OK"]
-    if (os == "win") and not debug and not fission: ["TIMEOUT", "OK"]
+    if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["TIMEOUT", "OK"]
+    if (os == "win") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "OK"]
+    if (os == "win") and not debug and webrender: ["TIMEOUT", "OK"]
     if os == "mac": ["TIMEOUT", "OK"]
     TIMEOUT
   [Test that TAO headers are reused on reloads.]
     expected:
-      if (os == "win") and not debug and fission: ["TIMEOUT", "PASS"]
-      if (os == "win") and not debug and not fission: ["TIMEOUT", "PASS"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["TIMEOUT", "PASS"]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): ["TIMEOUT", "PASS"]
+      if (os == "win") and not debug and webrender: ["TIMEOUT", "PASS"]
       if os == "mac": ["TIMEOUT", "PASS"]
       TIMEOUT
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/resource-timing-level1.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/resource-timing/resource-timing-level1.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/resource-timing-level1.sub.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resource-timing/resource-timing-level1.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,172 +2,3 @@
   disabled:
     if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1543604
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1543604
-  ['link responseStart uses 1XX (first) response timings']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-
-  ['script responseStart uses 1XX (first) response timings']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-
-  ['iframe responseStart uses 1XX (first) response timings']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-
-  ['xmlhttprequest responseStart uses 1XX (first) response timings']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-
-  ['xmlhttprequest (Potentially Cached): Immediately fetch the same URL, exercising the cache hit path (if any).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['link 250ms delay in headers does not affect responseStart']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-
-  ['iframe 250ms delay in headers does not affect responseStart']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
-  ['xmlhttprequest: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
-  ['xmlhttprequest (Redirected): 250ms delay before 'redirectEnd', another 250ms delay before 'responseStart'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
-  ['iframe (Populate cache): The initial request populates the cache (if appropriate).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['script: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-
-  ['link (Potentially Cached): Immediately fetch the same URL, exercising the cache hit path (if any).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['xmlhttprequest 250ms delay in headers does not affect responseStart']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-
-  ['link (Redirected): 250ms delay before 'redirectEnd', another 250ms delay before 'responseStart'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-
-  ['script (Potentially Cached): Immediately fetch the same URL, exercising the cache hit path (if any).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['script (Redirected): 250ms delay before 'redirectEnd', another 250ms delay before 'responseStart'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
-  ['script (Populate cache): The initial request populates the cache (if appropriate).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['script 250ms delay in headers does not affect responseStart']
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
-
-  ['xmlhttprequest (Populate cache): The initial request populates the cache (if appropriate).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['iframe (Potentially Cached): Immediately fetch the same URL, exercising the cache hit path (if any).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['link: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
-  ['iframe (Redirected): 250ms delay before 'redirectEnd', another 250ms delay before 'responseStart'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-
-  ['link (Populate cache): The initial request populates the cache (if appropriate).]
-    expected:
-      if (os == "win") and not webrender and debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug: ["PASS", "FAIL"]
-
-  ['iframe: 250ms delay before 'responseStart', another 250ms delay before 'responseEnd'.]
-    expected:
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86") and debug: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini firefox-85.0+build1/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/resource-timing/workerStart-tao-protected.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,25 +1,29 @@
 [workerStart-tao-protected.https.html]
   expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86_64"): OK
-    if (os == "android") and debug and webrender: OK
-    if (os == "linux") and debug: OK
-    if (os == "android") and not debug: OK
-    if (os == "win") and debug: OK
+    if not debug and (os == "win") and not webrender and (processor == "x86_64"): OK
+    if debug and not fission and (os == "android") and webrender: OK
+    if debug and not fission and (os == "android") and not webrender: ["TIMEOUT", "OK"]
+    if debug and not fission and (os == "mac"): OK
+    if debug and not fission and (os == "win"): OK
+    if debug and not fission and (os == "linux"): OK
     [OK, TIMEOUT]
   [Add TAO iframe to remote origin. Make sure workerStart is not zero]
     expected:
-      if not debug and (os == "win") and webrender and fission: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "win") and webrender and not fission: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "win") and not webrender and (processor == "x86"): ["FAIL", "TIMEOUT"]
-      if not debug and (os == "linux") and webrender and not fission: ["FAIL", "TIMEOUT", "NOTRUN"]
-      if not debug and (os == "linux") and webrender and fission: ["FAIL", "TIMEOUT"]
-      if debug and (os == "android") and not webrender: ["FAIL", "NOTRUN"]
-      if not debug and (os == "linux") and not webrender: ["FAIL", "TIMEOUT"]
-      if not debug and (os == "mac"): ["FAIL", "TIMEOUT"]
-      FAIL
+      if debug and not fission and (os == "android") and webrender: FAIL
+      if debug and not fission and (os == "android") and not webrender: ["NOTRUN", "FAIL"]
+      if not debug and not webrender and (os == "win") and (processor == "x86_64"): FAIL
+      if not debug and webrender and (os == "linux") and not fission: ["FAIL", "TIMEOUT", "NOTRUN"]
+      if not debug and webrender and (os == "win") and not fission: ["FAIL", "TIMEOUT", "NOTRUN"]
+      if debug and not fission and (os == "mac"): FAIL
+      if debug and not fission and (os == "linux"): FAIL
+      if debug and not fission and (os == "win"): FAIL
+      if not debug and webrender and (os == "android"): ["FAIL", "TIMEOUT", "NOTRUN"]
+      [FAIL, TIMEOUT]
 
   [Add TAO-less iframe to remote origin. Make sure workerStart is zero]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
-      if (os == "android") and debug and not webrender: ["PASS", "TIMEOUT"]
+      if webrender and not debug and (os == "win") and not fission: ["PASS", "TIMEOUT"]
+      if webrender and not debug and (os == "linux") and not fission: ["PASS", "TIMEOUT"]
+      if webrender and not debug and (os == "android"): ["PASS", "TIMEOUT"]
+      if not webrender and (os == "android") and debug: ["TIMEOUT", "PASS"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/screen-capture/getdisplaymedia-after-discard.https.html.ini firefox-85.0+build1/testing/web-platform/meta/screen-capture/getdisplaymedia-after-discard.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/screen-capture/getdisplaymedia-after-discard.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/screen-capture/getdisplaymedia-after-discard.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[getdisplaymedia-after-discard.https.html]
+  [getDisplayMedia() in a discarded browsing context]
+    expected:
+      if os == "android": FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/screen-capture/getdisplaymedia.https.html.ini firefox-85.0+build1/testing/web-platform/meta/screen-capture/getdisplaymedia.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/screen-capture/getdisplaymedia.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/screen-capture/getdisplaymedia.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,14 +1,15 @@
 [getdisplaymedia.https.html]
+  expected:
+    if (processor == "x86_64") and (os == "win") and debug and webrender: [OK, CRASH]
+    if (processor == "x86") and not debug: [OK, CRASH]
   disabled:
     if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
-  expected:
-    if (processor == "x86_64") and (os == "win") and debug and webrender: ["OK", "CRASH"]
-    if (processor == "x86") and not debug: ["OK", "CRASH"]
   [getDisplayMedia() with getSettings]
     expected: FAIL
 
   [applyConstraints(width or height) must downscale precisely]
     expected:
-      if (os == "win") and debug and webrender: ["PASS", "FAIL"]
-      if (os == "mac") and debug: ["PASS", "FAIL"]
+      if debug and (os == "linux") and webrender and not fission: [PASS, FAIL]
+      if debug and (os == "win") and webrender: [PASS, FAIL]
+      if debug and (os == "mac"): [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/screen-orientation/lock-unlock-check.html.ini firefox-85.0+build1/testing/web-platform/meta/screen-orientation/lock-unlock-check.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/screen-orientation/lock-unlock-check.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/screen-orientation/lock-unlock-check.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,6 @@
 [lock-unlock-check.html]
   expected:
-    if (os == "win") and (processor == "x86") and not debug: ["ERROR", "OK"]
-    if os == "android": ["TIMEOUT", "OK", "ERROR"]
+    if os == "android": [TIMEOUT, OK, ERROR]
     [OK, ERROR]
   [Re-locking orientation during event dispatch must reject existing orientationPendingPromise]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/screen-wake-lock/wakelock-insecure-context.any.js firefox-85.0+build1/testing/web-platform/meta/screen-wake-lock/wakelock-insecure-context.any.js
--- firefox-84.0.2+build1/testing/web-platform/meta/screen-wake-lock/wakelock-insecure-context.any.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/screen-wake-lock/wakelock-insecure-context.any.js	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 [wakelock-type.https.any.html]
   disabled:
     if (os == "win" and debug and bits == "32"): https://bugzilla.mozilla.org/show_bug.cgi?id=1591125
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[at-scroll-timeline-multi-pass.tentative.html]
+  [Multiple style/layout passes occur when necessary]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/find-range-from-text-directive.html.ini firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/find-range-from-text-directive.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/find-range-from-text-directive.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/find-range-from-text-directive.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,149 @@
+[find-range-from-text-directive.html]
+  expected: TIMEOUT
+  [inverted range search.]
+    expected:
+      if os == "android": ["TIMEOUT", "PASS", "NOTRUN"]
+      [PASS, TIMEOUT, NOTRUN]
+
+  [Suffix comes before |end|.]
+    expected:
+      if os == "android": NOTRUN
+      if os == "linux": ["PASS", "TIMEOUT", "NOTRUN"]
+      [NOTRUN, TIMEOUT]
+
+  [Multiple overlapping prefixes.]
+    expected: FAIL
+
+  [match doesn't immediately follow first prefix instance.]
+    expected: FAIL
+
+  [Suffix must be end bounded.]
+    expected:
+      if os == "linux": ["NOTRUN", "PASS", "TIMEOUT"]
+      NOTRUN
+
+  [non-existent exact match.]
+    expected:
+      if os == "android": ["PASS", "TIMEOUT", "NOTRUN"]
+      if os == "mac": ["PASS", "TIMEOUT"]
+
+  [non-existent range match.]
+    expected:
+      if os == "mac": ["PASS", "TIMEOUT", "NOTRUN"]
+
+  [Multiple overlapping one letter prefixes.]
+    expected: FAIL
+
+  [Content appears between match and suffix.]
+    expected:
+      if os == "linux": ["NOTRUN", "TIMEOUT"]
+      NOTRUN
+
+  [overlapping exact matches with suffix.]
+    expected:
+      if os == "mac": ["FAIL", "TIMEOUT", "NOTRUN"]
+      if os == "linux": FAIL
+      [FAIL, TIMEOUT]
+
+  [Match with no suffix.]
+    expected:
+      if os == "android": NOTRUN
+      if os == "win": ["TIMEOUT", "NOTRUN", "FAIL"]
+      if os == "linux": ["FAIL", "TIMEOUT", "NOTRUN"]
+      [NOTRUN, FAIL, TIMEOUT]
+
+  [Match text after prefix.]
+    expected: FAIL
+
+  [Search invisible content between |end| and suffix.]
+    expected:
+      if os == "linux": ["TIMEOUT", "NOTRUN", "FAIL"]
+      NOTRUN
+
+  [Range with preceeding suffix.]
+    expected:
+      if os == "mac": ["NOTRUN", "PASS", "TIMEOUT"]
+      if os == "android": NOTRUN
+      [PASS, TIMEOUT, NOTRUN]
+
+  [no suffix forces |end| to be end bounded.]
+    expected:
+      if os == "android": ["NOTRUN", "PASS", "TIMEOUT"]
+      [PASS, TIMEOUT, NOTRUN]
+
+  [|end| must be start bounded even if full range is word bounded.]
+    expected:
+      if os == "android": NOTRUN
+      if os == "mac": ["PASS", "NOTRUN", "TIMEOUT"]
+      if os == "win": ["PASS", "TIMEOUT", "NOTRUN"]
+      [PASS, NOTRUN]
+
+  [non-existent |end|.]
+    expected:
+      if os == "mac": ["TIMEOUT", "NOTRUN", "PASS"]
+      if os == "android": NOTRUN
+      if os == "win": ["PASS", "TIMEOUT", "NOTRUN"]
+      [PASS, NOTRUN]
+
+  [suffix means |start| need not end on word boundary.]
+    expected: FAIL
+
+  [Search invisible content between prefix and match.]
+    expected: FAIL
+
+  [overlapping one letter exact matches with suffix.]
+    expected:
+      if os == "android": ["FAIL", "NOTRUN"]
+      if os == "linux": ["FAIL", "TIMEOUT"]
+      [FAIL, TIMEOUT, NOTRUN]
+
+  [Basic smoke test - full word match.]
+    expected: FAIL
+
+  [matching range search.]
+    expected:
+      if os == "linux": ["FAIL", "NOTRUN"]
+      [FAIL, TIMEOUT, NOTRUN]
+
+  [Prefix need not end on a word boundary.]
+    expected: FAIL
+
+  [|start| doesn't need to start on word boundary.]
+    expected: FAIL
+
+  [no-prefix; suffix means |start| need not end on word boundary.]
+    expected:
+      if os == "android": ["FAIL", "TIMEOUT", "NOTRUN"]
+      FAIL
+
+  [no-prefix; no |end| or suffix forces |start| to end on word boundary.]
+    expected:
+      if os == "android": ["PASS", "TIMEOUT"]
+
+  [Non-existent suffix.]
+    expected:
+      if os == "linux": ["NOTRUN", "PASS"]
+      NOTRUN
+
+  [Suffix need not be start bounded.]
+    expected:
+      if os == "linux": ["NOTRUN", "FAIL", "TIMEOUT"]
+      NOTRUN
+
+  [|end| must be start bounded.]
+    expected:
+      if os == "android": ["NOTRUN", "TIMEOUT"]
+      if os == "mac": ["PASS", "NOTRUN", "TIMEOUT"]
+      [PASS, TIMEOUT, NOTRUN]
+
+  [suffix means |end| need not be end bounded.]
+    expected:
+      if os == "win": ["FAIL", "TIMEOUT", "NOTRUN"]
+      if os == "linux": ["FAIL", "NOTRUN"]
+      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
+      [FAIL, NOTRUN, TIMEOUT]
+
+  [|start| must start on a word boundary.]
+    expected:
+      if os == "android": ["PASS", "TIMEOUT", "NOTRUN"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/force-load-at-top.html.ini firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/force-load-at-top.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/force-load-at-top.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/force-load-at-top.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -11,17 +11,12 @@
       NOTRUN
 
   [no-force-load-at-top must not block scroll on load from text fragment.]
-    expected:
-      if os == "android": ["NOTRUN", "TIMEOUT"]
-      if os == "win": ["TIMEOUT", "FAIL", "NOTRUN"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [no-force-load-at-top must not block scroll on load from text fragment with element fallback.]
     expected:
-      if os == "mac": ["TIMEOUT", "NOTRUN"]
-      if os == "android": NOTRUN
       if os == "linux": ["TIMEOUT", "FAIL", "NOTRUN"]
-      [NOTRUN, TIMEOUT]
+      [TIMEOUT, NOTRUN]
 
   [no-force-load-at-top must not block scroll on load from element fragment.]
     expected:
@@ -30,7 +25,6 @@
 
   [force-load-at-top must block scroll on load from history scroll restoration.]
     expected:
-      if os == "android": ["TIMEOUT", "FAIL"]
       if os == "mac": ["FAIL", "TIMEOUT", "NOTRUN"]
       [FAIL, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -115,10 +115,7 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Non-matching text directive with existing element fragment should scroll to element.]
-    expected:
-      if os == "win": ["TIMEOUT", "NOTRUN", "FAIL"]
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Generic fragment directive with existing element fragment should scroll to element.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -127,25 +124,19 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Multiple match text directive disambiguated by suffix should match the suffixed text.]
-    expected:
-      if os == "win": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Exact text with suffix should match text.]
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text directive should match when context terms are separated by node boundaries.]
     expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "win": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+      if os == "linux": ["FAIL", "NOTRUN", "TIMEOUT"]
+      if os == "win": ["FAIL", "TIMEOUT", "NOTRUN"]
+      [TIMEOUT, NOTRUN, FAIL]
 
   [Test navigation with fragment: Non-matching text directive with nonexistent element fragment should not match and not scroll.]
-    expected:
-      if os == "win": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Non-whole-word exact text with spaces should not match.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -155,14 +146,12 @@
 
   [Test navigation with fragment: Text directive should not scroll to hidden text.]
     expected:
-      if os == "mac": ["TIMEOUT", "NOTRUN", "FAIL"]
+      if os == "linux": ["FAIL", "NOTRUN", "TIMEOUT"]
+      if os == "win": ["TIMEOUT", "NOTRUN", "FAIL"]
       [NOTRUN, FAIL, TIMEOUT]
 
   [Test navigation with fragment: Multiple match text directive disambiguated by prefix should match the prefixed text.]
-    expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "win": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text range with no context should match text.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -174,15 +163,13 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Multiple text directives and a non-text directive should match text.]
-    expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text directive should match text within shadow DOM.]
     expected:
-      if os == "linux": ["TIMEOUT", "FAIL", "NOTRUN"]
-      if os == "mac": ["FAIL", "NOTRUN", "TIMEOUT"]
-      [NOTRUN, FAIL, TIMEOUT]
+      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
+      if os == "mac": ["NOTRUN", "FAIL", "TIMEOUT"]
+      [FAIL, NOTRUN, TIMEOUT]
 
   [Test navigation with fragment: Text range with non-matching startText should not match.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -191,15 +178,10 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text directive with existing element fragment should match and scroll into view text.]
-    expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Multiple match text directive disambiguated by prefix and suffix should match the text with the given context.]
-    expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "win": ["NOTRUN", "FAIL", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text range with non-matching endText should not match.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -211,10 +193,7 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text directive with nonexistent element fragment should match and scroll into view text.]
-    expected:
-      if os == "android": ["NOTRUN", "FAIL", "TIMEOUT"]
-      if os == "win": ["FAIL", "NOTRUN", "TIMEOUT"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text range with nonmatching prefix and matching suffix should not match.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -232,7 +211,9 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Text directive should not scroll to display none text.]
-    expected: [NOTRUN, FAIL, TIMEOUT]
+    expected:
+      if os == "linux": ["TIMEOUT", "NOTRUN", "FAIL"]
+      [NOTRUN, FAIL, TIMEOUT]
 
   [Test navigation with fragment: Uppercase TEXT directive should not parse as a text directive.]
     expected: [FAIL, TIMEOUT, NOTRUN]
@@ -250,9 +231,7 @@
     expected: [NOTRUN, FAIL, TIMEOUT]
 
   [Test navigation with fragment: Text directive followed by non-text directive should match text.]
-    expected:
-      if os == "android": ["TIMEOUT", "NOTRUN", "FAIL"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test navigation with fragment: Exact text with prefix and suffix and query equals prefix..]
     expected: [FAIL, TIMEOUT, NOTRUN]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html.ini firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment-security.sub.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,5 @@
 [scroll-to-text-fragment-security.sub.html]
-  expected:
-    if os == "android": ["TIMEOUT", "OK"]
-    [OK, TIMEOUT]
+  expected: [OK, TIMEOUT]
   [Test that a text fragment directive requires a user activation (user_activation=true).]
     expected: [FAIL, TIMEOUT, NOTRUN]
 
@@ -12,9 +10,7 @@
     expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test that a text fragment directive is not activated within an iframe.]
-    expected:
-      if os == "android": ["TIMEOUT", "FAIL", "NOTRUN"]
-      [FAIL, TIMEOUT, NOTRUN]
+    expected: [FAIL, TIMEOUT, NOTRUN]
 
   [Test that a text fragment directive is not activated when there is a window opener (noopener=false).]
     expected: [FAIL, TIMEOUT, NOTRUN]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/selection/textcontrols/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/selection/textcontrols/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/selection/textcontrols/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/selection/textcontrols/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1 @@
+prefs: [dom.select_events.textcontrols.enabled:true]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/claim-worker-fetch.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[claim-worker-fetch.https.html]
+  [fetch() in blob URL Worker should be intercepted after the client is claimed.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-referrer-policy.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,3 +2,9 @@
   [Service Worker responds to fetch event with the referrer policy]
     expected: FAIL
 
+  [Service Worker should respond to fetch with the referrer URL when a member of RequestInit is present - Default Referrer]
+    expected: FAIL
+
+  [Service Worker should respond to fetch with the default referrer policy]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-worker-timing-frame.tentative.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-worker-timing-frame.tentative.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-worker-timing-frame.tentative.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/fetch-event-worker-timing-frame.tentative.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,23 +1,19 @@
 [fetch-event-worker-timing-frame.tentative.https.html]
   expected:
-    if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if (os == "win") and debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if (os == "win") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
   [workerTiming for navigation in a frame for a response from a fetch handler]
     expected:
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
+      if (os == "win") and not webrender and (processor == "x86_64"): ["FAIL", "TIMEOUT"]
       FAIL
 
   [workerTiming for subresources in a frame for a response from a fetchhandler]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
+      if (os == "win") and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
       FAIL
 
   [workerTiming for subresources in a frame with network fallback]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
+      if (os == "win") and not webrender and (processor == "x86_64"): ["FAIL", "NOTRUN"]
       FAIL
 
   [workerTiming for navigation in a frame with network fallback]
@@ -25,6 +21,5 @@
 
   [Unregister service worker]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/import-module-scripts.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/import-module-scripts.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/import-module-scripts.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/import-module-scripts.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [import-module-scripts.https.html]
   expected:
-    if webrender and (os == "linux") and not debug and fission: ["OK", "TIMEOUT"]
+    if webrender and (os == "linux") and not debug and fission: [OK, TIMEOUT]
   [Static import and then dynamic import.]
     expected: FAIL
 
@@ -15,16 +15,22 @@
 
   [eval(import()).]
     expected:
-      if webrender and (os == "linux") and not debug and fission: ["FAIL", "NOTRUN"]
+      if webrender and (os == "linux") and not debug and fission: [FAIL, NOTRUN]
       FAIL
 
   [Dynamic import and then static import.]
     expected:
-      if webrender and (os == "linux") and not debug and fission: ["FAIL", "NOTRUN"]
+      if webrender and (os == "linux") and not debug and fission: [FAIL, NOTRUN]
       FAIL
 
   [Nested dynamic import.]
     expected:
-      if webrender and (os == "linux") and not debug and fission: ["FAIL", "TIMEOUT"]
+      if webrender and (os == "linux") and not debug and fission: [FAIL, TIMEOUT]
       FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/navigate-window.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/navigate-window.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/navigate-window.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/navigate-window.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,5 +4,7 @@
 
   [Clients.matchAll() should not show an old window as controlled after it navigates.]
     expected:
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
       if (os == "mac") and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,27 +1,28 @@
 [navigation-redirect.https.html]
   [SW-fallbacked redirect to same-origin same-scope with different hash fragments.]
     expected:
-      if webrender and not debug: ["PASS", "FAIL"]
+      if webrender and not debug: [PASS, FAIL]
+      if not webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
 
   [SW-fallbacked redirect to same-origin same-scope.]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, FAIL]
+      if (os == "win") and webrender and not debug and fission: [PASS, FAIL]
+      if (os == "linux") and not debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to same-origin same-scope with a hash fragment.]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+      if (os == "linux") and webrender and not debug: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
 
   [SW-fallbacked redirect to other-origin and back to same-origin.]
     expected:
-      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: ["PASS", "FAIL"]
-      if (os == "win") and (processor == "x86_64") and fission: ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "win") and (processor == "x86_64") and not fission and debug and not webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86_64") and not fission and not debug and webrender: [PASS, FAIL]
+      if (os == "win") and (processor == "x86_64") and fission: [PASS, FAIL]
+      if (os == "linux") and not webrender and not debug: [PASS, FAIL]
+      if (os == "mac") and not debug: [PASS, FAIL]
 
 
 [navigation-redirect.https.html?client]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/registration-updateviacache.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/registration-updateviacache.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/registration-updateviacache.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/registration-updateviacache.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -21,8 +21,8 @@
 
   [register-with-updateViaCache-undefined-then-none]
     expected:
-      if (os == "linux") and not fission and debug and not webrender: ["PASS", "NOTRUN"]
-      if (os == "linux") and fission and not debug: ["PASS", "TIMEOUT"]
+      if not fission and (os == "linux") and debug and not webrender: ["PASS", "NOTRUN"]
+      if fission and (os == "linux") and not debug: ["PASS", "TIMEOUT"]
 
   [register-with-updateViaCache-none-then-undefined]
     expected:
@@ -113,13 +113,14 @@
 
   [register-with-updateViaCache-imports]
     expected:
-      if processor == "x86": ["PASS", "FAIL"]
+      if (processor == "x86") and (os == "win") and not debug: ["PASS", "FAIL"]
+      if (processor == "x86") and (os == "win") and debug: ["PASS", "FAIL"]
+      if (processor == "x86") and (os == "linux"): ["PASS", "FAIL"]
 
   [register-with-updateViaCache-all]
     expected:
-      if (os == "win") and not fission and not webrender and not debug and (processor == "x86"): ["PASS", "FAIL"]
-      if (os == "win") and not fission and webrender and debug: ["PASS", "FAIL"]
-      if (os == "linux") and webrender and debug and fission: ["PASS", "FAIL"]
-      if (os == "linux") and webrender and not debug and not fission: ["PASS", "FAIL"]
-      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
+      if (os == "win") and not fission and debug and webrender: ["PASS", "FAIL"]
+      if (os == "win") and not fission and not debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and debug and fission: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not fission: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -4,16 +4,20 @@
     if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
   expected:
     if fission and (os == "linux") and not debug: ["ERROR", "TIMEOUT"]
+    if not fission and (processor == "x86") and (os == "linux"): ["ERROR", "OK"]
     ERROR
   [ServiceWorkerRegistration.update() from installing service worker throws.]
     expected:
+      if not fission and (processor == "x86") and (os == "linux"): ["PASS", "FAIL"]
       if fission and (os == "linux") and not debug: ["PASS", "TIMEOUT"]
 
   [ServiceWorkerRegistration.update() from active service worker succeeds while installing service worker.]
     expected:
+      if not fission and (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if fission and (os == "linux") and not debug: ["PASS", "FAIL", "NOTRUN"]
 
   [ServiceWorkerRegistration.update() from client succeeds while installing service worker.]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and (processor == "x86_64") and not debug and webrender and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and (processor == "x86"): ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/update-on-navigation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/update-on-navigation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/update-on-navigation.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/update-on-navigation.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[update-on-navigation.https.html]
+  [The active service worker in charge of a navigation load should not be terminated as part of updating the registration]
+    expected:
+      if (os == "mac") and not debug: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/waiting.https.html.ini firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/waiting.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/service-workers/service-worker/waiting.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/service-workers/service-worker/waiting.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,10 +1,9 @@
 [waiting.https.html]
   [waiting is set after installation]
     expected:
-      if (os == "linux") and webrender and not debug and not fission: ["FAIL", "PASS"]
-      if (os == "linux") and webrender and not debug and fission: ["FAIL", "PASS"]
-      if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["FAIL", "PASS"]
-      if (os == "linux") and webrender and debug: ["FAIL", "PASS"]
-      if (os == "win") and debug: ["FAIL", "PASS"]
-      FAIL
+      if (os == "linux") and debug and not webrender: FAIL
+      if (os == "mac") and debug: FAIL
+      if (os == "win") and not debug: FAIL
+      if os == "android": FAIL
+      [FAIL, PASS]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,5 @@
 [declarative-shadow-dom-attachment.tentative.html]
+  max-asserts: 481
   [Declarative Shadow DOM as a child of <h2>, with mode=closed, delegatesFocus=true. Should be safelisted.]
     expected: FAIL
 
@@ -191,1719 +192,3 @@
   [Declarative Shadow DOM as a child of <header>, with mode=open, delegatesFocus=true. Should be safelisted.]
     expected: FAIL
 
-  [Declarative Shadow DOM as a child of <small>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <p>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <aside>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <blockquote>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <div>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h6>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h5>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h6>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <small>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <small>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <footer>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <header>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <small>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <aside>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <span>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h2>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <article>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <section>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <p>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <small>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <option>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <embed>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <div>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h4>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ruby>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdi>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <blockquote>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dd>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <style>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <footer>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <cite>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <colgroup>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <wbr>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <source>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h1>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h2>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <kbd>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <nav>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <address>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <audio>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h4>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h3>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <article>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <thead>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <strong>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <iframe>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <head>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h1>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ins>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <sub>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <u>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hgroup>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <bdo>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <header>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <i>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <output>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <td>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figure>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <caption>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <command>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rt>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <base>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <input>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <samp>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <rp>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <form>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <var>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <script>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <small>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meter>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tfoot>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <b>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <object>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <th>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <fieldset>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <button>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dfn>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dl>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <title>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <video>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <noscript>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <textarea>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ul>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <html>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <time>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <q>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <nav>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <area>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <datalist>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <optgroup>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <hr>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <del>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <span>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <section>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h5>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <h3>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <legend>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <track>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <map>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <progress>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <pre>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <details>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <s>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <abbr>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <param>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <table>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <menu>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dialog>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <select>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <canvas>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <em>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <meta>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tbody>, with mode=closed, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <label>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <code>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <br>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <figcaption>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <keygen>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <ol>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <img>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <dt>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <col>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <link>, with mode=invalid, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <mark>, with mode=open, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <tr>, with mode=invalid, delegatesFocus=false. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <li>, with mode=closed, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
-  [Declarative Shadow DOM as a child of <a>, with mode=open, delegatesFocus=true. Should be disallowed.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -29,9 +29,3 @@
   [Declarative Shadow DOM: template containing declarative shadow root and UA shadow root]
     expected: FAIL
 
-  [Declarative Shadow DOM: setInnerHTML root element]
-    expected: FAIL
-
-  [Declarative Shadow DOM: Invalid shadow root attribute]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini.orig firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini.orig
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini.orig	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html.ini.orig	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,37 @@
+[declarative-shadow-dom-basic.tentative.html]
+  [Declarative Shadow DOM: Missing closing tag]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Fragment parser basic test]
+    expected: FAIL
+
+  [Declarative Shadow DOM: delegates focus attribute]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Multiple roots]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Closed shadow root attribute]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Feature detection]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Basic test]
+    expected: FAIL
+
+  [Declarative Shadow DOM: template containing declarative shadow root]
+    expected: FAIL
+
+  [Declarative Shadow DOM: Feature detection]
+    expected: FAIL
+
+  [Declarative Shadow DOM: template containing declarative shadow root and UA shadow root]
+    expected: FAIL
+
+<<<<<<< HEAD
+=======
+  [Declarative Shadow DOM: setInnerHTML root element]
+    expected: FAIL
+
+>>>>>>> 763c2a96f6aeb... Bug 1679841 [wpt PR 26677] - Update wpt metadata, a=testonly
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -8,12 +8,6 @@
   [document.write allowed from synchronous script loaded from main document]
     expected: FAIL
 
-  [setInnerHTML on element]
-    expected: FAIL
-
-  [setInnerHTML on template]
-    expected: FAIL
-
   [iframe with no sandbox allows declarative Shadow DOM]
     expected: FAIL
 
@@ -23,18 +17,6 @@
   [iframe, no sandbox]
     expected: FAIL
 
-  [createHTMLDocument with setInnerHTML]
-    expected: FAIL
-
   [iframe]
     expected: FAIL
 
-  [setInnerHTML on shadowRoot]
-    expected: FAIL
-
-  [setInnerHTML on template, with nested template content]
-    expected: FAIL
-
-  [setInnerHTML on element, with nested template content]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/getinnerhtml.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/getinnerhtml.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/getinnerhtml.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/getinnerhtml.tentative.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,478 +1,955 @@
 [getinnerhtml.tentative.html]
-  [getInnerHTML() on <em>]
+  [Element.getInnerHTML() on <tfoot>]
     expected: FAIL
 
-  [getInnerHTML() on <video>]
+  [ShadowRoot.getInnerHTML() on <p>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <q>]
+  [ShadowRoot.getInnerHTML() on <s>]
     expected: FAIL
 
-  [getInnerHTML() on <dfn>]
+  [Element.getInnerHTML() on <script>]
     expected: FAIL
 
-  [getInnerHTML() on <span>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <h2>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <track>]
+  [ShadowRoot.getInnerHTML() on <dl>]
     expected: FAIL
 
-  [getInnerHTML() on <h2>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <header>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <span>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <h4>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <figure>]
+  [ShadowRoot.getInnerHTML() on <dialog>]
     expected: FAIL
 
-  [getInnerHTML() on <option>]
+  [Element.getInnerHTML() on <object>]
     expected: FAIL
 
-  [getInnerHTML() on <title>]
+  [Element.getInnerHTML() on <optgroup>]
     expected: FAIL
 
-  [getInnerHTML() on <aside>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <option>]
     expected: FAIL
 
-  [getInnerHTML() on <section>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <article>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <p>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <html>]
     expected: FAIL
 
-  [getInnerHTML() on <audio>]
+  [ShadowRoot.getInnerHTML() on <samp>]
     expected: FAIL
 
-  [getInnerHTML() on <nav>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <h3>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <link>]
+  [ShadowRoot.getInnerHTML() on <td>]
     expected: FAIL
 
-  [getInnerHTML() on <command>]
+  [Element.getInnerHTML() on <body>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <meter>]
+  [ShadowRoot.getInnerHTML() on <sub>]
     expected: FAIL
 
-  [getInnerHTML() on <b>]
+  [ShadowRoot.getInnerHTML() on <figcaption>]
     expected: FAIL
 
-  [getInnerHTML() on <col>]
+  [ShadowRoot.getInnerHTML() on <table>]
     expected: FAIL
 
-  [getInnerHTML() on <strong>]
+  [Element.getInnerHTML() on <h3>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <span>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <legend>]
     expected: FAIL
 
-  [getInnerHTML() on <br>]
+  [Element.getInnerHTML() on <samp>]
     expected: FAIL
 
-  [getInnerHTML() on <time>]
+  [Element.getInnerHTML() on <a>]
     expected: FAIL
 
-  [getInnerHTML() on <colgroup>]
+  [Element.getInnerHTML() on <h5>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <aside>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <style>]
     expected: FAIL
 
-  [getInnerHTML() on <h1>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <body>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <h5>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <dd>]
     expected: FAIL
 
-  [getInnerHTML() on <html>]
+  [Element.getInnerHTML() on <area>]
     expected: FAIL
 
-  [getInnerHTML() on <caption>]
+  [ShadowRoot.getInnerHTML() on <bdo>]
     expected: FAIL
 
-  [getInnerHTML() on <h2>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <p>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <embed>]
+  [ShadowRoot.getInnerHTML() on <tr>]
     expected: FAIL
 
-  [getInnerHTML() on <base>]
+  [Element.getInnerHTML() on <article>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <td>]
+  [ShadowRoot.getInnerHTML() on <video>]
     expected: FAIL
 
-  [getInnerHTML() on <i>]
+  [Element.getInnerHTML() on <bdo>]
     expected: FAIL
 
-  [getInnerHTML() on <nav>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <pre>]
     expected: FAIL
 
-  [getInnerHTML() on <var>]
+  [ShadowRoot.getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <a>]
+  [Element.getInnerHTML() on <th>]
     expected: FAIL
 
-  [getInnerHTML() on <map>]
+  [ShadowRoot.getInnerHTML() on <body>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <meta>]
     expected: FAIL
 
-  [getInnerHTML() on <wbr>]
+  [Element.getInnerHTML() on <span>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <keygen>]
+  [Element.getInnerHTML() on <progress>]
     expected: FAIL
 
-  [getInnerHTML() on <tfoot>]
+  [ShadowRoot.getInnerHTML() on <address>]
     expected: FAIL
 
-  [getInnerHTML() on <h1>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <dt>]
     expected: FAIL
 
-  [getInnerHTML() on <input>]
+  [Element.getInnerHTML() on <small>]
     expected: FAIL
 
-  [getInnerHTML() on <hr>]
+  [Element.getInnerHTML() on <footer>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <dialog>]
+  [ShadowRoot.getInnerHTML() on <section>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <li>]
+  [ShadowRoot.getInnerHTML() on <keygen>]
     expected: FAIL
 
-  [getInnerHTML() on <p>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <caption>]
     expected: FAIL
 
-  [getInnerHTML() on <legend>]
+  [Element.getInnerHTML() on <del>]
     expected: FAIL
 
-  [getInnerHTML() on <body>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <h1>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <textarea>]
     expected: FAIL
 
-  [getInnerHTML() on <rp>]
+  [Element.getInnerHTML() on <span>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <h6>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <aside>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <h3>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <i>]
     expected: FAIL
 
-  [getInnerHTML() on <menu>]
+  [Element.getInnerHTML() on <var>]
     expected: FAIL
 
-  [getInnerHTML() on <address>]
+  [Element.getInnerHTML() on <command>]
     expected: FAIL
 
-  [getInnerHTML() on <nav>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <details>]
     expected: FAIL
 
-  [getInnerHTML() on <dt>]
+  [ShadowRoot.getInnerHTML() on <map>]
     expected: FAIL
 
-  [getInnerHTML() on <bdo>]
+  [ShadowRoot.getInnerHTML() on <p>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <cite>]
+  [ShadowRoot.getInnerHTML() on <link>]
     expected: FAIL
 
-  [getInnerHTML() on <article>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <wbr>]
     expected: FAIL
 
-  [getInnerHTML() on <p>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <sub>]
     expected: FAIL
 
-  [getInnerHTML() on <progress>]
+  [Element.getInnerHTML() on <h1>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <table>]
+  [ShadowRoot.getInnerHTML() on <form>]
     expected: FAIL
 
-  [getInnerHTML() on <img>]
+  [Element.getInnerHTML() on <s>]
     expected: FAIL
 
-  [getInnerHTML() on <hgroup>]
+  [ShadowRoot.getInnerHTML() on <button>]
     expected: FAIL
 
-  [getInnerHTML() on <h5>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <header>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <h4>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <tbody>]
     expected: FAIL
 
-  [getInnerHTML() on <ruby>]
+  [Element.getInnerHTML() on <abbr>]
     expected: FAIL
 
-  [getInnerHTML() on <h4>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <strong>]
     expected: FAIL
 
-  [getInnerHTML() on <meta>]
+  [Element.getInnerHTML() on <span>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <h1>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <textarea>]
     expected: FAIL
 
-  [getInnerHTML() on <body>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <hgroup>]
     expected: FAIL
 
-  [getInnerHTML() on <footer>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <p>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <ul>]
+  [ShadowRoot.getInnerHTML() on <var>]
     expected: FAIL
 
-  [getInnerHTML() on <h2>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <dl>]
     expected: FAIL
 
-  [getInnerHTML() on <tbody>]
+  [ShadowRoot.getInnerHTML() on <section>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <h6>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <h1>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <header>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <kbd>]
     expected: FAIL
 
-  [getInnerHTML() on <h4>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <nav>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <mark>]
+  [Element.getInnerHTML() on <nav>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <label>]
+  [Element.getInnerHTML() on <div>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <nav>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <h5>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <header>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <h1>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <div>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <rp>]
     expected: FAIL
 
-  [getInnerHTML() on <small>]
+  [ShadowRoot.getInnerHTML() on <canvas>]
     expected: FAIL
 
-  [getInnerHTML() on <footer>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <article>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <section>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <h2>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <dl>]
+  [Element.getInnerHTML() on <body>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <abbr>]
+  [Element.getInnerHTML() on <embed>]
     expected: FAIL
 
-  [getInnerHTML() on <figcaption>]
+  [Element.getInnerHTML() on <rp>]
     expected: FAIL
 
-  [getInnerHTML() on <footer>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <ul>]
     expected: FAIL
 
-  [getInnerHTML() on <style>]
+  [ShadowRoot.getInnerHTML() on <code>]
     expected: FAIL
 
-  [getInnerHTML() on <param>]
+  [ShadowRoot.getInnerHTML() on <body>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <article>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <h6>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <dd>]
+  [ShadowRoot.getInnerHTML() on <h4>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <section>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <wbr>]
     expected: FAIL
 
-  [getInnerHTML() on <h2>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <u>]
+  [ShadowRoot.getInnerHTML() on <details>]
     expected: FAIL
 
-  [getInnerHTML() on <pre>]
+  [Element.getInnerHTML() on <hgroup>]
     expected: FAIL
 
-  [getInnerHTML() on <area>]
+  [Element.getInnerHTML() on <header>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <header>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <del>]
     expected: FAIL
 
-  [getInnerHTML() on <aside>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <input>]
     expected: FAIL
 
-  [getInnerHTML() on <h3>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <h5>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <h4>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <head>]
     expected: FAIL
 
-  [getInnerHTML() on <h3>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <h3>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <del>]
+  [ShadowRoot.getInnerHTML() on <aside>, with mode=closed, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <div>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <tr>]
     expected: FAIL
 
-  [getInnerHTML() on <button>]
+  [Element.getInnerHTML() on <legend>]
     expected: FAIL
 
-  [getInnerHTML() on <details>]
+  [Element.getInnerHTML() on <dfn>]
     expected: FAIL
 
-  [getInnerHTML() on <h6>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <nav>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <output>]
+  [ShadowRoot.getInnerHTML() on <datalist>]
     expected: FAIL
 
-  [getInnerHTML() on <code>]
+  [Element.getInnerHTML() on <head>]
     expected: FAIL
 
-  [getInnerHTML() on <th>]
+  [ShadowRoot.getInnerHTML() on <title>]
     expected: FAIL
 
-  [getInnerHTML() on <thead>]
+  [ShadowRoot.getInnerHTML() on <iframe>]
     expected: FAIL
 
-  [getInnerHTML() on <bdi>]
+  [ShadowRoot.getInnerHTML() on <h6>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <p>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <meter>]
     expected: FAIL
 
-  [getInnerHTML() on <h3>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <video>]
     expected: FAIL
 
-  [getInnerHTML() on <form>]
+  [Element.getInnerHTML() on <canvas>]
     expected: FAIL
 
-  [getInnerHTML() on <fieldset>]
+  [ShadowRoot.getInnerHTML() on <header>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <object>]
+  [ShadowRoot.getInnerHTML() on <fieldset>]
     expected: FAIL
 
-  [getInnerHTML() on <script>]
+  [ShadowRoot.getInnerHTML() on <h6>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <select>]
+  [Element.getInnerHTML() on <param>]
     expected: FAIL
 
-  [getInnerHTML() on <ins>]
+  [ShadowRoot.getInnerHTML() on <caption>]
     expected: FAIL
 
-  [getInnerHTML() on <s>]
+  [ShadowRoot.getInnerHTML() on <ol>]
     expected: FAIL
 
-  [getInnerHTML() on <h6>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <small>]
     expected: FAIL
 
-  [getInnerHTML() on <article>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <body>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <section>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <optgroup>]
     expected: FAIL
 
-  [getInnerHTML() on <sub>]
+  [ShadowRoot.getInnerHTML() on <h3>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <samp>]
+  [ShadowRoot.getInnerHTML() on <ins>]
     expected: FAIL
 
-  [getInnerHTML() on <header>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <nav>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <canvas>]
+  [Element.getInnerHTML() on <h4>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=true.]
+  [Element.getInnerHTML() on <base>]
     expected: FAIL
 
-  [getInnerHTML() on <div>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <rt>]
     expected: FAIL
 
-  [getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <h5>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <ol>]
+  [ShadowRoot.getInnerHTML() on <p>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <datalist>]
+  [Element.getInnerHTML() on <aside>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <article>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <article>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <textarea>]
+  [ShadowRoot.getInnerHTML() on <h4>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <footer>, with mode=closed, delegatesFocus=false.]
+  [Element.getInnerHTML() on <h4>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <body>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <h2>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <q>]
     expected: FAIL
 
-  [getInnerHTML() on <noscript>]
+  [Element.getInnerHTML() on <style>]
     expected: FAIL
 
-  [getInnerHTML() on <optgroup>]
+  [ShadowRoot.getInnerHTML() on <html>]
     expected: FAIL
 
-  [getInnerHTML() on <tr>]
+  [Element.getInnerHTML() on <h1>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <kbd>]
+  [ShadowRoot.getInnerHTML() on <h1>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <span>, with mode=open, delegatesFocus=false.]
+  [Element.getInnerHTML() on <h5>, with mode=closed, delegatesFocus=false.]
     expected: FAIL
 
-  [getInnerHTML() on <aside>, with mode=closed, delegatesFocus=false.]
+  [ShadowRoot.getInnerHTML() on <menu>]
     expected: FAIL
 
-  [getInnerHTML() on <source>]
+  [Element.getInnerHTML() on <h2>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <h5>, with mode=open, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <object>]
     expected: FAIL
 
-  [getInnerHTML() on <iframe>]
+  [ShadowRoot.getInnerHTML() on <tbody>]
     expected: FAIL
 
-  [getInnerHTML() on <rt>]
+  [Element.getInnerHTML() on <audio>]
     expected: FAIL
 
-  [getInnerHTML() on <body>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <img>]
     expected: FAIL
 
-  [getInnerHTML() on <head>]
+  [ShadowRoot.getInnerHTML() on <aside>, with mode=open, delegatesFocus=true.]
     expected: FAIL
 
-  [getInnerHTML() on <div>, with mode=closed, delegatesFocus=true.]
+  [ShadowRoot.getInnerHTML() on <cite>]
     expected: FAIL
 
-  [getInnerHTML() on <h5>, with mode=closed, delegatesFocus=true.]
+  [Element.getInnerHTML() on <source>]
     expected: FAIL
 
-  [getInnerHTML() on <htmlunknown>]
+  [Element.getInnerHTML() on <h4>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <aside>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <command>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <select>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <nav>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <div>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <dfn>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <u>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <body>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <footer>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <p>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h2>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h6>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <title>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <article>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <label>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <option>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <ruby>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <colgroup>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <td>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <article>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <bdi>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h2>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <ruby>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <map>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <u>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <abbr>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <script>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h6>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <header>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <span>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <footer>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <thead>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <htmlunknown>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <dt>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <span>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <track>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <em>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <output>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <col>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <time>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <div>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <section>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <section>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <dd>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <aside>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <div>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <header>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <q>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h3>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <nav>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <datalist>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <div>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <table>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h5>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <fieldset>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <time>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h3>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <pre>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <thead>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h3>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <footer>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <track>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <hr>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <audio>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h5>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <strong>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h2>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h2>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <noscript>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h4>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <ol>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <article>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <span>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <embed>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <footer>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <a>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <ul>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <link>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <br>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <article>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <dialog>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <blockquote>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <footer>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <p>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <section>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <figure>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <b>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <htmlunknown>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <header>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <code>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <img>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <button>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <footer>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <em>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <noscript>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <base>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <bdi>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <cite>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <figcaption>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <aside>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <aside>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <span>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <meter>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h5>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <nav>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <nav>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <span>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <i>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <div>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <kbd>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <section>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <mark>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <colgroup>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h3>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <select>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <keygen>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <iframe>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <mark>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <col>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <rt>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <header>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h4>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <hr>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <form>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <section>, with mode=open, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <tfoot>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <figure>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h6>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <li>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h1>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <output>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <meta>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <ins>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h6>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <br>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h1>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <h6>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <b>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <h1>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <address>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <th>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <li>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <progress>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <blockquote>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <source>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <body>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <area>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <label>]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <div>, with mode=closed, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <p>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [ShadowRoot.getInnerHTML() on <param>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <menu>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <section>, with mode=closed, delegatesFocus=true.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <input>]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <div>, with mode=open, delegatesFocus=false.]
+    expected: FAIL
+
+  [Element.getInnerHTML() on <footer>, with mode=open, delegatesFocus=false.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/setinnerhtml.tentative.html.ini firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/setinnerhtml.tentative.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/shadow-dom/declarative/setinnerhtml.tentative.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/shadow-dom/declarative/setinnerhtml.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,322 +0,0 @@
-[setinnerhtml.tentative.html]
-  [setInnerHTML() on <em>]
-    expected: FAIL
-
-  [setInnerHTML() on <footer>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <ol>]
-    expected: FAIL
-
-  [setInnerHTML() on <span>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <audio>]
-    expected: FAIL
-
-  [setInnerHTML() on <fieldset>]
-    expected: FAIL
-
-  [setInnerHTML() on <map>]
-    expected: FAIL
-
-  [setInnerHTML() on <label>]
-    expected: FAIL
-
-  [setInnerHTML() on <a>]
-    expected: FAIL
-
-  [setInnerHTML() on <html>]
-    expected: FAIL
-
-  [setInnerHTML() on <td>]
-    expected: FAIL
-
-  [setInnerHTML() on <dfn>]
-    expected: FAIL
-
-  [setInnerHTML() on <h3>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <style>]
-    expected: FAIL
-
-  [setInnerHTML() on <address>]
-    expected: FAIL
-
-  [setInnerHTML() on <meta>]
-    expected: FAIL
-
-  [setInnerHTML() on <form>]
-    expected: FAIL
-
-  [setInnerHTML() on <aside>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <div>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <option>]
-    expected: FAIL
-
-  [setInnerHTML() on <del>]
-    expected: FAIL
-
-  [setInnerHTML() on <details>]
-    expected: FAIL
-
-  [setInnerHTML() on <figure>]
-    expected: FAIL
-
-  [setInnerHTML() on <optgroup>]
-    expected: FAIL
-
-  [setInnerHTML() on <time>]
-    expected: FAIL
-
-  [setInnerHTML() on <param>]
-    expected: FAIL
-
-  [setInnerHTML() on <hgroup>]
-    expected: FAIL
-
-  [setInnerHTML() on <h6>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <cite>]
-    expected: FAIL
-
-  [setInnerHTML() on <menu>]
-    expected: FAIL
-
-  [setInnerHTML() on <section>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <area>]
-    expected: FAIL
-
-  [setInnerHTML() on <caption>]
-    expected: FAIL
-
-  [setInnerHTML() on <base>]
-    expected: FAIL
-
-  [setInnerHTML() on <abbr>]
-    expected: FAIL
-
-  [setInnerHTML() on <rp>]
-    expected: FAIL
-
-  [setInnerHTML() on <li>]
-    expected: FAIL
-
-  [setInnerHTML() on <table>]
-    expected: FAIL
-
-  [setInnerHTML() on <pre>]
-    expected: FAIL
-
-  [setInnerHTML() on <u>]
-    expected: FAIL
-
-  [setInnerHTML() on <bdi>]
-    expected: FAIL
-
-  [setInnerHTML() on <h4>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <var>]
-    expected: FAIL
-
-  [setInnerHTML() on <thead>]
-    expected: FAIL
-
-  [setInnerHTML() on <ins>]
-    expected: FAIL
-
-  [setInnerHTML() on <h2>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <video>]
-    expected: FAIL
-
-  [setInnerHTML() on <code>]
-    expected: FAIL
-
-  [setInnerHTML() on <th>]
-    expected: FAIL
-
-  [setInnerHTML() on <output>]
-    expected: FAIL
-
-  [setInnerHTML() on <samp>]
-    expected: FAIL
-
-  [setInnerHTML() on <article>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <input>]
-    expected: FAIL
-
-  [setInnerHTML() on <sub>]
-    expected: FAIL
-
-  [setInnerHTML() on <link>]
-    expected: FAIL
-
-  [setInnerHTML() on <title>]
-    expected: FAIL
-
-  [setInnerHTML() on <p>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <blockquote>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <iframe>]
-    expected: FAIL
-
-  [setInnerHTML() on <meter>]
-    expected: FAIL
-
-  [setInnerHTML() on <colgroup>]
-    expected: FAIL
-
-  [setInnerHTML() on <wbr>]
-    expected: FAIL
-
-  [setInnerHTML() on <tbody>]
-    expected: FAIL
-
-  [setInnerHTML() on <embed>]
-    expected: FAIL
-
-  [setInnerHTML() on <br>]
-    expected: FAIL
-
-  [setInnerHTML() on <mark>]
-    expected: FAIL
-
-  [setInnerHTML() on <img>]
-    expected: FAIL
-
-  [setInnerHTML() on <ul>]
-    expected: FAIL
-
-  [setInnerHTML() on <textarea>]
-    expected: FAIL
-
-  [setInnerHTML() on <strong>]
-    expected: FAIL
-
-  [setInnerHTML() on <ruby>]
-    expected: FAIL
-
-  [setInnerHTML() on <script>]
-    expected: FAIL
-
-  [setInnerHTML() on <htmlunknown>]
-    expected: FAIL
-
-  [setInnerHTML() on <noscript>]
-    expected: FAIL
-
-  [setInnerHTML() on <s>]
-    expected: FAIL
-
-  [setInnerHTML() on <button>]
-    expected: FAIL
-
-  [setInnerHTML() on <legend>]
-    expected: FAIL
-
-  [setInnerHTML() on <h1>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <hr>]
-    expected: FAIL
-
-  [setInnerHTML() on <figcaption>]
-    expected: FAIL
-
-  [setInnerHTML() on <nav>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <dt>]
-    expected: FAIL
-
-  [setInnerHTML() on <head>]
-    expected: FAIL
-
-  [setInnerHTML() on <command>]
-    expected: FAIL
-
-  [setInnerHTML() on <header>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <col>]
-    expected: FAIL
-
-  [setInnerHTML() on <keygen>]
-    expected: FAIL
-
-  [setInnerHTML() on <rt>]
-    expected: FAIL
-
-  [setInnerHTML() on <track>]
-    expected: FAIL
-
-  [setInnerHTML() on <canvas>]
-    expected: FAIL
-
-  [setInnerHTML() on <progress>]
-    expected: FAIL
-
-  [setInnerHTML() on <tr>]
-    expected: FAIL
-
-  [setInnerHTML() on <dd>]
-    expected: FAIL
-
-  [setInnerHTML() on <h5>, with declarative Shadow DOM.]
-    expected: FAIL
-
-  [setInnerHTML() on <tfoot>]
-    expected: FAIL
-
-  [setInnerHTML() on <object>]
-    expected: FAIL
-
-  [setInnerHTML() on <bdo>]
-    expected: FAIL
-
-  [setInnerHTML() on <i>]
-    expected: FAIL
-
-  [setInnerHTML() on <kbd>]
-    expected: FAIL
-
-  [setInnerHTML() on <b>]
-    expected: FAIL
-
-  [setInnerHTML() on <small>]
-    expected: FAIL
-
-  [setInnerHTML() on <dialog>]
-    expected: FAIL
-
-  [setInnerHTML() on <q>]
-    expected: FAIL
-
-  [setInnerHTML() on <datalist>]
-    expected: FAIL
-
-  [setInnerHTML() on <source>]
-    expected: FAIL
-
-  [setInnerHTML() on <dl>]
-    expected: FAIL
-
-  [setInnerHTML() on <select>]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/storage/buckets/buckets_basic.tentative.https.any.js.ini firefox-85.0+build1/testing/web-platform/meta/storage/buckets/buckets_basic.tentative.https.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/storage/buckets/buckets_basic.tentative.https.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/storage/buckets/buckets_basic.tentative.https.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,67 @@
+[buckets_basic.tentative.https.any.worker.html]
+  [delete() does nothing if bucket name does not exist]
+    expected: FAIL
+
+  [openOrCreate() does not store duplicate bucket name]
+    expected: FAIL
+
+  [delete() removes stored bucket name]
+    expected: FAIL
+
+  [keys() lists all stored bucket names alphabetically]
+    expected: FAIL
+
+  [openOrCreate() stores bucket name]
+    expected: FAIL
+
+
+[buckets_basic.tentative.https.any.sharedworker.html]
+  [delete() does nothing if bucket name does not exist]
+    expected: FAIL
+
+  [openOrCreate() does not store duplicate bucket name]
+    expected: FAIL
+
+  [delete() removes stored bucket name]
+    expected: FAIL
+
+  [keys() lists all stored bucket names alphabetically]
+    expected: FAIL
+
+  [openOrCreate() stores bucket name]
+    expected: FAIL
+
+
+[buckets_basic.tentative.https.any.html]
+  [delete() does nothing if bucket name does not exist]
+    expected: FAIL
+
+  [openOrCreate() does not store duplicate bucket name]
+    expected: FAIL
+
+  [delete() removes stored bucket name]
+    expected: FAIL
+
+  [keys() lists all stored bucket names alphabetically]
+    expected: FAIL
+
+  [openOrCreate() stores bucket name]
+    expected: FAIL
+
+
+[buckets_basic.tentative.https.any.serviceworker.html]
+  [delete() does nothing if bucket name does not exist]
+    expected: FAIL
+
+  [openOrCreate() does not store duplicate bucket name]
+    expected: FAIL
+
+  [delete() removes stored bucket name]
+    expected: FAIL
+
+  [keys() lists all stored bucket names alphabetically]
+    expected: FAIL
+
+  [openOrCreate() stores bucket name]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/streams/transferable/window.html.ini firefox-85.0+build1/testing/web-platform/meta/streams/transferable/window.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/streams/transferable/window.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/streams/transferable/window.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,12 +1,8 @@
 [window.html]
   expected:
-    if (os == "win") and not debug and not fission and not webrender and (processor == "x86_64"): ["ERROR", "OK"]
-    if (os == "linux") and not webrender and not debug and (processor == "x86"): ["ERROR", "OK"]
-    if (os == "linux") and webrender and not debug and fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and not debug and not fission: ["ERROR", "OK"]
-    if (os == "linux") and webrender and debug and not fission: ["ERROR", "OK"]
-    if (os == "win") and debug and not webrender and (processor == "x86"): ["ERROR", "OK"]
-    [OK, ERROR]
+    if (os == "linux") and not webrender and not debug and (processor == "x86_64"): ["OK", "ERROR"]
+    if (os == "mac") and not debug: ["OK", "ERROR"]
+    [ERROR, OK]
   [transfer to and from an iframe should work]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/floating-point-total-queue-size.any.js.ini firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/floating-point-total-queue-size.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/floating-point-total-queue-size.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/floating-point-total-queue-size.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,11 @@
 [floating-point-total-queue-size.any.js]
   type: testharness
   disabled: need to pass --enable-writable-streams to the shell to run these
+
+[floating-point-total-queue-size.any.sharedworker.html]
+
+[floating-point-total-queue-size.any.worker.html]
+
+[floating-point-total-queue-size.any.serviceworker.html]
+
+[floating-point-total-queue-size.any.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/properties.any.js.ini firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/properties.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/properties.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/properties.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,11 @@
 [properties.any.js]
   type: testharness
   disabled: need to pass --enable-writable-streams to the shell to run these
+
+[properties.any.serviceworker.html]
+
+[properties.any.sharedworker.html]
+
+[properties.any.html]
+
+[properties.any.worker.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/start.any.js.ini firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/start.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/streams/writable-streams/start.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/streams/writable-streams/start.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,11 @@
 [start.any.js]
   type: testharness
   disabled: need to pass --enable-writable-streams to the shell to run these
+
+[start.any.serviceworker.html]
+
+[start.any.sharedworker.html]
+
+[start.any.html]
+
+[start.any.worker.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini firefox-85.0+build1/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [correct-events-for-short-animations-with-syncbases.html]
   [Correct events for short animations with syncbases]
     expected:
-      if (os == "android") and debug and webrender: ["FAIL", "PASS"]
+      if debug and (os == "linux") and webrender and not fission: ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini firefox-85.0+build1/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,5 @@
 [pathlength-001.svg]
   expected:
     if (os == "linux") and not webrender: PASS
+    if (os == "win") and (bits == 32) and not webrender: PASS
     FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/uievents/interface/click-event.htm.ini firefox-85.0+build1/testing/web-platform/meta/uievents/interface/click-event.htm.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/uievents/interface/click-event.htm.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/uievents/interface/click-event.htm.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[click-event.htm]
+  [synthetic click event is a PointerEvent]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/uievents/mouse/layout_change_should_fire_mouseover.html.ini firefox-85.0+build1/testing/web-platform/meta/uievents/mouse/layout_change_should_fire_mouseover.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/uievents/mouse/layout_change_should_fire_mouseover.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/uievents/mouse/layout_change_should_fire_mouseover.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,9 +1,9 @@
 [layout_change_should_fire_mouseover.html]
   [Tests that the mouseover event is fired and the element has a hover effect when the element underneath the mouse cursor is changed.]
     expected:
-      if (os == "win") and not fission and webrender and not debug: ["PASS", "FAIL"]
-      if (os == "linux") and not fission and webrender and not debug: ["FAIL", "PASS"]
-      if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
-      if (os == "win") and fission: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
+      if (os == "win") and webrender and not debug and fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and not debug: ["PASS", "FAIL"]
+      if (os == "win") and webrender and debug: ["PASS", "FAIL"]
       if os == "android": FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/upgrade-insecure-requests/link-upgrade.sub.https.html.ini firefox-85.0+build1/testing/web-platform/meta/upgrade-insecure-requests/link-upgrade.sub.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/upgrade-insecure-requests/link-upgrade.sub.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/upgrade-insecure-requests/link-upgrade.sub.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,7 @@
 [link-upgrade.sub.https.html]
   expected:
     if fission and (os == "linux") and not debug: ["OK", "CRASH"]
+  max-asserts: 3
   [./link-upgrade/iframe-top-navigation-upgrade-1.sub.html]
     expected: TIMEOUT
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/url/failure.html.ini firefox-85.0+build1/testing/web-platform/meta/url/failure.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/url/failure.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/url/failure.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [failure.html]
+  max-asserts: 3
   expected:
     if fission and (os == "win"): ["OK", "ERROR", "CRASH"]
-  max-asserts: 3
   [URL's href: file://example:1/ should throw]
     expected: FAIL
 
@@ -536,7 +536,6 @@
       if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
       if (os == "win") and fission: FAIL
       if os == "android": ["FAIL", "PASS"]
-      if (os == "mac") and debug and fission: FAIL
 
   [window.open(): file://%C2%AD/p should throw]
     expected: FAIL
@@ -555,10 +554,9 @@
 
   [Location's href: file://xn--/p should throw]
     expected:
-      if (os == "linux") and fission and debug: FAIL
       if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and fission and debug: FAIL
       if (os == "win") and fission: FAIL
-      if (os == "mac") and debug and fission: FAIL
       if os == "android": ["FAIL", "PASS"]
 
   [URL's href: file://xn--/p should throw]
@@ -575,10 +573,9 @@
 
   [Location's href: file://%C2%AD/p should throw]
     expected:
-      if (os == "linux") and fission and debug: FAIL
       if (os == "linux") and fission and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and fission and debug: FAIL
       if (os == "win") and fission: FAIL
-      if (os == "mac") and debug and fission: FAIL
       if os == "android": ["FAIL", "PASS"]
 
   [sendBeacon(): \\\\\\.\\Y: should throw]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/urlpattern/input.https.any.js.ini firefox-85.0+build1/testing/web-platform/meta/urlpattern/input.https.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/urlpattern/input.https.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/urlpattern/input.https.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,115 @@
+[input.https.any.html]
+  [init baseURL and single component, input baseURL and single component]
+    expected: FAIL
+
+  [init single component, input baseURL and single component]
+    expected: FAIL
+
+  [init baseURL and single component, input two components]
+    expected: FAIL
+
+  [init single component, input two components]
+    expected: FAIL
+
+  [init single component, input single component]
+    expected: FAIL
+
+  [init baseURL and single component, input string]
+    expected: FAIL
+
+  [init single component, input three components]
+    expected: FAIL
+
+  [init single component, input string]
+    expected: FAIL
+
+  [init baseURL and single component, input single component]
+    expected: FAIL
+
+
+[input.https.any.worker.html]
+  [init baseURL and single component, input baseURL and single component]
+    expected: FAIL
+
+  [init single component, input baseURL and single component]
+    expected: FAIL
+
+  [init baseURL and single component, input two components]
+    expected: FAIL
+
+  [init single component, input two components]
+    expected: FAIL
+
+  [init single component, input single component]
+    expected: FAIL
+
+  [init baseURL and single component, input string]
+    expected: FAIL
+
+  [init single component, input three components]
+    expected: FAIL
+
+  [init single component, input string]
+    expected: FAIL
+
+  [init baseURL and single component, input single component]
+    expected: FAIL
+
+
+[input.https.any.serviceworker.html]
+  [init baseURL and single component, input baseURL and single component]
+    expected: FAIL
+
+  [init single component, input baseURL and single component]
+    expected: FAIL
+
+  [init baseURL and single component, input two components]
+    expected: FAIL
+
+  [init single component, input two components]
+    expected: FAIL
+
+  [init single component, input single component]
+    expected: FAIL
+
+  [init baseURL and single component, input string]
+    expected: FAIL
+
+  [init single component, input three components]
+    expected: FAIL
+
+  [init single component, input string]
+    expected: FAIL
+
+  [init baseURL and single component, input single component]
+    expected: FAIL
+
+
+[input.https.any.sharedworker.html]
+  [init baseURL and single component, input baseURL and single component]
+    expected: FAIL
+
+  [init single component, input baseURL and single component]
+    expected: FAIL
+
+  [init baseURL and single component, input two components]
+    expected: FAIL
+
+  [init single component, input two components]
+    expected: FAIL
+
+  [init single component, input single component]
+    expected: FAIL
+
+  [init baseURL and single component, input string]
+    expected: FAIL
+
+  [init single component, input three components]
+    expected: FAIL
+
+  [init single component, input string]
+    expected: FAIL
+
+  [init baseURL and single component, input single component]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/urlpattern/pathname.https.any.js.ini firefox-85.0+build1/testing/web-platform/meta/urlpattern/pathname.https.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/urlpattern/pathname.https.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/urlpattern/pathname.https.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,175 @@
+[pathname.https.any.serviceworker.html]
+  [optional regexp group]
+    expected: FAIL
+
+  [group]
+    expected: FAIL
+
+  [optional repeated named group]
+    expected: FAIL
+
+  [optional repeated regexp group]
+    expected: FAIL
+
+  [repeated named group]
+    expected: FAIL
+
+  [named regexp group]
+    expected: FAIL
+
+  [repeated regexp group]
+    expected: FAIL
+
+  [repeated group]
+    expected: FAIL
+
+  [optional group]
+    expected: FAIL
+
+  [repeated optional group]
+    expected: FAIL
+
+  [regexp group]
+    expected: FAIL
+
+  [named group]
+    expected: FAIL
+
+  [fixed string]
+    expected: FAIL
+
+  [optional named group]
+    expected: FAIL
+
+
+[pathname.https.any.sharedworker.html]
+  [optional regexp group]
+    expected: FAIL
+
+  [group]
+    expected: FAIL
+
+  [optional repeated named group]
+    expected: FAIL
+
+  [optional repeated regexp group]
+    expected: FAIL
+
+  [repeated named group]
+    expected: FAIL
+
+  [named regexp group]
+    expected: FAIL
+
+  [repeated regexp group]
+    expected: FAIL
+
+  [repeated group]
+    expected: FAIL
+
+  [optional group]
+    expected: FAIL
+
+  [repeated optional group]
+    expected: FAIL
+
+  [regexp group]
+    expected: FAIL
+
+  [named group]
+    expected: FAIL
+
+  [fixed string]
+    expected: FAIL
+
+  [optional named group]
+    expected: FAIL
+
+
+[pathname.https.any.html]
+  [optional regexp group]
+    expected: FAIL
+
+  [group]
+    expected: FAIL
+
+  [optional repeated named group]
+    expected: FAIL
+
+  [optional repeated regexp group]
+    expected: FAIL
+
+  [repeated named group]
+    expected: FAIL
+
+  [named regexp group]
+    expected: FAIL
+
+  [repeated regexp group]
+    expected: FAIL
+
+  [repeated group]
+    expected: FAIL
+
+  [optional group]
+    expected: FAIL
+
+  [repeated optional group]
+    expected: FAIL
+
+  [regexp group]
+    expected: FAIL
+
+  [named group]
+    expected: FAIL
+
+  [fixed string]
+    expected: FAIL
+
+  [optional named group]
+    expected: FAIL
+
+
+[pathname.https.any.worker.html]
+  [optional regexp group]
+    expected: FAIL
+
+  [group]
+    expected: FAIL
+
+  [optional repeated named group]
+    expected: FAIL
+
+  [optional repeated regexp group]
+    expected: FAIL
+
+  [repeated named group]
+    expected: FAIL
+
+  [named regexp group]
+    expected: FAIL
+
+  [repeated regexp group]
+    expected: FAIL
+
+  [repeated group]
+    expected: FAIL
+
+  [optional group]
+    expected: FAIL
+
+  [repeated optional group]
+    expected: FAIL
+
+  [regexp group]
+    expected: FAIL
+
+  [named group]
+    expected: FAIL
+
+  [fixed string]
+    expected: FAIL
+
+  [optional named group]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/video-rvfc/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/video-rvfc/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1 @@
+leak-threshold: [default:3020800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback.html.ini firefox-85.0+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,7 @@
 [request-video-frame-callback.html]
   expected:
     if (os == "win") and debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if (os == "win") and debug and webrender: ["OK", "TIMEOUT"]
   [Test we can register a video.rVFC callback.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini firefox-85.0+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/video-rvfc/request-video-frame-callback-webrtc.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,8 @@
 [request-video-frame-callback-webrtc.https.html]
-  expected: ERROR
+  expected:
+    if (os == "linux") and fission and not debug: [ERROR, CRASH]
+    if (os == "android") and debug: ERROR
+    ERROR
   [Test video.requestVideoFrameCallback() parameters for WebRTC applications.]
     expected: TIMEOUT
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/target.html.ini firefox-85.0+build1/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/target.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/target.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/target.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,25 +1,25 @@
 [target.html]
   [Change target from an existing to a different non-existing pseudo-element by setting pseudoElement.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
   [Change target from null to a non-existing pseudoElement setting target first.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
   [Change target from an existing to a different non-existing pseudo-element by setting target.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
   [Change target from a non-existing to a different non-existing pseudo-element by setting target.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
   [Change target from null to a non-existing pseudoElement setting pseudoElement first.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
   [Change target from a non-existing to a different non-existing pseudo-element by setting pseudoElement.]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1615083
+    expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html.ini firefox-85.0+build1/testing/web-platform/meta/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webaudio/the-audio-api/the-convolvernode-interface/realtime-conv.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,13 @@
+[realtime-conv.html]
+  [X SNR is not greater than or equal to 83. Got -53.217347975452626.]
+    expected: FAIL
+
+  [X SNR is not greater than or equal to 83. Got -53.217347975452576.]
+    expected: FAIL
+
+  [< [test\] 1 out of 1 assertions were failed.]
+    expected: FAIL
+
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 1 tasks were failed.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/audio-decoder.any.js.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/audio-decoder.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/audio-decoder.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/audio-decoder.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,27 @@
+[audio-decoder.any.html]
+  [Test AudioDecoder.configure()]
+    expected: FAIL
+
+  [Verify closed AudioDecoder operations]
+    expected: FAIL
+
+  [Test AudioDecoder construction]
+    expected: FAIL
+
+  [Verify unconfigured AudioDecoder operations]
+    expected: FAIL
+
+
+[audio-decoder.any.worker.html]
+  [Test AudioDecoder.configure()]
+    expected: FAIL
+
+  [Verify closed AudioDecoder operations]
+    expected: FAIL
+
+  [Test AudioDecoder construction]
+    expected: FAIL
+
+  [Verify unconfigured AudioDecoder operations]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/audio-decoder.html.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/audio-decoder.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/audio-decoder.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/audio-decoder.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[audio-decoder.html]
-  [Test AudioDecoder construction]
-    expected: FAIL
-
-  [Test AudioDecoder.configure()]
-    expected: FAIL
-
-  [Verify closed AudioDecoder operations]
-    expected: FAIL
-
-  [Verify unconfigured AudioDecoder operations]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-decoder.any.js.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-decoder.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-decoder.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-decoder.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,57 @@
+[video-decoder.any.html]
+  [Test VideoDecoder.configure()]
+    expected: FAIL
+
+  [Verify reset() suppresses output and rejects flush]
+    expected: FAIL
+
+  [Decode corrupt VP9 frame]
+    expected: FAIL
+
+  [Decode VP9]
+    expected: FAIL
+
+  [Close while decoding corrupt VP9 frame]
+    expected: FAIL
+
+  [Test VideoDecoder construction]
+    expected: FAIL
+
+  [Decode empty VP9 frame]
+    expected: FAIL
+
+  [Verify unconfigured VideoDecoder operations]
+    expected: FAIL
+
+  [Verify closed VideoDecoder operations]
+    expected: FAIL
+
+
+[video-decoder.any.worker.html]
+  [Test VideoDecoder.configure()]
+    expected: FAIL
+
+  [Verify reset() suppresses output and rejects flush]
+    expected: FAIL
+
+  [Decode corrupt VP9 frame]
+    expected: FAIL
+
+  [Decode VP9]
+    expected: FAIL
+
+  [Close while decoding corrupt VP9 frame]
+    expected: FAIL
+
+  [Test VideoDecoder construction]
+    expected: FAIL
+
+  [Decode empty VP9 frame]
+    expected: FAIL
+
+  [Verify unconfigured VideoDecoder operations]
+    expected: FAIL
+
+  [Verify closed VideoDecoder operations]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-decoder.html.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-decoder.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-decoder.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-decoder.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-[video-decoder.html]
-  [Test VideoDecoder construction]
-    expected: FAIL
-
-  [Decode corrupt VP9 frame]
-    expected: FAIL
-
-  [Decode VP9]
-    expected: FAIL
-
-  [Close while decoding corrupt VP9 frame]
-    expected: FAIL
-
-  [Decode empty VP9 frame]
-    expected: FAIL
-
-  [Test VideoDecoder.configure()]
-    expected: FAIL
-
-  [Verify unconfigured VideoDecoder operations]
-    expected: FAIL
-
-  [Verify closed VideoDecoder operations]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame.any.js.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,33 @@
+[video-frame.any.html]
+  [Test we cannot read planar data from a destroyed VideoFrame.]
+    expected: FAIL
+
+  [Test we can read planar data from a VideoFrame.]
+    expected: FAIL
+
+  [Test we can construct an odd-sized VideoFrame.]
+    expected: FAIL
+
+  [Test we can construct a VideoFrame.]
+    expected: FAIL
+
+  [Test constructing VideoFrames from closed ImageBitmap throws.]
+    expected: FAIL
+
+
+[video-frame.any.worker.html]
+  [Test we cannot read planar data from a destroyed VideoFrame.]
+    expected: FAIL
+
+  [Test we can read planar data from a VideoFrame.]
+    expected: FAIL
+
+  [Test we can construct an odd-sized VideoFrame.]
+    expected: FAIL
+
+  [Test we can construct a VideoFrame.]
+    expected: FAIL
+
+  [Test constructing VideoFrames from closed ImageBitmap throws.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame.html.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-[video-frame.html]
-  [Test we can construct an odd-sized VideoFrame.]
-    expected: FAIL
-
-  [Test we can construct a VideoFrame.]
-    expected: FAIL
-
-  [Test we can read planar data from a VideoFrame.]
-    expected: FAIL
-
-  [Test we cannot read planar data from a destroyed VideoFrame.]
-    expected: FAIL
-
-  [Test constructing VideoFrames from closed ImageBitmap throws.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.any.js.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.any.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,39 @@
+[video-frame-serialization.any.worker.html]
+  [Verify cloning a destroyed frame throws.]
+    expected: FAIL
+
+  [Verify posting destroyed frames throws.]
+    expected: FAIL
+
+  [Verify destroying frames propagates accross contexts.]
+    expected: FAIL
+
+  [Verify destroying cloned frames doesn't propagate accross contexts.]
+    expected: FAIL
+
+  [Test we can clone a VideoFrame.]
+    expected: FAIL
+
+  [Verify destroying a frame doesn't affect its clones.]
+    expected: FAIL
+
+
+[video-frame-serialization.any.html]
+  [Verify cloning a destroyed frame throws.]
+    expected: FAIL
+
+  [Verify posting destroyed frames throws.]
+    expected: FAIL
+
+  [Verify destroying frames propagates accross contexts.]
+    expected: FAIL
+
+  [Verify destroying cloned frames doesn't propagate accross contexts.]
+    expected: FAIL
+
+  [Test we can clone a VideoFrame.]
+    expected: FAIL
+
+  [Verify destroying a frame doesn't affect its clones.]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.html.ini firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webcodecs/video-frame-serialization.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-[video-frame-serialization.html]
-  [Verify cloning a destroyed frame throws.]
-    expected: FAIL
-
-  [Verify posting destroyed frames throws.]
-    expected: FAIL
-
-  [Verify destroying frames propagates accross contexts.]
-    expected: FAIL
-
-  [Verify destroying cloned frames doesn't propagate accross contexts.]
-    expected: FAIL
-
-  [Test we can clone a VideoFrame.]
-    expected: FAIL
-
-  [Verify destroying a frame doesn't affect its clones.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/close_window/close.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/close_window/close.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/close_window/close.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/close_window/close.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,3 @@
 [close.py]
   expected:
-    if (os == "linux") and not debug and webrender: ["OK", "ERROR", "TIMEOUT"]
-    if (os == "linux") and not debug and not webrender: ["OK", "ERROR", "TIMEOUT"]
-    if (os == "linux") and debug: ["OK", "ERROR", "TIMEOUT"]
+    if os == "linux": ["OK", "ERROR", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/close_window/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/close_window/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/close_window/user_prompts.py.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/close_window/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-[user_prompts.py]
-  [test_accept[capabilities0-alert\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_ignore[capabilities0-alert\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_dismiss[capabilities0-alert\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_dismiss_and_notify[capabilities0-alert-None\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_default[alert-None\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_dismiss_and_notify[capabilities0-prompt-None\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_accept_and_notify[capabilities0-alert-None\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
-  [test_ignore[capabilities0-prompt\]]
-    expected:
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/delete_session/delete.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/delete_session/delete.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/delete_session/delete.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/delete_session/delete.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,4 @@
 [delete.py]
   expected:
     if (os == "linux") and not webrender and not debug: ["OK", "ERROR", "TIMEOUT"]
+    if (os == "win") and fission: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/element_click/stale.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/element_click/stale.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/element_click/stale.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/element_click/stale.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+[stale.py]
+  [test_is_stale]
+    expected:
+      if (os == "win") and (processor == "x86") and not debug: ["PASS", "FAIL"]
+      if (os == "mac") and not debug: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/execute_async_script/execute_async.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/execute_async_script/execute_async.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/execute_async_script/execute_async.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/execute_async_script/execute_async.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -13,13 +13,17 @@
 
   [test_abort_by_user_prompt[prompt\]]
     expected:
-      if (os == "linux") and not webrender and not debug: [PASS, FAIL]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
   [test_abort_by_user_prompt[alert\]]
     expected:
-      if (os == "linux") and debug and not webrender: [PASS, FAIL]
+      if debug and (os == "linux") and not webrender: ["PASS", "FAIL"]
 
   [test_no_browsing_context]
     expected:
       if debug and not webrender: ["PASS", "FAIL"]
 
+  [test_abort_by_user_prompt_twice[confirm\]]
+    expected:
+      if (os == "win") and webrender and not debug and not fission: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/execute_script/execute.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/execute_script/execute.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/execute_script/execute.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/execute_script/execute.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -21,6 +21,18 @@
 
   [test_abort_by_user_prompt[prompt\]]
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
-      if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if os == "mac": ["PASS", "FAIL"]
+
+  [test_abort_by_user_prompt_twice[confirm\]]
+    expected:
+      if debug and (os == "win") and (processor == "x86"): ["PASS", "FAIL"]
+      if debug and (os == "win") and (processor == "x86_64"): ["PASS", "FAIL"]
+
+  [test_abort_by_user_prompt_twice[prompt\]]
+    expected:
+      if (processor == "x86") and debug: ["PASS", "FAIL"]
+
+  [test_abort_by_user_prompt_twice[alert\]]
+    expected:
+      if (processor == "x86") and debug: ["FAIL", "PASS"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/fullscreen_window/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/fullscreen_window/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/fullscreen_window/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/fullscreen_window/user_prompts.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[user_prompts.py]
+  [test_ignore[capabilities0-alert\]]
+    expected:
+      if fission and (os == "win"): ["PASS", "ERROR"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_title/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_title/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_title/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_title/user_prompts.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[user_prompts.py]
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    expected:
+      if (os == "win") and webrender and not debug and not fission: ["PASS", "ERROR"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/get.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,5 +2,8 @@
   [test_payload]
     bug: 1563251
     expected:
-      if headless: FAIL
+      if not debug and not webrender and (os == "win") and (processor == "x86_64"): ["PASS", "FAIL"]
+      if not debug and not webrender and (os == "win") and (processor == "x86"): ["PASS", "FAIL"]
+      if not debug and webrender and (os == "mac"): ["PASS", "FAIL"]
+      if not debug and not webrender and (os == "linux"): ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/get_window_rect/user_prompts.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,100 @@
+[user_prompts.py]
+  [test_accept[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and fission and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and fission and debug: ["PASS", "FAIL"]
+      if (os == "linux") and not fission: ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and fission and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and fission and debug: ["PASS", "FAIL"]
+      if (os == "linux") and not fission: ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not webrender: ["FAIL", "PASS"]
+      if (os == "linux") and not debug: ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-alert\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-confirm\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-prompt\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and not debug and not fission and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and not fission and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug and fission: ["FAIL", "PASS"]
+      if (os == "linux") and debug: ["PASS", "FAIL"]
+
+  [test_default[confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/maximize_window/maximize.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,4 +2,5 @@
   [test_maximize_when_resized_to_max_size]
     expected:
       if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
+      if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/maximize_window/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/maximize_window/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/maximize_window/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/maximize_window/user_prompts.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,97 @@
+[user_prompts.py]
+  [test_accept[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and debug and webrender and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug: ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and debug and webrender and fission: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender and not fission: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and not debug: ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-alert\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-confirm\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-prompt\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/refresh/refresh.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/refresh/refresh.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/refresh/refresh.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/refresh/refresh.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[refresh.py]
+  [test_refresh_switches_to_parent_browsing_context]
+    expected:
+      if (os == "linux") and webrender and not debug and not fission: ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/set.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
   [test_negative_x_y]
     bug: 1563248
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
       if (os == "mac") and not debug: ["PASS", "FAIL"]
+      if (os == "mac") and debug: ["PASS", "FAIL"]
 
   [test_restore_from_minimized]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/user_prompts.py.ini firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/user_prompts.py.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/user_prompts.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webdriver/tests/set_window_rect/user_prompts.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,103 @@
+[user_prompts.py]
+  [test_accept[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and webrender and not debug and fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and not debug and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and fission: ["PASS", "FAIL"]
+      if (os == "linux") and not webrender: ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-confirm-True\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_accept_and_notify[capabilities0-prompt-\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and not fission and webrender and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and not fission and webrender and debug: ["PASS", "FAIL"]
+      if (os == "linux") and fission and debug: ["FAIL", "PASS"]
+      if (os == "linux") and fission and not debug: ["PASS", "FAIL"]
+      if (os == "linux") and not fission and not webrender: ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_dismiss_and_notify[capabilities0-prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-alert\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-confirm\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_ignore[capabilities0-prompt\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[alert-None\]]
+    bug: 1602701
+    expected:
+      if (os == "linux") and not fission and webrender and debug: ["PASS", "FAIL"]
+      if (os == "linux") and not fission and webrender and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and not fission and not webrender: ["PASS", "FAIL"]
+      if (os == "linux") and fission and debug: ["PASS", "FAIL"]
+      if (os == "linux") and fission and not debug: ["PASS", "FAIL"]
+
+  [test_default[confirm-False\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
+  [test_default[prompt-None\]]
+    bug: 1602701
+    expected:
+      if os == "linux": ["PASS", "FAIL"]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/web-nfc/NDEFWriter_write.https.html.ini firefox-85.0+build1/testing/web-platform/meta/web-nfc/NDEFWriter_write.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/web-nfc/NDEFWriter_write.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/web-nfc/NDEFWriter_write.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-[NDEFWriter_write.https.html]
-  [NDEFWriter.write with 'empty' record should succeed.]
-    expected: FAIL
-
-  [NDEFWriter.write NDEFMessage containing embedded records.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail if user permission is not granted.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail with NetworkError when NFC data transfer fails.]
-    expected: FAIL
-
-  [Test that promise is rejected with TypeError if NDEFMessageSource is invalid.]
-    expected: FAIL
-
-  [Check that provided NDEFWriteOptions values are correctly converted.]
-    expected: FAIL
-
-  [NDEFWriter.write should succeed to write data to an unformatted NFC device when the NDEFWriteOptions.overwrite is false.]
-    expected: FAIL
-
-  [NDEFWriter.write should ignore reading data when ignoreRead is true.]
-    expected: FAIL
-
-  [Synchronously signaled abort.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail if no implementation for NFC Mojo interface is available.]
-    expected: FAIL
-
-  [Test that mediaType should be set to 'application/octet-stream' if NDEFRecordInit.record's recordType is 'mime' and NDEFRecordInit.record's mediaType is undefined.]
-    expected: FAIL
-
-  [Test that NDEFWriter.write succeeds when message is ArrayBufferView.]
-    expected: FAIL
-
-  [Test that NDEFWriter.write succeeds when message is ArrayBuffer.]
-    expected: FAIL
-
-  [Test that promise is rejected with SyntaxError if NDEFMessageSource contains invalid records.]
-    expected: FAIL
-
-  [Test that WebNFC API is not accessible from iframe context.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail if abort write request before write happends.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail when the NFC device coming up does not expose NDEF technology.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail if signal is not an AbortSignal.]
-    expected: FAIL
-
-  [NDEFWriter.write should succeed to overwrite the existing data when the NDEFWriteOptions.overwrite is true.]
-    expected: FAIL
-
-  [Test that NDEFWriter.write succeeds when message is DOMString.]
-    expected: FAIL
-
-  [NDEFWriter.write should read data when ignoreRead is false.]
-    expected: FAIL
-
-  [NDEFWriter.write NDEFMessage containing text, mime, unknown, url, absolute-url and external records with default NDEFWriteOptions.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail when NFC HW is disabled.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail when there are NDEF records on the NFC device and NDEFWriteOptions.overwrite is false.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail if signal's aborted flag is set.]
-    expected: FAIL
-
-  [Check that default NDEFWriteOptions values are correctly set.]
-    expected: FAIL
-
-  [NDEFWriter.write should replace all previously configured write operations.]
-    expected: FAIL
-
-  [NDEFWriter.write should fail when NFC HW is not supported.]
-    expected: FAIL
-
-  [NDEFWriter.write should succeed when NFC HW is enabled]
-    expected: FAIL
-
-  [NDEFWriter.write NDEFMessage containing smart-poster record.]
-    expected: FAIL
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,3 @@
 prefs: [media.navigator.permission.disabled:true, media.navigator.streams.fake:true, privacy.resistFingerprinting.reduceTimerPrecision.jitter:false, privacy.reduceTimerPrecision:false, media.peerconnection.ice.trickle_grace_period:10000]
 lsan-allowed: [NS_NewRunnableFunction, ParentContentActorCreateFunc, mozilla::MediaPacket::Copy, mozilla::MediaPipeline::MediaPipeline, mozilla::runnable_args_func]
-leak-threshold: [default:2969600]
+leak-threshold: [default:3020800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/bundle.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,15 +1,17 @@
 [bundle.https.html]
   expected:
-    if (processor == "x86") and debug: ["OK", "TIMEOUT"]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR, CRASH]
+    if (os == "win") and (processor == "x86") and debug: [OK, TIMEOUT]
   [not negotiating BUNDLE creates two separate ice and dtls transports]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (processor == "x86") and debug: ["FAIL", "TIMEOUT"]
+      if (processor == "x86") and debug: [FAIL, TIMEOUT]
       FAIL
 
   [bundles on the first transport and closes the second]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (processor == "x86") and debug: ["FAIL", "TIMEOUT", "NOTRUN"]
+      if (processor == "x86") and debug: [FAIL, TIMEOUT, NOTRUN]
       FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,2 +1,2 @@
 lsan-allowed: [Create, CreateNullDecoderModule, IPC::Channel::Channel, MakeRefPtr, MakeUnique, NewPage, NewSegment, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RevocableStore::RevocableStore, allocate, already_AddRefed, maybe_pod_malloc, mozilla::FFmpegDecoderModule, mozilla::KnowsCompositorVideo::TryCreateForIdentifier, mozilla::detail::UniqueSelector, mozilla::ipc::IProtocol::ActorConnected, mozilla::ipc::MessageChannel::Open, mozilla::layers::BufferTextureData::CreateInternal, mozilla::layers::ImageContainer::CreatePlanarYCbCrImage, mozilla::layers::ImageContainer::EnsureRecycleAllocatorForRDD, mozilla::layers::TextureClient::CreateIPDLActor, mozilla::layers::TextureClientRecycleAllocator::CreateOrRecycle, mozilla::layers::VideoBridgeChild::Open]
-leak-threshold: [default:51200]
+leak-threshold: [default:3020800, rdd:51200]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/handover.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/handover.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/handover.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/handover.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,7 @@
+[handover.html]
+  [Negotiation of handover initiated at callee works]
+    expected: FAIL
+
+  [Negotiation of handover initiated at caller works]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/rtp-payloadtypes.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/rtp-payloadtypes.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/rtp-payloadtypes.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/rtp-payloadtypes.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[rtp-payloadtypes.html]
+  [setRemoteDescription with a codec in the range 64-95 throws an InvalidAccessError]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/video-codecs.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/video-codecs.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/protocol/video-codecs.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/protocol/video-codecs.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,13 +1,14 @@
 [video-codecs.https.html]
+  max-asserts: 3
   [H.264 and VP8 should be supported in initial offer]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1534688
+    expected: FAIL
 
   [H.264 and VP8 should be negotiated after handshake]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1534687
+    expected: FAIL
 
   [All H.264 codecs MUST include profile-level-id]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1534687
+    expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCConfiguration-iceServers.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCConfiguration-iceServers.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCConfiguration-iceServers.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCConfiguration-iceServers.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -131,14 +131,6 @@
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1253706
     expected: FAIL
 
-  [new RTCPeerConnection(config) - with turns server, credentialType oauth, and string credential should throw InvalidAccessError]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1247616
-    expected: FAIL
-
-  [setConfiguration(config) - with turns server, credentialType oauth, and string credential should throw InvalidAccessError]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1247616, https://bugzilla.mozilla.org/show_bug.cgi?id=1253706
-    expected: FAIL
-
   [setConfiguration(config) - with empty urls should throw SyntaxError]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1253706
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDataChannel-close.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,25 +1,31 @@
 [RTCDataChannel-close.html]
-
   [Close datachannel causes onclosing and onclose to be called]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1611953
+    expected: FAIL
 
   [Close datachannel causes closing and close event to be called]
-    expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1641026
+    expected: FAIL
 
   [Close peerconnection causes close event and error to be called on datachannel]
-    expected: FAIL
     bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953
+    expected: FAIL
 
   [Close negotiated datachannel causes closing and close event to be called]
-    expected: FAIL
     bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1641026
+    expected: FAIL
 
   [Close negotiated datachannel causes onclosing and onclose to be called]
-    expected: FAIL
     bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953
+    expected: FAIL
 
   [Close peerconnection causes close event and error to be called on negotiated datachannel]
-    expected: FAIL
     bug: Probably https://bugzilla.mozilla.org/show_bug.cgi?id=1611953
+    expected: FAIL
+
+  [Close peerconnection causes close event and error on many channels, negotiated datachannel]
+    expected: FAIL
+
+  [Close peerconnection causes close event and error on many channels, datachannel]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDtlsTransport-state.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDtlsTransport-state.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDtlsTransport-state.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDtlsTransport-state.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,9 @@
 [RTCDtlsTransport-state.html]
   disabled:
     if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1654303
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "CRASH"]
+    if (os == "android") and debug and not webrender: ["OK", "CRASH"]
   [close() causes the other end's DTLS transport to close]
     expected:
       if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,7 @@
 [RTCDTMFSender-ontonechange.https.html]
   restart-after:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
-
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
+  expected:
+    if (os == "linux") and not debug and webrender and fission: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and not debug and webrender and not fission: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and not debug and not webrender: ["OK", "ERROR", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCDTMFSender-ontonechange-long.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,10 @@
 [RTCDTMFSender-ontonechange-long.https.html]
+  expected:
+    if (os == "linux") and not debug and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR, CRASH]
   [insertDTMF with duration greater than 6000 should be clamped to 6000]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1402717
     expected:
       if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, FAIL]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCIceConnectionState-candidate-pair.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[RTCIceConnectionState-candidate-pair.https.html]
+  expected:
+    if (os == "linux") and debug and not webrender: ["OK", "ERROR"]
+    if (os == "android") and debug and not webrender: ["OK", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,13 +1,13 @@
 [RTCPeerConnection-addIceCandidate-connectionSetup.html]
   expected:
     if (os == "linux") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
-    if (os == "android") and debug: ["OK", "TIMEOUT"]
     if (os == "linux") and not webrender: ["OK", "TIMEOUT"]
+    if (os == "android") and debug: ["OK", "TIMEOUT"]
   [Candidates are added at PC2; connection should work]
     expected:
       if (os == "linux") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
-      if (os == "linux") and not webrender: ["PASS", "NOTRUN"]
       if (os == "android") and debug: ["PASS", "NOTRUN"]
+      if (os == "linux") and not webrender: ["PASS", "NOTRUN"]
 
   [Candidates are added at PC1; connection should work]
     expected:
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-createDataChannel.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1,6 @@
-
+[RTCPeerConnection-createDataChannel.html]
+  expected:
+    if (os == "linux") and not fission and debug and webrender: ["OK", "ERROR"]
+    if (os == "linux") and not fission and debug and not webrender: ["OK", "ERROR"]
+    if (os == "linux") and fission and debug: ["OK", "ERROR"]
+    if (os == "linux") and fission and not debug: ["OK", "ERROR", "CRASH"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-getStats.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,24 +1,44 @@
 [RTCPeerConnection-getStats.https.html]
+  expected:
+    if (os == "linux") and not debug and webrender and fission: [TIMEOUT, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [TIMEOUT, ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender: [TIMEOUT, ERROR, CRASH]
+    TIMEOUT
   [getStats() with no argument should return stats report containing peer-connection stats on an empty PC]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1531087
     expected: FAIL
 
-  [getStats() with no argument should return stats report containing peer-connection stats and outbound-track-stats]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225720
-
-  [getStats() with no argument should return stats for no-stream tracks]
+  [getStats() with connected peer connections having tracks and data channel should return all mandatory to implement stats]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225720
     expected: FAIL
 
-  [getStats() on track associated with RtpSender should return stats report containing outbound-rtp stats]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225720
-    expected: FAIL
+  [getStats() on track associated with RTCRtpSender should return stats report containing outbound-rtp stats]
+    expected: NOTRUN
 
-  [getStats() on track associated with RtpReceiver should return stats report containing inbound-rtp stats]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723
-    expected: FAIL
+  [getStats() video outbound-rtp contains all mandatory stats]
+    expected: NOTRUN
 
-  [getStats() with connected peer connections having tracks and data channel should return all mandatory to implement stats]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225720
-    expected: FAIL
+  [getStats() audio outbound-rtp contains all mandatory stats]
+    expected: NOTRUN
+
+  [getStats(track) should not work if multiple senders have the same track]
+    expected: NOTRUN
+
+  [getStats() track without stream returns peer-connection and outbound-rtp stats]
+    expected: NOTRUN
+
+  [getStats() inbound-rtp contains all mandatory stats]
+    expected: NOTRUN
+
+  [getStats() track with stream returns peer-connection and outbound-rtp stats]
+    expected: TIMEOUT
+
+  [RTCStats.timestamp increases with time passing]
+    expected: NOTRUN
+
+  [getStats() audio and video validate all mandatory stats]
+    expected: NOTRUN
+
+  [getStats() on track associated with RTCRtpReceiver should return stats report containing inbound-rtp stats]
+    expected: NOTRUN
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-iceConnectionState.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,62 +1,74 @@
 [RTCPeerConnection-iceConnectionState.https.html]
   expected:
-    if (os == "win") and webrender and not debug and not fission: ["OK", "TIMEOUT"]
-    if os == "mac": ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and not debug and webrender: ["OK", "ERROR"]
+    if (os == "linux") and not fission and debug: ["OK", "ERROR"]
+    if (os == "win") and webrender and not fission: ["OK", "TIMEOUT"]
+    if (os == "mac") and debug: ["OK", "TIMEOUT"]
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [connection with one data channel should eventually have connected connection state]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1278299
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["FAIL", "TIMEOUT"]
+      if (os == "win") and webrender and not fission: ["FAIL", "TIMEOUT"]
       if os == "mac": ["FAIL", "TIMEOUT"]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy max-bundle]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["FAIL", "NOTRUN"]
-      if os == "mac": ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
+      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy max-compat]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["FAIL", "NOTRUN"]
-      if os == "mac": ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
+      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
+      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [iceConnectionState changes at the right time, with bundle policy balanced]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1307996
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["FAIL", "NOTRUN"]
-      if os == "mac": ["FAIL", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["FAIL", "NOTRUN"]
+      if (os == "mac") and debug: ["FAIL", "NOTRUN"]
+      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [Closing a PeerConnection should not fire iceconnectionstatechange event]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
-      if os == "mac": ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
 
   [ICE can connect in a recvonly usecase]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
-      if os == "mac": ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
 
   [connection with audio and video tracks should eventually have connected connection state]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
-      if os == "mac": ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
 
   [connection with audio track should eventually have connected connection state]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
-      if os == "mac": ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not fission: ["PASS", "TIMEOUT"]
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "mac") and debug: ["PASS", "TIMEOUT"]
 
   [Responder ICE connection state behaves as expected]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "NOTRUN"]
-      if os == "mac": ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not fission: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
 
   [connection with one data channel should eventually have connected or completed connection state]
     expected:
-      if (os == "win") and webrender and not debug and not fission: ["PASS", "TIMEOUT"]
-      if os == "mac": ["PASS", "FAIL"]
+      if (os == "win") and webrender and not fission: ["PASS", "TIMEOUT"]
+      if (os == "mac") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if (os == "mac") and debug: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnectionIceErrorEvent.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnectionIceErrorEvent.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnectionIceErrorEvent.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnectionIceErrorEvent.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+[RTCPeerConnectionIceErrorEvent.html]
+  [RTCPeerConnectionIceErrorEvent constructed from init parameters]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-mandatory-getStats.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,8 @@
 [RTCPeerConnection-mandatory-getStats.https.html]
+  expected:
+    if (os == "linux") and webrender and not debug and fission: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and not webrender and debug: ["OK", "ERROR", "CRASH"]
+    if (os == "linux") and not webrender and not debug: ["OK", "ERROR", "CRASH"]
   [RTCRtpStreamStats's transportId]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225723
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-ondatachannel.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,46 +1,52 @@
 [RTCPeerConnection-ondatachannel.html]
-  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
   expected:
-    if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "OK"]
+    if (os == "win") and (processor == "x86") and not debug: [TIMEOUT, OK]
     [OK, TIMEOUT]
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
   [In-band negotiated channel created on remote peer should match the same configuration as local peer]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and (processor == "x86_64") and not debug and webrender and not fission: ["PASS", "TIMEOUT", "NOTRUN"]
-      if (os == "win") and (processor == "x86") and not debug: ["TIMEOUT", "PASS"]
-      if (os == "mac") and not debug: ["PASS", "NOTRUN", "TIMEOUT"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN, TIMEOUT]
+      if (os == "win") and webrender and not debug and fission: [PASS, TIMEOUT, NOTRUN]
+      if (os == "win") and not webrender and not debug and (processor == "x86"): [TIMEOUT, PASS]
+      if (os == "mac") and not debug: [PASS, TIMEOUT, NOTRUN]
       [PASS, TIMEOUT]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
 
   [In-band negotiated channel created on remote peer should match the same (default) configuration as local peer]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and (processor == "x86") and not debug: ["NOTRUN", "PASS"]
+      if (os == "win") and (processor == "x86") and not debug: [NOTRUN, PASS]
       [PASS, NOTRUN]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
 
   [Open event should not be raised when sending and immediately closing the channel in the datachannel event]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
 
   [Negotiated channel should not fire datachannel event on remote peer]
-    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
     expected:
-      if (os == "win") and (processor == "x86") and not debug: ["NOTRUN", "PASS"]
+      if (os == "win") and (processor == "x86") and not debug: [NOTRUN, PASS]
       [PASS, NOTRUN]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1613433
 
   [Open event should be raised when closing the channel in the datachannel event after enqueuing a task]
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [Data channel event should fire when new data channel is announced to the remote peer]
     expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, TIMEOUT]
+      if (os == "mac") and not debug: [PASS, TIMEOUT]
 
   [Open event should not be raised when closing the channel in the datachannel event]
     expected:
-      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, NOTRUN]
 
   [Should be able to send data in a datachannel event handler]
     expected:
-      if (os == "mac") and not debug: ["PASS", "TIMEOUT", "NOTRUN"]
+      if (os == "win") and webrender and not debug and not fission: [PASS, NOTRUN]
+      if (os == "mac") and not debug: [PASS, TIMEOUT, NOTRUN]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,19 +1,19 @@
 [RTCPeerConnection-perfect-negotiation.https.html]
   expected:
-    if (processor == "x86_64") and fission and (os == "win"): ["OK", "CRASH"]
-    if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "OK"]
     if (processor == "x86") and (os == "win") and debug: ["OK", "TIMEOUT"]
+    if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "OK"]
+    if (processor == "x86_64") and fission and (os == "win"): ["OK", "CRASH"]
     if (processor == "x86") and (os == "linux"): ["OK", "TIMEOUT"]
   [Perfect negotiation setup connects with roles reversed]
     expected:
-      if (processor == "x86") and (os == "win") and debug: ["PASS", "NOTRUN"]
       if (processor == "x86") and (os == "win") and not debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and (os == "win") and debug: ["PASS", "NOTRUN"]
       if (processor == "x86") and (os == "linux"): ["PASS", "NOTRUN"]
 
   [Perfect negotiation glare with roles reversed]
     expected:
-      if (processor == "x86") and (os == "win") and debug: ["PASS", "NOTRUN"]
       if (processor == "x86") and (os == "win") and not debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and (os == "win") and debug: ["PASS", "NOTRUN"]
       if (processor == "x86") and (os == "linux"): ["PASS", "NOTRUN"]
 
   [Perfect negotiation glare]
@@ -24,7 +24,7 @@
 
   [Perfect negotiation setup connects]
     expected:
-      if (processor == "x86") and (os == "win") and debug: ["PASS", "TIMEOUT"]
       if (processor == "x86") and (os == "win") and not debug: ["TIMEOUT", "PASS"]
+      if (processor == "x86") and (os == "win") and debug: ["PASS", "TIMEOUT"]
       if (processor == "x86") and (os == "linux"): ["PASS", "TIMEOUT"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-remote-track-mute.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,32 +1,32 @@
 [RTCPeerConnection-remote-track-mute.https.html]
-  prefs: [media.peerconnection.mute_on_bye_or_timeout:true]
   expected:
-    if not debug and (os == "win") and webrender and not fission: ["OK", "TIMEOUT"]
-    if not debug and (os == "win") and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if not debug and (os == "linux") and not webrender: ["OK", "TIMEOUT"]
+    if (os == "win") and not debug and not fission and (processor == "x86_64"): [OK, TIMEOUT]
+    if (os == "linux") and webrender and not debug and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and webrender and not debug and not fission: [OK, ERROR]
+    if (os == "linux") and not webrender and debug: [OK, ERROR]
+    if (os == "linux") and not webrender and not debug: [OK, TIMEOUT, CRASH]
+    if (os == "linux") and webrender and debug: [OK, ERROR]
+  prefs: [media.peerconnection.mute_on_bye_or_timeout:true]
   [pc.close() on one side causes mute events on the other]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, NOTRUN]
 
   [Changing transceiver direction to 'sendrecv' unmutes the remote track]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "FAIL", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86"): ["PASS", "FAIL"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and not webrender and (processor == "x86"): [PASS, FAIL]
+      if (os == "win") and not debug and webrender and not fission: [PASS, FAIL, NOTRUN]
 
   [transceiver.stop() on one side (without renegotiation) causes mute events on the other]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, NOTRUN]
 
   [Changing transceiver direction to 'inactive' mutes the remote track]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "TIMEOUT", "NOTRUN"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "NOTRUN"]
+      if (os == "win") and not debug and not webrender and (processor == "x86_64"): [PASS, NOTRUN]
+      if (os == "win") and not debug and webrender and not fission: [PASS, TIMEOUT, NOTRUN]
 
   [ontrack: track goes from muted to unmuted]
     expected:
-      if (os == "win") and not debug and webrender and not fission: ["PASS", "TIMEOUT"]
-      if (os == "win") and not debug and not webrender and (processor == "x86_64"): ["PASS", "TIMEOUT"]
+      if (os == "win") and not debug and not fission and (processor == "x86_64"): [PASS, TIMEOUT]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,8 @@
 [RTCPeerConnection-setRemoteDescription-tracks.https.html]
   restart-after:
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
+  expected:
+    if (os == "linux") and debug and webrender and fission: [OK, ERROR]
+    if (os == "linux") and debug and webrender and not fission: [OK, ERROR]
+    if (os == "linux") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and debug: OK
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCPeerConnection-videoDetectorTest.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,9 @@
 [RTCPeerConnection-videoDetectorTest.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Signal detector detects track change within reasonable time]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526207
     expected:
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
       if os == "android" and nightly_build: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,9 @@
 [RTCRtpReceiver-getSynchronizationSources.https.html]
+  expected:
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR, CRASH]
   [[audio-only\] RTCRtpSynchronizationSource.voiceActivityFlag is a boolean]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1525394
     expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpSender-getStats.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpSender-getStats.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpSender-getStats.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpSender-getStats.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [RTCRtpSender-getStats.https.html]
   expected:
-    if (os == "win") and debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
-    if (os == "win") and debug and webrender: ["TIMEOUT", "OK"]
+    if (os == "win") and debug and (processor == "x86_64") and not webrender: [OK, TIMEOUT]
+    if (os == "win") and debug and (processor == "x86_64") and webrender: [OK, TIMEOUT]
   [sender.getStats() via addTransceiver should return stats report containing outbound-rtp stats]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1225720
     expected: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/RTCRtpTransceiver.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,117 +2,122 @@
   restart-after:
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1641237
   expected:
-    if (os == "win") and (processor == "x86") and debug: ["ERROR", "OK"]
-    if os == "android": ["OK", "CRASH"]
+    if (os == "linux") and debug and webrender and fission: ["OK", "ERROR", "CRASH"]
+    if (os == "win") and (processor == "x86") and debug: ["OK", "ERROR"]
+    if (os == "android") and not debug and not webrender: ["CRASH", "OK"]
+    if (os == "android") and not debug and webrender: ["OK", "CRASH"]
+    if (os == "linux") and debug and not webrender: ["OK", "ERROR", "CRASH"]
+    if (os == "android") and debug: ["OK", "CRASH"]
+    if (os == "linux") and not debug: ["OK", "ERROR", "CRASH"]
   [checkRemoteRollback]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStopAfterCreateOffer]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkLocalRollback]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStopAfterCreateAnswer]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStopAfterSetLocalAnswer]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStopAfterSetRemoteOffer]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStopAfterSetLocalOffer]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkStop]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "FAIL"]
+      if (processor == "x86") and debug: ["FAIL", "NOTRUN"]
       FAIL
 
   [checkAddIceCandidateToStoppedTransceiver]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkReplaceTrackNullDoesntPreventPairing]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTrackExistingTransceiverThenRemove]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkMsectionReuse]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTransceiverNoTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkRemoveTrackNegotiation]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkStopAfterClose]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTransceiverWithTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTransceiverThenAddTrackPairs]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkSendrecvWithTracklessStream]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTrackPairs]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkStopAfterCreateOfferWithReusedMsection]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkBundleTagRejected]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkMute]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkSendrecvWithNoSendTrack]
     expected:
-      if (processor == "x86") and debug: ["TIMEOUT", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "TIMEOUT"]
 
   [checkRemoveAndReadd]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkAddTransceiverThenReplaceTrackDoesntPair]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
   [checkRollbackAndSetRemoteOfferWithDifferentType]
     expected:
-      if (processor == "x86") and debug: ["NOTRUN", "PASS"]
+      if (processor == "x86") and debug: ["PASS", "NOTRUN"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/simplecall.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/simplecall.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/simplecall.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/simplecall.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,10 @@
+[simplecall.https.html]
+  expected:
+    if (os == "linux") and not fission and not debug and not webrender: [OK, ERROR, CRASH]
+    if (os == "linux") and not fission and not debug and webrender: [OK, ERROR, CRASH]
+    if (os == "linux") and fission: [OK, ERROR, CRASH]
+    if (os == "mac") and not debug: [OK, TIMEOUT]
+  [Can set up a basic WebRTC call.]
+    expected:
+      if (os == "mac") and not debug: [PASS, TIMEOUT]
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc/simplecall-no-ssrcs.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+[simplecall-no-ssrcs.https.html]
+  expected:
+    if (os == "linux") and not debug and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR, CRASH]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1 @@
+leak-threshold: [default:3020800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/RTCOAuthCredential.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/RTCOAuthCredential.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/RTCOAuthCredential.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/RTCOAuthCredential.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,13 @@
+[RTCOAuthCredential.html]
+  [new RTCPeerConnection(config) - with turns server, credentialType oauth, and string credential should throw InvalidAccessError]
+    expected: FAIL
+
+  [setConfiguration(config) - with turns server, credential type and credential from spec should not throw]
+    expected: FAIL
+
+  [setConfiguration(config) - with turns server, credentialType oauth, and string credential should throw InvalidAccessError]
+    expected: FAIL
+
+  [new RTCPeerConnection(config) - with turns server, credential type and credential from spec should not throw]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc-extensions/RTCRtpSynchronizationSource-captureTimestamp.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,8 @@
 [RTCRtpSynchronizationSource-captureTimestamp.html]
+  expected:
+    if (os == "linux") and debug and webrender and fission: [OK, ERROR]
+    if (os == "linux") and debug and not webrender: [OK, ERROR]
+    if (os == "android") and debug: OK
   [Audio and video RTCRtpSynchronizationSource.captureTimestamp are comparable]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc-insertable-streams/__dir__.ini firefox-85.0+build1/testing/web-platform/meta/webrtc-insertable-streams/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc-insertable-streams/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc-insertable-streams/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1,2 @@
 lsan-allowed: [NS_NewRunnableFunction, mozilla::MediaPacket::Copy, mozilla::MediaPipeline::MediaPipeline]
+leak-threshold: [default:3020800]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-legacy.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,9 @@
 [RTCPeerConnection-insertable-streams-legacy.https.html]
+  expected:
+    if (os == "linux") and not debug and webrender and fission: [OK, ERROR, CRASH]
+    if (os == "linux") and not debug and webrender and not fission: [OK, ERROR, CRASH]
+    if (os == "linux") and debug and fission: [OK, ERROR]
+    if (os == "linux") and not debug and not webrender: [OK, ERROR, CRASH]
   [Legacy API works]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html.ini firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_imports_blocked.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,6 @@
 [embedded_style_imports_blocked.html]
   expected:
-    if (os == "win") and not webrender and not debug and (processor == "x86"): ["FAIL", "PASS"]
-    if (os == "win") and not webrender and not debug and (processor == "x86_64"): ["PASS", "FAIL"]
-    if (os == "win") and not webrender and debug: ["PASS", "FAIL"]
-    if (os == "linux") and not webrender: ["PASS", "FAIL"]
+    if not webrender and (os == "win") and not debug and (processor == "x86"): [PASS, FAIL]
+    if not webrender and (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL]
+    if not webrender and (os == "win") and debug: [PASS, FAIL]
+    if not webrender and (os == "linux"): [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html.ini firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_multiple_tracks.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,7 @@
 [embedded_style_multiple_tracks.html]
   expected:
-    if not webrender and (processor == "x86_64") and (os == "linux") and debug: ["PASS", "FAIL"]
-    if not webrender and (processor == "x86_64") and (os == "linux") and not debug: ["PASS", "FAIL"]
-    if not webrender and (processor == "x86_64") and (os == "mac"): ["PASS", "FAIL"]
-    if not webrender and (processor == "x86_64") and (os == "win"): ["PASS", "FAIL"]
-    if not webrender and (processor == "x86_64") and (os == "android"): ["PASS", "FAIL"]
-    if not webrender and (processor == "x86"): ["PASS", "FAIL"]
+    if not webrender and (os == "linux") and debug: ["PASS", "FAIL"]
+    if not webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
+    if not webrender and (os == "mac"): ["PASS", "FAIL"]
+    if not webrender and (os == "win"): ["PASS", "FAIL"]
+    if not webrender and (os == "android"): ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html.ini firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/embedded_style_urls.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 [embedded_style_urls.html]
   expected:
-    if (os == "linux") and not webrender and not debug: ["FAIL", "PASS"]
-    if (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
     if (os == "win") and not webrender and debug: FAIL
     if (os == "win") and not webrender and not debug: ["FAIL", "PASS"]
+    if (os == "linux") and not webrender and not debug: ["PASS", "FAIL"]
+    if (os == "linux") and not webrender and debug: ["FAIL", "PASS"]
     if (os == "android") and not debug: ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html.ini firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/navigate_cue_position.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,6 +3,6 @@
     if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1557548
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1536762
   expected:
-    if debug and not fission and (os == "linux") and not webrender: ["PASS", "FAIL"]
-    if debug and not fission and (os == "linux") and webrender: ["FAIL", "PASS"]
-    if debug and not fission and (os == "mac"): ["PASS", "FAIL"]
+    if debug and not fission and (os == "mac") and webrender: ["PASS", "FAIL"]
+    if debug and not fission and (os == "mac") and not webrender: ["PASS", "FAIL"]
+    if debug and not fission and (os == "linux"): ["PASS", "FAIL"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/webxr/layers/xrWebGLBinding_constructor.https.html.ini firefox-85.0+build1/testing/web-platform/meta/webxr/layers/xrWebGLBinding_constructor.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/webxr/layers/xrWebGLBinding_constructor.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/webxr/layers/xrWebGLBinding_constructor.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,7 @@
+[xrWebGLBinding_constructor.https.html]
+  [Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl2]
+    expected: FAIL
+
+  [Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini firefox-85.0+build1/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[message-module-Error.html]
+  expected:
+    if (os == "android") and debug and webrender: ["OK", "TIMEOUT"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,5 @@
 [dedicated-worker-import.any.html]
-  expected:
-    ERROR
+  expected: ERROR
   [Static import.]
     expected: FAIL
 
@@ -22,6 +21,12 @@
   [eval(import()).]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
 
 [dedicated-worker-import.any.worker.html]
   expected: ERROR
@@ -46,3 +51,9 @@
   [eval(import()).]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -21,6 +21,12 @@
   [eval(import()).]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
 
 [dedicated-worker-import-blob-url.any.html]
   expected: ERROR
@@ -45,3 +51,9 @@
   [eval(import()).]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url.any.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -21,6 +21,12 @@
   [eval(import()).]
     expected: NOTRUN
 
+  [Static import (cross-origin).]
+    expected: NOTRUN
+
+  [Static import (redirect).]
+    expected: NOTRUN
+
 
 [dedicated-worker-import-data-url.any.worker.html]
   expected: ERROR
@@ -45,3 +51,9 @@
   [eval(import()).]
     expected: NOTRUN
 
+  [Static import (cross-origin).]
+    expected: NOTRUN
+
+  [Static import (redirect).]
+    expected: NOTRUN
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url-cross-origin.html.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url-cross-origin.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url-cross-origin.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-data-url-cross-origin.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,14 @@
+[dedicated-worker-import-data-url-cross-origin.html]
+  expected: ERROR
+  [static import script from data: URL should be allowed.]
+    expected: NOTRUN
+
+  [static import data url from data: URL should be allowed.]
+    expected: TIMEOUT
+
+  [dynamic import script from data: URL should be blocked.]
+    expected: NOTRUN
+
+  [dynamic import data url from data: URL should be allowed.]
+    expected: NOTRUN
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-referrer.html.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-referrer.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-referrer.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/dedicated-worker-import-referrer.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [dedicated-worker-import-referrer.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Same-origin static import with "no-referrer" referrer policy.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-blob-url.window.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-blob-url.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-blob-url.window.js.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-blob-url.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -20,3 +20,9 @@
   [Nested static import.]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-data-url.window.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-data-url.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-data-url.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-data-url.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -21,3 +21,9 @@
   [Nested static import.]
     expected: NOTRUN
 
+  [Static import (cross-origin).]
+    expected: NOTRUN
+
+  [Static import (redirect).]
+    expected: NOTRUN
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-referrer.html.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-referrer.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import-referrer.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import-referrer.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [shared-worker-import-referrer.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Cross-origin static import with "no-referrer" referrer policy.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import.window.js.ini firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import.window.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/modules/shared-worker-import.window.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/modules/shared-worker-import.window.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -20,3 +20,9 @@
   [Nested static import.]
     expected: FAIL
 
+  [Static import (cross-origin).]
+    expected: FAIL
+
+  [Static import (redirect).]
+    expected: FAIL
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/workers/WorkerPerformanceNow.html.ini firefox-85.0+build1/testing/web-platform/meta/workers/WorkerPerformanceNow.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/workers/WorkerPerformanceNow.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/workers/WorkerPerformanceNow.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1,2 @@
 prefs: [privacy.reduceTimerPrecision:false]
+[WorkerPerformanceNow.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/animation-worklet-csp.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/animation-worklet-csp.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/animation-worklet-csp.https.html.ini	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/animation-worklet-csp.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [animation-worklet-csp.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [A same-origin worklet importing a remote-origin-redirected script should not be blocked by the worker-src directive because worklets obey the script-src directive.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/animation-worklet-referrer.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/animation-worklet-referrer.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/animation-worklet-referrer.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/animation-worklet-referrer.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [animation-worklet-referrer.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Importing a same-origin script from a page that has "no-referrer" referrer policy should not send referrer.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/audio-worklet-csp.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/audio-worklet-csp.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/audio-worklet-csp.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/audio-worklet-csp.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [audio-worklet-csp.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [A same-origin worklet importing a remote-origin-redirected script should not be blocked by the worker-src directive because worklets obey the script-src directive.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/audio-worklet-referrer.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/audio-worklet-referrer.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/audio-worklet-referrer.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/audio-worklet-referrer.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [audio-worklet-referrer.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Importing a same-origin script from a same-origin worklet script that has "no-referrer" referrer policy should not send referrer.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/layout-worklet-csp.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/layout-worklet-csp.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/layout-worklet-csp.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/layout-worklet-csp.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [layout-worklet-csp.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [A same-origin worklet importing a remote-origin-redirected script should not be blocked by the worker-src directive because worklets obey the script-src directive.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/layout-worklet-referrer.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/layout-worklet-referrer.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/layout-worklet-referrer.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/layout-worklet-referrer.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,6 @@
 [layout-worklet-referrer.https.html]
+  expected:
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Importing a same-origin script from a page that has "no-referrer" referrer policy should not send referrer.]
     expected: FAIL
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/worklets/paint-worklet-csp.https.html.ini firefox-85.0+build1/testing/web-platform/meta/worklets/paint-worklet-csp.https.html.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/worklets/paint-worklet-csp.https.html.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/worklets/paint-worklet-csp.https.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,7 @@
 [paint-worklet-csp.https.html]
   expected:
-    if webrender and (os == "linux") and not debug and not fission: ["OK", "TIMEOUT"]
+    if (os == "linux") and not debug and webrender and not fission: ["OK", "TIMEOUT"]
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [A same-origin worklet importing a remote-origin-redirected script should not be blocked by the worker-src directive because worklets obey the script-src directive.]
     expected: FAIL
 
@@ -15,7 +16,7 @@
 
   [A same-origin worklet importing an insecure-origin-redirected script should be blocked because of mixed contents.]
     expected:
-      if webrender and (os == "linux") and not debug and not fission: ["FAIL", "TIMEOUT"]
+      if (os == "linux") and not debug and webrender and not fission: ["FAIL", "TIMEOUT"]
       FAIL
 
   [An insecure-origin-redirected worklet should be blocked because of mixed contents.]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/xhr/abort-upload-event-abort.any.js.ini firefox-85.0+build1/testing/web-platform/meta/xhr/abort-upload-event-abort.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/xhr/abort-upload-event-abort.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/xhr/abort-upload-event-abort.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1,11 +1,11 @@
 [abort-upload-event-abort.any.worker.html]
   expected:
-    if (os == "linux") and debug and webrender and not fission: ["OK", "TIMEOUT"]
-    if (os == "linux") and not debug and webrender and not fission: ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and not webrender and not debug and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and webrender: ["OK", "TIMEOUT"]
   [XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object]
     expected:
-      if (os == "linux") and not debug and webrender and not fission: ["PASS", "TIMEOUT"]
-      if (os == "linux") and debug and webrender and not fission: ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and not webrender and not debug and (processor == "x86_64"): ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and webrender: ["PASS", "TIMEOUT"]
 
 
 [abort-upload-event-abort.any.html]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/xhr/abort-upload-event-loadend.any.js.ini firefox-85.0+build1/testing/web-platform/meta/xhr/abort-upload-event-loadend.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/xhr/abort-upload-event-loadend.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/xhr/abort-upload-event-loadend.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -2,12 +2,16 @@
 
 [abort-upload-event-loadend.any.worker.html]
   expected:
-    if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "OK"]
-    if (os == "linux") and debug and not webrender: ["OK", "TIMEOUT"]
-    if (os == "linux") and not debug and not fission: ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and not debug and not webrender and (processor == "x86"): ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and not debug and not webrender and (processor == "x86_64"): ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and not debug and webrender: ["OK", "TIMEOUT"]
+    if (os == "linux") and not fission and debug: ["OK", "TIMEOUT"]
+    if (os == "linux") and fission and debug: ["OK", "TIMEOUT"]
   [XMLHttpRequest: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object]
     expected:
-      if (os == "linux") and debug and webrender and not fission: ["TIMEOUT", "PASS"]
-      if (os == "linux") and debug and not webrender: ["PASS", "TIMEOUT"]
-      if (os == "linux") and not debug and not fission: ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and not debug and not webrender and (processor == "x86"): ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and not debug and not webrender and (processor == "x86_64"): ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and not debug and webrender: ["PASS", "TIMEOUT"]
+      if (os == "linux") and fission and debug: ["PASS", "TIMEOUT"]
+      if (os == "linux") and not fission and debug: ["PASS", "TIMEOUT"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/xhr/event-timeout.any.js.ini firefox-85.0+build1/testing/web-platform/meta/xhr/event-timeout.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/xhr/event-timeout.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/xhr/event-timeout.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -5,6 +5,7 @@
     if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1557708
   [XMLHttpRequest: timeout event]
     expected:
+      if webrender and fission and (os == "linux") and debug: ["FAIL", "PASS"]
       if not webrender and (os == "linux") and debug: PASS
       if not webrender and (os == "win"): PASS
       [PASS, FAIL]
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/xhr/event-timeout-order.any.js.ini firefox-85.0+build1/testing/web-platform/meta/xhr/event-timeout-order.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/xhr/event-timeout-order.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/xhr/event-timeout-order.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -3,6 +3,6 @@
 [event-timeout-order.any.worker.html]
   [XMLHttpRequest: event - timeout (order of events)]
     expected:
-      if (os == "mac") and debug: ["FAIL", "PASS"]
+      if os == "mac": [FAIL, PASS]
       [PASS, FAIL]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini firefox-85.0+build1/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini
--- firefox-84.0.2+build1/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/meta/xhr/xhr-timeout-longtask.any.js.ini	2021-01-18 19:58:20.000000000 +0000
@@ -8,8 +8,9 @@
 [xhr-timeout-longtask.any.worker.html]
   [Long tasks should not trigger load timeout]
     expected:
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
-      if (os == "linux") and debug and not fission: ["PASS", "FAIL"]
+      if (os == "linux") and webrender and debug and not fission: ["PASS", "FAIL"]
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["PASS", "FAIL"]
       if (os == "mac") and debug: ["PASS", "FAIL"]
       if (os == "mac") and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and not webrender: ["PASS", "FAIL"]
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/metamerge.py firefox-85.0+build1/testing/web-platform/metamerge.py
--- firefox-84.0.2+build1/testing/web-platform/metamerge.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/metamerge.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import argparse
 import logging
 import os
diff -Nru firefox-84.0.2+build1/testing/web-platform/metasummary.py firefox-85.0+build1/testing/web-platform/metasummary.py
--- firefox-84.0.2+build1/testing/web-platform/metasummary.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/metasummary.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import argparse
 import json
 import logging
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-dynamic-module-circular.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-dynamic-module.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-dynamic-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-dynamic-module-error.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-circular.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-circular.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-circular.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-circular.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-module-circular.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-error.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-error.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-error.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module-error.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-module-error.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module.html.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module.html.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/async-module.html.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+[async-module.html]
+  disabled:
+    if release_or_beta: https://bugzilla.mozilla.org/show_bug.cgi?id=1681046
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/__dir__.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/__dir__.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/__dir__.ini	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/__dir__.ini	2021-01-18 19:58:20.000000000 +0000
@@ -1 +1 @@
-prefs: [dom.moduleScripts.enabled:true]
+prefs: [dom.moduleScripts.enabled:true, javascript.options.experimental.top_level_await:true]
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/meta/webdriver/new_session/debugger_address.py.ini firefox-85.0+build1/testing/web-platform/mozilla/meta/webdriver/new_session/debugger_address.py.ini
--- firefox-84.0.2+build1/testing/web-platform/mozilla/meta/webdriver/new_session/debugger_address.py.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/meta/webdriver/new_session/debugger_address.py.ini	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,15 @@
+[debugger_address.py]
+  disabled:
+    if os == 'win' and ccov: https://bugzilla.mozilla.org/show_bug.cgi?id=1677750
+
+  [test_debugger_address_true_fission_disabled[capabilities0\]]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1606604
+    expected:
+      if not nightly_build: FAIL
+    disabled:
+      if fission: (not supported due to Fission override)
+
+  [test_debugger_address_true_fission_override[capabilities0\]]
+    bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1606604
+    expected:
+      if not nightly_build: FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-circular.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load dynamically imported async modules circular</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load async dynamic module")
+  window.addEventListener("error", scriptError);
+  function scriptError(e) {
+    // An error is expected
+    test.step(() => assert_true(e.message !== "FAIL"));
+  }
+  function scriptLoaded() {
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_dynamic_module_circular.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module-error.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load dynamically imported async modules which errors</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load dynamically imported async modules with error")
+  window.addEventListener("error", scriptError);
+  function scriptError(e) {
+    // An error is expected
+    test.step(() => assert_true(e.message !== "FAIL"));
+  }
+  function scriptLoaded() {
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_dynamic_module_error.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-dynamic-module.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load dynamically imported async modules</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load async dynamic module")
+  window.addEventListener("error", scriptError);
+  function scriptError(e) {
+    // An error is expected
+    test.step(() => assert_true(e.message !== "FAIL"));
+  }
+  function scriptLoaded() {
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_dynamic_module.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-circular.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-circular.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-circular.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-circular.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load async modules circular</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load async module")
+  window.addEventListener("error", scriptError);
+  function scriptError(e) {
+    // An error is expected
+    test.step(() => assert_true(e.message !== "FAIL"));
+    test.done();
+  }
+  function scriptLoaded() {
+    test.step(() => assert_unreached("Should not load before error"));
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_module_circular.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()">
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-error.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-error.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-error.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module-error.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load an async module</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load dynamic async module with syntax error")
+  window.addEventListener("error", scriptError);
+  function scriptError(e) {
+    // An error is expected
+    test.step(() => assert_true(e.message !== "FAIL"));
+  }
+  function scriptLoaded() {
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_module_error.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module.html firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module.html
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/async-module.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Load dynamically imported async modules</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  setup({allow_uncaught_exception: true});
+  var test = async_test("Load async dynamic module")
+  function scriptLoaded() {
+    test.done();
+  }
+  function testNoError() {
+    test.step(() => assert_unreached("No event expected here"));
+    test.done();
+  }
+</script>
+<script type="module"
+				src="./support/async_module.js"
+        onerror="testNoError()"
+        onload="scriptLoaded()">
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_circular.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_circular.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_circular.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_circular.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+try {
+  var ns = await import('./async_test_module_circular_1.js');
+} catch(ns) {
+  throw Error("Fails as expected");
+};
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_error.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_error.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_error.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module_error.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+try {
+ await import('./bad_local_export.js');
+} catch(ns) {
+  throw Error("Fails as expected");
+};
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_dynamic_module.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,11 @@
+var ns = await import('./async_test_module.js');
+if (ns.default !== 42) {
+  throw new Error("FAIL");
+}
+if (ns.x !== "named") {
+  throw new Error("FAIL");
+}
+if (ns.y !== 39) {
+  throw new Error("FAIL");
+}
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_circular.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_circular.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_circular.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_circular.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+import module from './async_test_module_circular_1.js';
+
+throw new Error("FAIL");
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_error.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_error.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_error.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module_error.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,4 @@
+import ns from "./async_test_module_failure.js";
+
+throw Error("FAIL");
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_module.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,14 @@
+import nsPromise from './async_test_module.js';
+
+console.log("hi");
+let ns = await nsPromise;
+
+if (ns.default !== 42) {
+  throw new Error("FAIL");
+}
+if (ns.x !== "named") {
+  throw new Error("FAIL");
+}
+if (ns.y !== 39) {
+  throw new Error("FAIL");
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_1.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_1.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_1.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_1.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,3 @@
+import module from './async_test_module_circular_2.js';
+
+export default {};
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_2.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_2.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_2.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_2.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,5 @@
+import module from './async_test_module_circular_3.js';
+
+await module.test();
+
+export default {};
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_3.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_3.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_3.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_circular_3.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,8 @@
+import module from './async_test_module_circular_1.js';
+
+export default {
+  async test() {
+    throw new Error("error thrown");
+    return Promise.resolve()
+  }
+};
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_failure.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_failure.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_failure.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module_failure.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,6 @@
+export default 42;
+
+export const named = 'named';
+
+var rejection = Promise.reject(TypeError('I reject this!'));
+await rejection;
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module.js firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module.js
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/async_test_module.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,12 @@
+await 1;
+await 2;
+export default await Promise.resolve(42);
+
+export const y = await 39;
+export const x = await 'named';
+
+// Bonus: this rejection is not unwrapped
+if (false) {
+  await Promise.reject(42);
+}
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/evaluation-order-setup.mjs firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/evaluation-order-setup.mjs
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/evaluation-order-setup.mjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/evaluation-order-setup.mjs	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,19 @@
+globalThis.setup({allow_uncaught_exception: true});
+
+globalThis.log = [];
+
+globalThis.addEventListener("error",
+    event => globalThis.log.push("global-error", event.error.message));
+globalThis.addEventListener("onunhandledrejection",
+    event => globalThis.log.push('unhandled-promise-rejection'));
+globalThis.addEventListener("load",
+    event => globalThis.log.push("global-load"));
+
+globalThis.unreachable = function() {
+    globalThis.log.push("unreachable");
+}
+
+globalThis.test_load = async_test("Test evaluation order of modules");
+globalThis.testDone = globalThis.test_load.step_func_done(() => {
+  assert_array_equals(globalThis.log, globalThis.expectedLog);
+});
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/webdriver/new_session/conftest.py firefox-85.0+build1/testing/web-platform/mozilla/tests/webdriver/new_session/conftest.py
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/webdriver/new_session/conftest.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/webdriver/new_session/conftest.py	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,59 @@
+import pytest
+
+from webdriver.transport import HTTPWireProtocol
+
+
+@pytest.fixture(name="configuration")
+def fixture_configuration(configuration):
+    """Remove "acceptInsecureCerts" from capabilities if it exists.
+
+    Some browser configurations add acceptInsecureCerts capability by default.
+    Remove it during new_session tests to avoid interference.
+    """
+    if "acceptInsecureCerts" in configuration["capabilities"]:
+        configuration = dict(configuration)
+        del configuration["capabilities"]["acceptInsecureCerts"]
+    return configuration
+
+
+@pytest.fixture(name="new_session")
+def fixture_new_session(request, configuration, current_session):
+    """Start a new session for tests which themselves test creating new sessions.
+
+    :param body: The content of the body for the new session POST request.
+
+    :param delete_existing_session: Allows the fixture to delete an already
+     created custom session before the new session is getting created. This
+     is useful for tests which call this fixture multiple times within the
+     same test.
+    """
+    custom_session = {}
+
+    transport = HTTPWireProtocol(
+        configuration["host"],
+        configuration["port"],
+        url_prefix="/",
+    )
+
+    def _delete_session(session_id):
+        transport.send("DELETE", "session/{}".format(session_id))
+
+    def new_session(body, delete_existing_session=False):
+        # If there is an active session from the global session fixture,
+        # delete that one first
+        if current_session is not None:
+            current_session.end()
+
+        if delete_existing_session:
+            _delete_session(custom_session["session"]["sessionId"])
+
+        response = transport.send("POST", "session", body)
+        if response.status == 200:
+            custom_session["session"] = response.body["value"]
+        return response, custom_session.get("session", None)
+
+    yield new_session
+
+    if custom_session.get("session") is not None:
+        _delete_session(custom_session["session"]["sessionId"])
+        custom_session = None
diff -Nru firefox-84.0.2+build1/testing/web-platform/mozilla/tests/webdriver/new_session/debugger_address.py firefox-85.0+build1/testing/web-platform/mozilla/tests/webdriver/new_session/debugger_address.py
--- firefox-84.0.2+build1/testing/web-platform/mozilla/tests/webdriver/new_session/debugger_address.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/mozilla/tests/webdriver/new_session/debugger_address.py	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,74 @@
+import json
+
+import pytest
+
+from tests.support.http_request import HTTPRequest
+
+
+def set_context(session, context):
+    body = {"context": context}
+    session.send_session_command("POST", "moz/context", body)
+
+
+def test_debugger_address_not_set(session):
+    debugger_address = session.capabilities.get("moz:debuggerAddress")
+    assert debugger_address is None
+
+
+@pytest.mark.capabilities({"moz:debuggerAddress": False})
+def test_debugger_address_false(session):
+    debugger_address = session.capabilities.get("moz:debuggerAddress")
+    assert debugger_address is None
+
+
+@pytest.mark.capabilities({"moz:debuggerAddress": True})
+def test_debugger_address_true_fission_disabled(session):
+    debugger_address = session.capabilities.get("moz:debuggerAddress")
+    assert debugger_address is not None
+
+    host, port = debugger_address.split(":")
+    assert host == "localhost"
+    assert port.isnumeric()
+
+    # Fetch the browser version via the debugger address
+    http = HTTPRequest(host, int(port))
+    with http.get("/json/version") as response:
+        data = json.loads(response.read())
+        assert session.capabilities["browserVersion"] in data["Browser"]
+
+    # Force disabling Fission until Remote Agent is compatible
+    set_context(session, "chrome")
+    assert (
+        session.execute_script("""return Services.appinfo.fissionAutostart""") is False
+    )
+
+
+@pytest.mark.capabilities(
+    {
+        "moz:debuggerAddress": True,
+        "moz:firefoxOptions": {
+            "prefs": {
+                "fission.autostart": True,
+            }
+        },
+    }
+)
+def test_debugger_address_true_fission_override(session):
+    debugger_address = session.capabilities.get("moz:debuggerAddress")
+    assert debugger_address is not None
+
+    host, port = debugger_address.split(":")
+    assert host == "localhost"
+    assert port.isnumeric()
+
+    # Fetch the browser version via the debugger address
+    http = HTTPRequest(host, int(port))
+    with http.get("/json/version") as response:
+        data = json.loads(response.read())
+        assert session.capabilities["browserVersion"] in data["Browser"]
+
+    # Allow Fission to be enabled when setting the preference
+    set_context(session, "chrome")
+    assert (
+        session.execute_script("""return Services.appinfo.fissionAutostart""") is True
+    )
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/.azure-pipelines.yml firefox-85.0+build1/testing/web-platform/tests/.azure-pipelines.yml
--- firefox-84.0.2+build1/testing/web-platform/tests/.azure-pipelines.yml	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/.azure-pipelines.yml	2021-01-18 19:58:20.000000000 +0000
@@ -41,7 +41,7 @@
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '2.7.x'
+      versionSpec: '3.8.x'
   - template: tools/ci/azure/affected_tests.yml
     parameters:
       artifactName: 'safari-preview-affected-tests'
@@ -58,7 +58,7 @@
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '2.7.x'
+      versionSpec: '3.8.x'
   - template: tools/ci/azure/affected_tests.yml
     parameters:
       checkoutCommit: 'HEAD^1'
@@ -601,7 +601,7 @@
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '2.7.x'
+      versionSpec: '3.8.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:
@@ -639,7 +639,7 @@
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '2.7.x'
+      versionSpec: '3.8.x'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/pip_install.yml
     parameters:
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport-frame.py firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport-frame.py
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport-frame.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport-frame.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-def main(request, response):
-    """
-    postMessage Viewport-Width headers
-    """
-
-    if b"viewport-width" in request.headers:
-        result = request.headers["viewport-width"]
-    else:
-        result = u"FAIL"
-
-    headers = [(b"Content-Type", b"text/html"),
-               (b"Access-Control-Allow-Origin", b"*")]
-    content = b'''
-<script>
-  let parentOrOpener = window.opener || window.parent;
-  parentOrOpener.postMessage({ viewport: '%s' }, "*");
-</script>
-''' % (result)
-    return 200, headers, content
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport-measurement.html firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport-measurement.html
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport-measurement.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport-measurement.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<script>
-(async () => {
-  const response = await fetch("viewport.py");
-  const body = await response.text();
-  parent.postMessage(body, "*");
-})();
-</script>
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport.py firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport.py
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/resources/viewport.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/resources/viewport.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-def main(request, response):
-    """
-    Reflect Viewport-Width headers
-    """
-
-    if b"viewport-width" in request.headers:
-        result = request.headers["viewport-width"]
-    else:
-        result = u"FAIL"
-
-    headers = [(b"Content-Type", b"text/html"),
-               (b"Access-Control-Allow-Origin", b"*")]
-    return 200, headers, result
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, window.innerWidth.toString());
-      resolve();
-    }));
-  });
-});
-</script>
-<iframe src="resources/viewport-frame.py" width=503></iframe>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html.headers firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html.headers	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-iframe.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Accept-CH: Viewport-Width
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data, "503");
-      resolve();
-    }));
-  });
-});
-</script>
-<iframe src="resources/viewport-measurement.html" width=503>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html.headers firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html.headers	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-subresource.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Accept-CH: Viewport-Width
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, "503");
-      resolve();
-    }));
-  });
-});
-window.open("resources/viewport-frame.py", "", "width=503");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html.headers firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html.headers	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window-different-dimensions.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Accept-CH: Viewport-Width
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-promise_test(t => {
-  return new Promise(resolve => {
-    window.addEventListener("message", t.step_func(e => {
-      assert_equals(e.data.viewport, window.innerWidth.toString());
-      resolve();
-    }));
-  });
-});
-window.open("resources/viewport-frame.py", "");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html.headers firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html.headers	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/client-hints/viewport-width-window.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-Accept-CH: Viewport-Width
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/scope/document.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/scope/document.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/scope/document.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/scope/document.py	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
 
 from wptserve.utils import isomorphic_decode, isomorphic_encode
 
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import util
+import importlib
+util = importlib.import_module("common.security-features.scope.util")
 
 def main(request, response):
   policyDeliveries = json.loads(request.GET.first(b"policyDeliveries", b"[]"))
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/scope/worker.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/scope/worker.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/scope/worker.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/scope/worker.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,8 +1,8 @@
 import os, sys, json
 
 from wptserve.utils import isomorphic_decode, isomorphic_encode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import util
+import importlib
+util = importlib.import_module("common.security-features.scope.util")
 
 def main(request, response):
   policyDeliveries = json.loads(request.GET.first(b'policyDeliveries', b'[]'))
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/audio.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/audio.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/audio.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/audio.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
     file = os.path.join(request.doc_root, u"webaudio", u"resources",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/document.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/document.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/document.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/document.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     return subresource.get_template(u"document.html.template") % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/empty.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/empty.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/empty.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/empty.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     return u''
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/font.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/font.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/font.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/font.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys, base64
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
     data = (u'{"headers": %(headers)s}') % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/image.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/image.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/image.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/image.py	2021-01-18 19:58:20.000000000 +0000
@@ -2,11 +2,10 @@
 
 from six import BytesIO
 
-import subresource
-
 from wptserve.utils import isomorphic_decode
 
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 class Image:
     """This class partially implements the interface of the PIL.Image.Image.
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/script.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/script.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/script.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/script.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,8 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     return subresource.get_template(u"script.js.template") % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/shared-worker.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/shared-worker.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/shared-worker.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/shared-worker.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     return subresource.get_template(u"shared-worker.js.template") % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/static-import.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/static-import.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/static-import.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/static-import.py	2021-01-18 19:58:20.000000000 +0000
@@ -2,8 +2,8 @@
 from six.moves.urllib.parse import unquote
 
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request):
     import_url = unquote(isomorphic_decode(request.GET[b'import_url']))
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/stylesheet.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/stylesheet.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/stylesheet.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/stylesheet.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
     data = (u'{"headers": %(headers)s}') % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/svg.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/svg.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/svg.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/svg.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
     data = (u'{"headers": %(headers)s}') % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/video.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/video.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/video.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/video.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
     file = os.path.join(request.doc_root, u"media", u"movie_5.ogv")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/worker.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/worker.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/worker.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/worker.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     return subresource.get_template(u"worker.js.template") % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/xhr.py firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/xhr.py
--- firefox-84.0.2+build1/testing/web-platform/tests/common/security-features/subresource/xhr.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/common/security-features/subresource/xhr.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,7 +1,7 @@
 import os, sys
 from wptserve.utils import isomorphic_decode
-sys.path.insert(0, os.path.dirname(os.path.abspath(isomorphic_decode(__file__))))
-import subresource
+import importlib
+subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(server_data):
     data = (u'{"headers": %(headers)s}') % server_data
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/compression/compression-with-detach.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/compression/compression-with-detach.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/compression/compression-with-detach.tentative.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/compression/compression-with-detach.tentative.any.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,55 @@
+// META: global=window,worker
+// META: script=resources/concatenate-stream.js
+
+'use strict';
+
+const kInputLength = 500000;
+
+function createLargeRandomInput() {
+  const buffer = new ArrayBuffer(kInputLength);
+  // The getRandomValues API will only let us get 65536 bytes at a time, so call
+  // it multiple times.
+  const kChunkSize = 65536;
+  for (let offset = 0; offset < kInputLength; offset += kChunkSize) {
+    const length =
+        offset + kChunkSize > kInputLength ? kInputLength - offset : kChunkSize;
+    const view = new Uint8Array(buffer, offset, length);
+    crypto.getRandomValues(view);
+  }
+  return new Uint8Array(buffer);
+}
+
+function decompress(view) {
+  const ds = new DecompressionStream('deflate');
+  const writer = ds.writable.getWriter();
+  writer.write(view);
+  writer.close();
+  return concatenateStream(ds.readable);
+}
+
+promise_test(async () => {
+  const input = createLargeRandomInput();
+  const inputCopy = input.slice(0, input.byteLength);
+  const cs = new CompressionStream('deflate');
+  const writer = cs.writable.getWriter();
+  writer.write(input);
+  writer.close();
+  // Object.prototype.then will be looked up synchronously when the promise
+  // returned by read() is resolved.
+  Object.defineProperty(Object.prototype, 'then', {
+    get() {
+      // Cause input to become detached and unreferenced.
+      try {
+        postMessage(undefined, 'nowhere', [input.buffer]);
+      } catch (e) {
+        // It's already detached.
+      }
+    }
+  });
+  const output = await concatenateStream(cs.readable);
+  // Perform the comparison as strings since this is reasonably fast even when
+  // JITted JavaScript is running under an emulator.
+  assert_equals(
+      inputCopy.toString(), (await decompress(output)).toString(),
+      'decompressing the output should return the input');
+}, 'data should be correctly compressed even if input is detached partway');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/compression/decompression-with-detach.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/compression/decompression-with-detach.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/compression/decompression-with-detach.tentative.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/compression/decompression-with-detach.tentative.any.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,41 @@
+// META: global=window,worker
+// META: script=resources/concatenate-stream.js
+
+'use strict';
+
+const kInputLength = 1000000;
+
+async function createLargeCompressedInput() {
+  const cs = new CompressionStream('deflate');
+  // The input has to be large enough that it won't fit in a single chunk when
+  // decompressed.
+  const writer = cs.writable.getWriter();
+  writer.write(new Uint8Array(kInputLength));
+  writer.close();
+  return concatenateStream(cs.readable);
+}
+
+promise_test(async () => {
+  const input = await createLargeCompressedInput();
+  const ds = new DecompressionStream('deflate');
+  const writer = ds.writable.getWriter();
+  writer.write(input);
+  writer.close();
+  // Object.prototype.then will be looked up synchronously when the promise
+  // returned by read() is resolved.
+  Object.defineProperty(Object.prototype, 'then', {
+    get() {
+      // Cause input to become detached and unreferenced.
+      try {
+        postMessage(undefined, 'nowhere', [input.buffer]);
+      } catch (e) {
+        // It's already detached.
+      }
+    }
+  });
+  const output = await concatenateStream(ds.readable);
+  // If output successfully decompressed and gave the right length, we can be
+  // reasonably confident that no data corruption happened.
+  assert_equals(
+      output.byteLength, kInputLength, 'output should be the right length');
+}, 'data should be correctly decompressed even if input is detached partway');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/compression/resources/concatenate-stream.js firefox-85.0+build1/testing/web-platform/tests/compression/resources/concatenate-stream.js
--- firefox-84.0.2+build1/testing/web-platform/tests/compression/resources/concatenate-stream.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/compression/resources/concatenate-stream.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,25 @@
+'use strict';
+
+// Read all the chunks from a stream that returns BufferSource objects and
+// concatenate them into a single Uint8Array.
+async function concatenateStream(readableStream) {
+  const reader = readableStream.getReader();
+  let totalSize = 0;
+  const buffers = [];
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) {
+      break;
+    }
+    buffers.push(value);
+    totalSize += value.byteLength;
+  }
+  reader.releaseLock();
+  const concatenated = new Uint8Array(totalSize);
+  let offset = 0;
+  for (const buffer of buffers) {
+    concatenated.set(buffer, offset);
+    offset += buffer.byteLength;
+  }
+  return concatenated;
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html
--- firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-star-allow.html	2021-01-18 19:58:20.000000000 +0000
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+    <meta name="timeout" content="long">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/frame-ancestors-test.sub.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Frame-src: 'self' matches even if the parent's origin is unique.</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      var t = async_test('SubframeLoaded');
+
+      window.addEventListener('securitypolicyviolation', t.step_func(function(e) {
+        if (e.violatedDirective === "frame-src") {
+          assert_unreached('unexpected securitypolicyviolation');
+          t.done();
+        }
+      }));
+
+      window.addEventListener("message", t.step_func(function(event) {
+        assert_equals(event.data, "PASS", 'unexpected message: ' + event.data);
+        t.done();
+      }));
+
+      f = document.createElement("iframe");
+      f.src = "/content-security-policy/support/postmessage-pass.html";
+      document.body.appendChild(f);
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/content-security-policy/frame-src/frame-src-sandboxed-allowed.html.headers	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,4 @@
+Expires: Mon, 26 Jul 1997 05:00:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Content-Security-Policy: frame-src 'self'; sandbox allow-scripts
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/invalid.html firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/invalid.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/invalid.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/invalid.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,80 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test invalid attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      // These tests ensure that invalid attributes don't affect
+      // cookie parsing. `Path` isn't important to the tests where it appears,
+      // but it's used to be able to place the invalid attribute in different
+      // locations.
+      const invalidAttributeTests = [
+      {
+        cookie: "test=1; lol; Path=/",
+        expected: "test=1",
+        name: "Set cookie with invalid attribute"
+      },
+      {
+        cookie: "test=2; Path=/; lol",
+        expected: "test=2",
+        name: "Set cookie ending with invalid attribute."
+      },
+      {
+        cookie: "test=3; Path=/; 'lol'",
+        expected: "test=3",
+        name: "Set cookie ending with quoted invalid attribute."
+      },
+      {
+        cookie: 'test=4; Path=/; "lol"',
+        expected: "test=4",
+        name: "Set cookie ending with double-quoted invalid attribute."
+      },
+      {
+        cookie: "test=5; Path=/; lol=",
+        expected: "test=5",
+        name: "Set cookie ending with invalid attribute equals."
+      },
+      {
+        cookie: 'test=6; lol="aaa;bbb"; Path=/',
+        expected: "test=6",
+        name: "Set cookie with two invalid attributes (lol=\"aaa and bbb)."
+      },
+      {
+        cookie: 'test=7; Path=/; lol="aaa;bbb"',
+        expected: "test=7",
+        name: "Set cookie ending with two invalid attributes (lol=\"aaa and bbb)."
+      },
+      {
+        cookie: 'test=8; "Secure"',
+        expected: "test=8",
+        // This gets parsed as an unrecognized \"Secure\" attribute, not a valid
+        // Secure attribute. That's why it gets set on an non-secure origin.
+        name: "Set cookie for quoted Secure attribute",
+        defaultPath: true
+      },
+      {
+        cookie: "test=9; Secure qux",
+        expected: "test=9",
+        // This should be parsed as an unrecognized "Secure qux" attribute
+        // and ignored. That is, the cookie will not be Secure.
+        name: "Set cookie for Secure qux",
+        defaultPath: true
+      },
+    ];
+
+      for (const test of invalidAttributeTests) {
+        promise_test(async testCase => {
+          await runCookieTest(test.cookie, test.expected, test.defaultPath);
+        }, test.name);
+      }
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/path.html firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/path.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/path.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/path.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,76 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie path attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.4">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      const pathTests = [
+        {
+          cookie: "test=1; Path",
+          expected: "test=1",
+          name: "Set cookie for bare Path",
+          defaultPath: true
+        },
+        {
+          cookie: "test=2; Path=",
+          expected: "test=2",
+          name: "Set cookie for Path=",
+          defaultPath: true
+        },
+        {
+          cookie: "test=3; Path=/",
+          expected: "test=3",
+          name: "Set cookie for Path=/"
+        },
+        {
+          cookie: "test=4; Path=/qux",
+          expected: "",
+          name: "No cookie returned for mismatched path"
+        },
+        {
+          cookie: "test=5; Path    =/qux",
+          expected: "",
+          name: "No cookie returned for path space equals mismatched path"
+        },
+        {
+          cookie: "test=6; Path=    /qux",
+          expected: "",
+          name: "No cookie returned for path equals space mismatched path"
+        },
+        {
+          cookie: "test=7; Path=/qux      ; taz",
+          expected: "",
+          name: "No cookie returned for mismatched path and attribute"
+        },
+        {
+          cookie: "test=8; Path=/qux; Path=/",
+          expected: "test=8",
+          name: "Set cookie for mismatched and root path"
+        },
+        {
+          cookie: "test=9; Path=/; Path=/qux",
+          expected: "",
+          name: "No cookie returned for root and mismatched path"
+        },
+        {
+          cookie: "test=10; Path=/lol; Path=/qux",
+          expected: "",
+          name: "No cookie returned for multiple mismatched paths"
+        },
+      ];
+
+      for (const test of pathTests) {
+        promise_test(async testCase => {
+          await runCookieTest(test.cookie, test.expected, test.defaultPath);
+        }, test.name);
+      }
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/resources/secure-non-secure-child.html firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/resources/secure-non-secure-child.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/resources/secure-non-secure-child.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/resources/secure-non-secure-child.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,75 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie secure attribute parsing (on non-secure page)</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.5">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      // These tests are the non-secure analog to secure.https.html.
+      // They're not in the /cookies/attributes folder because they shouldn't
+      // be run by themselves. Instead, /cookies/attributes/secure.https.html
+      // opens this in a non-secure window.
+      const secureNonSecureTests = [
+      {
+        cookie: "test=1; Secure",
+        expected: "",
+        name: "(non-secure) Ignore cookie for Secure attribute",
+        defaultPath: true
+      },
+      {
+        cookie: "test=2; seCURe",
+        expected: "",
+        name: "(non-secure) Ignore cookie for seCURe attribute",
+        defaultPath: true
+      },
+      {
+        cookie: "test=3; Secure=",
+        expected: "",
+        name: "(non-secure) Ignore cookie for for Secure= attribute",
+        defaultPath: true
+      },
+      {
+        cookie: "test=4; Secure=aaaa",
+        expected: "",
+        name: "(non-secure) Ignore cookie for Secure=aaaa",
+        defaultPath: true
+      },
+      {
+        cookie: "test=5; Secure =aaaaa",
+        expected: "",
+        name: "(non-secure) Ignore cookie for Secure space equals",
+        defaultPath: true
+      },
+      {
+        cookie: "test=6; Secure= aaaaa",
+        expected: "",
+        name: "(non-secure) Ignore cookie for Secure equals space",
+        defaultPath: true
+      },
+      {
+        cookie: "test=7;                Secure",
+        expected: "",
+        name: "(non-secure) Ignore cookie for spaced Secure",
+        defaultPath: true
+      },
+      {
+        cookie: "test=8;       Secure     ;",
+        expected: "",
+        name: "(non-secure) Ignore cookie for space Secure with ;",
+        defaultPath: true
+      }
+    ];
+
+    for (const test of secureNonSecureTests) {
+      promise_test(async testCase => {
+        await runCookieTest(test.cookie, test.expected, test.defaultPath);
+      }, test.name);
+    }
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/secure.https.html firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/secure.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/secure.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/secure.https.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,73 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie secure attribute parsing</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.5">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      const secureTests = [
+        {
+          cookie: "test=1; Secure",
+          expected: "test=1",
+          name: "Set cookie for Secure attribute",
+          defaultPath: true
+        },
+        {
+          cookie: "test=2; seCURe",
+          expected: "test=2",
+          name: "Set cookie for seCURe attribute",
+          defaultPath: true
+        },
+        {
+          cookie: "test=3; Secure=",
+          expected: "test=3",
+          name: "Set cookie for for Secure= attribute",
+          defaultPath: true
+        },
+        {
+          cookie: "test=4; Secure=aaaa",
+          expected: "test=4",
+          name: "Set cookie for Secure=aaaa",
+          defaultPath: true
+        },
+        {
+          cookie: "test=5; Secure =aaaaa",
+          expected: "test=5",
+          name: "Set cookie for Secure space equals",
+          defaultPath: true
+        },
+        {
+          cookie: "test=6; Secure= aaaaa",
+          expected: "test=6",
+          name: "Set cookie for Secure equals space",
+          defaultPath: true
+        },
+        {
+          cookie: "test=7;                Secure",
+          expected: "test=7",
+          name: "Set cookie for spaced Secure",
+          defaultPath: true
+        },
+        {
+          cookie: "test=8;       Secure     ;",
+          expected: "test=8",
+          name: "Set cookie for space Secure with ;",
+          defaultPath: true
+        }
+      ];
+
+      for (const test of secureTests) {
+        promise_test(async testCase => {
+          await runCookieTest(test.cookie, test.expected, test.defaultPath);
+        }, test.name);
+      }
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/secure-non-secure.html firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/secure-non-secure.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/attributes/secure-non-secure.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/attributes/secure-non-secure.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset=utf-8>
+    <title>Test cookie secure attribute parsing (non-secure origin)</title>
+    <meta name=help href="https://tools.ietf.org/html/rfc6265#section-5.2.5">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/cookies/resources/cookie-helper.sub.js"></script>
+  </head>
+  <body>
+    <div id=log></div>
+    <script>
+      test(t => {
+        const win = window.open(`${INSECURE_ORIGIN}/cookies/attributes/resources/secure-non-secure-child.html`);
+        fetch_tests_from_window(win);
+      });
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/attribute-tests.html firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/attribute-tests.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/attribute-tests.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/attribute-tests.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>Tests cookie attribute functionality</title>
-    <meta name=help href="https://tools.ietf.org/html/rfc6265#page-8">
-    <meta name="timeout" content="long">
-
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/cookie-http-state-template.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <div id="iframes"></div>
-    <script>
-      setup({ explicit_timeout: true });
-
-      const TEST_CASES = [
-        {file: "attribute0001", name: "Ignore cookie for Secure attribute."},
-        {file: "attribute0002", name: "Ignore cookie for seCURe attribute."},
-        {file: "attribute0003", name: "Set cookie for \"Secure\" attribute."},
-        {file: "attribute0004", name: "Ignore cookie for for Secure= attribute."},
-        {file: "attribute0005", name: "Ignore cookie for Secure=aaaa"},
-        {file: "attribute0006", name: "Set cookie for Secure qux"},
-        {file: "attribute0007", name: "Ignore cookie for Secure space equals."},
-        {file: "attribute0008", name: "Ignore cookie for Secure equals space"},
-        {file: "attribute0009", name: "Ignore cookie for Secure separated."},
-        {file: "attribute0010", name: "Ignore cookie for Secure separated v2."},
-        {file: "attribute0011", name: "Ignore cookie for Secure separated v2."},
-        {file: "attribute0012", name: "Ignore cookie for spaced Secure"},
-        {file: "attribute0013", name: "Ignore cookie for space Secure with ;."},
-        {file: "attribute0014", name: "Set cookie for Path."},
-        {file: "attribute0015", name: "Set cookie for Path=."},
-        {file: "attribute0016", name: "Set cookie for Path=/."},
-        {file: "attribute0017", name: "Ignore cookie for invalid path."},
-        {file: "attribute0018", name: "Ignore cookie for spaced invalid path."},
-        {file: "attribute0019", name: "Ignore cookie for spaced invalid path v2."},
-        {file: "attribute0020", name: "Ignore cookie for invalid path and attribute."},
-        {file: "attribute0021", name: "Ignore cookie for invalid and root path."},
-        {file: "attribute0022", name: "Set cookie for root and invalid path."},
-        {file: "attribute0023", name: "Set cookie for invalid and sane path."},
-        {file: "attribute0024", name: "Ignore cookie for sane and invalid path."},
-        {file: "attribute0025", name: "Ignore cookie for invalid + Secure."},
-        {file: "attribute0026", name: "Ignore cookie for quoted invalid attribute."},
-      ];
-
-      for (const i in TEST_CASES) {
-        const t = TEST_CASES[i];
-        promise_test(createCookieTest(t.file),
-                     t.file + " - " + t.name);
-      }
-
-    </script>
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0001-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0002-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; seCURe
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0003-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; "Secure"
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0004-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure=
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0005-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure=aaaa
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0006-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0007-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure =aaaaa
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0008-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure= aaaaa
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0009-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure; qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0010-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure;qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0011-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Secure    ; qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0012-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar;                Secure
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0013-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar;       Secure     ;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0014-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0015-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0016-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0017-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0018-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path    =/qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0019-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=    /qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0020-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/qux      ; taz
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-expected	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Cookie: foo=bar
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0021-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/qux; Path=/
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0022-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/; Path=/qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0023-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/qux; Path=/cookie-parser-result
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0024-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; Path=/cookie-parser-result; Path=/qux
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0025-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; qux; Secure
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/http-state/resources/test-files/attribute0026-test	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Set-Cookie: foo=bar; qux="aaa;bbb"; Secure
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/path/match.html firefox-85.0+build1/testing/web-platform/tests/cookies/path/match.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/path/match.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/path/match.html	2021-01-18 19:58:20.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
   <meta charset=utf-8>
   <title>tests for matching cookie paths</title>
+  <meta name="timeout" content="long">
   <meta name=help href="http://tools.ietf.org/html/rfc6265#section-5.1.4">
 
   <script src="/resources/testharness.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/cookie-helper.sub.js firefox-85.0+build1/testing/web-platform/tests/cookies/resources/cookie-helper.sub.js
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/cookie-helper.sub.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/cookie-helper.sub.js	2021-01-18 19:58:20.000000000 +0000
@@ -309,3 +309,52 @@
   var re = new RegExp("(?:^|; )" + name);
   assert_equals(re.test(document.cookie), false, "Sanity check: " + name + " has been deleted.");
 }
+
+// getDefaultPathCookies is a helper method to get and delete cookies on the
+// "default path" (which for these tests will be at `/cookies/resources`),
+// determined by the path portion of the request-uri.
+async function getDefaultPathCookies(path = '/cookies/resources') {
+  return new Promise((resolve, reject) => {
+    try {
+      const iframe = document.createElement('iframe');
+      iframe.style = 'display: none';
+      iframe.src = `${path}/echo-cookie.html`;
+
+      iframe.addEventListener('load', (e) => {
+        const win = e.target.contentWindow;
+        const iframeCookies = win.getCookies();
+        win.expireCookie('test', path);
+        resolve(iframeCookies);
+      }, {once: true});
+
+      document.documentElement.appendChild(iframe);
+    } catch (e) {
+      reject(e);
+    }
+  });
+}
+
+// runCookieTest sets a |cookie|, then asserts it was or was not set
+// via |expectedValue|. Then cleans it up.
+async function runCookieTest(cookie, expectedValue, defaultPath) {
+  return fetch(`/cookies/resources/cookie.py?set=${encodeURIComponent(cookie)}`)
+      .then(async _ => {
+        let cookies = document.cookie;
+        // for the tests where a Path is set from the request-uri path, we need
+        // to go look for cookies in an iframe at that default path.
+        if (defaultPath) {
+          cookies = await getDefaultPathCookies();
+        }
+
+        if (Boolean(expectedValue)) {
+          assert_equals(
+              cookies, expectedValue, 'The cookie was set as expected.');
+        } else {
+          assert_equals(cookies, expectedValue, 'The cookie was rejected.');
+        }
+      })
+      .then(_ => {
+        return fetch(
+            `/cookies/resources/cookie.py?drop=${encodeURIComponent(cookie)}`);
+      });
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/cookie.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/cookie.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/cookie.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/cookie.py	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,33 @@
+from cookies.resources.helpers import setNoCacheAndCORSHeaders
+from wptserve.utils import isomorphic_encode
+
+def main(request, response):
+    """Set or drop a cookie via GET params.
+
+    Usage: `/cookie.py?set={cookie}` or `/cookie.py?drop={cookie}`
+
+    The passed-in cookie string should be encoded via encodeURIComponent,
+    otherwise `parse_qsl` will split on any semicolons (used by the Request.GET
+    property getter).
+
+    Note: here we don't use Response.delete_cookie() or similar other methods
+    in this resources directory because there are edge cases that are impossible
+    to express via those APIs, namely a bare (`Path`) or empty Path (`Path=`)
+    attribute. Instead, we pipe through the entire cookie and append `max-age=0`
+    to it.
+    """
+    headers = setNoCacheAndCORSHeaders(request, response)
+
+    try:
+        if b'drop' in request.GET:
+            cookie = request.GET[b'drop']
+            cookie += "; max-age=0"
+
+        if b'set' in request.GET:
+            cookie = request.GET[b'set']
+
+        headers.append((b'Set-Cookie', isomorphic_encode(cookie)))
+        return headers, b'{"success": true}'
+    except Exception as e:
+          return 500, headers, bytes({'error': '{}'.format(e)})
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/drop.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/drop.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/drop.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/drop.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Respond to `/cookie/drop?name={name}` by expiring the cookie named `{name}`."""
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSameSiteNone.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSameSiteNone.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSameSiteNone.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSameSiteNone.py	2021-01-18 19:58:21.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeDropCookie, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeDropCookie, setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Respond to `/cookies/resources/dropSameSiteNone.py by dropping the
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSameSite.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSameSite.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSameSite.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSameSite.py	2021-01-18 19:58:21.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeDropCookie, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeDropCookie, setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Respond to `/cookie/same-site/resources/dropSameSite.py by dropping the
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSecure.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSecure.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/dropSecure.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/dropSecure.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeDropCookie, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeDropCookie, setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Respond to `/cookie/drop/secure` by dropping the two cookie set by
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/echo-cookie.html firefox-85.0+build1/testing/web-platform/tests/cookies/resources/echo-cookie.html
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/echo-cookie.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/echo-cookie.html	2021-01-18 19:58:20.000000000 +0000
@@ -19,6 +19,7 @@
 window.expireCookie = function (name, path) {
   document.cookie = name + '=0; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=' + path + ';';
 };
+window.getCookies = () => document.cookie;
 </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/helpers.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/helpers.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/helpers.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/helpers.py	2021-01-18 19:58:20.000000000 +0000
@@ -36,7 +36,7 @@
     return (b"Set-Cookie", b"; ".join((attrs)))
 
 def makeDropCookie(name, secure):
-    attrs = {b"MaxAge": 0, b"path": b"/"}
+    attrs = {b"max-age": 0, b"path": b"/"}
     if secure:
         attrs[b"secure"] = b""
     return makeCookieHeader(name, b"", attrs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/imgIfMatch.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/imgIfMatch.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/imgIfMatch.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/imgIfMatch.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-import helpers
+from cookies.resources import helpers
 
 def main(request, response):
     """Respond to `/cookie/imgIfMatch?name={name}&value={value}` with a 404 if
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/list.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/list.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/list.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/list.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,5 @@
 import json
-import helpers
+from cookies.resources import helpers
 
 from wptserve.utils import isomorphic_decode
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/postToParent.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/postToParent.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/postToParent.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/postToParent.py	2021-01-18 19:58:21.000000000 +0000
@@ -1,5 +1,5 @@
 import json
-import helpers
+from cookies.resources import helpers
 
 from wptserve.utils import isomorphic_decode
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/redirectWithCORSHeaders.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/redirectWithCORSHeaders.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/redirectWithCORSHeaders.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/redirectWithCORSHeaders.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import setNoCacheAndCORSHeaders
+from cookies.resources.helpers import setNoCacheAndCORSHeaders
 
 def main(request, response):
     """Simple handler that causes redirection.
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/set.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/set.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/set.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/set.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-import helpers
+from cookies.resources import helpers
 from six.moves.urllib.parse import unquote
 
 from wptserve.utils import isomorphic_encode
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSameSiteNone.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSameSiteNone.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSameSiteNone.py	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSameSiteNone.py	2021-01-18 19:58:21.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeCookieHeader, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeCookieHeader, setNoCacheAndCORSHeaders
 
 from wptserve.utils import isomorphic_encode
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSameSite.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSameSite.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSameSite.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSameSite.py	2021-01-18 19:58:21.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeCookieHeader, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeCookieHeader, setNoCacheAndCORSHeaders
 
 from wptserve.utils import isomorphic_encode
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSecure.py firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSecure.py
--- firefox-84.0.2+build1/testing/web-platform/tests/cookies/resources/setSecure.py	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/cookies/resources/setSecure.py	2021-01-18 19:58:20.000000000 +0000
@@ -1,4 +1,4 @@
-from helpers import makeCookieHeader, readParameter, setNoCacheAndCORSHeaders
+from cookies.resources.helpers import makeCookieHeader, readParameter, setNoCacheAndCORSHeaders
 
 from wptserve.utils import isomorphic_encode
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/credential-management/otpcredential-iframe.https.html firefox-85.0+build1/testing/web-platform/tests/credential-management/otpcredential-iframe.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/credential-management/otpcredential-iframe.https.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/credential-management/otpcredential-iframe.https.html	2021-01-18 19:58:21.000000000 +0000
@@ -31,11 +31,24 @@
   const messageWatcher = new EventWatcher(t, window, "message");
   var iframe = document.createElement("iframe");
   iframe.src = remoteBaseURL + "support/otpcredential-iframe.html"
+  iframe.allow = "otp-credentials";
+  document.body.appendChild(iframe);
+
+  const message = await messageWatcher.wait_for("message");
+  assert_equals(message.data.result, "Pass");
+  assert_equals(message.data.code, "ABC123");
+
+}, "OTPCredential enabled in cross origin iframes with permissions policy");
+
+promise_test(async t => {
+  const messageWatcher = new EventWatcher(t, window, "message");
+  var iframe = document.createElement("iframe");
+  iframe.src = remoteBaseURL + "support/otpcredential-iframe.html"
   document.body.appendChild(iframe);
 
   const message = await messageWatcher.wait_for("message");
   assert_equals(message.data.result, "Fail");
   assert_equals(message.data.errorType, "NotAllowedError");
 
-}, "Test OTPCredential disabled in cross origin iframes");
+}, "OTPCredential disabled in cross origin iframes without permissions policy");
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html firefox-85.0+build1/testing/web-platform/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/CSS2/floats-clear/clearance-containing-fragmented-float-crash.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,36 @@
+<!-- quirks mode -->
+<meta charset="utf-8">
+<title>Should not crash when a clearance frame having a fragmented float is discovered</title>
+<link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1663232">
+
+<style>
+:not(em) {
+  border-left: 4px dashed green;
+  column-width: 0;
+}
+</style>
+<script>
+function go() {
+  b.appendChild(a)
+}
+</script>
+<m>
+<details ontoggle="go()" open>
+<f>
+<menu>U<menu>
+<table align="RIGHT">
+<caption>
+<o>
+<ul>
+<l>
+<li>
+<tr>6
+<table>
+<a>
+<details id="b" open>
+<summary>
+<i id="a">
+</summary>
+<details style="float: right">
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale.html firefox-85.0+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Transform animation under large scale</title>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="help" href="https://crbug.com/1153428">
+<link rel="match" href="transform-animation-under-large-scale-ref.html">
+<style>
+@keyframes move {
+  0% {transform: translateX(-1px);}
+  100% {transform: translateX(0);}
+}
+</style>
+<div style="width: 2px; height: 2px; transform: scale(100); transform-origin: 0 0; overflow: hidden">
+  <div style="animation: move 1s infinite alternate">
+    <div style="width: 4px; height: 1px; background: blue"></div>
+    <div style="width: 4px; height: 1px; background: green"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-animations/transform-animation-under-large-scale-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div style="width: 200px; height: 100px; background: blue"></div>
+<div style="width: 200px; height: 100px; background: green"></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-006.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-006.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-006.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-006.html	2021-01-18 19:58:22.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>CSS Backgrounds and Borders Test: background-size - one &lt;length&gt; value</title>
     <link rel="author" title="Intel" href="http://www.intel.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9. Sizing Images: the 'background-size' property">
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 and 2020-11-18 -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9 Sizing Images: the 'background-size' property">
     <link rel="match" href="reference/background-size-006-ref.html">
     <meta name="flags" content="image">
     <meta name="assert" content="Check if 'background-size' has only one length value, then such value is the width of the corresponding image and the second value (corresponding to the height of the background image) is assumed to be 'auto'. An 'auto' value for one dimension is resolved by using the image's intrinsic ratio (in this test, the image's intrinsic ratio is 1:1) and (multiplied by) the size of the other dimension. Therefore the used height of the background-size in this test should be 45px.">
@@ -16,7 +16,7 @@
             width: 45px;
         }
         #test-overlapping-green {
-            background-image: url(support/60x60-green.png);
+            background-image: url(support/1x1-green.png);
             background-repeat: no-repeat;
             background-size: 45px;
             bottom: 45px;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-009.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-009.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-009.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-009.html	2021-01-18 19:58:21.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>CSS Backgrounds and Borders Test: background-size - one &lt;percentage&gt; value</title>
     <link rel="author" title="Intel" href="http://www.intel.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9. Sizing Images: the 'background-size' property">
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 and 2020-11-18  -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9 Sizing Images: the 'background-size' property">
     <link rel="match" href="reference/background-size-006-ref.html">
     <meta name="flags" content="image">
     <meta name="assert" content="Check if 'background-size' has only one percentage value, then such value is the width of the corresponding image and the second value (corresponding to the height of the background image) is assumed to be 'auto'. A percentage is relative to the dimensions of the background positioning area. An 'auto' value for one dimension is resolved by using the image's intrinsic ratio (in this test, the image's intrinsic ratio is 1:1) and (multiplied by) the size of the other dimension. Therefore the used height of the background-size in this test should be 45px.">
@@ -16,7 +16,7 @@
             width: 45px;
         }
         #test-overlapping-green {
-            background-image: url(support/60x60-green.png);
+            background-image: url(support/1x1-green.png);
             background-repeat: no-repeat;
             background-size: 45%;
             bottom: 45px;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-014.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-014.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-014.html	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-014.html	2021-01-18 19:58:21.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>CSS Backgrounds and Borders Test: background-size - one auto keyword and one &lt;percentage&gt; values</title>
     <link rel="author" title="Intel" href="http://www.intel.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9. Sizing Images: the 'background-size' property">
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 and 2020-11-18  -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9 Sizing Images: the 'background-size' property">
     <link rel="match" href="reference/background-size-006-ref.html">
     <meta name="flags" content="image">
     <meta name="assert" content="Check if 'background-size' has one 'auto' and one percentage values, then the second value is the height of the corresponding background image and the first value (corresponding to the width of the background image) is resolved by using the image's intrinsic ratio (in this test, the image's intrinsic ratio is 1:1) and (multiplied by) the size of the other dimension. A percentage is relative to the dimensions of the background positioning area. Therefore the used width of the background-size in this test should be 45px.">
@@ -16,7 +16,7 @@
             width: 45px;
         }
         #test-overlapping-green {
-            background-image: url(support/60x60-green.png);
+            background-image: url(support/1x1-green.png);
             background-repeat: no-repeat;
             background-size: auto 45%;
             bottom: 45px;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-017.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-017.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/background-size-017.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/background-size-017.html	2021-01-18 19:58:21.000000000 +0000
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <title>CSS Backgrounds and Borders Test: background-size - one &lt;length&gt; and one &lt;percentage&gt; values</title>
     <link rel="author" title="Intel" href="http://www.intel.com">
-    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9. Sizing Images: the 'background-size' property">
+    <link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-11-09 and 2020-11-18  -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-size" title="3.9 Sizing Images: the 'background-size' property">
     <link rel="match" href="reference/background-size-006-ref.html">
     <meta name="flags" content="image">
     <meta name="assert" content="Check if 'background-size' has one length and one percentage values, then such values are the width and height of the corresponding background image. Therefore the used width and height of the background-size in this test should be 45px and 45px.">
@@ -16,7 +16,7 @@
             width: 45px;
         }
         #test-overlapping-green {
-            background-image: url(support/60x60-green.png);
+            background-image: url(support/1x1-green.png);
             background-repeat: no-repeat;
             background-size: 45px 45%;
             bottom: 45px;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/border-radius-clip-002.htm firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/border-radius-clip-002.htm
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/border-radius-clip-002.htm	2021-01-06 11:23:18.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/border-radius-clip-002.htm	2021-01-18 19:58:21.000000000 +0000
@@ -31,6 +31,7 @@
             {
                 width: 98px;
                 height: 98px;
+                margin-top: 62px;
                 margin-left: 20px;
                 border-radius: 20px;
                 background: red url(support/swatch-red.png);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="simple-bg-color-ref.html">
+<style>
+.box1 {
+  width: 100px;
+  height: 150px;
+  background-color: green;
+}
+.box2 {
+  width: 200px;
+  height: 250px;
+  background-color: red;
+}
+</style>
+<body>
+  <div class='box1'></div>
+  <div class='box2'></div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-backgrounds/hidpi/simple-bg-color-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="400" height="800"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  canvas.style.width = (canvas.width / 2) + 'px';
+  canvas.style.height = (canvas.height / 2) + 'px';
+  var ctx = canvas.getContext('2d');
+  ctx.scale(2, 2);
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 150);
+  ctx.fillStyle = 'red';
+  ctx.fillRect(0, 150, 200, 250);
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-print.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-print.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-print.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-print.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="block-001-wm-vlr-ref.html">
+<meta name="flags" content="paged">
+<meta name="fuzzy" content="maxDifference=0-60;totalPixels=0-200">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.b {
+  inline-size: 50vh;
+  block-size: 210vw;
+  box-sizing: border-box;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+  margin-block-end: -20px;
+}
+</style>
+<body>
+  <div class="b"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vlr-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<meta name="flags" content="paged">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { block-size: 40vw; }
+
+.b {
+  box-sizing: border-box;
+  inline-size: 50vh;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+
+.b1 {
+  block-size: 100vw;
+  border-block-end-style: none;
+}
+
+.b2 {
+  block-size: 100vw;
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+
+.b3 {
+  block-size: 10vw;
+  border-block-start-style: none;
+  margin-block-end: -20px;
+}
+</style>
+<body>
+  <div class="b b1"></div>
+  <div class="b b2"></div>
+  <div class="b b3"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-print.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-print.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-print.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-print.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="block-001-wm-vrl-ref.html">
+<meta name="flags" content="paged">
+<meta name="fuzzy" content="maxDifference=0-60;totalPixels=0-200">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { block-size: 40vw; }
+
+.b {
+  inline-size: 50vh;
+  block-size: 210vw;
+  box-sizing: border-box;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+</style>
+<body>
+  <div class="b"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-001-wm-vrl-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<meta name="flags" content="paged">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { block-size: 40vw; }
+
+.b {
+  box-sizing: border-box;
+  inline-size: 50vh;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+
+.b1 {
+  block-size: 100vw;
+  border-block-end-style: none;
+}
+
+.b2 {
+  block-size: 100vw;
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+
+.b3 {
+  block-size: 10vw;
+  border-block-start-style: none;
+  margin-block-end: -20px;
+}
+</style>
+<body>
+  <div class="b b1"></div>
+  <div class="b b2"></div>
+  <div class="b b3"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-print.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-print.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-print.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-print.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="block-002-wm-vlr-ref.html">
+<meta name="flags" content="paged">
+<meta name="fuzzy" content="maxDifference=0-35;totalPixels=0-220">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { margin-block-start: 80vw; }
+* { box-sizing: border-box; }
+
+.b {
+  inline-size: 50vh;
+  block-size: 130vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+
+.b > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+  margin-inline-start: 20px;
+  margin-block-start: -5px;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 30vw;
+  margin-block-start: 5vw;
+  border: 5px solid blue;
+}
+</style>
+<body>
+  <div class="b">
+    <div></div>
+  </div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vlr-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<meta name="flags" content="paged">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-lr;
+}
+html { margin-block-start: 80vw; }
+* { box-sizing: border-box; }
+
+.b {
+  inline-size: 50vh;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+.b1 {
+  block-size: 20vw;
+  border-block-end-style: none;
+}
+
+.b2 {
+  block-size: 100vw;
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+
+.b3 {
+  block-size: 10vw;
+  border-block-start-style: none;
+}
+
+.b > div {
+  inline-size: 50vh;
+  block-size: 100vw;
+  border: 5px solid grey;
+  margin-inline-start: 20px;
+}
+.b1 > div {
+  border-block-end-style: none;
+  margin-block-start: -5px;
+}
+.b2 > div {
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+.b3 > div {
+  block-size: 30vw;
+  border-block-start-style: none;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 30vw;
+  margin-block-start: 5vw;
+  border: 5px solid blue;
+}
+</style>
+<body>
+  <div class="b b1"><div></div></div>
+  <div class="b b2"><div></div></div>
+  <div class="b b3"><div></div></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-print.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-print.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-print.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-print.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="block-002-wm-vrl-ref.html">
+<meta name="flags" content="paged">
+<meta name="fuzzy" content="maxDifference=0-35;totalPixels=0-220">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { margin-block-start: 80vw; }
+* { box-sizing: border-box; }
+
+.b {
+  inline-size: 50vh;
+  block-size: 130vw;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+
+.b > div {
+  inline-size: 50vh;
+  block-size: 150vw;
+  border: 5px solid grey;
+  margin-inline-start: 20px;
+  margin-block-start: -5px;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 30vw;
+  margin-block-start: 5vw;
+  border: 5px solid blue;
+}
+</style>
+<body>
+  <div class="b">
+    <div></div>
+  </div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/block-002-wm-vrl-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<meta name="flags" content="paged">
+<html>
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+  writing-mode: vertical-rl;
+}
+html { margin-block-start: 80vw; }
+* { box-sizing: border-box; }
+
+.b {
+  inline-size: 50vh;
+  border: 5px solid black;
+  border-block-start-color: blue;
+  border-inline-start-color: lime;
+  margin-inline-start: 20px;
+}
+.b1 {
+  block-size: 20vw;
+  border-block-end-style: none;
+}
+
+.b2 {
+  block-size: 100vw;
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+
+.b3 {
+  block-size: 10vw;
+  border-block-start-style: none;
+}
+
+.b > div {
+  inline-size: 50vh;
+  block-size: 100vw;
+  border: 5px solid grey;
+  margin-inline-start: 20px;
+}
+.b1 > div {
+  border-block-end-style: none;
+  margin-block-start: -5px;
+}
+.b2 > div {
+  border-block-start-style: none;
+  border-block-end-style: none;
+}
+.b3 > div {
+  block-size: 30vw;
+  border-block-start-style: none;
+}
+
+.after {
+  inline-size: 60vh;
+  block-size: 30vw;
+  margin-block-start: 5vw;
+  border: 5px solid blue;
+}
+</style>
+<body>
+  <div class="b b1"><div></div></div>
+  <div class="b b2"><div></div></div>
+  <div class="b b3"><div></div></div>
+  <div class="after"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/ink-overflow-001-print.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/ink-overflow-001-print.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/ink-overflow-001-print.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/ink-overflow-001-print.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="about:blank">
+<meta name="flags" content="paged">
+<style>
+@page {
+  size: 5in 3in;
+  margin: 0.5in;
+}
+
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+body {
+  width: 100vw;
+  height: 100vh;
+  outline: 100px solid red;
+  box-shadow: 100px 100px 0 #F00;
+}
+</style>
+<body></body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/ink-overflow-002.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/ink-overflow-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/ink-overflow-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/ink-overflow-002.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+.col {
+  column-width: 100px;
+  column-rule: 100px solid red;
+  height: 100px;
+  column-fill: auto;
+  gap: 0;
+  overflow: hidden;
+}
+
+.col > div {
+  display: flow-root;
+  width: 100px;
+  height: 100px;
+  background: green;
+}
+
+.col > div > div {
+  width: 10px;
+  height: 10px;
+  margin-top: 80px;
+  margin-left: 50px;
+  outline: 30px solid green;
+  box-shadow: 0 30px 0 30px green;
+}
+</style>
+<body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <div class="col"><div><div></div></div></div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-000.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-000.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-000.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-000.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#breaking-rules">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-fill:auto; column-gap:0; width:100px; height:100px; background:red;">
+  <div style="float:left; width:100%; height:150px; background:green;"></div>
+  <div style="display:inline-block; vertical-align:top; width:100%; height:50px; background:green;"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/line-pushed-by-float-001.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#breaking-rules">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1122901">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:4; column-fill:auto; column-gap:0; width:100px; height:100px; background:red;">
+  <div style="float:left; width:100%; height:350px; background:green;"></div>
+  <div style="display:inline-block; vertical-align:top; width:100%; height:50px; background:green;"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/reference/widows-001-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/reference/widows-001-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/reference/widows-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/reference/widows-001-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <!--
+  Date created: November 7th 2020
+  Last modified: November 17th 2020
+  -->
+
+  <style>
+  div
+    {
+      border: orange solid 4px;
+      font-size: 20px;
+      line-height: 1.3; /* computes to 26px */
+      height: 104px; /* Therefore, exactly 4 line boxes */
+      margin-bottom: 1em;
+      padding: 0.5em; /* computes to 10px */
+      width: 490px;
+
+      columns: 3 auto;
+      column-fill: auto;
+      column-gap: 1em; /* computes to 20px */
+      column-rule: blue solid 4px;
+
+      widows: 1;
+    }
+  </style>
+
+   <p>Test passes if the digits inside both orange-bordered rectangles are <strong>distributed identically</strong>.
+
+  <div>1<br>2<br>3<br>4<br>5<br>6<br>7<br><br>8<br>9</div>
+
+  <div>1<br>2<br>3<br>4<br>5<br>6<br>7<br><br>8<br>9</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-001.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Fragmentation level 3 Test: 'widows' and content distribution in columns</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-break-3/#widows-orphans">
+  <link rel="match" href="reference/widows-001-ref.html">
+
+  <!--
+  Date created: November 7th 2020
+  Last modified: November 17th 2020
+  -->
+
+  <!--
+
+  Bug 1562420: Implement orphans and widows for individual columns of a multicolumn element
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1562420
+
+  Bug 137367: Implement orphans and widows
+  https://bugzilla.mozilla.org/show_bug.cgi?id=137367
+
+  -->
+
+  <meta name="flags" content="">
+  <meta name="assert" content="When column boxes are filled sequentially, their content should be adjusted and fragmented in accordance with the 'widows' declaration. In the test, since the 3rd column box was going to get only 1 line box, then a class B break point is allowed and should occur before the last line box of the 2nd column box and after the next-to-last line box of the 2nd column box so that there is a minimum of 2 line boxes at the top of the 3rd column box.">
+
+  <!--
+
+    Breaking at a class B break point is allowed only if (...)
+    the number of line boxes between the break and the end
+    of the box is the value of widows or more.
+    4.4 Unforced Breaks
+    https://www.w3.org/TR/css-break-3/#unforced-breaks
+
+  -->
+
+  <style>
+  div
+    {
+      border: orange solid 4px;
+      font-size: 20px;
+      line-height: 1.3; /* computes to 26px */
+      height: 104px; /* Therefore, exactly 4 line boxes */
+      margin-bottom: 1em;
+      padding: 0.5em; /* computes to 10px */
+      width: 490px;
+
+      columns: 3 auto;
+      column-fill: auto;
+      column-gap: 1em;
+      column-rule: blue solid 4px;
+    }
+
+  div#test
+    {
+      widows: 2; /* widows' initial value is 2 */
+
+      /*
+      "The widows property specifies the minimum number of line boxes of a
+      block container that must be left in a fragment <em>after</em> a
+      column break."
+
+      coming from
+      CSS Fragmentation Module Level 3, section 3.3 Breaks Between Lines: orphans, widows
+      https://www.w3.org/TR/css-break-3/#widows-orphans
+      */
+    }
+
+  div#reference
+    {
+      widows: 1;
+    }
+  </style>
+
+  <p>Test passes if the digits inside both orange-bordered rectangles are <strong>distributed identically</strong>.
+
+  <div id="test">1<br>2<br>3<br>4<br>5<br>6<br>7<br>8<br>9</div>
+
+  <div id="reference">1<br>2<br>3<br>4<br>5<br>6<br>7<br><br>8<br>9</div>
+
+  <!--           Same as div#test except 1 extra br here   ^      -->
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-orphans-006.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-orphans-006.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-orphans-006.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-orphans-006.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#widows-orphans">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1153517">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  #mc > div { display:inline-block; width:100%; height:20px; }
+  #mc > div.red { background:red; }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="mc" style="overflow:hidden; columns:1; column-fill:auto; width:100px; height:100px; orphans:1; widows:1; line-height:0; background:green;">
+  <div></div>
+  <div class="red"></div>
+  <div class="red"></div>
+  <div class="red"></div>
+  <div class="red"></div>
+  <div class="red"></div>
+</div>
+<script>
+  document.body.offsetTop,
+  mc.style.widows = 5;
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-orphans-007.html firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-orphans-007.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-break/widows-orphans-007.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-break/widows-orphans-007.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#widows-orphans">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1153517">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  #mc > div { display:inline-block; width:100%; height:20px; }
+  #mc > div.green { height:100px; background:green; }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div id="mc" style="columns:4; orphans:3; widows:1; column-gap:0; line-height:0;">
+    <div class="green"></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div class="green"></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div class="green"></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div class="green"></div>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  mc.style.orphans = 5;
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/contain-size-monolithic-002.html firefox-85.0+build1/testing/web-platform/tests/css/css-contain/contain-size-monolithic-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/contain-size-monolithic-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-contain/contain-size-monolithic-002.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="UTF-8">
+  <title>CSS Containment Test: absolute positioned 'contain: size' element is monolithic</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-size">
+  <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+  <meta  name="assert" content="This test checks that an absolute positioned element with size containment is monolithic.">
+
+  <style>
+  #multicol {
+    width: 300px;
+    column-count: 3;
+  }
+  #container {
+    position: relative;
+  }
+  #abs-size-contain {
+    position: absolute;
+    contain: size;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+  </style>
+
+  <p>Test passes if there is a filled green square.</p>
+  <div id="multicol">
+    <div id="container">
+      <div id="abs-size-contain"></div>
+    </div>
+  </div>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.html firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,27 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Content Visibility: content-visibility is not animatable.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="content-visibility is not animatable">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+@keyframes cv {
+  from { content-visibility: auto }
+  to { content-visibility: hidden }
+}
+
+#container { animation: cv 1s; }
+</style>
+
+<div id=container></div>
+
+<script>
+test(() => {
+  const computedStyle = getComputedStyle(container);
+  assert_equals(computedStyle.contentVisibility, "visible");
+}, "Content-visibility is not animatable");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.tentative.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-077.tentative.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!doctype HTML>
-<meta charset="utf8">
-<title>CSS Content Visibility: content-visibility is not animatable.</title>
-<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
-<meta name="assert" content="content-visibility is not animatable">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<style>
-@keyframes cv {
-  from { content-visibility: auto }
-  to { content-visibility: hidden }
-}
-
-#container { animation: cv 1s; }
-</style>
-
-<div id=container></div>
-
-<script>
-test(() => {
-  const computedStyle = getComputedStyle(container);
-  assert_equals(computedStyle.contentVisibility, "visible");
-}, "Content-visibility is not animatable");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078.html firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,33 @@
+<!doctype HTML>
+<html class="reftest-wait">
+<meta charset="utf8">
+<title>CSS Content Visibility: positioned movement update moves hidden container</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<link rel="match" href="content-visibility-078-ref.html">
+<meta name="assert" content="when locked, position updates still apply">
+
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+.hidden { content-visibility: hidden; }
+#target {
+  top: 0;
+  left: 0;
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  background: blue;
+}
+</style>
+
+<div id=target class=hidden>Content</div>
+
+<script>
+function runTest() {
+  target.style = "left: 100px;";
+  takeScreenshot();
+}
+
+window.onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-contain/content-visibility/content-visibility-078-ref.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,19 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>CSS Content Visibility: positioned movement update moves hidden container (reference)</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+
+<style>
+#target {
+  top: 0;
+  left: 100px;
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  background: blue;
+}
+</style>
+
+<div id=target></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-additive-symbols-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-additive-symbols-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-additive-symbols-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-additive-symbols-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-symbols">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_additive_symbols(value, expected) {
+  test_valid_counter_style_descriptor('additive-symbols', value, expected);
+}
+
+function test_invalid_additive_symbols(value) {
+  test_invalid_counter_style_descriptor('additive-symbols', value);
+}
+
+// [ <integer [0,∞]> && <symbol> ]#
+
+test_valid_additive_symbols('1 "X"');
+test_valid_additive_symbols('"X" 1', '1 "X"');
+test_valid_additive_symbols('5 "V", 1 "I"');
+
+test_invalid_additive_symbols('');
+
+// Weights must be non-negative
+test_invalid_additive_symbols('-1 "X"');
+
+// Weights must be in strictly decreasing order
+test_invalid_additive_symbols('1 "I", 5 "V"');
+test_invalid_additive_symbols('1 "X", 1 "Y"');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-fallback.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-fallback.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-fallback.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-fallback.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-fallback">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_fallback(value) {
+  test_valid_counter_style_descriptor('fallback', value);
+}
+
+function test_invalid_fallback(value) {
+  test_invalid_counter_style_descriptor('fallback', value);
+}
+
+// <counter-style-name>
+
+test_valid_fallback('bar');
+
+// Counter style names are custom identifiers, not strings
+test_invalid_fallback('"bar"');
+
+// The following are not valid counter style names
+test_invalid_fallback('none');
+test_invalid_fallback('initial');
+test_invalid_fallback('inherit');
+test_invalid_fallback('unset');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-name-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-name-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-name-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-name-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#the-counter-style-rule">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+test_valid_name('foo');
+
+test_invalid_name('');
+test_invalid_name('none');
+test_invalid_name('initial');
+test_invalid_name('inherit');
+test_invalid_name('unset');
+
+test_invalid_name('decimal');
+test_invalid_name('disc');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-negative-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-negative-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-negative-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-negative-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-negative">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_negative(value) {
+  test_valid_counter_style_descriptor('negative', value);
+}
+
+function test_invalid_negative(value) {
+  test_invalid_counter_style_descriptor('negative', value);
+}
+
+// <symbol> <symbol>?
+
+test_valid_negative('"X"');
+test_valid_negative('"X" "X"');
+test_invalid_negative('"X" "X" "X"');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-pad-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-pad-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-pad-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-pad-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-pad">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_pad(value, expected) {
+  test_valid_counter_style_descriptor('pad', value, expected);
+}
+
+function test_invalid_pad(value) {
+  test_invalid_counter_style_descriptor('pad', value);
+}
+
+// <integer [0,∞]> && <symbol>
+
+test_invalid_pad('10');
+test_invalid_pad('"X"');
+test_valid_pad('10 "X"');
+test_valid_pad('"X" 10', '10 "X"');
+test_invalid_pad('-1 "X"');
+test_invalid_pad('"X" -1');
+test_invalid_pad('10 "X" "Y"');
+test_invalid_pad('10 10 "X"');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-prefix-suffix-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-prefix-suffix-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-prefix-suffix-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-prefix-suffix-syntax.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-prefix">
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-suffix">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_prefix_suffix(value, expected) {
+  test_valid_counter_style_descriptor('prefix', value, expected);
+  test_valid_counter_style_descriptor('suffix', value, expected);
+}
+
+function test_invalid_prefix_suffix(value) {
+  test_invalid_counter_style_descriptor('prefix', value);
+  test_invalid_counter_style_descriptor('suffix', value);
+}
+
+// <symbol>
+// <symbol> = <string> | <image> | <custom-ident>
+
+// string values
+test_valid_prefix_suffix('"string"');
+test_valid_prefix_suffix('"initial"');
+test_valid_prefix_suffix('"inherit"');
+test_valid_prefix_suffix('"unset"');
+
+// custom-ident values
+test_valid_prefix_suffix('custom-ident')
+test_invalid_prefix_suffix('initial');
+test_invalid_prefix_suffix('inherit');
+test_invalid_prefix_suffix('unset');
+
+// image values
+test_valid_prefix_suffix('url("https://example.com/foo.png")');
+test_valid_prefix_suffix('url(https://example.com/foo.png)', 'url("https://example.com/foo.png")');
+test_valid_prefix_suffix('linear-gradient(yellow, blue)');
+
+// Must be exactly one symbol
+test_invalid_prefix_suffix('');
+test_invalid_prefix_suffix('foo bar');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-range-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-range-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-range-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-range-syntax.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-range">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_range(value) {
+  test_valid_counter_style_descriptor('range', value);
+}
+
+function test_invalid_range(value) {
+  test_invalid_counter_style_descriptor('range', value);
+}
+
+// [ <integer> | infinite ]{2} ]# | auto
+
+test_valid_range('auto');
+
+test_valid_range('infinite infinite');
+test_valid_range('infinite 0');
+test_valid_range('0 infinite');
+
+test_valid_range('infinite 0, 5 10, 100 infinite');
+test_valid_range('infinite 10, 5 20, 15 infinite');
+
+test_invalid_range('');
+test_invalid_range('0 -1');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-speak-as-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-speak-as-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-speak-as-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-speak-as-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-speak_as">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_speak_as(value) {
+  test_valid_counter_style_descriptor('speak-as', value);
+}
+
+function test_invalid_speak_as(value) {
+  test_invalid_counter_style_descriptor('speak-as', value);
+}
+
+// auto | bullets | numbers | words | spell-out | <counter-style-name>
+
+test_valid_speak_as('auto');
+test_valid_speak_as('bullets');
+test_valid_speak_as('numbers');
+test_valid_speak_as('words');
+test_valid_speak_as('spell-out');
+
+test_valid_speak_as('bar');
+test_valid_speak_as('spellout'); // 'spellout' is a valid counter style name
+
+test_invalid_speak_as('bullets numbers');
+
+// The following are not valid counter style names
+test_invalid_speak_as('none');
+test_invalid_speak_as('initial');
+test_invalid_speak_as('inherit');
+test_invalid_speak_as('unset');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-symbols-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-symbols-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-symbols-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-symbols-syntax.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-symbols">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_symbols(value, expected) {
+  test_valid_counter_style_descriptor('symbols', value, expected);
+}
+
+function test_invalid_symbols(value) {
+  test_invalid_counter_style_descriptor('symbols', value);
+}
+
+// <symbol>+
+
+test_valid_symbols('"X"');
+test_valid_symbols('"X" "X"');
+test_valid_symbols('ident "X"');
+test_valid_symbols('ident "X" url("foo.jpg")');
+
+test_invalid_symbols('');
+test_invalid_symbols('initial "X" "X"');
+test_invalid_symbols('inherit "X" "X"');
+test_invalid_symbols('unset "X" "X"');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-system-syntax.html firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-system-syntax.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-system-syntax.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/counter-style-system-syntax.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#counter-style-system">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/counter-style-testcommon.js"></script>
+<script>
+function test_valid_system(value) {
+  test_valid_counter_style_descriptor('system', value);
+}
+
+function test_invalid_system(value) {
+  test_invalid_counter_style_descriptor('system', value);
+}
+
+// cyclic | numeric | alphabetic | symbolic | additive |
+// [fixed <integer>?] | [ extends <counter-style-name> ]
+
+test_valid_system('cyclic');
+test_valid_system('fixed');
+test_valid_system('fixed 100');
+test_valid_system('fixed -1');
+test_valid_system('symbolic');
+test_valid_system('alphabetic');
+test_valid_system('numeric');
+test_valid_system('additive');
+test_valid_system('extends bar');
+
+test_invalid_system('float');
+test_invalid_system('cyclic cyclic');
+
+// The following are not valid counter style names
+test_invalid_system('extends none');
+test_invalid_system('extends initial');
+test_invalid_system('extends inherit');
+test_invalid_system('extends unset');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/support/counter-style-testcommon.js firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/support/counter-style-testcommon.js
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-counter-styles/support/counter-style-testcommon.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-counter-styles/support/counter-style-testcommon.js	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,83 @@
+function test_counter_style_descriptor(descriptor, value, expected) {
+  let descriptors = [];
+  descriptors.push(`${descriptor}: ${value}`);
+
+  // Fill out the remaining necessary descriptors
+  if (descriptor === 'system') {
+    if (value === 'additive')
+      descriptors.push('additive-symbols: 1 "I"');
+    else if (!value.startsWith('extends'))
+      descriptors.push('symbols: "X" "Y"');
+  } else if (descriptor === 'symbols') {
+    descriptors.push('system: symbolic');
+  } else if (descriptor === 'additive-symbols') {
+    descriptors.push('system: additive');
+  } else {
+    descriptors.push('system: symbolic');
+    descriptors.push('symbols: "X" "Y"');
+  }
+
+  let style = document.createElement('style');
+  style.textContent = `@counter-style foo { ${descriptors.join(';')} }`;
+  document.head.appendChild(style);
+
+  test(() => {
+    let rule = style.sheet.cssRules[0];
+    // TODO: The spec is inconsistent on when the entire rule is invalid
+    // (and hence absent from OM), and when only the descriptor is invalid.
+    // Revise when spec issue is resolved.
+    // See https://github.com/w3c/csswg-drafts/issues/5717
+    if (!rule) {
+      assert_equals(expected, undefined);
+      return;
+    }
+
+    assert_equals(rule.constructor.name, 'CSSCounterStyleRule');
+
+    let text = rule.cssText;
+    if (expected)
+      assert_not_equals(text.indexOf(`${descriptor}: ${expected}`), -1);
+    else
+      assert_equals(text.indexOf(`${descriptor}:`), -1);
+  }, `@counter-style '${descriptor}: ${value}' is ${expected ? 'valid' : 'invalid'}`);
+
+  style.remove();
+}
+
+function test_valid_counter_style_descriptor(descriptor, value, expected) {
+  expected = expected || value;
+  test_counter_style_descriptor(descriptor, value, expected);
+}
+
+function test_invalid_counter_style_descriptor(descriptor, value) {
+  test_counter_style_descriptor(descriptor, value, undefined);
+}
+
+function test_counter_style_name(name, isValid) {
+  let style = document.createElement('style');
+  style.textContent = `@counter-style ${name} { system: symbolic; symbols: 'X' 'Y'; }`;
+  document.head.appendChild(style);
+
+  test(() => {
+    let rule = style.sheet.cssRules[0];
+    if (!isValid) {
+      assert_equals(rule, undefined);
+      return;
+    }
+
+    assert_not_equals(rule, undefined);
+    assert_equals(rule.constructor.name, 'CSSCounterStyleRule');
+    assert_equals(rule.name, name);
+  }, `@counter-style name ${name} is ${isValid ? 'valid' : 'invalid'}`);
+
+  style.remove();
+}
+
+function test_valid_name(name) {
+  test_counter_style_name(name, true);
+}
+
+function test_invalid_name(name) {
+  test_counter_style_name(name, false);
+}
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001a.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001a.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001a.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001a.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,182 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a horizontal flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 20px; /* Skinny, to force us to wrap */
+        height: 200px;
+        display: flex;
+        flex-wrap: wrap;
+        margin-right: 2px;
+        float: left;
+        background: lightgray;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: auto; /* height comes from contents */
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 40px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 10px;
+        height: 30px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="8" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="30" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="110" data-offset-x="30" data-offset-y="98"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="30" data-offset-y="98"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="52" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="70" data-offset-x="52" data-offset-y="58"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="52" data-offset-y="58"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="52" data-offset-y="128"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="74" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="96" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="96" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="96" data-offset-y="18"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="118" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="118" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="118" data-offset-y="18"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="118" data-offset-y="48"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="140" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="162" data-offset-y="168"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="162" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="162" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="184" data-offset-y="128"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="184" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="184" data-offset-y="138"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="184" data-offset-y="168"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="206" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="228" data-offset-y="88"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="228" data-offset-y="98"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="228" data-offset-y="98"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="250" data-offset-y="68"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="250" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="250" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="250" data-offset-y="108"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="272" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="294" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="294" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="294" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="316" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="316" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="316" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="316" data-offset-y="168"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="338" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="360" data-offset-y="48"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="360" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="360" data-offset-y="138"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="382" data-offset-y="28"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="382" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="382" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="382" data-offset-y="148"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="404" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="426" data-offset-y="61"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="426" data-offset-y="125"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="426" data-offset-y="125"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="448" data-offset-y="38"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="448" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="448" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="448" data-offset-y="138"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="470" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="492" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="492" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="492" data-offset-y="18"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="514" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="514" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="514" data-offset-y="18"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="514" data-offset-y="48"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="536" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="558" data-offset-y="168"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="558" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="558" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="580" data-offset-y="128"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="580" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="580" data-offset-y="138"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="580" data-offset-y="168"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001b.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001b.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-001b.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,183 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. Additionally,
+     the flex container derives its width from the "max-width" property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a horizontal flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        max-width: 20px; /* Skinny, to force us to wrap */
+        height: 200px;
+        display: flex;
+        flex-wrap: wrap;
+        margin-right: 2px;
+        float: left;
+        background: lightgray;
+      }
+      div.a {
+        height: 10px;
+        width: 20px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        height: auto; /* height comes from contents */
+        width: 20px;
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        height: 40px;
+        width: 20px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 10px;
+        height: 30px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="8" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="30" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="110" data-offset-x="30" data-offset-y="98"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="30" data-offset-y="98"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="52" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="70" data-offset-x="52" data-offset-y="58"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="52" data-offset-y="58"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="52" data-offset-y="128"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="74" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="96" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="96" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="96" data-offset-y="18"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="118" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="118" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="118" data-offset-y="18"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="118" data-offset-y="48"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="140" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="162" data-offset-y="168"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="162" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="162" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="184" data-offset-y="128"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="184" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="184" data-offset-y="138"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="184" data-offset-y="168"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="206" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="228" data-offset-y="88"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="228" data-offset-y="98"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="228" data-offset-y="98"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="250" data-offset-y="68"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="250" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="250" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="250" data-offset-y="108"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="272" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="294" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="294" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="294" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="316" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="316" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="316" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="316" data-offset-y="168"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="338" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="360" data-offset-y="48"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="360" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="360" data-offset-y="138"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="382" data-offset-y="28"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="382" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="382" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="382" data-offset-y="148"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="404" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="426" data-offset-y="61"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="426" data-offset-y="125"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="426" data-offset-y="125"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="448" data-offset-y="38"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="448" data-offset-y="78"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="448" data-offset-y="78"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="448" data-offset-y="138"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="470" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="492" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="492" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="492" data-offset-y="18"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="514" data-offset-y="8"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="514" data-offset-y="18"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="514" data-offset-y="18"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="514" data-offset-y="48"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="536" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="558" data-offset-y="168"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="558" data-offset-y="178"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="558" data-offset-y="178"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="580" data-offset-y="128"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="580" data-offset-y="138"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="580" data-offset-y="138"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="580" data-offset-y="168"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-002.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-horiz-002.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,182 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of row wrap-reverse flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a row wrap-reverse flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 20px; /* Skinny, to force us to wrap */
+        height: 200px;
+        display: flex;
+        flex-wrap: wrap-reverse;
+        margin-right: 2px;
+        float: left;
+        background: lightgray;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: auto; /* height comes from contents */
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 40px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 10px;
+        height: 30px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="8" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="30" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="110" data-offset-x="30" data-offset-y="8"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="30" data-offset-y="8"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="52" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="70" data-offset-x="52" data-offset-y="88"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="52" data-offset-y="88"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="52" data-offset-y="48"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="74" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="96" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="96" data-offset-y="168"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="96" data-offset-y="168"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="118" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="118" data-offset-y="168"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="118" data-offset-y="168"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="118" data-offset-y="128"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="140" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="162" data-offset-y="38"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="162" data-offset-y="8"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="162" data-offset-y="8"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="184" data-offset-y="78"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="184" data-offset-y="48"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="184" data-offset-y="48"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="184" data-offset-y="8"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="206" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="228" data-offset-y="118"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="228" data-offset-y="88"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="228" data-offset-y="88"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="250" data-offset-y="138"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="250" data-offset-y="108"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="250" data-offset-y="108"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="250" data-offset-y="68"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="272" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="294" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="294" data-offset-y="8"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="294" data-offset-y="8"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="316" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="316" data-offset-y="108"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="316" data-offset-y="108"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="316" data-offset-y="8"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="338" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="360" data-offset-y="158"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="360" data-offset-y="48"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="360" data-offset-y="48"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="382" data-offset-y="178"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="382" data-offset-y="108"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="382" data-offset-y="108"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="382" data-offset-y="28"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="404" data-offset-y="103"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="426" data-offset-y="145"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="426" data-offset-y="61"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="426" data-offset-y="61"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="448" data-offset-y="168"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="448" data-offset-y="108"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="448" data-offset-y="108"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="448" data-offset-y="38"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="470" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="492" data-offset-y="38"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="492" data-offset-y="8"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="492" data-offset-y="8"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="514" data-offset-y="78"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="514" data-offset-y="48"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="514" data-offset-y="48"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="514" data-offset-y="8"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="536" data-offset-y="198"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="558" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="558" data-offset-y="168"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="558" data-offset-y="168"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="20" data-expected-height="10" data-offset-x="580" data-offset-y="198"></div>
+      <div class="b" data-expected-width="20" data-expected-height="30" data-offset-x="580" data-offset-y="168"><div class="fixedSizeChild" data-expected-width="10" data-expected-height="30" data-offset-x="580" data-offset-y="168"></div></div>
+      <div class="c" data-expected-width="20" data-expected-height="40" data-offset-x="580" data-offset-y="128"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001a.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001a.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001a.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001a.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,182 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of vertical flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a vertical flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 10px; /* Short, to force us to wrap */
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        margin-bottom: 2px;
+        background: lightgray;
+      }
+      div.a {
+        width: 10px;
+        height: 10px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: auto; /* width comes from contents */
+        height: 10px;
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 40px;
+        height: 10px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 5px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="20"></div>
+      <div class="b" data-expected-width="110" data-expected-height="10" data-offset-x="98" data-offset-y="20"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="98" data-offset-y="20"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="32"></div>
+      <div class="b" data-expected-width="70" data-expected-height="10" data-offset-x="58" data-offset-y="32"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="58" data-offset-y="32"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="128" data-offset-y="32"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="44"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="56"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="56"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="56"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="68"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="68"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="68"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="48" data-offset-y="68"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="198" data-offset-y="80"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="168" data-offset-y="92"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="92"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="92"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="128" data-offset-y="104"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="104"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="104"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="104"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="116"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="88" data-offset-y="128"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="98" data-offset-y="128"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="98" data-offset-y="128"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="68" data-offset-y="140"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="140"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="140"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="108" data-offset-y="140"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="152"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="164"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="164"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="164"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="176"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="176"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="176"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="176"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="188"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="48" data-offset-y="200"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="200"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="200"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="28" data-offset-y="212"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="212"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="212"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="148" data-offset-y="212"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="224"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="61" data-offset-y="236"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="125" data-offset-y="236"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="125" data-offset-y="236"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="38" data-offset-y="248"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="248"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="248"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="138" data-offset-y="248"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="260"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="272"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="272"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="272"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="284"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="284"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="284"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="48" data-offset-y="284"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="198" data-offset-y="296"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="168" data-offset-y="308"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="308"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="308"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="128" data-offset-y="320"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="320"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="320"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="320"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001b.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001b.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001b.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-001b.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,183 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of vertical flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. Additionally,
+     the flex container derives its height from the "max-height" property.-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a vertical flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        max-height: 10px; /* Short, to force us to wrap */
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        margin-bottom: 2px;
+        background: lightgray;
+      }
+      div.a {
+        width: 10px;
+        height: 10px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: auto; /* width comes from contents */
+        height: 10px;
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 40px;
+        height: 10px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 5px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="20"></div>
+      <div class="b" data-expected-width="110" data-expected-height="10" data-offset-x="98" data-offset-y="20"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="98" data-offset-y="20"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="32"></div>
+      <div class="b" data-expected-width="70" data-expected-height="10" data-offset-x="58" data-offset-y="32"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="58" data-offset-y="32"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="128" data-offset-y="32"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="44"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="56"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="56"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="56"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="68"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="68"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="68"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="48" data-offset-y="68"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="198" data-offset-y="80"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="168" data-offset-y="92"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="92"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="92"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="128" data-offset-y="104"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="104"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="104"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="104"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="116"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="88" data-offset-y="128"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="98" data-offset-y="128"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="98" data-offset-y="128"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="68" data-offset-y="140"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="140"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="140"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="108" data-offset-y="140"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="152"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="164"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="164"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="164"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="176"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="176"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="176"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="176"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="188"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="48" data-offset-y="200"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="200"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="200"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="28" data-offset-y="212"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="212"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="212"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="148" data-offset-y="212"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="103" data-offset-y="224"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="61" data-offset-y="236"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="125" data-offset-y="236"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="125" data-offset-y="236"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="38" data-offset-y="248"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="248"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="78" data-offset-y="248"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="138" data-offset-y="248"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="260"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="272"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="272"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="272"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="8" data-offset-y="284"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="284"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="18" data-offset-y="284"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="48" data-offset-y="284"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="198" data-offset-y="296"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="168" data-offset-y="308"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="308"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="178" data-offset-y="308"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="10" data-offset-x="128" data-offset-y="320"></div>
+      <div class="b" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="320"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="5" data-offset-x="138" data-offset-y="320"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="10" data-offset-x="168" data-offset-y="320"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-002.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-vert-002.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,182 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of column wrap-reverse flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a column wrap-reverse flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 20px; /* Short, to force us to wrap */
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap-reverse;
+        margin-bottom: 2px;
+        background: lightgray;
+      }
+      div.a {
+        width: 10px;
+        height: 20px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: auto; /* width comes from contents */
+        height: 20px;
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 40px;
+        height: 20px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 10px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="30"></div>
+      <div class="b" data-expected-width="110" data-expected-height="20" data-offset-x="8" data-offset-y="30"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="8" data-offset-y="30"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="52"></div>
+      <div class="b" data-expected-width="70" data-expected-height="20" data-offset-x="88" data-offset-y="52"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="88" data-offset-y="52"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="48" data-offset-y="52"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="74"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="96"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="96"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="96"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="118"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="118"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="118"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="128" data-offset-y="118"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="140"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="38" data-offset-y="162"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="8" data-offset-y="162"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="8" data-offset-y="162"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="78" data-offset-y="184"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="48" data-offset-y="184"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="48" data-offset-y="184"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="8" data-offset-y="184"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="206"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="118" data-offset-y="228"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="88" data-offset-y="228"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="88" data-offset-y="228"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="138" data-offset-y="250"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="108" data-offset-y="250"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="108" data-offset-y="250"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="68" data-offset-y="250"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="272"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="294"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="8" data-offset-y="294"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="8" data-offset-y="294"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="316"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="108" data-offset-y="316"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="108" data-offset-y="316"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="8" data-offset-y="316"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="338"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="158" data-offset-y="360"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="48" data-offset-y="360"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="48" data-offset-y="360"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="178" data-offset-y="382"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="108" data-offset-y="382"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="108" data-offset-y="382"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="28" data-offset-y="382"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="404"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="145" data-offset-y="426"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="61" data-offset-y="426"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="61" data-offset-y="426"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="168" data-offset-y="448"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="108" data-offset-y="448"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="108" data-offset-y="448"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="38" data-offset-y="448"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="470"></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="38" data-offset-y="492"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="8" data-offset-y="492"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="8" data-offset-y="492"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="78" data-offset-y="514"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="48" data-offset-y="514"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="48" data-offset-y="514"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="8" data-offset-y="514"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="536"></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="558"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="558"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="558"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="580"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="580"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="580"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="128" data-offset-y="580"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-wmvert-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-wmvert-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/align-content-wmvert-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/align-content-wmvert-001.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,182 @@
+<!doctype html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of horizontal flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a vertical writing-mode flex container</title>
+    <link rel="author" title="Mihir Iyer" href="mailto:miyer@mozilla.com"/>
+    <link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 20px; /* Short, to force us to wrap */
+        display: flex;
+        flex-wrap: wrap;
+        margin-bottom: 2px;
+        background: lightgray;
+        writing-mode: vertical-lr;
+      }
+      div.a {
+        width: 10px;
+        height: 20px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: auto;
+        height: 20px; /* height comes from contents */
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 40px;
+        height: 20px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 10px;
+        background: purple;
+      }
+    </style>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/check-layout-th.js"></script>
+  </head>
+  <body onload="checkLayout('.flexbox div')">
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="8"></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="30"></div>
+      <div class="b" data-expected-width="110" data-expected-height="20" data-offset-x="98" data-offset-y="30"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="98" data-offset-y="30"></div></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="52"></div>
+      <div class="b" data-expected-width="70" data-expected-height="20" data-offset-x="58" data-offset-y="52"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="58" data-offset-y="52"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="128" data-offset-y="52"></div>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="74"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="96"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="18" data-offset-y="96"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="96"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="118"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="18" data-offset-y="118"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="18" data-offset-y="118"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="48" data-offset-y="118"></div>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="140"></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="168" data-offset-y="162"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="178" data-offset-y="162"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="162"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="128" data-offset-y="184"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="138" data-offset-y="184"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="184"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="168" data-offset-y="184"></div>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="206"></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="88" data-offset-y="228"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="98" data-offset-y="228"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="98" data-offset-y="228"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="68" data-offset-y="250"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="78" data-offset-y="250"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="250"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="108" data-offset-y="250"></div>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="272"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="294"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="178" data-offset-y="294"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="178" data-offset-y="294"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="316"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="78" data-offset-y="316"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="316"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="168" data-offset-y="316"></div>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="338"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="48" data-offset-y="360"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="138" data-offset-y="360"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="138" data-offset-y="360"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="28" data-offset-y="382"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="78" data-offset-y="382"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="382"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="148" data-offset-y="382"></div>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="103" data-offset-y="404"></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="61" data-offset-y="426"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="125" data-offset-y="426"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="125" data-offset-y="426"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="38" data-offset-y="448"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="78" data-offset-y="448"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="78" data-offset-y="448"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="138" data-offset-y="448"></div>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="8" data-offset-y="470"></div>
+    </div>
+    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="38" data-offset-y="492"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="8" data-offset-y="492"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="8" data-offset-y="492"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="78" data-offset-y="514"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="48" data-offset-y="514"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="48" data-offset-y="514"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="8" data-offset-y="514"></div>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="536"></div>
+    </div>
+    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="558"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="558"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="558"></div></div>
+    </div>
+    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+      <div class="a" data-expected-width="10" data-expected-height="20" data-offset-x="198" data-offset-y="580"></div>
+      <div class="b" data-expected-width="30" data-expected-height="20" data-offset-x="168" data-offset-y="580"><div class="fixedSizeChild" data-expected-width="30" data-expected-height="10" data-offset-x="168" data-offset-y="580"></div></div>
+      <div class="c" data-expected-width="40" data-expected-height="20" data-offset-x="128" data-offset-y="580"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="UTF-8">
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1678469">
+  <meta name="assert" content="This test ensures that the browser does not crash after removing the element 'c'.">
+
+  <style>
+  html { columns: 0 }
+  body {
+    transform: rotate(14deg);
+  }
+  #flex-container {
+    display: flex;
+    contain: size layout;
+    position: absolute;
+    width: 100px;
+    height: 100px;
+  }
+  </style>
+
+  <script>
+  function boom() {
+    let flex = document.getElementById('flex-container');
+    let c = document.getElementById('c');
+    flex.removeChild(c);
+  }
+  </script>
+
+  <body onload="boom()">
+    <div id="flex-container">
+      x
+      <div id="c"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row.html	2021-01-18 19:58:21.000000000 +0000
@@ -18,35 +18,35 @@
             display: flex;
             flex-flow: row;
             writing-mode: vertical-rl;
-            color: white;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 3em;
-            line-height: 1.5em;
+            line-height: 0;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
+        .color-block {
+          display: inline-block;
+          width: 15px;
+          height: 45px;
         }
     </style>
 </head>
 <body>
-
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
-
-  <div class="error"></div>
+  <p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
   <div class="container">
-    <div class="item">１２３<br />�ｂｃ</div>
-    <div class="item">４５６<br />ｄｅｆ</div>
-    <div class="item">７８９<br />ｇｈｉ</div>
+    <div class="item">
+      <span class=color-block style="background: orange;"></span>
+      <br />
+      <span class=color-block style="background: grey;"></span>
+    </div>
+    <div class="item">
+      <span class=color-block style="background: blue;"></span>
+      <br />
+      <span class=color-block style="background: yellow;"></span>
+    </div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-ref.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -4,27 +4,21 @@
     <meta charset="utf-8" />
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Tsutomu ogaoga Ogasawara" href="mailto:info@ogaoga.org">
-    <style type="text/css">
-        .container {
-            color: white;
-        }
+
+    <style>
         .item {
-            writing-mode: vertical-rl;
-            background: green;
-            height: 3em;
-            width: 3em;
-            line-height: 1.5em;
+            width: 15px;
+            height: 45px;
+            float: left;
         }
     </style>
 </head>
-<body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
 
-  <div class="container">
-    <div class="item">１２３<br />�ｂｃ</div>
-    <div class="item">４５６<br />ｄｅｆ</div>
-    <div class="item">７８９<br />ｇｈｉ</div>
-  </div>
+<p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
 
-</body>
-</html>
+<div style="height: 90px; width: 30px; border: 2px solid black;">
+    <div class="item" style="background: grey"></div>
+    <div class="item" style="background: orange"></div>
+    <div class="item" style="background: yellow"></div>
+    <div class="item" style="background: blue"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse.html	2021-01-18 19:58:22.000000000 +0000
@@ -18,34 +18,35 @@
             display: flex;
             flex-flow: row-reverse;
             writing-mode: vertical-rl;
-            color: white;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 3em;
-            line-height: 1.5em;
+            line-height: 0;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
+        .color-block {
+          display: inline-block;
+          width: 15px;
+          height: 45px;
         }
     </style>
 </head>
 <body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
-
-  <div class="error"></div>
+  <p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
   <div class="container">
-    <div class="item">７８９<br />ｇｈｉ</div>
-    <div class="item">４５６<br />ｄｅｆ</div>
-    <div class="item">１２３<br />�ｂｃ</div>
+    <div class="item">
+      <span class=color-block style="background: blue;"></span>
+      <br />
+      <span class=color-block style="background: yellow;"></span>
+    </div>
+    <div class="item">
+      <span class=color-block style="background: orange;"></span>
+      <br />
+      <span class=color-block style="background: grey;"></span>
+    </div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap.html	2021-01-18 19:58:21.000000000 +0000
@@ -18,39 +18,26 @@
             display: flex;
             flex-flow: row-reverse wrap;
             writing-mode: vertical-rl;
-            color: white;
-
-            height: 9em;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 1.5em;
-            line-height: 1.5em;
+            width: 15px;
+            height: 45px;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
-        }
     </style>
 </head>
 <body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
+<p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
 
-  <div class="error"></div>
   <div class="container">
-    <div class="item">７８９</div>
-    <div class="item">４５６</div>
-    <div class="item">１２３</div>
-    <div class="item">ｇｈｉ</div>
-    <div class="item">ｄｅｆ</div>
-    <div class="item">�ｂｃ</div>
+    <div class="item" style="background: blue"></div>
+    <div class="item" style="background: orange"></div>
+    <div class="item" style="background: yellow"></div>
+    <div class="item" style="background: grey"></div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-reverse-wrap-reverse.html	2021-01-18 19:58:22.000000000 +0000
@@ -18,39 +18,26 @@
             display: flex;
             flex-flow: row-reverse wrap-reverse;
             writing-mode: vertical-rl;
-            color: white;
-
-            height: 9em;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 1.5em;
-            line-height: 1.5em;
+            width: 15px;
+            height: 45px;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
-        }
     </style>
 </head>
 <body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
+<p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
 
-  <div class="error"></div>
   <div class="container">
-    <div class="item">ｇｈｉ</div>
-    <div class="item">ｄｅｆ</div>
-    <div class="item">�ｂｃ</div>
-    <div class="item">７８９</div>
-    <div class="item">４５６</div>
-    <div class="item">１２３</div>
+    <div class="item" style="background: yellow"></div>
+    <div class="item" style="background: grey"></div>
+    <div class="item" style="background: blue"></div>
+    <div class="item" style="background: orange"></div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap.html	2021-01-18 19:58:21.000000000 +0000
@@ -18,39 +18,26 @@
             display: flex;
             flex-flow: row wrap;
             writing-mode: vertical-rl;
-            color: white;
-
-            height: 9em;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 1.5em;
-            line-height: 1.5em;
+            width: 15px;
+            height: 45px;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
-        }
     </style>
 </head>
 <body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
+<p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
 
-  <div class="error"></div>
   <div class="container">
-    <div class="item">１２３</div>
-    <div class="item">４５６</div>
-    <div class="item">７８９</div>
-    <div class="item">�ｂｃ</div>
-    <div class="item">ｄｅｆ</div>
-    <div class="item">ｇｈｉ</div>
+    <div class="item" style="background: orange"></div>
+    <div class="item" style="background: blue"></div>
+    <div class="item" style="background: grey"></div>
+    <div class="item" style="background: yellow"></div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/css-flexbox-row-wrap-reverse.html	2021-01-18 19:58:22.000000000 +0000
@@ -18,39 +18,25 @@
             display: flex;
             flex-flow: row wrap-reverse;
             writing-mode: vertical-rl;
-            color: white;
-
-            height: 9em;
+            border: 2px solid black;
+            height: 90px;
         }
         .item {
-            background: green;
-            height: 3em;
-            width: 1.5em;
-            line-height: 1.5em;
+            width: 15px;
+            height: 45px;
 
             /* make sure UA that doesn't support writing mode and flexbox fails. */
             float: right;
         }
-        .error {
-            position: absolute;
-            background: red;
-            height: 9em;
-            width: 3em;
-            z-index: -1;
-        }
     </style>
 </head>
 <body>
-  <p>The test passes if you see a tall green box with pairs of the 1-9 and a-i listed top to bottom in two columns.</p>
-
-  <div class="error"></div>
+<p>Pass condition: 4 rectangles, with colors in clockwise order starting from top-left: grey, orange, blue, yellow.
   <div class="container">
-    <div class="item">�ｂｃ</div>
-    <div class="item">ｄｅｆ</div>
-    <div class="item">ｇｈｉ</div>
-    <div class="item">１２３</div>
-    <div class="item">４５６</div>
-    <div class="item">７８９</div>
+    <div class="item" style="background: grey"></div>
+    <div class="item" style="background: yellow"></div>
+    <div class="item" style="background: orange"></div>
+    <div class="item" style="background: blue"></div>
   </div>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1149714">
+<link rel="match" href="fieldset-as-item-overflow-ref.html">
+<meta name="assert" content="A fieldset element when flex-shrink is applied has scrollable overflow.">
+<div style="display: flex; flex-direction: column; width: 100px; height: 100px; border: solid;">
+  <fieldset style="margin: 0; border: none; padding: 0; overflow-y: scroll; overflow-x: hidden; flex-grow: 1;">
+    <div style="height: 200px; background: green;"></div>
+  </fieldset>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/fieldset-as-item-overflow-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; border: solid;">
+  <div style="overflow-y: scroll; max-height: 100%;">
+    <div style="height: 200px; background: green;"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/flex-aspect-ratio-img-row-014.html	2021-01-18 19:58:21.000000000 +0000
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>CSS Flexible Box Test: Aspect ratio handling of images</title>
+<link rel="author" title="Sergio Villar Senin" href="mailto:svillar@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#algo-cross-item" />
+<link rel="match" href="reference/flex-aspect-ratio-img-row-014-ref.html" />
+<meta name="assert" content="Test that we compute the correct aspect-ratio based cross size when a percentage main size is specified" />
+
+<style>
+#reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 90px;
+    height: 225px;
+    z-index: -1;
+}
+#constrained-flex {
+    display: flex;
+    width: 300px;
+    border: 1px solid black;
+}
+img {
+    min-width: 0;
+    min-height: 0;
+    width: 30%;
+}
+</style>
+
+<p>Test passes if there is <strong>no red</strong> visible on the page.</p>
+
+<div id="reference-overlapped-red"></div>
+<div id="constrained-flex">
+    <img id="test-flex-item-overlapping-green" src="support/20x50-green.png" />
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/flex-minimum-size-003.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/flex-minimum-size-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/flex-minimum-size-003.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/flex-minimum-size-003.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,23 @@
+<!doctype html>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#min-size-auto">
+<link rel="help" href="https://crbug.com/1151608">
+<meta name="assert" content="automatic minimum size computation doesn't overflow when multiplying by the aspect ratio" />
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<body onload="checkLayout('img')">
+
+<div id=log></div>
+
+<div style="display: flex; width: 300px;">
+  <img src="data:image/svg+xml,%3Csvg viewBox='0 0 1 1' width='8000' height='8000' xmlns='http://www.w3.org/2000/svg' %3E%3C/svg%3E" data-expected-width=8000 style="height: 8000px;">
+</div>
+
+<div style="display: flex; flex-direction: column; height: 300px;">
+  <img src="data:image/svg+xml,%3Csvg viewBox='0 0 1 1' width='8000' height='8000' xmlns='http://www.w3.org/2000/svg' %3E%3C/svg%3E" data-expected-height=8000 style="width: 8000px;">
+</div>
+
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1148288">
+<link rel="match" href="position-absolute-scrollbar-freeze-ref.html">
+<div style="display: flex; position: relative;">
+  <div style="display: flex;">
+    <div id="target1" style="width: 0px;">text</div>
+  </div>
+  <div id="target2" style="position: absolute; overflow: auto; top: 0; left: 0; width: 100px; max-height: 100px; display: none;">
+    <div style="height: 200px; background: green;"></div>
+  </div>
+</div>
+<script>
+document.body.offsetTop;
+document.getElementById('target1').innerText = '';
+document.getElementById('target2').style.display = '';
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/position-absolute-scrollbar-freeze-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; overflow: auto;">
+  <div style="height: 200px; background: green;"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/reference/flex-aspect-ratio-img-row-014-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>CSS Reference</title>
+<link rel="author" title="Sergio Villar Senin" href="mailto:svillar@igalia.com" />
+<style>
+span {
+  display: inline-block;
+  background-color: green;
+  height: 225px;
+  width: 90px;
+}
+
+div {
+  border: 1px solid black;
+  height: 225px;
+  width: 300px;
+}
+</style>
+
+<p>Test passes if there is <strong>no red</strong> visible on the page.</p>
+<div><span></span></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-flex-cross-size.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-flex-cross-size.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-flex-cross-size.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-flex-cross-size.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#resolve-flexible-lengths">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The table's main-axis (block-size) size is flex to consume the available space.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: flex; flex-direction: column; width: 100px; height: 100px; background: red;">
+  <table style="border-spacing: 0; flex-grow: 1;">
+    <caption style="height: 10px; background: green;"></caption>
+    <caption style="height: 20px; background: green; caption-side: bottom;"></caption>
+    <td style="background: green;"></td>
+  </table>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-stretch-cross-size.html firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-stretch-cross-size.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-stretch-cross-size.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-flexbox/table-as-item-stretch-cross-size.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#valdef-align-items-stretch">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="The table's cross-axis (block-size) is stretched.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: flex; width: 100px; height: 100px; background: red;">
+  <table style="border-spacing: 0; flex-grow: 1;">
+    <caption style="height: 10px; background: green;"></caption>
+    <caption style="height: 20px; background: green; caption-side: bottom;"></caption>
+    <td style="background: green;"></td>
+  </table>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5713">
+<meta name="assert" content="If stretch alignment is applied to one axis the aspect-ratio of a replaced element is preserved.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: grid; grid-template: 100px / 200px; width: 100px; height: 100px; background: red;">
+  <canvas width=10 height=10 style="background: green; align-self: stretch;"></canvas>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5713">
+<meta name="assert" content="If stretch alignment is applied to one axis the aspect-ratio of a replaced element is preserved.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: grid; grid-template: 200px / 100px; width: 100px; height: 100px; background: red;">
+  <canvas width=10 height=10 style="background: green; justify-self: stretch;"></canvas>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-003.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5713">
+<meta name="assert" content="If stretch alignment is applied to both axis the aspect-ratio of a replaced element is ignored.">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="display: grid; grid-template: 100px / 100px; width: 100px; height: 100px; background: red;">
+  <canvas width=10 height=20 style="background: green; align-self: stretch; justify-self: stretch;"></canvas>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Margin auto and replaced grid item</title>
+<link rel="author" title="Hyunjune Kim" href="mailto:hyunjune.kim@samsung.com">
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#alignment">
+<meta name="assert" content="Checks width of the nested grid container applied 'margin:auto' with a replaced item which has a property called max-height.">
+<link rel="match" href="grid-auto-margin-and-replaced-item-001-ref.html">
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    left:0;
+    right:0;
+    margin: auto;
+    z-index: -1;
+  }
+  .grid {
+    display: grid;
+  }
+  .nested-grid {
+    display: grid;
+    margin: auto;
+  }
+  img {
+    max-height: 100%;
+  }
+</style>
+
+<body onload="loadImage()">
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="grid">
+  <div id="reference-overlapped-red"></div>
+  <div class="nested-grid">
+    <img id="replaced">
+  </div>
+</div>
+
+<script>
+function loadImage() {
+  var replaced = document.getElementById("replaced");
+  replaced.src = "./support/100x100-green.png";
+}
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/grid-auto-margin-and-replaced-item-001-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Reference: 100x100 green square image in the middle</title>
+<link rel="author" title="Hyunjune Kim" href="mailto:hyunjune.kim@samsung.com">
+<style>
+  img {
+    display: block;
+    margin: auto;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div>
+  <img src="./support/100x100-green.png">
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/grid-items/percentage-size-indefinite-replaced.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1153028">
+<meta name="assert" content="When determining a auto row, an indefinite percentage block-size should be considered auto, and use the inline-size + aspect-ratio.">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="display: grid; width: 50px;">
+  <canvas width=200 height=200 style="background: green; height: 100%; width: 200%;"></canvas>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/masonry/tentative/masonry-fragmentation-001-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -55,7 +55,7 @@
 }
 x,y,z,masonry-track { display: block; }
 masonry-track > * { margin-bottom:2px; }
-masonry-track.last > :last-child { margin-bottom:0; }
+.last > masonry-track > :last-child { margin-bottom:0; }
 masonry-track:nth-child(1) { width: 10px; }
 masonry-track:nth-child(2) { width: 15px; margin-left:2px; }
 masonry-track:nth-child(3) { width: 20px; margin-left:2px; }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,104 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>CSS Grid Test: abs.pos. subgrid edge cases</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-2">
+  <link rel="match" href="abs-pos-004-ref.html">
+<style>
+html,body {
+  color:black; background-color:white; font:15px/1 monospace;
+}
+
+.grid {
+  position: relative;
+  display: inline-grid;
+  grid-auto-columns: 10px;
+  grid-auto-rows: 20px;
+  grid-auto-flow: column;
+  border: 1px solid;
+  margin: 1px;
+  vertical-align: top;
+}
+
+.subgrid {
+  position: absolute;
+  inset: 0;
+  display: grid;
+  background: lightgrey;
+}
+.t1 { grid: subgrid / subgrid; }
+.t2 { grid: none / subgrid; }
+.t3 { grid: subgrid / none; }
+
+x {
+  background: lime;
+  grid-area: 1/1/-1/-1;
+}
+fail {
+  background: red;
+}
+
+.a {
+  position: absolute;
+  grid-area: 1/1/-1/-1;
+  inset: 0;
+  background: blue;
+}
+
+.o { overflow: hidden; }
+
+.start .subgrid {
+  grid-column-start: 3;
+}
+.end .subgrid {
+  grid-column-end: 1;
+}
+.start, .end {
+  width: 50px;
+}
+.end {
+  justify-content: end;
+}
+.start > fail, .end > fail {
+  background: initial;
+}
+</style>
+</head>
+<body>
+
+<script>
+function make_grids(items, abspos) {
+  ["", "o", "start", "end"].forEach(function(grid1) {
+    ["", "o"].forEach(function(subgrid1) {
+      ["t1", "t2", "t3"].forEach(function(subgrid2) {
+        let grid = document.createElement('div');
+        for (let i = 0; i < items; ++i) {
+          grid.appendChild(document.createElement('fail'));
+        }
+        grid.className = "grid " + grid1;
+        document.body.appendChild(grid);
+        document.body.offsetHeight;
+        let subgrid = document.createElement('div');
+        subgrid.className = "subgrid " + subgrid1 + " " + subgrid2;
+        let subgridItem = document.createElement('x');
+        if (abspos) {
+          subgridItem.className = "a";
+        }
+        subgrid.appendChild(subgridItem);
+        grid.appendChild(subgrid);
+      })
+    })
+  });
+}
+for (let i = 1; i <= 3; ++i) {
+  make_grids(i, false);
+  make_grids(i, true);
+}
+</script>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-grid/subgrid/abs-pos-004-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,198 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>Reference: abs.pos. subgrid edge cases</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<style>
+html,body {
+  color:black; background-color:white; font:15px/1 monospace;
+}
+
+body > div {
+  display: inline-block;
+  height: 20px;
+  border: 1px solid;
+  margin: 1px;
+  vertical-align: top;
+}
+body > div > div { height: 20px; background: lightgrey; }
+body > div > div > div { height: 20px; }
+</style>
+</head>
+<body>
+
+<script>
+let results = [
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "10px", "0", "10px", "0", "10px", "lime" ],
+  [ "50px", "0", "50px", "0", "10px", "lime" ],
+  [ "50px", "0", "50px", "0", "10px", "lime" ],
+  [ "50px", "0", "50px", "0", "50px", "lime" ],
+  [ "50px", "0", "50px", "0", "10px", "lime" ],
+  [ "50px", "0", "50px", "0", "10px", "lime" ],
+  [ "50px", "0", "50px", "0", "50px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+  [ "50px", "0", "40px", "0", "40px", "lime" ],
+
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "10px", "0", "10px", "0", "10px", "blue" ],
+  [ "50px", "0", "50px", "0", "10px", "blue" ],
+  [ "50px", "0", "50px", "0", "10px", "blue" ],
+  [ "50px", "0", "50px", "0", "50px", "blue" ],
+  [ "50px", "0", "50px", "0", "10px", "blue" ],
+  [ "50px", "0", "50px", "0", "10px", "blue" ],
+  [ "50px", "0", "50px", "0", "50px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+  [ "50px", "0", "40px", "0", "40px", "blue" ],
+
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "20px", "0", "20px", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "30px", "lime" ],
+
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "20px", "0", "20px", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "30px", "blue" ],
+
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "30px", "0", "30px", "0", "30px", "lime" ],
+  [ "50px", "20px", "30px", "0", "10px", "lime" ],
+  [ "50px", "20px", "30px", "0", "10px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "20px", "30px", "0", "10px", "lime" ],
+  [ "50px", "20px", "30px", "0", "10px", "lime" ],
+  [ "50px", "0", "0", "20px", "30px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+  [ "50px", "0", "0", "0", "20px", "lime" ],
+
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "30px", "0", "30px", "0", "30px", "blue" ],
+  [ "50px", "20px", "30px", "0", "10px", "blue" ],
+  [ "50px", "20px", "30px", "0", "10px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "20px", "30px", "0", "10px", "blue" ],
+  [ "50px", "20px", "30px", "0", "10px", "blue" ],
+  [ "50px", "0", "0", "20px", "30px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+  [ "50px", "0", "0", "0", "20px", "blue" ],
+];
+results.forEach(function(arr) {
+  let grid_width, subgrid_width, subgrid_pos, item_pos, item_width, item_bg;
+  [grid_width, subgrid_pos, subgrid_width, item_pos, item_width, item_bg] = arr;
+  let grid = document.createElement('div');
+  grid.style.width = grid_width;
+  let subgrid = document.createElement('div');
+  subgrid.style.width = subgrid_width;
+  subgrid.style.marginLeft = subgrid_pos;
+  let subgridItem = document.createElement('div');
+  subgridItem.style.width = item_width;
+  subgridItem.style.marginLeft = item_pos;
+  subgridItem.style.backgroundColor = item_bg;
+  subgrid.appendChild(subgridItem);
+  grid.appendChild(subgrid);
+  document.body.appendChild(grid);
+});
+</script>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background properties</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-background-properties-border-radius-ref.html">
+<meta name=fuzzy content="10;100">
+<style>
+    div {
+        position: absolute;
+        width: 200px;
+        height: 200PX;
+        background-image: url(support/exif-orientation-5-lu.jpg);
+        background-repeat: no-repeat;
+        border-radius: 5px;
+    }
+
+    .repeat {
+        background-repeat: repeat;
+        top: 20px;
+        left: 20px;
+    }
+
+    .position {
+        background-position: bottom right;
+        top: 20px;
+        left: 240px;
+    }
+
+    .cover {
+        background-size: cover;
+        top: 240px;
+        left: 20px;
+    }
+
+    .contain {
+        background-size: contain;
+        top: 240px;
+        left: 240px;
+    }
+</style>
+</head>
+<body>
+    <div class="repeat">
+    </div>
+    <div class="position">
+    </div>
+    <div class="cover">
+    </div>
+    <div class="contain">
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties.html firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/image-orientation-background-properties.html	2021-01-18 19:58:22.000000000 +0000
@@ -12,7 +12,6 @@
         position: absolute;
         width: 200px;
         height: 200PX;
-        vertical-align: top;
         background-image: url(support/exif-orientation-5-lu.jpg);
         background-repeat: no-repeat;
     }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background properties reference</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<style>
+    div {
+        position: absolute;
+        width: 200px;
+        height: 200PX;
+        background-image: url(../support/exif-orientation-5-lu-pre-rotated.jpg);
+        background-repeat: no-repeat;
+        border-radius: 5px;
+    }
+
+    .repeat {
+        background-repeat: repeat;
+        top: 20px;
+        left: 20px;
+    }
+
+    .position {
+        background-position: bottom right;
+        top: 20px;
+        left: 240px;
+    }
+
+    .cover {
+        background-size: cover;
+        top: 240px;
+        left: 20px;
+    }
+
+    .contain {
+        background-size: contain;
+        top: 240px;
+        left: 240px;
+    }
+</style>
+</head>
+<body>
+    <div class="repeat">
+    </div>
+    <div class="position">
+    </div>
+    <div class="cover">
+    </div>
+    <div class="contain">
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -10,7 +10,6 @@
         position: absolute;
         width: 200px;
         height: 200PX;
-        vertical-align: top;
         background-image: url(../support/exif-orientation-5-lu-pre-rotated.jpg);
         background-repeat: no-repeat;
     }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-computed.html firefox-85.0+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-computed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-computed.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-computed.html	2021-01-18 19:58:22.000000000 +0000
@@ -17,6 +17,8 @@
 test_computed_value('list-style-type', 'disc');
 test_computed_value('list-style-type', 'circle');
 test_computed_value('list-style-type', 'square');
+test_computed_value('list-style-type', 'disclosure-open');
+test_computed_value('list-style-type', 'disclosure-closed');
 test_computed_value('list-style-type', 'decimal');
 test_computed_value('list-style-type', 'decimal-leading-zero');
 test_computed_value('list-style-type', 'lower-roman');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-valid.html firefox-85.0+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-valid.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-valid.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-lists/parsing/list-style-type-valid.html	2021-01-18 19:58:22.000000000 +0000
@@ -17,6 +17,8 @@
 test_valid_value('list-style-type', 'disc');
 test_valid_value('list-style-type', 'circle');
 test_valid_value('list-style-type', 'square');
+test_valid_value('list-style-type', 'disclosure-open');
+test_valid_value('list-style-type', 'disclosure-closed');
 test_valid_value('list-style-type', 'decimal');
 test_valid_value('list-style-type', 'decimal-leading-zero');
 test_valid_value('list-style-type', 'lower-roman');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html firefox-85.0+build1/testing/web-platform/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-masking/mask-image/mask-image-svg-child-will-change.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Test: mask-image on svg with child with will-change: transform</title>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#mask-layer-image">
+<link rel="match" href="reference/mask-image-svg-child-will-change-ref.html">
+<style>
+svg {
+  /* The image is 200x200 with 100x100 opaque pixels at the center */
+  -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAABNklEQVR42u3TyQ0AMAgEMUj/PS895IWQ3QHHVAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/6yiBJ4pyLHqv7xG89pwSBgEBAICAQEAgIBAQCAgGBAAIBgYBAQCAgEBAICAQEAgIBgQACAYGAQEAgIBAQCAgEBAICAQQCAgGBgEBAICAQEAgIBAQCAgEEAgIBgYBAQCAgEBAICAQEAggEBAICAYGAQEAgIBAQCAgEBAIIBAQCAgGBgEBAICAQEAgIBBAICAQEAgIBgYBAQCAgEBAICAQQCAgEBAICAYGAQEAgIBAQCAjECkAgIBAQCAgEBAICAYGAQEAggEBAICAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAthrrbgTIalbwsQAAAABJRU5ErkJggg==);
+  mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAABNklEQVR42u3TyQ0AMAgEMUj/PS895IWQ3QHHVAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/6yiBJ4pyLHqv7xG89pwSBgEBAICAQEAgIBAQCAgGBAAIBgYBAQCAgEBAICAQEAgIBgQACAYGAQEAgIBAQCAgEBAICAQQCAgGBgEBAICAQEAgIBAQCAgEEAgIBgYBAQCAgEBAICAQEAggEBAICAYGAQEAgIBAQCAgEBAIIBAQCAgGBgEBAICAQEAgIBBAICAQEAgIBgYBAQCAgEBAICAQQCAgEBAICAYGAQEAgIBAQCAjECkAgIBAQCAgEBAICAYGAQEAggEBAICAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAthrrbgTIalbwsQAAAABJRU5ErkJggg==);
+  width: 100px;
+  height: 100px;
+  border: 50px solid red;
+  background: green;
+}
+</style>
+<p>The test passes if there is a green square and no red below.</p>
+<svg>
+  <rect style="will-change: transform">
+</svg>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-svg-child-will-change-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<p>The test passes if there is a green square and no red below.</p>
+<div style="width: 100px; height: 100px; background: green; position: relative; top: 50px; left: 50px"></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-000.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-000.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-000.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-000.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-between">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-within">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:4; background:green;">
+    <div style="break-inside:avoid; height:100px;"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-break-avoidance-001.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-between">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-within">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:4; background:green;">
+    <div style="break-inside:avoid; break-after:avoid; height:50px;"></div>
+    <div style="break-inside:avoid; height:50px;"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-orphans-widows-000.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-orphans-widows-000.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/balance-orphans-widows-000.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/balance-orphans-widows-000.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#widows-orphans">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  .multicol {
+      columns: 2;
+      orphans: 4;
+      widows: 4;
+      width: 100px;
+      column-gap: 80px;
+      column-rule: 80px solid green;
+      line-height: 0;
+      background: red;
+  }
+  span {
+      display: inline-block;
+      width: 100%;
+      height: 10px;
+      background: green;
+  }
+  span.tall {
+      height: 40px;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="multicol">
+  <span></span><br>
+  <span></span><br>
+  <span class="tall"></span><br>
+  <span class="tall"></span><br>
+  <span class="tall"></span><br>
+  <span class="tall"></span><br>
+  <span></span><br>
+  <span></span><br>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<title>CSS Test: breaking of column rule</title>
+<meta charset="utf-8">
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="help" href="https://drafts.csswg.org/css-multicol/#column-gaps-and-rules">
+<link rel="match" href="broken-column-rule-1-ref.html">
+<style>
+
+.outer {
+  height: 100px;
+  column-fill: auto;
+  width: 550px;
+  column-count: 4;
+  column-gap: 50px;
+  /* leaves 100px for each column */
+}
+
+.inner {
+  column-count: 2;
+  column-rule: 2px solid blue;
+  height: 250px;
+}
+
+.fill {
+  height: 500px; /* work around https://bugzilla.mozilla.org/show_bug.cgi?id=1374479#c4 */
+}
+
+</style>
+
+<div class="outer">
+  <div class="inner">
+    <div class="fill"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/broken-column-rule-1-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<title>CSS Test Reference: breaking of column rule</title>
+<meta charset="utf-8">
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<style>
+
+.ref1, .ref2 {
+  display: inline-block;
+  vertical-align: top;
+
+  border: 2px solid blue;
+  border-top: none;
+  border-bottom: none;
+}
+
+.ref1 {
+  margin-left:49px;
+  height: 100px;
+  width: 148px;
+}
+
+.ref2 {
+  margin-left: 148px;
+  height: 50px;
+  width: 10px;
+
+  border-right: none;
+}
+
+</style>
+<span class="ref1"></span><span class="ref2"></span>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html><head>
+  <title>CSS Test: Balancing Overflow, page-break-inside:avoid</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-multicol3-column-balancing-break-inside-avoid-1-ref.html">
+  <meta name="flags" content="paged">
+  <meta charset="utf-8">
+  <style type="text/css">
+@page { size:5in 3in; margin:0.5in; }
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+
+  .colset {
+    column-count: 3;
+    column-gap: 0;
+    border: solid silver;
+    width: 9em;
+  }
+  p { margin: 0; page-break-inside:avoid; }
+  .short { height: 5px; page-break-inside:avoid; }
+  .short p { page-break-inside:auto; }
+
+    </style>
+</head>
+<body>
+
+<div class="colset">
+<p>one</p>
+<p>two three</p>
+<p>four five</p>
+</div>
+
+<div class="colset">
+  <p>one two three four five</p>
+</div>
+
+<div class="colset">
+<p>one two</p>
+<p>three four five</p>
+</div>
+
+<div class="colset">
+  <div class="short"><p>one two three four five</p></div>
+</div>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html><head>
+  <title>CSS Test: Balancing Overflow, page-break-inside:avoid</title>
+  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
+  <meta name="flags" content="paged">
+  <meta charset="utf-8">
+  <style type="text/css">
+@page { size:5in 3in; margin:0.5in; }
+
+        html,body {
+            color:black; background-color:white; font-size:16px; padding:0; margin:0;
+        }
+
+  .colset {
+    column-count: 3;
+    column-gap: 0;
+    border: solid silver;
+    width: 9em;
+  }
+  p { margin: 0; }
+  .short { height: 5px; }
+  .short p { }
+
+    </style>
+</head>
+<body>
+
+<div class="colset">
+<p>one<br>&nbsp;&nbsp;&nbsp;&nbsp;</p>
+<p>two three</p>
+<p>four five</p>
+</div>
+
+<div class="colset">
+  <p>one two three four five</p>
+</div>
+
+<div class="colset">
+one two three four five
+</div>
+
+<div class="colset">
+  <div class="short"><p>one two three four five</p></div>
+</div>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-005.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-005.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-005.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-005.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="columns:2; column-gap:0; width:100px; height:20px; max-height:40px; min-height:100px; background:red;">
+  <div style="height:200px; background:green;"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-nested-000.html firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-nested-000.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-nested-000.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-fill-balance-nested-000.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#the-multi-column-model">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#filling-columns">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-within">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  #outer, #outer div { background: green; }
+  #inner * { break-inside: avoid; }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="outer" style="columns:2; column-gap:0; column-fill:auto; width:100px; height:100px;">
+  <div id="inner" style="columns:2; column-gap:0;">
+    <div style="height:50px;"></div>
+    <div style="height:100px;">
+      <div style="margin-left:100%; width:100%; height:50px; background:red;"></div>
+    </div>
+    <div style="height:50px;"></div>
+  </div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print-ref.xht firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print-ref.xht
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print-ref.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print-ref.xht	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <style type="text/css"><![CDATA[
+    html, body { height: 100%; }
+    * { margin: 0; }
+    div {
+      border: double blue 12px;
+      height: 150%;
+      padding: 0 12px;
+    }
+    div > p {
+      border-right: solid orange 12px;
+      border-left: solid orange 12px;
+      width: 50%;
+      margin: 0 auto;
+      height: 100%;
+    }
+    blockquote {
+      border: solid thick yellow;
+    }  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if even when printed:</p>
+  <ul>
+    <li>Two vertical orange stripes stretch exactly
+    from the inner top edge to the inner bottom edge of the blue box below.</li>
+    <li>There is a yellow stripe immediately below the blue box.</li>
+  </ul>
+  <div>
+    <p></p>
+  </div>
+  <blockquote></blockquote>
+ </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print.xht firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print.xht
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print.xht	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-multicol/multicol-height-002-print.xht	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>CSS Test: Percentage Computed Height on Multicol Child (Definite Multicol Height)</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
+  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" />
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#the-height-property"/>
+  <meta name="flags" content="" />
+  <meta name="assert" content="Percentage heights with a multi-column element are relative to the computed height of the multicolumn box, and this works even when the multi-column element is paginated." />
+  <link rel="match" href="multicol-height-002-print-ref.xht" />
+  <style type="text/css"><![CDATA[
+    html, body { height: 100%; }
+    * { margin: 0; }
+    div {
+      border: double blue 12px;
+      column-count:2;
+      column-gap:0;
+      column-fill: balance;
+      height: 150%;
+    }
+    div > p {
+      border-right: solid orange 12px;
+      width: 0;
+      margin: 0 auto;
+      height: 200%;
+    }
+    blockquote {
+      border: solid thick yellow;
+    }
+  ]]></style>
+ </head>
+ <body>
+  <p>Test passes if even when printed:</p>
+  <ul>
+    <li>Two vertical orange stripes stretch exactly
+    from the inner top edge to the inner bottom edge of the blue box below.</li>
+    <li>There is a yellow stripe immediately below the blue box.</li>
+  </ul>
+  <div>
+    <p></p>
+  </div>
+  <blockquote></blockquote>
+ </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/cssom/serialize-values.html firefox-85.0+build1/testing/web-platform/tests/css/cssom/serialize-values.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/cssom/serialize-values.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/cssom/serialize-values.html	2021-01-18 19:58:23.000000000 +0000
@@ -433,7 +433,8 @@
         'initial': 'outside',
       }],
       ['list-style-type', {
-        'values': ['disc', 'circle', 'square', 'decimal', 'decimal-leading-zero', 'lower-roman',
+        'values': ['disc', 'circle', 'square', 'disclosure-open', 'disclosure-closed',
+                   'decimal', 'decimal-leading-zero', 'lower-roman',
                    'upper-roman', 'lower-greek', 'lower-latin', 'upper-latin', 'armenian', 'georgian',
                    'lower-alpha', 'upper-alpha', 'none', 'inherit'],
         'initial': 'disc',
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html firefox-85.0+build1/testing/web-platform/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/cssom-view/MediaQueryList-addListener-removeListener.html	2021-01-18 19:58:23.000000000 +0000
@@ -11,6 +11,16 @@
 <script>
 "use strict";
 
+test(() => {
+    const mql = window.matchMedia("(min-width: 100px)");
+
+    mql.addListener(null);
+    mql.addListener(undefined);
+
+    mql.removeListener(null);
+    mql.removeListener(undefined);
+}, "EventListener parameter is optional");
+
 promise_test(async t => {
     const iframe = await createIFrame(t, 200, 100);
     const heightMQL = iframe.contentWindow.matchMedia("(max-height: 50px)");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl-2.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Overflow Test: Scrollable overflow area of a multicol container in vertical-rl writing-mode</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+  <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+  <meta name="assert" content="This test verifies the nested float element in a multicol container in vertical-rl writing-mode shouldn't contribute to its container'sscrollable overflow area.">
+
+  <style>
+  .scroll-container {
+    writing-mode: vertical-rl;
+    inline-size: 100px;
+    block-size: 100px;
+    overflow: auto;
+  }
+  .multicol {
+    block-size: 100px;
+    inline-size: 100px;
+    column-fill: auto;
+    column-count: 2;
+    column-gap: 0;
+  }
+  .float {
+    float: left;
+    inline-size: 50px;
+    block-size: 100px;
+    background: green;
+  }
+  </style>
+
+  <!--This test passes if the scroll-container has no scrollbar. -->
+
+  <p>Test passes if there is a filled green square.</p>
+  <div class="scroll-container">
+    <div class="multicol">
+      <div>
+        <div style="block-size: 100px; background: green;"></div>
+        <div class="float"></div>
+      </div>
+    </div>
+  </div>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/no-scrollable-overflow-vertical-rl.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Overflow Test: Scrollable overflow area of a multicol container in vertical-rl writing-mode</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+  <link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+  <meta name="assert" content="This test verifies the float element in a multicol container in vertical-rl writing-mode shouldn't contribute to its container'sscrollable overflow area.">
+
+  <style>
+  .scroll-container {
+    writing-mode: vertical-rl;
+    inline-size: 100px;
+    block-size: 100px;
+    overflow: auto;
+  }
+  .multicol {
+    block-size: 100px;
+    inline-size: 100px;
+    column-fill: auto;
+    column-count: 2;
+    column-gap: 0;
+  }
+  .float {
+    float: left;
+    inline-size: 50px;
+    block-size: 100px;
+    background: green;
+  }
+  </style>
+
+  <!--This test passes if the scroll-container has no scrollbar. -->
+
+  <p>Test passes if there is a filled green square.</p>
+  <div class="scroll-container">
+    <div class="multicol">
+      <div style="block-size: 100px; background: green;"></div>
+      <div class="float"></div>
+    </div>
+  </div>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/overflow-clip-scroll-size.html firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/overflow-clip-scroll-size.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/overflow-clip-scroll-size.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/overflow-clip-scroll-size.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,80 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>overflow: scroll width/height should return overflow size</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="author" title="Scott Violet" href="mailto:sky@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  .parent {
+    width: 100px;
+    height: 101px;
+  }
+  .child {
+    width: 200px;
+    height: 201px;
+  }
+  .overflow_clip_and_border {
+    width: 100px;
+    height: 101px;
+    overflow: clip;
+    border-width: 2px;
+    border-style: solid;
+  }
+</style>
+<div id="parent-clip-both" class="parent" style="overflow: clip">
+  <div class="child"></div>
+</div>
+<div id="parent-clip-x" class="parent" style="overflow: clip-x">
+  <div class="child"></div>
+</div>
+<div id="parent-clip-y" class="parent" style="overflow: clip-y">
+  <div class="child"></div>
+</div>
+
+<div id="border-equal-clip" class="parent">
+  <div class="overflow_clip_and_border"
+       style="overflow-clip-margin: 2px">
+    <div class="child"></div>
+  </div>
+</div>
+<div id="border-smaller-clip" class="parent">
+  <div class="overflow_clip_and_border"
+       style="overflow-clip-margin: 3px">
+    <div class="child"></div>
+  </div>
+</div>
+<div id="border-greater-clip" class="parent">
+  <div class="overflow_clip_and_border"
+       style="overflow-clip-margin: 1px">
+    <div class="child"></div>
+  </div>
+</div>
+
+<script>
+test(() => {
+  var pClipBoth = document.getElementById("parent-clip-both");
+  assert_equals(pClipBoth.scrollWidth, 200);
+  assert_equals(pClipBoth.scrollHeight, 201);
+
+  var pClipX = document.getElementById("parent-clip-x");
+  assert_equals(pClipX.scrollWidth, 200);
+  assert_equals(pClipX.scrollHeight, 201);
+
+  var pClipY = document.getElementById("parent-clip-y");
+  assert_equals(pClipY.scrollWidth, 200);
+  assert_equals(pClipY.scrollHeight, 201);
+}, "scroll size should match that of size specified by overflow: clip");
+
+test(() => {
+    assert_equals(document.getElementById("border-equal-clip").scrollWidth,
+                  104);
+
+    assert_equals(document.getElementById("border-smaller-clip").scrollWidth,
+                  105);
+
+    assert_equals(document.getElementById("border-greater-clip").scrollWidth,
+                  104);
+}, "scroll size should take into account border size and overflow-clip-margin");
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/overflow-empty-child-box.html firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/overflow-empty-child-box.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-overflow/overflow-empty-child-box.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-overflow/overflow-empty-child-box.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Overflow Test: Testing an empty child box and its container's scrollable overflow area</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+  <meta name="assert" content="This test verifies that an empty child box shouldn't contribute to its parents scrollable overflow area.">
+
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/check-layout-th.js"></script>
+
+  <style>
+  .container {
+    border: 1px solid black;
+    width: 200px;
+    height: 100px;
+  }
+
+  .empty {
+    position: relative;
+    width: 0px;
+    height: 0px;
+    left: 500px;
+    top: 300px;
+    box-shadow: 0 0 0 10px blue;
+  }
+  </style>
+
+  <body onload="checkLayout('.container')">
+    <p>You should see no scrollbars in these container because an empty child
+    box shouldn't contribute to its parents scrollable overflow area. </p>
+
+    <div class="container" style="overflow: visible"
+         data-expected-scroll-width="200" data-expected-scroll-height="100">
+      <div class="empty"></div>
+    </div>
+
+    <div class="container" style="overflow: auto"
+         data-expected-scroll-width="200" data-expected-scroll-height="100">
+      <div class="empty"></div>
+    </div>
+
+    <div class="container" style="overflow: hidden"
+         data-expected-scroll-width="200" data-expected-scroll-height="100">
+      <div class="empty"></div>
+    </div>
+
+    <div class="container" style="overflow: clip"
+         data-expected-scroll-width="200" data-expected-scroll-height="100">
+      <div class="empty"></div>
+    </div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation.https.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation.https.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation.https.html	2021-01-18 19:58:22.000000000 +0000
@@ -6,19 +6,24 @@
 .container {
   width: 100px;
   height: 100px;
-  animation: expand 5s;
+}
+.animate {
+  background-image: paint(geometry);
+  /* Use a long animation that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animation in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated property value. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animation is ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: expand 1000000s cubic-bezier(0,1,1,0) -500000s;
   will-change: transform;
 }
 @keyframes expand {
-  0% { --foo: rgb(255, 0, 0); }
-  0.01% { --foo: rgb(127, 127, 0); }
-  99% { --foo: rgb(127, 127, 0); }
-  100% { --foo: rgb(0, 255, 0); }
+  0% { --foo: rgb(200, 0, 0); }
+  100% { --foo: rgb(0, 200, 0); }
 }
 
-#canvas-geometry {
-  background-image: paint(geometry);
-}
 </style>
 <script src="/common/reftest-wait.js"></script>
 <script src="/common/worklet-reftest.js"></script>
@@ -45,13 +50,15 @@
 </script>
 
 <script>
-// The test is designed to make sure that when the custom property animation is
-// running on the compositor thread, we are getting the right value.
-// The "importWorkletAndTerminateTestAfterAsyncPaint" has the logic to rAF
-// two frames before taking a screenshot. So the animation is designed to
-// be stable after two frames. That is, the 0.01% of 5s is much less than
-// two frames, and thus after two frames, the value of --foo should be stable.
-importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
+var blob = new Blob([document.getElementById('code').textContent],
+                    {type: 'text/javascript'});
+CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
+    document.getElementById('canvas-geometry').classList.add('animate');
+    // Wait for the animation to start before completing the test.
+    document.getAnimations()[0].ready.then(() => {
+        takeScreenshot();
+    });
+});
 </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation-ref.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/color-custom-property-animation-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -5,7 +5,7 @@
 <script>
 var canvas = document.getElementById('canvas');
 var context = canvas.getContext("2d");
-context.fillStyle = 'rgb(127, 127, 0)';
+context.fillStyle = 'rgb(100, 100, 0)';
 context.fillRect(0, 0, 100, 100);
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/one-custom-property-animation.https.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/one-custom-property-animation.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/one-custom-property-animation.https.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/one-custom-property-animation.https.html	2021-01-18 19:58:22.000000000 +0000
@@ -9,13 +9,18 @@
 }
 @keyframes expand {
   0% { --foo: 0; }
-  0.01% { --foo: 50; }
-  99% { --foo: 50; }
   100% { --foo: 100; }
 }
 .animate {
   background-image: paint(geometry);
-  animation: expand 5s;
+  /* Use a long animation that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animation in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated property value. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animation is ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: expand 1000000s cubic-bezier(0,1,1,0) -500000s;
 }
 
 #canvas-geometry {
@@ -52,7 +57,9 @@
                     {type: 'text/javascript'});
 CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
     document.getElementById('canvas-geometry').classList.add('animate');
-    requestAnimationFrame(function() {
+    const animations = document.getAnimations();
+    // Wait for the animation to start before completing the test.
+    document.getAnimations()[0].ready.then(() => {
         takeScreenshot();
     });
 });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation.https.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation.https.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation.https.html	2021-01-18 19:58:22.000000000 +0000
@@ -9,19 +9,22 @@
 }
 @keyframes expand {
   0% { --foo: 0; }
-  0.01% { --foo: 50; }
-  99% { --foo: 50; }
   100% { --foo: 100; }
 }
 @keyframes clr {
   0% { --bar: 0; }
-  0.01% { --bar: 200; }
-  99% { --bar: 200; }
-  100% { --bar: 255; }
+  100% { --bar: 200; }
 }
 .animate {
   background-image: paint(geometry);
-  animation: expand 5s, clr 5s;
+  /* Use a long animation that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animation in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated property value. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animation is ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: expand 1000000s cubic-bezier(0,1,1,0) -500000s, clr 1000000s cubic-bezier(0,1,1,0) -500000s;
 }
 
 #canvas-geometry {
@@ -68,7 +71,9 @@
                     {type: 'text/javascript'});
 CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
     document.getElementById('canvas-geometry').classList.add('animate');
-    requestAnimationFrame(function() {
+    const animations = document.getAnimations();
+    // Wait for the animation to start before completing the test.
+    document.getAnimations()[0].ready.then(() => {
         takeScreenshot();
     });
 });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation-ref.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-custom-property-animation-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -7,7 +7,7 @@
 var context = canvas.getContext("2d");
 context.fillStyle = 'blue';
 context.fillRect(0, 0, 100, 100);
-context.fillStyle = '#9876c8';
+context.fillStyle = '#987664';
 context.fillRect(0, 0, 50, 50);
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation.https.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation.https.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.css-houdini.org/css-paint-api/">
+<link rel="match" href="two-element-custom-property-animation-ref.html">
+<style>
+#footainer {
+  width: 200px;
+  height: 200px;
+}
+.fooanimate {
+  background-image: paint(foo);
+  /* Use long animations that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animations in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated properties values. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animations are ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: expand 1000000s cubic-bezier(0,1,1,0) -500000s;
+}
+#bartainer {
+  width: 200px;
+  height: 200px;
+}
+.baranimate {
+  background-image: paint(bar);
+  animation: colorChange 1000000s cubic-bezier(0,1,1,0) -500000s;
+}
+@keyframes expand {
+  0% { --foo: 0; }
+  100% { --foo: 200; }
+}
+@keyframes colorChange {
+  0% { --bar: rgb(200, 0, 0); }
+  100% { --bar: rgb(0, 200, 0); }
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="footainer"></div>
+<div id="bartainer"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('foo', class {
+  static get inputProperties() { return ['--foo']; }
+  paint(ctx, geom, properties) {
+    let fooValue = parseFloat(properties.get('--foo').toString());
+    ctx.fillStyle = 'green';
+    ctx.fillRect(0, 0, fooValue, fooValue);
+  }
+});
+
+registerPaint('bar', class {
+  static get inputProperties() { return ['--bar']; }
+  paint(ctx, geom, properties) {
+    ctx.fillStyle = properties.get('--bar').toString();
+    ctx.fillRect(0, 0, 200, 200);
+  }
+});
+</script>
+
+<script type="text/javascript">
+CSS.registerProperty({
+  name: '--foo',
+  syntax: '<number>',
+  initialValue: '0',
+  inherits: false
+});
+CSS.registerProperty({
+  name: '--bar',
+  syntax: '<color>',
+  initialValue: 'rgb(0, 0, 0)',
+  inherits: false
+});
+</script>
+
+<script>
+var code = document.getElementById('code').textContent;
+var blob = new Blob([code], {type: 'text/javascript'});
+CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
+  document.getElementById('footainer').classList.add('fooanimate');
+  document.getElementById('bartainer').classList.add('baranimate');
+  const animations = document.getAnimations();
+  // Wait for all animations to start before completing the test.
+  Promise.all([animations[0].ready, animations[1].ready]).then(() => {
+      takeScreenshot();
+  });
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-custom-property-animation-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<body>
+<canvas id ="canvas" width="200" height="400"></canvas>
+<script>
+var canvas = document.getElementById('canvas');
+var context = canvas.getContext("2d");
+context.fillStyle = 'green';
+context.fillRect(0, 0, 100, 100);
+context.fillStyle = 'rgb(100, 100, 0)';
+context.fillRect(0, 200, 200, 200);
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation.https.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.css-houdini.org/css-paint-api/">
+<link rel="match" href="two-element-one-custom-property-animation-ref.html">
+<style>
+#footainer1 {
+  width: 200px;
+  height: 200px;
+}
+.fooanimate1 {
+  background-image: paint(foo);
+  /* Use long animations that start at 50% progress where the slope of the
+     selected timing function is zero. By setting up the animations in this way,
+     we accommodate lengthy delays in running the test without a potential drift
+     in the animated properties values. This is important for avoiding flakes,
+     especially on debug builds. The screenshots are taken as soon as the
+     animations are ready, thus the long animation duration has no bearing on
+     the actual duration of the test. */
+  animation: anim1 1000000s cubic-bezier(0,1,1,0);
+  animation-delay: -500000s;
+}
+#footainer2 {
+  width: 200px;
+  height: 200px;
+}
+.fooanimate2 {
+  background-image: paint(foo);
+  animation: anim2 1000000s cubic-bezier(0,1,1,0);
+  animation-delay: -500000s;
+}
+@keyframes anim1 {
+  0% { --foo: rgb(200, 0, 0); }
+  100% { --foo: rgb(0, 0, 200); }
+}
+@keyframes anim2 {
+  0% { --foo: rgb(200, 0, 0); }
+  100% { --foo: rgb(0, 200, 0); }
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="footainer1"></div>
+<div id="footainer2"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('foo', class {
+  static get inputProperties() { return ['--foo']; }
+  paint(ctx, geom, properties) {
+    ctx.fillStyle = properties.get('--foo').toString();
+    ctx.fillRect(0, 0, 200, 200);
+  }
+});
+</script>
+
+<script type="text/javascript">
+CSS.registerProperty({
+  name: '--foo',
+  syntax: '<color>',
+  initialValue: 'rgb(0, 0, 0)',
+  inherits: false
+});
+</script>
+
+<script>
+var code = document.getElementById('code').textContent;
+var blob = new Blob([code], {type: 'text/javascript'});
+CSS.paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
+  document.getElementById('footainer1').classList.add('fooanimate1');
+  document.getElementById('footainer2').classList.add('fooanimate2');
+  const animations = document.getAnimations();
+  // Wait for all animations to start before completing the test.
+  Promise.all([animations[0].ready, animations[1].ready]).then(() => {
+    takeScreenshot();
+  });
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-paint-api/two-element-one-custom-property-animation-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<body>
+<canvas id ="canvas" width="200" height="400"></canvas>
+<script>
+var canvas = document.getElementById('canvas');
+var context = canvas.getContext("2d");
+context.fillStyle = 'rgb(100, 0, 100)';
+context.fillRect(0, 0, 200, 200);
+context.fillStyle = 'rgb(100, 100, 0)';
+context.fillRect(0, 200, 200, 200);
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-position/positon-absolute-scrollable-overflow-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-position/positon-absolute-scrollable-overflow-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-position/positon-absolute-scrollable-overflow-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-position/positon-absolute-scrollable-overflow-001.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Positioned Layout Test: Absolute positioned elements are included in the scrollable overflow area</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-position/#valdef-position-absolute">
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#scrollable">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollheight">
+<meta name=assert content="Absolute positioned elements are included in the scrollable overflow area of its containing block.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+.containing-block {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  margin: 100px;
+}
+
+.abspos {
+  position: absolute;
+  background: rgba(0, 255, 0, 0.5);
+  width: 10px;
+  height: 10px;
+  left: 0;
+  top: 0;
+}
+</style>
+<body onload="checkLayout('.containing-block');">
+  <div id="log"></div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="500">
+    <div class="abspos" style="left: -50px; height: 500px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="550">
+    <div class="abspos" style="left: -50px; height: 500px; top: 50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="700">
+    <div class="abspos" style="left: -50px; height: 500px; top: 200px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="400">
+    <div class="abspos" style="left: -50px; height: 500px; top: -100px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div class="abspos" style="left: -50px; height: 500px; top: -1000px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div class="abspos" style="left: 50px; height: 500px; top: -1000px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="210" data-expected-scroll-height="700">
+    <div class="abspos" style="left: 200px; height: 500px; top: 200px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="500" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; top: -50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="550" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; left: 50px; top: -50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="700" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; left: 200px; top: -50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="400" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; left: -100px; top: -50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; left: -1000px; top: -50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="100" data-expected-scroll-height="100">
+    <div class="abspos" style="width: 500px; left: -1000px; top: 50px;"></div>
+  </div>
+  <div class="containing-block" data-expected-scroll-width="700" data-expected-scroll-height="210">
+    <div class="abspos" style="width: 500px; left: 200px; top: 200px;"></div>
+  </div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/file-selector-button-display-none-overflow-crash.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,5 @@
+<link rel="author" href="mailto:mats@mozilla.com">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1679682">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5049">
+<style>input{width:1px}::file-selector-button{display: none;}</style>
+<input type="file">
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<title>CSS Test: The empty span should be skipped when finding the ::first-letter content</title>
+<link rel="author" title="Jaeyong Bae" href="jdragon.bae@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#application-in-css">
+<link rel="match" href="first-letter-skip-empty-span-ref.html">
+<style>
+  div::first-letter { color: green }
+</style>
+<div>
+  <span></span>
+  <span>First letter should be green</span>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<title>CSS Test: The nested empty span should be skipped when finding the ::first-letter content</title>
+<link rel="author" title="Jaeyong Bae" href="jdragon.bae@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#application-in-css">
+<link rel="match" href="first-letter-skip-empty-span-nested-ref.html">
+<style>
+  div::first-letter { color: green }
+</style>
+<div>
+  <span></span>
+  <span><span></span>First letter should be green</span>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-nested-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<title>Reference: The nested empty span should be skipped when finding the ::first-letter content</title>
+<link rel="author" title="Jaeyong Bae" href="jdragon.bae@gmail.com">
+<style>
+first-letter { color: green }
+</style>
+<div>
+  <span><first-letter>F</first-letter>irst letter should be green</span>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-letter-skip-empty-span-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<title>Reference: The empty span should be skipped when finding the ::first-letter content</title>
+<link rel="author" title="Jaeyong Bae" href="jdragon.bae@gmail.com">
+<style>
+first-letter { color: green }
+</style>
+<div>
+  <span><first-letter>F</first-letter>irst letter should be green</span>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>inline block ::before styles should apply inside ::first-line</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#generated-content">
+<link rel="match" href="first-line-with-inline-block-before-ref.html">
+<style>
+  #target::first-line {
+    color: red;
+  }
+  #target::before {
+    content: "green";
+    color: green;
+    display: inline-block;
+  }
+</style>
+<div id="target">red</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/first-line-with-inline-block-before-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div>
+  <span style="color: green">green</span><span style="color: red">red</span>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/reference/selection-contenteditable-011-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -16,6 +16,33 @@
     }
   </style>
 
+  <script>
+  function startReference()
+  {
+  document.getElementById("ref").focus();
+  /*
+  Some browsers, like Chromium 80+, will transfer focus
+  to a selected element like a contenteditable div and
+  therefore style the border of such element according
+  to the user agent stylesheet rule:
+  :focus {outline: -webkit-focus-ring-color auto 1px;} .
+  So, we deliberately trigger such focus with the focus()
+  method in the reference file.
+  */
+  document.getElementById("ref").style.caretColor = "yellow";
+  /*
+  When a contenteditable element is focused in Firefox
+  82+, then the caret becomes visible and blinking and
+  it is painted with the ::selected's color which is
+  the green color in this case. We therefore counter,
+  neutralize this by resetting the caret's color to the
+  background color.
+  */
+  }
+  </script>
+
+  <body onload="startReference();">
+
   <p>Test passes if each glyph of "Selected Text" is green with a yellow background and if there is <strong>no red</strong>.
 
-  <div contenteditable="true" id="test">Selected Text</div>
+  <div contenteditable="true" id="ref">Selected Text</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/selection-contenteditable-011.html firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/selection-contenteditable-011.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-pseudo/selection-contenteditable-011.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-pseudo/selection-contenteditable-011.html	2021-01-18 19:58:22.000000000 +0000
@@ -35,15 +35,6 @@
   /* Then we set the range boundaries to the children of div#test */
   window.getSelection().addRange(targetRange);
   /* Finally, we now select such range of content */
-  document.getElementById("test").blur();
-  /*
-  Some browsers, like Chromium 80+, will
-  transfer focus to a selected element
-  like a contenteditable div and
-  therefore style the border of
-  such element. We remove such
-  focus with the blur() method.
-  */
   }
   </script>
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html firefox-85.0+build1/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-scroll-snap/snap-at-user-scroll-end-manual.html	2021-01-18 19:58:22.000000000 +0000
@@ -4,7 +4,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
-body {
+html {
   margin: 0px;
   scroll-snap-type: both mandatory;
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-004.html firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-004.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-004.html	2021-01-18 19:58:22.000000000 +0000
@@ -2,14 +2,14 @@
 <title>CSS aspect-ratio: abspos div inline size</title>
 <link rel="author" title="Google LLC" href="https://www.google.com/">
 <link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-position/#abspos-auto-size">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
 
-<!-- It is not entirely clear if this is testing the right behavior. See:
-     https://github.com/w3c/csswg-drafts/issues/5151
-  -->
-
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="width: 500px; height: 100px; position: relative;">
-  <div style="background: green; aspect-ratio: 1/1; position: absolute; left: 0; top: 0; bottom: 0;"></div>
+<div style="width: 300px; height: 50px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; top: 0; bottom: 0;"></div>
+</div>
+<div style="width: 100px; height: 300px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; right: 0; top: 0; writing-mode: vertical-lr;"></div>
 </div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-015.html firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-015.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-015.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/aspect-ratio/abspos-015.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: abspos div block size</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-position/#abspos-auto-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="width: 300px; height: 50px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; top: 0; bottom: 0; writing-mode: vertical-lr"></div>
+</div>
+<div style="width: 100px; height: 300px; position: relative;">
+  <div style="background: green; aspect-ratio: 2/1; position: absolute; left: 0; right: 0; top: 0;"></div>
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009.html firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,34 @@
+<!doctype html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1677353">
+<link rel="match" href="intrinsic-percent-replaced-009-ref.html">
+<style>
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  padding: 20px;
+  position: relative;
+}
+
+.parent {
+  border: 3px solid green;
+  position: absolute;
+  height: 60%;
+}
+
+.parent img {
+  height: 100%;
+}
+</style>
+<div class="parent">
+  <img src="/images/blue96x96.png">
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-009-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,32 @@
+<!doctype html>
+<title>CSS test reference</title>
+<style>
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  padding: 20px;
+  position: relative;
+}
+
+.parent {
+  border: 3px solid green;
+  position: absolute;
+  height: 60vh;
+}
+
+.parent img {
+  height: calc(60vh - 6px);
+}
+</style>
+<div class="parent">
+  <img src="/images/blue96x96.png">
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-tables/tentative/column-widths.html firefox-85.0+build1/testing/web-platform/tests/css/css-tables/tentative/column-widths.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-tables/tentative/column-widths.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-tables/tentative/column-widths.html	2021-01-18 19:58:22.000000000 +0000
@@ -276,7 +276,23 @@
 <table style="width:1px" data-expected-width=234>
   <col style="width:50%">
   <td style="width:100px" data-expected-width=10><div style="width:10px">10</div></td>
-  <td><div style="width:200px">200</div>
+  <td><div style="width:200px">200</div></td>
+</table>
+
+<p class="testdesc">col fixed td fixed inside table-layout:fixed
+constrained columns take precedence in fixed layout.
+<table style="width:324px;table-layout:fixed" data-expected-width=324>
+  <col style="width:100px">
+  <td style="width:200px" data-expected-width=100>100</td>
+  <td data-expected-width=200><div style="width:400px" >200</div></td>
+</table>
+
+<p class="testdesc">col percent td fixed inside table-layout:fixed
+constrained columns take precedence in fixed layout.
+<table style="width:324px;table-layout:fixed" data-expected-width=324>
+  <col style="width:50%">
+  <td style="width:200px" data-expected-width=150>150</td>
+  <td><div style="width:400px">150</div></td>
 </table>
 </main>
 <script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-tables/tentative/position-sticky-container.html firefox-85.0+build1/testing/web-platform/tests/css/css-tables/tentative/position-sticky-container.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-tables/tentative/position-sticky-container.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-tables/tentative/position-sticky-container.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,170 @@
+<!doctype html>
+<title>Table parts sticky containers</title>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<link rel="author" title="Aleks Totic" href="mailto:atotic@chromium.org" />
+<link rel="help" href="https://www.w3.org/TR/css-tables-3/" />
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5020"/>
+<style>
+  body {
+    margin: 0;
+  }
+  main * {
+    box-sizing: border-box;
+  }
+
+  main .scroller {
+    width: 350px;
+    height: 302px;
+    overflow-y: scroll;
+    outline-offset: -1px;
+    outline: gray solid 1px;
+  }
+  main .padblock {
+    width: 300px;
+    height: 400px;
+    outline-offset: -2px;
+    outline: black dotted 2px;
+  }
+  main table {
+    border-spacing: 0;
+  }
+
+  main td {
+    width: 100px;
+    height: 25px;
+  }
+  .sticky {
+    position:sticky;
+    top: 0;
+    background: rgba(0,255,0, 0.3);
+  }
+
+</style>
+<main>
+  <div class="scroller">
+    <div class="padblock">top</div>
+    <table>
+      <thead>
+        <tr>
+          <td>h:0,0</td>
+          <td>h:0,1</td>
+          <td>h:0,2</td>
+        </tr>
+        <tr >
+          <td>h:1,0</td>
+          <td >h:1,1</td>
+          <td>h:1,2</td>
+        </tr>
+        <tr>
+          <td>h:2,0</td>
+          <td>h:2,1</td>
+          <td>h:2,2</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>b:0,0</td>
+          <td>b:0,1</td>
+          <td>b:0,2</td>
+        </tr>
+        <tr>
+          <td>b:1,0</td>
+          <td>b:1,1</td>
+          <td>b:1,2</td>
+        </tr>
+        <tr>
+          <td>b:2,0</td>
+          <td>b:2,1</td>
+          <td>b:2,2</td>
+        </tr>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td>f:0,0</td>
+          <td>f:0,1</td>
+          <td>f:0,2</td>
+        </tr>
+        <tr>
+          <td>f:1,0</td>
+          <td>f:1,1</td>
+          <td>f:1,2</td>
+        </tr>
+        <tr>
+          <td>f:2,0</td>
+          <td>f:2,1</td>
+          <td>f:2,2</td>
+        </tr>
+      </tfoot>
+    </table>
+    <div class="padblock">bottom</div>
+  </div>
+</main>
+<script>
+
+  function scrollTo(y) {
+    let scroller = document.querySelector("main .scroller");
+    scroller.scrollTop = y;
+  }
+
+  test( () => {
+    // Setup
+    let target = document.querySelector("main tbody tr:nth-child(2) td:nth-child(2)");
+    let scroller = document.querySelector("main .scroller");
+    target.classList.toggle("sticky");
+
+    // Tests
+    scrollTo(0);
+    assert_equals(target.getBoundingClientRect().top, 500, "intrinsic position");
+
+    scrollTo(600);
+    assert_equals(target.getBoundingClientRect().top, 0, "sticking to the table");
+
+    scrollTo(640);
+    assert_equals(target.getBoundingClientRect().top, -40, "sticking to the table bottom");
+
+    // Teardown
+    target.classList.toggle("sticky");
+  }, "TD sticky container is table");
+
+  test( () => {
+    // Setup
+    let target = document.querySelector("main tbody tr:nth-child(2)");
+    let scroller = document.querySelector("main .scroller");
+    target.classList.toggle("sticky");
+
+    // Tests
+    scrollTo(0);
+    assert_equals(target.getBoundingClientRect().top, 500, "intrinsic position");
+
+    scrollTo(600);
+    assert_equals(target.getBoundingClientRect().top, 0, "sticking to the table");
+
+    scrollTo(640);
+    assert_equals(target.getBoundingClientRect().top, -40, "sticking to the table bottom");
+    // Teardown
+    target.classList.toggle("sticky");
+  }, "TR sticky container is table");
+
+
+  test( () => {
+    // Setup
+    let target = document.querySelector("main tbody");
+    let scroller = document.querySelector("main .scroller");
+    target.classList.toggle("sticky");
+
+    // Tests
+    scrollTo(0);
+    assert_equals(target.getBoundingClientRect().top, 475, "intrinsic position");
+
+    scrollTo(550);
+    assert_equals(target.getBoundingClientRect().top, 0, "sticking to the table");
+
+    scrollTo(600);
+    assert_equals(target.getBoundingClientRect().top, -50, "sticking to the table bottom");
+
+    // Teardown
+    target.classList.toggle("sticky");
+  }, "TBODY sticky container is table");
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/crashtests/rendering-rtl-bidi-override-crash.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,37 @@
+<!doctype html>
+<title>CSS Text Test: Crash rendering RLT text with unicode-bidi: bidi-override</title>
+<link rel="help" href="https://crbug.com/1152387">
+<script type="text/javascript">
+    function event_handler_CD7_readystatechange() {
+        document.designMode = document.designMode == "on" ? "off" : "on";
+        var oSelection=window.getSelection();
+        document.execCommand("SelectAll")
+        oSelection.collapseToEnd()
+        document.execCommand('CreateLink',false,'about:blank');
+    }
+    document.addEventListener("readystatechange", event_handler_CD7_readystatechange);
+    function event_handler_CD8_DOMCharacterDataModified() {
+        var oSelection=window.getSelection();
+        oSelection.modify('move', 'backward', 'line');
+    }
+    document.addEventListener("DOMCharacterDataModified", event_handler_CD8_DOMCharacterDataModified);
+    setTimeout(function() {
+        var oSelection=window.getSelection();
+        var oRange = oSelection.rangeCount ? oSelection.getRangeAt(68 % oSelection.rangeCount) : null;
+        var oParentElement = function() {
+            var oNewElement = document.createElementNS('http://www.w3.org/2000/svg', 'filter');
+            return oNewElement;
+        }();
+        oRange.surroundContents(oParentElement);
+    });
+</script>
+<style>
+    div {
+        unicode-bidi:bidi-override;
+        direction: rtl;
+    }
+</style>
+<div>
+AxBxC AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/full-width-leading-spaces-004.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/full-width-leading-spaces-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/full-width-leading-spaces-004.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/full-width-leading-spaces-004.html	2021-01-18 19:58:22.000000000 +0000
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 3 Test: handling leading ideographic space sequence</title>
+<title>CSS Text level 3 Test: handling trailing ideographic space sequence</title>
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
-<meta name="assert" content="Leading ideographic space sequences must account for intrinsic size.">
+<meta name="assert" content="Ideographic space sequences at the end of line must hang, and therefore not be taken into account for min content sizing.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
 <style>
 .ref {
     width: 100px;
     height: 100px;
-    background: red;
+    background: green;
 }
 .test {
     width: min-content;
     font-size: 100px;
     line-height: 1;
-    background: green;
+    background: red;
 }
 </style>
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Whitespace and line break transformation</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="All spaces and tabs immediately preceding or following a segment break are removed. If no F, H, W or ZWSP characters involved, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color:#2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color:#270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>hello
-there</span></div>
-<div id='test2' class="test"><span>hello&#x20;&#x20;&#x20;
-there</span></div>
-<div id='test3' class="test"><span>hello
-&#x20;&#x20;&#x20;&#x20;&#x20;there</span></div>
-<div id='test4' class="test"><span>hello&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;there</span></div>
-<div id='test5' class="test"><span>hello
-
-
-there</span></div>
-<div id='test6' class="test"><span>hello&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;there</span></div>
-<div id="ref" class="ref"><span>hello there</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-000.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Whitespace and line break transformation</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="All spaces and tabs immediately preceding or following a segment break are removed. If no F, H, W or ZWSP characters involved, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color:#2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color:#270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>hello
+there</span></div>
+<div id='test2' class="test"><span>hello&#x20;&#x20;&#x20;
+there</span></div>
+<div id='test3' class="test"><span>hello
+&#x20;&#x20;&#x20;&#x20;&#x20;there</span></div>
+<div id='test4' class="test"><span>hello&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;there</span></div>
+<div id='test5' class="test"><span>hello
+
+
+there</span></div>
+<div id='test6' class="test"><span>hello&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;there</span></div>
+<div id="ref" class="ref"><span>hello there</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Wide characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is W and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color:#2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color:#270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>日本語
-中国�</span></div>
-<div id='test2' class="test"><span>日本語&#x20;&#x20;&#x20;
-中国�</span></div>
-<div id='test3' class="test"><span>日本語
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;中国�</span></div>
-<div id='test4' class="test"><span>日本語&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;中国�</span></div>
-<div id='test5' class="test"><span>日本語
-
-
-中国�</span></div>
-<div id='test6' class="test"><span>日本語&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;中国�</span></div>
-<div id="ref" class="ref"><span>日本語中国�</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-001.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Wide characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is W and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color:#2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color:#270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>日本語
+中国�</span></div>
+<div id='test2' class="test"><span>日本語&#x20;&#x20;&#x20;
+中国�</span></div>
+<div id='test3' class="test"><span>日本語
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;中国�</span></div>
+<div id='test4' class="test"><span>日本語&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;中国�</span></div>
+<div id='test5' class="test"><span>日本語
+
+
+中国�</span></div>
+<div id='test6' class="test"><span>日本語&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;中国�</span></div>
+<div id="ref" class="ref"><span>日本語中国�</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Fullwidth characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ＦＵＬＬ
-ＷＩＤＴＨ</span></div>
-<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-ＷＩＤＴＨ</span></div>
-<div id='test3' class="test"><span>ＦＵＬＬ
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id='test5' class="test"><span>ＦＵＬＬ
-
-
-ＷＩＤＴＨ</span></div>
-<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id="ref" class="ref"><span>ＦＵＬＬＷＩＤＴＨ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-002.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Fullwidth characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ＦＵＬＬ
+ＷＩＤＴＨ</span></div>
+<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+ＷＩＤＴＨ</span></div>
+<div id='test3' class="test"><span>ＦＵＬＬ
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id='test5' class="test"><span>ＦＵＬＬ
+
+
+ＷＩＤＴＨ</span></div>
+<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id="ref" class="ref"><span>ＦＵＬＬＷＩＤＴＨ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Halfwidth characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is H and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ﾊ�
-ｶｸ</span></div>
-<div id='test2' class="test"><span>ﾊ�&#x20;&#x20;&#x20;
-ｶｸ</span></div>
-<div id='test3' class="test"><span>ﾊ�
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test4' class="test"><span>ﾊ�&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test5' class="test"><span>ﾊ�
-
-
-ｶｸ</span></div>
-<div id='test6' class="test"><span>ﾊ�&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id="ref" class="ref"><span>ﾊ�ｶｸ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-003.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Halfwidth characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is H and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ﾊ�
+ｶｸ</span></div>
+<div id='test2' class="test"><span>ﾊ�&#x20;&#x20;&#x20;
+ｶｸ</span></div>
+<div id='test3' class="test"><span>ﾊ�
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test4' class="test"><span>ﾊ�&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test5' class="test"><span>ﾊ�
+
+
+ｶｸ</span></div>
+<div id='test6' class="test"><span>ﾊ�&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id="ref" class="ref"><span>ﾊ�ｶｸ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Won and halfwidth characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F or H and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>â‚©
-ï¼’ï¼”</span></div>
-<div id='test2' class="test"><span>â‚©&#x20;&#x20;&#x20;
-ï¼’ï¼”</span></div>
-<div id='test3' class="test"><span>â‚©
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
-<div id='test4' class="test"><span>â‚©&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
-<div id='test5' class="test"><span>â‚©
-
-
-ï¼’ï¼”</span></div>
-<div id='test6' class="test"><span>â‚©&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
-<div id="ref1" class="ref"><span>â‚©ï¼’ï¼”</span></div>
-<div id='test7' class="test"><span>ï¼’ï¼”
-â‚©</span></div>
-<div id='test8' class="test"><span>ï¼’ï¼”&#x20;&#x20;&#x20;
-â‚©</span></div>
-<div id='test9' class="test"><span>ï¼’ï¼”
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;â‚©</span></div>
-<div id='test10' class="test"><span>ï¼’ï¼”&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;â‚©</span></div>
-<div id='test11' class="test"><span>ï¼’ï¼”
-
-
-â‚©</span></div>
-<div id='test12' class="test"><span>ï¼’ï¼”&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;â‚©</span></div>
-<div id="ref2" class="ref"><span>２４₩</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "linebreak only â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "spaces linebreak â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "linebreak spaces â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "spaces linebreak spaces â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "multiple linebreaks â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces â‚©ï¼’ï¼”");
-test(function() {
-assert_equals(document.getElementById('test7').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "linebreak only ２４₩");
-test(function() {
-assert_equals(document.getElementById('test8').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "spaces linebreak ２４₩");
-test(function() {
-assert_equals(document.getElementById('test9').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "linebreak spaces ２４₩");
-test(function() {
-assert_equals(document.getElementById('test10').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "spaces linebreak spaces ２４₩");
-test(function() {
-assert_equals(document.getElementById('test11').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "multiple linebreaks ２４₩");
-test(function() {
-assert_equals(document.getElementById('test12').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces ２４₩");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-004.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Won and halfwidth characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F or H and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>â‚©
+ï¼’ï¼”</span></div>
+<div id='test2' class="test"><span>â‚©&#x20;&#x20;&#x20;
+ï¼’ï¼”</span></div>
+<div id='test3' class="test"><span>â‚©
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
+<div id='test4' class="test"><span>â‚©&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
+<div id='test5' class="test"><span>â‚©
+
+
+ï¼’ï¼”</span></div>
+<div id='test6' class="test"><span>â‚©&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ï¼’ï¼”</span></div>
+<div id="ref1" class="ref"><span>â‚©ï¼’ï¼”</span></div>
+<div id='test7' class="test"><span>ï¼’ï¼”
+â‚©</span></div>
+<div id='test8' class="test"><span>ï¼’ï¼”&#x20;&#x20;&#x20;
+â‚©</span></div>
+<div id='test9' class="test"><span>ï¼’ï¼”
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;â‚©</span></div>
+<div id='test10' class="test"><span>ï¼’ï¼”&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;â‚©</span></div>
+<div id='test11' class="test"><span>ï¼’ï¼”
+
+
+â‚©</span></div>
+<div id='test12' class="test"><span>ï¼’ï¼”&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;â‚©</span></div>
+<div id="ref2" class="ref"><span>２４₩</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "linebreak only â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "spaces linebreak â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "linebreak spaces â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "spaces linebreak spaces â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "multiple linebreaks â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces â‚©ï¼’ï¼”");
+test(function() {
+assert_equals(document.getElementById('test7').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "linebreak only ２４₩");
+test(function() {
+assert_equals(document.getElementById('test8').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "spaces linebreak ２４₩");
+test(function() {
+assert_equals(document.getElementById('test9').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "linebreak spaces ２４₩");
+test(function() {
+assert_equals(document.getElementById('test10').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "spaces linebreak spaces ２４₩");
+test(function() {
+assert_equals(document.getElementById('test11').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "multiple linebreaks ２４₩");
+test(function() {
+assert_equals(document.getElementById('test12').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces ２４₩");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Wide character and non-wide character around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>漢字
-kanji</span></div>
-<div id='test2' class="test"><span>漢字&#x20;&#x20;&#x20;
-kanji</span></div>
-<div id='test3' class="test"><span>漢字
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;kanji</span></div>
-<div id='test4' class="test"><span>漢字&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;kanji</span></div>
-<div id='test5' class="test"><span>漢字
-
-
-kanji</span></div>
-<div id='test6' class="test"><span>漢字&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;kanji</span></div>
-<div id="ref" class="ref"><span>漢字&#x20;kanji</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more or less than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-005.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Wide character and non-wide character around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>漢字
+kanji</span></div>
+<div id='test2' class="test"><span>漢字&#x20;&#x20;&#x20;
+kanji</span></div>
+<div id='test3' class="test"><span>漢字
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;kanji</span></div>
+<div id='test4' class="test"><span>漢字&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;kanji</span></div>
+<div id='test5' class="test"><span>漢字
+
+
+kanji</span></div>
+<div id='test6' class="test"><span>漢字&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;kanji</span></div>
+<div id="ref" class="ref"><span>漢字&#x20;kanji</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more or less than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Fullwidth character and non-fullwidth character around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ＦＵＬＬ
-width</span></div>
-<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-width</span></div>
-<div id='test3' class="test"><span>ＦＵＬＬ
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;width</span></div>
-<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;width</span></div>
-<div id='test5' class="test"><span>ＦＵＬＬ
-
-
-width</span></div>
-<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;width</span></div>
-<div id="ref" class="ref"><span>ＦＵＬＬ&#x20;width</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more or less than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-006.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Fullwidth character and non-fullwidth character around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ＦＵＬＬ
+width</span></div>
+<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+width</span></div>
+<div id='test3' class="test"><span>ＦＵＬＬ
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;width</span></div>
+<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;width</span></div>
+<div id='test5' class="test"><span>ＦＵＬＬ
+
+
+width</span></div>
+<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;width</span></div>
+<div id="ref" class="ref"><span>ＦＵＬＬ&#x20;width</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more or less than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Halfwidth character and non-halfwidth character around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>han
-ｶｸ</span></div>
-<div id='test2' class="test"><span>han&#x20;&#x20;&#x20;
-ｶｸ</span></div>
-<div id='test3' class="test"><span>han
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test4' class="test"><span>han&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test5' class="test"><span>han
-
-
-ｶｸ</span></div>
-<div id='test6' class="test"><span>han&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id="ref" class="ref"><span>han&#x20;ｶｸ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more or less than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-007.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Halfwidth character and non-halfwidth character around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of only one character before and after the line feed is F, W or H and neither side is Hangul, then the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>han
+ｶｸ</span></div>
+<div id='test2' class="test"><span>han&#x20;&#x20;&#x20;
+ｶｸ</span></div>
+<div id='test3' class="test"><span>han
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test4' class="test"><span>han&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test5' class="test"><span>han
+
+
+ｶｸ</span></div>
+<div id='test6' class="test"><span>han&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id="ref" class="ref"><span>han&#x20;ｶｸ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more or less than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Wide and fullwidth characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>日本語
-ＷＩＤＴＨ</span></div>
-<div id='test2' class="test"><span>日本語&#x20;&#x20;&#x20;
-ＷＩＤＴＨ</span></div>
-<div id='test3' class="test"><span>日本語
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id='test4' class="test"><span>日本語&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id='test5' class="test"><span>日本語
-
-
-ＷＩＤＴＨ</span></div>
-<div id='test6' class="test"><span>日本語&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
-<div id="ref" class="ref"><span>日本語ＷＩＤＴＨ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-008.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Wide and fullwidth characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>日本語
+ＷＩＤＴＨ</span></div>
+<div id='test2' class="test"><span>日本語&#x20;&#x20;&#x20;
+ＷＩＤＴＨ</span></div>
+<div id='test3' class="test"><span>日本語
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id='test4' class="test"><span>日本語&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id='test5' class="test"><span>日本語
+
+
+ＷＩＤＴＨ</span></div>
+<div id='test6' class="test"><span>日本語&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ＷＩＤＴＨ</span></div>
+<div id="ref" class="ref"><span>日本語ＷＩＤＴＨ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Fullwidth and halfwidth characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ＦＵＬＬ
-ｶｸ</span></div>
-<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-ｶｸ</span></div>
-<div id='test3' class="test"><span>ＦＵＬＬ
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id='test5' class="test"><span>ＦＵＬＬ
-
-
-ｶｸ</span></div>
-<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ｶｸ</span></div>
-<div id="ref" class="ref"><span>ＦＵＬＬｶｸ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-009.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Fullwidth and halfwidth characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ＦＵＬＬ
+ｶｸ</span></div>
+<div id='test2' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+ｶｸ</span></div>
+<div id='test3' class="test"><span>ＦＵＬＬ
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test4' class="test"><span>ＦＵＬＬ&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id='test5' class="test"><span>ＦＵＬＬ
+
+
+ｶｸ</span></div>
+<div id='test6' class="test"><span>ＦＵＬＬ&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ｶｸ</span></div>
+<div id="ref" class="ref"><span>ＦＵＬＬｶｸ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Hangul characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>한글
-쓰기</span></div>
-<div id='test2' class="test"><span>한글&#x20;&#x20;&#x20;
-쓰기</span></div>
-<div id='test3' class="test"><span>한글
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;쓰기</span></div>
-<div id='test4' class="test"><span>한글&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;쓰기</span></div>
-<div id='test5' class="test"><span>한글
-
-
-쓰기</span></div>
-<div id='test6' class="test"><span>한글&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;쓰기</span></div>
-<div id="ref" class="ref"><span>한글&#x20;쓰기</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more or less than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-010.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Hangul characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>한글
+쓰기</span></div>
+<div id='test2' class="test"><span>한글&#x20;&#x20;&#x20;
+쓰기</span></div>
+<div id='test3' class="test"><span>한글
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;쓰기</span></div>
+<div id='test4' class="test"><span>한글&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;쓰기</span></div>
+<div id='test5' class="test"><span>한글
+
+
+쓰기</span></div>
+<div id='test6' class="test"><span>한글&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;쓰기</span></div>
+<div id="ref" class="ref"><span>한글&#x20;쓰기</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more or less than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Hangul jamo characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>하ᄂ
-그ᄅ</span></div>
-<div id='test2' class="test"><span>하ᄂ&#x20;&#x20;&#x20;
-그ᄅ</span></div>
-<div id='test3' class="test"><span>하ᄂ
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;그ᄅ</span></div>
-<div id='test4' class="test"><span>하ᄂ&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;그ᄅ</span></div>
-<div id='test5' class="test"><span>하ᄂ
-
-
-그ᄅ</span></div>
-<div id='test6' class="test"><span>하ᄂ&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;그ᄅ</span></div>
-<div id="ref" class="ref"><span>하ᄂ&#x20;그ᄅ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-011.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Hangul jamo characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>하ᄂ
+그ᄅ</span></div>
+<div id='test2' class="test"><span>하ᄂ&#x20;&#x20;&#x20;
+그ᄅ</span></div>
+<div id='test3' class="test"><span>하ᄂ
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;그ᄅ</span></div>
+<div id='test4' class="test"><span>하ᄂ&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;그ᄅ</span></div>
+<div id='test5' class="test"><span>하ᄂ
+
+
+그ᄅ</span></div>
+<div id='test6' class="test"><span>하ᄂ&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;그ᄅ</span></div>
+<div id="ref" class="ref"><span>하ᄂ&#x20;그ᄅ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Hangul halfwidth jamo characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ﾾￂﾤ
-ﾡￚﾩ</span></div>
-<div id='test2' class="test"><span>ﾾￂﾤ&#x20;&#x20;&#x20;
-ﾡￚﾩ</span></div>
-<div id='test3' class="test"><span>ﾾￂﾤ
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
-<div id='test4' class="test"><span>ﾾￂﾤ&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
-<div id='test5' class="test"><span>ﾾￂﾤ
-
-
-ﾡￚﾩ</span></div>
-<div id='test6' class="test"><span>ﾾￂﾤ&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
-<div id="ref" class="ref"><span>ﾾￂﾤ&#x20;ﾡￚﾩ</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-012.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Hangul halfwidth jamo characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ﾾￂﾤ
+ﾡￚﾩ</span></div>
+<div id='test2' class="test"><span>ﾾￂﾤ&#x20;&#x20;&#x20;
+ﾡￚﾩ</span></div>
+<div id='test3' class="test"><span>ﾾￂﾤ
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
+<div id='test4' class="test"><span>ﾾￂﾤ&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
+<div id='test5' class="test"><span>ﾾￂﾤ
+
+
+ﾡￚﾩ</span></div>
+<div id='test6' class="test"><span>ﾾￂﾤ&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ﾡￚﾩ</span></div>
+<div id="ref" class="ref"><span>ﾾￂﾤ&#x20;ﾡￚﾩ</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Thai characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ภาษา
-ไทย</span></div>
-<div id='test2' class="test"><span>ภาษา&#x20;&#x20;&#x20;
-ไทย</span></div>
-<div id='test3' class="test"><span>ภาษา
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
-<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
-<div id='test5' class="test"><span>ภาษา
-
-
-ไทย</span></div>
-<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ไทย</span></div>
-<div id="ref" class="ref"><span>ภาษา&#x20;ไทย</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-</script>
-<!-- Notes:
-The assertion will fail if more or less than one space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-014.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Thai characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ภาษา
+ไทย</span></div>
+<div id='test2' class="test"><span>ภาษา&#x20;&#x20;&#x20;
+ไทย</span></div>
+<div id='test3' class="test"><span>ภาษา
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
+<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
+<div id='test5' class="test"><span>ภาษา
+
+
+ไทย</span></div>
+<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ไทย</span></div>
+<div id="ref" class="ref"><span>ภาษา&#x20;ไทย</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+</script>
+<!-- Notes:
+The assertion will fail if more or less than one space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Thai and Latin characters around line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ภาษา
-latin</span></div>
-<div id='test2' class="test"><span>ภาษา&#x20;&#x20;&#x20;
-latin</span></div>
-<div id='test3' class="test"><span>ภาษา
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;latin</span></div>
-<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;latin</span></div>
-<div id='test5' class="test"><span>ภาษา
-
-
-latin</span></div>
-<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;latin</span></div>
-<div id="ref1" class="ref"><span>ภาษา&#x20;latin</span></div>
-
-<div id='test7' class="test"><span>latin
-ภาษา</span></div>
-<div id='test8' class="test"><span>latin&#x20;&#x20;&#x20;
-ภาษา</span></div>
-<div id='test9' class="test"><span>latin
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ภาษา</span></div>
-<div id='test10' class="test"><span>latin&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ภาษา</span></div>
-<div id='test11' class="test"><span>latin
-
-
-ภาษา</span></div>
-<div id='test12' class="test"><span>latin&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ภาษา</span></div>
-<div id="ref2" class="ref"><span>latin&#x20;ภาษา</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "linebreak only thai latin");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "spaces linebreak thai latin");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "linebreak spaces thai latin");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "spaces linebreak spaces thai latin");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "multiple linebreaks thai latin");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces thai latin");
-test(function() {
-assert_equals(document.getElementById('test7').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "linebreak only latin thai");
-test(function() {
-assert_equals(document.getElementById('test8').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "spaces linebreak latin thai");
-test(function() {
-assert_equals(document.getElementById('test9').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "linebreak spaces latin thai");
-test(function() {
-assert_equals(document.getElementById('test10').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "spaces linebreak spaces latin thai");
-test(function() {
-assert_equals(document.getElementById('test11').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "multiple linebreaks latin thai");
-test(function() {
-assert_equals(document.getElementById('test12').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces latin thai");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-015.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Thai and Latin characters around line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the East Asian Width property of both the character before and after the line feed is F, W or H  and neither side is Hangul, then the segment break is removed. Otherwise, the segment break is converted to a space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ภาษา
+latin</span></div>
+<div id='test2' class="test"><span>ภาษา&#x20;&#x20;&#x20;
+latin</span></div>
+<div id='test3' class="test"><span>ภาษา
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;latin</span></div>
+<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;latin</span></div>
+<div id='test5' class="test"><span>ภาษา
+
+
+latin</span></div>
+<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;latin</span></div>
+<div id="ref1" class="ref"><span>ภาษา&#x20;latin</span></div>
+
+<div id='test7' class="test"><span>latin
+ภาษา</span></div>
+<div id='test8' class="test"><span>latin&#x20;&#x20;&#x20;
+ภาษา</span></div>
+<div id='test9' class="test"><span>latin
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ภาษา</span></div>
+<div id='test10' class="test"><span>latin&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ภาษา</span></div>
+<div id='test11' class="test"><span>latin
+
+
+ภาษา</span></div>
+<div id='test12' class="test"><span>latin&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ภาษา</span></div>
+<div id="ref2" class="ref"><span>latin&#x20;ภาษา</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "linebreak only thai latin");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "spaces linebreak thai latin");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "linebreak spaces thai latin");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "spaces linebreak spaces thai latin");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "multiple linebreaks thai latin");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref1').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces thai latin");
+test(function() {
+assert_equals(document.getElementById('test7').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "linebreak only latin thai");
+test(function() {
+assert_equals(document.getElementById('test8').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "spaces linebreak latin thai");
+test(function() {
+assert_equals(document.getElementById('test9').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "linebreak spaces latin thai");
+test(function() {
+assert_equals(document.getElementById('test10').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "spaces linebreak spaces latin thai");
+test(function() {
+assert_equals(document.getElementById('test11').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "multiple linebreaks latin thai");
+test(function() {
+assert_equals(document.getElementById('test12').firstChild.offsetWidth, document.getElementById('ref2').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces latin thai");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Thai with ZWSP before line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the character immediately before or immediately after the segment break is the zero-width space character (U+200B), then the break is removed, leaving behind the zero-width space.">
-<style type='text/css'>
-/* the CSS below is not part of the test */
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ภาษา&#x200B;
-ไทย</span></div>
-<div id='test2' class="test"><span>ภาษา&#x200B;&#x20;&#x20;&#x20;
-ไทย</span></div>
-<div id='test3' class="test"><span>ภาษา&#x200B;
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
-<div id='test4' class="test"><span>ภาษา&#x200B;&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
-<div id='test5' class="test"><span>ภาษา&#x200B;
-
-
-ไทย</span></div>
-<div id='test6' class="test"><span>ภาษา&#x200B;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;ไทย</span></div>
-<div id="ref" class="ref"><span>ภาษาไทย</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-var matches = document.getElementById('test1').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 1");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-var matches = document.getElementById('test2').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 2");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-var matches = document.getElementById('test3').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 3");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-var matches = document.getElementById('test4').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 4");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-var matches = document.getElementById('test5').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 5");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-var matches = document.getElementById('test6').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 6");
-</script>
-<!-- Notes:
-The assertion will fail if a normal space is produced for any line in the test paragraph.
--->
-</body>
-</html>
-
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-016.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Thai with ZWSP before line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the character immediately before or immediately after the segment break is the zero-width space character (U+200B), then the break is removed, leaving behind the zero-width space.">
+<style type='text/css'>
+/* the CSS below is not part of the test */
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ภาษา&#x200B;
+ไทย</span></div>
+<div id='test2' class="test"><span>ภาษา&#x200B;&#x20;&#x20;&#x20;
+ไทย</span></div>
+<div id='test3' class="test"><span>ภาษา&#x200B;
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
+<div id='test4' class="test"><span>ภาษา&#x200B;&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;ไทย</span></div>
+<div id='test5' class="test"><span>ภาษา&#x200B;
+
+
+ไทย</span></div>
+<div id='test6' class="test"><span>ภาษา&#x200B;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;ไทย</span></div>
+<div id="ref" class="ref"><span>ภาษาไทย</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+var matches = document.getElementById('test1').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 1");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+var matches = document.getElementById('test2').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 2");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+var matches = document.getElementById('test3').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 3");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+var matches = document.getElementById('test4').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 4");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+var matches = document.getElementById('test5').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 5");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+var matches = document.getElementById('test6').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 6");
+</script>
+<!-- Notes:
+The assertion will fail if a normal space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
+
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-<meta charset="utf-8">
-<title>Thai with ZWSP after line break</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
-<meta name="assert" content="If the character immediately before or immediately after the segment break is the zero-width space character (U+200B), then the break is removed, leaving behind the zero-width space.">
-<style type='text/css'>
-.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
-.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body>
-<div id='log'></div>
-<div id='test1' class="test"><span>ภาษา
-&#x200B;ไทย</span></div>
-<div id='test2' class="test"><span>ภาษา
-&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
-<div id='test3' class="test"><span>ภาษา&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;
-&#x200B;ไทย</span></div>
-<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
-<div id='test5' class="test"><span>ภาษา
-
-
-&#x200B;ไทย</span></div>
-<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;
-&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
-<div id="ref" class="ref"><span>ภาษาไทย</span></div>
-<script>
-test(function() {
-assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak only");
-var matches = document.getElementById('test1').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 1");
-test(function() {
-assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak");
-var matches = document.getElementById('test2').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 2");
-test(function() {
-assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "linebreak spaces");
-var matches = document.getElementById('test3').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 3");
-test(function() {
-assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "spaces linebreak spaces");
-var matches = document.getElementById('test4').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 4");
-test(function() {
-assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks");
-var matches = document.getElementById('test5').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 5");
-test(function() {
-assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
-}, "multiple linebreaks + spaces");
-var matches = document.getElementById('test6').firstChild.textContent.match(/\u200B/g)
-test(function() {
-assert_equals(matches.length, 1);
-}, "zwsp retained 6");
-</script>
-<!-- Notes:
-The assertion will fail if space is produced for any line in the test paragraph.
--->
-</body>
-</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-017.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>Thai with ZWSP after line break</title>
+<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#line-break-transform'>
+<meta name="assert" content="If the character immediately before or immediately after the segment break is the zero-width space character (U+200B), then the break is removed, leaving behind the zero-width space.">
+<style type='text/css'>
+.test span { font-size: 24px; font-family: sans-serif; background-color: #2AA5F7; color: white; }
+.ref span { font-size: 24px; font-family: sans-serif; background-color: #270CEF; color: white; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id='log'></div>
+<div id='test1' class="test"><span>ภาษา
+&#x200B;ไทย</span></div>
+<div id='test2' class="test"><span>ภาษา
+&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
+<div id='test3' class="test"><span>ภาษา&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;
+&#x200B;ไทย</span></div>
+<div id='test4' class="test"><span>ภาษา&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
+<div id='test5' class="test"><span>ภาษา
+
+
+&#x200B;ไทย</span></div>
+<div id='test6' class="test"><span>ภาษา&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;
+&#x20;&#x20;&#x20;&#x200B;ไทย</span></div>
+<div id="ref" class="ref"><span>ภาษาไทย</span></div>
+<script>
+test(function() {
+assert_equals(document.getElementById('test1').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak only");
+var matches = document.getElementById('test1').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 1");
+test(function() {
+assert_equals(document.getElementById('test2').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak");
+var matches = document.getElementById('test2').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 2");
+test(function() {
+assert_equals(document.getElementById('test3').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "linebreak spaces");
+var matches = document.getElementById('test3').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 3");
+test(function() {
+assert_equals(document.getElementById('test4').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "spaces linebreak spaces");
+var matches = document.getElementById('test4').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 4");
+test(function() {
+assert_equals(document.getElementById('test5').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks");
+var matches = document.getElementById('test5').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 5");
+test(function() {
+assert_equals(document.getElementById('test6').firstChild.offsetWidth, document.getElementById('ref').firstChild.offsetWidth);
+}, "multiple linebreaks + spaces");
+var matches = document.getElementById('test6').firstChild.textContent.match(/\u200B/g)
+test(function() {
+assert_equals(matches.length, 1);
+}, "zwsp retained 6");
+</script>
+<!-- Notes:
+The assertion will fail if space is produced for any line in the test paragraph.
+-->
+</body>
+</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 3 Test: inline element boundary and segment break transformations</title>
-<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
-<meta name="assert" content="intervening inline box boundaries must be ignored for segment break transformations">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-<style>
-div {
-  font: 20px/1 Ahem;
-  color: green;
-}
-#b { border-right: solid 20px green; }
-#p { padding-right: 20px; background: green; }
-#m { margin-right: 20px; }
-#m2 { margin-right: -20px; }
-
-#red {
-  width: 100px;
-  height: 100px;
-  background: red;
-  position: absolute;
-  z-index: -1;
-}
-</style>
-
-<p>Test passes if there is a filled green square and <strong>no red</strong>.
-
-<div id=red></div>
-
-<div>aa&#x200b;
-bbb</div>
-
-<div>aa<span>&#x200b;</span>
-bbb</div>
-
-<div>aa<span id=b>&#x200b;</span>
-bb</div>
-
-<div>aa<span id=p>&#x200b;</span>
-bb</div>
-
-<div>aa<span id=m>&#x200b;</span><span id=m2></span>
-bbb</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-018.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: inline element boundary and segment break transformations</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="intervening inline box boundaries must be ignored for segment break transformations">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 20px/1 Ahem;
+  color: green;
+}
+#b { border-right: solid 20px green; }
+#p { padding-right: 20px; background: green; }
+#m { margin-right: 20px; }
+#m2 { margin-right: -20px; }
+
+#red {
+  width: 100px;
+  height: 100px;
+  background: red;
+  position: absolute;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div id=red></div>
+
+<div>aa&#x200b;
+bbb</div>
+
+<div>aa<span>&#x200b;</span>
+bbb</div>
+
+<div>aa<span id=b>&#x200b;</span>
+bb</div>
+
+<div>aa<span id=p>&#x200b;</span>
+bb</div>
+
+<div>aa<span id=m>&#x200b;</span><span id=m2></span>
+bbb</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 3 Test: out of flow elements and segment break transformations</title>
-<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
-<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
-<meta name="assert" content="Out-of-flow elements must be ignored for segment break transformations">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-<style>
-div {
-  font: 20px/1 Ahem;
-  color: green;
-}
-aside {
-  color: transparent;
-}
-#abs { position: absolute; }
-#fixed { position: fixed; }
-#float-r { float: right; }
-#float-l { float: left; margin-left: -3em; }
-#red {
-  width: 100px;
-  height: 100px;
-  background: red;
-  position: absolute;
-  z-index: -1;
-}
-</style>
-
-<p>Test passes if there is a filled green square and <strong>no red</strong>.
-
-<div id=red></div>
-
-<div>aa&#x200b;
-bbb</div>
-
-<div>aa&#x200b;<aside id=abs>foo</aside>
-bbb</div>
-
-<div>aa&#x200b;<aside id=fixed>foo</aside>
-bbb</div>
-
-<div>aa&#x200b;<aside id=float-r>foo</aside>
-bbb</div>
-
-<div>aa&#x200b;<aside id=float-l>foo</aside>
-bbb</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/seg-break-transformation-019.tentative.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: out of flow elements and segment break transformations</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#text-encoding">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-transform">
+<link rel=match href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="Out-of-flow elements must be ignored for segment break transformations">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  font: 20px/1 Ahem;
+  color: green;
+}
+aside {
+  color: transparent;
+}
+#abs { position: absolute; }
+#fixed { position: fixed; }
+#float-r { float: right; }
+#float-l { float: left; margin-left: -3em; }
+#red {
+  width: 100px;
+  height: 100px;
+  background: red;
+  position: absolute;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+<div id=red></div>
+
+<div>aa&#x200b;
+bbb</div>
+
+<div>aa&#x200b;<aside id=abs>foo</aside>
+bbb</div>
+
+<div>aa&#x200b;<aside id=fixed>foo</aside>
+bbb</div>
+
+<div>aa&#x200b;<aside id=float-r>foo</aside>
+bbb</div>
+
+<div>aa&#x200b;<aside id=float-l>foo</aside>
+bbb</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/trailing-ogham-003.html firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/trailing-ogham-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/css-text/white-space/trailing-ogham-003.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/css-text/white-space/trailing-ogham-003.html	2021-01-18 19:58:22.000000000 +0000
@@ -18,6 +18,6 @@
 
 <p>Test passes if the content of the blue and orange boxes is identical to that of the black box.
 
-<div class=end-of-element>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜&#x1680;</div>
 <div class=br>᚛ᚑᚌ�ᚋ᚜&#x1680;<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=end-of-element>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜&#x1680;</div>
 <div class=ref>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html firefox-85.0+build1/testing/web-platform/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/filter-effects/svg-empty-container-with-filter-content-added.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,25 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Adding content to a previously empty filtered container</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
+<link rel="match" href="reference/green-100x100.html">
+<link rel="bookmark" href="https://crbug.com/1154050">
+<script src="/common/rendering-utils.js"></script>
+<script src="/common/reftest-wait.js"></script>
+<svg>
+  <filter id="f" color-interpolation-filters="sRGB">
+    <feComponentTransfer><feFuncA/></feComponentTransfer>
+  </filter>
+  <rect width="100" height="100" fill="red"/>
+  <g id="target" filter="url(#f)"/>
+</svg>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+  rect.setAttribute('fill', 'green');
+  rect.setAttribute('width', '100');
+  rect.setAttribute('height', '100');
+  document.getElementById('target').appendChild(rect);
+  takeScreenshot();
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html firefox-85.0+build1/testing/web-platform/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/filter-effects/svg-unused-filter-on-clippath-mutated-crash.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,23 @@
+<!doctype html>
+<html class='test-wait'>
+<title>Mutating a filter primitive in a filter that isn't used doesn't crash</title>
+<link rel='help' href='https://drafts.fxtf.org/filter-effects/#FilterProperty'>
+<link rel='bookmark' href='https://crbug.com/1151610'>
+<script src='/common/rendering-utils.js'></script>
+<svg>
+  <filter id='f'>
+    <feDiffuseLighting id='dl' lighting-color='currentcolor'/>
+  </filter>
+  <clipPath id='c' filter='url(#f)'>
+    <rect width='100' height='100'/>
+  </clipPath>
+  <rect width='500' height='500' fill='green' clip-path='url(#c)'/>
+</svg>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  var primitive = document.getElementById('dl');
+  primitive.parentNode.appendChild(primitive);
+  primitive.setAttribute('lighting-color', 'blue');
+  document.documentElement.classList.remove('test-wait');
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/requirements.txt firefox-85.0+build1/testing/web-platform/tests/css/requirements.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/css/requirements.txt	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/requirements.txt	2021-01-18 19:58:23.000000000 +0000
@@ -1,6 +1,6 @@
 Template-Python==0.1.post1
 html5lib==1.1
-lxml==4.1.1
+lxml==4.5.2
 mercurial==4.5
 six==1.15.0
 webencodings==0.5.1
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-001.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-001.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>CSS Test (Selectors): Keyboard focus enables :focus-visible</title>
+  <link rel="author" title="Rob Dodson" href="robdodson@chromium.org" />
+  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <style>
+    :focus-visible {
+      outline: darkgreen dotted 1px; /* fallback for Edge */
+      outline: darkgreen auto 5px;
+    }
+
+    :focus:not(:focus-visible) {
+      outline: 0;
+      background-color: tomato;
+    }
+  </style>
+</head>
+<body>
+  This test checks that using the Tab key to navigate focus to an element triggers <code>:focus-visible</code> matching.
+  <ol id="instructions">
+    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
+    <li>Use the TAB key on the keyboard to focus the element below that says "Focus me."</li>
+    <li>If the element has a red background, then the test result is FAILURE. If the element has a green outline, then the test result is SUCCESS.</li>
+  </ol>
+  <br>
+  <div id="el" tabindex="0">Focus me.</div>
+  <script>
+    async_test(function(t) {
+      el.addEventListener("focus", t.step_func(function() {
+        assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)");
+        t.done();
+      }));
+      const tab_key = '\ue004';
+      test_driver.send_keys(el, tab_key)
+        .catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+    }, "Keyboard focus should match :focus-visible");
+  </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-001-manual.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-001-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-001-manual.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-001-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>CSS Test (Selectors): Keyboard focus enables :focus-visible</title>
-  <link rel="author" title="Rob Dodson" href="robdodson@chromium.org" />
-  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <style>
-    :focus-visible {
-      outline: darkgreen dotted 1px; /* fallback for Edge */
-      outline: darkgreen auto 5px;
-    }
-
-    :focus:not(:focus-visible) {
-      outline: 0;
-      background-color: tomato;
-    }
-  </style>
-</head>
-<body>
-  This test checks that using the Tab key to navigate focus to an element triggers <code>:focus-visible</code> matching.
-  <ol id="instructions">
-    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
-    <li>Use the TAB key on the keyboard to focus the element below that says "Focus me."</li>
-    <li>If the element has a red background, then the test result is FAILURE. If the element has a green outline, then the test result is SUCCESS.</li>
-  </ol>
-  <br>
-  <div id="el" tabindex="0">Focus me.</div>
-  <script>
-    async_test(function(t) {
-      el.addEventListener("focus", t.step_func(function() {
-        assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)");
-        t.done();
-      }));
-    }, "Keyboard focus should match :focus-visible");
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-003.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-003.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-003.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>CSS Test (Selectors): :focus-visible does not match on non-texty inputs</title>
+  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
+  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <style>
+    :focus-visible {
+      outline: red dotted 1px; /* fallback for Edge */
+      outline: red auto 5px;
+    }
+
+    :focus:not(:focus-visible) {
+        outline: 0;
+        background-color: darkseagreen;
+    }
+  </style>
+</head>
+<body>
+  This test checks that <code>:focus-visible</code> is <em>not</em> triggered by mouse focus on <code>&lt;input&gt;</code> elements which do not take text input.
+  <ol id="instructions">
+    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
+    <li>Click each element element below to focus it.</li>
+    <li>If the element has a red outline, then the test result is FAILURE. If the element has a green background, then the test result is SUCCESS.</li>
+  </ol>
+  <br />
+  <div>
+    <span data-tested="false" id="el-1" tabindex="1">Focus me</span>
+  </div>
+  <div>
+    <span data-tested="false" id="el-2" tabindex="-1">Focus me</span>
+  </div>
+  <div>
+    <span data-tested="false" id="el-3" tabindex="0">Focus me</span>
+  </div>
+  <div>
+    <button data-tested="false" id="el-4">Focus me</span>
+  </div>
+  <div>
+    <input data-tested="false" id="el-5" type="button" value="Focus me"></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-7" type="reset" value="Focus me."></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-8" type="submit" value="Focus me."></input>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-9" type="checkbox"></input> Focus me.</label>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-10" type="radio"></input> Focus me.</label>
+  </div>
+  <div>
+    <!-- Focusing file input triggers a modal, so only test manually -->
+    <input id="el-12" type="file" value="Focus me."></input>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-13" type="range"></input> Focus me.</label>
+  </div>
+  <div>
+    <!-- Ensure the color input is last, as it has a pop-up which obscures other elements -->
+    <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
+  </div>
+  <script>
+    function mouseClickInTarget(selector) {
+       let target = document.querySelector(selector);
+       return test_driver.click(target);
+    }
+
+    async_test(function(t) {
+        document.querySelectorAll("[data-tested]").forEach((el) => {
+            el.addEventListener("click", t.step_func((e) => {
+                let el = e.target;
+                assert_equals(getComputedStyle(el).outlineStyle, "none");
+                el.dataset.tested = true;
+                if (document.querySelector("[data-tested=false]")) {
+                    mouseClickInTarget("[data-tested=false]");
+                } else {
+                    t.done();
+                }
+            }));
+        });
+
+        mouseClickInTarget("[data-tested=false]");
+    }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible");
+  </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-003-manual.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-003-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-003-manual.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-003-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>CSS Test (Selectors): :focus-visible does not match on non-texty inputs</title>
-  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
-  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <style>
-    :focus-visible {
-      outline: red dotted 1px; /* fallback for Edge */
-      outline: red auto 5px;
-    }
-
-    :focus:not(:focus-visible) {
-        outline: 0;
-        background-color: darkseagreen;
-    }
-  </style>
-</head>
-<body>
-  This test checks that <code>:focus-visible</code> is <em>not</em> triggered by mouse focus on <code>&lt;input&gt;</code> elements which do not take text input.
-  <ol id="instructions">
-    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
-    <li>Click each element element below to focus it.</li>
-    <li>If the element has a red outline, then the test result is FAILURE. If the element has a green background, then the test result is SUCCESS.</li>
-  </ol>
-  <br />
-  <div>
-    <span data-tested="false" id="el-1" tabindex="1">Focus me</span>
-  </div>
-  <div>
-    <span data-tested="false" id="el-2" tabindex="-1">Focus me</span>
-  </div>
-  <div>
-    <span data-tested="false" id="el-3" tabindex="0">Focus me</span>
-  </div>
-  <div>
-    <button data-tested="false" id="el-4">Focus me</span>
-  </div>
-  <div>
-    <input data-tested="false" id="el-5" type="button" value="Focus me"</input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-7" type="reset" value="Focus me."></input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-8" type="submit" value="Focus me."></input>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-9" type="checkbox"></input> Focus me.</label>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-10" type="radio"></input> Focus me.</label>
-  </div>
-  <div>
-    <!-- Focusing file input triggers a modal, so only test manually -->
-    <input id="el-12" type="file" value="Focus me."></input>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-13" type="range"></input> Focus me.</label>
-  </div>
-  <div>
-    <!-- Ensure the color input is last, as it has a pop-up which obscures other elements -->
-    <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
-  </div>
-  <script>
-    async_test(function(t) {
-        document.querySelectorAll("[data-tested]").forEach((el) => {
-            el.addEventListener("click", t.step_func((e) => {
-                let el = e.target;
-                assert_equals(getComputedStyle(el).outlineStyle, "none");
-                el.dataset.tested = true;
-                if (document.querySelector("[data-tested=false]")) {
-                    mouseClickInTarget("[data-tested=false]");
-                } else {
-                    t.done();
-                }
-            }));
-        });
-    }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible");
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-004.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-004.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-004.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>CSS Test (Selectors): :focus-visible does not match on non-texty inputs with appearance: none</title>
+  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
+  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <style>
+    :focus-visible {
+      outline: red dotted 1px; /* fallback for Edge */
+      outline: red auto 5px;
+    }
+
+    :focus:not(:focus-visible) {
+      outline: 0;
+      background-color: darkseagreen;
+    }
+  </style>
+</head>
+<body>
+  This test checks that <code>:focus-visible</code> is <em>not</em> triggered by mouse focus on <code>&lt;input&gt;</code> elements which do not take text input, even if <code>appearance: none</code> is used.
+  <ol id="instructions">
+    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
+    <li>Click each element element below to focus it.</li>
+    <li>If the element has a red outline, then the test result is FAILURE. If the element has a green background, then the test result is SUCCESS.</li>
+  </ol>
+  <br />
+  <div>
+    <span data-tested="false" id="el-1" tabindex="1">Focus me</span>
+  </div>
+  <div>
+    <span data-tested="false" id="el-2" tabindex="-1">Focus me</span>
+  </div>
+  <div>
+    <span data-tested="false" id="el-3" tabindex="0">Focus me</span>
+  </div>
+  <div>
+    <button data-tested="false" id="el-4">Focus me</span>
+  </div>
+  <div>
+    <input data-tested="false" id="el-5" type="button" value="Focus me"></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-7" type="reset" value="Focus me."></input>
+  </div>
+  <div>
+    <input data-tested="false" id="el-8" type="submit" value="Focus me."></input>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-9" type="checkbox"></input> Focus me.</label>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-10" type="radio"></input> Focus me.</label>
+  </div>
+  <div>
+    <!-- Focusing file input triggers a modal, so only test manually -->
+    <input id="el-12" type="file" value="Focus me."></input>
+  </div>
+  <div>
+    <label><input data-tested="false" id="el-13" type="range"></input> Focus me.</label>
+  </div>
+  <div>
+    <!-- Ensure the color input is last, as it has a pop-up which obscures other elements,
+         causing the `mouseClickInTarget` method to fail and the test to hang waiting for
+         a click event.-->
+    <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
+  </div>
+  <script>
+    function mouseClickInTarget(selector) {
+       let target = document.querySelector(selector);
+       return test_driver.click(target);
+    }
+
+    async_test(function(t) {
+        document.querySelectorAll("[data-tested]").forEach((el) => {
+            el.addEventListener("click", t.step_func((e) => {
+                let el = e.target;
+                assert_equals(getComputedStyle(el).outlineStyle, "none");
+                el.dataset.tested = true;
+                if (document.querySelector("[data-tested=false]")) {
+                    mouseClickInTarget("[data-tested=false]");
+                } else {
+                    t.done();
+                }
+            }));
+        });
+
+        mouseClickInTarget("[data-tested=false]");
+    }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible - not affected by -webkit-appearance");
+  </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-004-manual.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-004-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-004-manual.html	2021-01-06 11:23:19.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-004-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>CSS Test (Selectors): :focus-visible does not match on non-texty inputs with appearance: none</title>
-  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
-  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <style>
-    :focus-visible {
-      outline: red dotted 1px; /* fallback for Edge */
-      outline: red auto 5px;
-    }
-
-    :focus:not(:focus-visible) {
-      outline: 0;
-      background-color: darkseagreen;
-    }
-  </style>
-</head>
-<body>
-  This test checks that <code>:focus-visible</code> is <em>not</em> triggered by mouse focus on <code>&lt;input&gt;</code> elements which do not take text input, even if <code>appearance: none</code> is used.
-  <ol id="instructions">
-    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
-    <li>Click each element element below to focus it.</li>
-    <li>If the element has a red outline, then the test result is FAILURE. If the element has a green background, then the test result is SUCCESS.</li>
-  </ol>
-  <br />
-  <div>
-    <span data-tested="false" id="el-1" tabindex="1">Focus me</span>
-  </div>
-  <div>
-    <span data-tested="false" id="el-2" tabindex="-1">Focus me</span>
-  </div>
-  <div>
-    <span data-tested="false" id="el-3" tabindex="0">Focus me</span>
-  </div>
-  <div>
-    <button data-tested="false" id="el-4">Focus me</span>
-  </div>
-  <div>
-    <input data-tested="false" id="el-5" type="button" value="Focus me"</input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-6" type="image" alt="Focus me."></input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-7" type="reset" value="Focus me."></input>
-  </div>
-  <div>
-    <input data-tested="false" id="el-8" type="submit" value="Focus me."></input>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-9" type="checkbox"></input> Focus me.</label>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-10" type="radio"></input> Focus me.</label>
-  </div>
-  <div>
-    <!-- Focusing file input triggers a modal, so only test manually -->
-    <input id="el-12" type="file" value="Focus me."></input>
-  </div>
-  <div>
-    <label><input data-tested="false" id="el-13" type="range"></input> Focus me.</label>
-  </div>
-  <div>
-    <!-- Ensure the color input is last, as it has a pop-up which obscures other elements,
-         causing the `mouseClickInTarget` method to fail and the test to hang waiting for
-         a click event.-->
-    <label><input data-tested="false" id="el-11" type="color"></input> Focus me.</label>
-  </div>
-  <script>
-    async_test(function(t) {
-        document.querySelectorAll("[data-tested]").forEach((el) => {
-            el.addEventListener("click", t.step_func((e) => {
-                let el = e.target;
-                assert_equals(getComputedStyle(el).outlineStyle, "none");
-                el.dataset.tested = true;
-                if (document.querySelector("[data-tested=false]")) {
-                    mouseClickInTarget("[data-tested=false]");
-                } else {
-                    t.done();
-                }
-            }));
-        });
-    }, "Mouse focus on input elements which do not show a virtual keyboard should NOT match :focus-visible - not affected by -webkit-appearance");
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-012.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-012.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-012.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-012.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <title>CSS Test (Selectors): Keyboard shortcut combinations do not trigger :focus-visible</title>
+  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
+  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <style>
+    :focus-visible {
+      outline: 0;
+      outline-color: tomato;
+      background-color: tomato;
+    }
+
+    :focus:not(:focus-visible) {
+      outline: darkgreen dotted 1px; /* fallback for Edge */
+      outline: darkgreen auto 5px;
+    }
+  </style>
+</head>
+<body>
+  This test checks that using keyboard combinations with [Ctrl], [Alt] or [Cmd]
+  do not trigger <code>:focus-visible</code> matching.
+  <ol id="instructions">
+    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
+    <li>Click the element below that says "Click me, then use a keyboard shortcut."</li>
+    <li>Press a keyboard combination including [Ctrl], [Alt] or [Cmd], such as <code>Ctrl</code> + <code>y</code></li>
+    <li>If the element has a red background, then the test result is FAILURE. If the element has a green outline, then the test result is SUCCESS.</li>
+  </ol>
+  <br>
+  <div id="el" tabindex="0">Click me, then use a keyboard shortcut.</div>
+  <script>
+        var t = async_test( "Keyboard focus should match :focus-visible");
+
+        el.addEventListener("click", t.step_func(function(e) {
+          assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)", "after focus()");
+        }), true);
+
+        el.addEventListener("keydown", t.step_func(function(e) {
+          if (e.altKey || e.ctrlKey || e.metaKey) {
+            assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)", "after kb event");
+            t.done();
+            return;
+          }
+          assert_true(false, "No modifier key");
+          t.done();
+        }));
+
+        t.step_timeout(() => {
+          assert_true(false, "timeout");
+        }, 1000);
+
+        const ctrl_key = '\uE009';
+        test_driver.click(el).then(() => {
+          return test_driver.send_keys(el, ctrl_key);
+        });
+
+  </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-012-manual.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-012-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/focus-visible-012-manual.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/focus-visible-012-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <title>CSS Test (Selectors): Keyboard shortcut combinations do not trigger :focus-visible</title>
-  <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org" />
-  <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-focus-visible-pseudo" />
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <style>
-    :focus-visible {
-      outline: 0;
-      outline-color: tomato;
-      background-color: tomato;
-    }
-
-    :focus:not(:focus-visible) {
-      outline: darkgreen dotted 1px; /* fallback for Edge */
-      outline: darkgreen auto 5px;
-    }
-  </style>
-</head>
-<body>
-  This test checks that using keyboard combinations with [Ctrl], [Alt] or [Cmd]
-  do not trigger <code>:focus-visible</code> matching.
-  <ol id="instructions">
-    <li>If the user-agent does not claim to support the <code>:focus-visible</code> pseudo-class then SKIP this test.</li>
-    <li>Click the element below that says "Click me, then use a keyboard shortcut."</li>
-    <li>Press a keyboard combination including [Ctrl], [Alt] or [Cmd], such as <code>Ctrl</code> + <code>y</code></li>
-    <li>If the element has a red background, then the test result is FAILURE. If the element has a green outline, then the test result is SUCCESS.</li>
-  </ol>
-  <br>
-  <div id="el" tabindex="0">Click me, then use a keyboard shortcut.</div>
-  <script>
-        var t = async_test( "Keyboard focus should match :focus-visible");
-
-        el.addEventListener("click", t.step_func(function(e) {
-          assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)", "after focus()");
-        }), true);
-
-        el.addEventListener("keydown", t.step_func(function(e) {
-          if (e.altKey || e.ctrlKey || e.metaKey) {
-            assert_equals(getComputedStyle(el).outlineColor, "rgb(0, 100, 0)", "after kb event");
-            t.done();
-            return;
-          }
-          assert_true(false, "No modifier key");
-          t.done();
-        }));
-
-        window.setTimeout(t.step_func_done(()=> {
-          assert_true(false, "timeout");
-        }), 1000);
-
-  </script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/hover-002.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/hover-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/hover-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/hover-002.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Selectors: Change class to enable :hover</title>
+<link rel="author" title="Rune Lillesveen" href="futhark@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/selectors/#the-hover-pseudo">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  .affected:hover { color: green }
+  #hoveredContents { display: contents }
+</style>
+<div id="hovered">Hover me - should become green</div>
+<div id="hoveredContents">
+  <div id="hovered2">Hover me - should become green</div>
+</div>
+<script>
+  function mouseMoveToTarget(selector) {
+     let target = document.querySelector(selector);
+     return new test_driver.Actions().pointerMove(0, 0, {origin: target})
+             .send();
+  }
+
+  function testElementGreen(test, element) {
+    element.addEventListener("mouseover", test.step_func(event => {
+      assert_equals(getComputedStyle(element).color, "rgb(0, 128, 0)");
+      test.done();
+    }));
+  }
+
+  // Setting the affected classes here makes the two elements go from never
+  // reacting to hover to being affected by hover without changing computed
+  // style.
+  hovered.offsetTop;
+  hovered.className = "affected";
+  hoveredContents.className = "affected";
+
+  async_test(t => { testElementGreen(t, hovered); }, "Hover #hovered element should make it go green");
+  async_test(t => { testElementGreen(t, hovered2); }, "Hover #hoveredContents child should make it go green");
+
+  mouseMoveToTarget("#hovered").then(() => {
+    mouseMoveToTarget("#hovered2");
+  });
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/hover-002-manual.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/hover-002-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/hover-002-manual.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/hover-002-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Selectors: Change class to enable :hover</title>
-<link rel="author" title="Rune Lillesveen" href="futhark@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/selectors/#the-hover-pseudo">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .affected:hover { color: green }
-  #hoveredContents { display: contents }
-</style>
-<div id="hovered">Hover me - should become green</div>
-<div id="hoveredContents">
-  <div id="hovered2">Hover me - should become green</div>
-</div>
-<script>
-  function testElementGreen(test, element) {
-    element.addEventListener("mouseover", test.step_func(event => {
-      assert_equals(getComputedStyle(element).color, "rgb(0, 128, 0)");
-      test.done();
-    }));
-  }
-
-  // Setting the affected classes here makes the two elements go from never
-  // reacting to hover to being affected by hover without changing computed
-  // style.
-  hovered.offsetTop;
-  hovered.className = "affected";
-  hoveredContents.className = "affected";
-
-  async_test(t => { testElementGreen(t, hovered); }, "Hover #hovered element should make it go green");
-  async_test(t => { testElementGreen(t, hovered2); }, "Hover #hoveredContents child should make it go green");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/parsing/parse-not.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/parsing/parse-not.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/parsing/parse-not.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/parsing/parse-not.html	2021-01-18 19:58:23.000000000 +0000
@@ -24,6 +24,8 @@
   test_valid_selector(':not(:host(.a))');
   test_valid_selector(':host(:not(.a))');
   test_valid_selector(':not(:host(:not(.a)))');
+  test_valid_selector(':not([disabled][selected])', ':not([disabled][selected])');
+  test_valid_selector(':not([disabled],[selected])', ':not([disabled], [selected])');
 
   test_invalid_selector(':not()');
   test_invalid_selector(':not(:not())');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-auto.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-auto.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-auto.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-auto.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,93 @@
+<!doctype html>
+<html>
+<head>
+  <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <style>
+    #div4_1 {
+      direction: rtl;
+    }
+  </style>
+</head>
+
+<!-- &#1514; is the Hebrew letter tav, i.e. RTL -->
+<body>
+  <div id=testDivs>
+    <div id=div1 dir=auto>
+      <div id=div1_1>a</div>
+    </div>
+    <div id=div2 dir=auto>
+      <div id=div2_1>&#1514;</div>
+    </div>
+    <div id=div3 dir=auto>
+      <div id=div3_1 dir=rtl>&#1514;</div>
+      <div id=div3_2>a</div>
+    </div>
+    <div id=div4 dir=auto>
+      <div id=div4_1>
+        <div id=div4_1_1>a</div>
+      </div>
+    </div>
+  </div>
+</body>
+
+<script>
+function test_directionality(message, element, expected) {
+  test(() => {
+    var isLTR = document.querySelector("#" + element.id + ":dir(ltr)") == element;
+    var isRTL = document.querySelector("#" + element.id + ":dir(rtl)") == element;
+    if (expected == "ltr") {
+      assert_true(isLTR);
+      assert_false(isRTL);
+    } else {
+      assert_false(isLTR);
+      assert_true(isRTL);
+    }
+  }, message + " directionality of element " + element.id + " is " + expected);
+}
+
+test_directionality("Initial ", div1, "ltr");
+test_directionality("Initial ", div1_1, "ltr");
+test_directionality("Initial ", div2, "rtl");
+test_directionality("Initial ", div2_1, "rtl");
+test_directionality("Initial ", div3, "ltr");
+test_directionality("Initial ", div3_1, "rtl");
+test_directionality("Initial ", div3_2, "ltr");
+test_directionality("Initial ", div4, "ltr");
+test_directionality("Initial ", div4_1, "ltr");
+test_directionality("Initial ", div4_1_1, "ltr");
+
+div1_1.innerText = "\u05EA";
+div1_1.offsetTop;
+test_directionality("Updated ", div1, "rtl");
+test_directionality("Updated ", div1_1, "rtl");
+
+div1_1.dir = "ltr";
+div1_1.offsetTop;
+test_directionality("Updated ", div1, "ltr");
+test_directionality("Updated ", div1_1, "ltr");
+
+div1_1.innerText = "a";
+div1_1.offsetTop;
+test_directionality("Reupdated ", div1, "ltr");
+test_directionality("Reupdated ", div1_1, "ltr");
+
+div2_1.remove();
+div2.offsetTop;
+test_directionality("Updated ", div2, "ltr");
+
+div3_1.dir = "";
+div3_1.offsetTop;
+test_directionality("Updated ", div3, "rtl");
+div3.appendChild(div3_1);
+div3.offsetTop;
+test_directionality("Updated ", div3, "ltr");
+
+div4_1_1.innerText = "\u05EA";
+div4_1_1.offsetTop;
+test_directionality("Updated ", div4, "rtl");
+test_directionality("Updated ", div4_1, "rtl");
+test_directionality("Updated ", div4_1_1, "rtl");
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir matching on dir attribute change from default(ltr) to rtl</title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="selectors-dir-selector-change-001-ref.html">
+    <style type="text/css">
+        #x:dir(rtl) + span { background-color: lime }
+        #outer { direction:ltr }
+    </style>
+</head>
+<body>
+    <div id="outer" style="-webkit-locale: 'en'">
+        <div>
+            <div id="x"></div>
+            <span>The background color should be lime</span>
+        </div>
+    </div>
+    <script>
+        outer.offsetTop;
+        outer.setAttribute("dir", "rtl");
+    </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001-ref.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-001-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text/css">
+        span { background-color: lime }
+    </style>
+</head>
+<body>
+    <div>
+        <div>
+          <div></div>
+          <span>The background color should be lime</span>
+        </div>
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-002.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-002.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir matching on dir attribute change from default(ltr) to rtl</title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+    <style type="text/css">
+       div {
+           width: 100px;
+           height: 100px;
+           background-color: red;
+       }
+
+       div:dir(rtl) {
+           background-color: green;
+       }
+    </style>
+</head>
+<body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+    <div id="inner"></div>
+    <script>
+        inner.offsetTop;
+        inner.setAttribute("dir", "rtl");
+    </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir matching on dir attribute change from rtl to auto</title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="selectors-dir-selector-change-003-ref.html">
+    <style type="text/css">
+        #x:dir(ltr) + span { background-color: lime }
+    </style>
+</head>
+<body>
+    <div id="outer" dir="rtl">
+        <div>
+            <div id="x"></div>
+            <span>The background color should be lime</span>
+        </div>
+    </div>
+    <script>
+        outer.offsetTop;
+        outer.setAttribute("dir", "auto");
+    </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003-ref.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-003-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text/css">
+        span { background-color: lime }
+    </style>
+</head>
+<body>
+    <div>
+        <div>
+          <div></div>
+          <span>The background color should be lime</span>
+        </div>
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: Check for correctly updating :dir matching on directionality change from ltr to rtl</title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="selectors-dir-selector-change-004-ref.html">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+        #x:dir(rtl) + span { background-color: lime }
+    </style>
+</head>
+<body>
+    <div dir="auto">
+        <div>
+            <div id="x"></div>
+            <span id="inner">The background color should be lime</span>
+        </div>
+    </div>
+    <script>
+        inner.offsetTop;
+        inner.innerHTML = "מקור הש� עברית";
+    </script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004-ref.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-change-004-ref.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style type="text/css">
+        span { background-color: lime }
+    </style>
+</head>
+<body>
+    <div>
+        <div dir="rtl">
+          <div></div>
+          <span>מקור הש� עברית</span>
+        </div>
+    </div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-002.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-002.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: exception handling for an invalid identifier of dir()</title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+    <meta name="flags" content="">
+    <meta name="assert" content="The invalid identifier of :dir(ltrr) pseudo-class doesn't match an element that has a directionality of (ltr). Even if the div element has dir=ltr, the selector should not match.">
+    <style type="text/css">
+       div {
+           width: 100px;
+           height: 100px;
+           background-color: green;
+       }
+
+       div:dir(ltrr) {
+           background-color: red;
+       }
+    </style>
+</head>
+<body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+    <div dir="ltr"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-003.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-003.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-003.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-ltr-003.html	2021-01-18 19:58:22.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: exception handling for multiple identifiers of dir() </title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+    <meta name="flags" content="">
+    <meta name="assert" content="The multiple identifiers of :dir(ltr, rtl) pseudo-class don't match an element that has a directionality of (ltr). Even if the div element has dir=ltr, the selector should not match.">
+    <style type="text/css">
+       div {
+           width: 100px;
+           height: 100px;
+           background-color: green;
+       }
+
+       div:dir(ltr, rtl) {
+           background-color: red;
+       }
+    </style>
+</head>
+<body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+    <div dir="ltr"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-querySelector.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-querySelector.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-querySelector.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-querySelector.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,71 @@
+<!doctype html>
+<html>
+<head>
+  <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <div id=outer>
+    <div id=div1></div>
+    <div id=div2 dir=ltr>
+      <div id=div2_1></div>
+      <div id=div2_2 dir=ltr></div>
+      <div id=div2_3 dir=rtl></div>
+    </div>
+    <div id=div3 dir=rtl>
+      <div id=div3_1>
+        <div id=div3_1_1></div>
+      </div>
+      <div id=div3_2 dir=ltr></div>
+      <div id=div3_3 dir=rtl></div>
+    </div>
+    <div id=div4 dir=lol></div>
+    <div id=div5 dir=auto></div>
+  </div>
+</body>
+
+<script>
+test(() => {
+  assert_equals(document.querySelector(":dir(lol)"), null);
+  assert_equals(document.querySelector(":dir(lol )"), null);
+  assert_equals(document.querySelector(":dir( auto)"), null);
+  assert_equals(document.querySelector(":dir(\nauto\t)"), null);
+}, ":dir() allows any ident value but strings other than ltr/rtl don't match");
+
+test(() => {
+  assert_throws_dom("SYNTAX_ERR", () => { document.querySelector(":dir()"); });
+  assert_throws_dom("SYNTAX_ERR", () => { document.querySelector(":dir(ltr, rtl)"); });
+  assert_throws_dom("SYNTAX_ERR", () => { document.querySelector(":dir('ltr')"); });
+}, ":dir() requires exactly an ident argument");
+
+test(() => {
+  assert_equals(document.querySelector(":dir(rtl)"), div2_3);
+  assert_equals(document.querySelector("*:dir(rtl)"), div2_3);
+  assert_equals(document.querySelector("div:dir(ltr)"), outer);
+  assert_equals(document.querySelector("div:dir(ltr):dir(ltr)"), outer);
+  assert_equals(document.querySelector(":dir(rtl)#div3_3"), div3_3);
+  assert_equals(document.querySelector(":nth-child(2):dir(rtl)"), null);
+  assert_equals(document.querySelector(":nth-child(3):dir(rtl)"), div2_3);
+  assert_equals(document.querySelector(":nth-child(4):dir(ltr)"), div4);
+  assert_equals(document.querySelector(":nth-last-child(3):dir(rtl)"), div3);
+}, ":dir() works in compound selectors");
+
+test(() => {
+  assert_equals(document.querySelector("#div2 :dir(ltr)"), div2_1);
+  assert_equals(document.querySelector(":dir(rtl) div"), div3_1);
+  assert_equals(document.querySelector("div + :dir(ltr)"), div2);
+  assert_equals(document.querySelector(":dir(ltr) + :dir(rtl)"), div2_3);
+  assert_equals(document.querySelector(":dir(rtl) :dir(rtl)"), div3_1);
+  assert_equals(document.querySelector(":dir(rtl) + :dir(ltr)"), div3_2);
+  assert_equals(document.querySelector(":dir(rtl) ~ :dir(rtl)"), div3_3);
+  assert_equals(document.querySelector(":dir(rtl) :dir(ltr)"), div3_2);
+  assert_equals(document.querySelector("* :dir(rtl) *"), div3_1);
+  assert_equals(document.querySelector("div :dir(rtl) div"), div3_1);
+  assert_equals(document.querySelector(":dir(ltr) :dir(rtl) + :dir(ltr)"), div3_2);
+  assert_equals(document.querySelector(":dir(ltr) + :dir(rtl) + * + *"), div5);
+  assert_equals(document.querySelector(":dir(rtl) > * > :dir(rtl)"), div3_1_1);
+}, ":dir() works in complex selectors");
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Selectors Level 4 Test: Verify for an identifier with leading and tailing whitespace of dir() </title>
+    <link rel="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
+    <link rel="help" href="http://www.w3.org/TR/selectors4/#dir-pseudo">
+    <link rel="match" href="selectors-dir-selector-white-space-001-ref.html">
+    <meta name="assert" content="The :dir(ltr) pseudo-class matches an element that has a directionality of (ltr). Since the div element has dir=ltr, the selector matches.">
+    <style type="text/css">
+       div {
+           width: 100px;
+           height: 100px;
+           background-color: red;
+       }
+
+       #a:dir( ltr) { background-color: green; }
+       #b:dir(ltr ) { background-color: green; }
+       #c:dir( ltr ) { background-color: green; }
+    </style>
+</head>
+<body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+    <div id="a" dir="ltr"></div>
+    <div id="b" dir="ltr"></div>
+    <div id="c" dir="ltr"></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001-ref.html firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/selectors/selectors-dir-selector-white-space-001-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style type="text/css">
+       div {
+           width: 100px;
+           height: 100px;
+           background-color: green;
+       }
+    </style>
+</head>
+<body>
+    <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+    <div></div>
+    <div></div>
+    <div></div>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1.html firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<title>CSS Test: breaking of column rule</title>
-<meta charset="utf-8">
-<link rel="author" title="L. David Baron" href="https://dbaron.org/">
-<link rel="help" href="https://drafts.csswg.org/css-multicol/#column-gaps-and-rules">
-<link rel="match" href="broken-column-rule-1-ref.html">
-<style>
-
-.outer {
-  height: 100px;
-  column-fill: auto;
-  width: 550px;
-  column-count: 4;
-  column-gap: 50px;
-  /* leaves 100px for each column */
-}
-
-.inner {
-  column-count: 2;
-  column-rule: 2px solid blue;
-  height: 250px;
-}
-
-.fill {
-  height: 500px; /* work around https://bugzilla.mozilla.org/show_bug.cgi?id=1374479#c4 */
-}
-
-</style>
-
-<div class="outer">
-  <div class="inner">
-    <div class="fill"></div>
-  </div>
-</div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1-ref.html firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1-ref.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/broken-column-rule-1-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML>
-<title>CSS Test Reference: breaking of column rule</title>
-<meta charset="utf-8">
-<link rel="author" title="L. David Baron" href="https://dbaron.org/">
-<style>
-
-.ref1, .ref2 {
-  display: inline-block;
-  vertical-align: top;
-
-  border: 2px solid blue;
-  border-top: none;
-  border-bottom: none;
-}
-
-.ref1 {
-  margin-left:49px;
-  height: 100px;
-  width: 148px;
-}
-
-.ref2 {
-  margin-left: 148px;
-  height: 50px;
-  width: 10px;
-
-  border-right: none;
-}
-
-</style>
-<span class="ref1"></span><span class="ref2"></span>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML>
-<html><head>
-  <title>CSS Test: Balancing Overflow, page-break-inside:avoid</title>
-  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
-  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-multicol3-column-balancing-break-inside-avoid-1-ref.html">
-  <meta name="flags" content="paged">
-  <meta charset="utf-8">
-  <style type="text/css">
-@page { size:5in 3in; margin:0.5in; }
-
-        html,body {
-            color:black; background-color:white; font-size:16px; padding:0; margin:0;
-        }
-
-  .colset {
-    column-count: 3;
-    column-gap: 0;
-    border: solid silver;
-    width: 9em;
-  }
-  p { margin: 0; page-break-inside:avoid; }
-  .short { height: 5px; page-break-inside:avoid; }
-  .short p { page-break-inside:auto; }
-
-    </style>
-</head>
-<body>
-
-<div class="colset">
-<p>one</p>
-<p>two three</p>
-<p>four five</p>
-</div>
-
-<div class="colset">
-  <p>one two three four five</p>
-</div>
-
-<div class="colset">
-<p>one two</p>
-<p>three four five</p>
-</div>
-
-<div class="colset">
-  <div class="short"><p>one two three four five</p></div>
-</div>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1-ref.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<html><head>
-  <title>CSS Test: Balancing Overflow, page-break-inside:avoid</title>
-  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
-  <meta name="flags" content="paged">
-  <meta charset="utf-8">
-  <style type="text/css">
-@page { size:5in 3in; margin:0.5in; }
-
-        html,body {
-            color:black; background-color:white; font-size:16px; padding:0; margin:0;
-        }
-
-  .colset {
-    column-count: 3;
-    column-gap: 0;
-    border: solid silver;
-    width: 9em;
-  }
-  p { margin: 0; }
-  .short { height: 5px; }
-  .short p { }
-
-    </style>
-</head>
-<body>
-
-<div class="colset">
-<p>one<br>&nbsp;&nbsp;&nbsp;&nbsp;</p>
-<p>two three</p>
-<p>four five</p>
-</div>
-
-<div class="colset">
-  <p>one two three four five</p>
-</div>
-
-<div class="colset">
-one two three four five
-</div>
-
-<div class="colset">
-  <div class="short"><p>one two three four five</p></div>
-</div>
-
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print-ref.xht firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print-ref.xht
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print-ref.xht	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print-ref.xht	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Reftest Reference</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
-  <style type="text/css"><![CDATA[
-    html, body { height: 100%; }
-    * { margin: 0; }
-    div {
-      border: double blue 12px;
-      height: 150%;
-      padding: 0 12px;
-    }
-    div > p {
-      border-right: solid orange 12px;
-      border-left: solid orange 12px;
-      width: 50%;
-      margin: 0 auto;
-      height: 100%;
-    }
-    blockquote {
-      border: solid thick yellow;
-    }  ]]></style>
- </head>
- <body>
-  <p>Test passes if even when printed:</p>
-  <ul>
-    <li>Two vertical orange stripes stretch exactly
-    from the inner top edge to the inner bottom edge of the blue box below.</li>
-    <li>There is a yellow stripe immediately below the blue box.</li>
-  </ul>
-  <div>
-    <p></p>
-  </div>
-  <blockquote></blockquote>
- </body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/multicol-height-002-print.xht	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Test: Percentage Computed Height on Multicol Child (Definite Multicol Height)</title>
-  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact" />
-  <link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-multi-column-model" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#the-height-property"/>
-  <meta name="flags" content="" />
-  <meta name="assert" content="Percentage heights with a multi-column element are relative to the computed height of the multicolumn box, and this works even when the multi-column element is paginated." />
-  <link rel="match" href="multicol-height-002-print-ref.xht" />
-  <style type="text/css"><![CDATA[
-    html, body { height: 100%; }
-    * { margin: 0; }
-    div {
-      border: double blue 12px;
-      column-count:2;
-      column-gap:0;
-      column-fill: balance;
-      height: 150%;
-    }
-    div > p {
-      border-right: solid orange 12px;
-      width: 0;
-      margin: 0 auto;
-      height: 200%;
-    }
-    blockquote {
-      border: solid thick yellow;
-    }
-  ]]></style>
- </head>
- <body>
-  <p>Test passes if even when printed:</p>
-  <ul>
-    <li>Two vertical orange stripes stretch exactly
-    from the inner top edge to the inner bottom edge of the blue box below.</li>
-    <li>There is a yellow stripe immediately below the blue box.</li>
-  </ul>
-  <div>
-    <p></p>
-  </div>
-  <blockquote></blockquote>
- </body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/reftest.list	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-== broken-column-rule-1.html broken-column-rule-1-ref.html
-== moz-multicol3-column-balancing-break-inside-avoid-1.html moz-multicol3-column-balancing-break-inside-avoid-1-ref.html
-== multicol-height-002.xht reference/multicol-height-002.xht
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
--- firefox-84.0.2+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list	2021-01-18 19:58:23.000000000 +0000
@@ -49,9 +49,6 @@
 # Masking Level 1
 include masking/reftest.list
 
-# Multi-column Layout 3
-include multicol3/reftest.list
-
 # Ruby Layout Module
 include ruby/reftest.list
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/docs/conf.py firefox-85.0+build1/testing/web-platform/tests/docs/conf.py
--- firefox-84.0.2+build1/testing/web-platform/tests/docs/conf.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/docs/conf.py	2021-01-18 19:58:23.000000000 +0000
@@ -78,6 +78,7 @@
     ('py:exc', 'BadOperationException'),
     ('py:exc', 'Exception'),
     ('py:exc', 'ValueError'),
+    ('py:class', 'http.client.HTTPMessage')
 ]
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -211,5 +212,5 @@
 # A list of files that should not be packed into the epub file.
 epub_exclude_files = ['search.html']
 
-intersphinx_mapping = {'python': ('https://docs.python.org/2/', None),
+intersphinx_mapping = {'python': ('https://docs.python.org/3/', None),
                        'mozilla': ('https://firefox-source-docs.mozilla.org/', None)}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/docs/requirements.txt firefox-85.0+build1/testing/web-platform/tests/docs/requirements.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/docs/requirements.txt	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/docs/requirements.txt	2021-01-18 19:58:23.000000000 +0000
@@ -1,4 +1,4 @@
 recommonmark==0.6.0
-# pin this to the last Py2 release
-Sphinx==1.8.5  # pyup: <2.0
+# Pin this to the same major version as https://docs.python.org/3/
+Sphinx==2.4.4  # pyup: <3.0
 sphinx-argparse==0.2.5
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/docs/reviewing-tests/checklist.md firefox-85.0+build1/testing/web-platform/tests/docs/reviewing-tests/checklist.md
--- firefox-84.0.2+build1/testing/web-platform/tests/docs/reviewing-tests/checklist.md	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/docs/reviewing-tests/checklist.md	2021-01-18 19:58:23.000000000 +0000
@@ -5,7 +5,7 @@
 documentation it should be ignored
 (please [file a bug](https://github.com/web-platform-tests/wpt/issues/new)!).
 
-As noted on the [reviewing tests](index) page, nits need not block PRs
+As noted on the [reviewing tests](./index.md) page, nits need not block PRs
 from landing.
 
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/docs/wpt_lint_rules.py firefox-85.0+build1/testing/web-platform/tests/docs/wpt_lint_rules.py
--- firefox-84.0.2+build1/testing/web-platform/tests/docs/wpt_lint_rules.py	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/docs/wpt_lint_rules.py	2021-01-18 19:58:23.000000000 +0000
@@ -3,6 +3,7 @@
 from recommonmark.parser import CommonMarkParser
 import importlib
 import textwrap
+from six import iteritems
 
 class WPTLintRules(Directive):
     """A docutils directive to generate documentation for the
@@ -31,7 +32,7 @@
                 """wpt-lint-rules: unable to resolve the module at "{}".""".format(self.module_specifier)
             )
 
-        for binding_name, value in module.__dict__.iteritems():
+        for binding_name, value in iteritems(module.__dict__):
             if hasattr(value, "__abstractmethods__") and len(value.__abstractmethods__):
                 continue
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/docs/writing-tests/python-handlers/index.md firefox-85.0+build1/testing/web-platform/tests/docs/writing-tests/python-handlers/index.md
--- firefox-84.0.2+build1/testing/web-platform/tests/docs/writing-tests/python-handlers/index.md	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/docs/writing-tests/python-handlers/index.md	2021-01-18 19:58:23.000000000 +0000
@@ -43,6 +43,44 @@
    /tools/wptserve/docs/stash
 ```
 
+### Importing local helper scripts
+
+Python file handlers may import local helper scripts, e.g. to share logic
+across multiple handlers. To avoid module name collision, however, imports must
+be relative to the root of WPT. For example, in an imaginary
+`cookies/resources/myhandler.py`:
+
+```python
+# DON'T DO THIS
+import myhelper
+
+# DO THIS
+from cookies.resources import myhelper
+```
+
+Only absolute imports are allowed; do not use relative imports. If the path to
+your helper script includes a hyphen (`-`), you can use `import_module` from
+`importlib` to import it. For example:
+
+```python
+import importlib
+myhelper = importlib.import_module('common.security-features.myhelper')
+```
+
+**Note on __init__ files**: Until WPT moves to Python 3 only (~Q1 2021),
+importing helper scripts like this requires a 'path' of empty `__init__.py`
+files in every directory down to the helper. For example, if your helper is
+`css/css-align/resources/myhelper.py`, you need to have:
+
+```
+css/__init__.py
+css/css-align/__init__.py
+css/css-align/resources/__init__.py
+```
+
+This requirement will be removed once we move to Python 3, due to
+[PEP 420](https://www.python.org/dev/peps/pep-0420/).
+
 ### Python3 compatibility
 
 Even though Python3 is not fully supported at this point, some work is being
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/dom/abort/addEventListenerAbortController.tentative.html firefox-85.0+build1/testing/web-platform/tests/dom/abort/addEventListenerAbortController.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/dom/abort/addEventListenerAbortController.tentative.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/dom/abort/addEventListenerAbortController.tentative.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-
-<!-- This behavior has not been specified yet. See https://github.com/whatwg/dom/issues/911 -->
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<body>
-
-<script>
-test(t => {
-  const target = new EventTarget();
-  const controller = new AbortController();
-
-  target.addEventListener('testevent', t.step_func(() => {
-    assert_unreached('testevent should have been canceled by AbortController');
-  }), {signal: controller.signal});
-
-  controller.abort();
-  target.dispatchEvent(new Event('testevent'));
-}, 'Tests support for EventController to cancel event listeners in addEventListener.');
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/dom/events/AddEventListenerOptions-signal.any.js firefox-85.0+build1/testing/web-platform/tests/dom/events/AddEventListenerOptions-signal.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/dom/events/AddEventListenerOptions-signal.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/dom/events/AddEventListenerOptions-signal.any.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,133 @@
+'use strict';
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 1, "Adding a signal still adds a listener");
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "The listener was not added with the once flag");
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "Aborting on the controller removes the listener");
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 2, "Passing an aborted signal never adds the handler");
+}, "Passing an AbortSignal to addEventListener options should allow removing a listener");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.removeEventListener('test', handler);
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener does not prevent removeEventListener");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, once: true });
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener works with the once flag");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, once: true });
+  et.removeEventListener('test', handler);
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Removing a once listener works with a passed signal");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('first', handler, { signal: controller.signal, once: true });
+  et.addEventListener('second', handler, { signal: controller.signal, once: true });
+  controller.abort();
+  et.dispatchEvent(new Event('first'));
+  et.dispatchEvent(new Event('second'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to multiple listeners");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', handler, { signal: controller.signal, capture: true });
+  controller.abort();
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Passing an AbortSignal to addEventListener works with the capture flag");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', () => {
+    controller.abort();
+  }, { signal: controller.signal });
+  et.addEventListener('test', handler, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Aborting from a listener does not call future listeners");
+
+test(function() {
+  let count = 0;
+  function handler() {
+    count++;
+  }
+  const et = new EventTarget();
+  const controller = new AbortController();
+  et.addEventListener('test', () => {
+    et.addEventListener('test', handler, { signal: controller.signal });
+    controller.abort();
+  }, { signal: controller.signal });
+  et.dispatchEvent(new Event('test'));
+  assert_equals(count, 0, "The listener was still removed");
+}, "Adding then aborting a listener in another listener does not call it");
+
+test(function() {
+  const et = new EventTarget();
+  const ac = new AbortController();
+  let count = 0;
+  et.addEventListener('foo', () => {
+    et.addEventListener('foo', () => {
+      count++;
+      if (count > 5) ac.abort();
+      et.dispatchEvent(new Event('foo'));
+    }, { signal: ac.signal });
+    et.dispatchEvent(new Event('foo'));
+  }, { once: true });
+  et.dispatchEvent(new Event('foo'));
+}, "Aborting from a nested listener should remove it");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/domxpath/xml_xpath_runner.html firefox-85.0+build1/testing/web-platform/tests/domxpath/xml_xpath_runner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/domxpath/xml_xpath_runner.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/domxpath/xml_xpath_runner.html	2021-01-18 19:58:23.000000000 +0000
@@ -1,5 +1,6 @@
 <!doctype html>
 <title>XPath tests</title>
+<meta name="timeout" content="long">
 <script src='/resources/testharness.js'></script>
 <script src='/resources/testharnessreport.js'></script>
 <script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html firefox-85.0+build1/testing/web-platform/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/editing/other/white-spaces-after-execCommand-delete.tentative.html	2021-01-18 19:58:23.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
 <head>
 <meta charset=utf-8>
+<meta name="timeout" content="long">
 <title>Testing normalizing white-space sequence after execCommand("delete", false, "")</title>
 <script src=../include/implementation.js></script>
 <script>var testsJsLibraryOnly = true</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/element-timing/resources/progressive-image.py firefox-85.0+build1/testing/web-platform/tests/element-timing/resources/progressive-image.py
--- firefox-84.0.2+build1/testing/web-platform/tests/element-timing/resources/progressive-image.py	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/element-timing/resources/progressive-image.py	2021-01-18 19:58:23.000000000 +0000
@@ -19,7 +19,6 @@
     # Read from the beginning, |numInitial| bytes.
     first = body[:numInitial]
     response.writer.write_content(first)
-    response.writer.flush()
 
     time.sleep(sleepTime)
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/encoding-detection/en-euro-windows-1252.tentative.html firefox-85.0+build1/testing/web-platform/tests/encoding-detection/en-euro-windows-1252.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/encoding-detection/en-euro-windows-1252.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/encoding-detection/en-euro-windows-1252.tentative.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,14 @@
+<!doctype html>
+<title>en windows-1252 euro sign</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<p>It costs €9.</p>
+<script>
+setup({explicit_done:true});
+onload = function() {
+    test(function() {
+        assert_equals(document.characterSet, "windows-1252", 'Expected windows-1252');
+    }, "Check detection result");
+      done();
+};
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/eventsource/resources/message2.py firefox-85.0+build1/testing/web-platform/tests/eventsource/resources/message2.py
--- firefox-84.0.2+build1/testing/web-platform/tests/eventsource/resources/message2.py	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/eventsource/resources/message2.py	2021-01-18 19:58:23.000000000 +0000
@@ -4,7 +4,6 @@
     response.headers.set(b'Content-Type', b'text/event-stream')
     response.headers.set(b'Cache-Control', b'no-cache')
 
-    response.explicit_flush = True
     response.write_status_headers()
 
     while True:
@@ -31,5 +30,4 @@
         response.writer.write(u"data:end")
         response.writer.write(u"\n\n")
 
-        response.writer.flush()
         time.sleep(2)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/api/cors/cors-preflight-referrer.any.js firefox-85.0+build1/testing/web-platform/tests/fetch/api/cors/cors-preflight-referrer.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/api/cors/cors-preflight-referrer.any.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/api/cors/cors-preflight-referrer.any.js	2021-01-18 19:58:23.000000000 +0000
@@ -35,8 +35,11 @@
 corsPreflightReferrer("Referrer policy: no-referrer", corsUrl, "no-referrer", undefined, "");
 corsPreflightReferrer("Referrer policy: no-referrer", corsUrl, "no-referrer", "myreferrer", "");
 
-corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", undefined, location.toString())
-corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", "myreferrer", new URL("myreferrer", location).toString());
+corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", undefined, origin);
+corsPreflightReferrer("Referrer policy: \"\"", corsUrl, "", "myreferrer", origin);
+
+corsPreflightReferrer("Referrer policy: no-referrer-when-downgrade", corsUrl, "no-referrer-when-downgrade", undefined, location.toString())
+corsPreflightReferrer("Referrer policy: no-referrer-when-downgrade", corsUrl, "no-referrer-when-downgrade", "myreferrer", new URL("myreferrer", location).toString());
 
 corsPreflightReferrer("Referrer policy: origin", corsUrl, "origin", undefined, origin);
 corsPreflightReferrer("Referrer policy: origin", corsUrl, "origin", "myreferrer", origin);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/non-secure-context.window.js firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/non-secure-context.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/non-secure-context.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/non-secure-context.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,31 @@
+// META: script=resources/support.js
+//
+// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+//
+// This file covers only those tests that must execute in a non secure context.
+// Other tests are defined in: secure-context.window.js
+
+setup(() => {
+  // Making sure we are in a non secure context, as expected.
+  assert_false(window.isSecureContext);
+});
+
+promise_test(async t => {
+  return fetch("/common/blank.html")
+      .catch(reason => {unreached_func(reason)});
+}, "Local non secure page fetches local page.");
+
+// For the following tests, we go through an iframe, because it is not possible
+// to directly import the test harness from a secured public page.
+promise_test(async t => {
+  let iframe = await appendIframe(t, document,
+      "resources/treat-as-public-address.html");
+  let reply = futureMessage();
+  iframe.contentWindow.postMessage("/common/blank.html", "*");
+  assert_equals(await reply, "failure");
+}, "Public non secure page fetches local page.");
+
+// TODO(https://github.com/web-platform-tests/wpt/issues/26166):
+// Add tests for public variations when we are able to fetch resources using a
+// mechanism compatible with WPT guidelines regarding being self-contained.
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/support.js firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/support.js
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/support.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/support.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,34 @@
+// Creates a new iframe in |doc|, calls |func| on it and appends it as a child
+// of |doc|.
+// Returns a promise that resolves to the iframe once loaded (successfully or
+// not).
+// The iframe is removed from |doc| once test |t| is done running.
+//
+// NOTE: Because iframe elements always invoke the onload event handler, even
+// in case of error, we cannot wire onerror to a promise rejection. The Promise
+// constructor requires users to resolve XOR reject the promise.
+function appendIframeWith(t, doc, func) {
+  return new Promise(resolve => {
+      const child = doc.createElement("iframe");
+      func(child);
+      child.onload = () => { resolve(child); };
+      doc.body.appendChild(child);
+      t.add_cleanup(() => { doc.body.removeChild(child); });
+    });
+}
+
+// Appends a child iframe to |doc| sourced from |src|.
+//
+// See append_child_frame_with() for more details.
+function appendIframe(t, doc, src) {
+  return appendIframeWith(t, doc, child => { child.src = src; });
+}
+
+// Register an event listener that will resolve this promise when this
+// window receives a message posted to it.
+function futureMessage() {
+  return new Promise(resolve => {
+      window.addEventListener("message", e => resolve(e.data));
+  });
+};
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,8 @@
+<script>
+  window.addEventListener("message", function (event) {
+    fetch(event.data)
+        .then(response => {parent.postMessage("success", "*")})
+        .catch(error => {parent.postMessage("failure", "*")});
+  });
+</script>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: treat-as-public-address;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,8 @@
+<script>
+  window.addEventListener("message", function (event) {
+    fetch(event.data)
+        .then(response => {parent.postMessage("success", "*")})
+        .catch(error => {parent.postMessage("failure", "*")});
+  });
+</script>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: treat-as-public-address;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/secure-context.https.window.js firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/secure-context.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/cors-rfc1918/secure-context.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/cors-rfc1918/secure-context.https.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,31 @@
+// META: script=resources/support.js
+//
+// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+//
+// This file covers only those tests that must execute in a secure context.
+// Other tests are defined in: non-secure-context.window.js
+
+setup(() => {
+  // Making sure we are in a secure context, as expected.
+  assert_true(window.isSecureContext);
+});
+
+promise_test(async t => {
+  return fetch("/common/blank.html")
+      .catch(reason => {unreached_func(reason)});
+}, "Local secure page fetches local page.");
+
+// For the following tests, we go through an iframe, because it is not possible
+// to directly import the test harness from a secured public page.
+promise_test(async t => {
+  let iframe = await appendIframe(t, document,
+      "resources/treat-as-public-address.https.html");
+  let reply = futureMessage();
+  iframe.contentWindow.postMessage("/common/blank.html", "*");
+  assert_equals(await reply, "success");
+}, "Public secure page fetches local page.");
+
+// TODO(https://github.com/web-platform-tests/wpt/issues/26166):
+// Add tests for public variations when we are able to fetch resources using a
+// mechanism compatible with WPT guidelines regarding being self-contained.
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/metadata/history.https.sub.html firefox-85.0+build1/testing/web-platform/tests/fetch/metadata/history.https.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/metadata/history.https.sub.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/metadata/history.https.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -9,8 +9,8 @@
 /// headers) are used in navigations triggered by |history.back()|.
 function add_test(description, report_host, go_back_host, expectations) {
   async_test(t => {
-    // STEP1: Navigate a new window to report_host/post-to-owner.py
-    const url_suffix = '/fetch/metadata/resources/post-to-owner.py';
+    // STEP1: Navigate a new window to report_host/post-to-owner-onload.py
+    const url_suffix = '/fetch/metadata/resources/post-to-owner-onload.py';
     const url = `https://${report_host}${url_suffix}`;
     const w = window.open(url, '_blank');
 
@@ -24,15 +24,10 @@
         // headers are used here and in STEP5).
         assert_header_equals(e.data, expectations, description + " 1");
 
-        // STEP3: Go to go_back_host/go-back.html (postponing this via
-        // step_timeout ensures that go-back.html will get a separate
-        // history entry - otherwise it might be treated as a client-side
-        // redirect and we might end up with nowhere to go back to).
-        t.step_timeout(() => {
-          const url_suffix = '/fetch/metadata/resources/go-back.html';
-          const url = `https://${go_back_host}${url_suffix}`;
-          w.location = url;
-        });
+        // STEP3: Go to go_back_host/go-back.html
+        const url_suffix = '/fetch/metadata/resources/go-back.html';
+        const url = `https://${go_back_host}${url_suffix}`;
+        w.location = url;
 
         // STEP4 (elsewhere - inside go-back.html): Call history.back().
       } else if (msg_counter == 2) {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/fetch/metadata/resources/post-to-owner-onload.py firefox-85.0+build1/testing/web-platform/tests/fetch/metadata/resources/post-to-owner-onload.py
--- firefox-84.0.2+build1/testing/web-platform/tests/fetch/metadata/resources/post-to-owner-onload.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/fetch/metadata/resources/post-to-owner-onload.py	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,34 @@
+import json
+
+from wptserve.utils import isomorphic_decode
+
+def main(request, response):
+    headers = [
+        (b"Content-Type", b"text/html"),
+        (b"Cache-Control", b"no-cache, no-store, must-revalidate")
+    ]
+    key = request.GET.first(b"key", None)
+
+    body = u"""
+        <!DOCTYPE html>
+        <script src="/portals/resources/stash-utils.sub.js"></script>
+        <script>
+          window.onload = function() {
+            var data = %s;
+            if (window.opener)
+                window.opener.postMessage(data, "*");
+            if (window.top != window)
+                window.top.postMessage(data, "*");
+
+            const key = %s;
+            if (key)
+                StashUtils.putValue(key, data);
+          }
+        </script>
+    """ % (json.dumps({
+        u"dest": isomorphic_decode(request.headers.get(b"sec-fetch-dest", b"")),
+        u"mode": isomorphic_decode(request.headers.get(b"sec-fetch-mode", b"")),
+        u"site": isomorphic_decode(request.headers.get(b"sec-fetch-site", b"")),
+        u"user": isomorphic_decode(request.headers.get(b"sec-fetch-user", b"")),
+        }), json.dumps(key))
+    return headers, body
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/blob/Blob-stream.any.js firefox-85.0+build1/testing/web-platform/tests/FileAPI/blob/Blob-stream.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/blob/Blob-stream.any.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/blob/Blob-stream.any.js	2021-01-18 19:58:20.000000000 +0000
@@ -3,15 +3,25 @@
 // META: script=../../streams/resources/test-utils.js
 'use strict';
 
+// Helper function that triggers garbage collection while reading a chunk
+// if perform_gc is true.
+async function read_and_gc(reader, perform_gc) {
+  const read_promise = reader.read();
+  if (perform_gc)
+    garbageCollect();
+  return read_promise;
+}
+
 // Takes in a ReadableStream and reads from it until it is done, returning
-// an array that contains the results of each read operation
-async function read_all_chunks(stream) {
+// an array that contains the results of each read operation. If perform_gc
+// is true, garbage collection is triggered while reading every chunk.
+async function read_all_chunks(stream, perform_gc = false) {
   assert_true(stream instanceof ReadableStream);
   assert_true('getReader' in stream);
   const reader = stream.getReader();
 
   assert_true('read' in reader);
-  let read_value = await reader.read();
+  let read_value = await read_and_gc(reader, perform_gc);
 
   let out = [];
   let i = 0;
@@ -19,7 +29,7 @@
     for (let val of read_value.value) {
       out[i++] = val;
     }
-    read_value = await reader.read();
+    read_value = await read_and_gc(reader, perform_gc);
   }
   return out;
 }
@@ -56,7 +66,7 @@
   const stream = blob.stream();
   blob = null;
   garbageCollect();
-  const chunks = await read_all_chunks(stream);
+  const chunks = await read_all_chunks(stream, /*perform_gc=*/true);
   assert_array_equals(chunks, input_arr);
 }, "Blob.stream() garbage collection of blob shouldn't break stream" +
       "consumption")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/resources/echo-content-escaped.py firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/resources/echo-content-escaped.py
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/resources/echo-content-escaped.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/resources/echo-content-escaped.py	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,29 @@
+from six import PY3
+from wptserve.utils import isomorphic_encode
+
+# Outputs the request body, with controls and non-ASCII bytes escaped
+# (b"\n" becomes b"\\x0a"), and with backslashes doubled.
+# As a convenience, CRLF newlines are left as is.
+
+def escape_byte(byte):
+    # We want a single-char binary string, but in Python 3 we may get an int
+    # from iterating over bytes.
+    if PY3:
+        byte = bytes([byte])
+    if b"\0" <= byte <= b"\x1F" or byte >= b"\x7F":
+        return b"\\x%02x" % ord(byte)
+    if byte == b"\\":
+        return b"\\\\"
+    return byte
+
+def main(request, response):
+
+    headers = [(b"X-Request-Method", isomorphic_encode(request.method)),
+               (b"X-Request-Content-Length", request.headers.get(b"Content-Length", b"NO")),
+               (b"X-Request-Content-Type", request.headers.get(b"Content-Type", b"NO")),
+               # Avoid any kind of content sniffing on the response.
+               (b"Content-Type", b"text/plain; charset=UTF-8")]
+
+    content = b"".join(map(escape_byte, request.body)).replace(b"\\x0d\\x0a", b"\r\n")
+
+    return headers, content
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-controls.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-controls.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-controls.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-controls.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Upload files named using controls (tentative)</title>
+<!--
+    NOTE: This test is tentative because encoding for filename
+    control characters is not yet standardized.
+  -->
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-form-helper.js"></script>
+<script>
+  "use strict";
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-NUL-[\0].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-NUL-[\0].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-BS-[\b].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-BS-[\b].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-VT-[\v].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-VT-[\v].txt",
+  });
+
+  // These have characters that undergo processing in name=,
+  // filename=, and/or value; formPostFileUploadTest postprocesses
+  // expectedEncodedBaseName for these internally.
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LF-[\n].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-LF-[\n].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LF-CR-[\n\r].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-LF-CR-[\n\r].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CR-[\r].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-CR-[\r].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CR-LF-[\r\n].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-CR-LF-[\r\n].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-HT-[\t].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-HT-[\t].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-FF-[\f].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-FF-[\f].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-DEL-[\x7F].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-DEL-[\x7F].txt",
+  });
+
+  // The rest should be passed through unmodified:
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-ESC-[\x1B].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-ESC-[\x1B].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SPACE-[ ].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-SPACE-[ ].txt",
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-controls.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-controls.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-controls.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-controls.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>FormData: Upload files named using controls (tentative)</title>
+<!--
+    NOTE: This test is tentative because encoding for filename
+    control characters is not yet standardized.
+  -->
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-formdata-helper.js"></script>
+<script>
+  "use strict";
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-NUL-[\0].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-BS-[\b].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-VT-[\v].txt",
+  });
+
+  // These have characters that undergo processing in name=,
+  // filename=, and/or value; formDataPostFileUploadTest postprocesses
+  // expectedEncodedBaseName for these internally.
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LF-[\n].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LF-CR-[\n\r].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CR-[\r].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CR-LF-[\r\n].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-HT-[\t].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-FF-[\f].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-DEL-[\x7F].txt",
+  });
+
+  // The rest should be passed through unmodified:
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-ESC-[\x1B].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SPACE-[ ].txt",
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>FormData: Upload ASCII-named file in UTF-8 form</title>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-formdata-helper.js"></script>
+<script>
+  "use strict";
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form.txt",
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-punctuation.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-punctuation.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-punctuation.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-punctuation.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>FormData: Upload files named using punctuation (tentative)</title>
+<!--
+    NOTE: This test is tentative because encoding for filename
+    punctuation characters is not yet standardized.
+  -->
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-formdata-helper.js"></script>
+<script>
+  "use strict";
+
+  // These have characters that undergo processing in name=,
+  // filename=, and/or value; formDataPostFileUploadTest postprocesses
+  // expectedEncodedBaseName for these internally.
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-QUOTATION-MARK-[\x22].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: '"file-for-upload-in-form-double-quoted.txt"',
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-REVERSE-SOLIDUS-[\\].txt",
+  });
+
+  // The rest should be passed through unmodified:
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-EXCLAMATION-MARK-[!].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-DOLLAR-SIGN-[$].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-PERCENT-SIGN-[%].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-AMPERSAND-[&].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-APOSTROPHE-['].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-PARENTHESIS-[(].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-PARENTHESIS-[)].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-ASTERISK-[*].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-PLUS-SIGN-[+].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-COMMA-[,].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-FULL-STOP-[.].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SOLIDUS-[/].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-COLON-[:].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SEMICOLON-[;].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-EQUALS-SIGN-[=].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-QUESTION-MARK-[?].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CIRCUMFLEX-ACCENT-[^].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-SQUARE-BRACKET-[[].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-SQUARE-BRACKET-[]].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-CURLY-BRACKET-[{].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-VERTICAL-LINE-[|].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-CURLY-BRACKET-[}].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-TILDE-[~].txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "'file-for-upload-in-form-single-quoted.txt'",
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-utf-8.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-utf-8.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-utf-8.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-formdata-utf-8.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>FormData: Upload files in UTF-8 fetch()</title>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-formdata-helper.js"></script>
+<script>
+  "use strict";
+
+  formDataPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form.txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "x-user-defined",
+    fileBaseName: "file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "windows-1252",
+    fileBaseName: "file-for-upload-in-form-☺😂.txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "JIS X 0201 and JIS X 0208",
+    fileBaseName: "file-for-upload-in-form-★星★.txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "Unicode",
+    fileBaseName: "file-for-upload-in-form-☺😂.txt",
+  });
+
+  formDataPostFileUploadTest({
+    fileNameSource: "Unicode",
+    fileBaseName: `file-for-upload-in-form-${kTestChars}.txt`,
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-punctuation.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-punctuation.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-punctuation.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-punctuation.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,230 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Upload files named using punctuation (tentative)</title>
+<!--
+    NOTE: This test is tentative because encoding for filename
+    punctuation characters is not yet standardized.
+  -->
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#multipart-form-data"
+/>
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/dnd.html#datatransferitemlist"
+/>
+<link rel="help" href="https://w3c.github.io/FileAPI/#file-constructor" />
+<link
+  rel="author"
+  title="Benjamin C. Wiley Sittler"
+  href="mailto:bsittler@chromium.org"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/send-file-form-helper.js"></script>
+<script>
+  "use strict";
+
+  // These have characters that undergo processing in name=,
+  // filename=, and/or value; formPostFileUploadTest postprocesses
+  // expectedEncodedBaseName for these internally.
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-QUOTATION-MARK-[\x22].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-QUOTATION-MARK-[\x22].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: '"file-for-upload-in-form-double-quoted.txt"',
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: '"file-for-upload-in-form-double-quoted.txt"',
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-REVERSE-SOLIDUS-[\\].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-REVERSE-SOLIDUS-[\\].txt",
+  });
+
+  // The rest should be passed through unmodified:
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-EXCLAMATION-MARK-[!].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-EXCLAMATION-MARK-[!].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-DOLLAR-SIGN-[$].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-DOLLAR-SIGN-[$].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-PERCENT-SIGN-[%].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-PERCENT-SIGN-[%].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-AMPERSAND-[&].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-AMPERSAND-[&].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-APOSTROPHE-['].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-APOSTROPHE-['].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-PARENTHESIS-[(].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-LEFT-PARENTHESIS-[(].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-PARENTHESIS-[)].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-RIGHT-PARENTHESIS-[)].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-ASTERISK-[*].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-ASTERISK-[*].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-PLUS-SIGN-[+].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-PLUS-SIGN-[+].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-COMMA-[,].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-COMMA-[,].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-FULL-STOP-[.].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-FULL-STOP-[.].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SOLIDUS-[/].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-SOLIDUS-[/].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-COLON-[:].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-COLON-[:].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-SEMICOLON-[;].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-SEMICOLON-[;].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-EQUALS-SIGN-[=].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-EQUALS-SIGN-[=].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-QUESTION-MARK-[?].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-QUESTION-MARK-[?].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-CIRCUMFLEX-ACCENT-[^].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-CIRCUMFLEX-ACCENT-[^].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-SQUARE-BRACKET-[[].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-LEFT-SQUARE-BRACKET-[[].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-SQUARE-BRACKET-[]].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-RIGHT-SQUARE-BRACKET-[]].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-LEFT-CURLY-BRACKET-[{].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-LEFT-CURLY-BRACKET-[{].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-VERTICAL-LINE-[|].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-VERTICAL-LINE-[|].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-RIGHT-CURLY-BRACKET-[}].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName:
+      "file-for-upload-in-form-RIGHT-CURLY-BRACKET-[}].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "file-for-upload-in-form-TILDE-[~].txt",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "file-for-upload-in-form-TILDE-[~].txt",
+  });
+
+  formPostFileUploadTest({
+    fileNameSource: "ASCII",
+    fileBaseName: "'file-for-upload-in-form-single-quoted.txt'",
+    formEncoding: "UTF-8",
+    expectedEncodedBaseName: "'file-for-upload-in-form-single-quoted.txt'",
+  });
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-utf-8.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-utf-8.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-utf-8.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-utf-8.html	2021-01-18 19:58:20.000000000 +0000
@@ -27,35 +27,36 @@
   fileBaseName: 'file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt',
   formEncoding: 'UTF-8',
   expectedEncodedBaseName: (
-      'file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt'),
+      'file-for-upload-in-form-\xEF\x9F\xB0\xEF\x9E\x93\xEF\x9E\x83\xEF\x9E\xA0.txt'),
 });
 
 formPostFileUploadTest({
   fileNameSource: 'windows-1252',
   fileBaseName: 'file-for-upload-in-form-☺😂.txt',
   formEncoding: 'UTF-8',
-  expectedEncodedBaseName: 'file-for-upload-in-form-☺😂.txt',
+  expectedEncodedBaseName: (
+      'file-for-upload-in-form-\xC3\xA2\xCB\x9C\xC2\xBA\xC3\xB0\xC5\xB8\xCB\x9C\xE2\x80\x9A.txt'),
 });
 
 formPostFileUploadTest({
   fileNameSource: 'JIS X 0201 and JIS X 0208',
   fileBaseName: 'file-for-upload-in-form-★星★.txt',
   formEncoding: 'UTF-8',
-  expectedEncodedBaseName: 'file-for-upload-in-form-★星★.txt',
+  expectedEncodedBaseName: 'file-for-upload-in-form-\xE2\x98\x85\xE6\x98\x9F\xE2\x98\x85.txt',
 });
 
 formPostFileUploadTest({
   fileNameSource: 'Unicode',
   fileBaseName: 'file-for-upload-in-form-☺😂.txt',
   formEncoding: 'UTF-8',
-  expectedEncodedBaseName: 'file-for-upload-in-form-☺😂.txt',
+  expectedEncodedBaseName: 'file-for-upload-in-form-\xE2\x98\xBA\xF0\x9F\x98\x82.txt',
 });
 
 formPostFileUploadTest({
   fileNameSource: 'Unicode',
   fileBaseName: `file-for-upload-in-form-${kTestChars}.txt`,
   formEncoding: 'UTF-8',
-  expectedEncodedBaseName: `file-for-upload-in-form-${kTestChars}.txt`,
+  expectedEncodedBaseName: `file-for-upload-in-form-${kTestFallbackUtf8}.txt`,
 });
 
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-windows-1252.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-windows-1252.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-windows-1252.tentative.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-windows-1252.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -33,15 +33,14 @@
   fileNameSource: 'x-user-defined',
   fileBaseName: 'file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt',
   formEncoding: 'windows-1252',
-  expectedEncodedBaseName: (
-      'file-for-upload-in-form-&#63472;&#63379;&#63363;&#63392;.txt'),
+  expectedEncodedBaseName: 'file-for-upload-in-form-&#63472;&#63379;&#63363;&#63392;.txt',
 });
 
 formPostFileUploadTest({
   fileNameSource: 'windows-1252',
   fileBaseName: 'file-for-upload-in-form-☺😂.txt',
   formEncoding: 'windows-1252',
-  expectedEncodedBaseName: 'file-for-upload-in-form-☺😂.txt',
+  expectedEncodedBaseName: 'file-for-upload-in-form-\xE2\x98\xBA\xF0\x9F\x98\x82.txt',
 });
 
 formPostFileUploadTest({
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-x-user-defined.tentative.html firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-x-user-defined.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/file/send-file-form-x-user-defined.tentative.html	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/file/send-file-form-x-user-defined.tentative.html	2021-01-18 19:58:20.000000000 +0000
@@ -33,7 +33,7 @@
   fileNameSource: 'x-user-defined',
   fileBaseName: 'file-for-upload-in-form-\uF7F0\uF793\uF783\uF7A0.txt',
   formEncoding: 'x-user-defined',
-  expectedEncodedBaseName: 'file-for-upload-in-form-𓃠.txt',
+  expectedEncodedBaseName: 'file-for-upload-in-form-\xF0\x93\x83\xA0.txt',
 });
 
 formPostFileUploadTest({
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/support/send-file-formdata-helper.js firefox-85.0+build1/testing/web-platform/tests/FileAPI/support/send-file-formdata-helper.js
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/support/send-file-formdata-helper.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/support/send-file-formdata-helper.js	2021-01-18 19:58:20.000000000 +0000
@@ -0,0 +1,97 @@
+"use strict";
+
+const kTestChars = "ABC~‾¥≈¤･・•∙·☼★星🌟星★☼·∙•・･¤≈¥‾~XYZ";
+
+// formDataPostFileUploadTest - verifies multipart upload structure and
+// numeric character reference replacement for filenames, field names,
+// and field values using FormData and fetch().
+//
+// Uses /fetch/api/resources/echo-content.py to echo the upload
+// POST (unlike in send-file-form-helper.js, here we expect all
+// multipart/form-data request bodies to be UTF-8, so we don't need to
+// escape controls and non-ASCII bytes).
+//
+// Fields in the parameter object:
+//
+// - fileNameSource: purely explanatory and gives a clue about which
+//   character encoding is the source for the non-7-bit-ASCII parts of
+//   the fileBaseName, or Unicode if no smaller-than-Unicode source
+//   contains all the characters. Used in the test name.
+// - fileBaseName: the not-necessarily-just-7-bit-ASCII file basename
+//   used for the constructed test file. Used in the test name.
+const formDataPostFileUploadTest = ({
+  fileNameSource,
+  fileBaseName,
+}) => {
+  promise_test(async (testCase) => {
+    const formData = new FormData();
+    let file = new Blob([kTestChars], { type: "text/plain" });
+    try {
+      // Switch to File in browsers that allow this
+      file = new File([file], fileBaseName, { type: file.type });
+    } catch (ignoredException) {
+    }
+
+    // Used to verify that the browser agrees with the test about
+    // field value replacement and encoding independently of file system
+    // idiosyncracies.
+    formData.append("filename", fileBaseName);
+
+    // Same, but with name and value reversed to ensure field names
+    // get the same treatment.
+    formData.append(fileBaseName, "filename");
+
+    formData.append("file", file, fileBaseName);
+
+    const formDataText = await (await fetch(
+      `/fetch/api/resources/echo-content.py`,
+      {
+        method: "POST",
+        body: formData,
+      },
+    )).text();
+    const formDataLines = formDataText.split("\r\n");
+    if (formDataLines.length && !formDataLines[formDataLines.length - 1]) {
+      --formDataLines.length;
+    }
+    assert_greater_than(
+      formDataLines.length,
+      2,
+      `${fileBaseName}: multipart form data must have at least 3 lines: ${
+        JSON.stringify(formDataText)
+      }`,
+    );
+    const boundary = formDataLines[0];
+    assert_equals(
+      formDataLines[formDataLines.length - 1],
+      boundary + "--",
+      `${fileBaseName}: multipart form data must end with ${boundary}--: ${
+        JSON.stringify(formDataText)
+      }`,
+    );
+
+    const asName = fileBaseName.replace(/[\r\n"]/g, encodeURIComponent);
+    const expectedText = [
+      boundary,
+      'Content-Disposition: form-data; name="filename"',
+      "",
+      fileBaseName,
+      boundary,
+      `Content-Disposition: form-data; name="${asName}"`,
+      "",
+      "filename",
+      boundary,
+      `Content-Disposition: form-data; name="file"; ` +
+      `filename="${asName}"`,
+      "Content-Type: text/plain",
+      "",
+      kTestChars,
+      boundary + "--",
+    ].join("\r\n");
+
+    assert_true(
+      formDataText.startsWith(expectedText),
+      `Unexpected multipart-shaped form data received:\n${formDataText}\nExpected:\n${expectedText}`,
+    );
+  }, `Upload ${fileBaseName} (${fileNameSource}) in fetch with FormData`);
+};
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/support/send-file-form-helper.js firefox-85.0+build1/testing/web-platform/tests/FileAPI/support/send-file-form-helper.js
--- firefox-84.0.2+build1/testing/web-platform/tests/FileAPI/support/send-file-form-helper.js	2021-01-06 11:23:17.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/FileAPI/support/send-file-form-helper.js	2021-01-18 19:58:20.000000000 +0000
@@ -1,5 +1,17 @@
 'use strict';
 
+// See /FileAPI/file/resources/echo-content-escaped.py
+function escapeString(string) {
+  return string.replace(/\\/g, "\\\\").replace(
+    /[^\x20-\x7E]/g,
+    (x) => {
+      let hex = x.charCodeAt(0).toString(16);
+      if (hex.length < 2) hex = "0" + hex;
+      return `\\x${hex}`;
+    },
+  ).replace(/\\x0d\\x0a/g, "\r\n");
+}
+
 // Rationale for this particular test character sequence, which is
 // used in filenames and also in file contents:
 //
@@ -72,36 +84,46 @@
 // are also allowed in Windows Unicode filenames.
 const kTestChars = 'ABC~‾¥≈¤･・•∙·☼★星🌟星★☼·∙•・･¤≈¥‾~XYZ';
 
-// NOTE: The expected interpretation of ISO-2022-JP according to
-// https://encoding.spec.whatwg.org/#iso-2022-jp-encoder unifies
-// single-byte and double-byte katakana.
-const kTestFallbackIso2022jp =
-      ('ABC~\x1B(J~\\≈¤\x1B$B!&!&\x1B(B•∙·☼\x1B$B!z@1\x1B(B🌟' +
-       '\x1B$B@1!z\x1B(B☼·∙•\x1B$B!&!&\x1B(B¤≈\x1B(J\\~\x1B(B~XYZ').replace(
-             /[^\0-\x7F]/gu,
-           x => `&#${x.codePointAt(0)};`);
-
-// NOTE: \uFFFD is used here to replace Windows-1252 bytes to match
-// how we will see them in the reflected POST bytes in a frame using
-// UTF-8 byte interpretation. The bytes will actually be intact, but
-// this code cannot tell and does not really care.
-const kTestFallbackWindows1252 =
-      'ABC~‾\xA5≈\xA4･・\x95∙\xB7☼★星🌟星★☼\xB7∙\x95・･\xA4≈\xA5‾~XYZ'.replace(
-            /[^\0-\xFF]/gu,
-          x => `&#${x.codePointAt(0)};`).replace(/[\x80-\xFF]/g, '\uFFFD');
-
-const kTestFallbackXUserDefined =
-      kTestChars.replace(/[^\0-\x7F]/gu, x => `&#${x.codePointAt(0)};`);
+// The kTestFallback* strings represent the expected byte sequence from
+// encoding kTestChars with the given encoding with "html" replacement
+// mode, isomorphic-decoded. That means, characters that can't be
+// encoded in that encoding get HTML-escaped, but no further
+// `escapeString`-like escapes are needed.
+const kTestFallbackUtf8 = (
+  "ABC~\xE2\x80\xBE\xC2\xA5\xE2\x89\x88\xC2\xA4\xEF\xBD\xA5\xE3\x83\xBB\xE2" +
+    "\x80\xA2\xE2\x88\x99\xC2\xB7\xE2\x98\xBC\xE2\x98\x85\xE6\x98\x9F\xF0\x9F" +
+    "\x8C\x9F\xE6\x98\x9F\xE2\x98\x85\xE2\x98\xBC\xC2\xB7\xE2\x88\x99\xE2\x80" +
+    "\xA2\xE3\x83\xBB\xEF\xBD\xA5\xC2\xA4\xE2\x89\x88\xC2\xA5\xE2\x80\xBE~XYZ"
+);
+
+const kTestFallbackIso2022jp = (
+  ("ABC~\x1B(J~\\≈¤\x1B$B!&!&\x1B(B•∙·☼\x1B$B!z@1\x1B(B🌟" +
+    "\x1B$B@1!z\x1B(B☼·∙•\x1B$B!&!&\x1B(B¤≈\x1B(J\\~\x1B(B~XYZ")
+    .replace(/[^\0-\x7F]/gu, (x) => `&#${x.codePointAt(0)};`)
+);
+
+const kTestFallbackWindows1252 = (
+  "ABC~‾\xA5≈\xA4･・\x95∙\xB7☼★星🌟星★☼\xB7∙\x95・･\xA4≈\xA5‾~XYZ".replace(
+    /[^\0-\xFF]/gu,
+    (x) => `&#${x.codePointAt(0)};`,
+  )
+);
+
+const kTestFallbackXUserDefined = kTestChars.replace(
+  /[^\0-\x7F]/gu,
+  (x) => `&#${x.codePointAt(0)};`,
+);
 
 // formPostFileUploadTest - verifies multipart upload structure and
 // numeric character reference replacement for filenames, field names,
-// and field values.
+// and field values using form submission.
 //
-// Uses /fetch/api/resources/echo-content.py to echo the upload
-// POST with UTF-8 byte interpretation, leading to the "UTF-8 goggles"
-// behavior documented below for expectedEncodedBaseName when non-
-// UTF-8-compatible byte sequences appear in the formEncoding-encoded
-// uploaded data.
+// Uses /FileAPI/file/resources/echo-content-escaped.py to echo the
+// upload POST with controls and non-ASCII bytes escaped. This is done
+// because navigations whose response body contains [\0\b\v] may get
+// treated as a download, which is not what we want. Use the
+// `escapeString` function to replicate that kind of escape (note that
+// it takes an isomorphic-decoded string, not a byte sequence).
 //
 // Fields in the parameter object:
 //
@@ -114,10 +136,9 @@
 // - formEncoding: the acceptCharset of the form used to submit the
 //   test file. Used in the test name.
 // - expectedEncodedBaseName: the expected formEncoding-encoded
-//   version of fileBaseName with unencodable characters replaced by
-//   numeric character references and non-7-bit-ASCII bytes seen
-//   through UTF-8 goggles; subsequences not interpretable as UTF-8
-//   have each byte represented here by \uFFFD REPLACEMENT CHARACTER.
+//   version of fileBaseName, isomorphic-decoded. That means, characters
+//   that can't be encoded in that encoding get HTML-escaped, but no
+//   further `escapeString`-like escapes are needed.
 const formPostFileUploadTest = ({
   fileNameSource,
   fileBaseName,
@@ -140,7 +161,7 @@
 
     const form = Object.assign(document.createElement('form'), {
       acceptCharset: formEncoding,
-      action: '/fetch/api/resources/echo-content.py',
+      action: '/FileAPI/file/resources/echo-content-escaped.py',
       method: 'POST',
       enctype: 'multipart/form-data',
       target: formTargetFrame.name,
@@ -194,7 +215,7 @@
       // exposed through the newer .files[0].name API. This check
       // verifies that assumption.
       assert_equals(
-          fileInput.files[0].name,
+          baseNameOfFilePath(fileInput.files[0].name),
           baseNameOfFilePath(fileInput.value),
           `The basename of the field's value should match its files[0].name`);
       form.submit();
@@ -219,6 +240,15 @@
         `${fileBaseName}: multipart form data must end with ${boundary}--: ${
              JSON.stringify(formDataText)
            }`);
+
+    const asValue = expectedEncodedBaseName.replace(/\r\n?|\n/g, "\r\n");
+    const asName = asValue.replace(/[\r\n"]/g, encodeURIComponent);
+    const asFilename = expectedEncodedBaseName.replace(/[\r\n"]/g, encodeURIComponent);
+
+    // The response body from echo-content-escaped.py has controls and non-ASCII
+    // bytes escaped, so any caller-provided field that might contain such bytes
+    // must be passed to `escapeString`, after any other expected
+    // transformations.
     const expectedText = [
       boundary,
       'Content-Disposition: form-data; name="_charset_"',
@@ -227,19 +257,22 @@
       boundary,
       'Content-Disposition: form-data; name="filename"',
       '',
-      expectedEncodedBaseName,
+      // Unlike for names and filenames, multipart/form-data values don't escape
+      // \r\n linebreaks, and when they're read from an iframe they become \n.
+      escapeString(asValue).replace(/\r\n/g, "\n"),
       boundary,
-      `Content-Disposition: form-data; name="${expectedEncodedBaseName}"`,
+      `Content-Disposition: form-data; name="${escapeString(asName)}"`,
       '',
       'filename',
       boundary,
       `Content-Disposition: form-data; name="file"; ` +
-          `filename="${expectedEncodedBaseName}"`,
+          `filename="${escapeString(asFilename)}"`,
       'Content-Type: text/plain',
       '',
-      kTestChars,
+      escapeString(kTestFallbackUtf8),
       boundary + '--',
     ].join('\n');
+
     assert_true(
         formDataText.startsWith(expectedText),
         `Unexpected multipart-shaped form data received:\n${
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-event-after-focusing-iframes.html firefox-85.0+build1/testing/web-platform/tests/focus/focus-event-after-focusing-iframes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-event-after-focusing-iframes.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/focus-event-after-focusing-iframes.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,55 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test focus event after focusing iframe</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+function waitForEvent(target, event, checkFn) {
+  return new Promise(resolve => {
+    target.addEventListener(event, e => {
+      if (checkFn && !checkFn(e)) {
+        return;
+      }
+      resolve();
+    }, { once: true });
+  });
+}
+
+function focusIframe(w) {
+  w.postMessage("focus", "*");
+}
+
+// This will send message to outer frame and also inner frame to ask them
+// send the log they collect back, the logs of outer and inner will be
+// concatenated.
+async function getLog(w) {
+  let log = "";
+  step_timeout(function() {
+    w.postMessage("getlog", "*");
+  }, 0);
+  await waitForEvent(window, "message", (e) => {
+    log = e.data;
+    return true;
+  });
+  return log;
+}
+
+async function runTest(t, url) {
+  let w = window.open(url);
+  t.add_cleanup(() => { w.close(); });
+  await waitForEvent(window, "message", e => e.data === "ready");
+  focusIframe(w);
+  assert_equals(await getLog(w), 'outerlog:willfocusiframe,windowblur,didfocusiframe,innerlog:windowfocus,');
+  focusIframe(w);
+  assert_equals(await getLog(w), 'outerlog:willfocusiframe,windowblur,didfocusiframe,willfocusiframe,didfocusiframe,innerlog:windowfocus,');
+}
+
+promise_test(async t => {
+  await runTest(t, "support/focus-event-after-focusing-different-site-iframes-outer.sub.html");
+}, "Check focus event after focusing different site iframe");
+
+promise_test(async t => {
+  await runTest(t, "support/focus-event-after-focusing-same-site-iframes-outer.html");
+}, "Check focus event after focusing same site iframe");
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-restoration-in-different-site-iframes-window.html firefox-85.0+build1/testing/web-platform/tests/focus/focus-restoration-in-different-site-iframes-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-restoration-in-different-site-iframes-window.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/focus-restoration-in-different-site-iframes-window.html	2021-01-18 19:58:23.000000000 +0000
@@ -7,7 +7,7 @@
 setup({explicit_done:true});
 window.onmessage = function(e) {
     test(function() {
-        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,", 'Check log');
+        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,windowblur,windowfocus,", 'Check log');
     }, "Check result");
     w.close();
     done();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-restoration-in-same-site-iframes-window.html firefox-85.0+build1/testing/web-platform/tests/focus/focus-restoration-in-same-site-iframes-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/focus-restoration-in-same-site-iframes-window.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/focus-restoration-in-same-site-iframes-window.html	2021-01-18 19:58:23.000000000 +0000
@@ -7,7 +7,7 @@
 setup({explicit_done:true});
 window.onmessage = function(e) {
     test(function() {
-        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,", 'Check log');
+        assert_equals(e.data, "outerlog:log:willfocuswindow,windowfocus,didfocuswindow,windowblur,windowfocus,", 'Check log');
     }, "Check result");
     w.close();
     done();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html firefox-85.0+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-different-site-intermediate-frame.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>iframe.contentWindow.focus() with different-site intermediate frame</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    var actual = e.data;
+    test(function() {
+        assert_equals(actual, "outeronload;outeractivelement:body;starttest;middleactivelement:body;callfocus;middleactivelement:iframe;innerfocus;middletimer;middleactivelement:iframe;outeractivelement:iframe;", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html firefox-85.0+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/iframe-contentwindow-focus-with-same-as-top-intermediate-frame.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>iframe.contentWindow.focus() with same-as-top intermediate frame</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    var actual = e.data;
+    test(function() {
+        assert_equals(actual, "outeronload;outeractivelement:body;starttest;middleactivelement:body;callfocus;middleactivelement:iframe;innerfocus;middletimer;middleactivelement:iframe;outeractivelement:iframe;", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-focus-with-different-site-intermediate-frame.html firefox-85.0+build1/testing/web-platform/tests/focus/iframe-focus-with-different-site-intermediate-frame.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-focus-with-different-site-intermediate-frame.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/iframe-focus-with-different-site-intermediate-frame.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>iframe.focus() with different-site intermediate frame</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    var actual = e.data;
+    test(function() {
+        assert_equals(actual, "outeronload;outeractivelement:body;starttest;middleactivelement:body;callfocus;middleactivelement:iframe;innerfocus;middletimer;middleactivelement:iframe;outeractivelement:iframe;", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html firefox-85.0+build1/testing/web-platform/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/iframe-focus-with-same-as-top-intermediate-frame.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>iframe.focus() with same-as-top intermediate frame</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+setup({explicit_done:true});
+window.onmessage = function(e) {
+    var actual = e.data;
+    test(function() {
+        assert_equals(actual, "outeronload;outeractivelement:body;starttest;middleactivelement:body;callfocus;middleactivelement:iframe;innerfocus;middletimer;middleactivelement:iframe;outeractivelement:iframe;", 'Check log');
+    }, "Check result");
+    w.close();
+    done();
+};
+var w = window.open("support/iframe-focus-with-same-as-top-intermediate-frame-outer.html");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-different-site-iframes-outer.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus event after focusing different site iframes outer</title>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/focus-event-after-focusing-iframes-inner.html"></iframe>
+<script>
+let outerlog = "outerlog:";
+
+let iframe = document.querySelector("iframe");
+window.onmessage = function(e) {
+  if (e.data == "focus") {
+    outerlog += "willfocusiframe,";
+    iframe.focus();
+    outerlog += "didfocusiframe,";
+  } else if (e.data == "getlog") {
+    iframe.contentWindow.postMessage("getlog", "*");
+  } else {
+    opener.postMessage(outerlog + e.data, "*");
+  }
+};
+
+window.onload = function() {
+  window.onfocus = function() {
+    outerlog += "windowfocus,";
+  };
+
+  window.onblur = function() {
+    outerlog += "windowblur,";
+  };
+
+  opener.postMessage("ready", "*");
+};
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-iframes-inner.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-iframes-inner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-iframes-inner.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-iframes-inner.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Focus event inner document</title>
+</head>
+<body>
+<h1>Inner</h1>
+<script>
+let innerlog = "innerlog:";
+
+window.onmessage = function(e) {
+  if (e.data == "getlog") {
+    parent.postMessage(innerlog, "*");
+  }
+};
+
+window.onfocus = function() {
+  innerlog += "windowfocus,";
+};
+
+window.onblur = function() {
+  innerlog += "windowblur,";
+};
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-event-after-focusing-same-site-iframes-outer.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,32 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Focus event after focusing same site iframes outer</title>
+<iframe src="focus-event-after-focusing-iframes-inner.html"></iframe>
+<script>
+let outerlog = "outerlog:";
+
+let iframe = document.querySelector("iframe");
+window.onmessage = function(e) {
+  if (e.data == "focus") {
+    outerlog += "willfocusiframe,";
+    document.querySelector("iframe").focus();
+    outerlog += "didfocusiframe,";
+  } else if (e.data == "getlog") {
+    iframe.contentWindow.postMessage("getlog", "*");
+  } else {
+    opener.postMessage(outerlog + e.data, "*");
+  }
+};
+
+window.onload = function() {
+  window.onfocus = function() {
+    outerlog += "windowfocus,";
+  };
+
+  window.onblur = function() {
+    outerlog += "windowblur,";
+  };
+
+  opener.postMessage("ready", "*");
+};
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-inner-window.html	2021-01-18 19:58:23.000000000 +0000
@@ -7,6 +7,12 @@
 <body>
 <h1>Inner</h1>
 <script>
+window.onmessage = function(e) {
+    if (e.data == "getlog") {
+        parent.postMessage(log, "*");
+    }
+};
+
 let log = "log:";
 window.onfocus = function() {
     log += "windowfocus,"
@@ -18,7 +24,7 @@
     log += "willfocuswindow,"
     window.focus();
     log += "didfocuswindow,"
-    parent.postMessage(log, "*");
+    parent.postMessage("start", "*");
 }
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-different-site-iframes-outer-window.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -8,7 +8,18 @@
     return log;
 }
 window.onmessage = function(e) {
-    opener.postMessage(getLog() + e.data, "*");
+    if (e.data == "start") {
+        other = window.open("focus-restoration-in-different-site-iframes-other.html", "otherwindow", "resizable=yes");
+    } else if (e.data == "other") {
+        other.close();
+        opener.step_timeout(function() {
+            document.getElementsByTagName("iframe")[0].contentWindow.postMessage("getlog", "*");
+        }, 2000);
+    } else {
+        opener.step_timeout(function() {
+            opener.postMessage(getLog() + e.data, "*");
+        }, 1500);
+    }
 };
 window.onload = function() {
     document.getElementsByTagName("iframe")[0].onfocus = function() {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-inner-window.html	2021-01-18 19:58:23.000000000 +0000
@@ -7,6 +7,12 @@
 <body>
 <h1>Inner</h1>
 <script>
+window.onmessage = function(e) {
+    if (e.data == "getlog") {
+        parent.postMessage(log, "*");
+    }
+};
+
 let log = "log:";
 window.onfocus = function() {
     log += "windowfocus,"
@@ -18,7 +24,7 @@
     log += "willfocuswindow,"
     window.focus();
     log += "didfocuswindow,"
-    parent.postMessage(log, "*");
+    parent.postMessage("start", "*");
 }
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/focus-restoration-in-same-site-iframes-outer-window.html	2021-01-18 19:58:23.000000000 +0000
@@ -8,7 +8,18 @@
     return log;
 }
 window.onmessage = function(e) {
-    opener.postMessage(getLog() + e.data, "*");
+    if (e.data == "start") {
+        other = window.open("focus-restoration-in-different-site-iframes-other.html", "otherwindow", "resizable=yes");
+    } else if (e.data == "other") {
+        other.close();
+        opener.step_timeout(function() {
+            document.getElementsByTagName("iframe")[0].contentWindow.postMessage("getlog", "*");
+        }, 2000);
+    } else {
+        opener.step_timeout(function() {
+            opener.postMessage(getLog() + e.data, "*");
+        }, 1500);
+    }
 };
 window.onload = function() {
     document.getElementsByTagName("iframe")[0].onfocus = function() {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>iframe.contentWindow.focus() with different-site intermediate frame inner</title>
+</head>
+<body>
+<script>
+document.body.onfocus = function() {
+    parent.postMessage("innerfocus;", "*");
+}
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.contentWindow.focus() with different-site intermediate frame middle</title>
+<iframe src="http://{{hosts[][www]}}:{{ports[http][0]}}/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-inner.html"></iframe>
+<script>
+let iframe = document.getElementsByTagName("iframe")[0];
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+    if (e.data == "starttest;") {
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        log += "callfocus;";
+        iframe.contentWindow.focus();
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        setTimeout(function() {
+            log += "middletimer;middleactivelement:" + document.activeElement.localName + ";";
+            parent.postMessage(getLog(), "*");
+        }, 1500);
+    }
+};
+/*
+ * TODO: Get browsers to agree on this one.
+ *
+ * Does not fire in Firefox without Fission
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1675484
+ *
+ * Fires in Blink in the iframe.focus() case but not in
+ * the iframe.contentWindow.focus() case.
+ */
+// iframe.onfocus = function() {
+//     log += "middlefocus;";
+// }
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.contentWindow.focus() with different-site intermediate frame outer</title>
+<script>
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+};
+window.onload = function() {
+    log += "outeronload;";
+    log += "outeractivelement:" + document.activeElement.localName + ";";
+    document.getElementsByTagName("iframe")[0].contentWindow.postMessage("starttest;", "*");
+    setTimeout(function() {
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+        opener.postMessage(getLog(), "*");
+    }, 3000);
+}
+</script>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html"></iframe>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>iframe.contentWindow.focus() with same-as-top intermediate frame inner</title>
+</head>
+<body>
+<script>
+document.body.onfocus = function() {
+    parent.postMessage("innerfocus;", "*");
+}
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.contentWindow.focus() with same-as-top intermediate frame middle</title>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-inner.html"></iframe>
+<script>
+let iframe = document.getElementsByTagName("iframe")[0];
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+    if (e.data == "starttest;") {
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        log += "callfocus;";
+        iframe.contentWindow.focus();
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        parent.opener.step_timeout(function() {
+            log += "middletimer;middleactivelement:" + document.activeElement.localName + ";";
+            parent.postMessage(getLog(), "*");
+        }, 1500);
+    }
+};
+/*
+ * TODO: Get browsers to agree on this one.
+ *
+ * Does not fire in Firefox without Fission
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1675484
+ *
+ * Fires in Blink in the iframe.focus() case but not in
+ * the iframe.contentWindow.focus() case.
+ */
+// iframe.onfocus = function() {
+//     log += "middlefocus;";
+// }
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-contentwindow-focus-with-same-as-top-intermediate-frame-outer.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.contentWindow.focus() with same-as-top intermediate frame outer</title>
+<script>
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+};
+window.onload = function() {
+    log += "outeronload;";
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+    document.getElementsByTagName("iframe")[0].contentWindow.postMessage("starttest;", "*");
+    opener.step_timeout(function() {
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+        opener.postMessage(getLog(), "*");
+    }, 2000);
+}
+</script>
+<iframe src="iframe-contentwindow-focus-with-same-as-top-intermediate-frame-middle.sub.html"></iframe>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>iframe.focus() with different-site intermediate frame inner</title>
+</head>
+<body>
+<script>
+document.body.onfocus = function() {
+    parent.postMessage("innerfocus;", "*");
+}
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.focus() with different-site intermediate frame middle</title>
+<iframe src="http://{{hosts[][www]}}:{{ports[http][0]}}/focus/support/iframe-focus-with-different-site-intermediate-frame-inner.html"></iframe>
+<script>
+let iframe = document.getElementsByTagName("iframe")[0];
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+    if (e.data == "starttest;") {
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        log += "callfocus;";
+        iframe.focus();
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        setTimeout(function() {
+            log += "middletimer;middleactivelement:" + document.activeElement.localName + ";";
+            parent.postMessage(getLog(), "*");
+        }, 1500);
+    }
+};
+/*
+ * TODO: Get browsers to agree on this one.
+ *
+ * Does not fire in Firefox without Fission
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1675484
+ *
+ * Fires in Blink in the iframe.focus() case but not in
+ * the iframe.contentWindow.focus() case.
+ */
+// iframe.onfocus = function() {
+//     log += "middlefocus;";
+// }
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.focus() with different-site intermediate frame outer</title>
+<script>
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+};
+window.onload = function() {
+    log += "outeronload;";
+    log += "outeractivelement:" + document.activeElement.localName + ";";
+    document.getElementsByTagName("iframe")[0].contentWindow.postMessage("starttest;", "*");
+    setTimeout(function() {
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+        opener.postMessage(getLog(), "*");
+    }, 3000);
+}
+</script>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html"></iframe>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>iframe.focus() with same-as-top intermediate frame inner</title>
+</head>
+<body>
+<script>
+document.body.onfocus = function() {
+    parent.postMessage("innerfocus;", "*");
+}
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.focus() with same-as-top intermediate frame middle</title>
+<iframe src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/focus/support/iframe-focus-with-same-as-top-intermediate-frame-inner.html"></iframe>
+<script>
+let iframe = document.getElementsByTagName("iframe")[0];
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+    if (e.data == "starttest;") {
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        log += "callfocus;";
+        iframe.focus();
+        log += "middleactivelement:" + document.activeElement.localName + ";";
+        parent.opener.step_timeout(function() {
+            log += "middletimer;middleactivelement:" + document.activeElement.localName + ";";
+            parent.postMessage(getLog(), "*");
+        }, 1500);
+    }
+};
+/*
+ * TODO: Get browsers to agree on this one.
+ *
+ * Does not fire in Firefox without Fission
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=1675484
+ *
+ * Fires in Blink in the iframe.focus() case but not in
+ * the iframe.contentWindow.focus() case.
+ */
+// iframe.onfocus = function() {
+//     log += "middlefocus;";
+// }
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html
--- firefox-84.0.2+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/focus/support/iframe-focus-with-same-as-top-intermediate-frame-outer.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>iframe.focus() with same-as-top intermediate frame outer</title>
+<script>
+let log = "";
+function getLog() {
+    return log;
+}
+window.onmessage = function(e) {
+    log += e.data;
+};
+window.onload = function() {
+    log += "outeronload;";
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+    document.getElementsByTagName("iframe")[0].contentWindow.postMessage("starttest;", "*");
+    opener.step_timeout(function() {
+        log += "outeractivelement:" + document.activeElement.localName + ";";
+        opener.postMessage(getLog(), "*");
+    }, 2000);
+}
+</script>
+<iframe src="iframe-focus-with-same-as-top-intermediate-frame-middle.sub.html"></iframe>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser-multiple.tentative.manual.https.html firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser-multiple.tentative.manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser-multiple.tentative.manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser-multiple.tentative.manual.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>Local Font Access: Multiple choosers</title>
+<meta charset=utf-8>
+
+<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>
+  promise_test(async t => {
+    await new Promise(resolve => {
+      window.addEventListener('DOMContentLoaded', resolve);
+    });
+    // Small delay to give chrome's test automation a chance to actually install
+    // itself.
+    await new Promise(resolve => step_timeout(resolve, 100));
+
+    await window.test_driver.bless('show a font chooser.<br>Please select at least one font.');
+    const promise = navigator.fonts.showFontChooser()
+    promise_rejects_dom(t, 'SecurityError', navigator.fonts.showFontChooser());
+    const fonts = await promise;
+  }, 'showFontChooser multiple choosers');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.https.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-// META: script=/resources/testdriver.js
-// META: script=/resources/testdriver-vendor.js
-// META: script=resources/test-expectations.js
-// META: script=resources/window-tests-chooser.js
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.manual.https.html firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/font-access/font_access-chooser.tentative.manual.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,28 @@
+<!doctype html>
+<meta charset=utf-8>
+
+<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>
+  promise_test(async t => {
+    await new Promise(resolve => {
+      window.addEventListener('DOMContentLoaded', resolve);
+    });
+    // Small delay to give chrome's test automation a chance to actually install
+    // itself.
+    await new Promise(resolve => step_timeout(resolve, 100));
+
+    await window.test_driver.bless('show a font chooser.<br />Please select at least one font.');
+    const fonts = await navigator.fonts.showFontChooser();
+    assert_true(Array.isArray(fonts));
+    assert_greater_than_equal(fonts.length, 1);
+
+    const postscriptName = fonts[0].postscriptName;
+    assert_equals(typeof postscriptName, "string");
+    assert_greater_than(postscriptName.length, 0);
+  }, 'showFontChooser works');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/font-access/resources/window-tests-chooser.js firefox-85.0+build1/testing/web-platform/tests/font-access/resources/window-tests-chooser.js
--- firefox-84.0.2+build1/testing/web-platform/tests/font-access/resources/window-tests-chooser.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/font-access/resources/window-tests-chooser.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-'use strict';
-
-font_access_test(async t => {
-  await promise_rejects_dom(
-      t, 'NotSupportedError', navigator.fonts.showFontChooser());
-  await promise_rejects_dom(
-      t, 'NotSupportedError', navigator.fonts.showFontChooser({all: false}));
-});
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/testing/web-platform/tests/fonts/fail.woff and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/testing/web-platform/tests/fonts/fail.woff differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/testing/web-platform/tests/fonts/pass.woff and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/testing/web-platform/tests/fonts/pass.woff differ
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!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-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html	2021-01-18 19:58:23.000000000 +0000
@@ -15,19 +15,11 @@
     <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
     <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
       <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be orange in forced colors mode due to inheritance.
+        This text should be CanvasText 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>
-
-  <svg height="600" width="600">
-    <foreignObject x="20" y="100" width="160" height="160" style="color: blue;">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be CanvasText in forced colors mode.
-      </div>
-    </foreignObject>
-  </svg>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -17,20 +17,12 @@
     </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: orange;">
-        This text should be orange in forced colors mode due to inheritance.
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: CanvasText;">
+        This text should be CanvasText 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>
-
-  <svg height="600" width="600">
-    <foreignObject x="20" y="100" width="160" height="160" style="color: CanvasText;">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-        This text should be CanvasText in forced colors mode.
-      </div>
-    </foreignObject>
-  </svg>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26.html	2021-01-18 19:58:23.000000000 +0000
@@ -12,8 +12,12 @@
 </style>
 <body>
   <div>
-    The triangle below should be currentColor when forced colors mode.
-    <svg height="600" width="600">
+    The triangle below should NOT get overridden in forced colors mode.
+    <svg height="200" width="350">
+      <path d="M150 0 L75 200 L225 200 Z" />
+    </svg>
+    The triangle below should be currentColor in forced colors mode.
+    <svg height="200" width="350" style="forced-color-adjust: auto;">
       <path d="M150 0 L75 200 L225 200 Z" />
     </svg>
   </div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26-ref.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26-ref.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-26-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -8,8 +8,12 @@
   }
 </style>
 <body>
-  The triangle below should be currentColor when forced colors mode.
-  <svg height="600" width="600">
-    <path fill="currentColor" d="M150 0 L75 200 L225 200 Z" />
+  The triangle below should NOT get overridden in forced colors mode.
+  <svg height="200" width="350">
+    <path fill="red" stroke="blue" d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+  The triangle below should be currentColor in forced colors mode.
+  <svg height="200" width="350">
+    <path fill="currentColor" stroke="currentColor" d="M150 0 L75 200 L225 200 Z" />
   </svg>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-32.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-32.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-32.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-32.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Forced colors mode - webkit-tap-highlight-color with sys 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: GrayText;
-  }
-</style>
-<a href="https://www.wikipedia.org" id="link">
-  This link color should not be overridden when forced colors mode is enabled.
-</a>
-<a href="" id="ref" style="forced-color-adjust:none"></a>
-
-<script>
-  var gray_text = getComputedStyle(ref).webkitTapHighlightColor;
-  test(function(){
-    assert_equals(getComputedStyle(link).webkitTapHighlightColor, gray_text);
-  }, "Checks hyperlinks are not overridden if a sys color is used.");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35.html	2021-01-18 19:58:23.000000000 +0000
@@ -15,9 +15,12 @@
   }
 </style>
 <a href="">
-  The triangle below should not preserve the blue/green fill/stroke colors
-  in forced colors mode.
-  <svg height="600" width="600">
+  The triangle below should NOT get overridden in forced colors mode.
+  <svg height="200" width="350">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+  The triangle below should be currentColor in forced colors mode.
+  <svg height="200" width="350" style="forced-color-adjust: auto;">
     <path d="M150 0 L75 200 L225 200 Z" />
   </svg>
 </a>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35-ref.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35-ref.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-35-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -4,14 +4,17 @@
 </title>
 <style>
   a {
-    fill: VisitedText;
+    color: VisitedText;
     forced-color-adjust: none;
   }
 </style>
 <a href="">
-  The triangle below should not preserve the blue/green fill/stroke colors
-  in forced colors mode.
-  <svg height="600" width="600">
-    <path d="M150 0 L75 200 L225 200 Z" />
+  The triangle below should NOT get overridden in forced colors mode.
+  <svg height="200" width="350">
+    <path fill="blue" stroke="green" d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+  The triangle below should be currentColor in forced colors mode.
+  <svg height="200" width="350">
+    <path fill="currentColor" stroke="currentColor" d="M150 0 L75 200 L225 200 Z" />
   </svg>
 </a>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-40.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-40.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-40.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-40.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - computed value.
+  Ensures that forced colors do not affect the computed style.
+</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: green;
+    border-color: green;
+    color: green;
+    column-rule-color: green;
+    fill: green;
+    outline-color: green;
+    stroke: green;
+    text-decoration-color: green;
+    -webkit-tap-highlight-color: green;
+    -webkit-text-emphasis-color: green;
+  }
+</style>
+<div id="div">
+    Forced colors should not affect the computed style.
+</div>
+
+<script>
+  const properties_to_test = [
+    "background-color",
+    "border-bottom-color",
+    "border-left-color",
+    "border-right-color",
+    "border-top-color",
+    "color",
+    "column-rule-color",
+    "fill",
+    "outline-color",
+    "stroke",
+    "text-decoration-color",
+    "-webkit-tap-highlight-color",
+    "-webkit-text-emphasis-color"
+  ];
+  for (let property of properties_to_test) {
+    test(function() {
+      let value = document.getElementById("div").computedStyleMap()
+          .get(property).toString();
+      assert_equals(value, "rgb(0, 128, 0)")
+    }, "Forced colors aren't applied at computed value time for " + property);
+  }
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-41.html firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-41.html
--- firefox-84.0.2+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-41.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-41.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - resolved value.
+  Forced colors happens at used value time. The resolved values of certain color
+  properties are used values. This test ensures that those values are forced 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: green;
+    border-color: green;
+    color: green;
+    outline-color: green;
+  }
+</style>
+<div id="div"></div>
+
+<script>
+  const properties_to_test = [
+    "background-color",
+    "border-bottom-color",
+    "border-left-color",
+    "border-right-color",
+    "border-top-color",
+    "color",
+    "outline-color"
+  ];
+  for (let property of properties_to_test) {
+    test(function() {
+      let value =
+        window.getComputedStyle(document.getElementById("div")).getPropertyValue(property);
+        assert_not_equals(value, "rgb(0, 128, 0)")
+    }, "Forced colors affects the resolved value of " + property);
+  }
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/hr-time/basic.any.js firefox-85.0+build1/testing/web-platform/tests/hr-time/basic.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/hr-time/basic.any.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/hr-time/basic.any.js	2021-01-18 19:58:23.000000000 +0000
@@ -26,3 +26,12 @@
     this.done();
   }, 2000);
 }, 'High resolution time has approximately the right relative magnitude');
+
+test(function() {
+  var didHandle = false;
+  self.performance.addEventListener("testEvent", function() {
+    didHandle = true;
+  }, { once: true} );
+  self.performance.dispatchEvent(new Event("testEvent"));
+  assert_true(didHandle, "Performance extends EventTarget, so event dispatching should work.");
+}, "Performance interface extends EventTarget.");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-src-about-blank.html	2021-01-18 19:58:23.000000000 +0000
@@ -6,12 +6,14 @@
 <div id=log></div>
 <iframe></iframe>
 <script>
-  setup({ single_test: true });
+  setup({
+    single_test: true
+  });
   onload = function() {
     var fr = document.querySelector("iframe")
     fr.src = "about:blank"
     fr.onload = function() {
-      assert_equals(fr.contentDocument.referrer, document.URL)
+      assert_equals(fr.contentDocument.referrer, document.location.origin + '/')
       done()
     }
   }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-iframe.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Beforeunload must be gated behind sticky activation: nested browsing context</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<p>If you happen to be running this test as a human, then be sure not to interact with any part of the page; that would invalidate the results!
+
+<script>
+setup({ single_test: true });
+
+const iframe = document.createElement('iframe');
+iframe.src = 'support/beforeunload-sticky-start.html';
+
+window.onmessage = e => {
+  assert_equals(e.data, 'navigated successfully');
+
+  const desiredURL = (new URL('support/beforeunload-sticky-destination.html', location.href)).href;
+  assert_equals(iframe.contentWindow.location.href, desiredURL);
+
+  done();
+};
+
+document.body.append(iframe);
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-manual.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Beforeunload must be gated behind sticky activation: normal top-level browsing context</title>
+
+<p>This test is manual because we want to test non-popup, non-iframe situations. Sibling files contain automated tests for those situations.
+
+<p>In three seconds, this document will redirect itself to a new page. The test passes if the redirect succeeds. The test fails if a beforeunload dialog pops up asking for confirmation.
+
+<p>Be sure not to interact with any part of the page in the meantime. That would invalidate the results.
+
+<script>
+window.onbeforeunload = e => e.preventDefault();
+
+setTimeout(() => {
+  location.href = 'support/beforeunload-sticky-destination.html';
+}, 3000);
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-sticky-activation-popup.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Beforeunload must be gated behind sticky activation: auxiliary browsing context</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<p>If you happen to be running this test as a human, then be sure not to interact with any part of the page; that would invalidate the results!
+
+<script>
+setup({ single_test: true });
+
+const w = window.open('support/beforeunload-sticky-start.html');
+
+window.onmessage = e => {
+  assert_equals(e.data, 'navigated successfully');
+
+  const desiredURL = (new URL('support/beforeunload-sticky-destination.html', location.href)).href;
+  assert_equals(w.location.href, desiredURL);
+
+  w.close();
+
+  done();
+};
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-destination.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Beforeunload must be gated behind sticky activation: destination page</title>
+
+<p>If you reached this page without clicking through a confirmation dialog, then the test has passed!
+
+<script>
+if (window.opener) {
+  window.opener.postMessage('navigated successfully');
+} else if (window.parent) {
+  window.parent.postMessage('navigated successfully');
+}
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/support/beforeunload-sticky-start.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Beforeunload must be gated behind sticky activation: start page</title>
+
+<p>This page will immediately navigate. If a beforeunload dialog pops up, the test fails.</p>
+
+<script>
+window.onbeforeunload = e => e.preventDefault();
+location.href = 'beforeunload-sticky-destination.html';
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/windows/browsing-context.html firefox-85.0+build1/testing/web-platform/tests/html/browsers/windows/browsing-context.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/browsers/windows/browsing-context.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/browsers/windows/browsing-context.html	2021-01-18 19:58:23.000000000 +0000
@@ -40,7 +40,7 @@
     }, "Check that new document nodes extant, empty");
 
     test(function () {
-      assert_equals(doc.referrer, document.URL, "The document's referrer should be its creator document's address.");
+      assert_equals(doc.referrer, document.location.origin + '/', "The document's referrer should be its creator document's origin.");
       assert_equals(iframe.contentWindow.parent.document, document);
     }, "Check the document properties corresponding to the creator browsing context");
     </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/drawing-images-to-the-canvas/2d.drawImage.nonexistent.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.drawImage.nonexistent</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.drawImage.nonexistent</h1>
+<p class="desc"></p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("");
+_addTest(function(canvas, ctx) {
+
+var img = document.getElementById('not-found-at-all.png');
+assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(img, 0, 0); });
+
+
+});
+</script>
+<img src="/images/not-found-at-all.png" id="not-found-at-all.png" class="resource">
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.condensed.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = condensed and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "condensed";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "condensed";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.expanded.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "expanded";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "expanded";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-condensed.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = extra-condensed and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "extra-condensed";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "extra-condensed";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.extra-expanded.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = extra-expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "extra-expanded";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "extra-expanded";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.normal.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/fail.woff)');
+f.stretch = "expanded";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/pass.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+document.fonts.add(f);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-condensed.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = semi-condensed and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "semi-condensed";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "semi-condensed";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.semi-expanded.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = semi-expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "semi-expanded";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "semi-expanded";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-condensed.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = ultra-condensed and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "ultra-condensed";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "ultra-condensed";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/drawing-text-to-the-canvas/canvas.2d.fontStretch.ultra-expanded.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Canvas test: 2d.text.fontStretch</title>
+<link rel="match" href="canvas.2d.fontStretch-ref.html">
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+</style>
+<canvas id="c" class="output" width="500" height="500"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas = document.getElementById("c");
+var ctx = canvas.getContext('2d');
+
+// P shows as Pass for fontStretch = ultra-expanded and shows as fail for
+// fontStretch = fail.
+function draw() {
+    ctx.clearRect(0, 0, 500, 500);
+    ctx.font = '25px test';
+    ctx.fontStretch = "ultra-expanded";
+    ctx.fillText("P", 10, 40);
+}
+
+var f = new FontFace('test', 'url(/fonts/pass.woff)');
+f.stretch = "ultra-expanded";
+document.fonts.add(f);
+
+var f2 = new FontFace('test', 'url(/fonts/fail.woff)');
+document.fonts.add(f2);
+// In canvas, font doesn't load until it's used. So try to use the newly added
+// font test here.
+draw();
+
+
+document.fonts.ready.then(() => {
+  draw();
+});
+
+
+</script>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html	2021-01-18 19:58:23.000000000 +0000
@@ -136,7 +136,7 @@
 
 var testScenariosCreateImageDataWH = [];
 for (var i = 0; i < canvasColorSettingsSet.length; i++) {
-  var message = "Test cretateImageData(width, height) from " +
+  var message = "Test createImageData(width, height) from " +
                 canvasColorSettingsSet[i].name + " canvas ";
   testScenariosCreateImageDataWH.
       push([message, canvasColorSettingsSet[i].colorSettings]);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/current-work-canvas.xhtml firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/current-work-canvas.xhtml
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/current-work-canvas.xhtml	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/current-work-canvas.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4576 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><html class="split" lang="en-US-x-hixie" xmlns="http://www.w3.org/1999/xhtml"><head><meta charset="utf-8"/><meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport"/><title>HTML Standard</title><meta content="#3c790a" name="theme-color"/><link href="https://resources.whatwg.org/standard.css" rel="stylesheet"/><link href="https://resources.whatwg.org/logo.svg" rel="icon"/><style>
-   .status { min-height: 0.6em; font: 1em sans-serif; width: 9em; padding: 0.3em; position: absolute; z-index: 8; right: 0.3em; background: #EEE; color: black; box-shadow: 0 0 3px #999; overflow: hidden; margin: -2em 0 0 0; border-collapse: initial; border-spacing: initial; }
-   .status:hover { z-index: 9; }
-   .status:focus-within { z-index: 9; }
-   .status.wrapped &gt; :not(input) { display: none; }
-   .status &gt; input { position: absolute; left: 0; top: 0; width: 1em; height: 1em; border: none; background: transparent; padding: 0; margin: 0; }
-   .status &gt; p { font-size: 0.6em; margin: 0; padding: 0; }
-   .status &gt; p + p { padding-top: 0.5em; }
-   .status &gt; p &gt; strong { margin-left: 1.5em; }
-   .status &gt; .support { display: block; }
-   .status &gt; .support &gt; span { padding: 0.2em 0; display: block; display: table; }
-   .status &gt; .support &gt; span.partial { color: #666666; filter: grayscale(50%); }
-   .status &gt; .support &gt; span.no { color: #CCCCCC; filter: grayscale(100%); }
-   .status &gt; .support &gt; span.no::before { opacity: 0.5; }
-   .status &gt; .support &gt; span:first-of-type { padding-top: 0.5em; }
-   .status &gt; .support &gt; span &gt; span { padding: 0 0.5em; display: table-cell; vertical-align: top; }
-   .status &gt; .support &gt; span &gt; span:first-child { width: 100%; }
-   .status &gt; .support &gt; span &gt; span:last-child { width: 100%; white-space: pre; padding: 0; }
-   .status &gt; .support &gt; span::before { content: ' '; display: table-cell; min-width: 1.5em; height: 1.5em; background: no-repeat center center; background-size: contain; text-align: right; font-size: 0.75em; font-weight: bold; }
-   .status &gt; .support &gt; .and_chr::before { background-image: url(https://resources.whatwg.org/browser-logos/chrome.svg); }
-   .status &gt; .support &gt; .and_ff::before { background-image: url(https://resources.whatwg.org/browser-logos/firefox.png); }
-   .status &gt; .support &gt; .and_uc::before { background-image: url(https://resources.whatwg.org/browser-logos/uc.png); } /* UC Browser for Android */
-   .status &gt; .support &gt; .android::before { background-image: url(https://resources.whatwg.org/browser-logos/android.svg); }
-   .status &gt; .support &gt; .bb::before { background-image: url(https://resources.whatwg.org/browser-logos/bb.jpg); } /* Blackberry Browser */
-   .status &gt; .support &gt; .chrome::before { background-image: url(https://resources.whatwg.org/browser-logos/chrome.svg); }
-   .status &gt; .support &gt; .edge::before { background-image: url(https://resources.whatwg.org/browser-logos/edge.svg); }
-   .status &gt; .support &gt; .firefox::before { background-image: url(https://resources.whatwg.org/browser-logos/firefox.png); }
-   .status &gt; .support &gt; .ie::before { background-image: url(https://resources.whatwg.org/browser-logos/ie.png); }
-   .status &gt; .support &gt; .ie_mob::before { background-image: url(https://resources.whatwg.org/browser-logos/ie-mobile.svg); }
-   .status &gt; .support &gt; .ios_saf::before { background-image: url(https://resources.whatwg.org/browser-logos/safari-ios.svg); }
-   .status &gt; .support &gt; .op_mini::before { background-image: url(https://resources.whatwg.org/browser-logos/opera-mini.png); }
-   .status &gt; .support &gt; .op_mob::before { background-image: url(https://resources.whatwg.org/browser-logos/opera.png); }
-   .status &gt; .support &gt; .opera::before { background-image: url(https://resources.whatwg.org/browser-logos/opera.png); }
-   .status &gt; .support &gt; .safari::before { background-image: url(https://resources.whatwg.org/browser-logos/safari.png); }
-   .status &gt; .support &gt; .samsung::before { background-image: url(https://resources.whatwg.org/browser-logos/samsung.png); }
-   .status &gt; .caniuse { text-align: right; font-style: italic; width: 100%; }
-   .status &gt; .caniuse + p { margin-top: 0.5em; border-top: 1px solid silver; }
-
-   @media (max-width: 767px) {
-     .status { right: -9em; }
-   }
-  </style><style>
-   [hidden] { display: none; }
-
-   .bad, .bad *:not(.X\58X) { color: gray; border-color: gray; background: transparent; }
-
-   .fingerprint { position: absolute; right: 0; z-index: 5; }
-   @media (max-width: 767px) {
-     .fingerprint { max-width: 35px; }
-   }
-
-   .applies .yes, .yesno .yes { background: yellow; }
-   .yesno .yes, .yesno .no { text-align: center; }
-
-   .applies thead th &gt; * { display: block; }
-   .applies thead code { display: block; }
-   .applies td { text-align: center; }
-
-   .matrix, .matrix td { border: hidden; text-align: right; }
-   .matrix { margin-left: 2em; }
-
-   .vertical-summary-table tr &gt; th[rowspan=&quot;2&quot;]:first-child + th,
-   .vertical-summary-table tr &gt; td[rowspan=&quot;2&quot;]:first-child + td { border-bottom: hidden; }
-
-   .dice-example { border-collapse: collapse; border-style: hidden solid solid hidden; border-width: thin; margin-left: 3em; }
-   .dice-example caption { width: 30em; font-size: smaller; font-style: italic; padding: 0.75em 0; text-align: left; }
-   .dice-example td, .dice-example th { border: solid thin; width: 1.35em; height: 1.05em; text-align: center; padding: 0; }
-
-   td.eg { border-width: thin; text-align: center; }
-
-   #table-example-1 { border: solid thin; border-collapse: collapse; margin-left: 3em; }
-   #table-example-1 caption { padding-bottom: 0.5em; }
-   #table-example-1 thead, #table-example-1 tbody { border: none; }
-   #table-example-1 th, #table-example-1 td { border: solid thin; }
-   #table-example-1 th { font-weight: normal; }
-   #table-example-1 td { border-style: none solid; vertical-align: top; }
-   #table-example-1 th { padding: 0.5em; vertical-align: middle; text-align: center; }
-   #table-example-1 tbody tr:first-child td { padding-top: 0.5em; }
-   #table-example-1 tbody tr:last-child td { padding-bottom: 1.5em; }
-   #table-example-1 tbody td:first-child { padding-left: 2.5em; padding-right: 0; width: 9em; }
-   #table-example-1 tbody td:first-child::after { content: leader(&quot;. &quot;); }
-   #table-example-1 tbody td { padding-left: 2em; padding-right: 2em; }
-   #table-example-1 tbody td:first-child + td { width: 10em; }
-   #table-example-1 tbody td:first-child + td ~ td { width: 2.5em; }
-   #table-example-1 tbody td:first-child + td + td + td ~ td { width: 1.25em; }
-
-   .apple-table-examples { border: none; border-collapse: separate; border-spacing: 1.5em 0em; width: 40em; margin-left: 3em; }
-   .apple-table-examples * { font-family: &quot;Times&quot;, serif; }
-   .apple-table-examples td, .apple-table-examples th { border: none; white-space: nowrap; padding-top: 0; padding-bottom: 0; }
-   .apple-table-examples tbody th:first-child { border-left: none; width: 100%; }
-   .apple-table-examples thead th:first-child ~ th { font-size: smaller; font-weight: bolder; border-bottom: solid 2px; text-align: center; }
-   .apple-table-examples tbody th::after, .apple-table-examples tfoot th::after { content: leader(&quot;. &quot;) }
-   .apple-table-examples tbody th, .apple-table-examples tfoot th { font: inherit; text-align: left; }
-   .apple-table-examples td { text-align: right; vertical-align: top; }
-   .apple-table-examples.e1 tbody tr:last-child td { border-bottom: solid 1px; }
-   .apple-table-examples.e1 tbody + tbody tr:last-child td { border-bottom: double 3px; }
-   .apple-table-examples.e2 th[scope=row] { padding-left: 1em; }
-   .apple-table-examples sup { line-height: 0; }
-
-   .three-column-nowrap tr &gt; td:first-child,
-   .three-column-nowrap tr &gt; td:first-child + td,
-   .three-column-nowrap tr &gt; td:first-child + td + td { white-space: nowrap; }
-
-   .details-example img { vertical-align: top; }
-
-   .parse-error-table td &gt; p:first-child { margin-top: 0; }
-
-   #named-character-references-table {
-     white-space: nowrap;
-     font-size: 0.6em;
-     column-width: 30em;
-     column-gap: 1em;
-     -webkit-column-width: 30em;
-     -webkit-column-gap: 1em;
-   }
-   #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:first-child + td,
-   #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:last-child { text-align: center; }
-   #named-character-references-table &gt; table &gt; tbody &gt; tr &gt; td:last-child:hover &gt; span { position: absolute; top: auto; left: auto; margin-left: 0.5em; line-height: 1.2; font-size: 5em; border: outset; padding: 0.25em 0.5em; background: white; width: 1.25em; height: auto; text-align: center; }
-   #named-character-references-table &gt; table &gt; tbody &gt; tr#entity-CounterClockwiseContourIntegral &gt; td:first-child { font-size: 0.5em; }
-
-   .glyph.control { color: red; }
-
-   #table-example-1 * { font-family: &quot;Essays1743&quot;, serif; line-height: 1.01em; }
-   @font-face {
-     font-family: 'Essays1743';
-     src: url('/fonts/Essays1743.ttf');
-   }
-   @font-face {
-     font-family: 'Essays1743';
-     font-weight: bold;
-     src: url('/fonts/Essays1743-Bold.ttf');
-   }
-   @font-face {
-     font-family: 'Essays1743';
-     font-style: italic;
-     src: url('/fonts/Essays1743-Italic.ttf');
-   }
-   @font-face {
-     font-family: 'Essays1743';
-     font-style: italic;
-     font-weight: bold;
-     src: url('/fonts/Essays1743-BoldItalic.ttf');
-   }
-
-   @media (max-width: 767px) {
-     #abstractimg { width: 100%; }
-   }
-   #abstractimg, #abstractimg text { font: inherit; }
-   #abstractimg rect { fill: #424242; }
-   #abstractimg text { fill: #ffffff; font-size: 18px }
-   #abstractimg .top { word-spacing: 50px; text-anchor: middle; }
-   #abstractimg .left, #abstractimg .bottom { word-spacing: 12px; }
-   #abstractimg .right { font-size: 25px; }
-  </style></head><body><header class="head with-buttons" id="head">
-   <a class="logo" href="https://whatwg.org/"><img alt="WHATWG" height="100" src="https://resources.whatwg.org/logo.svg" width="100"/></a>
-   <hgroup><h1 class="allcaps">HTML</h1><h2 class="no-num no-toc" id="living-standard">Living Standard — Last Updated <span class="pubdate">31 August 2017</span></h2></hgroup>
-   
-   
-
-   
-  <p class="copyright">Parts of this specification are © Copyright 2004-2014 Apple Inc., Mozilla Foundation, and Opera Software ASA. You are granted a license to use, reproduce and create derivative works of this document.</p></header><h4 id="the-canvas-element"><span class="secno">4.12.5</span> The <dfn id="canvas"><code>canvas</code></dfn> element<a class="self-link" href="#the-canvas-element"/></h4><div class="status"><input onclick="toggleStatus(this)" type="button" value="⋰"/><p class="support"><strong>Support:</strong> canvas<span class="and_chr yes"><span>Chrome for Android</span> <span>59+</span></span><span class="chrome yes"><span>Chrome</span> <span>4+</span></span><span class="and_uc yes"><span>UC Browser for Android</span> <span>11.4+</span></span><span class="ios_saf yes"><span>iOS Safari</span> <span>3.2+</span></span><span class="firefox yes"><span>Firefox</span> <span>3.6+</span></span><span class="ie yes"><span>IE</span> <span>9+</span></span><span class="samsung yes"><span>Samsung Internet</span> <span>4+</span></span><span class="op_mini partial"><span>Opera Mini (limited)</span> <span>all+</span></span><span class="safari yes"><span>Safari</span> <span>4+</span></span><span class="android yes"><span>Android Browser</span> <span>3+</span></span><span class="opera yes"><span>Opera</span> <span>9+</span></span><span class="edge yes"><span>Edge</span> <span>12+</span></span></p><p class="caniuse">Source: <a href="https://caniuse.com/#feat=canvas">caniuse.com</a></p></div>
-
-  <dl class="element"><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-categories" id="the-canvas-element:concept-element-categories">Categories</a>:</dt><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#flow-content-2" id="the-canvas-element:flow-content-2">Flow content</a>.</dd><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#phrasing-content-2" id="the-canvas-element:phrasing-content-2">Phrasing content</a>.</dd><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category">Embedded content</a>.</dd><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#palpable-content-2" id="the-canvas-element:palpable-content-2">Palpable content</a>.</dd><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-contexts" id="the-canvas-element:concept-element-contexts">Contexts in which this element can be used</a>:</dt><dd>Where <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-2">embedded content</a> is expected.</dd><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-content-model" id="the-canvas-element:concept-element-content-model">Content model</a>:</dt><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#transparent" id="the-canvas-element:transparent">Transparent</a>, but with no <a href="https://html.spec.whatwg.org/multipage/dom.html#interactive-content-2" id="the-canvas-element:interactive-content-2">interactive content</a> descendants except
-   for <code id="the-canvas-element:the-a-element"><a href="https://html.spec.whatwg.org/multipage/text-level-semantics.html#the-a-element">a</a></code> elements, <code id="the-canvas-element:the-img-element"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> elements with
-   <code id="the-canvas-element:attr-hyperlink-usemap"><a href="https://html.spec.whatwg.org/multipage/image-maps.html#attr-hyperlink-usemap">usemap</a></code> attributes, <code id="the-canvas-element:the-button-element"><a href="https://html.spec.whatwg.org/multipage/form-elements.html#the-button-element">button</a></code> elements,
-   <code id="the-canvas-element:the-input-element"><a href="https://html.spec.whatwg.org/multipage/input.html#the-input-element">input</a></code> elements whose <code id="the-canvas-element:attr-input-type"><a href="https://html.spec.whatwg.org/multipage/input.html#attr-input-type">type</a></code> attribute are in
-   the <a href="https://html.spec.whatwg.org/multipage/input.html#checkbox-state-(type=checkbox)" id="the-canvas-element:checkbox-state-(type=checkbox)">Checkbox</a> or <a href="https://html.spec.whatwg.org/multipage/input.html#radio-button-state-(type=radio)" id="the-canvas-element:radio-button-state-(type=radio)">Radio Button</a> states, <code id="the-canvas-element:the-input-element-2"><a href="https://html.spec.whatwg.org/multipage/input.html#the-input-element">input</a></code> elements that are
-   <a href="https://html.spec.whatwg.org/multipage/forms.html#concept-button" id="the-canvas-element:concept-button">buttons</a>, <code id="the-canvas-element:the-select-element"><a href="https://html.spec.whatwg.org/multipage/form-elements.html#the-select-element">select</a></code> elements with a <code id="the-canvas-element:attr-select-multiple"><a href="https://html.spec.whatwg.org/multipage/form-elements.html#attr-select-multiple">multiple</a></code> attribute or a <a href="https://html.spec.whatwg.org/multipage/form-elements.html#concept-select-size" id="the-canvas-element:concept-select-size">display size</a> greater than 1, and elements that would not be
-   <a href="https://html.spec.whatwg.org/multipage/dom.html#interactive-content-2" id="the-canvas-element:interactive-content-2-2">interactive content</a> except for having the <code id="the-canvas-element:attr-tabindex"><a href="https://html.spec.whatwg.org/multipage/interaction.html#attr-tabindex">tabindex</a></code> attribute specified.</dd><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-tag-omission" id="the-canvas-element:concept-element-tag-omission">Tag omission in text/html</a>:</dt><dd>Neither tag is omissible.</dd><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-attributes" id="the-canvas-element:concept-element-attributes">Content attributes</a>:</dt><dd><a href="https://html.spec.whatwg.org/multipage/dom.html#global-attributes" id="the-canvas-element:global-attributes">Global attributes</a></dd><dd><code id="the-canvas-element:attr-canvas-width"><a href="#attr-canvas-width">width</a></code> — Horizontal dimension</dd><dd><code id="the-canvas-element:attr-canvas-height"><a href="#attr-canvas-height">height</a></code> — Vertical dimension</dd><dt><a href="https://html.spec.whatwg.org/multipage/dom.html#concept-element-dom" id="the-canvas-element:concept-element-dom">DOM interface</a>:</dt><dd>
-    <pre class="idl">typedef (<a href="#canvasrenderingcontext2d" id="the-canvas-element:canvasrenderingcontext2d">CanvasRenderingContext2D</a> or <a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext" id="the-canvas-element:webglrenderingcontext">WebGLRenderingContext</a>) <dfn id="renderingcontext">RenderingContext</dfn>;
-
-[Exposed=Window,
- <a href="https://html.spec.whatwg.org/multipage/dom.html#htmlconstructor" id="the-canvas-element:htmlconstructor">HTMLConstructor</a>]
-interface <dfn id="htmlcanvaselement">HTMLCanvasElement</dfn> : <a href="https://html.spec.whatwg.org/multipage/dom.html#htmlelement" id="the-canvas-element:htmlelement">HTMLElement</a> {
-  [<a href="https://html.spec.whatwg.org/multipage/custom-elements.html#cereactions" id="the-canvas-element:cereactions">CEReactions</a>] attribute unsigned long <a href="#dom-canvas-width" id="the-canvas-element:dom-canvas-width">width</a>;
-  [<a href="https://html.spec.whatwg.org/multipage/custom-elements.html#cereactions" id="the-canvas-element:cereactions-2">CEReactions</a>] attribute unsigned long <a href="#dom-canvas-height" id="the-canvas-element:dom-canvas-height">height</a>;
-
-  <a href="#renderingcontext" id="the-canvas-element:renderingcontext">RenderingContext</a>? <a href="#dom-canvas-getcontext-2" id="the-canvas-element:dom-canvas-getcontext-2">getContext</a>(DOMString contextId, any... arguments);
-
-  USVString <a href="#dom-canvas-todataurl-2" id="the-canvas-element:dom-canvas-todataurl-2">toDataURL</a>(optional DOMString type, optional any quality);
-  void <a href="#dom-canvas-toblob-2" id="the-canvas-element:dom-canvas-toblob-2">toBlob</a>(<a href="#blobcallback" id="the-canvas-element:blobcallback">BlobCallback</a> _callback, optional DOMString type, optional any quality);
-  <a href="#offscreencanvas" id="the-canvas-element:offscreencanvas">OffscreenCanvas</a> <a href="#dom-canvas-transfercontroltooffscreen-2" id="the-canvas-element:dom-canvas-transfercontroltooffscreen-2">transferControlToOffscreen</a>();
-};
-
-callback <dfn id="blobcallback">BlobCallback</dfn> = void (<a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob" id="the-canvas-element:blob">Blob</a>? blob);</pre>
-   </dd></dl>
-
-  <p>The <code id="the-canvas-element:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element provides scripts with a resolution-dependent bitmap canvas,
-  which can be used for rendering graphs, game graphics, art, or other visual images on the fly.</p>
-
-  <p>Authors should not use the <code id="the-canvas-element:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element in a document when a more suitable
-  element is available. For example, it is inappropriate to use a <code id="the-canvas-element:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element to
-  render a page heading: if the desired presentation of the heading is graphically intense, it
-  should be marked up using appropriate elements (typically <code id="the-canvas-element:the-h1,-h2,-h3,-h4,-h5,-and-h6-elements"><a href="https://html.spec.whatwg.org/multipage/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements">h1</a></code>) and then styled using
-  CSS and supporting technologies such as Web Components.</p>
-
-  <p>When authors use the <code id="the-canvas-element:the-canvas-element-4"><a href="#the-canvas-element">canvas</a></code> element, they must also provide content that, when
-  presented to the user, conveys essentially the same function or purpose as the
-  <code id="the-canvas-element:the-canvas-element-5"><a href="#the-canvas-element">canvas</a></code>'s bitmap. This content may be placed as content of the <code id="the-canvas-element:the-canvas-element-6"><a href="#the-canvas-element">canvas</a></code>
-  element. The contents of the <code id="the-canvas-element:the-canvas-element-7"><a href="#the-canvas-element">canvas</a></code> element, if any, are the element's <a href="https://html.spec.whatwg.org/multipage/dom.html#fallback-content" id="the-canvas-element:fallback-content">fallback
-  content</a>.</p>
-
-  <hr/>
-
-  <p>In interactive visual media, if <a href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-n-script" id="the-canvas-element:concept-n-script">scripting is enabled</a> for
-  the <code id="the-canvas-element:the-canvas-element-8"><a href="#the-canvas-element">canvas</a></code> element, and if support for <code id="the-canvas-element:the-canvas-element-9"><a href="#the-canvas-element">canvas</a></code> elements has been enabled,
-  then the <code id="the-canvas-element:the-canvas-element-10"><a href="#the-canvas-element">canvas</a></code> element <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents">represents</a> <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-3">embedded content</a>
-  consisting of a dynamically created image, the element's bitmap.</p>
-
-  <p>In non-interactive, static, visual media, if the <code id="the-canvas-element:the-canvas-element-11"><a href="#the-canvas-element">canvas</a></code> element has been
-  previously associated with a rendering context (e.g. if the page was viewed in an interactive
-  visual medium and is now being printed, or if some script that ran during the page layout process
-  painted on the element), then the <code id="the-canvas-element:the-canvas-element-12"><a href="#the-canvas-element">canvas</a></code> element <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents-2">represents</a>
-  <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-4">embedded content</a> with the element's current bitmap and size. Otherwise, the element
-  represents its <a href="https://html.spec.whatwg.org/multipage/dom.html#fallback-content" id="the-canvas-element:fallback-content-2">fallback content</a> instead.</p>
-
-  <p>In non-visual media, and in visual media if <a href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-n-noscript" id="the-canvas-element:concept-n-noscript">scripting is
-  disabled</a> for the <code id="the-canvas-element:the-canvas-element-13"><a href="#the-canvas-element">canvas</a></code> element or if support for <code id="the-canvas-element:the-canvas-element-14"><a href="#the-canvas-element">canvas</a></code> elements
-  has been disabled, the <code id="the-canvas-element:the-canvas-element-15"><a href="#the-canvas-element">canvas</a></code> element <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents-3">represents</a> its <a href="https://html.spec.whatwg.org/multipage/dom.html#fallback-content" id="the-canvas-element:fallback-content-3">fallback
-  content</a> instead.</p>
-
-  
-  <p>When a <code id="the-canvas-element:the-canvas-element-16"><a href="#the-canvas-element">canvas</a></code> element <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents-4">represents</a> <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-5">embedded content</a>, the
-  user can still focus descendants of the <code id="the-canvas-element:the-canvas-element-17"><a href="#the-canvas-element">canvas</a></code> element (in the <a href="https://html.spec.whatwg.org/multipage/dom.html#fallback-content" id="the-canvas-element:fallback-content-4">fallback
-  content</a>). When an element is <a href="https://html.spec.whatwg.org/multipage/interaction.html#focused" id="the-canvas-element:focused">focused</a>, it is the target of keyboard interaction
-  events (even though the element itself is not visible). This allows authors to make an interactive
-  canvas keyboard-accessible: authors should have a one-to-one mapping of interactive regions to <i id="the-canvas-element:focusable-area"><a href="https://html.spec.whatwg.org/multipage/interaction.html#focusable-area">focusable areas</a></i> in the <a href="https://html.spec.whatwg.org/multipage/dom.html#fallback-content" id="the-canvas-element:fallback-content-5">fallback content</a>. (Focus has no
-  effect on mouse interaction events.) <a href="https://html.spec.whatwg.org/multipage/references.html#refsUIEVENTS">[UIEVENTS]</a></p> 
-
-  <p>An element whose nearest <code id="the-canvas-element:the-canvas-element-18"><a href="#the-canvas-element">canvas</a></code> element ancestor is <a href="https://html.spec.whatwg.org/multipage/rendering.html#being-rendered" id="the-canvas-element:being-rendered">being rendered</a>
-  and <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents-5">represents</a> <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-6">embedded content</a> is an element that is <dfn id="being-used-as-relevant-canvas-fallback-content">being used as
-  relevant canvas fallback content</dfn>.</p>
-
-  <hr/>
-
-  <p>The <code id="the-canvas-element:the-canvas-element-19"><a href="#the-canvas-element">canvas</a></code> element has two attributes to control the size of the element's bitmap:
-  <dfn id="attr-canvas-width"><code>width</code></dfn> and <dfn id="attr-canvas-height"><code>height</code></dfn>. These attributes, when specified, must have
-  values that are <a href="https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-non-negative-integer" id="the-canvas-element:valid-non-negative-integer">valid non-negative integers</a>. The <a href="https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#rules-for-parsing-non-negative-integers" id="the-canvas-element:rules-for-parsing-non-negative-integers">rules for parsing non-negative integers</a> must be used to obtain their
-  numeric values. If an attribute is missing, or if parsing its value returns an error, then the
-  default value must be used instead. The <code id="the-canvas-element:attr-canvas-width-2"><a href="#attr-canvas-width">width</a></code>
-  attribute defaults to 300, and the <code id="the-canvas-element:attr-canvas-height-2"><a href="#attr-canvas-height">height</a></code> attribute
-  defaults to 150.</p>
-
-  <p>The <a data-x-internal="intrinsic-dimensions" href="https://drafts.csswg.org/css2/conform.html#intrinsic" id="the-canvas-element:intrinsic-dimensions">intrinsic dimensions</a> of the <code id="the-canvas-element:the-canvas-element-20"><a href="#the-canvas-element">canvas</a></code> element when it
-  <a href="https://html.spec.whatwg.org/multipage/dom.html#represents" id="the-canvas-element:represents-6">represents</a> <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-7">embedded content</a> are equal to the dimensions of the
-  element's bitmap.</p>
-
-  <p>The user agent must use a square pixel density consisting of one pixel of image data per
-  coordinate space unit for the bitmaps of a <code id="the-canvas-element:the-canvas-element-21"><a href="#the-canvas-element">canvas</a></code> and its rendering contexts.</p>
-
-  <p class="note">A <code id="the-canvas-element:the-canvas-element-22"><a href="#the-canvas-element">canvas</a></code> element can be sized arbitrarily by a style sheet, its
-  bitmap is then subject to the <a data-x-internal="'object-fit'" href="https://drafts.csswg.org/css-images/#the-object-fit" id="the-canvas-element:'object-fit'">'object-fit'</a> CSS property.</p>
-
-  
-
-  <hr/>
-
-  <p>The bitmaps of <code id="the-canvas-element:the-canvas-element-23"><a href="#the-canvas-element">canvas</a></code> elements, the bitmaps of <code id="the-canvas-element:imagebitmap"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> objects,
-  as well as some of the bitmaps of rendering contexts, such as those described in the sections on
-  the <code id="the-canvas-element:canvasrenderingcontext2d-2"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> and <code id="the-canvas-element:imagebitmaprenderingcontext"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> objects
-  below, have an <dfn id="concept-canvas-origin-clean">origin-clean</dfn> flag, which can be
-  set to true or false. Initially, when the <code id="the-canvas-element:the-canvas-element-24"><a href="#the-canvas-element">canvas</a></code> element or <code id="the-canvas-element:imagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code>
-  object is created, its bitmap's <a href="#concept-canvas-origin-clean" id="the-canvas-element:concept-canvas-origin-clean">origin-clean</a>
-  flag must be set to true.</p>
-
-  <p>A <code id="the-canvas-element:the-canvas-element-25"><a href="#the-canvas-element">canvas</a></code> element can have a rendering context bound to it. Initially, it does not
-  have a bound rendering context. To keep track of whether it has a rendering context or not, and
-  what kind of rendering context it is, a <code id="the-canvas-element:the-canvas-element-26"><a href="#the-canvas-element">canvas</a></code> also has a <dfn id="concept-canvas-context-mode">canvas context mode</dfn>, which is initially <dfn id="concept-canvas-none">none</dfn> but can be changed to either <dfn id="concept-canvas-placeholder">placeholder</dfn>, <dfn id="concept-canvas-2d">2d</dfn>, <dfn id="concept-canvas-bitmaprenderer">bitmaprenderer</dfn>, or <dfn id="concept-canvas-webgl">webgl</dfn> by algorithms defined in this specification.</p>
-
-  <p>When its <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode">canvas context mode</a> is <a href="#concept-canvas-none" id="the-canvas-element:concept-canvas-none">none</a>, a <code id="the-canvas-element:the-canvas-element-27"><a href="#the-canvas-element">canvas</a></code> element has no rendering context,
-  and its bitmap must be fully transparent black with an <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-width" id="the-canvas-element:intrinsic-width">intrinsic width</a> equal to the
-  numeric value of the element's <code id="the-canvas-element:attr-canvas-width-3"><a href="#attr-canvas-width">width</a></code> attribute and an
-  <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-height" id="the-canvas-element:intrinsic-height">intrinsic height</a> equal to the numeric value of the element's <code id="the-canvas-element:attr-canvas-height-3"><a href="#attr-canvas-height">height</a></code> attribute, those values being interpreted in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="the-canvas-element:'px'">CSS pixels</a>, and being updated as the attributes are set, changed, or
-  removed.</p>
-
-  <p>When its <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-2">canvas context mode</a> is <a href="#concept-canvas-placeholder" id="the-canvas-element:concept-canvas-placeholder">placeholder</a>, a <code id="the-canvas-element:the-canvas-element-28"><a href="#the-canvas-element">canvas</a></code> element has no
-  rendering context. It serves as a placeholder for an <code id="the-canvas-element:offscreencanvas-2"><a href="#offscreencanvas">OffscreenCanvas</a></code> object, and
-  the content of the <code id="the-canvas-element:the-canvas-element-29"><a href="#the-canvas-element">canvas</a></code> element is updated by calling the <code id="the-canvas-element:offscreencontext-commit"><a href="#offscreencontext-commit">commit()</a></code> method of the <code id="the-canvas-element:offscreencanvas-3"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-  object's rendering context.</p>
-
-  <p>When a <code id="the-canvas-element:the-canvas-element-30"><a href="#the-canvas-element">canvas</a></code> element represents <a href="https://html.spec.whatwg.org/multipage/dom.html#embedded-content-category" id="the-canvas-element:embedded-content-category-8">embedded content</a>, it provides a
-  <a data-x-internal="paint-source" href="https://drafts.csswg.org/css-images-4/#paint-source" id="the-canvas-element:paint-source">paint source</a> whose width is the element's <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-width" id="the-canvas-element:intrinsic-width-2">intrinsic width</a>, whose height
-  is the element's <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-height" id="the-canvas-element:intrinsic-height-2">intrinsic height</a>, and whose appearance is the element's bitmap.</p>
-
-  <p>Whenever the <code id="the-canvas-element:attr-canvas-width-4"><a href="#attr-canvas-width">width</a></code> and <code id="the-canvas-element:attr-canvas-height-4"><a href="#attr-canvas-height">height</a></code> content attributes are set, removed, changed, or
-  redundantly set to the value they already have, then the user agent must perform the action
-  from the row of the following table that corresponds to the <code id="the-canvas-element:the-canvas-element-31"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-3">context mode</a>.</p>
-
-  <table><thead><tr><th>
-      <p><a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-4">Context Mode</a></p>
-     </th><th>
-      <p>Action</p>
-
-   </th></tr></thead><tbody><tr><th>
-      <p><a href="#concept-canvas-2d" id="the-canvas-element:concept-canvas-2d">2d</a></p>
-     </th><td>
-      <p>Follow the steps to <a href="#concept-canvas-set-bitmap-dimensions" id="the-canvas-element:concept-canvas-set-bitmap-dimensions">set bitmap
-      dimensions</a> to the numeric values of the <code id="the-canvas-element:attr-canvas-width-5"><a href="#attr-canvas-width">width</a></code>
-      and <code id="the-canvas-element:attr-canvas-height-5"><a href="#attr-canvas-height">height</a></code> content attributes.</p>
-
-    </td></tr><tr><th>
-      <p><a href="#concept-canvas-webgl" id="the-canvas-element:concept-canvas-webgl">webgl</a></p>
-     </th><td>
-      <p>Follow the behavior defined in the WebGL specification. <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a></p>
-
-    </td></tr><tr><th>
-      <p><a href="#concept-canvas-bitmaprenderer" id="the-canvas-element:concept-canvas-bitmaprenderer">bitmaprenderer</a></p>
-     </th><td>
-      <p>If the context's <a href="#concept-imagebitmaprenderingcontext-bitmap-mode" id="the-canvas-element:concept-imagebitmaprenderingcontext-bitmap-mode">bitmap
-      mode</a> is set to <a href="#concept-imagebitmaprenderingcontext-blank" id="the-canvas-element:concept-imagebitmaprenderingcontext-blank">blank</a>,
-      run the steps to <a href="#set-an-imagebitmaprenderingcontext's-output-bitmap" id="the-canvas-element:set-an-imagebitmaprenderingcontext's-output-bitmap">set an <code>ImageBitmapRenderingContext</code>'s output bitmap</a>,
-      passing the <code id="the-canvas-element:the-canvas-element-32"><a href="#the-canvas-element">canvas</a></code> element's rendering context.</p>
-
-    </td></tr><tr><th>
-      <p><a href="#concept-canvas-placeholder" id="the-canvas-element:concept-canvas-placeholder-2">placeholder</a></p>
-     </th><td>
-      <p>Do nothing.</p>
-
-    </td></tr><tr><th>
-      <p><a href="#concept-canvas-none" id="the-canvas-element:concept-canvas-none-2">none</a></p>
-     </th><td>
-      <p>Do nothing.</p>
-  </td></tr></tbody></table>
-
-  <p>The <dfn id="dom-canvas-width"><code>width</code></dfn> and <dfn id="dom-canvas-height"><code>height</code></dfn> IDL attributes must <a href="https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#reflect" id="the-canvas-element:reflect">reflect</a> the
-  respective content attributes of the same name, with the same defaults.</p>
-
-  
-
-  <hr/>
-
-  
-  <dl class="domintro"><dt><var>context</var> = <var>canvas</var> . <code id="dom-canvas-getcontext"><a href="#dom-canvas-getcontext-2">getContext</a></code>(<var>contextId</var> [, ... ] )</dt><dd>
-
-    <p>Returns an object that exposes an API for drawing on the canvas. The first argument
-    specifies the desired API, either &quot;<code id="the-canvas-element:canvas-context-2d"><a href="#canvas-context-2d">2d</a></code>&quot;, &quot;<code id="the-canvas-element:canvas-context-bitmaprenderer"><a href="#canvas-context-bitmaprenderer">bitmaprenderer</a></code>&quot; or &quot;<code id="the-canvas-element:canvas-context-webgl"><a href="#canvas-context-webgl">webgl</a></code>&quot;. Subsequent arguments are handled by that API.</p>
-
-    <p>This specification defines the &quot;<code id="the-canvas-element:canvas-context-2d-2"><a href="#canvas-context-2d">2d</a></code>&quot; and &quot;<code id="the-canvas-element:canvas-context-bitmaprenderer-2"><a href="#canvas-context-bitmaprenderer">bitmaprenderer</a></code>&quot; contexts below. There is also a
-    specification that defines a &quot;<code id="the-canvas-element:canvas-context-webgl-2"><a href="#canvas-context-webgl">webgl</a></code>&quot; context.
-    <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a></p>
-
-    <p>Returns null if the given context ID is not supported, or if the canvas has already been
-    initialized with another context type (e.g. trying to get a &quot;<code id="the-canvas-element:canvas-context-2d-3"><a href="#canvas-context-2d">2d</a></code>&quot; context after getting a &quot;<code id="the-canvas-element:canvas-context-webgl-3"><a href="#canvas-context-webgl">webgl</a></code>&quot; context).</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-canvas-getcontext-2"><code>getContext(<var>contextId</var>,
-  <var>arguments...</var>)</code></dfn> method of the <code id="the-canvas-element:the-canvas-element-33"><a href="#the-canvas-element">canvas</a></code> element, when invoked,
-  must run the steps in the cell of the following table whose column header describes the
-  <code id="the-canvas-element:the-canvas-element-34"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-5">canvas context
-  mode</a> and whose row header describes the method's first argument.</p>
-
-  <table><thead><tr><td>
-     </td><th><a href="#concept-canvas-none" id="the-canvas-element:concept-canvas-none-3">none</a>
-     </th><th><a href="#concept-canvas-2d" id="the-canvas-element:concept-canvas-2d-2">2d</a>
-     </th><th><a href="#concept-canvas-bitmaprenderer" id="the-canvas-element:concept-canvas-bitmaprenderer-2">bitmaprenderer</a>
-     </th><th><a href="#concept-canvas-webgl" id="the-canvas-element:concept-canvas-webgl-2">webgl</a>
-     </th><th><a href="#concept-canvas-placeholder" id="the-canvas-element:concept-canvas-placeholder-3">placeholder</a>
-   </th></tr></thead><tbody><tr><th>&quot;<dfn id="canvas-context-2d"><code>2d</code></dfn>&quot;
-     </th><td>
-
-      Follow the <a href="#2d-context-creation-algorithm" id="the-canvas-element:2d-context-creation-algorithm">2D context creation algorithm</a> defined in the section below, passing
-      it the <code id="the-canvas-element:the-canvas-element-35"><a href="#the-canvas-element">canvas</a></code> element and the method's <var>arguments...</var>, to obtain a
-      <code id="the-canvas-element:canvasrenderingcontext2d-3"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object; if this does not throw an exception, then
-      set the <code id="the-canvas-element:the-canvas-element-36"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-6">context
-      mode</a> to <a href="#concept-canvas-2d" id="the-canvas-element:concept-canvas-2d-3">2d</a>, and return the
-      <code id="the-canvas-element:canvasrenderingcontext2d-4"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object.
-
-     </td><td>
-      Return the same object as was returned the last time the method was invoked with this same
-      first argument.
-     </td><td>
-      Return null.
-     </td><td>
-      Return null.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-canvas-element:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-canvas-element:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-    </td></tr><tr><th>&quot;<dfn id="canvas-context-bitmaprenderer"><code>bitmaprenderer</code></dfn>&quot;
-     </th><td>
-
-      Follow the <a href="#imagebitmaprenderingcontext-creation-algorithm" id="the-canvas-element:imagebitmaprenderingcontext-creation-algorithm"><code>ImageBitmapRenderingContext</code> creation algorithm</a> defined
-      in the section below, passing it the <code id="the-canvas-element:the-canvas-element-37"><a href="#the-canvas-element">canvas</a></code> element and the method's
-      <var>arguments...</var>, to obtain an <code id="the-canvas-element:imagebitmaprenderingcontext-2"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object; then
-      set the <code id="the-canvas-element:the-canvas-element-38"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-7">context
-      mode</a> to <a href="#concept-canvas-bitmaprenderer" id="the-canvas-element:concept-canvas-bitmaprenderer-3">bitmaprenderer</a>, and return the
-      <code id="the-canvas-element:imagebitmaprenderingcontext-3"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object.
-
-     </td><td>
-      Return null.
-     </td><td>
-      Return the same object as was returned the last time the method was invoked with this same
-      first argument.
-     </td><td>
-      Return null.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-canvas-element:invalidstateerror-2">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-canvas-element:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-    </td></tr><tr><th>&quot;<dfn id="canvas-context-webgl"><code>webgl</code></dfn>&quot;, if the user agent supports the WebGL feature in its current configuration
-     </th><td>
-
-      Follow the instructions given in the WebGL specification's <i>Context Creation</i> section to
-      obtain either a <code id="the-canvas-element:webglrenderingcontext-2"><a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext">WebGLRenderingContext</a></code> or null; if the returned value is null,
-      then return null and abort these steps, otherwise, set the <code id="the-canvas-element:the-canvas-element-39"><a href="#the-canvas-element">canvas</a></code> element's
-      <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-8">context mode</a> to <a href="#concept-canvas-webgl" id="the-canvas-element:concept-canvas-webgl-3">webgl</a>, and return the <code id="the-canvas-element:webglrenderingcontext-3"><a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext">WebGLRenderingContext</a></code>
-      object <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a>
-
-     </td><td>
-      Return null.
-     </td><td>
-      Return null.
-     </td><td>
-      Return the same object as was returned the last time the method was invoked with this same
-      first argument.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-canvas-element:invalidstateerror-3">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-canvas-element:domexception-3"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-    </td></tr><tr><th>An unsupported value*
-     </th><td>
-      Return null.
-     </td><td>
-      Return null.
-     </td><td>
-      Return null.
-     </td><td>
-      Return null.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-canvas-element:invalidstateerror-4">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-canvas-element:domexception-4"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-  </td></tr></tbody></table>
-
-  <p class="tablenote"><small>* For example, the &quot;<code id="the-canvas-element:canvas-context-webgl-4"><a href="#canvas-context-webgl">webgl</a></code>&quot;
-  value in the case of a user agent having exhausted the graphics hardware's abilities and having no
-  software fallback implementation.</small></p>
-
-  <hr/>
-
-  
-
-  <dl class="domintro"><dt><var>url</var> = <var>canvas</var> . <code id="dom-canvas-todataurl"><a href="#dom-canvas-todataurl-2">toDataURL</a></code>( [ <var>type</var> [, <var>quality</var> ] ] )</dt><dd>
-
-    <p>Returns a <a data-x-internal="data-protocol" href="https://tools.ietf.org/html/rfc2397#section-2" id="the-canvas-element:data-protocol"><code>data:</code> URL</a> for the image in the
-    canvas.</p>
-
-    <p>The first argument, if provided, controls the type of the image to be returned (e.g. PNG or
-    JPEG). The default is &quot;<code id="the-canvas-element:image/png"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot;; that type is also used if the given type isn't
-    supported. The second argument applies if the type is an image format that supports variable
-    quality (such as &quot;<code id="the-canvas-element:image/jpeg"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/jpeg">image/jpeg</a></code>&quot;), and is a number in the range 0.0 to 1.0 inclusive
-    indicating the desired quality level for the resulting image.</p>
-
-    <p>When trying to use types other than &quot;<code id="the-canvas-element:image/png-2"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot;, authors can check if the image
-    was really returned in the requested format by checking to see if the returned string starts
-    with one of the exact strings &quot;<code>data:image/png,</code>&quot; or &quot;<code>data:image/png;</code>&quot;. If it does, the image is PNG, and thus the requested type was
-    not supported. (The one exception to this is if the canvas has either no height or no width, in
-    which case the result might simply be &quot;<code>data:,</code>&quot;.)</p>
-
-   </dd><dt><var>canvas</var> . <code id="dom-canvas-toblob"><a href="#dom-canvas-toblob-2">toBlob</a></code>(<var>callback</var> [, <var>type</var> [, quality ] ] )</dt><dd>
-
-    <p>Creates a <code id="the-canvas-element:blob-2"><a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob">Blob</a></code> object representing a file containing the image in the canvas,
-    and invokes a callback with a handle to that object.</p>
-
-    <p>The second argument, if provided, controls the type of the image to be returned (e.g. PNG or
-    JPEG). The default is &quot;<code id="the-canvas-element:image/png-3"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot;; that type is also used if the given type isn't
-    supported. The third argument applies if the type is an image format that supports variable
-    quality (such as &quot;<code id="the-canvas-element:image/jpeg-2"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/jpeg">image/jpeg</a></code>&quot;), and is a number in the range 0.0 to 1.0 inclusive
-    indicating the desired quality level for the resulting image.</p>
-
-   </dd><dt><var>canvas</var> . <code id="dom-canvas-transfercontroltooffscreen"><a href="#dom-canvas-transfercontroltooffscreen-2">transferControlToOffscreen</a></code>()</dt><dd>
-    <p>Returns a newly created <code id="the-canvas-element:offscreencanvas-4"><a href="#offscreencanvas">OffscreenCanvas</a></code> object that uses the
-    <code id="the-canvas-element:the-canvas-element-40"><a href="#the-canvas-element">canvas</a></code> element as a placeholder. Once the <code id="the-canvas-element:the-canvas-element-41"><a href="#the-canvas-element">canvas</a></code> element has become a
-    placeholder for an <code id="the-canvas-element:offscreencanvas-5"><a href="#offscreencanvas">OffscreenCanvas</a></code> object, its intrinsic size can no longer be
-    changed, and it cannot have a rendering context. The content of the placeholder canvas is
-    updated by calling the <code id="the-canvas-element:offscreencontext-commit-2"><a href="#offscreencontext-commit">commit()</a></code> method of the
-    <code id="the-canvas-element:offscreencanvas-6"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's rendering context.
-    </p>
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-canvas-todataurl-2"><code>toDataURL(<var>type</var>,
-  <var>quality</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If this <code id="the-canvas-element:the-canvas-element-42"><a href="#the-canvas-element">canvas</a></code> element's bitmap's <a href="#concept-canvas-origin-clean" id="the-canvas-element:concept-canvas-origin-clean-2">origin-clean</a> flag is set to false, then throw a
-   <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="the-canvas-element:securityerror">&quot;<code>SecurityError</code>&quot;</a> <code id="the-canvas-element:domexception-5"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p>
-
-
-   </li><li><p>If this <code id="the-canvas-element:the-canvas-element-43"><a href="#the-canvas-element">canvas</a></code> element's bitmap has no pixels (i.e. either its horizontal
-   dimension or its vertical dimension is zero) then return the string &quot;<code>data:,</code>&quot; and abort these steps. (This is the shortest <a data-x-internal="data-protocol" href="https://tools.ietf.org/html/rfc2397#section-2" id="the-canvas-element:data-protocol-2"><code>data:</code> URL</a>; it represents the empty string in a <code>text/plain</code> resource.)</p></li><li><p>Let <var>file</var> be <a href="#a-serialisation-of-the-bitmap-as-a-file" id="the-canvas-element:a-serialisation-of-the-bitmap-as-a-file">a
-   serialization of this <code>canvas</code> element's bitmap as a file</a>, passing
-   <var>type</var> and <var>quality</var> if they were given.</p></li><li><p>If <var>file</var> is null then return &quot;<code>data:,</code>&quot;.</p></li><li><p>Return a <a data-x-internal="data-protocol" href="https://tools.ietf.org/html/rfc2397#section-2" id="the-canvas-element:data-protocol-3"><code>data:</code> URL</a> representing
-   <var>file</var>. <a href="https://html.spec.whatwg.org/multipage/references.html#refsRFC2397">[RFC2397]</a></p>
-
-   
-
-  </li></ol>
-
-  <p>The <dfn id="dom-canvas-toblob-2"><code>toBlob(<var>callback</var>, <var>type</var>,
-  <var>quality</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If this <code id="the-canvas-element:the-canvas-element-44"><a href="#the-canvas-element">canvas</a></code> element's bitmap's <a href="#concept-canvas-origin-clean" id="the-canvas-element:concept-canvas-origin-clean-3">origin-clean</a> flag is set to false, then throw a
-   <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="the-canvas-element:securityerror-2">&quot;<code>SecurityError</code>&quot;</a> <code id="the-canvas-element:domexception-6"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p>
-
-
-   </li><li>
-    <p>If this <code id="the-canvas-element:the-canvas-element-45"><a href="#the-canvas-element">canvas</a></code> element's bitmap has no pixels (i.e. either its horizontal
-    dimension or its vertical dimension is zero) then let <var>result</var> be null.</p>
-
-    <p>Otherwise, let <var>result</var> be a <code id="the-canvas-element:blob-3"><a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob">Blob</a></code> object representing <a href="#a-serialisation-of-the-bitmap-as-a-file" id="the-canvas-element:a-serialisation-of-the-bitmap-as-a-file-2">a serialization of this <code>canvas</code> element's
-    bitmap as a file</a>, passing <var>type</var> and <var>quality</var> if they were given. <a href="https://html.spec.whatwg.org/multipage/references.html#refsFILEAPI">[FILEAPI]</a></p>
-   </li><li><p>Return, but continue running these steps <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#in-parallel" id="the-canvas-element:in-parallel">in parallel</a>.</p></li><li><p><a href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="the-canvas-element:queue-a-task">Queue a task</a> to <a data-x-internal="es-invoking-callback-functions" href="https://heycam.github.io/webidl/#invoke-a-callback-function" id="the-canvas-element:es-invoking-callback-functions">invoke</a>
-   the <code id="the-canvas-element:blobcallback-2"><a href="#blobcallback">BlobCallback</a></code> <var>callback</var> with <var>result</var> as its argument. The
-   <a href="https://html.spec.whatwg.org/multipage/webappapis.html#task-source" id="the-canvas-element:task-source">task source</a> for this task is the
-   <dfn id="canvas-blob-serialisation-task-source">canvas blob serialization task
-   source</dfn>.</p></li></ol>
-
-  <p>The <dfn id="dom-canvas-transfercontroltooffscreen-2"><code>transferControlToOffscreen()</code></dfn> method,
-  when invoked, must run these steps:</p>
-
-  <ol><li><p>If this <code id="the-canvas-element:the-canvas-element-46"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-9">context
-   mode</a> is not set to <a href="#concept-canvas-none" id="the-canvas-element:concept-canvas-none-4">none</a>, throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-canvas-element:invalidstateerror-5">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-canvas-element:domexception-7"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-   steps.</p></li><li><p>Let <var>offscreenCanvas</var> be a new <code id="the-canvas-element:offscreencanvas-7"><a href="#offscreencanvas">OffscreenCanvas</a></code> object with its
-   width and height equal to the values of the <code id="the-canvas-element:attr-canvas-width-6"><a href="#attr-canvas-width">width</a></code>
-   and <code id="the-canvas-element:attr-canvas-height-6"><a href="#attr-canvas-height">height</a></code> content attributes of this
-   <code id="the-canvas-element:the-canvas-element-47"><a href="#the-canvas-element">canvas</a></code> element.</p></li><li><p>Set the <a href="#offscreencanvas-placeholder" id="the-canvas-element:offscreencanvas-placeholder">placeholder <code>canvas</code>
-   element</a> of <var>offscreenCanvas</var> to be a weak reference to this <code id="the-canvas-element:the-canvas-element-48"><a href="#the-canvas-element">canvas</a></code>
-   element.</p></li><li><p>Set this <code id="the-canvas-element:the-canvas-element-49"><a href="#the-canvas-element">canvas</a></code> element's <a href="#concept-canvas-context-mode" id="the-canvas-element:concept-canvas-context-mode-10">context
-   mode</a> to <a href="#concept-canvas-placeholder" id="the-canvas-element:concept-canvas-placeholder-4">placeholder</a>.</p></li><li><p>Return <var>offscreenCanvas</var>.</p></li></ol>
-
-  
-
-  
-
-  <h5 id="2dcontext"><span class="secno">4.12.5.1</span> The 2D rendering context<a class="self-link" href="#2dcontext"/></h5>
-
-  
-
-  <pre class="idl">typedef (<a href="https://html.spec.whatwg.org/multipage/embedded-content.html#htmlimageelement" id="2dcontext:htmlimageelement">HTMLImageElement</a> or
-         <a data-x-internal="svgimageelement" href="https://www.w3.org/TR/SVG11/struct.html#InterfaceSVGImageElement" id="2dcontext:svgimageelement">SVGImageElement</a>) <dfn id="htmlorsvgimageelement">HTMLOrSVGImageElement</dfn>;
-
-typedef (<a href="#htmlorsvgimageelement" id="2dcontext:htmlorsvgimageelement">HTMLOrSVGImageElement</a> or
-         <a href="https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement" id="2dcontext:htmlvideoelement">HTMLVideoElement</a> or
-         <a href="#htmlcanvaselement" id="2dcontext:htmlcanvaselement">HTMLCanvasElement</a> or
-         <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap" id="2dcontext:imagebitmap">ImageBitmap</a> or
-         <a href="#offscreencanvas" id="2dcontext:offscreencanvas">OffscreenCanvas</a>) <dfn id="canvasimagesource">CanvasImageSource</dfn>;
-
-enum <dfn id="canvasfillrule">CanvasFillRule</dfn> { &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero">nonzero</a>&quot;, &quot;<a href="#dom-context-2d-fillrule-evenodd" id="2dcontext:dom-context-2d-fillrule-evenodd">evenodd</a>&quot; };
-
-dictionary <dfn id="canvasrenderingcontext2dsettings">CanvasRenderingContext2DSettings</dfn> {
-  boolean <a href="#dom-canvasrenderingcontext2dsettings-alpha" id="2dcontext:dom-canvasrenderingcontext2dsettings-alpha">alpha</a> = true;
-};
-
-enum <dfn id="imagesmoothingquality">ImageSmoothingQuality</dfn> { &quot;<a href="#dom-context-2d-imagesmoothingquality-low" id="2dcontext:dom-context-2d-imagesmoothingquality-low">low</a>&quot;, &quot;<a href="#dom-context-2d-imagesmoothingquality-medium" id="2dcontext:dom-context-2d-imagesmoothingquality-medium">medium</a>&quot;, &quot;<a href="#dom-context-2d-imagesmoothingquality-high" id="2dcontext:dom-context-2d-imagesmoothingquality-high">high</a>&quot; };
-
-interface <dfn id="canvasrenderingcontext2d">CanvasRenderingContext2D</dfn> {
-  // back-reference to the canvas
-  readonly attribute <a href="#htmlcanvaselement" id="2dcontext:htmlcanvaselement-2">HTMLCanvasElement</a> <a href="#dom-context-2d-canvas-2" id="2dcontext:dom-context-2d-canvas-2">canvas</a>;
-};
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d">CanvasRenderingContext2D</a> implements <a href="#canvasstate" id="2dcontext:canvasstate">CanvasState</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-2">CanvasRenderingContext2D</a> implements <a href="#canvastransform" id="2dcontext:canvastransform">CanvasTransform</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-3">CanvasRenderingContext2D</a> implements <a href="#canvascompositing" id="2dcontext:canvascompositing">CanvasCompositing</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-4">CanvasRenderingContext2D</a> implements <a href="#canvasimagesmoothing" id="2dcontext:canvasimagesmoothing">CanvasImageSmoothing</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-5">CanvasRenderingContext2D</a> implements <a href="#canvasfillstrokestyles" id="2dcontext:canvasfillstrokestyles">CanvasFillStrokeStyles</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-6">CanvasRenderingContext2D</a> implements <a href="#canvasshadowstyles" id="2dcontext:canvasshadowstyles">CanvasShadowStyles</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-7">CanvasRenderingContext2D</a> implements <a href="#canvasfilters" id="2dcontext:canvasfilters">CanvasFilters</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-8">CanvasRenderingContext2D</a> implements <a href="#canvasrect" id="2dcontext:canvasrect">CanvasRect</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-9">CanvasRenderingContext2D</a> implements <a href="#canvasdrawpath" id="2dcontext:canvasdrawpath">CanvasDrawPath</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-10">CanvasRenderingContext2D</a> implements <a href="#canvasuserinterface" id="2dcontext:canvasuserinterface">CanvasUserInterface</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-11">CanvasRenderingContext2D</a> implements <a href="#canvastext" id="2dcontext:canvastext">CanvasText</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-12">CanvasRenderingContext2D</a> implements <a href="#canvasdrawimage" id="2dcontext:canvasdrawimage">CanvasDrawImage</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-13">CanvasRenderingContext2D</a> implements <a href="#canvasimagedata" id="2dcontext:canvasimagedata">CanvasImageData</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-14">CanvasRenderingContext2D</a> implements <a href="#canvaspathdrawingstyles" id="2dcontext:canvaspathdrawingstyles">CanvasPathDrawingStyles</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-15">CanvasRenderingContext2D</a> implements <a href="#canvastextdrawingstyles" id="2dcontext:canvastextdrawingstyles">CanvasTextDrawingStyles</a>;
-<a href="#canvasrenderingcontext2d" id="2dcontext:canvasrenderingcontext2d-16">CanvasRenderingContext2D</a> implements <a href="#canvaspath" id="2dcontext:canvaspath">CanvasPath</a>;
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasstate">CanvasState</dfn> {
-  // state
-  void <a href="#dom-context-2d-save-2" id="2dcontext:dom-context-2d-save-2">save</a>(); // push state on state stack
-  void <a href="#dom-context-2d-restore-2" id="2dcontext:dom-context-2d-restore-2">restore</a>(); // pop state stack and restore state
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvastransform">CanvasTransform</dfn> {
-  // transformations (default transform is the identity matrix)
-  void <a href="#dom-context-2d-scale-2" id="2dcontext:dom-context-2d-scale-2">scale</a>(unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-rotate-2" id="2dcontext:dom-context-2d-rotate-2">rotate</a>(unrestricted double angle);
-  void <a href="#dom-context-2d-translate-2" id="2dcontext:dom-context-2d-translate-2">translate</a>(unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-transform-2" id="2dcontext:dom-context-2d-transform-2">transform</a>(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
-
-  [NewObject] <a data-x-internal="dommatrix" href="https://drafts.fxtf.org/geometry/#dommatrix" id="2dcontext:dommatrix">DOMMatrix</a> <a href="#dom-context-2d-gettransform-2" id="2dcontext:dom-context-2d-gettransform-2">getTransform</a>();
-  void <a href="#dom-context-2d-settransform-2" id="2dcontext:dom-context-2d-settransform-2">setTransform</a>(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
-  void <a href="#dom-context-2d-settransform-2" id="2dcontext:dom-context-2d-settransform-2-2">setTransform</a>(optional <a data-x-internal="dommatrix2dinit" href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit" id="2dcontext:dommatrix2dinit">DOMMatrix2DInit</a> transform);
-  void <a href="#dom-context-2d-resettransform-2" id="2dcontext:dom-context-2d-resettransform-2">resetTransform</a>();
-
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvascompositing">CanvasCompositing</dfn> {
-  // compositing
-  attribute unrestricted double <a href="#dom-context-2d-globalalpha-2" id="2dcontext:dom-context-2d-globalalpha-2">globalAlpha</a>; // (default 1.0)
-  attribute DOMString <a href="#dom-context-2d-globalcompositeoperation-2" id="2dcontext:dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a>; // (default source-over)
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasimagesmoothing">CanvasImageSmoothing</dfn> {
-  // image smoothing
-  attribute boolean <a href="#dom-context-2d-imagesmoothingenabled-2" id="2dcontext:dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a>; // (default true)
-  attribute <a href="#imagesmoothingquality" id="2dcontext:imagesmoothingquality">ImageSmoothingQuality</a> <a href="#dom-context-2d-imagesmoothingquality-2" id="2dcontext:dom-context-2d-imagesmoothingquality-2">imageSmoothingQuality</a>; // (default low)
-
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasfillstrokestyles">CanvasFillStrokeStyles</dfn> {
-  // colors and styles (see also the <a href="#canvaspathdrawingstyles" id="2dcontext:canvaspathdrawingstyles-2">CanvasPathDrawingStyles</a> and <a href="#canvastextdrawingstyles" id="2dcontext:canvastextdrawingstyles-2">CanvasTextDrawingStyles</a> interfaces)
-  attribute (DOMString or CanvasGradient or CanvasPattern) <a href="#dom-context-2d-strokestyle-2" id="2dcontext:dom-context-2d-strokestyle-2">strokeStyle</a>; // (default black)
-  attribute (DOMString or CanvasGradient or CanvasPattern) <a href="#dom-context-2d-fillstyle-2" id="2dcontext:dom-context-2d-fillstyle-2">fillStyle</a>; // (default black)
-  <a href="#canvasgradient" id="2dcontext:canvasgradient">CanvasGradient</a> <a href="#dom-context-2d-createlineargradient-2" id="2dcontext:dom-context-2d-createlineargradient-2">createLinearGradient</a>(double x0, double y0, double x1, double y1);
-  <a href="#canvasgradient" id="2dcontext:canvasgradient-2">CanvasGradient</a> <a href="#dom-context-2d-createradialgradient-2" id="2dcontext:dom-context-2d-createradialgradient-2">createRadialGradient</a>(double x0, double y0, double r0, double x1, double y1, double r1);
-  <a href="#canvaspattern" id="2dcontext:canvaspattern">CanvasPattern</a>? <a href="#dom-context-2d-createpattern-2" id="2dcontext:dom-context-2d-createpattern-2">createPattern</a>(<a href="#canvasimagesource" id="2dcontext:canvasimagesource">CanvasImageSource</a> image, [TreatNullAs=EmptyString] DOMString repetition);
-
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasshadowstyles">CanvasShadowStyles</dfn> {
-  // shadows
-  attribute unrestricted double <a href="#dom-context-2d-shadowoffsetx-2" id="2dcontext:dom-context-2d-shadowoffsetx-2">shadowOffsetX</a>; // (default 0)
-  attribute unrestricted double <a href="#dom-context-2d-shadowoffsety-2" id="2dcontext:dom-context-2d-shadowoffsety-2">shadowOffsetY</a>; // (default 0)
-  attribute unrestricted double <a href="#dom-context-2d-shadowblur-2" id="2dcontext:dom-context-2d-shadowblur-2">shadowBlur</a>; // (default 0)
-  attribute DOMString <a href="#dom-context-2d-shadowcolor-2" id="2dcontext:dom-context-2d-shadowcolor-2">shadowColor</a>; // (default transparent black)
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasfilters">CanvasFilters</dfn> {
-  // filters
-  attribute DOMString <a href="#dom-context-2d-filter" id="2dcontext:dom-context-2d-filter">filter</a>; // (default &quot;none&quot;)
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasrect">CanvasRect</dfn> {
-  // rects
-  void <a href="#dom-context-2d-clearrect-2" id="2dcontext:dom-context-2d-clearrect-2">clearRect</a>(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void <a href="#dom-context-2d-fillrect-2" id="2dcontext:dom-context-2d-fillrect-2">fillRect</a>(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void <a href="#dom-context-2d-strokerect-2" id="2dcontext:dom-context-2d-strokerect-2">strokeRect</a>(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasdrawpath">CanvasDrawPath</dfn> {
-  // path API (see also <a href="#canvaspath" id="2dcontext:canvaspath-2">CanvasPath</a>)
-  void <a href="#dom-context-2d-beginpath-2" id="2dcontext:dom-context-2d-beginpath-2">beginPath</a>();
-  void <a href="#dom-context-2d-fill-2" id="2dcontext:dom-context-2d-fill-2">fill</a>(optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-2">nonzero</a>&quot;);
-  void <a href="#dom-context-2d-fill-2" id="2dcontext:dom-context-2d-fill-2-2">fill</a>(<a href="#path2d" id="2dcontext:path2d">Path2D</a> path, optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-2">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-3">nonzero</a>&quot;);
-  void <a href="#dom-context-2d-stroke-2" id="2dcontext:dom-context-2d-stroke-2">stroke</a>();
-  void <a href="#dom-context-2d-stroke-2" id="2dcontext:dom-context-2d-stroke-2-2">stroke</a>(<a href="#path2d" id="2dcontext:path2d-2">Path2D</a> path);
-  void <a href="#dom-context-2d-clip-2" id="2dcontext:dom-context-2d-clip-2">clip</a>(optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-3">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-4">nonzero</a>&quot;);
-  void <a href="#dom-context-2d-clip-2" id="2dcontext:dom-context-2d-clip-2-2">clip</a>(<a href="#path2d" id="2dcontext:path2d-3">Path2D</a> path, optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-4">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-5">nonzero</a>&quot;);
-  void <a href="#dom-context-2d-resetclip-2" id="2dcontext:dom-context-2d-resetclip-2">resetClip</a>();
-  boolean <a href="#dom-context-2d-ispointinpath-2" id="2dcontext:dom-context-2d-ispointinpath-2">isPointInPath</a>(unrestricted double x, unrestricted double y, optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-5">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-6">nonzero</a>&quot;);
-  boolean <a href="#dom-context-2d-ispointinpath-2" id="2dcontext:dom-context-2d-ispointinpath-2-2">isPointInPath</a>(<a href="#path2d" id="2dcontext:path2d-4">Path2D</a> path, unrestricted double x, unrestricted double y, optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-6">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-7">nonzero</a>&quot;);
-  boolean <a href="#dom-context-2d-ispointinstroke-2" id="2dcontext:dom-context-2d-ispointinstroke-2">isPointInStroke</a>(unrestricted double x, unrestricted double y);
-  boolean <a href="#dom-context-2d-ispointinstroke-2" id="2dcontext:dom-context-2d-ispointinstroke-2-2">isPointInStroke</a>(<a href="#path2d" id="2dcontext:path2d-5">Path2D</a> path, unrestricted double x, unrestricted double y);
-};
-
-[Exposed=Window,
- NoInterfaceObject]
-interface <dfn id="canvasuserinterface">CanvasUserInterface</dfn> {
-  void <a href="#dom-context-2d-drawfocusifneeded-2" id="2dcontext:dom-context-2d-drawfocusifneeded-2">drawFocusIfNeeded</a>(<a data-x-internal="element" href="https://dom.spec.whatwg.org/#interface-element" id="2dcontext:element">Element</a> element);
-  void <a href="#dom-context-2d-drawfocusifneeded-2" id="2dcontext:dom-context-2d-drawfocusifneeded-2-2">drawFocusIfNeeded</a>(<a href="#path2d" id="2dcontext:path2d-6">Path2D</a> path, <a data-x-internal="element" href="https://dom.spec.whatwg.org/#interface-element" id="2dcontext:element-2">Element</a> element);
-  void <a href="#dom-context-2d-scrollpathintoview-2" id="2dcontext:dom-context-2d-scrollpathintoview-2">scrollPathIntoView</a>();
-  void <a href="#dom-context-2d-scrollpathintoview-2" id="2dcontext:dom-context-2d-scrollpathintoview-2-2">scrollPathIntoView</a>(<a href="#path2d" id="2dcontext:path2d-7">Path2D</a> path);
-};
-
-[Exposed=Window,
- NoInterfaceObject]
-interface <dfn id="canvastext">CanvasText</dfn> {
-  // text (see also the <a href="#canvaspathdrawingstyles" id="2dcontext:canvaspathdrawingstyles-3">CanvasPathDrawingStyles</a> and <a href="#canvastextdrawingstyles" id="2dcontext:canvastextdrawingstyles-3">CanvasTextDrawingStyles</a> interfaces)
-  void <a href="#dom-context-2d-filltext-2" id="2dcontext:dom-context-2d-filltext-2">fillText</a>(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-  void <a href="#dom-context-2d-stroketext-2" id="2dcontext:dom-context-2d-stroketext-2">strokeText</a>(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-  <a href="#textmetrics" id="2dcontext:textmetrics">TextMetrics</a> <a href="#dom-context-2d-measuretext-2" id="2dcontext:dom-context-2d-measuretext-2">measureText</a>(DOMString text);
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasdrawimage">CanvasDrawImage</dfn> {
-  // drawing images
-  void <a href="#dom-context-2d-drawimage" id="2dcontext:dom-context-2d-drawimage">drawImage</a>(<a href="#canvasimagesource" id="2dcontext:canvasimagesource-2">CanvasImageSource</a> image, unrestricted double dx, unrestricted double dy);
-  void <a href="#dom-context-2d-drawimage" id="2dcontext:dom-context-2d-drawimage-2">drawImage</a>(<a href="#canvasimagesource" id="2dcontext:canvasimagesource-3">CanvasImageSource</a> image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
-  void <a href="#dom-context-2d-drawimage" id="2dcontext:dom-context-2d-drawimage-3">drawImage</a>(<a href="#canvasimagesource" id="2dcontext:canvasimagesource-4">CanvasImageSource</a> image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvasimagedata">CanvasImageData</dfn> {
-  // <a href="#pixel-manipulation" id="2dcontext:pixel-manipulation">pixel manipulation</a>
-  <a href="#imagedata" id="2dcontext:imagedata">ImageData</a> <a href="#dom-context-2d-createimagedata-2" id="2dcontext:dom-context-2d-createimagedata-2">createImageData</a>(long sw, long sh);
-  <a href="#imagedata" id="2dcontext:imagedata-2">ImageData</a> <a href="#dom-context-2d-createimagedata-2" id="2dcontext:dom-context-2d-createimagedata-2-2">createImageData</a>(<a href="#imagedata" id="2dcontext:imagedata-3">ImageData</a> imagedata);
-  <a href="#imagedata" id="2dcontext:imagedata-4">ImageData</a> <a href="#dom-context-2d-getimagedata-2" id="2dcontext:dom-context-2d-getimagedata-2">getImageData</a>(long sx, long sy, long sw, long sh);
-  void <a href="#dom-context-2d-putimagedata-2" id="2dcontext:dom-context-2d-putimagedata-2">putImageData</a>(<a href="#imagedata" id="2dcontext:imagedata-5">ImageData</a> imagedata, long dx, long dy);
-  void <a href="#dom-context-2d-putimagedata-2" id="2dcontext:dom-context-2d-putimagedata-2-2">putImageData</a>(<a href="#imagedata" id="2dcontext:imagedata-6">ImageData</a> imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
-};
-
-enum <dfn id="canvaslinecap">CanvasLineCap</dfn> { &quot;butt&quot;, &quot;round&quot;, &quot;square&quot; };
-enum <dfn id="canvaslinejoin">CanvasLineJoin</dfn> { &quot;round&quot;, &quot;bevel&quot;, &quot;miter&quot; };
-enum <dfn id="canvastextalign">CanvasTextAlign</dfn> { &quot;<a href="#dom-context-2d-textalign-start" id="2dcontext:dom-context-2d-textalign-start">start</a>&quot;, &quot;<a href="#dom-context-2d-textalign-end" id="2dcontext:dom-context-2d-textalign-end">end</a>&quot;, &quot;<a href="#dom-context-2d-textalign-left" id="2dcontext:dom-context-2d-textalign-left">left</a>&quot;, &quot;<a href="#dom-context-2d-textalign-right" id="2dcontext:dom-context-2d-textalign-right">right</a>&quot;, &quot;<a href="#dom-context-2d-textalign-center" id="2dcontext:dom-context-2d-textalign-center">center</a>&quot; };
-enum <dfn id="canvastextbaseline">CanvasTextBaseline</dfn> { &quot;<a href="#dom-context-2d-textbaseline-top" id="2dcontext:dom-context-2d-textbaseline-top">top</a>&quot;, &quot;<a href="#dom-context-2d-textbaseline-hanging" id="2dcontext:dom-context-2d-textbaseline-hanging">hanging</a>&quot;, &quot;<a href="#dom-context-2d-textbaseline-middle" id="2dcontext:dom-context-2d-textbaseline-middle">middle</a>&quot;, &quot;<a href="#dom-context-2d-textbaseline-alphabetic" id="2dcontext:dom-context-2d-textbaseline-alphabetic">alphabetic</a>&quot;, &quot;<a href="#dom-context-2d-textbaseline-ideographic" id="2dcontext:dom-context-2d-textbaseline-ideographic">ideographic</a>&quot;, &quot;<a href="#dom-context-2d-textbaseline-bottom" id="2dcontext:dom-context-2d-textbaseline-bottom">bottom</a>&quot; };
-enum <dfn id="canvasdirection">CanvasDirection</dfn> { &quot;<a href="#dom-context-2d-direction-ltr" id="2dcontext:dom-context-2d-direction-ltr">ltr</a>&quot;, &quot;<a href="#dom-context-2d-direction-rtl" id="2dcontext:dom-context-2d-direction-rtl">rtl</a>&quot;, &quot;<a href="#dom-context-2d-direction-inherit" id="2dcontext:dom-context-2d-direction-inherit">inherit</a>&quot; };
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvaspathdrawingstyles">CanvasPathDrawingStyles</dfn> {
-  // line caps/joins
-  attribute unrestricted double <a href="#dom-context-2d-linewidth-2" id="2dcontext:dom-context-2d-linewidth-2">lineWidth</a>; // (default 1)
-  attribute <a href="#canvaslinecap" id="2dcontext:canvaslinecap">CanvasLineCap</a> <a href="#dom-context-2d-linecap-2" id="2dcontext:dom-context-2d-linecap-2">lineCap</a>; // (default &quot;butt&quot;)
-  attribute <a href="#canvaslinejoin" id="2dcontext:canvaslinejoin">CanvasLineJoin</a> <a href="#dom-context-2d-linejoin-2" id="2dcontext:dom-context-2d-linejoin-2">lineJoin</a>; // (default &quot;miter&quot;)
-  attribute unrestricted double <a href="#dom-context-2d-miterlimit-2" id="2dcontext:dom-context-2d-miterlimit-2">miterLimit</a>; // (default 10)
-
-  // dashed lines
-  void <a href="#dom-context-2d-setlinedash-2" id="2dcontext:dom-context-2d-setlinedash-2">setLineDash</a>(sequence&lt;unrestricted double&gt; segments); // default empty
-  sequence&lt;unrestricted double&gt; <a href="#dom-context-2d-getlinedash-2" id="2dcontext:dom-context-2d-getlinedash-2">getLineDash</a>();
-  attribute unrestricted double <a href="#dom-context-2d-linedashoffset-2" id="2dcontext:dom-context-2d-linedashoffset-2">lineDashOffset</a>;
-};
-
-[Exposed=Window,
- NoInterfaceObject]
-interface <dfn id="canvastextdrawingstyles">CanvasTextDrawingStyles</dfn> {
-  // text
-  attribute DOMString <a href="#dom-context-2d-font-2" id="2dcontext:dom-context-2d-font-2">font</a>; // (default 10px sans-serif)
-  attribute <a href="#canvastextalign" id="2dcontext:canvastextalign">CanvasTextAlign</a> <a href="#dom-context-2d-textalign-2" id="2dcontext:dom-context-2d-textalign-2">textAlign</a>; // (default: &quot;start&quot;)
-  attribute <a href="#canvastextbaseline" id="2dcontext:canvastextbaseline">CanvasTextBaseline</a> <a href="#dom-context-2d-textbaseline-2" id="2dcontext:dom-context-2d-textbaseline-2">textBaseline</a>; // (default: &quot;alphabetic&quot;)
-  attribute <a href="#canvasdirection" id="2dcontext:canvasdirection">CanvasDirection</a> <a href="#dom-context-2d-direction-2" id="2dcontext:dom-context-2d-direction-2">direction</a>; // (default: &quot;inherit&quot;)
-};
-
-[NoInterfaceObject, Exposed=(Window,Worker)]
-interface <dfn id="canvaspath">CanvasPath</dfn> {
-  // shared path API methods
-  void <a href="#dom-context-2d-closepath-2" id="2dcontext:dom-context-2d-closepath-2">closePath</a>();
-  void <a href="#dom-context-2d-moveto-2" id="2dcontext:dom-context-2d-moveto-2">moveTo</a>(unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-lineto-2" id="2dcontext:dom-context-2d-lineto-2">lineTo</a>(unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-quadraticcurveto-2" id="2dcontext:dom-context-2d-quadraticcurveto-2">quadraticCurveTo</a>(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-beziercurveto-2" id="2dcontext:dom-context-2d-beziercurveto-2">bezierCurveTo</a>(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
-  void <a href="#dom-context-2d-arcto-2" id="2dcontext:dom-context-2d-arcto-2">arcTo</a>(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius); 
-  void <a href="#dom-context-2d-arcto-2" id="2dcontext:dom-context-2d-arcto-2-2">arcTo</a>(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation); 
-  void <a href="#dom-context-2d-rect-2" id="2dcontext:dom-context-2d-rect-2">rect</a>(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void <a href="#dom-context-2d-arc-2" id="2dcontext:dom-context-2d-arc-2">arc</a>(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false); 
-  void <a href="#dom-context-2d-ellipse-2" id="2dcontext:dom-context-2d-ellipse-2">ellipse</a>(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false); 
-};
-
-[Exposed=(Window,Worker)]
-interface <dfn id="canvasgradient">CanvasGradient</dfn> {
-  // opaque object
-  void <a href="#dom-canvasgradient-addcolorstop-2" id="2dcontext:dom-canvasgradient-addcolorstop-2">addColorStop</a>(double offset, DOMString color);
-};
-
-[Exposed=(Window,Worker)]
-interface <dfn id="canvaspattern">CanvasPattern</dfn> {
-  // opaque object
-  void <a href="#dom-canvaspattern-settransform-2" id="2dcontext:dom-canvaspattern-settransform-2">setTransform</a>(optional <a data-x-internal="dommatrix2dinit" href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit" id="2dcontext:dommatrix2dinit-2">DOMMatrix2DInit</a> transform);
-};
-
-[Exposed=Window]
-interface <dfn id="textmetrics">TextMetrics</dfn> {
-  // x-direction
-  readonly attribute double <a href="#dom-textmetrics-width-2" id="2dcontext:dom-textmetrics-width-2">width</a>; // advance width
-  readonly attribute double <a href="#dom-textmetrics-actualboundingboxleft-2" id="2dcontext:dom-textmetrics-actualboundingboxleft-2">actualBoundingBoxLeft</a>;
-  readonly attribute double <a href="#dom-textmetrics-actualboundingboxright-2" id="2dcontext:dom-textmetrics-actualboundingboxright-2">actualBoundingBoxRight</a>;
-
-  // y-direction
-  readonly attribute double <a href="#dom-textmetrics-fontboundingboxascent-2" id="2dcontext:dom-textmetrics-fontboundingboxascent-2">fontBoundingBoxAscent</a>;
-  readonly attribute double <a href="#dom-textmetrics-fontboundingboxdescent-2" id="2dcontext:dom-textmetrics-fontboundingboxdescent-2">fontBoundingBoxDescent</a>;
-  readonly attribute double <a href="#dom-textmetrics-actualboundingboxascent-2" id="2dcontext:dom-textmetrics-actualboundingboxascent-2">actualBoundingBoxAscent</a>;
-  readonly attribute double <a href="#dom-textmetrics-actualboundingboxdescent-2" id="2dcontext:dom-textmetrics-actualboundingboxdescent-2">actualBoundingBoxDescent</a>;
-  readonly attribute double <a href="#dom-textmetrics-emheightascent-2" id="2dcontext:dom-textmetrics-emheightascent-2">emHeightAscent</a>;
-  readonly attribute double <a href="#dom-textmetrics-emheightdescent-2" id="2dcontext:dom-textmetrics-emheightdescent-2">emHeightDescent</a>;
-  readonly attribute double <a href="#dom-textmetrics-hangingbaseline-2" id="2dcontext:dom-textmetrics-hangingbaseline-2">hangingBaseline</a>;
-  readonly attribute double <a href="#dom-textmetrics-alphabeticbaseline-2" id="2dcontext:dom-textmetrics-alphabeticbaseline-2">alphabeticBaseline</a>;
-  readonly attribute double <a href="#dom-textmetrics-ideographicbaseline-2" id="2dcontext:dom-textmetrics-ideographicbaseline-2">ideographicBaseline</a>;
-};
-
-[<a href="#dom-imagedata" id="2dcontext:dom-imagedata">Constructor</a>(unsigned long sw, unsigned long sh),
- <a href="#dom-imagedata" id="2dcontext:dom-imagedata-2">Constructor</a>(<a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray" id="2dcontext:idl-uint8clampedarray">Uint8ClampedArray</a> data, unsigned long sw, optional unsigned long sh),
- Exposed=(Window,Worker),
- <a href="https://html.spec.whatwg.org/multipage/structured-data.html#serializable" id="2dcontext:serializable">Serializable</a>]
-interface <dfn id="imagedata">ImageData</dfn> {
-  readonly attribute unsigned long <a href="#dom-imagedata-width-2" id="2dcontext:dom-imagedata-width-2">width</a>;
-  readonly attribute unsigned long <a href="#dom-imagedata-height-2" id="2dcontext:dom-imagedata-height-2">height</a>;
-  readonly attribute <a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray" id="2dcontext:idl-uint8clampedarray-2">Uint8ClampedArray</a> <a href="#dom-imagedata-data-2" id="2dcontext:dom-imagedata-data-2">data</a>;
-};
-
-[<a href="#dom-path2d" id="2dcontext:dom-path2d">Constructor</a>,
- <a href="#dom-path2d-copy" id="2dcontext:dom-path2d-copy">Constructor</a>(<a href="#path2d" id="2dcontext:path2d-8">Path2D</a> path),
- <a href="#dom-path2d-merge" id="2dcontext:dom-path2d-merge">Constructor</a>(sequence&lt;<a href="#path2d" id="2dcontext:path2d-9">Path2D</a>&gt; paths, optional <a href="#canvasfillrule" id="2dcontext:canvasfillrule-7">CanvasFillRule</a> fillRule = &quot;<a href="#dom-context-2d-fillrule-nonzero" id="2dcontext:dom-context-2d-fillrule-nonzero-8">nonzero</a>&quot;),
- <a href="#dom-path2d-withdata" id="2dcontext:dom-path2d-withdata">Constructor</a>(DOMString d),
- Exposed=(Window,Worker)]
-interface <dfn id="path2d">Path2D</dfn> {
-  void <a href="#dom-path2d-addpath-2" id="2dcontext:dom-path2d-addpath-2">addPath</a>(<a href="#path2d" id="2dcontext:path2d-10">Path2D</a> path, optional <a data-x-internal="dommatrix2dinit" href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit" id="2dcontext:dommatrix2dinit-3">DOMMatrix2DInit</a> transform);
-};
-<a href="#path2d" id="2dcontext:path2d-11">Path2D</a> implements <a href="#canvaspath" id="2dcontext:canvaspath-3">CanvasPath</a>;</pre>
-
- 
-
-  <p class="note">To maintain compatibility with existing Web content, user agents need to
-  enumerate methods defined in <code id="2dcontext:canvasuserinterface-2"><a href="#canvasuserinterface">CanvasUserInterface</a></code> immediately after the <code id="2dcontext:dom-context-2d-stroke-2-3"><a href="#dom-context-2d-stroke-2">stroke()</a></code> method on <code id="2dcontext:canvasrenderingcontext2d-17"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>
-  objects.</p>
-
-  <dl class="domintro"><dt><var>context</var> = <var>canvas</var> . <code id="2dcontext:dom-canvas-getcontext-2"><a href="#dom-canvas-getcontext-2">getContext</a></code>('2d' [, { [ <code id="2dcontext:dom-canvasrenderingcontext2dsettings-alpha-2"><a href="#dom-canvasrenderingcontext2dsettings-alpha">alpha</a></code>: false ] } ] )</dt><dd>
-
-    <p>Returns a <code id="2dcontext:canvasrenderingcontext2d-18"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object that is permanently bound to a
-    particular <code id="2dcontext:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element.</p>
-
-    <p>If the <code id="2dcontext:dom-canvasrenderingcontext2dsettings-alpha-3"><a href="#dom-canvasrenderingcontext2dsettings-alpha">alpha</a></code> setting is
-    provided and set to false, then the canvas is forced to always be opaque.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-canvas"><a href="#dom-context-2d-canvas-2">canvas</a></code></dt><dd>
-
-    <p>Returns the <code id="2dcontext:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element.</p>
-
-   </dd></dl>
-
-  
-
-  <p>A <code id="2dcontext:canvasrenderingcontext2d-19"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object has an <dfn id="output-bitmap">output bitmap</dfn> that
-  is initialized when the object is created.</p>
-
-
-  <p>The <a href="#output-bitmap" id="2dcontext:output-bitmap">output bitmap</a> has an <a href="#concept-canvas-origin-clean" id="2dcontext:concept-canvas-origin-clean">origin-clean</a> flag, which can be set to true or false.
-  Initially, when one of these bitmaps is created, its <a href="#concept-canvas-origin-clean" id="2dcontext:concept-canvas-origin-clean-2">origin-clean</a> flag must be set to true.</p>
-
-
-  <p>The <code id="2dcontext:canvasrenderingcontext2d-20"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object also has an <dfn id="concept-canvas-alpha">alpha</dfn> flag, which can be set to true or false. Initially,
-  when the context is created, its <a href="#concept-canvas-alpha" id="2dcontext:concept-canvas-alpha">alpha</a> flag must be
-  set to true. When a <code id="2dcontext:canvasrenderingcontext2d-21"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object has its <a href="#concept-canvas-alpha" id="2dcontext:concept-canvas-alpha-2">alpha</a> flag set to false, then its alpha channel must be
-  fixed to 1.0 (fully opaque) for all pixels, and attempts to change the alpha component of any
-  pixel must be silently ignored.</p>
-
-  <p class="note">Thus, the bitmap of such a context starts off as fully-opaque black instead of
-  fully-transparent black; <code id="2dcontext:dom-context-2d-clearrect-2-2"><a href="#dom-context-2d-clearrect-2">clearRect()</a></code> always
-  results in fully-opaque black pixels, every fourth byte from <code id="2dcontext:dom-context-2d-getimagedata-2-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code> is always 255, the <code id="2dcontext:dom-context-2d-putimagedata-2-3"><a href="#dom-context-2d-putimagedata-2">putImageData()</a></code> method effectively ignores every
-  fourth byte in its input, and so on. However, the alpha component of styles and images drawn
-  onto the canvas are still honoured up to the point where they would impact the <a href="#output-bitmap" id="2dcontext:output-bitmap-2">output
-  bitmap</a>'s alpha channel; for instance, drawing a 50% transparent white square on a freshly
-  created <a href="#output-bitmap" id="2dcontext:output-bitmap-3">output bitmap</a> with its <a href="#concept-canvas-alpha" id="2dcontext:concept-canvas-alpha-3">alpha</a>
-  flag set to false will result in a fully-opaque gray square.</p>
-
-  <hr/>
-
-  <p>The <code id="2dcontext:canvasrenderingcontext2d-22"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> 2D rendering context represents a flat linear
-  Cartesian surface whose origin (0,0) is at the top left corner, with the coordinate space having
-  <var>x</var> values increasing when going right, and <var>y</var> values increasing when going
-  down. The <var>x</var>-coordinate of the right-most edge is equal to the width of the rendering
-  context's <a href="#output-bitmap" id="2dcontext:output-bitmap-4">output bitmap</a> in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="2dcontext:'px'">CSS pixels</a>; similarly, the
-  <var>y</var>-coordinate of the bottom-most edge is equal to the height of the rendering context's
-  <a href="#output-bitmap" id="2dcontext:output-bitmap-5">output bitmap</a> in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="2dcontext:'px'-2">CSS pixels</a>.</p>
-
-  <p>The size of the coordinate space does not necessarily represent the size of the actual bitmaps
-  that the user agent will use internally or during rendering. On high-definition displays, for
-  instance, the user agent may internally use bitmaps with two device pixels per unit in the
-  coordinate space, so that the rendering remains at high quality throughout. Anti-aliasing can
-  similarly be implemented using over-sampling with bitmaps of a higher resolution than the final
-  image on the display.</p>
-
-  <hr/>
-
-  <p>The <dfn id="2d-context-creation-algorithm">2D context creation algorithm</dfn>, which is passed a <var>target</var> (a
-  <code id="2dcontext:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element) and optionally some arguments, consists of running the following
-  steps:</p>
-
-  <ol><li><p>If the algorithm was passed some arguments, then let <var>arg</var> be the first such
-   argument. Otherwise, let <var>arg</var> be undefined.</p></li><li><p>Let <var>settings</var> be the result of <a href="#coerce-context-arguments-for-2d" id="2dcontext:coerce-context-arguments-for-2d">coercing the <var>arg</var> context arguments for 2D</a>.</p></li><li><p>Create a new <code id="2dcontext:canvasrenderingcontext2d-23"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object.</p></li><li><p>Initialize its <code id="2dcontext:dom-context-2d-canvas-2-2"><a href="#dom-context-2d-canvas-2">canvas</a></code> attribute to point to
-   <var>target</var>.</p></li><li><p>Let the new <code id="2dcontext:canvasrenderingcontext2d-24"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#output-bitmap" id="2dcontext:output-bitmap-6">output bitmap</a> be
-   the same bitmap as <var>target</var>'s bitmap (so that they are shared).</p></li><li><p><a href="#concept-canvas-set-bitmap-dimensions" id="2dcontext:concept-canvas-set-bitmap-dimensions">Set bitmap dimensions</a> to the
-   numeric values of <var>target</var>'s <code id="2dcontext:attr-canvas-width"><a href="#attr-canvas-width">width</a></code> and
-   <code id="2dcontext:attr-canvas-height"><a href="#attr-canvas-height">height</a></code> content attributes.</p></li><li>
-
-    <p>Process each of the members of <var>settings</var> as follows:</p>
-
-    <dl><dt><dfn id="dom-canvasrenderingcontext2dsettings-alpha"><code>alpha</code></dfn></dt><dd>If false, then set the new <code id="2dcontext:canvasrenderingcontext2d-25"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#concept-canvas-alpha" id="2dcontext:concept-canvas-alpha-4">alpha</a> flag to false.</dd></dl>
-
-   </li><li><p>Return the new <code id="2dcontext:canvasrenderingcontext2d-26"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object.</p></li></ol>
-
-  <hr/>
-
-  <hr/>
-
-  <p>When a user agent is required to <dfn id="coerce-context-arguments-for-2d">coerce context arguments for 2D</dfn>, it must run these
-  steps:</p>
-
-  <ol><li><p>Let <var>input</var> be the argument to coerce.</p></li><li><p>Let <var>jsval</var> be the result of <a data-x-internal="concept-idl-convert" href="https://heycam.github.io/webidl/#es-type-mapping" id="2dcontext:concept-idl-convert">converting</a>
-   <var>input</var> to a JavaScript value. (This can throw an exception.)</p></li><li><p>Let <var>dict</var> be the result of <a data-x-internal="concept-idl-convert" href="https://heycam.github.io/webidl/#es-type-mapping" id="2dcontext:concept-idl-convert-2">converting</a>
-   <var>jsval</var> to the dictionary type <code id="2dcontext:canvasrenderingcontext2dsettings"><a href="#canvasrenderingcontext2dsettings">CanvasRenderingContext2DSettings</a></code>. (This can
-   throw an exception.)</p></li><li><p>Return <var>dict</var>.</p></li></ol>
-
-  <hr/>
-
-  <p>When the user agent is to <dfn id="concept-canvas-set-bitmap-dimensions">set bitmap
-  dimensions</dfn> to <var>width</var> and <var>height</var>, it must run these steps:</p>
-
-  <ol><li><p><a href="#reset-the-rendering-context-to-its-default-state" id="2dcontext:reset-the-rendering-context-to-its-default-state">Reset the rendering context to its default state</a>.</p></li><li><p>Resize the <a href="#output-bitmap" id="2dcontext:output-bitmap-7">output bitmap</a> to the new <var>width</var> and <var>height</var>
-   and clear it to fully transparent black.</p></li><li><p>Let <var>canvas</var> be the <code id="2dcontext:the-canvas-element-4"><a href="#the-canvas-element">canvas</a></code> element to which the rendering
-   context's <code id="2dcontext:dom-context-2d-canvas-2-3"><a href="#dom-context-2d-canvas-2">canvas</a></code> attribute was initialized.</p></li><li><p>If the numeric value of <var>canvas</var>'s <code id="2dcontext:attr-canvas-width-2"><a href="#attr-canvas-width">width</a></code>
-   content attribute differs from <var>width</var>, then set <var>canvas</var>'s <code id="2dcontext:attr-canvas-width-3"><a href="#attr-canvas-width">width</a></code> content attribute to the shortest possible string
-   representing <var>width</var> as a <a href="https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-non-negative-integer" id="2dcontext:valid-non-negative-integer">valid non-negative integer</a>.</p></li><li><p>If the numeric value of <var>canvas</var>'s <code id="2dcontext:attr-canvas-height-2"><a href="#attr-canvas-height">height</a></code>
-   content attribute differs from <var>height</var>, then set <var>canvas</var>'s <code id="2dcontext:attr-canvas-height-3"><a href="#attr-canvas-height">height</a></code> content attribute to the shortest possible string
-   representing <var>height</var> as a <a href="https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-non-negative-integer" id="2dcontext:valid-non-negative-integer-2">valid non-negative integer</a>.</p></li></ol>
-
-  <div class="example">
-   <p>Only one square appears to be drawn in the following example:</p>
-   <pre>// canvas is a reference to a &lt;canvas&gt; element
-var context = canvas.getContext('2d');
-context.fillRect(0,0,50,50);
-canvas.setAttribute('width', '300'); // clears the canvas
-context.fillRect(0,100,50,50);
-canvas.width = canvas.width; // clears the canvas
-context.fillRect(100,0,50,50); // only this square remains</pre>
-  </div>
-
-  <hr/>
-
-  <p>When the user agent is to run the <dfn id="concept-canvas-unbinding-steps">unbinding
-  steps</dfn> for a rendering context, it must run these steps:</p>
-
-  <ol><li><p><a href="#reset-the-rendering-context-to-its-default-state" id="2dcontext:reset-the-rendering-context-to-its-default-state-2">Reset the rendering context to its default state</a>.</p></li><li><p>Clear the <code id="2dcontext:canvasrenderingcontext2d-27"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#output-bitmap" id="2dcontext:output-bitmap-8">output bitmap</a> to a
-   transparent black.</p></li><li><p>Set the <code id="2dcontext:canvasrenderingcontext2d-28"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#concept-canvas-origin-clean" id="2dcontext:concept-canvas-origin-clean-3">origin-clean</a> flag to true.</p></li><li><p>Let the <code id="2dcontext:canvasrenderingcontext2d-29"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object have no <a href="#output-bitmap" id="2dcontext:output-bitmap-9">output
-   bitmap</a>.</p></li></ol>
-
-  <p>When the user agent is to run the <dfn id="concept-canvas-binding-steps">binding
-  steps</dfn> to bind the rendering context to the <code id="2dcontext:the-canvas-element-5"><a href="#the-canvas-element">canvas</a></code> element <var>target</var>, it
-  must run these steps:</p>
-
-  <ol><li><p><a href="#reset-the-rendering-context-to-its-default-state" id="2dcontext:reset-the-rendering-context-to-its-default-state-3">Reset the rendering context to its default state</a>.</p></li><li><p>Resize the <code id="2dcontext:canvasrenderingcontext2d-30"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#output-bitmap" id="2dcontext:output-bitmap-10">output bitmap</a> to
-   the dimensions of <var>target</var>'s bitmap and clear it to fully transparent black.</p></li><li><p>Set the <code id="2dcontext:canvasrenderingcontext2d-31"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#concept-canvas-origin-clean" id="2dcontext:concept-canvas-origin-clean-4">origin-clean</a> flag to true.</p></li><li><p>Let the <code id="2dcontext:canvasrenderingcontext2d-32"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> object's <a href="#output-bitmap" id="2dcontext:output-bitmap-11">output bitmap</a> be <var>target</var>'s bitmap.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-canvas-2"><code>canvas</code></dfn> attribute must return the
-  value it was initialized to when the object was created.</p>
-
-  <hr/>
-
-  <p id="canvasrenderingcontext2d-currentcolor">Whenever the CSS value <code>currentColor</code> is used as a color in the <code id="2dcontext:canvasrenderingcontext2d-33"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>
-  API, the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="2dcontext:computed-value">computed value</a> of the <code>currentColor</code> keyword is
-  the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="2dcontext:computed-value-2">computed value</a> of the <a data-x-internal="'color'" href="https://drafts.csswg.org/css-color/#the-color-property" id="2dcontext:'color'">'color'</a> property on the <code id="2dcontext:the-canvas-element-6"><a href="#the-canvas-element">canvas</a></code>
-  element at the time that the color is specified (e.g. when the appropriate attribute is set, or
-  when the method is called; not when the color is rendered or otherwise used). If the computed
-  value of the <a data-x-internal="'color'" href="https://drafts.csswg.org/css-color/#the-color-property" id="2dcontext:'color'-2">'color'</a> property is undefined for a particular case (e.g. because the element is
-  not in a document), then the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="2dcontext:computed-value-3">computed value</a> of the <a data-x-internal="'color'" href="https://drafts.csswg.org/css-color/#the-color-property" id="2dcontext:'color'-3">'color'</a> property
-  for the purposes of determining the computed value of the <code>currentColor</code>
-  keyword is fully opaque black. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSCOLOR">[CSSCOLOR]</a></p>
-
-  <p>In the case of <code id="2dcontext:dom-canvasgradient-addcolorstop-2-2"><a href="#dom-canvasgradient-addcolorstop-2">addColorStop()</a></code> on
-  <code id="2dcontext:canvasgradient-3"><a href="#canvasgradient">CanvasGradient</a></code>, the &quot;<a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="2dcontext:computed-value-4">computed value</a> of the <a data-x-internal="'color'" href="https://drafts.csswg.org/css-color/#the-color-property" id="2dcontext:'color'-4">'color'</a>
-  property&quot; for the purposes of determining the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="2dcontext:computed-value-5">computed value</a> of the <code>currentColor</code> keyword is always fully opaque black (there is no associated
-  element). <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSCOLOR">[CSSCOLOR]</a></p>
-
-  <p class="note">This is because <code id="2dcontext:canvasgradient-4"><a href="#canvasgradient">CanvasGradient</a></code> objects are
-  <code id="2dcontext:the-canvas-element-7"><a href="#the-canvas-element">canvas</a></code>-neutral — a <code id="2dcontext:canvasgradient-5"><a href="#canvasgradient">CanvasGradient</a></code> object created by one
-  <code id="2dcontext:the-canvas-element-8"><a href="#the-canvas-element">canvas</a></code> can be used by another, and there is therefore no way to know which is the
-  &quot;element in question&quot; at the time that the color is specified.</p>
-
-  <p class="note">Similar concerns exist with font-related properties; the rules for those are
-  described in detail in the relevant section below.</p>
-
-  
-
-  <hr/>
-
-  <p>The <code id="2dcontext:canvasfillrule-8"><a href="#canvasfillrule">CanvasFillRule</a></code> enumeration is used to select the <dfn id="fill-rule">fill rule</dfn>
-  algorithm by which to determine if a point is inside or outside a path.</p>
-
-  <p>The value &quot;<dfn id="dom-context-2d-fillrule-nonzero"><code>nonzero</code></dfn>&quot; value
-  indicates the non-zero winding rule, wherein
-
-     a point is considered to be outside a shape if the number of times a half-infinite straight
-     line drawn from that point crosses the shape's path going in one direction is equal to the
-     number of times it crosses the path going in the other direction.
-
-  </p>
-
-
-  <p>The &quot;<dfn id="dom-context-2d-fillrule-evenodd"><code>evenodd</code></dfn>&quot; value indicates
-  the even-odd rule, wherein
-
-     a point is considered to be outside a shape if the number of times a half-infinite straight
-     line drawn from that point crosses the shape's path is even.
-
-  </p>
-
-  <p>If a point is not outside a shape, it is inside the shape.</p>
-
-
-  <hr/>
-
-  <p>The <code id="2dcontext:imagesmoothingquality-2"><a href="#imagesmoothingquality">ImageSmoothingQuality</a></code> enumeration is used to express a preference for the
-  interpolation quality to use when smoothing images.</p>
-
-  <p>The &quot;<dfn id="dom-context-2d-imagesmoothingquality-low"><code>low</code></dfn>&quot; value
-  indicates a preference for a low level of image interpolation quality. Low-quality image
-  interpolation may be more computationally efficient than higher settings.</p>
-
-  <p>The &quot;<dfn id="dom-context-2d-imagesmoothingquality-medium"><code>medium</code></dfn>&quot; value
-  indicates a preference for a medium level of image interpolation quality.</p>
-
-  <p>The &quot;<dfn id="dom-context-2d-imagesmoothingquality-high"><code>high</code></dfn>&quot; value
-  indicates a preference for a high level of image interpolation quality. High-quality image
-  interpolation may be more computationally expensive than lower settings.</p>
-
-  <p class="note">Bilinear scaling is an example of a relatively fast, lower-quality image-smoothing
-  algorithm. Bicubic or Lanczos scaling are examples of image-smoothing algorithms that produce
-  higher-quality output. This specification does not mandate that specific interpolation algorithms
-  be used.</p>
-
-
-  <h6 id="implementation-notes"><span class="secno">4.12.5.1.1</span> Implementation notes<a class="self-link" href="#implementation-notes"/></h6>
-
-  <p><i>This section is non-normative.</i></p>
-
-  <p>The <a href="#output-bitmap" id="implementation-notes:output-bitmap">output bitmap</a>, when it is not directly displayed by the user agent,
-  implementations can, instead of updating this bitmap, merely remember the sequence of drawing
-  operations that have been applied to it until such time as the bitmap's actual data is needed
-  (for example because of a call to <code id="implementation-notes:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage()</a></code>, or
-  the <code id="implementation-notes:dom-createimagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#dom-createimagebitmap-2">createImageBitmap()</a></code> factory method). In many
-  cases, this will be more memory efficient.</p>
-
-  <p>The bitmap of a <code id="implementation-notes:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element is the one bitmap that's pretty much always going
-  to be needed in practice. The <a href="#output-bitmap" id="implementation-notes:output-bitmap-2">output bitmap</a> of a rendering context, when it has one,
-  is always just an alias to a <code id="implementation-notes:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element's bitmap.</p>
-
-  <p>Additional bitmaps are sometimes needed, e.g. to enable fast drawing when the canvas is being
-  painted at a different size than its <a data-x-internal="intrinsic-dimensions" href="https://drafts.csswg.org/css2/conform.html#intrinsic" id="implementation-notes:intrinsic-dimensions">intrinsic size</a>,
-  or to enable double buffering so that graphics updates, like page scrolling for example, can be
-  processed concurrently while canvas draw commands are being executed.</p>
-
-  <h6 id="the-canvas-state"><span class="secno">4.12.5.1.2</span> The canvas state<a class="self-link" href="#the-canvas-state"/></h6>
-
-  <p>Objects that implement the <code id="the-canvas-state:canvasstate"><a href="#canvasstate">CanvasState</a></code> interface maintain a stack of drawing
-  states. <dfn id="drawing-state">Drawing states</dfn> consist of:</p>
-
-  <ul class="brief"><li>The current <a href="#transformations" id="the-canvas-state:transformations">transformation matrix</a>.</li><li>The current <a href="#clipping-region" id="the-canvas-state:clipping-region">clipping region</a>.</li><li>The current values of the following attributes: <code id="the-canvas-state:dom-context-2d-strokestyle-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code>, <code id="the-canvas-state:dom-context-2d-fillstyle-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code>, <code id="the-canvas-state:dom-context-2d-globalalpha-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code>, <code id="the-canvas-state:dom-context-2d-linewidth-2"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code>, <code id="the-canvas-state:dom-context-2d-linecap-2"><a href="#dom-context-2d-linecap-2">lineCap</a></code>, <code id="the-canvas-state:dom-context-2d-linejoin-2"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code>, <code id="the-canvas-state:dom-context-2d-miterlimit-2"><a href="#dom-context-2d-miterlimit-2">miterLimit</a></code>, <code id="the-canvas-state:dom-context-2d-linedashoffset-2"><a href="#dom-context-2d-linedashoffset-2">lineDashOffset</a></code>, <code id="the-canvas-state:dom-context-2d-shadowoffsetx-2"><a href="#dom-context-2d-shadowoffsetx-2">shadowOffsetX</a></code>, <code id="the-canvas-state:dom-context-2d-shadowoffsety-2"><a href="#dom-context-2d-shadowoffsety-2">shadowOffsetY</a></code>, <code id="the-canvas-state:dom-context-2d-shadowblur-2"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code>, <code id="the-canvas-state:dom-context-2d-shadowcolor-2"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code>, <code id="the-canvas-state:dom-context-2d-filter"><a href="#dom-context-2d-filter">filter</a></code>, <code id="the-canvas-state:dom-context-2d-globalcompositeoperation-2"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code>, <code id="the-canvas-state:dom-context-2d-font-2"><a href="#dom-context-2d-font-2">font</a></code>, <code id="the-canvas-state:dom-context-2d-textalign-2"><a href="#dom-context-2d-textalign-2">textAlign</a></code>, <code id="the-canvas-state:dom-context-2d-textbaseline-2"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code>, <code id="the-canvas-state:dom-context-2d-direction-2"><a href="#dom-context-2d-direction-2">direction</a></code>, <code id="the-canvas-state:dom-context-2d-imagesmoothingenabled-2"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code>, <code id="the-canvas-state:dom-context-2d-imagesmoothingquality-2"><a href="#dom-context-2d-imagesmoothingquality-2">imageSmoothingQuality</a></code>.</li><li>The current <a href="#dash-list" id="the-canvas-state:dash-list">dash list</a>.</li></ul>
-
-  <p class="note">The <a href="#current-default-path" id="the-canvas-state:current-default-path">current default path</a> and the rendering context's bitmaps are not
-  part of the drawing state. The <a href="#current-default-path" id="the-canvas-state:current-default-path-2">current default path</a> is persistent, and can only be
-  reset using the <code id="the-canvas-state:dom-context-2d-beginpath-2"><a href="#dom-context-2d-beginpath-2">beginPath()</a></code> method. The bitmaps
-  depend on whether and how the rendering context is bound to a <code id="the-canvas-state:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element.</p>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-save"><a href="#dom-context-2d-save-2">save</a></code>()</dt><dd>
-
-    <p>Pushes the current state onto the stack.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-restore"><a href="#dom-context-2d-restore-2">restore</a></code>()</dt><dd>
-
-    <p>Pops the top state on the stack, restoring the context to that state.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-context-2d-save-2"><code>save()</code></dfn> method, when invoked, must push
-  a copy of the current drawing state onto the drawing state stack.</p>
-
-  <p>The <dfn id="dom-context-2d-restore-2"><code>restore()</code></dfn> method, when invoked,
-  must pop the top entry in the drawing state stack, and reset the drawing state it describes. If
-  there is no saved state, then the method must do nothing.</p>
-
-  <p>When the user agent is to <dfn id="reset-the-rendering-context-to-its-default-state">reset the rendering context to its default state</dfn>, it must
-  clear the drawing state stack and everything that <a href="#drawing-state" id="the-canvas-state:drawing-state">drawing state</a> consists of to
-  initial values.</p>
-
-  
-
-  
-
-
-  <h6 id="line-styles"><span class="secno">4.12.5.1.3</span> Line styles<a class="self-link" href="#line-styles"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-linewidth"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-linewidth-2"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current line width.</p>
-
-    <p>Can be set, to change the line width. Values that are not finite values greater than zero are
-    ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-linecap"><a href="#dom-context-2d-linecap-2">lineCap</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-linecap-2"><a href="#dom-context-2d-linecap-2">lineCap</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current line cap style.</p>
-
-    <p>Can be set, to change the line cap style.</p>
-
-    <p>The possible line cap styles are &quot;<code>butt</code>&quot;, &quot;<code>round</code>&quot;, and &quot;<code>square</code>&quot;. Other values are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-linejoin"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-linejoin-2"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current line join style.</p>
-
-    <p>Can be set, to change the line join style.</p>
-
-    <p>The possible line join styles are &quot;<code>bevel</code>&quot;, &quot;<code>round</code>&quot;, and &quot;<code>miter</code>&quot;. Other values are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-miterlimit"><a href="#dom-context-2d-miterlimit-2">miterLimit</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-miterlimit-2"><a href="#dom-context-2d-miterlimit-2">miterLimit</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current miter limit ratio.</p>
-
-    <p>Can be set, to change the miter limit ratio. Values that are not finite values greater than
-    zero are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-setlinedash"><a href="#dom-context-2d-setlinedash-2">setLineDash</a></code>(<var>segments</var>)</dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-setlinedash-2"><a href="#dom-context-2d-setlinedash-2">setLineDash</a></code>(<var>segments</var>)</dt><dd>
-
-    <p>Sets the current line dash pattern (as used when stroking). The argument is a list of
-    distances for which to alternately have the line on and the line off.</p>
-
-   </dd><dt><var>segments</var> = <var>context</var> . <code id="dom-context-2d-getlinedash"><a href="#dom-context-2d-getlinedash-2">getLineDash</a></code>()</dt><dt><var>segments</var> = <var>styles</var> . <code id="line-styles:dom-context-2d-getlinedash-2"><a href="#dom-context-2d-getlinedash-2">getLineDash</a></code>()</dt><dd>
-
-    <p>Returns a copy of the current line dash pattern. The array returned will always have an even
-    number of entries (i.e. the pattern is normalized).</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-linedashoffset"><a href="#dom-context-2d-linedashoffset-2">lineDashOffset</a></code></dt><dt><var>styles</var> . <code id="line-styles:dom-context-2d-linedashoffset-2"><a href="#dom-context-2d-linedashoffset-2">lineDashOffset</a></code></dt><dd>
-
-    <p>Returns the phase offset (in the same units as the line dash pattern).</p>
-
-    <p>Can be set, to change the phase offset. Values that are not finite values are ignored.</p>
-
-   </dd></dl>
-
-  
-
-  <p>Objects that implement the <code id="line-styles:canvaspathdrawingstyles"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface have attributes and
-  methods (defined in this section) that control how lines are treated by the object.</p>
-
-  <p>The <dfn id="dom-context-2d-linewidth-2"><code>lineWidth</code></dfn> attribute gives the
-  width of lines, in coordinate space units. On getting, it must return the current value. On
-  setting, zero, negative, infinite, and NaN values must be ignored, leaving the value unchanged;
-  other values must change the current value to the new value.</p>
-
-  <p>When the object implementing the <code id="line-styles:canvaspathdrawingstyles-2"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface is created, the
-  <code id="line-styles:dom-context-2d-linewidth-2-2"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> attribute must initially have the value
-  1.0.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-linecap-2"><code>lineCap</code></dfn> attribute defines the type
-  of endings that UAs will place on the end of lines. The three valid values are &quot;<code>butt</code>&quot;, &quot;<code>round</code>&quot;, and &quot;<code>square</code>&quot;.</p>
-
-  <p>On getting, it must return the current value. On setting, the current value must be changed
-  to the new value.</p>
-
-  <p>When the object implementing the <code id="line-styles:canvaspathdrawingstyles-3"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface is created, the
-  <code id="line-styles:dom-context-2d-linecap-2-2"><a href="#dom-context-2d-linecap-2">lineCap</a></code> attribute must initially have the value
-  &quot;<code>butt</code>&quot;.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-linejoin-2"><code>lineJoin</code></dfn> attribute defines the type
-  of corners that UAs will place where two lines meet. The three valid values are
-  &quot;<code>bevel</code>&quot;, &quot;<code>round</code>&quot;, and &quot;<code>miter</code>&quot;.</p>
-
-  <p>On getting, it must return the current value. On setting, the current value must be changed
-  to the new value.</p>
-
-  <p>When the object implementing the <code id="line-styles:canvaspathdrawingstyles-4"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface is created, the
-  <code id="line-styles:dom-context-2d-linejoin-2-2"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code> attribute must initially have the value
-  &quot;<code>miter</code>&quot;.</p>
-
-  <hr/>
-
-  <p>When the <code id="line-styles:dom-context-2d-linejoin-2-3"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code> attribute has the value &quot;<code>miter</code>&quot;, strokes use the miter limit ratio to decide how to render joins. The
-  miter limit ratio can be explicitly set using the <dfn id="dom-context-2d-miterlimit-2"><code>miterLimit</code></dfn> attribute. On getting, it must return
-  the current value. On setting, zero, negative, infinite, and NaN values must be ignored, leaving
-  the value unchanged; other values must change the current value to the new value.</p>
-  
-
-  <p>When the object implementing the <code id="line-styles:canvaspathdrawingstyles-5"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface is created, the
-  <code id="line-styles:dom-context-2d-miterlimit-2-2"><a href="#dom-context-2d-miterlimit-2">miterLimit</a></code> attribute must initially have the value
-  10.0.</p>
-
-  <hr/>
-
-  <p>Each <code id="line-styles:canvaspathdrawingstyles-6"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> object has a <dfn id="dash-list">dash list</dfn>, which is either
-  empty or consists of an even number of non-negative numbers. Initially, the <a href="#dash-list" id="line-styles:dash-list">dash list</a>
-  must be empty.</p>
-
-  <p>The <dfn id="dom-context-2d-setlinedash-2"><code>setLineDash()</code></dfn> method, when
-  invoked, must run these steps:</p>
-
-  <ol><li><p>Let <var>a</var> be the argument.</p></li><li><p>If any value in <var>a</var> is not finite (e.g. an Infinity or a NaN value), or
-   if any value is negative (less than zero), then abort these steps (without throwing an exception;
-   user agents could show a message on a developer console, though, as that would be helpful for
-   debugging).</p></li><li><p>If the number of elements in <var>a</var> is odd, then let <var>a</var>
-   be the concatenation of two copies of <var>a</var>.</p></li><li><p>Let the object's <a href="#dash-list" id="line-styles:dash-list-2">dash list</a> be <var>a</var>.</p></li></ol>
-
-  <p>When the <dfn id="dom-context-2d-getlinedash-2"><code>getLineDash()</code></dfn> method is
-  invoked, it must return a sequence whose values are the values of the object's <a href="#dash-list" id="line-styles:dash-list-3">dash
-  list</a>, in the same order.</p>
-
-  <p>It is sometimes useful to change the &quot;phase&quot; of the dash pattern, e.g. to achieve a &quot;marching
-  ants&quot; effect. The phase can be set using the <dfn id="dom-context-2d-linedashoffset-2"><code>lineDashOffset</code></dfn> attribute. On getting, it must
-  return the current value. On setting, infinite and NaN values must be ignored, leaving the value
-  unchanged; other values must change the current value to the new value.</p>
-
-  <p>When the object implementing the <code id="line-styles:canvaspathdrawingstyles-7"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface is created, the
-  <code id="line-styles:dom-context-2d-linedashoffset-2-2"><a href="#dom-context-2d-linedashoffset-2">lineDashOffset</a></code> attribute must initially have
-  the value 0.0.</p>
-
-  <hr/>
-
-  <p>When a user agent is to <dfn id="trace-a-path">trace a path</dfn>, given an object <var>style</var>
-  that implements the <code id="line-styles:canvaspathdrawingstyles-8"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface, it must run the following
-  algorithm. This algorithm returns a new <a href="#concept-path" id="line-styles:concept-path">path</a>.</p>
-
-  <ol><li><p>Let <var>path</var> be a copy of the path being traced.</p></li><li><p>Prune all zero-length <a href="#line-segments" id="line-styles:line-segments">line segments</a> from <var>path</var>.</p></li><li><p>Remove from <var>path</var> any subpaths containing no lines (i.e. subpaths with
-   just one point).</p></li><li><p>Replace each point in each subpath of <var>path</var> other than the first point
-   and the last point of each subpath by a <i>join</i> that joins the line leading to that point to
-   the line leading out of that point, such that the subpaths all consist of two points (a starting
-   point with a line leading out of it, and an ending point with a line leading into it), one or
-   more lines (connecting the points and the joins), and zero or more joins (each connecting one
-   line to another), connected together such that each subpath is a series of one or more lines with
-   a join between each one and a point on each end.</p></li><li><p>Add a straight closing line to each closed subpath in <var>path</var> connecting
-   the last point and the first point of that subpath; change the last point to a join (from the
-   previously last line to the newly added closing line), and change the first point to a join (from
-   the newly added closing line to the first line).</p>
-
-   </li><li><p>If the <var>styles</var> <a href="#dash-list" id="line-styles:dash-list-4">dash list</a> is empty, then jump to the step
-   labeled <i>convert</i>.</p></li><li><p>Let <var>pattern width</var> be the concatenation of all the entries of the <var>styles</var> <a href="#dash-list" id="line-styles:dash-list-5">dash list</a>, in coordinate space units.</p>
-
-   </li><li><p>For each subpath <var>subpath</var> in <var>path</var>, run the
-   following substeps. These substeps mutate the subpaths in <var>path</var> <i>in
-   vivo</i>.</p>
-
-    <ol><li><p>Let <var>subpath width</var> be the length of all the lines of <var>subpath</var>, in coordinate space units.</p>
-
-     </li><li><p>Let <var>offset</var> be the value of the <var>styles</var> <code id="line-styles:dom-context-2d-linedashoffset-2-3"><a href="#dom-context-2d-linedashoffset-2">lineDashOffset</a></code>, in coordinate space
-     units.</p></li><li>
-
-      <p>While <var>offset</var> is greater than <var>pattern width</var>,
-      decrement it by <var>pattern width</var>.</p>
-
-      <p>While <var>offset</var> is less than zero, increment it by <var>pattern
-      width</var>.</p>
-
-     </li><li><p>Define <var>L</var> to be a linear coordinate line defined along all lines in
-     <var>subpath</var>, such that the start of the first line in the subpath is defined
-     as coordinate 0, and the end of the last line in the subpath is defined as coordinate <var>subpath width</var>.</p></li><li><p>Let <var>position</var> be zero minus <var>offset</var>.</p></li><li><p>Let <var>index</var> be 0.</p></li><li><p>Let <var>current state</var> be <i>off</i> (the other states being <i>on</i>
-     and <i>zero-on</i>).</p></li><li><p><i>Dash on</i>: Let <var>segment length</var> be
-     the value of the <var>styles</var> <a href="#dash-list" id="line-styles:dash-list-6">dash
-     list</a>'s <var>index</var>th entry.</p></li><li><p>Increment <var>position</var> by <var>segment length</var>.</p></li><li><p>If <var>position</var> is greater than <var>subpath width</var>,
-     then end these substeps for this subpath and start them again for the next subpath; if there
-     are no more subpaths, then jump to the step labeled <i>convert</i> instead.</p></li><li><p>If <var>segment length</var> is non-zero, then let <var>current state</var> be
-     <i>on</i>.</p></li><li><p>Increment <var>index</var> by one.</p></li><li><p><i>Dash off</i>: Let <var>segment
-     length</var> be the value of the <var>styles</var> <a href="#dash-list" id="line-styles:dash-list-7">dash list</a>'s <var>index</var>th entry.</p></li><li><p>Let <var>start</var> be the offset <var>position</var> on <var>L</var>.</p></li><li><p>Increment <var>position</var> by <var>segment length</var>.</p></li><li><p>If <var>position</var> is less than zero, then jump to the step labeled
-     <i>post-cut</i>.</p></li><li><p>If <var>start</var> is less than zero, then let <var>start</var> be
-     zero.</p></li><li><p>If <var>position</var> is greater than <var>subpath width</var>,
-     then let <var>end</var> be the offset <var>subpath width</var> on <var>L</var>. Otherwise, let <var>end</var> be the offset <var>position</var> on <var>L</var>.</p></li><li>
-
-      <p>Jump to the first appropriate step:</p>
-
-      <dl class="switch"><dt>If <var>segment length</var> is zero and <var>current state</var> is
-       <i>off</i></dt><dd>
-
-        <p>Do nothing, just continue to the next step.</p>
-
-       </dd><dt>If <var>current state</var> is <i>off</i></dt><dd>
-
-        <p>Cut the line on which <var>end</var> finds itself short at <var>end</var> and place a point there, cutting the subpath that it was in in two;
-        remove all line segments, joins, points, and subpaths that are between <var>start</var> and <var>end</var>; and finally place a single point at <var>start</var> with no lines connecting to it.</p>
-
-        <p>The point has a <i>directionality</i> for the purposes of drawing line caps (see below).
-        The directionality is the direction that the original line had at that point (i.e. when <var>L</var> was defined above).</p>
-
-       </dd><dt>Otherwise</dt><dd>
-
-        <p>Cut the line on which <var>start</var> finds itself into two at <var>start</var> and place a point there, cutting the subpath that it was in in two, and
-        similarly cut the line on which <var>end</var> finds itself short at <var>end</var> and place a point there, cutting the subpath that <em>it</em> was in in
-        two, and then remove all line segments, joins, points, and subpaths that are between <var>start</var> and <var>end</var>.</p>
-
-        <p>If <var>start</var> and <var>end</var> are the same point, then this
-        results in just the line being cut in two and two points being inserted there, with nothing
-        being removed, unless a join also happens to be at that point, in which case the join must
-        be removed.</p>
-
-       </dd></dl>
-
-     </li><li><p><i>Post-cut</i>: If <var>position</var> is greater than <var>subpath width</var>, then jump to the step labeled <i>convert</i>.</p></li><li><p>If <var>segment length</var> is greater than zero, then let
-     <var>positioned-at-on-dash</var> be false.</p></li><li><p>Increment <var>index</var> by one. If it is equal to the number of entries in
-     the <var>styles</var> <a href="#dash-list" id="line-styles:dash-list-8">dash list</a>, then let <var>index</var> be
-     0.</p></li><li><p>Return to the step labeled <i>dash on</i>.</p></li></ol>
-
-   </li><li>
-
-    <p><i>Convert</i>: This is the step that converts the path to a new path that represents its
-    stroke.</p>
-
-    <p>Create a new <a href="#concept-path" id="line-styles:concept-path-2">path</a> that describes the edge of the areas
-    that would be covered if a straight line of length equal to the <var>styles</var>
-    <code id="line-styles:dom-context-2d-linewidth-2-3"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> was swept along each subpath in <var>path</var> while being kept at an angle such that the line is orthogonal to the path
-    being swept, replacing each point with the end cap necessary to satisfy the <var>styles</var> <code id="line-styles:dom-context-2d-linecap-2-3"><a href="#dom-context-2d-linecap-2">lineCap</a></code> attribute as
-    described previously and elaborated below, and replacing each join with the join necessary to
-    satisfy the <var>styles</var> <code id="line-styles:dom-context-2d-linejoin-2-4"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code>
-    type, as defined below.</p>
-
-    <p><strong>Caps</strong>: Each point has a flat edge perpendicular to the direction of the line
-    coming out of it. This is then augmented according to the value of the <var>styles</var> <code id="line-styles:dom-context-2d-linecap-2-4"><a href="#dom-context-2d-linecap-2">lineCap</a></code>. The &quot;<code>butt</code>&quot; value means that no additional line cap is added. The &quot;<code>round</code>&quot; value means that a semi-circle with the diameter equal to the <var>styles</var> <code id="line-styles:dom-context-2d-linewidth-2-4"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> width must
-    additionally be placed on to the line coming out of each point. The &quot;<code>square</code>&quot; value means that a rectangle with the length of the <var>styles</var> <code id="line-styles:dom-context-2d-linewidth-2-5"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> width and the
-    width of half the <var>styles</var> <code id="line-styles:dom-context-2d-linewidth-2-6"><a href="#dom-context-2d-linewidth-2">lineWidth</a></code> width, placed flat against the edge
-    perpendicular to the direction of the line coming out of the point, must be added at each
-    point.</p>
-
-    <p>Points with no lines coming out of them must have two caps placed back-to-back as if it was
-    really two points connected to each other by an infinitesimally short straight line in the
-    direction of the point's <i>directionality</i> (as defined above).</p>
-
-    <p><strong>Joins</strong>: In addition to the point where a join occurs, two additional points
-    are relevant to each join, one for each line: the two corners found half the line width away
-    from the join point, one perpendicular to each line, each on the side furthest from the other
-    line.</p>
-
-    <p>A triangle connecting these two opposite corners with a straight line, with the third point
-    of the triangle being the join point, must be added at all joins. The <code id="line-styles:dom-context-2d-linejoin-2-5"><a href="#dom-context-2d-linejoin-2">lineJoin</a></code> attribute controls whether anything else is
-    rendered. The three aforementioned values have the following meanings:</p>
-
-    <p>The &quot;<code>bevel</code>&quot; value means that this is all that is rendered at
-    joins.</p>
-
-    <p>The &quot;<code>round</code>&quot; value means that an arc connecting the two aforementioned
-    corners of the join, abutting (and not overlapping) the aforementioned triangle, with the
-    diameter equal to the line width and the origin at the point of the join, must be added at
-    joins.</p>
-
-    <p>The &quot;<code>miter</code>&quot; value means that a second triangle must (if it can given
-    the miter length) be added at the join, with one line being the line between the two
-    aforementioned corners, abutting the first triangle, and the other two being continuations of
-    the outside edges of the two joining lines, as long as required to intersect without going over
-    the miter length.</p>
-
-    <p>The miter length is the distance from the point where the join occurs to the intersection of
-    the line edges on the outside of the join. The miter limit ratio is the maximum allowed ratio of
-    the miter length to half the line width. If the miter length would cause the miter limit ratio
-    (as set by the <var>style</var> <code id="line-styles:dom-context-2d-miterlimit-2-3"><a href="#dom-context-2d-miterlimit-2">miterLimit</a></code> attribute) to be exceeded, then this second
-    triangle must not be added.</p> 
-
-
-
-    <p>The subpaths in the newly created path must be oriented such that for any point, the number
-    of times a half-infinite straight line drawn from that point crosses a subpath is even if and
-    only if the number of times a half-infinite straight line drawn from that same point crosses a
-    subpath going in one direction is equal to the number of times it crosses a subpath going in the
-    other direction.</p>
-
-   </li><li><p>Return the newly created path.</p></li></ol>
-
-
-
-  
-
-
-  <h6 id="text-styles"><span class="secno">4.12.5.1.4</span> Text styles<a class="self-link" href="#text-styles"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-font"><a href="#dom-context-2d-font-2">font</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="text-styles:dom-context-2d-font-2"><a href="#dom-context-2d-font-2">font</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current font settings.</p>
-
-    <p>Can be set, to change the font. The syntax is the same as for the CSS <a data-x-internal="'font'" href="https://drafts.csswg.org/css-fonts/#font-prop" id="text-styles:'font'">'font'</a>
-    property; values that cannot be parsed as CSS font values are ignored.</p>
-
-    <p>Relative keywords and lengths are computed relative to the font of the <code id="text-styles:the-canvas-element"><a href="#the-canvas-element">canvas</a></code>
-    element.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-textalign"><a href="#dom-context-2d-textalign-2">textAlign</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="text-styles:dom-context-2d-textalign-2"><a href="#dom-context-2d-textalign-2">textAlign</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current text alignment settings.</p>
-
-    <p>Can be set, to change the alignment. The possible values are and their meanings are given
-    below. Other values are ignored. The default is &quot;<code>start</code>&quot;.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-textbaseline"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="text-styles:dom-context-2d-textbaseline-2"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current baseline alignment settings.</p>
-
-    <p>Can be set, to change the baseline alignment. The possible values and their meanings are
-    given below. Other values are ignored. The default is &quot;<code id="text-styles:dom-context-2d-textbaseline-alphabetic"><a href="#dom-context-2d-textbaseline-alphabetic">alphabetic</a></code>&quot;.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-direction"><a href="#dom-context-2d-direction-2">direction</a></code> [ = <var>value</var> ]</dt><dt><var>styles</var> . <code id="text-styles:dom-context-2d-direction-2"><a href="#dom-context-2d-direction-2">direction</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current directionality.</p>
-
-    <p>Can be set, to change the directionality. The possible values and their meanings are given
-    below. Other values are ignored. The default is &quot;<code id="text-styles:dom-context-2d-direction-inherit"><a href="#dom-context-2d-direction-inherit">inherit</a></code>&quot;.</p>
-
-   </dd></dl>
-
-  
-
-  <p>Objects that implement the <code id="text-styles:canvastextdrawingstyles"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interface have attributes
-  (defined in this section) that control how text is laid out (rasterized or outlined) by the
-  object. Such objects can also have a <dfn id="font-style-source-object">font style source object</dfn>. For
-  <code id="text-styles:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> objects, this is the <code id="text-styles:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element
-  referenced by the context's canvas property.</p>
-
-  
-
-  <p>The <dfn id="dom-context-2d-font-2"><code>font</code></dfn> IDL attribute, on setting, must
-  be <a data-x-internal="parse-something-according-to-a-css-grammar" href="https://drafts.csswg.org/css-syntax/#parse-grammar" id="text-styles:parse-something-according-to-a-css-grammar">parsed as a CSS &lt;'font'&gt;
-  value</a> (but without supporting property-independent style sheet syntax like 'inherit'), and
-  the resulting font must be assigned to the context, with the <a data-x-internal="'line-height'" href="https://drafts.csswg.org/css2/visudet.html#propdef-line-height" id="text-styles:'line-height'">'line-height'</a> component
-  forced to 'normal', with the <a data-x-internal="'font-size'" href="https://drafts.csswg.org/css-fonts/#font-size-prop" id="text-styles:'font-size'">'font-size'</a> component converted to <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="text-styles:'px'">CSS pixels</a>, and with system fonts being computed to explicit values. If the
-  new value is syntactically incorrect (including using property-independent style sheet syntax like
-  'inherit' or 'initial'), then it must be ignored, without assigning a new font value. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSS">[CSS]</a></p>
-
-  <p>Font family names must be interpreted in the context of the <a href="#font-style-source-object" id="text-styles:font-style-source-object">font style source
-  object</a> when the font is to be used; any fonts embedded using <code>@font-face</code> or loaded using <code id="text-styles:fontface"><a href="https://html.spec.whatwg.org/multipage/infrastructure.html#fontface">FontFace</a></code> objects that are visible to the
-  <a href="#font-style-source-object" id="text-styles:font-style-source-object-2">font style source object</a> must therefore be available once they are loaded. (Each <a href="#font-style-source-object" id="text-styles:font-style-source-object-3">font style source
-  object</a> has a <a data-x-internal="font-source" href="https://drafts.csswg.org/css-font-loading/#font-source" id="text-styles:font-source">font source</a>, which determines what fonts are available.) If a font
-  is used before it is fully loaded, or if the <a href="#font-style-source-object" id="text-styles:font-style-source-object-4">font style source object</a> does not have
-  that font in scope at the time the font is to be used, then it must be treated as if it was an
-  unknown font, falling back to another as described by the relevant CSS specifications. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSFONTS">[CSSFONTS]</a> <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSFONTLOAD">[CSSFONTLOAD]</a></p>
-
-  <p>On getting, the <code id="text-styles:dom-context-2d-font-2-2"><a href="#dom-context-2d-font-2">font</a></code> attribute must return the <a data-x-internal="serializing-a-css-value" href="https://drafts.csswg.org/cssom/#serialize-a-css-value" id="text-styles:serializing-a-css-value">serialized form</a> of the current font of the context (with
-  no <a data-x-internal="'line-height'" href="https://drafts.csswg.org/css2/visudet.html#propdef-line-height" id="text-styles:'line-height'-2">'line-height'</a> component). <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSOM">[CSSOM]</a></p>
-
-  <div class="example">
-
-   <p>For example, after the following statement:</p>
-
-   <pre>context.font = 'italic 400 12px/2 Unknown Font, sans-serif';</pre>
-
-   <p>...the expression <code>context.font</code> would evaluate to the string &quot;<code>italic 12px &quot;Unknown Font&quot;, sans-serif</code>&quot;. The &quot;400&quot;
-   font-weight doesn't appear because that is the default value. The line-height doesn't appear
-   because it is forced to &quot;normal&quot;, the default value.</p>
-
-  </div>
-
-  <p>When the object implementing the <code id="text-styles:canvastextdrawingstyles-2"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interface is created, the
-  font of the context must be set to 10px sans-serif. When the <a data-x-internal="'font-size'" href="https://drafts.csswg.org/css-fonts/#font-size-prop" id="text-styles:'font-size'-2">'font-size'</a> component is
-  set to lengths using percentages, <a data-x-internal="'em'" href="https://drafts.csswg.org/css-values/#em" id="text-styles:'em'">'em'</a> or <a data-x-internal="'ex'" href="https://drafts.csswg.org/css-values/#ex" id="text-styles:'ex'">'ex'</a> units, or the 'larger' or
-  'smaller' keywords, these must be interpreted relative to the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="text-styles:computed-value">computed value</a> of the
-  <a data-x-internal="'font-size'" href="https://drafts.csswg.org/css-fonts/#font-size-prop" id="text-styles:'font-size'-3">'font-size'</a> property of the <a href="#font-style-source-object" id="text-styles:font-style-source-object-5">font style source object</a> at the time that
-  the attribute is set, if it is an element. When the <a data-x-internal="'font-weight'" href="https://drafts.csswg.org/css-fonts/#font-weight-prop" id="text-styles:'font-weight'">'font-weight'</a> component is set to
-  the relative values 'bolder' and 'lighter', these must be interpreted relative to the
-  <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="text-styles:computed-value-2">computed value</a> of the <a data-x-internal="'font-weight'" href="https://drafts.csswg.org/css-fonts/#font-weight-prop" id="text-styles:'font-weight'-2">'font-weight'</a> property of the <a href="#font-style-source-object" id="text-styles:font-style-source-object-6">font style
-  source object</a> at the time that the attribute is set, if it is an element. If the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="text-styles:computed-value-3">computed values</a> are undefined for a particular case (e.g. because
-  the <a href="#font-style-source-object" id="text-styles:font-style-source-object-7">font style source object</a> is not an element or is not <a href="https://html.spec.whatwg.org/multipage/rendering.html#being-rendered" id="text-styles:being-rendered">being
-  rendered</a>), then the relative keywords must be interpreted relative to the normal-weight
-  10px sans-serif default.</p>
-
-  <p>The <dfn id="dom-context-2d-textalign-2"><code>textAlign</code></dfn> IDL attribute, on
-  getting, must return the current value. On setting, the current value must be changed to the new
-  value. When the object implementing the <code id="text-styles:canvastextdrawingstyles-3"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interface is
-  created, the <code id="text-styles:dom-context-2d-textalign-2-2"><a href="#dom-context-2d-textalign-2">textAlign</a></code> attribute must initially
-  have the value <code id="text-styles:dom-context-2d-textalign-start"><a href="#dom-context-2d-textalign-start">start</a></code>.</p>
-
-  <p>The <dfn id="dom-context-2d-textbaseline-2"><code>textBaseline</code></dfn> IDL attribute, on
-  getting, must return the current value. On setting, the current value must be changed to the new
-  value. When the object implementing the <code id="text-styles:canvastextdrawingstyles-4"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interface is
-  created, the <code id="text-styles:dom-context-2d-textbaseline-2-2"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute must
-  initially have the value <code id="text-styles:dom-context-2d-textbaseline-alphabetic-2"><a href="#dom-context-2d-textbaseline-alphabetic">alphabetic</a></code>.</p>
-
-  <p>The <dfn id="dom-context-2d-direction-2"><code>direction</code></dfn> IDL attribute, on
-  getting, must return the current value. On setting, the current value must be changed to the new
-  value. When the object implementing the <code id="text-styles:canvastextdrawingstyles-5"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interface is
-  created, the <code id="text-styles:dom-context-2d-direction-2-2"><a href="#dom-context-2d-direction-2">direction</a></code> attribute must initially
-  have the value &quot;<code id="text-styles:dom-context-2d-direction-inherit-2"><a href="#dom-context-2d-direction-inherit">inherit</a></code>&quot;.</p>
-
-  
-
-  <p>The <code id="text-styles:dom-context-2d-textalign-2-3"><a href="#dom-context-2d-textalign-2">textAlign</a></code> attribute's allowed keywords are
-  as follows:</p>
-
-  <dl><dt><dfn id="dom-context-2d-textalign-start"><code>start</code></dfn>
-   </dt><dd><p>Align to the start edge of the text (left side in left-to-right text, right side in
-   right-to-left text).</p></dd><dt><dfn id="dom-context-2d-textalign-end"><code>end</code></dfn>
-   </dt><dd><p>Align to the end edge of the text (right side in left-to-right text, left side in
-   right-to-left text).</p></dd><dt><dfn id="dom-context-2d-textalign-left"><code>left</code></dfn>
-   </dt><dd><p>Align to the left.</p></dd><dt><dfn id="dom-context-2d-textalign-right"><code>right</code></dfn>
-   </dt><dd><p>Align to the right.</p></dd><dt><dfn id="dom-context-2d-textalign-center"><code>center</code></dfn>
-   </dt><dd><p>Align to the center.</p></dd></dl>
-
-  <p>The <code id="text-styles:dom-context-2d-textbaseline-2-3"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code>
-  attribute's allowed keywords correspond to alignment points in the
-  font:</p>
-
-  <p><img alt="The top of the em square is roughly at the top of the glyphs in a font, the hanging baseline is where some glyphs like आ are anchored, the middle is half-way between the top of the em square and the bottom of the em square, the alphabetic baseline is where characters like �, ÿ, f, and Ω are anchored, the ideographic baseline is where glyphs like � and � are anchored, and the bottom of the em square is roughly at the bottom of the glyphs in a font. The top and bottom of the bounding box can be far from these baselines, due to glyphs extending far outside the em square." height="300" src="https://html.spec.whatwg.org/images/baselines.png" width="738"/></p>
-
-  <p>The keywords map to these alignment points as follows:</p>
-
-  <dl><dt><dfn id="dom-context-2d-textbaseline-top"><code>top</code></dfn>
-   </dt><dd>The top of the em square</dd><dt><dfn id="dom-context-2d-textbaseline-hanging"><code>hanging</code></dfn>
-   </dt><dd>The hanging baseline</dd><dt><dfn id="dom-context-2d-textbaseline-middle"><code>middle</code></dfn>
-   </dt><dd>The middle of the em square</dd><dt><dfn id="dom-context-2d-textbaseline-alphabetic"><code>alphabetic</code></dfn>
-   </dt><dd>The alphabetic baseline</dd><dt><dfn id="dom-context-2d-textbaseline-ideographic"><code>ideographic</code></dfn>
-   </dt><dd>The ideographic baseline</dd><dt><dfn id="dom-context-2d-textbaseline-bottom"><code>bottom</code></dfn>
-   </dt><dd>The bottom of the em square</dd></dl>
-
-  <p>The <code id="text-styles:dom-context-2d-direction-2-3"><a href="#dom-context-2d-direction-2">direction</a></code> attribute's allowed keywords are
-  as follows:</p>
-
-  <dl><dt><dfn id="dom-context-2d-direction-ltr"><code>ltr</code></dfn>
-
-   </dt><dd><p>Treat input to the <a href="#text-preparation-algorithm" id="text-styles:text-preparation-algorithm">text preparation algorithm</a> as left-to-right text.</p></dd><dt><dfn id="dom-context-2d-direction-rtl"><code>rtl</code></dfn>
-
-   </dt><dd><p>Treat input to the <a href="#text-preparation-algorithm" id="text-styles:text-preparation-algorithm-2">text preparation algorithm</a> as right-to-left text.</p></dd><dt><dfn id="dom-context-2d-direction-inherit"><code>inherit</code></dfn>
-
-   </dt><dd><p>Default to the directionality of the <code id="text-styles:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element or <code id="text-styles:document"><a href="https://html.spec.whatwg.org/multipage/dom.html#document">Document</a></code>
-   as appropriate.</p></dd></dl>
-
-  <p>The <dfn id="text-preparation-algorithm">text preparation algorithm</dfn> is as follows. It takes as input a string <var>text
-  </var>, a <code id="text-styles:canvastextdrawingstyles-6"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> object <var>target</var>, and an optional length
-  <var>maxWidth</var>. It returns an array of glyph shapes, each positioned on a common coordinate
-  space, a <var>physical alignment</var> whose value is one of <i>left</i>, <i>right</i>, and
-  <i>center</i>, and an <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box">inline box</a>. (Most callers of this algorithm ignore the
-  <var>physical alignment</var> and the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-2">inline box</a>.)</p>
-
-  <ol><li><p>If <var>maxWidth</var> was provided but is less than or equal to zero or equal to NaN,
-   then return an empty array.</p></li><li><p>Replace all <a data-x-internal="space-characters" href="https://infra.spec.whatwg.org/#ascii-whitespace" id="text-styles:space-characters">ASCII whitespace</a> in <var>text</var> with U+0020 SPACE
-   characters.</p></li><li><p>Let <var>font</var> be the current font of <var>target</var>, as given
-   by that object's <code id="text-styles:dom-context-2d-font-2-3"><a href="#dom-context-2d-font-2">font</a></code> attribute.</p></li><li>
-
-    <p>Apply the appropriate step from the following list to determine the value of <var>direction</var>:</p>
-
-    <dl class="switch"><dt>If the <var>target</var> object's <code id="text-styles:dom-context-2d-direction-2-4"><a href="#dom-context-2d-direction-2">direction</a></code> attribute has the value &quot;<code id="text-styles:dom-context-2d-direction-ltr"><a href="#dom-context-2d-direction-ltr">ltr</a></code>&quot;</dt><dd>Let <var>direction</var> be '<a href="https://html.spec.whatwg.org/multipage/dom.html#concept-ltr" id="text-styles:concept-ltr">ltr</a>'.</dd><dt>If the <var>target</var> object's <code id="text-styles:dom-context-2d-direction-2-5"><a href="#dom-context-2d-direction-2">direction</a></code> attribute has the value &quot;<code id="text-styles:dom-context-2d-direction-rtl"><a href="#dom-context-2d-direction-rtl">rtl</a></code>&quot;</dt><dd>Let <var>direction</var> be '<a href="https://html.spec.whatwg.org/multipage/dom.html#concept-rtl" id="text-styles:concept-rtl">rtl</a>'.</dd><dt>If the <var>target</var> object's <a href="#font-style-source-object" id="text-styles:font-style-source-object-8">font style source object</a> is an
-     element</dt><dd>Let <var>direction</var> be <a href="https://html.spec.whatwg.org/multipage/dom.html#the-directionality" id="text-styles:the-directionality">the directionality</a> of the <var>target</var> object's <a href="#font-style-source-object" id="text-styles:font-style-source-object-9">font style source object</a>.</dd><dt>If the <var>target</var> object's <a href="#font-style-source-object" id="text-styles:font-style-source-object-10">font style source object</a> is a
-     <code id="text-styles:document-2"><a href="https://html.spec.whatwg.org/multipage/dom.html#document">Document</a></code> with a non-null <a data-x-internal="document-element" href="https://dom.spec.whatwg.org/#document-element" id="text-styles:document-element">document element</a></dt><dd>Let <var>direction</var> be <a href="https://html.spec.whatwg.org/multipage/dom.html#the-directionality" id="text-styles:the-directionality-2">the directionality</a> of the <var>target</var>
-     object's <a href="#font-style-source-object" id="text-styles:font-style-source-object-11">font style source object</a>'s <a data-x-internal="document-element" href="https://dom.spec.whatwg.org/#document-element" id="text-styles:document-element-2">document element</a>.</dd><dt>Otherwise</dt><dd>Let <var>direction</var> be '<a href="https://html.spec.whatwg.org/multipage/dom.html#concept-ltr" id="text-styles:concept-ltr-2">ltr</a>'.</dd></dl>
-
-   </li><li><p>Form a hypothetical infinitely-wide CSS <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="text-styles:line-box">line box</a> containing a single
-   <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-3">inline box</a> containing the text <var>text</var>, with all the properties at their
-   initial values except the <a data-x-internal="'font'" href="https://drafts.csswg.org/css-fonts/#font-prop" id="text-styles:'font'-2">'font'</a> property of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-4">inline box</a> set to
-   <var>font</var>, the <a data-x-internal="'direction'" href="https://drafts.csswg.org/css-writing-modes/#direction" id="text-styles:'direction'">'direction'</a> property of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-5">inline box</a> set to
-   <var>direction</var>, and the <a data-x-internal="'white-space'" href="https://drafts.csswg.org/css-text/#white-space-property" id="text-styles:'white-space'">'white-space'</a> property set to 'pre'. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSS">[CSS]</a></p></li><li><p>If <var>maxWidth</var> was provided and the hypothetical width of the
-   <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-6">inline box</a> in the hypothetical <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="text-styles:line-box-2">line box</a> is greater than
-   <var>maxWidth</var> <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="text-styles:'px'-2">CSS pixels</a>, then change <var>font</var> to have a
-   more condensed font (if one is available or if a reasonably readable one can be synthesized by
-   applying a horizontal scale factor to the font) or a smaller font, and return to the previous
-   step.</p></li><li>
-
-    <p>The <var>anchor point</var> is a point on the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-7">inline box</a>, and the <var>physical
-    alignment</var> is one of the values <i>left</i>, <i>right</i>, and <i>center</i>. These
-    variables are determined by the <code id="text-styles:dom-context-2d-textalign-2-4"><a href="#dom-context-2d-textalign-2">textAlign</a></code> and
-    <code id="text-styles:dom-context-2d-textbaseline-2-4"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> values as follows:</p>
-
-    <p>Horizontal position:</p>
-
-    <dl><dt>If <code id="text-styles:dom-context-2d-textalign-2-5"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-left"><a href="#dom-context-2d-textalign-left">left</a></code></dt><dt>If <code id="text-styles:dom-context-2d-textalign-2-6"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-start-2"><a href="#dom-context-2d-textalign-start">start</a></code> and <var>direction</var> is
-     'ltr'</dt><dt>If <code id="text-styles:dom-context-2d-textalign-2-7"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-end"><a href="#dom-context-2d-textalign-end">end</a></code> and <var>direction</var> is 'rtl'</dt><dd>Let the <var>anchor point</var>'s horizontal position be the left edge of the
-     <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-8">inline box</a>, and let <var>physical alignment</var> be <i>left</i>.</dd><dt>If <code id="text-styles:dom-context-2d-textalign-2-8"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-right"><a href="#dom-context-2d-textalign-right">right</a></code></dt><dt>If <code id="text-styles:dom-context-2d-textalign-2-9"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-end-2"><a href="#dom-context-2d-textalign-end">end</a></code> and <var>direction</var> is 'ltr'</dt><dt>If <code id="text-styles:dom-context-2d-textalign-2-10"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-start-3"><a href="#dom-context-2d-textalign-start">start</a></code> and <var>direction</var> is
-     'rtl'</dt><dd>Let the <var>anchor point</var>'s horizontal position be the right edge of the
-     <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-9">inline box</a>, and let <var>physical alignment</var> be <i>right</i>.</dd><dt>If <code id="text-styles:dom-context-2d-textalign-2-11"><a href="#dom-context-2d-textalign-2">textAlign</a></code> is <code id="text-styles:dom-context-2d-textalign-center"><a href="#dom-context-2d-textalign-center">center</a></code></dt><dd>Let the <var>anchor point</var>'s horizontal position be half way between the left
-     and right edges of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-10">inline box</a>, and let <var>physical alignment</var> be
-     <i>center</i>.</dd></dl>
-
-    <p>Vertical position:</p>
-
-    <dl><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-5"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-top"><a href="#dom-context-2d-textbaseline-top">top</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be the top of the em box of
-     the first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-11">inline box</a>.</dd><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-6"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-hanging"><a href="#dom-context-2d-textbaseline-hanging">hanging</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be the hanging baseline of the
-     first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-12">inline box</a>.</dd><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-7"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-middle"><a href="#dom-context-2d-textbaseline-middle">middle</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be half way between the bottom
-     and the top of the em box of the first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-13">inline box</a>.</dd><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-8"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-alphabetic-3"><a href="#dom-context-2d-textbaseline-alphabetic">alphabetic</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be the alphabetic baseline of
-     the first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-14">inline box</a>.</dd><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-9"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-ideographic"><a href="#dom-context-2d-textbaseline-ideographic">ideographic</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be the ideographic baseline of
-     the first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-15">inline box</a>.</dd><dt>If <code id="text-styles:dom-context-2d-textbaseline-2-10"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> is <code id="text-styles:dom-context-2d-textbaseline-bottom"><a href="#dom-context-2d-textbaseline-bottom">bottom</a></code></dt><dd>Let the <var>anchor point</var>'s vertical position be the bottom of the em box of
-     the first available font of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-16">inline box</a>.</dd></dl>
-
-   </li><li>
-
-    <p>Let <var>result</var> be an array constructed by iterating over each glyph in the
-    <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-17">inline box</a> from left to right (if any), adding to the array, for each glyph, the
-    shape of the glyph as it is in the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="text-styles:inline-box-18">inline box</a>, positioned on a coordinate space
-    using <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="text-styles:'px'-3">CSS pixels</a> with its origin is at the <var>anchor
-    point</var>.</p>
-
-   </li><li><p>Return <var>result</var>, <var>physical alignment</var>, and the inline
-   box.</p></li></ol>
-
-
-  <h6 id="building-paths"><span class="secno">4.12.5.1.5</span> Building paths<a class="self-link" href="#building-paths"/></h6>
-
-  <p>Objects that implement the <code id="building-paths:canvaspath"><a href="#canvaspath">CanvasPath</a></code> interface have a <a href="#concept-path" id="building-paths:concept-path">path</a>. A <dfn id="concept-path">path</dfn> has a list of zero or
-  more subpaths. Each subpath consists of a list of one or more points, connected by straight or
-  curved <dfn id="line-segments">line segments</dfn>, and a flag indicating whether the subpath is closed or not. A
-  closed subpath is one where the last point of the subpath is connected to the first point of the
-  subpath by a straight line. Subpaths with only one point are ignored when painting the path.</p>
-
-  <p><a href="#concept-path" id="building-paths:concept-path-2">Paths</a> have a <dfn id="need-new-subpath">need new subpath</dfn> flag. When this
-  flag is set, certain APIs create a new subpath rather than extending the previous one. When a
-  <a href="#concept-path" id="building-paths:concept-path-3">path</a> is created, its <a href="#need-new-subpath" id="building-paths:need-new-subpath">need new subpath</a> flag must be
-  set.</p>
-
-  <p>When an object implementing the <code id="building-paths:canvaspath-2"><a href="#canvaspath">CanvasPath</a></code> interface is created, its <a href="#concept-path" id="building-paths:concept-path-4">path</a> must be initialized to zero subpaths.</p>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-moveto"><a href="#dom-context-2d-moveto-2">moveTo</a></code>(<var>x</var>, <var>y</var>)</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-moveto-2"><a href="#dom-context-2d-moveto-2">moveTo</a></code>(<var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Creates a new subpath with the given point.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-closepath"><a href="#dom-context-2d-closepath-2">closePath</a></code>()</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-closepath-2"><a href="#dom-context-2d-closepath-2">closePath</a></code>()</dt><dd>
-
-    <p>Marks the current subpath as closed, and starts a new subpath with a point the same as the
-    start and end of the newly closed subpath.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-lineto"><a href="#dom-context-2d-lineto-2">lineTo</a></code>(<var>x</var>, <var>y</var>)</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-lineto-2"><a href="#dom-context-2d-lineto-2">lineTo</a></code>(<var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Adds the given point to the current subpath, connected to the previous one by a straight
-    line.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-quadraticcurveto"><a href="#dom-context-2d-quadraticcurveto-2">quadraticCurveTo</a></code>(<var>cpx</var>, <var>cpy</var>, <var>x</var>, <var>y</var>)</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-quadraticcurveto-2"><a href="#dom-context-2d-quadraticcurveto-2">quadraticCurveTo</a></code>(<var>cpx</var>, <var>cpy</var>, <var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Adds the given point to the current subpath, connected to the previous one by a quadratic
-    Bézier curve with the given control point.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-beziercurveto"><a href="#dom-context-2d-beziercurveto-2">bezierCurveTo</a></code>(<var>cp1x</var>, <var>cp1y</var>, <var>cp2x</var>, <var>cp2y</var>, <var>x</var>, <var>y</var>)</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-beziercurveto-2"><a href="#dom-context-2d-beziercurveto-2">bezierCurveTo</a></code>(<var>cp1x</var>, <var>cp1y</var>, <var>cp2x</var>, <var>cp2y</var>, <var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Adds the given point to the current subpath, connected to the previous one by a cubic
-    Bézier curve with the given control points.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-arcto"><a href="#dom-context-2d-arcto-2">arcTo</a></code>(<var>x1</var>, <var>y1</var>, <var>x2</var>, <var>y2</var>, <var>radiusX</var> [, <var>radiusY</var>, <var>rotation</var> ] )</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-arcto-2"><a href="#dom-context-2d-arcto-2">arcTo</a></code>(<var>x1</var>, <var>y1</var>, <var>x2</var>, <var>y2</var>, <var>radiusX</var> [, <var>radiusY</var>, <var>rotation</var> ] )</dt><dd>
-
-    <p>Adds an arc with the given control points and radius to the current subpath, connected to the
-    previous point by a straight line.</p>
-
-    <p>If two radii are provided, then the first controls the width of the arc's ellipse, and the
-    second controls the height. If only one is provided, or if they are the same, then the arc is
-    from a circle. In the case of an ellipse, the rotation argument controls the clockwise
-    inclination of the ellipse relative to the x-axis.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="building-paths:indexsizeerror">&quot;<code>IndexSizeError</code>&quot;</a> <code id="building-paths:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the given
-    radius is negative.</p>
-
-    <figure class="diagrams">
-     
-     <img alt="" height="254" src="https://html.spec.whatwg.org/images/arcTo1.png" width="357"/>
-     <img alt="" height="310" src="https://html.spec.whatwg.org/images/arcTo2.png" width="468"/>
-     <img alt="" height="233" src="https://html.spec.whatwg.org/images/arcTo3.png" width="513"/>
-    </figure>
-
-
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-arc"><a href="#dom-context-2d-arc-2">arc</a></code>(<var>x</var>, <var>y</var>, <var>radius</var>, <var>startAngle</var>, <var>endAngle</var> [, <var>anticlockwise</var> ] )</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-arc-2"><a href="#dom-context-2d-arc-2">arc</a></code>(<var>x</var>, <var>y</var>, <var>radius</var>, <var>startAngle</var>, <var>endAngle</var> [, <var>anticlockwise</var> ] )</dt><dd>
-
-    <p>Adds points to the subpath such that the arc described by the circumference of the circle
-    described by the arguments, starting at the given start angle and ending at the given end angle,
-    going in the given direction (defaulting to clockwise), is added to the path, connected to the
-    previous point by a straight line.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="building-paths:indexsizeerror-2">&quot;<code>IndexSizeError</code>&quot;</a> <code id="building-paths:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the given
-    radius is negative.</p>
-
-    <figure class="diagrams">
-     
-     <img alt="" height="255" src="https://html.spec.whatwg.org/images/arc1.png" width="590"/>
-    </figure>
-
-
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-ellipse"><a href="#dom-context-2d-ellipse-2">ellipse</a></code>(<var>x</var>, <var>y</var>, <var>radiusX</var>, <var>radiusY</var>, <var>rotation</var>, <var>startAngle</var>, <var>endAngle</var> [, <var>anticlockwise</var>] )</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-ellipse-2"><a href="#dom-context-2d-ellipse-2">ellipse</a></code>(<var>x</var>, <var>y</var>, <var>radiusX</var>, <var>radiusY</var>, <var>rotation</var>, <var>startAngle</var>, <var>endAngle</var> [, <var>anticlockwise</var>] )</dt><dd>
-
-    <p>Adds points to the subpath such that the arc described by the circumference of the ellipse
-    described by the arguments, starting at the given start angle and ending at the given end angle,
-    going in the given direction (defaulting to clockwise), is added to the path, connected to the
-    previous point by a straight line.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="building-paths:indexsizeerror-3">&quot;<code>IndexSizeError</code>&quot;</a> <code id="building-paths:domexception-3"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the given
-    radius is negative.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-rect"><a href="#dom-context-2d-rect-2">rect</a></code>(<var>x</var>, <var>y</var>, <var>w</var>, <var>h</var>)</dt><dt><var>path</var> . <code id="building-paths:dom-context-2d-rect-2"><a href="#dom-context-2d-rect-2">rect</a></code>(<var>x</var>, <var>y</var>, <var>w</var>, <var>h</var>)</dt><dd>
-
-    <p>Adds a new closed subpath to the path, representing the given rectangle.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The following methods allow authors to manipulate the <a href="#concept-path" id="building-paths:concept-path-5">paths</a>
-  of objects implementing the <code id="building-paths:canvaspath-3"><a href="#canvaspath">CanvasPath</a></code> interface.</p>
-
-  <p>For objects implementing the <code id="building-paths:canvasdrawpath"><a href="#canvasdrawpath">CanvasDrawPath</a></code> and <code id="building-paths:canvastransform"><a href="#canvastransform">CanvasTransform</a></code>
-  interfaces, the points passed to the methods, and the resulting lines added to <a href="#current-default-path" id="building-paths:current-default-path">current
-  default path</a> by these methods, must be transformed according to the <a href="#transformations" id="building-paths:transformations">current transformation matrix</a> before being added to
-  the path.</p>
-
-  <p>The <dfn id="dom-context-2d-moveto-2"><code>moveTo(<var>x</var>, <var>y</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Create a new subpath with the specified point as its first (and only) point.</p></li></ol>
-
-  <p>When the user agent is to <dfn id="ensure-there-is-a-subpath">ensure there is a subpath</dfn> for a coordinate (<var>x</var>,
-  <var>y</var>) on a <a href="#concept-path" id="building-paths:concept-path-6">path</a>, the user agent must check to see if
-  the <a href="#concept-path" id="building-paths:concept-path-7">path</a> has its <a href="#need-new-subpath" id="building-paths:need-new-subpath-2">need new subpath</a> flag set. If it
-  does, then the user agent must create a new subpath with the point (<var>x</var>, <var>y</var>) as
-  its first (and only) point, as if the <code id="building-paths:dom-context-2d-moveto-2-2"><a href="#dom-context-2d-moveto-2">moveTo()</a></code> method
-  had been called, and must then unset the <a href="#concept-path" id="building-paths:concept-path-8">path</a>'s <a href="#need-new-subpath" id="building-paths:need-new-subpath-3">need new
-  subpath</a> flag.</p>
-
-
-  <p>The <dfn id="dom-context-2d-closepath-2"><code>closePath()</code></dfn> method, when invoked,
-  must do nothing if the object's path has no subpaths. Otherwise, it must mark the last subpath as
-  closed, create a new subpath whose first point is the same as the previous subpath's first point,
-  and finally add this new subpath to the path.</p>
-
-  <p class="note">If the last subpath had more than one point in its list of points, then this is
-  equivalent to adding a straight line connecting the last point back to the first point, thus
-  &quot;closing&quot; the shape, and then repeating the last (possibly implied) <code id="building-paths:dom-context-2d-moveto-2-3"><a href="#dom-context-2d-moveto-2">moveTo()</a></code> call.</p>
-
-
-  <p>New points and the lines connecting them are added to subpaths using the methods described
-  below. In all cases, the methods only modify the last subpath in the object's path.</p>
-
-
-  <p>The <dfn id="dom-context-2d-lineto-2"><code>lineTo(<var>x</var>, <var>y</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>If the object's path has no subpaths, then <a href="#ensure-there-is-a-subpath" id="building-paths:ensure-there-is-a-subpath">ensure there is a subpath</a> for
-   <span>(<var>x</var>, <var>y</var>)</span>.</p></li><li><p>Otherwise, connect the last point in the subpath to the given point (<var>x</var>,
-   <var>y</var>) using a straight line, and then add the given point (<var>x</var>, <var>y</var>) to
-   the subpath.</p></li></ol>
-
-  <p>The <dfn id="dom-context-2d-quadraticcurveto-2"><code>quadraticCurveTo(<var>cpx</var>,
-  <var>cpy</var>, <var>x</var>, <var>y</var>)</code></dfn> method, when invoked, must run these
-  steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p><a href="#ensure-there-is-a-subpath" id="building-paths:ensure-there-is-a-subpath-2">Ensure there is a subpath</a> for <span>(<var>cpx</var>,
-   <var>cpy</var>)</span></p></li><li><p>Connect the last point in the subpath to the given point (<var>x</var>, <var>y</var>)
-   using a quadratic Bézier curve with control point (<var>cpx</var>, <var>cpy</var>). <a href="https://html.spec.whatwg.org/multipage/references.html#refsBEZIER">[BEZIER]</a></p></li><li><p>Add the given point (<var>x</var>, <var>y</var>) to the subpath.</p></li></ol>
-
-  <p>The <dfn id="dom-context-2d-beziercurveto-2"><code>bezierCurveTo(<var>cp1x</var>,
-  <var>cp1y</var>, <var>cp2x</var>, <var>cp2y</var>, <var>x</var>, <var>y</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p><a href="#ensure-there-is-a-subpath" id="building-paths:ensure-there-is-a-subpath-3">Ensure there is a subpath</a> for <span>(<var>cp1x</var>,
-   <var>cp1y</var>)</span>.</p></li><li><p>Connect the last point in the subpath to the given point (<var>x</var>, <var>y</var>)
-   using a cubic Bézier curve with control points (<var>cp1x</var>, <var>cp1y</var>) and
-   (<var>cp2x</var>, <var>cp2y</var>). <a href="https://html.spec.whatwg.org/multipage/references.html#refsBEZIER">[BEZIER]</a></p></li><li><p>Add the point (<var>x</var>, <var>y</var>) to the subpath.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-arcto-2"><code>arcTo(<var>x1</var>, <var>y1</var>, <var>x2</var>,
-  <var>y2</var>, <var>radiusX</var>, <var>radiusY</var>, <var>rotation</var>)</code></dfn> method,
-  when invoked, must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p><a href="#ensure-there-is-a-subpath" id="building-paths:ensure-there-is-a-subpath-4">Ensure there is a subpath</a> for <span>(<var>x1</var>,
-   <var>y1</var>)</span>.</p></li><li><p>If either <var>radiusX</var> or <var>radiusY</var> are negative, then throw an
-   <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="building-paths:indexsizeerror-4">&quot;<code>IndexSizeError</code>&quot;</a> <code id="building-paths:domexception-4"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p></li><li><p>If <var>radiusY</var> is omitted, then set <var>radiusY</var> to
-   <var>radiusX</var>.</p></li><li><p>Let the point (<var>x0</var>, <var>y0</var>) be the last point in the subpath, transformed
-   by the inverse of the <a href="#transformations" id="building-paths:transformations-2">current transformation
-   matrix</a> (so that it is in the same coordinate system as the points passed to the
-   method).</p></li><li><p>If the point (<var>x0</var>, <var>y0</var>) is equal to the point (<var>x1</var>,
-   <var>y1</var>), or if the point (<var>x1</var>, <var>y1</var>) is equal to the point
-   (<var>x2</var>, <var>y2</var>), or if both <var>radiusX</var> and <var>radiusY</var> are zero,
-   then add the point (<var>x1</var>, <var>y1</var>) to the subpath, and connect that point to the
-   previous point (<var>x0</var>, <var>y0</var>) by a straight line.</p></li><li><p>Otherwise, if the points (<var>x0</var>, <var>y0</var>), (<var>x1</var>, <var>y1</var>),
-   and (<var>x2</var>, <var>y2</var>) all lie on a single straight line, then add the point
-   (<var>x1</var>, <var>y1</var>) to the subpath, and connect that point to the previous point
-   (<var>x0</var>, <var>y0</var>) by a straight line.</p></li><li><p>Otherwise, let <var>The Arc</var> be the shortest arc given by circumference of the
-   ellipse that has radius <var>radiusX</var> on the major axis and radius <var>radiusY</var> on the
-   minor axis, and whose semi-major axis is rotated <var>rotation</var> radians clockwise from the
-   positive x-axis, and that has one point tangent to the half-infinite line that crosses the point
-   (<var>x0</var>, <var>y0</var>) and ends at the point (<var>x1</var>, <var>y1</var>), and that has
-   a different point tangent to the half-infinite line that ends at the point (<var>x1</var>,
-   <var>y1</var>) and crosses the point (<var>x2</var>, <var>y2</var>). The points at which this
-   ellipse touches these two lines are called the start and end tangent points respectively. Connect
-   the point (<var>x0</var>, <var>y0</var>) to the start tangent point by a straight line, adding
-   the start tangent point to the subpath, and then connect the start tangent point to the end
-   tangent point by <var>The Arc</var>, adding the end tangent point to the subpath.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-arc-2"><code>arc(<var>x</var>, <var>y</var>,
-  <var>radius</var>, <var>startAngle</var>, <var>endAngle</var>, <var>anticlockwise</var>)</code></dfn> and <dfn id="dom-context-2d-ellipse-2"><code>ellipse(<var>x</var>, <var>y</var>, <var>radiusX</var>, <var>radiusY</var>, <var>rotation</var>, <var>startAngle</var>, <var>endAngle</var>, <var>anticlockwise</var>)</code></dfn> methods draw arcs.</p>
-
-  <p>The <code id="building-paths:dom-context-2d-arc-2-2"><a href="#dom-context-2d-arc-2">arc()</a></code> method is equivalent to the <code id="building-paths:dom-context-2d-ellipse-2-2"><a href="#dom-context-2d-ellipse-2">ellipse()</a></code> method in the case where the two radii are equal.
-  When the <code id="building-paths:dom-context-2d-arc-2-3"><a href="#dom-context-2d-arc-2">arc()</a></code> method is invoked, it must act as if the
-  <code id="building-paths:dom-context-2d-ellipse-2-3"><a href="#dom-context-2d-ellipse-2">ellipse()</a></code> method had been invoked with the <var>radiusX</var> and <var>radiusY</var> arguments set to the value of the <var>radius</var> argument, the <var>rotation</var> argument set to zero, and the
-  other arguments set to the same values as their identically named arguments on the <code id="building-paths:dom-context-2d-arc-2-4"><a href="#dom-context-2d-arc-2">arc()</a></code> method.</p>
-
-  <p>The <code id="building-paths:dom-context-2d-ellipse-2-4"><a href="#dom-context-2d-ellipse-2">ellipse()</a></code> method, when invoked, must run these
-  steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>If either <var>radiusX</var> or <var>radiusY</var> are negative, then throw an
-   <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="building-paths:indexsizeerror-5">&quot;<code>IndexSizeError</code>&quot;</a> <code id="building-paths:domexception-5"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p></li><li><p>If the object's path has any subpaths, then add a straight line from the last point in the
-   subpath to the start point of the arc.</p></li><li>
-    <p>Add the start and end points of the arc to the subpath, and connect them with an arc. The arc
-    and its start and end points are defined as follows:</p>
-
-    <p>Consider an ellipse that has its origin at (<var>x</var>, <var>y</var>), that has a
-    major-axis radius <var>radiusX</var> and a minor-axis radius <var>radiusY</var>, and that is
-    rotated about its origin such that its semi-major axis is inclined <var>rotation</var> radians
-    clockwise from the x-axis.</p>
-
-    <p>If <var>anticlockwise</var> is false and <span><var>endAngle</var>-<var>startAngle</var></span> is equal to or greater than <span>2Ï€</span>, or, if <var>anticlockwise</var> is <em>true</em> and <span><var>startAngle</var>-<var>endAngle</var></span> is equal to or greater than <span>2Ï€</span>, then the arc is the whole circumference of this ellipse, and the point
-    at <var>startAngle</var> along this circle's circumference, measured in radians clockwise from
-    the ellipse's semi-major axis, acts as both the start point and the end point.</p>
-
-    <p>Otherwise, the points at <var>startAngle</var> and <var>endAngle</var> along this circle's
-    circumference, measured in radians clockwise from the ellipse's semi-major axis, are the start
-    and end points respectively, and the arc is the path along the circumference of this ellipse
-    from the start point to the end point, going anti-clockwise if <var>anticlockwise</var> is true,
-    and clockwise otherwise. Since the points are on the ellipse, as opposed to being simply angles
-    from zero, the arc can never cover an angle greater than <span>2Ï€</span>
-    radians.</p>
-
-    <p class="note">Even if the arc covers the entire circumference of the ellipse and there are no
-    other points in the subpath, the path is not closed unless the <code id="building-paths:dom-context-2d-closepath-2-2"><a href="#dom-context-2d-closepath-2">closePath()</a></code> method is appropriately invoked.</p>
-   </li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-rect-2"><code>rect(<var>x</var>, <var>y</var>, <var>w</var>,
-  <var>h</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Create a new subpath containing just the four points (<var>x</var>, <var>y</var>),
-   (<var>x</var>+<var>w</var>, <var>y</var>), (<var>x</var>+<var>w</var>,
-   <var>y</var>+<var>h</var>), (<var>x</var>, <var>y</var>+<var>h</var>), in that order, with those
-   four points connected by straight lines.</p></li><li><p>Mark the subpath as closed.</p></li><li><p>Create a new subpath with the point (<var>x</var>, <var>y</var>) as the only point in the
-   subpath.</p></li></ol>
-
-  
-
-  
-
-
-
-  <h6 id="path2d-objects"><span class="secno">4.12.5.1.6</span> <code id="path2d-objects:path2d"><a href="#path2d">Path2D</a></code> objects<a class="self-link" href="#path2d-objects"/></h6>
-
-  <p><code id="path2d-objects:path2d-2"><a href="#path2d">Path2D</a></code> objects can be used to declare paths that are then later used on
-  objects implementing the <code id="path2d-objects:canvasdrawpath"><a href="#canvasdrawpath">CanvasDrawPath</a></code> interface. In addition to many of the APIs
-  described in earlier sections, <code id="path2d-objects:path2d-3"><a href="#path2d">Path2D</a></code> objects have methods to combine paths, and to
-  add text to paths.</p>
-
-  <dl class="domintro"><dt><var>path</var> = new <code id="path2d-objects:dom-path2d"><a href="#dom-path2d">Path2D</a></code>()</dt><dd>
-
-    <p>Creates a new empty <code id="path2d-objects:path2d-4"><a href="#path2d">Path2D</a></code> object.</p>
-
-   </dd><dt><var>path</var> = new <code id="path2d-objects:dom-path2d-copy"><a href="#dom-path2d-copy">Path2D</a></code>(<var>path</var>)</dt><dd>
-
-    <p>Creates a new <code id="path2d-objects:path2d-5"><a href="#path2d">Path2D</a></code> object that is a copy of the argument.</p>
-
-   </dd><dt><var>path</var> = new <code id="path2d-objects:dom-path2d-merge"><a href="#dom-path2d-merge">Path2D</a></code>(<var>paths</var> [, <var>fillRule</var> ] )</dt><dd>
-
-    <p>Creates a new <code id="path2d-objects:path2d-6"><a href="#path2d">Path2D</a></code> object that describes a path that outlines the given <var>paths</var>, using the given fill rule.</p>
-
-   </dd><dt><var>path</var> = new <code id="path2d-objects:dom-path2d-withdata"><a href="#dom-path2d-withdata">Path2D</a></code>(<var>d</var>)</dt><dd>
-
-    <p>Creates a new path with the path described by the argument, interpreted as SVG path data. <a href="https://html.spec.whatwg.org/multipage/references.html#refsSVG">[SVG]</a></p>
-
-   </dd><dt><var>path</var> . <code id="dom-path2d-addpath"><a href="#dom-path2d-addpath-2">addPath</a></code>(<var>path</var> [, <var>transform</var> ] )</dt><dd>
-
-    <p>Adds to the path the path given by the argument.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-path2d"><code>Path2D()</code></dfn> constructor, when invoked, must return a
-  newly created <code id="path2d-objects:path2d-7"><a href="#path2d">Path2D</a></code> object.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-path2d-copy"><code>Path2D(<var>path</var>)</code></dfn>
-  constructor, when invoked, must return a newly created <code id="path2d-objects:path2d-8"><a href="#path2d">Path2D</a></code> object, to which the
-  subpaths of the argument are added. (In other words, it returns a copy of the argument.)</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-path2d-merge"><code>Path2D(<var>paths</var>,
-  <var>fillRule</var>)</code></dfn> constructor, when invoked, must run these steps:</p>
-
-  <ol><li>
-
-    <p>Run the appropriate step from the following list, based on the constructor's second
-    argument:</p>
-
-    <dl class="switch"><dt>If it is &quot;nonzero&quot;</dt><dd>
-
-      <p>Let <var>merged path</var> be a <a href="#concept-path" id="path2d-objects:concept-path">path</a> that
-      consists of a set of non-overlapping subpaths that exactly outline the points from which, in
-      any of the <a href="#concept-path" id="path2d-objects:concept-path-2">paths</a> provided in the constructor's first
-      argument, the number of times a half-infinite straight line drawn from that point crosses a
-      subpath going in one direction is not equal to the number of times it crosses a subpath going
-      in the other direction.</p>
-
-     </dd><dt>If it is &quot;evenodd&quot;</dt><dd>
-
-      <p>Let <var>merged path</var> be a <a href="#concept-path" id="path2d-objects:concept-path-3">path</a> that
-      consists of a set of non-overlapping subpaths that exactly outline the points from which, in
-      any of the <a href="#concept-path" id="path2d-objects:concept-path-4">paths</a> provided in the constructor's first
-      argument, the number of times a half-infinite straight line drawn from that point crosses that
-      path is odd.</p>
-
-     </dd></dl>
-
-    <p>The subpaths in <var>merged path</var> must be oriented such that for any point,
-    the number of times a half-infinite straight line drawn from that point crosses a subpath is
-    even if and only if the number of times a half-infinite straight line drawn from that same point
-    crosses a subpath going in one direction is equal to the number of times it crosses a subpath
-    going in the other direction.</p>
-
-   </li><li><p>Add all the subpaths in <var>merged path</var> to the <code id="path2d-objects:path2d-9"><a href="#path2d">Path2D</a></code>
-   object.</p></li><li><p>Set the <code id="path2d-objects:path2d-10"><a href="#path2d">Path2D</a></code> object's <a href="#need-new-subpath" id="path2d-objects:need-new-subpath">need new subpath</a> flag.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-path2d-withdata"><code>Path2D(<var>d</var>)</code></dfn>
-  constructor, when invoked, must run these steps:</p>
-
-  <ol><li>
-
-    <p>Parse and interpret the <var>d</var> argument according to the SVG specification's
-    rules for path data, thus obtaining an SVG path. <a href="https://html.spec.whatwg.org/multipage/references.html#refsSVG">[SVG]</a></p>
-
-    <p class="note">The resulting path could be empty. SVG defines error handling rules for parsing
-    and applying path data.</p>
-
-   </li><li><p>Let (<var>x</var>, <var>y</var>) be the last point in the SVG
-   path.</p></li><li><p>Create a new <code id="path2d-objects:path2d-11"><a href="#path2d">Path2D</a></code> object and add all the subpaths in the SVG path, if any,
-   to that <code id="path2d-objects:path2d-12"><a href="#path2d">Path2D</a></code> object. </p>
-
-   </li><li><p>Create a new subpath in the <code id="path2d-objects:path2d-13"><a href="#path2d">Path2D</a></code> object with (<var>x</var>, <var>y</var>) as the only point in the subpath.</p></li><li><p>Return the <code id="path2d-objects:path2d-14"><a href="#path2d">Path2D</a></code> object as the constructed object.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-path2d-addpath-2"><code>addPath(<var>b</var>,
-  <var>transform</var>)</code></dfn> method, when invoked on a <code id="path2d-objects:path2d-15"><a href="#path2d">Path2D</a></code> object
-  <var>a</var>, must run these steps:</p>
-
-  <ol><li><p>If the <code id="path2d-objects:path2d-16"><a href="#path2d">Path2D</a></code> object <var>b</var> has no subpaths, then abort these
-   steps.</p></li><li><p>Create a copy of all the subpaths in <var>b</var>. Let this copy be known as <var>c</var>.</p></li><li><p>Let <var>matrix</var> be the result of <a data-x-internal="create-a-dommatrix-from-a-dictionary" href="https://drafts.fxtf.org/geometry/#create-a-dommatrix-from-the-dictionary" id="path2d-objects:create-a-dommatrix-from-a-dictionary">creating a <code>DOMMatrix</code> from a dictionary</a>
-   <var>transform</var>, with <var>ignore3D</var> set to true.</p></li><li><p>Transform all the coordinates and lines in <var>c</var> by the transform matrix
-   <var>matrix</var>.</p></li><li><p>Let (<var>x</var>, <var>y</var>) be the last point in the last subpath
-   of <var>c</var>.</p></li><li><p>Add all the subpaths in <var>c</var> to <var>a</var>.</p></li><li><p>Create a new subpath in <var>a</var> with (<var>x</var>, <var>y</var>) as the only point in the subpath.</p></li></ol>
-
-  
-
-
-  <h6 id="transformations"><span class="secno">4.12.5.1.7</span> <dfn>Transformations</dfn><a class="self-link" href="#transformations"/></h6><div class="status"><input onclick="toggleStatus(this)" type="button" value="â‹°"/><p class="bugs"><strong>Spec bugs:</strong> <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=28333" title="Show on example how a,b,c,d,e,f affect the point position">28333</a></p></div>
-
-  <p>Objects that implement the <code id="transformations:canvastransform"><a href="#canvastransform">CanvasTransform</a></code> interface have a <dfn id="current-transformation-matrix">current
-  transformation matrix</dfn>, as well as methods (described in this section) to manipulate it. When
-  an object implementing the <code id="transformations:canvastransform-2"><a href="#canvastransform">CanvasTransform</a></code> interface is created, its transformation
-  matrix must be initialized to the identity transform.</p>
-
-  <p>The <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix">current transformation matrix</a> is applied to coordinates when creating the
-  <a href="#current-default-path" id="transformations:current-default-path">current default path</a>, and when painting text, shapes, and <code id="transformations:path2d"><a href="#path2d">Path2D</a></code>
-  objects, on objects implementing the <code id="transformations:canvastransform-3"><a href="#canvastransform">CanvasTransform</a></code> interface.</p>
-  
-
-  <p class="note">Most of the API uses <code id="transformations:dommatrix"><a data-x-internal="dommatrix" href="https://drafts.fxtf.org/geometry/#dommatrix">DOMMatrix</a></code> objects rather than this API. This API
-  remains mostly for historical reasons.</p>
-
-  
-
-  <p>The transformations must be performed in reverse order.</p>
-
-  <p class="note">For instance, if a scale transformation that doubles the width is applied to the
-  canvas, followed by a rotation transformation that rotates drawing operations by a quarter turn,
-  and a rectangle twice as wide as it is tall is then drawn on the canvas, the actual result will be
-  a square.</p> 
-
-  
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-scale"><a href="#dom-context-2d-scale-2">scale</a></code>(<var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-2">current transformation matrix</a> to apply a scaling transformation
-    with the given characteristics.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-rotate"><a href="#dom-context-2d-rotate-2">rotate</a></code>(<var>angle</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-3">current transformation matrix</a> to apply a rotation transformation
-    with the given characteristics. The angle is in radians.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-translate"><a href="#dom-context-2d-translate-2">translate</a></code>(<var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-4">current transformation matrix</a> to apply a translation transformation
-    with the given characteristics.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-transform"><a href="#dom-context-2d-transform-2">transform</a></code>(<var>a</var>, <var>b</var>, <var>c</var>, <var>d</var>, <var>e</var>, <var>f</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-5">current transformation matrix</a> to apply the matrix given by the
-    arguments as described below.</p>
-
-   </dd><dt><var>matrix</var> = <var>context</var> . <code id="dom-context-2d-gettransform"><a href="#dom-context-2d-gettransform-2">getTransform</a></code>()</dt><dd>
-
-    <p>Returns a copy of the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-6">current transformation matrix</a>, as a newly created
-    <code id="transformations:dommatrix-2"><a data-x-internal="dommatrix" href="https://drafts.fxtf.org/geometry/#dommatrix">DOMMatrix</a></code> object.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-settransform"><a href="#dom-context-2d-settransform-2">setTransform</a></code>(<var>a</var>, <var>b</var>, <var>c</var>, <var>d</var>, <var>e</var>, <var>f</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-7">current transformation matrix</a> <em>to</em> the matrix given by the
-    arguments as described below.</p>
-
-   </dd><dt><var>context</var> . <code id="transformations:dom-context-2d-settransform-2"><a href="#dom-context-2d-settransform-2">setTransform</a></code>(<var>transform</var>)</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-8">current transformation matrix</a> <em>to</em> the matrix represented by
-    the passed <code id="transformations:dommatrix2dinit"><a data-x-internal="dommatrix2dinit" href="https://drafts.fxtf.org/geometry/#dictdef-dommatrix2dinit">DOMMatrix2DInit</a></code> dictionary.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-resettransform"><a href="#dom-context-2d-resettransform-2">resetTransform</a></code>()</dt><dd>
-
-    <p>Changes the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-9">current transformation matrix</a> to the identity transform.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-context-2d-scale-2"><code>scale(<var>x</var>, <var>y</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Add the scaling transformation described by the arguments to the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-10">current
-   transformation matrix</a>. The <var>x</var> argument represents the scale factor in the
-   horizontal direction and the <var>y</var> argument represents the scale factor in the vertical
-   direction. The factors are multiples.</p></li></ol>
-
-  <p>The <dfn id="dom-context-2d-rotate-2"><code>rotate(<var>angle</var>)</code></dfn> method,
-  when invoked, must run these steps:</p>
-
-  <ol><li><p>If <var>angle</var> is infinite or NaN, then abort these steps.</p></li><li><p>Add the rotation transformation described by the argument to the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-11">current
-   transformation matrix</a>. The <var>angle</var> argument represents a clockwise rotation angle
-   expressed in radians.</p></li></ol>
-
-  <p>The <dfn id="dom-context-2d-translate-2"><code>translate(<var>x</var>,
-  <var>y</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If either of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Add the translation transformation described by the arguments to the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-12">current
-   transformation matrix</a>. The <var>x</var> argument represents the translation distance in
-   the horizontal direction and the <var>y</var> argument represents the translation distance in the
-   vertical direction. The arguments are in coordinate space units.</p></li></ol>
-
-  <p>The <dfn id="dom-context-2d-transform-2"><code>transform(<var>a</var>, <var>b</var>,
-  <var>c</var>, <var>d</var>, <var>e</var>, <var>f</var>)</code></dfn> method, when invoked, must
-  run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Replace the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-13">current transformation matrix</a> with the result of multiplying the
-   current transformation matrix with the matrix described by:</p></li></ol>
-
-  
-
-  <table class="matrix"><tbody><tr><td><var>a</var></td><td><var>c</var></td><td><var>e</var></td></tr><tr><td><var>b</var></td><td><var>d</var></td><td><var>f</var></td></tr><tr><td>0</td><td>0</td><td>1</td></tr></tbody></table>
-
-  <p class="note">The arguments <var>a</var>, <var>b</var>, <var>c</var>, <var>d</var>,
-  <var>e</var>, and <var>f</var> are sometimes called <var>m11</var>, <var>m12</var>,
-  <var>m21</var>, <var>m22</var>, <var>dx</var>, and <var>dy</var> or <var>m11</var>,
-  <var>m21</var>, <var>m12</var>, <var>m22</var>, <var>dx</var>, and <var>dy</var>. Care ought to be
-  taken in particular with the order of the second and third arguments (<var>b</var> and
-  <var>c</var>) as their order varies from API to API and APIs sometimes use the notation
-  <var>m12</var>/<var>m21</var> and sometimes <var>m21</var>/<var>m12</var> for those positions.</p>
-
-  
-
-  <p>The <dfn id="dom-context-2d-gettransform-2"><code>getTransform()</code></dfn> method, when
-  invoked, must return a newly created <code id="transformations:dommatrix-3"><a data-x-internal="dommatrix" href="https://drafts.fxtf.org/geometry/#dommatrix">DOMMatrix</a></code> representing a copy of the
-  <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-14">current transformation matrix</a> matrix of the context.</p>
-
-  <p class="note">This returned object is not live, so updating it will not affect the
-  <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-15">current transformation matrix</a>, and updating the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-16">current transformation
-  matrix</a> will not affect an already returned <code id="transformations:dommatrix-4"><a data-x-internal="dommatrix" href="https://drafts.fxtf.org/geometry/#dommatrix">DOMMatrix</a></code>.</p>
-
-  <p>The <dfn id="dom-context-2d-settransform-2"><code>setTransform(<var>a</var>, <var>b</var>,
-  <var>c</var>, <var>d</var>, <var>e</var>, <var>f</var>)</code></dfn> method, when invoked, must
-  run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Reset the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-17">current transformation matrix</a> to the identity matrix.</p></li><li><p>Invoke the <code><a href="#dom-context-2d-transform-2" id="transformations:dom-context-2d-transform-2">transform</a>(<var>a</var>, <var>b</var>, <var>c</var>,
-   <var>d</var>, <var>e</var>, <var>f</var>)</code> method with the same arguments.</p></li></ol>
-
-  <p>The <dfn><code>setTransform(<var>transform</var>)</code></dfn> method, when invoked,
-  must reset the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-18">current transformation matrix</a> to the value represented by the result
-  of <a data-x-internal="create-a-dommatrix-from-a-dictionary" href="https://drafts.fxtf.org/geometry/#create-a-dommatrix-from-the-dictionary" id="transformations:create-a-dommatrix-from-a-dictionary">creating a <code>DOMMatrix</code> from a
-  dictionary</a> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
-
-  <p>The <dfn id="dom-context-2d-resettransform-2"><code>resetTransform()</code></dfn> method,
-  when invoked, must reset the <a href="#current-transformation-matrix" id="transformations:current-transformation-matrix-19">current transformation matrix</a> to the identity
-  matrix.</p>
-
-  
-
-
-
-  <h6 id="image-sources-for-2d-rendering-contexts"><span class="secno">4.12.5.1.8</span> Image sources for 2D rendering contexts<a class="self-link" href="#image-sources-for-2d-rendering-contexts"/></h6>
-
-  <p>Some methods on the <code id="image-sources-for-2d-rendering-contexts:canvasdrawimage"><a href="#canvasdrawimage">CanvasDrawImage</a></code> and <code id="image-sources-for-2d-rendering-contexts:canvasfillstrokestyles"><a href="#canvasfillstrokestyles">CanvasFillStrokeStyles</a></code>
-  interfaces take the union type <code id="image-sources-for-2d-rendering-contexts:canvasimagesource"><a href="#canvasimagesource">CanvasImageSource</a></code> as an argument.</p>
-
-  <p>This union type allows objects implementing any of the following interfaces to be used as image
-  sources:</p>
-
-  <ul><li><code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> (<code id="image-sources-for-2d-rendering-contexts:the-img-element"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> or <a data-x-internal="svg-image" href="https://www.w3.org/TR/SVG11/struct.html#ImageElement" id="image-sources-for-2d-rendering-contexts:svg-image">SVG <code>image</code></a>
-   elements)</li><li><code id="image-sources-for-2d-rendering-contexts:htmlvideoelement"><a href="https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement">HTMLVideoElement</a></code> (<code id="image-sources-for-2d-rendering-contexts:the-video-element"><a href="https://html.spec.whatwg.org/multipage/media.html#the-video-element">video</a></code> elements)</li><li><code id="image-sources-for-2d-rendering-contexts:htmlcanvaselement"><a href="#htmlcanvaselement">HTMLCanvasElement</a></code> (<code id="image-sources-for-2d-rendering-contexts:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> elements)</li><li><code id="image-sources-for-2d-rendering-contexts:imagebitmap"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code></li></ul>
-
-  <p class="note">Although not formally specified as such, <a data-x-internal="svg-image" href="https://www.w3.org/TR/SVG11/struct.html#ImageElement" id="image-sources-for-2d-rendering-contexts:svg-image-2">SVG <code>image</code></a>
-  elements are expected to be implemented nearly identical to <code id="image-sources-for-2d-rendering-contexts:the-img-element-2"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> elements. That is,
-  <a data-x-internal="svg-image" href="https://www.w3.org/TR/SVG11/struct.html#ImageElement" id="image-sources-for-2d-rendering-contexts:svg-image-3">SVG <code>image</code></a> elements share the fundamental concepts and features of
-  <code id="image-sources-for-2d-rendering-contexts:the-img-element-3"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> elements.</p>
-
-  <p class="note">The <code id="image-sources-for-2d-rendering-contexts:imagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> interface can be created from a number of other
-  image-representing types, including <code id="image-sources-for-2d-rendering-contexts:imagedata"><a href="#imagedata">ImageData</a></code>.</p>
-
-  <p>When a user agent is required to <dfn id="check-the-usability-of-the-image-argument">check the usability of the <var>image</var>
-  argument</dfn>, where <var>image</var> is a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-2"><a href="#canvasimagesource">CanvasImageSource</a></code> object, the
-  user agent must run these steps, which return either <i>good</i>, <i>bad</i>, or
-  <i>aborted</i>:</p>
-
-  <ol><li><p>If <var>image</var> is an <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-2"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> object that is in the <a href="https://html.spec.whatwg.org/multipage/images.html#img-error" id="image-sources-for-2d-rendering-contexts:img-error">broken</a> state, then throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="image-sources-for-2d-rendering-contexts:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="image-sources-for-2d-rendering-contexts:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>, return <i>aborted</i>,
-   and abort these steps.</p></li><li><p>If <var>image</var> is an <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-3"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> object that is not <a href="https://html.spec.whatwg.org/multipage/images.html#img-good" id="image-sources-for-2d-rendering-contexts:img-good">fully decodable</a>, or if <var>image</var> is an
-   <code id="image-sources-for-2d-rendering-contexts:htmlvideoelement-2"><a href="https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement">HTMLVideoElement</a></code> object whose <code id="image-sources-for-2d-rendering-contexts:dom-media-readystate-2"><a href="https://html.spec.whatwg.org/multipage/media.html#dom-media-readystate-2">readyState</a></code>
-   attribute is either <code id="image-sources-for-2d-rendering-contexts:dom-media-have_nothing"><a href="https://html.spec.whatwg.org/multipage/media.html#dom-media-have_nothing">HAVE_NOTHING</a></code> or <code id="image-sources-for-2d-rendering-contexts:dom-media-have_metadata"><a href="https://html.spec.whatwg.org/multipage/media.html#dom-media-have_metadata">HAVE_METADATA</a></code>, then return <i>bad</i> and abort these
-   steps.</p></li><li><p>If <var>image</var> is an <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-4"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> object with an
-   <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-width" id="image-sources-for-2d-rendering-contexts:intrinsic-width">intrinsic width</a> or <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-height" id="image-sources-for-2d-rendering-contexts:intrinsic-height">intrinsic height</a> (or both) equal to zero, then
-   return <i>bad</i> and abort these steps.</p></li><li><p>If <var>image</var> is an <code id="image-sources-for-2d-rendering-contexts:htmlcanvaselement-2"><a href="#htmlcanvaselement">HTMLCanvasElement</a></code> object with either a horizontal
-   dimension or a vertical dimension equal to zero, then return <i>bad</i> and abort these
-   steps.</p></li><li><p>If <var>image</var> is an <code id="image-sources-for-2d-rendering-contexts:imagebitmap-3"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> object with its
-   <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="image-sources-for-2d-rendering-contexts:detached">[[Detached]]</a> internal slot value set to true, then throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="image-sources-for-2d-rendering-contexts:invalidstateerror-2">&quot;<code>InvalidStateError</code>&quot;</a> <code id="image-sources-for-2d-rendering-contexts:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>, return <i>aborted</i>,
-   and abort these steps.</p></li><li><p>Return <i>good</i>.</p></li></ol>
-
-  <p>When a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-3"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-5"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code>,
-  the element's image must be used as the source image.</p>
-
-  <p>Specifically, when a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-4"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an animated image in an
-  <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-6"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code>, the user agent must use the default image of the animation
-  (the one that the format defines is to be used when animation is not supported or is disabled),
-  or, if there is no such image, the first frame of the animation, when rendering the image for
-  <code id="image-sources-for-2d-rendering-contexts:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> APIs.</p>
-
-  <p>When a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-5"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an <code id="image-sources-for-2d-rendering-contexts:htmlvideoelement-3"><a href="https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement">HTMLVideoElement</a></code>, then
-  the frame at the <a href="https://html.spec.whatwg.org/multipage/media.html#current-playback-position" id="image-sources-for-2d-rendering-contexts:current-playback-position">current playback position</a> when the method with the argument is
-  invoked must be used as the source image when rendering the image for
-  <code id="image-sources-for-2d-rendering-contexts:canvasrenderingcontext2d-2"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> APIs, and the source image's dimensions must be the <a href="https://html.spec.whatwg.org/multipage/media.html#concept-video-intrinsic-width" id="image-sources-for-2d-rendering-contexts:concept-video-intrinsic-width">intrinsic width</a> and <a href="https://html.spec.whatwg.org/multipage/media.html#concept-video-intrinsic-height" id="image-sources-for-2d-rendering-contexts:concept-video-intrinsic-height">intrinsic height</a> of the <a href="https://html.spec.whatwg.org/multipage/media.html#media-resource" id="image-sources-for-2d-rendering-contexts:media-resource">media resource</a>
-  (i.e. after any aspect-ratio correction has been applied).</p>
-
-  <p>When a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-6"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an <code id="image-sources-for-2d-rendering-contexts:htmlcanvaselement-3"><a href="#htmlcanvaselement">HTMLCanvasElement</a></code>, the
-  element's bitmap must be used as the source image.</p>
-
-  <p>When a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-7"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an element that is <a href="https://html.spec.whatwg.org/multipage/rendering.html#being-rendered" id="image-sources-for-2d-rendering-contexts:being-rendered">being
-  rendered</a> and that element has been resized, the original image data of the source image
-  must be used, not the image as it is rendered (e.g. <code id="image-sources-for-2d-rendering-contexts:attr-dim-width"><a href="https://html.spec.whatwg.org/multipage/embedded-content-other.html#attr-dim-width">width</a></code> and
-  <code id="image-sources-for-2d-rendering-contexts:attr-dim-height"><a href="https://html.spec.whatwg.org/multipage/embedded-content-other.html#attr-dim-height">height</a></code> attributes on the source element have no effect on how
-  the object is interpreted when rendering the image for <code id="image-sources-for-2d-rendering-contexts:canvasrenderingcontext2d-3"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>
-  APIs).</p>
-
-  <p>When a <code id="image-sources-for-2d-rendering-contexts:canvasimagesource-8"><a href="#canvasimagesource">CanvasImageSource</a></code> object represents an <code id="image-sources-for-2d-rendering-contexts:imagebitmap-4"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code>, the
-  object's bitmap image data must be used as the source image.</p>
-
-  <p><dfn id="the-image-argument-is-not-origin-clean">The <var>image argument</var> is not origin-clean</dfn> if it is an
-  <code id="image-sources-for-2d-rendering-contexts:htmlorsvgimageelement-7"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> or <code id="image-sources-for-2d-rendering-contexts:htmlvideoelement-4"><a href="https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement">HTMLVideoElement</a></code> whose <a href="https://html.spec.whatwg.org/multipage/origin.html#concept-origin" id="image-sources-for-2d-rendering-contexts:concept-origin">origin</a> is
-  not the <a href="https://html.spec.whatwg.org/multipage/origin.html#same-origin" id="image-sources-for-2d-rendering-contexts:same-origin">same</a> as the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-settings-object-origin" id="image-sources-for-2d-rendering-contexts:concept-settings-object-origin">origin</a> specified by the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#entry-settings-object" id="image-sources-for-2d-rendering-contexts:entry-settings-object">entry settings
-  object</a>, or if it is an <code id="image-sources-for-2d-rendering-contexts:htmlcanvaselement-4"><a href="#htmlcanvaselement">HTMLCanvasElement</a></code> whose bitmap's <a href="#concept-canvas-origin-clean" id="image-sources-for-2d-rendering-contexts:concept-canvas-origin-clean">origin-clean</a> flag is false.</p>
-
-
-
-  <h6 id="fill-and-stroke-styles"><span class="secno">4.12.5.1.9</span> Fill and stroke styles<a class="self-link" href="#fill-and-stroke-styles"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-fillstyle"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current style used for filling shapes.</p>
-
-    <p>Can be set, to change the fill style.</p>
-
-    <p>The style can be either a string containing a CSS color, or a <code id="fill-and-stroke-styles:canvasgradient"><a href="#canvasgradient">CanvasGradient</a></code> or
-    <code id="fill-and-stroke-styles:canvaspattern"><a href="#canvaspattern">CanvasPattern</a></code> object. Invalid values are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-strokestyle"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current style used for stroking shapes.</p>
-
-    <p>Can be set, to change the stroke style.</p>
-
-    <p>The style can be either a string containing a CSS color, or a <code id="fill-and-stroke-styles:canvasgradient-2"><a href="#canvasgradient">CanvasGradient</a></code> or
-    <code id="fill-and-stroke-styles:canvaspattern-2"><a href="#canvaspattern">CanvasPattern</a></code> object. Invalid values are ignored.</p>
-
-   </dd></dl>
-
-  
-
-  
-
-  <p>Objects that implement the <code id="fill-and-stroke-styles:canvasfillstrokestyles"><a href="#canvasfillstrokestyles">CanvasFillStrokeStyles</a></code> interface have attributes and
-  methods (defined in this section) that control how shapes are treated by the object.</p>
-
-  <p>The <dfn id="dom-context-2d-fillstyle-2"><code>fillStyle</code></dfn> attribute represents the
-  color or style to use inside shapes, and the <dfn id="dom-context-2d-strokestyle-2"><code>strokeStyle</code></dfn> attribute represents the color
-  or style to use for the lines around the shapes.</p>
-
-  <p>Both attributes can be either strings, <code id="fill-and-stroke-styles:canvasgradient-3"><a href="#canvasgradient">CanvasGradient</a></code>s, or
-  <code id="fill-and-stroke-styles:canvaspattern-3"><a href="#canvaspattern">CanvasPattern</a></code>s. On setting, strings must be <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="fill-and-stroke-styles:parsed-as-a-css-color-value">parsed as CSS &lt;color&gt; values</a> and the color assigned, and
-  <code id="fill-and-stroke-styles:canvasgradient-4"><a href="#canvasgradient">CanvasGradient</a></code> and <code id="fill-and-stroke-styles:canvaspattern-4"><a href="#canvaspattern">CanvasPattern</a></code> objects must be assigned themselves. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSCOLOR">[CSSCOLOR]</a> If the value is a string but cannot be <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="fill-and-stroke-styles:parsed-as-a-css-color-value-2">parsed as a CSS
-  &lt;color&gt; value</a>, then it must be ignored, and the attribute must retain its previous
-  value.
-
-  If the new value is a <code id="fill-and-stroke-styles:canvaspattern-5"><a href="#canvaspattern">CanvasPattern</a></code> object that is marked as <a href="#concept-canvas-pattern-not-origin-clean" id="fill-and-stroke-styles:concept-canvas-pattern-not-origin-clean">not origin-clean</a>, then the
-  <code id="fill-and-stroke-styles:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>'s <a href="#concept-canvas-origin-clean" id="fill-and-stroke-styles:concept-canvas-origin-clean">origin-clean</a> flag must be set to false.
-
-  </p>
-
-  <p>When set to a <code id="fill-and-stroke-styles:canvaspattern-6"><a href="#canvaspattern">CanvasPattern</a></code> or <code id="fill-and-stroke-styles:canvasgradient-5"><a href="#canvasgradient">CanvasGradient</a></code> object, the assignment
-  is <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#live" id="fill-and-stroke-styles:live">live</a>, meaning that changes made to the object after the assignment do affect
-  subsequent stroking or filling of shapes.</p>
-
-  <p>On getting, if the value is a color, then the <a href="#serialisation-of-a-color" id="fill-and-stroke-styles:serialisation-of-a-color">serialization of the color</a> must be returned. Otherwise, if it is not a color but a
-  <code id="fill-and-stroke-styles:canvasgradient-6"><a href="#canvasgradient">CanvasGradient</a></code> or <code id="fill-and-stroke-styles:canvaspattern-7"><a href="#canvaspattern">CanvasPattern</a></code>, then the respective object must be
-  returned. (Such objects are opaque and therefore only useful for assigning to other attributes or
-  for comparison to other gradients or patterns.)</p>
-
-  <p>The <dfn id="serialisation-of-a-color">serialization of a color</dfn> for a color
-  value is a string, computed as follows: if it has alpha equal to 1.0, then the string is a
-  lowercase six-digit hex value, prefixed with a &quot;#&quot; character (U+0023 NUMBER SIGN), with the first
-  two digits representing the red component, the next two digits representing the green component,
-  and the last two digits representing the blue component, the digits being <a data-x-internal="lowercase-ascii-hex-digits" href="https://infra.spec.whatwg.org/#ascii-lower-hex-digit" id="fill-and-stroke-styles:lowercase-ascii-hex-digits">ASCII lower hex digits</a>. Otherwise, the color value has alpha less than
-  1.0, and the string is the color value in the CSS <code>rgba()</code>
-  functional-notation format: the literal string &quot;<code>rgba</code>&quot; (U+0072 U+0067 U+0062
-  U+0061) followed by a U+0028 LEFT PARENTHESIS, a base-ten integer in the range 0-255 representing
-  the red component (using <a data-x-internal="ascii-digits" href="https://infra.spec.whatwg.org/#ascii-digit" id="fill-and-stroke-styles:ascii-digits">ASCII digits</a> in the shortest form possible), a literal
-  U+002C COMMA and U+0020 SPACE, an integer for the green component, a comma and a space, an integer
-  for the blue component, another comma and space, a U+0030 DIGIT ZERO, if the alpha value is
-  greater than zero then a U+002E FULL STOP (representing the decimal point), if the alpha value is
-  greater than zero then one or more <a data-x-internal="ascii-digits" href="https://infra.spec.whatwg.org/#ascii-digit" id="fill-and-stroke-styles:ascii-digits-2">ASCII digits</a> representing the fractional part of
-  the alpha, and finally a U+0029
-  RIGHT PARENTHESIS. User agents must express the fractional part of the alpha value, if any, with
-  the level of precision necessary for the alpha value, when reparsed, to be interpreted as the same
-  alpha value.</p>
-  
-
-  <p>When the context is created, the <code id="fill-and-stroke-styles:dom-context-2d-fillstyle-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code> and <code id="fill-and-stroke-styles:dom-context-2d-strokestyle-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code> attributes
-  must initially have the string value <code>#000000</code>.</p>
-
-  <p>When the value is a color, it must not be affected by the transformation matrix when used to
-  draw on bitmaps.</p> 
-
-  
-
-  <hr/>
-
-  <p>There are two types of gradients, linear gradients and radial gradients, both represented by
-  objects implementing the opaque <code id="fill-and-stroke-styles:canvasgradient-7"><a href="#canvasgradient">CanvasGradient</a></code> interface.</p>
-
-  <p id="interpolation">Once a gradient has been created (see below), stops are placed along it to
-  define how the colors are distributed along the gradient. The color of the
-  gradient at each stop is the color specified for that stop. Between each such stop, the colors and
-  the alpha component must be linearly interpolated over the RGBA space without premultiplying the
-  alpha value to find the color to use at that offset. Before the first stop, the color must be the
-  color of the first stop. After the last stop, the color must be the color of the last stop. When
-  there are no stops, the gradient is transparent black.</p>
-
-  <dl class="domintro"><dt><var>gradient</var> . <code id="dom-canvasgradient-addcolorstop"><a href="#dom-canvasgradient-addcolorstop-2">addColorStop</a></code>(<var>offset</var>, <var>color</var>)</dt><dd>
-
-    <p>Adds a color stop with the given color to the gradient at the given offset. 0.0 is the offset
-    at one end of the gradient, 1.0 is the offset at the other end.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="fill-and-stroke-styles:indexsizeerror">&quot;<code>IndexSizeError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the offset
-    is out of range. Throws a <a data-x-internal="syntaxerror" href="https://heycam.github.io/webidl/#syntaxerror" id="fill-and-stroke-styles:syntaxerror">&quot;<code>SyntaxError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if
-    the color cannot be parsed.</p>
-
-   </dd><dt><var>gradient</var> = <var>context</var> . <code id="dom-context-2d-createlineargradient"><a href="#dom-context-2d-createlineargradient-2">createLinearGradient</a></code>(<var>x0</var>, <var>y0</var>, <var>x1</var>, <var>y1</var>)</dt><dd>
-
-    <p>Returns a <code id="fill-and-stroke-styles:canvasgradient-8"><a href="#canvasgradient">CanvasGradient</a></code> object that represents a
-    linear gradient that paints along the line given by the
-    coordinates represented by the arguments.</p>
-
-   </dd><dt><var>gradient</var> = <var>context</var> . <code id="dom-context-2d-createradialgradient"><a href="#dom-context-2d-createradialgradient-2">createRadialGradient</a></code>(<var>x0</var>, <var>y0</var>, <var>r0</var>, <var>x1</var>, <var>y1</var>, <var>r1</var>)</dt><dd>
-
-    <p>Returns a <code id="fill-and-stroke-styles:canvasgradient-9"><a href="#canvasgradient">CanvasGradient</a></code> object that represents a
-    radial gradient that paints along the cone given by the circles
-    represented by the arguments.</p>
-
-    <p>If either of the radii are negative, throws an
-    <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="fill-and-stroke-styles:indexsizeerror-2">&quot;<code>IndexSizeError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-3"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> exception.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-canvasgradient-addcolorstop-2"><code>addColorStop(<var>offset</var>,
-  <var>color</var>)</code></dfn> method on the <code id="fill-and-stroke-styles:canvasgradient-10"><a href="#canvasgradient">CanvasGradient</a></code> interface adds a new stop
-  to a gradient. If the <var>offset</var> is less than 0 or greater than 1 then an
-  <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="fill-and-stroke-styles:indexsizeerror-3">&quot;<code>IndexSizeError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-4"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> must be thrown. If the
-  <var>color</var> cannot be <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="fill-and-stroke-styles:parsed-as-a-css-color-value-3">parsed as a CSS &lt;color&gt; value</a>, then a
-  <a data-x-internal="syntaxerror" href="https://heycam.github.io/webidl/#syntaxerror" id="fill-and-stroke-styles:syntaxerror-2">&quot;<code>SyntaxError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-5"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> must be thrown. Otherwise, the
-  gradient must have a new stop placed, at offset <var>offset</var> relative to the whole gradient,
-  and with the color obtained by <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="fill-and-stroke-styles:parsed-as-a-css-color-value-4">parsing
-  <var>color</var> as a CSS &lt;color&gt; value</a>. If multiple stops are added at the same
-  offset on a gradient, then they must be placed in the order added, with the first one closest to
-  the start of the gradient, and each subsequent one infinitesimally further along towards the end
-  point (in effect causing all but the first and last stop added at each point to be ignored).</p>
-
-  <p>The <dfn id="dom-context-2d-createlineargradient-2"><code>createLinearGradient(<var>x0</var>,
-  <var>y0</var>, <var>x1</var>, <var>y1</var>)</code></dfn> method takes four arguments that
-  represent the start point (<var>x0</var>, <var>y0</var>) and end point (<var>x1</var>,
-  <var>y1</var>) of the gradient. The method, when invoked, must return a linear
-  <code id="fill-and-stroke-styles:canvasgradient-11"><a href="#canvasgradient">CanvasGradient</a></code> initialized with the specified line.</p>
-
-  <p>Linear gradients must be rendered such that all points on a line perpendicular to the line that
-  crosses the start and end points have the color at the point where those two lines cross (with the
-  colors coming from the <a href="#interpolation">interpolation and extrapolation</a> described
-  above). The points in the linear gradient must be transformed as described by the <a href="#transformations" id="fill-and-stroke-styles:transformations">current transformation matrix</a> when rendering.</p>
-
-  <p>If <var>x0</var> = <var>x1</var> and <span><var>y0</var> = <var>y1</var></span>, then the linear
-  gradient must paint nothing.</p>
-
-  <p>The <dfn id="dom-context-2d-createradialgradient-2"><code>createRadialGradient(<var>x0</var>,
-  <var>y0</var>, <var>r0</var>, <var>x1</var>, <var>y1</var>, <var>r1</var>)</code></dfn> method
-  takes six arguments, the first three representing the start circle with origin (<var>x0</var>,
-  <var>y0</var>) and radius <var>r0</var>, and the last three representing the end circle with
-  origin (<var>x1</var>, <var>y1</var>) and radius <var>r1</var>. The values are in coordinate space
-  units. If either of <var>r0</var> or <var>r1</var> are negative, then an
-  <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="fill-and-stroke-styles:indexsizeerror-4">&quot;<code>IndexSizeError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-6"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> must be thrown. Otherwise,
-  the method, when invoked, must return a radial <code id="fill-and-stroke-styles:canvasgradient-12"><a href="#canvasgradient">CanvasGradient</a></code> initialized with the
-  two specified circles.</p>
-
-  <p>Radial gradients must be rendered by following these steps:</p>
-
-  <ol><li><p>If <var>x<sub>0</sub></var> = <var>x<sub>1</sub></var> and <var>y<sub>0</sub></var> = <var>y<sub>1</sub></var> and <var>r<sub>0</sub></var> = <var>r<sub>1</sub></var>, then the radial gradient must
-   paint nothing. Abort these steps.</p></li><li>
-
-    <p>Let <span>x(<var>ω</var>) = (<var>x<sub>1</sub></var>-<var>x<sub>0</sub></var>)<var>ω</var> + <var>x<sub>0</sub></var></span></p>
-
-    <p>Let <span>y(<var>ω</var>) = (<var>y<sub>1</sub></var>-<var>y<sub>0</sub></var>)<var>ω</var> + <var>y<sub>0</sub></var></span></p>
-
-    <p>Let <span>r(<var>ω</var>) = (<var>r<sub>1</sub></var>-<var>r<sub>0</sub></var>)<var>ω</var> + <var>r<sub>0</sub></var></span></p>
-
-    <p>Let the color at <var>ω</var> be the color at that position on the gradient
-    (with the colors coming from the <a href="#interpolation">interpolation and extrapolation</a>
-    described above).</p>
-
-   </li><li><p>For all values of <var>ω</var> where <span>r(<var>ω</var>) &gt; 0</span>, starting with the value of <var>ω</var> nearest to positive infinity and ending with the value of <var>ω</var> nearest to negative infinity, draw the circumference of the circle with
-   radius <span>r(<var>ω</var>)</span> at position (<span>x(<var>ω</var>)</span>, <span>y(<var>ω</var>)</span>), with the
-   color at <var>ω</var>, but only painting on the parts of the bitmap that have not
-   yet been painted on by earlier circles in this step for this rendering of the gradient.</p></li></ol>
-
-  <p class="note">This effectively creates a cone, touched by the two circles defined in the
-  creation of the gradient, with the part of the cone before the start circle (0.0) using the color
-  of the first offset, the part of the cone after the end circle (1.0) using the color of the last
-  offset, and areas outside the cone untouched by the gradient (transparent black).</p>
-
-  <p>The resulting radial gradient must then be transformed as described by the <a href="#transformations" id="fill-and-stroke-styles:transformations-2">current transformation matrix</a> when rendering.</p>
-
-  <p>Gradients must be painted only where the relevant stroking or filling effects requires that
-  they be drawn.</p>
-
-  
-
-  <hr/>
-
-  <p>Patterns are represented by objects implementing the opaque <code id="fill-and-stroke-styles:canvaspattern-8"><a href="#canvaspattern">CanvasPattern</a></code>
-  interface.</p>
-
-  <dl class="domintro"><dt><var>pattern</var> = <var>context</var> . <code id="dom-context-2d-createpattern"><a href="#dom-context-2d-createpattern-2">createPattern</a></code>(<var>image</var>, <var>repetition</var>)</dt><dd>
-
-    <p>Returns a <code id="fill-and-stroke-styles:canvaspattern-9"><a href="#canvaspattern">CanvasPattern</a></code> object that uses the given image and repeats in the
-    direction(s) given by the <var>repetition</var> argument.</p>
-
-    <p>The allowed values for <var>repetition</var> are <code>repeat</code> (both
-    directions), <code>repeat-x</code> (horizontal only), <code>repeat-y</code>
-    (vertical only), and <code>no-repeat</code> (neither). If the <var>repetition</var> argument is empty, the value <code>repeat</code> is used.</p>
-
-    <p>If the image isn't yet fully decoded, then nothing is drawn. If the image is a canvas with no
-    data, throws an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="fill-and-stroke-styles:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-7"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p>
-
-   </dd><dt><var>pattern</var> . <code id="dom-canvaspattern-settransform"><a href="#dom-canvaspattern-settransform-2">setTransform</a></code>(<var>transform</var>)</dt><dd>
-
-    <p>Sets the transformation matrix that will be used when rendering the pattern during a fill or
-    stroke painting operation.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-context-2d-createpattern-2"><code>createPattern(<var>image</var>,
-  <var>repetition</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>Let <var>image</var> be the first argument and <var>repetition</var> be
-   the second argument.</p></li><li><p><a href="#check-the-usability-of-the-image-argument" id="fill-and-stroke-styles:check-the-usability-of-the-image-argument">Check the usability of the <var>image</var> argument</a>. If this
-   returns <i>aborted</i>, then an exception has been thrown and the method doesn't return anything;
-   abort these steps. If it returns <i>bad</i>, then return null and abort these steps. Otherwise it
-   returns <i>good</i>; continue with these steps.</p></li><li><p>If <var>repetition</var> is the empty string, then set it to &quot;<code>repeat</code>&quot;.</p>
-
-   </li><li><p>If <var>repetition</var> is not a <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#case-sensitive" id="fill-and-stroke-styles:case-sensitive">case-sensitive</a> match for one of
-   &quot;<code>repeat</code>&quot;, &quot;<code>repeat-x</code>&quot;, &quot;<code>repeat-y</code>&quot;, or &quot;<code>no-repeat</code>&quot;, then throw a
-   <a data-x-internal="syntaxerror" href="https://heycam.github.io/webidl/#syntaxerror" id="fill-and-stroke-styles:syntaxerror-3">&quot;<code>SyntaxError</code>&quot;</a> <code id="fill-and-stroke-styles:domexception-8"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p></li><li><p>Create a new <code id="fill-and-stroke-styles:canvaspattern-10"><a href="#canvaspattern">CanvasPattern</a></code> object with the image <var>image</var>
-   and the repetition behavior given by <var>repetition</var>.</p></li><li><p>If <a href="#the-image-argument-is-not-origin-clean" id="fill-and-stroke-styles:the-image-argument-is-not-origin-clean">the <var>image argument</var> is not origin-clean</a>, then mark the
-   <code id="fill-and-stroke-styles:canvaspattern-11"><a href="#canvaspattern">CanvasPattern</a></code> object as <dfn id="concept-canvas-pattern-not-origin-clean">not
-   origin-clean</dfn>.</p></li><li><p>Return the <code id="fill-and-stroke-styles:canvaspattern-12"><a href="#canvaspattern">CanvasPattern</a></code> object.</p></li></ol>
-
-  <p>Modifying the <var>image</var> used when creating a <code id="fill-and-stroke-styles:canvaspattern-13"><a href="#canvaspattern">CanvasPattern</a></code> object
-  after calling the <code id="fill-and-stroke-styles:dom-context-2d-createpattern-2"><a href="#dom-context-2d-createpattern-2">createPattern()</a></code> method must
-  not affect the pattern(s) rendered by the <code id="fill-and-stroke-styles:canvaspattern-14"><a href="#canvaspattern">CanvasPattern</a></code> object.</p>
-
-  <p>Patterns have a transformation matrix, which controls how the pattern is used when it is
-  painted. Initially, a pattern's transformation matrix must be the identity transform.</p>
-
-  <p>The <dfn id="dom-canvaspattern-settransform-2"><code>setTransform(<var>transform</var>)</code></dfn> method,
-  when invoked, must reset the pattern's transformation matrix to the value represented by the
-  result of <a data-x-internal="create-a-dommatrix-from-a-dictionary" href="https://drafts.fxtf.org/geometry/#create-a-dommatrix-from-the-dictionary" id="fill-and-stroke-styles:create-a-dommatrix-from-a-dictionary">creating a <code>DOMMatrix</code>
-  from a dictionary</a> <var>transform</var>, with <var>ignore3D</var> set to true.</p>
-
-  <p>When a pattern is to be rendered within an area, the user agent must run the following steps to
-  determine what is rendered:</p>
-
-  <ol><li><p>Create an infinite transparent black bitmap.</p></li><li>
-
-    <p>Place a copy of the image on the bitmap, anchored such that its top left corner is at the
-    origin of the coordinate space, with one coordinate space unit per <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="fill-and-stroke-styles:'px'">CSS
-    pixel</a> of the image, then place repeated copies of this image horizontally to the left and
-    right, if the repetition behavior is &quot;<code>repeat-x</code>&quot;, or vertically up and
-    down, if the repetition behavior is &quot;<code>repeat-y</code>&quot;, or in all four
-    directions all over the bitmap, if the repetition behavior is &quot;<code>repeat</code>&quot;.</p>
-
-    <p>If the original image data is a bitmap image, then the value painted at a point in the area
-    of the repetitions is computed by filtering the original image data. When scaling up, if the
-    <code id="fill-and-stroke-styles:dom-context-2d-imagesmoothingenabled-2"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code> attribute is
-    set to false, then the image must be rendered using nearest-neighbor interpolation. Otherwise,
-    the user agent may use any filtering algorithm (for example bilinear interpolation or
-    nearest-neighbor). User agents which support multiple filtering algorithms may use the value of
-    the <code id="fill-and-stroke-styles:dom-context-2d-imagesmoothingquality-2"><a href="#dom-context-2d-imagesmoothingquality-2">imageSmoothingQuality</a></code> attribute
-    to guide the choice of filtering algorithm. When such a filtering algorithm requires a pixel
-    value from outside the original image data, it must instead use the value from wrapping the
-    pixel's coordinates to the original image's dimensions. (That is, the filter uses 'repeat'
-    behavior, regardless of the value of the pattern's repetition behavior.)</p> 
-
-   </li><li><p>Transform the resulting bitmap according to the pattern's transformation matrix.</p></li><li><p>Transform the resulting bitmap again, this time according to the <a href="#transformations" id="fill-and-stroke-styles:transformations-3">current transformation matrix</a>.</p></li><li><p>Replace any part of the image outside the area in which the pattern is to be rendered with
-   transparent black.</p></li><li><p>The resulting bitmap is what is to be rendered, with the same origin and same
-   scale.</p></li></ol>
-
-  <hr/>
-
-  <p>If a radial gradient or repeated pattern is used when the transformation matrix is singular,
-  then the resulting style must be transparent black (otherwise the gradient or pattern would be
-  collapsed to a point or line, leaving the other pixels undefined). Linear gradients and solid
-  colors always define all points even with singular transformation matrices.</p>
-
-  
-
-
-
-
-  <h6 id="drawing-rectangles-to-the-bitmap"><span class="secno">4.12.5.1.10</span> Drawing rectangles to the bitmap<a class="self-link" href="#drawing-rectangles-to-the-bitmap"/></h6>
-
-  <p>Objects that implement the <code id="drawing-rectangles-to-the-bitmap:canvasrect"><a href="#canvasrect">CanvasRect</a></code> interface provide the following methods for
-  immediately drawing rectangles to the bitmap. The methods each take four arguments; the first two
-  give the <var>x</var> and <var>y</var> coordinates of the top left of the rectangle, and the
-  second two give the width <var>w</var> and height <var>h</var> of the rectangle, respectively.</p>
-
-  
-
-  <p>The <a href="#transformations" id="drawing-rectangles-to-the-bitmap:transformations">current transformation matrix</a> must be
-  applied to the following four coordinates, which form the path that must then be closed to get the
-  specified rectangle: <span>(<var>x</var>, <var>y</var>)</span>, <span>(<var>x</var>+<var>w</var>, <var>y</var>)</span>, <span>(<var>x</var>+<var>w</var>, <var>y</var>+<var>h</var>)</span>, <span>(<var>x</var>, <var>y</var>+<var>h</var>)</span>.</p>
-
-  <p>Shapes are painted without affecting the <a href="#current-default-path" id="drawing-rectangles-to-the-bitmap:current-default-path">current default path</a>, and are subject to
-  the <a href="#clipping-region" id="drawing-rectangles-to-the-bitmap:clipping-region">clipping region</a>, and, with the exception of <code id="drawing-rectangles-to-the-bitmap:dom-context-2d-clearrect-2"><a href="#dom-context-2d-clearrect-2">clearRect()</a></code>, also <a href="#shadows" id="drawing-rectangles-to-the-bitmap:shadows">shadow
-  effects</a>, <a href="#dom-context-2d-globalalpha-2" id="drawing-rectangles-to-the-bitmap:dom-context-2d-globalalpha-2">global alpha</a>, and <a href="#dom-context-2d-globalcompositeoperation-2" id="drawing-rectangles-to-the-bitmap:dom-context-2d-globalcompositeoperation-2">global composition operators</a>.</p>
-
-  
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-clearrect"><a href="#dom-context-2d-clearrect-2">clearRect</a></code>(<var>x</var>, <var>y</var>, <var>w</var>, <var>h</var>)</dt><dd>
-
-    <p>Clears all pixels on the bitmap in the given rectangle to transparent black.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-fillrect"><a href="#dom-context-2d-fillrect-2">fillRect</a></code>(<var>x</var>, <var>y</var>, <var>w</var>, <var>h</var>)</dt><dd>
-
-    <p>Paints the given rectangle onto the bitmap, using the current fill style.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-strokerect"><a href="#dom-context-2d-strokerect-2">strokeRect</a></code>(<var>x</var>, <var>y</var>, <var>w</var>, <var>h</var>)</dt><dd>
-
-    <p>Paints the box that outlines the given rectangle onto the bitmap, using the current stroke
-    style.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-context-2d-clearrect-2"><code>clearRect(<var>x</var>, <var>y</var>,
-  <var>w</var>, <var>h</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Let <var>pixels</var> be the set of pixels in the specified rectangle that also
-   intersect the current <a href="#clipping-region" id="drawing-rectangles-to-the-bitmap:clipping-region-2">clipping region</a>.</p></li><li><p>Clear the pixels in <var>pixels</var> to a fully transparent black, erasing any
-   previous image.</p></li></ol>
-
-  <p class="note">If either height or width are zero, this method has no effect, since the set of
-  pixels would be empty.</p>
-
-  <p>The <dfn id="dom-context-2d-fillrect-2"><code>fillRect(<var>x</var>, <var>y</var>,
-  <var>w</var>, <var>h</var>)</code></dfn> method, when invoked, must must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>If either <var>w</var> or <var>h</var> are zero, then abort these steps.</p></li><li><p>Paint the specified rectangular area using the <code id="drawing-rectangles-to-the-bitmap:dom-context-2d-fillstyle-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code>.</p>
-  </li></ol>
-
-  <p>The <dfn id="dom-context-2d-strokerect-2"><code>strokeRect(<var>x</var>, <var>y</var>,
-  <var>w</var>, <var>h</var>)</code></dfn> method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Take the result of <a href="#trace-a-path" id="drawing-rectangles-to-the-bitmap:trace-a-path">tracing the path</a> described below,
-   using the <code id="drawing-rectangles-to-the-bitmap:canvaspathdrawingstyles"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface's line styles, and fill it with the
-   <code id="drawing-rectangles-to-the-bitmap:dom-context-2d-strokestyle-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code>.</p></li></ol>
-
-  <p>If both <var>w</var> and <var>h</var> are zero, the path has a single subpath
-  with just one point (<var>x</var>, <var>y</var>), and no lines, and this method
-  thus has no effect (the <a href="#trace-a-path" id="drawing-rectangles-to-the-bitmap:trace-a-path-2">trace a path</a> algorithm returns an empty path in that
-  case).</p>
-
-  <p>If just one of either <var>w</var> or <var>h</var> is zero, then the path has
-  a single subpath consisting of two points, with coordinates (<var>x</var>, <var>y</var>) and (<var>x</var>+<var>w</var>, <var>y</var>+<var>h</var>), in that order, connected by a single straight line.</p>
-
-  <p>Otherwise, the path has a single subpath consisting of four points, with coordinates (<span><var>x</var></span>, <var>y</var>), (<span><var>x</var>+<var>w</var></span>, <var>y</var>), (<var>x</var>+<var>w</var>,
-  <var>y</var>+<var>h</var>), and (<var>x</var>, <var>y</var>+<var>h</var>),
-  connected to each other in that order by straight lines.</p>
-
-  
-
-
-
-  <h6 id="drawing-text-to-the-bitmap"><span class="secno">4.12.5.1.11</span> Drawing text to the bitmap<a class="self-link" href="#drawing-text-to-the-bitmap"/></h6><div class="status"><input onclick="toggleStatus(this)" type="button" value="â‹°"/><p class="support"><strong>Support:</strong> canvas-text<span class="and_chr yes"><span>Chrome for Android</span> <span>59+</span></span><span class="chrome yes"><span>Chrome</span> <span>4+</span></span><span class="and_uc yes"><span>UC Browser for Android</span> <span>11.4+</span></span><span class="ios_saf yes"><span>iOS Safari</span> <span>3.2+</span></span><span class="firefox yes"><span>Firefox</span> <span>3.5+</span></span><span class="ie yes"><span>IE</span> <span>9+</span></span><span class="samsung yes"><span>Samsung Internet</span> <span>4+</span></span><span class="op_mini no"><span>Opera Mini</span> <span>None</span></span><span class="safari yes"><span>Safari</span> <span>4+</span></span><span class="android yes"><span>Android Browser</span> <span>2.1+</span></span><span class="opera yes"><span>Opera</span> <span>10.5+</span></span><span class="edge yes"><span>Edge</span> <span>12+</span></span></p><p class="caniuse">Source: <a href="https://caniuse.com/#feat=canvas-text">caniuse.com</a></p></div>
-
-  <dl class="domintro" id="text-0"><dt><var>context</var> . <code id="dom-context-2d-filltext"><a href="#dom-context-2d-filltext-2">fillText</a></code>(<var>text</var>, <var>x</var>, <var>y</var> [, <var>maxWidth</var> ] )</dt><dt><var>context</var> . <code id="dom-context-2d-stroketext"><a href="#dom-context-2d-stroketext-2">strokeText</a></code>(<var>text</var>, <var>x</var>, <var>y</var> [, <var>maxWidth</var> ] )</dt><dd>
-
-    <p>Fills or strokes (respectively) the given text at the given position. If a maximum width is
-    provided, the text will be scaled to fit that width if necessary.</p>
-
-   </dd><dt><var>metrics</var> = <var>context</var> . <code id="dom-context-2d-measuretext"><a href="#dom-context-2d-measuretext-2">measureText</a></code>(<var>text</var>)</dt><dd>
-
-    <p>Returns a <code id="drawing-text-to-the-bitmap:textmetrics"><a href="#textmetrics">TextMetrics</a></code> object with the metrics of the given text in the current
-    font.</p>
-
-   </dd><dt><var>metrics</var> . <code id="dom-textmetrics-width"><a href="#dom-textmetrics-width-2">width</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-actualboundingboxleft"><a href="#dom-textmetrics-actualboundingboxleft-2">actualBoundingBoxLeft</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-actualboundingboxright"><a href="#dom-textmetrics-actualboundingboxright-2">actualBoundingBoxRight</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-fontboundingboxascent"><a href="#dom-textmetrics-fontboundingboxascent-2">fontBoundingBoxAscent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-fontboundingboxdescent"><a href="#dom-textmetrics-fontboundingboxdescent-2">fontBoundingBoxDescent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-actualboundingboxascent"><a href="#dom-textmetrics-actualboundingboxascent-2">actualBoundingBoxAscent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-actualboundingboxdescent"><a href="#dom-textmetrics-actualboundingboxdescent-2">actualBoundingBoxDescent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-emheightascent"><a href="#dom-textmetrics-emheightascent-2">emHeightAscent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-emheightdescent"><a href="#dom-textmetrics-emheightdescent-2">emHeightDescent</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-hangingbaseline"><a href="#dom-textmetrics-hangingbaseline-2">hangingBaseline</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-alphabeticbaseline"><a href="#dom-textmetrics-alphabeticbaseline-2">alphabeticBaseline</a></code></dt><dt><var>metrics</var> . <code id="dom-textmetrics-ideographicbaseline"><a href="#dom-textmetrics-ideographicbaseline-2">ideographicBaseline</a></code></dt><dd>
-
-    <p>Returns the measurement described below.</p>
-
-   </dd></dl>
-
-  
-
-  <p>Objects that implement the <code id="drawing-text-to-the-bitmap:canvastext"><a href="#canvastext">CanvasText</a></code> interface provide the following methods for
-  rendering text.</p>
-
-  <p>The <dfn id="dom-context-2d-filltext-2"><code>fillText()</code></dfn> and <dfn id="dom-context-2d-stroketext-2"><code>strokeText()</code></dfn> methods take three or four arguments,
-  <var>text</var>, <var>x</var>, <var>y</var>, and optionally <var>maxWidth</var>, and render the
-  given <var>text</var> at the given (<var>x</var>, <var>y</var>) coordinates ensuring that the text
-  isn't wider than <var>maxWidth</var> if specified, using the current <code id="drawing-text-to-the-bitmap:dom-context-2d-font-2"><a href="#dom-context-2d-font-2">font</a></code>, <code id="drawing-text-to-the-bitmap:dom-context-2d-textalign-2"><a href="#dom-context-2d-textalign-2">textAlign</a></code>, and <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> values. Specifically, when the methods
-  are invoked, the user agent must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p>Run the <a href="#text-preparation-algorithm" id="drawing-text-to-the-bitmap:text-preparation-algorithm">text preparation algorithm</a>, passing it <var>text</var>, the object
-   implementing the <code id="drawing-text-to-the-bitmap:canvastext-2"><a href="#canvastext">CanvasText</a></code> interface, and, if the <var>maxWidth</var> argument was
-   provided, that argument. Let <var>glyphs</var> be the result.</p>
-
-   </li><li><p>Move all the shapes in <var>glyphs</var> to the right by <var>x</var>
-   <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'">CSS pixels</a> and down by <var>y</var> <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-2">CSS
-   pixels</a>.</p></li><li>
-
-    <p>Paint the shapes given in <var>glyphs</var>, as transformed by the <a href="#transformations" id="drawing-text-to-the-bitmap:transformations">current transformation matrix</a>, with each <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-3">CSS pixel</a> in the coordinate space of <var>glyphs</var> mapped to one
-    coordinate space unit.</p>
-
-    <p>For <code id="drawing-text-to-the-bitmap:dom-context-2d-filltext-2"><a href="#dom-context-2d-filltext-2">fillText()</a></code>, <code id="drawing-text-to-the-bitmap:dom-context-2d-fillstyle-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code> must be applied to the shapes and <code id="drawing-text-to-the-bitmap:dom-context-2d-strokestyle-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code> must be ignored. For <code id="drawing-text-to-the-bitmap:dom-context-2d-stroketext-2"><a href="#dom-context-2d-stroketext-2">strokeText()</a></code>, the reverse holds: <code id="drawing-text-to-the-bitmap:dom-context-2d-strokestyle-2-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code> must be applied to the result of <a href="#trace-a-path" id="drawing-text-to-the-bitmap:trace-a-path">tracing</a> the shapes using the object implementing the
-    <code id="drawing-text-to-the-bitmap:canvastext-3"><a href="#canvastext">CanvasText</a></code> interface for the line styles, and <code id="drawing-text-to-the-bitmap:dom-context-2d-fillstyle-2-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code> must be ignored.</p>
-
-    <p>These shapes are painted without affecting the current path, and are subject to <a href="#shadows" id="drawing-text-to-the-bitmap:shadows">shadow effects</a>, <a href="#dom-context-2d-globalalpha-2" id="drawing-text-to-the-bitmap:dom-context-2d-globalalpha-2">global
-    alpha</a>, the <a href="#clipping-region" id="drawing-text-to-the-bitmap:clipping-region">clipping region</a>, and <a href="#dom-context-2d-globalcompositeoperation-2" id="drawing-text-to-the-bitmap:dom-context-2d-globalcompositeoperation-2">global composition operators</a>.</p>
-
-   </li></ol>
-
-
-
-  <p>The <dfn id="dom-context-2d-measuretext-2"><code>measureText()</code></dfn> method takes one
-  argument, <var>text</var>. When the method is invoked, the user agent must run the
-  <a href="#text-preparation-algorithm" id="drawing-text-to-the-bitmap:text-preparation-algorithm-2">text preparation algorithm</a>, passing it <var>text</var> and the object implementing
-  the <code id="drawing-text-to-the-bitmap:canvastext-4"><a href="#canvastext">CanvasText</a></code> interface, and then using the returned <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="drawing-text-to-the-bitmap:inline-box">inline box</a> must
-  create a new <code id="drawing-text-to-the-bitmap:textmetrics-2"><a href="#textmetrics">TextMetrics</a></code> object with its attributes set as described in the following
-  list.
-
-  If doing these measurements requires using a font that has an <a href="https://html.spec.whatwg.org/multipage/origin.html#concept-origin" id="drawing-text-to-the-bitmap:concept-origin">origin</a> that is not the
-  <a href="https://html.spec.whatwg.org/multipage/origin.html#same-origin" id="drawing-text-to-the-bitmap:same-origin">same</a> as that of the <code id="drawing-text-to-the-bitmap:document"><a href="https://html.spec.whatwg.org/multipage/dom.html#document">Document</a></code> object that owns the
-  <code id="drawing-text-to-the-bitmap:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element (even if &quot;using a font&quot; means just checking if that font has a
-  particular glyph in it before falling back to another font), then the method, when invoked, must
-  throw a <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="drawing-text-to-the-bitmap:securityerror">&quot;<code>SecurityError</code>&quot;</a> <code id="drawing-text-to-the-bitmap:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-  Otherwise, it must return the new <code id="drawing-text-to-the-bitmap:textmetrics-3"><a href="#textmetrics">TextMetrics</a></code> object.
-  <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSS">[CSS]</a>
-  <a class="fingerprint" href="https://html.spec.whatwg.org/multipage/introduction.html#fingerprinting-vector" id="drawing-text-to-the-bitmap:fingerprinting-vector" title="There is a potential fingerprinting vector here."><img alt="(This is a fingerprinting vector.)" height="64" src="https://html.spec.whatwg.org/images/fingerprint.png" width="46"/></a>
-  </p>
-
-  
-
-  <dl><dt><dfn id="dom-textmetrics-width-2"><code>width</code></dfn> attribute</dt><dd><p>The width of that <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="drawing-text-to-the-bitmap:inline-box-2">inline box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-4">CSS pixels</a>. (The
-   text's advance width.)</p></dd><dt><dfn id="dom-textmetrics-actualboundingboxleft-2"><code>actualBoundingBoxLeft</code></dfn> attribute</dt><dd>
-
-    <p>The distance parallel to the baseline from the alignment point given by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textalign-2-2"><a href="#dom-context-2d-textalign-2">textAlign</a></code> attribute to the left side of the bounding
-    rectangle of the given text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-5">CSS pixels</a>; positive numbers
-    indicating a distance going left from the given alignment point.
-
-    </p><p class="note">The sum of this value and the next (<code id="drawing-text-to-the-bitmap:dom-textmetrics-actualboundingboxright-2"><a href="#dom-textmetrics-actualboundingboxright-2">actualBoundingBoxRight</a></code>) can be wider than
-    the width of the <a data-x-internal="inline-box" href="https://drafts.csswg.org/css2/visuren.html#inline-box" id="drawing-text-to-the-bitmap:inline-box-3">inline box</a> (<code id="drawing-text-to-the-bitmap:dom-textmetrics-width-2"><a href="#dom-textmetrics-width-2">width</a></code>), in
-    particular with slanted fonts where characters overhang their advance width.</p>
-
-   </dd><dt><dfn id="dom-textmetrics-actualboundingboxright-2"><code>actualBoundingBoxRight</code></dfn> attribute</dt><dd>
-
-    <p>The distance parallel to the baseline from the alignment point given by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textalign-2-3"><a href="#dom-context-2d-textalign-2">textAlign</a></code> attribute to the right side of the bounding
-    rectangle of the given text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-6">CSS pixels</a>; positive numbers
-    indicating a distance going right from the given alignment point.</p>
-
-   </dd><dt><dfn id="dom-textmetrics-fontboundingboxascent-2"><code>fontBoundingBoxAscent</code></dfn> attribute</dt><dd>
-
-    <p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-2"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the top of the highest
-    bounding rectangle of all the fonts used to render the text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-7">CSS
-    pixels</a>; positive numbers indicating a distance going up from the given baseline.</p>
-
-    <p class="note">This value and the next are useful when rendering a background that have to have
-    a consistent height even if the exact text being rendered changes. The <code id="drawing-text-to-the-bitmap:dom-textmetrics-actualboundingboxascent-2"><a href="#dom-textmetrics-actualboundingboxascent-2">actualBoundingBoxAscent</a></code> attribute (and
-    its corresponding attribute for the descent) are useful when drawing a bounding box around
-    specific text.</p>
-
-   </dd><dt><dfn id="dom-textmetrics-fontboundingboxdescent-2"><code>fontBoundingBoxDescent</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-3"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the bottom of the lowest
-   bounding rectangle of all the fonts used to render the text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-8">CSS
-   pixels</a>; positive numbers indicating a distance going down from the given
-   baseline.</p></dd><dt><dfn id="dom-textmetrics-actualboundingboxascent-2"><code>actualBoundingBoxAscent</code></dfn> attribute</dt><dd>
-
-    <p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-4"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the top of the bounding
-    rectangle of the given text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-9">CSS pixels</a>; positive numbers
-    indicating a distance going up from the given baseline.
-
-    </p><p class="note">This number can vary greatly based on the input text, even if the first font
-    specified covers all the characters in the input. For example, the <code id="drawing-text-to-the-bitmap:dom-textmetrics-actualboundingboxascent-2-2"><a href="#dom-textmetrics-actualboundingboxascent-2">actualBoundingBoxAscent</a></code> of a lowercase
-    &quot;o&quot; from an alphabetic baseline would be less than that of an uppercase &quot;F&quot;. The value can
-    easily be negative; for example, the distance from the top of the em box (<code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-5"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> value &quot;<code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-top"><a href="#dom-context-2d-textbaseline-top">top</a></code>&quot;) to the top of the bounding rectangle when
-    the given text is just a single comma &quot;<code>,</code>&quot; would likely (unless the font is
-    quite unusual) be negative.</p>
-
-   </dd><dt><dfn id="dom-textmetrics-actualboundingboxdescent-2"><code>actualBoundingBoxDescent</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-6"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the bottom of the bounding
-   rectangle of the given text, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-10">CSS pixels</a>; positive numbers
-   indicating a distance going down from the given baseline.</p></dd><dt><dfn id="dom-textmetrics-emheightascent-2"><code>emHeightAscent</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-7"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the highest top of the em
-   squares in the <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="drawing-text-to-the-bitmap:line-box">line box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-11">CSS pixels</a>; positive numbers
-   indicating that the given baseline is below the top of that em square (so this value will usually
-   be positive). Zero if the given baseline is the top of that em square; half the font size if the
-   given baseline is the middle of that em square.</p></dd><dt><dfn id="dom-textmetrics-emheightdescent-2"><code>emHeightDescent</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-8"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the lowest bottom of the em
-   squares in the <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="drawing-text-to-the-bitmap:line-box-2">line box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-12">CSS pixels</a>; positive numbers
-   indicating that the given baseline is below the bottom of that em square (so this value will
-   usually be negative). (Zero if the given baseline is the bottom of that em square.)</p></dd><dt><dfn id="dom-textmetrics-hangingbaseline-2"><code>hangingBaseline</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-9"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the hanging baseline of the
-   <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="drawing-text-to-the-bitmap:line-box-3">line box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-13">CSS pixels</a>; positive numbers indicating that
-   the given baseline is below the hanging baseline. (Zero if the given baseline is the hanging
-   baseline.)</p></dd><dt><dfn id="dom-textmetrics-alphabeticbaseline-2"><code>alphabeticBaseline</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-10"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the alphabetic baseline of
-   the <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="drawing-text-to-the-bitmap:line-box-4">line box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-14">CSS pixels</a>; positive numbers indicating
-   that the given baseline is below the alphabetic baseline. (Zero if the given baseline is the
-   alphabetic baseline.)</p></dd><dt><dfn id="dom-textmetrics-ideographicbaseline-2"><code>ideographicBaseline</code></dfn> attribute</dt><dd><p>The distance from the horizontal line indicated by the <code id="drawing-text-to-the-bitmap:dom-context-2d-textbaseline-2-11"><a href="#dom-context-2d-textbaseline-2">textBaseline</a></code> attribute to the ideographic baseline of
-   the <a data-x-internal="line-box" href="https://drafts.csswg.org/css2/visuren.html#line-box" id="drawing-text-to-the-bitmap:line-box-5">line box</a>, in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-text-to-the-bitmap:'px'-15">CSS pixels</a>; positive numbers indicating
-   that the given baseline is below the ideographic baseline. (Zero if the given baseline is the
-   ideographic baseline.)</p></dd></dl>
-
-  <p class="note">Glyphs rendered using <code id="drawing-text-to-the-bitmap:dom-context-2d-filltext-2-2"><a href="#dom-context-2d-filltext-2">fillText()</a></code> and
-  <code id="drawing-text-to-the-bitmap:dom-context-2d-stroketext-2-2"><a href="#dom-context-2d-stroketext-2">strokeText()</a></code> can spill out of the box given by the
-  font size (the em square size) and the width returned by <code id="drawing-text-to-the-bitmap:dom-context-2d-measuretext-2"><a href="#dom-context-2d-measuretext-2">measureText()</a></code> (the text width). Authors are encouraged
-  to use the bounding box values described above if this is an issue.</p>
-
-  <p class="note">A future version of the 2D context API might provide a way to render fragments of
-  documents, rendered using CSS, straight to the canvas. This would be provided in preference to a
-  dedicated way of doing multiline layout.</p>
-
-
-
-  <h6 id="drawing-paths-to-the-canvas"><span class="secno">4.12.5.1.12</span> Drawing paths to the canvas<a class="self-link" href="#drawing-paths-to-the-canvas"/></h6>
-
-  <p>Objects that implement the <code id="drawing-paths-to-the-canvas:canvasdrawpath"><a href="#canvasdrawpath">CanvasDrawPath</a></code> interface have a <dfn id="current-default-path">current default
-  path</dfn>. There is only one <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path">current default path</a>, it is not part of the
-  <a href="#drawing-state" id="drawing-paths-to-the-canvas:drawing-state">drawing state</a>. The <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-2">current default path</a> is a <a href="#concept-path" id="drawing-paths-to-the-canvas:concept-path">path</a>, as described above.</p>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-beginpath"><a href="#dom-context-2d-beginpath-2">beginPath</a></code>()</dt><dd>
-
-    <p>Resets the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-3">current default path</a>.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-fill"><a href="#dom-context-2d-fill-2">fill</a></code>( [ <var>fillRule</var> ] )</dt><dt><var>context</var> . <code id="drawing-paths-to-the-canvas:dom-context-2d-fill-2"><a href="#dom-context-2d-fill-2">fill</a></code>(<var>path</var> [, <var>fillRule</var> ] )</dt><dd>
-
-    <p>Fills the subpaths of the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-4">current default path</a> or the given path with the
-    current fill style, obeying the given fill rule.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-stroke"><a href="#dom-context-2d-stroke-2">stroke</a></code>()</dt><dt><var>context</var> . <code id="drawing-paths-to-the-canvas:dom-context-2d-stroke-2"><a href="#dom-context-2d-stroke-2">stroke</a></code>(<var>path</var>)</dt><dd>
-
-    <p>Strokes the subpaths of the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-5">current default path</a> or the given path with the
-    current stroke style.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-clip"><a href="#dom-context-2d-clip-2">clip</a></code>( [ <var>fillRule</var> ] )</dt><dt><var>context</var> . <code id="drawing-paths-to-the-canvas:dom-context-2d-clip-2"><a href="#dom-context-2d-clip-2">clip</a></code>(<var>path</var> [, <var>fillRule</var> ] )</dt><dd>
-
-    <p>Further constrains the clipping region to the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-6">current default path</a> or the given
-    path, using the given fill rule to determine what points are in the path.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-resetclip"><a href="#dom-context-2d-resetclip-2">resetClip</a></code>()</dt><dd>
-
-    <p>Unconstrains the clipping region.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-ispointinpath"><a href="#dom-context-2d-ispointinpath-2">isPointInPath</a></code>(<var>x</var>, <var>y</var> [, <var>fillRule</var> ] )</dt><dt><var>context</var> . <code id="drawing-paths-to-the-canvas:dom-context-2d-ispointinpath-2"><a href="#dom-context-2d-ispointinpath-2">isPointInPath</a></code>(<var>path</var>, <var>x</var>, <var>y</var> [, <var>fillRule</var> ] )</dt><dd>
-
-    <p>Returns true if the given point is in the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-7">current default path</a> or the given
-    path, using the given fill rule to determine what points are in the path.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-ispointinstroke"><a href="#dom-context-2d-ispointinstroke-2">isPointInStroke</a></code>(<var>x</var>, <var>y</var>)</dt><dt><var>context</var> . <code id="drawing-paths-to-the-canvas:dom-context-2d-ispointinstroke-2"><a href="#dom-context-2d-ispointinstroke-2">isPointInStroke</a></code>(<var>path</var>, <var>x</var>, <var>y</var>)</dt><dd>
-
-    <p>Returns true if the given point would be in the region covered by the stroke of the
-    <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-8">current default path</a> or the given path, given the current stroke style.</p>
-
-   </dd></dl><div class="status"><input onclick="toggleStatus(this)" type="button" value="â‹°"/><p class="bugs"><strong>Spec bugs:</strong> <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=28217" title="&lt;canvas&gt;: not clear if two polygon paths with a common edge should have no line visible">28217</a></p></div>
-
-  
-
-  <p>The <dfn id="dom-context-2d-beginpath-2"><code>beginPath()</code></dfn> method, when invoked,
-  must empty the list of subpaths in the context's <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-9">current default path</a> so that the it
-  once again has zero subpaths.</p>
-
-  <p>Where the following method definitions use the term <i>intended path</i>, it means the
-  <code id="drawing-paths-to-the-canvas:path2d"><a href="#path2d">Path2D</a></code> argument, if one was provided, or the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-10">current default path</a>
-  otherwise.</p>
-
-  <p>When the intended path is a <code id="drawing-paths-to-the-canvas:path2d-2"><a href="#path2d">Path2D</a></code> object, the coordinates and lines of its
-  subpaths must be transformed according to the <a href="#transformations" id="drawing-paths-to-the-canvas:transformations">
-  current transformation matrix</a> on the object implementing the
-  <code id="drawing-paths-to-the-canvas:canvastransform"><a href="#canvastransform">CanvasTransform</a></code> interface when used by these methods (without affecting the
-  <code id="drawing-paths-to-the-canvas:path2d-3"><a href="#path2d">Path2D</a></code> object itself). When the intended path is the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-11">current default
-  path</a>, it is not affected by the transform. (This is because transformations already affect
-  the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-12">current default path</a> when it is constructed, so applying it when it is painted as
-  well would result in a double transformation.)</p>
-
-  <p>The <dfn id="dom-context-2d-fill-2"><code>fill()</code></dfn> method, when invoked, must fill
-  all the subpaths of the intended path, using <code id="drawing-paths-to-the-canvas:dom-context-2d-fillstyle-2"><a href="#dom-context-2d-fillstyle-2">fillStyle</a></code>, and using the <a href="#fill-rule" id="drawing-paths-to-the-canvas:fill-rule">fill rule</a> indicated
-  by the <var>fillRule</var> argument. Open subpaths must be implicitly closed when being filled
-  (without affecting the actual subpaths).</p>
-
-  <p>The <dfn id="dom-context-2d-stroke-2"><code>stroke()</code></dfn> method, when invoked, must
-  <a href="#trace-a-path" id="drawing-paths-to-the-canvas:trace-a-path">trace</a> the intended path, using this
-  <code id="drawing-paths-to-the-canvas:canvaspathdrawingstyles"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> object for the line styles, and then fill the resulting path
-  using the <code id="drawing-paths-to-the-canvas:dom-context-2d-strokestyle-2"><a href="#dom-context-2d-strokestyle-2">strokeStyle</a></code> attribute, using the <a href="#dom-context-2d-fillrule-nonzero" id="drawing-paths-to-the-canvas:dom-context-2d-fillrule-nonzero">non-zero winding rule</a>.</p>
-
-  <p class="note">As a result of how the algorithm to <a href="#trace-a-path" id="drawing-paths-to-the-canvas:trace-a-path-2">trace a path</a> is defined,
-  overlapping parts of the paths in one stroke operation are treated as if their union was what was
-  painted.</p>
-
-  <p class="note">The stroke <em>style</em> is affected by the transformation during painting, even
-  if the intended path is the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-13">current default path</a>.</p>
-
-  <p>Paths, when filled or stroked, must be painted without affecting the <a href="#current-default-path" id="drawing-paths-to-the-canvas:current-default-path-14">current default
-  path</a> or any <code id="drawing-paths-to-the-canvas:path2d-4"><a href="#path2d">Path2D</a></code> objects, and must be subject to <a href="#shadows" id="drawing-paths-to-the-canvas:shadows">shadow effects</a>, <a href="#dom-context-2d-globalalpha-2" id="drawing-paths-to-the-canvas:dom-context-2d-globalalpha-2">global
-  alpha</a>, the <a href="#clipping-region" id="drawing-paths-to-the-canvas:clipping-region">clipping region</a>, and <a href="#dom-context-2d-globalcompositeoperation-2" id="drawing-paths-to-the-canvas:dom-context-2d-globalcompositeoperation-2">global composition operators</a>. (The effect
-  of transformations is described above and varies based on which path is being used.)</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-clip-2"><code>clip()</code></dfn> method, when invoked, must
-  create a new <dfn id="clipping-region">clipping region</dfn> by calculating the intersection of the current clipping
-  region and the area described by the intended path, using the <a href="#fill-rule" id="drawing-paths-to-the-canvas:fill-rule-2">fill rule</a> indicated by
-  the <var>fillRule</var> argument. Open subpaths must be implicitly closed when computing the
-  clipping region, without affecting the actual subpaths. The new clipping region replaces the
-  current clipping region.</p>
-
-  <p>When the context is initialized, the clipping region must be set to the largest infinite
-  surface (i.e. by default, no clipping occurs).</p>
-
-  
-
-  <p>The <dfn id="dom-context-2d-resetclip-2"><code>resetClip()</code></dfn> method, when invoked,
-  must create a new <a href="#clipping-region" id="drawing-paths-to-the-canvas:clipping-region-2">clipping region</a> that is the largest infinite surface. The new
-  clipping region replaces the current clipping region.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-ispointinpath-2"><code>isPointInPath()</code></dfn> method, when
-  invoked, must return true if the point given by the <var>x</var> and <var>y</var> coordinates
-  passed to the method, when treated as coordinates in the canvas coordinate space unaffected by the
-  current transformation, is inside the intended path as determined by the <a href="#fill-rule" id="drawing-paths-to-the-canvas:fill-rule-3">fill rule</a>
-  indicated by the <var>fillRule</var> argument; and must return false otherwise. Open subpaths must
-  be implicitly closed when computing the area inside the path, without affecting the actual
-  subpaths. Points on the path itself must be considered to be inside the path. If either of the
-  arguments are infinite or NaN, then the method must return false.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-ispointinstroke-2"><code>isPointInStroke()</code></dfn> method,
-  when invoked, must return true if the point given by the <var>x</var> and <var>y</var> coordinates
-  passed to the method, when treated as coordinates in the canvas coordinate space unaffected by the
-  current transformation, is inside the path that results from <a href="#trace-a-path" id="drawing-paths-to-the-canvas:trace-a-path-3">tracing</a> the intended path, using the <a href="#dom-context-2d-fillrule-nonzero" id="drawing-paths-to-the-canvas:dom-context-2d-fillrule-nonzero-2">non-zero winding rule</a>, and using the
-  <code id="drawing-paths-to-the-canvas:canvaspathdrawingstyles-2"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code> interface for the line styles; and must return false
-  otherwise. Points on the resulting path must be considered to be inside the path. If either of the
-  arguments are infinite or NaN, then the method must return false.</p>
-
-  <hr/>
-
-  
-
-  <div class="example" id="drawCustomFocusRingExample">
-
-   <p>This <code id="drawing-paths-to-the-canvas:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element has a couple of checkboxes. The path-related commands are
-   highlighted:</p>
-
-   <pre>&lt;canvas height=400 width=750&gt;
- &lt;label&gt;&lt;input type=checkbox id=showA&gt; Show As&lt;/label&gt;
- &lt;label&gt;&lt;input type=checkbox id=showB&gt; Show Bs&lt;/label&gt;
- &lt;!-- ... --&gt;
-&lt;/canvas&gt;
-&lt;script&gt;
- function drawCheckbox(context, element, x, y, paint) {
-   context.save();
-   context.font = '10px sans-serif';
-   context.textAlign = 'left';
-   context.textBaseline = 'middle';
-   var metrics = context.measureText(element.labels[0].textContent);
-   if (paint) {
-<strong>     context.beginPath();
-     context.strokeStyle = 'black';
-     context.rect(x-5, y-5, 10, 10);
-     context.stroke();
-</strong>     if (element.checked) {
-<strong>       context.fillStyle = 'black';
-       context.fill();
-</strong>     }
-     context.fillText(element.labels[0].textContent, x+5, y);
-   }
-<strong>   context.beginPath();
-   context.rect(x-7, y-7, 12 + metrics.width+2, 14);
-</strong>
-   context.drawFocusIfNeeded(element);
-   context.restore();
- }
- function drawBase() { /* ... */ }
- function drawAs() { /* ... */ }
- function drawBs() { /* ... */ }
- function redraw() {
-   var canvas = document.getElementsByTagName('canvas')[0];
-   var context = canvas.getContext('2d');
-   context.clearRect(0, 0, canvas.width, canvas.height);
-   drawCheckbox(context, document.getElementById('showA'), 20, 40, true);
-   drawCheckbox(context, document.getElementById('showB'), 20, 60, true);
-   drawBase();
-   if (document.getElementById('showA').checked)
-     drawAs();
-   if (document.getElementById('showB').checked)
-     drawBs();
- }
- function processClick(event) {
-   var canvas = document.getElementsByTagName('canvas')[0];
-   var context = canvas.getContext('2d');
-   var x = event.clientX;
-   var y = event.clientY;
-   var node = event.target;
-   while (node) {
-     x -= node.offsetLeft - node.scrollLeft;
-     y -= node.offsetTop - node.scrollTop;
-     node = node.offsetParent;
-   }
-   drawCheckbox(context, document.getElementById('showA'), 20, 40, false);
-   if (<strong>context.isPointInPath(x, y)</strong>)
-     document.getElementById('showA').checked = !(document.getElementById('showA').checked);
-   drawCheckbox(context, document.getElementById('showB'), 20, 60, false);
-   if (<strong>context.isPointInPath(x, y)</strong>)
-     document.getElementById('showB').checked = !(document.getElementById('showB').checked);
-   redraw();
- }
- document.getElementsByTagName('canvas')[0].addEventListener('focus', redraw, true);
- document.getElementsByTagName('canvas')[0].addEventListener('blur', redraw, true);
- document.getElementsByTagName('canvas')[0].addEventListener('change', redraw, true);
- document.getElementsByTagName('canvas')[0].addEventListener('click', processClick, false);
- redraw();
-&lt;/script&gt;</pre>
-
-
-  </div>
-
-  <h6 id="drawing-focus-rings-and-scrolling-paths-into-view"><span class="secno">4.12.5.1.13</span> Drawing focus rings and scrolling paths into view<a class="self-link" href="#drawing-focus-rings-and-scrolling-paths-into-view"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-drawfocusifneeded"><a href="#dom-context-2d-drawfocusifneeded-2">drawFocusIfNeeded</a></code>(<var>element</var>)</dt><dt><var>context</var> . <code id="drawing-focus-rings-and-scrolling-paths-into-view:dom-context-2d-drawfocusifneeded-2"><a href="#dom-context-2d-drawfocusifneeded-2">drawFocusIfNeeded</a></code>(<var>path</var>, <var>element</var>)</dt><dd>
-
-    <p>If the given element is <a href="https://html.spec.whatwg.org/multipage/interaction.html#focused" id="drawing-focus-rings-and-scrolling-paths-into-view:focused">focused</a>, draws a focus ring around the <a href="#current-default-path" id="drawing-focus-rings-and-scrolling-paths-into-view:current-default-path">current
-    default path</a> or the given path, following the platform conventions for focus rings.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-scrollpathintoview"><a href="#dom-context-2d-scrollpathintoview-2">scrollPathIntoView</a></code>()</dt><dt><var>context</var> . <code id="drawing-focus-rings-and-scrolling-paths-into-view:dom-context-2d-scrollpathintoview-2"><a href="#dom-context-2d-scrollpathintoview-2">scrollPathIntoView</a></code>(<var>path</var>)</dt><dd>
-
-    <p>Scrolls the <a href="#current-default-path" id="drawing-focus-rings-and-scrolling-paths-into-view:current-default-path-2">current default path</a> or the given path into view. This is especially
-    useful on devices with small screens, where the whole canvas might not be visible at once.</p>
-
-   </dd></dl>
-
-  
-
-  Objects that implement the <code id="drawing-focus-rings-and-scrolling-paths-into-view:canvasuserinterface"><a href="#canvasuserinterface">CanvasUserInterface</a></code> interface provide the following
-  methods to control drawing focus rings and scrolling paths into view.
-
-  <hr/>
-
-  <p id="dom-context-2d-drawosfocusring">The <dfn id="dom-context-2d-drawfocusifneeded-2"><code>drawFocusIfNeeded(<var>element</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>If <var>element</var> is not <a href="https://html.spec.whatwg.org/multipage/interaction.html#focused" id="drawing-focus-rings-and-scrolling-paths-into-view:focused-2">focused</a> or is not a descendant of the element with
-   whose context the method is associated, then abort these steps.</p></li><li>
-
-    <p>Draw a focus ring of the appropriate style along the intended path, following platform
-    conventions.</p>
-
-    <p class="note">Some platforms only draw focus rings around elements that have been focused from
-    the keyboard, and not those focused from the mouse. Other platforms simply don't draw focus
-    rings around some elements at all unless relevant accessibility features are enabled. This API
-    is intended to follow these conventions. User agents that implement distinctions based on the
-    manner in which the element was focused are encouraged to classify focus driven by the <code id="drawing-focus-rings-and-scrolling-paths-into-view:dom-focus-2"><a href="https://html.spec.whatwg.org/multipage/interaction.html#dom-focus-2">focus()</a></code> method based on the kind of user interaction event from which
-    the call was triggered (if any).</p>
-
-    <p>The focus ring should not be subject to the <a href="#shadows" id="drawing-focus-rings-and-scrolling-paths-into-view:shadows">shadow effects</a>, the
-    <a href="#dom-context-2d-globalalpha-2" id="drawing-focus-rings-and-scrolling-paths-into-view:dom-context-2d-globalalpha-2">global alpha</a>, the <a href="#dom-context-2d-globalcompositeoperation-2" id="drawing-focus-rings-and-scrolling-paths-into-view:dom-context-2d-globalcompositeoperation-2">global composition operators</a>, or any of
-    the members in the <code id="drawing-focus-rings-and-scrolling-paths-into-view:canvasfillstrokestyles"><a href="#canvasfillstrokestyles">CanvasFillStrokeStyles</a></code>, <code id="drawing-focus-rings-and-scrolling-paths-into-view:canvaspathdrawingstyles"><a href="#canvaspathdrawingstyles">CanvasPathDrawingStyles</a></code>,
-    <code id="drawing-focus-rings-and-scrolling-paths-into-view:canvastextdrawingstyles"><a href="#canvastextdrawingstyles">CanvasTextDrawingStyles</a></code> interfaces, but <em>should</em> be subject to the
-    <a href="#clipping-region" id="drawing-focus-rings-and-scrolling-paths-into-view:clipping-region">clipping region</a>. (The effect of transformations is described above and varies based
-    on which path is being used.)</p>
-
-   </li><li><p><a href="#inform">Inform the user</a> that the focus is at the location given by the
-   intended path. User agents may wait until the next time the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="drawing-focus-rings-and-scrolling-paths-into-view:event-loop">event loop</a> reaches its
-   <a href="https://html.spec.whatwg.org/multipage/webappapis.html#update-the-rendering" id="drawing-focus-rings-and-scrolling-paths-into-view:update-the-rendering">update the rendering</a> step to optionally inform the user.</p></li></ol>
-
-  <p>User agents should not implicitly close open subpaths in the intended path when drawing the
-  focus ring.</p>
-
-  <p class="note">This might be a moot point, however. For example, if the focus ring is drawn as an
-  axis-aligned bounding rectangle around the points in the intended path, then whether the subpaths
-  are closed or not has no effect. This specification intentionally does not specify precisely how
-  focus rings are to be drawn: user agents are expected to honor their platform's native
-  conventions.</p>
-
-  <hr/>
-
-  <p>The <dfn id="dom-context-2d-scrollpathintoview-2"><code>scrollPathIntoView()</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>Let <var>the specified rectangle</var> be the rectangle of the bounding box of
-   the intended path.</p></li><li><p>Let <var>notional child</var> be a hypothetical element that is a rendered child
-   of the <code id="drawing-focus-rings-and-scrolling-paths-into-view:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element whose dimensions are those of <var>the specified
-   rectangle</var>.</p></li><li><p><a data-x-internal="scroll-an-element-into-view" href="https://drafts.csswg.org/cssom-view/#scroll-an-element-into-view" id="drawing-focus-rings-and-scrolling-paths-into-view:scroll-an-element-into-view">Scroll <var>notional child</var> into
-   view</a> with the <var>align to top flag</var> set.</p>
-
-   </li><li><p>Optionally, <a href="#inform">inform the user</a> that the caret or selection (or both)
-   cover <var>the specified rectangle</var> of the canvas. The user agent may wait until the next
-   time the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="drawing-focus-rings-and-scrolling-paths-into-view:event-loop-2">event loop</a> reaches its <a href="https://html.spec.whatwg.org/multipage/webappapis.html#update-the-rendering" id="drawing-focus-rings-and-scrolling-paths-into-view:update-the-rendering-2">update the rendering</a> step to
-   optionally inform the user.</p></li></ol>
-
-  <p id="inform">&quot;Inform the user&quot;, as used in this section, does not imply any persistent state
-  change. It could mean, for instance, calling a system accessibility API to notify assistive
-  technologies such as magnification tools so that the user's magnifier moves to the given area of
-  the canvas. However, it does not associate the path with the element, or provide a region for
-  tactile feedback, etc.</p>
-
-  
-
-  <h6 id="drawing-images"><span class="secno">4.12.5.1.14</span> Drawing images<a class="self-link" href="#drawing-images"/></h6>
-
-  <p>Objects that implement the <code id="drawing-images:canvasdrawimage"><a href="#canvasdrawimage">CanvasDrawImage</a></code> interface have the <dfn id="dom-context-2d-drawimage"><code>drawImage</code></dfn> method to draw images.</p>
-
-  
-
-  <p>This method can be invoked with three different sets of arguments:</p>
-
-  <ul class="brief"><li><code>drawImage(<var>image</var>, <var>dx</var>, <var>dy</var>)</code>
-   </li><li><code>drawImage(<var>image</var>, <var>dx</var>, <var>dy</var>, <var>dw</var>, <var>dh</var>)</code>
-   </li><li><code>drawImage(<var>image</var>, <var>sx</var>, <var>sy</var>, <var>sw</var>, <var>sh</var>, <var>dx</var>, <var>dy</var>, <var>dw</var>, <var>dh</var>)</code>
-  </li></ul>
-
-  
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-drawimage-2"><a href="#dom-context-2d-drawimage">drawImage</a></code>(<var>image</var>, <var>dx</var>, <var>dy</var>)</dt><dt><var>context</var> . <code id="drawing-images:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage</a></code>(<var>image</var>, <var>dx</var>, <var>dy</var>, <var>dw</var>, <var>dh</var>)</dt><dt><var>context</var> . <code id="drawing-images:dom-context-2d-drawimage-2"><a href="#dom-context-2d-drawimage">drawImage</a></code>(<var>image</var>, <var>sx</var>, <var>sy</var>, <var>sw</var>, <var>sh</var>, <var>dx</var>, <var>dy</var>, <var>dw</var>, <var>dh</var>)</dt><dd>
-
-    <p>Draws the given image onto the canvas. The arguments are
-    interpreted as follows:</p>
-
-    <p><img alt="The sx and sy parameters give the x and y coordinates of the source rectangle; the sw and sh arguments give the width and height of the source rectangle; the dx and dy give the x and y coordinates of the destination rectangle; and the dw and dh arguments give the width and height of the destination rectangle." height="356" src="https://html.spec.whatwg.org/images/drawImage.png" width="356"/></p>
-
-    <p>If the image isn't yet fully decoded, then nothing is drawn. If the image is a canvas with no
-    data, throws an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="drawing-images:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="drawing-images:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p>
-
-   </dd></dl>
-
-  
-
-  <p>When the <code id="drawing-images:dom-context-2d-drawimage-3"><a href="#dom-context-2d-drawimage">drawImage()</a></code> method is invoked, the user
-  agent must run these steps:</p>
-
-  <ol><li><p>If any of the arguments are infinite or NaN, then abort these steps.</p></li><li><p><a href="#check-the-usability-of-the-image-argument" id="drawing-images:check-the-usability-of-the-image-argument">Check the usability of the <var>image</var> argument</a>. If this
-   returns <i>aborted</i>, then an exception has been thrown and the method doesn't return anything;
-   abort these steps. If it returns <i>bad</i>, then abort these steps without drawing anything.
-   Otherwise it returns <i>good</i>; continue with these steps.</p></li><li>
-
-    <p>Establish the source and destination rectangles as follows:</p>
-
-    <p>If not specified, the <var>dw</var> and <var>dh</var> arguments must default to the values of
-    <var>sw</var> and <var>sh</var>, interpreted such that one <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="drawing-images:'px'">CSS pixel</a>
-    in the image is treated as one unit in the <a href="#output-bitmap" id="drawing-images:output-bitmap">output bitmap</a>'s coordinate space. If the
-    <var>sx</var>, <var>sy</var>, <var>sw</var>, and <var>sh</var> arguments are omitted, then they
-    must default to 0, 0, the image's <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-width" id="drawing-images:intrinsic-width">intrinsic width</a> in image pixels, and the image's
-    <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-height" id="drawing-images:intrinsic-height">intrinsic height</a> in image pixels, respectively. If the image has no <a data-x-internal="intrinsic-dimensions" href="https://drafts.csswg.org/css2/conform.html#intrinsic" id="drawing-images:intrinsic-dimensions">intrinsic
-    dimensions</a>, then the <i>concrete object size</i> must be used instead, as determined
-    using the CSS &quot;<a href="https://drafts.csswg.org/css-images/#default-sizing">Concrete Object
-    Size Resolution</a>&quot; algorithm, with the <i>specified size</i> having neither a definite width
-    nor height, nor any additional constraints, the object's intrinsic properties being those of the
-    <var>image</var> argument, and the <a data-x-internal="default-object-size" href="https://drafts.csswg.org/css-images/#default-object-size" id="drawing-images:default-object-size">default object size</a> being the size of the
-    <a href="#output-bitmap" id="drawing-images:output-bitmap-2">output bitmap</a>. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSIMAGES">[CSSIMAGES]</a></p>
-
-    <p>The source rectangle is the rectangle whose corners are the four points (<var>sx</var>, <var>sy</var>), (<var>sx</var>+<var>sw</var>, <var>sy</var>), (<var>sx</var>+<var>sw</var>, <var>sy</var>+<var>sh</var>),
-    (<var>sx</var>, <var>sy</var>+<var>sh</var>).</p>
-
-    <p>The destination rectangle is the rectangle whose corners are the four points (<var>dx</var>, <var>dy</var>), (<var>dx</var>+<var>dw</var>, <var>dy</var>), (<var>dx</var>+<var>dw</var>, <var>dy</var>+<var>dh</var>),
-    (<var>dx</var>, <var>dy</var>+<var>dh</var>).</p>
-
-    <p>When the source rectangle is outside the source image, the source rectangle must be clipped
-    to the source image and the destination rectangle must be clipped in the same proportion.</p>
-
-    <p class="note">When the destination rectangle is outside the destination image (the
-    <a href="#output-bitmap" id="drawing-images:output-bitmap-3">output bitmap</a>), the pixels that land outside the <a href="#output-bitmap" id="drawing-images:output-bitmap-4">output bitmap</a> are
-    discarded, as if the destination was an infinite canvas whose rendering was clipped to the
-    dimensions of the <a href="#output-bitmap" id="drawing-images:output-bitmap-5">output bitmap</a>.</p>
-
-   </li><li><p>If one of the <var>sw</var> or <var>sh</var> arguments is zero, then abort
-   these steps. Nothing is painted.</p></li><li>
-
-    <p>Paint the region of the <var>image</var> argument specified by the source rectangle
-    on the region of the rendering context's <a href="#output-bitmap" id="drawing-images:output-bitmap-6">output bitmap</a> specified by the
-    destination rectangle, after applying the <a href="#transformations" id="drawing-images:transformations">current
-    transformation matrix</a> to the destination rectangle.</p>
-
-    <p>The image data must be processed in the original direction, even if the dimensions given are
-    negative. </p>
-
-    <p>When scaling up, if the <code id="drawing-images:dom-context-2d-imagesmoothingenabled-2"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code> attribute is set to
-    true, the user agent should attempt to apply a smoothing algorithm to the image data when it is
-    scaled. User agents which support multiple filtering algorithms may use the value of the <code id="drawing-images:dom-context-2d-imagesmoothingquality-2"><a href="#dom-context-2d-imagesmoothingquality-2">imageSmoothingQuality</a></code> attribute to guide
-    the choice of filtering algorithm when the <code id="drawing-images:dom-context-2d-imagesmoothingenabled-2-2"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code> attribute is set to
-    true. Otherwise, the image must be rendered using nearest-neighbor interpolation.</p>
-
-    <p class="note">This specification does not define the precise algorithm to use when scaling an
-    image down, or when scaling an image up when the <code id="drawing-images:dom-context-2d-imagesmoothingenabled-2-3"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code> attribute is set to
-    true.</p>
-
-    <p class="note">When a <code id="drawing-images:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element is drawn onto itself, the <a href="#drawing-model" id="drawing-images:drawing-model">drawing
-    model</a> requires the source to be copied before the image is drawn, so it is possible to
-    copy parts of a <code id="drawing-images:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element onto overlapping parts of itself.</p>
-
-    <p>If the original image data is a bitmap image, then the value painted at a point in the
-    destination rectangle is computed by filtering the original image data. The user agent may use
-    any filtering algorithm (for example bilinear interpolation or nearest-neighbor). When the
-    filtering algorithm requires a pixel value from outside the original image data, it must instead
-    use the value from the nearest edge pixel. (That is, the filter uses 'clamp-to-edge' behavior.)
-    When the filtering algorithm requires a pixel value from outside the source rectangle but inside
-    the original image data, then the value from the original image data must be used.</p>
-    
-    
-
-    <p class="note">Thus, scaling an image in parts or in whole will have the same effect. This does
-    mean that when sprites coming from a single sprite sheet are to be scaled, adjacent images in
-    the sprite sheet can interfere. This can be avoided by ensuring each sprite in the sheet is
-    surrounded by a border of transparent black, or by copying sprites to be scaled into temporary
-    <code id="drawing-images:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> elements and drawing the scaled sprites from there.</p>
-
-    <p>Images are painted without affecting the current path, and are subject to <a href="#shadows" id="drawing-images:shadows">shadow effects</a>, <a href="#dom-context-2d-globalalpha-2" id="drawing-images:dom-context-2d-globalalpha-2">global
-    alpha</a>, the <a href="#clipping-region" id="drawing-images:clipping-region">clipping region</a>, and <a href="#dom-context-2d-globalcompositeoperation-2" id="drawing-images:dom-context-2d-globalcompositeoperation-2">global composition operators</a>.</p>
-
-   </li><li><p>If <a href="#the-image-argument-is-not-origin-clean" id="drawing-images:the-image-argument-is-not-origin-clean">the <var>image argument</var> is not origin-clean</a>, then set the
-   <code id="drawing-images:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>'s <a href="#concept-canvas-origin-clean" id="drawing-images:concept-canvas-origin-clean">origin-clean</a> flag to false.</p></li></ol>
-
-  
-
-
-  <h6 id="pixel-manipulation"><span class="secno">4.12.5.1.15</span> <dfn>Pixel manipulation</dfn><a class="self-link" href="#pixel-manipulation"/></h6>
-
-  <dl class="domintro"><dt><var>imagedata</var> = new <code id="pixel-manipulation:dom-imagedata"><a href="#dom-imagedata">ImageData</a></code>(<var>sw</var>, <var>sh</var>)</dt><dt><var>imagedata</var> = <var>context</var> . <code id="dom-context-2d-createimagedata"><a href="#dom-context-2d-createimagedata-2">createImageData</a></code>(<var>sw</var>, <var>sh</var>)</dt><dd>
-
-    <p>Returns an <code id="pixel-manipulation:imagedata"><a href="#imagedata">ImageData</a></code> object with the given dimensions. All the pixels in the
-    returned object are transparent black.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if either of
-    the width or height arguments are zero.</p>
-
-   </dd><dt><var>imagedata</var> = <var>context</var> . <code id="pixel-manipulation:dom-context-2d-createimagedata-2"><a href="#dom-context-2d-createimagedata-2">createImageData</a></code>(<var>imagedata</var>)</dt><dd>
-
-    <p>Returns an <code id="pixel-manipulation:imagedata-2"><a href="#imagedata">ImageData</a></code> object with the same dimensions as the argument. All the
-    pixels in the returned object are transparent black.</p>
-
-   </dd><dt><var>imagedata</var> = new <code id="pixel-manipulation:dom-imagedata-2"><a href="#dom-imagedata">ImageData</a></code>(<var>data</var>, <var>sw</var> [, <var>sh</var> ] )</dt><dd>
-
-    <p>Returns an <code id="pixel-manipulation:imagedata-3"><a href="#imagedata">ImageData</a></code> object using the data provided in the <code id="pixel-manipulation:idl-uint8clampedarray"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> argument, interpreted using the given
-    dimensions.</p>
-
-    <p>As each pixel in the data is represented by four numbers, the length of the data needs to be
-    a multiple of four times the given width. If the height is provided as well, then the length
-    needs to be exactly the width times the height times 4.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-2">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the given
-    data and dimensions can't be interpreted consistently, or if either dimension is zero.</p>
-
-   </dd><dt><var>imagedata</var> = <var>context</var> . <code id="dom-context-2d-getimagedata"><a href="#dom-context-2d-getimagedata-2">getImageData</a></code>(<var>sx</var>, <var>sy</var>, <var>sw</var>, <var>sh</var>)</dt><dd>
-
-    <p>Returns an <code id="pixel-manipulation:imagedata-4"><a href="#imagedata">ImageData</a></code> object containing the image data for the given rectangle of
-    the bitmap.</p>
-
-    <p>Throws an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-3">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception-3"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the either
-    of the width or height arguments are zero.</p>
-
-   </dd><dt><var>imagedata</var> . <code id="dom-imagedata-width"><a href="#dom-imagedata-width-2">width</a></code></dt><dt><var>imagedata</var> . <code id="dom-imagedata-height"><a href="#dom-imagedata-height-2">height</a></code></dt><dd>
-
-    <p>Returns the actual dimensions of the data in the <code id="pixel-manipulation:imagedata-5"><a href="#imagedata">ImageData</a></code> object, in
-    pixels.</p>
-
-   </dd><dt><var>imagedata</var> . <code id="dom-imagedata-data"><a href="#dom-imagedata-data-2">data</a></code></dt><dd>
-
-    <p>Returns the one-dimensional array containing the data in RGBA order, as integers in the range
-    0 to 255.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-putimagedata"><a href="#dom-context-2d-putimagedata-2">putImageData</a></code>(<var>imagedata</var>, <var>dx</var>, <var>dy</var> [, <var>dirtyX</var>, <var>dirtyY</var>, <var>dirtyWidth</var>, <var>dirtyHeight</var> ] )</dt><dd>
-
-    <p>Paints the data from the given <code id="pixel-manipulation:imagedata-6"><a href="#imagedata">ImageData</a></code> object onto the bitmap. If a dirty
-    rectangle is provided, only the pixels from that rectangle are painted.</p>
-
-    <p>The <code id="pixel-manipulation:dom-context-2d-globalalpha-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code> and <code id="pixel-manipulation:dom-context-2d-globalcompositeoperation-2"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code> attributes, as
-    well as the shadow attributes, are ignored for the purposes of this method call; pixels in the
-    canvas are replaced wholesale, with no composition, alpha blending, no shadows, etc.</p>
-
-    <p>Throws an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="pixel-manipulation:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="pixel-manipulation:domexception-4"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> if the
-    <var>imagedata</var> object's data's <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="pixel-manipulation:detached">[[Detached]]</a> internal slot value is true.</p>
-
-   </dd></dl>
-
-  
-
-  <p>Objects that implement the <code id="pixel-manipulation:canvasimagedata"><a href="#canvasimagedata">CanvasImageData</a></code> interface provide the following methods
-  for reading and writing pixel data to the bitmap.</p>
-
-  <p>The <dfn id="dom-imagedata"><code>ImageData()</code></dfn> constructors and the
-  <dfn id="dom-context-2d-createimagedata-2"><code>createImageData()</code></dfn> methods are
-  used to instantiate new <code id="pixel-manipulation:imagedata-7"><a href="#imagedata">ImageData</a></code> objects.</p>
-
-  <p>When the <code id="pixel-manipulation:dom-imagedata-3"><a href="#dom-imagedata">ImageData()</a></code> constructor is invoked with two
-  numeric arguments <var>sw</var> and <var>sh</var>, it must <a href="#create-an-imagedata-object" id="pixel-manipulation:create-an-imagedata-object">create an <code>ImageData</code>
-  object</a> with parameter <var>pixelsPerRow</var> set to <var>sw</var>, and <var>rows</var> set
-  to <var>sh</var>. The image data of the newly created <code id="pixel-manipulation:imagedata-8"><a href="#imagedata">ImageData</a></code> object must be
-  initialized to transparent black. If both <var>sw</var> and <var>sh</var> are non-zero, then
-  return the new <code id="pixel-manipulation:imagedata-9"><a href="#imagedata">ImageData</a></code> object. If one or both of <var>sw</var> and <var>sh</var>
-  are zero, then the constructor must throw an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-4">&quot;<code>IndexSizeError</code>&quot;</a>
-  <code id="pixel-manipulation:domexception-5"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> instead.</p>
-
-  <p>When the <code id="pixel-manipulation:dom-imagedata-4"><a href="#dom-imagedata">ImageData()</a></code> constructor is invoked with its first
-  argument being an <code id="pixel-manipulation:idl-uint8clampedarray-2"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> <var>source</var>
-  and its second and optional third arguments being numeric arguments <var>sw</var> and
-  <var>sh</var>, it must run these steps:</p>
-
-  <ol><li><p>Let <var>length</var> be the number of bytes in <var>source</var>.</p></li><li><p>If <var>length</var> is not a non-zero integral multiple of four, then throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="pixel-manipulation:invalidstateerror-2">&quot;<code>InvalidStateError</code>&quot;</a> <code id="pixel-manipulation:domexception-6"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-   steps.</p></li><li><p>Let <var>length</var> be <var>length</var> divided by four.</p>
-
-   </li><li>
-
-    <p>If <var>length</var> is not an integral multiple of <var>sw</var>, then throw an
-    <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-5">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception-7"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p>
-
-    <p class="note">At this step, the length is guaranteed to be greater than zero (otherwise the
-    second step above would have aborted the steps), so if <var>sw</var> is zero, this
-    step will throw the exception and abort these steps.</p>
-
-   </li><li><p>Let <var>height</var> be <var>length</var> divided by <var>sw</var>.</p></li><li><p>If the <var>sh</var> argument was not omitted, and its value is not equal to
-   <var>height</var>, then throw an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-6">&quot;<code>IndexSizeError</code>&quot;</a>
-   <code id="pixel-manipulation:domexception-8"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p></li><li>
-
-    <p><a href="#create-an-imagedata-object" id="pixel-manipulation:create-an-imagedata-object-2">Create an <code>ImageData</code> object</a>, with parameter <var>pixelsPerRow</var>
-    set to <var>sw</var>, <var>rows</var> set to <var>sh</var>, and using <var>source</var>.
-    Return the newly created <code id="pixel-manipulation:imagedata-10"><a href="#imagedata">ImageData</a></code> object.</p>
-
-    <p class="note">The resulting object's data is not a <em>copy</em> of <var>source</var>, it's
-    the actual <code id="pixel-manipulation:idl-uint8clampedarray-3"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> object passed as the
-    first argument to the constructor.</p>
-
-   </li></ol>
-
-  <p>When the <code id="pixel-manipulation:dom-context-2d-createimagedata-2-2"><a href="#dom-context-2d-createimagedata-2">createImageData()</a></code> method is
-  invoked with two numeric arguments <var>sw</var> and <var>sh</var>, it must <a href="#create-an-imagedata-object" id="pixel-manipulation:create-an-imagedata-object-3">create an
-  <code>ImageData</code> object</a>, with parameter <var>pixelsPerRow</var> set to the
-  absolute magnitude of <var>sw</var>, and parameter <var>rows</var> set to the absolute magnitude
-  of <var>sh</var>. Initialize the image data of the new <code id="pixel-manipulation:imagedata-11"><a href="#imagedata">ImageData</a></code> object to
-  transparent black. If both <var>sw</var> and <var>sh</var> are non-zero, then return
-  the new <code id="pixel-manipulation:imagedata-12"><a href="#imagedata">ImageData</a></code> object. If one or both of <var>sw</var> and <var>sh</var> are
-  zero, then throw an <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-7">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception-9"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>
-  instead.</p>
-
-  <p>When the <code id="pixel-manipulation:dom-context-2d-createimagedata-2-3"><a href="#dom-context-2d-createimagedata-2">createImageData()</a></code> method is
-  invoked with a single <var>imagedata</var> argument, it must <a href="#create-an-imagedata-object" id="pixel-manipulation:create-an-imagedata-object-4">create an
-  <code>ImageData</code> object</a>, with parameter <var>pixelsPerRow</var> set to the value of
-  the <code id="pixel-manipulation:dom-imagedata-width-2"><a href="#dom-imagedata-width-2">width</a></code> attribute of the <code id="pixel-manipulation:imagedata-13"><a href="#imagedata">ImageData</a></code>
-  object passed as the argument, and the <var>rows</var> parameter set to the value of the
-  <code id="pixel-manipulation:dom-imagedata-height-2"><a href="#dom-imagedata-height-2">height</a></code> attribute.
-  Initialize the image data of the new <code id="pixel-manipulation:imagedata-14"><a href="#imagedata">ImageData</a></code> object to transparent black. Return
-  the newly created <code id="pixel-manipulation:imagedata-15"><a href="#imagedata">ImageData</a></code> object.</p>
-
-  <p>The <dfn id="dom-context-2d-getimagedata-2"><code>getImageData(<var>sx</var>,
-  <var>sy</var>, <var>sw</var>, <var>sh</var>)</code></dfn> method, when invoked, must,
-  if either the <var>sw</var> or <var>sh</var> arguments are zero, throw an
-  <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="pixel-manipulation:indexsizeerror-8">&quot;<code>IndexSizeError</code>&quot;</a> <code id="pixel-manipulation:domexception-10"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>; otherwise,
-  
-  if the <code id="pixel-manipulation:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>'s <a href="#concept-canvas-origin-clean" id="pixel-manipulation:concept-canvas-origin-clean">origin-clean</a> flag is set to false, it must throw a
-  <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="pixel-manipulation:securityerror">&quot;<code>SecurityError</code>&quot;</a> <code id="pixel-manipulation:domexception-11"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>;
-  
-  otherwise, it must <a href="#create-an-imagedata-object" id="pixel-manipulation:create-an-imagedata-object-5">create an <code>ImageData</code> object</a>, with parameter
-  <var>pixelsPerRow</var> set to <var>sw</var>, and parameter <var>rows</var> set to <var>sh</var>.
-  Set the pixel values of the image data of the newly created <code id="pixel-manipulation:imagedata-16"><a href="#imagedata">ImageData</a></code> object to
-  represent the <a href="#output-bitmap" id="pixel-manipulation:output-bitmap">output bitmap</a> for the area of that bitmap denoted by the rectangle
-  whose corners are the four points (<var>sx</var>, <var>sy</var>), (<span><var>sx</var>+<var>sw</var></span>, <var>sy</var>), (<span><var>sx</var>+<var>sw</var></span>, <span><var>sy</var>+<var>sh</var></span>), (<var>sx</var>,
-  <var>sy</var>+<var>sh</var>), in the bitmap's coordinate space units.
-  Pixels outside the <a href="#output-bitmap" id="pixel-manipulation:output-bitmap-2">output bitmap</a> must be set to transparent black. Pixel values
-  must not be premultiplied by alpha.</p>
-
-  <p>When the user agent is required to <dfn id="create-an-imagedata-object">create an <code>ImageData</code> object</dfn>, given a
-  positive integer number of rows <var>rows</var>, a positive integer number of pixels per row
-  <var>pixelsPerRow</var>, and an optional <code id="pixel-manipulation:idl-uint8clampedarray-4"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> <var>source</var>, it must run these
-  steps:</p>
-
-  <ol><li><p>Let <var>imageData</var> be a new uninitialized <code id="pixel-manipulation:imagedata-17"><a href="#imagedata">ImageData</a></code> object.</p></li><li><p>If <var>source</var> is specified, then assign the <dfn id="dom-imagedata-data-2"><code>data</code></dfn> attribute of <var>imageData</var> to
-   <var>source</var>.</p></li><li>
-    <p>If <var>source</var> is not specified, then initialize the <code id="pixel-manipulation:dom-imagedata-data-2"><a href="#dom-imagedata-data-2">data</a></code> attribute of <var>imageData</var> to a new <code id="pixel-manipulation:idl-uint8clampedarray-5"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> object. The <code id="pixel-manipulation:idl-uint8clampedarray-6"><a data-x-internal="idl-uint8clampedarray" href="https://heycam.github.io/webidl/#idl-Uint8ClampedArray">Uint8ClampedArray</a></code> object must use a new <a href="#canvas-pixel-arraybuffer" id="pixel-manipulation:canvas-pixel-arraybuffer">Canvas
-    Pixel <code>ArrayBuffer</code></a> for its storage, and must have a
-    zero start offset and a length equal to the length of its storage, in bytes. The <a href="#canvas-pixel-arraybuffer" id="pixel-manipulation:canvas-pixel-arraybuffer-2">Canvas
-    Pixel <code>ArrayBuffer</code></a> must have the correct size to
-    store <var>rows</var> × <var>pixelsPerRow</var> pixels.</p>
-
-    <p>If the <a href="#canvas-pixel-arraybuffer" id="pixel-manipulation:canvas-pixel-arraybuffer-3">Canvas Pixel <code>ArrayBuffer</code></a> cannot be
-    allocated, then rethrow the <code id="pixel-manipulation:js-rangeerror"><a data-x-internal="js-rangeerror" href="https://tc39.github.io/ecma262/#sec-native-error-types-used-in-this-standard-rangeerror">RangeError</a></code> thrown by JavaScript,
-    and abort these steps.</p>
-   </li><li><p>Initialize the <dfn id="dom-imagedata-width-2"><code>width</code></dfn> attribute of
-   <var>imageData</var> to <var>pixelsPerRow</var>.</p></li><li><p>Initialize the <dfn id="dom-imagedata-height-2"><code>height</code></dfn> attribute of
-   <var>imageData</var> to <var>rows</var>.</p></li><li><p>Return <var>imageData</var>.</p></li></ol>
-
-  <p><code id="pixel-manipulation:imagedata-18"><a href="#imagedata">ImageData</a></code> objects are <a href="https://html.spec.whatwg.org/multipage/structured-data.html#serializable-objects" id="pixel-manipulation:serializable-objects">serializable objects</a>. Their <a href="https://html.spec.whatwg.org/multipage/structured-data.html#serialization-steps" id="pixel-manipulation:serialization-steps">serialization
-  steps</a>, given <var>value</var> and <var>serialized</var>, are:</p>
-
-  <ol><li><p>Set <var>serialized</var>.[[Data]] to the <a href="https://html.spec.whatwg.org/multipage/structured-data.html#sub-serialization" id="pixel-manipulation:sub-serialization">sub-serialization</a> of the value of
-   <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-data-2-2"><a href="#dom-imagedata-data-2">data</a></code> attribute.</p></li><li><p>Set <var>serialized</var>.[[Width]] to the value of <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-width-2-2"><a href="#dom-imagedata-width-2">width</a></code> attribute.</p></li><li><p>Set <var>serialized</var>.[[Height]] to the value of <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-height-2-2"><a href="#dom-imagedata-height-2">height</a></code> attribute.</p></li></ol>
-
-  <p>Their <a href="https://html.spec.whatwg.org/multipage/structured-data.html#deserialization-steps" id="pixel-manipulation:deserialization-steps">deserialization steps</a>, given <var>serialized</var> and <var>value</var>,
-  are:</p>
-
-  <ol><li><p>Initialize <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-data-2-3"><a href="#dom-imagedata-data-2">data</a></code> attribute
-   to the <a href="https://html.spec.whatwg.org/multipage/structured-data.html#sub-deserialization" id="pixel-manipulation:sub-deserialization">sub-deserialization</a> of <var>serialized</var>.[[Data]].</p></li><li><p>Initialize <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-width-2-3"><a href="#dom-imagedata-width-2">width</a></code> attribute
-   to <var>serialized</var>.[[Width]].</p></li><li><p>Initialize <var>value</var>'s <code id="pixel-manipulation:dom-imagedata-height-2-3"><a href="#dom-imagedata-height-2">height</a></code> attribute
-   to <var>serialized</var>.[[Height]].</p></li></ol>
-
-  <p>A <dfn id="canvas-pixel-arraybuffer">Canvas Pixel <code>ArrayBuffer</code></dfn> is an <code id="pixel-manipulation:idl-arraybuffer"><a data-x-internal="idl-arraybuffer" href="https://heycam.github.io/webidl/#idl-ArrayBuffer">ArrayBuffer</a></code> whose data is represented in left-to-right order, row
-  by row top to bottom, starting with the top left, with each pixel's red, green, blue, and alpha
-  components being given in that order for each pixel. Each component of each pixel represented in
-  this array must be in the range 0..255, representing the 8 bit value for that component. The
-  components must be assigned consecutive indices starting with 0 for the top left pixel's red
-  component.</p>
-
-  <p>The <dfn id="dom-context-2d-putimagedata-2"><code>putImageData()</code></dfn> method writes
-  data from <code id="pixel-manipulation:imagedata-19"><a href="#imagedata">ImageData</a></code> structures back to the rendering context's <a href="#output-bitmap" id="pixel-manipulation:output-bitmap-3">output
-  bitmap</a>. Its arguments are: <var>imagedata</var>, <var>dx</var>, <var>dy</var>,
-  <var>dirtyX</var>, <var>dirtyY</var>, <var>dirtyWidth</var>, and <var>dirtyHeight</var>.</p>
-
-  <p>When the last four arguments to this method are omitted, they must be assumed to have the
-  values 0, 0, the <code id="pixel-manipulation:dom-imagedata-width-2-4"><a href="#dom-imagedata-width-2">width</a></code> member of the <var>imagedata</var> structure, and the <code id="pixel-manipulation:dom-imagedata-height-2-4"><a href="#dom-imagedata-height-2">height</a></code>
-  member of the <var>imagedata</var> structure, respectively.</p>
-
-  <p>The method, when invoked, must act as follows:</p>
-
-  <ol><li>
-
-    <p>If <var>imagedata</var>'s <code id="pixel-manipulation:dom-imagedata-data-2-4"><a href="#dom-imagedata-data-2">data</a></code> attribute value's
-    <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="pixel-manipulation:detached-2">[[Detached]]</a> internal slot value is true, then throw an
-    <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="pixel-manipulation:invalidstateerror-3">&quot;<code>InvalidStateError</code>&quot;</a> <code id="pixel-manipulation:domexception-12"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-    steps.</p>
-
-   </li><li>
-
-    <p>If <var>dirtyWidth</var> is negative, then let <var>dirtyX</var> be <span><var>dirtyX</var>+<var>dirtyWidth</var></span>, and let <var>dirtyWidth</var> be equal
-    to the absolute magnitude of <var>dirtyWidth</var>.</p>
-
-    <p>If <var>dirtyHeight</var> is negative, then let <var>dirtyY</var> be <span><var>dirtyY</var>+<var>dirtyHeight</var></span>, and let <var>dirtyHeight</var> be
-    equal to the absolute magnitude of <var>dirtyHeight</var>.</p>
-
-   </li><li>
-
-    <p>If <var>dirtyX</var> is negative, then let <var>dirtyWidth</var> be <span><var>dirtyWidth</var>+<var>dirtyX</var></span>, and let <var>dirtyX</var> be zero.</p>
-
-    <p>If <var>dirtyY</var> is negative, then let <var>dirtyHeight</var> be <span><var>dirtyHeight</var>+<var>dirtyY</var></span>, and let <var>dirtyY</var> be zero.</p>
-
-   </li><li>
-
-    <p>If <var>dirtyX</var>+<var>dirtyWidth</var> is greater than the <code id="pixel-manipulation:dom-imagedata-width-2-5"><a href="#dom-imagedata-width-2">width</a></code> attribute of the <var>imagedata</var> argument, then
-    let <var>dirtyWidth</var> be the value of that <code id="pixel-manipulation:dom-imagedata-width-2-6"><a href="#dom-imagedata-width-2">width</a></code>
-    attribute, minus the value of <var>dirtyX</var>.</p>
-
-    <p>If <var>dirtyY</var>+<var>dirtyHeight</var> is greater than the <code id="pixel-manipulation:dom-imagedata-height-2-5"><a href="#dom-imagedata-height-2">height</a></code> attribute of the <var>imagedata</var> argument, then
-    let <var>dirtyHeight</var> be the value of that <code id="pixel-manipulation:dom-imagedata-height-2-6"><a href="#dom-imagedata-height-2">height</a></code> attribute, minus the value of <var>dirtyY</var>.</p>
-
-   </li><li>
-
-    <p>If, after those changes, either <var>dirtyWidth</var> or <var>dirtyHeight</var> are negative
-    or zero, then abort these steps without affecting any bitmaps.</p>
-
-   </li><li><p>For all integer values of <var>x</var> and <var>y</var> where <span><var>dirtyX</var> ≤ <var>x</var> &lt; <span><var>dirtyX</var>+<var>dirtyWidth</var></span></span> and <span><var>dirtyY</var> ≤ <var>y</var> &lt; <span><var>dirtyY</var>+<var>dirtyHeight</var></span></span>, copy the
-   four channels of the pixel with coordinate (<var>x</var>, <var>y</var>) in
-   the <var>imagedata</var> data structure's <a href="#canvas-pixel-arraybuffer" id="pixel-manipulation:canvas-pixel-arraybuffer-4">Canvas Pixel
-   <code>ArrayBuffer</code></a> to the pixel with coordinate (<span><var>dx</var>+<var>x</var></span>, <var>dy</var>+<var>y</var>)
-   in the rendering context's <a href="#output-bitmap" id="pixel-manipulation:output-bitmap-4">output bitmap</a>.</p></li></ol>
-
-  <p class="note">Due to the lossy nature of converting to and from premultiplied alpha color
-  values, pixels that have just been set using <code id="pixel-manipulation:dom-context-2d-putimagedata-2"><a href="#dom-context-2d-putimagedata-2">putImageData()</a></code> might be returned to an equivalent
-  <code id="pixel-manipulation:dom-context-2d-getimagedata-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code> as different values.</p>
-
-  <p>The current path, <a href="#transformations" id="pixel-manipulation:transformations">transformation matrix</a>,
-  <a href="#shadows" id="pixel-manipulation:shadows">shadow attributes</a>, <a href="#dom-context-2d-globalalpha-2" id="pixel-manipulation:dom-context-2d-globalalpha-2-2">global
-  alpha</a>, the <a href="#clipping-region" id="pixel-manipulation:clipping-region">clipping region</a>, and <a href="#dom-context-2d-globalcompositeoperation-2" id="pixel-manipulation:dom-context-2d-globalcompositeoperation-2-2">global composition operator</a> must not
-  affect the methods described in this section.</p>
-
-  
-
-  <div class="example">
-
-   <p>In the following example, the script generates an <code id="pixel-manipulation:imagedata-20"><a href="#imagedata">ImageData</a></code> object so that it can
-   draw onto it.</p>
-
-   <pre>// canvas is a reference to a &lt;canvas&gt; element
-var context = canvas.getContext('2d');
-
-// create a blank slate
-var data = context.createImageData(canvas.width, canvas.height);
-
-// create some plasma
-FillPlasma(data, 'green'); // green plasma
-
-// add a cloud to the plasma
-AddCloud(data, data.width/2, data.height/2); // put a cloud in the middle
-
-// paint the plasma+cloud on the canvas
-context.putImageData(data, 0, 0);
-
-// support methods
-function FillPlasma(data, color) { ... }
-function AddCloud(data, x, y) { ... }</pre>
-
-  </div>
-
-  <div class="example">
-
-   <p>Here is an example of using <code id="pixel-manipulation:dom-context-2d-getimagedata-2-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code> and <code id="pixel-manipulation:dom-context-2d-putimagedata-2-2"><a href="#dom-context-2d-putimagedata-2">putImageData()</a></code> to implement an edge detection
-   filter.</p>
-
-   <pre>&lt;!DOCTYPE HTML&gt;
-&lt;html lang=&quot;en&quot;&gt;
- &lt;head&gt;
-  &lt;title&gt;Edge detection demo&lt;/title&gt;
-  &lt;script&gt;
-   var image = new Image();
-   function init() {
-     image.onload = demo;
-     image.src = &quot;image.jpeg&quot;;
-   }
-   function demo() {
-     var canvas = document.getElementsByTagName('canvas')[0];
-     var context = canvas.getContext('2d');
-
-     // draw the image onto the canvas
-     context.drawImage(image, 0, 0);
-
-     // get the image data to manipulate
-     var input = context.getImageData(0, 0, canvas.width, canvas.height);
-
-     // get an empty slate to put the data into
-     var output = context.createImageData(canvas.width, canvas.height);
-
-     // alias some variables for convenience
-     // In this case input.width and input.height
-     // match canvas.width and canvas.height
-     // but we'll use the former to keep the code generic.
-     var w = input.width, h = input.height;
-     var inputData = input.data;
-     var outputData = output.data;
-
-     // edge detection
-     for (var y = 1; y &lt; h-1; y += 1) {
-       for (var x = 1; x &lt; w-1; x += 1) {
-         for (var c = 0; c &lt; 3; c += 1) {
-           var i = (y*w + x)*4 + c;
-           outputData[i] = 127 + -inputData[i - w*4 - 4] -   inputData[i - w*4] - inputData[i - w*4 + 4] +
-                                 -inputData[i - 4]       + 8*inputData[i]       - inputData[i + 4] +
-                                 -inputData[i + w*4 - 4] -   inputData[i + w*4] - inputData[i + w*4 + 4];
-         }
-         outputData[(y*w + x)*4 + 3] = 255; // alpha
-       }
-     }
-
-     // put the image data back after manipulation
-     context.putImageData(output, 0, 0);
-   }
-  &lt;/script&gt;
- &lt;/head&gt;
- &lt;body onload=&quot;init()&quot;&gt;
-  &lt;canvas&gt;&lt;/canvas&gt;
- &lt;/body&gt;
-&lt;/html&gt;</pre>
-
-  </div>
-
-
-
-
-  <h6 id="compositing"><span class="secno">4.12.5.1.16</span> Compositing<a class="self-link" href="#compositing"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-globalalpha"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current alpha value applied to rendering operations.</p>
-
-    <p>Can be set, to change the alpha value. Values outside of the range 0.0 .. 1.0 are
-    ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-globalcompositeoperation"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current composition operation, from the values defined in the Compositing and
-    Blending specification. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCOMPOSITE">[COMPOSITE]</a>.</p>
-
-    <p>Can be set, to change the composition operation. Unknown values are ignored.</p>
-
-   </dd></dl><div class="status"><input onclick="toggleStatus(this)" type="button" value="â‹°"/><p class="bugs"><strong>Spec bugs:</strong> <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=27313" title="It seems like this should be defined in terms of an IDL enum. If not, please clarify the relationshi [...]">27313</a></p></div>
-
-  
-
-  <p>All drawing operations on an object which implements the <code id="compositing:canvascompositing"><a href="#canvascompositing">CanvasCompositing</a></code>
-  interface are affected by the global compositing attributes, <code id="compositing:dom-context-2d-globalalpha-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code> and <code id="compositing:dom-context-2d-globalcompositeoperation-2"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code>.</p>
-
-  
-
-  <p>The <dfn id="dom-context-2d-globalalpha-2"><code>globalAlpha</code></dfn> attribute gives an
-  alpha value that is applied to shapes and images before they are composited onto the <a href="#output-bitmap" id="compositing:output-bitmap">output
-  bitmap</a>. The value must be in the range from 0.0 (fully transparent) to 1.0 (no additional
-  transparency). If an attempt is made to set the attribute to a value outside this range, including
-  Infinity and Not-a-Number (NaN) values, then the attribute must retain its previous value. When
-  the context is created, the <code id="compositing:dom-context-2d-globalalpha-2-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code> attribute
-  must initially have the value 1.0.</p>
-
-  <p>The <dfn id="dom-context-2d-globalcompositeoperation-2"><code>globalCompositeOperation</code></dfn> attribute
-  sets the <dfn id="current-composition-operator">current composition operator</dfn>, which controls how shapes and images are drawn onto the
-  <a href="#output-bitmap" id="compositing:output-bitmap-2">output bitmap</a>, once they have had <code id="compositing:dom-context-2d-globalalpha-2-3"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code> and the current transformation matrix
-  applied. The possible values are those defined in the Compositing and Blending specification, and
-  include the values <dfn id="gcop-source-over"><code>source-over</code></dfn>
-  and <dfn id="gcop-copy"><code>copy</code></dfn>.
-  <a href="https://html.spec.whatwg.org/multipage/references.html#refsCOMPOSITE">[COMPOSITE]</a></p>
-
-  <p>These values are all case-sensitive — they must be used exactly as defined. User agents
-  must not recognize values that are not a <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#case-sensitive" id="compositing:case-sensitive">case-sensitive</a> match for one of the values
-  given in the Compositing and Blending specification. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCOMPOSITE">[COMPOSITE]</a></p>
-
-  <p>On setting, if the user agent does not recognize the specified value, it must be ignored,
-  leaving the value of <code id="compositing:dom-context-2d-globalcompositeoperation-2-2"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code> unaffected.
-  Otherwise, the attribute must be set to the given new value.</p>
-
-  <p>When the context is created, the <code id="compositing:dom-context-2d-globalcompositeoperation-2-3"><a href="#dom-context-2d-globalcompositeoperation-2">globalCompositeOperation</a></code> attribute must
-  initially have the value <code id="compositing:gcop-source-over"><a href="#gcop-source-over">source-over</a></code>.</p>
-
-  
-
-
-
-  <h6 id="image-smoothing"><span class="secno">4.12.5.1.17</span> Image smoothing<a class="self-link" href="#image-smoothing"/></h6>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-imagesmoothingenabled"><a href="#dom-context-2d-imagesmoothingenabled-2">imageSmoothingEnabled</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns whether pattern fills and the <code id="image-smoothing:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage()</a></code> method will attempt to smooth images if
-    their pixels don't line up exactly with the display, when scaling images up.</p>
-
-    <p>Can be set, to change whether images are smoothed (true) or not (false).</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-imagesmoothingquality"><a href="#dom-context-2d-imagesmoothingquality-2">imageSmoothingQuality</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current image-smoothing-quality preference.</p>
-
-    <p>Can be set, to change the preferred quality of image smoothing. The possible values are
-    &quot;<code id="image-smoothing:dom-context-2d-imagesmoothingquality-low"><a href="#dom-context-2d-imagesmoothingquality-low">low</a></code>&quot;, &quot;<code id="image-smoothing:dom-context-2d-imagesmoothingquality-medium"><a href="#dom-context-2d-imagesmoothingquality-medium">medium</a></code>&quot; and &quot;<code id="image-smoothing:dom-context-2d-imagesmoothingquality-high"><a href="#dom-context-2d-imagesmoothingquality-high">high</a></code>&quot;. Unknown values are ignored.</p>
-
-   </dd></dl>
-
-  
-
-  <p>Objects that implement the <code id="image-smoothing:canvasimagesmoothing"><a href="#canvasimagesmoothing">CanvasImageSmoothing</a></code> interface have attributes that
-  control how image smoothing is performed.</p>
-
-  <p>The <dfn id="dom-context-2d-imagesmoothingenabled-2"><code>imageSmoothingEnabled</code></dfn>
-  attribute, on getting, must return the last value it was set to. On setting, it must be set to the
-  new value. When the object implementing the <code id="image-smoothing:canvasimagesmoothing-2"><a href="#canvasimagesmoothing">CanvasImageSmoothing</a></code> interface is
-  created, the attribute must be set to true.</p>
-
-  <p>The <dfn id="dom-context-2d-imagesmoothingquality-2"><code>imageSmoothingQuality</code></dfn>
-  attribute, on getting, must return the last value it was set to. On setting, it must be set to the
-  new value. When the object implementing the <code id="image-smoothing:canvasimagesmoothing-3"><a href="#canvasimagesmoothing">CanvasImageSmoothing</a></code> interface is
-  created, the attribute must be set to &quot;<code id="image-smoothing:dom-context-2d-imagesmoothingquality-low-2"><a href="#dom-context-2d-imagesmoothingquality-low">low</a></code>&quot;.</p>
-
-  
-
-
-  <h6 id="shadows"><span class="secno">4.12.5.1.18</span> <dfn>Shadows</dfn><a class="self-link" href="#shadows"/></h6>
-
-  <p>All drawing operations on an object which implements the <code id="shadows:canvasshadowstyles"><a href="#canvasshadowstyles">CanvasShadowStyles</a></code>
-  interface are affected by the four global shadow attributes.</p>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-shadowcolor"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current shadow color.</p>
-
-    <p>Can be set, to change the shadow color. Values that cannot be parsed as CSS colors are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-shadowoffsetx"><a href="#dom-context-2d-shadowoffsetx-2">shadowOffsetX</a></code> [ = <var>value</var> ]</dt><dt><var>context</var> . <code id="dom-context-2d-shadowoffsety"><a href="#dom-context-2d-shadowoffsety-2">shadowOffsetY</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current shadow offset.</p>
-
-    <p>Can be set, to change the shadow offset. Values that are not finite numbers are ignored.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-context-2d-shadowblur"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current level of blur applied to shadows.</p>
-
-    <p>Can be set, to change the blur level. Values that are not finite numbers greater than or
-    equal to zero are ignored.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-context-2d-shadowcolor-2"><code>shadowColor</code></dfn> attribute sets the
-  color of the shadow.</p>
-
-  <p>When the context is created, the <code id="shadows:dom-context-2d-shadowcolor-2"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code>
-  attribute initially must be fully-transparent black.</p>
-
-  <p>On getting, the <a href="#serialisation-of-a-color" id="shadows:serialisation-of-a-color">serialization of the color</a>
-  must be returned.</p>
-
-  <p>On setting, the new value must be <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="shadows:parsed-as-a-css-color-value">parsed as a CSS &lt;color&gt; value</a> and the
-  color assigned. If the value cannot be <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#parsed-as-a-css-color-value" id="shadows:parsed-as-a-css-color-value-2">parsed as a CSS &lt;color&gt; value</a> then it
-  must be ignored, and the attribute must retain its previous value. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCSSCOLOR">[CSSCOLOR]</a></p>
-
-  <p>The <dfn id="dom-context-2d-shadowoffsetx-2"><code>shadowOffsetX</code></dfn> and <dfn id="dom-context-2d-shadowoffsety-2"><code>shadowOffsetY</code></dfn> attributes specify the distance
-  that the shadow will be offset in the positive horizontal and positive vertical distance
-  respectively. Their values are in coordinate space units. They are not affected by the current
-  transformation matrix.</p>
-
-  <p>When the context is created, the shadow offset attributes must initially have the value
-  0.</p>
-
-  <p>On getting, they must return their current value. On setting, the attribute being set must be
-  set to the new value, except if the value is infinite or NaN, in which case the new value must be
-  ignored.</p>
-
-  <p>The <dfn id="dom-context-2d-shadowblur-2"><code>shadowBlur</code></dfn> attribute specifies
-  the level of the blurring effect. (The units do not map to coordinate space units, and are not
-  affected by the current transformation matrix.)</p>
-
-  <p>When the context is created, the <code id="shadows:dom-context-2d-shadowblur-2"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code>
-  attribute must initially have the value 0.</p>
-
-  <p>On getting, the attribute must return its current value. On setting the attribute must be set
-  to the new value, except if the value is negative, infinite or NaN, in which case the new value
-  must be ignored.</p>
-
-  <p><dfn id="when-shadows-are-drawn">Shadows are only drawn if</dfn> the opacity component of
-  the alpha component of the color of <code id="shadows:dom-context-2d-shadowcolor-2-2"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code> is
-  non-zero and either the <code id="shadows:dom-context-2d-shadowblur-2-2"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code> is non-zero, or
-  the <code id="shadows:dom-context-2d-shadowoffsetx-2"><a href="#dom-context-2d-shadowoffsetx-2">shadowOffsetX</a></code> is non-zero, or the <code id="shadows:dom-context-2d-shadowoffsety-2"><a href="#dom-context-2d-shadowoffsety-2">shadowOffsetY</a></code> is non-zero.</p>
-
-  <p><a href="#when-shadows-are-drawn" id="shadows:when-shadows-are-drawn">When shadows are drawn</a>, they must be rendered as follows:</p>
-
-  <ol><li><p>Let <var>A</var> be an infinite transparent black bitmap on which the source
-   image for which a shadow is being created has been rendered.</p></li><li><p>Let <var>B</var> be an infinite transparent black bitmap, with a coordinate
-   space and an origin identical to <var>A</var>.</p></li><li><p>Copy the alpha channel of <var>A</var> to <var>B</var>, offset by <code id="shadows:dom-context-2d-shadowoffsetx-2-2"><a href="#dom-context-2d-shadowoffsetx-2">shadowOffsetX</a></code> in the positive <var>x</var>
-   direction, and <code id="shadows:dom-context-2d-shadowoffsety-2-2"><a href="#dom-context-2d-shadowoffsety-2">shadowOffsetY</a></code> in the positive
-   <var>y</var> direction.</p></li><li>
-
-    <p>If <code id="shadows:dom-context-2d-shadowblur-2-3"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code> is greater than 0:</p>
-
-    <ol><li> <p>Let <var>σ</var> be half the value of <code id="shadows:dom-context-2d-shadowblur-2-4"><a href="#dom-context-2d-shadowblur-2">shadowBlur</a></code>.</p></li><li> <p>Perform a 2D Gaussian Blur on <var>B</var>, using <var>σ</var>
-     as the standard deviation.</p>  </li></ol>
-
-    <p>User agents may limit values of <var>σ</var> to an implementation-specific
-    maximum value to avoid exceeding hardware limitations during the Gaussian blur operation.</p>
-
-   </li><li><p>Set the red, green, and blue components of every pixel in <var>B</var> to the
-   red, green, and blue components (respectively) of the color of <code id="shadows:dom-context-2d-shadowcolor-2-3"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code>.</p></li><li><p>Multiply the alpha component of every pixel in <var>B</var> by the alpha
-   component of the color of <code id="shadows:dom-context-2d-shadowcolor-2-4"><a href="#dom-context-2d-shadowcolor-2">shadowColor</a></code>.</p></li><li><p>The shadow is in the bitmap <var>B</var>, and is rendered as part of the
-   <a href="#drawing-model" id="shadows:drawing-model">drawing model</a> described below.</p></li></ol>
-
-  
-
-  <p>If the current composition operation is <code id="shadows:gcop-copy"><a href="#gcop-copy">copy</a></code>, then shadows
-  effectively won't render (since the shape will overwrite the shadow).</p>
-
-  <h6 id="filters"><span class="secno">4.12.5.1.19</span> Filters<a class="self-link" href="#filters"/></h6>
-
-  <p>All drawing operations on an object which implements the <code id="filters:canvasfilters"><a href="#canvasfilters">CanvasFilters</a></code>
-  interface are affected by the global <dfn id="dom-context-2d-filter"><code>filter</code></dfn>
-  attribute.</p>
-
-  <dl class="domintro"><dt><var>context</var> . <code id="dom-context-2d-filter-2"><a href="#dom-context-2d-filter">filter</a></code> [ = <var>value</var> ]</dt><dd>
-
-    <p>Returns the current filter.</p>
-
-    <p>Can be set, to change the filter. Values that cannot be parsed as a
-    <a data-x-internal="filter-function-list" href="https://drafts.fxtf.org/filters/#typedef-filter-function-list" id="filters:filter-function-list">&lt;filter-function-list&gt;</a> value are ignored.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <code id="filters:dom-context-2d-filter"><a href="#dom-context-2d-filter">filter</a></code> attribute, on getting, must
-  return the last value it was successfully set to. The value must not be re-serialized. On setting,
-  if the new value is 'none' (not the empty string, null, or undefined), filters must be disabled
-  for the context. Otherwise, the value must be parsed as a
-  <a data-x-internal="filter-function-list" href="https://drafts.fxtf.org/filters/#typedef-filter-function-list" id="filters:filter-function-list-2">&lt;filter-function-list&gt;</a> value. If the value cannot be parsed as a
-  <a data-x-internal="filter-function-list" href="https://drafts.fxtf.org/filters/#typedef-filter-function-list" id="filters:filter-function-list-3">&lt;filter-function-list&gt;</a> value, where using property-independent style sheet
-  syntax like 'inherit' or 'initial' is considered an invalid value, then it must be ignored, and
-  the attribute must retain its previous value. When creating the object implementing the
-  <code id="filters:canvasfilters-2"><a href="#canvasfilters">CanvasFilters</a></code> interface, the attribute must be set to 'none'.</p>
-
-  <p>A <a data-x-internal="filter-function-list" href="https://drafts.fxtf.org/filters/#typedef-filter-function-list" id="filters:filter-function-list-4">&lt;filter-function-list&gt;</a> value consists of a sequence of one or more
-  filter functions or references to SVG filters. The input to the filter is used as the input
-  to the first item in the list. Subsequent items take the output of the previous item as
-  their input. <a href="https://html.spec.whatwg.org/multipage/references.html#refsFILTERS">[FILTERS]</a></p>
-
-  <p>Coordinates used in the value of the <code id="filters:dom-context-2d-filter-2"><a href="#dom-context-2d-filter">filter</a></code> attribute are interpreted such that one pixel is
-  equivalent to one SVG user space unit and to one canvas coordinate space unit. Filter coordinates
-  are not affected by the <a href="#transformations" id="filters:transformations">current transformation
-  matrix</a>. The current transformation matrix affects only the input to the filter. Filters
-  are applied in the <a href="#output-bitmap" id="filters:output-bitmap">output bitmap</a>'s coordinate space.</p>
-
-  <p>When the value of the <code id="filters:dom-context-2d-filter-3"><a href="#dom-context-2d-filter">filter</a></code> attribute defines
-  lengths using percentages or using <a data-x-internal="'em'" href="https://drafts.csswg.org/css-values/#em" id="filters:'em'">'em'</a> or <a data-x-internal="'ex'" href="https://drafts.csswg.org/css-values/#ex" id="filters:'ex'">'ex'</a> units, these must be
-  interpreted relative to the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="filters:computed-value">computed value</a> of the <a data-x-internal="'font-size'" href="https://drafts.csswg.org/css-fonts/#font-size-prop" id="filters:'font-size'">'font-size'</a> property
-  of the <a href="#font-style-source-object" id="filters:font-style-source-object">font style source object</a> at the time that the attribute is set, if it is an
-  element. If the <a data-x-internal="computed-value" href="https://drafts.csswg.org/css-cascade/#computed-value" id="filters:computed-value-2">computed values</a> are undefined for a
-  particular case (e.g. because the <a href="#font-style-source-object" id="filters:font-style-source-object-2">font style source object</a> is not an element or is
-  not <a href="https://html.spec.whatwg.org/multipage/rendering.html#being-rendered" id="filters:being-rendered">being rendered</a>), then the relative keywords must be interpreted relative to the
-  default value of the <code id="filters:dom-context-2d-font-2"><a href="#dom-context-2d-font-2">font</a></code> attribute. The 'larger' and
-  'smaller' keywords are not supported.</p>
-
-  <p>If the value of the <code id="filters:dom-context-2d-filter-4"><a href="#dom-context-2d-filter">filter</a></code> attribute refers to an
-  SVG filter in the same document, and this SVG filter changes, then the changed filter is used for
-  the next draw operation.</p>
-
-  <p>If the value of the <code id="filters:dom-context-2d-filter-5"><a href="#dom-context-2d-filter">filter</a></code> attribute refers to an
-  SVG filter in an external resource document and that document is not loaded when a drawing
-  operation is invoked, then the drawing operation must proceed with no filtering.</p>
-
-  
-
-  <h6 id="working-with-externally-defined-svg-filters"><span class="secno">4.12.5.1.20</span> Working with externally-defined SVG filters<a class="self-link" href="#working-with-externally-defined-svg-filters"/></h6>
-
-  <p><i>This section is non-normative.</i></p>
-
-  <p>Since drawing is performed using filter value 'none' until an externally-defined
-  filter has finished loading, authors might wish to determine whether such a filter
-  has finished loading before proceeding with a drawing operation. One way to accomplish
-  this is to load the externally-defined filter elsewhere within the same page in some
-  element that sends a <code>load</code> event (for example, an <a data-x-internal="svg-use" href="https://www.w3.org/TR/SVG11/struct.html#UseElement" id="working-with-externally-defined-svg-filters:svg-use">SVG
-  <code>use</code></a> element), and wait for the <code>load</code> event to be
-  dispatched.</p>
-
-  
-
-  <h6 id="drawing-model"><span class="secno">4.12.5.1.21</span> <dfn>Drawing model</dfn><a class="self-link" href="#drawing-model"/></h6>
-
-  <p>When a shape or image is painted, user agents must follow these steps, in the order given (or
-  act as if they do):</p>
-
-  <ol><li><p>Render the shape or image onto an infinite transparent black bitmap, creating image <var>A</var>, as described in the previous sections. For shapes, the current fill, stroke,
-   and line styles must be honored, and the stroke must itself also be subjected to the current
-   transformation matrix.</p></li><li><p>When the filter attribute is set to a value other than 'none' and all the
-   externally-defined filters it references, if any, are in documents that are currently loaded,
-   then use image <var>A</var> as the input to the <code id="drawing-model:dom-context-2d-filter"><a href="#dom-context-2d-filter">filter</a></code>, creating image <var>B</var>. Otherwise, let
-   <var>B</var> be an alias for <var>A</var>.</p></li><li><p><a href="#when-shadows-are-drawn" id="drawing-model:when-shadows-are-drawn">When shadows are drawn</a>, render the shadow from image <var>B</var>,
-   using the current shadow styles, creating image <var>C</var>.</p></li><li><p><a href="#when-shadows-are-drawn" id="drawing-model:when-shadows-are-drawn-2">When shadows are drawn</a>, multiply the alpha component of every pixel in <var>C</var> by <code id="drawing-model:dom-context-2d-globalalpha-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code>.</p></li><li><p><a href="#when-shadows-are-drawn" id="drawing-model:when-shadows-are-drawn-3">When shadows are drawn</a>, composite <var>C</var> within the
-   <a href="#clipping-region" id="drawing-model:clipping-region">clipping region</a> over the current <a href="#output-bitmap" id="drawing-model:output-bitmap">output bitmap</a> using the <a href="#current-composition-operator" id="drawing-model:current-composition-operator">current
-   composition operator</a>.</p></li><li><p>Multiply the alpha component of every pixel in <var>B</var> by <code id="drawing-model:dom-context-2d-globalalpha-2-2"><a href="#dom-context-2d-globalalpha-2">globalAlpha</a></code>.</p></li><li><p>Composite <var>B</var> within the <a href="#clipping-region" id="drawing-model:clipping-region-2">clipping region</a> over the current
-   <a href="#output-bitmap" id="drawing-model:output-bitmap-2">output bitmap</a> using the <a href="#current-composition-operator" id="drawing-model:current-composition-operator-2">current composition operator</a>.</p></li></ol>
-
-  <p>When compositing onto the <a href="#output-bitmap" id="drawing-model:output-bitmap-3">output bitmap</a>, pixels that would fall outside of the
-  <a href="#output-bitmap" id="drawing-model:output-bitmap-4">output bitmap</a> must be discarded.</p>
-
-  
-
-
-
-
-  <h6 id="best-practices"><span class="secno">4.12.5.1.22</span> Best practices<a class="self-link" href="#best-practices"/></h6>
-
-  <p>When a canvas is interactive, authors should include focusable elements in the element's
-  fallback content corresponding to each focusable part of the canvas, as in the <a href="#drawCustomFocusRingExample">example above</a>.</p>
-
-  <p>When rendering focus rings, to ensure that focus rings have the appearance of native focus
-  rings, authors should use the <code id="best-practices:dom-context-2d-drawfocusifneeded-2"><a href="#dom-context-2d-drawfocusifneeded-2">drawFocusIfNeeded()</a></code> method, passing it the
-  element for which a ring is being drawn. This method only draws the focus ring if the element is
-  <a href="https://html.spec.whatwg.org/multipage/interaction.html#focused" id="best-practices:focused">focused</a>, so that it can simply be called whenever drawing the element, without
-  checking whether the element is focused or not first.</p>
-
-  <p>In addition to drawing focus rings, authors should use the <code id="best-practices:dom-context-2d-scrollpathintoview-2"><a href="#dom-context-2d-scrollpathintoview-2">scrollPathIntoView()</a></code> method when an element in
-  the canvas is focused, to make sure it is visible on the screen (if applicable).</p>
-
-  <p id="no-text-editing-in-canvas-please">Authors should avoid implementing text editing controls
-  using the <code id="best-practices:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element. Doing so has a large number of disadvantages:</p>
-
-  <ul><li>Mouse placement of the caret has to be reimplemented.</li><li>Keyboard movement of the caret has to be reimplemented (possibly across lines, for multiline
-   text input).</li><li>Scrolling of the text control has to be implemented (horizontally for long lines, vertically
-   for multiline input).</li><li>Native features such as copy-and-paste have to be reimplemented.</li><li>Native features such as spell-checking have to be reimplemented.</li><li>Native features such as drag-and-drop have to be reimplemented.</li><li>Native features such as page-wide text search have to be reimplemented.</li><li>Native features specific to the user, for example custom text services, have to be
-   reimplemented. This is close to impossible since each user might have different services
-   installed, and there is an unbounded set of possible such services.</li><li>Bidirectional text editing has to be reimplemented.</li><li>For multiline text editing, line wrapping has to be implemented for all relevant
-   languages.</li><li>Text selection has to be reimplemented.</li><li>Dragging of bidirectional text selections has to be reimplemented.</li><li>Platform-native keyboard shortcuts have to be reimplemented.</li><li>Platform-native input method editors (IMEs) have to be reimplemented.</li><li>Undo and redo functionality has to be reimplemented.</li><li>Accessibility features such as magnification following the caret or selection have to be
-   reimplemented.</li></ul>
-
-  <p>This is a huge amount of work, and authors are most strongly encouraged to avoid doing any of
-  it by instead using the <code id="best-practices:the-input-element"><a href="https://html.spec.whatwg.org/multipage/input.html#the-input-element">input</a></code> element, the <code id="best-practices:the-textarea-element"><a href="https://html.spec.whatwg.org/multipage/form-elements.html#the-textarea-element">textarea</a></code> element, or the
-  <code id="best-practices:attr-contenteditable"><a href="https://html.spec.whatwg.org/multipage/interaction.html#attr-contenteditable">contenteditable</a></code> attribute.</p>
-
-
-  <h6 id="examples"><span class="secno">4.12.5.1.23</span> Examples<a class="self-link" href="#examples"/></h6>
-
-  <p><i>This section is non-normative.</i></p>
-
-  <div class="example">
-
-  <p>Here is an example of a script that uses canvas to draw <a href="data:text/html;charset=utf-8;base64,PCFET0NUWVBFIEhUTUw%2BDQo8aHRtbCBsYW5nPSJlbiI%2BDQogPGhlYWQ%2BDQogIDx0aXRsZT5QcmV0dHkgR2xvd2luZyBMaW5lczwvdGl0bGU%2BDQogPC9oZWFkPg0KIDxib2R5Pg0KPGNhbnZhcyB3aWR0aD0iODAwIiBoZWlnaHQ9IjQ1MCI%2BPC9jYW52YXM%2BDQo8c2NyaXB0Pg0KDQogdmFyIGNvbnRleHQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnY2FudmFzJylbMF0uZ2V0Q29udGV4dCgnMmQnKTsNCg0KIHZhciBsYXN0WCA9IGNvbnRleHQuY2FudmFzLndpZHRoICogTWF0aC5yYW5kb20oKTsNCiB2YXIgbGFzdFkgPSBjb250ZXh0LmNhbnZhcy5oZWlnaHQgKiBNYXRoLnJhbmRvbSgpOw0KIHZhciBodWUgPSAwOw0KIGZ1bmN0aW9uIGxpbmUoKSB7DQogICBjb250ZXh0LnNhdmUoKTsNCiAgIGNvbnRleHQudHJhbnNsYXRlKGNvbnRleHQuY2FudmFzLndpZHRoLzIsIGNvbnRleHQuY2FudmFzLmhlaWdodC8yKTsNCiAgIGNvbnRleHQuc2NhbGUoMC45LCAwLjkpOw0KICAgY29udGV4dC50cmFuc2xhdGUoLWNvbnRleHQuY2FudmFzLndpZHRoLzIsIC1jb250ZXh0LmNhbnZhcy5oZWlnaHQvMik7DQogICBjb250ZXh0LmJlZ2luUGF0aCgpOw0KICAgY29udGV4dC5saW5lV2lkdGggPSA1ICsgTWF0aC5yYW5kb20oKSAqIDEwOw0KICAgY29udGV4dC5tb3ZlVG8obGFzdFgsIGxhc3RZKTsNCiAgIGxhc3RYID0gY29udGV4dC5jYW52YXMud2lkdGggKiBNYXRoLnJhbmRvbSgpOw0KICAgbGFzdFkgPSBjb250ZXh0LmNhbnZhcy5oZWlnaHQgKiBNYXRoLnJhbmRvbSgpOw0KICAgY29udGV4dC5iZXppZXJDdXJ2ZVRvKGNvbnRleHQuY2FudmFzLndpZHRoICogTWF0aC5yYW5kb20oKSwNCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmNhbnZhcy5oZWlnaHQgKiBNYXRoLnJhbmRvbSgpLA0KICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQuY2FudmFzLndpZHRoICogTWF0aC5yYW5kb20oKSwNCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LmNhbnZhcy5oZWlnaHQgKiBNYXRoLnJhbmRvbSgpLA0KICAgICAgICAgICAgICAgICAgICAgICAgIGxhc3RYLCBsYXN0WSk7DQoNCiAgIGh1ZSA9IGh1ZSArIDEwICogTWF0aC5yYW5kb20oKTsNCiAgIGNvbnRleHQuc3Ryb2tlU3R5bGUgPSAnaHNsKCcgKyBodWUgKyAnLCA1MCUsIDUwJSknOw0KICAgY29udGV4dC5zaGFkb3dDb2xvciA9ICd3aGl0ZSc7DQogICBjb250ZXh0LnNoYWRvd0JsdXIgPSAxMDsNCiAgIGNvbnRleHQuc3Ryb2tlKCk7DQogICBjb250ZXh0LnJlc3RvcmUoKTsNCiB9DQogc2V0SW50ZXJ2YWwobGluZSwgNTApOw0KDQogZnVuY3Rpb24gYmxhbmsoKSB7DQogICBjb250ZXh0LmZpbGxTdHlsZSA9ICdyZ2JhKDAsMCwwLDAuMSknOw0KICAgY29udGV4dC5maWxsUmVjdCgwLCAwLCBjb250ZXh0LmNhbnZhcy53aWR0aCwgY29udGV4dC5jYW52YXMuaGVpZ2h0KTsNCiB9DQogc2V0SW50ZXJ2YWwoYmxhbmssIDQwKTsNCg0KPC9zY3JpcHQ%2BDQogPC9ib2R5Pg0KPC9odG1sPg0K">pretty glowing lines</a>.</p>
-
-  <pre>&lt;canvas width=&quot;800&quot; height=&quot;450&quot;&gt;&lt;/canvas&gt;
-&lt;script&gt;
-
- var context = document.getElementsByTagName('canvas')[0].getContext('2d');
-
- var lastX = context.canvas.width * Math.random();
- var lastY = context.canvas.height * Math.random();
- var hue = 0;
- function line() {
-   context.save();
-   context.translate(context.canvas.width/2, context.canvas.height/2);
-   context.scale(0.9, 0.9);
-   context.translate(-context.canvas.width/2, -context.canvas.height/2);
-   context.beginPath();
-   context.lineWidth = 5 + Math.random() * 10;
-   context.moveTo(lastX, lastY);
-   lastX = context.canvas.width * Math.random();
-   lastY = context.canvas.height * Math.random();
-   context.bezierCurveTo(context.canvas.width * Math.random(),
-                         context.canvas.height * Math.random(),
-                         context.canvas.width * Math.random(),
-                         context.canvas.height * Math.random(),
-                         lastX, lastY);
-
-   hue = hue + 10 * Math.random();
-   context.strokeStyle = 'hsl(' + hue + ', 50%, 50%)';
-   context.shadowColor = 'white';
-   context.shadowBlur = 10;
-   context.stroke();
-   context.restore();
- }
- setInterval(line, 50);
-
- function blank() {
-   context.fillStyle = 'rgba(0,0,0,0.1)';
-   context.fillRect(0, 0, context.canvas.width, context.canvas.height);
- }
- setInterval(blank, 40);
-
-&lt;/script&gt;</pre>
-
-  </div>
-
-  <div class="example">
-
-   <p>The 2D rendering context for <code id="examples:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> is often used for sprite-based games. The
-   following example demonstrates this:</p>
-
-   <iframe height="216" src="https://html.spec.whatwg.org/demos/canvas/blue-robot/index-idle.html" width="396"/>
-
-   <p>Here is the source for this example:</p>
-
-   <pre>&lt;!DOCTYPE HTML&gt;
-&lt;meta charset=&quot;utf-8&quot;&gt;
-&lt;title&gt;Blue Robot Demo&lt;/title&gt;
-&lt;style&gt;
-  html { overflow: hidden; min-height: 200px; min-width: 380px; }
-  body { height: 200px; position: relative; margin: 8px; }
-  .buttons { position: absolute; bottom: 0px; left: 0px; margin: 4px; }
-&lt;/style&gt;
-&lt;canvas width=&quot;380&quot; height=&quot;200&quot;&gt;&lt;/canvas&gt;
-&lt;script&gt;
- var Landscape = function (context, width, height) {
-   this.offset = 0;
-   this.width = width;
-   this.advance = function (dx) {
-     this.offset += dx;
-   };
-   this.horizon = height * 0.7;
-   // This creates the sky gradient (from a darker blue to white at the bottom)
-   this.sky = context.createLinearGradient(0, 0, 0, this.horizon);
-   this.sky.addColorStop(0.0, 'rgb(55,121,179)');
-   this.sky.addColorStop(0.7, 'rgb(121,194,245)');
-   this.sky.addColorStop(1.0, 'rgb(164,200,214)');
-   // this creates the grass gradient (from a darker green to a lighter green)
-   this.earth = context.createLinearGradient(0, this.horizon, 0, height);
-   this.earth.addColorStop(0.0, 'rgb(81,140,20)');
-   this.earth.addColorStop(1.0, 'rgb(123,177,57)');
-   this.paintBackground = function (context, width, height) {
-     // first, paint the sky and grass rectangles
-     context.fillStyle = this.sky;
-     context.fillRect(0, 0, width, this.horizon);
-     context.fillStyle = this.earth;
-     context.fillRect(0, this.horizon, width, height-this.horizon);
-     // then, draw the cloudy banner
-     // we make it cloudy by having the draw text off the top of the
-     // canvas, and just having the blurred shadow shown on the canvas
-     context.save();
-     context.translate(width-((this.offset+(this.width*3.2)) % (this.width*4.0))+0, 0);
-     context.shadowColor = 'white';
-     context.shadowOffsetY = 30+this.horizon/3; // offset down on canvas
-     context.shadowBlur = '5';
-     context.fillStyle = 'white';
-     context.textAlign = 'left';
-     context.textBaseline = 'top';
-     context.font = '20px sans-serif';
-     context.fillText('WHATWG ROCKS', 10, -30); // text up above canvas
-     context.restore();
-     // then, draw the background tree
-     context.save();
-     context.translate(width-((this.offset+(this.width*0.2)) % (this.width*1.5))+30, 0);
-     context.beginPath();
-     context.fillStyle = 'rgb(143,89,2)';
-     context.lineStyle = 'rgb(10,10,10)';
-     context.lineWidth = 2;
-     context.rect(0, this.horizon+5, 10, -50); // trunk
-     context.fill();
-     context.stroke();
-     context.beginPath();
-     context.fillStyle = 'rgb(78,154,6)';
-     context.arc(5, this.horizon-60, 30, 0, Math.PI*2); // leaves
-     context.fill();
-     context.stroke();
-     context.restore();
-   };
-   this.paintForeground = function (context, width, height) {
-     // draw the box that goes in front
-     context.save();
-     context.translate(width-((this.offset+(this.width*0.7)) % (this.width*1.1))+0, 0);
-     context.beginPath();
-     context.rect(0, this.horizon - 5, 25, 25);
-     context.fillStyle = 'rgb(220,154,94)';
-     context.lineStyle = 'rgb(10,10,10)';
-     context.lineWidth = 2;
-     context.fill();
-     context.stroke();
-     context.restore();
-   };
- };
-&lt;/script&gt;
-&lt;script&gt;
- var BlueRobot = function () {
-   this.sprites = new Image();
-   this.sprites.src = 'blue-robot.png'; // this sprite sheet has 8 cells
-   this.targetMode = 'idle';
-   this.walk = function () {
-     this.targetMode = 'walk';
-   };
-   this.stop = function () {
-     this.targetMode = 'idle';
-   };
-   this.frameIndex = {
-     'idle': [0], // first cell is the idle frame
-     'walk': [1,2,3,4,5,6], // the walking animation is cells 1-6
-     'stop': [7], // last cell is the stopping animation
-   };
-   this.mode = 'idle';
-   this.frame = 0; // index into frameIndex
-   this.tick = function () {
-     // this advances the frame and the robot
-     // the return value is how many pixels the robot has moved
-     this.frame += 1;
-     if (this.frame &gt;= this.frameIndex[this.mode].length) {
-       // we've reached the end of this animation cycle
-       this.frame = 0;
-       if (this.mode != this.targetMode) {
-         // switch to next cycle
-         if (this.mode == 'walk') {
-           // we need to stop walking before we decide what to do next
-           this.mode = 'stop';
-         } else if (this.mode == 'stop') {
-           if (this.targetMode == 'walk')
-             this.mode = 'walk';
-           else
-             this.mode = 'idle';
-         } else if (this.mode == 'idle') {
-           if (this.targetMode == 'walk')
-             this.mode = 'walk';
-         }
-       }
-     }
-     if (this.mode == 'walk')
-       return 8;
-     return 0;
-   },
-   this.paint = function (context, x, y) {
-     if (!this.sprites.complete) return;
-     // draw the right frame out of the sprite sheet onto the canvas
-     // we assume each frame is as high as the sprite sheet
-     // the x,y coordinates give the position of the bottom center of the sprite
-     context.drawImage(this.sprites,
-                       this.frameIndex[this.mode][this.frame] * this.sprites.height, 0, this.sprites.height, this.sprites.height,
-                       x-this.sprites.height/2, y-this.sprites.height, this.sprites.height, this.sprites.height);
-   };
- };
-&lt;/script&gt;
-&lt;script&gt;
- var canvas = document.getElementsByTagName('canvas')[0];
- var context = canvas.getContext('2d');
- var landscape = new Landscape(context, canvas.width, canvas.height);
- var blueRobot = new BlueRobot();
- // paint when the browser wants us to, using requestAnimationFrame()
- function paint() {
-   context.clearRect(0, 0, canvas.width, canvas.height);
-   landscape.paintBackground(context, canvas.width, canvas.height);
-   blueRobot.paint(context, canvas.width/2, landscape.horizon*1.1);
-   landscape.paintForeground(context, canvas.width, canvas.height);
-   requestAnimationFrame(paint);
- }
- paint();
- // but tick every 150ms, so that we don't slow down when we don't paint
- setInterval(function () {
-   var dx = blueRobot.tick();
-   landscape.advance(dx);
- }, 100);
-&lt;/script&gt;
-&lt;p class=&quot;buttons&quot;&gt;
- &lt;input type=button value=&quot;Walk&quot; onclick=&quot;blueRobot.walk()&quot;&gt;
- &lt;input type=button value=&quot;Stop&quot; onclick=&quot;blueRobot.stop()&quot;&gt;
-&lt;footer&gt;
- &lt;small&gt; Blue Robot Player Sprite by &lt;a href=&quot;https://johncolburn.deviantart.com/&quot;&gt;JohnColburn&lt;/a&gt;.
- Licensed under the terms of the Creative Commons Attribution Share-Alike 3.0 Unported license.&lt;/small&gt;
- &lt;small&gt; This work is itself licensed under a &lt;a rel=&quot;license&quot; href=&quot;https://creativecommons.org/licenses/by-sa/3.0/&quot;&gt;Creative
- Commons Attribution-ShareAlike 3.0 Unported License&lt;/a&gt;.&lt;/small&gt;
-&lt;/footer&gt;
-</pre>
-
-  </div>
-
-
-
-
-  <h5 id="the-imagebitmap-rendering-context"><span class="secno">4.12.5.2</span> The <code id="the-imagebitmap-rendering-context:imagebitmap"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> rendering context<a class="self-link" href="#the-imagebitmap-rendering-context"/></h5>
-
-  <h6 id="introduction-6"><span class="secno">4.12.5.2.1</span> Introduction<a class="self-link" href="#introduction-6"/></h6>
-
-  <p><code id="introduction-6:imagebitmaprenderingcontext"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> is a performance-oriented interface that provides a
-  low overhead method for displaying the contents of <code id="introduction-6:imagebitmap"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> objects. It uses
-  transfer semantics to reduce overall memory consumption. It also streamlines performance by
-  avoiding intermediate compositing, unlike the <code id="introduction-6:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage()</a></code> method of
-  <code id="introduction-6:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>.</p>
-
-  <p>Using an <code id="introduction-6:the-img-element"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> element as an intermediate for getting an image resource into a
-  canvas, for example, would result in two copies of the decoded image existing in memory at the
-  same time: the <code id="introduction-6:the-img-element-2"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> element's copy, and the one in the canvas's backing store. This
-  memory cost can be prohibitive when dealing with extremely large images. This can be avoided by
-  using <code id="introduction-6:imagebitmaprenderingcontext-2"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code>.</p>
-
-  <div class="example">
-   <p>Using <code id="introduction-6:imagebitmaprenderingcontext-3"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code>, here is how to transcode an image to the JPEG
-   format in a memory- and CPU-efficient way:</p>
-
-   <pre>createImageBitmap(inputImageBlob).then(image =&gt; {
-  const canvas = document.createElement('canvas');
-  const context = canvas.getContext('bitmaprenderer');
-  context.transferFromImageBitmap(image);
-
-  canvas.toBlob(outputJPEGBlob =&gt; {
-    // Do something with outputJPEGBlob.
-  }, 'image/jpeg');
-});</pre>
-  </div>
-
-  <h6 id="the-imagebitmaprenderingcontext-interface"><span class="secno">4.12.5.2.2</span> The <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> interface<a class="self-link" href="#the-imagebitmaprenderingcontext-interface"/></h6>
-
-  <pre class="idl">[Exposed=Window]
-interface <dfn id="imagebitmaprenderingcontext">ImageBitmapRenderingContext</dfn> {
-  readonly attribute <a href="#htmlcanvaselement" id="the-imagebitmaprenderingcontext-interface:htmlcanvaselement">HTMLCanvasElement</a> <a href="#dom-imagebitmaprenderingcontext-canvas-2" id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontext-canvas-2">canvas</a>;
-  void <a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2" id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap</a>(ImageBitmap? bitmap);
-};
-
-dictionary <dfn id="imagebitmaprenderingcontextsettings">ImageBitmapRenderingContextSettings</dfn> {
-  boolean <a href="#dom-imagebitmaprenderingcontextsettings-alpha" id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontextsettings-alpha">alpha</a> = true;
-};</pre>
-
-  <dl class="domintro"><dt><var>context</var> = <var>canvas</var> . <code id="the-imagebitmaprenderingcontext-interface:dom-canvas-getcontext-2"><a href="#dom-canvas-getcontext-2">getContext</a></code>('bitmaprenderer' [, { [ <code id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontextsettings-alpha-2"><a href="#dom-imagebitmaprenderingcontextsettings-alpha">alpha</a></code>: false ] } ] )</dt><dd>
-
-    <p>Returns an <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-2"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object that is permanently bound to a
-    particular <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element.</p>
-
-    <p>If the <code id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontextsettings-alpha-3"><a href="#dom-imagebitmaprenderingcontextsettings-alpha">alpha</a></code> setting is
-    provided and set to false, then the canvas is forced to always be opaque.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-imagebitmaprenderingcontext-canvas"><a href="#dom-imagebitmaprenderingcontext-canvas-2">canvas</a></code></dt><dd>
-
-    <p>Returns the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element that the context is bound to.</p>
-
-   </dd><dt><var>context</var> . <code id="dom-imagebitmaprenderingcontext-transferfromimagebitmap"><a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap</a></code>(imageBitmap)</dt><dd>
-
-    <p>Transfers the underlying <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data">bitmap data</a>
-    from <var>imageBitmap</var> to <var>context</var>, and the bitmap becomes the contents of the
-    <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element to which <var>context</var> is bound.</p>
-
-   </dd><dt><var>context</var> . <code id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontext-transferfromimagebitmap-2-2"><a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap</a></code>(
-   null)</dt><dd>
-
-    <p>Replaces contents of the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-4"><a href="#the-canvas-element">canvas</a></code> element to which <var>context</var>
-    is bound with a transparent black bitmap whose size corresponds to the <code id="the-imagebitmaprenderingcontext-interface:attr-canvas-width"><a href="#attr-canvas-width">width</a></code> and <code id="the-imagebitmaprenderingcontext-interface:attr-canvas-height"><a href="#attr-canvas-height">height</a></code>
-    content attributes of the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-5"><a href="#the-canvas-element">canvas</a></code> element.</p>
-
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-imagebitmaprenderingcontext-canvas-2"><code>canvas</code></dfn> attribute
-  must return the value it was initialized to when the object was created.</p>
-
-  <p>An <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-3"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object has an <dfn id="concept-imagebitmaprenderingcontext-output-bitmap">output bitmap</dfn>, which is a
-  reference to <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data-2">bitmap data</a>.</p>
-
-  <p>An <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-4"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object has a <dfn id="concept-imagebitmaprenderingcontext-bitmap-mode">bitmap mode</dfn>, which can be set to
-  <dfn id="concept-imagebitmaprenderingcontext-valid">valid</dfn> or <dfn id="concept-imagebitmaprenderingcontext-blank">blank</dfn>. A value of <a href="#concept-imagebitmaprenderingcontext-valid" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-valid">valid</a> indicates that the context's
-  <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap">output bitmap</a> refers to
-  <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data-3">bitmap data</a> that was acquired via <code id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontext-transferfromimagebitmap-2-3"><a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap()</a></code>.
-  A value <a href="#concept-imagebitmaprenderingcontext-blank" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-blank">blank</a> indicates that the
-  context's <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-2">output
-  bitmap</a> is a default transparent bitmap.</p>
-
-  <p>An <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-5"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object also has an <dfn id="concept-imagebitmaprenderingcontext-alpha">alpha</dfn> flag, which can be set to true or
-  false. When an <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-6"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object has its <a href="#concept-imagebitmaprenderingcontext-alpha" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-alpha">alpha</a> flag set to false, the contents
-  of the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-6"><a href="#the-canvas-element">canvas</a></code> element to which the context is bound are obtained by
-  compositing the context's <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-3">output bitmap</a> onto an opaque
-  black bitmap of the same size using the source-over composite operation. If the <a href="#concept-imagebitmaprenderingcontext-alpha" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-alpha-2">alpha</a> flag is set to true, then the
-  <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-4">output bitmap</a> is used
-  as the contents of the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-7"><a href="#the-canvas-element">canvas</a></code> element to which the context is bound. <a href="https://html.spec.whatwg.org/multipage/references.html#refsCOMPOSITE">[COMPOSITE]</a></p>
-
-  <p class="note">The step of compositing over an opaque black bitmap ought to be elided whenever
-  equivalent results can be obtained more efficiently by other means.</p>
-
-  <hr/>
-
-  <p>When a user agent is required to <dfn id="set-an-imagebitmaprenderingcontext's-output-bitmap">set an <code>ImageBitmapRenderingContext</code>'s output
-  bitmap</dfn>, with a <var>context</var> argument that is an
-  <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-7"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object and an optional argument <var>bitmap</var> that
-  refers to <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data-4">bitmap data</a>, it must run these
-  steps:</p>
-
-  <ol><li><p>If a <var>bitmap</var> argument was not provided, then:</p>
-
-    <ol><li><p>Set <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-bitmap-mode" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-bitmap-mode">bitmap mode</a> to <a href="#concept-imagebitmaprenderingcontext-blank" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-blank-2">blank</a>.</p></li><li><p>Let <var>canvas</var> be the <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-8"><a href="#the-canvas-element">canvas</a></code> element to which <var>context</var>
-     is bound.</p></li><li><p>Set <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-5">output bitmap</a> to be fully
-     transparent black with an <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-width" id="the-imagebitmaprenderingcontext-interface:intrinsic-width">intrinsic width</a> equal to the numeric value of
-     <var>canvas</var>'s <code id="the-imagebitmaprenderingcontext-interface:attr-canvas-width-2"><a href="#attr-canvas-width">width</a></code> attribute and an
-     <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#intrinsic-height" id="the-imagebitmaprenderingcontext-interface:intrinsic-height">intrinsic height</a> equal to the numeric value of <var>canvas</var>'s <code id="the-imagebitmaprenderingcontext-interface:attr-canvas-height-2"><a href="#attr-canvas-height">height</a></code> attribute, those values being interpreted in <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="the-imagebitmaprenderingcontext-interface:'px'">CSS pixels</a>.</p></li><li><p>Set the <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-6">output bitmap</a>'s <a href="#concept-canvas-origin-clean" id="the-imagebitmaprenderingcontext-interface:concept-canvas-origin-clean">origin-clean</a> flag to true.</p></li></ol>
-
-   </li><li><p>If a <var>bitmap</var> argument was provided, then:</p>
-
-    <ol><li><p>Set <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-bitmap-mode" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-bitmap-mode-2">bitmap mode</a> to <a href="#concept-imagebitmaprenderingcontext-valid" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-valid-2">valid</a>.</p></li><li>
-      <p>Set <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-7">output bitmap</a> to refer
-      to the same underlying bitmap data as <var>bitmap</var>, without making a copy.</p>
-
-      <p class="note">The <a href="#concept-canvas-origin-clean" id="the-imagebitmaprenderingcontext-interface:concept-canvas-origin-clean-2">origin-clean</a> flag of
-      <var>bitmap</var> is included in the bitmap data to be referenced by <var>context</var>'s
-      <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-8">output bitmap</a>.</p>
-     </li></ol>
-
-   </li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="imagebitmaprenderingcontext-creation-algorithm"><code>ImageBitmapRenderingContext</code> creation algorithm</dfn>, which is passed a
-  <var>target</var> (a <code id="the-imagebitmaprenderingcontext-interface:the-canvas-element-9"><a href="#the-canvas-element">canvas</a></code> element) and optionally some arguments, consists of
-  running the following steps:</p>
-
-  <ol><li><p>If the algorithm was passed some arguments, then let <var>arg</var> be the first such
-   argument. Otherwise, let <var>arg</var> be undefined.</p></li><li><p>Let <var>settings</var> be the result of <a href="#coerce-context-arguments-for-imagebitmaprenderingcontext" id="the-imagebitmaprenderingcontext-interface:coerce-context-arguments-for-imagebitmaprenderingcontext">coercing the <var>arg</var> context arguments for
-   <code>ImageBitmapRenderingContext</code></a>.</p></li><li><p>Create a new <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-8"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object.</p></li><li><p>Initialize its <code id="the-imagebitmaprenderingcontext-interface:dom-context-2d-canvas-2"><a href="#dom-context-2d-canvas-2">canvas</a></code> attribute to point to
-   <var>target</var>.</p></li><li><p>Let the new <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-9"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object's <a href="#concept-imagebitmaprenderingcontext-output-bitmap" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-output-bitmap-9">output bitmap</a> and
-   <var>target</var>'s bitmap be a shared reference to the same bitmap.</p></li><li><p>Run the steps to <a href="#set-an-imagebitmaprenderingcontext's-output-bitmap" id="the-imagebitmaprenderingcontext-interface:set-an-imagebitmaprenderingcontext's-output-bitmap">set an <code>ImageBitmapRenderingContext</code>'s output
-   bitmap</a>, using the new <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-10"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object as the
-   <var>context</var> argument, and with no <var>bitmap</var> argument.</p></li><li><p>Initialize <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-alpha" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-alpha-3">alpha</a> flag to true.
-
-   </p></li><li>
-
-    <p>Process each of the members of <var>settings</var> as follows:</p>
-
-    <dl><dt><dfn id="dom-imagebitmaprenderingcontextsettings-alpha"><code>alpha</code></dfn></dt><dd>If false, then set <var>context</var>'s <a href="#concept-imagebitmaprenderingcontext-alpha" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmaprenderingcontext-alpha-4">alpha</a> flag to false.</dd></dl>
-
-   </li><li><p>Return the new <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-11"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object.</p></li></ol>
-
-  <hr/>
-
-  <p>When a user agent is required to <dfn id="coerce-context-arguments-for-imagebitmaprenderingcontext">coerce context arguments for
-  <code>ImageBitmapRenderingContext</code></dfn>, it must run these steps:</p>
-
-  <ol><li><p>Let <var>input</var> be the argument to coerce.</p></li><li><p>Let <var>jsval</var> be the result of <a data-x-internal="concept-idl-convert" href="https://heycam.github.io/webidl/#es-type-mapping" id="the-imagebitmaprenderingcontext-interface:concept-idl-convert">converting</a> <var>input</var> to a JavaScript value. (This can
-   throw an exception.)</p></li><li><p>Let <var>dict</var> be the result of <a data-x-internal="concept-idl-convert" href="https://heycam.github.io/webidl/#es-type-mapping" id="the-imagebitmaprenderingcontext-interface:concept-idl-convert-2">converting</a>
-   <var>jsval</var> to the dictionary type <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontextsettings"><a href="#imagebitmaprenderingcontextsettings">ImageBitmapRenderingContextSettings</a></code>. (This
-   can throw an exception.)</p></li><li><p>Return <var>dict</var>.</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-imagebitmaprenderingcontext-transferfromimagebitmap-2"><code>transferFromImageBitmap(<var>imageBitmap</var>)</code></dfn>
-  method, when invoked, must run these steps:</p>
-
-  <ol><li><p>Let <var>bitmapContext</var> be the <code id="the-imagebitmaprenderingcontext-interface:imagebitmaprenderingcontext-12"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code> object on
-   which the <code id="the-imagebitmaprenderingcontext-interface:dom-imagebitmaprenderingcontext-transferfromimagebitmap-2-4"><a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap()</a></code>
-   method was called.</p></li><li><p>If <var>imageBitmap</var> is null, then run the steps to <a href="#set-an-imagebitmaprenderingcontext's-output-bitmap" id="the-imagebitmaprenderingcontext-interface:set-an-imagebitmaprenderingcontext's-output-bitmap-2">set an
-   ImageBitmapRenderingContext's output bitmap</a>, with <var>bitmapContext</var> as the
-   <var>context</var> argument and no <var>bitmap</var> argument, then abort these steps.</p></li><li><p>If the value of <var>imageBitmap</var>'s <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="the-imagebitmaprenderingcontext-interface:detached">[[Detached]]</a> internal slot is set to
-   true, then throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-imagebitmaprenderingcontext-interface:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-imagebitmaprenderingcontext-interface:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and
-   abort these steps.</p></li><li><p>Run the steps to <a href="#set-an-imagebitmaprenderingcontext's-output-bitmap" id="the-imagebitmaprenderingcontext-interface:set-an-imagebitmaprenderingcontext's-output-bitmap-3">set an <code>ImageBitmapRenderingContext</code>'s output
-   bitmap</a>, with the <var>context</var> argument equal to <var>bitmapContext</var>, and the
-   <var>bitmap</var> argument referring to <var>imageBitmap</var>'s underlying <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data-5">bitmap data</a>.
-
-   </p></li><li><p>Set the value of <var>imageBitmap</var>'s <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="the-imagebitmaprenderingcontext-interface:detached-2">[[Detached]]</a> internal slot to
-   true.</p></li><li><p>Unset <var>imageBitmap's</var> <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#concept-imagebitmap-bitmap-data" id="the-imagebitmaprenderingcontext-interface:concept-imagebitmap-bitmap-data-6">bitmap
-   data</a>.</p></li></ol>
-
-  
-
-
-
-
-  <h5 id="the-offscreencanvas-interface"><span class="secno">4.12.5.3</span> The <code id="the-offscreencanvas-interface:offscreencanvas"><a href="#offscreencanvas">OffscreenCanvas</a></code> interface<a class="self-link" href="#the-offscreencanvas-interface"/></h5><div class="status"><input onclick="toggleStatus(this)" type="button" value="â‹°"/><p class="support"><strong>Support:</strong> offscreencanvas<span class="and_chr no"><span>Chrome for Android</span> <span>None</span></span><span class="chrome no"><span>Chrome</span> <span>None</span></span><span class="and_uc no"><span>UC Browser for Android</span> <span>None</span></span><span class="ios_saf no"><span>iOS Safari</span> <span>None</span></span><span class="firefox no"><span>Firefox</span> <span>None</span></span><span class="ie no"><span>IE</span> <span>None</span></span><span class="samsung no"><span>Samsung Internet</span> <span>None</span></span><span class="op_mini no"><span>Opera Mini</span> <span>None</span></span><span class="safari no"><span>Safari</span> <span>None</span></span><span class="android no"><span>Android Browser</span> <span>None</span></span><span class="opera no"><span>Opera</span> <span>None</span></span><span class="edge no"><span>Edge</span> <span>None</span></span></p><p class="caniuse">Source: <a href="https://caniuse.com/#feat=offscreencanvas">caniuse.com</a></p></div>
-
-  <pre class="idl">typedef (<a href="#offscreencanvasrenderingcontext2d" id="the-offscreencanvas-interface:offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a> or
-        <a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext" id="the-offscreencanvas-interface:webglrenderingcontext">WebGLRenderingContext</a>) <dfn id="offscreenrenderingcontext">OffscreenRenderingContext</dfn>;
-
-dictionary <dfn id="imageencodeoptions">ImageEncodeOptions</dfn> {
-  DOMString <a href="#image-encode-options-type" id="the-offscreencanvas-interface:image-encode-options-type">type</a> = &quot;image/png&quot;;
-  unrestricted double <a href="#image-encode-options-quality" id="the-offscreencanvas-interface:image-encode-options-quality">quality</a> = 1.0;
-};
-
-enum <dfn id="offscreenrenderingcontexttype">OffscreenRenderingContextType</dfn> { &quot;<a href="#offscreen-context-type-2d" id="the-offscreencanvas-interface:offscreen-context-type-2d">2d</a>&quot;, &quot;<a href="#offscreen-context-type-webgl" id="the-offscreencanvas-interface:offscreen-context-type-webgl">webgl</a>&quot; };
-
-[<a href="#dom-offscreencanvas-2" id="the-offscreencanvas-interface:dom-offscreencanvas-2">Constructor</a>([EnforceRange] unsigned long long width, [EnforceRange] unsigned long long height), Exposed=(Window,Worker), <a href="https://html.spec.whatwg.org/multipage/structured-data.html#transferable" id="the-offscreencanvas-interface:transferable">Transferable</a>]
-interface <dfn id="offscreencanvas">OffscreenCanvas</dfn> : <a data-x-internal="eventtarget" href="https://dom.spec.whatwg.org/#interface-eventtarget" id="the-offscreencanvas-interface:eventtarget">EventTarget</a> {
-  attribute unsigned long long <a href="#dom-offscreencanvas-width-2" id="the-offscreencanvas-interface:dom-offscreencanvas-width-2">width</a>;
-  attribute unsigned long long <a href="#dom-offscreencanvas-height-2" id="the-offscreencanvas-interface:dom-offscreencanvas-height-2">height</a>;
-
-  <a href="#offscreenrenderingcontext" id="the-offscreencanvas-interface:offscreenrenderingcontext">OffscreenRenderingContext</a>? <a href="#dom-offscreencanvas-getcontext-2" id="the-offscreencanvas-interface:dom-offscreencanvas-getcontext-2">getContext</a>(<a href="#offscreenrenderingcontexttype" id="the-offscreencanvas-interface:offscreenrenderingcontexttype">OffscreenRenderingContextType</a> contextType, any... arguments);
-  <a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap" id="the-offscreencanvas-interface:imagebitmap">ImageBitmap</a> <a href="#dom-offscreencanvas-transfertoimagebitmap-2" id="the-offscreencanvas-interface:dom-offscreencanvas-transfertoimagebitmap-2">transferToImageBitmap</a>();
-  Promise&lt;<a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob" id="the-offscreencanvas-interface:blob">Blob</a>&gt; <a href="#dom-offscreencanvas-converttoblob-2" id="the-offscreencanvas-interface:dom-offscreencanvas-converttoblob-2">convertToBlob</a>(optional <a href="#imageencodeoptions" id="the-offscreencanvas-interface:imageencodeoptions">ImageEncodeOptions</a> options);
-};
-</pre>
-
-  <p><code id="the-offscreencanvas-interface:offscreencanvas-2"><a href="#offscreencanvas">OffscreenCanvas</a></code> objects are used to create rendering contexts, much like an
-  <code id="the-offscreencanvas-interface:htmlcanvaselement"><a href="#htmlcanvaselement">HTMLCanvasElement</a></code>, but with no connection to the DOM. This makes it possible to
-  use canvas rendering contexts in <a href="https://html.spec.whatwg.org/multipage/workers.html#workers">workers</a>.</p>
-
-  <p>An <code id="the-offscreencanvas-interface:offscreencanvas-3"><a href="#offscreencanvas">OffscreenCanvas</a></code> object may hold a weak reference to a <dfn id="offscreencanvas-placeholder">placeholder <code>canvas</code> element</dfn>, which is
-  typically in the DOM, whose embedded content is provided by the <code id="the-offscreencanvas-interface:offscreencanvas-4"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-  object. The bitmap of the <code id="the-offscreencanvas-interface:offscreencanvas-5"><a href="#offscreencanvas">OffscreenCanvas</a></code> object is pushed to the <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder">placeholder <code>canvas</code> element</a> by
-  calling the <dfn id="offscreencontext-commit"><code>commit()</code></dfn> method of the
-  <code id="the-offscreencanvas-interface:offscreencanvas-6"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's rendering context. All rendering context types that
-  can be created by an <code id="the-offscreencanvas-interface:offscreencanvas-7"><a href="#offscreencanvas">OffscreenCanvas</a></code> object must implement a <code id="the-offscreencanvas-interface:offscreencontext-commit"><a href="#offscreencontext-commit">commit()</a></code> method. The exact behavior of the commit
-  method (e.g. whether it copies or transfers bitmaps) may vary, as defined by the rendering
-  contexts' respective specifications. Only the <a href="#offscreencanvasrenderingcontext2d" id="the-offscreencanvas-interface:offscreencanvasrenderingcontext2d-2">2D context for offscreen canvases</a> is defined
-  in this specification.</p>
-
-  <dl class="domintro"><dt><var>offscreenCanvas</var> = new <code id="dom-offscreencanvas"><a href="#dom-offscreencanvas-2">OffscreenCanvas</a></code>(<var>width</var>,
-   <var>height</var>)</dt><dt>
-
-   </dt><dd>
-
-    <p>Returns a new <code id="the-offscreencanvas-interface:offscreencanvas-8"><a href="#offscreencanvas">OffscreenCanvas</a></code> object that is not linked to a <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder-2">placeholder <code>canvas</code> element</a>, and
-    whose bitmap's size is determined by the <var>width</var> and <var>height</var> arguments.</p>
-
-   </dd><dt><var>context</var> = <var>offscreenCanvas</var> . <code id="dom-offscreencanvas-getcontext"><a href="#dom-offscreencanvas-getcontext-2">getContext</a></code>(<var>contextType</var> [, ... ] )</dt><dd>
-
-    <p>Returns an object that exposes an API for drawing on the <code id="the-offscreencanvas-interface:offscreencanvas-9"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-    object. The first argument specifies the desired API, either &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-2d-2"><a href="#offscreen-context-type-2d">2d</a></code>&quot;, or &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-webgl-2"><a href="#offscreen-context-type-webgl">webgl</a></code>&quot;. Subsequent arguments are handled by that
-    API.</p>
-
-    <p>This specification defines the &quot;<code id="the-offscreencanvas-interface:canvas-context-2d"><a href="#canvas-context-2d">2d</a></code>&quot; context below,
-    which is similar but distinct from the &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-2d-3"><a href="#offscreen-context-type-2d">2d</a></code>&quot;
-    context that is created from a <code id="the-offscreencanvas-interface:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element. There is also a specification that
-    defines a &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-webgl-3"><a href="#offscreen-context-type-webgl">webgl</a></code>&quot; context.
-    <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a></p>
-
-    <p>Returns null if the canvas has already been initialized with another context type (e.g.
-    trying to get a &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-2d-4"><a href="#offscreen-context-type-2d">2d</a></code>&quot; context after getting a
-    &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-webgl-4"><a href="#offscreen-context-type-webgl">webgl</a></code>&quot; context).</p>
-
-   </dd></dl>
-
-  
-
-  <p>An <code id="the-offscreencanvas-interface:offscreencanvas-10"><a href="#offscreencanvas">OffscreenCanvas</a></code> object has an internal <dfn id="offscreencanvas-bitmap">bitmap</dfn> that is initialized when the object
-  is created. The width and height of the <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap">bitmap</a> are
-  equal to the values of the <code id="the-offscreencanvas-interface:dom-offscreencanvas-width-2-2"><a href="#dom-offscreencanvas-width-2">width</a></code> and <code id="the-offscreencanvas-interface:dom-offscreencanvas-height-2-2"><a href="#dom-offscreencanvas-height-2">height</a></code> attributes of the <code id="the-offscreencanvas-interface:offscreencanvas-11"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-  object. Initially, all the bitmap's pixels are transparent black.</p>
-
-  <p>An <code id="the-offscreencanvas-interface:offscreencanvas-12"><a href="#offscreencanvas">OffscreenCanvas</a></code> object can have a rendering context bound to it. Initially,
-  it does not have a bound rendering context. To keep track of whether it has a rendering context
-  or not, and what kind of rendering context it is, an <code id="the-offscreencanvas-interface:offscreencanvas-13"><a href="#offscreencanvas">OffscreenCanvas</a></code> object also
-  has a <dfn id="offscreencanvas-context-mode">context mode</dfn>, which is initially <dfn id="offscreencanvas-context-none">none</dfn> but can be changed to either <dfn id="offscreencanvas-context-2d">2d</dfn>, <dfn id="offscreencanvas-context-webgl">webgl</dfn> or <dfn id="offscreencanvas-context-detached">detached</dfn> by algorithms defined in this
-  specification.</p>
-
-  <p>The constructor <dfn id="dom-offscreencanvas-2"><code>OffscreenCanvas(<var>width</var>,
-  <var>height</var>)</code></dfn>, when invoked, must create a new <code id="the-offscreencanvas-interface:offscreencanvas-14"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-  object with its <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-2">bitmap</a> initialized to a rectangular
-  array of transparent black pixels of the dimensions specified by <var>width</var> and
-  <var>height</var>; and its <code id="the-offscreencanvas-interface:dom-offscreencanvas-width-2-3"><a href="#dom-offscreencanvas-width-2">width</a></code> and <code id="the-offscreencanvas-interface:dom-offscreencanvas-height-2-3"><a href="#dom-offscreencanvas-height-2">height</a></code> attributes initialized to <var>width</var> and
-  <var>height</var> respectively.</p>
-
-  <hr/>
-
-  <p><code id="the-offscreencanvas-interface:offscreencanvas-15"><a href="#offscreencanvas">OffscreenCanvas</a></code> objects are <a href="https://html.spec.whatwg.org/multipage/structured-data.html#transferable-objects" id="the-offscreencanvas-interface:transferable-objects">transferable</a>. Their <a href="https://html.spec.whatwg.org/multipage/structured-data.html#transfer-steps" id="the-offscreencanvas-interface:transfer-steps">transfer steps</a>, given <var>value</var> and
-  <var>dataHolder</var>, are as follows:</p>
-
-  <ol><li><p>If <var>value</var>'s <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode">context mode</a> is
-   not equal to <a href="#offscreencanvas-context-none" id="the-offscreencanvas-interface:offscreencanvas-context-none">none</a>, then throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p></li><li><p>Set <var>value</var>'s <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-2">context mode</a> to
-   <a href="#offscreencanvas-context-detached" id="the-offscreencanvas-interface:offscreencanvas-context-detached">detached</a>.</p></li><li><p>Let <var>width</var> and <var>height</var> be the dimensions of <var>value</var>'s <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-3">bitmap</a>.</p></li><li><p>Unset <var>value</var>'s <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-4">bitmap</a>.</p></li><li><p>Set <var>dataHolder</var>.[[With]] to <var>width</var>, and
-   <var>dataHolder</var>.[[Height]] to <var>height</var>.</p></li><li><p>Set <var>dataHolder</var>.[[PlaceholderCanvas]] to be a weak reference to
-   <var>value</var>'s <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder-3">placeholder <code>canvas</code>
-   element</a>, if <var>value</var> has one, or null if it does not.</p></li></ol>
-
-  <p>Their <a href="https://html.spec.whatwg.org/multipage/structured-data.html#transfer-receiving-steps" id="the-offscreencanvas-interface:transfer-receiving-steps">transfer-receiving steps</a>, given <var>dataHolder</var> and <var>value</var>,
-  are:</p>
-
-  <ol><li><p>Initialize <var>value</var>'s <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-5">bitmap</a> to a
-   rectangular array of transparent black pixels with width given by <var>dataHolder</var>.[[Width]]
-   and height given by <var>dataHolder</var>.[[Height]].</p></li><li><p>If <var>dataHolder</var>.[[PlaceholderCanvas]] is not null, set <var>value</var>'s <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder-4">placeholder <code>canvas</code> element</a> to
-   <var>dataHolder</var>.[[PlaceholderCanvas]] (while maintaining the weak reference
-   semantics).</p></li></ol>
-
-  <hr/>
-
-  <p>The <dfn id="dom-offscreencanvas-getcontext-2"><code>getContext(<var>contextId</var>,
-  <var>arguments...</var>)</code></dfn> method of an <code id="the-offscreencanvas-interface:offscreencanvas-16"><a href="#offscreencanvas">OffscreenCanvas</a></code> object, when
-  invoked, must run the steps in the cell of the following table whose column header describes the
-  <code id="the-offscreencanvas-interface:offscreencanvas-17"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-3">context
-  mode</a> and whose row header describes the method's first argument.</p>
-
-  <table><thead><tr><td>
-     </td><th><a href="#offscreencanvas-context-none" id="the-offscreencanvas-interface:offscreencanvas-context-none-2">none</a>
-     </th><th><a href="#offscreencanvas-context-2d" id="the-offscreencanvas-interface:offscreencanvas-context-2d">2d</a>
-     </th><th><a href="#offscreencanvas-context-webgl" id="the-offscreencanvas-interface:offscreencanvas-context-webgl">webgl</a>
-     </th><th><a href="#offscreencanvas-context-detached" id="the-offscreencanvas-interface:offscreencanvas-context-detached-2">detached</a>
-   </th></tr></thead><tbody><tr><th>&quot;<dfn id="offscreen-context-type-2d"><code>2d</code></dfn>&quot;
-     </th><td>
-      Follow the steps to <a href="#offscreen-2d-context-creation-algorithm" id="the-offscreencanvas-interface:offscreen-2d-context-creation-algorithm">create an
-      offscreen 2D context</a> defined in the section below, passing it the
-      <code id="the-offscreencanvas-interface:offscreencanvas-18"><a href="#offscreencanvas">OffscreenCanvas</a></code> object and the method's <var>arguments...</var>, to obtain
-      an <code id="the-offscreencanvas-interface:offscreencanvasrenderingcontext2d-3"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object; if this does not throw an
-      exception, then set the <code id="the-offscreencanvas-interface:offscreencanvas-19"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-4">context mode</a> to <a href="#offscreencanvas-context-2d" id="the-offscreencanvas-interface:offscreencanvas-context-2d-2">2d</a>, and return the new
-      <code id="the-offscreencanvas-interface:offscreencanvasrenderingcontext2d-4"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object.
-     </td><td>
-      Return the same object as was returned the last time the method was invoked with this same
-      first argument.
-     </td><td>
-      Return null.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror-2">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-2"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-    </td></tr><tr><th>&quot;<dfn id="offscreen-context-type-webgl"><code>webgl</code></dfn>&quot;
-     </th><td>
-      Follow the instructions given in the WebGL specification's <i>Context Creation</i> section to
-      obtain either a <code id="the-offscreencanvas-interface:webglrenderingcontext-2"><a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext">WebGLRenderingContext</a></code> or null; if the returned value is null,
-      then return null and abort these steps, otherwise, set the <code id="the-offscreencanvas-interface:offscreencanvas-20"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-      object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-5">context mode</a> to <a href="#offscreencanvas-context-webgl" id="the-offscreencanvas-interface:offscreencanvas-context-webgl-2">webgl</a>, and return the
-      <code id="the-offscreencanvas-interface:webglrenderingcontext-3"><a data-x-internal="webglrenderingcontext" href="https://www.khronos.org/registry/webgl/specs/latest/1.0/#WebGLRenderingContext">WebGLRenderingContext</a></code> object. <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a>
-     </td><td>
-      Return null.
-     </td><td>
-      Return the same value as was returned the last time the method was invoked with this same
-      first argument.
-     </td><td>
-      Throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror-3">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-3"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.
-
-  </td></tr></tbody></table>
-
-  <hr/>
-
-  
-
-  <dl class="domintro"><dt><var>offscreenCanvas</var> . <code id="dom-offscreencanvas-width"><a href="#dom-offscreencanvas-width-2">width</a></code> [
-   = <var>value</var> ]</dt><dt><var>offscreenCanvas</var> . <code id="dom-offscreencanvas-height"><a href="#dom-offscreencanvas-height-2">height</a></code> [
-   = <var>value</var> ]</dt><dd>
-    <p>These attributes return the dimensions of the <code id="the-offscreencanvas-interface:offscreencanvas-21"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-6">bitmap</a>.</p>
-
-    <p>They can be set, to replace the <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-7">bitmap</a> with a
-    new, transparent black bitmap of the specified dimensions (effectively resizing it).</p>
-   </dd></dl>
-
-  
-
-  <p>If either the <dfn id="dom-offscreencanvas-width-2"><code>width</code></dfn> or <dfn id="dom-offscreencanvas-height-2"><code>height</code></dfn> attributes of an
-  <code id="the-offscreencanvas-interface:offscreencanvas-22"><a href="#offscreencanvas">OffscreenCanvas</a></code> object are set (to a new value or to the same value as before) and
-  the <code id="the-offscreencanvas-interface:offscreencanvas-23"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-6">context
-  mode</a> is <a href="#offscreencanvas-context-2d" id="the-offscreencanvas-interface:offscreencanvas-context-2d-3">2d</a>, then replace the
-  <code id="the-offscreencanvas-interface:offscreencanvas-24"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-8">bitmap</a> with a
-  new transparent black bitmap and <a href="#reset-the-rendering-context-to-its-default-state" id="the-offscreencanvas-interface:reset-the-rendering-context-to-its-default-state">reset the rendering context to its default state</a>.
-  The new bitmap's dimensions are equal to the new values of the <code id="the-offscreencanvas-interface:dom-offscreencanvas-width-2-4"><a href="#dom-offscreencanvas-width-2">width</a></code> and <code id="the-offscreencanvas-interface:dom-offscreencanvas-height-2-4"><a href="#dom-offscreencanvas-height-2">height</a></code> attributes.</p>
-
-  <p>The resizing behavior for &quot;<code id="the-offscreencanvas-interface:offscreen-context-type-webgl-5"><a href="#offscreen-context-type-webgl">webgl</a></code>&quot;
-  contexts is defined in the WebGL specification. <a href="https://html.spec.whatwg.org/multipage/references.html#refsWEBGL">[WEBGL]</a></p>
-
-  
-
-  <p class="note">If an <code id="the-offscreencanvas-interface:offscreencanvas-25"><a href="#offscreencanvas">OffscreenCanvas</a></code> object whose dimensions were changed has
-  a <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder-5">placeholder <code>canvas</code> element</a>, then
-  the <a href="#offscreencanvas-placeholder" id="the-offscreencanvas-interface:offscreencanvas-placeholder-6">placeholder <code>canvas</code> element</a>'s
-  <a data-x-internal="intrinsic-dimensions" href="https://drafts.csswg.org/css2/conform.html#intrinsic" id="the-offscreencanvas-interface:intrinsic-dimensions">intrinsic size</a> will only be updated via the <code id="the-offscreencanvas-interface:offscreencontext-commit-2"><a href="#offscreencontext-commit">commit()</a></code> method of the <code id="the-offscreencanvas-interface:offscreencanvas-26"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-  object's rendering context.</p>
-
-  <dl class="domintro"><dt><var>promise</var> = <var>offscreenCanvas</var> . <code id="dom-offscreencanvas-converttoblob"><a href="#dom-offscreencanvas-converttoblob-2">convertToBlob</a></code>( [<var>options</var>] )</dt><dd>
-    <p>Returns a promise that will fulfill with a new <code id="the-offscreencanvas-interface:blob-2"><a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob">Blob</a></code> object representing a file
-    containing the image in the <code id="the-offscreencanvas-interface:offscreencanvas-27"><a href="#offscreencanvas">OffscreenCanvas</a></code> object.</p>
-
-    <p>The argument, if provided, is a dictionary that controls the encoding options of the image
-    file to be created. The <code id="the-offscreencanvas-interface:image-encode-options-type-2"><a href="#image-encode-options-type">type</a></code>
-    field specifies the file format and has a default value of &quot;<code id="the-offscreencanvas-interface:image/png"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot;; that type
-    is also used if the requested type isn't supported. If the image format supports variable
-    quality (such as &quot;<code id="the-offscreencanvas-interface:image/jpeg"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/jpeg">image/jpeg</a></code>&quot;), then the <code id="the-offscreencanvas-interface:image-encode-options-quality-2"><a href="#image-encode-options-quality">quality</a></code> field is a number in the range 0.0
-    to 1.0 inclusive indicating the desired quality level for the resulting image.</p>
-   </dd><dt><var>canvas</var> . <code id="dom-offscreencanvas-transfertoimagebitmap"><a href="#dom-offscreencanvas-transfertoimagebitmap-2">transferToImageBitmap</a></code>()</dt><dd>
-    <p>Returns a newly created <code id="the-offscreencanvas-interface:imagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> object with the image in the
-    <code id="the-offscreencanvas-interface:offscreencanvas-28"><a href="#offscreencanvas">OffscreenCanvas</a></code> object. The image in the <code id="the-offscreencanvas-interface:offscreencanvas-29"><a href="#offscreencanvas">OffscreenCanvas</a></code> object is
-    replaced with a new blank image.</p>
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="dom-offscreencanvas-converttoblob-2"><code>convertToBlob(<var>options</var>)</code></dfn> method,
-  when invoked, must run the following steps:</p>
-
-  <ol><li><p>If the value of this <code id="the-offscreencanvas-interface:offscreencanvas-30"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="the-offscreencanvas-interface:detached">[[Detached]]</a>
-   internal slot is set to true, then return a promise rejected with an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror-4">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-4"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-   steps.</p></li><li><p>If this <code id="the-offscreencanvas-interface:offscreencanvas-31"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-7">context mode</a> is <a href="#offscreencanvas-context-2d" id="the-offscreencanvas-interface:offscreencanvas-context-2d-4">2d</a> and the rendering context's <a href="#offscreencontext2d-bitmap" id="the-offscreencanvas-interface:offscreencontext2d-bitmap">bitmap</a>'s <a href="#offscreencontext2d-origin-clean" id="the-offscreencanvas-interface:offscreencontext2d-origin-clean">origin-clean</a> flag is set to false, then return a
-   promise rejected with a <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="the-offscreencanvas-interface:securityerror">&quot;<code>SecurityError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-5"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and
-   abort these steps.</p>
-
-   </li><li><p>If this <code id="the-offscreencanvas-interface:offscreencanvas-32"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-9">bitmap</a> has no pixels (i.e. either its
-   horizontal dimension or its vertical dimension is zero) then return a promise rejected with an
-   <a data-x-internal="indexsizeerror" href="https://heycam.github.io/webidl/#indexsizeerror" id="the-offscreencanvas-interface:indexsizeerror">&quot;<code>IndexSizeError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-6"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-   steps.</p></li><li><p>Let <var>result</var> be a new promise object.</p></li><li><p>Return <var>result</var>, and <a href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="the-offscreencanvas-interface:queue-a-task">queue a task</a> to run the remaining steps
-   <a href="https://html.spec.whatwg.org/multipage/infrastructure.html#in-parallel" id="the-offscreencanvas-interface:in-parallel">in parallel</a>.</p></li><li><p>Let <var>blob</var> be a <code id="the-offscreencanvas-interface:blob-3"><a data-x-internal="blob" href="https://w3c.github.io/FileAPI/#blob">Blob</a></code> object, created in the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-relevant-realm" id="the-offscreencanvas-interface:concept-relevant-realm">relevant Realm</a> of this <code id="the-offscreencanvas-interface:offscreencanvas-33"><a href="#offscreencanvas">OffscreenCanvas</a></code>
-   object, representing <a href="#a-serialisation-of-the-bitmap-as-a-file" id="the-offscreencanvas-interface:a-serialisation-of-the-bitmap-as-a-file">a serialization of
-   this <code>OffscreenCanvas</code> object's <span>bitmap</span> as
-   a file</a>, passing the values of the <dfn id="image-encode-options-type"><code>type</code></dfn> and <dfn id="image-encode-options-quality"><code>quality</code></dfn> fields of <var>options</var>, if
-   <var>options</var> was specified. <a href="https://html.spec.whatwg.org/multipage/references.html#refsFILEAPI">[FILEAPI]</a></p></li><li><p>If <var>blob</var> is null, then reject <var>result</var> with an
-   <a data-x-internal="encodingerror" href="https://heycam.github.io/webidl/#encodingerror" id="the-offscreencanvas-interface:encodingerror">&quot;<code>EncodingError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-7"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code>.</p></li><li><p>Otherwise, resolve <var>result</var> with <var>blob</var>.</p></li></ol>
-
-  <p>The <dfn id="dom-offscreencanvas-transfertoimagebitmap-2"><code>transferToImageBitmap()</code></dfn> method,
-  when invoked, must run the following steps:</p>
-  <ol><li><p>If the value of this <code id="the-offscreencanvas-interface:offscreencanvas-34"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="https://html.spec.whatwg.org/multipage/structured-data.html#detached" id="the-offscreencanvas-interface:detached-2">[[Detached]]</a>
-   internal slot is set to true, then throw an <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror-5">&quot;<code>InvalidStateError</code>&quot;</a>
-   <code id="the-offscreencanvas-interface:domexception-8"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these steps.</p></li><li><p>If this <code id="the-offscreencanvas-interface:offscreencanvas-35"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-context-mode" id="the-offscreencanvas-interface:offscreencanvas-context-mode-8">context mode</a> is set to <a href="#offscreencanvas-context-none" id="the-offscreencanvas-interface:offscreencanvas-context-none-3">none</a>, then throw an
-   <a data-x-internal="invalidstateerror" href="https://heycam.github.io/webidl/#invalidstateerror" id="the-offscreencanvas-interface:invalidstateerror-6">&quot;<code>InvalidStateError</code>&quot;</a> <code id="the-offscreencanvas-interface:domexception-9"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> and abort these
-   steps.</p></li><li><p>Let <var>image</var> be a newly created <code id="the-offscreencanvas-interface:imagebitmap-3"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> object that references
-   the same underlying bitmap data as this <code id="the-offscreencanvas-interface:offscreencanvas-36"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-10">bitmap</a>.</p></li><li><p>Set this <code id="the-offscreencanvas-interface:offscreencanvas-37"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-bitmap" id="the-offscreencanvas-interface:offscreencanvas-bitmap-11">bitmap</a> to reference a newly created bitmap of the
-   same dimensions as the previous bitmap, and with its pixels initialized to transparent black,
-   or opaque black if the rendering context's <a href="#offscreencontext2d-alpha" id="the-offscreencanvas-interface:offscreencontext2d-alpha">alpha</a> flag is set to false.</p></li><li><p>Return <var>image</var>.</p></li></ol>
-  
-
-  <h6 id="the-offscreen-2d-rendering-context"><span class="secno">4.12.5.3.1</span> The offscreen 2D rendering context<a class="self-link" href="#the-offscreen-2d-rendering-context"/></h6>
-
-  <pre class="idl">[Exposed=(Window,Worker)]
-interface <a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a> {
-  void <a href="#offscreencontext2d-commit-2" id="the-offscreen-2d-rendering-context:offscreencontext2d-commit-2">commit</a>();
-  readonly attribute <a href="#offscreencanvas" id="the-offscreen-2d-rendering-context:offscreencanvas">OffscreenCanvas</a> <a href="#offscreencontext2d-canvas-2" id="the-offscreen-2d-rendering-context:offscreencontext2d-canvas-2">canvas</a>;
-};
-
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-2">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasstate" id="the-offscreen-2d-rendering-context:canvasstate">CanvasState</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-3">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvastransform" id="the-offscreen-2d-rendering-context:canvastransform">CanvasTransform</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-4">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvascompositing" id="the-offscreen-2d-rendering-context:canvascompositing">CanvasCompositing</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-5">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasimagesmoothing" id="the-offscreen-2d-rendering-context:canvasimagesmoothing">CanvasImageSmoothing</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-6">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasfillstrokestyles" id="the-offscreen-2d-rendering-context:canvasfillstrokestyles">CanvasFillStrokeStyles</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-7">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasshadowstyles" id="the-offscreen-2d-rendering-context:canvasshadowstyles">CanvasShadowStyles</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-8">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasfilters" id="the-offscreen-2d-rendering-context:canvasfilters">CanvasFilters</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-9">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasrect" id="the-offscreen-2d-rendering-context:canvasrect">CanvasRect</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-10">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasdrawpath" id="the-offscreen-2d-rendering-context:canvasdrawpath">CanvasDrawPath</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-11">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasdrawimage" id="the-offscreen-2d-rendering-context:canvasdrawimage">CanvasDrawImage</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-12">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvasimagedata" id="the-offscreen-2d-rendering-context:canvasimagedata">CanvasImageData</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-13">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvaspathdrawingstyles" id="the-offscreen-2d-rendering-context:canvaspathdrawingstyles">CanvasPathDrawingStyles</a>;
-<a href="#offscreencanvasrenderingcontext2d" id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-14">OffscreenCanvasRenderingContext2D</a> implements <a href="#canvaspath" id="the-offscreen-2d-rendering-context:canvaspath">CanvasPath</a>;
-</pre>
-
-  <p>The <dfn id="offscreencanvasrenderingcontext2d"><code>OffscreenCanvasRenderingContext2D</code></dfn> is a rendering context
-  interface for drawing to the <a href="#offscreencanvas-bitmap" id="the-offscreen-2d-rendering-context:offscreencanvas-bitmap">bitmap</a> of an
-  <code id="the-offscreen-2d-rendering-context:offscreencanvas-2"><a href="#offscreencanvas">OffscreenCanvas</a></code> object. It is similar to <code id="the-offscreen-2d-rendering-context:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code>,
-  with the following differences:</p>
-  <ul><li><p><a href="#canvastext" id="the-offscreen-2d-rendering-context:canvastext">text rendering</a> is not supported;</p></li><li><p>there is no support for <a href="#canvasuserinterface" id="the-offscreen-2d-rendering-context:canvasuserinterface">user interface</a>
-   features;</p></li><li><p>its <code id="the-offscreen-2d-rendering-context:offscreencontext2d-canvas-2-2"><a href="#offscreencontext2d-canvas-2">canvas</a></code> attribute refers to an
-   <code id="the-offscreen-2d-rendering-context:offscreencanvas-3"><a href="#offscreencanvas">OffscreenCanvas</a></code> object rather than a <code id="the-offscreen-2d-rendering-context:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> element;</p></li><li><p>it has a <code id="the-offscreen-2d-rendering-context:offscreencontext2d-commit-2-2"><a href="#offscreencontext2d-commit-2">commit()</a></code> method for pushing the
-   rendered image to the context's <code id="the-offscreen-2d-rendering-context:offscreencanvas-4"><a href="#offscreencanvas">OffscreenCanvas</a></code> object's <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder">placeholder <code>canvas</code> element</a>.</p></li></ul>
-
-  <p>An <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-15"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object has a <dfn id="offscreencontext2d-bitmap">bitmap</dfn> that is initialized when the object is
-  created.</p>
-
-  <p>The <a href="#offscreencontext2d-bitmap" id="the-offscreen-2d-rendering-context:offscreencontext2d-bitmap">bitmap</a> has an <dfn id="offscreencontext2d-origin-clean">origin-clean</dfn> flag, which can be set to true or
-  false. Initially, when one of these bitmaps is created, its <a href="#offscreencontext2d-origin-clean" id="the-offscreen-2d-rendering-context:offscreencontext2d-origin-clean">origin-clean</a> flag must be set to true.</p>
-
-  <p>An <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-16"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object also has an <dfn id="offscreencontext2d-alpha">alpha</dfn> flag, which can be set to true or false. Initially,
-  when the context is created, its alpha flag must be set to true. When an
-  <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-17"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object has its <a href="#offscreencontext2d-alpha" id="the-offscreen-2d-rendering-context:offscreencontext2d-alpha">alpha</a> flag set to false, then its alpha channel must be
-  fixed to 1.0 (fully opaque) for all pixels, and attempts to change the alpha component of any pixel
-  must be silently ignored.</p>
-
-  <p>An <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-18"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object has an <dfn id="associated-offscreencanvas-object">associated
-  <code>OffscreenCanvas</code> object</dfn>, which is the <code id="the-offscreen-2d-rendering-context:offscreencanvas-5"><a href="#offscreencanvas">OffscreenCanvas</a></code> object
-  from which the <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-19"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code> object was created.
-
-  </p><dl class="domintro"><dt><var>offscreenCanvasRenderingContext2D</var> . <code id="offscreencontext2d-commit"><a href="#offscreencontext2d-commit-2">commit</a></code>()</dt><dd>
-    <p>Copies the rendering context's <a href="#offscreencontext2d-bitmap" id="the-offscreen-2d-rendering-context:offscreencontext2d-bitmap-2">bitmap</a> to
-    the bitmap of the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-2">placeholder <code>canvas</code>
-    element</a> of the <a href="#associated-offscreencanvas-object" id="the-offscreen-2d-rendering-context:associated-offscreencanvas-object">associated <code>OffscreenCanvas</code> object</a>. The copy
-    operation is asynchronous.</p>
-   </dd><dt><var>offscreenCanvas</var> = <var>offscreenCanvasRenderingContext2D</var> . <code id="offscreencontext2d-canvas"><a href="#offscreencontext2d-canvas-2">canvas</a></code></dt><dd>
-    <p>Returns the <a href="#associated-offscreencanvas-object" id="the-offscreen-2d-rendering-context:associated-offscreencanvas-object-2">associated <code>OffscreenCanvas</code> object</a>.</p>
-   </dd></dl>
-
-  
-
-  <p>The <dfn id="offscreen-2d-context-creation-algorithm">offscreen 2D context creation algorithm</dfn>, which is passed a
-  <var>target</var> (an <code id="the-offscreen-2d-rendering-context:offscreencanvas-6"><a href="#offscreencanvas">OffscreenCanvas</a></code> object) and optionally some arguments,
-  consists of running the following steps:</p>
-
-  <ol><li><p>If the algorithm was passed some arguments, let <var>arg</var> be the first such
-   argument. Otherwise, let <var>arg</var> be undefined.</p></li><li><p>Let <var>settings</var> be the result of <a href="#coerce-context-arguments-for-2d" id="the-offscreen-2d-rendering-context:coerce-context-arguments-for-2d">coercing the <var>arg</var> context arguments
-   for 2D</a>.</p></li><li><p>Let <var>context</var> be a new <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-20"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code>
-   object.</p></li><li><p>Set <var>context</var>'s <a href="#associated-offscreencanvas-object" id="the-offscreen-2d-rendering-context:associated-offscreencanvas-object-3">associated <code>OffscreenCanvas</code> object</a> to
-   <var>target</var>.</p></li><li><p>Process each of the members of <var>settings</var> as follows:</p>
-    <dl><dt><code id="the-offscreen-2d-rendering-context:dom-canvasrenderingcontext2dsettings-alpha"><a href="#dom-canvasrenderingcontext2dsettings-alpha">alpha</a></code></dt><dd>If false, set <var>context</var>'s <a href="#offscreencontext2d-alpha" id="the-offscreen-2d-rendering-context:offscreencontext2d-alpha-2">alpha</a>
-     flag to false.</dd></dl>
-   </li><li><p>Set <var>context</var>'s <a href="#offscreencontext2d-bitmap" id="the-offscreen-2d-rendering-context:offscreencontext2d-bitmap-3">bitmap</a> to a newly
-   created bitmap with the dimensions specified by the <code id="the-offscreen-2d-rendering-context:dom-offscreencanvas-width-2"><a href="#dom-offscreencanvas-width-2">width</a></code> and <code id="the-offscreen-2d-rendering-context:dom-offscreencanvas-height-2"><a href="#dom-offscreencanvas-height-2">height</a></code> attributes of <var>target</var>, and set
-   <var>target</var>'s bitmap to the same bitmap (so that they are shared).</p></li><li><p>If <var>context</var>'s <a href="#offscreencontext2d-alpha" id="the-offscreen-2d-rendering-context:offscreencontext2d-alpha-3">alpha</a> flag is set
-   to true, initialize all the pixels of <var>context</var>'s <a href="#offscreencontext2d-bitmap" id="the-offscreen-2d-rendering-context:offscreencontext2d-bitmap-4">bitmap</a> to transparent black. Otherwise, initialize
-   the pixels to opaque black.</p></li><li><p>Return <var>context</var>.</p></li></ol>
-
-  <p>The <dfn id="offscreencontext2d-commit-2"><code>commit()</code></dfn> method, when invoked,
-  must run the following steps:</p>
-
-  <ol><li><p>If this <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-21"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code>'s <a href="#associated-offscreencanvas-object" id="the-offscreen-2d-rendering-context:associated-offscreencanvas-object-4">associated
-    <code>OffscreenCanvas</code> object</a> does not have a <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-3">placeholder <code>canvas</code> element</a>, abort
-    these steps.</p></li><li><p>Let <var>image</var> be a copy of this <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-22"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code>'s
-    <a href="#offscreencontext2d-bitmap" id="the-offscreen-2d-rendering-context:offscreencontext2d-bitmap-5">bitmap</a>, including the value of its <a href="#offscreencontext2d-origin-clean" id="the-offscreen-2d-rendering-context:offscreencontext2d-origin-clean-2">origin-clean</a> flag.</p></li><li>
-     <p><a href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task" id="the-offscreen-2d-rendering-context:queue-a-task">Queue a task</a> in the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-4">placeholder <code>canvas</code> element</a>'s
-     <a href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object" id="the-offscreen-2d-rendering-context:relevant-settings-object">relevant settings object</a>'s <a href="https://html.spec.whatwg.org/multipage/webappapis.html#responsible-event-loop" id="the-offscreen-2d-rendering-context:responsible-event-loop">responsible event loop</a> (which will be a
-     <a href="https://html.spec.whatwg.org/multipage/browsers.html#browsing-context" id="the-offscreen-2d-rendering-context:browsing-context">browsing context</a> <a href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="the-offscreen-2d-rendering-context:event-loop">event loop</a>) to set the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-5">placeholder <code>canvas</code> element</a>'s
-     <a href="#output-bitmap" id="the-offscreen-2d-rendering-context:output-bitmap">output bitmap</a> to be a reference to <var>image</var>.</p>
-
-     <p class="note">If <var>image</var> has different dimensions than the bitmap previously
-     referenced as the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-6">placeholder <code>canvas</code>
-     element</a>'s <a href="#output-bitmap" id="the-offscreen-2d-rendering-context:output-bitmap-2">output bitmap</a>, then this task will result in a change in
-     the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-7">placeholder <code>canvas</code>
-     element</a>'s <a data-x-internal="intrinsic-dimensions" href="https://drafts.csswg.org/css2/conform.html#intrinsic" id="the-offscreen-2d-rendering-context:intrinsic-dimensions">intrinsic size</a>, which can affect
-     document layout.</p>
-    </li></ol>
-
-  <p class="note">Implementations are encouraged to short-circuit the graphics update steps of
-  the <a href="https://html.spec.whatwg.org/multipage/browsers.html#browsing-context" id="the-offscreen-2d-rendering-context:browsing-context-2">browsing context</a> <a href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="the-offscreen-2d-rendering-context:event-loop-2">event loop</a> for the purposes of updating the
-  contents of a <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-8">placeholder <code>canvas</code>
-  element</a> to the display. This could mean, for example, that the <code id="the-offscreen-2d-rendering-context:offscreencontext2d-commit-2-3"><a href="#offscreencontext2d-commit-2">commit()</a></code> method can copy the bitmap contents directly
-  to a graphics buffer that is mapped to the physical display location of the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-9">placeholder <code>canvas</code> element</a>. This or
-  similar short-circuiting approaches can significantly reduce display latency, especially in cases
-  where the <code id="the-offscreen-2d-rendering-context:offscreencontext2d-commit-2-4"><a href="#offscreencontext2d-commit-2">commit()</a></code> method is invoked from a worker
-  and the <a href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop" id="the-offscreen-2d-rendering-context:event-loop-3">event loop</a> of the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-10">placeholder <code>canvas</code> element</a>'s
-  <a href="https://html.spec.whatwg.org/multipage/browsers.html#browsing-context" id="the-offscreen-2d-rendering-context:browsing-context-3">browsing context</a> is busy. However, such shortcuts can not have any
-  script-observable side-effects. This means that the committed bitmap still needs to be sent to
-  the <a href="#offscreencanvas-placeholder" id="the-offscreen-2d-rendering-context:offscreencanvas-placeholder-11">placeholder <code>canvas</code> element</a>, in
-  case the element is used as a <code id="the-offscreen-2d-rendering-context:canvasimagesource"><a href="#canvasimagesource">CanvasImageSource</a></code>, as an
-  <code id="the-offscreen-2d-rendering-context:imagebitmapsource"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmapsource">ImageBitmapSource</a></code>, or in case <code id="the-offscreen-2d-rendering-context:dom-canvas-todataurl-2"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code>
-  or <code id="the-offscreen-2d-rendering-context:dom-canvas-toblob-2"><a href="#dom-canvas-toblob-2">toBlob()</a></code> are called on it.</p>
-
-  <p>The <dfn id="offscreencontext2d-canvas-2"><code>canvas</code></dfn> attribute, on getting,
-  must return this <code id="the-offscreen-2d-rendering-context:offscreencanvasrenderingcontext2d-23"><a href="#offscreencanvasrenderingcontext2d">OffscreenCanvasRenderingContext2D</a></code>'s <a href="#associated-offscreencanvas-object" id="the-offscreen-2d-rendering-context:associated-offscreencanvas-object-5">associated
-  <code>OffscreenCanvas</code> object</a>.
-
-  </p>
-
-  
-
-  <h5 id="colour-spaces-and-colour-correction"><span class="secno">4.12.5.4</span> Color spaces and color correction<a class="self-link" href="#colour-spaces-and-colour-correction"/></h5>
-
-  <p>The <code id="colour-spaces-and-colour-correction:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> APIs must perform color correction at only two points: when rendering
-  images with their own gamma correction and color space information onto a bitmap, to convert the
-  image to the color space used by the bitmaps (e.g. using the 2D Context's <code id="colour-spaces-and-colour-correction:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage()</a></code> method with an
-  <code id="colour-spaces-and-colour-correction:htmlorsvgimageelement"><a href="#htmlorsvgimageelement">HTMLOrSVGImageElement</a></code> object), and when rendering the actual canvas bitmap to the
-  output device.</p>
-
-  <p class="note">Thus, in the 2D context, colors used to draw shapes onto the canvas will exactly
-  match colors obtained through the <code id="colour-spaces-and-colour-correction:dom-context-2d-getimagedata-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code> method.</p>
-
-  <p>The <code id="colour-spaces-and-colour-correction:dom-canvas-todataurl-2"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code> method, when invoked, must not
-  include color space information in the resources they return. Where the output format allows it,
-  the color of pixels in resources created by <code id="colour-spaces-and-colour-correction:dom-canvas-todataurl-2-2"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code>
-  must match those returned by the <code id="colour-spaces-and-colour-correction:dom-context-2d-getimagedata-2-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code>
-  method.</p>
-
-  <p>In user agents that support CSS, the color space used by a <code id="colour-spaces-and-colour-correction:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> element must
-  match the color space used for processing any colors for that element in CSS.</p>
-
-  <p>The gamma correction and color space information of images must be handled in such a way that
-  an image rendered directly using an <code id="colour-spaces-and-colour-correction:the-img-element"><a href="https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element">img</a></code> element would use the same colors as one
-  painted on a <code id="colour-spaces-and-colour-correction:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element that is then itself rendered. Furthermore, the rendering
-  of images that have no color correction information (such as those returned by the <code id="colour-spaces-and-colour-correction:dom-canvas-todataurl-2-3"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code> method) must be rendered with no color
-  correction.</p>
-
-  <p class="note">Thus, in the 2D context, calling the <code id="colour-spaces-and-colour-correction:dom-context-2d-drawimage-2"><a href="#dom-context-2d-drawimage">drawImage()</a></code> method to render the output of the <code id="colour-spaces-and-colour-correction:dom-canvas-todataurl-2-4"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code> method to the canvas, given the appropriate
-  dimensions, has no visible effect.</p>
-
-  
-
-
-
-  <h5 id="serialising-bitmaps-to-a-file"><span class="secno">4.12.5.5</span> Serializing bitmaps to a file<a class="self-link" href="#serialising-bitmaps-to-a-file"/></h5>
-
-  
-
-  <p>When a user agent is to create <dfn id="a-serialisation-of-the-bitmap-as-a-file">a
-  serialization of the bitmap as a file</dfn>, given an optional <var>type</var> and
-  <var>quality</var>, it must create an image file in the format given by <var>type</var>, or if
-  <var>type</var> was not supplied, in the PNG format. If an error occurs during the creation of
-  the image file (e.g. an internal encoder error), then the result of the serialization is null.
-  <a href="https://html.spec.whatwg.org/multipage/references.html#refsPNG">[PNG]</a></p>
-
-  <p>The image file's pixel data must be the bitmap's pixel data scaled to one image pixel per
-  coordinate space unit, and if the file format used supports encoding resolution metadata, the
-  resolution must be given as 96dpi (one image pixel per <a data-x-internal="'px'" href="https://drafts.csswg.org/css-values/#px" id="serialising-bitmaps-to-a-file:'px'">CSS pixel</a>).</p>
-
-  <p>If <var>type</var> is supplied, then it must be interpreted as a <a data-x-internal="mime-type" href="https://mimesniff.spec.whatwg.org/#mime-type" id="serialising-bitmaps-to-a-file:mime-type">MIME
-  type</a> giving the format to use. If the type has any parameters, then it must be treated as
-  not supported.</p>
-
-  <p class="example">For example, the value &quot;<code id="serialising-bitmaps-to-a-file:image/png"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot; would mean to generate a PNG
-  image, the value &quot;<code id="serialising-bitmaps-to-a-file:image/jpeg"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/jpeg">image/jpeg</a></code>&quot; would mean to generate a JPEG image, and the value
-  &quot;<code id="serialising-bitmaps-to-a-file:image/svg+xml"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/svg+xml">image/svg+xml</a></code>&quot; would mean to generate an SVG image (which would require that the
-  user agent track how the bitmap was generated, an unlikely, though potentially awesome,
-  feature).</p>
-
-  <p>User agents must support PNG (&quot;<code id="serialising-bitmaps-to-a-file:image/png-2"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/png">image/png</a></code>&quot;). User agents may support other types.
-  If the user agent does not support the requested type, then it must create the file using the PNG
-  format. <a href="https://html.spec.whatwg.org/multipage/references.html#refsPNG">[PNG]</a></p>
-
-  <p>User agents must <a data-x-internal="converted-to-ascii-lowercase" href="https://infra.spec.whatwg.org/#ascii-lowercase" id="serialising-bitmaps-to-a-file:converted-to-ascii-lowercase">convert the provided type to ASCII
-  lowercase</a> before establishing if they support that type.</p>
-
-  <p>For image types that do not support an alpha channel, the serialized image must be the bitmap
-  image composited onto a solid black background using the source-over operator.</p>
-
-  <p>If <var>type</var> is an image format that supports variable quality (such as
-  &quot;<code id="serialising-bitmaps-to-a-file:image/jpeg-2"><a href="https://html.spec.whatwg.org/multipage/indices.html#image/jpeg">image/jpeg</a></code>&quot;) and <var>quality</var> is given, then, if <a data-x-internal="js-type" href="https://tc39.github.io/ecma262/#sec-ecmascript-data-types-and-values" id="serialising-bitmaps-to-a-file:js-type">Type</a>(<var>quality</var>) is Number, and <var>quality</var> is in the range
-  0.0 to 1.0 inclusive, the user agent must treat <var>quality</var> as the desired quality level.
-  If <a data-x-internal="js-type" href="https://tc39.github.io/ecma262/#sec-ecmascript-data-types-and-values" id="serialising-bitmaps-to-a-file:js-type-2">Type</a>(<var>quality</var>) is not Number, or if <var>quality</var>
-  is outside that range, the user agent must use its default quality value, as if the
-  <var>quality</var> argument had not been given.</p>
-
-  <p class="note">The use of type-testing here, instead of simply declaring <var>quality</var> as
-  a Web IDL <code>double</code>, is a historical artifact.</p>
-
-  
-
-
-  
-
-  <h5 id="security-with-canvas-elements"><span class="secno">4.12.5.6</span> Security with <code id="security-with-canvas-elements:the-canvas-element"><a href="#the-canvas-element">canvas</a></code> elements<a class="self-link" href="#security-with-canvas-elements"/></h5>
-
-  <p><i>This section is non-normative.</i></p>
-
-  <p><strong>Information leakage</strong> can occur if scripts from one <a href="https://html.spec.whatwg.org/multipage/origin.html#concept-origin" id="security-with-canvas-elements:concept-origin">origin</a> can
-  access information (e.g. read pixels) from images from another origin (one that isn't the <a href="https://html.spec.whatwg.org/multipage/origin.html#same-origin" id="security-with-canvas-elements:same-origin">same</a>).</p>
-
-  <p>To mitigate this, bitmaps used with <code id="security-with-canvas-elements:the-canvas-element-2"><a href="#the-canvas-element">canvas</a></code> elements and <code id="security-with-canvas-elements:imagebitmap"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code>
-  objects are defined to have a flag indicating whether they are <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean">origin-clean</a>. All bitmaps start with their <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-2">origin-clean</a> set to true. The flag is set to false
-  when cross-origin images are used.</p>
-
-  <p>The <code id="security-with-canvas-elements:dom-canvas-todataurl-2"><a href="#dom-canvas-todataurl-2">toDataURL()</a></code>, <code id="security-with-canvas-elements:dom-canvas-toblob-2"><a href="#dom-canvas-toblob-2">toBlob()</a></code>, and <code id="security-with-canvas-elements:dom-context-2d-getimagedata-2"><a href="#dom-context-2d-getimagedata-2">getImageData()</a></code> methods check the flag and will
-  throw a <a data-x-internal="securityerror" href="https://heycam.github.io/webidl/#securityerror" id="security-with-canvas-elements:securityerror">&quot;<code>SecurityError</code>&quot;</a> <code id="security-with-canvas-elements:domexception"><a data-x-internal="domexception" href="https://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> rather than leak
-  cross-origin data.</p>
-
-  <p>The value of the <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-3">origin-clean</a> flag is
-  propagated from a source <code id="security-with-canvas-elements:the-canvas-element-3"><a href="#the-canvas-element">canvas</a></code> element's bitmap to a new <code id="security-with-canvas-elements:imagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code>
-  object by <code id="security-with-canvas-elements:dom-createimagebitmap-2"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#dom-createimagebitmap-2">createImageBitmap()</a></code>. Conversely, a
-  destination <code id="security-with-canvas-elements:the-canvas-element-4"><a href="#the-canvas-element">canvas</a></code> element's bitmap will have its <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-4">origin-clean</a> flags set to false by <code id="security-with-canvas-elements:dom-context-2d-drawimage"><a href="#dom-context-2d-drawimage">drawImage</a></code> if the source image is an
-  <code id="security-with-canvas-elements:imagebitmap-3"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> object whose bitmap has its <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-5">origin-clean</a> flag set to false.</p>
-
-  <p>The flag can be reset in certain situations; for example, when changing the value of the
-  <code id="security-with-canvas-elements:attr-canvas-width"><a href="#attr-canvas-width">width</a></code> or the <code id="security-with-canvas-elements:attr-canvas-height"><a href="#attr-canvas-height">height</a></code> content attribute of the <code id="security-with-canvas-elements:the-canvas-element-5"><a href="#the-canvas-element">canvas</a></code> element
-  to which a <code id="security-with-canvas-elements:canvasrenderingcontext2d"><a href="#canvasrenderingcontext2d">CanvasRenderingContext2D</a></code> is bound, the bitmap is
-  cleared and its <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-6">origin-clean</a> flag is reset.</p>
-
-  <p>When using an <code id="security-with-canvas-elements:imagebitmaprenderingcontext"><a href="#imagebitmaprenderingcontext">ImageBitmapRenderingContext</a></code>, the value of the <a href="#concept-canvas-origin-clean" id="security-with-canvas-elements:concept-canvas-origin-clean-7">origin-clean</a> flag is propagated from
-  <code id="security-with-canvas-elements:imagebitmap-4"><a href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#imagebitmap">ImageBitmap</a></code> objects when they are transferred to the <code id="security-with-canvas-elements:the-canvas-element-6"><a href="#the-canvas-element">canvas</a></code>
-  via <a href="#dom-imagebitmaprenderingcontext-transferfromimagebitmap-2" id="security-with-canvas-elements:dom-imagebitmaprenderingcontext-transferfromimagebitmap-2">transferFromImageBitmap()</a>.</p>
-
-  
-
-  </body></html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/gentestutils.py firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/gentestutils.py
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/gentestutils.py	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/gentestutils.py	2021-01-18 19:58:23.000000000 +0000
@@ -407,62 +407,3 @@
                 f.write(templates['w3cworker'] % template_params)
 
     print()
-
-
-    def getNodeText(node):
-        t, offsets = '', []
-
-        # Skip over any previous annotations we added
-        if node.nodeType == node.ELEMENT_NODE and 'testrefs' in node.getAttribute('class').split(' '):
-            return t, offsets
-
-        if node.nodeType == node.TEXT_NODE:
-            val = node.nodeValue
-            val = val.replace(unichr(0xa0), ' ') # replace &nbsp;s
-            t += val
-            offsets += [ (node, len(node.nodeValue)) ]
-        for n in node.childNodes:
-            child_t, child_offsets = getNodeText(n)
-            t += child_t
-            offsets += child_offsets
-        return t, offsets
-
-    def htmlSerializer(element):
-        element.normalize()
-        rv = []
-        specialtext = ['style', 'script', 'xmp', 'iframe', 'noembed', 'noframes', 'noscript']
-        empty = ['area', 'base', 'basefont', 'bgsound', 'br', 'col', 'embed', 'frame',
-                 'hr', 'img', 'input', 'link', 'meta', 'param', 'spacer', 'wbr']
-
-        def serializeElement(element):
-            if element.nodeType == Node.DOCUMENT_TYPE_NODE:
-                rv.append("<!DOCTYPE %s>" % element.name)
-            elif element.nodeType == Node.DOCUMENT_NODE:
-                for child in element.childNodes:
-                    serializeElement(child)
-            elif element.nodeType == Node.COMMENT_NODE:
-                rv.append("<!--%s-->" % element.nodeValue)
-            elif element.nodeType == Node.TEXT_NODE:
-                unescaped = False
-                n = element.parentNode
-                while n is not None:
-                    if n.nodeName in specialtext:
-                        unescaped = True
-                        break
-                    n = n.parentNode
-                if unescaped:
-                    rv.append(element.nodeValue)
-                else:
-                    rv.append(escapeHTML(element.nodeValue))
-            else:
-                rv.append("<%s" % element.nodeName)
-                if element.hasAttributes():
-                    for name, value in element.attributes.items():
-                        rv.append(' %s="%s"' % (name, escapeHTML(value)))
-                rv.append(">")
-                if element.nodeName not in empty:
-                    for child in element.childNodes:
-                        serializeElement(child)
-                    rv.append("</%s>" % element.nodeName)
-        serializeElement(element)
-        return '<!DOCTYPE html>\n' + ''.join(rv)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/specextract.py firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/specextract.py
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/specextract.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/specextract.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-import html5lib
-import html5lib.treebuilders.dom
-import re
-
-# Expected use:
-#   curl --compressed https://html.spec.whatwg.org/multipage/canvas.html >current-work
-#   python specextract.py
-#
-# Generates current-work-canvas.xhtml, for use by gentest.py to create the annotated spec document
-
-def extract():
-    parser = html5lib.html5parser.HTMLParser(tree=html5lib.getTreeBuilder("dom"))
-    doc = parser.parse(open('current-work', "r"), transport_encoding='utf-8')
-
-    head = doc.getElementsByTagName('head')[0]
-    for n in head.childNodes:
-        if n.tagName == 'script':
-            head.removeChild(n)
-
-    header = doc.getElementsByTagName('header')[0]
-    #thecanvas = doc.getElementById('the-canvas') # doesn't work (?!)
-    thecanvas = [ n for n in doc.getElementsByTagName('h4') if n.getAttribute('id') == 'the-canvas-element' ][0]
-
-    # Add copyright from https://html.spec.whatwg.org/multipage/acknowledgements.html#acknowledgments
-    copy = doc.createElement('p')
-    copy.setAttribute('class', 'copyright')
-    copy.appendChild(doc.createTextNode(u'Parts of this specification are \xA9 Copyright 2004-2014 Apple Inc., Mozilla Foundation, and Opera Software ASA. You are granted a license to use, reproduce and create derivative works of this document.'))
-    header.appendChild(copy)
-
-    keep = [header, thecanvas]
-    node = thecanvas.nextSibling
-    while node.nodeName != 'nav':
-        keep.append(node)
-        node = node.nextSibling
-    p = thecanvas.parentNode
-    for n in p.childNodes[:]:
-        if n not in keep:
-            p.removeChild(n)
-
-    for n in header.childNodes[3:-4]:
-        header.removeChild(n)
-
-    def make_absolute(url):
-        match = re.match(r'(\w+:|#)', url)
-        if match:
-            return url
-        elif url[0] == '/':
-            return 'https://html.spec.whatwg.org' + url
-        else:
-            return 'https://html.spec.whatwg.org/multipage/' + url
-
-    # Fix relative URLs
-    for e in doc.getElementsByTagName('script'):
-        e.setAttribute('src', make_absolute(e.getAttribute('src')))
-    for e in doc.getElementsByTagName('iframe'):
-        e.setAttribute('src', make_absolute(e.getAttribute('src')))
-    for e in doc.getElementsByTagName('img'):
-        e.setAttribute('src', make_absolute(e.getAttribute('src')))
-    for e in doc.getElementsByTagName('a'):
-        e.setAttribute('href', make_absolute(e.getAttribute('href')))
-
-    # Convert to XHTML, because it's quicker to re-parse than HTML5
-    doc.documentElement.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml')
-    doc.removeChild(doc.firstChild) # remove the DOCTYPE
-
-    open('current-work-canvas.xhtml', 'w').write(doc.toxml(encoding = 'UTF-8'))
-
-extract()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/spec.yaml firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/spec.yaml
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/spec.yaml	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/spec.yaml	2021-01-18 19:58:23.000000000 +0000
@@ -5,93 +5,92 @@
 
 assertions:
   - id: canvas.type
-    text: "interface HTMLCanvasElement<^> : HTMLElement {"
+    text: "interface HTMLCanvasElement : HTMLElement {"
   - id: size.width
-    text: "interface HTMLCanvasElement<...>attribute unsigned long width;<^>"
+    text: "interface HTMLCanvasElement<...>attribute unsigned long width;"
   - id: size.height
-    text: "interface HTMLCanvasElement<...>attribute unsigned long height;<^>"
+    text: "interface HTMLCanvasElement<...>attribute unsigned long height;"
   - id: canvas.getContext
-    text: "interface HTMLCanvasElement<...>object\\? getContext(in DOMString contextId, in any... args);<^>"
+    text: "interface HTMLCanvasElement<...>object\\? getContext(in DOMString contextId, in any... args);"
   - id: fallback
-    text: "The contents of the canvas element, if any, are the element's fallback content<^>."
+    text: "The contents of the canvas element, if any, are the element's fallback content."
   - id: size.nonnegativeinteger
-    text: "The rules for parsing non-negative integers *must* be used to obtain their numeric values<^>."
+    text: "The rules for parsing non-negative integers *must* be used to obtain their numeric values."
   - id: size.missing
-    text: "If an attribute is missing<^>, <...> then the default value *must* be used instead."
+    text: "If an attribute is missing, <...> then the default value *must* be used instead."
   - id: size.error
-    text: "if parsing its value returns an error<^>, then the default value *must* be used instead."
+    text: "if parsing its value returns an error, then the default value *must* be used instead."
   - id: size.default
-    text: "The width attribute defaults to 300, and the height attribute defaults to 150<^>."
+    text: "The width attribute defaults to 300, and the height attribute defaults to 150."
   - id: size.css
-    text: "the element can be sized arbitrarily by a style sheet. During rendering, the image is scaled to fit this layout size<^>."
+    text: "the element can be sized arbitrarily by a style sheet. During rendering, the image is scaled to fit this layout size."
   - id: initial.reset
-    text: "When the canvas element is created, and subsequently whenever the width and height attributes are set (whether to a new value or to the previous value), the bitmap and any associated contexts *must* be cleared back to their initial state <...><^>."
+    text: "When the canvas element is created, and subsequently whenever the width and height attributes are set (whether to a new value or to the previous value), the bitmap and any associated contexts *must* be cleared back to their initial state <...>."
   - id: initial.colour
-    text: "When the canvas is initialized, its bitmap *must* be cleared to transparent black<^>."
+    text: "When the canvas is initialized, its bitmap *must* be cleared to transparent black."
   - id: size.reflect
-    text: "The width and height IDL attributes *must* reflect the respective content attributes of the same name<^>,"
+    text: "The width and height IDL attributes *must* reflect the respective content attributes of the same name,"
 
   - id: context.unrecognised
-    text: "If contextId is not the name of a context supported by the user agent, return null and abort these steps<^>."
+    text: "If contextId is not the name of a context supported by the user agent, return null and abort these steps."
   - id: context.unique
-    text: "If the getContext() method has already been invoked on this element for the same contextId, return the same object as was returned that time, and abort these steps<^>."
+    text: "If the getContext() method has already been invoked on this element for the same contextId, return the same object as was returned that time, and abort these steps."
   - id: context.2d
-    text: "When the getContext() method of a canvas element is to return a new object for the contextId 2d, the user agent *must* return a new CanvasRenderingContext2D object<^>."
+    text: "When the getContext() method of a canvas element is to return a new object for the contextId 2d, the user agent *must* return a new CanvasRenderingContext2D object."
   - id: context.2d.extraargs
-    text: "When the getContext() method of a canvas element is to return a new object for the contextId 2d, the user agent *must* return a new CanvasRenderingContext2D object. Any additional arguments are ignored<^>."
+    text: "When the getContext() method of a canvas element is to return a new object for the contextId 2d, the user agent *must* return a new CanvasRenderingContext2D object. Any additional arguments are ignored."
 
   - id: toDataURL.noarguments
-    text: "When a user agent is to create a serialization of the image as a file, <...> if there are no arguments, in the PNG format<^>."
+    text: "When a user agent is to create a serialization of the image as a file, <...> if there are no arguments, in the PNG format."
   - id: toDataURL.zerosize
-    text: "If the canvas has no pixels (i.e. either its horizontal dimension or its vertical dimension is zero) then return the string \"data:,\"<^> and abort these steps."
+    text: "If the canvas has no pixels (i.e. either its horizontal dimension or its vertical dimension is zero) then return the string \"data:,\" and abort these steps."
   - id: toDataURL.witharguments
-    text: "If arguments is not empty, the first value must be interpreted as a MIME type giving the format to use<^>."
+    text: "If arguments is not empty, the first value must be interpreted as a MIME type giving the format to use."
   - id: toDataURL.noalpha
-    text: "For image types that do not support an alpha channel, the serialized image *must* be the canvas image composited onto a solid black background using the source-over operator<^>."
+    text: "For image types that do not support an alpha channel, the serialized image *must* be the canvas image composited onto a solid black background using the source-over operator."
   - id: toDataURL.png
-    text: "User agents *must* support PNG (\"image/png\")<^>."
+    text: "User agents *must* support PNG (\"image/png\")."
   - id: toDataURL.unrecognised
-    text: "If the user agent does not support the requested type, it *must* create the file using the PNG format<^>."
+    text: "If the user agent does not support the requested type, it *must* create the file using the PNG format."
   - id: toDataURL.lowercase
-    text: "User agents *must* convert the provided type to ASCII lowercase before establishing if they support that type<^>."
+    text: "User agents *must* convert the provided type to ASCII lowercase before establishing if they support that type."
   - id: toDataURL.jpeg
-    previously: [ 0, "image/png", false ]
-    text: "image/jpeg<^>"
+    text: "image/jpeg"
   - id: toDataURL.jpeg.quality
-    text: "The second argument, if it is a number in the range 0.0 to 1.0 inclusive, *must* be treated as the desired quality level<^>."
+    text: "The second argument, if it is a number in the range 0.0 to 1.0 inclusive, *must* be treated as the desired quality level."
   - id: toDataURL.jpeg.nan
-    text: "If it is not a number<^> <...>, the user agent *must* use its default value, as if the argument had been omitted."
+    text: "If it is not a number <...>, the user agent *must* use its default value, as if the argument had been omitted."
   - id: toDataURL.jpeg.range
-    text: "If it is <...> outside that range<^>, the user agent *must* use its default value, as if the argument had been omitted."
+    text: "If it is <...> outside that range, the user agent *must* use its default value, as if the argument had been omitted."
   - id: toDataURL.arguments
-    text: "Other arguments *must* be ignored and must not cause the user agent to raise an exception<^>."
+    text: "Other arguments *must* be ignored and must not cause the user agent to raise an exception."
 
   - id: 2d.coordinatespace
-    text: "flat Cartesian surface whose origin (0,0) is at the top left corner, with the coordinate space having x values increasing when going right, and y values increasing when going down<^>."
+    text: "flat Cartesian surface whose origin (0,0) is at the top left corner, with the coordinate space having x values increasing when going right, and y values increasing when going down."
   - id: context.2d.type
-    text: "interface CanvasRenderingContext2D<^> {"
+    text: "interface CanvasRenderingContext2D {"
   - id: 2d.canvasGradient.type
-    text: "interface CanvasGradient<^> {"
+    text: "interface CanvasGradient {"
   - id: 2d.imageData.type
-    text: "interface ImageData<^> {"
+    text: "interface ImageData {"
   - id: 2d.canvas.attribute
-    text: "readonly<^> attribute HTMLCanvasElement canvas;"
+    text: "readonly attribute HTMLCanvasElement canvas;"
   - id: 2d.canvas
-    text: "The canvas attribute *must* return the canvas element that the context paints on<^>."
+    text: "The canvas attribute *must* return the canvas element that the context paints on."
   - id: 2d.nonfinite
-    text: "Except where otherwise specified, for the 2D context interface, any method call with a numeric argument whose value is infinite or a NaN value *must* be ignored<^>."
+    text: "Except where otherwise specified, for the 2D context interface, any method call with a numeric argument whose value is infinite or a NaN value *must* be ignored."
 
   - id: 2d.currentColor.onset
-    text: "Whenever the CSS value currentColor is used as a color in this API, the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is the computed value of the 'color' property on the element in question at the time that the color is specified<^>"
+    text: "Whenever the CSS value currentColor is used as a color in this API, the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is the computed value of the 'color' property on the element in question at the time that the color is specified"
   - id: 2d.currentColor.outofdoc
-    text: "If the computed value of the 'color' property is undefined for a particular case (e.g. because the element is not in a Document), then the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is fully opaque black<^>."
+    text: "If the computed value of the 'color' property is undefined for a particular case (e.g. because the element is not in a Document), then the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is fully opaque black."
   - id: 2d.currentColor.gradient
-    text: "In the case of addColorStop() on CanvasGradient, the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is always fully opaque black<^> (there is no associated element)."
+    text: "In the case of addColorStop() on CanvasGradient, the \"computed value of the 'color' property\" for the purposes of determining the computed value of the currentColor keyword is always fully opaque black (there is no associated element)."
 
   - id: 2d.state.transformation
-    text: "The current transformation matrix<^>."
+    text: "The current transformation matrix."
   - id: 2d.state.clip
-    text: "The current clipping region<^>."
+    text: "The current clipping region."
   - meta: |
       for s in [
         'strokeStyle', 'fillStyle', 'globalAlpha',
@@ -102,623 +101,611 @@
       ]:
         assertions.append( {
           'id': '2d.state.%s' % s,
-          'text': 'The current values of the following attributes:<...>%s<^>' % s
+          'text': 'The current values of the following attributes:<...>%s' % s
         } )
   - id: 2d.state.path
-    text: "The current path<^> <...> are not part of the drawing state."
+    text: "The current path <...> are not part of the drawing state."
   - id: 2d.state.bitmap
-    text: "The <...> current bitmap<^> are not part of the drawing state."
+    text: "The <...> current bitmap are not part of the drawing state."
 
   - id: 2d.state.save
-    text: "The save() method *must* push a copy of the current drawing state onto the drawing state stack<^>."
+    text: "The save() method *must* push a copy of the current drawing state onto the drawing state stack."
   - id: 2d.state.restore
-    text: "The restore() method *must* pop the top entry in the drawing state stack, and reset the drawing state it describes<^>."
+    text: "The restore() method *must* pop the top entry in the drawing state stack, and reset the drawing state it describes."
   - id: 2d.state.restore.underflow
-    text: "If there is no saved state, the method *must* do nothing<^>."
+    text: "If there is no saved state, the method *must* do nothing."
 
   - id: 2d.transformation.initial
-    text: "When the context is created, the transformation matrix *must* initially be the identity transform<^>."
+    text: "When the context is created, the transformation matrix *must* initially be the identity transform."
   - id: 2d.transformation.order
-    text: "The transformations *must* be performed in reverse order<^>."
+    text: "The transformations *must* be performed in reverse order."
   - id: 2d.transformation.scale
-    text: "The scale(x, y) method *must* add the scaling transformation described by the arguments to the transformation matrix<^>."
+    text: "The scale(x, y) method *must* add the scaling transformation described by the arguments to the transformation matrix."
   - id: 2d.transformation.scale.multiple
-    text: "The factors are multiples<^>."
+    text: "The factors are multiples."
   - id: 2d.transformation.rotate
-    text: "The rotate(angle) method *must* add the rotation transformation described by the argument to the transformation matrix<^>."
+    text: "The rotate(angle) method *must* add the rotation transformation described by the argument to the transformation matrix."
   - id: 2d.transformation.rotate.direction
-    text: "The angle argument represents a clockwise rotation angle<^>"
+    text: "The angle argument represents a clockwise rotation angle"
   - id: 2d.transformation.rotate.radians
-    text: "The angle argument <...> expressed in radians<^>."
+    text: "The angle argument <...> expressed in radians."
   - id: 2d.transformation.translate
-    text: "The translate(x, y) method *must* add the translation transformation described by the arguments to the transformation matrix<^>."
+    text: "The translate(x, y) method *must* add the translation transformation described by the arguments to the transformation matrix."
   - id: 2d.transformation.transform
-    text: "The transform(a, b, c, d, e, f) method *must* replace the current transformation matrix with the result of multiplying the current transformation matrix with the matrix described by<^>:"
+    text: "The transform(a, b, c, d, e, f) method *must* replace the current transformation matrix with the result of multiplying the current transformation matrix with the matrix described by:"
   - id: 2d.transformation.transform.multiply
-    text: "The transform(a, b, c, d, e, f) method *must* replace the current transformation matrix with the result of multiplying<^> the current transformation matrix with the matrix described by:"
+    text: "The transform(a, b, c, d, e, f) method *must* replace the current transformation matrix with the result of multiplying the current transformation matrix with the matrix described by:"
   - id: 2d.transformation.setTransform
-    text: "The setTransform(a, b, c, d, e, f) method *must* <...> invoke the transform(a, b, c, d, e, f) method with the same arguments<^>"
+    text: "The setTransform(a, b, c, d, e, f) method *must* <...> invoke the transform(a, b, c, d, e, f) method with the same arguments"
   - id: 2d.transformation.setTransform.identity
-    text: "The setTransform(a, b, c, d, e, f) method *must* reset the current transform to the identity matrix<^>, "
+    text: "The setTransform(a, b, c, d, e, f) method *must* reset the current transform to the identity matrix, "
 
 
   - id: 2d.composite.operation
-    text: "All drawing operations are affected by the global compositing attributes, globalAlpha and globalCompositeOperation<^>."
+    text: "All drawing operations are affected by the global compositing attributes, globalAlpha and globalCompositeOperation."
 
   - id: 2d.composite.globalAlpha.shape
-    text: "The globalAlpha attribute gives an alpha value that is applied to shapes<^> and images before they are composited onto the canvas."
+    text: "The globalAlpha attribute gives an alpha value that is applied to shapes and images before they are composited onto the canvas."
   - id: 2d.composite.globalAlpha.image
-    text: "The globalAlpha attribute gives an alpha value that is applied to shapes and images<^> before they are composited onto the canvas."
+    text: "The globalAlpha attribute gives an alpha value that is applied to shapes and images before they are composited onto the canvas."
   - id: 2d.composite.globalAlpha.range
-    text: "The value must be in the range from 0.0 (fully transparent) to 1.0 (no additional transparency). If an attempt is made to set the attribute to a value outside this range, including Infinity and Not-a-Number (NaN) values, the attribute *must* retain its previous value<^>."
+    text: "The value must be in the range from 0.0 (fully transparent) to 1.0 (no additional transparency). If an attempt is made to set the attribute to a value outside this range, including Infinity and Not-a-Number (NaN) values, the attribute *must* retain its previous value."
   - id: 2d.composite.globalAlpha.default
-    text: "When the context is created, the globalAlpha attribute *must* initially have the value 1.0<^>."
+    text: "When the context is created, the globalAlpha attribute *must* initially have the value 1.0."
 
   - id: 2d.composite.operation.shape
-    text: "The globalCompositeOperation attribute sets how shapes<^> and images are drawn onto the existing bitmap,"
+    text: "The globalCompositeOperation attribute sets how shapes and images are drawn onto the existing bitmap,"
   - id: 2d.composite.operation.image
-    text: "The globalCompositeOperation attribute sets how shapes and images<^> are drawn onto the existing bitmap,"
+    text: "The globalCompositeOperation attribute sets how shapes and images are drawn onto the existing bitmap,"
 
   - id: 2d.composite.source-atop
-    text: "source-atop<^><eol>"
+    text: "source-atop"
   - id: 2d.composite.source-in
-    text: "source-in<^><eol>"
+    text: "source-in"
   - id: 2d.composite.source-out
-    text: "source-out<^><eol>"
+    text: "source-out"
   - id: 2d.composite.source-over
-    text: "source-over (default)<^><eol>"
+    text: "source-over (default)"
   - id: 2d.composite.destination-atop
-    text: "destination-atop<^><eol>"
+    text: "destination-atop"
   - id: 2d.composite.destination-in
-    text: "destination-in<^><eol>"
+    text: "destination-in"
   - id: 2d.composite.destination-out
-    text: "destination-out<^><eol>"
+    text: "destination-out"
   - id: 2d.composite.destination-over
-    text: "destination-over<^><eol>"
+    text: "destination-over"
   - id: 2d.composite.lighter
-    text: "lighter<^><eol>"
+    text: "lighter"
   - id: 2d.composite.copy
-    text: "copy<^><eol>"
+    text: "copy"
   - id: 2d.composite.xor
-    text: "xor<^><eol>"
+    text: "xor"
   - id: 2d.composite.clear
-    text: "clear<^><eol>"
+    text: "clear"
 
   - id: 2d.composite.operation.casesensitive
-    text: "These values are all case-sensitive<^> <...> they *must* be used exactly as shown."
+    text: "These values are all case-sensitive <...> they *must* be used exactly as shown."
   - id: 2d.composite.operation.exact
-    text: "User agents *must* not recognize values that are not a case-sensitive match for one of the values given above<^>."
+    text: "User agents *must* not recognize values that are not a case-sensitive match for one of the values given above."
   - id: 2d.composite.operation.porterduff
-    text: "The operators in the above list *must* be treated as described by the Porter-Duff operator given at the start of their description (e.g. A over B)<^>."
+    text: "The operators in the above list *must* be treated as described by the Porter-Duff operator given at the start of their description (e.g. A over B)."
   - id: 2d.composite.operation.unrecognised
-    text: "On setting, if the user agent does not recognize the specified value, it *must* be ignored, leaving the value of globalCompositeOperation unaffected<^>."
+    text: "On setting, if the user agent does not recognize the specified value, it *must* be ignored, leaving the value of globalCompositeOperation unaffected."
   - id: 2d.composite.operation.default
-    text: "When the context is created, the globalCompositeOperation attribute *must* initially have the value source-over<^>."
+    text: "When the context is created, the globalCompositeOperation attribute *must* initially have the value source-over."
 
 
   - id: 2d.colours.parse
-    text: "On setting, strings *must* be parsed as CSS <color> values and the color assigned<^>,"
+    text: "On setting, strings *must* be parsed as CSS <color> values and the color assigned,"
   - id: 2d.gradient.assign
-    text: "On setting, <...> CanvasGradient<^> and CanvasPattern objects *must* be assigned themselves."
+    text: "On setting, <...> CanvasGradient and CanvasPattern objects *must* be assigned themselves."
   - id: 2d.pattern.assign
-    text: "On setting, <...> CanvasGradient and CanvasPattern<^> objects *must* be assigned themselves."
+    text: "On setting, <...> CanvasGradient and CanvasPattern objects *must* be assigned themselves."
   - id: 2d.colours.invalidstring
-    text: "If the value is a string but cannot be parsed as a CSS <color> value<^>, <...> then it *must* be ignored, and the attribute must retain its previous value."
+    text: "If the value is a string but cannot be parsed as a CSS <color> value, <...> then it *must* be ignored, and the attribute must retain its previous value."
   - id: 2d.colours.invalidtype
-    text: "If the value is <...> neither a string, a CanvasGradient, nor a CanvasPattern<^>, then it *must* be ignored, and the attribute must retain its previous value."
+    text: "If the value is <...> neither a string, a CanvasGradient, nor a CanvasPattern, then it *must* be ignored, and the attribute must retain its previous value."
   - id: 2d.colours.getcolour
-    text: "On getting, if the value is a color, then the serialization of the color *must* be returned<^>."
+    text: "On getting, if the value is a color, then the serialization of the color *must* be returned."
   - id: 2d.gradient.object
-    text: "if it is not a color but a CanvasGradient<^> or CanvasPattern, then the respective object *must* be returned."
+    text: "if it is not a color but a CanvasGradient or CanvasPattern, then the respective object *must* be returned."
   - id: 2d.pattern.object
-    text: "if it is not a color but a CanvasGradient or CanvasPattern<^>, then the respective object *must* be returned."
+    text: "if it is not a color but a CanvasGradient or CanvasPattern, then the respective object *must* be returned."
   - id: 2d.serializecolour.solid
-    text: "if it has alpha equal to 1.0, then the string is a lowercase six-digit hex value<^>"
+    text: "if it has alpha equal to 1.0, then the string is a lowercase six-digit hex value"
   - id: 2d.serializecolour.transparent
-    text: "Otherwise, the color value has alpha less than 1.0, and the string is the color value in the CSS rgba() functional-notation format<^>:"
+    text: "Otherwise, the color value has alpha less than 1.0, and the string is the color value in the CSS rgba() functional-notation format:"
   - id: 2d.colours.default
-    text: "When the context is created, the strokeStyle and fillStyle attributes *must* initially have the string value #000000<^>."
+    text: "When the context is created, the strokeStyle and fillStyle attributes *must* initially have the string value #000000."
 
   - id: 2d.gradient.interpolate.linear
-    text: "Between each such stop, the colors and the alpha component *must* be linearly interpolated<^> over the RGBA space without premultiplying the alpha value to find the color to use at that offset."
+    text: "Between each such stop, the colors and the alpha component *must* be linearly interpolated over the RGBA space without premultiplying the alpha value to find the color to use at that offset."
   - id: 2d.gradient.interpolate.alpha
-    text: "Between each such stop, the colors and the alpha component *must* be linearly interpolated over the RGBA space without premultiplying the alpha value<^> to find the color to use at that offset."
+    text: "Between each such stop, the colors and the alpha component *must* be linearly interpolated over the RGBA space without premultiplying the alpha value to find the color to use at that offset."
   - id: 2d.gradient.outside.first
-    text: "Before the first stop, the color *must* be the color of the first stop<^>."
+    text: "Before the first stop, the color *must* be the color of the first stop."
   - id: 2d.gradient.outside.last
-    text: "After the last stop, the color *must* be the color of the last stop<^>."
+    text: "After the last stop, the color *must* be the color of the last stop."
   - id: 2d.gradient.empty
-    text: "When there are no stops, the gradient is transparent black<^>."
+    text: "When there are no stops, the gradient is transparent black."
 
 
   - id: 2d.gradient.invalidoffset
-    text: "If the offset is less than 0, greater than 1, infinite, or NaN, then an INDEX_SIZE_ERR exception *must* be raised<^>."
+    text: "If the offset is less than 0, greater than 1, infinite, or NaN, then an INDEX_SIZE_ERR exception *must* be raised."
   - id: 2d.gradient.invalidcolour
-    text: "If the color cannot be parsed as a CSS <color> value, then a SYNTAX_ERR exception *must* be raised<^>."
+    text: "If the color cannot be parsed as a CSS <color> value, then a SYNTAX_ERR exception *must* be raised."
   - id: 2d.gradient.update
-    text: "Otherwise, the gradient *must* have a new stop placed, at offset offset relative to the whole gradient, and with the color obtained by parsing color as a CSS <color> value<^>."
+    text: "Otherwise, the gradient *must* have a new stop placed, at offset offset relative to the whole gradient, and with the color obtained by parsing color as a CSS <color> value."
   - id: 2d.gradient.interpolate.overlap
-    text: "If multiple stops are added at the same offset on a gradient, they *must* be placed in the order added, with the first one closest to the start of the gradient, <...><^>."
+    text: "If multiple stops are added at the same offset on a gradient, they *must* be placed in the order added, with the first one closest to the start of the gradient, <...>."
 
   - id: 2d.gradient.linear.nonfinite
-    text: "If any of the arguments to createLinearGradient() are infinite or NaN, the method *must* raise a NOT_SUPPORTED_ERR exception<^>."
+    text: "If any of the arguments to createLinearGradient() are infinite or NaN, the method *must* raise a NOT_SUPPORTED_ERR exception."
   - id: 2d.gradient.linear.return
-    text: "Otherwise, the method *must* return a linear CanvasGradient initialized with the specified line<^>."
+    text: "Otherwise, the method *must* return a linear CanvasGradient initialized with the specified line."
   - id: 2d.gradient.linear.rendering
-    text: "Linear gradients *must* be rendered such that all points on a line perpendicular to the line that crosses the start and end points have the color at the point where those two lines cross (with the colors coming from the interpolation and extrapolation described above)<^>."
+    text: "Linear gradients *must* be rendered such that all points on a line perpendicular to the line that crosses the start and end points have the color at the point where those two lines cross (with the colors coming from the interpolation and extrapolation described above)."
   - id: 2d.gradient.linear.transform
-    text: "The points in the linear gradient *must* be transformed as described by the current transformation matrix when rendering<^>."
+    text: "The points in the linear gradient *must* be transformed as described by the current transformation matrix when rendering."
   - id: 2d.gradient.linear.zerosize
-    text: "If x0 = x1 and y0 = y1, then the linear gradient *must* paint nothing<^>."
+    text: "If x0 = x1 and y0 = y1, then the linear gradient *must* paint nothing."
 
   - id: 2d.gradient.radial.nonfinite
-    text: "If any of the arguments are infinite or NaN, a NOT_SUPPORTED_ERR exception *must* be raised<^>."
+    text: "If any of the arguments are infinite or NaN, a NOT_SUPPORTED_ERR exception *must* be raised."
   - id: 2d.gradient.radial.negative
-    text: "If either of r0 or r1 are negative, an INDEX_SIZE_ERR exception *must* be raised<^>."
+    text: "If either of r0 or r1 are negative, an INDEX_SIZE_ERR exception *must* be raised."
   - id: 2d.gradient.radial.return
-    text: "Otherwise, the method *must* return a radial CanvasGradient initialized with the two specified circles<^>."
+    text: "Otherwise, the method *must* return a radial CanvasGradient initialized with the two specified circles."
   - id: 2d.gradient.radial.rendering
-    text: "Radial gradients *must* be rendered by following these steps<^>:"
+    text: "Radial gradients *must* be rendered by following these steps:"
   - id: 2d.gradient.radial.equal
-    text: "If x0 = x1 and y0 = y1 and r0 = r1, then the radial gradient *must* paint nothing<^>."
+    text: "If x0 = x1 and y0 = y1 and r0 = r1, then the radial gradient *must* paint nothing."
   - id: 2d.gradient.extent
-    text: "Gradients *must* be painted only where the relevant stroking or filling effects requires that they be drawn<^>."
+    text: "Gradients *must* be painted only where the relevant stroking or filling effects requires that they be drawn."
   - id: 2d.gradient.radial.transform
-    text: "The points in the radial gradient *must* be transformed as described by the current transformation matrix when rendering<^>."
+    text: "The points in the radial gradient *must* be transformed as described by the current transformation matrix when rendering."
 
 
   - id: 2d.pattern.modify
-    text: "Modifying this image after calling the createPattern() method *must* not affect the pattern<^>."
+    text: "Modifying this image after calling the createPattern() method *must* not affect the pattern."
   - id: 2d.pattern.transform
     text: "The setTransform(transform) method, when invoked, must run these steps:"
   - id: 2d.pattern.missing
-    text: "If the empty string is specified, repeat *must* be assumed<^>."
+    text: "If the empty string is specified, repeat *must* be assumed."
   - id: 2d.pattern.unrecognised
-    text: "If an unrecognized value is given, then the user agent *must* raise a SYNTAX_ERR exception<^>."
+    text: "If an unrecognized value is given, then the user agent *must* raise a SYNTAX_ERR exception."
   - id: 2d.pattern.exact
-    text: "User agents *must* recognize the four values described above exactly (e.g. they must not do case folding)<^>."
+    text: "User agents *must* recognize the four values described above exactly (e.g. they must not do case folding)."
   - id: 2d.pattern.return
-    text: "the method *must* return a CanvasPattern object suitably initialized<^>."
+    text: "the method *must* return a CanvasPattern object suitably initialized."
   - id: 2d.pattern.IDL
-    text: "CanvasPattern createPattern(in HTMLImageElement image, in DOMString repetition);<...>CanvasPattern createPattern(in HTMLCanvasElement image, in DOMString repetition);<...>CanvasPattern createPattern(in HTMLVideoElement image, in DOMString repetition);<^>"
+    text: "CanvasPattern createPattern(in HTMLImageElement image, in DOMString repetition);<...>CanvasPattern createPattern(in HTMLCanvasElement image, in DOMString repetition);<...>CanvasPattern createPattern(in HTMLVideoElement image, in DOMString repetition);"
   - id: 2d.pattern.incomplete.image
-    text: "If the image argument is an HTMLImageElement object that is not fully decodable<^><...> then the implementation *must* return null."
+    text: "If the image argument is an HTMLImageElement object that is not fully decodable<...> then the implementation *must* return null."
   - id: 2d.pattern.incomplete.video
-    previously: [ 6, "createPattern" ]
-    text: "If the image argument is <...> an HTMLVideoElement object whose readyState attribute is either HAVE_NOTHING or HAVE_METADATA<^>, then the implementation *must* return null."
+    text: "If the image argument is <...> an HTMLVideoElement object whose readyState attribute is either HAVE_NOTHING or HAVE_METADATA, then the implementation *must* return null."
   - id: 2d.pattern.zerocanvas
-    previously: [ 10, "createPattern" ]
-    text: "If the image argument is an HTMLCanvasElement object with either a horizontal dimension or a vertical dimension equal to zero, then the implementation *must* raise an INVALID_STATE_ERR exception<^>."
+    text: "If the image argument is an HTMLCanvasElement object with either a horizontal dimension or a vertical dimension equal to zero, then the implementation *must* raise an INVALID_STATE_ERR exception."
   - id: 2d.pattern.painting
-    text: "Patterns *must* be painted so that the top left of the first image is anchored at the origin of the coordinate space, and images are then repeated horizontally to the left and right (if the repeat-x string was specified) or vertically up and down (if the repeat-y string was specified) or in all four directions all over the canvas (if the repeat string was specified)<^>."
+    text: "Patterns *must* be painted so that the top left of the first image is anchored at the origin of the coordinate space, and images are then repeated horizontally to the left and right (if the repeat-x string was specified) or vertically up and down (if the repeat-y string was specified) or in all four directions all over the canvas (if the repeat string was specified)."
   - id: 2d.pattern.unscaled
-    text: "The images are not scaled by this process; one CSS pixel of the image *must* be painted on one coordinate space unit<^>."
+    text: "The images are not scaled by this process; one CSS pixel of the image *must* be painted on one coordinate space unit."
   - id: 2d.pattern.extent
-    text: "patterns *must* actually be painted only where the stroking or filling effect requires that they be drawn<^>, and are affected by the current transformation matrix."
+    text: "patterns *must* actually be painted only where the stroking or filling effect requires that they be drawn, and are affected by the current transformation matrix."
   - id: 2d.pattern.animated.image
-    text: "When the createPattern() method is passed an animated image as its image argument, the user agent must use the poster frame of the animation, or, if there is no poster frame, the first frame of the animation<^>."
+    text: "When the createPattern() method is passed an animated image as its image argument, the user agent must use the poster frame of the animation, or, if there is no poster frame, the first frame of the animation."
   - id: 2d.pattern.animated.video
-    previously: [ 4, "createPattern" ]
-    text: "When the image argument is an HTMLVideoElement, then the frame at the current playback position *must* be used as the source image<^>,"
+    text: "When the image argument is an HTMLVideoElement, then the frame at the current playback position *must* be used as the source image,"
   - id: 2d.pattern.video.size
-    previously: [ 4, "createPattern" ]
-    text: "When the image argument is an HTMLVideoElement, <...> the source image's dimensions *must* be the intrinsic width and intrinsic height of the media resource (i.e. after any aspect-ratio correction has been applied)<^>."
+    text: "When the image argument is an HTMLVideoElement, <...> the source image's dimensions *must* be the intrinsic width and intrinsic height of the media resource (i.e. after any aspect-ratio correction has been applied)."
 
 
   - id: 2d.lineWidth
-    text: "The lineWidth attribute gives the width of lines, in coordinate space units<^>."
+    text: "The lineWidth attribute gives the width of lines, in coordinate space units."
   - id: 2d.lineWidth.get
-    text: "The lineWidth attribute <...>. On getting, it *must* return the current value<^>."
+    text: "The lineWidth attribute <...>. On getting, it *must* return the current value."
   - id: 2d.lineWidth.invalid
-    text: "The lineWidth attribute <...>. On setting, zero, negative, infinite, and NaN values *must* be ignored, leaving the value unchanged<^>;"
+    text: "The lineWidth attribute <...>. On setting, zero, negative, infinite, and NaN values *must* be ignored, leaving the value unchanged;"
   - id: 2d.lineWidth.set
-    text: "The lineWidth attribute <...>. On setting, <...> other values *must* change the current value to the new value<^>."
+    text: "The lineWidth attribute <...>. On setting, <...> other values *must* change the current value to the new value."
   - id: 2d.lineWidth.default
-    text: "the lineWidth attribute *must* initially have the value 1.0<^>."
+    text: "the lineWidth attribute *must* initially have the value 1.0."
   - id: 2d.lineCap.end
-    text: "The lineCap attribute defines the type of endings that UAs will place on the end of lines<^>."
+    text: "The lineCap attribute defines the type of endings that UAs will place on the end of lines."
   - id: 2d.lineCap.butt
-    text: "The butt value means that the end of each line has a flat edge perpendicular to the direction of the line (and that no additional line cap is added)<^>."
+    text: "The butt value means that the end of each line has a flat edge perpendicular to the direction of the line (and that no additional line cap is added)."
   - id: 2d.lineCap.round
-    text: "The round value means that a semi-circle with the diameter equal to the width of the line *must* then be added on to the end of the line<^>."
+    text: "The round value means that a semi-circle with the diameter equal to the width of the line *must* then be added on to the end of the line."
   - id: 2d.lineCap.square
-    text: "The square value means that a rectangle with the length of the line width and the width of half the line width, placed flat against the edge perpendicular to the direction of the line, *must* be added at the end of each line<^>."
+    text: "The square value means that a rectangle with the length of the line width and the width of half the line width, placed flat against the edge perpendicular to the direction of the line, *must* be added at the end of each line."
   - id: 2d.lineCap.get
-    previously: [ 2, "The lineCap attribute" ]
-    text: "On getting, it *must* return the current value<^>."
+    text: "On getting, it *must* return the current value."
   - id: 2d.lineCap.set
-    text: "On setting, if the new value is one of the literal strings butt, round, and square, then the current value *must* be changed to the new value<^>;"
+    text: "On setting, if the new value is one of the literal strings butt, round, and square, then the current value *must* be changed to the new value;"
   - id: 2d.lineCap.invalid
-    text: "On setting, if the new value is one of the literal strings butt, round, and square, then <...>; other values *must* ignored, leaving the value unchanged<^>."
+    text: "On setting, if the new value is one of the literal strings butt, round, and square, then <...>; other values *must* ignored, leaving the value unchanged."
   - id: 2d.lineCap.default
-    text: "When the context is created, the lineCap attribute *must* initially have the value butt<^>."
+    text: "When the context is created, the lineCap attribute *must* initially have the value butt."
   - id: 2d.lineJoin.get
-    previously: [ 2, "lineJoin" ]
-    text: "On getting, it *must* return the current value<^>."
+    text: "On getting, it *must* return the current value."
   - id: 2d.lineJoin.set
-    text: "On setting, if the new value is one of the literal strings bevel, round, and miter, then the current value *must* be changed to the new value<^>;"
+    text: "On setting, if the new value is one of the literal strings bevel, round, and miter, then the current value *must* be changed to the new value;"
   - id: 2d.lineJoin.invalid
-    text: "On setting, if the new value is one of the literal strings bevel, round, and miter, then <...>; other values *must* be ignored, leaving the value unchanged<^>."
+    text: "On setting, if the new value is one of the literal strings bevel, round, and miter, then <...>; other values *must* be ignored, leaving the value unchanged."
   - id: 2d.lineJoin.default
-    text: "When the context is created, the lineJoin attribute *must* initially have the value miter<^>."
+    text: "When the context is created, the lineJoin attribute *must* initially have the value miter."
   - id: 2d.lineJoin.joins
-    text: "A join exists at any point in a subpath shared by two consecutive lines<^>."
+    text: "A join exists at any point in a subpath shared by two consecutive lines."
   - id: 2d.lineJoin.joinclosed
-    text: "When a subpath is closed, then a join also exists at its first point (equivalent to its last point) connecting the first and last lines in the subpath<^>."
+    text: "When a subpath is closed, then a join also exists at its first point (equivalent to its last point) connecting the first and last lines in the subpath."
   - id: 2d.lineJoin.common
-    text: "A filled triangle connecting these two opposite corners with a straight line, with the third point of the triangle being the join point, *must* be rendered at all joins<^>."
+    text: "A filled triangle connecting these two opposite corners with a straight line, with the third point of the triangle being the join point, *must* be rendered at all joins."
   - id: 2d.lineJoin.round
-    text: "The round value means that a filled arc connecting the two aforementioned corners of the join, abutting (and not overlapping) the aforementioned triangle, with the diameter equal to the line width and the origin at the point of the join, *must* be rendered at joins<^>."
+    text: "The round value means that a filled arc connecting the two aforementioned corners of the join, abutting (and not overlapping) the aforementioned triangle, with the diameter equal to the line width and the origin at the point of the join, *must* be rendered at joins."
   - id: 2d.lineJoin.bevel
-    text: "The bevel value means that this is all that is rendered at joins<^>."
+    text: "The bevel value means that this is all that is rendered at joins."
   - id: 2d.lineJoin.miter
-    text: "The miter value means that a second filled triangle *must* (if it can given the miter length) be rendered at the join, with one line being the line between the two aforementioned corners, abutting the first triangle, and the other two being continuations of the outside edges of the two joining lines, as long as required to intersect without going over the miter length<^>."
+    text: "The miter value means that a second filled triangle *must* (if it can given the miter length) be rendered at the join, with one line being the line between the two aforementioned corners, abutting the first triangle, and the other two being continuations of the outside edges of the two joining lines, as long as required to intersect without going over the miter length."
   - id: 2d.lineJoin.miterLimit
-    text: "If the miter length would cause the miter limit ratio to be exceeded, this second triangle *must* not be rendered<^>."
+    text: "If the miter length would cause the miter limit ratio to be exceeded, this second triangle *must* not be rendered."
   - id: 2d.miterLimit.get
-    text: "The miter limit <...>. On getting, it *must* return the current value<^>."
+    text: "The miter limit <...>. On getting, it *must* return the current value."
   - id: 2d.miterLimit.invalid
-    text: "The miter limit <...>. On setting, zero, negative, infinite, and NaN values *must* be ignored, leaving the value unchanged<^>;"
+    text: "The miter limit <...>. On setting, zero, negative, infinite, and NaN values *must* be ignored, leaving the value unchanged;"
   - id: 2d.miterLimit.set
-    text: "The miter limit <...>. On setting, <...>; other values *must* change the current value to the new value<^>."
+    text: "The miter limit <...>. On setting, <...>; other values *must* change the current value to the new value."
   - id: 2d.miterLimit.default
-    text: "When the context is created, the miterLimit attribute *must* initially have the value 10.0<^>."
+    text: "When the context is created, the miterLimit attribute *must* initially have the value 10.0."
 
 
   - id: 2d.shadow.color.initial
-    text: "When the context is created, the shadowColor attribute initially *must* be fully-transparent black<^>."
+    text: "When the context is created, the shadowColor attribute initially *must* be fully-transparent black."
   - id: 2d.shadow.color.get
-    text: "On getting, the serialization of the color *must* be returned<^>."
+    text: "On getting, the serialization of the color *must* be returned."
   - id: 2d.shadow.color.set
-    text: "On setting, the new value *must* be parsed as a CSS <color> value and the color assigned<^>."
+    text: "On setting, the new value *must* be parsed as a CSS <color> value and the color assigned."
   - id: 2d.shadow.color.invalid
-    text: "If the value cannot be parsed as a CSS <color> value then it *must* be ignored, and the attribute must retain its previous value<^>."
+    text: "If the value cannot be parsed as a CSS <color> value then it *must* be ignored, and the attribute must retain its previous value."
   - id: 2d.shadow.offset.initial
-    text: "When the context is created, the shadow offset attributes *must* initially have the value 0<^>."
+    text: "When the context is created, the shadow offset attributes *must* initially have the value 0."
   - id: 2d.shadow.offset.get
-    text: "On getting, they *must* return their current value<^>."
+    text: "On getting, they *must* return their current value."
   - id: 2d.shadow.offset.set
-    text: "On setting, the attribute being set *must* be set to the new value<^>,"
+    text: "On setting, the attribute being set *must* be set to the new value,"
   - id: 2d.shadow.offset.invalid
-    text: "On setting, <...> if the value is infinite or NaN, in which case the new value *must* be ignored<^>."
+    text: "On setting, <...> if the value is infinite or NaN, in which case the new value *must* be ignored."
   - id: 2d.shadow.blur.initial
-    text: "When the context is created, the shadowBlur attribute *must* initially have the value 0<^>."
+    text: "When the context is created, the shadowBlur attribute *must* initially have the value 0."
   - id: 2d.shadow.blur.get
-    text: "On getting, the attribute *must* return its current value<^>."
+    text: "On getting, the attribute *must* return its current value."
   - id: 2d.shadow.blur.set
-    text: "On setting the attribute *must* be set to the new value<^>,"
+    text: "On setting the attribute *must* be set to the new value,"
   - id: 2d.shadow.blur.invalid
-    text: "On setting <...> if the value is negative, infinite or NaN, in which case the new value *must* be ignored<^>."
+    text: "On setting <...> if the value is negative, infinite or NaN, in which case the new value *must* be ignored."
   - id: 2d.shadow.enable
-    text: "Shadows are only drawn if the opacity component of the alpha component of the color of shadowColor is non-zero and either the shadowBlur is non-zero, or the shadowOffsetX is non-zero, or the shadowOffsetY is non-zero<^>."
+    text: "Shadows are only drawn if the opacity component of the alpha component of the color of shadowColor is non-zero and either the shadowBlur is non-zero, or the shadowOffsetX is non-zero, or the shadowOffsetY is non-zero."
   - id: 2d.shadow.render
-    text: "When shadows are drawn, they *must* be rendered as follows<^>:"
+    text: "When shadows are drawn, they *must* be rendered as follows:"
 
   - id: 2d.rect.transform
-    text: "The current transformation matrix *must* be applied to the following four coordinates<^>,"
+    text: "The current transformation matrix *must* be applied to the following four coordinates,"
   - id: 2d.rect.closed
-    text: "the following four coordinates, which form the path that *must* then be closed to get the specified rectangle<^>:"
+    text: "the following four coordinates, which form the path that *must* then be closed to get the specified rectangle:"
   - id: 2d.clearRect
-    text: "The clearRect(x, y, w, h) method *must* clear the pixels in the specified rectangle that also intersect the current clipping region to a fully transparent black, erasing any previous image<^>."
+    text: "The clearRect(x, y, w, h) method *must* clear the pixels in the specified rectangle that also intersect the current clipping region to a fully transparent black, erasing any previous image."
   - id: 2d.fillRect
-    text: "The fillRect(x, y, w, h) method *must* paint the specified rectangular area using the fillStyle<^>."
+    text: "The fillRect(x, y, w, h) method *must* paint the specified rectangular area using the fillStyle."
   - id: 2d.strokeRect
-    text: "The strokeRect(x, y, w, h) method *must* stroke the specified rectangle's path using the strokeStyle, lineWidth, lineJoin, and (if appropriate) miterLimit attributes<^>."
+    text: "The strokeRect(x, y, w, h) method *must* stroke the specified rectangle's path using the strokeStyle, lineWidth, lineJoin, and (if appropriate) miterLimit attributes."
 
 
   - id: 2d.path.initial
-    text: "Initially, the context's path *must* have zero subpaths<^>."
+    text: "Initially, the context's path *must* have zero subpaths."
   - id: 2d.path.transformation
-    text: "The points and lines added to the path by these methods *must* be transformed according to the current transformation matrix as they are added<^>."
+    text: "The points and lines added to the path by these methods *must* be transformed according to the current transformation matrix as they are added."
   - id: 2d.path.beginPath
-    text: "The beginPath() method *must* empty the list of subpaths so that the context once again has zero subpaths<^>."
+    text: "The beginPath() method *must* empty the list of subpaths so that the context once again has zero subpaths."
   - id: 2d.path.moveTo
-    text: "The moveTo(x, y) method *must* create a new subpath with the specified point as its first (and only) point<^>."
+    text: "The moveTo(x, y) method *must* create a new subpath with the specified point as its first (and only) point."
   - id: 2d.path.ensure
-    text: "When the user agent is to ensure there is a subpath for a coordinate (x, y), the user agent must check to see if the context has any subpaths, and if it does not, then the user agent *must* create a new subpath with the point (x, y) as its first (and only) point, as if the moveTo() method had been called<^>."
+    text: "When the user agent is to ensure there is a subpath for a coordinate (x, y), the user agent must check to see if the context has any subpaths, and if it does not, then the user agent *must* create a new subpath with the point (x, y) as its first (and only) point, as if the moveTo() method had been called."
   - id: 2d.path.closePath.empty
-    text: "The closePath() method *must* do nothing if the context has no subpaths<^>."
+    text: "The closePath() method *must* do nothing if the context has no subpaths."
   - id: 2d.path.closePath.nonempty
-    text: "The closePath() method <...> *must* mark the last subpath as closed, create a new subpath whose first point is the same as the previous subpath's first point, and finally add this new subpath to the path<^>."
+    text: "The closePath() method <...> *must* mark the last subpath as closed, create a new subpath whose first point is the same as the previous subpath's first point, and finally add this new subpath to the path."
   - id: 2d.path.lineTo.empty
-    text: "The lineTo(x, y) method *must* ensure there is a subpath for (x, y) if the context has no subpaths<^>."
+    text: "The lineTo(x, y) method *must* ensure there is a subpath for (x, y) if the context has no subpaths."
   - id: 2d.path.lineTo.nonempty
-    text: "The lineTo(x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a straight line, and must then add the given point (x, y) to the subpath<^>."
+    text: "The lineTo(x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a straight line, and must then add the given point (x, y) to the subpath."
   - id: 2d.path.quadratic.empty
-    text: "The quadraticCurveTo(cpx, cpy, x, y) method *must* ensure there is a subpath for (cpx, cpy)<^>,"
+    text: "The quadraticCurveTo(cpx, cpy, x, y) method *must* ensure there is a subpath for (cpx, cpy),"
   - id: 2d.path.quadratic.nonempty
-    text: "The quadraticCurveTo(cpx, cpy, x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a quadratic B<...>zier curve with control point (cpx, cpy), and must then add the given point (x, y) to the subpath<^>."
+    text: "The quadraticCurveTo(cpx, cpy, x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a quadratic B<...>zier curve with control point (cpx, cpy), and must then add the given point (x, y) to the subpath."
   - id: 2d.path.bezier.empty
-    text: "The bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) method *must* ensure there is a subpath for (cp1x, cp1y)<^>,"
+    text: "The bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) method *must* ensure there is a subpath for (cp1x, cp1y),"
   - id: 2d.path.bezier.nonempty
-    text: "The bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a cubic B<...>zier curve with control points (cp1x, cp1y) and (cp2x, cp2y). Then, it must add the point (x, y) to the subpath<^>."
+    text: "The bezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) method <...> *must* connect the last point in the subpath to the given point (x, y) using a cubic B<...>zier curve with control points (cp1x, cp1y) and (cp2x, cp2y). Then, it must add the point (x, y) to the subpath."
   - id: 2d.path.arcTo.empty
-    text: "The arcTo(x1, y1, x2, y2, radius) method *must* first ensure there is a subpath for (x1, y1)<^>."
+    text: "The arcTo(x1, y1, x2, y2, radius) method *must* first ensure there is a subpath for (x1, y1)."
   - id: 2d.path.arcTo.negative
-    previously: [ 2, "arcTo(" ]
-    text: "Negative values for radius *must* cause the implementation to raise an INDEX_SIZE_ERR exception<^>."
+    text: "Negative values for radius *must* cause the implementation to raise an INDEX_SIZE_ERR exception."
   - id: 2d.path.arcTo.coincide.01
-    text: "If the point (x0, y0) is equal to the point (x1, y1)<^>, or if the point (x1, y1) is equal to the point (x2, y2), or if the radius radius is zero, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
+    text: "If the point (x0, y0) is equal to the point (x1, y1), or if the point (x1, y1) is equal to the point (x2, y2), or if the radius radius is zero, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
   - id: 2d.path.arcTo.coincide.12
-    text: "If the point (x0, y0) is equal to the point (x1, y1), or if the point (x1, y1) is equal to the point (x2, y2)<^>, or if the radius radius is zero, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
+    text: "If the point (x0, y0) is equal to the point (x1, y1), or if the point (x1, y1) is equal to the point (x2, y2), or if the radius radius is zero, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
   - id: 2d.path.arcTo.zeroradius
-    text: "If the point (x0, y0) is equal to the point (x1, y1), or if the point (x1, y1) is equal to the point (x2, y2), or if the radius radius is zero<^>, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
+    text: "If the point (x0, y0) is equal to the point (x1, y1), or if the point (x1, y1) is equal to the point (x2, y2), or if the radius radius is zero, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
   - id: 2d.path.arcTo.collinear
-    text: "if the points (x0, y0), (x1, y1), and (x2, y2) all lie on a single straight line, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line<^>."
+    text: "if the points (x0, y0), (x1, y1), and (x2, y2) all lie on a single straight line, then the method *must* add the point (x1, y1) to the subpath, and connect that point to the previous point (x0, y0) by a straight line."
   - id: 2d.path.arcTo.shape
-    text: "The method *must* connect the point (x0, y0) to the start tangent point by a straight line, adding the start tangent point to the subpath, and then must connect the start tangent point to the end tangent point by The Arc, adding the end tangent point to the subpath<^>."
+    text: "The method *must* connect the point (x0, y0) to the start tangent point by a straight line, adding the start tangent point to the subpath, and then must connect the start tangent point to the end tangent point by The Arc, adding the end tangent point to the subpath."
 
   - id: 2d.path.arc.nonempty
-    text: "If the context has any subpaths, then the method *must* add a straight line from the last point in the subpath to the start point of the arc<^>."
+    text: "If the context has any subpaths, then the method *must* add a straight line from the last point in the subpath to the start point of the arc."
   - id: 2d.path.arc.draw
-    text: "it *must* draw the arc between the start point of the arc and the end point of the arc, and add the start and end points of the arc to the subpath<^>."
+    text: "it *must* draw the arc between the start point of the arc and the end point of the arc, and add the start and end points of the arc to the subpath."
   - id: 2d.path.arc.zero
-    text: "If the two points are the same, or if the radius is zero<^>, then the arc is defined as being of zero length in both directions."
+    text: "If the two points are the same, or if the radius is zero, then the arc is defined as being of zero length in both directions."
   - id: 2d.path.arc.negative
-    previously: [ 2, "anticlockwise" ]
-    text: "Negative values for radius *must* cause the implementation to raise an INDEX_SIZE_ERR exception<^>."
+    text: "Negative values for radius *must* cause the implementation to raise an INDEX_SIZE_ERR exception."
 
   - id: 2d.path.rect.subpath
-    text: "The rect(x, y, w, h) method *must* create a new subpath containing just the four points (x, y), (x+w, y), (x+w, y+h), (x, y+h), with those four points connected by straight lines<^>"
+    text: "The rect(x, y, w, h) method *must* create a new subpath containing just the four points (x, y), (x+w, y), (x+w, y+h), (x, y+h), with those four points connected by straight lines"
   - id: 2d.path.rect.closed
-    text: "The rect(x, y, w, h) method <...> *must* then mark the subpath as closed<^>."
+    text: "The rect(x, y, w, h) method <...> *must* then mark the subpath as closed."
   - id: 2d.path.rect.newsubpath
-    text: "The rect(x, y, w, h) method <...> *must* then create a new subpath with the point (x, y) as the only point in the subpath<^>."
+    text: "The rect(x, y, w, h) method <...> *must* then create a new subpath with the point (x, y) as the only point in the subpath."
 
   - id: 2d.path.fill.basic
-    text: "The fill() method *must* fill all the subpaths of the current path, using fillStyle, and using the non-zero winding number rule<^>."
+    text: "The fill() method *must* fill all the subpaths of the current path, using fillStyle, and using the non-zero winding number rule."
   - id: 2d.path.fill.closed
-    text: "Open subpaths *must* be implicitly closed when being filled (without affecting the actual subpaths)<^>."
+    text: "Open subpaths *must* be implicitly closed when being filled (without affecting the actual subpaths)."
   - id: 2d.path.stroke.basic
-    text: "The stroke() method *must* calculate the strokes of all the subpaths of the current path, using the lineWidth, lineCap, lineJoin, and (if appropriate) miterLimit attributes, and then fill the combined stroke area using the strokeStyle attribute<^>."
+    text: "The stroke() method *must* calculate the strokes of all the subpaths of the current path, using the lineWidth, lineCap, lineJoin, and (if appropriate) miterLimit attributes, and then fill the combined stroke area using the strokeStyle attribute."
   - id: 2d.path.unaffected
-    text: "Paths, when filled or stroked, *must* be painted without affecting the current path<^>"
+    text: "Paths, when filled or stroked, *must* be painted without affecting the current path"
   - id: 2d.path.subjected
-    text: "Paths, when filled or stroked, <...> *must* be subject to shadow effects, global alpha, the clipping region, and global composition operators<^>."
+    text: "Paths, when filled or stroked, <...> *must* be subject to shadow effects, global alpha, the clipping region, and global composition operators."
 
   - id: 2d.path.stroke.prune
-    text: "Zero-length line segments *must* be pruned before stroking a path<^>."
+    text: "Zero-length line segments *must* be pruned before stroking a path."
   - id: 2d.path.stroke.empty
-    text: "Empty subpaths *must* be ignored<^>."
+    text: "Empty subpaths *must* be ignored."
 
   - id: 2d.path.clip.basic
-    text: "The clip() method *must* create a new clipping region by calculating the intersection of the current clipping region and the area described by the current path, using the non-zero winding number rule<^>."
+    text: "The clip() method *must* create a new clipping region by calculating the intersection of the current clipping region and the area described by the current path, using the non-zero winding number rule."
   - id: 2d.path.clip.closed
-    text: "Open subpaths *must* be implicitly closed when computing the clipping region, without affecting the actual subpaths<^>."
+    text: "Open subpaths *must* be implicitly closed when computing the clipping region, without affecting the actual subpaths."
   - id: 2d.path.clip.initial
-    text: "When the context is initialized, the clipping region *must* be set to the rectangle with the top left corner at (0,0) and the width and height of the coordinate space<^>."
+    text: "When the context is initialized, the clipping region *must* be set to the rectangle with the top left corner at (0,0) and the width and height of the coordinate space."
   - id: 2d.path.isPointInPath
-    text: "The isPointInPath(x, y) method *must* return true if the point given by the x and y coordinates passed to the method, when treated as coordinates in the canvas coordinate space unaffected by the current transformation, is inside the current path as determined by the non-zero winding number rule; and must return false otherwise<^>."
+    text: "The isPointInPath(x, y) method *must* return true if the point given by the x and y coordinates passed to the method, when treated as coordinates in the canvas coordinate space unaffected by the current transformation, is inside the current path as determined by the non-zero winding number rule; and must return false otherwise."
   - id: 2d.path.isPointInPath.edge
-    text: "The isPointInPath(x, y) method *must* return true if <...>. Points on the path itself are considered to be inside the path<^>."
+    text: "The isPointInPath(x, y) method *must* return true if <...>. Points on the path itself are considered to be inside the path."
   - id: 2d.path.isPointInPath.nonfinite
-    text: "If either of the arguments is infinite or NaN, then the method *must* return false<^>."
+    text: "If either of the arguments is infinite or NaN, then the method *must* return false."
 
   # TODO: Focus management
 
   - id: 2d.text.font.parse
-    text: "The font IDL attribute, on setting, *must* be parsed the same way as the 'font' property of CSS (but without supporting property-independent style sheet syntax like 'inherit')<^>,"
+    text: "The font IDL attribute, on setting, *must* be parsed the same way as the 'font' property of CSS (but without supporting property-independent style sheet syntax like 'inherit'),"
   - id: 2d.text.font.lineheight
-    text: "The font IDL attribute, on setting, *must* be parsed <...> with the 'line-height' component forced to 'normal'<^>,"
+    text: "The font IDL attribute, on setting, *must* be parsed <...> with the 'line-height' component forced to 'normal',"
   - id: 2d.text.font.fontsize
-    text: "The font IDL attribute, on setting, *must* be parsed <...> with the 'font-size' component converted to CSS pixels<^>,"
+    text: "The font IDL attribute, on setting, *must* be parsed <...> with the 'font-size' component converted to CSS pixels,"
   - id: 2d.text.font.systemfonts
-    text: "The font IDL attribute, on setting, *must* be parsed <...> with system fonts being computed to explicit values<^>."
+    text: "The font IDL attribute, on setting, *must* be parsed <...> with system fonts being computed to explicit values."
   - id: 2d.text.font.invalid
-    text: "If the new value is syntactically incorrect (including using property-independent style sheet syntax like 'inherit' or 'initial'), then it *must* be ignored, without assigning a new font value<^>."
+    text: "If the new value is syntactically incorrect (including using property-independent style sheet syntax like 'inherit' or 'initial'), then it *must* be ignored, without assigning a new font value."
 
   - id: 2d.text.font.fontface
-    text: "Font names must be interpreted in the context of the canvas element's stylesheets; any fonts embedded using @font-face *must* therefore be available once they are loaded<^>."
+    text: "Font names must be interpreted in the context of the canvas element's stylesheets; any fonts embedded using @font-face *must* therefore be available once they are loaded."
   - id: 2d.text.font.notfullyloaded
-    text: "If a font is referenced before it is fully loaded, then it *must* be treated as if it was an unknown font, falling back to another as described by the relevant CSS specifications<^>."
+    text: "If a font is referenced before it is fully loaded, then it *must* be treated as if it was an unknown font, falling back to another as described by the relevant CSS specifications."
   - id: 2d.text.font.get
-    text: "On getting, the font attribute *must* return the serialized form of the current font of the context (with no 'line-height' component)<^>."
+    text: "On getting, the font attribute *must* return the serialized form of the current font of the context (with no 'line-height' component)."
   - id: 2d.text.font.default
-    text: "When the context is created, the font of the context *must* be set to 10px sans-serif<^>."
+    text: "When the context is created, the font of the context *must* be set to 10px sans-serif."
   - id: 2d.text.font.size
-    text: "When the 'font-size' component is set to lengths using percentages, 'em' or 'ex' units, or the 'larger' or 'smaller' keywords, these *must* be interpreted relative to the computed value of the 'font-size' property of the corresponding canvas element at the time that the attribute is set<^>."
+    text: "When the 'font-size' component is set to lengths using percentages, 'em' or 'ex' units, or the 'larger' or 'smaller' keywords, these *must* be interpreted relative to the computed value of the 'font-size' property of the corresponding canvas element at the time that the attribute is set."
   - id: 2d.text.font.weight
-    text: "When the 'font-weight' component is set to the relative values 'bolder' and 'lighter', these *must* be interpreted relative to the computed value of the 'font-weight' property of the corresponding canvas element at the time that the attribute is set<^>."
+    text: "When the 'font-weight' component is set to the relative values 'bolder' and 'lighter', these *must* be interpreted relative to the computed value of the 'font-weight' property of the corresponding canvas element at the time that the attribute is set."
   - id: 2d.text.font.undefined
-    text: "If the computed values are undefined for a particular case (e.g. because the canvas element is not in a Document), then the relative keywords *must* be interpreted relative to the normal-weight 10px sans-serif default<^>."
+    text: "If the computed values are undefined for a particular case (e.g. because the canvas element is not in a Document), then the relative keywords *must* be interpreted relative to the normal-weight 10px sans-serif default."
   - id: 2d.text.align.get
-    text: "The textAlign IDL attribute, on getting, *must* return the current value<^>."
+    text: "The textAlign IDL attribute, on getting, *must* return the current value."
   - id: 2d.text.align.set
-    text: "On setting, if the value is one of start, end, left, right, or center, then the value *must* be changed to the new value<^>."
+    text: "On setting, if the value is one of start, end, left, right, or center, then the value *must* be changed to the new value."
   - id: 2d.text.align.invalid
-    text: "The textAlign IDL attribute, <...> Otherwise, the new value *must* be ignored<^>."
+    text: "The textAlign IDL attribute, <...> Otherwise, the new value *must* be ignored."
   - id: 2d.text.align.default
-    text: "When the context is created, the textAlign attribute *must* initially have the value start<^>."
+    text: "When the context is created, the textAlign attribute *must* initially have the value start."
   - id: 2d.text.baseline.get
-    text: "The textBaseline IDL attribute, on getting, *must* return the current value<^>."
+    text: "The textBaseline IDL attribute, on getting, *must* return the current value."
   - id: 2d.text.baseline.set
-    text: "On setting, if the value is one of top, hanging, middle, alphabetic, ideographic, or bottom, then the value *must* be changed to the new value<^>."
+    text: "On setting, if the value is one of top, hanging, middle, alphabetic, ideographic, or bottom, then the value *must* be changed to the new value."
   - id: 2d.text.baseline.invalid
-    text: "The textBaseline IDL attribute, <...> Otherwise, the new value *must* be ignored<^>."
+    text: "The textBaseline IDL attribute, <...> Otherwise, the new value *must* be ignored."
   - id: 2d.text.baseline.default
-    text: "When the context is created, the textBaseline attribute *must* initially have the value alphabetic<^>."
+    text: "When the context is created, the textBaseline attribute *must* initially have the value alphabetic."
 
   - id: 2d.text.draw
-    text: "The fillText() and strokeText() methods <...> when the methods are called, the user agent *must* run the following steps<^>:"
+    text: "The fillText() and strokeText() methods <...> when the methods are called, the user agent *must* run the following steps:"
   - id: 2d.text.draw.spaces
-    text: "Replace all the space characters in text with U+0020 SPACE characters<^>."
+    text: "Replace all the space characters in text with U+0020 SPACE characters."
   - id: 2d.text.draw.direction
-    text: "the 'direction' property of the inline box set to the directionality of the canvas element<^>,"
+    text: "the 'direction' property of the inline box set to the directionality of the canvas element,"
   - id: 2d.text.draw.maxwidth
-    text: "If the maxWidth argument was specified and the hypothetical width of the inline box in the hypothetical line box is greater than maxWidth CSS pixels, then change font to have a more condensed font (if one is available or if a reasonably readable one can be synthesized by applying a horizontal scale factor to the font) or a smaller font, and return to the previous step<^>."
+    text: "If the maxWidth argument was specified and the hypothetical width of the inline box in the hypothetical line box is greater than maxWidth CSS pixels, then change font to have a more condensed font (if one is available or if a reasonably readable one can be synthesized by applying a horizontal scale factor to the font) or a smaller font, and return to the previous step."
   - id: 2d.text.align.left
-    text: "Let the anchor point's horizontal position be the left edge of the inline box<^>."
+    text: "Let the anchor point's horizontal position be the left edge of the inline box."
   - id: 2d.text.align.right
-    text: "Let the anchor point's horizontal position be the right edge of the inline box<^>."
+    text: "Let the anchor point's horizontal position be the right edge of the inline box."
   - id: 2d.text.align.center
-    text: "Let the anchor point's horizontal position be half way between the left and right edges of the inline box<^>."
+    text: "Let the anchor point's horizontal position be half way between the left and right edges of the inline box."
 
   - id: 2d.text.baseline.top
-    text: "Let the anchor point's vertical position be the top of the em box of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be the top of the em box of the first available font of the inline box."
   - id: 2d.text.baseline.hanging
-    text: "Let the anchor point's vertical position be the hanging baseline of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be the hanging baseline of the first available font of the inline box."
   - id: 2d.text.baseline.middle
-    text: "Let the anchor point's vertical position be half way between the bottom and the top of the em box of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be half way between the bottom and the top of the em box of the first available font of the inline box."
   - id: 2d.text.baseline.alphabetic
-    text: "Let the anchor point's vertical position be the alphabetic baseline of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be the alphabetic baseline of the first available font of the inline box."
   - id: 2d.text.baseline.ideographic
-    text: "Let the anchor point's vertical position be the ideographic baseline of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be the ideographic baseline of the first available font of the inline box."
   - id: 2d.text.baseline.bottom
-    text: "Let the anchor point's vertical position be the bottom of the em box of the first available font of the inline box<^>."
+    text: "Let the anchor point's vertical position be the bottom of the em box of the first available font of the inline box."
 
   - id: 2d.text.draw.fill
-    text: "For fillText() fillStyle must be applied to the glyphs and strokeStyle *must* be ignored<^>."
+    text: "For fillText() fillStyle must be applied to the glyphs and strokeStyle *must* be ignored."
   - id: 2d.text.draw.stroke
-    text: "For strokeText() the reverse holds and strokeStyle must be applied to the glyph outlines and fillStyle *must* be ignored<^>."
+    text: "For strokeText() the reverse holds and strokeStyle must be applied to the glyph outlines and fillStyle *must* be ignored."
   - id: 2d.text.measure.spaces
-    text: "When the method is invoked, the user agent *must* replace all the space characters in text with U+0020 SPACE characters<^>,"
+    text: "When the method is invoked, the user agent *must* replace all the space characters in text with U+0020 SPACE characters,"
   - id: 2d.text.measure
-    text: "When the method is invoked, the user agent <...> *must* form a hypothetical infinitely wide CSS line box containing a single inline box containing the text text, with all the properties at their initial values except the 'white-space' property of the inline element set to 'pre' and the 'font' property of the inline element set to the current font of the context as given by the font attribute, and must then return a new TextMetrics object with its width attribute set to the width of that inline box, in CSS pixels<^>."
+    text: "When the method is invoked, the user agent <...> *must* form a hypothetical infinitely wide CSS line box containing a single inline box containing the text text, with all the properties at their initial values except the 'white-space' property of the inline element set to 'pre' and the 'font' property of the inline element set to the current font of the context as given by the font attribute, and must then return a new TextMetrics object with its width attribute set to the width of that inline box, in CSS pixels."
 
   - id: 2d.drawImage.defaultdest
-    text: "If not specified, the dw and dh arguments *must* default to the values of sw and sh, interpreted such that one CSS pixel in the image is treated as one unit in the canvas coordinate space<^>."
+    text: "If not specified, the dw and dh arguments *must* default to the values of sw and sh, interpreted such that one CSS pixel in the image is treated as one unit in the canvas coordinate space."
   - id: 2d.drawImage.defaultsource
-    text: "If the sx, sy, sw, and sh arguments are omitted, they *must* default to 0, 0, the image's intrinsic width in image pixels, and the image's intrinsic height in image pixels, respectively<^>."
+    text: "If the sx, sy, sw, and sh arguments are omitted, they *must* default to 0, 0, the image's intrinsic width in image pixels, and the image's intrinsic height in image pixels, respectively."
   - id: 2d.drawImage.IDL
-    text: "void drawImage(in HTMLVideoElement image, in double sx, in double sy, in double sw, in double sh, in double dx, in double dy, in double dw, in double dh);<^>"
+    text: "void drawImage(in HTMLVideoElement image, in double sx, in double sy, in double sw, in double sh, in double dx, in double dy, in double dw, in double dh);"
   - id: 2d.drawImage.incomplete.image
-    text: "If the image argument is an HTMLImageElement object that is not fully decodable<^><...> then the implementation *must* return without drawing anything."
+    text: "If the image argument is an HTMLImageElement object that is not fully decodable<...> then the implementation *must* return without drawing anything."
   - id: 2d.drawImage.incomplete.video
-    previously: [ 6, "dw and dh" ]
-    text: "If the image argument is <...> an HTMLVideoElement object whose readyState attribute is either HAVE_NOTHING or HAVE_METADATA<^>, then the implementation *must* return without drawing anything."
+    text: "If the image argument is <...> an HTMLVideoElement object whose readyState attribute is either HAVE_NOTHING or HAVE_METADATA, then the implementation *must* return without drawing anything."
   - id: 2d.drawImage.zerocanvas
-    previously: [ 10, "dw and dh" ]
-    text: "If the image argument is an HTMLCanvasElement or an OffscreenCanvas object with either a horizontal dimension or a vertical dimension equal to zero, then the implementation *must* throw an INVALID_STATE_ERR exception<^>."
+    text: "If the image argument is an HTMLCanvasElement or an OffscreenCanvas object with either a horizontal dimension or a vertical dimension equal to zero, then the implementation *must* throw an INVALID_STATE_ERR exception."
   - id: 2d.drawImage.zerosource
-    text: "If one of the sw or sh arguments is zero<^>, the implementation *must* return without drawing anything."
+    text: "If one of the sw or sh arguments is zero, the implementation *must* return without drawing anything."
   - id: 2d.drawImage.paint
-    text: "When drawImage() is invoked, the region of the image specified by the source rectangle *must* be painted on the region of the canvas specified by the destination rectangle<^>, after applying the current transformation matrix to the points of the destination rectangle."
+    text: "When drawImage() is invoked, the region of the image specified by the source rectangle *must* be painted on the region of the canvas specified by the destination rectangle, after applying the current transformation matrix to the points of the destination rectangle."
   - id: 2d.drawImage.original
-    text: "The original image data of the source image *must* be used, not the image as it is rendered (e.g. width and height attributes on the source element have no effect)<^>."
+    text: "The original image data of the source image *must* be used, not the image as it is rendered (e.g. width and height attributes on the source element have no effect)."
   - id: 2d.drawImage.direction
-    text: "The image data *must* be processed in the original direction, even if the dimensions given are negative<^>."
+    text: "The image data *must* be processed in the original direction, even if the dimensions given are negative."
   - id: 2d.drawImage.self
-    text: "When a canvas is drawn onto itself, the drawing model requires the source to be copied before the image is drawn back onto the canvas, so it is possible to copy parts of a canvas onto overlapping parts of itself<^>."
+    text: "When a canvas is drawn onto itself, the drawing model requires the source to be copied before the image is drawn back onto the canvas, so it is possible to copy parts of a canvas onto overlapping parts of itself."
   - id: 2d.drawImage.animated.image
-    text: "When the drawImage() method is passed an animated image as its image argument, the user agent *must* use the poster frame of the animation, or, if there is no poster frame, the first frame of the animation<^>."
+    text: "When the drawImage() method is passed an animated image as its image argument, the user agent *must* use the poster frame of the animation, or, if there is no poster frame, the first frame of the animation."
   - id: 2d.drawImage.animated.video
-    previously: [ 4, "drawImage" ]
-    text: "When the image argument is an HTMLVideoElement, then the frame at the current playback position *must* be used as the source image<^>,"
+    text: "When the image argument is an HTMLVideoElement, then the frame at the current playback position *must* be used as the source image,"
   - id: 2d.drawImage.video.size
-    previously: [ 4, "drawImage" ]
-    text: "When the image argument is an HTMLVideoElement, <...> the source image's dimensions *must* be the intrinsic width and intrinsic height of the media resource (i.e. after any aspect-ratio correction has been applied)<^>."
+    text: "When the image argument is an HTMLVideoElement, <...> the source image's dimensions *must* be the intrinsic width and intrinsic height of the media resource (i.e. after any aspect-ratio correction has been applied)."
   - id: 2d.drawImage.unaffect
-    text: "Images are painted without affecting the current path<^>"
+    text: "Images are painted without affecting the current path"
   - id: 2d.drawImage.subject
-    text: "Images are painted without affecting the current path, and are subject to shadow effects, global alpha, the clipping region, and global composition operators<^>."
+    text: "Images are painted without affecting the current path, and are subject to shadow effects, global alpha, the clipping region, and global composition operators."
 
 
   - id: 2d.imageData.create2.object
-    text: "When the method is invoked with two arguments sw and sh, it *must* return an ImageData object<^>"
+    text: "When the method is invoked with two arguments sw and sh, it *must* return an ImageData object"
   - id: 2d.imageData.create2.size
-    text: "When the method is invoked with two arguments sw and sh, it *must* return an ImageData object representing a rectangle with a width in CSS pixels equal to the absolute magnitude of sw and a height in CSS pixels equal to the absolute magnitude of sh<^>."
+    text: "When the method is invoked with two arguments sw and sh, it *must* return an ImageData object representing a rectangle with a width in CSS pixels equal to the absolute magnitude of sw and a height in CSS pixels equal to the absolute magnitude of sh."
   - id: 2d.imageData.create1.object
-    text: "When invoked with a single imagedata argument, it *must* return an ImageData object<^>"
+    text: "When invoked with a single imagedata argument, it *must* return an ImageData object"
   - id: 2d.imageData.create1.size
-    text: "When invoked with a single imagedata argument, it *must* return an ImageData object representing a rectangle with the same dimensions as the ImageData object passed as the argument<^>."
+    text: "When invoked with a single imagedata argument, it *must* return an ImageData object representing a rectangle with the same dimensions as the ImageData object passed as the argument."
   - id: 2d.imageData.create.initial
-    text: "The ImageData object returned must be filled with transparent black<^>."
+    text: "The ImageData object returned must be filled with transparent black."
 
   - id: 2d.imageData.get.object
-    text: "The getImageData(sx, sy, sw, sh) method *must* return an ImageData object<^>"
+    text: "The getImageData(sx, sy, sw, sh) method *must* return an ImageData object"
   - id: 2d.imageData.get.basic
-    text: "The getImageData(sx, sy, sw, sh) method *must* return an ImageData object representing the underlying pixel data for the area of the canvas denoted by the rectangle whose corners are the four points (sx, sy), (sx+sw, sy), (sx+sw, sy+sh), (sx, sy+sh), in canvas coordinate space units<^>."
+    text: "The getImageData(sx, sy, sw, sh) method *must* return an ImageData object representing the underlying pixel data for the area of the canvas denoted by the rectangle whose corners are the four points (sx, sy), (sx+sw, sy), (sx+sw, sy+sh), (sx, sy+sh), in canvas coordinate space units."
   - id: 2d.imageData.get.outside
-    text: "Pixels outside the canvas *must* be returned as transparent black<^>."
+    text: "Pixels outside the canvas *must* be returned as transparent black."
   - id: 2d.imageData.get.premul
-    text: "Pixels *must* be returned as non-premultiplied alpha values<^>."
+    text: "Pixels *must* be returned as non-premultiplied alpha values."
 
   - id: 2d.imageData.getcreate.nonfinite
-    text: "If any of the arguments to createImageData() or getImageData() are infinite or NaN<^>, the method *must* instead raise a NOT_SUPPORTED_ERR exception."
+    text: "If any of the arguments to createImageData() or getImageData() are infinite or NaN, the method *must* instead raise a NOT_SUPPORTED_ERR exception."
   - id: 2d.imageData.create.null
-    text: "ImageData createImageData(in ImageData imagedata);<^>"
+    text: "ImageData createImageData(in ImageData imagedata);"
   - id: 2d.imageData.getcreate.zero
-    text: "If either the sw or sh arguments are zero, the method *must* instead raise an INDEX_SIZE_ERR exception<^>."
+    text: "If either the sw or sh arguments are zero, the method *must* instead raise an INDEX_SIZE_ERR exception."
 
   - id: 2d.imageData.initial
-    text: "ImageData objects *must* be initialized so that their width attribute is set to w, the number of physical device pixels per row in the image data, their height attribute is set to h, the number of rows in the image data, and their data attribute is initialized to a CanvasPixelArray object holding the image data<^>."
+    text: "ImageData objects *must* be initialized so that their width attribute is set to w, the number of physical device pixels per row in the image data, their height attribute is set to h, the number of rows in the image data, and their data attribute is initialized to a CanvasPixelArray object holding the image data."
   - id: 2d.imageData.one
-    text: "At least one pixel's worth of image data *must* be returned<^>."
+    text: "At least one pixel's worth of image data *must* be returned."
   - id: 2d.pixelarray.order
-    text: "The data *must* be represented in left-to-right order, row by row top to bottom, starting with the top left, with each pixel's red, green, blue, and alpha components being given in that order for each pixel<^>."
+    text: "The data *must* be represented in left-to-right order, row by row top to bottom, starting with the top left, with each pixel's red, green, blue, and alpha components being given in that order for each pixel."
   - id: 2d.pixelarray.range
-    text: "Each component of each device pixel represented in this array *must* be in the range 0..255, representing the 8 bit value for that component<^>."
+    text: "Each component of each device pixel represented in this array *must* be in the range 0..255, representing the 8 bit value for that component."
   - id: 2d.pixelarray.indexes
-    text: "The components *must* be assigned consecutive indices starting with 0 for the top left pixel's red component<^>."
+    text: "The components *must* be assigned consecutive indices starting with 0 for the top left pixel's red component."
   - id: 2d.pixelarray.length
-    text: "The length attribute of a CanvasPixelArray object *must* return this number<^>."
+    text: "The length attribute of a CanvasPixelArray object *must* return this number."
   - id: 2d.pixelarray.retrieve
-    text: "To determine the value of an indexed property index, the user agent *must* return the value of the indexth component in the array<^>."
+    text: "To determine the value of an indexed property index, the user agent *must* return the value of the indexth component in the array."
   - id: 2d.pixelarray.modify
-    text: "To set the value of an existing indexed property index to value value, the value of the indexth component in the array *must* be set to value<^>."
+    text: "To set the value of an existing indexed property index to value value, the value of the indexth component in the array *must* be set to value."
 
   - id: 2d.imageData.put.nonfinite
-    text: "If any of the arguments to the method are infinite or NaN, the method *must* raise a NOT_SUPPORTED_ERR exception<^>."
+    text: "If any of the arguments to the method are infinite or NaN, the method *must* raise a NOT_SUPPORTED_ERR exception."
   - id: 2d.imageData.put.wrongtype
-    text: "void putImageData(in ImageData imagedata, in double dx, in double dy);<...>void putImageData(in ImageData imagedata, in double dx, in double dy, in double dirtyX, in double dirtyY, in double dirtyWidth, in double dirtyHeight);<^>"
+    text: "void putImageData(in ImageData imagedata, in double dx, in double dy);<...>void putImageData(in ImageData imagedata, in double dx, in double dy, in double dirtyX, in double dirtyY, in double dirtyWidth, in double dirtyHeight);"
   - id: 2d.imageData.put.3arg
-    text: "When the last four arguments are omitted, they *must* be assumed to have the values 0, 0, the width member of the imagedata structure, and the height member of the imagedata structure, respectively<^>."
+    text: "When the last four arguments are omitted, they *must* be assumed to have the values 0, 0, the width member of the imagedata structure, and the height member of the imagedata structure, respectively."
   - id: 2d.imageData.put.normal
-    text: "When invoked with arguments that do not, per the last few paragraphs, cause an exception to be raised, the putImageData() method *must* act as follows<^>:"
+    text: "When invoked with arguments that do not, per the last few paragraphs, cause an exception to be raised, the putImageData() method *must* act as follows:"
 
   - id: 2d.imageData.unchanged
-    text: "the following *must* result in no visible changes to the rendering<^>:"
+    text: "the following *must* result in no visible changes to the rendering:"
   - id: 2d.imageData.createround
-    text: "...*must* return ImageData objects with the same dimensions, for any value of w and h<^>."
+    text: "...*must* return ImageData objects with the same dimensions, for any value of w and h."
   - id: 2d.imageData.unaffected
-    text: "The current path, transformation matrix, shadow attributes, global alpha, the clipping region, and global composition operator *must* not affect the getImageData() and putImageData() methods<^>."
+    text: "The current path, transformation matrix, shadow attributes, global alpha, the clipping region, and global composition operator *must* not affect the getImageData() and putImageData() methods."
 
   - id: 2d.drawingmodel
-    text: "When a shape or image is painted, user agents *must* follow these steps, in the order given (or act as if they do)<^>:"
+    text: "When a shape or image is painted, user agents *must* follow these steps, in the order given (or act as if they do):"
 
   - id: 2d.colorspace.correction
-    text: "The canvas APIs *must* perform color correction at only two points: when rendering images with their own gamma correction and color space information onto the canvas, to convert the image to the color space used by the canvas (e.g. using the 2D Context's drawImage() method with an HTMLImageElement object)<^>,"
+    text: "The canvas APIs *must* perform color correction at only two points: when rendering images with their own gamma correction and color space information onto the canvas, to convert the image to the color space used by the canvas (e.g. using the 2D Context's drawImage() method with an HTMLImageElement object),"
   - id: 2d.colorspace.toDataURL.info
-    text: "The toDataURL() method *must* not include color space information in the resource returned<^>."
+    text: "The toDataURL() method *must* not include color space information in the resource returned."
   - id: 2d.colorspace.toDataURL.equal
-    text: "Where the output format allows it, the color of pixels in resources created by toDataURL() *must* match those returned by the getImageData() method<^>."
+    text: "Where the output format allows it, the color of pixels in resources created by toDataURL() *must* match those returned by the getImageData() method."
   - id: 2d.colorspace.match
-    text: "In user agents that support CSS, the color space used by a canvas element *must* match the color space used for processing any colors for that element in CSS<^>."
+    text: "In user agents that support CSS, the color space used by a canvas element *must* match the color space used for processing any colors for that element in CSS."
   - id: 2d.colorspace.img.equal
-    text: "The gamma correction and color space information of images *must* be handled in such a way that an image rendered directly using an img element would use the same colors as one painted on a canvas element that is then itself rendered<^>."
+    text: "The gamma correction and color space information of images *must* be handled in such a way that an image rendered directly using an img element would use the same colors as one painted on a canvas element that is then itself rendered."
   - id: 2d.colorspace.img.noinfo
-    text: "Furthermore, the rendering of images that have no color correction information (such as those returned by the toDataURL() method) *must* be rendered with no color correction<^>."
+    text: "Furthermore, the rendering of images that have no color correction information (such as those returned by the toDataURL() method) *must* be rendered with no color correction."
 
   - id: 2d.scrollPathIntoView.basic
-    text: "The scrollPathIntoView() method, when invoked, *must* run these steps<^>:"
+    text: "The scrollPathIntoView() method, when invoked, *must* run these steps:"
 
   - id: security.start
-    text: "All canvas elements *must* start with their origin-clean set to true<^>."
+    text: "All canvas elements *must* start with their origin-clean set to true."
   - id: security.drawImage.image
     keyword: must
-    text: "The element's 2D context's drawImage() method is called with an HTMLImageElement or an HTMLVideoElement whose origin is not the same as that of the Document object that owns the canvas element<^>."
+    text: "The element's 2D context's drawImage() method is called with an HTMLImageElement or an HTMLVideoElement whose origin is not the same as that of the Document object that owns the canvas element."
   - id: security.drawImage.canvas
     keyword: must
-    text: "The element's 2D context's drawImage() method is called with an HTMLCanvasElement whose origin-clean flag is false<^>."
+    text: "The element's 2D context's drawImage() method is called with an HTMLCanvasElement whose origin-clean flag is false."
   - id: security.fillStyle.image
     keyword: must
-    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement<^> or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
+    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
   - id: security.fillStyle.video
     keyword: must
-    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement<^> whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
+    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
   - id: security.fillStyle.canvas
     keyword: must
-    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLCanvasElement whose origin-clean flag was false when the pattern was created<^>."
+    text: "The element's 2D context's fillStyle attribute is set to a CanvasPattern object that was created from an HTMLCanvasElement whose origin-clean flag was false when the pattern was created."
   - id: security.strokeStyle.image
     keyword: must
-    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement<^> or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
+    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
   - id: security.strokeStyle.video
     keyword: must
-    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement<^> whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
+    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLImageElement or an HTMLVideoElement whose origin was not the same as that of the Document object that owns the canvas element when the pattern was created."
   - id: security.strokeStyle.canvas
     keyword: must
-    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLCanvasElement whose origin-clean flag was false when the pattern was created<^>."
+    text: "The element's 2D context's strokeStyle attribute is set to a CanvasPattern object that was created from an HTMLCanvasElement whose origin-clean flag was false when the pattern was created."
   - id: security.toDataURL
-    text: "Whenever the toDataURL() method of a canvas element whose origin-clean flag is set to false is called, the method *must* raise a SECURITY_ERR exception<^>."
+    text: "Whenever the toDataURL() method of a canvas element whose origin-clean flag is set to false is called, the method *must* raise a SECURITY_ERR exception."
   - id: security.getImageData
-    text: "Whenever the getImageData() method of the 2D context of a canvas element whose origin-clean flag is set to false is called with otherwise correct arguments, the method *must* raise a SECURITY_ERR exception<^>."
+    text: "Whenever the getImageData() method of the 2D context of a canvas element whose origin-clean flag is set to false is called with otherwise correct arguments, the method *must* raise a SECURITY_ERR exception."
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml
--- firefox-84.0.2+build1/testing/web-platform/tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/canvas/tools/yaml/element/drawing-images-to-the-canvas.yaml	2021-01-18 19:58:23.000000000 +0000
@@ -439,6 +439,15 @@
     @assert pixel 50,25 ==~ 0,255,0,255; @moz-todo
   expected: green
 
+- name: 2d.drawImage.nonexistent
+  testing:
+  - 2d.drawImage.incomplete.image
+  images:
+  - not-found-at-all.png
+  code: |
+    var img = document.getElementById('not-found-at-all.png');
+    @assert throws INVALID_STATE_ERR ctx.drawImage(img, 0, 0);
+
 - name: 2d.drawImage.zerocanvas
   desc: drawImage with zero-sized canvas as the source shoud throw exception
   testing:
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw-from-coop.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw-from-coop.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw-from-coop.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw-from-coop.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -4,6 +4,7 @@
   <title>
     Check ServiceWorkers can set COOP/COEP headers for documents's responses
   </title>
+  <meta name="timeout" content="long">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/common/utils.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/popup-coop-by-sw.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -4,6 +4,7 @@
   <title>
     Check ServiceWorkers can set COOP/COEP headers for documents's responses
   </title>
+  <meta name="timeout" content="long">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/common/utils.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro_cross-origin.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -22,7 +22,7 @@
   const report_token = token();
   const openee_token = token();
 
-  const opener_url = location.href;
+  const opener_origin = location.origin + '/';
 
   const reportTo = reportToHeaders(report_token);
   const openee_url = cross_origin + executor_path +
@@ -52,7 +52,7 @@
   assert_equals(report.body.openerURL, "");
   assert_equals(report.body.openeeURL, undefined);
   assert_equals(report.body.otherDocumentURL, undefined);
-  assert_equals(report.body.referrer, opener_url);
+  assert_equals(report.body.referrer, opener_origin);
   assert_equals(report.body.initialPopupURL, undefined);
 }, name);
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro_cross-origin.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -23,7 +23,7 @@
   const openee_token = token();
   const opener_token = token(); // The current test window.
 
-  const opener_url = location.href;
+  const opener_origin = location.origin + '/';
 
   const reportTo = reportToHeaders(report_token);
   const openee_url = cross_origin + executor_path +
@@ -59,7 +59,7 @@
   assert_equals(report.body.openerURL, "");
   assert_equals(report.body.openeeURL, undefined);
   assert_equals(report.body.otherDocumentURL, undefined);
-  assert_equals(report.body.referrer, opener_url);
+  assert_equals(report.body.referrer, opener_origin);
   assert_equals(report.body.initialPopupURL, undefined);
 }, name);
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-opener.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,68 @@
+<title>
+  Reports a browsing context group switch when an opener with COOP navigates.
+</title>
+<meta name=timeout content=long>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/get-host-info.sub.js></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/dispatcher.js"></script>
+<script>
+
+const directory = "/html/cross-origin-opener-policy/reporting";
+const executor_path = directory + "/resources/executor.html?pipe=";
+const same_origin = get_host_info().HTTPS_ORIGIN;
+
+let escapeComma = url => url.replace(/,/g, '\\,');
+
+promise_test(async t => {
+  // The test window.
+ const this_window_token = token();
+
+  // The "opener" window.
+  const opener_token = token();
+  const opener_url = same_origin + executor_path + `&uuid=${opener_token}`;
+
+  // The "openee" window.
+  const openee_token = token();
+  const openee_url = same_origin + executor_path + `&uuid=${openee_token}`;
+
+  // The "final" url the opener will navigate to. It has COOP and a reporter.
+  const final_report_token= token();
+  const final_token = token();
+  const final_reportTo = reportToHeaders(final_report_token);
+  const final_url =  same_origin + executor_path + final_reportTo.header +
+    final_reportTo.coopSameOriginHeader +`&uuid=${final_token}`;
+
+  // 1. Create the opener window and ensure it doesn't have an opener.
+  let opener_window_proxy = window.open(opener_url, '_blank', 'noopener');
+  t.add_cleanup(() => send(opener_token, "window.close()"));
+
+  // 2. The opener opens a window.
+  send(opener_token, `
+    openee = window.open('${escapeComma(openee_url)}');
+    send("${this_window_token}", "ACK 1");
+  `);
+
+  // 3. Ensure the openee loads.
+  send(openee_token, `
+    send("${this_window_token}", "ACK 1");
+  `);
+  assert_equals("ACK 1", await receive(this_window_token));
+
+  // 4. The opener navigates.
+  send(opener_token, `
+    location.replace('${escapeComma(final_url)}');
+  `);
+
+  // 5. Check a report was sent to the opener.
+  let report =
+    await receiveReport(final_report_token, "navigation-to-response")
+  assert_equals(report.type, "coop");
+  assert_equals(report.url, final_url.replace(/"/g, '%22'));
+  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.effectivePolicy, "same-origin");
+  assert_equals(report.body.previousResponseURL, opener_url.replace(/"/g, '%22'));
+}, "navigation-report-from-opener-navigation");
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -31,7 +31,7 @@
             "disposition": "enforce",
             "effectivePolicy": "same-origin",
             "previousResponseURL": "",
-            "referrer": `${location.href}`, // referrer
+            "referrer": `${location.origin}/`, // referrer
             "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
@@ -84,7 +84,7 @@
           "body": {
             "disposition": "enforce",
             "previousResponseURL": "",
-            "referrer": `${location.href}`, // referrer
+            "referrer": `${location.origin}/`, // referrer
             "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -109,7 +109,7 @@
             "disposition": "enforce",
             "effectivePolicy": "same-origin",
             "previousResponseURL": ``,
-            "referrer": `${location.href}`, // referrer
+            "referrer": `${location.origin}/`, // referrer
             "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/dom/idlharness.https.html firefox-85.0+build1/testing/web-platform/tests/html/dom/idlharness.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/dom/idlharness.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/dom/idlharness.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -195,7 +195,6 @@
       HashChangeEvent: [],
       PageTransitionEvent: [],
       BeforeUnloadEvent: [],
-      ApplicationCache: ['window.applicationCache'],
       WindowModal: [],
       DOMParser: ['new DOMParser()'],
       Navigator: ['window.navigator'],
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/links/icon/no-error-event.sub.html firefox-85.0+build1/testing/web-platform/tests/html/links/icon/no-error-event.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/links/icon/no-error-event.sub.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/links/icon/no-error-event.sub.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>&lt;link rel="icon"&gt; doesn't fire an error event</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  async_test((t) => {
+    const link = document.createElement("link");
+    link.rel = "icon";
+    link.href = "http://{{hosts[][nonexistent]}}";
+
+    link.addEventListener("error", t.unreached_func());
+    document.head.append(link);
+    t.step_timeout(() => t.done(), 2000);
+  }, document.title);
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/links/icon/no-load-event.html firefox-85.0+build1/testing/web-platform/tests/html/links/icon/no-load-event.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/links/icon/no-load-event.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/links/icon/no-load-event.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>&lt;link rel="icon"&gt; doesn't fire a load event</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  async_test((t) => {
+    const link = document.createElement("link");
+    link.rel = "icon";
+    link.href = "/images/wpt-logo/wpt-logo-darkblue-bg.svg";
+
+    link.addEventListener("load", t.unreached_func());
+    document.head.append(link);
+    t.step_timeout(() => t.done(), 2000);
+  }, document.title);
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/dimension-attributes.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/dimension-attributes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/dimension-attributes.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/dimension-attributes.html	2021-01-18 19:58:23.000000000 +0000
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>Test handling of attributes that map to dimension properties</title>
+<meta name="timeout" content="long">
 <link rel="help"
       href="https://html.spec.whatwg.org/multipage/rendering.html#maps-to-the-dimension-property">
 <link rel="help"
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>Fieldset with a border-radius and non-opaque border-color</title>
+<link rel="match" href="fieldset-border-radius-with-alpha-ref.html">
+<style>
+fieldset {
+    background-color: green;
+    border: 3px solid rgba(255, 0, 0, 0.9);
+    border-radius: 4px;
+    height: 100px;
+    width: 100px;
+}
+div {
+    background-color: green;
+    height: 150px;
+    position: absolute;
+    width: 150px;
+    top: 50px;
+}
+</style>
+<p>There should be no red.</p>
+<fieldset></fieldset>
+<div></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-border-radius-with-alpha-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<style>
+div {
+    background-color: green;
+    height: 150px;
+    position: absolute;
+    width: 150px;
+    top: 50px;
+}
+</style>
+<p>There should be no red.</p>
+<div></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel="help" href="http://crbug.com/1151858">
+<link rel="match" href="fieldset-max-block-size-ref.html">
+<style>
+fieldset {
+  border: 2px solid gray;
+  margin: 1em;
+  padding: 0;
+  width: 20em;
+}
+
+.f1 {
+  overflow: auto;
+  max-height: 3em;
+}
+.f2 {
+  max-height: 0;
+}
+</style>
+
+<fieldset class="f1">
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+</fieldset>
+
+<fieldset class="f1">
+<div>foo</div>
+</fieldset>
+
+<fieldset class="f2">
+<div>foo</div>
+</fieldset>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-max-block-size-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<style>
+.fieldset {
+  border: 2px solid gray;
+  margin: 1em;
+  padding: 0;
+  width: 20em;
+}
+
+.f1 {
+  overflow: auto;
+  max-height: 3em;
+}
+.f2 {
+  max-height: 0;
+}
+</style>
+
+<div class="fieldset f1">
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+<div>foo</div>
+</div>
+
+<div class="fieldset f1">
+<div>foo</div>
+</div>
+
+<div class="fieldset f2">
+<div>foo</div>
+</div>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>legend position: relative</title>
+<link ref=help href="http://crbug.com/1151295">
+<link rel=match href=legend-position-relative-2-ref.html>
+<style>
+#fieldset2 {
+  background: lime;
+  border: 2px solid lime;
+  width: 200px;
+  padding: 0;
+  margin: 0;
+  overflow: hidden;
+}
+#legend2 {
+  position: relative;
+  overflow: hidden;
+  background: #00ffff;
+}
+</style>
+<p>"Legend" should be shown.</p>
+<fieldset id="fieldset2"><legend id="legend2">Legend</legend></fieldset>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>Reference for legend position: relative</title>
+<style>
+#fieldset2 {
+  background: lime;
+  border: 2px solid lime;
+  width: 200px;
+  padding: 0;
+  margin: 0;
+}
+#legend2 {
+  background: #00ffff;
+}
+</style>
+<p>"Legend" should be shown.</p>
+<fieldset id="fieldset2"><legend id="legend2">Legend</legend></fieldset>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<link rel="help" href="http://crbug.com/1146925">
+<link rel="match" href="sticky-content-ref.html">
+<body>
+<style>
+body {
+  margin: 0;
+}
+
+fieldset div {
+  height:1000px;
+}
+
+span {
+  background: lime;
+  display: block;
+  height: 40px;
+  position: sticky;
+  top: 4px;
+  width: 40px;
+}
+
+fieldset {
+  border: none;
+  height: 400px;
+  margin: 0;
+  overflow: scroll;
+  padding: 0;
+}
+</style>
+<fieldset><div><span></span></div></fieldset>
+<script>
+document.querySelector('fieldset').scrollTop = 1000;
+</script>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-ref.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<body>
+<style>
+body {
+  margin: 0;
+}
+
+.fieldset div {
+  height:1000px;
+}
+
+span {
+  background: lime;
+  display: block;
+  height: 40px;
+  position: absolute;
+  top: 4px;
+  left: 0px;
+  width: 40px;
+}
+
+.fieldset {
+  border: none;
+  height: 400px;
+  margin: 0;
+  overflow: scroll;
+  padding: 0;
+}
+</style>
+<div class="fieldset"><div><span></span></div></div>
+<script>
+document.querySelector('.fieldset').scrollTop = 1000;
+</script>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-mode.html	2021-01-18 19:58:23.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>TextTrack mode attribute</title>
+<meta name="timeout" content="long">
 <script src="/common/media.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/form-submission-0/newline-normalization.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/form-submission-0/newline-normalization.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/form-submission-0/newline-normalization.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/form-submission-0/newline-normalization.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Form newline normalization</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      function createForm(testCase, name, value) {
+        const form = document.createElement("form");
+        const input = document.createElement("input");
+        input.type = "hidden";
+        input.name = name;
+        input.value = value;
+        form.appendChild(input);
+        document.body.appendChild(form);
+        testCase.add_cleanup(() => {
+          document.body.removeChild(form);
+        });
+        return form;
+      }
+
+      function createFormWithFile(testCase, name, filename) {
+        const form = document.createElement("form");
+        const input = document.createElement("input");
+        input.type = "file";
+        input.name = name;
+        const dataTransfer = new DataTransfer();
+        dataTransfer.items.add(new File([], filename, { type: "text/plain" }));
+        input.files = dataTransfer.files;
+        form.appendChild(input);
+        document.body.appendChild(form);
+        testCase.add_cleanup(() => {
+          document.body.removeChild(form);
+        });
+        return form;
+      }
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a", "b\nc"));
+        assert_equals(formData.get("a"), "b\r\nc");
+      }, document.title + ": \\n in the value becomes \\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a", "b\rc"));
+        assert_equals(formData.get("a"), "b\r\nc");
+      }, document.title + ": \\r in the value becomes \\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a", "b\r\nc"));
+        assert_equals(formData.get("a"), "b\r\nc");
+      }, document.title + ": \\r\\n in the value stays unchanged");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a", "b\n\rc"));
+        assert_equals(formData.get("a"), "b\r\n\r\nc");
+      }, document.title + ": \\n\\r in the value becomes \\r\\n\\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a\nb", "c"));
+        assert_equals([...formData][0][0], "a\r\nb");
+      }, document.title + ": \\n in the name becomes \\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a\rb", "c"));
+        assert_equals([...formData][0][0], "a\r\nb");
+      }, document.title + ": \\r in the name becomes \\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a\r\nb", "c"));
+        assert_equals([...formData][0][0], "a\r\nb");
+      }, document.title + ": \\r\\n in the name stays unchanged");
+
+      test((testCase) => {
+        const formData = new FormData(createForm(testCase, "a\n\rb", "c"));
+        assert_equals([...formData][0][0], "a\r\n\r\nb");
+      }, document.title + ": \\n\\r in the name becomes \\r\\n\\r\\n");
+
+      test((testCase) => {
+        const formData = new FormData(
+          createFormWithFile(testCase, "a", "b\nc")
+        );
+        assert_equals(formData.get("a").name, "b\nc");
+      }, document.title + ": \\n in the filename stays unchanged");
+
+      test((testCase) => {
+        const formData = new FormData(
+          createFormWithFile(testCase, "a", "b\rc")
+        );
+        assert_equals(formData.get("a").name, "b\rc");
+      }, document.title + ": \\r in the filename stays unchanged");
+
+      test((testCase) => {
+        const formData = new FormData(
+          createFormWithFile(testCase, "a", "b\r\nc")
+        );
+        assert_equals(formData.get("a").name, "b\r\nc");
+      }, document.title + ": \\r\\n in the filename stays unchanged");
+
+      test((testCase) => {
+        const formData = new FormData(
+          createFormWithFile(testCase, "a", "b\n\rc")
+        );
+        assert_equals(formData.get("a").name, "b\n\rc");
+      }, document.title + ": \\n\\r in the filename stays unchanged");
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/select-event.html	2021-01-18 19:58:23.000000000 +0000
@@ -43,17 +43,37 @@
   },
   {
     label: "setRangeText()",
-    action: el => el.setRangeText("newmiddle")
+    action: el => el.setRangeText("newmiddle", el.selectionStart, el.selectionEnd, "select")
+  },
+  {
+    label: "selectionStart out of range",
+    action: el => el.selectionStart = 1000
+  },
+  {
+    label: "selectionEnd out of range",
+    action: el => el.selectionEnd = 1000
+  },
+  {
+    label: "setSelectionRange out of range",
+    action: el => el.setSelectionRange(1000, 2000)
   }
 ];
 
+function initialize(el) {
+  el.value = "foobar";
+  el.setSelectionRange(0, 0);
+  return new Promise(requestAnimationFrame);
+}
+
 els.forEach((el) => {
   const elLabel = el.localName === "textarea" ? "textarea" : "input type " + el.type;
 
   actions.forEach((action) => {
     // promise_test instead of async_test is important because these need to happen in sequence (to test that events
     // fire if and only if the selection changes).
-    promise_test(t => {
+    promise_test(async t => {
+      await initialize(el);
+
       const watcher = new EventWatcher(t, el, "select");
 
       const promise = watcher.wait_for("select").then(e => {
@@ -79,6 +99,48 @@
         }, 200);
       });
     }, `${elLabel}: ${action.label} a second time (must not fire select)`);
+
+    promise_test(async t => {
+      const element = el.cloneNode(true);
+
+      element.onselect = e => {
+        element.onselect = null;
+      };
+
+      action.action(element);
+
+      // step_wait properly timeouts before the whole test collapses
+      await t.step_wait(() => !element.onselect, "event didn't fire", 200, 10);
+    }, `${elLabel}: ${action.label} disconnected node`);
+
+    // Intentionally still using promise_test, as assert_unreachable does not
+    // make the test fail inside a listener while t.unreached_func() does.
+    promise_test(async t => {
+      const element = el.cloneNode(true);
+      let fired = false;
+
+      element.onselect = () => fired = true;
+      action.action(element);
+      assert_false(fired, "the select event must not fire synchronously")
+
+      await t.step_wait(() => fired, "event didn't fire", 200, 10);
+    }, `${elLabel}: ${action.label} event queue`);
+
+    promise_test(t => {
+      const element = el.cloneNode(true);
+      assert_equals(element.selectionEnd, 0);
+
+      element.onselect = () => {
+        element.onselect = t.unreached_func("the select event must not fire twice");
+      };
+
+      action.action(element);
+      action.action(element);
+
+      return new Promise(resolve => {
+        t.step_timeout(resolve, 200);
+      });
+    }, `${elLabel}: ${action.label} twice in disconnected node (must fire select only once)`);
   });
 });
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection.html	2021-01-18 19:58:23.000000000 +0000
@@ -95,12 +95,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionStart, el.value.length,
                     "SelectionStart offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionStart, 0, "SelectionStart offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionStart offset for input that is " +
          (append ? "appended" : " not appended"));
   }
@@ -112,12 +109,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionStart, el.value.length,
                     "SelectionStart offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionStart, 0, "SelectionStart offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionStart offset for textarea that is " +
          (append ? "appended" : " not appended"));
   }
@@ -129,12 +123,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionEnd, el.value.length,
                     "SelectionEnd offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionEnd, el.value.length, "SelectionEnd offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionEnd offset for input that is " +
          (append ? "appended" : " not appended"));
   }
@@ -147,12 +138,9 @@
       // to the character that immediately follows the text entry cursor.
       assert_equals(el.selectionEnd, el.value.length,
                     "SelectionEnd offset without selection in " + el.id);
-      if (!el.parentNode) {
-        return;
-      }
       el.select();
       assert_equals(el.selectionEnd, el.value.length, "SelectionEnd offset");
-      el.parentNode.removeChild(el);
+      el.remove();
     }, "test SelectionEnd offset for textarea that is " +
          (append ? "appended" : " not appended"));
   }
@@ -167,10 +155,52 @@
 
 
   test(function() {
-    var el = createInputElement(sampleText);
+    var el = createTextareaElement(sampleText);
     assert_in_array(el.selectionDirection, dirs, "SelectionDirection");
     el.select();
     assert_in_array(el.selectionDirection, dirs, "SelectionDirection");
     el.parentNode.removeChild(el);
   }, "test SelectionDirection for textarea");
+
+  promise_test(async () => {
+    // cause a layout overflow
+    const el = createInputElement(sampleText.repeat(100));
+    el.selectionEnd = 0;
+    await new Promise(requestAnimationFrame);
+    assert_equals(el.scrollLeft, 0);
+
+    el.select();
+    await new Promise(requestAnimationFrame);
+    assert_equals(el.scrollLeft, 0);
+    el.remove();
+  }, `test scrollLeft for input`);
+
+  promise_test(async () => {
+    // cause a layout overflow
+    const el = createInputElement(sampleText.repeat(100));
+    el.scrollLeft = 33;
+
+    el.select();
+    await new Promise(requestAnimationFrame);
+    assert_equals(el.scrollLeft, 33);
+    el.remove();
+  }, `test scrollLeft preservation for input`);
+
+  for (const localName of ["input", "textarea"]) {
+    promise_test(async () => {
+      const container = document.createElement("div");
+      container.style.height = "100px";
+      container.style.overflow = "scroll";
+      const element = document.createElement(localName);
+      element.style.marginTop = "120px";
+      container.append(element);
+      document.body.append(container);
+
+      element.select();
+      await new Promise(requestAnimationFrame);
+      assert_equals(container.scrollTop, 0);
+
+      container.remove();
+    }, `test container.scrollTop for ${localName}`);
+  }
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application.html	2021-01-18 19:58:23.000000000 +0000
@@ -63,8 +63,11 @@
   });
 
   applicableTypes.forEach(function(type) {
-    var el = document.createElement("input");
-    if (type) el.type = type;
+    const el = document.createElement("input");
+    if (type) {
+      el.type = type;
+    }
+    const initialDirection = el.selectionDirection;
 
     test(() => {
       assert_equals(el.selectionStart, 0);
@@ -79,6 +82,11 @@
     }, `selectionDirection on an input[type=${type}] returns a value`);
 
     test(() => {
+      el.selectionDirection = "none";
+      assert_equals(el.selectionDirection, initialDirection);
+    }, `assigning selectionDirection "none" on an input[type=${type}] should give the initial direction`);
+
+    test(() => {
       el.selectionStart = 1;
     }, `assigning selectionStart on an input[type=${type}] doesn't throw an exception`);
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-not-application-textarea.html	2021-01-18 19:58:23.000000000 +0000
@@ -11,8 +11,15 @@
     var el = document.createElement("textarea");
     assert_equals(el.selectionStart, 0, "initial selectionStart");
     assert_equals(el.selectionEnd, 0, "initial selectionEnd");
-    assert_equals(el.selectionDirection, "none", "initial selectionDirection");
+    // The initial selection direction must be "none" if the platform supports that
+    // direction, or "forward" otherwise.
+    assert_in_array(el.selectionDirection, ["none", "forward"]);
 
+    const initialDirection = el.selectionDirection;
+    el.selectionDirection = "none";
+    assert_equals(el.selectionDirection, initialDirection);
+
+    el.value = "foo";
     el.selectionStart = 1;
     el.selectionEnd = 1;
     el.selectionDirection = "forward";
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-start-end.html firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-start-end.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-start-end.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/forms/textfieldselection/selection-start-end.html	2021-01-18 19:58:23.000000000 +0000
@@ -145,6 +145,31 @@
   }, "selectionEnd edge-case values");
 
   test(() => {
+    for (const el of createTestElements(testValue)) {
+      el.selectionStart = 200;
+      assert_equals(el.selectionStart, testValue.length);
+      el.remove();
+    }
+  }, "selectionStart should be clamped by the current value length");
+
+  test(() => {
+    for (const el of createTestElements(testValue)) {
+      el.selectionStart = 300;
+      assert_equals(el.selectionEnd, testValue.length);
+      el.remove();
+    }
+  }, "selectionEnd should be clamped by the current value length");
+
+  test(() => {
+    for (const el of createTestElements(testValue)) {
+      el.setSelectionRange(200, 300);
+      assert_equals(el.selectionStart, testValue.length);
+      assert_equals(el.selectionEnd, testValue.length);
+      el.remove();
+    }
+  }, "setSelectionRange should be clamped by the current value length");
+
+  test(() => {
     for (let el of createTestElements(testValue)) {
       const start = 1;
       const end = testValue.length - 1;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py firefox-85.0+build1/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py
--- firefox-84.0.2+build1/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/moving-between-documents/resources/moving-between-documents-iframe.py	2021-01-18 19:58:23.000000000 +0000
@@ -47,7 +47,6 @@
   response.writer.write(u"%x\r\n" % len(body))
   response.writer.write(body)
   response.writer.write(u"\r\n")
-  response.writer.flush()
 
   body = u""
 
@@ -101,4 +100,3 @@
 
   response.writer.write(u"0\r\n")
   response.writer.write(u"\r\n")
-  response.writer.flush()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/consumption-crossorigin.sub.tentative.html firefox-85.0+build1/testing/web-platform/tests/html/user-activation/consumption-crossorigin.sub.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/consumption-crossorigin.sub.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/user-activation/consumption-crossorigin.sub.tentative.html	2021-01-18 19:58:23.000000000 +0000
@@ -5,6 +5,7 @@
 -->
 <html>
 <head>
+  <meta name="timeout" content="long">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key.html firefox-85.0+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>No user activation through 'Escape' key</title>
+    <meta name="timeout" content="long">
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+    <link rel="author" title="Google" href="http://www.google.com "/>
+    <link rel="help" href="https://html.spec.whatwg.org/#triggered-by-user-activation">
+    <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>
+    <style>
+      #target {
+        width: 40ex;
+        background-color: yellow;
+      }
+    </style>
+    <script type="text/javascript">
+      let keydown_event_fired = false;
+      let keyup_event_fired = false;
+
+      function run() {
+        let textbox_elem = document.getElementById("target");
+        let test_esc_key = async_test("'Escape' key doesn't activate a page.");
+
+        test_esc_key.step(() => {
+          assert_true(!!navigator.userActivation, "This test requires user activation query API");
+        });
+
+        textbox_elem.focus();
+
+        on_event(textbox_elem, "keydown", () => {
+          test_esc_key.step(() => {
+            keydown_event_fired = true;
+            assert_false(navigator.userActivation.isActive, "No user activation on keydown");
+          });
+        });
+
+        on_event(textbox_elem, "keyup", () => {
+          test_esc_key.step(() => {
+            if (keydown_event_fired)
+              keyup_event_fired = true;
+            assert_true(keydown_event_fired, "keydown event fired before keyup");
+            assert_false(navigator.userActivation.isActive, "No user activation on keyup");
+          });
+        });
+
+        // Inject mouse inputs.
+        const escape_key = "\uE00C";
+        test_driver
+        .send_keys(textbox_elem, escape_key)
+        .then(() => {
+          assert_true(keyup_event_fired, "keydown event fired before keyup");
+          test_esc_key.done();
+        });
+      }
+    </script>
+  </head>
+  <body onload="run()">
+    <h1>No user activation through 'Escape' key</h1>
+    <h4>Tests that pressing/releasing 'Escape' key is not treated as a user activation.</h4>
+    <input id="target" value="Press and release the 'Esc' key." />
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key-manual.html firefox-85.0+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key-manual.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/user-activation/no-activation-thru-escape-key-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>No user activation through 'Escape' key</title>
-    <meta name="timeout" content="long">
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
-    <link rel="author" title="Google" href="http://www.google.com "/>
-    <link rel="help" href="https://html.spec.whatwg.org/#triggered-by-user-activation">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <style>
-      #target {
-        width: 40ex;
-        background-color: yellow;
-      }
-    </style>
-    <script type="text/javascript">
-      let keydown_event_fired = false;
-
-      function run() {
-        let textbox_elem = document.getElementById("target");
-        let test_esc_key = async_test("'Escape' key doesn't activate a page.");
-
-        test_esc_key.step(() => {
-          assert_true(!!navigator.userActivation, "This test requires user activation query API");
-        });
-
-        textbox_elem.focus();
-
-        on_event(textbox_elem, "keydown", () => {
-          test_esc_key.step(() => {
-            keydown_event_fired = true;
-            assert_false(navigator.userActivation.isActive, "No user activation on keydown");
-          });
-        });
-
-        on_event(textbox_elem, "keyup", () => {
-          test_esc_key.step(() => {
-            assert_true(keydown_event_fired, "keydown event fired before keyup");
-            assert_false(navigator.userActivation.isActive, "No user activation on keyup");
-          });
-          test_esc_key.done();
-        });
-      }
-    </script>
-  </head>
-  <body onload="run()">
-    <h1>No user activation through 'Escape' key</h1>
-    <h4>Tests that pressing/releasing 'Escape' key is not treated as a user activation.</h4>
-    <input id="target" value="Press and release the 'Esc' key." />
-  </body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/propagation-crossorigin.sub.tentative.html firefox-85.0+build1/testing/web-platform/tests/html/user-activation/propagation-crossorigin.sub.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/user-activation/propagation-crossorigin.sub.tentative.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/user-activation/propagation-crossorigin.sub.tentative.html	2021-01-18 19:58:23.000000000 +0000
@@ -5,6 +5,7 @@
 -->
 <html>
 <head>
+  <meta name="timeout" content="long">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html firefox-85.0+build1/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html
--- firefox-84.0.2+build1/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator-window-controls-overlay.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>navigator.windowControlsOverlay</title>
+
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<script>
+  test(function(){
+    assert_idl_attribute(navigator, 'windowControlsOverlay');
+  }, 'the windowControlsOverlay object should exist on the navigator object');
+
+  test(function(){
+    assert_idl_attribute(navigator.windowControlsOverlay, 'visible');
+  }, 'visible should be a member of the windowControlsOverlay object');
+
+  test(function(){
+    assert_false(navigator.windowControlsOverlay.visible);
+  }, 'visible should be false');
+
+  test(function(){
+    assert_idl_attribute(navigator.windowControlsOverlay, 'getBoundingClientRect');
+  }, 'getBoundingClientRect should be a method of the windowControlsOverlay object');
+
+  test(function(){
+    var rect = navigator.windowControlsOverlay.getBoundingClientRect();
+    assert_true(rect instanceof DOMRect);
+  }, 'getBoundingClientRect return type should be DOMRect');
+
+  test(function(){
+    var rect = navigator.windowControlsOverlay.getBoundingClientRect();
+    assert_equals(rect.x, 0);
+    assert_equals(rect.y, 0);
+    assert_equals(rect.width, 0);
+    assert_equals(rect.height, 0);
+  }, 'getBoundingClientRect should return a empty DOMRect');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resolving-internal.https.html firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resolving-internal.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resolving-internal.https.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resolving-internal.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -18,6 +18,7 @@
 
 for (const json of [
   'resources/empty-import-map-internal.json',
+  'resources/url-specifiers-schemes-internal.json'
 ]) {
   promise_test(() => {
       const promise = runTestsFromJSON(json);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/empty-import-map-internal.json firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/empty-import-map-internal.json
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/empty-import-map-internal.json	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/empty-import-map-internal.json	2021-01-18 19:58:23.000000000 +0000
@@ -10,6 +10,7 @@
     },
     "non-fetch scheme absolute URLs": {
       "expectedResults": {
+        "about:fetch-scheme": "about:fetch-scheme",
         "mailto:non-fetch-scheme": "mailto:non-fetch-scheme",
         "import:non-fetch-scheme": "import:non-fetch-scheme",
         "javascript:non-fetch-scheme": "javascript:non-fetch-scheme",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json	2021-01-18 19:58:23.000000000 +0000
@@ -6,7 +6,9 @@
       "lodash-dot": "./node_modules/lodash-es/lodash.js",
       "lodash-dot/": "./node_modules/lodash-es/",
       "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-      "lodash-dotdot/": "../node_modules/lodash-es/"
+      "lodash-dotdot/": "../node_modules/lodash-es/",
+      "mapped/": "https://example.com/",
+      "mapped/path/": "https://github.com/WICG/import-maps/issues/207/"
     }
   },
   "importMapBaseURL": "https://example.com/app/index.html",
@@ -38,6 +40,18 @@
         "underscore/": null,
         "underscore/foo": null
       }
+    },
+    "backtracking via ..": {
+      "expectedResults": {
+        "mapped/path": "https://example.com/path",
+        "mapped/path/": "https://github.com/WICG/import-maps/issues/207/",
+        "mapped/path/..": null,
+        "mapped/path/../backtrack": null,
+        "mapped/path/../../backtrack": null,
+        "mapped/path/../../../backtrack": null,
+        "moment/../backtrack": null,
+        "moment/..": null
+      }
     }
   }
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/test-helper.js firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/test-helper.js
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/test-helper.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/test-helper.js	2021-01-18 19:58:23.000000000 +0000
@@ -83,7 +83,7 @@
           if (event.data.result === 'TypeError') {
             reject(new TypeError(event.data.message));
           } else {
-            reject(new Error(event.data.result));
+            reject(new Error(event.data.message));
           }
         } else {
           assert_unreached('Invalid message: ' + event.data.type);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers.json firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers.json
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers.json	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers.json	2021-01-18 19:58:23.000000000 +0000
@@ -16,7 +16,7 @@
   "baseURL": "https://example.com/js/app.mjs",
   "name": "URL-like specifiers",
   "tests": {
-    "Ordinal URL-like specifiers": {
+    "Ordinary URL-like specifiers": {
       "expectedResults": {
         "https://example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
         "https://///example.com/lib/foo.mjs": "https://example.com/app/more/bar.mjs",
@@ -47,6 +47,22 @@
       "expectedResults": {
         "/test": "https://example.com/lib/test2.mjs"
       }
+    },
+    "backtracking (relative URLs)": {
+      "expectedResults": {
+        "/test/..": "https://example.com/lib/slash-only/",
+        "/test/../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "/test/../../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "/test/../../../backtrack": "https://example.com/lib/slash-only/backtrack"
+      }
+    },
+    "backtracking (absolute URLs)": {
+      "expectedResults": {
+        "https://example.com/test/..": "https://example.com/lib/slash-only/",
+        "https://example.com/test/../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "https://example.com/test/../../backtrack": "https://example.com/lib/slash-only/backtrack",
+        "https://example.com/test/../../../backtrack": "https://example.com/lib/slash-only/backtrack"
+      }
     }
   }
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json
--- firefox-84.0.2+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/import-maps/data-driven/resources/url-specifiers-schemes-internal.json	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,45 @@
+{
+  "importMap": {
+    "imports": {
+      "data:text/": "/lib/test-data/",
+      "about:text/": "/lib/test-about/",
+      "blob:text/": "/lib/test-blob/",
+      "blah:text/": "/lib/test-blah/",
+      "http:text/": "/lib/test-http/",
+      "https:text/": "/lib/test-https/",
+      "file:text/": "/lib/test-file/",
+      "ftp:text/": "/lib/test-ftp/",
+      "ws:text/": "/lib/test-ws/",
+      "wss:text/": "/lib/test-wss/"
+    }
+  },
+  "importMapBaseURL": "https://example.com/app/index.html",
+  "baseURL": "https://example.com/js/app.mjs",
+  "name": "URL-like specifiers",
+  "tests": {
+    "Non-special vs. special schemes": {
+      "expectedResults": {
+        "data:text/javascript,console.log('foo')": "data:text/javascript,console.log('foo')",
+        "data:text/": "https://example.com/lib/test-data/",
+        "about:text/foo": "about:text/foo",
+        "about:text/": "https://example.com/lib/test-about/",
+        "blob:text/foo": "blob:text/foo",
+        "blob:text/": "https://example.com/lib/test-blob/",
+        "blah:text/foo": "blah:text/foo",
+        "blah:text/": "https://example.com/lib/test-blah/",
+        "http:text/foo": "https://example.com/lib/test-http/foo",
+        "http:text/": "https://example.com/lib/test-http/",
+        "https:text/foo": "https://example.com/lib/test-https/foo",
+        "https:text/": "https://example.com/lib/test-https/",
+        "ftp:text/foo": "https://example.com/lib/test-ftp/foo",
+        "ftp:text/": "https://example.com/lib/test-ftp/",
+        "file:text/foo": "https://example.com/lib/test-file/foo",
+        "file:text/": "https://example.com/lib/test-file/",
+        "ws:text/foo": "https://example.com/lib/test-ws/foo",
+        "ws:text/": "https://example.com/lib/test-ws/",
+        "wss:text/foo": "https://example.com/lib/test-wss/foo",
+        "wss:text/": "https://example.com/lib/test-wss/"
+      }
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,3 @@
 [eventOrder.html]
   expected:
-    if product == "safari" or product == "epiphany" or product == "webkit": ERROR
+    if product == "epiphany" or product == "webkit": ERROR
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/mouseClickCount.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,4 @@
+[mouseClickCount.html]
+  [TestDriver actions: test the mouse click counts at different cases]
+    expected:
+      if product == "firefox" or product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,7 @@
 [multiTouchPoints.html]
   expected:
-    if product == "firefox" or product == "safari" or product == "epiphany" or product == "webkit": ERROR
+    if product == "firefox" or product == "epiphany" or product == "webkit": ERROR
+
+  [TestDriver actions: two touch points with one moving one pause]
+    expected:
+      if product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseFirstPoint.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,7 @@
 [multiTouchPointsReleaseFirstPoint.html]
   expected:
-    if product == "firefox" or product == "safari": ERROR
+    if product == "firefox": ERROR
+
+  [TestDriver actions: two touch points with one moving one pause]
+    expected:
+      if product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsReleaseSecondPoint.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,7 @@
 [multiTouchPointsReleaseSecondPoint.html]
   expected:
-    if product == "firefox" or product == "safari": ERROR
+    if product == "firefox": ERROR
+
+  [TestDriver actions: two touch points with one moving one pause]
+    expected:
+      if product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsTwoTouchStarts.html.ini	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,7 @@
 [multiTouchPointsTwoTouchStarts.html]
-   expected:
-     if product == "firefox" or product == "safari": ERROR
+  expected:
+    if product == "firefox": ERROR
+
+  [TestDriver actions: two touch points with one moving one pause]
+    expected:
+      if product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
 [multiTouchPointsWithPause.html]
   expected:
-    if product == "firefox" or product == "safari": ERROR
+    if product == "firefox": ERROR
+
+  [TestDriver actions: two touch points with one moving one pause]
+    expected:
+      if product == "safari": FAIL
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/mouseClickCount.html firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/mouseClickCount.html
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/mouseClickCount.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/mouseClickCount.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: test the mouse click counts at different cases</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div#test {
+  position: fixed;
+  touch-action: none;
+  top: 5px;
+  left: 5px;
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+</style>
+
+<div id="test">
+</div>
+
+<script>
+let clickCountList = [];
+
+async_test(t => {
+  let test = document.getElementById("test");
+  test.addEventListener("click", e => {
+    clickCountList.push(e.detail);
+  });
+
+  let div = document.getElementById("test");
+  var actions = new test_driver.Actions();
+  actions.pointerMove(0, 0, {origin: test})
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .pointerMove(15, 15, {origin: test})
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .pointerDown()
+    .pointerUp()
+    .send()
+    .then(t.step_func_done(() => {
+      let expectedClickCountList = [1, 2, 1, 2, 3];
+      assert_array_equals(clickCountList, expectedClickCountList);
+  })).catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/pause.html firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/pause.html
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/pause.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/pause.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<meta name="timeout" content="long">
 <title>TestDriver actions: pause</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/textEditCommands.html firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/textEditCommands.html
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/actions/textEditCommands.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/actions/textEditCommands.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: text edit commands</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div { padding:0px; margin: 0px; }
+</style>
+<body>
+  <div>
+    <input type="text" id="text1" value="Hello World" />
+    <input type="text" id="text2">
+  </div>
+</body>
+<script>
+async_test(t => {
+  let text1 = document.getElementById("text1");
+  let text2 = document.getElementById("text2");
+  text1.addEventListener("click", function() {
+    let text1 = document.getElementById("text1");
+    text1.value="new text";
+  });
+
+  const ctrl_key = "\uE009";
+  const cmd_key = "\uE03D";
+  let edit_command_key = ctrl_key;
+  if(navigator.platform.includes('Mac'))
+    edit_command_key = cmd_key;
+
+  let actions = new test_driver.Actions()
+      .pointerMove(0, 0, {origin: text1})
+      .pointerDown()
+      .pointerUp()
+      .addTick()
+      .keyDown(edit_command_key)
+      .keyDown("a")
+      .keyUp("a")
+      .keyDown("x")
+      .keyUp("x")
+      .keyUp(edit_command_key)
+      .addTick()
+      .pointerMove(0, 0, {origin: text2})
+      .pointerDown()
+      .pointerUp()
+      .keyDown(edit_command_key)
+      .keyDown("v")
+      .keyUp("v")
+      .keyUp(edit_command_key);
+
+  actions.send()
+    .then(t.step_func_done(() => {
+      assert_equals(text1.value, "");
+      assert_equals(text2.value, "new text");
+    }))
+    .catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/click-multiple.html firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/click-multiple.html
--- firefox-84.0.2+build1/testing/web-platform/tests/infrastructure/testdriver/click-multiple.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/infrastructure/testdriver/click-multiple.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver multiple consecutive clicks</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>
+
+<button type="button" id="button1">Button 1</button>
+<button type="button" id="button2">Button 2</button>
+<button type="button" id="button3">Button 3</button>
+
+<script>
+buttons = [
+  document.getElementById("button1"),
+  document.getElementById("button2"),
+  document.getElementById("button3"),
+];
+
+promise_test(async t => {
+  clicked = [false, false, false];
+  for (let i = 0; i < buttons.length; i++) {
+    buttons[i].addEventListener("click", () => {
+      clicked[i] = true;
+    });
+  }
+
+  await Promise.all([
+    test_driver.click(buttons[0]),
+    test_driver.click(buttons[1]),
+    test_driver.click(buttons[2]),
+  ]);
+
+  assert_true(clicked[0]);
+  assert_true(clicked[1]);
+  assert_true(clicked[2]);
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges.html firefox-85.0+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges.html
--- firefox-84.0.2+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>InputEvent.getTargetRanges() behavior</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<p>To manually run this test, please follow the steps below:<br/>
+1. Place caret at the end of 'hel<i>lo wo</i><b>rld</b>'.<br/>
+2. Press Ctrl-Backspace (Alt-Backspace on macOS) to delete word backwards.<br/>
+3. Place caret at the end of 'test2' => Press 'a' key.<br/>
+4. Select 'test2a' => Press 'b' key.<br/>
+5. Select 'b' => Bold text through context menu or Command-b on macOS.<br/>
+6. Place caret at the end of 'test3' => Press 'a' key => Press Backspace key.<br/>
+<br/>
+If a "PASS" result appears the test passes, otherwise it fails</p>
+<p id="test1_editable" contenteditable>hel<i>lo wo</i><b>rld</b></p>
+<p id="test2_editable" contenteditable>test2</p>
+<textarea id="test3_plain">test3</textarea>
+<script>
+function resolveWhen(condition) {
+  return new Promise((resolve, reject) => {
+    function tick() {
+      if (condition())
+        resolve();
+      else
+        requestAnimationFrame(tick.bind(this));
+    }
+    tick();
+  });
+}
+
+let modifier_key = "\uE009";
+if(navigator.platform.includes('Mac'))
+    modifier_key = "\uE03D";
+const commands = {
+    COPY: 'copy',
+    CUT: 'cut',
+    PASTE: 'paste',
+    SELECTALL: 'select all',
+    DELETEALL: 'delete all',
+    BOLD: 'bold',
+}
+const backspace = "\uE003";
+
+function clickOnTarget(target) {
+  return new test_driver.Actions()
+      .pointerMove(0, 0, {origin: target})
+      .pointerDown()
+      .pointerUp()
+      .send();
+}
+
+function sendTextCommand(command) {
+  let command_key = "";
+  if(command == "copy")
+    command_key = "c";
+  else if (command == "cut")
+    command_key = "x";
+  else if (command == "paste")
+    command_key = "v";
+  else if (command == "select all")
+    command_key = "a";
+  else if (command == "delete all")
+    command_key = backspace;
+  else if (command == "bold")
+    command_key = "b";
+  return new test_driver.Actions()
+      .keyDown(modifier_key)
+      .keyDown(command_key)
+      .keyUp(command_key)
+      .keyUp(modifier_key)
+      .send();
+}
+
+function sendTextCommandAtTarget(target, command) {
+  return clickOnTarget(target).then(() => {
+    return sendTextCommand(command);
+  });
+}
+
+function addTextAtTarget(target, char) {
+  return test_driver.send_keys(target, char);
+}
+
+promise_test(async test => {
+    const test1_editable = document.getElementById('test1_editable');
+    let lastBeforeInput;
+    test1_editable.addEventListener('beforeinput', test.step_func(function() {
+        assert_equals(event.inputType, 'deleteWordBackward');
+        const ranges = event.getTargetRanges();
+        assert_equals(ranges.length, 1);
+        const range = ranges[0];
+        assert_true(range instanceof StaticRange);
+        assert_equals(range.startOffset, 3);
+        assert_equals(range.startContainer.textContent, 'lo wo');
+        assert_equals(range.endOffset, 3);
+        assert_equals(range.endContainer.textContent, 'rld');
+        assert_equals(test1_editable.innerHTML, 'hel<i>lo wo</i><b>rld</b>');
+        lastBeforeInput = event;
+    }));
+
+    test1_editable.addEventListener('input', test.step_func(function() {
+        assert_equals(event.inputType, 'deleteWordBackward');
+        assert_equals(test1_editable.innerHTML, 'hel<i>lo&nbsp;</i>');
+        assert_equals(lastBeforeInput.inputType, 'deleteWordBackward');
+        assert_equals(lastBeforeInput.getTargetRanges().length, 0,
+            'getTargetRanges() should be empty after the event has finished dispatching.');
+    }));
+
+    await sendTextCommandAtTarget(test1_editable, commands.DELETEALL);
+    await resolveWhen(() => { return test1_editable.innerHTML == 'hel<i>lo&nbsp;</i>' });
+}, 'getTargetRanges() returns correct range and cleared after dispatch.');
+
+promise_test(async test => {
+    const expectedEventLog = ['test2-5-test2-5', 'test2a-0-test2a-6', 'b-0-b-1'];
+    const actualEventLog = [];
+
+    const test2_editable = document.getElementById('test2_editable');
+    test2_editable.addEventListener('beforeinput', test.step_func(function() {
+        const ranges = event.getTargetRanges();
+        assert_equals(ranges.length, 1);
+        const range = ranges[0];
+        actualEventLog.push(
+            `${range.startContainer.textContent}-${range.startOffset}-${range.endContainer.textContent}-${range.endOffset}`);
+    }));
+
+    await addTextAtTarget(test2_editable, "a");
+    await sendTextCommandAtTarget(test2_editable, commands.SELECTALL);
+    await addTextAtTarget(test2_editable, "b");
+    await sendTextCommandAtTarget(test2_editable, commands.SELECTALL);
+    await sendTextCommand(commands.BOLD);
+    await resolveWhen(() => { return actualEventLog.length == expectedEventLog.length });
+    assert_array_equals(actualEventLog, expectedEventLog,
+                        `Expected: ${expectedEventLog}; Actual: ${actualEventLog}.`);
+}, 'Actions other than deletion should have current selection as target ranges.');
+
+promise_test(async test => {
+    const test3_plain = document.getElementById('test3_plain');
+    let event_type;
+    test3_plain.addEventListener('beforeinput', test.step_func(function() {
+        assert_equals(event.getTargetRanges().length, 0,
+            'getTargetRanges() should return empty array on textarea.');
+
+        if (event.inputType === 'deleteContentBackward')
+            event_type = event.inputType;
+    }));
+
+    await addTextAtTarget(test3_plain, "a");
+    await addTextAtTarget(test3_plain, backspace);
+    await resolveWhen(() => { return event_type == 'deleteContentBackward' });
+}, 'Textarea should have empty target range.');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges-manual.html firefox-85.0+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges-manual.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/input-events/input-events-get-target-ranges-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>InputEvent.getTargetRanges() behavior</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<p>To manually run this test, please follow the steps below:<br/>
-1. Place caret at the end of 'hel<i>lo wo</i><b>rld</b>'.<br/>
-2. Press Ctrl-Backspace (Alt-Backspace on macOS) to delete word backwards.<br/>
-3. Place caret at the end of 'test2' => Press 'a' key.<br/>
-4. Select 'test2a' => Press 'b' key.<br/>
-5. Select 'b' => Bold text through context menu or Command-b on macOS.<br/>
-6. Place caret at the end of 'test3' => Press 'a' key => Press Backspace key.<br/>
-<br/>
-If a "PASS" result appears the test passes, otherwise it fails</p>
-<p id="test1_editable" contenteditable>hel<i>lo wo</i><b>rld</b></p>
-<p id="test2_editable" contenteditable>test2</p>
-<textarea id="test3_plain">test3</textarea>
-<script>
-async_test(t => {
-    const test1_editable = document.getElementById('test1_editable');
-    let lastBeforeInput;
-    test1_editable.addEventListener('beforeinput', t.step_func(event => {
-        assert_equals(event.inputType, 'deleteWordBackward');
-        const ranges = event.getTargetRanges();
-        assert_equals(ranges.length, 1);
-        const range = ranges[0];
-        assert_true(range instanceof StaticRange);
-        assert_equals(range.startOffset, 3);
-        assert_equals(range.startContainer.textContent, 'lo wo');
-        assert_equals(range.endOffset, 3);
-        assert_equals(range.endContainer.textContent, 'rld');
-        assert_equals(test1_editable.innerHTML, 'hel<i>lo wo</i><b>rld</b>');
-        lastBeforeInput = event;
-    }));
-
-    test1_editable.addEventListener('input', t.step_func(event => {
-        assert_equals(event.inputType, 'deleteWordBackward');
-        assert_equals(test1_editable.innerHTML, 'hel<i>lo&nbsp;</i>');
-        assert_equals(lastBeforeInput.inputType, 'deleteWordBackward');
-        assert_equals(lastBeforeInput.getTargetRanges().length, 0,
-            'getTargetRanges() should be empty after the event has finished dispatching.');
-        t.done();
-    }));
-}, 'getTargetRanges() returns correct range and cleared after dispatch.');
-
-async_test(t => {
-    const expectedEventLog = ['test2-5-test2-5', 'test2a-0-test2a-6', 'b-0-b-1'];
-    const actualEventLog = [];
-
-    const test2_editable = document.getElementById('test2_editable');
-    test2_editable.addEventListener('beforeinput', t.step_func(event => {
-        const ranges = event.getTargetRanges();
-        assert_equals(ranges.length, 1);
-        const range = ranges[0];
-        actualEventLog.push(
-            `${range.startContainer.textContent}-${range.startOffset}-${range.endContainer.textContent}-${range.endOffset}`);
-
-        if (actualEventLog.length == expectedEventLog.length) {
-            assert_array_equals(actualEventLog, expectedEventLog,
-                `Expected: ${expectedEventLog}; Actual: ${actualEventLog}.`);
-            t.done();
-        }
-    }));
-}, 'Actions other than deletion should have current selection as target ranges.');
-
-async_test(t => {
-    const test3_plain = document.getElementById('test3_plain');
-    test3_plain.addEventListener('beforeinput', t.step_func(event => {
-        assert_equals(event.getTargetRanges().length, 0,
-            'getTargetRanges() should return empty array on textarea.');
-
-        if (event.inputType === 'deleteContentBackward')
-            t.done();
-    }));
-}, 'Textarea should have empty target range.');
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/dom.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/dom.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/dom.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/dom.idl	2021-01-18 19:58:24.000000000 +0000
@@ -79,6 +79,7 @@
 dictionary AddEventListenerOptions : EventListenerOptions {
   boolean passive = false;
   boolean once = false;
+  AbortSignal signal;
 };
 
 [Exposed=(Window,Worker)]
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/html.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/html.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/html.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/html.idl	2021-01-18 19:58:23.000000000 +0000
@@ -1701,7 +1701,6 @@
 
   // the user agent
   readonly attribute Navigator navigator;
-  [SecureContext] readonly attribute ApplicationCache applicationCache;
   readonly attribute boolean originIsolated;
 
   // user prompts
@@ -1801,39 +1800,6 @@
   attribute DOMString returnValue;
 };
 
-[SecureContext,
- Exposed=Window]
-interface ApplicationCache : EventTarget {
-
-  // update status
-  const unsigned short UNCACHED = 0;
-  const unsigned short IDLE = 1;
-  const unsigned short CHECKING = 2;
-  const unsigned short DOWNLOADING = 3;
-  const unsigned short UPDATEREADY = 4;
-  const unsigned short OBSOLETE = 5;
-  readonly attribute unsigned short status;
-
-  // updates
-  undefined update();
-  undefined abort();
-  undefined swapCache();
-
-  // events
-  attribute EventHandler onchecking;
-  attribute EventHandler onerror;
-  attribute EventHandler onnoupdate;
-  attribute EventHandler ondownloading;
-  attribute EventHandler onprogress;
-  attribute EventHandler onupdateready;
-  attribute EventHandler oncached;
-  attribute EventHandler onobsolete;
-};
-
-interface mixin NavigatorOnLine {
-  readonly attribute boolean onLine;
-};
-
 [Exposed=(Window,Worker)]
 interface ErrorEvent : Event {
   constructor(DOMString type, optional ErrorEventInit eventInitDict = {});
@@ -2048,6 +2014,10 @@
   readonly attribute FrozenArray<DOMString> languages;
 };
 
+interface mixin NavigatorOnLine {
+  readonly attribute boolean onLine;
+};
+
 interface mixin NavigatorContentUtils {
   [SecureContext] undefined registerProtocolHandler(DOMString scheme, USVString url);
   [SecureContext] undefined unregisterProtocolHandler(DOMString scheme, USVString url);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/mediacapture-streams.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/mediacapture-streams.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/mediacapture-streams.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/mediacapture-streams.idl	2021-01-18 19:58:23.000000000 +0000
@@ -143,6 +143,12 @@
   required MediaStreamTrack track;
 };
 
+[Exposed=Window]
+interface OverconstrainedError : DOMException {
+  constructor(DOMString constraint, optional DOMString message = "");
+  readonly attribute DOMString constraint;
+};
+
 partial interface Navigator {
   [SameObject, SecureContext] readonly attribute MediaDevices mediaDevices;
 };
@@ -191,9 +197,7 @@
 
 callback NavigatorUserMediaSuccessCallback = undefined (MediaStream stream);
 
-callback NavigatorUserMediaErrorCallback = undefined (MediaStreamError error);
-
-typedef object MediaStreamError;
+callback NavigatorUserMediaErrorCallback = undefined (DOMException error);
 
 dictionary DoubleRange {
   double max;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/media-source.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/media-source.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/media-source.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/media-source.idl	2021-01-18 19:58:23.000000000 +0000
@@ -25,10 +25,10 @@
                     attribute EventHandler        onsourceended;
                     attribute EventHandler        onsourceclose;
     SourceBuffer   addSourceBuffer (DOMString type);
-    void           removeSourceBuffer (SourceBuffer sourceBuffer);
-    void           endOfStream (optional EndOfStreamError error);
-    void           setLiveSeekableRange (double start, double end);
-    void           clearLiveSeekableRange ();
+    undefined           removeSourceBuffer (SourceBuffer sourceBuffer);
+    undefined           endOfStream (optional EndOfStreamError error);
+    undefined           setLiveSeekableRange (double start, double end);
+    undefined           clearLiveSeekableRange ();
     static boolean isTypeSupported (DOMString type);
 };
 
@@ -53,9 +53,9 @@
                     attribute EventHandler        onupdateend;
                     attribute EventHandler        onerror;
                     attribute EventHandler        onabort;
-    void appendBuffer (BufferSource data);
-    void abort ();
-    void remove (double start, unrestricted double end);
+    undefined appendBuffer (BufferSource data);
+    undefined abort ();
+    undefined remove (double start, unrestricted double end);
 };
 
 [Exposed=Window]
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/mediastream-recording.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/mediastream-recording.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/mediastream-recording.idl	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/mediastream-recording.idl	2021-01-18 19:58:23.000000000 +0000
@@ -3,9 +3,9 @@
 // (https://github.com/w3c/webref)
 // Source: MediaStream Recording (https://w3c.github.io/mediacapture-record/)
 
-[Exposed=Window,
- Constructor(MediaStream stream, optional MediaRecorderOptions options = {})]
+[Exposed=Window]
 interface MediaRecorder : EventTarget {
+  constructor(MediaStream stream, optional MediaRecorderOptions options = {});
   readonly attribute MediaStream stream;
   readonly attribute DOMString mimeType;
   readonly attribute RecordingState state;
@@ -19,11 +19,11 @@
   readonly attribute unsigned long audioBitsPerSecond;
   readonly attribute BitrateMode audioBitrateMode;
 
-  void start(optional unsigned long timeslice);
-  void stop();
-  void pause();
-  void resume();
-  void requestData();
+  undefined start(optional unsigned long timeslice);
+  undefined stop();
+  undefined pause();
+  undefined resume();
+  undefined requestData();
 
   static boolean isTypeSupported(DOMString type);
 };
@@ -47,8 +47,9 @@
   "paused"
 };
 
-[Exposed=Window, Constructor(DOMString type, BlobEventInit eventInitDict)]
+[Exposed=Window]
 interface BlobEvent : Event {
+  constructor(DOMString type, BlobEventInit eventInitDict);
   [SameObject] readonly attribute Blob data;
   readonly attribute DOMHighResTimeStamp timecode;
 };
@@ -62,7 +63,8 @@
   required DOMException error;
 };
 
-[Exposed=Window, Constructor(DOMString type, MediaRecorderErrorEventInit eventInitDict)]
+[Exposed=Window]
 interface MediaRecorderErrorEvent : Event {
+  constructor(DOMString type, MediaRecorderErrorEventInit eventInitDict);
   [SameObject] readonly attribute DOMException error;
 };
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/performance-measure-memory.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/performance-measure-memory.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/performance-measure-memory.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/performance-measure-memory.idl	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,30 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Measure Memory API (https://wicg.github.io/performance-measure-memory/)
+
+dictionary MemoryMeasurement {
+  unsigned long long bytes;
+  sequence<MemoryBreakdownEntry> breakdown;
+};
+
+dictionary MemoryBreakdownEntry {
+  unsigned long long bytes;
+  sequence<MemoryAttribution> attribution;
+  sequence<DOMString> userAgentSpecificTypes;
+};
+
+dictionary MemoryAttribution {
+  USVString url;
+  MemoryAttributionContainer container;
+  DOMString scope;
+};
+
+dictionary MemoryAttributionContainer {
+  DOMString id;
+  USVString src;
+};
+
+partial interface Performance {
+  [CrossOriginIsolated] Promise<MemoryMeasurement> measureMemory();
+};
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/serial.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/serial.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/serial.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/serial.idl	2021-01-18 19:58:24.000000000 +0000
@@ -23,7 +23,7 @@
 
 [Exposed=(DedicatedWorker,Window), SecureContext]
 interface SerialPort {
-  Promise<void> open(optional SerialOptions options = {});
+  Promise<undefined> open(optional SerialOptions options = {});
   readonly attribute ReadableStream in;
   readonly attribute WritableStream out;
   SerialPortInfo getInfo();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/webaudio.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/webaudio.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/webaudio.idl	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/webaudio.idl	2021-01-18 19:58:23.000000000 +0000
@@ -613,6 +613,11 @@
   readonly attribute MessagePort port;
 };
 
+callback AudioWorkletProcessCallback =
+  boolean (FrozenArray<FrozenArray<Float32Array>> inputs,
+           FrozenArray<FrozenArray<Float32Array>> outputs,
+           object parameters);
+
 dictionary AudioParamDescriptor {
   required DOMString name;
   float defaultValue = 0;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/web-nfc.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/web-nfc.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/web-nfc.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/web-nfc.idl	2021-01-18 19:58:24.000000000 +0000
@@ -44,21 +44,15 @@
 typedef (DOMString or BufferSource or NDEFMessageInit) NDEFMessageSource;
 
 [SecureContext, Exposed=Window]
-interface NDEFWriter {
-  constructor();
-
-  Promise<undefined> write(NDEFMessageSource message,
-                                 optional NDEFWriteOptions options={});
-};
-
-[SecureContext, Exposed=Window]
 interface NDEFReader : EventTarget {
   constructor();
 
-  attribute EventHandler onerror;
   attribute EventHandler onreading;
+  attribute EventHandler onreadingerror;
 
   Promise<undefined> scan(optional NDEFScanOptions options={});
+  Promise<undefined> write(NDEFMessageSource message,
+                                 optional NDEFWriteOptions options={});
 };
 
 [SecureContext, Exposed=Window]
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/interfaces/webrtc.idl firefox-85.0+build1/testing/web-platform/tests/interfaces/webrtc.idl
--- firefox-84.0.2+build1/testing/web-platform/tests/interfaces/webrtc.idl	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/interfaces/webrtc.idl	2021-01-18 19:58:23.000000000 +0000
@@ -119,7 +119,7 @@
   Promise<undefined> createOffer(RTCSessionDescriptionCallback successCallback,
                             RTCPeerConnectionErrorCallback failureCallback,
                             optional RTCOfferOptions options = {});
-  Promise<undefined> setLocalDescription(optional RTCLocalSessionDescriptionInit description = {},
+  Promise<undefined> setLocalDescription(RTCLocalSessionDescriptionInit description,
                                     VoidFunction successCallback,
                                     RTCPeerConnectionErrorCallback failureCallback);
   Promise<undefined> createAnswer(RTCSessionDescriptionCallback successCallback,
@@ -238,7 +238,7 @@
   unsigned short? port;
   DOMString url;
   required unsigned short errorCode;
-  USVString statusText;
+  USVString errorText;
 };
 
 partial interface RTCPeerConnection {
@@ -373,7 +373,6 @@
 };
 
 dictionary RTCRtpSynchronizationSource : RTCRtpContributingSource {
-  boolean voiceActivityFlag;
 };
 
 [Exposed=Window]
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/largest-contentful-paint/placeholder-image.html firefox-85.0+build1/testing/web-platform/tests/largest-contentful-paint/placeholder-image.html
--- firefox-84.0.2+build1/testing/web-platform/tests/largest-contentful-paint/placeholder-image.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/largest-contentful-paint/placeholder-image.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Largest Contentful Paint: src change triggers new entry.</title>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/largest-contentful-paint-helpers.js"></script>
+<img src='/images/green-1x1.png' id='image_id' width="133" height="106"/>
+<script>
+  async_test(function (t) {
+    assert_implements(window.LargestContentfulPaint, "LargestContentfulPaint is not implemented");
+    let beforeLoad = performance.now();
+    document.getElementById('image_id').src = '/images/blue.png';
+    const url = window.location.origin + '/images/blue.png';
+    const observer = new PerformanceObserver(
+      t.step_func(function(entryList) {
+        let entries = entryList.getEntries().filter(e => e.url === url);
+        if (entries.length === 0)
+          return;
+        assert_equals(entries.length, 1);
+        const entry = entries[0];
+        // blue.png is 133 by 106.
+        const size = 133 * 106;
+        checkImage(entry, url, 'image_id', size, beforeLoad);
+        t.done();
+      })
+    );
+    observer.observe({type: 'largest-contentful-paint', buffered: true});
+  }, 'Largest Contentful Paint: changing src causes a new entry to be dispatched.');
+</script>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-offscreen.html firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-offscreen.html
--- firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-offscreen.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-offscreen.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>Layout Instability: off-screen content-visibility:auto content</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<style>
+  #auto {
+    content-visibility: auto;
+    contain-intrinsic-size: 1px;
+    width: 100px;
+  }
+</style>
+<div class=auto>
+  <div style="width: 100px; height: 100px"></div>
+</div>
+<div class=auto style="position: relative; top: 100000px">
+  <div style="width: 100px; height: 100px"></div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  window.scrollTo(0, 100000 + 100);
+  await waitForAnimationFrames(2);
+
+  assert_equals(watcher.score, 0);
+
+  window.scrollTo(0, 0);
+  await waitForAnimationFrames(2);
+
+  assert_equals(watcher.score, 0);
+}, 'off-screen content-visibility:auto');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-onscreen.html firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-onscreen.html
--- firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-onscreen.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-onscreen.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>Layout Instability: on-screen content-visibility:auto content</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<style>
+  #target {
+    content-visibility: auto;
+    contain-intrinsic-size: 1px;
+    width: 100px;
+  }
+</style>
+<div id=target>
+  <div style="width: 100px; height: 100px"></div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+}, 'on-screen content-visibility:auto');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-resize.html firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-resize.html
--- firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-resize.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-auto-resize.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Layout Instability: resizing content-visibility:auto content</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<style>
+      .auto {
+        content-visibility: auto;
+        contain-intrinsic-size: 10px 3000px;
+        width: 100px;
+      }
+      .contained {
+        height: 100px;
+      }
+    </style>
+    <div class=a><div class=contained></div></div>
+    <div class=a ><div class=contained></div></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  assert_equals(watcher.score, 0);
+}, 'off-screen content-visibility:auto');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-hidden.html firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-hidden.html
--- firefox-84.0.2+build1/testing/web-platform/tests/layout-instability/content-visibility-hidden.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/layout-instability/content-visibility-hidden.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>Layout Instability: content-visibility:hidden content</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<style>
+  #target {
+    content-visibility: hidden;
+    contain-intrinsic-size: 1px;
+    width: 100px;
+  }
+</style>
+<div id=target>
+  <div style="width: 100px; height: 100px"></div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<script>
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+  assert_equals(watcher.score, 0);
+}, 'on-screen content-visibility:auto');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/lint.ignore firefox-85.0+build1/testing/web-platform/tests/lint.ignore
--- firefox-84.0.2+build1/testing/web-platform/tests/lint.ignore	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/lint.ignore	2021-01-18 19:58:23.000000000 +0000
@@ -217,6 +217,10 @@
 SET TIMEOUT: workers/*
 SET TIMEOUT: xhr/resources/init.htm
 SET TIMEOUT: xhr/resources/xmlhttprequest-timeout.js
+SET TIMEOUT: focus/support/iframe-focus-with-different-site-intermediate-frame-outer.sub.html
+SET TIMEOUT: focus/support/iframe-focus-with-different-site-intermediate-frame-middle.sub.html
+SET TIMEOUT: focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-outer.sub.html
+SET TIMEOUT: focus/support/iframe-contentwindow-focus-with-different-site-intermediate-frame-middle.sub.html
 
 # generate_tests implementation and sample usage
 GENERATE_TESTS: resources/test/tests/functional/generate-callback.html
@@ -478,6 +482,7 @@
 SET TIMEOUT: css/CSS2/selectors/dom-hover-002.xht
 SET TIMEOUT: css/CSS2/tables/tables-102.xht
 SET TIMEOUT: css/mediaqueries/min-width-tables-001.html
+SET TIMEOUT: css/css-text/crashtests/rendering-rtl-bidi-override-crash.html
 
 ## Build system stuff
 CSS-COLLIDING-SUPPORT-NAME: css/*/README
@@ -619,6 +624,8 @@
 CSS-COLLIDING-SUPPORT-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-1.png
 CSS-COLLIDING-REF-NAME: css/css-multicol/baseline-001-ref.html
 CSS-COLLIDING-REF-NAME: css/css-grid/subgrid/baseline-001-ref.html
+CSS-COLLIDING-REF-NAME: css/css-backgrounds/simple-bg-color-ref.html
+CSS-COLLIDING-REF-NAME: css/css-backgrounds/hidpi/simple-bg-color-ref.html
 
 CSS-COLLIDING-TEST-NAME: css/css-contain/inheritance.html
 CSS-COLLIDING-TEST-NAME: css/css-contain/content-visibility/inheritance.html
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/buffered-flag.window.js firefox-85.0+build1/testing/web-platform/tests/longtask-timing/buffered-flag.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/buffered-flag.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/buffered-flag.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,5 @@
+// META: script=resources/utils.js
+
 async_test(t => {
     assert_implements(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
     new PerformanceObserver(t.step_func((entryList, obs) => {
@@ -6,9 +8,7 @@
             list.getEntries().forEach(entry => {
                 if (entry.entryType === 'mark')
                     return;
-                assert_equals(entry.entryType, 'longtask');
-                assert_equals(entry.name, 'self');
-                assert_greater_than(entry.duration, 50);
+                checkLongTaskEntry(entry);
                 longtaskObserved = true;
             });
             assert_true(longtaskObserved, 'Did not observe buffered longtask.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/containerNames.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/containerNames.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/containerNames.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/containerNames.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 <h1>Longtasks in iframe</h1>
 <div id="log"></div>
 <script>
@@ -23,11 +24,7 @@
             longtask.name == 'multiple-contexts' ||
             longtask.name == 'unknown')
             return;
-        assert_equals(longtask.name, 'same-origin-descendant');
-        assert_greater_than(longtask.duration, 50);
-        assert_greater_than_equal(longtask.startTime, initialTime);
-        const currentTime = performance.now();
-        assert_less_than_equal(longtask.startTime, currentTime);
+        checkLongTaskEntry(longtask, 'same-origin-descendant');
         // Assert the TaskAttributionTiming entry in attribution.
         assert_equals(longtask.attribution.length, 1,
             'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/containerTypes.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/containerTypes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/containerTypes.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/containerTypes.html	2021-01-18 19:58:23.000000000 +0000
@@ -4,6 +4,7 @@
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 <h1>Longtasks in iframe, frame, object, and embed</h1>
 <div id="log"></div>
 <script>
@@ -32,11 +33,7 @@
             longtask.name == 'multiple-contexts' ||
             longtask.name == 'unknown')
           return;
-        assert_equals(longtask.name, 'same-origin-descendant');
-        assert_greater_than(longtask.duration, 50);
-        assert_greater_than_equal(longtask.startTime, initialTime);
-        const currentTime = performance.now();
-        assert_less_than_equal(longtask.startTime, currentTime);
+        checkLongTaskEntry(longtask, 'same-origin-descendant');
         // Assert the TaskAttributionTiming entry in attribution.
         assert_equals(longtask.attribution.length, 1,
           'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/long-microtask.window.js firefox-85.0+build1/testing/web-platform/tests/longtask-timing/long-microtask.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/long-microtask.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/long-microtask.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,5 @@
+// META: script=resources/utils.js
+
 async_test(function (t) {
     assert_implements(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
     new PerformanceObserver(
@@ -6,12 +8,7 @@
             assert_equals(entries.length, 1,
                 'Exactly one entry is expected.');
             const longtask = entries[0];
-            assert_equals(longtask.entryType, 'longtask');
-            assert_equals(longtask.name, 'self');
-            assert_greater_than(longtask.duration, 50);
-            assert_greater_than_equal(longtask.startTime, 0);
-            const currentTime = performance.now();
-            assert_less_than_equal(longtask.startTime, currentTime);
+            checkLongTaskEntry(longtask);
             t.done();
         })
     ).observe({entryTypes: ['longtask']});
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-attributes.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-attributes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-attributes.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-attributes.html	2021-01-18 19:58:23.000000000 +0000
@@ -5,6 +5,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <h1>Long Task Attributes</h1>
 <div id="log"></div>
@@ -17,13 +18,7 @@
             assert_equals(entries.length, 1,
                 'Exactly one entry is expected.');
             const longtask = entries[0];
-            assert_equals(longtask.entryType, 'longtask');
-            assert_equals(longtask.name, 'self');
-            assert_greater_than(longtask.duration, 50);
-            assert_greater_than_equal(longtask.startTime, 0);
-            const currentTime = performance.now();
-            assert_less_than_equal(longtask.startTime, currentTime);
-
+            checkLongTaskEntry(longtask);
             // Assert the TaskAttributionTiming entry in attribution.
             assert_equals(longtask.attribution.length, 1,
                 'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-before-observer.window.js firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-before-observer.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-before-observer.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-before-observer.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -1,3 +1,5 @@
+// META: script=resources/utils.js
+
 async_test(t => {
   assert_implements(window.PerformanceLongTaskTiming, 'Longtasks are not supported.');
   // Create a long task before any observer.
@@ -7,9 +9,7 @@
   t.step_timeout(() => {
     new PerformanceObserver(t.step_func_done(list => {
       list.getEntries().forEach(entry => {
-        assert_equals(entry.entryType, 'longtask');
-        assert_equals(entry.name, 'self');
-        assert_greater_than(entry.duration, 50);
+        checkLongTaskEntry(entry);
       });
     })).observe({type: 'longtask', buffered: true});
   }, 0);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe-crossorigin.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe-crossorigin.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe-crossorigin.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe-crossorigin.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src='resources/utils.js'></script>
 
 <h1>Long Task in Nested Cross-Origin Child Iframe</h1>
 <div id="log"></div>
@@ -22,9 +23,7 @@
                 longtask.name == 'multiple-contexts' ||
                 longtask.name == 'unknown')
               return;
-            assert_equals(longtask.name, 'cross-origin-descendant');
-            assert_greater_than(longtask.duration, 50);
-
+            checkLongTaskEntry(longtask, 'cross-origin-descendant');
             // Assert the TaskAttributionTiming entry in attribution.
             assert_equals(longtask.attribution.length, 1,
                 'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-childiframe.html	2021-01-18 19:58:23.000000000 +0000
@@ -5,6 +5,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <h1>Long Task in Nested Child Iframe</h1>
 <div id="log"></div>
@@ -23,13 +24,7 @@
                 longtask.name == 'multiple-contexts' ||
                 longtask.name == 'unknown')
               return;
-
-            assert_equals(longtask.name, 'same-origin-descendant');
-            assert_greater_than(longtask.duration, 50);
-            assert_greater_than_equal(longtask.startTime, initialTime);
-            const currentTime = performance.now();
-            assert_less_than_equal(longtask.startTime, currentTime);
-
+            checkLongTaskEntry(longtask, 'same-origin-descendant');
             // Assert the TaskAttributionTiming entry in attribution.
             assert_equals(longtask.attribution.length, 1,
                 'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-externalscript.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-externalscript.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-externalscript.html	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-externalscript.html	2021-01-18 19:58:23.000000000 +0000
@@ -5,6 +5,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <h1>Long Task: External Script</h1>
 <div id="log"></div>
@@ -17,10 +18,7 @@
             assert_equals(entries.length, 1,
                 'Exactly one entry is expected.');
             const longtask = entries[0];
-            assert_equals(longtask.entryType, 'longtask');
-            assert_equals(longtask.name, 'self');
-            assert_greater_than(longtask.duration, 50);
-
+            checkLongTaskEntry(longtask);
             // Assert the TaskAttributionTiming entry in attribution.
             assert_equals(longtask.attribution.length, 1,
                 'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-raf.html firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-raf.html
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/longtask-in-raf.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/longtask-in-raf.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
 
 <h1>Long Task: requestAnimationFrame</h1>
 <div id="log"></div>
@@ -17,10 +18,7 @@
             assert_equals(entries.length, 1,
                 'Exactly one entry is expected.');
             const longtask = entries[0];
-            assert_equals(longtask.entryType, 'longtask');
-            assert_equals(longtask.name, 'self');
-            assert_greater_than(longtask.duration, 50);
-
+            checkLongTaskEntry(longtask);
             // Assert the TaskAttributionTiming entry in attribution.
             assert_equals(longtask.attribution.length, 1,
                 'Exactly one attribution entry is expected');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/resources/utils.js firefox-85.0+build1/testing/web-platform/tests/longtask-timing/resources/utils.js
--- firefox-84.0.2+build1/testing/web-platform/tests/longtask-timing/resources/utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/longtask-timing/resources/utils.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,9 @@
+function checkLongTaskEntry(longtask, name='self') {
+  assert_equals(longtask.entryType, 'longtask');
+  assert_equals(longtask.name, name);
+  assert_true(Number.isInteger(longtask.duration));
+  assert_greater_than_equal(longtask.duration, 50);
+  assert_greater_than_equal(longtask.startTime, 0);
+  const currentTime = performance.now();
+  assert_less_than_equal(longtask.startTime, currentTime);
+}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mathml/crashtests/operator-and-first-letter.html firefox-85.0+build1/testing/web-platform/tests/mathml/crashtests/operator-and-first-letter.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mathml/crashtests/operator-and-first-letter.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mathml/crashtests/operator-and-first-letter.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+  p::first-letter { --panel-arrowcontent-color:-moz-FieldText; }
+</style>
+<p>
+  <math display="block">
+    <mo>&#x222B;</mo>
+  </math>
+</p>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,196 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-site-1',
+      children: [
+        {
+          id: 'same-origin-2',
+        },
+        {
+          id: 'same-origin-11',
+          window_open: true,
+        },
+      ],
+    },
+    {
+      id: 'same-origin-3',
+      children: [
+        {
+          id: 'same-origin-4',
+        },
+        {
+          id: 'same-origin-12',
+          window_open: true,
+        },
+      ],
+    },
+    {
+      id: 'cross-origin-5',
+      children: [
+        {
+          id: 'same-origin-6',
+        },
+        {
+          id: 'same-origin-13',
+          window_open: true,
+        },
+      ],
+    },
+    {
+      id: 'same-origin-7',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-8',
+        }
+      ],
+    },
+    {
+      id: 'cross-origin-9',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-10',
+        }
+      ],
+    },
+  ]);
+  const expected = [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-site-1',
+        src: iframes['cross-site-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'cross-site-1',
+        src: iframes['cross-site-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-3'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-3',
+        src: iframes['same-origin-3'].src,
+      },
+    },
+    {
+      url: windows['same-origin-4'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-4',
+        src: iframes['same-origin-4'].src,
+      },
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-origin-5',
+        src: iframes['cross-origin-5'].src,
+      },
+    },
+    {
+      url: windows['same-origin-6'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'cross-origin-5',
+        src: iframes['cross-origin-5'].src,
+      },
+    },
+    {
+      url: windows['same-origin-8'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-8',
+        src: iframes['same-origin-8'].src,
+      },
+    },
+    {
+      url: windows['same-origin-7'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-11'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-12'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-13'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+  ];
+  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
+  // Detach iframes:
+  // 1) By setting src attribute:
+  iframes['cross-site-1'].src =
+      iframes['cross-site-1'].src.replace('iframe.sub', 'iframe.secret.sub');
+  // 2) By setting location attribute:
+  let url = iframes['same-origin-3'].contentWindow.location.href;
+  url = url.replace('iframe.sub', 'iframe.secret.sub');
+  iframes['same-origin-3'].contentWindow.location.href = url;
+  // 3) By removing from the DOM tree:
+  iframes['cross-origin-5'].parentNode.removeChild(iframes['cross-origin-5']);
+
+  // Detach windows:
+  // 1) By setting document.location attribute:
+  url = windows['same-origin-7'].location.href;
+  url = url.replace('window.sub', 'window.secret.sub');
+  windows['same-origin-7'].location.href = url;
+  // 2) By closing the window:
+  windows['same-origin-10'].parent.close();
+
+  await waitForMessage('cross-site-1');
+  await waitForMessage('same-origin-3');
+  await waitForMessage('same-origin-7');
+
+  expected.push({
+    url: 'cross-origin-url',
+    scope: 'cross-origin-aggregated',
+    container: {
+      id: 'cross-site-1',
+      src: iframes['cross-site-1'].src,
+    },
+  });
+
+  expected.push({
+    url: windows['same-origin-3'].location.href,
+    scope: 'Window',
+    container: {
+      id: 'same-origin-3',
+      src: iframes['same-origin-3'].src,
+    },
+  });
+  expected.push({
+    url: windows['same-origin-7'].location.href,
+    scope: 'Window',
+    container: null,
+  });
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, expected);
+}, 'performance.measureMemory URLs within a cross-site iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/detached.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/detached.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes, windows} = await build([
-    {
-      id: 'cross-site-1',
-      children: [
-        {
-          id: 'same-origin-2',
-        },
-        {
-          id: 'same-origin-11',
-          window_open: true,
-        },
-      ],
-    },
-    {
-      id: 'same-origin-3',
-      children: [
-        {
-          id: 'same-origin-4',
-        },
-        {
-          id: 'same-origin-12',
-          window_open: true,
-        },
-      ],
-    },
-    {
-      id: 'cross-origin-5',
-      children: [
-        {
-          id: 'same-origin-6',
-        },
-        {
-          id: 'same-origin-13',
-          window_open: true,
-        },
-      ],
-    },
-    {
-      id: 'same-origin-7',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-8',
-        }
-      ],
-    },
-    {
-      id: 'cross-origin-9',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-10',
-        }
-      ],
-    },
-  ]);
-  const allowed = [
-    window.location.href,
-    iframes['cross-site-1'].src,
-    iframes['same-origin-3'].src,
-    iframes['same-origin-4'].src,
-    iframes['cross-origin-5'].src,
-    iframes['same-origin-8'].sec,
-    windows['same-origin-7'].location.href,
-    windows['same-origin-12'].location.href,
-  ];
-  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
-  // Detach iframes:
-  // 1) By setting src attribute:
-  iframes['cross-site-1'].src =
-      iframes['cross-site-1'].src.replace('iframe.sub', 'iframe.secret.sub');
-  // 2) By setting location attribute:
-  let url = iframes['same-origin-3'].contentWindow.location.href;
-  url = url.replace('iframe.sub', 'iframe.secret.sub');
-  iframes['same-origin-3'].contentWindow.location.href = url;
-  // 3) By removing from the DOM tree:
-  iframes['cross-origin-5'].parentNode.removeChild(iframes['cross-origin-5']);
-
-  // Detach windows:
-  // 1) By setting document.location attribute:
-  url = windows['same-origin-7'].location.href;
-  url = url.replace('window.sub', 'window.secret.sub');
-  windows['same-origin-7'].location.href = url;
-  // 2) By closing the window:
-  windows['cross-origin-9'].close();
-
-  await waitForMessage('cross-site-1');
-  await waitForMessage('same-origin-3');
-  await waitForMessage('same-origin-7');
-
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: allowed.concat([
-        iframes['cross-site-1'].src,
-        iframes['same-origin-3'].contentWindow.location.href,
-        windows['same-origin-7'].location.href,
-      ]),
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory URLs within a cross-site iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/idlharness.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/idlharness.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/idlharness.tentative.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/idlharness.tentative.any.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,15 @@
+// META: global=window,worker
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://wicg.github.io/performance-measure-memory/
+
+idl_test(
+  ['performance-measure-memory'],
+  ['hr-time', 'dom'],
+  async idl_array => {
+    // Nothing to add.
+  }
+);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,49 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-origin-1',
+      children: [
+        {
+          id: 'same-origin-2',
+        },
+        {
+          id: 'cross-origin-3',
+        },
+        {
+          id: 'cross-site-4',
+        }
+      ],
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-origin-1',
+        src: iframes['cross-origin-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'cross-origin-1',
+        src: iframes['cross-origin-1'].src,
+      },
+    },
+  ]);
+}, 'performance.measureMemory URLs within a cross-origin iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.https.window.js.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-origin.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes} = await build([
-    {
-      id: 'cross-origin-1',
-      children: [
-        {
-          id: 'same-origin-2',
-        },
-        {
-          id: 'cross-origin-3',
-        },
-        {
-          id: 'cross-site-4',
-        }
-      ],
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['cross-origin-1'].src,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory URLs within a cross-origin iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,56 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-site-1',
+      children: [
+        {
+          id: 'same-origin-2',
+        },
+        {
+          id: 'cross-origin-3',
+        },
+        {
+          id: 'cross-site-4',
+        }
+      ],
+    },
+  ]);
+  try {
+    const result = await performance.measureMemory();
+    checkMeasureMemory(result, [
+      {
+        url: window.location.href,
+        scope: 'Window',
+        container: null,
+      },
+      {
+        url: 'cross-origin-url',
+        scope: 'cross-origin-aggregated',
+        container: {
+          id: 'cross-site-1',
+          src: iframes['cross-site-1'].src,
+        },
+      },
+      {
+        url: windows['same-origin-2'].location.href,
+        scope: 'Window',
+        container: {
+          id: 'cross-site-1',
+          src: iframes['cross-site-1'].src,
+        },
+      },
+    ]);
+  } catch (error) {
+    if (!(error instanceof DOMException)) {
+      throw error;
+    }
+    assert_equals(error.name, 'SecurityError');
+  }
+}, 'performance.measureMemory URLs within a cross-site iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.cross-site.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes} = await build([
-    {
-      id: 'cross-site-1',
-      children: [
-        {
-          id: 'same-origin-2',
-        },
-        {
-          id: 'cross-origin-3',
-        },
-        {
-          id: 'cross-site-4',
-        }
-      ],
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['cross-site-1'].src,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory URLs within a cross-site iframe.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'same-origin-1',
+      children: [
+        {
+          id: 'same-origin-2',
+        }
+      ],
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-1'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-1',
+        src: iframes['same-origin-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-2',
+        src: iframes['same-origin-2'].src,
+      },
+    },
+  ]);
+}, 'Well-formed result of performance.measureMemory with same-origin iframes.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/iframe.same-origin.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes} = await build([
-    {
-      id: 'same-origin-1',
-      children: [
-        {
-          id: 'same-origin-2',
-        }
-      ],
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['same-origin-1'].src,
-        iframes['same-origin-2'].src,
-      ],
-      required: [
-        window.location.href,
-        iframes['same-origin-1'].src,
-        iframes['same-origin-2'].src,
-      ]
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'Well-formed result of performance.measureMemory with same-origin iframes.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,26 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const BYTES_PER_WORKER = 10 * 1024 * 1024;
+  const worker_url = await createWorker(BYTES_PER_WORKER);
+  const result = await performance.measureMemory();
+  assert_greater_than_equal(result.bytes, BYTES_PER_WORKER);
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: worker_url,
+      scope: 'DedicatedWindow',
+      container: null,
+    },
+  ]);
+}, 'Well-formed result of performance.measureMemory.');
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame-and-worker.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-
-promise_test(async testCase => {
- try {
-    const BYTES_PER_WORKER = 10 * 1024 * 1024;
-    await createWorker(BYTES_PER_WORKER);
-    const result = await performance.measureMemory();
-    assert_greater_than_equal(result.bytes, BYTES_PER_WORKER);
-    checkMeasureMemory(result, {
-      allowed: [window.location.href],
-      required: [window.location.href],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'Well-formed result of performance.measureMemory.');
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,16 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+promise_test(async testCase => {
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+  ]);
+}, 'Well-formed result of performance.measureMemory.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.https.window.js.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/main-frame.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
- try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [window.location.href],
-      required: [window.location.href],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'Well-formed result of performance.measureMemory.');
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,67 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-origin-1',
+      redirect: 'client',
+      children: [
+        {
+          id: 'same-origin-2',
+        },
+        {
+          id: 'cross-origin-3',
+        },
+        {
+          id: 'cross-site-4',
+        }
+      ],
+    },
+    {
+      id: 'cross-origin-5',
+      redirect: 'client',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-6',
+        },
+        {
+          id: 'cross-origin-7',
+        },
+        {
+          id: 'cross-site-8',
+        }
+      ],
+    },
+  ]);
+  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-origin-1',
+        src: frames['cross-origin-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'cross-origin-1',
+        src: iframes['cross-origin-1'].src,
+      },
+    },
+  ]);
+}, 'performance.measureMemory does not leak client redirected URL.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.client.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes, windows} = await build([
-    {
-      id: 'cross-origin-1',
-      redirect: 'client',
-      children: [
-        {
-          id: 'same-origin-2',
-        },
-        {
-          id: 'cross-origin-3',
-        },
-        {
-          id: 'cross-site-4',
-        }
-      ],
-    },
-    {
-      id: 'cross-origin-5',
-      redirect: 'client',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-6',
-        },
-        {
-          id: 'cross-origin-7',
-        },
-        {
-          id: 'cross-site-8',
-        }
-      ],
-    },
-  ]);
-  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['cross-origin-1'].src,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory does not leak client redirected URL.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,67 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-origin-1',
+      redirect: 'server',
+      children: [
+        {
+          id: 'same-origin-2',
+        },
+        {
+          id: 'cross-origin-3',
+        },
+        {
+          id: 'cross-site-4',
+        }
+      ],
+    },
+    {
+      id: 'cross-origin-5',
+      redirect: 'server',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-6',
+        },
+        {
+          id: 'cross-origin-7',
+        },
+        {
+          id: 'cross-site-8',
+        }
+      ],
+    },
+  ]);
+  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-origin-1',
+        src: frames['cross-origin-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'cross-origin-1',
+        src: iframes['cross-origin-1'].src,
+      },
+    },
+  ]);
+}, 'performance.measureMemory does not leak server redirected URL.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.https.window.js.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/redirect.server.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {iframes, windows} = await build([
-    {
-      id: 'cross-origin-1',
-      redirect: 'server',
-      children: [
-        {
-          id: 'same-origin-2',
-        },
-        {
-          id: 'cross-origin-3',
-        },
-        {
-          id: 'cross-site-4',
-        }
-      ],
-    },
-    {
-      id: 'cross-origin-5',
-      redirect: 'server',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-6',
-        },
-        {
-          id: 'cross-origin-7',
-        },
-        {
-          id: 'cross-site-8',
-        }
-      ],
-    },
-  ]);
-  const keep = sameOriginContexts(frames).concat(sameOriginContexts(windows));
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['cross-origin-1'].src,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory does not leak server redirected URL.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/common.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/common.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/common.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/common.js	2021-01-18 19:58:24.000000000 +0000
@@ -1,11 +1,32 @@
 const ORIGINS = {
-  'same-origin': get_host_info().HTTP_ORIGIN,
-  'cross-origin': get_host_info().HTTP_REMOTE_ORIGIN,
-  'cross-site': get_host_info().HTTP_NOTSAMESITE_ORIGIN,
+  'same-origin': get_host_info().HTTPS_ORIGIN,
+  'cross-origin': get_host_info().HTTPS_REMOTE_ORIGIN,
+  'cross-site': get_host_info().HTTPS_NOTSAMESITE_ORIGIN,
 }
 
-function checkMeasureMemoryBreakdown(breakdown, options, required) {
-  const allowed = new Set(options.allowed);
+function checkContainer(actual, expected) {
+  if (!actual) return true;
+  if (!expected) return false;
+  return actual.id == expected.id && actual.src == expected.src;
+}
+
+function checkAttribuiton(attribution, expected) {
+  assert_own_property(attribution, 'url');
+  assert_own_property(attribution, 'scope');
+  let found = false;
+  for (const e of expected) {
+    if (attribution.url === e.url &&
+        attribution.scope === e.scope &&
+        checkContainer(attribution.container, e.container)) {
+      found = true;
+      e.found = true;
+    }
+  }
+  assert_true(found, JSON.stringify(attribution) +
+      ' is not found in ' + JSON.stringify(expected) + '.');
+}
+
+function checkBreakdown(breakdown, expected) {
   assert_own_property(breakdown, 'bytes');
   assert_greater_than_equal(breakdown.bytes, 0);
   assert_own_property(breakdown, 'userAgentSpecificTypes');
@@ -14,28 +35,25 @@
   }
   assert_own_property(breakdown, 'attribution');
   for (const attribution of breakdown.attribution) {
-    assert_equals(typeof attribution, 'string');
-    assert_true(
-        allowed.has(attribution),
-        `${attribution} must be in ${JSON.stringify(options.allowed)}`);
-    if (required.has(attribution)) {
-      required.delete(attribution);
-    }
+    checkAttribuiton(attribution, expected);
   }
 }
 
-function checkMeasureMemory(result, options) {
-    assert_own_property(result, 'bytes');
-    assert_own_property(result, 'breakdown');
-    const required = new Set(options.required);
-    let bytes = 0;
-    for (let breakdown of result.breakdown) {
-      checkMeasureMemoryBreakdown(breakdown, options, required);
-      bytes += breakdown.bytes;
-    }
-    assert_equals(bytes, result.bytes);
-    assert_equals(required.size, 0, JSON.stringify(result.breakdown) +
-        ' does not include ' + JSON.stringify(required.values()));
+function checkMeasureMemory(result, expected) {
+  assert_own_property(result, 'bytes');
+  assert_own_property(result, 'breakdown');
+  let bytes = 0;
+  for (let breakdown of result.breakdown) {
+    checkBreakdown(breakdown, expected);
+    bytes += breakdown.bytes;
+  }
+  assert_equals(bytes, result.bytes);
+  for (const e of expected) {
+    if (e.required) {
+      assert_true(e.found,
+          JSON.stringify(e) + ' did not appear in the result.');
+    }
+  }
 }
 
 function url(params) {
@@ -52,7 +70,8 @@
   }
   let url = `${origin}/${file}?id=${params.id}`;
   if (params.redirect === 'server') {
-    url = `${origin}/common/redirect.py?location=${encodeURIComponent(url)}`;
+    url = (`${origin}/measure-memory/resources/redirect.py?` +
+           `location=${encodeURIComponent(url)}`);
   }
   return url;
 }
@@ -95,31 +114,7 @@
   }
 })();
 
-// Constructs iframes based on their descriptoin.
-async function build(children) {
-  window.accessible_children = {iframes: {}, windows: {}};
-  await Promise.all(children.map(buildChild));
-  const result = window.accessible_children;
-  delete window.accessible_children;
-  return result;
-}
-
-async function buildChild(params) {
-  let child = null;
-  function target() {
-    return params.window_open ? child : child.contentWindow;
-  }
-  if (params.window_open) {
-    child = window.open(url(params));
-  } else {
-    child = document.createElement('iframe');
-    child.src = url(params);
-    child.id = params.id;
-    document.body.appendChild(child);
-  }
-  const ready = await waitForMessage(params.id);
-  target().postMessage({id: 'parent', payload: params.children}, '*');
-  const done = await waitForMessage(params.id);
+function getMainWindow() {
   let main = window;
   while (true) {
     if (main === main.parent) {
@@ -132,17 +127,17 @@
       main = main.parent;
     }
   }
+  return main;
+}
+
+function isSameOrigin(other) {
   try {
-    main.accessible_children;
+    other.descendants;
   } catch (e) {
     // Cross-origin iframe that cannot access the main frame.
-    return;
-  }
-  if (params.window_open) {
-    main.accessible_children.windows[params.id] = child;
-  } else  {
-    main.accessible_children.iframes[params.id] = child;
+    return false;
   }
+  return !!other.descendants;
 }
 
 function getId() {
@@ -157,15 +152,57 @@
   return window.parent;
 }
 
+// Constructs iframes based on their descriptoin.
+async function build(children) {
+  window.descendants = {iframes: {}, windows: {}};
+  await Promise.all(children.map(buildChild));
+  const result = window.descendants;
+  return result;
+}
+
+async function buildChild(params) {
+  let child = null;
+  function target() {
+    return params.window_open ? child : child.contentWindow;
+  }
+  if (params.window_open) {
+    child = window.open(url(params));
+    if (!params.id.startsWith('same-origin')) {
+      // Cross-origin windows gets their own browsing context groups with COOP.
+      // The postMessage calls before would not work for them, so we do not
+      // wait for them to load.
+      return;
+    }
+  } else {
+    child = document.createElement('iframe');
+    child.src = url(params);
+    child.id = params.id;
+    document.body.appendChild(child);
+  }
+  const ready = await waitForMessage(params.id);
+  target().postMessage({id: 'parent', payload: params.children}, '*');
+  const done = await waitForMessage(params.id);
+  if (!params.window_open) {
+    const main = getMainWindow();
+    if (isSameOrigin(main)) {
+      main.descendants.iframes[params.id] = child;
+    }
+  }
+}
+
 // This function runs within an iframe.
 // It gets the children descriptions from the parent and constructs them.
 async function setupChild() {
   const id = getId();
+  const main = getMainWindow();
+  if (isSameOrigin(main)) {
+    main.descendants.windows[id] = window;
+  }
   document.getElementById('title').textContent = id;
   getParent().postMessage({id : id, payload: 'ready'}, '*');
   const children = await waitForMessage('parent');
   if (children) {
-    await build(children);
+    await Promise.all(children.map(buildChild));
   }
   getParent().postMessage({id: id, payload: 'done'}, '*');
 }
@@ -186,8 +223,7 @@
   let resolve_promise;
   const promise = new Promise(resolve => resolve_promise = resolve);
   worker.onmessage = function (message) {
-    assert_equals(message.data, 'ready');
-    resolve_promise();
+    resolve_promise(message.data);
   }
   worker.postMessage({bytes});
   return promise;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.redirect.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.redirect.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.redirect.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.redirect.sub.html.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Resource-Policy: cross-origin
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.secret.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.secret.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.secret.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.secret.sub.html.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Resource-Policy: cross-origin
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/iframe.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/iframe.sub.html.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Resource-Policy: cross-origin
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/redirect.py firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/redirect.py
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/redirect.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/redirect.py	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,21 @@
+def main(request, response):
+    """Simple handler that causes redirection.
+
+    The request should typically have two query parameters:
+    status - The status to use for the redirection. Defaults to 302.
+    location - The resource to redirect to.
+    """
+    status = 302
+    if b"status" in request.GET:
+        try:
+            status = int(request.GET.first(b"status"))
+        except ValueError:
+            pass
+
+    response.status = status
+
+    location = request.GET.first(b"location")
+
+    response.headers.set(b"Location", location)
+    response.headers.set(b"Cross-Origin-Embedder-Policy", b"require-corp")
+    response.headers.set(b"Cross-Origin-Resource-Policy", b"cross-origin")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.redirect.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.redirect.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.redirect.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.redirect.sub.html.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.secret.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.secret.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.secret.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.secret.sub.html.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.sub.html.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.sub.html.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/window.sub.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/window.sub.html.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/worker.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/worker.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/worker.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/worker.js	2021-01-18 19:58:24.000000000 +0000
@@ -5,5 +5,5 @@
   for (let i = 0; i < length; i += 256) {
     self.root[i] = 1;
   }
-  postMessage('ready');
+  postMessage(self.location.href);
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/worker.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/worker.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/resources/worker.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/resources/worker.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Resource-Policy: same-origin
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,35 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-origin-1',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-2',
+          window_open: true,
+        },
+        {
+          id: 'same-origin-3',
+        },
+        {
+          id: 'cross-origin-4',
+        },
+      ]
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+  ]);
+}, 'performance.measureMemory does not leak URL of cross-origin window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.window.js	2021-01-06 11:23:20.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-origin.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {windows, iframes} = await build([
-    {
-      id: 'cross-origin-1',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-2',
-          window_open: true,
-        },
-        {
-          id: 'same-origin-3',
-        },
-        {
-          id: 'cross-origin-4',
-        },
-      ]
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory does not leak URL of cross-origin window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,35 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'cross-site-1',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-2',
+          window_open: true,
+        },
+        {
+          id: 'same-origin-3',
+        },
+        {
+          id: 'cross-origin-4',
+        },
+      ]
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+  ]);
+}, 'performance.measureMemory does not leak URL of cross-site window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.https.window.js.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.cross-site.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {windows, iframes} = await build([
-    {
-      id: 'cross-site-1',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-2',
-          window_open: true,
-        },
-        {
-          id: 'same-origin-3',
-        },
-        {
-          id: 'cross-origin-4',
-        },
-      ]
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-      ],
-      required: [
-        window.location.href,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory does not leak URL of cross-site window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,135 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'same-origin-1',
+      children: [
+        {
+          id: 'same-origin-2',
+          window_open: true,
+          children: [
+            {
+              id: 'same-origin-3',
+              window_open: true,
+            },
+          ],
+        },
+        {
+          id: 'cross-origin-4',
+          children: [
+            {
+              id: 'same-origin-5',
+              window_open: true,
+            },
+          ],
+        },
+        {
+          id: 'cross-site-6',
+          children: [
+            {
+              id: 'same-origin-7',
+              window_open: true,
+            },
+          ],
+        },
+        {
+          id: 'same-origin-8',
+          children: [
+            {
+              id: 'cross-origin-9',
+              window_open: true,
+              children: [
+                {
+                  id: 'same-origin-10',
+                },
+                {
+                  id: 'same-origin-11',
+                  window_open: true,
+                },
+              ],
+            },
+            {
+              id: 'cross-site-12',
+              window_open: true,
+              children: [
+                {
+                  id: 'same-origin-13',
+                },
+                {
+                  id: 'same-origin-14',
+                  window_open: true,
+                },
+              ],
+            },
+          ],
+        },
+      ]
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-1'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-1',
+        src: iframes['same-origin-1'].src,
+      },
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-3'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-origin-4',
+        src: iframes['cross-origin-4'].src,
+      },
+    },
+    {
+      url: windows['same-origin-5'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: 'cross-origin-url',
+      scope: 'cross-origin-aggregated',
+      container: {
+        id: 'cross-site-6',
+        src: iframes['cross-site-6'].src,
+      },
+    },
+    {
+      url: windows['same-origin-7'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-8'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-8',
+        src: iframes['same-origin-8'].src,
+      },
+    },
+  ]);
+}, 'performance.measureMemory does not leak URLs in cross-origin iframes and windows.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.https.window.js.headers	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.mix.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,99 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {windows, iframes} = await build([
-    {
-      id: 'same-origin-1',
-      children: [
-        {
-          id: 'same-origin-2',
-          window_open: true,
-          children: [
-            {
-              id: 'same-origin-3',
-              window_open: true,
-            },
-          ],
-        },
-        {
-          id: 'cross-origin-4',
-          children: [
-            {
-              id: 'same-origin-5',
-              window_open: true,
-            },
-          ],
-        },
-        {
-          id: 'cross-site-6',
-          children: [
-            {
-              id: 'same-origin-7',
-              window_open: true,
-            },
-          ],
-        },
-        {
-          id: 'same-origin-8',
-          children: [
-            {
-              id: 'cross-origin-9',
-              window_open: true,
-              children: [
-                {
-                  id: 'same-origin-10',
-                },
-                {
-                  id: 'same-origin-11',
-                  window_open: true,
-                },
-              ],
-            },
-            {
-              id: 'cross-site-12',
-              window_open: true,
-              children: [
-                {
-                  id: 'same-origin-13',
-                },
-                {
-                  id: 'same-origin-14',
-                  window_open: true,
-                },
-              ],
-            },
-          ],
-        },
-      ]
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        iframes['same-origin-1'].src,
-        windows['same-origin-2'].location.href,
-        windows['same-origin-3'].location.href,
-        iframes['cross-origin-4'].src,
-        iframes['cross-site-6'].src,
-        iframes['same-origin-8'].src,
-      ],
-      required: [
-        window.location.href,
-        iframes['same-origin-1'].src,
-        windows['same-origin-2'].location.href,
-        windows['same-origin-3'].location.href,
-        iframes['same-origin-8'].src,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'performance.measureMemory does not leak URLs in cross-origin iframes and windows.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,50 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=./resources/common.js
+// META: timeout=long
+'use strict';
+
+assert_true(self.crossOriginIsolated);
+
+promise_test(async testCase => {
+  const {iframes, windows} = await build([
+    {
+      id: 'same-origin-1',
+      window_open: true,
+      children: [
+        {
+          id: 'same-origin-2',
+          window_open: true,
+        },
+        {
+          id: 'same-origin-3',
+        },
+      ]
+    },
+  ]);
+  const result = await performance.measureMemory();
+  checkMeasureMemory(result, [
+    {
+      url: window.location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-1'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-2'].location.href,
+      scope: 'Window',
+      container: null,
+    },
+    {
+      url: windows['same-origin-3'].location.href,
+      scope: 'Window',
+      container: {
+        id: 'same-origin-3',
+        src: iframes['same-origin-3'].src,
+      },
+    },
+  ]);
+}, 'Well-formed result of performance.measureMemory with same-origin window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.https.window.js.headers	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.window.js firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/measure-memory/window-open.same-origin.tentative.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-// META: script=./resources/common.js
-// META: timeout=long
-'use strict';
-
-promise_test(async testCase => {
-  const {windows, iframes} = await build([
-    {
-      id: 'same-origin-1',
-      window_open: true,
-      children: [
-        {
-          id: 'same-origin-2',
-          window_open: true,
-        },
-        {
-          id: 'same-origin-3',
-        },
-      ]
-    },
-  ]);
-  try {
-    const result = await performance.measureMemory();
-    checkMeasureMemory(result, {
-      allowed: [
-        window.location.href,
-        windows['same-origin-1'].location.href,
-        windows['same-origin-2'].location.href,
-        iframes['same-origin-3'].src,
-      ],
-      required: [
-        window.location.href,
-        windows['same-origin-1'].location.href,
-        windows['same-origin-2'].location.href,
-        iframes['same-origin-3'].src,
-      ],
-    });
-  } catch (error) {
-    if (!(error instanceof DOMException)) {
-      throw error;
-    }
-    assert_equals(error.name, 'SecurityError');
-  }
-}, 'Well-formed result of performance.measureMemory with same-origin window.open.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-image/MediaStreamTrack-clone.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-image/MediaStreamTrack-clone.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-image/MediaStreamTrack-clone.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-image/MediaStreamTrack-clone.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,362 @@
+<!DOCTYPE html>
+<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="/mediacapture-image/resources/imagecapture-helpers.js"></script>
+<script>
+
+// This test verifies that we can set some nondefault constraints, then clone a
+// MediaStreamTrack and check that the cloned constraints are the same as the
+// original, with a mock Mojo service implementation.
+image_capture_test(async (t, imageCaptureTest) => {
+  await test_driver.set_permission({name: 'camera', panTiltZoom: true},
+        'granted', false);
+
+  const constraints = { advanced : [{ whiteBalanceMode : 'single-shot',
+                                      exposureMode     : 'manual',
+                                      focusMode        : 'single-shot',
+
+                                      pointsOfInterest : [{x : 0.1, y : 0.2},
+                                                          {x : 0.3, y : 0.4}],
+
+                                      exposureCompensation : 133.77,
+                                      exposureTime         : 10000,
+                                      colorTemperature     : 6000,
+                                      iso                  : 120.0,
+
+                                      brightness           : 3,
+                                      contrast             : 4,
+                                      saturation           : 5,
+                                      sharpness            : 6,
+                                      focusDistance        : 7,
+
+                                      pan                  : 8,
+                                      tilt                 : 9,
+                                      zoom                 : 3.141592,
+
+                                      torch                : true
+                                    }]};
+
+    let stream = await navigator.mediaDevices.getUserMedia({video: true});
+    let originalVideoTrack = stream.getVideoTracks()[0];
+
+    await originalVideoTrack.applyConstraints(constraints);
+
+    let appliedConstraints = originalVideoTrack.getConstraints();
+
+    let clonedVideoTrack = originalVideoTrack.clone();
+    let appliedClonedConstraints = clonedVideoTrack.getConstraints();
+    assert_true('advanced' in appliedClonedConstraints);
+    assert_equals(appliedClonedConstraints.advanced.length, 1);
+    const appliedClonedAdvancedConstraints = appliedClonedConstraints.advanced[0];
+
+    // Check that |appliedClonedAdvancedConstraints| and |appliedAdvancedConstraints| are equal.
+    const appliedAdvancedConstraints = appliedConstraints.advanced[0];
+    assert_equals(appliedAdvancedConstraints.length, appliedClonedAdvancedConstraints.length);
+    Object.keys(appliedClonedAdvancedConstraints).forEach((key, value) => {
+      assert_not_equals(appliedAdvancedConstraints[key], undefined, 'key ' + key);
+      if (key != 'pointsOfInterest') {
+        assert_equals(appliedAdvancedConstraints[key], appliedClonedAdvancedConstraints[key], key);
+      } else {
+        assert_point2d_array_approx_equals(appliedAdvancedConstraints[key],
+                                           appliedClonedAdvancedConstraints[key], 0.01);
+      }
+    });
+
+    assert_equals(appliedAdvancedConstraints.whiteBalanceMode,
+                  appliedClonedAdvancedConstraints.whiteBalanceMode,
+                  'whiteBalanceMode');
+    assert_equals(appliedAdvancedConstraints.exposureMode,
+                  appliedClonedAdvancedConstraints.exposureMode,
+                  'exposureMode');
+    assert_equals(appliedAdvancedConstraints.focusMode,
+                  appliedClonedAdvancedConstraints.focusMode,
+                  'focusMode');
+
+    assert_point2d_array_approx_equals(
+        appliedAdvancedConstraints.pointsOfInterest,
+        appliedClonedAdvancedConstraints.pointsOfInterest,
+        0.01);
+
+    assert_equals(appliedAdvancedConstraints.exposureCompensation,
+                  appliedClonedAdvancedConstraints.exposureCompensation,
+                  'exposureCompensation');
+    assert_equals(appliedAdvancedConstraints.exposureTime,
+                  appliedClonedAdvancedConstraints.exposureTime,
+                  'exposureTime');
+    assert_equals(appliedAdvancedConstraints.colorTemperature,
+                  appliedClonedAdvancedConstraints.colorTemperature,
+                  'colorTemperature');
+    assert_equals(appliedAdvancedConstraints.iso,
+                  appliedClonedAdvancedConstraints.iso,
+                  'iso');
+    assert_equals(appliedAdvancedConstraints.brightness,
+                  appliedClonedAdvancedConstraints.brightness,
+                  'brightness');
+    assert_equals(appliedAdvancedConstraints.contrast,
+                  appliedClonedAdvancedConstraints.contrast,
+                  'constrast');
+    assert_equals(appliedAdvancedConstraints.saturation,
+                  appliedClonedAdvancedConstraints.saturation,
+                  'saturation');
+    assert_equals(appliedAdvancedConstraints.sharpness,
+                  appliedClonedAdvancedConstraints.sharpness,
+                  'sharpness');
+    assert_equals(appliedAdvancedConstraints.focusDistance,
+                  appliedClonedAdvancedConstraints.focusDistance,
+                  'focusDistance');
+
+    assert_equals(appliedAdvancedConstraints.pan,
+                  appliedClonedAdvancedConstraints.pan,
+                  'pan');
+    assert_equals(appliedAdvancedConstraints.tilt,
+                  appliedClonedAdvancedConstraints.tilt,
+                  'tilt');
+    assert_equals(appliedAdvancedConstraints.zoom,
+                  appliedClonedAdvancedConstraints.zoom,
+                  'zoom');
+
+    assert_equals(appliedAdvancedConstraints.torch,
+                  appliedClonedAdvancedConstraints.torch,
+                  'torch');
+}, 'checks MediaStreamTrack.clone() gets same applied constraints');
+
+// This test verifies that MediaStreamTrack ImageCapture settings are copied
+// when cloning a MediaStreamTrack.
+image_capture_test(async (t, imageCaptureTest) => {
+  await test_driver.set_permission({name: 'camera', panTiltZoom: true},
+        'granted', false);
+
+  let stream = await navigator.mediaDevices.getUserMedia({video: true});
+  let originalVideoTrack = stream.getVideoTracks()[0];
+  let clonedVideoTrack = originalVideoTrack.clone();
+
+  let settings = originalVideoTrack.getSettings();
+  let clonedSettings = clonedVideoTrack.getSettings();
+
+  assert_equals(settings.whiteBalanceMode,
+                clonedSettings.whiteBalanceMode,
+                'whiteBalanceMode');
+  assert_equals(settings.exposureMode,
+                clonedSettings.exposureMode,
+                'exposureMode;');
+  assert_equals(settings.focusMode,
+                clonedSettings.focusMode,
+                'focusMode');
+
+  assert_point2d_array_approx_equals(
+      settings.pointsOfInterest,
+      clonedSettings.pointsOfInterest,
+      0.01);
+
+  assert_equals(settings.exposureCompensation,
+                clonedSettings.exposureCompensation,
+                'exposureCompensation');
+  assert_equals(settings.exposureTime,
+                clonedSettings.exposureTime,
+                'exposureTime');
+  assert_equals(settings.colorTemperature,
+                clonedSettings.colorTemperature,
+                'colorTemperature');
+  assert_equals(settings.iso,
+                clonedSettings.iso,
+                'iso');
+
+  assert_equals(settings.brightness,
+                clonedSettings.brightness,
+                'brightness');
+  assert_equals(settings.contrast,
+                clonedSettings.contrast,
+                'contrast');
+  assert_equals(settings.saturation,
+                clonedSettings.saturation,
+                'saturation');
+  assert_equals(settings.sharpness,
+                clonedSettings.sharpness,
+                'sharpness');
+
+  assert_equals(settings.focusDistance,
+                clonedSettings.focusDistance,
+                'focusDistance');
+
+  assert_equals(settings.pan,
+                clonedSettings.pan,
+                'pan');
+  assert_equals(settings.tilt,
+                clonedSettings.tilt,
+                'tilt');
+  assert_equals(settings.zoom,
+                clonedSettings.zoom,
+                'zoom');
+
+  assert_equals(settings.torch,
+                clonedSettings.torch,
+                'torch');
+}, 'checks MediaStreamTrack.clone() gets same settings');
+
+// This test verifies that MediaStreamTrack ImageCapture capabilities are copied
+// when cloning a MediaStreamTrack.
+image_capture_test(async (t, imageCaptureTest) => {
+  await test_driver.set_permission({name: 'camera', panTiltZoom: true},
+      'granted', false);
+
+  let stream = await navigator.mediaDevices.getUserMedia({video: true});
+  let originalVideoTrack = stream.getVideoTracks()[0];
+  let clonedVideoTrack = originalVideoTrack.clone();
+
+  let capabilities = originalVideoTrack.getCapabilities();
+  let clonedCapabilities = clonedVideoTrack.getCapabilities();
+
+  assert_equals(capabilities.whiteBalanceMode.length,
+                clonedCapabilities.whiteBalanceMode.length,
+                'whiteBalanceMode length');
+  for (i = 0; i < capabilities.whiteBalanceMode.length; ++i) {
+    assert_equals(capabilities.whiteBalanceMode[i],
+                  clonedCapabilities.whiteBalanceMode[i],
+                  'whiteBalanceMode');
+  }
+
+  assert_equals(capabilities.exposureMode.length,
+                clonedCapabilities.exposureMode.length,
+                'exposureMode length');
+  for (i = 0; i < capabilities.exposureMode.length; ++i) {
+    assert_equals(capabilities.exposureMode[i],
+                  clonedCapabilities.exposureMode[i],
+                  'exposureMode');
+  }
+
+  assert_equals(capabilities.focusMode.length,
+                clonedCapabilities.focusMode.length,
+                'focusMode length');
+  for (i = 0; i < capabilities.focusMode.length; ++i) {
+    assert_equals(capabilities.focusMode[i],
+                  clonedCapabilities.focusMode[i],
+                  'focusMode');
+  }
+
+  assert_equals(capabilities.exposureCompensation.max,
+                clonedCapabilities.exposureCompensation.max,
+                'exposureCompensation max');
+  assert_equals(capabilities.exposureCompensation.min,
+                clonedCapabilities.exposureCompensation.min,
+                'exposureCompensation min');
+  assert_equals(capabilities.exposureCompensation.step,
+                clonedCapabilities.exposureCompensation.step,
+                'exposureCompensation step');
+
+  assert_equals(capabilities.exposureTime.max,
+                clonedCapabilities.exposureTime.max,
+                'exposureTime max');
+  assert_equals(capabilities.exposureTime.min,
+                clonedCapabilities.exposureTime.min,
+                'exposureTime min');
+  assert_equals(capabilities.exposureTime.step,
+                clonedCapabilities.exposureTime.step,
+                'exposureTime step');
+
+  assert_equals(capabilities.colorTemperature.max,
+                clonedCapabilities.colorTemperature.max,
+                'colorTemperature max');
+  assert_equals(capabilities.colorTemperature.min,
+                clonedCapabilities.colorTemperature.min,
+                'colorTemperature min');
+  assert_equals(capabilities.colorTemperature.step,
+                clonedCapabilities.colorTemperature.step,
+                'colorTemperature step');
+
+  assert_equals(capabilities.iso.max,
+                clonedCapabilities.iso.max,
+                'iso max');
+  assert_equals(capabilities.iso.min,
+                clonedCapabilities.iso.min,
+                'iso min');
+  assert_equals(capabilities.iso.step,
+                clonedCapabilities.iso.step,
+                'iso step');
+
+  assert_equals(capabilities.brightness.max,
+                clonedCapabilities.brightness.max,
+                'brightness max');
+  assert_equals(capabilities.brightness.min,
+                clonedCapabilities.brightness.min,
+                'brightness min');
+  assert_equals(capabilities.brightness.step,
+                clonedCapabilities.brightness.step,
+                'brightness step');
+
+  assert_equals(capabilities.contrast.max,
+                clonedCapabilities.contrast.max,
+                'contrast max');
+  assert_equals(capabilities.contrast.min,
+                clonedCapabilities.contrast.min,
+                'contrast min');
+  assert_equals(capabilities.contrast.step,
+                clonedCapabilities.contrast.step,
+                'contrast step');
+
+  assert_equals(capabilities.saturation.max,
+                clonedCapabilities.saturation.max,
+                'saturation max');
+  assert_equals(capabilities.saturation.min,
+                clonedCapabilities.saturation.min,
+                'saturation min');
+  assert_equals(capabilities.saturation.step,
+                clonedCapabilities.saturation.step,
+                'saturation step');
+
+  assert_equals(capabilities.sharpness.max,
+                clonedCapabilities.sharpness.max,
+                'sharpness max');
+  assert_equals(capabilities.sharpness.min,
+                clonedCapabilities.sharpness.min,
+                'sharpness min');
+  assert_equals(capabilities.sharpness.step,
+                clonedCapabilities.sharpness.step,
+                'sharpness step');
+
+  assert_equals(capabilities.focusDistance.max,
+                clonedCapabilities.focusDistance.max,
+                'focusDistance max');
+  assert_equals(capabilities.focusDistance.min,
+                clonedCapabilities.focusDistance.min,
+                'focusDistance min');
+  assert_equals(capabilities.focusDistance.step,
+                clonedCapabilities.focusDistance.step,
+                'focusDistance step');
+
+  assert_equals(capabilities.pan.max,
+                clonedCapabilities.pan.max,
+                'pan max');
+  assert_equals(capabilities.pan.min,
+                clonedCapabilities.pan.min,
+                'pan min');
+  assert_equals(capabilities.pan.step,
+                clonedCapabilities.pan.step,
+                'pan step');
+
+  assert_equals(capabilities.tilt.max,
+                clonedCapabilities.tilt.max,
+                'tilt max');
+  assert_equals(capabilities.tilt.min,
+                clonedCapabilities.tilt.min,
+                'tilt min');
+  assert_equals(capabilities.tilt.step,
+                clonedCapabilities.tilt.step,
+                'tilt step');
+
+  assert_equals(capabilities.zoom.max,
+                clonedCapabilities.zoom.max,
+                'zoom max');
+  assert_equals(capabilities.zoom.min,
+                clonedCapabilities.zoom.min,
+                'zoom min');
+  assert_equals(capabilities.zoom.step,
+                clonedCapabilities.zoom.step,
+                'zoom step');
+
+  assert_equals(capabilities.torch,
+                clonedCapabilities.torch,
+                'torch');
+}, 'checks MediaStreamTrack.clone() gets same capabilities');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-no-sink.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-no-sink.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-no-sink.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-no-sink.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<!doctype html>
-<html>
-
-<head>
-  <title>MediaRecorder peer connection</title>
-  <link rel="help"
-        href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="utils/peerconnection.js"></script>
-</head>
-
-<body>
-  <script>
-
-[{name: "audio",        kind: {audio: true, video: false}},
- {name: "video",        kind: {audio: false, video: true}},
- {name: "audio/video",  kind: {audio: true, video: true}}].forEach(args => {
-  promise_test(async t => {
-    const [localPc, remotePc, stream] = await startConnection(
-        t, args.kind.audio, args.kind.video);
-    const recorder = new MediaRecorder(stream);
-    // Set an arbitrary timeslice interval so the ondataavailable event
-    // handler gets invoked repeatedly. Without it, the test would
-    // deadlock as it's currently written.
-    recorder.start(100);
-    let combinedSize = 0;
-    const dataPromise = new Promise(r => recorder.ondataavailable = e => {
-      // Wait for an arbitrary amount of data to appear before we resolve.
-      combinedSize += e.data.size;
-      if (combinedSize > 4711) r();
-    });
-    await dataPromise;
-    recorder.stop();
-  }, "PeerConnection MediaRecorder records " + args.name +
-     " from PeerConnection without sinks");
- });
-
-  </script>
-</body>
-
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,57 +15,67 @@
   <video id="remote" autoplay width="240" />
   <script>
 
-[{ name: "video", kind: { video: true, audio: false }, mimeType: "" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "video/webm;codecs=vp8" },
- { name: "video", kind: { video: true, audio: false }, mimeType: "video/webm;codecs=vp8" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "video/webm;codecs=vp8" },
- { name: "audio", kind: { video: false, audio: true }, mimeType: "video/webm;codecs=vp9" },
- { name: "video", kind: { video: true, audio: false }, mimeType: "video/webm;codecs=vp9" },
- { name: "audio/video", kind: { video: true, audio: true }, mimeType: "video/webm;codecs=vp9" }]
-  .forEach(args => {
-    const formatString = JSON.stringify(args.kind) +
-        " with format " + (args.mimeType ? args.mimeType : "[passthrough]") + ".";
+promise_setup(async () => {
+  const t = {add_cleanup: add_completion_callback};
+  const [, pc, stream] = await startConnection(t, true, true);
+  const [audio] = stream.getAudioTracks();
+  const [video] = stream.getVideoTracks();
+
+  // Needed for the tests to get exercised in Chrome (bug)
+  document.getElementById('remote').srcObject = stream;
+
+  for (const {kinds, mimeType} of [
+   { kinds: { video }, mimeType: "" },
+   { kinds: { audio }, mimeType: "" },
+   { kinds: { video, audio }, mimeType: "" },
+   { kinds: { audio }, mimeType: "audio/webm;codecs=opus" },
+   { kinds: { video }, mimeType: "video/webm;codecs=vp8" },
+   { kinds: { video, audio }, mimeType: "video/webm;codecs=vp8,opus" },
+   { kinds: { video }, mimeType: "video/webm;codecs=vp9" },
+   { kinds: { video, audio }, mimeType: "video/webm;codecs=vp9,opus" }
+  ]) {
+    const tag = `${JSON.stringify(kinds)} mimeType "${mimeType}"`;
+    const stream = new MediaStream([kinds.audio, kinds.video].filter(n => n));
+
+    // Spec doesn't mandate codecs, so if not supported, test failure instead.
+    if (mimeType && !MediaRecorder.isTypeSupported(mimeType)) {
+      promise_test(async t => {
+        assert_throws_dom('NotSupportedError',
+                          () => new MediaRecorder(stream, { mimeType }));
+      }, `MediaRecorder constructor throws on no support, ${tag}`);
+      continue;
+    }
+
     promise_test(async t => {
-      const [localPc, remotePc, stream] = await startConnection(
-          t, args.kind.audio, args.kind.video);
-      const recorder = new MediaRecorder(stream, { mimeType: args.mimeType });
+      const recorder = new MediaRecorder(stream, { mimeType });
+      recorder.start(200);
+      await new Promise(r => recorder.onstart = r);
       let combinedSize = 0;
-      const dataPromise = new Promise(r => {
-        recorder.onstart = () => {
-          recorder.ondataavailable = e => {
-            // Wait for an arbitrary amount of data to appear before we resolve.
-            combinedSize += e.data.size;
-            if (combinedSize > 4711) r();
-          }
-        }
-      });
-      recorder.start(100);
-      await dataPromise;
+      // Wait for a small amount of data to appear. Kept small for mobile tests
+      while (combinedSize < 2000) {
+        const {data} = await new Promise(r => recorder.ondataavailable = r);
+        combinedSize += data.size;
+      }
       recorder.stop();
-    }, "PeerConnection MediaRecorder receives data after onstart, " +
-          formatString);
+    }, `PeerConnection MediaRecorder receives data after onstart, ${tag}`);
 
     promise_test(async t => {
-      const [localPc, remotePc, stream] = await startConnection(
-          t, args.kind.audio, args.kind.video);
-      const recorder = new MediaRecorder(stream, { mimeType: args.mimeType });
-      const stopPromise = new Promise(r => recorder.onstop = r);
-      const dataPromise = new Promise(r => recorder.ondataavailable = r);
+      const clone = stream.clone();
+      const recorder = new MediaRecorder(clone, { mimeType });
       recorder.start();
-      await waitForReceivedFrames(
-        t, remotePc, args.kind.audio, args.kind.video, 10);
-      for (transceiver of remotePc.getTransceivers())
-        transceiver.receiver.track.stop();
-      // As the tracks ended, we'd like to see data from the recorder.
-      // For details:
-      // https://www.w3.org/TR/mediastream-recording/#mediarecorder-methods.
-      await dataPromise;
-      await stopPromise;
-    }, "PeerConnection MediaRecorder gets ondata on stopping recorded " +
-            "tracks " + formatString);
-  });
+      await new Promise(r => recorder.onstart = r);
+      await waitForReceivedFramesOrPackets(t, pc, kinds.audio, kinds.video, 10);
+      for (const track of clone.getTracks()) {
+        track.stop();
+      }
+      // As the tracks ended, expect data from the recorder.
+      await Promise.all([
+        new Promise(r => recorder.onstop = r),
+        new Promise(r => recorder.ondataavailable = r)
+      ]);
+    }, `PeerConnection MediaRecorder gets ondata on stopping tracks, ${tag}`);
+  }
+});
 
   </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+<meta name="timeout" content="long">
+
+<head>
+  <title>MediaRecorder peer connection</title>
+  <link rel="help"
+        href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="utils/peerconnection.js"></script>
+</head>
+
+<body>
+  <script>
+
+promise_setup(async () => {
+  const t = {add_cleanup: add_completion_callback};
+  const [, pc, stream] = await startConnection(t, true, true);
+  const [audio] = stream.getAudioTracks();
+  const [video] = stream.getVideoTracks();
+
+  for (const kinds of [{ audio }, { video }, { audio, video }]) {
+    const tag = `${JSON.stringify(kinds)}`;
+    const stream = new MediaStream([kinds.audio, kinds.video].filter(n => n));
+
+    promise_test(async t => {
+      const recorder = new MediaRecorder(stream);
+      recorder.start(200);
+      let combinedSize = 0;
+      // Wait for a small amount of data to appear. Kept small for mobile tests
+      while (combinedSize < 2000) {
+        const {data} = await new Promise(r => recorder.ondataavailable = r);
+        combinedSize += data.size;
+      }
+      recorder.stop();
+    }, `MediaRecorder records from PeerConnection without sinks, ${tag}`);
+  }
+});
+
+  </script>
+</body>
+
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/passthrough/MediaRecorder-passthrough.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -22,6 +22,10 @@
     promise_test(async t => {
       const [localPc, remotePc, stream] = await startConnection(
           t, args.audio, /*video=*/true, args.codecPreference);
+
+      // Needed for the tests to get exercised in Chrome (bug)
+      document.getElementById('remote').srcObject = stream;
+
       const recorder = new MediaRecorder(stream);  // Passthrough.
       const onstartPromise = new Promise(resolve => {
         recorder.onstart = t.step_func(() => {
@@ -42,16 +46,22 @@
 promise_test(async t => {
   const [localPc, remotePc, stream, transceivers] = await startConnection(
       t, /*audio=*/false, /*video=*/true, /*videoCodecPreference=*/"VP8");
+
+  // Needed for the tests to get exercised in Chrome (bug)
+  document.getElementById('remote').srcObject = stream;
+
   const recorder = new MediaRecorder(stream);  // Possibly passthrough.
   recorder.start();
-  await waitForReceivedFrames(t, remotePc, false, true, 10);
+  await waitForReceivedFramesOrPackets(t, remotePc, false, true, 10);
 
   // Switch codec to VP9; we expect onerror to not be invoked.
   recorder.onerror = t.step_func(() => assert_unreached(
       "MediaRecorder should be prepared to handle codec switches"));
   setTransceiverCodecPreference(transceivers.video, "VP9");
-  exchangeOfferAnswer(localPc, remotePc);
-  await waitForReceivedCodec(t, remotePc, "VP9");
+  await Promise.all([
+    exchangeOfferAnswer(localPc, remotePc),
+    waitForReceivedCodec(t, remotePc, "VP9")
+  ]);
 }, "PeerConnection passthrough MediaRecorder should be prepared to handle " +
         "the codec switching from VP8 to VP9");
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/utils/peerconnection.js firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/utils/peerconnection.js
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-record/utils/peerconnection.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-record/utils/peerconnection.js	2021-01-18 19:58:24.000000000 +0000
@@ -26,7 +26,7 @@
  * @param {string} codecPreference The codec preference.
  */
 function setTransceiverCodecPreference(transceiver, codecPreference) {
-  for (let codec of RTCRtpSender.getCapabilities('video').codecs) {
+  for (const codec of RTCRtpSender.getCapabilities('video').codecs) {
     if (codec.mimeType.includes(codecPreference)) {
       transceiver.setCodecPreferences([codec]);
       return;
@@ -38,55 +38,37 @@
  * Starts a connection between two peer connections, using a audio and/or video
  * stream.
  * @param {*} t Test instance.
- * @param {boolean} useAudio True if audio should be used.
- * @param {boolean} useVideo True if video should be used.
+ * @param {boolean} audio True if audio should be used.
+ * @param {boolean} video True if video should be used.
  * @param {string} [videoCodecPreference] String containing the codec preference.
  * @returns an array with the two connected peer connections, the remote stream,
- * and the list of transceivers.
+ * and an object containing transceivers by kind.
  */
-async function startConnection(t, useAudio, useVideo, videoCodecPreference) {
-  const stream = await navigator.mediaDevices.getUserMedia({
-    audio: useAudio, video: useVideo
-  });
+async function startConnection(t, audio, video, videoCodecPreference) {
+  const stream = await navigator.mediaDevices.getUserMedia({audio, video});
   t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
   const pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
-  let transceivers = {};
-  stream.getTracks().forEach(track => {
-    const transceiver = pc1.addTransceiver(track);
+  const transceivers = {};
+  for (const track of stream.getTracks()) {
+    const transceiver = pc1.addTransceiver(track, {streams: [stream]});
     transceivers[track.kind] = transceiver;
     if (videoCodecPreference && track.kind == 'video') {
       setTransceiverCodecPreference(transceiver, videoCodecPreference);
     }
-  });
-  function doExchange(localPc, remotePc) {
-    localPc.addEventListener('icecandidate', event => {
-      const { candidate } = event;
-      if (candidate && remotePc.signalingState !== 'closed') {
-        remotePc.addIceCandidate(candidate);
-      }
+  }
+  for (const [local, remote] of [[pc1, pc2], [pc2, pc1]]) {
+    local.addEventListener('icecandidate', ({candidate}) => {
+      if (!candidate || remote.signalingState == 'closed') return;
+      remote.addIceCandidate(candidate);
     });
   }
-  doExchange(pc1, pc2);
-  doExchange(pc2, pc1);
-  exchangeOfferAnswer(pc1, pc2);
-  const remoteStream = await new Promise(resolve => {
-    let tracks = [];
-    pc2.ontrack = e => {
-      tracks.push(e.track)
-      if (tracks.length < useAudio + useVideo) return;
-      const stream = new MediaStream(tracks);
-      // The srcObject sink is needed for the tests to get exercised in Chrome.
-      const remoteVideo = document.getElementById('remote');
-      if (remoteVideo) {
-        remoteVideo.srcObject = stream;
-      }
-      resolve(stream)
-    }
-  });
-  return [pc1, pc2, remoteStream, transceivers]
+  const haveTrackEvent = new Promise(r => pc2.ontrack = r);
+  await exchangeOfferAnswer(pc1, pc2);
+  const {streams} = await haveTrackEvent;
+  return [pc1, pc2, streams[0], transceivers];
 }
 
 /**
@@ -99,17 +81,17 @@
  * @param {int} numFramesOrPackets Number of frames (video) and packets (audio)
  * to wait for.
  */
-async function waitForReceivedFrames(
+async function waitForReceivedFramesOrPackets(
     t, pc, lookForAudio, lookForVideo, numFramesOrPackets) {
   let initialAudioPackets = 0;
   let initialVideoFrames = 0;
   while (lookForAudio || lookForVideo) {
     const report = await pc.getStats();
-    report.forEach(stats => {
-      if (stats.type && stats.type == 'inbound-rtp') {
+    for (const stats of report.values()) {
+      if (stats.type == 'inbound-rtp') {
         if (lookForAudio && stats.kind == 'audio') {
           if (!initialAudioPackets) {
-            initialAudioPackets = stats.packetsReceived
+            initialAudioPackets = stats.packetsReceived;
           } else if (stats.packetsReceived > initialAudioPackets +
                      numFramesOrPackets) {
             lookForAudio = false;
@@ -124,8 +106,8 @@
           }
         }
       }
-    });
-    await new Promise(r => { t.step_timeout(r, 100); });
+    }
+    await new Promise(r => t.step_timeout(r, 100));
   }
 }
 
@@ -140,17 +122,16 @@
   let currentCodecId;
   for (;;) {
     const report = await pc.getStats();
-    report.forEach(stats => {
-      if (stats.id) {
-        if (stats.type == 'inbound-rtp' && stats.kind == 'video') {
-          currentCodecId = stats.codecId;
-        } else if (currentCodecId && stats.id == currentCodecId &&
-                   stats.mimeType.toLowerCase().includes(
-                      codecToLookFor.toLowerCase())) {
-          return;
+    for (const stats of report.values()) {
+      if (stats.type == 'inbound-rtp' && stats.kind == 'video') {
+        if (stats.codecId) {
+          if (report.get(stats.codecId).mimeType.toLowerCase()
+              .includes(codecToLookFor.toLowerCase())) {
+            return;
+          }
         }
       }
-    });
-    await new Promise(r => { t.step_timeout(r, 100); });
+    }
+    await new Promise(r => t.step_timeout(r, 100));
   }
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-deny.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-deny.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-deny.https.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-deny.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -3,8 +3,7 @@
 <head>
   <title>getUserMedia() triggers error callback when auth is denied</title>
   <link rel="author" title="Dr. A. Gouaillard" href="mailto:agouaillard@gmail.com"/>
-  <link rel="help" href="http://w3c.github.io/mediacapture-main/getusermedia.html#methods-5">
-  <link rel="help" href="http://w3c.github.io/mediacapture-main/getusermedia.html#navigatorusermediaerrorcallback">
+  <link rel="help" href="https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia">
 </head>
 <body>
   <p class="instructions">When prompted, <strong>please deny</strong> access to
@@ -16,18 +15,17 @@
   <script src=/resources/testharness.js></script>
   <script src=/resources/testharnessreport.js></script>
   <script>
-    var t = async_test("Tests that the error callback is triggered when permission is denied");
-    t.step(function() {
-      navigator.mediaDevices.getUserMedia({video: true})
-        .then(t.step_func(function (stream) {
-          assert_unreached("The success callback should not be triggered since access is to be denied");
-          t.done();
-        }), t.step_func(function (error) {
-          assert_equals(error.name, "NotAllowedError", "NotAllowedError returned as expected");
-          assert_equals(error.constraintName, undefined, "constraintName attribute not set as expected");
-          t.done();
-        }))
-    });
+promise_test(async () => {
+  try {
+    await navigator.mediaDevices.getUserMedia({video: true})
+  } catch (error) {
+    assert_throws_dom("NotAllowedError", () => { throw error });
+    assert_false('constraintName' in error,
+                 "constraintName attribute not set as expected");
+    return;
+  };
+  assert_unreached("The success callback should not be triggered since access is to be denied");
+}, "Tests that the error callback is triggered when permission is denied");
   </script>
 </body>
 </html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-empty-option-param.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-empty-option-param.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-empty-option-param.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-empty-option-param.https.html	2021-01-18 19:58:23.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 <title>getUserMedia({}) rejects with TypeError</title>
 <link rel="author" title="Dominique Hazael-Massieux" href="mailto:dom@w3.org"/>
-<link rel="help" href="http://dev.w3.org/2011/webrtc/editor/getusermedia.html#widl-NavigatorUserMedia-getUserMedia-void-MediaStreamConstraints-constraints-NavigatorUserMediaSuccessCallback-successCallback-NavigatorUserMediaErrorCallback-errorCallback">
+<link rel="help" href="https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia">
 </head>
 <body>
 <h1 class="instructions">Description</h1>
@@ -14,18 +14,20 @@
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script>
-var t = async_test("Tests that getUserMedia is rejected with a TypeError when used with an empty options parameter");
-t.step( function () {
-  navigator.mediaDevices.getUserMedia({})
-    .then(t.step_func(function () {
-      assert_unreached("This should never be triggered since the constraints parameter is empty");
-    }), t.step_func(function (error) {
-      assert_equals(error.name, "TypeError", "TypeError returned as expected");
-      assert_equals(error.constraintName, undefined, "constraintName attribute not set as expected");
-      t.done();
-    }));
-  t.done();
-});
+promise_test(async () => {
+  try {
+    // Race a settled promise to check that the returned promise is already
+    // rejected.
+    await Promise.race([navigator.mediaDevices.getUserMedia({}),
+                       Promise.resolve()]);
+  } catch (error) {
+    assert_throws_js(TypeError, () => { throw error });
+    assert_false('constraintName' in error,
+                 "constraintName attribute not set as expected");
+    return;
+  }
+  assert_unreached("should have returned an already-rejected promise.");
+}, "Tests that getUserMedia is rejected with a TypeError when used with an empty options parameter");
 
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/GUM-unknownkey-option-param.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -24,7 +24,6 @@
       assert_equals(error.constraintName, undefined, "constraintName attribute not set as expected");
       t.done();
     }));
-  t.done();
 });
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/idlharness.https.window.js firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/idlharness.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/idlharness.https.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/idlharness.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -8,7 +8,7 @@
 
 idl_test(
   ['mediacapture-streams'],
-  ['dom', 'html'],
+  ['WebIDL', 'dom', 'html'],
   async idl_array => {
     const inputDevices = [];
     const outputDevices = [];
@@ -44,6 +44,7 @@
       MediaDeviceInfo: outputDevices,
       MediaStreamTrack: ['track'],
       MediaStreamTrackEvent: ['trackEvent'],
+      OverconstrainedError: ['new OverconstrainedError("constraint")'],
     });
   }
 );
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/MediaDevices-after-discard.https.html firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/MediaDevices-after-discard.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/mediacapture-streams/MediaDevices-after-discard.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/mediacapture-streams/MediaDevices-after-discard.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,59 @@
+<!doctype html>
+<title>Test promises from MediaDevices methods in a discarded browsing
+  context</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<body></body>
+<script>
+let devices;
+let child_DOMException;
+setup(() => {
+  const frame = document.createElement('iframe');
+  document.body.appendChild(frame);
+  devices = frame.contentWindow.navigator.mediaDevices;
+  child_DOMException = frame.contentWindow.DOMException;
+  frame.remove();
+});
+
+// https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia
+// If the current settings object's responsible document is NOT fully active,
+// return a promise rejected with a DOMException object whose name attribute
+// has the value "InvalidStateError".
+promise_test(async () => {
+  // `catch()` is used rather than static Promise methods because microtasks
+  // for `PromiseResolve()` do not run when Promises in inactive Documents are
+  // involved.  Whether microtasks for `catch()` run depends on the realm of
+  // the handler rather than the realm of the Promise.
+  // See https://github.com/whatwg/html/issues/5319.
+  let promise_already_rejected = false;
+  let rejected_reason;
+  devices.getUserMedia({audio:true}).catch(reason => {
+    promise_already_rejected = true;
+    rejected_reason = reason;
+  });
+  // Race a settled promise to check that the returned promise is already
+  // rejected.
+  await Promise.reject().catch(() => {
+    assert_true(promise_already_rejected,
+                'should have returned an already-rejected promise.');
+    assert_throws_dom('InvalidStateError', child_DOMException,
+                      () => { throw rejected_reason });
+  });
+}, 'getUserMedia() in a discarded browsing context');
+
+// https://w3c.github.io/mediacapture-main/#dom-mediadevices-enumeratedevices
+// https://html.spec.whatwg.org/multipage/webappapis.html#event-loop-for-spec-authors
+// Promise resolution occurs only in parallel steps, so, if there is any
+// manipulation of the Promise, it would occur through a queued task.
+promise_test(() => {
+  let promise_is_pending = true;
+  // Don't use `finally()`, because it uses `PromiseResolve()` and so
+  // microtasks don't run.
+  devices.enumerateDevices().then(() => promise_is_pending = false,
+                                  () => promise_is_pending = false);
+  return Promise.resolve().then(() => {
+    assert_true(promise_is_pending,
+                'should have returned a pending promise.');
+  });
+}, 'enumerateDevices() in a discarded browsing context');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/merchant-validation/constructor.tentative.http.html firefox-85.0+build1/testing/web-platform/tests/merchant-validation/constructor.tentative.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/merchant-validation/constructor.tentative.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/merchant-validation/constructor.tentative.http.html	2021-01-18 19:58:23.000000000 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test for MerchantValidationEvent Constructor (insecure)</title>
+<link rel="help" href="https://w3c.github.io/browser-payment-api/#merchantvalidationevent-interface">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(() => {
+  assert_false("MerchantValidationEvent" in Window);
+}, "MerchantValidationEvent constructor must not be exposed in insecure context");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/merchant-validation/constructortentative..http.html firefox-85.0+build1/testing/web-platform/tests/merchant-validation/constructortentative..http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/merchant-validation/constructortentative..http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/merchant-validation/constructortentative..http.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test for MerchantValidationEvent Constructor (insecure)</title>
-<link rel="help" href="https://w3c.github.io/browser-payment-api/#merchantvalidationevent-interface">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-test(() => {
-  assert_false("MerchantValidationEvent" in Window);
-}, "MerchantValidationEvent constructor must not be exposed in insecure context");
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js firefox-85.0+build1/testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/native-file-system/showPicker-errors.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -80,9 +80,39 @@
       showPickerMethod +
           ': MIME type can\'t have invalid characters in subtype.');
 
-  promise_test(async t => {
-    await promise_rejects_js(t, TypeError, self[showPickerMethod]({
-                               types: [{accept: {'text/plain': ['.txt', 'txt']}}]
-                             }));
-  }, showPickerMethod + ': extension has to start with ".".');
+  const invalid_extensions = {
+    '.extensiontoolong': 'extension length more than 16.',
+    '.txt.': 'extenstion ends with "."',
+    'txt': 'extenstion does not start with "."',
+    '.$txt' : 'illegal character "$"',
+    '.t<xt': 'illegal character "<"',
+    '.t/xt': 'illegal character "\"',
+    '.\txt': 'illegal character "/"',
+    '.txt\\': 'illegal characters "\\"',
+    '.txt?': 'illegal character "?"',
+    '.txt*': 'illegal character "*"',
+    '.{txt': 'illegal character "{"',
+    '.}txt': 'illegal character "}"',
+    ' .txt': 'illegal whitespace at front of extension',
+    '. txt': 'illegal whitespace in extension',
+    '.txt ': 'illegal whitespace at end of extension',
+    '.\u202etxt\u202e' : 'illegal RTL character',
+    '.t\u00E6xt': 'non-ASCII character "æ"',
+    '.קו�': 'non-ASCII character "קו�"',
+    '.txt🙂': 'non-ASCII character "🙂"',
+    '.{txt}': 'illegal characters "{" and "}"',
+  }
+
+  for (const [extension, description] of Object.entries(invalid_extensions)) {
+    define_file_picker_extension_error_test(showPickerMethod, extension, description)
+  }
 }
+
+function define_file_picker_extension_error_test(showPickerMethod, extension, description) {
+  promise_test(async t => {
+    await promise_rejects_js(
+      t, TypeError,
+      self[showPickerMethod](
+        { types: [{ accept: { 'text/plain': ['.txt', extension] } }] }));
+  }, showPickerMethod + ': invalid extension "' + extension + '". ' + description + ".");
+}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_auxclick_is_a_pointerevent.html	2021-01-18 19:58:24.000000000 +0000
@@ -10,17 +10,47 @@
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let auxclickTest = async_test("auxclick is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let target = document.getElementById("target");
+let pointerId = 0;
+let pointerType = "";
 
-  target.addEventListener("auxclick", auxclickTest.step_func((e)=>{
+target.addEventListener("pointerdown", (e)=>{
+  pointerId = e.pointerId;
+  pointerType = e.pointerType;
+});
+
+function testFunction(test){
+  return test.step_func(e=>{
+    assert_equals(e.constructor, window.PointerEvent, "auxclick should use a PointerEvent constructor");
     assert_true(e instanceof PointerEvent, "auxclick should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(auxclickTest, target, ["auxclick"]);
-  let actions = new test_driver.Actions();
-  actions = actions.pointerMove(0,0, {origin:target})
-    .pointerDown({button:actions.ButtonType.MIDDLE})
-    .pointerUp({button:actions.ButtonType.MIDDLE});
-  Promise.all([eventWatcher.wait_for("auxclick"), actions.send()]).then(()=>auxclickTest.done());
+    assert_equals(e.pointerId, pointerId, "auxclick's pointerId should match the pointerId of the pointer event that triggers it");
+    assert_equals(e.pointerType, pointerType, "axclick's pointerType should match the pointerType of the pointer event that triggers it");
+  });
+}
+
+function run_test(pointerType){
+  promise_test((test) => new Promise((resolve, reject) => {
+    const testPointer = "TestPointer";
+    let auxclickFunc = testFunction(test);
+    test.add_cleanup(() => {
+      target.removeEventListener("auxclick", auxclickFunc);
+      pointerId = 0;
+      pointerType = "";
+    });
+    target.addEventListener("auxclick", auxclickFunc);
+    let eventWatcher = new EventWatcher(test, target, ["auxclick"]);
+    let actions = new test_driver.Actions();
+    actions = actions
+      .addPointer(testPointer, pointerType)
+      .pointerMove(0,0, {origin:target, sourceName:testPointer})
+      .pointerDown({button:actions.ButtonType.MIDDLE, sourceName:testPointer})
+      .pointerUp({button:actions.ButtonType.MIDDLE, sourceName:testPointer});
+    Promise.all([eventWatcher.wait_for("auxclick"), actions.send()]).then(()=>resolve());
+  }), "auxclick using " + pointerType + " is a PointerEvent");
+}
+
+run_test("mouse");
+run_test("pen");
+// TODO(crbug.com/1150441): Add test for auxclick from touch.Note: Calling run_test("touch") here times out.
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,225 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Set/Release capture</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="/resources/testdriver.js"></script>
+        <script src="/resources/testdriver-actions.js"></script>
+        <script src="/resources/testdriver-vendor.js"></script>
+        <!-- Additional helper script for common checks across event types -->
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+    </head>
+    <body>
+        <h1>Pointer Events capture test</h1>
+        <h4>
+            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the following actions:
+            <ol>
+                <li> Put your mouse over the black rectangle. pointerover and pointerenter should be logged inside of it.</li>
+                <li> Move your mouse out of the black rectangle. pointerout and pointerleave should be logged inside of it</li>
+                <li> Put your mouse over the purple rectangle. pointerover and pointerenter should be logged inside of it.</li>
+                <li> Move your mouse out of the purple rectangle. pointerout and pointerleave should be logged inside of it</li>
+                <li> Press and hold left mouse button over "Set Capture" button and move mouse a litte inside the button. "gotpointercapture", "pointerover", and "pointerenter" should be logged in the black rectangle</li>
+                <li> Put your mouse over the purple rectangle and then move it out. Nothing should happen</li>
+                <li> Put your mouse over the black rectangle and then move it out. Nothing should happen.</li>
+                <li> Put your mouse over the purple rectangle and then release left mouse button. "lostpointercapture" should be logged in the black rectangle. Move your mouse in the purple rectangle a little. "pointerout" and "pointerleave" should be logged in the black rectangle. Also "pointerover" and "pointerenter" should be logged in the purple rectangle"</li>
+            </ol>
+        </h4>
+        Test passes if the proper behaviour of the events is observed.
+        <div id="target0"></div>
+        <br>
+        <div id="target1"></div>
+        <br>
+        <input type="button" id="btnCapture" value="Set Capture">
+        <script type='text/javascript'>
+            var isPointerCapture = false;
+            var isRelatedTargetValueTested = false;
+            var isTargetAuthenticityTested = false;
+            var lostPointerCaptureReceived = false;
+            var count = 0;
+            var event_log = [];
+
+            var detected_pointertypes = {};
+            add_completion_callback(end_of_test);
+            function end_of_test() {
+                showLoggedEvents();
+                showPointerTypes();
+            }
+
+            var target0 = document.getElementById('target0');
+            var target1 = document.getElementById('target1');
+            var captureButton = document.getElementById('btnCapture');
+
+            var test_gotpointercapture = async_test("gotpointercapture event received");
+            var test_lostpointercapture = async_test("lostpointercapture event received");
+
+            var test_pointerover_no_capture = async_test("pointerover event without capture received");
+
+            var test_pointerover_capture = async_test("pointerover event with capture received");
+
+            var test_pointerout_no_capture = async_test("pointerout event without capture received");
+            var test_pointerout_after_capture = async_test("pointerout event after lostpointercapture received");
+
+            var test_pointerenter_no_capture = async_test("pointerenter event without capture received");
+            var test_pointerenter_capture = async_test("pointerenter event with capture received");
+
+            var test_pointerleave_no_capture = async_test("pointerleave event without capture received");
+            var test_pointerleave_after_capture = async_test("pointerleave event after lostpointercapture received");
+
+            var actions_promise;
+
+            window.onload = function() {
+                on_event(captureButton, 'pointerdown', function(e) {
+                    if(isPointerCapture == false) {
+                        sPointerCapture(e);
+                        isPointerCapture = true;
+                    }
+                });
+
+                on_event(target0, 'gotpointercapture', function(e) {
+                    test_gotpointercapture.done();
+                    event_log.push('gotpointercapture@target0');
+                });
+
+                on_event(target0, 'lostpointercapture', function(e) {
+                    isPointerCapture = false;
+                    lostPointerCaptureReceived = true;
+                    test_lostpointercapture.done();
+                    event_log.push('lostpointercapture@target0');
+                });
+
+                run();
+            }
+
+            function run() {
+                on_event(target0, "pointerover", function (event) {
+                    detected_pointertypes[ event.pointerType ] = true;
+                    event_log.push('pointerover@target0');
+                    if(isPointerCapture) {
+                        test_pointerover_capture.done();
+                        if (!isRelatedTargetValueTested) {
+                            test(function() {
+                                assert_not_equals(event.relatedTarget, null, "relatedTarget should behave the same as when the capture is not set")
+                            }, "relatedTarget is not null for boundary events even when the capture is set.");
+                            isRelatedTargetValueTested = true;
+                        }
+                        var hitTest = document.elementFromPoint(event.clientX, event.clientY);
+                        if(event.target !== hitTest && !isTargetAuthenticityTested) {
+                            test(function () {
+                                assert_not_equals(event.target, hitTest, "pointerover should be fired on capture target even if the pointer it not over the capture target");
+                            }, "pointerover should trigger the black rectangle even when pointer is not over black rectangle.");
+                            isTargetAuthenticityTested = true;
+                        }
+                    }
+                    else {
+                        test_pointerover_no_capture.done();
+                    }
+                });
+
+                on_event(target0, "pointerout", function (event) {
+                    event_log.push('pointerout@target0');
+                    if(isPointerCapture) {
+                        test(function() {
+                            assert_unreached("pointerout shouldn't be sent to captured node as all the events are targeted at the capturing node");
+                        }, "pointerout shouldn't be sent to captured node as all the events are targeted at the capturing node.");
+                    }
+                    else {
+                        if (lostPointerCaptureReceived) {
+                            test_pointerout_after_capture.done();
+                        } else {
+                            test_pointerout_no_capture.done();
+                        }
+                    }
+                });
+
+                on_event(target0, "pointerenter", function (event) {
+                    event_log.push('pointerenter@target0');
+                    if(isPointerCapture) {
+                        test_pointerenter_capture.done();
+                    }
+                    else {
+                        test_pointerenter_no_capture.done();
+                    }
+                });
+
+                on_event(target0, "pointerleave", function (event) {
+                    event_log.push('pointerleave@target0');
+                    if(isPointerCapture) {
+                        test(function() {
+                            assert_unreached("pointerleave shouldn't be sent to captured node as all the events are targeted at the capturing node");
+                        }, "pointerleave shouldn't be sent to captured node as all the events are targeted at the capturing node.");
+                    }
+                    else {
+                        if (lostPointerCaptureReceived) {
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerleave_after_capture.done();
+                            });
+                        } else {
+                            test_pointerleave_no_capture.done();
+                        }
+                    }
+                });
+
+                // fail if capture is set but event is received for the non-captured target
+                on_event(target1, "pointerover", function (event) {
+                    event_log.push('pointerover@target1');
+                    if(isPointerCapture == true) {
+                        test(function() {
+                            assert_unreached("pointerover shouldn't trigger for this target when capture is enabled");
+                        }, "pointerover shouldn't trigger for the purple rectangle while the black rectangle has capture");
+                    }
+                });
+
+                on_event(target1, "pointerout", function (event) {
+                    event_log.push('pointerout@target1');
+                    if(isPointerCapture == true) {
+                        test(function() {
+                            assert_unreached("pointerout shouldn't trigger for this target when capture is enabled");
+                        }, "pointerout shouldn't trigger for the purple rectangle while the black rectangle has capture");
+                    }
+                });
+
+                on_event(target1, "pointerenter", function (event) {
+                    event_log.push('pointerenter@target1');
+                    if(isPointerCapture == true) {
+                        test(function() {
+                            assert_unreached("pointerenter shouldn't trigger for this target when capture is enabled");
+                        }, "pointerenter shouldn't trigger for the purple rectangle while the black rectangle has capture");
+                    }
+                });
+
+                on_event(target1, "pointerleave", function (event) {
+                    event_log.push('pointerleave@target1');
+                    if(isPointerCapture == true) {
+                        test(function() {
+                            assert_unreached("pointerleave shouldn't trigger for this target when capture is enabled");
+                        }, "pointerleave shouldn't trigger for the purple rectangle while the black rectangle has capture");
+                    }
+                });
+
+                actions_promise = new test_driver.Actions()
+                    .pointerMove(0, 0, {origin: target0})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerMove(0, 0, {origin: btnCapture})
+                    .pointerDown()
+                    .pointerMove(0, 0, {origin: btnCapture})
+                    .pointerMove(10, 0, {origin: btnCapture})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerMove(0, 0, {origin: target0})
+                    .pointerMove(0, 0, {origin: target1})
+                    .pointerUp()
+                    .pointerMove(0, 0, {origin: target1})
+                    .send();
+            }
+        </script>
+        <h1>Pointer Events Capture Test</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>The following events were logged: <span id="event-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Set/Release capture</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-    </head>
-    <body>
-        <h1>Pointer Events capture test</h1>
-        <h4>
-            Test Description: This test checks if setCapture/releaseCapture functions works properly. Complete the following actions:
-            <ol>
-                <li> Put your mouse over the black rectangle. pointerover and pointerenter should be logged inside of it.</li>
-                <li> Move your mouse out of the black rectangle. pointerout and pointerleave should be logged inside of it</li>
-                <li> Put your mouse over the purple rectangle. pointerover and pointerenter should be logged inside of it.</li>
-                <li> Move your mouse out of the purple rectangle. pointerout and pointerleave should be logged inside of it</li>
-                <li> Press and hold left mouse button over "Set Capture" button and move mouse a litte inside the button. "gotpointercapture", "pointerover", and "pointerenter" should be logged in the black rectangle</li>
-                <li> Put your mouse over the purple rectangle and then move it out. Nothing should happen</li>
-                <li> Put your mouse over the black rectangle and then move it out. Nothing should happen.</li>
-                <li> Put your mouse over the purple rectangle and then release left mouse button. "lostpointercapture" should be logged in the black rectangle. Move your mouse in the purple rectangle a little. "pointerout" and "pointerleave" should be logged in the black rectangle. Also "pointerover" and "pointerenter" should be logged in the purple rectangle"</li>
-            </ol>
-        </h4>
-        Test passes if the proper behaviour of the events is observed.
-        <div id="target0"></div>
-        <br>
-        <div id="target1"></div>
-        <br>
-        <input type="button" id="btnCapture" value="Set Capture">
-        <script type='text/javascript'>
-            var isPointerCapture = false;
-            var isRelatedTargetValueTested = false;
-            var isTargetAuthenticityTested = false;
-            var lostPointerCaptureReceived = false;
-            var count = 0;
-            var event_log = [];
-
-            var detected_pointertypes = {};
-            add_completion_callback(end_of_test);
-            function end_of_test() {
-                showLoggedEvents();
-                showPointerTypes();
-            }
-
-            var target0 = document.getElementById('target0');
-            var target1 = document.getElementById('target1');
-            var captureButton = document.getElementById('btnCapture');
-
-            var test_gotpointercapture = async_test("gotpointercapture event received");
-            var test_lostpointercapture = async_test("lostpointercapture event received");
-
-            var test_pointerover_no_capture = async_test("pointerover event without capture received");
-            var test_pointerover_capture = async_test("pointerover event with capture received");
-
-            var test_pointerout_no_capture = async_test("pointerout event without capture received");
-            var test_pointerout_after_capture = async_test("pointerout event after lostpointercapture received");
-
-            var test_pointerenter_no_capture = async_test("pointerenter event without capture received");
-            var test_pointerenter_capture = async_test("pointerenter event with capture received");
-
-            var test_pointerleave_no_capture = async_test("pointerleave event without capture received");
-            var test_pointerleave_after_capture = async_test("pointerleave event after lostpointercapture received");
-
-            window.onload = function() {
-                on_event(captureButton, 'pointerdown', function(e) {
-                    if(isPointerCapture == false) {
-                        sPointerCapture(e);
-                        isPointerCapture = true;
-                    }
-                });
-
-                on_event(target0, 'gotpointercapture', function(e) {
-                    test_gotpointercapture.done();
-                    event_log.push('gotpointercapture@target0');
-                });
-
-                on_event(target0, 'lostpointercapture', function(e) {
-                    isPointerCapture = false;
-                    lostPointerCaptureReceived = true;
-                    test_lostpointercapture.done();
-                    event_log.push('lostpointercapture@target0');
-                });
-
-                run();
-            }
-
-            function run() {
-                on_event(target0, "pointerover", function (event) {
-                    detected_pointertypes[ event.pointerType ] = true;
-                    event_log.push('pointerover@target0');
-                    if(isPointerCapture) {
-                        test_pointerover_capture.done();
-                        if (!isRelatedTargetValueTested) {
-                            test(function() {
-                                assert_not_equals(event.relatedTarget, null, "relatedTarget should behave the same as when the capture is not set")
-                            }, "relatedTarget is not null for boundary events even when the capture is set.");
-                            isRelatedTargetValueTested = true;
-                        }
-                        var hitTest = document.elementFromPoint(event.clientX, event.clientY);
-                        if(event.target !== hitTest && !isTargetAuthenticityTested) {
-                            test(function () {
-                                assert_not_equals(event.target, hitTest, "pointerover should be fired on capture target even if the pointer it not over the capture target");
-                            }, "pointerover should trigger the black rectangle even when pointer is not over black rectangle.");
-                            isTargetAuthenticityTested = true;
-                        }
-                    }
-                    else {
-                        test_pointerover_no_capture.done();
-                    }
-                });
-
-                on_event(target0, "pointerout", function (event) {
-                    event_log.push('pointerout@target0');
-                    if(isPointerCapture) {
-                        test(function() {
-                            assert_unreached("pointerout shouldn't be sent to captured node as all the events are targeted at the capturing node");
-                        }, "pointerout shouldn't be sent to captured node as all the events are targeted at the capturing node.");
-                    }
-                    else {
-                        if (lostPointerCaptureReceived) {
-                            test_pointerout_after_capture.done();
-                        } else {
-                            test_pointerout_no_capture.done();
-                        }
-                    }
-                });
-
-                on_event(target0, "pointerenter", function (event) {
-                    event_log.push('pointerenter@target0');
-                    if(isPointerCapture) {
-                        test_pointerenter_capture.done();
-                    }
-                    else {
-                        test_pointerenter_no_capture.done();
-                    }
-                });
-
-                on_event(target0, "pointerleave", function (event) {
-                    event_log.push('pointerleave@target0');
-                    if(isPointerCapture) {
-                        test(function() {
-                            assert_unreached("pointerleave shouldn't be sent to captured node as all the events are targeted at the capturing node");
-                        }, "pointerleave shouldn't be sent to captured node as all the events are targeted at the capturing node.");
-                    }
-                    else {
-                        if (lostPointerCaptureReceived) {
-                            test_pointerleave_after_capture.done();
-                        } else {
-                            test_pointerleave_no_capture.done();
-                        }
-                    }
-                });
-
-                // fail if capture is set but event is received for the non-captured target
-                on_event(target1, "pointerover", function (event) {
-                    event_log.push('pointerover@target1');
-                    if(isPointerCapture == true) {
-                        test(function() {
-                            assert_unreached("pointerover shouldn't trigger for this target when capture is enabled");
-                        }, "pointerover shouldn't trigger for the purple rectangle while the black rectangle has capture");
-                    }
-                });
-
-                on_event(target1, "pointerout", function (event) {
-                    event_log.push('pointerout@target1');
-                    if(isPointerCapture == true) {
-                        test(function() {
-                            assert_unreached("pointerout shouldn't trigger for this target when capture is enabled");
-                        }, "pointerout shouldn't trigger for the purple rectangle while the black rectangle has capture");
-                    }
-                });
-
-                on_event(target1, "pointerenter", function (event) {
-                    event_log.push('pointerenter@target1');
-                    if(isPointerCapture == true) {
-                        test(function() {
-                            assert_unreached("pointerenter shouldn't trigger for this target when capture is enabled");
-                        }, "pointerenter shouldn't trigger for the purple rectangle while the black rectangle has capture");
-                    }
-                });
-
-                on_event(target1, "pointerleave", function (event) {
-                    event_log.push('pointerleave@target1');
-                    if(isPointerCapture == true) {
-                        test(function() {
-                            assert_unreached("pointerleave shouldn't trigger for this target when capture is enabled");
-                        }, "pointerleave shouldn't trigger for the purple rectangle while the black rectangle has capture");
-                    }
-                });
-            }
-        </script>
-        <h1>Pointer Events Capture Test</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>The following events were logged: <span id="event-log"></span>.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_click_is_a_pointerevent.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_click_is_a_pointerevent.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_click_is_a_pointerevent.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_click_is_a_pointerevent.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,18 +4,53 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let clickTest = async_test("click is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let target = document.getElementById("target");
+let pointerId = 0;
+let pointerType = "";
 
-  target.addEventListener("click", clickTest.step_func((e)=>{
+target.addEventListener("pointerdown", (e)=>{
+  pointerId = e.pointerId;
+  pointerType = e.pointerType;
+});
+
+function testFunction(test){
+  return test.step_func(e=>{
+    assert_equals(e.constructor, window.PointerEvent, "click should use a PointerEvent constructor");
     assert_true(e instanceof PointerEvent, "click should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(clickTest, target, ["click"]);
-  Promise.all([eventWatcher.wait_for("click"), test_driver.click(target)]).then(()=>clickTest.done());
+    assert_equals(e.pointerId, pointerId, "click's pointerId should match the pointerId of the pointer event that triggers it");
+    assert_equals(e.pointerType, pointerType, "click's pointerType should match the pointerType of the pointer event that triggers it");
+  });
+}
+
+function run_test(pointerType){
+  promise_test((test) => new Promise((resolve, reject) => {
+    const testPointer = "TestPointer";
+    let clickFunc = testFunction(test);
+    test.add_cleanup(() => {
+      target.removeEventListener("click", clickFunc);
+      pointerId = 0;
+      pointerType = "";
+    });
+    target.addEventListener("click", clickFunc);
+    let eventWatcher = new EventWatcher(test, target, ["click"]);
+    let actions = new test_driver.Actions();
+    actions = actions
+      .addPointer(testPointer, pointerType)
+      .pointerMove(0,0, {origin:target, sourceName:testPointer})
+      .pointerDown({sourceName:testPointer})
+      .pointerUp({sourceName:testPointer});
+    Promise.all([eventWatcher.wait_for("click"), actions.send()]).then(()=>resolve());
+  }), "click using " + pointerType + " is a PointerEvent");
+}
+
+run_test("mouse");
+run_test("pen");
+// TODO(crbug.com/1150593): Add wpt test for touch (reuse run_test)
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_contextmenu_is_a_pointerevent.html	2021-01-18 19:58:24.000000000 +0000
@@ -10,17 +10,20 @@
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let contextmenuTest = async_test("contextmenu is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let contextmenuTest = async_test("contextmenu is a PointerEvent");
+let target = document.getElementById("target");
 
-  target.addEventListener("contextmenu", contextmenuTest.step_func((e)=>{
-    assert_true(e instanceof PointerEvent, "contextmenu should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(contextmenuTest, target, ["contextmenu"]);
-  let actions = new test_driver.Actions();
-  actions = actions.pointerMove(0,0, {origin:target})
-    .pointerDown({button:actions.ButtonType.RIGHT})
-    .pointerUp({button:actions.ButtonType.RIGHT});
-  Promise.all([eventWatcher.wait_for("contextmenu"), actions.send()]).then(()=>contextmenuTest.done());
+target.addEventListener("contextmenu", contextmenuTest.step_func((e)=>{
+  assert_equals(e.constructor, window.PointerEvent, "contextmenu should use a PointerEvent constructor");
+  assert_true(e instanceof PointerEvent, "contextmenu should be a PointerEvent");
+  // TODO(crbug.com/1150441,crbug.com/1150442): Test pointerId, pointerType are properly populated from the pointer event stream
+}));
+
+let eventWatcher = new EventWatcher(contextmenuTest, target, ["contextmenu"]);
+let actions = new test_driver.Actions();
+actions = actions.pointerMove(0,0, {origin:target})
+  .pointerDown({button:actions.ButtonType.RIGHT})
+  .pointerUp({button:actions.ButtonType.RIGHT});
+Promise.all([eventWatcher.wait_for("contextmenu"), actions.send()]).then(()=>contextmenuTest.done());
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,149 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Pointer Events coordinates can have fractional value<</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="/resources/testdriver.js"></script>
+        <script src="/resources/testdriver-actions.js"></script>
+        <script src="/resources/testdriver-vendor.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
+        <style>
+            #innerFrame {
+                transform: scale(5);
+                width: 60px;
+                height: 60px;
+                margin-left: 120px;
+                margin-top: 120px;
+                border: 0.01px solid black;
+            }
+        </style>
+        <script>
+            var eventList = [
+                  "pointerdown",
+                  "pointerup",
+                  "pointermove",
+                  "pointerover",
+                  "pointerout",
+                  "pointerenter",
+                  "pointerleave"];
+            var eventsRecieved = {};
+            var clickedTargetList = [];
+
+            function resetTestState() {
+                eventsRecieved = {};
+                clickedTargetList = [];
+                ['s1', 's2', 's3'].forEach(function(id){
+                    var target = document.getElementById('innerFrame').contentDocument.getElementById(id);
+                    target.style.background = "black"
+                });
+            }
+
+            function checkPointerEventCoordinates(event) {
+              if (event.clientX != Math.floor(event.clientX) || event.clientY != Math.floor(event.clientY))
+                eventsRecieved[event.type] = true;
+            }
+
+            function testInputType(inputSource) {
+              const scale = 5;
+              const width = 3;
+              const height = 3;
+              var targetFrame = document.querySelector('#innerFrame');
+              var frameRect = targetFrame.getBoundingClientRect();
+              frameLeft = frameRect.left;
+              frameTop = frameRect.top;
+
+              target = [{x: 10, y: 10}, {x: 30, y: 50}, {x: 50, y: 30}]
+              xPosition = []
+              yPosition = []
+              for (var i = 0; i < target.length; i++) {
+                xPosition.push((target[i].x + width / 2.0) * scale + frameLeft);
+                yPosition.push((target[i].y + height / 2.0) * scale + frameTop);
+              }
+              return sendInputAt(inputSource, xPosition[0], yPosition[0]).then(function() {
+                return sendInputAt(inputSource, xPosition[1], yPosition[1]);
+              }).then(function() {
+                return sendInputAt(inputSource, xPosition[2], yPosition[2]);
+              });
+
+            }
+
+            function sendInputAt(inputSource, xPosition, yPosition) {
+              if (inputSource == "touch") {
+                return new test_driver.Actions()
+                  .addPointer("touchPointer1", "touch")
+                  .pointerMove(Math.ceil(xPosition), Math.ceil(yPosition))
+                  .pointerDown()
+                  .pointerMove(Math.ceil(xPosition + 1), Math.ceil(yPosition + 1))
+                  .pointerUp()
+                  .send();
+              } else {
+                return new test_driver.Actions()
+                  .pointerMove(Math.ceil(xPosition), Math.ceil(yPosition))
+                  .pointerDown()
+                  .pointerUp()
+                  .send();
+              }
+            }
+
+            function run() {
+                var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", ALL_POINTERS);
+                var innerFrame = document.getElementById('innerFrame');
+                var innerDocument = innerFrame.contentDocument;
+                ['s1', 's2', 's3'].forEach(function(id){
+                    var target = innerDocument.getElementById(id);
+                    eventList.forEach(function(eventName) {
+                        on_event(target, eventName, checkPointerEventCoordinates);
+                    });
+
+                    on_event(target, "click", function (event) {
+                      if (!(event.target.id in clickedTargetList)) {
+                          clickedTargetList.push(event.target.id);
+                          event.target.style.background = "red"
+                      }
+                      if (clickedTargetList.length == 3) {
+                          test(function () {
+                              if (Object.keys(eventsRecieved).length != eventList.length){
+                                  eventList.forEach(function(eventName){
+                                     assert_true(eventName in eventsRecieved, eventName + " should have fractional coordinates");
+                                  });
+                              }
+                          }, expectedPointerType);
+                          test_pointerEvent.done();
+                      }
+                    });
+                });
+
+                testInputType("mouse").then(function() {
+                    return testInputType("touch");
+                }).then(function() {
+                    return testInputType("pen");
+                });
+            }
+        </script>
+    </head>
+    <body onload="run()">
+        <h1>Pointer Events coordinates support fractional value</h1>
+        <h2 id="pointerTypeDescription"></h2>
+        <h4>
+            Test Description: This test checks pointer events has fractional client coordinates
+            <ol>
+                 <li>Move your pointer over one black square</li>
+                 <li>Press down the pointer (i.e. press left button with mouse or touch the screen with finger or pen).</li>
+                 <li>Release the pointer.</li>
+                 <li>Move to next black square and repreat 2 and 3</li>
+            </ol>
+
+            Test passes if pointer events has fractional coordinates.
+        </h4>
+        <iframe id=innerFrame src="resources/pointerevent_fractional_coordinates-iframe.html"></iframe>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+            <p>Refresh the page to run the tests again with a different pointer type.</p>
+        </div>
+        <div id="log"></div>
+    </body>
+</html>
+
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates-manual.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates-manual.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_fractional_coordinates-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>Pointer Events coordinates can have fractional value<</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <script type="text/javascript" src="pointerevent_support.js"></script>
-        <style>
-            #innerFrame {
-                transform: scale(5);
-                width: 60px;
-                height: 60px;
-                margin-left: 120px;
-                margin-top: 120px;
-                border: 0.01px solid black;
-            }
-        </style>
-        <script>
-            var eventList = [
-                  "pointerdown",
-                  "pointerup",
-                  "pointermove",
-                  "pointerover",
-                  "pointerout",
-                  "pointerenter",
-                  "pointerleave"];
-            var eventsRecieved = {};
-            var clickedTargetList = [];
-
-            function resetTestState() {
-                eventsRecieved = {};
-                clickedTargetList = [];
-                ['s1', 's2', 's3'].forEach(function(id){
-                    var target = document.getElementById('innerFrame').contentDocument.getElementById(id);
-                    target.style.background = "black"
-                });
-            }
-
-            function checkPointerEventCoordinates(event) {
-              if (event.clientX != Math.floor(event.clientX) || event.clientY != Math.floor(event.clientY))
-                eventsRecieved[event.type] = true;
-            }
-
-            function run() {
-                var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", ALL_POINTERS);
-                var innerFrame = document.getElementById('innerFrame');
-                var innerDocument = innerFrame.contentDocument;
-                ['s1', 's2', 's3'].forEach(function(id){
-                    var target = innerDocument.getElementById(id);
-                    eventList.forEach(function(eventName) {
-                        on_event(target, eventName, checkPointerEventCoordinates);
-                    });
-
-                    on_event(target, "click", function (event) {
-                      if (!(event.target.id in clickedTargetList)) {
-                          clickedTargetList.push(event.target.id);
-                          event.target.style.background = "red"
-                      }
-                      if (clickedTargetList.length == 3) {
-                          test(function () {
-                              if (Object.keys(eventsRecieved).length != eventList.length){
-                                  eventList.forEach(function(eventName){
-                                     assert_true(eventName in eventsRecieved, eventName + " should have fractional coordinates");
-                                  });
-                              }
-                          }, expectedPointerType);
-                          test_pointerEvent.done();
-                      }
-                    });
-                });
-            }
-        </script>
-    </head>
-    <body onload="run()">
-        <h1>Pointer Events coordinates support fractional value</h1>
-        <h2 id="pointerTypeDescription"></h2>
-        <h4>
-            Test Description: This test checks pointer events has fractional client coordinates
-            <ol>
-                 <li>Move your pointer over one black square</li>
-                 <li>Press down the pointer (i.e. press left button with mouse or touch the screen with finger or pen).</li>
-                 <li>Release the pointer.</li>
-                 <li>Move to next black square and repreat 2 and 3</li>
-            </ol>
-
-            Test passes if pointer events has fractional coordinates.
-        </h4>
-        <iframe id=innerFrame src="resources/pointerevent_fractional_coordinates-iframe.html"></iframe>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-            <p>Refresh the page to run the tests again with a different pointer type.</p>
-        </div>
-        <div id="log"></div>
-    </body>
-</html>
-
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
         <title>touch-action: parent > child: auto > child: none</title>
         <meta name="assert" content="TA15.5 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent, Child: `auto`, Grand-Child: `none`">
         <meta name="viewport" content="width=device-width">
+        <meta name="timeout" content="long">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch.html	2021-01-18 19:58:24.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: parent > child: pan-x > child: pan-x</title>
+        <meta name="timeout" content="long">
         <meta name="assert" content="TA15.6 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent, Child: `pan-x`, Grand-Child: `pan-x`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-inherit_parent-none_touch.html	2021-01-18 19:58:24.000000000 +0000
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>touch-action: inherit from parent: none</title>
+        <meta name="timeout" content="long">
         <meta name="assert" content="TA15.8 - when a user touches an element, the effect of that touch is determined by the value of the touch-action property and the default touch behaviors on the element and its ancestors. Scrollable-Parent: `none` Child: `auto`">
         <meta name="viewport" content="width=device-width">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html
--- firefox-84.0.2+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
         <title>touch-action: pan-right</title>
         <meta name="assert" content="TA15.3 - With `touch-action: pan-right` on a swiped or click/dragged element, only panning on the x-axis right direction should be possible.">
         <meta name="viewport" content="width=device-width">
+        <meta name="timeout" content="long">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/history/resources/portal-harness.js firefox-85.0+build1/testing/web-platform/tests/portals/history/resources/portal-harness.js
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/history/resources/portal-harness.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/history/resources/portal-harness.js	2021-01-18 19:58:24.000000000 +0000
@@ -6,7 +6,7 @@
   let testName = urlParams.get('testName');
   let testFn = window[testName];
   if (!testFn) {
-    window.portalHost.postMessage('Missing test: ' + testName, '*');
+    window.portalHost.postMessage('Missing test: ' + testName);
     return;
   }
 
@@ -17,10 +17,10 @@
 
   try {
     await testFn();
-    window.portalHost.postMessage('Passed', '*');
+    window.portalHost.postMessage('Passed');
   } catch (e) {
     window.portalHost.postMessage(
-        'Failed: ' + e.name + ': ' + e.message, '*');
+        'Failed: ' + e.name + ': ' + e.message);
   }
 };
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-focus.sub.html firefox-85.0+build1/testing/web-platform/tests/portals/portals-focus.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-focus.sub.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/portals-focus.sub.html	2021-01-18 19:58:24.000000000 +0000
@@ -22,7 +22,7 @@
       portal.onmessage = t.step_func(e => {
         assert_unreached("button inside portal should not be focused");
       });
-      portal.postMessage("focus", "*");
+      portal.postMessage("focus");
       await new Promise(r => t.step_timeout(r, 500));
     } finally {
       document.body.removeChild(portal);
@@ -35,7 +35,7 @@
       portal.onmessage = t.step_func(e => {
         assert_unreached("button inside portal should not be focused");
       });
-      portal.postMessage("focus", "*");
+      portal.postMessage("focus");
       await new Promise(r => t.step_timeout(r, 500));
     } finally {
       document.body.removeChild(portal);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-host-post-message.sub.html firefox-85.0+build1/testing/web-platform/tests/portals/portals-host-post-message.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-host-post-message.sub.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/portals-host-post-message.sub.html	2021-01-18 19:58:24.000000000 +0000
@@ -22,7 +22,7 @@
       var waitForResponse = new Promise((resolve, reject) => {
         portal.addEventListener("message", e => { resolve(e); });
       });
-      portal.postMessage(params, "*");
+      portal.postMessage(params);
       return waitForResponse;
     }
 
@@ -31,17 +31,10 @@
 
     promise_test(async () => {
       var {data, origin} = await createPortalAndLoopMessage(sameOriginUrl,
-                                                            ["test", "*"]);
-      assert_equals(data, "test");
-      assert_equals(origin, "http://{{host}}:{{ports[http][0]}}");
-    }, "Message received after postMessage from portal host");
-
-    promise_test(async () => {
-      var {data, origin} = await createPortalAndLoopMessage(sameOriginUrl,
                                                             ["test"]);
       assert_equals(data, "test");
       assert_equals(origin, "http://{{host}}:{{ports[http][0]}}");
-    }, "Message received from same-origin portal host with no target origin specified");
+    }, "Message received after postMessage from portal host");
 
     promise_test(async () => {
       var message = {
@@ -53,7 +46,7 @@
         }
       };
       var {data} = await createPortalAndLoopMessage(sameOriginUrl,
-                                                    [message, "*"]);
+                                                    [message]);
       assert_object_equals(data, message);
     }, "postMessage with object message");
 
@@ -63,7 +56,7 @@
         return new Promise((resolve, reject) => {
           var channel = new MessageChannel();
           channel.port1.onmessage = resolve;
-          port.postMessage("sending port", [channel.port2]);
+          port.postMessage("sending port", {transfer: [channel.port2]});
         });
       }
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-post-message.sub.html firefox-85.0+build1/testing/web-platform/tests/portals/portals-post-message.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/portals-post-message.sub.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/portals-post-message.sub.html	2021-01-18 19:58:24.000000000 +0000
@@ -33,21 +33,21 @@
       });
     }
 
-    function postMessageWithMessagePorts(portal, message, targetOrigin) {
+    function postMessageWithMessagePorts(portal, message) {
       return new Promise((resolve, reject) => {
         var channel = new MessageChannel();
         channel.port1.onmessage = e => {
           channel.port1.close();
           resolve(e.data);
         };
-        portal.postMessage(message, targetOrigin, [channel.port2]);
+        portal.postMessage(message, {transfer: [channel.port2]});
       });
     }
 
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       var message = "test message";
-      var {origin, data, sourceIsPortalHost} = await postMessage(portal, message, "*");
+      var {origin, data, sourceIsPortalHost} = await postMessage(portal, message);
       assert_equals(data, message);
       assert_equals(origin, window.location.origin);
       assert_true(sourceIsPortalHost);
@@ -55,18 +55,6 @@
 
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
-      var message = "test message";
-      var {data} = await postMessage(portal, message);
-      assert_equals(data, message);
-      var {data} = await postMessage(portal, message, "/");
-      assert_equals(data, message);
-      var {data} = await postMessage(portal, message,
-                                     "http://{{host}}:{{ports[http][0]}}");
-      assert_equals(data, message);
-    }, "postMessage received by portal host in same-origin portal for multiple valid target origins");
-
-    promise_test(async () => {
-      var portal = await createAndInsertPortal(sameOriginUrl);
       var message = {
         prop1: "value1",
         prop2: 2.5,
@@ -82,7 +70,7 @@
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       var message = "test message";
-      var {data} = await postMessageWithMessagePorts(portal, message, "*");
+      var {data} = await postMessageWithMessagePorts(portal, message);
       assert_equals(data, message);
     }, "postMessage with message ports and same-origin portal");
 
@@ -95,7 +83,7 @@
       var message = {
         arrayBuffer: arrayBuffer
       };
-      var {data} = await postMessage(portal, message, "*");
+      var {data} = await postMessage(portal, message);
       assert_array_equals([0, 1, 2, 3, 4], int8View);
       assert_array_equals([0, 1, 2, 3, 4], data.array);
     }, "postMessage with array buffer without transfer");
@@ -109,7 +97,7 @@
       var message = {
         arrayBuffer: arrayBuffer
       };
-      var {data} = await postMessage(portal, message, "*", [arrayBuffer]);
+      var {data} = await postMessage(portal, message, {transfer: [arrayBuffer]});
       assert_equals(int8View.length, 0);
       assert_array_equals(data.array, [0, 1, 2, 3, 4]);
     }, "postMessage with transferred array buffer");
@@ -149,7 +137,7 @@
     promise_test(async t => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       return promise_rejects_js(t, TypeError,
-                             postMessage(portal, "test", "*", [null]));
+                             postMessage(portal, "test", {transfer: [null]}));
     }, "postMessage should fail with invalid ports");
 
     async function waitForMessage(channelName) {
@@ -189,7 +177,7 @@
     promise_test(async t => {
       const key = token();
       const portal = await createAndInsertPortal(`${crossOriginUrl}?key=${key}`);
-      portal.postMessage('test message', '*');
+      portal.postMessage('test message');
       t.step_timeout(() => {
         StashUtils.putValue(key, 'passed');
       }, TIMEOUT_DURATION_MS);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/eval-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/eval-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/eval-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/eval-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script>
 let logic = new Function('event', (new URL(location)).searchParams.get('logic'));
-onload = () => window.portalHost.postMessage('ready', '*');
+onload = () => window.portalHost.postMessage('ready');
 onportalactivate = event => {
   Promise.resolve(event)
       .then(logic)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-data-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-data-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-data-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-data-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <script>
 let logic = new Function('event', (new URL(location)).searchParams.get('logic'));
-onload = () => window.portalHost.postMessage('ready', '*');
+onload = () => window.portalHost.postMessage('ready');
 onportalactivate = event => {
   var portal = event.adoptPredecessor();
-  portal.postMessage(logic(event), "*");
+  portal.postMessage(logic(event));
 };
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-event-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-event-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-event-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-event-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -17,5 +17,5 @@
     window.addEventListener("portalactivate", portalActivate);
   }
 
-  window.portalHost.postMessage("loaded", "*");
+  window.portalHost.postMessage("loaded");
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-inside-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-inside-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-activate-inside-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-activate-inside-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,7 +4,7 @@
     var portal = document.createElement("portal");
     portal.src = "simple-portal.html";
     portal.onload = () => {
-      portal.activate().catch(e => window.portalHost.postMessage(e.name, "*"));
+      portal.activate().catch(e => window.portalHost.postMessage(e.name));
     }
     document.body.appendChild(portal);
   </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-close-window.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-close-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-close-window.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-close-window.html	2021-01-18 19:58:24.000000000 +0000
@@ -2,6 +2,6 @@
 <script>
 onload = () => {
   window.close();
-  window.portalHost.postMessage(window.closed, '*');
+  window.portalHost.postMessage(window.closed);
 };
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-hidden-after-activation-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-hidden-after-activation-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-hidden-after-activation-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-hidden-after-activation-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -10,5 +10,5 @@
   bc.postMessage({hasHost: !!window.portalHost });
   bc.close();
 
-  window.portalHost.postMessage("loaded", "*");
+  window.portalHost.postMessage("loaded");
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-after-activate.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-after-activate.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-after-activate.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-after-activate.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <script>
-  window.portalHost.postMessage("loaded", "*");
+  window.portalHost.postMessage("loaded");
 
   var ph = window.portalHost;
 
   window.onportalactivate = e => {
     var exception_name = ""
     try {
-      ph.postMessage("message", "*");
+      ph.postMessage("message");
     }
     catch (error) {
       exception_name = error.name;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,15 +5,15 @@
     channel.port1.onmessage = e => {
       e.ports[0].postMessage("received");
     }
-    window.portalHost.postMessage("sending port", "*", [channel.port2]);
+    window.portalHost.postMessage("sending port", {transfer: [channel.port2]});
   }
 
   function postMessageWithArrayBuffer(array, withTransfer) {
     var arrayBuffer = new Int8Array(array).buffer;
     if (withTransfer) {
-      window.portalHost.postMessage({arrayBuffer}, "*", [arrayBuffer]);
+      window.portalHost.postMessage({arrayBuffer}, {transfer: [arrayBuffer]});
     } else {
-      window.portalHost.postMessage({arrayBuffer}, "*");
+      window.portalHost.postMessage({arrayBuffer});
     }
   }
 
@@ -21,7 +21,7 @@
     try {
       window.portalHost.postMessage(...params);
     } catch (e) {
-      window.portalHost.postMessage({errorType: e.name}, "*");
+      window.portalHost.postMessage({errorType: e.name});
     }
   }
 
@@ -39,10 +39,10 @@
           postMessageWithArrayBuffer(e.data.array, true);
           return;
         case "invalid-message":
-          postMessageAndCatchException(document.body, "*");
+          postMessageAndCatchException(document.body);
           return;
         case "invalid-port":
-          postMessageAndCatchException("", "*", [null]);
+          postMessageAndCatchException("", {transfer: [null]});
           return;
       }
     }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-1.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-1.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-1.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
 <script>
-  window.portalHost.postMessage("loaded", "*");
+  window.portalHost.postMessage("loaded");
   window.location.href = "portal-host-post-message-navigate-2.html"
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-2.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-2.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-2.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-navigate-2.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <script>
-  window.portalHost.postMessage("loaded", "*");
+  window.portalHost.postMessage("loaded");
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-x-origin.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-x-origin.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-x-origin.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-host-post-message-x-origin.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <script>
-  window.portalHost.postMessage('test message', '*');
+  window.portalHost.postMessage('test message');
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-post-message-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-post-message-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portal-post-message-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portal-post-message-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -24,6 +24,6 @@
       return;
     }
 
-    window.portalHost.postMessage(message, "*");
+    window.portalHost.postMessage(message);
   };
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-adopt-predecessor-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-adopt-predecessor-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-adopt-predecessor-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-adopt-predecessor-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -9,7 +9,7 @@
       document.body.appendChild(portal);
 
       if (portal instanceof HTMLPortalElement) {
-        portal.postMessage("adopted", "*");
+        portal.postMessage("adopted");
       }
     }
     if (test == "adopt-twice") {
@@ -20,7 +20,7 @@
         e.adoptPredecessor();
       } catch(e) {
         if (e.name == "InvalidStateError") {
-          portal.postMessage("passed", "*");
+          portal.postMessage("passed");
         }
       }
     }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-nested-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-nested-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-nested-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-nested-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -3,7 +3,7 @@
   <script>
     var portal = document.createElement("portal");
     portal.src = "simple-portal.html";
-    portal.onload = e => window.portalHost.postMessage(e.data, "*");
+    portal.onload = e => window.portalHost.postMessage(e.data);
     document.body.appendChild(portal);
   </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-rendering-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-rendering-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/portals-rendering-portal.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/portals-rendering-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -2,7 +2,7 @@
 <body style="background-color: green">
   <script>
     window.requestAnimationFrame(function(ts) {
-      window.portalHost.postMessage("loaded", "*");
+      window.portalHost.postMessage("loaded");
     });
   </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/postmessage-referrer.sub.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/postmessage-referrer.sub.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/postmessage-referrer.sub.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/postmessage-referrer.sub.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,5 +4,5 @@
     httpReferrer: '{{header_or_default(Referer, no-http-referrer)}}',
     documentReferrer: document.referrer || 'no-document-referrer',
   };
-  window.portalHost.postMessage(message, "*");
+  window.portalHost.postMessage(message);
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/simple-portal-adopts-predecessor.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/simple-portal-adopts-predecessor.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/simple-portal-adopts-predecessor.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/simple-portal-adopts-predecessor.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <body>
   <script>
-    window.portalHost.postMessage("ready", "*");
+    window.portalHost.postMessage("ready");
     onportalactivate = e => document.body.appendChild(e.adoptPredecessor());
   </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/simple-portal.html firefox-85.0+build1/testing/web-platform/tests/portals/resources/simple-portal.html
--- firefox-84.0.2+build1/testing/web-platform/tests/portals/resources/simple-portal.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/portals/resources/simple-portal.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <body>
   <script>
-    window.portalHost.postMessage("ready", "*");
+    window.portalHost.postMessage("ready");
   </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/preload/preload-with-type.html firefox-85.0+build1/testing/web-platform/tests/preload/preload-with-type.html
--- firefox-84.0.2+build1/testing/web-platform/tests/preload/preload-with-type.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/preload/preload-with-type.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>Makes sure that preloaded resources with a type attribute trigger the onload event</title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/preload/resources/preload_helper.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-float.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-float.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-float.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-float.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
 <style>
 body {
   border: solid;
+  margin: 10px 11px 12px 14px;
   float: left;
 }
 span {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE quirks-mode>
+<link rel="help" href="https://quirks.spec.whatwg.org/#the-body-element-fills-the-html-element-quirk"/>
+<link rel="match" href="body-fills-html-quirk-ref2.html" />
+<style>
+  html {
+    width: 200px;
+    height: 200px;
+  }
+  body {
+    border: solid;
+    margin: 10px 11px 12px 14px;
+  }
+  span {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<body>
+  <span></span>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-inline.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-inline.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-inline.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-inline.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
 <style>
 body {
   border: solid;
+  margin: 10px 11px 12px 14px;
   display: inline-block;
 }
 span {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-positioned.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-positioned.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-positioned.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-positioned.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,7 @@
 <style>
 body {
   border: solid;
+  margin: 10px 11px 12px 14px;
   position: absolute;
 }
 span {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref2.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref2.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref2.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body style="margin: 0">
+  <div style="width: 175px; height: 178px; margin: 10px 11px 12px 14px; border: solid; box-sizing: border-box;">
+    <div style="width: 100px; height: 100px; background: green"></div>
+  </div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-ref.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,2 +1,4 @@
 <!DOCTYPE html>
-<div style="width: 100px; height: 100px; border: solid; background: green;"></div>
+<body style="margin: 10px 11px 12px 14px;">
+  <div style="width: 100px; height: 100px; border: solid; background: green;"></div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-vertical.html firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-vertical.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/body-fills-html-quirk-vertical.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE quirks-mode>
+<link rel="help" href="https://quirks.spec.whatwg.org/#the-body-element-fills-the-html-element-quirk"/>
+<link rel="match" href="body-fills-html-quirk-ref2.html" />
+<style>
+  html {
+    width: 200px;
+    height: 200px;
+    writing-mode: vertical-lr;
+  }
+  body {
+    border: solid;
+    margin: 10px 11px 12px 14px;
+  }
+  span {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<body>
+  <span></span>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk.html firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE quirks-mode>
+<link
+  rel="help"
+  href="https://quirks.spec.whatwg.org/#the-html-element-fills-the-viewport-quirk"
+/>
+<link rel="match" href="html-fills-viewport-quirk-ref.html" />
+<style>
+  html {
+    border: solid;
+    margin: 10px 11px 12px 14px;
+  }
+  body {
+    margin: 0;
+  }
+  span {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<body>
+  <span></span>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-ref.html firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-ref.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-ref.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<body style="width: 100vw; height: 100vh; margin: 0; padding: 10px 11px 12px 14px; box-sizing: border-box">
+  <div id="border" style="border: solid; width: 100%; height: 100%; box-sizing: border-box">
+    <div style="width: 100px; height: 100px; background: green"></div>
+  </div>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-vertical.html firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-vertical.html
--- firefox-84.0.2+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-vertical.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/quirks/html-fills-viewport-quirk-vertical.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE quirks-mode>
+<link
+  rel="help"
+  href="https://quirks.spec.whatwg.org/#the-html-element-fills-the-viewport-quirk"
+/>
+<link rel="match" href="html-fills-viewport-quirk-ref.html" />
+<style>
+  html {
+    border: solid;
+    margin: 10px 11px 12px 14px;
+    writing-mode: vertical-lr;
+  }
+  body {
+    margin: 0;
+  }
+  span {
+    display: inline-block;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<body>
+  <span></span>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,26 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
@@ -43,16 +23,6 @@
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "a-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "img-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,66 +16,6 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -93,46 +33,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/always/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/default/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/never/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/origin-when-crossorigin/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "iframe"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/always/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/default/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/never/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-crossorigin/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -26,10 +26,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -41,10 +41,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -56,10 +56,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -71,10 +71,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -86,10 +86,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/always/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "always"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/default/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "default"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/never/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "never"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-crossorigin/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,275 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="no-referrer">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "meta",
+                    "key": "referrerPolicy",
+                    "value": "origin-when-crossorigin"
+                  }
+                ],
+                "sourceContextType": "srcdoc"
+              }
+            ],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/always/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="always">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/default/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="default">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/never/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="never">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "a-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "img-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/sharedworker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "sharedworker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-classic.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/worker-module.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-crossorigin/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec referrer-policy/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta name="referrer" content="origin-when-crossorigin">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,124 +14,124 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -27,10 +27,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -42,10 +42,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -57,10 +57,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
@@ -72,10 +72,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
@@ -87,10 +87,10 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-history-about-srcdoc.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/make-html-script.js"></script>
-<meta name="referrer" content="origin">
+<meta name="referrer" content="no-referrer">
 <div id="log"></div>
 <script>
   let reportedReferrer = () => {
@@ -47,9 +47,9 @@
     // Despite the main document has changed its referrer policy in (2), the
     // reported referrer for the history navigation to about:srcdoc in (4) must
     // match with the one originally reported in (1).
-    assert_equals(await referrer_1, self.origin + '/',
+    assert_equals(await referrer_1, undefined,
                   "First navigation uses correct policy.");
-    assert_equals(await referrer_2, self.origin + '/',
+    assert_equals(await referrer_2, undefined,
                   "History navigation reuses original policy.");
   }, "History navigation reuses original policy.");
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript-child.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,13 +4,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/make-html-script.js"></script>
-<meta name="referrer" content="origin">
+<meta name="referrer" content="unsafe-url">
 <div id="log"></div>
 <script>
 [
   {
     srcDocPolicy: ``,
-    expected: self.origin + "/"
+    expected: location.origin + "/custom"
   },
   {
     srcDocPolicy: `<meta name="referrer" content="no-referrer">`,
@@ -45,7 +45,8 @@
 [
   {
     srcDocPolicy: ``,
-    expected: self.origin + "/"
+    expected: undefined  // Because the URL of <iframe src="javascript:..."> is about:blank,
+                         // the referrer should be no referrer.
   },
   {
     srcDocPolicy: `<meta name="referrer" content="no-referrer">`,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-javascript.html	2021-01-18 19:58:24.000000000 +0000
@@ -4,7 +4,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/make-html-script.js"></script>
-<meta name="referrer" content="origin">
+<meta name="referrer" content="unsafe-url">
 <div id="log"></div>
 <script>
 
@@ -26,7 +26,7 @@
     // Document's origin == location.orgin. Furthermore, since the iframe
     // inherits its parent's referrer policy, the URL should be restricted to
     // its origin.
-    expected: self.origin + "/"
+    expected: self.origin + "/custom"
   }
 ].forEach(({ fetchReferrer, expected }) => {
   promise_test(t => {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,9 +16,13 @@
     <script>
       promise_test(() => {
         var urlPath = '/common/security-features/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImage(url, null, 'no-referrer')
+        // The default referrer policy is strict-origin-when-cross-origin.
+        // This document's headers contain the 'origin' and 'no-referrer' tokens,
+        // and we're making a same-origin image load, so, if the image request,
+        // uses the default policy (which is what this test's verifying), we
+        // should see the full initiating URL in the referrer, rather than just
+        // the origin or an empty string.
+        return requestViaImage(urlPath, null, 'no-referrer')
           .then(function(message) {
               assert_equals(message.referrer, document.location.href);
             });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html	2021-01-18 19:58:24.000000000 +0000
@@ -17,9 +17,7 @@
     <script>
       promise_test(function() {
         var urlPath = '/common/security-features/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImage(url, null, 'always')
+        return requestViaImage(urlPath, null, 'always')
           .then(function(message) {
             assert_equals(message.referrer, document.location.href);
           });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/spec.src.json firefox-85.0+build1/testing/web-platform/tests/referrer-policy/spec.src.json
--- firefox-84.0.2+build1/testing/web-platform/tests/referrer-policy/spec.src.json	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/referrer-policy/spec.src.json	2021-01-18 19:58:24.000000000 +0000
@@ -5,25 +5,46 @@
     {
       // unset-referrer-policy
       "title": "Referrer Policy is not explicitly defined",
-      "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.",
+      "description": "Check that referrer URL follows the strict-origin-when-cross-origin policy when no explicit Referrer Policy is set.",
       "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies",
       "test_expansion": [
         {
-          // insecure-protocol
+          // same-insecure
           "expansion": "default",
           "source_scheme": "http",
           "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
-          "origin": [
-            "same-http",
-            "cross-http"
-          ],
+          "origin": "same-http",
           "subresource": "*",
           "expectation": "stripped-referrer"
         },
         {
+          // same-insecure
+          "expansion": "override",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": null,
+          "redirection": "swap-origin",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-insecure
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": null,
+          "redirection": "*",
+          "origin": "cross-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
           // upgrade-protocol
           "expansion": "default",
           "source_scheme": "http",
@@ -36,7 +57,7 @@
             "cross-https"
           ],
           "subresource": "*",
-          "expectation": "stripped-referrer"
+          "expectation": "origin"
         },
         {
           // downgrade-protocol
@@ -54,19 +75,150 @@
           "expectation": "omitted"
         },
         {
-          // secure-protocol
+          // same-secure
           "expansion": "default",
           "source_scheme": "https",
           "source_context_list": "*",
           "delivery_type": "*",
           "delivery_value": null,
           "redirection": "*",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "stripped-referrer"
+        },
+        {
+          // same-secure
+          "expansion": "override",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": null,
+          "redirection": "swap-origin",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-secure
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "*",
+          "delivery_value": null,
+          "redirection": "*",
+          "origin": "cross-https",
+          "subresource": "*",
+          "expectation": "origin"
+        }
+      ]
+    },
+    {
+      // meta tag default
+      "title": "<meta rel=referrer> is set to the legacy keyword 'default'",
+      "description": "Check that the 'default' legacy keyword results in behavior equivalent to the default policy (currently strict-origin-when-cross-origin)",
+      "specification_url": "https://html.spec.whatwg.org/multipage/semantics.html#the-meta-element",
+      "test_expansion": [
+        {
+          // same-insecure
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "stripped-referrer"
+        },
+        {
+          // same-insecure
+          "expansion": "override",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "swap-origin",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-insecure
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
+          "origin": "cross-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // upgrade-protocol
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
           "origin": [
             "same-https",
             "cross-https"
           ],
           "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // downgrade-protocol
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
+          "origin": [
+            "same-http",
+            "cross-http"
+          ],
+          "subresource": "*",
+          "expectation": "omitted"
+        },
+        {
+          // same-secure
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
+          "origin": "same-https",
+          "subresource": "*",
           "expectation": "stripped-referrer"
+        },
+        {
+          // same-secure
+          "expansion": "override",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "swap-origin",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-secure
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "default",
+          "redirection": "*",
+          "origin": "cross-https",
+          "subresource": "*",
+          "expectation": "origin"
         }
       ]
     },
@@ -91,6 +243,26 @@
       ]
     },
     {
+      // meta tag never
+      "title": "<meta rel=referrer> is set to the legacy value 'never'",
+      "description": "Check that the legacy <meta> value 'never' is equivalent to the 'no-referrer' policy",
+      "specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer",
+      "test_expansion": [
+        {
+          // generic
+          "expansion": "default",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "never",
+          "redirection": "*",
+          "origin": "*",
+          "subresource": "*",
+          "expectation": "omitted"
+        }
+      ]
+    },
+    {
       // no-referrer-when-downgrade
       "title": "Referrer Policy is set to 'no-referrer-when-downgrade'",
       "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.",
@@ -327,6 +499,92 @@
       ]
     },
     {
+      // meta tag origin-when-crossorigin
+      "title": "<meta rel=referrer> is set to the legacy value 'origin-when-crossorigin'",
+      "description": "Check that the legacy <meta> value 'origin-when-crossorigin' is equivalent to the 'origin-when-cross-origin' policy",
+      "specification_url": "https://html.spec.whatwg.org/multipage/semantics.html#the-meta-element",
+      "test_expansion": [
+        {
+          // same-origin-insecure
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "*",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "stripped-referrer"
+        },
+        {
+          // same-origin-secure-default
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "*",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "stripped-referrer"
+        },
+        {
+          // same-origin-upgrade
+          "expansion": "default",
+          "source_scheme": "http",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "*",
+          "origin": "same-https",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // same-origin-downgrade
+          "expansion": "default",
+          "source_scheme": "https",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "*",
+          "origin": "same-http",
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // same-origin-insecure
+          "expansion": "override",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "swap-origin",
+          "origin": [
+            "same-http",
+            "same-https"
+          ],
+          "subresource": "*",
+          "expectation": "origin"
+        },
+        {
+          // cross-origin
+          "expansion": "default",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "origin-when-crossorigin",
+          "redirection": "*",
+          "origin": [
+            "cross-http",
+            "cross-https"
+          ],
+          "subresource": "*",
+          "expectation": "origin"
+        }
+      ]
+    },
+    {
       // strict-origin
       "title": "Referrer Policy is set to 'strict-origin'",
       "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.",
@@ -523,6 +781,26 @@
           "expectation": "stripped-referrer"
         }
       ]
+    },
+    {
+      // meta tag always
+      "title": "<meta rel=referrer> is set to the legacy value 'always'",
+      "description": "Check that the legacy <meta> value 'always' is equivalent to the 'unsafe-url' policy",
+      "specification_url": "https://html.spec.whatwg.org/multipage/semantics.html#the-meta-element",
+      "test_expansion": [
+        {
+          // generic
+          "expansion": "default",
+          "source_scheme": "*",
+          "source_context_list": "*",
+          "delivery_type": "meta",
+          "delivery_value": "always",
+          "redirection": "*",
+          "origin": "*",
+          "subresource": "*",
+          "expectation": "stripped-referrer"
+        }
+      ]
     }
   ],
   "delivery_key": "referrerPolicy",
@@ -833,7 +1111,11 @@
       "origin-when-cross-origin",
       "strict-origin",
       "strict-origin-when-cross-origin",
-      "unsafe-url"
+      "unsafe-url",
+      "default",
+      "always",
+      "never",
+      "origin-when-crossorigin"
     ],
     "expectation": [
       "omitted",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/requestidlecallback/callback-idle-periods.html firefox-85.0+build1/testing/web-platform/tests/requestidlecallback/callback-idle-periods.html
--- firefox-84.0.2+build1/testing/web-platform/tests/requestidlecallback/callback-idle-periods.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/requestidlecallback/callback-idle-periods.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>window.requestIdleCallback callback behavior during idle periods.</title>
+<meta name="timeout" content="long">
 <link rel="author" title="Ross McIlroy" href="mailto:rmcilroy@chromium.org" />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/requestidlecallback/callback-invoked.html firefox-85.0+build1/testing/web-platform/tests/requestidlecallback/callback-invoked.html
--- firefox-84.0.2+build1/testing/web-platform/tests/requestidlecallback/callback-invoked.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/requestidlecallback/callback-invoked.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!doctype html>
 <meta charset=utf-8>
+<meta name="timeout" content="long">
 <title>requestIdleCallback callback must be called eventually</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/resources/chromium/nfc-mock.js firefox-85.0+build1/testing/web-platform/tests/resources/chromium/nfc-mock.js
--- firefox-84.0.2+build1/testing/web-platform/tests/resources/chromium/nfc-mock.js	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/resources/chromium/nfc-mock.js	2021-01-18 19:58:24.000000000 +0000
@@ -214,23 +214,11 @@
       return createNDEFError(null);
     }
 
-    async cancelWatch(id) {
+    cancelWatch(id) {
       let index = this.watchers_.findIndex(value => value.id === id);
-      if (index === -1) {
-        return createNDEFError(device.mojom.NDEFErrorType.NOT_FOUND);
+      if (index !== -1) {
+        this.watchers_.splice(index, 1);
       }
-
-      this.watchers_.splice(index, 1);
-      return createNDEFError(null);
-    }
-
-    async cancelAllWatches() {
-      if (this.watchers_.length === 0) {
-        return createNDEFError(device.mojom.NDEFErrorType.NOT_FOUND);
-      }
-
-      this.watchers_.splice(0, this.watchers_.length);
-      return createNDEFError(null);
     }
 
     getHWError() {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/resource-timing/SyntheticResponse.py firefox-85.0+build1/testing/web-platform/tests/resource-timing/SyntheticResponse.py
--- firefox-84.0.2+build1/testing/web-platform/tests/resource-timing/SyntheticResponse.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/resource-timing/SyntheticResponse.py	2021-01-18 19:58:24.000000000 +0000
@@ -2,7 +2,8 @@
 
 from wptserve.utils import isomorphic_decode, isomorphic_encode
 
-import sleep
+import importlib
+sleep = importlib.import_module("resource-timing.sleep")
 
 def main(request, response):
     index = isomorphic_encode(request.request_path).index(b"?")
@@ -43,8 +44,6 @@
                 response.writer.end_headers()
             else:
                 statusSent = True
-        elif arg == b"flush":
-            response.writer.flush()
 
 #        else:
 #            error "  INVALID ARGUMENT %s" % arg
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/screen-capture/getdisplaymedia-after-discard.https.html firefox-85.0+build1/testing/web-platform/tests/screen-capture/getdisplaymedia-after-discard.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/screen-capture/getdisplaymedia-after-discard.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/screen-capture/getdisplaymedia-after-discard.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>Test for rejected promise from getDisplayMedia() in a discarded browsing
+  context</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>
+<body></body>
+<script>
+// https://w3c.github.io/mediacapture-screen-share/#dom-mediadevices-getdisplaymedia
+// If the current settings object's responsible document is NOT fully active,
+// return a promise rejected with a DOMException object whose name attribute
+// has the value "InvalidStateError".
+promise_test(async () => {
+  const frame = document.createElement('iframe');
+  document.body.appendChild(frame);
+  frame.srcdoc = '<html></html>';
+  await new Promise(resolve => frame.onload = resolve);
+  const child_window = frame.contentWindow;
+  const devices = child_window.navigator.mediaDevices;
+  const child_DOMException = child_window.DOMException;
+  // transient activation of iframe content
+  await test_driver.bless('getDisplayMedia()', undefined, child_window);
+  frame.remove();
+  // `catch()` is used rather than static Promise methods because microtasks
+  // for `PromiseResolve()` do not run when Promises in inactive Documents are
+  // involved.  Whether microtasks for `catch()` run depends on the realm of
+  // the handler rather than the realm of the Promise.
+  // See https://github.com/whatwg/html/issues/5319.
+  let promise_already_rejected = false;
+  let rejected_reason;
+  devices.getDisplayMedia({video:true}).catch(reason => {
+    promise_already_rejected = true;
+    rejected_reason = reason;
+  });
+  // Race a settled promise to check that the returned promise is already
+  // rejected.
+  await Promise.reject().catch(() => {
+    assert_true(promise_already_rejected,
+                'should have returned an already-rejected promise.');
+    assert_throws_dom('InvalidStateError', child_DOMException,
+                      () => { throw rejected_reason });
+  });
+}, 'getDisplayMedia() in a discarded browsing context');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/screen-capture/getdisplaymedia.https.html firefox-85.0+build1/testing/web-platform/tests/screen-capture/getdisplaymedia.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/screen-capture/getdisplaymedia.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/screen-capture/getdisplaymedia.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -23,14 +23,16 @@
   return navigator.mediaDevices.getDisplayMedia(constraints);
 }
 
-promise_test(async t => {
-  try {
-    stopTracks(await navigator.mediaDevices.getDisplayMedia({video: true}));
-  } catch (err) {
-    assert_equals(err.name, 'InvalidStateError', err.message);
-    return;
-  }
-  assert_unreached('getDisplayMedia should have failed');
+promise_test(t => {
+  const p = navigator.mediaDevices.getDisplayMedia({video: true});
+  t.add_cleanup(async () => {
+    try { stopTracks(await p) } catch {}
+  });
+  // Race a settled promise to check that the returned promise is already
+  // rejected.
+  return promise_rejects_dom(
+    t, 'InvalidStateError', Promise.race([p, Promise.resolve()]),
+    'getDisplayMedia should have returned an already-rejected promise.');
 }, `getDisplayMedia() must require user activation`);
 
 [
@@ -59,13 +61,14 @@
  {video: {frameRate: {exact: 4}}},
  {video: false, audio: true},
 ].forEach(constraints => promise_test(async t => {
-  try {
-    stopTracks(await getDisplayMedia(constraints));
-  } catch (err) {
-    assert_equals(err.name, 'TypeError', err.message);
-    return;
-  }
-  assert_unreached('getDisplayMedia should have failed');
+  await test_driver.bless('getDisplayMedia()');
+  const p = navigator.mediaDevices.getDisplayMedia(constraints);
+  t.add_cleanup(async () => {
+    try { stopTracks(await p) } catch {}
+  });
+  await promise_rejects_js(
+    t, TypeError, Promise.race([p, Promise.resolve()]),
+    'getDisplayMedia should have returned an already-rejected promise.');
 }, `getDisplayMedia(${j(constraints)}) must fail with TypeError`));
 
 [
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/scroll-animations/css/animation-timeline-computed.html firefox-85.0+build1/testing/web-platform/tests/scroll-animations/css/animation-timeline-computed.html
--- firefox-84.0.2+build1/testing/web-platform/tests/scroll-animations/css/animation-timeline-computed.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/scroll-animations/css/animation-timeline-computed.html	2021-01-18 19:58:24.000000000 +0000
@@ -39,7 +39,7 @@
 }, 'The animation-timeline property shows up in CSSStyleDeclaration enumeration');
 
 test(() => {
-  let style = getComputedStyle(document.getElementById('target'));
+  let style = document.getElementById('target').style;
   assert_not_equals(style.cssText.indexOf('animation-timeline'), -1);
 }, 'The animation-timeline property shows up in CSSStyleDeclaration.cssText');
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html firefox-85.0+build1/testing/web-platform/tests/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/scroll-animations/css/at-scroll-timeline-multi-pass.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<title>ScrollTimelines may trigger multiple style/layout passes</title>
+<link rel="help" src="https://github.com/w3c/csswg-drafts/issues/5261">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#avoiding-cycles">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  @keyframes expand_width {
+    from { width: 100px; }
+    to { width: 100px; }
+  }
+  @keyframes expand_height {
+    from { height: 100px; }
+    to { height: 100px; }
+  }
+  @scroll-timeline timeline1 {
+    source: selector(#scroller1);
+    time-range: 10s;
+  }
+  @scroll-timeline timeline2 {
+    source: selector(#scroller2);
+    time-range: 10s;
+  }
+  main {
+    height: 0px;
+    overflow: hidden;
+  }
+  .scroller {
+    height: 100px;
+    overflow: scroll;
+  }
+  .scroller > div {
+    height: 200px;
+  }
+  #element1 {
+    width: 1px;
+    animation: expand_width 10s timeline1;
+  }
+  #element2 {
+    height: 1px;
+    animation: expand_height 10s timeline2;
+  }
+</style>
+<main id=main></main>
+<div id=element1></div>
+<div>
+  <div id=element2></div>
+</div>
+<script>
+    function insertScroller(id) {
+      let scroller = document.createElement('div');
+      scroller.setAttribute('id', id);
+      scroller.setAttribute('class', 'scroller');
+      scroller.append(document.createElement('div'));
+      main.append(scroller);
+    }
+
+    promise_test(async () => {
+      await waitForNextFrame();
+
+      let events1 = [];
+      let events2 = [];
+
+      insertScroller('scroller1');
+      // Even though #scroller1 was just inserted into the DOM, |timeline1|
+      // remains inactive until the next frame.
+      //
+      // https://drafts.csswg.org/scroll-animations-1/#avoiding-cycles
+      assert_equals(getComputedStyle(element1).width, '1px');
+      (new ResizeObserver(entries => {
+        events1.push(entries);
+        insertScroller('scroller2');
+        assert_equals(getComputedStyle(element2).height, '1px');
+      })).observe(element1);
+
+      (new ResizeObserver(entries => {
+        events2.push(entries);
+      })).observe(element2);
+
+      await waitForNextFrame();
+
+      // According to the basic rules of the spec [1], the timeline is
+      // inactive at the time the resize observer event was delivered, because
+      // #scroller1 did not have a layout box at the time style recalc for
+      // #element1 happened.
+      //
+      // However, an additional style/layout pass should take place
+      // (before resize observer deliveries) if we detect new ScrollTimelines
+      // in this situation, hence we ultimately do expect the animation to
+      // apply [2].
+      //
+      // [1] https://drafts.csswg.org/scroll-animations-1/#avoiding-cycles
+      // [2] https://github.com/w3c/csswg-drafts/issues/5261
+      assert_equals(events1.length, 1);
+      assert_equals(events1[0].length, 1);
+      assert_equals(events1[0][0].contentBoxSize.length, 1);
+      assert_equals(events1[0][0].contentBoxSize[0].inlineSize, 100);
+
+      // ScrollTimelines created during the ResizeObserver should remain
+      // inactive during the frame they're created, so the ResizeObserver
+      // event should not reflect the animated value.
+      assert_equals(events2.length, 1);
+      assert_equals(events2[0].length, 1);
+      assert_equals(events2[0][0].contentBoxSize.length, 1);
+      assert_equals(events2[0][0].contentBoxSize[0].blockSize, 1);
+
+      assert_equals(getComputedStyle(element1).width, '100px');
+      assert_equals(getComputedStyle(element2).height, '100px');
+    }, 'Multiple style/layout passes occur when necessary');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive.html firefox-85.0+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive.html
--- firefox-84.0.2+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,287 @@
+<!doctype html>
+<title>Tests find-a-range-from-a-text-directive algorithm</title>
+<meta charset=utf-8>
+<link rel="help" href="https://wicg.github.io/scroll-to-text-fragment/#find-a-range-from-a-text-directive">
+<meta name="timeout" content="long">
+<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/utils.js"></script>
+<script src="stash.js"></script>
+<!--
+  This test suite performs scroll to text navigations to
+  find-range-from-text-directive-target.html and then checks the results, which are
+  communicated back from the target page via the WPT Stash server (see stash.py).
+  This structure is necessary because scroll to text security restrictions
+  specifically restrict the navigator from being able to observe the result of
+  the navigation, e.g. the target page cannot have a window opener.
+-->
+<script>
+// This test suite specifically exercises the "find a range from a text
+// directive" algorithm in the spec.
+
+let test_cases = [
+  {
+    fragment: '#:~:text=jumped',
+    expect_to_scroll: true,
+    description: 'Basic smoke test - full word match'
+  },
+  {
+    // Step 2.2.1
+    fragment: '#:~:text=u-,mped',
+    expect_to_scroll: false,
+    description: 'Prefix must start on a word boundary'
+  },
+  {
+    // Step 2.2.1
+    fragment: '#:~:text=ju-,mped',
+    expect_to_scroll: true,
+    description: 'Prefix need not end on a word boundary'
+  },
+  {
+    // Step 2.2.2
+    fragment: '#:~:text=null-,The%20quick',
+    expect_to_scroll: false,
+    description: 'Prefix doesn\'t exist'
+  },
+  {
+    // Step 2.2.3
+    fragment: '#:~:text=foo%20foo-,bar',
+    expect_to_scroll: true,
+    description: 'Multiple overlapping prefixes'
+  },
+  {
+    // Step 2.2.3
+    fragment: '#:~:text=a%20a-,b',
+    expect_to_scroll: true,
+    description: 'Multiple overlapping one letter prefixes'
+  },
+  {
+    // Step 2.2.4
+    fragment: '#:~:text=quick%20brown-,brown%20fox',
+    expect_to_scroll: false,
+    description: 'Prefix overlaps match text'
+  },
+  {
+    // Step 2.2.4
+    fragment: '#:~:text=quick%20brown-,fox',
+    expect_to_scroll: true,
+    description: 'Match text after prefix'
+  },
+  {
+    // Step 2.2.5
+    fragment: '#:~:text=Lorem-,Ipsum',
+    expect_to_scroll: true,
+    description: 'Search invisible content between prefix and match'
+  },
+  {
+    // Step 2.2.6
+    fragment: '#:~:text=end%20of%20the%20document-,test',
+    expect_to_scroll: false,
+    description: 'Prefix appears at end of document'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum,over',
+    expect_to_scroll: false,
+    description: '|end| forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum',
+    expect_to_scroll: false,
+    description: 'no |end| or suffix forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum,-ped',
+    expect_to_scroll: true,
+    description: 'suffix means |start| need not end on word boundary'
+  },
+  {
+    // Step 2.2.9
+    fragment: '#:~:text=jum-,ped',
+    expect_to_scroll: true,
+    description: '|start| doesn\'t need to start on word boundary'
+  },
+  {
+    // Step 2.2.10
+    fragment: '#:~:text=jumped-,null',
+    expect_to_scroll: false,
+    description: 'prefix with non-existent exact match'
+  },
+  {
+    // Step 2.2.10
+    fragment: '#:~:text=jumped-,null,lazy',
+    expect_to_scroll: false,
+    description: 'prefix with non-existent range match'
+  },
+  {
+    // Step 2.2.11
+    fragment: '#:~:text=brown-,jumped',
+    expect_to_scroll: false,
+    description: 'match doesn\'t immediately follow prefix'
+  },
+  {
+    // Step 2.2.11
+    fragment: '#:~:text=foo-,bar',
+    expect_to_scroll: true,
+    description: 'match doesn\'t immediately follow first prefix instance'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum,over',
+    expect_to_scroll: false,
+    description: 'no-prefix; |end| forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum',
+    expect_to_scroll: false,
+    description: 'no-prefix; no |end| or suffix forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum,-ped',
+    expect_to_scroll: true,
+    description: 'no-prefix; suffix means |start| need not end on word boundary'
+  },
+  {
+    // Step 2.3.2
+    fragment: '#:~:text=umped',
+    expect_to_scroll: false,
+    description: '|start| must start on a word boundary'
+  },
+  {
+    // Step 2.3.3
+    fragment: '#:~:text=null',
+    expect_to_scroll: false,
+    description: 'non-existent exact match'
+  },
+  {
+    // Step 2.3.3
+    fragment: '#:~:text=null,lazy',
+    expect_to_scroll: false,
+    description: 'non-existent range match'
+  },
+  {
+    // Step 2.3.4
+    fragment: '#:~:text=b%20b,-c',
+    expect_to_scroll: true,
+    description: 'overlapping exact matches with suffix'
+  },
+  {
+    // Step 2.3.4
+    fragment: '#:~:text=foo%20foo,-bar',
+    expect_to_scroll: true,
+    description: 'overlapping one letter exact matches with suffix'
+  },
+  {
+    // Step 2.4.1
+    fragment: '#:~:text=brown,fox',
+    expect_to_scroll: true,
+    description: 'matching range search'
+  },
+  {
+    // Step 2.4.1
+    fragment: '#:~:text=brown,quick',
+    expect_to_scroll: false,
+    description: 'inverted range search'
+  },
+  {
+    // Step 2.4.2
+    fragment: '#:~:text=quick,bro',
+    expect_to_scroll: false,
+    description: 'no suffix forces |end| to be end bounded'
+  },
+  {
+    // Step 2.4.2
+    fragment: '#:~:text=quick,bro,-wn',
+    expect_to_scroll: true,
+    description: 'suffix means |end| need not be end bounded'
+  },
+  {
+    // Step 2.4.3
+    fragment: '#:~:text=quick,ro,-wn',
+    expect_to_scroll: false,
+    description: '|end| must be start bounded'
+  },
+  {
+    // Step 2.4.3
+    fragment: '#:~:text=bro,wn',
+    expect_to_scroll: false,
+    description: '|end| must be start bounded even if full range is word bounded'
+  },
+  {
+    // Step 2.4.4
+    fragment: '#:~:text=quick,null',
+    expect_to_scroll: false,
+    description: 'non-existent |end|'
+  },
+  {
+    // Step 2.4.5
+    fragment: '#:~:text=quick,jumped,-fox',
+    expect_to_scroll: false,
+    description: 'Range with preceeding suffix'
+  },
+  {
+    // Step 2.6
+    fragment: '#:~:text=The-,quick,brown',
+    expect_to_scroll: true,
+    description: 'Match with no suffix'
+  },
+  {
+    // Step 2.7
+    fragment: '#:~:text=The-,quick,fox,-brown',
+    expect_to_scroll: false,
+    description: 'Suffix comes before |end|'
+  },
+  {
+    // Step 2.8
+    fragment: '#:~:text=Lorem-,Ipsum,Whitespace,-Dipsum',
+    expect_to_scroll: true,
+    description: 'Search invisible content between |end| and suffix'
+  },
+  {
+    // Step 2.9
+    fragment: '#:~:text=quick,-bro',
+    expect_to_scroll: false,
+    description: 'Suffix must be end bounded'
+  },
+  {
+    // Step 2.9
+    fragment: '#:~:text=qu,-ick',
+    expect_to_scroll: true,
+    description: 'Suffix need not be start bounded'
+  },
+  {
+    // Step 2.10
+    fragment: '#:~:text=quick,-null',
+    expect_to_scroll: false,
+    description: 'Non-existent suffix'
+  },
+  {
+    // Step 2.11
+    fragment: '#:~:text=quick,-fox',
+    expect_to_scroll: false,
+    description: 'Content appears between match and suffix'
+  }
+];
+
+for (const test_case of test_cases) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(`find-range-from-text-directive-target.html?key=${key}${test_case.fragment}`, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    const expectation_string = test_case.expect_to_scroll ? 'to scroll' : 'not to scroll';
+    assert_equals(data.didScroll, test_case.expect_to_scroll,
+                  `Expected ${expectation_string}`);
+  }), `${test_case.description}.`);
+}
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html firefox-85.0+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html
--- firefox-84.0.2+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/scroll-to-text-fragment/find-range-from-text-directive-target.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,71 @@
+<!doctype html>
+<title>Tests find-a-range-from-a-text-directive algorithm</title>
+<script src="stash.js"></script>
+<script>
+window.didScroll = false;
+
+function checkScroll() {
+  let results = {
+    didScroll: window.scrollY != 0
+  };
+
+  let key = (new URL(document.location)).searchParams.get("key");
+  stashResultsThenClose(key, results);
+}
+
+// Ensure two animation frames on load to test the fallback to element anchor,
+// which gets queued for the next frame if the text fragment is not found.
+window.onload = function() {
+  window.requestAnimationFrame(function() {
+    window.requestAnimationFrame(checkScroll);
+  });
+}
+</script>
+<style>
+  .spacer {
+    width: 50vw;
+    height: 200vh;
+  }
+</style>
+<body>
+  <div class="spacer"></div>
+  <p>
+    The quick brown fox jumped over the lazy dog.
+    a a b b b c
+  </p>
+  <p>
+    foo foo foo bar bar bar
+  </p>
+  <p>
+    Lorem
+
+    <br> <i>    </i>
+    <div>  &nbsp </div>
+    <!-- This <p> puts lots of non textual stuff between words -->
+    <div style="display: none">This isn't rendered</div>
+    <div style="visibility: hidden">This also isn't visible</div>
+    <iframe srcdoc="Inner Iframe"></iframe>
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII=">
+
+        &nbsp; &nbsp    Ipsum
+
+    Whitespace
+
+    <br> <i>    </i>
+    <div>  &nbsp </div>
+    <!-- This <p> puts lots of non textual stuff between words -->
+    <div style="display: none">This isn't rendered</div>
+    <div style="visibility: hidden">This also isn't visible</div>
+    <iframe srcdoc="Inner Iframe"></iframe>
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII=">
+        &nbsp; &nbsp
+
+    Dipsum
+
+
+
+  </p>
+  <p>
+    This text appears at the end of the document
+  </p
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/secure-payment-confirmation/secure-payment-confirmation.tenative.https.html firefox-85.0+build1/testing/web-platform/tests/secure-payment-confirmation/secure-payment-confirmation.tenative.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/secure-payment-confirmation/secure-payment-confirmation.tenative.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/secure-payment-confirmation/secure-payment-confirmation.tenative.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<meta name="timeout" content="long">
 <title>Test for 'secure-payment-confirmation' payment method</title>
 <link rel="help" href="https://github.com/rsolomakhin/secure-payment-confirmation">
 <script src="/resources/testharness.js"></script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/selection/textcontrols/selectionchange.tentative.html firefox-85.0+build1/testing/web-platform/tests/selection/textcontrols/selectionchange.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/selection/textcontrols/selectionchange.tentative.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/selection/textcontrols/selectionchange.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test selectionchange events from text controls</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  input,
+  textarea {
+    font: 16px/1 Ahem;
+  }
+</style>
+
+<input id="input" value="XXXXXXXXXXXXXXXXXXX" width="200"><br>
+<textarea id="textarea" width="200">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</textarea>
+
+<script>
+  class SelectionChangeCollector {
+    constructor(target) {
+      this.events = [];
+      target.addEventListener("selectionchange", ev => {
+        this.events.push(ev);
+      });
+    }
+    clear() {
+      this.events.length = 0;
+    }
+  }
+
+  const data = {
+    input: new SelectionChangeCollector(input),
+    textarea: new SelectionChangeCollector(textarea),
+    async initialize() {
+      input.blur();
+      textarea.blur();
+      input.selectionStart = input.selectionEnd = 0;
+      textarea.selectionStart = textarea.selectionEnd = 0;
+      await this.spin();
+      this.input.clear();
+      this.textarea.clear();
+    },
+    spin() {
+      return new Promise(setTimeout);
+    },
+    async assert_empty_spin() {
+      // firing selectionchange must be asynchronous
+      assert_equals(this.input.events.length, 0);
+      assert_equals(this.textarea.events.length, 0);
+      await this.spin();
+    }
+  };
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionStart = 1;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Modifying selectionStart value of the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionEnd = 1;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Modifying selectionEnd value of the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.setSelectionRange(0, 4);
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Calling setSelectionRange() on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    input.select();
+
+    await data.assert_empty_spin();
+    assert_equals(data.input.events.length, 1);
+  }, "Calling select() on the input element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.select();
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Calling select() on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    input.selectionStart = 0;
+
+    await data.assert_empty_spin();
+    assert_equals(data.input.events.length, 0);
+  }, "Setting initial zero selectionStart value on the input element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    input.selectionEnd = 0;
+
+    await data.assert_empty_spin();
+    assert_equals(data.input.events.length, 0);
+  }, "Setting initial zero selectionEnd value on the input element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionStart = 0;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 0);
+  }, "Setting initial zero selectionStart value on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionStart = 2;
+    textarea.selectionStart = 2;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Setting the same selectionStart value twice on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionEnd = 0;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 0);
+  }, "Setting initial zero selectionEnd value on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.selectionEnd = 2;
+    textarea.selectionEnd = 2;
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Setting the same selectionEnd value twice on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.setSelectionRange(0, 0);
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 0);
+  }, "Setting initial zero selection range on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.setSelectionRange(3, 3);
+    textarea.setSelectionRange(3, 3);
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Setting the same selection range twice on the textarea element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    input.select();
+    input.select();
+
+    await data.assert_empty_spin();
+    assert_equals(data.input.events.length, 1);
+  }, "Calling select() twice on the input element");
+
+  promise_test(async () => {
+    await data.initialize();
+
+    textarea.select();
+    textarea.select();
+
+    await data.assert_empty_spin();
+    assert_equals(data.textarea.events.length, 1);
+  }, "Calling select() twice on the textarea element");
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/serial/resources/common.js firefox-85.0+build1/testing/web-platform/tests/serial/resources/common.js
--- firefox-84.0.2+build1/testing/web-platform/tests/serial/resources/common.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/serial/resources/common.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,33 @@
+// Compare two Uint8Arrays.
+function compareArrays(actual, expected) {
+  assert_true(actual instanceof Uint8Array, 'actual is Uint8Array');
+  assert_true(expected instanceof Uint8Array, 'expected is Uint8Array');
+  assert_equals(actual.byteLength, expected.byteLength, 'lengths equal');
+  for (let i = 0; i < expected.byteLength; ++i)
+    assert_equals(actual[i], expected[i], `Mismatch at position ${i}.`);
+}
+
+// Reads from |reader| until at least |targetLength| is read or the stream is
+// closed. The data is returned as a combined Uint8Array.
+async function readWithLength(reader, targetLength) {
+  const chunks = [];
+  let actualLength = 0;
+
+  while (true) {
+    let {value, done} = await reader.read();
+    chunks.push(value);
+    actualLength += value.byteLength;
+
+    if (actualLength >= targetLength || done) {
+      // It would be better to allocate |buffer| up front with the number of
+      // of bytes expected but this is the best that can be done without a
+      // BYOB reader to control the amount of data read.
+      const buffer = new Uint8Array(actualLength);
+      chunks.reduce((offset, chunk) => {
+        buffer.set(chunk, offset);
+        return offset + chunk.byteLength;
+      }, 0);
+      return buffer;
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/serial/resources/manual.js firefox-85.0+build1/testing/web-platform/tests/serial/resources/manual.js
--- firefox-84.0.2+build1/testing/web-platform/tests/serial/resources/manual.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/serial/resources/manual.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,38 @@
+let manualTestPort = null;
+
+navigator.serial.addEventListener('disconnect', (e) => {
+  if (e.port === manualTestPort) {
+    manualTestPort = null;
+  }
+})
+
+async function getPortForManualTest() {
+  if (manualTestPort) {
+    return manualTestPort;
+  }
+
+  const button = document.createElement('button');
+  button.textContent = 'Click to select a device';
+  button.style.display = 'block';
+  button.style.fontSize = '20px';
+  button.style.padding = '10px';
+
+  await new Promise((resolve) => {
+    button.onclick = () => {
+      document.body.removeChild(button);
+      resolve();
+    };
+    document.body.appendChild(button);
+  });
+
+  manualTestPort = await navigator.serial.requestPort({filters: []});
+  assert_true(manualTestPort instanceof SerialPort);
+
+  return manualTestPort;
+}
+
+function manual_loopback_serial_test(func, name, properties) {
+  promise_test(async (test) => {
+    await func(test, await getPortForManualTest());
+  }, name, properties);
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/serial/serialPort_disconnect-manual.https.html firefox-85.0+build1/testing/web-platform/tests/serial/serialPort_disconnect-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/serial/serialPort_disconnect-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/serial/serialPort_disconnect-manual.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/common.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a serial device to be connected and disconnected.
+    </p>
+    <script>
+      manual_loopback_serial_test(async (t, port) => {
+        const watcher = new EventWatcher(t, navigator.serial, ['disconnect']);
+
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        const disconnectPromise = watcher.wait_for(['disconnect'])
+        const reader = port.readable.getReader();
+
+        const disconnectMessage = document.createElement('div');
+        disconnectMessage.textContent = 'Disconnect the device now.';
+        document.body.appendChild(disconnectMessage);
+
+        try {
+          while (true) {
+            const {value, done} = await reader.read();
+            // Ignore |value| in case the device happens to produce data. It is
+            // not important for this test.
+            assert_false(done);
+          }
+        } catch (e) {
+          assert_equals(e.constructor, DOMException);
+          assert_equals(e.name, 'NetworkError');
+        }
+        reader.releaseLock();
+        assert_equals(port.readable, null);
+
+        let event = await disconnectPromise;
+        assert_equals(event.target, port);
+
+        disconnectMessage.remove();
+
+        await port.close();
+      }, 'Disconnect during read is detected.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        const watcher = new EventWatcher(t, navigator.serial, ['disconnect']);
+
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        const disconnectPromise = watcher.wait_for(['disconnect'])
+        const writer = port.writable.getWriter();
+
+        const disconnectMessage = document.createElement('div');
+        disconnectMessage.textContent = 'Disconnect the device now.';
+        document.body.appendChild(disconnectMessage);
+
+        const data = new Uint8Array(4096);
+        try {
+          while (true) {
+            await writer.write(data);
+          }
+        } catch (e) {
+          assert_equals(e.constructor, DOMException);
+          assert_equals(e.name, 'NetworkError');
+        }
+        writer.releaseLock();
+        assert_equals(port.writable, null);
+
+        let event = await disconnectPromise;
+        assert_equals(event.target, port);
+
+        disconnectMessage.remove();
+
+        await port.close();
+      }, 'Disconnect during write is detected.');
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/serial/serialPort_loopback-manual.https.html firefox-85.0+build1/testing/web-platform/tests/serial/serialPort_loopback-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/serial/serialPort_loopback-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/serial/serialPort_loopback-manual.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/common.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a connected serial device configured to act as a
+      "loopback" device, with the transmit and receive pins wired together.
+    </p>
+    <script>
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much smaller than bufferSize above.
+        const data = new Uint8Array(64);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = i & 0xff;
+
+        const reader = port.readable.getReader();
+
+        for (let i = 0; i < 10; ++i) {
+          const writer = port.writable.getWriter();
+          writer.write(data);
+          const writePromise = writer.close();
+
+          const value = await readWithLength(reader, data.byteLength);
+          await writePromise;
+
+          compareArrays(value, data);
+        }
+
+        reader.releaseLock();
+        await port.close();
+      }, 'Can perform a series of small writes.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much larger than bufferSize above.
+        const data = new Uint8Array(10 * 1024);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = (i / 1024) & 0xff;
+
+        const reader = port.readable.getReader();
+
+        for (let i = 0; i < 10; ++i) {
+          const writer = port.writable.getWriter();
+          writer.write(data);
+          const writePromise = writer.close();
+
+          const value = await readWithLength(reader, data.byteLength);
+          await writePromise;
+
+          compareArrays(value, data);
+        }
+
+        reader.releaseLock();
+        await port.close();
+      }, 'Can perform a series of large writes.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 64});
+
+        const writer = port.writable.getWriter();
+        // |data| is small enough to be completely transmitted.
+        let data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+        await writer.write(data);
+
+        // Wait a little bit for the device to process the incoming data.
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        // ...before discarding the receive buffers.
+        await port.readable.cancel();
+
+        data = new Uint8Array([9, 10, 11, 12, 13, 14, 15, 16]);
+        const reader = port.readable.getReader();
+        const readPromise = readWithLength(reader, data.byteLength);
+
+        // The next block of data should be received successfully.
+        await writer.write(data);
+        writer.releaseLock();
+
+        const value = await readPromise;
+        reader.releaseLock();
+
+        compareArrays(value, data);
+
+        await port.close();
+      }, 'Canceling the reader discards buffered data.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        // Create something much larger than bufferSize above.
+        const data = new Uint8Array(16 * 1024);
+        for (let i = 0; i < data.byteLength; ++i)
+          data[i] = (i / 1024) & 0xff;
+
+        // Completely write |data| to the port without waiting for it to be
+        // received.
+        const writer = port.writable.getWriter();
+        writer.write(data);
+        await writer.close();
+
+        const reader = port.readable.getReader();
+        const chunks = [];
+        let actualLength = 0;
+        while (true) {
+          try {
+            const {value, done} = await reader.read();
+            if (value) {
+              actualLength += value.byteLength;
+              chunks.push(value);
+            }
+            if (done) {
+              assert_unreached("Unexpected end of stream.");
+              break;
+            }
+          } catch (e) {
+            assert_equals(e.name, 'BufferOverrunError');
+            break;
+          }
+        }
+        reader.releaseLock();
+
+        const buffer = new Uint8Array(actualLength);
+        chunks.reduce((offset, chunk) => {
+          buffer.set(chunk, offset);
+          return offset + chunk.byteLength;
+        }, 0);
+
+        assert_greater_than(actualLength, 0);
+        compareArrays(buffer, data.slice(0, actualLength));
+
+        await port.close();
+      }, 'Overflowing the receive buffer triggers an error.');
+
+      manual_loopback_serial_test(async (t, port) => {
+        await port.open({baudRate: 115200, bufferSize: 1024});
+
+        let reader = port.readable.getReader();
+        let readPromise = (async () => {
+          // A single zero byte will be read before the break is detected.
+          const {value, done} = await reader.read();
+          compareArrays(value, new Uint8Array([0]));
+          assert_false(done);
+
+          try {
+            const {value, done} = await reader.read();
+            assert_unreached(`Expected break, got ${value.byteLength} bytes`);
+          } catch (e) {
+            assert_equals(e.constructor, DOMException);
+            assert_equals(e.name, 'BreakError');
+          }
+        })();
+
+        await port.setSignals({break: true});
+        await readPromise;
+        await port.setSignals({break: false});
+
+        const writer = port.writable.getWriter();
+        // |data| is small enough to be completely transmitted.
+        let data = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+        await writer.write(data);
+        writer.releaseLock();
+
+        reader = port.readable.getReader();
+        const buffer = await readWithLength(reader, data.byteLength);;
+        compareArrays(buffer, data);
+        reader.releaseLock();
+
+        await port.close();
+      }, 'Break is detected.');
+    </script>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/claim-worker-fetch.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/claim-worker-fetch.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/claim-worker-fetch.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/claim-worker-fetch.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -7,73 +7,64 @@
 <body>
 <script>
 
-promise_test(function(t) {
+promise_test((t) => {
   return runTest(t, 'resources/claim-worker-fetch-iframe.html');
 }, 'fetch() in Worker should be intercepted after the client is claimed.');
 
-promise_test(function(t) {
+promise_test((t) => {
   return runTest(t, 'resources/claim-nested-worker-fetch-iframe.html');
 }, 'fetch() in nested Worker should be intercepted after the client is claimed.');
 
-function runTest(t, iframe_url) {
-  var resource = 'simple.txt';
+promise_test((t) => {
+  return runTest(t, 'resources/claim-blob-url-worker-fetch-iframe.html');
+}, 'fetch() in blob URL Worker should be intercepted after the client is claimed.');
+
+async function runTest(t, iframe_url) {
+  const resource = 'simple.txt';
+  const scope = 'resources/';
+  const script = 'resources/claim-worker.js';
+
+  // Create the test iframe with a dedicated worker.
+  const frame = await with_iframe(iframe_url);
+  t.add_cleanup(_ => frame.remove());
+
+  // Check the controller and test with fetch in the worker.
+  assert_equals(frame.contentWindow.navigator.controller,
+                undefined, 'Should have no controller.');
+  {
+    const response_text = await frame.contentWindow.fetch_in_worker(resource);
+    assert_equals(response_text, 'a simple text file\n',
+                  'fetch() should not be intercepted.');
+  }
+
+  // Register a service worker.
+  const reg = await service_worker_unregister_and_register(t, script, scope);
+  t.add_cleanup(_ => reg.unregister());
+  await wait_for_state(t, reg.installing, 'activated');
+
+  // Let the service worker claim the iframe and the worker.
+  const channel = new MessageChannel();
+  const saw_message = new Promise(function(resolve) {
+    channel.port1.onmessage = t.step_func(function(e) {
+      assert_equals(e.data, 'PASS', 'Worker call to claim() should fulfill.');
+      resolve();
+    });
+  });
+  reg.active.postMessage({port: channel.port2}, [channel.port2]);
+  await saw_message;
+
+  // Check the controller and test with fetch in the worker.
+  const reg2 =
+    await frame.contentWindow.navigator.serviceWorker.getRegistration(scope);
+  assert_equals(frame.contentWindow.navigator.serviceWorker.controller,
+                reg2.active, 'Test iframe should be claimed.');
 
-  var frame;
-  var registration;
-  var worker;
-  var scope = 'resources/';
-  var script = 'resources/claim-worker.js';
-
-  return Promise.resolve()
-    // Create the test iframe with a dedicated worker.
-    .then(() => with_iframe(iframe_url))
-    .then(f => {
-      t.add_cleanup(() => f.remove());
-      frame = f;
-    })
-
-    // Check the controller and test with fetch in the worker.
-    .then(() => assert_equals(frame.contentWindow.navigator.controller,
-                              undefined,
-                              'Should have no controller.'))
-    .then(() => frame.contentWindow.fetch_in_worker(resource))
-    .then(response_text => assert_equals(response_text,
-                                         'a simple text file\n',
-                                         'fetch() should not be intercepted.'))
-    // Register a service worker.
-    .then(() => service_worker_unregister_and_register(t, script, scope))
-    .then(r => {
-      t.add_cleanup(() => r.unregister());
-      worker = r.installing;
-    })
-    .then(() => wait_for_state(t, worker, 'activated'))
-
-    // Let the service worker claim the iframe and the worker.
-    .then(() => {
-      var channel = new MessageChannel();
-      var saw_message = new Promise(function(resolve) {
-        channel.port1.onmessage = t.step_func(function(e) {
-          assert_equals(e.data, 'PASS',
-                        'Worker call to claim() should fulfill.');
-          resolve();
-        });
-      });
-      worker.postMessage({port: channel.port2}, [channel.port2]);
-      return saw_message;
-    })
-
-    // Check the controller and test with fetch in the worker.
-    .then(() => frame.contentWindow.navigator.serviceWorker.getRegistration(scope))
-    .then(r => registration = r)
-    .then(() => assert_equals(frame.contentWindow.navigator.serviceWorker.controller,
-                             registration.active,
-                             'Test iframe should be claimed.'))
+  {
     // TODO(horo): Check the worker's navigator.seviceWorker.controller.
-    .then(() => frame.contentWindow.fetch_in_worker(resource))
-    .then(response_text =>
-          assert_equals(response_text,
-                        'Intercepted!',
-                        'fetch() in the worker should be intercepted.'));
+    const response_text = await frame.contentWindow.fetch_in_worker(resource);
+    assert_equals(response_text, 'Intercepted!',
+                  'fetch() in the worker should be intercepted.');
+  }
 }
 
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/client-url-of-blob-url-worker.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Service Worker: client.url of a worker created from a blob URL</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script>
+
+const SCRIPT = 'resources/client-url-of-blob-url-worker.js';
+const SCOPE = 'resources/client-url-of-blob-url-worker.html';
+
+promise_test(async (t) => {
+  const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+  t.add_cleanup(_ => reg.unregister());
+  await wait_for_state(t, reg.installing, 'activated');
+
+  const frame = await with_iframe(SCOPE);
+  t.add_cleanup(_ => frame.remove());
+  assert_not_equals(frame.contentWindow.navigator.serviceWorker.controller,
+                    null, 'frame should be controlled');
+
+  const response = await frame.contentWindow.createAndFetchFromBlobWorker();
+
+  assert_not_equals(response.result, 'one worker client should exist',
+                    'worker client should exist');
+  assert_equals(response.result, response.expected,
+                'client.url and worker location href should be the same');
+
+}, 'Client.url of a blob URL worker should be a blob URL.');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/fetch-event-referrer-policy.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -22,7 +22,7 @@
           do_test(referrer,
             response_text,
             'Referrer: ' + href + '\n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with the referrer URL when a member of RequestInit is present');
           var http_url = get_host_info()['HTTP_ORIGIN'] + base_path() +
                          '/resources/simple.html?referrerFull';
@@ -34,7 +34,7 @@
           do_test(referrer,
             response_text,
             'Referrer: \n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with no referrer when a member of RequestInit is present with an HTTP request');
           return frame.contentWindow.fetch('resources/simple.html?referrerFull',
                                            {referrerPolicy: "", referrer: referrer});
@@ -44,7 +44,7 @@
           do_test(referrer,
             response_text,
             'Referrer: ' + href + '\n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with the referrer with ""');
           var http_url = get_host_info()['HTTP_ORIGIN'] + base_path() +
                          '/resources/simple.html?referrerFull';
@@ -56,7 +56,7 @@
           do_test(referrer,
             response_text,
             'Referrer: \n' +
-            'ReferrerPolicy: no-referrer-when-downgrade',
+            'ReferrerPolicy: strict-origin-when-cross-origin',
             'Service Worker should respond to fetch with no referrer with ""');
           return frame.contentWindow.fetch('resources/simple.html?referrerFull',
                                            {referrerPolicy: "origin", referrer: referrer});
@@ -253,7 +253,7 @@
       .then(function(f) {
           frame = f;
           test(() => {
-            assert_equals(frame.contentDocument.body.textContent, 'ReferrerPolicy: no-referrer-when-downgrade');
+            assert_equals(frame.contentDocument.body.textContent, 'ReferrerPolicy: strict-origin-when-cross-origin');
           }, 'Service Worker should respond to fetch with the default referrer policy');
           // First, run the referrer policy tests without passing a referrer in RequestInit.
           return run_referrer_policy_tests(frame, undefined, frame.contentDocument.location.href,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/import-scripts-cross-origin.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/import-scripts-cross-origin.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/import-scripts-cross-origin.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/import-scripts-cross-origin.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tests for importScripts: cross-origin</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<body>
+<script>
+promise_test(async t => {
+    const scope = 'resources/import-scripts-cross-origin';
+    await service_worker_unregister(t, scope);
+    let reg = await navigator.serviceWorker.register(
+      'resources/import-scripts-cross-origin-worker.sub.js', { scope: scope });
+    t.add_cleanup(_ => reg.unregister());
+    assert_not_equals(reg.installing, null, 'worker is installing');
+  }, 'importScripts() supports cross-origin requests');
+</script>
+</body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/navigation-preload/resources/chunked-encoding-scope.py	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,6 @@
             response.writer.write(u"%s\n%s\n" % (len(str(idx)), idx))
         else:
             response.writer.write(u"%s\r\n%s\r\n" % (len(str(idx)), idx))
-        response.writer.flush()
         time.sleep(0.001)
 
     response.writer.write(u"0\r\n\r\n")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/claim-blob-url-worker-fetch-iframe.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,21 @@
+<!doctype html>
+<script>
+const baseLocation = window.location;
+const workerScript =
+  `self.onmessage = async (e) => {
+    const url = new URL(e.data, '${baseLocation}').href;
+    const response = await fetch(url);
+    const text = await response.text();
+    self.postMessage(text);
+  };`;
+const blob = new Blob([workerScript], { type: 'text/javascript' });
+const blobUrl = URL.createObjectURL(blob);
+const worker = new Worker(blobUrl);
+
+function fetch_in_worker(url) {
+  return new Promise((resolve) => {
+    worker.onmessage = (e) => resolve(e.data);
+    worker.postMessage(url);
+  });
+}
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<script>
+
+// Return a URL of a client when it's successful.
+function createAndFetchFromBlobWorker() {
+  const fetchURL = new URL('get-worker-client-url.txt', window.location).href;
+  const workerScript =
+    `self.onmessage = async (e) => {
+      const response = await fetch(e.data.url);
+      const text = await response.text();
+      self.postMessage({"result": text, "expected": self.location.href});
+    };`;
+  const blob = new Blob([workerScript], { type: 'text/javascript' });
+  const blobUrl = URL.createObjectURL(blob);
+
+  const worker = new Worker(blobUrl);
+  return new Promise((resolve, reject) => {
+    worker.onmessage = e => resolve(e.data);
+    worker.onerror = e => reject(e.message);
+    worker.postMessage({"url": fetchURL});
+  });
+}
+
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/client-url-of-blob-url-worker.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,10 @@
+addEventListener('fetch', e => {
+  if (e.request.url.includes('get-worker-client-url')) {
+    e.respondWith((async () => {
+      const clients = await self.clients.matchAll({type: 'worker'});
+      if (clients.length != 1)
+        return new Response('one worker client should exist');
+      return new Response(clients[0].url);
+    })());
+  }
+});
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/import-scripts-cross-origin-worker.sub.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1 @@
+importScripts('https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/import-scripts-version.py');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/invalid-chunked-encoding-with-flush.py	2021-01-18 19:58:24.000000000 +0000
@@ -5,7 +5,5 @@
     response.write_status_headers()
 
     time.sleep(1)
-    response.explicit_flush = True
 
     response.writer.write(b"XX\r\n\r\n")
-    response.writer.flush()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/malformed-worker.py firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/malformed-worker.py
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/malformed-worker.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/malformed-worker.py	2021-01-18 19:58:24.000000000 +0000
@@ -6,5 +6,6 @@
             u'uncaught-exception': u'throw new DOMException("AbortError");',
             u'caught-exception': u'try { throw new Error; } catch(e) {}',
             u'import-malformed-script': u'importScripts("malformed-worker.py?parse-error");',
-            u'import-no-such-script': u'importScripts("no-such-script.js");'}[request.url_parts.query]
+            u'import-no-such-script': u'importScripts("no-such-script.js");',
+            u'top-level-await': u'await Promise.resolve(1);'}[request.url_parts.query]
     return headers, body
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/registration-tests-script.js firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/registration-tests-script.js
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/resources/registration-tests-script.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/resources/registration-tests-script.js	2021-01-18 19:58:24.000000000 +0000
@@ -57,6 +57,17 @@
       }, 'Registering script importing malformed script');
   }
 
+  if (type === 'module') {
+    promise_test(function(t) {
+        var script = 'resources/malformed-worker.py?top-level-await';
+        var scope = 'resources/scope/top-level-await';
+        return promise_rejects_js(t,
+            TypeError,
+            register_method(script, {scope: scope}),
+            'Registration of script with await top-level await should fail.');
+      }, 'Registering script with top-level await');
+  }
+
   promise_test(function(t) {
       var script = 'resources/no-such-worker.js';
       var scope = 'resources/scope/no-such-worker';
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck-cors-import.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,59 @@
+<!doctype html>
+<meta charset=utf-8>
+<title></title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="resources/testharness-helpers.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script>
+// Tests of updating a service worker. This file contains cors cases only.
+// The cases of cors: false are in update-bytecheck.https.html.
+
+/*
+ * @param string main
+ *   Decide the content of the main script, where 'default' is for constant
+ *   content while 'time' is for time-variant content.
+ * @param string imported
+ *   Decide the content of the imported script, where 'default' is for constant
+ *   content while 'time' is for time-variant content.
+ */
+const settings = [{main: 'default', imported: 'default'},
+                  {main: 'default', imported: 'time'   },
+                  {main: 'time',    imported: 'default'},
+                  {main: 'time',    imported: 'time'   }];
+
+const host_info = get_host_info();
+settings.forEach(({cors, main, imported}) => {
+  promise_test(async (t) => {
+    // Specify a cross origin path to load imported scripts from a cross origin.
+    const path = host_info.HTTPS_REMOTE_ORIGIN +
+                 '/service-workers/service-worker/resources/';
+    const script = 'resources/bytecheck-worker.py' +
+                   '?main=' + main +
+                   '&imported=' + imported +
+                   '&path=' + path;
+    const scope = 'resources/blank.html';
+
+    // Register a service worker.
+    const swr = await service_worker_unregister_and_register(t, script, scope);
+    t.add_cleanup(() => swr.unregister());
+    const sw = await wait_for_update(t, swr);
+    await wait_for_state(t, sw, 'activated');
+    assert_array_equals([swr.active, swr.waiting, swr.installing],
+                        [sw, null, null]);
+
+    // Update the service worker registration.
+    await swr.update();
+
+    // If there should be a new service worker.
+    if (main === 'time' || imported === 'time') {
+      return wait_for_update(t, swr);
+    }
+    // Otherwise, make sure there is no newly created service worker.
+    assert_array_equals([swr.active, swr.waiting, swr.installing],
+                        [sw, null, null]);
+  }, `Test(main: ${main}, imported: ${imported})`);
+});
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck.https.html firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/service-workers/service-worker/update-bytecheck.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -8,10 +8,10 @@
 <script src="resources/test-helpers.sub.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script>
+// Tests of updating a service worker. This file contains non-cors cases only.
+// The cases of cors: true are in update-bytecheck-cors-import.https.html.
 
 /*
- * @param bolean cors
- *   Determine wether the imported script should be a cross origin script.
  * @param string main
  *   Decide the content of the main script, where 'default' is for constant
  *   content while 'time' is for time-variant content.
@@ -19,57 +19,40 @@
  *   Decide the content of the imported script, where 'default' is for constant
  *   content while 'time' is for time-variant content.
  */
-const settings = [{cors: false, main: 'default', imported: 'default'},
-                  {cors: false, main: 'default', imported: 'time'   },
-                  {cors: false, main: 'time',    imported: 'default'},
-                  {cors: false, main: 'time',    imported: 'time'   },
-                  {cors: true,  main: 'default', imported: 'default'},
-                  {cors: true,  main: 'default', imported: 'time'   },
-                  {cors: true,  main: 'time',    imported: 'default'},
-                  {cors: true,  main: 'time',    imported: 'time'   }];
+const settings = [{main: 'default', imported: 'default'},
+                  {main: 'default', imported: 'time'   },
+                  {main: 'time',    imported: 'default'},
+                  {main: 'time',    imported: 'time'   }];
 
 const host_info = get_host_info();
-settings.reduce((p, s) => {
-  return p.then(promise_test(function(t) {
-    var path = !s.cors ? ''
-                       : host_info.HTTPS_REMOTE_ORIGIN +
-                         '/service-workers/service-worker/resources/';
-    var script = 'resources/bytecheck-worker.py' +
-                 '?main=' + s.main +
-                 '&imported=' + s.imported +
-                 '&path=' + path;
-    var scope = 'resources/blank.html';
+settings.forEach(({main, imported}) => {
+  promise_test(async (t) => {
+    // Empty path results in the same origin imported scripts.
+    const path = '';
+    const script = 'resources/bytecheck-worker.py' +
+                   '?main=' + main +
+                   '&imported=' + imported +
+                   '&path=' + path;
+    const scope = 'resources/blank.html';
 
-    var swr, sw;
-    return Promise.resolve()
-      // Register a service worker.
-      .then(_ => service_worker_unregister_and_register(t, script, scope))
-      .then(r => {
-        t.add_cleanup(() => service_worker_unregister(t, scope));
-        swr = r;
-        return wait_for_update(t, swr);
-      })
-      .then(w => sw = w)
-      .then(_ => wait_for_state(t, sw, 'activated'))
-      .then(_ => assert_array_equals([swr.active,
-                                      swr.waiting,
-                                      swr.installing],
-                                     [sw, null, null]))
+    // Register a service worker.
+    const swr = await service_worker_unregister_and_register(t, script, scope);
+    t.add_cleanup(() => swr.unregister());
+    const sw = await wait_for_update(t, swr);
+    await wait_for_state(t, sw, 'activated');
+    assert_array_equals([swr.active, swr.waiting, swr.installing],
+                        [sw, null, null]);
 
-      // Update the service worker registration.
-      .then(_ => swr.update())
-      .then(_ => {
-         // If there should be a new service worker.
-         if (s.main === 'time' || s.imported === 'time') {
-           return wait_for_update(t, swr);
-         }
-         // Otherwise, make sure there is no newly created service worker.
-         assert_array_equals([swr.active,
-                              swr.waiting,
-                              swr.installing],
-                             [sw, null, null]);
-      });
-  }, `Test(cors: ${s.cors}, main: ${s.main}, imported: ${s.imported})`));
-}, Promise.resolve());
+    // Update the service worker registration.
+    await swr.update();
 
+    // If there should be a new service worker.
+    if (main === 'time' || imported === 'time') {
+      return wait_for_update(t, swr);
+    }
+    // Otherwise, make sure there is no newly created service worker.
+    assert_array_equals([swr.active, swr.waiting, swr.installing],
+                        [sw, null, null]);
+  }, `Test(main: ${main}, imported: ${imported})`);
+});
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 <script src='/resources/testharness.js'></script>
 <script src='/resources/testharnessreport.js'></script>
 <script src='../resources/shadow-dom-utils.js'></script>
+<script src="support/helpers.js"></script>
 
 <script>
 const shadowContent = '<span>Shadow tree</span><slot></slot>';
@@ -18,7 +19,7 @@
   const declarativeString = `<${elementType} id=theelement>${getDeclarativeContent(mode, delegatesFocus)}
      <span class='lightdom'>${lightDomTextContent}</span></${elementType}>`;
   const wrapper = document.createElement('div');
-  wrapper.setInnerHTML(declarativeString, {allowShadowRoot: true});
+  setInnerHTML(wrapper, declarativeString);
   const element = wrapper.querySelector('#theelement');
   return {wrapper: wrapper, element: element};
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" href="https://github.com/whatwg/dom/issues/831">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="support/helpers.js"></script>
 
 <div id="host" style="display:none">
   <template shadowroot="open">
@@ -32,14 +33,14 @@
 
 test(() => {
   const div = document.createElement('div');
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="open">
         <slot id="s1" name="slot1"></slot>
       </template>
       <div id="c1" slot="slot1"></div>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   const host = div.querySelector('#host');
   const c1 = host.querySelector('#c1');
   assert_true(!!c1);
@@ -53,12 +54,12 @@
 
 test(() => {
   const div = document.createElement('div');
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="invalid">
       </template>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   const host = div.querySelector('#host');
   assert_equals(host.shadowRoot, null, "Shadow root was found");
   const tmpl = host.querySelector('template');
@@ -69,12 +70,12 @@
 
 test(() => {
   const div = document.createElement('div');
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="closed">
       </template>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   const host = div.querySelector('#host');
   assert_equals(host.shadowRoot, null, "Closed shadow root");
   assert_equals(host.querySelector('template'), null, "No template - converted to shadow root");
@@ -82,12 +83,12 @@
 
 test(() => {
   const div = document.createElement('div');
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="open">
         <slot id="s1" name="slot1"></slot>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   const host = div.querySelector('#host');
   assert_equals(host.querySelector('#s1'), null, "Should be inside shadow root");
   assert_equals(host.querySelector('template'), null, "No leftover template node");
@@ -98,35 +99,25 @@
 
 test(() => {
   const div = document.createElement('div');
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="open" shadowrootdelegatesfocus>
       </template>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   var host = div.querySelector('#host');
   assert_true(!!host.shadowRoot,"No shadow root found");
   assert_true(host.shadowRoot.delegatesFocus,"delegatesFocus should be true");
-  div.setInnerHTML(`
+  setInnerHTML(div,`
     <div id="host">
       <template shadowroot="open">
       </template>
     </div>
-    `, {allowShadowRoot: true});
+    `);
   host = div.querySelector('#host');
   assert_true(!!host.shadowRoot,"No shadow root found");
   assert_false(host.shadowRoot.delegatesFocus,"delegatesFocus should be false without the shadowrootdelegatesfocus attribute");
 }, 'Declarative Shadow DOM: delegates focus attribute');
-
-test(() => {
-  const host = document.createElement('div');
-  // Root element of setInnerHTML is a <template shadowroot>:
-  host.setInnerHTML('<template shadowroot=open></template>', {allowShadowRoot: true});
-  assert_equals(host.shadowRoot, null, "Shadow root should not be present");
-  const tmpl = host.querySelector('template');
-  assert_true(!!tmpl,"Template should still be present");
-  assert_equals(tmpl.getAttribute('shadowroot'),"open","'shadowroot' attribute should still be present");
-}, 'Declarative Shadow DOM: setInnerHTML root element');
 </script>
 
 <div id="multi-host" style="display:none">
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" href="https://github.com/whatwg/dom/issues/831">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src='../resources/shadow-dom-utils.js'></script>
 
 <body>
 <style>
@@ -58,64 +59,48 @@
   assert_dsd(div,true);
 }, 'Non-fragment parsing needs no opt-in');
 
-test(() => {
-  const div = document.createElement('div');
-  div.innerHTML = content;
-  assert_dsd(div,false);
-}, 'innerHTML on element - disallowed');
-
-test(() => {
-  const div = document.createElement('div');
-  div.setInnerHTML(content);
-  assert_dsd(div,false);
-  div.setInnerHTML(content, {allowShadowRoot: false});
-  assert_dsd(div,false);
-  div.setInnerHTML(content, {allowShadowRoot: true});
-  assert_dsd(div,true);
-}, 'setInnerHTML on element');
-
-test(() => {
-  const templateContent = `<template id=tmpl>${content}</template>`;
-  const div = document.createElement('div');
-  div.innerHTML = templateContent;
-  assert_dsd(div.querySelector('#tmpl').content,false);
-  div.setInnerHTML(templateContent, {allowShadowRoot: true});
-  assert_dsd(div.querySelector('#tmpl').content,true);
-}, 'setInnerHTML on element, with nested template content');
+const noChildElements = ['iframe','noscript','script','select','style','textarea','title','colgroup'];
+const elements = HTML5_ELEMENT_NAMES.filter(el => !noChildElements.includes(el));
+for (let elementName of elements) {
+  var t = test(function() {
+    const el1 = document.createElement(elementName);
+    el1.innerHTML = content;
+    assert_dsd(el1,false);
+
+    const templateContent = `<template id=tmpl>${content}</template>`;
+    const el2 = document.createElement('div');
+    el2.innerHTML = templateContent;
+    assert_dsd(el2.querySelector('#tmpl').content,false);
+  }, `innerHTML on a <${elementName}>`);
+}
 
 test(() => {
   const temp = document.createElement('template');
   temp.innerHTML = content;
   assert_dsd(temp.content,false, 'innerHTML should not allow declarative shadow content');
-  temp.setInnerHTML(content, {allowShadowRoot: true});
-  assert_dsd(temp.content,true, 'setInnerHTML should allow declarative shadow content if enabled');
-}, 'setInnerHTML on template');
+}, 'innerHTML on template');
 
 test(() => {
   const templateContent = `<template id=tmpl>${content}</template>`;
   const temp = document.createElement('template');
   temp.innerHTML = templateContent;
   assert_dsd(temp.content.querySelector('#tmpl').content,false);
-  temp.setInnerHTML(templateContent, {allowShadowRoot: true});
-  assert_dsd(temp.content.querySelector('#tmpl').content,true);
-}, 'setInnerHTML on template, with nested template content');
+}, 'innerHTML on template, with nested template content');
 
 test(() => {
   const div = document.createElement('div');
   const shadow = div.attachShadow({mode: 'open'});
   shadow.innerHTML = content;
   assert_dsd(shadow,false);
-  shadow.setInnerHTML(content, {allowShadowRoot: true});
-  assert_dsd(shadow,true);
-}, 'setInnerHTML on shadowRoot');
+}, 'innerHTML on shadowRoot');
 
 test(() => {
   const parser = new DOMParser();
   let fragment = parser.parseFromString(content, 'text/html');
   assert_dsd(fragment.body,false);
-  fragment = parser.parseFromString(content, 'text/html', {allowShadowRoot: false});
+  fragment = parser.parseFromString(content, 'text/html', {includeShadowRoots: false});
   assert_dsd(fragment.body,false);
-  fragment = parser.parseFromString(content, 'text/html', {allowShadowRoot: true});
+  fragment = parser.parseFromString(content, 'text/html', {includeShadowRoots: true});
   assert_dsd(fragment.body,true);
 }, 'DOMParser');
 
@@ -123,9 +108,7 @@
   const doc = document.implementation.createHTMLDocument('');
   doc.body.innerHTML = content;
   assert_dsd(doc.body,false);
-  doc.body.setInnerHTML(content, {allowShadowRoot: true});
-  assert_dsd(doc.body,true);
-}, 'createHTMLDocument with setInnerHTML');
+}, 'createHTMLDocument with innerHTML - not supported');
 
 test(() => {
   const doc = document.implementation.createHTMLDocument('');
@@ -145,7 +128,7 @@
   client.open("GET", `data:text/html,${content}`);
   client.responseType = 'document';
   client.send();
-}, 'XMLHttpRequest, disabled');
+}, 'XMLHttpRequest - not supported');
 
 test(() => {
   const div = document.createElement('div');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/getinnerhtml.tentative.html firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/getinnerhtml.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/getinnerhtml.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/getinnerhtml.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -9,12 +9,20 @@
 <body>
 
 <script>
-function testElementType(allowsShadowDom, elementType, mode, delegatesFocus) {
-  var t = test(t => {
+function testElementType(allowsShadowDom, elementType, applyToShadow, mode, delegatesFocus) {
+  const t = test(t => {
     // Create and attach element
-    const wrapper = document.createElement('div');
-    t.add_cleanup(function() { wrapper.remove(); });
-    document.body.appendChild(wrapper);
+    let wrapper;
+    if (applyToShadow) {
+      const host = document.createElement('div');
+      t.add_cleanup(function() { host.remove(); });
+      document.body.appendChild(host);
+      wrapper = host.attachShadow({mode: 'open'});
+    } else {
+      wrapper = document.createElement('div');
+      t.add_cleanup(function() { wrapper.remove(); });
+      document.body.appendChild(wrapper);
+    }
     const element = document.createElement(elementType);
     wrapper.appendChild(element);
 
@@ -44,7 +52,7 @@
     // Either way, make sure getInnerHTML({includeShadowRoots: false}) matches .innerHTML
     assert_equals(wrapper.getInnerHTML({includeShadowRoots: false}),wrapper.innerHTML,'getInnerHTML() with includeShadowRoots false should return the same as .innerHTML');
 
-  }, `getInnerHTML() on <${elementType}>${allowsShadowDom ? `, with mode=${mode}, delegatesFocus=${delegatesFocus}.` : ''}`);
+  }, `${applyToShadow ? 'ShadowRoot' : 'Element'}.getInnerHTML() on <${elementType}>${allowsShadowDom ? `, with mode=${mode}, delegatesFocus=${delegatesFocus}.` : ''}`);
 }
 
 function runAllTests() {
@@ -52,14 +60,16 @@
   const safelisted = ATTACHSHADOW_SAFELISTED_ELEMENTS;
   for (const elementName of allElements) {
     const allowsShadowDom = safelisted.includes(elementName);
-    if (allowsShadowDom) {
-      for (const delegatesFocus of [false, true]) {
-        for (const mode of ['open', 'closed']) {
-          testElementType(true, elementName, mode, delegatesFocus);
+    for (const applyToShadow of [false, true]) {
+      if (allowsShadowDom) {
+        for (const delegatesFocus of [false, true]) {
+          for (const mode of ['open', 'closed']) {
+            testElementType(true, elementName, applyToShadow, mode, delegatesFocus);
+          }
         }
+      } else {
+        testElementType(false, elementName, applyToShadow);
       }
-    } else {
-      testElementType(false, elementName);
     }
   }
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/setinnerhtml.tentative.html firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/setinnerhtml.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/setinnerhtml.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/setinnerhtml.tentative.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<title>getInnerHTML </title>
-<link rel='author' title='Mason Freed' href='mailto:masonfreed@chromium.org'>
-<link rel='help' href='https://github.com/whatwg/dom/issues/831'>
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src='../resources/shadow-dom-utils.js'></script>
-
-<body>
-<script>
-function testElementType(allowsShadowDom, elementType) {
-  var t = test(t => {
-    // Create and attach element
-    const wrapper = document.createElement('div');
-    t.add_cleanup(function() { wrapper.remove(); });
-    document.body.appendChild(wrapper);
-
-    const html = `<${elementType}><template shadowroot="open"><slot></slot></template><span></span></${elementType}>`;
-    wrapper.setInnerHTML(html, {allowShadowRoot: true});
-    if (allowsShadowDom) {
-      // Retrieve shadow root
-      assert_true(!!wrapper.firstElementChild.shadowRoot,'No shadow root found');
-    } else {
-      const leftover = wrapper.firstElementChild.firstElementChild;
-      assert_true(wrapper.firstElementChild.childElementCount == 0 || leftover instanceof HTMLTemplateElement,'Template should be left over (or no children)');
-    }
-  }, `setInnerHTML() on <${elementType}>${allowsShadowDom ? `, with declarative Shadow DOM.` : ''}`);
-}
-
-function runAllTests() {
-  const allElements = [...HTML5_ELEMENT_NAMES, 'htmlunknown'].filter(item => item !== 'body');
-  const safelisted = ATTACHSHADOW_SAFELISTED_ELEMENTS;
-  for (const elementName of allElements) {
-    testElementType(safelisted.includes(elementName), elementName);
-  }
-}
-
-runAllTests();
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/support/helpers.js firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/support/helpers.js
--- firefox-84.0.2+build1/testing/web-platform/tests/shadow-dom/declarative/support/helpers.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/shadow-dom/declarative/support/helpers.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,4 @@
+function setInnerHTML(el,content) {
+  const fragment = (new DOMParser()).parseFromString(`<pre>${content}</pre>`, 'text/html', {includeShadowRoots: true});
+  (el instanceof HTMLTemplateElement ? el.content : el).replaceChildren(...fragment.body.firstChild.childNodes);
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/README.md firefox-85.0+build1/testing/web-platform/tests/signed-exchange/README.md
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/README.md	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/README.md	2021-01-18 19:58:24.000000000 +0000
@@ -19,4 +19,5 @@
 To install them, run:
 ```
 go get -u github.com/WICG/webpackage/go/signedexchange/cmd/...
+export PATH=$PATH:$(go env GOPATH)/bin
 ```
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -31,7 +31,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -31,7 +31,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_fetch_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -33,7 +33,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -53,7 +53,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -31,7 +31,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -51,7 +51,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -32,7 +32,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -28,7 +28,7 @@
         phase: "sxg",
         type: "sxg.cert_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -31,7 +31,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -54,7 +54,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
         phase: "sxg",
         type: "sxg.invalid_integrity_header",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -36,7 +36,7 @@
         phase: "sxg",
         type: "sxg.mi_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -56,7 +56,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -27,7 +27,7 @@
         phase: "sxg",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -47,7 +47,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -35,7 +35,7 @@
         phase: "sxg",
         type: "sxg.parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           cert_url: []
@@ -53,7 +53,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -32,7 +32,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -28,7 +28,7 @@
         phase: "sxg",
         type: "sxg.signature_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -28,7 +28,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_fetch_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -30,7 +30,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -50,7 +50,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -28,7 +28,7 @@
         // the report must not be downgraded.
         type: "sxg.cert_parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -48,7 +48,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -25,7 +25,7 @@
         phase: "sxg",
         type: "sxg.cert_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -45,7 +45,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -52,7 +52,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -26,7 +26,7 @@
         phase: "sxg",
         type: "sxg.invalid_integrity_header",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -46,7 +46,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -26,7 +26,7 @@
         phase: "sxg",
         type: "sxg.mi_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -46,7 +46,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -24,7 +24,7 @@
         phase: "sxg",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -44,7 +44,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -24,7 +24,7 @@
         phase: "sxg",
         type: "sxg.parse_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           cert_url: []
@@ -42,7 +42,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
         type: "sxg.failed",
         elapsed_time: 0,
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -49,7 +49,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -25,7 +25,7 @@
         phase: "sxg",
         type: "sxg.signature_verification_error",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
         sxg: {
           outer_url: sxg_url,
           inner_url:
@@ -45,7 +45,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href,
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh firefox-85.0+build1/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh	2021-01-18 19:58:24.000000000 +0000
@@ -19,6 +19,7 @@
     if ! command -v $cmd > /dev/null 2>&1; then
         echo "$cmd is not installed. Please run:"
         echo "  go get -u github.com/WICG/webpackage/go/signedexchange/cmd/..."
+        echo '  export PATH=$PATH:$(go env GOPATH)/bin'
         exit 1
     fi
 done
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/subresource/sxg-subresource-header-integrity-mismatch.tentative.html	2021-01-18 19:58:24.000000000 +0000
@@ -41,7 +41,7 @@
         phase: "application",
         type: "ok",
         status_code: 200,
-        referrer: location.href
+        referrer: location.origin + '/',
       },
       metadata: {
         content_type: "application/reports+json",
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-remote-logical.tentative.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -16,7 +16,7 @@
       origin: REMOTE_ORIGIN,
       sxg: REMOTE_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: REMOTE_ORIGIN,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-remote-physical-same-logical.tentative.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       origin: REMOTE_ORIGIN,
       sxg: SAME_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: REMOTE_ORIGIN,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/signed-exchange/sxg-referrer-same-physical-remote-logical.tentative.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
       origin: SAME_ORIGIN,
       sxg: REMOTE_ORIGIN_SXG,
       referrerPolicy: undefined,
-      expectedReferrer: document.location.href
+      expectedReferrer: document.location.origin + '/'
     },
     {
       origin: SAME_ORIGIN,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/storage/buckets/buckets_basic.tentative.https.any.js firefox-85.0+build1/testing/web-platform/tests/storage/buckets/buckets_basic.tentative.https.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/storage/buckets/buckets_basic.tentative.https.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/storage/buckets/buckets_basic.tentative.https.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,84 @@
+// META: title=Buckets API: Basic tests for openOrCreate(), keys(), delete().
+// META: global=window,worker
+
+'use strict';
+
+// This test is for initial IDL version optimized for debugging.
+// Split and add extensive testing once implementation for the endpoints are
+// added and method definitions are more defined.
+promise_test(async testCase => {
+  await navigator.storageBuckets.openOrCreate('bucket_name');
+  testCase.add_cleanup(async () => {
+    await navigator.storageBuckets.delete('bucket_name');
+  });
+
+  const buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 1);
+  assert_equals(buckets[0], 'bucket_name');
+}, 'openOrCreate() stores bucket name');
+
+promise_test(async testCase => {
+  await navigator.storageBuckets.openOrCreate('bucket_name');
+  await navigator.storageBuckets.openOrCreate('bucket_name');
+  testCase.add_cleanup(async () => {
+    await navigator.storageBuckets.delete('bucket_name');
+  });
+
+  const buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 1);
+  assert_equals(buckets[0], 'bucket_name');
+}, 'openOrCreate() does not store duplicate bucket name');
+
+promise_test(async testCase => {
+  await navigator.storageBuckets.openOrCreate('bucket_name3');
+  await navigator.storageBuckets.openOrCreate('bucket_name1');
+  await navigator.storageBuckets.openOrCreate('bucket_name2');
+  testCase.add_cleanup(async () => {
+    await navigator.storageBuckets.delete('bucket_name1');
+    await navigator.storageBuckets.delete('bucket_name2');
+    await navigator.storageBuckets.delete('bucket_name3');
+  });
+
+  const buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 3);
+  assert_equals(buckets[0], 'bucket_name1');
+  assert_equals(buckets[1], 'bucket_name2');
+  assert_equals(buckets[2], 'bucket_name3');
+}, 'keys() lists all stored bucket names alphabetically');
+
+promise_test(async testCase => {
+  await navigator.storageBuckets.openOrCreate('bucket_name1');
+  await navigator.storageBuckets.openOrCreate('bucket_name2');
+  testCase.add_cleanup(async () => {
+    await navigator.storageBuckets.delete('bucket_name1');
+    await navigator.storageBuckets.delete('bucket_name2');
+  });
+
+  let buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 2);
+  assert_equals(buckets[0], 'bucket_name1');
+  assert_equals(buckets[1], 'bucket_name2');
+
+  await navigator.storageBuckets.delete('bucket_name1');
+
+  buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 1);
+  assert_equals(buckets[0], 'bucket_name2');
+}, 'delete() removes stored bucket name');
+
+promise_test(async testCase => {
+  await navigator.storageBuckets.openOrCreate('bucket_name');
+  testCase.add_cleanup(async () => {
+    await navigator.storageBuckets.delete('bucket_name');
+  });
+
+  let buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 1);
+  assert_equals(buckets[0], 'bucket_name');
+
+  await navigator.storageBuckets.delete('does-not-exist');
+
+  buckets = await navigator.storageBuckets.keys();
+  assert_equals(buckets.length, 1);
+  assert_equals(buckets[0], 'bucket_name');
+}, 'delete() does nothing if bucket name does not exist');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/storage/buckets/META.yml firefox-85.0+build1/testing/web-platform/tests/storage/buckets/META.yml
--- firefox-84.0.2+build1/testing/web-platform/tests/storage/buckets/META.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/storage/buckets/META.yml	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,5 @@
+spec: https://github.com/WICG/storage-buckets
+suggested_reviewers:
+  - ayui
+  - jsbell
+  - pwnall
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js firefox-85.0+build1/testing/web-platform/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -212,8 +212,7 @@
 
       c.close();
 
-      const zeroLengthView = new Uint8Array(view.buffer, 0, 0);
-      assert_throws_js(TypeError, () => c.byobRequest.respondWithNewView(zeroLengthView));
+      assert_throws_js(TypeError, () => c.byobRequest.respondWithNewView(view));
     }),
     type: 'bytes'
   });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/azure/install_python.yml firefox-85.0+build1/testing/web-platform/tests/tools/ci/azure/install_python.yml
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/azure/install_python.yml	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/azure/install_python.yml	2021-01-18 19:58:24.000000000 +0000
@@ -1,15 +1,36 @@
 steps:
 - powershell: |
-    Start-BitsTransfer -Source https://www.python.org/ftp/python/2.7.15/python-2.7.15.amd64.msi -Destination python.msi
-    $hash = (Get-FileHash python.msi).Hash.ToLower()
-    $expectedHash = "5e85f3c4c209de98480acbf2ba2e71a907fd5567a838ad4b6748c76deb286ad7"
+    $pythonPath = 'C:\Python38'
+    $pythonInstallerLogPath = 'python_installer.log'
+    $installArgs = "/passive /log $pythonInstallerLogPath TargetDir=$pythonPath"
+
+    Write-Host "Downloading python installer exe"
+    $downloadPath = 'python_installer.exe'
+    Start-BitsTransfer -Source https://www.python.org/ftp/python/3.8.5/python-3.8.5-amd64.exe  -Destination $downloadPath
+    $hash = (Get-FileHash $downloadPath).Hash.ToLower()
+    $expectedHash = "cd427c7b17337d7c13761ca20877d2d8be661bd30415ddc17072a31a65a91b64"
     if ($hash.Equals($expectedHash)) {
-      Write-Host "python.msi hash verified"
+      Write-Host "$downloadPath hash verified"
     } else {
-      Throw "python.msi hash mismatch, got $hash, expected $expectedHash"
+      Throw "$downloadPath hash mismatch, got $hash, expected $expectedHash"
     }
-    msiexec /i python.msi TARGETDIR=C:\Python27 /q
-    Write-Host "##vso[task.prependpath]C:\Python27"
-    Write-Host "##vso[task.prependpath]C:\Python27\Scripts"
+
+    if (Test-Path -LiteralPath $pythonPath) {
+        Write-Host "$pythonPath already exists, uninstall it"
+        $uninstallArgs = $installArgs + " /uninstall /quiet"
+        $p = Start-Process -FilePath $downloadPath -Verb RunAs -ArgumentList $uninstallArgs -PassThru -Wait
+        Write-Host "Uninstall finished. Exit code was: $($p.ExitCode)"
+    }
+
+    Write-Host "Running $downloadPath with args $installArgs"
+    $p = Start-Process -FilePath $downloadPath -Verb RunAs -ArgumentList $installArgs -PassThru -Wait
+    Write-Host "$downloadPath finished. Exit code was: $($p.ExitCode)"
+
+    Write-Host "Adding Python dirs to path"
+    Write-Host "##vso[task.prependpath]C:\Python38"
+    Write-Host "##vso[task.prependpath]C:\Python38\Scripts"
+
+    Write-Host "Dumping install log file:"
+    Get-Content -Path "python_installer.log"
   displayName: 'Install Python (Windows)'
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/azure/safari-technology-preview.rb firefox-85.0+build1/testing/web-platform/tests/tools/ci/azure/safari-technology-preview.rb
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/azure/safari-technology-preview.rb	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/azure/safari-technology-preview.rb	2021-01-18 19:58:24.000000000 +0000
@@ -1,10 +1,10 @@
 cask "safari-technology-preview" do
   if MacOS.version <= :catalina
-    version "115,001-62651-20201022-6cd92e18-bfbe-48cc-9385-d84da8f3c24c"
-    sha256 "e4b29ac2a0d60e48bae7d9c635853ff7dadc59a82dd53f340b623eeb5538f657"
+    version "116,001-82546-20201119-d46bca22-a3dc-43c3-9fcf-29f7343956ac"
+    sha256 "37a631632e2d449ce5dfb117d0eb7fd14574f00ca306c27667ffbbe6b1c0bc68"
   else
-    version "115,001-62679-20201022-42e0d63a-527a-45af-beb1-02cd4095e341"
-    sha256 "815276ca814e49a6b2e8eb8429d6e6644de2db89527fbbce83cb9d69f54783f7"
+    version "116,001-69966-20201119-d87990cd-c094-40a8-a616-a4497506caed"
+    sha256 "64b82eb45729ee366272da25849039762c5382373ebedbad30168d80a06ec6b7"
   end
 
   url "https://secure-appldnld.apple.com/STP/#{version.after_comma}/SafariTechnologyPreview.dmg"
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/taskcluster-run.py firefox-85.0+build1/testing/web-platform/tests/tools/ci/taskcluster-run.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/taskcluster-run.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/taskcluster-run.py	2021-01-18 19:58:24.000000000 +0000
@@ -62,7 +62,7 @@
     )
     logger.addHandler(handler)
 
-    subprocess.call(['python', './wpt', 'manifest-download'])
+    subprocess.call(['python3', './wpt', 'manifest-download'])
 
     if commit_range:
         logger.info(
@@ -88,7 +88,7 @@
     if product == "servo" and "--test-type=wdspec" in wpt_args:
         wpt_args = [item for item in wpt_args if not item.startswith("--processes")]
 
-    command = ["python", "./wpt", "run"] + wpt_args + [product]
+    command = ["python3", "./wpt", "run"] + wpt_args + [product]
 
     logger.info("Executing command: %s" % " ".join(command))
     with open("/home/test/artifacts/checkrun.md", "a") as f:
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_decision.py firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_decision.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_decision.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_decision.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,9 +1,16 @@
 import mock
 import pytest
+import os
+import sys
 
-from tools.ci.tc import decision
 from six import iteritems
 
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", "..", ".."))
+sys.path.insert(0, root)
+
+from tools.ci.tc import decision
+
 
 @pytest.mark.parametrize("run_jobs,tasks,expected", [
     ([], {"task-no-schedule-if": {}}, ["task-no-schedule-if"]),
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_taskgraph.py firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_taskgraph.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_taskgraph.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_taskgraph.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,12 @@
+import os
 import pytest
+import sys
 import yaml
 
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.ci.tc import taskgraph
 
 @pytest.mark.parametrize("data, update_data, expected", [
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/tc/tests/test_valid.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,7 @@
 import json
 import os
 from io import open
+import sys
 
 import jsone
 import mock
@@ -9,10 +10,11 @@
 import yaml
 from jsonschema import validate
 
-from tools.ci.tc import decision
-
 here = os.path.dirname(__file__)
 root = os.path.abspath(os.path.join(here, "..", "..", "..", ".."))
+sys.path.insert(0, root)
+
+from tools.ci.tc import decision
 
 
 def data_path(filename):
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tests/test_jobs.py firefox-85.0+build1/testing/web-platform/tests/tools/ci/tests/test_jobs.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/ci/tests/test_jobs.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/ci/tests/test_jobs.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,10 @@
+import os
+import sys
+
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.ci import jobs
 
 all_jobs = {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/docker/documentation/Dockerfile firefox-85.0+build1/testing/web-platform/tests/tools/docker/documentation/Dockerfile
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/docker/documentation/Dockerfile	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/docker/documentation/Dockerfile	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,3 @@
-FROM python:2-stretch
+FROM python:3.8-buster
 
-RUN apt-get update && apt-get install --yes git
+RUN apt-get update && apt-get install --yes git virtualenv
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/lint/tests/test_lint.py firefox-85.0+build1/testing/web-platform/tests/tools/lint/tests/test_lint.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/lint/tests/test_lint.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/lint/tests/test_lint.py	2021-01-18 19:58:24.000000000 +0000
@@ -6,9 +6,13 @@
 import mock
 import six
 
-from ...localpaths import repo_root
-from .. import lint as lint_mod
-from ..lint import filter_ignorelist_errors, parse_ignorelist, lint, create_parser
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
+from tools.localpaths import repo_root
+from tools.lint import lint as lint_mod
+from tools.lint.lint import filter_ignorelist_errors, parse_ignorelist, lint, create_parser
 
 _dummy_repo = os.path.join(os.path.dirname(__file__), "dummy")
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/manifest/tests/test_manifest.py firefox-85.0+build1/testing/web-platform/tests/tools/manifest/tests/test_manifest.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/manifest/tests/test_manifest.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/manifest/tests/test_manifest.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,5 @@
 import os
+import sys
 
 import mock
 
@@ -7,7 +8,11 @@
 
 from six import iteritems
 
-from .. import manifest, sourcefile, item, utils
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
+from tools.manifest import manifest, sourcefile, item, utils
 
 MYPY = False
 if MYPY:
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/doc/enum.pdf firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/doc/enum.pdf
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/doc/enum.pdf	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/doc/enum.pdf	1970-01-01 00:00:00.000000000 +0000
@@ -1,2237 +0,0 @@
-%PDF-1.4
-%“Œ‹ž ReportLab Generated PDF document http://www.reportlab.com
-1 0 obj
-<< /F1 2 0 R /F2 3 0 R /F3 4 0 R /F4 5 0 R /F5 8 0 R /F6 15 0 R >>
-endobj
-2 0 obj
-<< /BaseFont /Helvetica /Encoding /WinAnsiEncoding /Name /F1 /Subtype /Type1 /Type /Font >>
-endobj
-3 0 obj
-<< /BaseFont /Courier-Bold /Encoding /WinAnsiEncoding /Name /F2 /Subtype /Type1 /Type /Font >>
-endobj
-4 0 obj
-<< /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding /Name /F3 /Subtype /Type1 /Type /Font >>
-endobj
-5 0 obj
-<< /BaseFont /Courier /Encoding /WinAnsiEncoding /Name /F4 /Subtype /Type1 /Type /Font >>
-endobj
-6 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 335.1805 574.4272 405.2473 586.4272 ] /Subtype /Link /Type /Annot >>
-endobj
-7 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 255.9742 427.4272 321.5378 439.4272 ] /Subtype /Link /Type /Annot >>
-endobj
-8 0 obj
-<< /BaseFont /Helvetica-Oblique /Encoding /WinAnsiEncoding /Name /F5 /Subtype /Type1 /Type /Font >>
-endobj
-9 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 278.1236 0 ] /Rect [ 82.69291 182.2272 201.0729 194.2272 ] /Subtype /Link /Type /Annot >>
-endobj
-10 0 obj
-<< /Annots [ 6 0 R 7 0 R 9 0 R ] /Contents 56 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-11 0 obj
-<< /Contents 57 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-12 0 obj
-<< /Contents 58 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-13 0 obj
-<< /Contents 59 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-14 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 157.2236 0 ] /Rect [ 101.6029 741.7736 141.6229 753.7736 ] /Subtype /Link /Type /Annot >>
-endobj
-15 0 obj
-<< /BaseFont /Helvetica-BoldOblique /Encoding /WinAnsiEncoding /Name /F6 /Subtype /Type1 /Type /Font >>
-endobj
-16 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 25 0 R /XYZ 62.69291 359.6236 0 ] /Rect [ 327.1529 585.5736 392.7329 597.5736 ] /Subtype /Link /Type /Annot >>
-endobj
-17 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 22 0 R /XYZ 62.69291 639.3236 0 ] /Rect [ 181.1917 312.1736 246.4634 324.1736 ] /Subtype /Link /Type /Annot >>
-endobj
-18 0 obj
-<< /Annots [ 14 0 R 16 0 R 17 0 R ] /Contents 60 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-19 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 610.8236 0 ] /Rect [ 326.1329 511.3736 357.2629 523.3736 ] /Subtype /Link /Type /Annot >>
-endobj
-20 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 25 0 R /XYZ 62.69291 359.6236 0 ] /Rect [ 241.1229 185.9736 306.7029 197.9736 ] /Subtype /Link /Type /Annot >>
-endobj
-21 0 obj
-<< /Annots [ 19 0 R 20 0 R ] /Contents 61 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-22 0 obj
-<< /Contents 62 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-23 0 obj
-<< /Contents 63 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-24 0 obj
-<< /Contents 64 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-25 0 obj
-<< /Contents 65 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-26 0 obj
-<< /Contents 66 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 /Trans <<  >> 
-  /Type /Page >>
-endobj
-27 0 obj
-<< /Border [ 0 0 0 ] /Contents () /Dest [ 26 0 R /XYZ 62.69291 610.8236 0 ] /Rect [ 309.4094 299.5736 340.6461 311.5736 ] /Subtype /Link /Type /Annot >>
-endobj
-28 0 obj
-<< /Annots [ 27 0 R ] /Contents 67 0 R /MediaBox [ 0 0 595.2756 841.8898 ] /Parent 55 0 R /Resources << /Font 1 0 R /ProcSet [ /PDF /Text /ImageB /ImageC /ImageI ] >> /Rotate 0 
-  /Trans <<  >> /Type /Page >>
-endobj
-29 0 obj
-<< /Outlines 31 0 R /PageLabels 68 0 R /PageMode /UseNone /Pages 55 0 R /Type /Catalog >>
-endobj
-30 0 obj
-<< /Author () /CreationDate (D:20160515202831+08'00') /Creator (\(unspecified\)) /Keywords () /Producer (ReportLab PDF Library - www.reportlab.com) /Subject (\(unspecified\)) 
-  /Title (enum --- support for enumerations) >>
-endobj
-31 0 obj
-<< /Count 27 /First 32 0 R /Last 51 0 R /Type /Outlines >>
-endobj
-32 0 obj
-<< /Dest [ 10 0 R /XYZ 62.69291 660.6772 0 ] /Next 33 0 R /Parent 31 0 R /Title (Module Contents) >>
-endobj
-33 0 obj
-<< /Dest [ 10 0 R /XYZ 62.69291 477.6772 0 ] /Next 34 0 R /Parent 31 0 R /Prev 32 0 R /Title (Creating an Enum) >>
-endobj
-34 0 obj
-<< /Dest [ 11 0 R /XYZ 62.69291 197.0236 0 ] /Next 35 0 R /Parent 31 0 R /Prev 33 0 R /Title (Programmatic access to enumeration members and their attributes) >>
-endobj
-35 0 obj
-<< /Dest [ 12 0 R /XYZ 62.69291 501.4236 0 ] /Next 36 0 R /Parent 31 0 R /Prev 34 0 R /Title (Duplicating enum members and values) >>
-endobj
-36 0 obj
-<< /Dest [ 13 0 R /XYZ 62.69291 215.0236 0 ] /Next 37 0 R /Parent 31 0 R /Prev 35 0 R /Title (Comparisons) >>
-endobj
-37 0 obj
-<< /Dest [ 18 0 R /XYZ 62.69291 362.4236 0 ] /Next 38 0 R /Parent 31 0 R /Prev 36 0 R /Title (Allowed members and attributes of enumerations) >>
-endobj
-38 0 obj
-<< /Dest [ 21 0 R /XYZ 62.69291 498.6236 0 ] /Next 39 0 R /Parent 31 0 R /Prev 37 0 R /Title (Restricted subclassing of enumerations) >>
-endobj
-39 0 obj
-<< /Dest [ 21 0 R /XYZ 62.69291 173.2236 0 ] /Next 40 0 R /Parent 31 0 R /Prev 38 0 R /Title (Pickling) >>
-endobj
-40 0 obj
-<< /Dest [ 22 0 R /XYZ 62.69291 635.8236 0 ] /Next 41 0 R /Parent 31 0 R /Prev 39 0 R /Title (Functional API) >>
-endobj
-41 0 obj
-<< /Count 2 /Dest [ 22 0 R /XYZ 62.69291 187.2236 0 ] /First 42 0 R /Last 43 0 R /Next 44 0 R /Parent 31 0 R 
-  /Prev 40 0 R /Title (Derived Enumerations) >>
-endobj
-42 0 obj
-<< /Dest [ 22 0 R /XYZ 62.69291 154.2236 0 ] /Next 43 0 R /Parent 41 0 R /Title (IntEnum) >>
-endobj
-43 0 obj
-<< /Dest [ 23 0 R /XYZ 62.69291 217.4236 0 ] /Parent 41 0 R /Prev 42 0 R /Title (Others) >>
-endobj
-44 0 obj
-<< /Count 1 /Dest [ 24 0 R /XYZ 62.69291 567.0236 0 ] /First 45 0 R /Last 45 0 R /Next 46 0 R /Parent 31 0 R 
-  /Prev 41 0 R /Title (Decorators) >>
-endobj
-45 0 obj
-<< /Dest [ 24 0 R /XYZ 62.69291 534.0236 0 ] /Parent 44 0 R /Title (unique) >>
-endobj
-46 0 obj
-<< /Count 4 /Dest [ 24 0 R /XYZ 62.69291 356.8236 0 ] /First 47 0 R /Last 50 0 R /Next 51 0 R /Parent 31 0 R 
-  /Prev 44 0 R /Title (Interesting examples) >>
-endobj
-47 0 obj
-<< /Dest [ 24 0 R /XYZ 62.69291 281.8236 0 ] /Next 48 0 R /Parent 46 0 R /Title (AutoNumber) >>
-endobj
-48 0 obj
-<< /Dest [ 25 0 R /XYZ 62.69291 641.8236 0 ] /Next 49 0 R /Parent 46 0 R /Prev 47 0 R /Title (UniqueEnum) >>
-endobj
-49 0 obj
-<< /Dest [ 25 0 R /XYZ 62.69291 356.6236 0 ] /Next 50 0 R /Parent 46 0 R /Prev 48 0 R /Title (OrderedEnum) >>
-endobj
-50 0 obj
-<< /Dest [ 26 0 R /XYZ 62.69291 607.8236 0 ] /Parent 46 0 R /Prev 49 0 R /Title (Planet) >>
-endobj
-51 0 obj
-<< /Count 3 /Dest [ 26 0 R /XYZ 62.69291 274.6236 0 ] /First 52 0 R /Last 54 0 R /Parent 31 0 R /Prev 46 0 R 
-  /Title (How are Enums different?) >>
-endobj
-52 0 obj
-<< /Dest [ 26 0 R /XYZ 62.69291 211.6236 0 ] /Next 53 0 R /Parent 51 0 R /Title (Enum Classes) >>
-endobj
-53 0 obj
-<< /Dest [ 28 0 R /XYZ 62.69291 664.0236 0 ] /Next 54 0 R /Parent 51 0 R /Prev 52 0 R /Title (Enum Members \(aka instances\)) >>
-endobj
-54 0 obj
-<< /Dest [ 28 0 R /XYZ 62.69291 592.0236 0 ] /Parent 51 0 R /Prev 53 0 R /Title (Finer Points) >>
-endobj
-55 0 obj
-<< /Count 12 /Kids [ 10 0 R 11 0 R 12 0 R 13 0 R 18 0 R 21 0 R 22 0 R 23 0 R 24 0 R 25 0 R 
-  26 0 R 28 0 R ] /Type /Pages >>
-endobj
-56 0 obj
-<< /Length 6458 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-q
-BT 1 0 0 1 0 4 Tm 73.71488 0 Td 24 TL /F2 20 Tf 0 0 0 rg (enum ) Tj /F3 20 Tf 0 0 0 rg (--- support for enumerations) Tj T* -73.71488 0 Td ET
-Q
-Q
-q
-1 0 0 1 62.69291 702.6772 cm
-n 0 14.17323 m 469.8898 14.17323 l S
-Q
-q
-1 0 0 1 62.69291 672.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 2.091318 Tw 12 TL /F1 10 Tf 0 0 0 rg (An enumeration is a set of symbolic names \(members\) bound to unique, constant values. Within an) Tj T* 0 Tw (enumeration, the members can be compared by identity, and the enumeration itself can be iterated over.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 639.6772 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Module Contents) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 609.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 2.027485 Tw 12 TL /F1 10 Tf 0 0 0 rg (This module defines two enumeration classes that can be used to define unique sets of names and) Tj T* 0 Tw (values: ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (IntEnum) Tj /F1 10 Tf 0 0 0 rg (. It also defines one decorator, ) Tj /F4 10 Tf 0 0 0 rg (unique) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 591.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (Enum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 561.6772 cm
-q
-BT 1 0 0 1 0 14 Tm 1.128443 Tw 12 TL /F1 10 Tf 0 0 0 rg (Base class for creating enumerated constants. See section ) Tj 0 0 .501961 rg (Functional API ) Tj 0 0 0 rg (for an alternate construction) Tj T* 0 Tw (syntax.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 543.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (IntEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 525.6772 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (Base class for creating enumerated constants that are also subclasses of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 507.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F4 10 Tf 12 TL (unique) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 489.6772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enum class decorator that ensures only one name is bound to any one value.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 456.6772 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Creating an Enum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 414.6772 cm
-q
-BT 1 0 0 1 0 26 Tm 2.432651 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enumerations are created using the ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (syntax, which makes them easy to read and write. An) Tj T* 0 Tw .533555 Tw (alternative creation method is described in ) Tj 0 0 .501961 rg (Functional API) Tj 0 0 0 rg (. To define an enumeration, subclass ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (as) Tj T* 0 Tw (follows:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 333.4772 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import Enum) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(Enum\):) Tj T* (...     red = 1) Tj T* (...     green = 2) Tj T* (...     blue = 3) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 313.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note: Nomenclature) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 307.4772 cm
-Q
-q
-1 0 0 1 62.69291 229.4772 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 72 cm
-Q
-q
-1 0 0 1 20 72 cm
-Q
-q
-1 0 0 1 20 60 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 -3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The class ) Tj /F4 10 Tf 0 0 0 rg (Color ) Tj /F1 10 Tf 0 0 0 rg (is an ) Tj /F5 10 Tf (enumeration ) Tj /F1 10 Tf (\(or ) Tj /F5 10 Tf (enum) Tj /F1 10 Tf (\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 54 cm
-Q
-q
-1 0 0 1 20 30 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 5.568863 Tw 12 TL /F1 10 Tf 0 0 0 rg (The attributes ) Tj /F4 10 Tf 0 0 0 rg (Color.red) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (Color.green) Tj /F1 10 Tf 0 0 0 rg (, etc., are ) Tj /F5 10 Tf (enumeration members ) Tj /F1 10 Tf (\(or ) Tj /F5 10 Tf (enum) Tj T* 0 Tw (members) Tj /F1 10 Tf (\).) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 24 cm
-Q
-q
-1 0 0 1 20 0 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 1.471318 Tw 12 TL /F1 10 Tf 0 0 0 rg (The enum members have ) Tj /F5 10 Tf (names ) Tj /F1 10 Tf (and ) Tj /F5 10 Tf (values ) Tj /F1 10 Tf (\(the name of ) Tj /F4 10 Tf 0 0 0 rg (Color.red ) Tj /F1 10 Tf 0 0 0 rg (is ) Tj /F4 10 Tf 0 0 0 rg (red) Tj /F1 10 Tf 0 0 0 rg (, the value of) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (Color.blue ) Tj /F1 10 Tf 0 0 0 rg (is ) Tj /F4 10 Tf 0 0 0 rg (3) Tj /F1 10 Tf 0 0 0 rg (, etc.\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 0 cm
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 229.4772 cm
-Q
-q
-1 0 0 1 62.69291 211.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 205.4772 cm
-Q
-q
-1 0 0 1 62.69291 181.4772 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 14 Tm .126235 Tw 12 TL /F1 10 Tf 0 0 0 rg (Even though we use the ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (syntax to create Enums, Enums are not normal Python classes. See) Tj T* 0 Tw 0 0 .501961 rg (How are Enums different? ) Tj 0 0 0 rg (for more details.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 181.4772 cm
-Q
-q
-1 0 0 1 62.69291 163.4772 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members have human readable string representations:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 118.2772 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(Color.red\)) Tj T* (Color.red) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 98.27717 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (...while their ) Tj /F4 10 Tf 0 0 0 rg (repr ) Tj /F1 10 Tf 0 0 0 rg (has more information:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-57 0 obj
-<< /Length 4174 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(repr\(Color.red\)\)) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 707.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F5 10 Tf (type ) Tj /F1 10 Tf (of an enumeration member is the enumeration it belongs to:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 626.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( type\(Color.red\)) Tj T* (<) Tj (enum 'Color') Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( isinstance\(Color.green, Color\)) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 606.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enum members also have a property that contains just their item name:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 561.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( print\(Color.red.name\)) Tj T* (red) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 529.4236 cm
-q
-BT 1 0 0 1 0 14 Tm .464985 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enumerations support iteration. In Python 3.x definition order is used; in Python 2.x the definition order is) Tj T* 0 Tw (not available, but class attribute ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (is supported; otherwise, value order is used:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 340.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 180 re B*
-Q
-q
-BT 1 0 0 1 0 158 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shake\(Enum\):) Tj T* (...   __order__ = 'vanilla chocolate cookies mint'  # only needed in 2.x) Tj T* (...   vanilla = 7) Tj T* (...   chocolate = 4) Tj T* (...   cookies = 9) Tj T* (...   mint = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( for shake in Shake:) Tj T* (...   print\(shake\)) Tj T* (...) Tj T* (Shake.vanilla) Tj T* (Shake.chocolate) Tj T* (Shake.cookies) Tj T* (Shake.mint) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 308.2236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.893735 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (attribute is always removed, and in 3.x it is also ignored \(order is definition order\);) Tj T* 0 Tw (however, in the stdlib version it will be ignored but not removed.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 290.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members are hashable, so they can be used in dictionaries and sets:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 209.0236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( apples = {}) Tj T* (>) Tj (>) Tj (>) Tj ( apples[Color.red] = 'red delicious') Tj T* (>) Tj (>) Tj (>) Tj ( apples[Color.green] = 'granny smith') Tj T* (>) Tj (>) Tj (>) Tj ( apples == {Color.red: 'red delicious', Color.green: 'granny smith'}) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 155.0236 cm
-q
-BT 1 0 0 1 0 24.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Programmatic access to enumeration members and) Tj T* (their attributes) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 113.0236 cm
-q
-BT 1 0 0 1 0 26 Tm 3.541797 Tw 12 TL /F1 10 Tf 0 0 0 rg (Sometimes it's useful to access members in enumerations programmatically \(i.e. situations where) Tj T* 0 Tw .922651 Tw /F4 10 Tf 0 0 0 rg (Color.red ) Tj /F1 10 Tf 0 0 0 rg (won't do because the exact color is not known at program-writing time\). ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (allows such) Tj T* 0 Tw (access:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-58 0 obj
-<< /Length 3791 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 703.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color\(1\)) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Color\(3\)) Tj T* (<) Tj (Color.blue: 3) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 683.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If you want to access enum members by ) Tj /F5 10 Tf (name) Tj /F1 10 Tf (, use item access:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 614.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color['red']) Tj T* (<) Tj (Color.red: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Color['green']) Tj T* (<) Tj (Color.green: 2) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 594.6236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If have an enum member and need its ) Tj /F4 10 Tf 0 0 0 rg (name ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (value) Tj /F1 10 Tf 0 0 0 rg (:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 513.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( member = Color.red) Tj T* (>) Tj (>) Tj (>) Tj ( member.name) Tj T* ('red') Tj T* (>) Tj (>) Tj (>) Tj ( member.value) Tj T* (1) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 480.4236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Duplicating enum members and values) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 450.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .13832 Tw (Having two enum members \(or any other attribute\) with the same name is invalid; in Python 3.x this would) Tj T* 0 Tw (raise an error, but in Python 2.x the second member simply overwrites the first:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 249.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 192 re B*
-Q
-q
-BT 1 0 0 1 0 170 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( # python 2.x) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   square = 2) Tj T* (...   square = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.square) Tj T* (<) Tj (Shape.square: 3) Tj (>) Tj  T*  T* (>) Tj (>) Tj (>) Tj ( # python 3.x) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   square = 2) Tj T* (...   square = 3) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (TypeError: Attempted to reuse key: 'square') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 205.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 26 Tm /F1 10 Tf 12 TL .384987 Tw (However, two enum members are allowed to have the same value. Given two members A and B with the) Tj T* 0 Tw .444772 Tw (same value \(and A defined first\), B is an alias to A. By-value lookup of the value of A and B will return A.) Tj T* 0 Tw (By-name lookup of B will also return A:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 88.02362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 492 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shape\(Enum\):) Tj T* (...   __order__ = 'square diamond circle alias_for_square'  # only needed in 2.x) Tj T* (...   square = 2) Tj T* (...   diamond = 1) Tj T* (...   circle = 3) Tj T* (...   alias_for_square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.square) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-59 0 obj
-<< /Length 4406 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 691.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (<) Tj (Shape.square: 2) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Shape.alias_for_square) Tj T* (<) Tj (Shape.square: 2) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Shape\(2\)) Tj T* (<) Tj (Shape.square: 2) Tj (>) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 659.8236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.074104 Tw 12 TL /F1 10 Tf 0 0 0 rg (Allowing aliases is not always desirable. ) Tj /F4 10 Tf 0 0 0 rg (unique ) Tj /F1 10 Tf 0 0 0 rg (can be used to ensure that none exist in a particular) Tj T* 0 Tw (enumeration:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 506.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 144 re B*
-Q
-q
-BT 1 0 0 1 0 122 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import unique) Tj T* (>) Tj (>) Tj (>) Tj ( @unique) Tj T* (... class Mistake\(Enum\):) Tj T* (...   __order__ = 'one two three four'  # only needed in 2.x) Tj T* (...   one = 1) Tj T* (...   two = 2) Tj T* (...   three = 3) Tj T* (...   four = 3) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: duplicate names found in ) Tj (<) Tj (enum 'Mistake') Tj (>) Tj (: four -) Tj (>) Tj ( three) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 486.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Iterating over the members of an enum does not provide the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 441.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( list\(Shape\)) Tj T* ([) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (, ) Tj (<) Tj (Shape.diamond: 1) Tj (>) Tj (, ) Tj (<) Tj (Shape.circle: 3) Tj (>) Tj (]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 409.4236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.307126 Tw 12 TL /F1 10 Tf 0 0 0 rg (The special attribute ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is a dictionary mapping names to members. It includes all names) Tj T* 0 Tw (defined in the enumeration, including the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 304.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 96 re B*
-Q
-q
-BT 1 0 0 1 0 74 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( for name, member in sorted\(Shape.__members__.items\(\)\):) Tj T* (...   name, member) Tj T* (...) Tj T* (\('alias_for_square', ) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (\)) Tj T* (\('circle', ) Tj (<) Tj (Shape.circle: 3) Tj (>) Tj (\)) Tj T* (\('diamond', ) Tj (<) Tj (Shape.diamond: 1) Tj (>) Tj (\)) Tj T* (\('square', ) Tj (<) Tj (Shape.square: 2) Tj (>) Tj (\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 272.2236 cm
-q
-BT 1 0 0 1 0 14 Tm .080751 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (attribute can be used for detailed programmatic access to the enumeration members.) Tj T* 0 Tw (For example, finding all the aliases:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 227.0236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 486 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( [name for name, member in Shape.__members__.items\(\) if member.name != name]) Tj T* (['alias_for_square']) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 194.0236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Comparisons) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 176.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumeration members are compared by identity:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 82.82362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.red is Color.red) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Color.red is Color.blue) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Color.red is not Color.blue) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-60 0 obj
-<< /Length 4521 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.131647 Tw 12 TL /F1 10 Tf 0 0 0 rg (Ordered comparisons between enumeration values are ) Tj /F5 10 Tf (not ) Tj /F1 10 Tf (supported. Enum members are not integers) Tj T* 0 Tw (\(but see ) Tj 0 0 .501961 rg (IntEnum ) Tj 0 0 0 rg (below\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 671.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 60 re B*
-Q
-q
-BT 1 0 0 1 0 38 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.red ) Tj (<) Tj ( Color.blue) Tj T* (Traceback \(most recent call last\):) Tj T* (  File ") Tj (<) Tj (stdin) Tj (>) Tj (", line 1, in ) Tj (<) Tj (module) Tj (>) Tj  T* (TypeError: unorderable types: Color\(\) ) Tj (<) Tj ( Color\(\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 651.8236 cm
-Q
-q
-1 0 0 1 62.69291 568.8236 cm
-.960784 .960784 .862745 rg
-n 0 83 469.8898 -83 re f*
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 6 57 Tm  T* ET
-q
-1 0 0 1 16 52 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2.5 Tm /F6 12.5 Tf 15 TL (Warning) Tj T* ET
-Q
-Q
-q
-1 0 0 1 16 16 cm
-q
-BT 1 0 0 1 0 14 Tm .189398 Tw 12 TL /F1 10 Tf 0 0 0 rg (In Python 2 ) Tj /F5 10 Tf (everything ) Tj /F1 10 Tf (is ordered, even though the ordering may not make sense. If you want your) Tj T* 0 Tw (enumerations to have a sensible ordering check out the ) Tj 0 0 .501961 rg (OrderedEnum ) Tj 0 0 0 rg (recipe below.) Tj T* ET
-Q
-Q
-q
-1 J
-1 j
-.662745 .662745 .662745 RG
-.5 w
-n 0 83 m 469.8898 83 l S
-n 0 0 m 469.8898 0 l S
-n 0 0 m 0 83 l S
-n 469.8898 0 m 469.8898 83 l S
-Q
-Q
-q
-1 0 0 1 62.69291 562.8236 cm
-Q
-q
-1 0 0 1 62.69291 544.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Equality comparisons are defined though:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 451.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.blue == Color.red) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Color.blue != Color.red) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Color.blue == Color.blue) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 419.6236 cm
-q
-BT 1 0 0 1 0 14 Tm 2.582706 Tw 12 TL /F1 10 Tf 0 0 0 rg (Comparisons against non-enumeration values will always compare not equal \(again, ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (was) Tj T* 0 Tw (explicitly designed to behave differently, see below\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 374.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Color.blue == 2) Tj T* (False) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 341.4236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Allowed members and attributes of enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 287.4236 cm
-q
-BT 1 0 0 1 0 38 Tm 2.755697 Tw 12 TL /F1 10 Tf 0 0 0 rg (The examples above use integers for enumeration values. Using integers is short and handy \(and) Tj T* 0 Tw .241751 Tw (provided by default by the ) Tj 0 0 .501961 rg (Functional API) Tj 0 0 0 rg (\), but not strictly enforced. In the vast majority of use-cases, one) Tj T* 0 Tw .848221 Tw (doesn't care what the actual value of an enumeration is. But if the value ) Tj /F5 10 Tf (is ) Tj /F1 10 Tf (important, enumerations can) Tj T* 0 Tw (have arbitrary values.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 257.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .638735 Tw (Enumerations are Python classes, and can have methods and special methods as usual. If we have this) Tj T* 0 Tw (enumeration:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 168 re B*
-Q
-q
-BT 1 0 0 1 0 146 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Mood\(Enum\):) Tj T* (...   funky = 1) Tj T* (...   happy = 3) Tj T* (...) Tj T* (...   def describe\(self\):) Tj T* (...     # self is the member here) Tj T* (...     return self.name, self.value) Tj T* (...) Tj T* (...   def __str__\(self\):) Tj T* (...     return 'my custom str! {0}'.format\(self.value\)) Tj T* (...) Tj T* (...   @classmethod) Tj T* (...   def favorite_mood\(cls\):) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-61 0 obj
-<< /Length 4627 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (...     # cls here is the enumeration) Tj T* (...     return cls.happy) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 707.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Then:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 614.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Mood.favorite_mood\(\)) Tj T* (<) Tj (Mood.happy: 3) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Mood.happy.describe\(\)) Tj T* (\('happy', 3\)) Tj T* (>) Tj (>) Tj (>) Tj ( str\(Mood.funky\)) Tj T* ('my custom str! 1') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 558.6236 cm
-q
-BT 1 0 0 1 0 38 Tm 3.14186 Tw 12 TL /F1 10 Tf 0 0 0 rg (The rules for what is allowed are as follows: _sunder_ names \(starting and ending with a single) Tj T* 0 Tw .310651 Tw (underscore\) are reserved by enum and cannot be used; all other attributes defined within an enumeration) Tj T* 0 Tw 2.199213 Tw (will become members of this enumeration, with the exception of ) Tj /F5 10 Tf (__dunder__ ) Tj /F1 10 Tf (names and descriptors) Tj T* 0 Tw (\(methods are also descriptors\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 540.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 534.6236 cm
-Q
-q
-1 0 0 1 62.69291 510.6236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 14 Tm .979213 Tw 12 TL /F1 10 Tf 0 0 0 rg (If your enumeration defines ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (and/or ) Tj /F4 10 Tf 0 0 0 rg (__init__ ) Tj /F1 10 Tf 0 0 0 rg (then whatever value\(s\) were given to the) Tj T* 0 Tw (enum member will be passed into those methods. See ) Tj 0 0 .501961 rg (Planet ) Tj 0 0 0 rg (for an example.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 510.6236 cm
-Q
-q
-1 0 0 1 62.69291 477.6236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Restricted subclassing of enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 447.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .778735 Tw (Subclassing an enumeration is allowed only if the enumeration does not define any members. So this is) Tj T* 0 Tw (forbidden:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 366.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class MoreColor\(Color\):) Tj T* (...   pink = 17) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (TypeError: Cannot extend enumerations) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 346.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (But this is allowed:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 229.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Foo\(Enum\):) Tj T* (...   def some_behavior\(self\):) Tj T* (...     pass) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Bar\(Foo\):) Tj T* (...   happy = 1) Tj T* (...   sad = 2) Tj T* (...) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 185.2236 cm
-q
-BT 1 0 0 1 0 26 Tm .127984 Tw 12 TL /F1 10 Tf 0 0 0 rg (Allowing subclassing of enums that define members would lead to a violation of some important invariants) Tj T* 0 Tw 1.889985 Tw (of types and instances. On the other hand, it makes sense to allow sharing some common behavior) Tj T* 0 Tw (between a group of enumerations. \(See ) Tj 0 0 .501961 rg (OrderedEnum ) Tj 0 0 0 rg (for an example.\)) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 152.2236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Pickling) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 134.2236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Enumerations can be pickled and unpickled:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 89.02362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum.test_enum import Fruit) Tj T* (>) Tj (>) Tj (>) Tj ( from pickle import dumps, loads) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-62 0 obj
-<< /Length 5372 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 727.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-BT 1 0 0 1 0 14 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Fruit.tomato is loads\(dumps\(Fruit.tomato, 2\)\)) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 695.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL 1.256457 Tw (The usual restrictions for pickling apply: picklable enums must be defined in the top level of a module,) Tj T* 0 Tw (since unpickling requires them to be importable from that module.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 677.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 671.8236 cm
-Q
-q
-1 0 0 1 62.69291 647.8236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL .081163 Tw (With pickle protocol version 4 \(introduced in Python 3.4\) it is possible to easily pickle enums nested in) Tj T* 0 Tw (other classes.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 647.8236 cm
-Q
-q
-1 0 0 1 62.69291 614.8236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Functional API) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 596.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class is callable, providing the following functional API:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 467.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 120 re B*
-Q
-q
-BT 1 0 0 1 0 98 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Animal = Enum\('Animal', 'ant bee cat dog'\)) Tj T* (>) Tj (>) Tj (>) Tj ( Animal) Tj T* (<) Tj (enum 'Animal') Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Animal.ant) Tj T* (<) Tj (Animal.ant: 1) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( Animal.ant.value) Tj T* (1) Tj T* (>) Tj (>) Tj (>) Tj ( list\(Animal\)) Tj T* ([) Tj (<) Tj (Animal.ant: 1) Tj (>) Tj (, ) Tj (<) Tj (Animal.bee: 2) Tj (>) Tj (, ) Tj (<) Tj (Animal.cat: 3) Tj (>) Tj (, ) Tj (<) Tj (Animal.dog: 4) Tj (>) Tj (]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 435.6236 cm
-q
-BT 1 0 0 1 0 14 Tm .602209 Tw 12 TL /F1 10 Tf 0 0 0 rg (The semantics of this API resemble ) Tj /F4 10 Tf 0 0 0 rg (namedtuple) Tj /F1 10 Tf 0 0 0 rg (. The first argument of the call to ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is the name of) Tj T* 0 Tw (the enumeration.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 369.6236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.326412 Tw 12 TL /F1 10 Tf 0 0 0 rg (The second argument is the ) Tj /F5 10 Tf (source ) Tj /F1 10 Tf (of enumeration member names. It can be a whitespace-separated) Tj T* 0 Tw .993516 Tw (string of names, a sequence of names, a sequence of 2-tuples with key/value pairs, or a mapping \(e.g.) Tj T* 0 Tw 1.168555 Tw (dictionary\) of names to values. The last two options enable assigning arbitrary values to enumerations;) Tj T* 0 Tw .537485 Tw (the others auto-assign increasing integers starting with 1. A new class derived from ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is returned. In) Tj T* 0 Tw (other words, the above assignment to ) Tj /F4 10 Tf 0 0 0 rg (Animal ) Tj /F1 10 Tf 0 0 0 rg (is equivalent to:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 288.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Animals\(Enum\):) Tj T* (...   ant = 1) Tj T* (...   bee = 2) Tj T* (...   cat = 3) Tj T* (...   dog = 4) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 232.4236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 38 Tm /F1 10 Tf 12 TL 1.239984 Tw (Pickling enums created with the functional API can be tricky as frame stack implementation details are) Tj T* 0 Tw .937132 Tw (used to try and figure out which module the enumeration is being created in \(e.g. it will fail if you use a) Tj T* 0 Tw 1.321163 Tw (utility function in separate module, and also may not work on IronPython or Jython\). The solution is to) Tj T* 0 Tw (specify the module name explicitly as follows:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 199.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 24 re B*
-Q
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( Animals = Enum\('Animals', 'ant bee cat dog', module=__name__\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 166.2236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Derived Enumerations) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 136.2236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (IntEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 94.22362 cm
-q
-BT 1 0 0 1 0 26 Tm 1.99832 Tw 12 TL /F1 10 Tf 0 0 0 rg (A variation of ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is provided which is also a subclass of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (. Members of an ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (can be) Tj T* 0 Tw .087984 Tw (compared to integers; by extension, integer enumerations of different types can also be compared to each) Tj T* 0 Tw (other:) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-63 0 obj
-<< /Length 4141 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 571.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 192 re B*
-Q
-q
-BT 1 0 0 1 0 170 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( from enum import IntEnum) Tj T* (>) Tj (>) Tj (>) Tj ( class Shape\(IntEnum\):) Tj T* (...   circle = 1) Tj T* (...   square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Request\(IntEnum\):) Tj T* (...   post = 1) Tj T* (...   get = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape == 1) Tj T* (False) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == 1) Tj T* (True) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == Request.post) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 551.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (However, they still can't be compared to standard ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (enumerations:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 410.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 132 re B*
-Q
-q
-BT 1 0 0 1 0 110 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Shape\(IntEnum\):) Tj T* (...   circle = 1) Tj T* (...   square = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(Enum\):) Tj T* (...   red = 1) Tj T* (...   green = 2) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Shape.circle == Color.red) Tj T* (False) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 390.6236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (values behave like integers in other ways you'd expect:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 297.4236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 84 re B*
-Q
-q
-BT 1 0 0 1 0 62 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( int\(Shape.circle\)) Tj T* (1) Tj T* (>) Tj (>) Tj (>) Tj ( ['a', 'b', 'c'][Shape.circle]) Tj T* ('b') Tj T* (>) Tj (>) Tj (>) Tj ( [i for i in range\(Shape.square\)]) Tj T* ([0, 1]) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 229.4236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.197126 Tw 12 TL /F1 10 Tf 0 0 0 rg (For the vast majority of code, ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (is strongly recommended, since ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (breaks some semantic) Tj T* 0 Tw .793318 Tw (promises of an enumeration \(by being comparable to integers, and thus by transitivity to other unrelated) Tj T* 0 Tw .554985 Tw (enumerations\). It should be used only in special cases where there's no other choice; for example, when) Tj T* 0 Tw .746136 Tw (integer constants are replaced with enumerations and backwards compatibility is required with code that) Tj T* 0 Tw (still expects integers.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 199.4236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Others) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 181.4236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (is part of the ) Tj /F4 10 Tf 0 0 0 rg (enum ) Tj /F1 10 Tf 0 0 0 rg (module, it would be very simple to implement independently:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 136.2236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 36 re B*
-Q
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F4 10 Tf 12 TL (class IntEnum\(int, Enum\):) Tj T* (    pass) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 104.2236 cm
-q
-BT 1 0 0 1 0 14 Tm .361412 Tw 12 TL /F1 10 Tf 0 0 0 rg (This demonstrates how similar derived enumerations can be defined; for example a ) Tj /F4 10 Tf 0 0 0 rg (StrEnum ) Tj /F1 10 Tf 0 0 0 rg (that mixes) Tj T* 0 Tw (in ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (instead of ) Tj /F4 10 Tf 0 0 0 rg (int) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 86.22362 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Some rules:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-Q
-q
-1 0 0 1 62.69291 80.22362 cm
-Q
- 
-endstream
-endobj
-64 0 obj
-<< /Length 7108 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 741.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .477318 Tw 12 TL /F1 10 Tf 0 0 0 rg (When subclassing ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg (, mix-in types must appear before ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (itself in the sequence of bases, as) Tj T* 0 Tw (in the ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (example above.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 735.0236 cm
-Q
-q
-1 0 0 1 62.69291 699.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 21 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 26 Tm 1.147045 Tw 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (can have members of any type, once you mix in an additional type, all the members) Tj T* 0 Tw .420574 Tw (must have values of that type, e.g. ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (above. This restriction does not apply to mix-ins which only) Tj T* 0 Tw (add methods and don't specify another data type such as ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (str) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 693.0236 cm
-Q
-q
-1 0 0 1 62.69291 669.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .100542 Tw 12 TL /F1 10 Tf 0 0 0 rg (When another data type is mixed in, the ) Tj /F4 10 Tf 0 0 0 rg (value ) Tj /F1 10 Tf 0 0 0 rg (attribute is ) Tj /F5 10 Tf (not the same ) Tj /F1 10 Tf (as the enum member itself,) Tj T* 0 Tw (although it is equivalant and will compare equal.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 663.0236 cm
-Q
-q
-1 0 0 1 62.69291 609.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 39 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 27 cm
-q
-BT 1 0 0 1 0 14 Tm 1.85998 Tw 12 TL /F1 10 Tf 0 0 0 rg (%-style formatting: ) Tj /F4 10 Tf 0 0 0 rg (%s ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (%r ) Tj /F1 10 Tf 0 0 0 rg (call ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg ('s ) Tj /F4 10 Tf 0 0 0 rg (__str__ ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (__repr__ ) Tj /F1 10 Tf 0 0 0 rg (respectively; other codes) Tj T* 0 Tw (\(such as ) Tj /F4 10 Tf 0 0 0 rg (%i ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (%h ) Tj /F1 10 Tf 0 0 0 rg (for IntEnum\) treat the enum member as its mixed-in type.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm .067045 Tw 12 TL /F1 10 Tf 0 0 0 rg (Note: Prior to Python 3.4 there is a bug in ) Tj /F4 10 Tf 0 0 0 rg (str) Tj /F1 10 Tf 0 0 0 rg ('s %-formatting: ) Tj /F4 10 Tf 0 0 0 rg (int ) Tj /F1 10 Tf 0 0 0 rg (subclasses are printed as strings) Tj T* 0 Tw (and not numbers when the ) Tj /F4 10 Tf 0 0 0 rg (%d) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (%i) Tj /F1 10 Tf 0 0 0 rg (, or ) Tj /F4 10 Tf 0 0 0 rg (%u ) Tj /F1 10 Tf 0 0 0 rg (codes are used.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 603.0236 cm
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-q
-1 0 0 1 6 9 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 -3 cm
-q
-BT 1 0 0 1 0 14 Tm 1.880751 Tw 12 TL /F4 10 Tf 0 0 0 rg (str.__format__ ) Tj /F1 10 Tf 0 0 0 rg (\(or ) Tj /F4 10 Tf 0 0 0 rg (format) Tj /F1 10 Tf 0 0 0 rg (\) will use the mixed-in type's ) Tj /F4 10 Tf 0 0 0 rg (__format__) Tj /F1 10 Tf 0 0 0 rg (. If the ) Tj /F4 10 Tf 0 0 0 rg (Enum) Tj /F1 10 Tf 0 0 0 rg ('s ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (or) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (repr ) Tj /F1 10 Tf 0 0 0 rg (is desired use the ) Tj /F4 10 Tf 0 0 0 rg (!s ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (!r) Tj /F1 10 Tf 0 0 0 rg ( ) Tj /F4 10 Tf 0 0 0 rg (str ) Tj /F1 10 Tf 0 0 0 rg (format codes.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-Q
-q
-1 0 0 1 62.69291 546.0236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Decorators) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 516.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (unique) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 486.0236 cm
-q
-BT 1 0 0 1 0 14 Tm .287251 Tw 12 TL /F1 10 Tf 0 0 0 rg (A ) Tj /F4 10 Tf 0 0 0 rg (class ) Tj /F1 10 Tf 0 0 0 rg (decorator specifically for enumerations. It searches an enumeration's ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (gathering) Tj T* 0 Tw (any aliases it finds; if any are found ) Tj /F4 10 Tf 0 0 0 rg (ValueError ) Tj /F1 10 Tf 0 0 0 rg (is raised with the details:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 368.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 108 re B*
-Q
-q
-BT 1 0 0 1 0 86 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( @unique) Tj T* (... class NoDupes\(Enum\):) Tj T* (...    first = 'one') Tj T* (...    second = 'two') Tj T* (...    third = 'two') Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: duplicate names found in ) Tj (<) Tj (enum 'NoDupes') Tj (>) Tj (: third -) Tj (>) Tj ( second) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 335.8236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (Interesting examples) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 293.8236 cm
-q
-BT 1 0 0 1 0 26 Tm .593735 Tw 12 TL /F1 10 Tf 0 0 0 rg (While ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (and ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (are expected to cover the majority of use-cases, they cannot cover them all.) Tj T* 0 Tw .897045 Tw (Here are recipes for some different types of enumerations that can be used directly, or as examples for) Tj T* 0 Tw (creating one's own.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 263.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (AutoNumber) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 245.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Avoids having to specify the value for each enumeration member:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 80.62362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 156 re B*
-Q
-q
-BT 1 0 0 1 0 134 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class AutoNumber\(Enum\):) Tj T* (...     def __new__\(cls\):) Tj T* (...         value = len\(cls.__members__\) + 1) Tj T* (...         obj = object.__new__\(cls\)) Tj T* (...         obj._value_ = value) Tj T* (...         return obj) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(AutoNumber\):) Tj T* (...     __order__ = "red green blue"  # only needed in 2.x) Tj T* (...     red = \(\)) Tj T* (...     green = \(\)) Tj T* (...     blue = \(\)) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-65 0 obj
-<< /Length 4158 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 715.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 48 re B*
-Q
-q
-BT 1 0 0 1 0 26 Tm 12 TL /F4 10 Tf 0 0 0 rg (...) Tj T* (>) Tj (>) Tj (>) Tj ( Color.green.value == 2) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 695.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Note:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 689.8236 cm
-Q
-q
-1 0 0 1 62.69291 653.8236 cm
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 0 cm
-q
-BT 1 0 0 1 0 26 Tm .144104 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F5 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (method, if defined, is used during creation of the Enum members; it is then replaced by) Tj T* 0 Tw .799985 Tw (Enum's ) Tj /F5 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (which is used after class creation for lookup of existing members. Due to the way) Tj T* 0 Tw (Enums are supposed to behave, there is no way to customize Enum's ) Tj /F5 10 Tf 0 0 0 rg (__new__) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 653.8236 cm
-Q
-q
-1 0 0 1 62.69291 623.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (UniqueEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 605.8236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2 Tm /F1 10 Tf 12 TL (Raises an error if a duplicate member name is found instead of creating an alias:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 368.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 228 re B*
-Q
-q
-BT 1 0 0 1 0 206 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class UniqueEnum\(Enum\):) Tj T* (...     def __init__\(self, *args\):) Tj T* (...         cls = self.__class__) Tj T* (...         if any\(self.value == e.value for e in cls\):) Tj T* (...             a = self.name) Tj T* (...             e = cls\(self.value\).name) Tj T* (...             raise ValueError\() Tj T* (...                     "aliases not allowed in UniqueEnum:  %r --) Tj (>) Tj ( %r") Tj T* (...                     % \(a, e\)\)) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Color\(UniqueEnum\):) Tj T* (...     red = 1) Tj T* (...     green = 2) Tj T* (...     blue = 3) Tj T* (...     grene = 2) Tj T* (Traceback \(most recent call last\):) Tj T* (...) Tj T* (ValueError: aliases not allowed in UniqueEnum:  'grene' --) Tj (>) Tj ( 'green') Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 338.6236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (OrderedEnum) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 308.6236 cm
-q
-BT 1 0 0 1 0 14 Tm 1.335984 Tw 12 TL /F1 10 Tf 0 0 0 rg (An ordered enumeration that is not based on ) Tj /F4 10 Tf 0 0 0 rg (IntEnum ) Tj /F1 10 Tf 0 0 0 rg (and so maintains the normal ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (invariants) Tj T* 0 Tw (\(such as not being comparable to other enumerations\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 83.42362 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 216 re B*
-Q
-q
-BT 1 0 0 1 0 194 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class OrderedEnum\(Enum\):) Tj T* (...     def __ge__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (>) Tj (= other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __gt__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (>) Tj ( other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __le__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (<) Tj (= other._value_) Tj T* (...         return NotImplemented) Tj T* (...     def __lt__\(self, other\):) Tj T* (...         if self.__class__ is other.__class__:) Tj T* (...             return self._value_ ) Tj (<) Tj ( other._value_) Tj T* (...         return NotImplemented) Tj T* ET
-Q
-Q
-Q
-Q
-Q
- 
-endstream
-endobj
-66 0 obj
-<< /Length 4039 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 619.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 144 re B*
-Q
-q
-BT 1 0 0 1 0 122 Tm 12 TL /F4 10 Tf 0 0 0 rg (...) Tj T* (>) Tj (>) Tj (>) Tj ( class Grade\(OrderedEnum\):) Tj T* (...     __ordered__ = 'A B C D F') Tj T* (...     A = 5) Tj T* (...     B = 4) Tj T* (...     C = 3) Tj T* (...     D = 2) Tj T* (...     F = 1) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Grade.C ) Tj (<) Tj ( Grade.A) Tj T* (True) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 589.8236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Planet) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 571.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (If ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (__init__ ) Tj /F1 10 Tf 0 0 0 rg (is defined the value of the enum member will be passed to those methods:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 286.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 276 re B*
-Q
-q
-BT 1 0 0 1 0 254 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class Planet\(Enum\):) Tj T* (...     MERCURY = \(3.303e+23, 2.4397e6\)) Tj T* (...     VENUS   = \(4.869e+24, 6.0518e6\)) Tj T* (...     EARTH   = \(5.976e+24, 6.37814e6\)) Tj T* (...     MARS    = \(6.421e+23, 3.3972e6\)) Tj T* (...     JUPITER = \(1.9e+27,   7.1492e7\)) Tj T* (...     SATURN  = \(5.688e+26, 6.0268e7\)) Tj T* (...     URANUS  = \(8.686e+25, 2.5559e7\)) Tj T* (...     NEPTUNE = \(1.024e+26, 2.4746e7\)) Tj T* (...     def __init__\(self, mass, radius\):) Tj T* (...         self.mass = mass       # in kilograms) Tj T* (...         self.radius = radius   # in meters) Tj T* (...     @property) Tj T* (...     def surface_gravity\(self\):) Tj T* (...         # universal gravitational constant  \(m3 kg-1 s-2\)) Tj T* (...         G = 6.67300E-11) Tj T* (...         return G * self.mass / \(self.radius * self.radius\)) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( Planet.EARTH.value) Tj T* (\(5.976e+24, 6378140.0\)) Tj T* (>) Tj (>) Tj (>) Tj ( Planet.EARTH.surface_gravity) Tj T* (9.802652743337129) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 253.6236 cm
-q
-BT 1 0 0 1 0 3.5 Tm 21 TL /F3 17.5 Tf 0 0 0 rg (How are Enums different?) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 223.6236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 14 Tm /F1 10 Tf 12 TL 2.090651 Tw (Enums have a custom metaclass that affects many aspects of both derived Enum classes and their) Tj T* 0 Tw (instances \(members\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 193.6236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Enum Classes) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 127.6236 cm
-q
-BT 1 0 0 1 0 50 Tm 1.263615 Tw 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (metaclass is responsible for providing the ) Tj /F4 10 Tf 0 0 0 rg (__contains__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__dir__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__iter__ ) Tj /F1 10 Tf 0 0 0 rg (and) Tj T* 0 Tw 2.264724 Tw (other methods that allow one to do things with an ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class that fail on a typical class, such as) Tj T* 0 Tw 2.594147 Tw /F4 10 Tf 0 0 0 rg (list\(Color\) ) Tj /F1 10 Tf 0 0 0 rg (or ) Tj /F4 10 Tf 0 0 0 rg (some_var) Tj ( ) Tj (in) Tj ( ) Tj (Color) Tj /F1 10 Tf 0 0 0 rg (. ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (is responsible for ensuring that various other) Tj T* 0 Tw 2.196905 Tw (methods on the final ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class are correct \(such as ) Tj /F4 10 Tf 0 0 0 rg (__new__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__getnewargs__) Tj /F1 10 Tf 0 0 0 rg (, ) Tj /F4 10 Tf 0 0 0 rg (__str__ ) Tj /F1 10 Tf 0 0 0 rg (and) Tj T* 0 Tw /F4 10 Tf 0 0 0 rg (__repr__) Tj /F1 10 Tf 0 0 0 rg (\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 115.6236 cm
-Q
- 
-endstream
-endobj
-67 0 obj
-<< /Length 5453 >>
-stream
-1 0 0 1 0 0 cm  BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 682.0236 cm
-.960784 .960784 .862745 rg
-n 0 83 469.8898 -83 re f*
-0 0 0 rg
-BT /F1 10 Tf 12 TL ET
-BT 1 0 0 1 6 57 Tm  T* ET
-q
-1 0 0 1 16 52 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 2.5 Tm /F6 12.5 Tf 15 TL (Note) Tj T* ET
-Q
-Q
-q
-1 0 0 1 16 16 cm
-q
-BT 1 0 0 1 0 14 Tm .686654 Tw 12 TL /F4 10 Tf 0 0 0 rg (__dir__ ) Tj /F1 10 Tf 0 0 0 rg (is not changed in the Python 2 line as it messes up some of the decorators included in) Tj T* 0 Tw (the stdlib.) Tj T* ET
-Q
-Q
-q
-1 J
-1 j
-.662745 .662745 .662745 RG
-.5 w
-n 0 83 m 469.8898 83 l S
-n 0 0 m 469.8898 0 l S
-n 0 0 m 0 83 l S
-n 469.8898 0 m 469.8898 83 l S
-Q
-Q
-q
-1 0 0 1 62.69291 676.0236 cm
-Q
-q
-1 0 0 1 62.69291 646.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Enum Members \(aka instances\)) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 604.0236 cm
-q
-BT 1 0 0 1 0 26 Tm .491984 Tw 12 TL /F1 10 Tf 0 0 0 rg (The most interesting thing about Enum members is that they are singletons. ) Tj /F4 10 Tf 0 0 0 rg (EnumMeta ) Tj /F1 10 Tf 0 0 0 rg (creates them all) Tj T* 0 Tw .084988 Tw (while it is creating the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class itself, and then puts a custom ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (in place to ensure that no new) Tj T* 0 Tw (ones are ever instantiated by returning only the existing member instances.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 574.0236 cm
-q
-BT 1 0 0 1 0 3 Tm 18 TL /F3 15 Tf 0 0 0 rg (Finer Points) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 520.0236 cm
-q
-BT 1 0 0 1 0 38 Tm 5.488555 Tw 12 TL /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members are instances of an ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (class, and even though they are accessible as) Tj T* 0 Tw 1.504147 Tw /F5 10 Tf 0 0 0 rg (EnumClass.member1.member2) Tj /F1 10 Tf 0 0 0 rg (, they should not be accessed directly from the member as that lookup) Tj T* 0 Tw .329985 Tw (may fail or, worse, return something besides the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (member you were looking for \(changed in version) Tj T* 0 Tw (1.1.1\):) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 390.8236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 120 re B*
-Q
-q
-BT 1 0 0 1 0 98 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( class FieldTypes\(Enum\):) Tj T* (...     name = 1) Tj T* (...     value = 2) Tj T* (...     size = 3) Tj T* (...) Tj T* (>) Tj (>) Tj (>) Tj ( FieldTypes.value.size) Tj T* (<) Tj (FieldTypes.size: 3) Tj (>) Tj  T* (>) Tj (>) Tj (>) Tj ( FieldTypes.size.value) Tj T* (3) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 370.8236 cm
-q
-BT 1 0 0 1 0 2 Tm 12 TL /F1 10 Tf 0 0 0 rg (The ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (attribute is only available on the class.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 316.8236 cm
-q
-BT 1 0 0 1 0 38 Tm 1.374651 Tw 12 TL /F1 10 Tf 0 0 0 rg (In Python 3.x ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is always an ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict) Tj /F1 10 Tf 0 0 0 rg (, with the order being the definition order. In) Tj T* 0 Tw 3.009213 Tw (Python 2.7 ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is an ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict ) Tj /F1 10 Tf 0 0 0 rg (if ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (was specified, and a plain ) Tj /F4 10 Tf 0 0 0 rg (dict) Tj T* 0 Tw 1.851318 Tw /F1 10 Tf 0 0 0 rg (otherwise. In all other Python 2.x versions ) Tj /F4 10 Tf 0 0 0 rg (__members__ ) Tj /F1 10 Tf 0 0 0 rg (is a plain ) Tj /F4 10 Tf 0 0 0 rg (dict ) Tj /F1 10 Tf 0 0 0 rg (even if ) Tj /F4 10 Tf 0 0 0 rg (__order__ ) Tj /F1 10 Tf 0 0 0 rg (was) Tj T* 0 Tw (specified as the ) Tj /F4 10 Tf 0 0 0 rg (OrderedDict ) Tj /F1 10 Tf 0 0 0 rg (type didn't exist yet.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 286.8236 cm
-q
-BT 1 0 0 1 0 14 Tm .106654 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you give your ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (subclass extra methods, like the ) Tj 0 0 .501961 rg (Planet ) Tj 0 0 0 rg (class above, those methods will show up in) Tj T* 0 Tw (a ) Tj /F5 10 Tf 0 0 0 rg (dir ) Tj /F1 10 Tf 0 0 0 rg (of the member, but not of the class:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 205.6236 cm
-q
-q
-1 0 0 1 0 0 cm
-q
-1 0 0 1 6.6 6.6 cm
-q
-.662745 .662745 .662745 RG
-.5 w
-.960784 .960784 .862745 rg
-n -6 -6 468.6898 72 re B*
-Q
-q
-BT 1 0 0 1 0 50 Tm 12 TL /F4 10 Tf 0 0 0 rg (>) Tj (>) Tj (>) Tj ( dir\(Planet\)) Tj T* (['EARTH', 'JUPITER', 'MARS', 'MERCURY', 'NEPTUNE', 'SATURN', 'URANUS',) Tj T* ('VENUS', '__class__', '__doc__', '__members__', '__module__']) Tj T* (>) Tj (>) Tj (>) Tj ( dir\(Planet.EARTH\)) Tj T* (['__class__', '__doc__', '__module__', 'name', 'surface_gravity', 'value']) Tj T* ET
-Q
-Q
-Q
-Q
-Q
-q
-1 0 0 1 62.69291 161.6236 cm
-q
-BT 1 0 0 1 0 26 Tm .938935 Tw 12 TL /F1 10 Tf 0 0 0 rg (A ) Tj /F4 10 Tf 0 0 0 rg (__new__ ) Tj /F1 10 Tf 0 0 0 rg (method will only be used for the creation of the ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members -- after that it is replaced.) Tj T* 0 Tw .949461 Tw (This means if you wish to change how ) Tj /F4 10 Tf 0 0 0 rg (Enum ) Tj /F1 10 Tf 0 0 0 rg (members are looked up you either have to write a helper) Tj T* 0 Tw (function or a ) Tj /F4 10 Tf 0 0 0 rg (classmethod) Tj /F1 10 Tf 0 0 0 rg (.) Tj T* ET
-Q
-Q
- 
-endstream
-endobj
-68 0 obj
-<< /Nums [ 0 69 0 R 1 70 0 R 2 71 0 R 3 72 0 R 4 73 0 R 
-  5 74 0 R 6 75 0 R 7 76 0 R 8 77 0 R 9 78 0 R 
-  10 79 0 R 11 80 0 R ] >>
-endobj
-69 0 obj
-<< /S /D /St 1 >>
-endobj
-70 0 obj
-<< /S /D /St 2 >>
-endobj
-71 0 obj
-<< /S /D /St 3 >>
-endobj
-72 0 obj
-<< /S /D /St 4 >>
-endobj
-73 0 obj
-<< /S /D /St 5 >>
-endobj
-74 0 obj
-<< /S /D /St 6 >>
-endobj
-75 0 obj
-<< /S /D /St 7 >>
-endobj
-76 0 obj
-<< /S /D /St 8 >>
-endobj
-77 0 obj
-<< /S /D /St 9 >>
-endobj
-78 0 obj
-<< /S /D /St 10 >>
-endobj
-79 0 obj
-<< /S /D /St 11 >>
-endobj
-80 0 obj
-<< /S /D /St 12 >>
-endobj
-xref
-0 81
-0000000000 65535 f
-0000000075 00000 n
-0000000160 00000 n
-0000000270 00000 n
-0000000383 00000 n
-0000000498 00000 n
-0000000606 00000 n
-0000000777 00000 n
-0000000948 00000 n
-0000001066 00000 n
-0000001237 00000 n
-0000001477 00000 n
-0000001687 00000 n
-0000001897 00000 n
-0000002107 00000 n
-0000002279 00000 n
-0000002402 00000 n
-0000002574 00000 n
-0000002746 00000 n
-0000002989 00000 n
-0000003161 00000 n
-0000003333 00000 n
-0000003569 00000 n
-0000003779 00000 n
-0000003989 00000 n
-0000004199 00000 n
-0000004409 00000 n
-0000004619 00000 n
-0000004791 00000 n
-0000005020 00000 n
-0000005129 00000 n
-0000005373 00000 n
-0000005451 00000 n
-0000005571 00000 n
-0000005705 00000 n
-0000005886 00000 n
-0000006039 00000 n
-0000006168 00000 n
-0000006332 00000 n
-0000006488 00000 n
-0000006614 00000 n
-0000006746 00000 n
-0000006924 00000 n
-0000007036 00000 n
-0000007147 00000 n
-0000007315 00000 n
-0000007413 00000 n
-0000007591 00000 n
-0000007706 00000 n
-0000007834 00000 n
-0000007963 00000 n
-0000008074 00000 n
-0000008243 00000 n
-0000008360 00000 n
-0000008508 00000 n
-0000008625 00000 n
-0000008771 00000 n
-0000015286 00000 n
-0000019517 00000 n
-0000023365 00000 n
-0000027828 00000 n
-0000032406 00000 n
-0000037090 00000 n
-0000042519 00000 n
-0000046717 00000 n
-0000053882 00000 n
-0000058097 00000 n
-0000062193 00000 n
-0000067703 00000 n
-0000067856 00000 n
-0000067893 00000 n
-0000067930 00000 n
-0000067967 00000 n
-0000068004 00000 n
-0000068041 00000 n
-0000068078 00000 n
-0000068115 00000 n
-0000068152 00000 n
-0000068189 00000 n
-0000068227 00000 n
-0000068265 00000 n
-trailer
-<< /ID 
- % ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(<}|~gm\352\320\235=\001p\220v\224\336) (<}|~gm\352\320\235=\001p\220v\224\336)]
- /Info 30 0 R /Root 29 0 R /Size 81 >>
-startxref
-68303
-%%EOF
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/__init__.py firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/__init__.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/__init__.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/__init__.py	2021-01-18 19:58:24.000000000 +0000
@@ -4,7 +4,7 @@
 
 __all__ = ['Enum', 'IntEnum', 'unique']
 
-version = 1, 1, 6
+version = 1, 1, 10
 
 pyver = float('%s.%s' % _sys.version_info[:2])
 
@@ -183,7 +183,8 @@
         else:
             del classdict['_order_']
             if pyver < 3.0:
-                _order_ = _order_.replace(',', ' ').split()
+                if isinstance(_order_, basestring):
+                    _order_ = _order_.replace(',', ' ').split()
                 aliases = [name for name in members if name not in _order_]
                 _order_ += aliases
 
@@ -463,7 +464,7 @@
             _order_.append(member_name)
         # only set _order_ in classdict if name/value was not from a mapping
         if not isinstance(item, basestring):
-            classdict['_order_'] = ' '.join(_order_)
+            classdict['_order_'] = _order_
         enum_class = metacls.__new__(metacls, class_name, bases, classdict)
 
         # TODO: replace the frame hack if a blessed way to know the calling
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/test.py firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/test.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/enum/test.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/enum/test.py	2021-01-18 19:58:24.000000000 +0000
@@ -452,8 +452,8 @@
         self.assertEqual(dates[Season.AUTUMN], '1031')
 
     def test_enum_duplicates(self):
-        _order_ = "SPRING SUMMER AUTUMN WINTER"
         class Season(Enum):
+            _order_ = "SPRING SUMMER AUTUMN WINTER"
             SPRING = 1
             SUMMER = 2
             AUTUMN = FALL = 3
@@ -665,7 +665,7 @@
                     protocol=(0, HIGHEST_PROTOCOL))
 
     def test_exploding_pickle(self):
-        BadPickle = Enum('BadPickle', 'dill sweet bread-n-butter')
+        BadPickle = Enum('BadPickle', 'dill sweet bread_n_butter')
         enum._make_class_unpicklable(BadPickle)
         globals()['BadPickle'] = BadPickle
         test_pickle_exception(self.assertRaises, TypeError, BadPickle.dill)
@@ -808,6 +808,27 @@
             i += 1
             e = SummerMonth(i)
             self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_iterable_with_weird_names(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                (('june', 1), ('july', 2), ('august', 3), ('fabulous september', 4))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 4, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august, SummerMonth['fabulous september']],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split() + ['fabulous september']):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
             self.assertNotEqual(e, i)
             self.assertEqual(e.name, month)
             self.assertTrue(e in SummerMonth)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/PKG-INFO firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/PKG-INFO
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/PKG-INFO	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/PKG-INFO	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: enum34
-Version: 1.1.6
+Version: 1.1.10
 Summary: Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4
 Home-page: https://bitbucket.org/stoneleaf/enum34
 Author: Ethan Furman
@@ -57,6 +57,4 @@
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
 Provides: enum
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/setup.cfg firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/setup.cfg
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/setup.cfg	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/setup.cfg	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/setup.py firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/setup.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/enum/setup.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/enum/setup.py	2021-01-18 19:58:24.000000000 +0000
@@ -9,6 +9,14 @@
 else:
     required = []
 
+# Don't shadow builtin enum package if we are being installed on a
+# recent Python.  This causes conflicts since at least 3.6:
+# https://bitbucket.org/stoneleaf/enum34/issues/19/enum34-isnt-compatible-with-python-36
+if sys.version_info[:2] < (3, 4):
+    packages = ['enum']
+else:
+    packages = []
+
 long_desc = '''\
 enum --- support for enumerations
 ========================================
@@ -54,15 +62,15 @@
 py2_only = ()
 py3_only = ()
 make = [
-        'rst2pdf enum/doc/enum.rst --output=enum/doc/enum.pdf',
+        # 'rst2pdf enum/doc/enum.rst --output=enum/doc/enum.pdf',
         ]
 
 
 data = dict(
         name='enum34',
-        version='1.1.6',
+        version='1.1.10',
         url='https://bitbucket.org/stoneleaf/enum34',
-        packages=['enum'],
+        packages=packages,
         package_data={
             'enum' : [
                 'LICENSE',
@@ -90,8 +98,6 @@
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3.3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
             ],
         )
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py firefox-85.0+build1/testing/web-platform/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/third_party/pywebsocket3/mod_pywebsocket/stream.py	2021-01-18 19:58:24.000000000 +0000
@@ -875,7 +875,7 @@
             wait_response: True when caller want to wait the response.
         Raises:
             BadOperationException: when reason is specified with code None
-            or reason is not an instance of both str and unicode.
+                or reason is not an instance of both str and unicode.
         """
 
         if self._request.server_terminated:
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/requirements.txt firefox-85.0+build1/testing/web-platform/tests/tools/wpt/requirements.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/requirements.txt	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/requirements.txt	2021-01-18 19:58:24.000000000 +0000
@@ -1,2 +1,2 @@
-requests==2.24.0
+requests==2.25.0
 mozinfo==1.2.1  # https://bugzilla.mozilla.org/show_bug.cgi?id=1621226
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/testfiles.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/testfiles.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/testfiles.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/testfiles.py	2021-01-18 19:58:24.000000000 +0000
@@ -2,6 +2,7 @@
 import logging
 import os
 import re
+import subprocess
 import sys
 
 from collections import OrderedDict
@@ -76,8 +77,19 @@
                      if item and item != "^%s" % head]
 
         # get all commits on HEAD but not reachable from anything in not_heads
-        commits = git("rev-list", "--topo-order", "--parents", "HEAD", *not_heads)
+        cmd = ["git", "rev-list", "--topo-order", "--parents", "--stdin", "HEAD"]
+        proc = subprocess.Popen(cmd,
+                                stdin=subprocess.PIPE,
+                                stdout=subprocess.PIPE,
+                                cwd=wpt_root)
+        commits_bytes, _ = proc.communicate(b"\n".join(item.encode("ascii") for item in not_heads))
+        if proc.returncode != 0:
+            raise subprocess.CalledProcessError(proc.returncode,
+                                                cmd,
+                                                commits_bytes)
+
         commit_parents = OrderedDict()  # type: Dict[Text, List[Text]]
+        commits = commits_bytes.decode("ascii")
         if commits:
             for line in commits.split("\n"):
                 line_commits = line.split(" ")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_browser.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_browser.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_browser.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_browser.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,9 +1,14 @@
+import logging
+import inspect
 import mock
+import os
+import pytest
 import subprocess
-import logging
 import sys
-import pytest
-import inspect
+
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
 
 from tools.wpt import browser
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_install.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_install.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_install.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_install.py	2021-01-18 19:58:24.000000000 +0000
@@ -4,6 +4,10 @@
 
 import pytest
 
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.wpt import browser, utils, wpt
 
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_markdown.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_markdown.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_markdown.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_markdown.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,10 @@
+import os
+import sys
+
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.wpt import markdown
 
 def test_format_comment_title():
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_revlist.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_revlist.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_revlist.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_revlist.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,11 @@
 import mock
+import os
+import sys
+
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.wpt import revlist
 
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_run.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_run.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_run.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_run.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,10 +1,15 @@
 import mock
+import os
 import tempfile
 import shutil
 import sys
 
 import pytest
 
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
+
 from tools.wpt import run
 from tools import localpaths  # noqa: F401
 from wptrunner.browsers import product_list
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_testfiles.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_testfiles.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_testfiles.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_testfiles.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,10 @@
 import os.path
 from mock import patch
+import sys
+
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
 
 from tools.manifest.manifest import Manifest
 from tools.wpt import testfiles
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_wpt.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_wpt.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/tests/test_wpt.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/tests/test_wpt.py	2021-01-18 19:58:24.000000000 +0000
@@ -15,10 +15,11 @@
 
 import pytest
 
-from tools.wpt import utils, wpt
-
+here = os.path.dirname(__file__)
+root = os.path.abspath(os.path.join(here, "..", "..", ".."))
+sys.path.insert(0, root)
 
-here = os.path.abspath(os.path.dirname(__file__))
+from tools.wpt import utils, wpt
 
 
 def is_port_8000_in_use():
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/wpt.py firefox-85.0+build1/testing/web-platform/tests/tools/wpt/wpt.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wpt/wpt.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wpt/wpt.py	2021-01-18 19:58:24.000000000 +0000
@@ -50,7 +50,10 @@
                         dest="skip_venv_setup",
                         help="Whether to use the virtualenv as-is. Must set --venv as well")
     parser.add_argument("--debug", action="store_true", help="Run the debugger in case of an exception")
-    parser.add_argument("--py3", action="store_true", help="Run with python3")
+    parser.add_argument("--py3", action="store_true",
+                        help="Run with Python 3 (requires a `python3` binary on the PATH)")
+    parser.add_argument("--py2", action="store_true",
+                        help="Run with Python 2 (requires a `python2` binary on the PATH)")
     subparsers = parser.add_subparsers(dest="command")
     for command, props in iteritems(commands):
         subparsers.add_parser(command, help=props["help"], add_help=False)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt	2021-01-18 19:58:24.000000000 +0000
@@ -1,10 +1,10 @@
 marionette_driver==3.1.0
 mozcrash==2.0.0
-mozinstall==2.0.0
+mozinstall==2.0.1
 mozleak==0.2
 moznetwork==1.1.0
 mozprocess==1.2.1
 mozprofile==2.5.0
-mozrunner==8.0.0
+mozrunner==8.0.3
 mozversion==2.3.0
 psutil==5.7.3
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,3 @@
 mozprocess==1.2.1
 selenium==3.141.0
-requests==2.24.0
+requests==2.25.0
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements.txt firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements.txt
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/requirements.txt	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/requirements.txt	2021-01-18 19:58:24.000000000 +0000
@@ -1,10 +1,10 @@
 html5lib==1.1
 mozinfo==1.2.1  # https://bugzilla.mozilla.org/show_bug.cgi?id=1621226
-mozlog==6.1
+mozlog==7.0.1
 mozdebug==0.2
 # Pillow 7 requires Python 3
 pillow==6.2.2; python_version <= '2.7'  # pyup: <7.0
 pillow==8.0.1; python_version >= '3.0'
-urllib3[secure]==1.26.1
-requests==2.24.0
+urllib3[secure]==1.26.2
+requests==2.25.0
 six==1.15.0
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py	2021-01-18 19:58:24.000000000 +0000
@@ -28,14 +28,14 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     # Use update() to modify the global list in place.
     _wptserve_ports.update(set(
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_webview.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_webview.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_webview.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/android_webview.py	2021-01-18 19:58:24.000000000 +0000
@@ -28,14 +28,14 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     # Use update() to modify the global list in place.
     _wptserve_ports.update(set(
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_android.py	2021-01-18 19:58:24.000000000 +0000
@@ -29,14 +29,14 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"package_name": kwargs["package_name"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     # Use update() to modify the global list in place.
     _wptserve_ports.update(set(
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome_ios.py	2021-01-18 19:58:24.000000000 +0000
@@ -22,12 +22,12 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                                            **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome.py	2021-01-18 19:58:24.000000000 +0000
@@ -28,13 +28,13 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py	2021-01-18 19:58:24.000000000 +0000
@@ -24,13 +24,13 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edge.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edge.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edge.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/edge.py	2021-01-18 19:58:24.000000000 +0000
@@ -34,7 +34,7 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args"),
             "timeout_multiplier": get_timeout_multiplier(test_type,
@@ -42,7 +42,7 @@
                                                          **kwargs)}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/epiphany.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/epiphany.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/epiphany.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/epiphany.py	2021-01-18 19:58:24.000000000 +0000
@@ -25,7 +25,7 @@
     pass
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     # Workaround for https://gitlab.gnome.org/GNOME/libsoup/issues/172
     webdriver_required_args = ["--host=127.0.0.1"]
     webdriver_args = maybe_add_args(webdriver_required_args, kwargs.get("webdriver_args"))
@@ -49,7 +49,7 @@
             "certificates": certificate_domain_list(server_config.domains_set, kwargs["host_cert_path"])}}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py	2021-01-18 19:58:24.000000000 +0000
@@ -38,7 +38,7 @@
     pass
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"package_name": kwargs["package_name"],
             "device_serial": kwargs["device_serial"],
             "prefs_root": kwargs["prefs_root"],
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/firefox.py	2021-01-18 19:58:24.000000000 +0000
@@ -76,7 +76,7 @@
     require_arg(kwargs, "binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "prefs_root": kwargs["prefs_root"],
             "extra_prefs": kwargs["extra_prefs"],
@@ -105,7 +105,7 @@
             "specialpowers_path": kwargs["specialpowers_path"]}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data,
@@ -138,6 +138,16 @@
         for pref, value in kwargs["extra_prefs"]:
             options["prefs"].update({pref: Preferences.cast(value)})
         capabilities["moz:firefoxOptions"] = options
+
+        environ = get_environ(logger,
+                              kwargs["binary"],
+                              kwargs["debug_info"],
+                              kwargs["stylo_threads"],
+                              kwargs["headless"],
+                              kwargs["enable_webrender"],
+                              kwargs["chaos_mode_flags"])
+
+        executor_kwargs["environ"] = environ
     if kwargs["certutil_binary"] is None:
         capabilities["acceptInsecureCerts"] = True
     if capabilities:
@@ -213,6 +223,26 @@
             {"os": ["version"], "processor": ["bits"]})
 
 
+def get_environ(logger, binary, debug_info, stylo_threads, headless, enable_webrender,
+                chaos_mode_flags=None):
+    env = test_environment(xrePath=os.path.abspath(os.path.dirname(binary)),
+                           debugger=debug_info is not None,
+                           useLSan=True,
+                           log=logger)
+
+    env["STYLO_THREADS"] = str(stylo_threads)
+    if chaos_mode_flags is not None:
+        env["MOZ_CHAOSMODE"] = str(chaos_mode_flags)
+    if headless:
+        env["MOZ_HEADLESS"] = "1"
+    if enable_webrender:
+        env["MOZ_WEBRENDER"] = "1"
+        env["MOZ_ACCELERATED"] = "1"
+    else:
+        env["MOZ_WEBRENDER"] = "0"
+    return env
+
+
 class FirefoxInstanceManager(object):
     __metaclass__ = ABCMeta
 
@@ -268,20 +298,8 @@
         marionette_port = get_free_port()
         profile.set_preferences({"marionette.port": marionette_port})
 
-        env = test_environment(xrePath=os.path.abspath(os.path.dirname(self.binary)),
-                               debugger=self.debug_info is not None,
-                               useLSan=True, log=self.logger)
-
-        env["STYLO_THREADS"] = str(self.stylo_threads)
-        if self.chaos_mode_flags is not None:
-            env["MOZ_CHAOSMODE"] = str(self.chaos_mode_flags)
-        if self.headless:
-            env["MOZ_HEADLESS"] = "1"
-        if self.enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-            env["MOZ_ACCELERATED"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
+        env = get_environ(self.logger, self.binary, self.debug_info, self.stylo_threads,
+                          self.headless, self.enable_webrender, self.chaos_mode_flags)
 
         args = self.binary_args[:] if self.binary_args else []
         args += [cmd_arg("marionette"), "about:blank"]
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/ie.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/ie.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/ie.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/ie.py	2021-01-18 19:58:24.000000000 +0000
@@ -18,11 +18,11 @@
 def check_args(**kwargs):
     require_arg(kwargs, "webdriver_binary")
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     options = {}
     options["requireWindowFocus"] = True
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/opera.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/opera.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/opera.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/opera.py	2021-01-18 19:58:24.000000000 +0000
@@ -24,13 +24,13 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     from selenium.webdriver import DesiredCapabilities
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/safari.py	2021-01-18 19:58:24.000000000 +0000
@@ -26,12 +26,12 @@
     require_arg(kwargs, "webdriver_binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce.py	2021-01-18 19:58:24.000000000 +0000
@@ -95,13 +95,13 @@
     require_arg(kwargs, "sauce_key")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     sauce_config = get_sauce_config(**kwargs)
 
     return {"sauce_config": sauce_config}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servodriver.py	2021-01-18 19:58:24.000000000 +0000
@@ -36,7 +36,7 @@
     require_arg(kwargs, "binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {
         "binary": kwargs["binary"],
         "binary_args": kwargs["binary_args"],
@@ -47,7 +47,7 @@
     }
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data, **kwargs):
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data, **kwargs):
     rv = base_executor_kwargs(test_type, server_config,
                               cache_manager, run_info_data, **kwargs)
     return rv
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servo.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servo.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servo.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/servo.py	2021-01-18 19:58:24.000000000 +0000
@@ -33,7 +33,7 @@
     require_arg(kwargs, "binary")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {
         "binary": kwargs["binary"],
         "debug_info": kwargs["debug_info"],
@@ -43,7 +43,7 @@
     }
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     rv = base_executor_kwargs(test_type, server_config,
                               cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py	2021-01-18 19:58:24.000000000 +0000
@@ -25,7 +25,7 @@
     pass
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     # Workaround for https://gitlab.gnome.org/GNOME/libsoup/issues/172
     webdriver_required_args = ["--host=127.0.0.1"]
     webdriver_args = maybe_add_args(webdriver_required_args, kwargs.get("webdriver_args"))
@@ -53,7 +53,7 @@
             "certificates": certificate_domain_list(server_config.domains_set, kwargs["host_cert_path"])}}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkit.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkit.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkit.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/webkit.py	2021-01-18 19:58:24.000000000 +0000
@@ -29,7 +29,7 @@
     require_arg(kwargs, "webkit_port")
 
 
-def browser_kwargs(test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "webdriver_binary": kwargs["webdriver_binary"],
             "webdriver_args": kwargs.get("webdriver_args")}
@@ -54,7 +54,7 @@
     return {}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
+def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, run_info_data, **kwargs)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py	2021-01-18 19:58:24.000000000 +0000
@@ -598,7 +598,7 @@
 
     def __init__(self, logger, browser, server_config, webdriver_binary,
                  webdriver_args, timeout_multiplier=1, capabilities=None,
-                 debug_info=None, **kwargs):
+                 debug_info=None, environ=None, **kwargs):
         self.do_delayed_imports()
         TestExecutor.__init__(self, logger, browser, server_config,
                               timeout_multiplier=timeout_multiplier,
@@ -607,6 +607,7 @@
         self.webdriver_args = webdriver_args
         self.timeout_multiplier = timeout_multiplier
         self.capabilities = capabilities
+        self.environ = environ if environ is not None else {}
         self.protocol = self.protocol_cls(self, browser)
 
     def is_alive(self):
@@ -632,7 +633,8 @@
         return pytestrunner.run(path,
                                 self.server_config,
                                 session_config,
-                                timeout=timeout)
+                                timeout=timeout,
+                                environ=self.environ)
 
     def do_delayed_imports(self):
         global pytestrunner
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py	2021-01-18 19:58:24.000000000 +0000
@@ -956,7 +956,8 @@
             assertion_count = self.protocol.asserts.get()
             if "extra" not in result:
                 result["extra"] = {}
-            result["extra"]["assertion_count"] = assertion_count
+            if assertion_count is not None:
+                result["extra"]["assertion_count"] = assertion_count
 
         return self.convert_result(test, result)
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py	2021-01-18 19:58:24.000000000 +0000
@@ -24,7 +24,7 @@
     import pytest
 
 
-def run(path, server_config, session_config, timeout=0):
+def run(path, server_config, session_config, timeout=0, environ=None):
     """
     Run Python test at ``path`` in pytest.  The provided ``session``
     is exposed as a fixture available in the scope of the test functions.
@@ -41,28 +41,35 @@
     if pytest is None:
         do_delayed_imports()
 
-    os.environ["WD_HOST"] = session_config["host"]
-    os.environ["WD_PORT"] = str(session_config["port"])
-    os.environ["WD_CAPABILITIES"] = json.dumps(session_config["capabilities"])
-    os.environ["WD_SERVER_CONFIG"] = json.dumps(server_config.as_dict_for_wd_env_variable())
-
-    harness = HarnessResultRecorder()
-    subtests = SubtestResultRecorder()
-
-    with TemporaryDirectory() as cache:
-        try:
-            pytest.main(["--strict",  # turn warnings into errors
-                         "-vv",  # show each individual subtest and full failure logs
-                         "--capture", "no",  # enable stdout/stderr from tests
-                         "--basetemp", cache,  # temporary directory
-                         "--showlocals",  # display contents of variables in local scope
-                         "-p", "no:mozlog",  # use the WPT result recorder
-                         "-p", "no:cacheprovider",  # disable state preservation across invocations
-                         "-o=console_output_style=classic",  # disable test progress bar
-                         path],
-                        plugins=[harness, subtests])
-        except Exception as e:
-            harness.outcome = ("INTERNAL-ERROR", str(e))
+    old_environ = os.environ.copy()
+    try:
+        os.environ["WD_HOST"] = session_config["host"]
+        os.environ["WD_PORT"] = str(session_config["port"])
+        os.environ["WD_CAPABILITIES"] = json.dumps(session_config["capabilities"])
+        os.environ["WD_SERVER_CONFIG"] = json.dumps(server_config.as_dict_for_wd_env_variable())
+        if environ:
+            os.environ.update(environ)
+
+        harness = HarnessResultRecorder()
+        subtests = SubtestResultRecorder()
+
+        with TemporaryDirectory() as cache:
+            try:
+                pytest.main(["--strict",  # turn warnings into errors
+                             "-vv",  # show each individual subtest and full failure logs
+                             "--capture", "no",  # enable stdout/stderr from tests
+                             "--basetemp", cache,  # temporary directory
+                             "--showlocals",  # display contents of variables in local scope
+                             "-p", "no:mozlog",  # use the WPT result recorder
+                             "-p", "no:cacheprovider",  # disable state preservation across invocations
+                             "-o=console_output_style=classic",  # disable test progress bar
+                             path],
+                            plugins=[harness, subtests])
+            except Exception as e:
+                harness.outcome = ("INTERNAL-ERROR", str(e))
+
+    finally:
+        os.environ = old_environ
 
     return (harness.outcome, subtests.results)
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/chromium.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/chromium.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/chromium.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/chromium.py	2021-01-18 19:58:24.000000000 +0000
@@ -31,48 +31,55 @@
         # the trie and the leaf contains the dict of per-test data.
         self.tests = {}
 
-        # Message dictionary, keyed by test name. Value is a list of strings:
-        # see _append_test_message for the format.
+        # Two dictionaries keyed by test name. Values are lists of strings:
+        # actual metadata content and other messages, respectively.
+        # See _append_test_message for examples.
+        self.actual_metadata = defaultdict(list)
         self.messages = defaultdict(list)
 
         # List of tests that have failing subtests.
         self.tests_with_subtest_fails = set()
 
         # Browser log for the current test under execution.
-        self.test_log = []
+        # These logs are from ChromeDriver's stdout/err, so we cannot say for
+        # sure which test a message is from, but instead we correlate them based
+        # on timing.
+        self.browser_log = []
 
     def _append_test_message(self, test, subtest, wpt_actual_status, message):
-        """
+        r"""
         Appends the message data for a test or subtest.
+
         :param str test: the name of the test
         :param str subtest: the name of the subtest with the message. Will be
                             None if this is called for a test.
         :param str wpt_actual_status: the test status as reported by WPT
         :param str message: the string to append to the message for this test
 
-        Example:
-          [test_or_subtest_name]
-            expected: FAIL
-            message: some test message eg assert failure
-        """
-        # NOTE: throughout this function we output a key called "expected" but
-        # fill it in with the actual status. This is by design. The goal of this
-        # output is to look exactly like WPT's expectation metadata so that it
-        # can be easily diff-ed.
+        Example actual_metadata of a test with a subtest:
+            "[test_name]\n  expected: OK\n"
+            "  [subtest_name]\n    expected: FAIL\n"
+
+        NOTE: throughout this function we output a key called "expected" but
+        fill it in with the actual status. This is by design. The goal of this
+        output is to look exactly like WPT's expectation metadata so that it
+        can be easily diff-ed.
+
+        Messages are appended verbatim to self.messages[test].
+        """
         if subtest:
             result = "  [%s]\n    expected: %s\n" % (subtest, wpt_actual_status)
+            self.actual_metadata[test].append(result)
             if message:
-                result += "    message: %s\n" % message
-            self.messages[test].append(result)
+                self.messages[test].append("%s: %s\n" % (subtest, message))
         else:
             # No subtest, so this is the top-level test. The result must be
-            # prepended to the list of messages, so that the message for the
-            # test comes before any subtest messages.
+            # prepended to the list, so that it comes before any subtest.
             test_name_last_part = test.split("/")[-1]
             result = "[%s]\n  expected: %s\n" % (test_name_last_part, wpt_actual_status)
+            self.actual_metadata[test].insert(0, result)
             if message:
-                result += "  message: %s\n" % message
-            self.messages[test].insert(0, result)
+                self.messages[test].insert(0, "Harness: %s\n" % message)
 
     def _append_artifact(self, cur_dict, artifact_name, artifact_value):
         """
@@ -86,13 +93,16 @@
             cur_dict["artifacts"] = defaultdict(list)
         cur_dict["artifacts"][artifact_name].append(artifact_value)
 
-    def _store_test_result(self, name, actual, expected, messages, wpt_actual,
-                           subtest_failure, reftest_screenshots):
+    def _store_test_result(self, name, actual, expected, actual_metadata,
+                           messages, wpt_actual, subtest_failure,
+                           reftest_screenshots=None):
         """
         Stores the result of a single test in |self.tests|
+
         :param str name: name of the test.
         :param str actual: actual status of the test.
         :param str expected: expected statuses of the test.
+        :param list actual_metadata: a list of metadata items.
         :param list messages: a list of test messages.
         :param str wpt_actual: actual status reported by wpt, may differ from |actual|.
         :param bool subtest_failure: whether this test failed because of subtests.
@@ -112,10 +122,12 @@
         if wpt_actual != actual:
             self._append_artifact(cur_dict, "wpt_actual_status", wpt_actual)
         if wpt_actual == 'CRASH':
-            for line in self.test_log:
+            for line in self.browser_log:
                 self._append_artifact(cur_dict, "wpt_crash_log", line)
+        for metadata in actual_metadata:
+            self._append_artifact(cur_dict, "wpt_actual_metadata", metadata)
         for message in messages:
-            self._append_artifact(cur_dict, "log", message)
+            self._append_artifact(cur_dict, "wpt_log", message)
 
         # Store screenshots (if any).
         for item in reftest_screenshots or []:
@@ -172,7 +184,7 @@
         to the actual status if it's not.
 
         If the test has multiple statuses, it will have other statuses listed as
-        "known_intermittent" in |data|. If these exist, they will be appended to
+        "known_intermittent" in |data|. If these exist, they will be added to
         the returned status with spaced in between.
 
         :param str actual_status: the actual status of the test
@@ -181,8 +193,9 @@
         """
         expected_statuses = self._map_status_name(data["expected"]) if "expected" in data else actual_status
         if data.get("known_intermittent"):
-            expected_statuses += " " + " ".join(
-                [self._map_status_name(other_status) for other_status in data["known_intermittent"]])
+            all_statsues = {self._map_status_name(other_status) for other_status in data["known_intermittent"]}
+            all_statsues.add(expected_statuses)
+            expected_statuses = " ".join(sorted(all_statsues))
         return expected_statuses
 
     def suite_start(self, data):
@@ -229,19 +242,21 @@
         self._store_test_result(test_name,
                                 actual_status,
                                 expected_statuses,
+                                self.actual_metadata[test_name],
                                 self.messages[test_name],
                                 wpt_actual_status,
                                 subtest_failure,
                                 data.get("extra", {}).get("reftest_screenshots"))
 
-        # Remove the test from messages dict to avoid accumulating too many.
+        # Remove the test from dicts to avoid accumulating too many.
+        self.actual_metadata.pop(test_name)
         self.messages.pop(test_name)
 
         # Update the count of how many tests ran with each status.
         self.num_failures_by_status[actual_status] += 1
 
         # New test, new browser logs.
-        self.test_log = []
+        self.browser_log = []
 
     def suite_end(self, data):
         # Create the final result dictionary
@@ -258,4 +273,4 @@
 
     def process_output(self, data):
         if 'command' in data and 'chromedriver' in data['command']:
-            self.test_log.append(data['data'])
+            self.browser_log.append(data['data'])
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py	2021-01-18 19:58:24.000000000 +0000
@@ -157,17 +157,24 @@
     output_json = json.load(output)
 
     t1_artifacts = output_json["tests"]["t1"]["artifacts"]
-    assert t1_artifacts["log"] == [
+    assert t1_artifacts["wpt_actual_metadata"] == [
         "[t1]\n  expected: PASS\n",
-        "  [t1_a]\n    expected: FAIL\n    message: t1_a_message\n",
-        "  [t1_b]\n    expected: PASS\n    message: t1_b_message\n",
+        "  [t1_a]\n    expected: FAIL\n",
+        "  [t1_b]\n    expected: PASS\n",
+    ]
+    assert t1_artifacts["wpt_log"] == [
+        "t1_a: t1_a_message\n",
+        "t1_b: t1_b_message\n",
     ]
     assert t1_artifacts["wpt_subtest_failure"] == ["true"]
     t2_artifacts = output_json["tests"]["t2"]["artifacts"]
-    assert t2_artifacts["log"] == [
-        "[t2]\n  expected: TIMEOUT\n  message: t2_message\n",
+    assert t2_artifacts["wpt_actual_metadata"] == [
+        "[t2]\n  expected: TIMEOUT\n",
         "  [t2_a]\n    expected: PASS\n",
     ]
+    assert t2_artifacts["wpt_log"] == [
+        "Harness: t2_message\n"
+    ]
     assert "wpt_subtest_failure" not in t2_artifacts.keys()
 
 
@@ -210,11 +217,17 @@
 
     test_obj = output_json["tests"]["t1"]
     t1_artifacts = test_obj["artifacts"]
-    assert t1_artifacts["log"] == [
-        "[t1]\n  expected: PASS\n  message: top_message\n",
-        "  [t1_a]\n    expected: FAIL\n    message: t1_a_message\n",
-        "  [t1_b]\n    expected: PASS\n    message: t1_b_message\n",
-        "  [t1_c]\n    expected: TIMEOUT\n    message: t1_c_message\n",
+    assert t1_artifacts["wpt_actual_metadata"] == [
+        "[t1]\n  expected: PASS\n",
+        "  [t1_a]\n    expected: FAIL\n",
+        "  [t1_b]\n    expected: PASS\n",
+        "  [t1_c]\n    expected: TIMEOUT\n",
+    ]
+    assert t1_artifacts["wpt_log"] == [
+        "Harness: top_message\n",
+        "t1_a: t1_a_message\n",
+        "t1_b: t1_b_message\n",
+        "t1_c: t1_c_message\n",
     ]
     assert t1_artifacts["wpt_subtest_failure"] == ["true"]
     # The status of the test in the output is a failure because subtests failed,
@@ -266,13 +279,16 @@
     output_json = json.load(output)
 
     test_obj = output_json["tests"]["t1"]
-    t1_log = test_obj["artifacts"]["log"]
-    print("Lpz t1log=%s" % t1_log)
-    assert t1_log == [
+    assert test_obj["artifacts"]["wpt_actual_metadata"] == [
         "[t1]\n  expected: OK\n",
-        "  [t1_a]\n    expected: FAIL\n    message: t1_a_message\n",
-        "  [t1_b]\n    expected: PASS\n    message: t1_b_message\n",
-        "  [t1_c]\n    expected: TIMEOUT\n    message: t1_c_message\n",
+        "  [t1_a]\n    expected: FAIL\n",
+        "  [t1_b]\n    expected: PASS\n",
+        "  [t1_c]\n    expected: TIMEOUT\n",
+    ]
+    assert test_obj["artifacts"]["wpt_log"] == [
+        "t1_a: t1_a_message\n",
+        "t1_b: t1_b_message\n",
+        "t1_c: t1_c_message\n",
     ]
     # The status of the test in the output is a pass because the subtest
     # failures were all expected.
@@ -316,9 +332,12 @@
 
     test_obj = output_json["tests"]["t1"]
     t1_artifacts = test_obj["artifacts"]
-    assert t1_artifacts["log"] == [
+    assert t1_artifacts["wpt_actual_metadata"] == [
         "[t1]\n  expected: PASS\n",
-        "  [t1_a]\n    expected: PASS\n    message: t1_a_message\n",
+        "  [t1_a]\n    expected: PASS\n",
+    ]
+    assert t1_artifacts["wpt_log"] == [
+        "t1_a: t1_a_message\n",
     ]
     assert t1_artifacts["wpt_subtest_failure"] == ["true"]
     # Since the subtest status is unexpected, we fail the test. But we report
@@ -426,8 +445,8 @@
     test_obj = output_json["tests"]["t1"]
     # The test's statuses are all mapped, changing ERROR->FAIL and OK->PASS
     assert test_obj["actual"] == "FAIL"
-    # All the possible statuses are concatenated together into expected.
-    assert test_obj["expected"] == "PASS FAIL TIMEOUT"
+    # All the possible statuses are merged and sorted together into expected.
+    assert test_obj["expected"] == "FAIL PASS TIMEOUT"
     # ...this is not a regression or unexpected because the actual status is one
     # of the expected ones
     assert "is_regression" not in test_obj
@@ -462,7 +481,7 @@
     test_obj = output_json["tests"]["t1"]
     # The test's statuses are all mapped, changing ERROR->FAIL and OK->PASS
     assert test_obj["actual"] == "FAIL"
-    # All the possible statuses are concatenated together into expected.
+    # All the possible statuses are merged and sorted together into expected.
     assert test_obj["expected"] == "PASS TIMEOUT"
     # ...this is a regression and unexpected because the actual status is not
     # one of the expected ones
@@ -536,6 +555,39 @@
     assert test_obj["expected"] == "PASS"
 
 
+def test_known_intermittent_duplicate(capfd):
+    # We don't want to have duplicate statuses in the final "expected" field.
+
+    # Set up the handler.
+    output = StringIO()
+    logger = structuredlog.StructuredLogger("test_a")
+    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
+
+    # There are two duplications in this input:
+    # 1. known_intermittent already contains expected;
+    # 2. both statuses in known_intermittent map to FAIL in Chromium.
+    # In the end, we should only get one FAIL in Chromium "expected".
+    logger.suite_start(["t1"], run_info={}, time=123)
+    logger.test_start("t1")
+    logger.test_end("t1", status="ERROR", expected="ERROR", known_intermittent=["FAIL", "ERROR"])
+    logger.suite_end()
+
+    # Check nothing got output to stdout/stderr.
+    # (Note that mozlog outputs exceptions during handling to stderr!)
+    captured = capfd.readouterr()
+    assert captured.out == ""
+    assert captured.err == ""
+
+    # Check the actual output of the formatter.
+    output.seek(0)
+    output_json = json.load(output)
+
+    test_obj = output_json["tests"]["t1"]
+    assert test_obj["actual"] == "FAIL"
+    # No duplicate "FAIL" in "expected".
+    assert test_obj["expected"] == "FAIL"
+
+
 def test_reftest_screenshots(capfd):
     # reftest_screenshots, if present, should be plumbed into artifacts.
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js	2021-01-18 19:58:24.000000000 +0000
@@ -34,7 +34,7 @@
         } else if (data.type === "testdriver-complete") {
             const cmd_id = data.cmd_id;
             const [on_success, on_failure] = pending.get(cmd_id);
-            pending.clear(cmd_id);
+            pending.delete(cmd_id);
             const resolver = data.status === "success" ? on_success : on_failure;
             resolver(data);
             if (is_test_context) {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py	2021-01-18 19:58:24.000000000 +0000
@@ -664,8 +664,8 @@
             self.logger.debug("Unexpected count in this thread %i" % self.unexpected_count)
 
         if "assertion_count" in file_result.extra:
-            assertion_count = file_result.extra.pop("assertion_count")
-            if assertion_count > 0:
+            assertion_count = file_result.extra["assertion_count"]
+            if assertion_count is not None and assertion_count > 0:
                 self.logger.assertion_count(test.id,
                                             int(assertion_count),
                                             test.min_assertion_count,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/update/state.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/update/state.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/update/state.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/update/state.py	2021-01-18 19:58:24.000000000 +0000
@@ -97,7 +97,7 @@
         try:
             if not os.path.isfile(cls.filename):
                 return None
-            with open(cls.filename) as f:
+            with open(cls.filename, "rb") as f:
                 try:
                     rv = pickle.load(f)
                     logger.debug("Loading data %r" % (rv._data,))
@@ -111,7 +111,7 @@
 
     def save(self):
         """Write the state to disk"""
-        with open(self.filename, "w") as f:
+        with open(self.filename, "wb") as f:
             pickle.dump(self, f)
 
     def clear(self):
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py	2021-01-18 19:58:24.000000000 +0000
@@ -275,13 +275,15 @@
                     else:
                         browser_cls = product.browser_cls
 
-                    browser_kwargs = product.get_browser_kwargs(test_type,
+                    browser_kwargs = product.get_browser_kwargs(logger,
+                                                                test_type,
                                                                 run_info,
                                                                 config=test_environment.config,
                                                                 **kwargs)
 
                     executor_cls = product.executor_classes.get(test_type)
-                    executor_kwargs = product.get_executor_kwargs(test_type,
+                    executor_kwargs = product.get_executor_kwargs(logger,
+                                                                  test_type,
                                                                   test_environment.config,
                                                                   test_environment.cache_manager,
                                                                   run_info,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/setup.py firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/setup.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/setup.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/setup.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 PACKAGE_VERSION = '3.0'
-deps = ["six>=1.8", "h2==3.0.1"]
+deps = ["six>=1.13.0", "h2==3.0.1"]
 
 setup(name='wptserve',
       version=PACKAGE_VERSION,
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/tests/functional/docroot/subdir/import_handler.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,4 +1,4 @@
-import example_module
+from subdir import example_module
 
 
 def main(request, response):
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/handlers.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,5 @@
 import json
 import os
-import sys
 import traceback
 from collections import defaultdict
 
@@ -287,9 +286,9 @@
     def __repr__(self):
         return "<%s base_path:%s url_base:%s>" % (self.__class__.__name__, self.base_path, self.url_base)
 
-    def _set_path_and_load_file(self, request, response, func):
+    def _load_file(self, request, response, func):
         """
-        This modifies the `sys.path` and loads the requested python file as an environ variable.
+        This loads the requested python file as an environ variable.
 
         Once the environ is loaded, the passed `func` is run with this loaded environ.
 
@@ -300,11 +299,8 @@
         """
         path = filesystem_path(self.base_path, request, self.url_base)
 
-        sys_path = sys.path[:]
-        sys_modules = sys.modules.copy()
         try:
             environ = {"__file__": path}
-            sys.path.insert(0, os.path.dirname(path))
             with open(path, 'rb') as f:
                 exec(compile(f.read(), path, 'exec'), environ, environ)
 
@@ -313,9 +309,6 @@
 
         except IOError:
             raise HTTPException(404)
-        finally:
-            sys.path = sys_path
-            sys.modules = sys_modules
 
     def __call__(self, request, response):
         def func(request, response, environ, path):
@@ -326,7 +319,7 @@
             else:
                 raise HTTPException(500, "No main function in script %s" % path)
 
-        self._set_path_and_load_file(request, response, func)
+        self._load_file(request, response, func)
 
     def frame_handler(self, request):
         """
@@ -353,7 +346,7 @@
                 raise HTTPException(500, "No main function or handlers in script %s" % path)
 
             return handler
-        return self._set_path_and_load_file(request, None, func)
+        return self._load_file(request, None, func)
 
 
 python_script_handler = PythonScriptHandler()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/response.py firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/response.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/response.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/response.py	2021-01-18 19:58:24.000000000 +0000
@@ -41,11 +41,6 @@
        Boolean, default False, indicating whether the body content should be
        sent when the request method is HEAD.
 
-    .. attribute:: explicit_flush
-
-       Boolean indicating whether output should be flushed automatically or only
-       when requested.
-
     .. attribute:: writer
 
        The ResponseWriter for this response
@@ -73,7 +68,6 @@
 
         self.add_required_headers = True
         self.send_body_for_head_request = False
-        self.explicit_flush = False
         self.close_connection = False
 
         self.logger = get_logger()
@@ -665,11 +659,7 @@
     """Object providing an API to write out a HTTP response.
 
     :param handler: The RequestHandler being used.
-    :param response: The Response associated with this writer.
-
-    After each part of the response is written, the output is
-    flushed unless response.explicit_flush is False, in which case
-    the user must call .flush() explicitly."""
+    :param response: The Response associated with this writer."""
     def __init__(self, handler, response):
         self._wfile = handler.wfile
         self._response = response
@@ -707,52 +697,65 @@
 
         :param name: Name of the header field
         :param value: Value of the header field
+        :return: A boolean indicating whether the write succeeds
         """
         if not self._status_written:
             self.write_status(self.default_status)
         self._headers_seen.add(self.encode(name.lower()))
-        self.write(name)
-        self.write(b": ")
+        if not self.write(name):
+            return False
+        if not self.write(b": "):
+            return False
         if isinstance(value, int):
-            self.write(text_type(value))
-        else:
-            self.write(value)
-        self.write(b"\r\n")
-        if not self._response.explicit_flush:
-            self.flush()
+            if not self.write(text_type(value)):
+                return False
+        elif not self.write(value):
+            return False
+        return self.write(b"\r\n")
 
     def write_default_headers(self):
         for name, f in [("Server", self._handler.version_string),
                         ("Date", self._handler.date_time_string)]:
             if not self._seen_header(name):
-                self.write_header(name, f())
+                if not self.write_header(name, f()):
+                    return False
 
         if (isinstance(self._response.content, (binary_type, text_type)) and
             not self._seen_header("content-length")):
             #Would be nice to avoid double-encoding here
-            self.write_header("Content-Length", len(self.encode(self._response.content)))
+            if not self.write_header("Content-Length", len(self.encode(self._response.content))):
+                return False
+
+        return True
 
     def end_headers(self):
         """Finish writing headers and write the separator.
 
         Unless add_required_headers on the response is False,
         this will also add HTTP-mandated headers that have not yet been supplied
-        to the response headers"""
+        to the response headers.
+        :return: A boolean indicating whether the write succeeds
+        """
 
         if self._response.add_required_headers:
-            self.write_default_headers()
+            if not self.write_default_headers():
+                return False
 
-        self.write("\r\n")
+        if not self.write("\r\n"):
+            return False
         if not self._seen_header("content-length"):
             self._response.close_connection = True
-        if not self._response.explicit_flush:
-            self.flush()
         self._headers_complete = True
 
+        return True
+
     def write_content(self, data):
         """Write the body of the response.
 
-        HTTP-mandated headers will be automatically added with status default to 200 if they have not been explicitly set."""
+        HTTP-mandated headers will be automatically added with status default to 200 if they have
+        not been explicitly set.
+        :return: A boolean indicating whether the write succeeds
+        """
         if not self._status_written:
             self.write_status(self.default_status)
         if not self._headers_complete:
@@ -772,7 +775,9 @@
 
     def write(self, data):
         """Write directly to the response, converting unicode to bytes
-        according to response.encoding. Does not flush."""
+        according to response.encoding.
+        :return: A boolean indicating whether the write succeeds
+        """
         self.content_written = True
         try:
             self._wfile.write(self.encode(data))
@@ -782,8 +787,7 @@
             return False
 
     def write_content_file(self, data):
-        """Write a file-like object directly to the response in chunks.
-        Does not flush."""
+        """Write a file-like object directly to the response in chunks."""
         self.content_written = True
         success = True
         while True:
@@ -807,13 +811,3 @@
             return data.encode(self._response.encoding)
         else:
             raise ValueError("data %r should be text or binary, but is %s" % (data, type(data)))
-
-    def flush(self):
-        """Flush the output. Returns False if the flush failed due to
-        the socket being closed by the remote end."""
-        try:
-            self._wfile.flush()
-            return True
-        except socket.error:
-            # This can happen if the socket got closed by the remote end
-            return False
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/router.py firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/router.py
--- firefox-84.0.2+build1/testing/web-platform/tests/tools/wptserve/wptserve/router.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/tools/wptserve/wptserve/router.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 import itertools
 import re
+import sys
 
 from .logger import get_logger
 from six import binary_type, text_type
@@ -98,6 +99,16 @@
         self.doc_root = doc_root
         self.routes = []
         self.logger = get_logger()
+
+        # Add the doc_root to the Python path, so that any Python handler can
+        # correctly locate helper scripts (see RFC_TO_BE_LINKED).
+        #
+        # TODO: In a perfect world, Router would not need to know about this
+        # and the handler itself would take care of it. Currently, however, we
+        # treat handlers like functions and so there's no easy way to do that.
+        if self.doc_root not in sys.path:
+            sys.path.insert(0, self.doc_root)
+
         for route in reversed(routes):
             self.register(*route)
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/uievents/interface/click-event.htm firefox-85.0+build1/testing/web-platform/tests/uievents/interface/click-event.htm
--- firefox-84.0.2+build1/testing/web-platform/tests/uievents/interface/click-event.htm	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/uievents/interface/click-event.htm	2021-01-18 19:58:24.000000000 +0000
@@ -1,7 +1,8 @@
 <!doctype html>
 <html>
   <head>
-    <title>Click event is a MouseEvent</title>
+    <title>Click event is a PointerEvent</title>
+    <link rel="help" href="https://github.com/w3c/pointerevents/pull/317">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -10,10 +11,14 @@
     <div id="log"></div>
     <script type="text/javascript">
     var clicktarget = document.querySelector("#clicktarget");
-    var t = async_test("synthetic click event is a MouseEvent");
+    var t = async_test("synthetic click event is a PointerEvent");
     clicktarget.addEventListener('click', t.step_func(function (e) {
-      assert_equals(e.constructor, window.MouseEvent);
-      assert_true(e instanceof window.MouseEvent);
+      assert_equals(e.constructor, window.PointerEvent);
+      assert_true(e instanceof window.PointerEvent);
+      // Since this click is not generated by a pointing device, pointerId and
+      // pointerType must have default values (0 and empty string)
+      assert_equals(e.pointerId, 0);
+      assert_equals(e.pointerType, "");
       t.done();
     }));
     document.querySelector('#clicktarget').click();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus.html firefox-85.0+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus.html
--- firefox-84.0.2+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Focus-related events should fire in the correct order</title>
+  <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
+  <link rel="help" href="https://w3c.github.io/uievents/#events-focusevent-event-order">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/uievents/resources/eventrecorder.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+</head>
+
+<body>
+  <ol>
+    <li>Click into the first text input.</li>
+    <li>Click into the second text input.</li>
+    <li>Click the "Done" button.</li>
+  </ol>
+  <input type="text" id="a" value="First">
+  <br>
+  <input type="text" id="b" value="Second">
+  <br>
+  <button type="button" id="done">Done</button>
+</body>
+
+<script>
+setup({explicit_timeout: true});
+function stopPropagation(e) {
+  if (event.type == "focusin" || event.type == "focusout")
+    assert_true(event.bubbles);
+  e.stopPropagation();
+}
+var relevantEvents = [
+  "focus",
+  "blur",
+  "focusin",
+  "focusout"
+];
+window.onload = function () {
+  var a = document.getElementById("a");
+  var b = document.getElementById("b");
+  var button = document.getElementById("done");
+  var inputs = [a, b];
+  var actions_promise;
+  EventRecorder.configure({
+      objectMap: {
+         "a": a,
+         "b": b,
+      }
+    });
+
+  EventRecorder.addEventListenersForNodes(relevantEvents, inputs, stopPropagation);
+  var expected = [
+    {type: "focus", target: "a"},
+    {type: "focusin", target: "a"},
+    {type: "blur", target: "a"},
+    {type: "focusout", target: "a"},
+    {type: "focus", target: "b"},
+    {type: "focusin", target: "b"},
+    {type: "blur", target: "b"},
+    {type: "focusout", target: "b"}
+  ];
+
+  async_test(function(t) {
+    button.addEventListener("click", function () {
+      t.step(function () {
+        assert_true(EventRecorder.checkRecords(expected));
+        // Make sure the test finishes after all the input actions are completed.
+        actions_promise.then( () => {
+          t.done();
+        });
+      });
+    }, false);
+  }, "Focus-related events should fire in the correct order");
+  EventRecorder.start();
+
+  // Inject mouse inputs.
+  actions_promise = new test_driver.Actions()
+    .pointerMove(0, 0, {origin: a})
+    .pointerDown()
+    .pointerUp()
+    .pointerMove(0, 0, {origin: b})
+    .pointerDown()
+    .pointerUp()
+    .pointerMove(0, 0, {origin: button})
+    .pointerDown()
+    .pointerUp()
+    .send();
+};
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus-manual.html firefox-85.0+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus-manual.html
--- firefox-84.0.2+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus-manual.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/uievents/order-of-events/focus-events/focus-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Focus-related events should fire in the correct order</title>
-  <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
-  <link rel="help" href="https://w3c.github.io/uievents/#events-focusevent-event-order">
-  <meta name="flags" content="interact">
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="/uievents/resources/eventrecorder.js"></script>
-</head>
-
-<body>
-  <ol>
-    <li>Click into the first text input.</li>
-    <li>Click into the second text input.</li>
-    <li>Click the "Done" button.</li>
-  </ol>
-  <input type="text" id="a" value="First">
-  <br>
-  <input type="text" id="b" value="Second">
-  <br>
-  <button type="button" id="done">Done</button>
-</body>
-
-<script>
-setup({explicit_timeout: true});
-function stopPropagation(e) {
-  if (event.type == "focusin" || event.type == "focusout")
-    assert_true(event.bubbles);
-  e.stopPropagation();
-}
-var relevantEvents = [
-  "focus",
-  "blur",
-  "focusin",
-  "focusout"
-];
-window.onload = function () {
-  var a = document.getElementById("a");
-  var b = document.getElementById("b");
-  var inputs = [a, b];
-  EventRecorder.configure({
-      objectMap: {
-         "a": a,
-         "b": b,
-      }
-    });
-
-  EventRecorder.addEventListenersForNodes(relevantEvents, inputs, stopPropagation);
-  var expected = [
-    {type: "focusin", target: "a"},
-    {type: "focus", target: "a"},
-    {type: "focusout", target: "a"},
-    {type: "focusin", target: "b"},
-    {type: "blur", target: "a"},
-    {type: "focus", target: "b"},
-    {type: "focusout", target: "b"},
-    {type: "blur", target: "b"}
-  ];
-
-  async_test(function(t) {
-    document.getElementById("done").addEventListener("click", function () {
-      t.step(function () {
-        assert_true(EventRecorder.checkRecords(expected));
-        t.done();
-      });
-    }, false);
-  }, "Focus-related events should fire in the correct order");
-  EventRecorder.start();
-};
-</script>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/url/resources/percent-encoding.py firefox-85.0+build1/testing/web-platform/tests/url/resources/percent-encoding.py
--- firefox-84.0.2+build1/testing/web-platform/tests/url/resources/percent-encoding.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/url/resources/percent-encoding.py	2021-01-18 19:58:24.000000000 +0000
@@ -7,15 +7,15 @@
 def numeric_references(input):
     output = b""
     for cp in input:
-        output += b"&#x" + format(ord(cp), b"X") + b";"
+        output += b"&#x" + format(ord(cp), u"X").encode(u"utf-8") + b";"
     return output
 
 def main(request, response):
     # Undo the "magic" space with + replacement as otherwise base64 decoding will fail.
-    value = request.GET.first(b"value").replace(" ", "+")
+    value = request.GET.first(b"value").replace(b" ", b"+")
     encoding = request.GET.first(b"encoding")
 
-    output_value = numeric_references(base64.b64decode(value).decode(b"utf-8"))
+    output_value = numeric_references(base64.b64decode(value).decode(u"utf-8"))
     return (
         [(b"Content-Type", b"text/html;charset=" + encoding)],
         b"""<!doctype html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/input.https.any.js firefox-85.0+build1/testing/web-platform/tests/urlpattern/input.https.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/input.https.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/urlpattern/input.https.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,88 @@
+// META: global=window,worker
+// META: script=resources/utils.js
+
+// This file attempts to test the different ways you can pass input values
+// to be matched; e.g. as strings vs structured component parts.
+
+test(() => {
+  runTest({ pathname: '/foo/bar' }, [
+    { input: "https://example.com/foo/bar", expected: true },
+    { input: "https://example.com/foo/bar/baz", expected: false },
+  ]);
+}, "init single component, input string");
+
+test(() => {
+  runTest({ pathname: '/foo/bar' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+  ]);
+}, "init single component, input single component");
+
+test(() => {
+  runTest({ pathname: '/foo/bar' }, [
+    { input: { hostname: 'example.com', pathname: '/foo/bar' },
+      expected: true },
+    { input: { hostname: 'example.com', pathname: '/foo/bar/baz' },
+      expected: false },
+  ]);
+}, "init single component, input two components");
+
+test(() => {
+  runTest({ pathname: '/foo/bar' }, [
+    { input: { pathname: '/foo/bar', baseURL: 'https://example.com' },
+      expected: true },
+    { input: { pathname: '/foo/bar/baz', baseURL: 'https://example.com' },
+      expected: false },
+  ]);
+}, "init single component, input baseURL and single component");
+
+test(() => {
+  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
+    { input: "https://example.com/foo/bar", expected: true },
+    { input: "https://example.com/foo/bar/baz", expected: false },
+    { input: "https://example2.com/foo/bar", expected: false },
+    { input: "http://example.com/foo/bar", expected: false },
+  ]);
+}, "init baseURL and single component, input string");
+
+test(() => {
+  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
+    { input: { pathname: '/foo/bar' }, expected: false },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+  ]);
+}, "init baseURL and single component, input single component");
+
+test(() => {
+  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
+    { input: { hostname: 'example.com', pathname: '/foo/bar' },
+      expected: false },
+    { input: { hostname: 'example.com', pathname: '/foo/bar/baz' },
+      expected: false },
+    { input: { hostname: 'example2.com', pathname: '/foo/bar' },
+      expected: false },
+  ]);
+}, "init baseURL and single component, input two components");
+
+test(() => {
+  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
+    { input: { protocol: 'https', hostname: 'example.com',
+               pathname: '/foo/bar' },
+      expected: true },
+    { input: { protocol: 'https', hostname: 'example.com',
+               pathname: '/foo/bar/baz' },
+      expected: false },
+  ]);
+}, "init single component, input three components");
+
+test(() => {
+  runTest({ pathname: '/foo/bar', baseURL: 'https://example.com?query#hash' }, [
+    { input: { pathname: '/foo/bar', baseURL: 'https://example.com' },
+      expected: true },
+    { input: { pathname: '/foo/bar/baz', baseURL: 'https://example.com' },
+      expected: false },
+    { input: { pathname: '/foo/bar', baseURL: 'https://example2.com' },
+      expected: false },
+    { input: { pathname: '/foo/bar', baseURL: 'http://example.com' },
+      expected: false },
+  ]);
+}, "init baseURL and single component, input baseURL and single component");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/pathname.https.any.js firefox-85.0+build1/testing/web-platform/tests/urlpattern/pathname.https.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/pathname.https.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/urlpattern/pathname.https.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,139 @@
+// META: global=window,worker
+// META: script=resources/utils.js
+
+test(() => {
+  runTest({ pathname: '/foo/bar' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/ba' }, expected: false },
+    { input: { pathname: '/foo/bar/' }, expected: false },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+  ]);
+}, "fixed string");
+
+test(() => {
+  runTest({ pathname: '/foo/:bar' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/index.html' }, expected: true },
+    { input: { pathname: '/foo/bar/' }, expected: false },
+    { input: { pathname: '/foo/' }, expected: false },
+  ]);
+}, "named group");
+
+test(() => {
+  runTest({ pathname: '/foo/(.*)' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: true },
+    { input: { pathname: '/foo' }, expected: false },
+  ]);
+}, "regexp group");
+
+test(() => {
+  runTest({ pathname: '/foo/:bar(.*)' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: true },
+    { input: { pathname: '/foo' }, expected: false },
+  ]);
+}, "named regexp group");
+
+test(() => {
+  runTest({ pathname: '/foo/:bar?' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+  ]);
+}, "optional named group");
+
+test(() => {
+  runTest({ pathname: '/foo/:bar+' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo' }, expected: false },
+    { input: { pathname: '/foo/' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+  ]);
+}, "repeated named group");
+
+test(() => {
+  runTest({ pathname: '/foo/:bar*' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+  ]);
+}, "optional repeated named group");
+
+test(() => {
+  runTest({ pathname: '/foo/(.*)?' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: true },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/fo' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+  ]);
+}, "optional regexp group");
+
+test(() => {
+  runTest({ pathname: '/foo/(.*)+' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: true },
+    { input: { pathname: '/foo' }, expected: false },
+    { input: { pathname: '/fo' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+  ]);
+}, "repeated regexp group");
+
+test(() => {
+  runTest({ pathname: '/foo/(.*)*' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: true },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/fo' }, expected: false },
+    { input: { pathname: '/foobar' }, expected: false },
+  ]);
+}, "optional repeated regexp group");
+
+test(() => {
+  runTest({ pathname: '/foo{/bar}' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+    { input: { pathname: '/foo/' }, expected: false },
+    { input: { pathname: '/foo' }, expected: false },
+  ]);
+}, "group");
+
+test(() => {
+  runTest({ pathname: '/foo{/bar}?' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: false },
+  ]);
+}, "optional group");
+
+test(() => {
+  runTest({ pathname: '/foo{/bar}+' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+    { input: { pathname: '/foo' }, expected: false },
+    { input: { pathname: '/foo/' }, expected: false },
+  ]);
+}, "repeated group");
+
+test(() => {
+  runTest({ pathname: '/foo{/bar}*' }, [
+    { input: { pathname: '/foo/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/bar' }, expected: true },
+    { input: { pathname: '/foo/bar/baz' }, expected: false },
+    { input: { pathname: '/foo' }, expected: true },
+    { input: { pathname: '/foo/' }, expected: false },
+  ]);
+}, "repeated optional group");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/resources/utils.js firefox-85.0+build1/testing/web-platform/tests/urlpattern/resources/utils.js
--- firefox-84.0.2+build1/testing/web-platform/tests/urlpattern/resources/utils.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/urlpattern/resources/utils.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,7 @@
+function runTest(pattern, expected_list) {
+  const p = new URLPattern(pattern);
+  for (let entry of expected_list) {
+    assert_equals(p.test(entry.input), entry.expected,
+                  `input: ${JSON.stringify(entry.input)}`);
+  }
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/global/type.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/global/type.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/global/type.tentative.any.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/global/type.tentative.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -3,9 +3,10 @@
 
 function assert_type(argument) {
     const myglobal = new WebAssembly.Global(argument);
+    const globaltype = myglobal.type();
 
-    assert_equals(myglobal.type.value, argument.value);
-    assert_equals(myglobal.type.mutable, argument.mutable);
+    assert_equals(globaltype.value, argument.value);
+    assert_equals(globaltype.mutable, argument.mutable);
 }
 
 test(() => {
@@ -58,7 +59,7 @@
 
 test(() => {
     const myglobal = new WebAssembly.Global({"value": "i32", "mutable": true});
-    const propertyNames = Object.getOwnPropertyNames(myglobal.type);
+    const propertyNames = Object.getOwnPropertyNames(myglobal.type());
     assert_equals(propertyNames[0], "mutable");
     assert_equals(propertyNames[1], "value");
 }, "key ordering");
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/memory/type.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/memory/type.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/memory/type.tentative.any.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/memory/type.tentative.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -3,11 +3,12 @@
 
 function assert_type(argument) {
     const memory = new WebAssembly.Memory(argument);
+    const memorytype = memory.type()
 
-    assert_equals(memory.type.minimum, argument.minimum);
-    assert_equals(memory.type.maximum, argument.maximum);
+    assert_equals(memorytype.minimum, argument.minimum);
+    assert_equals(memorytype.maximum, argument.maximum);
     if (argument.shared !== undefined) {
-        assert_equals(memory.type.shared, argument.shared);
+        assert_equals(memorytype.shared, argument.shared);
     }
 }
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/table/type.tentative.any.js firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/table/type.tentative.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/wasm/jsapi/table/type.tentative.any.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/wasm/jsapi/table/type.tentative.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -3,10 +3,10 @@
 
 function assert_type(argument) {
     const mytable = new WebAssembly.Table(argument);
-
-    assert_equals(mytable.type.minimum, argument.minimum);
-    assert_equals(mytable.type.maximum, argument.maximum);
-    assert_equals(mytable.type.element, argument.element);
+    const tabletype = mytable.type()
+    assert_equals(tabletype.minimum, argument.minimum);
+    assert_equals(tabletype.maximum, argument.maximum);
+    assert_equals(tabletype.element, argument.element);
 }
 
 test(() => {
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html firefox-85.0+build1/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html	2021-01-18 19:58:24.000000000 +0000
@@ -211,17 +211,19 @@
         Promise
             .all([
               c1.startRendering().then(function(resultBuffer) {
-                return should(resultBuffer.getChannelData(0), 'c1 result')
-                    .beEqualToArray(data);
+                return resultBuffer;
               }),
               c2.startRendering().then(function(resultBuffer) {
-                return should(resultBuffer.getChannelData(0), 'c2 result')
-                    .beEqualToArray(data);
+                return resultBuffer;
               }),
             ])
-            .then(returnValues => {
+            .then(resultBuffers => {
+              let c1ResultValue = should(resultBuffers[0].getChannelData(0), 'c1 result')
+                  .beEqualToArray(data);
+              let c2ResultValue = should(resultBuffers[1].getChannelData(0), 'c2 result')
+                  .beEqualToArray(data);
               should(
-                  returnValues[0] && returnValues[1],
+                  c1ResultValue && c2ResultValue,
                   'AudioBuffer shared between two different contexts')
                   .message('correctly', 'incorrectly');
               task.done();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webauthn/createcredential-resident-key.https.html firefox-85.0+build1/testing/web-platform/tests/webauthn/createcredential-resident-key.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webauthn/createcredential-resident-key.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webauthn/createcredential-resident-key.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>navigator.credentials.create() test with residentKey and credProps</title>
+<meta name="timeout" content="long">
+<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=helpers.js></script>
+<script>
+
+"use strict";
+const credPropsTests = [
+  {
+    name: "U2F",
+    authenticatorArgs: {
+      protocol: "ctap1/u2f",
+    },
+    expected: {
+      discouraged: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      preferred: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      required: {
+        success: false,
+      },
+    },
+  },
+  {
+    name: "CTAP 2.0 without resident key support",
+    authenticatorArgs: {
+      protocol: "ctap2",
+      hasResidentKey: false,
+      hasUserVerification: true,
+      isUserVerified: true,
+    },
+    expected: {
+      discouraged: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      preferred: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      required: {
+        success: false,
+      },
+    },
+  },
+  {
+    name: "CTAP 2.0 with resident key support",
+    authenticatorArgs: {
+      protocol: "ctap2",
+      hasResidentKey: true,
+      hasUserVerification: true,
+      isUserVerified: true,
+    },
+    expected: {
+      discouraged: {
+        success: true,
+        // CTAP2.0 authenticators may treat all credentials as discoverable,
+        // thus Chrome omits 'rk' in this case.
+        hasRk: false,
+      },
+      preferred: {
+        success: true,
+        hasRk: true,
+        rk: true,
+      },
+      required: {
+        success: true,
+        hasRk: true,
+        rk: true,
+      },
+    },
+  },
+  {
+    name: "CTAP 2.1 without resident key support",
+    authenticatorArgs: {
+      protocol: "ctap2_1",
+      hasResidentKey: false,
+      hasUserVerification: true,
+      isUserVerified: true,
+    },
+    expected: {
+      discouraged: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      preferred: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      required: {
+        success: false,
+      },
+    },
+  },
+  {
+    name: "CTAP 2.1 with resident key support",
+    authenticatorArgs: {
+      protocol: "ctap2_1",
+      hasResidentKey: true,
+      hasUserVerification: true,
+      isUserVerified: true,
+    },
+    expected: {
+      discouraged: {
+        success: true,
+        hasRk: true,
+        rk: false,
+      },
+      preferred: {
+        success: true,
+        hasRk: true,
+        rk: true,
+      },
+      required: {
+        success: true,
+        hasRk: true,
+        rk: true,
+      },
+    },
+  },
+];
+
+for (const fixture of credPropsTests) {
+  for (const rkRequirement of ["discouraged", "preferred", "required"]) {
+    virtualAuthenticatorPromiseTest(async t => {
+      const promise = createCredential({
+        options: {
+          publicKey: {
+            authenticatorSelection: {
+              residentKey: rkRequirement,
+            },
+            extensions: {
+              credProps: true,
+            },
+          },
+        },
+      });
+
+      assert_true(rkRequirement in fixture.expected);
+      const expected = fixture.expected[rkRequirement];
+      assert_true('success' in expected);
+      if (!expected.success) {
+        return promise_rejects_dom(t, "NotAllowedError", promise);
+      }
+
+      const cred = await promise;
+      assert_true('credProps' in cred.getClientExtensionResults());
+      const credProps = cred.getClientExtensionResults().credProps;
+      assert_equals('rk' in credProps, expected.hasRk, "hasRk");
+      if (expected.hasRk) {
+        assert_equals(credProps.rk, expected.rk, "rk");
+      }
+    }, fixture.authenticatorArgs, fixture.name
+        + ": navigator.credentials.create() with credProps extension, rk="
+        + rkRequirement);
+  }
+}
+</script>
+</head>
+<body></body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webauthn/helpers.js firefox-85.0+build1/testing/web-platform/tests/webauthn/helpers.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webauthn/helpers.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webauthn/helpers.js	2021-01-18 19:58:24.000000000 +0000
@@ -550,31 +550,57 @@
     // TODO: parseAuthenticatorData() and make sure flags are correct
 }
 
+function defaultAuthenticatorArgs() {
+  return {
+    protocol: 'ctap1/u2f',
+    transport: 'usb',
+    hasResidentKey: false,
+    hasUserVerification: false,
+    isUserVerified: false,
+  };
+}
+
 function standardSetup(cb, options = {}) {
-    // Setup an automated testing environment if available.
-    let authenticatorArgs = {
-        protocol: "ctap1/u2f",
-        transport: "usb",
-        hasResidentKey: false,
-        hasUserVerification: false,
-        isUserVerified: false,
-    };
-    extendObject(authenticatorArgs, options);
-    window.test_driver.add_virtual_authenticator(authenticatorArgs).then(authenticator => {
+  // Setup an automated testing environment if available.
+  let authenticatorArgs = Object.assign(defaultAuthenticatorArgs(), options);
+  window.test_driver.add_virtual_authenticator(authenticatorArgs)
+      .then(authenticator => {
         cb();
         // XXX add a subtest to clean up the virtual authenticator since
         // testharness does not support waiting for promises on cleanup.
-        promise_test(() => window.test_driver.remove_virtual_authenticator(authenticator),
-                     "Clean up the test environment");
-    }).catch(error => {
-        if (error !== "error: Action add_virtual_authenticator not implemented") {
-            throw error;
+        promise_test(
+            () =>
+                window.test_driver.remove_virtual_authenticator(authenticator),
+            'Clean up the test environment');
+      })
+      .catch(error => {
+        if (error !==
+            'error: Action add_virtual_authenticator not implemented') {
+          throw error;
         }
         // The protocol is not available. Continue manually.
         cb();
-    });
+      });
 }
 
-/* JSHINT */
-/* globals promise_rejects_dom, promise_rejects_js, assert_class_string, assert_equals, assert_idl_attribute, assert_readonly, promise_test */
-/* exported standardSetup, CreateCredentialsTest, GetCredentialsTest */
+// virtualAuthenticatorPromiseTest runs |testCb| in a promise_test with a
+// virtual authenticator set up before and destroyed after the test, if the
+// virtual testing API is available. In manual tests, setup and teardown is
+// skipped.
+function virtualAuthenticatorPromiseTest(
+    testCb, options = {}, name = 'Virtual Authenticator Test') {
+  let authenticatorArgs = Object.assign(defaultAuthenticatorArgs(), options);
+  promise_test(async t => {
+    try {
+      let authenticator =
+          await window.test_driver.add_virtual_authenticator(authenticatorArgs);
+      t.add_cleanup(
+          () => window.test_driver.remove_virtual_authenticator(authenticator));
+    } catch (error) {
+      if (error !== 'error: Action add_virtual_authenticator not implemented') {
+        throw error;
+      }
+    }
+    return testCb(t);
+  }, name);
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-bundle/README.md firefox-85.0+build1/testing/web-platform/tests/web-bundle/README.md
--- firefox-84.0.2+build1/testing/web-platform/tests/web-bundle/README.md	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-bundle/README.md	2021-01-18 19:58:24.000000000 +0000
@@ -6,4 +6,5 @@
 To install them, run:
 ```
 go get -u github.com/WICG/webpackage/go/bundle/cmd/...
+export PATH=$PATH:$(go env GOPATH)/bin
 ```
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-bundle/resources/generate-test-wbns.sh firefox-85.0+build1/testing/web-platform/tests/web-bundle/resources/generate-test-wbns.sh
--- firefox-84.0.2+build1/testing/web-platform/tests/web-bundle/resources/generate-test-wbns.sh	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-bundle/resources/generate-test-wbns.sh	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,7 @@
 if ! command -v gen-bundle > /dev/null 2>&1; then
     echo "gen-bundle is not installed. Please run:"
     echo "  go get -u github.com/WICG/webpackage/go/bundle/cmd/..."
+    echo '  export PATH=$PATH:$(go env GOPATH)/bin'
     exit 1
 fi
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/audio-decoder.any.js firefox-85.0+build1/testing/web-platform/tests/webcodecs/audio-decoder.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/audio-decoder.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/audio-decoder.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,56 @@
+// META: global=window,dedicatedworker
+// META: script=/webcodecs/utils.js
+
+const defaultConfig = {
+  codec: "opus",
+  sampleRate: 48000,
+  numberOfChannels: 2
+};
+
+function getFakeChunk() {
+  return new EncodedAudioChunk({
+    type:'key',
+    timestamp:0,
+    data:Uint8Array.of(0)
+  });
+}
+
+promise_test(t => {
+  // AudioDecoderInit lacks required fields.
+  assert_throws_js(TypeError, () => { new AudioDecoder({}); });
+
+  // AudioDecoderInit has required fields.
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  assert_equals(decoder.state, "unconfigured");
+  decoder.close();
+
+  return endAfterEventLoopTurn();
+}, 'Test AudioDecoder construction');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  let badCodecsList = [
+    '',                         // Empty codec
+    'bogus',                    // Non exsitent codec
+    'vp8',                      // Video codec
+    'audio/webm; codecs="opus"' // Codec with mime type
+  ]
+
+  testConfigurations(decoder, defaultConfig, badCodecsList);
+
+  return endAfterEventLoopTurn();
+}, 'Test AudioDecoder.configure()');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  return testClosedCodec(t, decoder, defaultConfig, getFakeChunk());
+}, 'Verify closed AudioDecoder operations');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  return testUnconfiguredCodec(t, decoder, getFakeChunk());
+}, 'Verify unconfigured AudioDecoder operations');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/audio-decoder.html firefox-85.0+build1/testing/web-platform/tests/webcodecs/audio-decoder.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/audio-decoder.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/audio-decoder.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>Test the AudioDecoder API.</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/webcodecs/utils.js"></script>
-<script>
-
-const defaultConfig = {
-  codec: "opus",
-  sampleRate: 48000,
-  numberOfChannels: 2
-};
-
-function getFakeChunk() {
-  return new EncodedAudioChunk({
-    type:'key',
-    timestamp:0,
-    data:Uint8Array.of(0)
-  });
-}
-
-promise_test(t => {
-  // AudioDecoderInit lacks required fields.
-  assert_throws_js(TypeError, () => { new AudioDecoder({}); });
-
-  // AudioDecoderInit has required fields.
-  let decoder = new AudioDecoder(getDefaultCodecInit(t));
-
-  assert_equals(decoder.state, "unconfigured");
-  decoder.close();
-
-  return endAfterEventLoopTurn();
-}, 'Test AudioDecoder construction');
-
-promise_test(t => {
-  let decoder = new AudioDecoder(getDefaultCodecInit(t));
-
-  let badCodecsList = [
-    '',                         // Empty codec
-    'bogus',                    // Non exsitent codec
-    'vp8',                      // Video codec
-    'audio/webm; codecs="opus"' // Codec with mime type
-  ]
-
-  testConfigurations(decoder, defaultConfig, badCodecsList);
-
-  return endAfterEventLoopTurn();
-}, 'Test AudioDecoder.configure()');
-
-promise_test(t => {
-  let decoder = new AudioDecoder(getDefaultCodecInit(t));
-
-  return testClosedCodec(t, decoder, defaultConfig, getFakeChunk());
-}, 'Verify closed AudioDecoder operations');
-
-promise_test(t => {
-  let decoder = new AudioDecoder(getDefaultCodecInit(t));
-
-  return testUnconfiguredCodec(t, decoder, getFakeChunk());
-}, 'Verify unconfigured AudioDecoder operations');
-
-
-</script>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-decoder.any.js firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-decoder.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-decoder.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-decoder.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,242 @@
+// META: global=window,dedicatedworker
+// META: script=/webcodecs/utils.js
+
+// TODO(sandersd): Move metadata into a helper library.
+// TODO(sandersd): Add H.264 decode test once there is an API to query for
+// supported codecs.
+let h264 = {
+  async buffer() { return (await fetch('h264.mp4')).arrayBuffer(); },
+  codec: "avc1.64000c",
+  description: {offset: 7229, size: 46},
+  frames: [{offset: 48, size: 4007},
+           {offset: 4055, size: 926},
+           {offset: 4981, size: 241},
+           {offset: 5222, size: 97},
+           {offset: 5319, size: 98},
+           {offset: 5417, size: 624},
+           {offset: 6041, size: 185},
+           {offset: 6226, size: 94},
+           {offset: 6320, size: 109},
+           {offset: 6429, size: 281}]
+};
+
+let vp9 = {
+  async buffer() { return (await fetch('vp9.mp4')).arrayBuffer(); },
+  // TODO(sandersd): Verify that the file is actually level 1.
+  codec: "vp09.00.10.08",
+  frames: [{offset: 44, size: 3315},
+           {offset: 3359, size: 203},
+           {offset: 3562, size: 245},
+           {offset: 3807, size: 172},
+           {offset: 3979, size: 312},
+           {offset: 4291, size: 170},
+           {offset: 4461, size: 195},
+           {offset: 4656, size: 181},
+           {offset: 4837, size: 356},
+           {offset: 5193, size: 159}]
+};
+
+function view(buffer, {offset, size}) {
+  return new Uint8Array(buffer, offset, size);
+}
+
+function getFakeChunk() {
+  return new EncodedVideoChunk({
+    type:'key',
+    timestamp:0,
+    data:Uint8Array.of(0)
+  });
+}
+
+promise_test(t => {
+  // VideoDecoderInit lacks required fields.
+  assert_throws_js(TypeError, () => { new VideoDecoder({}); });
+
+  // VideoDecoderInit has required fields.
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  assert_equals(decoder.state, "unconfigured");
+
+  decoder.close();
+
+  return endAfterEventLoopTurn();
+}, 'Test VideoDecoder construction');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  let badCodecsList = [
+    '',                         // Empty codec
+    'bogus',                    // Non exsitent codec
+    'vorbis',                   // Audio codec
+    'vp9',                      // Ambiguous codec
+    'video/webm; codecs="vp9"'  // Codec with mime type
+  ]
+
+  testConfigurations(decoder, { codec: vp9.codec }, badCodecsList);
+
+  return endAfterEventLoopTurn();
+}, 'Test VideoDecoder.configure()');
+
+promise_test(async t => {
+  let buffer = await vp9.buffer();
+
+  let numOutputs = 0;
+  let decoder = new VideoDecoder({
+    output(frame) {
+      t.step(() => {
+        assert_equals(++numOutputs, 1, "outputs");
+        assert_equals(frame.cropWidth, 320, "cropWidth");
+        assert_equals(frame.cropHeight, 240, "cropHeight");
+        assert_equals(frame.timestamp, 0, "timestamp");
+        frame.destroy();
+      });
+    },
+    error(e) {
+      t.step(() => { throw e; });
+    }
+  });
+
+  decoder.configure({codec: vp9.codec});
+
+  decoder.decode(new EncodedVideoChunk({
+    type:'key',
+    timestamp:0,
+    data: view(buffer, vp9.frames[0])
+  }));
+
+  await decoder.flush();
+
+  assert_equals(numOutputs, 1, "outputs");
+}, 'Decode VP9');
+
+promise_test(async t => {
+  let buffer = await vp9.buffer();
+
+  let outputs_before_reset = 0;
+  let outputs_after_reset = 0;
+
+  let decoder = new VideoDecoder({
+    // Pre-reset() chunks will all have timestamp=0, while post-reset() chunks
+    // will all have timestamp=1.
+    output(frame) {
+      t.step(() => {
+        if (frame.timestamp == 0)
+          outputs_before_reset++;
+        else
+          outputs_after_reset++;
+      });
+    },
+    error(e) {
+      t.step(() => { throw e; });
+    }
+  });
+
+  decoder.configure({codec: vp9.codec});
+
+  for (let i = 0; i < 100; i++) {
+    decoder.decode(new EncodedVideoChunk({
+      type:'key',
+      timestamp:0,
+      data: view(buffer, vp9.frames[0])
+    }));
+  }
+
+  assert_greater_than(decoder.decodeQueueSize, 0);
+
+  // Wait for the first frame to be decoded.
+  await t.step_wait(() => outputs_before_reset > 0,
+      "Decoded outputs started coming", 10000, 1);
+
+  let saved_outputs_before_reset = outputs_before_reset;
+  assert_greater_than(saved_outputs_before_reset, 0);
+  assert_less_than(saved_outputs_before_reset, 100);
+
+  decoder.reset()
+  assert_equals(decoder.decodeQueueSize, 0);
+
+  decoder.configure({codec: vp9.codec});
+
+  for (let i = 0; i < 5; i++) {
+    decoder.decode(new EncodedVideoChunk({
+      type:'key',
+      timestamp:1,
+      data: view(buffer, vp9.frames[0])
+    }));
+  }
+  await decoder.flush();
+  assert_equals(outputs_after_reset, 5);
+  assert_equals(saved_outputs_before_reset, outputs_before_reset);
+  assert_equals(decoder.decodeQueueSize, 0);
+
+  endAfterEventLoopTurn();
+}, 'Verify reset() suppresses output and rejects flush');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  return testClosedCodec(t, decoder, { codec: vp9.codec }, getFakeChunk());
+}, 'Verify closed VideoDecoder operations');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  return testUnconfiguredCodec(t, decoder, getFakeChunk());
+}, 'Verify unconfigured VideoDecoder operations');
+
+promise_test(t => {
+  let numErrors = 0;
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.error = _ => numErrors++;
+
+  let decoder = new VideoDecoder(codecInit);
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
+      () => {
+        assert_equals(numErrors, 1, "errors");
+        assert_equals(decoder.state, "closed");
+      });
+}, 'Decode corrupt VP9 frame');
+
+promise_test(t => {
+  let numErrors = 0;
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.error = _ => numErrors++;
+
+  let decoder = new VideoDecoder(codecInit);
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
+      () => {
+        assert_equals(numErrors, 1, "errors");
+        assert_equals(decoder.state, "closed");
+      });
+}, 'Decode empty VP9 frame');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  // Create the flush promise before closing, as it is invalid to do so later.
+  let flushPromise = decoder.flush();
+
+  // This should synchronously reject the flush() promise.
+  decoder.close();
+
+  // TODO(sandersd): Wait for a bit in case there is a lingering output
+  // or error coming.
+  return promise_rejects_exactly(t, undefined, flushPromise);
+}, 'Close while decoding corrupt VP9 frame');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-decoder.html firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-decoder.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-decoder.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-decoder.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>Test the VideoDecoder API.</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/webcodecs/utils.js"></script>
-<script>
-'use strict';
-
-// TODO(sandersd): Move metadata into a helper library.
-// TODO(sandersd): Add H.264 idecode test once there is an API to query for
-// supported codecs.
-let h264 = {
-  async buffer() { return (await fetch('h264.mp4')).arrayBuffer(); },
-  codec: "avc1.64000c",
-  description: {offset: 7229, size: 46},
-  frames: [{offset: 48, size: 4007},
-           {offset: 4055, size: 926},
-           {offset: 4981, size: 241},
-           {offset: 5222, size: 97},
-           {offset: 5319, size: 98},
-           {offset: 5417, size: 624},
-           {offset: 6041, size: 185},
-           {offset: 6226, size: 94},
-           {offset: 6320, size: 109},
-           {offset: 6429, size: 281}]
-};
-
-let vp9 = {
-  async buffer() { return (await fetch('vp9.mp4')).arrayBuffer(); },
-  // TODO(sandersd): Verify that the file is actually level 1.
-  codec: "vp09.00.10.08",
-  frames: [{offset: 44, size: 3315},
-           {offset: 3359, size: 203},
-           {offset: 3562, size: 245},
-           {offset: 3807, size: 172},
-           {offset: 3979, size: 312},
-           {offset: 4291, size: 170},
-           {offset: 4461, size: 195},
-           {offset: 4656, size: 181},
-           {offset: 4837, size: 356},
-           {offset: 5193, size: 159}]
-};
-
-function view(buffer, {offset, size}) {
-  return new Uint8Array(buffer, offset, size);
-}
-
-function getFakeChunk() {
-  return new EncodedVideoChunk({
-    type:'key',
-    timestamp:0,
-    data:Uint8Array.of(0)
-  });
-}
-
-promise_test(t => {
-  // VideoDecoderInit lacks required fields.
-  assert_throws_js(TypeError, () => { new VideoDecoder({}); });
-
-  // VideoDecoderInit has required fields.
-  let decoder = new VideoDecoder(getDefaultCodecInit(t));
-
-  assert_equals(decoder.state, "unconfigured");
-
-  decoder.close();
-
-  return endAfterEventLoopTurn();
-}, 'Test VideoDecoder construction');
-
-promise_test(t => {
-  let decoder = new VideoDecoder(getDefaultCodecInit(t));
-
-  let badCodecsList = [
-    '',                         // Empty codec
-    'bogus',                    // Non exsitent codec
-    'vorbis',                   // Audio codec
-    'vp9',                      // Ambiguous codec
-    'video/webm; codecs="vp9"'  // Codec with mime type
-  ]
-
-  testConfigurations(decoder, { codec: vp9.codec }, badCodecsList);
-
-  return endAfterEventLoopTurn();
-}, 'Test VideoDecoder.configure()');
-
-promise_test(async t => {
-  let buffer = await vp9.buffer();
-
-  let numOutputs = 0;
-  let decoder = new VideoDecoder({
-    output(frame) {
-      t.step(() => {
-        assert_equals(++numOutputs, 1, "outputs");
-        assert_equals(frame.cropWidth, 320, "cropWidth");
-        assert_equals(frame.cropHeight, 240, "cropHeight");
-        assert_equals(frame.timestamp, 0, "timestamp");
-        frame.destroy();
-      });
-    },
-    error(e) {
-      t.step(() => { throw e; });
-    }
-  });
-
-  decoder.configure({codec: vp9.codec});
-
-  decoder.decode(new EncodedVideoChunk({
-    type:'key',
-    timestamp:0,
-    data: view(buffer, vp9.frames[0])
-  }));
-
-  await decoder.flush();
-
-  assert_equals(numOutputs, 1, "outputs");
-}, 'Decode VP9');
-
-promise_test(t => {
-  let decoder = new VideoDecoder(getDefaultCodecInit(t));
-
-  return testClosedCodec(t, decoder, { codec: vp9.codec }, getFakeChunk());
-}, 'Verify closed VideoDecoder operations');
-
-promise_test(t => {
-  let decoder = new VideoDecoder(getDefaultCodecInit(t));
-
-  return testUnconfiguredCodec(t, decoder, getFakeChunk());
-}, 'Verify unconfigured VideoDecoder operations');
-
-promise_test(t => {
-  let numErrors = 0;
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.error = _ => numErrors++;
-
-  let decoder = new VideoDecoder(codecInit);
-
-  decoder.configure({codec: vp9.codec});
-
-  let fakeChunk = getFakeChunk();
-  decoder.decode(fakeChunk);
-
-  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
-      () => {
-        assert_equals(numErrors, 1, "errors");
-        assert_equals(decoder.state, "closed");
-      });
-}, 'Decode corrupt VP9 frame');
-
-promise_test(t => {
-  let numErrors = 0;
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.error = _ => numErrors++;
-
-  let decoder = new VideoDecoder(codecInit);
-
-  decoder.configure({codec: vp9.codec});
-
-  let fakeChunk = getFakeChunk();
-  decoder.decode(fakeChunk);
-
-  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
-      () => {
-        assert_equals(numErrors, 1, "errors");
-        assert_equals(decoder.state, "closed");
-      });
-}, 'Decode empty VP9 frame');
-
-promise_test(t => {
-  let decoder = new VideoDecoder(getDefaultCodecInit(t));
-
-  decoder.configure({codec: vp9.codec});
-
-  let fakeChunk = getFakeChunk();
-  decoder.decode(fakeChunk);
-
-  // Create the flush promise before closing, as it is invalid to do so later.
-  let flushPromise = decoder.flush();
-
-  // This should synchronously reject the flush() promise.
-  decoder.close();
-
-  // TODO(sandersd): Wait for a bit in case there is a lingering output
-  // or error coming.
-  return promise_rejects_exactly(t, undefined, flushPromise);
-}, 'Close while decoding corrupt VP9 frame');
-</script>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame.any.js firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,99 @@
+// META: global=window,dedicatedworker
+// META: script=/webcodecs/utils.js
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 10});
+
+  assert_equals(frame.timestamp, 10, "timestamp");
+  assert_equals(frame.duration, null, "duration");
+  assert_equals(frame.cropWidth, 32, "cropWidth");
+  assert_equals(frame.cropHeight, 16, "cropHeight");
+  assert_equals(frame.cropWidth, 32, "displayWidth");
+  assert_equals(frame.cropHeight, 16, "displayHeight");
+
+  frame.destroy();
+}, 'Test we can construct a VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(1, 1);
+  let frame = new VideoFrame(image, {timestamp: 10});
+
+  assert_equals(frame.cropWidth, 1, "cropWidth");
+  assert_equals(frame.cropHeight, 1, "cropHeight");
+  assert_equals(frame.cropWidth, 1, "displayWidth");
+  assert_equals(frame.cropHeight, 1, "displayHeight");
+
+  frame.destroy();
+}, 'Test we can construct an odd-sized VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 0});
+
+  // TODO(sandersd): This would be more clear as RGBA, but conversion has
+  // not be specified (or implemented) yet.
+  if (frame.format !== "I420") {
+    return;
+  }
+  assert_equals(frame.planes.length, 3, "number of planes");
+
+  // Validate Y plane metadata.
+  let yPlane = frame.planes[0];
+  let yStride = yPlane.stride;
+  let yRows = yPlane.rows;
+  let yLength = yPlane.length;
+
+  // Required minimums to contain the visible data.
+  assert_greater_than_equal(yRows, 16, "Y plane rows");
+  assert_greater_than_equal(yStride, 32, "Y plane stride");
+  assert_greater_than_equal(yLength, 32 * 16, "Y plane length");
+
+  // Not required by spec, but sets limit at 50% padding per dimension.
+  assert_less_than_equal(yRows, 32, "Y plane rows");
+  assert_less_than_equal(yStride, 64, "Y plane stride");
+  assert_less_than_equal(yLength, 32 * 64, "Y plane length");
+
+  // Validate Y plane data.
+  let buffer = new ArrayBuffer(yLength);
+  let view = new Uint8Array(buffer);
+  frame.planes[0].readInto(view);
+
+  // TODO(sandersd): This probably needs to be fuzzy unless we can make
+  // guarantees about the color space.
+  assert_equals(view[0], 94, "Y value at (0, 0)");
+
+  frame.destroy();
+}, 'Test we can read planar data from a VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 0});
+
+  // TODO(sandersd): This would be more clear as RGBA, but conversion has
+  // not be specified (or implemented) yet.
+  if (frame.format !== "I420") {
+    return;
+  }
+
+  assert_equals(frame.planes.length, 3, "number of planes");
+
+  // Attempt to read Y plane data, but destroy the frame first.
+  let yPlane = frame.planes[0];
+  let yLength = yPlane.length;
+  frame.destroy();
+
+  let buffer = new ArrayBuffer(yLength);
+  let view = new Uint8Array(buffer);
+  assert_throws_dom("InvalidStateError", () => yPlane.readInto(view));
+}, 'Test we cannot read planar data from a destroyed VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+
+  image.close();
+
+  assert_throws_dom("InvalidStateError", () => {
+    let frame = new VideoFrame(image, {timestamp: 10});
+  })
+}, 'Test constructing VideoFrames from closed ImageBitmap throws.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame.html firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>Test the VideoFrame API.</title>
-<body></body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/webcodecs/utils.js"></script>
-<script>
-
-test(t => {
-  let image = makeImageBitmap(32, 16);
-  let frame = new VideoFrame(image, {timestamp: 10});
-
-  assert_equals(frame.timestamp, 10, "timestamp");
-  assert_equals(frame.duration, null, "duration");
-  assert_equals(frame.cropWidth, 32, "cropWidth");
-  assert_equals(frame.cropHeight, 16, "cropHeight");
-  assert_equals(frame.cropWidth, 32, "displayWidth");
-  assert_equals(frame.cropHeight, 16, "displayHeight");
-
-  frame.destroy();
-}, 'Test we can construct a VideoFrame.');
-
-test(t => {
-  let image = makeImageBitmap(1, 1);
-  let frame = new VideoFrame(image, {timestamp: 10});
-
-  assert_equals(frame.cropWidth, 1, "cropWidth");
-  assert_equals(frame.cropHeight, 1, "cropHeight");
-  assert_equals(frame.cropWidth, 1, "displayWidth");
-  assert_equals(frame.cropHeight, 1, "displayHeight");
-
-  frame.destroy();
-}, 'Test we can construct an odd-sized VideoFrame.');
-
-test(t => {
-  let image = makeImageBitmap(32, 16);
-  let frame = new VideoFrame(image, {timestamp: 0});
-
-  // TODO(sandersd): This would be more clear as RGBA, but conversion has
-  // not be specified (or implemented) yet.
-  if (frame.format !== "I420") {
-    return;
-  }
-  assert_equals(frame.planes.length, 3, "number of planes");
-
-  // Validate Y plane metadata.
-  let yPlane = frame.planes[0];
-  let yStride = yPlane.stride;
-  let yRows = yPlane.rows;
-  let yLength = yPlane.length;
-
-  // Required minimums to contain the visible data.
-  assert_greater_than_equal(yRows, 16, "Y plane rows");
-  assert_greater_than_equal(yStride, 32, "Y plane stride");
-  assert_greater_than_equal(yLength, 32 * 16, "Y plane length");
-
-  // Not required by spec, but sets limit at 50% padding per dimension.
-  assert_less_than_equal(yRows, 32, "Y plane rows");
-  assert_less_than_equal(yStride, 64, "Y plane stride");
-  assert_less_than_equal(yLength, 32 * 64, "Y plane length");
-
-  // Validate Y plane data.
-  let buffer = new ArrayBuffer(yLength);
-  let view = new Uint8Array(buffer);
-  frame.planes[0].readInto(view);
-
-  // TODO(sandersd): This probably needs to be fuzzy unless we can make
-  // guarantees about the color space.
-  assert_equals(view[0], 94, "Y value at (0, 0)");
-
-  frame.destroy();
-}, 'Test we can read planar data from a VideoFrame.');
-
-test(t => {
-  let image = makeImageBitmap(32, 16);
-  let frame = new VideoFrame(image, {timestamp: 0});
-
-  // TODO(sandersd): This would be more clear as RGBA, but conversion has
-  // not be specified (or implemented) yet.
-  if (frame.format !== "I420") {
-    return;
-  }
-
-  assert_equals(frame.planes.length, 3, "number of planes");
-
-  // Attempt to read Y plane data, but destroy the frame first.
-  let yPlane = frame.planes[0];
-  let yLength = yPlane.length;
-  frame.destroy();
-
-  let buffer = new ArrayBuffer(yLength);
-  let view = new Uint8Array(buffer);
-  assert_throws_dom("InvalidStateError", () => yPlane.readInto(view));
-}, 'Test we cannot read planar data from a destroyed VideoFrame.');
-
-test(t => {
-  let image = makeImageBitmap(32, 16);
-
-  image.close();
-
-  assert_throws_dom("InvalidStateError", () => {
-    let frame = new VideoFrame(image, {timestamp: 10});
-  })
-}, 'Test constructing VideoFrames from closed ImageBitmap throws.');
-
-</script>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.any.js firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.any.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.any.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.any.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,114 @@
+// META: global=window,dedicatedworker
+// META: script=/common/media.js
+// META: script=/webcodecs/utils.js
+
+var defaultInit = {
+  timestamp : 100,
+  duration : 33,
+}
+
+function createDefaultVideoFrame() {
+  let image = makeImageBitmap(32,16);
+
+  return new VideoFrame(image, defaultInit);
+}
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  let clone = frame.clone();
+
+  assert_equals(frame.timestamp, clone.timestamp);
+  assert_equals(frame.duration, clone.duration);
+  assert_equals(frame.cropWidth, clone.cropWidth);
+  assert_equals(frame.cropHeight, clone.cropHeight);
+  assert_equals(frame.cropWidth, clone.cropWidth);
+  assert_equals(frame.cropHeight, clone.cropHeight);
+
+  frame.destroy();
+  clone.destroy();
+}, 'Test we can clone a VideoFrame.');
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  let copy = frame;
+  let clone = frame.clone();
+
+  frame.destroy();
+
+  assert_not_equals(copy.timestamp, defaultInit.timestamp);
+  assert_equals(clone.timestamp, defaultInit.timestamp);
+
+  clone.destroy();
+}, 'Verify destroying a frame doesn\'t affect its clones.');
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  frame.destroy();
+
+  assert_throws_dom("InvalidStateError", () => {
+    let clone = frame.clone();
+  });
+}, 'Verify cloning a destroyed frame throws.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+  let externalPort = channel.port2;
+
+  externalPort.onmessage = t.step_func((e) => {
+    let externalFrame = e.data;
+    externalFrame.destroy();
+    externalPort.postMessage("Done");
+  })
+
+  localPort.onmessage = t.step_func_done((e) => {
+    assert_not_equals(localFrame.timestamp, defaultInit.timestamp);
+  })
+
+  localPort.postMessage(localFrame);
+
+}, 'Verify destroying frames propagates accross contexts.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+  let externalPort = channel.port2;
+
+  externalPort.onmessage = t.step_func((e) => {
+    let externalFrame = e.data;
+    externalFrame.destroy();
+    externalPort.postMessage("Done");
+  })
+
+  localPort.onmessage = t.step_func_done((e) => {
+    assert_equals(localFrame.timestamp, defaultInit.timestamp);
+    localFrame.destroy();
+  })
+
+  localPort.postMessage(localFrame.clone());
+
+}, 'Verify destroying cloned frames doesn\'t propagate accross contexts.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+
+  localPort.onmessage = t.unreached_func();
+
+  localFrame.destroy();
+
+  assert_throws_dom("DataCloneError", () => {
+    localPort.postMessage(localFrame);
+  });
+
+  t.done();
+}, 'Verify posting destroyed frames throws.');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.html firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webcodecs/video-frame-serialization.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>Test posting VideoFrames.</title>
-<body></body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script src="/webcodecs/utils.js"></script>
-<script>
-
-var defaultInit = {
-  timestamp : 100,
-  duration : 33,
-}
-
-function createDefaultVideoFrame() {
-  let image = makeImageBitmap(32,16);
-
-  return new VideoFrame(image, defaultInit);
-}
-
-test(t => {
-  let frame = createDefaultVideoFrame();
-
-  let clone = frame.clone();
-
-  assert_equals(frame.timestamp, clone.timestamp);
-  assert_equals(frame.duration, clone.duration);
-  assert_equals(frame.cropWidth, clone.cropWidth);
-  assert_equals(frame.cropHeight, clone.cropHeight);
-  assert_equals(frame.cropWidth, clone.cropWidth);
-  assert_equals(frame.cropHeight, clone.cropHeight);
-
-  frame.destroy();
-  clone.destroy();
-}, 'Test we can clone a VideoFrame.');
-
-test(t => {
-  let frame = createDefaultVideoFrame();
-
-  let copy = frame;
-  let clone = frame.clone();
-
-  frame.destroy();
-
-  assert_not_equals(copy.timestamp, defaultInit.timestamp);
-  assert_equals(clone.timestamp, defaultInit.timestamp);
-
-  clone.destroy();
-}, 'Verify destroying a frame doesn\'t affect its clones.');
-
-test(t => {
-  let frame = createDefaultVideoFrame();
-
-  frame.destroy();
-
-  assert_throws_dom("InvalidStateError", () => {
-    let clone = frame.clone();
-  });
-}, 'Verify cloning a destroyed frame throws.');
-
-async_test(t => {
-  let localFrame = createDefaultVideoFrame();
-
-  let channel = new MessageChannel();
-  let localPort = channel.port1;
-  let externalPort = channel.port2;
-
-  externalPort.onmessage = t.step_func((e) => {
-    let externalFrame = e.data;
-    externalFrame.destroy();
-    externalPort.postMessage("Done");
-  })
-
-  localPort.onmessage = t.step_func_done((e) => {
-    assert_not_equals(localFrame.timestamp, defaultInit.timestamp);
-  })
-
-  localPort.postMessage(localFrame);
-
-}, 'Verify destroying frames propagates accross contexts.');
-
-async_test(t => {
-  let localFrame = createDefaultVideoFrame();
-
-  let channel = new MessageChannel();
-  let localPort = channel.port1;
-  let externalPort = channel.port2;
-
-  externalPort.onmessage = t.step_func((e) => {
-    let externalFrame = e.data;
-    externalFrame.destroy();
-    externalPort.postMessage("Done");
-  })
-
-  localPort.onmessage = t.step_func_done((e) => {
-    assert_equals(localFrame.timestamp, defaultInit.timestamp);
-    localFrame.destroy();
-  })
-
-  localPort.postMessage(localFrame.clone());
-
-}, 'Verify destroying cloned frames doesn\'t propagate accross contexts.');
-
-async_test(t => {
-  let localFrame = createDefaultVideoFrame();
-
-  let channel = new MessageChannel();
-  let localPort = channel.port1;
-
-  localPort.onmessage = t.unreached_func();
-
-  localFrame.destroy();
-
-  assert_throws_dom("DataCloneError", () => {
-    localPort.postMessage(localFrame);
-  });
-
-  t.done();
-}, 'Verify posting destroyed frames throws.');
-
-</script>
-</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/element_click/__init__.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/element_click/__init__.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/element_click/__init__.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/element_click/__init__.py	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,16 @@
+from tests.support.sync import Poll
+
+
+def wait_for_new_handle(session, handles_before):
+    def find_new_handle(session):
+        new_handles = list(set(session.handles) - set(handles_before))
+        if new_handles and len(new_handles) == 1:
+            return new_handles[0]
+        return None
+
+    wait = Poll(
+        session,
+        timeout=5,
+        message="No new window has been opened")
+
+    return wait.until(find_new_handle)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/element_click/navigate.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/element_click/navigate.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/element_click/navigate.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/element_click/navigate.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,7 +1,13 @@
+import pytest
+
+from webdriver.error import NoSuchElementException
+
 from tests.support.asserts import assert_success
-from tests.support.inline import inline
+from tests.support.inline import iframe, inline
 from tests.support.sync import Poll
 
+from . import wait_for_new_handle
+
 
 def element_click(session, element):
     return session.transport.send(
@@ -93,31 +99,72 @@
             """, args=(element,)) is True
 
 
-def test_link_open_target_in_new_window(session, url):
-    orig_handles = session.handles
+@pytest.mark.parametrize("target", [
+    "",
+    "_blank",
+    "_parent",
+    "_self",
+    "_top",
+])
+def test_link_from_toplevel_context_with_target(session, target):
+    target_page = inline("<p id='foo'>foo</p>")
 
-    session.url = inline("""
-        <a href="{}" target="_blank">Open in new window</a>
-    """.format(inline("<p id=foo")))
+    session.url = inline("<a href='{}' target='{}'>click</a>".format(target_page, target))
     element = session.find.css("a", all=False)
 
+    orig_handles = session.handles
+
     response = element_click(session, element)
     assert_success(response)
 
-    def find_new_handle(session):
-        new_handles = list(set(session.handles) - set(orig_handles))
-        if new_handles and len(new_handles) == 1:
-            return new_handles[0]
-        return None
+    if target == "_blank":
+        session.window_handle = wait_for_new_handle(session, orig_handles)
 
     wait = Poll(
         session,
         timeout=5,
-        message="No new window has been opened")
-    new_handle = wait.until(find_new_handle)
+        ignored_exceptions=NoSuchElementException,
+        message="Expected element has not been found")
+    wait.until(lambda s: s.find.css("#foo"))
+
+
+@pytest.mark.parametrize("target", [
+    "",
+    "_blank",
+    "_parent",
+    "_self",
+    "_top",
+])
+def test_link_from_nested_context_with_target(session, target):
+    target_page = inline("<p id='foo'>foo</p>")
+
+    session.url = inline(iframe("<a href='{}' target='{}'>click</a>".format(target_page, target)))
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    element = session.find.css("a".format(target), all=False)
+
+    orig_handles = session.handles
 
-    session.window_handle = new_handle
-    session.find.css("#foo")
+    response = element_click(session, element)
+    assert_success(response)
+
+    if target == "_blank":
+        session.window_handle = wait_for_new_handle(session, orig_handles)
+
+    # With the current browsing context removed the navigation should
+    # not timeout. Switch to the target context, and wait until the expected
+    # element is available.
+    if target == "_parent":
+        session.switch_frame("parent")
+    elif target == "_top":
+        session.switch_frame(None)
+
+    wait = Poll(
+        session,
+        timeout=5,
+        ignored_exceptions=NoSuchElementException,
+        message="Expected element has not been found")
+    wait.until(lambda s: s.find.css("#foo"))
 
 
 def test_link_closes_window(session):
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/fixtures.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/fixtures.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/fixtures.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/fixtures.py	2021-01-18 19:58:24.000000000 +0000
@@ -10,7 +10,7 @@
 from six.moves.urllib.parse import urlunsplit
 
 from tests.support import defaults
-from tests.support.helpers import cleanup_session
+from tests.support.helpers import cleanup_session, deep_update
 from tests.support.inline import inline
 from tests.support.http_request import HTTPRequest
 from tests.support.sync import Poll
@@ -124,7 +124,7 @@
     # Update configuration capabilities with custom ones from the
     # capabilities fixture, which can be set by tests
     caps = copy.deepcopy(configuration["capabilities"])
-    caps.update(capabilities)
+    deep_update(caps, capabilities)
     caps = {"alwaysMatch": caps}
 
     # If there is a session with different capabilities active, end it now
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/helpers.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/helpers.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/helpers.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/helpers.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,8 +1,11 @@
 from __future__ import print_function
 
+import collections
 import math
 import sys
 
+from six import iteritems
+
 import webdriver
 
 from tests.support import defaults
@@ -106,6 +109,20 @@
     session.transport.send("DELETE", "session/%s/cookie" % session.session_id)
 
 
+def deep_update(source, overrides):
+    """
+    Update a nested dictionary or similar mapping.
+    Modify ``source`` in place.
+    """
+    for key, value in iteritems(overrides):
+        if isinstance(value, collections.Mapping) and value:
+            returned = deep_update(source.get(key, {}), value)
+            source[key] = returned
+        else:
+            source[key] = overrides[key]
+    return source
+
+
 def document_dimensions(session):
     return tuple(session.execute_script("""
         let rect = document.documentElement.getBoundingClientRect();
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/merge_dictionaries.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/merge_dictionaries.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/support/merge_dictionaries.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/support/merge_dictionaries.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,9 +1,4 @@
-def iteritems(d):
-    """Create a key-value iterator for the given dict in both Python 2.x and
-    Python 3.x environments"""
-    if hasattr(d, "iteritems"):
-        return d.iteritems()
-    return d.items()
+from six import iteritems
 
 def merge_dictionaries(first, second):
     """Given two dictionaries, create a third that defines all specified
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/switch_to_frame/switch.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/switch_to_frame/switch.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/switch_to_frame/switch.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/switch_to_frame/switch.py	2021-01-18 19:58:24.000000000 +0000
@@ -2,7 +2,7 @@
 
 import webdriver.protocol as protocol
 
-from webdriver import StaleElementReferenceException
+from webdriver import NoSuchElementException
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_same_element, assert_success
@@ -96,9 +96,9 @@
     response = switch_to_frame(session, None)
     assert_success(response)
 
-    with pytest.raises(StaleElementReferenceException):
+    with pytest.raises(NoSuchElementException):
         element2.text
-    with pytest.raises(StaleElementReferenceException):
+    with pytest.raises(NoSuchElementException):
         element1.text
 
     frame = session.find.css("iframe", all=False)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py
--- firefox-84.0.2+build1/testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webdriver/tests/switch_to_parent_frame/switch.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,6 @@
 import pytest
 
-from webdriver import StaleElementReferenceException
+from webdriver import NoSuchElementException
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline, iframe
@@ -67,13 +67,13 @@
     session.url = inline(iframe("<p>foo"))
     frame_element = session.find.css("iframe", all=False)
     session.switch_frame(frame_element)
-    stale_element = session.find.css("p", all=False)
+    element = session.find.css("p", all=False)
 
     result = switch_to_parent_frame(session)
     assert_success(result)
 
-    with pytest.raises(StaleElementReferenceException):
-        stale_element.text
+    with pytest.raises(NoSuchElementException):
+        element.text
 
 
 def test_switch_from_top_level(session):
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/idlharness.https.window.js firefox-85.0+build1/testing/web-platform/tests/web-nfc/idlharness.https.window.js
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/idlharness.https.window.js	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/idlharness.https.window.js	2021-01-18 19:58:24.000000000 +0000
@@ -21,7 +21,6 @@
   ['html', 'dom', 'WebIDL'],
   idl_array => {
     idl_array.add_objects({
-      NDEFWriter: ['new NDEFWriter();'],
       NDEFReader: ['new NDEFReader();'],
       NDEFRecord: [`new NDEFRecord(${JSON.stringify(record)});`],
       NDEFMessage: [`new NDEFMessage(${JSON.stringify(message)});`],
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-document-hidden-manual.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-document-hidden-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-document-hidden-manual.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-document-hidden-manual.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="timeout" content="long">
-<title>NDEFReader.onreading respect page visibility changes</title>
-<link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/nfc-helpers.js"></script>
-<script>
-
-nfc_test(async (t, mockNFC) => {
-  mockNFC.simulateClosedPipe();
-  const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
-    if (document.hidden) reject();
-    resolve();
-  });
-  await reader.scan();
-  await promise;
-}, "Test NDEFReader.onreading is not fired when document is hidden");
-
-</script>
-
-<p>Step1: switch the page to the background, then tap a formatted NFC tag.</p>
-<p>Step2: switch back to the page, then tap the tag again.</p>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-read-document-hidden-manual.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>NDEFReader.onreading respect page visibility changes</title>
+<link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/nfc-helpers.js"></script>
+<script>
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  const ndefWatcher = new EventWatcher(t, reader, ["reading", "readingerror"]);
+  const promise = new Promise((resolve, reject) => {
+    ndefWatcher.wait_for("reading").then(event => {
+      if (document.hidden) reject();
+      else resolve();
+    });
+  });
+  await ndef.scan();
+  await promise;
+}, "Test NDEFReader.onreading is not fired when document is hidden");
+
+</script>
+
+<p>Step1: switch the page to the background, then tap a formatted NFC tag.</p>
+<p>Step2: switch back to the page, then tap the tag again.</p>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -21,110 +21,122 @@
 ];
 
 function waitSyntaxErrorPromise(t, scan_options) {
-  const reader = new NDEFReader();
-  return promise_rejects_dom(t, 'SyntaxError', reader.scan(scan_options));
+  const ndef = new NDEFReader();
+  return promise_rejects_dom(t, 'SyntaxError', ndef.scan(scan_options));
 }
 
 nfc_test(async t => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const promises = [];
   invalid_signals.forEach(invalid_signal => {
     promises.push(promise_rejects_js(t, TypeError,
-        reader.scan({ signal: invalid_signal })));
+        ndef.scan({ signal: invalid_signal })));
   });
   await Promise.all(promises);
 }, "Test that NDEFReader.scan rejects if signal is not an AbortSignal.");
 
 nfc_test(async t => {
   await test_driver.set_permission({ name: 'nfc' }, 'denied', false);
-  const reader = new NDEFReader();
-  await promise_rejects_dom(t, 'NotAllowedError', reader.scan());
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotAllowedError', ndef.scan());
 }, "NDEFReader.scan should fail if user permission is not granted.");
 
 // We do not provide NFC mock here to simulate that there has no available
 // implementation for NFC Mojo interface.
 nfc_test(async (t, mockNFC) => {
   mockNFC.simulateClosedPipe();
-  const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("error").then(event => {
-    assert_true(event instanceof ErrorEvent);
-  });
-  await promise_rejects_dom(t, 'NotSupportedError', reader.scan());
-  await promise;
-}, "Test that an error event happens if no implementation for NFC Mojo interface \
-is available.");
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.scan());
+}, "NDEFReader.scan should fail if no implementation for NFC Mojo interface.");
 
 nfc_test(async (t, mockNFC) => {
   mockNFC.setHWStatus(NFCHWStatus.DISABLED);
-  const reader = new NDEFReader();
-  await promise_rejects_dom(t, 'NotReadableError', reader.scan());
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotReadableError', ndef.scan());
 }, "NDEFReader.scan should fail if NFC HW is disabled.");
 
 nfc_test(async (t, mockNFC) => {
   mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
-  const reader = new NDEFReader();
-  await promise_rejects_dom(t, 'NotSupportedError', reader.scan());
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.scan());
 }, "NDEFReader.scan should fail if NFC HW is not supported.");
 
-nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
-  const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
-    assert_true(event instanceof NDEFReadingEvent);
-    controller.abort();
+nfc_test(async () => {
+  await new Promise((resolve,reject) => {
+    const iframe = document.createElement('iframe');
+    iframe.srcdoc = `<script>
+                      window.onmessage = async (message) => {
+                        if (message.data === "Ready") {
+                          try {
+                            const ndef = new NDEFReader();
+                            await ndef.scan();
+                            parent.postMessage("Failure", "*");
+                          } catch (error) {
+                            if (error.name == "InvalidStateError") {
+                              parent.postMessage("Success", "*");
+                            } else {
+                              parent.postMessage("Failure", "*");
+                            }
+                          }
+                        }
+                      };
+                    <\/script>`;
+    iframe.onload = () => iframe.contentWindow.postMessage('Ready', '*');
+    document.body.appendChild(iframe);
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else if (message.data == 'Failure') {
+        reject();
+      }
+    }
   });
-  await reader.scan({signal : controller.signal});
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
-  await promise;
-}, "Test that nfc watch success if NFC HW is enabled.");
+}, 'Test that WebNFC API is not accessible from iframe context.');
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
-}, "Test that NDEFReader.scan matches any ids if NDEFScanOptions.id is undefined.");
+}, "Test that nfc watch success if NFC HW is enabled.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
   controller.abort();
-  await promise_rejects_dom(t, 'AbortError', reader.scan({signal: controller.signal}));
+  await promise_rejects_dom(t, 'AbortError', ndef.scan({signal: controller.signal}));
 }, "Test that NDEFReader.scan rejects if NDEFScanOptions.signal is already aborted.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const promise = reader.scan({signal: controller.signal});
+  const promise = ndef.scan({signal: controller.signal});
   controller.abort();
   await promise_rejects_dom(t, 'AbortError', promise);
 }, "Test that NDEFReader.scan rejects if NDEFScanOptions.signal aborts right after \
 the scan invocation.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
   const message = createMessage([createTextRecord(test_text_data)]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   mockNFC.setReadingMessage(message);
   await promise;
 
-  reader.onreading = t.unreached_func("reading event should not be fired.");
+  ndef.onreading = t.unreached_func("reading event should not be fired.");
   mockNFC.setReadingMessage(message);
   controller.abort();
   await new Promise((resolve, reject) => {
@@ -133,10 +145,10 @@
 }, "Test that NDEFReader can not get any reading events once the signal aborts.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     controller.abort();
     assert_true(event instanceof NDEFReadingEvent);
 
@@ -157,7 +169,7 @@
     assert_equals(decoder.decode(event.message.records[0].toRecords()[0].toRecords()[0].data),
         test_text_data, 'data has the same content with the original dictionary');
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   // An external type record --contains-> a local type record --contains-> a text record.
   const messageContainText = createMessage([createTextRecord(test_text_data)]);
@@ -170,10 +182,10 @@
 }, "NDEFRecord.toRecords returns its embedded records correctly.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     controller.abort();
     assert_true(event instanceof NDEFReadingEvent);
 
@@ -209,7 +221,7 @@
     assert_array_equals(embedded_record_types.sort(), ['text', 'url'],
         'smart-poster record\'s contained record types');
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   // A smart-poster record contains a uri record, text record.
   const uri_record = createUrlRecord(test_url_data);
@@ -224,37 +236,33 @@
 nfc_test(async (t, mockNFC) => {
   const promises = [];
 
-  const reader1 = new NDEFReader();
-  const readerWatcher1 = new EventWatcher(t, reader1, ["reading", "error"]);
-  const promise1 = readerWatcher1.wait_for("error").then(event => {
-    assert_true(event instanceof ErrorEvent);
-  });
+  const ndef1 = new NDEFReader();
+  const ndefWatcher1 = new EventWatcher(t, ndef1, ["reading", "readingerror"]);
+  const promise1 = ndefWatcher1.wait_for("readingerror");
   promises.push(promise1);
-  await reader1.scan();
+  await ndef1.scan();
 
-  const reader2 = new NDEFReader();
-  const readerWatcher2 = new EventWatcher(t, reader2, ["reading", "error"]);
-  const promise2 = readerWatcher2.wait_for("error").then(event => {
-    assert_true(event instanceof ErrorEvent);
-  });
+  const ndef2 = new NDEFReader();
+  const ndefWatcher2 = new EventWatcher(t, ndef2, ["reading", "readingerror"]);
+  const promise2 = ndefWatcher2.wait_for("readingerror");
   promises.push(promise2);
-  await reader2.scan();
+  await ndef2.scan();
 
   mockNFC.simulateNonNDEFTagDiscovered();
   await Promise.all(promises);
-}, "Test that NDEFReader.onerror should be fired if the NFC tag does not \
+}, "Test that NDEFReader.onreadingerror should be fired if the NFC tag does not \
 expose NDEF technology.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     assert_equals(event.serialNumber, fake_tag_serial_number);
     assert_equals(event.message.records.length, 0);
     controller.abort();
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   mockNFC.setReadingMessage({ records: [] });
   await promise;
@@ -262,7 +270,7 @@
 with empty records array for NDEFMessage.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
   const message = createMessage([createTextRecord(test_text_data),
                                 createMimeRecordFromJson(test_json_data),
@@ -272,31 +280,31 @@
                                 createUrlRecord(test_url_data, true),
                                 createRecord('w3.org:xyz', test_buffer_data)],
                                 test_message_origin);
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     assert_equals(event.serialNumber, fake_tag_serial_number);
     assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     controller.abort();
   });
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
 
   mockNFC.setReadingMessage(message);
   await promise;
 }, "Test that reading message with multiple records should succeed.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
-  const promise1 = reader.scan();
-  const promise2 = promise_rejects_dom(t, 'InvalidStateError', reader.scan());
+  const ndef = new NDEFReader();
+  const promise1 = ndef.scan();
+  const promise2 = promise_rejects_dom(t, 'InvalidStateError', ndef.scan());
   await promise1;
   await promise2;
 }, "Test that NDEFReader.scan rejects if there is already an ongoing scan.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  await reader.scan({signal : controller.signal});
+  await ndef.scan({signal : controller.signal});
   controller.abort();
-  await reader.scan();
+  await ndef.scan();
 }, "Test that NDEFReader.scan can be started after the previous scan is aborted.");
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan_iframe.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan_iframe.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan_iframe.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_scan_iframe.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>NDEFWriter.scan with an focused iframe</title>
+<title>NDEFReader.scan with an focused iframe</title>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -9,15 +9,15 @@
 <script>
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
+  const ndef = new NDEFReader();
   const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
+  const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
 
-  const promise = readerWatcher.wait_for("reading").then(event => {
+  const promise = ndefWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  await reader.scan({ signal: controller.signal });
+  await ndef.scan({ signal: controller.signal });
 
   const iframe = document.createElement('iframe');
   iframe.src = 'resources/support-iframe.html';
@@ -37,7 +37,7 @@
 
   // Remove iframe from main document.
   iframe.parentNode.removeChild(iframe);
-}, 'Test that NDEFWriter.scan is not suspended if iframe gains focus.');
+}, 'Test that NDEFReader.scan is not suspended if iframe gains focus.');
 
 </script>
 </body>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader-write-document-hidden-manual.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>NDEFReader.write respect page visibility changes</title>
+<link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/nfc-helpers.js"></script>
+<script>
+
+promise_test(async t => {
+  const writer = new NDEFReader();
+  const p1 = writer.write(test_text_data);
+
+  return await new Promise((resolve, reject) => {
+    p1.then(() => {
+      assert_false(document.hidden);
+      resolve();
+    }).catch(e => {
+      reject();
+    });
+  });
+}, "Test NDEFReader.write operation should be suspended when document is not visible");
+
+</script>
+
+<p>Step1: switch the page to the background, then tap an NFC tag.</p>
+<p>Step2: switch back to the page, then tap the tag again.</p>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_write.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_write.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFReader_write.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFReader_write.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,468 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Web NFC: NDEFReader.write Tests</title>
+<link rel="author" title="Intel" href="http://www.intel.com"/>
+<link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/nfc-helpers.js"></script>
+<script>
+
+"use strict";
+
+const invalid_type_messages =
+    [
+      // Invalid NDEFMessageSource type
+      undefined,
+
+      // NDEFMessage.records: should have at least 1 valid record.
+      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
+      createMessage([{}]),
+
+      // NDEFMessageSource: not NDEF-formatable.
+      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
+      createMessage([]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-text-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createTextRecord()]),
+
+      // NDEFRecord.data for 'text' record must be either a string,
+      // an arrayBuffer, or an arrayBufferView.
+      createMessage([createTextRecord(test_json_data)]),
+
+      // NDEFRecord.encoding for 'text' record must be either "utf-8",
+      // "utf-16", "utf-16le" or "utf-16be".
+      createMessage([createTextRecord(test_buffer_data, "chinese")]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createUrlRecord()]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createUrlRecord(undefined, true)]),
+
+      // NDEFRecord.data for 'url' record must be string.
+      createMessage([createUrlRecord(test_buffer_data)]),
+      createMessage([createUrlRecord(test_json_data)]),
+
+      // NDEFRecord.data for 'absolute-url' record must be string.
+      createMessage([createUrlRecord(test_buffer_data, true)]),
+      createMessage([createUrlRecord(test_json_data, true)]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-binary-data-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createMimeRecord()]),
+
+      // NDEFRecord.data for 'mime' record must be BufferSource.
+      createMessage([createMimeRecord(test_text_data)]),
+      createMessage([createMimeRecord(test_number_data)]),
+      createMessage([createMimeRecord(test_json_data)]),
+
+      // NDEFRecord must have data.
+      createMessage([createUnknownRecord()]),
+
+      // NDEFRecord.data for 'unknown' record must be BufferSource.
+      createMessage([createUnknownRecord(test_text_data)]),
+      createMessage([createUnknownRecord(test_number_data)]),
+      createMessage([createUnknownRecord(test_json_data)]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-external-data-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createRecord('w3.org:xyz')]),
+
+      // NDEFRecord.data for external record must be a BufferSource or NDEFMessageInit.
+      createMessage([createRecord('w3.org:xyz', test_text_data)]),
+      createMessage([createRecord('w3.org:xyz', test_number_data)]),
+      createMessage([createRecord('w3.org:xyz', test_json_data)]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-local-type-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createRecord(':xyz')]),
+
+      // NDEFRecord.data for local type record must be a BufferSource or NDEFMessageInit.
+      createMessage([createRecord(':xyz', test_text_data)]),
+      createMessage([createRecord(':xyz', test_number_data)]),
+      createMessage([createRecord(':xyz', test_json_data)]),
+
+      // https://w3c.github.io/web-nfc/#dfn-map-smart-poster-to-ndef
+      // NDEFRecord must have data.
+      createMessage([createRecord('smart-poster')]),
+
+      // NDEFRecord.data for smart-poster record must be a NDEFMessageInit.
+      createMessage([createRecord('smart-poster', test_text_data)]),
+      createMessage([createRecord('smart-poster', test_number_data)]),
+      createMessage([createRecord('smart-poster', test_json_data)]),
+      createMessage([createRecord('smart-poster', test_buffer_data)]),
+
+      // https://w3c.github.io/web-nfc/#ndef-record-types
+      // The record type is neither a known type ('text', 'mime' etc.) nor a
+      // valid external/local type.
+      createMessage([createRecord('unmatched_type', test_buffer_data)])
+    ];
+
+const invalid_syntax_messages =
+    [
+      // Data for 'url' or 'absolute-url' record, must be a valid URL.
+      createMessage([createUrlRecord('Invalid URL:// Data')]),
+      createMessage([createUrlRecord('Invalid URL:// Data', true)]),
+
+      // NDEFRecord.lang length for 'text' record must be lower than 64.
+      createMessage([createTextRecord(test_text_data, undefined /* encoding */,
+                                      [...Array(64)].map(_ => 'a'))]),
+    ];
+
+const invalid_signals = [
+  "string",
+  123,
+  {},
+  true,
+  Symbol(),
+  () => {},
+  self
+];
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const promises = [];
+  invalid_type_messages.forEach(message => {
+    promises.push(
+      promise_rejects_js(t, TypeError, ndef.write(message)));
+  });
+  await Promise.all(promises);
+}, "Test that promise is rejected with TypeError if NDEFMessageSource is invalid.");
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const promises = [];
+  invalid_syntax_messages.forEach(message => {
+    promises.push(
+      promise_rejects_dom(t, 'SyntaxError', ndef.write(message)));
+  });
+  await Promise.all(promises);
+}, "Test that promise is rejected with SyntaxError if NDEFMessageSource contains\
+ invalid records.");
+
+nfc_test(async t => {
+  await test_driver.set_permission({ name: 'nfc' }, 'denied', false);
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotAllowedError', ndef.write(test_text_data));
+}, 'NDEFReader.write should fail if user permission is not granted.');
+
+// We do not provide NFC mock here to simulate that there has no available
+// implementation for NFC Mojo interface.
+nfc_test(async (t, mockNFC) => {
+  mockNFC.simulateClosedPipe();
+  const ndef = new NDEFReader();
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.write(test_text_data));
+}, 'NDEFReader.write should fail if no implementation for NFC Mojo interface is available.');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  const controller = new AbortController();
+
+  //Make sure push is pending
+  mockNFC.setPendingPushCompleted(false);
+  const p = ndef.write(test_text_data, { signal: controller.signal });
+  const rejected = promise_rejects_dom(t, 'AbortError', p);
+  let callback_called = false;
+  await new Promise(resolve => {
+    t.step_timeout(() => {
+      callback_called = true;
+      controller.abort();
+      resolve();
+    }, 10);
+  });
+  await rejected;
+  assert_true(callback_called, 'timeout should have caused the abort');
+}, "NDEFReader.write should fail if abort write request before write happends.");
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const controller = new AbortController();
+  assert_false(controller.signal.aborted);
+  controller.abort();
+  assert_true(controller.signal.aborted);
+  await promise_rejects_dom(t, 'AbortError',
+      ndef.write(test_text_data, { signal: controller.signal }));
+}, "NDEFReader.write should fail if signal's aborted flag is set.");
+
+nfc_test(async t => {
+  const ndef = new NDEFReader();
+  const promises = [];
+  invalid_signals.forEach(invalid_signal => {
+    promises.push(promise_rejects_js(t, TypeError,
+        ndef.write(test_text_data, { signal: invalid_signal })));
+  });
+  await Promise.all(promises);
+}, "NDEFReader.write should fail if signal is not an AbortSignal.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef1 = new NDEFReader();
+  const ndef2 = new NDEFReader();
+  const controller = new AbortController();
+  const p1 = ndef1.write(test_text_data, { signal: controller.signal });
+
+  // Even though write request is grantable,
+  // this abort should be processed synchronously.
+  controller.abort();
+  await promise_rejects_dom(t, 'AbortError', p1);
+
+  await ndef2.write(test_text_data);
+  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
+}, "Synchronously signaled abort.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.setHWStatus(NFCHWStatus.DISABLED);
+  await promise_rejects_dom(t, 'NotReadableError', ndef.write(test_text_data));
+}, "NDEFReader.write should fail when NFC HW is disabled.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
+  await promise_rejects_dom(t, 'NotSupportedError', ndef.write(test_text_data));
+}, "NDEFReader.write should fail when NFC HW is not supported.");
+
+nfc_test(async () => {
+  await new Promise((resolve,reject) => {
+    const iframe = document.createElement('iframe');
+    iframe.srcdoc = `<script>
+                      window.onmessage = async (message) => {
+                        if (message.data === "Ready") {
+                          try {
+                            const ndef = new NDEFReader();
+                            await ndef.write("Test");
+                            parent.postMessage("Failure", "*");
+                          } catch (error) {
+                            if (error.name == "InvalidStateError") {
+                              parent.postMessage("Success", "*");
+                            } else {
+                              parent.postMessage("Failure", "*");
+                            }
+                          }
+                        }
+                      };
+                    <\/script>`;
+    iframe.onload = () => iframe.contentWindow.postMessage('Ready', '*');
+    document.body.appendChild(iframe);
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else if (message.data == 'Failure') {
+        reject();
+      }
+    }
+  });
+}, 'Test that WebNFC API is not accessible from iframe context.');
+
+nfc_test(async () => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_text_data);
+}, 'NDEFReader.write should succeed when NFC HW is enabled');
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  const message = createMessage([createTextRecord(test_text_data),
+                               createMimeRecordFromJson(test_json_data),
+                               createMimeRecord(test_buffer_data),
+                               createUnknownRecord(test_buffer_data),
+                               createUrlRecord(test_url_data),
+                               createUrlRecord(test_url_data, true),
+                               createRecord('w3.org:xyz', test_buffer_data)],
+                               test_message_origin);
+  await ndef.write(message);
+  assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
+}, "NDEFReader.write NDEFMessage containing text, mime, unknown, url, absolute-url \
+and external records with default NDEFWriteOptions.");
+
+nfc_test(async (t, mockNFC) => {
+  const messageContainText = createMessage([createTextRecord(test_text_data)]);
+
+  // Prepare a local type record that uses |messageContainText| as its payload.
+  const messageContainLocal = createMessage([createRecord(':containsTextRecord', messageContainText)]);
+
+  // Prepare an external type record that uses |messageContainLocal| as its payload.
+  const message = createMessage([createRecord('example.com:containsLocalRecord', messageContainLocal)]);
+
+  const ndef = new NDEFReader();
+  await ndef.write(message);
+  const pushed_message = mockNFC.pushedMessage();
+
+  // The mojom message received by mock nfc contains only the external type record.
+  assert_equals(pushed_message.data.length, 1);
+  assert_equals(pushed_message.data[0].recordType, 'example.com:containsLocalRecord', 'recordType');
+
+  // The external type record's payload is from the original |messageContainLocal|,
+  // containing only the local type record.
+  assert_array_equals(pushed_message.data[0].data, new Uint8Array(0),
+      'payloadMessage is used instead');
+  assert_equals(pushed_message.data[0].payloadMessage.data.length, 1);
+  assert_equals(pushed_message.data[0].payloadMessage.data[0].recordType, ':containsTextRecord', 'recordType');
+
+  // The local type record's payload is from the original |messageContainText|,
+  // containing only the text record.
+  assert_array_equals(pushed_message.data[0].payloadMessage.data[0].data, new Uint8Array(0),
+      'payloadMessage is used instead');
+  assertNDEFMessagesEqual(messageContainText, pushed_message.data[0].payloadMessage.data[0].payloadMessage);
+}, "NDEFReader.write NDEFMessage containing embedded records.");
+
+nfc_test(async (t, mockNFC) => {
+  // A smart-poster record contains a uri record, text record.
+  const uri_record = createUrlRecord(test_url_data);
+  const text_record = createTextRecord(test_text_data);
+  const payload_message = createMessage([uri_record, text_record]);
+  const message = createMessage([createRecord(
+      'smart-poster', payload_message, "dummy_record_id")]);
+
+  const ndef = new NDEFReader();
+  await ndef.write(message);
+  const pushed_message = mockNFC.pushedMessage();
+
+  // The mojom message received by mock nfc contains only the smart-poster record.
+  assert_equals(pushed_message.data.length, 1);
+  assert_equals(pushed_message.data[0].recordType, 'smart-poster', 'recordType');
+  assert_equals(pushed_message.data[0].mediaType, null, 'mediaType');
+  assert_equals(pushed_message.data[0].id, 'dummy_record_id', 'id');
+
+  const embedded_records = pushed_message.data[0].payloadMessage.data;
+  assert_equals(embedded_records.length, 2);
+
+  let embedded_record_types = [];
+  for(let record of embedded_records) {
+    embedded_record_types.push(record.recordType);
+    switch(record.recordType) {
+      case 'url':
+        compareNDEFRecords(uri_record, record);
+        break;
+      case 'text':
+        compareNDEFRecords(text_record, record);
+        break;
+      default:
+        assert_unreached("Unknown recordType");
+    }
+  }
+  assert_array_equals(embedded_record_types.sort(), ['text', 'url'],
+      'smart-poster record\'s contained record types');
+}, "NDEFReader.write NDEFMessage containing smart-poster record.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_text_data);
+  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
+}, "Test that NDEFReader.write succeeds when message is DOMString.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_buffer_data);
+  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
+}, "Test that NDEFReader.write succeeds when message is ArrayBuffer.");
+
+nfc_test(async (t, mockNFC) => {
+  let buffer_view = new Uint8Array(test_buffer_data, 2, 5);
+  const ndef = new NDEFReader();
+  await ndef.write(buffer_view);
+  assertNDEFMessagesEqual(buffer_view, mockNFC.pushedMessage());
+}, "Test that NDEFReader.write succeeds when message is ArrayBufferView.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(createMessage([createRecord('empty')]));
+  const receivedMessage = mockNFC.pushedMessage();
+  assert_equals(receivedMessage.data.length, 1);
+  assert_equals(receivedMessage.data[0].recordType, 'empty', 'recordType');
+}, "NDEFReader.write with 'empty' record should succeed.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_text_data);
+  assertNDEFWriteOptionsEqual({overwrite: true}, mockNFC.writeOptions());
+}, "Check that default NDEFWriteOptions values are correctly set.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_text_data, {overwrite: false});
+  assertNDEFWriteOptionsEqual({overwrite: false}, mockNFC.writeOptions());
+}, "Check that provided NDEFWriteOptions values are correctly converted.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef1 = new NDEFReader();
+  const ndef2 = new NDEFReader();
+
+  const p1 = ndef1.write(test_text_data, {overwrite: false});
+  const p2 = ndef2.write(test_url_data, {overwrite: true});
+
+  await new Promise((resolve, reject) => {
+    // Make first push pending
+    mockNFC.setPendingPushCompleted(false);
+    let err = "";
+    p1.then(() => {
+      reject("pending push should not be fulfilled");
+    }).catch(e => {
+      err = e.name;
+    });
+    p2.then(() => {
+      assertNDEFMessagesEqual(test_url_data, mockNFC.pushedMessage());
+      assertNDEFWriteOptionsEqual( {overwrite: true}, mockNFC.writeOptions());
+      assert_equals(err, "AbortError", "the pending push should be aborted");
+      resolve();
+    });
+  });
+}, "NDEFReader.write should replace all previously configured write operations.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write({ records: [{ recordType: "mime", data: test_buffer_data }] });
+  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
+}, "Test that mediaType should be set to 'application/octet-stream' if \
+NDEFRecordInit.record's recordType is 'mime' and NDEFRecordInit.record's \
+mediaType is undefined.");
+
+nfc_test(async (t, mockNFC) => {
+  // Make sure the push will be pending in the mock.
+  mockNFC.setPendingPushCompleted(false);
+
+  const ndef1 = new NDEFReader();
+  const promise = ndef1.write(test_text_data);
+
+  // Just to make sure the write() request has already reached to the mock.
+  const ndef2 = new NDEFReader();
+  await ndef2.scan();
+
+  mockNFC.simulateNonNDEFTagDiscovered();
+  await promise_rejects_dom(t, 'NotSupportedError', promise);
+}, "NDEFReader.write should fail when the NFC device coming up does not expose \
+NDEF technology.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_text_data, {overwrite: false});
+  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
+}, "NDEFReader.write should succeed to write data to an unformatted NFC device \
+when the NDEFWriteOptions.overwrite is false.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  await ndef.write(test_buffer_data);
+  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
+  await ndef.write(test_text_data, {overwrite: true});
+  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
+}, "NDEFReader.write should succeed to overwrite the existing data \
+when the NDEFWriteOptions.overwrite is true.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  const p = ndef.write(test_text_data, {overwrite: false});
+  mockNFC.setIsFormattedTag(true);
+  await promise_rejects_dom(t, 'NotAllowedError', p);
+}, "NDEFReader.write should fail when there are NDEF records on the NFC device \
+and NDEFWriteOptions.overwrite is false.");
+
+nfc_test(async (t, mockNFC) => {
+  const ndef = new NDEFReader();
+  mockNFC.simulateDataTransferFails();
+  await promise_rejects_dom(t, 'NetworkError', ndef.write(test_text_data));
+}, "NDEFReader.write should fail with NetworkError when NFC data transfer fails.");
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFWriter-document-hidden-manual.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFWriter-document-hidden-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFWriter-document-hidden-manual.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFWriter-document-hidden-manual.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="timeout" content="long">
-<title>NDEFWriter.write respect page visibility changes</title>
-<link rel="help" href="https://w3c.github.io/web-nfc/#visible-document">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/nfc-helpers.js"></script>
-<script>
-
-promise_test(async t => {
-  const writer = new NDEFWriter();
-  const p1 = writer.write(test_text_data);
-
-  return await new Promise((resolve, reject) => {
-    p1.then(() => {
-      assert_false(document.hidden);
-      resolve();
-    }).catch(e => {
-      reject();
-    });
-  });
-}, "Test NDEFWriter.write operation should be suspend when document is not visible");
-
-</script>
-
-<p>Step1: switch the page to the background, then tap an NFC tag.</p>
-<p>Step2: switch back to the page, then tap the tag again.</p>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFWriter_write.https.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFWriter_write.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/NDEFWriter_write.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/NDEFWriter_write.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,473 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Web NFC: NDEFWriter.write Tests</title>
-<link rel="author" title="Intel" href="http://www.intel.com"/>
-<link rel="help" href="https://w3c.github.io/web-nfc/"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/nfc-helpers.js"></script>
-<script>
-
-"use strict";
-
-const invalid_type_messages =
-    [
-      // Invalid NDEFMessageSource type
-      undefined,
-
-      // NDEFMessage.records: should have at least 1 valid record.
-      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
-      createMessage([{}]),
-
-      // NDEFMessageSource: not NDEF-formatable.
-      // https://w3c.github.io/web-nfc/#the-write-method - Step 8.
-      createMessage([]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-text-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createTextRecord()]),
-
-      // NDEFRecord.data for 'text' record must be either a string,
-      // an arrayBuffer, or an arrayBufferView.
-      createMessage([createTextRecord(test_json_data)]),
-
-      // NDEFRecord.encoding for 'text' record must be either "utf-8",
-      // "utf-16", "utf-16le" or "utf-16be".
-      createMessage([createTextRecord(test_buffer_data, "chinese")]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createUrlRecord()]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-a-url-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createUrlRecord(undefined, true)]),
-
-      // NDEFRecord.data for 'url' record must be string.
-      createMessage([createUrlRecord(test_buffer_data)]),
-      createMessage([createUrlRecord(test_json_data)]),
-
-      // NDEFRecord.data for 'absolute-url' record must be string.
-      createMessage([createUrlRecord(test_buffer_data, true)]),
-      createMessage([createUrlRecord(test_json_data, true)]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-binary-data-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createMimeRecord()]),
-
-      // NDEFRecord.data for 'mime' record must be BufferSource.
-      createMessage([createMimeRecord(test_text_data)]),
-      createMessage([createMimeRecord(test_number_data)]),
-      createMessage([createMimeRecord(test_json_data)]),
-
-      // NDEFRecord must have data.
-      createMessage([createUnknownRecord()]),
-
-      // NDEFRecord.data for 'unknown' record must be BufferSource.
-      createMessage([createUnknownRecord(test_text_data)]),
-      createMessage([createUnknownRecord(test_number_data)]),
-      createMessage([createUnknownRecord(test_json_data)]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-external-data-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createRecord('w3.org:xyz')]),
-
-      // NDEFRecord.data for external record must be a BufferSource or NDEFMessageInit.
-      createMessage([createRecord('w3.org:xyz', test_text_data)]),
-      createMessage([createRecord('w3.org:xyz', test_number_data)]),
-      createMessage([createRecord('w3.org:xyz', test_json_data)]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-local-type-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createRecord(':xyz')]),
-
-      // NDEFRecord.data for local type record must be a BufferSource or NDEFMessageInit.
-      createMessage([createRecord(':xyz', test_text_data)]),
-      createMessage([createRecord(':xyz', test_number_data)]),
-      createMessage([createRecord(':xyz', test_json_data)]),
-
-      // https://w3c.github.io/web-nfc/#dfn-map-smart-poster-to-ndef
-      // NDEFRecord must have data.
-      createMessage([createRecord('smart-poster')]),
-
-      // NDEFRecord.data for smart-poster record must be a NDEFMessageInit.
-      createMessage([createRecord('smart-poster', test_text_data)]),
-      createMessage([createRecord('smart-poster', test_number_data)]),
-      createMessage([createRecord('smart-poster', test_json_data)]),
-      createMessage([createRecord('smart-poster', test_buffer_data)]),
-
-      // https://w3c.github.io/web-nfc/#ndef-record-types
-      // The record type is neither a known type ('text', 'mime' etc.) nor a
-      // valid external/local type.
-      createMessage([createRecord('unmatched_type', test_buffer_data)])
-    ];
-
-const invalid_syntax_messages =
-    [
-      // Data for 'url' or 'absolute-url' record, must be a valid URL.
-      createMessage([createUrlRecord('Invalid URL:// Data')]),
-      createMessage([createUrlRecord('Invalid URL:// Data', true)]),
-
-      // NDEFRecord.lang length for 'text' record must be lower than 64.
-      createMessage([createTextRecord(test_text_data, undefined /* encoding */,
-                                      [...Array(64)].map(_ => 'a'))]),
-    ];
-
-const invalid_signals = [
-  "string",
-  123,
-  {},
-  true,
-  Symbol(),
-  () => {},
-  self
-];
-
-nfc_test(async t => {
-  const writer = new NDEFWriter();
-  const promises = [];
-  invalid_type_messages.forEach(message => {
-    promises.push(
-      promise_rejects_js(t, TypeError, writer.write(message)));
-  });
-  await Promise.all(promises);
-}, "Test that promise is rejected with TypeError if NDEFMessageSource is invalid.");
-
-nfc_test(async t => {
-  const writer = new NDEFWriter();
-  const promises = [];
-  invalid_syntax_messages.forEach(message => {
-    promises.push(
-      promise_rejects_dom(t, 'SyntaxError', writer.write(message)));
-  });
-  await Promise.all(promises);
-}, "Test that promise is rejected with SyntaxError if NDEFMessageSource contains\
- invalid records.");
-
-nfc_test(async t => {
-  await test_driver.set_permission({ name: 'nfc' }, 'denied', false);
-  const writer = new NDEFWriter();
-  await promise_rejects_dom(t, 'NotAllowedError', writer.write(test_text_data));
-}, 'NDEFWriter.write should fail if user permission is not granted.');
-
-// We do not provide NFC mock here to simulate that there has no available
-// implementation for NFC Mojo interface.
-nfc_test(async (t, mockNFC) => {
-  mockNFC.simulateClosedPipe();
-  const writer = new NDEFWriter();
-  await promise_rejects_dom(t, 'NotSupportedError', writer.write(test_text_data));
-}, 'NDEFWriter.write should fail if no implementation for NFC Mojo interface is available.');
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  const controller = new AbortController();
-
-  //Make sure push is pending
-  mockNFC.setPendingPushCompleted(false);
-  const p = writer.write(test_text_data, { signal: controller.signal });
-  const rejected = promise_rejects_dom(t, 'AbortError', p);
-  let callback_called = false;
-  await new Promise(resolve => {
-    t.step_timeout(() => {
-      callback_called = true;
-      controller.abort();
-      resolve();
-    }, 10);
-  });
-  await rejected;
-  assert_true(callback_called, 'timeout should have caused the abort');
-}, "NDEFWriter.write should fail if abort write request before write happends.");
-
-nfc_test(async t => {
-  const writer = new NDEFWriter();
-  const controller = new AbortController();
-  assert_false(controller.signal.aborted);
-  controller.abort();
-  assert_true(controller.signal.aborted);
-  await promise_rejects_dom(t, 'AbortError',
-      writer.write(test_text_data, { signal: controller.signal }));
-}, "NDEFWriter.write should fail if signal's aborted flag is set.");
-
-nfc_test(async t => {
-  const writer = new NDEFWriter();
-  const promises = [];
-  invalid_signals.forEach(invalid_signal => {
-    promises.push(promise_rejects_js(t, TypeError,
-        writer.write(test_text_data, { signal: invalid_signal })));
-  });
-  await Promise.all(promises);
-}, "NDEFWriter.write should fail if signal is not an AbortSignal.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer1 = new NDEFWriter();
-  const writer2 = new NDEFWriter();
-  const controller = new AbortController();
-  const p1 = writer1.write(test_text_data, { signal: controller.signal });
-
-  // Even though write request is grantable,
-  // this abort should be processed synchronously.
-  controller.abort();
-  await promise_rejects_dom(t, 'AbortError', p1);
-
-  await writer2.write(test_text_data);
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "Synchronously signaled abort.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  mockNFC.setHWStatus(NFCHWStatus.DISABLED);
-  await promise_rejects_dom(t, 'NotReadableError', writer.write(test_text_data));
-}, "NDEFWriter.write should fail when NFC HW is disabled.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
-  await promise_rejects_dom(t, 'NotSupportedError', writer.write(test_text_data));
-}, "NDEFWriter.write should fail when NFC HW is not supported.");
-
-nfc_test(async () => {
-  await new Promise((resolve,reject) => {
-    const iframe = document.createElement('iframe');
-    iframe.srcdoc = `<script>
-                      window.onmessage = message => {
-                        if (message.data === "Ready") {
-                          const onSuccess = () => {
-                            parent.postMessage("Failure", "*");
-                          };
-                          const onError = error => {
-                            if (error.name == "NotAllowedError") {
-                              parent.postMessage("Success", "*");
-                            } else {
-                              parent.postMessage("Failure", "*");
-                            }
-                          };
-                          try {
-                            const writer = new NDEFWriter();
-                            writer.write("Test").then(onSuccess, onError);
-                          } catch(e) {
-                            parent.postMessage("Failure", "*");
-                          }
-                        }
-                      };
-                    <\/script>`;
-    iframe.onload = () => iframe.contentWindow.postMessage('Ready', '*');
-    document.body.appendChild(iframe);
-    window.onmessage = message => {
-      if (message.data == 'Success') {
-        resolve();
-      } else if (message.data == 'Failure') {
-        reject();
-      }
-    }
-  });
-}, 'Test that WebNFC API is not accessible from iframe context.');
-
-nfc_test(async () => {
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data);
-}, 'NDEFWriter.write should succeed when NFC HW is enabled');
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  const message = createMessage([createTextRecord(test_text_data),
-                               createMimeRecordFromJson(test_json_data),
-                               createMimeRecord(test_buffer_data),
-                               createUnknownRecord(test_buffer_data),
-                               createUrlRecord(test_url_data),
-                               createUrlRecord(test_url_data, true),
-                               createRecord('w3.org:xyz', test_buffer_data)],
-                               test_message_origin);
-  await writer.write(message);
-  assertNDEFMessagesEqual(message, mockNFC.pushedMessage());
-}, "NDEFWriter.write NDEFMessage containing text, mime, unknown, url, absolute-url \
-and external records with default NDEFWriteOptions.");
-
-nfc_test(async (t, mockNFC) => {
-  const messageContainText = createMessage([createTextRecord(test_text_data)]);
-
-  // Prepare a local type record that uses |messageContainText| as its payload.
-  const messageContainLocal = createMessage([createRecord(':containsTextRecord', messageContainText)]);
-
-  // Prepare an external type record that uses |messageContainLocal| as its payload.
-  const message = createMessage([createRecord('example.com:containsLocalRecord', messageContainLocal)]);
-
-  const writer = new NDEFWriter();
-  await writer.write(message);
-  const pushed_message = mockNFC.pushedMessage();
-
-  // The mojom message received by mock nfc contains only the external type record.
-  assert_equals(pushed_message.data.length, 1);
-  assert_equals(pushed_message.data[0].recordType, 'example.com:containsLocalRecord', 'recordType');
-
-  // The external type record's payload is from the original |messageContainLocal|,
-  // containing only the local type record.
-  assert_array_equals(pushed_message.data[0].data, new Uint8Array(0),
-      'payloadMessage is used instead');
-  assert_equals(pushed_message.data[0].payloadMessage.data.length, 1);
-  assert_equals(pushed_message.data[0].payloadMessage.data[0].recordType, ':containsTextRecord', 'recordType');
-
-  // The local type record's payload is from the original |messageContainText|,
-  // containing only the text record.
-  assert_array_equals(pushed_message.data[0].payloadMessage.data[0].data, new Uint8Array(0),
-      'payloadMessage is used instead');
-  assertNDEFMessagesEqual(messageContainText, pushed_message.data[0].payloadMessage.data[0].payloadMessage);
-}, "NDEFWriter.write NDEFMessage containing embedded records.");
-
-nfc_test(async (t, mockNFC) => {
-  // A smart-poster record contains a uri record, text record.
-  const uri_record = createUrlRecord(test_url_data);
-  const text_record = createTextRecord(test_text_data);
-  const payload_message = createMessage([uri_record, text_record]);
-  const message = createMessage([createRecord(
-      'smart-poster', payload_message, "dummy_record_id")]);
-
-  const writer = new NDEFWriter();
-  await writer.write(message);
-  const pushed_message = mockNFC.pushedMessage();
-
-  // The mojom message received by mock nfc contains only the smart-poster record.
-  assert_equals(pushed_message.data.length, 1);
-  assert_equals(pushed_message.data[0].recordType, 'smart-poster', 'recordType');
-  assert_equals(pushed_message.data[0].mediaType, null, 'mediaType');
-  assert_equals(pushed_message.data[0].id, 'dummy_record_id', 'id');
-
-  const embedded_records = pushed_message.data[0].payloadMessage.data;
-  assert_equals(embedded_records.length, 2);
-
-  let embedded_record_types = [];
-  for(let record of embedded_records) {
-    embedded_record_types.push(record.recordType);
-    switch(record.recordType) {
-      case 'url':
-        compareNDEFRecords(uri_record, record);
-        break;
-      case 'text':
-        compareNDEFRecords(text_record, record);
-        break;
-      default:
-        assert_unreached("Unknown recordType");
-    }
-  }
-  assert_array_equals(embedded_record_types.sort(), ['text', 'url'],
-      'smart-poster record\'s contained record types');
-}, "NDEFWriter.write NDEFMessage containing smart-poster record.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data);
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.write succeeds when message is DOMString.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_buffer_data);
-  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.write succeeds when message is ArrayBuffer.");
-
-nfc_test(async (t, mockNFC) => {
-  let buffer_view = new Uint8Array(test_buffer_data, 2, 5);
-  const writer = new NDEFWriter();
-  await writer.write(buffer_view);
-  assertNDEFMessagesEqual(buffer_view, mockNFC.pushedMessage());
-}, "Test that NDEFWriter.write succeeds when message is ArrayBufferView.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(createMessage([createRecord('empty')]));
-  const receivedMessage = mockNFC.pushedMessage();
-  assert_equals(receivedMessage.data.length, 1);
-  assert_equals(receivedMessage.data[0].recordType, 'empty', 'recordType');
-}, "NDEFWriter.write with 'empty' record should succeed.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data);
-  assertNDEFWriteOptionsEqual({overwrite: true}, mockNFC.writeOptions());
-}, "Check that default NDEFWriteOptions values are correctly set.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data, {overwrite: false});
-  assertNDEFWriteOptionsEqual({overwrite: false}, mockNFC.writeOptions());
-}, "Check that provided NDEFWriteOptions values are correctly converted.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer1 = new NDEFWriter();
-  const writer2 = new NDEFWriter();
-
-  const p1 = writer1.write(test_text_data, {overwrite: false});
-  const p2 = writer2.write(test_url_data, {overwrite: true});
-
-  await new Promise((resolve, reject) => {
-    // Make first push pending
-    mockNFC.setPendingPushCompleted(false);
-    let err = "";
-    p1.then(() => {
-      reject("pending push should not be fulfilled");
-    }).catch(e => {
-      err = e.name;
-    });
-    p2.then(() => {
-      assertNDEFMessagesEqual(test_url_data, mockNFC.pushedMessage());
-      assertNDEFWriteOptionsEqual( {overwrite: true}, mockNFC.writeOptions());
-      assert_equals(err, "AbortError", "the pending push should be aborted");
-      resolve();
-    });
-  });
-}, "NDEFWriter.write should replace all previously configured write operations.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write({ records: [{ recordType: "mime", data: test_buffer_data }] });
-  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-}, "Test that mediaType should be set to 'application/octet-stream' if \
-NDEFRecordInit.record's recordType is 'mime' and NDEFRecordInit.record's \
-mediaType is undefined.");
-
-nfc_test(async (t, mockNFC) => {
-  // Make sure the push will be pending in the mock.
-  mockNFC.setPendingPushCompleted(false);
-
-  const writer = new NDEFWriter();
-  const promise = writer.write(test_text_data);
-
-  // Just to make sure the write() request has already reached to the mock.
-  const reader = new NDEFReader();
-  await reader.scan();
-
-  mockNFC.simulateNonNDEFTagDiscovered();
-  await promise_rejects_dom(t, 'NotSupportedError', promise);
-}, "NDEFWriter.write should fail when the NFC device coming up does not expose \
-NDEF technology.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data, {overwrite: false});
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.write should succeed to write data to an unformatted NFC device \
-when the NDEFWriteOptions.overwrite is false.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  await writer.write(test_buffer_data);
-  assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-  await writer.write(test_text_data, {overwrite: true});
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.write should succeed to overwrite the existing data \
-when the NDEFWriteOptions.overwrite is true.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  const p = writer.write(test_text_data, {overwrite: false});
-  mockNFC.setIsFormattedTag(true);
-  await promise_rejects_dom(t, 'NotAllowedError', p);
-}, "NDEFWriter.write should fail when there are NDEF records on the NFC device \
-and NDEFWriteOptions.overwrite is false.");
-
-nfc_test(async (t, mockNFC) => {
-  const writer = new NDEFWriter();
-  mockNFC.simulateDataTransferFails();
-  await promise_rejects_dom(t, 'NetworkError', writer.write(test_text_data));
-}, "NDEFWriter.write should fail with NetworkError when NFC data transfer fails.");
-
-</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/nfc_insecure_context.html firefox-85.0+build1/testing/web-platform/tests/web-nfc/nfc_insecure_context.html
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/nfc_insecure_context.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/nfc_insecure_context.html	2021-01-18 19:58:24.000000000 +0000
@@ -17,11 +17,6 @@
 
 test(t => {
   assert_false(isSecureContext);
-  assert_false('NDEFWriter' in window);
-}, 'NDEFWriter requires a secure context');
-
-test(t => {
-  assert_false(isSecureContext);
   assert_false('NDEFReader' in window);
 }, 'NDEFReader requires a secure context');
 
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/resources/nfc-helpers.js firefox-85.0+build1/testing/web-platform/tests/web-nfc/resources/nfc-helpers.js
--- firefox-84.0.2+build1/testing/web-platform/tests/web-nfc/resources/nfc-helpers.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/web-nfc/resources/nfc-helpers.js	2021-01-18 19:58:24.000000000 +0000
@@ -150,7 +150,7 @@
 }
 
 // Compares NDEFMessageSource that was provided to the API
-// (e.g. NDEFWriter.write), and NDEFMessage that was received by the
+// (e.g. NDEFReader.write), and NDEFMessage that was received by the
 // mock NFC service.
 function assertNDEFMessagesEqual(providedMessage, receivedMessage) {
   // If simple data type is passed, e.g. String or ArrayBuffer or
@@ -174,7 +174,7 @@
 }
 
 // Used to compare two NDEFMessage, one that is received from
-// NDEFWriter.onreading() EventHandler and another that is provided to mock NFC
+// NDEFReader.onreading() EventHandler and another that is provided to mock NFC
 // service.
 function assertWebNDEFMessagesEqual(message, expectedMessage) {
   assert_equals(message.records.length, expectedMessage.records.length);
@@ -195,22 +195,22 @@
 
 function testMultiScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
   nfc_test(async (t, mockNFC) => {
-    const reader1 = new NDEFReader();
-    const reader2 = new NDEFReader();
+    const ndef1 = new NDEFReader();
+    const ndef2 = new NDEFReader();
     const controller = new AbortController();
 
-    // Reading from unmatched reader will not be triggered
-    reader1.onreading = t.unreached_func("reading event should not be fired.");
+    // Reading from unmatched ndef will not be triggered
+    ndef1.onreading = t.unreached_func("reading event should not be fired.");
     unmatchedScanOptions.signal = controller.signal;
-    await reader1.scan(unmatchedScanOptions);
+    await ndef1.scan(unmatchedScanOptions);
 
-    const readerWatcher = new EventWatcher(t, reader2, ["reading", "error"]);
-    const promise = readerWatcher.wait_for("reading").then(event => {
+    const ndefWatcher = new EventWatcher(t, ndef2, ["reading", "readingerror"]);
+    const promise = ndefWatcher.wait_for("reading").then(event => {
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
     scanOptions.signal = controller.signal;
-    await reader2.scan(scanOptions);
+    await ndef2.scan(scanOptions);
 
     mockNFC.setReadingMessage(message);
     await promise;
@@ -219,15 +219,15 @@
 
 function testMultiMessages(message, scanOptions, unmatchedMessage, desc) {
   nfc_test(async (t, mockNFC) => {
-    const reader = new NDEFReader();
+    const ndef = new NDEFReader();
     const controller = new AbortController();
-    const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-    const promise = readerWatcher.wait_for("reading").then(event => {
+    const ndefWatcher = new EventWatcher(t, ndef, ["reading", "readingerror"]);
+    const promise = ndefWatcher.wait_for("reading").then(event => {
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
     scanOptions.signal = controller.signal;
-    await reader.scan(scanOptions);
+    await ndef.scan(scanOptions);
 
     // Unmatched message will not be read
     mockNFC.setReadingMessage(unmatchedMessage);
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/handover.html firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/handover.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/handover.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/handover.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,74 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCPeerConnection Handovers</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+promise_test(async t => {
+  const offerPc = new RTCPeerConnection();
+  const answerPcFirst = new RTCPeerConnection();
+  const answerPcSecond = new RTCPeerConnection();
+  t.add_cleanup(() => {
+    offerPc.close();
+    answerPcFirst.close();
+    answerPcSecond.close();
+  });
+  offerPc.addTransceiver('audio');
+  // Negotiate connection with PC 1
+  const offer1 = await offerPc.createOffer();
+  await offerPc.setLocalDescription(offer1);
+  await answerPcFirst.setRemoteDescription(offer1);
+  const answer1 = await answerPcFirst.createAnswer();
+  await offerPc.setRemoteDescription(answer1);
+  await answerPcFirst.setLocalDescription(answer1);
+  // Renegotiate with PC 2
+  const offer2 = await offerPc.createOffer();
+  await offerPc.setLocalDescription(offer2);
+  await answerPcSecond.setRemoteDescription(offer2);
+  const answer2 = await answerPcSecond.createAnswer();
+  await offerPc.setRemoteDescription(answer2);
+  await answerPcSecond.setLocalDescription(answer2);
+}, 'Negotiation of handover initiated at caller works');
+
+promise_test(async t => {
+  const offerPc = new RTCPeerConnection();
+  const answerPcFirst = new RTCPeerConnection();
+  const answerPcSecond = new RTCPeerConnection();
+  t.add_cleanup(() => {
+    offerPc.close();
+    answerPcFirst.close();
+    answerPcSecond.close();
+  });
+  offerPc.addTransceiver('audio');
+  // Negotiate connection with PC 1
+  const offer1 = await offerPc.createOffer();
+  await offerPc.setLocalDescription(offer1);
+  await answerPcFirst.setRemoteDescription(offer1);
+  const answer1 = await answerPcFirst.createAnswer();
+  await offerPc.setRemoteDescription(answer1);
+  await answerPcFirst.setLocalDescription(answer1);
+  // Renegotiate with PC 2
+  // The offer from PC 2 needs to be consistent on at least the following:
+  // - Number, type and order of media sections
+  // - MID values
+  // - Payload type values
+  // Do a "fake" offer/answer using the original offer against PC2 to achieve this.
+  await answerPcSecond.setRemoteDescription(offer1);
+  // Discard the output of this round.
+  await answerPcSecond.setLocalDescription(await answerPcSecond.createAnswer());
+
+  // Now we can initiate an offer from the new PC.
+  const offer2 = await answerPcSecond.createOffer();
+  await answerPcSecond.setLocalDescription(offer2);
+  await offerPc.setRemoteDescription(offer2);
+  const answer2 = await offerPc.createAnswer();
+  await answerPcSecond.setRemoteDescription(answer2);
+  await offerPc.setLocalDescription(answer2);
+}, 'Negotiation of handover initiated at callee works');
+
+
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/RTCPeerConnection-payloadTypes.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>RTCPeerConnection RTP payload types</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+
+// Test that when creating an offer we do not run out of valid payload types.
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+
+  const offer = await pc1.createOffer({offerToReceiveAudio: true, offerToReceiveVideo: true});
+
+  // Extract all payload types from the m= lines.
+  const payloadTypes = offer.sdp.split('\n')
+    .map(line => line.trim())
+    .filter(line => line.startsWith('m='))
+    .map(line => line.split(' ').slice(3).join(' '))
+    .join(' ')
+    .split(' ')
+    .map(payloadType => parseInt(payloadType, 10));
+
+  // The list of allowed payload types is taken from here
+  // https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml#rtp-parameters-1.
+  const forbiddenPayloadTypes = payloadTypes
+    .filter(payloadType => {
+      if (payloadType >= 96 && payloadType <= 127) {
+        return false;
+      }
+      if (payloadType >= 72 && payloadType < 96) {
+        return true;
+      }
+      if (payloadType >= 35 && payloadType < 72) {
+        return false;
+      }
+      // TODO: Check against static payload type list.
+      return false;
+    });
+  assert_equals(forbiddenPayloadTypes.length, 0)
+}, 'createOffer with the maximum set of codecs does not generate invalid payload types');
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/rtp-payloadtypes.html firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/rtp-payloadtypes.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/protocol/rtp-payloadtypes.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/protocol/rtp-payloadtypes.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,58 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>payload type handling (assuming rtcp-mux)</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+// Tests behaviour from https://tools.ietf.org/html/rfc5761#section-4
+
+function createOfferSdp(opusPayloadType) {
+  return `v=0
+o=- 0 3 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=fingerprint:sha-256 A7:24:72:CA:6E:02:55:39:BA:66:DF:6E:CC:4C:D8:B0:1A:BF:1A:56:65:7D:F4:03:AD:7E:77:43:2A:29:EC:93
+a=ice-ufrag:6HHHdzzeIhkE0CKj
+a=ice-pwd:XYDGVpfvklQIEnZ6YnyLsAew
+m=audio 9 RTP/SAVPF ${opusPayloadType}
+c=IN IP4 0.0.0.0
+a=rtcp-mux
+a=sendonly
+a=mid:audio
+a=rtpmap:${opusPayloadType} opus/48000/2
+a=setup:actpass
+`;
+}
+
+promise_test(async t => {
+  for (let payloadType = 96; payloadType <= 127; payloadType++) {
+    const pc = new RTCPeerConnection();
+    await pc.setRemoteDescription({type: 'offer', sdp: createOfferSdp(payloadType)});
+    const answer = await pc.createAnswer();
+    assert_true(answer.sdp.includes(`a=rtpmap:${payloadType} opus/48000/2`));
+    pc.close();
+  }
+}, 'setRemoteDescription with a codec in the range 96-127 works');
+
+// This is written as a separate test since it currently fails in Chrome.
+promise_test(async t => {
+  for (let payloadType = 35; payloadType <= 63; payloadType++) {
+    const pc = new RTCPeerConnection();
+    await pc.setRemoteDescription({type: 'offer', sdp: createOfferSdp(payloadType)});
+    const answer = await pc.createAnswer();
+    assert_true(answer.sdp.includes(`a=rtpmap:${payloadType} opus/48000/2`));
+    pc.close();
+  }
+}, 'setRemoteDescription with a codec in the range 35-63 works');
+
+promise_test(async t => {
+  for (let payloadType = 64; payloadType <= 95; payloadType++) {
+    const pc = new RTCPeerConnection();
+    await promise_rejects_dom(t, 'InvalidAccessError',
+      pc.setRemoteDescription({type: 'offer', sdp: createOfferSdp(64)}));
+    pc.close();
+  }
+}, 'setRemoteDescription with a codec in the range 64-95 throws an InvalidAccessError');
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCConfiguration-iceServers.html firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCConfiguration-iceServers.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCConfiguration-iceServers.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCConfiguration-iceServers.html	2021-01-18 19:58:24.000000000 +0000
@@ -370,36 +370,4 @@
       }] }));
   }, 'with turns server, credentialType password, and object credential should throw InvalidAccessError');
 
-  /*
-    4.3.2.  To set a configuration
-      11.6. If scheme name is turn or turns, and server.credentialType is "oauth",
-            and server.credential is not an RTCOAuthCredential, then throw an
-            InvalidAccessError and abort these steps.
-   */
-  config_test(makePc => {
-    assert_throws_dom('InvalidAccessError', () =>
-      makePc({ iceServers: [{
-        urls: 'turns:turn.example.org',
-        credentialType: 'oauth',
-        username: 'user',
-        credential: 'cred'
-      }] }));
-  }, 'with turns server, credentialType oauth, and string credential should throw InvalidAccessError');
-
-  /*
-    Tested
-      4.3.2.  To set a configuration
-        11.1-6.
-
-    Untestable
-      4.3.2.  To set a configuration
-        11.7.  Append server to validatedServers.
-
-    Coverage Report
-      Tested         9
-      Not Tested     0
-      Untestable     1
-      Total         10
-   */
-
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCDataChannel-close.html firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCDataChannel-close.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCDataChannel-close.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCDataChannel-close.html	2021-01-18 19:58:24.000000000 +0000
@@ -45,7 +45,7 @@
     assert_true(closingSeen, 'Closing event was seen');
   }, `Close ${mode} causes closing and close event to be called`);
 
-  promise_test(async t => {
+   promise_test(async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     const [channel1, channel2] = await createDataChannelPair(t, options, pc1);
@@ -100,5 +100,81 @@
     pc1.close();
     await new Promise(resolve => t.step_timeout(resolve, 10));
   }, `Close peerconnection after ${mode} close causes no events`);
+
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+    pc1.createDataChannel('not-counted', options);
+    const tokenDataChannel = new Promise(resolve => {
+      pc2.ondatachannel = resolve;
+    });
+    exchangeIceCandidates(pc1, pc2);
+    await exchangeOfferAnswer(pc1, pc2);
+    if (!options.negotiated) {
+      await tokenDataChannel;
+    }
+    let closeExpectedCount = 0;
+    let errorExpectedCount = 0;
+    let resolveCountIsZero;
+    let waitForCountIsZero = new Promise(resolve => {
+      resolveCountIsZero = resolve;
+    });
+    for (let i = 1; i <= 10; i++) {
+      if ('id' in options) {
+        options.id = i;
+      }
+      pc1.createDataChannel('', options);
+      if (options.negotiated) {
+        const channel = pc2.createDataChannel('', options);
+        channel.addEventListener('error', t.step_func(event => {
+          assert_true(event instanceof RTCErrorEvent, 'error event ' + event);
+          errorExpectedCount -= 1;
+        }));
+        channel.addEventListener('close', t.step_func(event => {
+          closeExpectedCount -= 1;
+          if (closeExpectedCount == 0) {
+            resolveCountIsZero();
+          }
+        }));
+      } else {
+        await new Promise(resolve => {
+          pc2.ondatachannel = ({channel}) => {
+            channel.addEventListener('error', t.step_func(event => {
+              assert_true(event instanceof RTCErrorEvent);
+              errorExpectedCount -= 1;
+            }));
+            channel.addEventListener('close', t.step_func(event => {
+              closeExpectedCount -= 1;
+              if (closeExpectedCount == 0) {
+                resolveCountIsZero();
+              }
+            }));
+            resolve();
+          }
+        });
+      }
+      ++closeExpectedCount;
+      ++errorExpectedCount;
+    }
+    assert_equals(closeExpectedCount, 10);
+    // We have to wait until SCTP is connected before we close, otherwise
+    // there will be no signal.
+    // The state is not available under Plan B, and unreliable on negotiated
+    // channels.
+    // TODO(bugs.webrtc.org/12259): Remove dependency on "negotiated"
+    if (pc1.sctp && !options.negotiated) {
+      waitForState(pc1.sctp, 'connected');
+    } else {
+      // Under plan B, we don't have a dtls transport to wait on, so just
+      // wait a bit.
+      await new Promise(resolve => t.step_timeout(resolve, 100));
+    }
+    pc1.close();
+    await waitForCountIsZero;
+    assert_equals(closeExpectedCount, 0);
+    assert_equals(errorExpectedCount, 0);
+  }, `Close peerconnection causes close event and error on many channels, ${mode}`);
 }
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCPeerConnection-getStats.https.html firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCPeerConnection-getStats.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCPeerConnection-getStats.https.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCPeerConnection-getStats.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -93,23 +93,6 @@
   promise_test(t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
-    return getTrackFromUserMedia('audio')
-    .then(([track, mediaStream]) => {
-      // addTransceiver allows adding same track multiple times
-      const transceiver1 = pc.addTransceiver(track);
-      const transceiver2 = pc.addTransceiver(track);
-
-      assert_not_equals(transceiver1, transceiver2);
-      assert_not_equals(transceiver1.sender, transceiver2.sender);
-      assert_equals(transceiver1.sender.track, transceiver2.sender.track);
-
-      return promise_rejects_dom(t, 'InvalidAccessError', pc.getStats(track));
-    });
-  }, `getStats() with track associated with more than one sender should reject with InvalidAccessError`);
-
-  promise_test(t => {
-    const pc = new RTCPeerConnection();
-    t.add_cleanup(() => pc.close());
     const transceiver1 = pc.addTransceiver('audio');
 
     // Create another transceiver that resends what
@@ -135,35 +118,69 @@
     });
   }, 'getStats() with no argument should return stats report containing peer-connection stats on an empty PC');
 
-  promise_test(t => {
-    const pc = new RTCPeerConnection();
-    t.add_cleanup(() => pc.close());
-    return getTrackFromUserMedia('audio')
-    .then(([track, mediaStream]) => {
-      pc.addTrack(track, mediaStream);
-      return pc.getStats();
-    })
-    .then(statsReport => {
-//      validateStatsReport(statsReport);
-//      assert_stats_report_has_stats(statsReport, ['peer-connection']);
-      assert_stats_report_has_stats(statsReport, ['outbound-rtp']);
-    });
-  }, 'getStats() with no argument should return stats report containing peer-connection stats and outbound-track-stats');
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+    const [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc.addTrack(track, mediaStream);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    await listenToConnected(pc);
+    const statsReport = await pc.getStats();
+    getRequiredStats(statsReport, 'peer-connection');
+    getRequiredStats(statsReport, 'outbound-rtp');
+  }, 'getStats() track with stream returns peer-connection and outbound-rtp stats');
 
-  promise_test(t => {
-    const pc = new RTCPeerConnection();
-    t.add_cleanup(() => pc.close());
-    return getTrackFromUserMedia('audio')
-    .then(([track, mediaStream]) => {
-      pc.addTrack(track);
-      return pc.getStats();
-    })
-    .then(statsReport => {
-      validateStatsReport(statsReport);
-      assert_stats_report_has_stats(statsReport, ['peer-connection']);
-      assert_stats_report_has_stats(statsReport, ['outbound-rtp']);
-    });
-  }, 'getStats() with no argument should return stats for no-stream tracks');
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+    const [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc.addTrack(track);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    await listenToConnected(pc);
+    const statsReport = await pc.getStats();
+    getRequiredStats(statsReport, 'peer-connection');
+    getRequiredStats(statsReport, 'outbound-rtp');
+  }, 'getStats() track without stream returns peer-connection and outbound-rtp stats');
+
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+    const [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc.addTrack(track, mediaStream);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    await listenToConnected(pc);
+    const statsReport = await pc.getStats();
+    assert_stats_report_has_stats(statsReport, ['outbound-rtp']);
+  }, 'getStats() audio outbound-rtp contains all mandatory stats');
+
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+    const [track, mediaStream] = await getTrackFromUserMedia('video');
+    pc.addTrack(track, mediaStream);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    await listenToConnected(pc);
+    const statsReport = await pc.getStats();
+    assert_stats_report_has_stats(statsReport, ['outbound-rtp']);
+  }, 'getStats() video outbound-rtp contains all mandatory stats');
+
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+    const [audioTrack, audioStream] = await getTrackFromUserMedia('audio');
+    pc.addTrack(audioTrack, audioStream);
+    const [videoTrack, videoStream] = await getTrackFromUserMedia('video');
+    pc.addTrack(videoTrack, videoStream);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    await listenToConnected(pc);
+    const statsReport = await pc.getStats();
+    validateStatsReport(statsReport);
+  }, 'getStats() audio and video validate all mandatory stats');
 
   /*
     8.5.  The stats selection algorithm
@@ -181,12 +198,10 @@
     pc.addTrack(track, mediaStream);
     exchangeIceCandidates(pc, pc2);
     await exchangeOfferAnswer(pc, pc2);
-    await listenToIceConnected(pc);
+    await listenToConnected(pc);
     const stats = await pc.getStats(track);
-    validateStatsReport(stats);
-    assert_stats_report_has_stats(stats, ['outbound-rtp']);
-  }, `getStats() on track associated with RtpSender should return stats report containing outbound-rtp stats`);
-
+    getRequiredStats(stats, 'outbound-rtp');
+  }, `getStats() on track associated with RTCRtpSender should return stats report containing outbound-rtp stats`);
 
   /*
     8.5.  The stats selection algorithm
@@ -213,9 +228,28 @@
       });
     }
     const stats = await pc2.getStats(pc2.getReceivers()[0].track);
-    validateStatsReport(stats);
-    assert_stats_report_has_stats(stats, ['inbound-rtp']);
-  }, `getStats() on track associated with RtpReceiver should return stats report containing inbound-rtp stats`);
+    getRequiredStats(stats, 'inbound-rtp');
+  }, `getStats() on track associated with RTCRtpReceiver should return stats report containing inbound-rtp stats`);
+
+  promise_test(async t => {
+    const pc = createPeerConnectionWithCleanup(t);
+    const pc2 = createPeerConnectionWithCleanup(t);
+
+    let [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc.addTrack(track, mediaStream);
+    exchangeIceCandidates(pc, pc2);
+    await exchangeOfferAnswer(pc, pc2);
+    // Wait for unmute if the track is not already unmuted.
+    // According to spec, it should be muted when being created, but this
+    // is not what this test is testing, so allow it to be unmuted.
+    if (pc2.getReceivers()[0].track.muted) {
+      await new Promise(resolve => {
+        pc2.getReceivers()[0].track.addEventListener('unmute', resolve);
+      });
+    }
+    const stats = await pc2.getStats(pc2.getReceivers()[0].track);
+    getRequiredStats(stats, 'inbound-rtp');
+  }, `getStats() inbound-rtp contains all mandatory stats`);
 
   /*
     8.6   Mandatory To Implement Stats
@@ -339,4 +373,34 @@
 
   }, `getStats() with connected peer connections having tracks and data channel should return all mandatory to implement stats`);
 
+  promise_test(async t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    const [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc.addTransceiver(track);
+    pc.addTransceiver(track);
+    await promise_rejects_dom(t, 'InvalidAccessError', pc.getStats(track));
+  }, `getStats(track) should not work if multiple senders have the same track`);
+
+  promise_test(async t => {
+    const kMinimumTimeElapsedBetweenGetStatsCallsMs = 500;
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    const t0 = Math.floor(performance.now());
+    const t0Stats = getRequiredStats(await pc.getStats(), 'peer-connection');
+    await new Promise(
+        r => t.step_timeout(r, kMinimumTimeElapsedBetweenGetStatsCallsMs));
+    const t1Stats = getRequiredStats(await pc.getStats(), 'peer-connection');
+    const t1 = Math.ceil(performance.now());
+    const maximumTimeElapsedBetweenGetStatsCallsMs = t1 - t0;
+    const deltaTimestampMs = t1Stats.timestamp - t0Stats.timestamp;
+    // The delta must be at least the time we waited between calls.
+    assert_greater_than_equal(deltaTimestampMs,
+                              kMinimumTimeElapsedBetweenGetStatsCallsMs);
+    // The delta must be at most the time elapsed before the first getStats()
+    // call and after the second getStats() call.
+    assert_less_than_equal(deltaTimestampMs,
+                           maximumTimeElapsedBetweenGetStatsCallsMs);
+  }, `RTCStats.timestamp increases with time passing`);
+
 </script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCPeerConnectionIceErrorEvent.html firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCPeerConnectionIceErrorEvent.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCPeerConnectionIceErrorEvent.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCPeerConnectionIceErrorEvent.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,26 @@
+<!doctype html>
+<meta charset="utf-8">
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+test(() => {
+  init = {
+    address: "168.3.4.5",
+    port: 4711,
+    url: "turn:turn.example.org",
+    errorCode: 703,
+    errorText: "Test error"
+  };
+  event = new RTCPeerConnectionIceErrorEvent('type', init);
+  assert_equals(event.type, 'type');
+  assert_equals(event.address, '168.3.4.5');
+  assert_equals(event.port, 4711);
+  assert_equals(event.url, "turn:turn.example.org");
+  assert_equals(event.errorCode, 703);
+  assert_equals(event.errorText, "Test error");
+}, 'RTCPeerConnectionIceErrorEvent constructed from init parameters');
+
+</script>
+</html>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCRtpTransceiver-stop.html firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCRtpTransceiver-stop.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc/RTCRtpTransceiver-stop.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc/RTCRtpTransceiver-stop.html	2021-01-18 19:58:24.000000000 +0000
@@ -23,6 +23,18 @@
 
 promise_test(async (t)=> {
     const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+
+    pc1.addTransceiver("audio", { direction: "sendonly" });
+    pc1.addTransceiver("video");
+    assert_equals(null, pc1.getTransceivers()[1].receiver.transport);
+
+    pc1.getTransceivers()[1].stop();
+    assert_equals(pc1.getTransceivers()[1].receiver.transport, null);
+}, "A transceiver added and stopped should not crash when getting receiver's transport");
+
+promise_test(async (t)=> {
+    const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webrtc-extensions/RTCOAuthCredential.html firefox-85.0+build1/testing/web-platform/tests/webrtc-extensions/RTCOAuthCredential.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webrtc-extensions/RTCOAuthCredential.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webrtc-extensions/RTCOAuthCredential.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,44 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCConfiguration iceServers with OAuth credentials</title>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src='../webrtc/RTCConfiguration-helper.js'></script>
+<script>
+  'use strict';
+
+// These tests are based on
+// https://w3c.github.io/webrtc-extensions/#rtcoauthcredential-dictionary
+
+/*
+    4.3.2.  To set a configuration
+    11.6. If scheme name is turn or turns, and server.credentialType is "oauth",
+    and server.credential is not an RTCOAuthCredential, then throw an
+    InvalidAccessError and abort these steps.
+*/
+config_test(makePc => {
+  assert_throws_dom('InvalidAccessError', () =>
+    makePc({ iceServers: [{
+      urls: 'turns:turn.example.org',
+      credentialType: 'oauth',
+      username: 'user',
+      credential: 'cred'
+    }] }));
+}, 'with turns server, credentialType oauth, and string credential should throw InvalidAccessError');
+
+config_test(makePc => {
+  const pc = makePc({ iceServers: [{
+    urls: 'turns:turn2.example.net',
+    username: '22BIjxU93h/IgwEb',
+    credential: {
+      macKey: 'WmtzanB3ZW9peFhtdm42NzUzNG0=',
+      accessToken: 'AAwg3kPHWPfvk9bDFL936wYvkoctMADzQ5VhNDgeMR3+ZlZ35byg972fW8QjpEl7bx91YLBPFsIhsxloWcXPhA=='
+    },
+    credentialType: 'oauth'
+  }]});
+  const { iceServers } = pc.getConfiguration();
+  const server = iceServers[0];
+  assert_equals(server.credentialType, 'oauth');
+}, 'with turns server, credential type and credential from spec should not throw');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/001-1.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/001-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/001-1.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/001-1.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/001.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/001.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/001.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/001.html	2021-01-18 19:58:24.000000000 +0000
@@ -14,7 +14,7 @@
 var uuid;
 t.step(function() {
   uuid = token()
-  w = window.open("001-1.html");
+  w = window.open("001-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/002-1.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/002-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/002-1.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/002-1.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating top-level browsing context with closed websocket</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var controller = opener || parent;
 var t = controller.t;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/002.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/002.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/002.html	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/002.html	2021-01-18 19:58:24.000000000 +0000
@@ -15,7 +15,7 @@
 var uuid;
 t.step(function() {
   uuid = token()
-  w = window.open("002-1.html");
+  w = window.open("002-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/005-1.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/005-1.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/005-1.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/005-1.html	2021-01-18 19:58:24.000000000 +0000
@@ -1,8 +1,6 @@
 <!doctype html>
 <title>WebSockets: navigating nested browsing context with a websocket in top-level</title>
 <script src=../constants.js?pipe=sub></script>
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
 <script>
 var t = opener.t;
 var assert_unreached = opener.assert_unreached;
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/005.html firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/005.html
--- firefox-84.0.2+build1/testing/web-platform/tests/websockets/unload-a-document/005.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/websockets/unload-a-document/005.html	2021-01-18 19:58:24.000000000 +0000
@@ -12,7 +12,7 @@
 <script>
 var t = async_test();
 t.step(function() {
-  var w = window.open("005-1.html");
+  var w = window.open("005-1.html" + location.search);
   add_result_callback(function() {
     w.close();
   });
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webusb/resources/manual.js firefox-85.0+build1/testing/web-platform/tests/webusb/resources/manual.js
--- firefox-84.0.2+build1/testing/web-platform/tests/webusb/resources/manual.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webusb/resources/manual.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,38 @@
+let manualTestDevice = null;
+
+navigator.usb.addEventListener('disconnect', (e) => {
+  if (e.device === manualTestDevice) {
+    manualTestDevice = null;
+  }
+})
+
+async function getDeviceForManualTest() {
+  if (manualTestDevice) {
+    return manualTestDevice;
+  }
+
+  const button = document.createElement('button');
+  button.textContent = 'Click to select a device';
+  button.style.display = 'block';
+  button.style.fontSize = '20px';
+  button.style.padding = '10px';
+
+  await new Promise((resolve) => {
+    button.onclick = () => {
+      document.body.removeChild(button);
+      resolve();
+    };
+    document.body.appendChild(button);
+  });
+
+  manualTestDevice = await navigator.usb.requestDevice({filters: []});
+  assert_true(manualTestDevice instanceof USBDevice);
+
+  return manualTestDevice;
+}
+
+function manual_usb_test(func, name, properties) {
+  promise_test(async (test) => {
+    await func(test, await getDeviceForManualTest());
+  }, name, properties);
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webusb/usbDevice_claimInterface-manual.https.html firefox-85.0+build1/testing/web-platform/tests/webusb/usbDevice_claimInterface-manual.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webusb/usbDevice_claimInterface-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webusb/usbDevice_claimInterface-manual.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual.js"></script>
+  </head>
+  <body>
+    <p>
+      These tests require a USB device to be connected.
+    </p>
+    <script>
+      manual_usb_test(async (t, device) => {
+        await device.open();
+        const interfacesClaimed = [];
+        t.add_cleanup(async () => {
+          for (const iface of interfacesClaimed) {
+            await device.releaseInterface(iface.interfaceNumber);
+          }
+          await device.close();
+        });
+
+        await device.selectConfiguration(1);
+
+        const promises = [];
+        for (const iface of device.configuration.interfaces) {
+          const promise = device.claimInterface(iface.interfaceNumber);
+          promises.push(promise);
+
+          // Create a subtest for each interface so that success or failure to
+          // claim the interface is visible but does not affect the result of
+          // the overall test.
+          promise_test(async (t) => {
+            await promise;
+
+            interfacesClaimed.push(iface);
+          }, `Can claim interface ${iface.interfaceNumber}`);
+        }
+
+        await Promise.allSettled(promises);
+      }, 'claimInterface() resolves or rejects for all interfaces');
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/webxr/layers/xrWebGLBinding_constructor.https.html firefox-85.0+build1/testing/web-platform/tests/webxr/layers/xrWebGLBinding_constructor.https.html
--- firefox-84.0.2+build1/testing/web-platform/tests/webxr/layers/xrWebGLBinding_constructor.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/webxr/layers/xrWebGLBinding_constructor.https.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/webxr_util.js"></script>
+<script src="../resources/webxr_test_constants.js"></script>
+
+<script>
+
+function testConstructor(t, gl) {
+  return navigator.xr.test.simulateDeviceConnection(TRACKED_IMMERSIVE_DEVICE)
+    .then(() => {
+      return navigator.xr.requestSession('inline')
+        .then((session) => {
+          try {
+            let webglLayerIncompatible = new XRWebGLBinding(session, gl);
+            assert_unreached("XRWebGLBinding should fail when created with an inline session.");
+          } catch (err) {
+            assert_equals(err.name, "InvalidStateError", "Should get InvalidStateError for creating with inline session.");
+          }
+        });
+    })
+    .then(() => {
+      return new Promise((resolve) => {
+        navigator.xr.test.simulateUserActivation(() => {
+          let xrSession = null;
+          navigator.xr.requestSession('immersive-vr')
+          .then((session) => {
+            xrSession = session;
+            t.step_func(() => {
+              try {
+                let webglLayerIncompatible = new XRWebGLBinding(xrSession, gl);
+                assert_unreached("XRWebGLBinding should fail when created with a context that is not XRCompatible.")
+              } catch (err) {
+                assert_equals(err.name, "InvalidStateError", "Should get InvalidStateError for non-XRCompatible context.");
+              }
+            })
+
+            return gl.makeXRCompatible();
+          }).then(() => {
+            try {
+              let webglLayerGood = new XRWebGLBinding(xrSession, gl);
+            } catch (err) {
+              reject("XRWebGLBinding should not fail with valid arguments.");
+            }
+
+            let lose_context_ext = gl.getExtension('WEBGL_lose_context');
+
+            gl.canvas.addEventListener('webglcontextlost', (ev) => {
+              ev.preventDefault();
+
+              try {
+                let webglLayerBadContext = new XRWebGLBinding(xrSession, gl);
+                reject("XRWebGLBinding should fail when created with a lost context.");
+              } catch (err) {
+                assert_equals(err.name, 'InvalidStateError', "Should get InvalidStateError for lost context.");
+                t.step_timeout(() => { lose_context_ext.restoreContext(); }, 100);
+              }
+            });
+
+            gl.canvas.addEventListener('webglcontextrestored', (ev) => {
+              resolve(xrSession.end().then(() => {
+                try {
+                  let webglLayerBadSession = new XRWebGLBinding(xrSession, gl);
+                  assert_unreached("XRWebGLBinding should fail when created with an ended session.");
+                } catch (err) {
+                  assert_equals(err.name, 'InvalidStateError', "Should get InvalidStateError when passed an ended session.");
+                }
+              }));
+            });
+
+            lose_context_ext.loseContext();
+          });
+        });
+      });
+    });
+}
+xr_promise_test("Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl",
+  testConstructor, null, 'webgl');
+
+xr_promise_test("Ensure that XRWebGLBinding's constructor throws appropriate errors using webgl2",
+  testConstructor, null, 'webgl2');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html firefox-85.0+build1/testing/web-platform/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>DedicatedWorker: ES modules for data URL workers</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+const import_from_data_url_worker_test = (importType, isDataURL, expectation) => {
+  promise_test(async () => {
+    const importURL = new URL(`resources/${importType}-import-` +
+        `${isDataURL ? 'data-url' : 'script'}-block-cross-origin.js`,
+        location.href) + '?pipe=header(Access-Control-Allow-Origin, *)';
+    const dataURL = `data:text/javascript,import "${importURL}";`;
+    const worker = new Worker(dataURL, { type: 'module' });
+    worker.postMessage('Send message for tests from main script.');
+    const msgEvent =
+        await new Promise(resolve => worker.onmessage = resolve);
+    assert_array_equals(msgEvent.data,
+        expectation === 'blocked' ? ['ERROR']
+                                  : ['export-block-cross-origin.js']);
+  }, `${importType} import ${isDataURL ? 'data url' : 'script'} from data: ` +
+     `URL should be ${expectation}.`);
+}
+
+// Static import should obey the outside settings.
+// SecurityOrigin of the outside settings is decided by Window.
+import_from_data_url_worker_test('static', true, 'allowed');
+import_from_data_url_worker_test('static', false, 'allowed');
+
+
+// Dynamic import should obey the inside settings.
+// SecurityOrigin of the inside settings is a unique opaque origin.
+//
+// Data url script is cross-origin to the inside settings' SecurityOrigin, but
+// dynamic importing it is allowed.
+// https://fetch.spec.whatwg.org/#concept-main-fetch
+// Step 5: request’s current URL’s scheme is "data" [spec text]
+import_from_data_url_worker_test('dynamic', true, 'allowed');
+
+// Non-data url script is cross-origin to the inside settings' SecurityOrigin.
+// It should be blocked.
+import_from_data_url_worker_test('dynamic', false, 'blocked');
+
+</script>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/export-on-load-script.py firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/export-on-load-script.py
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/export-on-load-script.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/export-on-load-script.py	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,11 @@
+def main(request, response):
+    # This script serves both preflight and main GET request for cross-origin
+    # static imports from module service workers.
+    # According to https://w3c.github.io/ServiceWorker/#update-algorithm,
+    # `Service-Worker: script` request header is added, which triggers CORS
+    # preflight.
+    response_headers = [(b"Content-Type", b"text/javascript"),
+                        (b"Access-Control-Allow-Origin", b"*"),
+                        (b"Access-Control-Allow-Headers", b"Service-Worker")]
+    return (200, response_headers,
+            b"export const importedModules = ['export-on-load-script.js'];")
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/import-test-cases.js firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/import-test-cases.js
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/import-test-cases.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/import-test-cases.js	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,16 @@
         description: 'Static import.'
     },
     {
+        scriptURL: '/workers/modules/resources/static-import-remote-origin-script-worker.sub.js',
+        expectation: ['export-on-load-script.js'],
+        description: 'Static import (cross-origin).'
+    },
+    {
+        scriptURL: '/workers/modules/resources/static-import-redirect-worker.js',
+        expectation: ['export-on-load-script.js'],
+        description: 'Static import (redirect).'
+    },
+    {
         scriptURL: '/workers/modules/resources/nested-static-import-worker.js',
         expectation: [
             'export-on-static-import-script.js',
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/new-worker-window.html firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/new-worker-window.html
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/new-worker-window.html	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/new-worker-window.html	2021-01-18 19:58:24.000000000 +0000
@@ -8,6 +8,7 @@
 // Creates a new dedicated worker for a given script url.
 window.onmessage = e => {
   worker = new Worker(e.data, { type: 'module' });
+  worker.postMessage('start');
   worker.onmessage = msg => window.opener.postMessage(msg.data, '*');
   worker.onerror = err => {
       window.opener.postMessage(['ERROR'], '*');
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/redirect.py firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/redirect.py
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/redirect.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/redirect.py	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,8 @@
+def main(request, response):
+    """Simple handler that causes redirection.
+    This is placed here to stay within the same directory during redirects,
+    to avoid issues like https://crbug.com/1136775.
+    """
+    response.status = 302
+    location = request.GET.first(b"location")
+    response.headers.set(b"Location", location)
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/static-import-redirect-worker.js firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/static-import-redirect-worker.js
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/static-import-redirect-worker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/static-import-redirect-worker.js	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,21 @@
+// This script is meant to be imported by a module worker. It receives a
+// message from the worker and responds with the list of imported modules.
+import * as module from './redirect.py?location=/workers/modules/resources/export-on-load-script.js';
+if ('DedicatedWorkerGlobalScope' in self &&
+    self instanceof DedicatedWorkerGlobalScope) {
+  self.onmessage = e => {
+    e.target.postMessage(module.importedModules);
+  };
+} else if (
+    'SharedWorkerGlobalScope' in self &&
+    self instanceof SharedWorkerGlobalScope) {
+  self.onconnect = e => {
+    e.ports[0].postMessage(module.importedModules);
+  };
+} else if (
+    'ServiceWorkerGlobalScope' in self &&
+    self instanceof ServiceWorkerGlobalScope) {
+  self.onmessage = e => {
+    e.source.postMessage(module.importedModules);
+  };
+}
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/modules/resources/static-import-remote-origin-script-worker.sub.js	2021-01-18 19:58:24.000000000 +0000
@@ -1,12 +1,20 @@
 // Import a remote origin script.
-import * as module from 'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.js';
+import * as module from 'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-on-load-script.py';
 if ('DedicatedWorkerGlobalScope' in self &&
     self instanceof DedicatedWorkerGlobalScope) {
-  postMessage(module.importedModules);
+  self.onmessage = e => {
+    e.target.postMessage(module.importedModules);
+  };
 } else if (
     'SharedWorkerGlobalScope' in self &&
     self instanceof SharedWorkerGlobalScope) {
-  onconnect = e => {
+  self.onconnect = e => {
     e.ports[0].postMessage(module.importedModules);
   };
+} else if (
+    'ServiceWorkerGlobalScope' in self &&
+    self instanceof ServiceWorkerGlobalScope) {
+  self.onmessage = e => {
+    e.source.postMessage(module.importedModules);
+  };
 }
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/workers/Worker_terminate_event_queue.htm firefox-85.0+build1/testing/web-platform/tests/workers/Worker_terminate_event_queue.htm
--- firefox-84.0.2+build1/testing/web-platform/tests/workers/Worker_terminate_event_queue.htm	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/workers/Worker_terminate_event_queue.htm	2021-01-18 19:58:24.000000000 +0000
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title> AbstractWorker terminate(): clear event queue </title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id=log></div>
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/wpt firefox-85.0+build1/testing/web-platform/tests/wpt
--- firefox-84.0.2+build1/testing/web-platform/tests/wpt	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/wpt	2021-01-18 19:58:24.000000000 +0000
@@ -7,7 +7,20 @@
     commands = wpt.load_commands()
     py3only = commands[args.command]["py3only"]
 
-    if (args.py3 or py3only) and sys.version_info.major < 3:
+    if (args.py2) and sys.version_info.major > 2:
+        if py3only:
+            sys.stderr.write("This command only works with Python 3\n")
+            sys.exit(1)
+        from subprocess import call
+        try:
+            sys.exit(call(['python2'] + sys.argv))
+        except OSError as e:
+            if e.errno == 2:
+                sys.stderr.write("python2 is needed to run this command\n")
+                sys.exit(1)
+            else:
+                raise
+    elif (args.py3 or py3only) and sys.version_info.major < 3:
         from subprocess import call
         try:
             sys.exit(call(['python3'] + sys.argv))
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/xhr/resources/echo-method.py firefox-85.0+build1/testing/web-platform/tests/xhr/resources/echo-method.py
--- firefox-84.0.2+build1/testing/web-platform/tests/xhr/resources/echo-method.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/xhr/resources/echo-method.py	2021-01-18 19:58:24.000000000 +0000
@@ -14,4 +14,3 @@
 Content-Length: {}
 
 {}'''.format(len(content), content))
-    response.writer.flush()
diff -Nru firefox-84.0.2+build1/testing/web-platform/tests/xhr/resources/inspect-headers.py firefox-85.0+build1/testing/web-platform/tests/xhr/resources/inspect-headers.py
--- firefox-84.0.2+build1/testing/web-platform/tests/xhr/resources/inspect-headers.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/tests/xhr/resources/inspect-headers.py	2021-01-18 19:58:24.000000000 +0000
@@ -8,13 +8,14 @@
     # Python 3. <http.client.HTTPMessage> doesn't have 'headers" attribute or equivalent
     # [https://bugs.python.org/issue4773].
     # In Python 2, variable raw_headers.headers returns a completely uninterpreted list of lines
-    # contained in the header. In Python 3, raw_headers.as_string() returns entire formatted
-    # message as a string. Here is to construct an equivalent "headers" variable to support tests
-    # in Python 3.
+    # contained in the header. In Python 3, raw_headers.raw_items() returns the (name, value)
+    # header pairs without modification. Here is to construct an equivalent "headers" variable to
+    # support tests in Python 3.
     if PY3:
-        header_list = [
-            isomorphic_encode(s + u'\r\n') for s in raw_headers.as_string().splitlines() if s
-        ]
+        header_list = []
+        for field in raw_headers.raw_items():
+            header = b"%s: %s\r\n" % (isomorphic_encode(field[0]), isomorphic_encode(field[1]))
+            header_list.append(header)
     else:
         header_list = raw_headers.headers
     for line in header_list:
diff -Nru firefox-84.0.2+build1/testing/web-platform/unittestrunner.py firefox-85.0+build1/testing/web-platform/unittestrunner.py
--- firefox-84.0.2+build1/testing/web-platform/unittestrunner.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/unittestrunner.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import argparse
 import configparser
 import os
diff -Nru firefox-84.0.2+build1/testing/web-platform/update/upstream.py firefox-85.0+build1/testing/web-platform/update/upstream.py
--- firefox-84.0.2+build1/testing/web-platform/update/upstream.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/update/upstream.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import re
 import subprocess
diff -Nru firefox-84.0.2+build1/testing/web-platform/vcs.py firefox-85.0+build1/testing/web-platform/vcs.py
--- firefox-84.0.2+build1/testing/web-platform/vcs.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/web-platform/vcs.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 import os
 import subprocess
 
diff -Nru firefox-84.0.2+build1/testing/xpcshell/dns-packet/index.js firefox-85.0+build1/testing/xpcshell/dns-packet/index.js
--- firefox-84.0.2+build1/testing/xpcshell/dns-packet/index.js	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/dns-packet/index.js	2021-01-18 19:58:24.000000000 +0000
@@ -1347,13 +1347,27 @@
       svcparam.encode.bytes += 2;
     }
   } else if (key == 1) { // alpn
-    let len = param.value.length
-    buf.writeUInt16BE(len || 0, offset);
+    let val = param.value;
+    if (!Array.isArray(val)) val = [val];
+    // The alpn param is prefixed by its length as a single byte, so the
+    // initialValue to reduce function is the length of the array.
+    let total = val.reduce(function(result, id) {
+      return result += id.length;
+    }, val.length);
+
+    buf.writeUInt16BE(total, offset);
     offset += 2;
     svcparam.encode.bytes += 2;
-    buf.write(param.value, offset)
-    offset += len;
-    svcparam.encode.bytes += len;
+
+    for (let id of val) {
+      buf.writeUInt8(id.length, offset);
+      offset += 1;
+      svcparam.encode.bytes += 1;
+
+      buf.write(id, offset);
+      offset += id.length;
+      svcparam.encode.bytes += id.length;
+    }
   } else if (key == 2) { // no-default-alpn
     buf.writeUInt16BE(0, offset);
     offset += 2;
@@ -1378,13 +1392,23 @@
       svcparam.encode.bytes += 4;
     }
   } else if (key == 5) { //echconfig
-    // TODO: base64 presentation format
-    buf.writeUInt16BE(param.value.length, offset);
-    offset += 2;
-    svcparam.encode.bytes += 2;
-    buf.write(param.value, offset);
-    offset += param.value.length;
-    svcparam.encode.bytes += param.value.length;
+    if (svcparam.ech) {
+      buf.writeUInt16BE(svcparam.ech.length, offset);
+      offset += 2;
+      svcparam.encode.bytes += 2;
+      for (let i = 0; i < svcparam.ech.length; i++) {
+        buf.writeUInt8(svcparam.ech[i], offset);
+        offset++;
+      }
+      svcparam.encode.bytes += svcparam.ech.length;
+    } else {
+      buf.writeUInt16BE(param.value.length, offset);
+      offset += 2;
+      svcparam.encode.bytes += 2;
+      buf.write(param.value, offset);
+      offset += param.value.length;
+      svcparam.encode.bytes += param.value.length;
+    }
   } else if (key == 6) { //ipv6hint
     let val = param.value;
     if (!Array.isArray(val)) val = [val];
@@ -1433,11 +1457,24 @@
 
   switch (param.key) {
     case 'mandatory' : return 4 + 2*(Array.isArray(param.value) ? param.value.length : 1)
-    case 'alpn' : return 4 + param.value.length
+    case 'alpn' : {
+      let val = param.value;
+      if (!Array.isArray(val)) val = [val];
+      let total = val.reduce(function(result, id) {
+        return result += id.length;
+      }, val.length);
+      return 4 + total;
+    }
     case 'no-default-alpn' : return 4
     case 'port' : return 4 + 2
     case 'ipv4hint' : return 4 + 4 * (Array.isArray(param.value) ? param.value.length : 1)
-    case 'echconfig' : return 4 + param.value.length
+    case 'echconfig' : {
+      if (param.needBase64Decode) {
+        svcparam.ech = Buffer.from(param.value, "base64");
+        return 4 + svcparam.ech.length;
+      }
+      return 4 + param.value.length
+    }
     case 'ipv6hint' : return 4 + 16 * (Array.isArray(param.value) ? param.value.length : 1)
     case 'key65535' : return 4
     default: return 4 // unknown option
diff -Nru firefox-84.0.2+build1/testing/xpcshell/moz-http2/http2-cert.pem firefox-85.0+build1/testing/xpcshell/moz-http2/http2-cert.pem
--- firefox-84.0.2+build1/testing/xpcshell/moz-http2/http2-cert.pem	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/moz-http2/http2-cert.pem	2021-01-18 19:58:24.000000000 +0000
@@ -16,4 +16,4 @@
 ClaIJgjff/ucvCvRwl79GzGDCoh3qpqhvxQpC/Fcdz1iQDYEVAmjgUrYJe1lTfj8
 ZozM1WIq8fQ3SCXTJK82CnX818tJio2PWq3uzb9vhpuxJJif7WoMP88Jpdh8zcEb
 YL15XPzhQMyor2p6XfwNI3J6347fd7U=
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff -Nru firefox-84.0.2+build1/testing/xpcshell/moz-http2/moz-http2-child.js firefox-85.0+build1/testing/xpcshell/moz-http2/moz-http2-child.js
--- firefox-84.0.2+build1/testing/xpcshell/moz-http2/moz-http2-child.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/moz-http2/moz-http2-child.js	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+/* 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/. */
+
 /* eslint-env node */
 
 function sendBackResponse(evalResult, e) {
diff -Nru firefox-84.0.2+build1/testing/xpcshell/moz-http2/moz-http2.js firefox-85.0+build1/testing/xpcshell/moz-http2/moz-http2.js
--- firefox-84.0.2+build1/testing/xpcshell/moz-http2/moz-http2.js	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/moz-http2/moz-http2.js	2021-01-18 19:58:24.000000000 +0000
@@ -722,7 +722,7 @@
         });
       }
 
-      // for use with test_esni_dns_fetch.js
+      // for use with test_dns_by_type_resolve.js
       if (packet.questions[0].type == "TXT") {
         answers.push({
           name: packet.questions[0].name,
@@ -849,7 +849,7 @@
           priority: 1,
           name: "h3pool",
           values: [
-            { key: "alpn", value: "h2,h3" },
+            { key: "alpn", value: ["h2", "h3"] },
             { key: "no-default-alpn" },
             { key: "port", value: 8888 },
             { key: "ipv4hint", value: "1.2.3.4" },
@@ -1036,8 +1036,8 @@
     // it's just meant to be this slow - the test doesn't care about the actual response
     return;
   }
-  // for use with test_esni_dns_fetch.js
-  else if (u.pathname === "/esni-dns-push") {
+  // for use with test_dns_by_type_resolve.js
+  else if (u.pathname === "/txt-dns-push") {
     // _esni_push.example.com has A entry 127.0.0.1
     let rContent = Buffer.from(
       "0000010000010001000000000A5F65736E695F70757368076578616D706C6503636F6D0000010001C00C000100010000003700047F000001",
diff -Nru firefox-84.0.2+build1/testing/xpcshell/remotexpcshelltests.py firefox-85.0+build1/testing/xpcshell/remotexpcshelltests.py
--- firefox-84.0.2+build1/testing/xpcshell/remotexpcshelltests.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/remotexpcshelltests.py	2021-01-18 19:58:24.000000000 +0000
@@ -438,6 +438,7 @@
             "pk12util",
             "BadCertAndPinningServer",
             "DelegatedCredentialsServer",
+            "EncryptedClientHelloServer",
             "OCSPStaplingServer",
             "GenerateOCSPResponse",
             "SanctionsTestServer",
diff -Nru firefox-84.0.2+build1/testing/xpcshell/xpcshellcommandline.py firefox-85.0+build1/testing/xpcshell/xpcshellcommandline.py
--- firefox-84.0.2+build1/testing/xpcshell/xpcshellcommandline.py	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/testing/xpcshell/xpcshellcommandline.py	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,7 @@
+# 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/.
+
 from __future__ import absolute_import
 
 import argparse
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/.cargo-checksum.json	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/.cargo-checksum.json	2021-01-18 19:59:04.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGES":"2135917ffdf1c040c75aa2d4f75629f3ed6e0b45487f26ee8a1e588df66d148d","Cargo.lock":"67d8d8bcc74d8b8e4bbcc1fe11c12b49e13fd9f47dd28914ece899da79f9b8d6","Cargo.toml":"5b8c4d5be556016e5f6f2b6322ba2bc4b099d2efa05656e1fafe3d14f60d39c2","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"b0d447c467d903c594241afc3fcadece95fb7c1014e9df4a9e8e6f2ccced7e4a","build.rs":"8eb7cef3e6d0d5a56e94803931705fdcc37ee8b631e4eed9a9e026516c52499c","contributing.md":"664f45455e32d50973b69d42cea114704efc2646e1a7a087661a5aac9ac7faf7","docs.md":"7c7340cff168a726d920b1d91b673bfaddc9b8815358e327220de5ea94bc1481","internals.md":"62721f9a63729769c947ddb8270df3445f148fcba545e1152bc4f545cc32398b","src/bindgen/bindings.rs":"89f404fbd65df9c89101a31f5886ba401062ff69eb534a88421f4c14b4a86074","src/bindgen/bitflags.rs":"c52cb0d7fd0ac96be24a6f37ea49698450d918d5acddbce29e350f485f3cdf61","src/bindgen/builder.rs":"dbc5b127bc88e1786d5c4016b04e8a4c67e9c3ca21cea0aa896ae2d0a16130ea","src/bindgen/cargo/cargo.rs":"0da5d2bc55e685e126decfdb0aa78ff1aff893674f45207ec76fe61e11442b14","src/bindgen/cargo/cargo_expand.rs":"f7ef6f37782a0a7c21bdfcf2f17b8375cb4a09eda864c6dbbf34b87019c25afe","src/bindgen/cargo/cargo_lock.rs":"0426ce5ed7ed2a4c76ea119f9f9bb841c9a55ceb3554e93c3e0909b68c04bb82","src/bindgen/cargo/cargo_metadata.rs":"d2cecb9c532bf9de2db23603f9ba4ede8dedf2dc4958018ae502908d4a7a2f4a","src/bindgen/cargo/cargo_toml.rs":"a28f4cc8b9c938ec7fe99b1f235795e191e0baa1961299cb6c1155c7bbdbdfa0","src/bindgen/cargo/mod.rs":"a938c1070207d9d13304b1fe2f19680d2a409337fad1fad3770c676a6cc74373","src/bindgen/cdecl.rs":"d0365487af5b18b7f4a0b59a795a65332e62597ae89a0612c27f88e680d7ed61","src/bindgen/config.rs":"7fc39f6dfb1b95e9fb40fb52299609bda5326ef5499cbac0fbd891e4e3f4d272","src/bindgen/declarationtyperesolver.rs":"1c4f1851c23fe833ad3d9edd0c497b162a5e892fc426b2fd7a1d86d542f6ef7b","src/bindgen/dependencies.rs":"56809b651344fcf3a351e486fa6027c6b75a6a9b460eeb749e7c17d3e5761818","src/bindgen/error.rs":"9ba4d9f8c331c738c124f3369a0ed3c86cdd83c7eb3221ed8417f4f42eae5cbe","src/bindgen/ir/annotation.rs":"1bb90eace3a1777093e2ec9d007c2b6bc5e9feb7a9ac196a029c897abd52125e","src/bindgen/ir/cfg.rs":"9105ae1548cdf1a97200f4a0147f8b22cc1151f4e962d1356511271aefe90115","src/bindgen/ir/constant.rs":"ca52c3e6d81a3f637fd533868b009d85b5e06f1274527efad611dab1d5d43668","src/bindgen/ir/documentation.rs":"d102d4d7883efd243b1e5b83ffb24823844473d3d8b928a73e2e47f1f990c296","src/bindgen/ir/enumeration.rs":"4ec250720029fda2506e63a0915d885023afbc721960f5e997cf97d6f43d8286","src/bindgen/ir/function.rs":"df8932d6017cc699dcbab055b47614af389f6474f838312b33f39907017a6dd4","src/bindgen/ir/generic_path.rs":"59bb58f2752342393321bb13d84ecc553504effdf6d016cecc9a90dff683ffd9","src/bindgen/ir/global.rs":"40a3d61154db025e1ec4044c574d3f6833210bce69ec9f2dd60a0363f6801b0a","src/bindgen/ir/item.rs":"56cee90eb7c42b555bc260e52f0aa44943eff056946e3d39054075f235ff3b8d","src/bindgen/ir/mod.rs":"63dfc9d3a3ebb78f167d2b63ece4f86780d8a4a022a34b55b8519c073b320a18","src/bindgen/ir/opaque.rs":"8d712786fdd682a4c920f9d8338bb460ed7ff2bf06fe06b2da1ac2ab08f31514","src/bindgen/ir/path.rs":"a107230f403b7c139ea722e8c20156d12c609e141a6f279e19d5c5a0280d08af","src/bindgen/ir/repr.rs":"2c84fa601518bb500968836b6919503953649e1550dad50d031cf7658b956c50","src/bindgen/ir/structure.rs":"0b7f4946677cfffad8f159f8b3fc5177ae56e3101eb11531a4a87909f28a7968","src/bindgen/ir/ty.rs":"938b9bad0a46b76c583b414f495e0f7ba14a45ef28177bc11d57d1a8d91172bf","src/bindgen/ir/typedef.rs":"9571352719949b7b7a8b9240d209b4aa6dd04f959ae67ab64d4b5bb8cb2d8d42","src/bindgen/ir/union.rs":"2a0a441fc72fd9340def1093a9d3df949910d6100ca0d1a601f738fd52e0a63d","src/bindgen/library.rs":"f6a2e4d9e916f4a9817c483c13fbc43a5e1ea54ba81f0177a6b44fc43688fc19","src/bindgen/mangle.rs":"207d3264824ac0d056b992a58713f6c59af17ab792bb82bb04e01a44ef51d96b","src/bindgen/mod.rs":"40119fe70942ffd62be3764a5dae5c9fc14c6cb3dc3b60c8b77c87e57521971e","src/bindgen/monomorph.rs":"e7b77766cecd29363db107c91fff03e034ad5217c88e597757ea3e50358468eb","src/bindgen/parser.rs":"a2d5157eae18b7af5261bdbea8c488a06aab18d09a8154b668746b64159ed0b7","src/bindgen/rename.rs":"15b405f24f8abbccc9be0b84d4626c7b78fc84da69ee00472831de4b011d0e88","src/bindgen/reserved.rs":"7024f1cc80f787d768151bac15ed4e6f1b55fcb64c699e3a05b398ed9acbe4ea","src/bindgen/utilities.rs":"3adc4e72c8ab193e9dee5a8853e795b9deef8d3f0d6b736baa316afcb26f8c7a","src/bindgen/writer.rs":"a1d45453062411a8e2b3dbfb1e1991359f309753164e1ababd18b8c3b2e9ec80","src/lib.rs":"0c313bbe7f3bef625b2d2b345ec188e16db34c4222fc3e230b12b5863838b4a4","src/logging.rs":"61a51d7c22d4c34c3ec058e15ea45b9c5519addcf3e6841a56cd56e599b5cf1b","src/main.rs":"13f9e4c116cc181d9f6594d25fd9a943a30709629ebdfedd040bd25bfc69f378","template.toml":"1b9e7254949d25be8782c8c73cb648e41b849ff5c966273affed12d49f9b133f","tests/expectations/alias.c":"cf3c496e8e65c6ab14469a38420f9afd147160d432e6a2ed11c716c908b2cb5f","tests/expectations/alias.compat.c":"a56deac9f43efb1f68aed20f6b436687289f9037e2a21810669f640a7f8b6e12","tests/expectations/alias.cpp":"259c612fc5149b0e3ae7a353eff451413b54c4d912e69567d32849cd26697eb7","tests/expectations/annotation.c":"450759e776b54e87c5cbc3c4462e166eb0068ea6a267315505c786cb8879eba6","tests/expectations/annotation.compat.c":"4a6ebe717d4c7346de882a671ce4b61564887ff935afeb0ca9f56e2f52f30d66","tests/expectations/annotation.cpp":"4781e0146707823823c39bb16f167cfba0e2120c6e76869a2e0f89cb1700ad66","tests/expectations/array.c":"25d938723505e0bc30d79b57a510cbec95647fe7dd0a2bd06faf6f4c34b632d3","tests/expectations/array.compat.c":"36681b644e94cc38378f16ea1cb24792e01d1ff875c2e144d6e5a97ff62ac4c0","tests/expectations/array.cpp":"37152d5dbf71e280afdbbcff347ee7e53cc1eb426f1f0dbf94520f72b1695b1e","tests/expectations/asserted-cast.c":"3c63e1d148598e98bb0d30734c0c527fbc08f0767606c29622e492601e3995f3","tests/expectations/asserted-cast.compat.c":"fcca7cff3bfd5964a724b0bff77b909ebd3164bf8eee72fbe4a77af6815f2562","tests/expectations/asserted-cast.cpp":"b4df513687321770538b9da13674d7f9a6249bdf91ec61049d756d40c84d967d","tests/expectations/assoc_const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/assoc_const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/assoc_const_conflict.cpp":"29e82a9f7b478bb95a947ce6059fd0b9d76b4288d43b726c33520f70d67ace49","tests/expectations/assoc_constant.c":"bc24ec8a76c6bbecdb42593051ec1c87286ed5afe6ae5207dd978191b506f8d6","tests/expectations/assoc_constant.compat.c":"d7c4e031ccdb61b2ff04c99a755ffdcb9fb090c7a976c1739596a30852f85340","tests/expectations/assoc_constant.cpp":"7ac49cbf146a09881b33677db8a8db3de6bec3e3e79d69c10bb7e268212e25ba","tests/expectations/associated_constant_panic.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/associated_constant_panic.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/associated_constant_panic.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/associated_in_body.c":"884de8df7cbfaaff41ff953b441cbd267598956a18906202c3a239c49aa6ffe3","tests/expectations/associated_in_body.compat.c":"4760ad1dbef99c03a23531908898500c70cdb56a75c90a0c6b194daa4fabf968","tests/expectations/associated_in_body.cpp":"713be556c029aad5662b7ef6e6e02a5164d713a889e68e3aef35aeec9a095386","tests/expectations/bitflags.c":"a59ec11d40a4f37c991237e7b0a09604827553b065be5f073a6d31d2861357a2","tests/expectations/bitflags.compat.c":"a2b9b46236971e236e312edf1828ecee3cb404a3d61526fb699993f6b27f95fb","tests/expectations/bitflags.cpp":"14d77c4e34bb86cc1d632875404e6c6c22085abd071f0bfa9bc91212bd8660eb","tests/expectations/body.c":"6f20f6ff0564b4f8c984de50b8283dbc37184615052cf5425acdfff71f62449c","tests/expectations/body.compat.c":"3197f9a17148eab1d2463f9805dc88e6067cc10677c14f3e7ed5ebef7a0cdbc4","tests/expectations/body.cpp":"c3d10bac6c09c4b56cb4cf81e6eb719e2ecd3d75e8a62bc5bfe94abe7d1b41f5","tests/expectations/both/alias.c":"65cd0058379feecd20348416fd9950d11a205bd29e14ba2ffaae768c03a0e656","tests/expectations/both/alias.compat.c":"c704c0e9dd7ceceda6fa66f62756dd4af334087f23f2b8648c5310599258a451","tests/expectations/both/annotation.c":"00a582b5aed201ddd1253c83f33644dacdb66008f3f05de0ad7a52a2d786281e","tests/expectations/both/annotation.compat.c":"9e6db793d8d863150772e5d6bb54e9acd3ac681e5670ae593c1b58f213674ce7","tests/expectations/both/array.c":"102fbff2a729bffa996b75a7cc2c605da7ee3edf6661681bb0a5aaa181e94715","tests/expectations/both/array.compat.c":"de0f3e96b45291b2325e8038f6754ab16d5715de33aa1a84f97333537a5733e0","tests/expectations/both/asserted-cast.c":"a5ae14d8e8b073b0b7698de21c2198200d5cc4f02f18beb023cc5d66ae9e4655","tests/expectations/both/asserted-cast.compat.c":"327d4b2c2f7dc453b49bc7ebe730d455f25ad3ec09f67ed6e538dd3d1bb1fdf6","tests/expectations/both/assoc_const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/both/assoc_const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/both/assoc_constant.c":"74a840a33e6e1f5ac565515169371c254229291b54cc69f28df780a9c85f8317","tests/expectations/both/assoc_constant.compat.c":"36ea22318b4434be8f1caebd1d069341a71d6a37140ba400fd650f5de640a8a2","tests/expectations/both/associated_constant_panic.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/associated_constant_panic.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/associated_in_body.c":"aa5fb476f93e1e8f3451816ac738d7b85916405c6f9de009d86f3807f0a89bd0","tests/expectations/both/associated_in_body.compat.c":"1f99cafd2fc1bd0007fdc923158ec1cd49f11560bb7fd3162cb0607cc0be7f9f","tests/expectations/both/bitflags.c":"8d4c796411dfa540569024ea0d2f17b07950c96e0c7dd8993a46a07841c3ead6","tests/expectations/both/bitflags.compat.c":"4afa3bbb876fd7b099d2d2c24dd960459f1f0e0f0a77a0fca201c985920ff460","tests/expectations/both/body.c":"a75e00c91ebbc0d7ea963476e62e21f85960061cbb592735cb3b2138addd6705","tests/expectations/both/body.compat.c":"fd01fa3887079befd5773487269c8a4af8bf316f97c13547db04831ae587d574","tests/expectations/both/box.c":"a96662cc8ff46d8154ad48ddd8c9b261cfa65a5b19f463dc1ba3e340aa1f78c7","tests/expectations/both/box.compat.c":"abb5439e9bc01559c2fc5f6b40953a9919c5d9aa4a251a9f957172bcb7ceacbb","tests/expectations/both/cdecl.c":"e49da32919797ea6d6ce3f4fd7a967ad33ef1dfa3f323f15181cca5f9a1fc98e","tests/expectations/both/cdecl.compat.c":"80ca597ab6be6a89310ed2120e62192b6c957cce02770218e11eebfdaa730282","tests/expectations/both/cell.c":"51d22698737241f01c720fa6f2255e0e48d3528606e9da67b82e7ffde1a3d585","tests/expectations/both/cell.compat.c":"7096647393fdc6c67cb13ae72924d79540ab4bd2e1431b1a563c7c105e72b698","tests/expectations/both/cfg-2.c":"ddc235c7fcafb5a39f44b8a21c53b6fe836455605fab4dd79716b8d92cc84225","tests/expectations/both/cfg-2.compat.c":"d05be0c340a871e60be5c41b9d4ce57b97f02b7ea84fe39938a116ec95341cb4","tests/expectations/both/cfg-field.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/cfg-field.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/cfg.c":"05c89b43ca74eac5a9fcdf5bc0bb0b4278e755d9776d3b681c21e58e9d4eae42","tests/expectations/both/cfg.compat.c":"650a12d53aae902a2ed4796d07f0752e700d9682956c6815fafec92565967a0a","tests/expectations/both/char.c":"b3040bc72dd923e63a5882f389c25ce8654fe08048cace5b245af02a129a1017","tests/expectations/both/char.compat.c":"efbc7c3d353b57f010f08aa1025374ec79d6d11f67f8ac2ed43f67f5615e5058","tests/expectations/both/const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/both/const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/both/const_transparent.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/both/const_transparent.compat.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/both/constant.c":"aaa2b5c85aa0da4108decd4f0445db476fb2e215919fafaa29e646ed1e023521","tests/expectations/both/constant.compat.c":"6cc9f418c7271b716d605b20483b12ccb4e607df7c36a652b6005d38a0f033c1","tests/expectations/both/constant_big.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/both/constant_big.compat.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/both/constant_constexpr.c":"8b498a1a11e995d17cdc1b9d74d2cec3051af5601d195adee1954b5675457a5e","tests/expectations/both/constant_constexpr.compat.c":"8b498a1a11e995d17cdc1b9d74d2cec3051af5601d195adee1954b5675457a5e","tests/expectations/both/constant_sort_name.c":"733b9a46e8b9e33cb8696d13e74ba7b8023735c8fd8dfe73b3cf39d027dffb38","tests/expectations/both/constant_sort_name.compat.c":"82bd07c1f56913bca006c3859f222feada9ce53a53444702c5c61fd96943ec49","tests/expectations/both/constant_sort_none.c":"7839492e03ffac12c0b2f5a15bd4b32aaeb20d0c50440fc392fa2cff9b585f83","tests/expectations/both/constant_sort_none.compat.c":"3b59ec576d09ae51f0db0f8c34bb9787972cd8441ae718117568f9220c4f0cc9","tests/expectations/both/constant_user_defined_type.c":"c6c7e161438bc7d4eac09336b05950bba88ffb0ddfe39691ad288fd8db6825a8","tests/expectations/both/constant_user_defined_type.compat.c":"c6c7e161438bc7d4eac09336b05950bba88ffb0ddfe39691ad288fd8db6825a8","tests/expectations/both/custom_header.c":"9c1a75c8720c009da725e2f980c600ad695fc43481dbb038eb79e672d91ac05e","tests/expectations/both/custom_header.compat.c":"30b8f6fe02ad2f00956a4d1ac2ce3a32ddea5eb6789c1aade68dfa1640262ae6","tests/expectations/both/dep_v2.c":"6a979cce6c6d04f2a83310d0a5ca60841daec1cfd004b021bc66aff813122cec","tests/expectations/both/dep_v2.compat.c":"521095c1eb1aa701dc31f7956225058a83ae53bb119dc41807294479798e238a","tests/expectations/both/derive-eq.c":"bf28f86c3a8748010c3bbeb34826c8e8c65d6efbf2c9e3f70ad54b1d041492ff","tests/expectations/both/derive-eq.compat.c":"ab308e3e126a202151bf0b1ecdcc5a5152128cbb9c69ea56d7cc1a0d27feaa3b","tests/expectations/both/derive_ostream.c":"77aad5f0e1d02a5888fd9155d435f7bc93b883c61fed9ea6b8bddf16f2aba9e1","tests/expectations/both/derive_ostream.compat.c":"b9529e985d8a092b1ee75467c2c64d97176c3dca4bfcd8f7182b1f42290f9ffd","tests/expectations/both/destructor-and-copy-ctor.c":"f6c7378286dc9fc4b464b99e78e0626e3b12627dbb9496c2ed040cc1ca0d0176","tests/expectations/both/destructor-and-copy-ctor.compat.c":"51f65338085aa14fc899ffe874bc71d7f89d06b15ee7163dc30e74d29342f167","tests/expectations/both/display_list.c":"fe1a7716bf0af74b1843b47e6e3a4063cef57c55bbe22112e0f2f69d5adec9d9","tests/expectations/both/display_list.compat.c":"27ddabc469bf0f188de091095082c5dd59fd577434306989d6f90f38692580b4","tests/expectations/both/docstyle_auto.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/both/docstyle_auto.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/both/docstyle_c99.c":"dcb114c8aa34bd0a15cca9e7076b24700c3660741ecdcc41e7ddcc44bfff9434","tests/expectations/both/docstyle_c99.compat.c":"fe9814379b9c8795bf8ecfb1308397e5e0dbe9bd81cc9ac820b90ac89191c39f","tests/expectations/both/docstyle_doxy.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/both/docstyle_doxy.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/both/documentation.c":"268e799c5b13dabb6796b9e233d623adf89d3d69a26c9d25d661a182a2de2a73","tests/expectations/both/documentation.compat.c":"b9987f70233cc3952f82b2553b2e016e85b54037b767009c1b96c9cbf9d80830","tests/expectations/both/documentation_attr.c":"7c353cf10b129591b74fc1a3492b2ae45e80877e5c00ed225e83f892a495bd73","tests/expectations/both/documentation_attr.compat.c":"17f61b4a39cb3f8668713ea7d50e74e57e5021e326cedd95e3f67a29d1c4d2a4","tests/expectations/both/enum.c":"7a8415e93b76f73c2fadef2090eb10557b3b07fd8d88d20f08056fb56fc51b32","tests/expectations/both/enum.compat.c":"23a5b4a792f62a4123d82209cb654039d8c4b051453275ddaba462f77989449e","tests/expectations/both/enum_self.c":"14b19abdab3c28b3ae29bf2d78ea689ae843bc1ad649544584e1c9b6c2a6a3c9","tests/expectations/both/enum_self.compat.c":"1c767b6bead5def44369d59dca972f25ad5df9b129fa589b2613cb776cbd0d15","tests/expectations/both/euclid.c":"3f76779820ccc2a73c86722be4cf0faac116ffc9aebdc6e53e9f05f1ab17c4b2","tests/expectations/both/euclid.compat.c":"7a106f426aff59614bd226b366f119dde2af53f69d2efdac8a8bf622c6896bdb","tests/expectations/both/exclude_generic_monomorph.c":"46e15a685c5ab355b0f52800f20e91ee96b4cebddb0e58c553073ec6086d0cef","tests/expectations/both/exclude_generic_monomorph.compat.c":"b99fe2475b360de831767304e13bf266b7a889e35cbdc4ad3ba5ef5e4720158b","tests/expectations/both/expand.c":"d02f111a1690428057d3879c59e9ffb86165ea07bfb27a43690014db0fd24f61","tests/expectations/both/expand.compat.c":"4d9e09ee8d6a2be606c0abda81cf65f04f7a0af6d3e9caea0b6fd6cadf99b4b9","tests/expectations/both/expand_default_features.c":"bfbb4a6458c85c2d886c5cc7cbfb958be8cb77c17220654bdc7f5a12b08b48f3","tests/expectations/both/expand_default_features.compat.c":"ab65e10401dab3946e4b39c971744923c68d77a322b9e2953b5213f9330939d7","tests/expectations/both/expand_dep.c":"6a979cce6c6d04f2a83310d0a5ca60841daec1cfd004b021bc66aff813122cec","tests/expectations/both/expand_dep.compat.c":"521095c1eb1aa701dc31f7956225058a83ae53bb119dc41807294479798e238a","tests/expectations/both/expand_dep_v2.c":"6a979cce6c6d04f2a83310d0a5ca60841daec1cfd004b021bc66aff813122cec","tests/expectations/both/expand_dep_v2.compat.c":"521095c1eb1aa701dc31f7956225058a83ae53bb119dc41807294479798e238a","tests/expectations/both/expand_features.c":"4ed1272f3a2736193de2e5b9e0ad921dfbed39335be8d6e6b0bf54b80c33d37a","tests/expectations/both/expand_features.compat.c":"e48b1fb819d8f4a48537c4538708f1b90442ef7a71769f79bd941e22b0595f99","tests/expectations/both/expand_no_default_features.c":"d02f111a1690428057d3879c59e9ffb86165ea07bfb27a43690014db0fd24f61","tests/expectations/both/expand_no_default_features.compat.c":"4d9e09ee8d6a2be606c0abda81cf65f04f7a0af6d3e9caea0b6fd6cadf99b4b9","tests/expectations/both/export_name.c":"4c0452bf3c2901a1006efd759360882df316c2938d141906c89ad60b15b477ad","tests/expectations/both/export_name.compat.c":"5a2182e239b75ef0e4970431523f4ca5e3c17d43178ab1126b0833385666e37f","tests/expectations/both/extern-2.c":"a81c41efe618612fc4b9a22d937397ce7a76ae966a28b33e56a10725cf2700ea","tests/expectations/both/extern-2.compat.c":"124174ff9745e397b646830ed9660faeb05910bcb340b73c925a4f8f3f656a14","tests/expectations/both/extern.c":"2721a42f36bc7feab0e0a8762a925ff846e9375eec2d5c7eaa85d2c9f6f93cb2","tests/expectations/both/extern.compat.c":"28c4c320806466fab6b9b6e3a9c9825478f8150c8bd66eb0e98fbf0f87696698","tests/expectations/both/external_workspace_child.c":"61d48384241aa0ad5fa6ceea5f26a72d90c1cbac78bc38059ec56821985ffc2a","tests/expectations/both/external_workspace_child.compat.c":"2beaf06bbaecedec18c7852b12638b161bbf15ca4d00cbd8643cd6fa090e36a6","tests/expectations/both/fns.c":"6da214abe735811c331e2405af3067e859faca5b9d3770d1a596d9dcdc37708b","tests/expectations/both/fns.compat.c":"ec3b96de44ae2da6833830499bb4bac5847f554b332c35aa155fd2a2e91822f6","tests/expectations/both/function_args.c":"90545731d4f875305f4255721917fe99fe2b72a9800c0e0a1f5ce216c3bdfd93","tests/expectations/both/function_args.compat.c":"f8afecff6f47cb348f8899248cc12282614b052d50c3d20494f9f65c418c7ee4","tests/expectations/both/function_noreturn.c":"ea55a1ffca36bb2936814fe9db0f22176743a82385436ee720398323ef7a3382","tests/expectations/both/function_noreturn.compat.c":"f55784b82192998e9701cae9fef09dffa6ce6245c4d145c73968998a0cbbaa5e","tests/expectations/both/function_sort_name.c":"8c6f66d028092f8ad11acf8d9bfd934e17ef2ae25c26d3012c9655a54f379b45","tests/expectations/both/function_sort_name.compat.c":"7d8e577d35f4590a8d733ea072e68410784e9870295607ae8872c71239994a2c","tests/expectations/both/function_sort_none.c":"cb76985dc63027d0d85bb6cfb32e5a77f9c3a46a97059068643186f27a88d9ce","tests/expectations/both/function_sort_none.compat.c":"3aa6b8e43a5cbcceb35ced688fdf0dac71bd63f0dff1cb7d0ecea72749fcb017","tests/expectations/both/generic-pointer.c":"45574634a2c2b5408ac81b47d0f5abd913d73b50cb2cb506f034951dfdae9126","tests/expectations/both/generic-pointer.compat.c":"c453a42469ee2c2c2f18d69b36d171948a3b7d5289e4a26eb38d89f85032cb92","tests/expectations/both/global_attr.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/global_attr.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/global_variable.c":"e438559eb15269367b740790ee27a8bcf63a65f58153cfa9da90a173480b7842","tests/expectations/both/global_variable.compat.c":"7da3dbaa9810ec68996038c3170e308c86d038f2c6a7424f08153a002b84e737","tests/expectations/both/ignore.c":"8629579fd8d0e5df30b4a6e8258fe62efaeb58365f906e253684b1bd9530654c","tests/expectations/both/ignore.compat.c":"513d4638f5b6331b88782b7b9803d2eb30e058661ecce6e0f0aeab79b5edfd7a","tests/expectations/both/include.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/both/include.compat.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/both/include_guard.c":"5d9bc0cf8c54aec379f38ce9ee64a8ced7c710e86b947e6516745586d8d51e65","tests/expectations/both/include_guard.compat.c":"7ed0680e9547628b3c3edd867fa31bab7bdae7bb38ba68e8c643b676de876b1b","tests/expectations/both/include_item.c":"ebe3375d0ace217f9da88bdd026200a79ccb46d0e4fe06c2fd9ddf89e4327bce","tests/expectations/both/include_item.compat.c":"ebe3375d0ace217f9da88bdd026200a79ccb46d0e4fe06c2fd9ddf89e4327bce","tests/expectations/both/include_specific.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/both/include_specific.compat.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/both/inner_mod.c":"b4d19dad14d5ac70ab70b40a035acf0beb392a35d849121296087bbd9df221bc","tests/expectations/both/inner_mod.compat.c":"b876e186ddbbf7c381f7d14b2c61fc45d0e0d138308d82a8497ef43675674b56","tests/expectations/both/item_types.c":"ab7fb01375066294949a2dc99a55cd1cde72bfd8510aea21fe89db256200ed42","tests/expectations/both/item_types.compat.c":"0c68a303f170b7f412fd8ed4196d0c688a995c9f3a0b35b0bf857acecf9cfa36","tests/expectations/both/item_types_renamed.c":"fbb007a71b1e2567d4068dbceb46b4e284e64fc0f425b67b84bf9f319f947435","tests/expectations/both/item_types_renamed.compat.c":"a15917d285d40d7edad8b53ff9df83a5f417212c9d6bb8e120c68401afaa127b","tests/expectations/both/layout.c":"0a3f11507f4c77e6568d37f85b72cb7e22e3ae25c19edcdf3faefa4029a3a79b","tests/expectations/both/layout.compat.c":"0a3f11507f4c77e6568d37f85b72cb7e22e3ae25c19edcdf3faefa4029a3a79b","tests/expectations/both/layout_aligned_opaque.c":"f3ee88baa5bafe2038a33db94e5088d91f16a99a127a0a20fe5820d0fa2b309e","tests/expectations/both/layout_aligned_opaque.compat.c":"f3ee88baa5bafe2038a33db94e5088d91f16a99a127a0a20fe5820d0fa2b309e","tests/expectations/both/layout_packed_opaque.c":"ceb4ae333479c72559158a62d2dca064c6982d765ce99d979ccbddb48231e464","tests/expectations/both/layout_packed_opaque.compat.c":"ceb4ae333479c72559158a62d2dca064c6982d765ce99d979ccbddb48231e464","tests/expectations/both/lifetime_arg.c":"ae81c69fb1a47b5172f28ea5e8b3380006135106c90496543ef8e632626da92f","tests/expectations/both/lifetime_arg.compat.c":"d5b56a1bcabc76f0e80f1873932d0f802fbe4c26090a5286b998fa71e6987a1a","tests/expectations/both/linestyle_cr.c":"999285e7550112cdd7ee6abc90138db18f99dccda1c3f3ee8fdcd28bd080e8f6","tests/expectations/both/linestyle_cr.compat.c":"f78aa47c5a880694bf9ce757683b519b4a27a0c63ee88f196c02332876fd099a","tests/expectations/both/linestyle_crlf.c":"6c930b654aeef814d6c2332095de9c0f8bdccd55f58dbc1863555e66f92323f5","tests/expectations/both/linestyle_crlf.compat.c":"9093dd9ba0458ec049a5244e6adf23012853cfaa6cbe3b55a9f966dc020765d3","tests/expectations/both/linestyle_lf.c":"36f51fd2eaa24d2824b2dcd8a40846b91341289c634a293a579ee512e7cb0247","tests/expectations/both/linestyle_lf.compat.c":"421f299d7b604b9c85490cafe0513d602df3a7b759b7166f7c0ff8eaf90a0361","tests/expectations/both/literal_target.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/literal_target.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/mangle.c":"488dcb9ff25fb4be3e9f44999227014141424df69f658bd93994a1342594f660","tests/expectations/both/mangle.compat.c":"085817af5a71d71cd79e63aaf28c5b602349b414c84e591f210890d67d449d08","tests/expectations/both/manuallydrop.c":"ee47ffc8c80ebf6fc61b901758fdaefcca355feac89dbf36551908791eed2b26","tests/expectations/both/manuallydrop.compat.c":"5a463ad2aab095df95affe6fadb954d279bd0f771bb9cd6534142244105318d7","tests/expectations/both/maybeuninit.c":"3f10b0421fef929807bec8bb21ff93f6f83b2bcd928e0124629beb0844b1a030","tests/expectations/both/maybeuninit.compat.c":"a15bb73edf188d67c19ad8b9d69b285e35620678edc4062250fd1cc461f610fe","tests/expectations/both/mod_2015.c":"aa74fda16fa89965402a63a885bcf3b63eff807b5a977e0c4df975e3f8715a8a","tests/expectations/both/mod_2015.compat.c":"cb8e3ad2cbd9c069397ad9c368330f93e20ea9629dfb2da4cabab561b23bfd70","tests/expectations/both/mod_2018.c":"aa74fda16fa89965402a63a885bcf3b63eff807b5a977e0c4df975e3f8715a8a","tests/expectations/both/mod_2018.compat.c":"cb8e3ad2cbd9c069397ad9c368330f93e20ea9629dfb2da4cabab561b23bfd70","tests/expectations/both/mod_attr.c":"0c815b1da1af0afd59f9371ab3e285a525fd4e69dd8ed8a97e85886a482e665a","tests/expectations/both/mod_attr.compat.c":"b35ce9b15ab3ac6163be9373e13c9accea6682a17bae9c3d6cb4d382fe67b8b0","tests/expectations/both/mod_path.c":"aa74fda16fa89965402a63a885bcf3b63eff807b5a977e0c4df975e3f8715a8a","tests/expectations/both/mod_path.compat.c":"cb8e3ad2cbd9c069397ad9c368330f93e20ea9629dfb2da4cabab561b23bfd70","tests/expectations/both/monomorph-1.c":"fb4f61d88bb2092b64770fa3f51eb56398d4ff0af69c0e9766ac63bea6e7655f","tests/expectations/both/monomorph-1.compat.c":"8cf6a13ad235c98885a6709acb0ac95c99631fa2a8ecc4026d43f4164b734762","tests/expectations/both/monomorph-2.c":"8e606939b060a98bdecad4fad7e9432cf0e136be2c50256fa15bc4075b9898b3","tests/expectations/both/monomorph-2.compat.c":"05a9a4847d68e8f95e9953714bc2450ef80d4986e41f9ca8c941fc87ee2ec015","tests/expectations/both/monomorph-3.c":"b0e41e9d22438c8df86f482416829f25a3e65a72b6ea88005f1b84f8df1c2211","tests/expectations/both/monomorph-3.compat.c":"803413f66db52d5bb930bfb927b8192a73a5438581c181e770b30822260bd2eb","tests/expectations/both/must-use.c":"df67991ad0eb4f438e3d95e46e300425d64f0f244aa731e6d144cfeeebca31c3","tests/expectations/both/must-use.compat.c":"c122be5f653d1f53be7b8969eb87fcf607b09abb775bedaa105789845add7732","tests/expectations/both/namespace_constant.c":"7b256933fdb570bc1824e769b16348b46a695e5c3ac2db6d5b7b1889f6e0911f","tests/expectations/both/namespace_constant.compat.c":"0d3f36e6c96bc961685984c75f6d8e8c91c925bae1aff6a4a9ab3cd22a6eac3c","tests/expectations/both/namespaces_constant.c":"7b256933fdb570bc1824e769b16348b46a695e5c3ac2db6d5b7b1889f6e0911f","tests/expectations/both/namespaces_constant.compat.c":"0225153305390c7fd3522250655d92bdb615f3fc4b69c0ab52532fe8bc0a09d4","tests/expectations/both/nested_import.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/nested_import.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/no_includes.c":"7a291fbd7336e914b26137ad41ec8bd4b32339d54165147533cdb64b60fb92ef","tests/expectations/both/no_includes.compat.c":"9aa00142d44fcb11d131f63d3962c7c9a81aec881f0da8fef1f90cbd8378ea5b","tests/expectations/both/nonnull.c":"0ae68298985662a4f15b39e5798b39577bc15864789be7a19eb70f37963c35e0","tests/expectations/both/nonnull.compat.c":"2c9c87580b574f1eec815a24bd8c783aa39875df96678247e098b9ce959ec00c","tests/expectations/both/nonnull_attribute.c":"b72aeac890accf8d6dc8f22be5e6eb2676b58d2547b4767a4bcddc946b274285","tests/expectations/both/nonnull_attribute.compat.c":"8c7fade78855969159c0dcd6be31971d24f7e668a5af8f66765941f331fbedb9","tests/expectations/both/opaque.c":"7db50853678143d52cb6844f27e026c0a5e6ddef83b53970042d1a94137fee61","tests/expectations/both/opaque.compat.c":"68f1f086bb9fe26be13d0bfd7d79daad5edf47f8dbe80e13e3bf2f197300c8e7","tests/expectations/both/pragma_once.c":"95e7271709e92cc423fffba8cd534b6cd9c5d4754d5cc6dcbfe9a539f44e2c75","tests/expectations/both/pragma_once.compat.c":"906e661e80125cb01c762351e5bcb7981428aaf3304b6ab20c6d6932468656d3","tests/expectations/both/prefix.c":"97a910380b6fcf41321c0e7ccee2e3c16ef2ac36e296fbae382fcbeb20ed2573","tests/expectations/both/prefix.compat.c":"f85b1207483f95ba83d166d3e9fbf633738b41844d32f6a908a67cc8cef8028f","tests/expectations/both/prefixed_struct_literal.c":"7d7ae0ce7321aace164c0196e4fe335ca126f7c39da3bab4983cbcd3b4171a8c","tests/expectations/both/prefixed_struct_literal.compat.c":"5474d16fffb034065108c84311884297f79edeff6edafc5a731572c516ee2bce","tests/expectations/both/prefixed_struct_literal_deep.c":"9f8f7a0ce170628ad2efe88fe16f3586d9e77b02fca2df02d6e91b5167558b18","tests/expectations/both/prefixed_struct_literal_deep.compat.c":"d85d4c8622e9af0dc6e0b209a4250e038ee22425c2598eeb7942b0f13adeab23","tests/expectations/both/ptrs_as_arrays.c":"f23c55ffda78e07d22ad04db76dd3b49c2658eb919e709caa904820a510c8b17","tests/expectations/both/ptrs_as_arrays.compat.c":"dd7d3fc890b675c397f28ef905a5114047d0cbec79a1acadab5e61f9522fdb02","tests/expectations/both/raw_lines.c":"026afd7d10e04be3dbb480078a3e9c9c827ae3f97e688f17d7428fffec2b0264","tests/expectations/both/raw_lines.compat.c":"3f8f40efb683163f6d9451de6eeb454cfc05f17e7af74edca359dd08ef57b3c0","tests/expectations/both/rename-crate.c":"3e4b65459bd7c9bf05ab6dfb243482311e348148c698f1a9b69ffc23b6e945ca","tests/expectations/both/rename-crate.compat.c":"d8b53310e97bc19ba8567059b6598f70e1999e12b6ae38cf91017d38044b6fc2","tests/expectations/both/rename.c":"d0ee6e5d8a7951668993ab38c5d25484a6bcc43ec9db92484ca0323c754bfa3f","tests/expectations/both/rename.compat.c":"09b7e1f112ff0d21bfe20b465023775366d5ef069d5617bbf64432083898eded","tests/expectations/both/renaming-overrides-prefixing.c":"6ddeb13a603c18bab9c3128f289b975530fe2558d28bfa5e0cb060ed862ae781","tests/expectations/both/renaming-overrides-prefixing.compat.c":"be317bd5164cab7cb19d571b0957e0e0e51df120389b708f430ea56ea3b9dbe4","tests/expectations/both/reserved.c":"ee5c5eff3775c28685ecee88943ca6eb09ef067ce3a80822cde608a71df2e7e4","tests/expectations/both/reserved.compat.c":"a7a8f1618b235a5e17c3de48cef3baf46c23b7a00f3fba3f02b34a15ce54f83e","tests/expectations/both/sentinel.c":"b6a3a828ce8aee03aace5493916261fcbdfb2b65b03d26515b398e14ee60c6e4","tests/expectations/both/sentinel.compat.c":"76a72521896f45ef47b61a6234329aa5a38d5ccc4d93b2258a54a213e0b847a6","tests/expectations/both/simplify-option-ptr.c":"034d7f2d506df53f188b9775a5db0b1b09bbacc658f3a3aeabd6e3e042239645","tests/expectations/both/simplify-option-ptr.compat.c":"07c6b5c25705a1c87afd6de3f9e11b686d59853dc739922edb80370b9200655e","tests/expectations/both/static.c":"f3b5533ee9e56f9b977e02c167146f09cec773b8118f23a56d024207752398ec","tests/expectations/both/static.compat.c":"5b555b2fced4156ec6748466184bc806346e8782c9d29f85b443d0d75449496b","tests/expectations/both/std_lib.c":"8b8f89b986ef595c3cf7ae7604825ab30365406c1fb435fb0a7bfe1ab05f4297","tests/expectations/both/std_lib.compat.c":"93ce746242cdfe562bf0374584e0a913de41a718cca98ae54adcda44cf5d7a5d","tests/expectations/both/struct.c":"eea39e688699ed0a9aed73e642791c482b25d1c3a403f561c3206fc3d2b85fd9","tests/expectations/both/struct.compat.c":"96e82366037a0dfd876faac32cd61c8129d22adf28d0ffdb57f2b342acc5d6fb","tests/expectations/both/struct_literal.c":"7534402899c342a7fdaab6e90b70b608919c5634b0c1b5e56e3890999a7c1f73","tests/expectations/both/struct_literal.compat.c":"02b62c16290b4b84adaf9718f6e183827013fe598db0b42da86e0ab65b5797d6","tests/expectations/both/struct_literal_order.c":"6192b5c50a55a90c75ba1e31d81038a776ef89b212165851f4f640b684f580a1","tests/expectations/both/struct_literal_order.compat.c":"072beb617c51301e39093868837b504c2ac0d41e2af990a3ddfc319bdebb7a4e","tests/expectations/both/struct_self.c":"99c21893b65624ecad37641012ec8af1308005bcc15c39696dde9628288b8302","tests/expectations/both/struct_self.compat.c":"8be4e71a05d25daefbb79ad1a0c3f8ba4103ed7be8f15c039941700e3734c808","tests/expectations/both/style-crash.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/style-crash.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/both/swift_name.c":"a7aed23b9727f2d133c59600f92fe656baac5b20c0dfa086ce954cfdf8a9c949","tests/expectations/both/swift_name.compat.c":"3662d9c882e1c3d501f68e4626a625f3af5343734dd56833364c409c88b40100","tests/expectations/both/transform-op.c":"3e4d0d5ed382c4dc14135100ce30024d723e40545efd69f4d3790e4bed68346e","tests/expectations/both/transform-op.compat.c":"707cde9201b83a2b6283203c9c0b9d5615bd2930047fd794c471a3b46112d986","tests/expectations/both/transparent.c":"031e1800e40b6bd59b649a05b303df6fdb57255e7e7190c39c511a7b27a7bfdf","tests/expectations/both/transparent.compat.c":"685184af63abd732b4ca35d59d5de8a56150241f372c07204237c8b364379fdf","tests/expectations/both/typedef.c":"1ee9f0a27aa33902f7615b4e239c6a5193187e14e480e7d3c63d5fbb66b34506","tests/expectations/both/typedef.compat.c":"185b4e7035408edc8c8eaca66a6ee767b965523a8db2156bb3d2fba5a9042333","tests/expectations/both/union.c":"44eb683500f0b42b118ca45b3b95a9b45ac8f8b0fb5027c171220c7e11e90b46","tests/expectations/both/union.compat.c":"33bacb31f0fb1e7d23043352d76f27ab4541e8c63dff2fefb50327a32f5a37cf","tests/expectations/both/union_self.c":"1498da687f5b21f756aa8487b162fe975e186b396bb55610a44d984bd55a8a3a","tests/expectations/both/union_self.compat.c":"2b9dc0e33f7d2f1446f5c643804edc6976e1a7bae64ea836b432509224daa788","tests/expectations/both/using_namespaces.c":"fb2d6c8baed0b32ac1c5e69864e57f73f0a5c2ab8a6b37a5e763352ae43fddeb","tests/expectations/both/using_namespaces.compat.c":"417a45ea1ff78f2eac7f84c617d72377117cf31388df070ae6dcb70a412f33e5","tests/expectations/both/va_list.c":"7291161e6f66f168ce9fb4847f23fb2f64b31673989c08f8a2d3e17f6a2932ae","tests/expectations/both/va_list.compat.c":"113022c8ecac199d198670b2015c1524fb4d39b956cfb590e3661c4c54893442","tests/expectations/both/workspace.c":"3e26854121ba4446884cb758798688bed6c9fafe095900949f65f391248bf64f","tests/expectations/both/workspace.compat.c":"e448a31284be5009b1411266330fc1faefeaec69dea18307e0d6ffe257fdbddc","tests/expectations/box.c":"cfb19e9cee01831cb11937ef6458b38170d8d7d24180da9ff9135e6c793186af","tests/expectations/box.compat.c":"7d7284c8171273cd65fce71e0c00c3ab2a81c1d0b4464edd13ff6e37281bed97","tests/expectations/box.cpp":"ccc28be620536226219663d4b3714aeb6696fdd00a97de25395e5233cfd814be","tests/expectations/cdecl.c":"e49da32919797ea6d6ce3f4fd7a967ad33ef1dfa3f323f15181cca5f9a1fc98e","tests/expectations/cdecl.compat.c":"80ca597ab6be6a89310ed2120e62192b6c957cce02770218e11eebfdaa730282","tests/expectations/cdecl.cpp":"3242efce31ba876da3554e8ecaf3f7e89fae84537452d778d65dc1b1e4f31620","tests/expectations/cell.c":"4018a58ca84d08753a690c93da2f520de98764b738ee30cc6fd06c890fafab2a","tests/expectations/cell.compat.c":"f2e80372856f6589327e56d3173ded3c8fc69ce714ae773865d96c04310c7632","tests/expectations/cell.cpp":"fcfe5b2f9d546cfaa5654135b1b8c0202ea23070d758a0ab7c74c4cf84df59d2","tests/expectations/cfg-2.c":"6caa4c90a756240c60b954a02daa72779475921b2e9d36d2273fe17c623ece5a","tests/expectations/cfg-2.compat.c":"fa65a15ce85bc2d3bb6420f46887e58f333526c225e1b8fb2368e1f63385c35e","tests/expectations/cfg-2.cpp":"0679f6cd56393b46fe8f6021385b195c0d18ce72f618db5e07e99ebef05e4085","tests/expectations/cfg-field.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/cfg-field.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/cfg-field.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/cfg.c":"0fa7c40c04564020c9c910dc7c888091e102e3da2bc757fe95e66d4dbc89fe99","tests/expectations/cfg.compat.c":"d6c0a097a31766ba18dbe2f5c1588272d7ea4f6d7fdeeea083f7b315fce8fa37","tests/expectations/cfg.cpp":"5d476ec9de32ceae260b6ab9be0fc4e06da37dbf9e30bb84ac5986f3993ff55d","tests/expectations/char.c":"2365acd2244ddc250304b59a830ea27ca485f834628de95d419de0a91efc2965","tests/expectations/char.compat.c":"13a7c3b21783a5b815af46548021c9c93a74e476b8060aa4e8357bcb7f221936","tests/expectations/char.cpp":"7612cd7d981224c74d0829253a2da2dab788a02773be4c0b2634505c0f59b0db","tests/expectations/const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/const_conflict.cpp":"29e82a9f7b478bb95a947ce6059fd0b9d76b4288d43b726c33520f70d67ace49","tests/expectations/const_transparent.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/const_transparent.compat.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/const_transparent.cpp":"1d2bcd75d4ea5db4e2216b3fe7329358384461ff34a42cfc709f1e7debe70bf0","tests/expectations/constant.c":"129d9124d4c99e28f3bbbea1d527023582b118fffc74000f75eaa5f5c442a204","tests/expectations/constant.compat.c":"4b5a76782d75be1fbe5a06f776bfe3394d7959f368bebdfda7e1458ea72f1303","tests/expectations/constant.cpp":"99452b14270442969769c3f021cfb54e094a2df90f8d7b933d216e1875d87744","tests/expectations/constant_big.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/constant_big.compat.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/constant_big.cpp":"172ca1068d1e6bd4b34d8885fd7ac77b147b672f7de3597dd4f8c4518cfbb2e3","tests/expectations/constant_constexpr.c":"7f540ae608e3240cccc763f53e5ffcf279a3ab5f737f055e6ba1be6708ffa905","tests/expectations/constant_constexpr.compat.c":"7f540ae608e3240cccc763f53e5ffcf279a3ab5f737f055e6ba1be6708ffa905","tests/expectations/constant_constexpr.cpp":"a0e89b1235963aab1b48a8b8a4bdc5a117e44a5ff286fec38c2515b4d176f6da","tests/expectations/constant_sort_name.c":"733b9a46e8b9e33cb8696d13e74ba7b8023735c8fd8dfe73b3cf39d027dffb38","tests/expectations/constant_sort_name.compat.c":"82bd07c1f56913bca006c3859f222feada9ce53a53444702c5c61fd96943ec49","tests/expectations/constant_sort_name.cpp":"b2a9bf52718d1abe7696e2ab121ea6916803c66a6b3a7d664ab8e584201dd4d4","tests/expectations/constant_sort_none.c":"7839492e03ffac12c0b2f5a15bd4b32aaeb20d0c50440fc392fa2cff9b585f83","tests/expectations/constant_sort_none.compat.c":"3b59ec576d09ae51f0db0f8c34bb9787972cd8441ae718117568f9220c4f0cc9","tests/expectations/constant_sort_none.cpp":"2a2e22c4e3d9109e22a9cd579fa761eaa0106bec84166aa6f18e57fbb6f354d9","tests/expectations/constant_user_defined_type.c":"a723546e5f6a7bfe3caf8f8f687f8b7c457cc57defffb9082db07a91eecbe3be","tests/expectations/constant_user_defined_type.compat.c":"a723546e5f6a7bfe3caf8f8f687f8b7c457cc57defffb9082db07a91eecbe3be","tests/expectations/constant_user_defined_type.cpp":"1db08ea6da83f22d406134391f5bdfebdd40b29325559ec29da010682f763fbe","tests/expectations/custom_header.c":"9c1a75c8720c009da725e2f980c600ad695fc43481dbb038eb79e672d91ac05e","tests/expectations/custom_header.compat.c":"30b8f6fe02ad2f00956a4d1ac2ce3a32ddea5eb6789c1aade68dfa1640262ae6","tests/expectations/custom_header.cpp":"8861c03aa94c846abb7ce47bcbea2f8bf4a322c81af93cceaaf15c08bc568d0b","tests/expectations/dep_v2.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/dep_v2.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/dep_v2.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/derive-eq.c":"7b914984a98209889a6f9f4314f1347c4128deb26cef8f7b5b678206d5752bcf","tests/expectations/derive-eq.compat.c":"be14695942908f4d976b1ff606c567347f4ddf3fca40f62c4e1926231eb0ce10","tests/expectations/derive-eq.cpp":"21d619eeb9fa71fdcd35cdc4a29348b340860d7c7474b5b0231845b071b8cb59","tests/expectations/derive_ostream.c":"8cda8323907224084809d902e27a26fc90dea0988812440f11df7e026a826bec","tests/expectations/derive_ostream.compat.c":"fefa8ceb285b61c8f14fe2d9dab8fe411878a579f4a0289e4159c939ed61fd7d","tests/expectations/derive_ostream.cpp":"bd9ad020c82e15b445bb40b58e458f05262c706dcc19e20f40d224d53c79faf8","tests/expectations/destructor-and-copy-ctor.c":"d27c26866d476634873f0fcc392f483573c3e3d748cdcdc0a9d5e02d9838a717","tests/expectations/destructor-and-copy-ctor.compat.c":"7cce2bb533152d50b58b76376b664f2cb0dc2018b9cee209369825303fafac20","tests/expectations/destructor-and-copy-ctor.cpp":"5e2842b4831b25c278dbef666a3a051411c79ea137245e67a25c2ed8850ea1b8","tests/expectations/display_list.c":"f3df45922f23a2ec455b36341dad5c59e3d6453aeb9a7354c0ea55b04b79ba93","tests/expectations/display_list.compat.c":"18ebf21569cb7862816cd218f8b9926e5a725d9b032d46523eb4480bae9ceb0d","tests/expectations/display_list.cpp":"b94d2065a6ea07ae0c121cebb4f510d6d72cb2dfe7b8a2001d094bbb6301fa23","tests/expectations/docstyle_auto.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/docstyle_auto.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/docstyle_auto.cpp":"85f23dbbb3e5cf03ca1c9bedfd559b4253dd6795d8c3597773ce2dff3ac30714","tests/expectations/docstyle_c99.c":"dcb114c8aa34bd0a15cca9e7076b24700c3660741ecdcc41e7ddcc44bfff9434","tests/expectations/docstyle_c99.compat.c":"fe9814379b9c8795bf8ecfb1308397e5e0dbe9bd81cc9ac820b90ac89191c39f","tests/expectations/docstyle_c99.cpp":"2391bfb6d1de7679f5a6dcc5c2a1fa8b57d6a2af98058ddc6558153f64904a57","tests/expectations/docstyle_doxy.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/docstyle_doxy.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/docstyle_doxy.cpp":"0277cd56e2bfb397cbbc9ab58ab9e91ae27cf7388ce6c081140420a05ca7fd24","tests/expectations/documentation.c":"268e799c5b13dabb6796b9e233d623adf89d3d69a26c9d25d661a182a2de2a73","tests/expectations/documentation.compat.c":"b9987f70233cc3952f82b2553b2e016e85b54037b767009c1b96c9cbf9d80830","tests/expectations/documentation.cpp":"d34d4e1fbad6275e999d733083f922070bd2537e87e9024e5624da03c52eb7d6","tests/expectations/documentation_attr.c":"7c353cf10b129591b74fc1a3492b2ae45e80877e5c00ed225e83f892a495bd73","tests/expectations/documentation_attr.compat.c":"17f61b4a39cb3f8668713ea7d50e74e57e5021e326cedd95e3f67a29d1c4d2a4","tests/expectations/documentation_attr.cpp":"044c5e034beafc6275c6a3779fedcc6570795c4033819ba065a584b339ef5e46","tests/expectations/enum.c":"c19f7de7f59659a662b03e3dac4ad0cf64f394d77bab93b0554206aa93ef6e59","tests/expectations/enum.compat.c":"6e972161b6156c683baa43a233913f87f5c66ca53bcabd9ea79263180adc0674","tests/expectations/enum.cpp":"3a09d171b4e5e195681478bf12c52eefddd75053bafa67ce811653253d84185f","tests/expectations/enum_self.c":"8cb7cd9f545198280fd7ebef5d67d4d6348469c566d7636d5d216e793208127e","tests/expectations/enum_self.compat.c":"44167a7581be478d55895c4e8b85761eadfe5736658844e0f5c4cf9db525c1cb","tests/expectations/enum_self.cpp":"9fd2c124a9498f995a00b9f237e9e99ae9b0c14777698d25e30fb105a4bb25db","tests/expectations/euclid.c":"360eb8124beef4803470e58fe0d0546b64b5ee91ba7f3237de30e8b3c389122e","tests/expectations/euclid.compat.c":"4cc5da9fe161f55353c581702ca815e49c249f18d23c5f6b2b06e8ffd8a50afd","tests/expectations/euclid.cpp":"e2d7b4e83aae20151e2c1dbb96121abf4fc2fa6122485dd148dd99b7aeb97ba2","tests/expectations/exclude_generic_monomorph.c":"4514956a3d5c188481113ae41dbc0e9a3bbdc4d9a0be0e72965d65ece143fdd4","tests/expectations/exclude_generic_monomorph.compat.c":"233d53b28dfc9084fcded00134860891ab16abdae16677df006ad643a8e9cc2e","tests/expectations/exclude_generic_monomorph.cpp":"4514956a3d5c188481113ae41dbc0e9a3bbdc4d9a0be0e72965d65ece143fdd4","tests/expectations/expand.c":"fc69383c93f639f92996e4b91f296084510abe22f10b831ca628d7d11182620d","tests/expectations/expand.compat.c":"786956948cba335e44d4ec08f6cbce6aa85cec2605554ac88903ae1fc06ec2bc","tests/expectations/expand.cpp":"38f85893eaca630049af26274b6cdfd4ba9f9ad162bdce9e8f82be6f2572005a","tests/expectations/expand_default_features.c":"6bb6ecbe2d0e4c904d260fba76a4893a0284e5a794305e704886d36c7e63f595","tests/expectations/expand_default_features.compat.c":"5c4ca68e2bb67ba37949f3e87f5da85cef61a869891a239e39fcb7dc35120ba2","tests/expectations/expand_default_features.cpp":"7abea90e45ecf0ef2ab3d254e59eaea7044fcf95188e4dbdf2780c410b22919a","tests/expectations/expand_dep.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/expand_dep.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/expand_dep.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/expand_dep_v2.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/expand_dep_v2.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/expand_dep_v2.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/expand_features.c":"928314408a433b8e03ce4ec9d99a29be51de11a2a646bf00d5efaf4e8f42ef5b","tests/expectations/expand_features.compat.c":"4086173d7c9973d4ef51e4a729e69fbc96d196e9c4b483c1015581ea16961833","tests/expectations/expand_features.cpp":"71761f1030231dd7d6628f4c4055f85720186680c0ed32055df93096575703bd","tests/expectations/expand_no_default_features.c":"fc69383c93f639f92996e4b91f296084510abe22f10b831ca628d7d11182620d","tests/expectations/expand_no_default_features.compat.c":"786956948cba335e44d4ec08f6cbce6aa85cec2605554ac88903ae1fc06ec2bc","tests/expectations/expand_no_default_features.cpp":"38f85893eaca630049af26274b6cdfd4ba9f9ad162bdce9e8f82be6f2572005a","tests/expectations/export_name.c":"4c0452bf3c2901a1006efd759360882df316c2938d141906c89ad60b15b477ad","tests/expectations/export_name.compat.c":"5a2182e239b75ef0e4970431523f4ca5e3c17d43178ab1126b0833385666e37f","tests/expectations/export_name.cpp":"212eb614a342bdd626c83b790ffdfe30d985cdec4e2ff14fd38ccec4f55137c8","tests/expectations/extern-2.c":"a81c41efe618612fc4b9a22d937397ce7a76ae966a28b33e56a10725cf2700ea","tests/expectations/extern-2.compat.c":"124174ff9745e397b646830ed9660faeb05910bcb340b73c925a4f8f3f656a14","tests/expectations/extern-2.cpp":"739b9b9e58af72a281402c050d6358ddf001076a64ca861a2c3a95a66cb80d96","tests/expectations/extern.c":"e541f754570d2a1ce3ecf242de3b41f0437db6cbf4fb7e8505fca0ebc2088950","tests/expectations/extern.compat.c":"0d2e98ee37e668f056cf62884084ddf3b505f4a193626f098c5de20ac501d504","tests/expectations/extern.cpp":"2c9e359108649bd0f34ca83382ff77fd9c278dff4e9f9dc763012c0e1769f05c","tests/expectations/external_workspace_child.c":"9d9aeb31e5388158b6abf8686d4109771159d98ef83e93658d3c2e556dd69174","tests/expectations/external_workspace_child.compat.c":"3681fcbc89d3f7b91a1cb4b67bf6b64b0d08cd7722c9a6f908b0e16da9015077","tests/expectations/external_workspace_child.cpp":"32ab68edd8b25b7de5553236f624e23a25206aa3524bd52dcbbb423a8bc38611","tests/expectations/fns.c":"7c5803639ebaa0935c3fbe7aa1ed66cbf3566ee44005d14f58161ad66e9f1b28","tests/expectations/fns.compat.c":"ca3f73199d1cf506d63b746fa45edfdb8d650d2a268c64740efcbed14352ec70","tests/expectations/fns.cpp":"2f4f1079779feeb468d995aecc51b8a3cab2af8525c24f28f3b852685f7dcfe9","tests/expectations/function_args.c":"90545731d4f875305f4255721917fe99fe2b72a9800c0e0a1f5ce216c3bdfd93","tests/expectations/function_args.compat.c":"f8afecff6f47cb348f8899248cc12282614b052d50c3d20494f9f65c418c7ee4","tests/expectations/function_args.cpp":"929d057fe83dcf946ebc2abc915484e31c8bcfd48e5d572b1de90ec044129532","tests/expectations/function_noreturn.c":"ea55a1ffca36bb2936814fe9db0f22176743a82385436ee720398323ef7a3382","tests/expectations/function_noreturn.compat.c":"f55784b82192998e9701cae9fef09dffa6ce6245c4d145c73968998a0cbbaa5e","tests/expectations/function_noreturn.cpp":"7b279034320be636087273004e14e2dddca2918c96f8b718d835c353697a7d2b","tests/expectations/function_sort_name.c":"8c6f66d028092f8ad11acf8d9bfd934e17ef2ae25c26d3012c9655a54f379b45","tests/expectations/function_sort_name.compat.c":"7d8e577d35f4590a8d733ea072e68410784e9870295607ae8872c71239994a2c","tests/expectations/function_sort_name.cpp":"2924b7b6d6b49a93dd1f1a850643b7458da50fe7ea20ea057e3a9f4a27d051d1","tests/expectations/function_sort_none.c":"cb76985dc63027d0d85bb6cfb32e5a77f9c3a46a97059068643186f27a88d9ce","tests/expectations/function_sort_none.compat.c":"3aa6b8e43a5cbcceb35ced688fdf0dac71bd63f0dff1cb7d0ecea72749fcb017","tests/expectations/function_sort_none.cpp":"6b07b4a14d97230660b18a6a63258e3571124c935b4a8391ab377d48c8e9d2f8","tests/expectations/generic-pointer.c":"9ec3e744a8f953038b2bc748b34b0e9f682dd473ad46f06ea28bb6d282db9281","tests/expectations/generic-pointer.compat.c":"0c7db5c531555f960346011f526ca77268093718e707dd1d628f833a7678714f","tests/expectations/generic-pointer.cpp":"d4772de13c5e44f85aef9d9014d4e6b180d9749553895fdc559a96316dfcd0c8","tests/expectations/global_attr.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/global_attr.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/global_attr.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/global_variable.c":"e438559eb15269367b740790ee27a8bcf63a65f58153cfa9da90a173480b7842","tests/expectations/global_variable.compat.c":"7da3dbaa9810ec68996038c3170e308c86d038f2c6a7424f08153a002b84e737","tests/expectations/global_variable.cpp":"3b3506a61523642fab2ec283f14aeaa315117284f1566581f368f9d6d94c819e","tests/expectations/ignore.c":"8629579fd8d0e5df30b4a6e8258fe62efaeb58365f906e253684b1bd9530654c","tests/expectations/ignore.compat.c":"513d4638f5b6331b88782b7b9803d2eb30e058661ecce6e0f0aeab79b5edfd7a","tests/expectations/ignore.cpp":"8def6cc5a4e93ea3dbdb196769bfaaea3f2502cfdee4e256ef5ae86d25896145","tests/expectations/include.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/include.compat.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/include.cpp":"52590989caf74c26b42591460528979ce10569e35457f93bcc9ca07af686e6bc","tests/expectations/include_guard.c":"5d9bc0cf8c54aec379f38ce9ee64a8ced7c710e86b947e6516745586d8d51e65","tests/expectations/include_guard.compat.c":"7ed0680e9547628b3c3edd867fa31bab7bdae7bb38ba68e8c643b676de876b1b","tests/expectations/include_guard.cpp":"09174bac4cc923d3a3b91ef4e1205dbc244af756b8dd40382e0c7b7044ee0ed1","tests/expectations/include_item.c":"35a80c1690f6b418e3e6163174fce69bc667f578eb6a077107ac7bc87298a987","tests/expectations/include_item.compat.c":"35a80c1690f6b418e3e6163174fce69bc667f578eb6a077107ac7bc87298a987","tests/expectations/include_item.cpp":"b9a3d9d3c40c993223e93e9e0ce8f9c5d173832b1c8d4e09054d6ba559fe80fa","tests/expectations/include_specific.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/include_specific.compat.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/include_specific.cpp":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/inner_mod.c":"acdad2892c84bba42f5e45ae3295ea095dba9786d566672acfddd8e388ffde70","tests/expectations/inner_mod.compat.c":"fb9a16a48c294e56d60cdb50e9522d8119152e5ca34862857ee7643694e3ed84","tests/expectations/inner_mod.cpp":"e27ee433a0764f92010e476b4f311b3c8e7723e22bc4f3cf2f473ad6fe516ae3","tests/expectations/item_types.c":"ab7fb01375066294949a2dc99a55cd1cde72bfd8510aea21fe89db256200ed42","tests/expectations/item_types.compat.c":"0c68a303f170b7f412fd8ed4196d0c688a995c9f3a0b35b0bf857acecf9cfa36","tests/expectations/item_types.cpp":"19f55fe8f8416342e916344276ebf10a975e57b9a787c1b42bb9b0a374a587c6","tests/expectations/item_types_renamed.c":"fbb007a71b1e2567d4068dbceb46b4e284e64fc0f425b67b84bf9f319f947435","tests/expectations/item_types_renamed.compat.c":"a15917d285d40d7edad8b53ff9df83a5f417212c9d6bb8e120c68401afaa127b","tests/expectations/item_types_renamed.cpp":"b60fce152b506ad6e3f964638390212e06b7e3a9853f62943d05e12ae44c9766","tests/expectations/layout.c":"f3aaea6884993faf3dc4cb8433deb6eea361e8188e4a944ec44cfee418c1c30b","tests/expectations/layout.compat.c":"f3aaea6884993faf3dc4cb8433deb6eea361e8188e4a944ec44cfee418c1c30b","tests/expectations/layout.cpp":"0ba0d01dae0403e9d4f7c86241027ea34cd7f67b0fa4d5f48a4e993f42688369","tests/expectations/layout_aligned_opaque.c":"c6def8e3570b4c33ad597d699f5c668f3f6765240f8a79f1fbb506a2f29d5aed","tests/expectations/layout_aligned_opaque.compat.c":"c6def8e3570b4c33ad597d699f5c668f3f6765240f8a79f1fbb506a2f29d5aed","tests/expectations/layout_aligned_opaque.cpp":"bd1ec25eb3f52444263012c836c1a312831ae9987cf092569b9f77f5087f7fa3","tests/expectations/layout_packed_opaque.c":"eff44ed7ce409947708c246aa3b535f10b42bfd39a591d94afe8ab4d404a5350","tests/expectations/layout_packed_opaque.compat.c":"eff44ed7ce409947708c246aa3b535f10b42bfd39a591d94afe8ab4d404a5350","tests/expectations/layout_packed_opaque.cpp":"31e40feebac3001adf6ab13e121108a60da2b2924c7ba673f0ff56cd29ceed84","tests/expectations/lifetime_arg.c":"459d7f911c04353949476fea67e619b47b9cacab951a9cd2dc7267af9ea334cb","tests/expectations/lifetime_arg.compat.c":"5b6cfed7767c837e4637aa65df8f8f80be7172d1b869152d205894a5fca338e5","tests/expectations/lifetime_arg.cpp":"6828334dd6d17fcceb6b614e47691dbea6c7f1735ebd15826459567802b1c650","tests/expectations/linestyle_cr.c":"c47b79a70178b4dec21195bf3ecff48bceff5203a3621f2709a4163713c4777e","tests/expectations/linestyle_cr.compat.c":"9963c2f0101fda33df235e71816d6959662c1374d4ce1395ada0a54160528b04","tests/expectations/linestyle_cr.cpp":"a1f4477d1de11feff1bd6383075f1e66143766563b162e02b630377d391cea60","tests/expectations/linestyle_crlf.c":"8e5c12fba506818fb7843e9955d23cd400d185a550b0232361740e6ed899c733","tests/expectations/linestyle_crlf.compat.c":"a95bed74fc25acfbd9385e75d9047f1b49b813cd06cf342a0542b3ddcbe99ace","tests/expectations/linestyle_crlf.cpp":"12f0ea9dce436788bb0e63078085fa2a07caa8af17ecbe65da58c65cdc3cb47f","tests/expectations/linestyle_lf.c":"8ceccd798cd6034abac6b31b3f6cd5d4c1911bdb6da3a46235d4a12c30dff29b","tests/expectations/linestyle_lf.compat.c":"24d70a7beaffa4dd1e22f6c3b8fb76ab72acbffa7806e41c0b7057dffab969a7","tests/expectations/linestyle_lf.cpp":"abee092cf4bcebc00fd7f242ac1f9aa28b80f589f7c9bfc34a6ed1c07e82267b","tests/expectations/literal_target.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/literal_target.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/literal_target.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/mangle.c":"312911321d64a714a0a25578e3b2590c603ca1636ec2c650e3a80c0756f90fed","tests/expectations/mangle.compat.c":"1df720a2a3e58000497d04b37281a7a8e598f960d32e66a50162a4e61f84ac3b","tests/expectations/mangle.cpp":"516daff6a50fa93716d3c1c1f62ac99cb8157e6130dc321785e87756549fa334","tests/expectations/manuallydrop.c":"e0622672045714abb2a4b6bea61130021906c311836b40e07ef976e5d7318e4f","tests/expectations/manuallydrop.compat.c":"2b58154db3ed2a22f1a2ca8e6ee46743f012f05cecd3e2c369d6d1c55ba0afa0","tests/expectations/manuallydrop.cpp":"388c31ad2941e5f206921223f76872a17e8705c7ae99ae8e9938d6c19489b0f8","tests/expectations/maybeuninit.c":"4df7e02e501bed1bf6752b3a77c31377368686afb4d645c960379c632c90da20","tests/expectations/maybeuninit.compat.c":"c9e60600f1e2b5963527e77c8cc79148a998830811bb1e8aeb1a33c49740aa9b","tests/expectations/maybeuninit.cpp":"c94eab42d76c2113a6f37fa76b90d3766b513447a4059234d690f6a553cc8b2d","tests/expectations/mod_2015.c":"358500d2996dd971630376eef9816379576625619b3516e5d3de5cc74bbefc6f","tests/expectations/mod_2015.compat.c":"cd2604b2ffed7bfa17327ed654370e058b913afaaa9461454ab6da6bfd4a6b6d","tests/expectations/mod_2015.cpp":"5ac2510d0651364bb633fd42fe1019dc42c6099d7211666425d6891e84344616","tests/expectations/mod_2018.c":"358500d2996dd971630376eef9816379576625619b3516e5d3de5cc74bbefc6f","tests/expectations/mod_2018.compat.c":"cd2604b2ffed7bfa17327ed654370e058b913afaaa9461454ab6da6bfd4a6b6d","tests/expectations/mod_2018.cpp":"5ac2510d0651364bb633fd42fe1019dc42c6099d7211666425d6891e84344616","tests/expectations/mod_attr.c":"d340ebb11f9b5c208bc400886919db1a61882a4b4731b002d274703b9c121649","tests/expectations/mod_attr.compat.c":"4c4644e2a4b33932cb7f96599e99a0f37d4dac47064d00ac6d43a08e92720d61","tests/expectations/mod_attr.cpp":"2df0d4213466b6ad5528713960af7016b4e29d72914a1fb803932406165243e8","tests/expectations/mod_path.c":"358500d2996dd971630376eef9816379576625619b3516e5d3de5cc74bbefc6f","tests/expectations/mod_path.compat.c":"cd2604b2ffed7bfa17327ed654370e058b913afaaa9461454ab6da6bfd4a6b6d","tests/expectations/mod_path.cpp":"5ac2510d0651364bb633fd42fe1019dc42c6099d7211666425d6891e84344616","tests/expectations/monomorph-1.c":"56f782e0e7ed4af20b54b9c1a1fa32ccbb421f74953827e77e4a34374a1f99f9","tests/expectations/monomorph-1.compat.c":"2481def545a3d016b1480752266b5a1460e30f972bc532ac55fad28329fc8eae","tests/expectations/monomorph-1.cpp":"76c9f60394d2b33f784e8ea47d4a45247ded703cab9d3d9b92e7c3eafb99bd2d","tests/expectations/monomorph-2.c":"ad18b5898aa40134b766636adb7963140d9592028b409252709489c07321ed69","tests/expectations/monomorph-2.compat.c":"7392c90cfed6097d93892eaca523b90fa57336cd9489fd64e7e15e85f7600076","tests/expectations/monomorph-2.cpp":"95889ebbb57c509e6ea8d8b79e692b9d2ee3ba4343b1492cfbcf0b6eed185f26","tests/expectations/monomorph-3.c":"6f5150caf205ed2c4ce1f894ccc41036c336ec6171aaf1c5ea6b4995474a53a0","tests/expectations/monomorph-3.compat.c":"261747e051bd071b480bd46841e2598d7c829d62fe4397a1602a6a1f77c833c4","tests/expectations/monomorph-3.cpp":"fbe1c063e47cc1e0b216053db1c1355e0698af8c83b6cb8fedb2f5063194508d","tests/expectations/must-use.c":"5ea1164ec7dc85e3a39c96355765242732b78cc4dd87c610be3c93bc64e2b168","tests/expectations/must-use.compat.c":"36c8c4a3ff770d18ceab9d2b4dfef41ba0d7d9253f25e0a629de6129e8d8f7a3","tests/expectations/must-use.cpp":"78ef60a4d6c588f97bbf88f81cad3884c45f0b0bfe27af161e220ec48c76a963","tests/expectations/namespace_constant.c":"f86295772c831a2e12da48314a18829301a43c476c62953c14ccaac4a85f0a48","tests/expectations/namespace_constant.compat.c":"bb1230c6476d773c14ddc0027a8b713b364d5f7dee03861e2999ba3968e8bc1c","tests/expectations/namespace_constant.cpp":"06b47d366bcdda0fdcc34e01c5c773323a159cd946146603a4eb67aa9de76c8a","tests/expectations/namespaces_constant.c":"f86295772c831a2e12da48314a18829301a43c476c62953c14ccaac4a85f0a48","tests/expectations/namespaces_constant.compat.c":"1e446aa818a096bb981340f14470e11ced8cf9dc061fc887d99046c53ccb761b","tests/expectations/namespaces_constant.cpp":"025e6c03c6ecb2febc9729b895ec591826e08b88d20e2a92d3efc98add915971","tests/expectations/nested_import.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/nested_import.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/nested_import.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/no_includes.c":"7a291fbd7336e914b26137ad41ec8bd4b32339d54165147533cdb64b60fb92ef","tests/expectations/no_includes.compat.c":"9aa00142d44fcb11d131f63d3962c7c9a81aec881f0da8fef1f90cbd8378ea5b","tests/expectations/no_includes.cpp":"ccc81037551361d758874141fb95165c57473faf66e500830ad4b40fbe00e906","tests/expectations/nonnull.c":"e46f7cc997ce798dfdfc78d64ed71e9157d2b69f3b122c2caf09fe412560aab3","tests/expectations/nonnull.compat.c":"b453816610023cc1f27b8d44261c3fb927f1fff9e4b67e58658b1c89c02e71df","tests/expectations/nonnull.cpp":"fba2388c683faa872f7e6087be9a632c6400cff41d12f92736836abfa1a5af71","tests/expectations/nonnull_attribute.c":"661d8728beda90b65721fc48541b1e532e01011b8ce4d1479da227ca9dbbd5b3","tests/expectations/nonnull_attribute.compat.c":"39d76bd914641c3e8fc8d5c803290901872b7f35069acb57b92a367cfdce2b71","tests/expectations/nonnull_attribute.cpp":"0f6bb96180c6352bccf834ff30122c85578b3b0a9c28264d45704bf894431e92","tests/expectations/opaque.c":"7db50853678143d52cb6844f27e026c0a5e6ddef83b53970042d1a94137fee61","tests/expectations/opaque.compat.c":"68f1f086bb9fe26be13d0bfd7d79daad5edf47f8dbe80e13e3bf2f197300c8e7","tests/expectations/opaque.cpp":"af3dea8c5beb16e079b73a6fe2a27b73af58eb7db939e7f572cf7c17b37e61a7","tests/expectations/pragma_once.c":"95e7271709e92cc423fffba8cd534b6cd9c5d4754d5cc6dcbfe9a539f44e2c75","tests/expectations/pragma_once.compat.c":"906e661e80125cb01c762351e5bcb7981428aaf3304b6ab20c6d6932468656d3","tests/expectations/pragma_once.cpp":"d1892017945637ca6801719e8cd5002ec64e456d3b2d3b2c04eb337af069ab4f","tests/expectations/prefix.c":"a5e83d73e47a872b6b545f70af01a3d95e76dc9c65cc2b1a57b88cc4d9a5eb80","tests/expectations/prefix.compat.c":"097eb28dad1b8e50435d7791dcc4bcf1c69310ea0bbd9d30eb0271357c526a60","tests/expectations/prefix.cpp":"a84b94ef4e4370d32268bc709bd292f933dd2c3f52fc5e41128aba869f038ed2","tests/expectations/prefixed_struct_literal.c":"99a2da6d8da7278015d9a58df331562fd81813453856d302e3675a62e9bb271d","tests/expectations/prefixed_struct_literal.compat.c":"2c9a529e318c2772d804348938406ac2482ddad4792a08fe4e929487668f543a","tests/expectations/prefixed_struct_literal.cpp":"e23706c370947158ce34e6403016d321dcc5e852d4fbcc1ba7b35cd3b5e2e497","tests/expectations/prefixed_struct_literal_deep.c":"997e66ee545f1a392e2cdf14f92fe3ea5fbfa5ff9fddb545c14b1346baf55802","tests/expectations/prefixed_struct_literal_deep.compat.c":"6afaeb3c4aca7f73957c55c9b6d153de0f6c410227d9004f2664db291e56d760","tests/expectations/prefixed_struct_literal_deep.cpp":"d5224b4588b8bdea25f32d35ba099bfef6744451dc851c60613ef84d75d63835","tests/expectations/ptrs_as_arrays.c":"f23c55ffda78e07d22ad04db76dd3b49c2658eb919e709caa904820a510c8b17","tests/expectations/ptrs_as_arrays.compat.c":"dd7d3fc890b675c397f28ef905a5114047d0cbec79a1acadab5e61f9522fdb02","tests/expectations/ptrs_as_arrays.cpp":"ccc94fdc2e5418fb1c6e5a530caaab68459943d42d6586df46ea5c9aacc0676b","tests/expectations/raw_lines.c":"026afd7d10e04be3dbb480078a3e9c9c827ae3f97e688f17d7428fffec2b0264","tests/expectations/raw_lines.compat.c":"3f8f40efb683163f6d9451de6eeb454cfc05f17e7af74edca359dd08ef57b3c0","tests/expectations/raw_lines.cpp":"921d9cde3bc1c797b93a5b329e0d34160e53559b3c52effc83d4c8f1507cbfb3","tests/expectations/rename-crate.c":"682bfb0d58921aefad506346533d6f69a9732f2f5bfb0b3df26dbbcc3f34151a","tests/expectations/rename-crate.compat.c":"757270fea3e013be492835b5ab418487657e7674cab0225b0027c20630d6e7e8","tests/expectations/rename-crate.cpp":"6cf661bc951ba3b19ee378c1d91a5f73f40d1a00b2b782bc9378789df75b5020","tests/expectations/rename.c":"8263595d6613ae047750f23e842ee77ff503f6408a557049ffdbfc16286be38b","tests/expectations/rename.compat.c":"1756807a3c51e53a3da260cdbfc91450bd54c8b22fd27e79ce673b0713114260","tests/expectations/rename.cpp":"dad94bfa862804316151bf74c8c471ed6c5b81a84fa6f95937fb768ba449660b","tests/expectations/renaming-overrides-prefixing.c":"9c75ec110a52903b63e3174a636f0bd75c6d3daf03d041eaac1c3853d15cdac4","tests/expectations/renaming-overrides-prefixing.compat.c":"329934f453884687b371a9859a67f85270b56c6ff374a78cb03745b2cef7c4a6","tests/expectations/renaming-overrides-prefixing.cpp":"1b50bb928516eb1fddf1345dca133645fe271533ff7b0ddb106ce66ec1ffef62","tests/expectations/reserved.c":"bb19179f7199e869a11cf07c4c73e34eb9f87e134616125bdda15f588d7a81d9","tests/expectations/reserved.compat.c":"ab55a14c931c7a5c773c70f0a4b6f8a82de6a629bf4063ee1c8fb4cf754848fb","tests/expectations/reserved.cpp":"a7ac3e2f0a699f5d0192e97812c68793e57a8b5ce07af48b6a9c2ff2a1680b0d","tests/expectations/sentinel.c":"8c5bf6bd0b04574ed173f0f50f16e4191188a4f8401e05d6724f0eec33d35017","tests/expectations/sentinel.compat.c":"5bbc747d69716b12ed9f4cf3e64ea7b486d5473c86cc9ef4c03485e75437ec8c","tests/expectations/sentinel.cpp":"5c2d05019f8f65de0028ef870737fca9abb7ea177ba0d4dbb68fa5d9f1d1bcaf","tests/expectations/simplify-option-ptr.c":"0bf41bbc047d0cdfa5b460e9b092ab053a0c39de701c9808b9542a21d5a7349c","tests/expectations/simplify-option-ptr.compat.c":"7e49ebe1f0d7668b5f3e0d6b0038fd8cb9521e252f2ed1650893cba636489817","tests/expectations/simplify-option-ptr.cpp":"03732ef9b5d8c030b17988a7910eb3206106b9ce246b536d40b3477b7595329a","tests/expectations/static.c":"4a84a7b7c6388ec65e0855c02780f253844256e9b8c9d2c8f9c19a1e67cc729f","tests/expectations/static.compat.c":"298387148c4c870854dbbe81c996575bce7306e640661c3c636a2e811f736dcc","tests/expectations/static.cpp":"a9054d752eaef1e6bd8edb169fbdddfd20f6f0627103ded58ad52d2e316f2a3a","tests/expectations/std_lib.c":"8b8f89b986ef595c3cf7ae7604825ab30365406c1fb435fb0a7bfe1ab05f4297","tests/expectations/std_lib.compat.c":"93ce746242cdfe562bf0374584e0a913de41a718cca98ae54adcda44cf5d7a5d","tests/expectations/std_lib.cpp":"2ae1e7c56d054114d49ad95932d436f390bd89b37f763685fe91dee9617376ae","tests/expectations/struct.c":"3f3a24f56a43dd92290367ed37d3e64562def9f91b1ada89347adb2a686a4e5b","tests/expectations/struct.compat.c":"72027b56ec38931f962b0abea91e94cc179b3588d7d7b4c738013a39c249e3a7","tests/expectations/struct.cpp":"24223fcecc97e832fe70bfc10ed515c4f3da7a4f9bc3517df93ba97ac604e313","tests/expectations/struct_literal.c":"8e120681c9d50cc290853a0373a75318c5b1d690b1480d6850e6cc2b7e621b3e","tests/expectations/struct_literal.compat.c":"433b9d0ca518190fad88709e67286ab35d6f6ed8cacf382a51252c15514fbee9","tests/expectations/struct_literal.cpp":"aa2be235a95a2f53b3b5e3a86072922c14eb1b1c2d93c9eee011f558e321506f","tests/expectations/struct_literal_order.c":"ab4e19c8e18c302e4bdae2e7e6d8d9b3e302286bb271d68eb2146db9e618f283","tests/expectations/struct_literal_order.compat.c":"489aab1f32445f2f32ac56cdc108d16a21357f6b269fea48bebb239c88b52982","tests/expectations/struct_literal_order.cpp":"4c711c9d0c7b6f4c934334c29868cdeadcfbf3715aa1e1edf6bba49a8dfd7fd5","tests/expectations/struct_self.c":"1937ed40437d089404ea04e85df65343f4048830485b91680c44ecdd41f26cc7","tests/expectations/struct_self.compat.c":"8fb27c7eaeab15fbf369edb806a9342ad5d65c4be8dd88a411b10a290725f11e","tests/expectations/struct_self.cpp":"59c4b69ba609084b14f97b7ab545d601aedf9ed4429e5682155f791fdc212614","tests/expectations/style-crash.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/style-crash.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/style-crash.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/swift_name.c":"07469ad1a8da44f3fb5fe5813d6057e24ab3d08fd8e0f104c1a758fde22215a6","tests/expectations/swift_name.compat.c":"1041189e68320decac783af484d8470db99b6bd2850bf26bf29513b21c8a7e80","tests/expectations/swift_name.cpp":"a23f9a0c9158bc6bac41bb91fb5ca6356ee07b6750a7a59dfdc032594f0ceed9","tests/expectations/tag/alias.c":"73136d2f5b0b948d12a87935ada9d64f2ba9f03f40f6daffd692a3062d93b6c4","tests/expectations/tag/alias.compat.c":"1291aa2a7a7e68f16c17cbf2e0dbdae5b09670d6f436841f2246c5f0c8bdf76f","tests/expectations/tag/annotation.c":"6ef6f3d63a860cf653da1207cd02eead31143b3f8c354175102a063c2e4433a6","tests/expectations/tag/annotation.compat.c":"676a9b074292a367ecc5687b5a57bb3c16cd5c223d9e1d0bbffa260d3c1fdc9c","tests/expectations/tag/array.c":"0249e3bb142a9c6687387e0b04bb91d34a4f2b09aaa5a960e7c1ec088fdb311c","tests/expectations/tag/array.compat.c":"bac8f030401b2c9544d11e2902f83519ab33b421376c4ba23a2466ce828d4c90","tests/expectations/tag/asserted-cast.c":"266b0a1ea26cf4bd078fda3089e18f63aac5ca05f0e6853cb21ea75674922d61","tests/expectations/tag/asserted-cast.compat.c":"a121d794bdbc99ce13fe87e52b095327182b2053ccaa19b2076946166c2fb8b6","tests/expectations/tag/assoc_const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/tag/assoc_const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/tag/assoc_constant.c":"7a2669d2332623ef8e9bd605203f09dabe905c568f5f0162153e2e77ec7ae6fd","tests/expectations/tag/assoc_constant.compat.c":"d71d82758c132208ba453e876cc6e2e7f5afb1b537fbe588dab6cdce62a8ac9c","tests/expectations/tag/associated_constant_panic.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/associated_constant_panic.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/associated_in_body.c":"7fcfcab51404cdea16254d102e60d1689a6d6f64dacdc8f431a14de57027e8fe","tests/expectations/tag/associated_in_body.compat.c":"9b43a735b7f346861d01e20e6dcdaacf49241f34ea8112b70498f275373ee666","tests/expectations/tag/bitflags.c":"7470f660cc356a0ca0a4ceaf4b651a22fff99228d7c67ac93d70eaceb0450511","tests/expectations/tag/bitflags.compat.c":"1647ef46bf4b8cc7279e70b4a2f1cec62ea1c4e893e4a693366c42d5ad1b5522","tests/expectations/tag/body.c":"5790486bc774a8c0ef43b13a37e99339b7fb271ed0b323c545f07fbe159f696d","tests/expectations/tag/body.compat.c":"d711be20a0a529cb62387c280841234321644f9f8280088bf0ad48a7fad19f02","tests/expectations/tag/box.c":"546512481db6d70c6ebf28369243932581300a4d6dedbf48c9c57038339e2783","tests/expectations/tag/box.compat.c":"fb6e27bb47ca374089f5f3e362cef146d8676b321bd3eabd7467ac4e0530a055","tests/expectations/tag/cdecl.c":"e49da32919797ea6d6ce3f4fd7a967ad33ef1dfa3f323f15181cca5f9a1fc98e","tests/expectations/tag/cdecl.compat.c":"80ca597ab6be6a89310ed2120e62192b6c957cce02770218e11eebfdaa730282","tests/expectations/tag/cell.c":"87d4eb265f6c2313033cba74aa83c63010e0ef5f0d7de4cbfeab42429c379449","tests/expectations/tag/cell.compat.c":"77eecb7243f1dae0261e8c2fd2ba988eac4c0f455bff18ed7dcccc643205e838","tests/expectations/tag/cfg-2.c":"59713de1fbbca328b90e922215dbd01397e078edcdaee23f6f326c4c5395d444","tests/expectations/tag/cfg-2.compat.c":"911a9f8e00aa570746a4b28a314794252b2dd69543cef9f71420a14309297375","tests/expectations/tag/cfg-field.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/cfg-field.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/cfg.c":"87db725249f76beb68fb867b46fd519f4a08b1e0c04830f9403133ee15afbbfb","tests/expectations/tag/cfg.compat.c":"9f784f521d1d53dfb2a26a87847be9e94c0bfae4598bca6b49c010dbe941c668","tests/expectations/tag/char.c":"8aeeab4c3c0b28c9cbc6177a20bd5d85e98454b5c871885efb8b1d9da9a79aa2","tests/expectations/tag/char.compat.c":"f7fc5f73c50ae5f2f4348f4c8cda4fca318891339254f37a6a58762a94c1bba9","tests/expectations/tag/const_conflict.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/tag/const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/tag/const_transparent.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/tag/const_transparent.compat.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/tag/constant.c":"acd58a2ca6c5c0991a9d7c47b39ff967bc92ef1fba415ac58b05cee1a5ec83f6","tests/expectations/tag/constant.compat.c":"2ad53667d23ddef7899a3119e2f28ff91f1adc0afe52236723a40da4993bf05f","tests/expectations/tag/constant_big.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/tag/constant_big.compat.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/tag/constant_constexpr.c":"097adc133ca25bde9ebad4a63fe77d26759fa14ba015127a160d9c0f869caab3","tests/expectations/tag/constant_constexpr.compat.c":"097adc133ca25bde9ebad4a63fe77d26759fa14ba015127a160d9c0f869caab3","tests/expectations/tag/constant_sort_name.c":"733b9a46e8b9e33cb8696d13e74ba7b8023735c8fd8dfe73b3cf39d027dffb38","tests/expectations/tag/constant_sort_name.compat.c":"82bd07c1f56913bca006c3859f222feada9ce53a53444702c5c61fd96943ec49","tests/expectations/tag/constant_sort_none.c":"7839492e03ffac12c0b2f5a15bd4b32aaeb20d0c50440fc392fa2cff9b585f83","tests/expectations/tag/constant_sort_none.compat.c":"3b59ec576d09ae51f0db0f8c34bb9787972cd8441ae718117568f9220c4f0cc9","tests/expectations/tag/constant_user_defined_type.c":"0466a87dd60eb403f4f376639464e4b9400dd00938bd5166e131aa1715ff9e89","tests/expectations/tag/constant_user_defined_type.compat.c":"0466a87dd60eb403f4f376639464e4b9400dd00938bd5166e131aa1715ff9e89","tests/expectations/tag/custom_header.c":"9c1a75c8720c009da725e2f980c600ad695fc43481dbb038eb79e672d91ac05e","tests/expectations/tag/custom_header.compat.c":"30b8f6fe02ad2f00956a4d1ac2ce3a32ddea5eb6789c1aade68dfa1640262ae6","tests/expectations/tag/dep_v2.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/tag/dep_v2.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/tag/derive-eq.c":"7a28b8245621034532bd5af2c018bb0b62effb8b62a1076df143209121c42317","tests/expectations/tag/derive-eq.compat.c":"38dd43a0e5543dd566537512767131c41cfa6ae56c17ca8e14aee32076e879fc","tests/expectations/tag/derive_ostream.c":"d538cd7e0e33ecd512327ac5dd38aa3592a4883631d25cc2ccc3878d85d57f1c","tests/expectations/tag/derive_ostream.compat.c":"9ce26b646085d00eeead86842e1c8b1304774245876af4578d650e4be31e11b8","tests/expectations/tag/destructor-and-copy-ctor.c":"96c1598df9e6420c11d8ef10d6a61b26d117dc2a91011e2888c82d6ddabb46b0","tests/expectations/tag/destructor-and-copy-ctor.compat.c":"75d6b55508f446d3198fb72050803ed052bb67e584d10c5da39fa4a25461abe1","tests/expectations/tag/display_list.c":"886bd29c8d6b482f52e0d51c22b8d4381eb6ecf9ad6d249d0cc4843bfdbd663e","tests/expectations/tag/display_list.compat.c":"0a017a5f3d9fe253e392b44a19d1bac49a21b05d9de1029f4f7d908c819a611f","tests/expectations/tag/docstyle_auto.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/tag/docstyle_auto.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/tag/docstyle_c99.c":"dcb114c8aa34bd0a15cca9e7076b24700c3660741ecdcc41e7ddcc44bfff9434","tests/expectations/tag/docstyle_c99.compat.c":"fe9814379b9c8795bf8ecfb1308397e5e0dbe9bd81cc9ac820b90ac89191c39f","tests/expectations/tag/docstyle_doxy.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/tag/docstyle_doxy.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/tag/documentation.c":"268e799c5b13dabb6796b9e233d623adf89d3d69a26c9d25d661a182a2de2a73","tests/expectations/tag/documentation.compat.c":"b9987f70233cc3952f82b2553b2e016e85b54037b767009c1b96c9cbf9d80830","tests/expectations/tag/documentation_attr.c":"7c353cf10b129591b74fc1a3492b2ae45e80877e5c00ed225e83f892a495bd73","tests/expectations/tag/documentation_attr.compat.c":"17f61b4a39cb3f8668713ea7d50e74e57e5021e326cedd95e3f67a29d1c4d2a4","tests/expectations/tag/enum.c":"d55130ccaa63939ad9ecc010e49cefde3cd8772f6a90cfd87b7a79e485028014","tests/expectations/tag/enum.compat.c":"0dd25e792b2aa124765bfdca941769f6cc959aa6b7b759f831dfa4ffec789e81","tests/expectations/tag/enum_self.c":"e0727082e9c7fb41ee567ef6ee3dd2d041836f2294ab7ed939bdf827ff07e6fc","tests/expectations/tag/enum_self.compat.c":"f7624d67f46f66fb90c40ef3777adf345c6b290823f537ef8940985877dd6c37","tests/expectations/tag/euclid.c":"3a3bd68906ca709c4d7eefdea0021cf9117a83dd87a2bd9200b0b41cba68ba20","tests/expectations/tag/euclid.compat.c":"891ae3746e246a2e814a02f6670a025347fc792e956c242782cba4b8abb53f9b","tests/expectations/tag/exclude_generic_monomorph.c":"47be7eb089b5ef532d93d3bedede8285bdcaf880cc6a78e39e1d6d3fa530a91f","tests/expectations/tag/exclude_generic_monomorph.compat.c":"00cb8de1ff527d9901b46269b7eac2f6623ae52847f4ca567bbc5a8810e4a81a","tests/expectations/tag/expand.c":"c14c175f9672e03913b278c6f2346c3ed655ff66a67889b9f9f22e923dd293ca","tests/expectations/tag/expand.compat.c":"972f420b8703a1a2f9e72e7af8ed1dab832240faabe6c2af9a72e47f000fbe58","tests/expectations/tag/expand_default_features.c":"7da60b618c40a23089c8f7c26c196da98a59720acf25683f32a838c52f8a8b10","tests/expectations/tag/expand_default_features.compat.c":"fa7654d64a8de65c26a109d4f4389c9fe32489bbb9dbfbb3e4c51541e3555e49","tests/expectations/tag/expand_dep.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/tag/expand_dep.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/tag/expand_dep_v2.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/tag/expand_dep_v2.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/tag/expand_features.c":"307babc64b5f3821d90cce8dd7b344a665ecf5b76b76c2bf606001798f39d46a","tests/expectations/tag/expand_features.compat.c":"9316e9411d1a8be5414c0d2db09d1c582fd172661a69ecb2cf5a30731aeeb496","tests/expectations/tag/expand_no_default_features.c":"c14c175f9672e03913b278c6f2346c3ed655ff66a67889b9f9f22e923dd293ca","tests/expectations/tag/expand_no_default_features.compat.c":"972f420b8703a1a2f9e72e7af8ed1dab832240faabe6c2af9a72e47f000fbe58","tests/expectations/tag/export_name.c":"4c0452bf3c2901a1006efd759360882df316c2938d141906c89ad60b15b477ad","tests/expectations/tag/export_name.compat.c":"5a2182e239b75ef0e4970431523f4ca5e3c17d43178ab1126b0833385666e37f","tests/expectations/tag/extern-2.c":"a81c41efe618612fc4b9a22d937397ce7a76ae966a28b33e56a10725cf2700ea","tests/expectations/tag/extern-2.compat.c":"124174ff9745e397b646830ed9660faeb05910bcb340b73c925a4f8f3f656a14","tests/expectations/tag/extern.c":"1d6e6afbf9765a48cebf170bd31751ff7372d7665ea646bf2605e5df12c7e43d","tests/expectations/tag/extern.compat.c":"a9e47795357fbe2f04a952033d33d2d7bc54a47654f40c21c5c1c824137690ee","tests/expectations/tag/external_workspace_child.c":"be776d880e923d640da889c22551dbc6dcacf6f80b1b8a07284bc8fcd726151b","tests/expectations/tag/external_workspace_child.compat.c":"08b1d7e35fba239e73e08a56fe2a5ec80133b46774e4047ae2eabb56e027a4ad","tests/expectations/tag/fns.c":"9472ed474690bd8aece9893720ef7cb0c36d9a08511b077d9ddfedfe4204b45e","tests/expectations/tag/fns.compat.c":"cf0de02321c40c8426bd6298d7f62c21d2bb96ed9985184aaa91d4f50a8716fd","tests/expectations/tag/function_args.c":"90545731d4f875305f4255721917fe99fe2b72a9800c0e0a1f5ce216c3bdfd93","tests/expectations/tag/function_args.compat.c":"f8afecff6f47cb348f8899248cc12282614b052d50c3d20494f9f65c418c7ee4","tests/expectations/tag/function_noreturn.c":"ea55a1ffca36bb2936814fe9db0f22176743a82385436ee720398323ef7a3382","tests/expectations/tag/function_noreturn.compat.c":"f55784b82192998e9701cae9fef09dffa6ce6245c4d145c73968998a0cbbaa5e","tests/expectations/tag/function_sort_name.c":"8c6f66d028092f8ad11acf8d9bfd934e17ef2ae25c26d3012c9655a54f379b45","tests/expectations/tag/function_sort_name.compat.c":"7d8e577d35f4590a8d733ea072e68410784e9870295607ae8872c71239994a2c","tests/expectations/tag/function_sort_none.c":"cb76985dc63027d0d85bb6cfb32e5a77f9c3a46a97059068643186f27a88d9ce","tests/expectations/tag/function_sort_none.compat.c":"3aa6b8e43a5cbcceb35ced688fdf0dac71bd63f0dff1cb7d0ecea72749fcb017","tests/expectations/tag/generic-pointer.c":"6f7946fdf4f71603a67134fb7e15764d8c723575c969e0976091a6912fbde974","tests/expectations/tag/generic-pointer.compat.c":"7e03767bd8435010e1e92d6f6a7436d1376d78738199a7b1e484efd7e0543804","tests/expectations/tag/global_attr.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/global_attr.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/global_variable.c":"e438559eb15269367b740790ee27a8bcf63a65f58153cfa9da90a173480b7842","tests/expectations/tag/global_variable.compat.c":"7da3dbaa9810ec68996038c3170e308c86d038f2c6a7424f08153a002b84e737","tests/expectations/tag/ignore.c":"8629579fd8d0e5df30b4a6e8258fe62efaeb58365f906e253684b1bd9530654c","tests/expectations/tag/ignore.compat.c":"513d4638f5b6331b88782b7b9803d2eb30e058661ecce6e0f0aeab79b5edfd7a","tests/expectations/tag/include.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/tag/include.compat.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/tag/include_guard.c":"5d9bc0cf8c54aec379f38ce9ee64a8ced7c710e86b947e6516745586d8d51e65","tests/expectations/tag/include_guard.compat.c":"7ed0680e9547628b3c3edd867fa31bab7bdae7bb38ba68e8c643b676de876b1b","tests/expectations/tag/include_item.c":"c3e805ff7c80652cd250e0f91c158e25062b9331f9f106b77a7e08147e70d346","tests/expectations/tag/include_item.compat.c":"c3e805ff7c80652cd250e0f91c158e25062b9331f9f106b77a7e08147e70d346","tests/expectations/tag/include_specific.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/tag/include_specific.compat.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/tag/inner_mod.c":"e5b15746228630dbcd16bbd1467375d0954f981de85ba4230ee09bfa7f509a4e","tests/expectations/tag/inner_mod.compat.c":"6e3c7a559af8d84eb504d94aec8694c18d2c8d9acf32cc525e748c86db7d0c97","tests/expectations/tag/item_types.c":"ab7fb01375066294949a2dc99a55cd1cde72bfd8510aea21fe89db256200ed42","tests/expectations/tag/item_types.compat.c":"0c68a303f170b7f412fd8ed4196d0c688a995c9f3a0b35b0bf857acecf9cfa36","tests/expectations/tag/item_types_renamed.c":"fbb007a71b1e2567d4068dbceb46b4e284e64fc0f425b67b84bf9f319f947435","tests/expectations/tag/item_types_renamed.compat.c":"a15917d285d40d7edad8b53ff9df83a5f417212c9d6bb8e120c68401afaa127b","tests/expectations/tag/layout.c":"a4fc428e701015b316d1d5f45af9ccfe4f93119737dbc70440bb5135775455f5","tests/expectations/tag/layout.compat.c":"a4fc428e701015b316d1d5f45af9ccfe4f93119737dbc70440bb5135775455f5","tests/expectations/tag/layout_aligned_opaque.c":"b1c7d1fefd46489aef9c7d9a1ac9d2813daddb42950ae1e251c5f36db56ea087","tests/expectations/tag/layout_aligned_opaque.compat.c":"b1c7d1fefd46489aef9c7d9a1ac9d2813daddb42950ae1e251c5f36db56ea087","tests/expectations/tag/layout_packed_opaque.c":"e0a6f08d233d4f53d5302b728a723dc0b1c4684b47c50c7e28732fb895d6223f","tests/expectations/tag/layout_packed_opaque.compat.c":"e0a6f08d233d4f53d5302b728a723dc0b1c4684b47c50c7e28732fb895d6223f","tests/expectations/tag/lifetime_arg.c":"1c5da2b4db0418f6760a22d1045e077d479f39014df0ae76926913fcfdcd3f24","tests/expectations/tag/lifetime_arg.compat.c":"71c023595b76b5faf477211f240e28bd0e53d8ab934ffbae0db385d76d9e06ab","tests/expectations/tag/linestyle_cr.c":"b50a6e683e09e118df9d736d8c41558fe9449cd7ea286880af587c1c8cfebf9f","tests/expectations/tag/linestyle_cr.compat.c":"476b857e2ea70bcc0a38791988f8e366ec651eb9293407741a7daff78b0a6c72","tests/expectations/tag/linestyle_crlf.c":"6b420ef3c54620e8eeb287a0c4df434521d9448dc56b464ecac8ccbe95c07ca6","tests/expectations/tag/linestyle_crlf.compat.c":"f46844a888c93b7068a4fa19351aaa6e4b6b16edf1f9a2e02650e6ec89e3813f","tests/expectations/tag/linestyle_lf.c":"9b87b10e928fda7709575f3a6ae449c00e111aca5082e45e4765883cae39e1b9","tests/expectations/tag/linestyle_lf.compat.c":"f4ad723de21bdc3a88122f0582a32b6bfc16a5f5618b638331e1fb836f2d5b00","tests/expectations/tag/literal_target.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/literal_target.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/mangle.c":"3264b8207d7f53e63d8fe8ce8ce17b6ea3a1266a6e80d6185a686682ab8ec025","tests/expectations/tag/mangle.compat.c":"8afb865bb530219ac0ac12b48f976b229e9e78cf8f9f9a643e7196ef723ef708","tests/expectations/tag/manuallydrop.c":"3f1a2b1f6f166306487e82911417febc84dbbfb8e6d0c60b3268864b65c58d5b","tests/expectations/tag/manuallydrop.compat.c":"fa3ac35cf7a716183e8d9feaef0f39e249d0a6055aae20c4641ade1990c0647f","tests/expectations/tag/maybeuninit.c":"ac842439bc53ee739b0c842784f80922938df4a8387cbbf4ebd1bb6b83036cdb","tests/expectations/tag/maybeuninit.compat.c":"1e043eb89b3a478fc6fc6d47051464f128e9dab65860b8dd8ce93604d885eb08","tests/expectations/tag/mod_2015.c":"8c849f6a71fd73720b23141b0498400800dd1282bb47930855e2f12c80544777","tests/expectations/tag/mod_2015.compat.c":"c6ba516c29bf70a7234f85acaeaa98fa5720eb386f0b0c03e042262c476e0eb6","tests/expectations/tag/mod_2018.c":"8c849f6a71fd73720b23141b0498400800dd1282bb47930855e2f12c80544777","tests/expectations/tag/mod_2018.compat.c":"c6ba516c29bf70a7234f85acaeaa98fa5720eb386f0b0c03e042262c476e0eb6","tests/expectations/tag/mod_attr.c":"0c0fcfb23ac323595872ce0c294d9c59e53cd547238655ba278d5cef957c9814","tests/expectations/tag/mod_attr.compat.c":"7e085f1c5cb612114ff8a87a87badf9f85cd571ef0eef0f601af809ac16a35a3","tests/expectations/tag/mod_path.c":"8c849f6a71fd73720b23141b0498400800dd1282bb47930855e2f12c80544777","tests/expectations/tag/mod_path.compat.c":"c6ba516c29bf70a7234f85acaeaa98fa5720eb386f0b0c03e042262c476e0eb6","tests/expectations/tag/monomorph-1.c":"bdc4017baf04090f62c8b18d75824bdff0fb48f0b6ba2013eb8a594d5859702e","tests/expectations/tag/monomorph-1.compat.c":"e03f90337eca949628d86dd393c17ef1bbac240561edeec1f6365b71bd7035b1","tests/expectations/tag/monomorph-2.c":"b8be9d57b0021ad9fcaa7b905511aa14a412299ac9ff6680f273a3e999e86cfd","tests/expectations/tag/monomorph-2.compat.c":"ea568e6dde68ec79d95488c8f2682495d6135f40266e901642cff45295668a5c","tests/expectations/tag/monomorph-3.c":"0267e4ea206bac3ebaaef30f7dee4f2243cf7f5ffa0e0748f194d3e1fa5635e5","tests/expectations/tag/monomorph-3.compat.c":"3264f932beb090697bad43ecf82018719de18254460fadd7dd6a4c14b29871aa","tests/expectations/tag/must-use.c":"ea71bd4f8d079ca7d64e4dc1ddab2ef556a2a319a27130353aa1707fe355e553","tests/expectations/tag/must-use.compat.c":"a6c8c21b8520b6045cd7dad202aff7fc3044fa6599af3a1d4b8d28334a8b7fdf","tests/expectations/tag/namespace_constant.c":"1e3f5dc75e6c49f6ac9a223abf7fd35743465d7376116eb435c31befbd58674a","tests/expectations/tag/namespace_constant.compat.c":"5e45fe7f4600288ad2a5e545f873fff0d43e95c561e03c5afe5b596d0d144306","tests/expectations/tag/namespaces_constant.c":"1e3f5dc75e6c49f6ac9a223abf7fd35743465d7376116eb435c31befbd58674a","tests/expectations/tag/namespaces_constant.compat.c":"c6771d0b00159fde06de09d6074537cfd19d86f0ea70af8bc5c003dcbca2e96a","tests/expectations/tag/nested_import.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/nested_import.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/no_includes.c":"7a291fbd7336e914b26137ad41ec8bd4b32339d54165147533cdb64b60fb92ef","tests/expectations/tag/no_includes.compat.c":"9aa00142d44fcb11d131f63d3962c7c9a81aec881f0da8fef1f90cbd8378ea5b","tests/expectations/tag/nonnull.c":"9968d2607a64b8f21efe2c9d255da6ff8c606eca82e241b1426a31e5a5650af0","tests/expectations/tag/nonnull.compat.c":"32a9bdf793c01fc90b414e14f7255114402340c5b79f0c2092ce5a0e14c0c622","tests/expectations/tag/nonnull_attribute.c":"c53457574ee33cbb888c851ee016821ec3213b5ef360831fabd70d781e7fb292","tests/expectations/tag/nonnull_attribute.compat.c":"45a99a1efc18db8faee7f396e4e4025ca20dfcd9d7e35be532e77c2e7ac08780","tests/expectations/tag/opaque.c":"a2b5eb59654234b3d56c0d0ef28ce9b867b9b511ba26e78ef81dc5ae8f1f85a0","tests/expectations/tag/opaque.compat.c":"49a33f9999c10ec139fa7c5d81d457a6217e913737c3f0b598773f9273d9df42","tests/expectations/tag/pragma_once.c":"95e7271709e92cc423fffba8cd534b6cd9c5d4754d5cc6dcbfe9a539f44e2c75","tests/expectations/tag/pragma_once.compat.c":"906e661e80125cb01c762351e5bcb7981428aaf3304b6ab20c6d6932468656d3","tests/expectations/tag/prefix.c":"0d16591bb6b3df08ada5438f772f34acb3dfe4c370ae96e8748a2b834af085a1","tests/expectations/tag/prefix.compat.c":"dd1f1fc847939878a906ef9e42a7564394982e9d3c63344db0cf1f0ed3f20260","tests/expectations/tag/prefixed_struct_literal.c":"b68b97ac636ad4d9d87f42135b06fb7aee7c7a5fbff99d82eda74c1ebb5809e0","tests/expectations/tag/prefixed_struct_literal.compat.c":"ed20719d7f7639122f43c8b3aff649c88724c773903dd3db20272fe1bce9ebf5","tests/expectations/tag/prefixed_struct_literal_deep.c":"dc18b95c737546333a0c116cfecc677556584a38d1f2e60a237d751c1e34661c","tests/expectations/tag/prefixed_struct_literal_deep.compat.c":"bc01145cd2692ad37659eea40f4097faa88602cbd8cb8a410bc971976f68c84e","tests/expectations/tag/ptrs_as_arrays.c":"f23c55ffda78e07d22ad04db76dd3b49c2658eb919e709caa904820a510c8b17","tests/expectations/tag/ptrs_as_arrays.compat.c":"dd7d3fc890b675c397f28ef905a5114047d0cbec79a1acadab5e61f9522fdb02","tests/expectations/tag/raw_lines.c":"026afd7d10e04be3dbb480078a3e9c9c827ae3f97e688f17d7428fffec2b0264","tests/expectations/tag/raw_lines.compat.c":"3f8f40efb683163f6d9451de6eeb454cfc05f17e7af74edca359dd08ef57b3c0","tests/expectations/tag/rename-crate.c":"5870b314cab7bb0430558ecffeebf0dd590dbde4933adaf581a3a724d2541a83","tests/expectations/tag/rename-crate.compat.c":"7f2906a45f233d35cd097593c678a5b031ee9d54e812817caa949d62483a7424","tests/expectations/tag/rename.c":"60018fdaae3750e2c60c368fe9a195027ba6ccae03a12533bbaeeb04a96d02dc","tests/expectations/tag/rename.compat.c":"61bbb70212dc73046e6be1a09250f1ba8163506ef53b4f5274abf383c7b9f8ee","tests/expectations/tag/renaming-overrides-prefixing.c":"8dde2e5380b0ecd415c4552aa95e272fbdcc4843bfaadce8845339d04ece4aa3","tests/expectations/tag/renaming-overrides-prefixing.compat.c":"b24513fd3120d796273599deebd8c81c2a40bf08b5ad095b1b6a63c3528a83ae","tests/expectations/tag/reserved.c":"c44b70f5c2cbee518320cc738ab59258d800b32eb70526da18e74c7b0eebcce2","tests/expectations/tag/reserved.compat.c":"92ef58d8d39f3ef7b5b51371f918083268b647c8c0d383cd2f9ecb8673b6ee02","tests/expectations/tag/sentinel.c":"d50caaf5d902934525366f50ff8c85d370039baca0e5cadbbc13982ed7a98456","tests/expectations/tag/sentinel.compat.c":"a1772a029c21095e6431d907e6be39c710bd90cddaaa5612379f02fd026e930d","tests/expectations/tag/simplify-option-ptr.c":"6cce4e91caca1d6ebf208a92e47ed139f79ce1ba047c58ea6ecd614c063231d9","tests/expectations/tag/simplify-option-ptr.compat.c":"ef3b81aeff6e5ef8718bfe35dc09d5edd2da63bc905033b6335e355f19534c33","tests/expectations/tag/static.c":"67cd9094682d5878babe355e6f0036153008eff9a190abcff80d05e4fb3111f8","tests/expectations/tag/static.compat.c":"c132f2e64fd645e415ea99b546c97bca613348c0d4275681ff5079bd55d7b7f5","tests/expectations/tag/std_lib.c":"0e1d6b0d0e41071718034e5940b01da5e45cb17c2f99db7552335c0720b86907","tests/expectations/tag/std_lib.compat.c":"2ee4070a5512b9fe7409c1b3444cda9ac3d7ba28fd17582fa0a461950a76ece6","tests/expectations/tag/struct.c":"98033bb2596a3852351de170e1139499ae39eb5f414c6624353709e4c602fc6f","tests/expectations/tag/struct.compat.c":"5e3b361a41f6a3540c10f632873483a2b295dd8bed5a2701fe498b20aba24704","tests/expectations/tag/struct_literal.c":"41ab9ca8945eb6dc011925445882ddece4ea9bd8448277a5ad72d1cf71169a71","tests/expectations/tag/struct_literal.compat.c":"7a0e315ff9cdcd41e42ba103c6bfc2c220a6f1ce1b575980de4d4b6c5d52d5a8","tests/expectations/tag/struct_literal_order.c":"818bec81379d034429fa870fac46e9878b0744e6c4f992904f638781e308f79f","tests/expectations/tag/struct_literal_order.compat.c":"2b59847145b19e5c4059474cc83c26b7fb543ef26cc91c7555043c86a00e056f","tests/expectations/tag/struct_self.c":"de2462cc5788b3a858b096fbb99cea9d13b9646b7cc8c65247d9492418f1cbaf","tests/expectations/tag/struct_self.compat.c":"c93763dd177ba56e5dceb21295c0eb8f66be05e5413edc91019240cfe840f53c","tests/expectations/tag/style-crash.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/style-crash.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/tag/swift_name.c":"64ef8a5276e27fc005285edf8895c25c412451f0d8aabde059a9fec749862e9a","tests/expectations/tag/swift_name.compat.c":"f6496ace32fb497ba4bca2c6673f0ae109cc3daf6defa3795b4009ea6b057d36","tests/expectations/tag/transform-op.c":"07179ff1d68e40245c14d2e84076ab30ec768d0a8e65446d357bc0c1eb0b329b","tests/expectations/tag/transform-op.compat.c":"f31267ad42f38892232847e9bc5231125dcf5a54a7aac2ccfff3b1fe0097ddca","tests/expectations/tag/transparent.c":"6c5b0b107f05f345bc81c030233e63d38a7a82f5a5be719cc6029976892c6851","tests/expectations/tag/transparent.compat.c":"2c5cac22393daae1c514c17f242099f48d4149b9b8d495b697b0c2eeca34b60a","tests/expectations/tag/typedef.c":"4af487e5e1b6e74f17ed8445c6e3a69f96307cc2f904d7e9b212846112575862","tests/expectations/tag/typedef.compat.c":"5cf3831cf49ab69a1900ff58fea5488bb2ebdb75d9829d5d2d6258d332970383","tests/expectations/tag/union.c":"fbc4da207f1ba8f3c26a014ed5ef015c6c46a442b65129ad363be2f12e6dc963","tests/expectations/tag/union.compat.c":"96ea2eb155962801870ad8bac885ac3b0350cc0d7d363d8e0b0ee713a6f3c466","tests/expectations/tag/union_self.c":"eb6db9deec2228df7e761ef5ebcc2a44c9bf642db635bfaf9fdefb74ac848c18","tests/expectations/tag/union_self.compat.c":"c233507a1b1e6dc09136a1f586a84bca9f67cd2d0cb750936e449b8145dbb16d","tests/expectations/tag/using_namespaces.c":"fb2d6c8baed0b32ac1c5e69864e57f73f0a5c2ab8a6b37a5e763352ae43fddeb","tests/expectations/tag/using_namespaces.compat.c":"417a45ea1ff78f2eac7f84c617d72377117cf31388df070ae6dcb70a412f33e5","tests/expectations/tag/va_list.c":"7291161e6f66f168ce9fb4847f23fb2f64b31673989c08f8a2d3e17f6a2932ae","tests/expectations/tag/va_list.compat.c":"113022c8ecac199d198670b2015c1524fb4d39b956cfb590e3661c4c54893442","tests/expectations/tag/workspace.c":"ed26bcdb8568eb62f2cc09e6112cc012165e6faa2b52c283b8c28dfcf560cd23","tests/expectations/tag/workspace.compat.c":"f842aaeb2648812733f436d312038bab8c875534171efa5c82a88b87253968c0","tests/expectations/transform-op.c":"0e04ee53d50c1db604a2c6030e5183a5a76f1856387244c6be0842a5b355ceac","tests/expectations/transform-op.compat.c":"ed8ba3544342992d64ff6f4f5a7b76ef9c90861a8898524755b1bda70c01066b","tests/expectations/transform-op.cpp":"63446b46079c175bf99f2d475e360fd0d4e4f5ce2556fdf03b4331441494a47a","tests/expectations/transparent.c":"031e1800e40b6bd59b649a05b303df6fdb57255e7e7190c39c511a7b27a7bfdf","tests/expectations/transparent.compat.c":"685184af63abd732b4ca35d59d5de8a56150241f372c07204237c8b364379fdf","tests/expectations/transparent.cpp":"0a002cc3f56b248491e9780fb6986e03188a2360649bd46745078524b886b6fc","tests/expectations/typedef.c":"e83d84aa0bfc55d54f16fb98cdd17e07258f129fbebf5523aee55ebced1d4b02","tests/expectations/typedef.compat.c":"32fd05db2b98796097ca252436bccb8270474ca61de4d007d5248697da092443","tests/expectations/typedef.cpp":"e208f1a81abee51bff3ed49f62f814c630e2303c61fcec26ee013516003858d6","tests/expectations/union.c":"966eac07c65ea6a6b5c22e90e55d06d931ae539662f862de3ba8be7039c04ad3","tests/expectations/union.compat.c":"0a7acc07e93f11677b2d6db5527bdff0bdb0cfa2dbd7a1e0190b3958143e50d3","tests/expectations/union.cpp":"848e43bd7086bd94c136f347fe2209adbad074527d2c9d07dc26d0ee0bbfa177","tests/expectations/union_self.c":"e51ee5773a115e0dc23e4706a07be90dc606d8ceda653aa01f8950f83b67c8b1","tests/expectations/union_self.compat.c":"963d78273f7e213f0223153b87c73d348c1a234df0b7fb215d8b239b4db6501e","tests/expectations/union_self.cpp":"7ff87eb2163420bc3d7deca616b96a53225bea94d30b24d955ebf0240b773dae","tests/expectations/using_namespaces.c":"fb2d6c8baed0b32ac1c5e69864e57f73f0a5c2ab8a6b37a5e763352ae43fddeb","tests/expectations/using_namespaces.compat.c":"417a45ea1ff78f2eac7f84c617d72377117cf31388df070ae6dcb70a412f33e5","tests/expectations/using_namespaces.cpp":"033d493d0d18d4f21abd489ba9618d49bfb0f7049f26ab5963f388c52f39467c","tests/expectations/va_list.c":"7291161e6f66f168ce9fb4847f23fb2f64b31673989c08f8a2d3e17f6a2932ae","tests/expectations/va_list.compat.c":"113022c8ecac199d198670b2015c1524fb4d39b956cfb590e3661c4c54893442","tests/expectations/va_list.cpp":"56eb078c75de4615661419145ca5cee17b7f08de361585d3481570d222430876","tests/expectations/workspace.c":"f0b6aa5ec14968a880ffbf21662f901aa3955c46c401d87e872dd283ba504069","tests/expectations/workspace.compat.c":"6f040c52cb58257efb5c43098e413e751395aadd69b320ab9155da3c3cbc5000","tests/expectations/workspace.cpp":"d2703ae98a39d188e95fe0f1dcf6b6220063d6349dda07673f990efdc3e85b86","tests/rust/alias.rs":"cfa45dce533ac0669cb5f8a5facd80b1308e5b38af26082361ca1fad683dfb01","tests/rust/annotation.rs":"2ec88922528b315bda1515e9167b5f771ac958b8e16db487b1427f6b4576283d","tests/rust/array.rs":"f3f321ecbb21331abec66eb8da2200550bee1a116e4a5c1389c4404114388e67","tests/rust/array.toml":"7935a7d9b5fabba3f500058ce7b3c0cd79449283e6a353a3d1658e55709500ee","tests/rust/asserted-cast.rs":"5207c37aae5b929bf28195c619fcc23f6887be6d763205b201c1411d1f58d321","tests/rust/asserted-cast.toml":"49d996a324f26d749e4e9a03a2ef1e30421e6716b652d24e6bb3fb753b00139b","tests/rust/assoc_const_conflict.rs":"dd5bce15a9b1198f06b06c7ddfa9244ee69e102baf487608db0521cec65de2b4","tests/rust/assoc_constant.rs":"3fd9391aeb6610ffb03e1cba5725dbd581a30071c7d5440c8f97845cdb3c8534","tests/rust/associated_constant_panic.rs":"761b5d70dc78a3b08713e8ec804022ee9e81284e8e968c2e7921f911f926c0a0","tests/rust/associated_in_body.rs":"c8a8d68abb265d6964e08106eda8ad83c984852a1ded4e8648d0e01fd46915b6","tests/rust/associated_in_body.toml":"b597b722b4ce0071d47a6220237838794c77b1ad5f22aa9e33b7a56e6f7f1ab1","tests/rust/bitflags.rs":"38e4079c25d22de34ed8ab963efde23c95a49279dc32a806194496f63946f8cf","tests/rust/bitflags.toml":"fca6c9a046bd44a2d9d34c64843265a84218f493f43e845f1be7965e56b318cd","tests/rust/body.rs":"986d2f7b8d9b4c4b76374c31bd7924d842249f9273dd15596fa00088ade2d86e","tests/rust/body.toml":"936bc2edcb514f6bdc61772edf4300395e8eaeaa6a6eba7e43180468daed1145","tests/rust/box.rs":"03434d85fab066ed38fa39c372bd3be89af96913021c0190770da5f961e48bf8","tests/rust/box.toml":"0e639e4d04c9f8a6046bfe672d73207a8ecfca7964473208e83e8008e7fb5a58","tests/rust/cdecl.rs":"49d928c33231e9df3c0232aa913defd771c16c540617bda8c238cf8497436f16","tests/rust/cell.rs":"455a5ab03499d3bfc4c1f6662a29bcde0dcc8b09aac0058ab3a142192c87a9ae","tests/rust/cfg-2.rs":"16c59cd70008418750bcfca47c14a87a348b34c81fccc06115b68b0933b8dc64","tests/rust/cfg-2.toml":"1beaac0914c79d7c9132e83a21e9d5bdc87639c3bf787275bc9f9f55ceb6860e","tests/rust/cfg-field.rs":"904aec8f65fc8ff7a33ec9aa474891e87770de411ed1603c1cf3f5e14c0703f9","tests/rust/cfg.rs":"e59736377a03e542c35241ea832a4da22fae371614b1fe807d72dd5c822a6434","tests/rust/cfg.toml":"d6cba5977206949d69d6cddd1d6fa96cf1312beb3573e5d1049db482e90eb27c","tests/rust/char.rs":"8d266ad0518c6d864ad117f438963b51995fbe1825e415c35abd1c305b626364","tests/rust/const_conflict.rs":"6027453be28b17c20eebb6ea450b91b1e781b41fca08b97725b0eb7393120b47","tests/rust/const_transparent.rs":"7b3b029268345c373b4cd341c0be1bf6fc61d0ba9752f1f298e873f0b2638a71","tests/rust/constant.rs":"73eb998b1de5c6b48b73981e47b87e40a86bea6766d5ab31aa2f3f54d1e86071","tests/rust/constant_big.rs":"ef57342d59c7252cbfb5668689b82f44a9905d111cf5495dba655c2497edfa15","tests/rust/constant_constexpr.rs":"d5a974e8a2309975e069a59e8621d898aab8d52da8aa0d776d9571764508c99c","tests/rust/constant_constexpr.toml":"d2bc5b227f10948a978f3ee4e4ad89988495dae469219d27361e1bb08205ed69","tests/rust/constant_sort_name.rs":"b0fc655ea110af97dc80266dea84aaca098fb03224caa818c0adadcd48061b7d","tests/rust/constant_sort_name.toml":"739bdfbc7a1edaf7173011220ad822d8929ceed0985cc68700a478ae9f5caa26","tests/rust/constant_sort_none.rs":"b0fc655ea110af97dc80266dea84aaca098fb03224caa818c0adadcd48061b7d","tests/rust/constant_user_defined_type.rs":"49911c1eb1b69771a020a705fa6ea538d2a1e26d1181a8fd6c1cfc11e16affd2","tests/rust/custom_header.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/custom_header.toml":"11971be2d866b6e69225c69bc7d12c8c168bffe341b47b1c6bec5d9f0cf70879","tests/rust/derive_ostream.rs":"d815d16ba4913a40e4893fcf16193ff90abf352556191eb98d91ecb356ff0fc7","tests/rust/destructor-and-copy-ctor.rs":"8eb882982e9eb3d08a1157c89ae6962a55624f3e5ebf878757aa9f31a9eaedaf","tests/rust/destructor-and-copy-ctor.toml":"b1e73400004d05354122f6aa57352eee27c3f543c08f5b689802e47dca5d6a2b","tests/rust/display_list.rs":"b4c8388b49c0d62ecc2ea3b2b43474b7ef672e196cb9c456f9f0dd317cc315a2","tests/rust/docstyle_auto.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_auto.toml":"1609736841750b13dffd4ccd31820b5212913c19cc2767bca90672825a055614","tests/rust/docstyle_c99.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_c99.toml":"434839317738bc8ec8bb7b71cd3286b1cc473854929daebff35bd8748b056fa8","tests/rust/docstyle_doxy.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_doxy.toml":"041f3902d904ca4756bc35352b1885781b67314a5a35f4c894bfc4aa3e0185e1","tests/rust/documentation.rs":"3c3451092feeb8f6283a968a7cbfcdbba23a6004327761e0fe8d4073a3ba19de","tests/rust/documentation_attr.rs":"7df25a9c3e7fd97cc916c324536d30816132c927c325b8623e24321806d879cf","tests/rust/enum.rs":"287c6da1a29a4d62dd8565937b2ba9941ac1374f58087ace4f7dd94f48f024c8","tests/rust/enum.toml":"02ca4418db52f9a69cecd8f298c79104ca5a8afde972df29b5ffd1d101b8b957","tests/rust/enum_self.rs":"07523f250ad30b00cdea0325e55b93e066090a42f2d37cf07d185a81385ac3d4","tests/rust/euclid.rs":"d93d138d31e1cd90ffaec25d44feb2305dc702f45db04733b1ea79c0f164fea2","tests/rust/exclude_generic_monomorph.rs":"4b6299729923ae1e36e4ee3ecf766cc2825b46a25d0ed2033641cffb7c3b35ad","tests/rust/exclude_generic_monomorph.toml":"42e87b6d8c08424e6ab6b13041f0da6e8ff1bfa54c7a87de75ded2cf532ca913","tests/rust/export_name.rs":"bb35cd7d9ab197774684aec596560859315ded1bb29ed161907960423d838ba3","tests/rust/extern-2.rs":"6299ea10095ef94e3285844029c067349f07fa78c6d891b3e7402f85db36bcf0","tests/rust/extern.rs":"fb8c0e2b06186b4fbcce4f059289bc9c775ea42d3e36f935d407a2882f32c9d7","tests/rust/fns.rs":"7c8da1440a30830b395bac08d50a0a41c91f01be00b57b8821b6e40159d5d487","tests/rust/function_args.rs":"81ecd18c5919a3508f3bb6f04aecf4f91ed9db27da6d4b54a17fbe1d9b626643","tests/rust/function_noreturn.rs":"a73613002a639aed7133e417de53b4aaa662da5be4e98ef6d975dacf299d5e02","tests/rust/function_noreturn.toml":"3e0549ffddce990d0fe3e3860bff8f2e39434658578505105afdc6b37d1133b3","tests/rust/function_sort_name.rs":"a816564c64059e90587172feabe824726eb58050729f43237603bcb5dbf3694f","tests/rust/function_sort_name.toml":"1dcd75d52b46fc43de0e5c7b3dc300338c68e8ac0becb5b375821820c43a369a","tests/rust/function_sort_none.rs":"a816564c64059e90587172feabe824726eb58050729f43237603bcb5dbf3694f","tests/rust/generic-pointer.rs":"620d093fb1606a81d1afff60d1359bf76461214382b968e951dc12d1070af5be","tests/rust/global_attr.rs":"279e4ce58c67101d8d03f002a918bc89fd4b819a44b43a9e1259fa6529d02692","tests/rust/global_variable.rs":"0d4f12d6b688bfc5a9e134d94bd5391213bc24793aca59b5f9f3f3a8e4b9c7d8","tests/rust/ignore.rs":"abe57db0bc568385ba20e379a30f928d8c5a3f851b8910fa15d05ccacd1c3a74","tests/rust/include.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/rust/include.toml":"0c0530f9ae070027bfb23f539458782938401d028ea1b7b457dadc6b9eb0ee19","tests/rust/include_guard.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/include_guard.toml":"4f92729aeec3544b88bee8854e9b608c3fe5cf523eedee86bfd818a657d6ef9c","tests/rust/include_item.rs":"b59b9e35174bf2156e7d4d3d686b0fb6eb3976abd1e5c270693e3987b8ff9e4e","tests/rust/include_item.toml":"a8a25d0f3949303c1b2ac75ab142bd2a3418d54e335008f64ffe0c08a4f8fce2","tests/rust/include_specific.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/rust/include_specific.toml":"579522a1f980d6a2b950d2cb0abe527c2c87b7d8147946ccacec0eadc6a7b2c7","tests/rust/inner_mod.rs":"84d975ad14c8057f7cfc21d2a0dffdde043fef5e97e50bfb76abec61af617271","tests/rust/item_types.rs":"507a1de52bc29698edac28f08b0cec008604579689b9ef3cd832eb56ee359482","tests/rust/item_types.toml":"92ff09b39cb560124161667fa469e58bb5b369aef7b59e7668a84c8b7986c09f","tests/rust/item_types_renamed.rs":"507a1de52bc29698edac28f08b0cec008604579689b9ef3cd832eb56ee359482","tests/rust/item_types_renamed.toml":"68ff8b74b6dda04323ce09fe90260a5b6f203c9e7a75d77e021ffc973447a1cb","tests/rust/layout.rs":"79cc422e9976fdbe44272a185d0e233f96fd15e86af092a0dc9ded5517e9178e","tests/rust/layout.toml":"b4fb6c69305f20776a22f40a3d2368280fd908426ad68572ab59a0ef0711974d","tests/rust/layout_aligned_opaque.rs":"2b4af2cf9a2308a1b0407f389e680f5a3a5b81cc7121d4164aaf6c10de8b5315","tests/rust/layout_aligned_opaque.toml":"2ea5eb9208f53a0246f458fffe093d0a557ea5bac8a3910bf80efbdb56fbaf1e","tests/rust/layout_packed_opaque.rs":"fdb022462224bf6679111ed2dc4b294352d235a3ccb53a21cecc0418624370f0","tests/rust/layout_packed_opaque.toml":"b2f2d4cb9061267ded116cdd461a7ae2d3f156f99d007ad8d137f60588a19c84","tests/rust/lifetime_arg.rs":"72894d3a7f6bb4dc2176ca5d18e660fa4d70449243d69651921cfd41a89bb4a9","tests/rust/linestyle_cr.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_cr.toml":"24724f1514e7f79178fbebe757fa24f84ba1b996cb37e1d4de35394a2eee88e9","tests/rust/linestyle_crlf.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_crlf.toml":"a315db1b1b4fcb6b5de44b8cd88f560161a99c166ec38470f9a7c7c0a9b0f02a","tests/rust/linestyle_lf.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_lf.toml":"9ac0b95d322c535fd3d13cca88e1a41c07f76bb82c073a6c201702085cfe136e","tests/rust/mangle.rs":"d7079cf6c93304424952c0f1d3633585b13a3a4b9ee42aa6cc924935bc8f1030","tests/rust/mangle.toml":"9251c18d50b2c1f57afc70979f70cf54fa4d96b2b8abc3b7bf02ec1e74846875","tests/rust/manuallydrop.rs":"c6262ebd269697737c3e169db8344dd58bd51c049fe3a0ac65d3dfb25a8fbbf7","tests/rust/manuallydrop.toml":"1d1f8f183018369ef5aa9bfab2b4a5ca9d8bff1e407f2e618d550f4bec74595e","tests/rust/maybeuninit.rs":"fde78e4074fe0eb6ed75f1416b5fbeafe5931c4df3edcd1e51c31e4f38a5c517","tests/rust/maybeuninit.toml":"a7815239f5aca0a9a504c1558641ebf1303c138691b524a2b2590892db8b9d04","tests/rust/monomorph-1.rs":"4daa3c42f7a1bf0bb7dd6ed605f554db4dc6f8dbfcff999939e218195563f1f2","tests/rust/monomorph-2.rs":"eab2dc18f375594f16e00b401c9c8f4f98c770d61807c3323080ec811bcc0230","tests/rust/monomorph-3.rs":"e1a03e6f9c37a64183adc89ba978bccead47deab61e563f02a1a66520782154e","tests/rust/must-use.rs":"fa6d2c1474f4dc07b5b2defc463ff0976e9ca25eb93b691745174fe1fbde11b2","tests/rust/must-use.toml":"4c4c13940de3a610e25d319682ed53a10c26a0450f3ccf14b90e730d701822b5","tests/rust/namespace_constant.rs":"d280b65bdcf529b456570a01f0306b4e9ffc0aa22200fd8b54e9e5433f6c5ab2","tests/rust/namespace_constant.toml":"493e814e3ade6f1fc4d34140c73d0ecdf00f1e4864f7719516d799eecc9eb2dd","tests/rust/namespaces_constant.rs":"d280b65bdcf529b456570a01f0306b4e9ffc0aa22200fd8b54e9e5433f6c5ab2","tests/rust/namespaces_constant.toml":"6b5a58b167b9890c186ad92c9f9164b9f3204a86d706a7be688d51f8a666e9de","tests/rust/nested_import.rs":"35a8343efe9117b3ca460b2d8e9a4a0813d58f622ab776cbe18527814d7105c5","tests/rust/no_includes.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/no_includes.toml":"504215785a725906418431f044ff10cd2ea2db7261ff990a3f278dae17c05e58","tests/rust/nonnull.rs":"dda4baa922a142eb7ef283a5fb672fed6492552adbcc82106e78d482a8abc39b","tests/rust/nonnull_attribute.rs":"9479791492ee3c9e0838e3b7d207ff3338d0c7867ea9f5f7d42c4224cf1f515d","tests/rust/nonnull_attribute.toml":"d41f84191d8e843f2d87facc3e4aea13b2d4a02099e3e1fa9b583c4d1b855c91","tests/rust/opaque.rs":"d22d57adccab8cecb28d4573a42de30e76bb32e836843012b720a4828c35b227","tests/rust/opaque.toml":"9e417455556e6056f538af97577156c74971d2463f80501368c2e7e65c5dd918","tests/rust/pragma_once.skip_warning_as_error.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/pragma_once.skip_warning_as_error.toml":"bf1d35fcffe74f6689f53712cf7e079693f0a92c6e77403b5f9a5b0fcb0cb96c","tests/rust/prefix.rs":"040e7ed37285bde96feba37da3b8d1c42b65b7dff09762b60aad8f9a4f0cb34b","tests/rust/prefix.toml":"c6ab6c4cd09d12cbb04ace74dacb51ca5c89b6f0d77f2d95e918f22a9f27c0e3","tests/rust/prefixed_struct_literal.rs":"ce1843b02706788c31f8fb5889674ecc17f7940254cdf1e37ca47846b18e56d8","tests/rust/prefixed_struct_literal.toml":"d74eb710eb1f3bd05a723e54a6897170491ba0ae9bcf26acd1a3fe00e3a4ec14","tests/rust/prefixed_struct_literal_deep.rs":"fdee21e3739e9cf93ce1886d20e83db7597f3bb0d0c60c0fa5cab0e3b8beb1e6","tests/rust/prefixed_struct_literal_deep.toml":"d74eb710eb1f3bd05a723e54a6897170491ba0ae9bcf26acd1a3fe00e3a4ec14","tests/rust/ptrs_as_arrays.rs":"264ddc525e4286ec480caa1e011c3edc846eff16d2cb5f061295be55a86a3844","tests/rust/raw_lines.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/raw_lines.toml":"18d6b74ac6571b81a58c8a36e9e23c594537cbb63e79df73ffffb54da39ee87f","tests/rust/rename.rs":"9a310fa1c402c996047927342a94bd50f36697d124cb3214f91de31bb7fc31c1","tests/rust/rename.toml":"42523c11649292309fb8a226e2153768c5e44af1cf586d53fdd44a64bf59be40","tests/rust/renaming-overrides-prefixing.rs":"f1fcaf9d1f7a11f749e819524d73171986f76543204dbe8e5781097b1df6de4e","tests/rust/renaming-overrides-prefixing.toml":"ce65e3488f3e8c1ab5a4b6a191f1555b83156619bf332286d40005be260cad33","tests/rust/reserved.rs":"5a802dd88ef94f129d93a895ed1e81531100e8cf82d8fc5a9aa55afcd50e3458","tests/rust/sentinel.rs":"a982a4067401d8257f0d45d7832895eec5c8a352ff8fca5fc49a4149599d89bd","tests/rust/sentinel.toml":"93812028777748e46ee6b023b3f41864718862d47a862a92c0073b84e03f22f3","tests/rust/simplify-option-ptr.rs":"cf2bd798f4be8ea895e9c094b3422bd9dc6331bf2980831fc48433bf2b4f119e","tests/rust/static.rs":"2241389aaf3d3cf4db7dcc16071b2a2abab28669b11ba4f2a66fa85339688fda","tests/rust/std_lib.rs":"c1c8f383f01608f7f7c6a104fe470c8afd25be0ceb2194a702905fe9aa82d74d","tests/rust/struct.rs":"0b43021c98dbe0822a71d4300bb48efa9ba7e7d50d8816d3d38c866783e62099","tests/rust/struct_literal.rs":"d459e815498b0457f1d5bdb9ecec1a375985e2d57442ddfa29d5335e4cf8ff23","tests/rust/struct_literal_order.rs":"b3b4ee077bf7362a8b1af37ae5dba8bfa3c0d13a25e6f49a201eb857c1024c68","tests/rust/struct_self.rs":"7f0ca8785ff6d25be86af271229a42958d6308efe1da71421b5e505a3626c267","tests/rust/style-crash.rs":"8c4c716638c58260ecced5a58bfb035f6e42375a2d221028c2fe0d99203e6b44","tests/rust/swift_name.rs":"857554db62a18547b498198156025ced72d8f5e40224767e52f342a7068d1b3d","tests/rust/swift_name.toml":"1542a5b0409fa024ec7c81190887633dedb186c14d37b053c25f0609fd99b381","tests/rust/transform-op.rs":"103e3ccf7f34077ff2e61107242fd957cf0c59ba659537b12facee18b22d08af","tests/rust/transform-op.toml":"6129b6b8ea9a289eb64ecb5123929ed31d09f1374dc59341e1fa6d22842e55df","tests/rust/transparent.rs":"42e2adeea38fb1418a011ac6dd8fbd97958f8a91bf6c6faebb687dab468fd3e2","tests/rust/typedef.rs":"8e2c8c9dd0014040187fbc656a1a7921e4faabb7c10ba00f7d68fdbe05c1219d","tests/rust/union.rs":"4e697db4b97ef737c06f9997f341505b306abcb6145a6b767b8203f72ceeaff9","tests/rust/union_self.rs":"bec8ef669782564e9710598816aa7266e2ab33321b9c2f7c7b4fe8c683386afe","tests/rust/using_namespaces.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/using_namespaces.toml":"2f96d6173b28f152bfdc8b8692972eab1d549d340283607b6f5ee13a02242335","tests/rust/va_list.rs":"bbb1189a4b35cd3cd1bfb15a0a20b123b6f4e5d998e91f825d76a935cb6641fa","tests/testing-helpers.h":"78e624dfd94adf25fc2bfc69be5ea18dfffa049f146345e7881350e77fb9be7d","tests/tests.rs":"513edcfb2a46c8c54919bcb0777b897e328d788c1d953a047cb186470531d53a"},"package":"1df6a11bba1d7cab86c166cecf4cf8acd7d02b7b65924d81b33d27197f22ee35"}
\ No newline at end of file
+{"files":{"CHANGES":"f8d3acf2b48ee4db0d02167231cd6022fc486777aad77c37c8efa58b2571ff86","Cargo.lock":"a0891f2a953dae44a8cc6965e383b37265cba434ad0b4d185299cf5a22795544","Cargo.toml":"1829f76b287b9289e6b1905ccb1d1b67c65794813bcc38cac420ce8e173f18e0","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"b0d447c467d903c594241afc3fcadece95fb7c1014e9df4a9e8e6f2ccced7e4a","build.rs":"8eb7cef3e6d0d5a56e94803931705fdcc37ee8b631e4eed9a9e026516c52499c","contributing.md":"ff1e11d5460b698412ada7c60d429e5c876ab0ab500a6a1eef2ae040ddf84c9f","docs.md":"d136191fcd7016e6f825f94bdea85cc271dbc20535ba24af1d2654b971927825","internals.md":"62721f9a63729769c947ddb8270df3445f148fcba545e1152bc4f545cc32398b","src/bindgen/bindings.rs":"c2d0183d85cd2eb5647c6e8da3013d02f7227d3007e2594fb4f730b8603dfdec","src/bindgen/bitflags.rs":"c52cb0d7fd0ac96be24a6f37ea49698450d918d5acddbce29e350f485f3cdf61","src/bindgen/builder.rs":"1721aebc290627b3a72a936c2be18e29261fd88c0beb32bdaf177c12ce982b73","src/bindgen/cargo/cargo.rs":"1e0ff7845d9ada9145c1c7decb123236251019d74c9665d8990e11f0bbd71662","src/bindgen/cargo/cargo_expand.rs":"64c077e80645af4f14bd98eafa5d8ba08402edd840656c4e34502390a0d49b97","src/bindgen/cargo/cargo_lock.rs":"0426ce5ed7ed2a4c76ea119f9f9bb841c9a55ceb3554e93c3e0909b68c04bb82","src/bindgen/cargo/cargo_metadata.rs":"d2cecb9c532bf9de2db23603f9ba4ede8dedf2dc4958018ae502908d4a7a2f4a","src/bindgen/cargo/cargo_toml.rs":"a28f4cc8b9c938ec7fe99b1f235795e191e0baa1961299cb6c1155c7bbdbdfa0","src/bindgen/cargo/mod.rs":"a938c1070207d9d13304b1fe2f19680d2a409337fad1fad3770c676a6cc74373","src/bindgen/cdecl.rs":"2760466a07b7b8f622e45b1fdeb02c9da7a925ca892cce03472bda080b015b04","src/bindgen/config.rs":"c2f3c79f4f5e2c65da1375e8907bab5598a14f6256c2e63225dcd23fc9f88873","src/bindgen/declarationtyperesolver.rs":"1c4f1851c23fe833ad3d9edd0c497b162a5e892fc426b2fd7a1d86d542f6ef7b","src/bindgen/dependencies.rs":"56809b651344fcf3a351e486fa6027c6b75a6a9b460eeb749e7c17d3e5761818","src/bindgen/error.rs":"9ba4d9f8c331c738c124f3369a0ed3c86cdd83c7eb3221ed8417f4f42eae5cbe","src/bindgen/ir/annotation.rs":"5de64cf42a7f3573c72cac14c5de49be05b0fe34bf4e8005eb61d402a199f74f","src/bindgen/ir/cfg.rs":"9644cb1c197aaf847b0c8c504cc6e3e8294e8f2669f6a5b6bac7dda14c7d6d84","src/bindgen/ir/constant.rs":"0bd07f551186bbe5c2f00f8f945e82b337cb013487baecd1ae6958a7556ebde8","src/bindgen/ir/documentation.rs":"00314e5d0f2a26d563f56012434b80dafc0f345c225eba068b9c4b0ce79ac626","src/bindgen/ir/enumeration.rs":"cc3637a22c15aa6afb4262d3acac4107fb6dd12e2efc8d0b2872ff829d805708","src/bindgen/ir/field.rs":"ec3e71699a2152808b43cf7bb98e773308a0e84044a33b9ef9eb69b7db0fbd07","src/bindgen/ir/function.rs":"5c957dda85d34924cf88b16c81e88f58378a42ddff7fa7b217e8d5d8abe89711","src/bindgen/ir/generic_path.rs":"59bb58f2752342393321bb13d84ecc553504effdf6d016cecc9a90dff683ffd9","src/bindgen/ir/global.rs":"40a3d61154db025e1ec4044c574d3f6833210bce69ec9f2dd60a0363f6801b0a","src/bindgen/ir/item.rs":"56cee90eb7c42b555bc260e52f0aa44943eff056946e3d39054075f235ff3b8d","src/bindgen/ir/mod.rs":"67ae2b67ef6fafee72f68f38bf874b05a6816d60d8c63211abf802414459be5b","src/bindgen/ir/opaque.rs":"b010886d066620a2edb9325be702e86b5978115e4dfc8e6e529b9add9143f3db","src/bindgen/ir/path.rs":"a107230f403b7c139ea722e8c20156d12c609e141a6f279e19d5c5a0280d08af","src/bindgen/ir/repr.rs":"4d2218147a74a1ec0a85fe9d407291121928d53fc9b99b4bd30462d8f18bda96","src/bindgen/ir/structure.rs":"db671247318e08e35708121250b38bd16cc88919acd83ddb0a6d74fae05fc57e","src/bindgen/ir/ty.rs":"59ebda9eb36bb55891a54a593809fb7c15df0a3cdbc17764e92578768234e58a","src/bindgen/ir/typedef.rs":"e311d71f943d0280683ee64815414a348ecaa81e0cea507a5cb364648be03df3","src/bindgen/ir/union.rs":"806d7c23b80fc45b19bd45b8856814d5a19a46323b503e53a0eb2c094d55bce5","src/bindgen/library.rs":"773f5042bfbb974edeec48cb6f001ee91d4d2392f465c3e85a6374adf8ecbbf1","src/bindgen/mangle.rs":"207d3264824ac0d056b992a58713f6c59af17ab792bb82bb04e01a44ef51d96b","src/bindgen/mod.rs":"40c7ea333a83de98e420e39dc86d4067dccf82d5ac0ccbdad3da9a2ed63e3c3a","src/bindgen/monomorph.rs":"e7b77766cecd29363db107c91fff03e034ad5217c88e597757ea3e50358468eb","src/bindgen/parser.rs":"bbcbc81538fc2c6b5cc1235c57b361d8cf526be08358d65ac66a40b8e3319e6a","src/bindgen/rename.rs":"15b405f24f8abbccc9be0b84d4626c7b78fc84da69ee00472831de4b011d0e88","src/bindgen/reserved.rs":"7024f1cc80f787d768151bac15ed4e6f1b55fcb64c699e3a05b398ed9acbe4ea","src/bindgen/utilities.rs":"3adc4e72c8ab193e9dee5a8853e795b9deef8d3f0d6b736baa316afcb26f8c7a","src/bindgen/writer.rs":"7a23e81458732c6c717af332626084165b42d97fbe93af93d2f136f0f178d5a7","src/lib.rs":"0c313bbe7f3bef625b2d2b345ec188e16db34c4222fc3e230b12b5863838b4a4","src/logging.rs":"61a51d7c22d4c34c3ec058e15ea45b9c5519addcf3e6841a56cd56e599b5cf1b","src/main.rs":"3e24290272a201ebfd9fc0fb88524436cb2af2e2edbc33f75a1234e4fdbb52a5","template.toml":"43f1a9f3a3977de73a0193d45ebd778a815bb0d5aa8716ac5948b70f1b0281d6","tests/expectations/alias.both.c":"612bfc7278636a7c9c94d64406b528b492ee83e49a82411ed0c30630f9f34029","tests/expectations/alias.both.compat.c":"5f22c9d89182bffcbfed3662d5fbff9877049b045dfb8e6b81e6f5c01f974980","tests/expectations/alias.c":"cf3c496e8e65c6ab14469a38420f9afd147160d432e6a2ed11c716c908b2cb5f","tests/expectations/alias.compat.c":"a56deac9f43efb1f68aed20f6b436687289f9037e2a21810669f640a7f8b6e12","tests/expectations/alias.cpp":"259c612fc5149b0e3ae7a353eff451413b54c4d912e69567d32849cd26697eb7","tests/expectations/alias.pyx":"f65869ad2181650669f3c8c3445e5bdf0de6313a5b53d8982fb9cdcf08e9f8f2","tests/expectations/alias.tag.c":"73136d2f5b0b948d12a87935ada9d64f2ba9f03f40f6daffd692a3062d93b6c4","tests/expectations/alias.tag.compat.c":"1291aa2a7a7e68f16c17cbf2e0dbdae5b09670d6f436841f2246c5f0c8bdf76f","tests/expectations/alias.tag.pyx":"6b648bd4bde9cefb8441bcb9f28b9769cb4a5299d8caac49180ffcc276ff5ec3","tests/expectations/annotation.both.c":"0a54b323f9c40a345f535d79c89d245259443d5afe72e16165e3996f33588b70","tests/expectations/annotation.both.compat.c":"c15c9aee10d474ac8f998c4e0914f6f0c13526b3aaf6837de16b2e193a336c0f","tests/expectations/annotation.c":"3edc90fd9773ff57b0a6a39edbc8eb5ed594a0b080d89ce1a20dcb7a5ebfcfcc","tests/expectations/annotation.compat.c":"1bbcfa9ccbe11adaaceb63e3118b2186931967361e25e5b5895ec71fe6634823","tests/expectations/annotation.cpp":"4781e0146707823823c39bb16f167cfba0e2120c6e76869a2e0f89cb1700ad66","tests/expectations/annotation.pyx":"63988606b209b0fade197c971cc08d49afb4732bc44f0ba3f4f43b7b107f2c04","tests/expectations/annotation.tag.c":"55408b8b93b950b6e174abd940d011d2ed927ef8350b3dc456c48d0b7fdfce0d","tests/expectations/annotation.tag.compat.c":"3af0b1343b9148330f0226c6caec2961449df5702e66801853c6129d9cc5c7a1","tests/expectations/annotation.tag.pyx":"7b628664d1b89f080c09e9112752b57527362cee3257b3ad810cf23f61934ba4","tests/expectations/array.both.c":"51200233fe3a252492a9d96c069bbcbd3e89ed8a1b180d3d3b6d1af3f41126b1","tests/expectations/array.both.compat.c":"beedb600de83fe8688a10c1521ff7fdd61566114de723fb02f0a83f9aa0dab46","tests/expectations/array.c":"954225a346d838028d5b2d7c68f7b3c35f44d763341f3f425e04236426f9a209","tests/expectations/array.compat.c":"2c4940d3194c3813ac46d246d201d791dcec0865908e2921d77525a37610af75","tests/expectations/array.cpp":"37152d5dbf71e280afdbbcff347ee7e53cc1eb426f1f0dbf94520f72b1695b1e","tests/expectations/array.pyx":"68c523e03f09764d120f2044f1cfb35a48a52be49746153f8e819cff4fa74167","tests/expectations/array.tag.c":"957cdc7253d9524b5f1527e2d3b6120f706f9b390b6e6dc37f46d4e7ee766ac1","tests/expectations/array.tag.compat.c":"725bf3feca7a14fe77cfea5b18991179459ec4e2e57e7957a09eb93cf7ce15bf","tests/expectations/array.tag.pyx":"dbfcbdeb3e580a13e8c85235876b176ce9324599cc69f399cbca5f1090225c47","tests/expectations/asserted_cast.both.c":"e7be7cccbbc4c6bed203e16def79792ec212d28f93a6178fcca8bd5e5608aa93","tests/expectations/asserted_cast.both.compat.c":"9e49646e982dcd65464536634553c02a8c11a486198b346de14004d265fa55fa","tests/expectations/asserted_cast.c":"acf929fa2bc9be077666de04f4d10fc0d4224749a7a092021c5e8046711c71c7","tests/expectations/asserted_cast.compat.c":"4c2ec364d80064ae887913bb2bb27e47857ab8b332c3042a4d585737952af623","tests/expectations/asserted_cast.cpp":"b4df513687321770538b9da13674d7f9a6249bdf91ec61049d756d40c84d967d","tests/expectations/asserted_cast.pyx":"d33516a661934e392f050f3c6cc7d9f5d9d383f23721e7b406a9639e61ad1bc4","tests/expectations/asserted_cast.tag.c":"15b0b83adea966408e574421171bbbbf9cf85b7605e3e0e240af41f2bfab2ca9","tests/expectations/asserted_cast.tag.compat.c":"7e8f488d0613133a3fbae959cfd7c1d3a018ab8d762923aa073dc21ff8ab7b74","tests/expectations/asserted_cast.tag.pyx":"2151a982d03f45bce2581c832234fdc3ad4a361167c175b07cb0714d3b566cf1","tests/expectations/assoc_const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/assoc_const_conflict.cpp":"29e82a9f7b478bb95a947ce6059fd0b9d76b4288d43b726c33520f70d67ace49","tests/expectations/assoc_const_conflict.pyx":"84d5b4e58002f6062acce657f6a065f6782f4cab35e12f537ce44e82c84333e7","tests/expectations/assoc_constant.both.c":"7331702e91f98099690443a149bda315eb2ff4e49371351593fdd559458e75f9","tests/expectations/assoc_constant.both.compat.c":"81ebecdf6d838244b3464a8d9c1b4ed6caeb7ab43c17170e5faff006d60e2fcc","tests/expectations/assoc_constant.c":"bc24ec8a76c6bbecdb42593051ec1c87286ed5afe6ae5207dd978191b506f8d6","tests/expectations/assoc_constant.compat.c":"d7c4e031ccdb61b2ff04c99a755ffdcb9fb090c7a976c1739596a30852f85340","tests/expectations/assoc_constant.cpp":"7ac49cbf146a09881b33677db8a8db3de6bec3e3e79d69c10bb7e268212e25ba","tests/expectations/assoc_constant.pyx":"8bd9db9c6bfa3e007105de578edfc2dc236f61d6c290cc460a447aad2f4454cc","tests/expectations/assoc_constant.tag.c":"7a2669d2332623ef8e9bd605203f09dabe905c568f5f0162153e2e77ec7ae6fd","tests/expectations/assoc_constant.tag.compat.c":"d71d82758c132208ba453e876cc6e2e7f5afb1b537fbe588dab6cdce62a8ac9c","tests/expectations/assoc_constant.tag.pyx":"641a6a40d67f91dd4ce9a6f14b6f39e925e343dd2e3b3c6dd15ffa7da457022e","tests/expectations/associated_constant_panic.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/associated_constant_panic.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/associated_constant_panic.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/associated_in_body.both.c":"17f2ef9e2647a4868b500ec4a5ab9c3c525d01b2f8482862653762c89a5733f9","tests/expectations/associated_in_body.both.compat.c":"44e13771e781b13395fde786bc9fd9baec75ab3ba7b4f66d4bb27715e1aed0f1","tests/expectations/associated_in_body.c":"884de8df7cbfaaff41ff953b441cbd267598956a18906202c3a239c49aa6ffe3","tests/expectations/associated_in_body.compat.c":"4760ad1dbef99c03a23531908898500c70cdb56a75c90a0c6b194daa4fabf968","tests/expectations/associated_in_body.cpp":"713be556c029aad5662b7ef6e6e02a5164d713a889e68e3aef35aeec9a095386","tests/expectations/associated_in_body.pyx":"09d8a263bdd112298896ee7281993d270dcb394497fc5251b8a085650f2b29ef","tests/expectations/associated_in_body.tag.c":"7fcfcab51404cdea16254d102e60d1689a6d6f64dacdc8f431a14de57027e8fe","tests/expectations/associated_in_body.tag.compat.c":"9b43a735b7f346861d01e20e6dcdaacf49241f34ea8112b70498f275373ee666","tests/expectations/associated_in_body.tag.pyx":"8b77f19b0bb0e479d6c24da336de9897e56354259a580f76fc1af66e0b23562f","tests/expectations/bitfield.both.c":"684e0e0e909797238ad7e47b41dc3c9cc854c072724b9bcdc745bd2aa246c102","tests/expectations/bitfield.both.compat.c":"a4e4503e6e6a8ff59aacaeb641c37c78a692e1ace60fb8a2e069143211d5ce95","tests/expectations/bitfield.c":"45df0bd7774d3d63f745a34880e189c18a26a840ca4ec7f350777a07ccadb0fb","tests/expectations/bitfield.compat.c":"8e13a28fcce8570a47179dea123be18174af1a7ad73743a238bcb7997e3caf03","tests/expectations/bitfield.cpp":"29496ff002d05ead46c3138bff1de7d0ef6ae3fb1861d78699659a00227b2b2b","tests/expectations/bitfield.pyx":"b3209227b52c338dc12d5e1c9f4915be54fbabb8f04bc3d7eeed359faf298654","tests/expectations/bitfield.tag.c":"570212e779377fdc803539aeeca8a3ccb639c53341cdf044684e374bac4d1e9c","tests/expectations/bitfield.tag.compat.c":"1c40246f2a4e43be091ae835e02a72421d74e1f4f2d13ca7a18e051ef61c08e7","tests/expectations/bitfield.tag.pyx":"89580c6294bf5aa09afa748b708d2c221b0473fc4431f5fdbc6565bca086ceb5","tests/expectations/bitflags.both.c":"d869a523ba0f10ee16838fe4ce11331cce6370ad7b1f2fe8770a8dda47d66a81","tests/expectations/bitflags.both.compat.c":"87dc88c497cafeacd6453c0a2876a02b3dcb0957c7f0e6fb571706a37524dc64","tests/expectations/bitflags.c":"a59ec11d40a4f37c991237e7b0a09604827553b065be5f073a6d31d2861357a2","tests/expectations/bitflags.compat.c":"a2b9b46236971e236e312edf1828ecee3cb404a3d61526fb699993f6b27f95fb","tests/expectations/bitflags.cpp":"14d77c4e34bb86cc1d632875404e6c6c22085abd071f0bfa9bc91212bd8660eb","tests/expectations/bitflags.pyx":"15f102a6e89dd9b81413961d2898991ad69d11d933cb3de0ac543528bf7f9102","tests/expectations/bitflags.tag.c":"7470f660cc356a0ca0a4ceaf4b651a22fff99228d7c67ac93d70eaceb0450511","tests/expectations/bitflags.tag.compat.c":"1647ef46bf4b8cc7279e70b4a2f1cec62ea1c4e893e4a693366c42d5ad1b5522","tests/expectations/bitflags.tag.pyx":"5aaa0f6aaf91e4a7567783ee85617eeda2d38ac8ecdfd1a4f9e171a8b0fbffe3","tests/expectations/body.both.c":"b5b4b17c7545bb60b6b113750b6211ea012fbaf323a9f7c0a6f22bd502b10eba","tests/expectations/body.both.compat.c":"ab2ae390bff1c669024c0f57dafb6c39223124eb7fee5f774a26a24b7b745643","tests/expectations/body.c":"83e6548451a14b54b482fcf15765097c5fe67296f211ff0d13487b440fa3f205","tests/expectations/body.compat.c":"4b231ba3e4a9a5d5d15c905dbf7825af4afd00f1f418154d76aef0c8e820625d","tests/expectations/body.cpp":"8f033a0b3afaae1d37745734718539549951e9c60d66a12fbb09e974a09c2704","tests/expectations/body.pyx":"f80e234950b3f1fb08a22b49541f483b855e1fcaec5b826249aab46c22a0945b","tests/expectations/body.tag.c":"c93242bff38924582159b58214ab5aac7b24345139081037cc437fb8a58002a9","tests/expectations/body.tag.compat.c":"b6f862490b2d3d030eb6cb8246e44bae069010a7df448ff3978a75de1c726d37","tests/expectations/body.tag.pyx":"ab304c830a1938e7ae60af8e9f728ee6ba6be38877bee4061bfaff27fab45de3","tests/expectations/box.both.c":"29797d3cde598a2df118d1ff464cb7c6e6b4545a43778bd7868af4e857efcb9b","tests/expectations/box.both.compat.c":"7ccfc34358d74a6219b8a45614828bac98eebfe3dbe79de6fc7d0465170790bf","tests/expectations/box.c":"b0b2df7542f213b0ec758c6a3786ea1d7c4decf4c09e0a9adf09f60c4be8353b","tests/expectations/box.compat.c":"1216fb807bd22c26cb299a81feb31928d31405611367639ccd1de2f7263a8e14","tests/expectations/box.cpp":"5ac330bbf91df9cf320d6e95a9cf7d156e1c2e8dbd9580b8d1d86e2b96825836","tests/expectations/box.pyx":"addce00caa486fc98729b6952c6f2424ca62b22ac929ecdfdb6bd72e8547ce76","tests/expectations/box.tag.c":"342f6315589865b8f0a0da3a7a24500e4d45d8029bbc6a55e6d767e1b13a0e3c","tests/expectations/box.tag.compat.c":"4247724da37b75e4f3527fd3ac383c13db33ed76bfcc525402161b6316b1a8c4","tests/expectations/box.tag.pyx":"fe9138c1bd88e9e974315355d9ff43abd90d019e06135ea08280900d918779b4","tests/expectations/cdecl.c":"e49da32919797ea6d6ce3f4fd7a967ad33ef1dfa3f323f15181cca5f9a1fc98e","tests/expectations/cdecl.compat.c":"80ca597ab6be6a89310ed2120e62192b6c957cce02770218e11eebfdaa730282","tests/expectations/cdecl.cpp":"3242efce31ba876da3554e8ecaf3f7e89fae84537452d778d65dc1b1e4f31620","tests/expectations/cdecl.pyx":"91dc1444087738b3d108c19378391b92eea1660810829f3f3e02544c12e3a7c0","tests/expectations/cell.both.c":"40742fe09737aee76007e9fa879b9ac9c913f634cd1736e64adc1e246d3caa77","tests/expectations/cell.both.compat.c":"7fe548aa4cc0b4a05c2c482e70e11680a70ad55cb4e850ea3253e4194582e66a","tests/expectations/cell.c":"4018a58ca84d08753a690c93da2f520de98764b738ee30cc6fd06c890fafab2a","tests/expectations/cell.compat.c":"f2e80372856f6589327e56d3173ded3c8fc69ce714ae773865d96c04310c7632","tests/expectations/cell.cpp":"fcfe5b2f9d546cfaa5654135b1b8c0202ea23070d758a0ab7c74c4cf84df59d2","tests/expectations/cell.pyx":"2e359ca33d41e2e4c8586070c8484d20c07f5899e7a644df11d7bbf6149a6bef","tests/expectations/cell.tag.c":"87d4eb265f6c2313033cba74aa83c63010e0ef5f0d7de4cbfeab42429c379449","tests/expectations/cell.tag.compat.c":"77eecb7243f1dae0261e8c2fd2ba988eac4c0f455bff18ed7dcccc643205e838","tests/expectations/cell.tag.pyx":"6350674fd920f0b2e2eeaa5d4acc031a3945132f06fbb9e58ae5fbc85e03cd3e","tests/expectations/cfg.both.c":"7aeb06484d7d48fcb804f0c2490363271c68c46f88021a80f6b4915d03d59652","tests/expectations/cfg.both.compat.c":"af8d86fd3169f728e278e36639dd5a63ae574a0fcef074f1c21d2ecc35567697","tests/expectations/cfg.c":"9c6e2458b9b3e3c850dbb5c91598d0e9e6ecaeec776dedb3c308e2b922da09f4","tests/expectations/cfg.compat.c":"0980c724257983a39b37d4b8a4860cfef8619db7efbd06868f732f25ab7c157d","tests/expectations/cfg.cpp":"06fc52674e19706211b1f8386e1763d9a1f20d2f72453eafb9eaad3c85279a69","tests/expectations/cfg.pyx":"9abda332fb51d0f2e38f6e08d79e9f6dd28468d2415af1c90ebede91ca04c16f","tests/expectations/cfg.tag.c":"ad78b20b4f24ad6bbb1a7872c7ee4f0442407ed67fba3a69f24caaa807eb291c","tests/expectations/cfg.tag.compat.c":"f5fb90cf6ac7823e7c558bbb45e8e0626c6f26bb4ae2305fb8aee45c26534ccb","tests/expectations/cfg.tag.pyx":"132b50acb9af10a52f21d3623a1368bd2e8e3462843969bd1cec90aaf7ec0033","tests/expectations/cfg_2.both.c":"b93e3faf89cef94e5190bffe0535cdbdd39ecc1848ad5ed21b12a1d602e8980b","tests/expectations/cfg_2.both.compat.c":"1a22e353b9cad1331c2a34eac2f6c3c8aafb850242f6b1a8989690d9f4d6827e","tests/expectations/cfg_2.c":"50ed9a839309444b5b7569e7a5e3a29fa331ab2b11c5cc1169a174b1ed787dfb","tests/expectations/cfg_2.compat.c":"102606e339afdfe5aba1712c5af7a343b39b97b118e6b5013aeca0fffc2bbd8b","tests/expectations/cfg_2.cpp":"af5afc894b4e1fd1e414e88aafa7ab1387dd38e363a59b2b8998539316672908","tests/expectations/cfg_2.pyx":"64cafab8f478bec98d24f61262cfa9fcf7350fee9ef02e36541d72906fe256cf","tests/expectations/cfg_2.tag.c":"a2199043d58396b92007347dcf8e228ff2ddbf66360349300264305cfb2c324c","tests/expectations/cfg_2.tag.compat.c":"2475f0db5d5fd92306596f95b67ce0b35dcd8b0811f92d06c6a043cff6bf3b51","tests/expectations/cfg_2.tag.pyx":"46d11bbad61c3776d5a5691f8a792314759dc5193291c339c92f9774432a031f","tests/expectations/cfg_field.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/cfg_field.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/cfg_field.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/char.both.c":"3a120740886f111014128581320eaadc537b30717b946cb110004a7fd1c56b35","tests/expectations/char.both.compat.c":"96c4dd607cd73faee95d956ac87922c3ac809fd9d68ced25f6da91b761638af2","tests/expectations/char.c":"2365acd2244ddc250304b59a830ea27ca485f834628de95d419de0a91efc2965","tests/expectations/char.compat.c":"13a7c3b21783a5b815af46548021c9c93a74e476b8060aa4e8357bcb7f221936","tests/expectations/char.cpp":"7612cd7d981224c74d0829253a2da2dab788a02773be4c0b2634505c0f59b0db","tests/expectations/char.pyx":"9521eb16f9d0491dd39ccc10b6ef3ea9a582e0903482f692cd2dbd19603fefde","tests/expectations/char.tag.c":"8aeeab4c3c0b28c9cbc6177a20bd5d85e98454b5c871885efb8b1d9da9a79aa2","tests/expectations/char.tag.compat.c":"f7fc5f73c50ae5f2f4348f4c8cda4fca318891339254f37a6a58762a94c1bba9","tests/expectations/char.tag.pyx":"565200395f89d5d2572815bd38dfdc4d5f6787bd0ef23aa293a7451ccb5b5755","tests/expectations/const_conflict.compat.c":"bb2c53ac57d1b53f5e2ec0c0140d3d309d9e92158953f46b04708f3d86d93b67","tests/expectations/const_conflict.cpp":"29e82a9f7b478bb95a947ce6059fd0b9d76b4288d43b726c33520f70d67ace49","tests/expectations/const_conflict.pyx":"84d5b4e58002f6062acce657f6a065f6782f4cab35e12f537ce44e82c84333e7","tests/expectations/const_transparent.compat.c":"a722d38646474b075c37c7b34d2a1dc824df82e804e4e41957cd1f339e2fba4f","tests/expectations/const_transparent.cpp":"1d2bcd75d4ea5db4e2216b3fe7329358384461ff34a42cfc709f1e7debe70bf0","tests/expectations/const_transparent.pyx":"721caf7ea1e2a7d5ebca1670134cfb42f6a16969e192a52f9db815f10073010f","tests/expectations/constant.both.c":"deed4e341fa8b41884bff5af299df73c59e40cd4e8a63a77dd42619cf28e9d38","tests/expectations/constant.both.compat.c":"e8462d4ce6efe917e166263d3625059493a71c3c90e9a2b48bdb9710112ecd22","tests/expectations/constant.c":"129d9124d4c99e28f3bbbea1d527023582b118fffc74000f75eaa5f5c442a204","tests/expectations/constant.compat.c":"4b5a76782d75be1fbe5a06f776bfe3394d7959f368bebdfda7e1458ea72f1303","tests/expectations/constant.cpp":"99452b14270442969769c3f021cfb54e094a2df90f8d7b933d216e1875d87744","tests/expectations/constant.pyx":"1c0e93bb36fe3eddac86263ad00296d7e65ef27207435dad6497c92be23ba101","tests/expectations/constant.tag.c":"acd58a2ca6c5c0991a9d7c47b39ff967bc92ef1fba415ac58b05cee1a5ec83f6","tests/expectations/constant.tag.compat.c":"2ad53667d23ddef7899a3119e2f28ff91f1adc0afe52236723a40da4993bf05f","tests/expectations/constant.tag.pyx":"9d33c799f8032cc515487e60c25c24b980ce94b30a90aa0fabd067f3caa8b1f7","tests/expectations/constant_big.compat.c":"07e34364e8b6e5456470c17033d437615cc837e811cca702630a25e872be8d77","tests/expectations/constant_big.cpp":"172ca1068d1e6bd4b34d8885fd7ac77b147b672f7de3597dd4f8c4518cfbb2e3","tests/expectations/constant_big.pyx":"47ccffbf7d7c36213a700bd37bc9f37d8f3a74fcc2c8d79d59c106402e0bd236","tests/expectations/constant_constexpr.both.compat.c":"8b498a1a11e995d17cdc1b9d74d2cec3051af5601d195adee1954b5675457a5e","tests/expectations/constant_constexpr.compat.c":"7f540ae608e3240cccc763f53e5ffcf279a3ab5f737f055e6ba1be6708ffa905","tests/expectations/constant_constexpr.cpp":"a0e89b1235963aab1b48a8b8a4bdc5a117e44a5ff286fec38c2515b4d176f6da","tests/expectations/constant_constexpr.pyx":"500df1da145ac960629956a3b7a2d93a1cfd8526a900e2985643dbe5c892638f","tests/expectations/constant_constexpr.tag.compat.c":"097adc133ca25bde9ebad4a63fe77d26759fa14ba015127a160d9c0f869caab3","tests/expectations/constant_constexpr.tag.pyx":"8e2fb6f28152d22ea29830021add535b0313353f93c65cb012655c3d4316fa8b","tests/expectations/constant_sort_name.c":"733b9a46e8b9e33cb8696d13e74ba7b8023735c8fd8dfe73b3cf39d027dffb38","tests/expectations/constant_sort_name.compat.c":"82bd07c1f56913bca006c3859f222feada9ce53a53444702c5c61fd96943ec49","tests/expectations/constant_sort_name.cpp":"b2a9bf52718d1abe7696e2ab121ea6916803c66a6b3a7d664ab8e584201dd4d4","tests/expectations/constant_sort_name.pyx":"676a0026c90d31ca7339b4124f79e2da27198723b62410396b04984e72268070","tests/expectations/constant_sort_none.c":"7839492e03ffac12c0b2f5a15bd4b32aaeb20d0c50440fc392fa2cff9b585f83","tests/expectations/constant_sort_none.compat.c":"3b59ec576d09ae51f0db0f8c34bb9787972cd8441ae718117568f9220c4f0cc9","tests/expectations/constant_sort_none.cpp":"2a2e22c4e3d9109e22a9cd579fa761eaa0106bec84166aa6f18e57fbb6f354d9","tests/expectations/constant_sort_none.pyx":"da6f1f7ca130359c87ad502e3e1367b20a6f0b936dd036a5caa53181bc51c099","tests/expectations/constant_user_defined_type.both.compat.c":"c6c7e161438bc7d4eac09336b05950bba88ffb0ddfe39691ad288fd8db6825a8","tests/expectations/constant_user_defined_type.compat.c":"a723546e5f6a7bfe3caf8f8f687f8b7c457cc57defffb9082db07a91eecbe3be","tests/expectations/constant_user_defined_type.cpp":"1db08ea6da83f22d406134391f5bdfebdd40b29325559ec29da010682f763fbe","tests/expectations/constant_user_defined_type.pyx":"14f8acfe6db6e732931eaa3f5f8a4e9daebb425d64710fac1b72ee0b358a145d","tests/expectations/constant_user_defined_type.tag.compat.c":"0466a87dd60eb403f4f376639464e4b9400dd00938bd5166e131aa1715ff9e89","tests/expectations/constant_user_defined_type.tag.pyx":"b903a4e223c02cdee43ce21facc1958af978afa9e7e7f45f82414de77169a405","tests/expectations/custom_header.c":"30083b9d26f8f022945e85fae85ed3608a47e105217b0595ff64d103093bf3d6","tests/expectations/custom_header.compat.c":"4ac0644b644b1dcdd667a5e981ace55e21e0064ab83f27c59ff7fb0eab9f4861","tests/expectations/custom_header.cpp":"16875359466b19aff8885d62d20e499abf68675a2ae7741e2bd9c0956f87d9f1","tests/expectations/custom_header.pyx":"0540db55e6c4955d2841048feb2c4791e498bc06bac5d884cc33473cc642a316","tests/expectations/cython_options.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/cython_options.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/cython_options.pyx":"03c9cf870f9e143f0a49f10dc8c7a7cbecef2f524f041ba650790ee00940139d","tests/expectations/dep_v2.both.c":"9a1572f80eefff757c5fb0177780671190a92f2dc7702a932406de53705b095c","tests/expectations/dep_v2.both.compat.c":"c0b4f0a494024e66e04aad69cdd5022d694fc263a0628dc12bddd43cf8fc65e1","tests/expectations/dep_v2.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/dep_v2.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/dep_v2.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/dep_v2.pyx":"84f008b65e42343001b5719f67a1e3c8d39e5207a656ad068ee41acc372e8a20","tests/expectations/dep_v2.tag.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/dep_v2.tag.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/dep_v2.tag.pyx":"7a22343bead8edbb687caf42eca9720b69b7c3d96e5d4ec14e71d283aaabd512","tests/expectations/derive_eq.both.c":"0a42ce7794512473d32b7ff91f789b188af91c3c69ee6b6a9d86e82327129bd1","tests/expectations/derive_eq.both.compat.c":"d628768393c2420530d2628ced1e4447e583f9f386756fdd547f9c92df264852","tests/expectations/derive_eq.c":"7b914984a98209889a6f9f4314f1347c4128deb26cef8f7b5b678206d5752bcf","tests/expectations/derive_eq.compat.c":"be14695942908f4d976b1ff606c567347f4ddf3fca40f62c4e1926231eb0ce10","tests/expectations/derive_eq.cpp":"21d619eeb9fa71fdcd35cdc4a29348b340860d7c7474b5b0231845b071b8cb59","tests/expectations/derive_eq.pyx":"102c2505a974086507785589249f4349f0de5493c5672340e59dcf25bbb4fa7e","tests/expectations/derive_eq.tag.c":"7a28b8245621034532bd5af2c018bb0b62effb8b62a1076df143209121c42317","tests/expectations/derive_eq.tag.compat.c":"38dd43a0e5543dd566537512767131c41cfa6ae56c17ca8e14aee32076e879fc","tests/expectations/derive_eq.tag.pyx":"73aa8f84cae7e397fda4c1cfe6503b1df5e4ba820b64bd57311d2464214491bc","tests/expectations/derive_ostream.both.c":"0c225a59b20e6cd10b82d1e3fb4bd158e2f8ed6ad664953974cb80fcafc3fc76","tests/expectations/derive_ostream.both.compat.c":"1a7d96d572abd7fef9375e9ffe0e55f0a290a2ea15db1b1a9dac287632a73cee","tests/expectations/derive_ostream.c":"a6e8faff52219d4f055fb2fc193109e64af7413433dd49521c62a8914fe078da","tests/expectations/derive_ostream.compat.c":"74794d970127e90872aef5cf21be225e64e1e20b0d0509eb7191f3d8c422e4f4","tests/expectations/derive_ostream.cpp":"bd9ad020c82e15b445bb40b58e458f05262c706dcc19e20f40d224d53c79faf8","tests/expectations/derive_ostream.pyx":"8a58962d9079c278ea3a1da2d08209636903d10877c155af93f8726b7cb4bbed","tests/expectations/derive_ostream.tag.c":"834713a0931d81ddc6e88d5988d46b87004aca955e37e2cb156621740cb6ece2","tests/expectations/derive_ostream.tag.compat.c":"83e5c3c4c12b52f073ce71485c42d01b280c01596226ec602c384038425b31aa","tests/expectations/derive_ostream.tag.pyx":"e9909207c042d7b7256f815805c3c26d8ebe8d39d7c560aec6ee9a3e12784a25","tests/expectations/destructor_and_copy_ctor.both.c":"e846eacbf7f762b32982531b6490b94ed6c2c7ad998bf7c898c676d435f7b0f5","tests/expectations/destructor_and_copy_ctor.both.compat.c":"f6dfd8d30add21605134458c1e59ffac0e01903afd378928bcb6e01f721d3b64","tests/expectations/destructor_and_copy_ctor.c":"c4097f05b1c764d8c038225c407b145d8e1660b1d1a155a17afa04a2009e365c","tests/expectations/destructor_and_copy_ctor.compat.c":"645f95a9ade1397eac35b678f1c212ca4d933807a9083952d1d58c2c0fb736f1","tests/expectations/destructor_and_copy_ctor.cpp":"5e2842b4831b25c278dbef666a3a051411c79ea137245e67a25c2ed8850ea1b8","tests/expectations/destructor_and_copy_ctor.pyx":"47aebd55cf2ac78cdc38277626671728892345b1db4601077cf989ada05006b8","tests/expectations/destructor_and_copy_ctor.tag.c":"025a21e8f3974098ec52fdbc331f38c0c9643041597c3756a3bd40d4691092b9","tests/expectations/destructor_and_copy_ctor.tag.compat.c":"3b8bc3684ba0d2474208f4b28cb2be5eb1f551bab5c498dcdb7a353f0e537d0e","tests/expectations/destructor_and_copy_ctor.tag.pyx":"04b39fa3a0923ddd0e6aae88f78d9d497561468723756490367159c86c892dc8","tests/expectations/display_list.both.c":"a515bb0077634f77f023ef62f2ede36cf8326fe4da5bdcd2e800692c234e6ce6","tests/expectations/display_list.both.compat.c":"a1b785b368ef3b4b813cb8a3ec95089b8dbf772414dfefee585fb633cd2faa8e","tests/expectations/display_list.c":"f3df45922f23a2ec455b36341dad5c59e3d6453aeb9a7354c0ea55b04b79ba93","tests/expectations/display_list.compat.c":"18ebf21569cb7862816cd218f8b9926e5a725d9b032d46523eb4480bae9ceb0d","tests/expectations/display_list.cpp":"b94d2065a6ea07ae0c121cebb4f510d6d72cb2dfe7b8a2001d094bbb6301fa23","tests/expectations/display_list.pyx":"ae55fc18e44a7bad123f3a100ee25178c31b45786d43eb76cf8e71afa83050e8","tests/expectations/display_list.tag.c":"886bd29c8d6b482f52e0d51c22b8d4381eb6ecf9ad6d249d0cc4843bfdbd663e","tests/expectations/display_list.tag.compat.c":"0a017a5f3d9fe253e392b44a19d1bac49a21b05d9de1029f4f7d908c819a611f","tests/expectations/display_list.tag.pyx":"6f0f242efa62500f225f4dffe5201ca8169ea345248f0c4f313edf73dd41e348","tests/expectations/docstyle_auto.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/docstyle_auto.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/docstyle_auto.cpp":"85f23dbbb3e5cf03ca1c9bedfd559b4253dd6795d8c3597773ce2dff3ac30714","tests/expectations/docstyle_auto.pyx":"0b1bd6021b476900ff9a7bec7f1d06b8cd5de8085f50920b59c173e5c9c693c8","tests/expectations/docstyle_c99.c":"dcb114c8aa34bd0a15cca9e7076b24700c3660741ecdcc41e7ddcc44bfff9434","tests/expectations/docstyle_c99.compat.c":"fe9814379b9c8795bf8ecfb1308397e5e0dbe9bd81cc9ac820b90ac89191c39f","tests/expectations/docstyle_c99.cpp":"2391bfb6d1de7679f5a6dcc5c2a1fa8b57d6a2af98058ddc6558153f64904a57","tests/expectations/docstyle_c99.pyx":"0b1bd6021b476900ff9a7bec7f1d06b8cd5de8085f50920b59c173e5c9c693c8","tests/expectations/docstyle_doxy.c":"34e1474c79b8a974c1e4b91a444272d954a50d7a2e74c46368a1f94ea1a59113","tests/expectations/docstyle_doxy.compat.c":"e907be610c1c2fe09af9a355155df95226aa45b129d6ad5fcc4d7358793499bc","tests/expectations/docstyle_doxy.cpp":"0277cd56e2bfb397cbbc9ab58ab9e91ae27cf7388ce6c081140420a05ca7fd24","tests/expectations/docstyle_doxy.pyx":"0b1bd6021b476900ff9a7bec7f1d06b8cd5de8085f50920b59c173e5c9c693c8","tests/expectations/documentation.c":"268e799c5b13dabb6796b9e233d623adf89d3d69a26c9d25d661a182a2de2a73","tests/expectations/documentation.compat.c":"b9987f70233cc3952f82b2553b2e016e85b54037b767009c1b96c9cbf9d80830","tests/expectations/documentation.cpp":"d34d4e1fbad6275e999d733083f922070bd2537e87e9024e5624da03c52eb7d6","tests/expectations/documentation.pyx":"f87ad48322fc1ebeb72589f9c88c1fa3c98da99deeb4080b62b651caac20a5d6","tests/expectations/documentation_attr.c":"7c353cf10b129591b74fc1a3492b2ae45e80877e5c00ed225e83f892a495bd73","tests/expectations/documentation_attr.compat.c":"17f61b4a39cb3f8668713ea7d50e74e57e5021e326cedd95e3f67a29d1c4d2a4","tests/expectations/documentation_attr.cpp":"044c5e034beafc6275c6a3779fedcc6570795c4033819ba065a584b339ef5e46","tests/expectations/documentation_attr.pyx":"dbdea07c97a1b0e1937c009228825efbbbb12f5a4fcd85ae6fc9912ea039204c","tests/expectations/enum.both.c":"cdbf77b7a0cef66c5e19385fed6319ea3bbf9128afdeb5c480df3354a47c0848","tests/expectations/enum.both.compat.c":"ffa6668fe1b8b42c4c7cb9bd450cc54df7fd06911e392af2a374a6bbff919d5f","tests/expectations/enum.c":"d8e6cbbca2825cfe231c9a41413d44d4b0ddba8b4bcabcd8026e2042ed086122","tests/expectations/enum.compat.c":"ffd8334158673886c7fcc7ad5abc91e8ef563a038dabb2e00f471013ee16a7c7","tests/expectations/enum.cpp":"6e98d6688ce0a95f6ffc57e62f3a988e905c193454b3d95e4a598e8c68f7688c","tests/expectations/enum.pyx":"2e9b3647b75fea465a37ea1e96fde31b0d124ab6e1645e1f04bd026a67ba9c93","tests/expectations/enum.tag.c":"6f720368f8f58ef22c1a081997a5de4387abef3f18163da7a34a55c41e73cb49","tests/expectations/enum.tag.compat.c":"45fb2921cf0a8b7728908002cb28bd6c5279bc23b61225ff31c39f74590ab821","tests/expectations/enum.tag.pyx":"35183f84518c496970944bac78124ef83e515c2903298e32d34dd16596368989","tests/expectations/enum_discriminant.c":"6f24cbb16f768c5ffb22c7e37a316aa874a903c96d2ce18c9210ec0501224d74","tests/expectations/enum_discriminant.compat.c":"35ce86b5d0a7ceb4ddee1c13ae33265206a9f5e37d830b97878ee01f16b680ae","tests/expectations/enum_discriminant.cpp":"2522739dd34803c7365801b763b4afe80f6183247d7515978f7babff5e570576","tests/expectations/enum_discriminant.pyx":"f0f9441256929c7b92c1219c6062609d423fbdf24d3fb9ed9fa04fa78b1c9bda","tests/expectations/enum_self.both.c":"d75e33232219c5ac92e7192590725aa5f808f39a2ae6510366ce23485bba2e1a","tests/expectations/enum_self.both.compat.c":"5b90d1664411cbee379141e4bd49b3747c8738abfd90f48fcd1cde20736b59b3","tests/expectations/enum_self.c":"268553d06c168f0c0f9df14d4b1825c25fe627909b99bcf4e388eaafe2c516dc","tests/expectations/enum_self.compat.c":"185abf491a7577b844ff38e67c3cdd8e33f8371b3d69cf290d3bd8455ce33bad","tests/expectations/enum_self.cpp":"9fd2c124a9498f995a00b9f237e9e99ae9b0c14777698d25e30fb105a4bb25db","tests/expectations/enum_self.pyx":"0e9ed9167fce046ccf1b5a94e5e2e9dfcd0a4a4580979d41b700f028decec11a","tests/expectations/enum_self.tag.c":"0473c73442d1fe1348d552e8c51c548cffc0d61178cf2c6329fb5abcb854bed1","tests/expectations/enum_self.tag.compat.c":"8db08e1d671641c094c51ee0c488a5864b5f6a8f294d30958d66a13817078ab1","tests/expectations/enum_self.tag.pyx":"ceee847353f01353c2b5d2ad5b4b4fa56a809e762c65dc71a1f0d2524e9e5c76","tests/expectations/euclid.both.c":"a78b580e52876b49f32529ae67754975c1c33172c8bfba830cc147d3c755fb5d","tests/expectations/euclid.both.compat.c":"c6e5ee01e4dc8ffba597457db2ad5a7865f2778a334bfa468903681f5a8f340b","tests/expectations/euclid.c":"360eb8124beef4803470e58fe0d0546b64b5ee91ba7f3237de30e8b3c389122e","tests/expectations/euclid.compat.c":"4cc5da9fe161f55353c581702ca815e49c249f18d23c5f6b2b06e8ffd8a50afd","tests/expectations/euclid.cpp":"e2d7b4e83aae20151e2c1dbb96121abf4fc2fa6122485dd148dd99b7aeb97ba2","tests/expectations/euclid.pyx":"0353d7e1413cb86bb255c4b4516a7f430f6721ed2d67261b25383c17352e893f","tests/expectations/euclid.tag.c":"3a3bd68906ca709c4d7eefdea0021cf9117a83dd87a2bd9200b0b41cba68ba20","tests/expectations/euclid.tag.compat.c":"891ae3746e246a2e814a02f6670a025347fc792e956c242782cba4b8abb53f9b","tests/expectations/euclid.tag.pyx":"4a8efd3be848dfdb1e4beda0133d083b759e2dea791711c52f466ef746292c83","tests/expectations/exclude_generic_monomorph.both.c":"b63eac0e7048c67d47e7f75993684c098ecc86356fadff0038eeb4f4f8f86fcb","tests/expectations/exclude_generic_monomorph.both.compat.c":"c6a8435506c81517b4ea8b2653723e41ce72cd4c831ea8b439cfed774043a9a0","tests/expectations/exclude_generic_monomorph.c":"41924ac09f9b3abaac47c46f7781485a83518e37548f103a19af9460a7b7b6da","tests/expectations/exclude_generic_monomorph.compat.c":"5e8839568a14640b635689c9d88824d2a63332e254bd87a437cf71ad96b5c419","tests/expectations/exclude_generic_monomorph.cpp":"b63eac0e7048c67d47e7f75993684c098ecc86356fadff0038eeb4f4f8f86fcb","tests/expectations/exclude_generic_monomorph.pyx":"c0ff87a1730876e78bd564dfa001e3115d6722c3051e938f5141d1d66f5bc465","tests/expectations/exclude_generic_monomorph.tag.c":"3e6e6f27f680af301472ff2e4d0dfdb7eec5d8714968b99a6bb30841580f4f74","tests/expectations/exclude_generic_monomorph.tag.compat.c":"2f0a9feb2d9c4eb5a14089a06682416d685122dc8b75d0b3ec427d6a23363c80","tests/expectations/exclude_generic_monomorph.tag.pyx":"6b30a5d86eca17eb132334bcde1f8a7d9a91bd9316187587ee905d73a3ef1da6","tests/expectations/expand.both.c":"977cda0bf7dbf4fb408dd7f013bc24143e17dd10987f42f2ddc9b758857b96d1","tests/expectations/expand.both.compat.c":"bae04494dca07e7c56bdc60212ff99c009930db00c95c3910d64d5260769bcd0","tests/expectations/expand.c":"fc69383c93f639f92996e4b91f296084510abe22f10b831ca628d7d11182620d","tests/expectations/expand.compat.c":"786956948cba335e44d4ec08f6cbce6aa85cec2605554ac88903ae1fc06ec2bc","tests/expectations/expand.cpp":"38f85893eaca630049af26274b6cdfd4ba9f9ad162bdce9e8f82be6f2572005a","tests/expectations/expand.pyx":"1eb4669255dd12dea709aedef09b49053ba96c83e5225afe30c07cb55a21e801","tests/expectations/expand.tag.c":"c14c175f9672e03913b278c6f2346c3ed655ff66a67889b9f9f22e923dd293ca","tests/expectations/expand.tag.compat.c":"972f420b8703a1a2f9e72e7af8ed1dab832240faabe6c2af9a72e47f000fbe58","tests/expectations/expand.tag.pyx":"a5fbf6408df5bd3ddd87bfcaf0ac7cdcd0717b42802a9a0815012d14588b1b58","tests/expectations/expand_default_features.both.c":"84118df0f668e17a54ef8a081622bffbfcff9c64856ef135ac492a90d1029579","tests/expectations/expand_default_features.both.compat.c":"4a3e098f40d2062fd1aa35a4231ce597de7e3d805eda74e4463a409f9febd585","tests/expectations/expand_default_features.c":"6bb6ecbe2d0e4c904d260fba76a4893a0284e5a794305e704886d36c7e63f595","tests/expectations/expand_default_features.compat.c":"5c4ca68e2bb67ba37949f3e87f5da85cef61a869891a239e39fcb7dc35120ba2","tests/expectations/expand_default_features.cpp":"7abea90e45ecf0ef2ab3d254e59eaea7044fcf95188e4dbdf2780c410b22919a","tests/expectations/expand_default_features.pyx":"1183233f2774df3087a3691d8c315428791a2a1fef2902250aab7c4574bacf56","tests/expectations/expand_default_features.tag.c":"7da60b618c40a23089c8f7c26c196da98a59720acf25683f32a838c52f8a8b10","tests/expectations/expand_default_features.tag.compat.c":"fa7654d64a8de65c26a109d4f4389c9fe32489bbb9dbfbb3e4c51541e3555e49","tests/expectations/expand_default_features.tag.pyx":"e509ee84cda4f78b8fd871a6a30ab0932fd00db0733fdf03883d025d1d2a9466","tests/expectations/expand_dep.both.c":"9a1572f80eefff757c5fb0177780671190a92f2dc7702a932406de53705b095c","tests/expectations/expand_dep.both.compat.c":"c0b4f0a494024e66e04aad69cdd5022d694fc263a0628dc12bddd43cf8fc65e1","tests/expectations/expand_dep.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/expand_dep.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/expand_dep.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/expand_dep.pyx":"84f008b65e42343001b5719f67a1e3c8d39e5207a656ad068ee41acc372e8a20","tests/expectations/expand_dep.tag.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/expand_dep.tag.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/expand_dep.tag.pyx":"7a22343bead8edbb687caf42eca9720b69b7c3d96e5d4ec14e71d283aaabd512","tests/expectations/expand_dep_v2.both.c":"9a1572f80eefff757c5fb0177780671190a92f2dc7702a932406de53705b095c","tests/expectations/expand_dep_v2.both.compat.c":"c0b4f0a494024e66e04aad69cdd5022d694fc263a0628dc12bddd43cf8fc65e1","tests/expectations/expand_dep_v2.c":"20edfb69d065d63425aec974c97a23530585ac0f86334e2a565af8b110589d3e","tests/expectations/expand_dep_v2.compat.c":"127844afc3e5e33ae47db25be10938b5a3861780361ed3d22e10f834014f5fef","tests/expectations/expand_dep_v2.cpp":"b4884a3cf2e3d0d66b810831920b46579efe08a9d26b666bc9879c66f0c15ee2","tests/expectations/expand_dep_v2.pyx":"84f008b65e42343001b5719f67a1e3c8d39e5207a656ad068ee41acc372e8a20","tests/expectations/expand_dep_v2.tag.c":"889c38974bf7c2902f7213a35112d743c4ed0b68310d3aa9906efd9f916b93fa","tests/expectations/expand_dep_v2.tag.compat.c":"d925948a283703f6b336e1b6c8e3f15e0f84d92547ac832bc101cbdb511503d8","tests/expectations/expand_dep_v2.tag.pyx":"7a22343bead8edbb687caf42eca9720b69b7c3d96e5d4ec14e71d283aaabd512","tests/expectations/expand_features.both.c":"b953f3e1c597a42bea863a9baf59de77c2d7aebf00a25c7bf03bd842a5470a92","tests/expectations/expand_features.both.compat.c":"69ab55195aa57c3f15491027e098d45b15de039b48b87e07727414f9357cd8af","tests/expectations/expand_features.c":"928314408a433b8e03ce4ec9d99a29be51de11a2a646bf00d5efaf4e8f42ef5b","tests/expectations/expand_features.compat.c":"4086173d7c9973d4ef51e4a729e69fbc96d196e9c4b483c1015581ea16961833","tests/expectations/expand_features.cpp":"71761f1030231dd7d6628f4c4055f85720186680c0ed32055df93096575703bd","tests/expectations/expand_features.pyx":"b4c443321c0f86ddf508b8bb1308f75cc5239975893aa47074e252f4d34acd11","tests/expectations/expand_features.tag.c":"307babc64b5f3821d90cce8dd7b344a665ecf5b76b76c2bf606001798f39d46a","tests/expectations/expand_features.tag.compat.c":"9316e9411d1a8be5414c0d2db09d1c582fd172661a69ecb2cf5a30731aeeb496","tests/expectations/expand_features.tag.pyx":"2654ffa0041ae74a6a80494fda866a967d2535d79f1d03224a175373f8b4cf22","tests/expectations/expand_no_default_features.both.c":"977cda0bf7dbf4fb408dd7f013bc24143e17dd10987f42f2ddc9b758857b96d1","tests/expectations/expand_no_default_features.both.compat.c":"bae04494dca07e7c56bdc60212ff99c009930db00c95c3910d64d5260769bcd0","tests/expectations/expand_no_default_features.c":"fc69383c93f639f92996e4b91f296084510abe22f10b831ca628d7d11182620d","tests/expectations/expand_no_default_features.compat.c":"786956948cba335e44d4ec08f6cbce6aa85cec2605554ac88903ae1fc06ec2bc","tests/expectations/expand_no_default_features.cpp":"38f85893eaca630049af26274b6cdfd4ba9f9ad162bdce9e8f82be6f2572005a","tests/expectations/expand_no_default_features.pyx":"1eb4669255dd12dea709aedef09b49053ba96c83e5225afe30c07cb55a21e801","tests/expectations/expand_no_default_features.tag.c":"c14c175f9672e03913b278c6f2346c3ed655ff66a67889b9f9f22e923dd293ca","tests/expectations/expand_no_default_features.tag.compat.c":"972f420b8703a1a2f9e72e7af8ed1dab832240faabe6c2af9a72e47f000fbe58","tests/expectations/expand_no_default_features.tag.pyx":"a5fbf6408df5bd3ddd87bfcaf0ac7cdcd0717b42802a9a0815012d14588b1b58","tests/expectations/export_name.c":"4c0452bf3c2901a1006efd759360882df316c2938d141906c89ad60b15b477ad","tests/expectations/export_name.compat.c":"5a2182e239b75ef0e4970431523f4ca5e3c17d43178ab1126b0833385666e37f","tests/expectations/export_name.cpp":"212eb614a342bdd626c83b790ffdfe30d985cdec4e2ff14fd38ccec4f55137c8","tests/expectations/export_name.pyx":"e10cb6efef0c0d2c7f91d9226db21ed1111464f6474acc1076390cc4ca36e8c0","tests/expectations/extern.both.c":"5864f0aaa3669aff76a2a44fdb88de8ffebf2b22a1d32997686149d6c4401b84","tests/expectations/extern.both.compat.c":"957495a1a26dac601525b832456856813542be2014f344f2aa84a546c57fc7c9","tests/expectations/extern.c":"e541f754570d2a1ce3ecf242de3b41f0437db6cbf4fb7e8505fca0ebc2088950","tests/expectations/extern.compat.c":"0d2e98ee37e668f056cf62884084ddf3b505f4a193626f098c5de20ac501d504","tests/expectations/extern.cpp":"2c9e359108649bd0f34ca83382ff77fd9c278dff4e9f9dc763012c0e1769f05c","tests/expectations/extern.pyx":"419351cf630b00068f523b6bd463ba2a74e8babd14335fc08442ff9acce71efe","tests/expectations/extern.tag.c":"1d6e6afbf9765a48cebf170bd31751ff7372d7665ea646bf2605e5df12c7e43d","tests/expectations/extern.tag.compat.c":"a9e47795357fbe2f04a952033d33d2d7bc54a47654f40c21c5c1c824137690ee","tests/expectations/extern.tag.pyx":"585a09dcfe77d89ef0cbd5e4420f1caa07f3862aa67af293347c6f92336e4183","tests/expectations/extern_2.c":"a81c41efe618612fc4b9a22d937397ce7a76ae966a28b33e56a10725cf2700ea","tests/expectations/extern_2.compat.c":"124174ff9745e397b646830ed9660faeb05910bcb340b73c925a4f8f3f656a14","tests/expectations/extern_2.cpp":"739b9b9e58af72a281402c050d6358ddf001076a64ca861a2c3a95a66cb80d96","tests/expectations/extern_2.pyx":"0c1a9e29feecbc385005b9eef2c5a5398b74d5906fc09d2127b18e9722f6308d","tests/expectations/external_workspace_child.both.c":"0c518b620f1b2bc24d789d725083cfe6f9064630b8f386123c237d9e73fa38b8","tests/expectations/external_workspace_child.both.compat.c":"1fe5756ea6f2668069d92e7cda051ba1ca0ff547fa49fcc559d07fcf33d1c8f4","tests/expectations/external_workspace_child.c":"9d9aeb31e5388158b6abf8686d4109771159d98ef83e93658d3c2e556dd69174","tests/expectations/external_workspace_child.compat.c":"3681fcbc89d3f7b91a1cb4b67bf6b64b0d08cd7722c9a6f908b0e16da9015077","tests/expectations/external_workspace_child.cpp":"32ab68edd8b25b7de5553236f624e23a25206aa3524bd52dcbbb423a8bc38611","tests/expectations/external_workspace_child.pyx":"d67d610ac34dc895c1bb1a82007f798aa71a2bd0f309026acd40bbee182835f8","tests/expectations/external_workspace_child.tag.c":"be776d880e923d640da889c22551dbc6dcacf6f80b1b8a07284bc8fcd726151b","tests/expectations/external_workspace_child.tag.compat.c":"08b1d7e35fba239e73e08a56fe2a5ec80133b46774e4047ae2eabb56e027a4ad","tests/expectations/external_workspace_child.tag.pyx":"a6bee518d269e44054cb0935a8b704f942e43d84e69e5dabf9f07f1bfff733bc","tests/expectations/fns.both.c":"c1405054701813792db17fec4156ce2940713751aea6eb1f3e2b49eb14a78876","tests/expectations/fns.both.compat.c":"4601c5ed7d383db6490afcc49927d0e94121e6ac4c0e534f4c5317c9b4b14bdc","tests/expectations/fns.c":"7c5803639ebaa0935c3fbe7aa1ed66cbf3566ee44005d14f58161ad66e9f1b28","tests/expectations/fns.compat.c":"ca3f73199d1cf506d63b746fa45edfdb8d650d2a268c64740efcbed14352ec70","tests/expectations/fns.cpp":"2f4f1079779feeb468d995aecc51b8a3cab2af8525c24f28f3b852685f7dcfe9","tests/expectations/fns.pyx":"862c85224357db387d97f90c1822b52d918839aaa2818358fbb0fec4c3dde14a","tests/expectations/fns.tag.c":"9472ed474690bd8aece9893720ef7cb0c36d9a08511b077d9ddfedfe4204b45e","tests/expectations/fns.tag.compat.c":"cf0de02321c40c8426bd6298d7f62c21d2bb96ed9985184aaa91d4f50a8716fd","tests/expectations/fns.tag.pyx":"212a5f846b1eef6999481bc82b1abd54df8d245d771c7261690c276a6394556a","tests/expectations/forward_declaration.both.c":"ec4bdaa4367767cccee63afcac538bb34eed644ea2300c46400747416d271889","tests/expectations/forward_declaration.both.compat.c":"98ddc3144866860b7b421b3cf13fcea8b96c129c2ff238a35bde75567dbabf0f","tests/expectations/forward_declaration.c":"fa1c91cefc98346e34cd76cebd754bca1a7472594291ad910eda7e3f2c70bd61","tests/expectations/forward_declaration.compat.c":"19679d72b140a9e8984be0ba72ad2db52ecb1e577e0bc9d8410c5367991da723","tests/expectations/forward_declaration.cpp":"982e68a79e1fac4c4cdef1ff45c357ff3d343d7983866be3d21bab3291225a89","tests/expectations/forward_declaration.pyx":"ad727c468b1103aeb5f96b0d81325416f0f3aa4366b9ebfbef861e769957eea9","tests/expectations/forward_declaration.tag.c":"795e52d2101989fea9a35e2f6f6c2f4eaf8a09edd0a1e404687bf6e26907c9ba","tests/expectations/forward_declaration.tag.compat.c":"34a675955746042a4c658f7bf7bf679f4a88fc40387f9063bb7f5922c3edf236","tests/expectations/forward_declaration.tag.pyx":"ef8ba87a36122681ba479728147c82100c42a83754ef6a577df3122f6278e5ef","tests/expectations/function_args.c":"90545731d4f875305f4255721917fe99fe2b72a9800c0e0a1f5ce216c3bdfd93","tests/expectations/function_args.compat.c":"f8afecff6f47cb348f8899248cc12282614b052d50c3d20494f9f65c418c7ee4","tests/expectations/function_args.cpp":"929d057fe83dcf946ebc2abc915484e31c8bcfd48e5d572b1de90ec044129532","tests/expectations/function_args.pyx":"5e9da75f1c1047376424977fdf8c577bedea7e0248f9d45b468d75724e3baa62","tests/expectations/function_noreturn.c":"ea55a1ffca36bb2936814fe9db0f22176743a82385436ee720398323ef7a3382","tests/expectations/function_noreturn.compat.c":"f55784b82192998e9701cae9fef09dffa6ce6245c4d145c73968998a0cbbaa5e","tests/expectations/function_noreturn.cpp":"7b279034320be636087273004e14e2dddca2918c96f8b718d835c353697a7d2b","tests/expectations/function_noreturn.pyx":"70c41b59ce9f0cf6c42f303a8a8afcd91a3231580de4b7285f5fa14d6dc7640a","tests/expectations/function_sort_name.c":"8c6f66d028092f8ad11acf8d9bfd934e17ef2ae25c26d3012c9655a54f379b45","tests/expectations/function_sort_name.compat.c":"7d8e577d35f4590a8d733ea072e68410784e9870295607ae8872c71239994a2c","tests/expectations/function_sort_name.cpp":"2924b7b6d6b49a93dd1f1a850643b7458da50fe7ea20ea057e3a9f4a27d051d1","tests/expectations/function_sort_name.pyx":"5a94077258293fd28418e4141328aeab509ebbd1f2bdd084aa9802ea84994bc4","tests/expectations/function_sort_none.c":"cb76985dc63027d0d85bb6cfb32e5a77f9c3a46a97059068643186f27a88d9ce","tests/expectations/function_sort_none.compat.c":"3aa6b8e43a5cbcceb35ced688fdf0dac71bd63f0dff1cb7d0ecea72749fcb017","tests/expectations/function_sort_none.cpp":"6b07b4a14d97230660b18a6a63258e3571124c935b4a8391ab377d48c8e9d2f8","tests/expectations/function_sort_none.pyx":"c4b01d34e21c584097a1726c17884dd148315e5924c3353d799c7ee3b39cc939","tests/expectations/generic_pointer.both.c":"883597ae24580f0700dce70e121fbc6258bedaaec1412883ada64f3663433fa6","tests/expectations/generic_pointer.both.compat.c":"ee1c7f3319a4f6d5dc57a8ba1c07299b469c20030828ca24e2553b2d830c8ae1","tests/expectations/generic_pointer.c":"9ec3e744a8f953038b2bc748b34b0e9f682dd473ad46f06ea28bb6d282db9281","tests/expectations/generic_pointer.compat.c":"0c7db5c531555f960346011f526ca77268093718e707dd1d628f833a7678714f","tests/expectations/generic_pointer.cpp":"d4772de13c5e44f85aef9d9014d4e6b180d9749553895fdc559a96316dfcd0c8","tests/expectations/generic_pointer.pyx":"2f961cb4f9635a7ad83b3cb41787dfb336a1e7eea2003ee158e18a30c98e21b9","tests/expectations/generic_pointer.tag.c":"6f7946fdf4f71603a67134fb7e15764d8c723575c969e0976091a6912fbde974","tests/expectations/generic_pointer.tag.compat.c":"7e03767bd8435010e1e92d6f6a7436d1376d78738199a7b1e484efd7e0543804","tests/expectations/generic_pointer.tag.pyx":"69e4baa3e9aaec93c0dca6b7002c0b939ca9043893f33dd1756248e9a9a2dcef","tests/expectations/global_attr.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/global_attr.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/global_attr.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/global_variable.c":"e438559eb15269367b740790ee27a8bcf63a65f58153cfa9da90a173480b7842","tests/expectations/global_variable.compat.c":"7da3dbaa9810ec68996038c3170e308c86d038f2c6a7424f08153a002b84e737","tests/expectations/global_variable.cpp":"3b3506a61523642fab2ec283f14aeaa315117284f1566581f368f9d6d94c819e","tests/expectations/global_variable.pyx":"f9362bd82ec80bc8578ee363b0fed388091f90a61242d0a2853f8c18b846c142","tests/expectations/ignore.c":"8629579fd8d0e5df30b4a6e8258fe62efaeb58365f906e253684b1bd9530654c","tests/expectations/ignore.compat.c":"513d4638f5b6331b88782b7b9803d2eb30e058661ecce6e0f0aeab79b5edfd7a","tests/expectations/ignore.cpp":"8def6cc5a4e93ea3dbdb196769bfaaea3f2502cfdee4e256ef5ae86d25896145","tests/expectations/ignore.pyx":"deaa02f33d1bfe7d637420038e93bc63ffef82e93902bfccd43fd28daa4dd764","tests/expectations/include.compat.c":"f6a8f36949826da8fdd47af14b92afca3a27d334a2057bbd5dea3c3db6a8d8ad","tests/expectations/include.cpp":"52590989caf74c26b42591460528979ce10569e35457f93bcc9ca07af686e6bc","tests/expectations/include.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/include_guard.c":"5d9bc0cf8c54aec379f38ce9ee64a8ced7c710e86b947e6516745586d8d51e65","tests/expectations/include_guard.compat.c":"7ed0680e9547628b3c3edd867fa31bab7bdae7bb38ba68e8c643b676de876b1b","tests/expectations/include_guard.cpp":"09174bac4cc923d3a3b91ef4e1205dbc244af756b8dd40382e0c7b7044ee0ed1","tests/expectations/include_guard.pyx":"2dfb2777f23cfd907d3de10774c020dec80fb510b8d850a2725f133afb5fa038","tests/expectations/include_item.both.compat.c":"0d64fd9ae4b4dba8553cb80512e360fcc06cd4fe03a851a865e4b96a8582ac7c","tests/expectations/include_item.compat.c":"35a80c1690f6b418e3e6163174fce69bc667f578eb6a077107ac7bc87298a987","tests/expectations/include_item.cpp":"b9a3d9d3c40c993223e93e9e0ce8f9c5d173832b1c8d4e09054d6ba559fe80fa","tests/expectations/include_item.pyx":"a0448dd076125dd3483575edcd3f441ae0e5d3ce8b77742f48664ad2406e451e","tests/expectations/include_item.tag.compat.c":"c3e805ff7c80652cd250e0f91c158e25062b9331f9f106b77a7e08147e70d346","tests/expectations/include_item.tag.pyx":"b85cec40d10b7384c5277d5bfaa9dc789a38f56f9bde5d8186d3805055406193","tests/expectations/include_specific.compat.c":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/include_specific.cpp":"3c762fa6241403b00500f12542bd195f10c680c5b1801c76357b8c38193eeb97","tests/expectations/include_specific.pyx":"da3b3299f457f3aba4adfa25e21b9270ddfe6f324d29128add8bb6474bc7cc86","tests/expectations/inner_mod.both.c":"d848b62ec77f2cc5b0e21446cffa0429d2759fe55dfbc98604ac12466c43d542","tests/expectations/inner_mod.both.compat.c":"f6a4661c96309cfb53f860a6766a36760b0c501a4e603834f113a2b0cc980e73","tests/expectations/inner_mod.c":"acdad2892c84bba42f5e45ae3295ea095dba9786d566672acfddd8e388ffde70","tests/expectations/inner_mod.compat.c":"fb9a16a48c294e56d60cdb50e9522d8119152e5ca34862857ee7643694e3ed84","tests/expectations/inner_mod.cpp":"e27ee433a0764f92010e476b4f311b3c8e7723e22bc4f3cf2f473ad6fe516ae3","tests/expectations/inner_mod.pyx":"ac755298e5255b926962fc068e2a70899d40bf6065cf46db8e57ceb56b0538d0","tests/expectations/inner_mod.tag.c":"e5b15746228630dbcd16bbd1467375d0954f981de85ba4230ee09bfa7f509a4e","tests/expectations/inner_mod.tag.compat.c":"6e3c7a559af8d84eb504d94aec8694c18d2c8d9acf32cc525e748c86db7d0c97","tests/expectations/inner_mod.tag.pyx":"7dc7732308c5c67801aee1dd627df1a3c530b544057638362870138cab2efaf7","tests/expectations/item_types.c":"ab7fb01375066294949a2dc99a55cd1cde72bfd8510aea21fe89db256200ed42","tests/expectations/item_types.compat.c":"0c68a303f170b7f412fd8ed4196d0c688a995c9f3a0b35b0bf857acecf9cfa36","tests/expectations/item_types.cpp":"19f55fe8f8416342e916344276ebf10a975e57b9a787c1b42bb9b0a374a587c6","tests/expectations/item_types.pyx":"c067270e98479b2c336bc0b520c57c480b7b4448b21f0fb1a8b342d1953a79c3","tests/expectations/item_types_renamed.c":"fbb007a71b1e2567d4068dbceb46b4e284e64fc0f425b67b84bf9f319f947435","tests/expectations/item_types_renamed.compat.c":"a15917d285d40d7edad8b53ff9df83a5f417212c9d6bb8e120c68401afaa127b","tests/expectations/item_types_renamed.cpp":"b60fce152b506ad6e3f964638390212e06b7e3a9853f62943d05e12ae44c9766","tests/expectations/item_types_renamed.pyx":"a0e219b8f7a33b0843aad617bb42a987a41ba4d1edcb399d07c7c29e1137c1c1","tests/expectations/layout.both.compat.c":"0a3f11507f4c77e6568d37f85b72cb7e22e3ae25c19edcdf3faefa4029a3a79b","tests/expectations/layout.compat.c":"f3aaea6884993faf3dc4cb8433deb6eea361e8188e4a944ec44cfee418c1c30b","tests/expectations/layout.cpp":"0ba0d01dae0403e9d4f7c86241027ea34cd7f67b0fa4d5f48a4e993f42688369","tests/expectations/layout.pyx":"7031dcbdd850c1465afe36222ca0918b2f424022d549eff7c30a818cc1873a02","tests/expectations/layout.tag.compat.c":"a4fc428e701015b316d1d5f45af9ccfe4f93119737dbc70440bb5135775455f5","tests/expectations/layout.tag.pyx":"c44b62c85bab18e65ced0ef68549b92861191624dec0a13ac8743a3d11ef8fcc","tests/expectations/layout_aligned_opaque.both.compat.c":"f3ee88baa5bafe2038a33db94e5088d91f16a99a127a0a20fe5820d0fa2b309e","tests/expectations/layout_aligned_opaque.compat.c":"c6def8e3570b4c33ad597d699f5c668f3f6765240f8a79f1fbb506a2f29d5aed","tests/expectations/layout_aligned_opaque.cpp":"bd1ec25eb3f52444263012c836c1a312831ae9987cf092569b9f77f5087f7fa3","tests/expectations/layout_aligned_opaque.pyx":"19b00e1ddad32eccf8f092254a386af4a379510849f3f7f1401fd8e44d86a58f","tests/expectations/layout_aligned_opaque.tag.compat.c":"b1c7d1fefd46489aef9c7d9a1ac9d2813daddb42950ae1e251c5f36db56ea087","tests/expectations/layout_aligned_opaque.tag.pyx":"b4907b7045b946226178bab261d98a573f574b00a92b35374bb855525e4c5d8c","tests/expectations/layout_packed_opaque.both.compat.c":"ceb4ae333479c72559158a62d2dca064c6982d765ce99d979ccbddb48231e464","tests/expectations/layout_packed_opaque.compat.c":"eff44ed7ce409947708c246aa3b535f10b42bfd39a591d94afe8ab4d404a5350","tests/expectations/layout_packed_opaque.cpp":"31e40feebac3001adf6ab13e121108a60da2b2924c7ba673f0ff56cd29ceed84","tests/expectations/layout_packed_opaque.pyx":"5ac79bebcde01e802f8b945305db80a5b6e1a9a7637cc5277befc67a458544fd","tests/expectations/layout_packed_opaque.tag.compat.c":"e0a6f08d233d4f53d5302b728a723dc0b1c4684b47c50c7e28732fb895d6223f","tests/expectations/layout_packed_opaque.tag.pyx":"7767f5e23c99d5109516f7fbd81218210d6e3d321a1465f13cfc87b82489045c","tests/expectations/lifetime_arg.both.c":"b5f69000140f7afdbd7da95c5378da6dadd036c3692643488ebeb32409ce02ad","tests/expectations/lifetime_arg.both.compat.c":"0224425b0f7633b5b651c67a4f3ddb047c803ce8a55322a9ab2d2b74df13bb42","tests/expectations/lifetime_arg.c":"1219d3d3e02b7b9600bc861cf7f8268bd2e24705819e14c5a90cb236fe633b72","tests/expectations/lifetime_arg.compat.c":"bb23c5d46ef6ecc103674cec94cbfd4b41e087b46c5479edd9e2f26db575ed84","tests/expectations/lifetime_arg.cpp":"e6db96ee06a83ba33f1767a1741b656637574895edf496f1fadb109538d7eeca","tests/expectations/lifetime_arg.pyx":"36bc1ca71ee8eba07ed117326f565c50f38dc08a8b8e130be449a652baed630a","tests/expectations/lifetime_arg.tag.c":"54fc3164b2ec51a555fc98685ade1f4b46026cf5108ea238b7fef94059490264","tests/expectations/lifetime_arg.tag.compat.c":"b5e98c37d9e22e9c4b692f560872926977058aaa7a93634d45adbe4eee65df18","tests/expectations/lifetime_arg.tag.pyx":"41fa3947bcbd19b38f2eef40440535fc02e4351982c03991028131cb8b34243a","tests/expectations/linestyle_cr.both.c":"66018159ecc88a3da9e13953b5fd529ccdbceab9f9f4e6f1abd1f0596e3396a0","tests/expectations/linestyle_cr.both.compat.c":"3d849ad69d3d8673de20fbe25d350d3d89d2b03598057159572dcdad1e53fb01","tests/expectations/linestyle_cr.c":"c47b79a70178b4dec21195bf3ecff48bceff5203a3621f2709a4163713c4777e","tests/expectations/linestyle_cr.compat.c":"9963c2f0101fda33df235e71816d6959662c1374d4ce1395ada0a54160528b04","tests/expectations/linestyle_cr.cpp":"a1f4477d1de11feff1bd6383075f1e66143766563b162e02b630377d391cea60","tests/expectations/linestyle_cr.pyx":"401015e4f3d27c133f67bf2089c1d173d3e5dc8de063e726551fe738dc215e56","tests/expectations/linestyle_cr.tag.c":"b50a6e683e09e118df9d736d8c41558fe9449cd7ea286880af587c1c8cfebf9f","tests/expectations/linestyle_cr.tag.compat.c":"476b857e2ea70bcc0a38791988f8e366ec651eb9293407741a7daff78b0a6c72","tests/expectations/linestyle_cr.tag.pyx":"cd32abba2b2f8a866b251cf424ed3211d091cf59b762c09ca59aaf5100710c16","tests/expectations/linestyle_crlf.both.c":"755a99b1e933766ea9801a1ce117c2f997b0fa6b2c5137912fb65a22cf0335bd","tests/expectations/linestyle_crlf.both.compat.c":"9ea5a984f8c6948762c4fe9a2fc636c21007df7653b1fd0092251fdc417c67f6","tests/expectations/linestyle_crlf.c":"8e5c12fba506818fb7843e9955d23cd400d185a550b0232361740e6ed899c733","tests/expectations/linestyle_crlf.compat.c":"a95bed74fc25acfbd9385e75d9047f1b49b813cd06cf342a0542b3ddcbe99ace","tests/expectations/linestyle_crlf.cpp":"12f0ea9dce436788bb0e63078085fa2a07caa8af17ecbe65da58c65cdc3cb47f","tests/expectations/linestyle_crlf.pyx":"7650edb5a4f2b1137f44a61bcc7b08ab946a80f8f7a6e626949e6a4ac02b370d","tests/expectations/linestyle_crlf.tag.c":"6b420ef3c54620e8eeb287a0c4df434521d9448dc56b464ecac8ccbe95c07ca6","tests/expectations/linestyle_crlf.tag.compat.c":"f46844a888c93b7068a4fa19351aaa6e4b6b16edf1f9a2e02650e6ec89e3813f","tests/expectations/linestyle_crlf.tag.pyx":"4d3251841193e79a33b97cf932c04b1cf68f0e7effaa3d8c1590291589e752d1","tests/expectations/linestyle_lf.both.c":"ffec23096e4d365160f926c800be026e7e7638ccfd38963d3a93eb1c2a7c0fec","tests/expectations/linestyle_lf.both.compat.c":"2221088f3b4fe1b7683bcbb2ea3e96723e1764b3ad3bc83cf58626839fb291ba","tests/expectations/linestyle_lf.c":"8ceccd798cd6034abac6b31b3f6cd5d4c1911bdb6da3a46235d4a12c30dff29b","tests/expectations/linestyle_lf.compat.c":"24d70a7beaffa4dd1e22f6c3b8fb76ab72acbffa7806e41c0b7057dffab969a7","tests/expectations/linestyle_lf.cpp":"abee092cf4bcebc00fd7f242ac1f9aa28b80f589f7c9bfc34a6ed1c07e82267b","tests/expectations/linestyle_lf.pyx":"a6e7f087939ecbaf9dcd548e8ffb1b19e74cbf2206c95d07f3390a0588191b37","tests/expectations/linestyle_lf.tag.c":"9b87b10e928fda7709575f3a6ae449c00e111aca5082e45e4765883cae39e1b9","tests/expectations/linestyle_lf.tag.compat.c":"f4ad723de21bdc3a88122f0582a32b6bfc16a5f5618b638331e1fb836f2d5b00","tests/expectations/linestyle_lf.tag.pyx":"575ee9f32e8490cb8d5c3146dcba935e45d865a5be633d8a69747ef77b87c204","tests/expectations/literal_target.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/literal_target.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/literal_target.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/mangle.both.c":"ea3a1b9e0be2554db335744edaa97dfdcc181d41016f6106866fd39ead64810c","tests/expectations/mangle.both.compat.c":"3e9a54b810c818ab6749b7c7f5ffe9c1f5219a578d21fb708f7d229d56bb499b","tests/expectations/mangle.c":"312911321d64a714a0a25578e3b2590c603ca1636ec2c650e3a80c0756f90fed","tests/expectations/mangle.compat.c":"1df720a2a3e58000497d04b37281a7a8e598f960d32e66a50162a4e61f84ac3b","tests/expectations/mangle.cpp":"516daff6a50fa93716d3c1c1f62ac99cb8157e6130dc321785e87756549fa334","tests/expectations/mangle.pyx":"2b6b408168da12ef71a26ea3fed05afdd44949878f561e90854fe3a9360df5a8","tests/expectations/mangle.tag.c":"3264b8207d7f53e63d8fe8ce8ce17b6ea3a1266a6e80d6185a686682ab8ec025","tests/expectations/mangle.tag.compat.c":"8afb865bb530219ac0ac12b48f976b229e9e78cf8f9f9a643e7196ef723ef708","tests/expectations/mangle.tag.pyx":"e4076b5800eb936ccdd7d756b74a5ccfd184c08d808705f836bc48fb34735ac5","tests/expectations/manuallydrop.both.c":"ec4dfcd859bba568b3ff1bf6a2ff5b6a98317e7d543912f0c2bd1456ce93f5ed","tests/expectations/manuallydrop.both.compat.c":"2f36a1be447de716367ef3d36163b71223442d31d5e6ab7253163883b3277054","tests/expectations/manuallydrop.c":"2eefb2427ed5d62171b6b6a7e3bf5101a13bcc120410301b76d6417e2527ad15","tests/expectations/manuallydrop.compat.c":"6e9a50eeead96d677078b9ade8138edbc2f9cf1219c8e4e3ac0af0075e45150d","tests/expectations/manuallydrop.cpp":"21ece2b6da294f6059f55fd56fc06967ecde5a038967ccb8681d65bfb371ab85","tests/expectations/manuallydrop.pyx":"14bcb49b35222bc03aed5ec890178d1f7d935d7a57724e6828294785a3162dee","tests/expectations/manuallydrop.tag.c":"b1d424a68a572ce3299d98f4512af5b6f9f91693f1ecad4baba0d79c52e48029","tests/expectations/manuallydrop.tag.compat.c":"09ba19b04a806877ea0595b8f387785c25b78eace2c776cdfa6fde96d7e2c6ac","tests/expectations/manuallydrop.tag.pyx":"ef89a34e472084527c0499ae28929599b0fcf3d143bc78609d113aafbb0be9ed","tests/expectations/maybeuninit.both.c":"8a513c0229020af5d669b31f0839dfc4a9e05d2d7436311b2446242a0c9f9642","tests/expectations/maybeuninit.both.compat.c":"4e4b52dffc72866743f3edd7eb73b58c3d657171a890fc8f060e3d40a0ea4bd5","tests/expectations/maybeuninit.c":"0f264e87efd3acac66ee3acfedd2ed5e069bd4dbb75e6a682f67e67babcbe43e","tests/expectations/maybeuninit.compat.c":"ada6c9ca8f5b86eeb6bca56544d104b39e40fe512528c2442b8fe4c8e50311a5","tests/expectations/maybeuninit.cpp":"aca6865910f5ccaca1188fc1ca0d071ba59a77e4ff1f45e686e49137d3f55e66","tests/expectations/maybeuninit.pyx":"7c8f1c92265002ee295ce6362693c1e983670d49be3377354dfdfaf680307e82","tests/expectations/maybeuninit.tag.c":"315db831eaeb0111666a64229505bd2346ae252422448e138392b37a20992c1f","tests/expectations/maybeuninit.tag.compat.c":"39e381f827226a5d1cffe8a9da625d77a5d33da775133e3a517f9aeb1735d84a","tests/expectations/maybeuninit.tag.pyx":"bc1330e604936413d7f4b48a8cc44241c8c1006c84d1dad0c3750e1166e83afa","tests/expectations/mod_2015.both.c":"1d7ba633ee3311f1b1dac786a36977558fd1cc42a5fc108a0045de1cbb58c142","tests/expectations/mod_2015.both.compat.c":"50705d130b54224f6781d8fe1783036be0162b50194018b3d30033796821c56b","tests/expectations/mod_2015.c":"358500d2996dd971630376eef9816379576625619b3516e5d3de5cc74bbefc6f","tests/expectations/mod_2015.compat.c":"cd2604b2ffed7bfa17327ed654370e058b913afaaa9461454ab6da6bfd4a6b6d","tests/expectations/mod_2015.cpp":"5ac2510d0651364bb633fd42fe1019dc42c6099d7211666425d6891e84344616","tests/expectations/mod_2015.pyx":"23c7cd14eb5294331834dbb6645e4545cbf887b90458a8be24c9f927496710b4","tests/expectations/mod_2015.tag.c":"8c849f6a71fd73720b23141b0498400800dd1282bb47930855e2f12c80544777","tests/expectations/mod_2015.tag.compat.c":"c6ba516c29bf70a7234f85acaeaa98fa5720eb386f0b0c03e042262c476e0eb6","tests/expectations/mod_2015.tag.pyx":"8e8d99e0a9c29e8cc85efef7d5439d0f6e3d62c9102f955cd9794b7d432e8321","tests/expectations/mod_2018.both.c":"183d3d8c2e1259c40b0e57e7d752ac25f91d3b96b7f74be6ba1e995cd25a76a4","tests/expectations/mod_2018.both.compat.c":"ad2a285d171e6f42b9ae0df3554049c7533d3d364a85383bca7a1849016e7ff8","tests/expectations/mod_2018.c":"adfe989db9fbaa403f91a6c7b1eba018d6e6727e667c953fd26de6fb1dac3240","tests/expectations/mod_2018.compat.c":"c5c2da042830d0f8e8646a82e3c5a4daaaea1b311d571e73508952873bd8b97a","tests/expectations/mod_2018.cpp":"508be5004f3df242955a3c2e06865f507aef1b9641c1b9c33c30aa8f8539347a","tests/expectations/mod_2018.pyx":"1fbb74055b20b78f95289e30744496c33e69fd7c5fc97b0d92acd0e73cd6a82e","tests/expectations/mod_2018.tag.c":"6d7a883be96556c76c704a94cc4cd275daea7b9c9f7d23b8b49c0da7ad731a47","tests/expectations/mod_2018.tag.compat.c":"22c1afb39369e6fbb2508a3fdc42a85e6feb928b24a3d3e3073cfff460058865","tests/expectations/mod_2018.tag.pyx":"e1c67785d02ad8dc1045ecd543bd4275114424cf3d9f3d2c2553f1a616a3d442","tests/expectations/mod_attr.both.c":"e470259bbea62c1304c3b860d803d5c731a0de48351d71b5964e469c9b1630a5","tests/expectations/mod_attr.both.compat.c":"1df6dab72e8053d5556489e14774d3565ddb9815629169623b53c4b100c942f2","tests/expectations/mod_attr.c":"36b7399b5feddc4f4624706a8efb859f0690f1bd790979ae00963a53c399b486","tests/expectations/mod_attr.compat.c":"421356a463fcc7b8009f6e9f7fcb231735138cd8b00994db220d4fba7033dd0a","tests/expectations/mod_attr.cpp":"07381b24498c332f98a1275f5afa0ba1aea2f3cf0c55f418bfb55860b44764e7","tests/expectations/mod_attr.pyx":"efcbf28926b8dba7527ca7a3959ee170f21b95469610087b5a7a1f59d836a717","tests/expectations/mod_attr.tag.c":"26fb16ec5661935512120ea53a2f0a750c232b285181692342bc3b29c1626ded","tests/expectations/mod_attr.tag.compat.c":"9738e2d7525db7ca32eb01153bacef69a46e185ceb18045bf23462c9fd8ac9d0","tests/expectations/mod_attr.tag.pyx":"25d56fef07810075ac8e3613509aeb14e54101d1e6cb8f7930bf51dfcf53a7b6","tests/expectations/mod_path.both.c":"1d7ba633ee3311f1b1dac786a36977558fd1cc42a5fc108a0045de1cbb58c142","tests/expectations/mod_path.both.compat.c":"50705d130b54224f6781d8fe1783036be0162b50194018b3d30033796821c56b","tests/expectations/mod_path.c":"358500d2996dd971630376eef9816379576625619b3516e5d3de5cc74bbefc6f","tests/expectations/mod_path.compat.c":"cd2604b2ffed7bfa17327ed654370e058b913afaaa9461454ab6da6bfd4a6b6d","tests/expectations/mod_path.cpp":"5ac2510d0651364bb633fd42fe1019dc42c6099d7211666425d6891e84344616","tests/expectations/mod_path.pyx":"23c7cd14eb5294331834dbb6645e4545cbf887b90458a8be24c9f927496710b4","tests/expectations/mod_path.tag.c":"8c849f6a71fd73720b23141b0498400800dd1282bb47930855e2f12c80544777","tests/expectations/mod_path.tag.compat.c":"c6ba516c29bf70a7234f85acaeaa98fa5720eb386f0b0c03e042262c476e0eb6","tests/expectations/mod_path.tag.pyx":"8e8d99e0a9c29e8cc85efef7d5439d0f6e3d62c9102f955cd9794b7d432e8321","tests/expectations/monomorph_1.both.c":"10d69c5368f5995d614425992d794936ebbd46fe15fd8a50ff9c0cae0792b49f","tests/expectations/monomorph_1.both.compat.c":"a48fca0cc1856a58ae7db2893abbb9879c70248561b81d9c75dfe252be3e27ee","tests/expectations/monomorph_1.c":"56f782e0e7ed4af20b54b9c1a1fa32ccbb421f74953827e77e4a34374a1f99f9","tests/expectations/monomorph_1.compat.c":"2481def545a3d016b1480752266b5a1460e30f972bc532ac55fad28329fc8eae","tests/expectations/monomorph_1.cpp":"76c9f60394d2b33f784e8ea47d4a45247ded703cab9d3d9b92e7c3eafb99bd2d","tests/expectations/monomorph_1.pyx":"19b26eee97461802d415845e86e8b13905d5019c406bbc01a2c9f0c95040741a","tests/expectations/monomorph_1.tag.c":"bdc4017baf04090f62c8b18d75824bdff0fb48f0b6ba2013eb8a594d5859702e","tests/expectations/monomorph_1.tag.compat.c":"e03f90337eca949628d86dd393c17ef1bbac240561edeec1f6365b71bd7035b1","tests/expectations/monomorph_1.tag.pyx":"d116bc45b720243a572769bc08a65d8df36d52be82c3e306e5c60e56799f9a39","tests/expectations/monomorph_2.both.c":"27440ed92ed1cb717dca92703ee85a0bf1b16122fe99f2e2bf4320b05c8fbd0b","tests/expectations/monomorph_2.both.compat.c":"fb4754a776aaa49155c538e90dd8de978cea7cfc63e9ca846d2ed7b46b66e1f5","tests/expectations/monomorph_2.c":"ad18b5898aa40134b766636adb7963140d9592028b409252709489c07321ed69","tests/expectations/monomorph_2.compat.c":"7392c90cfed6097d93892eaca523b90fa57336cd9489fd64e7e15e85f7600076","tests/expectations/monomorph_2.cpp":"95889ebbb57c509e6ea8d8b79e692b9d2ee3ba4343b1492cfbcf0b6eed185f26","tests/expectations/monomorph_2.pyx":"be1027e30cfe3b0038061cd8662384e23f70ce442fd9692e8f099c1f963a5989","tests/expectations/monomorph_2.tag.c":"b8be9d57b0021ad9fcaa7b905511aa14a412299ac9ff6680f273a3e999e86cfd","tests/expectations/monomorph_2.tag.compat.c":"ea568e6dde68ec79d95488c8f2682495d6135f40266e901642cff45295668a5c","tests/expectations/monomorph_2.tag.pyx":"726ca00603356eb5b2f13e4ab4dbefd478954e9127960e4d623c2b003c446fcf","tests/expectations/monomorph_3.both.c":"1db37a701a9843a87ab9dc5b3170a70d2a3e9dfc2ee1d5131ea28738f6eb03f8","tests/expectations/monomorph_3.both.compat.c":"f3339fa5db4d59b08e5b6b1ca2f047a422249e71ccbba54cf3d4cefb6608063c","tests/expectations/monomorph_3.c":"6f5150caf205ed2c4ce1f894ccc41036c336ec6171aaf1c5ea6b4995474a53a0","tests/expectations/monomorph_3.compat.c":"261747e051bd071b480bd46841e2598d7c829d62fe4397a1602a6a1f77c833c4","tests/expectations/monomorph_3.cpp":"fbe1c063e47cc1e0b216053db1c1355e0698af8c83b6cb8fedb2f5063194508d","tests/expectations/monomorph_3.pyx":"c4668d54b54e532c5c1486a73769bdb497d552db3818105e2549122e8d08a175","tests/expectations/monomorph_3.tag.c":"0267e4ea206bac3ebaaef30f7dee4f2243cf7f5ffa0e0748f194d3e1fa5635e5","tests/expectations/monomorph_3.tag.compat.c":"3264f932beb090697bad43ecf82018719de18254460fadd7dd6a4c14b29871aa","tests/expectations/monomorph_3.tag.pyx":"106f50decd972650f25c3db07ed0279e4c6674a9ef22e4e5c5dd2f6a01def21f","tests/expectations/must_use.both.c":"95461e91bfd356405c9f320e0448c63a53f3a683ae21d83ef4bbf111bb7d06d9","tests/expectations/must_use.both.compat.c":"ccd7c9c85eb89e86f12e17e62f5f8182d2323d349f053a0f11ed0473fa012f4a","tests/expectations/must_use.c":"488e06c3e6cb76fcf734c807dfe7464d929e581d04c0f968a393c6681caeff70","tests/expectations/must_use.compat.c":"723ef05fd1ecbfa6280683415f11e1f1557048ceed13fdf3bdef6ff285ccca90","tests/expectations/must_use.cpp":"78ef60a4d6c588f97bbf88f81cad3884c45f0b0bfe27af161e220ec48c76a963","tests/expectations/must_use.pyx":"c7530439e1ca8e593be4449d5c85e3ab1649a6a3728cf18b2dd306dfa9fb5538","tests/expectations/must_use.tag.c":"8436ea338277f4b1d1923aab72de491a1b1e4f0104a480913c404fabab4e15b8","tests/expectations/must_use.tag.compat.c":"59ed65a024c04bb8bbea47f172acc4c2c0626e0f480cf3013f848a0c481fc799","tests/expectations/must_use.tag.pyx":"84f2013e619d7447308af15e1f75a3d86abe63a9494a4c3c1673a29de5ba3791","tests/expectations/namespace_constant.both.c":"e49631bb7ef1c78d3a699417b0fdb496f7411de836413baee26873dec16e6ce1","tests/expectations/namespace_constant.both.compat.c":"5fde7d256fb56db4dab0918960faf228c24c53cce2e5660f43296c7d2eae6b7f","tests/expectations/namespace_constant.c":"f86295772c831a2e12da48314a18829301a43c476c62953c14ccaac4a85f0a48","tests/expectations/namespace_constant.compat.c":"bb1230c6476d773c14ddc0027a8b713b364d5f7dee03861e2999ba3968e8bc1c","tests/expectations/namespace_constant.cpp":"06b47d366bcdda0fdcc34e01c5c773323a159cd946146603a4eb67aa9de76c8a","tests/expectations/namespace_constant.pyx":"2501710bd9698215badfe51ae410b870cdd6c415cba39ea9f434385d86e18090","tests/expectations/namespace_constant.tag.c":"1e3f5dc75e6c49f6ac9a223abf7fd35743465d7376116eb435c31befbd58674a","tests/expectations/namespace_constant.tag.compat.c":"5e45fe7f4600288ad2a5e545f873fff0d43e95c561e03c5afe5b596d0d144306","tests/expectations/namespace_constant.tag.pyx":"665c3b9423175a1233f1fe0cd466fd4d73d59f813fd3079899b62b2015e6902c","tests/expectations/namespaces_constant.both.c":"e49631bb7ef1c78d3a699417b0fdb496f7411de836413baee26873dec16e6ce1","tests/expectations/namespaces_constant.both.compat.c":"129a4b4f393636afc87e42d7f498e5fca2e921c77407fc4cf79da1d54da0fdac","tests/expectations/namespaces_constant.c":"f86295772c831a2e12da48314a18829301a43c476c62953c14ccaac4a85f0a48","tests/expectations/namespaces_constant.compat.c":"1e446aa818a096bb981340f14470e11ced8cf9dc061fc887d99046c53ccb761b","tests/expectations/namespaces_constant.cpp":"025e6c03c6ecb2febc9729b895ec591826e08b88d20e2a92d3efc98add915971","tests/expectations/namespaces_constant.pyx":"2501710bd9698215badfe51ae410b870cdd6c415cba39ea9f434385d86e18090","tests/expectations/namespaces_constant.tag.c":"1e3f5dc75e6c49f6ac9a223abf7fd35743465d7376116eb435c31befbd58674a","tests/expectations/namespaces_constant.tag.compat.c":"c6771d0b00159fde06de09d6074537cfd19d86f0ea70af8bc5c003dcbca2e96a","tests/expectations/namespaces_constant.tag.pyx":"665c3b9423175a1233f1fe0cd466fd4d73d59f813fd3079899b62b2015e6902c","tests/expectations/nested_import.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/nested_import.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/nested_import.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/no_includes.c":"7a291fbd7336e914b26137ad41ec8bd4b32339d54165147533cdb64b60fb92ef","tests/expectations/no_includes.compat.c":"9aa00142d44fcb11d131f63d3962c7c9a81aec881f0da8fef1f90cbd8378ea5b","tests/expectations/no_includes.cpp":"ccc81037551361d758874141fb95165c57473faf66e500830ad4b40fbe00e906","tests/expectations/no_includes.pyx":"2dfb2777f23cfd907d3de10774c020dec80fb510b8d850a2725f133afb5fa038","tests/expectations/nonnull.both.c":"bc89aae611a1bdf1ba1a2e073e6ef6bdc1e4c2649dbe53becc82764b5ae9ab02","tests/expectations/nonnull.both.compat.c":"d1f99b090cc1d952e3515d46680564948a5fbd2f58d11f5b23ac0f382c209df0","tests/expectations/nonnull.c":"e46f7cc997ce798dfdfc78d64ed71e9157d2b69f3b122c2caf09fe412560aab3","tests/expectations/nonnull.compat.c":"b453816610023cc1f27b8d44261c3fb927f1fff9e4b67e58658b1c89c02e71df","tests/expectations/nonnull.cpp":"fba2388c683faa872f7e6087be9a632c6400cff41d12f92736836abfa1a5af71","tests/expectations/nonnull.pyx":"97eb98c1cd54c2957df9845008eff32b782b2f32f84cd1a0214b8a9a131763dc","tests/expectations/nonnull.tag.c":"9968d2607a64b8f21efe2c9d255da6ff8c606eca82e241b1426a31e5a5650af0","tests/expectations/nonnull.tag.compat.c":"32a9bdf793c01fc90b414e14f7255114402340c5b79f0c2092ce5a0e14c0c622","tests/expectations/nonnull.tag.pyx":"30f8c77d14ae34ea152e697936ab2dbc3a8b5feb9a1fd8711c6a9c8967fd657b","tests/expectations/nonnull_attribute.both.c":"2b46102c86d19bcaed20026b879d429d1d55f785624cc7c80af2debe3b3ff46e","tests/expectations/nonnull_attribute.both.compat.c":"9f08d028de8a199057b5b837b26a5510959a7bea4ebf9b0ea8dd98896162b7fe","tests/expectations/nonnull_attribute.c":"661d8728beda90b65721fc48541b1e532e01011b8ce4d1479da227ca9dbbd5b3","tests/expectations/nonnull_attribute.compat.c":"39d76bd914641c3e8fc8d5c803290901872b7f35069acb57b92a367cfdce2b71","tests/expectations/nonnull_attribute.cpp":"0f6bb96180c6352bccf834ff30122c85578b3b0a9c28264d45704bf894431e92","tests/expectations/nonnull_attribute.pyx":"1602314d618d995a29b1cd864aa30f4827512bae8adaafbe8ae4754b193e4924","tests/expectations/nonnull_attribute.tag.c":"c53457574ee33cbb888c851ee016821ec3213b5ef360831fabd70d781e7fb292","tests/expectations/nonnull_attribute.tag.compat.c":"45a99a1efc18db8faee7f396e4e4025ca20dfcd9d7e35be532e77c2e7ac08780","tests/expectations/nonnull_attribute.tag.pyx":"d4083a527238f5786acfbdbb0b7ecf19621787a726ecedaa6649e76d1fc33165","tests/expectations/opaque.both.c":"b30710454b62658d4918ce7201bc48574daf3e48559d70535532282c953e4a6d","tests/expectations/opaque.both.compat.c":"e8c8f7b4606c65a4569b04bacb2573ccc78e3199c75d55ac4857e258e26a1024","tests/expectations/opaque.c":"8e59e82e0dcc94a546b057b8798d4dc4741a0c400d407c062a3f275f6002c101","tests/expectations/opaque.compat.c":"ae35afdbe3cf3e068ab031a63265f4b94d205b1bb2c3a27c1554c90a3ef06591","tests/expectations/opaque.cpp":"1f6d6d69806dbc0df22f9817f7826f81a103fa7e144f4bb4c15f81ff8884f8db","tests/expectations/opaque.pyx":"621874f934c702e4ac17a23e1d35e59269300033dbc9304aa780badbc1531bb5","tests/expectations/opaque.tag.c":"23759de134ada5d93d0628de216317cbd7dc81dd2628742cb32971ec98311f90","tests/expectations/opaque.tag.compat.c":"4a49cfe48f53d84457e5892597d61fb278a66b3d21a94f7de12032c431e3d66e","tests/expectations/opaque.tag.pyx":"4015405e384c38acb9f7f592c566aa36d6200adf862c14b691eeeb79d95031fc","tests/expectations/pragma_once.c":"95e7271709e92cc423fffba8cd534b6cd9c5d4754d5cc6dcbfe9a539f44e2c75","tests/expectations/pragma_once.compat.c":"906e661e80125cb01c762351e5bcb7981428aaf3304b6ab20c6d6932468656d3","tests/expectations/pragma_once.cpp":"d1892017945637ca6801719e8cd5002ec64e456d3b2d3b2c04eb337af069ab4f","tests/expectations/pragma_once.pyx":"3a86c97c4392932f53b8a0f6ebb436ab37c67cfa31e569322fc953b38aa34de1","tests/expectations/prefix.both.c":"6b2b07a2ffc19523144d86f31bb19cb696573091037cbdd077b9dd71ba530ccb","tests/expectations/prefix.both.compat.c":"62404d5616108de3a2acaeb43b2ae6b46286f58411cba8a0be8bf64768b0b822","tests/expectations/prefix.c":"46b860a97e645cd5bd80256dffefa934fa79c18159476bccb45adb757cce441a","tests/expectations/prefix.compat.c":"781e5cb6e1384cd9be9b72db829cf551b3b5c4ffdc17c12774db01389973bd84","tests/expectations/prefix.cpp":"a84b94ef4e4370d32268bc709bd292f933dd2c3f52fc5e41128aba869f038ed2","tests/expectations/prefix.pyx":"961812022c4fc004db702e2d37bd36becec60d12302c98730aa3e1817c6e05de","tests/expectations/prefix.tag.c":"89007bd5e6f08452bb8754b2393017e04b1ace8d138cfc25904df019eaf4b08b","tests/expectations/prefix.tag.compat.c":"1859b9de1d0bce6191d5b460b0ad97153e9a696d960556a589f0ce52b2c4aacb","tests/expectations/prefix.tag.pyx":"77f2fbc0c2495f3e363e2e11787d6aa2d4e5a3eb7916be12ec91b5bfd923b5e4","tests/expectations/prefixed_struct_literal.both.c":"9559f5424ca4828af65d221bbdd30793289b997dac8ee6352414276cf731785b","tests/expectations/prefixed_struct_literal.both.compat.c":"08b628769f3f69e4344023118fccd0f65f5d73b1a2dbed1e8cf56945eee1c6be","tests/expectations/prefixed_struct_literal.c":"99a2da6d8da7278015d9a58df331562fd81813453856d302e3675a62e9bb271d","tests/expectations/prefixed_struct_literal.compat.c":"2c9a529e318c2772d804348938406ac2482ddad4792a08fe4e929487668f543a","tests/expectations/prefixed_struct_literal.cpp":"e23706c370947158ce34e6403016d321dcc5e852d4fbcc1ba7b35cd3b5e2e497","tests/expectations/prefixed_struct_literal.pyx":"def6e2fa920533665063b601c53bc104deeac1354463585cfa90fdb71a73a2bd","tests/expectations/prefixed_struct_literal.tag.c":"b68b97ac636ad4d9d87f42135b06fb7aee7c7a5fbff99d82eda74c1ebb5809e0","tests/expectations/prefixed_struct_literal.tag.compat.c":"ed20719d7f7639122f43c8b3aff649c88724c773903dd3db20272fe1bce9ebf5","tests/expectations/prefixed_struct_literal.tag.pyx":"b7ba0af6fa6e76b3dda926ec70325c5c7dbea07059c284d990310e5c63a0e1d3","tests/expectations/prefixed_struct_literal_deep.both.c":"32753f1450ab56384e15112615099cbf7e05062ccd2dc59fc3a729fd884e6469","tests/expectations/prefixed_struct_literal_deep.both.compat.c":"2c421ab89a10c32592af85876da4a71172c24e36ca2db6e5f3a5723866ebb0c5","tests/expectations/prefixed_struct_literal_deep.c":"997e66ee545f1a392e2cdf14f92fe3ea5fbfa5ff9fddb545c14b1346baf55802","tests/expectations/prefixed_struct_literal_deep.compat.c":"6afaeb3c4aca7f73957c55c9b6d153de0f6c410227d9004f2664db291e56d760","tests/expectations/prefixed_struct_literal_deep.cpp":"d5224b4588b8bdea25f32d35ba099bfef6744451dc851c60613ef84d75d63835","tests/expectations/prefixed_struct_literal_deep.pyx":"7ed0799231747875564eb43e78b18e0f803279b625c9bd845e8bf5ab9452e5cd","tests/expectations/prefixed_struct_literal_deep.tag.c":"dc18b95c737546333a0c116cfecc677556584a38d1f2e60a237d751c1e34661c","tests/expectations/prefixed_struct_literal_deep.tag.compat.c":"bc01145cd2692ad37659eea40f4097faa88602cbd8cb8a410bc971976f68c84e","tests/expectations/prefixed_struct_literal_deep.tag.pyx":"26498cb3a8152a1a50a12ed2d9c706959d6b90d39afc14158f4cd9d462474b84","tests/expectations/ptrs_as_arrays.c":"f23c55ffda78e07d22ad04db76dd3b49c2658eb919e709caa904820a510c8b17","tests/expectations/ptrs_as_arrays.compat.c":"dd7d3fc890b675c397f28ef905a5114047d0cbec79a1acadab5e61f9522fdb02","tests/expectations/ptrs_as_arrays.cpp":"ccc94fdc2e5418fb1c6e5a530caaab68459943d42d6586df46ea5c9aacc0676b","tests/expectations/ptrs_as_arrays.pyx":"3eb5550015d66109f9caf8d19f9498c8948b86aa3a950d0465145dd0618843ea","tests/expectations/raw_lines.c":"026afd7d10e04be3dbb480078a3e9c9c827ae3f97e688f17d7428fffec2b0264","tests/expectations/raw_lines.compat.c":"3f8f40efb683163f6d9451de6eeb454cfc05f17e7af74edca359dd08ef57b3c0","tests/expectations/raw_lines.cpp":"921d9cde3bc1c797b93a5b329e0d34160e53559b3c52effc83d4c8f1507cbfb3","tests/expectations/raw_lines.pyx":"4af0f1e258276f5da540c0405e8f8a5e5d8904d658736d0c1ba83fdd3b4ccfdb","tests/expectations/rename.both.c":"77faa1f85cdc9b812e4803c75248a6494ed75d16ecd24624c1149f9c81069bda","tests/expectations/rename.both.compat.c":"c9518f693ca9df5ee1abdd18c9945acb1b74ffb3b150a82772d6b01ae6a9b7ce","tests/expectations/rename.c":"8263595d6613ae047750f23e842ee77ff503f6408a557049ffdbfc16286be38b","tests/expectations/rename.compat.c":"1756807a3c51e53a3da260cdbfc91450bd54c8b22fd27e79ce673b0713114260","tests/expectations/rename.cpp":"dad94bfa862804316151bf74c8c471ed6c5b81a84fa6f95937fb768ba449660b","tests/expectations/rename.pyx":"2142172189e88fe19ca0d44560ec218af5557841c7214585b429be62ab245fb8","tests/expectations/rename.tag.c":"60018fdaae3750e2c60c368fe9a195027ba6ccae03a12533bbaeeb04a96d02dc","tests/expectations/rename.tag.compat.c":"61bbb70212dc73046e6be1a09250f1ba8163506ef53b4f5274abf383c7b9f8ee","tests/expectations/rename.tag.pyx":"d13f5ea7f6266966171ff07211e172e8da9b79315ccc5e87ddc53a6df7d668e2","tests/expectations/rename_crate.both.c":"0b18c131a60be4411fbaec9e05e1295c5ef7b6481435458e6626888929ef64ee","tests/expectations/rename_crate.both.compat.c":"584989132f23548fcb4efefc50a1d486c61a1096d979bbcc226b7d88048a7284","tests/expectations/rename_crate.c":"bfa98a6eb12d66ff783f4ccfc95e9f387241f4651fd4972d35c714aa11790a55","tests/expectations/rename_crate.compat.c":"620bd8a3177b1b85eef545054a2c0da7734acdc6cdf0de006550a5bf0b1f1463","tests/expectations/rename_crate.cpp":"bcd672b04df587cfdbff965a26c4036cefe4a32a0b0bc43f8afe12da6925062a","tests/expectations/rename_crate.pyx":"704067e5ed8c2a73a38d118b6c9de4d16fc16047b82e0ef5d20410aff3ceb51a","tests/expectations/rename_crate.tag.c":"2b7ca2afb0e0f30e8f9aba9f023879d34683d11da534263f40544c13df63fa6f","tests/expectations/rename_crate.tag.compat.c":"3d1a5aa501d0a5fe5fd729599edb1e1aa312b25dc7c5131f4dac351e31b8a283","tests/expectations/rename_crate.tag.pyx":"1f76217c43716d5a0c75c94ec2f5324ab4f65377897a727e2b82f14b4b27f823","tests/expectations/renaming_overrides_prefixing.both.c":"77c7dd26dc089205d7bad2f5ddaf80486425abf35c4dff952dc5e555ea1237d8","tests/expectations/renaming_overrides_prefixing.both.compat.c":"6220291f381b1503f344d4f5b2ffaae4a5bddb5385e8bc9ff71219f78fd5008e","tests/expectations/renaming_overrides_prefixing.c":"9c75ec110a52903b63e3174a636f0bd75c6d3daf03d041eaac1c3853d15cdac4","tests/expectations/renaming_overrides_prefixing.compat.c":"329934f453884687b371a9859a67f85270b56c6ff374a78cb03745b2cef7c4a6","tests/expectations/renaming_overrides_prefixing.cpp":"1b50bb928516eb1fddf1345dca133645fe271533ff7b0ddb106ce66ec1ffef62","tests/expectations/renaming_overrides_prefixing.pyx":"f739ece019f92a094a2a8ad937c16508f2b261dc8552a6eb0962bef9df69e7d9","tests/expectations/renaming_overrides_prefixing.tag.c":"8dde2e5380b0ecd415c4552aa95e272fbdcc4843bfaadce8845339d04ece4aa3","tests/expectations/renaming_overrides_prefixing.tag.compat.c":"b24513fd3120d796273599deebd8c81c2a40bf08b5ad095b1b6a63c3528a83ae","tests/expectations/renaming_overrides_prefixing.tag.pyx":"47fc898306bc851614103a77648ac89e083cfcbab345df711ccb92baf0750fd4","tests/expectations/reserved.both.c":"8f140f38d0872e5b17351bdb25e5b005ece1af0dd25252ce3c2db9291a459a8c","tests/expectations/reserved.both.compat.c":"089e8e487072489faf686ff79a66542dce5ffb62a70932cc420454e718dc08cf","tests/expectations/reserved.c":"e91ad65c8cb095fd5e391d0e0115714b94fbd5e52a2604861106832ed9e3c0ef","tests/expectations/reserved.compat.c":"ca3b08af39c9dc0b4402f4aa1bf27402b43916429953d8b5c59a489ae62512d6","tests/expectations/reserved.cpp":"a7ac3e2f0a699f5d0192e97812c68793e57a8b5ce07af48b6a9c2ff2a1680b0d","tests/expectations/reserved.pyx":"dcb0d2468b20d98ad1fd7d2ce295247849b492567b2361e75f6e01f935a9f1fd","tests/expectations/reserved.tag.c":"fa21c2123137ae01bb37f1458616922c4dc6ac62c05339f73142702808f1d2f9","tests/expectations/reserved.tag.compat.c":"2ee9b63889ba7a3262829b1a073da665bcafc8fdace7b4c2ed8c750403b597a9","tests/expectations/reserved.tag.pyx":"1c11e2d3b0137af92e64ea65f19c6eb3bc6d42f4da98f118a176ee9bfe5b1626","tests/expectations/sentinel.both.c":"87c249eda8e73ac37b586b6961e2cc0a0b970b793720c0a1552df9edd0fcc2f2","tests/expectations/sentinel.both.compat.c":"bc69a1dde5d2ed402211f979fc5a247b21638641a0869c556d44d6130b7a6845","tests/expectations/sentinel.c":"8c5bf6bd0b04574ed173f0f50f16e4191188a4f8401e05d6724f0eec33d35017","tests/expectations/sentinel.compat.c":"5bbc747d69716b12ed9f4cf3e64ea7b486d5473c86cc9ef4c03485e75437ec8c","tests/expectations/sentinel.cpp":"5c2d05019f8f65de0028ef870737fca9abb7ea177ba0d4dbb68fa5d9f1d1bcaf","tests/expectations/sentinel.pyx":"5d3282346d2c0ff7dfd596d0a7dedcc97d3df153c97c620f9db1584065c9593e","tests/expectations/sentinel.tag.c":"d50caaf5d902934525366f50ff8c85d370039baca0e5cadbbc13982ed7a98456","tests/expectations/sentinel.tag.compat.c":"a1772a029c21095e6431d907e6be39c710bd90cddaaa5612379f02fd026e930d","tests/expectations/sentinel.tag.pyx":"2d695cc04fd973c71b3b028cb783b02d224134ba23ea2691f8b5050b36a4189c","tests/expectations/simplify_option_ptr.both.c":"a9315625c4e207d341540be4393e28668869cdfeeba418b67b64a3effd08af62","tests/expectations/simplify_option_ptr.both.compat.c":"fcd19b06851c1390c1263fdcdd32889b94ab8be04fad3cbdeea3c03f0e1d5683","tests/expectations/simplify_option_ptr.c":"0bf41bbc047d0cdfa5b460e9b092ab053a0c39de701c9808b9542a21d5a7349c","tests/expectations/simplify_option_ptr.compat.c":"7e49ebe1f0d7668b5f3e0d6b0038fd8cb9521e252f2ed1650893cba636489817","tests/expectations/simplify_option_ptr.cpp":"03732ef9b5d8c030b17988a7910eb3206106b9ce246b536d40b3477b7595329a","tests/expectations/simplify_option_ptr.pyx":"77267c4b2a4b8ad4ccac828b882abcfb1b1ff73a426fe9b6b498602369b72336","tests/expectations/simplify_option_ptr.tag.c":"6cce4e91caca1d6ebf208a92e47ed139f79ce1ba047c58ea6ecd614c063231d9","tests/expectations/simplify_option_ptr.tag.compat.c":"ef3b81aeff6e5ef8718bfe35dc09d5edd2da63bc905033b6335e355f19534c33","tests/expectations/simplify_option_ptr.tag.pyx":"5ba414e05441c8c8bff572cd9e10cf116ca62bf01cf50dfae735af645c15f2d4","tests/expectations/size_types.c":"76501f91182f958bb08ebd6bb357646e36cfd7bc332fd166789a8a1fbf4cf397","tests/expectations/size_types.compat.c":"0857b5a4ca7bc32f8fdcf84b07e5c9d317a80b469525b61f12bf6f0f6a2e7e69","tests/expectations/size_types.cpp":"79e269afa154855faa3a96a2baf7f3a505fe2d1dacc07d04fcc35060e3c30d0e","tests/expectations/size_types.pyx":"71c927fec8165010be1ab8cfa4add0c86c3b420086a026967071cbb7eb3a91a3","tests/expectations/static.both.c":"6fc6ac1197c8e0bdf393bdd4f99d018057c832f611dd1b37dfbc985f6354bd3c","tests/expectations/static.both.compat.c":"d28d355eae17260fffb96c7903aa2dbdafb4f1ad12cd83a2cd7ec944f12c570b","tests/expectations/static.c":"4a84a7b7c6388ec65e0855c02780f253844256e9b8c9d2c8f9c19a1e67cc729f","tests/expectations/static.compat.c":"298387148c4c870854dbbe81c996575bce7306e640661c3c636a2e811f736dcc","tests/expectations/static.cpp":"a9054d752eaef1e6bd8edb169fbdddfd20f6f0627103ded58ad52d2e316f2a3a","tests/expectations/static.pyx":"7515602ece87657fbc5477cdb75fab6477332aa6964200b5c309fc4158bd7b6c","tests/expectations/static.tag.c":"67cd9094682d5878babe355e6f0036153008eff9a190abcff80d05e4fb3111f8","tests/expectations/static.tag.compat.c":"c132f2e64fd645e415ea99b546c97bca613348c0d4275681ff5079bd55d7b7f5","tests/expectations/static.tag.pyx":"d842f816824dd6bc1337b50bb653cfd44a9348abd6da1c2cc8e04c2773807924","tests/expectations/std_lib.both.c":"8ef283c43e91a9c77174df7af5d3999353e1daac3b0afdea17dbd132a6df22c5","tests/expectations/std_lib.both.compat.c":"997390aad31bdbe204e5aea068ee467de8bc2ed365991d8b514830282f60fba3","tests/expectations/std_lib.c":"8b8f89b986ef595c3cf7ae7604825ab30365406c1fb435fb0a7bfe1ab05f4297","tests/expectations/std_lib.compat.c":"93ce746242cdfe562bf0374584e0a913de41a718cca98ae54adcda44cf5d7a5d","tests/expectations/std_lib.cpp":"2ae1e7c56d054114d49ad95932d436f390bd89b37f763685fe91dee9617376ae","tests/expectations/std_lib.pyx":"b5f57cc4fe57d5132a8d98f1a4f19547e467cf8331870fb65573183f2d0b7730","tests/expectations/std_lib.tag.c":"0e1d6b0d0e41071718034e5940b01da5e45cb17c2f99db7552335c0720b86907","tests/expectations/std_lib.tag.compat.c":"2ee4070a5512b9fe7409c1b3444cda9ac3d7ba28fd17582fa0a461950a76ece6","tests/expectations/std_lib.tag.pyx":"1c8011a2edaa0128e4e90ed3e7ca1bfd0ffbd90d49c097b9f36c755938d08b45","tests/expectations/struct.both.c":"44788c37c8bcb017282501700e2211908547c973b1d67321f31c4c78edbdb7f8","tests/expectations/struct.both.compat.c":"7b06998839a1850750cfb320e1befc3f33537d49add9778e86bdcf575d03bb9c","tests/expectations/struct.c":"3f3a24f56a43dd92290367ed37d3e64562def9f91b1ada89347adb2a686a4e5b","tests/expectations/struct.compat.c":"72027b56ec38931f962b0abea91e94cc179b3588d7d7b4c738013a39c249e3a7","tests/expectations/struct.cpp":"24223fcecc97e832fe70bfc10ed515c4f3da7a4f9bc3517df93ba97ac604e313","tests/expectations/struct.pyx":"d266e1195a387510a1cf49c3d680301dc6d0988e207fd9031cee0dc343dab26b","tests/expectations/struct.tag.c":"98033bb2596a3852351de170e1139499ae39eb5f414c6624353709e4c602fc6f","tests/expectations/struct.tag.compat.c":"5e3b361a41f6a3540c10f632873483a2b295dd8bed5a2701fe498b20aba24704","tests/expectations/struct.tag.pyx":"8a7213ad4f7a3b5edb6bf341ffcf52804512ed5b9d75cbb8f7f453492b86dc60","tests/expectations/struct_literal.both.c":"dbdaba2b639e54e19512901ae9130e8524d8034005876398742dd90c312df1d8","tests/expectations/struct_literal.both.compat.c":"4e0814176a6e17bacf1f63a849c8f8fe7785b40ed3e38e4cf018fc3aaabe0129","tests/expectations/struct_literal.c":"8e120681c9d50cc290853a0373a75318c5b1d690b1480d6850e6cc2b7e621b3e","tests/expectations/struct_literal.compat.c":"433b9d0ca518190fad88709e67286ab35d6f6ed8cacf382a51252c15514fbee9","tests/expectations/struct_literal.cpp":"aa2be235a95a2f53b3b5e3a86072922c14eb1b1c2d93c9eee011f558e321506f","tests/expectations/struct_literal.pyx":"40a9b091b89403cab2295f72e5d003e1b4885f7e7104ec291a1f9f29e9b8f753","tests/expectations/struct_literal.tag.c":"41ab9ca8945eb6dc011925445882ddece4ea9bd8448277a5ad72d1cf71169a71","tests/expectations/struct_literal.tag.compat.c":"7a0e315ff9cdcd41e42ba103c6bfc2c220a6f1ce1b575980de4d4b6c5d52d5a8","tests/expectations/struct_literal.tag.pyx":"b369847669050e0b4f59aa8b05cbcf59813f02b6bfc9b7272d4862edb9eeaa97","tests/expectations/struct_literal_order.both.c":"31b61ab03512aee2f152073dea8423f322ee25e0754eb18dcd42d5b5ae3f54d7","tests/expectations/struct_literal_order.both.compat.c":"850873c0f1eddfcbe23ec803aab2f52b7128171b2db8a838142928144494a4a4","tests/expectations/struct_literal_order.c":"ab4e19c8e18c302e4bdae2e7e6d8d9b3e302286bb271d68eb2146db9e618f283","tests/expectations/struct_literal_order.compat.c":"489aab1f32445f2f32ac56cdc108d16a21357f6b269fea48bebb239c88b52982","tests/expectations/struct_literal_order.cpp":"4c711c9d0c7b6f4c934334c29868cdeadcfbf3715aa1e1edf6bba49a8dfd7fd5","tests/expectations/struct_literal_order.pyx":"103a67d3a52029b6e5971665571c2c8c996a7163404fc0e891ee9f4003c693df","tests/expectations/struct_literal_order.tag.c":"818bec81379d034429fa870fac46e9878b0744e6c4f992904f638781e308f79f","tests/expectations/struct_literal_order.tag.compat.c":"2b59847145b19e5c4059474cc83c26b7fb543ef26cc91c7555043c86a00e056f","tests/expectations/struct_literal_order.tag.pyx":"9dd53c9b81932ac80aa8107577d62ef4241fe206977735ead3f9cf55a9663bfd","tests/expectations/struct_self.both.c":"2a187365237828051a485326d209fa72930b976bc82e580d74081eea028401e4","tests/expectations/struct_self.both.compat.c":"52fb23dcee0f333c981b9a40ad1a222b947b99f7db8feff437c6da775a5894b7","tests/expectations/struct_self.c":"1937ed40437d089404ea04e85df65343f4048830485b91680c44ecdd41f26cc7","tests/expectations/struct_self.compat.c":"8fb27c7eaeab15fbf369edb806a9342ad5d65c4be8dd88a411b10a290725f11e","tests/expectations/struct_self.cpp":"59c4b69ba609084b14f97b7ab545d601aedf9ed4429e5682155f791fdc212614","tests/expectations/struct_self.pyx":"4c8ef74ae6e2c77beee59c4ec671129bddeb7eecb8b43670be71160fdf0b8881","tests/expectations/struct_self.tag.c":"de2462cc5788b3a858b096fbb99cea9d13b9646b7cc8c65247d9492418f1cbaf","tests/expectations/struct_self.tag.compat.c":"c93763dd177ba56e5dceb21295c0eb8f66be05e5413edc91019240cfe840f53c","tests/expectations/struct_self.tag.pyx":"386321c5d2f4dcb7a714cdf7bda34076f9f90a706a9b2e58ce8bd1794c89bd41","tests/expectations/style_crash.compat.c":"cb16feeb6243454a636876fa5a6e046595e73f112eaa59dac9381732696d6452","tests/expectations/style_crash.cpp":"ce08b96a75048e41a1b1eeb07f188b4ae7759210996ec85060ad255fcaf360a3","tests/expectations/style_crash.pyx":"aa2a91d9d06f5ea56f74e813a887dcaec06903befbe5f4cd78c4cb8b53dcb0cf","tests/expectations/swift_name.both.c":"5dffffc5326d4ef841b68d8ade7c410c6b20851b604beeb8bc95354c2c4ec10a","tests/expectations/swift_name.both.compat.c":"554721f3f10201d18e7df09790086f9097b36fe5513e809b98446c782f73f1b3","tests/expectations/swift_name.c":"03b1398b9daf9b0acce73f85240b2085820d644d9d067363a53dcff95e892a5d","tests/expectations/swift_name.compat.c":"bf0cce62d4daec8e2408cc329d2bd8f70b9d8825ba3f278baa3e14f9f589069d","tests/expectations/swift_name.cpp":"f50a92ca45571eea3300a8f85074345289c3e3a4c4702195254150e7073aca00","tests/expectations/swift_name.pyx":"55346ca8f01e944a91aba0a22b7d8a92cc4a11677042b37e69e245db65a97cfc","tests/expectations/swift_name.tag.c":"155c5c6272d9671d4c2db0b1068aa7ed339c75ccfc349966a65364326ae4df07","tests/expectations/swift_name.tag.compat.c":"9b42f24733598f827941287ec9a551ed125b5016cbf902a14d7c05b5e54adf72","tests/expectations/swift_name.tag.pyx":"140ed42417c2f7d0f6796b563fc6b99db508fa3e106664fd367146213c6c2492","tests/expectations/transform_op.both.c":"c2d396ab17fc51293bc915a17ba6a0c165de4a50a7aca5a2a964648fef0a95c7","tests/expectations/transform_op.both.compat.c":"7ff5109437176e0dbc4f394291e56951d01da7dc8b471abb7f6cf87fd970dfac","tests/expectations/transform_op.c":"5c71a776ddf337608673a9f4f700dca411fd8da784b03d8baba8adcc60104c2a","tests/expectations/transform_op.compat.c":"0b70a18c01c7c5b9d4205ffbe8c04744adcfa0117c5bfdb97f1376ec8f63763c","tests/expectations/transform_op.cpp":"63446b46079c175bf99f2d475e360fd0d4e4f5ce2556fdf03b4331441494a47a","tests/expectations/transform_op.pyx":"8dca481203d0b7e0603ff498ddb66b0436bb71dfc4deab575117c1f4b390de5a","tests/expectations/transform_op.tag.c":"dd27004c7302cfd344582142679e81a2c4924432133771ac1b3511da71bb50ca","tests/expectations/transform_op.tag.compat.c":"42fe132b57f0b35710c8ae362f4927895b64d1012277af892d82095a43922774","tests/expectations/transform_op.tag.pyx":"90d89fb9af7f54aba3f6f6adc95d3c3a87414708448ed97596a7712b282036fa","tests/expectations/transparent.both.c":"c1ed47b4f14670faad177efcfd9c2bb74851201444da5a6ccf70a65132cba916","tests/expectations/transparent.both.compat.c":"23af96040634abd598e2196026cc0a23eb1a7f7b54bb4c2d7c28e0d74252377d","tests/expectations/transparent.c":"031e1800e40b6bd59b649a05b303df6fdb57255e7e7190c39c511a7b27a7bfdf","tests/expectations/transparent.compat.c":"685184af63abd732b4ca35d59d5de8a56150241f372c07204237c8b364379fdf","tests/expectations/transparent.cpp":"0a002cc3f56b248491e9780fb6986e03188a2360649bd46745078524b886b6fc","tests/expectations/transparent.pyx":"825c4b65506bdf5355b36f4d9c90737c86bc6d29272b7f9f5d2e5656effcc630","tests/expectations/transparent.tag.c":"6c5b0b107f05f345bc81c030233e63d38a7a82f5a5be719cc6029976892c6851","tests/expectations/transparent.tag.compat.c":"2c5cac22393daae1c514c17f242099f48d4149b9b8d495b697b0c2eeca34b60a","tests/expectations/transparent.tag.pyx":"2a39efdf6e611d81f6fbf67d658158e1bde85e8ad70f9ab93ff4336090ff84a8","tests/expectations/typedef.both.c":"79d5c5fb08e8e6929576ae536c3d7141607ed7a363a1ebec5dd82ce1f0f9cbe5","tests/expectations/typedef.both.compat.c":"88c51043226253b4ca3812c4b27998ceadeaa6637d8db6b34b4b05c93fae0528","tests/expectations/typedef.c":"e83d84aa0bfc55d54f16fb98cdd17e07258f129fbebf5523aee55ebced1d4b02","tests/expectations/typedef.compat.c":"32fd05db2b98796097ca252436bccb8270474ca61de4d007d5248697da092443","tests/expectations/typedef.cpp":"e208f1a81abee51bff3ed49f62f814c630e2303c61fcec26ee013516003858d6","tests/expectations/typedef.pyx":"79e655032a2811193bf8fa6278fc4d21d9ff93617b508df9c6964cc44b017a3b","tests/expectations/typedef.tag.c":"4af487e5e1b6e74f17ed8445c6e3a69f96307cc2f904d7e9b212846112575862","tests/expectations/typedef.tag.compat.c":"5cf3831cf49ab69a1900ff58fea5488bb2ebdb75d9829d5d2d6258d332970383","tests/expectations/typedef.tag.pyx":"89f9e5ee4e2919f80a7f615ccf995d87ddc3e794e3921c50c87b68511864dcf6","tests/expectations/union.both.c":"976ca72778588d6ed517b25f7315ade9f4d96a4261b303ecff40e8a0d7ada15d","tests/expectations/union.both.compat.c":"0590d866fa3d6fa7131cbfb2c6cad13ede12a10607e86705dd49550d53626aeb","tests/expectations/union.c":"966eac07c65ea6a6b5c22e90e55d06d931ae539662f862de3ba8be7039c04ad3","tests/expectations/union.compat.c":"0a7acc07e93f11677b2d6db5527bdff0bdb0cfa2dbd7a1e0190b3958143e50d3","tests/expectations/union.cpp":"848e43bd7086bd94c136f347fe2209adbad074527d2c9d07dc26d0ee0bbfa177","tests/expectations/union.pyx":"577352939826b36cd714b1f4ac244ec4c6030f9bcfd99aeb52b555e2f5a0b691","tests/expectations/union.tag.c":"fbc4da207f1ba8f3c26a014ed5ef015c6c46a442b65129ad363be2f12e6dc963","tests/expectations/union.tag.compat.c":"96ea2eb155962801870ad8bac885ac3b0350cc0d7d363d8e0b0ee713a6f3c466","tests/expectations/union.tag.pyx":"cbd531379c08e3b4e2b148f087fbfdd18e97f570fcfa8cf89b68b769c12557ed","tests/expectations/union_self.both.c":"f6aceb8b80c8467c6c83549874de4ad41aff41f8898c0e7fcdfe1e01a1609fc5","tests/expectations/union_self.both.compat.c":"5090bda547f554f35673ef355e0c89bf863bd79a3fa98ba98dbbc27a10dd3722","tests/expectations/union_self.c":"e51ee5773a115e0dc23e4706a07be90dc606d8ceda653aa01f8950f83b67c8b1","tests/expectations/union_self.compat.c":"963d78273f7e213f0223153b87c73d348c1a234df0b7fb215d8b239b4db6501e","tests/expectations/union_self.cpp":"7ff87eb2163420bc3d7deca616b96a53225bea94d30b24d955ebf0240b773dae","tests/expectations/union_self.pyx":"194a0d6d5b7b338722fe966b55a3b09aee375e857942f1d218bb9586d08a282a","tests/expectations/union_self.tag.c":"eb6db9deec2228df7e761ef5ebcc2a44c9bf642db635bfaf9fdefb74ac848c18","tests/expectations/union_self.tag.compat.c":"c233507a1b1e6dc09136a1f586a84bca9f67cd2d0cb750936e449b8145dbb16d","tests/expectations/union_self.tag.pyx":"a9c50823695c5d7d3be5d9448cf498602c0aa138f89868a6499783ae26281ee5","tests/expectations/using_namespaces.c":"fb2d6c8baed0b32ac1c5e69864e57f73f0a5c2ab8a6b37a5e763352ae43fddeb","tests/expectations/using_namespaces.compat.c":"417a45ea1ff78f2eac7f84c617d72377117cf31388df070ae6dcb70a412f33e5","tests/expectations/using_namespaces.cpp":"033d493d0d18d4f21abd489ba9618d49bfb0f7049f26ab5963f388c52f39467c","tests/expectations/using_namespaces.pyx":"3a86c97c4392932f53b8a0f6ebb436ab37c67cfa31e569322fc953b38aa34de1","tests/expectations/va_list.c":"7291161e6f66f168ce9fb4847f23fb2f64b31673989c08f8a2d3e17f6a2932ae","tests/expectations/va_list.compat.c":"113022c8ecac199d198670b2015c1524fb4d39b956cfb590e3661c4c54893442","tests/expectations/va_list.cpp":"56eb078c75de4615661419145ca5cee17b7f08de361585d3481570d222430876","tests/expectations/va_list.pyx":"cd38bcb0ea0e75cac7b0ade580610919c096eafdb6815d1510bca2cbac091d76","tests/expectations/workspace.both.c":"7f468e3471a1c21fb19950107c32cbb1f61a55bbfc7217038a6b155868eab0c8","tests/expectations/workspace.both.compat.c":"f3cac1a0847e3bb118de25320846fca47cb08986a048a18e97edae0c17050648","tests/expectations/workspace.c":"f0b6aa5ec14968a880ffbf21662f901aa3955c46c401d87e872dd283ba504069","tests/expectations/workspace.compat.c":"6f040c52cb58257efb5c43098e413e751395aadd69b320ab9155da3c3cbc5000","tests/expectations/workspace.cpp":"d2703ae98a39d188e95fe0f1dcf6b6220063d6349dda07673f990efdc3e85b86","tests/expectations/workspace.pyx":"5c341cf4f8c6f3269c92e9d681937f2036ea11f2dfc76ce506139ba5f9d1ecfa","tests/expectations/workspace.tag.c":"ed26bcdb8568eb62f2cc09e6112cc012165e6faa2b52c283b8c28dfcf560cd23","tests/expectations/workspace.tag.compat.c":"f842aaeb2648812733f436d312038bab8c875534171efa5c82a88b87253968c0","tests/expectations/workspace.tag.pyx":"aefa3818c4a23869e8119abd4103af623e277a73c971034d851fdc48b3fe489f","tests/profile.rs":"0b17d028acfbd1023bb027e19955bd6288e845437dea1f96ee770e1444a98d7a","tests/rust/alias.rs":"cfa45dce533ac0669cb5f8a5facd80b1308e5b38af26082361ca1fad683dfb01","tests/rust/annotation.rs":"2ec88922528b315bda1515e9167b5f771ac958b8e16db487b1427f6b4576283d","tests/rust/array.rs":"f3f321ecbb21331abec66eb8da2200550bee1a116e4a5c1389c4404114388e67","tests/rust/array.toml":"7935a7d9b5fabba3f500058ce7b3c0cd79449283e6a353a3d1658e55709500ee","tests/rust/asserted_cast.rs":"5207c37aae5b929bf28195c619fcc23f6887be6d763205b201c1411d1f58d321","tests/rust/asserted_cast.toml":"49d996a324f26d749e4e9a03a2ef1e30421e6716b652d24e6bb3fb753b00139b","tests/rust/assoc_const_conflict.rs":"dd5bce15a9b1198f06b06c7ddfa9244ee69e102baf487608db0521cec65de2b4","tests/rust/assoc_constant.rs":"3fd9391aeb6610ffb03e1cba5725dbd581a30071c7d5440c8f97845cdb3c8534","tests/rust/associated_constant_panic.rs":"761b5d70dc78a3b08713e8ec804022ee9e81284e8e968c2e7921f911f926c0a0","tests/rust/associated_in_body.rs":"c8a8d68abb265d6964e08106eda8ad83c984852a1ded4e8648d0e01fd46915b6","tests/rust/associated_in_body.toml":"b597b722b4ce0071d47a6220237838794c77b1ad5f22aa9e33b7a56e6f7f1ab1","tests/rust/bitflags.rs":"38e4079c25d22de34ed8ab963efde23c95a49279dc32a806194496f63946f8cf","tests/rust/bitflags.toml":"fca6c9a046bd44a2d9d34c64843265a84218f493f43e845f1be7965e56b318cd","tests/rust/body.rs":"986d2f7b8d9b4c4b76374c31bd7924d842249f9273dd15596fa00088ade2d86e","tests/rust/body.toml":"cfa734400fa079e137a3705c686c35eba1380b2f8dca9480b10e1930a292a9f6","tests/rust/box.rs":"03434d85fab066ed38fa39c372bd3be89af96913021c0190770da5f961e48bf8","tests/rust/box.toml":"78361b0fa8d7b0dea35cbe78badcbc5ff72bee8b8f69c451b3b305fcc41dfde0","tests/rust/cdecl.rs":"49d928c33231e9df3c0232aa913defd771c16c540617bda8c238cf8497436f16","tests/rust/cell.rs":"455a5ab03499d3bfc4c1f6662a29bcde0dcc8b09aac0058ab3a142192c87a9ae","tests/rust/cfg.rs":"dc612c646079401aa9ef8bb03040ee8f8d412683877959bd8a581d9953794d68","tests/rust/cfg.toml":"4af74309b7723df209b4880575e952a40af7a9a9acc7ab6e63ac052bc11ce106","tests/rust/cfg_2.rs":"16c59cd70008418750bcfca47c14a87a348b34c81fccc06115b68b0933b8dc64","tests/rust/cfg_2.toml":"49e149901948f7a1f2ed5cfc6d415b799d51848de235b2be153e7ef922d544ff","tests/rust/cfg_field.rs":"904aec8f65fc8ff7a33ec9aa474891e87770de411ed1603c1cf3f5e14c0703f9","tests/rust/char.rs":"8d266ad0518c6d864ad117f438963b51995fbe1825e415c35abd1c305b626364","tests/rust/const_conflict.rs":"6027453be28b17c20eebb6ea450b91b1e781b41fca08b97725b0eb7393120b47","tests/rust/const_transparent.rs":"7b3b029268345c373b4cd341c0be1bf6fc61d0ba9752f1f298e873f0b2638a71","tests/rust/constant.rs":"73eb998b1de5c6b48b73981e47b87e40a86bea6766d5ab31aa2f3f54d1e86071","tests/rust/constant_big.rs":"ef57342d59c7252cbfb5668689b82f44a9905d111cf5495dba655c2497edfa15","tests/rust/constant_constexpr.rs":"d5a974e8a2309975e069a59e8621d898aab8d52da8aa0d776d9571764508c99c","tests/rust/constant_constexpr.toml":"d2bc5b227f10948a978f3ee4e4ad89988495dae469219d27361e1bb08205ed69","tests/rust/constant_sort_name.rs":"b0fc655ea110af97dc80266dea84aaca098fb03224caa818c0adadcd48061b7d","tests/rust/constant_sort_name.toml":"739bdfbc7a1edaf7173011220ad822d8929ceed0985cc68700a478ae9f5caa26","tests/rust/constant_sort_none.rs":"b0fc655ea110af97dc80266dea84aaca098fb03224caa818c0adadcd48061b7d","tests/rust/constant_user_defined_type.rs":"49911c1eb1b69771a020a705fa6ea538d2a1e26d1181a8fd6c1cfc11e16affd2","tests/rust/custom_header.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/custom_header.toml":"4ca71bdad8db36ed78e0cb6342a33a4023f3f535a48141c43905750ffa688f96","tests/rust/cython_options.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/rust/cython_options.toml":"425bef8aafe10ec59986426f8147abcc56e534b12b950fba7ab2a3db50bf56a6","tests/rust/derive_ostream.rs":"d815d16ba4913a40e4893fcf16193ff90abf352556191eb98d91ecb356ff0fc7","tests/rust/destructor_and_copy_ctor.rs":"8eb882982e9eb3d08a1157c89ae6962a55624f3e5ebf878757aa9f31a9eaedaf","tests/rust/destructor_and_copy_ctor.toml":"b1e73400004d05354122f6aa57352eee27c3f543c08f5b689802e47dca5d6a2b","tests/rust/display_list.rs":"b4c8388b49c0d62ecc2ea3b2b43474b7ef672e196cb9c456f9f0dd317cc315a2","tests/rust/docstyle_auto.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_auto.toml":"1609736841750b13dffd4ccd31820b5212913c19cc2767bca90672825a055614","tests/rust/docstyle_c99.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_c99.toml":"434839317738bc8ec8bb7b71cd3286b1cc473854929daebff35bd8748b056fa8","tests/rust/docstyle_doxy.rs":"44f9d1d22a4a44930e69fef2603b6a0fdad5767a0ba17e0fce89927597d5b4f7","tests/rust/docstyle_doxy.toml":"041f3902d904ca4756bc35352b1885781b67314a5a35f4c894bfc4aa3e0185e1","tests/rust/documentation.rs":"3c3451092feeb8f6283a968a7cbfcdbba23a6004327761e0fe8d4073a3ba19de","tests/rust/documentation_attr.rs":"7df25a9c3e7fd97cc916c324536d30816132c927c325b8623e24321806d879cf","tests/rust/enum.rs":"287c6da1a29a4d62dd8565937b2ba9941ac1374f58087ace4f7dd94f48f024c8","tests/rust/enum.toml":"7956ac93ab5fbfc6695a76d96b4c09013e80b609a47bc7e384f5ef3afdad609c","tests/rust/enum_discriminant.rs":"2415b502bfa695c84ea672fc24fa6842ddc4c06ea55de261fa035b30ded94a3a","tests/rust/enum_discriminant.toml":"7a4b4d6adaf4d7fbaf6135b4cc859a86ff9e62b184c44cedd48bda4e79d0df27","tests/rust/enum_self.rs":"07523f250ad30b00cdea0325e55b93e066090a42f2d37cf07d185a81385ac3d4","tests/rust/euclid.rs":"d93d138d31e1cd90ffaec25d44feb2305dc702f45db04733b1ea79c0f164fea2","tests/rust/exclude_generic_monomorph.rs":"4b6299729923ae1e36e4ee3ecf766cc2825b46a25d0ed2033641cffb7c3b35ad","tests/rust/exclude_generic_monomorph.toml":"fad039feb18394d4d05d597a95118f4c3eff754b684397d54260e6e772c0d996","tests/rust/export_name.rs":"bb35cd7d9ab197774684aec596560859315ded1bb29ed161907960423d838ba3","tests/rust/extern.rs":"fb8c0e2b06186b4fbcce4f059289bc9c775ea42d3e36f935d407a2882f32c9d7","tests/rust/extern_2.rs":"6299ea10095ef94e3285844029c067349f07fa78c6d891b3e7402f85db36bcf0","tests/rust/fns.rs":"7c8da1440a30830b395bac08d50a0a41c91f01be00b57b8821b6e40159d5d487","tests/rust/forward_declaration.rs":"3e8616a472d97bff7239f42c7991e4893a2b7ef8730f6833b767c0d37a4cf7d2","tests/rust/forward_declaration.toml":"f4e9df03133b937507a034bbec10e680969fe47a57bbbb65701d19fbbddb5190","tests/rust/function_args.rs":"81ecd18c5919a3508f3bb6f04aecf4f91ed9db27da6d4b54a17fbe1d9b626643","tests/rust/function_noreturn.rs":"a73613002a639aed7133e417de53b4aaa662da5be4e98ef6d975dacf299d5e02","tests/rust/function_noreturn.toml":"3e0549ffddce990d0fe3e3860bff8f2e39434658578505105afdc6b37d1133b3","tests/rust/function_sort_name.rs":"a816564c64059e90587172feabe824726eb58050729f43237603bcb5dbf3694f","tests/rust/function_sort_name.toml":"1dcd75d52b46fc43de0e5c7b3dc300338c68e8ac0becb5b375821820c43a369a","tests/rust/function_sort_none.rs":"a816564c64059e90587172feabe824726eb58050729f43237603bcb5dbf3694f","tests/rust/generic_pointer.rs":"620d093fb1606a81d1afff60d1359bf76461214382b968e951dc12d1070af5be","tests/rust/global_attr.rs":"279e4ce58c67101d8d03f002a918bc89fd4b819a44b43a9e1259fa6529d02692","tests/rust/global_variable.rs":"0d4f12d6b688bfc5a9e134d94bd5391213bc24793aca59b5f9f3f3a8e4b9c7d8","tests/rust/ignore.rs":"abe57db0bc568385ba20e379a30f928d8c5a3f851b8910fa15d05ccacd1c3a74","tests/rust/include.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/rust/include.toml":"0c0530f9ae070027bfb23f539458782938401d028ea1b7b457dadc6b9eb0ee19","tests/rust/include_guard.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/include_guard.toml":"4f92729aeec3544b88bee8854e9b608c3fe5cf523eedee86bfd818a657d6ef9c","tests/rust/include_item.rs":"b59b9e35174bf2156e7d4d3d686b0fb6eb3976abd1e5c270693e3987b8ff9e4e","tests/rust/include_item.toml":"a8a25d0f3949303c1b2ac75ab142bd2a3418d54e335008f64ffe0c08a4f8fce2","tests/rust/include_specific.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","tests/rust/include_specific.toml":"579522a1f980d6a2b950d2cb0abe527c2c87b7d8147946ccacec0eadc6a7b2c7","tests/rust/inner_mod.rs":"84d975ad14c8057f7cfc21d2a0dffdde043fef5e97e50bfb76abec61af617271","tests/rust/item_types.rs":"507a1de52bc29698edac28f08b0cec008604579689b9ef3cd832eb56ee359482","tests/rust/item_types.toml":"92ff09b39cb560124161667fa469e58bb5b369aef7b59e7668a84c8b7986c09f","tests/rust/item_types_renamed.rs":"507a1de52bc29698edac28f08b0cec008604579689b9ef3cd832eb56ee359482","tests/rust/item_types_renamed.toml":"68ff8b74b6dda04323ce09fe90260a5b6f203c9e7a75d77e021ffc973447a1cb","tests/rust/layout.rs":"79cc422e9976fdbe44272a185d0e233f96fd15e86af092a0dc9ded5517e9178e","tests/rust/layout.toml":"b4fb6c69305f20776a22f40a3d2368280fd908426ad68572ab59a0ef0711974d","tests/rust/layout_aligned_opaque.rs":"2b4af2cf9a2308a1b0407f389e680f5a3a5b81cc7121d4164aaf6c10de8b5315","tests/rust/layout_aligned_opaque.toml":"2ea5eb9208f53a0246f458fffe093d0a557ea5bac8a3910bf80efbdb56fbaf1e","tests/rust/layout_packed_opaque.rs":"fdb022462224bf6679111ed2dc4b294352d235a3ccb53a21cecc0418624370f0","tests/rust/layout_packed_opaque.toml":"b2f2d4cb9061267ded116cdd461a7ae2d3f156f99d007ad8d137f60588a19c84","tests/rust/lifetime_arg.rs":"33c5066b198b82e1bb6044a3ed913447cda9e52ac43c893a239c2d4ab0a98a54","tests/rust/linestyle_cr.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_cr.toml":"24724f1514e7f79178fbebe757fa24f84ba1b996cb37e1d4de35394a2eee88e9","tests/rust/linestyle_crlf.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_crlf.toml":"a315db1b1b4fcb6b5de44b8cd88f560161a99c166ec38470f9a7c7c0a9b0f02a","tests/rust/linestyle_lf.rs":"734eb068f66bf32f85ba9f0dcc1973a85b56eb0a0561daea0a26272e238c4eaa","tests/rust/linestyle_lf.toml":"9ac0b95d322c535fd3d13cca88e1a41c07f76bb82c073a6c201702085cfe136e","tests/rust/mangle.rs":"d7079cf6c93304424952c0f1d3633585b13a3a4b9ee42aa6cc924935bc8f1030","tests/rust/mangle.toml":"9251c18d50b2c1f57afc70979f70cf54fa4d96b2b8abc3b7bf02ec1e74846875","tests/rust/manuallydrop.rs":"c6262ebd269697737c3e169db8344dd58bd51c049fe3a0ac65d3dfb25a8fbbf7","tests/rust/manuallydrop.toml":"ad2c9b4a190521a243dd37c27f9894e93dd274c2782d6651229ea09a6ff63745","tests/rust/maybeuninit.rs":"fde78e4074fe0eb6ed75f1416b5fbeafe5931c4df3edcd1e51c31e4f38a5c517","tests/rust/maybeuninit.toml":"d2322c437c261ffe1ca9bda7cca7cc78e9d6681a04f32c0aad7ad95852fb3574","tests/rust/monomorph_1.rs":"4daa3c42f7a1bf0bb7dd6ed605f554db4dc6f8dbfcff999939e218195563f1f2","tests/rust/monomorph_2.rs":"eab2dc18f375594f16e00b401c9c8f4f98c770d61807c3323080ec811bcc0230","tests/rust/monomorph_3.rs":"e1a03e6f9c37a64183adc89ba978bccead47deab61e563f02a1a66520782154e","tests/rust/must_use.rs":"fa6d2c1474f4dc07b5b2defc463ff0976e9ca25eb93b691745174fe1fbde11b2","tests/rust/must_use.toml":"4c4c13940de3a610e25d319682ed53a10c26a0450f3ccf14b90e730d701822b5","tests/rust/namespace_constant.rs":"d280b65bdcf529b456570a01f0306b4e9ffc0aa22200fd8b54e9e5433f6c5ab2","tests/rust/namespace_constant.toml":"493e814e3ade6f1fc4d34140c73d0ecdf00f1e4864f7719516d799eecc9eb2dd","tests/rust/namespaces_constant.rs":"d280b65bdcf529b456570a01f0306b4e9ffc0aa22200fd8b54e9e5433f6c5ab2","tests/rust/namespaces_constant.toml":"6b5a58b167b9890c186ad92c9f9164b9f3204a86d706a7be688d51f8a666e9de","tests/rust/nested_import.rs":"35a8343efe9117b3ca460b2d8e9a4a0813d58f622ab776cbe18527814d7105c5","tests/rust/no_includes.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/no_includes.toml":"504215785a725906418431f044ff10cd2ea2db7261ff990a3f278dae17c05e58","tests/rust/nonnull.rs":"dda4baa922a142eb7ef283a5fb672fed6492552adbcc82106e78d482a8abc39b","tests/rust/nonnull_attribute.rs":"9479791492ee3c9e0838e3b7d207ff3338d0c7867ea9f5f7d42c4224cf1f515d","tests/rust/nonnull_attribute.toml":"d41f84191d8e843f2d87facc3e4aea13b2d4a02099e3e1fa9b583c4d1b855c91","tests/rust/opaque.rs":"d22d57adccab8cecb28d4573a42de30e76bb32e836843012b720a4828c35b227","tests/rust/opaque.toml":"4c9bdee2ba996a05d3148a6f12ad7a64c6f651c3e00b199b7e5d5a9f35ce7140","tests/rust/pragma_once.skip_warning_as_error.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/pragma_once.skip_warning_as_error.toml":"bf1d35fcffe74f6689f53712cf7e079693f0a92c6e77403b5f9a5b0fcb0cb96c","tests/rust/prefix.rs":"773f2824b4771b8ceefb44e4ebe0b1d991acb0f297960fda543ea7a657854876","tests/rust/prefix.toml":"c6ab6c4cd09d12cbb04ace74dacb51ca5c89b6f0d77f2d95e918f22a9f27c0e3","tests/rust/prefixed_struct_literal.rs":"ce1843b02706788c31f8fb5889674ecc17f7940254cdf1e37ca47846b18e56d8","tests/rust/prefixed_struct_literal.toml":"d74eb710eb1f3bd05a723e54a6897170491ba0ae9bcf26acd1a3fe00e3a4ec14","tests/rust/prefixed_struct_literal_deep.rs":"fdee21e3739e9cf93ce1886d20e83db7597f3bb0d0c60c0fa5cab0e3b8beb1e6","tests/rust/prefixed_struct_literal_deep.toml":"d74eb710eb1f3bd05a723e54a6897170491ba0ae9bcf26acd1a3fe00e3a4ec14","tests/rust/ptrs_as_arrays.rs":"264ddc525e4286ec480caa1e011c3edc846eff16d2cb5f061295be55a86a3844","tests/rust/raw_lines.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/raw_lines.toml":"18d6b74ac6571b81a58c8a36e9e23c594537cbb63e79df73ffffb54da39ee87f","tests/rust/rename.rs":"9a310fa1c402c996047927342a94bd50f36697d124cb3214f91de31bb7fc31c1","tests/rust/rename.toml":"42523c11649292309fb8a226e2153768c5e44af1cf586d53fdd44a64bf59be40","tests/rust/renaming_overrides_prefixing.rs":"f1fcaf9d1f7a11f749e819524d73171986f76543204dbe8e5781097b1df6de4e","tests/rust/renaming_overrides_prefixing.toml":"ce65e3488f3e8c1ab5a4b6a191f1555b83156619bf332286d40005be260cad33","tests/rust/reserved.rs":"5a802dd88ef94f129d93a895ed1e81531100e8cf82d8fc5a9aa55afcd50e3458","tests/rust/sentinel.rs":"a982a4067401d8257f0d45d7832895eec5c8a352ff8fca5fc49a4149599d89bd","tests/rust/sentinel.toml":"93812028777748e46ee6b023b3f41864718862d47a862a92c0073b84e03f22f3","tests/rust/simplify_option_ptr.rs":"cf2bd798f4be8ea895e9c094b3422bd9dc6331bf2980831fc48433bf2b4f119e","tests/rust/size_types.rs":"314dc9b48853b286c6dd2e40dc355411a4310b5039f1aeeb39f573f3f891becf","tests/rust/size_types.toml":"2a6c8e75eac5a680c34b78599c04c41379dbe0ce6d1ff6f6291685fb156ad6bf","tests/rust/static.rs":"2241389aaf3d3cf4db7dcc16071b2a2abab28669b11ba4f2a66fa85339688fda","tests/rust/std_lib.rs":"c1c8f383f01608f7f7c6a104fe470c8afd25be0ceb2194a702905fe9aa82d74d","tests/rust/struct.rs":"0b43021c98dbe0822a71d4300bb48efa9ba7e7d50d8816d3d38c866783e62099","tests/rust/struct_literal.rs":"d459e815498b0457f1d5bdb9ecec1a375985e2d57442ddfa29d5335e4cf8ff23","tests/rust/struct_literal_order.rs":"b3b4ee077bf7362a8b1af37ae5dba8bfa3c0d13a25e6f49a201eb857c1024c68","tests/rust/struct_self.rs":"7f0ca8785ff6d25be86af271229a42958d6308efe1da71421b5e505a3626c267","tests/rust/style_crash.rs":"8c4c716638c58260ecced5a58bfb035f6e42375a2d221028c2fe0d99203e6b44","tests/rust/swift_name.rs":"4852f0d6547ed54e6f2b1de9a977a743a025ad8da16297818bc24af7b17199a6","tests/rust/swift_name.toml":"1542a5b0409fa024ec7c81190887633dedb186c14d37b053c25f0609fd99b381","tests/rust/transform_op.rs":"103e3ccf7f34077ff2e61107242fd957cf0c59ba659537b12facee18b22d08af","tests/rust/transform_op.toml":"6129b6b8ea9a289eb64ecb5123929ed31d09f1374dc59341e1fa6d22842e55df","tests/rust/transparent.rs":"42e2adeea38fb1418a011ac6dd8fbd97958f8a91bf6c6faebb687dab468fd3e2","tests/rust/typedef.rs":"8e2c8c9dd0014040187fbc656a1a7921e4faabb7c10ba00f7d68fdbe05c1219d","tests/rust/union.rs":"4e697db4b97ef737c06f9997f341505b306abcb6145a6b767b8203f72ceeaff9","tests/rust/union_self.rs":"bec8ef669782564e9710598816aa7266e2ab33321b9c2f7c7b4fe8c683386afe","tests/rust/using_namespaces.rs":"6bb8d24e0a54594a9db16c3f19416f81945dfd570d9dc4eb64f75b25535c7cb6","tests/rust/using_namespaces.toml":"2f96d6173b28f152bfdc8b8692972eab1d549d340283607b6f5ee13a02242335","tests/rust/va_list.rs":"bbb1189a4b35cd3cd1bfb15a0a20b123b6f4e5d998e91f825d76a935cb6641fa","tests/testing-helpers.h":"78e624dfd94adf25fc2bfc69be5ea18dfffa049f146345e7881350e77fb9be7d","tests/tests.rs":"547b8685f1a77db6ae9de7cf61cf25072489fbc33c8a6868ef5138d1cde3cf96"},"package":"9344318b9c787667b95cd2c5124f5eaf2bde35e959dd01ea04fc5b234c542c11"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/Cargo.lock firefox-85.0+build1/third_party/cbindgen/Cargo.lock
--- firefox-84.0.2+build1/third_party/cbindgen/Cargo.lock	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/Cargo.lock	2021-01-18 19:59:04.000000000 +0000
@@ -34,7 +34,7 @@
 
 [[package]]
 name = "cbindgen"
-version = "0.15.0"
+version = "0.16.0"
 dependencies = [
  "clap",
  "heck",
@@ -44,6 +44,7 @@
  "quote",
  "serde",
  "serde_json",
+ "serial_test",
  "syn",
  "tempfile",
  "toml",
@@ -71,6 +72,15 @@
 ]
 
 [[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
 name = "getrandom"
 version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -122,12 +132,27 @@
 checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
 
 [[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
 name = "libc"
 version = "0.2.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
 
 [[package]]
+name = "lock_api"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
 name = "log"
 version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -137,6 +162,30 @@
 ]
 
 [[package]]
+name = "parking_lot"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+dependencies = [
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
 name = "ppv-lite86"
 version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -223,6 +272,12 @@
 checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
 
 [[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
 name = "serde"
 version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -254,6 +309,34 @@
 ]
 
 [[package]]
+name = "serial_test"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b15f74add9a9d4a3eb2bf739c9a427d266d3895b53d992c3a7c234fec2ff1f1"
+dependencies = [
+ "lazy_static",
+ "parking_lot",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65f59259be9fc1bf677d06cc1456e97756004a1a5a577480f71430bd7c17ba33"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
+
+[[package]]
 name = "strsim"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/Cargo.toml firefox-85.0+build1/third_party/cbindgen/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/Cargo.toml	2021-01-06 11:23:46.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "cbindgen"
-version = "0.15.0"
+version = "0.16.0"
 authors = ["Jeff Muizelaar <jmuizelaar@mozilla.com>", "Kartikaya Gupta <kats@mozilla.com>", "Ryan Hunt <rhunt@eqrion.net>"]
 description = "A tool for generating C bindings to Rust code."
 keywords = ["bindings", "ffi", "code-generation"]
@@ -67,6 +67,8 @@
 
 [dependencies.toml]
 version = "0.5"
+[dev-dependencies.serial_test]
+version = "0.5.0"
 
 [features]
 default = ["clap"]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/CHANGES firefox-85.0+build1/third_party/cbindgen/CHANGES
--- firefox-84.0.2+build1/third_party/cbindgen/CHANGES	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/CHANGES	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,22 @@
+## 0.16.0
+
+     * Remove artificial restriction on lifetime parameters on enums (#604)
+     * Add an option for converting usize/isize into size_t/ptrdiff_t. (#606)
+     * Allow controlling the cargo profile used for expansion. (#607)
+     * Support wider range of expressions in enum discriminants (#614)
+     * Support generation of Cython bindings (#590)
+     * Fixed some issues with style=tag and recursive structs (#615)
+     * Default C style to Both (as specified in docs) (#615)
+     * Fix resolution of path dependencies from certain modules. (#629)
+     * Support inlined definitions for tuple variants with a single field in C (#631)
+
+Thanks to all the awesome contributors that contributed to this release.
+
 ## 0.15.0
 
      * Allow customizing mangling of generic parameters in C (#575)
      * Box<T> simplifies to T* in C (4ce324c)
-     * ManuallyDrop<T> and MaubeUninit<T> simplify to T in C, and are opaque in C++ (0076a17)
+     * ManuallyDrop<T> and MaybeUninit<T> simplify to T in C, and are opaque in C++ (0076a17)
      * C++ supports a derive-ostream annotation to derive serialization of structs, unions and enums (#582)
      * Large character constants have been fixed on Windows (#586)
      * Constants are now generated for typedefs, etc (#589)
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/contributing.md firefox-85.0+build1/third_party/cbindgen/contributing.md
--- firefox-84.0.2+build1/third_party/cbindgen/contributing.md	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/contributing.md	2021-01-18 19:59:04.000000000 +0000
@@ -14,6 +14,9 @@
 
 There is continuous integration setup for `cbindgen` using [travis](https://travis-ci.org/). It automatically runs `cargo test` which runs `cbindgen` against a series of rust files from `tests/rust/` and checks that the output compiles using `gcc` or `g++`.
 
+In addition to a C/C++ compiler `cargo test` requires Python and Cython
+(`python -m pip install Cython`) for checking Cython bindings generated from tests (`.pyx` files).
+
 Please run `cargo test` before filing a pull request to be sure that all tests pass. This will also update the test expectations.
 
 Rustfmt is also enforced by travis. To format your code install `rustfmt-preview` using `rustup component add rustfmt-preview` and then `cargo fmt`. Travis runs with rust nightly, so use `rustup run nightly -- cargo fmt` to guarantee consistent results.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/docs.md firefox-85.0+build1/third_party/cbindgen/docs.md
--- firefox-84.0.2+build1/third_party/cbindgen/docs.md	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/docs.md	2021-01-18 19:59:04.000000000 +0000
@@ -36,7 +36,9 @@
 cbindgen --config cbindgen.toml --crate my_rust_library --output my_header.h
 ```
 
-This produces a header file for C++.  For C, add the `--lang c` switch.
+This produces a header file for C++.  For C, add the `--lang c` switch. \
+`cbindgen` also supports generation of [Cython](https://cython.org) bindings,
+use `--lang cython` for that.
 
 See `cbindgen --help` for more options.
 
@@ -372,7 +374,7 @@
 ```toml
 # The language to output bindings in
 #
-# possible values: "C", "C++"
+# possible values: "C", "C++", "Cython"
 #
 # default: "C++"
 language = "C"
@@ -452,6 +454,8 @@
 # } // extern "C"
 # #endif // __cplusplus
 #
+# If the language is not C this option won't have any effect.
+#
 # default: false
 cpp_compat = false
 
@@ -691,6 +695,10 @@
 # default: "None"
 sort_by = "Name"
 
+# If this option is true `usize` and `isize` will be converted into `size_t` and `ptrdiff_t`
+# instead of `uintptr_t` and `intptr_t` respectively.
+usize_is_size_t = true
+
 [struct]
 # A rule to use to rename struct field names. The renaming assumes the input is
 # the Rust standard snake_case, however it acccepts all the different rename_args
@@ -971,6 +979,19 @@
 # `&mut T` and `NonNull<T>` all require a valid pointer value. 
 non_null_attribute = "_Nonnull"
 
+# Options specific to Cython bindings.
+
+[cython]
+
+# Header specified in the top level `cdef extern from header:` declaration.
+#
+# default: *
+header = '"my_header.h"'
+
+# `from module cimport name1, name2` declarations added in the same place
+# where you'd get includes in C.
+[cython.cimports]
+module = ["name1", "name2"]
 ```
 
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/bindings.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/bindings.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/bindings.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/bindings.rs	2021-01-18 19:59:04.000000000 +0000
@@ -78,10 +78,10 @@
         self.struct_map.for_items(path, |st| {
             let mut pos: usize = 0;
             for field in &st.fields {
-                if let Some(found_pos) = fields.iter().position(|v| *v == field.0) {
+                if let Some(found_pos) = fields.iter().position(|v| *v == field.name) {
                     pos = found_pos + 1;
                 } else {
-                    fields.insert(pos, field.0.clone());
+                    fields.insert(pos, field.name.clone());
                     pos += 1;
                 }
             }
@@ -126,14 +126,14 @@
             write!(out, "{}", f);
             out.new_line();
         }
-        if let Some(ref f) = self.config.include_guard {
+        if let Some(f) = self.config.include_guard() {
             out.new_line_if_not_start();
             write!(out, "#ifndef {}", f);
             out.new_line();
             write!(out, "#define {}", f);
             out.new_line();
         }
-        if self.config.pragma_once {
+        if self.config.pragma_once && self.config.language != Language::Cython {
             out.new_line_if_not_start();
             write!(out, "#pragma once");
             out.new_line();
@@ -154,8 +154,9 @@
         }
 
         if self.config.no_includes
-            && self.config.sys_includes.is_empty()
-            && self.config.includes.is_empty()
+            && self.config.sys_includes().is_empty()
+            && self.config.includes().is_empty()
+            && (self.config.cython.cimports.is_empty() || self.config.language != Language::Cython)
             && self.config.after_includes.is_none()
         {
             return;
@@ -164,46 +165,81 @@
         out.new_line_if_not_start();
 
         if !self.config.no_includes {
-            if self.config.language == Language::C {
-                out.write("#include <stdarg.h>");
-                out.new_line();
-                out.write("#include <stdbool.h>");
-                out.new_line();
-                out.write("#include <stdint.h>");
-                out.new_line();
-                out.write("#include <stdlib.h>");
-                out.new_line();
-            } else {
-                out.write("#include <cstdarg>");
-                out.new_line();
-                out.write("#include <cstdint>");
-                out.new_line();
-                out.write("#include <cstdlib>");
-                out.new_line();
-                out.write("#include <ostream>");
-                out.new_line();
-                out.write("#include <new>");
-                out.new_line();
-                if self.config.enumeration.cast_assert_name.is_none()
-                    && (self.config.enumeration.derive_mut_casts
-                        || self.config.enumeration.derive_const_casts)
-                {
-                    out.write("#include <cassert>");
+            match self.config.language {
+                Language::C => {
+                    out.write("#include <stdarg.h>");
+                    out.new_line();
+                    out.write("#include <stdbool.h>");
+                    out.new_line();
+                    if self.config.usize_is_size_t {
+                        out.write("#include <stddef.h>");
+                        out.new_line();
+                    }
+                    out.write("#include <stdint.h>");
+                    out.new_line();
+                    out.write("#include <stdlib.h>");
+                    out.new_line();
+                }
+                Language::Cxx => {
+                    out.write("#include <cstdarg>");
+                    out.new_line();
+                    if self.config.usize_is_size_t {
+                        out.write("#include <cstddef>");
+                        out.new_line();
+                    }
+                    out.write("#include <cstdint>");
+                    out.new_line();
+                    out.write("#include <cstdlib>");
                     out.new_line();
+                    out.write("#include <ostream>");
+                    out.new_line();
+                    out.write("#include <new>");
+                    out.new_line();
+                    if self.config.enumeration.cast_assert_name.is_none()
+                        && (self.config.enumeration.derive_mut_casts
+                            || self.config.enumeration.derive_const_casts)
+                    {
+                        out.write("#include <cassert>");
+                        out.new_line();
+                    }
+                }
+                Language::Cython => {
+                    out.write(
+                        "from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t",
+                    );
+                    out.new_line();
+                    out.write(
+                        "from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t",
+                    );
+                    out.new_line();
+                    out.write("cdef extern from *");
+                    out.open_brace();
+                    out.write("ctypedef bint bool");
+                    out.new_line();
+                    out.write("ctypedef struct va_list");
+                    out.new_line();
+                    out.close_brace(false);
                 }
             }
         }
 
-        for include in &self.config.sys_includes {
+        for include in self.config.sys_includes() {
             write!(out, "#include <{}>", include);
             out.new_line();
         }
 
-        for include in &self.config.includes {
+        for include in self.config.includes() {
             write!(out, "#include \"{}\"", include);
             out.new_line();
         }
 
+        if self.config.language == Language::Cython {
+            for (module, names) in &self.config.cython.cimports {
+                write!(out, "from {} cimport {}", module, names.join(", "));
+                out.new_line();
+            }
+        }
+
         if let Some(ref line) = self.config.after_includes {
             write!(out, "{}", line);
             out.new_line();
@@ -257,7 +293,7 @@
         }
 
         if !self.functions.is_empty() || !self.globals.is_empty() {
-            if self.config.language == Language::C && self.config.cpp_compat {
+            if self.config.cpp_compatible_c() {
                 out.new_line_if_not_start();
                 out.write("#ifdef __cplusplus");
             }
@@ -272,13 +308,13 @@
                 }
             }
 
-            if self.config.language == Language::Cxx || self.config.cpp_compat {
+            if self.config.language == Language::Cxx || self.config.cpp_compatible_c() {
                 out.new_line();
                 out.write("extern \"C\" {");
                 out.new_line();
             }
 
-            if self.config.language == Language::C && self.config.cpp_compat {
+            if self.config.cpp_compatible_c() {
                 out.write("#endif // __cplusplus");
                 out.new_line();
             }
@@ -295,26 +331,35 @@
                 out.new_line();
             }
 
-            if self.config.language == Language::C && self.config.cpp_compat {
+            if self.config.cpp_compatible_c() {
                 out.new_line();
                 out.write("#ifdef __cplusplus");
             }
 
-            if self.config.language == Language::Cxx || self.config.cpp_compat {
+            if self.config.language == Language::Cxx || self.config.cpp_compatible_c() {
                 out.new_line();
                 out.write("} // extern \"C\"");
                 out.new_line();
             }
 
-            if self.config.language == Language::C && self.config.cpp_compat {
+            if self.config.cpp_compatible_c() {
                 out.write("#endif // __cplusplus");
                 out.new_line();
             }
         }
 
+        if self.config.language == Language::Cython
+            && self.globals.is_empty()
+            && self.constants.is_empty()
+            && self.items.is_empty()
+            && self.functions.is_empty()
+        {
+            out.write("pass");
+        }
+
         self.close_namespaces(&mut out);
 
-        if let Some(ref f) = self.config.include_guard {
+        if let Some(f) = self.config.include_guard() {
             out.new_line_if_not_start();
             if self.config.language == Language::C {
                 write!(out, "#endif /* {} */", f);
@@ -333,7 +378,7 @@
     }
 
     fn all_namespaces(&self) -> Vec<&str> {
-        if self.config.language != Language::Cxx && !self.config.cpp_compat {
+        if self.config.language != Language::Cxx && !self.config.cpp_compatible_c() {
             return vec![];
         }
         let mut ret = vec![];
@@ -349,6 +394,18 @@
     }
 
     fn open_close_namespaces<F: Write>(&self, op: NamespaceOperation, out: &mut SourceWriter<F>) {
+        if self.config.language == Language::Cython {
+            if op == NamespaceOperation::Open {
+                out.new_line();
+                let header = self.config.cython.header.as_deref().unwrap_or("*");
+                write!(out, "cdef extern from {}", header);
+                out.open_brace();
+            } else {
+                out.close_brace(false);
+            }
+            return;
+        }
+
         let mut namespaces = self.all_namespaces();
         if namespaces.is_empty() {
             return;
@@ -358,8 +415,7 @@
             namespaces.reverse();
         }
 
-        let write_ifdefs = self.config.cpp_compat && self.config.language == Language::C;
-        if write_ifdefs {
+        if self.config.cpp_compatible_c() {
             out.new_line_if_not_start();
             out.write("#ifdef __cplusplus");
         }
@@ -373,7 +429,7 @@
         }
 
         out.new_line();
-        if write_ifdefs {
+        if self.config.cpp_compatible_c() {
             out.write("#endif // __cplusplus");
             out.new_line();
         }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/builder.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/builder.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/builder.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/builder.rs	2021-01-18 19:59:04.000000000 +0000
@@ -6,7 +6,7 @@
 
 use crate::bindgen::bindings::Bindings;
 use crate::bindgen::cargo::Cargo;
-use crate::bindgen::config::{Braces, Config, Language};
+use crate::bindgen::config::{Braces, Config, Language, Profile, Style};
 use crate::bindgen::error::Error;
 use crate::bindgen::library::Library;
 use crate::bindgen::parser::{self, Parse};
@@ -139,6 +139,12 @@
     }
 
     #[allow(unused)]
+    pub fn with_style(mut self, style: Style) -> Builder {
+        self.config.style = style;
+        self
+    }
+
+    #[allow(unused)]
     pub fn include_item<S: AsRef<str>>(mut self, item_name: S) -> Builder {
         self.config
             .export
@@ -220,6 +226,12 @@
     }
 
     #[allow(unused)]
+    pub fn with_parse_expand_profile(mut self, profile: Profile) -> Builder {
+        self.config.parse.expand.profile = profile;
+        self
+    }
+
+    #[allow(unused)]
     pub fn with_documentation(mut self, documentation: bool) -> Builder {
         self.config.documentation = documentation;
         self
@@ -342,3 +354,16 @@
         .generate()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn with_style() {
+        assert_eq!(
+            Style::Tag,
+            Builder::new().with_style(Style::Tag).config.style
+        );
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cargo/cargo_expand.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/cargo/cargo_expand.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cargo/cargo_expand.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/cargo/cargo_expand.rs	2021-01-18 19:59:04.000000000 +0000
@@ -2,6 +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/. */
 
+use crate::bindgen::config::Profile;
 use std::env;
 use std::error;
 use std::fmt;
@@ -65,6 +66,7 @@
     expand_all_features: bool,
     expand_default_features: bool,
     expand_features: &Option<Vec<String>>,
+    profile: Profile,
 ) -> Result<String, Error> {
     let cargo = env::var("CARGO").unwrap_or_else(|_| String::from("cargo"));
     let mut cmd = Command::new(cargo);
@@ -108,6 +110,12 @@
     if !expand_default_features {
         cmd.arg("--no-default-features");
     }
+    match profile {
+        Profile::Debug => {}
+        Profile::Release => {
+            cmd.arg("--release");
+        }
+    }
     cmd.arg("-p");
     let mut package = crate_name.to_owned();
     if let Some(version) = version {
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cargo/cargo.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/cargo/cargo.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cargo/cargo.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/cargo/cargo.rs	2021-01-18 19:59:04.000000000 +0000
@@ -9,6 +9,7 @@
 pub(crate) use crate::bindgen::cargo::cargo_metadata::PackageRef;
 use crate::bindgen::cargo::cargo_metadata::{self, Metadata};
 use crate::bindgen::cargo::cargo_toml;
+use crate::bindgen::config::Profile;
 use crate::bindgen::error::Error;
 use crate::bindgen::ir::Cfg;
 
@@ -233,6 +234,7 @@
         expand_all_features: bool,
         expand_default_features: bool,
         expand_features: &Option<Vec<String>>,
+        profile: Profile,
     ) -> Result<String, cargo_expand::Error> {
         cargo_expand::expand(
             &self.manifest_path,
@@ -242,6 +244,7 @@
             expand_all_features,
             expand_default_features,
             expand_features,
+            profile,
         )
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cdecl.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/cdecl.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/cdecl.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/cdecl.rs	2021-01-18 19:59:04.000000000 +0000
@@ -51,17 +51,17 @@
         }
     }
 
-    fn from_type(t: &Type) -> CDecl {
+    fn from_type(t: &Type, config: &Config) -> CDecl {
         let mut cdecl = CDecl::new();
-        cdecl.build_type(t, false);
+        cdecl.build_type(t, false, config);
         cdecl
     }
 
-    fn from_func_arg(t: &Type, array_length: Option<&str>) -> CDecl {
+    fn from_func_arg(t: &Type, array_length: Option<&str>, config: &Config) -> CDecl {
         let mut cdecl = CDecl::new();
         let length = match array_length {
             Some(l) => l,
-            None => return CDecl::from_type(t),
+            None => return CDecl::from_type(t, config),
         };
         let (ty, is_const) = match t {
             Type::Ptr { ty, is_const, .. } => (ty, is_const),
@@ -71,33 +71,33 @@
             ),
         };
         let ptr_as_array = Type::Array(ty.clone(), ArrayLength::Value(length.to_string()));
-        cdecl.build_type(&ptr_as_array, *is_const);
+        cdecl.build_type(&ptr_as_array, *is_const, config);
         cdecl
     }
 
-    fn from_func(f: &Function, layout_vertical: bool) -> CDecl {
+    fn from_func(f: &Function, layout_vertical: bool, config: &Config) -> CDecl {
         let mut cdecl = CDecl::new();
-        cdecl.build_func(f, layout_vertical);
+        cdecl.build_func(f, layout_vertical, config);
         cdecl
     }
 
-    fn build_func(&mut self, f: &Function, layout_vertical: bool) {
+    fn build_func(&mut self, f: &Function, layout_vertical: bool, config: &Config) {
         let args = f
             .args
             .iter()
             .map(|arg| {
                 (
                     arg.name.clone(),
-                    CDecl::from_func_arg(&arg.ty, arg.array_length.as_deref()),
+                    CDecl::from_func_arg(&arg.ty, arg.array_length.as_deref(), config),
                 )
             })
             .collect();
         self.declarators
             .push(CDeclarator::Func(args, layout_vertical));
-        self.build_type(&f.ret, false);
+        self.build_type(&f.ret, false, config);
     }
 
-    fn build_type(&mut self, t: &Type, is_const: bool) {
+    fn build_type(&mut self, t: &Type, is_const: bool, config: &Config) {
         match t {
             Type::Path(ref generic) => {
                 if is_const {
@@ -138,7 +138,7 @@
                     "error generating cdecl for {:?}",
                     t
                 );
-                self.type_name = p.to_string();
+                self.type_name = p.to_repr_c(config).to_string();
             }
             Type::Ptr {
                 ref ty,
@@ -151,17 +151,17 @@
                     is_nullable: *is_nullable,
                     is_ref: *is_ref,
                 });
-                self.build_type(ty, *ptr_is_const);
+                self.build_type(ty, *ptr_is_const, config);
             }
             Type::Array(ref t, ref constant) => {
                 let len = constant.as_str().to_owned();
                 self.declarators.push(CDeclarator::Array(len));
-                self.build_type(t, is_const);
+                self.build_type(t, is_const, config);
             }
             Type::FuncPtr(ref ret, ref args) => {
                 let args = args
                     .iter()
-                    .map(|(ref name, ref ty)| (name.clone(), CDecl::from_type(ty)))
+                    .map(|(ref name, ref ty)| (name.clone(), CDecl::from_type(ty, config)))
                     .collect();
                 self.declarators.push(CDeclarator::Ptr {
                     is_const: false,
@@ -169,7 +169,7 @@
                     is_ref: false,
                 });
                 self.declarators.push(CDeclarator::Func(args, false));
-                self.build_type(ret, false);
+                self.build_type(ret, false, config);
             }
         }
     }
@@ -180,8 +180,10 @@
             write!(out, "{} ", self.type_qualifers);
         }
 
-        if let Some(ref ctype) = self.type_ctype {
-            write!(out, "{} ", ctype.to_str());
+        if config.language != Language::Cython {
+            if let Some(ref ctype) = self.type_ctype {
+                write!(out, "{} ", ctype.to_str());
+            }
         }
 
         write!(out, "{}", self.type_name);
@@ -214,7 +216,7 @@
                     if is_const {
                         out.write("const ");
                     }
-                    if !is_nullable && !is_ref {
+                    if !is_nullable && !is_ref && config.language != Language::Cython {
                         if let Some(attr) = &config.pointer.non_null_attribute {
                             write!(out, "{} ", attr);
                         }
@@ -307,13 +309,13 @@
     layout_vertical: bool,
     config: &Config,
 ) {
-    CDecl::from_func(f, layout_vertical).write(out, Some(f.path().name()), config);
+    CDecl::from_func(f, layout_vertical, config).write(out, Some(f.path().name()), config);
 }
 
 pub fn write_field<F: Write>(out: &mut SourceWriter<F>, t: &Type, ident: &str, config: &Config) {
-    CDecl::from_type(t).write(out, Some(ident), config);
+    CDecl::from_type(t, config).write(out, Some(ident), config);
 }
 
 pub fn write_type<F: Write>(out: &mut SourceWriter<F>, t: &Type, config: &Config) {
-    CDecl::from_type(t).write(out, None, config);
+    CDecl::from_type(t, config).write(out, None, config);
 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/config.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/config.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/config.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/config.rs	2021-01-18 19:59:04.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/. */
 
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 use std::default::Default;
 use std::str::FromStr;
 use std::{fmt, fs, path::Path as StdPath};
@@ -22,6 +22,7 @@
 pub enum Language {
     Cxx,
     C,
+    Cython,
 }
 
 impl FromStr for Language {
@@ -39,6 +40,8 @@
             "C++" => Ok(Language::Cxx),
             "c" => Ok(Language::C),
             "C" => Ok(Language::C),
+            "cython" => Ok(Language::Cython),
+            "Cython" => Ok(Language::Cython),
             _ => Err(format!("Unrecognized Language: '{}'.", s)),
         }
     }
@@ -46,6 +49,15 @@
 
 deserialize_enum_str!(Language);
 
+impl Language {
+    pub(crate) fn typedef(self) -> &'static str {
+        match self {
+            Language::Cxx | Language::C => "typedef",
+            Language::Cython => "ctypedef",
+        }
+    }
+}
+
 /// Controls what type of line endings are used in the generated code.
 #[derive(Debug, Clone, Copy)]
 pub enum LineEndingStyle {
@@ -200,6 +212,21 @@
             Style::Tag => false,
         }
     }
+
+    // https://cython.readthedocs.io/en/latest/src/userguide/external_C_code.html#styles-of-struct-union-and-enum-declaration
+    pub fn cython_def(self) -> &'static str {
+        if self.generate_tag() {
+            "cdef "
+        } else {
+            "ctypedef "
+        }
+    }
+}
+
+impl Default for Style {
+    fn default() -> Self {
+        Style::Both
+    }
 }
 
 impl FromStr for Style {
@@ -668,6 +695,27 @@
     pub bitflags: bool,
 }
 
+/// Controls which Cargo profile is used for macro expansion.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum Profile {
+    Debug,
+    Release,
+}
+
+impl FromStr for Profile {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Profile, Self::Err> {
+        match s {
+            "debug" | "Debug" => Ok(Profile::Debug),
+            "release" | "Release" => Ok(Profile::Release),
+            _ => Err(format!("Unrecognized Profile: '{}'.", s)),
+        }
+    }
+}
+
+deserialize_enum_str!(Profile);
+
 /// Settings to apply when running `rustc --pretty=expanded`
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -683,6 +731,8 @@
     /// List of features to use when expanding. Combines with `default_features` like in
     /// `Cargo.toml`.
     pub features: Option<Vec<String>>,
+    /// Controls whether or not to pass `--release` when expanding.
+    pub profile: Profile,
 }
 
 impl Default for ParseExpandConfig {
@@ -692,6 +742,7 @@
             all_features: false,
             default_features: true,
             features: None,
+            profile: Profile::Debug,
         }
     }
 }
@@ -723,6 +774,7 @@
                 all_features: true,
                 default_features: true,
                 features: None,
+                profile: Profile::Debug,
             })
         }
 
@@ -789,6 +841,19 @@
     pub non_null_attribute: Option<String>,
 }
 
+/// Settings specific to Cython bindings.
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(deny_unknown_fields)]
+#[serde(default)]
+pub struct CythonConfig {
+    /// Header specified in the top level `cdef extern from header:` declaration.
+    pub header: Option<String>,
+    /// `from module cimport name1, name2, ...` declarations added in the same place
+    /// where you'd get includes in C.
+    pub cimports: BTreeMap<String, Vec<String>>,
+}
+
 /// A collection of settings to customize the generated bindings.
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -840,6 +905,9 @@
     pub style: Style,
     /// Default sort key for functions and constants.
     pub sort_by: SortKey,
+    /// If this option is true `usize` and `isize` will be converted into `size_t` and `ptrdiff_t`
+    /// instead of `uintptr_t` and `intptr_t` respectively.
+    pub usize_is_size_t: bool,
     /// The configuration options for parsing
     pub parse: ParseConfig,
     /// The configuration options for exporting
@@ -869,6 +937,8 @@
     /// Configuration options for pointers
     #[serde(rename = "ptr")]
     pub pointer: PtrConfig,
+    /// Configuration options specific to Cython.
+    pub cython: CythonConfig,
 }
 
 impl Default for Config {
@@ -893,7 +963,8 @@
             line_endings: LineEndingStyle::default(),
             language: Language::Cxx,
             cpp_compat: false,
-            style: Style::Type,
+            style: Style::default(),
+            usize_is_size_t: false,
             sort_by: SortKey::None,
             macro_expansion: Default::default(),
             parse: ParseConfig::default(),
@@ -907,11 +978,40 @@
             documentation: true,
             documentation_style: DocumentationStyle::Auto,
             pointer: PtrConfig::default(),
+            cython: CythonConfig::default(),
         }
     }
 }
 
 impl Config {
+    pub(crate) fn cpp_compatible_c(&self) -> bool {
+        self.language == Language::C && self.cpp_compat
+    }
+
+    pub(crate) fn include_guard(&self) -> Option<&str> {
+        if self.language == Language::Cython {
+            None
+        } else {
+            self.include_guard.as_deref()
+        }
+    }
+
+    pub(crate) fn includes(&self) -> &[String] {
+        if self.language == Language::Cython {
+            &[]
+        } else {
+            &self.includes
+        }
+    }
+
+    pub(crate) fn sys_includes(&self) -> &[String] {
+        if self.language == Language::Cython {
+            &[]
+        } else {
+            &self.sys_includes
+        }
+    }
+
     pub fn from_file<P: AsRef<StdPath>>(file_name: P) -> Result<Config, String> {
         let config_text = fs::read_to_string(file_name.as_ref()).map_err(|_| {
             format!(
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/annotation.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/annotation.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/annotation.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/annotation.rs	2021-01-18 19:59:04.000000000 +0000
@@ -6,6 +6,7 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
+use crate::bindgen::config::{Config, Language};
 use crate::bindgen::utilities::SynAttributeHelpers;
 
 // A system for specifying properties on items. Annotations are
@@ -48,6 +49,10 @@
         self.annotations.is_empty() && !self.must_use
     }
 
+    pub(crate) fn must_use(&self, config: &Config) -> bool {
+        self.must_use && config.language != Language::Cython
+    }
+
     pub fn load(attrs: &[syn::Attribute]) -> Result<AnnotationSet, String> {
         let lines = attrs.get_comment_lines();
         let lines: Vec<&str> = lines
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/cfg.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/cfg.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/cfg.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/cfg.rs	2021-01-18 19:59:04.000000000 +0000
@@ -6,7 +6,7 @@
 use std::io::Write;
 
 use crate::bindgen::cargo::cargo_metadata::Dependency;
-use crate::bindgen::config::Config;
+use crate::bindgen::config::{Config, Language};
 use crate::bindgen::writer::SourceWriter;
 
 #[derive(PartialEq, Eq)]
@@ -283,15 +283,23 @@
     fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
         match *self {
             Condition::Define(ref define) => {
-                out.write("defined(");
-                write!(out, "{}", define);
-                out.write(")");
+                if config.language == Language::Cython {
+                    write!(out, "{}", define);
+                } else {
+                    out.write("defined(");
+                    write!(out, "{}", define);
+                    out.write(")");
+                }
             }
             Condition::Any(ref conditions) => {
                 out.write("(");
                 for (i, condition) in conditions.iter().enumerate() {
                     if i != 0 {
-                        out.write(" || ");
+                        out.write(if config.language == Language::Cython {
+                            " or "
+                        } else {
+                            " || "
+                        });
                     }
                     condition.write(config, out);
                 }
@@ -301,14 +309,22 @@
                 out.write("(");
                 for (i, condition) in conditions.iter().enumerate() {
                     if i != 0 {
-                        out.write(" && ");
+                        out.write(if config.language == Language::Cython {
+                            " and "
+                        } else {
+                            " && "
+                        });
                     }
                     condition.write(config, out);
                 }
                 out.write(")");
             }
             Condition::Not(ref condition) => {
-                out.write("!");
+                out.write(if config.language == Language::Cython {
+                    "not "
+                } else {
+                    "!"
+                });
                 condition.write(config, out);
             }
         }
@@ -323,20 +339,30 @@
 impl ConditionWrite for Option<Condition> {
     fn write_before<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
         if let Some(ref cfg) = *self {
-            out.push_set_spaces(0);
-            out.write("#if ");
-            cfg.write(config, out);
-            out.pop_set_spaces();
-            out.new_line();
+            if config.language == Language::Cython {
+                out.write("IF ");
+                cfg.write(config, out);
+                out.open_brace();
+            } else {
+                out.push_set_spaces(0);
+                out.write("#if ");
+                cfg.write(config, out);
+                out.pop_set_spaces();
+                out.new_line();
+            }
         }
     }
 
-    fn write_after<F: Write>(&self, _config: &Config, out: &mut SourceWriter<F>) {
+    fn write_after<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
         if self.is_some() {
-            out.new_line();
-            out.push_set_spaces(0);
-            out.write("#endif");
-            out.pop_set_spaces();
+            if config.language == Language::Cython {
+                out.close_brace(false);
+            } else {
+                out.new_line();
+                out.push_set_spaces(0);
+                out.write("#endif");
+                out.pop_set_spaces();
+            }
         }
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/constant.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/constant.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/constant.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/constant.rs	2021-01-18 19:59:04.000000000 +0000
@@ -287,9 +287,13 @@
         }
     }
 
-    fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
+    pub(crate) fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
         match self {
-            Literal::Expr(v) => write!(out, "{}", v),
+            Literal::Expr(v) => match (&**v, config.language) {
+                ("true", Language::Cython) => write!(out, "True"),
+                ("false", Language::Cython) => write!(out, "False"),
+                (v, _) => write!(out, "{}", v),
+            },
             Literal::Path(v) => write!(out, "{}", v),
             Literal::PostfixUnaryOp { op, ref value } => {
                 write!(out, "{}", op);
@@ -307,9 +311,17 @@
                 write!(out, ")");
             }
             Literal::Cast { ref ty, ref value } => {
-                write!(out, "(");
+                out.write(if config.language == Language::Cython {
+                    "<"
+                } else {
+                    "("
+                });
                 ty.write(config, out);
-                write!(out, ")");
+                out.write(if config.language == Language::Cython {
+                    ">"
+                } else {
+                    ")"
+                });
                 value.write(config, out);
             }
             Literal::Struct {
@@ -317,10 +329,10 @@
                 fields,
                 path,
             } => {
-                if config.language == Language::C {
-                    write!(out, "({})", export_name);
-                } else {
-                    write!(out, "{}", export_name);
+                match config.language {
+                    Language::C => write!(out, "({})", export_name),
+                    Language::Cxx => write!(out, "{}", export_name),
+                    Language::Cython => write!(out, "<{}>", export_name),
                 }
 
                 write!(out, "{{ ");
@@ -334,10 +346,10 @@
                         } else {
                             is_first_field = false;
                         }
-                        if config.language == Language::Cxx {
-                            write!(out, "/* .{} = */ ", ordered_key);
-                        } else {
-                            write!(out, ".{} = ", ordered_key);
+                        match config.language {
+                            Language::Cxx => write!(out, "/* .{} = */ ", ordered_key),
+                            Language::C => write!(out, ".{} = ", ordered_key),
+                            Language::Cython => {}
                         }
                         lit.write(config, out);
                     }
@@ -551,31 +563,41 @@
             false
         };
 
-        if (config.constant.allow_static_const || allow_constexpr)
-            && config.language == Language::Cxx
-        {
-            if allow_constexpr {
-                out.write("constexpr ")
-            }
+        match config.language {
+            Language::Cxx if config.constant.allow_static_const || allow_constexpr => {
+                if allow_constexpr {
+                    out.write("constexpr ")
+                }
 
-            if config.constant.allow_static_const {
-                out.write(if in_body { "inline " } else { "static " });
-            }
+                if config.constant.allow_static_const {
+                    out.write(if in_body { "inline " } else { "static " });
+                }
 
-            if let Type::Ptr { is_const: true, .. } = self.ty {
-                // Nothing.
-            } else {
+                if let Type::Ptr { is_const: true, .. } = self.ty {
+                    // Nothing.
+                } else {
+                    out.write("const ");
+                }
+
+                self.ty.write(config, out);
+                write!(out, " {} = ", name);
+                value.write(config, out);
+                write!(out, ";");
+            }
+            Language::Cxx | Language::C => {
+                write!(out, "#define {} ", name);
+                value.write(config, out);
+            }
+            Language::Cython => {
                 out.write("const ");
+                self.ty.write(config, out);
+                // For extern Cython declarations the initializer is ignored,
+                // but still useful as documentation, so we write it as a comment.
+                write!(out, " {} # = ", name);
+                value.write(config, out);
             }
-
-            self.ty.write(config, out);
-            write!(out, " {} = ", name);
-            value.write(config, out);
-            write!(out, ";");
-        } else {
-            write!(out, "#define {} ", name);
-            value.write(config, out);
         }
+
         condition.write_after(config, out);
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/documentation.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/documentation.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/documentation.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/documentation.rs	2021-01-18 19:59:04.000000000 +0000
@@ -43,6 +43,15 @@
             return;
         }
 
+        // Cython uses Python-style comments, so `documentation_style` is not relevant.
+        if config.language == Language::Cython {
+            for line in &self.doc_comment {
+                write!(out, "#{}", line);
+                out.new_line();
+            }
+            return;
+        }
+
         let style = match config.documentation_style {
             DocumentationStyle::Auto if config.language == Language::C => DocumentationStyle::Doxy,
             DocumentationStyle::Auto if config.language == Language::Cxx => DocumentationStyle::Cxx,
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/enumeration.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/enumeration.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/enumeration.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/enumeration.rs	2021-01-18 19:59:04.000000000 +0000
@@ -8,8 +8,8 @@
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
 use crate::bindgen::ir::{
-    AnnotationSet, AnnotationValue, Cfg, ConditionWrite, Documentation, GenericParams, GenericPath,
-    Item, ItemContainer, Path, Repr, ReprStyle, ReprType, Struct, ToCondition, Type,
+    AnnotationSet, AnnotationValue, Cfg, ConditionWrite, Documentation, Field, GenericParams,
+    GenericPath, Item, ItemContainer, Literal, Path, Repr, ReprStyle, Struct, ToCondition, Type,
 };
 use crate::bindgen::library::Library;
 use crate::bindgen::mangle;
@@ -27,6 +27,14 @@
         name: String,
         /// The struct with all the items.
         body: Struct,
+        /// A separate named struct is not created for this variant,
+        /// an unnamed struct is inlined at the point of use instead.
+        /// This is a reasonable thing to do only for tuple variants with a single field.
+        inline: bool,
+        /// Generated cast methods return the variant's only field instead of the variant itself.
+        /// For backward compatibility casts are inlined in a slightly
+        /// larger set of cases than whole variants.
+        inline_casts: bool,
     },
 }
 
@@ -57,9 +65,16 @@
     ) -> Self {
         match *self {
             Self::Empty(ref annos) => Self::Empty(annos.clone()),
-            Self::Body { ref name, ref body } => Self::Body {
+            Self::Body {
+                ref name,
+                ref body,
+                inline,
+                inline_casts,
+            } => Self::Body {
                 name: name.clone(),
                 body: body.specialize(generic_values, mappings, config),
+                inline,
+                inline_casts,
             },
         }
     }
@@ -69,73 +84,58 @@
 pub struct EnumVariant {
     pub name: String,
     pub export_name: String,
-    pub discriminant: Option<i64>,
+    pub discriminant: Option<Literal>,
     pub body: VariantBody,
     pub cfg: Option<Cfg>,
     pub documentation: Documentation,
 }
 
-fn value_from_expr(val: &syn::Expr) -> Option<i64> {
-    match *val {
-        syn::Expr::Lit(ref lit) => match lit.lit {
-            syn::Lit::Int(ref lit) => lit.base10_parse::<i64>().ok(),
-            _ => None,
-        },
-        syn::Expr::Unary(ref unary) => {
-            let v = value_from_expr(&unary.expr)?;
-            match unary.op {
-                syn::UnOp::Deref(..) => None,
-                syn::UnOp::Neg(..) => v.checked_mul(-1),
-                syn::UnOp::Not(..) => v.checked_neg(),
-            }
-        }
-        _ => None,
-    }
-}
-
 impl EnumVariant {
     fn load(
-        is_tagged: bool,
+        inline_tag_field: bool,
         variant: &syn::Variant,
         generic_params: GenericParams,
         mod_cfg: Option<&Cfg>,
         self_path: &Path,
         enum_annotations: &AnnotationSet,
+        config: &Config,
     ) -> Result<Self, String> {
         let discriminant = match variant.discriminant {
-            Some((_, ref expr)) => match value_from_expr(expr) {
-                Some(v) => Some(v),
-                None => return Err(format!("Unsupported discriminant {:?}.", expr)),
-            },
+            Some((_, ref expr)) => Some(Literal::load(expr)?),
             None => None,
         };
 
         fn parse_fields(
-            is_tagged: bool,
+            inline_tag_field: bool,
             fields: &syn::punctuated::Punctuated<syn::Field, syn::token::Comma>,
             self_path: &Path,
-        ) -> Result<Vec<(String, Type, Documentation)>, String> {
+            inline_name: Option<&str>,
+        ) -> Result<Vec<Field>, String> {
             let mut res = Vec::new();
 
-            if is_tagged {
-                res.push((
-                    "tag".to_string(),
+            if inline_tag_field {
+                res.push(Field::from_name_and_type(
+                    inline_name.map_or_else(|| "tag".to_string(), |name| format!("{}_tag", name)),
                     Type::Path(GenericPath::new(Path::new("Tag"), vec![])),
-                    Documentation::none(),
                 ));
             }
 
             for (i, field) in fields.iter().enumerate() {
                 if let Some(mut ty) = Type::load(&field.ty)? {
                     ty.replace_self_with(self_path);
-                    res.push((
-                        match field.ident {
-                            Some(ref ident) => ident.to_string(),
-                            None => i.to_string(),
-                        },
+                    res.push(Field {
+                        name: inline_name.map_or_else(
+                            || match field.ident {
+                                Some(ref ident) => ident.to_string(),
+                                None => i.to_string(),
+                            },
+                            |name| name.to_string(),
+                        ),
                         ty,
-                        Documentation::load(&field.attrs),
-                    ));
+                        cfg: Cfg::load(&field.attrs),
+                        annotations: AnnotationSet::load(&field.attrs)?,
+                        documentation: Documentation::load(&field.attrs),
+                    });
                 }
             }
 
@@ -155,20 +155,21 @@
                     .apply(&variant.ident.to_string(), IdentifierType::StructMember)
                     .into_owned();
                 VariantBody::Body {
-                    name,
                     body: Struct::new(
                         path,
                         generic_params,
-                        parse_fields(is_tagged, &fields.named, self_path)?,
-                        is_tagged,
+                        parse_fields(inline_tag_field, &fields.named, self_path, None)?,
+                        inline_tag_field,
                         true,
                         None,
                         false,
-                        false,
                         None,
                         annotations,
                         Documentation::none(),
                     ),
+                    name,
+                    inline: false,
+                    inline_casts: false,
                 }
             }
             syn::Fields::Unnamed(ref fields) => {
@@ -176,21 +177,30 @@
                 let name = RenameRule::SnakeCase
                     .apply(&variant.ident.to_string(), IdentifierType::StructMember)
                     .into_owned();
+                let inline_casts = fields.unnamed.len() == 1;
+                // In C++ types with destructors cannot be put into unnamed structs like the
+                // inlining requires, and it's hard to detect such types.
+                // Besides that for C++ we generate casts/getters that can be used instead of
+                // direct field accesses and also have a benefit of being checked.
+                // As a result we don't currently inline variant definitions in C++ mode at all.
+                let inline = inline_casts && config.language != Language::Cxx;
+                let inline_name = if inline { Some(&*name) } else { None };
                 VariantBody::Body {
-                    name,
                     body: Struct::new(
                         path,
                         generic_params,
-                        parse_fields(is_tagged, &fields.unnamed, self_path)?,
-                        is_tagged,
+                        parse_fields(inline_tag_field, &fields.unnamed, self_path, inline_name)?,
+                        inline_tag_field,
                         true,
                         None,
                         false,
-                        true,
                         None,
                         annotations,
                         Documentation::none(),
                     ),
+                    name,
+                    inline,
+                    inline_casts,
                 }
             }
         };
@@ -206,7 +216,7 @@
 
     pub fn new(
         name: String,
-        discriminant: Option<i64>,
+        discriminant: Option<Literal>,
         body: VariantBody,
         cfg: Option<Cfg>,
         documentation: Documentation,
@@ -242,7 +252,7 @@
     ) -> Self {
         Self::new(
             mangle::mangle_name(&self.name, generic_values, &config.export.mangle),
-            self.discriminant,
+            self.discriminant.clone(),
             self.body.specialize(generic_values, mappings, config),
             self.cfg.clone(),
             self.documentation.clone(),
@@ -265,14 +275,25 @@
 impl Source for EnumVariant {
     fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
         let condition = self.cfg.to_condition(config);
-        condition.write_before(config, out);
+        // Cython doesn't support conditional enum variants.
+        if config.language != Language::Cython {
+            condition.write_before(config, out);
+        }
         self.documentation.write(config, out);
         write!(out, "{}", self.export_name);
-        if let Some(discriminant) = self.discriminant {
-            write!(out, " = {}", discriminant);
+        if let Some(discriminant) = &self.discriminant {
+            if config.language == Language::Cython {
+                // For extern Cython declarations the enumerator value is ignored,
+                // but still useful as documentation, so we write it as a comment.
+                out.write(" #")
+            }
+            out.write(" = ");
+            discriminant.write(config, out);
         }
         out.write(",");
-        condition.write_after(config, out);
+        if config.language != Language::Cython {
+            condition.write_after(config, out);
+        }
     }
 }
 
@@ -290,6 +311,16 @@
 }
 
 impl Enum {
+    /// Name of the generated tag enum.
+    fn tag_name(&self) -> &str {
+        self.tag.as_deref().unwrap_or_else(|| self.export_name())
+    }
+
+    /// Enum with data turns into a union of structs with each struct having its own tag field.
+    fn inline_tag_field(repr: &Repr) -> bool {
+        repr.style != ReprStyle::C
+    }
+
     pub fn add_monomorphs(&self, library: &Library, out: &mut Monomorphs) {
         if self.generic_params.len() > 0 {
             return;
@@ -335,20 +366,21 @@
         let generic_params = GenericParams::new(&item.generics);
 
         let mut variants = Vec::new();
-        let mut is_tagged = false;
+        let mut has_data = false;
 
         let annotations = AnnotationSet::load(&item.attrs)?;
 
         for variant in item.variants.iter() {
             let variant = EnumVariant::load(
-                repr.style == ReprStyle::Rust,
+                Self::inline_tag_field(&repr),
                 variant,
                 generic_params.clone(),
                 mod_cfg,
                 &path,
                 &annotations,
+                config,
             )?;
-            is_tagged = is_tagged || !variant.body.is_empty();
+            has_data = has_data || !variant.body.is_empty();
             variants.push(variant);
         }
 
@@ -374,7 +406,7 @@
             ));
         }
 
-        let tag = if is_tagged {
+        let tag = if has_data {
             Some("Tag".to_string())
         } else {
             None
@@ -462,7 +494,7 @@
     fn rename_for_config(&mut self, config: &Config) {
         config.export.rename(&mut self.export_name);
 
-        if config.language == Language::C && self.tag.is_some() {
+        if config.language != Language::Cxx && self.tag.is_some() {
             // it makes sense to always prefix Tag with type name in C
             let new_tag = format!("{}_Tag", self.export_name);
             if self.repr.style == ReprStyle::Rust {
@@ -470,7 +502,7 @@
                     if let VariantBody::Body { ref mut body, .. } = variant.body {
                         let path = Path::new(new_tag.clone());
                         let generic_path = GenericPath::new(path, vec![]);
-                        body.fields[0].1 = Type::Path(generic_path);
+                        body.fields[0].ty = Type::Path(generic_path);
                     }
                 }
             }
@@ -479,10 +511,13 @@
 
         for variant in &mut self.variants {
             reserved::escape(&mut variant.export_name);
-
+            if let Some(discriminant) = &mut variant.discriminant {
+                discriminant.rename_for_config(config);
+            }
             if let VariantBody::Body {
                 ref mut name,
                 ref mut body,
+                ..
             } = variant.body
             {
                 body.rename_for_config(config);
@@ -514,12 +549,19 @@
                     EnumVariant::new(
                         r.apply(&variant.export_name, IdentifierType::EnumVariant(self))
                             .into_owned(),
-                        variant.discriminant,
+                        variant.discriminant.clone(),
                         match variant.body {
                             VariantBody::Empty(..) => variant.body.clone(),
-                            VariantBody::Body { ref name, ref body } => VariantBody::Body {
+                            VariantBody::Body {
+                                ref name,
+                                ref body,
+                                inline,
+                                inline_casts,
+                            } => VariantBody::Body {
                                 name: r.apply(&name, IdentifierType::StructMember).into_owned(),
                                 body: body.clone(),
+                                inline,
+                                inline_casts,
                             },
                         },
                         variant.cfg.clone(),
@@ -595,98 +637,155 @@
 
 impl Source for Enum {
     fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
-        let size = self.repr.ty.map(|ty| match ty {
-            ReprType::USize => "uintptr_t",
-            ReprType::U64 => "uint64_t",
-            ReprType::U32 => "uint32_t",
-            ReprType::U16 => "uint16_t",
-            ReprType::U8 => "uint8_t",
-            ReprType::ISize => "intptr_t",
-            ReprType::I64 => "int64_t",
-            ReprType::I32 => "int32_t",
-            ReprType::I16 => "int16_t",
-            ReprType::I8 => "int8_t",
-        });
+        let size = self.repr.ty.map(|ty| ty.to_primitive().to_repr_c(config));
+        let has_data = self.tag.is_some();
+        let inline_tag_field = Self::inline_tag_field(&self.repr);
+        let tag_name = self.tag_name();
 
         let condition = self.cfg.to_condition(config);
         condition.write_before(config, out);
 
         self.documentation.write(config, out);
+        self.generic_params.write(config, out);
 
-        let is_tagged = self.tag.is_some();
-        let separate_tag = self.repr.style == ReprStyle::C;
+        // If the enum has data, we need to emit a struct or union for the data
+        // and enum for the tag. C++ supports nested type definitions, so we open
+        // the struct or union here and define the tag enum inside it (*).
+        if has_data && config.language == Language::Cxx {
+            self.open_struct_or_union(config, out, inline_tag_field);
+        }
 
-        // If tagged, we need to emit a proper struct/union wrapper around our enum
-        self.generic_params.write(config, out);
-        if is_tagged && config.language == Language::Cxx {
-            out.write(if separate_tag { "struct" } else { "union" });
+        // Emit the tag enum and everything related to it.
+        self.write_tag_enum(config, out, size, has_data, tag_name);
+
+        // If the enum has data, we need to emit structs for the variants and gather them together.
+        if has_data {
+            self.write_variant_defs(config, out);
+            out.new_line();
+            out.new_line();
 
-            if self.annotations.must_use {
-                if let Some(ref anno) = config.structure.must_use {
-                    write!(out, " {}", anno)
-                }
+            // Open the struct or union for the data (**), gathering all the variants with data
+            // together, unless it's C++, then we have already opened that struct/union at (*) and
+            // are currently inside it.
+            if config.language != Language::Cxx {
+                self.open_struct_or_union(config, out, inline_tag_field);
             }
 
-            write!(out, " {}", self.export_name());
-            out.open_brace();
+            // Emit tag field that is separate from all variants.
+            self.write_tag_field(config, out, size, inline_tag_field, tag_name);
+            out.new_line();
 
-            // Emit the pre_body section, if relevant
-            // Only do this here if we're writing C++, since the struct that wraps everything is starting here.
-            // If we're writing C, we aren't wrapping the enum and variant structs definitions, so the actual enum struct willstart down below
-            if let Some(body) = config.export.pre_body(&self.path) {
-                out.write_raw_block(body);
-                out.new_line();
+            // Open union of all variants with data, only in the non-inline tag scenario.
+            // Cython extern declarations don't manage layouts, layouts are defined entierly by the
+            // corresponding C code. So we can inline the unnamed union into the struct and get the
+            // same observable result. Moreother we have to do it because Cython doesn't support
+            // unnamed unions.
+            if !inline_tag_field && config.language != Language::Cython {
+                out.write("union");
+                out.open_brace();
             }
-        }
 
-        let enum_name = if let Some(ref tag) = self.tag {
-            tag
-        } else {
-            self.export_name()
-        };
+            // Emit fields for all variants with data.
+            self.write_variant_fields(config, out);
 
-        // Emit the actual enum
-        if config.language == Language::C {
-            if size.is_none() && config.style.generate_typedef() {
-                out.write("typedef ");
+            // Close union of all variants with data, only in the non-inline tag scenario.
+            // See the comment about Cython on `open_brace`.
+            if !inline_tag_field && config.language != Language::Cython {
+                out.close_brace(true);
             }
 
-            out.write("enum");
+            // Emit convenience methods for the struct or enum for the data.
+            self.write_derived_functions_data(config, out, tag_name);
 
-            if size.is_some() || config.style.generate_tag() {
-                write!(out, " {}", enum_name);
+            // Emit the post_body section, if relevant.
+            if let Some(body) = config.export.post_body(&self.path) {
+                out.new_line();
+                out.write_raw_block(body);
             }
 
-            if config.cpp_compat {
-                if let Some(prim) = size {
-                    out.new_line();
-                    out.write("#ifdef __cplusplus");
-                    out.new_line();
-                    write!(out, "  : {}", prim);
-                    out.new_line();
-                    out.write("#endif // __cplusplus");
-                    out.new_line();
-                }
-            }
-        } else {
-            if config.enumeration.enum_class(&self.annotations) {
-                out.write("enum class");
+            // Close the struct or union opened either at (*) or at (**).
+            if config.language == Language::C && config.style.generate_typedef() {
+                out.close_brace(false);
+                write!(out, " {};", self.export_name);
             } else {
-                out.write("enum");
+                out.close_brace(true);
             }
+        }
 
-            if self.annotations.must_use {
-                if let Some(ref anno) = config.enumeration.must_use {
-                    write!(out, " {}", anno)
+        condition.write_after(config, out);
+    }
+}
+
+impl Enum {
+    /// Emit the tag enum and convenience methods for it.
+    /// For enums with data this is only a part of the output,
+    /// but for enums without data it's the whole output (modulo doc comments etc.).
+    fn write_tag_enum<F: Write>(
+        &self,
+        config: &Config,
+        out: &mut SourceWriter<F>,
+        size: Option<&str>,
+        has_data: bool,
+        tag_name: &str,
+    ) {
+        // Open the tag enum.
+        match config.language {
+            Language::C => {
+                if let Some(prim) = size {
+                    // If we need to specify size, then we have no choice but to create a typedef,
+                    // so `config.style` is not respected.
+                    write!(out, "enum {}", tag_name);
+
+                    if config.cpp_compatible_c() {
+                        out.new_line();
+                        out.write("#ifdef __cplusplus");
+                        out.new_line();
+                        write!(out, "  : {}", prim);
+                        out.new_line();
+                        out.write("#endif // __cplusplus");
+                        out.new_line();
+                    }
+                } else {
+                    if config.style.generate_typedef() {
+                        out.write("typedef ");
+                    }
+                    out.write("enum");
+                    if config.style.generate_tag() {
+                        write!(out, " {}", tag_name);
+                    }
                 }
             }
+            Language::Cxx => {
+                if config.enumeration.enum_class(&self.annotations) {
+                    out.write("enum class");
+                } else {
+                    out.write("enum");
+                }
 
-            write!(out, " {}", enum_name);
-            if let Some(prim) = size {
-                write!(out, " : {}", prim);
+                if self.annotations.must_use(config) {
+                    if let Some(ref anno) = config.enumeration.must_use {
+                        write!(out, " {}", anno)
+                    }
+                }
+
+                write!(out, " {}", tag_name);
+                if let Some(prim) = size {
+                    write!(out, " : {}", prim);
+                }
+            }
+            Language::Cython => {
+                if size.is_some() {
+                    // If we need to specify size, then we have no choice but to create a typedef,
+                    // so `config.style` is not respected.
+                    write!(out, "cdef enum");
+                } else {
+                    write!(out, "{}enum {}", config.style.cython_def(), tag_name);
+                }
             }
         }
         out.open_brace();
+
+        // Emit enumerators for the tag enum.
         for (i, variant) in self.variants.iter().enumerate() {
             if i != 0 {
                 out.new_line()
@@ -694,37 +793,188 @@
             variant.write(config, out);
         }
 
+        // Close the tag enum.
         if config.language == Language::C && size.is_none() && config.style.generate_typedef() {
             out.close_brace(false);
-            write!(out, " {};", enum_name);
+            write!(out, " {};", tag_name);
         } else {
             out.close_brace(true);
         }
 
-        if config.language == Language::C {
-            if let Some(prim) = size {
-                if config.cpp_compat {
-                    out.new_line_if_not_start();
-                    out.write("#ifndef __cplusplus");
-                }
+        // Emit typedef specifying the tag enum's size if necessary.
+        // In C++ enums can "inherit" from numeric types (`enum E: uint8_t { ... }`),
+        // but in C `typedef uint8_t E` is the only way to give a fixed size to `E`.
+        if let Some(prim) = size {
+            if config.cpp_compatible_c() {
+                out.new_line_if_not_start();
+                out.write("#ifndef __cplusplus");
+            }
 
+            if config.language != Language::Cxx {
                 out.new_line();
-                write!(out, "typedef {} {};", prim, enum_name);
+                write!(out, "{} {} {};", config.language.typedef(), prim, tag_name);
+            }
+
+            if config.cpp_compatible_c() {
+                out.new_line_if_not_start();
+                out.write("#endif // __cplusplus");
+            }
+        }
 
-                if config.cpp_compat {
-                    out.new_line_if_not_start();
-                    out.write("#endif // __cplusplus");
+        // Emit convenience methods for the tag enum.
+        self.write_derived_functions_enum(config, out, has_data, tag_name);
+    }
+
+    /// The code here mirrors the beginning of `Struct::write` and `Union::write`.
+    fn open_struct_or_union<F: Write>(
+        &self,
+        config: &Config,
+        out: &mut SourceWriter<F>,
+        inline_tag_field: bool,
+    ) {
+        match config.language {
+            Language::C if config.style.generate_typedef() => out.write("typedef "),
+            Language::C | Language::Cxx => {}
+            Language::Cython => out.write(config.style.cython_def()),
+        }
+
+        out.write(if inline_tag_field { "union" } else { "struct" });
+
+        if self.annotations.must_use(config) {
+            if let Some(ref anno) = config.structure.must_use {
+                write!(out, " {}", anno);
+            }
+        }
+
+        if config.language != Language::C || config.style.generate_tag() {
+            write!(out, " {}", self.export_name());
+        }
+
+        out.open_brace();
+
+        // Emit the pre_body section, if relevant.
+        if let Some(body) = config.export.pre_body(&self.path) {
+            out.write_raw_block(body);
+            out.new_line();
+        }
+    }
+
+    /// Emit struct definitions for variants having data.
+    fn write_variant_defs<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
+        for variant in &self.variants {
+            if let VariantBody::Body {
+                ref body,
+                inline: false,
+                ..
+            } = variant.body
+            {
+                out.new_line();
+                out.new_line();
+                let condition = variant.cfg.to_condition(config);
+                // Cython doesn't support conditional enum variants.
+                if config.language != Language::Cython {
+                    condition.write_before(config, out);
+                }
+                body.write(config, out);
+                if config.language != Language::Cython {
+                    condition.write_after(config, out);
                 }
             }
         }
-        // Done emitting the enum
+    }
+
+    /// Emit tag field that is separate from all variants.
+    /// For non-inline tag scenario this is *the* tag field, and it does not exist in the variants.
+    /// For the inline tag scenario this is just a convenience and another way
+    /// to refer to the same tag that exist in all the variants.
+    fn write_tag_field<F: Write>(
+        &self,
+        config: &Config,
+        out: &mut SourceWriter<F>,
+        size: Option<&str>,
+        inline_tag_field: bool,
+        tag_name: &str,
+    ) {
+        // C++ allows accessing only common initial sequence of union
+        // fields so we have to wrap the tag field into an anonymous struct.
+        let wrap_tag = inline_tag_field && config.language == Language::Cxx;
+
+        if wrap_tag {
+            out.write("struct");
+            out.open_brace();
+        }
+
+        if config.language == Language::C && size.is_none() && !config.style.generate_typedef() {
+            out.write("enum ");
+        }
+
+        write!(out, "{} tag;", tag_name);
+
+        if wrap_tag {
+            out.close_brace(true);
+        }
+    }
+
+    /// Emit fields for all variants with data.
+    fn write_variant_fields<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
+        let mut first = true;
+        for variant in &self.variants {
+            if let VariantBody::Body {
+                name, body, inline, ..
+            } = &variant.body
+            {
+                if !first {
+                    out.new_line();
+                }
+                first = false;
+                let condition = variant.cfg.to_condition(config);
+                // Cython doesn't support conditional enum variants.
+                if config.language != Language::Cython {
+                    condition.write_before(config, out);
+                }
+                if *inline {
+                    // Write definition of an inlined variant with data.
+                    // Cython extern declarations don't manage layouts, layouts are defined entierly
+                    // by the corresponding C code. So we can inline the unnamed struct and get the
+                    // same observable result. Moreother we have to do it because Cython doesn't
+                    // support unnamed structs.
+                    if config.language != Language::Cython {
+                        out.write("struct");
+                        out.open_brace();
+                    }
+                    out.write_vertical_source_list(&body.fields, ListType::Cap(";"));
+                    if config.language != Language::Cython {
+                        out.close_brace(true);
+                    }
+                } else if config.style.generate_typedef() || config.language == Language::Cython {
+                    write!(out, "{} {};", body.export_name(), name);
+                } else {
+                    write!(out, "struct {} {};", body.export_name(), name);
+                }
+                if config.language != Language::Cython {
+                    condition.write_after(config, out);
+                }
+            }
+        }
+    }
+
+    // Emit convenience methods for enums themselves.
+    fn write_derived_functions_enum<F: Write>(
+        &self,
+        config: &Config,
+        out: &mut SourceWriter<F>,
+        has_data: bool,
+        tag_name: &str,
+    ) {
+        if config.language != Language::Cxx {
+            return;
+        }
 
         // Emit an ostream function if required.
-        let derive_ostream = config.enumeration.derive_ostream(&self.annotations);
-        if config.language == Language::Cxx && derive_ostream {
-            // For untagged enums, this emits the serializer function for the
-            // enum. For tagged enums, this emits the serializer function for
-            // the tag. In the latter case we need a couple of minor changes
+        if config.enumeration.derive_ostream(&self.annotations) {
+            // For enums without data, this emits the serializer function for the
+            // enum. For enums with data, this emits the serializer function for
+            // the tag enum. In the latter case we need a couple of minor changes
             // due to the function living inside the top-level struct or enum.
             let stream = config
                 .function
@@ -737,36 +987,36 @@
 
             out.new_line();
             out.new_line();
-            // For untagged enums, we mark the function inline because the
+            // For enums without data, we mark the function inline because the
             // header might get included into multiple compilation units that
             // get linked together, and not marking it inline would result in
-            // multiply-defined symbol errors. For tagged enums we don't have
+            // multiply-defined symbol errors. For enums with data we don't have
             // the same problem, but mark it as a friend function of the
             // containing union/struct.
-            // Note also that for tagged enums, the case labels for switch
+            // Note also that for enums with data, the case labels for switch
             // statements apparently need to be qualified to the top-level
             // generated struct or union. This is why the generated case labels
-            // below use the A::B::C format for tagged enums, with A being
+            // below use the A::B::C format for enums with data, with A being
             // self.export_name(). Failure to have that qualification results
             // in a surprising compilation failure for the generated header.
             write!(
                 out,
                 "{} std::ostream& operator<<(std::ostream& {}, const {}& {})",
-                if is_tagged { "friend" } else { "inline" },
+                if has_data { "friend" } else { "inline" },
                 stream,
-                enum_name,
+                tag_name,
                 instance,
             );
 
             out.open_brace();
-            if is_tagged {
+            if has_data {
                 // C++ name resolution rules are weird.
                 write!(
                     out,
                     "using {} = {}::{};",
-                    enum_name,
+                    tag_name,
                     self.export_name(),
-                    enum_name
+                    tag_name
                 );
                 out.new_line();
             }
@@ -778,7 +1028,7 @@
                 .map(|x| {
                     format!(
                         "case {}::{}: {} << \"{}\"; break;",
-                        enum_name, x.export_name, stream, x.export_name
+                        tag_name, x.export_name, stream, x.export_name
                     )
                 })
                 .collect();
@@ -789,9 +1039,9 @@
             write!(out, "return {};", stream);
             out.close_brace(false);
 
-            if is_tagged {
-                // For tagged enums, this emits the serializer function for
-                // the top-level enum or struct.
+            if has_data {
+                // For enums with data, this emits the serializer function for
+                // the top-level union or struct.
                 out.new_line();
                 out.new_line();
                 write!(
@@ -808,9 +1058,9 @@
                 write!(
                     out,
                     "using {} = {}::{};",
-                    enum_name,
+                    tag_name,
                     self.export_name(),
-                    enum_name
+                    tag_name
                 );
                 out.new_line();
 
@@ -821,21 +1071,24 @@
                     .iter()
                     .map(|x| {
                         let tag_str = format!("\"{}\"", x.export_name);
-                        if let VariantBody::Body { ref name, .. } = x.body {
+                        if let VariantBody::Body {
+                            ref name, ref body, ..
+                        } = x.body
+                        {
                             format!(
                                 "case {}::{}: {} << {}{}{}.{}; break;",
-                                enum_name,
+                                tag_name,
                                 x.export_name,
                                 stream,
-                                if separate_tag { &tag_str } else { "" },
-                                if separate_tag { " << " } else { "" },
+                                if body.has_tag_field { "" } else { &tag_str },
+                                if body.has_tag_field { "" } else { " << " },
                                 instance,
                                 name,
                             )
                         } else {
                             format!(
                                 "case {}::{}: {} << {}; break;",
-                                enum_name, x.export_name, stream, tag_str,
+                                tag_name, x.export_name, stream, tag_str,
                             )
                         }
                     })
@@ -848,495 +1101,395 @@
                 out.close_brace(false);
             }
         }
+    }
 
-        // If tagged, we need to emit structs for the cases and union them together
-        if is_tagged {
-            // Emit the cases for the structs
-            for variant in &self.variants {
-                if let VariantBody::Body { ref body, .. } = variant.body {
-                    out.new_line();
-                    out.new_line();
-                    let condition = variant.cfg.to_condition(config);
-                    condition.write_before(config, out);
-                    body.write(config, out);
-                    condition.write_after(config, out);
-                }
-            }
-
-            out.new_line();
-            out.new_line();
+    // Emit convenience methods for structs or unions produced for enums with data.
+    fn write_derived_functions_data<F: Write>(
+        &self,
+        config: &Config,
+        out: &mut SourceWriter<F>,
+        tag_name: &str,
+    ) {
+        if config.language != Language::Cxx {
+            return;
+        }
 
-            // Emit the actual union
-            if config.language == Language::C {
-                if config.style.generate_typedef() {
-                    out.write("typedef ");
-                }
+        if config.enumeration.derive_helper_methods(&self.annotations) {
+            for variant in &self.variants {
+                out.new_line();
+                out.new_line();
 
-                out.write(if separate_tag { "struct" } else { "union" });
+                let condition = variant.cfg.to_condition(config);
+                condition.write_before(config, out);
 
-                if config.style.generate_tag() {
-                    write!(out, " {}", self.export_name());
-                }
+                let arg_renamer = |name: &str| {
+                    config
+                        .function
+                        .rename_args
+                        .apply(name, IdentifierType::FunctionArg)
+                        .into_owned()
+                };
+
+                macro_rules! write_attrs {
+                    ($op:expr) => {{
+                        if let Some(Some(attrs)) =
+                            variant
+                                .body
+                                .annotations()
+                                .atom(concat!("variant-", $op, "-attributes"))
+                        {
+                            write!(out, "{} ", attrs);
+                        }
+                    }};
+                };
 
-                out.open_brace();
+                write_attrs!("constructor");
+                write!(out, "static {} {}(", self.export_name, variant.export_name);
 
-                // Emit the pre_body section, if relevant
-                // Only do this if we're writing C, since the struct is starting right here.
-                // For C++, the struct wraps all of the above variant structs too, and we write the pre_body section at the begining of that
-                if let Some(body) = config.export.pre_body(&self.path) {
-                    out.write_raw_block(body);
-                    out.new_line();
+                if let VariantBody::Body { ref body, .. } = variant.body {
+                    let skip_fields = if body.has_tag_field { 1 } else { 0 };
+                    let vec: Vec<_> = body
+                        .fields
+                        .iter()
+                        .skip(skip_fields)
+                        .map(|field| {
+                            Field::from_name_and_type(
+                                // const-ref args to constructor
+                                arg_renamer(&field.name),
+                                Type::const_ref_to(&field.ty),
+                            )
+                        })
+                        .collect();
+                    out.write_vertical_source_list(&vec[..], ListType::Join(","));
                 }
-            }
-
-            // C++ allows accessing only common initial sequence of union
-            // branches so we need to wrap tag into an anonymous struct
-            let wrap_tag = config.language == Language::Cxx && !separate_tag;
-
-            if wrap_tag {
-                out.write("struct");
-                out.open_brace();
-            }
-
-            if config.language == Language::C && size.is_none() && !config.style.generate_typedef()
-            {
-                out.write("enum ");
-            }
-
-            write!(out, "{} tag;", enum_name);
 
-            if wrap_tag {
-                out.close_brace(true);
-            }
-
-            out.new_line();
-
-            if separate_tag {
-                out.write("union");
+                write!(out, ")");
                 out.open_brace();
-            }
 
-            {
-                let mut first = true;
-                for variant in &self.variants {
-                    let (field_name, body) = match variant.body {
-                        VariantBody::Body { ref name, ref body } => (name, body),
-                        VariantBody::Empty(..) => continue,
-                    };
+                write!(out, "{} result;", self.export_name);
 
-                    if !first {
+                if let VariantBody::Body {
+                    name: ref variant_name,
+                    ref body,
+                    ..
+                } = variant.body
+                {
+                    let skip_fields = if body.has_tag_field { 1 } else { 0 };
+                    for field in body.fields.iter().skip(skip_fields) {
                         out.new_line();
+                        match field.ty {
+                            Type::Array(ref ty, ref length) => {
+                                // arrays are not assignable in C++ so we
+                                // need to manually copy the elements
+                                write!(out, "for (int i = 0; i < {}; i++)", length.as_str());
+                                out.open_brace();
+                                write!(out, "::new (&result.{}.{}[i]) (", variant_name, field.name);
+                                ty.write(config, out);
+                                write!(out, ")({}[i]);", arg_renamer(&field.name));
+                                out.close_brace(false);
+                            }
+                            ref ty => {
+                                write!(out, "::new (&result.{}.{}) (", variant_name, field.name);
+                                ty.write(config, out);
+                                write!(out, ")({});", arg_renamer(&field.name));
+                            }
+                        }
                     }
-                    first = false;
-                    let condition = variant.cfg.to_condition(config);
-                    condition.write_before(config, out);
-                    if config.style.generate_typedef() {
-                        write!(out, "{} {};", body.export_name(), field_name);
-                    } else {
-                        write!(out, "struct {} {};", body.export_name(), field_name);
-                    }
-                    condition.write_after(config, out);
                 }
-            }
 
-            if separate_tag {
-                out.close_brace(true);
-            }
-
-            let skip_fields = if separate_tag { 0 } else { 1 };
-
-            // Emit convenience methods
-            let derive_helper_methods = config.enumeration.derive_helper_methods(&self.annotations);
-            let derive_const_casts = config.enumeration.derive_const_casts(&self.annotations);
-            let derive_mut_casts = config.enumeration.derive_mut_casts(&self.annotations);
-            if config.language == Language::Cxx && derive_helper_methods {
-                for variant in &self.variants {
-                    out.new_line();
-                    out.new_line();
+                out.new_line();
+                write!(out, "result.tag = {}::{};", tag_name, variant.export_name);
+                out.new_line();
+                write!(out, "return result;");
+                out.close_brace(false);
 
-                    let condition = variant.cfg.to_condition(config);
-                    condition.write_before(config, out);
+                out.new_line();
+                out.new_line();
 
-                    let arg_renamer = |name: &str| {
-                        config
-                            .function
-                            .rename_args
-                            .apply(name, IdentifierType::FunctionArg)
-                            .into_owned()
-                    };
+                write_attrs!("is");
+                // FIXME: create a config for method case
+                write!(out, "bool Is{}() const", variant.export_name);
+                out.open_brace();
+                write!(out, "return tag == {}::{};", tag_name, variant.export_name);
+                out.close_brace(false);
 
-                    macro_rules! write_attrs {
-                        ($op:expr) => {{
-                            if let Some(Some(attrs)) = variant.body.annotations().atom(concat!(
-                                "variant-",
-                                $op,
-                                "-attributes"
-                            )) {
-                                write!(out, "{} ", attrs);
-                            }
-                        }};
+                let assert_name = match config.enumeration.cast_assert_name {
+                    Some(ref n) => &**n,
+                    None => "assert",
+                };
+
+                let mut derive_casts = |const_casts: bool| {
+                    let (member_name, body, inline_casts) = match variant.body {
+                        VariantBody::Body {
+                            ref name,
+                            ref body,
+                            inline_casts,
+                            ..
+                        } => (name, body, inline_casts),
+                        VariantBody::Empty(..) => return,
                     };
 
-                    write_attrs!("constructor");
-                    write!(out, "static {} {}(", self.export_name, variant.export_name);
-
-                    if let VariantBody::Body { ref body, .. } = variant.body {
-                        let vec: Vec<_> = body
-                            .fields
-                            .iter()
-                            .skip(skip_fields)
-                            .map(|&(ref name, ref ty, _)| {
-                                // const-ref args to constructor
-                                (arg_renamer(name), Type::const_ref_to(ty))
-                            })
-                            .collect();
-                        out.write_vertical_source_list(&vec[..], ListType::Join(","));
-                    }
-
-                    write!(out, ")");
-                    out.open_brace();
-
-                    write!(out, "{} result;", self.export_name);
-
-                    if let VariantBody::Body {
-                        name: ref variant_name,
-                        ref body,
-                    } = variant.body
-                    {
-                        for &(ref field_name, ref ty, ..) in body.fields.iter().skip(skip_fields) {
-                            out.new_line();
-                            match ty {
-                                Type::Array(ref ty, ref length) => {
-                                    // arrays are not assignable in C++ so we
-                                    // need to manually copy the elements
-                                    write!(out, "for (int i = 0; i < {}; i++)", length.as_str());
-                                    out.open_brace();
-                                    write!(
-                                        out,
-                                        "::new (&result.{}.{}[i]) (",
-                                        variant_name, field_name
-                                    );
-                                    ty.write(config, out);
-                                    write!(out, ")({}[i]);", arg_renamer(field_name));
-                                    out.close_brace(false);
-                                }
-                                ref ty => {
-                                    write!(
-                                        out,
-                                        "::new (&result.{}.{}) (",
-                                        variant_name, field_name
-                                    );
-                                    ty.write(config, out);
-                                    write!(out, ")({});", arg_renamer(field_name));
-                                }
-                            }
-                        }
+                    let skip_fields = if body.has_tag_field { 1 } else { 0 };
+                    let field_count = body.fields.len() - skip_fields;
+                    if field_count == 0 {
+                        return;
                     }
 
                     out.new_line();
-                    write!(out, "result.tag = {}::{};", enum_name, variant.export_name);
                     out.new_line();
-                    write!(out, "return result;");
-                    out.close_brace(false);
 
-                    out.new_line();
-                    out.new_line();
+                    if const_casts {
+                        write_attrs!("const-cast");
+                    } else {
+                        write_attrs!("mut-cast");
+                    }
+                    if inline_casts {
+                        let field = body.fields.last().unwrap();
+                        let return_type = field.ty.clone();
+                        let return_type = Type::Ptr {
+                            ty: Box::new(return_type),
+                            is_const: const_casts,
+                            is_ref: true,
+                            is_nullable: false,
+                        };
+                        return_type.write(config, out);
+                    } else if const_casts {
+                        write!(out, "const {}&", body.export_name());
+                    } else {
+                        write!(out, "{}&", body.export_name());
+                    }
 
-                    write_attrs!("is");
-                    // FIXME: create a config for method case
-                    write!(out, "bool Is{}() const", variant.export_name);
+                    write!(out, " As{}()", variant.export_name);
+                    if const_casts {
+                        write!(out, " const");
+                    }
                     out.open_brace();
-                    write!(out, "return tag == {}::{};", enum_name, variant.export_name);
+                    write!(out, "{}(Is{}());", assert_name, variant.export_name);
+                    out.new_line();
+                    write!(out, "return {}", member_name);
+                    if inline_casts {
+                        write!(out, "._0");
+                    }
+                    write!(out, ";");
                     out.close_brace(false);
+                };
 
-                    let assert_name = match config.enumeration.cast_assert_name {
-                        Some(ref n) => &**n,
-                        None => "assert",
-                    };
-
-                    let mut derive_casts = |const_casts: bool| {
-                        let (member_name, body) = match variant.body {
-                            VariantBody::Body { ref name, ref body } => (name, body),
-                            VariantBody::Empty(..) => return,
-                        };
-
-                        let field_count = body.fields.len() - skip_fields;
-                        if field_count == 0 {
-                            return;
-                        }
-
-                        out.new_line();
-                        out.new_line();
+                if config.enumeration.derive_const_casts(&self.annotations) {
+                    derive_casts(true)
+                }
 
-                        let dig = field_count == 1 && body.tuple_struct;
-                        if const_casts {
-                            write_attrs!("const-cast");
-                        } else {
-                            write_attrs!("mut-cast");
-                        }
-                        if dig {
-                            let field = body.fields.get(skip_fields).unwrap();
-                            let return_type = field.1.clone();
-                            let return_type = Type::Ptr {
-                                ty: Box::new(return_type),
-                                is_const: const_casts,
-                                is_ref: true,
-                                is_nullable: false,
-                            };
-                            return_type.write(config, out);
-                        } else if const_casts {
-                            write!(out, "const {}&", body.export_name());
-                        } else {
-                            write!(out, "{}&", body.export_name());
-                        }
+                if config.enumeration.derive_mut_casts(&self.annotations) {
+                    derive_casts(false)
+                }
 
-                        write!(out, " As{}()", variant.export_name);
-                        if const_casts {
-                            write!(out, " const");
-                        }
-                        out.open_brace();
-                        write!(out, "{}(Is{}());", assert_name, variant.export_name);
-                        out.new_line();
-                        if dig {
-                            write!(out, "return {}._0;", member_name);
-                        } else {
-                            write!(out, "return {};", member_name);
-                        }
-                        out.close_brace(false);
-                    };
+                condition.write_after(config, out);
+            }
+        }
 
-                    if derive_const_casts {
-                        derive_casts(true)
-                    }
+        let other = config
+            .function
+            .rename_args
+            .apply("other", IdentifierType::FunctionArg);
 
-                    if derive_mut_casts {
-                        derive_casts(false)
-                    }
+        macro_rules! write_attrs {
+            ($op:expr) => {{
+                if let Some(Some(attrs)) = self.annotations.atom(concat!($op, "-attributes")) {
+                    write!(out, "{} ", attrs);
+                }
+            }};
+        };
 
+        if self.can_derive_eq() && config.structure.derive_eq(&self.annotations) {
+            out.new_line();
+            out.new_line();
+            write_attrs!("eq");
+            write!(
+                out,
+                "bool operator==(const {}& {}) const",
+                self.export_name, other
+            );
+            out.open_brace();
+            write!(out, "if (tag != {}.tag)", other);
+            out.open_brace();
+            write!(out, "return false;");
+            out.close_brace(false);
+            out.new_line();
+            write!(out, "switch (tag)");
+            out.open_brace();
+            let mut exhaustive = true;
+            for variant in &self.variants {
+                if let VariantBody::Body {
+                    name: ref variant_name,
+                    ..
+                } = variant.body
+                {
+                    let condition = variant.cfg.to_condition(config);
+                    condition.write_before(config, out);
+                    write!(
+                        out,
+                        "case {}::{}: return {} == {}.{};",
+                        self.tag.as_ref().unwrap(),
+                        variant.export_name,
+                        variant_name,
+                        other,
+                        variant_name
+                    );
                     condition.write_after(config, out);
+                    out.new_line();
+                } else {
+                    exhaustive = false;
                 }
             }
+            if !exhaustive {
+                write!(out, "default: break;");
+            }
+            out.close_brace(false);
 
-            let other = config
-                .function
-                .rename_args
-                .apply("other", IdentifierType::FunctionArg);
+            out.new_line();
+            write!(out, "return true;");
 
-            macro_rules! write_attrs {
-                ($op:expr) => {{
-                    if let Some(Some(attrs)) = self.annotations.atom(concat!($op, "-attributes")) {
-                        write!(out, "{} ", attrs);
-                    }
-                }};
-            };
+            out.close_brace(false);
 
-            if config.language == Language::Cxx
-                && self.can_derive_eq()
-                && config.structure.derive_eq(&self.annotations)
-            {
+            if config.structure.derive_neq(&self.annotations) {
                 out.new_line();
                 out.new_line();
-                write_attrs!("eq");
+                write_attrs!("neq");
                 write!(
                     out,
-                    "bool operator==(const {}& {}) const",
+                    "bool operator!=(const {}& {}) const",
                     self.export_name, other
                 );
                 out.open_brace();
-                write!(out, "if (tag != {}.tag)", other);
-                out.open_brace();
-                write!(out, "return false;");
+                write!(out, "return !(*this == {});", other);
                 out.close_brace(false);
-                out.new_line();
-                write!(out, "switch (tag)");
-                out.open_brace();
-                let mut exhaustive = true;
-                for variant in &self.variants {
-                    if let VariantBody::Body {
-                        name: ref variant_name,
-                        ..
-                    } = variant.body
-                    {
-                        let condition = variant.cfg.to_condition(config);
-                        condition.write_before(config, out);
-                        write!(
-                            out,
-                            "case {}::{}: return {} == {}.{};",
-                            self.tag.as_ref().unwrap(),
-                            variant.export_name,
-                            variant_name,
-                            other,
-                            variant_name
-                        );
-                        condition.write_after(config, out);
-                        out.new_line();
-                    } else {
-                        exhaustive = false;
-                    }
-                }
-                if !exhaustive {
-                    write!(out, "default: break;");
-                }
-                out.close_brace(false);
-
-                out.new_line();
-                write!(out, "return true;");
+            }
+        }
 
-                out.close_brace(false);
+        if config
+            .enumeration
+            .private_default_tagged_enum_constructor(&self.annotations)
+        {
+            out.new_line();
+            out.new_line();
+            write!(out, "private:");
+            out.new_line();
+            write!(out, "{}()", self.export_name);
+            out.open_brace();
+            out.close_brace(false);
+            out.new_line();
+            write!(out, "public:");
+            out.new_line();
+        }
 
-                if config.structure.derive_neq(&self.annotations) {
-                    out.new_line();
-                    out.new_line();
-                    write_attrs!("neq");
+        if config
+            .enumeration
+            .derive_tagged_enum_destructor(&self.annotations)
+        {
+            out.new_line();
+            out.new_line();
+            write_attrs!("destructor");
+            write!(out, "~{}()", self.export_name);
+            out.open_brace();
+            write!(out, "switch (tag)");
+            out.open_brace();
+            let mut exhaustive = true;
+            for variant in &self.variants {
+                if let VariantBody::Body {
+                    ref name, ref body, ..
+                } = variant.body
+                {
+                    let condition = variant.cfg.to_condition(config);
+                    condition.write_before(config, out);
                     write!(
                         out,
-                        "bool operator!=(const {}& {}) const",
-                        self.export_name, other
+                        "case {}::{}: {}.~{}(); break;",
+                        self.tag.as_ref().unwrap(),
+                        variant.export_name,
+                        name,
+                        body.export_name(),
                     );
-                    out.open_brace();
-                    write!(out, "return !(*this == {});", other);
-                    out.close_brace(false);
+                    condition.write_after(config, out);
+                    out.new_line();
+                } else {
+                    exhaustive = false;
                 }
             }
-
-            if config.language == Language::Cxx
-                && config
-                    .enumeration
-                    .private_default_tagged_enum_constructor(&self.annotations)
-            {
-                out.new_line();
-                out.new_line();
-                write!(out, "private:");
-                out.new_line();
-                write!(out, "{}()", self.export_name);
-                out.open_brace();
-                out.close_brace(false);
-                out.new_line();
-                write!(out, "public:");
-                out.new_line();
+            if !exhaustive {
+                write!(out, "default: break;");
             }
+            out.close_brace(false);
+            out.close_brace(false);
+        }
 
-            if config.language == Language::Cxx
-                && config
-                    .enumeration
-                    .derive_tagged_enum_destructor(&self.annotations)
-            {
-                out.new_line();
-                out.new_line();
-                write_attrs!("destructor");
-                write!(out, "~{}()", self.export_name);
-                out.open_brace();
-                write!(out, "switch (tag)");
-                out.open_brace();
-                let mut exhaustive = true;
-                for variant in &self.variants {
-                    if let VariantBody::Body { ref name, ref body } = variant.body {
-                        let condition = variant.cfg.to_condition(config);
-                        condition.write_before(config, out);
-                        write!(
-                            out,
-                            "case {}::{}: {}.~{}(); break;",
-                            self.tag.as_ref().unwrap(),
-                            variant.export_name,
-                            name,
-                            body.export_name(),
-                        );
-                        condition.write_after(config, out);
-                        out.new_line();
-                    } else {
-                        exhaustive = false;
-                    }
-                }
-                if !exhaustive {
-                    write!(out, "default: break;");
+        if config
+            .enumeration
+            .derive_tagged_enum_copy_constructor(&self.annotations)
+        {
+            out.new_line();
+            out.new_line();
+            write_attrs!("copy-constructor");
+            write!(
+                out,
+                "{}(const {}& {})",
+                self.export_name, self.export_name, other
+            );
+            out.new_line();
+            write!(out, " : tag({}.tag)", other);
+            out.open_brace();
+            write!(out, "switch (tag)");
+            out.open_brace();
+            let mut exhaustive = true;
+            for variant in &self.variants {
+                if let VariantBody::Body {
+                    ref name, ref body, ..
+                } = variant.body
+                {
+                    let condition = variant.cfg.to_condition(config);
+                    condition.write_before(config, out);
+                    write!(
+                        out,
+                        "case {}::{}: ::new (&{}) ({})({}.{}); break;",
+                        self.tag.as_ref().unwrap(),
+                        variant.export_name,
+                        name,
+                        body.export_name(),
+                        other,
+                        name,
+                    );
+                    condition.write_after(config, out);
+                    out.new_line();
+                } else {
+                    exhaustive = false;
                 }
-                out.close_brace(false);
-                out.close_brace(false);
             }
+            if !exhaustive {
+                write!(out, "default: break;");
+            }
+            out.close_brace(false);
+            out.close_brace(false);
 
-            if config.language == Language::Cxx
-                && config
-                    .enumeration
-                    .derive_tagged_enum_copy_constructor(&self.annotations)
+            if config
+                .enumeration
+                .derive_tagged_enum_copy_assignment(&self.annotations)
             {
                 out.new_line();
-                out.new_line();
-                write_attrs!("copy-constructor");
+                write_attrs!("copy-assignment");
                 write!(
                     out,
-                    "{}(const {}& {})",
+                    "{}& operator=(const {}& {})",
                     self.export_name, self.export_name, other
                 );
-                out.new_line();
-                write!(out, " : tag({}.tag)", other);
                 out.open_brace();
-                write!(out, "switch (tag)");
+                write!(out, "if (this != &{})", other);
                 out.open_brace();
-                let mut exhaustive = true;
-                for variant in &self.variants {
-                    if let VariantBody::Body { ref name, ref body } = variant.body {
-                        let condition = variant.cfg.to_condition(config);
-                        condition.write_before(config, out);
-                        write!(
-                            out,
-                            "case {}::{}: ::new (&{}) ({})({}.{}); break;",
-                            self.tag.as_ref().unwrap(),
-                            variant.export_name,
-                            name,
-                            body.export_name(),
-                            other,
-                            name,
-                        );
-                        condition.write_after(config, out);
-                        out.new_line();
-                    } else {
-                        exhaustive = false;
-                    }
-                }
-                if !exhaustive {
-                    write!(out, "default: break;");
-                }
-                out.close_brace(false);
+                write!(out, "this->~{}();", self.export_name);
+                out.new_line();
+                write!(out, "new (this) {}({});", self.export_name, other);
                 out.close_brace(false);
-
-                if config.language == Language::Cxx
-                    && config
-                        .enumeration
-                        .derive_tagged_enum_copy_assignment(&self.annotations)
-                {
-                    out.new_line();
-                    write_attrs!("copy-assignment");
-                    write!(
-                        out,
-                        "{}& operator=(const {}& {})",
-                        self.export_name, self.export_name, other
-                    );
-                    out.open_brace();
-                    write!(out, "if (this != &{})", other);
-                    out.open_brace();
-                    write!(out, "this->~{}();", self.export_name);
-                    out.new_line();
-                    write!(out, "new (this) {}({});", self.export_name, other);
-                    out.close_brace(false);
-                    out.new_line();
-                    write!(out, "return *this;");
-                    out.close_brace(false);
-                }
-            }
-
-            // Emit the post_body section, if relevant
-            if let Some(body) = config.export.post_body(&self.path) {
                 out.new_line();
-                out.write_raw_block(body);
-            }
-
-            if config.language == Language::C && config.style.generate_typedef() {
+                write!(out, "return *this;");
                 out.close_brace(false);
-                write!(out, " {};", self.export_name);
-            } else {
-                out.close_brace(true);
             }
         }
-        condition.write_after(config, out);
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/field.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/field.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/field.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/field.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,77 @@
+use std::io::Write;
+
+use crate::bindgen::cdecl;
+use crate::bindgen::config::{Config, Language};
+use crate::bindgen::ir::{AnnotationSet, Cfg, ConditionWrite};
+use crate::bindgen::ir::{Documentation, Path, ToCondition, Type};
+use crate::bindgen::writer::{Source, SourceWriter};
+
+#[derive(Debug, Clone)]
+pub struct Field {
+    pub name: String,
+    pub ty: Type,
+    pub cfg: Option<Cfg>,
+    pub annotations: AnnotationSet,
+    pub documentation: Documentation,
+}
+
+impl Field {
+    pub fn from_name_and_type(name: String, ty: Type) -> Field {
+        Field {
+            name,
+            ty,
+            cfg: None,
+            annotations: AnnotationSet::new(),
+            documentation: Documentation::none(),
+        }
+    }
+
+    pub fn load(field: &syn::Field, self_path: &Path) -> Result<Option<Field>, String> {
+        Ok(if let Some(mut ty) = Type::load(&field.ty)? {
+            ty.replace_self_with(self_path);
+            Some(Field {
+                name: field
+                    .ident
+                    .as_ref()
+                    .ok_or_else(|| "field is missing identifier".to_string())?
+                    .to_string(),
+                ty,
+                cfg: Cfg::load(&field.attrs),
+                annotations: AnnotationSet::load(&field.attrs)?,
+                documentation: Documentation::load(&field.attrs),
+            })
+        } else {
+            None
+        })
+    }
+}
+
+impl Source for Field {
+    fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
+        // Cython doesn't support conditional fields.
+        let condition = self.cfg.to_condition(config);
+        if config.language != Language::Cython {
+            condition.write_before(config, out);
+        }
+
+        self.documentation.write(config, out);
+        cdecl::write_field(out, &self.ty, &self.name, config);
+        // Cython extern declarations don't manage layouts, layouts are defined entierly by the
+        // corresponding C code. So we can omit bitfield sizes which are not supported by Cython.
+        if config.language != Language::Cython {
+            if let Some(bitfield) = self.annotations.atom("bitfield") {
+                write!(out, ": {}", bitfield.unwrap_or_default());
+            }
+        }
+
+        if config.language != Language::Cython {
+            condition.write_after(config, out);
+            // FIXME(#634): `write_vertical_source_list` should support
+            // configuring list elements natively. For now we print a newline
+            // here to avoid printing `#endif;` with semicolon.
+            if condition.is_some() {
+                out.new_line();
+            }
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/function.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/function.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/function.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/function.rs	2021-01-18 19:59:04.000000000 +0000
@@ -6,7 +6,7 @@
 use std::io::Write;
 
 use crate::bindgen::cdecl;
-use crate::bindgen::config::{Config, Layout};
+use crate::bindgen::config::{Config, Language, Layout};
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
 use crate::bindgen::ir::{
@@ -86,7 +86,14 @@
         })
     }
 
-    pub fn swift_name(&self) -> Option<String> {
+    pub(crate) fn never_return(&self, config: &Config) -> bool {
+        self.never_return && config.language != Language::Cython
+    }
+
+    pub fn swift_name(&self, config: &Config) -> Option<String> {
+        if config.language == Language::Cython {
+            return None;
+        }
         // If the symbol name starts with the type name, separate the two components with '.'
         // so that Swift recognises the association between the method and the type
         let (ref type_prefix, ref type_name) = match self.self_type_path {
@@ -243,7 +250,7 @@
                 if let Some(ref prefix) = prefix {
                     write!(out, "{} ", prefix);
                 }
-                if func.annotations.must_use {
+                if func.annotations.must_use(config) {
                     if let Some(ref anno) = config.function.must_use {
                         write!(out, "{} ", anno);
                     }
@@ -258,12 +265,12 @@
             }
 
             if let Some(ref swift_name_macro) = config.function.swift_name_macro {
-                if let Some(swift_name) = func.swift_name() {
+                if let Some(swift_name) = func.swift_name(config) {
                     write!(out, " {}({})", swift_name_macro, swift_name);
                 }
             }
 
-            if func.never_return {
+            if func.never_return(config) {
                 if let Some(ref no_return_attr) = config.function.no_return {
                     out.write_fmt(format_args!(" {}", no_return_attr));
                 }
@@ -291,7 +298,7 @@
                     write!(out, "{}", prefix);
                     out.new_line();
                 }
-                if func.annotations.must_use {
+                if func.annotations.must_use(config) {
                     if let Some(ref anno) = config.function.must_use {
                         write!(out, "{}", anno);
                         out.new_line();
@@ -307,12 +314,12 @@
             }
 
             if let Some(ref swift_name_macro) = config.function.swift_name_macro {
-                if let Some(swift_name) = func.swift_name() {
+                if let Some(swift_name) = func.swift_name(config) {
                     write!(out, " {}({})", swift_name_macro, swift_name);
                 }
             }
 
-            if func.never_return {
+            if func.never_return(config) {
                 if let Some(ref no_return_attr) = config.function.no_return {
                     out.write_fmt(format_args!(" {}", no_return_attr));
                 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/mod.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/mod.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/mod.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/mod.rs	2021-01-18 19:59:04.000000000 +0000
@@ -7,6 +7,7 @@
 pub mod constant;
 pub mod documentation;
 pub mod enumeration;
+pub mod field;
 pub mod function;
 pub mod generic_path;
 pub mod global;
@@ -24,6 +25,7 @@
 pub use self::constant::*;
 pub use self::documentation::Documentation;
 pub use self::enumeration::*;
+pub use self::field::*;
 pub use self::function::*;
 pub use self::generic_path::*;
 pub use self::global::*;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/opaque.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/opaque.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/opaque.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/opaque.rs	2021-01-18 19:59:04.000000000 +0000
@@ -146,15 +146,29 @@
 
         self.generic_params.write_with_default(config, out);
 
-        if config.style.generate_typedef() && config.language == Language::C {
-            write!(
-                out,
-                "typedef struct {} {};",
-                self.export_name(),
-                self.export_name()
-            );
-        } else {
-            write!(out, "struct {};", self.export_name());
+        match config.language {
+            Language::C if config.style.generate_typedef() => {
+                write!(
+                    out,
+                    "typedef struct {} {};",
+                    self.export_name(),
+                    self.export_name()
+                );
+            }
+            Language::C | Language::Cxx => {
+                write!(out, "struct {};", self.export_name());
+            }
+            Language::Cython => {
+                write!(
+                    out,
+                    "{}struct {}",
+                    config.style.cython_def(),
+                    self.export_name()
+                );
+                out.open_brace();
+                out.write("pass");
+                out.close_brace(false);
+            }
         }
 
         condition.write_after(config, out);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/repr.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/repr.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/repr.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/repr.rs	2021-01-18 19:59:04.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/. */
 
+use crate::bindgen::ir::ty::PrimitiveType;
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum ReprStyle {
     Rust,
@@ -29,6 +31,23 @@
     ISize,
 }
 
+impl ReprType {
+    pub(crate) fn to_primitive(self) -> PrimitiveType {
+        match self {
+            ReprType::U8 => PrimitiveType::UInt8,
+            ReprType::U16 => PrimitiveType::UInt16,
+            ReprType::U32 => PrimitiveType::UInt32,
+            ReprType::U64 => PrimitiveType::UInt64,
+            ReprType::USize => PrimitiveType::USize,
+            ReprType::I8 => PrimitiveType::Int8,
+            ReprType::I16 => PrimitiveType::Int16,
+            ReprType::I32 => PrimitiveType::Int32,
+            ReprType::I64 => PrimitiveType::Int64,
+            ReprType::ISize => PrimitiveType::ISize,
+        }
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum ReprAlign {
     Packed,
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/structure.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/structure.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/structure.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/structure.rs	2021-01-18 19:59:04.000000000 +0000
@@ -8,7 +8,7 @@
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
 use crate::bindgen::ir::{
-    AnnotationSet, Cfg, ConditionWrite, Constant, Documentation, GenericParams, Item,
+    AnnotationSet, Cfg, ConditionWrite, Constant, Documentation, Field, GenericParams, Item,
     ItemContainer, Path, Repr, ReprAlign, ReprStyle, ToCondition, Type, Typedef,
 };
 use crate::bindgen::library::Library;
@@ -24,15 +24,14 @@
     pub path: Path,
     pub export_name: String,
     pub generic_params: GenericParams,
-    pub fields: Vec<(String, Type, Documentation)>,
+    pub fields: Vec<Field>,
     /// Whether there's a tag field on the body of this struct. When this is
     /// true, is_enum_variant_body is also guaranteed to be true.
-    pub is_tagged: bool,
+    pub has_tag_field: bool,
     /// Whether this is an enum variant body.
     pub is_enum_variant_body: bool,
     pub alignment: Option<ReprAlign>,
     pub is_transparent: bool,
-    pub tuple_struct: bool,
     pub cfg: Option<Cfg>,
     pub annotations: AnnotationSet,
     pub documentation: Documentation,
@@ -42,7 +41,7 @@
 impl Struct {
     /// Whether this struct can derive operator== / operator!=.
     pub fn can_derive_eq(&self) -> bool {
-        !self.fields.is_empty() && self.fields.iter().all(|x| x.1.can_cmp_eq())
+        !self.fields.is_empty() && self.fields.iter().all(|x| x.ty.can_cmp_eq())
     }
 
     pub fn add_associated_constant(&mut self, c: Constant) {
@@ -70,41 +69,43 @@
             layout_config.ensure_safe_to_represent(&align)?;
         }
 
-        let (fields, tuple_struct) = match item.fields {
-            syn::Fields::Unit => (Vec::new(), false),
-            syn::Fields::Named(ref fields) => {
-                let out = fields
-                    .named
-                    .iter()
-                    .try_skip_map(|x| x.as_ident_and_type(&path))?;
-                (out, false)
-            }
+        let fields = match item.fields {
+            syn::Fields::Unit => Vec::new(),
+            syn::Fields::Named(ref fields) => fields
+                .named
+                .iter()
+                .try_skip_map(|field| Field::load(field, &path))?,
             syn::Fields::Unnamed(ref fields) => {
                 let mut out = Vec::new();
                 let mut current = 0;
                 for field in fields.unnamed.iter() {
-                    if let Some(mut x) = Type::load(&field.ty)? {
-                        x.replace_self_with(&path);
-                        out.push((format!("{}", current), x, Documentation::load(&field.attrs)));
+                    if let Some(mut ty) = Type::load(&field.ty)? {
+                        ty.replace_self_with(&path);
+                        out.push(Field {
+                            name: format!("{}", current),
+                            ty,
+                            cfg: Cfg::load(&field.attrs),
+                            annotations: AnnotationSet::load(&field.attrs)?,
+                            documentation: Documentation::load(&field.attrs),
+                        });
                         current += 1;
                     }
                 }
-                (out, true)
+                out
             }
         };
 
-        let is_tagged = false;
+        let has_tag_field = false;
         let is_enum_variant_body = false;
 
         Ok(Struct::new(
             path,
             GenericParams::new(&item.generics),
             fields,
-            is_tagged,
+            has_tag_field,
             is_enum_variant_body,
             repr.align,
             is_transparent,
-            tuple_struct,
             Cfg::append(mod_cfg, Cfg::load(&item.attrs)),
             AnnotationSet::load(&item.attrs)?,
             Documentation::load(&item.attrs),
@@ -115,12 +116,11 @@
     pub fn new(
         path: Path,
         generic_params: GenericParams,
-        fields: Vec<(String, Type, Documentation)>,
-        is_tagged: bool,
+        fields: Vec<Field>,
+        has_tag_field: bool,
         is_enum_variant_body: bool,
         alignment: Option<ReprAlign>,
         is_transparent: bool,
-        tuple_struct: bool,
         cfg: Option<Cfg>,
         annotations: AnnotationSet,
         documentation: Documentation,
@@ -131,11 +131,10 @@
             export_name,
             generic_params,
             fields,
-            is_tagged,
+            has_tag_field,
             is_enum_variant_body,
             alignment,
             is_transparent,
-            tuple_struct,
             cfg,
             annotations,
             documentation,
@@ -144,8 +143,8 @@
     }
 
     pub fn simplify_standard_types(&mut self, config: &Config) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.simplify_standard_types(config);
+        for field in &mut self.fields {
+            field.ty.simplify_standard_types(config);
         }
     }
 
@@ -160,14 +159,14 @@
             return;
         }
 
-        for &(_, ref ty, _) in &self.fields {
-            ty.add_monomorphs(library, out);
+        for field in &self.fields {
+            field.ty.add_monomorphs(library, out);
         }
     }
 
     pub fn mangle_paths(&mut self, monomorphs: &Monomorphs) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.mangle_paths(monomorphs);
+        for field in &mut self.fields {
+            field.ty.mangle_paths(monomorphs);
         }
     }
 
@@ -183,13 +182,18 @@
             GenericParams::default(),
             self.fields
                 .iter()
-                .map(|x| (x.0.clone(), x.1.specialize(mappings), x.2.clone()))
+                .map(|field| Field {
+                    name: field.name.clone(),
+                    ty: field.ty.specialize(mappings),
+                    cfg: field.cfg.clone(),
+                    annotations: field.annotations.clone(),
+                    documentation: field.documentation.clone(),
+                })
                 .collect(),
-            self.is_tagged,
+            self.has_tag_field,
             self.is_enum_variant_body,
             self.alignment,
             self.is_transparent,
-            self.tuple_struct,
             self.cfg.clone(),
             self.annotations.clone(),
             self.documentation.clone(),
@@ -268,14 +272,14 @@
     }
 
     fn resolve_declaration_types(&mut self, resolver: &DeclarationTypeResolver) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.resolve_declaration_types(resolver);
+        for field in &mut self.fields {
+            field.ty.resolve_declaration_types(resolver);
         }
     }
 
     fn rename_for_config(&mut self, config: &Config) {
         // Rename the name of the struct
-        if !self.is_tagged || config.language == Language::C {
+        if !(self.has_tag_field && config.language == Language::Cxx) {
             config.export.rename(&mut self.export_name);
         }
 
@@ -284,9 +288,9 @@
             let fields = self
                 .fields
                 .iter_mut()
-                .skip(if self.is_tagged { 1 } else { 0 });
-            for &mut (_, ref mut ty, _) in fields {
-                ty.rename_for_config(config, &self.generic_params);
+                .skip(if self.has_tag_field { 1 } else { 0 });
+            for field in fields {
+                field.ty.rename_for_config(config, &self.generic_params);
             }
         }
 
@@ -301,7 +305,7 @@
 
         // Scope for mutable borrow of fields
         {
-            let mut names = self.fields.iter_mut().map(|field| &mut field.0);
+            let names = self.fields.iter_mut().map(|field| &mut field.name);
 
             let field_rules = self
                 .annotations
@@ -316,22 +320,19 @@
                 for name in names {
                     *name = r.apply(name, IdentifierType::StructMember).into_owned();
                 }
-            } else if self.tuple_struct {
-                // If there is a tag field, skip it
-                if self.is_tagged {
-                    names.next();
-                }
-
+            } else {
                 // If we don't have any rules for a tuple struct, prefix them with
-                // an underscore so it still compiles
+                // an underscore so it still compiles.
                 for name in names {
-                    name.insert(0, '_');
+                    if name.starts_with(|c: char| c.is_ascii_digit()) {
+                        name.insert(0, '_');
+                    }
                 }
             }
         }
 
         for field in &mut self.fields {
-            reserved::escape(&mut field.0);
+            reserved::escape(&mut field.name);
         }
 
         for c in self.associated_constants.iter_mut() {
@@ -343,12 +344,14 @@
         let mut fields = self.fields.iter();
 
         // If there is a tag field, skip it
-        if self.is_tagged {
+        if self.has_tag_field {
             fields.next();
         }
 
-        for &(_, ref ty, _) in fields {
-            ty.add_dependencies_ignoring_generics(&self.generic_params, library, out);
+        for field in fields {
+            field
+                .ty
+                .add_dependencies_ignoring_generics(&self.generic_params, library, out);
         }
 
         for c in &self.associated_constants {
@@ -397,7 +400,7 @@
                 path: self.path.clone(),
                 export_name: self.export_name.to_owned(),
                 generic_params: self.generic_params.clone(),
-                aliased: self.fields[0].1.clone(),
+                aliased: self.fields[0].ty.clone(),
                 cfg: self.cfg.clone(),
                 annotations: self.annotations.clone(),
                 documentation: self.documentation.clone(),
@@ -426,34 +429,50 @@
         //   typedef struct {
         // C with Both as style:
         //   typedef struct Name {
-        if config.language == Language::C && config.style.generate_typedef() {
-            out.write("typedef ");
+        match config.language {
+            Language::C if config.style.generate_typedef() => out.write("typedef "),
+            Language::C | Language::Cxx => {}
+            Language::Cython => out.write(config.style.cython_def()),
+        }
+
+        // Cython extern declarations don't manage layouts, layouts are defined entierly by the
+        // corresponding C code. So this `packed` is only for documentation, and missing
+        // `aligned(n)` is also not a problem.
+        if config.language == Language::Cython {
+            if let Some(align) = self.alignment {
+                match align {
+                    ReprAlign::Packed => out.write("packed "),
+                    ReprAlign::Align(_) => {} // Not supported
+                }
+            }
         }
 
         out.write("struct");
 
-        if let Some(align) = self.alignment {
-            match align {
-                ReprAlign::Packed => {
-                    if let Some(ref anno) = config.layout.packed {
-                        write!(out, " {}", anno);
+        if config.language != Language::Cython {
+            if let Some(align) = self.alignment {
+                match align {
+                    ReprAlign::Packed => {
+                        if let Some(ref anno) = config.layout.packed {
+                            write!(out, " {}", anno);
+                        }
                     }
-                }
-                ReprAlign::Align(n) => {
-                    if let Some(ref anno) = config.layout.aligned_n {
-                        write!(out, " {}({})", anno, n);
+                    ReprAlign::Align(n) => {
+                        if let Some(ref anno) = config.layout.aligned_n {
+                            write!(out, " {}({})", anno, n);
+                        }
                     }
                 }
             }
         }
 
-        if self.annotations.must_use {
+        if self.annotations.must_use(config) {
             if let Some(ref anno) = config.structure.must_use {
                 write!(out, " {}", anno);
             }
         }
 
-        if config.language == Language::Cxx || config.style.generate_tag() {
+        if config.language != Language::C || config.style.generate_tag() {
             write!(out, " {}", self.export_name());
         }
 
@@ -465,15 +484,9 @@
             out.new_line();
         }
 
-        if config.documentation {
-            out.write_vertical_source_list(&self.fields, ListType::Cap(";"));
-        } else {
-            let vec: Vec<_> = self
-                .fields
-                .iter()
-                .map(|&(ref name, ref ty, _)| (name.clone(), ty.clone()))
-                .collect();
-            out.write_vertical_source_list(&vec[..], ListType::Cap(";"));
+        out.write_vertical_source_list(&self.fields, ListType::Cap(";"));
+        if config.language == Language::Cython && self.fields.is_empty() {
+            out.write("pass");
         }
 
         if config.language == Language::Cxx {
@@ -498,9 +511,12 @@
                 let vec: Vec<_> = self
                     .fields
                     .iter()
-                    .map(|&(ref name, ref ty, _)| {
-                        // const-ref args to constructor
-                        (format!("const& {}", arg_renamer(name)), ty.clone())
+                    .map(|field| {
+                        Field::from_name_and_type(
+                            // const-ref args to constructor
+                            format!("const& {}", arg_renamer(&field.name)),
+                            field.ty.clone(),
+                        )
                     })
                     .collect();
                 out.write_vertical_source_list(&vec[..], ListType::Join(","));
@@ -510,7 +526,7 @@
                 let vec: Vec<_> = self
                     .fields
                     .iter()
-                    .map(|x| format!("{}({})", x.0, arg_renamer(&x.0)))
+                    .map(|field| format!("{}({})", field.name, arg_renamer(&field.name)))
                     .collect();
                 out.write_vertical_source_list(&vec[..], ListType::Join(","));
                 out.new_line();
@@ -580,14 +596,14 @@
                 let vec: Vec<_> = self
                     .fields
                     .iter()
-                    .map(|x| format!(" << \"{}=\" << {}.{}", x.0, instance, x.0))
+                    .map(|x| format!(" << \"{}=\" << {}.{}", x.name, instance, x.name))
                     .collect();
                 out.write_vertical_source_list(&vec[..], ListType::Join(" << \", \""));
                 out.write(" << \" }\";");
                 out.close_brace(false);
             }
 
-            let skip_fields = if self.is_tagged { 1 } else { 0 };
+            let skip_fields = if self.has_tag_field { 1 } else { 0 };
 
             macro_rules! emit_op {
                 ($op_name:expr, $op:expr, $conjuc:expr) => {{
@@ -620,7 +636,7 @@
                         .fields
                         .iter()
                         .skip(skip_fields)
-                        .map(|x| format!("{} {} {}.{}", x.0, $op, other, x.0))
+                        .map(|field| format!("{} {} {}.{}", field.name, $op, other, field.name))
                         .collect();
                     out.write_vertical_source_list(
                         &vec[..],
@@ -639,25 +655,25 @@
             }
             if config.structure.derive_lt(&self.annotations)
                 && self.fields.len() == 1
-                && self.fields[0].1.can_cmp_order()
+                && self.fields[0].ty.can_cmp_order()
             {
                 emit_op!("lt", "<", "&&");
             }
             if config.structure.derive_lte(&self.annotations)
                 && self.fields.len() == 1
-                && self.fields[0].1.can_cmp_order()
+                && self.fields[0].ty.can_cmp_order()
             {
                 emit_op!("lte", "<=", "&&");
             }
             if config.structure.derive_gt(&self.annotations)
                 && self.fields.len() == 1
-                && self.fields[0].1.can_cmp_order()
+                && self.fields[0].ty.can_cmp_order()
             {
                 emit_op!("gt", ">", "&&");
             }
             if config.structure.derive_gte(&self.annotations)
                 && self.fields.len() == 1
-                && self.fields[0].1.can_cmp_order()
+                && self.fields[0].ty.can_cmp_order()
             {
                 emit_op!("gte", ">=", "&&");
             }
@@ -694,35 +710,3 @@
         condition.write_after(config, out);
     }
 }
-
-pub trait SynFieldHelpers {
-    fn as_ident_and_type(
-        &self,
-        self_path: &Path,
-    ) -> Result<Option<(String, Type, Documentation)>, String>;
-}
-
-impl SynFieldHelpers for syn::Field {
-    fn as_ident_and_type(
-        &self,
-        self_path: &Path,
-    ) -> Result<Option<(String, Type, Documentation)>, String> {
-        let ident = self
-            .ident
-            .as_ref()
-            .ok_or_else(|| "field is missing identifier".to_string())?
-            .clone();
-        let converted_ty = Type::load(&self.ty)?;
-
-        if let Some(mut x) = converted_ty {
-            x.replace_self_with(self_path);
-            Ok(Some((
-                ident.to_string(),
-                x,
-                Documentation::load(&self.attrs),
-            )))
-        } else {
-            Ok(None)
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/typedef.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/typedef.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/typedef.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/typedef.rs	2021-01-18 19:59:04.000000000 +0000
@@ -9,8 +9,8 @@
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
 use crate::bindgen::ir::{
-    AnnotationSet, Cfg, ConditionWrite, Documentation, GenericParams, Item, ItemContainer, Path,
-    ToCondition, Type,
+    AnnotationSet, Cfg, ConditionWrite, Documentation, Field, GenericParams, Item, ItemContainer,
+    Path, ToCondition, Type,
 };
 use crate::bindgen::library::Library;
 use crate::bindgen::mangle;
@@ -203,13 +203,18 @@
 
         self.generic_params.write(config, out);
 
-        if config.language == Language::C {
-            out.write("typedef ");
-            (self.export_name().to_owned(), self.aliased.clone()).write(config, out);
-        } else {
-            write!(out, "using {} = ", self.export_name());
-            self.aliased.write(config, out);
+        match config.language {
+            Language::Cxx => {
+                write!(out, "using {} = ", self.export_name());
+                self.aliased.write(config, out);
+            }
+            Language::C | Language::Cython => {
+                write!(out, "{} ", config.language.typedef());
+                Field::from_name_and_type(self.export_name().to_owned(), self.aliased.clone())
+                    .write(config, out);
+            }
         }
+
         out.write(";");
 
         condition.write_after(config, out);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/ty.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/ty.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/ty.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/ty.rs	2021-01-18 19:59:04.000000000 +0000
@@ -2,14 +2,13 @@
  * 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 std::fmt;
 use std::io::Write;
 
 use crate::bindgen::cdecl;
 use crate::bindgen::config::{Config, Language};
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
-use crate::bindgen::ir::{Documentation, GenericParams, GenericPath, Path};
+use crate::bindgen::ir::{GenericParams, GenericPath, Path};
 use crate::bindgen::library::Library;
 use crate::bindgen::monomorph::Monomorphs;
 use crate::bindgen::utilities::IterHelpers;
@@ -123,7 +122,7 @@
         }
     }
 
-    pub fn to_repr_c(&self) -> &'static str {
+    pub fn to_repr_c(&self, config: &Config) -> &'static str {
         match *self {
             PrimitiveType::Void => "void",
             PrimitiveType::Bool => "bool",
@@ -147,11 +146,13 @@
             PrimitiveType::UInt => "unsigned int",
             PrimitiveType::ULong => "unsigned long",
             PrimitiveType::ULongLong => "unsigned long long",
+            PrimitiveType::USize if config.usize_is_size_t => "size_t",
             PrimitiveType::USize => "uintptr_t",
             PrimitiveType::UInt8 => "uint8_t",
             PrimitiveType::UInt16 => "uint16_t",
             PrimitiveType::UInt32 => "uint32_t",
             PrimitiveType::UInt64 => "uint64_t",
+            PrimitiveType::ISize if config.usize_is_size_t => "ptrdiff_t",
             PrimitiveType::ISize => "intptr_t",
             PrimitiveType::Int8 => "int8_t",
             PrimitiveType::Int16 => "int16_t",
@@ -178,12 +179,6 @@
     }
 }
 
-impl fmt::Display for PrimitiveType {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.to_repr_c())
-    }
-}
-
 // The `U` part of `[T; U]`
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum ArrayLength {
@@ -433,14 +428,14 @@
                 is_nullable: false,
                 is_ref: false,
             }),
-            "Box" if config.language == Language::C => Some(Type::Ptr {
+            "Box" if config.language != Language::Cxx => Some(Type::Ptr {
                 ty: Box::new(generic),
                 is_const: false,
                 is_nullable: false,
                 is_ref: false,
             }),
             "Cell" => Some(generic),
-            "ManuallyDrop" | "MaybeUninit" if config.language == Language::C => Some(generic),
+            "ManuallyDrop" | "MaybeUninit" if config.language != Language::Cxx => Some(generic),
             _ => None,
         }
     }
@@ -725,16 +720,3 @@
         cdecl::write_type(out, self, config);
     }
 }
-
-impl Source for (String, Type) {
-    fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
-        cdecl::write_field(out, &self.1, &self.0, config);
-    }
-}
-
-impl Source for (String, Type, Documentation) {
-    fn write<F: Write>(&self, config: &Config, out: &mut SourceWriter<F>) {
-        self.2.write(config, out);
-        cdecl::write_field(out, &self.1, &self.0, config);
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/union.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/union.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/ir/union.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/ir/union.rs	2021-01-18 19:59:04.000000000 +0000
@@ -7,10 +7,9 @@
 use crate::bindgen::config::{Config, Language, LayoutConfig};
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;
 use crate::bindgen::dependencies::Dependencies;
-use crate::bindgen::ir::SynFieldHelpers;
 use crate::bindgen::ir::{
-    AnnotationSet, Cfg, ConditionWrite, Documentation, GenericParams, Item, ItemContainer, Path,
-    Repr, ReprAlign, ReprStyle, ToCondition, Type,
+    AnnotationSet, Cfg, ConditionWrite, Documentation, Field, GenericParams, Item, ItemContainer,
+    Path, Repr, ReprAlign, ReprStyle, ToCondition, Type,
 };
 use crate::bindgen::library::Library;
 use crate::bindgen::mangle;
@@ -24,7 +23,7 @@
     pub path: Path,
     pub export_name: String,
     pub generic_params: GenericParams,
-    pub fields: Vec<(String, Type, Documentation)>,
+    pub fields: Vec<Field>,
     pub tuple_union: bool,
     pub alignment: Option<ReprAlign>,
     pub cfg: Option<Cfg>,
@@ -55,7 +54,7 @@
                 .fields
                 .named
                 .iter()
-                .try_skip_map(|x| x.as_ident_and_type(&path))?;
+                .try_skip_map(|field| Field::load(field, &path))?;
             (out, false)
         };
 
@@ -75,7 +74,7 @@
     pub fn new(
         path: Path,
         generic_params: GenericParams,
-        fields: Vec<(String, Type, Documentation)>,
+        fields: Vec<Field>,
         alignment: Option<ReprAlign>,
         tuple_union: bool,
         cfg: Option<Cfg>,
@@ -97,8 +96,8 @@
     }
 
     pub fn simplify_standard_types(&mut self, config: &Config) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.simplify_standard_types(config);
+        for field in &mut self.fields {
+            field.ty.simplify_standard_types(config);
         }
     }
 
@@ -113,14 +112,14 @@
             return;
         }
 
-        for &(_, ref ty, _) in &self.fields {
-            ty.add_monomorphs(library, out);
+        for field in &self.fields {
+            field.ty.add_monomorphs(library, out);
         }
     }
 
     pub fn mangle_paths(&mut self, monomorphs: &Monomorphs) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.mangle_paths(monomorphs);
+        for field in &mut self.fields {
+            field.ty.mangle_paths(monomorphs);
         }
     }
 }
@@ -155,15 +154,15 @@
     }
 
     fn resolve_declaration_types(&mut self, resolver: &DeclarationTypeResolver) {
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.resolve_declaration_types(resolver);
+        for field in &mut self.fields {
+            field.ty.resolve_declaration_types(resolver);
         }
     }
 
     fn rename_for_config(&mut self, config: &Config) {
         config.export.rename(&mut self.export_name);
-        for &mut (_, ref mut ty, _) in &mut self.fields {
-            ty.rename_for_config(config, &self.generic_params);
+        for field in &mut self.fields {
+            field.ty.rename_for_config(config, &self.generic_params);
         }
 
         let rules = self
@@ -174,11 +173,17 @@
         if let Some(o) = self.annotations.list("field-names") {
             let mut overriden_fields = Vec::new();
 
-            for (i, &(ref name, ref ty, ref doc)) in self.fields.iter().enumerate() {
+            for (i, field) in self.fields.iter().enumerate() {
                 if i >= o.len() {
-                    overriden_fields.push((name.clone(), ty.clone(), doc.clone()));
+                    overriden_fields.push(field.clone());
                 } else {
-                    overriden_fields.push((o[i].clone(), ty.clone(), doc.clone()));
+                    overriden_fields.push(Field {
+                        name: o[i].clone(),
+                        ty: field.ty.clone(),
+                        cfg: field.cfg.clone(),
+                        annotations: field.annotations.clone(),
+                        documentation: field.documentation.clone(),
+                    });
                 }
             }
 
@@ -187,26 +192,30 @@
             self.fields = self
                 .fields
                 .iter()
-                .map(|x| {
-                    (
-                        r.apply(&x.0, IdentifierType::StructMember).into_owned(),
-                        x.1.clone(),
-                        x.2.clone(),
-                    )
+                .map(|field| Field {
+                    name: r
+                        .apply(&field.name, IdentifierType::StructMember)
+                        .into_owned(),
+                    ty: field.ty.clone(),
+                    cfg: field.cfg.clone(),
+                    annotations: field.annotations.clone(),
+                    documentation: field.documentation.clone(),
                 })
                 .collect();
         } else if self.tuple_union {
             // If we don't have any rules for a tuple union, prefix them with
             // an underscore so it still compiles
-            for &mut (ref mut name, ..) in &mut self.fields {
-                name.insert(0, '_');
+            for field in &mut self.fields {
+                field.name.insert(0, '_');
             }
         }
     }
 
     fn add_dependencies(&self, library: &Library, out: &mut Dependencies) {
-        for &(_, ref ty, _) in &self.fields {
-            ty.add_dependencies_ignoring_generics(&self.generic_params, library, out);
+        for field in &self.fields {
+            field
+                .ty
+                .add_dependencies_ignoring_generics(&self.generic_params, library, out);
         }
     }
 
@@ -246,7 +255,13 @@
             GenericParams::default(),
             self.fields
                 .iter()
-                .map(|x| (x.0.clone(), x.1.specialize(&mappings), x.2.clone()))
+                .map(|field| Field {
+                    name: field.name.clone(),
+                    ty: field.ty.specialize(&mappings),
+                    cfg: field.cfg.clone(),
+                    annotations: field.annotations.clone(),
+                    documentation: field.documentation.clone(),
+                })
                 .collect(),
             self.alignment,
             self.tuple_union,
@@ -278,28 +293,33 @@
         //   typedef union {
         // C with Both as style:
         //   typedef union Name {
-        if config.language == Language::C && config.style.generate_typedef() {
-            out.write("typedef ");
+        match config.language {
+            Language::C if config.style.generate_typedef() => out.write("typedef "),
+            Language::C | Language::Cxx => {}
+            Language::Cython => out.write(config.style.cython_def()),
         }
 
         out.write("union");
 
-        if let Some(align) = self.alignment {
-            match align {
-                ReprAlign::Packed => {
-                    if let Some(ref anno) = config.layout.packed {
-                        write!(out, " {}", anno);
+        // Cython supports `packed` on structs (see comments there), but not on unions.
+        if config.language != Language::Cython {
+            if let Some(align) = self.alignment {
+                match align {
+                    ReprAlign::Packed => {
+                        if let Some(ref anno) = config.layout.packed {
+                            write!(out, " {}", anno);
+                        }
                     }
-                }
-                ReprAlign::Align(n) => {
-                    if let Some(ref anno) = config.layout.aligned_n {
-                        write!(out, " {}({})", anno, n);
+                    ReprAlign::Align(n) => {
+                        if let Some(ref anno) = config.layout.aligned_n {
+                            write!(out, " {}({})", anno, n);
+                        }
                     }
                 }
             }
         }
 
-        if config.language == Language::Cxx || config.style.generate_tag() {
+        if config.language != Language::C || config.style.generate_tag() {
             write!(out, " {}", self.export_name);
         }
 
@@ -311,15 +331,9 @@
             out.new_line();
         }
 
-        if config.documentation {
-            out.write_vertical_source_list(&self.fields, ListType::Cap(";"));
-        } else {
-            let vec: Vec<_> = self
-                .fields
-                .iter()
-                .map(|&(ref name, ref ty, _)| (name.clone(), ty.clone()))
-                .collect();
-            out.write_vertical_source_list(&vec[..], ListType::Cap(";"));
+        out.write_vertical_source_list(&self.fields, ListType::Cap(";"));
+        if config.language == Language::Cython && self.fields.is_empty() {
+            out.write("pass");
         }
 
         // Emit the post_body section, if relevant
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/library.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/library.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/library.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/library.rs	2021-01-18 19:59:04.000000000 +0000
@@ -62,12 +62,12 @@
             SortKey::None => { /* keep input order */ }
         }
 
-        if self.config.language == Language::C {
+        if self.config.language != Language::Cxx {
             self.instantiate_monomorphs();
-            self.remove_excluded();
+        }
+        self.remove_excluded();
+        if self.config.language == Language::C {
             self.resolve_declaration_types();
-        } else {
-            self.remove_excluded();
         }
 
         self.rename_items();
@@ -308,7 +308,7 @@
     }
 
     fn resolve_declaration_types(&mut self) {
-        if self.config.style.generate_typedef() {
+        if !self.config.style.generate_tag() {
             return;
         }
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/mod.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/mod.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/mod.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/mod.rs	2021-01-18 19:59:04.000000000 +0000
@@ -60,5 +60,6 @@
 
 pub use self::bindings::Bindings;
 pub use self::builder::Builder;
+pub use self::config::Profile; // disambiguate with cargo::Profile
 pub use self::config::*;
 pub use self::error::Error;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/parser.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/parser.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/parser.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/parser.rs	2021-01-18 19:59:04.000000000 +0000
@@ -191,6 +191,7 @@
                         self.config.parse.expand.all_features,
                         self.config.parse.expand.default_features,
                         &self.config.parse.expand.features,
+                        self.config.parse.expand.profile,
                     )
                     .map_err(|x| Error::CargoExpand(pkg.name.clone(), x))?;
                 let i = syn::parse_file(&s).map_err(|x| Error::ParseSyntaxError {
@@ -204,7 +205,7 @@
             self.cache_expanded_crate.get(&pkg.name).unwrap().clone()
         };
 
-        self.process_mod(pkg, None, &mod_items, 0)
+        self.process_mod(pkg, None, None, &mod_items, 0)
     }
 
     fn parse_mod(
@@ -239,30 +240,37 @@
         };
 
         // Compute module directory according to Rust 2018 rules
-        let mod_dir_2018;
+        let submod_dir_2018;
 
-        let mod_dir = if depth == 0 || mod_path.ends_with("mod.rs") {
-            mod_path.parent().unwrap()
+        let mod_dir = mod_path.parent().unwrap();
+
+        let submod_dir = if depth == 0 || mod_path.ends_with("mod.rs") {
+            mod_dir
         } else {
-            mod_dir_2018 = mod_path
+            submod_dir_2018 = mod_path
                 .parent()
                 .unwrap()
                 .join(mod_path.file_stem().unwrap());
-            &mod_dir_2018
+            &submod_dir_2018
         };
 
-        self.process_mod(pkg, Some(&mod_dir), &mod_items, depth)
+        self.process_mod(pkg, Some(mod_dir), Some(submod_dir), &mod_items, depth)
     }
 
     /// `mod_dir` is the path to the current directory of the module. It may be
     /// `None` for pre-expanded modules.
+    ///
+    /// `submod_dir` is the path to search submodules in by default, which might
+    /// be different for rust 2018 for example.
     fn process_mod(
         &mut self,
         pkg: &PackageRef,
         mod_dir: Option<&FilePath>,
+        submod_dir: Option<&FilePath>,
         items: &[syn::Item],
         depth: usize,
     ) -> Result<(), Error> {
+        debug_assert_eq!(mod_dir.is_some(), submod_dir.is_some());
         // We process the items first then the nested modules.
         let nested_modules = self.out.load_syn_crate_mod(
             &self.config,
@@ -274,18 +282,24 @@
 
         for item in nested_modules {
             let next_mod_name = item.ident.to_string();
-
             let cfg = Cfg::load(&item.attrs);
             if let Some(ref cfg) = cfg {
                 self.cfg_stack.push(cfg.clone());
             }
 
             if let Some((_, ref inline_items)) = item.content {
-                let next_mod_dir = mod_dir.map(|dir| dir.join(&next_mod_name));
-                self.process_mod(pkg, next_mod_dir.as_deref(), inline_items, depth)?;
+                let next_submod_dir = submod_dir.map(|dir| dir.join(&next_mod_name));
+                self.process_mod(
+                    pkg,
+                    mod_dir,
+                    next_submod_dir.as_deref(),
+                    inline_items,
+                    depth,
+                )?;
             } else if let Some(mod_dir) = mod_dir {
-                let next_mod_path1 = mod_dir.join(next_mod_name.clone() + ".rs");
-                let next_mod_path2 = mod_dir.join(next_mod_name.clone()).join("mod.rs");
+                let submod_dir = submod_dir.unwrap();
+                let next_mod_path1 = submod_dir.join(next_mod_name.clone() + ".rs");
+                let next_mod_path2 = submod_dir.join(next_mod_name.clone()).join("mod.rs");
 
                 if next_mod_path1.exists() {
                     self.parse_mod(pkg, next_mod_path1.as_path(), depth + 1)?;
@@ -906,14 +920,6 @@
         mod_cfg: Option<&Cfg>,
         item: &syn::ItemEnum,
     ) {
-        if item.generics.lifetimes().count() > 0 {
-            info!(
-                "Skip {}::{} - (has generics or lifetimes or where bounds).",
-                crate_name, &item.ident
-            );
-            return;
-        }
-
         match Enum::load(item, mod_cfg, config) {
             Ok(en) => {
                 info!("Take {}::{}.", crate_name, &item.ident);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/writer.rs firefox-85.0+build1/third_party/cbindgen/src/bindgen/writer.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/bindgen/writer.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/bindgen/writer.rs	2021-01-18 19:59:04.000000000 +0000
@@ -6,7 +6,7 @@
 use std::io;
 use std::io::Write;
 
-use crate::bindgen::config::{Braces, Config};
+use crate::bindgen::config::{Braces, Config, Language};
 use crate::bindgen::Bindings;
 
 /// A type of way to format a list.
@@ -153,28 +153,40 @@
     }
 
     pub fn open_brace(&mut self) {
-        match self.bindings.config.braces {
-            Braces::SameLine => {
-                self.write(" {");
-                self.push_tab();
-                self.new_line();
-            }
-            Braces::NextLine => {
+        match self.bindings.config.language {
+            Language::Cxx | Language::C => match self.bindings.config.braces {
+                Braces::SameLine => {
+                    self.write(" {");
+                    self.push_tab();
+                    self.new_line();
+                }
+                Braces::NextLine => {
+                    self.new_line();
+                    self.write("{");
+                    self.push_tab();
+                    self.new_line();
+                }
+            },
+            Language::Cython => {
+                self.write(":");
                 self.new_line();
-                self.write("{");
                 self.push_tab();
-                self.new_line();
             }
         }
     }
 
     pub fn close_brace(&mut self, semicolon: bool) {
         self.pop_tab();
-        self.new_line();
-        if semicolon {
-            self.write("};");
-        } else {
-            self.write("}");
+        match self.bindings.config.language {
+            Language::Cxx | Language::C => {
+                self.new_line();
+                if semicolon {
+                    self.write("};");
+                } else {
+                    self.write("}");
+                }
+            }
+            Language::Cython => {}
         }
     }
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/src/main.rs firefox-85.0+build1/third_party/cbindgen/src/main.rs
--- firefox-84.0.2+build1/third_party/cbindgen/src/main.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/src/main.rs	2021-01-18 19:59:04.000000000 +0000
@@ -5,6 +5,7 @@
 use std::env;
 use std::io;
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 extern crate clap;
 #[macro_use]
@@ -24,22 +25,19 @@
 mod bindgen;
 mod logging;
 
-use crate::bindgen::{Bindings, Builder, Cargo, Config, Error, Language, Style};
+use crate::bindgen::{Bindings, Builder, Cargo, Config, Error, Profile, Style};
 
 fn apply_config_overrides<'a>(config: &mut Config, matches: &ArgMatches<'a>) {
     // We allow specifying a language to override the config default. This is
     // used by compile-tests.
     if let Some(lang) = matches.value_of("lang") {
-        config.language = match lang {
-            "C++" => Language::Cxx,
-            "c++" => Language::Cxx,
-            "C" => Language::C,
-            "c" => Language::C,
-            _ => {
-                error!("Unknown language specified.");
+        config.language = match lang.parse() {
+            Ok(lang) => lang,
+            Err(reason) => {
+                error!("{}", reason);
                 return;
             }
-        };
+        }
     }
 
     if matches.is_present("cpp-compat") {
@@ -61,6 +59,16 @@
         }
     }
 
+    if let Some(profile) = matches.value_of("profile") {
+        config.parse.expand.profile = match Profile::from_str(profile) {
+            Ok(p) => p,
+            Err(e) => {
+                error!("{}", e);
+                return;
+            }
+        }
+    }
+
     if matches.is_present("d") {
         config.parse.parse_deps = true;
     }
@@ -144,7 +152,7 @@
                 .long("lang")
                 .value_name("LANGUAGE")
                 .help("Specify the language to output bindings in")
-                .possible_values(&["c++", "C++", "c", "C"]),
+                .possible_values(&["c++", "C++", "c", "C", "cython", "Cython"]),
         )
         .arg(
             Arg::with_name("cpp-compat")
@@ -227,6 +235,16 @@
                 .required(false),
         )
         .arg(
+            Arg::with_name("profile")
+                .long("profile")
+                .value_name("PROFILE")
+                .help(
+                    "Specify the profile to use when expanding macros. \
+                     Has no effect otherwise."
+                )
+                .possible_values(&["Debug", "debug", "Release", "release"]),
+        )
+        .arg(
             Arg::with_name("quiet")
                 .short("q")
                 .long("quiet")
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/template.toml firefox-85.0+build1/third_party/cbindgen/template.toml
--- firefox-84.0.2+build1/third_party/cbindgen/template.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/template.toml	2021-01-18 19:59:04.000000000 +0000
@@ -44,6 +44,7 @@
 
 style = "both"
 sort_by = "Name" # default for `fn.sort_by` and `const.sort_by`
+usize_is_size_t = true
 
 
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,37 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Status {
+  Ok,
+  Err,
+};
+typedef uint32_t Status;
+
+typedef struct Dep {
+  int32_t a;
+  float b;
+} Dep;
+
+typedef struct Foo_i32 {
+  int32_t a;
+  int32_t b;
+  struct Dep c;
+} Foo_i32;
+
+typedef struct Foo_i32 IntFoo;
+
+typedef struct Foo_f64 {
+  double a;
+  double b;
+  struct Dep c;
+} Foo_f64;
+
+typedef struct Foo_f64 DoubleFoo;
+
+typedef int32_t Unit;
+
+typedef Status SpecialStatus;
+
+void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Status
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  Ok,
+  Err,
+};
+#ifndef __cplusplus
+typedef uint32_t Status;
+#endif // __cplusplus
+
+typedef struct Dep {
+  int32_t a;
+  float b;
+} Dep;
+
+typedef struct Foo_i32 {
+  int32_t a;
+  int32_t b;
+  struct Dep c;
+} Foo_i32;
+
+typedef struct Foo_i32 IntFoo;
+
+typedef struct Foo_f64 {
+  double a;
+  double b;
+  struct Dep c;
+} Foo_f64;
+
+typedef struct Foo_f64 DoubleFoo;
+
+typedef int32_t Unit;
+
+typedef Status SpecialStatus;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Ok,
+    Err,
+  ctypedef uint32_t Status;
+
+  ctypedef struct Dep:
+    int32_t a;
+    float b;
+
+  ctypedef struct Foo_i32:
+    int32_t a;
+    int32_t b;
+    Dep c;
+
+  ctypedef Foo_i32 IntFoo;
+
+  ctypedef struct Foo_f64:
+    double a;
+    double b;
+    Dep c;
+
+  ctypedef Foo_f64 DoubleFoo;
+
+  ctypedef int32_t Unit;
+
+  ctypedef Status SpecialStatus;
+
+  void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,37 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Status {
+  Ok,
+  Err,
+};
+typedef uint32_t Status;
+
+struct Dep {
+  int32_t a;
+  float b;
+};
+
+struct Foo_i32 {
+  int32_t a;
+  int32_t b;
+  struct Dep c;
+};
+
+typedef struct Foo_i32 IntFoo;
+
+struct Foo_f64 {
+  double a;
+  double b;
+  struct Dep c;
+};
+
+typedef struct Foo_f64 DoubleFoo;
+
+typedef int32_t Unit;
+
+typedef Status SpecialStatus;
+
+void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Status
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  Ok,
+  Err,
+};
+#ifndef __cplusplus
+typedef uint32_t Status;
+#endif // __cplusplus
+
+struct Dep {
+  int32_t a;
+  float b;
+};
+
+struct Foo_i32 {
+  int32_t a;
+  int32_t b;
+  struct Dep c;
+};
+
+typedef struct Foo_i32 IntFoo;
+
+struct Foo_f64 {
+  double a;
+  double b;
+  struct Dep c;
+};
+
+typedef struct Foo_f64 DoubleFoo;
+
+typedef int32_t Unit;
+
+typedef Status SpecialStatus;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/alias.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/alias.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Ok,
+    Err,
+  ctypedef uint32_t Status;
+
+  cdef struct Dep:
+    int32_t a;
+    float b;
+
+  cdef struct Foo_i32:
+    int32_t a;
+    int32_t b;
+    Dep c;
+
+  ctypedef Foo_i32 IntFoo;
+
+  cdef struct Foo_f64:
+    double a;
+    double b;
+    Dep c;
+
+  ctypedef Foo_f64 DoubleFoo;
+
+  ctypedef int32_t Unit;
+
+  ctypedef Status SpecialStatus;
+
+  void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,65 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C {
+  X = 2,
+  Y,
+};
+typedef uint32_t C;
+
+typedef struct A {
+  int32_t m0;
+} A;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+enum F_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t F_Tag;
+
+typedef struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} F;
+
+enum H_Tag {
+  Hello,
+  There,
+  Everyone,
+};
+typedef uint8_t H_Tag;
+
+typedef struct There_Body {
+  uint8_t x;
+  int16_t y;
+} There_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    There_Body there;
+  };
+} H;
+
+void root(struct A x, struct B y, C z, union F f, struct H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,91 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  X = 2,
+  Y,
+};
+#ifndef __cplusplus
+typedef uint32_t C;
+#endif // __cplusplus
+
+typedef struct A {
+  int32_t m0;
+} A;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+typedef struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} F;
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Hello,
+  There,
+  Everyone,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+typedef struct There_Body {
+  uint8_t x;
+  int16_t y;
+} There_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    There_Body there;
+  };
+} H;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A x, struct B y, C z, union F f, struct H h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.c	2021-01-18 19:59:04.000000000 +0000
@@ -27,18 +27,16 @@
 
 typedef struct {
   F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  F_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   F_Tag tag;
-  Foo_Body foo;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } F;
 
@@ -50,10 +48,6 @@
 typedef uint8_t H_Tag;
 
 typedef struct {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } There_Body;
@@ -61,7 +55,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    Hello_Body hello;
+    struct {
+      int16_t hello;
+    };
     There_Body there;
   };
 } H;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -39,18 +39,16 @@
 
 typedef struct {
   F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  F_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   F_Tag tag;
-  Foo_Body foo;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } F;
 
@@ -68,10 +66,6 @@
 #endif // __cplusplus
 
 typedef struct {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } There_Body;
@@ -79,7 +73,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    Hello_Body hello;
+    struct {
+      int16_t hello;
+    };
     There_Body there;
   };
 } H;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,53 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    X # = 2,
+    Y,
+  ctypedef uint32_t C;
+
+  ctypedef struct A:
+    int32_t m0;
+
+  ctypedef struct B:
+    int32_t x;
+    float y;
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t F_Tag;
+
+  ctypedef struct Bar_Body:
+    F_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  ctypedef union F:
+    F_Tag tag;
+    F_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  cdef enum:
+    Hello,
+    There,
+    Everyone,
+  ctypedef uint8_t H_Tag;
+
+  ctypedef struct There_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct H:
+    H_Tag tag;
+    int16_t hello;
+    There_Body there;
+
+  void root(A x, B y, C z, F f, H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,65 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C {
+  X = 2,
+  Y,
+};
+typedef uint32_t C;
+
+struct A {
+  int32_t m0;
+};
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+enum F_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t F_Tag;
+
+struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag {
+  Hello,
+  There,
+  Everyone,
+};
+typedef uint8_t H_Tag;
+
+struct There_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    struct There_Body there;
+  };
+};
+
+void root(struct A x, struct B y, C z, union F f, struct H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,91 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  X = 2,
+  Y,
+};
+#ifndef __cplusplus
+typedef uint32_t C;
+#endif // __cplusplus
+
+struct A {
+  int32_t m0;
+};
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Hello,
+  There,
+  Everyone,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+struct There_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    struct There_Body there;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A x, struct B y, C z, union F f, struct H h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/annotation.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/annotation.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,53 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    X # = 2,
+    Y,
+  ctypedef uint32_t C;
+
+  cdef struct A:
+    int32_t m0;
+
+  cdef struct B:
+    int32_t x;
+    float y;
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t F_Tag;
+
+  cdef struct Bar_Body:
+    F_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  cdef union F:
+    F_Tag tag;
+    F_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  cdef enum:
+    Hello,
+    There,
+    Everyone,
+  ctypedef uint8_t H_Tag;
+
+  cdef struct There_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct H:
+    H_Tag tag;
+    int16_t hello;
+    There_Body there;
+
+  void root(A x, B y, C z, F f, H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef enum Foo_Tag {
+  A,
+} Foo_Tag;
+
+typedef struct Foo {
+  Foo_Tag tag;
+  union {
+    struct {
+      float a[20];
+    };
+  };
+} Foo;
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,27 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef enum Foo_Tag {
+  A,
+} Foo_Tag;
+
+typedef struct Foo {
+  Foo_Tag tag;
+  union {
+    struct {
+      float a[20];
+    };
+  };
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.c	2021-01-18 19:59:04.000000000 +0000
@@ -8,13 +8,11 @@
 } Foo_Tag;
 
 typedef struct {
-  float _0[20];
-} A_Body;
-
-typedef struct {
   Foo_Tag tag;
   union {
-    A_Body a;
+    struct {
+      float a[20];
+    };
   };
 } Foo;
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -8,13 +8,11 @@
 } Foo_Tag;
 
 typedef struct {
-  float _0[20];
-} A_Body;
-
-typedef struct {
   Foo_Tag tag;
   union {
-    A_Body a;
+    struct {
+      float a[20];
+    };
   };
 } Foo;
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef enum Foo_Tag:
+    A,
+
+  ctypedef struct Foo:
+    Foo_Tag tag;
+    float a[20];
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Foo_Tag {
+  A,
+};
+
+struct Foo {
+  enum Foo_Tag tag;
+  union {
+    struct {
+      float a[20];
+    };
+  };
+};
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,27 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum Foo_Tag {
+  A,
+};
+
+struct Foo {
+  enum Foo_Tag tag;
+  union {
+    struct {
+      float a[20];
+    };
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/array.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/array.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum Foo_Tag:
+    A,
+
+  cdef struct Foo:
+    Foo_Tag tag;
+    float a[20];
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,78 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct I I;
+
+enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+typedef uint8_t H_Tag;
+
+typedef struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum J_Tag {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+typedef uint8_t J_Tag;
+
+typedef struct J_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} J_Bar_Body;
+
+typedef struct J {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    J_Bar_Body bar;
+  };
+} J;
+
+enum K_Tag {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+typedef uint8_t K_Tag;
+
+typedef struct K_Bar_Body {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+} K_Bar_Body;
+
+typedef union K {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  K_Bar_Body bar;
+} K;
+
+void foo(struct H h, struct I i, struct J j, union K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,104 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct I I;
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+typedef struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum J_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t J_Tag;
+#endif // __cplusplus
+
+typedef struct J_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} J_Bar_Body;
+
+typedef struct J {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    J_Bar_Body bar;
+  };
+} J;
+
+enum K_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t K_Tag;
+#endif // __cplusplus
+
+typedef struct K_Bar_Body {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+} K_Bar_Body;
+
+typedef union K {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  K_Bar_Body bar;
+} K;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(struct H h, struct I i, struct J j, union K k);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,78 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct I I;
+
+enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+typedef uint8_t H_Tag;
+
+typedef struct {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum J_Tag {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+typedef uint8_t J_Tag;
+
+typedef struct {
+  uint8_t x;
+  int16_t y;
+} J_Bar_Body;
+
+typedef struct {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    J_Bar_Body bar;
+  };
+} J;
+
+enum K_Tag {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+typedef uint8_t K_Tag;
+
+typedef struct {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+} K_Bar_Body;
+
+typedef union {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  K_Bar_Body bar;
+} K;
+
+void foo(H h, I i, J j, K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct I I;
-
-enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-typedef uint8_t H_Tag;
-
-typedef struct {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum J_Tag {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-typedef uint8_t J_Tag;
-
-typedef struct {
-  int16_t _0;
-} J_Foo_Body;
-
-typedef struct {
-  uint8_t x;
-  int16_t y;
-} J_Bar_Body;
-
-typedef struct {
-  J_Tag tag;
-  union {
-    J_Foo_Body foo;
-    J_Bar_Body bar;
-  };
-} J;
-
-enum K_Tag {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-typedef uint8_t K_Tag;
-
-typedef struct {
-  K_Tag tag;
-  int16_t _0;
-} K_Foo_Body;
-
-typedef struct {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-} K_Bar_Body;
-
-typedef union {
-  K_Tag tag;
-  K_Foo_Body foo;
-  K_Bar_Body bar;
-} K;
-
-void foo(H h, I i, J j, K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,104 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct I I;
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum J_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t J_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  uint8_t x;
+  int16_t y;
+} J_Bar_Body;
+
+typedef struct {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    J_Bar_Body bar;
+  };
+} J;
+
+enum K_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t K_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+} K_Bar_Body;
+
+typedef union {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  K_Bar_Body bar;
+} K;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(H h, I i, J j, K k);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct I I;
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum J_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t J_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  int16_t _0;
-} J_Foo_Body;
-
-typedef struct {
-  uint8_t x;
-  int16_t y;
-} J_Bar_Body;
-
-typedef struct {
-  J_Tag tag;
-  union {
-    J_Foo_Body foo;
-    J_Bar_Body bar;
-  };
-} J;
-
-enum K_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t K_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  K_Tag tag;
-  int16_t _0;
-} K_Foo_Body;
-
-typedef struct {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-} K_Bar_Body;
-
-typedef union {
-  K_Tag tag;
-  K_Foo_Body foo;
-  K_Bar_Body bar;
-} K;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(H h, I i, J j, K k);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,250 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct I;
+
+struct H {
+  enum class Tag : uint8_t {
+    H_Foo,
+    H_Bar,
+    H_Baz,
+  };
+
+  struct H_Foo_Body {
+    int16_t _0;
+  };
+
+  struct H_Bar_Body {
+    uint8_t x;
+    int16_t y;
+  };
+
+  Tag tag;
+  union {
+    H_Foo_Body foo;
+    H_Bar_Body bar;
+  };
+
+  static H H_Foo(const int16_t &_0) {
+    H result;
+    ::new (&result.foo._0) (int16_t)(_0);
+    result.tag = Tag::H_Foo;
+    return result;
+  }
+
+  bool IsH_Foo() const {
+    return tag == Tag::H_Foo;
+  }
+
+  const int16_t& AsH_Foo() const {
+    MY_ASSERT(IsH_Foo());
+    return foo._0;
+  }
+
+  MY_ATTRS int16_t& AsH_Foo() {
+    MY_ASSERT(IsH_Foo());
+    return foo._0;
+  }
+
+  static H H_Bar(const uint8_t &x,
+                 const int16_t &y) {
+    H result;
+    ::new (&result.bar.x) (uint8_t)(x);
+    ::new (&result.bar.y) (int16_t)(y);
+    result.tag = Tag::H_Bar;
+    return result;
+  }
+
+  bool IsH_Bar() const {
+    return tag == Tag::H_Bar;
+  }
+
+  MY_ATTRS const H_Bar_Body& AsH_Bar() const {
+    MY_ASSERT(IsH_Bar());
+    return bar;
+  }
+
+  H_Bar_Body& AsH_Bar() {
+    MY_ASSERT(IsH_Bar());
+    return bar;
+  }
+
+  static H H_Baz() {
+    H result;
+    result.tag = Tag::H_Baz;
+    return result;
+  }
+
+  MY_ATTRS bool IsH_Baz() const {
+    return tag == Tag::H_Baz;
+  }
+};
+
+struct J {
+  enum class Tag : uint8_t {
+    J_Foo,
+    J_Bar,
+    J_Baz,
+  };
+
+  struct J_Foo_Body {
+    int16_t _0;
+  };
+
+  struct J_Bar_Body {
+    uint8_t x;
+    int16_t y;
+  };
+
+  Tag tag;
+  union {
+    J_Foo_Body foo;
+    J_Bar_Body bar;
+  };
+
+  static J J_Foo(const int16_t &_0) {
+    J result;
+    ::new (&result.foo._0) (int16_t)(_0);
+    result.tag = Tag::J_Foo;
+    return result;
+  }
+
+  bool IsJ_Foo() const {
+    return tag == Tag::J_Foo;
+  }
+
+  const int16_t& AsJ_Foo() const {
+    MY_ASSERT(IsJ_Foo());
+    return foo._0;
+  }
+
+  int16_t& AsJ_Foo() {
+    MY_ASSERT(IsJ_Foo());
+    return foo._0;
+  }
+
+  static J J_Bar(const uint8_t &x,
+                 const int16_t &y) {
+    J result;
+    ::new (&result.bar.x) (uint8_t)(x);
+    ::new (&result.bar.y) (int16_t)(y);
+    result.tag = Tag::J_Bar;
+    return result;
+  }
+
+  bool IsJ_Bar() const {
+    return tag == Tag::J_Bar;
+  }
+
+  const J_Bar_Body& AsJ_Bar() const {
+    MY_ASSERT(IsJ_Bar());
+    return bar;
+  }
+
+  J_Bar_Body& AsJ_Bar() {
+    MY_ASSERT(IsJ_Bar());
+    return bar;
+  }
+
+  static J J_Baz() {
+    J result;
+    result.tag = Tag::J_Baz;
+    return result;
+  }
+
+  bool IsJ_Baz() const {
+    return tag == Tag::J_Baz;
+  }
+};
+
+union K {
+  enum class Tag : uint8_t {
+    K_Foo,
+    K_Bar,
+    K_Baz,
+  };
+
+  struct K_Foo_Body {
+    Tag tag;
+    int16_t _0;
+  };
+
+  struct K_Bar_Body {
+    Tag tag;
+    uint8_t x;
+    int16_t y;
+  };
+
+  struct {
+    Tag tag;
+  };
+  K_Foo_Body foo;
+  K_Bar_Body bar;
+
+  static K K_Foo(const int16_t &_0) {
+    K result;
+    ::new (&result.foo._0) (int16_t)(_0);
+    result.tag = Tag::K_Foo;
+    return result;
+  }
+
+  bool IsK_Foo() const {
+    return tag == Tag::K_Foo;
+  }
+
+  const int16_t& AsK_Foo() const {
+    MY_ASSERT(IsK_Foo());
+    return foo._0;
+  }
+
+  int16_t& AsK_Foo() {
+    MY_ASSERT(IsK_Foo());
+    return foo._0;
+  }
+
+  static K K_Bar(const uint8_t &x,
+                 const int16_t &y) {
+    K result;
+    ::new (&result.bar.x) (uint8_t)(x);
+    ::new (&result.bar.y) (int16_t)(y);
+    result.tag = Tag::K_Bar;
+    return result;
+  }
+
+  bool IsK_Bar() const {
+    return tag == Tag::K_Bar;
+  }
+
+  const K_Bar_Body& AsK_Bar() const {
+    MY_ASSERT(IsK_Bar());
+    return bar;
+  }
+
+  K_Bar_Body& AsK_Bar() {
+    MY_ASSERT(IsK_Bar());
+    return bar;
+  }
+
+  static K K_Baz() {
+    K result;
+    result.tag = Tag::K_Baz;
+    return result;
+  }
+
+  bool IsK_Baz() const {
+    return tag == Tag::K_Baz;
+  }
+};
+
+extern "C" {
+
+void foo(H h, I i, J j, K k);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted-cast.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted-cast.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,250 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct I;
-
-struct H {
-  enum class Tag : uint8_t {
-    H_Foo,
-    H_Bar,
-    H_Baz,
-  };
-
-  struct H_Foo_Body {
-    int16_t _0;
-  };
-
-  struct H_Bar_Body {
-    uint8_t x;
-    int16_t y;
-  };
-
-  Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-
-  static H H_Foo(const int16_t &_0) {
-    H result;
-    ::new (&result.foo._0) (int16_t)(_0);
-    result.tag = Tag::H_Foo;
-    return result;
-  }
-
-  bool IsH_Foo() const {
-    return tag == Tag::H_Foo;
-  }
-
-  const int16_t& AsH_Foo() const {
-    MY_ASSERT(IsH_Foo());
-    return foo._0;
-  }
-
-  MY_ATTRS int16_t& AsH_Foo() {
-    MY_ASSERT(IsH_Foo());
-    return foo._0;
-  }
-
-  static H H_Bar(const uint8_t &x,
-                 const int16_t &y) {
-    H result;
-    ::new (&result.bar.x) (uint8_t)(x);
-    ::new (&result.bar.y) (int16_t)(y);
-    result.tag = Tag::H_Bar;
-    return result;
-  }
-
-  bool IsH_Bar() const {
-    return tag == Tag::H_Bar;
-  }
-
-  MY_ATTRS const H_Bar_Body& AsH_Bar() const {
-    MY_ASSERT(IsH_Bar());
-    return bar;
-  }
-
-  H_Bar_Body& AsH_Bar() {
-    MY_ASSERT(IsH_Bar());
-    return bar;
-  }
-
-  static H H_Baz() {
-    H result;
-    result.tag = Tag::H_Baz;
-    return result;
-  }
-
-  MY_ATTRS bool IsH_Baz() const {
-    return tag == Tag::H_Baz;
-  }
-};
-
-struct J {
-  enum class Tag : uint8_t {
-    J_Foo,
-    J_Bar,
-    J_Baz,
-  };
-
-  struct J_Foo_Body {
-    int16_t _0;
-  };
-
-  struct J_Bar_Body {
-    uint8_t x;
-    int16_t y;
-  };
-
-  Tag tag;
-  union {
-    J_Foo_Body foo;
-    J_Bar_Body bar;
-  };
-
-  static J J_Foo(const int16_t &_0) {
-    J result;
-    ::new (&result.foo._0) (int16_t)(_0);
-    result.tag = Tag::J_Foo;
-    return result;
-  }
-
-  bool IsJ_Foo() const {
-    return tag == Tag::J_Foo;
-  }
-
-  const int16_t& AsJ_Foo() const {
-    MY_ASSERT(IsJ_Foo());
-    return foo._0;
-  }
-
-  int16_t& AsJ_Foo() {
-    MY_ASSERT(IsJ_Foo());
-    return foo._0;
-  }
-
-  static J J_Bar(const uint8_t &x,
-                 const int16_t &y) {
-    J result;
-    ::new (&result.bar.x) (uint8_t)(x);
-    ::new (&result.bar.y) (int16_t)(y);
-    result.tag = Tag::J_Bar;
-    return result;
-  }
-
-  bool IsJ_Bar() const {
-    return tag == Tag::J_Bar;
-  }
-
-  const J_Bar_Body& AsJ_Bar() const {
-    MY_ASSERT(IsJ_Bar());
-    return bar;
-  }
-
-  J_Bar_Body& AsJ_Bar() {
-    MY_ASSERT(IsJ_Bar());
-    return bar;
-  }
-
-  static J J_Baz() {
-    J result;
-    result.tag = Tag::J_Baz;
-    return result;
-  }
-
-  bool IsJ_Baz() const {
-    return tag == Tag::J_Baz;
-  }
-};
-
-union K {
-  enum class Tag : uint8_t {
-    K_Foo,
-    K_Bar,
-    K_Baz,
-  };
-
-  struct K_Foo_Body {
-    Tag tag;
-    int16_t _0;
-  };
-
-  struct K_Bar_Body {
-    Tag tag;
-    uint8_t x;
-    int16_t y;
-  };
-
-  struct {
-    Tag tag;
-  };
-  K_Foo_Body foo;
-  K_Bar_Body bar;
-
-  static K K_Foo(const int16_t &_0) {
-    K result;
-    ::new (&result.foo._0) (int16_t)(_0);
-    result.tag = Tag::K_Foo;
-    return result;
-  }
-
-  bool IsK_Foo() const {
-    return tag == Tag::K_Foo;
-  }
-
-  const int16_t& AsK_Foo() const {
-    MY_ASSERT(IsK_Foo());
-    return foo._0;
-  }
-
-  int16_t& AsK_Foo() {
-    MY_ASSERT(IsK_Foo());
-    return foo._0;
-  }
-
-  static K K_Bar(const uint8_t &x,
-                 const int16_t &y) {
-    K result;
-    ::new (&result.bar.x) (uint8_t)(x);
-    ::new (&result.bar.y) (int16_t)(y);
-    result.tag = Tag::K_Bar;
-    return result;
-  }
-
-  bool IsK_Bar() const {
-    return tag == Tag::K_Bar;
-  }
-
-  const K_Bar_Body& AsK_Bar() const {
-    MY_ASSERT(IsK_Bar());
-    return bar;
-  }
-
-  K_Bar_Body& AsK_Bar() {
-    MY_ASSERT(IsK_Bar());
-    return bar;
-  }
-
-  static K K_Baz() {
-    K result;
-    result.tag = Tag::K_Baz;
-    return result;
-  }
-
-  bool IsK_Baz() const {
-    return tag == Tag::K_Baz;
-  }
-};
-
-extern "C" {
-
-void foo(H h, I i, J j, K k);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,63 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct I:
+    pass
+
+  cdef enum:
+    H_Foo,
+    H_Bar,
+    H_Baz,
+  ctypedef uint8_t H_Tag;
+
+  ctypedef struct H_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct H:
+    H_Tag tag;
+    int16_t foo;
+    H_Bar_Body bar;
+
+  cdef enum:
+    J_Foo,
+    J_Bar,
+    J_Baz,
+  ctypedef uint8_t J_Tag;
+
+  ctypedef struct J_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct J:
+    J_Tag tag;
+    int16_t foo;
+    J_Bar_Body bar;
+
+  cdef enum:
+    K_Foo,
+    K_Bar,
+    K_Baz,
+  ctypedef uint8_t K_Tag;
+
+  ctypedef struct K_Bar_Body:
+    K_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  ctypedef union K:
+    K_Tag tag;
+    K_Tag foo_tag;
+    int16_t foo;
+    K_Bar_Body bar;
+
+  void foo(H h, I i, J j, K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,78 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct I;
+
+enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+typedef uint8_t H_Tag;
+
+struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct H_Bar_Body bar;
+  };
+};
+
+enum J_Tag {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+typedef uint8_t J_Tag;
+
+struct J_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct J {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct J_Bar_Body bar;
+  };
+};
+
+enum K_Tag {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+typedef uint8_t K_Tag;
+
+struct K_Bar_Body {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union K {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  struct K_Bar_Body bar;
+};
+
+void foo(struct H h, struct I i, struct J j, union K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,104 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct I;
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct H_Bar_Body bar;
+  };
+};
+
+enum J_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  J_Foo,
+  J_Bar,
+  J_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t J_Tag;
+#endif // __cplusplus
+
+struct J_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct J {
+  J_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct J_Bar_Body bar;
+  };
+};
+
+enum K_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  K_Foo,
+  K_Bar,
+  K_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t K_Tag;
+#endif // __cplusplus
+
+struct K_Bar_Body {
+  K_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union K {
+  K_Tag tag;
+  struct {
+    K_Tag foo_tag;
+    int16_t foo;
+  };
+  struct K_Bar_Body bar;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(struct H h, struct I i, struct J j, union K k);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/asserted_cast.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,63 @@
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct I:
+    pass
+
+  cdef enum:
+    H_Foo,
+    H_Bar,
+    H_Baz,
+  ctypedef uint8_t H_Tag;
+
+  cdef struct H_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct H:
+    H_Tag tag;
+    int16_t foo;
+    H_Bar_Body bar;
+
+  cdef enum:
+    J_Foo,
+    J_Bar,
+    J_Baz,
+  ctypedef uint8_t J_Tag;
+
+  cdef struct J_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct J:
+    J_Tag tag;
+    int16_t foo;
+    J_Bar_Body bar;
+
+  cdef enum:
+    K_Foo,
+    K_Bar,
+    K_Baz,
+  ctypedef uint8_t K_Tag;
+
+  cdef struct K_Bar_Body:
+    K_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  cdef union K:
+    K_Tag tag;
+    K_Tag foo_tag;
+    int16_t foo;
+    K_Bar_Body bar;
+
+  void foo(H h, I i, J j, K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+#define Foo_GA 10
+#define Foo_ZO 3.14
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+#define Foo_GA 10
+#define Foo_ZO 3.14
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    pass
+  const int32_t Foo_GA # = 10
+  const float Foo_ZO # = 3.14
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+#define Foo_GA 10
+#define Foo_ZO 3.14
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+#define Foo_GA 10
+#define Foo_ZO 3.14
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_constant.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    pass
+  const int32_t Foo_GA # = 10
+  const float Foo_ZO # = 3.14
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/assoc_const_conflict.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint32_t Foo_FOO # = 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_constant_panic.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+typedef struct StyleAlignFlags {
+  uint8_t bits;
+} StyleAlignFlags;
+/**
+ * 'auto'
+ */
+#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+void root(struct StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+typedef struct StyleAlignFlags {
+  uint8_t bits;
+} StyleAlignFlags;
+/**
+ * 'auto'
+ */
+#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct StyleAlignFlags flags);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # Constants shared by multiple CSS Box Alignment properties
+  #
+  # These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+  ctypedef struct StyleAlignFlags:
+    uint8_t bits;
+  # 'auto'
+  const StyleAlignFlags StyleAlignFlags_AUTO # = <StyleAlignFlags>{ <uint8_t>0 }
+  # 'normal'
+  const StyleAlignFlags StyleAlignFlags_NORMAL # = <StyleAlignFlags>{ <uint8_t>1 }
+  # 'start'
+  const StyleAlignFlags StyleAlignFlags_START # = <StyleAlignFlags>{ <uint8_t>(1 << 1) }
+  # 'end'
+  const StyleAlignFlags StyleAlignFlags_END # = <StyleAlignFlags>{ <uint8_t>(1 << 2) }
+  # 'flex-start'
+  const StyleAlignFlags StyleAlignFlags_FLEX_START # = <StyleAlignFlags>{ <uint8_t>(1 << 3) }
+
+  void root(StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+struct StyleAlignFlags {
+  uint8_t bits;
+};
+/**
+ * 'auto'
+ */
+#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+void root(struct StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+struct StyleAlignFlags {
+  uint8_t bits;
+};
+/**
+ * 'auto'
+ */
+#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct StyleAlignFlags flags);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/associated_in_body.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # Constants shared by multiple CSS Box Alignment properties
+  #
+  # These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+  cdef struct StyleAlignFlags:
+    uint8_t bits;
+  # 'auto'
+  const StyleAlignFlags StyleAlignFlags_AUTO # = <StyleAlignFlags>{ <uint8_t>0 }
+  # 'normal'
+  const StyleAlignFlags StyleAlignFlags_NORMAL # = <StyleAlignFlags>{ <uint8_t>1 }
+  # 'start'
+  const StyleAlignFlags StyleAlignFlags_START # = <StyleAlignFlags>{ <uint8_t>(1 << 1) }
+  # 'end'
+  const StyleAlignFlags StyleAlignFlags_END # = <StyleAlignFlags>{ <uint8_t>(1 << 2) }
+  # 'flex-start'
+  const StyleAlignFlags StyleAlignFlags_FLEX_START # = <StyleAlignFlags>{ <uint8_t>(1 << 3) }
+
+  void root(StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct HasBitfields {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+} HasBitfields;
+
+void root(const struct HasBitfields*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct HasBitfields {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+} HasBitfields;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct HasBitfields*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+} HasBitfields;
+
+void root(const HasBitfields*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+} HasBitfields;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const HasBitfields*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct HasBitfields {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+};
+
+extern "C" {
+
+void root(const HasBitfields*);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct HasBitfields:
+    uint64_t foo;
+    uint64_t bar;
+
+  void root(const HasBitfields*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct HasBitfields {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+};
+
+void root(const struct HasBitfields*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct HasBitfields {
+  uint64_t foo: 8;
+  uint64_t bar: 56;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct HasBitfields*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitfield.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitfield.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct HasBitfields:
+    uint64_t foo;
+    uint64_t bar;
+
+  void root(const HasBitfields*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+typedef struct AlignFlags {
+  uint8_t bits;
+} AlignFlags;
+/**
+ * 'auto'
+ */
+#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+typedef struct DebugFlags {
+  uint32_t bits;
+} DebugFlags;
+/**
+ * Flag with the topmost bit set of the u32
+ */
+#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
+
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+typedef struct AlignFlags {
+  uint8_t bits;
+} AlignFlags;
+/**
+ * 'auto'
+ */
+#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+typedef struct DebugFlags {
+  uint32_t bits;
+} DebugFlags;
+/**
+ * Flag with the topmost bit set of the u32
+ */
+#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # Constants shared by multiple CSS Box Alignment properties
+  #
+  # These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+  ctypedef struct AlignFlags:
+    uint8_t bits;
+  # 'auto'
+  const AlignFlags AlignFlags_AUTO # = <AlignFlags>{ <uint8_t>0 }
+  # 'normal'
+  const AlignFlags AlignFlags_NORMAL # = <AlignFlags>{ <uint8_t>1 }
+  # 'start'
+  const AlignFlags AlignFlags_START # = <AlignFlags>{ <uint8_t>(1 << 1) }
+  # 'end'
+  const AlignFlags AlignFlags_END # = <AlignFlags>{ <uint8_t>(1 << 2) }
+  # 'flex-start'
+  const AlignFlags AlignFlags_FLEX_START # = <AlignFlags>{ <uint8_t>(1 << 3) }
+
+  ctypedef struct DebugFlags:
+    uint32_t bits;
+  # Flag with the topmost bit set of the u32
+  const DebugFlags DebugFlags_BIGGEST_ALLOWED # = <DebugFlags>{ <uint32_t>(1 << 31) }
+
+  void root(AlignFlags flags, DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+struct AlignFlags {
+  uint8_t bits;
+};
+/**
+ * 'auto'
+ */
+#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+struct DebugFlags {
+  uint32_t bits;
+};
+/**
+ * Flag with the topmost bit set of the u32
+ */
+#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
+
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * Constants shared by multiple CSS Box Alignment properties
+ *
+ * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+ */
+struct AlignFlags {
+  uint8_t bits;
+};
+/**
+ * 'auto'
+ */
+#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
+/**
+ * 'normal'
+ */
+#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
+/**
+ * 'start'
+ */
+#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
+/**
+ * 'end'
+ */
+#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
+/**
+ * 'flex-start'
+ */
+#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
+
+struct DebugFlags {
+  uint32_t bits;
+};
+/**
+ * Flag with the topmost bit set of the u32
+ */
+#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/bitflags.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/bitflags.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # Constants shared by multiple CSS Box Alignment properties
+  #
+  # These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
+  cdef struct AlignFlags:
+    uint8_t bits;
+  # 'auto'
+  const AlignFlags AlignFlags_AUTO # = <AlignFlags>{ <uint8_t>0 }
+  # 'normal'
+  const AlignFlags AlignFlags_NORMAL # = <AlignFlags>{ <uint8_t>1 }
+  # 'start'
+  const AlignFlags AlignFlags_START # = <AlignFlags>{ <uint8_t>(1 << 1) }
+  # 'end'
+  const AlignFlags AlignFlags_END # = <AlignFlags>{ <uint8_t>(1 << 2) }
+  # 'flex-start'
+  const AlignFlags AlignFlags_FLEX_START # = <AlignFlags>{ <uint8_t>(1 << 3) }
+
+  cdef struct DebugFlags:
+    uint32_t bits;
+  # Flag with the topmost bit set of the u32
+  const DebugFlags DebugFlags_BIGGEST_ALLOWED # = <DebugFlags>{ <uint32_t>(1 << 31) }
+
+  void root(AlignFlags flags, DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,93 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef enum MyCLikeEnum {
+  Foo1,
+  Bar1,
+  Baz1,
+} MyCLikeEnum;
+
+typedef enum MyCLikeEnum_Prepended {
+  Foo1_Prepended,
+  Bar1_Prepended,
+  Baz1_Prepended,
+} MyCLikeEnum_Prepended;
+
+typedef struct MyFancyStruct {
+  int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+} MyFancyStruct;
+
+typedef enum MyFancyEnum_Tag {
+  Foo,
+  Bar,
+  Baz,
+} MyFancyEnum_Tag;
+
+typedef struct MyFancyEnum {
+  MyFancyEnum_Tag tag;
+  union {
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
+  };
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+} MyFancyEnum;
+
+typedef union MyUnion {
+  float f;
+  uint32_t u;
+  int32_t extra_member;
+} MyUnion;
+
+typedef struct MyFancyStruct_Prepended {
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+  int32_t i;
+} MyFancyStruct_Prepended;
+
+typedef enum MyFancyEnum_Prepended_Tag {
+  Foo_Prepended,
+  Bar_Prepended,
+  Baz_Prepended,
+} MyFancyEnum_Prepended_Tag;
+
+typedef struct MyFancyEnum_Prepended {
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+  MyFancyEnum_Prepended_Tag tag;
+  union {
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
+  };
+} MyFancyEnum_Prepended;
+
+typedef union MyUnion_Prepended {
+    int32_t extra_member;
+  float f;
+  uint32_t u;
+} MyUnion_Prepended;
+
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,101 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef enum MyCLikeEnum {
+  Foo1,
+  Bar1,
+  Baz1,
+} MyCLikeEnum;
+
+typedef enum MyCLikeEnum_Prepended {
+  Foo1_Prepended,
+  Bar1_Prepended,
+  Baz1_Prepended,
+} MyCLikeEnum_Prepended;
+
+typedef struct MyFancyStruct {
+  int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+} MyFancyStruct;
+
+typedef enum MyFancyEnum_Tag {
+  Foo,
+  Bar,
+  Baz,
+} MyFancyEnum_Tag;
+
+typedef struct MyFancyEnum {
+  MyFancyEnum_Tag tag;
+  union {
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
+  };
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+} MyFancyEnum;
+
+typedef union MyUnion {
+  float f;
+  uint32_t u;
+  int32_t extra_member;
+} MyUnion;
+
+typedef struct MyFancyStruct_Prepended {
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+  int32_t i;
+} MyFancyStruct_Prepended;
+
+typedef enum MyFancyEnum_Prepended_Tag {
+  Foo_Prepended,
+  Bar_Prepended,
+  Baz_Prepended,
+} MyFancyEnum_Prepended_Tag;
+
+typedef struct MyFancyEnum_Prepended {
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+  MyFancyEnum_Prepended_Tag tag;
+  union {
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
+  };
+} MyFancyEnum_Prepended;
+
+typedef union MyUnion_Prepended {
+    int32_t extra_member;
+  float f;
+  uint32_t u;
+} MyUnion_Prepended;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.c	2021-01-18 19:59:04.000000000 +0000
@@ -18,7 +18,7 @@
 typedef struct {
   int32_t i;
 #ifdef __cplusplus
-  inline void foo();
+    inline void foo();
 #endif
 } MyFancyStruct;
 
@@ -29,33 +29,29 @@
 } MyFancyEnum_Tag;
 
 typedef struct {
-  int32_t _0;
-} Bar_Body;
-
-typedef struct {
-  int32_t _0;
-} Baz_Body;
-
-typedef struct {
   MyFancyEnum_Tag tag;
   union {
-    Bar_Body bar;
-    Baz_Body baz;
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
   };
 #ifdef __cplusplus
-  inline void wohoo();
+    inline void wohoo();
 #endif
 } MyFancyEnum;
 
 typedef union {
   float f;
   uint32_t u;
-  int32_t extra_member; // yolo
+  int32_t extra_member;
 } MyUnion;
 
 typedef struct {
 #ifdef __cplusplus
-  inline void prepended_wohoo();
+    inline void prepended_wohoo();
 #endif
   int32_t i;
 } MyFancyStruct_Prepended;
@@ -67,26 +63,22 @@
 } MyFancyEnum_Prepended_Tag;
 
 typedef struct {
-  int32_t _0;
-} Bar_Prepended_Body;
-
-typedef struct {
-  int32_t _0;
-} Baz_Prepended_Body;
-
-typedef struct {
-  #ifdef __cplusplus
+#ifdef __cplusplus
     inline void wohoo();
-  #endif
+#endif
   MyFancyEnum_Prepended_Tag tag;
   union {
-    Bar_Prepended_Body bar_prepended;
-    Baz_Prepended_Body baz_prepended;
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
   };
 } MyFancyEnum_Prepended;
 
 typedef union {
-  int32_t extra_member; // yolo
+    int32_t extra_member;
   float f;
   uint32_t u;
 } MyUnion_Prepended;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -18,7 +18,7 @@
 typedef struct {
   int32_t i;
 #ifdef __cplusplus
-  inline void foo();
+    inline void foo();
 #endif
 } MyFancyStruct;
 
@@ -29,33 +29,29 @@
 } MyFancyEnum_Tag;
 
 typedef struct {
-  int32_t _0;
-} Bar_Body;
-
-typedef struct {
-  int32_t _0;
-} Baz_Body;
-
-typedef struct {
   MyFancyEnum_Tag tag;
   union {
-    Bar_Body bar;
-    Baz_Body baz;
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
   };
 #ifdef __cplusplus
-  inline void wohoo();
+    inline void wohoo();
 #endif
 } MyFancyEnum;
 
 typedef union {
   float f;
   uint32_t u;
-  int32_t extra_member; // yolo
+  int32_t extra_member;
 } MyUnion;
 
 typedef struct {
 #ifdef __cplusplus
-  inline void prepended_wohoo();
+    inline void prepended_wohoo();
 #endif
   int32_t i;
 } MyFancyStruct_Prepended;
@@ -67,26 +63,22 @@
 } MyFancyEnum_Prepended_Tag;
 
 typedef struct {
-  int32_t _0;
-} Bar_Prepended_Body;
-
-typedef struct {
-  int32_t _0;
-} Baz_Prepended_Body;
-
-typedef struct {
-  #ifdef __cplusplus
+#ifdef __cplusplus
     inline void wohoo();
-  #endif
+#endif
   MyFancyEnum_Prepended_Tag tag;
   union {
-    Bar_Prepended_Body bar_prepended;
-    Baz_Prepended_Body baz_prepended;
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
   };
 } MyFancyEnum_Prepended;
 
 typedef union {
-  int32_t extra_member; // yolo
+    int32_t extra_member;
   float f;
   uint32_t u;
 } MyUnion_Prepended;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -19,7 +19,7 @@
 struct MyFancyStruct {
   int32_t i;
 #ifdef __cplusplus
-  inline void foo();
+    inline void foo();
 #endif
 };
 
@@ -44,27 +44,27 @@
     Baz_Body baz;
   };
 #ifdef __cplusplus
-  inline void wohoo();
+    inline void wohoo();
 #endif
 };
 
 union MyUnion {
   float f;
   uint32_t u;
-  int32_t extra_member; // yolo
+  int32_t extra_member;
 };
 
 struct MyFancyStruct_Prepended {
 #ifdef __cplusplus
-  inline void prepended_wohoo();
+    inline void prepended_wohoo();
 #endif
   int32_t i;
 };
 
 struct MyFancyEnum_Prepended {
-  #ifdef __cplusplus
+#ifdef __cplusplus
     inline void wohoo();
-  #endif
+#endif
   enum class Tag {
     Foo_Prepended,
     Bar_Prepended,
@@ -87,7 +87,7 @@
 };
 
 union MyUnion_Prepended {
-  int32_t extra_member; // yolo
+    int32_t extra_member;
   float f;
   uint32_t u;
 };
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,74 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef enum MyCLikeEnum:
+    Foo1,
+    Bar1,
+    Baz1,
+
+  ctypedef enum MyCLikeEnum_Prepended:
+    Foo1_Prepended,
+    Bar1_Prepended,
+    Baz1_Prepended,
+
+  ctypedef struct MyFancyStruct:
+    int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+
+  ctypedef enum MyFancyEnum_Tag:
+    Foo,
+    Bar,
+    Baz,
+
+  ctypedef struct MyFancyEnum:
+    MyFancyEnum_Tag tag;
+    int32_t bar;
+    int32_t baz;
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+
+  ctypedef union MyUnion:
+    float f;
+    uint32_t u;
+  int32_t extra_member;
+
+  ctypedef struct MyFancyStruct_Prepended:
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+    int32_t i;
+
+  ctypedef enum MyFancyEnum_Prepended_Tag:
+    Foo_Prepended,
+    Bar_Prepended,
+    Baz_Prepended,
+
+  ctypedef struct MyFancyEnum_Prepended:
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+    MyFancyEnum_Prepended_Tag tag;
+    int32_t bar_prepended;
+    int32_t baz_prepended;
+
+  ctypedef union MyUnion_Prepended:
+    int32_t extra_member;
+    float f;
+    uint32_t u;
+
+  void root(MyFancyStruct s,
+            MyFancyEnum e,
+            MyCLikeEnum c,
+            MyUnion u,
+            MyFancyStruct_Prepended sp,
+            MyFancyEnum_Prepended ep,
+            MyCLikeEnum_Prepended cp,
+            MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,93 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MyCLikeEnum {
+  Foo1,
+  Bar1,
+  Baz1,
+};
+
+enum MyCLikeEnum_Prepended {
+  Foo1_Prepended,
+  Bar1_Prepended,
+  Baz1_Prepended,
+};
+
+struct MyFancyStruct {
+  int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+};
+
+enum MyFancyEnum_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+
+struct MyFancyEnum {
+  enum MyFancyEnum_Tag tag;
+  union {
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
+  };
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+};
+
+union MyUnion {
+  float f;
+  uint32_t u;
+  int32_t extra_member;
+};
+
+struct MyFancyStruct_Prepended {
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+  int32_t i;
+};
+
+enum MyFancyEnum_Prepended_Tag {
+  Foo_Prepended,
+  Bar_Prepended,
+  Baz_Prepended,
+};
+
+struct MyFancyEnum_Prepended {
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+  enum MyFancyEnum_Prepended_Tag tag;
+  union {
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
+  };
+};
+
+union MyUnion_Prepended {
+    int32_t extra_member;
+  float f;
+  uint32_t u;
+};
+
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,101 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MyCLikeEnum {
+  Foo1,
+  Bar1,
+  Baz1,
+};
+
+enum MyCLikeEnum_Prepended {
+  Foo1_Prepended,
+  Bar1_Prepended,
+  Baz1_Prepended,
+};
+
+struct MyFancyStruct {
+  int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+};
+
+enum MyFancyEnum_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+
+struct MyFancyEnum {
+  enum MyFancyEnum_Tag tag;
+  union {
+    struct {
+      int32_t bar;
+    };
+    struct {
+      int32_t baz;
+    };
+  };
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+};
+
+union MyUnion {
+  float f;
+  uint32_t u;
+  int32_t extra_member;
+};
+
+struct MyFancyStruct_Prepended {
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+  int32_t i;
+};
+
+enum MyFancyEnum_Prepended_Tag {
+  Foo_Prepended,
+  Bar_Prepended,
+  Baz_Prepended,
+};
+
+struct MyFancyEnum_Prepended {
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+  enum MyFancyEnum_Prepended_Tag tag;
+  union {
+    struct {
+      int32_t bar_prepended;
+    };
+    struct {
+      int32_t baz_prepended;
+    };
+  };
+};
+
+union MyUnion_Prepended {
+    int32_t extra_member;
+  float f;
+  uint32_t u;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct MyFancyStruct s,
+          struct MyFancyEnum e,
+          enum MyCLikeEnum c,
+          union MyUnion u,
+          struct MyFancyStruct_Prepended sp,
+          struct MyFancyEnum_Prepended ep,
+          enum MyCLikeEnum_Prepended cp,
+          union MyUnion_Prepended up);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/body.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/body.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,74 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum MyCLikeEnum:
+    Foo1,
+    Bar1,
+    Baz1,
+
+  cdef enum MyCLikeEnum_Prepended:
+    Foo1_Prepended,
+    Bar1_Prepended,
+    Baz1_Prepended,
+
+  cdef struct MyFancyStruct:
+    int32_t i;
+#ifdef __cplusplus
+    inline void foo();
+#endif
+
+  cdef enum MyFancyEnum_Tag:
+    Foo,
+    Bar,
+    Baz,
+
+  cdef struct MyFancyEnum:
+    MyFancyEnum_Tag tag;
+    int32_t bar;
+    int32_t baz;
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+
+  cdef union MyUnion:
+    float f;
+    uint32_t u;
+  int32_t extra_member;
+
+  cdef struct MyFancyStruct_Prepended:
+#ifdef __cplusplus
+    inline void prepended_wohoo();
+#endif
+    int32_t i;
+
+  cdef enum MyFancyEnum_Prepended_Tag:
+    Foo_Prepended,
+    Bar_Prepended,
+    Baz_Prepended,
+
+  cdef struct MyFancyEnum_Prepended:
+#ifdef __cplusplus
+    inline void wohoo();
+#endif
+    MyFancyEnum_Prepended_Tag tag;
+    int32_t bar_prepended;
+    int32_t baz_prepended;
+
+  cdef union MyUnion_Prepended:
+    int32_t extra_member;
+    float f;
+    uint32_t u;
+
+  void root(MyFancyStruct s,
+            MyFancyEnum e,
+            MyCLikeEnum c,
+            MyUnion u,
+            MyFancyStruct_Prepended sp,
+            MyFancyEnum_Prepended ep,
+            MyCLikeEnum_Prepended cp,
+            MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/alias.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/alias.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/alias.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/alias.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Status {
-  Ok,
-  Err,
-};
-typedef uint32_t Status;
-
-typedef struct Dep {
-  int32_t a;
-  float b;
-} Dep;
-
-typedef struct Foo_i32 {
-  int32_t a;
-  int32_t b;
-  Dep c;
-} Foo_i32;
-
-typedef Foo_i32 IntFoo;
-
-typedef struct Foo_f64 {
-  double a;
-  double b;
-  Dep c;
-} Foo_f64;
-
-typedef Foo_f64 DoubleFoo;
-
-typedef int32_t Unit;
-
-typedef Status SpecialStatus;
-
-void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/alias.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/alias.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/alias.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/alias.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Status
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  Ok,
-  Err,
-};
-#ifndef __cplusplus
-typedef uint32_t Status;
-#endif // __cplusplus
-
-typedef struct Dep {
-  int32_t a;
-  float b;
-} Dep;
-
-typedef struct Foo_i32 {
-  int32_t a;
-  int32_t b;
-  Dep c;
-} Foo_i32;
-
-typedef Foo_i32 IntFoo;
-
-typedef struct Foo_f64 {
-  double a;
-  double b;
-  Dep c;
-} Foo_f64;
-
-typedef Foo_f64 DoubleFoo;
-
-typedef int32_t Unit;
-
-typedef Status SpecialStatus;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/annotation.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/annotation.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/annotation.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/annotation.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C {
-  X = 2,
-  Y,
-};
-typedef uint32_t C;
-
-typedef struct A {
-  int32_t m0;
-} A;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-enum F_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t F_Tag;
-
-typedef struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union F {
-  F_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} F;
-
-enum H_Tag {
-  Hello,
-  There,
-  Everyone,
-};
-typedef uint8_t H_Tag;
-
-typedef struct Hello_Body {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct There_Body {
-  uint8_t x;
-  int16_t y;
-} There_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    Hello_Body hello;
-    There_Body there;
-  };
-} H;
-
-void root(A x, B y, C z, F f, H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/annotation.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/annotation.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/annotation.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/annotation.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  X = 2,
-  Y,
-};
-#ifndef __cplusplus
-typedef uint32_t C;
-#endif // __cplusplus
-
-typedef struct A {
-  int32_t m0;
-} A;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-typedef struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union F {
-  F_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} F;
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Hello,
-  There,
-  Everyone,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-typedef struct Hello_Body {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct There_Body {
-  uint8_t x;
-  int16_t y;
-} There_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    Hello_Body hello;
-    There_Body there;
-  };
-} H;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A x, B y, C z, F f, H h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/array.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/array.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/array.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/array.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum Foo_Tag {
-  A,
-} Foo_Tag;
-
-typedef struct A_Body {
-  float _0[20];
-} A_Body;
-
-typedef struct Foo {
-  Foo_Tag tag;
-  union {
-    A_Body a;
-  };
-} Foo;
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/array.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/array.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/array.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/array.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum Foo_Tag {
-  A,
-} Foo_Tag;
-
-typedef struct A_Body {
-  float _0[20];
-} A_Body;
-
-typedef struct Foo {
-  Foo_Tag tag;
-  union {
-    A_Body a;
-  };
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct I I;
-
-enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-typedef uint8_t H_Tag;
-
-typedef struct H_Foo_Body {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum J_Tag {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-typedef uint8_t J_Tag;
-
-typedef struct J_Foo_Body {
-  int16_t _0;
-} J_Foo_Body;
-
-typedef struct J_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} J_Bar_Body;
-
-typedef struct J {
-  J_Tag tag;
-  union {
-    J_Foo_Body foo;
-    J_Bar_Body bar;
-  };
-} J;
-
-enum K_Tag {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-typedef uint8_t K_Tag;
-
-typedef struct K_Foo_Body {
-  K_Tag tag;
-  int16_t _0;
-} K_Foo_Body;
-
-typedef struct K_Bar_Body {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-} K_Bar_Body;
-
-typedef union K {
-  K_Tag tag;
-  K_Foo_Body foo;
-  K_Bar_Body bar;
-} K;
-
-void foo(H h, I i, J j, K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/asserted-cast.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct I I;
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-typedef struct H_Foo_Body {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum J_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t J_Tag;
-#endif // __cplusplus
-
-typedef struct J_Foo_Body {
-  int16_t _0;
-} J_Foo_Body;
-
-typedef struct J_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} J_Bar_Body;
-
-typedef struct J {
-  J_Tag tag;
-  union {
-    J_Foo_Body foo;
-    J_Bar_Body bar;
-  };
-} J;
-
-enum K_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t K_Tag;
-#endif // __cplusplus
-
-typedef struct K_Foo_Body {
-  K_Tag tag;
-  int16_t _0;
-} K_Foo_Body;
-
-typedef struct K_Bar_Body {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-} K_Bar_Body;
-
-typedef union K {
-  K_Tag tag;
-  K_Foo_Body foo;
-  K_Bar_Body bar;
-} K;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(H h, I i, J j, K k);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-#define Foo_GA 10
-#define Foo_ZO 3.14
-
-void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-#define Foo_GA 10
-#define Foo_ZO 3.14
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/assoc_const_conflict.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_constant_panic.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-typedef struct StyleAlignFlags {
-  uint8_t bits;
-} StyleAlignFlags;
-/**
- * 'auto'
- */
-#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-void root(StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/associated_in_body.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-typedef struct StyleAlignFlags {
-  uint8_t bits;
-} StyleAlignFlags;
-/**
- * 'auto'
- */
-#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(StyleAlignFlags flags);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/bitflags.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/bitflags.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/bitflags.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/bitflags.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-typedef struct AlignFlags {
-  uint8_t bits;
-} AlignFlags;
-/**
- * 'auto'
- */
-#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-typedef struct DebugFlags {
-  uint32_t bits;
-} DebugFlags;
-/**
- * Flag with the topmost bit set of the u32
- */
-#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
-
-void root(AlignFlags flags, DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/bitflags.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/bitflags.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/bitflags.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/bitflags.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-typedef struct AlignFlags {
-  uint8_t bits;
-} AlignFlags;
-/**
- * 'auto'
- */
-#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-typedef struct DebugFlags {
-  uint32_t bits;
-} DebugFlags;
-/**
- * Flag with the topmost bit set of the u32
- */
-#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(AlignFlags flags, DebugFlags bigger_flags);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/body.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/body.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/body.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/body.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum MyCLikeEnum {
-  Foo1,
-  Bar1,
-  Baz1,
-} MyCLikeEnum;
-
-typedef enum MyCLikeEnum_Prepended {
-  Foo1_Prepended,
-  Bar1_Prepended,
-  Baz1_Prepended,
-} MyCLikeEnum_Prepended;
-
-typedef struct MyFancyStruct {
-  int32_t i;
-#ifdef __cplusplus
-  inline void foo();
-#endif
-} MyFancyStruct;
-
-typedef enum MyFancyEnum_Tag {
-  Foo,
-  Bar,
-  Baz,
-} MyFancyEnum_Tag;
-
-typedef struct Bar_Body {
-  int32_t _0;
-} Bar_Body;
-
-typedef struct Baz_Body {
-  int32_t _0;
-} Baz_Body;
-
-typedef struct MyFancyEnum {
-  MyFancyEnum_Tag tag;
-  union {
-    Bar_Body bar;
-    Baz_Body baz;
-  };
-#ifdef __cplusplus
-  inline void wohoo();
-#endif
-} MyFancyEnum;
-
-typedef union MyUnion {
-  float f;
-  uint32_t u;
-  int32_t extra_member; // yolo
-} MyUnion;
-
-typedef struct MyFancyStruct_Prepended {
-#ifdef __cplusplus
-  inline void prepended_wohoo();
-#endif
-  int32_t i;
-} MyFancyStruct_Prepended;
-
-typedef enum MyFancyEnum_Prepended_Tag {
-  Foo_Prepended,
-  Bar_Prepended,
-  Baz_Prepended,
-} MyFancyEnum_Prepended_Tag;
-
-typedef struct Bar_Prepended_Body {
-  int32_t _0;
-} Bar_Prepended_Body;
-
-typedef struct Baz_Prepended_Body {
-  int32_t _0;
-} Baz_Prepended_Body;
-
-typedef struct MyFancyEnum_Prepended {
-  #ifdef __cplusplus
-    inline void wohoo();
-  #endif
-  MyFancyEnum_Prepended_Tag tag;
-  union {
-    Bar_Prepended_Body bar_prepended;
-    Baz_Prepended_Body baz_prepended;
-  };
-} MyFancyEnum_Prepended;
-
-typedef union MyUnion_Prepended {
-  int32_t extra_member; // yolo
-  float f;
-  uint32_t u;
-} MyUnion_Prepended;
-
-void root(MyFancyStruct s,
-          MyFancyEnum e,
-          MyCLikeEnum c,
-          MyUnion u,
-          MyFancyStruct_Prepended sp,
-          MyFancyEnum_Prepended ep,
-          MyCLikeEnum_Prepended cp,
-          MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/body.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/body.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/body.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/body.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum MyCLikeEnum {
-  Foo1,
-  Bar1,
-  Baz1,
-} MyCLikeEnum;
-
-typedef enum MyCLikeEnum_Prepended {
-  Foo1_Prepended,
-  Bar1_Prepended,
-  Baz1_Prepended,
-} MyCLikeEnum_Prepended;
-
-typedef struct MyFancyStruct {
-  int32_t i;
-#ifdef __cplusplus
-  inline void foo();
-#endif
-} MyFancyStruct;
-
-typedef enum MyFancyEnum_Tag {
-  Foo,
-  Bar,
-  Baz,
-} MyFancyEnum_Tag;
-
-typedef struct Bar_Body {
-  int32_t _0;
-} Bar_Body;
-
-typedef struct Baz_Body {
-  int32_t _0;
-} Baz_Body;
-
-typedef struct MyFancyEnum {
-  MyFancyEnum_Tag tag;
-  union {
-    Bar_Body bar;
-    Baz_Body baz;
-  };
-#ifdef __cplusplus
-  inline void wohoo();
-#endif
-} MyFancyEnum;
-
-typedef union MyUnion {
-  float f;
-  uint32_t u;
-  int32_t extra_member; // yolo
-} MyUnion;
-
-typedef struct MyFancyStruct_Prepended {
-#ifdef __cplusplus
-  inline void prepended_wohoo();
-#endif
-  int32_t i;
-} MyFancyStruct_Prepended;
-
-typedef enum MyFancyEnum_Prepended_Tag {
-  Foo_Prepended,
-  Bar_Prepended,
-  Baz_Prepended,
-} MyFancyEnum_Prepended_Tag;
-
-typedef struct Bar_Prepended_Body {
-  int32_t _0;
-} Bar_Prepended_Body;
-
-typedef struct Baz_Prepended_Body {
-  int32_t _0;
-} Baz_Prepended_Body;
-
-typedef struct MyFancyEnum_Prepended {
-  #ifdef __cplusplus
-    inline void wohoo();
-  #endif
-  MyFancyEnum_Prepended_Tag tag;
-  union {
-    Bar_Prepended_Body bar_prepended;
-    Baz_Prepended_Body baz_prepended;
-  };
-} MyFancyEnum_Prepended;
-
-typedef union MyUnion_Prepended {
-  int32_t extra_member; // yolo
-  float f;
-  uint32_t u;
-} MyUnion_Prepended;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(MyFancyStruct s,
-          MyFancyEnum e,
-          MyCLikeEnum c,
-          MyUnion u,
-          MyFancyStruct_Prepended sp,
-          MyFancyEnum_Prepended ep,
-          MyCLikeEnum_Prepended cp,
-          MyUnion_Prepended up);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/box.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/box.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/box.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/box.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using Box = T*;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
-
-typedef NotReprC_Box_i32 Foo;
-
-typedef struct MyStruct {
-  int32_t *number;
-} MyStruct;
-
-void root(const Foo *a, const MyStruct *with_box);
-
-void drop_box(int32_t *x);
-
-void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/box.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/box.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/box.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/box.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using Box = T*;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
-
-typedef NotReprC_Box_i32 Foo;
-
-typedef struct MyStruct {
-  int32_t *number;
-} MyStruct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const MyStruct *with_box);
-
-void drop_box(int32_t *x);
-
-void drop_box_opt(int32_t *x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cdecl.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cdecl.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cdecl.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cdecl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef void (*A)(void);
-
-typedef void (*B)(void);
-
-typedef bool (*C)(int32_t, int32_t);
-
-typedef bool (*(*D)(int32_t))(float);
-
-typedef const int32_t (*(*E)(void))[16];
-
-typedef const int32_t *F;
-
-typedef const int32_t *const *G;
-
-typedef int32_t *const *H;
-
-typedef const int32_t (*I)[16];
-
-typedef double (**J)(float);
-
-typedef int32_t K[16];
-
-typedef const int32_t *L[16];
-
-typedef bool (*M[16])(int32_t, int32_t);
-
-typedef void (*N[16])(int32_t, int32_t);
-
-typedef void (*P)(int32_t named1st, bool, bool named3rd, int32_t _);
-
-void (*O(void))(void);
-
-void root(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l, M m, N n, P p);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cdecl.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cdecl.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cdecl.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cdecl.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef void (*A)(void);
-
-typedef void (*B)(void);
-
-typedef bool (*C)(int32_t, int32_t);
-
-typedef bool (*(*D)(int32_t))(float);
-
-typedef const int32_t (*(*E)(void))[16];
-
-typedef const int32_t *F;
-
-typedef const int32_t *const *G;
-
-typedef int32_t *const *H;
-
-typedef const int32_t (*I)[16];
-
-typedef double (**J)(float);
-
-typedef int32_t K[16];
-
-typedef const int32_t *L[16];
-
-typedef bool (*M[16])(int32_t, int32_t);
-
-typedef void (*N[16])(int32_t, int32_t);
-
-typedef void (*P)(int32_t named1st, bool, bool named3rd, int32_t _);
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void (*O(void))(void);
-
-void root(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l, M m, N n, P p);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cell.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cell.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cell.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cell.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
-
-typedef NotReprC_RefCell_i32 Foo;
-
-typedef struct MyStruct {
-  int32_t number;
-} MyStruct;
-
-void root(const Foo *a, const MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cell.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cell.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cell.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cell.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
-
-typedef NotReprC_RefCell_i32 Foo;
-
-typedef struct MyStruct {
-  int32_t number;
-} MyStruct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const MyStruct *with_cell);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-typedef struct Foo {
-  int32_t x;
-} Foo;
-#endif
-
-#if defined(NOT_DEFINED)
-typedef struct Bar {
-  Foo y;
-} Bar;
-#endif
-
-#if defined(DEFINED)
-typedef struct Bar {
-  Foo z;
-} Bar;
-#endif
-
-typedef struct Root {
-  Bar w;
-} Root;
-
-void root(Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-typedef struct Foo {
-  int32_t x;
-} Foo;
-#endif
-
-#if defined(NOT_DEFINED)
-typedef struct Bar {
-  Foo y;
-} Bar;
-#endif
-
-#if defined(DEFINED)
-typedef struct Bar {
-  Foo z;
-} Bar;
-#endif
-
-typedef struct Root {
-  Bar w;
-} Root;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Root a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-enum BarType {
-  A,
-  B,
-  C,
-};
-typedef uint32_t BarType;
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-enum FooType {
-  A,
-  B,
-  C,
-};
-typedef uint32_t FooType;
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-typedef struct FooHandle {
-  FooType ty;
-  int32_t x;
-  float y;
-} FooHandle;
-#endif
-
-enum C_Tag {
-  C1,
-  C2,
-#if defined(PLATFORM_WIN)
-  C3,
-#endif
-#if defined(PLATFORM_UNIX)
-  C5,
-#endif
-};
-typedef uint8_t C_Tag;
-
-#if defined(PLATFORM_UNIX)
-typedef struct C5_Body {
-  C_Tag tag;
-  int32_t int_;
-} C5_Body;
-#endif
-
-typedef union C {
-  C_Tag tag;
-#if defined(PLATFORM_UNIX)
-  C5_Body c5;
-#endif
-} C;
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-typedef struct BarHandle {
-  BarType ty;
-  int32_t x;
-  float y;
-} BarHandle;
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-void root(FooHandle a, C c);
-#endif
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-void root(BarHandle a, C c);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-enum BarType
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  A,
-  B,
-  C,
-};
-#ifndef __cplusplus
-typedef uint32_t BarType;
-#endif // __cplusplus
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-enum FooType
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  A,
-  B,
-  C,
-};
-#ifndef __cplusplus
-typedef uint32_t FooType;
-#endif // __cplusplus
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-typedef struct FooHandle {
-  FooType ty;
-  int32_t x;
-  float y;
-} FooHandle;
-#endif
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  C1,
-  C2,
-#if defined(PLATFORM_WIN)
-  C3,
-#endif
-#if defined(PLATFORM_UNIX)
-  C5,
-#endif
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-#if defined(PLATFORM_UNIX)
-typedef struct C5_Body {
-  C_Tag tag;
-  int32_t int_;
-} C5_Body;
-#endif
-
-typedef union C {
-  C_Tag tag;
-#if defined(PLATFORM_UNIX)
-  C5_Body c5;
-#endif
-} C;
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-typedef struct BarHandle {
-  BarType ty;
-  int32_t x;
-  float y;
-} BarHandle;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-void root(FooHandle a, C c);
-#endif
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-void root(BarHandle a, C c);
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-field.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-field.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-field.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-field.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-field.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-field.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/cfg-field.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/cfg-field.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/char.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/char.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/char.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/char.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  uint32_t a;
-} Foo;
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/char.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/char.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/char.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/char.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  uint32_t a;
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_big.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_big.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_big.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_big.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
-
-#define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
-
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_big.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_big.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_big.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_big.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
-
-#define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
-
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-#define QUOTE '\''
-
-#define TAB '\t'
-
-#define NEWLINE '\n'
-
-#define HEART U'\U00002764'
-
-#define EQUID U'\U00010083'
-
-#define ZOM 3.14
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-/**
- * A
- * multi-line
- * doc
- * comment.
- */
-#define NEG_ONE -1
-
-#define SHIFT 3
-
-#define XBOOL 1
-
-#define XFALSE ((0 << SHIFT) | XBOOL)
-
-#define XTRUE (1 << (SHIFT | XBOOL))
-
-#define CAST (uint8_t)'A'
-
-#define DOUBLE_CAST (uint32_t)(float)1
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-#define QUOTE '\''
-
-#define TAB '\t'
-
-#define NEWLINE '\n'
-
-#define HEART U'\U00002764'
-
-#define EQUID U'\U00010083'
-
-#define ZOM 3.14
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-/**
- * A
- * multi-line
- * doc
- * comment.
- */
-#define NEG_ONE -1
-
-#define SHIFT 3
-
-#define XBOOL 1
-
-#define XFALSE ((0 << SHIFT) | XBOOL)
-
-#define XTRUE (1 << (SHIFT | XBOOL))
-
-#define CAST (uint8_t)'A'
-
-#define DOUBLE_CAST (uint32_t)(float)1
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CONSTANT_I64 216
-
-#define CONSTANT_FLOAT32 312.292
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-#define Foo_CONSTANT_I64_BODY 216
-
-#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_constexpr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CONSTANT_I64 216
-
-#define CONSTANT_FLOAT32 312.292
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-#define Foo_CONSTANT_I64_BODY 216
-
-#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define A 0
-
-#define B 0
-
-extern const uint8_t C;
-
-extern const uint8_t D;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define A 0
-
-#define B 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const uint8_t C;
-
-extern const uint8_t D;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define B 0
-
-#define A 0
-
-extern const uint8_t D;
-
-extern const uint8_t C;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_sort_none.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define B 0
-
-#define A 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const uint8_t D;
-
-extern const uint8_t C;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum E {
-  V,
-} E;
-
-typedef struct S {
-  uint8_t field;
-} S;
-
-typedef uint8_t A;
-
-#define C1 (S){ .field = 0 }
-
-#define C2 V
-
-#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/constant_user_defined_type.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum E {
-  V,
-} E;
-
-typedef struct S {
-  uint8_t field;
-} S;
-
-typedef uint8_t A;
-
-#define C1 (S){ .field = 0 }
-
-#define C2 V
-
-#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_conflict.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_conflict.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_conflict.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_conflict.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_transparent.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_transparent.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_transparent.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_transparent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef uint8_t Transparent;
-
-#define FOO 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_transparent.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_transparent.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/const_transparent.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/const_transparent.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef uint8_t Transparent;
-
-#define FOO 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/custom_header.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/custom_header.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/custom_header.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/custom_header.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-// This file is generated by cbindgen. DO NOT EDIT
-
-void root(void);
-
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/custom_header.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/custom_header.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/custom_header.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/custom_header.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-// This file is generated by cbindgen. DO NOT EDIT
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/dep_v2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/dep_v2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/dep_v2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/dep_v2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/dep_v2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/dep_v2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/dep_v2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/dep_v2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive-eq.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive-eq.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive-eq.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive-eq.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  bool a;
-  int32_t b;
-} Foo;
-
-enum Bar_Tag {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-typedef uint8_t Bar_Tag;
-
-typedef struct Bazz_Body {
-  Bar_Tag tag;
-  Foo named;
-} Bazz_Body;
-
-typedef struct FooNamed_Body {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-} FooNamed_Body;
-
-typedef struct FooParen_Body {
-  Bar_Tag tag;
-  int32_t _0;
-  Foo _1;
-} FooParen_Body;
-
-typedef union Bar {
-  Bar_Tag tag;
-  Bazz_Body bazz;
-  FooNamed_Body foo_named;
-  FooParen_Body foo_paren;
-} Bar;
-
-Foo root(Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive-eq.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive-eq.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive-eq.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive-eq.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  bool a;
-  int32_t b;
-} Foo;
-
-enum Bar_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-#ifndef __cplusplus
-typedef uint8_t Bar_Tag;
-#endif // __cplusplus
-
-typedef struct Bazz_Body {
-  Bar_Tag tag;
-  Foo named;
-} Bazz_Body;
-
-typedef struct FooNamed_Body {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-} FooNamed_Body;
-
-typedef struct FooParen_Body {
-  Bar_Tag tag;
-  int32_t _0;
-  Foo _1;
-} FooParen_Body;
-
-typedef union Bar {
-  Bar_Tag tag;
-  Bazz_Body bazz;
-  FooNamed_Body foo_named;
-  FooParen_Body foo_paren;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-Foo root(Bar aBar);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C {
-  X = 2,
-  Y,
-};
-typedef uint32_t C;
-
-typedef struct A {
-  int32_t _0;
-} A;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-typedef struct D {
-  uint8_t List;
-  uintptr_t Of;
-  B Things;
-} D;
-
-enum F_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t F_Tag;
-
-typedef struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union F {
-  F_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} F;
-
-enum H_Tag {
-  Hello,
-  There,
-  Everyone,
-};
-typedef uint8_t H_Tag;
-
-typedef struct Hello_Body {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct There_Body {
-  uint8_t x;
-  int16_t y;
-} There_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    Hello_Body hello;
-    There_Body there;
-  };
-} H;
-
-enum I_Tag {
-  ThereAgain,
-  SomethingElse,
-};
-typedef uint8_t I_Tag;
-
-typedef struct ThereAgain_Body {
-  uint8_t x;
-  int16_t y;
-} ThereAgain_Body;
-
-typedef struct I {
-  I_Tag tag;
-  union {
-    ThereAgain_Body there_again;
-  };
-} I;
-
-void root(A a, B b, C c, D d, F f, H h, I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/derive_ostream.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  X = 2,
-  Y,
-};
-#ifndef __cplusplus
-typedef uint32_t C;
-#endif // __cplusplus
-
-typedef struct A {
-  int32_t _0;
-} A;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-typedef struct D {
-  uint8_t List;
-  uintptr_t Of;
-  B Things;
-} D;
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-typedef struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union F {
-  F_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} F;
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Hello,
-  There,
-  Everyone,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-typedef struct Hello_Body {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct There_Body {
-  uint8_t x;
-  int16_t y;
-} There_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    Hello_Body hello;
-    There_Body there;
-  };
-} H;
-
-enum I_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  ThereAgain,
-  SomethingElse,
-};
-#ifndef __cplusplus
-typedef uint8_t I_Tag;
-#endif // __cplusplus
-
-typedef struct ThereAgain_Body {
-  uint8_t x;
-  int16_t y;
-} ThereAgain_Body;
-
-typedef struct I {
-  I_Tag tag;
-  union {
-    ThereAgain_Body there_again;
-  };
-} I;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A a, B b, C c, D d, F f, H h, I i);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule {
-  A,
-  B,
-};
-typedef uint8_t FillRule;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct OwnedSlice_u32 {
-  uintptr_t len;
-  uint32_t *ptr;
-} OwnedSlice_u32;
-
-typedef struct Polygon_u32 {
-  FillRule fill;
-  OwnedSlice_u32 coordinates;
-} Polygon_u32;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct OwnedSlice_i32 {
-  uintptr_t len;
-  int32_t *ptr;
-} OwnedSlice_i32;
-
-enum Foo_u32_Tag {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-typedef uint8_t Foo_u32_Tag;
-
-typedef struct Polygon1_Body_u32 {
-  Polygon_u32 _0;
-} Polygon1_Body_u32;
-
-typedef struct Slice1_Body_u32 {
-  OwnedSlice_u32 _0;
-} Slice1_Body_u32;
-
-typedef struct Slice2_Body_u32 {
-  OwnedSlice_i32 _0;
-} Slice2_Body_u32;
-
-typedef struct Slice3_Body_u32 {
-  FillRule fill;
-  OwnedSlice_u32 coords;
-} Slice3_Body_u32;
-
-typedef struct Slice4_Body_u32 {
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice4_Body_u32;
-
-typedef struct Foo_u32 {
-  Foo_u32_Tag tag;
-  union {
-    Polygon1_Body_u32 polygon1;
-    Slice1_Body_u32 slice1;
-    Slice2_Body_u32 slice2;
-    Slice3_Body_u32 slice3;
-    Slice4_Body_u32 slice4;
-  };
-} Foo_u32;
-
-typedef struct Polygon_i32 {
-  FillRule fill;
-  OwnedSlice_i32 coordinates;
-} Polygon_i32;
-
-enum Baz_i32_Tag {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-typedef uint8_t Baz_i32_Tag;
-
-typedef struct Polygon21_Body_i32 {
-  Baz_i32_Tag tag;
-  Polygon_i32 _0;
-} Polygon21_Body_i32;
-
-typedef struct Slice21_Body_i32 {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice21_Body_i32;
-
-typedef struct Slice22_Body_i32 {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice22_Body_i32;
-
-typedef struct Slice23_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice23_Body_i32;
-
-typedef struct Slice24_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice24_Body_i32;
-
-typedef union Baz_i32 {
-  Baz_i32_Tag tag;
-  Polygon21_Body_i32 polygon21;
-  Slice21_Body_i32 slice21;
-  Slice22_Body_i32 slice22;
-  Slice23_Body_i32 slice23;
-  Slice24_Body_i32 slice24;
-} Baz_i32;
-
-enum Taz_Tag {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-typedef uint8_t Taz_Tag;
-
-typedef struct Taz1_Body {
-  Taz_Tag tag;
-  int32_t _0;
-} Taz1_Body;
-
-typedef struct Taz3_Body {
-  Taz_Tag tag;
-  OwnedSlice_i32 _0;
-} Taz3_Body;
-
-typedef union Taz {
-  Taz_Tag tag;
-  Taz1_Body taz1;
-  Taz3_Body taz3;
-} Taz;
-
-enum Tazz_Tag {
-  Bar4,
-  Taz2,
-};
-typedef uint8_t Tazz_Tag;
-
-typedef struct Taz2_Body {
-  Tazz_Tag tag;
-  int32_t _0;
-} Taz2_Body;
-
-typedef union Tazz {
-  Tazz_Tag tag;
-  Taz2_Body taz2;
-} Tazz;
-
-enum Tazzz_Tag {
-  Bar5,
-  Taz5,
-};
-typedef uint8_t Tazzz_Tag;
-
-typedef struct Taz5_Body {
-  Tazzz_Tag tag;
-  int32_t _0;
-} Taz5_Body;
-
-typedef union Tazzz {
-  Tazzz_Tag tag;
-  Taz5_Body taz5;
-} Tazzz;
-
-enum Tazzzz_Tag {
-  Taz6,
-  Taz7,
-};
-typedef uint8_t Tazzzz_Tag;
-
-typedef struct Taz6_Body {
-  Tazzzz_Tag tag;
-  int32_t _0;
-} Taz6_Body;
-
-typedef struct Taz7_Body {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-} Taz7_Body;
-
-typedef union Tazzzz {
-  Tazzzz_Tag tag;
-  Taz6_Body taz6;
-  Taz7_Body taz7;
-} Tazzzz;
-
-enum Qux_Tag {
-  Qux1,
-  Qux2,
-};
-typedef uint8_t Qux_Tag;
-
-typedef struct Qux1_Body {
-  Qux_Tag tag;
-  int32_t _0;
-} Qux1_Body;
-
-typedef struct Qux2_Body {
-  Qux_Tag tag;
-  uint32_t _0;
-} Qux2_Body;
-
-typedef union Qux {
-  Qux_Tag tag;
-  Qux1_Body qux1;
-  Qux2_Body qux2;
-} Qux;
-
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/destructor-and-copy-ctor.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,294 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  A,
-  B,
-};
-#ifndef __cplusplus
-typedef uint8_t FillRule;
-#endif // __cplusplus
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct OwnedSlice_u32 {
-  uintptr_t len;
-  uint32_t *ptr;
-} OwnedSlice_u32;
-
-typedef struct Polygon_u32 {
-  FillRule fill;
-  OwnedSlice_u32 coordinates;
-} Polygon_u32;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct OwnedSlice_i32 {
-  uintptr_t len;
-  int32_t *ptr;
-} OwnedSlice_i32;
-
-enum Foo_u32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-#ifndef __cplusplus
-typedef uint8_t Foo_u32_Tag;
-#endif // __cplusplus
-
-typedef struct Polygon1_Body_u32 {
-  Polygon_u32 _0;
-} Polygon1_Body_u32;
-
-typedef struct Slice1_Body_u32 {
-  OwnedSlice_u32 _0;
-} Slice1_Body_u32;
-
-typedef struct Slice2_Body_u32 {
-  OwnedSlice_i32 _0;
-} Slice2_Body_u32;
-
-typedef struct Slice3_Body_u32 {
-  FillRule fill;
-  OwnedSlice_u32 coords;
-} Slice3_Body_u32;
-
-typedef struct Slice4_Body_u32 {
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice4_Body_u32;
-
-typedef struct Foo_u32 {
-  Foo_u32_Tag tag;
-  union {
-    Polygon1_Body_u32 polygon1;
-    Slice1_Body_u32 slice1;
-    Slice2_Body_u32 slice2;
-    Slice3_Body_u32 slice3;
-    Slice4_Body_u32 slice4;
-  };
-} Foo_u32;
-
-typedef struct Polygon_i32 {
-  FillRule fill;
-  OwnedSlice_i32 coordinates;
-} Polygon_i32;
-
-enum Baz_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t Baz_i32_Tag;
-#endif // __cplusplus
-
-typedef struct Polygon21_Body_i32 {
-  Baz_i32_Tag tag;
-  Polygon_i32 _0;
-} Polygon21_Body_i32;
-
-typedef struct Slice21_Body_i32 {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice21_Body_i32;
-
-typedef struct Slice22_Body_i32 {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice22_Body_i32;
-
-typedef struct Slice23_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice23_Body_i32;
-
-typedef struct Slice24_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice24_Body_i32;
-
-typedef union Baz_i32 {
-  Baz_i32_Tag tag;
-  Polygon21_Body_i32 polygon21;
-  Slice21_Body_i32 slice21;
-  Slice22_Body_i32 slice22;
-  Slice23_Body_i32 slice23;
-  Slice24_Body_i32 slice24;
-} Baz_i32;
-
-enum Taz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t Taz_Tag;
-#endif // __cplusplus
-
-typedef struct Taz1_Body {
-  Taz_Tag tag;
-  int32_t _0;
-} Taz1_Body;
-
-typedef struct Taz3_Body {
-  Taz_Tag tag;
-  OwnedSlice_i32 _0;
-} Taz3_Body;
-
-typedef union Taz {
-  Taz_Tag tag;
-  Taz1_Body taz1;
-  Taz3_Body taz3;
-} Taz;
-
-enum Tazz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar4,
-  Taz2,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazz_Tag;
-#endif // __cplusplus
-
-typedef struct Taz2_Body {
-  Tazz_Tag tag;
-  int32_t _0;
-} Taz2_Body;
-
-typedef union Tazz {
-  Tazz_Tag tag;
-  Taz2_Body taz2;
-} Tazz;
-
-enum Tazzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar5,
-  Taz5,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzz_Tag;
-#endif // __cplusplus
-
-typedef struct Taz5_Body {
-  Tazzz_Tag tag;
-  int32_t _0;
-} Taz5_Body;
-
-typedef union Tazzz {
-  Tazzz_Tag tag;
-  Taz5_Body taz5;
-} Tazzz;
-
-enum Tazzzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz6,
-  Taz7,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzzz_Tag;
-#endif // __cplusplus
-
-typedef struct Taz6_Body {
-  Tazzzz_Tag tag;
-  int32_t _0;
-} Taz6_Body;
-
-typedef struct Taz7_Body {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-} Taz7_Body;
-
-typedef union Tazzzz {
-  Tazzzz_Tag tag;
-  Taz6_Body taz6;
-  Taz7_Body taz7;
-} Tazzzz;
-
-enum Qux_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Qux1,
-  Qux2,
-};
-#ifndef __cplusplus
-typedef uint8_t Qux_Tag;
-#endif // __cplusplus
-
-typedef struct Qux1_Body {
-  Qux_Tag tag;
-  int32_t _0;
-} Qux1_Body;
-
-typedef struct Qux2_Body {
-  Qux_Tag tag;
-  uint32_t _0;
-} Qux2_Body;
-
-typedef union Qux {
-  Qux_Tag tag;
-  Qux1_Body qux1;
-  Qux2_Body qux2;
-} Qux;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/display_list.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/display_list.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/display_list.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/display_list.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Rect {
-  float x;
-  float y;
-  float w;
-  float h;
-} Rect;
-
-typedef struct Color {
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
-  uint8_t a;
-} Color;
-
-enum DisplayItem_Tag {
-  Fill,
-  Image,
-  ClearScreen,
-};
-typedef uint8_t DisplayItem_Tag;
-
-typedef struct Fill_Body {
-  DisplayItem_Tag tag;
-  Rect _0;
-  Color _1;
-} Fill_Body;
-
-typedef struct Image_Body {
-  DisplayItem_Tag tag;
-  uint32_t id;
-  Rect bounds;
-} Image_Body;
-
-typedef union DisplayItem {
-  DisplayItem_Tag tag;
-  Fill_Body fill;
-  Image_Body image;
-} DisplayItem;
-
-bool push_item(DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/display_list.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/display_list.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/display_list.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/display_list.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Rect {
-  float x;
-  float y;
-  float w;
-  float h;
-} Rect;
-
-typedef struct Color {
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
-  uint8_t a;
-} Color;
-
-enum DisplayItem_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Fill,
-  Image,
-  ClearScreen,
-};
-#ifndef __cplusplus
-typedef uint8_t DisplayItem_Tag;
-#endif // __cplusplus
-
-typedef struct Fill_Body {
-  DisplayItem_Tag tag;
-  Rect _0;
-  Color _1;
-} Fill_Body;
-
-typedef struct Image_Body {
-  DisplayItem_Tag tag;
-  uint32_t id;
-  Rect bounds;
-} Image_Body;
-
-typedef union DisplayItem {
-  DisplayItem_Tag tag;
-  Fill_Body fill;
-  Image_Body image;
-} DisplayItem;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-bool push_item(DisplayItem item);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_auto.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-// The root of all evil.
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_c99.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// The root of all evil.
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/docstyle_doxy.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- *With doc attr, each attr contribute to one line of document
- *like this one with a new line character at its end
- *and this one as well. So they are in the same paragraph
- *
- *Line ends with one new line should not break
- *
- *Line ends with two spaces and a new line
- *should break to next line
- *
- *Line ends with two new lines
- *
- *Should break to next paragraph
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- *With doc attr, each attr contribute to one line of document
- *like this one with a new line character at its end
- *and this one as well. So they are in the same paragraph
- *
- *Line ends with one new line should not break
- *
- *Line ends with two spaces and a new line
- *should break to next line
- *
- *Line ends with two new lines
- *
- *Should break to next paragraph
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- *
- * But at least it contains some more documentation as someone would expect
- * from a simple test case like this.
- *
- * # Hint
- *
- * Always ensure that everything is properly documented, even if you feel lazy.
- * **Sometimes** it is also helpful to include some markdown formatting.
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * Attention:
- *
- *    Rust is going to trim all leading `/` symbols. If you want to use them as a
- *    marker you need to add at least a single whitespace inbetween the tripple
- *    slash doc-comment marker and the rest.
- *
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/documentation.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/documentation.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- *
- * But at least it contains some more documentation as someone would expect
- * from a simple test case like this.
- *
- * # Hint
- *
- * Always ensure that everything is properly documented, even if you feel lazy.
- * **Sometimes** it is also helpful to include some markdown formatting.
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * Attention:
- *
- *    Rust is going to trim all leading `/` symbols. If you want to use them as a
- *    marker you need to add at least a single whitespace inbetween the tripple
- *    slash doc-comment marker and the rest.
- *
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A {
-  a1 = 0,
-  a2 = 2,
-  a3,
-  a4 = 5,
-};
-typedef uint64_t A;
-
-enum B {
-  b1 = 0,
-  b2 = 2,
-  b3,
-  b4 = 5,
-};
-typedef uint32_t B;
-
-enum C {
-  c1 = 0,
-  c2 = 2,
-  c3,
-  c4 = 5,
-};
-typedef uint16_t C;
-
-enum D {
-  d1 = 0,
-  d2 = 2,
-  d3,
-  d4 = 5,
-};
-typedef uint8_t D;
-
-enum E {
-  e1 = 0,
-  e2 = 2,
-  e3,
-  e4 = 5,
-};
-typedef uintptr_t E;
-
-enum F {
-  f1 = 0,
-  f2 = 2,
-  f3,
-  f4 = 5,
-};
-typedef intptr_t F;
-
-typedef enum L {
-  l1,
-  l2,
-  l3,
-  l4,
-} L;
-
-enum M {
-  m1 = -1,
-  m2 = 0,
-  m3 = 1,
-};
-typedef int8_t M;
-
-typedef enum N {
-  n1,
-  n2,
-  n3,
-  n4,
-} N;
-
-enum O {
-  o1,
-  o2,
-  o3,
-  o4,
-};
-typedef int8_t O;
-
-typedef struct J J;
-
-typedef struct K K;
-
-typedef struct Opaque Opaque;
-
-enum G_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t G_Tag;
-
-typedef struct Foo_Body {
-  G_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  G_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union G {
-  G_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} G;
-
-typedef enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-} H_Tag;
-
-typedef struct H_Foo_Body {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum I_Tag {
-  I_Foo,
-  I_Bar,
-  I_Baz,
-};
-typedef uint8_t I_Tag;
-
-typedef struct I_Foo_Body {
-  int16_t _0;
-} I_Foo_Body;
-
-typedef struct I_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} I_Bar_Body;
-
-typedef struct I {
-  I_Tag tag;
-  union {
-    I_Foo_Body foo;
-    I_Bar_Body bar;
-  };
-} I;
-
-enum P_Tag {
-  P0,
-  P1,
-};
-typedef uint8_t P_Tag;
-
-typedef struct P0_Body {
-  uint8_t _0;
-} P0_Body;
-
-typedef struct P1_Body {
-  uint8_t _0;
-  uint8_t _1;
-  uint8_t _2;
-} P1_Body;
-
-typedef struct P {
-  P_Tag tag;
-  union {
-    P0_Body p0;
-    P1_Body p1;
-  };
-} P;
-
-void root(Opaque *opaque,
-          A a,
-          B b,
-          C c,
-          D d,
-          E e,
-          F f,
-          G g,
-          H h,
-          I i,
-          J j,
-          K k,
-          L l,
-          M m,
-          N n,
-          O o,
-          P p);
-
-#include <stddef.h>
-#include "testing-helpers.h"
-static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
-static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,281 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A
-#ifdef __cplusplus
-  : uint64_t
-#endif // __cplusplus
- {
-  a1 = 0,
-  a2 = 2,
-  a3,
-  a4 = 5,
-};
-#ifndef __cplusplus
-typedef uint64_t A;
-#endif // __cplusplus
-
-enum B
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  b1 = 0,
-  b2 = 2,
-  b3,
-  b4 = 5,
-};
-#ifndef __cplusplus
-typedef uint32_t B;
-#endif // __cplusplus
-
-enum C
-#ifdef __cplusplus
-  : uint16_t
-#endif // __cplusplus
- {
-  c1 = 0,
-  c2 = 2,
-  c3,
-  c4 = 5,
-};
-#ifndef __cplusplus
-typedef uint16_t C;
-#endif // __cplusplus
-
-enum D
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  d1 = 0,
-  d2 = 2,
-  d3,
-  d4 = 5,
-};
-#ifndef __cplusplus
-typedef uint8_t D;
-#endif // __cplusplus
-
-enum E
-#ifdef __cplusplus
-  : uintptr_t
-#endif // __cplusplus
- {
-  e1 = 0,
-  e2 = 2,
-  e3,
-  e4 = 5,
-};
-#ifndef __cplusplus
-typedef uintptr_t E;
-#endif // __cplusplus
-
-enum F
-#ifdef __cplusplus
-  : intptr_t
-#endif // __cplusplus
- {
-  f1 = 0,
-  f2 = 2,
-  f3,
-  f4 = 5,
-};
-#ifndef __cplusplus
-typedef intptr_t F;
-#endif // __cplusplus
-
-typedef enum L {
-  l1,
-  l2,
-  l3,
-  l4,
-} L;
-
-enum M
-#ifdef __cplusplus
-  : int8_t
-#endif // __cplusplus
- {
-  m1 = -1,
-  m2 = 0,
-  m3 = 1,
-};
-#ifndef __cplusplus
-typedef int8_t M;
-#endif // __cplusplus
-
-typedef enum N {
-  n1,
-  n2,
-  n3,
-  n4,
-} N;
-
-enum O
-#ifdef __cplusplus
-  : int8_t
-#endif // __cplusplus
- {
-  o1,
-  o2,
-  o3,
-  o4,
-};
-#ifndef __cplusplus
-typedef int8_t O;
-#endif // __cplusplus
-
-typedef struct J J;
-
-typedef struct K K;
-
-typedef struct Opaque Opaque;
-
-enum G_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t G_Tag;
-#endif // __cplusplus
-
-typedef struct Foo_Body {
-  G_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct Bar_Body {
-  G_Tag tag;
-  uint8_t x;
-  int16_t y;
-} Bar_Body;
-
-typedef union G {
-  G_Tag tag;
-  Foo_Body foo;
-  Bar_Body bar;
-} G;
-
-typedef enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-} H_Tag;
-
-typedef struct H_Foo_Body {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} H_Bar_Body;
-
-typedef struct H {
-  H_Tag tag;
-  union {
-    H_Foo_Body foo;
-    H_Bar_Body bar;
-  };
-} H;
-
-enum I_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  I_Foo,
-  I_Bar,
-  I_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t I_Tag;
-#endif // __cplusplus
-
-typedef struct I_Foo_Body {
-  int16_t _0;
-} I_Foo_Body;
-
-typedef struct I_Bar_Body {
-  uint8_t x;
-  int16_t y;
-} I_Bar_Body;
-
-typedef struct I {
-  I_Tag tag;
-  union {
-    I_Foo_Body foo;
-    I_Bar_Body bar;
-  };
-} I;
-
-enum P_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  P0,
-  P1,
-};
-#ifndef __cplusplus
-typedef uint8_t P_Tag;
-#endif // __cplusplus
-
-typedef struct P0_Body {
-  uint8_t _0;
-} P0_Body;
-
-typedef struct P1_Body {
-  uint8_t _0;
-  uint8_t _1;
-  uint8_t _2;
-} P1_Body;
-
-typedef struct P {
-  P_Tag tag;
-  union {
-    P0_Body p0;
-    P1_Body p1;
-  };
-} P;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Opaque *opaque,
-          A a,
-          B b,
-          C c,
-          D d,
-          E e,
-          F f,
-          G g,
-          H h,
-          I i,
-          J j,
-          K k,
-          L l,
-          M m,
-          N n,
-          O o,
-          P p);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#include <stddef.h>
-#include "testing-helpers.h"
-static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
-static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-enum Bar_Tag {
-  Min,
-  Max,
-  Other,
-};
-typedef uint8_t Bar_Tag;
-
-typedef struct Min_Body {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Min_Body;
-
-typedef struct Max_Body {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Max_Body;
-
-typedef union Bar {
-  Bar_Tag tag;
-  Min_Body min;
-  Max_Body max;
-} Bar;
-
-void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/enum_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/enum_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-enum Bar_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Min,
-  Max,
-  Other,
-};
-#ifndef __cplusplus
-typedef uint8_t Bar_Tag;
-#endif // __cplusplus
-
-typedef struct Min_Body {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Min_Body;
-
-typedef struct Max_Body {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Max_Body;
-
-typedef union Bar {
-  Bar_Tag tag;
-  Min_Body min;
-  Max_Body max;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/euclid.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/euclid.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/euclid.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/euclid.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct TypedLength_f32__UnknownUnit {
-  float _0;
-} TypedLength_f32__UnknownUnit;
-
-typedef struct TypedLength_f32__LayoutUnit {
-  float _0;
-} TypedLength_f32__LayoutUnit;
-
-typedef TypedLength_f32__UnknownUnit Length_f32;
-
-typedef TypedLength_f32__LayoutUnit LayoutLength;
-
-typedef struct TypedSideOffsets2D_f32__UnknownUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-} TypedSideOffsets2D_f32__UnknownUnit;
-
-typedef struct TypedSideOffsets2D_f32__LayoutUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-} TypedSideOffsets2D_f32__LayoutUnit;
-
-typedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
-
-typedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
-
-typedef struct TypedSize2D_f32__UnknownUnit {
-  float width;
-  float height;
-} TypedSize2D_f32__UnknownUnit;
-
-typedef struct TypedSize2D_f32__LayoutUnit {
-  float width;
-  float height;
-} TypedSize2D_f32__LayoutUnit;
-
-typedef TypedSize2D_f32__UnknownUnit Size2D_f32;
-
-typedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
-
-typedef struct TypedPoint2D_f32__UnknownUnit {
-  float x;
-  float y;
-} TypedPoint2D_f32__UnknownUnit;
-
-typedef struct TypedPoint2D_f32__LayoutUnit {
-  float x;
-  float y;
-} TypedPoint2D_f32__LayoutUnit;
-
-typedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
-
-typedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
-
-typedef struct TypedRect_f32__UnknownUnit {
-  TypedPoint2D_f32__UnknownUnit origin;
-  TypedSize2D_f32__UnknownUnit size;
-} TypedRect_f32__UnknownUnit;
-
-typedef struct TypedRect_f32__LayoutUnit {
-  TypedPoint2D_f32__LayoutUnit origin;
-  TypedSize2D_f32__LayoutUnit size;
-} TypedRect_f32__LayoutUnit;
-
-typedef TypedRect_f32__UnknownUnit Rect_f32;
-
-typedef TypedRect_f32__LayoutUnit LayoutRect;
-
-typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-} TypedTransform2D_f32__UnknownUnit__LayoutUnit;
-
-typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-} TypedTransform2D_f32__LayoutUnit__UnknownUnit;
-
-void root(TypedLength_f32__UnknownUnit length_a,
-          TypedLength_f32__LayoutUnit length_b,
-          Length_f32 length_c,
-          LayoutLength length_d,
-          TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
-          SideOffsets2D_f32 side_offsets_c,
-          LayoutSideOffsets2D side_offsets_d,
-          TypedSize2D_f32__UnknownUnit size_a,
-          TypedSize2D_f32__LayoutUnit size_b,
-          Size2D_f32 size_c,
-          LayoutSize2D size_d,
-          TypedPoint2D_f32__UnknownUnit point_a,
-          TypedPoint2D_f32__LayoutUnit point_b,
-          Point2D_f32 point_c,
-          LayoutPoint2D point_d,
-          TypedRect_f32__UnknownUnit rect_a,
-          TypedRect_f32__LayoutUnit rect_b,
-          Rect_f32 rect_c,
-          LayoutRect rect_d,
-          TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/euclid.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/euclid.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/euclid.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/euclid.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct TypedLength_f32__UnknownUnit {
-  float _0;
-} TypedLength_f32__UnknownUnit;
-
-typedef struct TypedLength_f32__LayoutUnit {
-  float _0;
-} TypedLength_f32__LayoutUnit;
-
-typedef TypedLength_f32__UnknownUnit Length_f32;
-
-typedef TypedLength_f32__LayoutUnit LayoutLength;
-
-typedef struct TypedSideOffsets2D_f32__UnknownUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-} TypedSideOffsets2D_f32__UnknownUnit;
-
-typedef struct TypedSideOffsets2D_f32__LayoutUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-} TypedSideOffsets2D_f32__LayoutUnit;
-
-typedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
-
-typedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
-
-typedef struct TypedSize2D_f32__UnknownUnit {
-  float width;
-  float height;
-} TypedSize2D_f32__UnknownUnit;
-
-typedef struct TypedSize2D_f32__LayoutUnit {
-  float width;
-  float height;
-} TypedSize2D_f32__LayoutUnit;
-
-typedef TypedSize2D_f32__UnknownUnit Size2D_f32;
-
-typedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
-
-typedef struct TypedPoint2D_f32__UnknownUnit {
-  float x;
-  float y;
-} TypedPoint2D_f32__UnknownUnit;
-
-typedef struct TypedPoint2D_f32__LayoutUnit {
-  float x;
-  float y;
-} TypedPoint2D_f32__LayoutUnit;
-
-typedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
-
-typedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
-
-typedef struct TypedRect_f32__UnknownUnit {
-  TypedPoint2D_f32__UnknownUnit origin;
-  TypedSize2D_f32__UnknownUnit size;
-} TypedRect_f32__UnknownUnit;
-
-typedef struct TypedRect_f32__LayoutUnit {
-  TypedPoint2D_f32__LayoutUnit origin;
-  TypedSize2D_f32__LayoutUnit size;
-} TypedRect_f32__LayoutUnit;
-
-typedef TypedRect_f32__UnknownUnit Rect_f32;
-
-typedef TypedRect_f32__LayoutUnit LayoutRect;
-
-typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-} TypedTransform2D_f32__UnknownUnit__LayoutUnit;
-
-typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-} TypedTransform2D_f32__LayoutUnit__UnknownUnit;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(TypedLength_f32__UnknownUnit length_a,
-          TypedLength_f32__LayoutUnit length_b,
-          Length_f32 length_c,
-          LayoutLength length_d,
-          TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
-          SideOffsets2D_f32 side_offsets_c,
-          LayoutSideOffsets2D side_offsets_d,
-          TypedSize2D_f32__UnknownUnit size_a,
-          TypedSize2D_f32__LayoutUnit size_b,
-          Size2D_f32 size_c,
-          LayoutSize2D size_d,
-          TypedPoint2D_f32__UnknownUnit point_a,
-          TypedPoint2D_f32__LayoutUnit point_b,
-          Point2D_f32 point_c,
-          LayoutPoint2D point_d,
-          TypedRect_f32__UnknownUnit rect_a,
-          TypedRect_f32__LayoutUnit rect_b,
-          Rect_f32 rect_c,
-          LayoutRect rect_d,
-          TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdint.h>
-
-typedef uint64_t Option_Foo;
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar {
-  Option_Foo foo;
-} Bar;
-
-void root(Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/exclude_generic_monomorph.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdint.h>
-
-typedef uint64_t Option_Foo;
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar {
-  Option_Foo foo;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Bar f);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-void extra_debug_fn(void);
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_default_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void extra_debug_fn(void);
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_dep_v2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct dep_struct {
-  uint32_t x;
-  double y;
-} dep_struct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-void extra_debug_fn(void);
-
-void cbindgen(void);
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void extra_debug_fn(void);
-
-void cbindgen(void);
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/expand_no_default_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/export_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/export_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/export_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/export_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void do_the_thing_with_export_name(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/export_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/export_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/export_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/export_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void do_the_thing_with_export_name(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void first(void);
-
-void second(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void first(void);
-
-void second(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct ExtType {
-  uint32_t data;
-} ExtType;
-
-void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/external_workspace_child.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct ExtType {
-  uint32_t data;
-} ExtType;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void consume_ext(ExtType _ext);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-extern int32_t foo(void);
-
-extern void bar(Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/extern.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/extern.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern int32_t foo(void);
-
-extern void bar(Normal a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/fns.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/fns.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/fns.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/fns.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Fns {
-  void (*noArgs)(void);
-  void (*anonymousArg)(int32_t);
-  int32_t (*returnsNumber)(void);
-  int8_t (*namedArgs)(int32_t first, int16_t snd);
-  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
-} Fns;
-
-void root(Fns _fns);
-
-void no_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/fns.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/fns.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/fns.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/fns.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Fns {
-  void (*noArgs)(void);
-  void (*anonymousArg)(int32_t);
-  int32_t (*returnsNumber)(void);
-  int8_t (*namedArgs)(int32_t first, int16_t snd);
-  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
-} Fns;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Fns _fns);
-
-void no_return(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_args.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_args.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_args.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_args.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void unnamed(const uint64_t*);
-
-void pointer_test(const uint64_t *a);
-
-void print_from_rust(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_args.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_args.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_args.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_args.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void unnamed(const uint64_t*);
-
-void pointer_test(const uint64_t *a);
-
-void print_from_rust(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#ifndef NO_RETURN_ATTR
-  #ifdef __GNUC__
-    #define NO_RETURN_ATTR __attribute__ ((noreturn))
-  #else // __GNUC__
-    #define NO_RETURN_ATTR
-  #endif // __GNUC__
-#endif // NO_RETURN_ATTR
-
-
-void loop_forever(void) NO_RETURN_ATTR;
-
-uint8_t normal_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_noreturn.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#ifndef NO_RETURN_ATTR
-  #ifdef __GNUC__
-    #define NO_RETURN_ATTR __attribute__ ((noreturn))
-  #else // __GNUC__
-    #define NO_RETURN_ATTR
-  #endif // __GNUC__
-#endif // NO_RETURN_ATTR
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void loop_forever(void) NO_RETURN_ATTR;
-
-uint8_t normal_return(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void A(void);
-
-void B(void);
-
-void C(void);
-
-void D(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void A(void);
-
-void B(void);
-
-void C(void);
-
-void D(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void C(void);
-
-void B(void);
-
-void D(void);
-
-void A(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/function_sort_none.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void C(void);
-
-void B(void);
-
-void D(void);
-
-void A(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_____u8 {
-  uint8_t *a;
-} Foo_____u8;
-
-typedef Foo_____u8 Boo;
-
-void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/generic-pointer.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_____u8 {
-  uint8_t *a;
-} Foo_____u8;
-
-typedef Foo_____u8 Boo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Boo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_variable.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_variable.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_variable.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_variable.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-extern char MUT_GLOBAL_ARRAY[128];
-
-extern const char CONST_GLOBAL_ARRAY[128];
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_variable.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_variable.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/global_variable.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/global_variable.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern char MUT_GLOBAL_ARRAY[128];
-
-extern const char CONST_GLOBAL_ARRAY[128];
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ignore.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ignore.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ignore.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ignore.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void no_ignore_root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ignore.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ignore.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ignore.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ignore.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void no_ignore_root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_guard.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_guard.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_guard.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_guard.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-void root(void);
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_guard.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_guard.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_guard.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_guard.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_item.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_item.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_item.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_item.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  int32_t x;
-  float y;
-} A;
-
-typedef struct B {
-  A data;
-} B;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_item.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_item.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_item.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_item.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  int32_t x;
-  float y;
-} A;
-
-typedef struct B {
-  A data;
-} B;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_specific.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_specific.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_specific.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_specific.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_specific.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/include_specific.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/include_specific.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/inner_mod.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/inner_mod.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/inner_mod.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/inner_mod.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  float x;
-} Foo;
-
-void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/inner_mod.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/inner_mod.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/inner_mod.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/inner_mod.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  float x;
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum OnlyThisShouldBeGenerated {
-  Foo,
-  Bar,
-};
-typedef uint8_t OnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum OnlyThisShouldBeGenerated
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-};
-#ifndef __cplusplus
-typedef uint8_t OnlyThisShouldBeGenerated;
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum StyleOnlyThisShouldBeGenerated {
-  Foo,
-  Bar,
-};
-typedef uint8_t StyleOnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/item_types_renamed.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum StyleOnlyThisShouldBeGenerated
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleOnlyThisShouldBeGenerated;
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaqueAlign16Union OpaqueAlign16Union;
-
-typedef struct OpaqueAlign1Struct OpaqueAlign1Struct;
-
-typedef struct OpaqueAlign1Union OpaqueAlign1Union;
-
-typedef struct OpaqueAlign2Struct OpaqueAlign2Struct;
-
-typedef struct OpaqueAlign32Struct OpaqueAlign32Struct;
-
-typedef struct OpaqueAlign4Struct OpaqueAlign4Struct;
-
-typedef struct OpaqueAlign4Union OpaqueAlign4Union;
-
-typedef struct OpaqueAlign8Struct OpaqueAlign8Struct;
-
-typedef struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_aligned_opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaqueAlign16Union OpaqueAlign16Union;
-
-typedef struct OpaqueAlign1Struct OpaqueAlign1Struct;
-
-typedef struct OpaqueAlign1Union OpaqueAlign1Union;
-
-typedef struct OpaqueAlign2Struct OpaqueAlign2Struct;
-
-typedef struct OpaqueAlign32Struct OpaqueAlign32Struct;
-
-typedef struct OpaqueAlign4Struct OpaqueAlign4Struct;
-
-typedef struct OpaqueAlign4Union OpaqueAlign4Union;
-
-typedef struct OpaqueAlign8Struct OpaqueAlign8Struct;
-
-typedef struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#define CBINDGEN_PACKED     __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct RustAlign4Struct RustAlign4Struct;
-
-typedef struct RustAlign4Union RustAlign4Union;
-
-typedef struct RustPackedStruct RustPackedStruct;
-
-typedef struct RustPackedUnion RustPackedUnion;
-
-typedef struct UnsupportedAlign4Enum UnsupportedAlign4Enum;
-
-typedef struct UnsupportedPacked4Struct UnsupportedPacked4Struct;
-
-typedef struct UnsupportedPacked4Union UnsupportedPacked4Union;
-
-typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
-
-typedef struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#define CBINDGEN_PACKED     __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct RustAlign4Struct RustAlign4Struct;
-
-typedef struct RustAlign4Union RustAlign4Union;
-
-typedef struct RustPackedStruct RustPackedStruct;
-
-typedef struct RustPackedUnion RustPackedUnion;
-
-typedef struct UnsupportedAlign4Enum UnsupportedAlign4Enum;
-
-typedef struct UnsupportedPacked4Struct UnsupportedPacked4Struct;
-
-typedef struct UnsupportedPacked4Union UnsupportedPacked4Union;
-
-typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
-
-typedef struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaquePackedStruct OpaquePackedStruct;
-
-typedef struct OpaquePackedUnion OpaquePackedUnion;
-
-typedef union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/layout_packed_opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaquePackedStruct OpaquePackedStruct;
-
-typedef struct OpaquePackedUnion OpaquePackedUnion;
-
-typedef union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  const int32_t *data;
-} A;
-
-void root(A _a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/lifetime_arg.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  const int32_t *data;
-} A;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A _a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

void root(Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_cr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Dummy {
-  int32_t x;
-  float y;
-} Dummy;
-
-void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_crlf.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Dummy {
-  int32_t x;
-  float y;
-} Dummy;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Dummy d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Dummy {
-  int32_t x;
-  float y;
-} Dummy;
-
-void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/linestyle_lf.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Dummy {
-  int32_t x;
-  float y;
-} Dummy;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Dummy d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/literal_target.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/literal_target.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/literal_target.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/literal_target.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/literal_target.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/literal_target.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/literal_target.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/literal_target.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mangle.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mangle.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mangle.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mangle.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct FooU8 {
-  uint8_t a;
-} FooU8;
-
-typedef FooU8 Boo;
-
-void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mangle.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mangle.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mangle.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mangle.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct FooU8 {
-  uint8_t a;
-} FooU8;
-
-typedef FooU8 Boo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Boo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using ManuallyDrop = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
-
-typedef NotReprC_ManuallyDrop_Point Foo;
-
-typedef struct Point {
-  int32_t x;
-  int32_t y;
-} Point;
-
-typedef struct MyStruct {
-  Point point;
-} MyStruct;
-
-void root(const Foo *a, const MyStruct *with_manual_drop);
-
-void take(Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/manuallydrop.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using ManuallyDrop = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
-
-typedef NotReprC_ManuallyDrop_Point Foo;
-
-typedef struct Point {
-  int32_t x;
-  int32_t y;
-} Point;
-
-typedef struct MyStruct {
-  Point point;
-} MyStruct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const MyStruct *with_manual_drop);
-
-void take(Point with_manual_drop);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using MaybeUninit = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
-
-typedef NotReprC_MaybeUninit______i32 Foo;
-
-typedef struct MyStruct {
-  const int32_t *number;
-} MyStruct;
-
-void root(const Foo *a, const MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/maybeuninit.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using MaybeUninit = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
-
-typedef NotReprC_MaybeUninit______i32 Foo;
-
-typedef struct MyStruct {
-  const int32_t *number;
-} MyStruct;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const MyStruct *with_maybe_uninit);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2015.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2015.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2015.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2015.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2015.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2015.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2015.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2015.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2018.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2018.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2018.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2018.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2018.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2018.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_2018.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_2018.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(FOO)
-#define FOO 1
-#endif
-
-#if defined(BAR)
-#define BAR 2
-#endif
-
-#if defined(FOO)
-typedef struct Foo {
-
-} Foo;
-#endif
-
-#if defined(BAR)
-typedef struct Bar {
-
-} Bar;
-#endif
-
-#if defined(FOO)
-void foo(const Foo *foo);
-#endif
-
-#if defined(BAR)
-void bar(const Bar *bar);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(FOO)
-#define FOO 1
-#endif
-
-#if defined(BAR)
-#define BAR 2
-#endif
-
-#if defined(FOO)
-typedef struct Foo {
-
-} Foo;
-#endif
-
-#if defined(BAR)
-typedef struct Bar {
-
-} Bar;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#if defined(FOO)
-void foo(const Foo *foo);
-#endif
-
-#if defined(BAR)
-void bar(const Bar *bar);
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_path.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_path.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_path.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_path.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_path.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_path.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/mod_path.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/mod_path.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-typedef struct ExportMe {
-  uint64_t val;
-} ExportMe;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef struct Foo_i32 {
-  const int32_t *data;
-} Foo_i32;
-
-typedef struct Foo_f32 {
-  const float *data;
-} Foo_f32;
-
-typedef struct Foo_Bar_f32 {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef struct Tuple_Foo_f32_____f32 {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef struct Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-1.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef struct Foo_i32 {
-  const int32_t *data;
-} Foo_i32;
-
-typedef struct Foo_f32 {
-  const float *data;
-} Foo_f32;
-
-typedef struct Foo_Bar_f32 {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef struct Tuple_Foo_f32_____f32 {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef struct Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A A;
-
-typedef struct B B;
-
-typedef struct List_A {
-  A *members;
-  uintptr_t count;
-} List_A;
-
-typedef struct List_B {
-  B *members;
-  uintptr_t count;
-} List_B;
-
-void foo(List_A a);
-
-void bar(List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A A;
-
-typedef struct B B;
-
-typedef struct List_A {
-  A *members;
-  uintptr_t count;
-} List_A;
-
-typedef struct List_B {
-  B *members;
-  uintptr_t count;
-} List_B;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(List_A a);
-
-void bar(List_B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef union Foo_i32 {
-  const int32_t *data;
-} Foo_i32;
-
-typedef union Foo_f32 {
-  const float *data;
-} Foo_f32;
-
-typedef union Foo_Bar_f32 {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef union Tuple_Foo_f32_____f32 {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef union Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/monomorph-3.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef union Foo_i32 {
-  const int32_t *data;
-} Foo_i32;
-
-typedef union Foo_f32 {
-  const float *data;
-} Foo_f32;
-
-typedef union Foo_Bar_f32 {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef union Tuple_Foo_f32_____f32 {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef union Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/must-use.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/must-use.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/must-use.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/must-use.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag {
-  Owned_i32,
-  None_i32,
-};
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-
-typedef struct Owned_Body_i32 {
-  int32_t *_0;
-} Owned_Body_i32;
-
-typedef struct MaybeOwnedPtr_i32 {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    Owned_Body_i32 owned;
-  };
-} MaybeOwnedPtr_i32;
-
-typedef struct MUST_USE_STRUCT OwnedPtr_i32 {
-  int32_t *ptr;
-} OwnedPtr_i32;
-
-MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/must-use.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/must-use.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/must-use.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/must-use.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Owned_i32,
-  None_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-#endif // __cplusplus
-
-typedef struct Owned_Body_i32 {
-  int32_t *_0;
-} Owned_Body_i32;
-
-typedef struct MaybeOwnedPtr_i32 {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    Owned_Body_i32 owned;
-  };
-} MaybeOwnedPtr_i32;
-
-typedef struct MUST_USE_STRUCT OwnedPtr_i32 {
-  int32_t *ptr;
-} OwnedPtr_i32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define ZOM 3.14
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespace_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace constants {
-#endif // __cplusplus
-
-#define FOO 10
-
-#define ZOM 3.14
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace constants
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define ZOM 3.14
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/namespaces_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace constants {
-namespace test {
-#endif // __cplusplus
-
-#define FOO 10
-
-#define ZOM 3.14
-
-typedef struct Foo {
-  int32_t x[FOO];
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace test
-} // namespace constants
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nested_import.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nested_import.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nested_import.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nested_import.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nested_import.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nested_import.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nested_import.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nested_import.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/no_includes.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/no_includes.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/no_includes.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/no_includes.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/no_includes.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/no_includes.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/no_includes.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/no_includes.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#ifdef __clang__
-#define CBINDGEN_NONNULL _Nonnull
-#else
-#define CBINDGEN_NONNULL
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct References {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
-typedef struct Pointers_u64 {
-  float *CBINDGEN_NONNULL a;
-  uint64_t *CBINDGEN_NONNULL b;
-  Opaque *CBINDGEN_NONNULL c;
-  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
-  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
-  Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t *CBINDGEN_NONNULL *i;
-  const uint64_t *j;
-  uint64_t *k;
-} Pointers_u64;
-
-void value_arg(References arg);
-
-void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
-                    Pointers_u64 *foo,
-                    Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
-
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void optional_ref_arg(const Pointers_u64 *arg);
-
-void optional_mut_ref_arg(Pointers_u64 *arg);
-
-void nullable_const_ptr(const Pointers_u64 *arg);
-
-void nullable_mut_ptr(Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull_attribute.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-#ifdef __clang__
-#define CBINDGEN_NONNULL _Nonnull
-#else
-#define CBINDGEN_NONNULL
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct References {
-  const Opaque *CBINDGEN_NONNULL a;
-  Opaque *CBINDGEN_NONNULL b;
-  const Opaque *c;
-  Opaque *d;
-} References;
-
-typedef struct Pointers_u64 {
-  float *CBINDGEN_NONNULL a;
-  uint64_t *CBINDGEN_NONNULL b;
-  Opaque *CBINDGEN_NONNULL c;
-  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
-  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
-  Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t *CBINDGEN_NONNULL *i;
-  const uint64_t *j;
-  uint64_t *k;
-} Pointers_u64;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void value_arg(References arg);
-
-void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
-                    Pointers_u64 *foo,
-                    Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
-
-void ref_arg(const Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void mut_ref_arg(Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void optional_ref_arg(const Pointers_u64 *arg);
-
-void optional_mut_ref_arg(Pointers_u64 *arg);
-
-void nullable_const_ptr(const Pointers_u64 *arg);
-
-void nullable_mut_ptr(Pointers_u64 *arg);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Foo_u64 {
-  float *a;
-  uint64_t *b;
-  Opaque *c;
-  uint64_t **d;
-  float **e;
-  Opaque **f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t **i;
-} Foo_u64;
-
-void root(int32_t *arg, Foo_u64 *foo, Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/nonnull.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/nonnull.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Foo_u64 {
-  float *a;
-  uint64_t *b;
-  Opaque *c;
-  uint64_t **d;
-  float **e;
-  Opaque **f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t **i;
-} Foo_u64;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(int32_t *arg, Foo_u64 *foo, Opaque **d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#ifdef __cplusplus
-// These could be added as opaque types I guess.
-template <typename T>
-struct BuildHasherDefault;
-
-struct DefaultHasher;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
-
-typedef struct Result_Foo Result_Foo;
-
-/**
- * Fast hash map used internally.
- */
-typedef HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
-
-typedef FastHashMap_i32__i32 Foo;
-
-typedef Result_Foo Bar;
-
-void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#ifdef __cplusplus
-// These could be added as opaque types I guess.
-template <typename T>
-struct BuildHasherDefault;
-
-struct DefaultHasher;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
-
-typedef struct Result_Foo Result_Foo;
-
-/**
- * Fast hash map used internally.
- */
-typedef HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
-
-typedef FastHashMap_i32__i32 Foo;
-
-typedef Result_Foo Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const Bar *b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/pragma_once.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/pragma_once.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/pragma_once.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/pragma_once.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/pragma_once.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/pragma_once.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/pragma_once.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/pragma_once.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefix.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefix.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefix.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefix.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define PREFIX_LEN 22
-
-#define PREFIX_X (22 << 22)
-
-#define PREFIX_Y (PREFIX_X + PREFIX_X)
-
-typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
-
-typedef int32_t PREFIX_ValuedLenArray[22];
-
-enum PREFIX_AbsoluteFontWeight_Tag {
-  Weight,
-  Normal,
-  Bold,
-};
-typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
-
-typedef struct PREFIX_Weight_Body {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-} PREFIX_Weight_Body;
-
-typedef union PREFIX_AbsoluteFontWeight {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  PREFIX_Weight_Body weight;
-} PREFIX_AbsoluteFontWeight;
-
-void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefix.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefix.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefix.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefix.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define PREFIX_LEN 22
-
-#define PREFIX_X (22 << 22)
-
-#define PREFIX_Y (PREFIX_X + PREFIX_X)
-
-typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
-
-typedef int32_t PREFIX_ValuedLenArray[22];
-
-enum PREFIX_AbsoluteFontWeight_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Weight,
-  Normal,
-  Bold,
-};
-#ifndef __cplusplus
-typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
-#endif // __cplusplus
-
-typedef struct PREFIX_Weight_Body {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-} PREFIX_Weight_Body;
-
-typedef union PREFIX_AbsoluteFontWeight {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  PREFIX_Weight_Body weight;
-} PREFIX_AbsoluteFontWeight;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, PREFIX_AbsoluteFontWeight z);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-} PREFIXFoo;
-#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
-
-#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
-
-void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-} PREFIXFoo;
-#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
-
-#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(PREFIXFoo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct PREFIXBar {
-  int32_t a;
-} PREFIXBar;
-
-typedef struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-  PREFIXBar bar;
-} PREFIXFoo;
-
-#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
-
-void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/prefixed_struct_literal_deep.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct PREFIXBar {
-  int32_t a;
-} PREFIXBar;
-
-typedef struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-  PREFIXBar bar;
-} PREFIXFoo;
-
-#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(PREFIXFoo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void ptr_as_array(uint32_t n, const uint32_t arg[3], const uint64_t *v);
-
-void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
-
-void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
-
-void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
-
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/ptrs_as_arrays.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void ptr_as_array(uint32_t n, const uint32_t arg[3], const uint64_t *v);
-
-void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
-
-void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
-
-void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
-
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/raw_lines.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/raw_lines.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/raw_lines.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/raw_lines.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#define VERSION 1
-
-void root(void);
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/raw_lines.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/raw_lines.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/raw_lines.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/raw_lines.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#define VERSION 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define C_H 10
-
-enum C_E {
-  x = 0,
-  y = 1,
-};
-typedef uint8_t C_E;
-
-typedef struct C_A C_A;
-
-typedef struct C_C C_C;
-
-typedef struct C_AwesomeB {
-  int32_t x;
-  float y;
-} C_AwesomeB;
-
-typedef union C_D {
-  int32_t x;
-  float y;
-} C_D;
-
-typedef C_A C_F;
-
-#define C_I (intptr_t)(C_F*)10
-
-extern const int32_t G;
-
-void root(const C_A *a, C_AwesomeB b, C_C c, C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define C_H 10
-
-enum C_E
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  x = 0,
-  y = 1,
-};
-#ifndef __cplusplus
-typedef uint8_t C_E;
-#endif // __cplusplus
-
-typedef struct C_A C_A;
-
-typedef struct C_C C_C;
-
-typedef struct C_AwesomeB {
-  int32_t x;
-  float y;
-} C_AwesomeB;
-
-typedef union C_D {
-  int32_t x;
-  float y;
-} C_D;
-
-typedef C_A C_F;
-
-#define C_I (intptr_t)(C_F*)10
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const int32_t G;
-
-void root(const C_A *a, C_AwesomeB b, C_C c, C_D d, C_E e, C_F f);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename-crate.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename-crate.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename-crate.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename-crate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-
-typedef struct RenamedTy {
-  uint64_t y;
-} RenamedTy;
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct NoExternTy {
-  uint8_t field;
-} NoExternTy;
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct ContainsNoExternTy {
-  NoExternTy field;
-} ContainsNoExternTy;
-#endif
-
-#if defined(DEFINE_FREEBSD)
-typedef struct ContainsNoExternTy {
-  uint64_t field;
-} ContainsNoExternTy;
-#endif
-
-void root(Foo a);
-
-void renamed_func(RenamedTy a);
-
-void no_extern_func(ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename-crate.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename-crate.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/rename-crate.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/rename-crate.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo {
-  int32_t x;
-} Foo;
-
-typedef struct RenamedTy {
-  uint64_t y;
-} RenamedTy;
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct NoExternTy {
-  uint8_t field;
-} NoExternTy;
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct ContainsNoExternTy {
-  NoExternTy field;
-} ContainsNoExternTy;
-#endif
-
-#if defined(DEFINE_FREEBSD)
-typedef struct ContainsNoExternTy {
-  uint64_t field;
-} ContainsNoExternTy;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-void renamed_func(RenamedTy a);
-
-void no_extern_func(ContainsNoExternTy a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StyleA StyleA;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-void root(const StyleA *a, B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/renaming-overrides-prefixing.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StyleA StyleA;
-
-typedef struct B {
-  int32_t x;
-  float y;
-} B;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const StyleA *a, B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/reserved.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/reserved.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/reserved.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/reserved.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  int32_t namespace_;
-  float float_;
-} A;
-
-typedef struct B {
-  int32_t namespace_;
-  float float_;
-} B;
-
-enum C_Tag {
-  D,
-};
-typedef uint8_t C_Tag;
-
-typedef struct D_Body {
-  int32_t namespace_;
-  float float_;
-} D_Body;
-
-typedef struct C {
-  C_Tag tag;
-  union {
-    D_Body d;
-  };
-} C;
-
-enum E_Tag {
-  Double,
-  Float,
-};
-typedef uint8_t E_Tag;
-
-typedef struct Double_Body {
-  double _0;
-} Double_Body;
-
-typedef struct Float_Body {
-  float _0;
-} Float_Body;
-
-typedef struct E {
-  E_Tag tag;
-  union {
-    Double_Body double_;
-    Float_Body float_;
-  };
-} E;
-
-enum F_Tag {
-  double_,
-  float_,
-};
-typedef uint8_t F_Tag;
-
-typedef struct double_Body {
-  double _0;
-} double_Body;
-
-typedef struct float_Body {
-  float _0;
-} float_Body;
-
-typedef struct F {
-  F_Tag tag;
-  union {
-    double_Body double_;
-    float_Body float_;
-  };
-} F;
-
-void root(A a, B b, C c, E e, F f, int32_t namespace_, float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/reserved.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/reserved.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/reserved.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/reserved.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A {
-  int32_t namespace_;
-  float float_;
-} A;
-
-typedef struct B {
-  int32_t namespace_;
-  float float_;
-} B;
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  D,
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-typedef struct D_Body {
-  int32_t namespace_;
-  float float_;
-} D_Body;
-
-typedef struct C {
-  C_Tag tag;
-  union {
-    D_Body d;
-  };
-} C;
-
-enum E_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Double,
-  Float,
-};
-#ifndef __cplusplus
-typedef uint8_t E_Tag;
-#endif // __cplusplus
-
-typedef struct Double_Body {
-  double _0;
-} Double_Body;
-
-typedef struct Float_Body {
-  float _0;
-} Float_Body;
-
-typedef struct E {
-  E_Tag tag;
-  union {
-    Double_Body double_;
-    Float_Body float_;
-  };
-} E;
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  double_,
-  float_,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-typedef struct double_Body {
-  double _0;
-} double_Body;
-
-typedef struct float_Body {
-  float _0;
-} float_Body;
-
-typedef struct F {
-  F_Tag tag;
-  union {
-    double_Body double_;
-    float_Body float_;
-  };
-} F;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A a, B b, C c, E e, F f, int32_t namespace_, float float_);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/sentinel.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/sentinel.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/sentinel.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/sentinel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A {
-  A_A1,
-  A_A2,
-  A_A3,
-  /**
-   * Must be last for serialization purposes
-   */
-  A_Sentinel,
-};
-typedef uint8_t A;
-
-enum B {
-  B_B1,
-  B_B2,
-  B_B3,
-  /**
-   * Must be last for serialization purposes
-   */
-  B_Sentinel,
-};
-typedef uint8_t B;
-
-enum C_Tag {
-  C_C1,
-  C_C2,
-  C_C3,
-  /**
-   * Must be last for serialization purposes
-   */
-  C_Sentinel,
-};
-typedef uint8_t C_Tag;
-
-typedef struct C_C1_Body {
-  C_Tag tag;
-  uint32_t a;
-} C_C1_Body;
-
-typedef struct C_C2_Body {
-  C_Tag tag;
-  uint32_t b;
-} C_C2_Body;
-
-typedef union C {
-  C_Tag tag;
-  C_C1_Body c1;
-  C_C2_Body c2;
-} C;
-
-void root(A a, B b, C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/sentinel.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/sentinel.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/sentinel.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/sentinel.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  A_A1,
-  A_A2,
-  A_A3,
-  /**
-   * Must be last for serialization purposes
-   */
-  A_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t A;
-#endif // __cplusplus
-
-enum B
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  B_B1,
-  B_B2,
-  B_B3,
-  /**
-   * Must be last for serialization purposes
-   */
-  B_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t B;
-#endif // __cplusplus
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  C_C1,
-  C_C2,
-  C_C3,
-  /**
-   * Must be last for serialization purposes
-   */
-  C_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-typedef struct C_C1_Body {
-  C_Tag tag;
-  uint32_t a;
-} C_C1_Body;
-
-typedef struct C_C2_Body {
-  C_Tag tag;
-  uint32_t b;
-} C_C2_Body;
-
-typedef union C {
-  C_Tag tag;
-  C_C1_Body c1;
-  C_C2_Body c2;
-} C;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A a, B b, C c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Foo {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Foo;
-
-typedef union Bar {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Bar;
-
-void root(const Opaque *a, Opaque *b, Foo c, Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/simplify-option-ptr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Foo {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Foo;
-
-typedef union Bar {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Opaque *a, Opaque *b, Foo c, Bar d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/static.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/static.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/static.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/static.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar Bar;
-
-typedef struct Foo {
-
-} Foo;
-
-extern const int32_t NUMBER;
-
-extern Foo FOO;
-
-extern const Bar BAR;
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/static.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/static.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/static.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/static.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar Bar;
-
-typedef struct Foo {
-
-} Foo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const int32_t NUMBER;
-
-extern Foo FOO;
-
-extern const Bar BAR;
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/std_lib.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/std_lib.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/std_lib.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/std_lib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Option_i32 Option_i32;
-
-typedef struct Result_i32__String Result_i32__String;
-
-typedef struct Vec_String Vec_String;
-
-void root(const Vec_String *a, const Option_i32 *b, const Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/std_lib.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/std_lib.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/std_lib.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/std_lib.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Option_i32 Option_i32;
-
-typedef struct Result_i32__String Result_i32__String;
-
-typedef struct Vec_String Vec_String;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Vec_String *a, const Option_i32 *b, const Result_i32__String *c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-typedef struct NormalWithZST {
-  int32_t x;
-  float y;
-} NormalWithZST;
-
-typedef struct TupleRenamed {
-  int32_t m0;
-  float m1;
-} TupleRenamed;
-
-typedef struct TupleNamed {
-  int32_t x;
-  float y;
-} TupleNamed;
-
-void root(Opaque *a, Normal b, NormalWithZST c, TupleRenamed d, TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-typedef struct NormalWithZST {
-  int32_t x;
-  float y;
-} NormalWithZST;
-
-typedef struct TupleRenamed {
-  int32_t m0;
-  float m1;
-} TupleRenamed;
-
-typedef struct TupleNamed {
-  int32_t x;
-  float y;
-} TupleNamed;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Opaque *a, Normal b, NormalWithZST c, TupleRenamed d, TupleNamed e);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar Bar;
-
-typedef struct Foo {
-  int32_t a;
-  uint32_t b;
-} Foo;
-#define Foo_FOO (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
-
-
-#define BAR (Foo){ .a = 42, .b = 1337 }
-
-
-
-void root(Foo x, Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar Bar;
-
-typedef struct Foo {
-  int32_t a;
-  uint32_t b;
-} Foo;
-#define Foo_FOO (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
-
-
-#define BAR (Foo){ .a = 42, .b = 1337 }
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo x, Bar bar);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct ABC {
-  float a;
-  uint32_t b;
-  uint32_t c;
-} ABC;
-#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
-
-typedef struct BAC {
-  uint32_t b;
-  float a;
-  int32_t c;
-} BAC;
-#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
-
-void root(ABC a1, BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_literal_order.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct ABC {
-  float a;
-  uint32_t b;
-  uint32_t c;
-} ABC;
-#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
-
-typedef struct BAC {
-  uint32_t b;
-  float a;
-  int32_t c;
-} BAC;
-#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(ABC a1, BAC a2);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-typedef struct Bar {
-  int32_t something;
-  Foo_Bar subexpressions;
-} Bar;
-
-void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/struct_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/struct_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-typedef struct Bar {
-  int32_t something;
-  Foo_Bar subexpressions;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/style-crash.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/style-crash.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/style-crash.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/style-crash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/style-crash.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/style-crash.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/style-crash.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/style-crash.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/swift_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/swift_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/swift_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/swift_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct SelfTypeTestStruct {
-  uint8_t times;
-} SelfTypeTestStruct;
-
-typedef struct PointerToOpaque {
-  Opaque *ptr;
-} PointerToOpaque;
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void unnamed_argument(SelfTypeTestStruct*);
-
-void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
-
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/swift_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/swift_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/swift_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/swift_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct SelfTypeTestStruct {
-  uint8_t times;
-} SelfTypeTestStruct;
-
-typedef struct PointerToOpaque {
-  Opaque *ptr;
-} PointerToOpaque;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void unnamed_argument(SelfTypeTestStruct*);
-
-void free_function_should_not_exist_box(SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
-
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transform-op.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transform-op.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transform-op.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transform-op.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StylePoint_i32 {
-  int32_t x;
-  int32_t y;
-} StylePoint_i32;
-
-typedef struct StylePoint_f32 {
-  float x;
-  float y;
-} StylePoint_f32;
-
-enum StyleFoo_i32_Tag {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-typedef uint8_t StyleFoo_i32_Tag;
-
-typedef struct StyleFoo_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-} StyleFoo_Body_i32;
-
-typedef struct StyleBar_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-} StyleBar_Body_i32;
-
-typedef struct StyleBaz_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz_Body_i32;
-
-typedef union StyleFoo_i32 {
-  StyleFoo_i32_Tag tag;
-  StyleFoo_Body_i32 foo;
-  StyleBar_Body_i32 bar;
-  StyleBaz_Body_i32 baz;
-} StyleFoo_i32;
-
-typedef enum StyleBar_i32_Tag {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-} StyleBar_i32_Tag;
-
-typedef struct StyleBar1_Body_i32 {
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_i32;
-
-typedef struct StyleBar2_Body_i32 {
-  int32_t _0;
-} StyleBar2_Body_i32;
-
-typedef struct StyleBar3_Body_i32 {
-  StylePoint_i32 _0;
-} StyleBar3_Body_i32;
-
-typedef struct StyleBar_i32 {
-  StyleBar_i32_Tag tag;
-  union {
-    StyleBar1_Body_i32 bar1;
-    StyleBar2_Body_i32 bar2;
-    StyleBar3_Body_i32 bar3;
-  };
-} StyleBar_i32;
-
-typedef struct StylePoint_u32 {
-  uint32_t x;
-  uint32_t y;
-} StylePoint_u32;
-
-typedef enum StyleBar_u32_Tag {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-} StyleBar_u32_Tag;
-
-typedef struct StyleBar1_Body_u32 {
-  int32_t x;
-  StylePoint_u32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_u32;
-
-typedef struct StyleBar2_Body_u32 {
-  uint32_t _0;
-} StyleBar2_Body_u32;
-
-typedef struct StyleBar3_Body_u32 {
-  StylePoint_u32 _0;
-} StyleBar3_Body_u32;
-
-typedef struct StyleBar_u32 {
-  StyleBar_u32_Tag tag;
-  union {
-    StyleBar1_Body_u32 bar1;
-    StyleBar2_Body_u32 bar2;
-    StyleBar3_Body_u32 bar3;
-  };
-} StyleBar_u32;
-
-enum StyleBaz_Tag {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-typedef uint8_t StyleBaz_Tag;
-
-typedef struct StyleBaz1_Body {
-  StyleBaz_Tag tag;
-  StyleBar_u32 _0;
-} StyleBaz1_Body;
-
-typedef struct StyleBaz2_Body {
-  StyleBaz_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz2_Body;
-
-typedef union StyleBaz {
-  StyleBaz_Tag tag;
-  StyleBaz1_Body baz1;
-  StyleBaz2_Body baz2;
-} StyleBaz;
-
-enum StyleTaz_Tag {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-typedef uint8_t StyleTaz_Tag;
-
-typedef struct StyleTaz1_Body {
-  StyleBar_u32 _0;
-} StyleTaz1_Body;
-
-typedef struct StyleTaz2_Body {
-  StyleBaz _0;
-} StyleTaz2_Body;
-
-typedef struct StyleTaz {
-  StyleTaz_Tag tag;
-  union {
-    StyleTaz1_Body taz1;
-    StyleTaz2_Body taz2;
-  };
-} StyleTaz;
-
-void foo(const StyleFoo_i32 *foo,
-         const StyleBar_i32 *bar,
-         const StyleBaz *baz,
-         const StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transform-op.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transform-op.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transform-op.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transform-op.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StylePoint_i32 {
-  int32_t x;
-  int32_t y;
-} StylePoint_i32;
-
-typedef struct StylePoint_f32 {
-  float x;
-  float y;
-} StylePoint_f32;
-
-enum StyleFoo_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleFoo_i32_Tag;
-#endif // __cplusplus
-
-typedef struct StyleFoo_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-} StyleFoo_Body_i32;
-
-typedef struct StyleBar_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-} StyleBar_Body_i32;
-
-typedef struct StyleBaz_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz_Body_i32;
-
-typedef union StyleFoo_i32 {
-  StyleFoo_i32_Tag tag;
-  StyleFoo_Body_i32 foo;
-  StyleBar_Body_i32 bar;
-  StyleBaz_Body_i32 baz;
-} StyleFoo_i32;
-
-typedef enum StyleBar_i32_Tag {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-} StyleBar_i32_Tag;
-
-typedef struct StyleBar1_Body_i32 {
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_i32;
-
-typedef struct StyleBar2_Body_i32 {
-  int32_t _0;
-} StyleBar2_Body_i32;
-
-typedef struct StyleBar3_Body_i32 {
-  StylePoint_i32 _0;
-} StyleBar3_Body_i32;
-
-typedef struct StyleBar_i32 {
-  StyleBar_i32_Tag tag;
-  union {
-    StyleBar1_Body_i32 bar1;
-    StyleBar2_Body_i32 bar2;
-    StyleBar3_Body_i32 bar3;
-  };
-} StyleBar_i32;
-
-typedef struct StylePoint_u32 {
-  uint32_t x;
-  uint32_t y;
-} StylePoint_u32;
-
-typedef enum StyleBar_u32_Tag {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-} StyleBar_u32_Tag;
-
-typedef struct StyleBar1_Body_u32 {
-  int32_t x;
-  StylePoint_u32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_u32;
-
-typedef struct StyleBar2_Body_u32 {
-  uint32_t _0;
-} StyleBar2_Body_u32;
-
-typedef struct StyleBar3_Body_u32 {
-  StylePoint_u32 _0;
-} StyleBar3_Body_u32;
-
-typedef struct StyleBar_u32 {
-  StyleBar_u32_Tag tag;
-  union {
-    StyleBar1_Body_u32 bar1;
-    StyleBar2_Body_u32 bar2;
-    StyleBar3_Body_u32 bar3;
-  };
-} StyleBar_u32;
-
-enum StyleBaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleBaz_Tag;
-#endif // __cplusplus
-
-typedef struct StyleBaz1_Body {
-  StyleBaz_Tag tag;
-  StyleBar_u32 _0;
-} StyleBaz1_Body;
-
-typedef struct StyleBaz2_Body {
-  StyleBaz_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz2_Body;
-
-typedef union StyleBaz {
-  StyleBaz_Tag tag;
-  StyleBaz1_Body baz1;
-  StyleBaz2_Body baz2;
-} StyleBaz;
-
-enum StyleTaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleTaz_Tag;
-#endif // __cplusplus
-
-typedef struct StyleTaz1_Body {
-  StyleBar_u32 _0;
-} StyleTaz1_Body;
-
-typedef struct StyleTaz2_Body {
-  StyleBaz _0;
-} StyleTaz2_Body;
-
-typedef struct StyleTaz {
-  StyleTaz_Tag tag;
-  union {
-    StyleTaz1_Body taz1;
-    StyleTaz2_Body taz2;
-  };
-} StyleTaz;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(const StyleFoo_i32 *foo,
-         const StyleBar_i32 *bar,
-         const StyleBaz *baz,
-         const StyleTaz *taz);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transparent.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transparent.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transparent.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transparent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct DummyStruct DummyStruct;
-
-typedef struct EnumWithAssociatedConstantInImpl EnumWithAssociatedConstantInImpl;
-
-typedef DummyStruct TransparentComplexWrappingStructTuple;
-
-typedef uint32_t TransparentPrimitiveWrappingStructTuple;
-
-typedef DummyStruct TransparentComplexWrappingStructure;
-
-typedef uint32_t TransparentPrimitiveWrappingStructure;
-
-typedef DummyStruct TransparentComplexWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
-#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
-#define TransparentPrimitiveWithAssociatedConstants_ONE 1
-
-#define EnumWithAssociatedConstantInImpl_TEN 10
-
-void root(TransparentComplexWrappingStructTuple a,
-          TransparentPrimitiveWrappingStructTuple b,
-          TransparentComplexWrappingStructure c,
-          TransparentPrimitiveWrappingStructure d,
-          TransparentComplexWrapper_i32 e,
-          TransparentPrimitiveWrapper_i32 f,
-          TransparentPrimitiveWithAssociatedConstants g,
-          EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transparent.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transparent.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/transparent.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/transparent.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct DummyStruct DummyStruct;
-
-typedef struct EnumWithAssociatedConstantInImpl EnumWithAssociatedConstantInImpl;
-
-typedef DummyStruct TransparentComplexWrappingStructTuple;
-
-typedef uint32_t TransparentPrimitiveWrappingStructTuple;
-
-typedef DummyStruct TransparentComplexWrappingStructure;
-
-typedef uint32_t TransparentPrimitiveWrappingStructure;
-
-typedef DummyStruct TransparentComplexWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
-#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
-#define TransparentPrimitiveWithAssociatedConstants_ONE 1
-
-#define EnumWithAssociatedConstantInImpl_TEN 10
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(TransparentComplexWrappingStructTuple a,
-          TransparentPrimitiveWrappingStructTuple b,
-          TransparentComplexWrappingStructure c,
-          TransparentPrimitiveWrappingStructure d,
-          TransparentComplexWrapper_i32 e,
-          TransparentPrimitiveWrapper_i32 f,
-          TransparentPrimitiveWithAssociatedConstants g,
-          EnumWithAssociatedConstantInImpl h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/typedef.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/typedef.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/typedef.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/typedef.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_i32__i32 {
-  int32_t x;
-  int32_t y;
-} Foo_i32__i32;
-
-typedef Foo_i32__i32 IntFoo_i32;
-
-void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/typedef.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/typedef.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/typedef.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/typedef.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_i32__i32 {
-  int32_t x;
-  int32_t y;
-} Foo_i32__i32;
-
-typedef Foo_i32__i32 IntFoo_i32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(IntFoo_i32 a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef union Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-typedef union NormalWithZST {
-  int32_t x;
-  float y;
-} NormalWithZST;
-
-void root(Opaque *a, Normal b, NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef union Normal {
-  int32_t x;
-  float y;
-} Normal;
-
-typedef union NormalWithZST {
-  int32_t x;
-  float y;
-} NormalWithZST;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Opaque *a, Normal b, NormalWithZST c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-typedef union Bar {
-  int32_t something;
-  Foo_Bar subexpressions;
-} Bar;
-
-void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/union_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/union_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Foo_Bar {
-  const int32_t *something;
-} Foo_Bar;
-
-typedef union Bar {
-  int32_t something;
-  Foo_Bar subexpressions;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/using_namespaces.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace root {
-#endif // __cplusplus
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace root
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/va_list.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/va_list.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/va_list.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/va_list.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-int32_t va_list_test(va_list ap);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/va_list.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/va_list.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/va_list.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/va_list.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-int32_t va_list_test(va_list ap);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/workspace.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/workspace.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/workspace.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/workspace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXT_CONST 0
-
-typedef struct ExtType {
-  uint32_t data;
-} ExtType;
-
-void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/workspace.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/workspace.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/both/workspace.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/both/workspace.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXT_CONST 0
-
-typedef struct ExtType {
-  uint32_t data;
-} ExtType;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void consume_ext(ExtType _ext);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
+
+typedef struct NotReprC_Box_i32 Foo;
+
+typedef struct MyStruct {
+  int32_t *number;
+} MyStruct;
+
+void root(const Foo *a, const struct MyStruct *with_box);
+
+void drop_box(int32_t *x);
+
+void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_Box_i32 NotReprC_Box_i32;
+
+typedef struct NotReprC_Box_i32 Foo;
+
+typedef struct MyStruct {
+  int32_t *number;
+} MyStruct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_box);
+
+void drop_box(int32_t *x);
+
+void drop_box_opt(int32_t *x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using Box = T*;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using Box = T*;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using Box = T*;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <cstdarg>
 #include <cstdint>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct NotReprC_Box_i32:
+    pass
+
+  ctypedef NotReprC_Box_i32 Foo;
+
+  ctypedef struct MyStruct:
+    int32_t *number;
+
+  void root(const Foo *a, const MyStruct *with_box);
+
+  void drop_box(int32_t *x);
+
+  void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_Box_i32;
+
+typedef struct NotReprC_Box_i32 Foo;
+
+struct MyStruct {
+  int32_t *number;
+};
+
+void root(const Foo *a, const struct MyStruct *with_box);
+
+void drop_box(int32_t *x);
+
+void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_Box_i32;
+
+typedef struct NotReprC_Box_i32 Foo;
+
+struct MyStruct {
+  int32_t *number;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_box);
+
+void drop_box(int32_t *x);
+
+void drop_box_opt(int32_t *x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/box.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/box.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using Box = T*;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct NotReprC_Box_i32:
+    pass
+
+  ctypedef NotReprC_Box_i32 Foo;
+
+  cdef struct MyStruct:
+    int32_t *number;
+
+  void root(const Foo *a, const MyStruct *with_box);
+
+  void drop_box(int32_t *x);
+
+  void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cdecl.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cdecl.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cdecl.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cdecl.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,41 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef void (*A)();
+
+  ctypedef void (*B)();
+
+  ctypedef bool (*C)(int32_t, int32_t);
+
+  ctypedef bool (*(*D)(int32_t))(float);
+
+  ctypedef const int32_t (*(*E)())[16];
+
+  ctypedef const int32_t *F;
+
+  ctypedef const int32_t *const *G;
+
+  ctypedef int32_t *const *H;
+
+  ctypedef const int32_t (*I)[16];
+
+  ctypedef double (**J)(float);
+
+  ctypedef int32_t K[16];
+
+  ctypedef const int32_t *L[16];
+
+  ctypedef bool (*M[16])(int32_t, int32_t);
+
+  ctypedef void (*N[16])(int32_t, int32_t);
+
+  ctypedef void (*P)(int32_t named1st, bool, bool named3rd, int32_t _);
+
+  void (*O())();
+
+  void root(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l, M m, N n, P p);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
+
+typedef struct NotReprC_RefCell_i32 Foo;
+
+typedef struct MyStruct {
+  int32_t number;
+} MyStruct;
+
+void root(const Foo *a, const struct MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_RefCell_i32 NotReprC_RefCell_i32;
+
+typedef struct NotReprC_RefCell_i32 Foo;
+
+typedef struct MyStruct {
+  int32_t number;
+} MyStruct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_cell);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct NotReprC_RefCell_i32:
+    pass
+
+  ctypedef NotReprC_RefCell_i32 Foo;
+
+  ctypedef struct MyStruct:
+    int32_t number;
+
+  void root(const Foo *a, const MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_RefCell_i32;
+
+typedef struct NotReprC_RefCell_i32 Foo;
+
+struct MyStruct {
+  int32_t number;
+};
+
+void root(const Foo *a, const struct MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_RefCell_i32;
+
+typedef struct NotReprC_RefCell_i32 Foo;
+
+struct MyStruct {
+  int32_t number;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_cell);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cell.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cell.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct NotReprC_RefCell_i32:
+    pass
+
+  ctypedef NotReprC_RefCell_i32 Foo;
+
+  cdef struct MyStruct:
+    int32_t number;
+
+  void root(const Foo *a, const MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,42 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+typedef struct Foo {
+  int32_t x;
+} Foo;
+#endif
+
+#if defined(NOT_DEFINED)
+typedef struct Bar {
+  struct Foo y;
+} Bar;
+#endif
+
+#if defined(DEFINED)
+typedef struct Bar {
+  struct Foo z;
+} Bar;
+#endif
+
+typedef struct Root {
+  struct Bar w;
+} Root;
+
+void root(struct Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+typedef struct Foo {
+  int32_t x;
+} Foo;
+#endif
+
+#if defined(NOT_DEFINED)
+typedef struct Bar {
+  struct Foo y;
+} Bar;
+#endif
+
+#if defined(DEFINED)
+typedef struct Bar {
+  struct Foo z;
+} Bar;
+#endif
+
+typedef struct Root {
+  struct Bar w;
+} Root;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Root a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,42 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+typedef struct {
+  int32_t x;
+} Foo;
+#endif
+
+#if defined(NOT_DEFINED)
+typedef struct {
+  Foo y;
+} Bar;
+#endif
+
+#if defined(DEFINED)
+typedef struct {
+  Foo z;
+} Bar;
+#endif
+
+typedef struct {
+  Bar w;
+} Root;
+
+void root(Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-typedef struct {
-  int32_t x;
-} Foo;
-#endif
-
-#if defined(NOT_DEFINED)
-typedef struct {
-  Foo y;
-} Bar;
-#endif
-
-#if defined(DEFINED)
-typedef struct {
-  Foo z;
-} Bar;
-#endif
-
-typedef struct {
-  Bar w;
-} Root;
-
-void root(Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+typedef struct {
+  int32_t x;
+} Foo;
+#endif
+
+#if defined(NOT_DEFINED)
+typedef struct {
+  Foo y;
+} Bar;
+#endif
+
+#if defined(DEFINED)
+typedef struct {
+  Foo z;
+} Bar;
+#endif
+
+typedef struct {
+  Bar w;
+} Root;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Root a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-typedef struct {
-  int32_t x;
-} Foo;
-#endif
-
-#if defined(NOT_DEFINED)
-typedef struct {
-  Foo y;
-} Bar;
-#endif
-
-#if defined(DEFINED)
-typedef struct {
-  Foo z;
-} Bar;
-#endif
-
-typedef struct {
-  Bar w;
-} Root;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Root a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,47 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+#if defined(NOT_DEFINED)
+static const int32_t DEFAULT_X = 8;
+#endif
+
+#if defined(DEFINED)
+static const int32_t DEFAULT_X = 42;
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+struct Foo {
+  int32_t x;
+};
+#endif
+
+#if defined(NOT_DEFINED)
+struct Bar {
+  Foo y;
+};
+#endif
+
+#if defined(DEFINED)
+struct Bar {
+  Foo z;
+};
+#endif
+
+struct Root {
+  Bar w;
+};
+
+extern "C" {
+
+void root(Root a);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-2.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-2.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-#if defined(NOT_DEFINED)
-static const int32_t DEFAULT_X = 8;
-#endif
-
-#if defined(DEFINED)
-static const int32_t DEFAULT_X = 42;
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-struct Foo {
-  int32_t x;
-};
-#endif
-
-#if defined(NOT_DEFINED)
-struct Bar {
-  Foo y;
-};
-#endif
-
-#if defined(DEFINED)
-struct Bar {
-  Foo z;
-};
-#endif
-
-struct Root {
-  Bar w;
-};
-
-extern "C" {
-
-void root(Root a);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF NOT_DEFINED:
+    const int32_t DEFAULT_X # = 8
+
+  IF DEFINED:
+    const int32_t DEFAULT_X # = 42
+
+  IF (NOT_DEFINED or DEFINED):
+    ctypedef struct Foo:
+      int32_t x;
+
+  IF NOT_DEFINED:
+    ctypedef struct Bar:
+      Foo y;
+
+  IF DEFINED:
+    ctypedef struct Bar:
+      Foo z;
+
+  ctypedef struct Root:
+    Bar w;
+
+  void root(Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,42 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+struct Foo {
+  int32_t x;
+};
+#endif
+
+#if defined(NOT_DEFINED)
+struct Bar {
+  struct Foo y;
+};
+#endif
+
+#if defined(DEFINED)
+struct Bar {
+  struct Foo z;
+};
+#endif
+
+struct Root {
+  struct Bar w;
+};
+
+void root(struct Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(NOT_DEFINED)
+#define DEFAULT_X 8
+#endif
+
+#if defined(DEFINED)
+#define DEFAULT_X 42
+#endif
+
+#if (defined(NOT_DEFINED) || defined(DEFINED))
+struct Foo {
+  int32_t x;
+};
+#endif
+
+#if defined(NOT_DEFINED)
+struct Bar {
+  struct Foo y;
+};
+#endif
+
+#if defined(DEFINED)
+struct Bar {
+  struct Foo z;
+};
+#endif
+
+struct Root {
+  struct Bar w;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Root a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_2.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF NOT_DEFINED:
+    const int32_t DEFAULT_X # = 8
+
+  IF DEFINED:
+    const int32_t DEFAULT_X # = 42
+
+  IF (NOT_DEFINED or DEFINED):
+    cdef struct Foo:
+      int32_t x;
+
+  IF NOT_DEFINED:
+    cdef struct Bar:
+      Foo y;
+
+  IF DEFINED:
+    cdef struct Bar:
+      Foo z;
+
+  cdef struct Root:
+    Bar w;
+
+  void root(Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,89 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+enum BarType {
+  A,
+  B,
+  C,
+};
+typedef uint32_t BarType;
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+enum FooType {
+  A,
+  B,
+  C,
+};
+typedef uint32_t FooType;
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+typedef struct FooHandle {
+  FooType ty;
+  int32_t x;
+  float y;
+} FooHandle;
+#endif
+
+enum C_Tag {
+  C1,
+  C2,
+#if defined(PLATFORM_WIN)
+  C3,
+#endif
+#if defined(PLATFORM_UNIX)
+  C5,
+#endif
+};
+typedef uint8_t C_Tag;
+
+#if defined(PLATFORM_UNIX)
+typedef struct C5_Body {
+  C_Tag tag;
+  int32_t int_;
+} C5_Body;
+#endif
+
+typedef union C {
+  C_Tag tag;
+#if defined(PLATFORM_UNIX)
+  C5_Body c5;
+#endif
+} C;
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+typedef struct BarHandle {
+  BarType ty;
+  int32_t x;
+  float y;
+} BarHandle;
+#endif
+
+typedef struct ConditionalField {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+} ConditionalField;
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+void root(struct FooHandle a, union C c);
+#endif
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+void root(struct BarHandle a, union C c);
+#endif
+
+void cond(struct ConditionalField a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,115 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+enum BarType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+  C,
+};
+#ifndef __cplusplus
+typedef uint32_t BarType;
+#endif // __cplusplus
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+enum FooType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+  C,
+};
+#ifndef __cplusplus
+typedef uint32_t FooType;
+#endif // __cplusplus
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+typedef struct FooHandle {
+  FooType ty;
+  int32_t x;
+  float y;
+} FooHandle;
+#endif
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  C1,
+  C2,
+#if defined(PLATFORM_WIN)
+  C3,
+#endif
+#if defined(PLATFORM_UNIX)
+  C5,
+#endif
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+#if defined(PLATFORM_UNIX)
+typedef struct C5_Body {
+  C_Tag tag;
+  int32_t int_;
+} C5_Body;
+#endif
+
+typedef union C {
+  C_Tag tag;
+#if defined(PLATFORM_UNIX)
+  C5_Body c5;
+#endif
+} C;
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+typedef struct BarHandle {
+  BarType ty;
+  int32_t x;
+  float y;
+} BarHandle;
+#endif
+
+typedef struct ConditionalField {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+} ConditionalField;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+void root(struct FooHandle a, union C c);
+#endif
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+void root(struct BarHandle a, union C c);
+#endif
+
+void cond(struct ConditionalField a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,11 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -63,6 +71,13 @@
 } BarHandle;
 #endif
 
+typedef struct {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+} ConditionalField;
+
 #if (defined(PLATFORM_UNIX) && defined(X11))
 void root(FooHandle a, C c);
 #endif
@@ -70,3 +85,5 @@
 #if (defined(PLATFORM_WIN) || defined(M_32))
 void root(BarHandle a, C c);
 #endif
+
+void cond(ConditionalField a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,11 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -81,6 +89,13 @@
 } BarHandle;
 #endif
 
+typedef struct {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+} ConditionalField;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -93,6 +108,8 @@
 void root(BarHandle a, C c);
 #endif
 
+void cond(ConditionalField a);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,11 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
 #include <cstdarg>
 #include <cstdint>
 #include <cstdlib>
@@ -187,6 +195,13 @@
 };
 #endif
 
+struct ConditionalField {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+};
+
 extern "C" {
 
 #if (defined(PLATFORM_UNIX) && defined(X11))
@@ -197,4 +212,6 @@
 void root(BarHandle a, C c);
 #endif
 
+void cond(ConditionalField a);
+
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,4 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,5 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg-field.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg-field.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg_field.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg_field.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,67 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF (PLATFORM_WIN or M_32):
+    cdef enum:
+      A,
+      B,
+      C,
+    ctypedef uint32_t BarType;
+
+  IF (PLATFORM_UNIX and X11):
+    cdef enum:
+      A,
+      B,
+      C,
+    ctypedef uint32_t FooType;
+
+  IF (PLATFORM_UNIX and X11):
+    ctypedef struct FooHandle:
+      FooType ty;
+      int32_t x;
+      float y;
+
+  cdef enum:
+    C1,
+    C2,
+    C3,
+    C5,
+  ctypedef uint8_t C_Tag;
+
+  ctypedef struct C5_Body:
+    C_Tag tag;
+    int32_t int_;
+
+  ctypedef union C:
+    C_Tag tag;
+    C5_Body c5;
+
+  IF (PLATFORM_WIN or M_32):
+    ctypedef struct BarHandle:
+      BarType ty;
+      int32_t x;
+      float y;
+
+  ctypedef struct ConditionalField:
+    int32_t field;
+
+  IF (PLATFORM_UNIX and X11):
+    void root(FooHandle a, C c);
+
+  IF (PLATFORM_WIN or M_32):
+    void root(BarHandle a, C c);
+
+  void cond(ConditionalField a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,89 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+enum BarType {
+  A,
+  B,
+  C,
+};
+typedef uint32_t BarType;
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+enum FooType {
+  A,
+  B,
+  C,
+};
+typedef uint32_t FooType;
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+struct FooHandle {
+  FooType ty;
+  int32_t x;
+  float y;
+};
+#endif
+
+enum C_Tag {
+  C1,
+  C2,
+#if defined(PLATFORM_WIN)
+  C3,
+#endif
+#if defined(PLATFORM_UNIX)
+  C5,
+#endif
+};
+typedef uint8_t C_Tag;
+
+#if defined(PLATFORM_UNIX)
+struct C5_Body {
+  C_Tag tag;
+  int32_t int_;
+};
+#endif
+
+union C {
+  C_Tag tag;
+#if defined(PLATFORM_UNIX)
+  struct C5_Body c5;
+#endif
+};
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+struct BarHandle {
+  BarType ty;
+  int32_t x;
+  float y;
+};
+#endif
+
+struct ConditionalField {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+};
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+void root(struct FooHandle a, union C c);
+#endif
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+void root(struct BarHandle a, union C c);
+#endif
+
+void cond(struct ConditionalField a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,115 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+enum BarType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+  C,
+};
+#ifndef __cplusplus
+typedef uint32_t BarType;
+#endif // __cplusplus
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+enum FooType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+  C,
+};
+#ifndef __cplusplus
+typedef uint32_t FooType;
+#endif // __cplusplus
+#endif
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+struct FooHandle {
+  FooType ty;
+  int32_t x;
+  float y;
+};
+#endif
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  C1,
+  C2,
+#if defined(PLATFORM_WIN)
+  C3,
+#endif
+#if defined(PLATFORM_UNIX)
+  C5,
+#endif
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+#if defined(PLATFORM_UNIX)
+struct C5_Body {
+  C_Tag tag;
+  int32_t int_;
+};
+#endif
+
+union C {
+  C_Tag tag;
+#if defined(PLATFORM_UNIX)
+  struct C5_Body c5;
+#endif
+};
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+struct BarHandle {
+  BarType ty;
+  int32_t x;
+  float y;
+};
+#endif
+
+struct ConditionalField {
+#if defined(X11)
+  int32_t field
+#endif
+  ;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#if (defined(PLATFORM_UNIX) && defined(X11))
+void root(struct FooHandle a, union C c);
+#endif
+
+#if (defined(PLATFORM_WIN) || defined(M_32))
+void root(struct BarHandle a, union C c);
+#endif
+
+void cond(struct ConditionalField a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cfg.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cfg.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,67 @@
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF (PLATFORM_WIN or M_32):
+    cdef enum:
+      A,
+      B,
+      C,
+    ctypedef uint32_t BarType;
+
+  IF (PLATFORM_UNIX and X11):
+    cdef enum:
+      A,
+      B,
+      C,
+    ctypedef uint32_t FooType;
+
+  IF (PLATFORM_UNIX and X11):
+    cdef struct FooHandle:
+      FooType ty;
+      int32_t x;
+      float y;
+
+  cdef enum:
+    C1,
+    C2,
+    C3,
+    C5,
+  ctypedef uint8_t C_Tag;
+
+  cdef struct C5_Body:
+    C_Tag tag;
+    int32_t int_;
+
+  cdef union C:
+    C_Tag tag;
+    C5_Body c5;
+
+  IF (PLATFORM_WIN or M_32):
+    cdef struct BarHandle:
+      BarType ty;
+      int32_t x;
+      float y;
+
+  cdef struct ConditionalField:
+    int32_t field;
+
+  IF (PLATFORM_UNIX and X11):
+    void root(FooHandle a, C c);
+
+  IF (PLATFORM_WIN or M_32):
+    void root(BarHandle a, C c);
+
+  void cond(ConditionalField a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint32_t a;
+} Foo;
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint32_t a;
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    uint32_t a;
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint32_t a;
+};
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint32_t a;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/char.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/char.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    uint32_t a;
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_big.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_big.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_big.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_big.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
-
-#define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
-
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_big.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_big.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_big.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_big.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint64_t UNSIGNED_NEEDS_ULL_SUFFIX # = 9223372036854775808ULL
+
+  const uint64_t UNSIGNED_DOESNT_NEED_ULL_SUFFIX # = 8070450532247928832
+
+  const int64_t SIGNED_NEEDS_ULL_SUFFIX # = -9223372036854775808ULL
+
+  const int64_t SIGNED_DOESNT_NEED_ULL_SUFFIX # = -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,53 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+#define QUOTE '\''
+
+#define TAB '\t'
+
+#define NEWLINE '\n'
+
+#define HEART U'\U00002764'
+
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
+
+/**
+ * A
+ * multi-line
+ * doc
+ * comment.
+ */
+#define NEG_ONE -1
+
+#define SHIFT 3
+
+#define XBOOL 1
+
+#define XFALSE ((0 << SHIFT) | XBOOL)
+
+#define XTRUE (1 << (SHIFT | XBOOL))
+
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,61 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+#define QUOTE '\''
+
+#define TAB '\t'
+
+#define NEWLINE '\n'
+
+#define HEART U'\U00002764'
+
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
+
+/**
+ * A
+ * multi-line
+ * doc
+ * comment.
+ */
+#define NEG_ONE -1
+
+#define SHIFT 3
+
+#define XBOOL 1
+
+#define XFALSE ((0 << SHIFT) | XBOOL)
+
+#define XTRUE (1 << (SHIFT | XBOOL))
+
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define CONSTANT_I64 216
+
+#define CONSTANT_FLOAT32 312.292
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+typedef struct Foo {
+  int32_t x;
+} Foo;
+#define Foo_CONSTANT_I64_BODY 216
+
+#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CONSTANT_I64 216
-
-#define CONSTANT_FLOAT32 312.292
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-typedef struct {
-  int32_t x;
-} Foo;
-#define Foo_CONSTANT_I64_BODY 216
-
-#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int64_t CONSTANT_I64 # = 216
+
+  const float CONSTANT_FLOAT32 # = 312.292
+
+  const uint32_t DELIMITER # = ':'
+
+  const uint32_t LEFTCURLY # = '{'
+
+  ctypedef struct Foo:
+    int32_t x;
+  const int64_t Foo_CONSTANT_I64_BODY # = 216
+
+  const Foo SomeFoo # = <Foo>{ 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define CONSTANT_I64 216
+
+#define CONSTANT_FLOAT32 312.292
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+struct Foo {
+  int32_t x;
+};
+#define Foo_CONSTANT_I64_BODY 216
+
+#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_constexpr.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int64_t CONSTANT_I64 # = 216
+
+  const float CONSTANT_FLOAT32 # = 312.292
+
+  const uint32_t DELIMITER # = ':'
+
+  const uint32_t LEFTCURLY # = '{'
+
+  cdef struct Foo:
+    int32_t x;
+  const int64_t Foo_CONSTANT_I64_BODY # = 216
+
+  const Foo SomeFoo # = <Foo>{ 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const uint32_t DELIMITER # = ':'
+
+  const uint32_t LEFTCURLY # = '{'
+
+  const uint32_t QUOTE # = '\''
+
+  const uint32_t TAB # = '\t'
+
+  const uint32_t NEWLINE # = '\n'
+
+  const uint32_t HEART # = U'\U00002764'
+
+  const uint32_t EQUID # = U'\U00010083'
+
+  const float ZOM # = 3.14
+
+  # A single-line doc comment.
+  const int8_t POS_ONE # = 1
+
+  # A
+  # multi-line
+  # doc
+  # comment.
+  const int8_t NEG_ONE # = -1
+
+  const int64_t SHIFT # = 3
+
+  const int64_t XBOOL # = 1
+
+  const int64_t XFALSE # = ((0 << SHIFT) | XBOOL)
+
+  const int64_t XTRUE # = (1 << (SHIFT | XBOOL))
+
+  const uint8_t CAST # = <uint8_t>'A'
+
+  const uint32_t DOUBLE_CAST # = <uint32_t><float>1
+
+  ctypedef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_sort_name.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_sort_name.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_sort_name.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_sort_name.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t A # = 0
+
+  const uint8_t B # = 0
+
+  extern const uint8_t C;
+
+  extern const uint8_t D;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_sort_none.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_sort_none.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_sort_none.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_sort_none.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t B # = 0
+
+  const uint8_t A # = 0
+
+  extern const uint8_t D;
+
+  extern const uint8_t C;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,53 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+#define QUOTE '\''
+
+#define TAB '\t'
+
+#define NEWLINE '\n'
+
+#define HEART U'\U00002764'
+
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
+
+/**
+ * A
+ * multi-line
+ * doc
+ * comment.
+ */
+#define NEG_ONE -1
+
+#define SHIFT 3
+
+#define XBOOL 1
+
+#define XFALSE ((0 << SHIFT) | XBOOL)
+
+#define XTRUE (1 << (SHIFT | XBOOL))
+
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,61 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define DELIMITER ':'
+
+#define LEFTCURLY '{'
+
+#define QUOTE '\''
+
+#define TAB '\t'
+
+#define NEWLINE '\n'
+
+#define HEART U'\U00002764'
+
+#define EQUID U'\U00010083'
+
+#define ZOM 3.14
+
+/**
+ * A single-line doc comment.
+ */
+#define POS_ONE 1
+
+/**
+ * A
+ * multi-line
+ * doc
+ * comment.
+ */
+#define NEG_ONE -1
+
+#define SHIFT 3
+
+#define XBOOL 1
+
+#define XFALSE ((0 << SHIFT) | XBOOL)
+
+#define XTRUE (1 << (SHIFT | XBOOL))
+
+#define CAST (uint8_t)'A'
+
+#define DOUBLE_CAST (uint32_t)(float)1
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const uint32_t DELIMITER # = ':'
+
+  const uint32_t LEFTCURLY # = '{'
+
+  const uint32_t QUOTE # = '\''
+
+  const uint32_t TAB # = '\t'
+
+  const uint32_t NEWLINE # = '\n'
+
+  const uint32_t HEART # = U'\U00002764'
+
+  const uint32_t EQUID # = U'\U00010083'
+
+  const float ZOM # = 3.14
+
+  # A single-line doc comment.
+  const int8_t POS_ONE # = 1
+
+  # A
+  # multi-line
+  # doc
+  # comment.
+  const int8_t NEG_ONE # = -1
+
+  const int64_t SHIFT # = 3
+
+  const int64_t XBOOL # = 1
+
+  const int64_t XFALSE # = ((0 << SHIFT) | XBOOL)
+
+  const int64_t XTRUE # = (1 << (SHIFT | XBOOL))
+
+  const uint8_t CAST # = <uint8_t>'A'
+
+  const uint32_t DOUBLE_CAST # = <uint32_t><float>1
+
+  cdef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef enum E {
+  V,
+} E;
+
+typedef struct S {
+  uint8_t field;
+} S;
+
+typedef uint8_t A;
+
+#define C1 (S){ .field = 0 }
+
+#define C2 V
+
+#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef enum {
-  V,
-} E;
-
-typedef struct {
-  uint8_t field;
-} S;
-
-typedef uint8_t A;
-
-#define C1 (S){ .field = 0 }
-
-#define C2 V
-
-#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef enum E:
+    V,
+
+  ctypedef struct S:
+    uint8_t field;
+
+  ctypedef uint8_t A;
+
+  const S C1 # = <S>{ 0 }
+
+  const E C2 # = V
+
+  const A C3 # = 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum E {
+  V,
+};
+
+struct S {
+  uint8_t field;
+};
+
+typedef uint8_t A;
+
+#define C1 (S){ .field = 0 }
+
+#define C2 V
+
+#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/constant_user_defined_type.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum E:
+    V,
+
+  cdef struct S:
+    uint8_t field;
+
+  ctypedef uint8_t A;
+
+  const S C1 # = <S>{ 0 }
+
+  const E C2 # = V
+
+  const A C3 # = 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_conflict.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_conflict.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_conflict.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_conflict.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint32_t Foo_FOO # = 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_transparent.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_transparent.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_transparent.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_transparent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef uint8_t Transparent;
-
-#define FOO 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_transparent.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_transparent.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/const_transparent.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/const_transparent.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef uint8_t Transparent;
+
+  const Transparent FOO # = 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,5 +1,10 @@
-// This file is generated by cbindgen. DO NOT EDIT
+#if 0
+# This file is generated by cbindgen. DO NOT EDIT
+#endif
+
 
 void root(void);
 
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
+#if 0
+# This is a simple test to ensure that trailers do not cause extra newlines in files
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,4 +1,7 @@
-// This file is generated by cbindgen. DO NOT EDIT
+#if 0
+# This file is generated by cbindgen. DO NOT EDIT
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,4 +13,6 @@
 } // extern "C"
 #endif // __cplusplus
 
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
+#if 0
+# This is a simple test to ensure that trailers do not cause extra newlines in files
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,4 +1,7 @@
-// This file is generated by cbindgen. DO NOT EDIT
+#if 0
+# This file is generated by cbindgen. DO NOT EDIT
+#endif
+
 
 extern "C" {
 
@@ -6,4 +9,6 @@
 
 } // extern "C"
 
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
+#if 0
+# This is a simple test to ensure that trailers do not cause extra newlines in files
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/custom_header.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/custom_header.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#if 0
+# This file is generated by cbindgen. DO NOT EDIT
+#endif
+
+
+cdef extern from *:
+
+  void root();
+
+#if 0
+# This is a simple test to ensure that trailers do not cause extra newlines in files
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,4 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,5 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/cython_options.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/cython_options.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+from libc.stddef cimport *
+from libc.stdint cimport int8_t, int16_t
+
+cdef extern from "my_header.h":
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/dep_v2.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  bool a;
+  int32_t b;
+} Foo;
+
+enum Bar_Tag {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+typedef uint8_t Bar_Tag;
+
+typedef struct Bazz_Body {
+  Bar_Tag tag;
+  struct Foo named;
+} Bazz_Body;
+
+typedef struct FooNamed_Body {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+} FooNamed_Body;
+
+typedef struct FooParen_Body {
+  Bar_Tag tag;
+  int32_t _0;
+  struct Foo _1;
+} FooParen_Body;
+
+typedef union Bar {
+  Bar_Tag tag;
+  Bazz_Body bazz;
+  FooNamed_Body foo_named;
+  FooParen_Body foo_paren;
+} Bar;
+
+struct Foo root(union Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,57 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  bool a;
+  int32_t b;
+} Foo;
+
+enum Bar_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+#ifndef __cplusplus
+typedef uint8_t Bar_Tag;
+#endif // __cplusplus
+
+typedef struct Bazz_Body {
+  Bar_Tag tag;
+  struct Foo named;
+} Bazz_Body;
+
+typedef struct FooNamed_Body {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+} FooNamed_Body;
+
+typedef struct FooParen_Body {
+  Bar_Tag tag;
+  int32_t _0;
+  struct Foo _1;
+} FooParen_Body;
+
+typedef union Bar {
+  Bar_Tag tag;
+  Bazz_Body bazz;
+  FooNamed_Body foo_named;
+  FooParen_Body foo_paren;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+struct Foo root(union Bar aBar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  bool a;
+  int32_t b;
+} Foo;
+
+enum Bar_Tag {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+typedef uint8_t Bar_Tag;
+
+typedef struct {
+  Bar_Tag tag;
+  Foo named;
+} Bazz_Body;
+
+typedef struct {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+} FooNamed_Body;
+
+typedef struct {
+  Bar_Tag tag;
+  int32_t _0;
+  Foo _1;
+} FooParen_Body;
+
+typedef union {
+  Bar_Tag tag;
+  Bazz_Body bazz;
+  FooNamed_Body foo_named;
+  FooParen_Body foo_paren;
+} Bar;
+
+Foo root(Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  bool a;
-  int32_t b;
-} Foo;
-
-enum Bar_Tag {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-typedef uint8_t Bar_Tag;
-
-typedef struct {
-  Bar_Tag tag;
-  Foo named;
-} Bazz_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-} FooNamed_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  int32_t _0;
-  Foo _1;
-} FooParen_Body;
-
-typedef union {
-  Bar_Tag tag;
-  Bazz_Body bazz;
-  FooNamed_Body foo_named;
-  FooParen_Body foo_paren;
-} Bar;
-
-Foo root(Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,57 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  bool a;
+  int32_t b;
+} Foo;
+
+enum Bar_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+#ifndef __cplusplus
+typedef uint8_t Bar_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  Bar_Tag tag;
+  Foo named;
+} Bazz_Body;
+
+typedef struct {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+} FooNamed_Body;
+
+typedef struct {
+  Bar_Tag tag;
+  int32_t _0;
+  Foo _1;
+} FooParen_Body;
+
+typedef union {
+  Bar_Tag tag;
+  Bazz_Body bazz;
+  FooNamed_Body foo_named;
+  FooParen_Body foo_paren;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+Foo root(Bar aBar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  bool a;
-  int32_t b;
-} Foo;
-
-enum Bar_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-#ifndef __cplusplus
-typedef uint8_t Bar_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Bar_Tag tag;
-  Foo named;
-} Bazz_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-} FooNamed_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  int32_t _0;
-  Foo _1;
-} FooParen_Body;
-
-typedef union {
-  Bar_Tag tag;
-  Bazz_Body bazz;
-  FooNamed_Body foo_named;
-  FooParen_Body foo_paren;
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-Foo root(Bar aBar);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,100 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Foo {
+  bool a;
+  int32_t b;
+
+  bool operator==(const Foo& aOther) const {
+    return a == aOther.a &&
+           b == aOther.b;
+  }
+  bool operator!=(const Foo& aOther) const {
+    return a != aOther.a ||
+           b != aOther.b;
+  }
+};
+
+union Bar {
+  enum class Tag : uint8_t {
+    Baz,
+    Bazz,
+    FooNamed,
+    FooParen,
+  };
+
+  struct Bazz_Body {
+    Tag tag;
+    Foo named;
+
+    bool operator==(const Bazz_Body& aOther) const {
+      return named == aOther.named;
+    }
+    bool operator!=(const Bazz_Body& aOther) const {
+      return named != aOther.named;
+    }
+  };
+
+  struct FooNamed_Body {
+    Tag tag;
+    int32_t different;
+    uint32_t fields;
+
+    bool operator==(const FooNamed_Body& aOther) const {
+      return different == aOther.different &&
+             fields == aOther.fields;
+    }
+    bool operator!=(const FooNamed_Body& aOther) const {
+      return different != aOther.different ||
+             fields != aOther.fields;
+    }
+  };
+
+  struct FooParen_Body {
+    Tag tag;
+    int32_t _0;
+    Foo _1;
+
+    bool operator==(const FooParen_Body& aOther) const {
+      return _0 == aOther._0 &&
+             _1 == aOther._1;
+    }
+    bool operator!=(const FooParen_Body& aOther) const {
+      return _0 != aOther._0 ||
+             _1 != aOther._1;
+    }
+  };
+
+  struct {
+    Tag tag;
+  };
+  Bazz_Body bazz;
+  FooNamed_Body foo_named;
+  FooParen_Body foo_paren;
+
+  bool operator==(const Bar& aOther) const {
+    if (tag != aOther.tag) {
+      return false;
+    }
+    switch (tag) {
+      case Tag::Bazz: return bazz == aOther.bazz;
+      case Tag::FooNamed: return foo_named == aOther.foo_named;
+      case Tag::FooParen: return foo_paren == aOther.foo_paren;
+      default: break;
+    }
+    return true;
+  }
+
+  bool operator!=(const Bar& aOther) const {
+    return !(*this == aOther);
+  }
+};
+
+extern "C" {
+
+Foo root(Bar aBar);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive-eq.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive-eq.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct Foo {
-  bool a;
-  int32_t b;
-
-  bool operator==(const Foo& aOther) const {
-    return a == aOther.a &&
-           b == aOther.b;
-  }
-  bool operator!=(const Foo& aOther) const {
-    return a != aOther.a ||
-           b != aOther.b;
-  }
-};
-
-union Bar {
-  enum class Tag : uint8_t {
-    Baz,
-    Bazz,
-    FooNamed,
-    FooParen,
-  };
-
-  struct Bazz_Body {
-    Tag tag;
-    Foo named;
-
-    bool operator==(const Bazz_Body& aOther) const {
-      return named == aOther.named;
-    }
-    bool operator!=(const Bazz_Body& aOther) const {
-      return named != aOther.named;
-    }
-  };
-
-  struct FooNamed_Body {
-    Tag tag;
-    int32_t different;
-    uint32_t fields;
-
-    bool operator==(const FooNamed_Body& aOther) const {
-      return different == aOther.different &&
-             fields == aOther.fields;
-    }
-    bool operator!=(const FooNamed_Body& aOther) const {
-      return different != aOther.different ||
-             fields != aOther.fields;
-    }
-  };
-
-  struct FooParen_Body {
-    Tag tag;
-    int32_t _0;
-    Foo _1;
-
-    bool operator==(const FooParen_Body& aOther) const {
-      return _0 == aOther._0 &&
-             _1 == aOther._1;
-    }
-    bool operator!=(const FooParen_Body& aOther) const {
-      return _0 != aOther._0 ||
-             _1 != aOther._1;
-    }
-  };
-
-  struct {
-    Tag tag;
-  };
-  Bazz_Body bazz;
-  FooNamed_Body foo_named;
-  FooParen_Body foo_paren;
-
-  bool operator==(const Bar& aOther) const {
-    if (tag != aOther.tag) {
-      return false;
-    }
-    switch (tag) {
-      case Tag::Bazz: return bazz == aOther.bazz;
-      case Tag::FooNamed: return foo_named == aOther.foo_named;
-      case Tag::FooParen: return foo_paren == aOther.foo_paren;
-      default: break;
-    }
-    return true;
-  }
-
-  bool operator!=(const Bar& aOther) const {
-    return !(*this == aOther);
-  }
-};
-
-extern "C" {
-
-Foo root(Bar aBar);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    bool a;
+    int32_t b;
+
+  cdef enum:
+    Baz,
+    Bazz,
+    FooNamed,
+    FooParen,
+  ctypedef uint8_t Bar_Tag;
+
+  ctypedef struct Bazz_Body:
+    Bar_Tag tag;
+    Foo named;
+
+  ctypedef struct FooNamed_Body:
+    Bar_Tag tag;
+    int32_t different;
+    uint32_t fields;
+
+  ctypedef struct FooParen_Body:
+    Bar_Tag tag;
+    int32_t _0;
+    Foo _1;
+
+  ctypedef union Bar:
+    Bar_Tag tag;
+    Bazz_Body bazz;
+    FooNamed_Body foo_named;
+    FooParen_Body foo_paren;
+
+  Foo root(Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  bool a;
+  int32_t b;
+};
+
+enum Bar_Tag {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+typedef uint8_t Bar_Tag;
+
+struct Bazz_Body {
+  Bar_Tag tag;
+  struct Foo named;
+};
+
+struct FooNamed_Body {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+};
+
+struct FooParen_Body {
+  Bar_Tag tag;
+  int32_t _0;
+  struct Foo _1;
+};
+
+union Bar {
+  Bar_Tag tag;
+  struct Bazz_Body bazz;
+  struct FooNamed_Body foo_named;
+  struct FooParen_Body foo_paren;
+};
+
+struct Foo root(union Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,57 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  bool a;
+  int32_t b;
+};
+
+enum Bar_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz,
+  Bazz,
+  FooNamed,
+  FooParen,
+};
+#ifndef __cplusplus
+typedef uint8_t Bar_Tag;
+#endif // __cplusplus
+
+struct Bazz_Body {
+  Bar_Tag tag;
+  struct Foo named;
+};
+
+struct FooNamed_Body {
+  Bar_Tag tag;
+  int32_t different;
+  uint32_t fields;
+};
+
+struct FooParen_Body {
+  Bar_Tag tag;
+  int32_t _0;
+  struct Foo _1;
+};
+
+union Bar {
+  Bar_Tag tag;
+  struct Bazz_Body bazz;
+  struct FooNamed_Body foo_named;
+  struct FooParen_Body foo_paren;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+struct Foo root(union Bar aBar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_eq.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    bool a;
+    int32_t b;
+
+  cdef enum:
+    Baz,
+    Bazz,
+    FooNamed,
+    FooParen,
+  ctypedef uint8_t Bar_Tag;
+
+  cdef struct Bazz_Body:
+    Bar_Tag tag;
+    Foo named;
+
+  cdef struct FooNamed_Body:
+    Bar_Tag tag;
+    int32_t different;
+    uint32_t fields;
+
+  cdef struct FooParen_Body:
+    Bar_Tag tag;
+    int32_t _0;
+    Foo _1;
+
+  cdef union Bar:
+    Bar_Tag tag;
+    Bazz_Body bazz;
+    FooNamed_Body foo_named;
+    FooParen_Body foo_paren;
+
+  Foo root(Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,89 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C {
+  X = 2,
+  Y,
+};
+typedef uint32_t C;
+
+typedef struct A {
+  int32_t _0;
+} A;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+typedef struct D {
+  uint8_t List;
+  uintptr_t Of;
+  struct B Things;
+} D;
+
+enum F_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t F_Tag;
+
+typedef struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} F;
+
+enum H_Tag {
+  Hello,
+  There,
+  Everyone,
+};
+typedef uint8_t H_Tag;
+
+typedef struct There_Body {
+  uint8_t x;
+  int16_t y;
+} There_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    There_Body there;
+  };
+} H;
+
+enum I_Tag {
+  ThereAgain,
+  SomethingElse,
+};
+typedef uint8_t I_Tag;
+
+typedef struct ThereAgain_Body {
+  uint8_t x;
+  int16_t y;
+} ThereAgain_Body;
+
+typedef struct I {
+  I_Tag tag;
+  union {
+    ThereAgain_Body there_again;
+  };
+} I;
+
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,121 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  X = 2,
+  Y,
+};
+#ifndef __cplusplus
+typedef uint32_t C;
+#endif // __cplusplus
+
+typedef struct A {
+  int32_t _0;
+} A;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+typedef struct D {
+  uint8_t List;
+  uintptr_t Of;
+  struct B Things;
+} D;
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+typedef struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} F;
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Hello,
+  There,
+  Everyone,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+typedef struct There_Body {
+  uint8_t x;
+  int16_t y;
+} There_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    There_Body there;
+  };
+} H;
+
+enum I_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  ThereAgain,
+  SomethingElse,
+};
+#ifndef __cplusplus
+typedef uint8_t I_Tag;
+#endif // __cplusplus
+
+typedef struct ThereAgain_Body {
+  uint8_t x;
+  int16_t y;
+} ThereAgain_Body;
+
+typedef struct I {
+  I_Tag tag;
+  union {
+    ThereAgain_Body there_again;
+  };
+} I;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.c	2021-01-18 19:59:04.000000000 +0000
@@ -33,18 +33,16 @@
 
 typedef struct {
   F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  F_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   F_Tag tag;
-  Foo_Body foo;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } F;
 
@@ -56,10 +54,6 @@
 typedef uint8_t H_Tag;
 
 typedef struct {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } There_Body;
@@ -67,7 +61,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    Hello_Body hello;
+    struct {
+      int16_t hello;
+    };
     There_Body there;
   };
 } H;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -45,18 +45,16 @@
 
 typedef struct {
   F_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  F_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   F_Tag tag;
-  Foo_Body foo;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } F;
 
@@ -74,10 +72,6 @@
 #endif // __cplusplus
 
 typedef struct {
-  int16_t _0;
-} Hello_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } There_Body;
@@ -85,7 +79,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    Hello_Body hello;
+    struct {
+      int16_t hello;
+    };
     There_Body there;
   };
 } H;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,71 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    X # = 2,
+    Y,
+  ctypedef uint32_t C;
+
+  ctypedef struct A:
+    int32_t _0;
+
+  ctypedef struct B:
+    int32_t x;
+    float y;
+
+  ctypedef struct D:
+    uint8_t List;
+    uintptr_t Of;
+    B Things;
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t F_Tag;
+
+  ctypedef struct Bar_Body:
+    F_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  ctypedef union F:
+    F_Tag tag;
+    F_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  cdef enum:
+    Hello,
+    There,
+    Everyone,
+  ctypedef uint8_t H_Tag;
+
+  ctypedef struct There_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct H:
+    H_Tag tag;
+    int16_t hello;
+    There_Body there;
+
+  cdef enum:
+    ThereAgain,
+    SomethingElse,
+  ctypedef uint8_t I_Tag;
+
+  ctypedef struct ThereAgain_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct I:
+    I_Tag tag;
+    ThereAgain_Body there_again;
+
+  void root(A a, B b, C c, D d, F f, H h, I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,89 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C {
+  X = 2,
+  Y,
+};
+typedef uint32_t C;
+
+struct A {
+  int32_t _0;
+};
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+struct D {
+  uint8_t List;
+  uintptr_t Of;
+  struct B Things;
+};
+
+enum F_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t F_Tag;
+
+struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag {
+  Hello,
+  There,
+  Everyone,
+};
+typedef uint8_t H_Tag;
+
+struct There_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    struct There_Body there;
+  };
+};
+
+enum I_Tag {
+  ThereAgain,
+  SomethingElse,
+};
+typedef uint8_t I_Tag;
+
+struct ThereAgain_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct I {
+  I_Tag tag;
+  union {
+    struct ThereAgain_Body there_again;
+  };
+};
+
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,121 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum C
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  X = 2,
+  Y,
+};
+#ifndef __cplusplus
+typedef uint32_t C;
+#endif // __cplusplus
+
+struct A {
+  int32_t _0;
+};
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+struct D {
+  uint8_t List;
+  uintptr_t Of;
+  struct B Things;
+};
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+struct Bar_Body {
+  F_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union F {
+  F_Tag tag;
+  struct {
+    F_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Hello,
+  There,
+  Everyone,
+};
+#ifndef __cplusplus
+typedef uint8_t H_Tag;
+#endif // __cplusplus
+
+struct There_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t hello;
+    };
+    struct There_Body there;
+  };
+};
+
+enum I_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  ThereAgain,
+  SomethingElse,
+};
+#ifndef __cplusplus
+typedef uint8_t I_Tag;
+#endif // __cplusplus
+
+struct ThereAgain_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct I {
+  I_Tag tag;
+  union {
+    struct ThereAgain_Body there_again;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/derive_ostream.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,71 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    X # = 2,
+    Y,
+  ctypedef uint32_t C;
+
+  cdef struct A:
+    int32_t _0;
+
+  cdef struct B:
+    int32_t x;
+    float y;
+
+  cdef struct D:
+    uint8_t List;
+    uintptr_t Of;
+    B Things;
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t F_Tag;
+
+  cdef struct Bar_Body:
+    F_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  cdef union F:
+    F_Tag tag;
+    F_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  cdef enum:
+    Hello,
+    There,
+    Everyone,
+  ctypedef uint8_t H_Tag;
+
+  cdef struct There_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct H:
+    H_Tag tag;
+    int16_t hello;
+    There_Body there;
+
+  cdef enum:
+    ThereAgain,
+    SomethingElse,
+  ctypedef uint8_t I_Tag;
+
+  cdef struct ThereAgain_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct I:
+    I_Tag tag;
+    ThereAgain_Body there_again;
+
+  void root(A a, B b, C c, D d, F f, H h, I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,210 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule {
+  A,
+  B,
+};
+typedef uint8_t FillRule;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct OwnedSlice_u32 {
+  uintptr_t len;
+  uint32_t *ptr;
+} OwnedSlice_u32;
+
+typedef struct Polygon_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coordinates;
+} Polygon_u32;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct OwnedSlice_i32 {
+  uintptr_t len;
+  int32_t *ptr;
+} OwnedSlice_i32;
+
+enum Foo_u32_Tag {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+typedef uint8_t Foo_u32_Tag;
+
+typedef struct Slice3_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coords;
+} Slice3_Body_u32;
+
+typedef struct Slice4_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice4_Body_u32;
+
+typedef struct Foo_u32 {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      struct Polygon_u32 polygon1;
+    };
+    struct {
+      struct OwnedSlice_u32 slice1;
+    };
+    struct {
+      struct OwnedSlice_i32 slice2;
+    };
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+  };
+} Foo_u32;
+
+typedef struct Polygon_i32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coordinates;
+} Polygon_i32;
+
+enum Baz_i32_Tag {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+typedef uint8_t Baz_i32_Tag;
+
+typedef struct Slice23_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice23_Body_i32;
+
+typedef struct Slice24_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice24_Body_i32;
+
+typedef union Baz_i32 {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    struct Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    struct OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    struct OwnedSlice_i32 slice22;
+  };
+  Slice23_Body_i32 slice23;
+  Slice24_Body_i32 slice24;
+} Baz_i32;
+
+enum Taz_Tag {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+typedef uint8_t Taz_Tag;
+
+typedef union Taz {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    struct OwnedSlice_i32 taz3;
+  };
+} Taz;
+
+enum Tazz_Tag {
+  Bar4,
+  Taz2,
+};
+typedef uint8_t Tazz_Tag;
+
+typedef union Tazz {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+} Tazz;
+
+enum Tazzz_Tag {
+  Bar5,
+  Taz5,
+};
+typedef uint8_t Tazzz_Tag;
+
+typedef union Tazzz {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+} Tazzz;
+
+enum Tazzzz_Tag {
+  Taz6,
+  Taz7,
+};
+typedef uint8_t Tazzzz_Tag;
+
+typedef union Tazzzz {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+} Tazzzz;
+
+enum Qux_Tag {
+  Qux1,
+  Qux2,
+};
+typedef uint8_t Qux_Tag;
+
+typedef union Qux {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+} Qux;
+
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,266 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+};
+#ifndef __cplusplus
+typedef uint8_t FillRule;
+#endif // __cplusplus
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct OwnedSlice_u32 {
+  uintptr_t len;
+  uint32_t *ptr;
+} OwnedSlice_u32;
+
+typedef struct Polygon_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coordinates;
+} Polygon_u32;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct OwnedSlice_i32 {
+  uintptr_t len;
+  int32_t *ptr;
+} OwnedSlice_i32;
+
+enum Foo_u32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+#ifndef __cplusplus
+typedef uint8_t Foo_u32_Tag;
+#endif // __cplusplus
+
+typedef struct Slice3_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coords;
+} Slice3_Body_u32;
+
+typedef struct Slice4_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice4_Body_u32;
+
+typedef struct Foo_u32 {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      struct Polygon_u32 polygon1;
+    };
+    struct {
+      struct OwnedSlice_u32 slice1;
+    };
+    struct {
+      struct OwnedSlice_i32 slice2;
+    };
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+  };
+} Foo_u32;
+
+typedef struct Polygon_i32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coordinates;
+} Polygon_i32;
+
+enum Baz_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t Baz_i32_Tag;
+#endif // __cplusplus
+
+typedef struct Slice23_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice23_Body_i32;
+
+typedef struct Slice24_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+} Slice24_Body_i32;
+
+typedef union Baz_i32 {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    struct Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    struct OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    struct OwnedSlice_i32 slice22;
+  };
+  Slice23_Body_i32 slice23;
+  Slice24_Body_i32 slice24;
+} Baz_i32;
+
+enum Taz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t Taz_Tag;
+#endif // __cplusplus
+
+typedef union Taz {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    struct OwnedSlice_i32 taz3;
+  };
+} Taz;
+
+enum Tazz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar4,
+  Taz2,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazz_Tag;
+#endif // __cplusplus
+
+typedef union Tazz {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+} Tazz;
+
+enum Tazzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar5,
+  Taz5,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzz_Tag;
+#endif // __cplusplus
+
+typedef union Tazzz {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+} Tazzz;
+
+enum Tazzzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz6,
+  Taz7,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzzz_Tag;
+#endif // __cplusplus
+
+typedef union Tazzzz {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+} Tazzzz;
+
+enum Qux_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Qux1,
+  Qux2,
+};
+#ifndef __cplusplus
+typedef uint8_t Qux_Tag;
+#endif // __cplusplus
+
+typedef union Qux {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+} Qux;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,210 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule {
+  A,
+  B,
+};
+typedef uint8_t FillRule;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct {
+  uintptr_t len;
+  uint32_t *ptr;
+} OwnedSlice_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_u32 coordinates;
+} Polygon_u32;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct {
+  uintptr_t len;
+  int32_t *ptr;
+} OwnedSlice_i32;
+
+enum Foo_u32_Tag {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+typedef uint8_t Foo_u32_Tag;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_u32 coords;
+} Slice3_Body_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice4_Body_u32;
+
+typedef struct {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      Polygon_u32 polygon1;
+    };
+    struct {
+      OwnedSlice_u32 slice1;
+    };
+    struct {
+      OwnedSlice_i32 slice2;
+    };
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+  };
+} Foo_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_i32 coordinates;
+} Polygon_i32;
+
+enum Baz_i32_Tag {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+typedef uint8_t Baz_i32_Tag;
+
+typedef struct {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice23_Body_i32;
+
+typedef struct {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice24_Body_i32;
+
+typedef union {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    OwnedSlice_i32 slice22;
+  };
+  Slice23_Body_i32 slice23;
+  Slice24_Body_i32 slice24;
+} Baz_i32;
+
+enum Taz_Tag {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+typedef uint8_t Taz_Tag;
+
+typedef union {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    OwnedSlice_i32 taz3;
+  };
+} Taz;
+
+enum Tazz_Tag {
+  Bar4,
+  Taz2,
+};
+typedef uint8_t Tazz_Tag;
+
+typedef union {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+} Tazz;
+
+enum Tazzz_Tag {
+  Bar5,
+  Taz5,
+};
+typedef uint8_t Tazzz_Tag;
+
+typedef union {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+} Tazzz;
+
+enum Tazzzz_Tag {
+  Taz6,
+  Taz7,
+};
+typedef uint8_t Tazzzz_Tag;
+
+typedef union {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+} Tazzzz;
+
+enum Qux_Tag {
+  Qux1,
+  Qux2,
+};
+typedef uint8_t Qux_Tag;
+
+typedef union {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+} Qux;
+
+void root(const Foo_u32 *a,
+          const Baz_i32 *b,
+          const Taz *c,
+          Tazz d,
+          const Tazzz *e,
+          const Tazzzz *f,
+          const Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule {
-  A,
-  B,
-};
-typedef uint8_t FillRule;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct {
-  uintptr_t len;
-  uint32_t *ptr;
-} OwnedSlice_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_u32 coordinates;
-} Polygon_u32;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct {
-  uintptr_t len;
-  int32_t *ptr;
-} OwnedSlice_i32;
-
-enum Foo_u32_Tag {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-typedef uint8_t Foo_u32_Tag;
-
-typedef struct {
-  Polygon_u32 _0;
-} Polygon1_Body_u32;
-
-typedef struct {
-  OwnedSlice_u32 _0;
-} Slice1_Body_u32;
-
-typedef struct {
-  OwnedSlice_i32 _0;
-} Slice2_Body_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_u32 coords;
-} Slice3_Body_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice4_Body_u32;
-
-typedef struct {
-  Foo_u32_Tag tag;
-  union {
-    Polygon1_Body_u32 polygon1;
-    Slice1_Body_u32 slice1;
-    Slice2_Body_u32 slice2;
-    Slice3_Body_u32 slice3;
-    Slice4_Body_u32 slice4;
-  };
-} Foo_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_i32 coordinates;
-} Polygon_i32;
-
-enum Baz_i32_Tag {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-typedef uint8_t Baz_i32_Tag;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  Polygon_i32 _0;
-} Polygon21_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice21_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice22_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice23_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice24_Body_i32;
-
-typedef union {
-  Baz_i32_Tag tag;
-  Polygon21_Body_i32 polygon21;
-  Slice21_Body_i32 slice21;
-  Slice22_Body_i32 slice22;
-  Slice23_Body_i32 slice23;
-  Slice24_Body_i32 slice24;
-} Baz_i32;
-
-enum Taz_Tag {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-typedef uint8_t Taz_Tag;
-
-typedef struct {
-  Taz_Tag tag;
-  int32_t _0;
-} Taz1_Body;
-
-typedef struct {
-  Taz_Tag tag;
-  OwnedSlice_i32 _0;
-} Taz3_Body;
-
-typedef union {
-  Taz_Tag tag;
-  Taz1_Body taz1;
-  Taz3_Body taz3;
-} Taz;
-
-enum Tazz_Tag {
-  Bar4,
-  Taz2,
-};
-typedef uint8_t Tazz_Tag;
-
-typedef struct {
-  Tazz_Tag tag;
-  int32_t _0;
-} Taz2_Body;
-
-typedef union {
-  Tazz_Tag tag;
-  Taz2_Body taz2;
-} Tazz;
-
-enum Tazzz_Tag {
-  Bar5,
-  Taz5,
-};
-typedef uint8_t Tazzz_Tag;
-
-typedef struct {
-  Tazzz_Tag tag;
-  int32_t _0;
-} Taz5_Body;
-
-typedef union {
-  Tazzz_Tag tag;
-  Taz5_Body taz5;
-} Tazzz;
-
-enum Tazzzz_Tag {
-  Taz6,
-  Taz7,
-};
-typedef uint8_t Tazzzz_Tag;
-
-typedef struct {
-  Tazzzz_Tag tag;
-  int32_t _0;
-} Taz6_Body;
-
-typedef struct {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-} Taz7_Body;
-
-typedef union {
-  Tazzzz_Tag tag;
-  Taz6_Body taz6;
-  Taz7_Body taz7;
-} Tazzzz;
-
-enum Qux_Tag {
-  Qux1,
-  Qux2,
-};
-typedef uint8_t Qux_Tag;
-
-typedef struct {
-  Qux_Tag tag;
-  int32_t _0;
-} Qux1_Body;
-
-typedef struct {
-  Qux_Tag tag;
-  uint32_t _0;
-} Qux2_Body;
-
-typedef union {
-  Qux_Tag tag;
-  Qux1_Body qux1;
-  Qux2_Body qux2;
-} Qux;
-
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,266 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+};
+#ifndef __cplusplus
+typedef uint8_t FillRule;
+#endif // __cplusplus
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct {
+  uintptr_t len;
+  uint32_t *ptr;
+} OwnedSlice_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_u32 coordinates;
+} Polygon_u32;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+typedef struct {
+  uintptr_t len;
+  int32_t *ptr;
+} OwnedSlice_i32;
+
+enum Foo_u32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+#ifndef __cplusplus
+typedef uint8_t Foo_u32_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_u32 coords;
+} Slice3_Body_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice4_Body_u32;
+
+typedef struct {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      Polygon_u32 polygon1;
+    };
+    struct {
+      OwnedSlice_u32 slice1;
+    };
+    struct {
+      OwnedSlice_i32 slice2;
+    };
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+  };
+} Foo_u32;
+
+typedef struct {
+  FillRule fill;
+  OwnedSlice_i32 coordinates;
+} Polygon_i32;
+
+enum Baz_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t Baz_i32_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice23_Body_i32;
+
+typedef struct {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  OwnedSlice_i32 coords;
+} Slice24_Body_i32;
+
+typedef union {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    OwnedSlice_i32 slice22;
+  };
+  Slice23_Body_i32 slice23;
+  Slice24_Body_i32 slice24;
+} Baz_i32;
+
+enum Taz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t Taz_Tag;
+#endif // __cplusplus
+
+typedef union {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    OwnedSlice_i32 taz3;
+  };
+} Taz;
+
+enum Tazz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar4,
+  Taz2,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazz_Tag;
+#endif // __cplusplus
+
+typedef union {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+} Tazz;
+
+enum Tazzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar5,
+  Taz5,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzz_Tag;
+#endif // __cplusplus
+
+typedef union {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+} Tazzz;
+
+enum Tazzzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz6,
+  Taz7,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzzz_Tag;
+#endif // __cplusplus
+
+typedef union {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+} Tazzzz;
+
+enum Qux_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Qux1,
+  Qux2,
+};
+#ifndef __cplusplus
+typedef uint8_t Qux_Tag;
+#endif // __cplusplus
+
+typedef union {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+} Qux;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo_u32 *a,
+          const Baz_i32 *b,
+          const Taz *c,
+          Tazz d,
+          const Tazzz *e,
+          const Tazzzz *f,
+          const Qux *g);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,294 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  A,
-  B,
-};
-#ifndef __cplusplus
-typedef uint8_t FillRule;
-#endif // __cplusplus
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct {
-  uintptr_t len;
-  uint32_t *ptr;
-} OwnedSlice_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_u32 coordinates;
-} Polygon_u32;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-typedef struct {
-  uintptr_t len;
-  int32_t *ptr;
-} OwnedSlice_i32;
-
-enum Foo_u32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-#ifndef __cplusplus
-typedef uint8_t Foo_u32_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Polygon_u32 _0;
-} Polygon1_Body_u32;
-
-typedef struct {
-  OwnedSlice_u32 _0;
-} Slice1_Body_u32;
-
-typedef struct {
-  OwnedSlice_i32 _0;
-} Slice2_Body_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_u32 coords;
-} Slice3_Body_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice4_Body_u32;
-
-typedef struct {
-  Foo_u32_Tag tag;
-  union {
-    Polygon1_Body_u32 polygon1;
-    Slice1_Body_u32 slice1;
-    Slice2_Body_u32 slice2;
-    Slice3_Body_u32 slice3;
-    Slice4_Body_u32 slice4;
-  };
-} Foo_u32;
-
-typedef struct {
-  FillRule fill;
-  OwnedSlice_i32 coordinates;
-} Polygon_i32;
-
-enum Baz_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t Baz_i32_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Baz_i32_Tag tag;
-  Polygon_i32 _0;
-} Polygon21_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice21_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  OwnedSlice_i32 _0;
-} Slice22_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice23_Body_i32;
-
-typedef struct {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  OwnedSlice_i32 coords;
-} Slice24_Body_i32;
-
-typedef union {
-  Baz_i32_Tag tag;
-  Polygon21_Body_i32 polygon21;
-  Slice21_Body_i32 slice21;
-  Slice22_Body_i32 slice22;
-  Slice23_Body_i32 slice23;
-  Slice24_Body_i32 slice24;
-} Baz_i32;
-
-enum Taz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t Taz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Taz_Tag tag;
-  int32_t _0;
-} Taz1_Body;
-
-typedef struct {
-  Taz_Tag tag;
-  OwnedSlice_i32 _0;
-} Taz3_Body;
-
-typedef union {
-  Taz_Tag tag;
-  Taz1_Body taz1;
-  Taz3_Body taz3;
-} Taz;
-
-enum Tazz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar4,
-  Taz2,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Tazz_Tag tag;
-  int32_t _0;
-} Taz2_Body;
-
-typedef union {
-  Tazz_Tag tag;
-  Taz2_Body taz2;
-} Tazz;
-
-enum Tazzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar5,
-  Taz5,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Tazzz_Tag tag;
-  int32_t _0;
-} Taz5_Body;
-
-typedef union {
-  Tazzz_Tag tag;
-  Taz5_Body taz5;
-} Tazzz;
-
-enum Tazzzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz6,
-  Taz7,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzzz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Tazzzz_Tag tag;
-  int32_t _0;
-} Taz6_Body;
-
-typedef struct {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-} Taz7_Body;
-
-typedef union {
-  Tazzzz_Tag tag;
-  Taz6_Body taz6;
-  Taz7_Body taz7;
-} Tazzzz;
-
-enum Qux_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Qux1,
-  Qux2,
-};
-#ifndef __cplusplus
-typedef uint8_t Qux_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  Qux_Tag tag;
-  int32_t _0;
-} Qux1_Body;
-
-typedef struct {
-  Qux_Tag tag;
-  uint32_t _0;
-} Qux2_Body;
-
-typedef union {
-  Qux_Tag tag;
-  Qux1_Body qux1;
-  Qux2_Body qux2;
-} Qux;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo_u32 *a,
-          const Baz_i32 *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,712 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+enum class FillRule : uint8_t {
+  A,
+  B,
+};
+
+/// This will have a destructor manually implemented via variant_body, and
+/// similarly a Drop impl in Rust.
+template<typename T>
+struct OwnedSlice {
+  uintptr_t len;
+  T *ptr;
+  ~OwnedSlice() {}
+};
+
+template<typename LengthPercentage>
+struct Polygon {
+  FillRule fill;
+  OwnedSlice<LengthPercentage> coordinates;
+};
+
+template<typename T>
+struct Foo {
+  enum class Tag : uint8_t {
+    Bar,
+    Polygon1,
+    Slice1,
+    Slice2,
+    Slice3,
+    Slice4,
+  };
+
+  struct Polygon1_Body {
+    Polygon<T> _0;
+  };
+
+  struct Slice1_Body {
+    OwnedSlice<T> _0;
+  };
+
+  struct Slice2_Body {
+    OwnedSlice<int32_t> _0;
+  };
+
+  struct Slice3_Body {
+    FillRule fill;
+    OwnedSlice<T> coords;
+  };
+
+  struct Slice4_Body {
+    FillRule fill;
+    OwnedSlice<int32_t> coords;
+  };
+
+  Tag tag;
+  union {
+    Polygon1_Body polygon1;
+    Slice1_Body slice1;
+    Slice2_Body slice2;
+    Slice3_Body slice3;
+    Slice4_Body slice4;
+  };
+
+  static Foo Bar() {
+    Foo result;
+    result.tag = Tag::Bar;
+    return result;
+  }
+
+  bool IsBar() const {
+    return tag == Tag::Bar;
+  }
+
+  static Foo Polygon1(const Polygon<T> &_0) {
+    Foo result;
+    ::new (&result.polygon1._0) (Polygon<T>)(_0);
+    result.tag = Tag::Polygon1;
+    return result;
+  }
+
+  bool IsPolygon1() const {
+    return tag == Tag::Polygon1;
+  }
+
+  static Foo Slice1(const OwnedSlice<T> &_0) {
+    Foo result;
+    ::new (&result.slice1._0) (OwnedSlice<T>)(_0);
+    result.tag = Tag::Slice1;
+    return result;
+  }
+
+  bool IsSlice1() const {
+    return tag == Tag::Slice1;
+  }
+
+  static Foo Slice2(const OwnedSlice<int32_t> &_0) {
+    Foo result;
+    ::new (&result.slice2._0) (OwnedSlice<int32_t>)(_0);
+    result.tag = Tag::Slice2;
+    return result;
+  }
+
+  bool IsSlice2() const {
+    return tag == Tag::Slice2;
+  }
+
+  static Foo Slice3(const FillRule &fill,
+                    const OwnedSlice<T> &coords) {
+    Foo result;
+    ::new (&result.slice3.fill) (FillRule)(fill);
+    ::new (&result.slice3.coords) (OwnedSlice<T>)(coords);
+    result.tag = Tag::Slice3;
+    return result;
+  }
+
+  bool IsSlice3() const {
+    return tag == Tag::Slice3;
+  }
+
+  static Foo Slice4(const FillRule &fill,
+                    const OwnedSlice<int32_t> &coords) {
+    Foo result;
+    ::new (&result.slice4.fill) (FillRule)(fill);
+    ::new (&result.slice4.coords) (OwnedSlice<int32_t>)(coords);
+    result.tag = Tag::Slice4;
+    return result;
+  }
+
+  bool IsSlice4() const {
+    return tag == Tag::Slice4;
+  }
+
+  private:
+  Foo() {
+
+  }
+  public:
+
+
+  ~Foo() {
+    switch (tag) {
+      case Tag::Polygon1: polygon1.~Polygon1_Body(); break;
+      case Tag::Slice1: slice1.~Slice1_Body(); break;
+      case Tag::Slice2: slice2.~Slice2_Body(); break;
+      case Tag::Slice3: slice3.~Slice3_Body(); break;
+      case Tag::Slice4: slice4.~Slice4_Body(); break;
+      default: break;
+    }
+  }
+
+  Foo(const Foo& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Polygon1: ::new (&polygon1) (Polygon1_Body)(other.polygon1); break;
+      case Tag::Slice1: ::new (&slice1) (Slice1_Body)(other.slice1); break;
+      case Tag::Slice2: ::new (&slice2) (Slice2_Body)(other.slice2); break;
+      case Tag::Slice3: ::new (&slice3) (Slice3_Body)(other.slice3); break;
+      case Tag::Slice4: ::new (&slice4) (Slice4_Body)(other.slice4); break;
+      default: break;
+    }
+  }
+  Foo& operator=(const Foo& other) {
+    if (this != &other) {
+      this->~Foo();
+      new (this) Foo(other);
+    }
+    return *this;
+  }
+};
+
+template<typename T>
+union Baz {
+  enum class Tag : uint8_t {
+    Bar2,
+    Polygon21,
+    Slice21,
+    Slice22,
+    Slice23,
+    Slice24,
+  };
+
+  struct Polygon21_Body {
+    Tag tag;
+    Polygon<T> _0;
+  };
+
+  struct Slice21_Body {
+    Tag tag;
+    OwnedSlice<T> _0;
+  };
+
+  struct Slice22_Body {
+    Tag tag;
+    OwnedSlice<int32_t> _0;
+  };
+
+  struct Slice23_Body {
+    Tag tag;
+    FillRule fill;
+    OwnedSlice<T> coords;
+  };
+
+  struct Slice24_Body {
+    Tag tag;
+    FillRule fill;
+    OwnedSlice<int32_t> coords;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Polygon21_Body polygon21;
+  Slice21_Body slice21;
+  Slice22_Body slice22;
+  Slice23_Body slice23;
+  Slice24_Body slice24;
+
+  static Baz Bar2() {
+    Baz result;
+    result.tag = Tag::Bar2;
+    return result;
+  }
+
+  bool IsBar2() const {
+    return tag == Tag::Bar2;
+  }
+
+  static Baz Polygon21(const Polygon<T> &_0) {
+    Baz result;
+    ::new (&result.polygon21._0) (Polygon<T>)(_0);
+    result.tag = Tag::Polygon21;
+    return result;
+  }
+
+  bool IsPolygon21() const {
+    return tag == Tag::Polygon21;
+  }
+
+  static Baz Slice21(const OwnedSlice<T> &_0) {
+    Baz result;
+    ::new (&result.slice21._0) (OwnedSlice<T>)(_0);
+    result.tag = Tag::Slice21;
+    return result;
+  }
+
+  bool IsSlice21() const {
+    return tag == Tag::Slice21;
+  }
+
+  static Baz Slice22(const OwnedSlice<int32_t> &_0) {
+    Baz result;
+    ::new (&result.slice22._0) (OwnedSlice<int32_t>)(_0);
+    result.tag = Tag::Slice22;
+    return result;
+  }
+
+  bool IsSlice22() const {
+    return tag == Tag::Slice22;
+  }
+
+  static Baz Slice23(const FillRule &fill,
+                     const OwnedSlice<T> &coords) {
+    Baz result;
+    ::new (&result.slice23.fill) (FillRule)(fill);
+    ::new (&result.slice23.coords) (OwnedSlice<T>)(coords);
+    result.tag = Tag::Slice23;
+    return result;
+  }
+
+  bool IsSlice23() const {
+    return tag == Tag::Slice23;
+  }
+
+  static Baz Slice24(const FillRule &fill,
+                     const OwnedSlice<int32_t> &coords) {
+    Baz result;
+    ::new (&result.slice24.fill) (FillRule)(fill);
+    ::new (&result.slice24.coords) (OwnedSlice<int32_t>)(coords);
+    result.tag = Tag::Slice24;
+    return result;
+  }
+
+  bool IsSlice24() const {
+    return tag == Tag::Slice24;
+  }
+
+  private:
+  Baz() {
+
+  }
+  public:
+
+
+  ~Baz() {
+    switch (tag) {
+      case Tag::Polygon21: polygon21.~Polygon21_Body(); break;
+      case Tag::Slice21: slice21.~Slice21_Body(); break;
+      case Tag::Slice22: slice22.~Slice22_Body(); break;
+      case Tag::Slice23: slice23.~Slice23_Body(); break;
+      case Tag::Slice24: slice24.~Slice24_Body(); break;
+      default: break;
+    }
+  }
+
+  Baz(const Baz& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Polygon21: ::new (&polygon21) (Polygon21_Body)(other.polygon21); break;
+      case Tag::Slice21: ::new (&slice21) (Slice21_Body)(other.slice21); break;
+      case Tag::Slice22: ::new (&slice22) (Slice22_Body)(other.slice22); break;
+      case Tag::Slice23: ::new (&slice23) (Slice23_Body)(other.slice23); break;
+      case Tag::Slice24: ::new (&slice24) (Slice24_Body)(other.slice24); break;
+      default: break;
+    }
+  }
+  Baz& operator=(const Baz& other) {
+    if (this != &other) {
+      this->~Baz();
+      new (this) Baz(other);
+    }
+    return *this;
+  }
+};
+
+union Taz {
+  enum class Tag : uint8_t {
+    Bar3,
+    Taz1,
+    Taz3,
+  };
+
+  struct Taz1_Body {
+    Tag tag;
+    int32_t _0;
+  };
+
+  struct Taz3_Body {
+    Tag tag;
+    OwnedSlice<int32_t> _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Taz1_Body taz1;
+  Taz3_Body taz3;
+
+  static Taz Bar3() {
+    Taz result;
+    result.tag = Tag::Bar3;
+    return result;
+  }
+
+  bool IsBar3() const {
+    return tag == Tag::Bar3;
+  }
+
+  static Taz Taz1(const int32_t &_0) {
+    Taz result;
+    ::new (&result.taz1._0) (int32_t)(_0);
+    result.tag = Tag::Taz1;
+    return result;
+  }
+
+  bool IsTaz1() const {
+    return tag == Tag::Taz1;
+  }
+
+  static Taz Taz3(const OwnedSlice<int32_t> &_0) {
+    Taz result;
+    ::new (&result.taz3._0) (OwnedSlice<int32_t>)(_0);
+    result.tag = Tag::Taz3;
+    return result;
+  }
+
+  bool IsTaz3() const {
+    return tag == Tag::Taz3;
+  }
+
+  private:
+  Taz() {
+
+  }
+  public:
+
+
+  ~Taz() {
+    switch (tag) {
+      case Tag::Taz1: taz1.~Taz1_Body(); break;
+      case Tag::Taz3: taz3.~Taz3_Body(); break;
+      default: break;
+    }
+  }
+
+  Taz(const Taz& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Taz1: ::new (&taz1) (Taz1_Body)(other.taz1); break;
+      case Tag::Taz3: ::new (&taz3) (Taz3_Body)(other.taz3); break;
+      default: break;
+    }
+  }
+  Taz& operator=(const Taz& other) {
+    if (this != &other) {
+      this->~Taz();
+      new (this) Taz(other);
+    }
+    return *this;
+  }
+};
+
+union Tazz {
+  enum class Tag : uint8_t {
+    Bar4,
+    Taz2,
+  };
+
+  struct Taz2_Body {
+    Tag tag;
+    int32_t _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Taz2_Body taz2;
+
+  static Tazz Bar4() {
+    Tazz result;
+    result.tag = Tag::Bar4;
+    return result;
+  }
+
+  bool IsBar4() const {
+    return tag == Tag::Bar4;
+  }
+
+  static Tazz Taz2(const int32_t &_0) {
+    Tazz result;
+    ::new (&result.taz2._0) (int32_t)(_0);
+    result.tag = Tag::Taz2;
+    return result;
+  }
+
+  bool IsTaz2() const {
+    return tag == Tag::Taz2;
+  }
+
+  private:
+  Tazz() {
+
+  }
+  public:
+
+};
+
+union Tazzz {
+  enum class Tag : uint8_t {
+    Bar5,
+    Taz5,
+  };
+
+  struct Taz5_Body {
+    Tag tag;
+    int32_t _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Taz5_Body taz5;
+
+  static Tazzz Bar5() {
+    Tazzz result;
+    result.tag = Tag::Bar5;
+    return result;
+  }
+
+  bool IsBar5() const {
+    return tag == Tag::Bar5;
+  }
+
+  static Tazzz Taz5(const int32_t &_0) {
+    Tazzz result;
+    ::new (&result.taz5._0) (int32_t)(_0);
+    result.tag = Tag::Taz5;
+    return result;
+  }
+
+  bool IsTaz5() const {
+    return tag == Tag::Taz5;
+  }
+
+  private:
+  Tazzz() {
+
+  }
+  public:
+
+
+  ~Tazzz() {
+    switch (tag) {
+      case Tag::Taz5: taz5.~Taz5_Body(); break;
+      default: break;
+    }
+  }
+
+  Tazzz(const Tazzz& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Taz5: ::new (&taz5) (Taz5_Body)(other.taz5); break;
+      default: break;
+    }
+  }
+};
+
+union Tazzzz {
+  enum class Tag : uint8_t {
+    Taz6,
+    Taz7,
+  };
+
+  struct Taz6_Body {
+    Tag tag;
+    int32_t _0;
+  };
+
+  struct Taz7_Body {
+    Tag tag;
+    uint32_t _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Taz6_Body taz6;
+  Taz7_Body taz7;
+
+  static Tazzzz Taz6(const int32_t &_0) {
+    Tazzzz result;
+    ::new (&result.taz6._0) (int32_t)(_0);
+    result.tag = Tag::Taz6;
+    return result;
+  }
+
+  bool IsTaz6() const {
+    return tag == Tag::Taz6;
+  }
+
+  static Tazzzz Taz7(const uint32_t &_0) {
+    Tazzzz result;
+    ::new (&result.taz7._0) (uint32_t)(_0);
+    result.tag = Tag::Taz7;
+    return result;
+  }
+
+  bool IsTaz7() const {
+    return tag == Tag::Taz7;
+  }
+
+  private:
+  Tazzzz() {
+
+  }
+  public:
+
+
+  ~Tazzzz() {
+    switch (tag) {
+      case Tag::Taz6: taz6.~Taz6_Body(); break;
+      case Tag::Taz7: taz7.~Taz7_Body(); break;
+
+    }
+  }
+
+  Tazzzz(const Tazzzz& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Taz6: ::new (&taz6) (Taz6_Body)(other.taz6); break;
+      case Tag::Taz7: ::new (&taz7) (Taz7_Body)(other.taz7); break;
+
+    }
+  }
+  Tazzzz& operator=(const Tazzzz& other) {
+    if (this != &other) {
+      this->~Tazzzz();
+      new (this) Tazzzz(other);
+    }
+    return *this;
+  }
+};
+
+union Qux {
+  enum class Tag : uint8_t {
+    Qux1,
+    Qux2,
+  };
+
+  struct Qux1_Body {
+    Tag tag;
+    int32_t _0;
+
+    bool operator==(const Qux1_Body& other) const {
+      return _0 == other._0;
+    }
+  };
+
+  struct Qux2_Body {
+    Tag tag;
+    uint32_t _0;
+
+    bool operator==(const Qux2_Body& other) const {
+      return _0 == other._0;
+    }
+  };
+
+  struct {
+    Tag tag;
+  };
+  Qux1_Body qux1;
+  Qux2_Body qux2;
+
+  static Qux Qux1(const int32_t &_0) {
+    Qux result;
+    ::new (&result.qux1._0) (int32_t)(_0);
+    result.tag = Tag::Qux1;
+    return result;
+  }
+
+  bool IsQux1() const {
+    return tag == Tag::Qux1;
+  }
+
+  static Qux Qux2(const uint32_t &_0) {
+    Qux result;
+    ::new (&result.qux2._0) (uint32_t)(_0);
+    result.tag = Tag::Qux2;
+    return result;
+  }
+
+  bool IsQux2() const {
+    return tag == Tag::Qux2;
+  }
+
+  NODISCARD bool operator==(const Qux& other) const {
+    if (tag != other.tag) {
+      return false;
+    }
+    switch (tag) {
+      case Tag::Qux1: return qux1 == other.qux1;
+      case Tag::Qux2: return qux2 == other.qux2;
+
+    }
+    return true;
+  }
+
+  NODISCARD bool operator!=(const Qux& other) const {
+    return !(*this == other);
+  }
+
+  private:
+  Qux() {
+
+  }
+  public:
+
+
+  NOINLINE ~Qux() {
+    switch (tag) {
+      case Tag::Qux1: qux1.~Qux1_Body(); break;
+      case Tag::Qux2: qux2.~Qux2_Body(); break;
+
+    }
+  }
+
+  NOINLINE Qux(const Qux& other)
+   : tag(other.tag) {
+    switch (tag) {
+      case Tag::Qux1: ::new (&qux1) (Qux1_Body)(other.qux1); break;
+      case Tag::Qux2: ::new (&qux2) (Qux2_Body)(other.qux2); break;
+
+    }
+  }
+  NOINLINE Qux& operator=(const Qux& other) {
+    if (this != &other) {
+      this->~Qux();
+      new (this) Qux(other);
+    }
+    return *this;
+  }
+};
+
+extern "C" {
+
+void root(const Foo<uint32_t> *a,
+          const Baz<int32_t> *b,
+          const Taz *c,
+          Tazz d,
+          const Tazzz *e,
+          const Tazzzz *f,
+          const Qux *g);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor-and-copy-ctor.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,712 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-enum class FillRule : uint8_t {
-  A,
-  B,
-};
-
-/// This will have a destructor manually implemented via variant_body, and
-/// similarly a Drop impl in Rust.
-template<typename T>
-struct OwnedSlice {
-  uintptr_t len;
-  T *ptr;
-  ~OwnedSlice() {}
-};
-
-template<typename LengthPercentage>
-struct Polygon {
-  FillRule fill;
-  OwnedSlice<LengthPercentage> coordinates;
-};
-
-template<typename T>
-struct Foo {
-  enum class Tag : uint8_t {
-    Bar,
-    Polygon1,
-    Slice1,
-    Slice2,
-    Slice3,
-    Slice4,
-  };
-
-  struct Polygon1_Body {
-    Polygon<T> _0;
-  };
-
-  struct Slice1_Body {
-    OwnedSlice<T> _0;
-  };
-
-  struct Slice2_Body {
-    OwnedSlice<int32_t> _0;
-  };
-
-  struct Slice3_Body {
-    FillRule fill;
-    OwnedSlice<T> coords;
-  };
-
-  struct Slice4_Body {
-    FillRule fill;
-    OwnedSlice<int32_t> coords;
-  };
-
-  Tag tag;
-  union {
-    Polygon1_Body polygon1;
-    Slice1_Body slice1;
-    Slice2_Body slice2;
-    Slice3_Body slice3;
-    Slice4_Body slice4;
-  };
-
-  static Foo Bar() {
-    Foo result;
-    result.tag = Tag::Bar;
-    return result;
-  }
-
-  bool IsBar() const {
-    return tag == Tag::Bar;
-  }
-
-  static Foo Polygon1(const Polygon<T> &_0) {
-    Foo result;
-    ::new (&result.polygon1._0) (Polygon<T>)(_0);
-    result.tag = Tag::Polygon1;
-    return result;
-  }
-
-  bool IsPolygon1() const {
-    return tag == Tag::Polygon1;
-  }
-
-  static Foo Slice1(const OwnedSlice<T> &_0) {
-    Foo result;
-    ::new (&result.slice1._0) (OwnedSlice<T>)(_0);
-    result.tag = Tag::Slice1;
-    return result;
-  }
-
-  bool IsSlice1() const {
-    return tag == Tag::Slice1;
-  }
-
-  static Foo Slice2(const OwnedSlice<int32_t> &_0) {
-    Foo result;
-    ::new (&result.slice2._0) (OwnedSlice<int32_t>)(_0);
-    result.tag = Tag::Slice2;
-    return result;
-  }
-
-  bool IsSlice2() const {
-    return tag == Tag::Slice2;
-  }
-
-  static Foo Slice3(const FillRule &fill,
-                    const OwnedSlice<T> &coords) {
-    Foo result;
-    ::new (&result.slice3.fill) (FillRule)(fill);
-    ::new (&result.slice3.coords) (OwnedSlice<T>)(coords);
-    result.tag = Tag::Slice3;
-    return result;
-  }
-
-  bool IsSlice3() const {
-    return tag == Tag::Slice3;
-  }
-
-  static Foo Slice4(const FillRule &fill,
-                    const OwnedSlice<int32_t> &coords) {
-    Foo result;
-    ::new (&result.slice4.fill) (FillRule)(fill);
-    ::new (&result.slice4.coords) (OwnedSlice<int32_t>)(coords);
-    result.tag = Tag::Slice4;
-    return result;
-  }
-
-  bool IsSlice4() const {
-    return tag == Tag::Slice4;
-  }
-
-  private:
-  Foo() {
-
-  }
-  public:
-
-
-  ~Foo() {
-    switch (tag) {
-      case Tag::Polygon1: polygon1.~Polygon1_Body(); break;
-      case Tag::Slice1: slice1.~Slice1_Body(); break;
-      case Tag::Slice2: slice2.~Slice2_Body(); break;
-      case Tag::Slice3: slice3.~Slice3_Body(); break;
-      case Tag::Slice4: slice4.~Slice4_Body(); break;
-      default: break;
-    }
-  }
-
-  Foo(const Foo& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Polygon1: ::new (&polygon1) (Polygon1_Body)(other.polygon1); break;
-      case Tag::Slice1: ::new (&slice1) (Slice1_Body)(other.slice1); break;
-      case Tag::Slice2: ::new (&slice2) (Slice2_Body)(other.slice2); break;
-      case Tag::Slice3: ::new (&slice3) (Slice3_Body)(other.slice3); break;
-      case Tag::Slice4: ::new (&slice4) (Slice4_Body)(other.slice4); break;
-      default: break;
-    }
-  }
-  Foo& operator=(const Foo& other) {
-    if (this != &other) {
-      this->~Foo();
-      new (this) Foo(other);
-    }
-    return *this;
-  }
-};
-
-template<typename T>
-union Baz {
-  enum class Tag : uint8_t {
-    Bar2,
-    Polygon21,
-    Slice21,
-    Slice22,
-    Slice23,
-    Slice24,
-  };
-
-  struct Polygon21_Body {
-    Tag tag;
-    Polygon<T> _0;
-  };
-
-  struct Slice21_Body {
-    Tag tag;
-    OwnedSlice<T> _0;
-  };
-
-  struct Slice22_Body {
-    Tag tag;
-    OwnedSlice<int32_t> _0;
-  };
-
-  struct Slice23_Body {
-    Tag tag;
-    FillRule fill;
-    OwnedSlice<T> coords;
-  };
-
-  struct Slice24_Body {
-    Tag tag;
-    FillRule fill;
-    OwnedSlice<int32_t> coords;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Polygon21_Body polygon21;
-  Slice21_Body slice21;
-  Slice22_Body slice22;
-  Slice23_Body slice23;
-  Slice24_Body slice24;
-
-  static Baz Bar2() {
-    Baz result;
-    result.tag = Tag::Bar2;
-    return result;
-  }
-
-  bool IsBar2() const {
-    return tag == Tag::Bar2;
-  }
-
-  static Baz Polygon21(const Polygon<T> &_0) {
-    Baz result;
-    ::new (&result.polygon21._0) (Polygon<T>)(_0);
-    result.tag = Tag::Polygon21;
-    return result;
-  }
-
-  bool IsPolygon21() const {
-    return tag == Tag::Polygon21;
-  }
-
-  static Baz Slice21(const OwnedSlice<T> &_0) {
-    Baz result;
-    ::new (&result.slice21._0) (OwnedSlice<T>)(_0);
-    result.tag = Tag::Slice21;
-    return result;
-  }
-
-  bool IsSlice21() const {
-    return tag == Tag::Slice21;
-  }
-
-  static Baz Slice22(const OwnedSlice<int32_t> &_0) {
-    Baz result;
-    ::new (&result.slice22._0) (OwnedSlice<int32_t>)(_0);
-    result.tag = Tag::Slice22;
-    return result;
-  }
-
-  bool IsSlice22() const {
-    return tag == Tag::Slice22;
-  }
-
-  static Baz Slice23(const FillRule &fill,
-                     const OwnedSlice<T> &coords) {
-    Baz result;
-    ::new (&result.slice23.fill) (FillRule)(fill);
-    ::new (&result.slice23.coords) (OwnedSlice<T>)(coords);
-    result.tag = Tag::Slice23;
-    return result;
-  }
-
-  bool IsSlice23() const {
-    return tag == Tag::Slice23;
-  }
-
-  static Baz Slice24(const FillRule &fill,
-                     const OwnedSlice<int32_t> &coords) {
-    Baz result;
-    ::new (&result.slice24.fill) (FillRule)(fill);
-    ::new (&result.slice24.coords) (OwnedSlice<int32_t>)(coords);
-    result.tag = Tag::Slice24;
-    return result;
-  }
-
-  bool IsSlice24() const {
-    return tag == Tag::Slice24;
-  }
-
-  private:
-  Baz() {
-
-  }
-  public:
-
-
-  ~Baz() {
-    switch (tag) {
-      case Tag::Polygon21: polygon21.~Polygon21_Body(); break;
-      case Tag::Slice21: slice21.~Slice21_Body(); break;
-      case Tag::Slice22: slice22.~Slice22_Body(); break;
-      case Tag::Slice23: slice23.~Slice23_Body(); break;
-      case Tag::Slice24: slice24.~Slice24_Body(); break;
-      default: break;
-    }
-  }
-
-  Baz(const Baz& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Polygon21: ::new (&polygon21) (Polygon21_Body)(other.polygon21); break;
-      case Tag::Slice21: ::new (&slice21) (Slice21_Body)(other.slice21); break;
-      case Tag::Slice22: ::new (&slice22) (Slice22_Body)(other.slice22); break;
-      case Tag::Slice23: ::new (&slice23) (Slice23_Body)(other.slice23); break;
-      case Tag::Slice24: ::new (&slice24) (Slice24_Body)(other.slice24); break;
-      default: break;
-    }
-  }
-  Baz& operator=(const Baz& other) {
-    if (this != &other) {
-      this->~Baz();
-      new (this) Baz(other);
-    }
-    return *this;
-  }
-};
-
-union Taz {
-  enum class Tag : uint8_t {
-    Bar3,
-    Taz1,
-    Taz3,
-  };
-
-  struct Taz1_Body {
-    Tag tag;
-    int32_t _0;
-  };
-
-  struct Taz3_Body {
-    Tag tag;
-    OwnedSlice<int32_t> _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Taz1_Body taz1;
-  Taz3_Body taz3;
-
-  static Taz Bar3() {
-    Taz result;
-    result.tag = Tag::Bar3;
-    return result;
-  }
-
-  bool IsBar3() const {
-    return tag == Tag::Bar3;
-  }
-
-  static Taz Taz1(const int32_t &_0) {
-    Taz result;
-    ::new (&result.taz1._0) (int32_t)(_0);
-    result.tag = Tag::Taz1;
-    return result;
-  }
-
-  bool IsTaz1() const {
-    return tag == Tag::Taz1;
-  }
-
-  static Taz Taz3(const OwnedSlice<int32_t> &_0) {
-    Taz result;
-    ::new (&result.taz3._0) (OwnedSlice<int32_t>)(_0);
-    result.tag = Tag::Taz3;
-    return result;
-  }
-
-  bool IsTaz3() const {
-    return tag == Tag::Taz3;
-  }
-
-  private:
-  Taz() {
-
-  }
-  public:
-
-
-  ~Taz() {
-    switch (tag) {
-      case Tag::Taz1: taz1.~Taz1_Body(); break;
-      case Tag::Taz3: taz3.~Taz3_Body(); break;
-      default: break;
-    }
-  }
-
-  Taz(const Taz& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Taz1: ::new (&taz1) (Taz1_Body)(other.taz1); break;
-      case Tag::Taz3: ::new (&taz3) (Taz3_Body)(other.taz3); break;
-      default: break;
-    }
-  }
-  Taz& operator=(const Taz& other) {
-    if (this != &other) {
-      this->~Taz();
-      new (this) Taz(other);
-    }
-    return *this;
-  }
-};
-
-union Tazz {
-  enum class Tag : uint8_t {
-    Bar4,
-    Taz2,
-  };
-
-  struct Taz2_Body {
-    Tag tag;
-    int32_t _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Taz2_Body taz2;
-
-  static Tazz Bar4() {
-    Tazz result;
-    result.tag = Tag::Bar4;
-    return result;
-  }
-
-  bool IsBar4() const {
-    return tag == Tag::Bar4;
-  }
-
-  static Tazz Taz2(const int32_t &_0) {
-    Tazz result;
-    ::new (&result.taz2._0) (int32_t)(_0);
-    result.tag = Tag::Taz2;
-    return result;
-  }
-
-  bool IsTaz2() const {
-    return tag == Tag::Taz2;
-  }
-
-  private:
-  Tazz() {
-
-  }
-  public:
-
-};
-
-union Tazzz {
-  enum class Tag : uint8_t {
-    Bar5,
-    Taz5,
-  };
-
-  struct Taz5_Body {
-    Tag tag;
-    int32_t _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Taz5_Body taz5;
-
-  static Tazzz Bar5() {
-    Tazzz result;
-    result.tag = Tag::Bar5;
-    return result;
-  }
-
-  bool IsBar5() const {
-    return tag == Tag::Bar5;
-  }
-
-  static Tazzz Taz5(const int32_t &_0) {
-    Tazzz result;
-    ::new (&result.taz5._0) (int32_t)(_0);
-    result.tag = Tag::Taz5;
-    return result;
-  }
-
-  bool IsTaz5() const {
-    return tag == Tag::Taz5;
-  }
-
-  private:
-  Tazzz() {
-
-  }
-  public:
-
-
-  ~Tazzz() {
-    switch (tag) {
-      case Tag::Taz5: taz5.~Taz5_Body(); break;
-      default: break;
-    }
-  }
-
-  Tazzz(const Tazzz& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Taz5: ::new (&taz5) (Taz5_Body)(other.taz5); break;
-      default: break;
-    }
-  }
-};
-
-union Tazzzz {
-  enum class Tag : uint8_t {
-    Taz6,
-    Taz7,
-  };
-
-  struct Taz6_Body {
-    Tag tag;
-    int32_t _0;
-  };
-
-  struct Taz7_Body {
-    Tag tag;
-    uint32_t _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Taz6_Body taz6;
-  Taz7_Body taz7;
-
-  static Tazzzz Taz6(const int32_t &_0) {
-    Tazzzz result;
-    ::new (&result.taz6._0) (int32_t)(_0);
-    result.tag = Tag::Taz6;
-    return result;
-  }
-
-  bool IsTaz6() const {
-    return tag == Tag::Taz6;
-  }
-
-  static Tazzzz Taz7(const uint32_t &_0) {
-    Tazzzz result;
-    ::new (&result.taz7._0) (uint32_t)(_0);
-    result.tag = Tag::Taz7;
-    return result;
-  }
-
-  bool IsTaz7() const {
-    return tag == Tag::Taz7;
-  }
-
-  private:
-  Tazzzz() {
-
-  }
-  public:
-
-
-  ~Tazzzz() {
-    switch (tag) {
-      case Tag::Taz6: taz6.~Taz6_Body(); break;
-      case Tag::Taz7: taz7.~Taz7_Body(); break;
-
-    }
-  }
-
-  Tazzzz(const Tazzzz& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Taz6: ::new (&taz6) (Taz6_Body)(other.taz6); break;
-      case Tag::Taz7: ::new (&taz7) (Taz7_Body)(other.taz7); break;
-
-    }
-  }
-  Tazzzz& operator=(const Tazzzz& other) {
-    if (this != &other) {
-      this->~Tazzzz();
-      new (this) Tazzzz(other);
-    }
-    return *this;
-  }
-};
-
-union Qux {
-  enum class Tag : uint8_t {
-    Qux1,
-    Qux2,
-  };
-
-  struct Qux1_Body {
-    Tag tag;
-    int32_t _0;
-
-    bool operator==(const Qux1_Body& other) const {
-      return _0 == other._0;
-    }
-  };
-
-  struct Qux2_Body {
-    Tag tag;
-    uint32_t _0;
-
-    bool operator==(const Qux2_Body& other) const {
-      return _0 == other._0;
-    }
-  };
-
-  struct {
-    Tag tag;
-  };
-  Qux1_Body qux1;
-  Qux2_Body qux2;
-
-  static Qux Qux1(const int32_t &_0) {
-    Qux result;
-    ::new (&result.qux1._0) (int32_t)(_0);
-    result.tag = Tag::Qux1;
-    return result;
-  }
-
-  bool IsQux1() const {
-    return tag == Tag::Qux1;
-  }
-
-  static Qux Qux2(const uint32_t &_0) {
-    Qux result;
-    ::new (&result.qux2._0) (uint32_t)(_0);
-    result.tag = Tag::Qux2;
-    return result;
-  }
-
-  bool IsQux2() const {
-    return tag == Tag::Qux2;
-  }
-
-  NODISCARD bool operator==(const Qux& other) const {
-    if (tag != other.tag) {
-      return false;
-    }
-    switch (tag) {
-      case Tag::Qux1: return qux1 == other.qux1;
-      case Tag::Qux2: return qux2 == other.qux2;
-
-    }
-    return true;
-  }
-
-  NODISCARD bool operator!=(const Qux& other) const {
-    return !(*this == other);
-  }
-
-  private:
-  Qux() {
-
-  }
-  public:
-
-
-  NOINLINE ~Qux() {
-    switch (tag) {
-      case Tag::Qux1: qux1.~Qux1_Body(); break;
-      case Tag::Qux2: qux2.~Qux2_Body(); break;
-
-    }
-  }
-
-  NOINLINE Qux(const Qux& other)
-   : tag(other.tag) {
-    switch (tag) {
-      case Tag::Qux1: ::new (&qux1) (Qux1_Body)(other.qux1); break;
-      case Tag::Qux2: ::new (&qux2) (Qux2_Body)(other.qux2); break;
-
-    }
-  }
-  NOINLINE Qux& operator=(const Qux& other) {
-    if (this != &other) {
-      this->~Qux();
-      new (this) Qux(other);
-    }
-    return *this;
-  }
-};
-
-extern "C" {
-
-void root(const Foo<uint32_t> *a,
-          const Baz<int32_t> *b,
-          const Taz *c,
-          Tazz d,
-          const Tazzz *e,
-          const Tazzzz *f,
-          const Qux *g);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,156 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    A,
+    B,
+  ctypedef uint8_t FillRule;
+
+  # This will have a destructor manually implemented via variant_body, and
+  # similarly a Drop impl in Rust.
+  ctypedef struct OwnedSlice_u32:
+    uintptr_t len;
+    uint32_t *ptr;
+
+  ctypedef struct Polygon_u32:
+    FillRule fill;
+    OwnedSlice_u32 coordinates;
+
+  # This will have a destructor manually implemented via variant_body, and
+  # similarly a Drop impl in Rust.
+  ctypedef struct OwnedSlice_i32:
+    uintptr_t len;
+    int32_t *ptr;
+
+  cdef enum:
+    Bar_u32,
+    Polygon1_u32,
+    Slice1_u32,
+    Slice2_u32,
+    Slice3_u32,
+    Slice4_u32,
+  ctypedef uint8_t Foo_u32_Tag;
+
+  ctypedef struct Slice3_Body_u32:
+    FillRule fill;
+    OwnedSlice_u32 coords;
+
+  ctypedef struct Slice4_Body_u32:
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  ctypedef struct Foo_u32:
+    Foo_u32_Tag tag;
+    Polygon_u32 polygon1;
+    OwnedSlice_u32 slice1;
+    OwnedSlice_i32 slice2;
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+
+  ctypedef struct Polygon_i32:
+    FillRule fill;
+    OwnedSlice_i32 coordinates;
+
+  cdef enum:
+    Bar2_i32,
+    Polygon21_i32,
+    Slice21_i32,
+    Slice22_i32,
+    Slice23_i32,
+    Slice24_i32,
+  ctypedef uint8_t Baz_i32_Tag;
+
+  ctypedef struct Slice23_Body_i32:
+    Baz_i32_Tag tag;
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  ctypedef struct Slice24_Body_i32:
+    Baz_i32_Tag tag;
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  ctypedef union Baz_i32:
+    Baz_i32_Tag tag;
+    Baz_i32_Tag polygon21_tag;
+    Polygon_i32 polygon21;
+    Baz_i32_Tag slice21_tag;
+    OwnedSlice_i32 slice21;
+    Baz_i32_Tag slice22_tag;
+    OwnedSlice_i32 slice22;
+    Slice23_Body_i32 slice23;
+    Slice24_Body_i32 slice24;
+
+  cdef enum:
+    Bar3,
+    Taz1,
+    Taz3,
+  ctypedef uint8_t Taz_Tag;
+
+  ctypedef union Taz:
+    Taz_Tag tag;
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+    Taz_Tag taz3_tag;
+    OwnedSlice_i32 taz3;
+
+  cdef enum:
+    Bar4,
+    Taz2,
+  ctypedef uint8_t Tazz_Tag;
+
+  ctypedef union Tazz:
+    Tazz_Tag tag;
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+
+  cdef enum:
+    Bar5,
+    Taz5,
+  ctypedef uint8_t Tazzz_Tag;
+
+  ctypedef union Tazzz:
+    Tazzz_Tag tag;
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+
+  cdef enum:
+    Taz6,
+    Taz7,
+  ctypedef uint8_t Tazzzz_Tag;
+
+  ctypedef union Tazzzz:
+    Tazzzz_Tag tag;
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+
+  cdef enum:
+    Qux1,
+    Qux2,
+  ctypedef uint8_t Qux_Tag;
+
+  ctypedef union Qux:
+    Qux_Tag tag;
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+
+  void root(const Foo_u32 *a,
+            const Baz_i32 *b,
+            const Taz *c,
+            Tazz d,
+            const Tazzz *e,
+            const Tazzzz *f,
+            const Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,210 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule {
+  A,
+  B,
+};
+typedef uint8_t FillRule;
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+struct OwnedSlice_u32 {
+  uintptr_t len;
+  uint32_t *ptr;
+};
+
+struct Polygon_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coordinates;
+};
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+struct OwnedSlice_i32 {
+  uintptr_t len;
+  int32_t *ptr;
+};
+
+enum Foo_u32_Tag {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+typedef uint8_t Foo_u32_Tag;
+
+struct Slice3_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coords;
+};
+
+struct Slice4_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+struct Foo_u32 {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      struct Polygon_u32 polygon1;
+    };
+    struct {
+      struct OwnedSlice_u32 slice1;
+    };
+    struct {
+      struct OwnedSlice_i32 slice2;
+    };
+    struct Slice3_Body_u32 slice3;
+    struct Slice4_Body_u32 slice4;
+  };
+};
+
+struct Polygon_i32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coordinates;
+};
+
+enum Baz_i32_Tag {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+typedef uint8_t Baz_i32_Tag;
+
+struct Slice23_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+struct Slice24_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+union Baz_i32 {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    struct Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    struct OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    struct OwnedSlice_i32 slice22;
+  };
+  struct Slice23_Body_i32 slice23;
+  struct Slice24_Body_i32 slice24;
+};
+
+enum Taz_Tag {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+typedef uint8_t Taz_Tag;
+
+union Taz {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    struct OwnedSlice_i32 taz3;
+  };
+};
+
+enum Tazz_Tag {
+  Bar4,
+  Taz2,
+};
+typedef uint8_t Tazz_Tag;
+
+union Tazz {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+};
+
+enum Tazzz_Tag {
+  Bar5,
+  Taz5,
+};
+typedef uint8_t Tazzz_Tag;
+
+union Tazzz {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+};
+
+enum Tazzzz_Tag {
+  Taz6,
+  Taz7,
+};
+typedef uint8_t Tazzzz_Tag;
+
+union Tazzzz {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+};
+
+enum Qux_Tag {
+  Qux1,
+  Qux2,
+};
+typedef uint8_t Qux_Tag;
+
+union Qux {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+};
+
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,266 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum FillRule
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  A,
+  B,
+};
+#ifndef __cplusplus
+typedef uint8_t FillRule;
+#endif // __cplusplus
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+struct OwnedSlice_u32 {
+  uintptr_t len;
+  uint32_t *ptr;
+};
+
+struct Polygon_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coordinates;
+};
+
+/**
+ * This will have a destructor manually implemented via variant_body, and
+ * similarly a Drop impl in Rust.
+ */
+struct OwnedSlice_i32 {
+  uintptr_t len;
+  int32_t *ptr;
+};
+
+enum Foo_u32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar_u32,
+  Polygon1_u32,
+  Slice1_u32,
+  Slice2_u32,
+  Slice3_u32,
+  Slice4_u32,
+};
+#ifndef __cplusplus
+typedef uint8_t Foo_u32_Tag;
+#endif // __cplusplus
+
+struct Slice3_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_u32 coords;
+};
+
+struct Slice4_Body_u32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+struct Foo_u32 {
+  Foo_u32_Tag tag;
+  union {
+    struct {
+      struct Polygon_u32 polygon1;
+    };
+    struct {
+      struct OwnedSlice_u32 slice1;
+    };
+    struct {
+      struct OwnedSlice_i32 slice2;
+    };
+    struct Slice3_Body_u32 slice3;
+    struct Slice4_Body_u32 slice4;
+  };
+};
+
+struct Polygon_i32 {
+  FillRule fill;
+  struct OwnedSlice_i32 coordinates;
+};
+
+enum Baz_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar2_i32,
+  Polygon21_i32,
+  Slice21_i32,
+  Slice22_i32,
+  Slice23_i32,
+  Slice24_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t Baz_i32_Tag;
+#endif // __cplusplus
+
+struct Slice23_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+struct Slice24_Body_i32 {
+  Baz_i32_Tag tag;
+  FillRule fill;
+  struct OwnedSlice_i32 coords;
+};
+
+union Baz_i32 {
+  Baz_i32_Tag tag;
+  struct {
+    Baz_i32_Tag polygon21_tag;
+    struct Polygon_i32 polygon21;
+  };
+  struct {
+    Baz_i32_Tag slice21_tag;
+    struct OwnedSlice_i32 slice21;
+  };
+  struct {
+    Baz_i32_Tag slice22_tag;
+    struct OwnedSlice_i32 slice22;
+  };
+  struct Slice23_Body_i32 slice23;
+  struct Slice24_Body_i32 slice24;
+};
+
+enum Taz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar3,
+  Taz1,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t Taz_Tag;
+#endif // __cplusplus
+
+union Taz {
+  Taz_Tag tag;
+  struct {
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+  };
+  struct {
+    Taz_Tag taz3_tag;
+    struct OwnedSlice_i32 taz3;
+  };
+};
+
+enum Tazz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar4,
+  Taz2,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazz_Tag;
+#endif // __cplusplus
+
+union Tazz {
+  Tazz_Tag tag;
+  struct {
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+  };
+};
+
+enum Tazzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Bar5,
+  Taz5,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzz_Tag;
+#endif // __cplusplus
+
+union Tazzz {
+  Tazzz_Tag tag;
+  struct {
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+  };
+};
+
+enum Tazzzz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz6,
+  Taz7,
+};
+#ifndef __cplusplus
+typedef uint8_t Tazzzz_Tag;
+#endif // __cplusplus
+
+union Tazzzz {
+  Tazzzz_Tag tag;
+  struct {
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+  };
+  struct {
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+  };
+};
+
+enum Qux_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Qux1,
+  Qux2,
+};
+#ifndef __cplusplus
+typedef uint8_t Qux_Tag;
+#endif // __cplusplus
+
+union Qux {
+  Qux_Tag tag;
+  struct {
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+  };
+  struct {
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Foo_u32 *a,
+          const union Baz_i32 *b,
+          const union Taz *c,
+          union Tazz d,
+          const union Tazzz *e,
+          const union Tazzzz *f,
+          const union Qux *g);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/destructor_and_copy_ctor.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,156 @@
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    A,
+    B,
+  ctypedef uint8_t FillRule;
+
+  # This will have a destructor manually implemented via variant_body, and
+  # similarly a Drop impl in Rust.
+  cdef struct OwnedSlice_u32:
+    uintptr_t len;
+    uint32_t *ptr;
+
+  cdef struct Polygon_u32:
+    FillRule fill;
+    OwnedSlice_u32 coordinates;
+
+  # This will have a destructor manually implemented via variant_body, and
+  # similarly a Drop impl in Rust.
+  cdef struct OwnedSlice_i32:
+    uintptr_t len;
+    int32_t *ptr;
+
+  cdef enum:
+    Bar_u32,
+    Polygon1_u32,
+    Slice1_u32,
+    Slice2_u32,
+    Slice3_u32,
+    Slice4_u32,
+  ctypedef uint8_t Foo_u32_Tag;
+
+  cdef struct Slice3_Body_u32:
+    FillRule fill;
+    OwnedSlice_u32 coords;
+
+  cdef struct Slice4_Body_u32:
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  cdef struct Foo_u32:
+    Foo_u32_Tag tag;
+    Polygon_u32 polygon1;
+    OwnedSlice_u32 slice1;
+    OwnedSlice_i32 slice2;
+    Slice3_Body_u32 slice3;
+    Slice4_Body_u32 slice4;
+
+  cdef struct Polygon_i32:
+    FillRule fill;
+    OwnedSlice_i32 coordinates;
+
+  cdef enum:
+    Bar2_i32,
+    Polygon21_i32,
+    Slice21_i32,
+    Slice22_i32,
+    Slice23_i32,
+    Slice24_i32,
+  ctypedef uint8_t Baz_i32_Tag;
+
+  cdef struct Slice23_Body_i32:
+    Baz_i32_Tag tag;
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  cdef struct Slice24_Body_i32:
+    Baz_i32_Tag tag;
+    FillRule fill;
+    OwnedSlice_i32 coords;
+
+  cdef union Baz_i32:
+    Baz_i32_Tag tag;
+    Baz_i32_Tag polygon21_tag;
+    Polygon_i32 polygon21;
+    Baz_i32_Tag slice21_tag;
+    OwnedSlice_i32 slice21;
+    Baz_i32_Tag slice22_tag;
+    OwnedSlice_i32 slice22;
+    Slice23_Body_i32 slice23;
+    Slice24_Body_i32 slice24;
+
+  cdef enum:
+    Bar3,
+    Taz1,
+    Taz3,
+  ctypedef uint8_t Taz_Tag;
+
+  cdef union Taz:
+    Taz_Tag tag;
+    Taz_Tag taz1_tag;
+    int32_t taz1;
+    Taz_Tag taz3_tag;
+    OwnedSlice_i32 taz3;
+
+  cdef enum:
+    Bar4,
+    Taz2,
+  ctypedef uint8_t Tazz_Tag;
+
+  cdef union Tazz:
+    Tazz_Tag tag;
+    Tazz_Tag taz2_tag;
+    int32_t taz2;
+
+  cdef enum:
+    Bar5,
+    Taz5,
+  ctypedef uint8_t Tazzz_Tag;
+
+  cdef union Tazzz:
+    Tazzz_Tag tag;
+    Tazzz_Tag taz5_tag;
+    int32_t taz5;
+
+  cdef enum:
+    Taz6,
+    Taz7,
+  ctypedef uint8_t Tazzzz_Tag;
+
+  cdef union Tazzzz:
+    Tazzzz_Tag tag;
+    Tazzzz_Tag taz6_tag;
+    int32_t taz6;
+    Tazzzz_Tag taz7_tag;
+    uint32_t taz7;
+
+  cdef enum:
+    Qux1,
+    Qux2,
+  ctypedef uint8_t Qux_Tag;
+
+  cdef union Qux:
+    Qux_Tag tag;
+    Qux_Tag qux1_tag;
+    int32_t qux1;
+    Qux_Tag qux2_tag;
+    uint32_t qux2;
+
+  void root(const Foo_u32 *a,
+            const Baz_i32 *b,
+            const Taz *c,
+            Tazz d,
+            const Tazzz *e,
+            const Tazzzz *f,
+            const Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Rect {
+  float x;
+  float y;
+  float w;
+  float h;
+} Rect;
+
+typedef struct Color {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+  uint8_t a;
+} Color;
+
+enum DisplayItem_Tag {
+  Fill,
+  Image,
+  ClearScreen,
+};
+typedef uint8_t DisplayItem_Tag;
+
+typedef struct Fill_Body {
+  DisplayItem_Tag tag;
+  struct Rect _0;
+  struct Color _1;
+} Fill_Body;
+
+typedef struct Image_Body {
+  DisplayItem_Tag tag;
+  uint32_t id;
+  struct Rect bounds;
+} Image_Body;
+
+typedef union DisplayItem {
+  DisplayItem_Tag tag;
+  Fill_Body fill;
+  Image_Body image;
+} DisplayItem;
+
+bool push_item(union DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,59 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Rect {
+  float x;
+  float y;
+  float w;
+  float h;
+} Rect;
+
+typedef struct Color {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+  uint8_t a;
+} Color;
+
+enum DisplayItem_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Fill,
+  Image,
+  ClearScreen,
+};
+#ifndef __cplusplus
+typedef uint8_t DisplayItem_Tag;
+#endif // __cplusplus
+
+typedef struct Fill_Body {
+  DisplayItem_Tag tag;
+  struct Rect _0;
+  struct Color _1;
+} Fill_Body;
+
+typedef struct Image_Body {
+  DisplayItem_Tag tag;
+  uint32_t id;
+  struct Rect bounds;
+} Image_Body;
+
+typedef union DisplayItem {
+  DisplayItem_Tag tag;
+  Fill_Body fill;
+  Image_Body image;
+} DisplayItem;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+bool push_item(union DisplayItem item);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,42 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Rect:
+    float x;
+    float y;
+    float w;
+    float h;
+
+  ctypedef struct Color:
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+    uint8_t a;
+
+  cdef enum:
+    Fill,
+    Image,
+    ClearScreen,
+  ctypedef uint8_t DisplayItem_Tag;
+
+  ctypedef struct Fill_Body:
+    DisplayItem_Tag tag;
+    Rect _0;
+    Color _1;
+
+  ctypedef struct Image_Body:
+    DisplayItem_Tag tag;
+    uint32_t id;
+    Rect bounds;
+
+  ctypedef union DisplayItem:
+    DisplayItem_Tag tag;
+    Fill_Body fill;
+    Image_Body image;
+
+  bool push_item(DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Rect {
+  float x;
+  float y;
+  float w;
+  float h;
+};
+
+struct Color {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+  uint8_t a;
+};
+
+enum DisplayItem_Tag {
+  Fill,
+  Image,
+  ClearScreen,
+};
+typedef uint8_t DisplayItem_Tag;
+
+struct Fill_Body {
+  DisplayItem_Tag tag;
+  struct Rect _0;
+  struct Color _1;
+};
+
+struct Image_Body {
+  DisplayItem_Tag tag;
+  uint32_t id;
+  struct Rect bounds;
+};
+
+union DisplayItem {
+  DisplayItem_Tag tag;
+  struct Fill_Body fill;
+  struct Image_Body image;
+};
+
+bool push_item(union DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,59 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Rect {
+  float x;
+  float y;
+  float w;
+  float h;
+};
+
+struct Color {
+  uint8_t r;
+  uint8_t g;
+  uint8_t b;
+  uint8_t a;
+};
+
+enum DisplayItem_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Fill,
+  Image,
+  ClearScreen,
+};
+#ifndef __cplusplus
+typedef uint8_t DisplayItem_Tag;
+#endif // __cplusplus
+
+struct Fill_Body {
+  DisplayItem_Tag tag;
+  struct Rect _0;
+  struct Color _1;
+};
+
+struct Image_Body {
+  DisplayItem_Tag tag;
+  uint32_t id;
+  struct Rect bounds;
+};
+
+union DisplayItem {
+  DisplayItem_Tag tag;
+  struct Fill_Body fill;
+  struct Image_Body image;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+bool push_item(union DisplayItem item);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/display_list.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/display_list.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,42 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Rect:
+    float x;
+    float y;
+    float w;
+    float h;
+
+  cdef struct Color:
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+    uint8_t a;
+
+  cdef enum:
+    Fill,
+    Image,
+    ClearScreen,
+  ctypedef uint8_t DisplayItem_Tag;
+
+  cdef struct Fill_Body:
+    DisplayItem_Tag tag;
+    Rect _0;
+    Color _1;
+
+  cdef struct Image_Body:
+    DisplayItem_Tag tag;
+    uint32_t id;
+    Rect bounds;
+
+  cdef union DisplayItem:
+    DisplayItem_Tag tag;
+    Fill_Body fill;
+    Image_Body image;
+
+  bool push_item(DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_auto.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_auto.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_auto.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_auto.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # The root of all evil.
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_c99.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_c99.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_c99.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_c99.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # The root of all evil.
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_doxy.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_doxy.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/docstyle_doxy.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/docstyle_doxy.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # The root of all evil.
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/documentation_attr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/documentation_attr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/documentation_attr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/documentation_attr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  #With doc attr, each attr contribute to one line of document
+  #like this one with a new line character at its end
+  #and this one as well. So they are in the same paragraph
+  #
+  #Line ends with one new line should not break
+  #
+  #Line ends with two spaces and a new line
+  #should break to next line
+  #
+  #Line ends with two new lines
+  #
+  #Should break to next paragraph
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/documentation.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/documentation.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/documentation.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/documentation.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,27 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # The root of all evil.
+  #
+  # But at least it contains some more documentation as someone would expect
+  # from a simple test case like this.
+  #
+  # # Hint
+  #
+  # Always ensure that everything is properly documented, even if you feel lazy.
+  # **Sometimes** it is also helpful to include some markdown formatting.
+  #
+  # ////////////////////////////////////////////////////////////////////////////
+  #
+  # Attention:
+  #
+  #    Rust is going to trim all leading `/` symbols. If you want to use them as a
+  #    marker you need to add at least a single whitespace inbetween the tripple
+  #    slash doc-comment marker and the rest.
+  #
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,207 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A {
+  a1 = 0,
+  a2 = 2,
+  a3,
+  a4 = 5,
+};
+typedef uint64_t A;
+
+enum B {
+  b1 = 0,
+  b2 = 2,
+  b3,
+  b4 = 5,
+};
+typedef uint32_t B;
+
+enum C {
+  c1 = 0,
+  c2 = 2,
+  c3,
+  c4 = 5,
+};
+typedef uint16_t C;
+
+enum D {
+  d1 = 0,
+  d2 = 2,
+  d3,
+  d4 = 5,
+};
+typedef uint8_t D;
+
+enum E {
+  e1 = 0,
+  e2 = 2,
+  e3,
+  e4 = 5,
+};
+typedef uintptr_t E;
+
+enum F {
+  f1 = 0,
+  f2 = 2,
+  f3,
+  f4 = 5,
+};
+typedef intptr_t F;
+
+typedef enum L {
+  l1,
+  l2,
+  l3,
+  l4,
+} L;
+
+enum M {
+  m1 = -1,
+  m2 = 0,
+  m3 = 1,
+};
+typedef int8_t M;
+
+typedef enum N {
+  n1,
+  n2,
+  n3,
+  n4,
+} N;
+
+enum O {
+  o1,
+  o2,
+  o3,
+  o4,
+};
+typedef int8_t O;
+
+typedef struct J J;
+
+typedef struct K K;
+
+typedef struct Opaque Opaque;
+
+enum G_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t G_Tag;
+
+typedef struct Bar_Body {
+  G_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union G {
+  G_Tag tag;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} G;
+
+typedef enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+} H_Tag;
+
+typedef struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum I_Tag {
+  I_Foo,
+  I_Bar,
+  I_Baz,
+};
+typedef uint8_t I_Tag;
+
+typedef struct I_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} I_Bar_Body;
+
+typedef struct I {
+  I_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    I_Bar_Body bar;
+  };
+} I;
+
+enum P_Tag {
+  P0,
+  P1,
+};
+typedef uint8_t P_Tag;
+
+typedef struct P1_Body {
+  uint8_t _0;
+  uint8_t _1;
+  uint8_t _2;
+} P1_Body;
+
+typedef struct P {
+  P_Tag tag;
+  union {
+    struct {
+      uint8_t p0;
+    };
+    P1_Body p1;
+  };
+} P;
+
+void root(struct Opaque *opaque,
+          A a,
+          B b,
+          C c,
+          D d,
+          E e,
+          F f,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
+          M m,
+          enum N n,
+          O o,
+          struct P p);
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,281 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A
+#ifdef __cplusplus
+  : uint64_t
+#endif // __cplusplus
+ {
+  a1 = 0,
+  a2 = 2,
+  a3,
+  a4 = 5,
+};
+#ifndef __cplusplus
+typedef uint64_t A;
+#endif // __cplusplus
+
+enum B
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  b1 = 0,
+  b2 = 2,
+  b3,
+  b4 = 5,
+};
+#ifndef __cplusplus
+typedef uint32_t B;
+#endif // __cplusplus
+
+enum C
+#ifdef __cplusplus
+  : uint16_t
+#endif // __cplusplus
+ {
+  c1 = 0,
+  c2 = 2,
+  c3,
+  c4 = 5,
+};
+#ifndef __cplusplus
+typedef uint16_t C;
+#endif // __cplusplus
+
+enum D
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  d1 = 0,
+  d2 = 2,
+  d3,
+  d4 = 5,
+};
+#ifndef __cplusplus
+typedef uint8_t D;
+#endif // __cplusplus
+
+enum E
+#ifdef __cplusplus
+  : uintptr_t
+#endif // __cplusplus
+ {
+  e1 = 0,
+  e2 = 2,
+  e3,
+  e4 = 5,
+};
+#ifndef __cplusplus
+typedef uintptr_t E;
+#endif // __cplusplus
+
+enum F
+#ifdef __cplusplus
+  : intptr_t
+#endif // __cplusplus
+ {
+  f1 = 0,
+  f2 = 2,
+  f3,
+  f4 = 5,
+};
+#ifndef __cplusplus
+typedef intptr_t F;
+#endif // __cplusplus
+
+typedef enum L {
+  l1,
+  l2,
+  l3,
+  l4,
+} L;
+
+enum M
+#ifdef __cplusplus
+  : int8_t
+#endif // __cplusplus
+ {
+  m1 = -1,
+  m2 = 0,
+  m3 = 1,
+};
+#ifndef __cplusplus
+typedef int8_t M;
+#endif // __cplusplus
+
+typedef enum N {
+  n1,
+  n2,
+  n3,
+  n4,
+} N;
+
+enum O
+#ifdef __cplusplus
+  : int8_t
+#endif // __cplusplus
+ {
+  o1,
+  o2,
+  o3,
+  o4,
+};
+#ifndef __cplusplus
+typedef int8_t O;
+#endif // __cplusplus
+
+typedef struct J J;
+
+typedef struct K K;
+
+typedef struct Opaque Opaque;
+
+enum G_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t G_Tag;
+#endif // __cplusplus
+
+typedef struct Bar_Body {
+  G_Tag tag;
+  uint8_t x;
+  int16_t y;
+} Bar_Body;
+
+typedef union G {
+  G_Tag tag;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
+  Bar_Body bar;
+} G;
+
+typedef enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+} H_Tag;
+
+typedef struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} H_Bar_Body;
+
+typedef struct H {
+  H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    H_Bar_Body bar;
+  };
+} H;
+
+enum I_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  I_Foo,
+  I_Bar,
+  I_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t I_Tag;
+#endif // __cplusplus
+
+typedef struct I_Bar_Body {
+  uint8_t x;
+  int16_t y;
+} I_Bar_Body;
+
+typedef struct I {
+  I_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    I_Bar_Body bar;
+  };
+} I;
+
+enum P_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  P0,
+  P1,
+};
+#ifndef __cplusplus
+typedef uint8_t P_Tag;
+#endif // __cplusplus
+
+typedef struct P1_Body {
+  uint8_t _0;
+  uint8_t _1;
+  uint8_t _2;
+} P1_Body;
+
+typedef struct P {
+  P_Tag tag;
+  union {
+    struct {
+      uint8_t p0;
+    };
+    P1_Body p1;
+  };
+} P;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *opaque,
+          A a,
+          B b,
+          C c,
+          D d,
+          E e,
+          F f,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
+          M m,
+          enum N n,
+          O o,
+          struct P p);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.c	2021-01-18 19:59:04.000000000 +0000
@@ -95,18 +95,16 @@
 
 typedef struct {
   G_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  G_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   G_Tag tag;
-  Foo_Body foo;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } G;
 
@@ -117,10 +115,6 @@
 } H_Tag;
 
 typedef struct {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } H_Bar_Body;
@@ -128,7 +122,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    H_Foo_Body foo;
+    struct {
+      int16_t foo;
+    };
     H_Bar_Body bar;
   };
 } H;
@@ -141,10 +137,6 @@
 typedef uint8_t I_Tag;
 
 typedef struct {
-  int16_t _0;
-} I_Foo_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } I_Bar_Body;
@@ -152,7 +144,9 @@
 typedef struct {
   I_Tag tag;
   union {
-    I_Foo_Body foo;
+    struct {
+      int16_t foo;
+    };
     I_Bar_Body bar;
   };
 } I;
@@ -165,10 +159,6 @@
 
 typedef struct {
   uint8_t _0;
-} P0_Body;
-
-typedef struct {
-  uint8_t _0;
   uint8_t _1;
   uint8_t _2;
 } P1_Body;
@@ -176,7 +166,9 @@
 typedef struct {
   P_Tag tag;
   union {
-    P0_Body p0;
+    struct {
+      uint8_t p0;
+    };
     P1_Body p1;
   };
 } P;
@@ -199,9 +191,17 @@
           O o,
           P p);
 
+#if 0
+''' '
+#endif
+
 #include <stddef.h>
 #include "testing-helpers.h"
 static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
 static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -149,18 +149,16 @@
 
 typedef struct {
   G_Tag tag;
-  int16_t _0;
-} Foo_Body;
-
-typedef struct {
-  G_Tag tag;
   uint8_t x;
   int16_t y;
 } Bar_Body;
 
 typedef union {
   G_Tag tag;
-  Foo_Body foo;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
   Bar_Body bar;
 } G;
 
@@ -171,10 +169,6 @@
 } H_Tag;
 
 typedef struct {
-  int16_t _0;
-} H_Foo_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } H_Bar_Body;
@@ -182,7 +176,9 @@
 typedef struct {
   H_Tag tag;
   union {
-    H_Foo_Body foo;
+    struct {
+      int16_t foo;
+    };
     H_Bar_Body bar;
   };
 } H;
@@ -201,10 +197,6 @@
 #endif // __cplusplus
 
 typedef struct {
-  int16_t _0;
-} I_Foo_Body;
-
-typedef struct {
   uint8_t x;
   int16_t y;
 } I_Bar_Body;
@@ -212,7 +204,9 @@
 typedef struct {
   I_Tag tag;
   union {
-    I_Foo_Body foo;
+    struct {
+      int16_t foo;
+    };
     I_Bar_Body bar;
   };
 } I;
@@ -231,10 +225,6 @@
 
 typedef struct {
   uint8_t _0;
-} P0_Body;
-
-typedef struct {
-  uint8_t _0;
   uint8_t _1;
   uint8_t _2;
 } P1_Body;
@@ -242,7 +232,9 @@
 typedef struct {
   P_Tag tag;
   union {
-    P0_Body p0;
+    struct {
+      uint8_t p0;
+    };
     P1_Body p1;
   };
 } P;
@@ -273,9 +265,17 @@
 } // extern "C"
 #endif // __cplusplus
 
+#if 0
+''' '
+#endif
+
 #include <stddef.h>
 #include "testing-helpers.h"
 static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
 static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -195,9 +195,17 @@
 
 } // extern "C"
 
+#if 0
+''' '
+#endif
+
 #include <stddef.h>
 #include "testing-helpers.h"
 static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
 static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOURTY_FOUR 4
+
+enum E {
+  A = 1,
+  B = -1,
+  C = (1 + 2),
+  D = FOURTY_FOUR,
+  F = 5,
+  G = (int8_t)54,
+  H = (int8_t)false,
+};
+typedef int8_t E;
+
+void root(const E*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,33 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOURTY_FOUR 4
+
+enum E
+#ifdef __cplusplus
+  : int8_t
+#endif // __cplusplus
+ {
+  A = 1,
+  B = -1,
+  C = (1 + 2),
+  D = FOURTY_FOUR,
+  F = 5,
+  G = (int8_t)54,
+  H = (int8_t)false,
+};
+#ifndef __cplusplus
+typedef int8_t E;
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const E*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+static const int8_t FOURTY_FOUR = 4;
+
+enum class E : int8_t {
+  A = 1,
+  B = -1,
+  C = (1 + 2),
+  D = FOURTY_FOUR,
+  F = 5,
+  G = (int8_t)54,
+  H = (int8_t)false,
+};
+
+extern "C" {
+
+void root(const E*);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_discriminant.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_discriminant.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int8_t FOURTY_FOUR # = 4
+
+  cdef enum:
+    A # = 1,
+    B # = -1,
+    C # = (1 + 2),
+    D # = FOURTY_FOUR,
+    F # = 5,
+    G # = <int8_t>54,
+    H # = <int8_t>False,
+  ctypedef int8_t E;
+
+  void root(const E*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,177 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    a1 # = 0,
+    a2 # = 2,
+    a3,
+    a4 # = 5,
+  ctypedef uint64_t A;
+
+  cdef enum:
+    b1 # = 0,
+    b2 # = 2,
+    b3,
+    b4 # = 5,
+  ctypedef uint32_t B;
+
+  cdef enum:
+    c1 # = 0,
+    c2 # = 2,
+    c3,
+    c4 # = 5,
+  ctypedef uint16_t C;
+
+  cdef enum:
+    d1 # = 0,
+    d2 # = 2,
+    d3,
+    d4 # = 5,
+  ctypedef uint8_t D;
+
+  cdef enum:
+    e1 # = 0,
+    e2 # = 2,
+    e3,
+    e4 # = 5,
+  ctypedef uintptr_t E;
+
+  cdef enum:
+    f1 # = 0,
+    f2 # = 2,
+    f3,
+    f4 # = 5,
+  ctypedef intptr_t F;
+
+  ctypedef enum L:
+    l1,
+    l2,
+    l3,
+    l4,
+
+  cdef enum:
+    m1 # = -1,
+    m2 # = 0,
+    m3 # = 1,
+  ctypedef int8_t M;
+
+  ctypedef enum N:
+    n1,
+    n2,
+    n3,
+    n4,
+
+  cdef enum:
+    o1,
+    o2,
+    o3,
+    o4,
+  ctypedef int8_t O;
+
+  ctypedef struct J:
+    pass
+
+  ctypedef struct K:
+    pass
+
+  ctypedef struct Opaque:
+    pass
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t G_Tag;
+
+  ctypedef struct Bar_Body:
+    G_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  ctypedef union G:
+    G_Tag tag;
+    G_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  ctypedef enum H_Tag:
+    H_Foo,
+    H_Bar,
+    H_Baz,
+
+  ctypedef struct H_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct H:
+    H_Tag tag;
+    int16_t foo;
+    H_Bar_Body bar;
+
+  cdef enum:
+    I_Foo,
+    I_Bar,
+    I_Baz,
+  ctypedef uint8_t I_Tag;
+
+  ctypedef struct I_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  ctypedef struct I:
+    I_Tag tag;
+    int16_t foo;
+    I_Bar_Body bar;
+
+  cdef enum:
+    P0,
+    P1,
+  ctypedef uint8_t P_Tag;
+
+  ctypedef struct P1_Body:
+    uint8_t _0;
+    uint8_t _1;
+    uint8_t _2;
+
+  ctypedef struct P:
+    P_Tag tag;
+    uint8_t p0;
+    P1_Body p1;
+
+  void root(Opaque *opaque,
+            A a,
+            B b,
+            C c,
+            D d,
+            E e,
+            F f,
+            G g,
+            H h,
+            I i,
+            J j,
+            K k,
+            L l,
+            M m,
+            N n,
+            O o,
+            P p);
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+enum Bar_Tag {
+  Min,
+  Max,
+  Other,
+};
+typedef uint8_t Bar_Tag;
+
+typedef union Bar {
+  Bar_Tag tag;
+  struct {
+    Bar_Tag min_tag;
+    struct Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    struct Foo_Bar max;
+  };
+} Bar;
+
+void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+enum Bar_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Min,
+  Max,
+  Other,
+};
+#ifndef __cplusplus
+typedef uint8_t Bar_Tag;
+#endif // __cplusplus
+
+typedef union Bar {
+  Bar_Tag tag;
+  struct {
+    Bar_Tag min_tag;
+    struct Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    struct Foo_Bar max;
+  };
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.c	2021-01-18 19:59:04.000000000 +0000
@@ -14,20 +14,16 @@
 };
 typedef uint8_t Bar_Tag;
 
-typedef struct {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Min_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Max_Body;
-
 typedef union {
   Bar_Tag tag;
-  Min_Body min;
-  Max_Body max;
+  struct {
+    Bar_Tag min_tag;
+    Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    Foo_Bar max;
+  };
 } Bar;
 
 void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -20,20 +20,16 @@
 typedef uint8_t Bar_Tag;
 #endif // __cplusplus
 
-typedef struct {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Min_Body;
-
-typedef struct {
-  Bar_Tag tag;
-  Foo_Bar _0;
-} Max_Body;
-
 typedef union {
   Bar_Tag tag;
-  Min_Body min;
-  Max_Body max;
+  struct {
+    Bar_Tag min_tag;
+    Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    Foo_Bar max;
+  };
 } Bar;
 
 #ifdef __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo_Bar:
+    const int32_t *something;
+
+  cdef enum:
+    Min,
+    Max,
+    Other,
+  ctypedef uint8_t Bar_Tag;
+
+  ctypedef union Bar:
+    Bar_Tag tag;
+    Bar_Tag min_tag;
+    Foo_Bar min;
+    Bar_Tag max_tag;
+    Foo_Bar max;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+enum Bar_Tag {
+  Min,
+  Max,
+  Other,
+};
+typedef uint8_t Bar_Tag;
+
+union Bar {
+  Bar_Tag tag;
+  struct {
+    Bar_Tag min_tag;
+    struct Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    struct Foo_Bar max;
+  };
+};
+
+void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+enum Bar_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Min,
+  Max,
+  Other,
+};
+#ifndef __cplusplus
+typedef uint8_t Bar_Tag;
+#endif // __cplusplus
+
+union Bar {
+  Bar_Tag tag;
+  struct {
+    Bar_Tag min_tag;
+    struct Foo_Bar min;
+  };
+  struct {
+    Bar_Tag max_tag;
+    struct Foo_Bar max;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum_self.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum_self.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo_Bar:
+    const int32_t *something;
+
+  cdef enum:
+    Min,
+    Max,
+    Other,
+  ctypedef uint8_t Bar_Tag;
+
+  cdef union Bar:
+    Bar_Tag tag;
+    Bar_Tag min_tag;
+    Foo_Bar min;
+    Bar_Tag max_tag;
+    Foo_Bar max;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,207 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A {
+  a1 = 0,
+  a2 = 2,
+  a3,
+  a4 = 5,
+};
+typedef uint64_t A;
+
+enum B {
+  b1 = 0,
+  b2 = 2,
+  b3,
+  b4 = 5,
+};
+typedef uint32_t B;
+
+enum C {
+  c1 = 0,
+  c2 = 2,
+  c3,
+  c4 = 5,
+};
+typedef uint16_t C;
+
+enum D {
+  d1 = 0,
+  d2 = 2,
+  d3,
+  d4 = 5,
+};
+typedef uint8_t D;
+
+enum E {
+  e1 = 0,
+  e2 = 2,
+  e3,
+  e4 = 5,
+};
+typedef uintptr_t E;
+
+enum F {
+  f1 = 0,
+  f2 = 2,
+  f3,
+  f4 = 5,
+};
+typedef intptr_t F;
+
+enum L {
+  l1,
+  l2,
+  l3,
+  l4,
+};
+
+enum M {
+  m1 = -1,
+  m2 = 0,
+  m3 = 1,
+};
+typedef int8_t M;
+
+enum N {
+  n1,
+  n2,
+  n3,
+  n4,
+};
+
+enum O {
+  o1,
+  o2,
+  o3,
+  o4,
+};
+typedef int8_t O;
+
+struct J;
+
+struct K;
+
+struct Opaque;
+
+enum G_Tag {
+  Foo,
+  Bar,
+  Baz,
+};
+typedef uint8_t G_Tag;
+
+struct Bar_Body {
+  G_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union G {
+  G_Tag tag;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+
+struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  enum H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct H_Bar_Body bar;
+  };
+};
+
+enum I_Tag {
+  I_Foo,
+  I_Bar,
+  I_Baz,
+};
+typedef uint8_t I_Tag;
+
+struct I_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct I {
+  I_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct I_Bar_Body bar;
+  };
+};
+
+enum P_Tag {
+  P0,
+  P1,
+};
+typedef uint8_t P_Tag;
+
+struct P1_Body {
+  uint8_t _0;
+  uint8_t _1;
+  uint8_t _2;
+};
+
+struct P {
+  P_Tag tag;
+  union {
+    struct {
+      uint8_t p0;
+    };
+    struct P1_Body p1;
+  };
+};
+
+void root(struct Opaque *opaque,
+          A a,
+          B b,
+          C c,
+          D d,
+          E e,
+          F f,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
+          M m,
+          enum N n,
+          O o,
+          struct P p);
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,281 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A
+#ifdef __cplusplus
+  : uint64_t
+#endif // __cplusplus
+ {
+  a1 = 0,
+  a2 = 2,
+  a3,
+  a4 = 5,
+};
+#ifndef __cplusplus
+typedef uint64_t A;
+#endif // __cplusplus
+
+enum B
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  b1 = 0,
+  b2 = 2,
+  b3,
+  b4 = 5,
+};
+#ifndef __cplusplus
+typedef uint32_t B;
+#endif // __cplusplus
+
+enum C
+#ifdef __cplusplus
+  : uint16_t
+#endif // __cplusplus
+ {
+  c1 = 0,
+  c2 = 2,
+  c3,
+  c4 = 5,
+};
+#ifndef __cplusplus
+typedef uint16_t C;
+#endif // __cplusplus
+
+enum D
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  d1 = 0,
+  d2 = 2,
+  d3,
+  d4 = 5,
+};
+#ifndef __cplusplus
+typedef uint8_t D;
+#endif // __cplusplus
+
+enum E
+#ifdef __cplusplus
+  : uintptr_t
+#endif // __cplusplus
+ {
+  e1 = 0,
+  e2 = 2,
+  e3,
+  e4 = 5,
+};
+#ifndef __cplusplus
+typedef uintptr_t E;
+#endif // __cplusplus
+
+enum F
+#ifdef __cplusplus
+  : intptr_t
+#endif // __cplusplus
+ {
+  f1 = 0,
+  f2 = 2,
+  f3,
+  f4 = 5,
+};
+#ifndef __cplusplus
+typedef intptr_t F;
+#endif // __cplusplus
+
+enum L {
+  l1,
+  l2,
+  l3,
+  l4,
+};
+
+enum M
+#ifdef __cplusplus
+  : int8_t
+#endif // __cplusplus
+ {
+  m1 = -1,
+  m2 = 0,
+  m3 = 1,
+};
+#ifndef __cplusplus
+typedef int8_t M;
+#endif // __cplusplus
+
+enum N {
+  n1,
+  n2,
+  n3,
+  n4,
+};
+
+enum O
+#ifdef __cplusplus
+  : int8_t
+#endif // __cplusplus
+ {
+  o1,
+  o2,
+  o3,
+  o4,
+};
+#ifndef __cplusplus
+typedef int8_t O;
+#endif // __cplusplus
+
+struct J;
+
+struct K;
+
+struct Opaque;
+
+enum G_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo,
+  Bar,
+  Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t G_Tag;
+#endif // __cplusplus
+
+struct Bar_Body {
+  G_Tag tag;
+  uint8_t x;
+  int16_t y;
+};
+
+union G {
+  G_Tag tag;
+  struct {
+    G_Tag foo_tag;
+    int16_t foo;
+  };
+  struct Bar_Body bar;
+};
+
+enum H_Tag {
+  H_Foo,
+  H_Bar,
+  H_Baz,
+};
+
+struct H_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct H {
+  enum H_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct H_Bar_Body bar;
+  };
+};
+
+enum I_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  I_Foo,
+  I_Bar,
+  I_Baz,
+};
+#ifndef __cplusplus
+typedef uint8_t I_Tag;
+#endif // __cplusplus
+
+struct I_Bar_Body {
+  uint8_t x;
+  int16_t y;
+};
+
+struct I {
+  I_Tag tag;
+  union {
+    struct {
+      int16_t foo;
+    };
+    struct I_Bar_Body bar;
+  };
+};
+
+enum P_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  P0,
+  P1,
+};
+#ifndef __cplusplus
+typedef uint8_t P_Tag;
+#endif // __cplusplus
+
+struct P1_Body {
+  uint8_t _0;
+  uint8_t _1;
+  uint8_t _2;
+};
+
+struct P {
+  P_Tag tag;
+  union {
+    struct {
+      uint8_t p0;
+    };
+    struct P1_Body p1;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *opaque,
+          A a,
+          B b,
+          C c,
+          D d,
+          E e,
+          F f,
+          union G g,
+          struct H h,
+          struct I i,
+          struct J j,
+          struct K k,
+          enum L l,
+          M m,
+          enum N n,
+          O o,
+          struct P p);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/enum.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/enum.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,177 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    a1 # = 0,
+    a2 # = 2,
+    a3,
+    a4 # = 5,
+  ctypedef uint64_t A;
+
+  cdef enum:
+    b1 # = 0,
+    b2 # = 2,
+    b3,
+    b4 # = 5,
+  ctypedef uint32_t B;
+
+  cdef enum:
+    c1 # = 0,
+    c2 # = 2,
+    c3,
+    c4 # = 5,
+  ctypedef uint16_t C;
+
+  cdef enum:
+    d1 # = 0,
+    d2 # = 2,
+    d3,
+    d4 # = 5,
+  ctypedef uint8_t D;
+
+  cdef enum:
+    e1 # = 0,
+    e2 # = 2,
+    e3,
+    e4 # = 5,
+  ctypedef uintptr_t E;
+
+  cdef enum:
+    f1 # = 0,
+    f2 # = 2,
+    f3,
+    f4 # = 5,
+  ctypedef intptr_t F;
+
+  cdef enum L:
+    l1,
+    l2,
+    l3,
+    l4,
+
+  cdef enum:
+    m1 # = -1,
+    m2 # = 0,
+    m3 # = 1,
+  ctypedef int8_t M;
+
+  cdef enum N:
+    n1,
+    n2,
+    n3,
+    n4,
+
+  cdef enum:
+    o1,
+    o2,
+    o3,
+    o4,
+  ctypedef int8_t O;
+
+  cdef struct J:
+    pass
+
+  cdef struct K:
+    pass
+
+  cdef struct Opaque:
+    pass
+
+  cdef enum:
+    Foo,
+    Bar,
+    Baz,
+  ctypedef uint8_t G_Tag;
+
+  cdef struct Bar_Body:
+    G_Tag tag;
+    uint8_t x;
+    int16_t y;
+
+  cdef union G:
+    G_Tag tag;
+    G_Tag foo_tag;
+    int16_t foo;
+    Bar_Body bar;
+
+  cdef enum H_Tag:
+    H_Foo,
+    H_Bar,
+    H_Baz,
+
+  cdef struct H_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct H:
+    H_Tag tag;
+    int16_t foo;
+    H_Bar_Body bar;
+
+  cdef enum:
+    I_Foo,
+    I_Bar,
+    I_Baz,
+  ctypedef uint8_t I_Tag;
+
+  cdef struct I_Bar_Body:
+    uint8_t x;
+    int16_t y;
+
+  cdef struct I:
+    I_Tag tag;
+    int16_t foo;
+    I_Bar_Body bar;
+
+  cdef enum:
+    P0,
+    P1,
+  ctypedef uint8_t P_Tag;
+
+  cdef struct P1_Body:
+    uint8_t _0;
+    uint8_t _1;
+    uint8_t _2;
+
+  cdef struct P:
+    P_Tag tag;
+    uint8_t p0;
+    P1_Body p1;
+
+  void root(Opaque *opaque,
+            A a,
+            B b,
+            C c,
+            D d,
+            E e,
+            F f,
+            G g,
+            H h,
+            I i,
+            J j,
+            K k,
+            L l,
+            M m,
+            N n,
+            O o,
+            P p);
+
+#if 0
+''' '
+#endif
+
+#include <stddef.h>
+#include "testing-helpers.h"
+static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
+static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
+static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
+
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,117 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct TypedLength_f32__UnknownUnit {
+  float _0;
+} TypedLength_f32__UnknownUnit;
+
+typedef struct TypedLength_f32__LayoutUnit {
+  float _0;
+} TypedLength_f32__LayoutUnit;
+
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
+
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+} TypedSideOffsets2D_f32__UnknownUnit;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+} TypedSideOffsets2D_f32__LayoutUnit;
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+typedef struct TypedSize2D_f32__UnknownUnit {
+  float width;
+  float height;
+} TypedSize2D_f32__UnknownUnit;
+
+typedef struct TypedSize2D_f32__LayoutUnit {
+  float width;
+  float height;
+} TypedSize2D_f32__LayoutUnit;
+
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+typedef struct TypedPoint2D_f32__UnknownUnit {
+  float x;
+  float y;
+} TypedPoint2D_f32__UnknownUnit;
+
+typedef struct TypedPoint2D_f32__LayoutUnit {
+  float x;
+  float y;
+} TypedPoint2D_f32__LayoutUnit;
+
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+typedef struct TypedRect_f32__UnknownUnit {
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
+} TypedRect_f32__UnknownUnit;
+
+typedef struct TypedRect_f32__LayoutUnit {
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
+} TypedRect_f32__LayoutUnit;
+
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
+
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
+
+typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+} TypedTransform2D_f32__UnknownUnit__LayoutUnit;
+
+typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+} TypedTransform2D_f32__LayoutUnit__UnknownUnit;
+
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
+          Length_f32 length_c,
+          LayoutLength length_d,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          SideOffsets2D_f32 side_offsets_c,
+          LayoutSideOffsets2D side_offsets_d,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
+          Size2D_f32 size_c,
+          LayoutSize2D size_d,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
+          Point2D_f32 point_c,
+          LayoutPoint2D point_d,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
+          Rect_f32 rect_c,
+          LayoutRect rect_d,
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,125 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct TypedLength_f32__UnknownUnit {
+  float _0;
+} TypedLength_f32__UnknownUnit;
+
+typedef struct TypedLength_f32__LayoutUnit {
+  float _0;
+} TypedLength_f32__LayoutUnit;
+
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
+
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+} TypedSideOffsets2D_f32__UnknownUnit;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+} TypedSideOffsets2D_f32__LayoutUnit;
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+typedef struct TypedSize2D_f32__UnknownUnit {
+  float width;
+  float height;
+} TypedSize2D_f32__UnknownUnit;
+
+typedef struct TypedSize2D_f32__LayoutUnit {
+  float width;
+  float height;
+} TypedSize2D_f32__LayoutUnit;
+
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+typedef struct TypedPoint2D_f32__UnknownUnit {
+  float x;
+  float y;
+} TypedPoint2D_f32__UnknownUnit;
+
+typedef struct TypedPoint2D_f32__LayoutUnit {
+  float x;
+  float y;
+} TypedPoint2D_f32__LayoutUnit;
+
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+typedef struct TypedRect_f32__UnknownUnit {
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
+} TypedRect_f32__UnknownUnit;
+
+typedef struct TypedRect_f32__LayoutUnit {
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
+} TypedRect_f32__LayoutUnit;
+
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
+
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
+
+typedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+} TypedTransform2D_f32__UnknownUnit__LayoutUnit;
+
+typedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+} TypedTransform2D_f32__LayoutUnit__UnknownUnit;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
+          Length_f32 length_c,
+          LayoutLength length_d,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          SideOffsets2D_f32 side_offsets_c,
+          LayoutSideOffsets2D side_offsets_d,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
+          Size2D_f32 size_c,
+          LayoutSize2D size_d,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
+          Point2D_f32 point_c,
+          LayoutPoint2D point_d,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
+          Rect_f32 rect_c,
+          LayoutRect rect_d,
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,108 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct TypedLength_f32__UnknownUnit:
+    float _0;
+
+  ctypedef struct TypedLength_f32__LayoutUnit:
+    float _0;
+
+  ctypedef TypedLength_f32__UnknownUnit Length_f32;
+
+  ctypedef TypedLength_f32__LayoutUnit LayoutLength;
+
+  ctypedef struct TypedSideOffsets2D_f32__UnknownUnit:
+    float top;
+    float right;
+    float bottom;
+    float left;
+
+  ctypedef struct TypedSideOffsets2D_f32__LayoutUnit:
+    float top;
+    float right;
+    float bottom;
+    float left;
+
+  ctypedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+  ctypedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+  ctypedef struct TypedSize2D_f32__UnknownUnit:
+    float width;
+    float height;
+
+  ctypedef struct TypedSize2D_f32__LayoutUnit:
+    float width;
+    float height;
+
+  ctypedef TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+  ctypedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+  ctypedef struct TypedPoint2D_f32__UnknownUnit:
+    float x;
+    float y;
+
+  ctypedef struct TypedPoint2D_f32__LayoutUnit:
+    float x;
+    float y;
+
+  ctypedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+  ctypedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+  ctypedef struct TypedRect_f32__UnknownUnit:
+    TypedPoint2D_f32__UnknownUnit origin;
+    TypedSize2D_f32__UnknownUnit size;
+
+  ctypedef struct TypedRect_f32__LayoutUnit:
+    TypedPoint2D_f32__LayoutUnit origin;
+    TypedSize2D_f32__LayoutUnit size;
+
+  ctypedef TypedRect_f32__UnknownUnit Rect_f32;
+
+  ctypedef TypedRect_f32__LayoutUnit LayoutRect;
+
+  ctypedef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit:
+    float m11;
+    float m12;
+    float m21;
+    float m22;
+    float m31;
+    float m32;
+
+  ctypedef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit:
+    float m11;
+    float m12;
+    float m21;
+    float m22;
+    float m31;
+    float m32;
+
+  void root(TypedLength_f32__UnknownUnit length_a,
+            TypedLength_f32__LayoutUnit length_b,
+            Length_f32 length_c,
+            LayoutLength length_d,
+            TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+            TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+            SideOffsets2D_f32 side_offsets_c,
+            LayoutSideOffsets2D side_offsets_d,
+            TypedSize2D_f32__UnknownUnit size_a,
+            TypedSize2D_f32__LayoutUnit size_b,
+            Size2D_f32 size_c,
+            LayoutSize2D size_d,
+            TypedPoint2D_f32__UnknownUnit point_a,
+            TypedPoint2D_f32__LayoutUnit point_b,
+            Point2D_f32 point_c,
+            LayoutPoint2D point_d,
+            TypedRect_f32__UnknownUnit rect_a,
+            TypedRect_f32__LayoutUnit rect_b,
+            Rect_f32 rect_c,
+            LayoutRect rect_d,
+            TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+            TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,117 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct TypedLength_f32__UnknownUnit {
+  float _0;
+};
+
+struct TypedLength_f32__LayoutUnit {
+  float _0;
+};
+
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
+
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
+
+struct TypedSideOffsets2D_f32__UnknownUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+};
+
+struct TypedSideOffsets2D_f32__LayoutUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+};
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+struct TypedSize2D_f32__UnknownUnit {
+  float width;
+  float height;
+};
+
+struct TypedSize2D_f32__LayoutUnit {
+  float width;
+  float height;
+};
+
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+struct TypedPoint2D_f32__UnknownUnit {
+  float x;
+  float y;
+};
+
+struct TypedPoint2D_f32__LayoutUnit {
+  float x;
+  float y;
+};
+
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+struct TypedRect_f32__UnknownUnit {
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
+};
+
+struct TypedRect_f32__LayoutUnit {
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
+};
+
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
+
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
+
+struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+};
+
+struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+};
+
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
+          Length_f32 length_c,
+          LayoutLength length_d,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          SideOffsets2D_f32 side_offsets_c,
+          LayoutSideOffsets2D side_offsets_d,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
+          Size2D_f32 size_c,
+          LayoutSize2D size_d,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
+          Point2D_f32 point_c,
+          LayoutPoint2D point_d,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
+          Rect_f32 rect_c,
+          LayoutRect rect_d,
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,125 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct TypedLength_f32__UnknownUnit {
+  float _0;
+};
+
+struct TypedLength_f32__LayoutUnit {
+  float _0;
+};
+
+typedef struct TypedLength_f32__UnknownUnit Length_f32;
+
+typedef struct TypedLength_f32__LayoutUnit LayoutLength;
+
+struct TypedSideOffsets2D_f32__UnknownUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+};
+
+struct TypedSideOffsets2D_f32__LayoutUnit {
+  float top;
+  float right;
+  float bottom;
+  float left;
+};
+
+typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+struct TypedSize2D_f32__UnknownUnit {
+  float width;
+  float height;
+};
+
+struct TypedSize2D_f32__LayoutUnit {
+  float width;
+  float height;
+};
+
+typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+struct TypedPoint2D_f32__UnknownUnit {
+  float x;
+  float y;
+};
+
+struct TypedPoint2D_f32__LayoutUnit {
+  float x;
+  float y;
+};
+
+typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+struct TypedRect_f32__UnknownUnit {
+  struct TypedPoint2D_f32__UnknownUnit origin;
+  struct TypedSize2D_f32__UnknownUnit size;
+};
+
+struct TypedRect_f32__LayoutUnit {
+  struct TypedPoint2D_f32__LayoutUnit origin;
+  struct TypedSize2D_f32__LayoutUnit size;
+};
+
+typedef struct TypedRect_f32__UnknownUnit Rect_f32;
+
+typedef struct TypedRect_f32__LayoutUnit LayoutRect;
+
+struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+};
+
+struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
+  float m11;
+  float m12;
+  float m21;
+  float m22;
+  float m31;
+  float m32;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypedLength_f32__UnknownUnit length_a,
+          struct TypedLength_f32__LayoutUnit length_b,
+          Length_f32 length_c,
+          LayoutLength length_d,
+          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+          SideOffsets2D_f32 side_offsets_c,
+          LayoutSideOffsets2D side_offsets_d,
+          struct TypedSize2D_f32__UnknownUnit size_a,
+          struct TypedSize2D_f32__LayoutUnit size_b,
+          Size2D_f32 size_c,
+          LayoutSize2D size_d,
+          struct TypedPoint2D_f32__UnknownUnit point_a,
+          struct TypedPoint2D_f32__LayoutUnit point_b,
+          Point2D_f32 point_c,
+          LayoutPoint2D point_d,
+          struct TypedRect_f32__UnknownUnit rect_a,
+          struct TypedRect_f32__LayoutUnit rect_b,
+          Rect_f32 rect_c,
+          LayoutRect rect_d,
+          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/euclid.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/euclid.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,108 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct TypedLength_f32__UnknownUnit:
+    float _0;
+
+  cdef struct TypedLength_f32__LayoutUnit:
+    float _0;
+
+  ctypedef TypedLength_f32__UnknownUnit Length_f32;
+
+  ctypedef TypedLength_f32__LayoutUnit LayoutLength;
+
+  cdef struct TypedSideOffsets2D_f32__UnknownUnit:
+    float top;
+    float right;
+    float bottom;
+    float left;
+
+  cdef struct TypedSideOffsets2D_f32__LayoutUnit:
+    float top;
+    float right;
+    float bottom;
+    float left;
+
+  ctypedef TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
+
+  ctypedef TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
+
+  cdef struct TypedSize2D_f32__UnknownUnit:
+    float width;
+    float height;
+
+  cdef struct TypedSize2D_f32__LayoutUnit:
+    float width;
+    float height;
+
+  ctypedef TypedSize2D_f32__UnknownUnit Size2D_f32;
+
+  ctypedef TypedSize2D_f32__LayoutUnit LayoutSize2D;
+
+  cdef struct TypedPoint2D_f32__UnknownUnit:
+    float x;
+    float y;
+
+  cdef struct TypedPoint2D_f32__LayoutUnit:
+    float x;
+    float y;
+
+  ctypedef TypedPoint2D_f32__UnknownUnit Point2D_f32;
+
+  ctypedef TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
+
+  cdef struct TypedRect_f32__UnknownUnit:
+    TypedPoint2D_f32__UnknownUnit origin;
+    TypedSize2D_f32__UnknownUnit size;
+
+  cdef struct TypedRect_f32__LayoutUnit:
+    TypedPoint2D_f32__LayoutUnit origin;
+    TypedSize2D_f32__LayoutUnit size;
+
+  ctypedef TypedRect_f32__UnknownUnit Rect_f32;
+
+  ctypedef TypedRect_f32__LayoutUnit LayoutRect;
+
+  cdef struct TypedTransform2D_f32__UnknownUnit__LayoutUnit:
+    float m11;
+    float m12;
+    float m21;
+    float m22;
+    float m31;
+    float m32;
+
+  cdef struct TypedTransform2D_f32__LayoutUnit__UnknownUnit:
+    float m11;
+    float m12;
+    float m21;
+    float m22;
+    float m31;
+    float m32;
+
+  void root(TypedLength_f32__UnknownUnit length_a,
+            TypedLength_f32__LayoutUnit length_b,
+            Length_f32 length_c,
+            LayoutLength length_d,
+            TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
+            TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
+            SideOffsets2D_f32 side_offsets_c,
+            LayoutSideOffsets2D side_offsets_d,
+            TypedSize2D_f32__UnknownUnit size_a,
+            TypedSize2D_f32__LayoutUnit size_b,
+            Size2D_f32 size_c,
+            LayoutSize2D size_d,
+            TypedPoint2D_f32__UnknownUnit point_a,
+            TypedPoint2D_f32__LayoutUnit point_b,
+            Point2D_f32 point_c,
+            LayoutPoint2D point_d,
+            TypedRect_f32__UnknownUnit rect_a,
+            TypedRect_f32__LayoutUnit rect_b,
+            Rect_f32 rect_c,
+            LayoutRect rect_d,
+            TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
+            TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar {
+  Option_Foo foo;
+} Bar;
+
+void root(struct Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar {
+  Option_Foo foo;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Bar f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,7 +1,20 @@
 #include <stdint.h>
 
+#if 0
+''' '
+#endif
+
 typedef uint64_t Option_Foo;
 
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,7 +1,20 @@
 #include <stdint.h>
 
+#if 0
+''' '
+#endif
+
 typedef uint64_t Option_Foo;
 
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,15 +1,28 @@
 #include <stdint.h>
 
+#if 0
+''' '
+#endif
+
 typedef uint64_t Option_Foo;
 
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-typedef struct {
+typedef struct Bar {
   Option_Foo foo;
 } Bar;
 
-void root(Bar f);
+void root(struct Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Bar:
+    Option_Foo foo;
+
+  void root(Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar {
+  Option_Foo foo;
+};
+
+void root(struct Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar {
+  Option_Foo foo;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Bar f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/exclude_generic_monomorph.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdint.h>
+
+#if 0
+''' '
+#endif
+
+typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Bar:
+    Option_Foo foo;
+
+  void root(Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+void extra_debug_fn(void);
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void extra_debug_fn(void);
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    pass
+
+  void extra_debug_fn();
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+void extra_debug_fn(void);
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void extra_debug_fn(void);
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_default_features.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    pass
+
+  void extra_debug_fn();
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct dep_struct {
+  uint32_t x;
+  double y;
+} dep_struct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct dep_struct {
+  uint32_t x;
+  double y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+uint32_t get_x(const struct dep_struct *dep_struct);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_dep_v2.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct dep_struct:
+    uint32_t x;
+    double y;
+
+  uint32_t get_x(const dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+void extra_debug_fn(void);
+
+void cbindgen(void);
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void extra_debug_fn(void);
+
+void cbindgen(void);
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    pass
+
+  void extra_debug_fn();
+
+  void cbindgen();
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+void extra_debug_fn(void);
+
+void cbindgen(void);
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void extra_debug_fn(void);
+
+void cbindgen(void);
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_features.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_features.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    pass
+
+  void extra_debug_fn();
+
+  void cbindgen();
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    pass
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand_no_default_features.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    pass
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    pass
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/expand.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/expand.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    pass
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/export_name.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/export_name.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/export_name.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/export_name.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void do_the_thing_with_export_name();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void first(void);
+
+void second(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void first(void);
-
-void second(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void first(void);
+
+void second(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void first(void);
-
-void second(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+extern "C" {
+
+void first();
+
+void second();
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern-2.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern-2.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-extern "C" {
-
-void first();
-
-void second();
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern_2.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern_2.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void first();
+
+  void second();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void consume_ext(struct ExtType _ext);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct ExtType:
+    uint32_t data;
+
+  void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct ExtType {
+  uint32_t data;
+};
+
+void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct ExtType {
+  uint32_t data;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void consume_ext(struct ExtType _ext);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/external_workspace_child.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct ExtType:
+    uint32_t data;
+
+  void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+extern int32_t foo(void);
+
+extern void bar(struct Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern int32_t foo(void);
+
+extern void bar(struct Normal a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Normal:
+    int32_t x;
+    float y;
+
+  extern int32_t foo();
+
+  extern void bar(Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Normal {
+  int32_t x;
+  float y;
+};
+
+extern int32_t foo(void);
+
+extern void bar(struct Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Normal {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern int32_t foo(void);
+
+extern void bar(struct Normal a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/extern.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/extern.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Normal:
+    int32_t x;
+    float y;
+
+  extern int32_t foo();
+
+  extern void bar(Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Fns {
+  void (*noArgs)(void);
+  void (*anonymousArg)(int32_t);
+  int32_t (*returnsNumber)(void);
+  int8_t (*namedArgs)(int32_t first, int16_t snd);
+  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+} Fns;
+
+void root(struct Fns _fns);
+
+void no_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Fns {
+  void (*noArgs)(void);
+  void (*anonymousArg)(int32_t);
+  int32_t (*returnsNumber)(void);
+  int8_t (*namedArgs)(int32_t first, int16_t snd);
+  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+} Fns;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Fns _fns);
+
+void no_return(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Fns:
+    void (*noArgs)();
+    void (*anonymousArg)(int32_t);
+    int32_t (*returnsNumber)();
+    int8_t (*namedArgs)(int32_t first, int16_t snd);
+    int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+
+  void root(Fns _fns);
+
+  void no_return();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Fns {
+  void (*noArgs)(void);
+  void (*anonymousArg)(int32_t);
+  int32_t (*returnsNumber)(void);
+  int8_t (*namedArgs)(int32_t first, int16_t snd);
+  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+};
+
+void root(struct Fns _fns);
+
+void no_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Fns {
+  void (*noArgs)(void);
+  void (*anonymousArg)(int32_t);
+  int32_t (*returnsNumber)(void);
+  int8_t (*namedArgs)(int32_t first, int16_t snd);
+  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Fns _fns);
+
+void no_return(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/fns.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/fns.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Fns:
+    void (*noArgs)();
+    void (*anonymousArg)(int32_t);
+    int32_t (*returnsNumber)();
+    int8_t (*namedArgs)(int32_t first, int16_t snd);
+    int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
+
+  void root(Fns _fns);
+
+  void no_return();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum TypeData_Tag {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct TypeData {
+  TypeData_Tag tag;
+  union {
+    struct {
+      struct StructInfo struct_;
+    };
+  };
+} TypeData;
+
+typedef struct TypeInfo {
+  struct TypeData data;
+} TypeInfo;
+
+void root(struct TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,58 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum TypeData_Tag {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct TypeData {
+  TypeData_Tag tag;
+  union {
+    struct {
+      struct StructInfo struct_;
+    };
+  };
+} TypeData;
+
+typedef struct TypeInfo {
+  struct TypeData data;
+} TypeInfo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct {
+  TypeData_Tag tag;
+  union {
+    struct {
+      StructInfo struct_;
+    };
+  };
+} TypeData;
+
+typedef struct {
+  TypeData data;
+} TypeInfo;
+
+void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,58 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+} StructInfo;
+
+typedef enum {
+  Primitive,
+  Struct,
+} TypeData_Tag;
+
+typedef struct {
+  TypeData_Tag tag;
+  union {
+    struct {
+      StructInfo struct_;
+    };
+  };
+} TypeData;
+
+typedef struct {
+  TypeData data;
+} TypeInfo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,57 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct StructInfo {
+  const TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+struct TypeData {
+  enum class Tag {
+    Primitive,
+    Struct,
+  };
+
+  struct Struct_Body {
+    StructInfo _0;
+  };
+
+  Tag tag;
+  union {
+    Struct_Body struct_;
+  };
+};
+
+struct TypeInfo {
+  TypeData data;
+};
+
+extern "C" {
+
+void root(TypeInfo x);
+
+} // extern "C"
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct StructInfo:
+    const TypeInfo *const *fields;
+    uintptr_t num_fields;
+
+  ctypedef enum TypeData_Tag:
+    Primitive,
+    Struct,
+
+  ctypedef struct TypeData:
+    TypeData_Tag tag;
+    StructInfo struct_;
+
+  ctypedef struct TypeInfo:
+    TypeData data;
+
+  void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,50 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+enum TypeData_Tag {
+  Primitive,
+  Struct,
+};
+
+struct TypeData {
+  enum TypeData_Tag tag;
+  union {
+    struct {
+      struct StructInfo struct_;
+    };
+  };
+};
+
+struct TypeInfo {
+  struct TypeData data;
+};
+
+void root(struct TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,58 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StructInfo {
+  const struct TypeInfo *const *fields;
+  uintptr_t num_fields;
+};
+
+enum TypeData_Tag {
+  Primitive,
+  Struct,
+};
+
+struct TypeData {
+  enum TypeData_Tag tag;
+  union {
+    struct {
+      struct StructInfo struct_;
+    };
+  };
+};
+
+struct TypeInfo {
+  struct TypeData data;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct TypeInfo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/forward_declaration.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct StructInfo:
+    const TypeInfo *const *fields;
+    uintptr_t num_fields;
+
+  cdef enum TypeData_Tag:
+    Primitive,
+    Struct,
+
+  cdef struct TypeData:
+    TypeData_Tag tag;
+    StructInfo struct_;
+
+  cdef struct TypeInfo:
+    TypeData data;
+
+  void root(TypeInfo x);
+
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_args.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_args.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_args.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_args.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void unnamed(const uint64_t*);
+
+  void pointer_test(const uint64_t *a);
+
+  void print_from_rust();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_noreturn.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_noreturn.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_noreturn.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_noreturn.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+#ifndef NO_RETURN_ATTR
+  #ifdef __GNUC__
+    #define NO_RETURN_ATTR __attribute__ ((noreturn))
+  #else // __GNUC__
+    #define NO_RETURN_ATTR
+  #endif // __GNUC__
+#endif // NO_RETURN_ATTR
+
+
+cdef extern from *:
+
+  void loop_forever();
+
+  uint8_t normal_return();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_sort_name.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_sort_name.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_sort_name.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_sort_name.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void A();
+
+  void B();
+
+  void C();
+
+  void D();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_sort_none.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_sort_none.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/function_sort_none.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/function_sort_none.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void C();
+
+  void B();
+
+  void D();
+
+  void A();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_____u8 {
+  uint8_t *a;
+} Foo_____u8;
+
+typedef struct Foo_____u8 Boo;
+
+void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_____u8 {
+  uint8_t *a;
+} Foo_____u8;
+
+typedef struct Foo_____u8 Boo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Boo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint8_t *a;
+} Foo_____u8;
+
+typedef Foo_____u8 Boo;
+
+void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  uint8_t *a;
-} Foo_____u8;
-
-typedef Foo_____u8 Boo;
-
-void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint8_t *a;
+} Foo_____u8;
+
+typedef Foo_____u8 Boo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Boo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  uint8_t *a;
-} Foo_____u8;
-
-typedef Foo_____u8 Boo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Boo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+template<typename T>
+struct Foo {
+  T a;
+};
+
+using Boo = Foo<uint8_t*>;
+
+extern "C" {
+
+void root(Boo x);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic-pointer.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic-pointer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-template<typename T>
-struct Foo {
-  T a;
-};
-
-using Boo = Foo<uint8_t*>;
-
-extern "C" {
-
-void root(Boo x);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo_____u8:
+    uint8_t *a;
+
+  ctypedef Foo_____u8 Boo;
+
+  void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_____u8 {
+  uint8_t *a;
+};
+
+typedef struct Foo_____u8 Boo;
+
+void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_____u8 {
+  uint8_t *a;
+};
+
+typedef struct Foo_____u8 Boo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Boo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/generic_pointer.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo_____u8:
+    uint8_t *a;
+
+  ctypedef Foo_____u8 Boo;
+
+  void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_attr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_attr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_attr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_attr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_variable.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_variable.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/global_variable.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/global_variable.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  extern char MUT_GLOBAL_ARRAY[128];
+
+  extern const char CONST_GLOBAL_ARRAY[128];
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/ignore.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/ignore.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/ignore.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/ignore.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void no_ignore_root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/include.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_guard.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_guard.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_guard.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_guard.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,4 @@
+
+cdef extern from *:
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A {
+  int32_t x;
+  float y;
+} A;
+
+typedef struct B {
+  struct A data;
+} B;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  int32_t x;
-  float y;
-} A;
-
-typedef struct {
-  A data;
-} B;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct A:
+    int32_t x;
+    float y;
+
+  ctypedef struct B:
+    A data;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A {
+  int32_t x;
+  float y;
+};
+
+struct B {
+  struct A data;
+};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_item.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_item.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct A:
+    int32_t x;
+    float y;
+
+  cdef struct B:
+    A data;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/include.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_specific.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_specific.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_specific.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_specific.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_specific.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/include_specific.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/include_specific.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,3 @@
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  float x;
+} Foo;
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  float x;
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    float x;
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  float x;
+};
+
+void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  float x;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/inner_mod.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    float x;
+
+  void root(Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/item_types.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/item_types.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/item_types.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/item_types.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Foo,
+    Bar,
+  ctypedef uint8_t OnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/item_types_renamed.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/item_types_renamed.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/item_types_renamed.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/item_types_renamed.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Foo,
+    Bar,
+  ctypedef uint8_t StyleOnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,34 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct OpaqueAlign16Union OpaqueAlign16Union;
+
+typedef struct OpaqueAlign1Struct OpaqueAlign1Struct;
+
+typedef struct OpaqueAlign1Union OpaqueAlign1Union;
+
+typedef struct OpaqueAlign2Struct OpaqueAlign2Struct;
+
+typedef struct OpaqueAlign32Struct OpaqueAlign32Struct;
+
+typedef struct OpaqueAlign4Struct OpaqueAlign4Struct;
+
+typedef struct OpaqueAlign4Union OpaqueAlign4Union;
+
+typedef struct OpaqueAlign8Struct OpaqueAlign8Struct;
+
+typedef struct CBINDGEN_PACKED PackedStruct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} PackedStruct;
+
+typedef union CBINDGEN_PACKED PackedUnion {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaqueAlign16Union OpaqueAlign16Union;
-
-typedef struct OpaqueAlign1Struct OpaqueAlign1Struct;
-
-typedef struct OpaqueAlign1Union OpaqueAlign1Union;
-
-typedef struct OpaqueAlign2Struct OpaqueAlign2Struct;
-
-typedef struct OpaqueAlign32Struct OpaqueAlign32Struct;
-
-typedef struct OpaqueAlign4Struct OpaqueAlign4Struct;
-
-typedef struct OpaqueAlign4Union OpaqueAlign4Union;
-
-typedef struct OpaqueAlign8Struct OpaqueAlign8Struct;
-
-typedef struct CBINDGEN_PACKED {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_PACKED {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct OpaqueAlign16Union:
+    pass
+
+  ctypedef struct OpaqueAlign1Struct:
+    pass
+
+  ctypedef struct OpaqueAlign1Union:
+    pass
+
+  ctypedef struct OpaqueAlign2Struct:
+    pass
+
+  ctypedef struct OpaqueAlign32Struct:
+    pass
+
+  ctypedef struct OpaqueAlign4Struct:
+    pass
+
+  ctypedef struct OpaqueAlign4Union:
+    pass
+
+  ctypedef struct OpaqueAlign8Struct:
+    pass
+
+  ctypedef packed struct PackedStruct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef union PackedUnion:
+    uintptr_t variant1;
+    uint8_t *variant2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,34 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct OpaqueAlign16Union;
+
+struct OpaqueAlign1Struct;
+
+struct OpaqueAlign1Union;
+
+struct OpaqueAlign2Struct;
+
+struct OpaqueAlign32Struct;
+
+struct OpaqueAlign4Struct;
+
+struct OpaqueAlign4Union;
+
+struct OpaqueAlign8Struct;
+
+struct CBINDGEN_PACKED PackedStruct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+union CBINDGEN_PACKED PackedUnion {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_aligned_opaque.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct OpaqueAlign16Union:
+    pass
+
+  cdef struct OpaqueAlign1Struct:
+    pass
+
+  cdef struct OpaqueAlign1Union:
+    pass
+
+  cdef struct OpaqueAlign2Struct:
+    pass
+
+  cdef struct OpaqueAlign32Struct:
+    pass
+
+  cdef struct OpaqueAlign4Struct:
+    pass
+
+  cdef struct OpaqueAlign4Union:
+    pass
+
+  cdef struct OpaqueAlign8Struct:
+    pass
+
+  cdef packed struct PackedStruct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef union PackedUnion:
+    uintptr_t variant1;
+    uint8_t *variant2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,72 @@
+#define CBINDGEN_PACKED     __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct RustAlign4Struct RustAlign4Struct;
+
+typedef struct RustAlign4Union RustAlign4Union;
+
+typedef struct RustPackedStruct RustPackedStruct;
+
+typedef struct RustPackedUnion RustPackedUnion;
+
+typedef struct UnsupportedAlign4Enum UnsupportedAlign4Enum;
+
+typedef struct UnsupportedPacked4Struct UnsupportedPacked4Struct;
+
+typedef struct UnsupportedPacked4Union UnsupportedPacked4Union;
+
+typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align1Struct;
+
+typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align2Struct;
+
+typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align4Struct;
+
+typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align8Struct;
+
+typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align32Struct;
+
+typedef struct CBINDGEN_PACKED PackedStruct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} PackedStruct;
+
+typedef union CBINDGEN_ALIGNED(1) Align1Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align1Union;
+
+typedef union CBINDGEN_ALIGNED(4) Align4Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align4Union;
+
+typedef union CBINDGEN_ALIGNED(16) Align16Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align16Union;
+
+typedef union CBINDGEN_PACKED PackedUnion {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#define CBINDGEN_PACKED     __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct RustAlign4Struct RustAlign4Struct;
-
-typedef struct RustAlign4Union RustAlign4Union;
-
-typedef struct RustPackedStruct RustPackedStruct;
-
-typedef struct RustPackedUnion RustPackedUnion;
-
-typedef struct UnsupportedAlign4Enum UnsupportedAlign4Enum;
-
-typedef struct UnsupportedPacked4Struct UnsupportedPacked4Struct;
-
-typedef struct UnsupportedPacked4Union UnsupportedPacked4Union;
-
-typedef struct CBINDGEN_ALIGNED(1) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
-
-typedef struct CBINDGEN_PACKED {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} PackedStruct;
-
-typedef union CBINDGEN_ALIGNED(1) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef union CBINDGEN_PACKED {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} PackedUnion;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct OpaquePackedStruct OpaquePackedStruct;
+
+typedef struct OpaquePackedUnion OpaquePackedUnion;
+
+typedef union CBINDGEN_ALIGNED(1) Align1Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align1Union;
+
+typedef union CBINDGEN_ALIGNED(4) Align4Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align4Union;
+
+typedef union CBINDGEN_ALIGNED(16) Align16Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+} Align16Union;
+
+typedef struct CBINDGEN_ALIGNED(1) Align1Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align1Struct;
+
+typedef struct CBINDGEN_ALIGNED(2) Align2Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align2Struct;
+
+typedef struct CBINDGEN_ALIGNED(4) Align4Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align4Struct;
+
+typedef struct CBINDGEN_ALIGNED(8) Align8Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align8Struct;
+
+typedef struct CBINDGEN_ALIGNED(32) Align32Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+} Align32Struct;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct OpaquePackedStruct OpaquePackedStruct;
-
-typedef struct OpaquePackedUnion OpaquePackedUnion;
-
-typedef union CBINDGEN_ALIGNED(1) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align1Union;
-
-typedef union CBINDGEN_ALIGNED(4) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align4Union;
-
-typedef union CBINDGEN_ALIGNED(16) {
-  uintptr_t variant1;
-  uint8_t *variant2;
-} Align16Union;
-
-typedef struct CBINDGEN_ALIGNED(1) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align1Struct;
-
-typedef struct CBINDGEN_ALIGNED(2) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align2Struct;
-
-typedef struct CBINDGEN_ALIGNED(4) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align4Struct;
-
-typedef struct CBINDGEN_ALIGNED(8) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align8Struct;
-
-typedef struct CBINDGEN_ALIGNED(32) {
-  uintptr_t arg1;
-  uint8_t *arg2;
-} Align32Struct;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct OpaquePackedStruct:
+    pass
+
+  ctypedef struct OpaquePackedUnion:
+    pass
+
+  ctypedef union Align1Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef union Align4Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef union Align16Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef struct Align1Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align2Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align4Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align8Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align32Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct OpaquePackedStruct;
+
+struct OpaquePackedUnion;
+
+union CBINDGEN_ALIGNED(1) Align1Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+union CBINDGEN_ALIGNED(4) Align4Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+union CBINDGEN_ALIGNED(16) Align16Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+struct CBINDGEN_ALIGNED(1) Align1Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(2) Align2Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(4) Align4Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(8) Align8Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(32) Align32Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout_packed_opaque.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+#define CBINDGEN_PACKED        __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct OpaquePackedStruct:
+    pass
+
+  cdef struct OpaquePackedUnion:
+    pass
+
+  cdef union Align1Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef union Align4Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef union Align16Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef struct Align1Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align2Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align4Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align8Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align32Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,72 @@
+#define CBINDGEN_PACKED     __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct RustAlign4Struct:
+    pass
+
+  ctypedef struct RustAlign4Union:
+    pass
+
+  ctypedef struct RustPackedStruct:
+    pass
+
+  ctypedef struct RustPackedUnion:
+    pass
+
+  ctypedef struct UnsupportedAlign4Enum:
+    pass
+
+  ctypedef struct UnsupportedPacked4Struct:
+    pass
+
+  ctypedef struct UnsupportedPacked4Union:
+    pass
+
+  ctypedef struct Align1Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align2Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align4Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align8Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef struct Align32Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef packed struct PackedStruct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  ctypedef union Align1Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef union Align4Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef union Align16Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  ctypedef union PackedUnion:
+    uintptr_t variant1;
+    uint8_t *variant2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,72 @@
+#define CBINDGEN_PACKED     __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct RustAlign4Struct;
+
+struct RustAlign4Union;
+
+struct RustPackedStruct;
+
+struct RustPackedUnion;
+
+struct UnsupportedAlign4Enum;
+
+struct UnsupportedPacked4Struct;
+
+struct UnsupportedPacked4Union;
+
+struct CBINDGEN_ALIGNED(1) Align1Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(2) Align2Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(4) Align4Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(8) Align8Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_ALIGNED(32) Align32Struct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+struct CBINDGEN_PACKED PackedStruct {
+  uintptr_t arg1;
+  uint8_t *arg2;
+};
+
+union CBINDGEN_ALIGNED(1) Align1Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+union CBINDGEN_ALIGNED(4) Align4Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+union CBINDGEN_ALIGNED(16) Align16Union {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
+
+union CBINDGEN_PACKED PackedUnion {
+  uintptr_t variant1;
+  uint8_t *variant2;
+};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/layout.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/layout.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,72 @@
+#define CBINDGEN_PACKED     __attribute__ ((packed))
+#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct RustAlign4Struct:
+    pass
+
+  cdef struct RustAlign4Union:
+    pass
+
+  cdef struct RustPackedStruct:
+    pass
+
+  cdef struct RustPackedUnion:
+    pass
+
+  cdef struct UnsupportedAlign4Enum:
+    pass
+
+  cdef struct UnsupportedPacked4Struct:
+    pass
+
+  cdef struct UnsupportedPacked4Union:
+    pass
+
+  cdef struct Align1Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align2Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align4Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align8Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef struct Align32Struct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef packed struct PackedStruct:
+    uintptr_t arg1;
+    uint8_t *arg2;
+
+  cdef union Align1Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef union Align4Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef union Align16Union:
+    uintptr_t variant1;
+    uint8_t *variant2;
+
+  cdef union PackedUnion:
+    uintptr_t variant1;
+    uint8_t *variant2;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A {
+  const int32_t *data;
+} A;
+
+typedef enum E_Tag {
+  V,
+  U,
+} E_Tag;
+
+typedef struct E {
+  E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+} E;
+
+void root(struct A _a, struct E _e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A {
+  const int32_t *data;
+} A;
+
+typedef enum E_Tag {
+  V,
+  U,
+} E_Tag;
+
+typedef struct E {
+  E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+} E;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A _a, struct E _e);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.c	2021-01-18 19:59:04.000000000 +0000
@@ -7,4 +7,18 @@
   const int32_t *data;
 } A;
 
-void root(A _a);
+typedef enum {
+  V,
+  U,
+} E_Tag;
+
+typedef struct {
+  E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+} E;
+
+void root(A _a, E _e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -7,11 +7,25 @@
   const int32_t *data;
 } A;
 
+typedef enum {
+  V,
+  U,
+} E_Tag;
+
+typedef struct {
+  E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+} E;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void root(A _a);
+void root(A _a, E _e);
 
 #ifdef __cplusplus
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -8,8 +8,24 @@
   const int32_t *data;
 };
 
+struct E {
+  enum class Tag {
+    V,
+    U,
+  };
+
+  struct U_Body {
+    const uint8_t *_0;
+  };
+
+  Tag tag;
+  union {
+    U_Body u;
+  };
+};
+
 extern "C" {
 
-void root(A _a);
+void root(A _a, E _e);
 
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct A:
+    const int32_t *data;
+
+  ctypedef enum E_Tag:
+    V,
+    U,
+
+  ctypedef struct E:
+    E_Tag tag;
+    const uint8_t *u;
+
+  void root(A _a, E _e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A {
+  const int32_t *data;
+};
+
+enum E_Tag {
+  V,
+  U,
+};
+
+struct E {
+  enum E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+};
+
+void root(struct A _a, struct E _e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A {
+  const int32_t *data;
+};
+
+enum E_Tag {
+  V,
+  U,
+};
+
+struct E {
+  enum E_Tag tag;
+  union {
+    struct {
+      const uint8_t *u;
+    };
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A _a, struct E _e);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/lifetime_arg.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct A:
+    const int32_t *data;
+
+  cdef enum E_Tag:
+    V,
+    U,
+
+  cdef struct E:
+    E_Tag tag;
+    const uint8_t *u;
+
+  void root(A _a, E _e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

void root(struct Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

typedef struct Dummy {
  int32_t x;
  float y;
} Dummy;

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(struct Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Dummy {
+  int32_t x;
+  float y;
+} Dummy;
+
+void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Dummy {
+  int32_t x;
+  float y;
+} Dummy;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Dummy d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Dummy:
+    int32_t x;
+    float y;
+
+  void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Dummy {
+  int32_t x;
+  float y;
+};
+
+void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Dummy {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Dummy d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_crlf.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Dummy:
+    int32_t x;
+    float y;
+
+  void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
cdef extern from *:
  ctypedef bint bool
  ctypedef struct va_list

cdef extern from *:

  ctypedef struct Dummy:
    int32_t x;
    float y;

  void root(Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

struct Dummy {
  int32_t x;
  float y;
};

void root(struct Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

struct Dummy {
  int32_t x;
  float y;
};

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(struct Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_cr.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
cdef extern from *:
  ctypedef bint bool
  ctypedef struct va_list

cdef extern from *:

  cdef struct Dummy:
    int32_t x;
    float y;

  void root(Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Dummy {
+  int32_t x;
+  float y;
+} Dummy;
+
+void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Dummy {
+  int32_t x;
+  float y;
+} Dummy;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Dummy d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Dummy:
+    int32_t x;
+    float y;
+
+  void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Dummy {
+  int32_t x;
+  float y;
+};
+
+void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Dummy {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Dummy d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/linestyle_lf.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Dummy:
+    int32_t x;
+    float y;
+
+  void root(Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/literal_target.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/literal_target.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/literal_target.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/literal_target.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/literal_target.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/literal_target.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/literal_target.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/literal_target.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct FooU8 {
+  uint8_t a;
+} FooU8;
+
+typedef struct FooU8 Boo;
+
+void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct FooU8 {
+  uint8_t a;
+} FooU8;
+
+typedef struct FooU8 Boo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Boo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct FooU8:
+    uint8_t a;
+
+  ctypedef FooU8 Boo;
+
+  void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct FooU8 {
+  uint8_t a;
+};
+
+typedef struct FooU8 Boo;
+
+void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct FooU8 {
+  uint8_t a;
+};
+
+typedef struct FooU8 Boo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Boo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mangle.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mangle.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct FooU8:
+    uint8_t a;
+
+  ctypedef FooU8 Boo;
+
+  void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
+
+typedef struct NotReprC_ManuallyDrop_Point Foo;
+
+typedef struct Point {
+  int32_t x;
+  int32_t y;
+} Point;
+
+typedef struct MyStruct {
+  struct Point point;
+} MyStruct;
+
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
+
+void take(struct Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_ManuallyDrop_Point NotReprC_ManuallyDrop_Point;
+
+typedef struct NotReprC_ManuallyDrop_Point Foo;
+
+typedef struct Point {
+  int32_t x;
+  int32_t y;
+} Point;
+
+typedef struct MyStruct {
+  struct Point point;
+} MyStruct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
+
+void take(struct Point with_manual_drop);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using ManuallyDrop = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using ManuallyDrop = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using ManuallyDrop = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <cstdarg>
 #include <cstdint>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,37 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct NotReprC_ManuallyDrop_Point:
+    pass
+
+  ctypedef NotReprC_ManuallyDrop_Point Foo;
+
+  ctypedef struct Point:
+    int32_t x;
+    int32_t y;
+
+  ctypedef struct MyStruct:
+    Point point;
+
+  void root(const Foo *a, const MyStruct *with_manual_drop);
+
+  void take(Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_ManuallyDrop_Point;
+
+typedef struct NotReprC_ManuallyDrop_Point Foo;
+
+struct Point {
+  int32_t x;
+  int32_t y;
+};
+
+struct MyStruct {
+  struct Point point;
+};
+
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
+
+void take(struct Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_ManuallyDrop_Point;
+
+typedef struct NotReprC_ManuallyDrop_Point Foo;
+
+struct Point {
+  int32_t x;
+  int32_t y;
+};
+
+struct MyStruct {
+  struct Point point;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_manual_drop);
+
+void take(struct Point with_manual_drop);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/manuallydrop.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,37 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using ManuallyDrop = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct NotReprC_ManuallyDrop_Point:
+    pass
+
+  ctypedef NotReprC_ManuallyDrop_Point Foo;
+
+  cdef struct Point:
+    int32_t x;
+    int32_t y;
+
+  cdef struct MyStruct:
+    Point point;
+
+  void root(const Foo *a, const MyStruct *with_manual_drop);
+
+  void take(Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
+
+typedef struct NotReprC_MaybeUninit______i32 Foo;
+
+typedef struct MyStruct {
+  const int32_t *number;
+} MyStruct;
+
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct NotReprC_MaybeUninit______i32 NotReprC_MaybeUninit______i32;
+
+typedef struct NotReprC_MaybeUninit______i32 Foo;
+
+typedef struct MyStruct {
+  const int32_t *number;
+} MyStruct;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using MaybeUninit = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using MaybeUninit = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using MaybeUninit = T;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <cstdarg>
 #include <cstdint>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,31 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct NotReprC_MaybeUninit______i32:
+    pass
+
+  ctypedef NotReprC_MaybeUninit______i32 Foo;
+
+  ctypedef struct MyStruct:
+    const int32_t *number;
+
+  void root(const Foo *a, const MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_MaybeUninit______i32;
+
+typedef struct NotReprC_MaybeUninit______i32 Foo;
+
+struct MyStruct {
+  const int32_t *number;
+};
+
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct NotReprC_MaybeUninit______i32;
+
+typedef struct NotReprC_MaybeUninit______i32 Foo;
+
+struct MyStruct {
+  const int32_t *number;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/maybeuninit.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,31 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+template <typename T>
+using MaybeUninit = T;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct NotReprC_MaybeUninit______i32:
+    pass
+
+  ctypedef NotReprC_MaybeUninit______i32 Foo;
+
+  cdef struct MyStruct:
+    const int32_t *number;
+
+  void root(const Foo *a, const MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  ctypedef struct ExportMe:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2015.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  cdef struct ExportMe:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+typedef struct ExportMe2 {
+  uint64_t val;
+} ExportMe2;
+
+void export_me(struct ExportMe *val);
+
+void export_me_2(struct ExportMe2*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+typedef struct ExportMe2 {
+  uint64_t val;
+} ExportMe2;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+void export_me_2(struct ExportMe2*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.c	2021-01-18 19:59:04.000000000 +0000
@@ -9,4 +9,10 @@
   uint64_t val;
 } ExportMe;
 
+typedef struct {
+  uint64_t val;
+} ExportMe2;
+
 void export_me(ExportMe *val);
+
+void export_me_2(ExportMe2*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -9,12 +9,18 @@
   uint64_t val;
 } ExportMe;
 
+typedef struct {
+  uint64_t val;
+} ExportMe2;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
 void export_me(ExportMe *val);
 
+void export_me_2(ExportMe2*);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -10,8 +10,14 @@
   uint64_t val;
 };
 
+struct ExportMe2 {
+  uint64_t val;
+};
+
 extern "C" {
 
 void export_me(ExportMe *val);
 
+void export_me_2(ExportMe2*);
+
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  ctypedef struct ExportMe:
+    uint64_t val;
+
+  ctypedef struct ExportMe2:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
+
+  void export_me_2(ExportMe2*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+struct ExportMe2 {
+  uint64_t val;
+};
+
+void export_me(struct ExportMe *val);
+
+void export_me_2(struct ExportMe2*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+struct ExportMe2 {
+  uint64_t val;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+void export_me_2(struct ExportMe2*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_2018.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  cdef struct ExportMe:
+    uint64_t val;
+
+  cdef struct ExportMe2:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
+
+  void export_me_2(ExportMe2*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,38 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(FOO)
+#define FOO 1
+#endif
+
+#if defined(BAR)
+#define BAR 2
+#endif
+
+#if defined(FOO)
+typedef struct Foo {
+
+} Foo;
+#endif
+
+#if defined(BAR)
+typedef struct Bar {
+
+} Bar;
+#endif
+
+#if defined(FOO)
+void foo(const struct Foo *foo);
+#endif
+
+#if defined(BAR)
+void bar(const struct Bar *bar);
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,46 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(FOO)
+#define FOO 1
+#endif
+
+#if defined(BAR)
+#define BAR 2
+#endif
+
+#if defined(FOO)
+typedef struct Foo {
+
+} Foo;
+#endif
+
+#if defined(BAR)
+typedef struct Bar {
+
+} Bar;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#if defined(FOO)
+void foo(const struct Foo *foo);
+#endif
+
+#if defined(BAR)
+void bar(const struct Bar *bar);
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,9 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,9 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,9 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
 #include <cstdarg>
 #include <cstdint>
 #include <cstdlib>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,33 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF FOO:
+    const int32_t FOO # = 1
+
+  IF BAR:
+    const int32_t BAR # = 2
+
+  IF FOO:
+    ctypedef struct Foo:
+      pass
+
+  IF BAR:
+    ctypedef struct Bar:
+      pass
+
+  IF FOO:
+    void foo(const Foo *foo);
+
+  IF BAR:
+    void bar(const Bar *bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,38 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(FOO)
+#define FOO 1
+#endif
+
+#if defined(BAR)
+#define BAR 2
+#endif
+
+#if defined(FOO)
+struct Foo {
+
+};
+#endif
+
+#if defined(BAR)
+struct Bar {
+
+};
+#endif
+
+#if defined(FOO)
+void foo(const struct Foo *foo);
+#endif
+
+#if defined(BAR)
+void bar(const struct Bar *bar);
+#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,46 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#if defined(FOO)
+#define FOO 1
+#endif
+
+#if defined(BAR)
+#define BAR 2
+#endif
+
+#if defined(FOO)
+struct Foo {
+
+};
+#endif
+
+#if defined(BAR)
+struct Bar {
+
+};
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#if defined(FOO)
+void foo(const struct Foo *foo);
+#endif
+
+#if defined(BAR)
+void bar(const struct Bar *bar);
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_attr.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,33 @@
+#if 0
+DEF FOO = 0
+DEF BAR = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  IF FOO:
+    const int32_t FOO # = 1
+
+  IF BAR:
+    const int32_t BAR # = 2
+
+  IF FOO:
+    cdef struct Foo:
+      pass
+
+  IF BAR:
+    cdef struct Bar:
+      pass
+
+  IF FOO:
+    void foo(const Foo *foo);
+
+  IF BAR:
+    void bar(const Bar *bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct ExportMe {
+  uint64_t val;
+} ExportMe;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  ctypedef struct ExportMe:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXPORT_ME_TOO 42
+
+struct ExportMe {
+  uint64_t val;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void export_me(struct ExportMe *val);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/mod_path.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/mod_path.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const uint8_t EXPORT_ME_TOO # = 42
+
+  cdef struct ExportMe:
+    uint64_t val;
+
+  void export_me(ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef struct Foo_i32 {
+  const int32_t *data;
+} Foo_i32;
+
+typedef struct Foo_f32 {
+  const float *data;
+} Foo_f32;
+
+typedef struct Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef struct Tuple_Foo_f32_____f32 {
+  const struct Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef struct Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef struct Tuple_f32__f32 Indirection_f32;
+
+void root(struct Foo_i32 a,
+          struct Foo_f32 b,
+          struct Bar_f32 c,
+          struct Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          struct Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef struct Foo_i32 {
+  const int32_t *data;
+} Foo_i32;
+
+typedef struct Foo_f32 {
+  const float *data;
+} Foo_f32;
+
+typedef struct Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef struct Tuple_Foo_f32_____f32 {
+  const struct Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef struct Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef struct Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo_i32 a,
+          struct Foo_f32 b,
+          struct Bar_f32 c,
+          struct Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          struct Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef struct {
+  const int32_t *data;
+} Foo_i32;
+
+typedef struct {
+  const float *data;
+} Foo_f32;
+
+typedef struct {
+  const Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef struct {
+  const Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef struct {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef Tuple_f32__f32 Indirection_f32;
+
+void root(Foo_i32 a,
+          Foo_f32 b,
+          Bar_f32 c,
+          Foo_Bar_f32 d,
+          Bar_Foo_f32 e,
+          Bar_Bar_f32 f,
+          Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef struct {
-  const int32_t *data;
-} Foo_i32;
-
-typedef struct {
-  const float *data;
-} Foo_f32;
-
-typedef struct {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef struct {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef struct {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef struct {
+  const int32_t *data;
+} Foo_i32;
+
+typedef struct {
+  const float *data;
+} Foo_f32;
+
+typedef struct {
+  const Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef struct {
+  const Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef struct {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Foo_i32 a,
+          Foo_f32 b,
+          Bar_f32 c,
+          Foo_Bar_f32 d,
+          Bar_Foo_f32 e,
+          Bar_Bar_f32 f,
+          Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef struct {
-  const int32_t *data;
-} Foo_i32;
-
-typedef struct {
-  const float *data;
-} Foo_f32;
-
-typedef struct {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef struct {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef struct {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+template<typename T = void>
+struct Bar;
+
+template<typename T>
+struct Foo {
+  const T *data;
+};
+
+template<typename T, typename E>
+struct Tuple {
+  const T *a;
+  const E *b;
+};
+
+template<typename T>
+using Indirection = Tuple<T, float>;
+
+extern "C" {
+
+void root(Foo<int32_t> a,
+          Foo<float> b,
+          Bar<float> c,
+          Foo<Bar<float>> d,
+          Bar<Foo<float>> e,
+          Bar<Bar<float>> f,
+          Tuple<Foo<float>, float> g,
+          Indirection<float> h);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-1.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-1.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-template<typename T = void>
-struct Bar;
-
-template<typename T>
-struct Foo {
-  const T *data;
-};
-
-template<typename T, typename E>
-struct Tuple {
-  const T *a;
-  const E *b;
-};
-
-template<typename T>
-using Indirection = Tuple<T, float>;
-
-extern "C" {
-
-void root(Foo<int32_t> a,
-          Foo<float> b,
-          Bar<float> c,
-          Foo<Bar<float>> d,
-          Bar<Foo<float>> e,
-          Bar<Bar<float>> f,
-          Tuple<Foo<float>, float> g,
-          Indirection<float> h);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Bar_Bar_f32:
+    pass
+
+  ctypedef struct Bar_Foo_f32:
+    pass
+
+  ctypedef struct Bar_f32:
+    pass
+
+  ctypedef struct Foo_i32:
+    const int32_t *data;
+
+  ctypedef struct Foo_f32:
+    const float *data;
+
+  ctypedef struct Foo_Bar_f32:
+    const Bar_f32 *data;
+
+  ctypedef struct Tuple_Foo_f32_____f32:
+    const Foo_f32 *a;
+    const float *b;
+
+  ctypedef struct Tuple_f32__f32:
+    const float *a;
+    const float *b;
+
+  ctypedef Tuple_f32__f32 Indirection_f32;
+
+  void root(Foo_i32 a,
+            Foo_f32 b,
+            Bar_f32 c,
+            Foo_Bar_f32 d,
+            Bar_Foo_f32 e,
+            Bar_Bar_f32 f,
+            Tuple_Foo_f32_____f32 g,
+            Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar_Bar_f32;
+
+struct Bar_Foo_f32;
+
+struct Bar_f32;
+
+struct Foo_i32 {
+  const int32_t *data;
+};
+
+struct Foo_f32 {
+  const float *data;
+};
+
+struct Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+};
+
+struct Tuple_Foo_f32_____f32 {
+  const struct Foo_f32 *a;
+  const float *b;
+};
+
+struct Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+};
+
+typedef struct Tuple_f32__f32 Indirection_f32;
+
+void root(struct Foo_i32 a,
+          struct Foo_f32 b,
+          struct Bar_f32 c,
+          struct Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          struct Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar_Bar_f32;
+
+struct Bar_Foo_f32;
+
+struct Bar_f32;
+
+struct Foo_i32 {
+  const int32_t *data;
+};
+
+struct Foo_f32 {
+  const float *data;
+};
+
+struct Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+};
+
+struct Tuple_Foo_f32_____f32 {
+  const struct Foo_f32 *a;
+  const float *b;
+};
+
+struct Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+};
+
+typedef struct Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo_i32 a,
+          struct Foo_f32 b,
+          struct Bar_f32 c,
+          struct Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          struct Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_1.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Bar_Bar_f32:
+    pass
+
+  cdef struct Bar_Foo_f32:
+    pass
+
+  cdef struct Bar_f32:
+    pass
+
+  cdef struct Foo_i32:
+    const int32_t *data;
+
+  cdef struct Foo_f32:
+    const float *data;
+
+  cdef struct Foo_Bar_f32:
+    const Bar_f32 *data;
+
+  cdef struct Tuple_Foo_f32_____f32:
+    const Foo_f32 *a;
+    const float *b;
+
+  cdef struct Tuple_f32__f32:
+    const float *a;
+    const float *b;
+
+  ctypedef Tuple_f32__f32 Indirection_f32;
+
+  void root(Foo_i32 a,
+            Foo_f32 b,
+            Bar_f32 c,
+            Foo_Bar_f32 d,
+            Bar_Foo_f32 e,
+            Bar_Bar_f32 f,
+            Tuple_Foo_f32_____f32 g,
+            Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A A;
+
+typedef struct B B;
+
+typedef struct List_A {
+  struct A *members;
+  uintptr_t count;
+} List_A;
+
+typedef struct List_B {
+  struct B *members;
+  uintptr_t count;
+} List_B;
+
+void foo(struct List_A a);
+
+void bar(struct List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A A;
+
+typedef struct B B;
+
+typedef struct List_A {
+  struct A *members;
+  uintptr_t count;
+} List_A;
+
+typedef struct List_B {
+  struct B *members;
+  uintptr_t count;
+} List_B;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(struct List_A a);
+
+void bar(struct List_B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A A;
+
+typedef struct B B;
+
+typedef struct {
+  A *members;
+  uintptr_t count;
+} List_A;
+
+typedef struct {
+  B *members;
+  uintptr_t count;
+} List_B;
+
+void foo(List_A a);
+
+void bar(List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A A;
-
-typedef struct B B;
-
-typedef struct {
-  A *members;
-  uintptr_t count;
-} List_A;
-
-typedef struct {
-  B *members;
-  uintptr_t count;
-} List_B;
-
-void foo(List_A a);
-
-void bar(List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A A;
+
+typedef struct B B;
+
+typedef struct {
+  A *members;
+  uintptr_t count;
+} List_A;
+
+typedef struct {
+  B *members;
+  uintptr_t count;
+} List_B;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(List_A a);
+
+void bar(List_B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct A A;
-
-typedef struct B B;
-
-typedef struct {
-  A *members;
-  uintptr_t count;
-} List_A;
-
-typedef struct {
-  B *members;
-  uintptr_t count;
-} List_B;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(List_A a);
-
-void bar(List_B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct A;
+
+struct B;
+
+template<typename T>
+struct List {
+  T *members;
+  uintptr_t count;
+};
+
+extern "C" {
+
+void foo(List<A> a);
+
+void bar(List<B> b);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-2.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-2.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct A;
-
-struct B;
-
-template<typename T>
-struct List {
-  T *members;
-  uintptr_t count;
-};
-
-extern "C" {
-
-void foo(List<A> a);
-
-void bar(List<B> b);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct A:
+    pass
+
+  ctypedef struct B:
+    pass
+
+  ctypedef struct List_A:
+    A *members;
+    uintptr_t count;
+
+  ctypedef struct List_B:
+    B *members;
+    uintptr_t count;
+
+  void foo(List_A a);
+
+  void bar(List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A;
+
+struct B;
+
+struct List_A {
+  struct A *members;
+  uintptr_t count;
+};
+
+struct List_B {
+  struct B *members;
+  uintptr_t count;
+};
+
+void foo(struct List_A a);
+
+void bar(struct List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A;
+
+struct B;
+
+struct List_A {
+  struct A *members;
+  uintptr_t count;
+};
+
+struct List_B {
+  struct B *members;
+  uintptr_t count;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(struct List_A a);
+
+void bar(struct List_B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_2.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct A:
+    pass
+
+  cdef struct B:
+    pass
+
+  cdef struct List_A:
+    A *members;
+    uintptr_t count;
+
+  cdef struct List_B:
+    B *members;
+    uintptr_t count;
+
+  void foo(List_A a);
+
+  void bar(List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef union Foo_i32 {
+  const int32_t *data;
+} Foo_i32;
+
+typedef union Foo_f32 {
+  const float *data;
+} Foo_f32;
+
+typedef union Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef union Tuple_Foo_f32_____f32 {
+  const union Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef union Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef union Tuple_f32__f32 Indirection_f32;
+
+void root(union Foo_i32 a,
+          union Foo_f32 b,
+          struct Bar_f32 c,
+          union Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          union Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef union Foo_i32 {
+  const int32_t *data;
+} Foo_i32;
+
+typedef union Foo_f32 {
+  const float *data;
+} Foo_f32;
+
+typedef union Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef union Tuple_Foo_f32_____f32 {
+  const union Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef union Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef union Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Foo_i32 a,
+          union Foo_f32 b,
+          struct Bar_f32 c,
+          union Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          union Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef union {
+  const int32_t *data;
+} Foo_i32;
+
+typedef union {
+  const float *data;
+} Foo_f32;
+
+typedef union {
+  const Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef union {
+  const Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef union {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef Tuple_f32__f32 Indirection_f32;
+
+void root(Foo_i32 a,
+          Foo_f32 b,
+          Bar_f32 c,
+          Foo_Bar_f32 d,
+          Bar_Foo_f32 e,
+          Bar_Bar_f32 f,
+          Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef union {
-  const int32_t *data;
-} Foo_i32;
-
-typedef union {
-  const float *data;
-} Foo_f32;
-
-typedef union {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef union {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef union {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar_Bar_f32 Bar_Bar_f32;
+
+typedef struct Bar_Foo_f32 Bar_Foo_f32;
+
+typedef struct Bar_f32 Bar_f32;
+
+typedef union {
+  const int32_t *data;
+} Foo_i32;
+
+typedef union {
+  const float *data;
+} Foo_f32;
+
+typedef union {
+  const Bar_f32 *data;
+} Foo_Bar_f32;
+
+typedef union {
+  const Foo_f32 *a;
+  const float *b;
+} Tuple_Foo_f32_____f32;
+
+typedef union {
+  const float *a;
+  const float *b;
+} Tuple_f32__f32;
+
+typedef Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Foo_i32 a,
+          Foo_f32 b,
+          Bar_f32 c,
+          Foo_Bar_f32 d,
+          Bar_Foo_f32 e,
+          Bar_Bar_f32 f,
+          Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Bar_Bar_f32 Bar_Bar_f32;
-
-typedef struct Bar_Foo_f32 Bar_Foo_f32;
-
-typedef struct Bar_f32 Bar_f32;
-
-typedef union {
-  const int32_t *data;
-} Foo_i32;
-
-typedef union {
-  const float *data;
-} Foo_f32;
-
-typedef union {
-  const Bar_f32 *data;
-} Foo_Bar_f32;
-
-typedef union {
-  const Foo_f32 *a;
-  const float *b;
-} Tuple_Foo_f32_____f32;
-
-typedef union {
-  const float *a;
-  const float *b;
-} Tuple_f32__f32;
-
-typedef Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo_i32 a,
-          Foo_f32 b,
-          Bar_f32 c,
-          Foo_Bar_f32 d,
-          Bar_Foo_f32 e,
-          Bar_Bar_f32 f,
-          Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+template<typename T = void>
+struct Bar;
+
+template<typename T>
+union Foo {
+  const T *data;
+};
+
+template<typename T, typename E>
+union Tuple {
+  const T *a;
+  const E *b;
+};
+
+template<typename T>
+using Indirection = Tuple<T, float>;
+
+extern "C" {
+
+void root(Foo<int32_t> a,
+          Foo<float> b,
+          Bar<float> c,
+          Foo<Bar<float>> d,
+          Bar<Foo<float>> e,
+          Bar<Bar<float>> f,
+          Tuple<Foo<float>, float> g,
+          Indirection<float> h);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph-3.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph-3.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-template<typename T = void>
-struct Bar;
-
-template<typename T>
-union Foo {
-  const T *data;
-};
-
-template<typename T, typename E>
-union Tuple {
-  const T *a;
-  const E *b;
-};
-
-template<typename T>
-using Indirection = Tuple<T, float>;
-
-extern "C" {
-
-void root(Foo<int32_t> a,
-          Foo<float> b,
-          Bar<float> c,
-          Foo<Bar<float>> d,
-          Bar<Foo<float>> e,
-          Bar<Bar<float>> f,
-          Tuple<Foo<float>, float> g,
-          Indirection<float> h);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Bar_Bar_f32:
+    pass
+
+  ctypedef struct Bar_Foo_f32:
+    pass
+
+  ctypedef struct Bar_f32:
+    pass
+
+  ctypedef union Foo_i32:
+    const int32_t *data;
+
+  ctypedef union Foo_f32:
+    const float *data;
+
+  ctypedef union Foo_Bar_f32:
+    const Bar_f32 *data;
+
+  ctypedef union Tuple_Foo_f32_____f32:
+    const Foo_f32 *a;
+    const float *b;
+
+  ctypedef union Tuple_f32__f32:
+    const float *a;
+    const float *b;
+
+  ctypedef Tuple_f32__f32 Indirection_f32;
+
+  void root(Foo_i32 a,
+            Foo_f32 b,
+            Bar_f32 c,
+            Foo_Bar_f32 d,
+            Bar_Foo_f32 e,
+            Bar_Bar_f32 f,
+            Tuple_Foo_f32_____f32 g,
+            Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar_Bar_f32;
+
+struct Bar_Foo_f32;
+
+struct Bar_f32;
+
+union Foo_i32 {
+  const int32_t *data;
+};
+
+union Foo_f32 {
+  const float *data;
+};
+
+union Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+};
+
+union Tuple_Foo_f32_____f32 {
+  const union Foo_f32 *a;
+  const float *b;
+};
+
+union Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+};
+
+typedef union Tuple_f32__f32 Indirection_f32;
+
+void root(union Foo_i32 a,
+          union Foo_f32 b,
+          struct Bar_f32 c,
+          union Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          union Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,51 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar_Bar_f32;
+
+struct Bar_Foo_f32;
+
+struct Bar_f32;
+
+union Foo_i32 {
+  const int32_t *data;
+};
+
+union Foo_f32 {
+  const float *data;
+};
+
+union Foo_Bar_f32 {
+  const struct Bar_f32 *data;
+};
+
+union Tuple_Foo_f32_____f32 {
+  const union Foo_f32 *a;
+  const float *b;
+};
+
+union Tuple_f32__f32 {
+  const float *a;
+  const float *b;
+};
+
+typedef union Tuple_f32__f32 Indirection_f32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Foo_i32 a,
+          union Foo_f32 b,
+          struct Bar_f32 c,
+          union Foo_Bar_f32 d,
+          struct Bar_Foo_f32 e,
+          struct Bar_Bar_f32 f,
+          union Tuple_Foo_f32_____f32 g,
+          Indirection_f32 h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/monomorph_3.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Bar_Bar_f32:
+    pass
+
+  cdef struct Bar_Foo_f32:
+    pass
+
+  cdef struct Bar_f32:
+    pass
+
+  cdef union Foo_i32:
+    const int32_t *data;
+
+  cdef union Foo_f32:
+    const float *data;
+
+  cdef union Foo_Bar_f32:
+    const Bar_f32 *data;
+
+  cdef union Tuple_Foo_f32_____f32:
+    const Foo_f32 *a;
+    const float *b;
+
+  cdef union Tuple_f32__f32:
+    const float *a;
+    const float *b;
+
+  ctypedef Tuple_f32__f32 Indirection_f32;
+
+  void root(Foo_i32 a,
+            Foo_f32 b,
+            Bar_f32 c,
+            Foo_Bar_f32 d,
+            Bar_Foo_f32 e,
+            Bar_Bar_f32 f,
+            Tuple_Foo_f32_____f32 g,
+            Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag {
+  Owned_i32,
+  None_i32,
+};
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+
+typedef struct MUST_USE_STRUCT MaybeOwnedPtr_i32 {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+} MaybeOwnedPtr_i32;
+
+typedef struct MUST_USE_STRUCT OwnedPtr_i32 {
+  int32_t *ptr;
+} OwnedPtr_i32;
+
+MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Owned_i32,
+  None_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+#endif // __cplusplus
+
+typedef struct MUST_USE_STRUCT MaybeOwnedPtr_i32 {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+} MaybeOwnedPtr_i32;
+
+typedef struct MUST_USE_STRUCT OwnedPtr_i32 {
+  int32_t *ptr;
+} OwnedPtr_i32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag {
+  Owned_i32,
+  None_i32,
+};
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+
+typedef struct MUST_USE_STRUCT {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+} MaybeOwnedPtr_i32;
+
+typedef struct MUST_USE_STRUCT {
+  int32_t *ptr;
+} OwnedPtr_i32;
+
+MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag {
-  Owned_i32,
-  None_i32,
-};
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-
-typedef struct {
-  int32_t *_0;
-} Owned_Body_i32;
-
-typedef struct {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    Owned_Body_i32 owned;
-  };
-} MaybeOwnedPtr_i32;
-
-typedef struct MUST_USE_STRUCT {
-  int32_t *ptr;
-} OwnedPtr_i32;
-
-MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Owned_i32,
+  None_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+#endif // __cplusplus
+
+typedef struct MUST_USE_STRUCT {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+} MaybeOwnedPtr_i32;
+
+typedef struct MUST_USE_STRUCT {
+  int32_t *ptr;
+} OwnedPtr_i32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Owned_i32,
-  None_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  int32_t *_0;
-} Owned_Body_i32;
-
-typedef struct {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    Owned_Body_i32 owned;
-  };
-} MaybeOwnedPtr_i32;
-
-typedef struct MUST_USE_STRUCT {
-  int32_t *ptr;
-} OwnedPtr_i32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-MUST_USE_FUNC MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,38 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+template<typename T>
+struct MUST_USE_STRUCT MaybeOwnedPtr {
+  enum class MUST_USE_ENUM Tag : uint8_t {
+    Owned,
+    None,
+  };
+
+  struct Owned_Body {
+    T *_0;
+  };
+
+  Tag tag;
+  union {
+    Owned_Body owned;
+  };
+};
+
+template<typename T>
+struct MUST_USE_STRUCT OwnedPtr {
+  T *ptr;
+};
+
+extern "C" {
+
+MUST_USE_FUNC MaybeOwnedPtr<int32_t> maybe_consume(OwnedPtr<int32_t> input);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must-use.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must-use.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-template<typename T>
-struct MUST_USE_STRUCT MaybeOwnedPtr {
-  enum class MUST_USE_ENUM Tag : uint8_t {
-    Owned,
-    None,
-  };
-
-  struct Owned_Body {
-    T *_0;
-  };
-
-  Tag tag;
-  union {
-    Owned_Body owned;
-  };
-};
-
-template<typename T>
-struct MUST_USE_STRUCT OwnedPtr {
-  T *ptr;
-};
-
-extern "C" {
-
-MUST_USE_FUNC MaybeOwnedPtr<int32_t> maybe_consume(OwnedPtr<int32_t> input);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Owned_i32,
+    None_i32,
+  ctypedef uint8_t MaybeOwnedPtr_i32_Tag;
+
+  ctypedef struct MaybeOwnedPtr_i32:
+    MaybeOwnedPtr_i32_Tag tag;
+    int32_t *owned;
+
+  ctypedef struct OwnedPtr_i32:
+    int32_t *ptr;
+
+  MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag {
+  Owned_i32,
+  None_i32,
+};
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+
+struct MUST_USE_STRUCT MaybeOwnedPtr_i32 {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+};
+
+struct MUST_USE_STRUCT OwnedPtr_i32 {
+  int32_t *ptr;
+};
+
+MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum MaybeOwnedPtr_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Owned_i32,
+  None_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t MaybeOwnedPtr_i32_Tag;
+#endif // __cplusplus
+
+struct MUST_USE_STRUCT MaybeOwnedPtr_i32 {
+  MaybeOwnedPtr_i32_Tag tag;
+  union {
+    struct {
+      int32_t *owned;
+    };
+  };
+};
+
+struct MUST_USE_STRUCT OwnedPtr_i32 {
+  int32_t *ptr;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/must_use.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/must_use.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Owned_i32,
+    None_i32,
+  ctypedef uint8_t MaybeOwnedPtr_i32_Tag;
+
+  cdef struct MaybeOwnedPtr_i32:
+    MaybeOwnedPtr_i32_Tag tag;
+    int32_t *owned;
+
+  cdef struct OwnedPtr_i32:
+    int32_t *ptr;
+
+  MaybeOwnedPtr_i32 maybe_consume(OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define ZOM 3.14
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+namespace constants {
+#endif // __cplusplus
+
+#define FOO 10
+
+#define ZOM 3.14
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+} // namespace constants
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const float ZOM # = 3.14
+
+  ctypedef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define ZOM 3.14
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+namespace constants {
+#endif // __cplusplus
+
+#define FOO 10
+
+#define ZOM 3.14
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+} // namespace constants
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespace_constant.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const float ZOM # = 3.14
+
+  cdef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define ZOM 3.14
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+namespace constants {
+namespace test {
+#endif // __cplusplus
+
+#define FOO 10
+
+#define ZOM 3.14
+
+typedef struct Foo {
+  int32_t x[FOO];
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+} // namespace test
+} // namespace constants
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const float ZOM # = 3.14
+
+  ctypedef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define FOO 10
+
+#define ZOM 3.14
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+namespace constants {
+namespace test {
+#endif // __cplusplus
+
+#define FOO 10
+
+#define ZOM 3.14
+
+struct Foo {
+  int32_t x[FOO];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+} // namespace test
+} // namespace constants
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/namespaces_constant.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t FOO # = 10
+
+  const float ZOM # = 3.14
+
+  cdef struct Foo:
+    int32_t x[FOO];
+
+  void root(Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nested_import.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nested_import.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nested_import.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nested_import.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nested_import.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/nested_import.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nested_import.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nested_import.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/no_includes.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/no_includes.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/no_includes.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/no_includes.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,4 @@
+
+cdef extern from *:
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct References {
+  const struct Opaque *CBINDGEN_NONNULL a;
+  struct Opaque *CBINDGEN_NONNULL b;
+  const struct Opaque *c;
+  struct Opaque *d;
+} References;
+
+typedef struct Pointers_u64 {
+  float *CBINDGEN_NONNULL a;
+  uint64_t *CBINDGEN_NONNULL b;
+  struct Opaque *CBINDGEN_NONNULL c;
+  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
+  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
+  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t *CBINDGEN_NONNULL *i;
+  const uint64_t *j;
+  uint64_t *k;
+} Pointers_u64;
+
+void value_arg(struct References arg);
+
+void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
+                    struct Pointers_u64 *foo,
+                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
+
+void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const struct Pointers_u64 *arg);
+
+void optional_mut_ref_arg(struct Pointers_u64 *arg);
+
+void nullable_const_ptr(const struct Pointers_u64 *arg);
+
+void nullable_mut_ptr(struct Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,60 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct References {
+  const struct Opaque *CBINDGEN_NONNULL a;
+  struct Opaque *CBINDGEN_NONNULL b;
+  const struct Opaque *c;
+  struct Opaque *d;
+} References;
+
+typedef struct Pointers_u64 {
+  float *CBINDGEN_NONNULL a;
+  uint64_t *CBINDGEN_NONNULL b;
+  struct Opaque *CBINDGEN_NONNULL c;
+  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
+  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
+  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t *CBINDGEN_NONNULL *i;
+  const uint64_t *j;
+  uint64_t *k;
+} Pointers_u64;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void value_arg(struct References arg);
+
+void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
+                    struct Pointers_u64 *foo,
+                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
+
+void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const struct Pointers_u64 *arg);
+
+void optional_mut_ref_arg(struct Pointers_u64 *arg);
+
+void nullable_const_ptr(const struct Pointers_u64 *arg);
+
+void nullable_mut_ptr(struct Pointers_u64 *arg);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef struct References:
+    const Opaque *a;
+    Opaque *b;
+    const Opaque *c;
+    Opaque *d;
+
+  ctypedef struct Pointers_u64:
+    float *a;
+    uint64_t *b;
+    Opaque *c;
+    uint64_t **d;
+    float **e;
+    Opaque **f;
+    uint64_t *g;
+    int32_t *h;
+    int32_t **i;
+    const uint64_t *j;
+    uint64_t *k;
+
+  void value_arg(References arg);
+
+  void mutltiple_args(int32_t *arg, Pointers_u64 *foo, Opaque **d);
+
+  void ref_arg(const Pointers_u64 *arg);
+
+  void mut_ref_arg(Pointers_u64 *arg);
+
+  void optional_ref_arg(const Pointers_u64 *arg);
+
+  void optional_mut_ref_arg(Pointers_u64 *arg);
+
+  void nullable_const_ptr(const Pointers_u64 *arg);
+
+  void nullable_mut_ptr(Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct References {
+  const struct Opaque *CBINDGEN_NONNULL a;
+  struct Opaque *CBINDGEN_NONNULL b;
+  const struct Opaque *c;
+  struct Opaque *d;
+};
+
+struct Pointers_u64 {
+  float *CBINDGEN_NONNULL a;
+  uint64_t *CBINDGEN_NONNULL b;
+  struct Opaque *CBINDGEN_NONNULL c;
+  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
+  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
+  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t *CBINDGEN_NONNULL *i;
+  const uint64_t *j;
+  uint64_t *k;
+};
+
+void value_arg(struct References arg);
+
+void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
+                    struct Pointers_u64 *foo,
+                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
+
+void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const struct Pointers_u64 *arg);
+
+void optional_mut_ref_arg(struct Pointers_u64 *arg);
+
+void nullable_const_ptr(const struct Pointers_u64 *arg);
+
+void nullable_mut_ptr(struct Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,60 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct References {
+  const struct Opaque *CBINDGEN_NONNULL a;
+  struct Opaque *CBINDGEN_NONNULL b;
+  const struct Opaque *c;
+  struct Opaque *d;
+};
+
+struct Pointers_u64 {
+  float *CBINDGEN_NONNULL a;
+  uint64_t *CBINDGEN_NONNULL b;
+  struct Opaque *CBINDGEN_NONNULL c;
+  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
+  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
+  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t *CBINDGEN_NONNULL *i;
+  const uint64_t *j;
+  uint64_t *k;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void value_arg(struct References arg);
+
+void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
+                    struct Pointers_u64 *foo,
+                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
+
+void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
+
+void optional_ref_arg(const struct Pointers_u64 *arg);
+
+void optional_mut_ref_arg(struct Pointers_u64 *arg);
+
+void nullable_const_ptr(const struct Pointers_u64 *arg);
+
+void nullable_mut_ptr(struct Pointers_u64 *arg);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull_attribute.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,52 @@
+#ifdef __clang__
+#define CBINDGEN_NONNULL _Nonnull
+#else
+#define CBINDGEN_NONNULL
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef struct References:
+    const Opaque *a;
+    Opaque *b;
+    const Opaque *c;
+    Opaque *d;
+
+  cdef struct Pointers_u64:
+    float *a;
+    uint64_t *b;
+    Opaque *c;
+    uint64_t **d;
+    float **e;
+    Opaque **f;
+    uint64_t *g;
+    int32_t *h;
+    int32_t **i;
+    const uint64_t *j;
+    uint64_t *k;
+
+  void value_arg(References arg);
+
+  void mutltiple_args(int32_t *arg, Pointers_u64 *foo, Opaque **d);
+
+  void ref_arg(const Pointers_u64 *arg);
+
+  void mut_ref_arg(Pointers_u64 *arg);
+
+  void optional_ref_arg(const Pointers_u64 *arg);
+
+  void optional_mut_ref_arg(Pointers_u64 *arg);
+
+  void nullable_const_ptr(const Pointers_u64 *arg);
+
+  void nullable_mut_ptr(Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Foo_u64 {
+  float *a;
+  uint64_t *b;
+  struct Opaque *c;
+  uint64_t **d;
+  float **e;
+  struct Opaque **f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t **i;
+} Foo_u64;
+
+void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Foo_u64 {
+  float *a;
+  uint64_t *b;
+  struct Opaque *c;
+  uint64_t **d;
+  float **e;
+  struct Opaque **f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t **i;
+} Foo_u64;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef struct Foo_u64:
+    float *a;
+    uint64_t *b;
+    Opaque *c;
+    uint64_t **d;
+    float **e;
+    Opaque **f;
+    uint64_t *g;
+    int32_t *h;
+    int32_t **i;
+
+  void root(int32_t *arg, Foo_u64 *foo, Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Foo_u64 {
+  float *a;
+  uint64_t *b;
+  struct Opaque *c;
+  uint64_t **d;
+  float **e;
+  struct Opaque **f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t **i;
+};
+
+void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Foo_u64 {
+  float *a;
+  uint64_t *b;
+  struct Opaque *c;
+  uint64_t **d;
+  float **e;
+  struct Opaque **f;
+  uint64_t *g;
+  int32_t *h;
+  int32_t **i;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/nonnull.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/nonnull.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef struct Foo_u64:
+    float *a;
+    uint64_t *b;
+    Opaque *c;
+    uint64_t **d;
+    float **e;
+    Opaque **f;
+    uint64_t *g;
+    int32_t *h;
+    int32_t **i;
+
+  void root(int32_t *arg, Foo_u64 *foo, Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
+
+typedef struct Result_Foo Result_Foo;
+
+/**
+ * Fast hash map used internally.
+ */
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+typedef FastHashMap_i32__i32 Foo;
+
+typedef struct Result_Foo Bar;
+
+void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
+
+typedef struct Result_Foo Result_Foo;
+
+/**
+ * Fast hash map used internally.
+ */
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+typedef FastHashMap_i32__i32 Foo;
+
+typedef struct Result_Foo Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const Bar *b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,7 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 // These could be added as opaque types I guess.
 template <typename T>
@@ -6,6 +10,10 @@
 struct DefaultHasher;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,7 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 // These could be added as opaque types I guess.
 template <typename T>
@@ -6,6 +10,10 @@
 struct DefaultHasher;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <stdarg.h>
 #include <stdbool.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,7 @@
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 // These could be added as opaque types I guess.
 template <typename T>
@@ -6,6 +10,10 @@
 struct DefaultHasher;
 #endif
 
+#if 0
+' '''
+#endif
+
 
 #include <cstdarg>
 #include <cstdint>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,39 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher:
+    pass
+
+  ctypedef struct Result_Foo:
+    pass
+
+  # Fast hash map used internally.
+  ctypedef HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+  ctypedef FastHashMap_i32__i32 Foo;
+
+  ctypedef Result_Foo Bar;
+
+  void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
+
+struct Result_Foo;
+
+/**
+ * Fast hash map used internally.
+ */
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+typedef FastHashMap_i32__i32 Foo;
+
+typedef struct Result_Foo Bar;
+
+void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
+
+struct Result_Foo;
+
+/**
+ * Fast hash map used internally.
+ */
+typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+typedef FastHashMap_i32__i32 Foo;
+
+typedef struct Result_Foo Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Foo *a, const Bar *b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/opaque.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/opaque.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,39 @@
+#if 0
+''' '
+#endif
+
+#ifdef __cplusplus
+// These could be added as opaque types I guess.
+template <typename T>
+struct BuildHasherDefault;
+
+struct DefaultHasher;
+#endif
+
+#if 0
+' '''
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher:
+    pass
+
+  cdef struct Result_Foo:
+    pass
+
+  # Fast hash map used internally.
+  ctypedef HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
+
+  ctypedef FastHashMap_i32__i32 Foo;
+
+  ctypedef Result_Foo Bar;
+
+  void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/pragma_once.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/pragma_once.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/pragma_once.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/pragma_once.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,31 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define PREFIX_LEN 22
+
+#define PREFIX_X (22 << 22)
+
+#define PREFIX_Y (PREFIX_X + PREFIX_X)
+
+typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+typedef int32_t PREFIX_ValuedLenArray[22];
+
+enum PREFIX_AbsoluteFontWeight_Tag {
+  Weight,
+  Normal,
+  Bold,
+};
+typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+
+typedef union PREFIX_AbsoluteFontWeight {
+  PREFIX_AbsoluteFontWeight_Tag tag;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
+} PREFIX_AbsoluteFontWeight;
+
+void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define PREFIX_LEN 22
+
+#define PREFIX_X (22 << 22)
+
+#define PREFIX_Y (PREFIX_X + PREFIX_X)
+
+typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+typedef int32_t PREFIX_ValuedLenArray[22];
+
+enum PREFIX_AbsoluteFontWeight_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Weight,
+  Normal,
+  Bold,
+};
+#ifndef __cplusplus
+typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+#endif // __cplusplus
+
+typedef union PREFIX_AbsoluteFontWeight {
+  PREFIX_AbsoluteFontWeight_Tag tag;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
+} PREFIX_AbsoluteFontWeight;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.c	2021-01-18 19:59:04.000000000 +0000
@@ -20,14 +20,12 @@
 };
 typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
 
-typedef struct {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-} PREFIX_Weight_Body;
-
 typedef union {
   PREFIX_AbsoluteFontWeight_Tag tag;
-  PREFIX_Weight_Body weight;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
 } PREFIX_AbsoluteFontWeight;
 
 void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -26,14 +26,12 @@
 typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
 #endif // __cplusplus
 
-typedef struct {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-} PREFIX_Weight_Body;
-
 typedef union {
   PREFIX_AbsoluteFontWeight_Tag tag;
-  PREFIX_Weight_Body weight;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
 } PREFIX_AbsoluteFontWeight;
 
 #ifdef __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+} PREFIXFoo;
+#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
+
+#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
+
+void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+} PREFIXFoo;
+#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
+
+#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct PREFIXFoo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct PREFIXBar {
+  int32_t a;
+} PREFIXBar;
+
+typedef struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+  struct PREFIXBar bar;
+} PREFIXFoo;
+
+#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
+
+void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct PREFIXBar {
+  int32_t a;
+} PREFIXBar;
+
+typedef struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+  struct PREFIXBar bar;
+} PREFIXFoo;
+
+#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct PREFIXFoo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct PREFIXBar:
+    int32_t a;
+
+  ctypedef struct PREFIXFoo:
+    int32_t a;
+    uint32_t b;
+    PREFIXBar bar;
+
+  const PREFIXFoo PREFIXVAL # = <PREFIXFoo>{ 42, 1337, <PREFIXBar>{ 323 } }
+
+  void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct PREFIXBar {
+  int32_t a;
+};
+
+struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+  struct PREFIXBar bar;
+};
+
+#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
+
+void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct PREFIXBar {
+  int32_t a;
+};
+
+struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+  struct PREFIXBar bar;
+};
+
+#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct PREFIXFoo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal_deep.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct PREFIXBar:
+    int32_t a;
+
+  cdef struct PREFIXFoo:
+    int32_t a;
+    uint32_t b;
+    PREFIXBar bar;
+
+  const PREFIXFoo PREFIXVAL # = <PREFIXFoo>{ 42, 1337, <PREFIXBar>{ 323 } }
+
+  void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct PREFIXFoo:
+    int32_t a;
+    uint32_t b;
+  const PREFIXFoo PREFIXFoo_FOO # = <PREFIXFoo>{ 42, 47 }
+
+  const PREFIXFoo PREFIXBAR # = <PREFIXFoo>{ 42, 1337 }
+
+  void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+};
+#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
+
+#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
+
+void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct PREFIXFoo {
+  int32_t a;
+  uint32_t b;
+};
+#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
+
+#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct PREFIXFoo x);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefixed_struct_literal.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct PREFIXFoo:
+    int32_t a;
+    uint32_t b;
+  const PREFIXFoo PREFIXFoo_FOO # = <PREFIXFoo>{ 42, 47 }
+
+  const PREFIXFoo PREFIXBAR # = <PREFIXFoo>{ 42, 1337 }
+
+  void root(PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t PREFIX_LEN # = 22
+
+  const int64_t PREFIX_X # = (22 << 22)
+
+  const int64_t PREFIX_Y # = (PREFIX_X + PREFIX_X)
+
+  ctypedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+  ctypedef int32_t PREFIX_ValuedLenArray[22];
+
+  cdef enum:
+    Weight,
+    Normal,
+    Bold,
+  ctypedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+
+  ctypedef union PREFIX_AbsoluteFontWeight:
+    PREFIX_AbsoluteFontWeight_Tag tag;
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+
+  void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,31 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define PREFIX_LEN 22
+
+#define PREFIX_X (22 << 22)
+
+#define PREFIX_Y (PREFIX_X + PREFIX_X)
+
+typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+typedef int32_t PREFIX_ValuedLenArray[22];
+
+enum PREFIX_AbsoluteFontWeight_Tag {
+  Weight,
+  Normal,
+  Bold,
+};
+typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+
+union PREFIX_AbsoluteFontWeight {
+  PREFIX_AbsoluteFontWeight_Tag tag;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
+};
+
+void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,45 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define PREFIX_LEN 22
+
+#define PREFIX_X (22 << 22)
+
+#define PREFIX_Y (PREFIX_X + PREFIX_X)
+
+typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+typedef int32_t PREFIX_ValuedLenArray[22];
+
+enum PREFIX_AbsoluteFontWeight_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Weight,
+  Normal,
+  Bold,
+};
+#ifndef __cplusplus
+typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+#endif // __cplusplus
+
+union PREFIX_AbsoluteFontWeight {
+  PREFIX_AbsoluteFontWeight_Tag tag;
+  struct {
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/prefix.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/prefix.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,30 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t PREFIX_LEN # = 22
+
+  const int64_t PREFIX_X # = (22 << 22)
+
+  const int64_t PREFIX_Y # = (PREFIX_X + PREFIX_X)
+
+  ctypedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
+
+  ctypedef int32_t PREFIX_ValuedLenArray[22];
+
+  cdef enum:
+    Weight,
+    Normal,
+    Bold,
+  ctypedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
+
+  cdef union PREFIX_AbsoluteFontWeight:
+    PREFIX_AbsoluteFontWeight_Tag tag;
+    PREFIX_AbsoluteFontWeight_Tag weight_tag;
+    float weight;
+
+  void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/ptrs_as_arrays.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/ptrs_as_arrays.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/ptrs_as_arrays.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/ptrs_as_arrays.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void ptr_as_array(uint32_t n, const uint32_t arg[3], const uint64_t *v);
+
+  void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
+
+  void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
+
+  void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
+
+  void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/raw_lines.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/raw_lines.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/raw_lines.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/raw_lines.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+#define VERSION 1
+
+cdef extern from *:
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,34 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define C_H 10
+
+enum C_E {
+  x = 0,
+  y = 1,
+};
+typedef uint8_t C_E;
+
+typedef struct C_A C_A;
+
+typedef struct C_C C_C;
+
+typedef struct C_AwesomeB {
+  int32_t x;
+  float y;
+} C_AwesomeB;
+
+typedef union C_D {
+  int32_t x;
+  float y;
+} C_D;
+
+typedef struct C_A C_F;
+
+#define C_I (intptr_t)(C_F*)10
+
+extern const int32_t G;
+
+void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,48 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define C_H 10
+
+enum C_E
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  x = 0,
+  y = 1,
+};
+#ifndef __cplusplus
+typedef uint8_t C_E;
+#endif // __cplusplus
+
+typedef struct C_A C_A;
+
+typedef struct C_C C_C;
+
+typedef struct C_AwesomeB {
+  int32_t x;
+  float y;
+} C_AwesomeB;
+
+typedef union C_D {
+  int32_t x;
+  float y;
+} C_D;
+
+typedef struct C_A C_F;
+
+#define C_I (intptr_t)(C_F*)10
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const int32_t G;
+
+void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,41 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  int32_t x;
+} Foo;
+
+typedef struct RenamedTy {
+  uint64_t y;
+} RenamedTy;
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct NoExternTy {
+  uint8_t field;
+} NoExternTy;
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct ContainsNoExternTy {
+  struct NoExternTy field;
+} ContainsNoExternTy;
+#endif
+
+#if defined(DEFINE_FREEBSD)
+typedef struct ContainsNoExternTy {
+  uint64_t field;
+} ContainsNoExternTy;
+#endif
+
+void root(struct Foo a);
+
+void renamed_func(struct RenamedTy a);
+
+void no_extern_func(struct ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  int32_t x;
+} Foo;
+
+typedef struct RenamedTy {
+  uint64_t y;
+} RenamedTy;
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct NoExternTy {
+  uint8_t field;
+} NoExternTy;
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct ContainsNoExternTy {
+  struct NoExternTy field;
+} ContainsNoExternTy;
+#endif
+
+#if defined(DEFINE_FREEBSD)
+typedef struct ContainsNoExternTy {
+  uint64_t field;
+} ContainsNoExternTy;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+void renamed_func(struct RenamedTy a);
+
+void no_extern_func(struct ContainsNoExternTy a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,41 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  int32_t x;
+} Foo;
+
+typedef struct {
+  uint64_t y;
+} RenamedTy;
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct {
+  uint8_t field;
+} NoExternTy;
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct {
+  NoExternTy field;
+} ContainsNoExternTy;
+#endif
+
+#if defined(DEFINE_FREEBSD)
+typedef struct {
+  uint64_t field;
+} ContainsNoExternTy;
+#endif
+
+void root(Foo a);
+
+void renamed_func(RenamedTy a);
+
+void no_extern_func(ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  int32_t x;
-} Foo;
-
-typedef struct {
-  uint64_t y;
-} RenamedTy;
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct {
-  uint8_t field;
-} NoExternTy;
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct {
-  NoExternTy field;
-} ContainsNoExternTy;
-#endif
-
-#if defined(DEFINE_FREEBSD)
-typedef struct {
-  uint64_t field;
-} ContainsNoExternTy;
-#endif
-
-void root(Foo a);
-
-void renamed_func(RenamedTy a);
-
-void no_extern_func(ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  int32_t x;
+} Foo;
+
+typedef struct {
+  uint64_t y;
+} RenamedTy;
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct {
+  uint8_t field;
+} NoExternTy;
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+typedef struct {
+  NoExternTy field;
+} ContainsNoExternTy;
+#endif
+
+#if defined(DEFINE_FREEBSD)
+typedef struct {
+  uint64_t field;
+} ContainsNoExternTy;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Foo a);
+
+void renamed_func(RenamedTy a);
+
+void no_extern_func(ContainsNoExternTy a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  int32_t x;
-} Foo;
-
-typedef struct {
-  uint64_t y;
-} RenamedTy;
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct {
-  uint8_t field;
-} NoExternTy;
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-typedef struct {
-  NoExternTy field;
-} ContainsNoExternTy;
-#endif
-
-#if defined(DEFINE_FREEBSD)
-typedef struct {
-  uint64_t field;
-} ContainsNoExternTy;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Foo a);
-
-void renamed_func(RenamedTy a);
-
-void no_extern_func(ContainsNoExternTy a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,46 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Foo {
+  int32_t x;
+};
+
+struct RenamedTy {
+  uint64_t y;
+};
+
+#if !defined(DEFINE_FREEBSD)
+struct NoExternTy {
+  uint8_t field;
+};
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  NoExternTy field;
+};
+#endif
+
+#if defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  uint64_t field;
+};
+#endif
+
+extern "C" {
+
+void root(Foo a);
+
+void renamed_func(RenamedTy a);
+
+void no_extern_func(ContainsNoExternTy a);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename-crate.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename-crate.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct Foo {
-  int32_t x;
-};
-
-struct RenamedTy {
-  uint64_t y;
-};
-
-#if !defined(DEFINE_FREEBSD)
-struct NoExternTy {
-  uint8_t field;
-};
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  NoExternTy field;
-};
-#endif
-
-#if defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  uint64_t field;
-};
-#endif
-
-extern "C" {
-
-void root(Foo a);
-
-void renamed_func(RenamedTy a);
-
-void no_extern_func(ContainsNoExternTy a);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    int32_t x;
+
+  ctypedef struct RenamedTy:
+    uint64_t y;
+
+  IF not DEFINE_FREEBSD:
+    ctypedef struct NoExternTy:
+      uint8_t field;
+
+  IF not DEFINE_FREEBSD:
+    ctypedef struct ContainsNoExternTy:
+      NoExternTy field;
+
+  IF DEFINE_FREEBSD:
+    ctypedef struct ContainsNoExternTy:
+      uint64_t field;
+
+  void root(Foo a);
+
+  void renamed_func(RenamedTy a);
+
+  void no_extern_func(ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,41 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  int32_t x;
+};
+
+struct RenamedTy {
+  uint64_t y;
+};
+
+#if !defined(DEFINE_FREEBSD)
+struct NoExternTy {
+  uint8_t field;
+};
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  struct NoExternTy field;
+};
+#endif
+
+#if defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  uint64_t field;
+};
+#endif
+
+void root(struct Foo a);
+
+void renamed_func(struct RenamedTy a);
+
+void no_extern_func(struct ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  int32_t x;
+};
+
+struct RenamedTy {
+  uint64_t y;
+};
+
+#if !defined(DEFINE_FREEBSD)
+struct NoExternTy {
+  uint8_t field;
+};
+#endif
+
+#if !defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  struct NoExternTy field;
+};
+#endif
+
+#if defined(DEFINE_FREEBSD)
+struct ContainsNoExternTy {
+  uint64_t field;
+};
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a);
+
+void renamed_func(struct RenamedTy a);
+
+void no_extern_func(struct ContainsNoExternTy a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename_crate.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+#if 0
+DEF DEFINE_FREEBSD = 0
+#endif
+
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    int32_t x;
+
+  cdef struct RenamedTy:
+    uint64_t y;
+
+  IF not DEFINE_FREEBSD:
+    cdef struct NoExternTy:
+      uint8_t field;
+
+  IF not DEFINE_FREEBSD:
+    cdef struct ContainsNoExternTy:
+      NoExternTy field;
+
+  IF DEFINE_FREEBSD:
+    cdef struct ContainsNoExternTy:
+      uint64_t field;
+
+  void root(Foo a);
+
+  void renamed_func(RenamedTy a);
+
+  void no_extern_func(ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t C_H # = 10
+
+  cdef enum:
+    x # = 0,
+    y # = 1,
+  ctypedef uint8_t C_E;
+
+  ctypedef struct C_A:
+    pass
+
+  ctypedef struct C_C:
+    pass
+
+  ctypedef struct C_AwesomeB:
+    int32_t x;
+    float y;
+
+  ctypedef union C_D:
+    int32_t x;
+    float y;
+
+  ctypedef C_A C_F;
+
+  const intptr_t C_I # = <intptr_t><C_F*>10
+
+  extern const int32_t G;
+
+  void root(const C_A *a, C_AwesomeB b, C_C c, C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,34 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define C_H 10
+
+enum C_E {
+  x = 0,
+  y = 1,
+};
+typedef uint8_t C_E;
+
+struct C_A;
+
+struct C_C;
+
+struct C_AwesomeB {
+  int32_t x;
+  float y;
+};
+
+union C_D {
+  int32_t x;
+  float y;
+};
+
+typedef struct C_A C_F;
+
+#define C_I (intptr_t)(C_F*)10
+
+extern const int32_t G;
+
+void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,48 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define C_H 10
+
+enum C_E
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  x = 0,
+  y = 1,
+};
+#ifndef __cplusplus
+typedef uint8_t C_E;
+#endif // __cplusplus
+
+struct C_A;
+
+struct C_C;
+
+struct C_AwesomeB {
+  int32_t x;
+  float y;
+};
+
+union C_D {
+  int32_t x;
+  float y;
+};
+
+typedef struct C_A C_F;
+
+#define C_I (intptr_t)(C_F*)10
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const int32_t G;
+
+void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/rename.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/rename.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,36 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t C_H # = 10
+
+  cdef enum:
+    x # = 0,
+    y # = 1,
+  ctypedef uint8_t C_E;
+
+  cdef struct C_A:
+    pass
+
+  cdef struct C_C:
+    pass
+
+  cdef struct C_AwesomeB:
+    int32_t x;
+    float y;
+
+  cdef union C_D:
+    int32_t x;
+    float y;
+
+  ctypedef C_A C_F;
+
+  const intptr_t C_I # = <intptr_t><C_F*>10
+
+  extern const int32_t G;
+
+  void root(const C_A *a, C_AwesomeB b, C_C c, C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StyleA StyleA;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+void root(const struct StyleA *a, struct B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StyleA StyleA;
+
+typedef struct B {
+  int32_t x;
+  float y;
+} B;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct StyleA *a, struct B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StyleA StyleA;
+
+typedef struct {
+  int32_t x;
+  float y;
+} B;
+
+void root(const StyleA *a, B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StyleA StyleA;
-
-typedef struct {
-  int32_t x;
-  float y;
-} B;
-
-void root(const StyleA *a, B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StyleA StyleA;
+
+typedef struct {
+  int32_t x;
+  float y;
+} B;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const StyleA *a, B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct StyleA StyleA;
-
-typedef struct {
-  int32_t x;
-  float y;
-} B;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const StyleA *a, B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct StyleA;
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+extern "C" {
+
+void root(const StyleA *a, B b);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming-overrides-prefixing.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct StyleA;
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-extern "C" {
-
-void root(const StyleA *a, B b);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct StyleA:
+    pass
+
+  ctypedef struct B:
+    int32_t x;
+    float y;
+
+  void root(const StyleA *a, B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StyleA;
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+void root(const struct StyleA *a, struct B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StyleA;
+
+struct B {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct StyleA *a, struct B b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/renaming_overrides_prefixing.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct StyleA:
+    pass
+
+  cdef struct B:
+    int32_t x;
+    float y;
+
+  void root(const StyleA *a, B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,75 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A {
+  int32_t namespace_;
+  float float_;
+} A;
+
+typedef struct B {
+  int32_t namespace_;
+  float float_;
+} B;
+
+enum C_Tag {
+  D,
+};
+typedef uint8_t C_Tag;
+
+typedef struct D_Body {
+  int32_t namespace_;
+  float float_;
+} D_Body;
+
+typedef struct C {
+  C_Tag tag;
+  union {
+    D_Body d;
+  };
+} C;
+
+enum E_Tag {
+  Double,
+  Float,
+};
+typedef uint8_t E_Tag;
+
+typedef struct E {
+  E_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+} E;
+
+enum F_Tag {
+  double_,
+  float_,
+};
+typedef uint8_t F_Tag;
+
+typedef struct F {
+  F_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+} F;
+
+void root(struct A a,
+          struct B b,
+          struct C c,
+          struct E e,
+          struct F f,
+          int32_t namespace_,
+          float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,101 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct A {
+  int32_t namespace_;
+  float float_;
+} A;
+
+typedef struct B {
+  int32_t namespace_;
+  float float_;
+} B;
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  D,
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+typedef struct D_Body {
+  int32_t namespace_;
+  float float_;
+} D_Body;
+
+typedef struct C {
+  C_Tag tag;
+  union {
+    D_Body d;
+  };
+} C;
+
+enum E_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Double,
+  Float,
+};
+#ifndef __cplusplus
+typedef uint8_t E_Tag;
+#endif // __cplusplus
+
+typedef struct E {
+  E_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+} E;
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  double_,
+  float_,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+typedef struct F {
+  F_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+} F;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A a,
+          struct B b,
+          struct C c,
+          struct E e,
+          struct F f,
+          int32_t namespace_,
+          float float_);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.c	2021-01-18 19:59:04.000000000 +0000
@@ -37,18 +37,14 @@
 typedef uint8_t E_Tag;
 
 typedef struct {
-  double _0;
-} Double_Body;
-
-typedef struct {
-  float _0;
-} Float_Body;
-
-typedef struct {
   E_Tag tag;
   union {
-    Double_Body double_;
-    Float_Body float_;
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
   };
 } E;
 
@@ -59,18 +55,14 @@
 typedef uint8_t F_Tag;
 
 typedef struct {
-  double _0;
-} double_Body;
-
-typedef struct {
-  float _0;
-} float_Body;
-
-typedef struct {
   F_Tag tag;
   union {
-    double_Body double_;
-    float_Body float_;
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
   };
 } F;
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -49,18 +49,14 @@
 #endif // __cplusplus
 
 typedef struct {
-  double _0;
-} Double_Body;
-
-typedef struct {
-  float _0;
-} Float_Body;
-
-typedef struct {
   E_Tag tag;
   union {
-    Double_Body double_;
-    Float_Body float_;
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
   };
 } E;
 
@@ -77,18 +73,14 @@
 #endif // __cplusplus
 
 typedef struct {
-  double _0;
-} double_Body;
-
-typedef struct {
-  float _0;
-} float_Body;
-
-typedef struct {
   F_Tag tag;
   union {
-    double_Body double_;
-    float_Body float_;
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
   };
 } F;
 
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct A:
+    int32_t namespace_;
+    float float_;
+
+  ctypedef struct B:
+    int32_t namespace_;
+    float float_;
+
+  cdef enum:
+    D,
+  ctypedef uint8_t C_Tag;
+
+  ctypedef struct D_Body:
+    int32_t namespace_;
+    float float_;
+
+  ctypedef struct C:
+    C_Tag tag;
+    D_Body d;
+
+  cdef enum:
+    Double,
+    Float,
+  ctypedef uint8_t E_Tag;
+
+  ctypedef struct E:
+    E_Tag tag;
+    double double_;
+    float float_;
+
+  cdef enum:
+    double_,
+    float_,
+  ctypedef uint8_t F_Tag;
+
+  ctypedef struct F:
+    F_Tag tag;
+    double double_;
+    float float_;
+
+  void root(A a, B b, C c, E e, F f, int32_t namespace_, float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,75 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A {
+  int32_t namespace_;
+  float float_;
+};
+
+struct B {
+  int32_t namespace_;
+  float float_;
+};
+
+enum C_Tag {
+  D,
+};
+typedef uint8_t C_Tag;
+
+struct D_Body {
+  int32_t namespace_;
+  float float_;
+};
+
+struct C {
+  C_Tag tag;
+  union {
+    struct D_Body d;
+  };
+};
+
+enum E_Tag {
+  Double,
+  Float,
+};
+typedef uint8_t E_Tag;
+
+struct E {
+  E_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+};
+
+enum F_Tag {
+  double_,
+  float_,
+};
+typedef uint8_t F_Tag;
+
+struct F {
+  F_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+};
+
+void root(struct A a,
+          struct B b,
+          struct C c,
+          struct E e,
+          struct F f,
+          int32_t namespace_,
+          float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,101 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct A {
+  int32_t namespace_;
+  float float_;
+};
+
+struct B {
+  int32_t namespace_;
+  float float_;
+};
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  D,
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+struct D_Body {
+  int32_t namespace_;
+  float float_;
+};
+
+struct C {
+  C_Tag tag;
+  union {
+    struct D_Body d;
+  };
+};
+
+enum E_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Double,
+  Float,
+};
+#ifndef __cplusplus
+typedef uint8_t E_Tag;
+#endif // __cplusplus
+
+struct E {
+  E_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+};
+
+enum F_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  double_,
+  float_,
+};
+#ifndef __cplusplus
+typedef uint8_t F_Tag;
+#endif // __cplusplus
+
+struct F {
+  F_Tag tag;
+  union {
+    struct {
+      double double_;
+    };
+    struct {
+      float float_;
+    };
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct A a,
+          struct B b,
+          struct C c,
+          struct E e,
+          struct F f,
+          int32_t namespace_,
+          float float_);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/reserved.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/reserved.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,49 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct A:
+    int32_t namespace_;
+    float float_;
+
+  cdef struct B:
+    int32_t namespace_;
+    float float_;
+
+  cdef enum:
+    D,
+  ctypedef uint8_t C_Tag;
+
+  cdef struct D_Body:
+    int32_t namespace_;
+    float float_;
+
+  cdef struct C:
+    C_Tag tag;
+    D_Body d;
+
+  cdef enum:
+    Double,
+    Float,
+  ctypedef uint8_t E_Tag;
+
+  cdef struct E:
+    E_Tag tag;
+    double double_;
+    float float_;
+
+  cdef enum:
+    double_,
+    float_,
+  ctypedef uint8_t F_Tag;
+
+  cdef struct F:
+    F_Tag tag;
+    double double_;
+    float float_;
+
+  void root(A a, B b, C c, E e, F f, int32_t namespace_, float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,55 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A {
+  A_A1,
+  A_A2,
+  A_A3,
+  /**
+   * Must be last for serialization purposes
+   */
+  A_Sentinel,
+};
+typedef uint8_t A;
+
+enum B {
+  B_B1,
+  B_B2,
+  B_B3,
+  /**
+   * Must be last for serialization purposes
+   */
+  B_Sentinel,
+};
+typedef uint8_t B;
+
+enum C_Tag {
+  C_C1,
+  C_C2,
+  C_C3,
+  /**
+   * Must be last for serialization purposes
+   */
+  C_Sentinel,
+};
+typedef uint8_t C_Tag;
+
+typedef struct C_C1_Body {
+  C_Tag tag;
+  uint32_t a;
+} C_C1_Body;
+
+typedef struct C_C2_Body {
+  C_Tag tag;
+  uint32_t b;
+} C_C2_Body;
+
+typedef union C {
+  C_Tag tag;
+  C_C1_Body c1;
+  C_C2_Body c2;
+} C;
+
+void root(A a, B b, union C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,81 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  A_A1,
+  A_A2,
+  A_A3,
+  /**
+   * Must be last for serialization purposes
+   */
+  A_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t A;
+#endif // __cplusplus
+
+enum B
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  B_B1,
+  B_B2,
+  B_B3,
+  /**
+   * Must be last for serialization purposes
+   */
+  B_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t B;
+#endif // __cplusplus
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  C_C1,
+  C_C2,
+  C_C3,
+  /**
+   * Must be last for serialization purposes
+   */
+  C_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+typedef struct C_C1_Body {
+  C_Tag tag;
+  uint32_t a;
+} C_C1_Body;
+
+typedef struct C_C2_Body {
+  C_Tag tag;
+  uint32_t b;
+} C_C2_Body;
+
+typedef union C {
+  C_Tag tag;
+  C_C1_Body c1;
+  C_C2_Body c2;
+} C;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(A a, B b, union C c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,46 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    A_A1,
+    A_A2,
+    A_A3,
+    # Must be last for serialization purposes
+    A_Sentinel,
+  ctypedef uint8_t A;
+
+  cdef enum:
+    B_B1,
+    B_B2,
+    B_B3,
+    # Must be last for serialization purposes
+    B_Sentinel,
+  ctypedef uint8_t B;
+
+  cdef enum:
+    C_C1,
+    C_C2,
+    C_C3,
+    # Must be last for serialization purposes
+    C_Sentinel,
+  ctypedef uint8_t C_Tag;
+
+  ctypedef struct C_C1_Body:
+    C_Tag tag;
+    uint32_t a;
+
+  ctypedef struct C_C2_Body:
+    C_Tag tag;
+    uint32_t b;
+
+  ctypedef union C:
+    C_Tag tag;
+    C_C1_Body c1;
+    C_C2_Body c2;
+
+  void root(A a, B b, C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,55 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A {
+  A_A1,
+  A_A2,
+  A_A3,
+  /**
+   * Must be last for serialization purposes
+   */
+  A_Sentinel,
+};
+typedef uint8_t A;
+
+enum B {
+  B_B1,
+  B_B2,
+  B_B3,
+  /**
+   * Must be last for serialization purposes
+   */
+  B_Sentinel,
+};
+typedef uint8_t B;
+
+enum C_Tag {
+  C_C1,
+  C_C2,
+  C_C3,
+  /**
+   * Must be last for serialization purposes
+   */
+  C_Sentinel,
+};
+typedef uint8_t C_Tag;
+
+struct C_C1_Body {
+  C_Tag tag;
+  uint32_t a;
+};
+
+struct C_C2_Body {
+  C_Tag tag;
+  uint32_t b;
+};
+
+union C {
+  C_Tag tag;
+  struct C_C1_Body c1;
+  struct C_C2_Body c2;
+};
+
+void root(A a, B b, union C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,81 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum A
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  A_A1,
+  A_A2,
+  A_A3,
+  /**
+   * Must be last for serialization purposes
+   */
+  A_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t A;
+#endif // __cplusplus
+
+enum B
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  B_B1,
+  B_B2,
+  B_B3,
+  /**
+   * Must be last for serialization purposes
+   */
+  B_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t B;
+#endif // __cplusplus
+
+enum C_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  C_C1,
+  C_C2,
+  C_C3,
+  /**
+   * Must be last for serialization purposes
+   */
+  C_Sentinel,
+};
+#ifndef __cplusplus
+typedef uint8_t C_Tag;
+#endif // __cplusplus
+
+struct C_C1_Body {
+  C_Tag tag;
+  uint32_t a;
+};
+
+struct C_C2_Body {
+  C_Tag tag;
+  uint32_t b;
+};
+
+union C {
+  C_Tag tag;
+  struct C_C1_Body c1;
+  struct C_C2_Body c2;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(A a, B b, union C c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/sentinel.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/sentinel.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,46 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    A_A1,
+    A_A2,
+    A_A3,
+    # Must be last for serialization purposes
+    A_Sentinel,
+  ctypedef uint8_t A;
+
+  cdef enum:
+    B_B1,
+    B_B2,
+    B_B3,
+    # Must be last for serialization purposes
+    B_Sentinel,
+  ctypedef uint8_t B;
+
+  cdef enum:
+    C_C1,
+    C_C2,
+    C_C3,
+    # Must be last for serialization purposes
+    C_Sentinel,
+  ctypedef uint8_t C_Tag;
+
+  cdef struct C_C1_Body:
+    C_Tag tag;
+    uint32_t a;
+
+  cdef struct C_C2_Body:
+    C_Tag tag;
+    uint32_t b;
+
+  cdef union C:
+    C_Tag tag;
+    C_C1_Body c1;
+    C_C2_Body c2;
+
+  void root(A a, B b, C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Foo {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+} Foo;
+
+typedef union Bar {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+} Bar;
+
+void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Foo {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+} Foo;
+
+typedef union Bar {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)(void);
+} Foo;
+
+typedef union {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)(void);
+} Bar;
+
+void root(const Opaque *a, Opaque *b, Foo c, Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Foo;
-
-typedef union {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Bar;
-
-void root(const Opaque *a, Opaque *b, Foo c, Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)(void);
+} Foo;
+
+typedef union {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)(void);
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const Opaque *a, Opaque *b, Foo c, Bar d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct Opaque Opaque;
-
-typedef struct {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Foo;
-
-typedef union {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)(void);
-} Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Opaque *a, Opaque *b, Foo c, Bar d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Opaque;
+
+struct Foo {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)();
+};
+
+union Bar {
+  const Opaque *x;
+  Opaque *y;
+  void (*z)();
+};
+
+extern "C" {
+
+void root(const Opaque *a, Opaque *b, Foo c, Bar d);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify-option-ptr.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-
-struct Opaque;
-
-struct Foo {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)();
-};
-
-union Bar {
-  const Opaque *x;
-  Opaque *y;
-  void (*z)();
-};
-
-extern "C" {
-
-void root(const Opaque *a, Opaque *b, Foo c, Bar d);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef struct Foo:
+    const Opaque *x;
+    Opaque *y;
+    void (*z)();
+
+  ctypedef union Bar:
+    const Opaque *x;
+    Opaque *y;
+    void (*z)();
+
+  void root(const Opaque *a, Opaque *b, Foo c, Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Foo {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+};
+
+union Bar {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+};
+
+void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Foo {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+};
+
+union Bar {
+  const struct Opaque *x;
+  struct Opaque *y;
+  void (*z)(void);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/simplify_option_ptr.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef struct Foo:
+    const Opaque *x;
+    Opaque *y;
+    void (*z)();
+
+  cdef union Bar:
+    const Opaque *x;
+    Opaque *y;
+    void (*z)();
+
+  void root(const Opaque *a, Opaque *b, Foo c, Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum IE {
+  IV,
+};
+typedef ptrdiff_t IE;
+
+enum UE {
+  UV,
+};
+typedef size_t UE;
+
+typedef size_t Usize;
+
+typedef ptrdiff_t Isize;
+
+void root(Usize, Isize, UE, IE);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,41 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum IE
+#ifdef __cplusplus
+  : ptrdiff_t
+#endif // __cplusplus
+ {
+  IV,
+};
+#ifndef __cplusplus
+typedef ptrdiff_t IE;
+#endif // __cplusplus
+
+enum UE
+#ifdef __cplusplus
+  : size_t
+#endif // __cplusplus
+ {
+  UV,
+};
+#ifndef __cplusplus
+typedef size_t UE;
+#endif // __cplusplus
+
+typedef size_t Usize;
+
+typedef ptrdiff_t Isize;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Usize, Isize, UE, IE);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+enum class IE : ptrdiff_t {
+  IV,
+};
+
+enum class UE : size_t {
+  UV,
+};
+
+using Usize = size_t;
+
+using Isize = ptrdiff_t;
+
+extern "C" {
+
+void root(Usize, Isize, UE, IE);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/size_types.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/size_types.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    IV,
+  ctypedef ptrdiff_t IE;
+
+  cdef enum:
+    UV,
+  ctypedef size_t UE;
+
+  ctypedef size_t Usize;
+
+  ctypedef ptrdiff_t Isize;
+
+  void root(Usize, Isize, UE, IE);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar Bar;
+
+typedef struct Foo {
+
+} Foo;
+
+extern const int32_t NUMBER;
+
+extern struct Foo FOO;
+
+extern const struct Bar BAR;
+
+void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar Bar;
+
+typedef struct Foo {
+
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const int32_t NUMBER;
+
+extern struct Foo FOO;
+
+extern const struct Bar BAR;
+
+void root(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Bar:
+    pass
+
+  ctypedef struct Foo:
+    pass
+
+  extern const int32_t NUMBER;
+
+  extern Foo FOO;
+
+  extern const Bar BAR;
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar;
+
+struct Foo {
+
+};
+
+extern const int32_t NUMBER;
+
+extern struct Foo FOO;
+
+extern const struct Bar BAR;
+
+void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar;
+
+struct Foo {
+
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const int32_t NUMBER;
+
+extern struct Foo FOO;
+
+extern const struct Bar BAR;
+
+void root(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/static.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/static.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Bar:
+    pass
+
+  cdef struct Foo:
+    pass
+
+  extern const int32_t NUMBER;
+
+  extern Foo FOO;
+
+  extern const Bar BAR;
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Option_i32 Option_i32;
+
+typedef struct Result_i32__String Result_i32__String;
+
+typedef struct Vec_String Vec_String;
+
+void root(const struct Vec_String *a,
+          const struct Option_i32 *b,
+          const struct Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Option_i32 Option_i32;
+
+typedef struct Result_i32__String Result_i32__String;
+
+typedef struct Vec_String Vec_String;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Vec_String *a,
+          const struct Option_i32 *b,
+          const struct Result_i32__String *c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Option_i32:
+    pass
+
+  ctypedef struct Result_i32__String:
+    pass
+
+  ctypedef struct Vec_String:
+    pass
+
+  void root(const Vec_String *a, const Option_i32 *b, const Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Option_i32;
+
+struct Result_i32__String;
+
+struct Vec_String;
+
+void root(const struct Vec_String *a,
+          const struct Option_i32 *b,
+          const struct Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,22 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Option_i32;
+
+struct Result_i32__String;
+
+struct Vec_String;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(const struct Vec_String *a,
+          const struct Option_i32 *b,
+          const struct Result_i32__String *c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/std_lib.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/std_lib.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Option_i32:
+    pass
+
+  cdef struct Result_i32__String:
+    pass
+
+  cdef struct Vec_String:
+    pass
+
+  void root(const Vec_String *a, const Option_i32 *b, const Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+typedef struct NormalWithZST {
+  int32_t x;
+  float y;
+} NormalWithZST;
+
+typedef struct TupleRenamed {
+  int32_t m0;
+  float m1;
+} TupleRenamed;
+
+typedef struct TupleNamed {
+  int32_t x;
+  float y;
+} TupleNamed;
+
+void root(struct Opaque *a,
+          struct Normal b,
+          struct NormalWithZST c,
+          struct TupleRenamed d,
+          struct TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+typedef struct NormalWithZST {
+  int32_t x;
+  float y;
+} NormalWithZST;
+
+typedef struct TupleRenamed {
+  int32_t m0;
+  float m1;
+} TupleRenamed;
+
+typedef struct TupleNamed {
+  int32_t x;
+  float y;
+} TupleNamed;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *a,
+          struct Normal b,
+          struct NormalWithZST c,
+          struct TupleRenamed d,
+          struct TupleNamed e);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar Bar;
+
+typedef struct Foo {
+  int32_t a;
+  uint32_t b;
+} Foo;
+#define Foo_FOO (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
+
+
+#define BAR (Foo){ .a = 42, .b = 1337 }
+
+
+
+void root(struct Foo x, struct Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Bar Bar;
+
+typedef struct Foo {
+  int32_t a;
+  uint32_t b;
+} Foo;
+#define Foo_FOO (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
+
+
+#define BAR (Foo){ .a = 42, .b = 1337 }
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x, struct Bar bar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct ABC {
+  float a;
+  uint32_t b;
+  uint32_t c;
+} ABC;
+#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
+
+typedef struct BAC {
+  uint32_t b;
+  float a;
+  int32_t c;
+} BAC;
+#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
+
+void root(struct ABC a1, struct BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct ABC {
+  float a;
+  uint32_t b;
+  uint32_t c;
+} ABC;
+#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
+
+typedef struct BAC {
+  uint32_t b;
+  float a;
+  int32_t c;
+} BAC;
+#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct ABC a1, struct BAC a2);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct ABC:
+    float a;
+    uint32_t b;
+    uint32_t c;
+  const ABC ABC_abc # = <ABC>{ 1.0, 2, 3 }
+  const ABC ABC_bac # = <ABC>{ 1.0, 2, 3 }
+  const ABC ABC_cba # = <ABC>{ 1.0, 2, 3 }
+
+  ctypedef struct BAC:
+    uint32_t b;
+    float a;
+    int32_t c;
+  const BAC BAC_abc # = <BAC>{ 1, 2.0, 3 }
+  const BAC BAC_bac # = <BAC>{ 1, 2.0, 3 }
+  const BAC BAC_cba # = <BAC>{ 1, 2.0, 3 }
+
+  void root(ABC a1, BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct ABC {
+  float a;
+  uint32_t b;
+  uint32_t c;
+};
+#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
+
+struct BAC {
+  uint32_t b;
+  float a;
+  int32_t c;
+};
+#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
+
+void root(struct ABC a1, struct BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct ABC {
+  float a;
+  uint32_t b;
+  uint32_t c;
+};
+#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
+#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
+
+struct BAC {
+  uint32_t b;
+  float a;
+  int32_t c;
+};
+#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
+#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct ABC a1, struct BAC a2);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal_order.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,25 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct ABC:
+    float a;
+    uint32_t b;
+    uint32_t c;
+  const ABC ABC_abc # = <ABC>{ 1.0, 2, 3 }
+  const ABC ABC_bac # = <ABC>{ 1.0, 2, 3 }
+  const ABC ABC_cba # = <ABC>{ 1.0, 2, 3 }
+
+  cdef struct BAC:
+    uint32_t b;
+    float a;
+    int32_t c;
+  const BAC BAC_abc # = <BAC>{ 1, 2.0, 3 }
+  const BAC BAC_bac # = <BAC>{ 1, 2.0, 3 }
+  const BAC BAC_cba # = <BAC>{ 1, 2.0, 3 }
+
+  void root(ABC a1, BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Bar:
+    pass
+
+  ctypedef struct Foo:
+    int32_t a;
+    uint32_t b;
+  const Foo Foo_FOO # = <Foo>{ 42, 47 }
+  const Foo Foo_FOO2 # = <Foo>{ 42, 47 }
+  const Foo Foo_FOO3 # = <Foo>{ 42, 47 }
+
+
+  const Foo BAR # = <Foo>{ 42, 1337 }
+
+
+
+  void root(Foo x, Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar;
+
+struct Foo {
+  int32_t a;
+  uint32_t b;
+};
+#define Foo_FOO (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
+
+
+#define BAR (Foo){ .a = 42, .b = 1337 }
+
+
+
+void root(struct Foo x, struct Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Bar;
+
+struct Foo {
+  int32_t a;
+  uint32_t b;
+};
+#define Foo_FOO (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
+#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
+
+
+#define BAR (Foo){ .a = 42, .b = 1337 }
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo x, struct Bar bar);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_literal.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Bar:
+    pass
+
+  cdef struct Foo:
+    int32_t a;
+    uint32_t b;
+  const Foo Foo_FOO # = <Foo>{ 42, 47 }
+  const Foo Foo_FOO2 # = <Foo>{ 42, 47 }
+  const Foo Foo_FOO3 # = <Foo>{ 42, 47 }
+
+
+  const Foo BAR # = <Foo>{ 42, 1337 }
+
+
+
+  void root(Foo x, Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef struct Normal:
+    int32_t x;
+    float y;
+
+  ctypedef struct NormalWithZST:
+    int32_t x;
+    float y;
+
+  ctypedef struct TupleRenamed:
+    int32_t m0;
+    float m1;
+
+  ctypedef struct TupleNamed:
+    int32_t x;
+    float y;
+
+  void root(Opaque *a, Normal b, NormalWithZST c, TupleRenamed d, TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+typedef struct Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+} Bar;
+
+void root(struct Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+typedef struct Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo_Bar:
+    const int32_t *something;
+
+  ctypedef struct Bar:
+    int32_t something;
+    Foo_Bar subexpressions;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+struct Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+};
+
+void root(struct Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+struct Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct_self.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct_self.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo_Bar:
+    const int32_t *something;
+
+  cdef struct Bar:
+    int32_t something;
+    Foo_Bar subexpressions;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Normal {
+  int32_t x;
+  float y;
+};
+
+struct NormalWithZST {
+  int32_t x;
+  float y;
+};
+
+struct TupleRenamed {
+  int32_t m0;
+  float m1;
+};
+
+struct TupleNamed {
+  int32_t x;
+  float y;
+};
+
+void root(struct Opaque *a,
+          struct Normal b,
+          struct NormalWithZST c,
+          struct TupleRenamed d,
+          struct TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct Normal {
+  int32_t x;
+  float y;
+};
+
+struct NormalWithZST {
+  int32_t x;
+  float y;
+};
+
+struct TupleRenamed {
+  int32_t m0;
+  float m1;
+};
+
+struct TupleNamed {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *a,
+          struct Normal b,
+          struct NormalWithZST c,
+          struct TupleRenamed d,
+          struct TupleNamed e);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/struct.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/struct.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef struct Normal:
+    int32_t x;
+    float y;
+
+  cdef struct NormalWithZST:
+    int32_t x;
+    float y;
+
+  cdef struct TupleRenamed:
+    int32_t m0;
+    float m1;
+
+  cdef struct TupleNamed:
+    int32_t x;
+    float y;
+
+  void root(Opaque *a, Normal b, NormalWithZST c, TupleRenamed d, TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,4 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,5 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style-crash.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style-crash.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/style_crash.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/style_crash.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,8 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+  pass
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,54 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct SelfTypeTestStruct {
+  uint8_t times;
+} SelfTypeTestStruct;
+
+typedef struct PointerToOpaque {
+  struct Opaque *ptr;
+} PointerToOpaque;
+
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(struct SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(struct PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,62 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef struct SelfTypeTestStruct {
+  uint8_t times;
+} SelfTypeTestStruct;
+
+typedef struct PointerToOpaque {
+  struct Opaque *ptr;
+} PointerToOpaque;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(struct SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(struct PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.c	2021-01-18 19:59:04.000000000 +0000
@@ -51,5 +51,4 @@
 
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
+void PointerToOpaque_sayHello(PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -55,8 +55,7 @@
 
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
+void PointerToOpaque_sayHello(PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
 
 #ifdef __cplusplus
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -57,7 +57,6 @@
 
 PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
 
-void PointerToOpaque_sayHello(PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
+void PointerToOpaque_sayHello(PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
 
 } // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,56 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef struct SelfTypeTestStruct:
+    uint8_t times;
+
+  ctypedef struct PointerToOpaque:
+    Opaque *ptr;
+
+  void rust_print_hello_world();
+
+  void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self);
+
+  void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self);
+
+  void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self);
+
+  SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box();
+
+  void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self);
+
+  void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct);
+
+  void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct);
+
+  void unnamed_argument(SelfTypeTestStruct*);
+
+  void free_function_should_not_exist_box(SelfTypeTestStruct *boxed);
+
+  void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct);
+
+  void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct);
+
+  PointerToOpaque PointerToOpaque_create(uint8_t times);
+
+  void PointerToOpaque_sayHello(PointerToOpaque self);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,54 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct SelfTypeTestStruct {
+  uint8_t times;
+};
+
+struct PointerToOpaque {
+  struct Opaque *ptr;
+};
+
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(struct SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(struct PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,62 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+struct SelfTypeTestStruct {
+  uint8_t times;
+};
+
+struct PointerToOpaque {
+  struct Opaque *ptr;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
+
+void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
+
+void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
+
+void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
+
+struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
+
+void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
+
+void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
+
+void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
+
+void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
+
+void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
+
+void unnamed_argument(struct SelfTypeTestStruct*);
+
+void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
+
+void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
+
+void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
+
+struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
+
+void PointerToOpaque_sayHello(struct PointerToOpaque self) CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/swift_name.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/swift_name.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,56 @@
+#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef struct SelfTypeTestStruct:
+    uint8_t times;
+
+  cdef struct PointerToOpaque:
+    Opaque *ptr;
+
+  void rust_print_hello_world();
+
+  void SelfTypeTestStruct_should_exist_ref(const SelfTypeTestStruct *self);
+
+  void SelfTypeTestStruct_should_exist_ref_mut(SelfTypeTestStruct *self);
+
+  void SelfTypeTestStruct_should_not_exist_box(SelfTypeTestStruct *self);
+
+  SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box();
+
+  void SelfTypeTestStruct_should_exist_annotated_self(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_mut_self(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_by_name(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_annotated_mut_by_name(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_unannotated(SelfTypeTestStruct self);
+
+  void SelfTypeTestStruct_should_exist_mut_unannotated(SelfTypeTestStruct self);
+
+  void free_function_should_exist_ref(const SelfTypeTestStruct *test_struct);
+
+  void free_function_should_exist_ref_mut(SelfTypeTestStruct *test_struct);
+
+  void unnamed_argument(SelfTypeTestStruct*);
+
+  void free_function_should_not_exist_box(SelfTypeTestStruct *boxed);
+
+  void free_function_should_exist_annotated_by_name(SelfTypeTestStruct test_struct);
+
+  void free_function_should_exist_annotated_mut_by_name(SelfTypeTestStruct test_struct);
+
+  PointerToOpaque PointerToOpaque_create(uint8_t times);
+
+  void PointerToOpaque_sayHello(PointerToOpaque self);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/alias.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/alias.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/alias.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/alias.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Status {
-  Ok,
-  Err,
-};
-typedef uint32_t Status;
-
-struct Dep {
-  int32_t a;
-  float b;
-};
-
-struct Foo_i32 {
-  int32_t a;
-  int32_t b;
-  struct Dep c;
-};
-
-typedef struct Foo_i32 IntFoo;
-
-struct Foo_f64 {
-  double a;
-  double b;
-  struct Dep c;
-};
-
-typedef struct Foo_f64 DoubleFoo;
-
-typedef int32_t Unit;
-
-typedef Status SpecialStatus;
-
-void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/alias.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/alias.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/alias.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/alias.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Status
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  Ok,
-  Err,
-};
-#ifndef __cplusplus
-typedef uint32_t Status;
-#endif // __cplusplus
-
-struct Dep {
-  int32_t a;
-  float b;
-};
-
-struct Foo_i32 {
-  int32_t a;
-  int32_t b;
-  struct Dep c;
-};
-
-typedef struct Foo_i32 IntFoo;
-
-struct Foo_f64 {
-  double a;
-  double b;
-  struct Dep c;
-};
-
-typedef struct Foo_f64 DoubleFoo;
-
-typedef int32_t Unit;
-
-typedef Status SpecialStatus;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(IntFoo x, DoubleFoo y, Unit z, SpecialStatus w);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/annotation.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/annotation.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/annotation.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/annotation.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C {
-  X = 2,
-  Y,
-};
-typedef uint32_t C;
-
-struct A {
-  int32_t m0;
-};
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-enum F_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t F_Tag;
-
-struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union F {
-  F_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag {
-  Hello,
-  There,
-  Everyone,
-};
-typedef uint8_t H_Tag;
-
-struct Hello_Body {
-  int16_t _0;
-};
-
-struct There_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct Hello_Body hello;
-    struct There_Body there;
-  };
-};
-
-void root(struct A x, struct B y, C z, union F f, struct H h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/annotation.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/annotation.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/annotation.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/annotation.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  X = 2,
-  Y,
-};
-#ifndef __cplusplus
-typedef uint32_t C;
-#endif // __cplusplus
-
-struct A {
-  int32_t m0;
-};
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union F {
-  F_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Hello,
-  There,
-  Everyone,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-struct Hello_Body {
-  int16_t _0;
-};
-
-struct There_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct Hello_Body hello;
-    struct There_Body there;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct A x, struct B y, C z, union F f, struct H h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/array.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/array.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/array.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/array.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Foo_Tag {
-  A,
-};
-
-struct A_Body {
-  float _0[20];
-};
-
-struct Foo {
-  enum Foo_Tag tag;
-  union {
-    struct A_Body a;
-  };
-};
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/array.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/array.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/array.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/array.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum Foo_Tag {
-  A,
-};
-
-struct A_Body {
-  float _0[20];
-};
-
-struct Foo {
-  enum Foo_Tag tag;
-  union {
-    struct A_Body a;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct I;
-
-enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-typedef uint8_t H_Tag;
-
-struct H_Foo_Body {
-  int16_t _0;
-};
-
-struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct H_Foo_Body foo;
-    struct H_Bar_Body bar;
-  };
-};
-
-enum J_Tag {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-typedef uint8_t J_Tag;
-
-struct J_Foo_Body {
-  int16_t _0;
-};
-
-struct J_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct J {
-  J_Tag tag;
-  union {
-    struct J_Foo_Body foo;
-    struct J_Bar_Body bar;
-  };
-};
-
-enum K_Tag {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-typedef uint8_t K_Tag;
-
-struct K_Foo_Body {
-  K_Tag tag;
-  int16_t _0;
-};
-
-struct K_Bar_Body {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union K {
-  K_Tag tag;
-  struct K_Foo_Body foo;
-  struct K_Bar_Body bar;
-};
-
-void foo(struct H h, struct I i, struct J j, union K k);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/asserted-cast.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct I;
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-struct H_Foo_Body {
-  int16_t _0;
-};
-
-struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct H_Foo_Body foo;
-    struct H_Bar_Body bar;
-  };
-};
-
-enum J_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  J_Foo,
-  J_Bar,
-  J_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t J_Tag;
-#endif // __cplusplus
-
-struct J_Foo_Body {
-  int16_t _0;
-};
-
-struct J_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct J {
-  J_Tag tag;
-  union {
-    struct J_Foo_Body foo;
-    struct J_Bar_Body bar;
-  };
-};
-
-enum K_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  K_Foo,
-  K_Bar,
-  K_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t K_Tag;
-#endif // __cplusplus
-
-struct K_Foo_Body {
-  K_Tag tag;
-  int16_t _0;
-};
-
-struct K_Bar_Body {
-  K_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union K {
-  K_Tag tag;
-  struct K_Foo_Body foo;
-  struct K_Bar_Body bar;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(struct H h, struct I i, struct J j, union K k);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-#define Foo_GA 10
-#define Foo_ZO 3.14
-
-void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-#define Foo_GA 10
-#define Foo_ZO 3.14
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/assoc_const_conflict.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_constant_panic.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-struct StyleAlignFlags {
-  uint8_t bits;
-};
-/**
- * 'auto'
- */
-#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-void root(struct StyleAlignFlags flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/associated_in_body.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-struct StyleAlignFlags {
-  uint8_t bits;
-};
-/**
- * 'auto'
- */
-#define StyleAlignFlags_AUTO (StyleAlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define StyleAlignFlags_NORMAL (StyleAlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define StyleAlignFlags_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define StyleAlignFlags_END (StyleAlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define StyleAlignFlags_FLEX_START (StyleAlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct StyleAlignFlags flags);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/bitflags.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/bitflags.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/bitflags.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/bitflags.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-struct AlignFlags {
-  uint8_t bits;
-};
-/**
- * 'auto'
- */
-#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-struct DebugFlags {
-  uint32_t bits;
-};
-/**
- * Flag with the topmost bit set of the u32
- */
-#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
-
-void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/bitflags.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/bitflags.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/bitflags.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/bitflags.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Constants shared by multiple CSS Box Alignment properties
- *
- * These constants match Gecko's `NS_STYLE_ALIGN_*` constants.
- */
-struct AlignFlags {
-  uint8_t bits;
-};
-/**
- * 'auto'
- */
-#define AlignFlags_AUTO (AlignFlags){ .bits = (uint8_t)0 }
-/**
- * 'normal'
- */
-#define AlignFlags_NORMAL (AlignFlags){ .bits = (uint8_t)1 }
-/**
- * 'start'
- */
-#define AlignFlags_START (AlignFlags){ .bits = (uint8_t)(1 << 1) }
-/**
- * 'end'
- */
-#define AlignFlags_END (AlignFlags){ .bits = (uint8_t)(1 << 2) }
-/**
- * 'flex-start'
- */
-#define AlignFlags_FLEX_START (AlignFlags){ .bits = (uint8_t)(1 << 3) }
-
-struct DebugFlags {
-  uint32_t bits;
-};
-/**
- * Flag with the topmost bit set of the u32
- */
-#define DebugFlags_BIGGEST_ALLOWED (DebugFlags){ .bits = (uint32_t)(1 << 31) }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct AlignFlags flags, struct DebugFlags bigger_flags);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/body.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/body.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/body.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/body.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MyCLikeEnum {
-  Foo1,
-  Bar1,
-  Baz1,
-};
-
-enum MyCLikeEnum_Prepended {
-  Foo1_Prepended,
-  Bar1_Prepended,
-  Baz1_Prepended,
-};
-
-struct MyFancyStruct {
-  int32_t i;
-#ifdef __cplusplus
-  inline void foo();
-#endif
-};
-
-enum MyFancyEnum_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-
-struct Bar_Body {
-  int32_t _0;
-};
-
-struct Baz_Body {
-  int32_t _0;
-};
-
-struct MyFancyEnum {
-  enum MyFancyEnum_Tag tag;
-  union {
-    struct Bar_Body bar;
-    struct Baz_Body baz;
-  };
-#ifdef __cplusplus
-  inline void wohoo();
-#endif
-};
-
-union MyUnion {
-  float f;
-  uint32_t u;
-  int32_t extra_member; // yolo
-};
-
-struct MyFancyStruct_Prepended {
-#ifdef __cplusplus
-  inline void prepended_wohoo();
-#endif
-  int32_t i;
-};
-
-enum MyFancyEnum_Prepended_Tag {
-  Foo_Prepended,
-  Bar_Prepended,
-  Baz_Prepended,
-};
-
-struct Bar_Prepended_Body {
-  int32_t _0;
-};
-
-struct Baz_Prepended_Body {
-  int32_t _0;
-};
-
-struct MyFancyEnum_Prepended {
-  #ifdef __cplusplus
-    inline void wohoo();
-  #endif
-  enum MyFancyEnum_Prepended_Tag tag;
-  union {
-    struct Bar_Prepended_Body bar_prepended;
-    struct Baz_Prepended_Body baz_prepended;
-  };
-};
-
-union MyUnion_Prepended {
-  int32_t extra_member; // yolo
-  float f;
-  uint32_t u;
-};
-
-void root(struct MyFancyStruct s,
-          struct MyFancyEnum e,
-          enum MyCLikeEnum c,
-          union MyUnion u,
-          struct MyFancyStruct_Prepended sp,
-          struct MyFancyEnum_Prepended ep,
-          enum MyCLikeEnum_Prepended cp,
-          union MyUnion_Prepended up);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/body.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/body.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/body.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/body.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MyCLikeEnum {
-  Foo1,
-  Bar1,
-  Baz1,
-};
-
-enum MyCLikeEnum_Prepended {
-  Foo1_Prepended,
-  Bar1_Prepended,
-  Baz1_Prepended,
-};
-
-struct MyFancyStruct {
-  int32_t i;
-#ifdef __cplusplus
-  inline void foo();
-#endif
-};
-
-enum MyFancyEnum_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-
-struct Bar_Body {
-  int32_t _0;
-};
-
-struct Baz_Body {
-  int32_t _0;
-};
-
-struct MyFancyEnum {
-  enum MyFancyEnum_Tag tag;
-  union {
-    struct Bar_Body bar;
-    struct Baz_Body baz;
-  };
-#ifdef __cplusplus
-  inline void wohoo();
-#endif
-};
-
-union MyUnion {
-  float f;
-  uint32_t u;
-  int32_t extra_member; // yolo
-};
-
-struct MyFancyStruct_Prepended {
-#ifdef __cplusplus
-  inline void prepended_wohoo();
-#endif
-  int32_t i;
-};
-
-enum MyFancyEnum_Prepended_Tag {
-  Foo_Prepended,
-  Bar_Prepended,
-  Baz_Prepended,
-};
-
-struct Bar_Prepended_Body {
-  int32_t _0;
-};
-
-struct Baz_Prepended_Body {
-  int32_t _0;
-};
-
-struct MyFancyEnum_Prepended {
-  #ifdef __cplusplus
-    inline void wohoo();
-  #endif
-  enum MyFancyEnum_Prepended_Tag tag;
-  union {
-    struct Bar_Prepended_Body bar_prepended;
-    struct Baz_Prepended_Body baz_prepended;
-  };
-};
-
-union MyUnion_Prepended {
-  int32_t extra_member; // yolo
-  float f;
-  uint32_t u;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct MyFancyStruct s,
-          struct MyFancyEnum e,
-          enum MyCLikeEnum c,
-          union MyUnion u,
-          struct MyFancyStruct_Prepended sp,
-          struct MyFancyEnum_Prepended ep,
-          enum MyCLikeEnum_Prepended cp,
-          union MyUnion_Prepended up);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/box.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/box.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/box.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/box.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using Box = T*;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_Box_i32;
-
-typedef struct NotReprC_Box_i32 Foo;
-
-struct MyStruct {
-  int32_t *number;
-};
-
-void root(const Foo *a, const struct MyStruct *with_box);
-
-void drop_box(int32_t *x);
-
-void drop_box_opt(int32_t *x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/box.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/box.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/box.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/box.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using Box = T*;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_Box_i32;
-
-typedef struct NotReprC_Box_i32 Foo;
-
-struct MyStruct {
-  int32_t *number;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const struct MyStruct *with_box);
-
-void drop_box(int32_t *x);
-
-void drop_box_opt(int32_t *x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cdecl.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cdecl.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cdecl.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cdecl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef void (*A)(void);
-
-typedef void (*B)(void);
-
-typedef bool (*C)(int32_t, int32_t);
-
-typedef bool (*(*D)(int32_t))(float);
-
-typedef const int32_t (*(*E)(void))[16];
-
-typedef const int32_t *F;
-
-typedef const int32_t *const *G;
-
-typedef int32_t *const *H;
-
-typedef const int32_t (*I)[16];
-
-typedef double (**J)(float);
-
-typedef int32_t K[16];
-
-typedef const int32_t *L[16];
-
-typedef bool (*M[16])(int32_t, int32_t);
-
-typedef void (*N[16])(int32_t, int32_t);
-
-typedef void (*P)(int32_t named1st, bool, bool named3rd, int32_t _);
-
-void (*O(void))(void);
-
-void root(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l, M m, N n, P p);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cdecl.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cdecl.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cdecl.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cdecl.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef void (*A)(void);
-
-typedef void (*B)(void);
-
-typedef bool (*C)(int32_t, int32_t);
-
-typedef bool (*(*D)(int32_t))(float);
-
-typedef const int32_t (*(*E)(void))[16];
-
-typedef const int32_t *F;
-
-typedef const int32_t *const *G;
-
-typedef int32_t *const *H;
-
-typedef const int32_t (*I)[16];
-
-typedef double (**J)(float);
-
-typedef int32_t K[16];
-
-typedef const int32_t *L[16];
-
-typedef bool (*M[16])(int32_t, int32_t);
-
-typedef void (*N[16])(int32_t, int32_t);
-
-typedef void (*P)(int32_t named1st, bool, bool named3rd, int32_t _);
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void (*O(void))(void);
-
-void root(A a, B b, C c, D d, E e, F f, G g, H h, I i, J j, K k, L l, M m, N n, P p);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cell.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cell.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cell.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cell.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_RefCell_i32;
-
-typedef struct NotReprC_RefCell_i32 Foo;
-
-struct MyStruct {
-  int32_t number;
-};
-
-void root(const Foo *a, const struct MyStruct *with_cell);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cell.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cell.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cell.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cell.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_RefCell_i32;
-
-typedef struct NotReprC_RefCell_i32 Foo;
-
-struct MyStruct {
-  int32_t number;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const struct MyStruct *with_cell);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-struct Foo {
-  int32_t x;
-};
-#endif
-
-#if defined(NOT_DEFINED)
-struct Bar {
-  struct Foo y;
-};
-#endif
-
-#if defined(DEFINED)
-struct Bar {
-  struct Foo z;
-};
-#endif
-
-struct Root {
-  struct Bar w;
-};
-
-void root(struct Root a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(NOT_DEFINED)
-#define DEFAULT_X 8
-#endif
-
-#if defined(DEFINED)
-#define DEFAULT_X 42
-#endif
-
-#if (defined(NOT_DEFINED) || defined(DEFINED))
-struct Foo {
-  int32_t x;
-};
-#endif
-
-#if defined(NOT_DEFINED)
-struct Bar {
-  struct Foo y;
-};
-#endif
-
-#if defined(DEFINED)
-struct Bar {
-  struct Foo z;
-};
-#endif
-
-struct Root {
-  struct Bar w;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Root a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-enum BarType {
-  A,
-  B,
-  C,
-};
-typedef uint32_t BarType;
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-enum FooType {
-  A,
-  B,
-  C,
-};
-typedef uint32_t FooType;
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-struct FooHandle {
-  FooType ty;
-  int32_t x;
-  float y;
-};
-#endif
-
-enum C_Tag {
-  C1,
-  C2,
-#if defined(PLATFORM_WIN)
-  C3,
-#endif
-#if defined(PLATFORM_UNIX)
-  C5,
-#endif
-};
-typedef uint8_t C_Tag;
-
-#if defined(PLATFORM_UNIX)
-struct C5_Body {
-  C_Tag tag;
-  int32_t int_;
-};
-#endif
-
-union C {
-  C_Tag tag;
-#if defined(PLATFORM_UNIX)
-  struct C5_Body c5;
-#endif
-};
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-struct BarHandle {
-  BarType ty;
-  int32_t x;
-  float y;
-};
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-void root(struct FooHandle a, union C c);
-#endif
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-void root(struct BarHandle a, union C c);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-enum BarType
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  A,
-  B,
-  C,
-};
-#ifndef __cplusplus
-typedef uint32_t BarType;
-#endif // __cplusplus
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-enum FooType
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  A,
-  B,
-  C,
-};
-#ifndef __cplusplus
-typedef uint32_t FooType;
-#endif // __cplusplus
-#endif
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-struct FooHandle {
-  FooType ty;
-  int32_t x;
-  float y;
-};
-#endif
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  C1,
-  C2,
-#if defined(PLATFORM_WIN)
-  C3,
-#endif
-#if defined(PLATFORM_UNIX)
-  C5,
-#endif
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-#if defined(PLATFORM_UNIX)
-struct C5_Body {
-  C_Tag tag;
-  int32_t int_;
-};
-#endif
-
-union C {
-  C_Tag tag;
-#if defined(PLATFORM_UNIX)
-  struct C5_Body c5;
-#endif
-};
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-struct BarHandle {
-  BarType ty;
-  int32_t x;
-  float y;
-};
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#if (defined(PLATFORM_UNIX) && defined(X11))
-void root(struct FooHandle a, union C c);
-#endif
-
-#if (defined(PLATFORM_WIN) || defined(M_32))
-void root(struct BarHandle a, union C c);
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/cfg-field.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/char.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/char.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/char.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/char.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  uint32_t a;
-};
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/char.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/char.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/char.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/char.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  uint32_t a;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_big.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_big.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_big.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_big.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
-
-#define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
-
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_big.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_big.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_big.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_big.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define UNSIGNED_NEEDS_ULL_SUFFIX 9223372036854775808ULL
-
-#define UNSIGNED_DOESNT_NEED_ULL_SUFFIX 8070450532247928832
-
-#define SIGNED_NEEDS_ULL_SUFFIX -9223372036854775808ULL
-
-#define SIGNED_DOESNT_NEED_ULL_SUFFIX -9223372036854775807
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-#define QUOTE '\''
-
-#define TAB '\t'
-
-#define NEWLINE '\n'
-
-#define HEART U'\U00002764'
-
-#define EQUID U'\U00010083'
-
-#define ZOM 3.14
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-/**
- * A
- * multi-line
- * doc
- * comment.
- */
-#define NEG_ONE -1
-
-#define SHIFT 3
-
-#define XBOOL 1
-
-#define XFALSE ((0 << SHIFT) | XBOOL)
-
-#define XTRUE (1 << (SHIFT | XBOOL))
-
-#define CAST (uint8_t)'A'
-
-#define DOUBLE_CAST (uint32_t)(float)1
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-#define QUOTE '\''
-
-#define TAB '\t'
-
-#define NEWLINE '\n'
-
-#define HEART U'\U00002764'
-
-#define EQUID U'\U00010083'
-
-#define ZOM 3.14
-
-/**
- * A single-line doc comment.
- */
-#define POS_ONE 1
-
-/**
- * A
- * multi-line
- * doc
- * comment.
- */
-#define NEG_ONE -1
-
-#define SHIFT 3
-
-#define XBOOL 1
-
-#define XFALSE ((0 << SHIFT) | XBOOL)
-
-#define XTRUE (1 << (SHIFT | XBOOL))
-
-#define CAST (uint8_t)'A'
-
-#define DOUBLE_CAST (uint32_t)(float)1
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CONSTANT_I64 216
-
-#define CONSTANT_FLOAT32 312.292
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-struct Foo {
-  int32_t x;
-};
-#define Foo_CONSTANT_I64_BODY 216
-
-#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_constexpr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define CONSTANT_I64 216
-
-#define CONSTANT_FLOAT32 312.292
-
-#define DELIMITER ':'
-
-#define LEFTCURLY '{'
-
-struct Foo {
-  int32_t x;
-};
-#define Foo_CONSTANT_I64_BODY 216
-
-#define SomeFoo (Foo){ .x = 99 }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define A 0
-
-#define B 0
-
-extern const uint8_t C;
-
-extern const uint8_t D;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define A 0
-
-#define B 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const uint8_t C;
-
-extern const uint8_t D;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define B 0
-
-#define A 0
-
-extern const uint8_t D;
-
-extern const uint8_t C;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_sort_none.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define B 0
-
-#define A 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const uint8_t D;
-
-extern const uint8_t C;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum E {
-  V,
-};
-
-struct S {
-  uint8_t field;
-};
-
-typedef uint8_t A;
-
-#define C1 (S){ .field = 0 }
-
-#define C2 V
-
-#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/constant_user_defined_type.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum E {
-  V,
-};
-
-struct S {
-  uint8_t field;
-};
-
-typedef uint8_t A;
-
-#define C1 (S){ .field = 0 }
-
-#define C2 V
-
-#define C3 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_conflict.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define Foo_FOO 42
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef uint8_t Transparent;
-
-#define FOO 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/const_transparent.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef uint8_t Transparent;
-
-#define FOO 0
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/custom_header.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/custom_header.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/custom_header.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/custom_header.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-// This file is generated by cbindgen. DO NOT EDIT
-
-void root(void);
-
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/custom_header.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/custom_header.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/custom_header.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/custom_header.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-// This file is generated by cbindgen. DO NOT EDIT
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/dep_v2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const struct dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  bool a;
-  int32_t b;
-};
-
-enum Bar_Tag {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-typedef uint8_t Bar_Tag;
-
-struct Bazz_Body {
-  Bar_Tag tag;
-  struct Foo named;
-};
-
-struct FooNamed_Body {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-};
-
-struct FooParen_Body {
-  Bar_Tag tag;
-  int32_t _0;
-  struct Foo _1;
-};
-
-union Bar {
-  Bar_Tag tag;
-  struct Bazz_Body bazz;
-  struct FooNamed_Body foo_named;
-  struct FooParen_Body foo_paren;
-};
-
-struct Foo root(union Bar aBar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive-eq.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  bool a;
-  int32_t b;
-};
-
-enum Bar_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz,
-  Bazz,
-  FooNamed,
-  FooParen,
-};
-#ifndef __cplusplus
-typedef uint8_t Bar_Tag;
-#endif // __cplusplus
-
-struct Bazz_Body {
-  Bar_Tag tag;
-  struct Foo named;
-};
-
-struct FooNamed_Body {
-  Bar_Tag tag;
-  int32_t different;
-  uint32_t fields;
-};
-
-struct FooParen_Body {
-  Bar_Tag tag;
-  int32_t _0;
-  struct Foo _1;
-};
-
-union Bar {
-  Bar_Tag tag;
-  struct Bazz_Body bazz;
-  struct FooNamed_Body foo_named;
-  struct FooParen_Body foo_paren;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-struct Foo root(union Bar aBar);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C {
-  X = 2,
-  Y,
-};
-typedef uint32_t C;
-
-struct A {
-  int32_t _0;
-};
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-struct D {
-  uint8_t List;
-  uintptr_t Of;
-  struct B Things;
-};
-
-enum F_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t F_Tag;
-
-struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union F {
-  F_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag {
-  Hello,
-  There,
-  Everyone,
-};
-typedef uint8_t H_Tag;
-
-struct Hello_Body {
-  int16_t _0;
-};
-
-struct There_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct Hello_Body hello;
-    struct There_Body there;
-  };
-};
-
-enum I_Tag {
-  ThereAgain,
-  SomethingElse,
-};
-typedef uint8_t I_Tag;
-
-struct ThereAgain_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct I {
-  I_Tag tag;
-  union {
-    struct ThereAgain_Body there_again;
-  };
-};
-
-void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/derive_ostream.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum C
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  X = 2,
-  Y,
-};
-#ifndef __cplusplus
-typedef uint32_t C;
-#endif // __cplusplus
-
-struct A {
-  int32_t _0;
-};
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-struct D {
-  uint8_t List;
-  uintptr_t Of;
-  struct B Things;
-};
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-struct Foo_Body {
-  F_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  F_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union F {
-  F_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Hello,
-  There,
-  Everyone,
-};
-#ifndef __cplusplus
-typedef uint8_t H_Tag;
-#endif // __cplusplus
-
-struct Hello_Body {
-  int16_t _0;
-};
-
-struct There_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  H_Tag tag;
-  union {
-    struct Hello_Body hello;
-    struct There_Body there;
-  };
-};
-
-enum I_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  ThereAgain,
-  SomethingElse,
-};
-#ifndef __cplusplus
-typedef uint8_t I_Tag;
-#endif // __cplusplus
-
-struct ThereAgain_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct I {
-  I_Tag tag;
-  union {
-    struct ThereAgain_Body there_again;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct A a, struct B b, C c, struct D d, union F f, struct H h, struct I i);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule {
-  A,
-  B,
-};
-typedef uint8_t FillRule;
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-struct OwnedSlice_u32 {
-  uintptr_t len;
-  uint32_t *ptr;
-};
-
-struct Polygon_u32 {
-  FillRule fill;
-  struct OwnedSlice_u32 coordinates;
-};
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-struct OwnedSlice_i32 {
-  uintptr_t len;
-  int32_t *ptr;
-};
-
-enum Foo_u32_Tag {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-typedef uint8_t Foo_u32_Tag;
-
-struct Polygon1_Body_u32 {
-  struct Polygon_u32 _0;
-};
-
-struct Slice1_Body_u32 {
-  struct OwnedSlice_u32 _0;
-};
-
-struct Slice2_Body_u32 {
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice3_Body_u32 {
-  FillRule fill;
-  struct OwnedSlice_u32 coords;
-};
-
-struct Slice4_Body_u32 {
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-struct Foo_u32 {
-  Foo_u32_Tag tag;
-  union {
-    struct Polygon1_Body_u32 polygon1;
-    struct Slice1_Body_u32 slice1;
-    struct Slice2_Body_u32 slice2;
-    struct Slice3_Body_u32 slice3;
-    struct Slice4_Body_u32 slice4;
-  };
-};
-
-struct Polygon_i32 {
-  FillRule fill;
-  struct OwnedSlice_i32 coordinates;
-};
-
-enum Baz_i32_Tag {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-typedef uint8_t Baz_i32_Tag;
-
-struct Polygon21_Body_i32 {
-  Baz_i32_Tag tag;
-  struct Polygon_i32 _0;
-};
-
-struct Slice21_Body_i32 {
-  Baz_i32_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice22_Body_i32 {
-  Baz_i32_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice23_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-struct Slice24_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-union Baz_i32 {
-  Baz_i32_Tag tag;
-  struct Polygon21_Body_i32 polygon21;
-  struct Slice21_Body_i32 slice21;
-  struct Slice22_Body_i32 slice22;
-  struct Slice23_Body_i32 slice23;
-  struct Slice24_Body_i32 slice24;
-};
-
-enum Taz_Tag {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-typedef uint8_t Taz_Tag;
-
-struct Taz1_Body {
-  Taz_Tag tag;
-  int32_t _0;
-};
-
-struct Taz3_Body {
-  Taz_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-union Taz {
-  Taz_Tag tag;
-  struct Taz1_Body taz1;
-  struct Taz3_Body taz3;
-};
-
-enum Tazz_Tag {
-  Bar4,
-  Taz2,
-};
-typedef uint8_t Tazz_Tag;
-
-struct Taz2_Body {
-  Tazz_Tag tag;
-  int32_t _0;
-};
-
-union Tazz {
-  Tazz_Tag tag;
-  struct Taz2_Body taz2;
-};
-
-enum Tazzz_Tag {
-  Bar5,
-  Taz5,
-};
-typedef uint8_t Tazzz_Tag;
-
-struct Taz5_Body {
-  Tazzz_Tag tag;
-  int32_t _0;
-};
-
-union Tazzz {
-  Tazzz_Tag tag;
-  struct Taz5_Body taz5;
-};
-
-enum Tazzzz_Tag {
-  Taz6,
-  Taz7,
-};
-typedef uint8_t Tazzzz_Tag;
-
-struct Taz6_Body {
-  Tazzzz_Tag tag;
-  int32_t _0;
-};
-
-struct Taz7_Body {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-};
-
-union Tazzzz {
-  Tazzzz_Tag tag;
-  struct Taz6_Body taz6;
-  struct Taz7_Body taz7;
-};
-
-enum Qux_Tag {
-  Qux1,
-  Qux2,
-};
-typedef uint8_t Qux_Tag;
-
-struct Qux1_Body {
-  Qux_Tag tag;
-  int32_t _0;
-};
-
-struct Qux2_Body {
-  Qux_Tag tag;
-  uint32_t _0;
-};
-
-union Qux {
-  Qux_Tag tag;
-  struct Qux1_Body qux1;
-  struct Qux2_Body qux2;
-};
-
-void root(const struct Foo_u32 *a,
-          const union Baz_i32 *b,
-          const union Taz *c,
-          union Tazz d,
-          const union Tazzz *e,
-          const union Tazzzz *f,
-          const union Qux *g);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/destructor-and-copy-ctor.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,294 +0,0 @@
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum FillRule
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  A,
-  B,
-};
-#ifndef __cplusplus
-typedef uint8_t FillRule;
-#endif // __cplusplus
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-struct OwnedSlice_u32 {
-  uintptr_t len;
-  uint32_t *ptr;
-};
-
-struct Polygon_u32 {
-  FillRule fill;
-  struct OwnedSlice_u32 coordinates;
-};
-
-/**
- * This will have a destructor manually implemented via variant_body, and
- * similarly a Drop impl in Rust.
- */
-struct OwnedSlice_i32 {
-  uintptr_t len;
-  int32_t *ptr;
-};
-
-enum Foo_u32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar_u32,
-  Polygon1_u32,
-  Slice1_u32,
-  Slice2_u32,
-  Slice3_u32,
-  Slice4_u32,
-};
-#ifndef __cplusplus
-typedef uint8_t Foo_u32_Tag;
-#endif // __cplusplus
-
-struct Polygon1_Body_u32 {
-  struct Polygon_u32 _0;
-};
-
-struct Slice1_Body_u32 {
-  struct OwnedSlice_u32 _0;
-};
-
-struct Slice2_Body_u32 {
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice3_Body_u32 {
-  FillRule fill;
-  struct OwnedSlice_u32 coords;
-};
-
-struct Slice4_Body_u32 {
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-struct Foo_u32 {
-  Foo_u32_Tag tag;
-  union {
-    struct Polygon1_Body_u32 polygon1;
-    struct Slice1_Body_u32 slice1;
-    struct Slice2_Body_u32 slice2;
-    struct Slice3_Body_u32 slice3;
-    struct Slice4_Body_u32 slice4;
-  };
-};
-
-struct Polygon_i32 {
-  FillRule fill;
-  struct OwnedSlice_i32 coordinates;
-};
-
-enum Baz_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar2_i32,
-  Polygon21_i32,
-  Slice21_i32,
-  Slice22_i32,
-  Slice23_i32,
-  Slice24_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t Baz_i32_Tag;
-#endif // __cplusplus
-
-struct Polygon21_Body_i32 {
-  Baz_i32_Tag tag;
-  struct Polygon_i32 _0;
-};
-
-struct Slice21_Body_i32 {
-  Baz_i32_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice22_Body_i32 {
-  Baz_i32_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-struct Slice23_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-struct Slice24_Body_i32 {
-  Baz_i32_Tag tag;
-  FillRule fill;
-  struct OwnedSlice_i32 coords;
-};
-
-union Baz_i32 {
-  Baz_i32_Tag tag;
-  struct Polygon21_Body_i32 polygon21;
-  struct Slice21_Body_i32 slice21;
-  struct Slice22_Body_i32 slice22;
-  struct Slice23_Body_i32 slice23;
-  struct Slice24_Body_i32 slice24;
-};
-
-enum Taz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar3,
-  Taz1,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t Taz_Tag;
-#endif // __cplusplus
-
-struct Taz1_Body {
-  Taz_Tag tag;
-  int32_t _0;
-};
-
-struct Taz3_Body {
-  Taz_Tag tag;
-  struct OwnedSlice_i32 _0;
-};
-
-union Taz {
-  Taz_Tag tag;
-  struct Taz1_Body taz1;
-  struct Taz3_Body taz3;
-};
-
-enum Tazz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar4,
-  Taz2,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazz_Tag;
-#endif // __cplusplus
-
-struct Taz2_Body {
-  Tazz_Tag tag;
-  int32_t _0;
-};
-
-union Tazz {
-  Tazz_Tag tag;
-  struct Taz2_Body taz2;
-};
-
-enum Tazzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Bar5,
-  Taz5,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzz_Tag;
-#endif // __cplusplus
-
-struct Taz5_Body {
-  Tazzz_Tag tag;
-  int32_t _0;
-};
-
-union Tazzz {
-  Tazzz_Tag tag;
-  struct Taz5_Body taz5;
-};
-
-enum Tazzzz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz6,
-  Taz7,
-};
-#ifndef __cplusplus
-typedef uint8_t Tazzzz_Tag;
-#endif // __cplusplus
-
-struct Taz6_Body {
-  Tazzzz_Tag tag;
-  int32_t _0;
-};
-
-struct Taz7_Body {
-  Tazzzz_Tag tag;
-  uint32_t _0;
-};
-
-union Tazzzz {
-  Tazzzz_Tag tag;
-  struct Taz6_Body taz6;
-  struct Taz7_Body taz7;
-};
-
-enum Qux_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Qux1,
-  Qux2,
-};
-#ifndef __cplusplus
-typedef uint8_t Qux_Tag;
-#endif // __cplusplus
-
-struct Qux1_Body {
-  Qux_Tag tag;
-  int32_t _0;
-};
-
-struct Qux2_Body {
-  Qux_Tag tag;
-  uint32_t _0;
-};
-
-union Qux {
-  Qux_Tag tag;
-  struct Qux1_Body qux1;
-  struct Qux2_Body qux2;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const struct Foo_u32 *a,
-          const union Baz_i32 *b,
-          const union Taz *c,
-          union Tazz d,
-          const union Tazzz *e,
-          const union Tazzzz *f,
-          const union Qux *g);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/display_list.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/display_list.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/display_list.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/display_list.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Rect {
-  float x;
-  float y;
-  float w;
-  float h;
-};
-
-struct Color {
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
-  uint8_t a;
-};
-
-enum DisplayItem_Tag {
-  Fill,
-  Image,
-  ClearScreen,
-};
-typedef uint8_t DisplayItem_Tag;
-
-struct Fill_Body {
-  DisplayItem_Tag tag;
-  struct Rect _0;
-  struct Color _1;
-};
-
-struct Image_Body {
-  DisplayItem_Tag tag;
-  uint32_t id;
-  struct Rect bounds;
-};
-
-union DisplayItem {
-  DisplayItem_Tag tag;
-  struct Fill_Body fill;
-  struct Image_Body image;
-};
-
-bool push_item(union DisplayItem item);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/display_list.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/display_list.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/display_list.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/display_list.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Rect {
-  float x;
-  float y;
-  float w;
-  float h;
-};
-
-struct Color {
-  uint8_t r;
-  uint8_t g;
-  uint8_t b;
-  uint8_t a;
-};
-
-enum DisplayItem_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Fill,
-  Image,
-  ClearScreen,
-};
-#ifndef __cplusplus
-typedef uint8_t DisplayItem_Tag;
-#endif // __cplusplus
-
-struct Fill_Body {
-  DisplayItem_Tag tag;
-  struct Rect _0;
-  struct Color _1;
-};
-
-struct Image_Body {
-  DisplayItem_Tag tag;
-  uint32_t id;
-  struct Rect bounds;
-};
-
-union DisplayItem {
-  DisplayItem_Tag tag;
-  struct Fill_Body fill;
-  struct Image_Body image;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-bool push_item(union DisplayItem item);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_auto.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-// The root of all evil.
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_c99.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// The root of all evil.
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/docstyle_doxy.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- *With doc attr, each attr contribute to one line of document
- *like this one with a new line character at its end
- *and this one as well. So they are in the same paragraph
- *
- *Line ends with one new line should not break
- *
- *Line ends with two spaces and a new line
- *should break to next line
- *
- *Line ends with two new lines
- *
- *Should break to next paragraph
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- *With doc attr, each attr contribute to one line of document
- *like this one with a new line character at its end
- *and this one as well. So they are in the same paragraph
- *
- *Line ends with one new line should not break
- *
- *Line ends with two spaces and a new line
- *should break to next line
- *
- *Line ends with two new lines
- *
- *Should break to next paragraph
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * The root of all evil.
- *
- * But at least it contains some more documentation as someone would expect
- * from a simple test case like this.
- *
- * # Hint
- *
- * Always ensure that everything is properly documented, even if you feel lazy.
- * **Sometimes** it is also helpful to include some markdown formatting.
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * Attention:
- *
- *    Rust is going to trim all leading `/` symbols. If you want to use them as a
- *    marker you need to add at least a single whitespace inbetween the tripple
- *    slash doc-comment marker and the rest.
- *
- */
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/documentation.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/documentation.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-/**
- * The root of all evil.
- *
- * But at least it contains some more documentation as someone would expect
- * from a simple test case like this.
- *
- * # Hint
- *
- * Always ensure that everything is properly documented, even if you feel lazy.
- * **Sometimes** it is also helpful to include some markdown formatting.
- *
- * ////////////////////////////////////////////////////////////////////////////
- *
- * Attention:
- *
- *    Rust is going to trim all leading `/` symbols. If you want to use them as a
- *    marker you need to add at least a single whitespace inbetween the tripple
- *    slash doc-comment marker and the rest.
- *
- */
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,207 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A {
-  a1 = 0,
-  a2 = 2,
-  a3,
-  a4 = 5,
-};
-typedef uint64_t A;
-
-enum B {
-  b1 = 0,
-  b2 = 2,
-  b3,
-  b4 = 5,
-};
-typedef uint32_t B;
-
-enum C {
-  c1 = 0,
-  c2 = 2,
-  c3,
-  c4 = 5,
-};
-typedef uint16_t C;
-
-enum D {
-  d1 = 0,
-  d2 = 2,
-  d3,
-  d4 = 5,
-};
-typedef uint8_t D;
-
-enum E {
-  e1 = 0,
-  e2 = 2,
-  e3,
-  e4 = 5,
-};
-typedef uintptr_t E;
-
-enum F {
-  f1 = 0,
-  f2 = 2,
-  f3,
-  f4 = 5,
-};
-typedef intptr_t F;
-
-enum L {
-  l1,
-  l2,
-  l3,
-  l4,
-};
-
-enum M {
-  m1 = -1,
-  m2 = 0,
-  m3 = 1,
-};
-typedef int8_t M;
-
-enum N {
-  n1,
-  n2,
-  n3,
-  n4,
-};
-
-enum O {
-  o1,
-  o2,
-  o3,
-  o4,
-};
-typedef int8_t O;
-
-struct J;
-
-struct K;
-
-struct Opaque;
-
-enum G_Tag {
-  Foo,
-  Bar,
-  Baz,
-};
-typedef uint8_t G_Tag;
-
-struct Foo_Body {
-  G_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  G_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union G {
-  G_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-
-struct H_Foo_Body {
-  int16_t _0;
-};
-
-struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  enum H_Tag tag;
-  union {
-    struct H_Foo_Body foo;
-    struct H_Bar_Body bar;
-  };
-};
-
-enum I_Tag {
-  I_Foo,
-  I_Bar,
-  I_Baz,
-};
-typedef uint8_t I_Tag;
-
-struct I_Foo_Body {
-  int16_t _0;
-};
-
-struct I_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct I {
-  I_Tag tag;
-  union {
-    struct I_Foo_Body foo;
-    struct I_Bar_Body bar;
-  };
-};
-
-enum P_Tag {
-  P0,
-  P1,
-};
-typedef uint8_t P_Tag;
-
-struct P0_Body {
-  uint8_t _0;
-};
-
-struct P1_Body {
-  uint8_t _0;
-  uint8_t _1;
-  uint8_t _2;
-};
-
-struct P {
-  P_Tag tag;
-  union {
-    struct P0_Body p0;
-    struct P1_Body p1;
-  };
-};
-
-void root(struct Opaque *opaque,
-          A a,
-          B b,
-          C c,
-          D d,
-          E e,
-          F f,
-          union G g,
-          struct H h,
-          struct I i,
-          struct J j,
-          struct K k,
-          enum L l,
-          M m,
-          enum N n,
-          O o,
-          struct P p);
-
-#include <stddef.h>
-#include "testing-helpers.h"
-static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
-static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,281 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A
-#ifdef __cplusplus
-  : uint64_t
-#endif // __cplusplus
- {
-  a1 = 0,
-  a2 = 2,
-  a3,
-  a4 = 5,
-};
-#ifndef __cplusplus
-typedef uint64_t A;
-#endif // __cplusplus
-
-enum B
-#ifdef __cplusplus
-  : uint32_t
-#endif // __cplusplus
- {
-  b1 = 0,
-  b2 = 2,
-  b3,
-  b4 = 5,
-};
-#ifndef __cplusplus
-typedef uint32_t B;
-#endif // __cplusplus
-
-enum C
-#ifdef __cplusplus
-  : uint16_t
-#endif // __cplusplus
- {
-  c1 = 0,
-  c2 = 2,
-  c3,
-  c4 = 5,
-};
-#ifndef __cplusplus
-typedef uint16_t C;
-#endif // __cplusplus
-
-enum D
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  d1 = 0,
-  d2 = 2,
-  d3,
-  d4 = 5,
-};
-#ifndef __cplusplus
-typedef uint8_t D;
-#endif // __cplusplus
-
-enum E
-#ifdef __cplusplus
-  : uintptr_t
-#endif // __cplusplus
- {
-  e1 = 0,
-  e2 = 2,
-  e3,
-  e4 = 5,
-};
-#ifndef __cplusplus
-typedef uintptr_t E;
-#endif // __cplusplus
-
-enum F
-#ifdef __cplusplus
-  : intptr_t
-#endif // __cplusplus
- {
-  f1 = 0,
-  f2 = 2,
-  f3,
-  f4 = 5,
-};
-#ifndef __cplusplus
-typedef intptr_t F;
-#endif // __cplusplus
-
-enum L {
-  l1,
-  l2,
-  l3,
-  l4,
-};
-
-enum M
-#ifdef __cplusplus
-  : int8_t
-#endif // __cplusplus
- {
-  m1 = -1,
-  m2 = 0,
-  m3 = 1,
-};
-#ifndef __cplusplus
-typedef int8_t M;
-#endif // __cplusplus
-
-enum N {
-  n1,
-  n2,
-  n3,
-  n4,
-};
-
-enum O
-#ifdef __cplusplus
-  : int8_t
-#endif // __cplusplus
- {
-  o1,
-  o2,
-  o3,
-  o4,
-};
-#ifndef __cplusplus
-typedef int8_t O;
-#endif // __cplusplus
-
-struct J;
-
-struct K;
-
-struct Opaque;
-
-enum G_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-  Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t G_Tag;
-#endif // __cplusplus
-
-struct Foo_Body {
-  G_Tag tag;
-  int16_t _0;
-};
-
-struct Bar_Body {
-  G_Tag tag;
-  uint8_t x;
-  int16_t y;
-};
-
-union G {
-  G_Tag tag;
-  struct Foo_Body foo;
-  struct Bar_Body bar;
-};
-
-enum H_Tag {
-  H_Foo,
-  H_Bar,
-  H_Baz,
-};
-
-struct H_Foo_Body {
-  int16_t _0;
-};
-
-struct H_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct H {
-  enum H_Tag tag;
-  union {
-    struct H_Foo_Body foo;
-    struct H_Bar_Body bar;
-  };
-};
-
-enum I_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  I_Foo,
-  I_Bar,
-  I_Baz,
-};
-#ifndef __cplusplus
-typedef uint8_t I_Tag;
-#endif // __cplusplus
-
-struct I_Foo_Body {
-  int16_t _0;
-};
-
-struct I_Bar_Body {
-  uint8_t x;
-  int16_t y;
-};
-
-struct I {
-  I_Tag tag;
-  union {
-    struct I_Foo_Body foo;
-    struct I_Bar_Body bar;
-  };
-};
-
-enum P_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  P0,
-  P1,
-};
-#ifndef __cplusplus
-typedef uint8_t P_Tag;
-#endif // __cplusplus
-
-struct P0_Body {
-  uint8_t _0;
-};
-
-struct P1_Body {
-  uint8_t _0;
-  uint8_t _1;
-  uint8_t _2;
-};
-
-struct P {
-  P_Tag tag;
-  union {
-    struct P0_Body p0;
-    struct P1_Body p1;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Opaque *opaque,
-          A a,
-          B b,
-          C c,
-          D d,
-          E e,
-          F f,
-          union G g,
-          struct H h,
-          struct I i,
-          struct J j,
-          struct K k,
-          enum L l,
-          M m,
-          enum N n,
-          O o,
-          struct P p);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#include <stddef.h>
-#include "testing-helpers.h"
-static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
-static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
-static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-enum Bar_Tag {
-  Min,
-  Max,
-  Other,
-};
-typedef uint8_t Bar_Tag;
-
-struct Min_Body {
-  Bar_Tag tag;
-  struct Foo_Bar _0;
-};
-
-struct Max_Body {
-  Bar_Tag tag;
-  struct Foo_Bar _0;
-};
-
-union Bar {
-  Bar_Tag tag;
-  struct Min_Body min;
-  struct Max_Body max;
-};
-
-void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/enum_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/enum_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-enum Bar_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Min,
-  Max,
-  Other,
-};
-#ifndef __cplusplus
-typedef uint8_t Bar_Tag;
-#endif // __cplusplus
-
-struct Min_Body {
-  Bar_Tag tag;
-  struct Foo_Bar _0;
-};
-
-struct Max_Body {
-  Bar_Tag tag;
-  struct Foo_Bar _0;
-};
-
-union Bar {
-  Bar_Tag tag;
-  struct Min_Body min;
-  struct Max_Body max;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(union Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/euclid.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/euclid.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/euclid.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/euclid.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,117 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct TypedLength_f32__UnknownUnit {
-  float _0;
-};
-
-struct TypedLength_f32__LayoutUnit {
-  float _0;
-};
-
-typedef struct TypedLength_f32__UnknownUnit Length_f32;
-
-typedef struct TypedLength_f32__LayoutUnit LayoutLength;
-
-struct TypedSideOffsets2D_f32__UnknownUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-};
-
-struct TypedSideOffsets2D_f32__LayoutUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-};
-
-typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
-
-typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
-
-struct TypedSize2D_f32__UnknownUnit {
-  float width;
-  float height;
-};
-
-struct TypedSize2D_f32__LayoutUnit {
-  float width;
-  float height;
-};
-
-typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
-
-typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
-
-struct TypedPoint2D_f32__UnknownUnit {
-  float x;
-  float y;
-};
-
-struct TypedPoint2D_f32__LayoutUnit {
-  float x;
-  float y;
-};
-
-typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
-
-typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
-
-struct TypedRect_f32__UnknownUnit {
-  struct TypedPoint2D_f32__UnknownUnit origin;
-  struct TypedSize2D_f32__UnknownUnit size;
-};
-
-struct TypedRect_f32__LayoutUnit {
-  struct TypedPoint2D_f32__LayoutUnit origin;
-  struct TypedSize2D_f32__LayoutUnit size;
-};
-
-typedef struct TypedRect_f32__UnknownUnit Rect_f32;
-
-typedef struct TypedRect_f32__LayoutUnit LayoutRect;
-
-struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-};
-
-struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-};
-
-void root(struct TypedLength_f32__UnknownUnit length_a,
-          struct TypedLength_f32__LayoutUnit length_b,
-          Length_f32 length_c,
-          LayoutLength length_d,
-          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
-          SideOffsets2D_f32 side_offsets_c,
-          LayoutSideOffsets2D side_offsets_d,
-          struct TypedSize2D_f32__UnknownUnit size_a,
-          struct TypedSize2D_f32__LayoutUnit size_b,
-          Size2D_f32 size_c,
-          LayoutSize2D size_d,
-          struct TypedPoint2D_f32__UnknownUnit point_a,
-          struct TypedPoint2D_f32__LayoutUnit point_b,
-          Point2D_f32 point_c,
-          LayoutPoint2D point_d,
-          struct TypedRect_f32__UnknownUnit rect_a,
-          struct TypedRect_f32__LayoutUnit rect_b,
-          Rect_f32 rect_c,
-          LayoutRect rect_d,
-          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/euclid.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/euclid.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/euclid.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/euclid.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct TypedLength_f32__UnknownUnit {
-  float _0;
-};
-
-struct TypedLength_f32__LayoutUnit {
-  float _0;
-};
-
-typedef struct TypedLength_f32__UnknownUnit Length_f32;
-
-typedef struct TypedLength_f32__LayoutUnit LayoutLength;
-
-struct TypedSideOffsets2D_f32__UnknownUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-};
-
-struct TypedSideOffsets2D_f32__LayoutUnit {
-  float top;
-  float right;
-  float bottom;
-  float left;
-};
-
-typedef struct TypedSideOffsets2D_f32__UnknownUnit SideOffsets2D_f32;
-
-typedef struct TypedSideOffsets2D_f32__LayoutUnit LayoutSideOffsets2D;
-
-struct TypedSize2D_f32__UnknownUnit {
-  float width;
-  float height;
-};
-
-struct TypedSize2D_f32__LayoutUnit {
-  float width;
-  float height;
-};
-
-typedef struct TypedSize2D_f32__UnknownUnit Size2D_f32;
-
-typedef struct TypedSize2D_f32__LayoutUnit LayoutSize2D;
-
-struct TypedPoint2D_f32__UnknownUnit {
-  float x;
-  float y;
-};
-
-struct TypedPoint2D_f32__LayoutUnit {
-  float x;
-  float y;
-};
-
-typedef struct TypedPoint2D_f32__UnknownUnit Point2D_f32;
-
-typedef struct TypedPoint2D_f32__LayoutUnit LayoutPoint2D;
-
-struct TypedRect_f32__UnknownUnit {
-  struct TypedPoint2D_f32__UnknownUnit origin;
-  struct TypedSize2D_f32__UnknownUnit size;
-};
-
-struct TypedRect_f32__LayoutUnit {
-  struct TypedPoint2D_f32__LayoutUnit origin;
-  struct TypedSize2D_f32__LayoutUnit size;
-};
-
-typedef struct TypedRect_f32__UnknownUnit Rect_f32;
-
-typedef struct TypedRect_f32__LayoutUnit LayoutRect;
-
-struct TypedTransform2D_f32__UnknownUnit__LayoutUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-};
-
-struct TypedTransform2D_f32__LayoutUnit__UnknownUnit {
-  float m11;
-  float m12;
-  float m21;
-  float m22;
-  float m31;
-  float m32;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct TypedLength_f32__UnknownUnit length_a,
-          struct TypedLength_f32__LayoutUnit length_b,
-          Length_f32 length_c,
-          LayoutLength length_d,
-          struct TypedSideOffsets2D_f32__UnknownUnit side_offsets_a,
-          struct TypedSideOffsets2D_f32__LayoutUnit side_offsets_b,
-          SideOffsets2D_f32 side_offsets_c,
-          LayoutSideOffsets2D side_offsets_d,
-          struct TypedSize2D_f32__UnknownUnit size_a,
-          struct TypedSize2D_f32__LayoutUnit size_b,
-          Size2D_f32 size_c,
-          LayoutSize2D size_d,
-          struct TypedPoint2D_f32__UnknownUnit point_a,
-          struct TypedPoint2D_f32__LayoutUnit point_b,
-          Point2D_f32 point_c,
-          LayoutPoint2D point_d,
-          struct TypedRect_f32__UnknownUnit rect_a,
-          struct TypedRect_f32__LayoutUnit rect_b,
-          Rect_f32 rect_c,
-          LayoutRect rect_d,
-          struct TypedTransform2D_f32__UnknownUnit__LayoutUnit transform_a,
-          struct TypedTransform2D_f32__LayoutUnit__UnknownUnit transform_b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdint.h>
-
-typedef uint64_t Option_Foo;
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar {
-  Option_Foo foo;
-};
-
-void root(struct Bar f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/exclude_generic_monomorph.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdint.h>
-
-typedef uint64_t Option_Foo;
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar {
-  Option_Foo foo;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Bar f);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-void extra_debug_fn(void);
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_default_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void extra_debug_fn(void);
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const struct dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-uint32_t get_x(const struct dep_struct *dep_struct);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_dep_v2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct dep_struct {
-  uint32_t x;
-  double y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-uint32_t get_x(const struct dep_struct *dep_struct);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-void extra_debug_fn(void);
-
-void cbindgen(void);
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void extra_debug_fn(void);
-
-void cbindgen(void);
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/expand_no_default_features.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/export_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/export_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/export_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/export_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void do_the_thing_with_export_name(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/export_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/export_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/export_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/export_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void do_the_thing_with_export_name(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void first(void);
-
-void second(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void first(void);
-
-void second(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct ExtType {
-  uint32_t data;
-};
-
-void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/external_workspace_child.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct ExtType {
-  uint32_t data;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void consume_ext(struct ExtType _ext);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Normal {
-  int32_t x;
-  float y;
-};
-
-extern int32_t foo(void);
-
-extern void bar(struct Normal a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/extern.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/extern.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Normal {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern int32_t foo(void);
-
-extern void bar(struct Normal a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/fns.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/fns.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/fns.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/fns.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Fns {
-  void (*noArgs)(void);
-  void (*anonymousArg)(int32_t);
-  int32_t (*returnsNumber)(void);
-  int8_t (*namedArgs)(int32_t first, int16_t snd);
-  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
-};
-
-void root(struct Fns _fns);
-
-void no_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/fns.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/fns.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/fns.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/fns.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Fns {
-  void (*noArgs)(void);
-  void (*anonymousArg)(int32_t);
-  int32_t (*returnsNumber)(void);
-  int8_t (*namedArgs)(int32_t first, int16_t snd);
-  int8_t (*namedArgsWildcards)(int32_t _, int16_t named, int64_t _1);
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Fns _fns);
-
-void no_return(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_args.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_args.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_args.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_args.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void unnamed(const uint64_t*);
-
-void pointer_test(const uint64_t *a);
-
-void print_from_rust(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_args.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_args.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_args.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_args.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void unnamed(const uint64_t*);
-
-void pointer_test(const uint64_t *a);
-
-void print_from_rust(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#ifndef NO_RETURN_ATTR
-  #ifdef __GNUC__
-    #define NO_RETURN_ATTR __attribute__ ((noreturn))
-  #else // __GNUC__
-    #define NO_RETURN_ATTR
-  #endif // __GNUC__
-#endif // NO_RETURN_ATTR
-
-
-void loop_forever(void) NO_RETURN_ATTR;
-
-uint8_t normal_return(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_noreturn.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#ifndef NO_RETURN_ATTR
-  #ifdef __GNUC__
-    #define NO_RETURN_ATTR __attribute__ ((noreturn))
-  #else // __GNUC__
-    #define NO_RETURN_ATTR
-  #endif // __GNUC__
-#endif // NO_RETURN_ATTR
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void loop_forever(void) NO_RETURN_ATTR;
-
-uint8_t normal_return(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void A(void);
-
-void B(void);
-
-void C(void);
-
-void D(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void A(void);
-
-void B(void);
-
-void C(void);
-
-void D(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void C(void);
-
-void B(void);
-
-void D(void);
-
-void A(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/function_sort_none.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void C(void);
-
-void B(void);
-
-void D(void);
-
-void A(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_____u8 {
-  uint8_t *a;
-};
-
-typedef struct Foo_____u8 Boo;
-
-void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/generic-pointer.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_____u8 {
-  uint8_t *a;
-};
-
-typedef struct Foo_____u8 Boo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Boo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_variable.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_variable.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_variable.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_variable.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-extern char MUT_GLOBAL_ARRAY[128];
-
-extern const char CONST_GLOBAL_ARRAY[128];
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_variable.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_variable.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/global_variable.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/global_variable.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern char MUT_GLOBAL_ARRAY[128];
-
-extern const char CONST_GLOBAL_ARRAY[128];
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ignore.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ignore.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ignore.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ignore.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void no_ignore_root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ignore.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ignore.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ignore.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ignore.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void no_ignore_root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_guard.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_guard.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_guard.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_guard.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-void root(void);
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_guard.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_guard.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_guard.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_guard.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_item.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_item.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_item.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_item.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  int32_t x;
-  float y;
-};
-
-struct B {
-  struct A data;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_item.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_item.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_item.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_item.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  int32_t x;
-  float y;
-};
-
-struct B {
-  struct A data;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_specific.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_specific.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_specific.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_specific.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_specific.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/include_specific.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/include_specific.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <math.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  float x;
-};
-
-void root(struct Foo a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/inner_mod.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  float x;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum OnlyThisShouldBeGenerated {
-  Foo,
-  Bar,
-};
-typedef uint8_t OnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum OnlyThisShouldBeGenerated
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-};
-#ifndef __cplusplus
-typedef uint8_t OnlyThisShouldBeGenerated;
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum StyleOnlyThisShouldBeGenerated {
-  Foo,
-  Bar,
-};
-typedef uint8_t StyleOnlyThisShouldBeGenerated;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/item_types_renamed.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum StyleOnlyThisShouldBeGenerated
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo,
-  Bar,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleOnlyThisShouldBeGenerated;
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct OpaqueAlign16Union;
-
-struct OpaqueAlign1Struct;
-
-struct OpaqueAlign1Union;
-
-struct OpaqueAlign2Struct;
-
-struct OpaqueAlign32Struct;
-
-struct OpaqueAlign4Struct;
-
-struct OpaqueAlign4Union;
-
-struct OpaqueAlign8Struct;
-
-struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_aligned_opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct OpaqueAlign16Union;
-
-struct OpaqueAlign1Struct;
-
-struct OpaqueAlign1Union;
-
-struct OpaqueAlign2Struct;
-
-struct OpaqueAlign32Struct;
-
-struct OpaqueAlign4Struct;
-
-struct OpaqueAlign4Union;
-
-struct OpaqueAlign8Struct;
-
-struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#define CBINDGEN_PACKED     __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct RustAlign4Struct;
-
-struct RustAlign4Union;
-
-struct RustPackedStruct;
-
-struct RustPackedUnion;
-
-struct UnsupportedAlign4Enum;
-
-struct UnsupportedPacked4Struct;
-
-struct UnsupportedPacked4Union;
-
-struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#define CBINDGEN_PACKED     __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n) __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct RustAlign4Struct;
-
-struct RustAlign4Union;
-
-struct RustPackedStruct;
-
-struct RustPackedUnion;
-
-struct UnsupportedAlign4Enum;
-
-struct UnsupportedPacked4Struct;
-
-struct UnsupportedPacked4Union;
-
-struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_PACKED PackedStruct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_PACKED PackedUnion {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct OpaquePackedStruct;
-
-struct OpaquePackedUnion;
-
-union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/layout_packed_opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#define CBINDGEN_PACKED        __attribute__ ((packed))
-#define CBINDGEN_ALIGNED(n)    __attribute__ ((aligned(n)))
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct OpaquePackedStruct;
-
-struct OpaquePackedUnion;
-
-union CBINDGEN_ALIGNED(1) Align1Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(4) Align4Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-union CBINDGEN_ALIGNED(16) Align16Union {
-  uintptr_t variant1;
-  uint8_t *variant2;
-};
-
-struct CBINDGEN_ALIGNED(1) Align1Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(2) Align2Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(4) Align4Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(8) Align8Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
-
-struct CBINDGEN_ALIGNED(32) Align32Struct {
-  uintptr_t arg1;
-  uint8_t *arg2;
-};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  const int32_t *data;
-};
-
-void root(struct A _a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/lifetime_arg.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  const int32_t *data;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct A _a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

struct Dummy {
  int32_t x;
  float y;
};

void root(struct Dummy d);
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_cr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

struct Dummy {
  int32_t x;
  float y;
};

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

void root(struct Dummy d);

#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Dummy {
-  int32_t x;
-  float y;
-};
-
-void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_crlf.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Dummy {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Dummy d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Dummy {
-  int32_t x;
-  float y;
-};
-
-void root(struct Dummy d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/linestyle_lf.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Dummy {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Dummy d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/literal_target.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/literal_target.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/literal_target.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/literal_target.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/literal_target.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/literal_target.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/literal_target.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/literal_target.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mangle.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mangle.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mangle.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mangle.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct FooU8 {
-  uint8_t a;
-};
-
-typedef struct FooU8 Boo;
-
-void root(Boo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mangle.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mangle.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mangle.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mangle.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct FooU8 {
-  uint8_t a;
-};
-
-typedef struct FooU8 Boo;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(Boo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using ManuallyDrop = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_ManuallyDrop_Point;
-
-typedef struct NotReprC_ManuallyDrop_Point Foo;
-
-struct Point {
-  int32_t x;
-  int32_t y;
-};
-
-struct MyStruct {
-  struct Point point;
-};
-
-void root(const Foo *a, const struct MyStruct *with_manual_drop);
-
-void take(struct Point with_manual_drop);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/manuallydrop.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using ManuallyDrop = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_ManuallyDrop_Point;
-
-typedef struct NotReprC_ManuallyDrop_Point Foo;
-
-struct Point {
-  int32_t x;
-  int32_t y;
-};
-
-struct MyStruct {
-  struct Point point;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const struct MyStruct *with_manual_drop);
-
-void take(struct Point with_manual_drop);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using MaybeUninit = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_MaybeUninit______i32;
-
-typedef struct NotReprC_MaybeUninit______i32 Foo;
-
-struct MyStruct {
-  const int32_t *number;
-};
-
-void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/maybeuninit.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#ifdef __cplusplus
-template <typename T>
-using MaybeUninit = T;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct NotReprC_MaybeUninit______i32;
-
-typedef struct NotReprC_MaybeUninit______i32 Foo;
-
-struct MyStruct {
-  const int32_t *number;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const struct MyStruct *with_maybe_uninit);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2015.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(struct ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_2018.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(struct ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(FOO)
-#define FOO 1
-#endif
-
-#if defined(BAR)
-#define BAR 2
-#endif
-
-#if defined(FOO)
-struct Foo {
-
-};
-#endif
-
-#if defined(BAR)
-struct Bar {
-
-};
-#endif
-
-#if defined(FOO)
-void foo(const struct Foo *foo);
-#endif
-
-#if defined(BAR)
-void bar(const struct Bar *bar);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_attr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#if defined(FOO)
-#define FOO 1
-#endif
-
-#if defined(BAR)
-#define BAR 2
-#endif
-
-#if defined(FOO)
-struct Foo {
-
-};
-#endif
-
-#if defined(BAR)
-struct Bar {
-
-};
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-#if defined(FOO)
-void foo(const struct Foo *foo);
-#endif
-
-#if defined(BAR)
-void bar(const struct Bar *bar);
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_path.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_path.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_path.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_path.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-void export_me(struct ExportMe *val);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_path.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_path.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/mod_path.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/mod_path.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXPORT_ME_TOO 42
-
-struct ExportMe {
-  uint64_t val;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void export_me(struct ExportMe *val);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar_Bar_f32;
-
-struct Bar_Foo_f32;
-
-struct Bar_f32;
-
-struct Foo_i32 {
-  const int32_t *data;
-};
-
-struct Foo_f32 {
-  const float *data;
-};
-
-struct Foo_Bar_f32 {
-  const struct Bar_f32 *data;
-};
-
-struct Tuple_Foo_f32_____f32 {
-  const struct Foo_f32 *a;
-  const float *b;
-};
-
-struct Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-};
-
-typedef struct Tuple_f32__f32 Indirection_f32;
-
-void root(struct Foo_i32 a,
-          struct Foo_f32 b,
-          struct Bar_f32 c,
-          struct Foo_Bar_f32 d,
-          struct Bar_Foo_f32 e,
-          struct Bar_Bar_f32 f,
-          struct Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-1.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar_Bar_f32;
-
-struct Bar_Foo_f32;
-
-struct Bar_f32;
-
-struct Foo_i32 {
-  const int32_t *data;
-};
-
-struct Foo_f32 {
-  const float *data;
-};
-
-struct Foo_Bar_f32 {
-  const struct Bar_f32 *data;
-};
-
-struct Tuple_Foo_f32_____f32 {
-  const struct Foo_f32 *a;
-  const float *b;
-};
-
-struct Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-};
-
-typedef struct Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo_i32 a,
-          struct Foo_f32 b,
-          struct Bar_f32 c,
-          struct Foo_Bar_f32 d,
-          struct Bar_Foo_f32 e,
-          struct Bar_Bar_f32 f,
-          struct Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A;
-
-struct B;
-
-struct List_A {
-  struct A *members;
-  uintptr_t count;
-};
-
-struct List_B {
-  struct B *members;
-  uintptr_t count;
-};
-
-void foo(struct List_A a);
-
-void bar(struct List_B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-2.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A;
-
-struct B;
-
-struct List_A {
-  struct A *members;
-  uintptr_t count;
-};
-
-struct List_B {
-  struct B *members;
-  uintptr_t count;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(struct List_A a);
-
-void bar(struct List_B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar_Bar_f32;
-
-struct Bar_Foo_f32;
-
-struct Bar_f32;
-
-union Foo_i32 {
-  const int32_t *data;
-};
-
-union Foo_f32 {
-  const float *data;
-};
-
-union Foo_Bar_f32 {
-  const struct Bar_f32 *data;
-};
-
-union Tuple_Foo_f32_____f32 {
-  const union Foo_f32 *a;
-  const float *b;
-};
-
-union Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-};
-
-typedef union Tuple_f32__f32 Indirection_f32;
-
-void root(union Foo_i32 a,
-          union Foo_f32 b,
-          struct Bar_f32 c,
-          union Foo_Bar_f32 d,
-          struct Bar_Foo_f32 e,
-          struct Bar_Bar_f32 f,
-          union Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/monomorph-3.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar_Bar_f32;
-
-struct Bar_Foo_f32;
-
-struct Bar_f32;
-
-union Foo_i32 {
-  const int32_t *data;
-};
-
-union Foo_f32 {
-  const float *data;
-};
-
-union Foo_Bar_f32 {
-  const struct Bar_f32 *data;
-};
-
-union Tuple_Foo_f32_____f32 {
-  const union Foo_f32 *a;
-  const float *b;
-};
-
-union Tuple_f32__f32 {
-  const float *a;
-  const float *b;
-};
-
-typedef union Tuple_f32__f32 Indirection_f32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(union Foo_i32 a,
-          union Foo_f32 b,
-          struct Bar_f32 c,
-          union Foo_Bar_f32 d,
-          struct Bar_Foo_f32 e,
-          struct Bar_Bar_f32 f,
-          union Tuple_Foo_f32_____f32 g,
-          Indirection_f32 h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/must-use.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/must-use.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/must-use.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/must-use.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag {
-  Owned_i32,
-  None_i32,
-};
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-
-struct Owned_Body_i32 {
-  int32_t *_0;
-};
-
-struct MaybeOwnedPtr_i32 {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    struct Owned_Body_i32 owned;
-  };
-};
-
-struct MUST_USE_STRUCT OwnedPtr_i32 {
-  int32_t *ptr;
-};
-
-MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/must-use.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/must-use.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/must-use.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/must-use.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum MaybeOwnedPtr_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Owned_i32,
-  None_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t MaybeOwnedPtr_i32_Tag;
-#endif // __cplusplus
-
-struct Owned_Body_i32 {
-  int32_t *_0;
-};
-
-struct MaybeOwnedPtr_i32 {
-  MaybeOwnedPtr_i32_Tag tag;
-  union {
-    struct Owned_Body_i32 owned;
-  };
-};
-
-struct MUST_USE_STRUCT OwnedPtr_i32 {
-  int32_t *ptr;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-MUST_USE_FUNC struct MaybeOwnedPtr_i32 maybe_consume(struct OwnedPtr_i32 input);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define ZOM 3.14
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespace_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace constants {
-#endif // __cplusplus
-
-#define FOO 10
-
-#define ZOM 3.14
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace constants
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define FOO 10
-
-#define ZOM 3.14
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-void root(struct Foo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/namespaces_constant.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace constants {
-namespace test {
-#endif // __cplusplus
-
-#define FOO 10
-
-#define ZOM 3.14
-
-struct Foo {
-  int32_t x[FOO];
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace test
-} // namespace constants
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nested_import.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nested_import.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nested_import.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nested_import.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nested_import.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nested_import.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nested_import.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nested_import.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/no_includes.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/no_includes.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/no_includes.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/no_includes.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/no_includes.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/no_includes.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/no_includes.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/no_includes.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-#ifdef __clang__
-#define CBINDGEN_NONNULL _Nonnull
-#else
-#define CBINDGEN_NONNULL
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct References {
-  const struct Opaque *CBINDGEN_NONNULL a;
-  struct Opaque *CBINDGEN_NONNULL b;
-  const struct Opaque *c;
-  struct Opaque *d;
-};
-
-struct Pointers_u64 {
-  float *CBINDGEN_NONNULL a;
-  uint64_t *CBINDGEN_NONNULL b;
-  struct Opaque *CBINDGEN_NONNULL c;
-  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
-  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
-  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t *CBINDGEN_NONNULL *i;
-  const uint64_t *j;
-  uint64_t *k;
-};
-
-void value_arg(struct References arg);
-
-void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
-                    struct Pointers_u64 *foo,
-                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
-
-void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void optional_ref_arg(const struct Pointers_u64 *arg);
-
-void optional_mut_ref_arg(struct Pointers_u64 *arg);
-
-void nullable_const_ptr(const struct Pointers_u64 *arg);
-
-void nullable_mut_ptr(struct Pointers_u64 *arg);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull_attribute.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-#ifdef __clang__
-#define CBINDGEN_NONNULL _Nonnull
-#else
-#define CBINDGEN_NONNULL
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct References {
-  const struct Opaque *CBINDGEN_NONNULL a;
-  struct Opaque *CBINDGEN_NONNULL b;
-  const struct Opaque *c;
-  struct Opaque *d;
-};
-
-struct Pointers_u64 {
-  float *CBINDGEN_NONNULL a;
-  uint64_t *CBINDGEN_NONNULL b;
-  struct Opaque *CBINDGEN_NONNULL c;
-  uint64_t *CBINDGEN_NONNULL *CBINDGEN_NONNULL d;
-  float *CBINDGEN_NONNULL *CBINDGEN_NONNULL e;
-  struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t *CBINDGEN_NONNULL *i;
-  const uint64_t *j;
-  uint64_t *k;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void value_arg(struct References arg);
-
-void mutltiple_args(int32_t *CBINDGEN_NONNULL arg,
-                    struct Pointers_u64 *foo,
-                    struct Opaque *CBINDGEN_NONNULL *CBINDGEN_NONNULL d);
-
-void ref_arg(const struct Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void mut_ref_arg(struct Pointers_u64 *CBINDGEN_NONNULL arg);
-
-void optional_ref_arg(const struct Pointers_u64 *arg);
-
-void optional_mut_ref_arg(struct Pointers_u64 *arg);
-
-void nullable_const_ptr(const struct Pointers_u64 *arg);
-
-void nullable_mut_ptr(struct Pointers_u64 *arg);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Foo_u64 {
-  float *a;
-  uint64_t *b;
-  struct Opaque *c;
-  uint64_t **d;
-  float **e;
-  struct Opaque **f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t **i;
-};
-
-void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/nonnull.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/nonnull.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Foo_u64 {
-  float *a;
-  uint64_t *b;
-  struct Opaque *c;
-  uint64_t **d;
-  float **e;
-  struct Opaque **f;
-  uint64_t *g;
-  int32_t *h;
-  int32_t **i;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(int32_t *arg, struct Foo_u64 *foo, struct Opaque **d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/opaque.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/opaque.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/opaque.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/opaque.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#ifdef __cplusplus
-// These could be added as opaque types I guess.
-template <typename T>
-struct BuildHasherDefault;
-
-struct DefaultHasher;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
-
-struct Result_Foo;
-
-/**
- * Fast hash map used internally.
- */
-typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
-
-typedef FastHashMap_i32__i32 Foo;
-
-typedef struct Result_Foo Bar;
-
-void root(const Foo *a, const Bar *b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/opaque.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/opaque.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/opaque.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/opaque.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#ifdef __cplusplus
-// These could be added as opaque types I guess.
-template <typename T>
-struct BuildHasherDefault;
-
-struct DefaultHasher;
-#endif
-
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher;
-
-struct Result_Foo;
-
-/**
- * Fast hash map used internally.
- */
-typedef struct HashMap_i32__i32__BuildHasherDefault_DefaultHasher FastHashMap_i32__i32;
-
-typedef FastHashMap_i32__i32 Foo;
-
-typedef struct Result_Foo Bar;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const Foo *a, const Bar *b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/pragma_once.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefix.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefix.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefix.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefix.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define PREFIX_LEN 22
-
-#define PREFIX_X (22 << 22)
-
-#define PREFIX_Y (PREFIX_X + PREFIX_X)
-
-typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
-
-typedef int32_t PREFIX_ValuedLenArray[22];
-
-enum PREFIX_AbsoluteFontWeight_Tag {
-  Weight,
-  Normal,
-  Bold,
-};
-typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
-
-struct PREFIX_Weight_Body {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-};
-
-union PREFIX_AbsoluteFontWeight {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  struct PREFIX_Weight_Body weight;
-};
-
-void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefix.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefix.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefix.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefix.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define PREFIX_LEN 22
-
-#define PREFIX_X (22 << 22)
-
-#define PREFIX_Y (PREFIX_X + PREFIX_X)
-
-typedef int32_t PREFIX_NamedLenArray[PREFIX_LEN];
-
-typedef int32_t PREFIX_ValuedLenArray[22];
-
-enum PREFIX_AbsoluteFontWeight_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Weight,
-  Normal,
-  Bold,
-};
-#ifndef __cplusplus
-typedef uint8_t PREFIX_AbsoluteFontWeight_Tag;
-#endif // __cplusplus
-
-struct PREFIX_Weight_Body {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  float _0;
-};
-
-union PREFIX_AbsoluteFontWeight {
-  PREFIX_AbsoluteFontWeight_Tag tag;
-  struct PREFIX_Weight_Body weight;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(PREFIX_NamedLenArray x, PREFIX_ValuedLenArray y, union PREFIX_AbsoluteFontWeight z);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-};
-#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
-
-#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
-
-void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-};
-#define PREFIXFoo_FOO (PREFIXFoo){ .a = 42, .b = 47 }
-
-#define PREFIXBAR (PREFIXFoo){ .a = 42, .b = 1337 }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct PREFIXFoo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct PREFIXBar {
-  int32_t a;
-};
-
-struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-  struct PREFIXBar bar;
-};
-
-#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
-
-void root(struct PREFIXFoo x);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/prefixed_struct_literal_deep.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct PREFIXBar {
-  int32_t a;
-};
-
-struct PREFIXFoo {
-  int32_t a;
-  uint32_t b;
-  struct PREFIXBar bar;
-};
-
-#define PREFIXVAL (PREFIXFoo){ .a = 42, .b = 1337, .bar = (PREFIXBar){ .a = 323 } }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct PREFIXFoo x);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void ptr_as_array(uint32_t n, const uint32_t arg[3], const uint64_t *v);
-
-void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
-
-void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
-
-void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
-
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/ptrs_as_arrays.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void ptr_as_array(uint32_t n, const uint32_t arg[3], const uint64_t *v);
-
-void ptr_as_array1(uint32_t n, const uint32_t arg[3], uint64_t v[4]);
-
-void ptr_as_array2(uint32_t n, uint32_t arg[], const uint64_t v[]);
-
-void ptr_as_array_wrong_syntax(uint32_t *arg, const uint32_t *v, const uint32_t*);
-
-void ptr_as_array_unnamed(uint32_t*, const uint32_t*);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#define VERSION 1
-
-void root(void);
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/raw_lines.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#ifndef INCLUDE_GUARD_H
-#define INCLUDE_GUARD_H
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#define VERSION 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif /* INCLUDE_GUARD_H */
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define C_H 10
-
-enum C_E {
-  x = 0,
-  y = 1,
-};
-typedef uint8_t C_E;
-
-struct C_A;
-
-struct C_C;
-
-struct C_AwesomeB {
-  int32_t x;
-  float y;
-};
-
-union C_D {
-  int32_t x;
-  float y;
-};
-
-typedef struct C_A C_F;
-
-#define C_I (intptr_t)(C_F*)10
-
-extern const int32_t G;
-
-void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define C_H 10
-
-enum C_E
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  x = 0,
-  y = 1,
-};
-#ifndef __cplusplus
-typedef uint8_t C_E;
-#endif // __cplusplus
-
-struct C_A;
-
-struct C_C;
-
-struct C_AwesomeB {
-  int32_t x;
-  float y;
-};
-
-union C_D {
-  int32_t x;
-  float y;
-};
-
-typedef struct C_A C_F;
-
-#define C_I (intptr_t)(C_F*)10
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const int32_t G;
-
-void root(const struct C_A *a, struct C_AwesomeB b, struct C_C c, union C_D d, C_E e, C_F f);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  int32_t x;
-};
-
-struct RenamedTy {
-  uint64_t y;
-};
-
-#if !defined(DEFINE_FREEBSD)
-struct NoExternTy {
-  uint8_t field;
-};
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  struct NoExternTy field;
-};
-#endif
-
-#if defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  uint64_t field;
-};
-#endif
-
-void root(struct Foo a);
-
-void renamed_func(struct RenamedTy a);
-
-void no_extern_func(struct ContainsNoExternTy a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/rename-crate.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo {
-  int32_t x;
-};
-
-struct RenamedTy {
-  uint64_t y;
-};
-
-#if !defined(DEFINE_FREEBSD)
-struct NoExternTy {
-  uint8_t field;
-};
-#endif
-
-#if !defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  struct NoExternTy field;
-};
-#endif
-
-#if defined(DEFINE_FREEBSD)
-struct ContainsNoExternTy {
-  uint64_t field;
-};
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo a);
-
-void renamed_func(struct RenamedTy a);
-
-void no_extern_func(struct ContainsNoExternTy a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct StyleA;
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-void root(const struct StyleA *a, struct B b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/renaming-overrides-prefixing.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct StyleA;
-
-struct B {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const struct StyleA *a, struct B b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/reserved.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/reserved.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/reserved.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/reserved.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  int32_t namespace_;
-  float float_;
-};
-
-struct B {
-  int32_t namespace_;
-  float float_;
-};
-
-enum C_Tag {
-  D,
-};
-typedef uint8_t C_Tag;
-
-struct D_Body {
-  int32_t namespace_;
-  float float_;
-};
-
-struct C {
-  C_Tag tag;
-  union {
-    struct D_Body d;
-  };
-};
-
-enum E_Tag {
-  Double,
-  Float,
-};
-typedef uint8_t E_Tag;
-
-struct Double_Body {
-  double _0;
-};
-
-struct Float_Body {
-  float _0;
-};
-
-struct E {
-  E_Tag tag;
-  union {
-    struct Double_Body double_;
-    struct Float_Body float_;
-  };
-};
-
-enum F_Tag {
-  double_,
-  float_,
-};
-typedef uint8_t F_Tag;
-
-struct double_Body {
-  double _0;
-};
-
-struct float_Body {
-  float _0;
-};
-
-struct F {
-  F_Tag tag;
-  union {
-    struct double_Body double_;
-    struct float_Body float_;
-  };
-};
-
-void root(struct A a,
-          struct B b,
-          struct C c,
-          struct E e,
-          struct F f,
-          int32_t namespace_,
-          float float_);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/reserved.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/reserved.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/reserved.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/reserved.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct A {
-  int32_t namespace_;
-  float float_;
-};
-
-struct B {
-  int32_t namespace_;
-  float float_;
-};
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  D,
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-struct D_Body {
-  int32_t namespace_;
-  float float_;
-};
-
-struct C {
-  C_Tag tag;
-  union {
-    struct D_Body d;
-  };
-};
-
-enum E_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Double,
-  Float,
-};
-#ifndef __cplusplus
-typedef uint8_t E_Tag;
-#endif // __cplusplus
-
-struct Double_Body {
-  double _0;
-};
-
-struct Float_Body {
-  float _0;
-};
-
-struct E {
-  E_Tag tag;
-  union {
-    struct Double_Body double_;
-    struct Float_Body float_;
-  };
-};
-
-enum F_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  double_,
-  float_,
-};
-#ifndef __cplusplus
-typedef uint8_t F_Tag;
-#endif // __cplusplus
-
-struct double_Body {
-  double _0;
-};
-
-struct float_Body {
-  float _0;
-};
-
-struct F {
-  F_Tag tag;
-  union {
-    struct double_Body double_;
-    struct float_Body float_;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct A a,
-          struct B b,
-          struct C c,
-          struct E e,
-          struct F f,
-          int32_t namespace_,
-          float float_);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/sentinel.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/sentinel.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/sentinel.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/sentinel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A {
-  A_A1,
-  A_A2,
-  A_A3,
-  /**
-   * Must be last for serialization purposes
-   */
-  A_Sentinel,
-};
-typedef uint8_t A;
-
-enum B {
-  B_B1,
-  B_B2,
-  B_B3,
-  /**
-   * Must be last for serialization purposes
-   */
-  B_Sentinel,
-};
-typedef uint8_t B;
-
-enum C_Tag {
-  C_C1,
-  C_C2,
-  C_C3,
-  /**
-   * Must be last for serialization purposes
-   */
-  C_Sentinel,
-};
-typedef uint8_t C_Tag;
-
-struct C_C1_Body {
-  C_Tag tag;
-  uint32_t a;
-};
-
-struct C_C2_Body {
-  C_Tag tag;
-  uint32_t b;
-};
-
-union C {
-  C_Tag tag;
-  struct C_C1_Body c1;
-  struct C_C2_Body c2;
-};
-
-void root(A a, B b, union C c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/sentinel.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/sentinel.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/sentinel.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/sentinel.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-enum A
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  A_A1,
-  A_A2,
-  A_A3,
-  /**
-   * Must be last for serialization purposes
-   */
-  A_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t A;
-#endif // __cplusplus
-
-enum B
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  B_B1,
-  B_B2,
-  B_B3,
-  /**
-   * Must be last for serialization purposes
-   */
-  B_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t B;
-#endif // __cplusplus
-
-enum C_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  C_C1,
-  C_C2,
-  C_C3,
-  /**
-   * Must be last for serialization purposes
-   */
-  C_Sentinel,
-};
-#ifndef __cplusplus
-typedef uint8_t C_Tag;
-#endif // __cplusplus
-
-struct C_C1_Body {
-  C_Tag tag;
-  uint32_t a;
-};
-
-struct C_C2_Body {
-  C_Tag tag;
-  uint32_t b;
-};
-
-union C {
-  C_Tag tag;
-  struct C_C1_Body c1;
-  struct C_C2_Body c2;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(A a, B b, union C c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Foo {
-  const struct Opaque *x;
-  struct Opaque *y;
-  void (*z)(void);
-};
-
-union Bar {
-  const struct Opaque *x;
-  struct Opaque *y;
-  void (*z)(void);
-};
-
-void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/simplify-option-ptr.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Foo {
-  const struct Opaque *x;
-  struct Opaque *y;
-  void (*z)(void);
-};
-
-union Bar {
-  const struct Opaque *x;
-  struct Opaque *y;
-  void (*z)(void);
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const struct Opaque *a, struct Opaque *b, struct Foo c, union Bar d);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/static.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/static.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/static.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/static.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar;
-
-struct Foo {
-
-};
-
-extern const int32_t NUMBER;
-
-extern struct Foo FOO;
-
-extern const struct Bar BAR;
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/static.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/static.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/static.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/static.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar;
-
-struct Foo {
-
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-extern const int32_t NUMBER;
-
-extern struct Foo FOO;
-
-extern const struct Bar BAR;
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/std_lib.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/std_lib.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/std_lib.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/std_lib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Option_i32;
-
-struct Result_i32__String;
-
-struct Vec_String;
-
-void root(const struct Vec_String *a,
-          const struct Option_i32 *b,
-          const struct Result_i32__String *c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/std_lib.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/std_lib.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/std_lib.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/std_lib.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Option_i32;
-
-struct Result_i32__String;
-
-struct Vec_String;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(const struct Vec_String *a,
-          const struct Option_i32 *b,
-          const struct Result_i32__String *c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Normal {
-  int32_t x;
-  float y;
-};
-
-struct NormalWithZST {
-  int32_t x;
-  float y;
-};
-
-struct TupleRenamed {
-  int32_t m0;
-  float m1;
-};
-
-struct TupleNamed {
-  int32_t x;
-  float y;
-};
-
-void root(struct Opaque *a,
-          struct Normal b,
-          struct NormalWithZST c,
-          struct TupleRenamed d,
-          struct TupleNamed e);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct Normal {
-  int32_t x;
-  float y;
-};
-
-struct NormalWithZST {
-  int32_t x;
-  float y;
-};
-
-struct TupleRenamed {
-  int32_t m0;
-  float m1;
-};
-
-struct TupleNamed {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Opaque *a,
-          struct Normal b,
-          struct NormalWithZST c,
-          struct TupleRenamed d,
-          struct TupleNamed e);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar;
-
-struct Foo {
-  int32_t a;
-  uint32_t b;
-};
-#define Foo_FOO (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
-
-
-#define BAR (Foo){ .a = 42, .b = 1337 }
-
-
-
-void root(struct Foo x, struct Bar bar);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Bar;
-
-struct Foo {
-  int32_t a;
-  uint32_t b;
-};
-#define Foo_FOO (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO2 (Foo){ .a = 42, .b = 47 }
-#define Foo_FOO3 (Foo){ .a = 42, .b = 47 }
-
-
-#define BAR (Foo){ .a = 42, .b = 1337 }
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Foo x, struct Bar bar);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct ABC {
-  float a;
-  uint32_t b;
-  uint32_t c;
-};
-#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
-
-struct BAC {
-  uint32_t b;
-  float a;
-  int32_t c;
-};
-#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
-
-void root(struct ABC a1, struct BAC a2);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_literal_order.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct ABC {
-  float a;
-  uint32_t b;
-  uint32_t c;
-};
-#define ABC_abc (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_bac (ABC){ .a = 1.0, .b = 2, .c = 3 }
-#define ABC_cba (ABC){ .a = 1.0, .b = 2, .c = 3 }
-
-struct BAC {
-  uint32_t b;
-  float a;
-  int32_t c;
-};
-#define BAC_abc (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_bac (BAC){ .b = 1, .a = 2.0, .c = 3 }
-#define BAC_cba (BAC){ .b = 1, .a = 2.0, .c = 3 }
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct ABC a1, struct BAC a2);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-struct Bar {
-  int32_t something;
-  struct Foo_Bar subexpressions;
-};
-
-void root(struct Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/struct_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/struct_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-struct Bar {
-  int32_t something;
-  struct Foo_Bar subexpressions;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/style-crash.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/style-crash.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/style-crash.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/style-crash.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/style-crash.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/style-crash.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/style-crash.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/style-crash.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/swift_name.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/swift_name.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/swift_name.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/swift_name.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct SelfTypeTestStruct {
-  uint8_t times;
-};
-
-struct PointerToOpaque {
-  struct Opaque *ptr;
-};
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void unnamed_argument(struct SelfTypeTestStruct*);
-
-void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
-
-void PointerToOpaque_sayHello(struct PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/swift_name.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/swift_name.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/swift_name.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/swift_name.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-#define CF_SWIFT_NAME(_name) __attribute__((swift_name(#_name)))
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-struct SelfTypeTestStruct {
-  uint8_t times;
-};
-
-struct PointerToOpaque {
-  struct Opaque *ptr;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void rust_print_hello_world(void) CF_SWIFT_NAME(rust_print_hello_world());
-
-void SelfTypeTestStruct_should_exist_ref(const struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref(self:));
-
-void SelfTypeTestStruct_should_exist_ref_mut(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_ref_mut(self:));
-
-void SelfTypeTestStruct_should_not_exist_box(struct SelfTypeTestStruct *self) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_box(self:));
-
-struct SelfTypeTestStruct *SelfTypeTestStruct_should_not_exist_return_box(void) CF_SWIFT_NAME(SelfTypeTestStruct.should_not_exist_return_box());
-
-void SelfTypeTestStruct_should_exist_annotated_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_self(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_self(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_annotated_mut_by_name(self:));
-
-void SelfTypeTestStruct_should_exist_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_unannotated(self:));
-
-void SelfTypeTestStruct_should_exist_mut_unannotated(struct SelfTypeTestStruct self) CF_SWIFT_NAME(SelfTypeTestStruct.should_exist_mut_unannotated(self:));
-
-void free_function_should_exist_ref(const struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref(test_struct:));
-
-void free_function_should_exist_ref_mut(struct SelfTypeTestStruct *test_struct) CF_SWIFT_NAME(free_function_should_exist_ref_mut(test_struct:));
-
-void unnamed_argument(struct SelfTypeTestStruct*);
-
-void free_function_should_not_exist_box(struct SelfTypeTestStruct *boxed) CF_SWIFT_NAME(free_function_should_not_exist_box(boxed:));
-
-void free_function_should_exist_annotated_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_by_name(test_struct:));
-
-void free_function_should_exist_annotated_mut_by_name(struct SelfTypeTestStruct test_struct) CF_SWIFT_NAME(free_function_should_exist_annotated_mut_by_name(test_struct:));
-
-struct PointerToOpaque PointerToOpaque_create(uint8_t times) CF_SWIFT_NAME(PointerToOpaque.create(times:));
-
-void PointerToOpaque_sayHello(struct PointerToOpaque self)
-/*a comment!*/ CF_SWIFT_NAME(PointerToOpaque.sayHello(self:));
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transform-op.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transform-op.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transform-op.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transform-op.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct StylePoint_i32 {
-  int32_t x;
-  int32_t y;
-};
-
-struct StylePoint_f32 {
-  float x;
-  float y;
-};
-
-enum StyleFoo_i32_Tag {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-typedef uint8_t StyleFoo_i32_Tag;
-
-struct StyleFoo_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  struct StylePoint_i32 y;
-  struct StylePoint_f32 z;
-};
-
-struct StyleBar_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-};
-
-struct StyleBaz_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  struct StylePoint_i32 _0;
-};
-
-union StyleFoo_i32 {
-  StyleFoo_i32_Tag tag;
-  struct StyleFoo_Body_i32 foo;
-  struct StyleBar_Body_i32 bar;
-  struct StyleBaz_Body_i32 baz;
-};
-
-enum StyleBar_i32_Tag {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-};
-
-struct StyleBar1_Body_i32 {
-  int32_t x;
-  struct StylePoint_i32 y;
-  struct StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-};
-
-struct StyleBar2_Body_i32 {
-  int32_t _0;
-};
-
-struct StyleBar3_Body_i32 {
-  struct StylePoint_i32 _0;
-};
-
-struct StyleBar_i32 {
-  enum StyleBar_i32_Tag tag;
-  union {
-    struct StyleBar1_Body_i32 bar1;
-    struct StyleBar2_Body_i32 bar2;
-    struct StyleBar3_Body_i32 bar3;
-  };
-};
-
-struct StylePoint_u32 {
-  uint32_t x;
-  uint32_t y;
-};
-
-enum StyleBar_u32_Tag {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-};
-
-struct StyleBar1_Body_u32 {
-  int32_t x;
-  struct StylePoint_u32 y;
-  struct StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-};
-
-struct StyleBar2_Body_u32 {
-  uint32_t _0;
-};
-
-struct StyleBar3_Body_u32 {
-  struct StylePoint_u32 _0;
-};
-
-struct StyleBar_u32 {
-  enum StyleBar_u32_Tag tag;
-  union {
-    struct StyleBar1_Body_u32 bar1;
-    struct StyleBar2_Body_u32 bar2;
-    struct StyleBar3_Body_u32 bar3;
-  };
-};
-
-enum StyleBaz_Tag {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-typedef uint8_t StyleBaz_Tag;
-
-struct StyleBaz1_Body {
-  StyleBaz_Tag tag;
-  struct StyleBar_u32 _0;
-};
-
-struct StyleBaz2_Body {
-  StyleBaz_Tag tag;
-  struct StylePoint_i32 _0;
-};
-
-union StyleBaz {
-  StyleBaz_Tag tag;
-  struct StyleBaz1_Body baz1;
-  struct StyleBaz2_Body baz2;
-};
-
-enum StyleTaz_Tag {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-typedef uint8_t StyleTaz_Tag;
-
-struct StyleTaz1_Body {
-  struct StyleBar_u32 _0;
-};
-
-struct StyleTaz2_Body {
-  union StyleBaz _0;
-};
-
-struct StyleTaz {
-  StyleTaz_Tag tag;
-  union {
-    struct StyleTaz1_Body taz1;
-    struct StyleTaz2_Body taz2;
-  };
-};
-
-void foo(const union StyleFoo_i32 *foo,
-         const struct StyleBar_i32 *bar,
-         const union StyleBaz *baz,
-         const struct StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transform-op.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transform-op.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transform-op.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transform-op.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct StylePoint_i32 {
-  int32_t x;
-  int32_t y;
-};
-
-struct StylePoint_f32 {
-  float x;
-  float y;
-};
-
-enum StyleFoo_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleFoo_i32_Tag;
-#endif // __cplusplus
-
-struct StyleFoo_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  struct StylePoint_i32 y;
-  struct StylePoint_f32 z;
-};
-
-struct StyleBar_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-};
-
-struct StyleBaz_Body_i32 {
-  StyleFoo_i32_Tag tag;
-  struct StylePoint_i32 _0;
-};
-
-union StyleFoo_i32 {
-  StyleFoo_i32_Tag tag;
-  struct StyleFoo_Body_i32 foo;
-  struct StyleBar_Body_i32 bar;
-  struct StyleBaz_Body_i32 baz;
-};
-
-enum StyleBar_i32_Tag {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-};
-
-struct StyleBar1_Body_i32 {
-  int32_t x;
-  struct StylePoint_i32 y;
-  struct StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-};
-
-struct StyleBar2_Body_i32 {
-  int32_t _0;
-};
-
-struct StyleBar3_Body_i32 {
-  struct StylePoint_i32 _0;
-};
-
-struct StyleBar_i32 {
-  enum StyleBar_i32_Tag tag;
-  union {
-    struct StyleBar1_Body_i32 bar1;
-    struct StyleBar2_Body_i32 bar2;
-    struct StyleBar3_Body_i32 bar3;
-  };
-};
-
-struct StylePoint_u32 {
-  uint32_t x;
-  uint32_t y;
-};
-
-enum StyleBar_u32_Tag {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-};
-
-struct StyleBar1_Body_u32 {
-  int32_t x;
-  struct StylePoint_u32 y;
-  struct StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-};
-
-struct StyleBar2_Body_u32 {
-  uint32_t _0;
-};
-
-struct StyleBar3_Body_u32 {
-  struct StylePoint_u32 _0;
-};
-
-struct StyleBar_u32 {
-  enum StyleBar_u32_Tag tag;
-  union {
-    struct StyleBar1_Body_u32 bar1;
-    struct StyleBar2_Body_u32 bar2;
-    struct StyleBar3_Body_u32 bar3;
-  };
-};
-
-enum StyleBaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleBaz_Tag;
-#endif // __cplusplus
-
-struct StyleBaz1_Body {
-  StyleBaz_Tag tag;
-  struct StyleBar_u32 _0;
-};
-
-struct StyleBaz2_Body {
-  StyleBaz_Tag tag;
-  struct StylePoint_i32 _0;
-};
-
-union StyleBaz {
-  StyleBaz_Tag tag;
-  struct StyleBaz1_Body baz1;
-  struct StyleBaz2_Body baz2;
-};
-
-enum StyleTaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleTaz_Tag;
-#endif // __cplusplus
-
-struct StyleTaz1_Body {
-  struct StyleBar_u32 _0;
-};
-
-struct StyleTaz2_Body {
-  union StyleBaz _0;
-};
-
-struct StyleTaz {
-  StyleTaz_Tag tag;
-  union {
-    struct StyleTaz1_Body taz1;
-    struct StyleTaz2_Body taz2;
-  };
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(const union StyleFoo_i32 *foo,
-         const struct StyleBar_i32 *bar,
-         const union StyleBaz *baz,
-         const struct StyleTaz *taz);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transparent.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transparent.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transparent.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transparent.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct DummyStruct;
-
-struct EnumWithAssociatedConstantInImpl;
-
-typedef struct DummyStruct TransparentComplexWrappingStructTuple;
-
-typedef uint32_t TransparentPrimitiveWrappingStructTuple;
-
-typedef struct DummyStruct TransparentComplexWrappingStructure;
-
-typedef uint32_t TransparentPrimitiveWrappingStructure;
-
-typedef struct DummyStruct TransparentComplexWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
-#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
-#define TransparentPrimitiveWithAssociatedConstants_ONE 1
-
-#define EnumWithAssociatedConstantInImpl_TEN 10
-
-void root(TransparentComplexWrappingStructTuple a,
-          TransparentPrimitiveWrappingStructTuple b,
-          TransparentComplexWrappingStructure c,
-          TransparentPrimitiveWrappingStructure d,
-          TransparentComplexWrapper_i32 e,
-          TransparentPrimitiveWrapper_i32 f,
-          TransparentPrimitiveWithAssociatedConstants g,
-          struct EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transparent.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transparent.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/transparent.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/transparent.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct DummyStruct;
-
-struct EnumWithAssociatedConstantInImpl;
-
-typedef struct DummyStruct TransparentComplexWrappingStructTuple;
-
-typedef uint32_t TransparentPrimitiveWrappingStructTuple;
-
-typedef struct DummyStruct TransparentComplexWrappingStructure;
-
-typedef uint32_t TransparentPrimitiveWrappingStructure;
-
-typedef struct DummyStruct TransparentComplexWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWrapper_i32;
-
-typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
-#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
-#define TransparentPrimitiveWithAssociatedConstants_ONE 1
-
-#define EnumWithAssociatedConstantInImpl_TEN 10
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(TransparentComplexWrappingStructTuple a,
-          TransparentPrimitiveWrappingStructTuple b,
-          TransparentComplexWrappingStructure c,
-          TransparentPrimitiveWrappingStructure d,
-          TransparentComplexWrapper_i32 e,
-          TransparentPrimitiveWrapper_i32 f,
-          TransparentPrimitiveWithAssociatedConstants g,
-          struct EnumWithAssociatedConstantInImpl h);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/typedef.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/typedef.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/typedef.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/typedef.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_i32__i32 {
-  int32_t x;
-  int32_t y;
-};
-
-typedef struct Foo_i32__i32 IntFoo_i32;
-
-void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/typedef.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/typedef.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/typedef.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/typedef.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_i32__i32 {
-  int32_t x;
-  int32_t y;
-};
-
-typedef struct Foo_i32__i32 IntFoo_i32;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(IntFoo_i32 a);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-union Normal {
-  int32_t x;
-  float y;
-};
-
-union NormalWithZST {
-  int32_t x;
-  float y;
-};
-
-void root(struct Opaque *a, union Normal b, union NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Opaque;
-
-union Normal {
-  int32_t x;
-  float y;
-};
-
-union NormalWithZST {
-  int32_t x;
-  float y;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(struct Opaque *a, union Normal b, union NormalWithZST c);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union_self.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union_self.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union_self.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union_self.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-union Bar {
-  int32_t something;
-  struct Foo_Bar subexpressions;
-};
-
-void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union_self.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union_self.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/union_self.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/union_self.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-struct Foo_Bar {
-  const int32_t *something;
-};
-
-union Bar {
-  int32_t something;
-  struct Foo_Bar subexpressions;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(union Bar b);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-void root(void);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/using_namespaces.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-namespace root {
-#endif // __cplusplus
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void root(void);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#ifdef __cplusplus
-} // namespace root
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/va_list.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/va_list.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/va_list.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/va_list.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-int32_t va_list_test(va_list ap);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/va_list.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/va_list.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/va_list.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/va_list.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-int32_t va_list_test(va_list ap);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/workspace.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/workspace.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/workspace.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/workspace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXT_CONST 0
-
-struct ExtType {
-  uint32_t data;
-};
-
-void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/workspace.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/workspace.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/tag/workspace.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/tag/workspace.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#define EXT_CONST 0
-
-struct ExtType {
-  uint32_t data;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void consume_ext(struct ExtType _ext);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,144 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StylePoint_i32 {
+  int32_t x;
+  int32_t y;
+} StylePoint_i32;
+
+typedef struct StylePoint_f32 {
+  float x;
+  float y;
+} StylePoint_f32;
+
+enum StyleFoo_i32_Tag {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+typedef uint8_t StyleFoo_i32_Tag;
+
+typedef struct StyleFoo_Body_i32 {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+} StyleFoo_Body_i32;
+
+typedef union StyleFoo_i32 {
+  StyleFoo_i32_Tag tag;
+  StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    struct StylePoint_i32 baz;
+  };
+} StyleFoo_i32;
+
+typedef enum StyleBar_i32_Tag {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+} StyleBar_i32_Tag;
+
+typedef struct StyleBar1_Body_i32 {
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_i32;
+
+typedef struct StyleBar_i32 {
+  StyleBar_i32_Tag tag;
+  union {
+    StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      struct StylePoint_i32 bar3;
+    };
+  };
+} StyleBar_i32;
+
+typedef struct StylePoint_u32 {
+  uint32_t x;
+  uint32_t y;
+} StylePoint_u32;
+
+typedef enum StyleBar_u32_Tag {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+} StyleBar_u32_Tag;
+
+typedef struct StyleBar1_Body_u32 {
+  int32_t x;
+  struct StylePoint_u32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_u32;
+
+typedef struct StyleBar_u32 {
+  StyleBar_u32_Tag tag;
+  union {
+    StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      struct StylePoint_u32 bar3;
+    };
+  };
+} StyleBar_u32;
+
+enum StyleBaz_Tag {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+typedef uint8_t StyleBaz_Tag;
+
+typedef union StyleBaz {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    struct StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    struct StylePoint_i32 baz2;
+  };
+} StyleBaz;
+
+enum StyleTaz_Tag {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+typedef uint8_t StyleTaz_Tag;
+
+typedef struct StyleTaz {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      struct StyleBar_u32 taz1;
+    };
+    struct {
+      union StyleBaz taz2;
+    };
+  };
+} StyleTaz;
+
+void foo(const union StyleFoo_i32 *foo,
+         const struct StyleBar_i32 *bar,
+         const union StyleBaz *baz,
+         const struct StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,170 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct StylePoint_i32 {
+  int32_t x;
+  int32_t y;
+} StylePoint_i32;
+
+typedef struct StylePoint_f32 {
+  float x;
+  float y;
+} StylePoint_f32;
+
+enum StyleFoo_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleFoo_i32_Tag;
+#endif // __cplusplus
+
+typedef struct StyleFoo_Body_i32 {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+} StyleFoo_Body_i32;
+
+typedef union StyleFoo_i32 {
+  StyleFoo_i32_Tag tag;
+  StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    struct StylePoint_i32 baz;
+  };
+} StyleFoo_i32;
+
+typedef enum StyleBar_i32_Tag {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+} StyleBar_i32_Tag;
+
+typedef struct StyleBar1_Body_i32 {
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_i32;
+
+typedef struct StyleBar_i32 {
+  StyleBar_i32_Tag tag;
+  union {
+    StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      struct StylePoint_i32 bar3;
+    };
+  };
+} StyleBar_i32;
+
+typedef struct StylePoint_u32 {
+  uint32_t x;
+  uint32_t y;
+} StylePoint_u32;
+
+typedef enum StyleBar_u32_Tag {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+} StyleBar_u32_Tag;
+
+typedef struct StyleBar1_Body_u32 {
+  int32_t x;
+  struct StylePoint_u32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_u32;
+
+typedef struct StyleBar_u32 {
+  StyleBar_u32_Tag tag;
+  union {
+    StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      struct StylePoint_u32 bar3;
+    };
+  };
+} StyleBar_u32;
+
+enum StyleBaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleBaz_Tag;
+#endif // __cplusplus
+
+typedef union StyleBaz {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    struct StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    struct StylePoint_i32 baz2;
+  };
+} StyleBaz;
+
+enum StyleTaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleTaz_Tag;
+#endif // __cplusplus
+
+typedef struct StyleTaz {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      struct StyleBar_u32 taz1;
+    };
+    struct {
+      union StyleBaz taz2;
+    };
+  };
+} StyleTaz;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(const union StyleFoo_i32 *foo,
+         const struct StyleBar_i32 *bar,
+         const union StyleBaz *baz,
+         const struct StyleTaz *taz);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,144 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  int32_t x;
+  int32_t y;
+} StylePoint_i32;
+
+typedef struct {
+  float x;
+  float y;
+} StylePoint_f32;
+
+enum StyleFoo_i32_Tag {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+typedef uint8_t StyleFoo_i32_Tag;
+
+typedef struct {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  StylePoint_i32 y;
+  StylePoint_f32 z;
+} StyleFoo_Body_i32;
+
+typedef union {
+  StyleFoo_i32_Tag tag;
+  StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    StylePoint_i32 baz;
+  };
+} StyleFoo_i32;
+
+typedef enum {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+} StyleBar_i32_Tag;
+
+typedef struct {
+  int32_t x;
+  StylePoint_i32 y;
+  StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_i32;
+
+typedef struct {
+  StyleBar_i32_Tag tag;
+  union {
+    StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      StylePoint_i32 bar3;
+    };
+  };
+} StyleBar_i32;
+
+typedef struct {
+  uint32_t x;
+  uint32_t y;
+} StylePoint_u32;
+
+typedef enum {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+} StyleBar_u32_Tag;
+
+typedef struct {
+  int32_t x;
+  StylePoint_u32 y;
+  StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_u32;
+
+typedef struct {
+  StyleBar_u32_Tag tag;
+  union {
+    StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      StylePoint_u32 bar3;
+    };
+  };
+} StyleBar_u32;
+
+enum StyleBaz_Tag {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+typedef uint8_t StyleBaz_Tag;
+
+typedef union {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    StylePoint_i32 baz2;
+  };
+} StyleBaz;
+
+enum StyleTaz_Tag {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+typedef uint8_t StyleTaz_Tag;
+
+typedef struct {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      StyleBar_u32 taz1;
+    };
+    struct {
+      StyleBaz taz2;
+    };
+  };
+} StyleTaz;
+
+void foo(const StyleFoo_i32 *foo,
+         const StyleBar_i32 *bar,
+         const StyleBaz *baz,
+         const StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  int32_t x;
-  int32_t y;
-} StylePoint_i32;
-
-typedef struct {
-  float x;
-  float y;
-} StylePoint_f32;
-
-enum StyleFoo_i32_Tag {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-typedef uint8_t StyleFoo_i32_Tag;
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-} StyleFoo_Body_i32;
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-} StyleBar_Body_i32;
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz_Body_i32;
-
-typedef union {
-  StyleFoo_i32_Tag tag;
-  StyleFoo_Body_i32 foo;
-  StyleBar_Body_i32 bar;
-  StyleBaz_Body_i32 baz;
-} StyleFoo_i32;
-
-typedef enum {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-} StyleBar_i32_Tag;
-
-typedef struct {
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_i32;
-
-typedef struct {
-  int32_t _0;
-} StyleBar2_Body_i32;
-
-typedef struct {
-  StylePoint_i32 _0;
-} StyleBar3_Body_i32;
-
-typedef struct {
-  StyleBar_i32_Tag tag;
-  union {
-    StyleBar1_Body_i32 bar1;
-    StyleBar2_Body_i32 bar2;
-    StyleBar3_Body_i32 bar3;
-  };
-} StyleBar_i32;
-
-typedef struct {
-  uint32_t x;
-  uint32_t y;
-} StylePoint_u32;
-
-typedef enum {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-} StyleBar_u32_Tag;
-
-typedef struct {
-  int32_t x;
-  StylePoint_u32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_u32;
-
-typedef struct {
-  uint32_t _0;
-} StyleBar2_Body_u32;
-
-typedef struct {
-  StylePoint_u32 _0;
-} StyleBar3_Body_u32;
-
-typedef struct {
-  StyleBar_u32_Tag tag;
-  union {
-    StyleBar1_Body_u32 bar1;
-    StyleBar2_Body_u32 bar2;
-    StyleBar3_Body_u32 bar3;
-  };
-} StyleBar_u32;
-
-enum StyleBaz_Tag {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-typedef uint8_t StyleBaz_Tag;
-
-typedef struct {
-  StyleBaz_Tag tag;
-  StyleBar_u32 _0;
-} StyleBaz1_Body;
-
-typedef struct {
-  StyleBaz_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz2_Body;
-
-typedef union {
-  StyleBaz_Tag tag;
-  StyleBaz1_Body baz1;
-  StyleBaz2_Body baz2;
-} StyleBaz;
-
-enum StyleTaz_Tag {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-typedef uint8_t StyleTaz_Tag;
-
-typedef struct {
-  StyleBar_u32 _0;
-} StyleTaz1_Body;
-
-typedef struct {
-  StyleBaz _0;
-} StyleTaz2_Body;
-
-typedef struct {
-  StyleTaz_Tag tag;
-  union {
-    StyleTaz1_Body taz1;
-    StyleTaz2_Body taz2;
-  };
-} StyleTaz;
-
-void foo(const StyleFoo_i32 *foo,
-         const StyleBar_i32 *bar,
-         const StyleBaz *baz,
-         const StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,170 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  int32_t x;
+  int32_t y;
+} StylePoint_i32;
+
+typedef struct {
+  float x;
+  float y;
+} StylePoint_f32;
+
+enum StyleFoo_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleFoo_i32_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  StylePoint_i32 y;
+  StylePoint_f32 z;
+} StyleFoo_Body_i32;
+
+typedef union {
+  StyleFoo_i32_Tag tag;
+  StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    StylePoint_i32 baz;
+  };
+} StyleFoo_i32;
+
+typedef enum {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+} StyleBar_i32_Tag;
+
+typedef struct {
+  int32_t x;
+  StylePoint_i32 y;
+  StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_i32;
+
+typedef struct {
+  StyleBar_i32_Tag tag;
+  union {
+    StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      StylePoint_i32 bar3;
+    };
+  };
+} StyleBar_i32;
+
+typedef struct {
+  uint32_t x;
+  uint32_t y;
+} StylePoint_u32;
+
+typedef enum {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+} StyleBar_u32_Tag;
+
+typedef struct {
+  int32_t x;
+  StylePoint_u32 y;
+  StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+} StyleBar1_Body_u32;
+
+typedef struct {
+  StyleBar_u32_Tag tag;
+  union {
+    StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      StylePoint_u32 bar3;
+    };
+  };
+} StyleBar_u32;
+
+enum StyleBaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleBaz_Tag;
+#endif // __cplusplus
+
+typedef union {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    StylePoint_i32 baz2;
+  };
+} StyleBaz;
+
+enum StyleTaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleTaz_Tag;
+#endif // __cplusplus
+
+typedef struct {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      StyleBar_u32 taz1;
+    };
+    struct {
+      StyleBaz taz2;
+    };
+  };
+} StyleTaz;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(const StyleFoo_i32 *foo,
+         const StyleBar_i32 *bar,
+         const StyleBaz *baz,
+         const StyleTaz *taz);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.compat.c	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.compat.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-typedef struct {
-  int32_t x;
-  int32_t y;
-} StylePoint_i32;
-
-typedef struct {
-  float x;
-  float y;
-} StylePoint_f32;
-
-enum StyleFoo_i32_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Foo_i32,
-  Bar_i32,
-  Baz_i32,
-  Bazz_i32,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleFoo_i32_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-} StyleFoo_Body_i32;
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  int32_t _0;
-} StyleBar_Body_i32;
-
-typedef struct {
-  StyleFoo_i32_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz_Body_i32;
-
-typedef union {
-  StyleFoo_i32_Tag tag;
-  StyleFoo_Body_i32 foo;
-  StyleBar_Body_i32 bar;
-  StyleBaz_Body_i32 baz;
-} StyleFoo_i32;
-
-typedef enum {
-  Bar1_i32,
-  Bar2_i32,
-  Bar3_i32,
-  Bar4_i32,
-} StyleBar_i32_Tag;
-
-typedef struct {
-  int32_t x;
-  StylePoint_i32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_i32;
-
-typedef struct {
-  int32_t _0;
-} StyleBar2_Body_i32;
-
-typedef struct {
-  StylePoint_i32 _0;
-} StyleBar3_Body_i32;
-
-typedef struct {
-  StyleBar_i32_Tag tag;
-  union {
-    StyleBar1_Body_i32 bar1;
-    StyleBar2_Body_i32 bar2;
-    StyleBar3_Body_i32 bar3;
-  };
-} StyleBar_i32;
-
-typedef struct {
-  uint32_t x;
-  uint32_t y;
-} StylePoint_u32;
-
-typedef enum {
-  Bar1_u32,
-  Bar2_u32,
-  Bar3_u32,
-  Bar4_u32,
-} StyleBar_u32_Tag;
-
-typedef struct {
-  int32_t x;
-  StylePoint_u32 y;
-  StylePoint_f32 z;
-  int32_t (*u)(int32_t);
-} StyleBar1_Body_u32;
-
-typedef struct {
-  uint32_t _0;
-} StyleBar2_Body_u32;
-
-typedef struct {
-  StylePoint_u32 _0;
-} StyleBar3_Body_u32;
-
-typedef struct {
-  StyleBar_u32_Tag tag;
-  union {
-    StyleBar1_Body_u32 bar1;
-    StyleBar2_Body_u32 bar2;
-    StyleBar3_Body_u32 bar3;
-  };
-} StyleBar_u32;
-
-enum StyleBaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Baz1,
-  Baz2,
-  Baz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleBaz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  StyleBaz_Tag tag;
-  StyleBar_u32 _0;
-} StyleBaz1_Body;
-
-typedef struct {
-  StyleBaz_Tag tag;
-  StylePoint_i32 _0;
-} StyleBaz2_Body;
-
-typedef union {
-  StyleBaz_Tag tag;
-  StyleBaz1_Body baz1;
-  StyleBaz2_Body baz2;
-} StyleBaz;
-
-enum StyleTaz_Tag
-#ifdef __cplusplus
-  : uint8_t
-#endif // __cplusplus
- {
-  Taz1,
-  Taz2,
-  Taz3,
-};
-#ifndef __cplusplus
-typedef uint8_t StyleTaz_Tag;
-#endif // __cplusplus
-
-typedef struct {
-  StyleBar_u32 _0;
-} StyleTaz1_Body;
-
-typedef struct {
-  StyleBaz _0;
-} StyleTaz2_Body;
-
-typedef struct {
-  StyleTaz_Tag tag;
-  union {
-    StyleTaz1_Body taz1;
-    StyleTaz2_Body taz2;
-  };
-} StyleTaz;
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-void foo(const StyleFoo_i32 *foo,
-         const StyleBar_i32 *bar,
-         const StyleBaz *baz,
-         const StyleTaz *taz);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.cpp	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,393 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+#include <cassert>
+
+template<typename T>
+struct StylePoint {
+  T x;
+  T y;
+};
+
+template<typename T>
+union StyleFoo {
+  enum class Tag : uint8_t {
+    Foo,
+    Bar,
+    Baz,
+    Bazz,
+  };
+
+  struct Foo_Body {
+    Tag tag;
+    int32_t x;
+    StylePoint<T> y;
+    StylePoint<float> z;
+  };
+
+  struct Bar_Body {
+    Tag tag;
+    T _0;
+  };
+
+  struct Baz_Body {
+    Tag tag;
+    StylePoint<T> _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Foo_Body foo;
+  Bar_Body bar;
+  Baz_Body baz;
+
+  static StyleFoo Foo(const int32_t &x,
+                      const StylePoint<T> &y,
+                      const StylePoint<float> &z) {
+    StyleFoo result;
+    ::new (&result.foo.x) (int32_t)(x);
+    ::new (&result.foo.y) (StylePoint<T>)(y);
+    ::new (&result.foo.z) (StylePoint<float>)(z);
+    result.tag = Tag::Foo;
+    return result;
+  }
+
+  bool IsFoo() const {
+    return tag == Tag::Foo;
+  }
+
+  const Foo_Body& AsFoo() const {
+    assert(IsFoo());
+    return foo;
+  }
+
+  Foo_Body& AsFoo() {
+    assert(IsFoo());
+    return foo;
+  }
+
+  static StyleFoo Bar(const T &_0) {
+    StyleFoo result;
+    ::new (&result.bar._0) (T)(_0);
+    result.tag = Tag::Bar;
+    return result;
+  }
+
+  bool IsBar() const {
+    return tag == Tag::Bar;
+  }
+
+  const T& AsBar() const {
+    assert(IsBar());
+    return bar._0;
+  }
+
+  T& AsBar() {
+    assert(IsBar());
+    return bar._0;
+  }
+
+  static StyleFoo Baz(const StylePoint<T> &_0) {
+    StyleFoo result;
+    ::new (&result.baz._0) (StylePoint<T>)(_0);
+    result.tag = Tag::Baz;
+    return result;
+  }
+
+  bool IsBaz() const {
+    return tag == Tag::Baz;
+  }
+
+  const StylePoint<T>& AsBaz() const {
+    assert(IsBaz());
+    return baz._0;
+  }
+
+  StylePoint<T>& AsBaz() {
+    assert(IsBaz());
+    return baz._0;
+  }
+
+  static StyleFoo Bazz() {
+    StyleFoo result;
+    result.tag = Tag::Bazz;
+    return result;
+  }
+
+  bool IsBazz() const {
+    return tag == Tag::Bazz;
+  }
+};
+
+template<typename T>
+struct StyleBar {
+  enum class Tag {
+    Bar1,
+    Bar2,
+    Bar3,
+    Bar4,
+  };
+
+  struct StyleBar1_Body {
+    int32_t x;
+    StylePoint<T> y;
+    StylePoint<float> z;
+    int32_t (*u)(int32_t);
+  };
+
+  struct StyleBar2_Body {
+    T _0;
+  };
+
+  struct StyleBar3_Body {
+    StylePoint<T> _0;
+  };
+
+  Tag tag;
+  union {
+    StyleBar1_Body bar1;
+    StyleBar2_Body bar2;
+    StyleBar3_Body bar3;
+  };
+
+  static StyleBar Bar1(const int32_t &x,
+                       const StylePoint<T> &y,
+                       const StylePoint<float> &z,
+                       int32_t (*&u)(int32_t)) {
+    StyleBar result;
+    ::new (&result.bar1.x) (int32_t)(x);
+    ::new (&result.bar1.y) (StylePoint<T>)(y);
+    ::new (&result.bar1.z) (StylePoint<float>)(z);
+    ::new (&result.bar1.u) (int32_t(*)(int32_t))(u);
+    result.tag = Tag::Bar1;
+    return result;
+  }
+
+  bool IsBar1() const {
+    return tag == Tag::Bar1;
+  }
+
+  const StyleBar1_Body& AsBar1() const {
+    assert(IsBar1());
+    return bar1;
+  }
+
+  StyleBar1_Body& AsBar1() {
+    assert(IsBar1());
+    return bar1;
+  }
+
+  static StyleBar Bar2(const T &_0) {
+    StyleBar result;
+    ::new (&result.bar2._0) (T)(_0);
+    result.tag = Tag::Bar2;
+    return result;
+  }
+
+  bool IsBar2() const {
+    return tag == Tag::Bar2;
+  }
+
+  const T& AsBar2() const {
+    assert(IsBar2());
+    return bar2._0;
+  }
+
+  T& AsBar2() {
+    assert(IsBar2());
+    return bar2._0;
+  }
+
+  static StyleBar Bar3(const StylePoint<T> &_0) {
+    StyleBar result;
+    ::new (&result.bar3._0) (StylePoint<T>)(_0);
+    result.tag = Tag::Bar3;
+    return result;
+  }
+
+  bool IsBar3() const {
+    return tag == Tag::Bar3;
+  }
+
+  const StylePoint<T>& AsBar3() const {
+    assert(IsBar3());
+    return bar3._0;
+  }
+
+  StylePoint<T>& AsBar3() {
+    assert(IsBar3());
+    return bar3._0;
+  }
+
+  static StyleBar Bar4() {
+    StyleBar result;
+    result.tag = Tag::Bar4;
+    return result;
+  }
+
+  bool IsBar4() const {
+    return tag == Tag::Bar4;
+  }
+};
+
+union StyleBaz {
+  enum class Tag : uint8_t {
+    Baz1,
+    Baz2,
+    Baz3,
+  };
+
+  struct Baz1_Body {
+    Tag tag;
+    StyleBar<uint32_t> _0;
+  };
+
+  struct Baz2_Body {
+    Tag tag;
+    StylePoint<int32_t> _0;
+  };
+
+  struct {
+    Tag tag;
+  };
+  Baz1_Body baz1;
+  Baz2_Body baz2;
+
+  static StyleBaz Baz1(const StyleBar<uint32_t> &_0) {
+    StyleBaz result;
+    ::new (&result.baz1._0) (StyleBar<uint32_t>)(_0);
+    result.tag = Tag::Baz1;
+    return result;
+  }
+
+  bool IsBaz1() const {
+    return tag == Tag::Baz1;
+  }
+
+  const StyleBar<uint32_t>& AsBaz1() const {
+    assert(IsBaz1());
+    return baz1._0;
+  }
+
+  StyleBar<uint32_t>& AsBaz1() {
+    assert(IsBaz1());
+    return baz1._0;
+  }
+
+  static StyleBaz Baz2(const StylePoint<int32_t> &_0) {
+    StyleBaz result;
+    ::new (&result.baz2._0) (StylePoint<int32_t>)(_0);
+    result.tag = Tag::Baz2;
+    return result;
+  }
+
+  bool IsBaz2() const {
+    return tag == Tag::Baz2;
+  }
+
+  const StylePoint<int32_t>& AsBaz2() const {
+    assert(IsBaz2());
+    return baz2._0;
+  }
+
+  StylePoint<int32_t>& AsBaz2() {
+    assert(IsBaz2());
+    return baz2._0;
+  }
+
+  static StyleBaz Baz3() {
+    StyleBaz result;
+    result.tag = Tag::Baz3;
+    return result;
+  }
+
+  bool IsBaz3() const {
+    return tag == Tag::Baz3;
+  }
+};
+
+struct StyleTaz {
+  enum class Tag : uint8_t {
+    Taz1,
+    Taz2,
+    Taz3,
+  };
+
+  struct StyleTaz1_Body {
+    StyleBar<uint32_t> _0;
+  };
+
+  struct StyleTaz2_Body {
+    StyleBaz _0;
+  };
+
+  Tag tag;
+  union {
+    StyleTaz1_Body taz1;
+    StyleTaz2_Body taz2;
+  };
+
+  static StyleTaz Taz1(const StyleBar<uint32_t> &_0) {
+    StyleTaz result;
+    ::new (&result.taz1._0) (StyleBar<uint32_t>)(_0);
+    result.tag = Tag::Taz1;
+    return result;
+  }
+
+  bool IsTaz1() const {
+    return tag == Tag::Taz1;
+  }
+
+  const StyleBar<uint32_t>& AsTaz1() const {
+    assert(IsTaz1());
+    return taz1._0;
+  }
+
+  StyleBar<uint32_t>& AsTaz1() {
+    assert(IsTaz1());
+    return taz1._0;
+  }
+
+  static StyleTaz Taz2(const StyleBaz &_0) {
+    StyleTaz result;
+    ::new (&result.taz2._0) (StyleBaz)(_0);
+    result.tag = Tag::Taz2;
+    return result;
+  }
+
+  bool IsTaz2() const {
+    return tag == Tag::Taz2;
+  }
+
+  const StyleBaz& AsTaz2() const {
+    assert(IsTaz2());
+    return taz2._0;
+  }
+
+  StyleBaz& AsTaz2() {
+    assert(IsTaz2());
+    return taz2._0;
+  }
+
+  static StyleTaz Taz3() {
+    StyleTaz result;
+    result.tag = Tag::Taz3;
+    return result;
+  }
+
+  bool IsTaz3() const {
+    return tag == Tag::Taz3;
+  }
+};
+
+extern "C" {
+
+void foo(const StyleFoo<int32_t> *foo,
+         const StyleBar<int32_t> *bar,
+         const StyleBaz *baz,
+         const StyleTaz *taz);
+
+} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.cpp firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.cpp
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform-op.cpp	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform-op.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,393 +0,0 @@
-#include <cstdarg>
-#include <cstdint>
-#include <cstdlib>
-#include <ostream>
-#include <new>
-#include <cassert>
-
-template<typename T>
-struct StylePoint {
-  T x;
-  T y;
-};
-
-template<typename T>
-union StyleFoo {
-  enum class Tag : uint8_t {
-    Foo,
-    Bar,
-    Baz,
-    Bazz,
-  };
-
-  struct Foo_Body {
-    Tag tag;
-    int32_t x;
-    StylePoint<T> y;
-    StylePoint<float> z;
-  };
-
-  struct Bar_Body {
-    Tag tag;
-    T _0;
-  };
-
-  struct Baz_Body {
-    Tag tag;
-    StylePoint<T> _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Foo_Body foo;
-  Bar_Body bar;
-  Baz_Body baz;
-
-  static StyleFoo Foo(const int32_t &x,
-                      const StylePoint<T> &y,
-                      const StylePoint<float> &z) {
-    StyleFoo result;
-    ::new (&result.foo.x) (int32_t)(x);
-    ::new (&result.foo.y) (StylePoint<T>)(y);
-    ::new (&result.foo.z) (StylePoint<float>)(z);
-    result.tag = Tag::Foo;
-    return result;
-  }
-
-  bool IsFoo() const {
-    return tag == Tag::Foo;
-  }
-
-  const Foo_Body& AsFoo() const {
-    assert(IsFoo());
-    return foo;
-  }
-
-  Foo_Body& AsFoo() {
-    assert(IsFoo());
-    return foo;
-  }
-
-  static StyleFoo Bar(const T &_0) {
-    StyleFoo result;
-    ::new (&result.bar._0) (T)(_0);
-    result.tag = Tag::Bar;
-    return result;
-  }
-
-  bool IsBar() const {
-    return tag == Tag::Bar;
-  }
-
-  const T& AsBar() const {
-    assert(IsBar());
-    return bar._0;
-  }
-
-  T& AsBar() {
-    assert(IsBar());
-    return bar._0;
-  }
-
-  static StyleFoo Baz(const StylePoint<T> &_0) {
-    StyleFoo result;
-    ::new (&result.baz._0) (StylePoint<T>)(_0);
-    result.tag = Tag::Baz;
-    return result;
-  }
-
-  bool IsBaz() const {
-    return tag == Tag::Baz;
-  }
-
-  const StylePoint<T>& AsBaz() const {
-    assert(IsBaz());
-    return baz._0;
-  }
-
-  StylePoint<T>& AsBaz() {
-    assert(IsBaz());
-    return baz._0;
-  }
-
-  static StyleFoo Bazz() {
-    StyleFoo result;
-    result.tag = Tag::Bazz;
-    return result;
-  }
-
-  bool IsBazz() const {
-    return tag == Tag::Bazz;
-  }
-};
-
-template<typename T>
-struct StyleBar {
-  enum class Tag {
-    Bar1,
-    Bar2,
-    Bar3,
-    Bar4,
-  };
-
-  struct StyleBar1_Body {
-    int32_t x;
-    StylePoint<T> y;
-    StylePoint<float> z;
-    int32_t (*u)(int32_t);
-  };
-
-  struct StyleBar2_Body {
-    T _0;
-  };
-
-  struct StyleBar3_Body {
-    StylePoint<T> _0;
-  };
-
-  Tag tag;
-  union {
-    StyleBar1_Body bar1;
-    StyleBar2_Body bar2;
-    StyleBar3_Body bar3;
-  };
-
-  static StyleBar Bar1(const int32_t &x,
-                       const StylePoint<T> &y,
-                       const StylePoint<float> &z,
-                       int32_t (*&u)(int32_t)) {
-    StyleBar result;
-    ::new (&result.bar1.x) (int32_t)(x);
-    ::new (&result.bar1.y) (StylePoint<T>)(y);
-    ::new (&result.bar1.z) (StylePoint<float>)(z);
-    ::new (&result.bar1.u) (int32_t(*)(int32_t))(u);
-    result.tag = Tag::Bar1;
-    return result;
-  }
-
-  bool IsBar1() const {
-    return tag == Tag::Bar1;
-  }
-
-  const StyleBar1_Body& AsBar1() const {
-    assert(IsBar1());
-    return bar1;
-  }
-
-  StyleBar1_Body& AsBar1() {
-    assert(IsBar1());
-    return bar1;
-  }
-
-  static StyleBar Bar2(const T &_0) {
-    StyleBar result;
-    ::new (&result.bar2._0) (T)(_0);
-    result.tag = Tag::Bar2;
-    return result;
-  }
-
-  bool IsBar2() const {
-    return tag == Tag::Bar2;
-  }
-
-  const T& AsBar2() const {
-    assert(IsBar2());
-    return bar2._0;
-  }
-
-  T& AsBar2() {
-    assert(IsBar2());
-    return bar2._0;
-  }
-
-  static StyleBar Bar3(const StylePoint<T> &_0) {
-    StyleBar result;
-    ::new (&result.bar3._0) (StylePoint<T>)(_0);
-    result.tag = Tag::Bar3;
-    return result;
-  }
-
-  bool IsBar3() const {
-    return tag == Tag::Bar3;
-  }
-
-  const StylePoint<T>& AsBar3() const {
-    assert(IsBar3());
-    return bar3._0;
-  }
-
-  StylePoint<T>& AsBar3() {
-    assert(IsBar3());
-    return bar3._0;
-  }
-
-  static StyleBar Bar4() {
-    StyleBar result;
-    result.tag = Tag::Bar4;
-    return result;
-  }
-
-  bool IsBar4() const {
-    return tag == Tag::Bar4;
-  }
-};
-
-union StyleBaz {
-  enum class Tag : uint8_t {
-    Baz1,
-    Baz2,
-    Baz3,
-  };
-
-  struct Baz1_Body {
-    Tag tag;
-    StyleBar<uint32_t> _0;
-  };
-
-  struct Baz2_Body {
-    Tag tag;
-    StylePoint<int32_t> _0;
-  };
-
-  struct {
-    Tag tag;
-  };
-  Baz1_Body baz1;
-  Baz2_Body baz2;
-
-  static StyleBaz Baz1(const StyleBar<uint32_t> &_0) {
-    StyleBaz result;
-    ::new (&result.baz1._0) (StyleBar<uint32_t>)(_0);
-    result.tag = Tag::Baz1;
-    return result;
-  }
-
-  bool IsBaz1() const {
-    return tag == Tag::Baz1;
-  }
-
-  const StyleBar<uint32_t>& AsBaz1() const {
-    assert(IsBaz1());
-    return baz1._0;
-  }
-
-  StyleBar<uint32_t>& AsBaz1() {
-    assert(IsBaz1());
-    return baz1._0;
-  }
-
-  static StyleBaz Baz2(const StylePoint<int32_t> &_0) {
-    StyleBaz result;
-    ::new (&result.baz2._0) (StylePoint<int32_t>)(_0);
-    result.tag = Tag::Baz2;
-    return result;
-  }
-
-  bool IsBaz2() const {
-    return tag == Tag::Baz2;
-  }
-
-  const StylePoint<int32_t>& AsBaz2() const {
-    assert(IsBaz2());
-    return baz2._0;
-  }
-
-  StylePoint<int32_t>& AsBaz2() {
-    assert(IsBaz2());
-    return baz2._0;
-  }
-
-  static StyleBaz Baz3() {
-    StyleBaz result;
-    result.tag = Tag::Baz3;
-    return result;
-  }
-
-  bool IsBaz3() const {
-    return tag == Tag::Baz3;
-  }
-};
-
-struct StyleTaz {
-  enum class Tag : uint8_t {
-    Taz1,
-    Taz2,
-    Taz3,
-  };
-
-  struct StyleTaz1_Body {
-    StyleBar<uint32_t> _0;
-  };
-
-  struct StyleTaz2_Body {
-    StyleBaz _0;
-  };
-
-  Tag tag;
-  union {
-    StyleTaz1_Body taz1;
-    StyleTaz2_Body taz2;
-  };
-
-  static StyleTaz Taz1(const StyleBar<uint32_t> &_0) {
-    StyleTaz result;
-    ::new (&result.taz1._0) (StyleBar<uint32_t>)(_0);
-    result.tag = Tag::Taz1;
-    return result;
-  }
-
-  bool IsTaz1() const {
-    return tag == Tag::Taz1;
-  }
-
-  const StyleBar<uint32_t>& AsTaz1() const {
-    assert(IsTaz1());
-    return taz1._0;
-  }
-
-  StyleBar<uint32_t>& AsTaz1() {
-    assert(IsTaz1());
-    return taz1._0;
-  }
-
-  static StyleTaz Taz2(const StyleBaz &_0) {
-    StyleTaz result;
-    ::new (&result.taz2._0) (StyleBaz)(_0);
-    result.tag = Tag::Taz2;
-    return result;
-  }
-
-  bool IsTaz2() const {
-    return tag == Tag::Taz2;
-  }
-
-  const StyleBaz& AsTaz2() const {
-    assert(IsTaz2());
-    return taz2._0;
-  }
-
-  StyleBaz& AsTaz2() {
-    assert(IsTaz2());
-    return taz2._0;
-  }
-
-  static StyleTaz Taz3() {
-    StyleTaz result;
-    result.tag = Tag::Taz3;
-    return result;
-  }
-
-  bool IsTaz3() const {
-    return tag == Tag::Taz3;
-  }
-};
-
-extern "C" {
-
-void foo(const StyleFoo<int32_t> *foo,
-         const StyleBar<int32_t> *bar,
-         const StyleBaz *baz,
-         const StyleTaz *taz);
-
-} // extern "C"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,105 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct StylePoint_i32:
+    int32_t x;
+    int32_t y;
+
+  ctypedef struct StylePoint_f32:
+    float x;
+    float y;
+
+  cdef enum:
+    Foo_i32,
+    Bar_i32,
+    Baz_i32,
+    Bazz_i32,
+  ctypedef uint8_t StyleFoo_i32_Tag;
+
+  ctypedef struct StyleFoo_Body_i32:
+    StyleFoo_i32_Tag tag;
+    int32_t x;
+    StylePoint_i32 y;
+    StylePoint_f32 z;
+
+  ctypedef union StyleFoo_i32:
+    StyleFoo_i32_Tag tag;
+    StyleFoo_Body_i32 foo;
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+    StyleFoo_i32_Tag baz_tag;
+    StylePoint_i32 baz;
+
+  ctypedef enum StyleBar_i32_Tag:
+    Bar1_i32,
+    Bar2_i32,
+    Bar3_i32,
+    Bar4_i32,
+
+  ctypedef struct StyleBar1_Body_i32:
+    int32_t x;
+    StylePoint_i32 y;
+    StylePoint_f32 z;
+    int32_t (*u)(int32_t);
+
+  ctypedef struct StyleBar_i32:
+    StyleBar_i32_Tag tag;
+    StyleBar1_Body_i32 bar1;
+    int32_t bar2;
+    StylePoint_i32 bar3;
+
+  ctypedef struct StylePoint_u32:
+    uint32_t x;
+    uint32_t y;
+
+  ctypedef enum StyleBar_u32_Tag:
+    Bar1_u32,
+    Bar2_u32,
+    Bar3_u32,
+    Bar4_u32,
+
+  ctypedef struct StyleBar1_Body_u32:
+    int32_t x;
+    StylePoint_u32 y;
+    StylePoint_f32 z;
+    int32_t (*u)(int32_t);
+
+  ctypedef struct StyleBar_u32:
+    StyleBar_u32_Tag tag;
+    StyleBar1_Body_u32 bar1;
+    uint32_t bar2;
+    StylePoint_u32 bar3;
+
+  cdef enum:
+    Baz1,
+    Baz2,
+    Baz3,
+  ctypedef uint8_t StyleBaz_Tag;
+
+  ctypedef union StyleBaz:
+    StyleBaz_Tag tag;
+    StyleBaz_Tag baz1_tag;
+    StyleBar_u32 baz1;
+    StyleBaz_Tag baz2_tag;
+    StylePoint_i32 baz2;
+
+  cdef enum:
+    Taz1,
+    Taz2,
+    Taz3,
+  ctypedef uint8_t StyleTaz_Tag;
+
+  ctypedef struct StyleTaz:
+    StyleTaz_Tag tag;
+    StyleBar_u32 taz1;
+    StyleBaz taz2;
+
+  void foo(const StyleFoo_i32 *foo,
+           const StyleBar_i32 *bar,
+           const StyleBaz *baz,
+           const StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,144 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StylePoint_i32 {
+  int32_t x;
+  int32_t y;
+};
+
+struct StylePoint_f32 {
+  float x;
+  float y;
+};
+
+enum StyleFoo_i32_Tag {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+typedef uint8_t StyleFoo_i32_Tag;
+
+struct StyleFoo_Body_i32 {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+};
+
+union StyleFoo_i32 {
+  StyleFoo_i32_Tag tag;
+  struct StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    struct StylePoint_i32 baz;
+  };
+};
+
+enum StyleBar_i32_Tag {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+};
+
+struct StyleBar1_Body_i32 {
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+};
+
+struct StyleBar_i32 {
+  enum StyleBar_i32_Tag tag;
+  union {
+    struct StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      struct StylePoint_i32 bar3;
+    };
+  };
+};
+
+struct StylePoint_u32 {
+  uint32_t x;
+  uint32_t y;
+};
+
+enum StyleBar_u32_Tag {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+};
+
+struct StyleBar1_Body_u32 {
+  int32_t x;
+  struct StylePoint_u32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+};
+
+struct StyleBar_u32 {
+  enum StyleBar_u32_Tag tag;
+  union {
+    struct StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      struct StylePoint_u32 bar3;
+    };
+  };
+};
+
+enum StyleBaz_Tag {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+typedef uint8_t StyleBaz_Tag;
+
+union StyleBaz {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    struct StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    struct StylePoint_i32 baz2;
+  };
+};
+
+enum StyleTaz_Tag {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+typedef uint8_t StyleTaz_Tag;
+
+struct StyleTaz {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      struct StyleBar_u32 taz1;
+    };
+    struct {
+      union StyleBaz taz2;
+    };
+  };
+};
+
+void foo(const union StyleFoo_i32 *foo,
+         const struct StyleBar_i32 *bar,
+         const union StyleBaz *baz,
+         const struct StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,170 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct StylePoint_i32 {
+  int32_t x;
+  int32_t y;
+};
+
+struct StylePoint_f32 {
+  float x;
+  float y;
+};
+
+enum StyleFoo_i32_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Foo_i32,
+  Bar_i32,
+  Baz_i32,
+  Bazz_i32,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleFoo_i32_Tag;
+#endif // __cplusplus
+
+struct StyleFoo_Body_i32 {
+  StyleFoo_i32_Tag tag;
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+};
+
+union StyleFoo_i32 {
+  StyleFoo_i32_Tag tag;
+  struct StyleFoo_Body_i32 foo;
+  struct {
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+  };
+  struct {
+    StyleFoo_i32_Tag baz_tag;
+    struct StylePoint_i32 baz;
+  };
+};
+
+enum StyleBar_i32_Tag {
+  Bar1_i32,
+  Bar2_i32,
+  Bar3_i32,
+  Bar4_i32,
+};
+
+struct StyleBar1_Body_i32 {
+  int32_t x;
+  struct StylePoint_i32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+};
+
+struct StyleBar_i32 {
+  enum StyleBar_i32_Tag tag;
+  union {
+    struct StyleBar1_Body_i32 bar1;
+    struct {
+      int32_t bar2;
+    };
+    struct {
+      struct StylePoint_i32 bar3;
+    };
+  };
+};
+
+struct StylePoint_u32 {
+  uint32_t x;
+  uint32_t y;
+};
+
+enum StyleBar_u32_Tag {
+  Bar1_u32,
+  Bar2_u32,
+  Bar3_u32,
+  Bar4_u32,
+};
+
+struct StyleBar1_Body_u32 {
+  int32_t x;
+  struct StylePoint_u32 y;
+  struct StylePoint_f32 z;
+  int32_t (*u)(int32_t);
+};
+
+struct StyleBar_u32 {
+  enum StyleBar_u32_Tag tag;
+  union {
+    struct StyleBar1_Body_u32 bar1;
+    struct {
+      uint32_t bar2;
+    };
+    struct {
+      struct StylePoint_u32 bar3;
+    };
+  };
+};
+
+enum StyleBaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Baz1,
+  Baz2,
+  Baz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleBaz_Tag;
+#endif // __cplusplus
+
+union StyleBaz {
+  StyleBaz_Tag tag;
+  struct {
+    StyleBaz_Tag baz1_tag;
+    struct StyleBar_u32 baz1;
+  };
+  struct {
+    StyleBaz_Tag baz2_tag;
+    struct StylePoint_i32 baz2;
+  };
+};
+
+enum StyleTaz_Tag
+#ifdef __cplusplus
+  : uint8_t
+#endif // __cplusplus
+ {
+  Taz1,
+  Taz2,
+  Taz3,
+};
+#ifndef __cplusplus
+typedef uint8_t StyleTaz_Tag;
+#endif // __cplusplus
+
+struct StyleTaz {
+  StyleTaz_Tag tag;
+  union {
+    struct {
+      struct StyleBar_u32 taz1;
+    };
+    struct {
+      union StyleBaz taz2;
+    };
+  };
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(const union StyleFoo_i32 *foo,
+         const struct StyleBar_i32 *bar,
+         const union StyleBaz *baz,
+         const struct StyleTaz *taz);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transform_op.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transform_op.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,105 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct StylePoint_i32:
+    int32_t x;
+    int32_t y;
+
+  cdef struct StylePoint_f32:
+    float x;
+    float y;
+
+  cdef enum:
+    Foo_i32,
+    Bar_i32,
+    Baz_i32,
+    Bazz_i32,
+  ctypedef uint8_t StyleFoo_i32_Tag;
+
+  cdef struct StyleFoo_Body_i32:
+    StyleFoo_i32_Tag tag;
+    int32_t x;
+    StylePoint_i32 y;
+    StylePoint_f32 z;
+
+  cdef union StyleFoo_i32:
+    StyleFoo_i32_Tag tag;
+    StyleFoo_Body_i32 foo;
+    StyleFoo_i32_Tag bar_tag;
+    int32_t bar;
+    StyleFoo_i32_Tag baz_tag;
+    StylePoint_i32 baz;
+
+  cdef enum StyleBar_i32_Tag:
+    Bar1_i32,
+    Bar2_i32,
+    Bar3_i32,
+    Bar4_i32,
+
+  cdef struct StyleBar1_Body_i32:
+    int32_t x;
+    StylePoint_i32 y;
+    StylePoint_f32 z;
+    int32_t (*u)(int32_t);
+
+  cdef struct StyleBar_i32:
+    StyleBar_i32_Tag tag;
+    StyleBar1_Body_i32 bar1;
+    int32_t bar2;
+    StylePoint_i32 bar3;
+
+  cdef struct StylePoint_u32:
+    uint32_t x;
+    uint32_t y;
+
+  cdef enum StyleBar_u32_Tag:
+    Bar1_u32,
+    Bar2_u32,
+    Bar3_u32,
+    Bar4_u32,
+
+  cdef struct StyleBar1_Body_u32:
+    int32_t x;
+    StylePoint_u32 y;
+    StylePoint_f32 z;
+    int32_t (*u)(int32_t);
+
+  cdef struct StyleBar_u32:
+    StyleBar_u32_Tag tag;
+    StyleBar1_Body_u32 bar1;
+    uint32_t bar2;
+    StylePoint_u32 bar3;
+
+  cdef enum:
+    Baz1,
+    Baz2,
+    Baz3,
+  ctypedef uint8_t StyleBaz_Tag;
+
+  cdef union StyleBaz:
+    StyleBaz_Tag tag;
+    StyleBaz_Tag baz1_tag;
+    StyleBar_u32 baz1;
+    StyleBaz_Tag baz2_tag;
+    StylePoint_i32 baz2;
+
+  cdef enum:
+    Taz1,
+    Taz2,
+    Taz3,
+  ctypedef uint8_t StyleTaz_Tag;
+
+  cdef struct StyleTaz:
+    StyleTaz_Tag tag;
+    StyleBar_u32 taz1;
+    StyleBaz taz2;
+
+  void foo(const StyleFoo_i32 *foo,
+           const StyleBar_i32 *bar,
+           const StyleBaz *baz,
+           const StyleTaz *taz);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct DummyStruct DummyStruct;
+
+typedef struct EnumWithAssociatedConstantInImpl EnumWithAssociatedConstantInImpl;
+
+typedef struct DummyStruct TransparentComplexWrappingStructTuple;
+
+typedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+typedef struct DummyStruct TransparentComplexWrappingStructure;
+
+typedef uint32_t TransparentPrimitiveWrappingStructure;
+
+typedef struct DummyStruct TransparentComplexWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
+#define TransparentPrimitiveWithAssociatedConstants_ONE 1
+
+#define EnumWithAssociatedConstantInImpl_TEN 10
+
+void root(TransparentComplexWrappingStructTuple a,
+          TransparentPrimitiveWrappingStructTuple b,
+          TransparentComplexWrappingStructure c,
+          TransparentPrimitiveWrappingStructure d,
+          TransparentComplexWrapper_i32 e,
+          TransparentPrimitiveWrapper_i32 f,
+          TransparentPrimitiveWithAssociatedConstants g,
+          struct EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct DummyStruct DummyStruct;
+
+typedef struct EnumWithAssociatedConstantInImpl EnumWithAssociatedConstantInImpl;
+
+typedef struct DummyStruct TransparentComplexWrappingStructTuple;
+
+typedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+typedef struct DummyStruct TransparentComplexWrappingStructure;
+
+typedef uint32_t TransparentPrimitiveWrappingStructure;
+
+typedef struct DummyStruct TransparentComplexWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
+#define TransparentPrimitiveWithAssociatedConstants_ONE 1
+
+#define EnumWithAssociatedConstantInImpl_TEN 10
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(TransparentComplexWrappingStructTuple a,
+          TransparentPrimitiveWrappingStructTuple b,
+          TransparentComplexWrappingStructure c,
+          TransparentPrimitiveWrappingStructure d,
+          TransparentComplexWrapper_i32 e,
+          TransparentPrimitiveWrapper_i32 f,
+          TransparentPrimitiveWithAssociatedConstants g,
+          struct EnumWithAssociatedConstantInImpl h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct DummyStruct:
+    pass
+
+  ctypedef struct EnumWithAssociatedConstantInImpl:
+    pass
+
+  ctypedef DummyStruct TransparentComplexWrappingStructTuple;
+
+  ctypedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+  ctypedef DummyStruct TransparentComplexWrappingStructure;
+
+  ctypedef uint32_t TransparentPrimitiveWrappingStructure;
+
+  ctypedef DummyStruct TransparentComplexWrapper_i32;
+
+  ctypedef uint32_t TransparentPrimitiveWrapper_i32;
+
+  ctypedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+  const TransparentPrimitiveWithAssociatedConstants TransparentPrimitiveWithAssociatedConstants_ZERO # = 0
+  const TransparentPrimitiveWithAssociatedConstants TransparentPrimitiveWithAssociatedConstants_ONE # = 1
+
+  const TransparentPrimitiveWrappingStructure EnumWithAssociatedConstantInImpl_TEN # = 10
+
+  void root(TransparentComplexWrappingStructTuple a,
+            TransparentPrimitiveWrappingStructTuple b,
+            TransparentComplexWrappingStructure c,
+            TransparentPrimitiveWrappingStructure d,
+            TransparentComplexWrapper_i32 e,
+            TransparentPrimitiveWrapper_i32 f,
+            TransparentPrimitiveWithAssociatedConstants g,
+            EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct DummyStruct;
+
+struct EnumWithAssociatedConstantInImpl;
+
+typedef struct DummyStruct TransparentComplexWrappingStructTuple;
+
+typedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+typedef struct DummyStruct TransparentComplexWrappingStructure;
+
+typedef uint32_t TransparentPrimitiveWrappingStructure;
+
+typedef struct DummyStruct TransparentComplexWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
+#define TransparentPrimitiveWithAssociatedConstants_ONE 1
+
+#define EnumWithAssociatedConstantInImpl_TEN 10
+
+void root(TransparentComplexWrappingStructTuple a,
+          TransparentPrimitiveWrappingStructTuple b,
+          TransparentComplexWrappingStructure c,
+          TransparentPrimitiveWrappingStructure d,
+          TransparentComplexWrapper_i32 e,
+          TransparentPrimitiveWrapper_i32 f,
+          TransparentPrimitiveWithAssociatedConstants g,
+          struct EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct DummyStruct;
+
+struct EnumWithAssociatedConstantInImpl;
+
+typedef struct DummyStruct TransparentComplexWrappingStructTuple;
+
+typedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+typedef struct DummyStruct TransparentComplexWrappingStructure;
+
+typedef uint32_t TransparentPrimitiveWrappingStructure;
+
+typedef struct DummyStruct TransparentComplexWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWrapper_i32;
+
+typedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+#define TransparentPrimitiveWithAssociatedConstants_ZERO 0
+#define TransparentPrimitiveWithAssociatedConstants_ONE 1
+
+#define EnumWithAssociatedConstantInImpl_TEN 10
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(TransparentComplexWrappingStructTuple a,
+          TransparentPrimitiveWrappingStructTuple b,
+          TransparentComplexWrappingStructure c,
+          TransparentPrimitiveWrappingStructure d,
+          TransparentComplexWrapper_i32 e,
+          TransparentPrimitiveWrapper_i32 f,
+          TransparentPrimitiveWithAssociatedConstants g,
+          struct EnumWithAssociatedConstantInImpl h);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/transparent.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/transparent.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,40 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct DummyStruct:
+    pass
+
+  cdef struct EnumWithAssociatedConstantInImpl:
+    pass
+
+  ctypedef DummyStruct TransparentComplexWrappingStructTuple;
+
+  ctypedef uint32_t TransparentPrimitiveWrappingStructTuple;
+
+  ctypedef DummyStruct TransparentComplexWrappingStructure;
+
+  ctypedef uint32_t TransparentPrimitiveWrappingStructure;
+
+  ctypedef DummyStruct TransparentComplexWrapper_i32;
+
+  ctypedef uint32_t TransparentPrimitiveWrapper_i32;
+
+  ctypedef uint32_t TransparentPrimitiveWithAssociatedConstants;
+  const TransparentPrimitiveWithAssociatedConstants TransparentPrimitiveWithAssociatedConstants_ZERO # = 0
+  const TransparentPrimitiveWithAssociatedConstants TransparentPrimitiveWithAssociatedConstants_ONE # = 1
+
+  const TransparentPrimitiveWrappingStructure EnumWithAssociatedConstantInImpl_TEN # = 10
+
+  void root(TransparentComplexWrappingStructTuple a,
+            TransparentPrimitiveWrappingStructTuple b,
+            TransparentComplexWrappingStructure c,
+            TransparentPrimitiveWrappingStructure d,
+            TransparentComplexWrapper_i32 e,
+            TransparentPrimitiveWrapper_i32 f,
+            TransparentPrimitiveWithAssociatedConstants g,
+            EnumWithAssociatedConstantInImpl h);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_i32__i32 {
+  int32_t x;
+  int32_t y;
+} Foo_i32__i32;
+
+typedef struct Foo_i32__i32 IntFoo_i32;
+
+void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_i32__i32 {
+  int32_t x;
+  int32_t y;
+} Foo_i32__i32;
+
+typedef struct Foo_i32__i32 IntFoo_i32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(IntFoo_i32 a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo_i32__i32:
+    int32_t x;
+    int32_t y;
+
+  ctypedef Foo_i32__i32 IntFoo_i32;
+
+  void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_i32__i32 {
+  int32_t x;
+  int32_t y;
+};
+
+typedef struct Foo_i32__i32 IntFoo_i32;
+
+void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_i32__i32 {
+  int32_t x;
+  int32_t y;
+};
+
+typedef struct Foo_i32__i32 IntFoo_i32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(IntFoo_i32 a);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/typedef.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/typedef.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo_i32__i32:
+    int32_t x;
+    int32_t y;
+
+  ctypedef Foo_i32__i32 IntFoo_i32;
+
+  void root(IntFoo_i32 a);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef union Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+typedef union NormalWithZST {
+  int32_t x;
+  float y;
+} NormalWithZST;
+
+void root(struct Opaque *a, union Normal b, union NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Opaque Opaque;
+
+typedef union Normal {
+  int32_t x;
+  float y;
+} Normal;
+
+typedef union NormalWithZST {
+  int32_t x;
+  float y;
+} NormalWithZST;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *a, union Normal b, union NormalWithZST c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Opaque:
+    pass
+
+  ctypedef union Normal:
+    int32_t x;
+    float y;
+
+  ctypedef union NormalWithZST:
+    int32_t x;
+    float y;
+
+  void root(Opaque *a, Normal b, NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+typedef union Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+} Bar;
+
+void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo_Bar {
+  const int32_t *something;
+} Foo_Bar;
+
+typedef union Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+} Bar;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo_Bar:
+    const int32_t *something;
+
+  ctypedef union Bar:
+    int32_t something;
+    Foo_Bar subexpressions;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+union Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+};
+
+void root(union Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo_Bar {
+  const int32_t *something;
+};
+
+union Bar {
+  int32_t something;
+  struct Foo_Bar subexpressions;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(union Bar b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union_self.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union_self.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo_Bar:
+    const int32_t *something;
+
+  cdef union Bar:
+    int32_t something;
+    Foo_Bar subexpressions;
+
+  void root(Bar b);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+union Normal {
+  int32_t x;
+  float y;
+};
+
+union NormalWithZST {
+  int32_t x;
+  float y;
+};
+
+void root(struct Opaque *a, union Normal b, union NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Opaque;
+
+union Normal {
+  int32_t x;
+  float y;
+};
+
+union NormalWithZST {
+  int32_t x;
+  float y;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Opaque *a, union Normal b, union NormalWithZST c);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/union.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/union.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Opaque:
+    pass
+
+  cdef union Normal:
+    int32_t x;
+    float y;
+
+  cdef union NormalWithZST:
+    int32_t x;
+    float y;
+
+  void root(Opaque *a, Normal b, NormalWithZST c);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/using_namespaces.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/using_namespaces.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/using_namespaces.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/using_namespaces.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void root();
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/va_list.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/va_list.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/va_list.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/va_list.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,9 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  int32_t va_list_test(va_list ap);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.both.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.both.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.both.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.both.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXT_CONST 0
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.both.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.both.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.both.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.both.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXT_CONST 0
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void consume_ext(struct ExtType _ext);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t EXT_CONST # = 0
+
+  ctypedef struct ExtType:
+    uint32_t data;
+
+  void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,12 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXT_CONST 0
+
+struct ExtType {
+  uint32_t data;
+};
+
+void consume_ext(struct ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.compat.c firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.compat.c
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.compat.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.compat.c	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,20 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#define EXT_CONST 0
+
+struct ExtType {
+  uint32_t data;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void consume_ext(struct ExtType _ext);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.pyx firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.pyx
--- firefox-84.0.2+build1/third_party/cbindgen/tests/expectations/workspace.tag.pyx	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/expectations/workspace.tag.pyx	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  const int32_t EXT_CONST # = 0
+
+  cdef struct ExtType:
+    uint32_t data;
+
+  void consume_ext(ExtType _ext);
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/profile.rs firefox-85.0+build1/third_party/cbindgen/tests/profile.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/profile.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/profile.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,112 @@
+use cbindgen::*;
+
+use serial_test::serial;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir {
+    let expand_dep_test_dir = {
+        let mut this_file = PathBuf::from(file!());
+        this_file.pop();
+        this_file.extend(&["rust", "expand_dep"]);
+        this_file
+    };
+
+    let tmp_dir = tempfile::Builder::new()
+        .prefix("cbindgen-test-output-")
+        .tempdir()
+        .expect("Creating tmp dir failed");
+
+    std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path());
+    let builder = Builder::new()
+        .with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap())
+        .with_crate(expand_dep_test_dir);
+    let builder = config(builder);
+    builder.generate().expect("build should succeed");
+
+    tmp_dir
+}
+
+fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir {
+    let expand_dep_test_dir = {
+        let mut this_file = PathBuf::from(file!());
+        this_file.pop();
+        this_file.extend(&["rust", "expand_dep"]);
+        this_file
+    };
+
+    let tmp_dir = tempfile::Builder::new()
+        .prefix("cbindgen-test-output-")
+        .tempdir()
+        .expect("Creating tmp dir failed");
+
+    let cbindgen_path = match option_env!("CARGO_BIN_EXE_cbindgen") {
+        Some(path) => path.into(),
+        None => {
+            // We must be on an older version of Rust.
+            // Guess where cbindgen would be relative to OUT_DIR.
+            let mut path = PathBuf::from(env!("OUT_DIR"));
+            path.pop();
+            path.pop();
+            path.pop();
+            path.push("cbindgen");
+            path.into_os_string()
+        }
+    };
+
+    Command::new(cbindgen_path)
+        .current_dir(expand_dep_test_dir)
+        .env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path())
+        .args(extra_args)
+        .output()
+        .expect("build should succed");
+
+    tmp_dir
+}
+
+fn get_contents_of_dir(path: &Path) -> Vec<String> {
+    path.read_dir()
+        .unwrap()
+        .map(|f| f.unwrap().file_name().to_str().unwrap().to_string())
+        .filter(|name| !name.starts_with("."))
+        .collect()
+}
+
+#[test]
+#[serial]
+fn lib_default_uses_debug_build() {
+    let target_dir = build_using_lib(|b| b);
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
+}
+
+#[test]
+#[serial]
+fn lib_explicit_debug_build() {
+    let target_dir = build_using_lib(|b| b.with_parse_expand_profile(Profile::Debug));
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
+}
+
+#[test]
+#[serial]
+fn lib_explicit_release_build() {
+    let target_dir = build_using_lib(|b| b.with_parse_expand_profile(Profile::Release));
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["release"]);
+}
+
+#[test]
+fn bin_default_uses_debug_build() {
+    let target_dir = build_using_bin(&[]);
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
+}
+
+#[test]
+fn bin_explicit_debug_build() {
+    let target_dir = build_using_bin(&["--profile", "debug"]);
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]);
+}
+
+#[test]
+fn bin_explicit_release_build() {
+    let target_dir = build_using_bin(&["--profile", "release"]);
+    assert_eq!(get_contents_of_dir(target_dir.path()), &["release"]);
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted_cast.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted_cast.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted_cast.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted_cast.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,44 @@
+/// cbindgen:prefix-with-name
+#[repr(C, u8)]
+pub enum H {
+    /// cbindgen:variant-mut-cast-attributes=MY_ATTRS
+    Foo(i16),
+    /// cbindgen:variant-const-cast-attributes=MY_ATTRS
+    Bar { x: u8, y: i16 },
+    /// cbindgen:variant-is-attributes=MY_ATTRS
+    Baz
+}
+
+/// cbindgen:prefix-with-name
+#[repr(C, u8, u16)]
+pub enum I {
+    /// cbindgen:variant-constructor-attributes=MY_ATTRS
+    Foo(i16),
+    /// cbindgen:eq-attributes=MY_ATTRS
+    Bar { x: u8, y: i16 },
+    Baz
+}
+
+/// cbindgen:prefix-with-name
+#[repr(C, u8)]
+pub enum J {
+    Foo(i16),
+    Bar { x: u8, y: i16 },
+    Baz
+}
+
+/// cbindgen:prefix-with-name
+#[repr(u8)]
+pub enum K {
+    Foo(i16),
+    Bar { x: u8, y: i16 },
+    Baz
+}
+
+#[no_mangle]
+pub extern "C" fn foo(
+    h: H,
+    i: I,
+    j: J,
+    k: K,
+) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted-cast.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted-cast.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted-cast.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted-cast.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/// cbindgen:prefix-with-name
-#[repr(C, u8)]
-pub enum H {
-    /// cbindgen:variant-mut-cast-attributes=MY_ATTRS
-    Foo(i16),
-    /// cbindgen:variant-const-cast-attributes=MY_ATTRS
-    Bar { x: u8, y: i16 },
-    /// cbindgen:variant-is-attributes=MY_ATTRS
-    Baz
-}
-
-/// cbindgen:prefix-with-name
-#[repr(C, u8, u16)]
-pub enum I {
-    /// cbindgen:variant-constructor-attributes=MY_ATTRS
-    Foo(i16),
-    /// cbindgen:eq-attributes=MY_ATTRS
-    Bar { x: u8, y: i16 },
-    Baz
-}
-
-/// cbindgen:prefix-with-name
-#[repr(C, u8)]
-pub enum J {
-    Foo(i16),
-    Bar { x: u8, y: i16 },
-    Baz
-}
-
-/// cbindgen:prefix-with-name
-#[repr(u8)]
-pub enum K {
-    Foo(i16),
-    Bar { x: u8, y: i16 },
-    Baz
-}
-
-#[no_mangle]
-pub extern "C" fn foo(
-    h: H,
-    i: I,
-    j: J,
-    k: K,
-) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted_cast.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted_cast.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted_cast.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted_cast.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,10 @@
+header = """
+#define MY_ASSERT(...) do { } while (0)
+#define MY_ATTRS __attribute((noinline))
+"""
+
+[enum]
+derive_helper_methods = true
+derive_const_casts = true
+derive_mut_casts = true
+cast_assert_name = "MY_ASSERT"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted-cast.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted-cast.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/asserted-cast.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/asserted-cast.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-header = """
-#define MY_ASSERT(...) do { } while (0)
-#define MY_ATTRS __attribute((noinline))
-"""
-
-[enum]
-derive_helper_methods = true
-derive_const_casts = true
-derive_mut_casts = true
-cast_assert_name = "MY_ASSERT"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/body.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/body.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/body.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/body.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,13 +1,13 @@
 [export.body]
 "MyFancyStruct" = """
 #ifdef __cplusplus
-  inline void foo();
+    inline void foo();
 #endif
 """
 
 "MyFancyEnum" = """
 #ifdef __cplusplus
-  inline void wohoo();
+    inline void wohoo();
 #endif
 """
 
@@ -16,20 +16,20 @@
 """
 
 "MyUnion" = """
-  int32_t extra_member; // yolo
+  int32_t extra_member;
 """
 
 [export.pre_body]
 "MyFancyStruct_Prepended" = """
 #ifdef __cplusplus
-  inline void prepended_wohoo();
+    inline void prepended_wohoo();
 #endif
 """
 
 "MyFancyEnum_Prepended" = """
-  #ifdef __cplusplus
+#ifdef __cplusplus
     inline void wohoo();
-  #endif
+#endif
 """
 
 "MyCLikeEnum_Prepended" = """
@@ -37,6 +37,5 @@
 """
 
 "MyUnion_Prepended" = """
-  int32_t extra_member; // yolo
+    int32_t extra_member;
 """
-
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/box.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/box.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/box.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/box.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,11 +1,18 @@
 header = """
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using Box = T*;
 #endif
+
+#if 0
+' '''
+#endif
 """
 [export]
 exclude = [
   "Box",
 ]
-
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_2.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_2.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,32 @@
+#[cfg(any(windows, unix))]
+#[repr(C)]
+struct Foo {
+    x: i32,
+}
+
+#[cfg(windows)]
+#[repr(C)]
+struct Bar {
+    y: Foo,
+}
+
+#[cfg(unix)]
+#[repr(C)]
+struct Bar {
+    z: Foo,
+}
+
+#[repr(C)]
+struct Root {
+    w: Bar,
+}
+
+#[cfg(windows)]
+pub const DEFAULT_X: i32 = 0x08;
+
+#[cfg(unix)]
+pub const DEFAULT_X: i32 = 0x2a;
+
+#[no_mangle]
+pub extern "C" fn root(a: Root)
+{ }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-2.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#[cfg(any(windows, unix))]
-#[repr(C)]
-struct Foo {
-    x: i32,
-}
-
-#[cfg(windows)]
-#[repr(C)]
-struct Bar {
-    y: Foo,
-}
-
-#[cfg(unix)]
-#[repr(C)]
-struct Bar {
-    z: Foo,
-}
-
-#[repr(C)]
-struct Root {
-    w: Bar,
-}
-
-#[cfg(windows)]
-pub const DEFAULT_X: i32 = 0x08;
-
-#[cfg(unix)]
-pub const DEFAULT_X: i32 = 0x2a;
-
-#[no_mangle]
-pub extern "C" fn root(a: Root)
-{ }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_2.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_2.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_2.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_2.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+header = """
+#if 0
+DEF DEFINED = 1
+DEF NOT_DEFINED = 0
+#endif
+"""
+
+[defines]
+"unix" = "DEFINED"
+"macos" = "NOT_DEFINED"
+"windows" = "NOT_DEFINED"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-2.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-2.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-2.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-2.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[defines]
-"unix" = "DEFINED"
-"macos" = "NOT_DEFINED"
-"windows" = "NOT_DEFINED"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_field.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_field.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg_field.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg_field.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+struct Foo {
+    #[cfg(windows)]
+    x: i32,
+}
+
+pub fn foo() {
+    Foo {
+        #[cfg(windows)]
+        x: 0,
+    };
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-field.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-field.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg-field.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg-field.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-struct Foo {
-    #[cfg(windows)]
-    x: i32,
-}
-
-pub fn foo() {
-    Foo {
-        #[cfg(windows)]
-        x: 0,
-    };
-}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg.rs	2021-01-18 19:59:04.000000000 +0000
@@ -40,6 +40,15 @@
     y: f32,
 }
 
+// FIXME(#634): Support deriving methods for structs with conditional fields.
+/// cbindgen:derive-eq=false
+/// cbindgen:derive-neq=false
+#[repr(C)]
+struct ConditionalField {
+    #[cfg(x11)]
+    field: i32,
+}
+
 #[cfg(all(unix, x11))]
 #[no_mangle]
 pub extern "C" fn root(a: FooHandle, c: C)
@@ -49,3 +58,7 @@
 #[no_mangle]
 pub extern "C" fn root(a: BarHandle, c: C)
 { }
+
+#[no_mangle]
+pub extern "C" fn cond(a: ConditionalField)
+{ }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cfg.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cfg.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,3 +1,12 @@
+header = """
+#if 0
+DEF PLATFORM_UNIX = 0
+DEF PLATFORM_WIN = 0
+DEF X11 = 0
+DEF M_32 = 0
+#endif
+"""
+
 [defines]
 "unix" = "PLATFORM_UNIX"
 "windows" = "PLATFORM_WIN"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/custom_header.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/custom_header.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/custom_header.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/custom_header.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,5 +1,11 @@
 no_includes = true
-header = "// This file is generated by cbindgen. DO NOT EDIT"
+header = """
+#if 0
+# This file is generated by cbindgen. DO NOT EDIT
+#endif
+"""
 trailer = """
-/* This is a simple test to ensure that trailers don't cause extra newlines in files */
+#if 0
+# This is a simple test to ensure that trailers do not cause extra newlines in files
+#endif
 """
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cython_options.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/cython_options.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/cython_options.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/cython_options.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,6 @@
+[cython]
+header = '"my_header.h"'
+
+[cython.cimports]
+"libc.stdint" = ["int8_t", "int16_t"]
+"libc.stddef" = ["*"]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,97 @@
+use std::ptr::NonNull;
+
+/// This will have a destructor manually implemented via variant_body, and
+/// similarly a Drop impl in Rust.
+#[repr(C)]
+pub struct OwnedSlice<T> {
+    len: usize,
+    ptr: NonNull<T>,
+}
+
+#[repr(u8)]
+pub enum FillRule { A, B }
+
+#[repr(C)]
+pub struct Polygon<LengthPercentage> {
+    pub fill: FillRule,
+    pub coordinates: OwnedSlice<LengthPercentage>,
+}
+
+#[repr(C, u8)]
+pub enum Foo<T> {
+    Bar,
+    Polygon1(Polygon<T>),
+    Slice1(OwnedSlice<T>),
+    Slice2(OwnedSlice<i32>),
+    Slice3 {
+        fill: FillRule,
+        coords: OwnedSlice<T>,
+    },
+    Slice4 {
+        fill: FillRule,
+        coords: OwnedSlice<i32>,
+    },
+}
+
+#[repr(u8)]
+pub enum Baz<T> {
+    Bar2,
+    Polygon21(Polygon<T>),
+    Slice21(OwnedSlice<T>),
+    Slice22(OwnedSlice<i32>),
+    Slice23 {
+        fill: FillRule,
+        coords: OwnedSlice<T>,
+    },
+    Slice24 {
+        fill: FillRule,
+        coords: OwnedSlice<i32>,
+    },
+}
+
+#[repr(u8)]
+pub enum Taz {
+    Bar3,
+    Taz1(i32),
+    Taz3(OwnedSlice<i32>),
+}
+
+/// cbindgen:derive-tagged-enum-destructor=false
+/// cbindgen:derive-tagged-enum-copy-constructor=false
+#[repr(u8)]
+pub enum Tazz {
+    Bar4,
+    Taz2(i32),
+}
+
+/// cbindgen:derive-tagged-enum-copy-assignment=false
+#[repr(u8)]
+pub enum Tazzz {
+    Bar5,
+    Taz5(i32),
+}
+
+#[repr(u8)]
+pub enum Tazzzz {
+    Taz6(i32),
+    Taz7(u32),
+}
+
+/// cbindgen:derive-eq=true
+/// cbindgen:derive-neq=true
+/// cbindgen:neq-attributes=NODISCARD
+/// cbindgen:eq-attributes=NODISCARD
+/// cbindgen:destructor-attributes=NOINLINE
+/// cbindgen:copy-constructor-attributes=NOINLINE
+/// cbindgen:copy-assignment-attributes=NOINLINE
+#[repr(u8)]
+pub enum Qux {
+    /// cbindgen:derive-eq=true
+    Qux1(i32),
+    /// cbindgen:derive-eq=true
+    Qux2(u32),
+}
+
+
+#[no_mangle]
+pub extern "C" fn root(a: &Foo<u32>, b: &Baz<i32>, c: &Taz, d: Tazz, e: &Tazzz, f: &Tazzzz, g: &Qux) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-use std::ptr::NonNull;
-
-/// This will have a destructor manually implemented via variant_body, and
-/// similarly a Drop impl in Rust.
-#[repr(C)]
-pub struct OwnedSlice<T> {
-    len: usize,
-    ptr: NonNull<T>,
-}
-
-#[repr(u8)]
-pub enum FillRule { A, B }
-
-#[repr(C)]
-pub struct Polygon<LengthPercentage> {
-    pub fill: FillRule,
-    pub coordinates: OwnedSlice<LengthPercentage>,
-}
-
-#[repr(C, u8)]
-pub enum Foo<T> {
-    Bar,
-    Polygon1(Polygon<T>),
-    Slice1(OwnedSlice<T>),
-    Slice2(OwnedSlice<i32>),
-    Slice3 {
-        fill: FillRule,
-        coords: OwnedSlice<T>,
-    },
-    Slice4 {
-        fill: FillRule,
-        coords: OwnedSlice<i32>,
-    },
-}
-
-#[repr(u8)]
-pub enum Baz<T> {
-    Bar2,
-    Polygon21(Polygon<T>),
-    Slice21(OwnedSlice<T>),
-    Slice22(OwnedSlice<i32>),
-    Slice23 {
-        fill: FillRule,
-        coords: OwnedSlice<T>,
-    },
-    Slice24 {
-        fill: FillRule,
-        coords: OwnedSlice<i32>,
-    },
-}
-
-#[repr(u8)]
-pub enum Taz {
-    Bar3,
-    Taz1(i32),
-    Taz3(OwnedSlice<i32>),
-}
-
-/// cbindgen:derive-tagged-enum-destructor=false
-/// cbindgen:derive-tagged-enum-copy-constructor=false
-#[repr(u8)]
-pub enum Tazz {
-    Bar4,
-    Taz2(i32),
-}
-
-/// cbindgen:derive-tagged-enum-copy-assignment=false
-#[repr(u8)]
-pub enum Tazzz {
-    Bar5,
-    Taz5(i32),
-}
-
-#[repr(u8)]
-pub enum Tazzzz {
-    Taz6(i32),
-    Taz7(u32),
-}
-
-/// cbindgen:derive-eq=true
-/// cbindgen:derive-neq=true
-/// cbindgen:neq-attributes=NODISCARD
-/// cbindgen:eq-attributes=NODISCARD
-/// cbindgen:destructor-attributes=NOINLINE
-/// cbindgen:copy-constructor-attributes=NOINLINE
-/// cbindgen:copy-assignment-attributes=NOINLINE
-#[repr(u8)]
-pub enum Qux {
-    /// cbindgen:derive-eq=true
-    Qux1(i32),
-    /// cbindgen:derive-eq=true
-    Qux2(u32),
-}
-
-
-#[no_mangle]
-pub extern "C" fn root(a: &Foo<u32>, b: &Baz<i32>, c: &Taz, d: Tazz, e: &Tazzz, f: &Tazzzz, g: &Qux) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor_and_copy_ctor.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,16 @@
+header = """
+#define NOINLINE __attribute__((noinline))
+#define NODISCARD [[nodiscard]]
+"""
+
+[enum]
+derive_tagged_enum_destructor = true
+derive_tagged_enum_copy_constructor = true
+derive_tagged_enum_copy_assignment = true
+derive_helper_methods = true
+private_default_tagged_enum_constructor = true
+
+[export.body]
+"OwnedSlice" = """
+  ~OwnedSlice() {}
+"""
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/destructor-and-copy-ctor.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-header = """
-#define NOINLINE __attribute__((noinline))
-#define NODISCARD [[nodiscard]]
-"""
-
-[enum]
-derive_tagged_enum_destructor = true
-derive_tagged_enum_copy_constructor = true
-derive_tagged_enum_copy_assignment = true
-derive_helper_methods = true
-private_default_tagged_enum_constructor = true
-
-[export.body]
-"OwnedSlice" = """
-  ~OwnedSlice() {}
-"""
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum_discriminant.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/enum_discriminant.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum_discriminant.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/enum_discriminant.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+pub const FOUR: i8 = 4;
+
+#[repr(i8)]
+enum E {
+    A = 1,
+    B = -1,
+    C = 1 + 2,
+    D = FOUR,
+    F = (5),
+    G = b'6' as i8,
+    H = false as i8,
+}
+
+#[no_mangle]
+pub extern "C" fn root(_: &E) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum_discriminant.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/enum_discriminant.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum_discriminant.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/enum_discriminant.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,2 @@
+[export.rename]
+"FOUR" = "FOURTY_FOUR"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/enum.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/enum.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/enum.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
 trailer = """
+#if 0
+''' '
+#endif
+
 #include <stddef.h>
 #include "testing-helpers.h"
 static_assert(offsetof(CBINDGEN_STRUCT(P), tag) == 0, "unexpected offset for tag");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p0");
 static_assert(offsetof(CBINDGEN_STRUCT(P), p0) == 1, "unexpected offset for p1");
 static_assert(sizeof(CBINDGEN_STRUCT(P)) == 4, "unexpected size for P");
-"""
\ No newline at end of file
+
+#if 0
+' '''
+#endif
+"""
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/exclude_generic_monomorph.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/exclude_generic_monomorph.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/exclude_generic_monomorph.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/exclude_generic_monomorph.toml	2021-01-18 19:59:04.000000000 +0000
@@ -2,7 +2,20 @@
 header = """
 #include <stdint.h>
 
+#if 0
+''' '
+#endif
+
 typedef uint64_t Option_Foo;
+
+#if 0
+' '''
+#endif
+
+#if 0
+from libc.stdint cimport uint64_t
+ctypedef uint64_t Option_Foo
+#endif
 """
 
 [export]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/extern_2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/extern_2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/extern_2.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/extern_2.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#[no_mangle]
+pub extern "C" fn first()
+{ }
+
+#[no_mangle]
+pub extern fn second()
+{ }
+
+#[no_mangle]
+pub fn third()
+{ }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/extern-2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/extern-2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/extern-2.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/extern-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#[no_mangle]
-pub extern "C" fn first()
-{ }
-
-#[no_mangle]
-pub extern fn second()
-{ }
-
-#[no_mangle]
-pub fn third()
-{ }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/forward_declaration.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/forward_declaration.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/forward_declaration.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/forward_declaration.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,21 @@
+#[repr(C)]
+struct TypeInfo {
+    data: TypeData,
+}
+
+#[repr(C)]
+enum TypeData {
+    Primitive,
+    Struct(StructInfo),
+}
+
+#[repr(C)]
+struct StructInfo {
+    fields: *const *const TypeInfo, // requires forward declaration
+    num_fields: usize,
+}
+
+#[no_mangle]
+pub extern "C" fn root(
+    x: TypeInfo,
+) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/forward_declaration.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/forward_declaration.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/forward_declaration.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/forward_declaration.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,23 @@
+header = """
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+/* ANONYMOUS STRUCTS DO NOT SUPPORT FORWARD DECLARATIONS!
+#endif
+#if 0
+' '''
+#endif
+"""
+
+trailer = """
+#if 0
+''' '
+#endif
+#if defined(CBINDGEN_STYLE_TYPE)
+*/
+#endif
+#if 0
+' '''
+#endif
+"""
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/generic_pointer.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/generic_pointer.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/generic_pointer.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/generic_pointer.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,11 @@
+#[repr(C)]
+pub struct Foo<T> {
+    a: T,
+}
+
+pub type Boo = Foo<*mut u8>;
+
+#[no_mangle]
+pub extern "C" fn root(
+    x: Boo,
+) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/generic-pointer.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/generic-pointer.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/generic-pointer.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/generic-pointer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-#[repr(C)]
-pub struct Foo<T> {
-    a: T,
-}
-
-pub type Boo = Foo<*mut u8>;
-
-#[no_mangle]
-pub extern "C" fn root(
-    x: Boo,
-) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/lifetime_arg.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/lifetime_arg.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/lifetime_arg.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/lifetime_arg.rs	2021-01-18 19:59:04.000000000 +0000
@@ -3,6 +3,12 @@
     data: &'a i32
 }
 
+#[repr(C)]
+enum E<'a> {
+    V,
+    U(&'a u8),
+}
+
 #[no_mangle]
-pub extern "C" fn root<'a>(_a: A<'a>)
+pub extern "C" fn root<'a>(_a: A<'a>, _e: E<'a>)
 { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/manuallydrop.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/manuallydrop.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/manuallydrop.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/manuallydrop.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
 header = """
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using ManuallyDrop = T;
 #endif
+
+#if 0
+' '''
+#endif
 """
 [export]
 exclude = [
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/maybeuninit.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/maybeuninit.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/maybeuninit.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/maybeuninit.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,8 +1,16 @@
 header = """
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 template <typename T>
 using MaybeUninit = T;
 #endif
+
+#if 0
+' '''
+#endif
 """
 [export]
 exclude = [
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_1.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_1.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_1.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_1.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#[repr(C)]
+struct Foo<T> {
+    data: *const T
+}
+
+struct Bar<T> {
+    data: *const T
+}
+
+#[repr(C)]
+struct Tuple<T, E> {
+    a: *const T,
+    b: *const E,
+}
+
+type Indirection<T> = Tuple<T, f32>;
+
+#[no_mangle]
+pub extern "C" fn root(
+    a: Foo<i32>,
+    b: Foo<f32>,
+    c: Bar<f32>,
+    d: Foo<Bar<f32>>,
+    e: Bar<Foo<f32>>,
+    f: Bar<Bar<f32>>,
+    g: Tuple<Foo<f32>, f32>,
+    h: Indirection<f32>
+) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-1.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-1.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-1.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-1.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#[repr(C)]
-struct Foo<T> {
-    data: *const T
-}
-
-struct Bar<T> {
-    data: *const T
-}
-
-#[repr(C)]
-struct Tuple<T, E> {
-    a: *const T,
-    b: *const E,
-}
-
-type Indirection<T> = Tuple<T, f32>;
-
-#[no_mangle]
-pub extern "C" fn root(
-    a: Foo<i32>,
-    b: Foo<f32>,
-    c: Bar<f32>,
-    d: Foo<Bar<f32>>,
-    e: Bar<Foo<f32>>,
-    f: Bar<Bar<f32>>,
-    g: Tuple<Foo<f32>, f32>,
-    h: Indirection<f32>
-) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_2.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_2.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+#[repr(C)]
+struct List<T> {
+     members: *mut T,
+     count: usize
+}
+
+struct A;
+
+struct B;
+
+#[no_mangle]
+pub extern "C" fn foo(a: List<A>) { }
+
+#[no_mangle]
+pub extern "C" fn bar(b: List<B>) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-2.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-2.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-2.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-2.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#[repr(C)]
-struct List<T> {
-     members: *mut T,
-     count: usize
-}
-
-struct A;
-
-struct B;
-
-#[no_mangle]
-pub extern "C" fn foo(a: List<A>) { }
-
-#[no_mangle]
-pub extern "C" fn bar(b: List<B>) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_3.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_3.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph_3.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph_3.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,28 @@
+#[repr(C)]
+union Foo<T> {
+    data: *const T
+}
+
+union Bar<T> {
+    data: *const T
+}
+
+#[repr(C)]
+union Tuple<T, E> {
+    a: *const T,
+    b: *const E,
+}
+
+type Indirection<T> = Tuple<T, f32>;
+
+#[no_mangle]
+pub extern "C" fn root(
+    a: Foo<i32>,
+    b: Foo<f32>,
+    c: Bar<f32>,
+    d: Foo<Bar<f32>>,
+    e: Bar<Foo<f32>>,
+    f: Bar<Bar<f32>>,
+    g: Tuple<Foo<f32>, f32>,
+    h: Indirection<f32>
+) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-3.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-3.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/monomorph-3.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/monomorph-3.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#[repr(C)]
-union Foo<T> {
-    data: *const T
-}
-
-union Bar<T> {
-    data: *const T
-}
-
-#[repr(C)]
-union Tuple<T, E> {
-    a: *const T,
-    b: *const E,
-}
-
-type Indirection<T> = Tuple<T, f32>;
-
-#[no_mangle]
-pub extern "C" fn root(
-    a: Foo<i32>,
-    b: Foo<f32>,
-    c: Bar<f32>,
-    d: Foo<Bar<f32>>,
-    e: Bar<Foo<f32>>,
-    f: Bar<Bar<f32>>,
-    g: Tuple<Foo<f32>, f32>,
-    h: Indirection<f32>
-) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must_use.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/must_use.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must_use.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/must_use.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,18 @@
+
+#[repr(C)]
+#[must_use]
+pub struct OwnedPtr<T> {
+    ptr: *mut T,
+}
+
+#[repr(C, u8)]
+#[must_use]
+pub enum MaybeOwnedPtr<T> {
+    Owned(*mut T),
+    None,
+}
+
+#[no_mangle]
+#[must_use]
+pub extern "C" fn maybe_consume(input: OwnedPtr<i32>) -> MaybeOwnedPtr<i32> {
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must-use.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/must-use.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must-use.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/must-use.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-
-#[repr(C)]
-#[must_use]
-pub struct OwnedPtr<T> {
-    ptr: *mut T,
-}
-
-#[repr(C, u8)]
-#[must_use]
-pub enum MaybeOwnedPtr<T> {
-    Owned(*mut T),
-    None,
-}
-
-#[no_mangle]
-#[must_use]
-pub extern "C" fn maybe_consume(input: OwnedPtr<i32>) -> MaybeOwnedPtr<i32> {
-}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must_use.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/must_use.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must_use.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/must_use.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,14 @@
+header = """
+#define MUST_USE_FUNC __attribute__((warn_unused_result))
+#define MUST_USE_STRUCT __attribute__((warn_unused))
+#define MUST_USE_ENUM /* nothing */
+"""
+
+[fn]
+must_use = "MUST_USE_FUNC"
+
+[struct]
+must_use = "MUST_USE_STRUCT"
+
+[enum]
+must_use = "MUST_USE_ENUM"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must-use.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/must-use.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/must-use.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/must-use.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-header = """
-#define MUST_USE_FUNC __attribute__((warn_unused_result))
-#define MUST_USE_STRUCT __attribute__((warn_unused))
-#define MUST_USE_ENUM /* nothing */
-"""
-
-[fn]
-must_use = "MUST_USE_FUNC"
-
-[struct]
-must_use = "MUST_USE_STRUCT"
-
-[enum]
-must_use = "MUST_USE_ENUM"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/opaque.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/opaque.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/opaque.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/opaque.toml	2021-01-18 19:59:04.000000000 +0000
@@ -1,4 +1,8 @@
 header = """
+#if 0
+''' '
+#endif
+
 #ifdef __cplusplus
 // These could be added as opaque types I guess.
 template <typename T>
@@ -6,4 +10,8 @@
 
 struct DefaultHasher;
 #endif
+
+#if 0
+' '''
+#endif
 """
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/prefix.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/prefix.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/prefix.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/prefix.rs	2021-01-18 19:59:04.000000000 +0000
@@ -11,7 +11,7 @@
 }
 
 #[no_mangle]
-pub extern "C" fn root(x: NamedLenArray, y: ValuedLenArray, z: AbsoluteFontWeight) { }
+pub extern "C" fn root(x: NamedLenArray, y: ValuedLenArray, z: AbsoluteFontWeight) {}
 
 #[no_mangle]
 pub const X: i64 = 22 << 22;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,13 @@
+struct A {
+    x: i32,
+    y: f32,
+}
+
+#[repr(C)]
+struct B {
+    x: i32,
+    y: f32,
+}
+
+#[no_mangle]
+pub extern "C" fn root(a: *const A, b: B) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-struct A {
-    x: i32,
-    y: f32,
-}
-
-#[repr(C)]
-struct B {
-    x: i32,
-    y: f32,
-}
-
-#[no_mangle]
-pub extern "C" fn root(a: *const A, b: B) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming_overrides_prefixing.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,6 @@
+[export]
+prefix = "Style"
+renaming_overrides_prefixing = true
+
+[export.rename]
+"B" = "B" # B should remain unprefixed.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/renaming-overrides-prefixing.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[export]
-prefix = "Style"
-renaming_overrides_prefixing = true
-
-[export.rename]
-"B" = "B" # B should remain unprefixed.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/simplify_option_ptr.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/simplify_option_ptr.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/simplify_option_ptr.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/simplify_option_ptr.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,24 @@
+
+struct Opaque();
+
+#[repr(C)]
+struct Foo {
+    x: Option<&Opaque>,
+    y: Option<&mut Opaque>,
+    z: Option<fn () -> ()>,
+}
+
+#[repr(C)]
+union Bar {
+    x: Option<&Opaque>,
+    y: Option<&mut Opaque>,
+    z: Option<fn () -> ()>,
+}
+
+#[no_mangle]
+pub extern "C" fn root(
+	a: Option<&Opaque>,
+    b: Option<&mut Opaque>,
+    c: Foo,
+    d: Bar
+) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/simplify-option-ptr.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/simplify-option-ptr.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/simplify-option-ptr.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/simplify-option-ptr.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-
-struct Opaque();
-
-#[repr(C)]
-struct Foo {
-    x: Option<&Opaque>,
-    y: Option<&mut Opaque>,
-    z: Option<fn () -> ()>,
-}
-
-#[repr(C)]
-union Bar {
-    x: Option<&Opaque>,
-    y: Option<&mut Opaque>,
-    z: Option<fn () -> ()>,
-}
-
-#[no_mangle]
-pub extern "C" fn root(
-	a: Option<&Opaque>,
-    b: Option<&mut Opaque>,
-    c: Foo,
-    d: Bar
-) { }
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/size_types.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/size_types.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/size_types.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/size_types.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,15 @@
+type Usize = usize;
+type Isize = isize;
+
+#[repr(usize)]
+enum UE {
+    UV,
+}
+
+#[repr(isize)]
+enum IE {
+    IV,
+}
+
+#[no_mangle]
+pub extern "C" fn root(_: Usize, _: Isize, _: UE, _: IE) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/size_types.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/size_types.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/size_types.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/size_types.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1 @@
+usize_is_size_t = true
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/style_crash.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/style_crash.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/style_crash.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/style_crash.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,7 @@
+pub trait SpecifiedValueInfo {
+    const SUPPORTED_TYPES: u8 = 0;
+}
+
+impl<T: SpecifiedValueInfo> SpecifiedValueInfo for [T] {
+    const SUPPORTED_TYPES: u8 = T::SUPPORTED_TYPES;
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/style-crash.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/style-crash.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/style-crash.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/style-crash.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-pub trait SpecifiedValueInfo {
-    const SUPPORTED_TYPES: u8 = 0;
-}
-
-impl<T: SpecifiedValueInfo> SpecifiedValueInfo for [T] {
-    const SUPPORTED_TYPES: u8 = T::SUPPORTED_TYPES;
-}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/swift_name.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/swift_name.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/swift_name.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/swift_name.rs	2021-01-18 19:59:04.000000000 +0000
@@ -122,7 +122,6 @@
     PointerToOpaque { ptr: Box::into_raw(Box::new(Opaque { times })) }
   }
 
-  /// cbindgen:postfix=/*a comment!*/
   #[export_name="PointerToOpaque_sayHello"]
   pub extern fn say_hello(self: PointerToOpaque) {
     if let Some(nonnull) = std::ptr::NonNull::new(self.ptr) {
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform_op.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/transform_op.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform_op.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/transform_op.rs	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,43 @@
+#[repr(C)]
+pub struct Point<T> {
+    pub x: T,
+    pub y: T,
+}
+
+#[repr(u8)]
+pub enum Foo<T> {
+    Foo { x: i32, y: Point<T>, z: Point<f32>, },
+    Bar(T),
+    Baz(Point<T>),
+    Bazz,
+}
+
+#[repr(C)]
+pub enum Bar<T> {
+    Bar1 { x: i32, y: Point<T>, z: Point<f32>, u: unsafe extern "C" fn(i32) -> i32,  },
+    Bar2(T),
+    Bar3(Point<T>),
+    Bar4,
+}
+
+#[repr(u8)]
+pub enum Baz {
+    Baz1(Bar<u32>),
+    Baz2(Point<i32>),
+    Baz3,
+}
+
+#[repr(C, u8)]
+pub enum Taz {
+    Taz1(Bar<u32>),
+    Taz2(Baz),
+    Taz3,
+}
+
+#[no_mangle]
+pub extern "C" fn foo(
+    foo: *const Foo<i32>,
+    bar: *const Bar<i32>,
+    baz: *const Baz,
+    taz: *const Taz,
+) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform-op.rs firefox-85.0+build1/third_party/cbindgen/tests/rust/transform-op.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform-op.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/transform-op.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-#[repr(C)]
-pub struct Point<T> {
-    pub x: T,
-    pub y: T,
-}
-
-#[repr(u8)]
-pub enum Foo<T> {
-    Foo { x: i32, y: Point<T>, z: Point<f32>, },
-    Bar(T),
-    Baz(Point<T>),
-    Bazz,
-}
-
-#[repr(C)]
-pub enum Bar<T> {
-    Bar1 { x: i32, y: Point<T>, z: Point<f32>, u: unsafe extern "C" fn(i32) -> i32,  },
-    Bar2(T),
-    Bar3(Point<T>),
-    Bar4,
-}
-
-#[repr(u8)]
-pub enum Baz {
-    Baz1(Bar<u32>),
-    Baz2(Point<i32>),
-    Baz3,
-}
-
-#[repr(C, u8)]
-pub enum Taz {
-    Taz1(Bar<u32>),
-    Taz2(Baz),
-    Taz3,
-}
-
-#[no_mangle]
-pub extern "C" fn foo(
-    foo: *const Foo<i32>,
-    bar: *const Bar<i32>,
-    baz: *const Baz,
-    taz: *const Taz,
-) {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform_op.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/transform_op.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform_op.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/transform_op.toml	2021-01-18 19:59:04.000000000 +0000
@@ -0,0 +1,7 @@
+[export]
+prefix = "Style"
+
+[enum]
+derive_helper_methods = true
+derive_const_casts = true
+derive_mut_casts = true
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform-op.toml firefox-85.0+build1/third_party/cbindgen/tests/rust/transform-op.toml
--- firefox-84.0.2+build1/third_party/cbindgen/tests/rust/transform-op.toml	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/rust/transform-op.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[export]
-prefix = "Style"
-
-[enum]
-derive_helper_methods = true
-derive_const_casts = true
-derive_mut_casts = true
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/tests/tests.rs firefox-85.0+build1/third_party/cbindgen/tests/tests.rs
--- firefox-84.0.2+build1/third_party/cbindgen/tests/tests.rs	2021-01-06 11:23:44.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/tests/tests.rs	2021-01-18 19:59:04.000000000 +0000
@@ -1,6 +1,7 @@
 extern crate cbindgen;
 
 use cbindgen::*;
+use std::collections::HashSet;
 use std::path::Path;
 use std::process::Command;
 use std::{env, fs, str};
@@ -20,7 +21,7 @@
     language: Language,
     cpp_compat: bool,
     style: Option<Style>,
-) {
+) -> Vec<u8> {
     let program = Path::new(cbindgen_path);
     let mut command = Command::new(&program);
     match language {
@@ -32,20 +33,16 @@
                 command.arg("--cpp-compat");
             }
         }
+        Language::Cython => {
+            command.arg("--lang").arg("cython");
+        }
     }
 
     if let Some(style) = style {
         command.arg("--style").arg(style_str(style));
     }
 
-    command.arg("-o").arg(output);
-
-    if env::var("CBINDGEN_TEST_VERIFY").is_ok() {
-        command.arg("--verify");
-    }
-
-    let mut config = path.clone().to_path_buf();
-    config.set_extension("toml");
+    let config = path.with_extension("toml");
     if config.exists() {
         command.arg("--config").arg(config);
     }
@@ -60,6 +57,7 @@
         output,
         str::from_utf8(&cbindgen_output.stderr).unwrap_or_default()
     );
+    cbindgen_output.stdout
 }
 
 fn compile(
@@ -73,6 +71,7 @@
     let cc = match language {
         Language::Cxx => env::var("CXX").unwrap_or_else(|_| "g++".to_owned()),
         Language::C => env::var("CC").unwrap_or_else(|_| "gcc".to_owned()),
+        Language::Cython => env::var("CYTHON").unwrap_or_else(|_| "cython".to_owned()),
     };
 
     let file_name = cbindgen_output
@@ -82,45 +81,58 @@
     object.set_extension("o");
 
     let mut command = Command::new(cc);
-    command.arg("-D").arg("DEFINED");
-    command.arg("-I").arg(tests_path);
-    command.arg("-Wall");
-    if !skip_warning_as_error {
-        command.arg("-Werror");
-    }
-    // `swift_name` is not recognzied by gcc.
-    command.arg("-Wno-attributes");
-    // clang warns about unused const variables.
-    command.arg("-Wno-unused-const-variable");
-    // clang also warns about returning non-instantiated templates (they could
-    // be specialized, but they're not so it's fine).
-    command.arg("-Wno-return-type-c-linkage");
-    if let Language::Cxx = language {
-        // enum class is a c++11 extension which makes g++ on macos 10.14 error out
-        // inline variables are are a c++17 extension
-        command.arg("-std=c++17");
-        // Prevents warnings when compiling .c files as c++.
-        command.arg("-x").arg("c++");
-        if let Ok(extra_flags) = env::var("CXXFLAGS") {
-            command.args(extra_flags.split_whitespace());
+    match language {
+        Language::Cxx | Language::C => {
+            command.arg("-D").arg("DEFINED");
+            command.arg("-I").arg(tests_path);
+            command.arg("-Wall");
+            if !skip_warning_as_error {
+                command.arg("-Werror");
+            }
+            // `swift_name` is not recognzied by gcc.
+            command.arg("-Wno-attributes");
+            // clang warns about unused const variables.
+            command.arg("-Wno-unused-const-variable");
+            // clang also warns about returning non-instantiated templates (they could
+            // be specialized, but they're not so it's fine).
+            command.arg("-Wno-return-type-c-linkage");
+            if let Language::Cxx = language {
+                // enum class is a c++11 extension which makes g++ on macos 10.14 error out
+                // inline variables are are a c++17 extension
+                command.arg("-std=c++17");
+                // Prevents warnings when compiling .c files as c++.
+                command.arg("-x").arg("c++");
+                if let Ok(extra_flags) = env::var("CXXFLAGS") {
+                    command.args(extra_flags.split_whitespace());
+                }
+            } else {
+                if let Ok(extra_flags) = env::var("CFLAGS") {
+                    command.args(extra_flags.split_whitespace());
+                }
+            }
+
+            if let Some(style) = style {
+                command.arg("-D");
+                command.arg(format!(
+                    "CBINDGEN_STYLE_{}",
+                    style_str(style).to_uppercase()
+                ));
+            }
+
+            command.arg("-o").arg(&object);
+            command.arg("-c").arg(cbindgen_output);
         }
-    } else {
-        if let Ok(extra_flags) = env::var("CFLAGS") {
-            command.args(extra_flags.split_whitespace());
+        Language::Cython => {
+            command.arg("-Wextra");
+            if !skip_warning_as_error {
+                command.arg("-Werror");
+            }
+            command.arg("-3");
+            command.arg("-o").arg(&object);
+            command.arg(cbindgen_output);
         }
     }
 
-    if let Some(style) = style {
-        command.arg("-D");
-        command.arg(format!(
-            "CBINDGEN_STYLE_{}",
-            style_str(style).to_uppercase()
-        ));
-    }
-
-    command.arg("-o").arg(&object);
-    command.arg("-c").arg(cbindgen_output);
-
     println!("Running: {:?}", command);
     let out = command.output().expect("failed to compile");
     assert!(out.status.success(), "Output failed to compile: {:?}", out);
@@ -140,40 +152,38 @@
     language: Language,
     cpp_compat: bool,
     style: Option<Style>,
+    cbindgen_outputs: &mut HashSet<Vec<u8>>,
 ) {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let tests_path = Path::new(&crate_dir).join("tests");
     let mut generated_file = tests_path.join("expectations");
-    if let Some(style) = style {
-        match style {
-            Style::Both => {
-                generated_file.push("both");
-            }
-            Style::Tag => {
-                generated_file.push("tag");
-            }
-            Style::Type => {}
-        }
-    }
+    fs::create_dir_all(&generated_file).unwrap();
 
-    let ext = match language {
-        Language::Cxx => "cpp",
-        Language::C => {
-            if cpp_compat {
-                "compat.c"
-            } else {
-                "c"
-            }
-        }
+    let style_ext = style
+        .map(|style| match style {
+            Style::Both => ".both",
+            Style::Tag => ".tag",
+            Style::Type => "",
+        })
+        .unwrap_or_default();
+    let lang_ext = match language {
+        Language::Cxx => ".cpp",
+        Language::C if cpp_compat => ".compat.c",
+        Language::C => ".c",
+        // cbindgen is supposed to generate declaration files (`.pxd`), but `cython` compiler
+        // is extension-sensitive and won't work on them, so we use implementation files (`.pyx`)
+        // in the test suite.
+        Language::Cython => ".pyx",
     };
 
     let skip_warning_as_error = name.rfind(SKIP_WARNING_AS_ERROR_SUFFIX).is_some();
 
-    let source_file = format!("{}.{}", &name, &ext).replace(SKIP_WARNING_AS_ERROR_SUFFIX, "");
+    let source_file =
+        format!("{}{}{}", name, style_ext, lang_ext).replace(SKIP_WARNING_AS_ERROR_SUFFIX, "");
 
     generated_file.push(source_file);
 
-    run_cbindgen(
+    let cbindgen_output = run_cbindgen(
         cbindgen_path,
         path,
         &generated_file,
@@ -182,24 +192,44 @@
         style,
     );
 
-    compile(
-        &generated_file,
-        &tests_path,
-        tmp_dir,
-        language,
-        style,
-        skip_warning_as_error,
-    );
+    if cbindgen_outputs.contains(&cbindgen_output) {
+        // We already generated an identical file previously.
+        if env::var_os("CBINDGEN_TEST_VERIFY").is_some() {
+            assert!(!generated_file.exists());
+        } else {
+            if generated_file.exists() {
+                fs::remove_file(&generated_file).unwrap();
+            }
+        }
+    } else {
+        if env::var_os("CBINDGEN_TEST_VERIFY").is_some() {
+            let prev_cbindgen_output = fs::read(&generated_file).unwrap();
+            assert_eq!(cbindgen_output, prev_cbindgen_output);
+        } else {
+            fs::write(&generated_file, &cbindgen_output).unwrap();
+        }
+
+        cbindgen_outputs.insert(cbindgen_output);
 
-    if language == Language::C && cpp_compat {
         compile(
             &generated_file,
             &tests_path,
             tmp_dir,
-            Language::Cxx,
+            language,
             style,
             skip_warning_as_error,
         );
+
+        if language == Language::C && cpp_compat {
+            compile(
+                &generated_file,
+                &tests_path,
+                tmp_dir,
+                Language::Cxx,
+                style,
+                skip_warning_as_error,
+            );
+        }
     }
 }
 
@@ -210,8 +240,11 @@
         .tempdir()
         .expect("Creating tmp dir failed");
     let tmp_dir = tmp_dir.path();
-    for style in &[Style::Type, Style::Tag, Style::Both] {
-        for cpp_compat in &[true, false] {
+    // Run tests in deduplication priority order. C++ compatibility tests are run first,
+    // otherwise we would lose the C++ compiler run if they were deduplicated.
+    let mut cbindgen_outputs = HashSet::new();
+    for cpp_compat in &[true, false] {
+        for style in &[Style::Type, Style::Tag, Style::Both] {
             run_compile_test(
                 cbindgen_path,
                 name,
@@ -220,6 +253,7 @@
                 Language::C,
                 *cpp_compat,
                 Some(*style),
+                &mut cbindgen_outputs,
             );
         }
     }
@@ -232,7 +266,23 @@
         Language::Cxx,
         /* cpp_compat = */ false,
         None,
+        &mut HashSet::new(),
     );
+
+    // `Style::Both` should be identical to `Style::Tag` for Cython.
+    let mut cbindgen_outputs = HashSet::new();
+    for style in &[Style::Type, Style::Tag] {
+        run_compile_test(
+            cbindgen_path,
+            name,
+            &test,
+            tmp_dir,
+            Language::Cython,
+            /* cpp_compat = */ false,
+            Some(*style),
+            &mut cbindgen_outputs,
+        );
+    }
 }
 
 macro_rules! test_file {
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/bitflags.rs firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/bitflags.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/bitflags.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/bitflags.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,51 @@
+// Copyright (c) 2018 Nuxi (https://nuxi.nl/) and contributors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. 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 AUTHOR 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 AUTHOR 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.
+
+// Appease Rust's tidy.
+// ignore-license
+
+#[cfg(feature = "bitflags")]
+#[macro_use]
+extern crate bitflags;
+
+// Minimal implementation of bitflags! in case we can't depend on the bitflags
+// crate. Only implements `bits()` and a `from_bits_truncate()` that doesn't
+// actually truncate.
+#[cfg(not(feature = "bitflags"))]
+macro_rules! bitflags {
+  (
+    $(#[$attr:meta])*
+    pub struct $name:ident: $type:ty {
+      $($(#[$const_attr:meta])* const $const:ident = $val:expr;)*
+    }
+  ) => {
+    $(#[$attr])*
+    #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+    pub struct $name { bits: $type }
+    impl $name {
+      $($(#[$const_attr])* pub const $const: $name = $name{ bits: $val };)*
+      pub fn bits(&self) -> $type { self.bits }
+      pub fn from_bits_truncate(bits: $type) -> Self { $name{ bits } }
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"16ef935056e2aaf48b28c1340a63cc75febaabc901c752da9a3a2edbe081b429","bitflags.rs":"4621173dcf1307094cf240d26955b6f25c2f770dfd4e975ec2728771209006b5","cloudabi.rs":"93e139ba72a04db4934b04a6f21b054757a218a687e0bd2f6ba32514ec8c5f38"},"package":"ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,31 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "cloudabi"
+version = "0.0.3"
+authors = ["Nuxi (https://nuxi.nl/) and contributors"]
+description = "Low level interface to CloudABI. Contains all syscalls and related types."
+homepage = "https://nuxi.nl/cloudabi/"
+documentation = "https://docs.rs/cloudabi/"
+keywords = ["cloudabi"]
+license = "BSD-2-Clause"
+repository = "https://github.com/nuxinl/cloudabi"
+
+[lib]
+path = "cloudabi.rs"
+[dependencies.bitflags]
+version = "1.0"
+optional = true
+
+[features]
+default = ["bitflags"]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/cloudabi.rs firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/cloudabi.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/cloudabi/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/cloudabi/cloudabi.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,2847 @@
+// Copyright (c) 2016-2017 Nuxi (https://nuxi.nl/) and contributors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. 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 AUTHOR 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 AUTHOR 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.
+//
+// This file is automatically generated. Do not edit.
+//
+// Source: https://github.com/NuxiNL/cloudabi
+
+// Appease Rust's tidy.
+// ignore-license
+// ignore-tidy-linelength
+
+//! **PLEASE NOTE: This entire crate including this
+//! documentation is automatically generated from
+//! [`cloudabi.txt`](https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt)**
+//!
+//! # Nuxi CloudABI
+//!
+//! CloudABI is what you get if you take POSIX, add capability-based
+//! security, and remove everything that's incompatible with that. The
+//! result is a minimal ABI consisting of only 49 syscalls.
+//!
+//! CloudABI doesn't have its own kernel, but instead is implemented in existing
+//! kernels: FreeBSD has CloudABI support for x86-64 and arm64, and [a patch-set
+//! for NetBSD](https://github.com/NuxiNL/netbsd) and [a patch-set for
+//! Linux](https://github.com/NuxiNL/linux) are available as well. This means that
+//! CloudABI binaries can be executed on different operating systems, without any
+//! modification.
+//!
+//! ## Capability-Based Security
+//!
+//! Capability-based security means that processes can only perform
+//! actions that have no global impact. Processes cannot open files by
+//! their absolute path, cannot open network connections, and cannot
+//! observe global system state such as the process table.
+//!
+//! The capabilities of a process are fully determined by its set of open
+//! file descriptors (fds). For example, files can only be opened if the
+//! process already has a file descriptor to a directory the file is in.
+//!
+//! Unlike in POSIX, where processes are normally started with file
+//! descriptors 0, 1, and 2 reserved for standard input, output, and
+//! error, CloudABI does not reserve any file descriptor numbers for
+//! specific purposes.
+//!
+//! In CloudABI, a process depends on its parent process to launch it with
+//! the right set of resources, since the process will not be able to open
+//! any new resources. For example, a simple static web server would need
+//! to be started with a file descriptor to a [TCP
+//! listener](https://github.com/NuxiNL/flower), and a file descriptor to
+//! the directory for which to serve files. The web server will then be
+//! unable to do anything other than reading files in that directory, and
+//! process incoming network connections.
+//!
+//! So, unknown CloudABI binaries can safely be executed without the need
+//! for containers, virtual machines, or other sandboxing technologies.
+//!
+//! Watch [Ed Schouten's Talk at
+//! 32C3](https://www.youtube.com/watch?v=3N29vrPoDv8) for more
+//! information about what capability-based security for UNIX means.
+//!
+//! ## Cloudlibc
+//!
+//! [Cloudlibc](https://github.com/NuxiNL/cloudlibc) is an implementation
+//! of the C standard library, without all CloudABI-incompatible
+//! functions. For example, Cloudlibc does not have `printf`, but does
+//! have `fprintf`. It does not have `open`, but does have `openat`.
+//!
+//! ## CloudABI-Ports
+//!
+//! [CloudABI-Ports](https://github.com/NuxiNL/cloudabi-ports) is a
+//! collection of ports of commonly used libraries and applications to
+//! CloudABI. It contains software such as `zlib`, `libpng`, `boost`,
+//! `memcached`, and much more. The software is patched to not depend on
+//! any global state, such as files in `/etc` or `/dev`, using `open()`,
+//! etc.
+//!
+//! ## Using CloudABI
+//!
+//! Instructions for using CloudABI (including kernel modules/patches,
+//! toolchain, and ports) are available for several operating systems:
+//!
+//! - [Arch Linux](https://nuxi.nl/cloudabi/archlinux/)
+//! - [Debian, Ubuntu, and other Debian derivatives](https://nuxi.nl/cloudabi/debian/)
+//! - [FreeBSD, PC-BSD and DragonFly BSD](https://nuxi.nl/cloudabi/freebsd/)
+//! - [Mac OS X](https://nuxi.nl/cloudabi/mac/)
+//! - [NetBSD](https://nuxi.nl/cloudabi/netbsd/)
+//!
+//! ## Specification of the ABI
+//!
+//! The entire ABI is specified in a a file called
+//! [`cloudabi.txt`](https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt),
+//! from which all
+//! [headers](https://github.com/NuxiNL/cloudabi/tree/master/headers)
+//! and documentation (including the one you're reading now) is generated.
+
+#![no_std]
+#![allow(non_camel_case_types)]
+
+include!("bitflags.rs");
+
+/// File or memory access pattern advisory information.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum advice {
+  /// The application expects that it will not access the
+  /// specified data in the near future.
+  DONTNEED   = 1,
+  /// The application expects to access the specified data
+  /// once and then not reuse it thereafter.
+  NOREUSE    = 2,
+  /// The application has no advice to give on its behavior
+  /// with respect to the specified data.
+  NORMAL     = 3,
+  /// The application expects to access the specified data
+  /// in a random order.
+  RANDOM     = 4,
+  /// The application expects to access the specified data
+  /// sequentially from lower offsets to higher offsets.
+  SEQUENTIAL = 5,
+  /// The application expects to access the specified data
+  /// in the near future.
+  WILLNEED   = 6,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+/// Enumeration describing the kind of value stored in [`auxv`](struct.auxv.html).
+#[repr(u32)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum auxtype {
+  /// Base address of the binary argument data provided to
+  /// [`proc_exec()`](fn.proc_exec.html).
+  ARGDATA      = 256,
+  /// Length of the binary argument data provided to
+  /// [`proc_exec()`](fn.proc_exec.html).
+  ARGDATALEN   = 257,
+  /// Base address at which the executable is placed in
+  /// memory.
+  BASE         =   7,
+  /// Base address of a buffer of random data that may be
+  /// used for non-cryptographic purposes, for example as a
+  /// canary for stack smashing protection.
+  CANARY       = 258,
+  /// Length of a buffer of random data that may be used
+  /// for non-cryptographic purposes, for example as a
+  /// canary for stack smashing protection.
+  CANARYLEN    = 259,
+  /// Number of CPUs that the system this process is running
+  /// on has.
+  NCPUS        = 260,
+  /// Terminator of the auxiliary vector.
+  NULL         =   0,
+  /// Smallest memory object size for which individual
+  /// memory protection controls can be configured.
+  PAGESZ       =   6,
+  /// Address of the first ELF program header of the
+  /// executable.
+  PHDR         =   3,
+  /// Number of ELF program headers of the executable.
+  PHNUM        =   4,
+  /// Identifier of the process.
+  ///
+  /// This environment does not provide any simple numerical
+  /// process identifiers, for the reason that these are not
+  /// useful in distributed contexts. Instead, processes are
+  /// identified by a UUID.
+  ///
+  /// This record should point to sixteen bytes of binary
+  /// data, containing a version 4 UUID (fully random).
+  PID          = 263,
+  /// Address of the ELF header of the vDSO.
+  ///
+  /// The vDSO is a shared library that is mapped in the
+  /// address space of the process. It provides entry points
+  /// for every system call supported by the environment,
+  /// all having a corresponding symbol that is prefixed
+  /// with `cloudabi_sys_`. System calls should be invoked
+  /// through these entry points.
+  ///
+  /// The first advantage of letting processes call into a
+  /// vDSO to perform system calls instead of raising
+  /// hardware traps is that it allows for easy emulation of
+  /// executables on top of existing operating systems. The
+  /// second advantage is that in cases where an operating
+  /// system provides native support for CloudABI executables,
+  /// it may still implement partial userspace
+  /// implementations of these system calls to improve
+  /// performance (e.g., [`clock_time_get()`](fn.clock_time_get.html)). It also provides
+  /// a more dynamic way of adding, removing or replacing
+  /// system calls.
+  SYSINFO_EHDR = 262,
+  /// Thread ID of the initial thread of the process.
+  TID          = 261,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u32,
+}
+
+/// Identifiers for clocks.
+#[repr(u32)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum clockid {
+  /// The system-wide monotonic clock, which is defined as a
+  /// clock measuring real time, whose value cannot be
+  /// adjusted and which cannot have negative clock jumps.
+  ///
+  /// The epoch of this clock is undefined. The absolute
+  /// time value of this clock therefore has no meaning.
+  MONOTONIC          = 1,
+  /// The CPU-time clock associated with the current
+  /// process.
+  PROCESS_CPUTIME_ID = 2,
+  /// The system-wide clock measuring real time. Time value
+  /// zero corresponds with 1970-01-01T00:00:00Z.
+  REALTIME           = 3,
+  /// The CPU-time clock associated with the current thread.
+  THREAD_CPUTIME_ID  = 4,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u32,
+}
+
+/// A userspace condition variable.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct condvar(pub u32);
+/// The condition variable is in its initial state. There
+/// are no threads waiting to be woken up. If the
+/// condition variable has any other value, the kernel
+/// must be called to wake up any sleeping threads.
+pub const CONDVAR_HAS_NO_WAITERS: condvar = condvar(0);
+
+/// Identifier for a device containing a file system. Can be used
+/// in combination with [`inode`](struct.inode.html) to uniquely identify a file on the
+/// local system.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct device(pub u64);
+
+/// A reference to the offset of a directory entry.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct dircookie(pub u64);
+/// Permanent reference to the first directory entry
+/// within a directory.
+pub const DIRCOOKIE_START: dircookie = dircookie(0);
+
+/// Error codes returned by system calls.
+///
+/// Not all of these error codes are returned by the system calls
+/// provided by this environment, but are either used in userspace
+/// exclusively or merely provided for alignment with POSIX.
+#[repr(u16)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum errno {
+  /// No error occurred. System call completed successfully.
+  SUCCESS        =  0,
+  /// Argument list too long.
+  TOOBIG         =  1,
+  /// Permission denied.
+  ACCES          =  2,
+  /// Address in use.
+  ADDRINUSE      =  3,
+  /// Address not available.
+  ADDRNOTAVAIL   =  4,
+  /// Address family not supported.
+  AFNOSUPPORT    =  5,
+  /// Resource unavailable, or operation would block.
+  AGAIN          =  6,
+  /// Connection already in progress.
+  ALREADY        =  7,
+  /// Bad file descriptor.
+  BADF           =  8,
+  /// Bad message.
+  BADMSG         =  9,
+  /// Device or resource busy.
+  BUSY           = 10,
+  /// Operation canceled.
+  CANCELED       = 11,
+  /// No child processes.
+  CHILD          = 12,
+  /// Connection aborted.
+  CONNABORTED    = 13,
+  /// Connection refused.
+  CONNREFUSED    = 14,
+  /// Connection reset.
+  CONNRESET      = 15,
+  /// Resource deadlock would occur.
+  DEADLK         = 16,
+  /// Destination address required.
+  DESTADDRREQ    = 17,
+  /// Mathematics argument out of domain of function.
+  DOM            = 18,
+  /// Reserved.
+  DQUOT          = 19,
+  /// File exists.
+  EXIST          = 20,
+  /// Bad address.
+  FAULT          = 21,
+  /// File too large.
+  FBIG           = 22,
+  /// Host is unreachable.
+  HOSTUNREACH    = 23,
+  /// Identifier removed.
+  IDRM           = 24,
+  /// Illegal byte sequence.
+  ILSEQ          = 25,
+  /// Operation in progress.
+  INPROGRESS     = 26,
+  /// Interrupted function.
+  INTR           = 27,
+  /// Invalid argument.
+  INVAL          = 28,
+  /// I/O error.
+  IO             = 29,
+  /// Socket is connected.
+  ISCONN         = 30,
+  /// Is a directory.
+  ISDIR          = 31,
+  /// Too many levels of symbolic links.
+  LOOP           = 32,
+  /// File descriptor value too large.
+  MFILE          = 33,
+  /// Too many links.
+  MLINK          = 34,
+  /// Message too large.
+  MSGSIZE        = 35,
+  /// Reserved.
+  MULTIHOP       = 36,
+  /// Filename too long.
+  NAMETOOLONG    = 37,
+  /// Network is down.
+  NETDOWN        = 38,
+  /// Connection aborted by network.
+  NETRESET       = 39,
+  /// Network unreachable.
+  NETUNREACH     = 40,
+  /// Too many files open in system.
+  NFILE          = 41,
+  /// No buffer space available.
+  NOBUFS         = 42,
+  /// No such device.
+  NODEV          = 43,
+  /// No such file or directory.
+  NOENT          = 44,
+  /// Executable file format error.
+  NOEXEC         = 45,
+  /// No locks available.
+  NOLCK          = 46,
+  /// Reserved.
+  NOLINK         = 47,
+  /// Not enough space.
+  NOMEM          = 48,
+  /// No message of the desired type.
+  NOMSG          = 49,
+  /// Protocol not available.
+  NOPROTOOPT     = 50,
+  /// No space left on device.
+  NOSPC          = 51,
+  /// Function not supported.
+  NOSYS          = 52,
+  /// The socket is not connected.
+  NOTCONN        = 53,
+  /// Not a directory or a symbolic link to a directory.
+  NOTDIR         = 54,
+  /// Directory not empty.
+  NOTEMPTY       = 55,
+  /// State not recoverable.
+  NOTRECOVERABLE = 56,
+  /// Not a socket.
+  NOTSOCK        = 57,
+  /// Not supported, or operation not supported on socket.
+  NOTSUP         = 58,
+  /// Inappropriate I/O control operation.
+  NOTTY          = 59,
+  /// No such device or address.
+  NXIO           = 60,
+  /// Value too large to be stored in data type.
+  OVERFLOW       = 61,
+  /// Previous owner died.
+  OWNERDEAD      = 62,
+  /// Operation not permitted.
+  PERM           = 63,
+  /// Broken pipe.
+  PIPE           = 64,
+  /// Protocol error.
+  PROTO          = 65,
+  /// Protocol not supported.
+  PROTONOSUPPORT = 66,
+  /// Protocol wrong type for socket.
+  PROTOTYPE      = 67,
+  /// Result too large.
+  RANGE          = 68,
+  /// Read-only file system.
+  ROFS           = 69,
+  /// Invalid seek.
+  SPIPE          = 70,
+  /// No such process.
+  SRCH           = 71,
+  /// Reserved.
+  STALE          = 72,
+  /// Connection timed out.
+  TIMEDOUT       = 73,
+  /// Text file busy.
+  TXTBSY         = 74,
+  /// Cross-device link.
+  XDEV           = 75,
+  /// Extension: Capabilities insufficient.
+  NOTCAPABLE     = 76,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u16,
+}
+
+bitflags! {
+  /// The state of the file descriptor subscribed to with
+  /// [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
+  #[repr(C)]
+  pub struct eventrwflags: u16 {
+    /// The peer of this socket has closed or disconnected.
+    const HANGUP = 0x0001;
+  }
+}
+
+/// Type of a subscription to an event or its occurrence.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum eventtype {
+  /// The time value of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id)
+  /// has reached timestamp [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout).
+  CLOCK          = 1,
+  /// Condition variable [`subscription.union.condvar.condvar`](struct.subscription_condvar.html#structfield.condvar) has
+  /// been woken up and [`subscription.union.condvar.lock`](struct.subscription_condvar.html#structfield.lock) has been
+  /// acquired for writing.
+  CONDVAR        = 2,
+  /// File descriptor [`subscription.union.fd_readwrite.fd`](struct.subscription_fd_readwrite.html#structfield.fd) has
+  /// data available for reading. This event always triggers
+  /// for regular files.
+  FD_READ        = 3,
+  /// File descriptor [`subscription.union.fd_readwrite.fd`](struct.subscription_fd_readwrite.html#structfield.fd) has
+  /// capacity available for writing. This event always
+  /// triggers for regular files.
+  FD_WRITE       = 4,
+  /// Lock [`subscription.union.lock.lock`](struct.subscription_lock.html#structfield.lock) has been acquired for
+  /// reading.
+  LOCK_RDLOCK    = 5,
+  /// Lock [`subscription.union.lock.lock`](struct.subscription_lock.html#structfield.lock) has been acquired for
+  /// writing.
+  LOCK_WRLOCK    = 6,
+  /// The process associated with process descriptor
+  /// [`subscription.union.proc_terminate.fd`](struct.subscription_proc_terminate.html#structfield.fd) has terminated.
+  PROC_TERMINATE = 7,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+/// Exit code generated by a process when exiting.
+pub type exitcode = u32;
+
+/// A file descriptor number.
+///
+/// Unlike on POSIX-compliant systems, none of the file descriptor
+/// numbers are reserved for a purpose (e.g., stdin, stdout,
+/// stderr). Operating systems are not required to allocate new
+/// file descriptors in ascending order.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct fd(pub u32);
+/// Returned to the child process by [`proc_fork()`](fn.proc_fork.html).
+pub const PROCESS_CHILD: fd = fd(0xffffffff);
+/// Passed to [`mem_map()`](fn.mem_map.html) when creating a mapping to
+/// anonymous memory.
+pub const MAP_ANON_FD  : fd = fd(0xffffffff);
+
+bitflags! {
+  /// File descriptor flags.
+  #[repr(C)]
+  pub struct fdflags: u16 {
+    /// Append mode: Data written to the file is always
+    /// appended to the file's end.
+    const APPEND   = 0x0001;
+    /// Write according to synchronized I/O data integrity
+    /// completion. Only the data stored in the file is
+    /// synchronized.
+    const DSYNC    = 0x0002;
+    /// Non-blocking mode.
+    const NONBLOCK = 0x0004;
+    /// Synchronized read I/O operations.
+    const RSYNC    = 0x0008;
+    /// Write according to synchronized I/O file integrity
+    /// completion. In addition to synchronizing the data
+    /// stored in the file, the system may also synchronously
+    /// update the file's metadata.
+    const SYNC     = 0x0010;
+  }
+}
+
+bitflags! {
+  /// Which file descriptor attributes to adjust.
+  #[repr(C)]
+  pub struct fdsflags: u16 {
+    /// Adjust the file descriptor flags stored in
+    /// [`fdstat.fs_flags`](struct.fdstat.html#structfield.fs_flags).
+    const FLAGS  = 0x0001;
+    /// Restrict the rights of the file descriptor to the
+    /// rights stored in [`fdstat.fs_rights_base`](struct.fdstat.html#structfield.fs_rights_base) and
+    /// [`fdstat.fs_rights_inheriting`](struct.fdstat.html#structfield.fs_rights_inheriting).
+    const RIGHTS = 0x0002;
+  }
+}
+
+/// Relative offset within a file.
+pub type filedelta = i64;
+
+/// Non-negative file size or length of a region within a file.
+pub type filesize = u64;
+
+/// The type of a file descriptor or file.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum filetype {
+  /// The type of the file descriptor or file is unknown or
+  /// is different from any of the other types specified.
+  UNKNOWN          =   0,
+  /// The file descriptor or file refers to a block device
+  /// inode.
+  BLOCK_DEVICE     =  16,
+  /// The file descriptor or file refers to a character
+  /// device inode.
+  CHARACTER_DEVICE =  17,
+  /// The file descriptor or file refers to a directory
+  /// inode.
+  DIRECTORY        =  32,
+  /// The file descriptor refers to a process handle.
+  PROCESS          =  80,
+  /// The file descriptor or file refers to a regular file
+  /// inode.
+  REGULAR_FILE     =  96,
+  /// The file descriptor refers to a shared memory object.
+  SHARED_MEMORY    = 112,
+  /// The file descriptor or file refers to a datagram
+  /// socket.
+  SOCKET_DGRAM     = 128,
+  /// The file descriptor or file refers to a byte-stream
+  /// socket.
+  SOCKET_STREAM    = 130,
+  /// The file refers to a symbolic link inode.
+  SYMBOLIC_LINK    = 144,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+bitflags! {
+  /// Which file attributes to adjust.
+  #[repr(C)]
+  pub struct fsflags: u16 {
+    /// Adjust the last data access timestamp to the value
+    /// stored in [`filestat.st_atim`](struct.filestat.html#structfield.st_atim).
+    const ATIM     = 0x0001;
+    /// Adjust the last data access timestamp to the time
+    /// of clock [`REALTIME`](enum.clockid.html#variant.REALTIME).
+    const ATIM_NOW = 0x0002;
+    /// Adjust the last data modification timestamp to the
+    /// value stored in [`filestat.st_mtim`](struct.filestat.html#structfield.st_mtim).
+    const MTIM     = 0x0004;
+    /// Adjust the last data modification timestamp to the
+    /// time of clock [`REALTIME`](enum.clockid.html#variant.REALTIME).
+    const MTIM_NOW = 0x0008;
+    /// Truncate or extend the file to the size stored in
+    /// [`filestat.st_size`](struct.filestat.html#structfield.st_size).
+    const SIZE     = 0x0010;
+  }
+}
+
+/// File serial number that is unique within its file system.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct inode(pub u64);
+
+/// Number of hard links to an inode.
+pub type linkcount = u32;
+
+/// A userspace read-recursive readers-writer lock, similar to a
+/// Linux futex or a FreeBSD umtx.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct lock(pub u32);
+/// Value indicating that the lock is in its initial
+/// unlocked state.
+pub const LOCK_UNLOCKED      : lock = lock(0x00000000);
+/// Bitmask indicating that the lock is write-locked. If
+/// set, the lower 30 bits of the lock contain the
+/// identifier of the thread that owns the write lock.
+/// Otherwise, the lower 30 bits of the lock contain the
+/// number of acquired read locks.
+pub const LOCK_WRLOCKED      : lock = lock(0x40000000);
+/// Bitmask indicating that the lock is either read locked
+/// or write locked, and that one or more threads have
+/// their execution suspended, waiting to acquire the
+/// lock. The last owner of the lock must call the
+/// kernel to unlock.
+///
+/// When the lock is acquired for reading and this bit is
+/// set, it means that one or more threads are attempting
+/// to acquire this lock for writing. In that case, other
+/// threads should only acquire additional read locks if
+/// suspending execution would cause a deadlock. It is
+/// preferred to suspend execution, as this prevents
+/// starvation of writers.
+pub const LOCK_KERNEL_MANAGED: lock = lock(0x80000000);
+/// Value indicating that the lock is in an incorrect
+/// state. A lock cannot be in its initial unlocked state,
+/// while also managed by the kernel.
+pub const LOCK_BOGUS         : lock = lock(0x80000000);
+
+bitflags! {
+  /// Flags determining the method of how paths are resolved.
+  #[repr(C)]
+  pub struct lookupflags: u32 {
+    /// As long as the resolved path corresponds to a symbolic
+    /// link, it is expanded.
+    const SYMLINK_FOLLOW = 0x00000001;
+  }
+}
+
+bitflags! {
+  /// Memory mapping flags.
+  #[repr(C)]
+  pub struct mflags: u8 {
+    /// Instead of mapping the contents of the file provided,
+    /// create a mapping to anonymous memory. The file
+    /// descriptor argument must be set to [`MAP_ANON_FD`](constant.MAP_ANON_FD.html),
+    /// and the offset must be set to zero.
+    const ANON    = 0x01;
+    /// Require that the mapping is performed at the base
+    /// address provided.
+    const FIXED   = 0x02;
+    /// Changes are private.
+    const PRIVATE = 0x04;
+    /// Changes are shared.
+    const SHARED  = 0x08;
+  }
+}
+
+bitflags! {
+  /// Memory page protection options.
+  ///
+  /// This implementation enforces the `W^X` property: Pages cannot be
+  /// mapped for execution while also mapped for writing.
+  #[repr(C)]
+  pub struct mprot: u8 {
+    /// Page can be executed.
+    const EXEC  = 0x01;
+    /// Page can be written.
+    const WRITE = 0x02;
+    /// Page can be read.
+    const READ  = 0x04;
+  }
+}
+
+bitflags! {
+  /// Methods of synchronizing memory with physical storage.
+  #[repr(C)]
+  pub struct msflags: u8 {
+    /// Perform asynchronous writes.
+    const ASYNC      = 0x01;
+    /// Invalidate cached data.
+    const INVALIDATE = 0x02;
+    /// Perform synchronous writes.
+    const SYNC       = 0x04;
+  }
+}
+
+/// Specifies the number of threads sleeping on a condition
+/// variable that should be woken up.
+pub type nthreads = u32;
+
+bitflags! {
+  /// Open flags used by [`file_open()`](fn.file_open.html).
+  #[repr(C)]
+  pub struct oflags: u16 {
+    /// Create file if it does not exist.
+    const CREAT     = 0x0001;
+    /// Fail if not a directory.
+    const DIRECTORY = 0x0002;
+    /// Fail if file already exists.
+    const EXCL      = 0x0004;
+    /// Truncate file to size 0.
+    const TRUNC     = 0x0008;
+  }
+}
+
+bitflags! {
+  /// Flags provided to [`sock_recv()`](fn.sock_recv.html).
+  #[repr(C)]
+  pub struct riflags: u16 {
+    /// Returns the message without removing it from the
+    /// socket's receive queue.
+    const PEEK    = 0x0004;
+    /// On byte-stream sockets, block until the full amount
+    /// of data can be returned.
+    const WAITALL = 0x0010;
+  }
+}
+
+bitflags! {
+  /// File descriptor rights, determining which actions may be
+  /// performed.
+  #[repr(C)]
+  pub struct rights: u64 {
+    /// The right to invoke [`fd_datasync()`](fn.fd_datasync.html).
+    ///
+    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
+    /// invoke [`file_open()`](fn.file_open.html) with [`DSYNC`](struct.fdflags.html#associatedconstant.DSYNC).
+    const FD_DATASYNC           = 0x0000000000000001;
+    /// The right to invoke [`fd_read()`](fn.fd_read.html) and [`sock_recv()`](fn.sock_recv.html).
+    ///
+    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, includes the right to
+    /// invoke [`mem_map()`](fn.mem_map.html) with memory protection option
+    /// [`READ`](struct.mprot.html#associatedconstant.READ).
+    ///
+    /// If [`FD_SEEK`](struct.rights.html#associatedconstant.FD_SEEK) is set, includes the right to invoke
+    /// [`fd_pread()`](fn.fd_pread.html).
+    const FD_READ               = 0x0000000000000002;
+    /// The right to invoke [`fd_seek()`](fn.fd_seek.html). This flag implies
+    /// [`FD_TELL`](struct.rights.html#associatedconstant.FD_TELL).
+    const FD_SEEK               = 0x0000000000000004;
+    /// The right to invoke [`fd_stat_put()`](fn.fd_stat_put.html) with
+    /// [`FLAGS`](struct.fdsflags.html#associatedconstant.FLAGS).
+    const FD_STAT_PUT_FLAGS     = 0x0000000000000008;
+    /// The right to invoke [`fd_sync()`](fn.fd_sync.html).
+    ///
+    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
+    /// invoke [`file_open()`](fn.file_open.html) with [`RSYNC`](struct.fdflags.html#associatedconstant.RSYNC) and
+    /// [`DSYNC`](struct.fdflags.html#associatedconstant.DSYNC).
+    const FD_SYNC               = 0x0000000000000010;
+    /// The right to invoke [`fd_seek()`](fn.fd_seek.html) in such a way that the
+    /// file offset remains unaltered (i.e., [`CUR`](enum.whence.html#variant.CUR) with
+    /// offset zero).
+    const FD_TELL               = 0x0000000000000020;
+    /// The right to invoke [`fd_write()`](fn.fd_write.html) and [`sock_send()`](fn.sock_send.html).
+    ///
+    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, includes the right to
+    /// invoke [`mem_map()`](fn.mem_map.html) with memory protection option
+    /// [`WRITE`](struct.mprot.html#associatedconstant.WRITE).
+    ///
+    /// If [`FD_SEEK`](struct.rights.html#associatedconstant.FD_SEEK) is set, includes the right to
+    /// invoke [`fd_pwrite()`](fn.fd_pwrite.html).
+    const FD_WRITE              = 0x0000000000000040;
+    /// The right to invoke [`file_advise()`](fn.file_advise.html).
+    const FILE_ADVISE           = 0x0000000000000080;
+    /// The right to invoke [`file_allocate()`](fn.file_allocate.html).
+    const FILE_ALLOCATE         = 0x0000000000000100;
+    /// The right to invoke [`file_create()`](fn.file_create.html) with
+    /// [`DIRECTORY`](enum.filetype.html#variant.DIRECTORY).
+    const FILE_CREATE_DIRECTORY = 0x0000000000000200;
+    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, the right to invoke
+    /// [`file_open()`](fn.file_open.html) with [`CREAT`](struct.oflags.html#associatedconstant.CREAT).
+    const FILE_CREATE_FILE      = 0x0000000000000400;
+    /// The right to invoke [`file_link()`](fn.file_link.html) with the file
+    /// descriptor as the source directory.
+    const FILE_LINK_SOURCE      = 0x0000000000001000;
+    /// The right to invoke [`file_link()`](fn.file_link.html) with the file
+    /// descriptor as the target directory.
+    const FILE_LINK_TARGET      = 0x0000000000002000;
+    /// The right to invoke [`file_open()`](fn.file_open.html).
+    const FILE_OPEN             = 0x0000000000004000;
+    /// The right to invoke [`file_readdir()`](fn.file_readdir.html).
+    const FILE_READDIR          = 0x0000000000008000;
+    /// The right to invoke [`file_readlink()`](fn.file_readlink.html).
+    const FILE_READLINK         = 0x0000000000010000;
+    /// The right to invoke [`file_rename()`](fn.file_rename.html) with the file
+    /// descriptor as the source directory.
+    const FILE_RENAME_SOURCE    = 0x0000000000020000;
+    /// The right to invoke [`file_rename()`](fn.file_rename.html) with the file
+    /// descriptor as the target directory.
+    const FILE_RENAME_TARGET    = 0x0000000000040000;
+    /// The right to invoke [`file_stat_fget()`](fn.file_stat_fget.html).
+    const FILE_STAT_FGET        = 0x0000000000080000;
+    /// The right to invoke [`file_stat_fput()`](fn.file_stat_fput.html) with
+    /// [`SIZE`](struct.fsflags.html#associatedconstant.SIZE).
+    ///
+    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
+    /// invoke [`file_open()`](fn.file_open.html) with [`TRUNC`](struct.oflags.html#associatedconstant.TRUNC).
+    const FILE_STAT_FPUT_SIZE   = 0x0000000000100000;
+    /// The right to invoke [`file_stat_fput()`](fn.file_stat_fput.html) with
+    /// [`ATIM`](struct.fsflags.html#associatedconstant.ATIM), [`ATIM_NOW`](struct.fsflags.html#associatedconstant.ATIM_NOW), [`MTIM`](struct.fsflags.html#associatedconstant.MTIM),
+    /// and [`MTIM_NOW`](struct.fsflags.html#associatedconstant.MTIM_NOW).
+    const FILE_STAT_FPUT_TIMES  = 0x0000000000200000;
+    /// The right to invoke [`file_stat_get()`](fn.file_stat_get.html).
+    const FILE_STAT_GET         = 0x0000000000400000;
+    /// The right to invoke [`file_stat_put()`](fn.file_stat_put.html) with
+    /// [`ATIM`](struct.fsflags.html#associatedconstant.ATIM), [`ATIM_NOW`](struct.fsflags.html#associatedconstant.ATIM_NOW), [`MTIM`](struct.fsflags.html#associatedconstant.MTIM),
+    /// and [`MTIM_NOW`](struct.fsflags.html#associatedconstant.MTIM_NOW).
+    const FILE_STAT_PUT_TIMES   = 0x0000000000800000;
+    /// The right to invoke [`file_symlink()`](fn.file_symlink.html).
+    const FILE_SYMLINK          = 0x0000000001000000;
+    /// The right to invoke [`file_unlink()`](fn.file_unlink.html).
+    const FILE_UNLINK           = 0x0000000002000000;
+    /// The right to invoke [`mem_map()`](fn.mem_map.html) with [`mprot`](struct.mprot.html) set to
+    /// zero.
+    const MEM_MAP               = 0x0000000004000000;
+    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, the right to invoke
+    /// [`mem_map()`](fn.mem_map.html) with [`EXEC`](struct.mprot.html#associatedconstant.EXEC).
+    const MEM_MAP_EXEC          = 0x0000000008000000;
+    /// If [`FD_READ`](struct.rights.html#associatedconstant.FD_READ) is set, includes the right to
+    /// invoke [`poll()`](fn.poll.html) to subscribe to [`FD_READ`](enum.eventtype.html#variant.FD_READ).
+    ///
+    /// If [`FD_WRITE`](struct.rights.html#associatedconstant.FD_WRITE) is set, includes the right to
+    /// invoke [`poll()`](fn.poll.html) to subscribe to [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
+    const POLL_FD_READWRITE     = 0x0000000010000000;
+    /// The right to invoke [`poll()`](fn.poll.html) to subscribe to
+    /// [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
+    const POLL_PROC_TERMINATE   = 0x0000000040000000;
+    /// The right to invoke [`proc_exec()`](fn.proc_exec.html).
+    const PROC_EXEC             = 0x0000000100000000;
+    /// The right to invoke [`sock_shutdown()`](fn.sock_shutdown.html).
+    const SOCK_SHUTDOWN         = 0x0000008000000000;
+  }
+}
+
+bitflags! {
+  /// Flags returned by [`sock_recv()`](fn.sock_recv.html).
+  #[repr(C)]
+  pub struct roflags: u16 {
+    /// Returned by [`sock_recv()`](fn.sock_recv.html): List of file descriptors
+    /// has been truncated.
+    const FDS_TRUNCATED  = 0x0001;
+    /// Returned by [`sock_recv()`](fn.sock_recv.html): Message data has been
+    /// truncated.
+    const DATA_TRUNCATED = 0x0008;
+  }
+}
+
+/// Indicates whether an object is stored in private or shared
+/// memory.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum scope {
+  /// The object is stored in private memory.
+  PRIVATE = 4,
+  /// The object is stored in shared memory.
+  SHARED  = 8,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+bitflags! {
+  /// Which channels on a socket need to be shut down.
+  #[repr(C)]
+  pub struct sdflags: u8 {
+    /// Disables further receive operations.
+    const RD = 0x01;
+    /// Disables further send operations.
+    const WR = 0x02;
+  }
+}
+
+bitflags! {
+  /// Flags provided to [`sock_send()`](fn.sock_send.html). As there are currently no flags
+  /// defined, it must be set to zero.
+  #[repr(C)]
+  pub struct siflags: u16 {
+    const DEFAULT = 0;
+  }
+}
+
+/// Signal condition.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum signal {
+  /// Process abort signal.
+  ///
+  /// Action: Terminates the process.
+  ABRT   =  1,
+  /// Alarm clock.
+  ///
+  /// Action: Terminates the process.
+  ALRM   =  2,
+  /// Access to an undefined portion of a memory object.
+  ///
+  /// Action: Terminates the process.
+  BUS    =  3,
+  /// Child process terminated, stopped, or continued.
+  ///
+  /// Action: Ignored.
+  CHLD   =  4,
+  /// Continue executing, if stopped.
+  ///
+  /// Action: Continues executing, if stopped.
+  CONT   =  5,
+  /// Erroneous arithmetic operation.
+  ///
+  /// Action: Terminates the process.
+  FPE    =  6,
+  /// Hangup.
+  ///
+  /// Action: Terminates the process.
+  HUP    =  7,
+  /// Illegal instruction.
+  ///
+  /// Action: Terminates the process.
+  ILL    =  8,
+  /// Terminate interrupt signal.
+  ///
+  /// Action: Terminates the process.
+  INT    =  9,
+  /// Kill.
+  ///
+  /// Action: Terminates the process.
+  KILL   = 10,
+  /// Write on a pipe with no one to read it.
+  ///
+  /// Action: Ignored.
+  PIPE   = 11,
+  /// Terminal quit signal.
+  ///
+  /// Action: Terminates the process.
+  QUIT   = 12,
+  /// Invalid memory reference.
+  ///
+  /// Action: Terminates the process.
+  SEGV   = 13,
+  /// Stop executing.
+  ///
+  /// Action: Stops executing.
+  STOP   = 14,
+  /// Bad system call.
+  ///
+  /// Action: Terminates the process.
+  SYS    = 15,
+  /// Termination signal.
+  ///
+  /// Action: Terminates the process.
+  TERM   = 16,
+  /// Trace/breakpoint trap.
+  ///
+  /// Action: Terminates the process.
+  TRAP   = 17,
+  /// Terminal stop signal.
+  ///
+  /// Action: Stops executing.
+  TSTP   = 18,
+  /// Background process attempting read.
+  ///
+  /// Action: Stops executing.
+  TTIN   = 19,
+  /// Background process attempting write.
+  ///
+  /// Action: Stops executing.
+  TTOU   = 20,
+  /// High bandwidth data is available at a socket.
+  ///
+  /// Action: Ignored.
+  URG    = 21,
+  /// User-defined signal 1.
+  ///
+  /// Action: Terminates the process.
+  USR1   = 22,
+  /// User-defined signal 2.
+  ///
+  /// Action: Terminates the process.
+  USR2   = 23,
+  /// Virtual timer expired.
+  ///
+  /// Action: Terminates the process.
+  VTALRM = 24,
+  /// CPU time limit exceeded.
+  ///
+  /// Action: Terminates the process.
+  XCPU   = 25,
+  /// File size limit exceeded.
+  ///
+  /// Action: Terminates the process.
+  XFSZ   = 26,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+bitflags! {
+  /// Flags determining how the timestamp provided in
+  /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) should be interpreted.
+  #[repr(C)]
+  pub struct subclockflags: u16 {
+    /// If set, treat the timestamp provided in
+    /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) as an absolute timestamp
+    /// of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id).
+    ///
+    /// If clear, treat the timestamp provided in
+    /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) relative to the current
+    /// time value of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id).
+    const ABSTIME = 0x0001;
+  }
+}
+
+bitflags! {
+  /// Flags influencing the method of polling for read or writing on
+  /// a file descriptor.
+  #[repr(C)]
+  pub struct subrwflags: u16 {
+    /// Deprecated. Must be set by callers and ignored by
+    /// implementations.
+    const POLL = 0x0001;
+  }
+}
+
+/// Unique system-local identifier of a thread. This identifier is
+/// only valid during the lifetime of the thread.
+///
+/// Threads must be aware of their thread identifier, as it is
+/// written it into locks when acquiring them for writing. It is
+/// not advised to use these identifiers for any other purpose.
+///
+/// As the thread identifier is also stored in [`lock`](struct.lock.html) when
+/// [`LOCK_WRLOCKED`](constant.LOCK_WRLOCKED.html) is set, the top two bits of the thread
+/// must always be set to zero.
+#[repr(C)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub struct tid(pub u32);
+
+/// Timestamp in nanoseconds.
+pub type timestamp = u64;
+
+bitflags! {
+  /// Specifies whether files are unlinked or directories are
+  /// removed.
+  #[repr(C)]
+  pub struct ulflags: u8 {
+    /// If set, removes a directory. Otherwise, unlinks any
+    /// non-directory file.
+    const REMOVEDIR = 0x01;
+  }
+}
+
+/// User-provided value that can be attached to objects that is
+/// retained when extracted from the kernel.
+pub type userdata = u64;
+
+/// Relative to which position the offset of the file descriptor
+/// should be set.
+#[repr(u8)]
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+pub enum whence {
+  /// Seek relative to current position.
+  CUR = 1,
+  /// Seek relative to end-of-file.
+  END = 2,
+  /// Seek relative to start-of-file.
+  SET = 3,
+  #[doc(hidden)] _NonExhaustive = -1 as isize as u8,
+}
+
+/// Auxiliary vector entry.
+///
+/// The auxiliary vector is a list of key-value pairs that is
+/// provided to the process on startup. Unlike structures, it is
+/// extensible, as it is possible to add new records later on.
+/// The auxiliary vector is always terminated by an entry having
+/// type [`NULL`](enum.auxtype.html#variant.NULL).
+///
+/// The auxiliary vector is part of the x86-64 ABI, but is used by
+/// this environment on all architectures.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct auxv {
+  /// The type of the auxiliary vector entry.
+  pub a_type: auxtype,
+  pub union: auxv_union
+}
+/// A union inside `auxv`.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub union auxv_union {
+  /// Used when `a_type` is [`ARGDATALEN`](enum.auxtype.html#variant.ARGDATALEN), [`CANARYLEN`](enum.auxtype.html#variant.CANARYLEN), [`NCPUS`](enum.auxtype.html#variant.NCPUS), [`PAGESZ`](enum.auxtype.html#variant.PAGESZ), [`PHNUM`](enum.auxtype.html#variant.PHNUM), or [`TID`](enum.auxtype.html#variant.TID).
+/// A numerical value.
+  pub a_val: usize,
+  /// Used when `a_type` is [`ARGDATA`](enum.auxtype.html#variant.ARGDATA), [`BASE`](enum.auxtype.html#variant.BASE), [`CANARY`](enum.auxtype.html#variant.CANARY), [`PHDR`](enum.auxtype.html#variant.PHDR), [`PID`](enum.auxtype.html#variant.PID), or [`SYSINFO_EHDR`](enum.auxtype.html#variant.SYSINFO_EHDR).
+/// A pointer value.
+  pub a_ptr: *mut (),
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn auxv_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<auxv>(), 8);
+  assert_eq!(::core::mem::align_of::<auxv>(), 4);
+  unsafe {
+    let obj: auxv = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.a_type as *const _ as usize - base, 0);
+    assert_eq!(&obj.union.a_val as *const _ as usize - base, 4);
+    assert_eq!(&obj.union.a_ptr as *const _ as usize - base, 4);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn auxv_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<auxv>(), 16);
+  assert_eq!(::core::mem::align_of::<auxv>(), 8);
+  unsafe {
+    let obj: auxv = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.a_type as *const _ as usize - base, 0);
+    assert_eq!(&obj.union.a_val as *const _ as usize - base, 8);
+    assert_eq!(&obj.union.a_ptr as *const _ as usize - base, 8);
+  }
+}
+
+/// A region of memory for scatter/gather writes.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct ciovec {
+  /// The address and length of the buffer to be written.
+  pub buf: (*const (), usize),
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn ciovec_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<ciovec>(), 8);
+  assert_eq!(::core::mem::align_of::<ciovec>(), 4);
+  unsafe {
+    let obj: ciovec = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.buf.1 as *const _ as usize - base, 4);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn ciovec_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<ciovec>(), 16);
+  assert_eq!(::core::mem::align_of::<ciovec>(), 8);
+  unsafe {
+    let obj: ciovec = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.buf.1 as *const _ as usize - base, 8);
+  }
+}
+
+/// A directory entry.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct dirent {
+  /// The offset of the next directory entry stored in this
+  /// directory.
+  pub d_next: dircookie,
+  /// The serial number of the file referred to by this
+  /// directory entry.
+  pub d_ino: inode,
+  /// The length of the name of the directory entry.
+  pub d_namlen: u32,
+  /// The type of the file referred to by this directory
+  /// entry.
+  pub d_type: filetype,
+}
+#[test]
+fn dirent_layout_test() {
+  assert_eq!(::core::mem::size_of::<dirent>(), 24);
+  assert_eq!(::core::mem::align_of::<dirent>(), 8);
+  unsafe {
+    let obj: dirent = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.d_next as *const _ as usize - base, 0);
+    assert_eq!(&obj.d_ino as *const _ as usize - base, 8);
+    assert_eq!(&obj.d_namlen as *const _ as usize - base, 16);
+    assert_eq!(&obj.d_type as *const _ as usize - base, 20);
+  }
+}
+
+/// An event that occurred.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct event {
+  /// User-provided value that got attached to
+  /// [`subscription.userdata`](struct.subscription.html#structfield.userdata).
+  pub userdata: userdata,
+  /// If non-zero, an error that occurred while processing
+  /// the subscription request.
+  pub error: errno,
+  /// The type of the event that occurred.
+  pub type_: eventtype,
+  pub union: event_union
+}
+/// A union inside `event`.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub union event_union {
+  /// Used when `type_` is [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
+  pub fd_readwrite: event_fd_readwrite,
+  /// Used when `type_` is [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
+  pub proc_terminate: event_proc_terminate,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct event_fd_readwrite {
+  /// The number of bytes available
+  /// for reading or writing.
+  pub nbytes: filesize,
+  /// Obsolete.
+  pub unused: [u8; 4],
+  /// The state of the file
+  /// descriptor.
+  pub flags: eventrwflags,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct event_proc_terminate {
+  /// Obsolete.
+  pub unused: [u8; 4],
+  /// If zero, the process has
+  /// exited.
+  /// Otherwise, the signal
+  /// condition causing it to
+  /// terminated.
+  pub signal: signal,
+  /// If exited, the exit code of
+  /// the process.
+  pub exitcode: exitcode,
+}
+#[test]
+fn event_layout_test() {
+  assert_eq!(::core::mem::size_of::<event>(), 32);
+  assert_eq!(::core::mem::align_of::<event>(), 8);
+  unsafe {
+    let obj: event = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.userdata as *const _ as usize - base, 0);
+    assert_eq!(&obj.error as *const _ as usize - base, 8);
+    assert_eq!(&obj.type_ as *const _ as usize - base, 10);
+    assert_eq!(&obj.union.fd_readwrite.nbytes as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.fd_readwrite.unused as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 28);
+    assert_eq!(&obj.union.proc_terminate.unused as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.proc_terminate.signal as *const _ as usize - base, 20);
+    assert_eq!(&obj.union.proc_terminate.exitcode as *const _ as usize - base, 24);
+  }
+}
+
+/// File descriptor attributes.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct fdstat {
+  /// File type.
+  pub fs_filetype: filetype,
+  /// File descriptor flags.
+  pub fs_flags: fdflags,
+  /// Rights that apply to this file descriptor.
+  pub fs_rights_base: rights,
+  /// Maximum set of rights that can be installed on new
+  /// file descriptors that are created through this file
+  /// descriptor, e.g., through [`file_open()`](fn.file_open.html).
+  pub fs_rights_inheriting: rights,
+}
+#[test]
+fn fdstat_layout_test() {
+  assert_eq!(::core::mem::size_of::<fdstat>(), 24);
+  assert_eq!(::core::mem::align_of::<fdstat>(), 8);
+  unsafe {
+    let obj: fdstat = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.fs_filetype as *const _ as usize - base, 0);
+    assert_eq!(&obj.fs_flags as *const _ as usize - base, 2);
+    assert_eq!(&obj.fs_rights_base as *const _ as usize - base, 8);
+    assert_eq!(&obj.fs_rights_inheriting as *const _ as usize - base, 16);
+  }
+}
+
+/// File attributes.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct filestat {
+  /// Device ID of device containing the file.
+  pub st_dev: device,
+  /// File serial number.
+  pub st_ino: inode,
+  /// File type.
+  pub st_filetype: filetype,
+  /// Number of hard links to the file.
+  pub st_nlink: linkcount,
+  /// For regular files, the file size in bytes. For
+  /// symbolic links, the length in bytes of the pathname
+  /// contained in the symbolic link.
+  pub st_size: filesize,
+  /// Last data access timestamp.
+  pub st_atim: timestamp,
+  /// Last data modification timestamp.
+  pub st_mtim: timestamp,
+  /// Last file status change timestamp.
+  pub st_ctim: timestamp,
+}
+#[test]
+fn filestat_layout_test() {
+  assert_eq!(::core::mem::size_of::<filestat>(), 56);
+  assert_eq!(::core::mem::align_of::<filestat>(), 8);
+  unsafe {
+    let obj: filestat = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.st_dev as *const _ as usize - base, 0);
+    assert_eq!(&obj.st_ino as *const _ as usize - base, 8);
+    assert_eq!(&obj.st_filetype as *const _ as usize - base, 16);
+    assert_eq!(&obj.st_nlink as *const _ as usize - base, 20);
+    assert_eq!(&obj.st_size as *const _ as usize - base, 24);
+    assert_eq!(&obj.st_atim as *const _ as usize - base, 32);
+    assert_eq!(&obj.st_mtim as *const _ as usize - base, 40);
+    assert_eq!(&obj.st_ctim as *const _ as usize - base, 48);
+  }
+}
+
+/// A region of memory for scatter/gather reads.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct iovec {
+  /// The address and length of the buffer to be filled.
+  pub buf: (*mut (), usize),
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn iovec_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<iovec>(), 8);
+  assert_eq!(::core::mem::align_of::<iovec>(), 4);
+  unsafe {
+    let obj: iovec = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.buf.1 as *const _ as usize - base, 4);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn iovec_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<iovec>(), 16);
+  assert_eq!(::core::mem::align_of::<iovec>(), 8);
+  unsafe {
+    let obj: iovec = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.buf.1 as *const _ as usize - base, 8);
+  }
+}
+
+/// Path lookup properties.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct lookup {
+  /// The working directory at which the resolution of the
+  /// path starts.
+  pub fd: fd,
+  /// Flags determining the method of how the path is
+  /// resolved.
+  pub flags: lookupflags,
+}
+#[test]
+fn lookup_layout_test() {
+  assert_eq!(::core::mem::size_of::<lookup>(), 8);
+  assert_eq!(::core::mem::align_of::<lookup>(), 4);
+  unsafe {
+    let obj: lookup = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.fd as *const _ as usize - base, 0);
+    assert_eq!(&obj.flags as *const _ as usize - base, 4);
+  }
+}
+
+/// Entry point for a process (`_start`).
+///
+/// **auxv**:
+/// The auxiliary vector. See [`auxv`](struct.auxv.html).
+pub type processentry = unsafe extern "C" fn(
+  auxv: *const auxv,
+) -> ();
+
+/// Arguments of [`sock_recv()`](fn.sock_recv.html).
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct recv_in {
+  /// List of scatter/gather vectors where message data
+  /// should be stored.
+  pub ri_data: (*const iovec, usize),
+  /// Buffer where numbers of incoming file descriptors
+  /// should be stored.
+  pub ri_fds: (*mut fd, usize),
+  /// Message flags.
+  pub ri_flags: riflags,
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn recv_in_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<recv_in>(), 20);
+  assert_eq!(::core::mem::align_of::<recv_in>(), 4);
+  unsafe {
+    let obj: recv_in = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.ri_data.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.ri_data.1 as *const _ as usize - base, 4);
+    assert_eq!(&obj.ri_fds.0 as *const _ as usize - base, 8);
+    assert_eq!(&obj.ri_fds.1 as *const _ as usize - base, 12);
+    assert_eq!(&obj.ri_flags as *const _ as usize - base, 16);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn recv_in_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<recv_in>(), 40);
+  assert_eq!(::core::mem::align_of::<recv_in>(), 8);
+  unsafe {
+    let obj: recv_in = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.ri_data.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.ri_data.1 as *const _ as usize - base, 8);
+    assert_eq!(&obj.ri_fds.0 as *const _ as usize - base, 16);
+    assert_eq!(&obj.ri_fds.1 as *const _ as usize - base, 24);
+    assert_eq!(&obj.ri_flags as *const _ as usize - base, 32);
+  }
+}
+
+/// Results of [`sock_recv()`](fn.sock_recv.html).
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct recv_out {
+  /// Number of bytes stored in [`recv_in.ri_data`](struct.recv_in.html#structfield.ri_data).
+  pub ro_datalen: usize,
+  /// Number of file descriptors stored in [`recv_in.ri_fds`](struct.recv_in.html#structfield.ri_fds).
+  pub ro_fdslen: usize,
+  /// Fields that were used by previous implementations.
+  pub ro_unused: [u8; 40],
+  /// Message flags.
+  pub ro_flags: roflags,
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn recv_out_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<recv_out>(), 52);
+  assert_eq!(::core::mem::align_of::<recv_out>(), 4);
+  unsafe {
+    let obj: recv_out = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.ro_datalen as *const _ as usize - base, 0);
+    assert_eq!(&obj.ro_fdslen as *const _ as usize - base, 4);
+    assert_eq!(&obj.ro_unused as *const _ as usize - base, 8);
+    assert_eq!(&obj.ro_flags as *const _ as usize - base, 48);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn recv_out_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<recv_out>(), 64);
+  assert_eq!(::core::mem::align_of::<recv_out>(), 8);
+  unsafe {
+    let obj: recv_out = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.ro_datalen as *const _ as usize - base, 0);
+    assert_eq!(&obj.ro_fdslen as *const _ as usize - base, 8);
+    assert_eq!(&obj.ro_unused as *const _ as usize - base, 16);
+    assert_eq!(&obj.ro_flags as *const _ as usize - base, 56);
+  }
+}
+
+/// Arguments of [`sock_send()`](fn.sock_send.html).
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct send_in {
+  /// List of scatter/gather vectors where message data
+  /// should be retrieved.
+  pub si_data: (*const ciovec, usize),
+  /// File descriptors that need to be attached to the
+  /// message.
+  pub si_fds: (*const fd, usize),
+  /// Message flags.
+  pub si_flags: siflags,
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn send_in_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<send_in>(), 20);
+  assert_eq!(::core::mem::align_of::<send_in>(), 4);
+  unsafe {
+    let obj: send_in = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.si_data.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.si_data.1 as *const _ as usize - base, 4);
+    assert_eq!(&obj.si_fds.0 as *const _ as usize - base, 8);
+    assert_eq!(&obj.si_fds.1 as *const _ as usize - base, 12);
+    assert_eq!(&obj.si_flags as *const _ as usize - base, 16);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn send_in_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<send_in>(), 40);
+  assert_eq!(::core::mem::align_of::<send_in>(), 8);
+  unsafe {
+    let obj: send_in = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.si_data.0 as *const _ as usize - base, 0);
+    assert_eq!(&obj.si_data.1 as *const _ as usize - base, 8);
+    assert_eq!(&obj.si_fds.0 as *const _ as usize - base, 16);
+    assert_eq!(&obj.si_fds.1 as *const _ as usize - base, 24);
+    assert_eq!(&obj.si_flags as *const _ as usize - base, 32);
+  }
+}
+
+/// Results of [`sock_send()`](fn.sock_send.html).
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct send_out {
+  /// Number of bytes transmitted.
+  pub so_datalen: usize,
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn send_out_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<send_out>(), 4);
+  assert_eq!(::core::mem::align_of::<send_out>(), 4);
+  unsafe {
+    let obj: send_out = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.so_datalen as *const _ as usize - base, 0);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn send_out_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<send_out>(), 8);
+  assert_eq!(::core::mem::align_of::<send_out>(), 8);
+  unsafe {
+    let obj: send_out = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.so_datalen as *const _ as usize - base, 0);
+  }
+}
+
+/// Subscription to an event.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription {
+  /// User-provided value that is attached to the
+  /// subscription in the kernel and returned through
+  /// [`event.userdata`](struct.event.html#structfield.userdata).
+  pub userdata: userdata,
+  /// Used by previous implementations. Ignored.
+  pub unused: u16,
+  /// The type of the event to which to subscribe.
+  ///
+  /// Currently, [`CONDVAR`](enum.eventtype.html#variant.CONDVAR),
+  /// [`LOCK_RDLOCK`](enum.eventtype.html#variant.LOCK_RDLOCK), and [`LOCK_WRLOCK`](enum.eventtype.html#variant.LOCK_WRLOCK)
+  /// must be provided as the first subscription and may
+  /// only be followed by up to one other subscription,
+  /// having type [`CLOCK`](enum.eventtype.html#variant.CLOCK).
+  pub type_: eventtype,
+  pub union: subscription_union
+}
+/// A union inside `subscription`.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub union subscription_union {
+  /// Used when `type_` is [`CLOCK`](enum.eventtype.html#variant.CLOCK).
+  pub clock: subscription_clock,
+  /// Used when `type_` is [`CONDVAR`](enum.eventtype.html#variant.CONDVAR).
+  pub condvar: subscription_condvar,
+  /// Used when `type_` is [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
+  pub fd_readwrite: subscription_fd_readwrite,
+  /// Used when `type_` is [`LOCK_RDLOCK`](enum.eventtype.html#variant.LOCK_RDLOCK) or [`LOCK_WRLOCK`](enum.eventtype.html#variant.LOCK_WRLOCK).
+  pub lock: subscription_lock,
+  /// Used when `type_` is [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
+  pub proc_terminate: subscription_proc_terminate,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription_clock {
+  /// The user-defined unique
+  /// identifier of the clock.
+  pub identifier: userdata,
+  /// The clock against which the
+  /// timestamp should be compared.
+  pub clock_id: clockid,
+  /// The absolute or relative
+  /// timestamp.
+  pub timeout: timestamp,
+  /// The amount of time that the
+  /// kernel may wait additionally
+  /// to coalesce with other events.
+  pub precision: timestamp,
+  /// Flags specifying whether the
+  /// timeout is absolute or
+  /// relative.
+  pub flags: subclockflags,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription_condvar {
+  /// The condition variable on
+  /// which to wait to be woken up.
+  pub condvar: *mut condvar,
+  /// The lock that will be
+  /// released while waiting.
+  ///
+  /// The lock will be reacquired
+  /// for writing when the condition
+  /// variable triggers.
+  pub lock: *mut lock,
+  /// Whether the condition variable
+  /// is stored in private or shared
+  /// memory.
+  pub condvar_scope: scope,
+  /// Whether the lock is stored in
+  /// private or shared memory.
+  pub lock_scope: scope,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription_fd_readwrite {
+  /// The file descriptor on which
+  /// to wait for it to become ready
+  /// for reading or writing.
+  pub fd: fd,
+  /// Under which conditions to
+  /// trigger.
+  pub flags: subrwflags,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription_lock {
+  /// The lock that will be acquired
+  /// for reading or writing.
+  pub lock: *mut lock,
+  /// Whether the lock is stored in
+  /// private or shared memory.
+  pub lock_scope: scope,
+}
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct subscription_proc_terminate {
+  /// The process descriptor on
+  /// which to wait for process
+  /// termination.
+  pub fd: fd,
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn subscription_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<subscription>(), 56);
+  assert_eq!(::core::mem::align_of::<subscription>(), 8);
+  unsafe {
+    let obj: subscription = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.userdata as *const _ as usize - base, 0);
+    assert_eq!(&obj.unused as *const _ as usize - base, 8);
+    assert_eq!(&obj.type_ as *const _ as usize - base, 10);
+    assert_eq!(&obj.union.clock.identifier as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.clock.clock_id as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.clock.timeout as *const _ as usize - base, 32);
+    assert_eq!(&obj.union.clock.precision as *const _ as usize - base, 40);
+    assert_eq!(&obj.union.clock.flags as *const _ as usize - base, 48);
+    assert_eq!(&obj.union.condvar.condvar as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.condvar.lock as *const _ as usize - base, 20);
+    assert_eq!(&obj.union.condvar.condvar_scope as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.condvar.lock_scope as *const _ as usize - base, 25);
+    assert_eq!(&obj.union.fd_readwrite.fd as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 20);
+    assert_eq!(&obj.union.lock.lock as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.lock.lock_scope as *const _ as usize - base, 20);
+    assert_eq!(&obj.union.proc_terminate.fd as *const _ as usize - base, 16);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn subscription_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<subscription>(), 56);
+  assert_eq!(::core::mem::align_of::<subscription>(), 8);
+  unsafe {
+    let obj: subscription = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.userdata as *const _ as usize - base, 0);
+    assert_eq!(&obj.unused as *const _ as usize - base, 8);
+    assert_eq!(&obj.type_ as *const _ as usize - base, 10);
+    assert_eq!(&obj.union.clock.identifier as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.clock.clock_id as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.clock.timeout as *const _ as usize - base, 32);
+    assert_eq!(&obj.union.clock.precision as *const _ as usize - base, 40);
+    assert_eq!(&obj.union.clock.flags as *const _ as usize - base, 48);
+    assert_eq!(&obj.union.condvar.condvar as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.condvar.lock as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.condvar.condvar_scope as *const _ as usize - base, 32);
+    assert_eq!(&obj.union.condvar.lock_scope as *const _ as usize - base, 33);
+    assert_eq!(&obj.union.fd_readwrite.fd as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 20);
+    assert_eq!(&obj.union.lock.lock as *const _ as usize - base, 16);
+    assert_eq!(&obj.union.lock.lock_scope as *const _ as usize - base, 24);
+    assert_eq!(&obj.union.proc_terminate.fd as *const _ as usize - base, 16);
+  }
+}
+
+/// The Thread Control Block (TCB).
+///
+/// After a thread begins execution (at program startup or when
+/// created through [`thread_create()`](fn.thread_create.html)), the CPU's registers
+/// controlling Thread-Local Storage (TLS) will already be
+/// initialized. They will point to an area only containing the
+/// TCB.
+///
+/// If the thread needs space for storing thread-specific
+/// variables, the thread may allocate a larger area and adjust
+/// the CPU's registers to point to that area instead. However, it
+/// does need to make sure that the TCB is copied over to the new
+/// TLS area.
+///
+/// The purpose of the TCB is that it allows light-weight
+/// emulators to store information related to individual threads.
+/// For example, it may be used to store a copy of the CPU
+/// registers prior emulation, so that TLS for the host system
+/// can be restored if needed.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct tcb {
+  /// Pointer that may be freely assigned by the system. Its
+  /// value cannot be interpreted by the application.
+  pub parent: *mut (),
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn tcb_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<tcb>(), 4);
+  assert_eq!(::core::mem::align_of::<tcb>(), 4);
+  unsafe {
+    let obj: tcb = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.parent as *const _ as usize - base, 0);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn tcb_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<tcb>(), 8);
+  assert_eq!(::core::mem::align_of::<tcb>(), 8);
+  unsafe {
+    let obj: tcb = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.parent as *const _ as usize - base, 0);
+  }
+}
+
+/// Entry point for additionally created threads.
+///
+/// **tid**:
+/// Thread ID of the current thread.
+///
+/// **aux**:
+/// Copy of the value stored in
+/// [`threadattr.argument`](struct.threadattr.html#structfield.argument).
+pub type threadentry = unsafe extern "C" fn(
+  tid: tid,
+  aux: *mut (),
+) -> ();
+
+/// Attributes for thread creation.
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct threadattr {
+  /// Initial program counter value.
+  pub entry_point: threadentry,
+  /// Region allocated to serve as stack space.
+  pub stack: (*mut (), usize),
+  /// Argument to be forwarded to the entry point function.
+  pub argument: *mut (),
+}
+#[test]
+#[cfg(target_pointer_width = "32")]
+fn threadattr_layout_test_32() {
+  assert_eq!(::core::mem::size_of::<threadattr>(), 16);
+  assert_eq!(::core::mem::align_of::<threadattr>(), 4);
+  unsafe {
+    let obj: threadattr = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.entry_point as *const _ as usize - base, 0);
+    assert_eq!(&obj.stack.0 as *const _ as usize - base, 4);
+    assert_eq!(&obj.stack.1 as *const _ as usize - base, 8);
+    assert_eq!(&obj.argument as *const _ as usize - base, 12);
+  }
+}
+#[test]
+#[cfg(target_pointer_width = "64")]
+fn threadattr_layout_test_64() {
+  assert_eq!(::core::mem::size_of::<threadattr>(), 32);
+  assert_eq!(::core::mem::align_of::<threadattr>(), 8);
+  unsafe {
+    let obj: threadattr = ::core::mem::uninitialized();
+    let base = &obj as *const _ as usize;
+    assert_eq!(&obj.entry_point as *const _ as usize - base, 0);
+    assert_eq!(&obj.stack.0 as *const _ as usize - base, 8);
+    assert_eq!(&obj.stack.1 as *const _ as usize - base, 16);
+    assert_eq!(&obj.argument as *const _ as usize - base, 24);
+  }
+}
+
+/// The table with pointers to all syscall implementations.
+#[allow(improper_ctypes)]
+extern "C" {
+  fn cloudabi_sys_clock_res_get(_: clockid, _: *mut timestamp) -> errno;
+  fn cloudabi_sys_clock_time_get(_: clockid, _: timestamp, _: *mut timestamp) -> errno;
+  fn cloudabi_sys_condvar_signal(_: *mut condvar, _: scope, _: nthreads) -> errno;
+  fn cloudabi_sys_fd_close(_: fd) -> errno;
+  fn cloudabi_sys_fd_create1(_: filetype, _: *mut fd) -> errno;
+  fn cloudabi_sys_fd_create2(_: filetype, _: *mut fd, _: *mut fd) -> errno;
+  fn cloudabi_sys_fd_datasync(_: fd) -> errno;
+  fn cloudabi_sys_fd_dup(_: fd, _: *mut fd) -> errno;
+  fn cloudabi_sys_fd_pread(_: fd, _: *const iovec, _: usize, _: filesize, _: *mut usize) -> errno;
+  fn cloudabi_sys_fd_pwrite(_: fd, _: *const ciovec, _: usize, _: filesize, _: *mut usize) -> errno;
+  fn cloudabi_sys_fd_read(_: fd, _: *const iovec, _: usize, _: *mut usize) -> errno;
+  fn cloudabi_sys_fd_replace(_: fd, _: fd) -> errno;
+  fn cloudabi_sys_fd_seek(_: fd, _: filedelta, _: whence, _: *mut filesize) -> errno;
+  fn cloudabi_sys_fd_stat_get(_: fd, _: *mut fdstat) -> errno;
+  fn cloudabi_sys_fd_stat_put(_: fd, _: *const fdstat, _: fdsflags) -> errno;
+  fn cloudabi_sys_fd_sync(_: fd) -> errno;
+  fn cloudabi_sys_fd_write(_: fd, _: *const ciovec, _: usize, _: *mut usize) -> errno;
+  fn cloudabi_sys_file_advise(_: fd, _: filesize, _: filesize, _: advice) -> errno;
+  fn cloudabi_sys_file_allocate(_: fd, _: filesize, _: filesize) -> errno;
+  fn cloudabi_sys_file_create(_: fd, _: *const u8, _: usize, _: filetype) -> errno;
+  fn cloudabi_sys_file_link(_: lookup, _: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
+  fn cloudabi_sys_file_open(_: lookup, _: *const u8, _: usize, _: oflags, _: *const fdstat, _: *mut fd) -> errno;
+  fn cloudabi_sys_file_readdir(_: fd, _: *mut (), _: usize, _: dircookie, _: *mut usize) -> errno;
+  fn cloudabi_sys_file_readlink(_: fd, _: *const u8, _: usize, _: *mut u8, _: usize, _: *mut usize) -> errno;
+  fn cloudabi_sys_file_rename(_: fd, _: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
+  fn cloudabi_sys_file_stat_fget(_: fd, _: *mut filestat) -> errno;
+  fn cloudabi_sys_file_stat_fput(_: fd, _: *const filestat, _: fsflags) -> errno;
+  fn cloudabi_sys_file_stat_get(_: lookup, _: *const u8, _: usize, _: *mut filestat) -> errno;
+  fn cloudabi_sys_file_stat_put(_: lookup, _: *const u8, _: usize, _: *const filestat, _: fsflags) -> errno;
+  fn cloudabi_sys_file_symlink(_: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
+  fn cloudabi_sys_file_unlink(_: fd, _: *const u8, _: usize, _: ulflags) -> errno;
+  fn cloudabi_sys_lock_unlock(_: *mut lock, _: scope) -> errno;
+  fn cloudabi_sys_mem_advise(_: *mut (), _: usize, _: advice) -> errno;
+  fn cloudabi_sys_mem_map(_: *mut (), _: usize, _: mprot, _: mflags, _: fd, _: filesize, _: *mut *mut ()) -> errno;
+  fn cloudabi_sys_mem_protect(_: *mut (), _: usize, _: mprot) -> errno;
+  fn cloudabi_sys_mem_sync(_: *mut (), _: usize, _: msflags) -> errno;
+  fn cloudabi_sys_mem_unmap(_: *mut (), _: usize) -> errno;
+  fn cloudabi_sys_poll(_: *const subscription, _: *mut event, _: usize, _: *mut usize) -> errno;
+  fn cloudabi_sys_proc_exec(_: fd, _: *const (), _: usize, _: *const fd, _: usize) -> errno;
+  fn cloudabi_sys_proc_exit(_: exitcode) -> !;
+  fn cloudabi_sys_proc_fork(_: *mut fd, _: *mut tid) -> errno;
+  fn cloudabi_sys_proc_raise(_: signal) -> errno;
+  fn cloudabi_sys_random_get(_: *mut (), _: usize) -> errno;
+  fn cloudabi_sys_sock_recv(_: fd, _: *const recv_in, _: *mut recv_out) -> errno;
+  fn cloudabi_sys_sock_send(_: fd, _: *const send_in, _: *mut send_out) -> errno;
+  fn cloudabi_sys_sock_shutdown(_: fd, _: sdflags) -> errno;
+  fn cloudabi_sys_thread_create(_: *mut threadattr, _: *mut tid) -> errno;
+  fn cloudabi_sys_thread_exit(_: *mut lock, _: scope) -> !;
+  fn cloudabi_sys_thread_yield() -> errno;
+}
+
+/// Obtains the resolution of a clock.
+///
+/// ## Parameters
+///
+/// **clock_id**:
+/// The clock for which the resolution needs to be
+/// returned.
+///
+/// **resolution**:
+/// The resolution of the clock.
+#[inline]
+pub unsafe fn clock_res_get(clock_id_: clockid, resolution_: &mut timestamp) -> errno {
+  cloudabi_sys_clock_res_get(clock_id_, resolution_)
+}
+
+/// Obtains the time value of a clock.
+///
+/// ## Parameters
+///
+/// **clock_id**:
+/// The clock for which the time needs to be
+/// returned.
+///
+/// **precision**:
+/// The maximum lag (exclusive) that the returned
+/// time value may have, compared to its actual
+/// value.
+///
+/// **time**:
+/// The time value of the clock.
+#[inline]
+pub unsafe fn clock_time_get(clock_id_: clockid, precision_: timestamp, time_: &mut timestamp) -> errno {
+  cloudabi_sys_clock_time_get(clock_id_, precision_, time_)
+}
+
+/// Wakes up threads waiting on a userspace condition variable.
+///
+/// If an invocation of this system call causes all waiting
+/// threads to be woken up, the value of the condition variable
+/// is set to [`CONDVAR_HAS_NO_WAITERS`](constant.CONDVAR_HAS_NO_WAITERS.html). As long as the condition
+/// variable is set to this value, it is not needed to invoke this
+/// system call.
+///
+/// ## Parameters
+///
+/// **condvar**:
+/// The userspace condition variable that has
+/// waiting threads.
+///
+/// **scope**:
+/// Whether the condition variable is stored in
+/// private or shared memory.
+///
+/// **nwaiters**:
+/// The number of threads that need to be woken
+/// up. If it exceeds the number of waiting
+/// threads, all threads are woken up.
+#[inline]
+pub unsafe fn condvar_signal(condvar_: *mut condvar, scope_: scope, nwaiters_: nthreads) -> errno {
+  cloudabi_sys_condvar_signal(condvar_, scope_, nwaiters_)
+}
+
+/// Closes a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor that needs to be closed.
+#[inline]
+pub unsafe fn fd_close(fd_: fd) -> errno {
+  cloudabi_sys_fd_close(fd_)
+}
+
+/// Creates a file descriptor.
+///
+/// ## Parameters
+///
+/// **type**:
+/// Possible values:
+///
+///   - [`SHARED_MEMORY`](enum.filetype.html#variant.SHARED_MEMORY):
+///     Creates an anonymous shared memory
+///     object.
+///
+/// **fd**:
+/// The file descriptor that has been created.
+#[inline]
+pub unsafe fn fd_create1(type_: filetype, fd_: &mut fd) -> errno {
+  cloudabi_sys_fd_create1(type_, fd_)
+}
+
+/// Creates a pair of file descriptors.
+///
+/// ## Parameters
+///
+/// **type**:
+/// Possible values:
+///
+///   - [`SOCKET_DGRAM`](enum.filetype.html#variant.SOCKET_DGRAM):
+///     Creates a UNIX datagram socket pair.
+///   - [`SOCKET_STREAM`](enum.filetype.html#variant.SOCKET_STREAM):
+///     Creates a UNIX byte-stream socket
+///     pair.
+///
+/// **fd1**:
+/// The first file descriptor of the pair.
+///
+/// **fd2**:
+/// The second file descriptor of the pair.
+#[inline]
+pub unsafe fn fd_create2(type_: filetype, fd1_: &mut fd, fd2_: &mut fd) -> errno {
+  cloudabi_sys_fd_create2(type_, fd1_, fd2_)
+}
+
+/// Synchronizes the data of a file to disk.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor of the file whose data
+/// needs to be synchronized to disk.
+#[inline]
+pub unsafe fn fd_datasync(fd_: fd) -> errno {
+  cloudabi_sys_fd_datasync(fd_)
+}
+
+/// Duplicates a file descriptor.
+///
+/// ## Parameters
+///
+/// **from**:
+/// The file descriptor that needs to be
+/// duplicated.
+///
+/// **fd**:
+/// The new file descriptor.
+#[inline]
+pub unsafe fn fd_dup(from_: fd, fd_: &mut fd) -> errno {
+  cloudabi_sys_fd_dup(from_, fd_)
+}
+
+/// Reads from a file descriptor, without using and updating the
+/// file descriptor's offset.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor from which data should be
+/// read.
+///
+/// **iovs**:
+/// List of scatter/gather vectors where data
+/// should be stored.
+///
+/// **offset**:
+/// The offset within the file at which reading
+/// should start.
+///
+/// **nread**:
+/// The number of bytes read.
+#[inline]
+pub unsafe fn fd_pread(fd_: fd, iovs_: &[iovec], offset_: filesize, nread_: &mut usize) -> errno {
+  cloudabi_sys_fd_pread(fd_, iovs_.as_ptr(), iovs_.len(), offset_, nread_)
+}
+
+/// Writes to a file descriptor, without using and updating the
+/// file descriptor's offset.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor to which data should be
+/// written.
+///
+/// **iovs**:
+/// List of scatter/gather vectors where data
+/// should be retrieved.
+///
+/// **offset**:
+/// The offset within the file at which writing
+/// should start.
+///
+/// **nwritten**:
+/// The number of bytes written.
+#[inline]
+pub unsafe fn fd_pwrite(fd_: fd, iovs_: &[ciovec], offset_: filesize, nwritten_: &mut usize) -> errno {
+  cloudabi_sys_fd_pwrite(fd_, iovs_.as_ptr(), iovs_.len(), offset_, nwritten_)
+}
+
+/// Reads from a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor from which data should be
+/// read.
+///
+/// **iovs**:
+/// List of scatter/gather vectors where data
+/// should be stored.
+///
+/// **nread**:
+/// The number of bytes read.
+#[inline]
+pub unsafe fn fd_read(fd_: fd, iovs_: &[iovec], nread_: &mut usize) -> errno {
+  cloudabi_sys_fd_read(fd_, iovs_.as_ptr(), iovs_.len(), nread_)
+}
+
+/// Atomically replaces a file descriptor by a copy of another
+/// file descriptor.
+///
+/// Due to the strong focus on thread safety, this environment
+/// does not provide a mechanism to duplicate a file descriptor to
+/// an arbitrary number, like dup2(). This would be prone to race
+/// conditions, as an actual file descriptor with the same number
+/// could be allocated by a different thread at the same time.
+///
+/// This system call provides a way to atomically replace file
+/// descriptors, which would disappear if dup2() were to be
+/// removed entirely.
+///
+/// ## Parameters
+///
+/// **from**:
+/// The file descriptor that needs to be copied.
+///
+/// **to**:
+/// The file descriptor that needs to be
+/// overwritten.
+#[inline]
+pub unsafe fn fd_replace(from_: fd, to_: fd) -> errno {
+  cloudabi_sys_fd_replace(from_, to_)
+}
+
+/// Moves the offset of the file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor whose offset has to be
+/// moved.
+///
+/// **offset**:
+/// The number of bytes to move.
+///
+/// **whence**:
+/// Relative to which position the move should
+/// take place.
+///
+/// **newoffset**:
+/// The new offset of the file descriptor,
+/// relative to the start of the file.
+#[inline]
+pub unsafe fn fd_seek(fd_: fd, offset_: filedelta, whence_: whence, newoffset_: &mut filesize) -> errno {
+  cloudabi_sys_fd_seek(fd_, offset_, whence_, newoffset_)
+}
+
+/// Gets attributes of a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor whose attributes have to
+/// be obtained.
+///
+/// **buf**:
+/// The buffer where the file descriptor's
+/// attributes are stored.
+#[inline]
+pub unsafe fn fd_stat_get(fd_: fd, buf_: *mut fdstat) -> errno {
+  cloudabi_sys_fd_stat_get(fd_, buf_)
+}
+
+/// Adjusts attributes of a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor whose attributes have to
+/// be adjusted.
+///
+/// **buf**:
+/// The desired values of the file descriptor
+/// attributes that are adjusted.
+///
+/// **flags**:
+/// A bitmask indicating which attributes have to
+/// be adjusted.
+#[inline]
+pub unsafe fn fd_stat_put(fd_: fd, buf_: *const fdstat, flags_: fdsflags) -> errno {
+  cloudabi_sys_fd_stat_put(fd_, buf_, flags_)
+}
+
+/// Synchronizes the data and metadata of a file to disk.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor of the file whose data
+/// and metadata needs to be synchronized to disk.
+#[inline]
+pub unsafe fn fd_sync(fd_: fd) -> errno {
+  cloudabi_sys_fd_sync(fd_)
+}
+
+/// Writes to a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor to which data should be
+/// written.
+///
+/// **iovs**:
+/// List of scatter/gather vectors where data
+/// should be retrieved.
+///
+/// **nwritten**:
+/// The number of bytes written.
+#[inline]
+pub unsafe fn fd_write(fd_: fd, iovs_: &[ciovec], nwritten_: &mut usize) -> errno {
+  cloudabi_sys_fd_write(fd_, iovs_.as_ptr(), iovs_.len(), nwritten_)
+}
+
+/// Provides file advisory information on a file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor for which to provide file
+/// advisory information.
+///
+/// **offset**:
+/// The offset within the file to which the
+/// advisory applies.
+///
+/// **len**:
+/// The length of the region to which the advisory
+/// applies.
+///
+/// **advice**:
+/// The advice.
+#[inline]
+pub unsafe fn file_advise(fd_: fd, offset_: filesize, len_: filesize, advice_: advice) -> errno {
+  cloudabi_sys_file_advise(fd_, offset_, len_, advice_)
+}
+
+/// Forces the allocation of space in a file.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file in which the space should be
+/// allocated.
+///
+/// **offset**:
+/// The offset at which the allocation should
+/// start.
+///
+/// **len**:
+/// The length of the area that is allocated.
+#[inline]
+pub unsafe fn file_allocate(fd_: fd, offset_: filesize, len_: filesize) -> errno {
+  cloudabi_sys_file_allocate(fd_, offset_, len_)
+}
+
+/// Creates a file of a specified type.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the file to be created starts.
+///
+/// **path**:
+/// The path at which the file should be created.
+///
+/// **type**:
+/// Possible values:
+///
+///   - [`DIRECTORY`](enum.filetype.html#variant.DIRECTORY):
+///     Creates a directory.
+#[inline]
+pub unsafe fn file_create(fd_: fd, path_: &[u8], type_: filetype) -> errno {
+  cloudabi_sys_file_create(fd_, path_.as_ptr(), path_.len(), type_)
+}
+
+/// Creates a hard link.
+///
+/// ## Parameters
+///
+/// **fd1**:
+/// The working directory at which the resolution
+/// of the source path starts.
+///
+/// **path1**:
+/// The source path of the file that should be
+/// hard linked.
+///
+/// **fd2**:
+/// The working directory at which the resolution
+/// of the destination path starts.
+///
+/// **path2**:
+/// The destination path at which the hard link
+/// should be created.
+#[inline]
+pub unsafe fn file_link(fd1_: lookup, path1_: &[u8], fd2_: fd, path2_: &[u8]) -> errno {
+  cloudabi_sys_file_link(fd1_, path1_.as_ptr(), path1_.len(), fd2_, path2_.as_ptr(), path2_.len())
+}
+
+/// Opens a file.
+///
+/// ## Parameters
+///
+/// **dirfd**:
+/// The working directory at which the resolution
+/// of the file to be opened starts.
+///
+/// **path**:
+/// The path of the file that should be opened.
+///
+/// **oflags**:
+/// The method at which the file should be opened.
+///
+/// **fds**:
+/// [`fdstat.fs_rights_base`](struct.fdstat.html#structfield.fs_rights_base) and
+/// [`fdstat.fs_rights_inheriting`](struct.fdstat.html#structfield.fs_rights_inheriting) specify the
+/// initial rights of the newly created file
+/// descriptor. The operating system is allowed to
+/// return a file descriptor with fewer rights
+/// than specified, if and only if those rights do
+/// not apply to the type of file being opened.
+///
+/// [`fdstat.fs_flags`](struct.fdstat.html#structfield.fs_flags) specifies the initial flags
+/// of the file descriptor.
+///
+/// [`fdstat.fs_filetype`](struct.fdstat.html#structfield.fs_filetype) is ignored.
+///
+/// **fd**:
+/// The file descriptor of the file that has been
+/// opened.
+#[inline]
+pub unsafe fn file_open(dirfd_: lookup, path_: &[u8], oflags_: oflags, fds_: *const fdstat, fd_: &mut fd) -> errno {
+  cloudabi_sys_file_open(dirfd_, path_.as_ptr(), path_.len(), oflags_, fds_, fd_)
+}
+
+/// Reads directory entries from a directory.
+///
+/// When successful, the contents of the output buffer consist of
+/// a sequence of directory entries. Each directory entry consists
+/// of a [`dirent`](struct.dirent.html) object, followed by [`dirent.d_namlen`](struct.dirent.html#structfield.d_namlen) bytes
+/// holding the name of the directory entry.
+///
+/// This system call fills the output buffer as much as possible,
+/// potentially truncating the last directory entry. This allows
+/// the caller to grow its read buffer size in case it's too small
+/// to fit a single large directory entry, or skip the oversized
+/// directory entry.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The directory from which to read the directory
+/// entries.
+///
+/// **buf**:
+/// The buffer where directory entries are stored.
+///
+/// **cookie**:
+/// The location within the directory to start
+/// reading.
+///
+/// **bufused**:
+/// The number of bytes stored in the read buffer.
+/// If less than the size of the read buffer, the
+/// end of the directory has been reached.
+#[inline]
+pub unsafe fn file_readdir(fd_: fd, buf_: &mut [u8], cookie_: dircookie, bufused_: &mut usize) -> errno {
+  cloudabi_sys_file_readdir(fd_, buf_.as_mut_ptr() as *mut (), buf_.len(), cookie_, bufused_)
+}
+
+/// Reads the contents of a symbolic link.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the path of the symbolic starts.
+///
+/// **path**:
+/// The path of the symbolic link whose contents
+/// should be read.
+///
+/// **buf**:
+/// The buffer where the contents of the symbolic
+/// link should be stored.
+///
+/// **bufused**:
+/// The number of bytes placed in the buffer.
+#[inline]
+pub unsafe fn file_readlink(fd_: fd, path_: &[u8], buf_: &mut [u8], bufused_: &mut usize) -> errno {
+  cloudabi_sys_file_readlink(fd_, path_.as_ptr(), path_.len(), buf_.as_mut_ptr(), buf_.len(), bufused_)
+}
+
+/// Renames a file.
+///
+/// ## Parameters
+///
+/// **fd1**:
+/// The working directory at which the resolution
+/// of the source path starts.
+///
+/// **path1**:
+/// The source path of the file that should be
+/// renamed.
+///
+/// **fd2**:
+/// The working directory at which the resolution
+/// of the destination path starts.
+///
+/// **path2**:
+/// The destination path to which the file should
+/// be renamed.
+#[inline]
+pub unsafe fn file_rename(fd1_: fd, path1_: &[u8], fd2_: fd, path2_: &[u8]) -> errno {
+  cloudabi_sys_file_rename(fd1_, path1_.as_ptr(), path1_.len(), fd2_, path2_.as_ptr(), path2_.len())
+}
+
+/// Gets attributes of a file by file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor whose attributes have to
+/// be obtained.
+///
+/// **buf**:
+/// The buffer where the file's attributes are
+/// stored.
+#[inline]
+pub unsafe fn file_stat_fget(fd_: fd, buf_: *mut filestat) -> errno {
+  cloudabi_sys_file_stat_fget(fd_, buf_)
+}
+
+/// Adjusts attributes of a file by file descriptor.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The file descriptor whose attributes have to
+/// be adjusted.
+///
+/// **buf**:
+/// The desired values of the file attributes that
+/// are adjusted.
+///
+/// **flags**:
+/// A bitmask indicating which attributes have to
+/// be adjusted.
+#[inline]
+pub unsafe fn file_stat_fput(fd_: fd, buf_: *const filestat, flags_: fsflags) -> errno {
+  cloudabi_sys_file_stat_fput(fd_, buf_, flags_)
+}
+
+/// Gets attributes of a file by path.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the path whose attributes have to be
+/// obtained starts.
+///
+/// **path**:
+/// The path of the file whose attributes have to
+/// be obtained.
+///
+/// **buf**:
+/// The buffer where the file's attributes are
+/// stored.
+#[inline]
+pub unsafe fn file_stat_get(fd_: lookup, path_: &[u8], buf_: *mut filestat) -> errno {
+  cloudabi_sys_file_stat_get(fd_, path_.as_ptr(), path_.len(), buf_)
+}
+
+/// Adjusts attributes of a file by path.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the path whose attributes have to be
+/// adjusted starts.
+///
+/// **path**:
+/// The path of the file whose attributes have to
+/// be adjusted.
+///
+/// **buf**:
+/// The desired values of the file attributes that
+/// are adjusted.
+///
+/// **flags**:
+/// A bitmask indicating which attributes have to
+/// be adjusted.
+#[inline]
+pub unsafe fn file_stat_put(fd_: lookup, path_: &[u8], buf_: *const filestat, flags_: fsflags) -> errno {
+  cloudabi_sys_file_stat_put(fd_, path_.as_ptr(), path_.len(), buf_, flags_)
+}
+
+/// Creates a symbolic link.
+///
+/// ## Parameters
+///
+/// **path1**:
+/// The contents of the symbolic link.
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the destination path starts.
+///
+/// **path2**:
+/// The destination path at which the symbolic
+/// link should be created.
+#[inline]
+pub unsafe fn file_symlink(path1_: &[u8], fd_: fd, path2_: &[u8]) -> errno {
+  cloudabi_sys_file_symlink(path1_.as_ptr(), path1_.len(), fd_, path2_.as_ptr(), path2_.len())
+}
+
+/// Unlinks a file, or removes a directory.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// The working directory at which the resolution
+/// of the path starts.
+///
+/// **path**:
+/// The path that needs to be unlinked or removed.
+///
+/// **flags**:
+/// Possible values:
+///
+///   - [`REMOVEDIR`](struct.ulflags.html#associatedconstant.REMOVEDIR):
+///     If set, attempt to remove a directory.
+///     Otherwise, unlink a file.
+#[inline]
+pub unsafe fn file_unlink(fd_: fd, path_: &[u8], flags_: ulflags) -> errno {
+  cloudabi_sys_file_unlink(fd_, path_.as_ptr(), path_.len(), flags_)
+}
+
+/// Unlocks a write-locked userspace lock.
+///
+/// If a userspace lock is unlocked while having its
+/// [`LOCK_KERNEL_MANAGED`](constant.LOCK_KERNEL_MANAGED.html) flag set, the lock cannot be unlocked in
+/// userspace directly. This system call needs to be performed
+/// instead, so that any waiting threads can be woken up.
+///
+/// To prevent spurious invocations of this system call, the lock
+/// must be locked for writing. This prevents other threads from
+/// acquiring additional read locks while the system call is in
+/// progress. If the lock is acquired for reading, it must first
+/// be upgraded to a write lock.
+///
+/// ## Parameters
+///
+/// **lock**:
+/// The userspace lock that is locked for writing
+/// by the calling thread.
+///
+/// **scope**:
+/// Whether the lock is stored in private or
+/// shared memory.
+#[inline]
+pub unsafe fn lock_unlock(lock_: *mut lock, scope_: scope) -> errno {
+  cloudabi_sys_lock_unlock(lock_, scope_)
+}
+
+/// Provides memory advisory information on a region of memory.
+///
+/// ## Parameters
+///
+/// **mapping**:
+/// The pages for which to provide memory advisory
+/// information.
+///
+/// **advice**:
+/// The advice.
+#[inline]
+pub unsafe fn mem_advise(mapping_: &mut [u8], advice_: advice) -> errno {
+  cloudabi_sys_mem_advise(mapping_.as_mut_ptr() as *mut (), mapping_.len(), advice_)
+}
+
+/// Creates a memory mapping, making the contents of a file
+/// accessible through memory.
+///
+/// ## Parameters
+///
+/// **addr**:
+/// If [`FIXED`](struct.mflags.html#associatedconstant.FIXED) is set, specifies to which
+/// address the file region is mapped. Otherwise,
+/// the mapping is performed at an unused
+/// location.
+///
+/// **len**:
+/// The length of the memory mapping to be
+/// created.
+///
+/// **prot**:
+/// Initial memory protection options for the
+/// memory mapping.
+///
+/// **flags**:
+/// Memory mapping flags.
+///
+/// **fd**:
+/// If [`ANON`](struct.mflags.html#associatedconstant.ANON) is set, this argument must be
+/// [`MAP_ANON_FD`](constant.MAP_ANON_FD.html). Otherwise, this argument
+/// specifies the file whose contents need to be
+/// mapped.
+///
+/// **off**:
+/// If [`ANON`](struct.mflags.html#associatedconstant.ANON) is set, this argument must be
+/// zero. Otherwise, this argument specifies the
+/// offset within the file at which the mapping
+/// starts.
+///
+/// **mem**:
+/// The starting address of the memory mapping.
+#[inline]
+pub unsafe fn mem_map(addr_: *mut (), len_: usize, prot_: mprot, flags_: mflags, fd_: fd, off_: filesize, mem_: &mut *mut ()) -> errno {
+  cloudabi_sys_mem_map(addr_, len_, prot_, flags_, fd_, off_, mem_)
+}
+
+/// Change the protection of a memory mapping.
+///
+/// ## Parameters
+///
+/// **mapping**:
+/// The pages that need their protection changed.
+///
+/// **prot**:
+/// New protection options.
+#[inline]
+pub unsafe fn mem_protect(mapping_: &mut [u8], prot_: mprot) -> errno {
+  cloudabi_sys_mem_protect(mapping_.as_mut_ptr() as *mut (), mapping_.len(), prot_)
+}
+
+/// Synchronize a region of memory with its physical storage.
+///
+/// ## Parameters
+///
+/// **mapping**:
+/// The pages that need to be synchronized.
+///
+/// **flags**:
+/// The method of synchronization.
+#[inline]
+pub unsafe fn mem_sync(mapping_: &mut [u8], flags_: msflags) -> errno {
+  cloudabi_sys_mem_sync(mapping_.as_mut_ptr() as *mut (), mapping_.len(), flags_)
+}
+
+/// Unmaps a region of memory.
+///
+/// ## Parameters
+///
+/// **mapping**:
+/// The pages that needs to be unmapped.
+#[inline]
+pub unsafe fn mem_unmap(mapping_: &mut [u8]) -> errno {
+  cloudabi_sys_mem_unmap(mapping_.as_mut_ptr() as *mut (), mapping_.len())
+}
+
+/// Concurrently polls for the occurrence of a set of events.
+///
+/// ## Parameters
+///
+/// **in**:
+/// The events to which to subscribe.
+///
+/// **out**:
+/// The events that have occurred.
+///
+/// **nsubscriptions**:
+/// Both the number of subscriptions and events.
+///
+/// **nevents**:
+/// The number of events stored.
+#[inline]
+pub unsafe fn poll(in_: *const subscription, out_: *mut event, nsubscriptions_: usize, nevents_: &mut usize) -> errno {
+  cloudabi_sys_poll(in_, out_, nsubscriptions_, nevents_)
+}
+
+/// Replaces the process by a new executable.
+///
+/// Process execution in CloudABI differs from POSIX in two ways:
+/// handling of arguments and inheritance of file descriptors.
+///
+/// CloudABI does not use string command line arguments. Instead,
+/// a buffer with binary data is copied into the address space of
+/// the new executable. The kernel does not enforce any specific
+/// structure to this data, although CloudABI's C library uses it
+/// to store a tree structure that is semantically identical to
+/// YAML.
+///
+/// Due to the strong focus on thread safety, file descriptors
+/// aren't inherited through close-on-exec flags. An explicit
+/// list of file descriptors that need to be retained needs to be
+/// provided. After execution, file descriptors are placed in the
+/// order in which they are stored in the array. This not only
+/// makes the execution process deterministic. It also prevents
+/// potential information disclosures about the layout of the
+/// original process.
+///
+/// ## Parameters
+///
+/// **fd**:
+/// A file descriptor of the new executable.
+///
+/// **data**:
+/// Binary argument data that is passed on to the
+/// new executable.
+///
+/// **fds**:
+/// The layout of the file descriptor table after
+/// execution.
+#[inline]
+pub unsafe fn proc_exec(fd_: fd, data_: &[u8], fds_: &[fd]) -> errno {
+  cloudabi_sys_proc_exec(fd_, data_.as_ptr() as *const (), data_.len(), fds_.as_ptr(), fds_.len())
+}
+
+/// Terminates the process normally.
+///
+/// ## Parameters
+///
+/// **rval**:
+/// The exit code returned by the process. The
+/// exit code can be obtained by other processes
+/// through [`event.union.proc_terminate.exitcode`](struct.event_proc_terminate.html#structfield.exitcode).
+#[inline]
+pub unsafe fn proc_exit(rval_: exitcode) -> ! {
+  cloudabi_sys_proc_exit(rval_)
+}
+
+/// Forks the process of the calling thread.
+///
+/// After forking, a new process shall be created, having only a
+/// copy of the calling thread. The parent process will obtain a
+/// process descriptor. When closed, the child process is
+/// automatically signaled with [`KILL`](enum.signal.html#variant.KILL).
+///
+/// ## Parameters
+///
+/// **fd**:
+/// In the parent process: the file descriptor
+/// number of the process descriptor.
+///
+/// In the child process: [`PROCESS_CHILD`](constant.PROCESS_CHILD.html).
+///
+/// **tid**:
+/// In the parent process: undefined.
+///
+/// In the child process: the thread ID of the
+/// initial thread of the child process.
+#[inline]
+pub unsafe fn proc_fork(fd_: &mut fd, tid_: &mut tid) -> errno {
+  cloudabi_sys_proc_fork(fd_, tid_)
+}
+
+/// Sends a signal to the process of the calling thread.
+///
+/// ## Parameters
+///
+/// **sig**:
+/// The signal condition that should be triggered.
+/// If the signal causes the process to terminate,
+/// its condition can be obtained by other
+/// processes through
+/// [`event.union.proc_terminate.signal`](struct.event_proc_terminate.html#structfield.signal).
+#[inline]
+pub unsafe fn proc_raise(sig_: signal) -> errno {
+  cloudabi_sys_proc_raise(sig_)
+}
+
+/// Obtains random data from the kernel random number generator.
+///
+/// As this interface is not guaranteed to be fast, it is advised
+/// that the random data obtained through this system call is used
+/// as the seed for a userspace pseudo-random number generator.
+///
+/// ## Parameters
+///
+/// **buf**:
+/// The buffer that needs to be filled with random
+/// data.
+#[inline]
+pub unsafe fn random_get(buf_: &mut [u8]) -> errno {
+  cloudabi_sys_random_get(buf_.as_mut_ptr() as *mut (), buf_.len())
+}
+
+/// Receives a message on a socket.
+///
+/// ## Parameters
+///
+/// **sock**:
+/// The socket on which a message should be
+/// received.
+///
+/// **in**:
+/// Input parameters.
+///
+/// **out**:
+/// Output parameters.
+#[inline]
+pub unsafe fn sock_recv(sock_: fd, in_: *const recv_in, out_: *mut recv_out) -> errno {
+  cloudabi_sys_sock_recv(sock_, in_, out_)
+}
+
+/// Sends a message on a socket.
+///
+/// ## Parameters
+///
+/// **sock**:
+/// The socket on which a message should be sent.
+///
+/// **in**:
+/// Input parameters.
+///
+/// **out**:
+/// Output parameters.
+#[inline]
+pub unsafe fn sock_send(sock_: fd, in_: *const send_in, out_: *mut send_out) -> errno {
+  cloudabi_sys_sock_send(sock_, in_, out_)
+}
+
+/// Shuts down socket send and receive channels.
+///
+/// ## Parameters
+///
+/// **sock**:
+/// The socket that needs its channels shut down.
+///
+/// **how**:
+/// Which channels on the socket need to be shut
+/// down.
+#[inline]
+pub unsafe fn sock_shutdown(sock_: fd, how_: sdflags) -> errno {
+  cloudabi_sys_sock_shutdown(sock_, how_)
+}
+
+/// Creates a new thread within the current process.
+///
+/// ## Parameters
+///
+/// **attr**:
+/// The desired attributes of the new thread.
+///
+/// **tid**:
+/// The thread ID of the new thread.
+#[inline]
+pub unsafe fn thread_create(attr_: *mut threadattr, tid_: &mut tid) -> errno {
+  cloudabi_sys_thread_create(attr_, tid_)
+}
+
+/// Terminates the calling thread.
+///
+/// This system call can also unlock a single userspace lock
+/// after termination, which can be used to implement thread
+/// joining.
+///
+/// ## Parameters
+///
+/// **lock**:
+/// Userspace lock that is locked for writing by
+/// the calling thread.
+///
+/// **scope**:
+/// Whether the lock is stored in private or
+/// shared memory.
+#[inline]
+pub unsafe fn thread_exit(lock_: *mut lock, scope_: scope) -> ! {
+  cloudabi_sys_thread_exit(lock_, scope_)
+}
+
+/// Temporarily yields execution of the calling thread.
+#[inline]
+pub unsafe fn thread_yield() -> errno {
+  cloudabi_sys_thread_yield()
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"05e37a4e63dc4a495998bb5133252a51d671c4e99061a6342089ed6eab43978a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0621878e61f0d0fda054bcbe02df75192c28bde1ecc8289cbd86aeba2dd72720","README.md":"e2effacb5bbd7c01523f9a9e4a6a59c0f9b8698753b210fec5742408498197df","src/core_lazy.rs":"6b9fb6a4f553058e240756125b6b9ca43a83ed1fb72964343038ea0ea2e1af10","src/inline_lazy.rs":"f6184afbca4b477616f270790edc180263be806aa92ef0a9de681b4aac9e88c4","src/lib.rs":"99096a5d3089c0d86646f0805d1455befe2cb09683704af29c5c9d99ecab2683","tests/no_std.rs":"d68b149ee51ef5ae2b2906c0c94f5a9812d3b02811b13365c5a35e2ef90d25cf","tests/test.rs":"b3f7d805375dc5af7a2aa4b869944ad2ab4fc982b35ad718ea58f6914dc0a698"},"package":"e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,46 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "lazy_static"
+version = "1.4.0"
+authors = ["Marvin Löbel <loebel.marvin@gmail.com>"]
+exclude = ["/.travis.yml", "/appveyor.yml"]
+description = "A macro for declaring lazily evaluated statics in Rust."
+documentation = "https://docs.rs/lazy_static"
+readme = "README.md"
+keywords = ["macro", "lazy", "static"]
+categories = ["no-std", "rust-patterns", "memory-management"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/rust-lang-nursery/lazy-static.rs"
+[dependencies.spin]
+version = "0.5.0"
+optional = true
+[dev-dependencies.doc-comment]
+version = "0.3.1"
+
+[features]
+spin_no_std = ["spin"]
+[badges.appveyor]
+repository = "rust-lang-nursery/lazy-static.rs"
+
+[badges.is-it-maintained-issue-resolution]
+repository = "rust-lang-nursery/lazy-static.rs"
+
+[badges.is-it-maintained-open-issues]
+repository = "rust-lang-nursery/lazy-static.rs"
+
+[badges.maintenance]
+status = "passively-maintained"
+
+[badges.travis-ci]
+repository = "rust-lang-nursery/lazy-static.rs"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2010 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/README.md firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/README.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/README.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,79 @@
+lazy-static.rs
+==============
+
+A macro for declaring lazily evaluated statics in Rust.
+
+Using this macro, it is possible to have `static`s that require code to be
+executed at runtime in order to be initialized.
+This includes anything requiring heap allocations, like vectors or hash maps,
+as well as anything that requires non-const function calls to be computed.
+
+[![Travis-CI Status](https://travis-ci.com/rust-lang-nursery/lazy-static.rs.svg?branch=master)](https://travis-ci.com/rust-lang-nursery/lazy-static.rs)
+[![Latest version](https://img.shields.io/crates/v/lazy_static.svg)](https://crates.io/crates/lazy_static)
+[![Documentation](https://docs.rs/lazy_static/badge.svg)](https://docs.rs/lazy_static)
+[![License](https://img.shields.io/crates/l/lazy_static.svg)](https://github.com/rust-lang-nursery/lazy-static.rs#license)
+
+## Minimum supported `rustc`
+
+`1.27.2+`
+
+This version is explicitly tested in CI and may only be bumped in new minor versions. Any changes to the supported minimum version will be called out in the release notes.
+
+
+# Getting Started
+
+[lazy-static.rs is available on crates.io](https://crates.io/crates/lazy_static).
+It is recommended to look there for the newest released version, as well as links to the newest builds of the docs.
+
+At the point of the last update of this README, the latest published version could be used like this:
+
+Add the following dependency to your Cargo manifest...
+
+```toml
+[dependencies]
+lazy_static = "1.4.0"
+```
+
+...and see the [docs](https://docs.rs/lazy_static) for how to use it.
+
+# Example
+
+```rust
+#[macro_use]
+extern crate lazy_static;
+
+use std::collections::HashMap;
+
+lazy_static! {
+    static ref HASHMAP: HashMap<u32, &'static str> = {
+        let mut m = HashMap::new();
+        m.insert(0, "foo");
+        m.insert(1, "bar");
+        m.insert(2, "baz");
+        m
+    };
+}
+
+fn main() {
+    // First access to `HASHMAP` initializes it
+    println!("The entry for `0` is \"{}\".", HASHMAP.get(&0).unwrap());
+
+    // Any further access to `HASHMAP` just returns the computed value
+    println!("The entry for `1` is \"{}\".", HASHMAP.get(&1).unwrap());
+}
+```
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/core_lazy.rs firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/core_lazy.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/core_lazy.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/core_lazy.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,31 @@
+// Copyright 2016 lazy-static.rs Developers
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+extern crate spin;
+
+use self::spin::Once;
+
+pub struct Lazy<T: Sync>(Once<T>);
+
+impl<T: Sync> Lazy<T> {
+    pub const INIT: Self = Lazy(Once::INIT);
+
+    #[inline(always)]
+    pub fn get<F>(&'static self, builder: F) -> &T
+        where F: FnOnce() -> T
+    {
+        self.0.call_once(builder)
+    }
+}
+
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __lazy_static_create {
+    ($NAME:ident, $T:ty) => {
+        static $NAME: $crate::lazy::Lazy<$T> = $crate::lazy::Lazy::INIT;
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/inline_lazy.rs firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/inline_lazy.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/inline_lazy.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/inline_lazy.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,57 @@
+// Copyright 2016 lazy-static.rs Developers
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+extern crate core;
+extern crate std;
+
+use self::std::prelude::v1::*;
+use self::std::cell::Cell;
+use self::std::hint::unreachable_unchecked;
+use self::std::sync::Once;
+#[allow(deprecated)]
+pub use self::std::sync::ONCE_INIT;
+
+// FIXME: Replace Option<T> with MaybeUninit<T> (stable since 1.36.0)
+pub struct Lazy<T: Sync>(Cell<Option<T>>, Once);
+
+impl<T: Sync> Lazy<T> {
+    #[allow(deprecated)]
+    pub const INIT: Self = Lazy(Cell::new(None), ONCE_INIT);
+
+    #[inline(always)]
+    pub fn get<F>(&'static self, f: F) -> &T
+    where
+        F: FnOnce() -> T,
+    {
+        self.1.call_once(|| {
+            self.0.set(Some(f()));
+        });
+
+        // `self.0` is guaranteed to be `Some` by this point
+        // The `Once` will catch and propagate panics
+        unsafe {
+            match *self.0.as_ptr() {
+                Some(ref x) => x,
+                None => {
+                    debug_assert!(false, "attempted to derefence an uninitialized lazy static. This is a bug");
+
+                    unreachable_unchecked()
+                },
+            }
+        }
+    }
+}
+
+unsafe impl<T: Sync> Sync for Lazy<T> {}
+
+#[macro_export]
+#[doc(hidden)]
+macro_rules! __lazy_static_create {
+    ($NAME:ident, $T:ty) => {
+        static $NAME: $crate::lazy::Lazy<$T> = $crate::lazy::Lazy::INIT;
+    };
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,215 @@
+// Copyright 2016 lazy-static.rs Developers
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+/*!
+A macro for declaring lazily evaluated statics.
+
+Using this macro, it is possible to have `static`s that require code to be
+executed at runtime in order to be initialized.
+This includes anything requiring heap allocations, like vectors or hash maps,
+as well as anything that requires function calls to be computed.
+
+# Syntax
+
+```ignore
+lazy_static! {
+    [pub] static ref NAME_1: TYPE_1 = EXPR_1;
+    [pub] static ref NAME_2: TYPE_2 = EXPR_2;
+    ...
+    [pub] static ref NAME_N: TYPE_N = EXPR_N;
+}
+```
+
+Attributes (including doc comments) are supported as well:
+
+```rust
+# #[macro_use]
+# extern crate lazy_static;
+# fn main() {
+lazy_static! {
+    /// This is an example for using doc comment attributes
+    static ref EXAMPLE: u8 = 42;
+}
+# }
+```
+
+# Semantics
+
+For a given `static ref NAME: TYPE = EXPR;`, the macro generates a unique type that
+implements `Deref<TYPE>` and stores it in a static with name `NAME`. (Attributes end up
+attaching to this type.)
+
+On first deref, `EXPR` gets evaluated and stored internally, such that all further derefs
+can return a reference to the same object. Note that this can lead to deadlocks
+if you have multiple lazy statics that depend on each other in their initialization.
+
+Apart from the lazy initialization, the resulting "static ref" variables
+have generally the same properties as regular "static" variables:
+
+- Any type in them needs to fulfill the `Sync` trait.
+- If the type has a destructor, then it will not run when the process exits.
+
+# Example
+
+Using the macro:
+
+```rust
+#[macro_use]
+extern crate lazy_static;
+
+use std::collections::HashMap;
+
+lazy_static! {
+    static ref HASHMAP: HashMap<u32, &'static str> = {
+        let mut m = HashMap::new();
+        m.insert(0, "foo");
+        m.insert(1, "bar");
+        m.insert(2, "baz");
+        m
+    };
+    static ref COUNT: usize = HASHMAP.len();
+    static ref NUMBER: u32 = times_two(21);
+}
+
+fn times_two(n: u32) -> u32 { n * 2 }
+
+fn main() {
+    println!("The map has {} entries.", *COUNT);
+    println!("The entry for `0` is \"{}\".", HASHMAP.get(&0).unwrap());
+    println!("A expensive calculation on a static results in: {}.", *NUMBER);
+}
+```
+
+# Implementation details
+
+The `Deref` implementation uses a hidden static variable that is guarded by an atomic check on each access.
+
+# Cargo features
+
+This crate provides one cargo feature:
+
+- `spin_no_std`: This allows using this crate in a no-std environment, by depending on the standalone `spin` crate.
+
+*/
+
+#![doc(html_root_url = "https://docs.rs/lazy_static/1.4.0")]
+#![no_std]
+
+#[cfg(not(feature = "spin_no_std"))]
+#[path="inline_lazy.rs"]
+#[doc(hidden)]
+pub mod lazy;
+
+#[cfg(test)]
+#[macro_use]
+extern crate doc_comment;
+
+#[cfg(test)]
+doctest!("../README.md");
+
+#[cfg(feature = "spin_no_std")]
+#[path="core_lazy.rs"]
+#[doc(hidden)]
+pub mod lazy;
+
+#[doc(hidden)]
+pub use core::ops::Deref as __Deref;
+
+#[macro_export(local_inner_macros)]
+#[doc(hidden)]
+macro_rules! __lazy_static_internal {
+    // optional visibility restrictions are wrapped in `()` to allow for
+    // explicitly passing otherwise implicit information about private items
+    ($(#[$attr:meta])* ($($vis:tt)*) static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        __lazy_static_internal!(@MAKE TY, $(#[$attr])*, ($($vis)*), $N);
+        __lazy_static_internal!(@TAIL, $N : $T = $e);
+        lazy_static!($($t)*);
+    };
+    (@TAIL, $N:ident : $T:ty = $e:expr) => {
+        impl $crate::__Deref for $N {
+            type Target = $T;
+            fn deref(&self) -> &$T {
+                #[inline(always)]
+                fn __static_ref_initialize() -> $T { $e }
+
+                #[inline(always)]
+                fn __stability() -> &'static $T {
+                    __lazy_static_create!(LAZY, $T);
+                    LAZY.get(__static_ref_initialize)
+                }
+                __stability()
+            }
+        }
+        impl $crate::LazyStatic for $N {
+            fn initialize(lazy: &Self) {
+                let _ = &**lazy;
+            }
+        }
+    };
+    // `vis` is wrapped in `()` to prevent parsing ambiguity
+    (@MAKE TY, $(#[$attr:meta])*, ($($vis:tt)*), $N:ident) => {
+        #[allow(missing_copy_implementations)]
+        #[allow(non_camel_case_types)]
+        #[allow(dead_code)]
+        $(#[$attr])*
+        $($vis)* struct $N {__private_field: ()}
+        #[doc(hidden)]
+        $($vis)* static $N: $N = $N {__private_field: ()};
+    };
+    () => ()
+}
+
+#[macro_export(local_inner_macros)]
+macro_rules! lazy_static {
+    ($(#[$attr:meta])* static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        // use `()` to explicitly forward the information about private items
+        __lazy_static_internal!($(#[$attr])* () static ref $N : $T = $e; $($t)*);
+    };
+    ($(#[$attr:meta])* pub static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        __lazy_static_internal!($(#[$attr])* (pub) static ref $N : $T = $e; $($t)*);
+    };
+    ($(#[$attr:meta])* pub ($($vis:tt)+) static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
+        __lazy_static_internal!($(#[$attr])* (pub ($($vis)+)) static ref $N : $T = $e; $($t)*);
+    };
+    () => ()
+}
+
+/// Support trait for enabling a few common operation on lazy static values.
+///
+/// This is implemented by each defined lazy static, and
+/// used by the free functions in this crate.
+pub trait LazyStatic {
+    #[doc(hidden)]
+    fn initialize(lazy: &Self);
+}
+
+/// Takes a shared reference to a lazy static and initializes
+/// it if it has not been already.
+///
+/// This can be used to control the initialization point of a lazy static.
+///
+/// Example:
+///
+/// ```rust
+/// #[macro_use]
+/// extern crate lazy_static;
+///
+/// lazy_static! {
+///     static ref BUFFER: Vec<u8> = (0..255).collect();
+/// }
+///
+/// fn main() {
+///     lazy_static::initialize(&BUFFER);
+///
+///     // ...
+///     work_with_initialized_data(&BUFFER);
+/// }
+/// # fn work_with_initialized_data(_: &[u8]) {}
+/// ```
+pub fn initialize<T: LazyStatic>(lazy: &T) {
+    LazyStatic::initialize(lazy);
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/tests/no_std.rs firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/tests/no_std.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/tests/no_std.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/tests/no_std.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,20 @@
+#![cfg(feature="spin_no_std")]
+
+#![no_std]
+
+#[macro_use]
+extern crate lazy_static;
+
+lazy_static! {
+    /// Documentation!
+    pub static ref NUMBER: u32 = times_two(3);
+}
+
+fn times_two(n: u32) -> u32 {
+    n * 2
+}
+
+#[test]
+fn test_basic() {
+    assert_eq!(*NUMBER, 6);
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/tests/test.rs firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/tests/test.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lazy_static/tests/test.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lazy_static/tests/test.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,164 @@
+#[macro_use]
+extern crate lazy_static;
+use std::collections::HashMap;
+
+lazy_static! {
+    /// Documentation!
+    pub static ref NUMBER: u32 = times_two(3);
+
+    static ref ARRAY_BOXES: [Box<u32>; 3] = [Box::new(1), Box::new(2), Box::new(3)];
+
+    /// More documentation!
+    #[allow(unused_variables)]
+    #[derive(Copy, Clone, Debug)]
+    pub static ref STRING: String = "hello".to_string();
+
+    static ref HASHMAP: HashMap<u32, &'static str> = {
+        let mut m = HashMap::new();
+        m.insert(0, "abc");
+        m.insert(1, "def");
+        m.insert(2, "ghi");
+        m
+    };
+
+    // This should not compile if the unsafe is removed.
+    static ref UNSAFE: u32 = unsafe {
+        std::mem::transmute::<i32, u32>(-1)
+    };
+}
+
+lazy_static! {
+    static ref S1: &'static str = "a";
+    static ref S2: &'static str = "b";
+}
+lazy_static! {
+    static ref S3: String = [*S1, *S2].join("");
+}
+
+#[test]
+fn s3() {
+    assert_eq!(&*S3, "ab");
+}
+
+fn times_two(n: u32) -> u32 {
+    n * 2
+}
+
+#[test]
+fn test_basic() {
+    assert_eq!(&**STRING, "hello");
+    assert_eq!(*NUMBER, 6);
+    assert!(HASHMAP.get(&1).is_some());
+    assert!(HASHMAP.get(&3).is_none());
+    assert_eq!(&*ARRAY_BOXES, &[Box::new(1), Box::new(2), Box::new(3)]);
+    assert_eq!(*UNSAFE, std::u32::MAX);
+}
+
+#[test]
+fn test_repeat() {
+    assert_eq!(*NUMBER, 6);
+    assert_eq!(*NUMBER, 6);
+    assert_eq!(*NUMBER, 6);
+}
+
+#[test]
+fn test_meta() {
+    // this would not compile if STRING were not marked #[derive(Copy, Clone)]
+    let copy_of_string = STRING;
+    // just to make sure it was copied
+    assert!(&STRING as *const _ != &copy_of_string as *const _);
+
+    // this would not compile if STRING were not marked #[derive(Debug)]
+    assert_eq!(format!("{:?}", STRING), "STRING { __private_field: () }".to_string());
+}
+
+mod visibility {
+    lazy_static! {
+        pub static ref FOO: Box<u32> = Box::new(0);
+        static ref BAR: Box<u32> = Box::new(98);
+    }
+
+    pub mod inner {
+        lazy_static! {
+            pub(in visibility) static ref BAZ: Box<u32> = Box::new(42);
+            pub(crate) static ref BAG: Box<u32> = Box::new(37);
+        }
+    }
+
+    #[test]
+    fn sub_test() {
+        assert_eq!(**FOO, 0);
+        assert_eq!(**BAR, 98);
+        assert_eq!(**inner::BAZ, 42);
+        assert_eq!(**inner::BAG, 37);
+    }
+}
+
+#[test]
+fn test_visibility() {
+    assert_eq!(*visibility::FOO, Box::new(0));
+    assert_eq!(*visibility::inner::BAG, Box::new(37));
+}
+
+// This should not cause a warning about a missing Copy implementation
+lazy_static! {
+    pub static ref VAR: i32 = { 0 };
+}
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+struct X;
+struct Once(X);
+const ONCE_INIT: Once = Once(X);
+static DATA: X = X;
+static ONCE: X = X;
+fn require_sync() -> X { X }
+fn transmute() -> X { X }
+fn __static_ref_initialize() -> X { X }
+fn test(_: Vec<X>) -> X { X }
+
+// All these names should not be shadowed
+lazy_static! {
+    static ref ITEM_NAME_TEST: X = {
+        test(vec![X, Once(X).0, ONCE_INIT.0, DATA, ONCE,
+                  require_sync(), transmute(),
+                  // Except this, which will sadly be shadowed by internals:
+                  // __static_ref_initialize()
+                  ])
+    };
+}
+
+#[test]
+fn item_name_shadowing() {
+    assert_eq!(*ITEM_NAME_TEST, X);
+}
+
+use std::sync::atomic::AtomicBool;
+#[allow(deprecated)]
+use std::sync::atomic::ATOMIC_BOOL_INIT;
+use std::sync::atomic::Ordering::SeqCst;
+
+#[allow(deprecated)]
+static PRE_INIT_FLAG: AtomicBool = ATOMIC_BOOL_INIT;
+
+lazy_static! {
+    static ref PRE_INIT: () = {
+        PRE_INIT_FLAG.store(true, SeqCst);
+        ()
+    };
+}
+
+#[test]
+fn pre_init() {
+    assert_eq!(PRE_INIT_FLAG.load(SeqCst), false);
+    lazy_static::initialize(&PRE_INIT);
+    assert_eq!(PRE_INIT_FLAG.load(SeqCst), true);
+}
+
+lazy_static! {
+    static ref LIFETIME_NAME: for<'a> fn(&'a u8) = { fn f(_: &u8) {} f };
+}
+
+#[test]
+fn lifetime_name() {
+    let _ = LIFETIME_NAME;
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"6b931fdc231a35953748d244fc3ed1b6cd4d95c95c618058955df508f2e7e738","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"3541bfbc3b6121af8fbeb4683ab28412ca46a9b9bdd83a9348778db76e7ea18f","src/mutex.rs":"d010fba6b466937cbc8c16ed4131c7a16753c61362e4be038c1748c2b9431340","src/remutex.rs":"541735f5675c78117cdec802b53df6ac5b7a834d18e0616cff073b7acc6cf02b","src/rwlock.rs":"992394f38f0bc5211fa1f4d7b7af3a1cc9afcec4d48734ded3b248897c7902d9"},"package":"c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,37 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "lock_api"
+version = "0.3.4"
+authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
+description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."
+keywords = ["mutex", "rwlock", "lock", "no_std"]
+categories = ["concurrency", "no-std"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/Amanieu/parking_lot"
+[dependencies.owning_ref]
+version = "0.4"
+optional = true
+
+[dependencies.scopeguard]
+version = "1.0"
+default-features = false
+
+[dependencies.serde]
+version = "1.0.90"
+optional = true
+default-features = false
+
+[features]
+nightly = []
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2016 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,109 @@
+// Copyright 2018 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! This library provides type-safe and fully-featured `Mutex` and `RwLock`
+//! types which wrap a simple raw mutex or rwlock type. This has several
+//! benefits: not only does it eliminate a large portion of the work in
+//! implementing custom lock types, it also allows users to write code which is
+//! generic with regards to different lock implementations.
+//!
+//! Basic usage of this crate is very straightforward:
+//!
+//! 1. Create a raw lock type. This should only contain the lock state, not any
+//!    data protected by the lock.
+//! 2. Implement the `RawMutex` trait for your custom lock type.
+//! 3. Export your mutex as a type alias for `lock_api::Mutex`, and
+//!    your mutex guard as a type alias for `lock_api::MutexGuard`.
+//!    See the [example](#example) below for details.
+//!
+//! This process is similar for RwLocks, except that two guards need to be
+//! exported instead of one. (Or 3 guards if your type supports upgradable read
+//! locks, see [extension traits](#extension-traits) below for details)
+//!
+//! # Example
+//!
+//! ```
+//! use lock_api::{RawMutex, Mutex, GuardSend};
+//! use std::sync::atomic::{AtomicBool, Ordering};
+//!
+//! // 1. Define our raw lock type
+//! pub struct RawSpinlock(AtomicBool);
+//!
+//! // 2. Implement RawMutex for this type
+//! unsafe impl RawMutex for RawSpinlock {
+//!     const INIT: RawSpinlock = RawSpinlock(AtomicBool::new(false));
+//!
+//!     // A spinlock guard can be sent to another thread and unlocked there
+//!     type GuardMarker = GuardSend;
+//!
+//!     fn lock(&self) {
+//!         // Note: This isn't the best way of implementing a spinlock, but it
+//!         // suffices for the sake of this example.
+//!         while !self.try_lock() {}
+//!     }
+//!
+//!     fn try_lock(&self) -> bool {
+//!         self.0
+//!             .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
+//!             .is_ok()
+//!     }
+//!
+//!     fn unlock(&self) {
+//!         self.0.store(false, Ordering::Release);
+//!     }
+//! }
+//!
+//! // 3. Export the wrappers. This are the types that your users will actually use.
+//! pub type Spinlock<T> = lock_api::Mutex<RawSpinlock, T>;
+//! pub type SpinlockGuard<'a, T> = lock_api::MutexGuard<'a, RawSpinlock, T>;
+//! ```
+//!
+//! # Extension traits
+//!
+//! In addition to basic locking & unlocking functionality, you have the option
+//! of exposing additional functionality in your lock types by implementing
+//! additional traits for it. Examples of extension features include:
+//!
+//! - Fair unlocking (`RawMutexFair`, `RawRwLockFair`)
+//! - Lock timeouts (`RawMutexTimed`, `RawRwLockTimed`)
+//! - Downgradable write locks (`RawRwLockDowngradable`)
+//! - Recursive read locks (`RawRwLockRecursive`)
+//! - Upgradable read locks (`RawRwLockUpgrade`)
+//!
+//! The `Mutex` and `RwLock` wrappers will automatically expose this additional
+//! functionality if the raw lock type implements these extension traits.
+//!
+//! # Cargo features
+//!
+//! This crate supports two cargo features:
+//!
+//! - `owning_ref`: Allows your lock types to be used with the `owning_ref` crate.
+//! - `nightly`: Enables nightly-only features. At the moment the only such
+//!   feature is `const fn` constructors for lock types.
+
+#![no_std]
+#![warn(missing_docs)]
+#![warn(rust_2018_idioms)]
+#![cfg_attr(feature = "nightly", feature(const_fn))]
+
+#[macro_use]
+extern crate scopeguard;
+
+/// Marker type which indicates that the Guard type for a lock is `Send`.
+pub struct GuardSend(());
+
+/// Marker type which indicates that the Guard type for a lock is not `Send`.
+pub struct GuardNoSend(*mut ());
+
+mod mutex;
+pub use crate::mutex::*;
+
+mod remutex;
+pub use crate::remutex::*;
+
+mod rwlock;
+pub use crate::rwlock::*;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/mutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/mutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/mutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,644 @@
+// Copyright 2018 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::cell::UnsafeCell;
+use core::fmt;
+use core::marker::PhantomData;
+use core::mem;
+use core::ops::{Deref, DerefMut};
+
+#[cfg(feature = "owning_ref")]
+use owning_ref::StableAddress;
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+/// Basic operations for a mutex.
+///
+/// Types implementing this trait can be used by `Mutex` to form a safe and
+/// fully-functioning mutex type.
+///
+/// # Safety
+///
+/// Implementations of this trait must ensure that the mutex is actually
+/// exclusive: a lock can't be acquired while the mutex is already locked.
+pub unsafe trait RawMutex {
+    /// Initial value for an unlocked mutex.
+    // A “non-constant� const item is a legacy way to supply an initialized value to downstream
+    // static items. Can hopefully be replaced with `const fn new() -> Self` at some point.
+    #[allow(clippy::declare_interior_mutable_const)]
+    const INIT: Self;
+
+    /// Marker type which determines whether a lock guard should be `Send`. Use
+    /// one of the `GuardSend` or `GuardNoSend` helper types here.
+    type GuardMarker;
+
+    /// Acquires this mutex, blocking the current thread until it is able to do so.
+    fn lock(&self);
+
+    /// Attempts to acquire this mutex without blocking. Returns `true`
+    /// if the lock was successfully acquired and `false` otherwise.
+    fn try_lock(&self) -> bool;
+
+    /// Unlocks this mutex.
+    fn unlock(&self);
+}
+
+/// Additional methods for mutexes which support fair unlocking.
+///
+/// Fair unlocking means that a lock is handed directly over to the next waiting
+/// thread if there is one, without giving other threads the opportunity to
+/// "steal" the lock in the meantime. This is typically slower than unfair
+/// unlocking, but may be necessary in certain circumstances.
+pub unsafe trait RawMutexFair: RawMutex {
+    /// Unlocks this mutex using a fair unlock protocol.
+    fn unlock_fair(&self);
+
+    /// Temporarily yields the mutex to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `lock`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    fn bump(&self) {
+        self.unlock_fair();
+        self.lock();
+    }
+}
+
+/// Additional methods for mutexes which support locking with timeouts.
+///
+/// The `Duration` and `Instant` types are specified as associated types so that
+/// this trait is usable even in `no_std` environments.
+pub unsafe trait RawMutexTimed: RawMutex {
+    /// Duration type used for `try_lock_for`.
+    type Duration;
+
+    /// Instant type used for `try_lock_until`.
+    type Instant;
+
+    /// Attempts to acquire this lock until a timeout is reached.
+    fn try_lock_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to acquire this lock until a timeout is reached.
+    fn try_lock_until(&self, timeout: Self::Instant) -> bool;
+}
+
+/// A mutual exclusion primitive useful for protecting shared data
+///
+/// This mutex will block threads waiting for the lock to become available. The
+/// mutex can also be statically initialized or created via a `new`
+/// constructor. Each mutex has a type parameter which represents the data that
+/// it is protecting. The data can only be accessed through the RAII guards
+/// returned from `lock` and `try_lock`, which guarantees that the data is only
+/// ever accessed when the mutex is locked.
+pub struct Mutex<R, T: ?Sized> {
+    raw: R,
+    data: UnsafeCell<T>,
+}
+
+unsafe impl<R: RawMutex + Send, T: ?Sized + Send> Send for Mutex<R, T> {}
+unsafe impl<R: RawMutex + Sync, T: ?Sized + Send> Sync for Mutex<R, T> {}
+
+impl<R: RawMutex, T> Mutex<R, T> {
+    /// Creates a new mutex in an unlocked state ready for use.
+    #[cfg(feature = "nightly")]
+    #[inline]
+    pub const fn new(val: T) -> Mutex<R, T> {
+        Mutex {
+            raw: R::INIT,
+            data: UnsafeCell::new(val),
+        }
+    }
+
+    /// Creates a new mutex in an unlocked state ready for use.
+    #[cfg(not(feature = "nightly"))]
+    #[inline]
+    pub fn new(val: T) -> Mutex<R, T> {
+        Mutex {
+            raw: R::INIT,
+            data: UnsafeCell::new(val),
+        }
+    }
+
+    /// Consumes this mutex, returning the underlying data.
+    #[inline]
+    pub fn into_inner(self) -> T {
+        self.data.into_inner()
+    }
+}
+
+impl<R, T> Mutex<R, T> {
+    /// Creates a new mutex based on a pre-existing raw mutex.
+    ///
+    /// This allows creating a mutex in a constant context on stable Rust.
+    #[inline]
+    pub const fn const_new(raw_mutex: R, val: T) -> Mutex<R, T> {
+        Mutex {
+            raw: raw_mutex,
+            data: UnsafeCell::new(val),
+        }
+    }
+}
+
+impl<R: RawMutex, T: ?Sized> Mutex<R, T> {
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[inline]
+    unsafe fn guard(&self) -> MutexGuard<'_, R, T> {
+        MutexGuard {
+            mutex: self,
+            marker: PhantomData,
+        }
+    }
+
+    /// Acquires a mutex, blocking the current thread until it is able to do so.
+    ///
+    /// This function will block the local thread until it is available to acquire
+    /// the mutex. Upon returning, the thread is the only thread with the mutex
+    /// held. An RAII guard is returned to allow scoped unlock of the lock. When
+    /// the guard goes out of scope, the mutex will be unlocked.
+    ///
+    /// Attempts to lock a mutex in the thread which already holds the lock will
+    /// result in a deadlock.
+    #[inline]
+    pub fn lock(&self) -> MutexGuard<'_, R, T> {
+        self.raw.lock();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.guard() }
+    }
+
+    /// Attempts to acquire this lock.
+    ///
+    /// If the lock could not be acquired at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned. The lock will be unlocked when the
+    /// guard is dropped.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_lock(&self) -> Option<MutexGuard<'_, R, T>> {
+        if self.raw.try_lock() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the `Mutex` mutably, no actual locking needs to
+    /// take place---the mutable borrow statically guarantees no locks exist.
+    #[inline]
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data.get() }
+    }
+
+    /// Forcibly unlocks the mutex.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `MutexGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `MutexGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a mutex is unlocked when not locked.
+    #[inline]
+    pub unsafe fn force_unlock(&self) {
+        self.raw.unlock();
+    }
+
+    /// Returns the underlying raw mutex object.
+    ///
+    /// Note that you will most likely need to import the `RawMutex` trait from
+    /// `lock_api` to be able to call functions on the raw mutex.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because it allows unlocking a mutex while
+    /// still holding a reference to a `MutexGuard`.
+    #[inline]
+    pub unsafe fn raw(&self) -> &R {
+        &self.raw
+    }
+}
+
+impl<R: RawMutexFair, T: ?Sized> Mutex<R, T> {
+    /// Forcibly unlocks the mutex using a fair unlock procotol.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `MutexGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `MutexGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a mutex is unlocked when not locked.
+    #[inline]
+    pub unsafe fn force_unlock_fair(&self) {
+        self.raw.unlock_fair();
+    }
+}
+
+impl<R: RawMutexTimed, T: ?Sized> Mutex<R, T> {
+    /// Attempts to acquire this lock until a timeout is reached.
+    ///
+    /// If the lock could not be acquired before the timeout expired, then
+    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
+    /// be unlocked when the guard is dropped.
+    #[inline]
+    pub fn try_lock_for(&self, timeout: R::Duration) -> Option<MutexGuard<'_, R, T>> {
+        if self.raw.try_lock_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this lock until a timeout is reached.
+    ///
+    /// If the lock could not be acquired before the timeout expired, then
+    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
+    /// be unlocked when the guard is dropped.
+    #[inline]
+    pub fn try_lock_until(&self, timeout: R::Instant) -> Option<MutexGuard<'_, R, T>> {
+        if self.raw.try_lock_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawMutex, T: ?Sized + Default> Default for Mutex<R, T> {
+    #[inline]
+    fn default() -> Mutex<R, T> {
+        Mutex::new(Default::default())
+    }
+}
+
+impl<R: RawMutex, T> From<T> for Mutex<R, T> {
+    #[inline]
+    fn from(t: T) -> Mutex<R, T> {
+        Mutex::new(t)
+    }
+}
+
+impl<R: RawMutex, T: ?Sized + fmt::Debug> fmt::Debug for Mutex<R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.try_lock() {
+            Some(guard) => f.debug_struct("Mutex").field("data", &&*guard).finish(),
+            None => {
+                struct LockedPlaceholder;
+                impl fmt::Debug for LockedPlaceholder {
+                    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                        f.write_str("<locked>")
+                    }
+                }
+
+                f.debug_struct("Mutex")
+                    .field("data", &LockedPlaceholder)
+                    .finish()
+            }
+        }
+    }
+}
+
+// Copied and modified from serde
+#[cfg(feature = "serde")]
+impl<R, T> Serialize for Mutex<R, T>
+where
+    R: RawMutex,
+    T: Serialize + ?Sized,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.lock().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, R, T> Deserialize<'de> for Mutex<R, T>
+where
+    R: RawMutex,
+    T: Deserialize<'de> + ?Sized,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Deserialize::deserialize(deserializer).map(Mutex::new)
+    }
+}
+
+/// An RAII implementation of a "scoped lock" of a mutex. When this structure is
+/// dropped (falls out of scope), the lock will be unlocked.
+///
+/// The data protected by the mutex can be accessed through this guard via its
+/// `Deref` and `DerefMut` implementations.
+#[must_use = "if unused the Mutex will immediately unlock"]
+pub struct MutexGuard<'a, R: RawMutex, T: ?Sized> {
+    mutex: &'a Mutex<R, T>,
+    marker: PhantomData<(&'a mut T, R::GuardMarker)>,
+}
+
+unsafe impl<'a, R: RawMutex + Sync + 'a, T: ?Sized + Sync + 'a> Sync for MutexGuard<'a, R, T> {}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
+    /// Returns a reference to the original `Mutex` object.
+    pub fn mutex(s: &Self) -> &'a Mutex<R, T> {
+        s.mutex
+    }
+
+    /// Makes a new `MappedMutexGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `MutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedMutexGuard<'a, R, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let raw = &s.mutex.raw;
+        let data = f(unsafe { &mut *s.mutex.data.get() });
+        mem::forget(s);
+        MappedMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make a new `MappedMutexGuard` for a component of the
+    /// locked data. The original guard is returned if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `MutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MutexGuard::try_map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedMutexGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let raw = &s.mutex.raw;
+        let data = match f(unsafe { &mut *s.mutex.data.get() }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.mutex.raw.unlock();
+        defer!(s.mutex.raw.lock());
+        f()
+    }
+}
+
+impl<'a, R: RawMutexFair + 'a, T: ?Sized + 'a> MutexGuard<'a, R, T> {
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// By default, mutexes are unfair and allow the current thread to re-lock
+    /// the mutex before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the mutex for a long time. This is the
+    /// default because it allows much higher throughput as it avoids forcing a
+    /// context switch on every mutex unlock. This can result in one thread
+    /// acquiring a mutex many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `MutexGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.mutex.raw.unlock_fair();
+        mem::forget(s);
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// The mutex is unlocked using a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.mutex.raw.unlock_fair();
+        defer!(s.mutex.raw.lock());
+        f()
+    }
+
+    /// Temporarily yields the mutex to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `lock`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        s.mutex.raw.bump();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Deref for MutexGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.mutex.data.get() }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> DerefMut for MutexGuard<'a, R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.mutex.data.get() }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Drop for MutexGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.mutex.raw.unlock();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug for MutexGuard<'a, R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display for MutexGuard<'a, R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> StableAddress for MutexGuard<'a, R, T> {}
+
+/// An RAII mutex guard returned by `MutexGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedMutexGuard` and `MutexGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+#[must_use = "if unused the Mutex will immediately unlock"]
+pub struct MappedMutexGuard<'a, R: RawMutex, T: ?Sized> {
+    raw: &'a R,
+    data: *mut T,
+    marker: PhantomData<&'a mut T>,
+}
+
+unsafe impl<'a, R: RawMutex + Sync + 'a, T: ?Sized + Sync + 'a> Sync
+    for MappedMutexGuard<'a, R, T>
+{
+}
+unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Send for MappedMutexGuard<'a, R, T> where
+    R::GuardMarker: Send
+{
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> MappedMutexGuard<'a, R, T> {
+    /// Makes a new `MappedMutexGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `MappedMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedMutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedMutexGuard<'a, R, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let raw = s.raw;
+        let data = f(unsafe { &mut *s.data });
+        mem::forget(s);
+        MappedMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make a new `MappedMutexGuard` for a component of the
+    /// locked data. The original guard is returned if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `MappedMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedMutexGuard::try_map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedMutexGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let raw = s.raw;
+        let data = match f(unsafe { &mut *s.data }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+}
+
+impl<'a, R: RawMutexFair + 'a, T: ?Sized + 'a> MappedMutexGuard<'a, R, T> {
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// By default, mutexes are unfair and allow the current thread to re-lock
+    /// the mutex before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the mutex for a long time. This is the
+    /// default because it allows much higher throughput as it avoids forcing a
+    /// context switch on every mutex unlock. This can result in one thread
+    /// acquiring a mutex many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `MutexGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.raw.unlock_fair();
+        mem::forget(s);
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Deref for MappedMutexGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> DerefMut for MappedMutexGuard<'a, R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> Drop for MappedMutexGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.raw.unlock();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug for MappedMutexGuard<'a, R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawMutex + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for MappedMutexGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawMutex + 'a, T: ?Sized + 'a> StableAddress for MappedMutexGuard<'a, R, T> {}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/remutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/remutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/remutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/remutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,740 @@
+// Copyright 2018 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::{
+    mutex::{RawMutex, RawMutexFair, RawMutexTimed},
+    GuardNoSend,
+};
+use core::{
+    cell::{Cell, UnsafeCell},
+    fmt,
+    marker::PhantomData,
+    mem,
+    num::NonZeroUsize,
+    ops::Deref,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+
+#[cfg(feature = "owning_ref")]
+use owning_ref::StableAddress;
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+/// Helper trait which returns a non-zero thread ID.
+///
+/// The simplest way to implement this trait is to return the address of a
+/// thread-local variable.
+///
+/// # Safety
+///
+/// Implementations of this trait must ensure that no two active threads share
+/// the same thread ID. However the ID of a thread that has exited can be
+/// re-used since that thread is no longer active.
+pub unsafe trait GetThreadId {
+    /// Initial value.
+    // A “non-constant� const item is a legacy way to supply an initialized value to downstream
+    // static items. Can hopefully be replaced with `const fn new() -> Self` at some point.
+    #[allow(clippy::declare_interior_mutable_const)]
+    const INIT: Self;
+
+    /// Returns a non-zero thread ID which identifies the current thread of
+    /// execution.
+    fn nonzero_thread_id(&self) -> NonZeroUsize;
+}
+
+struct RawReentrantMutex<R, G> {
+    owner: AtomicUsize,
+    lock_count: Cell<usize>,
+    mutex: R,
+    get_thread_id: G,
+}
+
+impl<R: RawMutex, G: GetThreadId> RawReentrantMutex<R, G> {
+    #[inline]
+    fn lock_internal<F: FnOnce() -> bool>(&self, try_lock: F) -> bool {
+        let id = self.get_thread_id.nonzero_thread_id().get();
+        if self.owner.load(Ordering::Relaxed) == id {
+            self.lock_count.set(
+                self.lock_count
+                    .get()
+                    .checked_add(1)
+                    .expect("ReentrantMutex lock count overflow"),
+            );
+        } else {
+            if !try_lock() {
+                return false;
+            }
+            self.owner.store(id, Ordering::Relaxed);
+            debug_assert_eq!(self.lock_count.get(), 0);
+            self.lock_count.set(1);
+        }
+        true
+    }
+
+    #[inline]
+    fn lock(&self) {
+        self.lock_internal(|| {
+            self.mutex.lock();
+            true
+        });
+    }
+
+    #[inline]
+    fn try_lock(&self) -> bool {
+        self.lock_internal(|| self.mutex.try_lock())
+    }
+
+    #[inline]
+    fn unlock(&self) {
+        let lock_count = self.lock_count.get() - 1;
+        self.lock_count.set(lock_count);
+        if lock_count == 0 {
+            self.owner.store(0, Ordering::Relaxed);
+            self.mutex.unlock();
+        }
+    }
+}
+
+impl<R: RawMutexFair, G: GetThreadId> RawReentrantMutex<R, G> {
+    #[inline]
+    fn unlock_fair(&self) {
+        let lock_count = self.lock_count.get() - 1;
+        self.lock_count.set(lock_count);
+        if lock_count == 0 {
+            self.owner.store(0, Ordering::Relaxed);
+            self.mutex.unlock_fair();
+        }
+    }
+
+    #[inline]
+    fn bump(&self) {
+        if self.lock_count.get() == 1 {
+            let id = self.owner.load(Ordering::Relaxed);
+            self.owner.store(0, Ordering::Relaxed);
+            self.mutex.bump();
+            self.owner.store(id, Ordering::Relaxed);
+        }
+    }
+}
+
+impl<R: RawMutexTimed, G: GetThreadId> RawReentrantMutex<R, G> {
+    #[inline]
+    fn try_lock_until(&self, timeout: R::Instant) -> bool {
+        self.lock_internal(|| self.mutex.try_lock_until(timeout))
+    }
+
+    #[inline]
+    fn try_lock_for(&self, timeout: R::Duration) -> bool {
+        self.lock_internal(|| self.mutex.try_lock_for(timeout))
+    }
+}
+
+/// A mutex which can be recursively locked by a single thread.
+///
+/// This type is identical to `Mutex` except for the following points:
+///
+/// - Locking multiple times from the same thread will work correctly instead of
+///   deadlocking.
+/// - `ReentrantMutexGuard` does not give mutable references to the locked data.
+///   Use a `RefCell` if you need this.
+///
+/// See [`Mutex`](struct.Mutex.html) for more details about the underlying mutex
+/// primitive.
+pub struct ReentrantMutex<R, G, T: ?Sized> {
+    raw: RawReentrantMutex<R, G>,
+    data: UnsafeCell<T>,
+}
+
+unsafe impl<R: RawMutex + Send, G: GetThreadId + Send, T: ?Sized + Send> Send
+    for ReentrantMutex<R, G, T>
+{
+}
+unsafe impl<R: RawMutex + Sync, G: GetThreadId + Sync, T: ?Sized + Send> Sync
+    for ReentrantMutex<R, G, T>
+{
+}
+
+impl<R: RawMutex, G: GetThreadId, T> ReentrantMutex<R, G, T> {
+    /// Creates a new reentrant mutex in an unlocked state ready for use.
+    #[cfg(feature = "nightly")]
+    #[inline]
+    pub const fn new(val: T) -> ReentrantMutex<R, G, T> {
+        ReentrantMutex {
+            data: UnsafeCell::new(val),
+            raw: RawReentrantMutex {
+                owner: AtomicUsize::new(0),
+                lock_count: Cell::new(0),
+                mutex: R::INIT,
+                get_thread_id: G::INIT,
+            },
+        }
+    }
+
+    /// Creates a new reentrant mutex in an unlocked state ready for use.
+    #[cfg(not(feature = "nightly"))]
+    #[inline]
+    pub fn new(val: T) -> ReentrantMutex<R, G, T> {
+        ReentrantMutex {
+            data: UnsafeCell::new(val),
+            raw: RawReentrantMutex {
+                owner: AtomicUsize::new(0),
+                lock_count: Cell::new(0),
+                mutex: R::INIT,
+                get_thread_id: G::INIT,
+            },
+        }
+    }
+
+    /// Consumes this mutex, returning the underlying data.
+    #[inline]
+    pub fn into_inner(self) -> T {
+        self.data.into_inner()
+    }
+}
+
+impl<R, G, T> ReentrantMutex<R, G, T> {
+    /// Creates a new reentrant mutex based on a pre-existing raw mutex and a
+    /// helper to get the thread ID.
+    ///
+    /// This allows creating a reentrant mutex in a constant context on stable
+    /// Rust.
+    #[inline]
+    pub const fn const_new(raw_mutex: R, get_thread_id: G, val: T) -> ReentrantMutex<R, G, T> {
+        ReentrantMutex {
+            data: UnsafeCell::new(val),
+            raw: RawReentrantMutex {
+                owner: AtomicUsize::new(0),
+                lock_count: Cell::new(0),
+                mutex: raw_mutex,
+                get_thread_id,
+            },
+        }
+    }
+}
+
+impl<R: RawMutex, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[inline]
+    unsafe fn guard(&self) -> ReentrantMutexGuard<'_, R, G, T> {
+        ReentrantMutexGuard {
+            remutex: &self,
+            marker: PhantomData,
+        }
+    }
+
+    /// Acquires a reentrant mutex, blocking the current thread until it is able
+    /// to do so.
+    ///
+    /// If the mutex is held by another thread then this function will block the
+    /// local thread until it is available to acquire the mutex. If the mutex is
+    /// already held by the current thread then this function will increment the
+    /// lock reference count and return immediately. Upon returning,
+    /// the thread is the only thread with the mutex held. An RAII guard is
+    /// returned to allow scoped unlock of the lock. When the guard goes out of
+    /// scope, the mutex will be unlocked.
+    #[inline]
+    pub fn lock(&self) -> ReentrantMutexGuard<'_, R, G, T> {
+        self.raw.lock();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.guard() }
+    }
+
+    /// Attempts to acquire this lock.
+    ///
+    /// If the lock could not be acquired at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned. The lock will be unlocked when the
+    /// guard is dropped.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_lock(&self) -> Option<ReentrantMutexGuard<'_, R, G, T>> {
+        if self.raw.try_lock() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the `ReentrantMutex` mutably, no actual locking needs to
+    /// take place---the mutable borrow statically guarantees no locks exist.
+    #[inline]
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data.get() }
+    }
+
+    /// Forcibly unlocks the mutex.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `ReentrantMutexGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `ReentrantMutexGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a mutex is unlocked when not locked.
+    #[inline]
+    pub unsafe fn force_unlock(&self) {
+        self.raw.unlock();
+    }
+
+    /// Returns the underlying raw mutex object.
+    ///
+    /// Note that you will most likely need to import the `RawMutex` trait from
+    /// `lock_api` to be able to call functions on the raw mutex.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because it allows unlocking a mutex while
+    /// still holding a reference to a `ReentrantMutexGuard`.
+    #[inline]
+    pub unsafe fn raw(&self) -> &R {
+        &self.raw.mutex
+    }
+}
+
+impl<R: RawMutexFair, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
+    /// Forcibly unlocks the mutex using a fair unlock protocol.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `ReentrantMutexGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `ReentrantMutexGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a mutex is unlocked when not locked.
+    #[inline]
+    pub unsafe fn force_unlock_fair(&self) {
+        self.raw.unlock_fair();
+    }
+}
+
+impl<R: RawMutexTimed, G: GetThreadId, T: ?Sized> ReentrantMutex<R, G, T> {
+    /// Attempts to acquire this lock until a timeout is reached.
+    ///
+    /// If the lock could not be acquired before the timeout expired, then
+    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
+    /// be unlocked when the guard is dropped.
+    #[inline]
+    pub fn try_lock_for(&self, timeout: R::Duration) -> Option<ReentrantMutexGuard<'_, R, G, T>> {
+        if self.raw.try_lock_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this lock until a timeout is reached.
+    ///
+    /// If the lock could not be acquired before the timeout expired, then
+    /// `None` is returned. Otherwise, an RAII guard is returned. The lock will
+    /// be unlocked when the guard is dropped.
+    #[inline]
+    pub fn try_lock_until(&self, timeout: R::Instant) -> Option<ReentrantMutexGuard<'_, R, G, T>> {
+        if self.raw.try_lock_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawMutex, G: GetThreadId, T: ?Sized + Default> Default for ReentrantMutex<R, G, T> {
+    #[inline]
+    fn default() -> ReentrantMutex<R, G, T> {
+        ReentrantMutex::new(Default::default())
+    }
+}
+
+impl<R: RawMutex, G: GetThreadId, T> From<T> for ReentrantMutex<R, G, T> {
+    #[inline]
+    fn from(t: T) -> ReentrantMutex<R, G, T> {
+        ReentrantMutex::new(t)
+    }
+}
+
+impl<R: RawMutex, G: GetThreadId, T: ?Sized + fmt::Debug> fmt::Debug for ReentrantMutex<R, G, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.try_lock() {
+            Some(guard) => f
+                .debug_struct("ReentrantMutex")
+                .field("data", &&*guard)
+                .finish(),
+            None => {
+                struct LockedPlaceholder;
+                impl fmt::Debug for LockedPlaceholder {
+                    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                        f.write_str("<locked>")
+                    }
+                }
+
+                f.debug_struct("ReentrantMutex")
+                    .field("data", &LockedPlaceholder)
+                    .finish()
+            }
+        }
+    }
+}
+
+// Copied and modified from serde
+#[cfg(feature = "serde")]
+impl<R, G, T> Serialize for ReentrantMutex<R, G, T>
+where
+    R: RawMutex,
+    G: GetThreadId,
+    T: Serialize + ?Sized,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.lock().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, R, G, T> Deserialize<'de> for ReentrantMutex<R, G, T>
+where
+    R: RawMutex,
+    G: GetThreadId,
+    T: Deserialize<'de> + ?Sized,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Deserialize::deserialize(deserializer).map(ReentrantMutex::new)
+    }
+}
+
+/// An RAII implementation of a "scoped lock" of a reentrant mutex. When this structure
+/// is dropped (falls out of scope), the lock will be unlocked.
+///
+/// The data protected by the mutex can be accessed through this guard via its
+/// `Deref` implementation.
+#[must_use = "if unused the ReentrantMutex will immediately unlock"]
+pub struct ReentrantMutexGuard<'a, R: RawMutex, G: GetThreadId, T: ?Sized> {
+    remutex: &'a ReentrantMutex<R, G, T>,
+    marker: PhantomData<(&'a T, GuardNoSend)>,
+}
+
+unsafe impl<'a, R: RawMutex + Sync + 'a, G: GetThreadId + Sync + 'a, T: ?Sized + Sync + 'a> Sync
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> ReentrantMutexGuard<'a, R, G, T> {
+    /// Returns a reference to the original `ReentrantMutex` object.
+    pub fn remutex(s: &Self) -> &'a ReentrantMutex<R, G, T> {
+        s.remutex
+    }
+
+    /// Makes a new `MappedReentrantMutexGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `ReentrantMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `ReentrantMutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedReentrantMutexGuard<'a, R, G, U>
+    where
+        F: FnOnce(&T) -> &U,
+    {
+        let raw = &s.remutex.raw;
+        let data = f(unsafe { &*s.remutex.data.get() });
+        mem::forget(s);
+        MappedReentrantMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedReentrantMutexGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `ReentrantMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `ReentrantMutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(
+        s: Self,
+        f: F,
+    ) -> Result<MappedReentrantMutexGuard<'a, R, G, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let raw = &s.remutex.raw;
+        let data = match f(unsafe { &mut *s.remutex.data.get() }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedReentrantMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.remutex.raw.unlock();
+        defer!(s.remutex.raw.lock());
+        f()
+    }
+}
+
+impl<'a, R: RawMutexFair + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
+    ReentrantMutexGuard<'a, R, G, T>
+{
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// By default, mutexes are unfair and allow the current thread to re-lock
+    /// the mutex before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the mutex for a long time. This is the
+    /// default because it allows much higher throughput as it avoids forcing a
+    /// context switch on every mutex unlock. This can result in one thread
+    /// acquiring a mutex many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `ReentrantMutexGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.remutex.raw.unlock_fair();
+        mem::forget(s);
+    }
+
+    /// Temporarily unlocks the mutex to execute the given function.
+    ///
+    /// The mutex is unlocked a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the mutex.
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.remutex.raw.unlock_fair();
+        defer!(s.remutex.raw.lock());
+        f()
+    }
+
+    /// Temporarily yields the mutex to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `lock`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        s.remutex.raw.bump();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Deref
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.remutex.data.get() }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Drop
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+    #[inline]
+    fn drop(&mut self) {
+        self.remutex.raw.unlock();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> StableAddress
+    for ReentrantMutexGuard<'a, R, G, T>
+{
+}
+
+/// An RAII mutex guard returned by `ReentrantMutexGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedReentrantMutexGuard` and `ReentrantMutexGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+#[must_use = "if unused the ReentrantMutex will immediately unlock"]
+pub struct MappedReentrantMutexGuard<'a, R: RawMutex, G: GetThreadId, T: ?Sized> {
+    raw: &'a RawReentrantMutex<R, G>,
+    data: *const T,
+    marker: PhantomData<&'a T>,
+}
+
+unsafe impl<'a, R: RawMutex + Sync + 'a, G: GetThreadId + Sync + 'a, T: ?Sized + Sync + 'a> Sync
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
+    MappedReentrantMutexGuard<'a, R, G, T>
+{
+    /// Makes a new `MappedReentrantMutexGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `MappedReentrantMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedReentrantMutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedReentrantMutexGuard<'a, R, G, U>
+    where
+        F: FnOnce(&T) -> &U,
+    {
+        let raw = s.raw;
+        let data = f(unsafe { &*s.data });
+        mem::forget(s);
+        MappedReentrantMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedReentrantMutexGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `MappedReentrantMutexGuard` passed
+    /// in already locked the mutex.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedReentrantMutexGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(
+        s: Self,
+        f: F,
+    ) -> Result<MappedReentrantMutexGuard<'a, R, G, U>, Self>
+    where
+        F: FnOnce(&T) -> Option<&U>,
+    {
+        let raw = s.raw;
+        let data = match f(unsafe { &*s.data }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedReentrantMutexGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+}
+
+impl<'a, R: RawMutexFair + 'a, G: GetThreadId + 'a, T: ?Sized + 'a>
+    MappedReentrantMutexGuard<'a, R, G, T>
+{
+    /// Unlocks the mutex using a fair unlock protocol.
+    ///
+    /// By default, mutexes are unfair and allow the current thread to re-lock
+    /// the mutex before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the mutex for a long time. This is the
+    /// default because it allows much higher throughput as it avoids forcing a
+    /// context switch on every mutex unlock. This can result in one thread
+    /// acquiring a mutex many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `ReentrantMutexGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.raw.unlock_fair();
+        mem::forget(s);
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Deref
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> Drop
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+    #[inline]
+    fn drop(&mut self) {
+        self.raw.unlock();
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawMutex + 'a, G: GetThreadId + 'a, T: ?Sized + 'a> StableAddress
+    for MappedReentrantMutexGuard<'a, R, G, T>
+{
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/rwlock.rs firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/rwlock.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/lock_api/src/rwlock.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/lock_api/src/rwlock.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,1632 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::cell::UnsafeCell;
+use core::fmt;
+use core::marker::PhantomData;
+use core::mem;
+use core::ops::{Deref, DerefMut};
+
+#[cfg(feature = "owning_ref")]
+use owning_ref::StableAddress;
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+/// Basic operations for a reader-writer lock.
+///
+/// Types implementing this trait can be used by `RwLock` to form a safe and
+/// fully-functioning `RwLock` type.
+///
+/// # Safety
+///
+/// Implementations of this trait must ensure that the `RwLock` is actually
+/// exclusive: an exclusive lock can't be acquired while an exclusive or shared
+/// lock exists, and a shared lock can't be acquire while an exclusive lock
+/// exists.
+pub unsafe trait RawRwLock {
+    /// Initial value for an unlocked `RwLock`.
+    // A “non-constant� const item is a legacy way to supply an initialized value to downstream
+    // static items. Can hopefully be replaced with `const fn new() -> Self` at some point.
+    #[allow(clippy::declare_interior_mutable_const)]
+    const INIT: Self;
+
+    /// Marker type which determines whether a lock guard should be `Send`. Use
+    /// one of the `GuardSend` or `GuardNoSend` helper types here.
+    type GuardMarker;
+
+    /// Acquires a shared lock, blocking the current thread until it is able to do so.
+    fn lock_shared(&self);
+
+    /// Attempts to acquire a shared lock without blocking.
+    fn try_lock_shared(&self) -> bool;
+
+    /// Releases a shared lock.
+    fn unlock_shared(&self);
+
+    /// Acquires an exclusive lock, blocking the current thread until it is able to do so.
+    fn lock_exclusive(&self);
+
+    /// Attempts to acquire an exclusive lock without blocking.
+    fn try_lock_exclusive(&self) -> bool;
+
+    /// Releases an exclusive lock.
+    fn unlock_exclusive(&self);
+}
+
+/// Additional methods for RwLocks which support fair unlocking.
+///
+/// Fair unlocking means that a lock is handed directly over to the next waiting
+/// thread if there is one, without giving other threads the opportunity to
+/// "steal" the lock in the meantime. This is typically slower than unfair
+/// unlocking, but may be necessary in certain circumstances.
+pub unsafe trait RawRwLockFair: RawRwLock {
+    /// Releases a shared lock using a fair unlock protocol.
+    fn unlock_shared_fair(&self);
+
+    /// Releases an exclusive lock using a fair unlock protocol.
+    fn unlock_exclusive_fair(&self);
+
+    /// Temporarily yields a shared lock to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_shared_fair` followed
+    /// by `lock_shared`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    fn bump_shared(&self) {
+        self.unlock_shared_fair();
+        self.lock_shared();
+    }
+
+    /// Temporarily yields an exclusive lock to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_exclusive_fair` followed
+    /// by `lock_exclusive`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    fn bump_exclusive(&self) {
+        self.unlock_exclusive_fair();
+        self.lock_exclusive();
+    }
+}
+
+/// Additional methods for RwLocks which support atomically downgrading an
+/// exclusive lock to a shared lock.
+pub unsafe trait RawRwLockDowngrade: RawRwLock {
+    /// Atomically downgrades an exclusive lock into a shared lock without
+    /// allowing any thread to take an exclusive lock in the meantime.
+    fn downgrade(&self);
+}
+
+/// Additional methods for RwLocks which support locking with timeouts.
+///
+/// The `Duration` and `Instant` types are specified as associated types so that
+/// this trait is usable even in `no_std` environments.
+pub unsafe trait RawRwLockTimed: RawRwLock {
+    /// Duration type used for `try_lock_for`.
+    type Duration;
+
+    /// Instant type used for `try_lock_until`.
+    type Instant;
+
+    /// Attempts to acquire a shared lock until a timeout is reached.
+    fn try_lock_shared_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to acquire a shared lock until a timeout is reached.
+    fn try_lock_shared_until(&self, timeout: Self::Instant) -> bool;
+
+    /// Attempts to acquire an exclusive lock until a timeout is reached.
+    fn try_lock_exclusive_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to acquire an exclusive lock until a timeout is reached.
+    fn try_lock_exclusive_until(&self, timeout: Self::Instant) -> bool;
+}
+
+/// Additional methods for RwLocks which support recursive read locks.
+///
+/// These are guaranteed to succeed without blocking if
+/// another read lock is held at the time of the call. This allows a thread
+/// to recursively lock a `RwLock`. However using this method can cause
+/// writers to starve since readers no longer block if a writer is waiting
+/// for the lock.
+pub unsafe trait RawRwLockRecursive: RawRwLock {
+    /// Acquires a shared lock without deadlocking in case of a recursive lock.
+    fn lock_shared_recursive(&self);
+
+    /// Attempts to acquire a shared lock without deadlocking in case of a recursive lock.
+    fn try_lock_shared_recursive(&self) -> bool;
+}
+
+/// Additional methods for RwLocks which support recursive read locks and timeouts.
+pub unsafe trait RawRwLockRecursiveTimed: RawRwLockRecursive + RawRwLockTimed {
+    /// Attempts to acquire a shared lock until a timeout is reached, without
+    /// deadlocking in case of a recursive lock.
+    fn try_lock_shared_recursive_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to acquire a shared lock until a timeout is reached, without
+    /// deadlocking in case of a recursive lock.
+    fn try_lock_shared_recursive_until(&self, timeout: Self::Instant) -> bool;
+}
+
+/// Additional methods for RwLocks which support atomically upgrading a shared
+/// lock to an exclusive lock.
+///
+/// This requires acquiring a special "upgradable read lock" instead of a
+/// normal shared lock. There may only be one upgradable lock at any time,
+/// otherwise deadlocks could occur when upgrading.
+pub unsafe trait RawRwLockUpgrade: RawRwLock {
+    /// Acquires an upgradable lock, blocking the current thread until it is able to do so.
+    fn lock_upgradable(&self);
+
+    /// Attempts to acquire an upgradable lock without blocking.
+    fn try_lock_upgradable(&self) -> bool;
+
+    /// Releases an upgradable lock.
+    fn unlock_upgradable(&self);
+
+    /// Upgrades an upgradable lock to an exclusive lock.
+    fn upgrade(&self);
+
+    /// Attempts to upgrade an upgradable lock to an exclusive lock without
+    /// blocking.
+    fn try_upgrade(&self) -> bool;
+}
+
+/// Additional methods for RwLocks which support upgradable locks and fair
+/// unlocking.
+pub unsafe trait RawRwLockUpgradeFair: RawRwLockUpgrade + RawRwLockFair {
+    /// Releases an upgradable lock using a fair unlock protocol.
+    fn unlock_upgradable_fair(&self);
+
+    /// Temporarily yields an upgradable lock to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_upgradable_fair` followed
+    /// by `lock_upgradable`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    fn bump_upgradable(&self) {
+        self.unlock_upgradable_fair();
+        self.lock_upgradable();
+    }
+}
+
+/// Additional methods for RwLocks which support upgradable locks and lock
+/// downgrading.
+pub unsafe trait RawRwLockUpgradeDowngrade: RawRwLockUpgrade + RawRwLockDowngrade {
+    /// Downgrades an upgradable lock to a shared lock.
+    fn downgrade_upgradable(&self);
+
+    /// Downgrades an exclusive lock to an upgradable lock.
+    fn downgrade_to_upgradable(&self);
+}
+
+/// Additional methods for RwLocks which support upgradable locks and locking
+/// with timeouts.
+pub unsafe trait RawRwLockUpgradeTimed: RawRwLockUpgrade + RawRwLockTimed {
+    /// Attempts to acquire an upgradable lock until a timeout is reached.
+    fn try_lock_upgradable_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to acquire an upgradable lock until a timeout is reached.
+    fn try_lock_upgradable_until(&self, timeout: Self::Instant) -> bool;
+
+    /// Attempts to upgrade an upgradable lock to an exclusive lock until a
+    /// timeout is reached.
+    fn try_upgrade_for(&self, timeout: Self::Duration) -> bool;
+
+    /// Attempts to upgrade an upgradable lock to an exclusive lock until a
+    /// timeout is reached.
+    fn try_upgrade_until(&self, timeout: Self::Instant) -> bool;
+}
+
+/// A reader-writer lock
+///
+/// This type of lock allows a number of readers or at most one writer at any
+/// point in time. The write portion of this lock typically allows modification
+/// of the underlying data (exclusive access) and the read portion of this lock
+/// typically allows for read-only access (shared access).
+///
+/// The type parameter `T` represents the data that this lock protects. It is
+/// required that `T` satisfies `Send` to be shared across threads and `Sync` to
+/// allow concurrent access through readers. The RAII guards returned from the
+/// locking methods implement `Deref` (and `DerefMut` for the `write` methods)
+/// to allow access to the contained of the lock.
+pub struct RwLock<R, T: ?Sized> {
+    raw: R,
+    data: UnsafeCell<T>,
+}
+
+// Copied and modified from serde
+#[cfg(feature = "serde")]
+impl<R, T> Serialize for RwLock<R, T>
+where
+    R: RawRwLock,
+    T: Serialize + ?Sized,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.read().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, R, T> Deserialize<'de> for RwLock<R, T>
+where
+    R: RawRwLock,
+    T: Deserialize<'de> + ?Sized,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Deserialize::deserialize(deserializer).map(RwLock::new)
+    }
+}
+
+unsafe impl<R: RawRwLock + Send, T: ?Sized + Send> Send for RwLock<R, T> {}
+unsafe impl<R: RawRwLock + Sync, T: ?Sized + Send + Sync> Sync for RwLock<R, T> {}
+
+impl<R: RawRwLock, T> RwLock<R, T> {
+    /// Creates a new instance of an `RwLock<T>` which is unlocked.
+    #[cfg(feature = "nightly")]
+    #[inline]
+    pub const fn new(val: T) -> RwLock<R, T> {
+        RwLock {
+            data: UnsafeCell::new(val),
+            raw: R::INIT,
+        }
+    }
+
+    /// Creates a new instance of an `RwLock<T>` which is unlocked.
+    #[cfg(not(feature = "nightly"))]
+    #[inline]
+    pub fn new(val: T) -> RwLock<R, T> {
+        RwLock {
+            data: UnsafeCell::new(val),
+            raw: R::INIT,
+        }
+    }
+
+    /// Consumes this `RwLock`, returning the underlying data.
+    #[inline]
+    #[allow(unused_unsafe)]
+    pub fn into_inner(self) -> T {
+        unsafe { self.data.into_inner() }
+    }
+}
+
+impl<R, T> RwLock<R, T> {
+    /// Creates a new new instance of an `RwLock<T>` based on a pre-existing
+    /// `RawRwLock<T>`.
+    ///
+    /// This allows creating a `RwLock<T>` in a constant context on stable
+    /// Rust.
+    #[inline]
+    pub const fn const_new(raw_rwlock: R, val: T) -> RwLock<R, T> {
+        RwLock {
+            data: UnsafeCell::new(val),
+            raw: raw_rwlock,
+        }
+    }
+}
+
+impl<R: RawRwLock, T: ?Sized> RwLock<R, T> {
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[inline]
+    unsafe fn read_guard(&self) -> RwLockReadGuard<'_, R, T> {
+        RwLockReadGuard {
+            rwlock: self,
+            marker: PhantomData,
+        }
+    }
+
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[inline]
+    unsafe fn write_guard(&self) -> RwLockWriteGuard<'_, R, T> {
+        RwLockWriteGuard {
+            rwlock: self,
+            marker: PhantomData,
+        }
+    }
+
+    /// Locks this `RwLock` with shared read access, blocking the current thread
+    /// until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which
+    /// hold the lock. There may be other readers currently inside the lock when
+    /// this method returns.
+    ///
+    /// Note that attempts to recursively acquire a read lock on a `RwLock` when
+    /// the current thread already holds one may result in a deadlock.
+    ///
+    /// Returns an RAII guard which will release this thread's shared access
+    /// once it is dropped.
+    #[inline]
+    pub fn read(&self) -> RwLockReadGuard<'_, R, T> {
+        self.raw.lock_shared();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.read_guard() }
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access.
+    ///
+    /// If the access could not be granted at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned which will release the shared access
+    /// when it is dropped.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_read(&self) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Locks this `RwLock` with exclusive write access, blocking the current
+    /// thread until it can be acquired.
+    ///
+    /// This function will not return while other writers or other readers
+    /// currently have access to the lock.
+    ///
+    /// Returns an RAII guard which will drop the write access of this `RwLock`
+    /// when dropped.
+    #[inline]
+    pub fn write(&self) -> RwLockWriteGuard<'_, R, T> {
+        self.raw.lock_exclusive();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.write_guard() }
+    }
+
+    /// Attempts to lock this `RwLock` with exclusive write access.
+    ///
+    /// If the lock could not be acquired at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned which will release the lock when
+    /// it is dropped.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_write(&self) -> Option<RwLockWriteGuard<'_, R, T>> {
+        if self.raw.try_lock_exclusive() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.write_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the `RwLock` mutably, no actual locking needs to
+    /// take place---the mutable borrow statically guarantees no locks exist.
+    #[inline]
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data.get() }
+    }
+
+    /// Forcibly unlocks a read lock.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `RwLockReadGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `RwLockReadGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a rwlock is read-unlocked when not read-locked.
+    #[inline]
+    pub unsafe fn force_unlock_read(&self) {
+        self.raw.unlock_shared();
+    }
+
+    /// Forcibly unlocks a write lock.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `RwLockWriteGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `RwLockWriteGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a rwlock is write-unlocked when not write-locked.
+    #[inline]
+    pub unsafe fn force_unlock_write(&self) {
+        self.raw.unlock_exclusive();
+    }
+
+    /// Returns the underlying raw reader-writer lock object.
+    ///
+    /// Note that you will most likely need to import the `RawRwLock` trait from
+    /// `lock_api` to be able to call functions on the raw
+    /// reader-writer lock.
+    ///
+    /// # Safety
+    ///
+    /// This method is unsafe because it allows unlocking a mutex while
+    /// still holding a reference to a lock guard.
+    pub unsafe fn raw(&self) -> &R {
+        &self.raw
+    }
+}
+
+impl<R: RawRwLockFair, T: ?Sized> RwLock<R, T> {
+    /// Forcibly unlocks a read lock using a fair unlock procotol.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `RwLockReadGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `RwLockReadGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a rwlock is read-unlocked when not read-locked.
+    #[inline]
+    pub unsafe fn force_unlock_read_fair(&self) {
+        self.raw.unlock_shared_fair();
+    }
+
+    /// Forcibly unlocks a write lock using a fair unlock procotol.
+    ///
+    /// This is useful when combined with `mem::forget` to hold a lock without
+    /// the need to maintain a `RwLockWriteGuard` object alive, for example when
+    /// dealing with FFI.
+    ///
+    /// # Safety
+    ///
+    /// This method must only be called if the current thread logically owns a
+    /// `RwLockWriteGuard` but that guard has be discarded using `mem::forget`.
+    /// Behavior is undefined if a rwlock is write-unlocked when not write-locked.
+    #[inline]
+    pub unsafe fn force_unlock_write_fair(&self) {
+        self.raw.unlock_exclusive_fair();
+    }
+}
+
+impl<R: RawRwLockTimed, T: ?Sized> RwLock<R, T> {
+    /// Attempts to acquire this `RwLock` with shared read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    #[inline]
+    pub fn try_read_for(&self, timeout: R::Duration) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    #[inline]
+    pub fn try_read_until(&self, timeout: R::Instant) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with exclusive write access until a
+    /// timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the exclusive access when it is dropped.
+    #[inline]
+    pub fn try_write_for(&self, timeout: R::Duration) -> Option<RwLockWriteGuard<'_, R, T>> {
+        if self.raw.try_lock_exclusive_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.write_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with exclusive write access until a
+    /// timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the exclusive access when it is dropped.
+    #[inline]
+    pub fn try_write_until(&self, timeout: R::Instant) -> Option<RwLockWriteGuard<'_, R, T>> {
+        if self.raw.try_lock_exclusive_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.write_guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawRwLockRecursive, T: ?Sized> RwLock<R, T> {
+    /// Locks this `RwLock` with shared read access, blocking the current thread
+    /// until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which
+    /// hold the lock. There may be other readers currently inside the lock when
+    /// this method returns.
+    ///
+    /// Unlike `read`, this method is guaranteed to succeed without blocking if
+    /// another read lock is held at the time of the call. This allows a thread
+    /// to recursively lock a `RwLock`. However using this method can cause
+    /// writers to starve since readers no longer block if a writer is waiting
+    /// for the lock.
+    ///
+    /// Returns an RAII guard which will release this thread's shared access
+    /// once it is dropped.
+    #[inline]
+    pub fn read_recursive(&self) -> RwLockReadGuard<'_, R, T> {
+        self.raw.lock_shared_recursive();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.read_guard() }
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access.
+    ///
+    /// If the access could not be granted at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned which will release the shared access
+    /// when it is dropped.
+    ///
+    /// This method is guaranteed to succeed if another read lock is held at the
+    /// time of the call. See the documentation for `read_recursive` for details.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_read_recursive(&self) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared_recursive() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawRwLockRecursiveTimed, T: ?Sized> RwLock<R, T> {
+    /// Attempts to acquire this `RwLock` with shared read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    ///
+    /// This method is guaranteed to succeed without blocking if another read
+    /// lock is held at the time of the call. See the documentation for
+    /// `read_recursive` for details.
+    #[inline]
+    pub fn try_read_recursive_for(
+        &self,
+        timeout: R::Duration,
+    ) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared_recursive_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with shared read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    #[inline]
+    pub fn try_read_recursive_until(
+        &self,
+        timeout: R::Instant,
+    ) -> Option<RwLockReadGuard<'_, R, T>> {
+        if self.raw.try_lock_shared_recursive_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.read_guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawRwLockUpgrade, T: ?Sized> RwLock<R, T> {
+    /// # Safety
+    ///
+    /// The lock must be held when calling this method.
+    #[inline]
+    unsafe fn upgradable_guard(&self) -> RwLockUpgradableReadGuard<'_, R, T> {
+        RwLockUpgradableReadGuard {
+            rwlock: self,
+            marker: PhantomData,
+        }
+    }
+
+    /// Locks this `RwLock` with upgradable read access, blocking the current thread
+    /// until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers or other
+    /// upgradable reads which hold the lock. There may be other readers currently
+    /// inside the lock when this method returns.
+    ///
+    /// Returns an RAII guard which will release this thread's shared access
+    /// once it is dropped.
+    #[inline]
+    pub fn upgradable_read(&self) -> RwLockUpgradableReadGuard<'_, R, T> {
+        self.raw.lock_upgradable();
+        // SAFETY: The lock is held, as required.
+        unsafe { self.upgradable_guard() }
+    }
+
+    /// Attempts to acquire this `RwLock` with upgradable read access.
+    ///
+    /// If the access could not be granted at this time, then `None` is returned.
+    /// Otherwise, an RAII guard is returned which will release the shared access
+    /// when it is dropped.
+    ///
+    /// This function does not block.
+    #[inline]
+    pub fn try_upgradable_read(&self) -> Option<RwLockUpgradableReadGuard<'_, R, T>> {
+        if self.raw.try_lock_upgradable() {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.upgradable_guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawRwLockUpgradeTimed, T: ?Sized> RwLock<R, T> {
+    /// Attempts to acquire this `RwLock` with upgradable read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    #[inline]
+    pub fn try_upgradable_read_for(
+        &self,
+        timeout: R::Duration,
+    ) -> Option<RwLockUpgradableReadGuard<'_, R, T>> {
+        if self.raw.try_lock_upgradable_for(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.upgradable_guard() })
+        } else {
+            None
+        }
+    }
+
+    /// Attempts to acquire this `RwLock` with upgradable read access until a timeout
+    /// is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// `None` is returned. Otherwise, an RAII guard is returned which will
+    /// release the shared access when it is dropped.
+    #[inline]
+    pub fn try_upgradable_read_until(
+        &self,
+        timeout: R::Instant,
+    ) -> Option<RwLockUpgradableReadGuard<'_, R, T>> {
+        if self.raw.try_lock_upgradable_until(timeout) {
+            // SAFETY: The lock is held, as required.
+            Some(unsafe { self.upgradable_guard() })
+        } else {
+            None
+        }
+    }
+}
+
+impl<R: RawRwLock, T: ?Sized + Default> Default for RwLock<R, T> {
+    #[inline]
+    fn default() -> RwLock<R, T> {
+        RwLock::new(Default::default())
+    }
+}
+
+impl<R: RawRwLock, T> From<T> for RwLock<R, T> {
+    #[inline]
+    fn from(t: T) -> RwLock<R, T> {
+        RwLock::new(t)
+    }
+}
+
+impl<R: RawRwLock, T: ?Sized + fmt::Debug> fmt::Debug for RwLock<R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.try_read() {
+            Some(guard) => f.debug_struct("RwLock").field("data", &&*guard).finish(),
+            None => {
+                struct LockedPlaceholder;
+                impl fmt::Debug for LockedPlaceholder {
+                    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                        f.write_str("<locked>")
+                    }
+                }
+
+                f.debug_struct("RwLock")
+                    .field("data", &LockedPlaceholder)
+                    .finish()
+            }
+        }
+    }
+}
+
+/// RAII structure used to release the shared read access of a lock when
+/// dropped.
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct RwLockReadGuard<'a, R: RawRwLock, T: ?Sized> {
+    rwlock: &'a RwLock<R, T>,
+    marker: PhantomData<(&'a T, R::GuardMarker)>,
+}
+
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for RwLockReadGuard<'a, R, T> {}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
+    /// Returns a reference to the original reader-writer lock object.
+    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
+        s.rwlock
+    }
+
+    /// Make a new `MappedRwLockReadGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `RwLockReadGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockReadGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockReadGuard<'a, R, U>
+    where
+        F: FnOnce(&T) -> &U,
+    {
+        let raw = &s.rwlock.raw;
+        let data = f(unsafe { &*s.rwlock.data.get() });
+        mem::forget(s);
+        MappedRwLockReadGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedRwLockReadGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `RwLockReadGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockReadGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockReadGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&T) -> Option<&U>,
+    {
+        let raw = &s.rwlock.raw;
+        let data = match f(unsafe { &*s.rwlock.data.get() }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedRwLockReadGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// The `RwLock` is unlocked a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_shared();
+        defer!(s.rwlock.raw.lock_shared());
+        f()
+    }
+}
+
+impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> RwLockReadGuard<'a, R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// By default, `RwLock` is unfair and allow the current thread to re-lock
+    /// the `RwLock` before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the `RwLock` for a long time. This is
+    /// the default because it allows much higher throughput as it avoids
+    /// forcing a context switch on every `RwLock` unlock. This can result in one
+    /// thread acquiring a `RwLock` many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `RwLockReadGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.rwlock.raw.unlock_shared_fair();
+        mem::forget(s);
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// The `RwLock` is unlocked a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_shared_fair();
+        defer!(s.rwlock.raw.lock_shared());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `read`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        s.rwlock.raw.bump_shared();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for RwLockReadGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for RwLockReadGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.rwlock.raw.unlock_shared();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug for RwLockReadGuard<'a, R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for RwLockReadGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockReadGuard<'a, R, T> {}
+
+/// RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct RwLockWriteGuard<'a, R: RawRwLock, T: ?Sized> {
+    rwlock: &'a RwLock<R, T>,
+    marker: PhantomData<(&'a mut T, R::GuardMarker)>,
+}
+
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for RwLockWriteGuard<'a, R, T> {}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
+    /// Returns a reference to the original reader-writer lock object.
+    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
+        s.rwlock
+    }
+
+    /// Make a new `MappedRwLockWriteGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `RwLockWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockWriteGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockWriteGuard<'a, R, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let raw = &s.rwlock.raw;
+        let data = f(unsafe { &mut *s.rwlock.data.get() });
+        mem::forget(s);
+        MappedRwLockWriteGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedRwLockWriteGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `RwLockWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `RwLockWriteGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockWriteGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let raw = &s.rwlock.raw;
+        let data = match f(unsafe { &mut *s.rwlock.data.get() }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedRwLockWriteGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_exclusive();
+        defer!(s.rwlock.raw.lock_exclusive());
+        f()
+    }
+}
+
+impl<'a, R: RawRwLockDowngrade + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
+    /// Atomically downgrades a write lock into a read lock without allowing any
+    /// writers to take exclusive access of the lock in the meantime.
+    ///
+    /// Note that if there are any writers currently waiting to take the lock
+    /// then other readers may not be able to acquire the lock even if it was
+    /// downgraded.
+    pub fn downgrade(s: Self) -> RwLockReadGuard<'a, R, T> {
+        s.rwlock.raw.downgrade();
+        let rwlock = s.rwlock;
+        mem::forget(s);
+        RwLockReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
+    /// Atomically downgrades a write lock into an upgradable read lock without allowing any
+    /// writers to take exclusive access of the lock in the meantime.
+    ///
+    /// Note that if there are any writers currently waiting to take the lock
+    /// then other readers may not be able to acquire the lock even if it was
+    /// downgraded.
+    pub fn downgrade_to_upgradable(s: Self) -> RwLockUpgradableReadGuard<'a, R, T> {
+        s.rwlock.raw.downgrade_to_upgradable();
+        let rwlock = s.rwlock;
+        mem::forget(s);
+        RwLockUpgradableReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> RwLockWriteGuard<'a, R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// By default, `RwLock` is unfair and allow the current thread to re-lock
+    /// the `RwLock` before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the `RwLock` for a long time. This is
+    /// the default because it allows much higher throughput as it avoids
+    /// forcing a context switch on every `RwLock` unlock. This can result in one
+    /// thread acquiring a `RwLock` many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `RwLockWriteGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.rwlock.raw.unlock_exclusive_fair();
+        mem::forget(s);
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// The `RwLock` is unlocked a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_exclusive_fair();
+        defer!(s.rwlock.raw.lock_exclusive());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `write`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        s.rwlock.raw.bump_exclusive();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for RwLockWriteGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> DerefMut for RwLockWriteGuard<'a, R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.rwlock.data.get() }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for RwLockWriteGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.rwlock.raw.unlock_exclusive();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug for RwLockWriteGuard<'a, R, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for RwLockWriteGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress for RwLockWriteGuard<'a, R, T> {}
+
+/// RAII structure used to release the upgradable read access of a lock when
+/// dropped.
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct RwLockUpgradableReadGuard<'a, R: RawRwLockUpgrade, T: ?Sized> {
+    rwlock: &'a RwLock<R, T>,
+    marker: PhantomData<(&'a T, R::GuardMarker)>,
+}
+
+unsafe impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + Sync + 'a> Sync
+    for RwLockUpgradableReadGuard<'a, R, T>
+{
+}
+
+impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
+    /// Returns a reference to the original reader-writer lock object.
+    pub fn rwlock(s: &Self) -> &'a RwLock<R, T> {
+        s.rwlock
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_upgradable();
+        defer!(s.rwlock.raw.lock_upgradable());
+        f()
+    }
+
+    /// Atomically upgrades an upgradable read lock lock into a exclusive write lock,
+    /// blocking the current thread until it can be acquired.
+    pub fn upgrade(s: Self) -> RwLockWriteGuard<'a, R, T> {
+        s.rwlock.raw.upgrade();
+        let rwlock = s.rwlock;
+        mem::forget(s);
+        RwLockWriteGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive write lock.
+    ///
+    /// If the access could not be granted at this time, then the current guard is returned.
+    pub fn try_upgrade(s: Self) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
+        if s.rwlock.raw.try_upgrade() {
+            let rwlock = s.rwlock;
+            mem::forget(s);
+            Ok(RwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+}
+
+impl<'a, R: RawRwLockUpgradeFair + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// By default, `RwLock` is unfair and allow the current thread to re-lock
+    /// the `RwLock` before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the `RwLock` for a long time. This is
+    /// the default because it allows much higher throughput as it avoids
+    /// forcing a context switch on every `RwLock` unlock. This can result in one
+    /// thread acquiring a `RwLock` many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `RwLockUpgradableReadGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.rwlock.raw.unlock_upgradable_fair();
+        mem::forget(s);
+    }
+
+    /// Temporarily unlocks the `RwLock` to execute the given function.
+    ///
+    /// The `RwLock` is unlocked a fair unlock protocol.
+    ///
+    /// This is safe because `&mut` guarantees that there exist no other
+    /// references to the data protected by the `RwLock`.
+    #[inline]
+    pub fn unlocked_fair<F, U>(s: &mut Self, f: F) -> U
+    where
+        F: FnOnce() -> U,
+    {
+        s.rwlock.raw.unlock_upgradable_fair();
+        defer!(s.rwlock.raw.lock_upgradable());
+        f()
+    }
+
+    /// Temporarily yields the `RwLock` to a waiting thread if there is one.
+    ///
+    /// This method is functionally equivalent to calling `unlock_fair` followed
+    /// by `upgradable_read`, however it can be much more efficient in the case where there
+    /// are no waiting threads.
+    #[inline]
+    pub fn bump(s: &mut Self) {
+        s.rwlock.raw.bump_upgradable();
+    }
+}
+
+impl<'a, R: RawRwLockUpgradeDowngrade + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
+    /// Atomically downgrades an upgradable read lock lock into a shared read lock
+    /// without allowing any writers to take exclusive access of the lock in the
+    /// meantime.
+    ///
+    /// Note that if there are any writers currently waiting to take the lock
+    /// then other readers may not be able to acquire the lock even if it was
+    /// downgraded.
+    pub fn downgrade(s: Self) -> RwLockReadGuard<'a, R, T> {
+        s.rwlock.raw.downgrade_upgradable();
+        let rwlock = s.rwlock;
+        mem::forget(s);
+        RwLockReadGuard {
+            rwlock,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, R: RawRwLockUpgradeTimed + 'a, T: ?Sized + 'a> RwLockUpgradableReadGuard<'a, R, T> {
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive
+    /// write lock, until a timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// the current guard is returned.
+    pub fn try_upgrade_for(
+        s: Self,
+        timeout: R::Duration,
+    ) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
+        if s.rwlock.raw.try_upgrade_for(timeout) {
+            let rwlock = s.rwlock;
+            mem::forget(s);
+            Ok(RwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+
+    /// Tries to atomically upgrade an upgradable read lock into a exclusive
+    /// write lock, until a timeout is reached.
+    ///
+    /// If the access could not be granted before the timeout expires, then
+    /// the current guard is returned.
+    #[inline]
+    pub fn try_upgrade_until(
+        s: Self,
+        timeout: R::Instant,
+    ) -> Result<RwLockWriteGuard<'a, R, T>, Self> {
+        if s.rwlock.raw.try_upgrade_until(timeout) {
+            let rwlock = s.rwlock;
+            mem::forget(s);
+            Ok(RwLockWriteGuard {
+                rwlock,
+                marker: PhantomData,
+            })
+        } else {
+            Err(s)
+        }
+    }
+}
+
+impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> Deref for RwLockUpgradableReadGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.rwlock.data.get() }
+    }
+}
+
+impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> Drop for RwLockUpgradableReadGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.rwlock.raw.unlock_upgradable();
+    }
+}
+
+impl<'a, R: RawRwLockUpgrade + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug
+    for RwLockUpgradableReadGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawRwLockUpgrade + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for RwLockUpgradableReadGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawRwLockUpgrade + 'a, T: ?Sized + 'a> StableAddress
+    for RwLockUpgradableReadGuard<'a, R, T>
+{
+}
+
+/// An RAII read lock guard returned by `RwLockReadGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedRwLockReadGuard` and `RwLockReadGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct MappedRwLockReadGuard<'a, R: RawRwLock, T: ?Sized> {
+    raw: &'a R,
+    data: *const T,
+    marker: PhantomData<&'a T>,
+}
+
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync for MappedRwLockReadGuard<'a, R, T> {}
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Send for MappedRwLockReadGuard<'a, R, T> where
+    R::GuardMarker: Send
+{
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> MappedRwLockReadGuard<'a, R, T> {
+    /// Make a new `MappedRwLockReadGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `MappedRwLockReadGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedRwLockReadGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockReadGuard<'a, R, U>
+    where
+        F: FnOnce(&T) -> &U,
+    {
+        let raw = s.raw;
+        let data = f(unsafe { &*s.data });
+        mem::forget(s);
+        MappedRwLockReadGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedRwLockReadGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `MappedRwLockReadGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedRwLockReadGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockReadGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&T) -> Option<&U>,
+    {
+        let raw = s.raw;
+        let data = match f(unsafe { &*s.data }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedRwLockReadGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+}
+
+impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> MappedRwLockReadGuard<'a, R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// By default, `RwLock` is unfair and allow the current thread to re-lock
+    /// the `RwLock` before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the `RwLock` for a long time. This is
+    /// the default because it allows much higher throughput as it avoids
+    /// forcing a context switch on every `RwLock` unlock. This can result in one
+    /// thread acquiring a `RwLock` many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `MappedRwLockReadGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.raw.unlock_shared_fair();
+        mem::forget(s);
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for MappedRwLockReadGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for MappedRwLockReadGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.raw.unlock_shared();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug
+    for MappedRwLockReadGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for MappedRwLockReadGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress
+    for MappedRwLockReadGuard<'a, R, T>
+{
+}
+
+/// An RAII write lock guard returned by `RwLockWriteGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedRwLockWriteGuard` and `RwLockWriteGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+#[must_use = "if unused the RwLock will immediately unlock"]
+pub struct MappedRwLockWriteGuard<'a, R: RawRwLock, T: ?Sized> {
+    raw: &'a R,
+    data: *mut T,
+    marker: PhantomData<&'a mut T>,
+}
+
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + Sync + 'a> Sync
+    for MappedRwLockWriteGuard<'a, R, T>
+{
+}
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Send for MappedRwLockWriteGuard<'a, R, T> where
+    R::GuardMarker: Send
+{
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
+    /// Make a new `MappedRwLockWriteGuard` for a component of the locked data.
+    ///
+    /// This operation cannot fail as the `MappedRwLockWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedRwLockWriteGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn map<U: ?Sized, F>(s: Self, f: F) -> MappedRwLockWriteGuard<'a, R, U>
+    where
+        F: FnOnce(&mut T) -> &mut U,
+    {
+        let raw = s.raw;
+        let data = f(unsafe { &mut *s.data });
+        mem::forget(s);
+        MappedRwLockWriteGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+
+    /// Attempts to make  a new `MappedRwLockWriteGuard` for a component of the
+    /// locked data. The original guard is return if the closure returns `None`.
+    ///
+    /// This operation cannot fail as the `MappedRwLockWriteGuard` passed
+    /// in already locked the data.
+    ///
+    /// This is an associated function that needs to be
+    /// used as `MappedRwLockWriteGuard::map(...)`. A method would interfere with methods of
+    /// the same name on the contents of the locked data.
+    #[inline]
+    pub fn try_map<U: ?Sized, F>(s: Self, f: F) -> Result<MappedRwLockWriteGuard<'a, R, U>, Self>
+    where
+        F: FnOnce(&mut T) -> Option<&mut U>,
+    {
+        let raw = s.raw;
+        let data = match f(unsafe { &mut *s.data }) {
+            Some(data) => data,
+            None => return Err(s),
+        };
+        mem::forget(s);
+        Ok(MappedRwLockWriteGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        })
+    }
+}
+
+impl<'a, R: RawRwLockDowngrade + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
+    /// Atomically downgrades a write lock into a read lock without allowing any
+    /// writers to take exclusive access of the lock in the meantime.
+    ///
+    /// Note that if there are any writers currently waiting to take the lock
+    /// then other readers may not be able to acquire the lock even if it was
+    /// downgraded.
+    #[deprecated(
+        since = "0.3.3",
+        note = "This function is unsound and will be removed in the future, see issue #198"
+    )]
+    pub fn downgrade(s: Self) -> MappedRwLockReadGuard<'a, R, T> {
+        s.raw.downgrade();
+        let raw = s.raw;
+        let data = s.data;
+        mem::forget(s);
+        MappedRwLockReadGuard {
+            raw,
+            data,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, R: RawRwLockFair + 'a, T: ?Sized + 'a> MappedRwLockWriteGuard<'a, R, T> {
+    /// Unlocks the `RwLock` using a fair unlock protocol.
+    ///
+    /// By default, `RwLock` is unfair and allow the current thread to re-lock
+    /// the `RwLock` before another has the chance to acquire the lock, even if
+    /// that thread has been blocked on the `RwLock` for a long time. This is
+    /// the default because it allows much higher throughput as it avoids
+    /// forcing a context switch on every `RwLock` unlock. This can result in one
+    /// thread acquiring a `RwLock` many more times than other threads.
+    ///
+    /// However in some cases it can be beneficial to ensure fairness by forcing
+    /// the lock to pass on to a waiting thread if there is one. This is done by
+    /// using this method instead of dropping the `MappedRwLockWriteGuard` normally.
+    #[inline]
+    pub fn unlock_fair(s: Self) {
+        s.raw.unlock_exclusive_fair();
+        mem::forget(s);
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Deref for MappedRwLockWriteGuard<'a, R, T> {
+    type Target = T;
+    #[inline]
+    fn deref(&self) -> &T {
+        unsafe { &*self.data }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> DerefMut for MappedRwLockWriteGuard<'a, R, T> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.data }
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> Drop for MappedRwLockWriteGuard<'a, R, T> {
+    #[inline]
+    fn drop(&mut self) {
+        self.raw.unlock_exclusive();
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Debug + ?Sized + 'a> fmt::Debug
+    for MappedRwLockWriteGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Debug::fmt(&**self, f)
+    }
+}
+
+impl<'a, R: RawRwLock + 'a, T: fmt::Display + ?Sized + 'a> fmt::Display
+    for MappedRwLockWriteGuard<'a, R, T>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+#[cfg(feature = "owning_ref")]
+unsafe impl<'a, R: RawRwLock + 'a, T: ?Sized + 'a> StableAddress
+    for MappedRwLockWriteGuard<'a, R, T>
+{
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/appveyor.yml firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/appveyor.yml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/appveyor.yml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,59 @@
+environment:
+  TRAVIS_CARGO_NIGHTLY_FEATURE: nightly
+  RUST_TEST_THREADS: 1
+  matrix:
+  - TARGET: x86_64-pc-windows-msvc
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: i686-pc-windows-msvc
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: x86_64-pc-windows-gnu
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: i686-pc-windows-gnu
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: nightly
+    FEATURES: nightly
+  - TARGET: x86_64-pc-windows-msvc
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: 1.36.0
+  - TARGET: i686-pc-windows-msvc
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: 1.36.0
+  - TARGET: x86_64-pc-windows-gnu
+    MSYSTEM: MINGW64
+    CPU: x86_64
+    TOOLCHAIN: 1.36.0
+  - TARGET: i686-pc-windows-gnu
+    MSYSTEM: MINGW32
+    CPU: i686
+    TOOLCHAIN: 1.36.0
+
+install:
+  - set PATH=C:\msys64\%MSYSTEM%\bin;c:\msys64\usr\bin;%PATH%
+  - pacman --noconfirm -Syu mingw-w64-%CPU%-make
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain %TOOLCHAIN%
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - rustc -vV
+  - cargo -vV
+
+build_script:
+  - cargo build --features "%FEATURES%"
+
+test_script:
+  - cargo test --all --features "%FEATURES%"
+  - cargo doc --all
+  - cd benchmark
+  - cargo run --release --bin mutex -- 2 1 0 1 2
+  - cargo run --release --bin rwlock -- 1 1 1 0 1 2
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/bors.toml firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/bors.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/bors.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/bors.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,3 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"18a3b6c2a59fb59450362712afae444070b23c2697cf20aa9ee3911dd9f6d981","Cargo.toml":"c0d17dd8decba5afb1495577e0ded39c0228eeb2eb14be4f4d4d5d9c96ebc0c3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"0f1b45638eb0d2b3f142baec830319a5790f3f2004eac5bc5f3e95bc632bdaed","appveyor.yml":"e2416e65e27442dd8e17c773deee1e45ee96157221bc81b03d9a6d25bfa570e2","bors.toml":"1c81ede536a37edd30fe4e622ff0531b25372403ac9475a5d6c50f14156565a2","src/condvar.rs":"510f96e94b56f0cb0d200a8e94b0487d0799e13b9e126b9b416f22d8dc11b643","src/deadlock.rs":"7d3ebb5b4f63658435df277bb983e352e4bc651a92c4fd48ae68bf103e452d0d","src/elision.rs":"9aceb0b27fd3cdaf4ef76bda63435a96ec2fdef24be098b9e4edbc39db000765","src/fair_mutex.rs":"d0a032e8207919da04b85f1422dfb14aa2af7aad78843c708d2fe3e0478e401a","src/lib.rs":"3d89619878f3c8b6190261321a4e430e0514c97b65e8c911c0764ea57c0605f2","src/mutex.rs":"afc25db5c45da63c743029ee3cb22e262ea7a32b533245b441c0a5835f9f525f","src/once.rs":"a1c38a5d87077e3d112d57e065ee126a24ab19f04fba9cb1f2cb43bc82caf33c","src/raw_fair_mutex.rs":"a7415aa6cbc040a2f886d06dd6c0c0b3be9963936a31f60f1494e718c9d18acb","src/raw_mutex.rs":"f3507478c34b49bd725dfaed6bf4847fc3aec28700960a7823af9e15b06b5e24","src/raw_rwlock.rs":"f8ce7c4f92299cf64cb6e7b69cd46d9ddefd1211535729b6455e82f7c4eb3eae","src/remutex.rs":"7a0de55161cd57497bb52d3aecca69a89eff2e71cdb2d762df53579e0607b489","src/rwlock.rs":"1a782ab4fafc0c542d1c42151b98475829c96da168d2d0e8947181b7f2d7cb07","src/util.rs":"37a2c8b5c9254df83e8f3a5cd831558c1045061a76c2571bdc4d78eb86e467f2","tests/issue_203.rs":"5fbdf6ec63f391d86457df949678c203a1e81e8aa32d4e10037fa76e768702c0"},"package":"d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,40 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "parking_lot"
+version = "0.10.2"
+authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
+description = "More compact and efficient implementations of the standard synchronization primitives."
+readme = "README.md"
+keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
+categories = ["concurrency"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/Amanieu/parking_lot"
+[dependencies.lock_api]
+version = "0.3.4"
+
+[dependencies.parking_lot_core]
+version = "0.7.1"
+[dev-dependencies.bincode]
+version = "1.1.3"
+
+[dev-dependencies.rand]
+version = "0.7"
+
+[features]
+deadlock_detection = ["parking_lot_core/deadlock_detection"]
+default = []
+nightly = ["parking_lot_core/nightly", "lock_api/nightly"]
+owning_ref = ["lock_api/owning_ref"]
+serde = ["lock_api/serde"]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/CHANGELOG.md firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/CHANGELOG.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/CHANGELOG.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,120 @@
+## parking_lot 0.10.2 (2020-04-10)
+
+- Update minimum version of `lock_api`.
+
+## parking_lot 0.10.1, parking_lot_core 0.7.1, lock_api 0.3.4 (2020-04-10)
+
+- Add methods to construct `Mutex`, `RwLock`, etc in a `const` context. (#217)
+- Add `FairMutex` which always uses fair unlocking. (#204)
+- Fixed panic with deadlock detection on macOS. (#203)
+- Fixed incorrect synchronization in `create_hashtable`. (#210)
+- Use `llvm_asm!` instead of the deprecated `asm!`. (#223)
+
+## lock_api 0.3.3 (2020-01-04)
+
+- Deprecate unsound `MappedRwLockWriteGuard::downgrade` (#198)
+
+## parking_lot 0.10.0, parking_lot_core 0.7.0, lock_api 0.3.2 (2019-11-25)
+
+- Upgrade smallvec dependency to 1.0 in parking_lot_core.
+- Replace all usage of `mem::uninitialized` with `mem::MaybeUninit`.
+- The minimum required Rust version is bumped to 1.36. Because of the above two changes.
+- Make methods on `WaitTimeoutResult` and `OnceState` take `self` by value instead of reference.
+
+## parking_lot_core 0.6.2 (2019-07-22)
+
+- Fixed compile error on Windows with old cfg_if version. (#164)
+
+## parking_lot_core 0.6.1 (2019-07-17)
+
+- Fixed Android build. (#163)
+
+## parking_lot 0.9.0, parking_lot_core 0.6.0, lock_api 0.3.1 (2019-07-14)
+
+- Re-export lock_api (0.3.1) from parking_lot (#150)
+- Removed (non-dev) dependency on rand crate for fairness mechanism, by
+  including a simple xorshift PRNG in core (#144)
+- Android now uses the futex-based ThreadParker. (#140)
+- Fixed CloudABI ThreadParker. (#140)
+- Fix race condition in lock_api::ReentrantMutex (da16c2c7)
+
+## lock_api 0.3.0 (2019-07-03, _yanked_)
+
+- Use NonZeroUsize in GetThreadId::nonzero_thread_id (#148)
+- Debug assert lock_count in ReentrantMutex (#148)
+- Tag as `unsafe` and document some internal methods (#148)
+- This release was _yanked_ due to a regression in ReentrantMutex (da16c2c7)
+
+## parking_lot 0.8.1 (2019-07-03, _yanked_)
+
+- Re-export lock_api (0.3.0) from parking_lot (#150)
+- This release was _yanked_ from crates.io due to unexpected breakage (#156)
+
+## parking_lot 0.8.0, parking_lot_core 0.5.0, lock_api 0.2.0 (2019-05-04)
+
+- Fix race conditions in deadlock detection.
+- Support for more platforms by adding ThreadParker implementations for
+  Wasm, Redox, SGX and CloudABI.
+- Drop support for older Rust. parking_lot now requires 1.31 and is a
+  Rust 2018 edition crate (#122).
+- Disable the owning_ref feature by default.
+- Fix was_last_thread value in the timeout callback of park() (#129).
+- Support single byte Mutex/Once on stable Rust when compiler is at least
+  version 1.34.
+- Make Condvar::new and Once::new const fns on stable Rust and remove
+  ONCE_INIT (#134).
+- Add optional Serde support (#135).
+
+## parking_lot 0.7.1 (2019-01-01)
+
+- Fixed potential deadlock when upgrading a RwLock.
+- Fixed overflow panic on very long timeouts (#111).
+
+## parking_lot 0.7.0, parking_lot_core 0.4.0 (2018-11-26)
+
+- Return if or how many threads were notified from `Condvar::notify_*`
+
+## parking_lot 0.6.3 (2018-07-18)
+
+- Export `RawMutex`, `RawRwLock` and `RawThreadId`.
+
+## parking_lot 0.6.2 (2018-06-18)
+
+- Enable `lock_api/nightly` feature from `parking_lot/nightly` (#79)
+
+## parking_lot 0.6.1 (2018-06-08)
+
+Added missing typedefs for mapped lock guards:
+
+- `MappedMutexGuard`
+- `MappedReentrantMutexGuard`
+- `MappedRwLockReadGuard`
+- `MappedRwLockWriteGuard`
+
+## parking_lot 0.6.0 (2018-06-08)
+
+This release moves most of the code for type-safe `Mutex` and `RwLock` types
+into a separate crate called `lock_api`. This new crate is compatible with
+`no_std` and provides `Mutex` and `RwLock` type-safe wrapper types from a raw
+mutex type which implements the `RawMutex` or `RawRwLock` trait. The API
+provided by the wrapper types can be extended by implementing more traits on
+the raw mutex type which provide more functionality (e.g. `RawMutexTimed`). See
+the crate documentation for more details.
+
+There are also several major changes:
+
+- The minimum required Rust version is bumped to 1.26.
+- All methods on `MutexGuard` (and other guard types) are no longer inherent
+  methods and must be called as `MutexGuard::method(self)`. This avoids
+  conflicts with methods from the inner type.
+- `MutexGuard` (and other guard types) add the `unlocked` method which
+  temporarily unlocks a mutex, runs the given closure, and then re-locks the
+   mutex.
+- `MutexGuard` (and other guard types) add the `bump` method which gives a
+  chance for other threads to acquire the mutex by temporarily unlocking it and
+  re-locking it. However this is optimized for the common case where there are
+  no threads waiting on the lock, in which case no unlocking is performed.
+- `MutexGuard` (and other guard types) add the `map` method which returns a
+  `MappedMutexGuard` which holds only a subset of the original locked type. The
+  `MappedMutexGuard` type is identical to `MutexGuard` except that it does not
+  support the `unlocked` and `bump` methods, and can't be used with `CondVar`.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2016 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/README.md firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/README.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/README.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,140 @@
+parking_lot
+============
+
+[![Build Status](https://travis-ci.org/Amanieu/parking_lot.svg?branch=master)](https://travis-ci.org/Amanieu/parking_lot) [![Build status](https://ci.appveyor.com/api/projects/status/wppcc32ttpud0a30/branch/master?svg=true)](https://ci.appveyor.com/project/Amanieu/parking-lot/branch/master) [![Crates.io](https://img.shields.io/crates/v/parking_lot.svg)](https://crates.io/crates/parking_lot)
+
+[Documentation (synchronization primitives)](https://docs.rs/parking_lot/)
+
+[Documentation (core parking lot API)](https://docs.rs/parking_lot_core/)
+
+[Documentation (type-safe lock API)](https://docs.rs/lock_api/)
+
+This library provides implementations of `Mutex`, `RwLock`, `Condvar` and
+`Once` that are smaller, faster and more flexible than those in the Rust
+standard library, as well as a `ReentrantMutex` type which supports recursive
+locking. It also exposes a low-level API for creating your own efficient
+synchronization primitives.
+
+When tested on x86_64 Linux, `parking_lot::Mutex` was found to be 1.5x
+faster than `std::sync::Mutex` when uncontended, and up to 5x faster when
+contended from multiple threads. The numbers for `RwLock` vary depending on
+the number of reader and writer threads, but are almost always faster than
+the standard library `RwLock`, and even up to 50x faster in some cases.
+
+## Features
+
+The primitives provided by this library have several advantages over those
+in the Rust standard library:
+
+1. `Mutex` and `Once` only require 1 byte of storage space, while `Condvar`
+   and `RwLock` only require 1 word of storage space. On the other hand the
+   standard library primitives require a dynamically allocated `Box` to hold
+   OS-specific synchronization primitives. The small size of `Mutex` in
+   particular encourages the use of fine-grained locks to increase
+   parallelism.
+2. Since they consist of just a single atomic variable, have constant
+   initializers and don't need destructors, these primitives can be used as
+   `static` global variables. The standard library primitives require
+   dynamic initialization and thus need to be lazily initialized with
+   `lazy_static!`.
+3. Uncontended lock acquisition and release is done through fast inline
+   paths which only require a single atomic operation.
+4. Microcontention (a contended lock with a short critical section) is
+   efficiently handled by spinning a few times while trying to acquire a
+   lock.
+5. The locks are adaptive and will suspend a thread after a few failed spin
+   attempts. This makes the locks suitable for both long and short critical
+   sections.
+6. `Condvar`, `RwLock` and `Once` work on Windows XP, unlike the standard
+   library versions of those types.
+7. `RwLock` takes advantage of hardware lock elision on processors that
+   support it, which can lead to huge performance wins with many readers.
+8. `RwLock` uses a task-fair locking policy, which avoids reader and writer
+   starvation, whereas the standard library version makes no guarantees.
+9. `Condvar` is guaranteed not to produce spurious wakeups. A thread will
+    only be woken up if it timed out or it was woken up by a notification.
+10. `Condvar::notify_all` will only wake up a single thread and requeue the
+    rest to wait on the associated `Mutex`. This avoids a thundering herd
+    problem where all threads try to acquire the lock at the same time.
+11. `RwLock` supports atomically downgrading a write lock into a read lock.
+12. `Mutex` and `RwLock` allow raw unlocking without a RAII guard object.
+13. `Mutex<()>` and `RwLock<()>` allow raw locking without a RAII guard
+    object.
+14. `Mutex` and `RwLock` support [eventual fairness](https://trac.webkit.org/changeset/203350)
+    which allows them to be fair on average without sacrificing performance.
+15. A `ReentrantMutex` type which supports recursive locking.
+16. An *experimental* deadlock detector that works for `Mutex`,
+    `RwLock` and `ReentrantMutex`. This feature is disabled by default and
+    can be enabled via the `deadlock_detection` feature.
+17. `RwLock` supports atomically upgrading an "upgradable" read lock into a
+    write lock.
+18. Optional support for [serde](https://docs.serde.rs/serde/).  Enable via the
+    feature `serde`.  **NOTE!** this support is for `Mutex`, `ReentrantMutex`,
+    and `RwLock` only; `Condvar` and `Once` are not currently supported.
+
+## The parking lot
+
+To keep these primitives small, all thread queuing and suspending
+functionality is offloaded to the *parking lot*. The idea behind this is
+based on the Webkit [`WTF::ParkingLot`](https://webkit.org/blog/6161/locking-in-webkit/)
+class, which essentially consists of a hash table mapping of lock addresses
+to queues of parked (sleeping) threads. The Webkit parking lot was itself
+inspired by Linux [futexes](http://man7.org/linux/man-pages/man2/futex.2.html),
+but it is more powerful since it allows invoking callbacks while holding a queue
+lock.
+
+## Nightly vs stable
+
+There are a few restrictions when using this library on stable Rust:
+
+- You will have to use the `const_*` functions (e.g. `const_mutex(val)`) to
+  statically initialize the locking primitives. Using e.g. `Mutex::new(val)`
+  does not work on stable Rust yet.
+- `RwLock` will not be able to take advantage of hardware lock elision for
+  readers, which improves performance when there are multiple readers.
+
+To enable nightly-only functionality, you need to enable the `nightly` feature
+in Cargo (see below).
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+parking_lot = "0.10"
+```
+
+To enable nightly-only features, add this to your `Cargo.toml` instead:
+
+```toml
+[dependencies]
+parking_lot = { version = "0.10", features = ["nightly"] }
+```
+
+The experimental deadlock detector can be enabled with the
+`deadlock_detection` Cargo feature.
+
+The core parking lot API is provided by the `parking_lot_core` crate. It is
+separate from the synchronization primitives in the `parking_lot` crate so that
+changes to the core API do not cause breaking changes for users of `parking_lot`.
+
+## Minimum Rust version
+
+The current minimum required Rust version is 1.36. Any change to this is
+considered a breaking change and will require a major version bump.
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/condvar.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/condvar.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/condvar.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/condvar.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,1052 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::mutex::MutexGuard;
+use crate::raw_mutex::{RawMutex, TOKEN_HANDOFF, TOKEN_NORMAL};
+use crate::{deadlock, util};
+use core::{
+    fmt, ptr,
+    sync::atomic::{AtomicPtr, Ordering},
+};
+use lock_api::RawMutex as RawMutex_;
+use parking_lot_core::{self, ParkResult, RequeueOp, UnparkResult, DEFAULT_PARK_TOKEN};
+use std::time::{Duration, Instant};
+
+/// A type indicating whether a timed wait on a condition variable returned
+/// due to a time out or not.
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub struct WaitTimeoutResult(bool);
+
+impl WaitTimeoutResult {
+    /// Returns whether the wait was known to have timed out.
+    #[inline]
+    pub fn timed_out(self) -> bool {
+        self.0
+    }
+}
+
+/// A Condition Variable
+///
+/// Condition variables represent the ability to block a thread such that it
+/// consumes no CPU time while waiting for an event to occur. Condition
+/// variables are typically associated with a boolean predicate (a condition)
+/// and a mutex. The predicate is always verified inside of the mutex before
+/// determining that thread must block.
+///
+/// Note that this module places one additional restriction over the system
+/// condition variables: each condvar can be used with only one mutex at a
+/// time. Any attempt to use multiple mutexes on the same condition variable
+/// simultaneously will result in a runtime panic. However it is possible to
+/// switch to a different mutex if there are no threads currently waiting on
+/// the condition variable.
+///
+/// # Differences from the standard library `Condvar`
+///
+/// - No spurious wakeups: A wait will only return a non-timeout result if it
+///   was woken up by `notify_one` or `notify_all`.
+/// - `Condvar::notify_all` will only wake up a single thread, the rest are
+///   requeued to wait for the `Mutex` to be unlocked by the thread that was
+///   woken up.
+/// - Only requires 1 word of space, whereas the standard library boxes the
+///   `Condvar` due to platform limitations.
+/// - Can be statically constructed (requires the `const_fn` nightly feature).
+/// - Does not require any drop glue when dropped.
+/// - Inline fast path for the uncontended case.
+///
+/// # Examples
+///
+/// ```
+/// use parking_lot::{Mutex, Condvar};
+/// use std::sync::Arc;
+/// use std::thread;
+///
+/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
+/// let pair2 = pair.clone();
+///
+/// // Inside of our lock, spawn a new thread, and then wait for it to start
+/// thread::spawn(move|| {
+///     let &(ref lock, ref cvar) = &*pair2;
+///     let mut started = lock.lock();
+///     *started = true;
+///     cvar.notify_one();
+/// });
+///
+/// // wait for the thread to start up
+/// let &(ref lock, ref cvar) = &*pair;
+/// let mut started = lock.lock();
+/// if !*started {
+///     cvar.wait(&mut started);
+/// }
+/// // Note that we used an if instead of a while loop above. This is only
+/// // possible because parking_lot's Condvar will never spuriously wake up.
+/// // This means that wait() will only return after notify_one or notify_all is
+/// // called.
+/// ```
+pub struct Condvar {
+    state: AtomicPtr<RawMutex>,
+}
+
+impl Condvar {
+    /// Creates a new condition variable which is ready to be waited on and
+    /// notified.
+    #[inline]
+    pub const fn new() -> Condvar {
+        Condvar {
+            state: AtomicPtr::new(ptr::null_mut()),
+        }
+    }
+
+    /// Wakes up one blocked thread on this condvar.
+    ///
+    /// Returns whether a thread was woken up.
+    ///
+    /// If there is a blocked thread on this condition variable, then it will
+    /// be woken up from its call to `wait` or `wait_timeout`. Calls to
+    /// `notify_one` are not buffered in any way.
+    ///
+    /// To wake up all threads, see `notify_all()`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use parking_lot::Condvar;
+    ///
+    /// let condvar = Condvar::new();
+    ///
+    /// // do something with condvar, share it with other threads
+    ///
+    /// if !condvar.notify_one() {
+    ///     println!("Nobody was listening for this.");
+    /// }
+    /// ```
+    #[inline]
+    pub fn notify_one(&self) -> bool {
+        // Nothing to do if there are no waiting threads
+        let state = self.state.load(Ordering::Relaxed);
+        if state.is_null() {
+            return false;
+        }
+
+        self.notify_one_slow(state)
+    }
+
+    #[cold]
+    fn notify_one_slow(&self, mutex: *mut RawMutex) -> bool {
+        unsafe {
+            // Unpark one thread and requeue the rest onto the mutex
+            let from = self as *const _ as usize;
+            let to = mutex as usize;
+            let validate = || {
+                // Make sure that our atomic state still points to the same
+                // mutex. If not then it means that all threads on the current
+                // mutex were woken up and a new waiting thread switched to a
+                // different mutex. In that case we can get away with doing
+                // nothing.
+                if self.state.load(Ordering::Relaxed) != mutex {
+                    return RequeueOp::Abort;
+                }
+
+                // Unpark one thread if the mutex is unlocked, otherwise just
+                // requeue everything to the mutex. This is safe to do here
+                // since unlocking the mutex when the parked bit is set requires
+                // locking the queue. There is the possibility of a race if the
+                // mutex gets locked after we check, but that doesn't matter in
+                // this case.
+                if (*mutex).mark_parked_if_locked() {
+                    RequeueOp::RequeueOne
+                } else {
+                    RequeueOp::UnparkOne
+                }
+            };
+            let callback = |_op, result: UnparkResult| {
+                // Clear our state if there are no more waiting threads
+                if !result.have_more_threads {
+                    self.state.store(ptr::null_mut(), Ordering::Relaxed);
+                }
+                TOKEN_NORMAL
+            };
+            let res = parking_lot_core::unpark_requeue(from, to, validate, callback);
+
+            res.unparked_threads + res.requeued_threads != 0
+        }
+    }
+
+    /// Wakes up all blocked threads on this condvar.
+    ///
+    /// Returns the number of threads woken up.
+    ///
+    /// This method will ensure that any current waiters on the condition
+    /// variable are awoken. Calls to `notify_all()` are not buffered in any
+    /// way.
+    ///
+    /// To wake up only one thread, see `notify_one()`.
+    #[inline]
+    pub fn notify_all(&self) -> usize {
+        // Nothing to do if there are no waiting threads
+        let state = self.state.load(Ordering::Relaxed);
+        if state.is_null() {
+            return 0;
+        }
+
+        self.notify_all_slow(state)
+    }
+
+    #[cold]
+    fn notify_all_slow(&self, mutex: *mut RawMutex) -> usize {
+        unsafe {
+            // Unpark one thread and requeue the rest onto the mutex
+            let from = self as *const _ as usize;
+            let to = mutex as usize;
+            let validate = || {
+                // Make sure that our atomic state still points to the same
+                // mutex. If not then it means that all threads on the current
+                // mutex were woken up and a new waiting thread switched to a
+                // different mutex. In that case we can get away with doing
+                // nothing.
+                if self.state.load(Ordering::Relaxed) != mutex {
+                    return RequeueOp::Abort;
+                }
+
+                // Clear our state since we are going to unpark or requeue all
+                // threads.
+                self.state.store(ptr::null_mut(), Ordering::Relaxed);
+
+                // Unpark one thread if the mutex is unlocked, otherwise just
+                // requeue everything to the mutex. This is safe to do here
+                // since unlocking the mutex when the parked bit is set requires
+                // locking the queue. There is the possibility of a race if the
+                // mutex gets locked after we check, but that doesn't matter in
+                // this case.
+                if (*mutex).mark_parked_if_locked() {
+                    RequeueOp::RequeueAll
+                } else {
+                    RequeueOp::UnparkOneRequeueRest
+                }
+            };
+            let callback = |op, result: UnparkResult| {
+                // If we requeued threads to the mutex, mark it as having
+                // parked threads. The RequeueAll case is already handled above.
+                if op == RequeueOp::UnparkOneRequeueRest && result.requeued_threads != 0 {
+                    (*mutex).mark_parked();
+                }
+                TOKEN_NORMAL
+            };
+            let res = parking_lot_core::unpark_requeue(from, to, validate, callback);
+
+            res.unparked_threads + res.requeued_threads
+        }
+    }
+
+    /// Blocks the current thread until this condition variable receives a
+    /// notification.
+    ///
+    /// This function will atomically unlock the mutex specified (represented by
+    /// `mutex_guard`) and block the current thread. This means that any calls
+    /// to `notify_*()` which happen logically after the mutex is unlocked are
+    /// candidates to wake this thread up. When this function call returns, the
+    /// lock specified will have been re-acquired.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if another thread is waiting on the `Condvar`
+    /// with a different `Mutex` object.
+    #[inline]
+    pub fn wait<T: ?Sized>(&self, mutex_guard: &mut MutexGuard<'_, T>) {
+        self.wait_until_internal(unsafe { MutexGuard::mutex(mutex_guard).raw() }, None);
+    }
+
+    /// Waits on this condition variable for a notification, timing out after
+    /// the specified time instant.
+    ///
+    /// The semantics of this function are equivalent to `wait()` except that
+    /// the thread will be blocked roughly until `timeout` is reached. This
+    /// method should not be used for precise timing due to anomalies such as
+    /// preemption or platform differences that may not cause the maximum
+    /// amount of time waited to be precisely `timeout`.
+    ///
+    /// Note that the best effort is made to ensure that the time waited is
+    /// measured with a monotonic clock, and not affected by the changes made to
+    /// the system time.
+    ///
+    /// The returned `WaitTimeoutResult` value indicates if the timeout is
+    /// known to have elapsed.
+    ///
+    /// Like `wait`, the lock specified will be re-acquired when this function
+    /// returns, regardless of whether the timeout elapsed or not.
+    ///
+    /// # Panics
+    ///
+    /// This function will panic if another thread is waiting on the `Condvar`
+    /// with a different `Mutex` object.
+    #[inline]
+    pub fn wait_until<T: ?Sized>(
+        &self,
+        mutex_guard: &mut MutexGuard<'_, T>,
+        timeout: Instant,
+    ) -> WaitTimeoutResult {
+        self.wait_until_internal(
+            unsafe { MutexGuard::mutex(mutex_guard).raw() },
+            Some(timeout),
+        )
+    }
+
+    // This is a non-generic function to reduce the monomorphization cost of
+    // using `wait_until`.
+    fn wait_until_internal(&self, mutex: &RawMutex, timeout: Option<Instant>) -> WaitTimeoutResult {
+        unsafe {
+            let result;
+            let mut bad_mutex = false;
+            let mut requeued = false;
+            {
+                let addr = self as *const _ as usize;
+                let lock_addr = mutex as *const _ as *mut _;
+                let validate = || {
+                    // Ensure we don't use two different mutexes with the same
+                    // Condvar at the same time. This is done while locked to
+                    // avoid races with notify_one
+                    let state = self.state.load(Ordering::Relaxed);
+                    if state.is_null() {
+                        self.state.store(lock_addr, Ordering::Relaxed);
+                    } else if state != lock_addr {
+                        bad_mutex = true;
+                        return false;
+                    }
+                    true
+                };
+                let before_sleep = || {
+                    // Unlock the mutex before sleeping...
+                    mutex.unlock();
+                };
+                let timed_out = |k, was_last_thread| {
+                    // If we were requeued to a mutex, then we did not time out.
+                    // We'll just park ourselves on the mutex again when we try
+                    // to lock it later.
+                    requeued = k != addr;
+
+                    // If we were the last thread on the queue then we need to
+                    // clear our state. This is normally done by the
+                    // notify_{one,all} functions when not timing out.
+                    if !requeued && was_last_thread {
+                        self.state.store(ptr::null_mut(), Ordering::Relaxed);
+                    }
+                };
+                result = parking_lot_core::park(
+                    addr,
+                    validate,
+                    before_sleep,
+                    timed_out,
+                    DEFAULT_PARK_TOKEN,
+                    timeout,
+                );
+            }
+
+            // Panic if we tried to use multiple mutexes with a Condvar. Note
+            // that at this point the MutexGuard is still locked. It will be
+            // unlocked by the unwinding logic.
+            if bad_mutex {
+                panic!("attempted to use a condition variable with more than one mutex");
+            }
+
+            // ... and re-lock it once we are done sleeping
+            if result == ParkResult::Unparked(TOKEN_HANDOFF) {
+                deadlock::acquire_resource(mutex as *const _ as usize);
+            } else {
+                mutex.lock();
+            }
+
+            WaitTimeoutResult(!(result.is_unparked() || requeued))
+        }
+    }
+
+    /// Waits on this condition variable for a notification, timing out after a
+    /// specified duration.
+    ///
+    /// The semantics of this function are equivalent to `wait()` except that
+    /// the thread will be blocked for roughly no longer than `timeout`. This
+    /// method should not be used for precise timing due to anomalies such as
+    /// preemption or platform differences that may not cause the maximum
+    /// amount of time waited to be precisely `timeout`.
+    ///
+    /// Note that the best effort is made to ensure that the time waited is
+    /// measured with a monotonic clock, and not affected by the changes made to
+    /// the system time.
+    ///
+    /// The returned `WaitTimeoutResult` value indicates if the timeout is
+    /// known to have elapsed.
+    ///
+    /// Like `wait`, the lock specified will be re-acquired when this function
+    /// returns, regardless of whether the timeout elapsed or not.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the given `timeout` is so large that it can't be added to the current time.
+    /// This panic is not possible if the crate is built with the `nightly` feature, then a too
+    /// large `timeout` becomes equivalent to just calling `wait`.
+    #[inline]
+    pub fn wait_for<T: ?Sized>(
+        &self,
+        mutex_guard: &mut MutexGuard<'_, T>,
+        timeout: Duration,
+    ) -> WaitTimeoutResult {
+        let deadline = util::to_deadline(timeout);
+        self.wait_until_internal(unsafe { MutexGuard::mutex(mutex_guard).raw() }, deadline)
+    }
+}
+
+impl Default for Condvar {
+    #[inline]
+    fn default() -> Condvar {
+        Condvar::new()
+    }
+}
+
+impl fmt::Debug for Condvar {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.pad("Condvar { .. }")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{Condvar, Mutex, MutexGuard};
+    use std::sync::mpsc::channel;
+    use std::sync::Arc;
+    use std::thread;
+    use std::time::{Duration, Instant};
+
+    #[test]
+    fn smoke() {
+        let c = Condvar::new();
+        c.notify_one();
+        c.notify_all();
+    }
+
+    #[test]
+    fn notify_one() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        let mut g = m.lock();
+        let _t = thread::spawn(move || {
+            let _g = m2.lock();
+            c2.notify_one();
+        });
+        c.wait(&mut g);
+    }
+
+    #[test]
+    fn notify_all() {
+        const N: usize = 10;
+
+        let data = Arc::new((Mutex::new(0), Condvar::new()));
+        let (tx, rx) = channel();
+        for _ in 0..N {
+            let data = data.clone();
+            let tx = tx.clone();
+            thread::spawn(move || {
+                let &(ref lock, ref cond) = &*data;
+                let mut cnt = lock.lock();
+                *cnt += 1;
+                if *cnt == N {
+                    tx.send(()).unwrap();
+                }
+                while *cnt != 0 {
+                    cond.wait(&mut cnt);
+                }
+                tx.send(()).unwrap();
+            });
+        }
+        drop(tx);
+
+        let &(ref lock, ref cond) = &*data;
+        rx.recv().unwrap();
+        let mut cnt = lock.lock();
+        *cnt = 0;
+        cond.notify_all();
+        drop(cnt);
+
+        for _ in 0..N {
+            rx.recv().unwrap();
+        }
+    }
+
+    #[test]
+    fn notify_one_return_true() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        let mut g = m.lock();
+        let _t = thread::spawn(move || {
+            let _g = m2.lock();
+            assert!(c2.notify_one());
+        });
+        c.wait(&mut g);
+    }
+
+    #[test]
+    fn notify_one_return_false() {
+        let m = Arc::new(Mutex::new(()));
+        let c = Arc::new(Condvar::new());
+
+        let _t = thread::spawn(move || {
+            let _g = m.lock();
+            assert!(!c.notify_one());
+        });
+    }
+
+    #[test]
+    fn notify_all_return() {
+        const N: usize = 10;
+
+        let data = Arc::new((Mutex::new(0), Condvar::new()));
+        let (tx, rx) = channel();
+        for _ in 0..N {
+            let data = data.clone();
+            let tx = tx.clone();
+            thread::spawn(move || {
+                let &(ref lock, ref cond) = &*data;
+                let mut cnt = lock.lock();
+                *cnt += 1;
+                if *cnt == N {
+                    tx.send(()).unwrap();
+                }
+                while *cnt != 0 {
+                    cond.wait(&mut cnt);
+                }
+                tx.send(()).unwrap();
+            });
+        }
+        drop(tx);
+
+        let &(ref lock, ref cond) = &*data;
+        rx.recv().unwrap();
+        let mut cnt = lock.lock();
+        *cnt = 0;
+        assert_eq!(cond.notify_all(), N);
+        drop(cnt);
+
+        for _ in 0..N {
+            rx.recv().unwrap();
+        }
+
+        assert_eq!(cond.notify_all(), 0);
+    }
+
+    #[test]
+    fn wait_for() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        let mut g = m.lock();
+        let no_timeout = c.wait_for(&mut g, Duration::from_millis(1));
+        assert!(no_timeout.timed_out());
+
+        let _t = thread::spawn(move || {
+            let _g = m2.lock();
+            c2.notify_one();
+        });
+        // Non-nightly panics on too large timeouts. Nightly treats it as indefinite wait.
+        let very_long_timeout = if cfg!(feature = "nightly") {
+            Duration::from_secs(u64::max_value())
+        } else {
+            Duration::from_millis(u32::max_value() as u64)
+        };
+
+        let timeout_res = c.wait_for(&mut g, very_long_timeout);
+        assert!(!timeout_res.timed_out());
+
+        drop(g);
+    }
+
+    #[test]
+    fn wait_until() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        let mut g = m.lock();
+        let no_timeout = c.wait_until(&mut g, Instant::now() + Duration::from_millis(1));
+        assert!(no_timeout.timed_out());
+        let _t = thread::spawn(move || {
+            let _g = m2.lock();
+            c2.notify_one();
+        });
+        let timeout_res = c.wait_until(
+            &mut g,
+            Instant::now() + Duration::from_millis(u32::max_value() as u64),
+        );
+        assert!(!timeout_res.timed_out());
+        drop(g);
+    }
+
+    #[test]
+    #[should_panic]
+    fn two_mutexes() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let m3 = Arc::new(Mutex::new(()));
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        // Make sure we don't leave the child thread dangling
+        struct PanicGuard<'a>(&'a Condvar);
+        impl<'a> Drop for PanicGuard<'a> {
+            fn drop(&mut self) {
+                self.0.notify_one();
+            }
+        }
+
+        let (tx, rx) = channel();
+        let g = m.lock();
+        let _t = thread::spawn(move || {
+            let mut g = m2.lock();
+            tx.send(()).unwrap();
+            c2.wait(&mut g);
+        });
+        drop(g);
+        rx.recv().unwrap();
+        let _g = m.lock();
+        let _guard = PanicGuard(&*c);
+        c.wait(&mut m3.lock());
+    }
+
+    #[test]
+    fn two_mutexes_disjoint() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let m3 = Arc::new(Mutex::new(()));
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+
+        let mut g = m.lock();
+        let _t = thread::spawn(move || {
+            let _g = m2.lock();
+            c2.notify_one();
+        });
+        c.wait(&mut g);
+        drop(g);
+
+        let _ = c.wait_for(&mut m3.lock(), Duration::from_millis(1));
+    }
+
+    #[test]
+    fn test_debug_condvar() {
+        let c = Condvar::new();
+        assert_eq!(format!("{:?}", c), "Condvar { .. }");
+    }
+
+    #[test]
+    fn test_condvar_requeue() {
+        let m = Arc::new(Mutex::new(()));
+        let m2 = m.clone();
+        let c = Arc::new(Condvar::new());
+        let c2 = c.clone();
+        let t = thread::spawn(move || {
+            let mut g = m2.lock();
+            c2.wait(&mut g);
+        });
+
+        let mut g = m.lock();
+        while !c.notify_one() {
+            // Wait for the thread to get into wait()
+            MutexGuard::bump(&mut g);
+        }
+        // The thread should have been requeued to the mutex, which we wake up now.
+        drop(g);
+        t.join().unwrap();
+    }
+
+    #[test]
+    fn test_issue_129() {
+        let locks = Arc::new((Mutex::new(()), Condvar::new()));
+
+        let (tx, rx) = channel();
+        for _ in 0..4 {
+            let locks = locks.clone();
+            let tx = tx.clone();
+            thread::spawn(move || {
+                let mut guard = locks.0.lock();
+                locks.1.wait(&mut guard);
+                locks.1.wait_for(&mut guard, Duration::from_millis(1));
+                locks.1.notify_one();
+                tx.send(()).unwrap();
+            });
+        }
+
+        thread::sleep(Duration::from_millis(100));
+        locks.1.notify_one();
+
+        for _ in 0..4 {
+            assert_eq!(rx.recv_timeout(Duration::from_millis(500)), Ok(()));
+        }
+    }
+}
+
+/// This module contains an integration test that is heavily inspired from WebKit's own integration
+/// tests for it's own Condvar.
+#[cfg(test)]
+mod webkit_queue_test {
+    use crate::{Condvar, Mutex, MutexGuard};
+    use std::{collections::VecDeque, sync::Arc, thread, time::Duration};
+
+    #[derive(Clone, Copy)]
+    enum Timeout {
+        Bounded(Duration),
+        Forever,
+    }
+
+    #[derive(Clone, Copy)]
+    enum NotifyStyle {
+        One,
+        All,
+    }
+
+    struct Queue {
+        items: VecDeque<usize>,
+        should_continue: bool,
+    }
+
+    impl Queue {
+        fn new() -> Self {
+            Self {
+                items: VecDeque::new(),
+                should_continue: true,
+            }
+        }
+    }
+
+    fn wait<T: ?Sized>(
+        condition: &Condvar,
+        lock: &mut MutexGuard<'_, T>,
+        predicate: impl Fn(&mut MutexGuard<'_, T>) -> bool,
+        timeout: &Timeout,
+    ) {
+        while !predicate(lock) {
+            match timeout {
+                Timeout::Forever => condition.wait(lock),
+                Timeout::Bounded(bound) => {
+                    condition.wait_for(lock, *bound);
+                }
+            }
+        }
+    }
+
+    fn notify(style: NotifyStyle, condition: &Condvar, should_notify: bool) {
+        match style {
+            NotifyStyle::One => {
+                condition.notify_one();
+            }
+            NotifyStyle::All => {
+                if should_notify {
+                    condition.notify_all();
+                }
+            }
+        }
+    }
+
+    fn run_queue_test(
+        num_producers: usize,
+        num_consumers: usize,
+        max_queue_size: usize,
+        messages_per_producer: usize,
+        notify_style: NotifyStyle,
+        timeout: Timeout,
+        delay: Duration,
+    ) {
+        let input_queue = Arc::new(Mutex::new(Queue::new()));
+        let empty_condition = Arc::new(Condvar::new());
+        let full_condition = Arc::new(Condvar::new());
+
+        let output_vec = Arc::new(Mutex::new(vec![]));
+
+        let consumers = (0..num_consumers)
+            .map(|_| {
+                consumer_thread(
+                    input_queue.clone(),
+                    empty_condition.clone(),
+                    full_condition.clone(),
+                    timeout,
+                    notify_style,
+                    output_vec.clone(),
+                    max_queue_size,
+                )
+            })
+            .collect::<Vec<_>>();
+        let producers = (0..num_producers)
+            .map(|_| {
+                producer_thread(
+                    messages_per_producer,
+                    input_queue.clone(),
+                    empty_condition.clone(),
+                    full_condition.clone(),
+                    timeout,
+                    notify_style,
+                    max_queue_size,
+                )
+            })
+            .collect::<Vec<_>>();
+
+        thread::sleep(delay);
+
+        for producer in producers.into_iter() {
+            producer.join().expect("Producer thread panicked");
+        }
+
+        {
+            let mut input_queue = input_queue.lock();
+            input_queue.should_continue = false;
+        }
+        empty_condition.notify_all();
+
+        for consumer in consumers.into_iter() {
+            consumer.join().expect("Consumer thread panicked");
+        }
+
+        let mut output_vec = output_vec.lock();
+        assert_eq!(output_vec.len(), num_producers * messages_per_producer);
+        output_vec.sort();
+        for msg_idx in 0..messages_per_producer {
+            for producer_idx in 0..num_producers {
+                assert_eq!(msg_idx, output_vec[msg_idx * num_producers + producer_idx]);
+            }
+        }
+    }
+
+    fn consumer_thread(
+        input_queue: Arc<Mutex<Queue>>,
+        empty_condition: Arc<Condvar>,
+        full_condition: Arc<Condvar>,
+        timeout: Timeout,
+        notify_style: NotifyStyle,
+        output_queue: Arc<Mutex<Vec<usize>>>,
+        max_queue_size: usize,
+    ) -> thread::JoinHandle<()> {
+        thread::spawn(move || loop {
+            let (should_notify, result) = {
+                let mut queue = input_queue.lock();
+                wait(
+                    &*empty_condition,
+                    &mut queue,
+                    |state| -> bool { !state.items.is_empty() || !state.should_continue },
+                    &timeout,
+                );
+                if queue.items.is_empty() && !queue.should_continue {
+                    return;
+                }
+                let should_notify = queue.items.len() == max_queue_size;
+                let result = queue.items.pop_front();
+                std::mem::drop(queue);
+                (should_notify, result)
+            };
+            notify(notify_style, &*full_condition, should_notify);
+
+            if let Some(result) = result {
+                output_queue.lock().push(result);
+            }
+        })
+    }
+
+    fn producer_thread(
+        num_messages: usize,
+        queue: Arc<Mutex<Queue>>,
+        empty_condition: Arc<Condvar>,
+        full_condition: Arc<Condvar>,
+        timeout: Timeout,
+        notify_style: NotifyStyle,
+        max_queue_size: usize,
+    ) -> thread::JoinHandle<()> {
+        thread::spawn(move || {
+            for message in 0..num_messages {
+                let should_notify = {
+                    let mut queue = queue.lock();
+                    wait(
+                        &*full_condition,
+                        &mut queue,
+                        |state| state.items.len() < max_queue_size,
+                        &timeout,
+                    );
+                    let should_notify = queue.items.is_empty();
+                    queue.items.push_back(message);
+                    std::mem::drop(queue);
+                    should_notify
+                };
+                notify(notify_style, &*empty_condition, should_notify);
+            }
+        })
+    }
+
+    macro_rules! run_queue_tests {
+        ( $( $name:ident(
+            num_producers: $num_producers:expr,
+            num_consumers: $num_consumers:expr,
+            max_queue_size: $max_queue_size:expr,
+            messages_per_producer: $messages_per_producer:expr,
+            notification_style: $notification_style:expr,
+            timeout: $timeout:expr,
+            delay_seconds: $delay_seconds:expr);
+        )* ) => {
+            $(#[test]
+            fn $name() {
+                let delay = Duration::from_secs($delay_seconds);
+                run_queue_test(
+                    $num_producers,
+                    $num_consumers,
+                    $max_queue_size,
+                    $messages_per_producer,
+                    $notification_style,
+                    $timeout,
+                    delay,
+                    );
+            })*
+        };
+    }
+
+    run_queue_tests! {
+        sanity_check_queue(
+            num_producers: 1,
+            num_consumers: 1,
+            max_queue_size: 1,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Bounded(Duration::from_secs(1)),
+            delay_seconds: 0
+        );
+        sanity_check_queue_timeout(
+            num_producers: 1,
+            num_consumers: 1,
+            max_queue_size: 1,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        new_test_without_timeout_5(
+            num_producers: 1,
+            num_consumers: 5,
+            max_queue_size: 1,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        one_producer_one_consumer_one_slot(
+            num_producers: 1,
+            num_consumers: 1,
+            max_queue_size: 1,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        one_producer_one_consumer_one_slot_timeout(
+            num_producers: 1,
+            num_consumers: 1,
+            max_queue_size: 1,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 1
+        );
+        one_producer_one_consumer_hundred_slots(
+            num_producers: 1,
+            num_consumers: 1,
+            max_queue_size: 100,
+            messages_per_producer: 1_000_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_one_consumer_one_slot(
+            num_producers: 10,
+            num_consumers: 1,
+            max_queue_size: 1,
+            messages_per_producer: 10000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_one_consumer_hundred_slots_notify_all(
+            num_producers: 10,
+            num_consumers: 1,
+            max_queue_size: 100,
+            messages_per_producer: 10000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_one_consumer_hundred_slots_notify_one(
+            num_producers: 10,
+            num_consumers: 1,
+            max_queue_size: 100,
+            messages_per_producer: 10000,
+            notification_style: NotifyStyle::One,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        one_producer_ten_consumers_one_slot(
+            num_producers: 1,
+            num_consumers: 10,
+            max_queue_size: 1,
+            messages_per_producer: 10000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        one_producer_ten_consumers_hundred_slots_notify_all(
+            num_producers: 1,
+            num_consumers: 10,
+            max_queue_size: 100,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        one_producer_ten_consumers_hundred_slots_notify_one(
+            num_producers: 1,
+            num_consumers: 10,
+            max_queue_size: 100,
+            messages_per_producer: 100_000,
+            notification_style: NotifyStyle::One,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_ten_consumers_one_slot(
+            num_producers: 10,
+            num_consumers: 10,
+            max_queue_size: 1,
+            messages_per_producer: 50000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_ten_consumers_hundred_slots_notify_all(
+            num_producers: 10,
+            num_consumers: 10,
+            max_queue_size: 100,
+            messages_per_producer: 50000,
+            notification_style: NotifyStyle::All,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+        ten_producers_ten_consumers_hundred_slots_notify_one(
+            num_producers: 10,
+            num_consumers: 10,
+            max_queue_size: 100,
+            messages_per_producer: 50000,
+            notification_style: NotifyStyle::One,
+            timeout: Timeout::Forever,
+            delay_seconds: 0
+        );
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/deadlock.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/deadlock.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/deadlock.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/deadlock.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,232 @@
+//! \[Experimental\] Deadlock detection
+//!
+//! This feature is optional and can be enabled via the `deadlock_detection` feature flag.
+//!
+//! # Example
+//!
+//! ```
+//! #[cfg(feature = "deadlock_detection")]
+//! { // only for #[cfg]
+//! use std::thread;
+//! use std::time::Duration;
+//! use parking_lot::deadlock;
+//!
+//! // Create a background thread which checks for deadlocks every 10s
+//! thread::spawn(move || {
+//!     loop {
+//!         thread::sleep(Duration::from_secs(10));
+//!         let deadlocks = deadlock::check_deadlock();
+//!         if deadlocks.is_empty() {
+//!             continue;
+//!         }
+//!
+//!         println!("{} deadlocks detected", deadlocks.len());
+//!         for (i, threads) in deadlocks.iter().enumerate() {
+//!             println!("Deadlock #{}", i);
+//!             for t in threads {
+//!                 println!("Thread Id {:#?}", t.thread_id());
+//!                 println!("{:#?}", t.backtrace());
+//!             }
+//!         }
+//!     }
+//! });
+//! } // only for #[cfg]
+//! ```
+
+#[cfg(feature = "deadlock_detection")]
+pub use parking_lot_core::deadlock::check_deadlock;
+pub(crate) use parking_lot_core::deadlock::{acquire_resource, release_resource};
+
+#[cfg(test)]
+#[cfg(feature = "deadlock_detection")]
+mod tests {
+    use crate::{Mutex, ReentrantMutex, RwLock};
+    use std::sync::{Arc, Barrier};
+    use std::thread::{self, sleep};
+    use std::time::Duration;
+
+    // We need to serialize these tests since deadlock detection uses global state
+    static DEADLOCK_DETECTION_LOCK: Mutex<()> = crate::const_mutex(());
+
+    fn check_deadlock() -> bool {
+        use parking_lot_core::deadlock::check_deadlock;
+        !check_deadlock().is_empty()
+    }
+
+    #[test]
+    fn test_mutex_deadlock() {
+        let _guard = DEADLOCK_DETECTION_LOCK.lock();
+
+        let m1: Arc<Mutex<()>> = Default::default();
+        let m2: Arc<Mutex<()>> = Default::default();
+        let m3: Arc<Mutex<()>> = Default::default();
+        let b = Arc::new(Barrier::new(4));
+
+        let m1_ = m1.clone();
+        let m2_ = m2.clone();
+        let m3_ = m3.clone();
+        let b1 = b.clone();
+        let b2 = b.clone();
+        let b3 = b.clone();
+
+        assert!(!check_deadlock());
+
+        let _t1 = thread::spawn(move || {
+            let _g = m1.lock();
+            b1.wait();
+            let _ = m2_.lock();
+        });
+
+        let _t2 = thread::spawn(move || {
+            let _g = m2.lock();
+            b2.wait();
+            let _ = m3_.lock();
+        });
+
+        let _t3 = thread::spawn(move || {
+            let _g = m3.lock();
+            b3.wait();
+            let _ = m1_.lock();
+        });
+
+        assert!(!check_deadlock());
+
+        b.wait();
+        sleep(Duration::from_millis(50));
+        assert!(check_deadlock());
+
+        assert!(!check_deadlock());
+    }
+
+    #[test]
+    fn test_mutex_deadlock_reentrant() {
+        let _guard = DEADLOCK_DETECTION_LOCK.lock();
+
+        let m1: Arc<Mutex<()>> = Default::default();
+
+        assert!(!check_deadlock());
+
+        let _t1 = thread::spawn(move || {
+            let _g = m1.lock();
+            let _ = m1.lock();
+        });
+
+        sleep(Duration::from_millis(50));
+        assert!(check_deadlock());
+
+        assert!(!check_deadlock());
+    }
+
+    #[test]
+    fn test_remutex_deadlock() {
+        let _guard = DEADLOCK_DETECTION_LOCK.lock();
+
+        let m1: Arc<ReentrantMutex<()>> = Default::default();
+        let m2: Arc<ReentrantMutex<()>> = Default::default();
+        let m3: Arc<ReentrantMutex<()>> = Default::default();
+        let b = Arc::new(Barrier::new(4));
+
+        let m1_ = m1.clone();
+        let m2_ = m2.clone();
+        let m3_ = m3.clone();
+        let b1 = b.clone();
+        let b2 = b.clone();
+        let b3 = b.clone();
+
+        assert!(!check_deadlock());
+
+        let _t1 = thread::spawn(move || {
+            let _g = m1.lock();
+            let _g = m1.lock();
+            b1.wait();
+            let _ = m2_.lock();
+        });
+
+        let _t2 = thread::spawn(move || {
+            let _g = m2.lock();
+            let _g = m2.lock();
+            b2.wait();
+            let _ = m3_.lock();
+        });
+
+        let _t3 = thread::spawn(move || {
+            let _g = m3.lock();
+            let _g = m3.lock();
+            b3.wait();
+            let _ = m1_.lock();
+        });
+
+        assert!(!check_deadlock());
+
+        b.wait();
+        sleep(Duration::from_millis(50));
+        assert!(check_deadlock());
+
+        assert!(!check_deadlock());
+    }
+
+    #[test]
+    fn test_rwlock_deadlock() {
+        let _guard = DEADLOCK_DETECTION_LOCK.lock();
+
+        let m1: Arc<RwLock<()>> = Default::default();
+        let m2: Arc<RwLock<()>> = Default::default();
+        let m3: Arc<RwLock<()>> = Default::default();
+        let b = Arc::new(Barrier::new(4));
+
+        let m1_ = m1.clone();
+        let m2_ = m2.clone();
+        let m3_ = m3.clone();
+        let b1 = b.clone();
+        let b2 = b.clone();
+        let b3 = b.clone();
+
+        assert!(!check_deadlock());
+
+        let _t1 = thread::spawn(move || {
+            let _g = m1.read();
+            b1.wait();
+            let _g = m2_.write();
+        });
+
+        let _t2 = thread::spawn(move || {
+            let _g = m2.read();
+            b2.wait();
+            let _g = m3_.write();
+        });
+
+        let _t3 = thread::spawn(move || {
+            let _g = m3.read();
+            b3.wait();
+            let _ = m1_.write();
+        });
+
+        assert!(!check_deadlock());
+
+        b.wait();
+        sleep(Duration::from_millis(50));
+        assert!(check_deadlock());
+
+        assert!(!check_deadlock());
+    }
+
+    #[cfg(rwlock_deadlock_detection_not_supported)]
+    #[test]
+    fn test_rwlock_deadlock_reentrant() {
+        let _guard = DEADLOCK_DETECTION_LOCK.lock();
+
+        let m1: Arc<RwLock<()>> = Default::default();
+
+        assert!(!check_deadlock());
+
+        let _t1 = thread::spawn(move || {
+            let _g = m1.read();
+            let _ = m1.write();
+        });
+
+        sleep(Duration::from_millis(50));
+        assert!(check_deadlock());
+
+        assert!(!check_deadlock());
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/elision.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/elision.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/elision.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/elision.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,116 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use std::sync::atomic::AtomicUsize;
+
+// Extension trait to add lock elision primitives to atomic types
+pub trait AtomicElisionExt {
+    type IntType;
+
+    // Perform a compare_exchange and start a transaction
+    fn elision_compare_exchange_acquire(
+        &self,
+        current: Self::IntType,
+        new: Self::IntType,
+    ) -> Result<Self::IntType, Self::IntType>;
+
+    // Perform a fetch_sub and end a transaction
+    fn elision_fetch_sub_release(&self, val: Self::IntType) -> Self::IntType;
+}
+
+// Indicates whether the target architecture supports lock elision
+#[inline]
+pub fn have_elision() -> bool {
+    cfg!(all(
+        feature = "nightly",
+        any(target_arch = "x86", target_arch = "x86_64"),
+    ))
+}
+
+// This implementation is never actually called because it is guarded by
+// have_elision().
+#[cfg(not(all(feature = "nightly", any(target_arch = "x86", target_arch = "x86_64"))))]
+impl AtomicElisionExt for AtomicUsize {
+    type IntType = usize;
+
+    #[inline]
+    fn elision_compare_exchange_acquire(&self, _: usize, _: usize) -> Result<usize, usize> {
+        unreachable!();
+    }
+
+    #[inline]
+    fn elision_fetch_sub_release(&self, _: usize) -> usize {
+        unreachable!();
+    }
+}
+
+#[cfg(all(feature = "nightly", any(target_arch = "x86", target_arch = "x86_64")))]
+impl AtomicElisionExt for AtomicUsize {
+    type IntType = usize;
+
+    #[cfg(target_pointer_width = "32")]
+    #[inline]
+    fn elision_compare_exchange_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
+        unsafe {
+            let prev: usize;
+            llvm_asm!("xacquire; lock; cmpxchgl $2, $1"
+                      : "={eax}" (prev), "+*m" (self)
+                      : "r" (new), "{eax}" (current)
+                      : "memory"
+                      : "volatile");
+            if prev == current {
+                Ok(prev)
+            } else {
+                Err(prev)
+            }
+        }
+    }
+    #[cfg(target_pointer_width = "64")]
+    #[inline]
+    fn elision_compare_exchange_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
+        unsafe {
+            let prev: usize;
+            llvm_asm!("xacquire; lock; cmpxchgq $2, $1"
+                      : "={rax}" (prev), "+*m" (self)
+                      : "r" (new), "{rax}" (current)
+                      : "memory"
+                      : "volatile");
+            if prev == current {
+                Ok(prev)
+            } else {
+                Err(prev)
+            }
+        }
+    }
+
+    #[cfg(target_pointer_width = "32")]
+    #[inline]
+    fn elision_fetch_sub_release(&self, val: usize) -> usize {
+        unsafe {
+            let prev: usize;
+            llvm_asm!("xrelease; lock; xaddl $2, $1"
+                      : "=r" (prev), "+*m" (self)
+                      : "0" (val.wrapping_neg())
+                      : "memory"
+                      : "volatile");
+            prev
+        }
+    }
+    #[cfg(target_pointer_width = "64")]
+    #[inline]
+    fn elision_fetch_sub_release(&self, val: usize) -> usize {
+        unsafe {
+            let prev: usize;
+            llvm_asm!("xrelease; lock; xaddq $2, $1"
+                      : "=r" (prev), "+*m" (self)
+                      : "0" (val.wrapping_neg())
+                      : "memory"
+                      : "volatile");
+            prev
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/fair_mutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/fair_mutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/fair_mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/fair_mutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,278 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::raw_fair_mutex::RawFairMutex;
+use lock_api;
+
+/// A mutual exclusive primitive that is always fair, useful for protecting shared data
+///
+/// This mutex will block threads waiting for the lock to become available. The
+/// mutex can also be statically initialized or created via a `new`
+/// constructor. Each mutex has a type parameter which represents the data that
+/// it is protecting. The data can only be accessed through the RAII guards
+/// returned from `lock` and `try_lock`, which guarantees that the data is only
+/// ever accessed when the mutex is locked.
+///
+/// The regular mutex provided by `parking_lot` uses eventual locking fairness
+/// (after some time it will default to the fair algorithm), but eventual
+/// fairness does not provide the same garantees a always fair method would.
+/// Fair mutexes are generally slower, but sometimes needed. This wrapper was
+/// created to avoid using a unfair protocol when it's forbidden by mistake.
+///
+/// In a fair mutex the lock is provided to whichever thread asked first,
+/// they form a queue and always follow the first-in first-out order. This
+/// means some thread in the queue won't be able to steal the lock and use it fast
+/// to increase throughput, at the cost of latency. Since the response time will grow
+/// for some threads that are waiting for the lock and losing to faster but later ones,
+/// but it may make sending more responses possible.
+///
+/// A fair mutex may not be interesting if threads have different priorities (this is known as
+/// priority inversion).
+///
+/// # Differences from the standard library `Mutex`
+///
+/// - No poisoning, the lock is released normally on panic.
+/// - Only requires 1 byte of space, whereas the standard library boxes the
+///   `FairMutex` due to platform limitations.
+/// - Can be statically constructed (requires the `const_fn` nightly feature).
+/// - Does not require any drop glue when dropped.
+/// - Inline fast path for the uncontended case.
+/// - Efficient handling of micro-contention using adaptive spinning.
+/// - Allows raw locking & unlocking without a guard.
+///
+/// # Examples
+///
+/// ```
+/// use parking_lot::FairMutex;
+/// use std::sync::{Arc, mpsc::channel};
+/// use std::thread;
+///
+/// const N: usize = 10;
+///
+/// // Spawn a few threads to increment a shared variable (non-atomically), and
+/// // let the main thread know once all increments are done.
+/// //
+/// // Here we're using an Arc to share memory among threads, and the data inside
+/// // the Arc is protected with a mutex.
+/// let data = Arc::new(FairMutex::new(0));
+///
+/// let (tx, rx) = channel();
+/// for _ in 0..10 {
+///     let (data, tx) = (Arc::clone(&data), tx.clone());
+///     thread::spawn(move || {
+///         // The shared state can only be accessed once the lock is held.
+///         // Our non-atomic increment is safe because we're the only thread
+///         // which can access the shared state when the lock is held.
+///         let mut data = data.lock();
+///         *data += 1;
+///         if *data == N {
+///             tx.send(()).unwrap();
+///         }
+///         // the lock is unlocked here when `data` goes out of scope.
+///     });
+/// }
+///
+/// rx.recv().unwrap();
+/// ```
+pub type FairMutex<T> = lock_api::Mutex<RawFairMutex, T>;
+
+/// Creates a new fair mutex in an unlocked state ready for use.
+///
+/// This allows creating a fair mutex in a constant context on stable Rust.
+pub const fn const_fair_mutex<T>(val: T) -> FairMutex<T> {
+    FairMutex::const_new(<RawFairMutex as lock_api::RawMutex>::INIT, val)
+}
+
+/// An RAII implementation of a "scoped lock" of a mutex. When this structure is
+/// dropped (falls out of scope), the lock will be unlocked.
+///
+/// The data protected by the mutex can be accessed through this guard via its
+/// `Deref` and `DerefMut` implementations.
+pub type FairMutexGuard<'a, T> = lock_api::MutexGuard<'a, RawFairMutex, T>;
+
+/// An RAII mutex guard returned by `FairMutexGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedFairMutexGuard` and `FairMutexGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+pub type MappedFairMutexGuard<'a, T> = lock_api::MappedMutexGuard<'a, RawFairMutex, T>;
+
+#[cfg(test)]
+mod tests {
+    use crate::FairMutex;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::mpsc::channel;
+    use std::sync::Arc;
+    use std::thread;
+
+    #[cfg(feature = "serde")]
+    use bincode::{deserialize, serialize};
+
+    #[derive(Eq, PartialEq, Debug)]
+    struct NonCopy(i32);
+
+    #[test]
+    fn smoke() {
+        let m = FairMutex::new(());
+        drop(m.lock());
+        drop(m.lock());
+    }
+
+    #[test]
+    fn lots_and_lots() {
+        const J: u32 = 1000;
+        const K: u32 = 3;
+
+        let m = Arc::new(FairMutex::new(0));
+
+        fn inc(m: &FairMutex<u32>) {
+            for _ in 0..J {
+                *m.lock() += 1;
+            }
+        }
+
+        let (tx, rx) = channel();
+        for _ in 0..K {
+            let tx2 = tx.clone();
+            let m2 = m.clone();
+            thread::spawn(move || {
+                inc(&m2);
+                tx2.send(()).unwrap();
+            });
+            let tx2 = tx.clone();
+            let m2 = m.clone();
+            thread::spawn(move || {
+                inc(&m2);
+                tx2.send(()).unwrap();
+            });
+        }
+
+        drop(tx);
+        for _ in 0..2 * K {
+            rx.recv().unwrap();
+        }
+        assert_eq!(*m.lock(), J * K * 2);
+    }
+
+    #[test]
+    fn try_lock() {
+        let m = FairMutex::new(());
+        *m.try_lock().unwrap() = ();
+    }
+
+    #[test]
+    fn test_into_inner() {
+        let m = FairMutex::new(NonCopy(10));
+        assert_eq!(m.into_inner(), NonCopy(10));
+    }
+
+    #[test]
+    fn test_into_inner_drop() {
+        struct Foo(Arc<AtomicUsize>);
+        impl Drop for Foo {
+            fn drop(&mut self) {
+                self.0.fetch_add(1, Ordering::SeqCst);
+            }
+        }
+        let num_drops = Arc::new(AtomicUsize::new(0));
+        let m = FairMutex::new(Foo(num_drops.clone()));
+        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        {
+            let _inner = m.into_inner();
+            assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        }
+        assert_eq!(num_drops.load(Ordering::SeqCst), 1);
+    }
+
+    #[test]
+    fn test_get_mut() {
+        let mut m = FairMutex::new(NonCopy(10));
+        *m.get_mut() = NonCopy(20);
+        assert_eq!(m.into_inner(), NonCopy(20));
+    }
+
+    #[test]
+    fn test_mutex_arc_nested() {
+        // Tests nested mutexes and access
+        // to underlying data.
+        let arc = Arc::new(FairMutex::new(1));
+        let arc2 = Arc::new(FairMutex::new(arc));
+        let (tx, rx) = channel();
+        let _t = thread::spawn(move || {
+            let lock = arc2.lock();
+            let lock2 = lock.lock();
+            assert_eq!(*lock2, 1);
+            tx.send(()).unwrap();
+        });
+        rx.recv().unwrap();
+    }
+
+    #[test]
+    fn test_mutex_arc_access_in_unwind() {
+        let arc = Arc::new(FairMutex::new(1));
+        let arc2 = arc.clone();
+        let _ = thread::spawn(move || {
+            struct Unwinder {
+                i: Arc<FairMutex<i32>>,
+            }
+            impl Drop for Unwinder {
+                fn drop(&mut self) {
+                    *self.i.lock() += 1;
+                }
+            }
+            let _u = Unwinder { i: arc2 };
+            panic!();
+        })
+        .join();
+        let lock = arc.lock();
+        assert_eq!(*lock, 2);
+    }
+
+    #[test]
+    fn test_mutex_unsized() {
+        let mutex: &FairMutex<[i32]> = &FairMutex::new([1, 2, 3]);
+        {
+            let b = &mut *mutex.lock();
+            b[0] = 4;
+            b[2] = 5;
+        }
+        let comp: &[i32] = &[4, 2, 5];
+        assert_eq!(&*mutex.lock(), comp);
+    }
+
+    #[test]
+    fn test_mutexguard_sync() {
+        fn sync<T: Sync>(_: T) {}
+
+        let mutex = FairMutex::new(());
+        sync(mutex.lock());
+    }
+
+    #[test]
+    fn test_mutex_debug() {
+        let mutex = FairMutex::new(vec![0u8, 10]);
+
+        assert_eq!(format!("{:?}", mutex), "Mutex { data: [0, 10] }");
+        let _lock = mutex.lock();
+        assert_eq!(format!("{:?}", mutex), "Mutex { data: <locked> }");
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde() {
+        let contents: Vec<u8> = vec![0, 1, 2];
+        let mutex = FairMutex::new(contents.clone());
+
+        let serialized = serialize(&mutex).unwrap();
+        let deserialized: FairMutex<Vec<u8>> = deserialize(&serialized).unwrap();
+
+        assert_eq!(*(mutex.lock()), *(deserialized.lock()));
+        assert_eq!(contents, *(deserialized.lock()));
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,48 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! This library provides implementations of `Mutex`, `RwLock`, `Condvar` and
+//! `Once` that are smaller, faster and more flexible than those in the Rust
+//! standard library. It also provides a `ReentrantMutex` type.
+
+#![warn(missing_docs)]
+#![warn(rust_2018_idioms)]
+#![cfg_attr(feature = "nightly", feature(llvm_asm))]
+
+mod condvar;
+mod elision;
+mod fair_mutex;
+mod mutex;
+mod once;
+mod raw_fair_mutex;
+mod raw_mutex;
+mod raw_rwlock;
+mod remutex;
+mod rwlock;
+mod util;
+
+#[cfg(feature = "deadlock_detection")]
+pub mod deadlock;
+#[cfg(not(feature = "deadlock_detection"))]
+mod deadlock;
+
+pub use self::condvar::{Condvar, WaitTimeoutResult};
+pub use self::fair_mutex::{const_fair_mutex, FairMutex, FairMutexGuard, MappedFairMutexGuard};
+pub use self::mutex::{const_mutex, MappedMutexGuard, Mutex, MutexGuard};
+pub use self::once::{Once, OnceState};
+pub use self::raw_fair_mutex::RawFairMutex;
+pub use self::raw_mutex::RawMutex;
+pub use self::raw_rwlock::RawRwLock;
+pub use self::remutex::{
+    const_reentrant_mutex, MappedReentrantMutexGuard, RawThreadId, ReentrantMutex,
+    ReentrantMutexGuard,
+};
+pub use self::rwlock::{
+    const_rwlock, MappedRwLockReadGuard, MappedRwLockWriteGuard, RwLock, RwLockReadGuard,
+    RwLockUpgradableReadGuard, RwLockWriteGuard,
+};
+pub use ::lock_api;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/mutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/mutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/mutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,312 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::raw_mutex::RawMutex;
+use lock_api;
+
+/// A mutual exclusion primitive useful for protecting shared data
+///
+/// This mutex will block threads waiting for the lock to become available. The
+/// mutex can also be statically initialized or created via a `new`
+/// constructor. Each mutex has a type parameter which represents the data that
+/// it is protecting. The data can only be accessed through the RAII guards
+/// returned from `lock` and `try_lock`, which guarantees that the data is only
+/// ever accessed when the mutex is locked.
+///
+/// # Fairness
+///
+/// A typical unfair lock can often end up in a situation where a single thread
+/// quickly acquires and releases the same mutex in succession, which can starve
+/// other threads waiting to acquire the mutex. While this improves performance
+/// because it doesn't force a context switch when a thread tries to re-acquire
+/// a mutex it has just released, this can starve other threads.
+///
+/// This mutex uses [eventual fairness](https://trac.webkit.org/changeset/203350)
+/// to ensure that the lock will be fair on average without sacrificing
+/// performance. This is done by forcing a fair unlock on average every 0.5ms,
+/// which will force the lock to go to the next thread waiting for the mutex.
+///
+/// Additionally, any critical section longer than 1ms will always use a fair
+/// unlock, which has a negligible performance impact compared to the length of
+/// the critical section.
+///
+/// You can also force a fair unlock by calling `MutexGuard::unlock_fair` when
+/// unlocking a mutex instead of simply dropping the `MutexGuard`.
+///
+/// # Differences from the standard library `Mutex`
+///
+/// - No poisoning, the lock is released normally on panic.
+/// - Only requires 1 byte of space, whereas the standard library boxes the
+///   `Mutex` due to platform limitations.
+/// - Can be statically constructed (requires the `const_fn` nightly feature).
+/// - Does not require any drop glue when dropped.
+/// - Inline fast path for the uncontended case.
+/// - Efficient handling of micro-contention using adaptive spinning.
+/// - Allows raw locking & unlocking without a guard.
+/// - Supports eventual fairness so that the mutex is fair on average.
+/// - Optionally allows making the mutex fair by calling `MutexGuard::unlock_fair`.
+///
+/// # Examples
+///
+/// ```
+/// use parking_lot::Mutex;
+/// use std::sync::{Arc, mpsc::channel};
+/// use std::thread;
+///
+/// const N: usize = 10;
+///
+/// // Spawn a few threads to increment a shared variable (non-atomically), and
+/// // let the main thread know once all increments are done.
+/// //
+/// // Here we're using an Arc to share memory among threads, and the data inside
+/// // the Arc is protected with a mutex.
+/// let data = Arc::new(Mutex::new(0));
+///
+/// let (tx, rx) = channel();
+/// for _ in 0..10 {
+///     let (data, tx) = (Arc::clone(&data), tx.clone());
+///     thread::spawn(move || {
+///         // The shared state can only be accessed once the lock is held.
+///         // Our non-atomic increment is safe because we're the only thread
+///         // which can access the shared state when the lock is held.
+///         let mut data = data.lock();
+///         *data += 1;
+///         if *data == N {
+///             tx.send(()).unwrap();
+///         }
+///         // the lock is unlocked here when `data` goes out of scope.
+///     });
+/// }
+///
+/// rx.recv().unwrap();
+/// ```
+pub type Mutex<T> = lock_api::Mutex<RawMutex, T>;
+
+/// Creates a new mutex in an unlocked state ready for use.
+///
+/// This allows creating a mutex in a constant context on stable Rust.
+pub const fn const_mutex<T>(val: T) -> Mutex<T> {
+    Mutex::const_new(<RawMutex as lock_api::RawMutex>::INIT, val)
+}
+
+/// An RAII implementation of a "scoped lock" of a mutex. When this structure is
+/// dropped (falls out of scope), the lock will be unlocked.
+///
+/// The data protected by the mutex can be accessed through this guard via its
+/// `Deref` and `DerefMut` implementations.
+pub type MutexGuard<'a, T> = lock_api::MutexGuard<'a, RawMutex, T>;
+
+/// An RAII mutex guard returned by `MutexGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedMutexGuard` and `MutexGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+pub type MappedMutexGuard<'a, T> = lock_api::MappedMutexGuard<'a, RawMutex, T>;
+
+#[cfg(test)]
+mod tests {
+    use crate::{Condvar, Mutex};
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::mpsc::channel;
+    use std::sync::Arc;
+    use std::thread;
+
+    #[cfg(feature = "serde")]
+    use bincode::{deserialize, serialize};
+
+    struct Packet<T>(Arc<(Mutex<T>, Condvar)>);
+
+    #[derive(Eq, PartialEq, Debug)]
+    struct NonCopy(i32);
+
+    unsafe impl<T: Send> Send for Packet<T> {}
+    unsafe impl<T> Sync for Packet<T> {}
+
+    #[test]
+    fn smoke() {
+        let m = Mutex::new(());
+        drop(m.lock());
+        drop(m.lock());
+    }
+
+    #[test]
+    fn lots_and_lots() {
+        const J: u32 = 1000;
+        const K: u32 = 3;
+
+        let m = Arc::new(Mutex::new(0));
+
+        fn inc(m: &Mutex<u32>) {
+            for _ in 0..J {
+                *m.lock() += 1;
+            }
+        }
+
+        let (tx, rx) = channel();
+        for _ in 0..K {
+            let tx2 = tx.clone();
+            let m2 = m.clone();
+            thread::spawn(move || {
+                inc(&m2);
+                tx2.send(()).unwrap();
+            });
+            let tx2 = tx.clone();
+            let m2 = m.clone();
+            thread::spawn(move || {
+                inc(&m2);
+                tx2.send(()).unwrap();
+            });
+        }
+
+        drop(tx);
+        for _ in 0..2 * K {
+            rx.recv().unwrap();
+        }
+        assert_eq!(*m.lock(), J * K * 2);
+    }
+
+    #[test]
+    fn try_lock() {
+        let m = Mutex::new(());
+        *m.try_lock().unwrap() = ();
+    }
+
+    #[test]
+    fn test_into_inner() {
+        let m = Mutex::new(NonCopy(10));
+        assert_eq!(m.into_inner(), NonCopy(10));
+    }
+
+    #[test]
+    fn test_into_inner_drop() {
+        struct Foo(Arc<AtomicUsize>);
+        impl Drop for Foo {
+            fn drop(&mut self) {
+                self.0.fetch_add(1, Ordering::SeqCst);
+            }
+        }
+        let num_drops = Arc::new(AtomicUsize::new(0));
+        let m = Mutex::new(Foo(num_drops.clone()));
+        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        {
+            let _inner = m.into_inner();
+            assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        }
+        assert_eq!(num_drops.load(Ordering::SeqCst), 1);
+    }
+
+    #[test]
+    fn test_get_mut() {
+        let mut m = Mutex::new(NonCopy(10));
+        *m.get_mut() = NonCopy(20);
+        assert_eq!(m.into_inner(), NonCopy(20));
+    }
+
+    #[test]
+    fn test_mutex_arc_condvar() {
+        let packet = Packet(Arc::new((Mutex::new(false), Condvar::new())));
+        let packet2 = Packet(packet.0.clone());
+        let (tx, rx) = channel();
+        let _t = thread::spawn(move || {
+            // wait until parent gets in
+            rx.recv().unwrap();
+            let &(ref lock, ref cvar) = &*packet2.0;
+            let mut lock = lock.lock();
+            *lock = true;
+            cvar.notify_one();
+        });
+
+        let &(ref lock, ref cvar) = &*packet.0;
+        let mut lock = lock.lock();
+        tx.send(()).unwrap();
+        assert!(!*lock);
+        while !*lock {
+            cvar.wait(&mut lock);
+        }
+    }
+
+    #[test]
+    fn test_mutex_arc_nested() {
+        // Tests nested mutexes and access
+        // to underlying data.
+        let arc = Arc::new(Mutex::new(1));
+        let arc2 = Arc::new(Mutex::new(arc));
+        let (tx, rx) = channel();
+        let _t = thread::spawn(move || {
+            let lock = arc2.lock();
+            let lock2 = lock.lock();
+            assert_eq!(*lock2, 1);
+            tx.send(()).unwrap();
+        });
+        rx.recv().unwrap();
+    }
+
+    #[test]
+    fn test_mutex_arc_access_in_unwind() {
+        let arc = Arc::new(Mutex::new(1));
+        let arc2 = arc.clone();
+        let _ = thread::spawn(move || {
+            struct Unwinder {
+                i: Arc<Mutex<i32>>,
+            }
+            impl Drop for Unwinder {
+                fn drop(&mut self) {
+                    *self.i.lock() += 1;
+                }
+            }
+            let _u = Unwinder { i: arc2 };
+            panic!();
+        })
+        .join();
+        let lock = arc.lock();
+        assert_eq!(*lock, 2);
+    }
+
+    #[test]
+    fn test_mutex_unsized() {
+        let mutex: &Mutex<[i32]> = &Mutex::new([1, 2, 3]);
+        {
+            let b = &mut *mutex.lock();
+            b[0] = 4;
+            b[2] = 5;
+        }
+        let comp: &[i32] = &[4, 2, 5];
+        assert_eq!(&*mutex.lock(), comp);
+    }
+
+    #[test]
+    fn test_mutexguard_sync() {
+        fn sync<T: Sync>(_: T) {}
+
+        let mutex = Mutex::new(());
+        sync(mutex.lock());
+    }
+
+    #[test]
+    fn test_mutex_debug() {
+        let mutex = Mutex::new(vec![0u8, 10]);
+
+        assert_eq!(format!("{:?}", mutex), "Mutex { data: [0, 10] }");
+        let _lock = mutex.lock();
+        assert_eq!(format!("{:?}", mutex), "Mutex { data: <locked> }");
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde() {
+        let contents: Vec<u8> = vec![0, 1, 2];
+        let mutex = Mutex::new(contents.clone());
+
+        let serialized = serialize(&mutex).unwrap();
+        let deserialized: Mutex<Vec<u8>> = deserialize(&serialized).unwrap();
+
+        assert_eq!(*(mutex.lock()), *(deserialized.lock()));
+        assert_eq!(contents, *(deserialized.lock()));
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/once.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/once.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/once.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/once.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,458 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::util::UncheckedOptionExt;
+use core::{
+    fmt, mem,
+    sync::atomic::{fence, AtomicU8, Ordering},
+};
+use parking_lot_core::{self, SpinWait, DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN};
+
+const DONE_BIT: u8 = 1;
+const POISON_BIT: u8 = 2;
+const LOCKED_BIT: u8 = 4;
+const PARKED_BIT: u8 = 8;
+
+/// Current state of a `Once`.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum OnceState {
+    /// A closure has not been executed yet
+    New,
+
+    /// A closure was executed but panicked.
+    Poisoned,
+
+    /// A thread is currently executing a closure.
+    InProgress,
+
+    /// A closure has completed successfully.
+    Done,
+}
+
+impl OnceState {
+    /// Returns whether the associated `Once` has been poisoned.
+    ///
+    /// Once an initialization routine for a `Once` has panicked it will forever
+    /// indicate to future forced initialization routines that it is poisoned.
+    #[inline]
+    pub fn poisoned(self) -> bool {
+        match self {
+            OnceState::Poisoned => true,
+            _ => false,
+        }
+    }
+
+    /// Returns whether the associated `Once` has successfully executed a
+    /// closure.
+    #[inline]
+    pub fn done(self) -> bool {
+        match self {
+            OnceState::Done => true,
+            _ => false,
+        }
+    }
+}
+
+/// A synchronization primitive which can be used to run a one-time
+/// initialization. Useful for one-time initialization for globals, FFI or
+/// related functionality.
+///
+/// # Differences from the standard library `Once`
+///
+/// - Only requires 1 byte of space, instead of 1 word.
+/// - Not required to be `'static`.
+/// - Relaxed memory barriers in the fast path, which can significantly improve
+///   performance on some architectures.
+/// - Efficient handling of micro-contention using adaptive spinning.
+///
+/// # Examples
+///
+/// ```
+/// use parking_lot::Once;
+///
+/// static START: Once = Once::new();
+///
+/// START.call_once(|| {
+///     // run initialization here
+/// });
+/// ```
+pub struct Once(AtomicU8);
+
+impl Once {
+    /// Creates a new `Once` value.
+    #[inline]
+    pub const fn new() -> Once {
+        Once(AtomicU8::new(0))
+    }
+
+    /// Returns the current state of this `Once`.
+    #[inline]
+    pub fn state(&self) -> OnceState {
+        let state = self.0.load(Ordering::Acquire);
+        if state & DONE_BIT != 0 {
+            OnceState::Done
+        } else if state & LOCKED_BIT != 0 {
+            OnceState::InProgress
+        } else if state & POISON_BIT != 0 {
+            OnceState::Poisoned
+        } else {
+            OnceState::New
+        }
+    }
+
+    /// Performs an initialization routine once and only once. The given closure
+    /// will be executed if this is the first time `call_once` has been called,
+    /// and otherwise the routine will *not* be invoked.
+    ///
+    /// This method will block the calling thread if another initialization
+    /// routine is currently running.
+    ///
+    /// When this function returns, it is guaranteed that some initialization
+    /// has run and completed (it may not be the closure specified). It is also
+    /// guaranteed that any memory writes performed by the executed closure can
+    /// be reliably observed by other threads at this point (there is a
+    /// happens-before relation between the closure and code executing after the
+    /// return).
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use parking_lot::Once;
+    ///
+    /// static mut VAL: usize = 0;
+    /// static INIT: Once = Once::new();
+    ///
+    /// // Accessing a `static mut` is unsafe much of the time, but if we do so
+    /// // in a synchronized fashion (e.g. write once or read all) then we're
+    /// // good to go!
+    /// //
+    /// // This function will only call `expensive_computation` once, and will
+    /// // otherwise always return the value returned from the first invocation.
+    /// fn get_cached_val() -> usize {
+    ///     unsafe {
+    ///         INIT.call_once(|| {
+    ///             VAL = expensive_computation();
+    ///         });
+    ///         VAL
+    ///     }
+    /// }
+    ///
+    /// fn expensive_computation() -> usize {
+    ///     // ...
+    /// # 2
+    /// }
+    /// ```
+    ///
+    /// # Panics
+    ///
+    /// The closure `f` will only be executed once if this is called
+    /// concurrently amongst many threads. If that closure panics, however, then
+    /// it will *poison* this `Once` instance, causing all future invocations of
+    /// `call_once` to also panic.
+    #[inline]
+    pub fn call_once<F>(&self, f: F)
+    where
+        F: FnOnce(),
+    {
+        if self.0.load(Ordering::Acquire) == DONE_BIT {
+            return;
+        }
+
+        let mut f = Some(f);
+        self.call_once_slow(false, &mut |_| unsafe { f.take().unchecked_unwrap()() });
+    }
+
+    /// Performs the same function as `call_once` except ignores poisoning.
+    ///
+    /// If this `Once` has been poisoned (some initialization panicked) then
+    /// this function will continue to attempt to call initialization functions
+    /// until one of them doesn't panic.
+    ///
+    /// The closure `f` is yielded a structure which can be used to query the
+    /// state of this `Once` (whether initialization has previously panicked or
+    /// not).
+    #[inline]
+    pub fn call_once_force<F>(&self, f: F)
+    where
+        F: FnOnce(OnceState),
+    {
+        if self.0.load(Ordering::Acquire) == DONE_BIT {
+            return;
+        }
+
+        let mut f = Some(f);
+        self.call_once_slow(true, &mut |state| unsafe {
+            f.take().unchecked_unwrap()(state)
+        });
+    }
+
+    // This is a non-generic function to reduce the monomorphization cost of
+    // using `call_once` (this isn't exactly a trivial or small implementation).
+    //
+    // Additionally, this is tagged with `#[cold]` as it should indeed be cold
+    // and it helps let LLVM know that calls to this function should be off the
+    // fast path. Essentially, this should help generate more straight line code
+    // in LLVM.
+    //
+    // Finally, this takes an `FnMut` instead of a `FnOnce` because there's
+    // currently no way to take an `FnOnce` and call it via virtual dispatch
+    // without some allocation overhead.
+    #[cold]
+    fn call_once_slow(&self, ignore_poison: bool, f: &mut dyn FnMut(OnceState)) {
+        let mut spinwait = SpinWait::new();
+        let mut state = self.0.load(Ordering::Relaxed);
+        loop {
+            // If another thread called the closure, we're done
+            if state & DONE_BIT != 0 {
+                // An acquire fence is needed here since we didn't load the
+                // state with Ordering::Acquire.
+                fence(Ordering::Acquire);
+                return;
+            }
+
+            // If the state has been poisoned and we aren't forcing, then panic
+            if state & POISON_BIT != 0 && !ignore_poison {
+                // Need the fence here as well for the same reason
+                fence(Ordering::Acquire);
+                panic!("Once instance has previously been poisoned");
+            }
+
+            // Grab the lock if it isn't locked, even if there is a queue on it.
+            // We also clear the poison bit since we are going to try running
+            // the closure again.
+            if state & LOCKED_BIT == 0 {
+                match self.0.compare_exchange_weak(
+                    state,
+                    (state | LOCKED_BIT) & !POISON_BIT,
+                    Ordering::Acquire,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => break,
+                    Err(x) => state = x,
+                }
+                continue;
+            }
+
+            // If there is no queue, try spinning a few times
+            if state & PARKED_BIT == 0 && spinwait.spin() {
+                state = self.0.load(Ordering::Relaxed);
+                continue;
+            }
+
+            // Set the parked bit
+            if state & PARKED_BIT == 0 {
+                if let Err(x) = self.0.compare_exchange_weak(
+                    state,
+                    state | PARKED_BIT,
+                    Ordering::Relaxed,
+                    Ordering::Relaxed,
+                ) {
+                    state = x;
+                    continue;
+                }
+            }
+
+            // Park our thread until we are woken up by the thread that owns the
+            // lock.
+            unsafe {
+                let addr = self as *const _ as usize;
+                let validate = || self.0.load(Ordering::Relaxed) == LOCKED_BIT | PARKED_BIT;
+                let before_sleep = || {};
+                let timed_out = |_, _| unreachable!();
+                parking_lot_core::park(
+                    addr,
+                    validate,
+                    before_sleep,
+                    timed_out,
+                    DEFAULT_PARK_TOKEN,
+                    None,
+                );
+            }
+
+            // Loop back and check if the done bit was set
+            spinwait.reset();
+            state = self.0.load(Ordering::Relaxed);
+        }
+
+        struct PanicGuard<'a>(&'a Once);
+        impl<'a> Drop for PanicGuard<'a> {
+            fn drop(&mut self) {
+                // Mark the state as poisoned, unlock it and unpark all threads.
+                let once = self.0;
+                let state = once.0.swap(POISON_BIT, Ordering::Release);
+                if state & PARKED_BIT != 0 {
+                    unsafe {
+                        let addr = once as *const _ as usize;
+                        parking_lot_core::unpark_all(addr, DEFAULT_UNPARK_TOKEN);
+                    }
+                }
+            }
+        }
+
+        // At this point we have the lock, so run the closure. Make sure we
+        // properly clean up if the closure panicks.
+        let guard = PanicGuard(self);
+        let once_state = if state & POISON_BIT != 0 {
+            OnceState::Poisoned
+        } else {
+            OnceState::New
+        };
+        f(once_state);
+        mem::forget(guard);
+
+        // Now unlock the state, set the done bit and unpark all threads
+        let state = self.0.swap(DONE_BIT, Ordering::Release);
+        if state & PARKED_BIT != 0 {
+            unsafe {
+                let addr = self as *const _ as usize;
+                parking_lot_core::unpark_all(addr, DEFAULT_UNPARK_TOKEN);
+            }
+        }
+    }
+}
+
+impl Default for Once {
+    #[inline]
+    fn default() -> Once {
+        Once::new()
+    }
+}
+
+impl fmt::Debug for Once {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Once")
+            .field("state", &self.state())
+            .finish()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::Once;
+    use std::panic;
+    use std::sync::mpsc::channel;
+    use std::thread;
+
+    #[test]
+    fn smoke_once() {
+        static O: Once = Once::new();
+        let mut a = 0;
+        O.call_once(|| a += 1);
+        assert_eq!(a, 1);
+        O.call_once(|| a += 1);
+        assert_eq!(a, 1);
+    }
+
+    #[test]
+    fn stampede_once() {
+        static O: Once = Once::new();
+        static mut RUN: bool = false;
+
+        let (tx, rx) = channel();
+        for _ in 0..10 {
+            let tx = tx.clone();
+            thread::spawn(move || {
+                for _ in 0..4 {
+                    thread::yield_now()
+                }
+                unsafe {
+                    O.call_once(|| {
+                        assert!(!RUN);
+                        RUN = true;
+                    });
+                    assert!(RUN);
+                }
+                tx.send(()).unwrap();
+            });
+        }
+
+        unsafe {
+            O.call_once(|| {
+                assert!(!RUN);
+                RUN = true;
+            });
+            assert!(RUN);
+        }
+
+        for _ in 0..10 {
+            rx.recv().unwrap();
+        }
+    }
+
+    #[test]
+    fn poison_bad() {
+        static O: Once = Once::new();
+
+        // poison the once
+        let t = panic::catch_unwind(|| {
+            O.call_once(|| panic!());
+        });
+        assert!(t.is_err());
+
+        // poisoning propagates
+        let t = panic::catch_unwind(|| {
+            O.call_once(|| {});
+        });
+        assert!(t.is_err());
+
+        // we can subvert poisoning, however
+        let mut called = false;
+        O.call_once_force(|p| {
+            called = true;
+            assert!(p.poisoned())
+        });
+        assert!(called);
+
+        // once any success happens, we stop propagating the poison
+        O.call_once(|| {});
+    }
+
+    #[test]
+    fn wait_for_force_to_finish() {
+        static O: Once = Once::new();
+
+        // poison the once
+        let t = panic::catch_unwind(|| {
+            O.call_once(|| panic!());
+        });
+        assert!(t.is_err());
+
+        // make sure someone's waiting inside the once via a force
+        let (tx1, rx1) = channel();
+        let (tx2, rx2) = channel();
+        let t1 = thread::spawn(move || {
+            O.call_once_force(|p| {
+                assert!(p.poisoned());
+                tx1.send(()).unwrap();
+                rx2.recv().unwrap();
+            });
+        });
+
+        rx1.recv().unwrap();
+
+        // put another waiter on the once
+        let t2 = thread::spawn(|| {
+            let mut called = false;
+            O.call_once(|| {
+                called = true;
+            });
+            assert!(!called);
+        });
+
+        tx2.send(()).unwrap();
+
+        assert!(t1.join().is_ok());
+        assert!(t2.join().is_ok());
+    }
+
+    #[test]
+    fn test_once_debug() {
+        static O: Once = Once::new();
+
+        assert_eq!(format!("{:?}", O), "Once { state: New }");
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_fair_mutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_fair_mutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_fair_mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_fair_mutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,60 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::raw_mutex::RawMutex;
+use lock_api::RawMutexFair;
+
+/// Raw fair mutex type backed by the parking lot.
+pub struct RawFairMutex(RawMutex);
+
+unsafe impl lock_api::RawMutex for RawFairMutex {
+    const INIT: Self = RawFairMutex(<RawMutex as lock_api::RawMutex>::INIT);
+
+    type GuardMarker = <RawMutex as lock_api::RawMutex>::GuardMarker;
+
+    #[inline]
+    fn lock(&self) {
+        self.0.lock()
+    }
+
+    #[inline]
+    fn try_lock(&self) -> bool {
+        self.0.try_lock()
+    }
+
+    #[inline]
+    fn unlock(&self) {
+        self.unlock_fair()
+    }
+}
+
+unsafe impl lock_api::RawMutexFair for RawFairMutex {
+    #[inline]
+    fn unlock_fair(&self) {
+        self.0.unlock_fair()
+    }
+
+    #[inline]
+    fn bump(&self) {
+        self.0.bump()
+    }
+}
+
+unsafe impl lock_api::RawMutexTimed for RawFairMutex {
+    type Duration = <RawMutex as lock_api::RawMutexTimed>::Duration;
+    type Instant = <RawMutex as lock_api::RawMutexTimed>::Instant;
+
+    #[inline]
+    fn try_lock_until(&self, timeout: Self::Instant) -> bool {
+        self.0.try_lock_until(timeout)
+    }
+
+    #[inline]
+    fn try_lock_for(&self, timeout: Self::Duration) -> bool {
+        self.0.try_lock_for(timeout)
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_mutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_mutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_mutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_mutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,325 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::{deadlock, util};
+use core::{
+    sync::atomic::{AtomicU8, Ordering},
+    time::Duration,
+};
+use lock_api::{GuardNoSend, RawMutex as RawMutex_};
+use parking_lot_core::{self, ParkResult, SpinWait, UnparkResult, UnparkToken, DEFAULT_PARK_TOKEN};
+use std::time::Instant;
+
+// UnparkToken used to indicate that that the target thread should attempt to
+// lock the mutex again as soon as it is unparked.
+pub(crate) const TOKEN_NORMAL: UnparkToken = UnparkToken(0);
+
+// UnparkToken used to indicate that the mutex is being handed off to the target
+// thread directly without unlocking it.
+pub(crate) const TOKEN_HANDOFF: UnparkToken = UnparkToken(1);
+
+/// This bit is set in the `state` of a `RawMutex` when that mutex is locked by some thread.
+const LOCKED_BIT: u8 = 0b01;
+/// This bit is set in the `state` of a `RawMutex` just before parking a thread. A thread is being
+/// parked if it wants to lock the mutex, but it is currently being held by some other thread.
+const PARKED_BIT: u8 = 0b10;
+
+/// Raw mutex type backed by the parking lot.
+pub struct RawMutex {
+    /// This atomic integer holds the current state of the mutex instance. Only the two lowest bits
+    /// are used. See `LOCKED_BIT` and `PARKED_BIT` for the bitmask for these bits.
+    ///
+    /// # State table:
+    ///
+    /// PARKED_BIT | LOCKED_BIT | Description
+    ///     0      |     0      | The mutex is not locked, nor is anyone waiting for it.
+    /// -----------+------------+------------------------------------------------------------------
+    ///     0      |     1      | The mutex is locked by exactly one thread. No other thread is
+    ///            |            | waiting for it.
+    /// -----------+------------+------------------------------------------------------------------
+    ///     1      |     0      | The mutex is not locked. One or more thread is parked or about to
+    ///            |            | park. At least one of the parked threads are just about to be
+    ///            |            | unparked, or a thread heading for parking might abort the park.
+    /// -----------+------------+------------------------------------------------------------------
+    ///     1      |     1      | The mutex is locked by exactly one thread. One or more thread is
+    ///            |            | parked or about to park, waiting for the lock to become available.
+    ///            |            | In this state, PARKED_BIT is only ever cleared when a bucket lock
+    ///            |            | is held (i.e. in a parking_lot_core callback). This ensures that
+    ///            |            | we never end up in a situation where there are parked threads but
+    ///            |            | PARKED_BIT is not set (which would result in those threads
+    ///            |            | potentially never getting woken up).
+    state: AtomicU8,
+}
+
+unsafe impl lock_api::RawMutex for RawMutex {
+    const INIT: RawMutex = RawMutex {
+        state: AtomicU8::new(0),
+    };
+
+    type GuardMarker = GuardNoSend;
+
+    #[inline]
+    fn lock(&self) {
+        if self
+            .state
+            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_err()
+        {
+            self.lock_slow(None);
+        }
+        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
+    }
+
+    #[inline]
+    fn try_lock(&self) -> bool {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            if state & LOCKED_BIT != 0 {
+                return false;
+            }
+            match self.state.compare_exchange_weak(
+                state,
+                state | LOCKED_BIT,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => {
+                    unsafe { deadlock::acquire_resource(self as *const _ as usize) };
+                    return true;
+                }
+                Err(x) => state = x,
+            }
+        }
+    }
+
+    #[inline]
+    fn unlock(&self) {
+        unsafe { deadlock::release_resource(self as *const _ as usize) };
+        if self
+            .state
+            .compare_exchange(LOCKED_BIT, 0, Ordering::Release, Ordering::Relaxed)
+            .is_ok()
+        {
+            return;
+        }
+        self.unlock_slow(false);
+    }
+}
+
+unsafe impl lock_api::RawMutexFair for RawMutex {
+    #[inline]
+    fn unlock_fair(&self) {
+        unsafe { deadlock::release_resource(self as *const _ as usize) };
+        if self
+            .state
+            .compare_exchange(LOCKED_BIT, 0, Ordering::Release, Ordering::Relaxed)
+            .is_ok()
+        {
+            return;
+        }
+        self.unlock_slow(true);
+    }
+
+    #[inline]
+    fn bump(&self) {
+        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
+            self.bump_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawMutexTimed for RawMutex {
+    type Duration = Duration;
+    type Instant = Instant;
+
+    #[inline]
+    fn try_lock_until(&self, timeout: Instant) -> bool {
+        let result = if self
+            .state
+            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            true
+        } else {
+            self.lock_slow(Some(timeout))
+        };
+        if result {
+            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_for(&self, timeout: Duration) -> bool {
+        let result = if self
+            .state
+            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            true
+        } else {
+            self.lock_slow(util::to_deadline(timeout))
+        };
+        if result {
+            unsafe { deadlock::acquire_resource(self as *const _ as usize) };
+        }
+        result
+    }
+}
+
+impl RawMutex {
+    // Used by Condvar when requeuing threads to us, must be called while
+    // holding the queue lock.
+    #[inline]
+    pub(crate) fn mark_parked_if_locked(&self) -> bool {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            if state & LOCKED_BIT == 0 {
+                return false;
+            }
+            match self.state.compare_exchange_weak(
+                state,
+                state | PARKED_BIT,
+                Ordering::Relaxed,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return true,
+                Err(x) => state = x,
+            }
+        }
+    }
+
+    // Used by Condvar when requeuing threads to us, must be called while
+    // holding the queue lock.
+    #[inline]
+    pub(crate) fn mark_parked(&self) {
+        self.state.fetch_or(PARKED_BIT, Ordering::Relaxed);
+    }
+
+    #[cold]
+    fn lock_slow(&self, timeout: Option<Instant>) -> bool {
+        let mut spinwait = SpinWait::new();
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // Grab the lock if it isn't locked, even if there is a queue on it
+            if state & LOCKED_BIT == 0 {
+                match self.state.compare_exchange_weak(
+                    state,
+                    state | LOCKED_BIT,
+                    Ordering::Acquire,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return true,
+                    Err(x) => state = x,
+                }
+                continue;
+            }
+
+            // If there is no queue, try spinning a few times
+            if state & PARKED_BIT == 0 && spinwait.spin() {
+                state = self.state.load(Ordering::Relaxed);
+                continue;
+            }
+
+            // Set the parked bit
+            if state & PARKED_BIT == 0 {
+                if let Err(x) = self.state.compare_exchange_weak(
+                    state,
+                    state | PARKED_BIT,
+                    Ordering::Relaxed,
+                    Ordering::Relaxed,
+                ) {
+                    state = x;
+                    continue;
+                }
+            }
+
+            // Park our thread until we are woken up by an unlock
+            let addr = self as *const _ as usize;
+            let validate = || self.state.load(Ordering::Relaxed) == LOCKED_BIT | PARKED_BIT;
+            let before_sleep = || {};
+            let timed_out = |_, was_last_thread| {
+                // Clear the parked bit if we were the last parked thread
+                if was_last_thread {
+                    self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
+                }
+            };
+            // SAFETY:
+            //   * `addr` is an address we control.
+            //   * `validate`/`timed_out` does not panic or call into any function of `parking_lot`.
+            //   * `before_sleep` does not call `park`, nor does it panic.
+            match unsafe {
+                parking_lot_core::park(
+                    addr,
+                    validate,
+                    before_sleep,
+                    timed_out,
+                    DEFAULT_PARK_TOKEN,
+                    timeout,
+                )
+            } {
+                // The thread that unparked us passed the lock on to us
+                // directly without unlocking it.
+                ParkResult::Unparked(TOKEN_HANDOFF) => return true,
+
+                // We were unparked normally, try acquiring the lock again
+                ParkResult::Unparked(_) => (),
+
+                // The validation function failed, try locking again
+                ParkResult::Invalid => (),
+
+                // Timeout expired
+                ParkResult::TimedOut => return false,
+            }
+
+            // Loop back and try locking again
+            spinwait.reset();
+            state = self.state.load(Ordering::Relaxed);
+        }
+    }
+
+    #[cold]
+    fn unlock_slow(&self, force_fair: bool) {
+        // Unpark one thread and leave the parked bit set if there might
+        // still be parked threads on this address.
+        let addr = self as *const _ as usize;
+        let callback = |result: UnparkResult| {
+            // If we are using a fair unlock then we should keep the
+            // mutex locked and hand it off to the unparked thread.
+            if result.unparked_threads != 0 && (force_fair || result.be_fair) {
+                // Clear the parked bit if there are no more parked
+                // threads.
+                if !result.have_more_threads {
+                    self.state.store(LOCKED_BIT, Ordering::Relaxed);
+                }
+                return TOKEN_HANDOFF;
+            }
+
+            // Clear the locked bit, and the parked bit as well if there
+            // are no more parked threads.
+            if result.have_more_threads {
+                self.state.store(PARKED_BIT, Ordering::Release);
+            } else {
+                self.state.store(0, Ordering::Release);
+            }
+            TOKEN_NORMAL
+        };
+        // SAFETY:
+        //   * `addr` is an address we control.
+        //   * `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            parking_lot_core::unpark_one(addr, callback);
+        }
+    }
+
+    #[cold]
+    fn bump_slow(&self) {
+        unsafe { deadlock::release_resource(self as *const _ as usize) };
+        self.unlock_slow(true);
+        self.lock();
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_rwlock.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_rwlock.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/raw_rwlock.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/raw_rwlock.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,1137 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::elision::{have_elision, AtomicElisionExt};
+use crate::raw_mutex::{TOKEN_HANDOFF, TOKEN_NORMAL};
+use crate::util;
+use core::{
+    cell::Cell,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+use lock_api::{GuardNoSend, RawRwLock as RawRwLock_, RawRwLockUpgrade};
+use parking_lot_core::{
+    self, deadlock, FilterOp, ParkResult, ParkToken, SpinWait, UnparkResult, UnparkToken,
+};
+use std::time::{Duration, Instant};
+
+// This reader-writer lock implementation is based on Boost's upgrade_mutex:
+// https://github.com/boostorg/thread/blob/fc08c1fe2840baeeee143440fba31ef9e9a813c8/include/boost/thread/v2/shared_mutex.hpp#L432
+//
+// This implementation uses 2 wait queues, one at key [addr] and one at key
+// [addr + 1]. The primary queue is used for all new waiting threads, and the
+// secondary queue is used by the thread which has acquired WRITER_BIT but is
+// waiting for the remaining readers to exit the lock.
+//
+// This implementation is fair between readers and writers since it uses the
+// order in which threads first started queuing to alternate between read phases
+// and write phases. In particular is it not vulnerable to write starvation
+// since readers will block if there is a pending writer.
+
+// There is at least one thread in the main queue.
+const PARKED_BIT: usize = 0b0001;
+// There is a parked thread holding WRITER_BIT. WRITER_BIT must be set.
+const WRITER_PARKED_BIT: usize = 0b0010;
+// A reader is holding an upgradable lock. The reader count must be non-zero and
+// WRITER_BIT must not be set.
+const UPGRADABLE_BIT: usize = 0b0100;
+// If the reader count is zero: a writer is currently holding an exclusive lock.
+// Otherwise: a writer is waiting for the remaining readers to exit the lock.
+const WRITER_BIT: usize = 0b1000;
+// Mask of bits used to count readers.
+const READERS_MASK: usize = !0b1111;
+// Base unit for counting readers.
+const ONE_READER: usize = 0b10000;
+
+// Token indicating what type of lock a queued thread is trying to acquire
+const TOKEN_SHARED: ParkToken = ParkToken(ONE_READER);
+const TOKEN_EXCLUSIVE: ParkToken = ParkToken(WRITER_BIT);
+const TOKEN_UPGRADABLE: ParkToken = ParkToken(ONE_READER | UPGRADABLE_BIT);
+
+/// Raw reader-writer lock type backed by the parking lot.
+pub struct RawRwLock {
+    state: AtomicUsize,
+}
+
+unsafe impl lock_api::RawRwLock for RawRwLock {
+    const INIT: RawRwLock = RawRwLock {
+        state: AtomicUsize::new(0),
+    };
+
+    type GuardMarker = GuardNoSend;
+
+    #[inline]
+    fn lock_exclusive(&self) {
+        if self
+            .state
+            .compare_exchange_weak(0, WRITER_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_err()
+        {
+            let result = self.lock_exclusive_slow(None);
+            debug_assert!(result);
+        }
+        self.deadlock_acquire();
+    }
+
+    #[inline]
+    fn try_lock_exclusive(&self) -> bool {
+        if self
+            .state
+            .compare_exchange(0, WRITER_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            self.deadlock_acquire();
+            true
+        } else {
+            false
+        }
+    }
+
+    #[inline]
+    fn unlock_exclusive(&self) {
+        self.deadlock_release();
+        if self
+            .state
+            .compare_exchange(WRITER_BIT, 0, Ordering::Release, Ordering::Relaxed)
+            .is_ok()
+        {
+            return;
+        }
+        self.unlock_exclusive_slow(false);
+    }
+
+    #[inline]
+    fn lock_shared(&self) {
+        if !self.try_lock_shared_fast(false) {
+            let result = self.lock_shared_slow(false, None);
+            debug_assert!(result);
+        }
+        self.deadlock_acquire();
+    }
+
+    #[inline]
+    fn try_lock_shared(&self) -> bool {
+        let result = if self.try_lock_shared_fast(false) {
+            true
+        } else {
+            self.try_lock_shared_slow(false)
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn unlock_shared(&self) {
+        self.deadlock_release();
+        let state = if have_elision() {
+            self.state.elision_fetch_sub_release(ONE_READER)
+        } else {
+            self.state.fetch_sub(ONE_READER, Ordering::Release)
+        };
+        if state & (READERS_MASK | WRITER_PARKED_BIT) == (ONE_READER | WRITER_PARKED_BIT) {
+            self.unlock_shared_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockFair for RawRwLock {
+    #[inline]
+    fn unlock_shared_fair(&self) {
+        // Shared unlocking is always fair in this implementation.
+        self.unlock_shared();
+    }
+
+    #[inline]
+    fn unlock_exclusive_fair(&self) {
+        self.deadlock_release();
+        if self
+            .state
+            .compare_exchange(WRITER_BIT, 0, Ordering::Release, Ordering::Relaxed)
+            .is_ok()
+        {
+            return;
+        }
+        self.unlock_exclusive_slow(true);
+    }
+
+    #[inline]
+    fn bump_shared(&self) {
+        if self.state.load(Ordering::Relaxed) & (READERS_MASK | WRITER_BIT)
+            == ONE_READER | WRITER_BIT
+        {
+            self.bump_shared_slow();
+        }
+    }
+
+    #[inline]
+    fn bump_exclusive(&self) {
+        if self.state.load(Ordering::Relaxed) & PARKED_BIT != 0 {
+            self.bump_exclusive_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockDowngrade for RawRwLock {
+    #[inline]
+    fn downgrade(&self) {
+        let state = self
+            .state
+            .fetch_add(ONE_READER - WRITER_BIT, Ordering::Release);
+
+        // Wake up parked shared and upgradable threads if there are any
+        if state & PARKED_BIT != 0 {
+            self.downgrade_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockTimed for RawRwLock {
+    type Duration = Duration;
+    type Instant = Instant;
+
+    #[inline]
+    fn try_lock_shared_for(&self, timeout: Self::Duration) -> bool {
+        let result = if self.try_lock_shared_fast(false) {
+            true
+        } else {
+            self.lock_shared_slow(false, util::to_deadline(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_shared_until(&self, timeout: Self::Instant) -> bool {
+        let result = if self.try_lock_shared_fast(false) {
+            true
+        } else {
+            self.lock_shared_slow(false, Some(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_exclusive_for(&self, timeout: Duration) -> bool {
+        let result = if self
+            .state
+            .compare_exchange_weak(0, WRITER_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            true
+        } else {
+            self.lock_exclusive_slow(util::to_deadline(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_exclusive_until(&self, timeout: Instant) -> bool {
+        let result = if self
+            .state
+            .compare_exchange_weak(0, WRITER_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            true
+        } else {
+            self.lock_exclusive_slow(Some(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+}
+
+unsafe impl lock_api::RawRwLockRecursive for RawRwLock {
+    #[inline]
+    fn lock_shared_recursive(&self) {
+        if !self.try_lock_shared_fast(true) {
+            let result = self.lock_shared_slow(true, None);
+            debug_assert!(result);
+        }
+        self.deadlock_acquire();
+    }
+
+    #[inline]
+    fn try_lock_shared_recursive(&self) -> bool {
+        let result = if self.try_lock_shared_fast(true) {
+            true
+        } else {
+            self.try_lock_shared_slow(true)
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+}
+
+unsafe impl lock_api::RawRwLockRecursiveTimed for RawRwLock {
+    #[inline]
+    fn try_lock_shared_recursive_for(&self, timeout: Self::Duration) -> bool {
+        let result = if self.try_lock_shared_fast(true) {
+            true
+        } else {
+            self.lock_shared_slow(true, util::to_deadline(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_shared_recursive_until(&self, timeout: Self::Instant) -> bool {
+        let result = if self.try_lock_shared_fast(true) {
+            true
+        } else {
+            self.lock_shared_slow(true, Some(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+}
+
+unsafe impl lock_api::RawRwLockUpgrade for RawRwLock {
+    #[inline]
+    fn lock_upgradable(&self) {
+        if !self.try_lock_upgradable_fast() {
+            let result = self.lock_upgradable_slow(None);
+            debug_assert!(result);
+        }
+        self.deadlock_acquire();
+    }
+
+    #[inline]
+    fn try_lock_upgradable(&self) -> bool {
+        let result = if self.try_lock_upgradable_fast() {
+            true
+        } else {
+            self.try_lock_upgradable_slow()
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn unlock_upgradable(&self) {
+        self.deadlock_release();
+        let state = self.state.load(Ordering::Relaxed);
+        if state & PARKED_BIT == 0 {
+            if self
+                .state
+                .compare_exchange_weak(
+                    state,
+                    state - (ONE_READER | UPGRADABLE_BIT),
+                    Ordering::Release,
+                    Ordering::Relaxed,
+                )
+                .is_ok()
+            {
+                return;
+            }
+        }
+        self.unlock_upgradable_slow(false);
+    }
+
+    #[inline]
+    fn upgrade(&self) {
+        let state = self.state.fetch_sub(
+            (ONE_READER | UPGRADABLE_BIT) - WRITER_BIT,
+            Ordering::Relaxed,
+        );
+        if state & READERS_MASK != ONE_READER {
+            let result = self.upgrade_slow(None);
+            debug_assert!(result);
+        }
+    }
+
+    #[inline]
+    fn try_upgrade(&self) -> bool {
+        if self
+            .state
+            .compare_exchange_weak(
+                ONE_READER | UPGRADABLE_BIT,
+                WRITER_BIT,
+                Ordering::Relaxed,
+                Ordering::Relaxed,
+            )
+            .is_ok()
+        {
+            true
+        } else {
+            self.try_upgrade_slow()
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockUpgradeFair for RawRwLock {
+    #[inline]
+    fn unlock_upgradable_fair(&self) {
+        self.deadlock_release();
+        let state = self.state.load(Ordering::Relaxed);
+        if state & PARKED_BIT == 0 {
+            if self
+                .state
+                .compare_exchange_weak(
+                    state,
+                    state - (ONE_READER | UPGRADABLE_BIT),
+                    Ordering::Release,
+                    Ordering::Relaxed,
+                )
+                .is_ok()
+            {
+                return;
+            }
+        }
+        self.unlock_upgradable_slow(false);
+    }
+
+    #[inline]
+    fn bump_upgradable(&self) {
+        if self.state.load(Ordering::Relaxed) == ONE_READER | UPGRADABLE_BIT | PARKED_BIT {
+            self.bump_upgradable_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockUpgradeDowngrade for RawRwLock {
+    #[inline]
+    fn downgrade_upgradable(&self) {
+        let state = self.state.fetch_sub(UPGRADABLE_BIT, Ordering::Relaxed);
+
+        // Wake up parked upgradable threads if there are any
+        if state & PARKED_BIT != 0 {
+            self.downgrade_slow();
+        }
+    }
+
+    #[inline]
+    fn downgrade_to_upgradable(&self) {
+        let state = self.state.fetch_add(
+            (ONE_READER | UPGRADABLE_BIT) - WRITER_BIT,
+            Ordering::Release,
+        );
+
+        // Wake up parked shared threads if there are any
+        if state & PARKED_BIT != 0 {
+            self.downgrade_to_upgradable_slow();
+        }
+    }
+}
+
+unsafe impl lock_api::RawRwLockUpgradeTimed for RawRwLock {
+    #[inline]
+    fn try_lock_upgradable_until(&self, timeout: Instant) -> bool {
+        let result = if self.try_lock_upgradable_fast() {
+            true
+        } else {
+            self.lock_upgradable_slow(Some(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_lock_upgradable_for(&self, timeout: Duration) -> bool {
+        let result = if self.try_lock_upgradable_fast() {
+            true
+        } else {
+            self.lock_upgradable_slow(util::to_deadline(timeout))
+        };
+        if result {
+            self.deadlock_acquire();
+        }
+        result
+    }
+
+    #[inline]
+    fn try_upgrade_until(&self, timeout: Instant) -> bool {
+        let state = self.state.fetch_sub(
+            (ONE_READER | UPGRADABLE_BIT) - WRITER_BIT,
+            Ordering::Relaxed,
+        );
+        if state & READERS_MASK == ONE_READER {
+            true
+        } else {
+            self.upgrade_slow(Some(timeout))
+        }
+    }
+
+    #[inline]
+    fn try_upgrade_for(&self, timeout: Duration) -> bool {
+        let state = self.state.fetch_sub(
+            (ONE_READER | UPGRADABLE_BIT) - WRITER_BIT,
+            Ordering::Relaxed,
+        );
+        if state & READERS_MASK == ONE_READER {
+            true
+        } else {
+            self.upgrade_slow(util::to_deadline(timeout))
+        }
+    }
+}
+
+impl RawRwLock {
+    #[inline(always)]
+    fn try_lock_shared_fast(&self, recursive: bool) -> bool {
+        let state = self.state.load(Ordering::Relaxed);
+
+        // We can't allow grabbing a shared lock if there is a writer, even if
+        // the writer is still waiting for the remaining readers to exit.
+        if state & WRITER_BIT != 0 {
+            // To allow recursive locks, we make an exception and allow readers
+            // to skip ahead of a pending writer to avoid deadlocking, at the
+            // cost of breaking the fairness guarantees.
+            if !recursive || state & READERS_MASK == 0 {
+                return false;
+            }
+        }
+
+        // Use hardware lock elision to avoid cache conflicts when multiple
+        // readers try to acquire the lock. We only do this if the lock is
+        // completely empty since elision handles conflicts poorly.
+        if have_elision() && state == 0 {
+            self.state
+                .elision_compare_exchange_acquire(0, ONE_READER)
+                .is_ok()
+        } else if let Some(new_state) = state.checked_add(ONE_READER) {
+            self.state
+                .compare_exchange_weak(state, new_state, Ordering::Acquire, Ordering::Relaxed)
+                .is_ok()
+        } else {
+            false
+        }
+    }
+
+    #[cold]
+    fn try_lock_shared_slow(&self, recursive: bool) -> bool {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // This mirrors the condition in try_lock_shared_fast
+            if state & WRITER_BIT != 0 {
+                if !recursive || state & READERS_MASK == 0 {
+                    return false;
+                }
+            }
+            if have_elision() && state == 0 {
+                match self.state.elision_compare_exchange_acquire(0, ONE_READER) {
+                    Ok(_) => return true,
+                    Err(x) => state = x,
+                }
+            } else {
+                match self.state.compare_exchange_weak(
+                    state,
+                    state
+                        .checked_add(ONE_READER)
+                        .expect("RwLock reader count overflow"),
+                    Ordering::Acquire,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return true,
+                    Err(x) => state = x,
+                }
+            }
+        }
+    }
+
+    #[inline(always)]
+    fn try_lock_upgradable_fast(&self) -> bool {
+        let state = self.state.load(Ordering::Relaxed);
+
+        // We can't grab an upgradable lock if there is already a writer or
+        // upgradable reader.
+        if state & (WRITER_BIT | UPGRADABLE_BIT) != 0 {
+            return false;
+        }
+
+        if let Some(new_state) = state.checked_add(ONE_READER | UPGRADABLE_BIT) {
+            self.state
+                .compare_exchange_weak(state, new_state, Ordering::Acquire, Ordering::Relaxed)
+                .is_ok()
+        } else {
+            false
+        }
+    }
+
+    #[cold]
+    fn try_lock_upgradable_slow(&self) -> bool {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // This mirrors the condition in try_lock_upgradable_fast
+            if state & (WRITER_BIT | UPGRADABLE_BIT) != 0 {
+                return false;
+            }
+
+            match self.state.compare_exchange_weak(
+                state,
+                state
+                    .checked_add(ONE_READER | UPGRADABLE_BIT)
+                    .expect("RwLock reader count overflow"),
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return true,
+                Err(x) => state = x,
+            }
+        }
+    }
+
+    #[cold]
+    fn lock_exclusive_slow(&self, timeout: Option<Instant>) -> bool {
+        let try_lock = |state: &mut usize| {
+            loop {
+                if *state & (WRITER_BIT | UPGRADABLE_BIT) != 0 {
+                    return false;
+                }
+
+                // Grab WRITER_BIT if it isn't set, even if there are parked threads.
+                match self.state.compare_exchange_weak(
+                    *state,
+                    *state | WRITER_BIT,
+                    Ordering::Acquire,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return true,
+                    Err(x) => *state = x,
+                }
+            }
+        };
+
+        // Step 1: grab exclusive ownership of WRITER_BIT
+        let timed_out = !self.lock_common(
+            timeout,
+            TOKEN_EXCLUSIVE,
+            try_lock,
+            WRITER_BIT | UPGRADABLE_BIT,
+        );
+        if timed_out {
+            return false;
+        }
+
+        // Step 2: wait for all remaining readers to exit the lock.
+        self.wait_for_readers(timeout, 0)
+    }
+
+    #[cold]
+    fn unlock_exclusive_slow(&self, force_fair: bool) {
+        // There are threads to unpark. Try to unpark as many as we can.
+        let callback = |mut new_state, result: UnparkResult| {
+            // If we are using a fair unlock then we should keep the
+            // rwlock locked and hand it off to the unparked threads.
+            if result.unparked_threads != 0 && (force_fair || result.be_fair) {
+                if result.have_more_threads {
+                    new_state |= PARKED_BIT;
+                }
+                self.state.store(new_state, Ordering::Release);
+                TOKEN_HANDOFF
+            } else {
+                // Clear the parked bit if there are no more parked threads.
+                if result.have_more_threads {
+                    self.state.store(PARKED_BIT, Ordering::Release);
+                } else {
+                    self.state.store(0, Ordering::Release);
+                }
+                TOKEN_NORMAL
+            }
+        };
+        // SAFETY: `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            self.wake_parked_threads(0, callback);
+        }
+    }
+
+    #[cold]
+    fn lock_shared_slow(&self, recursive: bool, timeout: Option<Instant>) -> bool {
+        let try_lock = |state: &mut usize| {
+            let mut spinwait_shared = SpinWait::new();
+            loop {
+                // Use hardware lock elision to avoid cache conflicts when multiple
+                // readers try to acquire the lock. We only do this if the lock is
+                // completely empty since elision handles conflicts poorly.
+                if have_elision() && *state == 0 {
+                    match self.state.elision_compare_exchange_acquire(0, ONE_READER) {
+                        Ok(_) => return true,
+                        Err(x) => *state = x,
+                    }
+                }
+
+                // This is the same condition as try_lock_shared_fast
+                if *state & WRITER_BIT != 0 {
+                    if !recursive || *state & READERS_MASK == 0 {
+                        return false;
+                    }
+                }
+
+                if self
+                    .state
+                    .compare_exchange_weak(
+                        *state,
+                        state
+                            .checked_add(ONE_READER)
+                            .expect("RwLock reader count overflow"),
+                        Ordering::Acquire,
+                        Ordering::Relaxed,
+                    )
+                    .is_ok()
+                {
+                    return true;
+                }
+
+                // If there is high contention on the reader count then we want
+                // to leave some time between attempts to acquire the lock to
+                // let other threads make progress.
+                spinwait_shared.spin_no_yield();
+                *state = self.state.load(Ordering::Relaxed);
+            }
+        };
+        self.lock_common(timeout, TOKEN_SHARED, try_lock, WRITER_BIT)
+    }
+
+    #[cold]
+    fn unlock_shared_slow(&self) {
+        // At this point WRITER_PARKED_BIT is set and READER_MASK is empty. We
+        // just need to wake up a potentially sleeping pending writer.
+        // Using the 2nd key at addr + 1
+        let addr = self as *const _ as usize + 1;
+        let callback = |_result: UnparkResult| {
+            // Clear the WRITER_PARKED_BIT here since there can only be one
+            // parked writer thread.
+            self.state.fetch_and(!WRITER_PARKED_BIT, Ordering::Relaxed);
+            TOKEN_NORMAL
+        };
+        // SAFETY:
+        //   * `addr` is an address we control.
+        //   * `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            parking_lot_core::unpark_one(addr, callback);
+        }
+    }
+
+    #[cold]
+    fn lock_upgradable_slow(&self, timeout: Option<Instant>) -> bool {
+        let try_lock = |state: &mut usize| {
+            let mut spinwait_shared = SpinWait::new();
+            loop {
+                if *state & (WRITER_BIT | UPGRADABLE_BIT) != 0 {
+                    return false;
+                }
+
+                if self
+                    .state
+                    .compare_exchange_weak(
+                        *state,
+                        state
+                            .checked_add(ONE_READER | UPGRADABLE_BIT)
+                            .expect("RwLock reader count overflow"),
+                        Ordering::Acquire,
+                        Ordering::Relaxed,
+                    )
+                    .is_ok()
+                {
+                    return true;
+                }
+
+                // If there is high contention on the reader count then we want
+                // to leave some time between attempts to acquire the lock to
+                // let other threads make progress.
+                spinwait_shared.spin_no_yield();
+                *state = self.state.load(Ordering::Relaxed);
+            }
+        };
+        self.lock_common(
+            timeout,
+            TOKEN_UPGRADABLE,
+            try_lock,
+            WRITER_BIT | UPGRADABLE_BIT,
+        )
+    }
+
+    #[cold]
+    fn unlock_upgradable_slow(&self, force_fair: bool) {
+        // Just release the lock if there are no parked threads.
+        let mut state = self.state.load(Ordering::Relaxed);
+        while state & PARKED_BIT == 0 {
+            match self.state.compare_exchange_weak(
+                state,
+                state - (ONE_READER | UPGRADABLE_BIT),
+                Ordering::Release,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return,
+                Err(x) => state = x,
+            }
+        }
+
+        // There are threads to unpark. Try to unpark as many as we can.
+        let callback = |new_state, result: UnparkResult| {
+            // If we are using a fair unlock then we should keep the
+            // rwlock locked and hand it off to the unparked threads.
+            let mut state = self.state.load(Ordering::Relaxed);
+            if force_fair || result.be_fair {
+                // Fall back to normal unpark on overflow. Panicking is
+                // not allowed in parking_lot callbacks.
+                while let Some(mut new_state) =
+                    (state - (ONE_READER | UPGRADABLE_BIT)).checked_add(new_state)
+                {
+                    if result.have_more_threads {
+                        new_state |= PARKED_BIT;
+                    } else {
+                        new_state &= !PARKED_BIT;
+                    }
+                    match self.state.compare_exchange_weak(
+                        state,
+                        new_state,
+                        Ordering::Relaxed,
+                        Ordering::Relaxed,
+                    ) {
+                        Ok(_) => return TOKEN_HANDOFF,
+                        Err(x) => state = x,
+                    }
+                }
+            }
+
+            // Otherwise just release the upgradable lock and update PARKED_BIT.
+            loop {
+                let mut new_state = state - (ONE_READER | UPGRADABLE_BIT);
+                if result.have_more_threads {
+                    new_state |= PARKED_BIT;
+                } else {
+                    new_state &= !PARKED_BIT;
+                }
+                match self.state.compare_exchange_weak(
+                    state,
+                    new_state,
+                    Ordering::Relaxed,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return TOKEN_NORMAL,
+                    Err(x) => state = x,
+                }
+            }
+        };
+        // SAFETY: `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            self.wake_parked_threads(0, callback);
+        }
+    }
+
+    #[cold]
+    fn try_upgrade_slow(&self) -> bool {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            if state & READERS_MASK != ONE_READER {
+                return false;
+            }
+            match self.state.compare_exchange_weak(
+                state,
+                state - (ONE_READER | UPGRADABLE_BIT) + WRITER_BIT,
+                Ordering::Relaxed,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => return true,
+                Err(x) => state = x,
+            }
+        }
+    }
+
+    #[cold]
+    fn upgrade_slow(&self, timeout: Option<Instant>) -> bool {
+        self.wait_for_readers(timeout, ONE_READER | UPGRADABLE_BIT)
+    }
+
+    #[cold]
+    fn downgrade_slow(&self) {
+        // We only reach this point if PARKED_BIT is set.
+        let callback = |_, result: UnparkResult| {
+            // Clear the parked bit if there no more parked threads
+            if !result.have_more_threads {
+                self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
+            }
+            TOKEN_NORMAL
+        };
+        // SAFETY: `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            self.wake_parked_threads(ONE_READER, callback);
+        }
+    }
+
+    #[cold]
+    fn downgrade_to_upgradable_slow(&self) {
+        // We only reach this point if PARKED_BIT is set.
+        let callback = |_, result: UnparkResult| {
+            // Clear the parked bit if there no more parked threads
+            if !result.have_more_threads {
+                self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
+            }
+            TOKEN_NORMAL
+        };
+        // SAFETY: `callback` does not panic or call into any function of `parking_lot`.
+        unsafe {
+            self.wake_parked_threads(ONE_READER | UPGRADABLE_BIT, callback);
+        }
+    }
+
+    #[cold]
+    fn bump_shared_slow(&self) {
+        self.unlock_shared();
+        self.lock_shared();
+    }
+
+    #[cold]
+    fn bump_exclusive_slow(&self) {
+        self.deadlock_release();
+        self.unlock_exclusive_slow(true);
+        self.lock_exclusive();
+    }
+
+    #[cold]
+    fn bump_upgradable_slow(&self) {
+        self.deadlock_release();
+        self.unlock_upgradable_slow(true);
+        self.lock_upgradable();
+    }
+
+    /// Common code for waking up parked threads after releasing WRITER_BIT or
+    /// UPGRADABLE_BIT.
+    ///
+    /// # Safety
+    ///
+    /// `callback` must uphold the requirements of the `callback` parameter to
+    /// `parking_lot_core::unpark_filter`. Meaning no panics or calls into any function in
+    /// `parking_lot`.
+    #[inline]
+    unsafe fn wake_parked_threads(
+        &self,
+        new_state: usize,
+        callback: impl FnOnce(usize, UnparkResult) -> UnparkToken,
+    ) {
+        // We must wake up at least one upgrader or writer if there is one,
+        // otherwise they may end up parked indefinitely since unlock_shared
+        // does not call wake_parked_threads.
+        let new_state = Cell::new(new_state);
+        let addr = self as *const _ as usize;
+        let filter = |ParkToken(token)| {
+            let s = new_state.get();
+
+            // If we are waking up a writer, don't wake anything else.
+            if s & WRITER_BIT != 0 {
+                return FilterOp::Stop;
+            }
+
+            // Otherwise wake *all* readers and one upgrader/writer.
+            if token & (UPGRADABLE_BIT | WRITER_BIT) != 0 && s & UPGRADABLE_BIT != 0 {
+                // Skip writers and upgradable readers if we already have
+                // a writer/upgradable reader.
+                FilterOp::Skip
+            } else {
+                new_state.set(s + token);
+                FilterOp::Unpark
+            }
+        };
+        let callback = |result| callback(new_state.get(), result);
+        // SAFETY:
+        // * `addr` is an address we control.
+        // * `filter` does not panic or call into any function of `parking_lot`.
+        // * `callback` safety responsibility is on caller
+        parking_lot_core::unpark_filter(addr, filter, callback);
+    }
+
+    // Common code for waiting for readers to exit the lock after acquiring
+    // WRITER_BIT.
+    #[inline]
+    fn wait_for_readers(&self, timeout: Option<Instant>, prev_value: usize) -> bool {
+        // At this point WRITER_BIT is already set, we just need to wait for the
+        // remaining readers to exit the lock.
+        let mut spinwait = SpinWait::new();
+        let mut state = self.state.load(Ordering::Relaxed);
+        while state & READERS_MASK != 0 {
+            // Spin a few times to wait for readers to exit
+            if spinwait.spin() {
+                state = self.state.load(Ordering::Relaxed);
+                continue;
+            }
+
+            // Set the parked bit
+            if state & WRITER_PARKED_BIT == 0 {
+                if let Err(x) = self.state.compare_exchange_weak(
+                    state,
+                    state | WRITER_PARKED_BIT,
+                    Ordering::Relaxed,
+                    Ordering::Relaxed,
+                ) {
+                    state = x;
+                    continue;
+                }
+            }
+
+            // Park our thread until we are woken up by an unlock
+            // Using the 2nd key at addr + 1
+            let addr = self as *const _ as usize + 1;
+            let validate = || {
+                let state = self.state.load(Ordering::Relaxed);
+                state & READERS_MASK != 0 && state & WRITER_PARKED_BIT != 0
+            };
+            let before_sleep = || {};
+            let timed_out = |_, _| {};
+            // SAFETY:
+            //   * `addr` is an address we control.
+            //   * `validate`/`timed_out` does not panic or call into any function of `parking_lot`.
+            //   * `before_sleep` does not call `park`, nor does it panic.
+            let park_result = unsafe {
+                parking_lot_core::park(
+                    addr,
+                    validate,
+                    before_sleep,
+                    timed_out,
+                    TOKEN_EXCLUSIVE,
+                    timeout,
+                )
+            };
+            match park_result {
+                // We still need to re-check the state if we are unparked
+                // since a previous writer timing-out could have allowed
+                // another reader to sneak in before we parked.
+                ParkResult::Unparked(_) | ParkResult::Invalid => {
+                    state = self.state.load(Ordering::Relaxed);
+                    continue;
+                }
+
+                // Timeout expired
+                ParkResult::TimedOut => {
+                    // We need to release WRITER_BIT and revert back to
+                    // our previous value. We also wake up any threads that
+                    // might be waiting on WRITER_BIT.
+                    let state = self.state.fetch_add(
+                        prev_value.wrapping_sub(WRITER_BIT | WRITER_PARKED_BIT),
+                        Ordering::Relaxed,
+                    );
+                    if state & PARKED_BIT != 0 {
+                        let callback = |_, result: UnparkResult| {
+                            // Clear the parked bit if there no more parked threads
+                            if !result.have_more_threads {
+                                self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
+                            }
+                            TOKEN_NORMAL
+                        };
+                        // SAFETY: `callback` does not panic or call any function of `parking_lot`.
+                        unsafe {
+                            self.wake_parked_threads(ONE_READER | UPGRADABLE_BIT, callback);
+                        }
+                    }
+                    return false;
+                }
+            }
+        }
+        true
+    }
+
+    /// Common code for acquiring a lock
+    #[inline]
+    fn lock_common(
+        &self,
+        timeout: Option<Instant>,
+        token: ParkToken,
+        mut try_lock: impl FnMut(&mut usize) -> bool,
+        validate_flags: usize,
+    ) -> bool {
+        let mut spinwait = SpinWait::new();
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // Attempt to grab the lock
+            if try_lock(&mut state) {
+                return true;
+            }
+
+            // If there are no parked threads, try spinning a few times.
+            if state & (PARKED_BIT | WRITER_PARKED_BIT) == 0 && spinwait.spin() {
+                state = self.state.load(Ordering::Relaxed);
+                continue;
+            }
+
+            // Set the parked bit
+            if state & PARKED_BIT == 0 {
+                if let Err(x) = self.state.compare_exchange_weak(
+                    state,
+                    state | PARKED_BIT,
+                    Ordering::Relaxed,
+                    Ordering::Relaxed,
+                ) {
+                    state = x;
+                    continue;
+                }
+            }
+
+            // Park our thread until we are woken up by an unlock
+            let addr = self as *const _ as usize;
+            let validate = || {
+                let state = self.state.load(Ordering::Relaxed);
+                state & PARKED_BIT != 0 && (state & validate_flags != 0)
+            };
+            let before_sleep = || {};
+            let timed_out = |_, was_last_thread| {
+                // Clear the parked bit if we were the last parked thread
+                if was_last_thread {
+                    self.state.fetch_and(!PARKED_BIT, Ordering::Relaxed);
+                }
+            };
+
+            // SAFETY:
+            // * `addr` is an address we control.
+            // * `validate`/`timed_out` does not panic or call into any function of `parking_lot`.
+            // * `before_sleep` does not call `park`, nor does it panic.
+            let park_result = unsafe {
+                parking_lot_core::park(addr, validate, before_sleep, timed_out, token, timeout)
+            };
+            match park_result {
+                // The thread that unparked us passed the lock on to us
+                // directly without unlocking it.
+                ParkResult::Unparked(TOKEN_HANDOFF) => return true,
+
+                // We were unparked normally, try acquiring the lock again
+                ParkResult::Unparked(_) => (),
+
+                // The validation function failed, try locking again
+                ParkResult::Invalid => (),
+
+                // Timeout expired
+                ParkResult::TimedOut => return false,
+            }
+
+            // Loop back and try locking again
+            spinwait.reset();
+            state = self.state.load(Ordering::Relaxed);
+        }
+    }
+
+    #[inline]
+    fn deadlock_acquire(&self) {
+        unsafe { deadlock::acquire_resource(self as *const _ as usize) };
+        unsafe { deadlock::acquire_resource(self as *const _ as usize + 1) };
+    }
+
+    #[inline]
+    fn deadlock_release(&self) {
+        unsafe { deadlock::release_resource(self as *const _ as usize) };
+        unsafe { deadlock::release_resource(self as *const _ as usize + 1) };
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/remutex.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/remutex.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/remutex.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/remutex.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,149 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::raw_mutex::RawMutex;
+use core::num::NonZeroUsize;
+use lock_api::{self, GetThreadId};
+
+/// Implementation of the `GetThreadId` trait for `lock_api::ReentrantMutex`.
+pub struct RawThreadId;
+
+unsafe impl GetThreadId for RawThreadId {
+    const INIT: RawThreadId = RawThreadId;
+
+    fn nonzero_thread_id(&self) -> NonZeroUsize {
+        // The address of a thread-local variable is guaranteed to be unique to the
+        // current thread, and is also guaranteed to be non-zero. The variable has to have a
+        // non-zero size to guarantee it has a unique address for each thread.
+        thread_local!(static KEY: u8 = 0);
+        KEY.with(|x| {
+            NonZeroUsize::new(x as *const _ as usize)
+                .expect("thread-local variable address is null")
+        })
+    }
+}
+
+/// A mutex which can be recursively locked by a single thread.
+///
+/// This type is identical to `Mutex` except for the following points:
+///
+/// - Locking multiple times from the same thread will work correctly instead of
+///   deadlocking.
+/// - `ReentrantMutexGuard` does not give mutable references to the locked data.
+///   Use a `RefCell` if you need this.
+///
+/// See [`Mutex`](type.Mutex.html) for more details about the underlying mutex
+/// primitive.
+pub type ReentrantMutex<T> = lock_api::ReentrantMutex<RawMutex, RawThreadId, T>;
+
+/// Creates a new reentrant mutex in an unlocked state ready for use.
+///
+/// This allows creating a reentrant mutex in a constant context on stable Rust.
+pub const fn const_reentrant_mutex<T>(val: T) -> ReentrantMutex<T> {
+    ReentrantMutex::const_new(
+        <RawMutex as lock_api::RawMutex>::INIT,
+        <RawThreadId as lock_api::GetThreadId>::INIT,
+        val,
+    )
+}
+
+/// An RAII implementation of a "scoped lock" of a reentrant mutex. When this structure
+/// is dropped (falls out of scope), the lock will be unlocked.
+///
+/// The data protected by the mutex can be accessed through this guard via its
+/// `Deref` implementation.
+pub type ReentrantMutexGuard<'a, T> = lock_api::ReentrantMutexGuard<'a, RawMutex, RawThreadId, T>;
+
+/// An RAII mutex guard returned by `ReentrantMutexGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedReentrantMutexGuard` and `ReentrantMutexGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+pub type MappedReentrantMutexGuard<'a, T> =
+    lock_api::MappedReentrantMutexGuard<'a, RawMutex, RawThreadId, T>;
+
+#[cfg(test)]
+mod tests {
+    use crate::ReentrantMutex;
+    use std::cell::RefCell;
+    use std::sync::Arc;
+    use std::thread;
+
+    #[cfg(feature = "serde")]
+    use bincode::{deserialize, serialize};
+
+    #[test]
+    fn smoke() {
+        let m = ReentrantMutex::new(2);
+        {
+            let a = m.lock();
+            {
+                let b = m.lock();
+                {
+                    let c = m.lock();
+                    assert_eq!(*c, 2);
+                }
+                assert_eq!(*b, 2);
+            }
+            assert_eq!(*a, 2);
+        }
+    }
+
+    #[test]
+    fn is_mutex() {
+        let m = Arc::new(ReentrantMutex::new(RefCell::new(0)));
+        let m2 = m.clone();
+        let lock = m.lock();
+        let child = thread::spawn(move || {
+            let lock = m2.lock();
+            assert_eq!(*lock.borrow(), 4950);
+        });
+        for i in 0..100 {
+            let lock = m.lock();
+            *lock.borrow_mut() += i;
+        }
+        drop(lock);
+        child.join().unwrap();
+    }
+
+    #[test]
+    fn trylock_works() {
+        let m = Arc::new(ReentrantMutex::new(()));
+        let m2 = m.clone();
+        let _lock = m.try_lock();
+        let _lock2 = m.try_lock();
+        thread::spawn(move || {
+            let lock = m2.try_lock();
+            assert!(lock.is_none());
+        })
+        .join()
+        .unwrap();
+        let _lock3 = m.try_lock();
+    }
+
+    #[test]
+    fn test_reentrant_mutex_debug() {
+        let mutex = ReentrantMutex::new(vec![0u8, 10]);
+
+        assert_eq!(format!("{:?}", mutex), "ReentrantMutex { data: [0, 10] }");
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde() {
+        let contents: Vec<u8> = vec![0, 1, 2];
+        let mutex = ReentrantMutex::new(contents.clone());
+
+        let serialized = serialize(&mutex).unwrap();
+        let deserialized: ReentrantMutex<Vec<u8>> = deserialize(&serialized).unwrap();
+
+        assert_eq!(*(mutex.lock()), *(deserialized.lock()));
+        assert_eq!(contents, *(deserialized.lock()));
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/rwlock.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/rwlock.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/rwlock.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/rwlock.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,613 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::raw_rwlock::RawRwLock;
+use lock_api;
+
+/// A reader-writer lock
+///
+/// This type of lock allows a number of readers or at most one writer at any
+/// point in time. The write portion of this lock typically allows modification
+/// of the underlying data (exclusive access) and the read portion of this lock
+/// typically allows for read-only access (shared access).
+///
+/// This lock uses a task-fair locking policy which avoids both reader and
+/// writer starvation. This means that readers trying to acquire the lock will
+/// block even if the lock is unlocked when there are writers waiting to acquire
+/// the lock. Because of this, attempts to recursively acquire a read lock
+/// within a single thread may result in a deadlock.
+///
+/// The type parameter `T` represents the data that this lock protects. It is
+/// required that `T` satisfies `Send` to be shared across threads and `Sync` to
+/// allow concurrent access through readers. The RAII guards returned from the
+/// locking methods implement `Deref` (and `DerefMut` for the `write` methods)
+/// to allow access to the contained of the lock.
+///
+/// # Fairness
+///
+/// A typical unfair lock can often end up in a situation where a single thread
+/// quickly acquires and releases the same lock in succession, which can starve
+/// other threads waiting to acquire the rwlock. While this improves performance
+/// because it doesn't force a context switch when a thread tries to re-acquire
+/// a rwlock it has just released, this can starve other threads.
+///
+/// This rwlock uses [eventual fairness](https://trac.webkit.org/changeset/203350)
+/// to ensure that the lock will be fair on average without sacrificing
+/// performance. This is done by forcing a fair unlock on average every 0.5ms,
+/// which will force the lock to go to the next thread waiting for the rwlock.
+///
+/// Additionally, any critical section longer than 1ms will always use a fair
+/// unlock, which has a negligible performance impact compared to the length of
+/// the critical section.
+///
+/// You can also force a fair unlock by calling `RwLockReadGuard::unlock_fair`
+/// or `RwLockWriteGuard::unlock_fair` when unlocking a mutex instead of simply
+/// dropping the guard.
+///
+/// # Differences from the standard library `RwLock`
+///
+/// - Supports atomically downgrading a write lock into a read lock.
+/// - Task-fair locking policy instead of an unspecified platform default.
+/// - No poisoning, the lock is released normally on panic.
+/// - Only requires 1 word of space, whereas the standard library boxes the
+///   `RwLock` due to platform limitations.
+/// - Can be statically constructed (requires the `const_fn` nightly feature).
+/// - Does not require any drop glue when dropped.
+/// - Inline fast path for the uncontended case.
+/// - Efficient handling of micro-contention using adaptive spinning.
+/// - Allows raw locking & unlocking without a guard.
+/// - Supports eventual fairness so that the rwlock is fair on average.
+/// - Optionally allows making the rwlock fair by calling
+///   `RwLockReadGuard::unlock_fair` and `RwLockWriteGuard::unlock_fair`.
+///
+/// # Examples
+///
+/// ```
+/// use parking_lot::RwLock;
+///
+/// let lock = RwLock::new(5);
+///
+/// // many reader locks can be held at once
+/// {
+///     let r1 = lock.read();
+///     let r2 = lock.read();
+///     assert_eq!(*r1, 5);
+///     assert_eq!(*r2, 5);
+/// } // read locks are dropped at this point
+///
+/// // only one write lock may be held, however
+/// {
+///     let mut w = lock.write();
+///     *w += 1;
+///     assert_eq!(*w, 6);
+/// } // write lock is dropped here
+/// ```
+pub type RwLock<T> = lock_api::RwLock<RawRwLock, T>;
+
+/// Creates a new instance of an `RwLock<T>` which is unlocked.
+///
+/// This allows creating a `RwLock<T>` in a constant context on stable Rust.
+pub const fn const_rwlock<T>(val: T) -> RwLock<T> {
+    RwLock::const_new(<RawRwLock as lock_api::RawRwLock>::INIT, val)
+}
+
+/// RAII structure used to release the shared read access of a lock when
+/// dropped.
+pub type RwLockReadGuard<'a, T> = lock_api::RwLockReadGuard<'a, RawRwLock, T>;
+
+/// RAII structure used to release the exclusive write access of a lock when
+/// dropped.
+pub type RwLockWriteGuard<'a, T> = lock_api::RwLockWriteGuard<'a, RawRwLock, T>;
+
+/// An RAII read lock guard returned by `RwLockReadGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedRwLockReadGuard` and `RwLockReadGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+pub type MappedRwLockReadGuard<'a, T> = lock_api::MappedRwLockReadGuard<'a, RawRwLock, T>;
+
+/// An RAII write lock guard returned by `RwLockWriteGuard::map`, which can point to a
+/// subfield of the protected data.
+///
+/// The main difference between `MappedRwLockWriteGuard` and `RwLockWriteGuard` is that the
+/// former doesn't support temporarily unlocking and re-locking, since that
+/// could introduce soundness issues if the locked object is modified by another
+/// thread.
+pub type MappedRwLockWriteGuard<'a, T> = lock_api::MappedRwLockWriteGuard<'a, RawRwLock, T>;
+
+/// RAII structure used to release the upgradable read access of a lock when
+/// dropped.
+pub type RwLockUpgradableReadGuard<'a, T> = lock_api::RwLockUpgradableReadGuard<'a, RawRwLock, T>;
+
+#[cfg(test)]
+mod tests {
+    use crate::{RwLock, RwLockUpgradableReadGuard, RwLockWriteGuard};
+    use rand::Rng;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::mpsc::channel;
+    use std::sync::Arc;
+    use std::thread;
+    use std::time::Duration;
+
+    #[cfg(feature = "serde")]
+    use bincode::{deserialize, serialize};
+
+    #[derive(Eq, PartialEq, Debug)]
+    struct NonCopy(i32);
+
+    #[test]
+    fn smoke() {
+        let l = RwLock::new(());
+        drop(l.read());
+        drop(l.write());
+        drop(l.upgradable_read());
+        drop((l.read(), l.read()));
+        drop((l.read(), l.upgradable_read()));
+        drop(l.write());
+    }
+
+    #[test]
+    fn frob() {
+        const N: u32 = 10;
+        const M: u32 = 1000;
+
+        let r = Arc::new(RwLock::new(()));
+
+        let (tx, rx) = channel::<()>();
+        for _ in 0..N {
+            let tx = tx.clone();
+            let r = r.clone();
+            thread::spawn(move || {
+                let mut rng = rand::thread_rng();
+                for _ in 0..M {
+                    if rng.gen_bool(1.0 / N as f64) {
+                        drop(r.write());
+                    } else {
+                        drop(r.read());
+                    }
+                }
+                drop(tx);
+            });
+        }
+        drop(tx);
+        let _ = rx.recv();
+    }
+
+    #[test]
+    fn test_rw_arc_no_poison_wr() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _: Result<(), _> = thread::spawn(move || {
+            let _lock = arc2.write();
+            panic!();
+        })
+        .join();
+        let lock = arc.read();
+        assert_eq!(*lock, 1);
+    }
+
+    #[test]
+    fn test_rw_arc_no_poison_ww() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _: Result<(), _> = thread::spawn(move || {
+            let _lock = arc2.write();
+            panic!();
+        })
+        .join();
+        let lock = arc.write();
+        assert_eq!(*lock, 1);
+    }
+
+    #[test]
+    fn test_rw_arc_no_poison_rr() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _: Result<(), _> = thread::spawn(move || {
+            let _lock = arc2.read();
+            panic!();
+        })
+        .join();
+        let lock = arc.read();
+        assert_eq!(*lock, 1);
+    }
+
+    #[test]
+    fn test_rw_arc_no_poison_rw() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _: Result<(), _> = thread::spawn(move || {
+            let _lock = arc2.read();
+            panic!()
+        })
+        .join();
+        let lock = arc.write();
+        assert_eq!(*lock, 1);
+    }
+
+    #[test]
+    fn test_ruw_arc() {
+        let arc = Arc::new(RwLock::new(0));
+        let arc2 = arc.clone();
+        let (tx, rx) = channel();
+
+        thread::spawn(move || {
+            for _ in 0..10 {
+                let mut lock = arc2.write();
+                let tmp = *lock;
+                *lock = -1;
+                thread::yield_now();
+                *lock = tmp + 1;
+            }
+            tx.send(()).unwrap();
+        });
+
+        let mut children = Vec::new();
+
+        // Upgradable readers try to catch the writer in the act and also
+        // try to touch the value
+        for _ in 0..5 {
+            let arc3 = arc.clone();
+            children.push(thread::spawn(move || {
+                let lock = arc3.upgradable_read();
+                let tmp = *lock;
+                assert!(tmp >= 0);
+                thread::yield_now();
+                let mut lock = RwLockUpgradableReadGuard::upgrade(lock);
+                assert_eq!(tmp, *lock);
+                *lock = -1;
+                thread::yield_now();
+                *lock = tmp + 1;
+            }));
+        }
+
+        // Readers try to catch the writers in the act
+        for _ in 0..5 {
+            let arc4 = arc.clone();
+            children.push(thread::spawn(move || {
+                let lock = arc4.read();
+                assert!(*lock >= 0);
+            }));
+        }
+
+        // Wait for children to pass their asserts
+        for r in children {
+            assert!(r.join().is_ok());
+        }
+
+        // Wait for writer to finish
+        rx.recv().unwrap();
+        let lock = arc.read();
+        assert_eq!(*lock, 15);
+    }
+
+    #[test]
+    fn test_rw_arc() {
+        let arc = Arc::new(RwLock::new(0));
+        let arc2 = arc.clone();
+        let (tx, rx) = channel();
+
+        thread::spawn(move || {
+            let mut lock = arc2.write();
+            for _ in 0..10 {
+                let tmp = *lock;
+                *lock = -1;
+                thread::yield_now();
+                *lock = tmp + 1;
+            }
+            tx.send(()).unwrap();
+        });
+
+        // Readers try to catch the writer in the act
+        let mut children = Vec::new();
+        for _ in 0..5 {
+            let arc3 = arc.clone();
+            children.push(thread::spawn(move || {
+                let lock = arc3.read();
+                assert!(*lock >= 0);
+            }));
+        }
+
+        // Wait for children to pass their asserts
+        for r in children {
+            assert!(r.join().is_ok());
+        }
+
+        // Wait for writer to finish
+        rx.recv().unwrap();
+        let lock = arc.read();
+        assert_eq!(*lock, 10);
+    }
+
+    #[test]
+    fn test_rw_arc_access_in_unwind() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _ = thread::spawn(move || {
+            struct Unwinder {
+                i: Arc<RwLock<isize>>,
+            }
+            impl Drop for Unwinder {
+                fn drop(&mut self) {
+                    let mut lock = self.i.write();
+                    *lock += 1;
+                }
+            }
+            let _u = Unwinder { i: arc2 };
+            panic!();
+        })
+        .join();
+        let lock = arc.read();
+        assert_eq!(*lock, 2);
+    }
+
+    #[test]
+    fn test_rwlock_unsized() {
+        let rw: &RwLock<[i32]> = &RwLock::new([1, 2, 3]);
+        {
+            let b = &mut *rw.write();
+            b[0] = 4;
+            b[2] = 5;
+        }
+        let comp: &[i32] = &[4, 2, 5];
+        assert_eq!(&*rw.read(), comp);
+    }
+
+    #[test]
+    fn test_rwlock_try_read() {
+        let lock = RwLock::new(0isize);
+        {
+            let read_guard = lock.read();
+
+            let read_result = lock.try_read();
+            assert!(
+                read_result.is_some(),
+                "try_read should succeed while read_guard is in scope"
+            );
+
+            drop(read_guard);
+        }
+        {
+            let upgrade_guard = lock.upgradable_read();
+
+            let read_result = lock.try_read();
+            assert!(
+                read_result.is_some(),
+                "try_read should succeed while upgrade_guard is in scope"
+            );
+
+            drop(upgrade_guard);
+        }
+        {
+            let write_guard = lock.write();
+
+            let read_result = lock.try_read();
+            assert!(
+                read_result.is_none(),
+                "try_read should fail while write_guard is in scope"
+            );
+
+            drop(write_guard);
+        }
+    }
+
+    #[test]
+    fn test_rwlock_try_write() {
+        let lock = RwLock::new(0isize);
+        {
+            let read_guard = lock.read();
+
+            let write_result = lock.try_write();
+            assert!(
+                write_result.is_none(),
+                "try_write should fail while read_guard is in scope"
+            );
+
+            drop(read_guard);
+        }
+        {
+            let upgrade_guard = lock.upgradable_read();
+
+            let write_result = lock.try_write();
+            assert!(
+                write_result.is_none(),
+                "try_write should fail while upgrade_guard is in scope"
+            );
+
+            drop(upgrade_guard);
+        }
+        {
+            let write_guard = lock.write();
+
+            let write_result = lock.try_write();
+            assert!(
+                write_result.is_none(),
+                "try_write should fail while write_guard is in scope"
+            );
+
+            drop(write_guard);
+        }
+    }
+
+    #[test]
+    fn test_rwlock_try_upgrade() {
+        let lock = RwLock::new(0isize);
+        {
+            let read_guard = lock.read();
+
+            let upgrade_result = lock.try_upgradable_read();
+            assert!(
+                upgrade_result.is_some(),
+                "try_upgradable_read should succeed while read_guard is in scope"
+            );
+
+            drop(read_guard);
+        }
+        {
+            let upgrade_guard = lock.upgradable_read();
+
+            let upgrade_result = lock.try_upgradable_read();
+            assert!(
+                upgrade_result.is_none(),
+                "try_upgradable_read should fail while upgrade_guard is in scope"
+            );
+
+            drop(upgrade_guard);
+        }
+        {
+            let write_guard = lock.write();
+
+            let upgrade_result = lock.try_upgradable_read();
+            assert!(
+                upgrade_result.is_none(),
+                "try_upgradable should fail while write_guard is in scope"
+            );
+
+            drop(write_guard);
+        }
+    }
+
+    #[test]
+    fn test_into_inner() {
+        let m = RwLock::new(NonCopy(10));
+        assert_eq!(m.into_inner(), NonCopy(10));
+    }
+
+    #[test]
+    fn test_into_inner_drop() {
+        struct Foo(Arc<AtomicUsize>);
+        impl Drop for Foo {
+            fn drop(&mut self) {
+                self.0.fetch_add(1, Ordering::SeqCst);
+            }
+        }
+        let num_drops = Arc::new(AtomicUsize::new(0));
+        let m = RwLock::new(Foo(num_drops.clone()));
+        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        {
+            let _inner = m.into_inner();
+            assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+        }
+        assert_eq!(num_drops.load(Ordering::SeqCst), 1);
+    }
+
+    #[test]
+    fn test_get_mut() {
+        let mut m = RwLock::new(NonCopy(10));
+        *m.get_mut() = NonCopy(20);
+        assert_eq!(m.into_inner(), NonCopy(20));
+    }
+
+    #[test]
+    fn test_rwlockguard_sync() {
+        fn sync<T: Sync>(_: T) {}
+
+        let rwlock = RwLock::new(());
+        sync(rwlock.read());
+        sync(rwlock.write());
+    }
+
+    #[test]
+    fn test_rwlock_downgrade() {
+        let x = Arc::new(RwLock::new(0));
+        let mut handles = Vec::new();
+        for _ in 0..8 {
+            let x = x.clone();
+            handles.push(thread::spawn(move || {
+                for _ in 0..100 {
+                    let mut writer = x.write();
+                    *writer += 1;
+                    let cur_val = *writer;
+                    let reader = RwLockWriteGuard::downgrade(writer);
+                    assert_eq!(cur_val, *reader);
+                }
+            }));
+        }
+        for handle in handles {
+            handle.join().unwrap()
+        }
+        assert_eq!(*x.read(), 800);
+    }
+
+    #[test]
+    fn test_rwlock_recursive() {
+        let arc = Arc::new(RwLock::new(1));
+        let arc2 = arc.clone();
+        let _lock1 = arc.read();
+        thread::spawn(move || {
+            let _lock = arc2.write();
+        });
+
+        if cfg!(not(all(target_env = "sgx", target_vendor = "fortanix"))) {
+            thread::sleep(Duration::from_millis(100));
+        } else {
+            // FIXME: https://github.com/fortanix/rust-sgx/issues/31
+            for _ in 0..100 {
+                thread::yield_now();
+            }
+        }
+
+        // A normal read would block here since there is a pending writer
+        let _lock2 = arc.read_recursive();
+    }
+
+    #[test]
+    fn test_rwlock_debug() {
+        let x = RwLock::new(vec![0u8, 10]);
+
+        assert_eq!(format!("{:?}", x), "RwLock { data: [0, 10] }");
+        let _lock = x.write();
+        assert_eq!(format!("{:?}", x), "RwLock { data: <locked> }");
+    }
+
+    #[test]
+    fn test_clone() {
+        let rwlock = RwLock::new(Arc::new(1));
+        let a = rwlock.read_recursive();
+        let b = a.clone();
+        assert_eq!(Arc::strong_count(&b), 2);
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde() {
+        let contents: Vec<u8> = vec![0, 1, 2];
+        let mutex = RwLock::new(contents.clone());
+
+        let serialized = serialize(&mutex).unwrap();
+        let deserialized: RwLock<Vec<u8>> = deserialize(&serialized).unwrap();
+
+        assert_eq!(*(mutex.read()), *(deserialized.read()));
+        assert_eq!(contents, *(deserialized.read()));
+    }
+
+    #[test]
+    fn test_issue_203() {
+        struct Bar(RwLock<()>);
+
+        impl Drop for Bar {
+            fn drop(&mut self) {
+                let _n = self.0.write();
+            }
+        }
+
+        thread_local! {
+            static B: Bar = Bar(RwLock::new(()));
+        }
+
+        thread::spawn(|| {
+            B.with(|_| ());
+
+            let a = RwLock::new(());
+            let _a = a.read();
+        })
+        .join()
+        .unwrap();
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/util.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/util.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/src/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/src/util.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,38 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use std::time::{Duration, Instant};
+
+// Option::unchecked_unwrap
+pub trait UncheckedOptionExt<T> {
+    unsafe fn unchecked_unwrap(self) -> T;
+}
+
+impl<T> UncheckedOptionExt<T> for Option<T> {
+    #[inline]
+    unsafe fn unchecked_unwrap(self) -> T {
+        match self {
+            Some(x) => x,
+            None => unreachable(),
+        }
+    }
+}
+
+// hint::unreachable_unchecked() in release mode
+#[inline]
+unsafe fn unreachable() -> ! {
+    if cfg!(debug_assertions) {
+        unreachable!();
+    } else {
+        core::hint::unreachable_unchecked()
+    }
+}
+
+#[inline]
+pub fn to_deadline(timeout: Duration) -> Option<Instant> {
+    Instant::now().checked_add(timeout)
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/tests/issue_203.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/tests/issue_203.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot/tests/issue_203.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot/tests/issue_203.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,26 @@
+use parking_lot::RwLock;
+use std::thread;
+
+struct Bar(RwLock<()>);
+
+impl Drop for Bar {
+    fn drop(&mut self) {
+        let _n = self.0.write();
+    }
+}
+
+thread_local! {
+    static B: Bar = Bar(RwLock::new(()));
+}
+
+#[test]
+fn main() {
+    thread::spawn(|| {
+        B.with(|_| ());
+
+        let a = RwLock::new(());
+        let _a = a.read();
+    })
+    .join()
+    .unwrap();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"8230dddab7c73aa75c9fcb9647c57af37c015e57223ac1706cf7e73e810559dc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"058dddad16d91c8d0160fa2a78bb5f7c2f801f2fd9770fc387c5843395bf0379","src/parking_lot.rs":"15c2c91f05ca117bb47fbaeb65e19cb039aab0064301c5113c2a48c86b76f5da","src/spinwait.rs":"d568d8a81f9144ec4c4a139dc934d7d04ee1656a4a221eb548742fe7aba09ab1","src/thread_parker/cloudabi.rs":"0668b50898c20e7267ac6cc977e7ad376a18958e2d07faeca8199794d873d2eb","src/thread_parker/generic.rs":"2f501c6e46fcff434ba9e13ae8859e66de3327f601ed92989b310124e4129ff4","src/thread_parker/linux.rs":"853fd22f51215d1f553ad6461ad3c92c4ec9c294e607e69ed5f53b2e8c7a11d7","src/thread_parker/mod.rs":"5bc2100d2f575608b5b76e626ca92ce3ba4830176ecc773c5594cda6ca0905e9","src/thread_parker/redox.rs":"081c76af1e24be12da45d8093e261c48d558342ac2ac64dc3f7dd95eaaa1bf11","src/thread_parker/sgx.rs":"3fd71a7066db58189f302d2344e4e425320f82c298ca482ca4318bae44ae37fd","src/thread_parker/unix.rs":"77e1f049207b7e89b22ef05e5134c7538b31fff99aa9660784136f96fec1845a","src/thread_parker/wasm.rs":"b4c9f9e9c1fd636b235a0e8e0227c954b1e7432d8394b58af77b348cdfa2141e","src/thread_parker/wasm_atomic.rs":"a1ab05981a833e72d8d353350ab2b95e6f833cd7224591e595ccdb3692968c23","src/thread_parker/windows/keyed_event.rs":"34fc4693e7afd69a5c426ae7face83b8363f114a44dece44197cd03861cfdded","src/thread_parker/windows/mod.rs":"7702ff9b72ac647ec998a9b205ace961a28839fcd94631fb750ca459e4804260","src/thread_parker/windows/waitaddress.rs":"06d994633006e237dc940f377432ea00cf1609e56096d69d46f7bb3b80eeb857","src/util.rs":"285e6133150645525f2ca1ece41f6d35bad4e7c5e08b42b20c99d2a97e04a974","src/word_lock.rs":"2c030aedb340ae8ca564365206452c298fe29986d005d6a40e808c9760f91c95"},"package":"d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,52 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "parking_lot_core"
+version = "0.7.2"
+authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
+description = "An advanced API for creating custom synchronization primitives."
+keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
+categories = ["concurrency"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/Amanieu/parking_lot"
+[dependencies.backtrace]
+version = "0.3.2"
+optional = true
+
+[dependencies.cfg-if]
+version = "0.1.5"
+
+[dependencies.petgraph]
+version = "0.5"
+optional = true
+
+[dependencies.smallvec]
+version = "1.0"
+
+[dependencies.thread-id]
+version = "3.2.0"
+optional = true
+
+[features]
+deadlock_detection = ["petgraph", "thread-id", "backtrace"]
+nightly = []
+[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
+version = "0.0.3"
+[target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
+version = "0.1"
+[target."cfg(unix)".dependencies.libc]
+version = "0.2.55"
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3"
+features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"]
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2016 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,71 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! This library exposes a low-level API for creating your own efficient
+//! synchronization primitives.
+//!
+//! # The parking lot
+//!
+//! To keep synchronization primitives small, all thread queuing and suspending
+//! functionality is offloaded to the *parking lot*. The idea behind this is based
+//! on the Webkit [`WTF::ParkingLot`](https://webkit.org/blog/6161/locking-in-webkit/)
+//! class, which essentially consists of a hash table mapping of lock addresses
+//! to queues of parked (sleeping) threads. The Webkit parking lot was itself
+//! inspired by Linux [futexes](http://man7.org/linux/man-pages/man2/futex.2.html),
+//! but it is more powerful since it allows invoking callbacks while holding a
+//! queue lock.
+//!
+//! There are two main operations that can be performed on the parking lot:
+//!
+//!  - *Parking* refers to suspending the thread while simultaneously enqueuing it
+//! on a queue keyed by some address.
+//! - *Unparking* refers to dequeuing a thread from a queue keyed by some address
+//! and resuming it.
+//!
+//! See the documentation of the individual functions for more details.
+//!
+//! # Building custom synchronization primitives
+//!
+//! Building custom synchronization primitives is very simple since the parking
+//! lot takes care of all the hard parts for you. A simple example for a
+//! custom primitive would be to integrate a `Mutex` inside another data type.
+//! Since a mutex only requires 2 bits, it can share space with other data.
+//! For example, one could create an `ArcMutex` type that combines the atomic
+//! reference count and the two mutex bits in the same atomic word.
+
+#![warn(missing_docs)]
+#![warn(rust_2018_idioms)]
+#![cfg_attr(
+    all(target_env = "sgx", target_vendor = "fortanix"),
+    feature(sgx_platform)
+)]
+#![cfg_attr(
+    all(
+        feature = "nightly",
+        target_arch = "wasm32",
+        target_feature = "atomics"
+    ),
+    feature(stdsimd)
+)]
+#![cfg_attr(
+    all(feature = "nightly", target_os = "cloudabi",),
+    feature(thread_local)
+)]
+
+mod parking_lot;
+mod spinwait;
+mod thread_parker;
+mod util;
+mod word_lock;
+
+pub use self::parking_lot::deadlock;
+pub use self::parking_lot::{park, unpark_all, unpark_filter, unpark_one, unpark_requeue};
+pub use self::parking_lot::{
+    FilterOp, ParkResult, ParkToken, RequeueOp, UnparkResult, UnparkToken,
+};
+pub use self::parking_lot::{DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN};
+pub use self::spinwait::SpinWait;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/parking_lot.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/parking_lot.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/parking_lot.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/parking_lot.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,1708 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+use cfg_if::cfg_if;
+use crate::thread_parker::{ThreadParker, ThreadParkerT, UnparkHandleT};
+use crate::util::UncheckedOptionExt;
+use crate::word_lock::WordLock;
+use core::{
+    cell::{Cell, UnsafeCell},
+    ptr,
+    sync::atomic::{AtomicPtr, AtomicUsize, Ordering},
+};
+use smallvec::SmallVec;
+use std::time::{Duration, Instant};
+
+cfg_if! {
+    if #[cfg(all(
+        target_arch = "wasm32",
+        target_os = "unknown",
+        target_vendor = "unknown"
+    ))] {
+        use core::ops::Add;
+
+        #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
+        struct DummyInstant(Duration);
+
+        impl DummyInstant {
+            pub fn now() -> DummyInstant {
+                DummyInstant::zero()
+            }
+
+            const fn zero() -> DummyInstant {
+                DummyInstant(Duration::from_secs(0))
+            }
+        }
+
+        impl Add<Duration> for DummyInstant {
+            type Output = DummyInstant;
+
+            fn add(self, _rhs: Duration) -> DummyInstant {
+                DummyInstant::zero()
+            }
+        }
+
+        // Use dummy implementation for `Instant` on `wasm32`. The reason for this is
+        // that `Instant::now()` will always panic because time is currently not implemented
+        // on wasm32-unknown-unknown.
+        // See https://github.com/rust-lang/rust/blob/master/src/libstd/sys/wasm/time.rs
+        type InstantType = DummyInstant;
+    } else {
+        // Otherwise use `std::time::Instant`
+        type InstantType = Instant;
+    }
+}
+
+static NUM_THREADS: AtomicUsize = AtomicUsize::new(0);
+
+/// Holds the pointer to the currently active `HashTable`.
+///
+/// # Safety
+///
+/// Except for the initial value of null, it must always point to a valid `HashTable` instance.
+/// Any `HashTable` this global static has ever pointed to must never be freed.
+static HASHTABLE: AtomicPtr<HashTable> = AtomicPtr::new(ptr::null_mut());
+
+// Even with 3x more buckets than threads, the memory overhead per thread is
+// still only a few hundred bytes per thread.
+const LOAD_FACTOR: usize = 3;
+
+struct HashTable {
+    // Hash buckets for the table
+    entries: Box<[Bucket]>,
+
+    // Number of bits used for the hash function
+    hash_bits: u32,
+
+    // Previous table. This is only kept to keep leak detectors happy.
+    _prev: *const HashTable,
+}
+
+impl HashTable {
+    #[inline]
+    fn new(num_threads: usize, prev: *const HashTable) -> Box<HashTable> {
+        let new_size = (num_threads * LOAD_FACTOR).next_power_of_two();
+        let hash_bits = 0usize.leading_zeros() - new_size.leading_zeros() - 1;
+
+        let now = InstantType::now();
+        let mut entries = Vec::with_capacity(new_size);
+        for i in 0..new_size {
+            // We must ensure the seed is not zero
+            entries.push(Bucket::new(now, i as u32 + 1));
+        }
+
+        Box::new(HashTable {
+            entries: entries.into_boxed_slice(),
+            hash_bits,
+            _prev: prev,
+        })
+    }
+}
+
+#[repr(align(64))]
+struct Bucket {
+    // Lock protecting the queue
+    mutex: WordLock,
+
+    // Linked list of threads waiting on this bucket
+    queue_head: Cell<*const ThreadData>,
+    queue_tail: Cell<*const ThreadData>,
+
+    // Next time at which point be_fair should be set
+    fair_timeout: UnsafeCell<FairTimeout>,
+}
+
+impl Bucket {
+    #[inline]
+    pub fn new(timeout: InstantType, seed: u32) -> Self {
+        Self {
+            mutex: WordLock::new(),
+            queue_head: Cell::new(ptr::null()),
+            queue_tail: Cell::new(ptr::null()),
+            fair_timeout: UnsafeCell::new(FairTimeout::new(timeout, seed)),
+        }
+    }
+}
+
+struct FairTimeout {
+    // Next time at which point be_fair should be set
+    timeout: InstantType,
+
+    // the PRNG state for calculating the next timeout
+    seed: u32,
+}
+
+impl FairTimeout {
+    #[inline]
+    fn new(timeout: InstantType, seed: u32) -> FairTimeout {
+        FairTimeout { timeout, seed }
+    }
+
+    // Determine whether we should force a fair unlock, and update the timeout
+    #[inline]
+    fn should_timeout(&mut self) -> bool {
+        let now = InstantType::now();
+        if now > self.timeout {
+            // Time between 0 and 1ms.
+            let nanos = self.gen_u32() % 1_000_000;
+            self.timeout = now + Duration::new(0, nanos);
+            true
+        } else {
+            false
+        }
+    }
+
+    // Pseudorandom number generator from the "Xorshift RNGs" paper by George Marsaglia.
+    fn gen_u32(&mut self) -> u32 {
+        self.seed ^= self.seed << 13;
+        self.seed ^= self.seed >> 17;
+        self.seed ^= self.seed << 5;
+        self.seed
+    }
+}
+
+struct ThreadData {
+    parker: ThreadParker,
+
+    // Key that this thread is sleeping on. This may change if the thread is
+    // requeued to a different key.
+    key: AtomicUsize,
+
+    // Linked list of parked threads in a bucket
+    next_in_queue: Cell<*const ThreadData>,
+
+    // UnparkToken passed to this thread when it is unparked
+    unpark_token: Cell<UnparkToken>,
+
+    // ParkToken value set by the thread when it was parked
+    park_token: Cell<ParkToken>,
+
+    // Is the thread parked with a timeout?
+    parked_with_timeout: Cell<bool>,
+
+    // Extra data for deadlock detection
+    #[cfg(feature = "deadlock_detection")]
+    deadlock_data: deadlock::DeadlockData,
+}
+
+impl ThreadData {
+    fn new() -> ThreadData {
+        // Keep track of the total number of live ThreadData objects and resize
+        // the hash table accordingly.
+        let num_threads = NUM_THREADS.fetch_add(1, Ordering::Relaxed) + 1;
+        grow_hashtable(num_threads);
+
+        ThreadData {
+            parker: ThreadParker::new(),
+            key: AtomicUsize::new(0),
+            next_in_queue: Cell::new(ptr::null()),
+            unpark_token: Cell::new(DEFAULT_UNPARK_TOKEN),
+            park_token: Cell::new(DEFAULT_PARK_TOKEN),
+            parked_with_timeout: Cell::new(false),
+            #[cfg(feature = "deadlock_detection")]
+            deadlock_data: deadlock::DeadlockData::new(),
+        }
+    }
+}
+
+// Invokes the given closure with a reference to the current thread `ThreadData`.
+#[inline(always)]
+fn with_thread_data<T>(f: impl FnOnce(&ThreadData) -> T) -> T {
+    // Unlike word_lock::ThreadData, parking_lot::ThreadData is always expensive
+    // to construct. Try to use a thread-local version if possible. Otherwise just
+    // create a ThreadData on the stack
+    let mut thread_data_storage = None;
+    thread_local!(static THREAD_DATA: ThreadData = ThreadData::new());
+    let thread_data_ptr = THREAD_DATA
+        .try_with(|x| x as *const ThreadData)
+        .unwrap_or_else(|_| thread_data_storage.get_or_insert_with(ThreadData::new));
+
+    f(unsafe { &*thread_data_ptr })
+}
+
+impl Drop for ThreadData {
+    fn drop(&mut self) {
+        NUM_THREADS.fetch_sub(1, Ordering::Relaxed);
+    }
+}
+
+/// Returns a reference to the latest hash table, creating one if it doesn't exist yet.
+/// The reference is valid forever. However, the `HashTable` it references might become stale
+/// at any point. Meaning it still exists, but it is not the instance in active use.
+#[inline]
+fn get_hashtable() -> &'static HashTable {
+    let table = HASHTABLE.load(Ordering::Acquire);
+
+    // If there is no table, create one
+    if table.is_null() {
+        create_hashtable()
+    } else {
+        // SAFETY: when not null, `HASHTABLE` always points to a `HashTable` that is never freed.
+        unsafe { &*table }
+    }
+}
+
+/// Returns a reference to the latest hash table, creating one if it doesn't exist yet.
+/// The reference is valid forever. However, the `HashTable` it references might become stale
+/// at any point. Meaning it still exists, but it is not the instance in active use.
+#[cold]
+fn create_hashtable() -> &'static HashTable {
+    let new_table = Box::into_raw(HashTable::new(LOAD_FACTOR, ptr::null()));
+
+    // If this fails then it means some other thread created the hash table first.
+    let table = match HASHTABLE.compare_exchange(
+        ptr::null_mut(),
+        new_table,
+        Ordering::AcqRel,
+        Ordering::Acquire,
+    ) {
+        Ok(_) => new_table,
+        Err(old_table) => {
+            // Free the table we created
+            // SAFETY: `new_table` is created from `Box::into_raw` above and only freed here.
+            unsafe {
+                Box::from_raw(new_table);
+            }
+            old_table
+        }
+    };
+    // SAFETY: The `HashTable` behind `table` is never freed. It is either the table pointer we
+    // created here, or it is one loaded from `HASHTABLE`.
+    unsafe { &*table }
+}
+
+// Grow the hash table so that it is big enough for the given number of threads.
+// This isn't performance-critical since it is only done when a ThreadData is
+// created, which only happens once per thread.
+fn grow_hashtable(num_threads: usize) {
+    // Lock all buckets in the existing table and get a reference to it
+    let old_table = loop {
+        let table = get_hashtable();
+
+        // Check if we need to resize the existing table
+        if table.entries.len() >= LOAD_FACTOR * num_threads {
+            return;
+        }
+
+        // Lock all buckets in the old table
+        for bucket in &table.entries[..] {
+            bucket.mutex.lock();
+        }
+
+        // Now check if our table is still the latest one. Another thread could
+        // have grown the hash table between us reading HASHTABLE and locking
+        // the buckets.
+        if HASHTABLE.load(Ordering::Relaxed) == table as *const _ as *mut _ {
+            break table;
+        }
+
+        // Unlock buckets and try again
+        for bucket in &table.entries[..] {
+            // SAFETY: We hold the lock here, as required
+            unsafe { bucket.mutex.unlock() };
+        }
+    };
+
+    // Create the new table
+    let mut new_table = HashTable::new(num_threads, old_table);
+
+    // Move the entries from the old table to the new one
+    for bucket in &old_table.entries[..] {
+        // SAFETY: The park, unpark* and check_wait_graph_fast functions create only correct linked
+        // lists. All `ThreadData` instances in these lists will remain valid as long as they are
+        // present in the lists, meaning as long as their threads are parked.
+        unsafe { rehash_bucket_into(bucket, &mut new_table) };
+    }
+
+    // Publish the new table. No races are possible at this point because
+    // any other thread trying to grow the hash table is blocked on the bucket
+    // locks in the old table.
+    HASHTABLE.store(Box::into_raw(new_table), Ordering::Release);
+
+    // Unlock all buckets in the old table
+    for bucket in &old_table.entries[..] {
+        // SAFETY: We hold the lock here, as required
+        unsafe { bucket.mutex.unlock() };
+    }
+}
+
+/// Iterate through all `ThreadData` objects in the bucket and insert them into the given table
+/// in the bucket their key correspond to for this table.
+///
+/// # Safety
+///
+/// The given `bucket` must have a correctly constructed linked list under `queue_head`, containing
+/// `ThreadData` instances that must stay valid at least as long as the given `table` is in use.
+///
+/// The given `table` must only contain buckets with correctly constructed linked lists.
+unsafe fn rehash_bucket_into(bucket: &'static Bucket, table: &mut HashTable) {
+    let mut current: *const ThreadData = bucket.queue_head.get();
+    while !current.is_null() {
+        let next = (*current).next_in_queue.get();
+        let hash = hash((*current).key.load(Ordering::Relaxed), table.hash_bits);
+        if table.entries[hash].queue_tail.get().is_null() {
+            table.entries[hash].queue_head.set(current);
+        } else {
+            (*table.entries[hash].queue_tail.get())
+                .next_in_queue
+                .set(current);
+        }
+        table.entries[hash].queue_tail.set(current);
+        (*current).next_in_queue.set(ptr::null());
+        current = next;
+    }
+}
+
+// Hash function for addresses
+#[cfg(target_pointer_width = "32")]
+#[inline]
+fn hash(key: usize, bits: u32) -> usize {
+    key.wrapping_mul(0x9E3779B9) >> (32 - bits)
+}
+#[cfg(target_pointer_width = "64")]
+#[inline]
+fn hash(key: usize, bits: u32) -> usize {
+    key.wrapping_mul(0x9E3779B97F4A7C15) >> (64 - bits)
+}
+
+/// Locks the bucket for the given key and returns a reference to it.
+/// The returned bucket must be unlocked again in order to not cause deadlocks.
+#[inline]
+fn lock_bucket(key: usize) -> &'static Bucket {
+    loop {
+        let hashtable = get_hashtable();
+
+        let hash = hash(key, hashtable.hash_bits);
+        let bucket = &hashtable.entries[hash];
+
+        // Lock the bucket
+        bucket.mutex.lock();
+
+        // If no other thread has rehashed the table before we grabbed the lock
+        // then we are good to go! The lock we grabbed prevents any rehashes.
+        if HASHTABLE.load(Ordering::Relaxed) == hashtable as *const _ as *mut _ {
+            return bucket;
+        }
+
+        // Unlock the bucket and try again
+        // SAFETY: We hold the lock here, as required
+        unsafe { bucket.mutex.unlock() };
+    }
+}
+
+/// Locks the bucket for the given key and returns a reference to it. But checks that the key
+/// hasn't been changed in the meantime due to a requeue.
+/// The returned bucket must be unlocked again in order to not cause deadlocks.
+#[inline]
+fn lock_bucket_checked(key: &AtomicUsize) -> (usize, &'static Bucket) {
+    loop {
+        let hashtable = get_hashtable();
+        let current_key = key.load(Ordering::Relaxed);
+
+        let hash = hash(current_key, hashtable.hash_bits);
+        let bucket = &hashtable.entries[hash];
+
+        // Lock the bucket
+        bucket.mutex.lock();
+
+        // Check that both the hash table and key are correct while the bucket
+        // is locked. Note that the key can't change once we locked the proper
+        // bucket for it, so we just keep trying until we have the correct key.
+        if HASHTABLE.load(Ordering::Relaxed) == hashtable as *const _ as *mut _
+            && key.load(Ordering::Relaxed) == current_key
+        {
+            return (current_key, bucket);
+        }
+
+        // Unlock the bucket and try again
+        // SAFETY: We hold the lock here, as required
+        unsafe { bucket.mutex.unlock() };
+    }
+}
+
+/// Locks the two buckets for the given pair of keys and returns references to them.
+/// The returned buckets must be unlocked again in order to not cause deadlocks.
+///
+/// If both keys hash to the same value, both returned references will be to the same bucket. Be
+/// careful to only unlock it once in this case, always use `unlock_bucket_pair`.
+#[inline]
+fn lock_bucket_pair(key1: usize, key2: usize) -> (&'static Bucket, &'static Bucket) {
+    loop {
+        let hashtable = get_hashtable();
+
+        let hash1 = hash(key1, hashtable.hash_bits);
+        let hash2 = hash(key2, hashtable.hash_bits);
+
+        // Get the bucket at the lowest hash/index first
+        let bucket1 = if hash1 <= hash2 {
+            &hashtable.entries[hash1]
+        } else {
+            &hashtable.entries[hash2]
+        };
+
+        // Lock the first bucket
+        bucket1.mutex.lock();
+
+        // If no other thread has rehashed the table before we grabbed the lock
+        // then we are good to go! The lock we grabbed prevents any rehashes.
+        if HASHTABLE.load(Ordering::Relaxed) == hashtable as *const _ as *mut _ {
+            // Now lock the second bucket and return the two buckets
+            if hash1 == hash2 {
+                return (bucket1, bucket1);
+            } else if hash1 < hash2 {
+                let bucket2 = &hashtable.entries[hash2];
+                bucket2.mutex.lock();
+                return (bucket1, bucket2);
+            } else {
+                let bucket2 = &hashtable.entries[hash1];
+                bucket2.mutex.lock();
+                return (bucket2, bucket1);
+            }
+        }
+
+        // Unlock the bucket and try again
+        // SAFETY: We hold the lock here, as required
+        unsafe { bucket1.mutex.unlock() };
+    }
+}
+
+/// Unlock a pair of buckets
+///
+/// # Safety
+///
+/// Both buckets must be locked
+#[inline]
+unsafe fn unlock_bucket_pair(bucket1: &Bucket, bucket2: &Bucket) {
+    bucket1.mutex.unlock();
+    if !ptr::eq(bucket1, bucket2) {
+        bucket2.mutex.unlock();
+    }
+}
+
+/// Result of a park operation.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum ParkResult {
+    /// We were unparked by another thread with the given token.
+    Unparked(UnparkToken),
+
+    /// The validation callback returned false.
+    Invalid,
+
+    /// The timeout expired.
+    TimedOut,
+}
+
+impl ParkResult {
+    /// Returns true if we were unparked by another thread.
+    #[inline]
+    pub fn is_unparked(self) -> bool {
+        if let ParkResult::Unparked(_) = self {
+            true
+        } else {
+            false
+        }
+    }
+}
+
+/// Result of an unpark operation.
+#[derive(Copy, Clone, Default, Eq, PartialEq, Debug)]
+pub struct UnparkResult {
+    /// The number of threads that were unparked.
+    pub unparked_threads: usize,
+
+    /// The number of threads that were requeued.
+    pub requeued_threads: usize,
+
+    /// Whether there are any threads remaining in the queue. This only returns
+    /// true if a thread was unparked.
+    pub have_more_threads: bool,
+
+    /// This is set to true on average once every 0.5ms for any given key. It
+    /// should be used to switch to a fair unlocking mechanism for a particular
+    /// unlock.
+    pub be_fair: bool,
+
+    /// Private field so new fields can be added without breakage.
+    _sealed: (),
+}
+
+/// Operation that `unpark_requeue` should perform.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum RequeueOp {
+    /// Abort the operation without doing anything.
+    Abort,
+
+    /// Unpark one thread and requeue the rest onto the target queue.
+    UnparkOneRequeueRest,
+
+    /// Requeue all threads onto the target queue.
+    RequeueAll,
+
+    /// Unpark one thread and leave the rest parked. No requeuing is done.
+    UnparkOne,
+
+    /// Requeue one thread and leave the rest parked on the original queue.
+    RequeueOne,
+}
+
+/// Operation that `unpark_filter` should perform for each thread.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum FilterOp {
+    /// Unpark the thread and continue scanning the list of parked threads.
+    Unpark,
+
+    /// Don't unpark the thread and continue scanning the list of parked threads.
+    Skip,
+
+    /// Don't unpark the thread and stop scanning the list of parked threads.
+    Stop,
+}
+
+/// A value which is passed from an unparker to a parked thread.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub struct UnparkToken(pub usize);
+
+/// A value associated with a parked thread which can be used by `unpark_filter`.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub struct ParkToken(pub usize);
+
+/// A default unpark token to use.
+pub const DEFAULT_UNPARK_TOKEN: UnparkToken = UnparkToken(0);
+
+/// A default park token to use.
+pub const DEFAULT_PARK_TOKEN: ParkToken = ParkToken(0);
+
+/// Parks the current thread in the queue associated with the given key.
+///
+/// The `validate` function is called while the queue is locked and can abort
+/// the operation by returning false. If `validate` returns true then the
+/// current thread is appended to the queue and the queue is unlocked.
+///
+/// The `before_sleep` function is called after the queue is unlocked but before
+/// the thread is put to sleep. The thread will then sleep until it is unparked
+/// or the given timeout is reached.
+///
+/// The `timed_out` function is also called while the queue is locked, but only
+/// if the timeout was reached. It is passed the key of the queue it was in when
+/// it timed out, which may be different from the original key if
+/// `unpark_requeue` was called. It is also passed a bool which indicates
+/// whether it was the last thread in the queue.
+///
+/// # Safety
+///
+/// You should only call this function with an address that you control, since
+/// you could otherwise interfere with the operation of other synchronization
+/// primitives.
+///
+/// The `validate` and `timed_out` functions are called while the queue is
+/// locked and must not panic or call into any function in `parking_lot`.
+///
+/// The `before_sleep` function is called outside the queue lock and is allowed
+/// to call `unpark_one`, `unpark_all`, `unpark_requeue` or `unpark_filter`, but
+/// it is not allowed to call `park` or panic.
+#[inline]
+pub unsafe fn park(
+    key: usize,
+    validate: impl FnOnce() -> bool,
+    before_sleep: impl FnOnce(),
+    timed_out: impl FnOnce(usize, bool),
+    park_token: ParkToken,
+    timeout: Option<Instant>,
+) -> ParkResult {
+    // Grab our thread data, this also ensures that the hash table exists
+    with_thread_data(|thread_data| {
+        // Lock the bucket for the given key
+        let bucket = lock_bucket(key);
+
+        // If the validation function fails, just return
+        if !validate() {
+            // SAFETY: We hold the lock here, as required
+            bucket.mutex.unlock();
+            return ParkResult::Invalid;
+        }
+
+        // Append our thread data to the queue and unlock the bucket
+        thread_data.parked_with_timeout.set(timeout.is_some());
+        thread_data.next_in_queue.set(ptr::null());
+        thread_data.key.store(key, Ordering::Relaxed);
+        thread_data.park_token.set(park_token);
+        thread_data.parker.prepare_park();
+        if !bucket.queue_head.get().is_null() {
+            (*bucket.queue_tail.get()).next_in_queue.set(thread_data);
+        } else {
+            bucket.queue_head.set(thread_data);
+        }
+        bucket.queue_tail.set(thread_data);
+        // SAFETY: We hold the lock here, as required
+        bucket.mutex.unlock();
+
+        // Invoke the pre-sleep callback
+        before_sleep();
+
+        // Park our thread and determine whether we were woken up by an unpark
+        // or by our timeout. Note that this isn't precise: we can still be
+        // unparked since we are still in the queue.
+        let unparked = match timeout {
+            Some(timeout) => thread_data.parker.park_until(timeout),
+            None => {
+                thread_data.parker.park();
+                // call deadlock detection on_unpark hook
+                deadlock::on_unpark(thread_data);
+                true
+            }
+        };
+
+        // If we were unparked, return now
+        if unparked {
+            return ParkResult::Unparked(thread_data.unpark_token.get());
+        }
+
+        // Lock our bucket again. Note that the hashtable may have been rehashed in
+        // the meantime. Our key may also have changed if we were requeued.
+        let (key, bucket) = lock_bucket_checked(&thread_data.key);
+
+        // Now we need to check again if we were unparked or timed out. Unlike the
+        // last check this is precise because we hold the bucket lock.
+        if !thread_data.parker.timed_out() {
+            // SAFETY: We hold the lock here, as required
+            bucket.mutex.unlock();
+            return ParkResult::Unparked(thread_data.unpark_token.get());
+        }
+
+        // We timed out, so we now need to remove our thread from the queue
+        let mut link = &bucket.queue_head;
+        let mut current = bucket.queue_head.get();
+        let mut previous = ptr::null();
+        let mut was_last_thread = true;
+        while !current.is_null() {
+            if current == thread_data {
+                let next = (*current).next_in_queue.get();
+                link.set(next);
+                if bucket.queue_tail.get() == current {
+                    bucket.queue_tail.set(previous);
+                } else {
+                    // Scan the rest of the queue to see if there are any other
+                    // entries with the given key.
+                    let mut scan = next;
+                    while !scan.is_null() {
+                        if (*scan).key.load(Ordering::Relaxed) == key {
+                            was_last_thread = false;
+                            break;
+                        }
+                        scan = (*scan).next_in_queue.get();
+                    }
+                }
+
+                // Callback to indicate that we timed out, and whether we were the
+                // last thread on the queue.
+                timed_out(key, was_last_thread);
+                break;
+            } else {
+                if (*current).key.load(Ordering::Relaxed) == key {
+                    was_last_thread = false;
+                }
+                link = &(*current).next_in_queue;
+                previous = current;
+                current = link.get();
+            }
+        }
+
+        // There should be no way for our thread to have been removed from the queue
+        // if we timed out.
+        debug_assert!(!current.is_null());
+
+        // Unlock the bucket, we are done
+        // SAFETY: We hold the lock here, as required
+        bucket.mutex.unlock();
+        ParkResult::TimedOut
+    })
+}
+
+/// Unparks one thread from the queue associated with the given key.
+///
+/// The `callback` function is called while the queue is locked and before the
+/// target thread is woken up. The `UnparkResult` argument to the function
+/// indicates whether a thread was found in the queue and whether this was the
+/// last thread in the queue. This value is also returned by `unpark_one`.
+///
+/// The `callback` function should return an `UnparkToken` value which will be
+/// passed to the thread that is unparked. If no thread is unparked then the
+/// returned value is ignored.
+///
+/// # Safety
+///
+/// You should only call this function with an address that you control, since
+/// you could otherwise interfere with the operation of other synchronization
+/// primitives.
+///
+/// The `callback` function is called while the queue is locked and must not
+/// panic or call into any function in `parking_lot`.
+#[inline]
+pub unsafe fn unpark_one(
+    key: usize,
+    callback: impl FnOnce(UnparkResult) -> UnparkToken,
+) -> UnparkResult {
+    // Lock the bucket for the given key
+    let bucket = lock_bucket(key);
+
+    // Find a thread with a matching key and remove it from the queue
+    let mut link = &bucket.queue_head;
+    let mut current = bucket.queue_head.get();
+    let mut previous = ptr::null();
+    let mut result = UnparkResult::default();
+    while !current.is_null() {
+        if (*current).key.load(Ordering::Relaxed) == key {
+            // Remove the thread from the queue
+            let next = (*current).next_in_queue.get();
+            link.set(next);
+            if bucket.queue_tail.get() == current {
+                bucket.queue_tail.set(previous);
+            } else {
+                // Scan the rest of the queue to see if there are any other
+                // entries with the given key.
+                let mut scan = next;
+                while !scan.is_null() {
+                    if (*scan).key.load(Ordering::Relaxed) == key {
+                        result.have_more_threads = true;
+                        break;
+                    }
+                    scan = (*scan).next_in_queue.get();
+                }
+            }
+
+            // Invoke the callback before waking up the thread
+            result.unparked_threads = 1;
+            result.be_fair = (*bucket.fair_timeout.get()).should_timeout();
+            let token = callback(result);
+
+            // Set the token for the target thread
+            (*current).unpark_token.set(token);
+
+            // This is a bit tricky: we first lock the ThreadParker to prevent
+            // the thread from exiting and freeing its ThreadData if its wait
+            // times out. Then we unlock the queue since we don't want to keep
+            // the queue locked while we perform a system call. Finally we wake
+            // up the parked thread.
+            let handle = (*current).parker.unpark_lock();
+            // SAFETY: We hold the lock here, as required
+            bucket.mutex.unlock();
+            handle.unpark();
+
+            return result;
+        } else {
+            link = &(*current).next_in_queue;
+            previous = current;
+            current = link.get();
+        }
+    }
+
+    // No threads with a matching key were found in the bucket
+    callback(result);
+    // SAFETY: We hold the lock here, as required
+    bucket.mutex.unlock();
+    result
+}
+
+/// Unparks all threads in the queue associated with the given key.
+///
+/// The given `UnparkToken` is passed to all unparked threads.
+///
+/// This function returns the number of threads that were unparked.
+///
+/// # Safety
+///
+/// You should only call this function with an address that you control, since
+/// you could otherwise interfere with the operation of other synchronization
+/// primitives.
+#[inline]
+pub unsafe fn unpark_all(key: usize, unpark_token: UnparkToken) -> usize {
+    // Lock the bucket for the given key
+    let bucket = lock_bucket(key);
+
+    // Remove all threads with the given key in the bucket
+    let mut link = &bucket.queue_head;
+    let mut current = bucket.queue_head.get();
+    let mut previous = ptr::null();
+    let mut threads = SmallVec::<[_; 8]>::new();
+    while !current.is_null() {
+        if (*current).key.load(Ordering::Relaxed) == key {
+            // Remove the thread from the queue
+            let next = (*current).next_in_queue.get();
+            link.set(next);
+            if bucket.queue_tail.get() == current {
+                bucket.queue_tail.set(previous);
+            }
+
+            // Set the token for the target thread
+            (*current).unpark_token.set(unpark_token);
+
+            // Don't wake up threads while holding the queue lock. See comment
+            // in unpark_one. For now just record which threads we need to wake
+            // up.
+            threads.push((*current).parker.unpark_lock());
+            current = next;
+        } else {
+            link = &(*current).next_in_queue;
+            previous = current;
+            current = link.get();
+        }
+    }
+
+    // Unlock the bucket
+    // SAFETY: We hold the lock here, as required
+    bucket.mutex.unlock();
+
+    // Now that we are outside the lock, wake up all the threads that we removed
+    // from the queue.
+    let num_threads = threads.len();
+    for handle in threads.into_iter() {
+        handle.unpark();
+    }
+
+    num_threads
+}
+
+/// Removes all threads from the queue associated with `key_from`, optionally
+/// unparks the first one and requeues the rest onto the queue associated with
+/// `key_to`.
+///
+/// The `validate` function is called while both queues are locked. Its return
+/// value will determine which operation is performed, or whether the operation
+/// should be aborted. See `RequeueOp` for details about the different possible
+/// return values.
+///
+/// The `callback` function is also called while both queues are locked. It is
+/// passed the `RequeueOp` returned by `validate` and an `UnparkResult`
+/// indicating whether a thread was unparked and whether there are threads still
+/// parked in the new queue. This `UnparkResult` value is also returned by
+/// `unpark_requeue`.
+///
+/// The `callback` function should return an `UnparkToken` value which will be
+/// passed to the thread that is unparked. If no thread is unparked then the
+/// returned value is ignored.
+///
+/// # Safety
+///
+/// You should only call this function with an address that you control, since
+/// you could otherwise interfere with the operation of other synchronization
+/// primitives.
+///
+/// The `validate` and `callback` functions are called while the queue is locked
+/// and must not panic or call into any function in `parking_lot`.
+#[inline]
+pub unsafe fn unpark_requeue(
+    key_from: usize,
+    key_to: usize,
+    validate: impl FnOnce() -> RequeueOp,
+    callback: impl FnOnce(RequeueOp, UnparkResult) -> UnparkToken,
+) -> UnparkResult {
+    // Lock the two buckets for the given key
+    let (bucket_from, bucket_to) = lock_bucket_pair(key_from, key_to);
+
+    // If the validation function fails, just return
+    let mut result = UnparkResult::default();
+    let op = validate();
+    if op == RequeueOp::Abort {
+        // SAFETY: Both buckets are locked, as required.
+        unlock_bucket_pair(bucket_from, bucket_to);
+        return result;
+    }
+
+    // Remove all threads with the given key in the source bucket
+    let mut link = &bucket_from.queue_head;
+    let mut current = bucket_from.queue_head.get();
+    let mut previous = ptr::null();
+    let mut requeue_threads: *const ThreadData = ptr::null();
+    let mut requeue_threads_tail: *const ThreadData = ptr::null();
+    let mut wakeup_thread = None;
+    while !current.is_null() {
+        if (*current).key.load(Ordering::Relaxed) == key_from {
+            // Remove the thread from the queue
+            let next = (*current).next_in_queue.get();
+            link.set(next);
+            if bucket_from.queue_tail.get() == current {
+                bucket_from.queue_tail.set(previous);
+            }
+
+            // Prepare the first thread for wakeup and requeue the rest.
+            if (op == RequeueOp::UnparkOneRequeueRest || op == RequeueOp::UnparkOne)
+                && wakeup_thread.is_none()
+            {
+                wakeup_thread = Some(current);
+                result.unparked_threads = 1;
+            } else {
+                if !requeue_threads.is_null() {
+                    (*requeue_threads_tail).next_in_queue.set(current);
+                } else {
+                    requeue_threads = current;
+                }
+                requeue_threads_tail = current;
+                (*current).key.store(key_to, Ordering::Relaxed);
+                result.requeued_threads += 1;
+            }
+            if op == RequeueOp::UnparkOne || op == RequeueOp::RequeueOne {
+                // Scan the rest of the queue to see if there are any other
+                // entries with the given key.
+                let mut scan = next;
+                while !scan.is_null() {
+                    if (*scan).key.load(Ordering::Relaxed) == key_from {
+                        result.have_more_threads = true;
+                        break;
+                    }
+                    scan = (*scan).next_in_queue.get();
+                }
+                break;
+            }
+            current = next;
+        } else {
+            link = &(*current).next_in_queue;
+            previous = current;
+            current = link.get();
+        }
+    }
+
+    // Add the requeued threads to the destination bucket
+    if !requeue_threads.is_null() {
+        (*requeue_threads_tail).next_in_queue.set(ptr::null());
+        if !bucket_to.queue_head.get().is_null() {
+            (*bucket_to.queue_tail.get())
+                .next_in_queue
+                .set(requeue_threads);
+        } else {
+            bucket_to.queue_head.set(requeue_threads);
+        }
+        bucket_to.queue_tail.set(requeue_threads_tail);
+    }
+
+    // Invoke the callback before waking up the thread
+    if result.unparked_threads != 0 {
+        result.be_fair = (*bucket_from.fair_timeout.get()).should_timeout();
+    }
+    let token = callback(op, result);
+
+    // See comment in unpark_one for why we mess with the locking
+    if let Some(wakeup_thread) = wakeup_thread {
+        (*wakeup_thread).unpark_token.set(token);
+        let handle = (*wakeup_thread).parker.unpark_lock();
+        // SAFETY: Both buckets are locked, as required.
+        unlock_bucket_pair(bucket_from, bucket_to);
+        handle.unpark();
+    } else {
+        // SAFETY: Both buckets are locked, as required.
+        unlock_bucket_pair(bucket_from, bucket_to);
+    }
+
+    result
+}
+
+/// Unparks a number of threads from the front of the queue associated with
+/// `key` depending on the results of a filter function which inspects the
+/// `ParkToken` associated with each thread.
+///
+/// The `filter` function is called for each thread in the queue or until
+/// `FilterOp::Stop` is returned. This function is passed the `ParkToken`
+/// associated with a particular thread, which is unparked if `FilterOp::Unpark`
+/// is returned.
+///
+/// The `callback` function is also called while both queues are locked. It is
+/// passed an `UnparkResult` indicating the number of threads that were unparked
+/// and whether there are still parked threads in the queue. This `UnparkResult`
+/// value is also returned by `unpark_filter`.
+///
+/// The `callback` function should return an `UnparkToken` value which will be
+/// passed to all threads that are unparked. If no thread is unparked then the
+/// returned value is ignored.
+///
+/// # Safety
+///
+/// You should only call this function with an address that you control, since
+/// you could otherwise interfere with the operation of other synchronization
+/// primitives.
+///
+/// The `filter` and `callback` functions are called while the queue is locked
+/// and must not panic or call into any function in `parking_lot`.
+#[inline]
+pub unsafe fn unpark_filter(
+    key: usize,
+    mut filter: impl FnMut(ParkToken) -> FilterOp,
+    callback: impl FnOnce(UnparkResult) -> UnparkToken,
+) -> UnparkResult {
+    // Lock the bucket for the given key
+    let bucket = lock_bucket(key);
+
+    // Go through the queue looking for threads with a matching key
+    let mut link = &bucket.queue_head;
+    let mut current = bucket.queue_head.get();
+    let mut previous = ptr::null();
+    let mut threads = SmallVec::<[_; 8]>::new();
+    let mut result = UnparkResult::default();
+    while !current.is_null() {
+        if (*current).key.load(Ordering::Relaxed) == key {
+            // Call the filter function with the thread's ParkToken
+            let next = (*current).next_in_queue.get();
+            match filter((*current).park_token.get()) {
+                FilterOp::Unpark => {
+                    // Remove the thread from the queue
+                    link.set(next);
+                    if bucket.queue_tail.get() == current {
+                        bucket.queue_tail.set(previous);
+                    }
+
+                    // Add the thread to our list of threads to unpark
+                    threads.push((current, None));
+
+                    current = next;
+                }
+                FilterOp::Skip => {
+                    result.have_more_threads = true;
+                    link = &(*current).next_in_queue;
+                    previous = current;
+                    current = link.get();
+                }
+                FilterOp::Stop => {
+                    result.have_more_threads = true;
+                    break;
+                }
+            }
+        } else {
+            link = &(*current).next_in_queue;
+            previous = current;
+            current = link.get();
+        }
+    }
+
+    // Invoke the callback before waking up the threads
+    result.unparked_threads = threads.len();
+    if result.unparked_threads != 0 {
+        result.be_fair = (*bucket.fair_timeout.get()).should_timeout();
+    }
+    let token = callback(result);
+
+    // Pass the token to all threads that are going to be unparked and prepare
+    // them for unparking.
+    for t in threads.iter_mut() {
+        (*t.0).unpark_token.set(token);
+        t.1 = Some((*t.0).parker.unpark_lock());
+    }
+
+    // SAFETY: We hold the lock here, as required
+    bucket.mutex.unlock();
+
+    // Now that we are outside the lock, wake up all the threads that we removed
+    // from the queue.
+    for (_, handle) in threads.into_iter() {
+        handle.unchecked_unwrap().unpark();
+    }
+
+    result
+}
+
+/// \[Experimental\] Deadlock detection
+///
+/// Enabled via the `deadlock_detection` feature flag.
+pub mod deadlock {
+    #[cfg(feature = "deadlock_detection")]
+    use super::deadlock_impl;
+
+    #[cfg(feature = "deadlock_detection")]
+    pub(super) use super::deadlock_impl::DeadlockData;
+
+    /// Acquire a resource identified by key in the deadlock detector
+    /// Noop if deadlock_detection feature isn't enabled.
+    ///
+    /// # Safety
+    ///
+    /// Call after the resource is acquired
+    #[inline]
+    pub unsafe fn acquire_resource(_key: usize) {
+        #[cfg(feature = "deadlock_detection")]
+        deadlock_impl::acquire_resource(_key);
+    }
+
+    /// Release a resource identified by key in the deadlock detector.
+    /// Noop if deadlock_detection feature isn't enabled.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the resource was already released or wasn't acquired in this thread.
+    ///
+    /// # Safety
+    ///
+    /// Call before the resource is released
+    #[inline]
+    pub unsafe fn release_resource(_key: usize) {
+        #[cfg(feature = "deadlock_detection")]
+        deadlock_impl::release_resource(_key);
+    }
+
+    /// Returns all deadlocks detected *since* the last call.
+    /// Each cycle consist of a vector of `DeadlockedThread`.
+    #[cfg(feature = "deadlock_detection")]
+    #[inline]
+    pub fn check_deadlock() -> Vec<Vec<deadlock_impl::DeadlockedThread>> {
+        deadlock_impl::check_deadlock()
+    }
+
+    #[inline]
+    pub(super) unsafe fn on_unpark(_td: &super::ThreadData) {
+        #[cfg(feature = "deadlock_detection")]
+        deadlock_impl::on_unpark(_td);
+    }
+}
+
+#[cfg(feature = "deadlock_detection")]
+mod deadlock_impl {
+    use super::{get_hashtable, lock_bucket, with_thread_data, ThreadData, NUM_THREADS};
+    use crate::thread_parker::{ThreadParkerT, UnparkHandleT};
+    use crate::word_lock::WordLock;
+    use backtrace::Backtrace;
+    use petgraph;
+    use petgraph::graphmap::DiGraphMap;
+    use std::cell::{Cell, UnsafeCell};
+    use std::collections::HashSet;
+    use std::sync::atomic::Ordering;
+    use std::sync::mpsc;
+    use thread_id;
+
+    /// Representation of a deadlocked thread
+    pub struct DeadlockedThread {
+        thread_id: usize,
+        backtrace: Backtrace,
+    }
+
+    impl DeadlockedThread {
+        /// The system thread id
+        pub fn thread_id(&self) -> usize {
+            self.thread_id
+        }
+
+        /// The thread backtrace
+        pub fn backtrace(&self) -> &Backtrace {
+            &self.backtrace
+        }
+    }
+
+    pub struct DeadlockData {
+        // Currently owned resources (keys)
+        resources: UnsafeCell<Vec<usize>>,
+
+        // Set when there's a pending callstack request
+        deadlocked: Cell<bool>,
+
+        // Sender used to report the backtrace
+        backtrace_sender: UnsafeCell<Option<mpsc::Sender<DeadlockedThread>>>,
+
+        // System thread id
+        thread_id: usize,
+    }
+
+    impl DeadlockData {
+        pub fn new() -> Self {
+            DeadlockData {
+                resources: UnsafeCell::new(Vec::new()),
+                deadlocked: Cell::new(false),
+                backtrace_sender: UnsafeCell::new(None),
+                thread_id: thread_id::get(),
+            }
+        }
+    }
+
+    pub(super) unsafe fn on_unpark(td: &ThreadData) {
+        if td.deadlock_data.deadlocked.get() {
+            let sender = (*td.deadlock_data.backtrace_sender.get()).take().unwrap();
+            sender
+                .send(DeadlockedThread {
+                    thread_id: td.deadlock_data.thread_id,
+                    backtrace: Backtrace::new(),
+                })
+                .unwrap();
+            // make sure to close this sender
+            drop(sender);
+
+            // park until the end of the time
+            td.parker.prepare_park();
+            td.parker.park();
+            unreachable!("unparked deadlocked thread!");
+        }
+    }
+
+    pub unsafe fn acquire_resource(key: usize) {
+        with_thread_data(|thread_data| {
+            (*thread_data.deadlock_data.resources.get()).push(key);
+        });
+    }
+
+    pub unsafe fn release_resource(key: usize) {
+        with_thread_data(|thread_data| {
+            let resources = &mut (*thread_data.deadlock_data.resources.get());
+
+            // There is only one situation where we can fail to find the
+            // resource: we are currently running TLS destructors and our
+            // ThreadData has already been freed. There isn't much we can do
+            // about it at this point, so just ignore it.
+            if let Some(p) = resources.iter().rposition(|x| *x == key) {
+                resources.swap_remove(p);
+            }
+        });
+    }
+
+    pub fn check_deadlock() -> Vec<Vec<DeadlockedThread>> {
+        unsafe {
+            // fast pass
+            if check_wait_graph_fast() {
+                // double check
+                check_wait_graph_slow()
+            } else {
+                Vec::new()
+            }
+        }
+    }
+
+    // Simple algorithm that builds a wait graph f the threads and the resources,
+    // then checks for the presence of cycles (deadlocks).
+    // This variant isn't precise as it doesn't lock the entire table before checking
+    unsafe fn check_wait_graph_fast() -> bool {
+        let table = get_hashtable();
+        let thread_count = NUM_THREADS.load(Ordering::Relaxed);
+        let mut graph = DiGraphMap::<usize, ()>::with_capacity(thread_count * 2, thread_count * 2);
+
+        for b in &(*table).entries[..] {
+            b.mutex.lock();
+            let mut current = b.queue_head.get();
+            while !current.is_null() {
+                if !(*current).parked_with_timeout.get()
+                    && !(*current).deadlock_data.deadlocked.get()
+                {
+                    // .resources are waiting for their owner
+                    for &resource in &(*(*current).deadlock_data.resources.get()) {
+                        graph.add_edge(resource, current as usize, ());
+                    }
+                    // owner waits for resource .key
+                    graph.add_edge(current as usize, (*current).key.load(Ordering::Relaxed), ());
+                }
+                current = (*current).next_in_queue.get();
+            }
+            // SAFETY: We hold the lock here, as required
+            b.mutex.unlock();
+        }
+
+        petgraph::algo::is_cyclic_directed(&graph)
+    }
+
+    #[derive(Hash, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
+    enum WaitGraphNode {
+        Thread(*const ThreadData),
+        Resource(usize),
+    }
+
+    use self::WaitGraphNode::*;
+
+    // Contrary to the _fast variant this locks the entries table before looking for cycles.
+    // Returns all detected thread wait cycles.
+    // Note that once a cycle is reported it's never reported again.
+    unsafe fn check_wait_graph_slow() -> Vec<Vec<DeadlockedThread>> {
+        static DEADLOCK_DETECTION_LOCK: WordLock = WordLock::new();
+        DEADLOCK_DETECTION_LOCK.lock();
+
+        let mut table = get_hashtable();
+        loop {
+            // Lock all buckets in the old table
+            for b in &table.entries[..] {
+                b.mutex.lock();
+            }
+
+            // Now check if our table is still the latest one. Another thread could
+            // have grown the hash table between us getting and locking the hash table.
+            let new_table = get_hashtable();
+            if new_table as *const _ == table as *const _ {
+                break;
+            }
+
+            // Unlock buckets and try again
+            for b in &table.entries[..] {
+                // SAFETY: We hold the lock here, as required
+                b.mutex.unlock();
+            }
+
+            table = new_table;
+        }
+
+        let thread_count = NUM_THREADS.load(Ordering::Relaxed);
+        let mut graph =
+            DiGraphMap::<WaitGraphNode, ()>::with_capacity(thread_count * 2, thread_count * 2);
+
+        for b in &table.entries[..] {
+            let mut current = b.queue_head.get();
+            while !current.is_null() {
+                if !(*current).parked_with_timeout.get()
+                    && !(*current).deadlock_data.deadlocked.get()
+                {
+                    // .resources are waiting for their owner
+                    for &resource in &(*(*current).deadlock_data.resources.get()) {
+                        graph.add_edge(Resource(resource), Thread(current), ());
+                    }
+                    // owner waits for resource .key
+                    graph.add_edge(
+                        Thread(current),
+                        Resource((*current).key.load(Ordering::Relaxed)),
+                        (),
+                    );
+                }
+                current = (*current).next_in_queue.get();
+            }
+        }
+
+        for b in &table.entries[..] {
+            // SAFETY: We hold the lock here, as required
+            b.mutex.unlock();
+        }
+
+        // find cycles
+        let cycles = graph_cycles(&graph);
+
+        let mut results = Vec::with_capacity(cycles.len());
+
+        for cycle in cycles {
+            let (sender, receiver) = mpsc::channel();
+            for td in cycle {
+                let bucket = lock_bucket((*td).key.load(Ordering::Relaxed));
+                (*td).deadlock_data.deadlocked.set(true);
+                *(*td).deadlock_data.backtrace_sender.get() = Some(sender.clone());
+                let handle = (*td).parker.unpark_lock();
+                // SAFETY: We hold the lock here, as required
+                bucket.mutex.unlock();
+                // unpark the deadlocked thread!
+                // on unpark it'll notice the deadlocked flag and report back
+                handle.unpark();
+            }
+            // make sure to drop our sender before collecting results
+            drop(sender);
+            results.push(receiver.iter().collect());
+        }
+
+        DEADLOCK_DETECTION_LOCK.unlock();
+
+        results
+    }
+
+    // normalize a cycle to start with the "smallest" node
+    fn normalize_cycle<T: Ord + Copy + Clone>(input: &[T]) -> Vec<T> {
+        let min_pos = input
+            .iter()
+            .enumerate()
+            .min_by_key(|&(_, &t)| t)
+            .map(|(p, _)| p)
+            .unwrap_or(0);
+        input
+            .iter()
+            .cycle()
+            .skip(min_pos)
+            .take(input.len())
+            .cloned()
+            .collect()
+    }
+
+    // returns all thread cycles in the wait graph
+    fn graph_cycles(g: &DiGraphMap<WaitGraphNode, ()>) -> Vec<Vec<*const ThreadData>> {
+        use petgraph::visit::depth_first_search;
+        use petgraph::visit::DfsEvent;
+        use petgraph::visit::NodeIndexable;
+
+        let mut cycles = HashSet::new();
+        let mut path = Vec::with_capacity(g.node_bound());
+        // start from threads to get the correct threads cycle
+        let threads = g
+            .nodes()
+            .filter(|n| if let &Thread(_) = n { true } else { false });
+
+        depth_first_search(g, threads, |e| match e {
+            DfsEvent::Discover(Thread(n), _) => path.push(n),
+            DfsEvent::Finish(Thread(_), _) => {
+                path.pop();
+            }
+            DfsEvent::BackEdge(_, Thread(n)) => {
+                let from = path.iter().rposition(|&i| i == n).unwrap();
+                cycles.insert(normalize_cycle(&path[from..]));
+            }
+            _ => (),
+        });
+
+        cycles.iter().cloned().collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{ThreadData, DEFAULT_PARK_TOKEN, DEFAULT_UNPARK_TOKEN};
+    use std::{
+        ptr,
+        sync::{
+            atomic::{AtomicIsize, AtomicPtr, AtomicUsize, Ordering},
+            Arc,
+        },
+        thread,
+        time::Duration,
+    };
+
+    /// Calls a closure for every `ThreadData` currently parked on a given key
+    fn for_each(key: usize, mut f: impl FnMut(&ThreadData)) {
+        let bucket = super::lock_bucket(key);
+
+        let mut current: *const ThreadData = bucket.queue_head.get();
+        while !current.is_null() {
+            let current_ref = unsafe { &*current };
+            if current_ref.key.load(Ordering::Relaxed) == key {
+                f(current_ref);
+            }
+            current = current_ref.next_in_queue.get();
+        }
+
+        // SAFETY: We hold the lock here, as required
+        unsafe { bucket.mutex.unlock() };
+    }
+
+    macro_rules! test {
+        ( $( $name:ident(
+            repeats: $repeats:expr,
+            latches: $latches:expr,
+            delay: $delay:expr,
+            threads: $threads:expr,
+            single_unparks: $single_unparks:expr);
+        )* ) => {
+            $(#[test]
+            fn $name() {
+                let delay = Duration::from_micros($delay);
+                for _ in 0..$repeats {
+                    run_parking_test($latches, delay, $threads, $single_unparks);
+                }
+            })*
+        };
+    }
+
+    test! {
+        unpark_all_one_fast(
+            repeats: 10000, latches: 1, delay: 0, threads: 1, single_unparks: 0
+        );
+        unpark_all_hundred_fast(
+            repeats: 100, latches: 1, delay: 0, threads: 100, single_unparks: 0
+        );
+        unpark_one_one_fast(
+            repeats: 1000, latches: 1, delay: 0, threads: 1, single_unparks: 1
+        );
+        unpark_one_hundred_fast(
+            repeats: 20, latches: 1, delay: 0, threads: 100, single_unparks: 100
+        );
+        unpark_one_fifty_then_fifty_all_fast(
+            repeats: 50, latches: 1, delay: 0, threads: 100, single_unparks: 50
+        );
+        unpark_all_one(
+            repeats: 100, latches: 1, delay: 10000, threads: 1, single_unparks: 0
+        );
+        unpark_all_hundred(
+            repeats: 100, latches: 1, delay: 10000, threads: 100, single_unparks: 0
+        );
+        unpark_one_one(
+            repeats: 10, latches: 1, delay: 10000, threads: 1, single_unparks: 1
+        );
+        unpark_one_fifty(
+            repeats: 1, latches: 1, delay: 10000, threads: 50, single_unparks: 50
+        );
+        unpark_one_fifty_then_fifty_all(
+            repeats: 2, latches: 1, delay: 10000, threads: 100, single_unparks: 50
+        );
+        hundred_unpark_all_one_fast(
+            repeats: 100, latches: 100, delay: 0, threads: 1, single_unparks: 0
+        );
+        hundred_unpark_all_one(
+            repeats: 1, latches: 100, delay: 10000, threads: 1, single_unparks: 0
+        );
+    }
+
+    fn run_parking_test(
+        num_latches: usize,
+        delay: Duration,
+        num_threads: usize,
+        num_single_unparks: usize,
+    ) {
+        let mut tests = Vec::with_capacity(num_latches);
+
+        for _ in 0..num_latches {
+            let test = Arc::new(SingleLatchTest::new(num_threads));
+            let mut threads = Vec::with_capacity(num_threads);
+            for _ in 0..num_threads {
+                let test = test.clone();
+                threads.push(thread::spawn(move || test.run()));
+            }
+            tests.push((test, threads));
+        }
+
+        for unpark_index in 0..num_single_unparks {
+            thread::sleep(delay);
+            for (test, _) in &tests {
+                test.unpark_one(unpark_index);
+            }
+        }
+
+        for (test, threads) in tests {
+            test.finish(num_single_unparks);
+            for thread in threads {
+                thread.join().expect("Test thread panic");
+            }
+        }
+    }
+
+    struct SingleLatchTest {
+        semaphore: AtomicIsize,
+        num_awake: AtomicUsize,
+        /// Holds the pointer to the last *unprocessed* woken up thread.
+        last_awoken: AtomicPtr<ThreadData>,
+        /// Total number of threads participating in this test.
+        num_threads: usize,
+    }
+
+    impl SingleLatchTest {
+        pub fn new(num_threads: usize) -> Self {
+            Self {
+                // This implements a fair (FIFO) semaphore, and it starts out unavailable.
+                semaphore: AtomicIsize::new(0),
+                num_awake: AtomicUsize::new(0),
+                last_awoken: AtomicPtr::new(ptr::null_mut()),
+                num_threads,
+            }
+        }
+
+        pub fn run(&self) {
+            // Get one slot from the semaphore
+            self.down();
+
+            // Report back to the test verification code that this thread woke up
+            let this_thread_ptr = super::with_thread_data(|t| t as *const _ as *mut _);
+            self.last_awoken.store(this_thread_ptr, Ordering::SeqCst);
+            self.num_awake.fetch_add(1, Ordering::SeqCst);
+        }
+
+        pub fn unpark_one(&self, single_unpark_index: usize) {
+            // last_awoken should be null at all times except between self.up() and at the bottom
+            // of this method where it's reset to null again
+            assert!(self.last_awoken.load(Ordering::SeqCst).is_null());
+
+            let mut queue: Vec<*mut ThreadData> = Vec::with_capacity(self.num_threads);
+            for_each(self.semaphore_addr(), |thread_data| {
+                queue.push(thread_data as *const _ as *mut _);
+            });
+            assert!(queue.len() <= self.num_threads - single_unpark_index);
+
+            let num_awake_before_up = self.num_awake.load(Ordering::SeqCst);
+
+            self.up();
+
+            // Wait for a parked thread to wake up and update num_awake + last_awoken.
+            while self.num_awake.load(Ordering::SeqCst) != num_awake_before_up + 1 {
+                thread::yield_now();
+            }
+
+            // At this point the other thread should have set last_awoken inside the run() method
+            let last_awoken = self.last_awoken.load(Ordering::SeqCst);
+            assert!(!last_awoken.is_null());
+            if !queue.is_empty() && queue[0] != last_awoken {
+                panic!(
+                    "Woke up wrong thread:\n\tqueue: {:?}\n\tlast awoken: {:?}",
+                    queue, last_awoken
+                );
+            }
+            self.last_awoken.store(ptr::null_mut(), Ordering::SeqCst);
+        }
+
+        pub fn finish(&self, num_single_unparks: usize) {
+            // The amount of threads not unparked via unpark_one
+            let mut num_threads_left = self.num_threads.checked_sub(num_single_unparks).unwrap();
+
+            // Wake remaining threads up with unpark_all. Has to be in a loop, because there might
+            // still be threads that has not yet parked.
+            while num_threads_left > 0 {
+                let mut num_waiting_on_address = 0;
+                for_each(self.semaphore_addr(), |_thread_data| {
+                    num_waiting_on_address += 1;
+                });
+                assert!(num_waiting_on_address <= num_threads_left);
+
+                let num_awake_before_unpark = self.num_awake.load(Ordering::SeqCst);
+
+                let num_unparked =
+                    unsafe { super::unpark_all(self.semaphore_addr(), DEFAULT_UNPARK_TOKEN) };
+                assert!(num_unparked >= num_waiting_on_address);
+                assert!(num_unparked <= num_threads_left);
+
+                // Wait for all unparked threads to wake up and update num_awake + last_awoken.
+                while self.num_awake.load(Ordering::SeqCst)
+                    != num_awake_before_unpark + num_unparked
+                {
+                    thread::yield_now()
+                }
+
+                num_threads_left = num_threads_left.checked_sub(num_unparked).unwrap();
+            }
+            // By now, all threads should have been woken up
+            assert_eq!(self.num_awake.load(Ordering::SeqCst), self.num_threads);
+
+            // Make sure no thread is parked on our semaphore address
+            let mut num_waiting_on_address = 0;
+            for_each(self.semaphore_addr(), |_thread_data| {
+                num_waiting_on_address += 1;
+            });
+            assert_eq!(num_waiting_on_address, 0);
+        }
+
+        pub fn down(&self) {
+            let old_semaphore_value = self.semaphore.fetch_sub(1, Ordering::SeqCst);
+
+            if old_semaphore_value > 0 {
+                // We acquired the semaphore. Done.
+                return;
+            }
+
+            // We need to wait.
+            let validate = || true;
+            let before_sleep = || {};
+            let timed_out = |_, _| {};
+            unsafe {
+                super::park(
+                    self.semaphore_addr(),
+                    validate,
+                    before_sleep,
+                    timed_out,
+                    DEFAULT_PARK_TOKEN,
+                    None,
+                );
+            }
+        }
+
+        pub fn up(&self) {
+            let old_semaphore_value = self.semaphore.fetch_add(1, Ordering::SeqCst);
+
+            // Check if anyone was waiting on the semaphore. If they were, then pass ownership to them.
+            if old_semaphore_value < 0 {
+                // We need to continue until we have actually unparked someone. It might be that
+                // the thread we want to pass ownership to has decremented the semaphore counter,
+                // but not yet parked.
+                loop {
+                    match unsafe {
+                        super::unpark_one(self.semaphore_addr(), |_| DEFAULT_UNPARK_TOKEN)
+                            .unparked_threads
+                    } {
+                        1 => break,
+                        0 => (),
+                        i => panic!("Should not wake up {} threads", i),
+                    }
+                }
+            }
+        }
+
+        fn semaphore_addr(&self) -> usize {
+            &self.semaphore as *const _ as usize
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/spinwait.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/spinwait.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/spinwait.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/spinwait.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,74 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::thread_parker;
+use std::sync::atomic::spin_loop_hint;
+
+// Wastes some CPU time for the given number of iterations,
+// using a hint to indicate to the CPU that we are spinning.
+#[inline]
+fn cpu_relax(iterations: u32) {
+    for _ in 0..iterations {
+        spin_loop_hint()
+    }
+}
+
+/// A counter used to perform exponential backoff in spin loops.
+#[derive(Default)]
+pub struct SpinWait {
+    counter: u32,
+}
+
+impl SpinWait {
+    /// Creates a new `SpinWait`.
+    #[inline]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Resets a `SpinWait` to its initial state.
+    #[inline]
+    pub fn reset(&mut self) {
+        self.counter = 0;
+    }
+
+    /// Spins until the sleep threshold has been reached.
+    ///
+    /// This function returns whether the sleep threshold has been reached, at
+    /// which point further spinning has diminishing returns and the thread
+    /// should be parked instead.
+    ///
+    /// The spin strategy will initially use a CPU-bound loop but will fall back
+    /// to yielding the CPU to the OS after a few iterations.
+    #[inline]
+    pub fn spin(&mut self) -> bool {
+        if self.counter >= 10 {
+            return false;
+        }
+        self.counter += 1;
+        if self.counter <= 3 {
+            cpu_relax(1 << self.counter);
+        } else {
+            thread_parker::thread_yield();
+        }
+        true
+    }
+
+    /// Spins without yielding the thread to the OS.
+    ///
+    /// Instead, the backoff is simply capped at a maximum value. This can be
+    /// used to improve throughput in `compare_exchange` loops that have high
+    /// contention.
+    #[inline]
+    pub fn spin_no_yield(&mut self) {
+        self.counter += 1;
+        if self.counter > 10 {
+            self.counter = 10;
+        }
+        cpu_relax(1 << self.counter);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/cloudabi.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/cloudabi.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/cloudabi.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,304 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use cloudabi as abi;
+use core::{
+    cell::Cell,
+    mem::{self, MaybeUninit},
+    sync::atomic::{AtomicU32, Ordering},
+};
+use std::{convert::TryFrom, thread, time::Instant};
+
+extern "C" {
+    #[thread_local]
+    static __pthread_thread_id: abi::tid;
+}
+
+struct Lock {
+    lock: AtomicU32,
+}
+
+impl Lock {
+    pub fn new() -> Self {
+        Lock {
+            lock: AtomicU32::new(abi::LOCK_UNLOCKED.0),
+        }
+    }
+
+    /// # Safety
+    ///
+    /// See `Lock::lock`.
+    unsafe fn try_lock(&self) -> Option<LockGuard> {
+        // Attempt to acquire the lock.
+        if let Err(old) = self.lock.compare_exchange(
+            abi::LOCK_UNLOCKED.0,
+            __pthread_thread_id.0 | abi::LOCK_WRLOCKED.0,
+            Ordering::Acquire,
+            Ordering::Relaxed,
+        ) {
+            // Failure. Crash upon recursive acquisition.
+            debug_assert_ne!(
+                old & !abi::LOCK_KERNEL_MANAGED.0,
+                __pthread_thread_id.0 | abi::LOCK_WRLOCKED.0,
+                "Attempted to recursive write-lock a lock",
+            );
+            None
+        } else {
+            Some(LockGuard { lock: &self.lock })
+        }
+    }
+
+    /// # Safety
+    ///
+    /// This method is unsafe because the `LockGuard` has a raw pointer into this `Lock`
+    /// that it will access on drop to unlock the lock. So make sure the `LockGuard` goes
+    /// out of scope before the `Lock` it came from moves or goes out of scope.
+    pub unsafe fn lock(&self) -> LockGuard {
+        self.try_lock().unwrap_or_else(|| {
+            // Call into the kernel to acquire a write lock.
+            let subscription = abi::subscription {
+                type_: abi::eventtype::LOCK_WRLOCK,
+                union: abi::subscription_union {
+                    lock: abi::subscription_lock {
+                        lock: self.ptr(),
+                        lock_scope: abi::scope::PRIVATE,
+                    },
+                },
+                ..mem::zeroed()
+            };
+            let mut event = MaybeUninit::<abi::event>::uninit();
+            let mut nevents: usize = 0;
+            let ret = abi::poll(&subscription, event.as_mut_ptr(), 1, &mut nevents);
+            debug_assert_eq!(ret, abi::errno::SUCCESS);
+            debug_assert_eq!(event.assume_init().error, abi::errno::SUCCESS);
+
+            LockGuard { lock: &self.lock }
+        })
+    }
+
+    fn ptr(&self) -> *mut abi::lock {
+        &self.lock as *const AtomicU32 as *mut abi::lock
+    }
+}
+
+struct LockGuard {
+    lock: *const AtomicU32,
+}
+
+impl LockGuard {
+    fn ptr(&self) -> *mut abi::lock {
+        self.lock as *mut abi::lock
+    }
+}
+
+impl Drop for LockGuard {
+    fn drop(&mut self) {
+        let lock = unsafe { &*self.lock };
+        debug_assert_eq!(
+            lock.load(Ordering::Relaxed) & !abi::LOCK_KERNEL_MANAGED.0,
+            unsafe { __pthread_thread_id.0 } | abi::LOCK_WRLOCKED.0,
+            "This lock is not write-locked by this thread"
+        );
+
+        if !lock
+            .compare_exchange(
+                unsafe { __pthread_thread_id.0 } | abi::LOCK_WRLOCKED.0,
+                abi::LOCK_UNLOCKED.0,
+                Ordering::Release,
+                Ordering::Relaxed,
+            )
+            .is_ok()
+        {
+            // Lock is managed by kernelspace. Call into the kernel
+            // to unblock waiting threads.
+            let ret = unsafe { abi::lock_unlock(self.lock as *mut abi::lock, abi::scope::PRIVATE) };
+            debug_assert_eq!(ret, abi::errno::SUCCESS);
+        }
+    }
+}
+
+struct Condvar {
+    condvar: AtomicU32,
+}
+
+impl Condvar {
+    pub fn new() -> Self {
+        Condvar {
+            condvar: AtomicU32::new(abi::CONDVAR_HAS_NO_WAITERS.0),
+        }
+    }
+
+    pub fn wait(&self, lock: &LockGuard) {
+        unsafe {
+            let subscription = abi::subscription {
+                type_: abi::eventtype::CONDVAR,
+                union: abi::subscription_union {
+                    condvar: abi::subscription_condvar {
+                        condvar: self.ptr(),
+                        condvar_scope: abi::scope::PRIVATE,
+                        lock: lock.ptr(),
+                        lock_scope: abi::scope::PRIVATE,
+                    },
+                },
+                ..mem::zeroed()
+            };
+            let mut event = MaybeUninit::<abi::event>::uninit();
+            let mut nevents: usize = 0;
+
+            let ret = abi::poll(&subscription, event.as_mut_ptr(), 1, &mut nevents);
+            debug_assert_eq!(ret, abi::errno::SUCCESS);
+            debug_assert_eq!(event.assume_init().error, abi::errno::SUCCESS);
+        }
+    }
+
+    /// Waits for a signal on the condvar.
+    /// Returns false if it times out before anyone notified us.
+    pub fn wait_timeout(&self, lock: &LockGuard, timeout: abi::timestamp) -> bool {
+        unsafe {
+            let subscriptions = [
+                abi::subscription {
+                    type_: abi::eventtype::CONDVAR,
+                    union: abi::subscription_union {
+                        condvar: abi::subscription_condvar {
+                            condvar: self.ptr(),
+                            condvar_scope: abi::scope::PRIVATE,
+                            lock: lock.ptr(),
+                            lock_scope: abi::scope::PRIVATE,
+                        },
+                    },
+                    ..mem::zeroed()
+                },
+                abi::subscription {
+                    type_: abi::eventtype::CLOCK,
+                    union: abi::subscription_union {
+                        clock: abi::subscription_clock {
+                            clock_id: abi::clockid::MONOTONIC,
+                            timeout,
+                            ..mem::zeroed()
+                        },
+                    },
+                    ..mem::zeroed()
+                },
+            ];
+            let mut events = MaybeUninit::<[abi::event; 2]>::uninit();
+            let mut nevents: usize = 0;
+
+            let ret = abi::poll(
+                subscriptions.as_ptr(),
+                events.as_mut_ptr() as *mut _,
+                2,
+                &mut nevents,
+            );
+            debug_assert_eq!(ret, abi::errno::SUCCESS);
+            let events = events.assume_init();
+            for i in 0..nevents {
+                debug_assert_eq!(events[i].error, abi::errno::SUCCESS);
+                if events[i].type_ == abi::eventtype::CONDVAR {
+                    return true;
+                }
+            }
+        }
+        false
+    }
+
+    pub fn notify(&self) {
+        let ret = unsafe { abi::condvar_signal(self.ptr(), abi::scope::PRIVATE, 1) };
+        debug_assert_eq!(ret, abi::errno::SUCCESS);
+    }
+
+    fn ptr(&self) -> *mut abi::condvar {
+        &self.condvar as *const AtomicU32 as *mut abi::condvar
+    }
+}
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    should_park: Cell<bool>,
+    lock: Lock,
+    condvar: Condvar,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    fn new() -> ThreadParker {
+        ThreadParker {
+            should_park: Cell::new(false),
+            lock: Lock::new(),
+            condvar: Condvar::new(),
+        }
+    }
+
+    unsafe fn prepare_park(&self) {
+        self.should_park.set(true);
+    }
+
+    unsafe fn timed_out(&self) -> bool {
+        // We need to grab the lock here because another thread may be
+        // concurrently executing UnparkHandle::unpark, which is done without
+        // holding the queue lock.
+        let _guard = self.lock.lock();
+        self.should_park.get()
+    }
+
+    unsafe fn park(&self) {
+        let guard = self.lock.lock();
+        while self.should_park.get() {
+            self.condvar.wait(&guard);
+        }
+    }
+
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        let guard = self.lock.lock();
+        while self.should_park.get() {
+            if let Some(duration_left) = timeout.checked_duration_since(Instant::now()) {
+                if let Ok(nanos_left) = abi::timestamp::try_from(duration_left.as_nanos()) {
+                    self.condvar.wait_timeout(&guard, nanos_left);
+                } else {
+                    // remaining timeout overflows an abi::timestamp. Sleep indefinitely
+                    self.condvar.wait(&guard);
+                }
+            } else {
+                // We timed out
+                return false;
+            }
+        }
+        true
+    }
+
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        let _lock_guard = self.lock.lock();
+
+        UnparkHandle {
+            thread_parker: self,
+            _lock_guard,
+        }
+    }
+}
+
+pub struct UnparkHandle {
+    thread_parker: *const ThreadParker,
+    _lock_guard: LockGuard,
+}
+
+impl super::UnparkHandleT for UnparkHandle {
+    unsafe fn unpark(self) {
+        (*self.thread_parker).should_park.set(false);
+
+        // We notify while holding the lock here to avoid races with the target
+        // thread. In particular, the thread could exit after we unlock the
+        // mutex, which would make the condvar access invalid memory.
+        (*self.thread_parker).condvar.notify();
+    }
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/generic.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/generic.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/generic.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/generic.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,77 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! A simple spin lock based thread parker. Used on platforms without better
+//! parking facilities available.
+
+use core::sync::atomic::{spin_loop_hint, AtomicBool, Ordering};
+use std::{thread, time::Instant};
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    parked: AtomicBool,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            parked: AtomicBool::new(false),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.parked.store(true, Ordering::Relaxed);
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        self.parked.load(Ordering::Relaxed) != false
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        while self.parked.load(Ordering::Acquire) != false {
+            spin_loop_hint();
+        }
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        while self.parked.load(Ordering::Acquire) != false {
+            if Instant::now() >= timeout {
+                return false;
+            }
+            spin_loop_hint();
+        }
+        true
+    }
+
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        self.parked.store(false, Ordering::Release);
+        UnparkHandle(())
+    }
+}
+
+pub struct UnparkHandle(());
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {}
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/linux.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/linux.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/linux.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/linux.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,155 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    ptr,
+    sync::atomic::{AtomicI32, Ordering},
+};
+use libc;
+use std::{thread, time::Instant};
+
+// x32 Linux uses a non-standard type for tv_nsec in timespec.
+// See https://sourceware.org/bugzilla/show_bug.cgi?id=16437
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+#[allow(non_camel_case_types)]
+type tv_nsec_t = i64;
+#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
+#[allow(non_camel_case_types)]
+type tv_nsec_t = libc::c_long;
+
+fn errno() -> libc::c_int {
+    #[cfg(target_os = "linux")]
+    unsafe {
+        *libc::__errno_location()
+    }
+    #[cfg(target_os = "android")]
+    unsafe {
+        *libc::__errno()
+    }
+}
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    futex: AtomicI32,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            futex: AtomicI32::new(0),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.futex.store(1, Ordering::Relaxed);
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        self.futex.load(Ordering::Relaxed) != 0
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        while self.futex.load(Ordering::Acquire) != 0 {
+            self.futex_wait(None);
+        }
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        while self.futex.load(Ordering::Acquire) != 0 {
+            let now = Instant::now();
+            if timeout <= now {
+                return false;
+            }
+            let diff = timeout - now;
+            if diff.as_secs() as libc::time_t as u64 != diff.as_secs() {
+                // Timeout overflowed, just sleep indefinitely
+                self.park();
+                return true;
+            }
+            let ts = libc::timespec {
+                tv_sec: diff.as_secs() as libc::time_t,
+                tv_nsec: diff.subsec_nanos() as tv_nsec_t,
+            };
+            self.futex_wait(Some(ts));
+        }
+        true
+    }
+
+    // Locks the parker to prevent the target thread from exiting. This is
+    // necessary to ensure that thread-local ThreadData objects remain valid.
+    // This should be called while holding the queue lock.
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        self.futex.store(0, Ordering::Release);
+
+        UnparkHandle { futex: &self.futex }
+    }
+}
+
+impl ThreadParker {
+    #[inline]
+    fn futex_wait(&self, ts: Option<libc::timespec>) {
+        let ts_ptr = ts
+            .as_ref()
+            .map(|ts_ref| ts_ref as *const _)
+            .unwrap_or(ptr::null());
+        let r = unsafe {
+            libc::syscall(
+                libc::SYS_futex,
+                &self.futex,
+                libc::FUTEX_WAIT | libc::FUTEX_PRIVATE_FLAG,
+                1,
+                ts_ptr,
+            )
+        };
+        debug_assert!(r == 0 || r == -1);
+        if r == -1 {
+            debug_assert!(
+                errno() == libc::EINTR
+                    || errno() == libc::EAGAIN
+                    || (ts.is_some() && errno() == libc::ETIMEDOUT)
+            );
+        }
+    }
+}
+
+pub struct UnparkHandle {
+    futex: *const AtomicI32,
+}
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {
+        // The thread data may have been freed at this point, but it doesn't
+        // matter since the syscall will just return EFAULT in that case.
+        let r = libc::syscall(
+            libc::SYS_futex,
+            self.futex,
+            libc::FUTEX_WAKE | libc::FUTEX_PRIVATE_FLAG,
+            1,
+        );
+        debug_assert!(r == 0 || r == 1 || r == -1);
+        if r == -1 {
+            debug_assert_eq!(errno(), libc::EFAULT);
+        }
+    }
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/mod.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/mod.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/mod.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,88 @@
+use cfg_if::cfg_if;
+use std::time::Instant;
+
+/// Trait for the platform thread parker implementation.
+///
+/// All unsafe methods are unsafe because the Unix thread parker is based on
+/// pthread mutexes and condvars. Those primitives must not be moved and used
+/// from any other memory address than the one they were located at when they
+/// were initialized. As such, it's UB to call any unsafe method on
+/// `ThreadParkerT` if the implementing instance has moved since the last
+/// call to any of the unsafe methods.
+pub trait ThreadParkerT {
+    type UnparkHandle: UnparkHandleT;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool;
+
+    fn new() -> Self;
+
+    /// Prepares the parker. This should be called before adding it to the queue.
+    unsafe fn prepare_park(&self);
+
+    /// Checks if the park timed out. This should be called while holding the
+    /// queue lock after park_until has returned false.
+    unsafe fn timed_out(&self) -> bool;
+
+    /// Parks the thread until it is unparked. This should be called after it has
+    /// been added to the queue, after unlocking the queue.
+    unsafe fn park(&self);
+
+    /// Parks the thread until it is unparked or the timeout is reached. This
+    /// should be called after it has been added to the queue, after unlocking
+    /// the queue. Returns true if we were unparked and false if we timed out.
+    unsafe fn park_until(&self, timeout: Instant) -> bool;
+
+    /// Locks the parker to prevent the target thread from exiting. This is
+    /// necessary to ensure that thread-local ThreadData objects remain valid.
+    /// This should be called while holding the queue lock.
+    unsafe fn unpark_lock(&self) -> Self::UnparkHandle;
+}
+
+/// Handle for a thread that is about to be unparked. We need to mark the thread
+/// as unparked while holding the queue lock, but we delay the actual unparking
+/// until after the queue lock is released.
+pub trait UnparkHandleT {
+    /// Wakes up the parked thread. This should be called after the queue lock is
+    /// released to avoid blocking the queue for too long.
+    ///
+    /// This method is unsafe for the same reason as the unsafe methods in
+    /// `ThreadParkerT`.
+    unsafe fn unpark(self);
+}
+
+cfg_if! {
+    if #[cfg(any(target_os = "linux", target_os = "android"))] {
+        #[path = "linux.rs"]
+        mod imp;
+    } else if #[cfg(unix)] {
+        #[path = "unix.rs"]
+        mod imp;
+    } else if #[cfg(windows)] {
+        #[path = "windows/mod.rs"]
+        mod imp;
+    } else if #[cfg(target_os = "redox")] {
+        #[path = "redox.rs"]
+        mod imp;
+    } else if #[cfg(all(target_env = "sgx", target_vendor = "fortanix"))] {
+        #[path = "sgx.rs"]
+        mod imp;
+    } else if #[cfg(all(
+        feature = "nightly",
+        target_arch = "wasm32",
+        target_feature = "atomics"
+    ))] {
+        #[path = "wasm_atomic.rs"]
+        mod imp;
+    } else if #[cfg(target_arch = "wasm32")] {
+        #[path = "wasm.rs"]
+        mod imp;
+    } else if #[cfg(all(feature = "nightly", target_os = "cloudabi"))] {
+        #[path = "cloudabi.rs"]
+        mod imp;
+    } else {
+        #[path = "generic.rs"]
+        mod imp;
+    }
+}
+
+pub use self::imp::{thread_yield, ThreadParker, UnparkHandle};
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/redox.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/redox.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/redox.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/redox.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,138 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    ptr,
+    sync::atomic::{AtomicI32, Ordering},
+};
+use std::{thread, time::Instant};
+use syscall::{
+    call::futex,
+    data::TimeSpec,
+    error::{Error, EAGAIN, EFAULT, EINTR, ETIMEDOUT},
+    flag::{FUTEX_WAIT, FUTEX_WAKE},
+};
+
+const UNPARKED: i32 = 0;
+const PARKED: i32 = 1;
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    futex: AtomicI32,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            futex: AtomicI32::new(UNPARKED),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.futex.store(PARKED, Ordering::Relaxed);
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        self.futex.load(Ordering::Relaxed) != UNPARKED
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        while self.futex.load(Ordering::Acquire) != UNPARKED {
+            self.futex_wait(None);
+        }
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        while self.futex.load(Ordering::Acquire) != UNPARKED {
+            let now = Instant::now();
+            if timeout <= now {
+                return false;
+            }
+            let diff = timeout - now;
+            if diff.as_secs() > i64::max_value() as u64 {
+                // Timeout overflowed, just sleep indefinitely
+                self.park();
+                return true;
+            }
+            let ts = TimeSpec {
+                tv_sec: diff.as_secs() as i64,
+                tv_nsec: diff.subsec_nanos() as i32,
+            };
+            self.futex_wait(Some(ts));
+        }
+        true
+    }
+
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        self.futex.store(UNPARKED, Ordering::Release);
+
+        UnparkHandle { futex: self.ptr() }
+    }
+}
+
+impl ThreadParker {
+    #[inline]
+    fn futex_wait(&self, ts: Option<TimeSpec>) {
+        let ts_ptr = ts
+            .as_ref()
+            .map(|ts_ref| ts_ref as *const _)
+            .unwrap_or(ptr::null());
+        let r = unsafe {
+            futex(
+                self.ptr(),
+                FUTEX_WAIT,
+                PARKED,
+                ts_ptr as usize,
+                ptr::null_mut(),
+            )
+        };
+        match r {
+            Ok(r) => debug_assert_eq!(r, 0),
+            Err(Error { errno }) => {
+                debug_assert!(errno == EINTR || errno == EAGAIN || errno == ETIMEDOUT);
+            }
+        }
+    }
+
+    #[inline]
+    fn ptr(&self) -> *mut i32 {
+        &self.futex as *const AtomicI32 as *mut i32
+    }
+}
+
+pub struct UnparkHandle {
+    futex: *mut i32,
+}
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {
+        // The thread data may have been freed at this point, but it doesn't
+        // matter since the syscall will just return EFAULT in that case.
+        let r = futex(self.futex, FUTEX_WAKE, PARKED, 0, ptr::null_mut());
+        match r {
+            Ok(num_woken) => debug_assert!(num_woken == 0 || num_woken == 1),
+            Err(Error { errno }) => debug_assert_eq!(errno, EFAULT),
+        }
+    }
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/sgx.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/sgx.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/sgx.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/sgx.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,94 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::sync::atomic::{AtomicBool, Ordering};
+use std::{
+    io,
+    os::fortanix_sgx::{
+        thread::current as current_tcs,
+        usercalls::{
+            self,
+            raw::{Tcs, EV_UNPARK, WAIT_INDEFINITE},
+        },
+    },
+    thread,
+    time::Instant,
+};
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    parked: AtomicBool,
+    tcs: Tcs,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            parked: AtomicBool::new(false),
+            tcs: current_tcs(),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.parked.store(true, Ordering::Relaxed);
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        self.parked.load(Ordering::Relaxed)
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        while self.parked.load(Ordering::Acquire) {
+            let result = usercalls::wait(EV_UNPARK, WAIT_INDEFINITE);
+            debug_assert_eq!(result.expect("wait returned error") & EV_UNPARK, EV_UNPARK);
+        }
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, _timeout: Instant) -> bool {
+        // FIXME: https://github.com/fortanix/rust-sgx/issues/31
+        panic!("timeout not supported in SGX");
+    }
+
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        self.parked.store(false, Ordering::Release);
+        UnparkHandle(self.tcs)
+    }
+}
+
+pub struct UnparkHandle(Tcs);
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {
+        let result = usercalls::send(EV_UNPARK, Some(self.0));
+        if cfg!(debug_assertions) {
+            if let Err(error) = result {
+                // `InvalidInput` may be returned if the thread we send to has
+                // already been unparked and exited.
+                if error.kind() != io::ErrorKind::InvalidInput {
+                    panic!("send returned an unexpected error: {:?}", error);
+                }
+            }
+        }
+    }
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/unix.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/unix.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/unix.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/unix.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,252 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+use core::ptr;
+use core::{
+    cell::{Cell, UnsafeCell},
+    mem::MaybeUninit,
+};
+use libc;
+use std::{
+    thread,
+    time::{Duration, Instant},
+};
+
+// x32 Linux uses a non-standard type for tv_nsec in timespec.
+// See https://sourceware.org/bugzilla/show_bug.cgi?id=16437
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
+#[allow(non_camel_case_types)]
+type tv_nsec_t = i64;
+#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
+#[allow(non_camel_case_types)]
+type tv_nsec_t = libc::c_long;
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    should_park: Cell<bool>,
+    mutex: UnsafeCell<libc::pthread_mutex_t>,
+    condvar: UnsafeCell<libc::pthread_cond_t>,
+    initialized: Cell<bool>,
+}
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = false;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            should_park: Cell::new(false),
+            mutex: UnsafeCell::new(libc::PTHREAD_MUTEX_INITIALIZER),
+            condvar: UnsafeCell::new(libc::PTHREAD_COND_INITIALIZER),
+            initialized: Cell::new(false),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.should_park.set(true);
+        if !self.initialized.get() {
+            self.init();
+            self.initialized.set(true);
+        }
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        // We need to grab the mutex here because another thread may be
+        // concurrently executing UnparkHandle::unpark, which is done without
+        // holding the queue lock.
+        let r = libc::pthread_mutex_lock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+        let should_park = self.should_park.get();
+        let r = libc::pthread_mutex_unlock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+        should_park
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        let r = libc::pthread_mutex_lock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+        while self.should_park.get() {
+            let r = libc::pthread_cond_wait(self.condvar.get(), self.mutex.get());
+            debug_assert_eq!(r, 0);
+        }
+        let r = libc::pthread_mutex_unlock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        let r = libc::pthread_mutex_lock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+        while self.should_park.get() {
+            let now = Instant::now();
+            if timeout <= now {
+                let r = libc::pthread_mutex_unlock(self.mutex.get());
+                debug_assert_eq!(r, 0);
+                return false;
+            }
+
+            if let Some(ts) = timeout_to_timespec(timeout - now) {
+                let r = libc::pthread_cond_timedwait(self.condvar.get(), self.mutex.get(), &ts);
+                if ts.tv_sec < 0 {
+                    // On some systems, negative timeouts will return EINVAL. In
+                    // that case we won't sleep and will just busy loop instead,
+                    // which is the best we can do.
+                    debug_assert!(r == 0 || r == libc::ETIMEDOUT || r == libc::EINVAL);
+                } else {
+                    debug_assert!(r == 0 || r == libc::ETIMEDOUT);
+                }
+            } else {
+                // Timeout calculation overflowed, just sleep indefinitely
+                let r = libc::pthread_cond_wait(self.condvar.get(), self.mutex.get());
+                debug_assert_eq!(r, 0);
+            }
+        }
+        let r = libc::pthread_mutex_unlock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+        true
+    }
+
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        let r = libc::pthread_mutex_lock(self.mutex.get());
+        debug_assert_eq!(r, 0);
+
+        UnparkHandle {
+            thread_parker: self,
+        }
+    }
+}
+
+impl ThreadParker {
+    /// Initializes the condvar to use CLOCK_MONOTONIC instead of CLOCK_REALTIME.
+    #[cfg(any(target_os = "macos", target_os = "ios", target_os = "android"))]
+    #[inline]
+    unsafe fn init(&self) {}
+
+    /// Initializes the condvar to use CLOCK_MONOTONIC instead of CLOCK_REALTIME.
+    #[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "android")))]
+    #[inline]
+    unsafe fn init(&self) {
+        let mut attr = MaybeUninit::<libc::pthread_condattr_t>::uninit();
+        let r = libc::pthread_condattr_init(attr.as_mut_ptr());
+        debug_assert_eq!(r, 0);
+        let r = libc::pthread_condattr_setclock(attr.as_mut_ptr(), libc::CLOCK_MONOTONIC);
+        debug_assert_eq!(r, 0);
+        let r = libc::pthread_cond_init(self.condvar.get(), attr.as_ptr());
+        debug_assert_eq!(r, 0);
+        let r = libc::pthread_condattr_destroy(attr.as_mut_ptr());
+        debug_assert_eq!(r, 0);
+    }
+}
+
+impl Drop for ThreadParker {
+    #[inline]
+    fn drop(&mut self) {
+        // On DragonFly pthread_mutex_destroy() returns EINVAL if called on a
+        // mutex that was just initialized with libc::PTHREAD_MUTEX_INITIALIZER.
+        // Once it is used (locked/unlocked) or pthread_mutex_init() is called,
+        // this behaviour no longer occurs. The same applies to condvars.
+        unsafe {
+            let r = libc::pthread_mutex_destroy(self.mutex.get());
+            if cfg!(target_os = "dragonfly") {
+                debug_assert!(r == 0 || r == libc::EINVAL);
+            } else {
+                debug_assert_eq!(r, 0);
+            }
+            let r = libc::pthread_cond_destroy(self.condvar.get());
+            if cfg!(target_os = "dragonfly") {
+                debug_assert!(r == 0 || r == libc::EINVAL);
+            } else {
+                debug_assert_eq!(r, 0);
+            }
+        }
+    }
+}
+
+pub struct UnparkHandle {
+    thread_parker: *const ThreadParker,
+}
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {
+        (*self.thread_parker).should_park.set(false);
+
+        // We notify while holding the lock here to avoid races with the target
+        // thread. In particular, the thread could exit after we unlock the
+        // mutex, which would make the condvar access invalid memory.
+        let r = libc::pthread_cond_signal((*self.thread_parker).condvar.get());
+        debug_assert_eq!(r, 0);
+        let r = libc::pthread_mutex_unlock((*self.thread_parker).mutex.get());
+        debug_assert_eq!(r, 0);
+    }
+}
+
+// Returns the current time on the clock used by pthread_cond_t as a timespec.
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+#[inline]
+fn timespec_now() -> libc::timespec {
+    let mut now = MaybeUninit::<libc::timeval>::uninit();
+    let r = unsafe { libc::gettimeofday(now.as_mut_ptr(), ptr::null_mut()) };
+    debug_assert_eq!(r, 0);
+    // SAFETY: We know `libc::gettimeofday` has initialized the value.
+    let now = unsafe { now.assume_init() };
+    libc::timespec {
+        tv_sec: now.tv_sec,
+        tv_nsec: now.tv_usec as tv_nsec_t * 1000,
+    }
+}
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+#[inline]
+fn timespec_now() -> libc::timespec {
+    let mut now = MaybeUninit::<libc::timespec>::uninit();
+    let clock = if cfg!(target_os = "android") {
+        // Android doesn't support pthread_condattr_setclock, so we need to
+        // specify the timeout in CLOCK_REALTIME.
+        libc::CLOCK_REALTIME
+    } else {
+        libc::CLOCK_MONOTONIC
+    };
+    let r = unsafe { libc::clock_gettime(clock, now.as_mut_ptr()) };
+    debug_assert_eq!(r, 0);
+    // SAFETY: We know `libc::clock_gettime` has initialized the value.
+    unsafe { now.assume_init() }
+}
+
+// Converts a relative timeout into an absolute timeout in the clock used by
+// pthread_cond_t.
+#[inline]
+fn timeout_to_timespec(timeout: Duration) -> Option<libc::timespec> {
+    // Handle overflows early on
+    if timeout.as_secs() > libc::time_t::max_value() as u64 {
+        return None;
+    }
+
+    let now = timespec_now();
+    let mut nsec = now.tv_nsec + timeout.subsec_nanos() as tv_nsec_t;
+    let mut sec = now.tv_sec.checked_add(timeout.as_secs() as libc::time_t);
+    if nsec >= 1_000_000_000 {
+        nsec -= 1_000_000_000;
+        sec = sec.and_then(|sec| sec.checked_add(1));
+    }
+
+    sec.map(|sec| libc::timespec {
+        tv_nsec: nsec,
+        tv_sec: sec,
+    })
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,96 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    arch::wasm32,
+    sync::atomic::{AtomicI32, Ordering},
+};
+use std::{convert::TryFrom, thread, time::Instant};
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    parked: AtomicI32,
+}
+
+const UNPARKED: i32 = 0;
+const PARKED: i32 = 1;
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    fn new() -> ThreadParker {
+        ThreadParker {
+            parked: AtomicI32::new(UNPARKED),
+        }
+    }
+
+    #[inline]
+    unsafe fn prepare_park(&self) {
+        self.parked.store(PARKED, Ordering::Relaxed);
+    }
+
+    #[inline]
+    unsafe fn timed_out(&self) -> bool {
+        self.parked.load(Ordering::Relaxed) == PARKED
+    }
+
+    #[inline]
+    unsafe fn park(&self) {
+        while self.parked.load(Ordering::Acquire) == PARKED {
+            let r = unsafe { wasm32::i32_atomic_wait(self.ptr(), PARKED, -1) };
+            // we should have either woken up (0) or got a not-equal due to a
+            // race (1). We should never time out (2)
+            debug_assert!(r == 0 || r == 1);
+        }
+    }
+
+    #[inline]
+    unsafe fn park_until(&self, timeout: Instant) -> bool {
+        while self.parked.load(Ordering::Acquire) == PARKED {
+            if let Some(left) = timeout.checked_duration_since(Instant::now()) {
+                let nanos_left = i64::try_from(left.as_nanos()).unwrap_or(i64::max_value());
+                let r = unsafe { wasm32::i32_atomic_wait(self.ptr(), PARKED, nanos_left) };
+                debug_assert!(r == 0 || r == 1 || r == 2);
+            } else {
+                return false;
+            }
+        }
+        true
+    }
+
+    #[inline]
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        self.parked.store(UNPARKED, Ordering::Release);
+        UnparkHandle(self.ptr())
+    }
+}
+
+impl ThreadParker {
+    #[inline]
+    fn ptr(&self) -> *mut i32 {
+        &self.parked as *const AtomicI32 as *mut i32
+    }
+}
+
+pub struct UnparkHandle(*mut i32);
+
+impl super::UnparkHandleT for UnparkHandle {
+    #[inline]
+    unsafe fn unpark(self) {
+        let num_notified = unsafe { wasm32::atomic_notify(self.0 as *mut i32, 1) };
+        debug_assert!(num_notified == 0 || num_notified == 1);
+    }
+}
+
+#[inline]
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/wasm.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,53 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! The wasm platform can't park when atomic support is not available.
+//! So this ThreadParker just panics on any attempt to park.
+
+use std::{thread, time::Instant};
+
+pub struct ThreadParker(());
+
+impl super::ThreadParkerT for ThreadParker {
+    type UnparkHandle = UnparkHandle;
+
+    const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    fn new() -> ThreadParker {
+        ThreadParker(())
+    }
+
+    unsafe fn prepare_park(&self) {
+        panic!("Parking not supported on this platform");
+    }
+
+    unsafe fn timed_out(&self) -> bool {
+        panic!("Parking not supported on this platform");
+    }
+
+    unsafe fn park(&self) {
+        panic!("Parking not supported on this platform");
+    }
+
+    unsafe fn park_until(&self, _timeout: Instant) -> bool {
+        panic!("Parking not supported on this platform");
+    }
+
+    unsafe fn unpark_lock(&self) -> UnparkHandle {
+        panic!("Parking not supported on this platform");
+    }
+}
+
+pub struct UnparkHandle(());
+
+impl super::UnparkHandleT for UnparkHandle {
+    unsafe fn unpark(self) {}
+}
+
+pub fn thread_yield() {
+    thread::yield_now();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,220 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    mem::{self, MaybeUninit},
+    ptr,
+};
+use std::{
+    sync::atomic::{AtomicUsize, Ordering},
+    time::Instant,
+};
+use winapi::{
+    shared::{
+        minwindef::{TRUE, ULONG},
+        ntdef::NTSTATUS,
+        ntstatus::{STATUS_SUCCESS, STATUS_TIMEOUT},
+    },
+    um::{
+        handleapi::CloseHandle,
+        libloaderapi::{GetModuleHandleA, GetProcAddress},
+        winnt::{
+            ACCESS_MASK, BOOLEAN, GENERIC_READ, GENERIC_WRITE, HANDLE, LARGE_INTEGER, LPCSTR,
+            PHANDLE, PLARGE_INTEGER, PVOID,
+        },
+    },
+};
+
+const STATE_UNPARKED: usize = 0;
+const STATE_PARKED: usize = 1;
+const STATE_TIMED_OUT: usize = 2;
+
+#[allow(non_snake_case)]
+pub struct KeyedEvent {
+    handle: HANDLE,
+    NtReleaseKeyedEvent: extern "system" fn(
+        EventHandle: HANDLE,
+        Key: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS,
+    NtWaitForKeyedEvent: extern "system" fn(
+        EventHandle: HANDLE,
+        Key: PVOID,
+        Alertable: BOOLEAN,
+        Timeout: PLARGE_INTEGER,
+    ) -> NTSTATUS,
+}
+
+impl KeyedEvent {
+    #[inline]
+    unsafe fn wait_for(&self, key: PVOID, timeout: PLARGE_INTEGER) -> NTSTATUS {
+        (self.NtWaitForKeyedEvent)(self.handle, key, 0, timeout)
+    }
+
+    #[inline]
+    unsafe fn release(&self, key: PVOID) -> NTSTATUS {
+        (self.NtReleaseKeyedEvent)(self.handle, key, 0, ptr::null_mut())
+    }
+
+    #[allow(non_snake_case)]
+    pub fn create() -> Option<KeyedEvent> {
+        unsafe {
+            let ntdll = GetModuleHandleA(b"ntdll.dll\0".as_ptr() as LPCSTR);
+            if ntdll.is_null() {
+                return None;
+            }
+
+            let NtCreateKeyedEvent =
+                GetProcAddress(ntdll, b"NtCreateKeyedEvent\0".as_ptr() as LPCSTR);
+            if NtCreateKeyedEvent.is_null() {
+                return None;
+            }
+            let NtReleaseKeyedEvent =
+                GetProcAddress(ntdll, b"NtReleaseKeyedEvent\0".as_ptr() as LPCSTR);
+            if NtReleaseKeyedEvent.is_null() {
+                return None;
+            }
+            let NtWaitForKeyedEvent =
+                GetProcAddress(ntdll, b"NtWaitForKeyedEvent\0".as_ptr() as LPCSTR);
+            if NtWaitForKeyedEvent.is_null() {
+                return None;
+            }
+
+            let NtCreateKeyedEvent: extern "system" fn(
+                KeyedEventHandle: PHANDLE,
+                DesiredAccess: ACCESS_MASK,
+                ObjectAttributes: PVOID,
+                Flags: ULONG,
+            ) -> NTSTATUS = mem::transmute(NtCreateKeyedEvent);
+            let mut handle = MaybeUninit::uninit();
+            let status = NtCreateKeyedEvent(
+                handle.as_mut_ptr(),
+                GENERIC_READ | GENERIC_WRITE,
+                ptr::null_mut(),
+                0,
+            );
+            if status != STATUS_SUCCESS {
+                return None;
+            }
+
+            Some(KeyedEvent {
+                handle: handle.assume_init(),
+                NtReleaseKeyedEvent: mem::transmute(NtReleaseKeyedEvent),
+                NtWaitForKeyedEvent: mem::transmute(NtWaitForKeyedEvent),
+            })
+        }
+    }
+
+    #[inline]
+    pub fn prepare_park(&'static self, key: &AtomicUsize) {
+        key.store(STATE_PARKED, Ordering::Relaxed);
+    }
+
+    #[inline]
+    pub fn timed_out(&'static self, key: &AtomicUsize) -> bool {
+        key.load(Ordering::Relaxed) == STATE_TIMED_OUT
+    }
+
+    #[inline]
+    pub unsafe fn park(&'static self, key: &AtomicUsize) {
+        let status = self.wait_for(key as *const _ as PVOID, ptr::null_mut());
+        debug_assert_eq!(status, STATUS_SUCCESS);
+    }
+
+    #[inline]
+    pub unsafe fn park_until(&'static self, key: &AtomicUsize, timeout: Instant) -> bool {
+        let now = Instant::now();
+        if timeout <= now {
+            // If another thread unparked us, we need to call
+            // NtWaitForKeyedEvent otherwise that thread will stay stuck at
+            // NtReleaseKeyedEvent.
+            if key.swap(STATE_TIMED_OUT, Ordering::Relaxed) == STATE_UNPARKED {
+                self.park(key);
+                return true;
+            }
+            return false;
+        }
+
+        // NT uses a timeout in units of 100ns. We use a negative value to
+        // indicate a relative timeout based on a monotonic clock.
+        let mut nt_timeout: LARGE_INTEGER = mem::zeroed();
+        let diff = timeout - now;
+        let value = (diff.as_secs() as i64)
+            .checked_mul(-10000000)
+            .and_then(|x| x.checked_sub((diff.subsec_nanos() as i64 + 99) / 100));
+
+        match value {
+            Some(x) => *nt_timeout.QuadPart_mut() = x,
+            None => {
+                // Timeout overflowed, just sleep indefinitely
+                self.park(key);
+                return true;
+            }
+        };
+
+        let status = self.wait_for(key as *const _ as PVOID, &mut nt_timeout);
+        if status == STATUS_SUCCESS {
+            return true;
+        }
+        debug_assert_eq!(status, STATUS_TIMEOUT);
+
+        // If another thread unparked us, we need to call NtWaitForKeyedEvent
+        // otherwise that thread will stay stuck at NtReleaseKeyedEvent.
+        if key.swap(STATE_TIMED_OUT, Ordering::Relaxed) == STATE_UNPARKED {
+            self.park(key);
+            return true;
+        }
+        false
+    }
+
+    #[inline]
+    pub unsafe fn unpark_lock(&'static self, key: &AtomicUsize) -> UnparkHandle {
+        // If the state was STATE_PARKED then we need to wake up the thread
+        if key.swap(STATE_UNPARKED, Ordering::Relaxed) == STATE_PARKED {
+            UnparkHandle {
+                key: key,
+                keyed_event: self,
+            }
+        } else {
+            UnparkHandle {
+                key: ptr::null(),
+                keyed_event: self,
+            }
+        }
+    }
+}
+
+impl Drop for KeyedEvent {
+    #[inline]
+    fn drop(&mut self) {
+        unsafe {
+            let ok = CloseHandle(self.handle);
+            debug_assert_eq!(ok, TRUE);
+        }
+    }
+}
+
+// Handle for a thread that is about to be unparked. We need to mark the thread
+// as unparked while holding the queue lock, but we delay the actual unparking
+// until after the queue lock is released.
+pub struct UnparkHandle {
+    key: *const AtomicUsize,
+    keyed_event: &'static KeyedEvent,
+}
+
+impl UnparkHandle {
+    // Wakes up the parked thread. This should be called after the queue lock is
+    // released to avoid blocking the queue for too long.
+    #[inline]
+    pub unsafe fn unpark(self) {
+        if !self.key.is_null() {
+            let status = self.keyed_event.release(self.key as PVOID);
+            debug_assert_eq!(status, STATUS_SUCCESS);
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/mod.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/mod.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/mod.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,188 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    ptr,
+    sync::atomic::{AtomicPtr, AtomicUsize, Ordering},
+};
+use std::time::Instant;
+
+mod keyed_event;
+mod waitaddress;
+
+enum Backend {
+    KeyedEvent(keyed_event::KeyedEvent),
+    WaitAddress(waitaddress::WaitAddress),
+}
+
+static BACKEND: AtomicPtr<Backend> = AtomicPtr::new(ptr::null_mut());
+
+impl Backend {
+    #[inline]
+    fn get() -> &'static Backend {
+        // Fast path: use the existing object
+        let backend_ptr = BACKEND.load(Ordering::Acquire);
+        if !backend_ptr.is_null() {
+            return unsafe { &*backend_ptr };
+        };
+
+        Backend::create()
+    }
+
+    #[cold]
+    fn create() -> &'static Backend {
+        // Try to create a new Backend
+        let backend;
+        if let Some(waitaddress) = waitaddress::WaitAddress::create() {
+            backend = Backend::WaitAddress(waitaddress);
+        } else if let Some(keyed_event) = keyed_event::KeyedEvent::create() {
+            backend = Backend::KeyedEvent(keyed_event);
+        } else {
+            panic!(
+                "parking_lot requires either NT Keyed Events (WinXP+) or \
+                 WaitOnAddress/WakeByAddress (Win8+)"
+            );
+        }
+
+        // Try to set our new Backend as the global one
+        let backend_ptr = Box::into_raw(Box::new(backend));
+        match BACKEND.compare_exchange(
+            ptr::null_mut(),
+            backend_ptr,
+            Ordering::Release,
+            Ordering::Relaxed,
+        ) {
+            Ok(_) => unsafe { &*backend_ptr },
+            Err(global_backend_ptr) => {
+                unsafe {
+                    // We lost the race, free our object and return the global one
+                    Box::from_raw(backend_ptr);
+                    &*global_backend_ptr
+                }
+            }
+        }
+    }
+}
+
+// Helper type for putting a thread to sleep until some other thread wakes it up
+pub struct ThreadParker {
+    key: AtomicUsize,
+    backend: &'static Backend,
+}
+
+impl ThreadParker {
+    pub const IS_CHEAP_TO_CONSTRUCT: bool = true;
+
+    #[inline]
+    pub fn new() -> ThreadParker {
+        // Initialize the backend here to ensure we don't get any panics
+        // later on, which could leave synchronization primitives in a broken
+        // state.
+        ThreadParker {
+            key: AtomicUsize::new(0),
+            backend: Backend::get(),
+        }
+    }
+
+    // Prepares the parker. This should be called before adding it to the queue.
+    #[inline]
+    pub fn prepare_park(&self) {
+        match *self.backend {
+            Backend::KeyedEvent(ref x) => x.prepare_park(&self.key),
+            Backend::WaitAddress(ref x) => x.prepare_park(&self.key),
+        }
+    }
+
+    // Checks if the park timed out. This should be called while holding the
+    // queue lock after park_until has returned false.
+    #[inline]
+    pub fn timed_out(&self) -> bool {
+        match *self.backend {
+            Backend::KeyedEvent(ref x) => x.timed_out(&self.key),
+            Backend::WaitAddress(ref x) => x.timed_out(&self.key),
+        }
+    }
+
+    // Parks the thread until it is unparked. This should be called after it has
+    // been added to the queue, after unlocking the queue.
+    #[inline]
+    pub unsafe fn park(&self) {
+        match *self.backend {
+            Backend::KeyedEvent(ref x) => x.park(&self.key),
+            Backend::WaitAddress(ref x) => x.park(&self.key),
+        }
+    }
+
+    // Parks the thread until it is unparked or the timeout is reached. This
+    // should be called after it has been added to the queue, after unlocking
+    // the queue. Returns true if we were unparked and false if we timed out.
+    #[inline]
+    pub unsafe fn park_until(&self, timeout: Instant) -> bool {
+        match *self.backend {
+            Backend::KeyedEvent(ref x) => x.park_until(&self.key, timeout),
+            Backend::WaitAddress(ref x) => x.park_until(&self.key, timeout),
+        }
+    }
+
+    // Locks the parker to prevent the target thread from exiting. This is
+    // necessary to ensure that thread-local ThreadData objects remain valid.
+    // This should be called while holding the queue lock.
+    #[inline]
+    pub unsafe fn unpark_lock(&self) -> UnparkHandle {
+        match *self.backend {
+            Backend::KeyedEvent(ref x) => UnparkHandle::KeyedEvent(x.unpark_lock(&self.key)),
+            Backend::WaitAddress(ref x) => UnparkHandle::WaitAddress(x.unpark_lock(&self.key)),
+        }
+    }
+}
+
+// Handle for a thread that is about to be unparked. We need to mark the thread
+// as unparked while holding the queue lock, but we delay the actual unparking
+// until after the queue lock is released.
+pub enum UnparkHandle {
+    KeyedEvent(keyed_event::UnparkHandle),
+    WaitAddress(waitaddress::UnparkHandle),
+}
+
+impl UnparkHandle {
+    // Wakes up the parked thread. This should be called after the queue lock is
+    // released to avoid blocking the queue for too long.
+    #[inline]
+    pub unsafe fn unpark(self) {
+        match self {
+            UnparkHandle::KeyedEvent(x) => x.unpark(),
+            UnparkHandle::WaitAddress(x) => x.unpark(),
+        }
+    }
+}
+
+// Yields the rest of the current timeslice to the OS
+#[inline]
+pub fn thread_yield() {
+    // Note that this is manually defined here rather than using the definition
+    // through `winapi`. The `winapi` definition comes from the `synchapi`
+    // header which enables the "synchronization.lib" library. It turns out,
+    // however that `Sleep` comes from `kernel32.dll` so this activation isn't
+    // necessary.
+    //
+    // This was originally identified in rust-lang/rust where on MinGW the
+    // libsynchronization.a library pulls in a dependency on a newer DLL not
+    // present in older versions of Windows. (see rust-lang/rust#49438)
+    //
+    // This is a bit of a hack for now and ideally we'd fix MinGW's own import
+    // libraries, but that'll probably take a lot longer than patching this here
+    // and avoiding the `synchapi` feature entirely.
+    extern "system" {
+        fn Sleep(a: winapi::shared::minwindef::DWORD);
+    }
+    unsafe {
+        // We don't use SwitchToThread here because it doesn't consider all
+        // threads in the system and the thread we are waiting for may not get
+        // selected.
+        Sleep(0);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,149 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use core::{
+    mem,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+use std::time::Instant;
+use winapi::{
+    shared::{
+        basetsd::SIZE_T,
+        minwindef::{BOOL, DWORD, FALSE, TRUE},
+        winerror::ERROR_TIMEOUT,
+    },
+    um::{
+        errhandlingapi::GetLastError,
+        libloaderapi::{GetModuleHandleA, GetProcAddress},
+        winbase::INFINITE,
+        winnt::{LPCSTR, PVOID},
+    },
+};
+
+#[allow(non_snake_case)]
+pub struct WaitAddress {
+    WaitOnAddress: extern "system" fn(
+        Address: PVOID,
+        CompareAddress: PVOID,
+        AddressSize: SIZE_T,
+        dwMilliseconds: DWORD,
+    ) -> BOOL,
+    WakeByAddressSingle: extern "system" fn(Address: PVOID),
+}
+
+impl WaitAddress {
+    #[allow(non_snake_case)]
+    pub fn create() -> Option<WaitAddress> {
+        unsafe {
+            // MSDN claims that that WaitOnAddress and WakeByAddressSingle are
+            // located in kernel32.dll, but they are lying...
+            let synch_dll =
+                GetModuleHandleA(b"api-ms-win-core-synch-l1-2-0.dll\0".as_ptr() as LPCSTR);
+            if synch_dll.is_null() {
+                return None;
+            }
+
+            let WaitOnAddress = GetProcAddress(synch_dll, b"WaitOnAddress\0".as_ptr() as LPCSTR);
+            if WaitOnAddress.is_null() {
+                return None;
+            }
+            let WakeByAddressSingle =
+                GetProcAddress(synch_dll, b"WakeByAddressSingle\0".as_ptr() as LPCSTR);
+            if WakeByAddressSingle.is_null() {
+                return None;
+            }
+            Some(WaitAddress {
+                WaitOnAddress: mem::transmute(WaitOnAddress),
+                WakeByAddressSingle: mem::transmute(WakeByAddressSingle),
+            })
+        }
+    }
+
+    #[inline]
+    pub fn prepare_park(&'static self, key: &AtomicUsize) {
+        key.store(1, Ordering::Relaxed);
+    }
+
+    #[inline]
+    pub fn timed_out(&'static self, key: &AtomicUsize) -> bool {
+        key.load(Ordering::Relaxed) != 0
+    }
+
+    #[inline]
+    pub fn park(&'static self, key: &AtomicUsize) {
+        while key.load(Ordering::Acquire) != 0 {
+            let r = self.wait_on_address(key, INFINITE);
+            debug_assert!(r == TRUE);
+        }
+    }
+
+    #[inline]
+    pub fn park_until(&'static self, key: &AtomicUsize, timeout: Instant) -> bool {
+        while key.load(Ordering::Acquire) != 0 {
+            let now = Instant::now();
+            if timeout <= now {
+                return false;
+            }
+            let diff = timeout - now;
+            let timeout = diff
+                .as_secs()
+                .checked_mul(1000)
+                .and_then(|x| x.checked_add((diff.subsec_nanos() as u64 + 999999) / 1000000))
+                .map(|ms| {
+                    if ms > <DWORD>::max_value() as u64 {
+                        INFINITE
+                    } else {
+                        ms as DWORD
+                    }
+                })
+                .unwrap_or(INFINITE);
+            if self.wait_on_address(key, timeout) == FALSE {
+                debug_assert_eq!(unsafe { GetLastError() }, ERROR_TIMEOUT);
+            }
+        }
+        true
+    }
+
+    #[inline]
+    pub fn unpark_lock(&'static self, key: &AtomicUsize) -> UnparkHandle {
+        // We don't need to lock anything, just clear the state
+        key.store(0, Ordering::Release);
+
+        UnparkHandle {
+            key: key,
+            waitaddress: self,
+        }
+    }
+
+    #[inline]
+    fn wait_on_address(&'static self, key: &AtomicUsize, timeout: DWORD) -> BOOL {
+        let cmp = 1usize;
+        (self.WaitOnAddress)(
+            key as *const _ as PVOID,
+            &cmp as *const _ as PVOID,
+            mem::size_of::<usize>() as SIZE_T,
+            timeout,
+        )
+    }
+}
+
+// Handle for a thread that is about to be unparked. We need to mark the thread
+// as unparked while holding the queue lock, but we delay the actual unparking
+// until after the queue lock is released.
+pub struct UnparkHandle {
+    key: *const AtomicUsize,
+    waitaddress: &'static WaitAddress,
+}
+
+impl UnparkHandle {
+    // Wakes up the parked thread. This should be called after the queue lock is
+    // released to avoid blocking the queue for too long.
+    #[inline]
+    pub fn unpark(self) {
+        (self.waitaddress.WakeByAddressSingle)(self.key as PVOID);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/util.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/util.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/util.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/util.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,31 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+// Option::unchecked_unwrap
+pub trait UncheckedOptionExt<T> {
+    unsafe fn unchecked_unwrap(self) -> T;
+}
+
+impl<T> UncheckedOptionExt<T> for Option<T> {
+    #[inline]
+    unsafe fn unchecked_unwrap(self) -> T {
+        match self {
+            Some(x) => x,
+            None => unreachable(),
+        }
+    }
+}
+
+// hint::unreachable_unchecked() in release mode
+#[inline]
+unsafe fn unreachable() -> ! {
+    if cfg!(debug_assertions) {
+        unreachable!();
+    } else {
+        core::hint::unreachable_unchecked()
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/word_lock.rs firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/word_lock.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/parking_lot_core/src/word_lock.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/parking_lot_core/src/word_lock.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,316 @@
+// Copyright 2016 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use crate::spinwait::SpinWait;
+use crate::thread_parker::{ThreadParker, ThreadParkerT, UnparkHandleT};
+use core::{
+    cell::Cell,
+    mem, ptr,
+    sync::atomic::{fence, AtomicUsize, Ordering},
+};
+
+struct ThreadData {
+    parker: ThreadParker,
+
+    // Linked list of threads in the queue. The queue is split into two parts:
+    // the processed part and the unprocessed part. When new nodes are added to
+    // the list, they only have the next pointer set, and queue_tail is null.
+    //
+    // Nodes are processed with the queue lock held, which consists of setting
+    // the prev pointer for each node and setting the queue_tail pointer on the
+    // first processed node of the list.
+    //
+    // This setup allows nodes to be added to the queue without a lock, while
+    // still allowing O(1) removal of nodes from the processed part of the list.
+    // The only cost is the O(n) processing, but this only needs to be done
+    // once for each node, and therefore isn't too expensive.
+    queue_tail: Cell<*const ThreadData>,
+    prev: Cell<*const ThreadData>,
+    next: Cell<*const ThreadData>,
+}
+
+impl ThreadData {
+    #[inline]
+    fn new() -> ThreadData {
+        assert!(mem::align_of::<ThreadData>() > !QUEUE_MASK);
+        ThreadData {
+            parker: ThreadParker::new(),
+            queue_tail: Cell::new(ptr::null()),
+            prev: Cell::new(ptr::null()),
+            next: Cell::new(ptr::null()),
+        }
+    }
+}
+
+// Invokes the given closure with a reference to the current thread `ThreadData`.
+#[inline]
+fn with_thread_data<T>(f: impl FnOnce(&ThreadData) -> T) -> T {
+    let mut thread_data_ptr = ptr::null();
+    // If ThreadData is expensive to construct, then we want to use a cached
+    // version in thread-local storage if possible.
+    if !ThreadParker::IS_CHEAP_TO_CONSTRUCT {
+        thread_local!(static THREAD_DATA: ThreadData = ThreadData::new());
+        if let Ok(tls_thread_data) = THREAD_DATA.try_with(|x| x as *const ThreadData) {
+            thread_data_ptr = tls_thread_data;
+        }
+    }
+    // Otherwise just create a ThreadData on the stack
+    let mut thread_data_storage = None;
+    if thread_data_ptr.is_null() {
+        thread_data_ptr = thread_data_storage.get_or_insert_with(ThreadData::new);
+    }
+
+    f(unsafe { &*thread_data_ptr })
+}
+
+const LOCKED_BIT: usize = 1;
+const QUEUE_LOCKED_BIT: usize = 2;
+const QUEUE_MASK: usize = !3;
+
+// Word-sized lock that is used to implement the parking_lot API. Since this
+// can't use parking_lot, it instead manages its own queue of waiting threads.
+pub struct WordLock {
+    state: AtomicUsize,
+}
+
+impl WordLock {
+    /// Returns a new, unlocked, WordLock.
+    pub const fn new() -> Self {
+        WordLock {
+            state: AtomicUsize::new(0),
+        }
+    }
+
+    #[inline]
+    pub fn lock(&self) {
+        if self
+            .state
+            .compare_exchange_weak(0, LOCKED_BIT, Ordering::Acquire, Ordering::Relaxed)
+            .is_ok()
+        {
+            return;
+        }
+        self.lock_slow();
+    }
+
+    /// Must not be called on an already unlocked `WordLock`!
+    #[inline]
+    pub unsafe fn unlock(&self) {
+        let state = self.state.fetch_sub(LOCKED_BIT, Ordering::Release);
+        if state.is_queue_locked() || state.queue_head().is_null() {
+            return;
+        }
+        self.unlock_slow();
+    }
+
+    #[cold]
+    fn lock_slow(&self) {
+        let mut spinwait = SpinWait::new();
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // Grab the lock if it isn't locked, even if there is a queue on it
+            if !state.is_locked() {
+                match self.state.compare_exchange_weak(
+                    state,
+                    state | LOCKED_BIT,
+                    Ordering::Acquire,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return,
+                    Err(x) => state = x,
+                }
+                continue;
+            }
+
+            // If there is no queue, try spinning a few times
+            if state.queue_head().is_null() && spinwait.spin() {
+                state = self.state.load(Ordering::Relaxed);
+                continue;
+            }
+
+            // Get our thread data and prepare it for parking
+            state = with_thread_data(|thread_data| {
+                // The pthread implementation is still unsafe, so we need to surround `prepare_park`
+                // with `unsafe {}`.
+                #[allow(unused_unsafe)]
+                unsafe {
+                    thread_data.parker.prepare_park();
+                }
+
+                // Add our thread to the front of the queue
+                let queue_head = state.queue_head();
+                if queue_head.is_null() {
+                    thread_data.queue_tail.set(thread_data);
+                    thread_data.prev.set(ptr::null());
+                } else {
+                    thread_data.queue_tail.set(ptr::null());
+                    thread_data.prev.set(ptr::null());
+                    thread_data.next.set(queue_head);
+                }
+                if let Err(x) = self.state.compare_exchange_weak(
+                    state,
+                    state.with_queue_head(thread_data),
+                    Ordering::Release,
+                    Ordering::Relaxed,
+                ) {
+                    return x;
+                }
+
+                // Sleep until we are woken up by an unlock
+                // Ignoring unused unsafe, since it's only a few platforms where this is unsafe.
+                #[allow(unused_unsafe)]
+                unsafe {
+                    thread_data.parker.park();
+                }
+
+                // Loop back and try locking again
+                spinwait.reset();
+                self.state.load(Ordering::Relaxed)
+            });
+        }
+    }
+
+    #[cold]
+    fn unlock_slow(&self) {
+        let mut state = self.state.load(Ordering::Relaxed);
+        loop {
+            // We just unlocked the WordLock. Just check if there is a thread
+            // to wake up. If the queue is locked then another thread is already
+            // taking care of waking up a thread.
+            if state.is_queue_locked() || state.queue_head().is_null() {
+                return;
+            }
+
+            // Try to grab the queue lock
+            match self.state.compare_exchange_weak(
+                state,
+                state | QUEUE_LOCKED_BIT,
+                Ordering::Acquire,
+                Ordering::Relaxed,
+            ) {
+                Ok(_) => break,
+                Err(x) => state = x,
+            }
+        }
+
+        // Now we have the queue lock and the queue is non-empty
+        'outer: loop {
+            // First, we need to fill in the prev pointers for any newly added
+            // threads. We do this until we reach a node that we previously
+            // processed, which has a non-null queue_tail pointer.
+            let queue_head = state.queue_head();
+            let mut queue_tail;
+            let mut current = queue_head;
+            loop {
+                queue_tail = unsafe { (*current).queue_tail.get() };
+                if !queue_tail.is_null() {
+                    break;
+                }
+                unsafe {
+                    let next = (*current).next.get();
+                    (*next).prev.set(current);
+                    current = next;
+                }
+            }
+
+            // Set queue_tail on the queue head to indicate that the whole list
+            // has prev pointers set correctly.
+            unsafe {
+                (*queue_head).queue_tail.set(queue_tail);
+            }
+
+            // If the WordLock is locked, then there is no point waking up a
+            // thread now. Instead we let the next unlocker take care of waking
+            // up a thread.
+            if state.is_locked() {
+                match self.state.compare_exchange_weak(
+                    state,
+                    state & !QUEUE_LOCKED_BIT,
+                    Ordering::Release,
+                    Ordering::Relaxed,
+                ) {
+                    Ok(_) => return,
+                    Err(x) => state = x,
+                }
+
+                // Need an acquire fence before reading the new queue
+                fence(Ordering::Acquire);
+                continue;
+            }
+
+            // Remove the last thread from the queue and unlock the queue
+            let new_tail = unsafe { (*queue_tail).prev.get() };
+            if new_tail.is_null() {
+                loop {
+                    match self.state.compare_exchange_weak(
+                        state,
+                        state & LOCKED_BIT,
+                        Ordering::Release,
+                        Ordering::Relaxed,
+                    ) {
+                        Ok(_) => break,
+                        Err(x) => state = x,
+                    }
+
+                    // If the compare_exchange failed because a new thread was
+                    // added to the queue then we need to re-scan the queue to
+                    // find the previous element.
+                    if state.queue_head().is_null() {
+                        continue;
+                    } else {
+                        // Need an acquire fence before reading the new queue
+                        fence(Ordering::Acquire);
+                        continue 'outer;
+                    }
+                }
+            } else {
+                unsafe {
+                    (*queue_head).queue_tail.set(new_tail);
+                }
+                self.state.fetch_and(!QUEUE_LOCKED_BIT, Ordering::Release);
+            }
+
+            // Finally, wake up the thread we removed from the queue. Note that
+            // we don't need to worry about any races here since the thread is
+            // guaranteed to be sleeping right now and we are the only one who
+            // can wake it up.
+            unsafe {
+                (*queue_tail).parker.unpark_lock().unpark();
+            }
+            break;
+        }
+    }
+}
+
+trait LockState {
+    fn is_locked(self) -> bool;
+    fn is_queue_locked(self) -> bool;
+    fn queue_head(self) -> *const ThreadData;
+    fn with_queue_head(self, thread_data: *const ThreadData) -> Self;
+}
+
+impl LockState for usize {
+    #[inline]
+    fn is_locked(self) -> bool {
+        self & LOCKED_BIT != 0
+    }
+
+    #[inline]
+    fn is_queue_locked(self) -> bool {
+        self & QUEUE_LOCKED_BIT != 0
+    }
+
+    #[inline]
+    fn queue_head(self) -> *const ThreadData {
+        (self & QUEUE_MASK) as *const ThreadData
+    }
+
+    #[inline]
+    fn with_queue_head(self, thread_data: *const ThreadData) -> Self {
+        (self & !QUEUE_MASK) | thread_data as *const _ as usize
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.lock":"6fdc13a4ac088ef8f084acdd4b60829c154e4064516d0bb9729e05fa521a756b","Cargo.toml":"9e3bdbf6b410b9d82c84d60249a4e3ee7dc9a95e2ee41221da2fbd627214b030","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"fb77f0a9c53e473abe5103c8632ef9f0f2874d4fb3f17cb2d8c661aab9cee9d7","README.rst":"67d8fa211a9c7d4b856ebcf822318ae5ae0192f3bd141d8b608677010ea7842f","examples/readme.rs":"d00fe19aecd7ca1632bcf176306f7a13ed8fdefa890761aa2c532f8c97532a33","src/lib.rs":"29a60ae468881edbdebc30e8f4c87101ede6e7e669482419b1c52a35e4c7f5ed"},"package":"d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/Cargo.lock firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/Cargo.lock
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/Cargo.lock	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,28 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "scopeguard"
+version = "1.1.0"
+authors = ["bluss"]
+description = "A RAII scope guard that will run a given closure when it goes out of scope,\neven if the code between panics (assuming unwinding panic).\n\nDefines the macros `defer!`, `defer_on_unwind!`, `defer_on_success!` as\nshorthands for guards with one of the implemented strategies.\n"
+documentation = "https://docs.rs/scopeguard/"
+keywords = ["scope-guard", "defer", "panic", "unwind"]
+categories = ["rust-patterns", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/bluss/scopeguard"
+[package.metadata.release]
+no-dev-version = true
+
+[features]
+default = ["use_std"]
+use_std = []
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/examples/readme.rs firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/examples/readme.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/examples/readme.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/examples/readme.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,27 @@
+
+#[macro_use(defer)] extern crate scopeguard;
+
+use scopeguard::guard;
+
+fn f() {
+    defer!(println!("Called at return or panic"));
+    panic!();
+}
+
+use std::fs::File;
+use std::io::Write;
+
+fn g() {
+    let f = File::create("newfile.txt").unwrap();
+    let mut file = guard(f, |f| {
+        // write file at return or panic
+        let _ = f.sync_all();
+    });
+    // Access the file through the scope guard itself
+    file.write_all(b"test me\n").unwrap();
+}
+
+fn main() {
+    f();
+    g();
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2016-2019 Ulrik Sverdrup "bluss" and scopeguard developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/README.rst firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/README.rst
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/README.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/README.rst	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,103 @@
+
+scopeguard
+==========
+
+Rust crate for a convenient RAII scope guard that will run a given closure when
+it goes out of scope, even if the code between panics (assuming unwinding panic).
+
+The `defer!` macro and `guard` are `no_std` compatible (require only core),
+but the on unwinding / not on uwinding strategies requires linking to `std`.
+
+Requires Rust 1.20.
+
+
+Please read the `API documentation here`__
+
+__ https://docs.rs/scopeguard/
+
+|build_status|_ |crates|_
+
+.. |build_status| image:: https://travis-ci.org/bluss/scopeguard.svg
+.. _build_status: https://travis-ci.org/bluss/scopeguard
+
+.. |crates| image:: http://meritbadge.herokuapp.com/scopeguard
+.. _crates: https://crates.io/crates/scopeguard
+
+How to use
+----------
+
+.. code:: rust
+
+    #[macro_use(defer)] extern crate scopeguard;
+
+    use scopeguard::guard;
+
+    fn f() {
+        defer!(println!("Called at return or panic"));
+        panic!();
+    }
+
+    use std::fs::File;
+    use std::io::Write;
+
+    fn g() {
+        let f = File::create("newfile.txt").unwrap();
+        let mut file = guard(f, |f| {
+            // write file at return or panic
+            let _ = f.sync_all();
+        });
+        // Access the file through the scope guard itself
+        file.write_all(b"test me\n").unwrap();
+    }
+
+Recent Changes
+--------------
+
+- 1.1.0
+
+  - Change macros (``defer!``, ``defer_on_success!`` and ``defer_on_unwind!``)
+    to accept statements. (by @konsumlamm)
+
+- 1.0.0
+
+  - Change the closure type from ``FnMut(&mut T)`` to ``FnOnce(T)``:
+    Passing the inner value by value instead of a mutable reference is a
+    breaking change, but allows the guard closure to consume it. (by @tormol)
+
+  - Add ``defer_on_success!{}``, ``guard_on_success()`` and ``OnSuccess``
+    strategy, which triggers when scope is exited *without* panic. It's the
+    opposite to ``OnUnwind`` / ``guard_on_unwind()`` / ``defer_on_unwind!{}``.
+
+  - Add ``ScopeGuard::into_inner()``, which "defuses" the guard and returns the
+    guarded value. (by @tormol)
+
+  - Implement ``Sync`` for guards with non-``Sync`` closures.
+
+  - Require Rust 1.20
+
+- 0.3.3
+
+  - Use ``#[inline]`` on a few more functions by @stjepang (#14)
+  - Add examples to crate documentation
+
+- 0.3.2
+
+  - Add crate categories
+
+- 0.3.1
+
+  - Add ``defer_on_unwind!``, ``Strategy`` trait
+  - Rename ``Guard`` → ``ScopeGuard``
+  - Add ``ScopeGuard::with_strategy``.
+  - ``ScopeGuard`` now implements ``Debug``.
+  - Require Rust 1.11
+
+- 0.2.0
+
+  - Require Rust 1.6
+  - Use `no_std` unconditionally
+  - No other changes
+
+- 0.1.2
+
+  - Add macro ``defer!()``
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/scopeguard/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/scopeguard/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,578 @@
+#![cfg_attr(not(any(test, feature = "use_std")), no_std)]
+#![doc(html_root_url = "https://docs.rs/scopeguard/1/")]
+
+//! A scope guard will run a given closure when it goes out of scope,
+//! even if the code between panics.
+//! (as long as panic doesn't abort)
+//!
+//! # Examples
+//!
+//! ## Hello World
+//!
+//! This example creates a scope guard with an example function:
+//!
+//! ```
+//! extern crate scopeguard;
+//!
+//! fn f() {
+//!     let _guard = scopeguard::guard((), |_| {
+//!         println!("Hello Scope Exit!");
+//!     });
+//!
+//!     // rest of the code here.
+//!
+//!     // Here, at the end of `_guard`'s scope, the guard's closure is called.
+//!     // It is also called if we exit this scope through unwinding instead.
+//! }
+//! # fn main() {
+//! #    f();
+//! # }
+//! ```
+//!
+//! ## `defer!`
+//!
+//! Use the `defer` macro to run an operation at scope exit,
+//! either regular scope exit or during unwinding from a panic.
+//!
+//! ```
+//! #[macro_use(defer)] extern crate scopeguard;
+//!
+//! use std::cell::Cell;
+//!
+//! fn main() {
+//!     // use a cell to observe drops during and after the scope guard is active
+//!     let drop_counter = Cell::new(0);
+//!     {
+//!         // Create a scope guard using `defer!` for the current scope
+//!         defer! {
+//!             drop_counter.set(1 + drop_counter.get());
+//!         }
+//!
+//!         // Do regular operations here in the meantime.
+//!
+//!         // Just before scope exit: it hasn't run yet.
+//!         assert_eq!(drop_counter.get(), 0);
+//!
+//!         // The following scope end is where the defer closure is called
+//!     }
+//!     assert_eq!(drop_counter.get(), 1);
+//! }
+//! ```
+//!
+//! ## Scope Guard with Value
+//!
+//! If the scope guard closure needs to access an outer value that is also
+//! mutated outside of the scope guard, then you may want to use the scope guard
+//! with a value. The guard works like a smart pointer, so the inner value can
+//! be accessed by reference or by mutable reference.
+//!
+//! ### 1. The guard owns a file
+//!
+//! In this example, the scope guard owns a file and ensures pending writes are
+//! synced at scope exit.
+//!
+//! ```
+//! extern crate scopeguard;
+//!
+//! use std::fs::*;
+//! use std::io::{self, Write};
+//! # // Mock file so that we don't actually write a file
+//! # struct MockFile;
+//! # impl MockFile {
+//! #     fn create(_s: &str) -> io::Result<Self> { Ok(MockFile) }
+//! #     fn write_all(&self, _b: &[u8]) -> io::Result<()> { Ok(()) }
+//! #     fn sync_all(&self) -> io::Result<()> { Ok(()) }
+//! # }
+//! # use self::MockFile as File;
+//!
+//! fn try_main() -> io::Result<()> {
+//!     let f = File::create("newfile.txt")?;
+//!     let mut file = scopeguard::guard(f, |f| {
+//!         // ensure we flush file at return or panic
+//!         let _ = f.sync_all();
+//!     });
+//!     // Access the file through the scope guard itself
+//!     file.write_all(b"test me\n").map(|_| ())
+//! }
+//!
+//! fn main() {
+//!     try_main().unwrap();
+//! }
+//!
+//! ```
+//!
+//! ### 2. The guard restores an invariant on scope exit
+//!
+//! ```
+//! extern crate scopeguard;
+//!
+//! use std::mem::ManuallyDrop;
+//! use std::ptr;
+//!
+//! // This function, just for this example, takes the first element
+//! // and inserts it into the assumed sorted tail of the vector.
+//! //
+//! // For optimization purposes we temporarily violate an invariant of the
+//! // Vec, that it owns all of its elements.
+//! //
+//! // The safe approach is to use swap, which means two writes to memory,
+//! // the optimization is to use a “hole� which uses only one write of memory
+//! // for each position it moves.
+//! //
+//! // We *must* use a scope guard to run this code safely. We
+//! // are running arbitrary user code (comparison operators) that may panic.
+//! // The scope guard ensures we restore the invariant after successful
+//! // exit or during unwinding from panic.
+//! fn insertion_sort_first<T>(v: &mut Vec<T>)
+//!     where T: PartialOrd
+//! {
+//!     struct Hole<'a, T: 'a> {
+//!         v: &'a mut Vec<T>,
+//!         index: usize,
+//!         value: ManuallyDrop<T>,
+//!     }
+//!
+//!     unsafe {
+//!         // Create a moved-from location in the vector, a “hole�.
+//!         let value = ptr::read(&v[0]);
+//!         let mut hole = Hole { v: v, index: 0, value: ManuallyDrop::new(value) };
+//!
+//!         // Use a scope guard with a value.
+//!         // At scope exit, plug the hole so that the vector is fully
+//!         // initialized again.
+//!         // The scope guard owns the hole, but we can access it through the guard.
+//!         let mut hole_guard = scopeguard::guard(hole, |hole| {
+//!             // plug the hole in the vector with the value that was // taken out
+//!             let index = hole.index;
+//!             ptr::copy_nonoverlapping(&*hole.value, &mut hole.v[index], 1);
+//!         });
+//!
+//!         // run algorithm that moves the hole in the vector here
+//!         // move the hole until it's in a sorted position
+//!         for i in 1..hole_guard.v.len() {
+//!             if *hole_guard.value >= hole_guard.v[i] {
+//!                 // move the element back and the hole forward
+//!                 let index = hole_guard.index;
+//!                 ptr::copy_nonoverlapping(&hole_guard.v[index + 1], &mut hole_guard.v[index], 1);
+//!                 hole_guard.index += 1;
+//!             } else {
+//!                 break;
+//!             }
+//!         }
+//!
+//!         // When the scope exits here, the Vec becomes whole again!
+//!     }
+//! }
+//!
+//! fn main() {
+//!     let string = String::from;
+//!     let mut data = vec![string("c"), string("a"), string("b"), string("d")];
+//!     insertion_sort_first(&mut data);
+//!     assert_eq!(data, vec!["a", "b", "c", "d"]);
+//! }
+//!
+//! ```
+//!
+//!
+//! # Crate Features
+//!
+//! - `use_std`
+//!   + Enabled by default. Enables the `OnUnwind` and `OnSuccess` strategies.
+//!   + Disable to use `no_std`.
+//!
+//! # Rust Version
+//!
+//! This version of the crate requires Rust 1.20 or later.
+//!
+//! The scopeguard 1.x release series will use a carefully considered version
+//! upgrade policy, where in a later 1.x version, we will raise the minimum
+//! required Rust version.
+
+#[cfg(not(any(test, feature = "use_std")))]
+extern crate core as std;
+
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem::{self, ManuallyDrop};
+use std::ops::{Deref, DerefMut};
+use std::ptr;
+
+/// Controls in which cases the associated code should be run
+pub trait Strategy {
+    /// Return `true` if the guard’s associated code should run
+    /// (in the context where this method is called).
+    fn should_run() -> bool;
+}
+
+/// Always run on scope exit.
+///
+/// “Always� run: on regular exit from a scope or on unwinding from a panic.
+/// Can not run on abort, process exit, and other catastrophic events where
+/// destructors don’t run.
+#[derive(Debug)]
+pub enum Always {}
+
+/// Run on scope exit through unwinding.
+///
+/// Requires crate feature `use_std`.
+#[cfg(feature = "use_std")]
+#[derive(Debug)]
+pub enum OnUnwind {}
+
+/// Run on regular scope exit, when not unwinding.
+///
+/// Requires crate feature `use_std`.
+#[cfg(feature = "use_std")]
+#[derive(Debug)]
+pub enum OnSuccess {}
+
+impl Strategy for Always {
+    #[inline(always)]
+    fn should_run() -> bool { true }
+}
+
+#[cfg(feature = "use_std")]
+impl Strategy for OnUnwind {
+    #[inline]
+    fn should_run() -> bool { std::thread::panicking() }
+}
+
+#[cfg(feature = "use_std")]
+impl Strategy for OnSuccess {
+    #[inline]
+    fn should_run() -> bool { !std::thread::panicking() }
+}
+
+/// Macro to create a `ScopeGuard` (always run).
+///
+/// The macro takes statements, which are the body of a closure
+/// that will run when the scope is exited.
+#[macro_export]
+macro_rules! defer {
+    ($($t:tt)*) => {
+        let _guard = $crate::guard((), |()| { $($t)* });
+    };
+}
+
+/// Macro to create a `ScopeGuard` (run on successful scope exit).
+///
+/// The macro takes statements, which are the body of a closure
+/// that will run when the scope is exited.
+///
+/// Requires crate feature `use_std`.
+#[cfg(feature = "use_std")]
+#[macro_export]
+macro_rules! defer_on_success {
+    ($($t:tt)*) => {
+        let _guard = $crate::guard_on_success((), |()| { $($t)* });
+    };
+}
+
+/// Macro to create a `ScopeGuard` (run on unwinding from panic).
+///
+/// The macro takes statements, which are the body of a closure
+/// that will run when the scope is exited.
+///
+/// Requires crate feature `use_std`.
+#[cfg(feature = "use_std")]
+#[macro_export]
+macro_rules! defer_on_unwind {
+    ($($t:tt)*) => {
+        let _guard = $crate::guard_on_unwind((), |()| { $($t)* });
+    };
+}
+
+/// `ScopeGuard` is a scope guard that may own a protected value.
+///
+/// If you place a guard in a local variable, the closure can
+/// run regardless how you leave the scope — through regular return or panic
+/// (except if panic or other code aborts; so as long as destructors run).
+/// It is run only once.
+///
+/// The `S` parameter for [`Strategy`](trait.Strategy.html) determines if
+/// the closure actually runs.
+///
+/// The guard's closure will be called with the held value in the destructor.
+///
+/// The `ScopeGuard` implements `Deref` so that you can access the inner value.
+pub struct ScopeGuard<T, F, S = Always>
+    where F: FnOnce(T),
+          S: Strategy,
+{
+    value: ManuallyDrop<T>,
+    dropfn: ManuallyDrop<F>,
+    // fn(S) -> S is used, so that the S is not taken into account for auto traits.
+    strategy: PhantomData<fn(S) -> S>,
+}
+
+impl<T, F, S> ScopeGuard<T, F, S>
+    where F: FnOnce(T),
+          S: Strategy,
+{
+    /// Create a `ScopeGuard` that owns `v` (accessible through deref) and calls
+    /// `dropfn` when its destructor runs.
+    ///
+    /// The `Strategy` decides whether the scope guard's closure should run.
+    #[inline]
+    pub fn with_strategy(v: T, dropfn: F) -> ScopeGuard<T, F, S> {
+        ScopeGuard {
+            value: ManuallyDrop::new(v),
+            dropfn: ManuallyDrop::new(dropfn),
+            strategy: PhantomData,
+        }
+    }
+
+    /// “Defuse� the guard and extract the value without calling the closure.
+    ///
+    /// ```
+    /// extern crate scopeguard;
+    ///
+    /// use scopeguard::{guard, ScopeGuard};
+    ///
+    /// fn conditional() -> bool { true }
+    ///
+    /// fn main() {
+    ///     let mut guard = guard(Vec::new(), |mut v| v.clear());
+    ///     guard.push(1);
+    ///     
+    ///     if conditional() {
+    ///         // a condition maybe makes us decide to
+    ///         // “defuse� the guard and get back its inner parts
+    ///         let value = ScopeGuard::into_inner(guard);
+    ///     } else {
+    ///         // guard still exists in this branch
+    ///     }
+    /// }
+    /// ```
+    #[inline]
+    pub fn into_inner(guard: Self) -> T {
+        // Cannot move out of Drop-implementing types, so
+        // ptr::read the value and forget the guard.
+        unsafe {
+            let value = ptr::read(&*guard.value);
+            // read the closure so that it is dropped, and assign it to a local
+            // variable to ensure that it is only dropped after the guard has
+            // been forgotten. (In case the Drop impl of the closure, or that
+            // of any consumed captured variable, panics).
+            let _dropfn = ptr::read(&*guard.dropfn);
+            mem::forget(guard);
+            value
+        }
+    }
+}
+
+
+/// Create a new `ScopeGuard` owning `v` and with deferred closure `dropfn`.
+#[inline]
+pub fn guard<T, F>(v: T, dropfn: F) -> ScopeGuard<T, F, Always>
+    where F: FnOnce(T)
+{
+    ScopeGuard::with_strategy(v, dropfn)
+}
+
+/// Create a new `ScopeGuard` owning `v` and with deferred closure `dropfn`.
+///
+/// Requires crate feature `use_std`.
+#[cfg(feature = "use_std")]
+#[inline]
+pub fn guard_on_success<T, F>(v: T, dropfn: F) -> ScopeGuard<T, F, OnSuccess>
+    where F: FnOnce(T)
+{
+    ScopeGuard::with_strategy(v, dropfn)
+}
+
+/// Create a new `ScopeGuard` owning `v` and with deferred closure `dropfn`.
+///
+/// Requires crate feature `use_std`.
+///
+/// ## Examples
+///
+/// For performance reasons, or to emulate “only run guard on unwind� in
+/// no-std environments, we can also use the default guard and simply manually
+/// defuse it at the end of scope like the following example. (The performance
+/// reason would be if the [`OnUnwind`]'s call to [std::thread::panicking()] is
+/// an issue.)
+///
+/// ```
+/// extern crate scopeguard;
+///
+/// use scopeguard::ScopeGuard;
+/// # fn main() {
+/// {
+///     let guard = scopeguard::guard((), |_| {});
+///
+///     // rest of the code here
+///
+///     // we reached the end of scope without unwinding - defuse it
+///     ScopeGuard::into_inner(guard);
+/// }
+/// # }
+/// ```
+#[cfg(feature = "use_std")]
+#[inline]
+pub fn guard_on_unwind<T, F>(v: T, dropfn: F) -> ScopeGuard<T, F, OnUnwind>
+    where F: FnOnce(T)
+{
+    ScopeGuard::with_strategy(v, dropfn)
+}
+
+// ScopeGuard can be Sync even if F isn't because the closure is
+// not accessible from references.
+// The guard does not store any instance of S, so it is also irrelevant.
+unsafe impl<T, F, S> Sync for ScopeGuard<T, F, S>
+    where T: Sync,
+          F: FnOnce(T),
+          S: Strategy
+{}
+
+impl<T, F, S> Deref for ScopeGuard<T, F, S>
+    where F: FnOnce(T),
+          S: Strategy
+{
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &*self.value
+    }
+}
+
+impl<T, F, S> DerefMut for ScopeGuard<T, F, S>
+    where F: FnOnce(T),
+          S: Strategy
+{
+    fn deref_mut(&mut self) -> &mut T {
+        &mut *self.value
+    }
+}
+
+impl<T, F, S> Drop for ScopeGuard<T, F, S>
+    where F: FnOnce(T),
+          S: Strategy
+{
+    fn drop(&mut self) {
+        // This is OK because the fields are `ManuallyDrop`s
+        // which will not be dropped by the compiler.
+        let (value, dropfn) = unsafe {
+            (ptr::read(&*self.value), ptr::read(&*self.dropfn))
+        };
+        if S::should_run() {
+            dropfn(value);
+        }
+    }
+}
+
+impl<T, F, S> fmt::Debug for ScopeGuard<T, F, S>
+    where T: fmt::Debug,
+          F: FnOnce(T),
+          S: Strategy
+{
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct(stringify!(ScopeGuard))
+         .field("value", &*self.value)
+         .finish()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::cell::Cell;
+    use std::panic::catch_unwind;
+    use std::panic::AssertUnwindSafe;
+
+    #[test]
+    fn test_defer() {
+        let drops = Cell::new(0);
+        defer!(drops.set(1000));
+        assert_eq!(drops.get(), 0);
+    }
+
+    #[cfg(feature = "use_std")]
+    #[test]
+    fn test_defer_success_1() {
+        let drops = Cell::new(0);
+        {
+            defer_on_success!(drops.set(1));
+            assert_eq!(drops.get(), 0);
+        }
+        assert_eq!(drops.get(), 1);
+    }
+
+    #[cfg(feature = "use_std")]
+    #[test]
+    fn test_defer_success_2() {
+        let drops = Cell::new(0);
+        let _ = catch_unwind(AssertUnwindSafe(|| {
+            defer_on_success!(drops.set(1));
+            panic!("failure")
+        }));
+        assert_eq!(drops.get(), 0);
+    }
+
+    #[cfg(feature = "use_std")]
+    #[test]
+    fn test_defer_unwind_1() {
+        let drops = Cell::new(0);
+        let _ = catch_unwind(AssertUnwindSafe(|| {
+            defer_on_unwind!(drops.set(1));
+            assert_eq!(drops.get(), 0);
+            panic!("failure")
+        }));
+        assert_eq!(drops.get(), 1);
+    }
+
+    #[cfg(feature = "use_std")]
+    #[test]
+    fn test_defer_unwind_2() {
+        let drops = Cell::new(0);
+        {
+            defer_on_unwind!(drops.set(1));
+        }
+        assert_eq!(drops.get(), 0);
+    }
+
+    #[test]
+    fn test_only_dropped_by_closure_when_run() {
+        let value_drops = Cell::new(0);
+        let value = guard((), |()| value_drops.set(1 + value_drops.get()));
+        let closure_drops = Cell::new(0);
+        let guard = guard(value, |_| closure_drops.set(1 + closure_drops.get()));
+        assert_eq!(value_drops.get(), 0);
+        assert_eq!(closure_drops.get(), 0);
+        drop(guard);
+        assert_eq!(value_drops.get(), 1);
+        assert_eq!(closure_drops.get(), 1);
+    }
+
+    #[cfg(feature = "use_std")]
+    #[test]
+    fn test_dropped_once_when_not_run() {
+        let value_drops = Cell::new(0);
+        let value = guard((), |()| value_drops.set(1 + value_drops.get()));
+        let captured_drops = Cell::new(0);
+        let captured = guard((), |()| captured_drops.set(1 + captured_drops.get()));
+        let closure_drops = Cell::new(0);
+        let guard = guard_on_unwind(value, |value| {
+            drop(value);
+            drop(captured);
+            closure_drops.set(1 + closure_drops.get())
+        });
+        assert_eq!(value_drops.get(), 0);
+        assert_eq!(captured_drops.get(), 0);
+        assert_eq!(closure_drops.get(), 0);
+        drop(guard);
+        assert_eq!(value_drops.get(), 1);
+        assert_eq!(captured_drops.get(), 1);
+        assert_eq!(closure_drops.get(), 0);
+    }
+
+    #[test]
+    fn test_into_inner() {
+        let dropped = Cell::new(false);
+        let value = guard(42, |_| dropped.set(true));
+        let guard = guard(value, |_| dropped.set(true));
+        let inner = ScopeGuard::into_inner(guard);
+        assert_eq!(dropped.get(), false);
+        assert_eq!(*inner, 42);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"55c1cd9aacdff8505c590dd9b2b7568c9d7114acd50b47768b839e89a1995807","README.md":"6dd2163101f51e8d3dc51c01a65366ca84e6da4b7e9d919f72eb67d9a6297c1b","src/lib.rs":"f5e43243d8a1fa55ee7acceb4d47be7956c7dee638e7816a411eb7efd72adba7","tests/tests.rs":"73df3c5b4e0ca15adc63689cba82bcc1553165bc09f034ab34b17e4b09cde5a8"},"package":"1b15f74add9a9d4a3eb2bf739c9a427d266d3895b53d992c3a7c234fec2ff1f1"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,30 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "serial_test"
+version = "0.5.0"
+authors = ["Tom Parker-Shemilt <palfrey@tevp.net>"]
+description = "Allows for the creation of serialised Rust tests"
+readme = "README.md"
+categories = ["development-tools::testing"]
+license = "MIT"
+repository = "https://github.com/palfrey/serial_test/"
+[dependencies.lazy_static]
+version = "1.2"
+
+[dependencies.parking_lot]
+version = "0.10"
+
+[dependencies.serial_test_derive]
+version = "~0.5.0"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/README.md firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/README.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/README.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,48 @@
+# serial_test
+[![Version](https://img.shields.io/crates/v/serial_test.svg)](https://crates.io/crates/serial_test)
+[![Downloads](https://img.shields.io/crates/d/serial_test)](https://crates.io/crates/serial_test)
+[![Docs](https://docs.rs/serial_test/badge.svg)](https://docs.rs/serial_test/)
+[![MIT license](https://img.shields.io/crates/l/serial_test.svg)](./LICENSE)
+[![Build Status](https://travis-ci.com/palfrey/serial_test.svg?branch=master)](https://travis-ci.com/palfrey/serial_test)
+[![MSRV: 1.39.0](https://flat.badgen.net/badge/MSRV/1.39.0/purple)](https://blog.rust-lang.org/2019/11/07/Rust-1.39.0.html)
+
+`serial_test` allows for the creation of serialised Rust tests using the `serial` attribute
+e.g.
+```rust
+#[test]
+#[serial]
+fn test_serial_one() {
+  // Do things
+}
+
+#[test]
+#[serial]
+fn test_serial_another() {
+  // Do things
+}
+
+#[tokio::test]
+#[serial]
+async fn test_serial_another() {
+  // Do things asynchronously
+}
+```
+Multiple tests with the `serial` attribute are guaranteed to be executed in serial. Ordering of the tests is not guaranteed however.
+
+## Usage
+We require at least Rust 1.39 for [async/await](https://blog.rust-lang.org/2019/11/07/Async-await-stable.html) support
+
+Add to your Cargo.toml
+```toml
+[dev-dependencies]
+serial_test = "*"
+```
+
+plus `use serial_test::serial;` (for Rust 2018) or
+```rust
+#[macro_use]
+extern crate serial_test;
+```
+for earlier versions.
+
+You can then either add `#[serial]` or `#[serial(some_text)]` to tests as required.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,92 @@
+//! # serial_test
+//! `serial_test` allows for the creation of serialised Rust tests using the [serial](attr.serial.html) attribute
+//! e.g.
+//! ````
+//! #[test]
+//! #[serial]
+//! fn test_serial_one() {
+//!   // Do things
+//! }
+//!
+//! #[test]
+//! #[serial]
+//! fn test_serial_another() {
+//!   // Do things
+//! }
+//! ````
+//! Multiple tests with the [serial](attr.serial.html) attribute are guaranteed to be executed in serial. Ordering
+//! of the tests is not guaranteed however.
+
+use lazy_static::lazy_static;
+use parking_lot::ReentrantMutex;
+use std::collections::HashMap;
+use std::ops::{Deref, DerefMut};
+use std::sync::{Arc, RwLock};
+
+lazy_static! {
+    static ref LOCKS: Arc<RwLock<HashMap<String, ReentrantMutex<()>>>> =
+        Arc::new(RwLock::new(HashMap::new()));
+}
+
+fn check_new_key(name: &str) {
+    // Check if a new key is needed. Just need a read lock, which can be done in sync with everyone else
+    let new_key = {
+        let unlock = LOCKS.read().unwrap();
+        !unlock.deref().contains_key(name)
+    };
+    if new_key {
+        // This is the rare path, which avoids the multi-writer situation mostly
+        LOCKS
+            .write()
+            .unwrap()
+            .deref_mut()
+            .insert(name.to_string(), ReentrantMutex::new(()));
+    }
+}
+
+#[doc(hidden)]
+pub fn serial_core_with_return<E>(name: &str, function: fn() -> Result<(), E>) -> Result<(), E> {
+    check_new_key(name);
+
+    let unlock = LOCKS.read().unwrap();
+    // _guard needs to be named to avoid being instant dropped
+    let _guard = unlock.deref()[name].lock();
+    function()
+}
+
+#[doc(hidden)]
+pub fn serial_core(name: &str, function: fn()) {
+    check_new_key(name);
+
+    let unlock = LOCKS.read().unwrap();
+    // _guard needs to be named to avoid being instant dropped
+    let _guard = unlock.deref()[name].lock();
+    function();
+}
+
+#[doc(hidden)]
+pub async fn async_serial_core_with_return<E>(
+    name: &str,
+    fut: impl std::future::Future<Output = Result<(), E>>,
+) -> Result<(), E> {
+    check_new_key(name);
+
+    let unlock = LOCKS.read().unwrap();
+    // _guard needs to be named to avoid being instant dropped
+    let _guard = unlock.deref()[name].lock();
+    fut.await
+}
+
+#[doc(hidden)]
+pub async fn async_serial_core(name: &str, fut: impl std::future::Future<Output = ()>) {
+    check_new_key(name);
+
+    let unlock = LOCKS.read().unwrap();
+    // _guard needs to be named to avoid being instant dropped
+    let _guard = unlock.deref()[name].lock();
+    fut.await
+}
+
+// Re-export #[serial].
+#[allow(unused_imports)]
+pub use serial_test_derive::serial;
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/tests/tests.rs firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/tests/tests.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test/tests/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test/tests/tests.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,8 @@
+use serial_test::serial_core;
+
+#[test]
+fn test_empty_serial_call() {
+    serial_core("beta", || {
+        println!("Bar");
+    });
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"62a7ea856cc0d3926e11d8b714deceb895c04024137031e178d76e06762218f2","README.md":"6dd2163101f51e8d3dc51c01a65366ca84e6da4b7e9d919f72eb67d9a6297c1b","src/lib.rs":"5a3625477edec06083dc18587d3b908e29ec15ff8410e2c57df10d2c2e9414b0"},"package":"65f59259be9fc1bf677d06cc1456e97756004a1a5a577480f71430bd7c17ba33"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,36 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "serial_test_derive"
+version = "0.5.0"
+authors = ["Tom Parker-Shemilt <palfrey@tevp.net>"]
+description = "Helper crate for serial_test"
+readme = "README.md"
+categories = ["development-tools::testing"]
+license = "MIT"
+repository = "https://github.com/palfrey/serial_test/"
+
+[lib]
+proc-macro = true
+[dependencies.proc-macro2]
+version = "1.0"
+
+[dependencies.quote]
+version = "1.0"
+
+[dependencies.syn]
+version = "1.0"
+features = ["full"]
+[dev-dependencies.env_logger]
+version = "0.7"
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/README.md firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/README.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/README.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,48 @@
+# serial_test
+[![Version](https://img.shields.io/crates/v/serial_test.svg)](https://crates.io/crates/serial_test)
+[![Downloads](https://img.shields.io/crates/d/serial_test)](https://crates.io/crates/serial_test)
+[![Docs](https://docs.rs/serial_test/badge.svg)](https://docs.rs/serial_test/)
+[![MIT license](https://img.shields.io/crates/l/serial_test.svg)](./LICENSE)
+[![Build Status](https://travis-ci.com/palfrey/serial_test.svg?branch=master)](https://travis-ci.com/palfrey/serial_test)
+[![MSRV: 1.39.0](https://flat.badgen.net/badge/MSRV/1.39.0/purple)](https://blog.rust-lang.org/2019/11/07/Rust-1.39.0.html)
+
+`serial_test` allows for the creation of serialised Rust tests using the `serial` attribute
+e.g.
+```rust
+#[test]
+#[serial]
+fn test_serial_one() {
+  // Do things
+}
+
+#[test]
+#[serial]
+fn test_serial_another() {
+  // Do things
+}
+
+#[tokio::test]
+#[serial]
+async fn test_serial_another() {
+  // Do things asynchronously
+}
+```
+Multiple tests with the `serial` attribute are guaranteed to be executed in serial. Ordering of the tests is not guaranteed however.
+
+## Usage
+We require at least Rust 1.39 for [async/await](https://blog.rust-lang.org/2019/11/07/Async-await-stable.html) support
+
+Add to your Cargo.toml
+```toml
+[dev-dependencies]
+serial_test = "*"
+```
+
+plus `use serial_test::serial;` (for Rust 2018) or
+```rust
+#[macro_use]
+extern crate serial_test;
+```
+for earlier versions.
+
+You can then either add `#[serial]` or `#[serial(some_text)]` to tests as required.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/serial_test_derive/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/serial_test_derive/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,230 @@
+//! # serial_test_derive
+//! Helper crate for [serial_test](../serial_test/index.html)
+
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use proc_macro2::TokenTree;
+use quote::quote;
+use std::ops::Deref;
+use syn;
+
+/// Allows for the creation of serialised Rust tests
+/// ````
+/// #[test]
+/// #[serial]
+/// fn test_serial_one() {
+///   // Do things
+/// }
+///
+/// #[test]
+/// #[serial]
+/// fn test_serial_another() {
+///   // Do things
+/// }
+/// ````
+/// Multiple tests with the [serial](attr.serial.html) attribute are guaranteed to be executed in serial. Ordering
+/// of the tests is not guaranteed however. If you want different subsets of tests to be serialised with each
+/// other, but not depend on other subsets, you can add an argument to [serial](attr.serial.html), and all calls
+/// with identical arguments will be called in serial. e.g.
+/// ````
+/// #[test]
+/// #[serial(something)]
+/// fn test_serial_one() {
+///   // Do things
+/// }
+///
+/// #[test]
+/// #[serial(something)]
+/// fn test_serial_another() {
+///   // Do things
+/// }
+///
+/// #[test]
+/// #[serial(other)]
+/// fn test_serial_third() {
+///   // Do things
+/// }
+///
+/// #[test]
+/// #[serial(other)]
+/// fn test_serial_fourth() {
+///   // Do things
+/// }
+/// ````
+/// `test_serial_one` and `test_serial_another` will be executed in serial, as will `test_serial_third` and `test_serial_fourth`
+/// but neither sequence will be blocked by the other
+#[proc_macro_attribute]
+pub fn serial(attr: TokenStream, input: TokenStream) -> TokenStream {
+    return serial_core(attr.into(), input.into()).into();
+}
+
+fn serial_core(
+    attr: proc_macro2::TokenStream,
+    input: proc_macro2::TokenStream,
+) -> proc_macro2::TokenStream {
+    let attrs = attr.into_iter().collect::<Vec<TokenTree>>();
+    let key = match attrs.len() {
+        0 => "".to_string(),
+        1 => {
+            if let TokenTree::Ident(id) = &attrs[0] {
+                id.to_string()
+            } else {
+                panic!("Expected a single name as argument, got {:?}", attrs);
+            }
+        }
+        n => {
+            panic!("Expected either 0 or 1 arguments, got {}: {:?}", n, attrs);
+        }
+    };
+    let ast: syn::ItemFn = syn::parse2(input).unwrap();
+    let asyncness = ast.sig.asyncness;
+    let name = ast.sig.ident;
+    let return_type = match ast.sig.output {
+        syn::ReturnType::Default => None,
+        syn::ReturnType::Type(_rarrow, ref box_type) => Some(box_type.deref()),
+    };
+    let block = ast.block;
+    let attrs: Vec<syn::Attribute> = ast
+        .attrs
+        .into_iter()
+        .filter(|at| {
+            if let Ok(m) = at.parse_meta() {
+                let path = m.path();
+                if path.is_ident("ignore") || path.is_ident("should_panic") {
+                    // we skip ignore/should_panic because the test framework already deals with it
+                    false
+                } else {
+                    true
+                }
+            } else {
+                true
+            }
+        })
+        .collect();
+    let gen = if let Some(ret) = return_type {
+        match asyncness {
+            Some(_) => quote! {
+                #(#attrs)
+                *
+                async fn #name () -> #ret {
+                    serial_test::async_serial_core_with_return(#key, || async {
+                        #block
+                    }).await;
+                }
+            },
+            None => quote! {
+                #(#attrs)
+                *
+                fn #name () -> #ret {
+                    serial_test::serial_core_with_return(#key, || {
+                        #block
+                    })
+                }
+            },
+        }
+    } else {
+        match asyncness {
+            Some(_) => quote! {
+                #(#attrs)
+                *
+                async fn #name () {
+                    serial_test::async_serial_core(#key, || async {
+                        #block
+                    }).await;
+                }
+            },
+            None => quote! {
+                #(#attrs)
+                *
+                fn #name () {
+                    serial_test::serial_core(#key, || {
+                        #block
+                    });
+                }
+            },
+        }
+    };
+    return gen.into();
+}
+
+#[test]
+fn test_serial() {
+    let attrs = proc_macro2::TokenStream::new();
+    let input = quote! {
+        #[test]
+        fn foo() {}
+    };
+    let stream = serial_core(attrs.into(), input);
+    let compare = quote! {
+        #[test]
+        fn foo () {
+            serial_test::serial_core("", || {
+                {}
+            });
+        }
+    };
+    assert_eq!(format!("{}", compare), format!("{}", stream));
+}
+
+#[test]
+fn test_stripped_attributes() {
+    let _ = env_logger::builder().is_test(true).try_init();
+    let attrs = proc_macro2::TokenStream::new();
+    let input = quote! {
+        #[test]
+        #[ignore]
+        #[should_panic(expected = "Testing panic")]
+        #[something_else]
+        fn foo() {}
+    };
+    let stream = serial_core(attrs.into(), input);
+    let compare = quote! {
+        #[test]
+        #[something_else]
+        fn foo () {
+            serial_test::serial_core("", || {
+                {}
+            });
+        }
+    };
+    assert_eq!(format!("{}", compare), format!("{}", stream));
+}
+
+#[test]
+fn test_serial_async() {
+    let attrs = proc_macro2::TokenStream::new();
+    let input = quote! {
+        #[tokio::test]
+        async fn foo() {}
+    };
+    let stream = serial_core(attrs.into(), input);
+    let compare = quote! {
+        #[tokio::test]
+        async fn foo () {
+            serial_test::async_serial_core("", || async {
+                {}
+            }).await;
+        }
+    };
+    assert_eq!(format!("{}", compare), format!("{}", stream));
+}
+
+#[test]
+fn test_serial_async_return() {
+    let attrs = proc_macro2::TokenStream::new();
+    let input = quote! {
+        #[tokio::test]
+        async fn foo() -> Result<(), ()> { Ok(()) }
+    };
+    let stream = serial_core(attrs.into(), input);
+    let compare = quote! {
+        #[tokio::test]
+        async fn foo () -> Result<(), ()> {
+            serial_test::async_serial_core_with_return("", || async {
+                { Ok(()) }
+            }).await;
+        }
+    };
+    assert_eq!(format!("{}", compare), format!("{}", stream));
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/benches/bench.rs firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/benches/bench.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/benches/bench.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/benches/bench.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,296 @@
+#![feature(test)]
+#![allow(deprecated)]
+
+#[macro_use]
+extern crate smallvec;
+extern crate test;
+
+use self::test::Bencher;
+use smallvec::{ExtendFromSlice, SmallVec};
+
+const VEC_SIZE: usize = 16;
+const SPILLED_SIZE: usize = 100;
+
+trait Vector<T>: for<'a> From<&'a [T]> + Extend<T> + ExtendFromSlice<T> {
+    fn new() -> Self;
+    fn push(&mut self, val: T);
+    fn pop(&mut self) -> Option<T>;
+    fn remove(&mut self, p: usize) -> T;
+    fn insert(&mut self, n: usize, val: T);
+    fn from_elem(val: T, n: usize) -> Self;
+    fn from_elems(val: &[T]) -> Self;
+}
+
+impl<T: Copy> Vector<T> for Vec<T> {
+    fn new() -> Self {
+        Self::with_capacity(VEC_SIZE)
+    }
+
+    fn push(&mut self, val: T) {
+        self.push(val)
+    }
+
+    fn pop(&mut self) -> Option<T> {
+        self.pop()
+    }
+
+    fn remove(&mut self, p: usize) -> T {
+        self.remove(p)
+    }
+
+    fn insert(&mut self, n: usize, val: T) {
+        self.insert(n, val)
+    }
+
+    fn from_elem(val: T, n: usize) -> Self {
+        vec![val; n]
+    }
+
+    fn from_elems(val: &[T]) -> Self {
+        val.to_owned()
+    }
+}
+
+impl<T: Copy> Vector<T> for SmallVec<[T; VEC_SIZE]> {
+    fn new() -> Self {
+        Self::new()
+    }
+
+    fn push(&mut self, val: T) {
+        self.push(val)
+    }
+
+    fn pop(&mut self) -> Option<T> {
+        self.pop()
+    }
+
+    fn remove(&mut self, p: usize) -> T {
+        self.remove(p)
+    }
+
+    fn insert(&mut self, n: usize, val: T) {
+        self.insert(n, val)
+    }
+
+    fn from_elem(val: T, n: usize) -> Self {
+        smallvec![val; n]
+    }
+
+    fn from_elems(val: &[T]) -> Self {
+        SmallVec::from_slice(val)
+    }
+}
+
+macro_rules! make_benches {
+    ($typ:ty { $($b_name:ident => $g_name:ident($($args:expr),*),)* }) => {
+        $(
+            #[bench]
+            fn $b_name(b: &mut Bencher) {
+                $g_name::<$typ>($($args,)* b)
+            }
+        )*
+    }
+}
+
+make_benches! {
+    SmallVec<[u64; VEC_SIZE]> {
+        bench_push => gen_push(SPILLED_SIZE as _),
+        bench_push_small => gen_push(VEC_SIZE as _),
+        bench_insert => gen_insert(SPILLED_SIZE as _),
+        bench_insert_small => gen_insert(VEC_SIZE as _),
+        bench_remove => gen_remove(SPILLED_SIZE as _),
+        bench_remove_small => gen_remove(VEC_SIZE as _),
+        bench_extend => gen_extend(SPILLED_SIZE as _),
+        bench_extend_small => gen_extend(VEC_SIZE as _),
+        bench_from_iter => gen_from_iter(SPILLED_SIZE as _),
+        bench_from_iter_small => gen_from_iter(VEC_SIZE as _),
+        bench_from_slice => gen_from_slice(SPILLED_SIZE as _),
+        bench_from_slice_small => gen_from_slice(VEC_SIZE as _),
+        bench_extend_from_slice => gen_extend_from_slice(SPILLED_SIZE as _),
+        bench_extend_from_slice_small => gen_extend_from_slice(VEC_SIZE as _),
+        bench_macro_from_elem => gen_from_elem(SPILLED_SIZE as _),
+        bench_macro_from_elem_small => gen_from_elem(VEC_SIZE as _),
+        bench_pushpop => gen_pushpop(),
+    }
+}
+
+make_benches! {
+    Vec<u64> {
+        bench_push_vec => gen_push(SPILLED_SIZE as _),
+        bench_push_vec_small => gen_push(VEC_SIZE as _),
+        bench_insert_vec => gen_insert(SPILLED_SIZE as _),
+        bench_insert_vec_small => gen_insert(VEC_SIZE as _),
+        bench_remove_vec => gen_remove(SPILLED_SIZE as _),
+        bench_remove_vec_small => gen_remove(VEC_SIZE as _),
+        bench_extend_vec => gen_extend(SPILLED_SIZE as _),
+        bench_extend_vec_small => gen_extend(VEC_SIZE as _),
+        bench_from_iter_vec => gen_from_iter(SPILLED_SIZE as _),
+        bench_from_iter_vec_small => gen_from_iter(VEC_SIZE as _),
+        bench_from_slice_vec => gen_from_slice(SPILLED_SIZE as _),
+        bench_from_slice_vec_small => gen_from_slice(VEC_SIZE as _),
+        bench_extend_from_slice_vec => gen_extend_from_slice(SPILLED_SIZE as _),
+        bench_extend_from_slice_vec_small => gen_extend_from_slice(VEC_SIZE as _),
+        bench_macro_from_elem_vec => gen_from_elem(SPILLED_SIZE as _),
+        bench_macro_from_elem_vec_small => gen_from_elem(VEC_SIZE as _),
+        bench_pushpop_vec => gen_pushpop(),
+    }
+}
+
+fn gen_push<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    #[inline(never)]
+    fn push_noinline<V: Vector<u64>>(vec: &mut V, x: u64) {
+        vec.push(x);
+    }
+
+    b.iter(|| {
+        let mut vec = V::new();
+        for x in 0..n {
+            push_noinline(&mut vec, x);
+        }
+        vec
+    });
+}
+
+fn gen_insert<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    #[inline(never)]
+    fn insert_noinline<V: Vector<u64>>(vec: &mut V, p: usize, x: u64) {
+        vec.insert(p, x)
+    }
+
+    b.iter(|| {
+        let mut vec = V::new();
+        // Add one element, with each iteration we insert one before the end.
+        // This means that we benchmark the insertion operation and not the
+        // time it takes to `ptr::copy` the data.
+        vec.push(0);
+        for x in 0..n {
+            insert_noinline(&mut vec, x as _, x);
+        }
+        vec
+    });
+}
+
+fn gen_remove<V: Vector<u64>>(n: usize, b: &mut Bencher) {
+    #[inline(never)]
+    fn remove_noinline<V: Vector<u64>>(vec: &mut V, p: usize) -> u64 {
+        vec.remove(p)
+    }
+
+    b.iter(|| {
+        let mut vec = V::from_elem(0, n as _);
+
+        for x in (0..n - 1).rev() {
+            remove_noinline(&mut vec, x);
+        }
+    });
+}
+
+fn gen_extend<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    b.iter(|| {
+        let mut vec = V::new();
+        vec.extend(0..n);
+        vec
+    });
+}
+
+fn gen_from_iter<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    let v: Vec<u64> = (0..n).collect();
+    b.iter(|| {
+        let vec = V::from(&v);
+        vec
+    });
+}
+
+fn gen_from_slice<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    let v: Vec<u64> = (0..n).collect();
+    b.iter(|| {
+        let vec = V::from_elems(&v);
+        vec
+    });
+}
+
+fn gen_extend_from_slice<V: Vector<u64>>(n: u64, b: &mut Bencher) {
+    let v: Vec<u64> = (0..n).collect();
+    b.iter(|| {
+        let mut vec = V::new();
+        vec.extend_from_slice(&v);
+        vec
+    });
+}
+
+fn gen_pushpop<V: Vector<u64>>(b: &mut Bencher) {
+    #[inline(never)]
+    fn pushpop_noinline<V: Vector<u64>>(vec: &mut V, x: u64) -> Option<u64> {
+        vec.push(x);
+        vec.pop()
+    }
+
+    b.iter(|| {
+        let mut vec = V::new();
+        for x in 0..SPILLED_SIZE as _ {
+            pushpop_noinline(&mut vec, x);
+        }
+        vec
+    });
+}
+
+fn gen_from_elem<V: Vector<u64>>(n: usize, b: &mut Bencher) {
+    b.iter(|| {
+        let vec = V::from_elem(42, n);
+        vec
+    });
+}
+
+#[bench]
+fn bench_insert_many(b: &mut Bencher) {
+    #[inline(never)]
+    fn insert_many_noinline<I: IntoIterator<Item = u64>>(
+        vec: &mut SmallVec<[u64; VEC_SIZE]>,
+        index: usize,
+        iterable: I,
+    ) {
+        vec.insert_many(index, iterable)
+    }
+
+    b.iter(|| {
+        let mut vec = SmallVec::<[u64; VEC_SIZE]>::new();
+        insert_many_noinline(&mut vec, 0, 0..SPILLED_SIZE as _);
+        insert_many_noinline(&mut vec, 0, 0..SPILLED_SIZE as _);
+        vec
+    });
+}
+
+#[bench]
+fn bench_insert_from_slice(b: &mut Bencher) {
+    let v: Vec<u64> = (0..SPILLED_SIZE as _).collect();
+    b.iter(|| {
+        let mut vec = SmallVec::<[u64; VEC_SIZE]>::new();
+        vec.insert_from_slice(0, &v);
+        vec.insert_from_slice(0, &v);
+        vec
+    });
+}
+
+#[bench]
+fn bench_macro_from_list(b: &mut Bencher) {
+    b.iter(|| {
+        let vec: SmallVec<[u64; 16]> = smallvec![
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 32, 36, 0x40, 0x80,
+            0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, 0x40000,
+            0x80000, 0x100000,
+        ];
+        vec
+    });
+}
+
+#[bench]
+fn bench_macro_from_list_vec(b: &mut Bencher) {
+    b.iter(|| {
+        let vec: Vec<u64> = vec![
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 32, 36, 0x40, 0x80,
+            0x100, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, 0x40000,
+            0x80000, 0x100000,
+        ];
+        vec
+    });
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/.cargo-checksum.json firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/.cargo-checksum.json	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"13560b491e0ed99fe7d16ecef0f728bc57058c007563170d7d644f3bb2433fff","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b28172679e0009b655da42797c03fd163a3379d5cfa67ba1f1655e974a2a1a9","README.md":"a01127c37308457e8d396b176fb790846be0978c173be3f13260b62efcef011b","benches/bench.rs":"7425b60d83d01a0bcedb5855ec8652fb1089194da5b5d8f7d7d9072c8ea9d133","scripts/run_miri.sh":"0d0b8c54c73fa9da1217d29ed0984f8328dd9fb61bb5a02db44458c360cdc3c4","src/lib.rs":"bb8aef09a9c7a43d225dfd99063261b89ebd6835ced4e2dfe696f1c3eaf9b9d2","src/specialization.rs":"46433586203399251cba496d67b88d34e1be3c2b591986b77463513da1c66471","src/tests.rs":"1c4763444139813d335d33f9eda8b8b719da60a2b13ddcb44e1a6cc278c319cc","tests/macro.rs":"22ad4f6f104a599fdcba19cad8834105b8656b212fb6c7573a427d447f5db14f"},"package":"fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/Cargo.toml firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/Cargo.toml
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/Cargo.toml	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,37 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "smallvec"
+version = "1.4.2"
+authors = ["The Servo Project Developers"]
+description = "'Small vector' optimization: store up to a small number of items on the stack"
+documentation = "https://docs.rs/smallvec/"
+readme = "README.md"
+keywords = ["small", "vec", "vector", "stack", "no_std"]
+categories = ["data-structures"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/servo/rust-smallvec"
+[dependencies.serde]
+version = "1"
+optional = true
+default-features = false
+[dev-dependencies.bincode]
+version = "1.0.1"
+
+[features]
+const_generics = []
+may_dangle = []
+specialization = []
+union = []
+write = []
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/LICENSE-APACHE firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/LICENSE-APACHE	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/LICENSE-MIT firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/LICENSE-MIT	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,25 @@
+Copyright (c) 2018 The Servo Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/README.md firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/README.md
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/README.md	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,26 @@
+rust-smallvec
+=============
+
+[Documentation](https://docs.rs/smallvec/)
+
+[Release notes](https://github.com/servo/rust-smallvec/releases)
+
+"Small vector" optimization for Rust: store up to a small number of items on the stack
+
+## Example
+
+```rust
+use smallvec::{SmallVec, smallvec};
+    
+// This SmallVec can hold up to 4 items on the stack:
+let mut v: SmallVec<[i32; 4]> = smallvec![1, 2, 3, 4];
+
+// It will automatically move its contents to the heap if
+// contains more than four items:
+v.push(5);
+
+// SmallVec points to a slice, so you can use normal slice
+// indexing and other methods to access its contents:
+v[0] = v[1] + v[2];
+v.sort();
+```
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/scripts/run_miri.sh firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/scripts/run_miri.sh
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/scripts/run_miri.sh	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/scripts/run_miri.sh	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/bash
+
+set -ex
+
+# Clean out our target dir, which may have artifacts compiled by a version of
+# rust different from the one we're about to download.
+cargo clean
+
+# Install and run the latest version of nightly where miri built successfully.
+# Taken from: https://github.com/rust-lang/miri#running-miri-on-ci
+
+MIRI_NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)
+echo "Installing latest nightly with Miri: $MIRI_NIGHTLY"
+rustup default "$MIRI_NIGHTLY"
+
+rustup component add miri
+cargo miri setup
+
+cargo miri test --verbose
+cargo miri test --verbose --features union
+cargo miri test --verbose --all-features
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/lib.rs firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/lib.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/lib.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,1950 @@
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Small vectors in various sizes. These store a certain number of elements inline, and fall back
+//! to the heap for larger allocations.  This can be a useful optimization for improving cache
+//! locality and reducing allocator traffic for workloads that fit within the inline buffer.
+//!
+//! ## `no_std` support
+//!
+//! By default, `smallvec` does not depend on `std`.  However, the optional
+//! `write` feature implements the `std::io::Write` trait for vectors of `u8`.
+//! When this feature is enabled, `smallvec` depends on `std`.
+//!
+//! ## Optional features
+//!
+//! ### `serde`
+//!
+//! When this optional dependency is enabled, `SmallVec` implements the `serde::Serialize` and
+//! `serde::Deserialize` traits.
+//!
+//! ### `write`
+//!
+//! When this feature is enabled, `SmallVec<[u8; _]>` implements the `std::io::Write` trait.
+//! This feature is not compatible with `#![no_std]` programs.
+//!
+//! ### `union`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When the `union` feature is enabled `smallvec` will track its state (inline or spilled)
+//! without the use of an enum tag, reducing the size of the `smallvec` by one machine word.
+//! This means that there is potentially no space overhead compared to `Vec`.
+//! Note that `smallvec` can still be larger than `Vec` if the inline buffer is larger than two
+//! machine words.
+//!
+//! To use this feature add `features = ["union"]` in the `smallvec` section of Cargo.toml.
+//! Note that this feature requires a nightly compiler (for now).
+//!
+//! Tracking issue: [rust-lang/rust#55149](https://github.com/rust-lang/rust/issues/55149)
+//!
+//! ### `const_generics`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When this feature is enabled, `SmallVec` works with any arrays of any size, not just a fixed
+//! list of sizes.
+//!
+//! Tracking issue: [rust-lang/rust#44580](https://github.com/rust-lang/rust/issues/44580)
+//!
+//! ### `specialization`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When this feature is enabled, `SmallVec::from(slice)` has improved performance for slices
+//! of `Copy` types.  (Without this feature, you can use `SmallVec::from_slice` to get optimal
+//! performance for `Copy` types.)
+//!
+//! Tracking issue: [rust-lang/rust#31844](https://github.com/rust-lang/rust/issues/31844)
+//!
+//! ### `may_dangle`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! This feature makes the Rust compiler less strict about use of vectors that contain borrowed
+//! references. For details, see the
+//! [Rustonomicon](https://doc.rust-lang.org/1.42.0/nomicon/dropck.html#an-escape-hatch).
+//!
+//! Tracking issue: [rust-lang/rust#34761](https://github.com/rust-lang/rust/issues/34761)
+
+#![no_std]
+#![cfg_attr(feature = "union", feature(untagged_unions))]
+#![cfg_attr(feature = "specialization", allow(incomplete_features))]
+#![cfg_attr(feature = "specialization", feature(specialization))]
+#![cfg_attr(feature = "may_dangle", feature(dropck_eyepatch))]
+#![cfg_attr(feature = "const_generics", feature(min_const_generics))]
+#![deny(missing_docs)]
+
+#[doc(hidden)]
+pub extern crate alloc;
+
+#[cfg(any(test, feature = "write"))]
+extern crate std;
+
+#[cfg(test)]
+mod tests;
+
+use alloc::alloc::{Layout, LayoutErr};
+use alloc::boxed::Box;
+use alloc::{vec, vec::Vec};
+use core::borrow::{Borrow, BorrowMut};
+use core::cmp;
+use core::fmt;
+use core::hash::{Hash, Hasher};
+use core::hint::unreachable_unchecked;
+use core::iter::{repeat, FromIterator, FusedIterator, IntoIterator};
+use core::mem;
+use core::mem::MaybeUninit;
+use core::ops::{self, Range, RangeBounds};
+use core::ptr::{self, NonNull};
+use core::slice::{self, SliceIndex};
+
+#[cfg(feature = "serde")]
+use serde::{
+    de::{Deserialize, Deserializer, SeqAccess, Visitor},
+    ser::{Serialize, SerializeSeq, Serializer},
+};
+
+#[cfg(feature = "serde")]
+use core::marker::PhantomData;
+
+#[cfg(feature = "write")]
+use std::io;
+
+/// Creates a [`SmallVec`] containing the arguments.
+///
+/// `smallvec!` allows `SmallVec`s to be defined with the same syntax as array expressions.
+/// There are two forms of this macro:
+///
+/// - Create a [`SmallVec`] containing a given list of elements:
+///
+/// ```
+/// # #[macro_use] extern crate smallvec;
+/// # use smallvec::SmallVec;
+/// # fn main() {
+/// let v: SmallVec<[_; 128]> = smallvec![1, 2, 3];
+/// assert_eq!(v[0], 1);
+/// assert_eq!(v[1], 2);
+/// assert_eq!(v[2], 3);
+/// # }
+/// ```
+///
+/// - Create a [`SmallVec`] from a given element and size:
+///
+/// ```
+/// # #[macro_use] extern crate smallvec;
+/// # use smallvec::SmallVec;
+/// # fn main() {
+/// let v: SmallVec<[_; 0x8000]> = smallvec![1; 3];
+/// assert_eq!(v, SmallVec::from_buf([1, 1, 1]));
+/// # }
+/// ```
+///
+/// Note that unlike array expressions this syntax supports all elements
+/// which implement [`Clone`] and the number of elements doesn't have to be
+/// a constant.
+///
+/// This will use `clone` to duplicate an expression, so one should be careful
+/// using this with types having a nonstandard `Clone` implementation. For
+/// example, `smallvec![Rc::new(1); 5]` will create a vector of five references
+/// to the same boxed integer value, not five references pointing to independently
+/// boxed integers.
+
+#[macro_export]
+macro_rules! smallvec {
+    // count helper: transform any expression into 1
+    (@one $x:expr) => (1usize);
+    ($elem:expr; $n:expr) => ({
+        $crate::SmallVec::from_elem($elem, $n)
+    });
+    ($($x:expr),*$(,)*) => ({
+        let count = 0usize $(+ $crate::smallvec!(@one $x))*;
+        #[allow(unused_mut)]
+        let mut vec = $crate::SmallVec::new();
+        if count <= vec.inline_size() {
+            $(vec.push($x);)*
+            vec
+        } else {
+            $crate::SmallVec::from_vec($crate::alloc::vec![$($x,)*])
+        }
+    });
+}
+
+/// `panic!()` in debug builds, optimization hint in release.
+#[cfg(not(feature = "union"))]
+macro_rules! debug_unreachable {
+    () => {
+        debug_unreachable!("entered unreachable code")
+    };
+    ($e:expr) => {
+        if cfg!(not(debug_assertions)) {
+            unreachable_unchecked();
+        } else {
+            panic!($e);
+        }
+    };
+}
+
+/// Trait to be implemented by a collection that can be extended from a slice
+///
+/// ## Example
+///
+/// ```rust
+/// use smallvec::{ExtendFromSlice, SmallVec};
+///
+/// fn initialize<V: ExtendFromSlice<u8>>(v: &mut V) {
+///     v.extend_from_slice(b"Test!");
+/// }
+///
+/// let mut vec = Vec::new();
+/// initialize(&mut vec);
+/// assert_eq!(&vec, b"Test!");
+///
+/// let mut small_vec = SmallVec::<[u8; 8]>::new();
+/// initialize(&mut small_vec);
+/// assert_eq!(&small_vec as &[_], b"Test!");
+/// ```
+#[doc(hidden)]
+#[deprecated]
+pub trait ExtendFromSlice<T> {
+    /// Extends a collection from a slice of its element type
+    fn extend_from_slice(&mut self, other: &[T]);
+}
+
+#[allow(deprecated)]
+impl<T: Clone> ExtendFromSlice<T> for Vec<T> {
+    fn extend_from_slice(&mut self, other: &[T]) {
+        Vec::extend_from_slice(self, other)
+    }
+}
+
+/// Error type for APIs with fallible heap allocation
+#[derive(Debug)]
+pub enum CollectionAllocErr {
+    /// Overflow `usize::MAX` or other error during size computation
+    CapacityOverflow,
+    /// The allocator return an error
+    AllocErr {
+        /// The layout that was passed to the allocator
+        layout: Layout,
+    },
+}
+
+impl From<LayoutErr> for CollectionAllocErr {
+    fn from(_: LayoutErr) -> Self {
+        CollectionAllocErr::CapacityOverflow
+    }
+}
+
+fn infallible<T>(result: Result<T, CollectionAllocErr>) -> T {
+    match result {
+        Ok(x) => x,
+        Err(CollectionAllocErr::CapacityOverflow) => panic!("capacity overflow"),
+        Err(CollectionAllocErr::AllocErr { layout }) => alloc::alloc::handle_alloc_error(layout),
+    }
+}
+
+/// FIXME: use `Layout::array` when we require a Rust version where it’s stable
+/// https://github.com/rust-lang/rust/issues/55724
+fn layout_array<T>(n: usize) -> Result<Layout, CollectionAllocErr> {
+    let size = mem::size_of::<T>()
+        .checked_mul(n)
+        .ok_or(CollectionAllocErr::CapacityOverflow)?;
+    let align = mem::align_of::<T>();
+    Layout::from_size_align(size, align).map_err(|_| CollectionAllocErr::CapacityOverflow)
+}
+
+unsafe fn deallocate<T>(ptr: *mut T, capacity: usize) {
+    // This unwrap should succeed since the same did when allocating.
+    let layout = layout_array::<T>(capacity).unwrap();
+    alloc::alloc::dealloc(ptr as *mut u8, layout)
+}
+
+/// An iterator that removes the items from a `SmallVec` and yields them by value.
+///
+/// Returned from [`SmallVec::drain`][1].
+///
+/// [1]: struct.SmallVec.html#method.drain
+pub struct Drain<'a, T: 'a + Array> {
+    tail_start: usize,
+    tail_len: usize,
+    iter: slice::Iter<'a, T::Item>,
+    vec: NonNull<SmallVec<T>>,
+}
+
+impl<'a, T: 'a + Array> fmt::Debug for Drain<'a, T>
+where
+    T::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("Drain").field(&self.iter.as_slice()).finish()
+    }
+}
+
+unsafe impl<'a, T: Sync + Array> Sync for Drain<'a, T> {}
+unsafe impl<'a, T: Send + Array> Send for Drain<'a, T> {}
+
+impl<'a, T: 'a + Array> Iterator for Drain<'a, T> {
+    type Item = T::Item;
+
+    #[inline]
+    fn next(&mut self) -> Option<T::Item> {
+        self.iter
+            .next()
+            .map(|reference| unsafe { ptr::read(reference) })
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, T: 'a + Array> DoubleEndedIterator for Drain<'a, T> {
+    #[inline]
+    fn next_back(&mut self) -> Option<T::Item> {
+        self.iter
+            .next_back()
+            .map(|reference| unsafe { ptr::read(reference) })
+    }
+}
+
+impl<'a, T: Array> ExactSizeIterator for Drain<'a, T> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.iter.len()
+    }
+}
+
+impl<'a, T: Array> FusedIterator for Drain<'a, T> {}
+
+impl<'a, T: 'a + Array> Drop for Drain<'a, T> {
+    fn drop(&mut self) {
+        self.for_each(drop);
+
+        if self.tail_len > 0 {
+            unsafe {
+                let source_vec = self.vec.as_mut();
+
+                // memmove back untouched tail, update to new length
+                let start = source_vec.len();
+                let tail = self.tail_start;
+                if tail != start {
+                    let src = source_vec.as_ptr().add(tail);
+                    let dst = source_vec.as_mut_ptr().add(start);
+                    ptr::copy(src, dst, self.tail_len);
+                }
+                source_vec.set_len(start + self.tail_len);
+            }
+        }
+    }
+}
+
+#[cfg(feature = "union")]
+union SmallVecData<A: Array> {
+    inline: MaybeUninit<A>,
+    heap: (*mut A::Item, usize),
+}
+
+#[cfg(feature = "union")]
+impl<A: Array> SmallVecData<A> {
+    #[inline]
+    unsafe fn inline(&self) -> *const A::Item {
+        self.inline.as_ptr() as *const A::Item
+    }
+    #[inline]
+    unsafe fn inline_mut(&mut self) -> *mut A::Item {
+        self.inline.as_mut_ptr() as *mut A::Item
+    }
+    #[inline]
+    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
+        SmallVecData { inline }
+    }
+    #[inline]
+    unsafe fn into_inline(self) -> MaybeUninit<A> {
+        self.inline
+    }
+    #[inline]
+    unsafe fn heap(&self) -> (*mut A::Item, usize) {
+        self.heap
+    }
+    #[inline]
+    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
+        &mut self.heap
+    }
+    #[inline]
+    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
+        SmallVecData { heap: (ptr, len) }
+    }
+}
+
+#[cfg(not(feature = "union"))]
+enum SmallVecData<A: Array> {
+    Inline(MaybeUninit<A>),
+    Heap((*mut A::Item, usize)),
+}
+
+#[cfg(not(feature = "union"))]
+impl<A: Array> SmallVecData<A> {
+    #[inline]
+    unsafe fn inline(&self) -> *const A::Item {
+        match self {
+            SmallVecData::Inline(a) => a.as_ptr() as *const A::Item,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn inline_mut(&mut self) -> *mut A::Item {
+        match self {
+            SmallVecData::Inline(a) => a.as_mut_ptr() as *mut A::Item,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
+        SmallVecData::Inline(inline)
+    }
+    #[inline]
+    unsafe fn into_inline(self) -> MaybeUninit<A> {
+        match self {
+            SmallVecData::Inline(a) => a,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn heap(&self) -> (*mut A::Item, usize) {
+        match self {
+            SmallVecData::Heap(data) => *data,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
+        match self {
+            SmallVecData::Heap(data) => data,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
+        SmallVecData::Heap((ptr, len))
+    }
+}
+
+unsafe impl<A: Array + Send> Send for SmallVecData<A> {}
+unsafe impl<A: Array + Sync> Sync for SmallVecData<A> {}
+
+/// A `Vec`-like container that can store a small number of elements inline.
+///
+/// `SmallVec` acts like a vector, but can store a limited amount of data inline within the
+/// `SmallVec` struct rather than in a separate allocation.  If the data exceeds this limit, the
+/// `SmallVec` will "spill" its data onto the heap, allocating a new buffer to hold it.
+///
+/// The amount of data that a `SmallVec` can store inline depends on its backing store. The backing
+/// store can be any type that implements the `Array` trait; usually it is a small fixed-sized
+/// array.  For example a `SmallVec<[u64; 8]>` can hold up to eight 64-bit integers inline.
+///
+/// ## Example
+///
+/// ```rust
+/// use smallvec::SmallVec;
+/// let mut v = SmallVec::<[u8; 4]>::new(); // initialize an empty vector
+///
+/// // The vector can hold up to 4 items without spilling onto the heap.
+/// v.extend(0..4);
+/// assert_eq!(v.len(), 4);
+/// assert!(!v.spilled());
+///
+/// // Pushing another element will force the buffer to spill:
+/// v.push(4);
+/// assert_eq!(v.len(), 5);
+/// assert!(v.spilled());
+/// ```
+pub struct SmallVec<A: Array> {
+    // The capacity field is used to determine which of the storage variants is active:
+    // If capacity <= Self::inline_capacity() then the inline variant is used and capacity holds the current length of the vector (number of elements actually in use).
+    // If capacity > Self::inline_capacity() then the heap variant is used and capacity holds the size of the memory allocation.
+    capacity: usize,
+    data: SmallVecData<A>,
+}
+
+impl<A: Array> SmallVec<A> {
+    /// Construct an empty vector
+    #[inline]
+    pub fn new() -> SmallVec<A> {
+        // Try to detect invalid custom implementations of `Array`. Hopefuly,
+        // this check should be optimized away entirely for valid ones.
+        assert!(
+            mem::size_of::<A>() == A::size() * mem::size_of::<A::Item>()
+                && mem::align_of::<A>() >= mem::align_of::<A::Item>()
+        );
+        SmallVec {
+            capacity: 0,
+            data: SmallVecData::from_inline(MaybeUninit::uninit()),
+        }
+    }
+
+    /// Construct an empty vector with enough capacity pre-allocated to store at least `n`
+    /// elements.
+    ///
+    /// Will create a heap allocation only if `n` is larger than the inline capacity.
+    ///
+    /// ```
+    /// # use smallvec::SmallVec;
+    ///
+    /// let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(100);
+    ///
+    /// assert!(v.is_empty());
+    /// assert!(v.capacity() >= 100);
+    /// ```
+    #[inline]
+    pub fn with_capacity(n: usize) -> Self {
+        let mut v = SmallVec::new();
+        v.reserve_exact(n);
+        v
+    }
+
+    /// Construct a new `SmallVec` from a `Vec<A::Item>`.
+    ///
+    /// Elements will be copied to the inline buffer if vec.capacity() <= Self::inline_capacity().
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let vec = vec![1, 2, 3, 4, 5];
+    /// let small_vec: SmallVec<[_; 3]> = SmallVec::from_vec(vec);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_vec(mut vec: Vec<A::Item>) -> SmallVec<A> {
+        if vec.capacity() <= Self::inline_capacity() {
+            unsafe {
+                let mut data = SmallVecData::<A>::from_inline(MaybeUninit::uninit());
+                let len = vec.len();
+                vec.set_len(0);
+                ptr::copy_nonoverlapping(vec.as_ptr(), data.inline_mut(), len);
+
+                SmallVec {
+                    capacity: len,
+                    data,
+                }
+            }
+        } else {
+            let (ptr, cap, len) = (vec.as_mut_ptr(), vec.capacity(), vec.len());
+            mem::forget(vec);
+
+            SmallVec {
+                capacity: cap,
+                data: SmallVecData::from_heap(ptr, len),
+            }
+        }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let buf = [1, 2, 3, 4, 5];
+    /// let small_vec: SmallVec<_> = SmallVec::from_buf(buf);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_buf(buf: A) -> SmallVec<A> {
+        SmallVec {
+            capacity: A::size(),
+            data: SmallVecData::from_inline(MaybeUninit::new(buf)),
+        }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements. Also sets the length, which must be less or
+    /// equal to the size of `buf`.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
+    /// let small_vec: SmallVec<_> = SmallVec::from_buf_and_len(buf, 5);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_buf_and_len(buf: A, len: usize) -> SmallVec<A> {
+        assert!(len <= A::size());
+        unsafe { SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), len) }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements. Also sets the length. The user is responsible
+    /// for ensuring that `len <= A::size()`.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    /// use std::mem::MaybeUninit;
+    ///
+    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
+    /// let small_vec: SmallVec<_> = unsafe {
+    ///     SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), 5)
+    /// };
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub unsafe fn from_buf_and_len_unchecked(buf: MaybeUninit<A>, len: usize) -> SmallVec<A> {
+        SmallVec {
+            capacity: len,
+            data: SmallVecData::from_inline(buf),
+        }
+    }
+
+    /// Sets the length of a vector.
+    ///
+    /// This will explicitly set the size of the vector, without actually
+    /// modifying its buffers, so it is up to the caller to ensure that the
+    /// vector is actually the specified size.
+    pub unsafe fn set_len(&mut self, new_len: usize) {
+        let (_, len_ptr, _) = self.triple_mut();
+        *len_ptr = new_len;
+    }
+
+    /// The maximum number of elements this vector can hold inline
+    #[inline]
+    fn inline_capacity() -> usize {
+        if mem::size_of::<A::Item>() > 0 {
+            A::size()
+        } else {
+            // For zero-size items code like `ptr.add(offset)` always returns the same pointer.
+            // Therefore all items are at the same address,
+            // and any array size has capacity for infinitely many items.
+            // The capacity is limited by the bit width of the length field.
+            //
+            // `Vec` also does this:
+            // https://github.com/rust-lang/rust/blob/1.44.0/src/liballoc/raw_vec.rs#L186
+            //
+            // In our case, this also ensures that a smallvec of zero-size items never spills,
+            // and we never try to allocate zero bytes which `std::alloc::alloc` disallows.
+            core::usize::MAX
+        }
+    }
+
+    /// The maximum number of elements this vector can hold inline
+    #[inline]
+    pub fn inline_size(&self) -> usize {
+        Self::inline_capacity()
+    }
+
+    /// The number of elements stored in the vector
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.triple().1
+    }
+
+    /// Returns `true` if the vector is empty
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// The number of items the vector can hold without reallocating
+    #[inline]
+    pub fn capacity(&self) -> usize {
+        self.triple().2
+    }
+
+    /// Returns a tuple with (data ptr, len, capacity)
+    /// Useful to get all SmallVec properties with a single check of the current storage variant.
+    #[inline]
+    fn triple(&self) -> (*const A::Item, usize, usize) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                (ptr, len, self.capacity)
+            } else {
+                (self.data.inline(), self.capacity, Self::inline_capacity())
+            }
+        }
+    }
+
+    /// Returns a tuple with (data ptr, len ptr, capacity)
+    #[inline]
+    fn triple_mut(&mut self) -> (*mut A::Item, &mut usize, usize) {
+        unsafe {
+            if self.spilled() {
+                let &mut (ptr, ref mut len_ptr) = self.data.heap_mut();
+                (ptr, len_ptr, self.capacity)
+            } else {
+                (
+                    self.data.inline_mut(),
+                    &mut self.capacity,
+                    Self::inline_capacity(),
+                )
+            }
+        }
+    }
+
+    /// Returns `true` if the data has spilled into a separate heap-allocated buffer.
+    #[inline]
+    pub fn spilled(&self) -> bool {
+        self.capacity > Self::inline_capacity()
+    }
+
+    /// Creates a draining iterator that removes the specified range in the vector
+    /// and yields the removed items.
+    ///
+    /// Note 1: The element range is removed even if the iterator is only
+    /// partially consumed or not consumed at all.
+    ///
+    /// Note 2: It is unspecified how many elements are removed from the vector
+    /// if the `Drain` value is leaked.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the starting point is greater than the end point or if
+    /// the end point is greater than the length of the vector.
+    pub fn drain<R>(&mut self, range: R) -> Drain<'_, A>
+    where
+        R: RangeBounds<usize>,
+    {
+        use core::ops::Bound::*;
+
+        let len = self.len();
+        let start = match range.start_bound() {
+            Included(&n) => n,
+            Excluded(&n) => n + 1,
+            Unbounded => 0,
+        };
+        let end = match range.end_bound() {
+            Included(&n) => n + 1,
+            Excluded(&n) => n,
+            Unbounded => len,
+        };
+
+        assert!(start <= end);
+        assert!(end <= len);
+
+        unsafe {
+            self.set_len(start);
+
+            let range_slice = slice::from_raw_parts_mut(self.as_mut_ptr().add(start), end - start);
+
+            Drain {
+                tail_start: end,
+                tail_len: len - end,
+                iter: range_slice.iter(),
+                vec: NonNull::from(self),
+            }
+        }
+    }
+
+    /// Append an item to the vector.
+    #[inline]
+    pub fn push(&mut self, value: A::Item) {
+        unsafe {
+            let (_, &mut len, cap) = self.triple_mut();
+            if len == cap {
+                self.reserve(1);
+            }
+            let (ptr, len_ptr, _) = self.triple_mut();
+            *len_ptr = len + 1;
+            ptr::write(ptr.add(len), value);
+        }
+    }
+
+    /// Remove an item from the end of the vector and return it, or None if empty.
+    #[inline]
+    pub fn pop(&mut self) -> Option<A::Item> {
+        unsafe {
+            let (ptr, len_ptr, _) = self.triple_mut();
+            if *len_ptr == 0 {
+                return None;
+            }
+            let last_index = *len_ptr - 1;
+            *len_ptr = last_index;
+            Some(ptr::read(ptr.add(last_index)))
+        }
+    }
+
+    /// Re-allocate to set the capacity to `max(new_cap, inline_size())`.
+    ///
+    /// Panics if `new_cap` is less than the vector's length
+    /// or if the capacity computation overflows `usize`.
+    pub fn grow(&mut self, new_cap: usize) {
+        infallible(self.try_grow(new_cap))
+    }
+
+    /// Re-allocate to set the capacity to `max(new_cap, inline_size())`.
+    ///
+    /// Panics if `new_cap` is less than the vector's length
+    pub fn try_grow(&mut self, new_cap: usize) -> Result<(), CollectionAllocErr> {
+        unsafe {
+            let (ptr, &mut len, cap) = self.triple_mut();
+            let unspilled = !self.spilled();
+            assert!(new_cap >= len);
+            if new_cap <= self.inline_size() {
+                if unspilled {
+                    return Ok(());
+                }
+                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
+                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
+                self.capacity = len;
+                deallocate(ptr, cap);
+            } else if new_cap != cap {
+                let layout = layout_array::<A::Item>(new_cap)?;
+                debug_assert!(layout.size() > 0);
+                let new_alloc;
+                if unspilled {
+                    new_alloc = NonNull::new(alloc::alloc::alloc(layout))
+                        .ok_or(CollectionAllocErr::AllocErr { layout })?
+                        .cast()
+                        .as_ptr();
+                    ptr::copy_nonoverlapping(ptr, new_alloc, len);
+                } else {
+                    // This should never fail since the same succeeded
+                    // when previously allocating `ptr`.
+                    let old_layout = layout_array::<A::Item>(cap)?;
+
+                    let new_ptr = alloc::alloc::realloc(ptr as *mut u8, old_layout, layout.size());
+                    new_alloc = NonNull::new(new_ptr)
+                        .ok_or(CollectionAllocErr::AllocErr { layout })?
+                        .cast()
+                        .as_ptr();
+                }
+                self.data = SmallVecData::from_heap(new_alloc, len);
+                self.capacity = new_cap;
+            }
+            Ok(())
+        }
+    }
+
+    /// Reserve capacity for `additional` more elements to be inserted.
+    ///
+    /// May reserve more space to avoid frequent reallocations.
+    ///
+    /// Panics if the capacity computation overflows `usize`.
+    #[inline]
+    pub fn reserve(&mut self, additional: usize) {
+        infallible(self.try_reserve(additional))
+    }
+
+    /// Reserve capacity for `additional` more elements to be inserted.
+    ///
+    /// May reserve more space to avoid frequent reallocations.
+    pub fn try_reserve(&mut self, additional: usize) -> Result<(), CollectionAllocErr> {
+        // prefer triple_mut() even if triple() would work
+        // so that the optimizer removes duplicated calls to it
+        // from callers like insert()
+        let (_, &mut len, cap) = self.triple_mut();
+        if cap - len >= additional {
+            return Ok(());
+        }
+        let new_cap = len
+            .checked_add(additional)
+            .and_then(usize::checked_next_power_of_two)
+            .ok_or(CollectionAllocErr::CapacityOverflow)?;
+        self.try_grow(new_cap)
+    }
+
+    /// Reserve the minimum capacity for `additional` more elements to be inserted.
+    ///
+    /// Panics if the new capacity overflows `usize`.
+    pub fn reserve_exact(&mut self, additional: usize) {
+        infallible(self.try_reserve_exact(additional))
+    }
+
+    /// Reserve the minimum capacity for `additional` more elements to be inserted.
+    pub fn try_reserve_exact(&mut self, additional: usize) -> Result<(), CollectionAllocErr> {
+        let (_, &mut len, cap) = self.triple_mut();
+        if cap - len >= additional {
+            return Ok(());
+        }
+        let new_cap = len
+            .checked_add(additional)
+            .ok_or(CollectionAllocErr::CapacityOverflow)?;
+        self.try_grow(new_cap)
+    }
+
+    /// Shrink the capacity of the vector as much as possible.
+    ///
+    /// When possible, this will move data from an external heap buffer to the vector's inline
+    /// storage.
+    pub fn shrink_to_fit(&mut self) {
+        if !self.spilled() {
+            return;
+        }
+        let len = self.len();
+        if self.inline_size() >= len {
+            unsafe {
+                let (ptr, len) = self.data.heap();
+                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
+                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
+                deallocate(ptr, self.capacity);
+                self.capacity = len;
+            }
+        } else if self.capacity() > len {
+            self.grow(len);
+        }
+    }
+
+    /// Shorten the vector, keeping the first `len` elements and dropping the rest.
+    ///
+    /// If `len` is greater than or equal to the vector's current length, this has no
+    /// effect.
+    ///
+    /// This does not re-allocate.  If you want the vector's capacity to shrink, call
+    /// `shrink_to_fit` after truncating.
+    pub fn truncate(&mut self, len: usize) {
+        unsafe {
+            let (ptr, len_ptr, _) = self.triple_mut();
+            while len < *len_ptr {
+                let last_index = *len_ptr - 1;
+                *len_ptr = last_index;
+                ptr::drop_in_place(ptr.add(last_index));
+            }
+        }
+    }
+
+    /// Extracts a slice containing the entire vector.
+    ///
+    /// Equivalent to `&s[..]`.
+    pub fn as_slice(&self) -> &[A::Item] {
+        self
+    }
+
+    /// Extracts a mutable slice of the entire vector.
+    ///
+    /// Equivalent to `&mut s[..]`.
+    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        self
+    }
+
+    /// Remove the element at position `index`, replacing it with the last element.
+    ///
+    /// This does not preserve ordering, but is O(1).
+    ///
+    /// Panics if `index` is out of bounds.
+    #[inline]
+    pub fn swap_remove(&mut self, index: usize) -> A::Item {
+        let len = self.len();
+        self.swap(len - 1, index);
+        self.pop()
+            .unwrap_or_else(|| unsafe { unreachable_unchecked() })
+    }
+
+    /// Remove all elements from the vector.
+    #[inline]
+    pub fn clear(&mut self) {
+        self.truncate(0);
+    }
+
+    /// Remove and return the element at position `index`, shifting all elements after it to the
+    /// left.
+    ///
+    /// Panics if `index` is out of bounds.
+    pub fn remove(&mut self, index: usize) -> A::Item {
+        unsafe {
+            let (mut ptr, len_ptr, _) = self.triple_mut();
+            let len = *len_ptr;
+            assert!(index < len);
+            *len_ptr = len - 1;
+            ptr = ptr.add(index);
+            let item = ptr::read(ptr);
+            ptr::copy(ptr.add(1), ptr, len - index - 1);
+            item
+        }
+    }
+
+    /// Insert an element at position `index`, shifting all elements after it to the right.
+    ///
+    /// Panics if `index` is out of bounds.
+    pub fn insert(&mut self, index: usize, element: A::Item) {
+        self.reserve(1);
+
+        unsafe {
+            let (mut ptr, len_ptr, _) = self.triple_mut();
+            let len = *len_ptr;
+            assert!(index <= len);
+            *len_ptr = len + 1;
+            ptr = ptr.add(index);
+            ptr::copy(ptr, ptr.add(1), len - index);
+            ptr::write(ptr, element);
+        }
+    }
+
+    /// Insert multiple elements at position `index`, shifting all following elements toward the
+    /// back.
+    pub fn insert_many<I: IntoIterator<Item = A::Item>>(&mut self, index: usize, iterable: I) {
+        let iter = iterable.into_iter();
+        if index == self.len() {
+            return self.extend(iter);
+        }
+
+        let (lower_size_bound, _) = iter.size_hint();
+        assert!(lower_size_bound <= core::isize::MAX as usize); // Ensure offset is indexable
+        assert!(index + lower_size_bound >= index); // Protect against overflow
+        self.reserve(lower_size_bound);
+
+        unsafe {
+            let old_len = self.len();
+            assert!(index <= old_len);
+            let start = self.as_mut_ptr();
+            let mut ptr = start.add(index);
+
+            // Move the trailing elements.
+            ptr::copy(ptr, ptr.add(lower_size_bound), old_len - index);
+
+            // In case the iterator panics, don't double-drop the items we just copied above.
+            self.set_len(0);
+            let mut guard = DropOnPanic {
+                start,
+                skip: index..(index + lower_size_bound),
+                len: old_len + lower_size_bound,
+            };
+
+            let mut num_added = 0;
+            for element in iter {
+                let mut cur = ptr.add(num_added);
+                if num_added >= lower_size_bound {
+                    // Iterator provided more elements than the hint.  Move trailing items again.
+                    self.reserve(1);
+                    let start = self.as_mut_ptr();
+                    ptr = start.add(index);
+                    cur = ptr.add(num_added);
+                    ptr::copy(cur, cur.add(1), old_len - index);
+
+                    guard.start = start;
+                    guard.len += 1;
+                    guard.skip.end += 1;
+                }
+                ptr::write(cur, element);
+                guard.skip.start += 1;
+                num_added += 1;
+            }
+            mem::forget(guard);
+
+            if num_added < lower_size_bound {
+                // Iterator provided fewer elements than the hint
+                ptr::copy(
+                    ptr.add(lower_size_bound),
+                    ptr.add(num_added),
+                    old_len - index,
+                );
+            }
+
+            self.set_len(old_len + num_added);
+        }
+
+        struct DropOnPanic<T> {
+            start: *mut T,
+            skip: Range<usize>,
+            len: usize,
+        }
+
+        impl<T> Drop for DropOnPanic<T> {
+            fn drop(&mut self) {
+                for i in 0..self.len {
+                    if !self.skip.contains(&i) {
+                        unsafe {
+                            ptr::drop_in_place(self.start.add(i));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// Convert a SmallVec to a Vec, without reallocating if the SmallVec has already spilled onto
+    /// the heap.
+    pub fn into_vec(self) -> Vec<A::Item> {
+        if self.spilled() {
+            unsafe {
+                let (ptr, len) = self.data.heap();
+                let v = Vec::from_raw_parts(ptr, len, self.capacity);
+                mem::forget(self);
+                v
+            }
+        } else {
+            self.into_iter().collect()
+        }
+    }
+
+    /// Converts a `SmallVec` into a `Box<[T]>` without reallocating if the `SmallVec` has already spilled
+    /// onto the heap.
+    ///
+    /// Note that this will drop any excess capacity.
+    pub fn into_boxed_slice(self) -> Box<[A::Item]> {
+        self.into_vec().into_boxed_slice()
+    }
+
+    /// Convert the SmallVec into an `A` if possible. Otherwise return `Err(Self)`.
+    ///
+    /// This method returns `Err(Self)` if the SmallVec is too short (and the `A` contains uninitialized elements),
+    /// or if the SmallVec is too long (and all the elements were spilled to the heap).
+    pub fn into_inner(self) -> Result<A, Self> {
+        if self.spilled() || self.len() != A::size() {
+            // Note: A::size, not Self::inline_capacity
+            Err(self)
+        } else {
+            unsafe {
+                let data = ptr::read(&self.data);
+                mem::forget(self);
+                Ok(data.into_inline().assume_init())
+            }
+        }
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all elements `e` such that `f(&e)` returns `false`.
+    /// This method operates in place and preserves the order of the retained
+    /// elements.
+    pub fn retain<F: FnMut(&mut A::Item) -> bool>(&mut self, mut f: F) {
+        let mut del = 0;
+        let len = self.len();
+        for i in 0..len {
+            if !f(&mut self[i]) {
+                del += 1;
+            } else if del > 0 {
+                self.swap(i - del, i);
+            }
+        }
+        self.truncate(len - del);
+    }
+
+    /// Removes consecutive duplicate elements.
+    pub fn dedup(&mut self)
+    where
+        A::Item: PartialEq<A::Item>,
+    {
+        self.dedup_by(|a, b| a == b);
+    }
+
+    /// Removes consecutive duplicate elements using the given equality relation.
+    pub fn dedup_by<F>(&mut self, mut same_bucket: F)
+    where
+        F: FnMut(&mut A::Item, &mut A::Item) -> bool,
+    {
+        // See the implementation of Vec::dedup_by in the
+        // standard library for an explanation of this algorithm.
+        let len = self.len();
+        if len <= 1 {
+            return;
+        }
+
+        let ptr = self.as_mut_ptr();
+        let mut w: usize = 1;
+
+        unsafe {
+            for r in 1..len {
+                let p_r = ptr.add(r);
+                let p_wm1 = ptr.add(w - 1);
+                if !same_bucket(&mut *p_r, &mut *p_wm1) {
+                    if r != w {
+                        let p_w = p_wm1.add(1);
+                        mem::swap(&mut *p_r, &mut *p_w);
+                    }
+                    w += 1;
+                }
+            }
+        }
+
+        self.truncate(w);
+    }
+
+    /// Removes consecutive elements that map to the same key.
+    pub fn dedup_by_key<F, K>(&mut self, mut key: F)
+    where
+        F: FnMut(&mut A::Item) -> K,
+        K: PartialEq<K>,
+    {
+        self.dedup_by(|a, b| key(a) == key(b));
+    }
+
+    /// Resizes the `SmallVec` in-place so that `len` is equal to `new_len`.
+    ///
+    /// If `new_len` is greater than `len`, the `SmallVec` is extended by the difference, with each
+    /// additional slot filled with the result of calling the closure `f`. The return values from `f`
+    //// will end up in the `SmallVec` in the order they have been generated.
+    ///
+    /// If `new_len` is less than `len`, the `SmallVec` is simply truncated.
+    ///
+    /// This method uses a closure to create new values on every push. If you'd rather `Clone` a given
+    /// value, use `resize`. If you want to use the `Default` trait to generate values, you can pass
+    /// `Default::default()` as the second argument.
+    ///
+    /// Added for std::vec::Vec compatibility (added in Rust 1.33.0)
+    ///
+    /// ```
+    /// # use smallvec::{smallvec, SmallVec};
+    /// let mut vec : SmallVec<[_; 4]> = smallvec![1, 2, 3];
+    /// vec.resize_with(5, Default::default);
+    /// assert_eq!(&*vec, &[1, 2, 3, 0, 0]);
+    ///
+    /// let mut vec : SmallVec<[_; 4]> = smallvec![];
+    /// let mut p = 1;
+    /// vec.resize_with(4, || { p *= 2; p });
+    /// assert_eq!(&*vec, &[2, 4, 8, 16]);
+    /// ```
+    pub fn resize_with<F>(&mut self, new_len: usize, f: F)
+    where
+        F: FnMut() -> A::Item,
+    {
+        let old_len = self.len();
+        if old_len < new_len {
+            let mut f = f;
+            let additional = new_len - old_len;
+            self.reserve(additional);
+            for _ in 0..additional {
+                self.push(f());
+            }
+        } else if old_len > new_len {
+            self.truncate(new_len);
+        }
+    }
+
+    /// Creates a `SmallVec` directly from the raw components of another
+    /// `SmallVec`.
+    ///
+    /// # Safety
+    ///
+    /// This is highly unsafe, due to the number of invariants that aren't
+    /// checked:
+    ///
+    /// * `ptr` needs to have been previously allocated via `SmallVec` for its
+    ///   spilled storage (at least, it's highly likely to be incorrect if it
+    ///   wasn't).
+    /// * `ptr`'s `A::Item` type needs to be the same size and alignment that
+    ///   it was allocated with
+    /// * `length` needs to be less than or equal to `capacity`.
+    /// * `capacity` needs to be the capacity that the pointer was allocated
+    ///   with.
+    ///
+    /// Violating these may cause problems like corrupting the allocator's
+    /// internal data structures.
+    ///
+    /// Additionally, `capacity` must be greater than the amount of inline
+    /// storage `A` has; that is, the new `SmallVec` must need to spill over
+    /// into heap allocated storage. This condition is asserted against.
+    ///
+    /// The ownership of `ptr` is effectively transferred to the
+    /// `SmallVec` which may then deallocate, reallocate or change the
+    /// contents of memory pointed to by the pointer at will. Ensure
+    /// that nothing else uses the pointer after calling this
+    /// function.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate smallvec;
+    /// # use smallvec::SmallVec;
+    /// use std::mem;
+    /// use std::ptr;
+    ///
+    /// fn main() {
+    ///     let mut v: SmallVec<[_; 1]> = smallvec![1, 2, 3];
+    ///
+    ///     // Pull out the important parts of `v`.
+    ///     let p = v.as_mut_ptr();
+    ///     let len = v.len();
+    ///     let cap = v.capacity();
+    ///     let spilled = v.spilled();
+    ///
+    ///     unsafe {
+    ///         // Forget all about `v`. The heap allocation that stored the
+    ///         // three values won't be deallocated.
+    ///         mem::forget(v);
+    ///
+    ///         // Overwrite memory with [4, 5, 6].
+    ///         //
+    ///         // This is only safe if `spilled` is true! Otherwise, we are
+    ///         // writing into the old `SmallVec`'s inline storage on the
+    ///         // stack.
+    ///         assert!(spilled);
+    ///         for i in 0..len {
+    ///             ptr::write(p.add(i), 4 + i);
+    ///         }
+    ///
+    ///         // Put everything back together into a SmallVec with a different
+    ///         // amount of inline storage, but which is still less than `cap`.
+    ///         let rebuilt = SmallVec::<[_; 2]>::from_raw_parts(p, len, cap);
+    ///         assert_eq!(&*rebuilt, &[4, 5, 6]);
+    ///     }
+    /// }
+    #[inline]
+    pub unsafe fn from_raw_parts(ptr: *mut A::Item, length: usize, capacity: usize) -> SmallVec<A> {
+        assert!(capacity > Self::inline_capacity());
+        SmallVec {
+            capacity,
+            data: SmallVecData::from_heap(ptr, length),
+        }
+    }
+
+    /// Returns a raw pointer to the vector's buffer.
+    pub fn as_ptr(&self) -> *const A::Item {
+        // We shadow the slice method of the same name to avoid going through
+        // `deref`, which creates an intermediate reference that may place
+        // additional safety constraints on the contents of the slice.
+        self.triple().0
+    }
+
+    /// Returns a raw mutable pointer to the vector's buffer.
+    pub fn as_mut_ptr(&mut self) -> *mut A::Item {
+        // We shadow the slice method of the same name to avoid going through
+        // `deref_mut`, which creates an intermediate reference that may place
+        // additional safety constraints on the contents of the slice.
+        self.triple_mut().0
+    }
+}
+
+impl<A: Array> SmallVec<A>
+where
+    A::Item: Copy,
+{
+    /// Copy the elements from a slice into a new `SmallVec`.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `SmallVec::from(slice)`.
+    pub fn from_slice(slice: &[A::Item]) -> Self {
+        let len = slice.len();
+        if len <= Self::inline_capacity() {
+            SmallVec {
+                capacity: len,
+                data: SmallVecData::from_inline(unsafe {
+                    let mut data: MaybeUninit<A> = MaybeUninit::uninit();
+                    ptr::copy_nonoverlapping(
+                        slice.as_ptr(),
+                        data.as_mut_ptr() as *mut A::Item,
+                        len,
+                    );
+                    data
+                }),
+            }
+        } else {
+            let mut b = slice.to_vec();
+            let (ptr, cap) = (b.as_mut_ptr(), b.capacity());
+            mem::forget(b);
+            SmallVec {
+                capacity: cap,
+                data: SmallVecData::from_heap(ptr, len),
+            }
+        }
+    }
+
+    /// Copy elements from a slice into the vector at position `index`, shifting any following
+    /// elements toward the back.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `insert`.
+    pub fn insert_from_slice(&mut self, index: usize, slice: &[A::Item]) {
+        self.reserve(slice.len());
+
+        let len = self.len();
+        assert!(index <= len);
+
+        unsafe {
+            let slice_ptr = slice.as_ptr();
+            let ptr = self.as_mut_ptr().add(index);
+            ptr::copy(ptr, ptr.add(slice.len()), len - index);
+            ptr::copy_nonoverlapping(slice_ptr, ptr, slice.len());
+            self.set_len(len + slice.len());
+        }
+    }
+
+    /// Copy elements from a slice and append them to the vector.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `extend`.
+    #[inline]
+    pub fn extend_from_slice(&mut self, slice: &[A::Item]) {
+        let len = self.len();
+        self.insert_from_slice(len, slice);
+    }
+}
+
+impl<A: Array> SmallVec<A>
+where
+    A::Item: Clone,
+{
+    /// Resizes the vector so that its length is equal to `len`.
+    ///
+    /// If `len` is less than the current length, the vector simply truncated.
+    ///
+    /// If `len` is greater than the current length, `value` is appended to the
+    /// vector until its length equals `len`.
+    pub fn resize(&mut self, len: usize, value: A::Item) {
+        let old_len = self.len();
+
+        if len > old_len {
+            self.extend(repeat(value).take(len - old_len));
+        } else {
+            self.truncate(len);
+        }
+    }
+
+    /// Creates a `SmallVec` with `n` copies of `elem`.
+    /// ```
+    /// use smallvec::SmallVec;
+    ///
+    /// let v = SmallVec::<[char; 128]>::from_elem('d', 2);
+    /// assert_eq!(v, SmallVec::from_buf(['d', 'd']));
+    /// ```
+    pub fn from_elem(elem: A::Item, n: usize) -> Self {
+        if n > Self::inline_capacity() {
+            vec![elem; n].into()
+        } else {
+            let mut v = SmallVec::<A>::new();
+            unsafe {
+                let (ptr, len_ptr, _) = v.triple_mut();
+                let mut local_len = SetLenOnDrop::new(len_ptr);
+
+                for i in 0..n {
+                    ::core::ptr::write(ptr.add(i), elem.clone());
+                    local_len.increment_len(1);
+                }
+            }
+            v
+        }
+    }
+}
+
+impl<A: Array> ops::Deref for SmallVec<A> {
+    type Target = [A::Item];
+    #[inline]
+    fn deref(&self) -> &[A::Item] {
+        unsafe {
+            let (ptr, len, _) = self.triple();
+            slice::from_raw_parts(ptr, len)
+        }
+    }
+}
+
+impl<A: Array> ops::DerefMut for SmallVec<A> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut [A::Item] {
+        unsafe {
+            let (ptr, &mut len, _) = self.triple_mut();
+            slice::from_raw_parts_mut(ptr, len)
+        }
+    }
+}
+
+impl<A: Array> AsRef<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn as_ref(&self) -> &[A::Item] {
+        self
+    }
+}
+
+impl<A: Array> AsMut<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn as_mut(&mut self) -> &mut [A::Item] {
+        self
+    }
+}
+
+impl<A: Array> Borrow<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn borrow(&self) -> &[A::Item] {
+        self
+    }
+}
+
+impl<A: Array> BorrowMut<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn borrow_mut(&mut self) -> &mut [A::Item] {
+        self
+    }
+}
+
+#[cfg(feature = "write")]
+impl<A: Array<Item = u8>> io::Write for SmallVec<A> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.extend_from_slice(buf);
+        Ok(buf.len())
+    }
+
+    #[inline]
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        self.extend_from_slice(buf);
+        Ok(())
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<A: Array> Serialize for SmallVec<A>
+where
+    A::Item: Serialize,
+{
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut state = serializer.serialize_seq(Some(self.len()))?;
+        for item in self {
+            state.serialize_element(&item)?;
+        }
+        state.end()
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, A: Array> Deserialize<'de> for SmallVec<A>
+where
+    A::Item: Deserialize<'de>,
+{
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        deserializer.deserialize_seq(SmallVecVisitor {
+            phantom: PhantomData,
+        })
+    }
+}
+
+#[cfg(feature = "serde")]
+struct SmallVecVisitor<A> {
+    phantom: PhantomData<A>,
+}
+
+#[cfg(feature = "serde")]
+impl<'de, A: Array> Visitor<'de> for SmallVecVisitor<A>
+where
+    A::Item: Deserialize<'de>,
+{
+    type Value = SmallVec<A>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("a sequence")
+    }
+
+    fn visit_seq<B>(self, mut seq: B) -> Result<Self::Value, B::Error>
+    where
+        B: SeqAccess<'de>,
+    {
+        let len = seq.size_hint().unwrap_or(0);
+        let mut values = SmallVec::with_capacity(len);
+
+        while let Some(value) = seq.next_element()? {
+            values.push(value);
+        }
+
+        Ok(values)
+    }
+}
+
+#[cfg(feature = "specialization")]
+trait SpecFrom<A: Array, S> {
+    fn spec_from(slice: S) -> SmallVec<A>;
+}
+
+#[cfg(feature = "specialization")]
+mod specialization;
+
+#[cfg(feature = "specialization")]
+impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Copy,
+{
+    #[inline]
+    fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
+        SmallVec::from_slice(slice)
+    }
+}
+
+impl<'a, A: Array> From<&'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[cfg(not(feature = "specialization"))]
+    #[inline]
+    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
+        slice.iter().cloned().collect()
+    }
+
+    #[cfg(feature = "specialization")]
+    #[inline]
+    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
+        SmallVec::spec_from(slice)
+    }
+}
+
+impl<A: Array> From<Vec<A::Item>> for SmallVec<A> {
+    #[inline]
+    fn from(vec: Vec<A::Item>) -> SmallVec<A> {
+        SmallVec::from_vec(vec)
+    }
+}
+
+impl<A: Array> From<A> for SmallVec<A> {
+    #[inline]
+    fn from(array: A) -> SmallVec<A> {
+        SmallVec::from_buf(array)
+    }
+}
+
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::Index<I> for SmallVec<A> {
+    type Output = I::Output;
+
+    fn index(&self, index: I) -> &I::Output {
+        &(**self)[index]
+    }
+}
+
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::IndexMut<I> for SmallVec<A> {
+    fn index_mut(&mut self, index: I) -> &mut I::Output {
+        &mut (&mut **self)[index]
+    }
+}
+
+#[allow(deprecated)]
+impl<A: Array> ExtendFromSlice<A::Item> for SmallVec<A>
+where
+    A::Item: Copy,
+{
+    fn extend_from_slice(&mut self, other: &[A::Item]) {
+        SmallVec::extend_from_slice(self, other)
+    }
+}
+
+impl<A: Array> FromIterator<A::Item> for SmallVec<A> {
+    #[inline]
+    fn from_iter<I: IntoIterator<Item = A::Item>>(iterable: I) -> SmallVec<A> {
+        let mut v = SmallVec::new();
+        v.extend(iterable);
+        v
+    }
+}
+
+impl<A: Array> Extend<A::Item> for SmallVec<A> {
+    fn extend<I: IntoIterator<Item = A::Item>>(&mut self, iterable: I) {
+        let mut iter = iterable.into_iter();
+        let (lower_size_bound, _) = iter.size_hint();
+        self.reserve(lower_size_bound);
+
+        unsafe {
+            let (ptr, len_ptr, cap) = self.triple_mut();
+            let mut len = SetLenOnDrop::new(len_ptr);
+            while len.get() < cap {
+                if let Some(out) = iter.next() {
+                    ptr::write(ptr.add(len.get()), out);
+                    len.increment_len(1);
+                } else {
+                    return;
+                }
+            }
+        }
+
+        for elem in iter {
+            self.push(elem);
+        }
+    }
+}
+
+impl<A: Array> fmt::Debug for SmallVec<A>
+where
+    A::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_list().entries(self.iter()).finish()
+    }
+}
+
+impl<A: Array> Default for SmallVec<A> {
+    #[inline]
+    fn default() -> SmallVec<A> {
+        SmallVec::new()
+    }
+}
+
+#[cfg(feature = "may_dangle")]
+unsafe impl<#[may_dangle] A: Array> Drop for SmallVec<A> {
+    fn drop(&mut self) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                Vec::from_raw_parts(ptr, len, self.capacity);
+            } else {
+                ptr::drop_in_place(&mut self[..]);
+            }
+        }
+    }
+}
+
+#[cfg(not(feature = "may_dangle"))]
+impl<A: Array> Drop for SmallVec<A> {
+    fn drop(&mut self) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                Vec::from_raw_parts(ptr, len, self.capacity);
+            } else {
+                ptr::drop_in_place(&mut self[..]);
+            }
+        }
+    }
+}
+
+impl<A: Array> Clone for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[inline]
+    fn clone(&self) -> SmallVec<A> {
+        SmallVec::from(self.as_slice())
+    }
+}
+
+impl<A: Array, B: Array> PartialEq<SmallVec<B>> for SmallVec<A>
+where
+    A::Item: PartialEq<B::Item>,
+{
+    #[inline]
+    fn eq(&self, other: &SmallVec<B>) -> bool {
+        self[..] == other[..]
+    }
+}
+
+impl<A: Array> Eq for SmallVec<A> where A::Item: Eq {}
+
+impl<A: Array> PartialOrd for SmallVec<A>
+where
+    A::Item: PartialOrd,
+{
+    #[inline]
+    fn partial_cmp(&self, other: &SmallVec<A>) -> Option<cmp::Ordering> {
+        PartialOrd::partial_cmp(&**self, &**other)
+    }
+}
+
+impl<A: Array> Ord for SmallVec<A>
+where
+    A::Item: Ord,
+{
+    #[inline]
+    fn cmp(&self, other: &SmallVec<A>) -> cmp::Ordering {
+        Ord::cmp(&**self, &**other)
+    }
+}
+
+impl<A: Array> Hash for SmallVec<A>
+where
+    A::Item: Hash,
+{
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        (**self).hash(state)
+    }
+}
+
+unsafe impl<A: Array> Send for SmallVec<A> where A::Item: Send {}
+
+/// An iterator that consumes a `SmallVec` and yields its items by value.
+///
+/// Returned from [`SmallVec::into_iter`][1].
+///
+/// [1]: struct.SmallVec.html#method.into_iter
+pub struct IntoIter<A: Array> {
+    data: SmallVec<A>,
+    current: usize,
+    end: usize,
+}
+
+impl<A: Array> fmt::Debug for IntoIter<A>
+where
+    A::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("IntoIter").field(&self.as_slice()).finish()
+    }
+}
+
+impl<A: Array + Clone> Clone for IntoIter<A>
+where
+    A::Item: Clone,
+{
+    fn clone(&self) -> IntoIter<A> {
+        SmallVec::from(self.as_slice()).into_iter()
+    }
+}
+
+impl<A: Array> Drop for IntoIter<A> {
+    fn drop(&mut self) {
+        for _ in self {}
+    }
+}
+
+impl<A: Array> Iterator for IntoIter<A> {
+    type Item = A::Item;
+
+    #[inline]
+    fn next(&mut self) -> Option<A::Item> {
+        if self.current == self.end {
+            None
+        } else {
+            unsafe {
+                let current = self.current;
+                self.current += 1;
+                Some(ptr::read(self.data.as_ptr().add(current)))
+            }
+        }
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let size = self.end - self.current;
+        (size, Some(size))
+    }
+}
+
+impl<A: Array> DoubleEndedIterator for IntoIter<A> {
+    #[inline]
+    fn next_back(&mut self) -> Option<A::Item> {
+        if self.current == self.end {
+            None
+        } else {
+            unsafe {
+                self.end -= 1;
+                Some(ptr::read(self.data.as_ptr().add(self.end)))
+            }
+        }
+    }
+}
+
+impl<A: Array> ExactSizeIterator for IntoIter<A> {}
+impl<A: Array> FusedIterator for IntoIter<A> {}
+
+impl<A: Array> IntoIter<A> {
+    /// Returns the remaining items of this iterator as a slice.
+    pub fn as_slice(&self) -> &[A::Item] {
+        let len = self.end - self.current;
+        unsafe { core::slice::from_raw_parts(self.data.as_ptr().add(self.current), len) }
+    }
+
+    /// Returns the remaining items of this iterator as a mutable slice.
+    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        let len = self.end - self.current;
+        unsafe { core::slice::from_raw_parts_mut(self.data.as_mut_ptr().add(self.current), len) }
+    }
+}
+
+impl<A: Array> IntoIterator for SmallVec<A> {
+    type IntoIter = IntoIter<A>;
+    type Item = A::Item;
+    fn into_iter(mut self) -> Self::IntoIter {
+        unsafe {
+            // Set SmallVec len to zero as `IntoIter` drop handles dropping of the elements
+            let len = self.len();
+            self.set_len(0);
+            IntoIter {
+                data: self,
+                current: 0,
+                end: len,
+            }
+        }
+    }
+}
+
+impl<'a, A: Array> IntoIterator for &'a SmallVec<A> {
+    type IntoIter = slice::Iter<'a, A::Item>;
+    type Item = &'a A::Item;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a, A: Array> IntoIterator for &'a mut SmallVec<A> {
+    type IntoIter = slice::IterMut<'a, A::Item>;
+    type Item = &'a mut A::Item;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter_mut()
+    }
+}
+
+/// Types that can be used as the backing store for a SmallVec
+pub unsafe trait Array {
+    /// The type of the array's elements.
+    type Item;
+    /// Returns the number of items the array can hold.
+    fn size() -> usize;
+}
+
+/// Set the length of the vec when the `SetLenOnDrop` value goes out of scope.
+///
+/// Copied from https://github.com/rust-lang/rust/pull/36355
+struct SetLenOnDrop<'a> {
+    len: &'a mut usize,
+    local_len: usize,
+}
+
+impl<'a> SetLenOnDrop<'a> {
+    #[inline]
+    fn new(len: &'a mut usize) -> Self {
+        SetLenOnDrop {
+            local_len: *len,
+            len,
+        }
+    }
+
+    #[inline]
+    fn get(&self) -> usize {
+        self.local_len
+    }
+
+    #[inline]
+    fn increment_len(&mut self, increment: usize) {
+        self.local_len += increment;
+    }
+}
+
+impl<'a> Drop for SetLenOnDrop<'a> {
+    #[inline]
+    fn drop(&mut self) {
+        *self.len = self.local_len;
+    }
+}
+
+#[cfg(feature = "const_generics")]
+unsafe impl<T, const N: usize> Array for [T; N] {
+    type Item = T;
+    fn size() -> usize {
+        N
+    }
+}
+
+#[cfg(not(feature = "const_generics"))]
+macro_rules! impl_array(
+    ($($size:expr),+) => {
+        $(
+            unsafe impl<T> Array for [T; $size] {
+                type Item = T;
+                fn size() -> usize { $size }
+            }
+        )+
+    }
+);
+
+#[cfg(not(feature = "const_generics"))]
+impl_array!(
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 32, 36, 0x40, 0x60, 0x80,
+    0x100, 0x200, 0x400, 0x600, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x8000, 0x10000, 0x20000,
+    0x40000, 0x60000, 0x80000, 0x10_0000
+);
+
+/// Convenience trait for constructing a `SmallVec`
+pub trait ToSmallVec<A: Array> {
+    /// Construct a new `SmallVec` from a slice.
+    fn to_smallvec(&self) -> SmallVec<A>;
+}
+
+impl<A: Array> ToSmallVec<A> for [A::Item]
+where
+    A::Item: Copy,
+{
+    #[inline]
+    fn to_smallvec(&self) -> SmallVec<A> {
+        SmallVec::from_slice(self)
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/specialization.rs firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/specialization.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/specialization.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/specialization.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,19 @@
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementations that require `default fn`.
+
+use super::{Array, SmallVec, SpecFrom};
+
+impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[inline]
+    default fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
+        slice.into_iter().cloned().collect()
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/tests.rs firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/tests.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/src/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/src/tests.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,907 @@
+use crate::{smallvec, SmallVec};
+
+use std::iter::FromIterator;
+
+use alloc::borrow::ToOwned;
+use alloc::boxed::Box;
+use alloc::rc::Rc;
+use alloc::{vec, vec::Vec};
+
+#[test]
+pub fn test_zero() {
+    let mut v = SmallVec::<[_; 0]>::new();
+    assert!(!v.spilled());
+    v.push(0usize);
+    assert!(v.spilled());
+    assert_eq!(&*v, &[0]);
+}
+
+// We heap allocate all these strings so that double frees will show up under valgrind.
+
+#[test]
+pub fn test_inline() {
+    let mut v = SmallVec::<[_; 16]>::new();
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    assert_eq!(&*v, &["hello".to_owned(), "there".to_owned(),][..]);
+}
+
+#[test]
+pub fn test_spill() {
+    let mut v = SmallVec::<[_; 2]>::new();
+    v.push("hello".to_owned());
+    assert_eq!(v[0], "hello");
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    assert_eq!(v[0], "hello");
+    v.push("shave".to_owned());
+    assert_eq!(
+        &*v,
+        &[
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+        ][..]
+    );
+}
+
+#[test]
+pub fn test_double_spill() {
+    let mut v = SmallVec::<[_; 2]>::new();
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    v.push("shave".to_owned());
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    v.push("shave".to_owned());
+    assert_eq!(
+        &*v,
+        &[
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+        ][..]
+    );
+}
+
+/// https://github.com/servo/rust-smallvec/issues/4
+#[test]
+fn issue_4() {
+    SmallVec::<[Box<u32>; 2]>::new();
+}
+
+/// https://github.com/servo/rust-smallvec/issues/5
+#[test]
+fn issue_5() {
+    assert!(Some(SmallVec::<[&u32; 2]>::new()).is_some());
+}
+
+#[test]
+fn test_with_capacity() {
+    let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(1);
+    assert!(v.is_empty());
+    assert!(!v.spilled());
+    assert_eq!(v.capacity(), 3);
+
+    let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(10);
+    assert!(v.is_empty());
+    assert!(v.spilled());
+    assert_eq!(v.capacity(), 10);
+}
+
+#[test]
+fn drain() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.drain(..).collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    let old_capacity = v.capacity();
+    assert_eq!(v.drain(1..).collect::<Vec<_>>(), &[4, 5]);
+    // drain should not change the capacity
+    assert_eq!(v.capacity(), old_capacity);
+}
+
+#[test]
+fn drain_rev() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[5, 4, 3]);
+}
+
+#[test]
+fn drain_forget() {
+    let mut v: SmallVec<[u8; 1]> = smallvec![0, 1, 2, 3, 4, 5, 6, 7];
+    std::mem::forget(v.drain(2..5));
+    assert_eq!(v.len(), 2);
+}
+
+#[test]
+fn into_iter() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3, 4, 5]);
+}
+
+#[test]
+fn into_iter_rev() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[5, 4, 3]);
+}
+
+#[test]
+fn into_iter_drop() {
+    use std::cell::Cell;
+
+    struct DropCounter<'a>(&'a Cell<i32>);
+
+    impl<'a> Drop for DropCounter<'a> {
+        fn drop(&mut self) {
+            self.0.set(self.0.get() + 1);
+        }
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.into_iter();
+        assert_eq!(cell.get(), 1);
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        assert!(v.into_iter().next().is_some());
+        assert_eq!(cell.get(), 2);
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        assert!(v.into_iter().next().is_some());
+        assert_eq!(cell.get(), 3);
+    }
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        {
+            let mut it = v.into_iter();
+            assert!(it.next().is_some());
+            assert!(it.next_back().is_some());
+        }
+        assert_eq!(cell.get(), 3);
+    }
+}
+
+#[test]
+fn test_capacity() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.reserve(1);
+    assert_eq!(v.capacity(), 2);
+    assert!(!v.spilled());
+
+    v.reserve_exact(0x100);
+    assert!(v.capacity() >= 0x100);
+
+    v.push(0);
+    v.push(1);
+    v.push(2);
+    v.push(3);
+
+    v.shrink_to_fit();
+    assert!(v.capacity() < 0x100);
+}
+
+#[test]
+fn test_truncate() {
+    let mut v: SmallVec<[Box<u8>; 8]> = SmallVec::new();
+
+    for x in 0..8 {
+        v.push(Box::new(x));
+    }
+    v.truncate(4);
+
+    assert_eq!(v.len(), 4);
+    assert!(!v.spilled());
+
+    assert_eq!(*v.swap_remove(1), 1);
+    assert_eq!(*v.remove(1), 3);
+    v.insert(1, Box::new(3));
+
+    assert_eq!(&v.iter().map(|v| **v).collect::<Vec<_>>(), &[0, 3, 2]);
+}
+
+#[test]
+fn test_insert_many() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(1, [5, 6].iter().cloned());
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+struct MockHintIter<T: Iterator> {
+    x: T,
+    hint: usize,
+}
+impl<T: Iterator> Iterator for MockHintIter<T> {
+    type Item = T::Item;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.x.next()
+    }
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.hint, None)
+    }
+}
+
+#[test]
+fn test_insert_many_short_hint() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(
+        1,
+        MockHintIter {
+            x: [5, 6].iter().cloned(),
+            hint: 5,
+        },
+    );
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+#[test]
+fn test_insert_many_long_hint() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(
+        1,
+        MockHintIter {
+            x: [5, 6].iter().cloned(),
+            hint: 1,
+        },
+    );
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+// https://github.com/servo/rust-smallvec/issues/96
+mod insert_many_panic {
+    use crate::{smallvec, SmallVec};
+    use alloc::boxed::Box;
+
+    struct PanicOnDoubleDrop {
+        dropped: Box<bool>,
+    }
+
+    impl PanicOnDoubleDrop {
+        fn new() -> Self {
+            Self {
+                dropped: Box::new(false),
+            }
+        }
+    }
+
+    impl Drop for PanicOnDoubleDrop {
+        fn drop(&mut self) {
+            assert!(!*self.dropped, "already dropped");
+            *self.dropped = true;
+        }
+    }
+
+    /// Claims to yield `hint` items, but actually yields `count`, then panics.
+    struct BadIter {
+        hint: usize,
+        count: usize,
+    }
+
+    impl Iterator for BadIter {
+        type Item = PanicOnDoubleDrop;
+        fn size_hint(&self) -> (usize, Option<usize>) {
+            (self.hint, None)
+        }
+        fn next(&mut self) -> Option<Self::Item> {
+            if self.count == 0 {
+                panic!()
+            }
+            self.count -= 1;
+            Some(PanicOnDoubleDrop::new())
+        }
+    }
+
+    #[test]
+    fn panic_early_at_start() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(0, BadIter { hint: 1, count: 0 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_early_in_middle() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(1, BadIter { hint: 4, count: 2 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_early_at_end() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(2, BadIter { hint: 3, count: 1 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_late_at_start() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(0, BadIter { hint: 3, count: 5 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_late_at_end() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(2, BadIter { hint: 3, count: 5 });
+        });
+        assert!(result.is_err());
+    }
+}
+
+#[test]
+#[should_panic]
+fn test_invalid_grow() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    v.extend(0..8);
+    v.grow(5);
+}
+
+#[test]
+fn test_insert_from_slice() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_from_slice(1, &[5, 6]);
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+#[test]
+fn test_extend_from_slice() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.extend_from_slice(&[5, 6]);
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 1, 2, 3, 5, 6]
+    );
+}
+
+#[test]
+#[should_panic]
+fn test_drop_panic_smallvec() {
+    // This test should only panic once, and not double panic,
+    // which would mean a double drop
+    struct DropPanic;
+
+    impl Drop for DropPanic {
+        fn drop(&mut self) {
+            panic!("drop");
+        }
+    }
+
+    let mut v = SmallVec::<[_; 1]>::new();
+    v.push(DropPanic);
+}
+
+#[test]
+fn test_eq() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut b: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut c: SmallVec<[u32; 2]> = SmallVec::new();
+    // a = [1, 2]
+    a.push(1);
+    a.push(2);
+    // b = [1, 2]
+    b.push(1);
+    b.push(2);
+    // c = [3, 4]
+    c.push(3);
+    c.push(4);
+
+    assert!(a == b);
+    assert!(a != c);
+}
+
+#[test]
+fn test_ord() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut b: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut c: SmallVec<[u32; 2]> = SmallVec::new();
+    // a = [1]
+    a.push(1);
+    // b = [1, 1]
+    b.push(1);
+    b.push(1);
+    // c = [1, 2]
+    c.push(1);
+    c.push(2);
+
+    assert!(a < b);
+    assert!(b > a);
+    assert!(b < c);
+    assert!(c > b);
+}
+
+#[test]
+fn test_hash() {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::Hash;
+
+    {
+        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+        let b = [1, 2];
+        a.extend(b.iter().cloned());
+        let mut hasher = DefaultHasher::new();
+        assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
+    }
+    {
+        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+        let b = [1, 2, 11, 12];
+        a.extend(b.iter().cloned());
+        let mut hasher = DefaultHasher::new();
+        assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
+    }
+}
+
+#[test]
+fn test_as_ref() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.as_ref(), [1]);
+    a.push(2);
+    assert_eq!(a.as_ref(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.as_ref(), [1, 2, 3]);
+}
+
+#[test]
+fn test_as_mut() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.as_mut(), [1]);
+    a.push(2);
+    assert_eq!(a.as_mut(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.as_mut(), [1, 2, 3]);
+    a.as_mut()[1] = 4;
+    assert_eq!(a.as_mut(), [1, 4, 3]);
+}
+
+#[test]
+fn test_borrow() {
+    use std::borrow::Borrow;
+
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.borrow(), [1]);
+    a.push(2);
+    assert_eq!(a.borrow(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.borrow(), [1, 2, 3]);
+}
+
+#[test]
+fn test_borrow_mut() {
+    use std::borrow::BorrowMut;
+
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.borrow_mut(), [1]);
+    a.push(2);
+    assert_eq!(a.borrow_mut(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.borrow_mut(), [1, 2, 3]);
+    BorrowMut::<[u32]>::borrow_mut(&mut a)[1] = 4;
+    assert_eq!(a.borrow_mut(), [1, 4, 3]);
+}
+
+#[test]
+fn test_from() {
+    assert_eq!(&SmallVec::<[u32; 2]>::from(&[1][..])[..], [1]);
+    assert_eq!(&SmallVec::<[u32; 2]>::from(&[1, 2, 3][..])[..], [1, 2, 3]);
+
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let array = [1];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from(array);
+    assert_eq!(&*small_vec, &[1]);
+    drop(small_vec);
+
+    let array = [99; 128];
+    let small_vec: SmallVec<[u8; 128]> = SmallVec::from(array);
+    assert_eq!(&*small_vec, vec![99u8; 128].as_slice());
+    drop(small_vec);
+}
+
+#[test]
+fn test_from_slice() {
+    assert_eq!(&SmallVec::<[u32; 2]>::from_slice(&[1][..])[..], [1]);
+    assert_eq!(
+        &SmallVec::<[u32; 2]>::from_slice(&[1, 2, 3][..])[..],
+        [1, 2, 3]
+    );
+}
+
+#[test]
+fn test_exact_size_iterator() {
+    let mut vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
+    assert_eq!(vec.clone().into_iter().len(), 3);
+    assert_eq!(vec.drain(..2).len(), 2);
+    assert_eq!(vec.into_iter().len(), 1);
+}
+
+#[test]
+fn test_into_iter_as_slice() {
+    let vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
+    let mut iter = vec.clone().into_iter();
+    assert_eq!(iter.as_slice(), &[1, 2, 3]);
+    assert_eq!(iter.as_mut_slice(), &[1, 2, 3]);
+    iter.next();
+    assert_eq!(iter.as_slice(), &[2, 3]);
+    assert_eq!(iter.as_mut_slice(), &[2, 3]);
+    iter.next_back();
+    assert_eq!(iter.as_slice(), &[2]);
+    assert_eq!(iter.as_mut_slice(), &[2]);
+}
+
+#[test]
+fn test_into_iter_clone() {
+    // Test that the cloned iterator yields identical elements and that it owns its own copy
+    // (i.e. no use after move errors).
+    let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter();
+    let mut clone_iter = iter.clone();
+    while let Some(x) = iter.next() {
+        assert_eq!(x, clone_iter.next().unwrap());
+    }
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn test_into_iter_clone_partially_consumed_iterator() {
+    // Test that the cloned iterator only contains the remaining elements of the original iterator.
+    let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter().skip(1);
+    let mut clone_iter = iter.clone();
+    while let Some(x) = iter.next() {
+        assert_eq!(x, clone_iter.next().unwrap());
+    }
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn test_into_iter_clone_empty_smallvec() {
+    let mut iter = SmallVec::<[u8; 2]>::new().into_iter();
+    let mut clone_iter = iter.clone();
+    assert_eq!(iter.next(), None);
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn shrink_to_fit_unspill() {
+    let mut vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    vec.pop();
+    assert!(vec.spilled());
+    vec.shrink_to_fit();
+    assert!(!vec.spilled(), "shrink_to_fit will un-spill if possible");
+}
+
+#[test]
+fn test_into_vec() {
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
+    assert_eq!(vec.into_vec(), vec![0, 1]);
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    assert_eq!(vec.into_vec(), vec![0, 1, 2]);
+}
+
+#[test]
+fn test_into_inner() {
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
+    assert_eq!(vec.into_inner(), Ok([0, 1]));
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..1);
+    assert_eq!(vec.clone().into_inner(), Err(vec));
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    assert_eq!(vec.clone().into_inner(), Err(vec));
+}
+
+#[test]
+fn test_from_vec() {
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![1];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+}
+
+#[test]
+fn test_retain() {
+    // Test inline data storate
+    let mut sv: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
+    sv.retain(|&mut i| i != 3);
+    assert_eq!(sv.pop(), Some(4));
+    assert_eq!(sv.pop(), Some(2));
+    assert_eq!(sv.pop(), Some(1));
+    assert_eq!(sv.pop(), None);
+
+    // Test spilled data storage
+    let mut sv: SmallVec<[i32; 3]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
+    sv.retain(|&mut i| i != 3);
+    assert_eq!(sv.pop(), Some(4));
+    assert_eq!(sv.pop(), Some(2));
+    assert_eq!(sv.pop(), Some(1));
+    assert_eq!(sv.pop(), None);
+
+    // Test that drop implementations are called for inline.
+    let one = Rc::new(1);
+    let mut sv: SmallVec<[Rc<i32>; 3]> = SmallVec::new();
+    sv.push(Rc::clone(&one));
+    assert_eq!(Rc::strong_count(&one), 2);
+    sv.retain(|_| false);
+    assert_eq!(Rc::strong_count(&one), 1);
+
+    // Test that drop implementations are called for spilled data.
+    let mut sv: SmallVec<[Rc<i32>; 1]> = SmallVec::new();
+    sv.push(Rc::clone(&one));
+    sv.push(Rc::new(2));
+    assert_eq!(Rc::strong_count(&one), 2);
+    sv.retain(|_| false);
+    assert_eq!(Rc::strong_count(&one), 1);
+}
+
+#[test]
+fn test_dedup() {
+    let mut dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 2, 3, 3]);
+    dupes.dedup();
+    assert_eq!(&*dupes, &[1, 2, 3]);
+
+    let mut empty: SmallVec<[i32; 5]> = SmallVec::new();
+    empty.dedup();
+    assert!(empty.is_empty());
+
+    let mut all_ones: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 1, 1, 1]);
+    all_ones.dedup();
+    assert_eq!(all_ones.len(), 1);
+
+    let mut no_dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 4, 5]);
+    no_dupes.dedup();
+    assert_eq!(no_dupes.len(), 5);
+}
+
+#[test]
+fn test_resize() {
+    let mut v: SmallVec<[i32; 8]> = SmallVec::new();
+    v.push(1);
+    v.resize(5, 0);
+    assert_eq!(v[..], [1, 0, 0, 0, 0][..]);
+
+    v.resize(2, -1);
+    assert_eq!(v[..], [1, 0][..]);
+}
+
+#[cfg(feature = "write")]
+#[test]
+fn test_write() {
+    use std::io::Write;
+
+    let data = [1, 2, 3, 4, 5];
+
+    let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
+    let len = small_vec.write(&data[..]).unwrap();
+    assert_eq!(len, 5);
+    assert_eq!(small_vec.as_ref(), data.as_ref());
+
+    let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
+    small_vec.write_all(&data[..]).unwrap();
+    assert_eq!(small_vec.as_ref(), data.as_ref());
+}
+
+#[cfg(feature = "serde")]
+extern crate bincode;
+
+#[cfg(feature = "serde")]
+#[test]
+fn test_serde() {
+    use self::bincode::{config, deserialize};
+    let mut small_vec: SmallVec<[i32; 2]> = SmallVec::new();
+    small_vec.push(1);
+    let encoded = config().limit(100).serialize(&small_vec).unwrap();
+    let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
+    assert_eq!(small_vec, decoded);
+    small_vec.push(2);
+    // Spill the vec
+    small_vec.push(3);
+    small_vec.push(4);
+    // Check again after spilling.
+    let encoded = config().limit(100).serialize(&small_vec).unwrap();
+    let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
+    assert_eq!(small_vec, decoded);
+}
+
+#[test]
+fn grow_to_shrink() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(1);
+    v.push(2);
+    v.push(3);
+    assert!(v.spilled());
+    v.clear();
+    // Shrink to inline.
+    v.grow(2);
+    assert!(!v.spilled());
+    assert_eq!(v.capacity(), 2);
+    assert_eq!(v.len(), 0);
+    v.push(4);
+    assert_eq!(v[..], [4]);
+}
+
+#[test]
+fn resumable_extend() {
+    let s = "a b c";
+    // This iterator yields: (Some('a'), None, Some('b'), None, Some('c')), None
+    let it = s
+        .chars()
+        .scan(0, |_, ch| if ch.is_whitespace() { None } else { Some(ch) });
+    let mut v: SmallVec<[char; 4]> = SmallVec::new();
+    v.extend(it);
+    assert_eq!(v[..], ['a']);
+}
+
+// #139
+#[test]
+fn uninhabited() {
+    enum Void {}
+    let _sv = SmallVec::<[Void; 8]>::new();
+}
+
+#[test]
+fn grow_spilled_same_size() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(0);
+    v.push(1);
+    v.push(2);
+    assert!(v.spilled());
+    assert_eq!(v.capacity(), 4);
+    // grow with the same capacity
+    v.grow(4);
+    assert_eq!(v.capacity(), 4);
+    assert_eq!(v[..], [0, 1, 2]);
+}
+
+#[cfg(feature = "const_generics")]
+#[test]
+fn const_generics() {
+    let _v = SmallVec::<[i32; 987]>::default();
+}
+
+#[test]
+fn empty_macro() {
+    let _v: SmallVec<[u8; 1]> = smallvec![];
+}
+
+#[test]
+fn zero_size_items() {
+    SmallVec::<[(); 0]>::new().push(());
+}
diff -Nru firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/tests/macro.rs firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/tests/macro.rs
--- firefox-84.0.2+build1/third_party/cbindgen/vendor/smallvec/tests/macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/cbindgen/vendor/smallvec/tests/macro.rs	2021-01-18 19:59:06.000000000 +0000
@@ -0,0 +1,24 @@
+/// This file tests `smallvec!` without actually having the macro in scope.
+/// This forces any recursion to use a `$crate` prefix to reliably find itself.
+
+#[test]
+fn smallvec() {
+    let mut vec: smallvec::SmallVec<[i32; 2]>;
+
+    macro_rules! check {
+        ($init:tt) => {
+            vec = smallvec::smallvec! $init;
+            assert_eq!(*vec, *vec! $init);
+        }
+    }
+
+    check!([0; 0]);
+    check!([1; 1]);
+    check!([2; 2]);
+    check!([3; 3]);
+
+    check!([]);
+    check!([1]);
+    check!([1, 2]);
+    check!([1, 2, 3]);
+}
diff -Nru firefox-84.0.2+build1/third_party/dav1d/include/common/mem.h firefox-85.0+build1/third_party/dav1d/include/common/mem.h
--- firefox-84.0.2+build1/third_party/dav1d/include/common/mem.h	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/include/common/mem.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright © 2018, VideoLAN and dav1d authors
- * Copyright © 2018, Two Orioles, LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. 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 OWNER 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 DAV1D_COMMON_MEM_H
-#define DAV1D_COMMON_MEM_H
-
-#include <stdlib.h>
-
-#if defined(HAVE_ALIGNED_MALLOC) || defined(HAVE_MEMALIGN)
-#include <malloc.h>
-#endif
-
-#include "common/attributes.h"
-
-/*
- * Allocate align-byte aligned memory. The return value can be released
- * by calling the dav1d_free_aligned() function.
- */
-static inline void *dav1d_alloc_aligned(size_t sz, size_t align) {
-    assert(!(align & (align - 1)));
-#ifdef HAVE_POSIX_MEMALIGN
-    void *ptr;
-    if (posix_memalign(&ptr, align, sz)) return NULL;
-    return ptr;
-#elif defined(HAVE_ALIGNED_MALLOC)
-    return _aligned_malloc(sz, align);
-#elif defined(HAVE_MEMALIGN)
-    return memalign(align, sz);
-#else
-#error Missing aligned alloc implementation
-#endif
-}
-
-static inline void dav1d_free_aligned(void* ptr) {
-#ifdef HAVE_POSIX_MEMALIGN
-    free(ptr);
-#elif defined(HAVE_ALIGNED_MALLOC)
-    _aligned_free(ptr);
-#elif defined(HAVE_MEMALIGN)
-    free(ptr);
-#endif
-}
-
-static inline void dav1d_freep_aligned(void* ptr) {
-    void **mem = (void **) ptr;
-    if (*mem) {
-        dav1d_free_aligned(*mem);
-        *mem = NULL;
-    }
-}
-
-static inline void freep(void *ptr) {
-    void **mem = (void **) ptr;
-    if (*mem) {
-        free(*mem);
-        *mem = NULL;
-    }
-}
-
-#endif /* DAV1D_COMMON_MEM_H */
diff -Nru firefox-84.0.2+build1/third_party/dav1d/meson.build firefox-85.0+build1/third_party/dav1d/meson.build
--- firefox-84.0.2+build1/third_party/dav1d/meson.build	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/meson.build	2021-01-18 19:58:25.000000000 +0000
@@ -23,7 +23,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 project('dav1d', ['c'],
-    version: '0.7.1',
+    version: '0.8.0',
     default_options: ['c_std=c99',
                       'warning_level=2',
                       'buildtype=release',
diff -Nru firefox-84.0.2+build1/third_party/dav1d/NEWS firefox-85.0+build1/third_party/dav1d/NEWS
--- firefox-84.0.2+build1/third_party/dav1d/NEWS	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/NEWS	2021-01-18 19:58:24.000000000 +0000
@@ -1,3 +1,18 @@
+Changes for 0.8.0 'Eurasian hobby":
+-----------------------------------
+
+0.8.0 is a major update for dav1d:
+ - Improve the performance by using a picture buffer pool;
+   The improvements can reach 10% on some cases on Windows.
+ - Support for Apple ARM Silicon
+ - ARM32 optimizations for 8bit bitdepth for ipred paeth, smooth, cfl
+ - ARM32 optimizations for 10/12/16bit bitdepth for mc_avg/mask/w_avg,
+   put/prep 8tap/bilin, wiener and CDEF filters
+ - ARM64 optimizations for cfl_ac 444 for all bitdepths
+ - x86 optimizations for MC 8-tap, mc_scaled in AVX2
+ - x86 optimizations for CDEF in SSE and {put/prep}_{8tap/bilin} in SSSE3
+
+
 Changes for 0.7.1 'Frigatebird':
 ------------------------------
 
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef16.S firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef16.S
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef16.S	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef16.S	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,232 @@
+/*
+ * Copyright © 2018, VideoLAN and dav1d authors
+ * Copyright © 2020, Martin Storsjo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. 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 OWNER 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 "src/arm/asm.S"
+#include "util.S"
+#include "cdef_tmpl.S"
+
+// r1 = d0/q0
+// r2 = d2/q1
+.macro pad_top_bot_16 s1, s2, w, stride, r1, r2, align, ret
+        tst             r6,  #1 // CDEF_HAVE_LEFT
+        beq             2f
+        // CDEF_HAVE_LEFT
+        tst             r6,  #2 // CDEF_HAVE_RIGHT
+        beq             1f
+        // CDEF_HAVE_LEFT+CDEF_HAVE_RIGHT
+        vldr            s8,  [\s1, #-4]
+        vld1.16         {\r1}, [\s1, :\align]
+        vldr            s9,  [\s1, #2*\w]
+        vldr            s10, [\s2, #-4]
+        vld1.16         {\r2}, [\s2, :\align]
+        vldr            s11, [\s2, #2*\w]
+        vstr            s8,  [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s9,  [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        vstr            s10, [r0, #-4]
+        vst1.16         {\r2}, [r0, :\align]
+        vstr            s11, [r0, #2*\w]
+.if \ret
+        pop             {r4-r7,pc}
+.else
+        add             r0,  r0,  #2*\stride
+        b               3f
+.endif
+
+1:
+        // CDEF_HAVE_LEFT+!CDEF_HAVE_RIGHT
+        vldr            s8,  [\s1, #-4]
+        vld1.16         {\r1}, [\s1, :\align]
+        vldr            s9,  [\s2, #-4]
+        vld1.16         {\r2}, [\s2, :\align]
+        vstr            s8,  [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        vstr            s9,  [r0, #-4]
+        vst1.16         {\r2}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+.if \ret
+        pop             {r4-r7,pc}
+.else
+        add             r0,  r0,  #2*\stride
+        b               3f
+.endif
+
+2:
+        // !CDEF_HAVE_LEFT
+        tst             r6,  #2 // CDEF_HAVE_RIGHT
+        beq             1f
+        // !CDEF_HAVE_LEFT+CDEF_HAVE_RIGHT
+        vld1.16         {\r1}, [\s1, :\align]
+        vldr            s8,  [\s1, #2*\w]
+        vld1.16         {\r2}, [\s2, :\align]
+        vldr            s9,  [\s2, #2*\w]
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s8,  [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r2}, [r0, :\align]
+        vstr            s9,  [r0, #2*\w]
+.if \ret
+        pop             {r4-r7,pc}
+.else
+        add             r0,  r0,  #2*\stride
+        b               3f
+.endif
+
+1:
+        // !CDEF_HAVE_LEFT+!CDEF_HAVE_RIGHT
+        vld1.16         {\r1}, [\s1, :\align]
+        vld1.16         {\r2}, [\s2, :\align]
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r2}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+.if \ret
+        pop             {r4-r7,pc}
+.else
+        add             r0,  r0,  #2*\stride
+.endif
+3:
+.endm
+
+// void dav1d_cdef_paddingX_16bpc_neon(uint16_t *tmp, const pixel *src,
+//                                     ptrdiff_t src_stride, const pixel (*left)[2],
+//                                     const pixel *const top, int h,
+//                                     enum CdefEdgeFlags edges);
+
+// r1 = d0/q0
+// r2 = d2/q1
+.macro padding_func_16 w, stride, r1, r2, align
+function cdef_padding\w\()_16bpc_neon, export=1
+        push            {r4-r7,lr}
+        ldrd            r4,  r5,  [sp, #20]
+        ldr             r6,  [sp, #28]
+        vmov.i16        q3,  #0x8000
+        tst             r6,  #4 // CDEF_HAVE_TOP
+        bne             1f
+        // !CDEF_HAVE_TOP
+        sub             r12, r0,  #2*(2*\stride+2)
+        vmov.i16        q2,  #0x8000
+        vst1.16         {q2,q3}, [r12]!
+.if \w == 8
+        vst1.16         {q2,q3}, [r12]!
+.endif
+        b               3f
+1:
+        // CDEF_HAVE_TOP
+        add             r7,  r4,  r2
+        sub             r0,  r0,  #2*(2*\stride)
+        pad_top_bot_16  r4,  r7,  \w, \stride, \r1, \r2, \align, 0
+
+        // Middle section
+3:
+        tst             r6,  #1 // CDEF_HAVE_LEFT
+        beq             2f
+        // CDEF_HAVE_LEFT
+        tst             r6,  #2 // CDEF_HAVE_RIGHT
+        beq             1f
+        // CDEF_HAVE_LEFT+CDEF_HAVE_RIGHT
+0:
+        vld1.32         {d2[]}, [r3, :32]!
+        vldr            s5,  [r1, #2*\w]
+        vld1.16         {\r1}, [r1, :\align], r2
+        subs            r5,  r5,  #1
+        vstr            s4,  [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s5,  [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        bgt             0b
+        b               3f
+1:
+        // CDEF_HAVE_LEFT+!CDEF_HAVE_RIGHT
+        vld1.32         {d2[]}, [r3, :32]!
+        vld1.16         {\r1}, [r1, :\align], r2
+        subs            r5,  r5,  #1
+        vstr            s4,  [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        bgt             1b
+        b               3f
+2:
+        tst             r6,  #2 // CDEF_HAVE_RIGHT
+        beq             1f
+        // !CDEF_HAVE_LEFT+CDEF_HAVE_RIGHT
+0:
+        vldr            s4,  [r1, #2*\w]
+        vld1.16         {\r1}, [r1, :\align], r2
+        subs            r5,  r5,  #1
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s4,  [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        bgt             0b
+        b               3f
+1:
+        // !CDEF_HAVE_LEFT+!CDEF_HAVE_RIGHT
+        vld1.16         {\r1}, [r1, :\align], r2
+        subs            r5,  r5,  #1
+        vstr            s12, [r0, #-4]
+        vst1.16         {\r1}, [r0, :\align]
+        vstr            s12, [r0, #2*\w]
+        add             r0,  r0,  #2*\stride
+        bgt             1b
+
+3:
+        tst             r6,  #8 // CDEF_HAVE_BOTTOM
+        bne             1f
+        // !CDEF_HAVE_BOTTOM
+        sub             r12, r0,  #4
+        vmov.i16        q2,  #0x8000
+        vst1.16         {q2,q3}, [r12]!
+.if \w == 8
+        vst1.16         {q2,q3}, [r12]!
+.endif
+        pop             {r4-r7,pc}
+1:
+        // CDEF_HAVE_BOTTOM
+        add             r7,  r1,  r2
+        pad_top_bot_16  r1,  r7,  \w, \stride, \r1, \r2, \align, 1
+endfunc
+.endm
+
+padding_func_16 8, 16, q0, q1, 128
+padding_func_16 4, 8,  d0, d2, 64
+
+tables
+
+filter 8, 16
+filter 4, 16
+
+find_dir 16
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef.S firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef.S
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef.S	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef.S	2021-01-18 19:58:24.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include "src/arm/asm.S"
 #include "util.S"
+#include "cdef_tmpl.S"
 
 // n1 = s0/d0
 // w1 = d0/q0
@@ -190,11 +191,9 @@
         beq             1f
         // CDEF_HAVE_LEFT+CDEF_HAVE_RIGHT
 0:
-        ldrh            r12, [r3], #2
-        vldr            \n1, [r1]
-        vdup.16         d2,  r12
+        vld1.16         {d2[]}, [r3, :16]!
         ldrh            r12, [r1, #\w]
-        add             r1,  r1,  r2
+        load_n_incr     d0,  r1,  r2,  \w
         subs            r5,  r5,  #1
         vmov.16         d2[1], r12
         vmovl.u8        q0,  d0
@@ -207,9 +206,8 @@
         b               3f
 1:
         // CDEF_HAVE_LEFT+!CDEF_HAVE_RIGHT
-        ldrh            r12, [r3], #2
+        vld1.16         {d2[]}, [r3, :16]!
         load_n_incr     d0,  r1,  r2,  \w
-        vdup.16         d2,  r12
         subs            r5,  r5,  #1
         vmovl.u8        q0,  d0
         vmovl.u8        q1,  d2
@@ -327,230 +325,12 @@
 padding_func_edged 8, 16, d0, 64
 padding_func_edged 4, 8,  s0, 32
 
-.macro dir_table w, stride
-const directions\w
-        .byte           -1 * \stride + 1, -2 * \stride + 2
-        .byte            0 * \stride + 1, -1 * \stride + 2
-        .byte            0 * \stride + 1,  0 * \stride + 2
-        .byte            0 * \stride + 1,  1 * \stride + 2
-        .byte            1 * \stride + 1,  2 * \stride + 2
-        .byte            1 * \stride + 0,  2 * \stride + 1
-        .byte            1 * \stride + 0,  2 * \stride + 0
-        .byte            1 * \stride + 0,  2 * \stride - 1
-// Repeated, to avoid & 7
-        .byte           -1 * \stride + 1, -2 * \stride + 2
-        .byte            0 * \stride + 1, -1 * \stride + 2
-        .byte            0 * \stride + 1,  0 * \stride + 2
-        .byte            0 * \stride + 1,  1 * \stride + 2
-        .byte            1 * \stride + 1,  2 * \stride + 2
-        .byte            1 * \stride + 0,  2 * \stride + 1
-endconst
-.endm
-
-dir_table 8, 16
-dir_table 4, 8
-
-const pri_taps
-        .byte           4, 2, 3, 3
-endconst
-
-.macro load_px d11, d12, d21, d22, w
-.if \w == 8
-        add             r6,  r2,  r9, lsl #1 // x + off
-        sub             r9,  r2,  r9, lsl #1 // x - off
-        vld1.16         {\d11,\d12}, [r6]    // p0
-        vld1.16         {\d21,\d22}, [r9]    // p1
-.else
-        add             r6,  r2,  r9, lsl #1 // x + off
-        sub             r9,  r2,  r9, lsl #1 // x - off
-        vld1.16         {\d11}, [r6]         // p0
-        add             r6,  r6,  #2*8       // += stride
-        vld1.16         {\d21}, [r9]         // p1
-        add             r9,  r9,  #2*8       // += stride
-        vld1.16         {\d12}, [r6]         // p0
-        vld1.16         {\d22}, [r9]         // p1
-.endif
-.endm
-.macro handle_pixel s1, s2, thresh_vec, shift, tap, min
-.if \min
-        vmin.u16        q2,  q2,  \s1
-        vmax.s16        q3,  q3,  \s1
-        vmin.u16        q2,  q2,  \s2
-        vmax.s16        q3,  q3,  \s2
-.endif
-        vabd.u16        q8,  q0,  \s1        // abs(diff)
-        vabd.u16        q11, q0,  \s2        // abs(diff)
-        vshl.u16        q9,  q8,  \shift     // abs(diff) >> shift
-        vshl.u16        q12, q11, \shift     // abs(diff) >> shift
-        vqsub.u16       q9,  \thresh_vec, q9 // clip = imax(0, threshold - (abs(diff) >> shift))
-        vqsub.u16       q12, \thresh_vec, q12// clip = imax(0, threshold - (abs(diff) >> shift))
-        vsub.i16        q10, \s1, q0         // diff = p0 - px
-        vsub.i16        q13, \s2, q0         // diff = p1 - px
-        vneg.s16        q8,  q9              // -clip
-        vneg.s16        q11, q12             // -clip
-        vmin.s16        q10, q10, q9         // imin(diff, clip)
-        vmin.s16        q13, q13, q12        // imin(diff, clip)
-        vdup.16         q9,  \tap            // taps[k]
-        vmax.s16        q10, q10, q8         // constrain() = imax(imin(diff, clip), -clip)
-        vmax.s16        q13, q13, q11        // constrain() = imax(imin(diff, clip), -clip)
-        vmla.i16        q1,  q10, q9         // sum += taps[k] * constrain()
-        vmla.i16        q1,  q13, q9         // sum += taps[k] * constrain()
-.endm
-
-// void dav1d_cdef_filterX_8bpc_neon(pixel *dst, ptrdiff_t dst_stride,
-//                                   const uint16_t *tmp, int pri_strength,
-//                                   int sec_strength, int dir, int damping,
-//                                   int h, size_t edges);
-.macro filter_func w, pri, sec, min, suffix
-function cdef_filter\w\suffix\()_neon
-        cmp             r8,  #0xf
-        beq             cdef_filter\w\suffix\()_edged_neon
-.if \pri
-        movrel_local    r8,  pri_taps
-        and             r9,  r3,  #1
-        add             r8,  r8,  r9, lsl #1
-.endif
-        movrel_local    r9,  directions\w
-        add             r5,  r9,  r5, lsl #1
-        vmov.u16        d17, #15
-        vdup.16         d16, r6              // damping
-
-.if \pri
-        vdup.16         q5,  r3              // threshold
-.endif
-.if \sec
-        vdup.16         q7,  r4              // threshold
-.endif
-        vmov.16         d8[0], r3
-        vmov.16         d8[1], r4
-        vclz.i16        d8,  d8              // clz(threshold)
-        vsub.i16        d8,  d17, d8         // ulog2(threshold)
-        vqsub.u16       d8,  d16, d8         // shift = imax(0, damping - ulog2(threshold))
-        vneg.s16        d8,  d8              // -shift
-.if \sec
-        vdup.16         q6,  d8[1]
-.endif
-.if \pri
-        vdup.16         q4,  d8[0]
-.endif
-
-1:
-.if \w == 8
-        vld1.16         {q0},  [r2, :128]    // px
-.else
-        add             r12, r2,  #2*8
-        vld1.16         {d0},  [r2,  :64]    // px
-        vld1.16         {d1},  [r12, :64]    // px
-.endif
-
-        vmov.u16        q1,  #0              // sum
-.if \min
-        vmov.u16        q2,  q0              // min
-        vmov.u16        q3,  q0              // max
-.endif
-
-        // Instead of loading sec_taps 2, 1 from memory, just set it
-        // to 2 initially and decrease for the second round.
-        // This is also used as loop counter.
-        mov             lr,  #2              // sec_taps[0]
-
-2:
-.if \pri
-        ldrsb           r9,  [r5]            // off1
-
-        load_px         d28, d29, d30, d31, \w
-.endif
-
-.if \sec
-        add             r5,  r5,  #4         // +2*2
-        ldrsb           r9,  [r5]            // off2
-.endif
-
-.if \pri
-        ldrb            r12, [r8]            // *pri_taps
-
-        handle_pixel    q14, q15, q5,  q4,  r12, \min
-.endif
-
-.if \sec
-        load_px         d28, d29, d30, d31, \w
-
-        add             r5,  r5,  #8         // +2*4
-        ldrsb           r9,  [r5]            // off3
-
-        handle_pixel    q14, q15, q7,  q6,  lr, \min
-
-        load_px         d28, d29, d30, d31, \w
-
-        handle_pixel    q14, q15, q7,  q6,  lr, \min
+tables
 
-        sub             r5,  r5,  #11        // r5 -= 2*(2+4); r5 += 1;
-.else
-        add             r5,  r5,  #1         // r5 += 1
-.endif
-        subs            lr,  lr,  #1         // sec_tap-- (value)
-.if \pri
-        add             r8,  r8,  #1         // pri_taps++ (pointer)
-.endif
-        bne             2b
-
-        vshr.s16        q14, q1,  #15        // -(sum < 0)
-        vadd.i16        q1,  q1,  q14        // sum - (sum < 0)
-        vrshr.s16       q1,  q1,  #4         // (8 + sum - (sum < 0)) >> 4
-        vadd.i16        q0,  q0,  q1         // px + (8 + sum ...) >> 4
-.if \min
-        vmin.s16        q0,  q0,  q3
-        vmax.s16        q0,  q0,  q2         // iclip(px + .., min, max)
-.endif
-        vmovn.u16       d0,  q0
-.if \w == 8
-        add             r2,  r2,  #2*16      // tmp += tmp_stride
-        subs            r7,  r7,  #1         // h--
-        vst1.8          {d0}, [r0, :64], r1
-.else
-        vst1.32         {d0[0]}, [r0, :32], r1
-        add             r2,  r2,  #2*16      // tmp += 2*tmp_stride
-        subs            r7,  r7,  #2         // h -= 2
-        vst1.32         {d0[1]}, [r0, :32], r1
-.endif
+filter 8, 8
+filter 4, 8
 
-        // Reset pri_taps and directions back to the original point
-        sub             r5,  r5,  #2
-.if \pri
-        sub             r8,  r8,  #2
-.endif
-
-        bgt             1b
-        vpop            {q4-q7}
-        pop             {r4-r9,pc}
-endfunc
-.endm
-
-.macro filter w
-filter_func \w, pri=1, sec=0, min=0, suffix=_pri
-filter_func \w, pri=0, sec=1, min=0, suffix=_sec
-filter_func \w, pri=1, sec=1, min=1, suffix=_pri_sec
-
-function cdef_filter\w\()_8bpc_neon, export=1
-        push            {r4-r9,lr}
-        vpush           {q4-q7}
-        ldrd            r4,  r5,  [sp, #92]
-        ldrd            r6,  r7,  [sp, #100]
-        ldr             r8,  [sp, #108]
-        cmp             r3,  #0 // pri_strength
-        bne             1f
-        b               cdef_filter\w\()_sec_neon // only sec
-1:
-        cmp             r4,  #0 // sec_strength
-        bne             1f
-        b               cdef_filter\w\()_pri_neon // only pri
-1:
-        b               cdef_filter\w\()_pri_sec_neon // both pri and sec
-endfunc
-.endm
-
-filter 8
-filter 4
+find_dir 8
 
 .macro load_px_8 d11, d12, d21, d22, w
 .if \w == 8
@@ -756,219 +536,3 @@
 
 filter_8 8
 filter_8 4
-
-const div_table, align=4
-        .short         840, 420, 280, 210, 168, 140, 120, 105
-endconst
-
-const alt_fact, align=4
-        .short         420, 210, 140, 105, 105, 105, 105, 105, 140, 210, 420, 0
-endconst
-
-// int dav1d_cdef_find_dir_8bpc_neon(const pixel *img, const ptrdiff_t stride,
-//                                   unsigned *const var)
-function cdef_find_dir_8bpc_neon, export=1
-        push            {lr}
-        vpush           {q4-q7}
-        sub             sp,  sp,  #32          // cost
-        mov             r3,  #8
-        vmov.u16        q1,  #0                // q0-q1   sum_diag[0]
-        vmov.u16        q3,  #0                // q2-q3   sum_diag[1]
-        vmov.u16        q5,  #0                // q4-q5   sum_hv[0-1]
-        vmov.u16        q8,  #0                // q6,d16  sum_alt[0]
-                                               // q7,d17  sum_alt[1]
-        vmov.u16        q9,  #0                // q9,d22  sum_alt[2]
-        vmov.u16        q11, #0
-        vmov.u16        q10, #0                // q10,d23 sum_alt[3]
-
-
-.irpc i, 01234567
-        vld1.8          {d30}, [r0, :64], r1
-        vmov.u8         d31, #128
-        vsubl.u8        q15, d30, d31          // img[x] - 128
-        vmov.u16        q14, #0
-
-.if \i == 0
-        vmov            q0,  q15               // sum_diag[0]
-.else
-        vext.8          q12, q14, q15, #(16-2*\i)
-        vext.8          q13, q15, q14, #(16-2*\i)
-        vadd.i16        q0,  q0,  q12          // sum_diag[0]
-        vadd.i16        q1,  q1,  q13          // sum_diag[0]
-.endif
-        vrev64.16       q13, q15
-        vswp            d26, d27               // [-x]
-.if \i == 0
-        vmov            q2,  q13               // sum_diag[1]
-.else
-        vext.8          q12, q14, q13, #(16-2*\i)
-        vext.8          q13, q13, q14, #(16-2*\i)
-        vadd.i16        q2,  q2,  q12          // sum_diag[1]
-        vadd.i16        q3,  q3,  q13          // sum_diag[1]
-.endif
-
-        vpadd.u16       d26, d30, d31          // [(x >> 1)]
-        vmov.u16        d27, #0
-        vpadd.u16       d24, d26, d28
-        vpadd.u16       d24, d24, d28          // [y]
-        vmov.u16        r12, d24[0]
-        vadd.i16        q5,  q5,  q15          // sum_hv[1]
-.if \i < 4
-        vmov.16         d8[\i],   r12          // sum_hv[0]
-.else
-        vmov.16         d9[\i-4], r12          // sum_hv[0]
-.endif
-
-.if \i == 0
-        vmov.u16        q6,  q13               // sum_alt[0]
-.else
-        vext.8          q12, q14, q13, #(16-2*\i)
-        vext.8          q14, q13, q14, #(16-2*\i)
-        vadd.i16        q6,  q6,  q12          // sum_alt[0]
-        vadd.i16        d16, d16, d28          // sum_alt[0]
-.endif
-        vrev64.16       d26, d26               // [-(x >> 1)]
-        vmov.u16        q14, #0
-.if \i == 0
-        vmov            q7,  q13               // sum_alt[1]
-.else
-        vext.8          q12, q14, q13, #(16-2*\i)
-        vext.8          q13, q13, q14, #(16-2*\i)
-        vadd.i16        q7,  q7,  q12          // sum_alt[1]
-        vadd.i16        d17, d17, d26          // sum_alt[1]
-.endif
-
-.if \i < 6
-        vext.8          q12, q14, q15, #(16-2*(3-(\i/2)))
-        vext.8          q13, q15, q14, #(16-2*(3-(\i/2)))
-        vadd.i16        q9,  q9,  q12          // sum_alt[2]
-        vadd.i16        d22, d22, d26          // sum_alt[2]
-.else
-        vadd.i16        q9,  q9,  q15          // sum_alt[2]
-.endif
-.if \i == 0
-        vmov            q10, q15               // sum_alt[3]
-.elseif \i == 1
-        vadd.i16        q10, q10, q15          // sum_alt[3]
-.else
-        vext.8          q12, q14, q15, #(16-2*(\i/2))
-        vext.8          q13, q15, q14, #(16-2*(\i/2))
-        vadd.i16        q10, q10, q12          // sum_alt[3]
-        vadd.i16        d23, d23, d26          // sum_alt[3]
-.endif
-.endr
-
-        vmov.u32        q15, #105
-
-        vmull.s16       q12, d8,  d8           // sum_hv[0]*sum_hv[0]
-        vmlal.s16       q12, d9,  d9
-        vmull.s16       q13, d10, d10          // sum_hv[1]*sum_hv[1]
-        vmlal.s16       q13, d11, d11
-        vadd.s32        d8,  d24, d25
-        vadd.s32        d9,  d26, d27
-        vpadd.s32       d8,  d8,  d9           // cost[2,6] (s16, s17)
-        vmul.i32        d8,  d8,  d30          // cost[2,6] *= 105
-
-        vrev64.16       q1,  q1
-        vrev64.16       q3,  q3
-        vext.8          q1,  q1,  q1,  #10     // sum_diag[0][14-n]
-        vext.8          q3,  q3,  q3,  #10     // sum_diag[1][14-n]
-
-        vstr            s16, [sp, #2*4]        // cost[2]
-        vstr            s17, [sp, #6*4]        // cost[6]
-
-        movrel_local    r12, div_table
-        vld1.16         {q14}, [r12, :128]
-
-        vmull.s16       q5,  d0,  d0           // sum_diag[0]*sum_diag[0]
-        vmull.s16       q12, d1,  d1
-        vmlal.s16       q5,  d2,  d2
-        vmlal.s16       q12, d3,  d3
-        vmull.s16       q0,  d4,  d4           // sum_diag[1]*sum_diag[1]
-        vmull.s16       q1,  d5,  d5
-        vmlal.s16       q0,  d6,  d6
-        vmlal.s16       q1,  d7,  d7
-        vmovl.u16       q13, d28               // div_table
-        vmovl.u16       q14, d29
-        vmul.i32        q5,  q5,  q13          // cost[0]
-        vmla.i32        q5,  q12, q14
-        vmul.i32        q0,  q0,  q13          // cost[4]
-        vmla.i32        q0,  q1,  q14
-        vadd.i32        d10, d10, d11
-        vadd.i32        d0,  d0,  d1
-        vpadd.i32       d0,  d10, d0           // cost[0,4] = s0,s1
-
-        movrel_local    r12, alt_fact
-        vld1.16         {d29, d30, d31}, [r12, :64] // div_table[2*m+1] + 105
-
-        vstr            s0,  [sp, #0*4]        // cost[0]
-        vstr            s1,  [sp, #4*4]        // cost[4]
-
-        vmovl.u16       q13, d29               // div_table[2*m+1] + 105
-        vmovl.u16       q14, d30
-        vmovl.u16       q15, d31
-
-.macro cost_alt dest, s1, s2, s3, s4, s5, s6
-        vmull.s16       q1,  \s1, \s1          // sum_alt[n]*sum_alt[n]
-        vmull.s16       q2,  \s2, \s2
-        vmull.s16       q3,  \s3, \s3
-        vmull.s16       q5,  \s4, \s4          // sum_alt[n]*sum_alt[n]
-        vmull.s16       q12, \s5, \s5
-        vmull.s16       q6,  \s6, \s6          // q6 overlaps the first \s1-\s2 here
-        vmul.i32        q1,  q1,  q13          // sum_alt[n]^2*fact
-        vmla.i32        q1,  q2,  q14
-        vmla.i32        q1,  q3,  q15
-        vmul.i32        q5,  q5,  q13          // sum_alt[n]^2*fact
-        vmla.i32        q5,  q12, q14
-        vmla.i32        q5,  q6,  q15
-        vadd.i32        d2,  d2,  d3
-        vadd.i32        d3,  d10, d11
-        vpadd.i32       \dest, d2, d3          // *cost_ptr
-.endm
-        cost_alt        d14, d12, d13, d16, d14, d15, d17 // cost[1], cost[3]
-        cost_alt        d15, d18, d19, d22, d20, d21, d23 // cost[5], cost[7]
-        vstr            s28, [sp, #1*4]        // cost[1]
-        vstr            s29, [sp, #3*4]        // cost[3]
-
-        mov             r0,  #0                // best_dir
-        vmov.32         r1,  d0[0]             // best_cost
-        mov             r3,  #1                // n
-
-        vstr            s30, [sp, #5*4]        // cost[5]
-        vstr            s31, [sp, #7*4]        // cost[7]
-
-        vmov.32         r12, d14[0]
-
-.macro find_best s1, s2, s3
-.ifnb \s2
-        vmov.32         lr,  \s2
-.endif
-        cmp             r12, r1                // cost[n] > best_cost
-        itt             gt
-        movgt           r0,  r3                // best_dir = n
-        movgt           r1,  r12               // best_cost = cost[n]
-.ifnb \s2
-        add             r3,  r3,  #1           // n++
-        cmp             lr,  r1                // cost[n] > best_cost
-        vmov.32         r12, \s3
-        itt             gt
-        movgt           r0,  r3                // best_dir = n
-        movgt           r1,  lr                // best_cost = cost[n]
-        add             r3,  r3,  #1           // n++
-.endif
-.endm
-        find_best       d14[0], d8[0], d14[1]
-        find_best       d14[1], d0[1], d15[0]
-        find_best       d15[0], d8[1], d15[1]
-        find_best       d15[1]
-
-        eor             r3,  r0,  #4           // best_dir ^4
-        ldr             r12, [sp, r3, lsl #2]
-        sub             r1,  r1,  r12          // best_cost - cost[best_dir ^ 4]
-        lsr             r1,  r1,  #10
-        str             r1,  [r2]              // *var
-
-        add             sp,  sp,  #32
-        vpop            {q4-q7}
-        pop             {pc}
-endfunc
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef_tmpl.S firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef_tmpl.S
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/32/cdef_tmpl.S	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/32/cdef_tmpl.S	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,515 @@
+/*
+ * Copyright © 2018, VideoLAN and dav1d authors
+ * Copyright © 2020, Martin Storsjo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. 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 OWNER 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 "src/arm/asm.S"
+#include "util.S"
+
+.macro dir_table w, stride
+const directions\w
+        .byte           -1 * \stride + 1, -2 * \stride + 2
+        .byte            0 * \stride + 1, -1 * \stride + 2
+        .byte            0 * \stride + 1,  0 * \stride + 2
+        .byte            0 * \stride + 1,  1 * \stride + 2
+        .byte            1 * \stride + 1,  2 * \stride + 2
+        .byte            1 * \stride + 0,  2 * \stride + 1
+        .byte            1 * \stride + 0,  2 * \stride + 0
+        .byte            1 * \stride + 0,  2 * \stride - 1
+// Repeated, to avoid & 7
+        .byte           -1 * \stride + 1, -2 * \stride + 2
+        .byte            0 * \stride + 1, -1 * \stride + 2
+        .byte            0 * \stride + 1,  0 * \stride + 2
+        .byte            0 * \stride + 1,  1 * \stride + 2
+        .byte            1 * \stride + 1,  2 * \stride + 2
+        .byte            1 * \stride + 0,  2 * \stride + 1
+endconst
+.endm
+
+.macro tables
+dir_table 8, 16
+dir_table 4, 8
+
+const pri_taps
+        .byte           4, 2, 3, 3
+endconst
+.endm
+
+.macro load_px d11, d12, d21, d22, w
+.if \w == 8
+        add             r6,  r2,  r9, lsl #1 // x + off
+        sub             r9,  r2,  r9, lsl #1 // x - off
+        vld1.16         {\d11,\d12}, [r6]    // p0
+        vld1.16         {\d21,\d22}, [r9]    // p1
+.else
+        add             r6,  r2,  r9, lsl #1 // x + off
+        sub             r9,  r2,  r9, lsl #1 // x - off
+        vld1.16         {\d11}, [r6]         // p0
+        add             r6,  r6,  #2*8       // += stride
+        vld1.16         {\d21}, [r9]         // p1
+        add             r9,  r9,  #2*8       // += stride
+        vld1.16         {\d12}, [r6]         // p0
+        vld1.16         {\d22}, [r9]         // p1
+.endif
+.endm
+.macro handle_pixel s1, s2, thresh_vec, shift, tap, min
+.if \min
+        vmin.u16        q2,  q2,  \s1
+        vmax.s16        q3,  q3,  \s1
+        vmin.u16        q2,  q2,  \s2
+        vmax.s16        q3,  q3,  \s2
+.endif
+        vabd.u16        q8,  q0,  \s1        // abs(diff)
+        vabd.u16        q11, q0,  \s2        // abs(diff)
+        vshl.u16        q9,  q8,  \shift     // abs(diff) >> shift
+        vshl.u16        q12, q11, \shift     // abs(diff) >> shift
+        vqsub.u16       q9,  \thresh_vec, q9 // clip = imax(0, threshold - (abs(diff) >> shift))
+        vqsub.u16       q12, \thresh_vec, q12// clip = imax(0, threshold - (abs(diff) >> shift))
+        vsub.i16        q10, \s1, q0         // diff = p0 - px
+        vsub.i16        q13, \s2, q0         // diff = p1 - px
+        vneg.s16        q8,  q9              // -clip
+        vneg.s16        q11, q12             // -clip
+        vmin.s16        q10, q10, q9         // imin(diff, clip)
+        vmin.s16        q13, q13, q12        // imin(diff, clip)
+        vdup.16         q9,  \tap            // taps[k]
+        vmax.s16        q10, q10, q8         // constrain() = imax(imin(diff, clip), -clip)
+        vmax.s16        q13, q13, q11        // constrain() = imax(imin(diff, clip), -clip)
+        vmla.i16        q1,  q10, q9         // sum += taps[k] * constrain()
+        vmla.i16        q1,  q13, q9         // sum += taps[k] * constrain()
+.endm
+
+// void dav1d_cdef_filterX_Ybpc_neon(pixel *dst, ptrdiff_t dst_stride,
+//                                   const uint16_t *tmp, int pri_strength,
+//                                   int sec_strength, int dir, int damping,
+//                                   int h, size_t edges);
+.macro filter_func w, bpc, pri, sec, min, suffix
+function cdef_filter\w\suffix\()_\bpc\()bpc_neon
+.if \bpc == 8
+        cmp             r8,  #0xf
+        beq             cdef_filter\w\suffix\()_edged_neon
+.endif
+.if \pri
+.if \bpc == 16
+        clz             r9,  r9
+        sub             r9,  r9,  #24        // -bitdepth_min_8
+        neg             r9,  r9              // bitdepth_min_8
+.endif
+        movrel_local    r8,  pri_taps
+.if \bpc == 16
+        lsr             r9,  r3,  r9         // pri_strength >> bitdepth_min_8
+        and             r9,  r9,  #1         // (pri_strength >> bitdepth_min_8) & 1
+.else
+        and             r9,  r3,  #1
+.endif
+        add             r8,  r8,  r9, lsl #1
+.endif
+        movrel_local    r9,  directions\w
+        add             r5,  r9,  r5, lsl #1
+        vmov.u16        d17, #15
+        vdup.16         d16, r6              // damping
+
+.if \pri
+        vdup.16         q5,  r3              // threshold
+.endif
+.if \sec
+        vdup.16         q7,  r4              // threshold
+.endif
+        vmov.16         d8[0], r3
+        vmov.16         d8[1], r4
+        vclz.i16        d8,  d8              // clz(threshold)
+        vsub.i16        d8,  d17, d8         // ulog2(threshold)
+        vqsub.u16       d8,  d16, d8         // shift = imax(0, damping - ulog2(threshold))
+        vneg.s16        d8,  d8              // -shift
+.if \sec
+        vdup.16         q6,  d8[1]
+.endif
+.if \pri
+        vdup.16         q4,  d8[0]
+.endif
+
+1:
+.if \w == 8
+        vld1.16         {q0},  [r2, :128]    // px
+.else
+        add             r12, r2,  #2*8
+        vld1.16         {d0},  [r2,  :64]    // px
+        vld1.16         {d1},  [r12, :64]    // px
+.endif
+
+        vmov.u16        q1,  #0              // sum
+.if \min
+        vmov.u16        q2,  q0              // min
+        vmov.u16        q3,  q0              // max
+.endif
+
+        // Instead of loading sec_taps 2, 1 from memory, just set it
+        // to 2 initially and decrease for the second round.
+        // This is also used as loop counter.
+        mov             lr,  #2              // sec_taps[0]
+
+2:
+.if \pri
+        ldrsb           r9,  [r5]            // off1
+
+        load_px         d28, d29, d30, d31, \w
+.endif
+
+.if \sec
+        add             r5,  r5,  #4         // +2*2
+        ldrsb           r9,  [r5]            // off2
+.endif
+
+.if \pri
+        ldrb            r12, [r8]            // *pri_taps
+
+        handle_pixel    q14, q15, q5,  q4,  r12, \min
+.endif
+
+.if \sec
+        load_px         d28, d29, d30, d31, \w
+
+        add             r5,  r5,  #8         // +2*4
+        ldrsb           r9,  [r5]            // off3
+
+        handle_pixel    q14, q15, q7,  q6,  lr, \min
+
+        load_px         d28, d29, d30, d31, \w
+
+        handle_pixel    q14, q15, q7,  q6,  lr, \min
+
+        sub             r5,  r5,  #11        // r5 -= 2*(2+4); r5 += 1;
+.else
+        add             r5,  r5,  #1         // r5 += 1
+.endif
+        subs            lr,  lr,  #1         // sec_tap-- (value)
+.if \pri
+        add             r8,  r8,  #1         // pri_taps++ (pointer)
+.endif
+        bne             2b
+
+        vshr.s16        q14, q1,  #15        // -(sum < 0)
+        vadd.i16        q1,  q1,  q14        // sum - (sum < 0)
+        vrshr.s16       q1,  q1,  #4         // (8 + sum - (sum < 0)) >> 4
+        vadd.i16        q0,  q0,  q1         // px + (8 + sum ...) >> 4
+.if \min
+        vmin.s16        q0,  q0,  q3
+        vmax.s16        q0,  q0,  q2         // iclip(px + .., min, max)
+.endif
+.if \bpc == 8
+        vmovn.u16       d0,  q0
+.endif
+.if \w == 8
+        add             r2,  r2,  #2*16      // tmp += tmp_stride
+        subs            r7,  r7,  #1         // h--
+.if \bpc == 8
+        vst1.8          {d0}, [r0, :64], r1
+.else
+        vst1.16         {q0}, [r0, :128], r1
+.endif
+.else
+.if \bpc == 8
+        vst1.32         {d0[0]}, [r0, :32], r1
+.else
+        vst1.16         {d0},    [r0, :64], r1
+.endif
+        add             r2,  r2,  #2*16      // tmp += 2*tmp_stride
+        subs            r7,  r7,  #2         // h -= 2
+.if \bpc == 8
+        vst1.32         {d0[1]}, [r0, :32], r1
+.else
+        vst1.16         {d1},    [r0, :64], r1
+.endif
+.endif
+
+        // Reset pri_taps and directions back to the original point
+        sub             r5,  r5,  #2
+.if \pri
+        sub             r8,  r8,  #2
+.endif
+
+        bgt             1b
+        vpop            {q4-q7}
+        pop             {r4-r9,pc}
+endfunc
+.endm
+
+.macro filter w, bpc
+filter_func \w, \bpc, pri=1, sec=0, min=0, suffix=_pri
+filter_func \w, \bpc, pri=0, sec=1, min=0, suffix=_sec
+filter_func \w, \bpc, pri=1, sec=1, min=1, suffix=_pri_sec
+
+function cdef_filter\w\()_\bpc\()bpc_neon, export=1
+        push            {r4-r9,lr}
+        vpush           {q4-q7}
+        ldrd            r4,  r5,  [sp, #92]
+        ldrd            r6,  r7,  [sp, #100]
+.if \bpc == 16
+        ldrd            r8,  r9,  [sp, #108]
+.else
+        ldr             r8,  [sp, #108]
+.endif
+        cmp             r3,  #0 // pri_strength
+        bne             1f
+        b               cdef_filter\w\()_sec_\bpc\()bpc_neon // only sec
+1:
+        cmp             r4,  #0 // sec_strength
+        bne             1f
+        b               cdef_filter\w\()_pri_\bpc\()bpc_neon // only pri
+1:
+        b               cdef_filter\w\()_pri_sec_\bpc\()bpc_neon // both pri and sec
+endfunc
+.endm
+
+const div_table, align=4
+        .short         840, 420, 280, 210, 168, 140, 120, 105
+endconst
+
+const alt_fact, align=4
+        .short         420, 210, 140, 105, 105, 105, 105, 105, 140, 210, 420, 0
+endconst
+
+.macro cost_alt dest, s1, s2, s3, s4, s5, s6
+        vmull.s16       q1,  \s1, \s1          // sum_alt[n]*sum_alt[n]
+        vmull.s16       q2,  \s2, \s2
+        vmull.s16       q3,  \s3, \s3
+        vmull.s16       q5,  \s4, \s4          // sum_alt[n]*sum_alt[n]
+        vmull.s16       q12, \s5, \s5
+        vmull.s16       q6,  \s6, \s6          // q6 overlaps the first \s1-\s2 here
+        vmul.i32        q1,  q1,  q13          // sum_alt[n]^2*fact
+        vmla.i32        q1,  q2,  q14
+        vmla.i32        q1,  q3,  q15
+        vmul.i32        q5,  q5,  q13          // sum_alt[n]^2*fact
+        vmla.i32        q5,  q12, q14
+        vmla.i32        q5,  q6,  q15
+        vadd.i32        d2,  d2,  d3
+        vadd.i32        d3,  d10, d11
+        vpadd.i32       \dest, d2, d3          // *cost_ptr
+.endm
+
+.macro find_best s1, s2, s3
+.ifnb \s2
+        vmov.32         lr,  \s2
+.endif
+        cmp             r12, r1                // cost[n] > best_cost
+        itt             gt
+        movgt           r0,  r3                // best_dir = n
+        movgt           r1,  r12               // best_cost = cost[n]
+.ifnb \s2
+        add             r3,  r3,  #1           // n++
+        cmp             lr,  r1                // cost[n] > best_cost
+        vmov.32         r12, \s3
+        itt             gt
+        movgt           r0,  r3                // best_dir = n
+        movgt           r1,  lr                // best_cost = cost[n]
+        add             r3,  r3,  #1           // n++
+.endif
+.endm
+
+// int dav1d_cdef_find_dir_Xbpc_neon(const pixel *img, const ptrdiff_t stride,
+//                                   unsigned *const var)
+.macro find_dir bpc
+function cdef_find_dir_\bpc\()bpc_neon, export=1
+        push            {lr}
+        vpush           {q4-q7}
+.if \bpc == 16
+        clz             r3,  r3                // clz(bitdepth_max)
+        sub             lr,  r3,  #24          // -bitdepth_min_8
+.endif
+        sub             sp,  sp,  #32          // cost
+        mov             r3,  #8
+        vmov.u16        q1,  #0                // q0-q1   sum_diag[0]
+        vmov.u16        q3,  #0                // q2-q3   sum_diag[1]
+        vmov.u16        q5,  #0                // q4-q5   sum_hv[0-1]
+        vmov.u16        q8,  #0                // q6,d16  sum_alt[0]
+                                               // q7,d17  sum_alt[1]
+        vmov.u16        q9,  #0                // q9,d22  sum_alt[2]
+        vmov.u16        q11, #0
+        vmov.u16        q10, #0                // q10,d23 sum_alt[3]
+
+
+.irpc i, 01234567
+.if \bpc == 8
+        vld1.8          {d30}, [r0, :64], r1
+        vmov.u8         d31, #128
+        vsubl.u8        q15, d30, d31          // img[x] - 128
+.else
+        vld1.16         {q15}, [r0, :128], r1
+        vdup.16         q14, lr                // -bitdepth_min_8
+        vshl.u16        q15, q15, q14
+        vmov.u16        q14, #128
+        vsub.i16        q15, q15, q14          // img[x] - 128
+.endif
+        vmov.u16        q14, #0
+
+.if \i == 0
+        vmov            q0,  q15               // sum_diag[0]
+.else
+        vext.8          q12, q14, q15, #(16-2*\i)
+        vext.8          q13, q15, q14, #(16-2*\i)
+        vadd.i16        q0,  q0,  q12          // sum_diag[0]
+        vadd.i16        q1,  q1,  q13          // sum_diag[0]
+.endif
+        vrev64.16       q13, q15
+        vswp            d26, d27               // [-x]
+.if \i == 0
+        vmov            q2,  q13               // sum_diag[1]
+.else
+        vext.8          q12, q14, q13, #(16-2*\i)
+        vext.8          q13, q13, q14, #(16-2*\i)
+        vadd.i16        q2,  q2,  q12          // sum_diag[1]
+        vadd.i16        q3,  q3,  q13          // sum_diag[1]
+.endif
+
+        vpadd.u16       d26, d30, d31          // [(x >> 1)]
+        vmov.u16        d27, #0
+        vpadd.u16       d24, d26, d28
+        vpadd.u16       d24, d24, d28          // [y]
+        vmov.u16        r12, d24[0]
+        vadd.i16        q5,  q5,  q15          // sum_hv[1]
+.if \i < 4
+        vmov.16         d8[\i],   r12          // sum_hv[0]
+.else
+        vmov.16         d9[\i-4], r12          // sum_hv[0]
+.endif
+
+.if \i == 0
+        vmov.u16        q6,  q13               // sum_alt[0]
+.else
+        vext.8          q12, q14, q13, #(16-2*\i)
+        vext.8          q14, q13, q14, #(16-2*\i)
+        vadd.i16        q6,  q6,  q12          // sum_alt[0]
+        vadd.i16        d16, d16, d28          // sum_alt[0]
+.endif
+        vrev64.16       d26, d26               // [-(x >> 1)]
+        vmov.u16        q14, #0
+.if \i == 0
+        vmov            q7,  q13               // sum_alt[1]
+.else
+        vext.8          q12, q14, q13, #(16-2*\i)
+        vext.8          q13, q13, q14, #(16-2*\i)
+        vadd.i16        q7,  q7,  q12          // sum_alt[1]
+        vadd.i16        d17, d17, d26          // sum_alt[1]
+.endif
+
+.if \i < 6
+        vext.8          q12, q14, q15, #(16-2*(3-(\i/2)))
+        vext.8          q13, q15, q14, #(16-2*(3-(\i/2)))
+        vadd.i16        q9,  q9,  q12          // sum_alt[2]
+        vadd.i16        d22, d22, d26          // sum_alt[2]
+.else
+        vadd.i16        q9,  q9,  q15          // sum_alt[2]
+.endif
+.if \i == 0
+        vmov            q10, q15               // sum_alt[3]
+.elseif \i == 1
+        vadd.i16        q10, q10, q15          // sum_alt[3]
+.else
+        vext.8          q12, q14, q15, #(16-2*(\i/2))
+        vext.8          q13, q15, q14, #(16-2*(\i/2))
+        vadd.i16        q10, q10, q12          // sum_alt[3]
+        vadd.i16        d23, d23, d26          // sum_alt[3]
+.endif
+.endr
+
+        vmov.u32        q15, #105
+
+        vmull.s16       q12, d8,  d8           // sum_hv[0]*sum_hv[0]
+        vmlal.s16       q12, d9,  d9
+        vmull.s16       q13, d10, d10          // sum_hv[1]*sum_hv[1]
+        vmlal.s16       q13, d11, d11
+        vadd.s32        d8,  d24, d25
+        vadd.s32        d9,  d26, d27
+        vpadd.s32       d8,  d8,  d9           // cost[2,6] (s16, s17)
+        vmul.i32        d8,  d8,  d30          // cost[2,6] *= 105
+
+        vrev64.16       q1,  q1
+        vrev64.16       q3,  q3
+        vext.8          q1,  q1,  q1,  #10     // sum_diag[0][14-n]
+        vext.8          q3,  q3,  q3,  #10     // sum_diag[1][14-n]
+
+        vstr            s16, [sp, #2*4]        // cost[2]
+        vstr            s17, [sp, #6*4]        // cost[6]
+
+        movrel_local    r12, div_table
+        vld1.16         {q14}, [r12, :128]
+
+        vmull.s16       q5,  d0,  d0           // sum_diag[0]*sum_diag[0]
+        vmull.s16       q12, d1,  d1
+        vmlal.s16       q5,  d2,  d2
+        vmlal.s16       q12, d3,  d3
+        vmull.s16       q0,  d4,  d4           // sum_diag[1]*sum_diag[1]
+        vmull.s16       q1,  d5,  d5
+        vmlal.s16       q0,  d6,  d6
+        vmlal.s16       q1,  d7,  d7
+        vmovl.u16       q13, d28               // div_table
+        vmovl.u16       q14, d29
+        vmul.i32        q5,  q5,  q13          // cost[0]
+        vmla.i32        q5,  q12, q14
+        vmul.i32        q0,  q0,  q13          // cost[4]
+        vmla.i32        q0,  q1,  q14
+        vadd.i32        d10, d10, d11
+        vadd.i32        d0,  d0,  d1
+        vpadd.i32       d0,  d10, d0           // cost[0,4] = s0,s1
+
+        movrel_local    r12, alt_fact
+        vld1.16         {d29, d30, d31}, [r12, :64] // div_table[2*m+1] + 105
+
+        vstr            s0,  [sp, #0*4]        // cost[0]
+        vstr            s1,  [sp, #4*4]        // cost[4]
+
+        vmovl.u16       q13, d29               // div_table[2*m+1] + 105
+        vmovl.u16       q14, d30
+        vmovl.u16       q15, d31
+
+        cost_alt        d14, d12, d13, d16, d14, d15, d17 // cost[1], cost[3]
+        cost_alt        d15, d18, d19, d22, d20, d21, d23 // cost[5], cost[7]
+        vstr            s28, [sp, #1*4]        // cost[1]
+        vstr            s29, [sp, #3*4]        // cost[3]
+
+        mov             r0,  #0                // best_dir
+        vmov.32         r1,  d0[0]             // best_cost
+        mov             r3,  #1                // n
+
+        vstr            s30, [sp, #5*4]        // cost[5]
+        vstr            s31, [sp, #7*4]        // cost[7]
+
+        vmov.32         r12, d14[0]
+
+        find_best       d14[0], d8[0], d14[1]
+        find_best       d14[1], d0[1], d15[0]
+        find_best       d15[0], d8[1], d15[1]
+        find_best       d15[1]
+
+        eor             r3,  r0,  #4           // best_dir ^4
+        ldr             r12, [sp, r3, lsl #2]
+        sub             r1,  r1,  r12          // best_cost - cost[best_dir ^ 4]
+        lsr             r1,  r1,  #10
+        str             r1,  [r2]              // *var
+
+        add             sp,  sp,  #32
+        vpop            {q4-q7}
+        pop             {pc}
+endfunc
+.endm
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/32/mc16.S firefox-85.0+build1/third_party/dav1d/src/arm/32/mc16.S
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/32/mc16.S	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/32/mc16.S	2021-01-18 19:58:25.000000000 +0000
@@ -2427,3 +2427,308 @@
 
 filter_fn put,  r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10
 filter_fn prep, r0, r8, r1, r2, r3, r4, r5, r6, r7, r9, r10
+
+.macro load_filter_ptr src
+        asr             r12, \src, #10
+        add             r12, r11, r12, lsl #3
+.endm
+
+.macro load_filter_coef dst, src, inc
+        vld1.8          {\dst}, [r12, :64]
+        add             \src, \src, \inc
+.endm
+
+.macro load_filter_row dst, src, inc
+        load_filter_ptr \src
+        load_filter_coef \dst, \src, \inc
+.endm
+
+function warp_filter_horz_neon
+        load_filter_ptr r5                  // filter 0
+        vld1.16         {q6,q7}, [r2], r3
+
+        load_filter_coef d0, r5,  r7        // filter 0
+        load_filter_row d2,  r5,  r7        // filter 1
+        vmovl.s8        q0,  d0             // filter 0
+        vext.8          q3,  q6,  q7,  #2*1 // filter 1 pixels
+        vmovl.s8        q1,  d2             // filter 1
+
+        vmull.s16       q4,  d12, d0        // filter 0 output (0-3)
+        vmull.s16       q5,  d13, d1        // filter 0 output (4-7)
+
+        load_filter_ptr r5                  // filter 2
+
+        vmull.s16       q2,  d6,  d2        // filter 1 output (0-3)
+        vmull.s16       q3,  d7,  d3        // filter 1 output (4-7)
+
+        load_filter_coef d0, r5,  r7        // filter 2
+
+        vpadd.i32       d8,  d8,  d9        // half pixel 0 (2x32)
+        vpadd.i32       d9,  d10, d11       // half pixel 0 (2x32)
+
+        load_filter_ptr r5                  // filter 3
+
+        vpadd.i32       d4,  d4,  d5        // half pixel 1 (2x32)
+        vpadd.i32       d5,  d6,  d7        // half pixel 1 (2x32)
+
+        vmovl.s8        q0,  d0             // filter 2
+        vext.8          q3,  q6,  q7,  #2*2 // filter 2 pixels
+
+        vpadd.i32       d8,  d8,  d9        // pixel 0 (2x32)
+        vpadd.i32       d9,  d4,  d5        // pixel 1 (2x32)
+
+        load_filter_coef d2, r5,  r7        // filter 3
+
+        vmull.s16       q2,  d6,  d0        // filter 2 output (0-3)
+        vmull.s16       q3,  d7,  d1        // filter 2 output (4-7)
+
+        load_filter_ptr r5                  // filter 4
+
+        vpadd.i32       d8,  d8,  d9        // pixel 0,1
+
+        vpadd.i32       d9,  d4,  d5        // half pixel 2 (2x32)
+        vpadd.i32       d10, d6,  d7        // half pixel 2 (2x32)
+
+        vmovl.s8        q1,  d2             // filter 3
+        vext.8          q3,  q6,  q7,  #2*3 // filter 3 pixels
+
+        load_filter_coef d0, r5,  r7        // filter 4
+
+        vpadd.i32       d9,  d9,  d10       // pixel 2 (2x32)
+
+        vmull.s16       q2,  d6,  d2        // filter 3 output (0-3)
+        vmull.s16       q3,  d7,  d3        // filter 3 output (4-7)
+
+        vmovl.s8        q0,  d0             // filter 4
+        load_filter_ptr r5                  // filter 5
+
+        vpadd.i32       d10, d4,  d5        // half pixel 3 (2x32)
+        vpadd.i32       d11, d6,  d7        // half pixel 3 (2x32)
+
+        vext.8          q3,  q6,  q7,  #2*4 // filter 4 pixels
+        load_filter_coef d2, r5,  r7        // filter 5
+
+        vpadd.i32       d10, d10, d11       // pixel 3 (2x32)
+
+        vpadd.i32       d9,  d9,  d10       // pixel 2,3
+
+        vmull.s16       q2,  d6,  d0        // filter 4 output (0-3)
+        vmull.s16       q3,  d7,  d1        // filter 4 output (4-7)
+
+        vmovl.s8        q1,  d2             // filter 5
+        load_filter_ptr r5                  // filter 6
+
+        vpadd.i32       d10, d4,  d5        // half pixel 4 (2x32)
+        vpadd.i32       d11, d6,  d7        // half pixel 4 (2x32)
+
+        vext.8          q3,  q6,  q7,  #2*5 // filter 5 pixels
+        load_filter_coef d0, r5,  r7        // filter 6
+
+        vpadd.i32       d10, d10, d11       // pixel 4 (2x32)
+
+        vmull.s16       q2,  d6,  d2        // filter 5 output (0-3)
+        vmull.s16       q3,  d7,  d3        // filter 5 output (4-7)
+
+        vmovl.s8        q0,  d0             // filter 6
+        load_filter_ptr r5                  // filter 7
+
+        vpadd.i32       d4,  d4,  d5        // half pixel 5 (2x32)
+        vpadd.i32       d5,  d6,  d7        // half pixel 5 (2x32)
+
+        vext.8          q3,  q6,  q7,  #2*6 // filter 6 pixels
+        load_filter_coef d2, r5,  r7        // filter 7
+
+        vpadd.i32       d11, d4,  d5        // pixel 5 (2x32)
+
+        vmull.s16       q2,  d6,  d0        // filter 6 output (0-3)
+        vmull.s16       q3,  d7,  d1        // filter 6 output (4-7)
+
+        vmovl.s8        q1,  d2             // filter 7
+
+        vpadd.i32       d10, d10, d11       // pixel 4,5
+
+        vpadd.i32       d4,  d4,  d5        // half pixel 6 (2x32)
+        vpadd.i32       d5,  d6,  d7        // half pixel 6 (2x32)
+
+        vext.8          q3,  q6,  q7,  #2*7 // filter 7 pixels
+
+        vpadd.i32       d11, d4,  d5        // pixel 6 (2x32)
+
+        vmull.s16       q2,  d6,  d2        // filter 7 output (0-3)
+        vmull.s16       q3,  d7,  d3        // filter 7 output (4-7)
+
+        vld1.32         {d14[],d15[]}, [sp] // -(7 - intermediate_bits)
+
+        vpadd.i32       d4,  d4,  d5        // half pixel 7 (2x32)
+        vpadd.i32       d5,  d6,  d7        // half pixel 7 (2x32)
+
+        sub             r5,  r5,  r7, lsl #3
+
+        vpadd.i32       d4,  d4,  d5        // pixel 7 (2x32)
+
+        add             r5,  r5,  r8
+
+        vpadd.i32       d11, d11, d4        // pixel 6,7
+
+        vrshl.s32       q4,  q4,  q7        // -(7 - intermediate_bits)
+        vrshl.s32       q5,  q5,  q7        // -(7 - intermediate_bits)
+
+        bx              lr
+endfunc
+
+// void dav1d_warp_affine_8x8_16bpc_neon(
+//         pixel *dst, const ptrdiff_t dst_stride,
+//         const pixel *src, const ptrdiff_t src_stride,
+//         const int16_t *const abcd, int mx, int my,
+//         const int bitdepth_max)
+.macro warp t
+function warp_affine_8x8\t\()_16bpc_neon, export=1
+        push            {r4-r11,lr}
+        vpush           {q4-q7}
+        ldrd            r4,  r5,  [sp, #100]
+        ldrd            r6,  r7,  [sp, #108]
+        sub             sp,  sp,  #8
+
+        clz             r7,  r7
+                                      // intermediate_bits = clz(bitdepth_max) - 18
+.ifb \t
+        sub             r8,  r7,  #11 // 7 + intermediate_bits = clz(bitdepth_max) - 18 + 7
+.endif
+        sub             r7,  r7,  #25 // -(7 - intermediate_bits)
+.ifb \t
+        neg             r8,  r8       // -(7 + intermediate_bits)
+.endif
+        str             r7,  [sp]     // spill -(7 - intermediate_bits) on stack
+.ifb \t
+        str             r8,  [sp, #4] // spill -(7 + intermediate_bits) on stack
+.endif
+
+        ldrd            r8,  r9,  [r4]
+        sxth            r7,  r8
+        asr             r8,  r8, #16
+        asr             r4,  r9, #16
+        sxth            r9,  r9
+        mov             r10, #8
+        sub             r2,  r2,  r3, lsl #1
+        sub             r2,  r2,  r3
+        sub             r2,  r2,  #6
+        movrel          r11, X(mc_warp_filter), 64*8
+.ifnb \t
+        lsl             r1,  r1,  #1
+.endif
+        add             r5,  r5,  #512
+        add             r6,  r6,  #512
+
+        bl              warp_filter_horz_neon
+        vmovn.i32       d16, q4
+        vmovn.i32       d17, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d18, q4
+        vmovn.i32       d19, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d20, q4
+        vmovn.i32       d21, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d22, q4
+        vmovn.i32       d23, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d24, q4
+        vmovn.i32       d25, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d26, q4
+        vmovn.i32       d27, q5
+        bl              warp_filter_horz_neon
+        vmovn.i32       d28, q4
+        vmovn.i32       d29, q5
+
+1:
+        bl              warp_filter_horz_neon
+        vmovn.i32       d30, q4
+        vmovn.i32       d31, q5
+
+        load_filter_row d8,  r6,  r9
+        load_filter_row d9,  r6,  r9
+        load_filter_row d10, r6,  r9
+        load_filter_row d11, r6,  r9
+        load_filter_row d12, r6,  r9
+        load_filter_row d13, r6,  r9
+        load_filter_row d14, r6,  r9
+        load_filter_row d15, r6,  r9
+        transpose_8x8b  q4,  q5,  q6,  q7,  d8,  d9,  d10, d11, d12, d13, d14, d15
+        vmovl.s8        q1,  d8
+        vmovl.s8        q2,  d9
+        vmovl.s8        q3,  d10
+        vmovl.s8        q4,  d11
+        vmovl.s8        q5,  d12
+        vmovl.s8        q6,  d13
+
+        sub             r6,  r6,  r9, lsl #3
+
+        // This ordering of vmull/vmlal is highly beneficial for
+        // Cortex A8/A9/A53 here, but harmful for Cortex A7.
+        vmull.s16       q0,  d16,  d2
+        vmlal.s16       q0,  d18,  d4
+        vmlal.s16       q0,  d20,  d6
+        vmlal.s16       q0,  d22,  d8
+        vmlal.s16       q0,  d24,  d10
+        vmlal.s16       q0,  d26,  d12
+        vmull.s16       q1,  d17,  d3
+        vmlal.s16       q1,  d19,  d5
+        vmlal.s16       q1,  d21,  d7
+        vmlal.s16       q1,  d23,  d9
+        vmlal.s16       q1,  d25,  d11
+        vmlal.s16       q1,  d27,  d13
+
+        vmovl.s8        q2,  d14
+        vmovl.s8        q3,  d15
+
+        vmlal.s16       q0,  d28,  d4
+        vmlal.s16       q0,  d30,  d6
+        vmlal.s16       q1,  d29,  d5
+        vmlal.s16       q1,  d31,  d7
+
+.ifb \t
+        ldr             lr,  [sp, #4]   // -(7 + intermediate_bits)
+        ldr             r12, [sp, #120] // bitdepth_max
+        vdup.32         q2,  lr         // -(7 + intermediate_bits)
+        vdup.16         q3,  r12        // bitdepth_max
+.endif
+
+        vmov            q8,  q9
+        vmov            q9,  q10
+.ifb \t
+        vrshl.s32       q0,  q0,  q2    // -(7 + intermediate_bits)
+        vrshl.s32       q1,  q1,  q2    // -(7 + intermediate_bits)
+.else
+        vrshrn.s32      d0,  q0,  #7
+        vrshrn.s32      d1,  q1,  #7
+        vmov.i16        q3,  #PREP_BIAS
+.endif
+        vmov            q10, q11
+.ifb \t
+        vqmovun.s32     d0,  q0
+        vqmovun.s32     d1,  q1
+.else
+        vsub.i16        q0,  q0,  q3    // PREP_BIAS
+.endif
+        vmov            q11, q12
+        vmov            q12, q13
+.ifb \t
+        vmin.u16        q0,  q0,  q3    // bitdepth_max
+.endif
+        vmov            q13, q14
+        vmov            q14, q15
+        subs            r10, r10, #1
+        vst1.16         {q0}, [r0, :128], r1
+
+        add             r6,  r6,  r4
+        bgt             1b
+
+        add             sp,  sp,  #8
+        vpop            {q4-q7}
+        pop             {r4-r11,pc}
+endfunc
+.endm
+
+warp
+warp t
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/64/cdef_tmpl.S firefox-85.0+build1/third_party/dav1d/src/arm/64/cdef_tmpl.S
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/64/cdef_tmpl.S	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/64/cdef_tmpl.S	2021-01-18 19:58:24.000000000 +0000
@@ -107,7 +107,7 @@
 .macro filter_func w, bpc, pri, sec, min, suffix
 function cdef_filter\w\suffix\()_\bpc\()bpc_neon
 .if \bpc == 8
-        ldr             w8,  [sp]                   // bitdepth_max
+        ldr             w8,  [sp]                   // edges
         cmp             w8,  #0xf
         b.eq            cdef_filter\w\suffix\()_edged_8bpc_neon
 .endif
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/cdef_init_tmpl.c firefox-85.0+build1/third_party/dav1d/src/arm/cdef_init_tmpl.c
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/cdef_init_tmpl.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/cdef_init_tmpl.c	2021-01-18 19:58:24.000000000 +0000
@@ -27,7 +27,6 @@
 #include "src/cpu.h"
 #include "src/cdef.h"
 
-#if BITDEPTH == 8 || ARCH_AARCH64
 decl_cdef_dir_fn(BF(dav1d_cdef_find_dir, neon));
 
 void BF(dav1d_cdef_padding4, neon)(uint16_t *tmp, const pixel *src,
@@ -72,7 +71,6 @@
 DEFINE_FILTER(8, 8, 16)
 DEFINE_FILTER(4, 8, 8)
 DEFINE_FILTER(4, 4, 8)
-#endif
 
 
 COLD void bitfn(dav1d_cdef_dsp_init_arm)(Dav1dCdefDSPContext *const c) {
@@ -80,10 +78,8 @@
 
     if (!(flags & DAV1D_ARM_CPU_FLAG_NEON)) return;
 
-#if BITDEPTH == 8 || ARCH_AARCH64
     c->dir = BF(dav1d_cdef_find_dir, neon);
     c->fb[0] = cdef_filter_8x8_neon;
     c->fb[1] = cdef_filter_4x8_neon;
     c->fb[2] = cdef_filter_4x4_neon;
-#endif
 }
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/arm/mc_init_tmpl.c firefox-85.0+build1/third_party/dav1d/src/arm/mc_init_tmpl.c
--- firefox-84.0.2+build1/third_party/dav1d/src/arm/mc_init_tmpl.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/arm/mc_init_tmpl.c	2021-01-18 19:58:24.000000000 +0000
@@ -109,8 +109,10 @@
     c->w_mask[0] = BF(dav1d_w_mask_444, neon);
     c->w_mask[1] = BF(dav1d_w_mask_422, neon);
     c->w_mask[2] = BF(dav1d_w_mask_420, neon);
+#endif
     c->warp8x8 = BF(dav1d_warp_affine_8x8, neon);
     c->warp8x8t = BF(dav1d_warp_affine_8x8t, neon);
+#if BITDEPTH == 8 || ARCH_AARCH64
     c->emu_edge = BF(dav1d_emu_edge, neon);
 #endif
 }
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/cdf.c firefox-85.0+build1/third_party/dav1d/src/cdf.c
--- firefox-84.0.2+build1/third_party/dav1d/src/cdf.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/cdf.c	2021-01-18 19:58:24.000000000 +0000
@@ -29,10 +29,7 @@
 
 #include <string.h>
 
-#include "src/thread.h"
-#include "common/intops.h"
-
-#include "src/cdf.h"
+#include "src/internal.h"
 #include "src/tables.h"
 
 #define CDF1(x) (32768-(x))
@@ -4096,11 +4093,11 @@
     }
 }
 
-int dav1d_cdf_thread_alloc(CdfThreadContext *const cdf,
+int dav1d_cdf_thread_alloc(Dav1dContext *const c, CdfThreadContext *const cdf,
                            struct thread_data *const t)
 {
-    cdf->ref = dav1d_ref_create(sizeof(CdfContext) +
-                                (t != NULL) * sizeof(atomic_uint));
+    cdf->ref = dav1d_ref_create_using_pool(&c->cdf_pool,
+                                           sizeof(CdfContext) + sizeof(atomic_uint));
     if (!cdf->ref) return DAV1D_ERR(ENOMEM);
     cdf->data.cdf = cdf->ref->data;
     if (t) {
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/cdf.h firefox-85.0+build1/third_party/dav1d/src/cdf.h
--- firefox-84.0.2+build1/third_party/dav1d/src/cdf.h	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/cdf.h	2021-01-18 19:58:25.000000000 +0000
@@ -140,7 +140,8 @@
 } CdfThreadContext;
 
 void dav1d_cdf_thread_init_static(CdfThreadContext *cdf, int qidx);
-int dav1d_cdf_thread_alloc(CdfThreadContext *cdf, struct thread_data *t);
+int dav1d_cdf_thread_alloc(Dav1dContext *c, CdfThreadContext *cdf,
+                           struct thread_data *t);
 void dav1d_cdf_thread_copy(CdfContext *dst, const CdfThreadContext *src);
 void dav1d_cdf_thread_ref(CdfThreadContext *dst, CdfThreadContext *src);
 void dav1d_cdf_thread_unref(CdfThreadContext *cdf);
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/data.c firefox-85.0+build1/third_party/dav1d/src/data.c
--- firefox-84.0.2+build1/third_party/dav1d/src/data.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/data.c	2021-01-18 19:58:24.000000000 +0000
@@ -43,6 +43,7 @@
 uint8_t *dav1d_data_create_internal(Dav1dData *const buf, const size_t sz) {
     validate_input_or_ret(buf != NULL, NULL);
 
+    if (sz > SIZE_MAX / 2) return NULL;
     buf->ref = dav1d_ref_create(sz);
     if (!buf->ref) return NULL;
     buf->data = buf->ref->const_data;
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/decode.c firefox-85.0+build1/third_party/dav1d/src/decode.c
--- firefox-84.0.2+build1/third_party/dav1d/src/decode.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/decode.c	2021-01-18 19:58:24.000000000 +0000
@@ -36,7 +36,6 @@
 #include "dav1d/data.h"
 
 #include "common/intops.h"
-#include "common/mem.h"
 
 #include "src/ctx.h"
 #include "src/decode.h"
@@ -2678,17 +2677,17 @@
                    sizeof(*f->tile_thread.titsati_index_rows) *
                        (f->frame_hdr->tiling.rows + 1)))
         {
-            for (int tile_row = 0, tile_idx = 0;
+            for (int tile_row = 0, task_idx = 0;
                  tile_row < f->frame_hdr->tiling.rows; tile_row++)
             {
                 for (int sby = f->frame_hdr->tiling.row_start_sb[tile_row];
                      sby < f->frame_hdr->tiling.row_start_sb[tile_row + 1]; sby++)
                 {
                     for (int tile_col = 0; tile_col < f->frame_hdr->tiling.cols;
-                         tile_col++, tile_idx++)
+                         tile_col++, task_idx++)
                     {
-                        f->tile_thread.task_idx_to_sby_and_tile_idx[tile_idx][0] = sby;
-                        f->tile_thread.task_idx_to_sby_and_tile_idx[tile_idx][1] =
+                        f->tile_thread.task_idx_to_sby_and_tile_idx[task_idx][0] = sby;
+                        f->tile_thread.task_idx_to_sby_and_tile_idx[task_idx][1] =
                             tile_row * f->frame_hdr->tiling.cols + tile_col;
                     }
                 }
@@ -3102,7 +3101,7 @@
                                                           4 * (t->by + f->sb_step),
                                                           PLANE_TYPE_BLOCK))
                             {
-                                return 1;
+                                goto error;
                             }
                         dav1d_refmvs_load_tmvs(&f->rf, tile_row,
                                                0, f->bw >> 1, t->by >> 1, by_end);
@@ -3398,7 +3397,7 @@
         dav1d_cdf_thread_ref(&f->in_cdf, &c->cdf[pri_ref]);
     }
     if (f->frame_hdr->refresh_context) {
-        res = dav1d_cdf_thread_alloc(&f->out_cdf, c->n_fc > 1 ? &f->frame_thread.td : NULL);
+        res = dav1d_cdf_thread_alloc(c, &f->out_cdf, c->n_fc > 1 ? &f->frame_thread.td : NULL);
         if (res < 0) goto error;
     }
 
@@ -3463,8 +3462,8 @@
 
     // ref_mvs
     if ((f->frame_hdr->frame_type & 1) || f->frame_hdr->allow_intrabc) {
-        f->mvs_ref = dav1d_ref_create(f->sb128h * 16 * (f->b4_stride >> 1) *
-                                      sizeof(*f->mvs));
+        f->mvs_ref = dav1d_ref_create_using_pool(&c->refmvs_pool,
+            sizeof(*f->mvs) * f->sb128h * 16 * (f->b4_stride >> 1));
         if (!f->mvs_ref) {
             res = DAV1D_ERR(ENOMEM);
             goto error;
@@ -3527,7 +3526,8 @@
             // We're updating an existing map, but need somewhere to
             // put the new values. Allocate them here (the data
             // actually gets set elsewhere)
-            f->cur_segmap_ref = dav1d_ref_create(f->b4_stride * 32 * f->sb128h);
+            f->cur_segmap_ref = dav1d_ref_create_using_pool(&c->segmap_pool,
+                sizeof(*f->cur_segmap) * f->b4_stride * 32 * f->sb128h);
             if (!f->cur_segmap_ref) {
                 dav1d_ref_dec(&f->prev_segmap_ref);
                 res = DAV1D_ERR(ENOMEM);
@@ -3542,13 +3542,14 @@
             f->cur_segmap = f->prev_segmap_ref->data;
         } else {
             // We need to make a new map. Allocate one here and zero it out.
-            f->cur_segmap_ref = dav1d_ref_create(f->b4_stride * 32 * f->sb128h);
+            const size_t segmap_size = sizeof(*f->cur_segmap) * f->b4_stride * 32 * f->sb128h;
+            f->cur_segmap_ref = dav1d_ref_create_using_pool(&c->segmap_pool, segmap_size);
             if (!f->cur_segmap_ref) {
                 res = DAV1D_ERR(ENOMEM);
                 goto error;
             }
             f->cur_segmap = f->cur_segmap_ref->data;
-            memset(f->cur_segmap_ref->data, 0, f->b4_stride * 32 * f->sb128h);
+            memset(f->cur_segmap, 0, segmap_size);
         }
     } else {
         f->cur_segmap = NULL;
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/internal.h firefox-85.0+build1/third_party/dav1d/src/internal.h
--- firefox-84.0.2+build1/third_party/dav1d/src/internal.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/internal.h	2021-01-18 19:58:24.000000000 +0000
@@ -82,8 +82,10 @@
     int n_tile_data_alloc;
     int n_tile_data;
     int n_tiles;
+    Dav1dMemPool seq_hdr_pool;
     Dav1dRef *seq_hdr_ref;
     Dav1dSequenceHeader *seq_hdr;
+    Dav1dMemPool frame_hdr_pool;
     Dav1dRef *frame_hdr_ref;
     Dav1dFrameHeader *frame_hdr;
 
@@ -107,12 +109,15 @@
     } frame_thread;
 
     // reference/entropy state
+    Dav1dMemPool segmap_pool;
+    Dav1dMemPool refmvs_pool;
     struct {
         Dav1dThreadPicture p;
         Dav1dRef *segmap;
         Dav1dRef *refmvs;
         unsigned refpoc[7];
     } refs[8];
+    Dav1dMemPool cdf_pool;
     CdfThreadContext cdf[8];
 
     Dav1dDSPContext dsp[3 /* 8, 10, 12 bits/component */];
@@ -135,6 +140,9 @@
     int drain;
 
     Dav1dLogger logger;
+
+    Dav1dMemPool picture_pool;
+    int mem_pools_inited;
 };
 
 struct Dav1dFrameContext {
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/lib.c firefox-85.0+build1/third_party/dav1d/src/lib.c
--- firefox-84.0.2+build1/third_party/dav1d/src/lib.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/lib.c	2021-01-18 19:58:24.000000000 +0000
@@ -38,7 +38,6 @@
 #include "dav1d/dav1d.h"
 #include "dav1d/data.h"
 
-#include "common/mem.h"
 #include "common/validate.h"
 
 #include "src/cpu.h"
@@ -77,6 +76,35 @@
     s->frame_size_limit = 0;
 }
 
+static COLD int init_mem_pools(Dav1dContext *const c) {
+    if (!pthread_mutex_init(&c->seq_hdr_pool.lock, NULL)) {
+        if (!pthread_mutex_init(&c->frame_hdr_pool.lock, NULL)) {
+            if (!pthread_mutex_init(&c->segmap_pool.lock, NULL)) {
+                if (!pthread_mutex_init(&c->refmvs_pool.lock, NULL)) {
+                    if (!pthread_mutex_init(&c->cdf_pool.lock, NULL)) {
+                        if (c->allocator.alloc_picture_callback == dav1d_default_picture_alloc) {
+                            if (!pthread_mutex_init(&c->picture_pool.lock, NULL)) {
+                                c->allocator.cookie = &c->picture_pool;
+                                c->mem_pools_inited = 2;
+                                return 0;
+                            }
+                        } else {
+                            c->mem_pools_inited = 1;
+                            return 0;
+                        }
+                        pthread_mutex_destroy(&c->cdf_pool.lock);
+                    }
+                    pthread_mutex_destroy(&c->refmvs_pool.lock);
+                }
+                pthread_mutex_destroy(&c->segmap_pool.lock);
+            }
+            pthread_mutex_destroy(&c->frame_hdr_pool.lock);
+        }
+        pthread_mutex_destroy(&c->seq_hdr_pool.lock);
+    }
+    return -1;
+}
+
 static void close_internal(Dav1dContext **const c_out, int flush);
 
 NO_SANITIZE("cfi-icall") // CFI is broken with dlsym()
@@ -129,6 +157,8 @@
     c->all_layers = s->all_layers;
     c->frame_size_limit = s->frame_size_limit;
 
+    if (init_mem_pools(c)) goto error;
+
     /* On 32-bit systems extremely large frame sizes can cause overflows in
      * dav1d_decode_frame() malloc size calculations. Prevent that from occuring
      * by enforcing a maximum frame size limit, chosen to roughly correspond to
@@ -572,6 +602,16 @@
     dav1d_ref_dec(&c->content_light_ref);
     dav1d_ref_dec(&c->itut_t35_ref);
 
+    if (c->mem_pools_inited) {
+        dav1d_mem_pool_destroy(&c->seq_hdr_pool);
+        dav1d_mem_pool_destroy(&c->frame_hdr_pool);
+        dav1d_mem_pool_destroy(&c->segmap_pool);
+        dav1d_mem_pool_destroy(&c->refmvs_pool);
+        dav1d_mem_pool_destroy(&c->cdf_pool);
+        if (c->mem_pools_inited == 2)
+            dav1d_mem_pool_destroy(&c->picture_pool);
+    }
+
     dav1d_freep_aligned(c_out);
 }
 
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/looprestoration_tmpl.c firefox-85.0+build1/third_party/dav1d/src/looprestoration_tmpl.c
--- firefox-84.0.2+build1/third_party/dav1d/src/looprestoration_tmpl.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/looprestoration_tmpl.c	2021-01-18 19:58:24.000000000 +0000
@@ -208,44 +208,58 @@
 // i: Pixel summed and stored (between loops)
 // c: Pixel summed not stored
 // x: Pixel not summed not stored
-static void boxsum3(coef *dst, const pixel *src, const int w, const int h) {
+static void boxsum3(int32_t *sumsq, coef *sum, const pixel *src,
+                    const int w, const int h)
+{
     // We skip the first row, as it is never used
     src += REST_UNIT_STRIDE;
-    dst += REST_UNIT_STRIDE;
 
     // We skip the first and last columns, as they are never used
     for (int x = 1; x < w - 1; x++) {
-        coef *ds = dst + x;
+        coef *sum_v = sum + x;
+        int32_t *sumsq_v = sumsq + x;
         const pixel *s = src + x;
-        int a = s[0], b = s[REST_UNIT_STRIDE];
+        int a = s[0], a2 = a * a;
+        int b = s[REST_UNIT_STRIDE], b2 = b * b;
 
         // We skip the first 2 rows, as they are skipped in the next loop and
         // we don't need the last 2 row as it is skipped in the next loop
         for (int y = 2; y < h - 2; y++) {
             s += REST_UNIT_STRIDE;
             const int c = s[REST_UNIT_STRIDE];
-            ds += REST_UNIT_STRIDE;
-            *ds = a + b + c;
+            const int c2 = c * c;
+            sum_v += REST_UNIT_STRIDE;
+            sumsq_v += REST_UNIT_STRIDE;
+            *sum_v = a + b + c;
+            *sumsq_v = a2 + b2 + c2;
             a = b;
+            a2 = b2;
             b = c;
+            b2 = c2;
         }
      }
 
-    // We skip the first 2 rows as they are never read
-    dst += REST_UNIT_STRIDE;
+    // We skip the first row as it is never read
+    sum += REST_UNIT_STRIDE;
+    sumsq += REST_UNIT_STRIDE;
     // We skip the last 2 rows as it is never read
     for (int y = 2; y < h - 2; y++) {
-        int a = dst[1], b = dst[2];
+        int a = sum[1], a2 = sumsq[1];
+        int b = sum[2], b2 = sumsq[2];
 
         // We don't store the first column as it is never read and
         // we don't store the last 2 columns as they are never read
         for (int x = 2; x < w - 2; x++) {
-            const int c = dst[x + 1];
-            dst[x] = a + b + c;
+            const int c = sum[x + 1], c2 = sumsq[x + 1];
+            sum[x] = a + b + c;
+            sumsq[x] = a2 + b2 + c2;
             a = b;
+            a2 = b2;
             b = c;
+            b2 = c2;
         }
-        dst += REST_UNIT_STRIDE;
+        sum += REST_UNIT_STRIDE;
+        sumsq += REST_UNIT_STRIDE;
     }
 }
 
@@ -271,141 +285,62 @@
 // i: Pixel summed and stored (between loops)
 // c: Pixel summed not stored
 // x: Pixel not summed not stored
-static void boxsum5(coef *dst, const pixel *const src, const int w, const int h) {
-    // We skip the first row, as it is never used
-    dst += REST_UNIT_STRIDE;
-
-    for (int x = 0; x < w; x++) {
-        coef *ds = dst + x;
-        const pixel *s = src + 3 * REST_UNIT_STRIDE + x;
-        int a = s[-3 * REST_UNIT_STRIDE];
-        int b = s[-2 * REST_UNIT_STRIDE];
-        int c = s[-1 * REST_UNIT_STRIDE];
-        int d = s[0];
-
-        // We skip the first 2 rows, as they are skipped in the next loop and
-        // we don't need the last 2 row as it is skipped in the next loop
-        for (int y = 2; y < h - 2; y++) {
-            s += REST_UNIT_STRIDE;
-            const int e = *s;
-            ds += REST_UNIT_STRIDE;
-            *ds = a + b + c + d + e;
-            a = b;
-            b = c;
-            c = d;
-            d = e;
-        }
-    }
-
-    // We skip the first 2 rows as they are never read
-    dst += REST_UNIT_STRIDE;
-    for (int y = 2; y < h - 2; y++) {
-        int a = dst[0];
-        int b = dst[1];
-        int c = dst[2];
-        int d = dst[3];
-
-        for (int x = 2; x < w - 2; x++) {
-            const int e = dst[x + 2];
-            dst[x] = a + b + c + d + e;
-            a = b;
-            b = c;
-            c = d;
-            d = e;
-        }
-        dst += REST_UNIT_STRIDE;
-    }
-}
-
-// See boxsum3 function comments for details on row and column skipping
-static void boxsum3sqr(int32_t *dst, const pixel *src, const int w, const int h) {
-    // We skip the first row, as it is never used
-    src += REST_UNIT_STRIDE;
-    dst += REST_UNIT_STRIDE;
-
-    // We skip the first and last columns, as they are never used
-    for (int x = 1; x < w - 1; x++) {
-        int32_t *ds = dst + x;
-        const pixel *s = src + x;
-        int a = s[0] * s[0];
-        int b = s[REST_UNIT_STRIDE] * s[REST_UNIT_STRIDE];
-
-        // We skip the first row, as it is skipped in the next loop and
-        // we don't need the last row as it is skipped in the next loop
-        for (int y = 2; y < h - 2; y++) {
-            s += REST_UNIT_STRIDE;
-            const int c = s[REST_UNIT_STRIDE] * s[REST_UNIT_STRIDE];
-            ds += REST_UNIT_STRIDE;
-            *ds = a + b + c;
-            a = b;
-            b = c;
-        }
-     }
-
-    // We skip the first row as it is never read
-    dst += REST_UNIT_STRIDE;
-    // We skip the last row as it is never read
-    for (int y = 2; y < h - 2; y++) {
-        int a = dst[1], b = dst[2];
-
-        // We don't store the first column as it is never read and
-        // we don't store the last 2 columns as they are never read
-        for (int x = 2; x < w - 2; x++) {
-            const int c = dst[x + 1];
-            dst[x] = a + b + c;
-            a = b;
-            b = c;
-        }
-        dst += REST_UNIT_STRIDE;
-    }
-}
-
-// See boxsum5 function comments for details on row and column skipping
-static void boxsum5sqr(int32_t *dst, const pixel *const src, const int w,
-                       const int h)
+static void boxsum5(int32_t *sumsq, coef *sum, const pixel *const src,
+                    const int w, const int h)
 {
-    // We skip the first row, as it is never used
-    dst += REST_UNIT_STRIDE;
-
     for (int x = 0; x < w; x++) {
-        int32_t *ds = dst + x;
+        coef *sum_v = sum + x;
+        int32_t *sumsq_v = sumsq + x;
         const pixel *s = src + 3 * REST_UNIT_STRIDE + x;
-        int a = s[-3 * REST_UNIT_STRIDE] * s[-3 * REST_UNIT_STRIDE];
-        int b = s[-2 * REST_UNIT_STRIDE] * s[-2 * REST_UNIT_STRIDE];
-        int c = s[-1 * REST_UNIT_STRIDE] * s[-1 * REST_UNIT_STRIDE];
-        int d = s[0] * s[0];
+        int a = s[-3 * REST_UNIT_STRIDE], a2 = a * a;
+        int b = s[-2 * REST_UNIT_STRIDE], b2 = b * b;
+        int c = s[-1 * REST_UNIT_STRIDE], c2 = c * c;
+        int d = s[0], d2 = d * d;
 
         // We skip the first 2 rows, as they are skipped in the next loop and
         // we don't need the last 2 row as it is skipped in the next loop
         for (int y = 2; y < h - 2; y++) {
             s += REST_UNIT_STRIDE;
-            const int e = s[0] * s[0];
-            ds += REST_UNIT_STRIDE;
-            *ds = a + b + c + d + e;
+            const int e = *s, e2 = e * e;
+            sum_v += REST_UNIT_STRIDE;
+            sumsq_v += REST_UNIT_STRIDE;
+            *sum_v = a + b + c + d + e;
+            *sumsq_v = a2 + b2 + c2 + d2 + e2;
             a = b;
             b = c;
             c = d;
             d = e;
+            a2 = b2;
+            b2 = c2;
+            c2 = d2;
+            d2 = e2;
         }
     }
 
-    // We skip the first 2 rows as they are never read
-    dst += REST_UNIT_STRIDE;
+    // We skip the first row as it is never read
+    sum += REST_UNIT_STRIDE;
+    sumsq += REST_UNIT_STRIDE;
     for (int y = 2; y < h - 2; y++) {
-        int a = dst[0];
-        int b = dst[1];
-        int c = dst[2];
-        int d = dst[3];
+        int a = sum[0], a2 = sumsq[0];
+        int b = sum[1], b2 = sumsq[1];
+        int c = sum[2], c2 = sumsq[2];
+        int d = sum[3], d2 = sumsq[3];
 
         for (int x = 2; x < w - 2; x++) {
-            const int e = dst[x + 2];
-            dst[x] = a + b + c + d + e;
+            const int e = sum[x + 2], e2 = sumsq[x + 2];
+            sum[x] = a + b + c + d + e;
+            sumsq[x] = a2 + b2 + c2 + d2 + e2;
             a = b;
             b = c;
             c = d;
             d = e;
+            a2 = b2;
+            b2 = c2;
+            c2 = d2;
+            d2 = e2;
         }
-        dst += REST_UNIT_STRIDE;
+        sum += REST_UNIT_STRIDE;
+        sumsq += REST_UNIT_STRIDE;
     }
 }
 
@@ -418,21 +353,18 @@
 
     // Selfguided filter is applied to a maximum stripe height of 64 + 3 pixels
     // of padding above and below
-    int32_t A_[70 /*(64 + 3 + 3)*/ * REST_UNIT_STRIDE];
-    int32_t *A = A_ + 3 * REST_UNIT_STRIDE + 3;
+    int32_t sumsq[68 /*(64 + 2 + 2)*/ * REST_UNIT_STRIDE];
+    int32_t *A = sumsq + 2 * REST_UNIT_STRIDE + 3;
     // By inverting A and B after the boxsums, B can be of size coef instead
     // of int32_t
-    coef B_[70 /*(64 + 3 + 3)*/ * REST_UNIT_STRIDE];
-    coef *B = B_ + 3 * REST_UNIT_STRIDE + 3;
+    coef sum[68 /*(64 + 2 + 2)*/ * REST_UNIT_STRIDE];
+    coef *B = sum + 2 * REST_UNIT_STRIDE + 3;
 
     const int step = (n == 25) + 1;
-    if (n == 25) {
-        boxsum5(B_, src, w + 6, h + 6);
-        boxsum5sqr(A_, src, w + 6, h + 6);
-    } else {
-        boxsum3(B_, src, w + 6, h + 6);
-        boxsum3sqr(A_, src, w + 6, h + 6);
-    }
+    if (n == 25)
+        boxsum5(sumsq, sum, src, w + 6, h + 6);
+    else
+        boxsum3(sumsq, sum, src, w + 6, h + 6);
     const int bitdepth_min_8 = bitdepth_from_max(bitdepth_max) - 8;
 
     int32_t *AA = A - REST_UNIT_STRIDE;
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/mem.c firefox-85.0+build1/third_party/dav1d/src/mem.c
--- firefox-84.0.2+build1/third_party/dav1d/src/mem.c	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/mem.c	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2020, VideoLAN and dav1d authors
+ * Copyright © 2020, Two Orioles, LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. 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 OWNER 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 "config.h"
+
+#include <stdint.h>
+
+#include "src/mem.h"
+#include "src/thread.h"
+
+void dav1d_mem_pool_push(Dav1dMemPool *const pool, Dav1dMemPoolBuffer *const buf) {
+    pthread_mutex_lock(&pool->lock);
+    buf->next = pool->buf;
+    pool->buf = buf;
+    pthread_mutex_unlock(&pool->lock);
+}
+
+Dav1dMemPoolBuffer *dav1d_mem_pool_pop(Dav1dMemPool *const pool, const size_t size) {
+    pthread_mutex_lock(&pool->lock);
+    Dav1dMemPoolBuffer *buf = pool->buf;
+    uint8_t *data;
+    if (buf) {
+        pool->buf = buf->next;
+        pthread_mutex_unlock(&pool->lock);
+        data = buf->data;
+        if ((uintptr_t)buf - (uintptr_t)data != size) {
+            dav1d_free_aligned(data);
+            goto alloc;
+        }
+    } else {
+        pthread_mutex_unlock(&pool->lock);
+alloc:
+        data = dav1d_alloc_aligned(size + sizeof(Dav1dMemPoolBuffer), 64);
+        if (!data) return NULL;
+        buf = (Dav1dMemPoolBuffer*)(data + size);
+        buf->data = data;
+    }
+
+    return buf;
+}
+
+COLD void dav1d_mem_pool_destroy(Dav1dMemPool *const pool) {
+    pthread_mutex_destroy(&pool->lock);
+    Dav1dMemPoolBuffer *buf = pool->buf;
+    while (buf) {
+        void *const data = buf->data;
+        buf = buf->next;
+        dav1d_free_aligned(data);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/mem.h firefox-85.0+build1/third_party/dav1d/src/mem.h
--- firefox-84.0.2+build1/third_party/dav1d/src/mem.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/mem.h	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2018, VideoLAN and dav1d authors
+ * Copyright © 2018, Two Orioles, LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. 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 OWNER 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 DAV1D_SRC_MEM_H
+#define DAV1D_SRC_MEM_H
+
+#include <stdlib.h>
+
+#if defined(HAVE_ALIGNED_MALLOC) || defined(HAVE_MEMALIGN)
+#include <malloc.h>
+#endif
+
+#include "common/attributes.h"
+
+#include "src/thread.h"
+
+typedef struct Dav1dMemPoolBuffer {
+    void *data;
+    struct Dav1dMemPoolBuffer *next;
+} Dav1dMemPoolBuffer;
+
+typedef struct Dav1dMemPool {
+    pthread_mutex_t lock;
+    Dav1dMemPoolBuffer *buf;
+} Dav1dMemPool;
+
+void dav1d_mem_pool_push(Dav1dMemPool *pool, Dav1dMemPoolBuffer *buf);
+Dav1dMemPoolBuffer *dav1d_mem_pool_pop(Dav1dMemPool *pool, size_t size);
+void dav1d_mem_pool_destroy(Dav1dMemPool *pool);
+
+/*
+ * Allocate align-byte aligned memory. The return value can be released
+ * by calling the dav1d_free_aligned() function.
+ */
+static inline void *dav1d_alloc_aligned(size_t sz, size_t align) {
+    assert(!(align & (align - 1)));
+#ifdef HAVE_POSIX_MEMALIGN
+    void *ptr;
+    if (posix_memalign(&ptr, align, sz)) return NULL;
+    return ptr;
+#elif defined(HAVE_ALIGNED_MALLOC)
+    return _aligned_malloc(sz, align);
+#elif defined(HAVE_MEMALIGN)
+    return memalign(align, sz);
+#else
+#error Missing aligned alloc implementation
+#endif
+}
+
+static inline void dav1d_free_aligned(void* ptr) {
+#ifdef HAVE_POSIX_MEMALIGN
+    free(ptr);
+#elif defined(HAVE_ALIGNED_MALLOC)
+    _aligned_free(ptr);
+#elif defined(HAVE_MEMALIGN)
+    free(ptr);
+#endif
+}
+
+static inline void dav1d_freep_aligned(void* ptr) {
+    void **mem = (void **) ptr;
+    if (*mem) {
+        dav1d_free_aligned(*mem);
+        *mem = NULL;
+    }
+}
+
+static inline void freep(void *ptr) {
+    void **mem = (void **) ptr;
+    if (*mem) {
+        free(*mem);
+        *mem = NULL;
+    }
+}
+
+#endif /* DAV1D_SRC_MEM_H */
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/meson.build firefox-85.0+build1/third_party/dav1d/src/meson.build
--- firefox-84.0.2+build1/third_party/dav1d/src/meson.build	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/meson.build	2021-01-18 19:58:25.000000000 +0000
@@ -38,6 +38,7 @@
     'itx_1d.c',
     'lf_mask.c',
     'log.c',
+    'mem.c',
     'msac.c',
     'obu.c',
     'picture.c',
@@ -147,6 +148,7 @@
 
             if dav1d_bitdepths.contains('16')
                 libdav1d_sources_asm += files(
+                    'arm/32/cdef16.S',
                     'arm/32/looprestoration16.S',
                     'arm/32/mc16.S',
                 )
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/obu.c firefox-85.0+build1/third_party/dav1d/src/obu.c
--- firefox-84.0.2+build1/third_party/dav1d/src/obu.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/obu.c	2021-01-18 19:58:24.000000000 +0000
@@ -55,7 +55,7 @@
     hdr->profile = dav1d_get_bits(gb, 3);
     if (hdr->profile > 2) goto error;
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-profile: off=%ld\n",
+    printf("SEQHDR: post-profile: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -63,7 +63,7 @@
     hdr->reduced_still_picture_header = dav1d_get_bits(gb, 1);
     if (hdr->reduced_still_picture_header && !hdr->still_picture) goto error;
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-stillpicture_flags: off=%ld\n",
+    printf("SEQHDR: post-stillpicture_flags: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -102,7 +102,7 @@
             hdr->decoder_model_info_present = 0;
         }
 #if DEBUG_SEQ_HDR
-        printf("SEQHDR: post-timinginfo: off=%ld\n",
+        printf("SEQHDR: post-timinginfo: off=%u\n",
                dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -138,7 +138,7 @@
             c->operating_point < hdr->num_operating_points ? c->operating_point : 0;
         c->operating_point_idc = hdr->operating_points[op_idx].idc;
 #if DEBUG_SEQ_HDR
-        printf("SEQHDR: post-operating-points: off=%ld\n",
+        printf("SEQHDR: post-operating-points: off=%u\n",
                dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
     }
@@ -148,7 +148,7 @@
     hdr->max_width = dav1d_get_bits(gb, hdr->width_n_bits) + 1;
     hdr->max_height = dav1d_get_bits(gb, hdr->height_n_bits) + 1;
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-size: off=%ld\n",
+    printf("SEQHDR: post-size: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
     hdr->frame_id_numbers_present =
@@ -158,7 +158,7 @@
         hdr->frame_id_n_bits = dav1d_get_bits(gb, 3) + hdr->delta_frame_id_n_bits + 1;
     }
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-frame-id-numbers-present: off=%ld\n",
+    printf("SEQHDR: post-frame-id-numbers-present: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -192,7 +192,7 @@
         }
         hdr->screen_content_tools = dav1d_get_bits(gb, 1) ? DAV1D_ADAPTIVE : dav1d_get_bits(gb, 1);
     #if DEBUG_SEQ_HDR
-        printf("SEQHDR: post-screentools: off=%ld\n",
+        printf("SEQHDR: post-screentools: off=%u\n",
                dav1d_get_bits_pos(gb) - init_bit_pos);
     #endif
         hdr->force_integer_mv = hdr->screen_content_tools ?
@@ -204,7 +204,7 @@
     hdr->cdef = dav1d_get_bits(gb, 1);
     hdr->restoration = dav1d_get_bits(gb, 1);
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-featurebits: off=%ld\n",
+    printf("SEQHDR: post-featurebits: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -264,13 +264,13 @@
     }
     hdr->separate_uv_delta_q = !hdr->monochrome && dav1d_get_bits(gb, 1);
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-colorinfo: off=%ld\n",
+    printf("SEQHDR: post-colorinfo: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
     hdr->film_grain_present = dav1d_get_bits(gb, 1);
 #if DEBUG_SEQ_HDR
-    printf("SEQHDR: post-filmgrain: off=%ld\n",
+    printf("SEQHDR: post-filmgrain: off=%u\n",
            dav1d_get_bits_pos(gb) - init_bit_pos);
 #endif
 
@@ -367,15 +367,18 @@
     hdr->show_existing_frame =
         !seqhdr->reduced_still_picture_header && dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-show_existing_frame: off=%ld\n",
+    printf("HDR: post-show_existing_frame: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     if (hdr->show_existing_frame) {
         hdr->existing_frame_idx = dav1d_get_bits(gb, 3);
         if (seqhdr->decoder_model_info_present && !seqhdr->equal_picture_interval)
             hdr->frame_presentation_delay = dav1d_get_bits(gb, seqhdr->frame_presentation_delay_length);
-        if (seqhdr->frame_id_numbers_present)
+        if (seqhdr->frame_id_numbers_present) {
             hdr->frame_id = dav1d_get_bits(gb, seqhdr->frame_id_n_bits);
+            Dav1dFrameHeader *const ref_frame_hdr = c->refs[hdr->existing_frame_idx].p.p.frame_hdr;
+            if (!ref_frame_hdr || ref_frame_hdr->frame_id != hdr->frame_id) return DAV1D_ERR(EINVAL);
+        }
         return 0;
     }
 
@@ -391,7 +394,7 @@
         hdr->frame_type == DAV1D_FRAME_TYPE_SWITCH ||
         seqhdr->reduced_still_picture_header || dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-frametype_bits: off=%ld\n",
+    printf("HDR: post-frametype_bits: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->disable_cdf_update = dav1d_get_bits(gb, 1);
@@ -412,7 +415,7 @@
     hdr->frame_size_override = seqhdr->reduced_still_picture_header ? 0 :
                                hdr->frame_type == DAV1D_FRAME_TYPE_SWITCH ? 1 : dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-frame_size_override_flag: off=%ld\n",
+    printf("HDR: post-frame_size_override_flag: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->frame_offset = seqhdr->order_hint ?
@@ -550,8 +553,12 @@
         for (int i = 0; i < 7; i++) {
             if (!hdr->frame_ref_short_signaling)
                 hdr->refidx[i] = dav1d_get_bits(gb, 3);
-            if (seqhdr->frame_id_numbers_present)
-                dav1d_get_bits(gb, seqhdr->delta_frame_id_n_bits);
+            if (seqhdr->frame_id_numbers_present) {
+                const int delta_ref_frame_id_minus_1 = dav1d_get_bits(gb, seqhdr->delta_frame_id_n_bits);
+                const int ref_frame_id = (hdr->frame_id + (1 << seqhdr->frame_id_n_bits) - delta_ref_frame_id_minus_1 - 1) & ((1 << seqhdr->frame_id_n_bits) - 1);
+                Dav1dFrameHeader *const ref_frame_hdr = c->refs[hdr->refidx[i]].p.p.frame_hdr;
+                if (!ref_frame_hdr || ref_frame_hdr->frame_id != ref_frame_id) goto error;
+            }
         }
         const int use_ref = !hdr->error_resilient_mode &&
                             hdr->frame_size_override;
@@ -565,14 +572,14 @@
             hdr->frame_type & 1 && dav1d_get_bits(gb, 1);
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-frametype-specific-bits: off=%ld\n",
+    printf("HDR: post-frametype-specific-bits: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
     hdr->refresh_context = !seqhdr->reduced_still_picture_header &&
                            !hdr->disable_cdf_update && !dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-refresh_context: off=%ld\n",
+    printf("HDR: post-refresh_context: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -646,7 +653,7 @@
         hdr->tiling.n_bytes = hdr->tiling.update = 0;
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-tiling: off=%ld\n",
+    printf("HDR: post-tiling: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -669,7 +676,7 @@
         }
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-quant: off=%ld\n",
+    printf("HDR: post-quant: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->quant.qm = dav1d_get_bits(gb, 1);
@@ -681,7 +688,7 @@
                                           hdr->quant.qm_u;
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-qm: off=%ld\n",
+    printf("HDR: post-qm: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -766,7 +773,7 @@
             hdr->segmentation.seg_data.d[i].ref = -1;
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-segmentation: off=%ld\n",
+    printf("HDR: post-segmentation: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -778,7 +785,7 @@
     hdr->delta.lf.res_log2 = hdr->delta.lf.present ? dav1d_get_bits(gb, 2) : 0;
     hdr->delta.lf.multi = hdr->delta.lf.present ? dav1d_get_bits(gb, 1) : 0;
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-delta_q_lf_flags: off=%ld\n",
+    printf("HDR: post-delta_q_lf_flags: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -838,7 +845,7 @@
         }
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-lpf: off=%ld\n",
+    printf("HDR: post-lpf: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -857,7 +864,7 @@
         hdr->cdef.uv_strength[0] = 0;
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-cdef: off=%ld\n",
+    printf("HDR: post-cdef: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -899,19 +906,19 @@
         hdr->restoration.type[2] = DAV1D_RESTORATION_NONE;
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-restoration: off=%ld\n",
+    printf("HDR: post-restoration: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
     hdr->txfm_mode = hdr->all_lossless ? DAV1D_TX_4X4_ONLY :
                      dav1d_get_bits(gb, 1) ? DAV1D_TX_SWITCHABLE : DAV1D_TX_LARGEST;
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-txfmmode: off=%ld\n",
+    printf("HDR: post-txfmmode: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->switchable_comp_refs = hdr->frame_type & 1 ? dav1d_get_bits(gb, 1) : 0;
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-refmode: off=%ld\n",
+    printf("HDR: post-refmode: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->skip_mode_allowed = 0;
@@ -972,18 +979,18 @@
     }
     hdr->skip_mode_enabled = hdr->skip_mode_allowed ? dav1d_get_bits(gb, 1) : 0;
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-extskip: off=%ld\n",
+    printf("HDR: post-extskip: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->warp_motion = !hdr->error_resilient_mode && hdr->frame_type & 1 &&
         seqhdr->warped_motion && dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-warpmotionbit: off=%ld\n",
+    printf("HDR: post-warpmotionbit: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
     hdr->reduced_txtp_set = dav1d_get_bits(gb, 1);
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-reducedtxtpset: off=%ld\n",
+    printf("HDR: post-reducedtxtpset: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -1037,7 +1044,7 @@
         }
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-gmv: off=%ld\n",
+    printf("HDR: post-gmv: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -1121,7 +1128,7 @@
         memset(&hdr->film_grain.data, 0, sizeof(hdr->film_grain.data));
     }
 #if DEBUG_FRAME_HDR
-    printf("HDR: post-filmgrain: off=%ld\n",
+    printf("HDR: post-filmgrain: off=%td\n",
            (gb->ptr - init_ptr) * 8 - gb->bits_left);
 #endif
 
@@ -1227,7 +1234,8 @@
 
     switch (type) {
     case DAV1D_OBU_SEQ_HDR: {
-        Dav1dRef *ref = dav1d_ref_create(sizeof(Dav1dSequenceHeader));
+        Dav1dRef *ref = dav1d_ref_create_using_pool(&c->seq_hdr_pool,
+                                                    sizeof(Dav1dSequenceHeader));
         if (!ref) return DAV1D_ERR(ENOMEM);
         Dav1dSequenceHeader *seq_hdr = ref->data;
         memset(seq_hdr, 0, sizeof(*seq_hdr));
@@ -1273,7 +1281,8 @@
         if (global) break;
         if (!c->seq_hdr) goto error;
         if (!c->frame_hdr_ref) {
-            c->frame_hdr_ref = dav1d_ref_create(sizeof(Dav1dFrameHeader));
+            c->frame_hdr_ref = dav1d_ref_create_using_pool(&c->frame_hdr_pool,
+                                                           sizeof(Dav1dFrameHeader));
             if (!c->frame_hdr_ref) return DAV1D_ERR(ENOMEM);
         }
 #ifndef NDEBUG
@@ -1366,6 +1375,10 @@
         break;
     }
     case DAV1D_OBU_METADATA: {
+#define DEBUG_OBU_METADATA 0
+#if DEBUG_OBU_METADATA
+        const uint8_t *const init_ptr = gb.ptr;
+#endif
         // obu metadta type field
         const enum ObuMetaType meta_type = dav1d_get_uleb128(&gb);
         const int meta_type_len = (dav1d_get_bits_pos(&gb) - init_bit_pos) >> 3;
@@ -1378,7 +1391,17 @@
             Dav1dContentLightLevel *const content_light = ref->data;
 
             content_light->max_content_light_level = dav1d_get_bits(&gb, 16);
+#if DEBUG_OBU_METADATA
+            printf("CLLOBU: max-content-light-level: %d [off=%td]\n",
+                   content_light->max_content_light_level,
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             content_light->max_frame_average_light_level = dav1d_get_bits(&gb, 16);
+#if DEBUG_OBU_METADATA
+            printf("CLLOBU: max-frame-average-light-level: %d [off=%td]\n",
+                   content_light->max_frame_average_light_level,
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
 
             // Skip the trailing bit, align to the next byte boundary and check for overrun.
             dav1d_get_bits(&gb, 1);
@@ -1401,13 +1424,37 @@
             for (int i = 0; i < 3; i++) {
                 mastering_display->primaries[i][0] = dav1d_get_bits(&gb, 16);
                 mastering_display->primaries[i][1] = dav1d_get_bits(&gb, 16);
+#if DEBUG_OBU_METADATA
+                printf("MDCVOBU: primaries[%d]: (%d, %d) [off=%td]\n", i,
+                       mastering_display->primaries[i][0],
+                       mastering_display->primaries[i][1],
+                       (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             }
             mastering_display->white_point[0] = dav1d_get_bits(&gb, 16);
+#if DEBUG_OBU_METADATA
+            printf("MDCVOBU: white-point-x: %d [off=%td]\n",
+                   mastering_display->white_point[0],
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             mastering_display->white_point[1] = dav1d_get_bits(&gb, 16);
-
+#if DEBUG_OBU_METADATA
+            printf("MDCVOBU: white-point-y: %d [off=%td]\n",
+                   mastering_display->white_point[1],
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             mastering_display->max_luminance = dav1d_get_bits(&gb, 32);
+#if DEBUG_OBU_METADATA
+            printf("MDCVOBU: max-luminance: %d [off=%td]\n",
+                   mastering_display->max_luminance,
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             mastering_display->min_luminance = dav1d_get_bits(&gb, 32);
-
+#if DEBUG_OBU_METADATA
+            printf("MDCVOBU: min-luminance: %d [off=%td]\n",
+                   mastering_display->min_luminance,
+                   (gb.ptr - init_ptr) * 8 - gb.bits_left);
+#endif
             // Skip the trailing bit, align to the next byte boundary and check for overrun.
             dav1d_get_bits(&gb, 1);
             dav1d_bytealign_get_bits(&gb);
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/picture.c firefox-85.0+build1/third_party/dav1d/src/picture.c
--- firefox-84.0.2+build1/third_party/dav1d/src/picture.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/picture.c	2021-01-18 19:58:24.000000000 +0000
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include "common/intops.h"
-#include "common/mem.h"
 #include "common/validate.h"
 
 #include "src/internal.h"
@@ -45,7 +44,7 @@
 #include "src/thread_task.h"
 
 int dav1d_default_picture_alloc(Dav1dPicture *const p, void *const cookie) {
-    assert(cookie == NULL);
+    assert(sizeof(Dav1dMemPoolBuffer) <= DAV1D_PICTURE_ALIGNMENT);
     const int hbd = p->p.bpc > 8;
     const int aligned_w = (p->p.w + 127) & ~127;
     const int aligned_h = (p->p.h + 127) & ~127;
@@ -67,27 +66,24 @@
     p->stride[1] = uv_stride;
     const size_t y_sz = y_stride * aligned_h;
     const size_t uv_sz = uv_stride * (aligned_h >> ss_ver);
-    const size_t pic_size = y_sz + 2 * uv_sz + DAV1D_PICTURE_ALIGNMENT;
-    uint8_t *const data = dav1d_alloc_aligned(pic_size, DAV1D_PICTURE_ALIGNMENT);
-    if (!data) return DAV1D_ERR(ENOMEM);
+    const size_t pic_size = y_sz + 2 * uv_sz;
 
+    Dav1dMemPoolBuffer *const buf = dav1d_mem_pool_pop(cookie, pic_size +
+                                                       DAV1D_PICTURE_ALIGNMENT -
+                                                       sizeof(Dav1dMemPoolBuffer));
+    if (!buf) return DAV1D_ERR(ENOMEM);
+    p->allocator_data = buf;
+
+    uint8_t *const data = buf->data;
     p->data[0] = data;
     p->data[1] = has_chroma ? data + y_sz : NULL;
     p->data[2] = has_chroma ? data + y_sz + uv_sz : NULL;
 
-#ifndef NDEBUG /* safety check */
-    p->allocator_data = data;
-#endif
-
     return 0;
 }
 
 void dav1d_default_picture_release(Dav1dPicture *const p, void *const cookie) {
-    assert(cookie == NULL);
-#ifndef NDEBUG /* safety check */
-    assert(p->allocator_data == p->data[0]);
-#endif
-    dav1d_free_aligned(p->data[0]);
+    dav1d_mem_pool_push(cookie, p->allocator_data);
 }
 
 struct pic_ctx_context {
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/picture.h firefox-85.0+build1/third_party/dav1d/src/picture.h
--- firefox-84.0.2+build1/third_party/dav1d/src/picture.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/picture.h	2021-01-18 19:58:24.000000000 +0000
@@ -52,6 +52,11 @@
     atomic_uint *progress;
 } Dav1dThreadPicture;
 
+typedef struct Dav1dPictureBuffer {
+    void *data;
+    struct Dav1dPictureBuffer *next;
+} Dav1dPictureBuffer;
+
 /*
  * Allocate a picture with custom border size.
  */
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/recon_tmpl.c firefox-85.0+build1/third_party/dav1d/src/recon_tmpl.c
--- firefox-84.0.2+build1/third_party/dav1d/src/recon_tmpl.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/recon_tmpl.c	2021-01-18 19:58:24.000000000 +0000
@@ -34,7 +34,6 @@
 #include "common/bitdepth.h"
 #include "common/dump.h"
 #include "common/intops.h"
-#include "common/mem.h"
 
 #include "src/cdef_apply.h"
 #include "src/ctx.h"
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/ref.c firefox-85.0+build1/third_party/dav1d/src/ref.c
--- firefox-84.0.2+build1/third_party/dav1d/src/ref.c	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/ref.c	2021-01-18 19:58:24.000000000 +0000
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#include "common/mem.h"
-
 #include "src/ref.h"
 
 static void default_free_callback(const uint8_t *const data, void *const user_data) {
@@ -36,15 +34,39 @@
     dav1d_free_aligned(user_data);
 }
 
-Dav1dRef *dav1d_ref_create(const size_t size) {
-    void *data = dav1d_alloc_aligned(size, 32);
+Dav1dRef *dav1d_ref_create(size_t size) {
+    size = (size + sizeof(void*) - 1) & ~(sizeof(void*) - 1);
+
+    uint8_t *const data = dav1d_alloc_aligned(size + sizeof(Dav1dRef), 64);
     if (!data) return NULL;
 
-    Dav1dRef *const res = dav1d_ref_wrap(data, default_free_callback, data);
-    if (res)
-        res->data = data;
-    else
-        dav1d_free_aligned(data);
+    Dav1dRef *const res = (Dav1dRef*)(data + size);
+    res->const_data = res->user_data = res->data = data;
+    atomic_init(&res->ref_cnt, 1);
+    res->free_ref = 0;
+    res->free_callback = default_free_callback;
+
+    return res;
+}
+
+static void pool_free_callback(const uint8_t *const data, void *const user_data) {
+    dav1d_mem_pool_push((Dav1dMemPool*)data, user_data);
+}
+
+Dav1dRef *dav1d_ref_create_using_pool(Dav1dMemPool *const pool, size_t size) {
+    size = (size + sizeof(void*) - 1) & ~(sizeof(void*) - 1);
+
+    Dav1dMemPoolBuffer *const buf =
+        dav1d_mem_pool_pop(pool, size + sizeof(Dav1dRef));
+    if (!buf) return NULL;
+
+    Dav1dRef *const res = &((Dav1dRef*)buf)[-1];
+    res->data = buf->data;
+    res->const_data = pool;
+    atomic_init(&res->ref_cnt, 1);
+    res->free_ref = 0;
+    res->free_callback = pool_free_callback;
+    res->user_data = buf;
 
     return res;
 }
@@ -59,6 +81,7 @@
     res->data = NULL;
     res->const_data = ptr;
     atomic_init(&res->ref_cnt, 1);
+    res->free_ref = 1;
     res->free_callback = free_callback;
     res->user_data = user_data;
 
@@ -76,8 +99,9 @@
     if (!ref) return;
 
     if (atomic_fetch_sub(&ref->ref_cnt, 1) == 1) {
+        const int free_ref = ref->free_ref;
         ref->free_callback(ref->const_data, ref->user_data);
-        free(ref);
+        if (free_ref) free(ref);
     }
     *pref = NULL;
 }
diff -Nru firefox-84.0.2+build1/third_party/dav1d/src/ref.h firefox-85.0+build1/third_party/dav1d/src/ref.h
--- firefox-84.0.2+build1/third_party/dav1d/src/ref.h	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/src/ref.h	2021-01-18 19:58:24.000000000 +0000
@@ -30,6 +30,9 @@
 
 #include "dav1d/dav1d.h"
 
+#include "src/mem.h"
+#include "src/thread.h"
+
 #include <stdatomic.h>
 #include <stddef.h>
 
@@ -37,11 +40,13 @@
     void *data;
     const void *const_data;
     atomic_int ref_cnt;
+    int free_ref;
     void (*free_callback)(const uint8_t *data, void *user_data);
     void *user_data;
 };
 
 Dav1dRef *dav1d_ref_create(size_t size);
+Dav1dRef *dav1d_ref_create_using_pool(Dav1dMemPool *pool, size_t size);
 Dav1dRef *dav1d_ref_wrap(const uint8_t *ptr,
                          void (*free_callback)(const uint8_t *data, void *user_data),
                          void *user_data);
diff -Nru firefox-84.0.2+build1/third_party/dav1d/tests/libfuzzer/meson.build firefox-85.0+build1/third_party/dav1d/tests/libfuzzer/meson.build
--- firefox-84.0.2+build1/third_party/dav1d/tests/libfuzzer/meson.build	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/tests/libfuzzer/meson.build	2021-01-18 19:58:24.000000000 +0000
@@ -72,8 +72,15 @@
 
 objcopy = find_program('objcopy',
                        required: false)
+
+if meson.version().version_compare('<0.56.99')
+    lto = get_option('b_lto') ? 'true' : 'false'
+else
+    lto = get_option('b_lto')
+endif
+
 if (objcopy.found() and
-    not get_option('b_lto') and
+    lto == 'false' and
     get_option('default_library') == 'static' and
     cc.has_function('posix_memalign', prefix : '#include <stdlib.h>', args : test_args))
 
diff -Nru firefox-84.0.2+build1/third_party/dav1d/THANKS.md firefox-85.0+build1/third_party/dav1d/THANKS.md
--- firefox-84.0.2+build1/third_party/dav1d/THANKS.md	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/dav1d/THANKS.md	2021-01-18 19:58:25.000000000 +0000
@@ -16,13 +16,16 @@
 
 And all the dav1d Authors (git shortlog -sn), including:
 
-Janne Grunau, Ronald S. Bultje, Martin Storsjö, Henrik Gramner, James Almer,
-Marvin Scholz, Luc Trudeau, Jean-Baptiste Kempf, Victorien Le Couviour--Tuffet,
-David Michael Barr, Hugo Beauzée-Luyssen, Steve Lhomme, Nathan E. Egge,
-Francois Cartegnie, Konstantin Pavlov, Liwei Wang, Xuefeng Jiang,
-Derek Buitenhuis, Raphaël Zumer, Niklas Haas, Michael Bradshaw, Kyle Siefring,
-Raphael Zumer, Boyuan Xiao, Thierry Foucu, Matthias Dressel, Thomas Daede,
-Rupert Swarbrick, Jan Beich, Dale Curtis, SmilingWolf, Tristan Laurent,
-Vittorio Giovara, Rostislav Pehlivanov, Shiz, skal, Steinar Midtskogen,
-Luca Barbato, Justin Bull, Jean-Yves Avenard, Timo Gurr, Fred Barbier,
-Anisse Astier, Pablo Stebler, Nicolas Frattaroli, Mark Shuttleworth.
+Martin Storsjö, Janne Grunau, Henrik Gramner, Ronald S. Bultje, James Almer,
+Marvin Scholz, Luc Trudeau, Victorien Le Couviour--Tuffet, Jean-Baptiste Kempf,
+Hugo Beauzée-Luyssen, Matthias Dressel, Konstantin Pavlov, David Michael Barr,
+Steve Lhomme, Niklas Haas, B Krishnan Iyer, Francois Cartegnie, Liwei Wang,
+Nathan E. Egge, Derek Buitenhuis, Michael Bradshaw, Raphaël Zumer,
+Xuefeng Jiang, Luca Barbato, Jan Beich, Wan-Teh Chang, Justin Bull, Boyuan Xiao,
+Dale Curtis, Kyle Siefring, Raphael Zumer, Rupert Swarbrick, Thierry Foucu,
+Thomas Daede, Colin Lee, Emmanuel Gil Peyrot, Lynne, Michail Alvanos,
+Nico Weber, SmilingWolf, Tristan Laurent, Vittorio Giovara, Anisse Astier,
+Dmitriy Sychov, Ewout ter Hoeven, Fred Barbier, Jean-Yves Avenard,
+Mark Shuttleworth, Matthieu Bouron, Nicolas Frattaroli, Pablo Stebler,
+Rostislav Pehlivanov, Shiz, Steinar Midtskogen, Sylvestre Ledru, Timo Gurr,
+Tristan Matthews, Xavier Claessens, Xu Guangxin, kossh1 and skal.
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/BUILD.gn	2021-01-18 19:58:25.000000000 +0000
@@ -10,6 +10,10 @@
 import("//build/config/ui.gni")
 import("../../webrtc.gni")
 
+if (build_with_mozilla) {
+  defines = [ "MULTI_MONITOR_SCREENSHARE" ]
+}
+
 use_desktop_capture_differ_sse2 = current_cpu == "x86" || current_cpu == "x64"
 
 rtc_static_library("primitives") {
@@ -155,18 +159,6 @@
   }
 }
 
-if (is_linux) {
-  if (rtc_use_pipewire) {
-    defines = [ "WEBRTC_USE_PIPEWIRE" ]
-    pkg_config("gio") {
-      packages = [
-        "gio-2.0",
-        "gio-unix-2.0",
-      ]
-    }
-  }
-}
-
 rtc_source_set("desktop_capture") {
   public_deps = [
     ":desktop_capture_generic",
@@ -302,8 +294,6 @@
   ]
 
   if (build_with_mozilla) {
-    defines = [ "MULTI_MONITOR_SCREENSHARE" ]
-
     sources += [
       "desktop_device_info.cc",
       "desktop_device_info.h",
@@ -326,7 +316,6 @@
   }
 
   if (use_x11 || rtc_use_pipewire) {
-    include_dirs = [ "/third_party/libwebrtc/third_party/pipewire" ]
     sources += [
       "mouse_cursor_monitor_linux.cc",
       "screen_capturer_linux.cc",
@@ -368,7 +357,6 @@
   }
 
   if (rtc_use_pipewire) {
-    include_dirs = [ "/third_party/libwebrtc/third_party/pipewire" ]
     sources += [
       "linux/base_capturer_pipewire.cc",
       "linux/base_capturer_pipewire.h",
@@ -378,10 +366,15 @@
       "linux/window_capturer_pipewire.h",
     ]
 
-    configs += [
-      ":gio",
-      ":pipewire",
-    ]
+    if (!build_with_mozilla) {
+      configs += [
+        ":gio",
+        ":pipewire",
+      ]
+    } else {
+      defines += [ "WEBRTC_USE_PIPEWIRE" ]
+      include_dirs += [ "/third_party/pipewire" ]
+    }
   }
 
   if (!is_win && !is_mac && !use_x11 && !rtc_use_pipewire) {
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build	2021-01-18 19:58:25.000000000 +0000
@@ -5,6 +5,8 @@
 
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 COMPILE_FLAGS["OS_INCLUDES"] = []
 AllowCompilerWarnings()
@@ -25,8 +27,7 @@
     "/ipc/chromium/src",
     "/ipc/glue",
     "/media/libyuv/libyuv/include/",
-    "/third_party/libwebrtc/webrtc/",
-    "/third_party/pipewire"
+    "/third_party/libwebrtc/webrtc/"
 ]
 
 UNIFIED_SOURCES += [
@@ -162,7 +163,6 @@
     DEFINES["WEBRTC_LINUX"] = True
     DEFINES["WEBRTC_POSIX"] = True
     DEFINES["_FILE_OFFSET_BITS"] = "64"
-    DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
 
     OS_LIBS += [
         "rt",
@@ -195,14 +195,6 @@
         "/third_party/libwebrtc/webrtc/modules/desktop_capture/window_capturer_linux.cc"
     ]
 
-    CXXFLAGS += CONFIG['TK_CFLAGS']
-
-    UNIFIED_SOURCES += [
-        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
-        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
-        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
-    ]
-
 if CONFIG["OS_TARGET"] == "NetBSD":
 
     DEFINES["USE_X11"] = "1"
@@ -393,6 +385,17 @@
 
     DEFINES["DISABLE_NACL"] = True
     DEFINES["NO_TCMALLOC"] = True
+    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+
+    LOCAL_INCLUDES += [
+        "/third_party/pipewire/"
+    ]
+
+    UNIFIED_SOURCES += [
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+    ]
 
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 
@@ -400,6 +403,32 @@
         "-msse2"
     ]
 
+    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+
+    LOCAL_INCLUDES += [
+        "/third_party/pipewire/"
+    ]
+
+    UNIFIED_SOURCES += [
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+    ]
+
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
+
+    DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+
+    LOCAL_INCLUDES += [
+        "/third_party/pipewire/"
+    ]
+
+    UNIFIED_SOURCES += [
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
+        "/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
+    ]
+
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "NetBSD":
 
     CXXFLAGS += [
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2021-01-18 19:58:25.000000000 +0000
@@ -401,6 +401,7 @@
     video_size_ = desktop_size_;
   }
 
+  rtc::CritScope lock(&current_frame_lock_);
   if (!current_frame_ ||
       (video_metadata_use_ && !video_size_.equals(video_size_prev))) {
     current_frame_ =
@@ -877,6 +878,7 @@
     return;
   }
 
+  rtc::CritScope lock(&current_frame_lock_);
   if (!current_frame_) {
     callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
     return;
@@ -898,17 +900,23 @@
   callback_->OnCaptureResult(Result::SUCCESS, std::move(result));
 }
 
+// Keep in sync with defines at browser/actors/WebRTCParent.jsm
+// With PipeWire we can't select which system resource is shared so
+// we don't create a window/screen list. Instead we place these constants
+// as window name/id so frontend code can identify PipeWire backend
+// and does not try to create screen/window preview.
+
+#define PIPEWIRE_ID   0xaffffff
+#define PIPEWIRE_NAME "####_PIPEWIRE_PORTAL_####"
+
 bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
-  RTC_DCHECK(sources->size() == 0);
-  // List of available screens is already presented by the xdg-desktop-portal.
-  // But we have to add an empty source as the code expects it.
-  sources->push_back({0});
+  sources->push_back({PIPEWIRE_ID, 0, PIPEWIRE_NAME});
   return true;
 }
 
 bool BaseCapturerPipeWire::SelectSource(SourceId id) {
   // Screen selection is handled by the xdg-desktop-portal.
-  return true;
+  return id == PIPEWIRE_ID;
 }
 
 // static
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h	2021-01-18 19:58:25.000000000 +0000
@@ -84,6 +84,7 @@
   DesktopSize desktop_size_ = {};
   DesktopCaptureOptions options_ = {};
 
+  rtc::CriticalSection current_frame_lock_;
   std::unique_ptr<uint8_t[]> current_frame_;
   Callback* callback_ = nullptr;
 
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/moz.build firefox-85.0+build1/third_party/libwebrtc/webrtc/moz.build
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/moz.build	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/moz.build	2021-01-18 19:58:25.000000000 +0000
@@ -186,9 +186,6 @@
         "/third_party/libwebrtc/webrtc/modules/video_capture/video_capture_internal_impl_gn",
         "/third_party/libwebrtc/webrtc/system_wrappers/cpu_features_linux_gn"
     ]
-    DIRS += [
-        "/third_party/pipewire/libpipewire"
-    ]
 
 if CONFIG["OS_TARGET"] == "NetBSD":
 
diff -Nru firefox-84.0.2+build1/third_party/libwebrtc/webrtc/webrtc.gni firefox-85.0+build1/third_party/libwebrtc/webrtc/webrtc.gni
--- firefox-84.0.2+build1/third_party/libwebrtc/webrtc/webrtc.gni	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/libwebrtc/webrtc/webrtc.gni	2021-01-18 19:58:25.000000000 +0000
@@ -71,7 +71,7 @@
   rtc_enable_bwe_test_logging = false
 
   # Set this to use PipeWire on the Wayland display server.
-  rtc_use_pipewire = false
+  rtc_use_pipewire = true
 
   rtc_enable_android_opensl = false
 
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/.cirrus.yml firefox-85.0+build1/third_party/python/psutil/.cirrus.yml
--- firefox-84.0.2+build1/third_party/python/psutil/.cirrus.yml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/.cirrus.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-freebsd_12_1_py3_task:
-  freebsd_instance:
-    image: freebsd-12-1-release-amd64
-  env:
-    CIRRUS: 1
-  install_script:
-    - pkg install -y python3 gcc py37-pip
-  script:
-    - python3 -m pip install --user setuptools
-    - make clean
-    - make install
-    - make test
-    - make test-memleaks
-    - PSUTIL_TESTING=1 python3 -Wa scripts/internal/print_access_denied.py
-    - PSUTIL_TESTING=1 python3 -Wa scripts/internal/print_api_speed.py
-
-freebsd_12_1_py2_task:
-  freebsd_instance:
-    image: freebsd-12-1-release-amd64
-  env:
-    CIRRUS: 1
-  install_script:
-    - pkg install -y python gcc py27-pip
-  script:
-    - python2.7 -m pip install --user setuptools ipaddress mock
-    - make clean
-    - make install
-    - make test
-    - make test-memleaks
-    - PSUTIL_TESTING=1 python3 -Wa scripts/internal/print_access_denied.py
-    - PSUTIL_TESTING=1 python3 -Wa scripts/internal/print_api_speed.py
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/.coveragerc firefox-85.0+build1/third_party/python/psutil/.coveragerc
--- firefox-84.0.2+build1/third_party/python/psutil/.coveragerc	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/.coveragerc	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-[report]
-
-include =
-    *psutil*
-omit =
-    psutil/_compat.py
-    psutil/tests/*
-    setup.py
-exclude_lines =
-    enum.IntEnum
-    except ImportError:
-    globals().update
-    if __name__ == .__main__.:
-    if _WINDOWS:
-    if BSD
-    if enum is None:
-    if enum is not None:
-    if FREEBSD
-    if has_enums:
-    if LINUX
-    if LITTLE_ENDIAN:
-    if NETBSD
-    if OPENBSD
-    if MACOS
-    if ppid_map is None:
-    if PY3:
-    if SUNOS
-    if sys.platform.startswith
-    if WINDOWS
-    import enum
-    pragma: no cover
-    raise NotImplementedError
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/CREDITS firefox-85.0+build1/third_party/python/psutil/CREDITS
--- firefox-84.0.2+build1/third_party/python/psutil/CREDITS	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/CREDITS	1970-01-01 00:00:00.000000000 +0000
@@ -1,666 +0,0 @@
-Intro
-=====
-
-I would like to recognize some of the people who have been instrumental in the
-development of psutil. I'm sure I'm forgetting somebody (feel free to email me)
-but here is a short list. It's modeled after the Linux CREDITS file where the
-fields are: name (N), e-mail (E), website (W), country (C), description (D),
-(I) issues. Issue tracker is at https://github.com/giampaolo/psutil/issues).
-A big thanks to all of you.
-
-- Giampaolo
-
-Author
-======
-
-N: Giampaolo Rodola
-C: Italy
-E: g.rodola@gmail.com
-W: http://grodola.blogspot.com/
-
-Experts
-=======
-
-Github usernames of people to CC on github when in need of help.
-
-- NetBSD:
-    - 0-wiz-0, Thomas Klausner
-    - ryoqun, Ryo Onodera
-- OpenBSD:
-    - landryb, Landry Breuil
-- FreeBSD:
-    - glebius, Gleb Smirnoff (#1013)
-    - sunpoet, Po-Chuan Hsieh (pkg maintainer, #1105)
-    - kostikbel, Konstantin Belousov (#1105)
-- macOS:
-    - whitlockjc, Jeremy Whitlock
-- Windows:
-    - mrjefftang, Jeff Tang
-    - wj32, Wen Jia Liu
-    - fbenkstein, Frank Benkstein
-- SunOS:
-    - wiggin15, Arnon Yaari
-    - alxchk, Oleksii Shevchuk
-- AIX:
-    - wiggin15, Arnon Yaari (maintainer)
-
-Top contributors
-================
-
-N: Jay Loden
-C: NJ, USA
-E: jloden@gmail.com
-D: original co-author, initial design/bootstrap and occasional bug fixes
-W: http://www.jayloden.com
-
-N: Arnon Yaari (wiggin15)
-W: https://github.com/wiggin15
-D: AIX implementation, expert on multiple fronts
-I: 517, 607, 610, 1131, 1123, 1130, 1154, 1164, 1174, 1177, 1210, 1214, 1408,
-   1329, 1276, 1494, 1528.
-
-N: Alex Manuskin
-W: https://github.com/amanusk
-D: FreeBSD cpu_freq(), OSX temperatures, support for Linux temperatures.
-I: 1284, 1345, 1350, 1352, 1472, 1481, 1487.
-
-N: Jeff Tang
-W: https://github.com/mrjefftang
-I: 340, 529, 616, 653, 654, 648, 641
-
-N: Jeremy Whitlock
-E: jcscoobyrs@gmail.com
-D: great help with macOS C development.
-I: 125, 150, 174, 206
-
-N: Landry Breuil
-W: https://github.com/landryb
-D: OpenBSD implementation.
-I: 615
-
-N: Justin Venus
-E: justin.venus@gmail.com
-D: Solaris support
-I: 18
-
-N: Thomas Klausner
-W: https://github.com/0-wiz-0
-D: NetBSD implementation (co-author).
-I: 557
-
-N: Ryo Onodera
-W: https://github.com/ryoon
-D: NetBSD implementation (co-author).
-I: 557
-
-Contributors
-============
-
-N: wj32
-E: wj32.64@gmail.com
-D: process username() and get_connections() on Windows
-I: 114, 115
-
-N: Yan Raber
-C: Bologna, Italy
-E: yanraber@gmail.com
-D: help on Windows development (initial version of Process.username())
-
-N: Dave Daeschler
-C: USA
-E: david.daeschler@gmail.com
-W: http://daviddaeschler.com
-D: some contributions to initial design/bootstrap plus occasional bug fixing
-I: 522, 536
-
-N: cjgohlke
-E: cjgohlke@gmail.com
-D: Windows 64 bit support
-I: 107
-
-N: Frank Benkstein
-D: process environ()
-W: https://github.com/fbenkstein
-I: 732, 733
-
-N: Mozilla Foundation
-D: sample code for process USS memory.
-
-N: EccoTheFlintstone
-W: https://github.com/EccoTheFlintstone
-I: 1368, 1348
-
-----
-
-N: Jeffery Kline
-E: jeffery.kline@gmail.com
-I: 130
-
-N: Grabriel Monnerat
-E: gabrielmonnerat@gmail.com
-I: 146
-
-N: Philip Roberts
-E: philip.roberts@gmail.com
-I: 168
-
-N: jcscoobyrs
-E: jcscoobyrs@gmail.com
-I: 125
-
-N: Sandro Tosi
-E: sandro.tosi@gmail.com
-I: 200, 201
-
-N: Andrew Colin
-E: andrew.colin@gmail.com
-I: 248
-
-N: Amoser
-E: amoser@google.com
-I: 266, 267, 340
-
-N: Matthew Grant
-E: matthewgrant5@gmail.com
-I: 271
-
-N: oweidner
-E: oweidner@cct.lsu.edu
-I: 275
-
-N: Tarek Ziade
-E: ziade.tarek
-I: 281
-
-N: Luca Cipriani
-C: Turin, Italy
-E: luca.opensource@gmail.com
-I: 278
-
-N: Maciej Lach,
-E: maciej.lach@gmail.com
-I: 294
-
-N: James Pye
-E: james.pye@gmail.com
-I: 305, 306
-
-N: Stanchev Emil
-E: stanchev.emil
-I: 314
-
-N: Kim Gräsman
-E: kim.grasman@gmail.com
-D: ...also kindly donated some money.
-I: 316
-
-N: Riccardo Murri
-C: Italy
-I: 318
-
-N: Florent Xicluna
-E: florent.xicluna@gmail.com
-I: 319
-
-N: Michal Spondr
-E: michal.spondr
-I: 313
-
-N: Jean Sebastien
-E: dumbboules@gmail.com
-I: 344
-
-N: Rob Smith
-W: http://www.kormoc.com/
-I: 341
-
-N: Youngsik Kim
-W: https://plus.google.com/101320747613749824490/
-I: 317
-
-N: Gregory Szorc
-W: https://plus.google.com/116873264322260110710/posts
-I: 323
-
-N: André Oriani
-E: aoriani@gmail.com
-I: 361
-
-N: clackwell
-E: clackwell@gmail.com
-I: 356
-
-N: m.malycha
-E: m.malycha@gmail.com
-I: 351
-
-N: John Baldwin
-E: jhb@FreeBSD.org
-I: 370
-
-N: Jan Beich
-E: jbeich@tormail.org
-I: 325
-
-N: floppymaster
-E: floppymaster@gmail.com
-I: 380
-
-N: Arfrever.FTA
-E: Arfrever.FTA@gmail.com
-I: 369, 404
-
-N: danudey
-E: danudey@gmail.com
-I: 386
-
-N: Adrien Fallou
-I: 224
-
-N: Gisle Vanem
-E: gisle.vanem@gmail.com
-I: 411
-
-N: thepyr0
-E: thepyr0@gmail.com
-I: 414
-
-N: John Pankov
-E: john.pankov@gmail.com
-I: 435
-
-N: Matt Good
-W: http://matt-good.net/
-I: 438
-
-N: Ulrich Klank
-E: ulrich.klank@scitics.de
-I: 448
-
-N: Josiah Carlson
-E: josiah.carlson@gmail.com
-I: 451, 452
-
-N: Raymond Hettinger
-D: namedtuple and lru_cache backward compatible implementations.
-
-N: Jason Kirtland
-D: backward compatible implementation of collections.defaultdict.
-
-M: Ken Seeho
-D: @cached_property decorator
-
-N: crusaderky
-E: crusaderky@gmail.com
-I: 470, 477
-
-E: alex@mroja.net
-I: 471
-
-N: Gautam Singh
-E: gautam.singh@gmail.com
-I: 466
-
-E: lhn@hupfeldtit.dk
-I: 476, 479
-
-N: Francois Charron
-E: francois.charron.1@gmail.com
-I: 474
-
-N: Naveed Roudsari
-E: naveed.roudsari@gmail.com
-I: 421
-
-N: Alexander Grothe
-E: Alexander.Grothe@gmail.com
-I: 497
-
-N: Szigeti Gabor Niif
-E: szigeti.gabor.niif@gmail.com
-I: 446
-
-N: msabramo
-E: msabramo@gmail.com
-I: 492
-
-N: Yaolong Huang
-E: airekans@gmail.com
-W: http://airekans.github.io/
-I: 530
-
-N: Anders Chrigström
-W: https://github.com/anders-chrigstrom
-I: 496
-
-N: spacewander
-W: https://github.com/spacewander
-E: spacewanderlzx@gmail.com
-I: 561, 603
-
-N: Sylvain Mouquet
-E: sylvain.mouquet@gmail.com
-I: 565
-
-N: karthikrev
-I: 568
-
-N: Bruno Binet
-E: bruno.binet@gmail.com
-I: 572
-
-N: Gabi Davar
-C: Israel
-W: https://github.com/mindw
-I: 578, 581, 587
-
-N: spacewanderlzx
-C: Guangzhou,China
-E: spacewanderlzx@gmail.com
-I: 555
-
-N: Fabian Groffen
-I: 611, 618
-
-N: desbma
-W: https://github.com/desbma
-C: France
-I: 628
-
-N: John Burnett
-W: http://www.johnburnett.com/
-C: Irvine, CA, US
-I: 614
-
-N: �rni Már Jónsson
-E: Reykjavik, Iceland
-E: https://github.com/arnimarj
-I: 634
-
-N: Bart van Kleef
-W: https://github.com/bkleef
-I: 664
-
-N: Steven Winfield
-W: https://github.com/stevenwinfield
-I: 672
-
-N: sk6249
-W: https://github.com/sk6249
-I: 670
-
-N: maozguttman
-W: https://github.com/maozguttman
-I: 659
-
-N: dasumin
-W: https://github.com/dasumin
-I: 541
-
-N: Mike Sarahan
-W: https://github.com/msarahan
-I: 688
-
-N: Syohei YOSHIDA
-W: https://github.com/syohex
-I: 730
-
-N: Visa Hankala
-E: visa@openbsd.org
-I: 741
-
-N: Sebastian-Gabriel Brestin
-C: Romania
-E: sebastianbrestin@gmail.com
-I: 704
-
-N: Timmy Konick
-W: https://github.com/tijko
-I: 751
-
-N: mpderbec
-W: https://github.com/mpderbec
-I: 660
-
-N: wxwright
-W: https://github.com/wxwright
-I: 776
-
-N: Farhan Khan
-E: khanzf@gmail.com
-I: 823
-
-N: Jake Omann
-E: https://github.com/jomann09
-I: 816, 775
-
-N: Jeremy Humble
-W: https://github.com/jhumble
-I: 863
-
-N: Ilya Georgievsky
-W: https://github.com/xBeAsTx
-I: 870
-
-N: Yago Jesus
-W: https://github.com/YJesus
-I: 798
-
-N: Andre Caron
-C: Montreal, QC, Canada
-E: andre.l.caron@gmail.com
-W: https://github.com/AndreLouisCaron
-I: 880
-
-N: ewedlund
-W: https://github.com/ewedlund
-I: 874
-
-N: Arcadiy Ivanov
-W: https://github.com/arcivanov
-I: 919
-
-N: Max Bélanger
-W: https://github.com/maxbelanger
-I: 936, 1133
-
-N: Pierre Fersing
-C: France
-E: pierre.fersing@bleemeo.com
-I: 950
-
-N: Thiago Borges Abdnur
-W: https://github.com/bolaum
-I: 959
-
-N: Nicolas Hennion
-W: https://github.com/nicolargo
-I: 974
-
-N: Baruch Siach
-W: https://github.com/baruchsiach
-I: 872
-
-N: Danek Duvall
-W: https://github.com/dhduvall
-I: 1002
-
-N: Alexander Hasselhuhn
-C: Germany
-W: https://github.com/alexanha
-
-N: Himanshu Shekhar
-W: https://github.com/himanshub16
-I: 1036
-
-N: Yannick Gingras
-W: https://github.com/ygingras
-I: 1057
-
-N: Gleb Smirnoff
-W: https://github.com/glebius
-D: good help with FreeBSD
-I: 1042, 1079, 1070
-
-N: Oleksii Shevchuk
-W: https://github.com/alxchk
-I: 1077, 1093, 1091, 1220, 1346
-
-N: Prodesire
-W: https://github.com/Prodesire
-I: 1138
-
-N: Sebastian Saip
-W: https://github.com/ssaip
-I: 1141
-
-N: Jakub Bacic
-W: https://github.com/jakub-bacic
-I: 1127
-
-N: Akos Kiss
-W: https://github.com/akosthekiss
-I: 1150
-
-N: Adrian Page
-W: https://github.com/adpag
-I: 1159, 1160, 1161
-
-N: Matthew Long
-W: https://github.com/matray
-I: 1167
-
-N: janderbrain
-W: https://github.com/janderbrain
-I: 1169
-
-N: Dan Vinakovsky
-W: https://github.com/hexaclock
-I: 1216
-
-N: stswandering
-W: https://github.com/stswandering
-I: 1243
-
-N: Georg Sauthoff
-W: https://github.com/gsauthof
-I: 1193, 1194
-
-N: Maxime Mouial
-W: https://github.com/hush-hush
-I: 1239
-
-N: Denis Krienbühl
-W: https://github.com/href
-I: 1260
-
-N: Jean-Luc Migot
-W: https://github.com/jmigot-tehtris
-I: 1258, 1289
-
-N: Nikhil Marathe
-W: https://github.com/nikhilm
-I: 1278
-
-N: Sylvain Duchesne
-W: https://github.com/sylvainduchesne
-I: 1294
-
-N: Lawrence Ye
-W: https://github.com/LEAFERx
-I: 1321
-
-N: Ilya Yanok
-W: https://github.com/yanok
-I: 1332
-
-N: Jaime Fullaondo
-W: https://github.com/truthbk
-D: AIX support
-I: 1320
-
-N: Koen Kooi
-W: https://github.com/koenkooi
-I: 1360
-
-N: Ghislain Le Meur
-W: https://github.com/gigi206
-D: idea for Process.parents()
-I: 1379
-
-N: Benjamin Drung
-D: make tests invariant to LANG setting
-W: https://github.com/bdrung
-I: 1462
-
-N: Xiaoling Bao
-I: 1223
-
-N: Cedric Lamoriniere
-W: https://github.com/clamoriniere
-I: 1470
-
-N: Daniel Beer
-W: https://github.com/dbeer1
-I: 1471
-
-N: Samer Masterson
-W: https://github.com/samertm
-I: 1480
-
-N: Ammar Askar
-E: ammar@ammaraskar.com
-W: http://ammaraskar.com/
-I: 604, 1484
-
-N: agnewee
-W: https://github.com/Agnewee
-C: China
-I: 1491
-
-N: Kamil Rytarowski
-W: https://github.com/krytarowski
-C: Poland
-I: 1526, 1530
-
-N: Athos Ribeiro
-W: https://github.com/athos-ribeiro
-I: 1585
-
-N: Erwan Le Pape
-W: https://github.com/erwan-le-pape
-I: 1570
-
-N: Étienne Servais
-W: https://github.com/vser1
-I: 1607, 1637
-
-N: Bernát Gábor
-W: https://github.com/gaborbernat
-I: 1565
-
-N: Nathan Houghton
-W: https://github.com/n1000
-I: 1619
-
-N: Riccardo Schirone
-W: https://github.com/ret2libc
-C: Milano, Italy
-I: 1616
-
-N: Po-Chuan Hsieh
-W: https://github.com/sunpoet
-C: Taiwan
-I: 1646
-
-N: Javad Karabi
-W: https://github.com/karabijavad
-I: 1648
-
-N: Mike Hommey
-W: https://github.com/glandium
-I: 1665
-
-N: Anselm Kruis
-W: https://github.com/akruis
-I: 1695
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/.gitignore firefox-85.0+build1/third_party/python/psutil/.gitignore
--- firefox-84.0.2+build1/third_party/python/psutil/.gitignore	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-syntax: glob
-*.al
-*.bak
-*.egg-info
-*.la
-*.lo
-*.o
-*.orig
-*.pyc
-*.pyd
-*.rej
-*.so
-*.swp
-.failed-tests.txt
-.cache/
-.idea/
-.tox/
-build/
-dist/
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/HISTORY.rst firefox-85.0+build1/third_party/python/psutil/HISTORY.rst
--- firefox-84.0.2+build1/third_party/python/psutil/HISTORY.rst	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/HISTORY.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,4141 +0,0 @@
-*Bug tracker at https://github.com/giampaolo/psutil/issues*
-
-5.7.0
-=====
-
-2020-12-18
-
-**Enhancements**
-
-- 1637_: [SunOS] add partial support for old SunOS 5.10 Update 0 to 3.
-- 1648_: [Linux] sensors_temperatures() looks into an additional /sys/device/
-  directory for additional data.  (patch by Javad Karabi)
-- 1652_: [Windows] dropped support for Windows XP and Windows Server 2003.
-  Minimum supported Windows version now is Windows Vista.
-- 1671_: [FreeBSD] add CI testing/service for FreeBSD (Cirrus CI).
-- 1677_: [Windows] process exe() will succeed for all process PIDs (instead of
-  raising AccessDenied).
-- 1679_: [Windows] net_connections() and Process.connections() are 10% faster.
-- 1682_: [PyPy] added CI / test integration for PyPy via Travis.
-- 1686_: [Windows] added support for PyPy on Windows.
-- 1693_: [Windows] boot_time(), Process.create_time() and users()'s login time
-  now have 1 micro second precision (before the precision was of 1 second).
-
-**Bug fixes**
-
-- 1538_: [NetBSD] process cwd() may return ENOENT instead of NoSuchProcess.
-- 1627_: [Linux] Process.memory_maps() can raise KeyError.
-- 1642_: [SunOS] querying basic info for PID 0 results in FileNotFoundError.
-- 1646_: [FreeBSD] many Process methods may cause a segfault on FreeBSD 12.0
-  due to a backward incompatible change in a C type introduced in 12.0.
-- 1656_: [Windows] Process.memory_full_info() raises AccessDenied even for the
-  current user and os.getpid().
-- 1660_: [Windows] Process.open_files() complete rewrite + check of errors.
-- 1662_: [Windows] process exe() may raise WinError 0.
-- 1665_: [Linux] disk_io_counters() does not take into account extra fields
-  added to recent kernels.  (patch by Mike Hommey)
-- 1672_: use the right C type when dealing with PIDs (int or long). Thus far
-  (long) was almost always assumed, which is wrong on most platforms.
-- 1673_: [OpenBSD] Process connections(), num_fds() and threads() returned
-  improper exception if process is gone.
-- 1674_: [SunOS] disk_partitions() may raise OSError.
-- 1684_: [Linux] disk_io_counters() may raise ValueError on systems not
-  having /proc/diskstats.
-- 1695_: [Linux] could not compile on kernels <= 2.6.13 due to
-  PSUTIL_HAVE_IOPRIO not being defined.  (patch by Anselm Kruis)
-
-5.6.7
-=====
-
-2019-11-26
-
-**Bug fixes**
-
-- 1630_: [Windows] can't compile source distribution due to C syntax error.
-
-5.6.6
-=====
-
-2019-11-25
-
-**Bug fixes**
-
-- 1179_: [Linux] Process cmdline() now takes into account misbehaving processes
-  renaming the command line and using inappropriate chars to separate args.
-- 1616_: use of Py_DECREF instead of Py_CLEAR will result in double free and
-  segfault
-  (`CVE-2019-18874 <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-18874>`__).
-  (patch by Riccardo Schirone)
-- 1619_: [OpenBSD] compilation fails due to C syntax error.  (patch by Nathan
-  Houghton)
-
-5.6.5
-=====
-
-2019-11-06
-
-**Bug fixes**
-
-- 1615_: remove pyproject.toml as it was causing installation issues.
-
-5.6.4
-=====
-
-2019-11-04
-
-**Enhancements**
-
-- 1527_: [Linux] added Process.cpu_times().iowait counter, which is the time
-  spent waiting for blocking I/O to complete.
-- 1565_: add PEP 517/8 build backend and requirements specification for better
-  pip integration.  (patch by Bernát Gábor)
-
-**Bug fixes**
-
-- 875_: [Windows] Process' cmdline(), environ() or cwd() may occasionally fail
-  with ERROR_PARTIAL_COPY which now gets translated to AccessDenied.
-- 1126_: [Linux] cpu_affinity() segfaults on CentOS 5 / manylinux.
-  cpu_affinity() support for CentOS 5 was removed.
-- 1528_: [AIX] compilation error on AIX 7.2 due to 32 vs 64 bit differences.
-  (patch by Arnon Yaari)
-- 1535_: 'type' and 'family' fields returned by net_connections() are not
-  always turned into enums.
-- 1536_: [NetBSD] process cmdline() erroneously raise ZombieProcess error if
-  cmdline has non encodable chars.
-- 1546_: usage percent may be rounded to 0 on Python 2.
-- 1552_: [Windows] getloadavg() math for calculating 5 and 15 mins values is
-  incorrect.
-- 1568_: [Linux] use CC compiler env var if defined.
-- 1570_: [Windows] `NtWow64*` syscalls fail to raise the proper error code
-- 1585_: [OSX] calling close() (in C) on possible negative integers.  (patch
-  by Athos Ribeiro)
-- 1606_: [SunOS] compilation fails on SunOS 5.10.  (patch by vser1)
-
-5.6.3
-=====
-
-2019-06-11
-
-**Enhancements**
-
-- 1494_: [AIX] added support for Process.environ().  (patch by Arnon Yaari)
-
-**Bug fixes**
-
-- 1276_: [AIX] can't get whole cmdline().  (patch by Arnon Yaari)
-- 1501_: [Windows] Process cmdline() and exe() raise unhandled "WinError 1168
-  element not found" exceptions for "Registry" and "Memory Compression" psuedo
-  processes on Windows 10.
-- 1526_: [NetBSD] process cmdline() could raise MemoryError.  (patch by
-  Kamil Rytarowski)
-
-5.6.2
-=====
-
-2019-04-26
-
-**Enhancements**
-
-- 604_: [Windows, Windows] add new psutil.getloadavg(), returning system load
-  average calculation, including on Windows (emulated).  (patch by Ammar Askar)
-- 1404_: [Linux] cpu_count(logical=False) uses a second method (read from
-  `/sys/devices/system/cpu/cpu[0-9]/topology/core_id`) in order to determine
-  the number of physical CPUs in case /proc/cpuinfo does not provide this info.
-- 1458_: provide coloured test output. Also show failures on KeyboardInterrupt.
-- 1464_: various docfixes (always point to python3 doc, fix links, etc.).
-- 1476_: [Windows] it is now possible to set process high I/O priority
-  (ionice()).Also, I/O priority values are now exposed as 4 new constants:
-  IOPRIO_VERYLOW, IOPRIO_LOW, IOPRIO_NORMAL, IOPRIO_HIGH.
-- 1478_: add make command to re-run tests failed on last run.
-
-**Bug fixes**
-
-- 1223_: [Windows] boot_time() may return value on Windows XP.
-- 1456_: [Linux] cpu_freq() returns None instead of 0.0 when min/max not
-  available (patch by Alex Manuskin)
-- 1462_: [Linux] (tests) make tests invariant to LANG setting (patch by
-  Benjamin Drung)
-- 1463_: cpu_distribution.py script was broken.
-- 1470_: [Linux] disk_partitions(): fix corner case when /etc/mtab doesn't
-  exist.  (patch by Cedric Lamoriniere)
-- 1471_: [SunOS] Process name() and cmdline() can return SystemError.  (patch
-  by Daniel Beer)
-- 1472_: [Linux] cpu_freq() does not return all CPUs on Rasbperry-pi 3.
-- 1474_: fix formatting of psutil.tests() which mimicks 'ps aux' output.
-- 1475_: [Windows] OSError.winerror attribute wasn't properly checked resuling
-  in WindowsError being raised instead of AccessDenied.
-- 1477_: [Windows] wrong or absent error handling for private NTSTATUS Windows
-  APIs. Different process methods were affected by this.
-- 1480_: [Windows] psutil.cpu_count(logical=False) could cause a crash due to
-  fixed read violation.  (patch by Samer Masterson)
-- 1486_: [AIX, SunOS] AttributeError when interacting with Process methods
-  involved into oneshot() context.
-- 1491_: [SunOS] net_if_addrs(): free() ifap struct on error.  (patch by
-  Agnewee)
-- 1493_: [Linux] cpu_freq(): handle the case where
-  /sys/devices/system/cpu/cpufreq/ exists but is empty.
-
-5.6.1
-=====
-
-2019-03-11
-
-**Bug fixes**
-
-- 1329_: [AIX] psutil doesn't compile on AIX 6.1.  (patch by Arnon Yaari)
-- 1448_: [Windows] crash on import due to rtlIpv6AddressToStringA not available
-  on Wine.
-- 1451_: [Windows] Process.memory_full_info() segfaults. NtQueryVirtualMemory
-  is now used instead of QueryWorkingSet to calculate USS memory.
-
-5.6.0
-=====
-
-2019-03-05
-
-**Enhancements**
-
-- 1379_: [Windows] Process suspend() and resume() now use NtSuspendProcess
-  and NtResumeProcess instead of stopping/resuming all threads of a process.
-  This is faster and more reliable (aka this is what ProcessHacker does).
-- 1420_: [Windows] in case of exception disk_usage() now also shows the path
-  name.
-- 1422_: [Windows] Windows APIs requiring to be dynamically loaded from DLL
-  libraries are now loaded only once on startup (instead of on per function
-  call) significantly speeding up different functions and methods.
-- 1426_: [Windows] PAGESIZE and number of processors is now calculated on
-  startup.
-- 1428_: in case of error, the traceback message now shows the underlying C
-  function called which failed.
-- 1433_: new Process.parents() method.  (idea by Ghislain Le Meur)
-- 1437_: pids() are returned in sorted order.
-- 1442_: python3 is now the default interpreter used by Makefile.
-
-**Bug fixes**
-
-- 1353_: process_iter() is now thread safe (it rarely raised TypeError).
-- 1394_: [Windows] Process name() and exe() may erroneously return "Registry".
-  QueryFullProcessImageNameW is now used instead of GetProcessImageFileNameW
-  in order to prevent that.
-- 1411_: [BSD] lack of Py_DECREF could cause segmentation fault on process
-  instantiation.
-- 1419_: [Windows] Process.environ() raises NotImplementedError when querying
-  a 64-bit process in 32-bit-WoW mode. Now it raises AccessDenied.
-- 1427_: [OSX] Process cmdline() and environ() may erroneously raise OSError
-  on failed malloc().
-- 1429_: [Windows] SE DEBUG was not properly set for current process. It is
-  now, and it should result in less AccessDenied exceptions for low-pid
-  processes.
-- 1432_: [Windows] Process.memory_info_ex()'s USS memory is miscalculated
-  because we're not using the actual system PAGESIZE.
-- 1439_: [NetBSD] Process.connections() may return incomplete results if using
-  oneshot().
-- 1447_: original exception wasn't turned into NSP/AD exceptions when using
-  Process.oneshot() ctx manager.
-
-**Incompatible API changes**
-
-- 1291_: [OSX] Process.memory_maps() was removed because inherently broken
-  (segfault) for years.
-
-5.5.1
-=====
-
-2019-02-15
-
-**Enhancements**
-
-- 1348_: [Windows] on Windows >= 8.1 if Process.cmdline() fails due to
-  ERROR_ACCESS_DENIED attempt using NtQueryInformationProcess +
-  ProcessCommandLineInformation. (patch by EccoTheFlintstone)
-
-**Bug fixes**
-
-- 1394_: [Windows] Process.exe() returns "[Error 0] The operation completed
-  successfully" when Python process runs in "Virtual Secure Mode".
-- 1402_: psutil exceptions' repr() show the internal private module path.
-- 1408_: [AIX] psutil won't compile on AIX 7.1 due to missing header.  (patch
-  by Arnon Yaari)
-
-5.5.0
-=====
-
-2019-01-23
-
-**Enhancements**
-
-- 1350_: [FreeBSD] added support for sensors_temperatures().  (patch by Alex
-  Manuskin)
-- 1352_: [FreeBSD] added support for CPU frequency.  (patch by Alex Manuskin)
-
-**Bug fixes**
-
-- 1111_: Process.oneshot() is now thread safe.
-- 1354_: [Linux] disk_io_counters() fails on Linux kernel 4.18+.
-- 1357_: [Linux] Process' memory_maps() and io_counters() method are no longer
-  exposed if not supported by the kernel.
-- 1368_: [Windows] fix psutil.Process().ionice(...) mismatch.  (patch by
-  EccoTheFlintstone)
-- 1370_: [Windows] improper usage of CloseHandle() may lead to override the
-  original error code when raising an exception.
-- 1373_: incorrect handling of cache in Process.oneshot() context causes
-  Process instances to return incorrect results.
-- 1376_: [Windows] OpenProcess() now uses PROCESS_QUERY_LIMITED_INFORMATION
-  access rights wherever possible, resulting in less AccessDenied exceptions
-  being thrown for system processes.
-- 1376_: [Windows] check if variable is NULL before free()ing it.  (patch by
-  EccoTheFlintstone)
-
-5.4.8
-=====
-
-2018-10-30
-
-**Enhancements**
-
-- 1197_: [Linux] cpu_freq() is now implemented by parsing /proc/cpuinfo in case
-  /sys/devices/system/cpu/* filesystem is not available.
-- 1310_: [Linux] psutil.sensors_temperatures() now parses /sys/class/thermal
-  in case /sys/class/hwmon fs is not available (e.g. Raspberry Pi).  (patch
-  by Alex Manuskin)
-- 1320_: [Posix] better compilation support when using g++ instead of gcc.
-  (patch by Jaime Fullaondo)
-
-**Bug fixes**
-
-- 715_: do not print exception on import time in case cpu_times() fails.
-- 1004_: [Linux] Process.io_counters() may raise ValueError.
-- 1277_: [OSX] available and used memory (psutil.virtual_memory()) metrics are
-  not accurate.
-- 1294_: [Windows] psutil.Process().connections() may sometimes fail with
-  intermittent 0xC0000001.  (patch by Sylvain Duchesne)
-- 1307_: [Linux] disk_partitions() does not honour PROCFS_PATH.
-- 1320_: [AIX] system CPU times (psutil.cpu_times()) were being reported with
-  ticks unit as opposed to seconds.  (patch by Jaime Fullaondo)
-- 1332_: [OSX] psutil debug messages are erroneously printed all the time.
-  (patch by Ilya Yanok)
-- 1346_: [SunOS] net_connections() returns an empty list.  (patch by Oleksii
-  Shevchuk)
-
-5.4.7
-=====
-
-2018-08-14
-
-**Enhancements**
-
-- 1286_: [macOS] psutil.OSX constant is now deprecated in favor of new
-  psutil.MACOS.
-- 1309_: [Linux] added psutil.STATUS_PARKED constant for Process.status().
-- 1321_: [Linux] add disk_io_counters() dual implementation relying on
-  /sys/block filesystem in case /proc/diskstats is not available. (patch by
-  Lawrence Ye)
-
-**Bug fixes**
-
-- 1209_: [macOS] Process.memory_maps() may fail with EINVAL due to poor
-  task_for_pid() syscall. AccessDenied is now raised instead.
-- 1278_: [macOS] Process.threads() incorrectly return microseconds instead of
-  seconds. (patch by Nikhil Marathe)
-- 1279_: [Linux, macOS, BSD] net_if_stats() may return ENODEV.
-- 1294_: [Windows] psutil.Process().connections() may sometime fail with
-  MemoryError.  (patch by sylvainduchesne)
-- 1305_: [Linux] disk_io_stats() may report inflated r/w bytes values.
-- 1309_: [Linux] Process.status() is unable to recognize "idle" and "parked"
-  statuses (returns '?').
-- 1313_: [Linux] disk_io_counters() can report inflated IO counters due to
-  erroneously counting base disk device and its partition(s) twice.
-- 1323_: [Linux] sensors_temperatures() may fail with ValueError.
-
-5.4.6
-=====
-
-2018-06-07
-
-**Bug fixes**
-
-- 1258_: [Windows] Process.username() may cause a segfault (Python interpreter
-  crash).  (patch by Jean-Luc Migot)
-- 1273_: net_if_addr() namedtuple's name has been renamed from "snic" to
-  "snicaddr".
-- 1274_: [Linux] there was a small chance Process.children() may swallow
-  AccessDenied exceptions.
-
-5.4.5
-=====
-
-2018-04-14
-
-**Bug fixes**
-
-- 1268_: setup.py's extra_require parameter requires latest setuptools version,
-  breaking quite a lot of installations.
-
-5.4.4
-=====
-
-2018-04-13
-
-**Enhancements**
-
-- 1239_: [Linux] expose kernel "slab" memory for psutil.virtual_memory().
-  (patch by Maxime Mouial)
-
-**Bug fixes**
-
-- 694_: [SunOS] cmdline() could be truncated at the 15th character when
-  reading it from /proc. An extra effort is made by reading it from process
-  address space first.  (patch by Georg Sauthoff)
-- 771_: [Windows] cpu_count() (both logical and physical) return a wrong
-  (smaller) number on systems using process groups (> 64 cores).
-- 771_: [Windows] cpu_times(percpu=True) return fewer CPUs on systems using
-  process groups (> 64 cores).
-- 771_: [Windows] cpu_stats() and cpu_freq() may return incorrect results on
-  systems using process groups (> 64 cores).
-- 1193_: [SunOS] Return uid/gid from /proc/pid/psinfo if there aren't
-  enough permissions for /proc/pid/cred.  (patch by Georg Sauthoff)
-- 1194_: [SunOS] Return nice value from psinfo as getpriority() doesn't
-  support real-time processes.  (patch by Georg Sauthoff)
-- 1194_: [SunOS] Fix double free in psutil_proc_cpu_num().  (patch by Georg
-  Sauthoff)
-- 1194_: [SunOS] Fix undefined behavior related to strict-aliasing rules
-  and warnings.  (patch by Georg Sauthoff)
-- 1210_: [Linux] cpu_percent() steal time may remain stuck at 100% due to Linux
-  erroneously reporting a decreased steal time between calls. (patch by Arnon
-  Yaari)
-- 1216_: fix compatibility with python 2.6 on Windows (patch by Dan Vinakovsky)
-- 1222_: [Linux] Process.memory_full_info() was erroneously summing "Swap:" and
-  "SwapPss:". Same for "Pss:" and "SwapPss". Not anymore.
-- 1224_: [Windows] Process.wait() may erroneously raise TimeoutExpired.
-- 1238_: [Linux] sensors_battery() may return None in case battery is not
-  listed as "BAT0" under /sys/class/power_supply.
-- 1240_: [Windows] cpu_times() float loses accuracy in a long running system.
-  (patch by stswandering)
-- 1245_: [Linux] sensors_temperatures() may fail with IOError "no such file".
-- 1255_: [FreeBSD] swap_memory() stats were erroneously represented in KB.
-  (patch by Denis Krienbühl)
-
-**Backward compatibility**
-
-- 771_: [Windows] cpu_count(logical=False) on Windows XP and Vista is no
-  longer supported and returns None.
-
-5.4.3
-=====
-
-*2018-01-01*
-
-**Enhancements**
-
-- 775_: disk_partitions() on Windows return mount points.
-
-**Bug fixes**
-
-- 1193_: pids() may return False on macOS.
-
-5.4.2
-=====
-
-*2017-12-07*
-
-**Enhancements**
-
-- 1173_: introduced PSUTIL_DEBUG environment variable which can be set in order
-  to print useful debug messages on stderr (useful in case of nasty errors).
-- 1177_: added support for sensors_battery() on macOS.  (patch by Arnon Yaari)
-- 1183_: Process.children() is 2x faster on UNIX and 2.4x faster on Linux.
-- 1188_: deprecated method Process.memory_info_ex() now warns by using
-  FutureWarning instead of DeprecationWarning.
-
-**Bug fixes**
-
-- 1152_: [Windows] disk_io_counters() may return an empty dict.
-- 1169_: [Linux] users() "hostname" returns username instead.  (patch by
-  janderbrain)
-- 1172_: [Windows] `make test` does not work.
-- 1179_: [Linux] Process.cmdline() is now able to splits cmdline args for
-  misbehaving processes which overwrite /proc/pid/cmdline and use spaces
-  instead of null bytes as args separator.
-- 1181_: [macOS] Process.memory_maps() may raise ENOENT.
-- 1187_: [macOS] pids() does not return PID 0 on recent macOS versions.
-
-5.4.1
-=====
-
-*2017-11-08*
-
-**Enhancements**
-
-- 1164_: [AIX] add support for Process.num_ctx_switches().  (patch by Arnon
-  Yaari)
-- 1053_: abandon Python 3.3 support (psutil still works but it's no longer
-  tested).
-
-**Bug fixes**
-
-- 1150_: [Windows] when a process is terminate()d now the exit code is set to
-  SIGTERM instead of 0.  (patch by Akos Kiss)
-- 1151_: python -m psutil.tests fail
-- 1154_: [AIX] psutil won't compile on AIX 6.1.0.  (patch by Arnon Yaari)
-- 1167_: [Windows] net_io_counter() packets count now include also non-unicast
-  packets.  (patch by Matthew Long)
-
-5.4.0
-=====
-
-*2017-10-12*
-
-**Enhancements**
-
-- 1123_: [AIX] added support for AIX platform.  (patch by Arnon Yaari)
-
-**Bug fixes**
-
-- 1009_: [Linux] sensors_temperatures() may crash with IOError.
-- 1012_: [Windows] disk_io_counters()'s read_time and write_time were expressed
-  in tens of micro seconds instead of milliseconds.
-- 1127_: [macOS] invalid reference counting in Process.open_files() may lead to
-  segfault.  (patch by Jakub Bacic)
-- 1129_: [Linux] sensors_fans() may crash with IOError.  (patch by Sebastian
-  Saip)
-- 1131_: [SunOS] fix compilation warnings.  (patch by Arnon Yaari)
-- 1133_: [Windows] can't compile on newer versions of Visual Studio 2017 15.4.
-  (patch by Max Bélanger)
-- 1138_: [Linux] can't compile on CentOS 5.0 and RedHat 5.0.
-  (patch by Prodesire)
-
-5.3.1
-=====
-
-*2017-09-10*
-
-**Enhancements**
-
-- 1124_: documentation moved to http://psutil.readthedocs.io
-
-**Bug fixes**
-
-- 1105_: [FreeBSD] psutil does not compile on FreeBSD 12.
-- 1125_: [BSD] net_connections() raises TypeError.
-
-**Compatibility notes**
-
-- 1120_: .exe files for Windows are no longer uploaded on PyPI as per PEP-527;
-  only wheels are provided.
-
-5.3.0
-=====
-
-*2017-09-01*
-
-**Enhancements**
-
-- 802_: disk_io_counters() and net_io_counters() numbers no longer wrap
-  (restart from 0). Introduced a new "nowrap" argument.
-- 928_: psutil.net_connections() and psutil.Process.connections() "laddr" and
-  "raddr" are now named tuples.
-- 1015_: swap_memory() now relies on /proc/meminfo instead of sysinfo() syscall
-  so that it can be used in conjunction with PROCFS_PATH in order to retrieve
-  memory info about Linux containers such as Docker and Heroku.
-- 1022_: psutil.users() provides a new "pid" field.
-- 1025_: process_iter() accepts two new parameters in order to invoke
-  Process.as_dict(): "attrs" and "ad_value". With this you can iterate over all
-  processes in one shot without needing to catch NoSuchProcess and do list/dict
-  comprehensions.
-- 1040_: implemented full unicode support.
-- 1051_: disk_usage() on Python 3 is now able to accept bytes.
-- 1058_: test suite now enables all warnings by default.
-- 1060_: source distribution is dynamically generated so that it only includes
-  relevant files.
-- 1079_: [FreeBSD] net_connections()'s fd number is now being set for real
-  (instead of -1).  (patch by Gleb Smirnoff)
-- 1091_: [SunOS] implemented Process.environ().  (patch by Oleksii Shevchuk)
-
-**Bug fixes**
-
-- 989_: [Windows] boot_time() may return a negative value.
-- 1007_: [Windows] boot_time() can have a 1 sec fluctuation between calls; the
-  value of the first call is now cached so that boot_time() always returns the
-  same value if fluctuation is <= 1 second.
-- 1013_: [FreeBSD] psutil.net_connections() may return incorrect PID.  (patch
-  by Gleb Smirnoff)
-- 1014_: [Linux] Process class can mask legitimate ENOENT exceptions as
-  NoSuchProcess.
-- 1016_: disk_io_counters() raises RuntimeError on a system with no disks.
-- 1017_: net_io_counters() raises RuntimeError on a system with no network
-  cards installed.
-- 1021_: [Linux] open_files() may erroneously raise NoSuchProcess instead of
-  skipping a file which gets deleted while open files are retrieved.
-- 1029_: [macOS, FreeBSD] Process.connections('unix') on Python 3 doesn't
-  properly handle unicode paths and may raise UnicodeDecodeError.
-- 1033_: [macOS, FreeBSD] memory leak for net_connections() and
-  Process.connections() when retrieving UNIX sockets (kind='unix').
-- 1040_: fixed many unicode related issues such as UnicodeDecodeError on
-  Python 3 + UNIX and invalid encoded data on Windows.
-- 1042_: [FreeBSD] psutil won't compile on FreeBSD 12.
-- 1044_: [macOS] different Process methods incorrectly raise AccessDenied for
-  zombie processes.
-- 1046_: [Windows] disk_partitions() on Windows overrides user's SetErrorMode.
-- 1047_: [Windows] Process username(): memory leak in case exception is thrown.
-- 1048_: [Windows] users()'s host field report an invalid IP address.
-- 1050_: [Windows] Process.memory_maps memory() leaks memory.
-- 1055_: cpu_count() is no longer cached; this is useful on systems such as
-  Linux where CPUs can be disabled at runtime. This also reflects on
-  Process.cpu_percent() which no longer uses the cache.
-- 1058_: fixed Python warnings.
-- 1062_: disk_io_counters() and net_io_counters() raise TypeError if no disks
-  or NICs are installed on the system.
-- 1063_: [NetBSD] net_connections() may list incorrect sockets.
-- 1064_: [NetBSD] swap_memory() may segfault in case of error.
-- 1065_: [OpenBSD] Process.cmdline() may raise SystemError.
-- 1067_: [NetBSD] Process.cmdline() leaks memory if process has terminated.
-- 1069_: [FreeBSD] Process.cpu_num() may return 255 for certain kernel
-  processes.
-- 1071_: [Linux] cpu_freq() may raise IOError on old RedHat distros.
-- 1074_: [FreeBSD] sensors_battery() raises OSError in case of no battery.
-- 1075_: [Windows] net_if_addrs(): inet_ntop() return value is not checked.
-- 1077_: [SunOS] net_if_addrs() shows garbage addresses on SunOS 5.10.
-  (patch by Oleksii Shevchuk)
-- 1077_: [SunOS] net_connections() does not work on SunOS 5.10. (patch by
-  Oleksii Shevchuk)
-- 1079_: [FreeBSD] net_connections() didn't list locally connected sockets.
-  (patch by Gleb Smirnoff)
-- 1085_: cpu_count() return value is now checked and forced to None if <= 1.
-- 1087_: Process.cpu_percent() guard against cpu_count() returning None and
-  assumes 1 instead.
-- 1093_: [SunOS] memory_maps() shows wrong 64 bit addresses.
-- 1094_: [Windows] psutil.pid_exists() may lie. Also, all process APIs relying
-  on OpenProcess Windows API now check whether the PID is actually running.
-- 1098_: [Windows] Process.wait() may erroneously return sooner, when the PID
-  is still alive.
-- 1099_: [Windows] Process.terminate() may raise AccessDenied even if the
-  process already died.
-- 1101_: [Linux] sensors_temperatures() may raise ENODEV.
-
-**Porting notes**
-
-- 1039_: returned types consolidation:
-  - Windows / Process.cpu_times(): fields #3 and #4 were int instead of float
-  - Linux / FreeBSD: connections('unix'): raddr is now set to "" instead of
-    None
-  - OpenBSD: connections('unix'): laddr and raddr are now set to "" instead of
-    None
-- 1040_: all strings are encoded by using OS fs encoding.
-- 1040_: the following Windows APIs on Python 2 now return a string instead of
-  unicode:
-  - Process.memory_maps().path
-  - WindowsService.bin_path()
-  - WindowsService.description()
-  - WindowsService.display_name()
-  - WindowsService.username()
-
-5.2.2
-=====
-
-*2017-04-10*
-
-**Bug fixes**
-
-- 1000_: fixed some setup.py warnings.
-- 1002_: [SunOS] remove C macro which will not be available on new Solaris
-  versions. (patch by Danek Duvall)
-- 1004_: [Linux] Process.io_counters() may raise ValueError.
-- 1006_: [Linux] cpu_freq() may return None on some Linux versions does not
-  support the function; now the function is not declared instead.
-- 1009_: [Linux] sensors_temperatures() may raise OSError.
-- 1010_: [Linux] virtual_memory() may raise ValueError on Ubuntu 14.04.
-
-5.2.1
-=====
-
-*2017-03-24*
-
-**Bug fixes**
-
-- 981_: [Linux] cpu_freq() may return an empty list.
-- 993_: [Windows] Process.memory_maps() on Python 3 may raise
-  UnicodeDecodeError.
-- 996_: [Linux] sensors_temperatures() may not show all temperatures.
-- 997_: [FreeBSD] virtual_memory() may fail due to missing sysctl parameter on
-  FreeBSD 12.
-
-5.2.0
-=====
-
-*2017-03-05*
-
-**Enhancements**
-
-- 971_: [Linux] Add psutil.sensors_fans() function.  (patch by Nicolas Hennion)
-- 976_: [Windows] Process.io_counters() has 2 new fields: *other_count* and
-  *other_bytes*.
-- 976_: [Linux] Process.io_counters() has 2 new fields: *read_chars* and
-  *write_chars*.
-
-**Bug fixes**
-
-- 872_: [Linux] can now compile on Linux by using MUSL C library.
-- 985_: [Windows] Fix a crash in `Process.open_files` when the worker thread
-  for `NtQueryObject` times out.
-- 986_: [Linux] Process.cwd() may raise NoSuchProcess instead of ZombieProcess.
-
-5.1.3
-=====
-
-**Bug fixes**
-
-- 971_: [Linux] sensors_temperatures() didn't work on CentOS 7.
-- 973_: cpu_percent() may raise ZeroDivisionError.
-
-5.1.2
-=====
-
-*2017-02-03*
-
-**Bug fixes**
-
-- 966_: [Linux] sensors_battery().power_plugged may erroneously return None on
-  Python 3.
-- 968_: [Linux] disk_io_counters() raises TypeError on python 3.
-- 970_: [Linux] sensors_battery()'s name and label fields on Python 3 are bytes
-  instead of str.
-
-5.1.1
-=====
-
-*2017-02-03*
-
-**Enhancements**
-
-- 966_: [Linux] sensors_battery().percent is a float and is more precise.
-
-**Bug fixes**
-
-- 964_: [Windows] Process.username() and psutil.users() may return badly
-  decoding character on Python 3.
-- 965_: [Linux] disk_io_counters() may miscalculate sector size and report the
-  wrong number of bytes read and written.
-- 966_: [Linux] sensors_battery() may fail with "no such file error".
-- 966_: [Linux] sensors_battery().power_plugged may lie.
-
-5.1.0
-=====
-
-*2017-02-01*
-
-**Enhancements**
-
-- 357_: added psutil.Process.cpu_num() (what CPU a process is on).
-- 371_: added psutil.sensors_temperatures() (Linux only).
-- 941_: added psutil.cpu_freq() (CPU frequency).
-- 955_: added psutil.sensors_battery() (Linux, Windows, only).
-- 956_: cpu_affinity([]) can now be used as an alias to set affinity against
-  all eligible CPUs.
-
-**Bug fixes**
-
-- 687_: [Linux] pid_exists() no longer returns True if passed a process thread
-  ID.
-- 948_: cannot install psutil with PYTHONOPTIMIZE=2.
-- 950_: [Windows] Process.cpu_percent() was calculated incorrectly and showed
-  higher number than real usage.
-- 951_: [Windows] the uploaded wheels for Python 3.6 64 bit didn't work.
-- 959_: psutil exception objects could not be pickled.
-- 960_: Popen.wait() did not return the correct negative exit status if process
-  is ``kill()``ed by a signal.
-- 961_: [Windows] WindowsService.description() may fail with
-  ERROR_MUI_FILE_NOT_FOUND.
-
-5.0.1
-=====
-
-*2016-12-21*
-
-**Enhancements**
-
-- 939_: tar.gz distribution went from 1.8M to 258K.
-- 811_: [Windows] provide a more meaningful error message if trying to use
-  psutil on unsupported Windows XP.
-
-**Bug fixes**
-
-- 609_: [SunOS] psutil does not compile on Solaris 10.
-- 936_: [Windows] fix compilation error on VS 2013 (patch by Max Bélanger).
-- 940_: [Linux] cpu_percent() and cpu_times_percent() was calculated
-  incorrectly as "iowait", "guest" and "guest_nice" times were not properly
-  taken into account.
-- 944_: [OpenBSD] psutil.pids() was omitting PID 0.
-
-5.0.0
-=====
-
-*2016-11-06*
-
-**Enhncements**
-
-- 799_: new Process.oneshot() context manager making Process methods around
-  +2x faster in general and from +2x to +6x faster on Windows.
-- 943_: better error message in case of version conflict on import.
-
-**Bug fixes**
-
-- 932_: [NetBSD] net_connections() and Process.connections() may fail without
-  raising an exception.
-- 933_: [Windows] memory leak in cpu_stats() and WindowsService.description().
-
-4.4.2
-=====
-
-*2016-10-26*
-
-**Bug fixes**
-
-- 931_: psutil no longer compiles on Solaris.
-
-4.4.1
-=====
-
-*2016-10-25*
-
-**Bug fixes**
-
-- 927_: ``Popen.__del__`` may cause maximum recursion depth error.
-
-4.4.0
-=====
-
-*2016-10-23*
-
-**Enhancements**
-
-- 874_: [Windows] net_if_addrs() returns also the netmask.
-- 887_: [Linux] virtual_memory()'s 'available' and 'used' values are more
-  precise and match "free" cmdline utility.  "available" also takes into
-  account LCX containers preventing "available" to overflow "total".
-- 891_: procinfo.py script has been updated and provides a lot more info.
-
-**Bug fixes**
-
-- 514_: [macOS] possibly fix Process.memory_maps() segfault (critical!).
-- 783_: [macOS] Process.status() may erroneously return "running" for zombie
-  processes.
-- 798_: [Windows] Process.open_files() returns and empty list on Windows 10.
-- 825_: [Linux] cpu_affinity; fix possible double close and use of unopened
-  socket.
-- 880_: [Windows] Handle race condition inside psutil_net_connections.
-- 885_: ValueError is raised if a negative integer is passed to cpu_percent()
-  functions.
-- 892_: [Linux] Process.cpu_affinity([-1]) raise SystemError with no error
-  set; now ValueError is raised.
-- 906_: [BSD] disk_partitions(all=False) returned an empty list. Now the
-  argument is ignored and all partitions are always returned.
-- 907_: [FreeBSD] Process.exe() may fail with OSError(ENOENT).
-- 908_: [macOS, BSD] different process methods could errounesuly mask the real
-  error for high-privileged PIDs and raise NoSuchProcess and AccessDenied
-  instead of OSError and RuntimeError.
-- 909_: [macOS] Process open_files() and connections() methods may raise
-  OSError with no exception set if process is gone.
-- 916_: [macOS] fix many compilation warnings.
-
-4.3.1
-=====
-
-*2016-09-01*
-
-**Enhancements**
-
-- 881_: "make install" now works also when using a virtual env.
-
-**Bug fixes**
-
-- 854_: Process.as_dict() raises ValueError if passed an erroneous attrs name.
-- 857_: [SunOS] Process cpu_times(), cpu_percent(), threads() amd memory_maps()
-  may raise RuntimeError if attempting to query a 64bit process with a 32bit
-  python. "Null" values are returned as a fallback.
-- 858_: Process.as_dict() should not return memory_info_ex() because it's
-  deprecated.
-- 863_: [Windows] memory_map truncates addresses above 32 bits
-- 866_: [Windows] win_service_iter() and services in general are not able to
-  handle unicode service names / descriptions.
-- 869_: [Windows] Process.wait() may raise TimeoutExpired with wrong timeout
-  unit (ms instead of sec).
-- 870_: [Windows] Handle leak inside psutil_get_process_data.
-
-4.3.0
-=====
-
-*2016-06-18*
-
-**Enhancements**
-
-- 819_: [Linux] different speedup improvements:
-  Process.ppid() is 20% faster
-  Process.status() is 28% faster
-  Process.name() is 25% faster
-  Process.num_threads is 20% faster on Python 3
-
-**Bug fixes**
-
-- 810_: [Windows] Windows wheels are incompatible with pip 7.1.2.
-- 812_: [NetBSD] fix compilation on NetBSD-5.x.
-- 823_: [NetBSD] virtual_memory() raises TypeError on Python 3.
-- 829_: [UNIX] psutil.disk_usage() percent field takes root reserved space
-  into account.
-- 816_: [Windows] fixed net_io_counter() values wrapping after 4.3GB in
-  Windows Vista (NT 6.0) and above using 64bit values from newer win APIs.
-
-4.2.0
-=====
-
-*2016-05-14*
-
-**Enhancements**
-
-- 795_: [Windows] new APIs to deal with Windows services: win_service_iter()
-  and win_service_get().
-- 800_: [Linux] psutil.virtual_memory() returns a new "shared" memory field.
-- 819_: [Linux] speedup /proc parsing:
-  - Process.ppid() is 20% faster
-  - Process.status() is 28% faster
-  - Process.name() is 25% faster
-  - Process.num_threads is 20% faster on Python 3
-
-**Bug fixes**
-
-- 797_: [Linux] net_if_stats() may raise OSError for certain NIC cards.
-- 813_: Process.as_dict() should ignore extraneous attribute names which gets
-  attached to the Process instance.
-
-4.1.0
-=====
-
-*2016-03-12*
-
-**Enhancements**
-
-- 777_: [Linux] Process.open_files() on Linux return 3 new fields: position,
-  mode and flags.
-- 779_: Process.cpu_times() returns two new fields, 'children_user' and
-  'children_system' (always set to 0 on macOS and Windows).
-- 789_: [Windows] psutil.cpu_times() return two new fields: "interrupt" and
-  "dpc". Same for psutil.cpu_times_percent().
-- 792_: new psutil.cpu_stats() function returning number of CPU ctx switches
-  interrupts, soft interrupts and syscalls.
-
-**Bug fixes**
-
-- 774_: [FreeBSD] net_io_counters() dropout is no longer set to 0 if the kernel
-  provides it.
-- 776_: [Linux] Process.cpu_affinity() may erroneously raise NoSuchProcess.
-  (patch by wxwright)
-- 780_: [macOS] psutil does not compile with some gcc versions.
-- 786_: net_if_addrs() may report incomplete MAC addresses.
-- 788_: [NetBSD] virtual_memory()'s buffers and shared values were set to 0.
-- 790_: [macOS] psutil won't compile on macOS 10.4.
-
-4.0.0
-=====
-
-*2016-02-17*
-
-**Enhancements**
-
-- 523_: [Linux, FreeBSD] disk_io_counters() return a new "busy_time" field.
-- 660_: [Windows] make.bat is smarter in finding alternative VS install
-  locations.  (patch by mpderbec)
-- 732_: Process.environ().  (patch by Frank Benkstein)
-- 753_: [Linux, macOS, Windows] Process USS and PSS (Linux) "real" memory stats.
-  (patch by Eric Rahm)
-- 755_: Process.memory_percent() "memtype" parameter.
-- 758_: tests now live in psutil namespace.
-- 760_: expose OS constants (psutil.LINUX, psutil.macOS, etc.)
-- 756_: [Linux] disk_io_counters() return 2 new fields: read_merged_count and
-  write_merged_count.
-- 762_: new scripts/procsmem.py script.
-
-**Bug fixes**
-
-- 685_: [Linux] virtual_memory() provides wrong results on systems with a lot
-  of physical memory.
-- 704_: [Solaris] psutil does not compile on Solaris sparc.
-- 734_: on Python 3 invalid UTF-8 data is not correctly handled for process
-  name(), cwd(), exe(), cmdline() and open_files() methods resulting in
-  UnicodeDecodeError exceptions. 'surrogateescape' error handler is now
-  used as a workaround for replacing the corrupted data.
-- 737_: [Windows] when the bitness of psutil and the target process was
-  different cmdline() and cwd() could return a wrong result or incorrectly
-  report an AccessDenied error.
-- 741_: [OpenBSD] psutil does not compile on mips64.
-- 751_: [Linux] fixed call to Py_DECREF on possible Null object.
-- 754_: [Linux] cmdline() can be wrong in case of zombie process.
-- 759_: [Linux] Process.memory_maps() may return paths ending with " (deleted)"
-- 761_: [Windows] psutil.boot_time() wraps to 0 after 49 days.
-- 764_: [NetBSD] fix compilation on NetBSD-6.x.
-- 766_: [Linux] net_connections() can't handle malformed /proc/net/unix file.
-- 767_: [Linux] disk_io_counters() may raise ValueError on 2.6 kernels and it's
-  broken on 2.4 kernels.
-- 770_: [NetBSD] disk_io_counters() metrics didn't update.
-
-3.4.2
-=====
-
-*2016-01-20*
-
-**Enhancements**
-
-- 728_: [Solaris] exposed psutil.PROCFS_PATH constant to change the default
-  location of /proc filesystem.
-
-**Bug fixes**
-
-- 724_: [FreeBSD] psutil.virtual_memory().total is incorrect.
-- 730_: [FreeBSD] psutil.virtual_memory() crashes.
-
-3.4.1
-=====
-
-*2016-01-15*
-
-**Enhancements**
-
-- 557_: [NetBSD] added NetBSD support.  (contributed by Ryo Onodera and
-  Thomas Klausner)
-- 708_: [Linux] psutil.net_connections() and Process.connections() on Python 2
-  can be up to 3x faster in case of many connections.
-  Also psutil.Process.memory_maps() is slightly faster.
-- 718_: process_iter() is now thread safe.
-
-**Bug fixes**
-
-- 714_: [OpenBSD] virtual_memory().cached value was always set to 0.
-- 715_: don't crash at import time if cpu_times() fail for some reason.
-- 717_: [Linux] Process.open_files fails if deleted files still visible.
-- 722_: [Linux] swap_memory() no longer crashes if sin/sout can't be determined
-  due to missing /proc/vmstat.
-- 724_: [FreeBSD] virtual_memory().total is slightly incorrect.
-
-3.3.0
-=====
-
-*2015-11-25*
-
-**Enhancements**
-
-- 558_: [Linux] exposed psutil.PROCFS_PATH constant to change the default
-  location of /proc filesystem.
-- 615_: [OpenBSD] added OpenBSD support.  (contributed by Landry Breuil)
-
-**Bug fixes**
-
-- 692_: [UNIX] Process.name() is no longer cached as it may change.
-
-3.2.2
-=====
-
-*2015-10-04*
-
-**Bug fixes**
-
-- 517_: [SunOS] net_io_counters failed to detect network interfaces
-  correctly on Solaris 10
-- 541_: [FreeBSD] disk_io_counters r/w times were expressed in seconds instead
-  of milliseconds.  (patch by dasumin)
-- 610_: [SunOS] fix build and tests on Solaris 10
-- 623_: [Linux] process or system connections raises ValueError if IPv6 is not
-  supported by the system.
-- 678_: [Linux] can't install psutil due to bug in setup.py.
-- 688_: [Windows] compilation fails with MSVC 2015, Python 3.5. (patch by
-  Mike Sarahan)
-
-3.2.1
-=====
-
-*2015-09-03*
-
-**Bug fixes**
-
-- 677_: [Linux] can't install psutil due to bug in setup.py.
-
-3.2.0
-=====
-
-*2015-09-02*
-
-**Enhancements**
-
-- 644_: [Windows] added support for CTRL_C_EVENT and CTRL_BREAK_EVENT signals
-  to use with Process.send_signal().
-- 648_: CI test integration for macOS. (patch by Jeff Tang)
-- 663_: [UNIX] net_if_addrs() now returns point-to-point (VPNs) addresses.
-- 655_: [Windows] different issues regarding unicode handling were fixed. On
-  Python 2 all APIs returning a string will now return an encoded version of it
-  by using sys.getfilesystemencoding() codec. The APIs involved are:
-  - psutil.net_if_addrs()
-  - psutil.net_if_stats()
-  - psutil.net_io_counters()
-  - psutil.Process.cmdline()
-  - psutil.Process.name()
-  - psutil.Process.username()
-  - psutil.users()
-
-**Bug fixes**
-
-- 513_: [Linux] fixed integer overflow for RLIM_INFINITY.
-- 641_: [Windows] fixed many compilation warnings.  (patch by Jeff Tang)
-- 652_: [Windows] net_if_addrs() UnicodeDecodeError in case of non-ASCII NIC
-  names.
-- 655_: [Windows] net_if_stats() UnicodeDecodeError in case of non-ASCII NIC
-  names.
-- 659_: [Linux] compilation error on Suse 10. (patch by maozguttman)
-- 664_: [Linux] compilation error on Alpine Linux. (patch by Bart van Kleef)
-- 670_: [Windows] segfgault of net_if_addrs() in case of non-ASCII NIC names.
-  (patch by sk6249)
-- 672_: [Windows] compilation fails if using Windows SDK v8.0. (patch by
-  Steven Winfield)
-- 675_: [Linux] net_connections(); UnicodeDecodeError may occur when listing
-  UNIX sockets.
-
-3.1.1
-=====
-
-*2015-07-15*
-
-**Bug fixes**
-
-- 603_: [Linux] ionice_set value range is incorrect.  (patch by spacewander)
-- 645_: [Linux] psutil.cpu_times_percent() may produce negative results.
-- 656_: 'from psutil import *' does not work.
-
-3.1.0
-=====
-
-*2015-07-15*
-
-**Enhancements**
-
-- 534_: [Linux] disk_partitions() added support for ZFS filesystems.
-- 646_: continuous tests integration for Windows with
-  https://ci.appveyor.com/project/giampaolo/psutil.
-- 647_: new dev guide:
-  https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst
-- 651_: continuous code quality test integration with scrutinizer-ci.com
-
-**Bug fixes**
-
-- 340_: [Windows] Process.open_files() no longer hangs. Instead it uses a
-  thred which times out and skips the file handle in case it's taking too long
-  to be retrieved.  (patch by Jeff Tang, PR #597)
-- 627_: [Windows] Process.name() no longer raises AccessDenied for pids owned
-  by another user.
-- 636_: [Windows] Process.memory_info() raise AccessDenied.
-- 637_: [UNIX] raise exception if trying to send signal to Process PID 0 as it
-  will affect os.getpid()'s process group instead of PID 0.
-- 639_: [Linux] Process.cmdline() can be truncated.
-- 640_: [Linux] *connections functions may swallow errors and return an
-  incomplete list of connnections.
-- 642_: repr() of exceptions is incorrect.
-- 653_: [Windows] Add inet_ntop function for Windows XP to support IPv6.
-- 641_: [Windows] Replace deprecated string functions with safe equivalents.
-
-3.0.1
-=====
-
-*2015-06-18*
-
-**Bug fixes**
-
-- 632_: [Linux] better error message if cannot parse process UNIX connections.
-- 634_: [Linux] Proces.cmdline() does not include empty string arguments.
-- 635_: [UNIX] crash on module import if 'enum' package is installed on python
-  < 3.4.
-
-3.0.0
-=====
-
-*2015-06-13*
-
-**Enhancements**
-
-- 250_: new psutil.net_if_stats() returning NIC statistics (isup, duplex,
-  speed, MTU).
-- 376_: new psutil.net_if_addrs() returning all NIC addresses a-la ifconfig.
-- 469_: on Python >= 3.4 ``IOPRIO_CLASS_*`` and ``*_PRIORITY_CLASS`` constants
-  returned by psutil.Process' ionice() and nice() methods are enums instead of
-  plain integers.
-- 581_: add .gitignore. (patch by Gabi Davar)
-- 582_: connection constants returned by psutil.net_connections() and
-  psutil.Process.connections() were turned from int to enums on Python > 3.4.
-- 587_: Move native extension into the package.
-- 589_: Process.cpu_affinity() accepts any kind of iterable (set, tuple, ...),
-  not only lists.
-- 594_: all deprecated APIs were removed.
-- 599_: [Windows] process name() can now be determined for all processes even
-  when running as a limited user.
-- 602_: pre-commit GIT hook.
-- 629_: enhanced support for py.test and nose test discovery and tests run.
-- 616_: [Windows] Add inet_ntop function for Windows XP.
-
-**Bug fixes**
-
-- 428_: [all UNIXes except Linux] correct handling of zombie processes;
-  introduced new ZombieProcess exception class.
-- 512_: [BSD] fix segfault in net_connections().
-- 555_: [Linux] psutil.users() correctly handles ":0" as an alias for
-  "localhost"
-- 579_: [Windows] Fixed open_files() for PID>64K.
-- 579_: [Windows] fixed many compiler warnings.
-- 585_: [FreeBSD] net_connections() may raise KeyError.
-- 586_: [FreeBSD] cpu_affinity() segfaults on set in case an invalid CPU
-  number is provided.
-- 593_: [FreeBSD] Process().memory_maps() segfaults.
-- 606_: Process.parent() may swallow NoSuchProcess exceptions.
-- 611_: [SunOS] net_io_counters has send and received swapped
-- 614_: [Linux]: cpu_count(logical=False) return the number of physical CPUs
-  instead of physical cores.
-- 618_: [SunOS] swap tests fail on Solaris when run as normal user
-- 628_: [Linux] Process.name() truncates process name in case it contains
-  spaces or parentheses.
-
-2.2.1
-=====
-
-*2015-02-02*
-
-**Bug fixes**
-
-- 496_: [Linux] fix "ValueError: ambiguos inode with multiple PIDs references"
-  (patch by Bruno Binet)
-
-2.2.0
-=====
-
-*2015-01-06*
-
-**Enhancements**
-
-- 521_: drop support for Python 2.4 and 2.5.
-- 553_: new examples/pstree.py script.
-- 564_: C extension version mismatch in case the user messed up with psutil
-  installation or with sys.path is now detected at import time.
-- 568_: New examples/pidof.py script.
-- 569_: [FreeBSD] add support for process CPU affinity.
-
-**Bug fixes**
-
-- 496_: [Solaris] can't import psutil.
-- 547_: [UNIX] Process.username() may raise KeyError if UID can't be resolved.
-- 551_: [Windows] get rid of the unicode hack for net_io_counters() NIC names.
-- 556_: [Linux] lots of file handles were left open.
-- 561_: [Linux] net_connections() might skip some legitimate UNIX sockets.
-  (patch by spacewander)
-- 565_: [Windows] use proper encoding for psutil.Process.username() and
-  psutil.users(). (patch by Sylvain Mouquet)
-- 567_: [Linux] in the alternative implementation of CPU affinity PyList_Append
-  and Py_BuildValue return values are not checked.
-- 569_: [FreeBSD] fix memory leak in psutil.cpu_count(logical=False).
-- 571_: [Linux] Process.open_files() might swallow AccessDenied exceptions and
-  return an incomplete list of open files.
-
-2.1.3
-=====
-
-*2014-09-26*
-
-- 536_: [Linux]: fix "undefined symbol: CPU_ALLOC" compilation error.
-
-2.1.2
-=====
-
-*2014-09-21*
-
-**Enhancements**
-
-- 407_: project moved from Google Code to Github; code moved from Mercurial
-  to Git.
-- 492_: use tox to run tests on multiple python versions.  (patch by msabramo)
-- 505_: [Windows] distribution as wheel packages.
-- 511_: new examples/ps.py sample code.
-
-**Bug fixes**
-
-- 340_: [Windows] Process.get_open_files() no longer hangs.  (patch by
-  Jeff Tang)
-- 501_: [Windows] disk_io_counters() may return negative values.
-- 503_: [Linux] in rare conditions Process exe(), open_files() and
-  connections() methods can raise OSError(ESRCH) instead of NoSuchProcess.
-- 504_: [Linux] can't build RPM packages via setup.py
-- 506_: [Linux] python 2.4 support was broken.
-- 522_: [Linux] Process.cpu_affinity() might return EINVAL.  (patch by David
-  Daeschler)
-- 529_: [Windows] Process.exe() may raise unhandled WindowsError exception
-  for PIDs 0 and 4.  (patch by Jeff Tang)
-- 530_: [Linux] psutil.disk_io_counters() may crash on old Linux distros
-  (< 2.6.5)  (patch by Yaolong Huang)
-- 533_: [Linux] Process.memory_maps() may raise TypeError on old Linux distros.
-
-2.1.1
-=====
-
-*2014-04-30*
-
-**Bug fixes**
-
-- 446_: [Windows] fix encoding error when using net_io_counters() on Python 3.
-  (patch by Szigeti Gabor Niif)
-- 460_: [Windows] net_io_counters() wraps after 4G.
-- 491_: [Linux] psutil.net_connections() exceptions. (patch by Alexander Grothe)
-
-2.1.0
-=====
-
-*2014-04-08*
-
-**Enhancements**
-
-- 387_: system-wide open connections a-la netstat.
-
-**Bug fixes**
-
-- 421_: [Solaris] psutil does not compile on SunOS 5.10 (patch by Naveed
-  Roudsari)
-- 489_: [Linux] psutil.disk_partitions() return an empty list.
-
-2.0.0
-=====
-
-*2014-03-10*
-
-**Enhancements**
-
-- 424_: [Windows] installer for Python 3.X 64 bit.
-- 427_: number of logical and physical CPUs (psutil.cpu_count()).
-- 447_: psutil.wait_procs() timeout parameter is now optional.
-- 452_: make Process instances hashable and usable with set()s.
-- 453_: tests on Python < 2.7 require unittest2 module.
-- 459_: add a make file for running tests and other repetitive tasks (also
-  on Windows).
-- 463_: make timeout parameter of cpu_percent* functions default to 0.0 'cause
-  it's a common trap to introduce slowdowns.
-- 468_: move documentation to readthedocs.com.
-- 477_: process cpu_percent() is about 30% faster.  (suggested by crusaderky)
-- 478_: [Linux] almost all APIs are about 30% faster on Python 3.X.
-- 479_: long deprecated psutil.error module is gone; exception classes now
-  live in "psutil" namespace only.
-
-**Bug fixes**
-
-- 193_: psutil.Popen constructor can throw an exception if the spawned process
-  terminates quickly.
-- 340_: [Windows] process get_open_files() no longer hangs.  (patch by
-  jtang@vahna.net)
-- 443_: [Linux] fix a potential overflow issue for Process.set_cpu_affinity()
-  on systems with more than 64 CPUs.
-- 448_: [Windows] get_children() and ppid() memory leak (patch by Ulrich
-  Klank).
-- 457_: [POSIX] pid_exists() always returns True for PID 0.
-- 461_: namedtuples are not pickle-able.
-- 466_: [Linux] process exe improper null bytes handling.  (patch by
-  Gautam Singh)
-- 470_: wait_procs() might not wait.  (patch by crusaderky)
-- 471_: [Windows] process exe improper unicode handling. (patch by
-  alex@mroja.net)
-- 473_: psutil.Popen.wait() does not set returncode attribute.
-- 474_: [Windows] Process.cpu_percent() is no longer capped at 100%.
-- 476_: [Linux] encoding error for process name and cmdline.
-
-**API changes**
-
-For the sake of consistency a lot of psutil APIs have been renamed.
-In most cases accessing the old names will work but it will cause a
-DeprecationWarning.
-
-- psutil.* module level constants have being replaced by functions:
-
-  +-----------------------+-------------------------------+
-  | Old name              | Replacement                   |
-  +=======================+===============================+
-  | psutil.NUM_CPUS       | psutil.cpu_cpunt()            |
-  +-----------------------+-------------------------------+
-  | psutil.BOOT_TIME      | psutil.boot_time()            |
-  +-----------------------+-------------------------------+
-  | psutil.TOTAL_PHYMEM   | psutil.virtual_memory().total |
-  +-----------------------+-------------------------------+
-
-- Renamed psutil.* functions:
-
-  +--------------------------+-------------------------------+
-  | Old name                 | Replacement                   |
-  +==========================+===============================+
-  | - psutil.get_pid_list()  | psutil.pids()                 |
-  +--------------------------+-------------------------------+
-  | - psutil.get_users()     | psutil.users()                |
-  +--------------------------+-------------------------------+
-  | - psutil.get_boot_time() | psutil.boot_time()            |
-  +--------------------------+-------------------------------+
-
-- All psutil.Process ``get_*`` methods lost the ``get_`` prefix.
-  get_ext_memory_info() renamed to memory_info_ex().
-  Assuming "p = psutil.Process()":
-
-  +--------------------------+----------------------+
-  | Old name                 | Replacement          |
-  +==========================+======================+
-  | p.get_children()         | p.children()         |
-  +--------------------------+----------------------+
-  | p.get_connections()      | p.connections()      |
-  +--------------------------+----------------------+
-  | p.get_cpu_affinity()     | p.cpu_affinity()     |
-  +--------------------------+----------------------+
-  | p.get_cpu_percent()      | p.cpu_percent()      |
-  +--------------------------+----------------------+
-  | p.get_cpu_times()        | p.cpu_times()        |
-  +--------------------------+----------------------+
-  | p.get_ext_memory_info()  | p.memory_info_ex()   |
-  +--------------------------+----------------------+
-  | p.get_io_counters()      | p.io_counters()      |
-  +--------------------------+----------------------+
-  | p.get_ionice()           | p.ionice()           |
-  +--------------------------+----------------------+
-  | p.get_memory_info()      | p.memory_info()      |
-  +--------------------------+----------------------+
-  | p.get_memory_maps()      | p.memory_maps()      |
-  +--------------------------+----------------------+
-  | p.get_memory_percent()   | p.memory_percent()   |
-  +--------------------------+----------------------+
-  | p.get_nice()             | p.nice()             |
-  +--------------------------+----------------------+
-  | p.get_num_ctx_switches() | p.num_ctx_switches() |
-  +--------------------------+----------------------+
-  | p.get_num_fds()          | p.num_fds()          |
-  +--------------------------+----------------------+
-  | p.get_num_threads()      | p.num_threads()      |
-  +--------------------------+----------------------+
-  | p.get_open_files()       | p.open_files()       |
-  +--------------------------+----------------------+
-  | p.get_rlimit()           | p.rlimit()           |
-  +--------------------------+----------------------+
-  | p.get_threads()          | p.threads()          |
-  +--------------------------+----------------------+
-  | p.getcwd()               | p.cwd()              |
-  +--------------------------+----------------------+
-
-- All psutil.Process ``set_*`` methods lost the ``set_`` prefix.
-  Assuming "p = psutil.Process()":
-
-  +----------------------+---------------------------------+
-  | Old name             | Replacement                     |
-  +======================+=================================+
-  | p.set_nice()         | p.nice(value)                   |
-  +----------------------+---------------------------------+
-  | p.set_ionice()       | p.ionice(ioclass, value=None)   |
-  +----------------------+---------------------------------+
-  | p.set_cpu_affinity() | p.cpu_affinity(cpus)            |
-  +----------------------+---------------------------------+
-  | p.set_rlimit()       | p.rlimit(resource, limits=None) |
-  +----------------------+---------------------------------+
-
-- Except for 'pid' all psutil.Process class properties have been turned into
-  methods. This is the only case which there are no aliases.
-  Assuming "p = psutil.Process()":
-
-  +---------------+-----------------+
-  | Old name      | Replacement     |
-  +===============+=================+
-  | p.name        | p.name()        |
-  +---------------+-----------------+
-  | p.parent      | p.parent()      |
-  +---------------+-----------------+
-  | p.ppid        | p.ppid()        |
-  +---------------+-----------------+
-  | p.exe         | p.exe()         |
-  +---------------+-----------------+
-  | p.cmdline     | p.cmdline()     |
-  +---------------+-----------------+
-  | p.status      | p.status()      |
-  +---------------+-----------------+
-  | p.uids        | p.uids()        |
-  +---------------+-----------------+
-  | p.gids        | p.gids()        |
-  +---------------+-----------------+
-  | p.username    | p.username()    |
-  +---------------+-----------------+
-  | p.create_time | p.create_time() |
-  +---------------+-----------------+
-
-- timeout parameter of cpu_percent* functions defaults to 0.0 instead of 0.1.
-- long deprecated psutil.error module is gone; exception classes now live in
-  "psutil" namespace only.
-- Process instances' "retcode" attribute returned by psutil.wait_procs() has
-  been renamed to "returncode" for consistency with subprocess.Popen.
-
-1.2.1
-=====
-
-*2013-11-25*
-
-**Bug fixes**
-
-- 348_: [Windows XP] fixed "ImportError: DLL load failed" occurring on module
-  import.
-- 425_: [Solaris] crash on import due to failure at determining BOOT_TIME.
-- 443_: [Linux] can't set CPU affinity on systems with more than 64 cores.
-
-1.2.0
-=====
-
-*2013-11-20*
-
-**Enhancements**
-
-- 439_: assume os.getpid() if no argument is passed to psutil.Process
-  constructor.
-- 440_: new psutil.wait_procs() utility function which waits for multiple
-  processes to terminate.
-
-**Bug fixes**
-
-- 348_: [Windows XP/Vista] fix "ImportError: DLL load failed" occurring on
-  module import.
-
-1.1.3
-=====
-
-*2013-11-07*
-
-**Bug fixes**
-
-- 442_: [Linux] psutil won't compile on certain version of Linux because of
-  missing prlimit(2) syscall.
-
-1.1.2
-=====
-
-*2013-10-22*
-
-**Bug fixes**
-
-- 442_: [Linux] psutil won't compile on Debian 6.0 because of missing
-  prlimit(2) syscall.
-
-1.1.1
-=====
-
-*2013-10-08*
-
-**Bug fixes**
-
-- 442_: [Linux] psutil won't compile on kernels < 2.6.36 due to missing
-  prlimit(2) syscall.
-
-1.1.0
-=====
-
-*2013-09-28*
-
-**Enhancements**
-
-- 410_: host tar.gz and windows binary files are on PyPI.
-- 412_: [Linux] get/set process resource limits.
-- 415_: [Windows] Process.get_children() is an order of magnitude faster.
-- 426_: [Windows] Process.name is an order of magnitude faster.
-- 431_: [UNIX] Process.name is slightly faster because it unnecessarily
-  retrieved also process cmdline.
-
-**Bug fixes**
-
-- 391_: [Windows] psutil.cpu_times_percent() returns negative percentages.
-- 408_: STATUS_* and CONN_* constants don't properly serialize on JSON.
-- 411_: [Windows] examples/disk_usage.py may pop-up a GUI error.
-- 413_: [Windows] Process.get_memory_info() leaks memory.
-- 414_: [Windows] Process.exe on Windows XP may raise ERROR_INVALID_PARAMETER.
-- 416_: psutil.disk_usage() doesn't work well with unicode path names.
-- 430_: [Linux] process IO counters report wrong number of r/w syscalls.
-- 435_: [Linux] psutil.net_io_counters() might report erreneous NIC names.
-- 436_: [Linux] psutil.net_io_counters() reports a wrong 'dropin' value.
-
-**API changes**
-
-- 408_: turn STATUS_* and CONN_* constants into plain Python strings.
-
-1.0.1
-=====
-
-*2013-07-12*
-
-**Bug fixes**
-
-- 405_: network_io_counters(pernic=True) no longer works as intended in 1.0.0.
-
-1.0.0
-=====
-
-*2013-07-10*
-
-**Enhancements**
-
-- 18_:  Solaris support (yay!)  (thanks Justin Venus)
-- 367_: Process.get_connections() 'status' strings are now constants.
-- 380_: test suite exits with non-zero on failure.  (patch by floppymaster)
-- 391_: introduce unittest2 facilities and provide workarounds if unittest2
-  is not installed (python < 2.7).
-
-**Bug fixes**
-
-- 374_: [Windows] negative memory usage reported if process uses a lot of
-  memory.
-- 379_: [Linux] Process.get_memory_maps() may raise ValueError.
-- 394_: [macOS] Mapped memory regions report incorrect file name.
-- 404_: [Linux] sched_*affinity() are implicitly declared. (patch by Arfrever)
-
-**API changes**
-
-- Process.get_connections() 'status' field is no longer a string but a
-  constant object (psutil.CONN_*).
-- Process.get_connections() 'local_address' and 'remote_address' fields
-  renamed to 'laddr' and 'raddr'.
-- psutil.network_io_counters() renamed to psutil.net_io_counters().
-
-0.7.1
-=====
-
-*2013-05-03*
-
-**Bug fixes**
-
-- 325_: [BSD] psutil.virtual_memory() can raise SystemError.
-  (patch by Jan Beich)
-- 370_: [BSD] Process.get_connections() requires root.  (patch by John Baldwin)
-- 372_: [BSD] different process methods raise NoSuchProcess instead of
-  AccessDenied.
-
-0.7.0
-=====
-
-*2013-04-12*
-
-**Enhancements**
-
-- 233_: code migrated to Mercurial (yay!)
-- 246_: psutil.error module is deprecated and scheduled for removal.
-- 328_: [Windows] process IO nice/priority support.
-- 359_: psutil.get_boot_time()
-- 361_: [Linux] psutil.cpu_times() now includes new 'steal', 'guest' and
-  'guest_nice' fields available on recent Linux kernels.
-  Also, psutil.cpu_percent() is more accurate.
-- 362_: cpu_times_percent() (per-CPU-time utilization as a percentage)
-
-**Bug fixes**
-
-- 234_: [Windows] disk_io_counters() fails to list certain disks.
-- 264_: [Windows] use of psutil.disk_partitions() may cause a message box to
-  appear.
-- 313_: [Linux] psutil.virtual_memory() and psutil.swap_memory() can crash on
-  certain exotic Linux flavors having an incomplete /proc interface.
-  If that's the case we now set the unretrievable stats to 0 and raise a
-  RuntimeWarning.
-- 315_: [macOS] fix some compilation warnings.
-- 317_: [Windows] cannot set process CPU affinity above 31 cores.
-- 319_: [Linux] process get_memory_maps() raises KeyError 'Anonymous' on Debian
-  squeeze.
-- 321_: [UNIX] Process.ppid property is no longer cached as the kernel may set
-  the ppid to 1 in case of a zombie process.
-- 323_: [macOS] disk_io_counters()'s read_time and write_time parameters were
-  reporting microseconds not milliseconds.  (patch by Gregory Szorc)
-- 331_: Process cmdline is no longer cached after first acces as it may change.
-- 333_: [macOS] Leak of Mach ports on macOS (patch by rsesek@google.com)
-- 337_: [Linux] process methods not working because of a poor /proc
-  implementation will raise NotImplementedError rather than RuntimeError
-  and Process.as_dict() will not blow up.  (patch by Curtin1060)
-- 338_: [Linux] disk_io_counters() fails to find some disks.
-- 339_: [FreeBSD] get_pid_list() can allocate all the memory on system.
-- 341_: [Linux] psutil might crash on import due to error in retrieving system
-  terminals map.
-- 344_: [FreeBSD] swap_memory() might return incorrect results due to
-  kvm_open(3) not being called. (patch by Jean Sebastien)
-- 338_: [Linux] disk_io_counters() fails to find some disks.
-- 351_: [Windows] if psutil is compiled with mingw32 (provided installers for
-  py2.4 and py2.5 are) disk_io_counters() will fail. (Patch by m.malycha)
-- 353_: [macOS] get_users() returns an empty list on macOS 10.8.
-- 356_: Process.parent now checks whether parent PID has been reused in which
-  case returns None.
-- 365_: Process.set_nice() should check PID has not been reused by another
-  process.
-- 366_: [FreeBSD] get_memory_maps(), get_num_fds(), get_open_files() and
-  getcwd() Process methods raise RuntimeError instead of AccessDenied.
-
-**API changes**
-
-- Process.cmdline property is no longer cached after first access.
-- Process.ppid property is no longer cached after first access.
-- [Linux] Process methods not working because of a poor /proc implementation
-  will raise NotImplementedError instead of RuntimeError.
-- psutil.error module is deprecated and scheduled for removal.
-
-0.6.1
-=====
-
-*2012-08-16*
-
-**Enhancements**
-
-- 316_: process cmdline property now makes a better job at guessing the process
-  executable from the cmdline.
-
-**Bug fixes**
-
-- 316_: process exe was resolved in case it was a symlink.
-- 318_: python 2.4 compatibility was broken.
-
-**API changes**
-
-- process exe can now return an empty string instead of raising AccessDenied.
-- process exe is no longer resolved in case it's a symlink.
-
-0.6.0
-=====
-
-*2012-08-13*
-
-**Enhancements**
-
-- 216_: [POSIX] get_connections() UNIX sockets support.
-- 220_: [FreeBSD] get_connections() has been rewritten in C and no longer
-  requires lsof.
-- 222_: [macOS] add support for process cwd.
-- 261_: process extended memory info.
-- 295_: [macOS] process executable path is now determined by asking the OS
-  instead of being guessed from process cmdline.
-- 297_: [macOS] the Process methods below were always raising AccessDenied for
-  any process except the current one. Now this is no longer true. Also
-  they are 2.5x faster.
-  - name
-  - get_memory_info()
-  - get_memory_percent()
-  - get_cpu_times()
-  - get_cpu_percent()
-  - get_num_threads()
-- 300_: examples/pmap.py script.
-- 301_: process_iter() now yields processes sorted by their PIDs.
-- 302_: process number of voluntary and involuntary context switches.
-- 303_: [Windows] the Process methods below were always raising AccessDenied
-  for any process not owned by current user. Now this is no longer true:
-  - create_time
-  - get_cpu_times()
-  - get_cpu_percent()
-  - get_memory_info()
-  - get_memory_percent()
-  - get_num_handles()
-  - get_io_counters()
-- 305_: add examples/netstat.py script.
-- 311_: system memory functions has been refactorized and rewritten and now
-  provide a more detailed and consistent representation of the system
-  memory. New psutil.virtual_memory() function provides the following
-  memory amounts:
-  - total
-  - available
-  - percent
-  - used
-  - active [POSIX]
-  - inactive [POSIX]
-  - buffers (BSD, Linux)
-  - cached (BSD, macOS)
-  - wired (macOS, BSD)
-  - shared [FreeBSD]
-  New psutil.swap_memory() provides:
-  - total
-  - used
-  - free
-  - percent
-  - sin (no. of bytes the system has swapped in from disk (cumulative))
-  - sout (no. of bytes the system has swapped out from disk (cumulative))
-  All old memory-related functions are deprecated.
-  Also two new example scripts were added:  free.py and meminfo.py.
-- 312_: psutil.network_io_counters() namedtuple includes 4 new fields:
-  errin, errout dropin and dropout, reflecting the number of packets
-  dropped and with errors.
-
-**Bug fixes**
-
-- 298_: [macOS and BSD] memory leak in get_num_fds().
-- 299_: potential memory leak every time PyList_New(0) is used.
-- 303_: [Windows] potential heap corruption in get_num_threads() and
-  get_status() Process methods.
-- 305_: [FreeBSD] psutil can't compile on FreeBSD 9 due to removal of utmp.h.
-- 306_: at C level, errors are not checked when invoking Py* functions which
-  create or manipulate Python objects leading to potential memory related
-  errors and/or segmentation faults.
-- 307_: [FreeBSD] values returned by psutil.network_io_counters() are wrong.
-- 308_: [BSD / Windows] psutil.virtmem_usage() wasn't actually returning
-  information about swap memory usage as it was supposed to do. It does
-  now.
-- 309_: get_open_files() might not return files which can not be accessed
-  due to limited permissions. AccessDenied is now raised instead.
-
-**API changes**
-
-- psutil.phymem_usage() is deprecated       (use psutil.virtual_memory())
-- psutil.virtmem_usage() is deprecated      (use psutil.swap_memory())
-- psutil.phymem_buffers() on Linux is deprecated  (use psutil.virtual_memory())
-- psutil.cached_phymem() on Linux is deprecated   (use psutil.virtual_memory())
-- [Windows and BSD] psutil.virtmem_usage() now returns information about swap
-  memory instead of virtual memory.
-
-0.5.1
-=====
-
-*2012-06-29*
-
-**Enhancements**
-
-- 293_: [Windows] process executable path is now determined by asking the OS
-  instead of being guessed from process cmdline.
-
-**Bug fixes**
-
-- 292_: [Linux] race condition in process files/threads/connections.
-- 294_: [Windows] Process CPU affinity is only able to set CPU #0.
-
-0.5.0
-=====
-
-*2012-06-27*
-
-**Enhancements**
-
-- 195_: [Windows] number of handles opened by process.
-- 209_: psutil.disk_partitions() now provides also mount options.
-- 229_: list users currently connected on the system (psutil.get_users()).
-- 238_: [Linux, Windows] process CPU affinity (get and set).
-- 242_: Process.get_children(recursive=True): return all process
-  descendants.
-- 245_: [POSIX] Process.wait() incrementally consumes less CPU cycles.
-- 257_: [Windows] removed Windows 2000 support.
-- 258_: [Linux] Process.get_memory_info() is now 0.5x faster.
-- 260_: process's mapped memory regions. (Windows patch by wj32.64, macOS patch
-  by Jeremy Whitlock)
-- 262_: [Windows] psutil.disk_partitions() was slow due to inspecting the
-  floppy disk drive also when "all" argument was False.
-- 273_: psutil.get_process_list() is deprecated.
-- 274_: psutil no longer requires 2to3 at installation time in order to work
-  with Python 3.
-- 278_: new Process.as_dict() method.
-- 281_: ppid, name, exe, cmdline and create_time properties of Process class
-  are now cached after being accessed.
-- 282_: psutil.STATUS_* constants can now be compared by using their string
-  representation.
-- 283_: speedup Process.is_running() by caching its return value in case the
-  process is terminated.
-- 284_: [POSIX] per-process number of opened file descriptors.
-- 287_: psutil.process_iter() now caches Process instances between calls.
-- 290_: Process.nice property is deprecated in favor of new get_nice() and
-  set_nice() methods.
-
-**Bug fixes**
-
-- 193_: psutil.Popen constructor can throw an exception if the spawned process
-  terminates quickly.
-- 240_: [macOS] incorrect use of free() for Process.get_connections().
-- 244_: [POSIX] Process.wait() can hog CPU resources if called against a
-  process which is not our children.
-- 248_: [Linux] psutil.network_io_counters() might return erroneous NIC names.
-- 252_: [Windows] process getcwd() erroneously raise NoSuchProcess for
-  processes owned by another user.  It now raises AccessDenied instead.
-- 266_: [Windows] psutil.get_pid_list() only shows 1024 processes.
-  (patch by Amoser)
-- 267_: [macOS] Process.get_connections() - an erroneous remote address was
-  returned. (Patch by Amoser)
-- 272_: [Linux] Porcess.get_open_files() - potential race condition can lead to
-  unexpected NoSuchProcess exception.  Also, we can get incorrect reports
-  of not absolutized path names.
-- 275_: [Linux] Process.get_io_counters() erroneously raise NoSuchProcess on
-  old Linux versions. Where not available it now raises
-  NotImplementedError.
-- 286_: Process.is_running() doesn't actually check whether PID has been
-  reused.
-- 314_: Process.get_children() can sometimes return non-children.
-
-**API changes**
-
-- Process.nice property is deprecated in favor of new get_nice() and set_nice()
-  methods.
-- psutil.get_process_list() is deprecated.
-- ppid, name, exe, cmdline and create_time properties of Process class are now
-  cached after being accessed, meaning NoSuchProcess will no longer be raised
-  in case the process is gone in the meantime.
-- psutil.STATUS_* constants can now be compared by using their string
-  representation.
-
-0.4.1
-=====
-
-*2011-12-14*
-
-**Bug fixes**
-
-- 228_: some example scripts were not working with python 3.
-- 230_: [Windows / macOS] memory leak in Process.get_connections().
-- 232_: [Linux] psutil.phymem_usage() can report erroneous values which are
-  different than "free" command.
-- 236_: [Windows] memory/handle leak in Process's get_memory_info(),
-  suspend() and resume() methods.
-
-0.4.0
-=====
-
-*2011-10-29*
-
-**Enhancements**
-
-- 150_: network I/O counters. (macOS and Windows patch by Jeremy Whitlock)
-- 154_: [FreeBSD] add support for process getcwd()
-- 157_: [Windows] provide installer for Python 3.2 64-bit.
-- 198_: Process.wait(timeout=0) can now be used to make wait() return
-  immediately.
-- 206_: disk I/O counters. (macOS and Windows patch by Jeremy Whitlock)
-- 213_: examples/iotop.py script.
-- 217_: Process.get_connections() now has a "kind" argument to filter
-  for connections with different criteria.
-- 221_: [FreeBSD] Process.get_open_files has been rewritten in C and no longer
-  relies on lsof.
-- 223_: examples/top.py script.
-- 227_: examples/nettop.py script.
-
-**Bug fixes**
-
-- 135_: [macOS] psutil cannot create Process object.
-- 144_: [Linux] no longer support 0 special PID.
-- 188_: [Linux] psutil import error on Linux ARM architectures.
-- 194_: [POSIX] psutil.Process.get_cpu_percent() now reports a percentage over
-  100 on multicore processors.
-- 197_: [Linux] Process.get_connections() is broken on platforms not
-  supporting IPv6.
-- 200_: [Linux] psutil.NUM_CPUS not working on armel and sparc architectures
-  and causing crash on module import.
-- 201_: [Linux] Process.get_connections() is broken on big-endian
-  architectures.
-- 211_: Process instance can unexpectedly raise NoSuchProcess if tested for
-  equality with another object.
-- 218_: [Linux] crash at import time on Debian 64-bit because of a missing
-  line in /proc/meminfo.
-- 226_: [FreeBSD] crash at import time on FreeBSD 7 and minor.
-
-0.3.0
-=====
-
-*2011-07-08*
-
-**Enhancements**
-
-- 125_: system per-cpu percentage utilization and times.
-- 163_: per-process associated terminal (TTY).
-- 171_: added get_phymem() and get_virtmem() functions returning system
-  memory information (total, used, free) and memory percent usage.
-  total_* avail_* and used_* memory functions are deprecated.
-- 172_: disk usage statistics.
-- 174_: mounted disk partitions.
-- 179_: setuptools is now used in setup.py
-
-**Bug fixes**
-
-- 159_: SetSeDebug() does not close handles or unset impersonation on return.
-- 164_: [Windows] wait function raises a TimeoutException when a process
-  returns -1 .
-- 165_: process.status raises an unhandled exception.
-- 166_: get_memory_info() leaks handles hogging system resources.
-- 168_: psutil.cpu_percent() returns erroneous results when used in
-  non-blocking mode.  (patch by Philip Roberts)
-- 178_: macOS - Process.get_threads() leaks memory
-- 180_: [Windows] Process's get_num_threads() and get_threads() methods can
-  raise NoSuchProcess exception while process still exists.
-
-0.2.1
-=====
-
-*2011-03-20*
-
-**Enhancements**
-
-- 64_: per-process I/O counters.
-- 116_: per-process wait() (wait for process to terminate and return its exit
-  code).
-- 134_: per-process get_threads() returning information (id, user and kernel
-  times) about threads opened by process.
-- 136_: process executable path on FreeBSD is now determined by asking the
-  kernel instead of guessing it from cmdline[0].
-- 137_: per-process real, effective and saved user and group ids.
-- 140_: system boot time.
-- 142_: per-process get and set niceness (priority).
-- 143_: per-process status.
-- 147_: per-process I/O nice (priority) - Linux only.
-- 148_: psutil.Popen class which tidies up subprocess.Popen and psutil.Process
-  in a unique interface.
-- 152_: [macOS] get_process_open_files() implementation has been rewritten
-  in C and no longer relies on lsof resulting in a 3x speedup.
-- 153_: [macOS] get_process_connection() implementation has been rewritten
-  in C and no longer relies on lsof resulting in a 3x speedup.
-
-**Bug fixes**
-
-- 83_:  process cmdline is empty on macOS 64-bit.
-- 130_: a race condition can cause IOError exception be raised on
-  Linux if process disappears between open() and subsequent read() calls.
-- 145_: WindowsError was raised instead of psutil.AccessDenied when using
-  process resume() or suspend() on Windows.
-- 146_: 'exe' property on Linux can raise TypeError if path contains NULL
-  bytes.
-- 151_: exe and getcwd() for PID 0 on Linux return inconsistent data.
-
-**API changes**
-
-- Process "uid" and "gid" properties are deprecated in favor of "uids" and
-  "gids" properties.
-
-0.2.0
-=====
-
-*2010-11-13*
-
-**Enhancements**
-
-- 79_: per-process open files.
-- 88_: total system physical cached memory.
-- 88_: total system physical memory buffers used by the kernel.
-- 91_: per-process send_signal() and terminate() methods.
-- 95_: NoSuchProcess and AccessDenied exception classes now provide "pid",
-  "name" and "msg" attributes.
-- 97_: per-process children.
-- 98_: Process.get_cpu_times() and Process.get_memory_info now return
-  a namedtuple instead of a tuple.
-- 103_: per-process opened TCP and UDP connections.
-- 107_: add support for Windows 64 bit. (patch by cjgohlke)
-- 111_: per-process executable name.
-- 113_: exception messages now include process name and pid.
-- 114_: process username Windows implementation has been rewritten in pure
-  C and no longer uses WMI resulting in a big speedup. Also, pywin32 is no
-  longer required as a third-party dependancy. (patch by wj32)
-- 117_: added support for Windows 2000.
-- 123_: psutil.cpu_percent() and psutil.Process.cpu_percent() accept a
-  new 'interval' parameter.
-- 129_: per-process number of threads.
-
-**Bug fixes**
-
-- 80_: fixed warnings when installing psutil with easy_install.
-- 81_: psutil fails to compile with Visual Studio.
-- 94_: suspend() raises OSError instead of AccessDenied.
-- 86_: psutil didn't compile against FreeBSD 6.x.
-- 102_: orphaned process handles obtained by using OpenProcess in C were
-  left behind every time Process class was instantiated.
-- 111_: path and name Process properties report truncated or erroneous
-  values on UNIX.
-- 120_: cpu_percent() always returning 100% on macOS.
-- 112_: uid and gid properties don't change if process changes effective
-  user/group id at some point.
-- 126_: ppid, uid, gid, name, exe, cmdline and create_time properties are
-  no longer cached and correctly raise NoSuchProcess exception if the process
-  disappears.
-
-**API changes**
-
-- psutil.Process.path property is deprecated and works as an alias for "exe"
-  property.
-- psutil.Process.kill(): signal argument was removed - to send a signal to the
-  process use send_signal(signal) method instead.
-- psutil.Process.get_memory_info() returns a nametuple instead of a tuple.
-- psutil.cpu_times() returns a nametuple instead of a tuple.
-- New psutil.Process methods: get_open_files(), get_connections(),
-  send_signal() and terminate().
-- ppid, uid, gid, name, exe, cmdline and create_time properties are no longer
-  cached and raise NoSuchProcess exception if process disappears.
-- psutil.cpu_percent() no longer returns immediately (see issue 123).
-- psutil.Process.get_cpu_percent() and psutil.cpu_percent() no longer returns
-  immediately by default (see issue 123).
-
-0.1.3
-=====
-
-*2010-03-02*
-
-**Enhancements**
-
-- 14_: per-process username
-- 51_: per-process current working directory (Windows and Linux only)
-- 59_: Process.is_running() is now 10 times faster
-- 61_: added supoprt for FreeBSD 64 bit
-- 71_: implemented suspend/resume process
-- 75_: python 3 support
-
-**Bug fixes**
-
-- 36_: process cpu_times() and memory_info() functions succeeded also for dead
-  processes while a NoSuchProcess exception is supposed to be raised.
-- 48_: incorrect size for mib array defined in getcmdargs for BSD
-- 49_: possible memory leak due to missing free() on error condition on
-- 50_: fixed getcmdargs() memory fragmentation on BSD
-- 55_: test_pid_4 was failing on Windows Vista
-- 57_: some unit tests were failing on systems where no swap memory is
-  available
-- 58_: is_running() is now called before kill() to make sure we are going
-  to kill the correct process.
-- 73_: virtual memory size reported on macOS includes shared library size
-- 77_: NoSuchProcess wasn't raised on Process.create_time if kill() was
-  used first.
-
-0.1.2
-=====
-
-*2009-05-06*
-
-**Enhancements**
-
-- 32_: Per-process CPU user/kernel times
-- 33_: Process create time
-- 34_: Per-process CPU utilization percentage
-- 38_: Per-process memory usage (bytes)
-- 41_: Per-process memory utilization (percent)
-- 39_: System uptime
-- 43_: Total system virtual memory
-- 46_: Total system physical memory
-- 44_: Total system used/free virtual and physical memory
-
-**Bug fixes**
-
-- 36_: [Windows] NoSuchProcess not raised when accessing timing methods.
-- 40_: test_get_cpu_times() failing on FreeBSD and macOS.
-- 42_: [Windows] get_memory_percent() raises AccessDenied.
-
-0.1.1
-=====
-
-*2009-03-06*
-
-**Enhancements**
-
-- 4_: FreeBSD support for all functions of psutil
-- 9_: Process.uid and Process.gid now retrieve process UID and GID.
-- 11_: Support for parent/ppid - Process.parent property returns a
-  Process object representing the parent process, and Process.ppid returns
-  the parent PID.
-- 12_ & 15:
-  NoSuchProcess exception now raised when creating an object
-  for a nonexistent process, or when retrieving information about a process
-  that has gone away.
-- 21_: AccessDenied exception created for raising access denied errors
-  from OSError or WindowsError on individual platforms.
-- 26_: psutil.process_iter() function to iterate over processes as
-  Process objects with a generator.
-- Process objects can now also be compared with == operator for equality
-  (PID, name, command line are compared).
-
-**Bug fixes**
-
-- 16_: [Windows] Special case for "System Idle Process" (PID 0) which
-  otherwise would return an "invalid parameter" exception.
-- 17_: get_process_list() ignores NoSuchProcess and AccessDenied
-  exceptions during building of the list.
-- 22_: [Windows] Process(0).kill() was failing with an unset exception.
-- 23_: Special case for pid_exists(0)
-- 24_: [Windows] Process(0).kill() now raises AccessDenied exception instead
-  of WindowsError.
-- 30_: psutil.get_pid_list() was returning two ins
-
-.. _1: https://github.com/giampaolo/psutil/issues/1
-.. _2: https://github.com/giampaolo/psutil/issues/2
-.. _3: https://github.com/giampaolo/psutil/issues/3
-.. _4: https://github.com/giampaolo/psutil/issues/4
-.. _5: https://github.com/giampaolo/psutil/issues/5
-.. _6: https://github.com/giampaolo/psutil/issues/6
-.. _7: https://github.com/giampaolo/psutil/issues/7
-.. _8: https://github.com/giampaolo/psutil/issues/8
-.. _9: https://github.com/giampaolo/psutil/issues/9
-.. _10: https://github.com/giampaolo/psutil/issues/10
-.. _11: https://github.com/giampaolo/psutil/issues/11
-.. _12: https://github.com/giampaolo/psutil/issues/12
-.. _13: https://github.com/giampaolo/psutil/issues/13
-.. _14: https://github.com/giampaolo/psutil/issues/14
-.. _15: https://github.com/giampaolo/psutil/issues/15
-.. _16: https://github.com/giampaolo/psutil/issues/16
-.. _17: https://github.com/giampaolo/psutil/issues/17
-.. _18: https://github.com/giampaolo/psutil/issues/18
-.. _19: https://github.com/giampaolo/psutil/issues/19
-.. _20: https://github.com/giampaolo/psutil/issues/20
-.. _21: https://github.com/giampaolo/psutil/issues/21
-.. _22: https://github.com/giampaolo/psutil/issues/22
-.. _23: https://github.com/giampaolo/psutil/issues/23
-.. _24: https://github.com/giampaolo/psutil/issues/24
-.. _25: https://github.com/giampaolo/psutil/issues/25
-.. _26: https://github.com/giampaolo/psutil/issues/26
-.. _27: https://github.com/giampaolo/psutil/issues/27
-.. _28: https://github.com/giampaolo/psutil/issues/28
-.. _29: https://github.com/giampaolo/psutil/issues/29
-.. _30: https://github.com/giampaolo/psutil/issues/30
-.. _31: https://github.com/giampaolo/psutil/issues/31
-.. _32: https://github.com/giampaolo/psutil/issues/32
-.. _33: https://github.com/giampaolo/psutil/issues/33
-.. _34: https://github.com/giampaolo/psutil/issues/34
-.. _35: https://github.com/giampaolo/psutil/issues/35
-.. _36: https://github.com/giampaolo/psutil/issues/36
-.. _37: https://github.com/giampaolo/psutil/issues/37
-.. _38: https://github.com/giampaolo/psutil/issues/38
-.. _39: https://github.com/giampaolo/psutil/issues/39
-.. _40: https://github.com/giampaolo/psutil/issues/40
-.. _41: https://github.com/giampaolo/psutil/issues/41
-.. _42: https://github.com/giampaolo/psutil/issues/42
-.. _43: https://github.com/giampaolo/psutil/issues/43
-.. _44: https://github.com/giampaolo/psutil/issues/44
-.. _45: https://github.com/giampaolo/psutil/issues/45
-.. _46: https://github.com/giampaolo/psutil/issues/46
-.. _47: https://github.com/giampaolo/psutil/issues/47
-.. _48: https://github.com/giampaolo/psutil/issues/48
-.. _49: https://github.com/giampaolo/psutil/issues/49
-.. _50: https://github.com/giampaolo/psutil/issues/50
-.. _51: https://github.com/giampaolo/psutil/issues/51
-.. _52: https://github.com/giampaolo/psutil/issues/52
-.. _53: https://github.com/giampaolo/psutil/issues/53
-.. _54: https://github.com/giampaolo/psutil/issues/54
-.. _55: https://github.com/giampaolo/psutil/issues/55
-.. _56: https://github.com/giampaolo/psutil/issues/56
-.. _57: https://github.com/giampaolo/psutil/issues/57
-.. _58: https://github.com/giampaolo/psutil/issues/58
-.. _59: https://github.com/giampaolo/psutil/issues/59
-.. _60: https://github.com/giampaolo/psutil/issues/60
-.. _61: https://github.com/giampaolo/psutil/issues/61
-.. _62: https://github.com/giampaolo/psutil/issues/62
-.. _63: https://github.com/giampaolo/psutil/issues/63
-.. _64: https://github.com/giampaolo/psutil/issues/64
-.. _65: https://github.com/giampaolo/psutil/issues/65
-.. _66: https://github.com/giampaolo/psutil/issues/66
-.. _67: https://github.com/giampaolo/psutil/issues/67
-.. _68: https://github.com/giampaolo/psutil/issues/68
-.. _69: https://github.com/giampaolo/psutil/issues/69
-.. _70: https://github.com/giampaolo/psutil/issues/70
-.. _71: https://github.com/giampaolo/psutil/issues/71
-.. _72: https://github.com/giampaolo/psutil/issues/72
-.. _73: https://github.com/giampaolo/psutil/issues/73
-.. _74: https://github.com/giampaolo/psutil/issues/74
-.. _75: https://github.com/giampaolo/psutil/issues/75
-.. _76: https://github.com/giampaolo/psutil/issues/76
-.. _77: https://github.com/giampaolo/psutil/issues/77
-.. _78: https://github.com/giampaolo/psutil/issues/78
-.. _79: https://github.com/giampaolo/psutil/issues/79
-.. _80: https://github.com/giampaolo/psutil/issues/80
-.. _81: https://github.com/giampaolo/psutil/issues/81
-.. _82: https://github.com/giampaolo/psutil/issues/82
-.. _83: https://github.com/giampaolo/psutil/issues/83
-.. _84: https://github.com/giampaolo/psutil/issues/84
-.. _85: https://github.com/giampaolo/psutil/issues/85
-.. _86: https://github.com/giampaolo/psutil/issues/86
-.. _87: https://github.com/giampaolo/psutil/issues/87
-.. _88: https://github.com/giampaolo/psutil/issues/88
-.. _89: https://github.com/giampaolo/psutil/issues/89
-.. _90: https://github.com/giampaolo/psutil/issues/90
-.. _91: https://github.com/giampaolo/psutil/issues/91
-.. _92: https://github.com/giampaolo/psutil/issues/92
-.. _93: https://github.com/giampaolo/psutil/issues/93
-.. _94: https://github.com/giampaolo/psutil/issues/94
-.. _95: https://github.com/giampaolo/psutil/issues/95
-.. _96: https://github.com/giampaolo/psutil/issues/96
-.. _97: https://github.com/giampaolo/psutil/issues/97
-.. _98: https://github.com/giampaolo/psutil/issues/98
-.. _99: https://github.com/giampaolo/psutil/issues/99
-.. _100: https://github.com/giampaolo/psutil/issues/100
-.. _101: https://github.com/giampaolo/psutil/issues/101
-.. _102: https://github.com/giampaolo/psutil/issues/102
-.. _103: https://github.com/giampaolo/psutil/issues/103
-.. _104: https://github.com/giampaolo/psutil/issues/104
-.. _105: https://github.com/giampaolo/psutil/issues/105
-.. _106: https://github.com/giampaolo/psutil/issues/106
-.. _107: https://github.com/giampaolo/psutil/issues/107
-.. _108: https://github.com/giampaolo/psutil/issues/108
-.. _109: https://github.com/giampaolo/psutil/issues/109
-.. _110: https://github.com/giampaolo/psutil/issues/110
-.. _111: https://github.com/giampaolo/psutil/issues/111
-.. _112: https://github.com/giampaolo/psutil/issues/112
-.. _113: https://github.com/giampaolo/psutil/issues/113
-.. _114: https://github.com/giampaolo/psutil/issues/114
-.. _115: https://github.com/giampaolo/psutil/issues/115
-.. _116: https://github.com/giampaolo/psutil/issues/116
-.. _117: https://github.com/giampaolo/psutil/issues/117
-.. _118: https://github.com/giampaolo/psutil/issues/118
-.. _119: https://github.com/giampaolo/psutil/issues/119
-.. _120: https://github.com/giampaolo/psutil/issues/120
-.. _121: https://github.com/giampaolo/psutil/issues/121
-.. _122: https://github.com/giampaolo/psutil/issues/122
-.. _123: https://github.com/giampaolo/psutil/issues/123
-.. _124: https://github.com/giampaolo/psutil/issues/124
-.. _125: https://github.com/giampaolo/psutil/issues/125
-.. _126: https://github.com/giampaolo/psutil/issues/126
-.. _127: https://github.com/giampaolo/psutil/issues/127
-.. _128: https://github.com/giampaolo/psutil/issues/128
-.. _129: https://github.com/giampaolo/psutil/issues/129
-.. _130: https://github.com/giampaolo/psutil/issues/130
-.. _131: https://github.com/giampaolo/psutil/issues/131
-.. _132: https://github.com/giampaolo/psutil/issues/132
-.. _133: https://github.com/giampaolo/psutil/issues/133
-.. _134: https://github.com/giampaolo/psutil/issues/134
-.. _135: https://github.com/giampaolo/psutil/issues/135
-.. _136: https://github.com/giampaolo/psutil/issues/136
-.. _137: https://github.com/giampaolo/psutil/issues/137
-.. _138: https://github.com/giampaolo/psutil/issues/138
-.. _139: https://github.com/giampaolo/psutil/issues/139
-.. _140: https://github.com/giampaolo/psutil/issues/140
-.. _141: https://github.com/giampaolo/psutil/issues/141
-.. _142: https://github.com/giampaolo/psutil/issues/142
-.. _143: https://github.com/giampaolo/psutil/issues/143
-.. _144: https://github.com/giampaolo/psutil/issues/144
-.. _145: https://github.com/giampaolo/psutil/issues/145
-.. _146: https://github.com/giampaolo/psutil/issues/146
-.. _147: https://github.com/giampaolo/psutil/issues/147
-.. _148: https://github.com/giampaolo/psutil/issues/148
-.. _149: https://github.com/giampaolo/psutil/issues/149
-.. _150: https://github.com/giampaolo/psutil/issues/150
-.. _151: https://github.com/giampaolo/psutil/issues/151
-.. _152: https://github.com/giampaolo/psutil/issues/152
-.. _153: https://github.com/giampaolo/psutil/issues/153
-.. _154: https://github.com/giampaolo/psutil/issues/154
-.. _155: https://github.com/giampaolo/psutil/issues/155
-.. _156: https://github.com/giampaolo/psutil/issues/156
-.. _157: https://github.com/giampaolo/psutil/issues/157
-.. _158: https://github.com/giampaolo/psutil/issues/158
-.. _159: https://github.com/giampaolo/psutil/issues/159
-.. _160: https://github.com/giampaolo/psutil/issues/160
-.. _161: https://github.com/giampaolo/psutil/issues/161
-.. _162: https://github.com/giampaolo/psutil/issues/162
-.. _163: https://github.com/giampaolo/psutil/issues/163
-.. _164: https://github.com/giampaolo/psutil/issues/164
-.. _165: https://github.com/giampaolo/psutil/issues/165
-.. _166: https://github.com/giampaolo/psutil/issues/166
-.. _167: https://github.com/giampaolo/psutil/issues/167
-.. _168: https://github.com/giampaolo/psutil/issues/168
-.. _169: https://github.com/giampaolo/psutil/issues/169
-.. _170: https://github.com/giampaolo/psutil/issues/170
-.. _171: https://github.com/giampaolo/psutil/issues/171
-.. _172: https://github.com/giampaolo/psutil/issues/172
-.. _173: https://github.com/giampaolo/psutil/issues/173
-.. _174: https://github.com/giampaolo/psutil/issues/174
-.. _175: https://github.com/giampaolo/psutil/issues/175
-.. _176: https://github.com/giampaolo/psutil/issues/176
-.. _177: https://github.com/giampaolo/psutil/issues/177
-.. _178: https://github.com/giampaolo/psutil/issues/178
-.. _179: https://github.com/giampaolo/psutil/issues/179
-.. _180: https://github.com/giampaolo/psutil/issues/180
-.. _181: https://github.com/giampaolo/psutil/issues/181
-.. _182: https://github.com/giampaolo/psutil/issues/182
-.. _183: https://github.com/giampaolo/psutil/issues/183
-.. _184: https://github.com/giampaolo/psutil/issues/184
-.. _185: https://github.com/giampaolo/psutil/issues/185
-.. _186: https://github.com/giampaolo/psutil/issues/186
-.. _187: https://github.com/giampaolo/psutil/issues/187
-.. _188: https://github.com/giampaolo/psutil/issues/188
-.. _189: https://github.com/giampaolo/psutil/issues/189
-.. _190: https://github.com/giampaolo/psutil/issues/190
-.. _191: https://github.com/giampaolo/psutil/issues/191
-.. _192: https://github.com/giampaolo/psutil/issues/192
-.. _193: https://github.com/giampaolo/psutil/issues/193
-.. _194: https://github.com/giampaolo/psutil/issues/194
-.. _195: https://github.com/giampaolo/psutil/issues/195
-.. _196: https://github.com/giampaolo/psutil/issues/196
-.. _197: https://github.com/giampaolo/psutil/issues/197
-.. _198: https://github.com/giampaolo/psutil/issues/198
-.. _199: https://github.com/giampaolo/psutil/issues/199
-.. _200: https://github.com/giampaolo/psutil/issues/200
-.. _201: https://github.com/giampaolo/psutil/issues/201
-.. _202: https://github.com/giampaolo/psutil/issues/202
-.. _203: https://github.com/giampaolo/psutil/issues/203
-.. _204: https://github.com/giampaolo/psutil/issues/204
-.. _205: https://github.com/giampaolo/psutil/issues/205
-.. _206: https://github.com/giampaolo/psutil/issues/206
-.. _207: https://github.com/giampaolo/psutil/issues/207
-.. _208: https://github.com/giampaolo/psutil/issues/208
-.. _209: https://github.com/giampaolo/psutil/issues/209
-.. _210: https://github.com/giampaolo/psutil/issues/210
-.. _211: https://github.com/giampaolo/psutil/issues/211
-.. _212: https://github.com/giampaolo/psutil/issues/212
-.. _213: https://github.com/giampaolo/psutil/issues/213
-.. _214: https://github.com/giampaolo/psutil/issues/214
-.. _215: https://github.com/giampaolo/psutil/issues/215
-.. _216: https://github.com/giampaolo/psutil/issues/216
-.. _217: https://github.com/giampaolo/psutil/issues/217
-.. _218: https://github.com/giampaolo/psutil/issues/218
-.. _219: https://github.com/giampaolo/psutil/issues/219
-.. _220: https://github.com/giampaolo/psutil/issues/220
-.. _221: https://github.com/giampaolo/psutil/issues/221
-.. _222: https://github.com/giampaolo/psutil/issues/222
-.. _223: https://github.com/giampaolo/psutil/issues/223
-.. _224: https://github.com/giampaolo/psutil/issues/224
-.. _225: https://github.com/giampaolo/psutil/issues/225
-.. _226: https://github.com/giampaolo/psutil/issues/226
-.. _227: https://github.com/giampaolo/psutil/issues/227
-.. _228: https://github.com/giampaolo/psutil/issues/228
-.. _229: https://github.com/giampaolo/psutil/issues/229
-.. _230: https://github.com/giampaolo/psutil/issues/230
-.. _231: https://github.com/giampaolo/psutil/issues/231
-.. _232: https://github.com/giampaolo/psutil/issues/232
-.. _233: https://github.com/giampaolo/psutil/issues/233
-.. _234: https://github.com/giampaolo/psutil/issues/234
-.. _235: https://github.com/giampaolo/psutil/issues/235
-.. _236: https://github.com/giampaolo/psutil/issues/236
-.. _237: https://github.com/giampaolo/psutil/issues/237
-.. _238: https://github.com/giampaolo/psutil/issues/238
-.. _239: https://github.com/giampaolo/psutil/issues/239
-.. _240: https://github.com/giampaolo/psutil/issues/240
-.. _241: https://github.com/giampaolo/psutil/issues/241
-.. _242: https://github.com/giampaolo/psutil/issues/242
-.. _243: https://github.com/giampaolo/psutil/issues/243
-.. _244: https://github.com/giampaolo/psutil/issues/244
-.. _245: https://github.com/giampaolo/psutil/issues/245
-.. _246: https://github.com/giampaolo/psutil/issues/246
-.. _247: https://github.com/giampaolo/psutil/issues/247
-.. _248: https://github.com/giampaolo/psutil/issues/248
-.. _249: https://github.com/giampaolo/psutil/issues/249
-.. _250: https://github.com/giampaolo/psutil/issues/250
-.. _251: https://github.com/giampaolo/psutil/issues/251
-.. _252: https://github.com/giampaolo/psutil/issues/252
-.. _253: https://github.com/giampaolo/psutil/issues/253
-.. _254: https://github.com/giampaolo/psutil/issues/254
-.. _255: https://github.com/giampaolo/psutil/issues/255
-.. _256: https://github.com/giampaolo/psutil/issues/256
-.. _257: https://github.com/giampaolo/psutil/issues/257
-.. _258: https://github.com/giampaolo/psutil/issues/258
-.. _259: https://github.com/giampaolo/psutil/issues/259
-.. _260: https://github.com/giampaolo/psutil/issues/260
-.. _261: https://github.com/giampaolo/psutil/issues/261
-.. _262: https://github.com/giampaolo/psutil/issues/262
-.. _263: https://github.com/giampaolo/psutil/issues/263
-.. _264: https://github.com/giampaolo/psutil/issues/264
-.. _265: https://github.com/giampaolo/psutil/issues/265
-.. _266: https://github.com/giampaolo/psutil/issues/266
-.. _267: https://github.com/giampaolo/psutil/issues/267
-.. _268: https://github.com/giampaolo/psutil/issues/268
-.. _269: https://github.com/giampaolo/psutil/issues/269
-.. _270: https://github.com/giampaolo/psutil/issues/270
-.. _271: https://github.com/giampaolo/psutil/issues/271
-.. _272: https://github.com/giampaolo/psutil/issues/272
-.. _273: https://github.com/giampaolo/psutil/issues/273
-.. _274: https://github.com/giampaolo/psutil/issues/274
-.. _275: https://github.com/giampaolo/psutil/issues/275
-.. _276: https://github.com/giampaolo/psutil/issues/276
-.. _277: https://github.com/giampaolo/psutil/issues/277
-.. _278: https://github.com/giampaolo/psutil/issues/278
-.. _279: https://github.com/giampaolo/psutil/issues/279
-.. _280: https://github.com/giampaolo/psutil/issues/280
-.. _281: https://github.com/giampaolo/psutil/issues/281
-.. _282: https://github.com/giampaolo/psutil/issues/282
-.. _283: https://github.com/giampaolo/psutil/issues/283
-.. _284: https://github.com/giampaolo/psutil/issues/284
-.. _285: https://github.com/giampaolo/psutil/issues/285
-.. _286: https://github.com/giampaolo/psutil/issues/286
-.. _287: https://github.com/giampaolo/psutil/issues/287
-.. _288: https://github.com/giampaolo/psutil/issues/288
-.. _289: https://github.com/giampaolo/psutil/issues/289
-.. _290: https://github.com/giampaolo/psutil/issues/290
-.. _291: https://github.com/giampaolo/psutil/issues/291
-.. _292: https://github.com/giampaolo/psutil/issues/292
-.. _293: https://github.com/giampaolo/psutil/issues/293
-.. _294: https://github.com/giampaolo/psutil/issues/294
-.. _295: https://github.com/giampaolo/psutil/issues/295
-.. _296: https://github.com/giampaolo/psutil/issues/296
-.. _297: https://github.com/giampaolo/psutil/issues/297
-.. _298: https://github.com/giampaolo/psutil/issues/298
-.. _299: https://github.com/giampaolo/psutil/issues/299
-.. _300: https://github.com/giampaolo/psutil/issues/300
-.. _301: https://github.com/giampaolo/psutil/issues/301
-.. _302: https://github.com/giampaolo/psutil/issues/302
-.. _303: https://github.com/giampaolo/psutil/issues/303
-.. _304: https://github.com/giampaolo/psutil/issues/304
-.. _305: https://github.com/giampaolo/psutil/issues/305
-.. _306: https://github.com/giampaolo/psutil/issues/306
-.. _307: https://github.com/giampaolo/psutil/issues/307
-.. _308: https://github.com/giampaolo/psutil/issues/308
-.. _309: https://github.com/giampaolo/psutil/issues/309
-.. _310: https://github.com/giampaolo/psutil/issues/310
-.. _311: https://github.com/giampaolo/psutil/issues/311
-.. _312: https://github.com/giampaolo/psutil/issues/312
-.. _313: https://github.com/giampaolo/psutil/issues/313
-.. _314: https://github.com/giampaolo/psutil/issues/314
-.. _315: https://github.com/giampaolo/psutil/issues/315
-.. _316: https://github.com/giampaolo/psutil/issues/316
-.. _317: https://github.com/giampaolo/psutil/issues/317
-.. _318: https://github.com/giampaolo/psutil/issues/318
-.. _319: https://github.com/giampaolo/psutil/issues/319
-.. _320: https://github.com/giampaolo/psutil/issues/320
-.. _321: https://github.com/giampaolo/psutil/issues/321
-.. _322: https://github.com/giampaolo/psutil/issues/322
-.. _323: https://github.com/giampaolo/psutil/issues/323
-.. _324: https://github.com/giampaolo/psutil/issues/324
-.. _325: https://github.com/giampaolo/psutil/issues/325
-.. _326: https://github.com/giampaolo/psutil/issues/326
-.. _327: https://github.com/giampaolo/psutil/issues/327
-.. _328: https://github.com/giampaolo/psutil/issues/328
-.. _329: https://github.com/giampaolo/psutil/issues/329
-.. _330: https://github.com/giampaolo/psutil/issues/330
-.. _331: https://github.com/giampaolo/psutil/issues/331
-.. _332: https://github.com/giampaolo/psutil/issues/332
-.. _333: https://github.com/giampaolo/psutil/issues/333
-.. _334: https://github.com/giampaolo/psutil/issues/334
-.. _335: https://github.com/giampaolo/psutil/issues/335
-.. _336: https://github.com/giampaolo/psutil/issues/336
-.. _337: https://github.com/giampaolo/psutil/issues/337
-.. _338: https://github.com/giampaolo/psutil/issues/338
-.. _339: https://github.com/giampaolo/psutil/issues/339
-.. _340: https://github.com/giampaolo/psutil/issues/340
-.. _341: https://github.com/giampaolo/psutil/issues/341
-.. _342: https://github.com/giampaolo/psutil/issues/342
-.. _343: https://github.com/giampaolo/psutil/issues/343
-.. _344: https://github.com/giampaolo/psutil/issues/344
-.. _345: https://github.com/giampaolo/psutil/issues/345
-.. _346: https://github.com/giampaolo/psutil/issues/346
-.. _347: https://github.com/giampaolo/psutil/issues/347
-.. _348: https://github.com/giampaolo/psutil/issues/348
-.. _349: https://github.com/giampaolo/psutil/issues/349
-.. _350: https://github.com/giampaolo/psutil/issues/350
-.. _351: https://github.com/giampaolo/psutil/issues/351
-.. _352: https://github.com/giampaolo/psutil/issues/352
-.. _353: https://github.com/giampaolo/psutil/issues/353
-.. _354: https://github.com/giampaolo/psutil/issues/354
-.. _355: https://github.com/giampaolo/psutil/issues/355
-.. _356: https://github.com/giampaolo/psutil/issues/356
-.. _357: https://github.com/giampaolo/psutil/issues/357
-.. _358: https://github.com/giampaolo/psutil/issues/358
-.. _359: https://github.com/giampaolo/psutil/issues/359
-.. _360: https://github.com/giampaolo/psutil/issues/360
-.. _361: https://github.com/giampaolo/psutil/issues/361
-.. _362: https://github.com/giampaolo/psutil/issues/362
-.. _363: https://github.com/giampaolo/psutil/issues/363
-.. _364: https://github.com/giampaolo/psutil/issues/364
-.. _365: https://github.com/giampaolo/psutil/issues/365
-.. _366: https://github.com/giampaolo/psutil/issues/366
-.. _367: https://github.com/giampaolo/psutil/issues/367
-.. _368: https://github.com/giampaolo/psutil/issues/368
-.. _369: https://github.com/giampaolo/psutil/issues/369
-.. _370: https://github.com/giampaolo/psutil/issues/370
-.. _371: https://github.com/giampaolo/psutil/issues/371
-.. _372: https://github.com/giampaolo/psutil/issues/372
-.. _373: https://github.com/giampaolo/psutil/issues/373
-.. _374: https://github.com/giampaolo/psutil/issues/374
-.. _375: https://github.com/giampaolo/psutil/issues/375
-.. _376: https://github.com/giampaolo/psutil/issues/376
-.. _377: https://github.com/giampaolo/psutil/issues/377
-.. _378: https://github.com/giampaolo/psutil/issues/378
-.. _379: https://github.com/giampaolo/psutil/issues/379
-.. _380: https://github.com/giampaolo/psutil/issues/380
-.. _381: https://github.com/giampaolo/psutil/issues/381
-.. _382: https://github.com/giampaolo/psutil/issues/382
-.. _383: https://github.com/giampaolo/psutil/issues/383
-.. _384: https://github.com/giampaolo/psutil/issues/384
-.. _385: https://github.com/giampaolo/psutil/issues/385
-.. _386: https://github.com/giampaolo/psutil/issues/386
-.. _387: https://github.com/giampaolo/psutil/issues/387
-.. _388: https://github.com/giampaolo/psutil/issues/388
-.. _389: https://github.com/giampaolo/psutil/issues/389
-.. _390: https://github.com/giampaolo/psutil/issues/390
-.. _391: https://github.com/giampaolo/psutil/issues/391
-.. _392: https://github.com/giampaolo/psutil/issues/392
-.. _393: https://github.com/giampaolo/psutil/issues/393
-.. _394: https://github.com/giampaolo/psutil/issues/394
-.. _395: https://github.com/giampaolo/psutil/issues/395
-.. _396: https://github.com/giampaolo/psutil/issues/396
-.. _397: https://github.com/giampaolo/psutil/issues/397
-.. _398: https://github.com/giampaolo/psutil/issues/398
-.. _399: https://github.com/giampaolo/psutil/issues/399
-.. _400: https://github.com/giampaolo/psutil/issues/400
-.. _401: https://github.com/giampaolo/psutil/issues/401
-.. _402: https://github.com/giampaolo/psutil/issues/402
-.. _403: https://github.com/giampaolo/psutil/issues/403
-.. _404: https://github.com/giampaolo/psutil/issues/404
-.. _405: https://github.com/giampaolo/psutil/issues/405
-.. _406: https://github.com/giampaolo/psutil/issues/406
-.. _407: https://github.com/giampaolo/psutil/issues/407
-.. _408: https://github.com/giampaolo/psutil/issues/408
-.. _409: https://github.com/giampaolo/psutil/issues/409
-.. _410: https://github.com/giampaolo/psutil/issues/410
-.. _411: https://github.com/giampaolo/psutil/issues/411
-.. _412: https://github.com/giampaolo/psutil/issues/412
-.. _413: https://github.com/giampaolo/psutil/issues/413
-.. _414: https://github.com/giampaolo/psutil/issues/414
-.. _415: https://github.com/giampaolo/psutil/issues/415
-.. _416: https://github.com/giampaolo/psutil/issues/416
-.. _417: https://github.com/giampaolo/psutil/issues/417
-.. _418: https://github.com/giampaolo/psutil/issues/418
-.. _419: https://github.com/giampaolo/psutil/issues/419
-.. _420: https://github.com/giampaolo/psutil/issues/420
-.. _421: https://github.com/giampaolo/psutil/issues/421
-.. _422: https://github.com/giampaolo/psutil/issues/422
-.. _423: https://github.com/giampaolo/psutil/issues/423
-.. _424: https://github.com/giampaolo/psutil/issues/424
-.. _425: https://github.com/giampaolo/psutil/issues/425
-.. _426: https://github.com/giampaolo/psutil/issues/426
-.. _427: https://github.com/giampaolo/psutil/issues/427
-.. _428: https://github.com/giampaolo/psutil/issues/428
-.. _429: https://github.com/giampaolo/psutil/issues/429
-.. _430: https://github.com/giampaolo/psutil/issues/430
-.. _431: https://github.com/giampaolo/psutil/issues/431
-.. _432: https://github.com/giampaolo/psutil/issues/432
-.. _433: https://github.com/giampaolo/psutil/issues/433
-.. _434: https://github.com/giampaolo/psutil/issues/434
-.. _435: https://github.com/giampaolo/psutil/issues/435
-.. _436: https://github.com/giampaolo/psutil/issues/436
-.. _437: https://github.com/giampaolo/psutil/issues/437
-.. _438: https://github.com/giampaolo/psutil/issues/438
-.. _439: https://github.com/giampaolo/psutil/issues/439
-.. _440: https://github.com/giampaolo/psutil/issues/440
-.. _441: https://github.com/giampaolo/psutil/issues/441
-.. _442: https://github.com/giampaolo/psutil/issues/442
-.. _443: https://github.com/giampaolo/psutil/issues/443
-.. _444: https://github.com/giampaolo/psutil/issues/444
-.. _445: https://github.com/giampaolo/psutil/issues/445
-.. _446: https://github.com/giampaolo/psutil/issues/446
-.. _447: https://github.com/giampaolo/psutil/issues/447
-.. _448: https://github.com/giampaolo/psutil/issues/448
-.. _449: https://github.com/giampaolo/psutil/issues/449
-.. _450: https://github.com/giampaolo/psutil/issues/450
-.. _451: https://github.com/giampaolo/psutil/issues/451
-.. _452: https://github.com/giampaolo/psutil/issues/452
-.. _453: https://github.com/giampaolo/psutil/issues/453
-.. _454: https://github.com/giampaolo/psutil/issues/454
-.. _455: https://github.com/giampaolo/psutil/issues/455
-.. _456: https://github.com/giampaolo/psutil/issues/456
-.. _457: https://github.com/giampaolo/psutil/issues/457
-.. _458: https://github.com/giampaolo/psutil/issues/458
-.. _459: https://github.com/giampaolo/psutil/issues/459
-.. _460: https://github.com/giampaolo/psutil/issues/460
-.. _461: https://github.com/giampaolo/psutil/issues/461
-.. _462: https://github.com/giampaolo/psutil/issues/462
-.. _463: https://github.com/giampaolo/psutil/issues/463
-.. _464: https://github.com/giampaolo/psutil/issues/464
-.. _465: https://github.com/giampaolo/psutil/issues/465
-.. _466: https://github.com/giampaolo/psutil/issues/466
-.. _467: https://github.com/giampaolo/psutil/issues/467
-.. _468: https://github.com/giampaolo/psutil/issues/468
-.. _469: https://github.com/giampaolo/psutil/issues/469
-.. _470: https://github.com/giampaolo/psutil/issues/470
-.. _471: https://github.com/giampaolo/psutil/issues/471
-.. _472: https://github.com/giampaolo/psutil/issues/472
-.. _473: https://github.com/giampaolo/psutil/issues/473
-.. _474: https://github.com/giampaolo/psutil/issues/474
-.. _475: https://github.com/giampaolo/psutil/issues/475
-.. _476: https://github.com/giampaolo/psutil/issues/476
-.. _477: https://github.com/giampaolo/psutil/issues/477
-.. _478: https://github.com/giampaolo/psutil/issues/478
-.. _479: https://github.com/giampaolo/psutil/issues/479
-.. _480: https://github.com/giampaolo/psutil/issues/480
-.. _481: https://github.com/giampaolo/psutil/issues/481
-.. _482: https://github.com/giampaolo/psutil/issues/482
-.. _483: https://github.com/giampaolo/psutil/issues/483
-.. _484: https://github.com/giampaolo/psutil/issues/484
-.. _485: https://github.com/giampaolo/psutil/issues/485
-.. _486: https://github.com/giampaolo/psutil/issues/486
-.. _487: https://github.com/giampaolo/psutil/issues/487
-.. _488: https://github.com/giampaolo/psutil/issues/488
-.. _489: https://github.com/giampaolo/psutil/issues/489
-.. _490: https://github.com/giampaolo/psutil/issues/490
-.. _491: https://github.com/giampaolo/psutil/issues/491
-.. _492: https://github.com/giampaolo/psutil/issues/492
-.. _493: https://github.com/giampaolo/psutil/issues/493
-.. _494: https://github.com/giampaolo/psutil/issues/494
-.. _495: https://github.com/giampaolo/psutil/issues/495
-.. _496: https://github.com/giampaolo/psutil/issues/496
-.. _497: https://github.com/giampaolo/psutil/issues/497
-.. _498: https://github.com/giampaolo/psutil/issues/498
-.. _499: https://github.com/giampaolo/psutil/issues/499
-.. _500: https://github.com/giampaolo/psutil/issues/500
-.. _501: https://github.com/giampaolo/psutil/issues/501
-.. _502: https://github.com/giampaolo/psutil/issues/502
-.. _503: https://github.com/giampaolo/psutil/issues/503
-.. _504: https://github.com/giampaolo/psutil/issues/504
-.. _505: https://github.com/giampaolo/psutil/issues/505
-.. _506: https://github.com/giampaolo/psutil/issues/506
-.. _507: https://github.com/giampaolo/psutil/issues/507
-.. _508: https://github.com/giampaolo/psutil/issues/508
-.. _509: https://github.com/giampaolo/psutil/issues/509
-.. _510: https://github.com/giampaolo/psutil/issues/510
-.. _511: https://github.com/giampaolo/psutil/issues/511
-.. _512: https://github.com/giampaolo/psutil/issues/512
-.. _513: https://github.com/giampaolo/psutil/issues/513
-.. _514: https://github.com/giampaolo/psutil/issues/514
-.. _515: https://github.com/giampaolo/psutil/issues/515
-.. _516: https://github.com/giampaolo/psutil/issues/516
-.. _517: https://github.com/giampaolo/psutil/issues/517
-.. _518: https://github.com/giampaolo/psutil/issues/518
-.. _519: https://github.com/giampaolo/psutil/issues/519
-.. _520: https://github.com/giampaolo/psutil/issues/520
-.. _521: https://github.com/giampaolo/psutil/issues/521
-.. _522: https://github.com/giampaolo/psutil/issues/522
-.. _523: https://github.com/giampaolo/psutil/issues/523
-.. _524: https://github.com/giampaolo/psutil/issues/524
-.. _525: https://github.com/giampaolo/psutil/issues/525
-.. _526: https://github.com/giampaolo/psutil/issues/526
-.. _527: https://github.com/giampaolo/psutil/issues/527
-.. _528: https://github.com/giampaolo/psutil/issues/528
-.. _529: https://github.com/giampaolo/psutil/issues/529
-.. _530: https://github.com/giampaolo/psutil/issues/530
-.. _531: https://github.com/giampaolo/psutil/issues/531
-.. _532: https://github.com/giampaolo/psutil/issues/532
-.. _533: https://github.com/giampaolo/psutil/issues/533
-.. _534: https://github.com/giampaolo/psutil/issues/534
-.. _535: https://github.com/giampaolo/psutil/issues/535
-.. _536: https://github.com/giampaolo/psutil/issues/536
-.. _537: https://github.com/giampaolo/psutil/issues/537
-.. _538: https://github.com/giampaolo/psutil/issues/538
-.. _539: https://github.com/giampaolo/psutil/issues/539
-.. _540: https://github.com/giampaolo/psutil/issues/540
-.. _541: https://github.com/giampaolo/psutil/issues/541
-.. _542: https://github.com/giampaolo/psutil/issues/542
-.. _543: https://github.com/giampaolo/psutil/issues/543
-.. _544: https://github.com/giampaolo/psutil/issues/544
-.. _545: https://github.com/giampaolo/psutil/issues/545
-.. _546: https://github.com/giampaolo/psutil/issues/546
-.. _547: https://github.com/giampaolo/psutil/issues/547
-.. _548: https://github.com/giampaolo/psutil/issues/548
-.. _549: https://github.com/giampaolo/psutil/issues/549
-.. _550: https://github.com/giampaolo/psutil/issues/550
-.. _551: https://github.com/giampaolo/psutil/issues/551
-.. _552: https://github.com/giampaolo/psutil/issues/552
-.. _553: https://github.com/giampaolo/psutil/issues/553
-.. _554: https://github.com/giampaolo/psutil/issues/554
-.. _555: https://github.com/giampaolo/psutil/issues/555
-.. _556: https://github.com/giampaolo/psutil/issues/556
-.. _557: https://github.com/giampaolo/psutil/issues/557
-.. _558: https://github.com/giampaolo/psutil/issues/558
-.. _559: https://github.com/giampaolo/psutil/issues/559
-.. _560: https://github.com/giampaolo/psutil/issues/560
-.. _561: https://github.com/giampaolo/psutil/issues/561
-.. _562: https://github.com/giampaolo/psutil/issues/562
-.. _563: https://github.com/giampaolo/psutil/issues/563
-.. _564: https://github.com/giampaolo/psutil/issues/564
-.. _565: https://github.com/giampaolo/psutil/issues/565
-.. _566: https://github.com/giampaolo/psutil/issues/566
-.. _567: https://github.com/giampaolo/psutil/issues/567
-.. _568: https://github.com/giampaolo/psutil/issues/568
-.. _569: https://github.com/giampaolo/psutil/issues/569
-.. _570: https://github.com/giampaolo/psutil/issues/570
-.. _571: https://github.com/giampaolo/psutil/issues/571
-.. _572: https://github.com/giampaolo/psutil/issues/572
-.. _573: https://github.com/giampaolo/psutil/issues/573
-.. _574: https://github.com/giampaolo/psutil/issues/574
-.. _575: https://github.com/giampaolo/psutil/issues/575
-.. _576: https://github.com/giampaolo/psutil/issues/576
-.. _577: https://github.com/giampaolo/psutil/issues/577
-.. _578: https://github.com/giampaolo/psutil/issues/578
-.. _579: https://github.com/giampaolo/psutil/issues/579
-.. _580: https://github.com/giampaolo/psutil/issues/580
-.. _581: https://github.com/giampaolo/psutil/issues/581
-.. _582: https://github.com/giampaolo/psutil/issues/582
-.. _583: https://github.com/giampaolo/psutil/issues/583
-.. _584: https://github.com/giampaolo/psutil/issues/584
-.. _585: https://github.com/giampaolo/psutil/issues/585
-.. _586: https://github.com/giampaolo/psutil/issues/586
-.. _587: https://github.com/giampaolo/psutil/issues/587
-.. _588: https://github.com/giampaolo/psutil/issues/588
-.. _589: https://github.com/giampaolo/psutil/issues/589
-.. _590: https://github.com/giampaolo/psutil/issues/590
-.. _591: https://github.com/giampaolo/psutil/issues/591
-.. _592: https://github.com/giampaolo/psutil/issues/592
-.. _593: https://github.com/giampaolo/psutil/issues/593
-.. _594: https://github.com/giampaolo/psutil/issues/594
-.. _595: https://github.com/giampaolo/psutil/issues/595
-.. _596: https://github.com/giampaolo/psutil/issues/596
-.. _597: https://github.com/giampaolo/psutil/issues/597
-.. _598: https://github.com/giampaolo/psutil/issues/598
-.. _599: https://github.com/giampaolo/psutil/issues/599
-.. _600: https://github.com/giampaolo/psutil/issues/600
-.. _601: https://github.com/giampaolo/psutil/issues/601
-.. _602: https://github.com/giampaolo/psutil/issues/602
-.. _603: https://github.com/giampaolo/psutil/issues/603
-.. _604: https://github.com/giampaolo/psutil/issues/604
-.. _605: https://github.com/giampaolo/psutil/issues/605
-.. _606: https://github.com/giampaolo/psutil/issues/606
-.. _607: https://github.com/giampaolo/psutil/issues/607
-.. _608: https://github.com/giampaolo/psutil/issues/608
-.. _609: https://github.com/giampaolo/psutil/issues/609
-.. _610: https://github.com/giampaolo/psutil/issues/610
-.. _611: https://github.com/giampaolo/psutil/issues/611
-.. _612: https://github.com/giampaolo/psutil/issues/612
-.. _613: https://github.com/giampaolo/psutil/issues/613
-.. _614: https://github.com/giampaolo/psutil/issues/614
-.. _615: https://github.com/giampaolo/psutil/issues/615
-.. _616: https://github.com/giampaolo/psutil/issues/616
-.. _617: https://github.com/giampaolo/psutil/issues/617
-.. _618: https://github.com/giampaolo/psutil/issues/618
-.. _619: https://github.com/giampaolo/psutil/issues/619
-.. _620: https://github.com/giampaolo/psutil/issues/620
-.. _621: https://github.com/giampaolo/psutil/issues/621
-.. _622: https://github.com/giampaolo/psutil/issues/622
-.. _623: https://github.com/giampaolo/psutil/issues/623
-.. _624: https://github.com/giampaolo/psutil/issues/624
-.. _625: https://github.com/giampaolo/psutil/issues/625
-.. _626: https://github.com/giampaolo/psutil/issues/626
-.. _627: https://github.com/giampaolo/psutil/issues/627
-.. _628: https://github.com/giampaolo/psutil/issues/628
-.. _629: https://github.com/giampaolo/psutil/issues/629
-.. _630: https://github.com/giampaolo/psutil/issues/630
-.. _631: https://github.com/giampaolo/psutil/issues/631
-.. _632: https://github.com/giampaolo/psutil/issues/632
-.. _633: https://github.com/giampaolo/psutil/issues/633
-.. _634: https://github.com/giampaolo/psutil/issues/634
-.. _635: https://github.com/giampaolo/psutil/issues/635
-.. _636: https://github.com/giampaolo/psutil/issues/636
-.. _637: https://github.com/giampaolo/psutil/issues/637
-.. _638: https://github.com/giampaolo/psutil/issues/638
-.. _639: https://github.com/giampaolo/psutil/issues/639
-.. _640: https://github.com/giampaolo/psutil/issues/640
-.. _641: https://github.com/giampaolo/psutil/issues/641
-.. _642: https://github.com/giampaolo/psutil/issues/642
-.. _643: https://github.com/giampaolo/psutil/issues/643
-.. _644: https://github.com/giampaolo/psutil/issues/644
-.. _645: https://github.com/giampaolo/psutil/issues/645
-.. _646: https://github.com/giampaolo/psutil/issues/646
-.. _647: https://github.com/giampaolo/psutil/issues/647
-.. _648: https://github.com/giampaolo/psutil/issues/648
-.. _649: https://github.com/giampaolo/psutil/issues/649
-.. _650: https://github.com/giampaolo/psutil/issues/650
-.. _651: https://github.com/giampaolo/psutil/issues/651
-.. _652: https://github.com/giampaolo/psutil/issues/652
-.. _653: https://github.com/giampaolo/psutil/issues/653
-.. _654: https://github.com/giampaolo/psutil/issues/654
-.. _655: https://github.com/giampaolo/psutil/issues/655
-.. _656: https://github.com/giampaolo/psutil/issues/656
-.. _657: https://github.com/giampaolo/psutil/issues/657
-.. _658: https://github.com/giampaolo/psutil/issues/658
-.. _659: https://github.com/giampaolo/psutil/issues/659
-.. _660: https://github.com/giampaolo/psutil/issues/660
-.. _661: https://github.com/giampaolo/psutil/issues/661
-.. _662: https://github.com/giampaolo/psutil/issues/662
-.. _663: https://github.com/giampaolo/psutil/issues/663
-.. _664: https://github.com/giampaolo/psutil/issues/664
-.. _665: https://github.com/giampaolo/psutil/issues/665
-.. _666: https://github.com/giampaolo/psutil/issues/666
-.. _667: https://github.com/giampaolo/psutil/issues/667
-.. _668: https://github.com/giampaolo/psutil/issues/668
-.. _669: https://github.com/giampaolo/psutil/issues/669
-.. _670: https://github.com/giampaolo/psutil/issues/670
-.. _671: https://github.com/giampaolo/psutil/issues/671
-.. _672: https://github.com/giampaolo/psutil/issues/672
-.. _673: https://github.com/giampaolo/psutil/issues/673
-.. _674: https://github.com/giampaolo/psutil/issues/674
-.. _675: https://github.com/giampaolo/psutil/issues/675
-.. _676: https://github.com/giampaolo/psutil/issues/676
-.. _677: https://github.com/giampaolo/psutil/issues/677
-.. _678: https://github.com/giampaolo/psutil/issues/678
-.. _679: https://github.com/giampaolo/psutil/issues/679
-.. _680: https://github.com/giampaolo/psutil/issues/680
-.. _681: https://github.com/giampaolo/psutil/issues/681
-.. _682: https://github.com/giampaolo/psutil/issues/682
-.. _683: https://github.com/giampaolo/psutil/issues/683
-.. _684: https://github.com/giampaolo/psutil/issues/684
-.. _685: https://github.com/giampaolo/psutil/issues/685
-.. _686: https://github.com/giampaolo/psutil/issues/686
-.. _687: https://github.com/giampaolo/psutil/issues/687
-.. _688: https://github.com/giampaolo/psutil/issues/688
-.. _689: https://github.com/giampaolo/psutil/issues/689
-.. _690: https://github.com/giampaolo/psutil/issues/690
-.. _691: https://github.com/giampaolo/psutil/issues/691
-.. _692: https://github.com/giampaolo/psutil/issues/692
-.. _693: https://github.com/giampaolo/psutil/issues/693
-.. _694: https://github.com/giampaolo/psutil/issues/694
-.. _695: https://github.com/giampaolo/psutil/issues/695
-.. _696: https://github.com/giampaolo/psutil/issues/696
-.. _697: https://github.com/giampaolo/psutil/issues/697
-.. _698: https://github.com/giampaolo/psutil/issues/698
-.. _699: https://github.com/giampaolo/psutil/issues/699
-.. _700: https://github.com/giampaolo/psutil/issues/700
-.. _701: https://github.com/giampaolo/psutil/issues/701
-.. _702: https://github.com/giampaolo/psutil/issues/702
-.. _703: https://github.com/giampaolo/psutil/issues/703
-.. _704: https://github.com/giampaolo/psutil/issues/704
-.. _705: https://github.com/giampaolo/psutil/issues/705
-.. _706: https://github.com/giampaolo/psutil/issues/706
-.. _707: https://github.com/giampaolo/psutil/issues/707
-.. _708: https://github.com/giampaolo/psutil/issues/708
-.. _709: https://github.com/giampaolo/psutil/issues/709
-.. _710: https://github.com/giampaolo/psutil/issues/710
-.. _711: https://github.com/giampaolo/psutil/issues/711
-.. _712: https://github.com/giampaolo/psutil/issues/712
-.. _713: https://github.com/giampaolo/psutil/issues/713
-.. _714: https://github.com/giampaolo/psutil/issues/714
-.. _715: https://github.com/giampaolo/psutil/issues/715
-.. _716: https://github.com/giampaolo/psutil/issues/716
-.. _717: https://github.com/giampaolo/psutil/issues/717
-.. _718: https://github.com/giampaolo/psutil/issues/718
-.. _719: https://github.com/giampaolo/psutil/issues/719
-.. _720: https://github.com/giampaolo/psutil/issues/720
-.. _721: https://github.com/giampaolo/psutil/issues/721
-.. _722: https://github.com/giampaolo/psutil/issues/722
-.. _723: https://github.com/giampaolo/psutil/issues/723
-.. _724: https://github.com/giampaolo/psutil/issues/724
-.. _725: https://github.com/giampaolo/psutil/issues/725
-.. _726: https://github.com/giampaolo/psutil/issues/726
-.. _727: https://github.com/giampaolo/psutil/issues/727
-.. _728: https://github.com/giampaolo/psutil/issues/728
-.. _729: https://github.com/giampaolo/psutil/issues/729
-.. _730: https://github.com/giampaolo/psutil/issues/730
-.. _731: https://github.com/giampaolo/psutil/issues/731
-.. _732: https://github.com/giampaolo/psutil/issues/732
-.. _733: https://github.com/giampaolo/psutil/issues/733
-.. _734: https://github.com/giampaolo/psutil/issues/734
-.. _735: https://github.com/giampaolo/psutil/issues/735
-.. _736: https://github.com/giampaolo/psutil/issues/736
-.. _737: https://github.com/giampaolo/psutil/issues/737
-.. _738: https://github.com/giampaolo/psutil/issues/738
-.. _739: https://github.com/giampaolo/psutil/issues/739
-.. _740: https://github.com/giampaolo/psutil/issues/740
-.. _741: https://github.com/giampaolo/psutil/issues/741
-.. _742: https://github.com/giampaolo/psutil/issues/742
-.. _743: https://github.com/giampaolo/psutil/issues/743
-.. _744: https://github.com/giampaolo/psutil/issues/744
-.. _745: https://github.com/giampaolo/psutil/issues/745
-.. _746: https://github.com/giampaolo/psutil/issues/746
-.. _747: https://github.com/giampaolo/psutil/issues/747
-.. _748: https://github.com/giampaolo/psutil/issues/748
-.. _749: https://github.com/giampaolo/psutil/issues/749
-.. _750: https://github.com/giampaolo/psutil/issues/750
-.. _751: https://github.com/giampaolo/psutil/issues/751
-.. _752: https://github.com/giampaolo/psutil/issues/752
-.. _753: https://github.com/giampaolo/psutil/issues/753
-.. _754: https://github.com/giampaolo/psutil/issues/754
-.. _755: https://github.com/giampaolo/psutil/issues/755
-.. _756: https://github.com/giampaolo/psutil/issues/756
-.. _757: https://github.com/giampaolo/psutil/issues/757
-.. _758: https://github.com/giampaolo/psutil/issues/758
-.. _759: https://github.com/giampaolo/psutil/issues/759
-.. _760: https://github.com/giampaolo/psutil/issues/760
-.. _761: https://github.com/giampaolo/psutil/issues/761
-.. _762: https://github.com/giampaolo/psutil/issues/762
-.. _763: https://github.com/giampaolo/psutil/issues/763
-.. _764: https://github.com/giampaolo/psutil/issues/764
-.. _765: https://github.com/giampaolo/psutil/issues/765
-.. _766: https://github.com/giampaolo/psutil/issues/766
-.. _767: https://github.com/giampaolo/psutil/issues/767
-.. _768: https://github.com/giampaolo/psutil/issues/768
-.. _769: https://github.com/giampaolo/psutil/issues/769
-.. _770: https://github.com/giampaolo/psutil/issues/770
-.. _771: https://github.com/giampaolo/psutil/issues/771
-.. _772: https://github.com/giampaolo/psutil/issues/772
-.. _773: https://github.com/giampaolo/psutil/issues/773
-.. _774: https://github.com/giampaolo/psutil/issues/774
-.. _775: https://github.com/giampaolo/psutil/issues/775
-.. _776: https://github.com/giampaolo/psutil/issues/776
-.. _777: https://github.com/giampaolo/psutil/issues/777
-.. _778: https://github.com/giampaolo/psutil/issues/778
-.. _779: https://github.com/giampaolo/psutil/issues/779
-.. _780: https://github.com/giampaolo/psutil/issues/780
-.. _781: https://github.com/giampaolo/psutil/issues/781
-.. _782: https://github.com/giampaolo/psutil/issues/782
-.. _783: https://github.com/giampaolo/psutil/issues/783
-.. _784: https://github.com/giampaolo/psutil/issues/784
-.. _785: https://github.com/giampaolo/psutil/issues/785
-.. _786: https://github.com/giampaolo/psutil/issues/786
-.. _787: https://github.com/giampaolo/psutil/issues/787
-.. _788: https://github.com/giampaolo/psutil/issues/788
-.. _789: https://github.com/giampaolo/psutil/issues/789
-.. _790: https://github.com/giampaolo/psutil/issues/790
-.. _791: https://github.com/giampaolo/psutil/issues/791
-.. _792: https://github.com/giampaolo/psutil/issues/792
-.. _793: https://github.com/giampaolo/psutil/issues/793
-.. _794: https://github.com/giampaolo/psutil/issues/794
-.. _795: https://github.com/giampaolo/psutil/issues/795
-.. _796: https://github.com/giampaolo/psutil/issues/796
-.. _797: https://github.com/giampaolo/psutil/issues/797
-.. _798: https://github.com/giampaolo/psutil/issues/798
-.. _799: https://github.com/giampaolo/psutil/issues/799
-.. _800: https://github.com/giampaolo/psutil/issues/800
-.. _801: https://github.com/giampaolo/psutil/issues/801
-.. _802: https://github.com/giampaolo/psutil/issues/802
-.. _803: https://github.com/giampaolo/psutil/issues/803
-.. _804: https://github.com/giampaolo/psutil/issues/804
-.. _805: https://github.com/giampaolo/psutil/issues/805
-.. _806: https://github.com/giampaolo/psutil/issues/806
-.. _807: https://github.com/giampaolo/psutil/issues/807
-.. _808: https://github.com/giampaolo/psutil/issues/808
-.. _809: https://github.com/giampaolo/psutil/issues/809
-.. _810: https://github.com/giampaolo/psutil/issues/810
-.. _811: https://github.com/giampaolo/psutil/issues/811
-.. _812: https://github.com/giampaolo/psutil/issues/812
-.. _813: https://github.com/giampaolo/psutil/issues/813
-.. _814: https://github.com/giampaolo/psutil/issues/814
-.. _815: https://github.com/giampaolo/psutil/issues/815
-.. _816: https://github.com/giampaolo/psutil/issues/816
-.. _817: https://github.com/giampaolo/psutil/issues/817
-.. _818: https://github.com/giampaolo/psutil/issues/818
-.. _819: https://github.com/giampaolo/psutil/issues/819
-.. _820: https://github.com/giampaolo/psutil/issues/820
-.. _821: https://github.com/giampaolo/psutil/issues/821
-.. _822: https://github.com/giampaolo/psutil/issues/822
-.. _823: https://github.com/giampaolo/psutil/issues/823
-.. _824: https://github.com/giampaolo/psutil/issues/824
-.. _825: https://github.com/giampaolo/psutil/issues/825
-.. _826: https://github.com/giampaolo/psutil/issues/826
-.. _827: https://github.com/giampaolo/psutil/issues/827
-.. _828: https://github.com/giampaolo/psutil/issues/828
-.. _829: https://github.com/giampaolo/psutil/issues/829
-.. _830: https://github.com/giampaolo/psutil/issues/830
-.. _831: https://github.com/giampaolo/psutil/issues/831
-.. _832: https://github.com/giampaolo/psutil/issues/832
-.. _833: https://github.com/giampaolo/psutil/issues/833
-.. _834: https://github.com/giampaolo/psutil/issues/834
-.. _835: https://github.com/giampaolo/psutil/issues/835
-.. _836: https://github.com/giampaolo/psutil/issues/836
-.. _837: https://github.com/giampaolo/psutil/issues/837
-.. _838: https://github.com/giampaolo/psutil/issues/838
-.. _839: https://github.com/giampaolo/psutil/issues/839
-.. _840: https://github.com/giampaolo/psutil/issues/840
-.. _841: https://github.com/giampaolo/psutil/issues/841
-.. _842: https://github.com/giampaolo/psutil/issues/842
-.. _843: https://github.com/giampaolo/psutil/issues/843
-.. _844: https://github.com/giampaolo/psutil/issues/844
-.. _845: https://github.com/giampaolo/psutil/issues/845
-.. _846: https://github.com/giampaolo/psutil/issues/846
-.. _847: https://github.com/giampaolo/psutil/issues/847
-.. _848: https://github.com/giampaolo/psutil/issues/848
-.. _849: https://github.com/giampaolo/psutil/issues/849
-.. _850: https://github.com/giampaolo/psutil/issues/850
-.. _851: https://github.com/giampaolo/psutil/issues/851
-.. _852: https://github.com/giampaolo/psutil/issues/852
-.. _853: https://github.com/giampaolo/psutil/issues/853
-.. _854: https://github.com/giampaolo/psutil/issues/854
-.. _855: https://github.com/giampaolo/psutil/issues/855
-.. _856: https://github.com/giampaolo/psutil/issues/856
-.. _857: https://github.com/giampaolo/psutil/issues/857
-.. _858: https://github.com/giampaolo/psutil/issues/858
-.. _859: https://github.com/giampaolo/psutil/issues/859
-.. _860: https://github.com/giampaolo/psutil/issues/860
-.. _861: https://github.com/giampaolo/psutil/issues/861
-.. _862: https://github.com/giampaolo/psutil/issues/862
-.. _863: https://github.com/giampaolo/psutil/issues/863
-.. _864: https://github.com/giampaolo/psutil/issues/864
-.. _865: https://github.com/giampaolo/psutil/issues/865
-.. _866: https://github.com/giampaolo/psutil/issues/866
-.. _867: https://github.com/giampaolo/psutil/issues/867
-.. _868: https://github.com/giampaolo/psutil/issues/868
-.. _869: https://github.com/giampaolo/psutil/issues/869
-.. _870: https://github.com/giampaolo/psutil/issues/870
-.. _871: https://github.com/giampaolo/psutil/issues/871
-.. _872: https://github.com/giampaolo/psutil/issues/872
-.. _873: https://github.com/giampaolo/psutil/issues/873
-.. _874: https://github.com/giampaolo/psutil/issues/874
-.. _875: https://github.com/giampaolo/psutil/issues/875
-.. _876: https://github.com/giampaolo/psutil/issues/876
-.. _877: https://github.com/giampaolo/psutil/issues/877
-.. _878: https://github.com/giampaolo/psutil/issues/878
-.. _879: https://github.com/giampaolo/psutil/issues/879
-.. _880: https://github.com/giampaolo/psutil/issues/880
-.. _881: https://github.com/giampaolo/psutil/issues/881
-.. _882: https://github.com/giampaolo/psutil/issues/882
-.. _883: https://github.com/giampaolo/psutil/issues/883
-.. _884: https://github.com/giampaolo/psutil/issues/884
-.. _885: https://github.com/giampaolo/psutil/issues/885
-.. _886: https://github.com/giampaolo/psutil/issues/886
-.. _887: https://github.com/giampaolo/psutil/issues/887
-.. _888: https://github.com/giampaolo/psutil/issues/888
-.. _889: https://github.com/giampaolo/psutil/issues/889
-.. _890: https://github.com/giampaolo/psutil/issues/890
-.. _891: https://github.com/giampaolo/psutil/issues/891
-.. _892: https://github.com/giampaolo/psutil/issues/892
-.. _893: https://github.com/giampaolo/psutil/issues/893
-.. _894: https://github.com/giampaolo/psutil/issues/894
-.. _895: https://github.com/giampaolo/psutil/issues/895
-.. _896: https://github.com/giampaolo/psutil/issues/896
-.. _897: https://github.com/giampaolo/psutil/issues/897
-.. _898: https://github.com/giampaolo/psutil/issues/898
-.. _899: https://github.com/giampaolo/psutil/issues/899
-.. _900: https://github.com/giampaolo/psutil/issues/900
-.. _901: https://github.com/giampaolo/psutil/issues/901
-.. _902: https://github.com/giampaolo/psutil/issues/902
-.. _903: https://github.com/giampaolo/psutil/issues/903
-.. _904: https://github.com/giampaolo/psutil/issues/904
-.. _905: https://github.com/giampaolo/psutil/issues/905
-.. _906: https://github.com/giampaolo/psutil/issues/906
-.. _907: https://github.com/giampaolo/psutil/issues/907
-.. _908: https://github.com/giampaolo/psutil/issues/908
-.. _909: https://github.com/giampaolo/psutil/issues/909
-.. _910: https://github.com/giampaolo/psutil/issues/910
-.. _911: https://github.com/giampaolo/psutil/issues/911
-.. _912: https://github.com/giampaolo/psutil/issues/912
-.. _913: https://github.com/giampaolo/psutil/issues/913
-.. _914: https://github.com/giampaolo/psutil/issues/914
-.. _915: https://github.com/giampaolo/psutil/issues/915
-.. _916: https://github.com/giampaolo/psutil/issues/916
-.. _917: https://github.com/giampaolo/psutil/issues/917
-.. _918: https://github.com/giampaolo/psutil/issues/918
-.. _919: https://github.com/giampaolo/psutil/issues/919
-.. _920: https://github.com/giampaolo/psutil/issues/920
-.. _921: https://github.com/giampaolo/psutil/issues/921
-.. _922: https://github.com/giampaolo/psutil/issues/922
-.. _923: https://github.com/giampaolo/psutil/issues/923
-.. _924: https://github.com/giampaolo/psutil/issues/924
-.. _925: https://github.com/giampaolo/psutil/issues/925
-.. _926: https://github.com/giampaolo/psutil/issues/926
-.. _927: https://github.com/giampaolo/psutil/issues/927
-.. _928: https://github.com/giampaolo/psutil/issues/928
-.. _929: https://github.com/giampaolo/psutil/issues/929
-.. _930: https://github.com/giampaolo/psutil/issues/930
-.. _931: https://github.com/giampaolo/psutil/issues/931
-.. _932: https://github.com/giampaolo/psutil/issues/932
-.. _933: https://github.com/giampaolo/psutil/issues/933
-.. _934: https://github.com/giampaolo/psutil/issues/934
-.. _935: https://github.com/giampaolo/psutil/issues/935
-.. _936: https://github.com/giampaolo/psutil/issues/936
-.. _937: https://github.com/giampaolo/psutil/issues/937
-.. _938: https://github.com/giampaolo/psutil/issues/938
-.. _939: https://github.com/giampaolo/psutil/issues/939
-.. _940: https://github.com/giampaolo/psutil/issues/940
-.. _941: https://github.com/giampaolo/psutil/issues/941
-.. _942: https://github.com/giampaolo/psutil/issues/942
-.. _943: https://github.com/giampaolo/psutil/issues/943
-.. _944: https://github.com/giampaolo/psutil/issues/944
-.. _945: https://github.com/giampaolo/psutil/issues/945
-.. _946: https://github.com/giampaolo/psutil/issues/946
-.. _947: https://github.com/giampaolo/psutil/issues/947
-.. _948: https://github.com/giampaolo/psutil/issues/948
-.. _949: https://github.com/giampaolo/psutil/issues/949
-.. _950: https://github.com/giampaolo/psutil/issues/950
-.. _951: https://github.com/giampaolo/psutil/issues/951
-.. _952: https://github.com/giampaolo/psutil/issues/952
-.. _953: https://github.com/giampaolo/psutil/issues/953
-.. _954: https://github.com/giampaolo/psutil/issues/954
-.. _955: https://github.com/giampaolo/psutil/issues/955
-.. _956: https://github.com/giampaolo/psutil/issues/956
-.. _957: https://github.com/giampaolo/psutil/issues/957
-.. _958: https://github.com/giampaolo/psutil/issues/958
-.. _959: https://github.com/giampaolo/psutil/issues/959
-.. _960: https://github.com/giampaolo/psutil/issues/960
-.. _961: https://github.com/giampaolo/psutil/issues/961
-.. _962: https://github.com/giampaolo/psutil/issues/962
-.. _963: https://github.com/giampaolo/psutil/issues/963
-.. _964: https://github.com/giampaolo/psutil/issues/964
-.. _965: https://github.com/giampaolo/psutil/issues/965
-.. _966: https://github.com/giampaolo/psutil/issues/966
-.. _967: https://github.com/giampaolo/psutil/issues/967
-.. _968: https://github.com/giampaolo/psutil/issues/968
-.. _969: https://github.com/giampaolo/psutil/issues/969
-.. _970: https://github.com/giampaolo/psutil/issues/970
-.. _971: https://github.com/giampaolo/psutil/issues/971
-.. _972: https://github.com/giampaolo/psutil/issues/972
-.. _973: https://github.com/giampaolo/psutil/issues/973
-.. _974: https://github.com/giampaolo/psutil/issues/974
-.. _975: https://github.com/giampaolo/psutil/issues/975
-.. _976: https://github.com/giampaolo/psutil/issues/976
-.. _977: https://github.com/giampaolo/psutil/issues/977
-.. _978: https://github.com/giampaolo/psutil/issues/978
-.. _979: https://github.com/giampaolo/psutil/issues/979
-.. _980: https://github.com/giampaolo/psutil/issues/980
-.. _981: https://github.com/giampaolo/psutil/issues/981
-.. _982: https://github.com/giampaolo/psutil/issues/982
-.. _983: https://github.com/giampaolo/psutil/issues/983
-.. _984: https://github.com/giampaolo/psutil/issues/984
-.. _985: https://github.com/giampaolo/psutil/issues/985
-.. _986: https://github.com/giampaolo/psutil/issues/986
-.. _987: https://github.com/giampaolo/psutil/issues/987
-.. _988: https://github.com/giampaolo/psutil/issues/988
-.. _989: https://github.com/giampaolo/psutil/issues/989
-.. _990: https://github.com/giampaolo/psutil/issues/990
-.. _991: https://github.com/giampaolo/psutil/issues/991
-.. _992: https://github.com/giampaolo/psutil/issues/992
-.. _993: https://github.com/giampaolo/psutil/issues/993
-.. _994: https://github.com/giampaolo/psutil/issues/994
-.. _995: https://github.com/giampaolo/psutil/issues/995
-.. _996: https://github.com/giampaolo/psutil/issues/996
-.. _997: https://github.com/giampaolo/psutil/issues/997
-.. _998: https://github.com/giampaolo/psutil/issues/998
-.. _999: https://github.com/giampaolo/psutil/issues/999
-.. _1000: https://github.com/giampaolo/psutil/issues/1000
-.. _1001: https://github.com/giampaolo/psutil/issues/1001
-.. _1002: https://github.com/giampaolo/psutil/issues/1002
-.. _1003: https://github.com/giampaolo/psutil/issues/1003
-.. _1004: https://github.com/giampaolo/psutil/issues/1004
-.. _1005: https://github.com/giampaolo/psutil/issues/1005
-.. _1006: https://github.com/giampaolo/psutil/issues/1006
-.. _1007: https://github.com/giampaolo/psutil/issues/1007
-.. _1008: https://github.com/giampaolo/psutil/issues/1008
-.. _1009: https://github.com/giampaolo/psutil/issues/1009
-.. _1010: https://github.com/giampaolo/psutil/issues/1010
-.. _1011: https://github.com/giampaolo/psutil/issues/1011
-.. _1012: https://github.com/giampaolo/psutil/issues/1012
-.. _1013: https://github.com/giampaolo/psutil/issues/1013
-.. _1014: https://github.com/giampaolo/psutil/issues/1014
-.. _1015: https://github.com/giampaolo/psutil/issues/1015
-.. _1016: https://github.com/giampaolo/psutil/issues/1016
-.. _1017: https://github.com/giampaolo/psutil/issues/1017
-.. _1018: https://github.com/giampaolo/psutil/issues/1018
-.. _1019: https://github.com/giampaolo/psutil/issues/1019
-.. _1020: https://github.com/giampaolo/psutil/issues/1020
-.. _1021: https://github.com/giampaolo/psutil/issues/1021
-.. _1022: https://github.com/giampaolo/psutil/issues/1022
-.. _1023: https://github.com/giampaolo/psutil/issues/1023
-.. _1024: https://github.com/giampaolo/psutil/issues/1024
-.. _1025: https://github.com/giampaolo/psutil/issues/1025
-.. _1026: https://github.com/giampaolo/psutil/issues/1026
-.. _1027: https://github.com/giampaolo/psutil/issues/1027
-.. _1028: https://github.com/giampaolo/psutil/issues/1028
-.. _1029: https://github.com/giampaolo/psutil/issues/1029
-.. _1030: https://github.com/giampaolo/psutil/issues/1030
-.. _1031: https://github.com/giampaolo/psutil/issues/1031
-.. _1032: https://github.com/giampaolo/psutil/issues/1032
-.. _1033: https://github.com/giampaolo/psutil/issues/1033
-.. _1034: https://github.com/giampaolo/psutil/issues/1034
-.. _1035: https://github.com/giampaolo/psutil/issues/1035
-.. _1036: https://github.com/giampaolo/psutil/issues/1036
-.. _1037: https://github.com/giampaolo/psutil/issues/1037
-.. _1038: https://github.com/giampaolo/psutil/issues/1038
-.. _1039: https://github.com/giampaolo/psutil/issues/1039
-.. _1040: https://github.com/giampaolo/psutil/issues/1040
-.. _1041: https://github.com/giampaolo/psutil/issues/1041
-.. _1042: https://github.com/giampaolo/psutil/issues/1042
-.. _1043: https://github.com/giampaolo/psutil/issues/1043
-.. _1044: https://github.com/giampaolo/psutil/issues/1044
-.. _1045: https://github.com/giampaolo/psutil/issues/1045
-.. _1046: https://github.com/giampaolo/psutil/issues/1046
-.. _1047: https://github.com/giampaolo/psutil/issues/1047
-.. _1048: https://github.com/giampaolo/psutil/issues/1048
-.. _1049: https://github.com/giampaolo/psutil/issues/1049
-.. _1050: https://github.com/giampaolo/psutil/issues/1050
-.. _1051: https://github.com/giampaolo/psutil/issues/1051
-.. _1052: https://github.com/giampaolo/psutil/issues/1052
-.. _1053: https://github.com/giampaolo/psutil/issues/1053
-.. _1054: https://github.com/giampaolo/psutil/issues/1054
-.. _1055: https://github.com/giampaolo/psutil/issues/1055
-.. _1056: https://github.com/giampaolo/psutil/issues/1056
-.. _1057: https://github.com/giampaolo/psutil/issues/1057
-.. _1058: https://github.com/giampaolo/psutil/issues/1058
-.. _1059: https://github.com/giampaolo/psutil/issues/1059
-.. _1060: https://github.com/giampaolo/psutil/issues/1060
-.. _1061: https://github.com/giampaolo/psutil/issues/1061
-.. _1062: https://github.com/giampaolo/psutil/issues/1062
-.. _1063: https://github.com/giampaolo/psutil/issues/1063
-.. _1064: https://github.com/giampaolo/psutil/issues/1064
-.. _1065: https://github.com/giampaolo/psutil/issues/1065
-.. _1066: https://github.com/giampaolo/psutil/issues/1066
-.. _1067: https://github.com/giampaolo/psutil/issues/1067
-.. _1068: https://github.com/giampaolo/psutil/issues/1068
-.. _1069: https://github.com/giampaolo/psutil/issues/1069
-.. _1070: https://github.com/giampaolo/psutil/issues/1070
-.. _1071: https://github.com/giampaolo/psutil/issues/1071
-.. _1072: https://github.com/giampaolo/psutil/issues/1072
-.. _1073: https://github.com/giampaolo/psutil/issues/1073
-.. _1074: https://github.com/giampaolo/psutil/issues/1074
-.. _1075: https://github.com/giampaolo/psutil/issues/1075
-.. _1076: https://github.com/giampaolo/psutil/issues/1076
-.. _1077: https://github.com/giampaolo/psutil/issues/1077
-.. _1078: https://github.com/giampaolo/psutil/issues/1078
-.. _1079: https://github.com/giampaolo/psutil/issues/1079
-.. _1080: https://github.com/giampaolo/psutil/issues/1080
-.. _1081: https://github.com/giampaolo/psutil/issues/1081
-.. _1082: https://github.com/giampaolo/psutil/issues/1082
-.. _1083: https://github.com/giampaolo/psutil/issues/1083
-.. _1084: https://github.com/giampaolo/psutil/issues/1084
-.. _1085: https://github.com/giampaolo/psutil/issues/1085
-.. _1086: https://github.com/giampaolo/psutil/issues/1086
-.. _1087: https://github.com/giampaolo/psutil/issues/1087
-.. _1088: https://github.com/giampaolo/psutil/issues/1088
-.. _1089: https://github.com/giampaolo/psutil/issues/1089
-.. _1090: https://github.com/giampaolo/psutil/issues/1090
-.. _1091: https://github.com/giampaolo/psutil/issues/1091
-.. _1092: https://github.com/giampaolo/psutil/issues/1092
-.. _1093: https://github.com/giampaolo/psutil/issues/1093
-.. _1094: https://github.com/giampaolo/psutil/issues/1094
-.. _1095: https://github.com/giampaolo/psutil/issues/1095
-.. _1096: https://github.com/giampaolo/psutil/issues/1096
-.. _1097: https://github.com/giampaolo/psutil/issues/1097
-.. _1098: https://github.com/giampaolo/psutil/issues/1098
-.. _1099: https://github.com/giampaolo/psutil/issues/1099
-.. _1100: https://github.com/giampaolo/psutil/issues/1100
-.. _1101: https://github.com/giampaolo/psutil/issues/1101
-.. _1102: https://github.com/giampaolo/psutil/issues/1102
-.. _1103: https://github.com/giampaolo/psutil/issues/1103
-.. _1104: https://github.com/giampaolo/psutil/issues/1104
-.. _1105: https://github.com/giampaolo/psutil/issues/1105
-.. _1106: https://github.com/giampaolo/psutil/issues/1106
-.. _1107: https://github.com/giampaolo/psutil/issues/1107
-.. _1108: https://github.com/giampaolo/psutil/issues/1108
-.. _1109: https://github.com/giampaolo/psutil/issues/1109
-.. _1110: https://github.com/giampaolo/psutil/issues/1110
-.. _1111: https://github.com/giampaolo/psutil/issues/1111
-.. _1112: https://github.com/giampaolo/psutil/issues/1112
-.. _1113: https://github.com/giampaolo/psutil/issues/1113
-.. _1114: https://github.com/giampaolo/psutil/issues/1114
-.. _1115: https://github.com/giampaolo/psutil/issues/1115
-.. _1116: https://github.com/giampaolo/psutil/issues/1116
-.. _1117: https://github.com/giampaolo/psutil/issues/1117
-.. _1118: https://github.com/giampaolo/psutil/issues/1118
-.. _1119: https://github.com/giampaolo/psutil/issues/1119
-.. _1120: https://github.com/giampaolo/psutil/issues/1120
-.. _1121: https://github.com/giampaolo/psutil/issues/1121
-.. _1122: https://github.com/giampaolo/psutil/issues/1122
-.. _1123: https://github.com/giampaolo/psutil/issues/1123
-.. _1124: https://github.com/giampaolo/psutil/issues/1124
-.. _1125: https://github.com/giampaolo/psutil/issues/1125
-.. _1126: https://github.com/giampaolo/psutil/issues/1126
-.. _1127: https://github.com/giampaolo/psutil/issues/1127
-.. _1128: https://github.com/giampaolo/psutil/issues/1128
-.. _1129: https://github.com/giampaolo/psutil/issues/1129
-.. _1130: https://github.com/giampaolo/psutil/issues/1130
-.. _1131: https://github.com/giampaolo/psutil/issues/1131
-.. _1132: https://github.com/giampaolo/psutil/issues/1132
-.. _1133: https://github.com/giampaolo/psutil/issues/1133
-.. _1134: https://github.com/giampaolo/psutil/issues/1134
-.. _1135: https://github.com/giampaolo/psutil/issues/1135
-.. _1136: https://github.com/giampaolo/psutil/issues/1136
-.. _1137: https://github.com/giampaolo/psutil/issues/1137
-.. _1138: https://github.com/giampaolo/psutil/issues/1138
-.. _1139: https://github.com/giampaolo/psutil/issues/1139
-.. _1140: https://github.com/giampaolo/psutil/issues/1140
-.. _1141: https://github.com/giampaolo/psutil/issues/1141
-.. _1142: https://github.com/giampaolo/psutil/issues/1142
-.. _1143: https://github.com/giampaolo/psutil/issues/1143
-.. _1144: https://github.com/giampaolo/psutil/issues/1144
-.. _1145: https://github.com/giampaolo/psutil/issues/1145
-.. _1146: https://github.com/giampaolo/psutil/issues/1146
-.. _1147: https://github.com/giampaolo/psutil/issues/1147
-.. _1148: https://github.com/giampaolo/psutil/issues/1148
-.. _1149: https://github.com/giampaolo/psutil/issues/1149
-.. _1150: https://github.com/giampaolo/psutil/issues/1150
-.. _1151: https://github.com/giampaolo/psutil/issues/1151
-.. _1152: https://github.com/giampaolo/psutil/issues/1152
-.. _1153: https://github.com/giampaolo/psutil/issues/1153
-.. _1154: https://github.com/giampaolo/psutil/issues/1154
-.. _1155: https://github.com/giampaolo/psutil/issues/1155
-.. _1156: https://github.com/giampaolo/psutil/issues/1156
-.. _1157: https://github.com/giampaolo/psutil/issues/1157
-.. _1158: https://github.com/giampaolo/psutil/issues/1158
-.. _1159: https://github.com/giampaolo/psutil/issues/1159
-.. _1160: https://github.com/giampaolo/psutil/issues/1160
-.. _1161: https://github.com/giampaolo/psutil/issues/1161
-.. _1162: https://github.com/giampaolo/psutil/issues/1162
-.. _1163: https://github.com/giampaolo/psutil/issues/1163
-.. _1164: https://github.com/giampaolo/psutil/issues/1164
-.. _1165: https://github.com/giampaolo/psutil/issues/1165
-.. _1166: https://github.com/giampaolo/psutil/issues/1166
-.. _1167: https://github.com/giampaolo/psutil/issues/1167
-.. _1168: https://github.com/giampaolo/psutil/issues/1168
-.. _1169: https://github.com/giampaolo/psutil/issues/1169
-.. _1170: https://github.com/giampaolo/psutil/issues/1170
-.. _1171: https://github.com/giampaolo/psutil/issues/1171
-.. _1172: https://github.com/giampaolo/psutil/issues/1172
-.. _1173: https://github.com/giampaolo/psutil/issues/1173
-.. _1174: https://github.com/giampaolo/psutil/issues/1174
-.. _1175: https://github.com/giampaolo/psutil/issues/1175
-.. _1176: https://github.com/giampaolo/psutil/issues/1176
-.. _1177: https://github.com/giampaolo/psutil/issues/1177
-.. _1178: https://github.com/giampaolo/psutil/issues/1178
-.. _1179: https://github.com/giampaolo/psutil/issues/1179
-.. _1180: https://github.com/giampaolo/psutil/issues/1180
-.. _1181: https://github.com/giampaolo/psutil/issues/1181
-.. _1182: https://github.com/giampaolo/psutil/issues/1182
-.. _1183: https://github.com/giampaolo/psutil/issues/1183
-.. _1184: https://github.com/giampaolo/psutil/issues/1184
-.. _1185: https://github.com/giampaolo/psutil/issues/1185
-.. _1186: https://github.com/giampaolo/psutil/issues/1186
-.. _1187: https://github.com/giampaolo/psutil/issues/1187
-.. _1188: https://github.com/giampaolo/psutil/issues/1188
-.. _1189: https://github.com/giampaolo/psutil/issues/1189
-.. _1190: https://github.com/giampaolo/psutil/issues/1190
-.. _1191: https://github.com/giampaolo/psutil/issues/1191
-.. _1192: https://github.com/giampaolo/psutil/issues/1192
-.. _1193: https://github.com/giampaolo/psutil/issues/1193
-.. _1194: https://github.com/giampaolo/psutil/issues/1194
-.. _1195: https://github.com/giampaolo/psutil/issues/1195
-.. _1196: https://github.com/giampaolo/psutil/issues/1196
-.. _1197: https://github.com/giampaolo/psutil/issues/1197
-.. _1198: https://github.com/giampaolo/psutil/issues/1198
-.. _1199: https://github.com/giampaolo/psutil/issues/1199
-.. _1200: https://github.com/giampaolo/psutil/issues/1200
-.. _1201: https://github.com/giampaolo/psutil/issues/1201
-.. _1202: https://github.com/giampaolo/psutil/issues/1202
-.. _1203: https://github.com/giampaolo/psutil/issues/1203
-.. _1204: https://github.com/giampaolo/psutil/issues/1204
-.. _1205: https://github.com/giampaolo/psutil/issues/1205
-.. _1206: https://github.com/giampaolo/psutil/issues/1206
-.. _1207: https://github.com/giampaolo/psutil/issues/1207
-.. _1208: https://github.com/giampaolo/psutil/issues/1208
-.. _1209: https://github.com/giampaolo/psutil/issues/1209
-.. _1210: https://github.com/giampaolo/psutil/issues/1210
-.. _1211: https://github.com/giampaolo/psutil/issues/1211
-.. _1212: https://github.com/giampaolo/psutil/issues/1212
-.. _1213: https://github.com/giampaolo/psutil/issues/1213
-.. _1214: https://github.com/giampaolo/psutil/issues/1214
-.. _1215: https://github.com/giampaolo/psutil/issues/1215
-.. _1216: https://github.com/giampaolo/psutil/issues/1216
-.. _1217: https://github.com/giampaolo/psutil/issues/1217
-.. _1218: https://github.com/giampaolo/psutil/issues/1218
-.. _1219: https://github.com/giampaolo/psutil/issues/1219
-.. _1220: https://github.com/giampaolo/psutil/issues/1220
-.. _1221: https://github.com/giampaolo/psutil/issues/1221
-.. _1222: https://github.com/giampaolo/psutil/issues/1222
-.. _1223: https://github.com/giampaolo/psutil/issues/1223
-.. _1224: https://github.com/giampaolo/psutil/issues/1224
-.. _1225: https://github.com/giampaolo/psutil/issues/1225
-.. _1226: https://github.com/giampaolo/psutil/issues/1226
-.. _1227: https://github.com/giampaolo/psutil/issues/1227
-.. _1228: https://github.com/giampaolo/psutil/issues/1228
-.. _1229: https://github.com/giampaolo/psutil/issues/1229
-.. _1230: https://github.com/giampaolo/psutil/issues/1230
-.. _1231: https://github.com/giampaolo/psutil/issues/1231
-.. _1232: https://github.com/giampaolo/psutil/issues/1232
-.. _1233: https://github.com/giampaolo/psutil/issues/1233
-.. _1234: https://github.com/giampaolo/psutil/issues/1234
-.. _1235: https://github.com/giampaolo/psutil/issues/1235
-.. _1236: https://github.com/giampaolo/psutil/issues/1236
-.. _1237: https://github.com/giampaolo/psutil/issues/1237
-.. _1238: https://github.com/giampaolo/psutil/issues/1238
-.. _1239: https://github.com/giampaolo/psutil/issues/1239
-.. _1240: https://github.com/giampaolo/psutil/issues/1240
-.. _1241: https://github.com/giampaolo/psutil/issues/1241
-.. _1242: https://github.com/giampaolo/psutil/issues/1242
-.. _1243: https://github.com/giampaolo/psutil/issues/1243
-.. _1244: https://github.com/giampaolo/psutil/issues/1244
-.. _1245: https://github.com/giampaolo/psutil/issues/1245
-.. _1246: https://github.com/giampaolo/psutil/issues/1246
-.. _1247: https://github.com/giampaolo/psutil/issues/1247
-.. _1248: https://github.com/giampaolo/psutil/issues/1248
-.. _1249: https://github.com/giampaolo/psutil/issues/1249
-.. _1250: https://github.com/giampaolo/psutil/issues/1250
-.. _1251: https://github.com/giampaolo/psutil/issues/1251
-.. _1252: https://github.com/giampaolo/psutil/issues/1252
-.. _1253: https://github.com/giampaolo/psutil/issues/1253
-.. _1254: https://github.com/giampaolo/psutil/issues/1254
-.. _1255: https://github.com/giampaolo/psutil/issues/1255
-.. _1256: https://github.com/giampaolo/psutil/issues/1256
-.. _1257: https://github.com/giampaolo/psutil/issues/1257
-.. _1258: https://github.com/giampaolo/psutil/issues/1258
-.. _1259: https://github.com/giampaolo/psutil/issues/1259
-.. _1260: https://github.com/giampaolo/psutil/issues/1260
-.. _1261: https://github.com/giampaolo/psutil/issues/1261
-.. _1262: https://github.com/giampaolo/psutil/issues/1262
-.. _1263: https://github.com/giampaolo/psutil/issues/1263
-.. _1264: https://github.com/giampaolo/psutil/issues/1264
-.. _1265: https://github.com/giampaolo/psutil/issues/1265
-.. _1266: https://github.com/giampaolo/psutil/issues/1266
-.. _1267: https://github.com/giampaolo/psutil/issues/1267
-.. _1268: https://github.com/giampaolo/psutil/issues/1268
-.. _1269: https://github.com/giampaolo/psutil/issues/1269
-.. _1270: https://github.com/giampaolo/psutil/issues/1270
-.. _1271: https://github.com/giampaolo/psutil/issues/1271
-.. _1272: https://github.com/giampaolo/psutil/issues/1272
-.. _1273: https://github.com/giampaolo/psutil/issues/1273
-.. _1274: https://github.com/giampaolo/psutil/issues/1274
-.. _1275: https://github.com/giampaolo/psutil/issues/1275
-.. _1276: https://github.com/giampaolo/psutil/issues/1276
-.. _1277: https://github.com/giampaolo/psutil/issues/1277
-.. _1278: https://github.com/giampaolo/psutil/issues/1278
-.. _1279: https://github.com/giampaolo/psutil/issues/1279
-.. _1280: https://github.com/giampaolo/psutil/issues/1280
-.. _1281: https://github.com/giampaolo/psutil/issues/1281
-.. _1282: https://github.com/giampaolo/psutil/issues/1282
-.. _1283: https://github.com/giampaolo/psutil/issues/1283
-.. _1284: https://github.com/giampaolo/psutil/issues/1284
-.. _1285: https://github.com/giampaolo/psutil/issues/1285
-.. _1286: https://github.com/giampaolo/psutil/issues/1286
-.. _1287: https://github.com/giampaolo/psutil/issues/1287
-.. _1288: https://github.com/giampaolo/psutil/issues/1288
-.. _1289: https://github.com/giampaolo/psutil/issues/1289
-.. _1290: https://github.com/giampaolo/psutil/issues/1290
-.. _1291: https://github.com/giampaolo/psutil/issues/1291
-.. _1292: https://github.com/giampaolo/psutil/issues/1292
-.. _1293: https://github.com/giampaolo/psutil/issues/1293
-.. _1294: https://github.com/giampaolo/psutil/issues/1294
-.. _1295: https://github.com/giampaolo/psutil/issues/1295
-.. _1296: https://github.com/giampaolo/psutil/issues/1296
-.. _1297: https://github.com/giampaolo/psutil/issues/1297
-.. _1298: https://github.com/giampaolo/psutil/issues/1298
-.. _1299: https://github.com/giampaolo/psutil/issues/1299
-.. _1300: https://github.com/giampaolo/psutil/issues/1300
-.. _1301: https://github.com/giampaolo/psutil/issues/1301
-.. _1302: https://github.com/giampaolo/psutil/issues/1302
-.. _1303: https://github.com/giampaolo/psutil/issues/1303
-.. _1304: https://github.com/giampaolo/psutil/issues/1304
-.. _1305: https://github.com/giampaolo/psutil/issues/1305
-.. _1306: https://github.com/giampaolo/psutil/issues/1306
-.. _1307: https://github.com/giampaolo/psutil/issues/1307
-.. _1308: https://github.com/giampaolo/psutil/issues/1308
-.. _1309: https://github.com/giampaolo/psutil/issues/1309
-.. _1310: https://github.com/giampaolo/psutil/issues/1310
-.. _1311: https://github.com/giampaolo/psutil/issues/1311
-.. _1312: https://github.com/giampaolo/psutil/issues/1312
-.. _1313: https://github.com/giampaolo/psutil/issues/1313
-.. _1314: https://github.com/giampaolo/psutil/issues/1314
-.. _1315: https://github.com/giampaolo/psutil/issues/1315
-.. _1316: https://github.com/giampaolo/psutil/issues/1316
-.. _1317: https://github.com/giampaolo/psutil/issues/1317
-.. _1318: https://github.com/giampaolo/psutil/issues/1318
-.. _1319: https://github.com/giampaolo/psutil/issues/1319
-.. _1320: https://github.com/giampaolo/psutil/issues/1320
-.. _1321: https://github.com/giampaolo/psutil/issues/1321
-.. _1322: https://github.com/giampaolo/psutil/issues/1322
-.. _1323: https://github.com/giampaolo/psutil/issues/1323
-.. _1324: https://github.com/giampaolo/psutil/issues/1324
-.. _1325: https://github.com/giampaolo/psutil/issues/1325
-.. _1326: https://github.com/giampaolo/psutil/issues/1326
-.. _1327: https://github.com/giampaolo/psutil/issues/1327
-.. _1328: https://github.com/giampaolo/psutil/issues/1328
-.. _1329: https://github.com/giampaolo/psutil/issues/1329
-.. _1330: https://github.com/giampaolo/psutil/issues/1330
-.. _1331: https://github.com/giampaolo/psutil/issues/1331
-.. _1332: https://github.com/giampaolo/psutil/issues/1332
-.. _1333: https://github.com/giampaolo/psutil/issues/1333
-.. _1334: https://github.com/giampaolo/psutil/issues/1334
-.. _1335: https://github.com/giampaolo/psutil/issues/1335
-.. _1336: https://github.com/giampaolo/psutil/issues/1336
-.. _1337: https://github.com/giampaolo/psutil/issues/1337
-.. _1338: https://github.com/giampaolo/psutil/issues/1338
-.. _1339: https://github.com/giampaolo/psutil/issues/1339
-.. _1340: https://github.com/giampaolo/psutil/issues/1340
-.. _1341: https://github.com/giampaolo/psutil/issues/1341
-.. _1342: https://github.com/giampaolo/psutil/issues/1342
-.. _1343: https://github.com/giampaolo/psutil/issues/1343
-.. _1344: https://github.com/giampaolo/psutil/issues/1344
-.. _1345: https://github.com/giampaolo/psutil/issues/1345
-.. _1346: https://github.com/giampaolo/psutil/issues/1346
-.. _1347: https://github.com/giampaolo/psutil/issues/1347
-.. _1348: https://github.com/giampaolo/psutil/issues/1348
-.. _1349: https://github.com/giampaolo/psutil/issues/1349
-.. _1350: https://github.com/giampaolo/psutil/issues/1350
-.. _1351: https://github.com/giampaolo/psutil/issues/1351
-.. _1352: https://github.com/giampaolo/psutil/issues/1352
-.. _1353: https://github.com/giampaolo/psutil/issues/1353
-.. _1354: https://github.com/giampaolo/psutil/issues/1354
-.. _1355: https://github.com/giampaolo/psutil/issues/1355
-.. _1356: https://github.com/giampaolo/psutil/issues/1356
-.. _1357: https://github.com/giampaolo/psutil/issues/1357
-.. _1358: https://github.com/giampaolo/psutil/issues/1358
-.. _1359: https://github.com/giampaolo/psutil/issues/1359
-.. _1360: https://github.com/giampaolo/psutil/issues/1360
-.. _1361: https://github.com/giampaolo/psutil/issues/1361
-.. _1362: https://github.com/giampaolo/psutil/issues/1362
-.. _1363: https://github.com/giampaolo/psutil/issues/1363
-.. _1364: https://github.com/giampaolo/psutil/issues/1364
-.. _1365: https://github.com/giampaolo/psutil/issues/1365
-.. _1366: https://github.com/giampaolo/psutil/issues/1366
-.. _1367: https://github.com/giampaolo/psutil/issues/1367
-.. _1368: https://github.com/giampaolo/psutil/issues/1368
-.. _1369: https://github.com/giampaolo/psutil/issues/1369
-.. _1370: https://github.com/giampaolo/psutil/issues/1370
-.. _1371: https://github.com/giampaolo/psutil/issues/1371
-.. _1372: https://github.com/giampaolo/psutil/issues/1372
-.. _1373: https://github.com/giampaolo/psutil/issues/1373
-.. _1374: https://github.com/giampaolo/psutil/issues/1374
-.. _1375: https://github.com/giampaolo/psutil/issues/1375
-.. _1376: https://github.com/giampaolo/psutil/issues/1376
-.. _1377: https://github.com/giampaolo/psutil/issues/1377
-.. _1378: https://github.com/giampaolo/psutil/issues/1378
-.. _1379: https://github.com/giampaolo/psutil/issues/1379
-.. _1380: https://github.com/giampaolo/psutil/issues/1380
-.. _1381: https://github.com/giampaolo/psutil/issues/1381
-.. _1382: https://github.com/giampaolo/psutil/issues/1382
-.. _1383: https://github.com/giampaolo/psutil/issues/1383
-.. _1384: https://github.com/giampaolo/psutil/issues/1384
-.. _1385: https://github.com/giampaolo/psutil/issues/1385
-.. _1386: https://github.com/giampaolo/psutil/issues/1386
-.. _1387: https://github.com/giampaolo/psutil/issues/1387
-.. _1388: https://github.com/giampaolo/psutil/issues/1388
-.. _1389: https://github.com/giampaolo/psutil/issues/1389
-.. _1390: https://github.com/giampaolo/psutil/issues/1390
-.. _1391: https://github.com/giampaolo/psutil/issues/1391
-.. _1392: https://github.com/giampaolo/psutil/issues/1392
-.. _1393: https://github.com/giampaolo/psutil/issues/1393
-.. _1394: https://github.com/giampaolo/psutil/issues/1394
-.. _1395: https://github.com/giampaolo/psutil/issues/1395
-.. _1396: https://github.com/giampaolo/psutil/issues/1396
-.. _1397: https://github.com/giampaolo/psutil/issues/1397
-.. _1398: https://github.com/giampaolo/psutil/issues/1398
-.. _1399: https://github.com/giampaolo/psutil/issues/1399
-.. _1400: https://github.com/giampaolo/psutil/issues/1400
-.. _1401: https://github.com/giampaolo/psutil/issues/1401
-.. _1402: https://github.com/giampaolo/psutil/issues/1402
-.. _1403: https://github.com/giampaolo/psutil/issues/1403
-.. _1404: https://github.com/giampaolo/psutil/issues/1404
-.. _1405: https://github.com/giampaolo/psutil/issues/1405
-.. _1406: https://github.com/giampaolo/psutil/issues/1406
-.. _1407: https://github.com/giampaolo/psutil/issues/1407
-.. _1408: https://github.com/giampaolo/psutil/issues/1408
-.. _1409: https://github.com/giampaolo/psutil/issues/1409
-.. _1410: https://github.com/giampaolo/psutil/issues/1410
-.. _1411: https://github.com/giampaolo/psutil/issues/1411
-.. _1412: https://github.com/giampaolo/psutil/issues/1412
-.. _1413: https://github.com/giampaolo/psutil/issues/1413
-.. _1414: https://github.com/giampaolo/psutil/issues/1414
-.. _1415: https://github.com/giampaolo/psutil/issues/1415
-.. _1416: https://github.com/giampaolo/psutil/issues/1416
-.. _1417: https://github.com/giampaolo/psutil/issues/1417
-.. _1418: https://github.com/giampaolo/psutil/issues/1418
-.. _1419: https://github.com/giampaolo/psutil/issues/1419
-.. _1420: https://github.com/giampaolo/psutil/issues/1420
-.. _1421: https://github.com/giampaolo/psutil/issues/1421
-.. _1422: https://github.com/giampaolo/psutil/issues/1422
-.. _1423: https://github.com/giampaolo/psutil/issues/1423
-.. _1424: https://github.com/giampaolo/psutil/issues/1424
-.. _1425: https://github.com/giampaolo/psutil/issues/1425
-.. _1426: https://github.com/giampaolo/psutil/issues/1426
-.. _1427: https://github.com/giampaolo/psutil/issues/1427
-.. _1428: https://github.com/giampaolo/psutil/issues/1428
-.. _1429: https://github.com/giampaolo/psutil/issues/1429
-.. _1430: https://github.com/giampaolo/psutil/issues/1430
-.. _1431: https://github.com/giampaolo/psutil/issues/1431
-.. _1432: https://github.com/giampaolo/psutil/issues/1432
-.. _1433: https://github.com/giampaolo/psutil/issues/1433
-.. _1434: https://github.com/giampaolo/psutil/issues/1434
-.. _1435: https://github.com/giampaolo/psutil/issues/1435
-.. _1436: https://github.com/giampaolo/psutil/issues/1436
-.. _1437: https://github.com/giampaolo/psutil/issues/1437
-.. _1438: https://github.com/giampaolo/psutil/issues/1438
-.. _1439: https://github.com/giampaolo/psutil/issues/1439
-.. _1440: https://github.com/giampaolo/psutil/issues/1440
-.. _1441: https://github.com/giampaolo/psutil/issues/1441
-.. _1442: https://github.com/giampaolo/psutil/issues/1442
-.. _1443: https://github.com/giampaolo/psutil/issues/1443
-.. _1444: https://github.com/giampaolo/psutil/issues/1444
-.. _1445: https://github.com/giampaolo/psutil/issues/1445
-.. _1446: https://github.com/giampaolo/psutil/issues/1446
-.. _1447: https://github.com/giampaolo/psutil/issues/1447
-.. _1448: https://github.com/giampaolo/psutil/issues/1448
-.. _1449: https://github.com/giampaolo/psutil/issues/1449
-.. _1450: https://github.com/giampaolo/psutil/issues/1450
-.. _1451: https://github.com/giampaolo/psutil/issues/1451
-.. _1452: https://github.com/giampaolo/psutil/issues/1452
-.. _1453: https://github.com/giampaolo/psutil/issues/1453
-.. _1454: https://github.com/giampaolo/psutil/issues/1454
-.. _1455: https://github.com/giampaolo/psutil/issues/1455
-.. _1456: https://github.com/giampaolo/psutil/issues/1456
-.. _1457: https://github.com/giampaolo/psutil/issues/1457
-.. _1458: https://github.com/giampaolo/psutil/issues/1458
-.. _1459: https://github.com/giampaolo/psutil/issues/1459
-.. _1460: https://github.com/giampaolo/psutil/issues/1460
-.. _1461: https://github.com/giampaolo/psutil/issues/1461
-.. _1462: https://github.com/giampaolo/psutil/issues/1462
-.. _1463: https://github.com/giampaolo/psutil/issues/1463
-.. _1464: https://github.com/giampaolo/psutil/issues/1464
-.. _1465: https://github.com/giampaolo/psutil/issues/1465
-.. _1466: https://github.com/giampaolo/psutil/issues/1466
-.. _1467: https://github.com/giampaolo/psutil/issues/1467
-.. _1468: https://github.com/giampaolo/psutil/issues/1468
-.. _1469: https://github.com/giampaolo/psutil/issues/1469
-.. _1470: https://github.com/giampaolo/psutil/issues/1470
-.. _1471: https://github.com/giampaolo/psutil/issues/1471
-.. _1472: https://github.com/giampaolo/psutil/issues/1472
-.. _1473: https://github.com/giampaolo/psutil/issues/1473
-.. _1474: https://github.com/giampaolo/psutil/issues/1474
-.. _1475: https://github.com/giampaolo/psutil/issues/1475
-.. _1476: https://github.com/giampaolo/psutil/issues/1476
-.. _1477: https://github.com/giampaolo/psutil/issues/1477
-.. _1478: https://github.com/giampaolo/psutil/issues/1478
-.. _1479: https://github.com/giampaolo/psutil/issues/1479
-.. _1480: https://github.com/giampaolo/psutil/issues/1480
-.. _1481: https://github.com/giampaolo/psutil/issues/1481
-.. _1482: https://github.com/giampaolo/psutil/issues/1482
-.. _1483: https://github.com/giampaolo/psutil/issues/1483
-.. _1484: https://github.com/giampaolo/psutil/issues/1484
-.. _1485: https://github.com/giampaolo/psutil/issues/1485
-.. _1486: https://github.com/giampaolo/psutil/issues/1486
-.. _1487: https://github.com/giampaolo/psutil/issues/1487
-.. _1488: https://github.com/giampaolo/psutil/issues/1488
-.. _1489: https://github.com/giampaolo/psutil/issues/1489
-.. _1490: https://github.com/giampaolo/psutil/issues/1490
-.. _1491: https://github.com/giampaolo/psutil/issues/1491
-.. _1492: https://github.com/giampaolo/psutil/issues/1492
-.. _1493: https://github.com/giampaolo/psutil/issues/1493
-.. _1494: https://github.com/giampaolo/psutil/issues/1494
-.. _1495: https://github.com/giampaolo/psutil/issues/1495
-.. _1496: https://github.com/giampaolo/psutil/issues/1496
-.. _1497: https://github.com/giampaolo/psutil/issues/1497
-.. _1498: https://github.com/giampaolo/psutil/issues/1498
-.. _1499: https://github.com/giampaolo/psutil/issues/1499
-.. _1500: https://github.com/giampaolo/psutil/issues/1500
-.. _1501: https://github.com/giampaolo/psutil/issues/1501
-.. _1502: https://github.com/giampaolo/psutil/issues/1502
-.. _1503: https://github.com/giampaolo/psutil/issues/1503
-.. _1504: https://github.com/giampaolo/psutil/issues/1504
-.. _1505: https://github.com/giampaolo/psutil/issues/1505
-.. _1506: https://github.com/giampaolo/psutil/issues/1506
-.. _1507: https://github.com/giampaolo/psutil/issues/1507
-.. _1508: https://github.com/giampaolo/psutil/issues/1508
-.. _1509: https://github.com/giampaolo/psutil/issues/1509
-.. _1510: https://github.com/giampaolo/psutil/issues/1510
-.. _1511: https://github.com/giampaolo/psutil/issues/1511
-.. _1512: https://github.com/giampaolo/psutil/issues/1512
-.. _1513: https://github.com/giampaolo/psutil/issues/1513
-.. _1514: https://github.com/giampaolo/psutil/issues/1514
-.. _1515: https://github.com/giampaolo/psutil/issues/1515
-.. _1516: https://github.com/giampaolo/psutil/issues/1516
-.. _1517: https://github.com/giampaolo/psutil/issues/1517
-.. _1518: https://github.com/giampaolo/psutil/issues/1518
-.. _1519: https://github.com/giampaolo/psutil/issues/1519
-.. _1520: https://github.com/giampaolo/psutil/issues/1520
-.. _1521: https://github.com/giampaolo/psutil/issues/1521
-.. _1522: https://github.com/giampaolo/psutil/issues/1522
-.. _1523: https://github.com/giampaolo/psutil/issues/1523
-.. _1524: https://github.com/giampaolo/psutil/issues/1524
-.. _1525: https://github.com/giampaolo/psutil/issues/1525
-.. _1526: https://github.com/giampaolo/psutil/issues/1526
-.. _1527: https://github.com/giampaolo/psutil/issues/1527
-.. _1528: https://github.com/giampaolo/psutil/issues/1528
-.. _1529: https://github.com/giampaolo/psutil/issues/1529
-.. _1530: https://github.com/giampaolo/psutil/issues/1530
-.. _1531: https://github.com/giampaolo/psutil/issues/1531
-.. _1532: https://github.com/giampaolo/psutil/issues/1532
-.. _1533: https://github.com/giampaolo/psutil/issues/1533
-.. _1534: https://github.com/giampaolo/psutil/issues/1534
-.. _1535: https://github.com/giampaolo/psutil/issues/1535
-.. _1536: https://github.com/giampaolo/psutil/issues/1536
-.. _1537: https://github.com/giampaolo/psutil/issues/1537
-.. _1538: https://github.com/giampaolo/psutil/issues/1538
-.. _1539: https://github.com/giampaolo/psutil/issues/1539
-.. _1540: https://github.com/giampaolo/psutil/issues/1540
-.. _1541: https://github.com/giampaolo/psutil/issues/1541
-.. _1542: https://github.com/giampaolo/psutil/issues/1542
-.. _1543: https://github.com/giampaolo/psutil/issues/1543
-.. _1544: https://github.com/giampaolo/psutil/issues/1544
-.. _1545: https://github.com/giampaolo/psutil/issues/1545
-.. _1546: https://github.com/giampaolo/psutil/issues/1546
-.. _1547: https://github.com/giampaolo/psutil/issues/1547
-.. _1548: https://github.com/giampaolo/psutil/issues/1548
-.. _1549: https://github.com/giampaolo/psutil/issues/1549
-.. _1550: https://github.com/giampaolo/psutil/issues/1550
-.. _1551: https://github.com/giampaolo/psutil/issues/1551
-.. _1552: https://github.com/giampaolo/psutil/issues/1552
-.. _1553: https://github.com/giampaolo/psutil/issues/1553
-.. _1554: https://github.com/giampaolo/psutil/issues/1554
-.. _1555: https://github.com/giampaolo/psutil/issues/1555
-.. _1556: https://github.com/giampaolo/psutil/issues/1556
-.. _1557: https://github.com/giampaolo/psutil/issues/1557
-.. _1558: https://github.com/giampaolo/psutil/issues/1558
-.. _1559: https://github.com/giampaolo/psutil/issues/1559
-.. _1560: https://github.com/giampaolo/psutil/issues/1560
-.. _1561: https://github.com/giampaolo/psutil/issues/1561
-.. _1562: https://github.com/giampaolo/psutil/issues/1562
-.. _1563: https://github.com/giampaolo/psutil/issues/1563
-.. _1564: https://github.com/giampaolo/psutil/issues/1564
-.. _1565: https://github.com/giampaolo/psutil/issues/1565
-.. _1566: https://github.com/giampaolo/psutil/issues/1566
-.. _1567: https://github.com/giampaolo/psutil/issues/1567
-.. _1568: https://github.com/giampaolo/psutil/issues/1568
-.. _1569: https://github.com/giampaolo/psutil/issues/1569
-.. _1570: https://github.com/giampaolo/psutil/issues/1570
-.. _1571: https://github.com/giampaolo/psutil/issues/1571
-.. _1572: https://github.com/giampaolo/psutil/issues/1572
-.. _1573: https://github.com/giampaolo/psutil/issues/1573
-.. _1574: https://github.com/giampaolo/psutil/issues/1574
-.. _1575: https://github.com/giampaolo/psutil/issues/1575
-.. _1576: https://github.com/giampaolo/psutil/issues/1576
-.. _1577: https://github.com/giampaolo/psutil/issues/1577
-.. _1578: https://github.com/giampaolo/psutil/issues/1578
-.. _1579: https://github.com/giampaolo/psutil/issues/1579
-.. _1580: https://github.com/giampaolo/psutil/issues/1580
-.. _1581: https://github.com/giampaolo/psutil/issues/1581
-.. _1582: https://github.com/giampaolo/psutil/issues/1582
-.. _1583: https://github.com/giampaolo/psutil/issues/1583
-.. _1584: https://github.com/giampaolo/psutil/issues/1584
-.. _1585: https://github.com/giampaolo/psutil/issues/1585
-.. _1586: https://github.com/giampaolo/psutil/issues/1586
-.. _1587: https://github.com/giampaolo/psutil/issues/1587
-.. _1588: https://github.com/giampaolo/psutil/issues/1588
-.. _1589: https://github.com/giampaolo/psutil/issues/1589
-.. _1590: https://github.com/giampaolo/psutil/issues/1590
-.. _1591: https://github.com/giampaolo/psutil/issues/1591
-.. _1592: https://github.com/giampaolo/psutil/issues/1592
-.. _1593: https://github.com/giampaolo/psutil/issues/1593
-.. _1594: https://github.com/giampaolo/psutil/issues/1594
-.. _1595: https://github.com/giampaolo/psutil/issues/1595
-.. _1596: https://github.com/giampaolo/psutil/issues/1596
-.. _1597: https://github.com/giampaolo/psutil/issues/1597
-.. _1598: https://github.com/giampaolo/psutil/issues/1598
-.. _1599: https://github.com/giampaolo/psutil/issues/1599
-.. _1600: https://github.com/giampaolo/psutil/issues/1600
-.. _1601: https://github.com/giampaolo/psutil/issues/1601
-.. _1602: https://github.com/giampaolo/psutil/issues/1602
-.. _1603: https://github.com/giampaolo/psutil/issues/1603
-.. _1604: https://github.com/giampaolo/psutil/issues/1604
-.. _1605: https://github.com/giampaolo/psutil/issues/1605
-.. _1606: https://github.com/giampaolo/psutil/issues/1606
-.. _1607: https://github.com/giampaolo/psutil/issues/1607
-.. _1608: https://github.com/giampaolo/psutil/issues/1608
-.. _1609: https://github.com/giampaolo/psutil/issues/1609
-.. _1610: https://github.com/giampaolo/psutil/issues/1610
-.. _1611: https://github.com/giampaolo/psutil/issues/1611
-.. _1612: https://github.com/giampaolo/psutil/issues/1612
-.. _1613: https://github.com/giampaolo/psutil/issues/1613
-.. _1614: https://github.com/giampaolo/psutil/issues/1614
-.. _1615: https://github.com/giampaolo/psutil/issues/1615
-.. _1616: https://github.com/giampaolo/psutil/issues/1616
-.. _1617: https://github.com/giampaolo/psutil/issues/1617
-.. _1618: https://github.com/giampaolo/psutil/issues/1618
-.. _1619: https://github.com/giampaolo/psutil/issues/1619
-.. _1620: https://github.com/giampaolo/psutil/issues/1620
-.. _1621: https://github.com/giampaolo/psutil/issues/1621
-.. _1622: https://github.com/giampaolo/psutil/issues/1622
-.. _1623: https://github.com/giampaolo/psutil/issues/1623
-.. _1624: https://github.com/giampaolo/psutil/issues/1624
-.. _1625: https://github.com/giampaolo/psutil/issues/1625
-.. _1626: https://github.com/giampaolo/psutil/issues/1626
-.. _1627: https://github.com/giampaolo/psutil/issues/1627
-.. _1628: https://github.com/giampaolo/psutil/issues/1628
-.. _1629: https://github.com/giampaolo/psutil/issues/1629
-.. _1630: https://github.com/giampaolo/psutil/issues/1630
-.. _1631: https://github.com/giampaolo/psutil/issues/1631
-.. _1632: https://github.com/giampaolo/psutil/issues/1632
-.. _1633: https://github.com/giampaolo/psutil/issues/1633
-.. _1634: https://github.com/giampaolo/psutil/issues/1634
-.. _1635: https://github.com/giampaolo/psutil/issues/1635
-.. _1636: https://github.com/giampaolo/psutil/issues/1636
-.. _1637: https://github.com/giampaolo/psutil/issues/1637
-.. _1638: https://github.com/giampaolo/psutil/issues/1638
-.. _1639: https://github.com/giampaolo/psutil/issues/1639
-.. _1640: https://github.com/giampaolo/psutil/issues/1640
-.. _1641: https://github.com/giampaolo/psutil/issues/1641
-.. _1642: https://github.com/giampaolo/psutil/issues/1642
-.. _1643: https://github.com/giampaolo/psutil/issues/1643
-.. _1644: https://github.com/giampaolo/psutil/issues/1644
-.. _1645: https://github.com/giampaolo/psutil/issues/1645
-.. _1646: https://github.com/giampaolo/psutil/issues/1646
-.. _1647: https://github.com/giampaolo/psutil/issues/1647
-.. _1648: https://github.com/giampaolo/psutil/issues/1648
-.. _1649: https://github.com/giampaolo/psutil/issues/1649
-.. _1650: https://github.com/giampaolo/psutil/issues/1650
-.. _1651: https://github.com/giampaolo/psutil/issues/1651
-.. _1652: https://github.com/giampaolo/psutil/issues/1652
-.. _1653: https://github.com/giampaolo/psutil/issues/1653
-.. _1654: https://github.com/giampaolo/psutil/issues/1654
-.. _1655: https://github.com/giampaolo/psutil/issues/1655
-.. _1656: https://github.com/giampaolo/psutil/issues/1656
-.. _1657: https://github.com/giampaolo/psutil/issues/1657
-.. _1658: https://github.com/giampaolo/psutil/issues/1658
-.. _1659: https://github.com/giampaolo/psutil/issues/1659
-.. _1660: https://github.com/giampaolo/psutil/issues/1660
-.. _1661: https://github.com/giampaolo/psutil/issues/1661
-.. _1662: https://github.com/giampaolo/psutil/issues/1662
-.. _1663: https://github.com/giampaolo/psutil/issues/1663
-.. _1664: https://github.com/giampaolo/psutil/issues/1664
-.. _1665: https://github.com/giampaolo/psutil/issues/1665
-.. _1666: https://github.com/giampaolo/psutil/issues/1666
-.. _1667: https://github.com/giampaolo/psutil/issues/1667
-.. _1668: https://github.com/giampaolo/psutil/issues/1668
-.. _1669: https://github.com/giampaolo/psutil/issues/1669
-.. _1670: https://github.com/giampaolo/psutil/issues/1670
-.. _1671: https://github.com/giampaolo/psutil/issues/1671
-.. _1672: https://github.com/giampaolo/psutil/issues/1672
-.. _1673: https://github.com/giampaolo/psutil/issues/1673
-.. _1674: https://github.com/giampaolo/psutil/issues/1674
-.. _1675: https://github.com/giampaolo/psutil/issues/1675
-.. _1676: https://github.com/giampaolo/psutil/issues/1676
-.. _1677: https://github.com/giampaolo/psutil/issues/1677
-.. _1678: https://github.com/giampaolo/psutil/issues/1678
-.. _1679: https://github.com/giampaolo/psutil/issues/1679
-.. _1680: https://github.com/giampaolo/psutil/issues/1680
-.. _1681: https://github.com/giampaolo/psutil/issues/1681
-.. _1682: https://github.com/giampaolo/psutil/issues/1682
-.. _1683: https://github.com/giampaolo/psutil/issues/1683
-.. _1684: https://github.com/giampaolo/psutil/issues/1684
-.. _1685: https://github.com/giampaolo/psutil/issues/1685
-.. _1686: https://github.com/giampaolo/psutil/issues/1686
-.. _1687: https://github.com/giampaolo/psutil/issues/1687
-.. _1688: https://github.com/giampaolo/psutil/issues/1688
-.. _1689: https://github.com/giampaolo/psutil/issues/1689
-.. _1690: https://github.com/giampaolo/psutil/issues/1690
-.. _1691: https://github.com/giampaolo/psutil/issues/1691
-.. _1692: https://github.com/giampaolo/psutil/issues/1692
-.. _1693: https://github.com/giampaolo/psutil/issues/1693
-.. _1694: https://github.com/giampaolo/psutil/issues/1694
-.. _1695: https://github.com/giampaolo/psutil/issues/1695
-.. _1696: https://github.com/giampaolo/psutil/issues/1696
-.. _1697: https://github.com/giampaolo/psutil/issues/1697
-.. _1698: https://github.com/giampaolo/psutil/issues/1698
-.. _1699: https://github.com/giampaolo/psutil/issues/1699
-.. _1700: https://github.com/giampaolo/psutil/issues/1700
-.. _1701: https://github.com/giampaolo/psutil/issues/1701
-.. _1702: https://github.com/giampaolo/psutil/issues/1702
-.. _1703: https://github.com/giampaolo/psutil/issues/1703
-.. _1704: https://github.com/giampaolo/psutil/issues/1704
-.. _1705: https://github.com/giampaolo/psutil/issues/1705
-.. _1706: https://github.com/giampaolo/psutil/issues/1706
-.. _1707: https://github.com/giampaolo/psutil/issues/1707
-.. _1708: https://github.com/giampaolo/psutil/issues/1708
-.. _1709: https://github.com/giampaolo/psutil/issues/1709
-.. _1710: https://github.com/giampaolo/psutil/issues/1710
-.. _1711: https://github.com/giampaolo/psutil/issues/1711
-.. _1712: https://github.com/giampaolo/psutil/issues/1712
-.. _1713: https://github.com/giampaolo/psutil/issues/1713
-.. _1714: https://github.com/giampaolo/psutil/issues/1714
-.. _1715: https://github.com/giampaolo/psutil/issues/1715
-.. _1716: https://github.com/giampaolo/psutil/issues/1716
-.. _1717: https://github.com/giampaolo/psutil/issues/1717
-.. _1718: https://github.com/giampaolo/psutil/issues/1718
-.. _1719: https://github.com/giampaolo/psutil/issues/1719
-.. _1720: https://github.com/giampaolo/psutil/issues/1720
-.. _1721: https://github.com/giampaolo/psutil/issues/1721
-.. _1722: https://github.com/giampaolo/psutil/issues/1722
-.. _1723: https://github.com/giampaolo/psutil/issues/1723
-.. _1724: https://github.com/giampaolo/psutil/issues/1724
-.. _1725: https://github.com/giampaolo/psutil/issues/1725
-.. _1726: https://github.com/giampaolo/psutil/issues/1726
-.. _1727: https://github.com/giampaolo/psutil/issues/1727
-.. _1728: https://github.com/giampaolo/psutil/issues/1728
-.. _1729: https://github.com/giampaolo/psutil/issues/1729
-.. _1730: https://github.com/giampaolo/psutil/issues/1730
-.. _1731: https://github.com/giampaolo/psutil/issues/1731
-.. _1732: https://github.com/giampaolo/psutil/issues/1732
-.. _1733: https://github.com/giampaolo/psutil/issues/1733
-.. _1734: https://github.com/giampaolo/psutil/issues/1734
-.. _1735: https://github.com/giampaolo/psutil/issues/1735
-.. _1736: https://github.com/giampaolo/psutil/issues/1736
-.. _1737: https://github.com/giampaolo/psutil/issues/1737
-.. _1738: https://github.com/giampaolo/psutil/issues/1738
-.. _1739: https://github.com/giampaolo/psutil/issues/1739
-.. _1740: https://github.com/giampaolo/psutil/issues/1740
-.. _1741: https://github.com/giampaolo/psutil/issues/1741
-.. _1742: https://github.com/giampaolo/psutil/issues/1742
-.. _1743: https://github.com/giampaolo/psutil/issues/1743
-.. _1744: https://github.com/giampaolo/psutil/issues/1744
-.. _1745: https://github.com/giampaolo/psutil/issues/1745
-.. _1746: https://github.com/giampaolo/psutil/issues/1746
-.. _1747: https://github.com/giampaolo/psutil/issues/1747
-.. _1748: https://github.com/giampaolo/psutil/issues/1748
-.. _1749: https://github.com/giampaolo/psutil/issues/1749
-.. _1750: https://github.com/giampaolo/psutil/issues/1750
-.. _1751: https://github.com/giampaolo/psutil/issues/1751
-.. _1752: https://github.com/giampaolo/psutil/issues/1752
-.. _1753: https://github.com/giampaolo/psutil/issues/1753
-.. _1754: https://github.com/giampaolo/psutil/issues/1754
-.. _1755: https://github.com/giampaolo/psutil/issues/1755
-.. _1756: https://github.com/giampaolo/psutil/issues/1756
-.. _1757: https://github.com/giampaolo/psutil/issues/1757
-.. _1758: https://github.com/giampaolo/psutil/issues/1758
-.. _1759: https://github.com/giampaolo/psutil/issues/1759
-.. _1760: https://github.com/giampaolo/psutil/issues/1760
-.. _1761: https://github.com/giampaolo/psutil/issues/1761
-.. _1762: https://github.com/giampaolo/psutil/issues/1762
-.. _1763: https://github.com/giampaolo/psutil/issues/1763
-.. _1764: https://github.com/giampaolo/psutil/issues/1764
-.. _1765: https://github.com/giampaolo/psutil/issues/1765
-.. _1766: https://github.com/giampaolo/psutil/issues/1766
-.. _1767: https://github.com/giampaolo/psutil/issues/1767
-.. _1768: https://github.com/giampaolo/psutil/issues/1768
-.. _1769: https://github.com/giampaolo/psutil/issues/1769
-.. _1770: https://github.com/giampaolo/psutil/issues/1770
-.. _1771: https://github.com/giampaolo/psutil/issues/1771
-.. _1772: https://github.com/giampaolo/psutil/issues/1772
-.. _1773: https://github.com/giampaolo/psutil/issues/1773
-.. _1774: https://github.com/giampaolo/psutil/issues/1774
-.. _1775: https://github.com/giampaolo/psutil/issues/1775
-.. _1776: https://github.com/giampaolo/psutil/issues/1776
-.. _1777: https://github.com/giampaolo/psutil/issues/1777
-.. _1778: https://github.com/giampaolo/psutil/issues/1778
-.. _1779: https://github.com/giampaolo/psutil/issues/1779
-.. _1780: https://github.com/giampaolo/psutil/issues/1780
-.. _1781: https://github.com/giampaolo/psutil/issues/1781
-.. _1782: https://github.com/giampaolo/psutil/issues/1782
-.. _1783: https://github.com/giampaolo/psutil/issues/1783
-.. _1784: https://github.com/giampaolo/psutil/issues/1784
-.. _1785: https://github.com/giampaolo/psutil/issues/1785
-.. _1786: https://github.com/giampaolo/psutil/issues/1786
-.. _1787: https://github.com/giampaolo/psutil/issues/1787
-.. _1788: https://github.com/giampaolo/psutil/issues/1788
-.. _1789: https://github.com/giampaolo/psutil/issues/1789
-.. _1790: https://github.com/giampaolo/psutil/issues/1790
-.. _1791: https://github.com/giampaolo/psutil/issues/1791
-.. _1792: https://github.com/giampaolo/psutil/issues/1792
-.. _1793: https://github.com/giampaolo/psutil/issues/1793
-.. _1794: https://github.com/giampaolo/psutil/issues/1794
-.. _1795: https://github.com/giampaolo/psutil/issues/1795
-.. _1796: https://github.com/giampaolo/psutil/issues/1796
-.. _1797: https://github.com/giampaolo/psutil/issues/1797
-.. _1798: https://github.com/giampaolo/psutil/issues/1798
-.. _1799: https://github.com/giampaolo/psutil/issues/1799
-.. _1800: https://github.com/giampaolo/psutil/issues/1800
-.. _1801: https://github.com/giampaolo/psutil/issues/1801
-.. _1802: https://github.com/giampaolo/psutil/issues/1802
-.. _1803: https://github.com/giampaolo/psutil/issues/1803
-.. _1804: https://github.com/giampaolo/psutil/issues/1804
-.. _1805: https://github.com/giampaolo/psutil/issues/1805
-.. _1806: https://github.com/giampaolo/psutil/issues/1806
-.. _1807: https://github.com/giampaolo/psutil/issues/1807
-.. _1808: https://github.com/giampaolo/psutil/issues/1808
-.. _1809: https://github.com/giampaolo/psutil/issues/1809
-.. _1810: https://github.com/giampaolo/psutil/issues/1810
-.. _1811: https://github.com/giampaolo/psutil/issues/1811
-.. _1812: https://github.com/giampaolo/psutil/issues/1812
-.. _1813: https://github.com/giampaolo/psutil/issues/1813
-.. _1814: https://github.com/giampaolo/psutil/issues/1814
-.. _1815: https://github.com/giampaolo/psutil/issues/1815
-.. _1816: https://github.com/giampaolo/psutil/issues/1816
-.. _1817: https://github.com/giampaolo/psutil/issues/1817
-.. _1818: https://github.com/giampaolo/psutil/issues/1818
-.. _1819: https://github.com/giampaolo/psutil/issues/1819
-.. _1820: https://github.com/giampaolo/psutil/issues/1820
-.. _1821: https://github.com/giampaolo/psutil/issues/1821
-.. _1822: https://github.com/giampaolo/psutil/issues/1822
-.. _1823: https://github.com/giampaolo/psutil/issues/1823
-.. _1824: https://github.com/giampaolo/psutil/issues/1824
-.. _1825: https://github.com/giampaolo/psutil/issues/1825
-.. _1826: https://github.com/giampaolo/psutil/issues/1826
-.. _1827: https://github.com/giampaolo/psutil/issues/1827
-.. _1828: https://github.com/giampaolo/psutil/issues/1828
-.. _1829: https://github.com/giampaolo/psutil/issues/1829
-.. _1830: https://github.com/giampaolo/psutil/issues/1830
-.. _1831: https://github.com/giampaolo/psutil/issues/1831
-.. _1832: https://github.com/giampaolo/psutil/issues/1832
-.. _1833: https://github.com/giampaolo/psutil/issues/1833
-.. _1834: https://github.com/giampaolo/psutil/issues/1834
-.. _1835: https://github.com/giampaolo/psutil/issues/1835
-.. _1836: https://github.com/giampaolo/psutil/issues/1836
-.. _1837: https://github.com/giampaolo/psutil/issues/1837
-.. _1838: https://github.com/giampaolo/psutil/issues/1838
-.. _1839: https://github.com/giampaolo/psutil/issues/1839
-.. _1840: https://github.com/giampaolo/psutil/issues/1840
-.. _1841: https://github.com/giampaolo/psutil/issues/1841
-.. _1842: https://github.com/giampaolo/psutil/issues/1842
-.. _1843: https://github.com/giampaolo/psutil/issues/1843
-.. _1844: https://github.com/giampaolo/psutil/issues/1844
-.. _1845: https://github.com/giampaolo/psutil/issues/1845
-.. _1846: https://github.com/giampaolo/psutil/issues/1846
-.. _1847: https://github.com/giampaolo/psutil/issues/1847
-.. _1848: https://github.com/giampaolo/psutil/issues/1848
-.. _1849: https://github.com/giampaolo/psutil/issues/1849
-.. _1850: https://github.com/giampaolo/psutil/issues/1850
-.. _1851: https://github.com/giampaolo/psutil/issues/1851
-.. _1852: https://github.com/giampaolo/psutil/issues/1852
-.. _1853: https://github.com/giampaolo/psutil/issues/1853
-.. _1854: https://github.com/giampaolo/psutil/issues/1854
-.. _1855: https://github.com/giampaolo/psutil/issues/1855
-.. _1856: https://github.com/giampaolo/psutil/issues/1856
-.. _1857: https://github.com/giampaolo/psutil/issues/1857
-.. _1858: https://github.com/giampaolo/psutil/issues/1858
-.. _1859: https://github.com/giampaolo/psutil/issues/1859
-.. _1860: https://github.com/giampaolo/psutil/issues/1860
-.. _1861: https://github.com/giampaolo/psutil/issues/1861
-.. _1862: https://github.com/giampaolo/psutil/issues/1862
-.. _1863: https://github.com/giampaolo/psutil/issues/1863
-.. _1864: https://github.com/giampaolo/psutil/issues/1864
-.. _1865: https://github.com/giampaolo/psutil/issues/1865
-.. _1866: https://github.com/giampaolo/psutil/issues/1866
-.. _1867: https://github.com/giampaolo/psutil/issues/1867
-.. _1868: https://github.com/giampaolo/psutil/issues/1868
-.. _1869: https://github.com/giampaolo/psutil/issues/1869
-.. _1870: https://github.com/giampaolo/psutil/issues/1870
-.. _1871: https://github.com/giampaolo/psutil/issues/1871
-.. _1872: https://github.com/giampaolo/psutil/issues/1872
-.. _1873: https://github.com/giampaolo/psutil/issues/1873
-.. _1874: https://github.com/giampaolo/psutil/issues/1874
-.. _1875: https://github.com/giampaolo/psutil/issues/1875
-.. _1876: https://github.com/giampaolo/psutil/issues/1876
-.. _1877: https://github.com/giampaolo/psutil/issues/1877
-.. _1878: https://github.com/giampaolo/psutil/issues/1878
-.. _1879: https://github.com/giampaolo/psutil/issues/1879
-.. _1880: https://github.com/giampaolo/psutil/issues/1880
-.. _1881: https://github.com/giampaolo/psutil/issues/1881
-.. _1882: https://github.com/giampaolo/psutil/issues/1882
-.. _1883: https://github.com/giampaolo/psutil/issues/1883
-.. _1884: https://github.com/giampaolo/psutil/issues/1884
-.. _1885: https://github.com/giampaolo/psutil/issues/1885
-.. _1886: https://github.com/giampaolo/psutil/issues/1886
-.. _1887: https://github.com/giampaolo/psutil/issues/1887
-.. _1888: https://github.com/giampaolo/psutil/issues/1888
-.. _1889: https://github.com/giampaolo/psutil/issues/1889
-.. _1890: https://github.com/giampaolo/psutil/issues/1890
-.. _1891: https://github.com/giampaolo/psutil/issues/1891
-.. _1892: https://github.com/giampaolo/psutil/issues/1892
-.. _1893: https://github.com/giampaolo/psutil/issues/1893
-.. _1894: https://github.com/giampaolo/psutil/issues/1894
-.. _1895: https://github.com/giampaolo/psutil/issues/1895
-.. _1896: https://github.com/giampaolo/psutil/issues/1896
-.. _1897: https://github.com/giampaolo/psutil/issues/1897
-.. _1898: https://github.com/giampaolo/psutil/issues/1898
-.. _1899: https://github.com/giampaolo/psutil/issues/1899
-.. _1900: https://github.com/giampaolo/psutil/issues/1900
-.. _1901: https://github.com/giampaolo/psutil/issues/1901
-.. _1902: https://github.com/giampaolo/psutil/issues/1902
-.. _1903: https://github.com/giampaolo/psutil/issues/1903
-.. _1904: https://github.com/giampaolo/psutil/issues/1904
-.. _1905: https://github.com/giampaolo/psutil/issues/1905
-.. _1906: https://github.com/giampaolo/psutil/issues/1906
-.. _1907: https://github.com/giampaolo/psutil/issues/1907
-.. _1908: https://github.com/giampaolo/psutil/issues/1908
-.. _1909: https://github.com/giampaolo/psutil/issues/1909
-.. _1910: https://github.com/giampaolo/psutil/issues/1910
-.. _1911: https://github.com/giampaolo/psutil/issues/1911
-.. _1912: https://github.com/giampaolo/psutil/issues/1912
-.. _1913: https://github.com/giampaolo/psutil/issues/1913
-.. _1914: https://github.com/giampaolo/psutil/issues/1914
-.. _1915: https://github.com/giampaolo/psutil/issues/1915
-.. _1916: https://github.com/giampaolo/psutil/issues/1916
-.. _1917: https://github.com/giampaolo/psutil/issues/1917
-.. _1918: https://github.com/giampaolo/psutil/issues/1918
-.. _1919: https://github.com/giampaolo/psutil/issues/1919
-.. _1920: https://github.com/giampaolo/psutil/issues/1920
-.. _1921: https://github.com/giampaolo/psutil/issues/1921
-.. _1922: https://github.com/giampaolo/psutil/issues/1922
-.. _1923: https://github.com/giampaolo/psutil/issues/1923
-.. _1924: https://github.com/giampaolo/psutil/issues/1924
-.. _1925: https://github.com/giampaolo/psutil/issues/1925
-.. _1926: https://github.com/giampaolo/psutil/issues/1926
-.. _1927: https://github.com/giampaolo/psutil/issues/1927
-.. _1928: https://github.com/giampaolo/psutil/issues/1928
-.. _1929: https://github.com/giampaolo/psutil/issues/1929
-.. _1930: https://github.com/giampaolo/psutil/issues/1930
-.. _1931: https://github.com/giampaolo/psutil/issues/1931
-.. _1932: https://github.com/giampaolo/psutil/issues/1932
-.. _1933: https://github.com/giampaolo/psutil/issues/1933
-.. _1934: https://github.com/giampaolo/psutil/issues/1934
-.. _1935: https://github.com/giampaolo/psutil/issues/1935
-.. _1936: https://github.com/giampaolo/psutil/issues/1936
-.. _1937: https://github.com/giampaolo/psutil/issues/1937
-.. _1938: https://github.com/giampaolo/psutil/issues/1938
-.. _1939: https://github.com/giampaolo/psutil/issues/1939
-.. _1940: https://github.com/giampaolo/psutil/issues/1940
-.. _1941: https://github.com/giampaolo/psutil/issues/1941
-.. _1942: https://github.com/giampaolo/psutil/issues/1942
-.. _1943: https://github.com/giampaolo/psutil/issues/1943
-.. _1944: https://github.com/giampaolo/psutil/issues/1944
-.. _1945: https://github.com/giampaolo/psutil/issues/1945
-.. _1946: https://github.com/giampaolo/psutil/issues/1946
-.. _1947: https://github.com/giampaolo/psutil/issues/1947
-.. _1948: https://github.com/giampaolo/psutil/issues/1948
-.. _1949: https://github.com/giampaolo/psutil/issues/1949
-.. _1950: https://github.com/giampaolo/psutil/issues/1950
-.. _1951: https://github.com/giampaolo/psutil/issues/1951
-.. _1952: https://github.com/giampaolo/psutil/issues/1952
-.. _1953: https://github.com/giampaolo/psutil/issues/1953
-.. _1954: https://github.com/giampaolo/psutil/issues/1954
-.. _1955: https://github.com/giampaolo/psutil/issues/1955
-.. _1956: https://github.com/giampaolo/psutil/issues/1956
-.. _1957: https://github.com/giampaolo/psutil/issues/1957
-.. _1958: https://github.com/giampaolo/psutil/issues/1958
-.. _1959: https://github.com/giampaolo/psutil/issues/1959
-.. _1960: https://github.com/giampaolo/psutil/issues/1960
-.. _1961: https://github.com/giampaolo/psutil/issues/1961
-.. _1962: https://github.com/giampaolo/psutil/issues/1962
-.. _1963: https://github.com/giampaolo/psutil/issues/1963
-.. _1964: https://github.com/giampaolo/psutil/issues/1964
-.. _1965: https://github.com/giampaolo/psutil/issues/1965
-.. _1966: https://github.com/giampaolo/psutil/issues/1966
-.. _1967: https://github.com/giampaolo/psutil/issues/1967
-.. _1968: https://github.com/giampaolo/psutil/issues/1968
-.. _1969: https://github.com/giampaolo/psutil/issues/1969
-.. _1970: https://github.com/giampaolo/psutil/issues/1970
-.. _1971: https://github.com/giampaolo/psutil/issues/1971
-.. _1972: https://github.com/giampaolo/psutil/issues/1972
-.. _1973: https://github.com/giampaolo/psutil/issues/1973
-.. _1974: https://github.com/giampaolo/psutil/issues/1974
-.. _1975: https://github.com/giampaolo/psutil/issues/1975
-.. _1976: https://github.com/giampaolo/psutil/issues/1976
-.. _1977: https://github.com/giampaolo/psutil/issues/1977
-.. _1978: https://github.com/giampaolo/psutil/issues/1978
-.. _1979: https://github.com/giampaolo/psutil/issues/1979
-.. _1980: https://github.com/giampaolo/psutil/issues/1980
-.. _1981: https://github.com/giampaolo/psutil/issues/1981
-.. _1982: https://github.com/giampaolo/psutil/issues/1982
-.. _1983: https://github.com/giampaolo/psutil/issues/1983
-.. _1984: https://github.com/giampaolo/psutil/issues/1984
-.. _1985: https://github.com/giampaolo/psutil/issues/1985
-.. _1986: https://github.com/giampaolo/psutil/issues/1986
-.. _1987: https://github.com/giampaolo/psutil/issues/1987
-.. _1988: https://github.com/giampaolo/psutil/issues/1988
-.. _1989: https://github.com/giampaolo/psutil/issues/1989
-.. _1990: https://github.com/giampaolo/psutil/issues/1990
-.. _1991: https://github.com/giampaolo/psutil/issues/1991
-.. _1992: https://github.com/giampaolo/psutil/issues/1992
-.. _1993: https://github.com/giampaolo/psutil/issues/1993
-.. _1994: https://github.com/giampaolo/psutil/issues/1994
-.. _1995: https://github.com/giampaolo/psutil/issues/1995
-.. _1996: https://github.com/giampaolo/psutil/issues/1996
-.. _1997: https://github.com/giampaolo/psutil/issues/1997
-.. _1998: https://github.com/giampaolo/psutil/issues/1998
-.. _1999: https://github.com/giampaolo/psutil/issues/1999
-.. _2000: https://github.com/giampaolo/psutil/issues/2000
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/INSTALL.rst firefox-85.0+build1/third_party/python/psutil/INSTALL.rst
--- firefox-84.0.2+build1/third_party/python/psutil/INSTALL.rst	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/INSTALL.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-Install pip
-===========
-
-pip is the easiest way to install psutil. It is shipped by default with Python
-2.7.9+ and 3.4+. For other Python versions you can install it manually.
-On Linux or via wget::
-
-    wget https://bootstrap.pypa.io/get-pip.py -O - | python
-
-On macOS or via curl::
-
-    python < <(curl -s https://bootstrap.pypa.io/get-pip.py)
-
-On Windows, `download pip <https://pip.pypa.io/en/latest/installing/>`__, open
-cmd.exe and install it::
-
-    C:\Python27\python.exe get-pip.py
-
-Permission issues (UNIX)
-========================
-
-The commands below assume you're running as root.
-If you aren't or you bump into permission errors you can either install psutil
-for your user only::
-
-    pip3 install --user psutil
-
-...or prepend ``sudo`` and install it globally, e.g.::
-
-    sudo pip3 install psutil
-
-Linux
-=====
-
-Ubuntu / Debian::
-
-    sudo apt-get install gcc python3-dev
-    pip3 install psutil
-
-RedHat / CentOS::
-
-    sudo yum install gcc python3-devel
-    pip3 install psutil
-
-If you're on Python 2 use ``python-dev`` instead.
-
-macOS
-=====
-
-Install `Xcode <https://developer.apple.com/downloads/?name=Xcode>`__ then run::
-
-    pip3 install psutil
-
-Windows
-=======
-
-Open a cmd.exe shell and run::
-
-    python3 -m pip install psutil
-
-This assumes "python" is in your PATH. If not, specify the full python.exe
-path.
-
-In order to compile psutil from sources you'll need **Visual Studio** (Mingw32
-is not supported).
-This  `blog post <https://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/>`__
-provides numerous info on how to properly set up VS. The needed VS versions are:
-
-* Python 2.6, 2.7: `VS-2008 <http://www.microsoft.com/en-us/download/details.aspx?id=44266>`__
-* Python 3.4: `VS-2010 <http://www.visualstudio.com/downloads/download-visual-studio-vs#d-2010-express>`__
-* Python 3.5+: `VS-2015 <http://www.visualstudio.com/en-au/news/vs2015-preview-vs>`__
-
-Compiling 64 bit versions of Python 2.6 and 2.7 with VS 2008 requires
-`Windows SDK and .NET Framework 3.5 SP1 <https://www.microsoft.com/en-us/download/details.aspx?id=3138>`__.
-Once installed run `vcvars64.bat`
-(see `here <http://stackoverflow.com/questions/11072521/>`__).
-Once VS is setup open a cmd.exe shell, cd into psutil directory and run::
-
-    python3 setup.py build
-    python3 setup.py install
-
-FreeBSD
-=======
-
-::
-
-    pkg install python3 gcc
-    python -m pip3 install psutil
-
-OpenBSD
-=======
-
-::
-
-    export PKG_PATH=http://ftp.eu.openbsd.org/pub/OpenBSD/`uname -r`/packages/`uname -m`/
-    pkg_add -v python gcc
-    python3 -m pip install psutil
-
-NetBSD
-======
-
-::
-
-    export PKG_PATH="ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/`uname -m`/`uname -r`/All"
-    pkg_add -v pkgin
-    pkgin install python3 gcc
-    python3 -m pip install psutil
-
-Solaris
-=======
-
-If ``cc`` compiler is not installed create a symlink to ``gcc``::
-
-    sudo ln -s /usr/bin/gcc /usr/local/bin/cc
-
-Install::
-
-    pkg install gcc
-    python3 -m pip install psutil
-
-Install from sources
-====================
-
-::
-
-    git clone https://github.com/giampaolo/psutil.git
-    cd psutil
-    python3 setup.py install
-
-Testing installation
-====================
-
-::
-
-    python3 -m psutil.tests
-
-Dev Guide
-=========
-
-See: `dev guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`__.
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/LICENSE firefox-85.0+build1/third_party/python/psutil/LICENSE
--- firefox-84.0.2+build1/third_party/python/psutil/LICENSE	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'
-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.
-
- * Neither the name of the psutil authors nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-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 OWNER 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-84.0.2+build1/third_party/python/psutil/make.bat firefox-85.0+build1/third_party/python/psutil/make.bat
--- firefox-84.0.2+build1/third_party/python/psutil/make.bat	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/make.bat	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-@echo off
-
-rem ==========================================================================
-rem Shortcuts for various tasks, emulating UNIX "make" on Windows.
-rem It is primarly intended as a shortcut for compiling / installing
-rem psutil ("make.bat build", "make.bat install") and running tests
-rem ("make.bat test").
-rem
-rem This script is modeled after my Windows installation which uses:
-rem - Visual studio 2008 for Python 2.6, 2.7
-rem - Visual studio 2010 for Python 3.4+
-rem ...therefore it might not work on your Windows installation.
-rem
-rem By default C:\Python27\python.exe is used.
-rem To compile for a specific Python version run:
-rem     set PYTHON=C:\Python34\python.exe & make.bat build
-rem
-rem To use a different test script:
-rem      set PYTHON=C:\Python34\python.exe & set TSCRIPT=foo.py & make.bat test
-rem ==========================================================================
-
-if "%PYTHON%" == "" (
-    if exist "C:\Python38-64\python.exe" (
-        set PYTHON=C:\Python38-64\python.exe
-    ) else (
-        set PYTHON=C:\Python27\python.exe
-    )
-)
-
-if "%TSCRIPT%" == "" (
-    set TSCRIPT=psutil\tests\runner.py
-)
-
-rem Needed to locate the .pypirc file and upload exes on PyPI.
-set HOME=%USERPROFILE%
-
-%PYTHON% scripts\internal\winmake.py %1 %2 %3 %4 %5 %6
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/Makefile firefox-85.0+build1/third_party/python/psutil/Makefile
--- firefox-84.0.2+build1/third_party/python/psutil/Makefile	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +0,0 @@
-# Shortcuts for various tasks (UNIX only).
-# To use a specific Python version run: "make install PYTHON=python3.3"
-# You can set the variables below from the command line.
-
-PYTHON = python3
-TSCRIPT = psutil/tests/runner.py
-ARGS =
-# List of nice-to-have dev libs.
-DEPS = \
-	argparse \
-	check-manifest \
-	coverage \
-	flake8 \
-	pyperf \
-	requests \
-	setuptools \
-	twine \
-	virtualenv \
-	wheel
-PY2_DEPS = \
-	futures \
-	ipaddress \
-	mock==1.0.1 \
-	unittest2
-DEPS += `$(PYTHON) -c \
-	"import sys; print('$(PY2_DEPS)' if sys.version_info[0] == 2 else '')"`
-# In not in a virtualenv, add --user options for install commands.
-INSTALL_OPTS = `$(PYTHON) -c \
-	"import sys; print('' if hasattr(sys, 'real_prefix') else '--user')"`
-TEST_PREFIX = PYTHONWARNINGS=all PSUTIL_TESTING=1 PSUTIL_DEBUG=1
-
-all: test
-
-# ===================================================================
-# Install
-# ===================================================================
-
-clean:  ## Remove all build files.
-	rm -rf `find . -type d -name __pycache__ \
-		-o -type f -name \*.bak \
-		-o -type f -name \*.orig \
-		-o -type f -name \*.pyc \
-		-o -type f -name \*.pyd \
-		-o -type f -name \*.pyo \
-		-o -type f -name \*.rej \
-		-o -type f -name \*.so \
-		-o -type f -name \*.~ \
-		-o -type f -name \*\$testfn`
-	rm -rf \
-		*.core \
-		*.egg-info \
-		*\$testfn* \
-		.coverage \
-		.failed-tests.txt \
-		.tox \
-		build/ \
-		dist/ \
-		docs/_build/ \
-		htmlcov/
-
-_:
-
-build: _  ## Compile without installing.
-	# make sure setuptools is installed (needed for 'develop' / edit mode)
-	$(PYTHON) -c "import setuptools"
-	PYTHONWARNINGS=all $(PYTHON) setup.py build
-	@# copies compiled *.so files in ./psutil directory in order to allow
-	@# "import psutil" when using the interactive interpreter from within
-	@# this directory.
-	PYTHONWARNINGS=all $(PYTHON) setup.py build_ext -i
-	$(PYTHON) -c "import psutil"  # make sure it actually worked
-
-install:  ## Install this package as current user in "edit" mode.
-	${MAKE} build
-	PYTHONWARNINGS=all $(PYTHON) setup.py develop $(INSTALL_OPTS)
-
-uninstall:  ## Uninstall this package via pip.
-	cd ..; $(PYTHON) -m pip uninstall -y -v psutil || true
-	$(PYTHON) scripts/internal/purge_installation.py
-
-install-pip:  ## Install pip (no-op if already installed).
-	$(PYTHON) -c \
-		"import sys, ssl, os, pkgutil, tempfile, atexit; \
-		sys.exit(0) if pkgutil.find_loader('pip') else None; \
-		pyexc = 'from urllib.request import urlopen' if sys.version_info[0] == 3 else 'from urllib2 import urlopen'; \
-		exec(pyexc); \
-		ctx = ssl._create_unverified_context() if hasattr(ssl, '_create_unverified_context') else None; \
-		kw = dict(context=ctx) if ctx else {}; \
-		req = urlopen('https://bootstrap.pypa.io/get-pip.py', **kw); \
-		data = req.read(); \
-		f = tempfile.NamedTemporaryFile(suffix='.py'); \
-		atexit.register(f.close); \
-		f.write(data); \
-		f.flush(); \
-		print('downloaded %s' % f.name); \
-		code = os.system('%s %s --user' % (sys.executable, f.name)); \
-		f.close(); \
-		sys.exit(code);"
-
-setup-dev-env:  ## Install GIT hooks, pip, test deps (also upgrades them).
-	${MAKE} install-git-hooks
-	${MAKE} install-pip
-	$(PYTHON) -m pip install $(INSTALL_OPTS) --upgrade --trusted-host files.pythonhosted.org pip
-	$(PYTHON) -m pip install $(INSTALL_OPTS) --upgrade --trusted-host files.pythonhosted.org $(DEPS)
-
-# ===================================================================
-# Tests
-# ===================================================================
-
-test:  ## Run all tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) $(TSCRIPT)
-
-test-process:  ## Run process-related API tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_process.py
-
-test-system:  ## Run system-related API tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_system.py
-
-test-misc:  ## Run miscellaneous tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_misc.py
-
-test-unicode:  ## Test APIs dealing with strings.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_unicode.py
-
-test-contracts:  ## APIs sanity tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_contracts.py
-
-test-connections:  ## Test net_connections() and Process.connections().
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_connections.py
-
-test-posix:  ## POSIX specific tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_posix.py
-
-test-platform:  ## Run specific platform tests only.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_`$(PYTHON) -c 'import psutil; print([x.lower() for x in ("LINUX", "BSD", "OSX", "SUNOS", "WINDOWS", "AIX") if getattr(psutil, x)][0])'`.py
-
-test-memleaks:  ## Memory leak tests.
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) psutil/tests/test_memory_leaks.py
-
-test-by-name:  ## e.g. make test-by-name ARGS=psutil.tests.test_system.TestSystemAPIs
-	${MAKE} install
-	@$(TEST_PREFIX) $(PYTHON) -m unittest -v $(ARGS)
-
-test-failed:  ## Re-run tests which failed on last run
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) $(TSCRIPT) --last-failed
-
-test-coverage:  ## Run test coverage.
-	${MAKE} install
-	# Note: coverage options are controlled by .coveragerc file
-	rm -rf .coverage htmlcov
-	$(TEST_PREFIX) $(PYTHON) -m coverage run $(TSCRIPT)
-	$(PYTHON) -m coverage report
-	@echo "writing results to htmlcov/index.html"
-	$(PYTHON) -m coverage html
-	$(PYTHON) -m webbrowser -t htmlcov/index.html
-
-# ===================================================================
-# Linters
-# ===================================================================
-
-lint-py:  ## Run Python (flake8) linter.
-	@git ls-files '*.py' | xargs $(PYTHON) -m flake8
-
-lint-c:  ## Run  C linter.
-	@git ls-files '*.c' '*.h' | xargs $(PYTHON) scripts/internal/clinter.py
-
-lint:  ## Run Python (flake8) and C linters.
-	${MAKE} lint-py
-	${MAKE} lint-c
-
-fix-lint:  ## Attempt to automatically fix some Python lint issues.
-	@git ls-files | grep \\.py$ | xargs $(PYTHON) -m flake8 --exit-zero | $(PYTHON) scripts/internal/fix_flake8.py
-
-# ===================================================================
-# GIT
-# ===================================================================
-
-git-tag-release:  ## Git-tag a new release.
-	git tag -a release-`python -c "import setup; print(setup.get_version())"` -m `git rev-list HEAD --count`:`git rev-parse --short HEAD`
-	git push --follow-tags
-
-install-git-hooks:  ## Install GIT pre-commit hook.
-	ln -sf ../../scripts/internal/.git-pre-commit .git/hooks/pre-commit
-	chmod +x .git/hooks/pre-commit
-
-# ===================================================================
-# Distribution
-# ===================================================================
-
-sdist:  ## Create tar.gz source distribution.
-	${MAKE} generate-manifest
-	$(PYTHON) setup.py sdist
-
-wheel:  ## Generate wheel.
-	$(PYTHON) setup.py bdist_wheel
-
-win-download-wheels:  ## Download wheels hosted on appveyor.
-	$(TEST_PREFIX) $(PYTHON) scripts/internal/win_download_wheels.py --user giampaolo --project psutil
-
-upload-src:  ## Upload source tarball on https://pypi.org/project/psutil/
-	${MAKE} sdist
-	$(PYTHON) setup.py sdist upload
-
-upload-win-wheels:  ## Upload wheels in dist/* directory on PyPI.
-	$(PYTHON) -m twine upload dist/*.whl
-
-# --- others
-
-check-sdist:  ## Create source distribution and checks its sanity (MANIFEST)
-	rm -rf dist
-	${MAKE} clean
-	$(PYTHON) -m virtualenv --clear --no-wheel --quiet build/venv
-	PYTHONWARNINGS=all $(PYTHON) setup.py sdist
-	build/venv/bin/python -m pip install -v --isolated --quiet dist/*.tar.gz
-	build/venv/bin/python -c "import os; os.chdir('build/venv'); import psutil"
-
-pre-release:  ## Check if we're ready to produce a new release.
-	${MAKE} check-sdist
-	${MAKE} install
-	${MAKE} generate-manifest
-	git diff MANIFEST.in > /dev/null  # ...otherwise 'git diff-index HEAD' will complain
-	${MAKE} win-download-wheels
-	${MAKE} sdist
-	$(PYTHON) -c \
-		"from psutil import __version__ as ver; \
-		doc = open('docs/index.rst').read(); \
-		history = open('HISTORY.rst').read(); \
-		assert ver in doc, '%r not in docs/index.rst' % ver; \
-		assert ver in history, '%r not in HISTORY.rst' % ver; \
-		assert 'XXXX' not in history, 'XXXX in HISTORY.rst';"
-	$(PYTHON) -c "import subprocess, sys; out = subprocess.check_output('git diff --quiet && git diff --cached --quiet', shell=True).strip(); sys.exit('there are uncommitted changes:\n%s' % out) if out else 0 ;"
-
-release:  ## Create a release (down/uploads tar.gz, wheels, git tag release).
-	${MAKE} pre-release
-	$(PYTHON) -m twine upload dist/*  # upload tar.gz and Windows wheels on PyPI
-	${MAKE} git-tag-release
-
-check-manifest:  ## Inspect MANIFEST.in file.
-	$(PYTHON) -m check_manifest -v $(ARGS)
-
-generate-manifest:  ## Generates MANIFEST.in file.
-	$(PYTHON) scripts/internal/generate_manifest.py > MANIFEST.in
-
-# ===================================================================
-# Printers
-# ===================================================================
-
-print-announce:  ## Print announce of new release.
-	@$(PYTHON) scripts/internal/print_announce.py
-
-print-timeline:  ## Print releases' timeline.
-	@$(PYTHON) scripts/internal/print_timeline.py
-
-print-access-denied: ## Print AD exceptions
-	${MAKE} install
-	@$(TEST_PREFIX) $(PYTHON) scripts/internal/print_access_denied.py
-
-print-api-speed:  ## Benchmark all API calls
-	${MAKE} install
-	@$(TEST_PREFIX) $(PYTHON) scripts/internal/print_api_speed.py $(ARGS)
-
-# ===================================================================
-# Misc
-# ===================================================================
-
-grep-todos:  ## Look for TODOs in the source files.
-	git grep -EIn "TODO|FIXME|XXX"
-
-bench-oneshot:  ## Benchmarks for oneshot() ctx manager (see #799).
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) scripts/internal/bench_oneshot.py
-
-bench-oneshot-2:  ## Same as above but using perf module (supposed to be more precise)
-	${MAKE} install
-	$(TEST_PREFIX) $(PYTHON) scripts/internal/bench_oneshot_2.py
-
-check-broken-links:  ## Look for broken links in source files.
-	git ls-files | xargs $(PYTHON) -Wa scripts/internal/check_broken_links.py
-
-help: ## Display callable targets.
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/MANIFEST.in firefox-85.0+build1/third_party/python/psutil/MANIFEST.in
--- firefox-84.0.2+build1/third_party/python/psutil/MANIFEST.in	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/MANIFEST.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-include .cirrus.yml
-include .coveragerc
-include .gitignore
-include CREDITS
-include HISTORY.rst
-include INSTALL.rst
-include LICENSE
-include MANIFEST.in
-include Makefile
-include README.rst
-include docs/DEVGUIDE.rst
-include docs/DEVNOTES
-include docs/Makefile
-include docs/README
-include docs/_static/copybutton.js
-include docs/_static/css/custom.css
-include docs/_static/favicon.ico
-include docs/_static/sidebar.js
-include docs/conf.py
-include docs/index.rst
-include docs/make.bat
-include make.bat
-include psutil/__init__.py
-include psutil/_common.py
-include psutil/_compat.py
-include psutil/_psaix.py
-include psutil/_psbsd.py
-include psutil/_pslinux.py
-include psutil/_psosx.py
-include psutil/_psposix.py
-include psutil/_pssunos.py
-include psutil/_psutil_aix.c
-include psutil/_psutil_bsd.c
-include psutil/_psutil_common.c
-include psutil/_psutil_common.h
-include psutil/_psutil_linux.c
-include psutil/_psutil_osx.c
-include psutil/_psutil_posix.c
-include psutil/_psutil_posix.h
-include psutil/_psutil_sunos.c
-include psutil/_psutil_windows.c
-include psutil/_pswindows.py
-include psutil/arch/aix/common.c
-include psutil/arch/aix/common.h
-include psutil/arch/aix/ifaddrs.c
-include psutil/arch/aix/ifaddrs.h
-include psutil/arch/aix/net_connections.c
-include psutil/arch/aix/net_connections.h
-include psutil/arch/aix/net_kernel_structs.h
-include psutil/arch/freebsd/proc_socks.c
-include psutil/arch/freebsd/proc_socks.h
-include psutil/arch/freebsd/specific.c
-include psutil/arch/freebsd/specific.h
-include psutil/arch/freebsd/sys_socks.c
-include psutil/arch/freebsd/sys_socks.h
-include psutil/arch/netbsd/socks.c
-include psutil/arch/netbsd/socks.h
-include psutil/arch/netbsd/specific.c
-include psutil/arch/netbsd/specific.h
-include psutil/arch/openbsd/specific.c
-include psutil/arch/openbsd/specific.h
-include psutil/arch/osx/process_info.c
-include psutil/arch/osx/process_info.h
-include psutil/arch/solaris/environ.c
-include psutil/arch/solaris/environ.h
-include psutil/arch/solaris/v10/ifaddrs.c
-include psutil/arch/solaris/v10/ifaddrs.h
-include psutil/arch/windows/cpu.c
-include psutil/arch/windows/cpu.h
-include psutil/arch/windows/disk.c
-include psutil/arch/windows/disk.h
-include psutil/arch/windows/net.c
-include psutil/arch/windows/net.h
-include psutil/arch/windows/ntextapi.h
-include psutil/arch/windows/process_handles.c
-include psutil/arch/windows/process_handles.h
-include psutil/arch/windows/process_info.c
-include psutil/arch/windows/process_info.h
-include psutil/arch/windows/process_utils.c
-include psutil/arch/windows/process_utils.h
-include psutil/arch/windows/security.c
-include psutil/arch/windows/security.h
-include psutil/arch/windows/services.c
-include psutil/arch/windows/services.h
-include psutil/arch/windows/socks.c
-include psutil/arch/windows/socks.h
-include psutil/arch/windows/wmi.c
-include psutil/arch/windows/wmi.h
-include psutil/tests/README.rst
-include psutil/tests/__init__.py
-include psutil/tests/__main__.py
-include psutil/tests/runner.py
-include psutil/tests/test_aix.py
-include psutil/tests/test_bsd.py
-include psutil/tests/test_connections.py
-include psutil/tests/test_contracts.py
-include psutil/tests/test_linux.py
-include psutil/tests/test_memory_leaks.py
-include psutil/tests/test_misc.py
-include psutil/tests/test_osx.py
-include psutil/tests/test_posix.py
-include psutil/tests/test_process.py
-include psutil/tests/test_sunos.py
-include psutil/tests/test_system.py
-include psutil/tests/test_unicode.py
-include psutil/tests/test_windows.py
-include scripts/battery.py
-include scripts/cpu_distribution.py
-include scripts/disk_usage.py
-include scripts/fans.py
-include scripts/free.py
-include scripts/ifconfig.py
-include scripts/internal/.git-pre-commit
-include scripts/internal/README
-include scripts/internal/bench_oneshot.py
-include scripts/internal/bench_oneshot_2.py
-include scripts/internal/check_broken_links.py
-include scripts/internal/clinter.py
-include scripts/internal/fix_flake8.py
-include scripts/internal/generate_manifest.py
-include scripts/internal/print_access_denied.py
-include scripts/internal/print_announce.py
-include scripts/internal/print_api_speed.py
-include scripts/internal/print_timeline.py
-include scripts/internal/purge_installation.py
-include scripts/internal/win_download_wheels.py
-include scripts/internal/winmake.py
-include scripts/iotop.py
-include scripts/killall.py
-include scripts/meminfo.py
-include scripts/netstat.py
-include scripts/nettop.py
-include scripts/pidof.py
-include scripts/pmap.py
-include scripts/procinfo.py
-include scripts/procsmem.py
-include scripts/ps.py
-include scripts/pstree.py
-include scripts/sensors.py
-include scripts/temperatures.py
-include scripts/top.py
-include scripts/who.py
-include scripts/winservices.py
-include setup.py
-include tox.ini
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/PKG-INFO firefox-85.0+build1/third_party/python/psutil/PKG-INFO
--- firefox-84.0.2+build1/third_party/python/psutil/PKG-INFO	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
@@ -1,578 +0,0 @@
-Metadata-Version: 1.2
-Name: psutil
-Version: 5.7.0
-Summary: Cross-platform lib for process and system monitoring in Python.
-Home-page: https://github.com/giampaolo/psutil
-Author: Giampaolo Rodola
-Author-email: g.rodola@gmail.com
-License: BSD
-Description: |  |downloads| |stars| |forks| |contributors| |coverage| |quality|
-        |  |version| |py-versions| |packages| |license|
-        |  |travis| |appveyor| |cirrus| |doc| |twitter| |tidelift|
-        
-        .. |downloads| image:: https://img.shields.io/pypi/dm/psutil.svg
-            :target: https://pepy.tech/project/psutil
-            :alt: Downloads
-        
-        .. |stars| image:: https://img.shields.io/github/stars/giampaolo/psutil.svg
-            :target: https://github.com/giampaolo/psutil/stargazers
-            :alt: Github stars
-        
-        .. |forks| image:: https://img.shields.io/github/forks/giampaolo/psutil.svg
-            :target: https://github.com/giampaolo/psutil/network/members
-            :alt: Github forks
-        
-        .. |contributors| image:: https://img.shields.io/github/contributors/giampaolo/psutil.svg
-            :target: https://github.com/giampaolo/psutil/graphs/contributors
-            :alt: Contributors
-        
-        .. |quality| image:: https://img.shields.io/codacy/grade/ce63e7f7f69d44b5b59682196e6fbfca.svg
-            :target: https://www.codacy.com/app/g-rodola/psutil?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=giampaolo/psutil&amp;utm_campaign=Badge_Grade
-            :alt: Code quality
-        
-        .. |travis| image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux,%20OSX,%20PyPy
-            :target: https://travis-ci.org/giampaolo/psutil
-            :alt: Linux tests (Travis)
-        
-        .. |appveyor| image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows
-            :target: https://ci.appveyor.com/project/giampaolo/psutil
-            :alt: Windows tests (Appveyor)
-        
-        .. |cirrus| image:: https://img.shields.io/cirrus/github/giampaolo/psutil?label=FreeBSD
-            :target: https://cirrus-ci.com/github/giampaolo/psutil-cirrus-ci
-            :alt: FreeBSD tests (Cirrus-Ci)
-        
-        .. |coverage| image:: https://img.shields.io/coveralls/github/giampaolo/psutil.svg?label=test%20coverage
-            :target: https://coveralls.io/github/giampaolo/psutil?branch=master
-            :alt: Test coverage (coverall.io)
-        
-        .. |doc| image:: https://readthedocs.org/projects/psutil/badge/?version=latest
-            :target: http://psutil.readthedocs.io/en/latest/?badge=latest
-            :alt: Documentation Status
-        
-        .. |version| image:: https://img.shields.io/pypi/v/psutil.svg?label=pypi
-            :target: https://pypi.org/project/psutil
-            :alt: Latest version
-        
-        .. |py-versions| image:: https://img.shields.io/pypi/pyversions/psutil.svg
-            :target: https://pypi.org/project/psutil
-            :alt: Supported Python versions
-        
-        .. |packages| image:: https://repology.org/badge/tiny-repos/python:psutil.svg
-            :target: https://repology.org/metapackage/python:psutil/versions
-            :alt: Binary packages
-        
-        .. |license| image:: https://img.shields.io/pypi/l/psutil.svg
-            :target: https://github.com/giampaolo/psutil/blob/master/LICENSE
-            :alt: License
-        
-        .. |twitter| image:: https://img.shields.io/twitter/follow/grodola.svg?label=follow&style=flat&logo=twitter&logoColor=4FADFF
-            :target: https://twitter.com/grodola
-            :alt: Twitter Follow
-        
-        .. |tidelift| image:: https://tidelift.com/badges/github/giampaolo/psutil?style=flat
-            :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-            :alt: Tidelift
-        
-        -----
-        
-        Quick links
-        ===========
-        
-        - `Home page <https://github.com/giampaolo/psutil>`_
-        - `Install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`_
-        - `Documentation <http://psutil.readthedocs.io>`_
-        - `Download <https://pypi.org/project/psutil/#files>`_
-        - `Forum <http://groups.google.com/group/psutil/topics>`_
-        - `StackOverflow <https://stackoverflow.com/questions/tagged/psutil>`_
-        - `Blog <http://grodola.blogspot.com/search/label/psutil>`_
-        - `Development guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`_
-        - `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`_
-        
-        Summary
-        =======
-        
-        psutil (process and system utilities) is a cross-platform library for
-        retrieving information on **running processes** and **system utilization**
-        (CPU, memory, disks, network, sensors) in Python.
-        It is useful mainly for **system monitoring**, **profiling and limiting process
-        resources** and **management of running processes**.
-        It implements many functionalities offered by classic UNIX command line tools
-        such as *ps, top, iotop, lsof, netstat, ifconfig, free* and others.
-        psutil currently supports the following platforms:
-        
-        - **Linux**
-        - **Windows**
-        - **macOS**
-        - **FreeBSD, OpenBSD**, **NetBSD**
-        - **Sun Solaris**
-        - **AIX**
-        
-        ...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy3 <http://pypy.org/>`__ is also known to work.
-        
-        psutil for enterprise
-        =====================
-        
-        .. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
-           :width: 150
-           :alt: Tidelift
-           :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-        
-        .. list-table::
-           :widths: 10 150
-        
-           * - |tideliftlogo|
-             - The maintainer of psutil and thousands of other packages are working
-               with Tidelift to deliver commercial support and maintenance for the open
-               source dependencies you use to build your applications. Save time,
-               reduce risk, and improve code health, while paying the maintainers of
-               the exact dependencies you use.
-               `Learn more <https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`__.
-        
-               By subscribing to Tidelift you will help me (`Giampaolo Rodola`_) support
-               psutil future development. Alternatively consider making a small
-               `donation`_.
-        
-        Security
-        ========
-        
-        To report a security vulnerability, please use the `Tidelift security
-        contact`_.  Tidelift will coordinate the fix and disclosure.
-        
-        Example applications
-        ====================
-        
-        +------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-        | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/top-small.png      |
-        |    :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo.png          |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/top.png          |
-        +------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-        | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap-small.png     |
-        |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem.png         |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap.png         |
-        +------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-        
-        Also see `scripts directory <https://github.com/giampaolo/psutil/tree/master/scripts>`__
-        and `doc recipes <http://psutil.readthedocs.io/#recipes/>`__.
-        
-        Projects using psutil
-        =====================
-        
-        psutil has roughly the following monthly downloads:
-        
-        .. image:: https://img.shields.io/pypi/dm/psutil.svg
-            :target: https://pepy.tech/project/psutil
-            :alt: Downloads
-        
-        There are over
-        `10.000 open source projects <https://libraries.io/pypi/psutil/dependent_repositories?page=1>`__
-        on github which depend from psutil.
-        Here's some I find particularly interesting:
-        
-        - https://github.com/google/grr
-        - https://github.com/facebook/osquery/
-        - https://github.com/nicolargo/glances
-        - https://github.com/Jahaja/psdash
-        - https://github.com/ajenti/ajenti
-        - https://github.com/home-assistant/home-assistant/
-        
-        
-        Portings
-        ========
-        
-        - Go: https://github.com/shirou/gopsutil
-        - C: https://github.com/hamon-in/cpslib
-        - Rust: https://github.com/borntyping/rust-psutil
-        - Nim: https://github.com/johnscillieri/psutil-nim
-        
-        
-        Example usages
-        ==============
-        
-        This represents pretty much the whole psutil API.
-        
-        CPU
-        ---
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>>
-            >>> psutil.cpu_times()
-            scputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540, iowait=629.59, irq=0.0, softirq=19.42, steal=0.0, guest=0, nice=0.0)
-            >>>
-            >>> for x in range(3):
-            ...     psutil.cpu_percent(interval=1)
-            ...
-            4.0
-            5.9
-            3.8
-            >>>
-            >>> for x in range(3):
-            ...     psutil.cpu_percent(interval=1, percpu=True)
-            ...
-            [4.0, 6.9, 3.7, 9.2]
-            [7.0, 8.5, 2.4, 2.1]
-            [1.2, 9.0, 9.9, 7.2]
-            >>>
-            >>> for x in range(3):
-            ...     psutil.cpu_times_percent(interval=1, percpu=False)
-            ...
-            scputimes(user=1.5, nice=0.0, system=0.5, idle=96.5, iowait=1.5, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-            scputimes(user=1.0, nice=0.0, system=0.0, idle=99.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-            scputimes(user=2.0, nice=0.0, system=0.0, idle=98.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-            >>>
-            >>> psutil.cpu_count()
-            4
-            >>> psutil.cpu_count(logical=False)
-            2
-            >>>
-            >>> psutil.cpu_stats()
-            scpustats(ctx_switches=20455687, interrupts=6598984, soft_interrupts=2134212, syscalls=0)
-            >>>
-            >>> psutil.cpu_freq()
-            scpufreq(current=931.42925, min=800.0, max=3500.0)
-            >>>
-            >>> psutil.getloadavg()  # also on Windows (emulated)
-            (3.14, 3.89, 4.67)
-        
-        Memory
-        ------
-        
-        .. code-block:: python
-        
-            >>> psutil.virtual_memory()
-            svmem(total=10367352832, available=6472179712, percent=37.6, used=8186245120, free=2181107712, active=4748992512, inactive=2758115328, buffers=790724608, cached=3500347392, shared=787554304)
-            >>> psutil.swap_memory()
-            sswap(total=2097147904, used=296128512, free=1801019392, percent=14.1, sin=304193536, sout=677842944)
-            >>>
-        
-        Disks
-        -----
-        
-        .. code-block:: python
-        
-            >>> psutil.disk_partitions()
-            [sdiskpart(device='/dev/sda1', mountpoint='/', fstype='ext4', opts='rw,nosuid'),
-             sdiskpart(device='/dev/sda2', mountpoint='/home', fstype='ext, opts='rw')]
-            >>>
-            >>> psutil.disk_usage('/')
-            sdiskusage(total=21378641920, used=4809781248, free=15482871808, percent=22.5)
-            >>>
-            >>> psutil.disk_io_counters(perdisk=False)
-            sdiskio(read_count=719566, write_count=1082197, read_bytes=18626220032, write_bytes=24081764352, read_time=5023392, write_time=63199568, read_merged_count=619166, write_merged_count=812396, busy_time=4523412)
-            >>>
-        
-        Network
-        -------
-        
-        .. code-block:: python
-        
-            >>> psutil.net_io_counters(pernic=True)
-            {'eth0': netio(bytes_sent=485291293, bytes_recv=6004858642, packets_sent=3251564, packets_recv=4787798, errin=0, errout=0, dropin=0, dropout=0),
-             'lo': netio(bytes_sent=2838627, bytes_recv=2838627, packets_sent=30567, packets_recv=30567, errin=0, errout=0, dropin=0, dropout=0)}
-            >>>
-            >>> psutil.net_connections()
-            [sconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED', pid=1254),
-             sconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING', pid=2987),
-             ...]
-            >>>
-            >>> psutil.net_if_addrs()
-            {'lo': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='127.0.0.1', netmask='255.0.0.0', broadcast='127.0.0.1', ptp=None),
-                    snicaddr(family=<AddressFamily.AF_INET6: 10>, address='::1', netmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff', broadcast=None, ptp=None),
-                    snicaddr(family=<AddressFamily.AF_LINK: 17>, address='00:00:00:00:00:00', netmask=None, broadcast='00:00:00:00:00:00', ptp=None)],
-             'wlan0': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='192.168.1.3', netmask='255.255.255.0', broadcast='192.168.1.255', ptp=None),
-                       snicaddr(family=<AddressFamily.AF_INET6: 10>, address='fe80::c685:8ff:fe45:641%wlan0', netmask='ffff:ffff:ffff:ffff::', broadcast=None, ptp=None),
-                       snicaddr(family=<AddressFamily.AF_LINK: 17>, address='c4:85:08:45:06:41', netmask=None, broadcast='ff:ff:ff:ff:ff:ff', ptp=None)]}
-            >>>
-            >>> psutil.net_if_stats()
-            {'lo': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_UNKNOWN: 0>, speed=0, mtu=65536),
-             'wlan0': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>, speed=100, mtu=1500)}
-            >>>
-        
-        Sensors
-        -------
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>> psutil.sensors_temperatures()
-            {'acpitz': [shwtemp(label='', current=47.0, high=103.0, critical=103.0)],
-             'asus': [shwtemp(label='', current=47.0, high=None, critical=None)],
-             'coretemp': [shwtemp(label='Physical id 0', current=52.0, high=100.0, critical=100.0),
-                          shwtemp(label='Core 0', current=45.0, high=100.0, critical=100.0)]}
-            >>>
-            >>> psutil.sensors_fans()
-            {'asus': [sfan(label='cpu_fan', current=3200)]}
-            >>>
-            >>> psutil.sensors_battery()
-            sbattery(percent=93, secsleft=16628, power_plugged=False)
-            >>>
-        
-        Other system info
-        -----------------
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>> psutil.users()
-            [suser(name='giampaolo', terminal='pts/2', host='localhost', started=1340737536.0, pid=1352),
-             suser(name='giampaolo', terminal='pts/3', host='localhost', started=1340737792.0, pid=1788)]
-            >>>
-            >>> psutil.boot_time()
-            1365519115.0
-            >>>
-        
-        Process management
-        ------------------
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>> psutil.pids()
-            [1, 2, 3, 4, 5, 6, 7, 46, 48, 50, 51, 178, 182, 222, 223, 224, 268, 1215, 1216, 1220, 1221, 1243, 1244,
-             1301, 1601, 2237, 2355, 2637, 2774, 3932, 4176, 4177, 4185, 4187, 4189, 4225, 4243, 4245, 4263, 4282,
-             4306, 4311, 4312, 4313, 4314, 4337, 4339, 4357, 4358, 4363, 4383, 4395, 4408, 4433, 4443, 4445, 4446,
-             5167, 5234, 5235, 5252, 5318, 5424, 5644, 6987, 7054, 7055, 7071]
-            >>>
-            >>> p = psutil.Process(7055)
-            >>> p
-            psutil.Process(pid=7055, name='python', started='09:04:44')
-            >>> p.name()
-            'python'
-            >>> p.exe()
-            '/usr/bin/python'
-            >>> p.cwd()
-            '/home/giampaolo'
-            >>> p.cmdline()
-            ['/usr/bin/python', 'main.py']
-            >>>
-            >>> p.pid
-            7055
-            >>> p.ppid()
-            7054
-            >>> p.children(recursive=True)
-            [psutil.Process(pid=29835, name='python2.7', started='11:45:38'),
-             psutil.Process(pid=29836, name='python2.7', started='11:43:39')]
-            >>>
-            >>> p.parent()
-            psutil.Process(pid=4699, name='bash', started='09:06:44')
-            >>> p.parents()
-            [psutil.Process(pid=4699, name='bash', started='09:06:44'),
-             psutil.Process(pid=4689, name='gnome-terminal-server', started='0:06:44'),
-             psutil.Process(pid=1, name='systemd', started='05:56:55')]
-            >>>
-            >>> p.status()
-            'running'
-            >>> p.username()
-            'giampaolo'
-            >>> p.create_time()
-            1267551141.5019531
-            >>> p.terminal()
-            '/dev/pts/0'
-            >>>
-            >>> p.uids()
-            puids(real=1000, effective=1000, saved=1000)
-            >>> p.gids()
-            pgids(real=1000, effective=1000, saved=1000)
-            >>>
-            >>> p.cpu_times()
-            pcputimes(user=1.02, system=0.31, children_user=0.32, children_system=0.1, iowait=0.0)
-            >>> p.cpu_percent(interval=1.0)
-            12.1
-            >>> p.cpu_affinity()
-            [0, 1, 2, 3]
-            >>> p.cpu_affinity([0, 1])  # set
-            >>> p.cpu_num()
-            1
-            >>>
-            >>> p.memory_info()
-            pmem(rss=10915840, vms=67608576, shared=3313664, text=2310144, lib=0, data=7262208, dirty=0)
-            >>> p.memory_full_info()  # "real" USS memory usage (Linux, macOS, Win only)
-            pfullmem(rss=10199040, vms=52133888, shared=3887104, text=2867200, lib=0, data=5967872, dirty=0, uss=6545408, pss=6872064, swap=0)
-            >>> p.memory_percent()
-            0.7823
-            >>> p.memory_maps()
-            [pmmap_grouped(path='/lib/x8664-linux-gnu/libutil-2.15.so', rss=32768, size=2125824, pss=32768, shared_clean=0, shared_dirty=0, private_clean=20480, private_dirty=12288, referenced=32768, anonymous=12288, swap=0),
-             pmmap_grouped(path='/lib/x8664-linux-gnu/libc-2.15.so', rss=3821568, size=3842048, pss=3821568, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=3821568, referenced=3575808, anonymous=3821568, swap=0),
-             pmmap_grouped(path='[heap]',  rss=32768, size=139264, pss=32768, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=32768, referenced=32768, anonymous=32768, swap=0),
-             pmmap_grouped(path='[stack]', rss=2465792, size=2494464, pss=2465792, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=2465792, referenced=2277376, anonymous=2465792, swap=0),
-             ...]
-            >>>
-            >>> p.io_counters()
-            pio(read_count=478001, write_count=59371, read_bytes=700416, write_bytes=69632, read_chars=456232, write_chars=517543)
-            >>>
-            >>> p.open_files()
-            [popenfile(path='/home/giampaolo/monit.py', fd=3, position=0, mode='r', flags=32768),
-             popenfile(path='/var/log/monit.log', fd=4, position=235542, mode='a', flags=33793)]
-            >>>
-            >>> p.connections()
-            [pconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED'),
-             pconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING')]
-            >>>
-            >>> p.num_threads()
-            4
-            >>> p.num_fds()
-            8
-            >>> p.threads()
-            [pthread(id=5234, user_time=22.5, system_time=9.2891),
-             pthread(id=5237, user_time=0.0707, system_time=1.1)]
-            >>>
-            >>> p.num_ctx_switches()
-            pctxsw(voluntary=78, involuntary=19)
-            >>>
-            >>> p.nice()
-            0
-            >>> p.nice(10)  # set
-            >>>
-            >>> p.ionice(psutil.IOPRIO_CLASS_IDLE)  # IO priority (Win and Linux only)
-            >>> p.ionice()
-            pionice(ioclass=<IOPriority.IOPRIO_CLASS_IDLE: 3>, value=0)
-            >>>
-            >>> p.rlimit(psutil.RLIMIT_NOFILE, (5, 5))  # set resource limits (Linux only)
-            >>> p.rlimit(psutil.RLIMIT_NOFILE)
-            (5, 5)
-            >>>
-            >>> p.environ()
-            {'LC_PAPER': 'it_IT.UTF-8', 'SHELL': '/bin/bash', 'GREP_OPTIONS': '--color=auto',
-            'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg',
-             ...}
-            >>>
-            >>> p.as_dict()
-            {'status': 'running', 'num_ctx_switches': pctxsw(voluntary=63, involuntary=1), 'pid': 5457, ...}
-            >>> p.is_running()
-            True
-            >>> p.suspend()
-            >>> p.resume()
-            >>>
-            >>> p.terminate()
-            >>> p.kill()
-            >>> p.wait(timeout=3)
-            0
-            >>>
-            >>> psutil.test()
-            USER         PID %CPU %MEM     VSZ     RSS TTY        START    TIME  COMMAND
-            root           1  0.0  0.0   24584    2240            Jun17   00:00  init
-            root           2  0.0  0.0       0       0            Jun17   00:00  kthreadd
-            ...
-            giampaolo  31475  0.0  0.0   20760    3024 /dev/pts/0 Jun19   00:00  python2.4
-            giampaolo  31721  0.0  2.2  773060  181896            00:04   10:30  chrome
-            root       31763  0.0  0.0       0       0            00:05   00:00  kworker/0:1
-            >>>
-        
-        Further process APIs
-        --------------------
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>> for proc in psutil.process_iter(['pid', 'name']):
-            ...     print(proc.info)
-            ...
-            {'pid': 1, 'name': 'systemd'}
-            {'pid': 2, 'name': 'kthreadd'}
-            {'pid': 3, 'name': 'ksoftirqd/0'}
-            ...
-            >>>
-            >>> psutil.pid_exists(3)
-            True
-            >>>
-            >>> def on_terminate(proc):
-            ...     print("process {} terminated".format(proc))
-            ...
-            >>> # waits for multiple processes to terminate
-            >>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
-            >>>
-        
-        Popen wrapper:
-        
-        .. code-block:: python
-        
-            >>> import psutil
-            >>> from subprocess import PIPE
-            >>> p = psutil.Popen(["/usr/bin/python", "-c", "print('hello')"], stdout=PIPE)
-            >>> p.name()
-            'python'
-            >>> p.username()
-            'giampaolo'
-            >>> p.communicate()
-            ('hello\n', None)
-            >>> p.wait(timeout=2)
-            0
-            >>>
-        
-        Windows services
-        ----------------
-        
-        .. code-block:: python
-        
-            >>> list(psutil.win_service_iter())
-            [<WindowsService(name='AeLookupSvc', display_name='Application Experience') at 38850096>,
-             <WindowsService(name='ALG', display_name='Application Layer Gateway Service') at 38850128>,
-             <WindowsService(name='APNMCP', display_name='Ask Update Service') at 38850160>,
-             <WindowsService(name='AppIDSvc', display_name='Application Identity') at 38850192>,
-             ...]
-            >>> s = psutil.win_service_get('alg')
-            >>> s.as_dict()
-            {'binpath': 'C:\\Windows\\System32\\alg.exe',
-             'description': 'Provides support for 3rd party protocol plug-ins for Internet Connection Sharing',
-             'display_name': 'Application Layer Gateway Service',
-             'name': 'alg',
-             'pid': None,
-             'start_type': 'manual',
-             'status': 'stopped',
-             'username': 'NT AUTHORITY\\LocalService'}
-        
-        
-        .. _`Giampaolo Rodola`: http://grodola.blogspot.com/p/about.html
-        .. _`donation`: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A9ZS7PKKRM3S8
-        .. _Tidelift security contact: https://tidelift.com/security
-        .. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-        
-        
-Keywords: ps,top,kill,free,lsof,netstat,nice,tty,ionice,uptime,taskmgr,process,df,iotop,iostat,ifconfig,taskset,who,pidof,pmap,smem,pstree,monitoring,ulimit,prlimit,smem,performance,metrics,agent,observability
-Platform: Platform Independent
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Environment :: Win32 (MS Windows)
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows :: Windows 10
-Classifier: Operating System :: Microsoft :: Windows :: Windows 7
-Classifier: Operating System :: Microsoft :: Windows :: Windows 8
-Classifier: Operating System :: Microsoft :: Windows :: Windows 8.1
-Classifier: Operating System :: Microsoft :: Windows :: Windows Server 2003
-Classifier: Operating System :: Microsoft :: Windows :: Windows Server 2008
-Classifier: Operating System :: Microsoft :: Windows :: Windows Vista
-Classifier: Operating System :: Microsoft
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX :: AIX
-Classifier: Operating System :: POSIX :: BSD :: FreeBSD
-Classifier: Operating System :: POSIX :: BSD :: NetBSD
-Classifier: Operating System :: POSIX :: BSD :: OpenBSD
-Classifier: Operating System :: POSIX :: BSD
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Operating System :: POSIX :: SunOS/Solaris
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: C
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: System :: Benchmark
-Classifier: Topic :: System :: Hardware :: Hardware Drivers
-Classifier: Topic :: System :: Hardware
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: System :: Networking :: Monitoring :: Hardware Watchdog
-Classifier: Topic :: System :: Networking :: Monitoring
-Classifier: Topic :: System :: Networking
-Classifier: Topic :: System :: Operating System
-Classifier: Topic :: System :: Systems Administration
-Classifier: Topic :: Utilities
-Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/common.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/common.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/common.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <sys/core.h>
-#include <stdlib.h>
-#include "common.h"
-
-/* psutil_kread() - read from kernel memory */
-int
-psutil_kread(
-    int Kd,             /* kernel memory file descriptor */
-    KA_T addr,          /* kernel memory address */
-    char *buf,          /* buffer to receive data */
-    size_t len) {       /* length to read */
-    int br;
-
-    if (lseek64(Kd, (off64_t)addr, L_SET) == (off64_t)-1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return 1;
-    }
-    br = read(Kd, buf, len);
-    if (br == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return 1;
-    }
-    if (br != len) {
-        PyErr_SetString(PyExc_RuntimeError,
-                        "size mismatch when reading kernel memory fd");
-        return 1;
-    }
-    return 0;
-}
-
-struct procentry64 *
-psutil_read_process_table(int * num) {
-    size_t msz;
-    pid32_t pid = 0;
-    struct procentry64 *processes = (struct procentry64 *)NULL;
-    struct procentry64 *p;
-    int Np = 0;          /* number of processes allocated in 'processes' */
-    int np = 0;          /* number of processes read into 'processes' */
-    int i;               /* number of processes read in current iteration */
-
-    msz = (size_t)(PROCSIZE * PROCINFO_INCR);
-    processes = (struct procentry64 *)malloc(msz);
-    if (!processes) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    Np = PROCINFO_INCR;
-    p = processes;
-    while ((i = getprocs64(p, PROCSIZE, (struct fdsinfo64 *)NULL, 0, &pid,
-                 PROCINFO_INCR))
-    == PROCINFO_INCR) {
-        np += PROCINFO_INCR;
-        if (np >= Np) {
-            msz = (size_t)(PROCSIZE * (Np + PROCINFO_INCR));
-            processes = (struct procentry64 *)realloc((char *)processes, msz);
-            if (!processes) {
-                PyErr_NoMemory();
-                return NULL;
-            }
-            Np += PROCINFO_INCR;
-        }
-        p = (struct procentry64 *)((char *)processes + (np * PROCSIZE));
-    }
-
-    /* add the number of processes read in the last iteration */
-    if (i > 0)
-        np += i;
-
-    *num = np;
-    return processes;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/common.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/common.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/common.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __PSUTIL_AIX_COMMON_H__
-#define __PSUTIL_AIX_COMMON_H__
-
-#include <sys/core.h>
-
-#define PROCINFO_INCR   (256)
-#define PROCSIZE        (sizeof(struct procentry64))
-#define FDSINFOSIZE     (sizeof(struct fdsinfo64))
-#define KMEM            "/dev/kmem"
-
-typedef u_longlong_t    KA_T;
-
-/* psutil_kread() - read from kernel memory */
-int psutil_kread(int Kd,     /* kernel memory file descriptor */
-    KA_T addr,               /* kernel memory address */
-    char *buf,               /* buffer to receive data */
-    size_t len);             /* length to read */
-
-struct procentry64 *
-psutil_read_process_table(
-    int * num               /* out - number of processes read */
-);
-
-#endif  /* __PSUTIL_AIX_COMMON_H__ */
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.c	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/*! Based on code from
-    https://lists.samba.org/archive/samba-technical/2009-February/063079.html
-!*/
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "ifaddrs.h"
-
-#define MAX(x,y) ((x)>(y)?(x):(y))
-#define SIZE(p) MAX((p).sa_len,sizeof(p))
-
-
-static struct sockaddr *
-sa_dup(struct sockaddr *sa1)
-{
-    struct sockaddr *sa2;
-    size_t sz = sa1->sa_len;
-    sa2 = (struct sockaddr *) calloc(1, sz);
-    if (sa2 == NULL)
-        return NULL;
-    memcpy(sa2, sa1, sz);
-    return sa2;
-}
-
-
-void freeifaddrs(struct ifaddrs *ifp)
-{
-    if (NULL == ifp) return;
-    free(ifp->ifa_name);
-    free(ifp->ifa_addr);
-    free(ifp->ifa_netmask);
-    free(ifp->ifa_dstaddr);
-    freeifaddrs(ifp->ifa_next);
-    free(ifp);
-}
-
-
-int getifaddrs(struct ifaddrs **ifap)
-{
-    int sd, ifsize;
-    char *ccp, *ecp;
-    struct ifconf ifc;
-    struct ifreq *ifr;
-    struct ifaddrs *cifa = NULL; /* current */
-    struct ifaddrs *pifa = NULL; /* previous */
-    const size_t IFREQSZ = sizeof(struct ifreq);
-    int fam;
-
-    *ifap = NULL;
-
-    sd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sd == -1)
-        goto error;
-
-    /* find how much memory to allocate for the SIOCGIFCONF call */
-    if (ioctl(sd, SIOCGSIZIFCONF, (caddr_t)&ifsize) < 0)
-        goto error;
-
-    ifc.ifc_req = (struct ifreq *) calloc(1, ifsize);
-    if (ifc.ifc_req == NULL)
-        goto error;
-    ifc.ifc_len = ifsize;
-
-    if (ioctl(sd, SIOCGIFCONF, &ifc) < 0)
-        goto error;
-
-    ccp = (char *)ifc.ifc_req;
-    ecp = ccp + ifsize;
-
-    while (ccp < ecp) {
-
-        ifr = (struct ifreq *) ccp;
-        ifsize = sizeof(ifr->ifr_name) + SIZE(ifr->ifr_addr);
-        fam = ifr->ifr_addr.sa_family;
-
-        if (fam == AF_INET || fam == AF_INET6) {
-            cifa = (struct ifaddrs *) calloc(1, sizeof(struct ifaddrs));
-            if (cifa == NULL)
-                goto error;
-            cifa->ifa_next = NULL;
-
-            if (pifa == NULL) *ifap = cifa; /* first one */
-            else pifa->ifa_next = cifa;
-
-            cifa->ifa_name = strdup(ifr->ifr_name);
-            if (cifa->ifa_name == NULL)
-                goto error;
-            cifa->ifa_flags = 0;
-            cifa->ifa_dstaddr = NULL;
-
-            cifa->ifa_addr = sa_dup(&ifr->ifr_addr);
-            if (cifa->ifa_addr == NULL)
-                goto error;
-
-            if (fam == AF_INET) {
-                if (ioctl(sd, SIOCGIFNETMASK, ifr, IFREQSZ) < 0)
-                    goto error;
-                cifa->ifa_netmask = sa_dup(&ifr->ifr_addr);
-                if (cifa->ifa_netmask == NULL)
-                    goto error;
-            }
-
-            if (0 == ioctl(sd, SIOCGIFFLAGS, ifr)) /* optional */
-                cifa->ifa_flags = ifr->ifr_flags;
-
-            if (fam == AF_INET) {
-                if (ioctl(sd, SIOCGIFDSTADDR, ifr, IFREQSZ) < 0) {
-                    if (0 == ioctl(sd, SIOCGIFBRDADDR, ifr, IFREQSZ)) {
-                        cifa->ifa_dstaddr = sa_dup(&ifr->ifr_addr);
-                        if (cifa->ifa_dstaddr == NULL)
-                            goto error;
-                    }
-                }
-                else {
-                    cifa->ifa_dstaddr = sa_dup(&ifr->ifr_addr);
-                    if (cifa->ifa_dstaddr == NULL)
-                        goto error;
-                }
-            }
-            pifa = cifa;
-        }
-
-        ccp += ifsize;
-    }
-    free(ifc.ifc_req);
-    close(sd);
-    return 0;
-error:
-    if (ifc.ifc_req != NULL)
-        free(ifc.ifc_req);
-    if (sd != -1)
-        close(sd);
-    freeifaddrs(*ifap);
-    return (-1);
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/ifaddrs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/*! Based on code from
-    https://lists.samba.org/archive/samba-technical/2009-February/063079.html
-!*/
-
-
-#ifndef GENERIC_AIX_IFADDRS_H
-#define GENERIC_AIX_IFADDRS_H
-
-#include <sys/socket.h>
-#include <net/if.h>
-
-#undef  ifa_dstaddr
-#undef  ifa_broadaddr
-#define ifa_broadaddr ifa_dstaddr
-
-struct ifaddrs {
-    struct ifaddrs  *ifa_next;
-    char            *ifa_name;
-    unsigned int     ifa_flags;
-    struct sockaddr *ifa_addr;
-    struct sockaddr *ifa_netmask;
-    struct sockaddr *ifa_dstaddr;
-};
-
-extern int getifaddrs(struct ifaddrs **);
-extern void freeifaddrs(struct ifaddrs *);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_connections.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_connections.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_connections.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_connections.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Baded on code from lsof:
- * http://www.ibm.com/developerworks/aix/library/au-lsof.html
- * - dialects/aix/dproc.c:gather_proc_info
- * - lib/prfp.c:process_file
- * - dialects/aix/dsock.c:process_socket
- * - dialects/aix/dproc.c:get_kernel_access
-*/
-
-#include <Python.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#define _KERNEL
-#include <sys/file.h>
-#undef _KERNEL
-#include <sys/types.h>
-#include <sys/core.h>
-#include <sys/domain.h>
-#include <sys/un.h>
-#include <netinet/in_pcb.h>
-#include <arpa/inet.h>
-
-#include "../../_psutil_common.h"
-#include "net_kernel_structs.h"
-#include "net_connections.h"
-#include "common.h"
-
-#define NO_SOCKET       (PyObject *)(-1)
-
-static int
-read_unp_addr(
-    int Kd,
-    KA_T unp_addr,
-    char *buf,
-    size_t buflen
-) {
-    struct sockaddr_un *ua = (struct sockaddr_un *)NULL;
-    struct sockaddr_un un;
-    struct mbuf64 mb;
-    int uo;
-
-    if (psutil_kread(Kd, unp_addr, (char *)&mb, sizeof(mb))) {
-        return 1;
-    }
-
-    uo = (int)(mb.m_hdr.mh_data - unp_addr);
-    if ((uo + sizeof(struct sockaddr)) <= sizeof(mb))
-        ua = (struct sockaddr_un *)((char *)&mb + uo);
-    else {
-        if (psutil_kread(Kd, (KA_T)mb.m_hdr.mh_data,
-                         (char *)&un, sizeof(un))) {
-            return 1;
-        }
-        ua = &un;
-    }
-    if (ua && ua->sun_path[0]) {
-        if (mb.m_len > sizeof(struct sockaddr_un))
-            mb.m_len = sizeof(struct sockaddr_un);
-        *((char *)ua + mb.m_len - 1) = '\0';
-        snprintf(buf, buflen, "%s", ua->sun_path);
-    }
-    return 0;
-}
-
-static PyObject *
-process_file(int Kd, pid32_t pid, int fd, KA_T fp) {
-    struct file64 f;
-    struct socket64 s;
-    struct protosw64 p;
-    struct domain d;
-    struct inpcb64 inp;
-    int fam;
-    struct tcpcb64 t;
-    int state = PSUTIL_CONN_NONE;
-    unsigned char *laddr = (unsigned char *)NULL;
-    unsigned char *raddr = (unsigned char *)NULL;
-    int rport, lport;
-    char laddr_str[INET6_ADDRSTRLEN];
-    char raddr_str[INET6_ADDRSTRLEN];
-    struct unpcb64 unp;
-    char unix_laddr_str[PATH_MAX] = { 0 };
-    char unix_raddr_str[PATH_MAX] = { 0 };
-
-    /* Read file structure */
-    if (psutil_kread(Kd, fp, (char *)&f, sizeof(f))) {
-        return NULL;
-    }
-    if (!f.f_count || f.f_type != DTYPE_SOCKET) {
-        return NO_SOCKET;
-    }
-
-    if (psutil_kread(Kd, (KA_T) f.f_data, (char *) &s, sizeof(s))) {
-        return NULL;
-    }
-
-    if (!s.so_type) {
-        return NO_SOCKET;
-    }
-
-    if (!s.so_proto) {
-        PyErr_SetString(PyExc_RuntimeError, "invalid socket protocol handle");
-        return NULL;
-    }
-    if (psutil_kread(Kd, (KA_T)s.so_proto, (char *)&p, sizeof(p))) {
-        return NULL;
-    }
-
-    if (!p.pr_domain) {
-        PyErr_SetString(PyExc_RuntimeError, "invalid socket protocol domain");
-        return NULL;
-    }
-    if (psutil_kread(Kd, (KA_T)p.pr_domain, (char *)&d, sizeof(d))) {
-        return NULL;
-    }
-
-    fam = d.dom_family;
-    if (fam == AF_INET || fam == AF_INET6) {
-        /* Read protocol control block */
-        if (!s.so_pcb) {
-            PyErr_SetString(PyExc_RuntimeError, "invalid socket PCB");
-            return NULL;
-        }
-        if (psutil_kread(Kd, (KA_T) s.so_pcb, (char *) &inp, sizeof(inp))) {
-            return NULL;
-        }
-
-        if (p.pr_protocol == IPPROTO_TCP) {
-            /* If this is a TCP socket, read its control block */
-            if (inp.inp_ppcb
-                &&  !psutil_kread(Kd, (KA_T)inp.inp_ppcb,
-                                  (char *)&t, sizeof(t)))
-                state = t.t_state;
-        }
-
-        if (fam == AF_INET6) {
-            laddr = (unsigned char *)&inp.inp_laddr6;
-            if (!IN6_IS_ADDR_UNSPECIFIED(&inp.inp_faddr6)) {
-                raddr = (unsigned char *)&inp.inp_faddr6;
-                rport = (int)ntohs(inp.inp_fport);
-            }
-        }
-        if (fam == AF_INET) {
-            laddr = (unsigned char *)&inp.inp_laddr;
-            if (inp.inp_faddr.s_addr != INADDR_ANY || inp.inp_fport != 0) {
-                raddr =  (unsigned char *)&inp.inp_faddr;
-                rport = (int)ntohs(inp.inp_fport);
-            }
-        }
-        lport = (int)ntohs(inp.inp_lport);
-
-        inet_ntop(fam, laddr, laddr_str, sizeof(laddr_str));
-
-        if (raddr != NULL) {
-            inet_ntop(fam, raddr, raddr_str, sizeof(raddr_str));
-            return Py_BuildValue("(iii(si)(si)ii)", fd, fam,
-                                 s.so_type, laddr_str, lport, raddr_str,
-                                 rport, state, pid);
-        }
-        else {
-            return Py_BuildValue("(iii(si)()ii)", fd, fam,
-                                 s.so_type, laddr_str, lport, state,
-                                 pid);
-        }
-    }
-
-
-    if (fam == AF_UNIX) {
-        if (psutil_kread(Kd, (KA_T) s.so_pcb, (char *)&unp, sizeof(unp))) {
-            return NULL;
-        }
-        if ((KA_T) f.f_data != (KA_T) unp.unp_socket) {
-            PyErr_SetString(PyExc_RuntimeError, "unp_socket mismatch");
-            return NULL;
-        }
-
-        if (unp.unp_addr) {
-            if (read_unp_addr(Kd, unp.unp_addr, unix_laddr_str,
-                              sizeof(unix_laddr_str))) {
-                return NULL;
-            }
-        }
-
-        if (unp.unp_conn) {
-            if (psutil_kread(Kd, (KA_T) unp.unp_conn, (char *)&unp,
-                sizeof(unp))) {
-                return NULL;
-            }
-            if (read_unp_addr(Kd, unp.unp_addr, unix_raddr_str,
-                              sizeof(unix_raddr_str))) {
-                return NULL;
-            }
-        }
-
-        return Py_BuildValue("(iiissii)", fd, d.dom_family,
-                 s.so_type, unix_laddr_str, unix_raddr_str, PSUTIL_CONN_NONE,
-                 pid);
-    }
-    return NO_SOCKET;
-}
-
-PyObject *
-psutil_net_connections(PyObject *self, PyObject *args) {
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    KA_T fp;
-    int Kd = -1;
-    int i, np;
-    struct procentry64 *p;
-    struct fdsinfo64 *fds = (struct fdsinfo64 *)NULL;
-    pid32_t requested_pid;
-    pid32_t pid;
-    struct procentry64 *processes = (struct procentry64 *)NULL;
-                    /* the process table */
-
-    if (py_retlist == NULL)
-        goto error;
-    if (! PyArg_ParseTuple(args, "i", &requested_pid))
-        goto error;
-
-    Kd = open(KMEM, O_RDONLY, 0);
-    if (Kd < 0) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, KMEM);
-        goto error;
-    }
-
-    processes = psutil_read_process_table(&np);
-    if (!processes)
-        goto error;
-
-    /* Loop through processes */
-    for (p = processes; np > 0; np--, p++) {
-        pid = p->pi_pid;
-        if (requested_pid != -1 && requested_pid != pid)
-            continue;
-        if (p->pi_state == 0 || p->pi_state == SZOMB)
-            continue;
-
-        if (!fds) {
-            fds = (struct fdsinfo64 *)malloc((size_t)FDSINFOSIZE);
-            if (!fds) {
-                PyErr_NoMemory();
-                goto error;
-            }
-        }
-        if (getprocs64((struct procentry64 *)NULL, PROCSIZE, fds, FDSINFOSIZE,
-              &pid, 1)
-        != 1)
-            continue;
-
-        /* loop over file descriptors */
-        for (i = 0; i < p->pi_maxofile; i++) {
-            fp = (KA_T)fds->pi_ufd[i].fp;
-            if (fp) {
-                py_tuple = process_file(Kd, p->pi_pid, i, fp);
-                if (py_tuple == NULL)
-                    goto error;
-                if (py_tuple != NO_SOCKET) {
-                    if (PyList_Append(py_retlist, py_tuple))
-                        goto error;
-                    Py_DECREF(py_tuple);
-                }
-            }
-        }
-    }
-    close(Kd);
-    free(processes);
-    if (fds != NULL)
-        free(fds);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (Kd > 0)
-        close(Kd);
-    if (processes != NULL)
-        free(processes);
-    if (fds != NULL)
-        free(fds);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_connections.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_connections.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_connections.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_connections.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef __NET_CONNECTIONS_H__
-#define __NET_CONNECTIONS_H__
-
-#include <Python.h>
-
-PyObject* psutil_net_connections(PyObject *self, PyObject *args);
-
-#endif  /* __NET_CONNECTIONS_H__ */
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_kernel_structs.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_kernel_structs.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/aix/net_kernel_structs.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/aix/net_kernel_structs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* The kernel is always 64 bit but Python is usually compiled as a 32 bit
- * process. We're reading the kernel memory to get the network connections,
- * so we need the structs we read to be defined with 64 bit "pointers".
- * Here are the partial definitions of the structs we use, taken from the
- * header files, with data type sizes converted to their 64 bit counterparts,
- * and unused data truncated. */
-
-#ifdef __64BIT__
-/* In case we're in a 64 bit process after all */
-#include <sys/socketvar.h>
-#include <sys/protosw.h>
-#include <sys/unpcb.h>
-#include <sys/mbuf_base.h>
-#include <sys/mbuf_macro.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#define file64 file
-#define socket64 socket
-#define protosw64 protosw
-#define inpcb64 inpcb
-#define tcpcb64 tcpcb
-#define unpcb64 unpcb
-#define mbuf64 mbuf
-#else       /* __64BIT__ */
-  struct file64 {
-    int f_flag;
-    int f_count;
-    int f_options;
-    int f_type;
-    u_longlong_t f_data;
- };
-
- struct socket64 {
-    short   so_type;                 /* generic type, see socket.h */
-    short   so_options;              /* from socket call, see socket.h */
-    ushort  so_linger;               /* time to linger while closing */
-    short   so_state;                /* internal state flags SS_*, below */
-    u_longlong_t so_pcb;             /* protocol control block */
-    u_longlong_t so_proto;           /* protocol handle */
- };
-
- struct protosw64 {
-    short   pr_type;                 /* socket type used for */
-    u_longlong_t pr_domain;          /* domain protocol a member of */
-    short   pr_protocol;             /* protocol number */
-    short   pr_flags;                /* see below */
- };
-
- struct inpcb64 {
-    u_longlong_t inp_next,inp_prev;
-                                     /* pointers to other pcb's */
-    u_longlong_t inp_head;           /* pointer back to chain of inpcb's
-                                       for this protocol */
-    u_int32_t inp_iflowinfo;         /* input flow label */
-    u_short inp_fport;               /* foreign port */
-    u_int16_t inp_fatype;            /* foreign address type */
-    union   in_addr_6 inp_faddr_6;   /* foreign host table entry */
-    u_int32_t inp_oflowinfo;         /* output flow label */
-    u_short inp_lport;               /* local port */
-    u_int16_t inp_latype;            /* local address type */
-    union   in_addr_6 inp_laddr_6;   /* local host table entry */
-    u_longlong_t inp_socket;         /* back pointer to socket */
-    u_longlong_t inp_ppcb;           /* pointer to per-protocol pcb */
-    u_longlong_t space_rt;
-    struct  sockaddr_in6 spare_dst;
-    u_longlong_t inp_ifa;            /* interface address to use */
-    int     inp_flags;               /* generic IP/datagram flags */
-};
-
-struct tcpcb64 {
-    u_longlong_t seg__next;
-    u_longlong_t seg__prev;
-    short   t_state;                 /* state of this connection */
-};
-
-struct unpcb64 {
-        u_longlong_t unp_socket;     /* pointer back to socket */
-        u_longlong_t unp_vnode;      /* if associated with file */
-        ino_t   unp_vno;             /* fake vnode number */
-        u_longlong_t unp_conn;       /* control block of connected socket */
-        u_longlong_t unp_refs;       /* referencing socket linked list */
-        u_longlong_t unp_nextref;    /* link in unp_refs list */
-        u_longlong_t unp_addr;       /* bound address of socket */
-};
-
-struct m_hdr64
-{
-    u_longlong_t mh_next;            /* next buffer in chain */
-    u_longlong_t mh_nextpkt;         /* next chain in queue/record */
-    long mh_len;                     /* amount of data in this mbuf */
-    u_longlong_t mh_data;            /* location of data */
-};
-
-struct mbuf64
-{
-    struct m_hdr64 m_hdr;
-};
-
-#define m_len               m_hdr.mh_len
-
-#endif      /* __64BIT__ */
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Retrieves per-process open socket connections.
- */
-
-#include <Python.h>
-#include <sys/user.h>
-#include <sys/socketvar.h>    // for struct xsocket
-#include <sys/un.h>
-#include <sys/sysctl.h>
-#include <netinet/in.h>   // for xinpcb struct
-#include <netinet/in_pcb.h>
-#include <netinet/tcp_var.h>   // for struct xtcpcb
-#include <arpa/inet.h>         // for inet_ntop()
-#include <libutil.h>
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-
-
-// The tcplist fetching and walking is borrowed from netstat/inet.c.
-static char *
-psutil_fetch_tcplist(void) {
-    char *buf;
-    size_t len;
-
-    for (;;) {
-        if (sysctlbyname("net.inet.tcp.pcblist", NULL, &len, NULL, 0) < 0) {
-            PyErr_SetFromErrno(PyExc_OSError);
-            return NULL;
-        }
-        buf = malloc(len);
-        if (buf == NULL) {
-            PyErr_NoMemory();
-            return NULL;
-        }
-        if (sysctlbyname("net.inet.tcp.pcblist", buf, &len, NULL, 0) < 0) {
-            free(buf);
-            PyErr_SetFromErrno(PyExc_OSError);
-            return NULL;
-        }
-        return buf;
-    }
-}
-
-
-static int
-psutil_sockaddr_port(int family, struct sockaddr_storage *ss) {
-    struct sockaddr_in6 *sin6;
-    struct sockaddr_in *sin;
-
-    if (family == AF_INET) {
-        sin = (struct sockaddr_in *)ss;
-        return (sin->sin_port);
-    }
-    else {
-        sin6 = (struct sockaddr_in6 *)ss;
-        return (sin6->sin6_port);
-    }
-}
-
-
-static void *
-psutil_sockaddr_addr(int family, struct sockaddr_storage *ss) {
-    struct sockaddr_in6 *sin6;
-    struct sockaddr_in *sin;
-
-    if (family == AF_INET) {
-        sin = (struct sockaddr_in *)ss;
-        return (&sin->sin_addr);
-    }
-    else {
-        sin6 = (struct sockaddr_in6 *)ss;
-        return (&sin6->sin6_addr);
-    }
-}
-
-
-static socklen_t
-psutil_sockaddr_addrlen(int family) {
-    if (family == AF_INET)
-        return (sizeof(struct in_addr));
-    else
-        return (sizeof(struct in6_addr));
-}
-
-
-static int
-psutil_sockaddr_matches(int family, int port, void *pcb_addr,
-                        struct sockaddr_storage *ss) {
-    if (psutil_sockaddr_port(family, ss) != port)
-        return (0);
-    return (memcmp(psutil_sockaddr_addr(family, ss), pcb_addr,
-                   psutil_sockaddr_addrlen(family)) == 0);
-}
-
-
-#if __FreeBSD_version >= 1200026
-static struct xtcpcb *
-psutil_search_tcplist(char *buf, struct kinfo_file *kif) {
-    struct xtcpcb *tp;
-    struct xinpcb *inp;
-#else
-static struct tcpcb *
-psutil_search_tcplist(char *buf, struct kinfo_file *kif) {
-    struct tcpcb *tp;
-    struct inpcb *inp;
-#endif
-    struct xinpgen *xig, *oxig;
-    struct xsocket *so;
-
-    oxig = xig = (struct xinpgen *)buf;
-    for (xig = (struct xinpgen *)((char *)xig + xig->xig_len);
-            xig->xig_len > sizeof(struct xinpgen);
-            xig = (struct xinpgen *)((char *)xig + xig->xig_len)) {
-
-#if __FreeBSD_version >= 1200026
-        tp = (struct xtcpcb *)xig;
-        inp = &tp->xt_inp;
-        so = &inp->xi_socket;
-#else
-        tp = &((struct xtcpcb *)xig)->xt_tp;
-        inp = &((struct xtcpcb *)xig)->xt_inp;
-        so = &((struct xtcpcb *)xig)->xt_socket;
-#endif
-
-        if (so->so_type != kif->kf_sock_type ||
-                so->xso_family != kif->kf_sock_domain ||
-                so->xso_protocol != kif->kf_sock_protocol)
-            continue;
-
-        if (kif->kf_sock_domain == AF_INET) {
-            if (!psutil_sockaddr_matches(
-                    AF_INET, inp->inp_lport, &inp->inp_laddr,
-#if __FreeBSD_version < 1200031
-                    &kif->kf_sa_local))
-#else
-                    &kif->kf_un.kf_sock.kf_sa_local))
-#endif
-                continue;
-            if (!psutil_sockaddr_matches(
-                    AF_INET, inp->inp_fport, &inp->inp_faddr,
-#if __FreeBSD_version < 1200031
-                    &kif->kf_sa_peer))
-#else
-                    &kif->kf_un.kf_sock.kf_sa_peer))
-#endif
-                continue;
-        } else {
-            if (!psutil_sockaddr_matches(
-                    AF_INET6, inp->inp_lport, &inp->in6p_laddr,
-#if __FreeBSD_version < 1200031
-                    &kif->kf_sa_local))
-#else
-                    &kif->kf_un.kf_sock.kf_sa_local))
-#endif
-                continue;
-            if (!psutil_sockaddr_matches(
-                    AF_INET6, inp->inp_fport, &inp->in6p_faddr,
-#if __FreeBSD_version < 1200031
-                    &kif->kf_sa_peer))
-#else
-                    &kif->kf_un.kf_sock.kf_sa_peer))
-#endif
-                continue;
-        }
-
-        return (tp);
-    }
-    return NULL;
-}
-
-
-
-PyObject *
-psutil_proc_connections(PyObject *self, PyObject *args) {
-    // Return connections opened by process.
-    pid_t pid;
-    int i;
-    int cnt;
-    struct kinfo_file *freep = NULL;
-    struct kinfo_file *kif;
-    char *tcplist = NULL;
-#if __FreeBSD_version >= 1200026
-    struct xtcpcb *tcp;
-#else
-    struct tcpcb *tcp;
-#endif
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-    PyObject *py_af_filter = NULL;
-    PyObject *py_type_filter = NULL;
-    PyObject *py_family = NULL;
-    PyObject *py_type = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "OO", &pid,
-                           &py_af_filter, &py_type_filter))
-    {
-        goto error;
-    }
-    if (!PySequence_Check(py_af_filter) || !PySequence_Check(py_type_filter)) {
-        PyErr_SetString(PyExc_TypeError, "arg 2 or 3 is not a sequence");
-        goto error;
-    }
-
-    errno = 0;
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-        psutil_raise_for_pid(pid, "kinfo_getfile()");
-        goto error;
-    }
-
-    tcplist = psutil_fetch_tcplist();
-    if (tcplist == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < cnt; i++) {
-        int lport, rport, state;
-        char lip[200], rip[200];
-        char path[PATH_MAX];
-        int inseq;
-        py_tuple = NULL;
-        py_laddr = NULL;
-        py_raddr = NULL;
-
-        kif = &freep[i];
-        if (kif->kf_type == KF_TYPE_SOCKET) {
-            // apply filters
-            py_family = PyLong_FromLong((long)kif->kf_sock_domain);
-            inseq = PySequence_Contains(py_af_filter, py_family);
-            Py_DECREF(py_family);
-            if (inseq == 0)
-                continue;
-            py_type = PyLong_FromLong((long)kif->kf_sock_type);
-            inseq = PySequence_Contains(py_type_filter, py_type);
-            Py_DECREF(py_type);
-            if (inseq == 0)
-                continue;
-            // IPv4 / IPv6 socket
-            if ((kif->kf_sock_domain == AF_INET) ||
-                    (kif->kf_sock_domain == AF_INET6)) {
-                // fill status
-                state = PSUTIL_CONN_NONE;
-                if (kif->kf_sock_type == SOCK_STREAM) {
-                    tcp = psutil_search_tcplist(tcplist, kif);
-                    if (tcp != NULL)
-                        state = (int)tcp->t_state;
-                }
-
-                // build addr and port
-                inet_ntop(
-                    kif->kf_sock_domain,
-                    psutil_sockaddr_addr(kif->kf_sock_domain,
-#if __FreeBSD_version < 1200031
-                                         &kif->kf_sa_local),
-#else
-                                         &kif->kf_un.kf_sock.kf_sa_local),
-#endif
-                    lip,
-                    sizeof(lip));
-                inet_ntop(
-                    kif->kf_sock_domain,
-                    psutil_sockaddr_addr(kif->kf_sock_domain,
-#if __FreeBSD_version < 1200031
-                                         &kif->kf_sa_peer),
-#else
-                                         &kif->kf_un.kf_sock.kf_sa_peer),
-#endif
-                    rip,
-                    sizeof(rip));
-                lport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
-#if __FreeBSD_version < 1200031
-                                                   &kif->kf_sa_local));
-#else
-                                                   &kif->kf_un.kf_sock.kf_sa_local));
-#endif
-                rport = htons(psutil_sockaddr_port(kif->kf_sock_domain,
-#if __FreeBSD_version < 1200031
-                                                   &kif->kf_sa_peer));
-#else
-                                                   &kif->kf_un.kf_sock.kf_sa_peer));
-#endif
-
-                // construct python tuple/list
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                if (rport != 0)
-                    py_raddr = Py_BuildValue("(si)", rip, rport);
-                else
-                    py_raddr = Py_BuildValue("()");
-                if (!py_raddr)
-                    goto error;
-                py_tuple = Py_BuildValue(
-                    "(iiiNNi)",
-                    kif->kf_fd,
-                    kif->kf_sock_domain,
-                    kif->kf_sock_type,
-                    py_laddr,
-                    py_raddr,
-                    state
-                );
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_DECREF(py_tuple);
-            }
-            // UNIX socket.
-            // Note: remote path cannot be determined.
-            else if (kif->kf_sock_domain == AF_UNIX) {
-                struct sockaddr_un *sun;
-
-#if __FreeBSD_version < 1200031
-                sun = (struct sockaddr_un *)&kif->kf_sa_local;
-#else
-                sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local;
-#endif
-                snprintf(
-                    path, sizeof(path), "%.*s",
-                    (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))),
-                    sun->sun_path);
-
-                py_laddr = PyUnicode_DecodeFSDefault(path);
-                if (! py_laddr)
-                    goto error;
-
-                py_tuple = Py_BuildValue(
-                    "(iiiOsi)",
-                    kif->kf_fd,
-                    kif->kf_sock_domain,
-                    kif->kf_sock_type,
-                    py_laddr,
-                    "",  // raddr can't be determined
-                    PSUTIL_CONN_NONE
-                );
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_DECREF(py_tuple);
-                Py_DECREF(py_laddr);
-            }
-        }
-    }
-    free(freep);
-    free(tcplist);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    Py_DECREF(py_retlist);
-    if (freep != NULL)
-        free(freep);
-    if (tcplist != NULL)
-        free(tcplist);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/proc_socks.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject* psutil_proc_connections(PyObject* self, PyObject* args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/specific.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/specific.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/specific.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1077 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Helper functions specific to FreeBSD.
- * Used by _psutil_bsd module methods.
- */
-
-#include <Python.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/param.h>
-#include <sys/user.h>
-#include <sys/proc.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/vmmeter.h>  // needed for vmtotal struct
-#include <devstat.h>  // for swap mem
-#include <libutil.h>  // process open files, shared libs (kinfo_getvmmap), cwd
-#include <sys/cpuset.h>
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-
-
-#define PSUTIL_TV2DOUBLE(t)    ((t).tv_sec + (t).tv_usec / 1000000.0)
-#define PSUTIL_BT2MSEC(bt) (bt.sec * 1000 + (((uint64_t) 1000000000 * (uint32_t) \
-        (bt.frac >> 32) ) >> 32 ) / 1000000)
-#define DECIKELVIN_2_CELCIUS(t) (t - 2731) / 10
-#ifndef _PATH_DEVNULL
-#define _PATH_DEVNULL "/dev/null"
-#endif
-
-
-// ============================================================================
-// Utility functions
-// ============================================================================
-
-
-int
-psutil_kinfo_proc(pid_t pid, struct kinfo_proc *proc) {
-    // Fills a kinfo_proc struct based on process pid.
-    int mib[4];
-    size_t size;
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PID;
-    mib[3] = pid;
-
-    size = sizeof(struct kinfo_proc);
-    if (sysctl((int *)mib, 4, proc, &size, NULL, 0) == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_PID)");
-        return -1;
-    }
-
-    // sysctl stores 0 in the size if we can't find the process information.
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        return -1;
-    }
-    return 0;
-}
-
-
-// remove spaces from string
-static void psutil_remove_spaces(char *str) {
-    char *p1 = str;
-    char *p2 = str;
-    do
-        while (*p2 == ' ')
-            p2++;
-    while ((*p1++ = *p2++));
-}
-
-
-// ============================================================================
-// APIS
-// ============================================================================
-
-int
-psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount) {
-    // Returns a list of all BSD processes on the system.  This routine
-    // allocates the list and puts it in *procList and a count of the
-    // number of entries in *procCount.  You are responsible for freeing
-    // this list. On success returns 0, else 1 with exception set.
-    int err;
-    struct kinfo_proc *buf = NULL;
-    int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PROC, 0 };
-    size_t length = 0;
-
-    assert(procList != NULL);
-    assert(*procList == NULL);
-    assert(procCount != NULL);
-
-    // Call sysctl with a NULL buffer in order to get buffer length.
-    err = sysctl(name, 3, NULL, &length, NULL, 0);
-    if (err == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl (null buffer)");
-        return 1;
-    }
-
-    // Allocate an appropriately sized buffer based on the results
-    // from the previous call.
-    buf = malloc(length);
-    if (buf == NULL) {
-        PyErr_NoMemory();
-        return 1;
-    }
-
-    // Call sysctl again with the new buffer.
-    err = sysctl(name, 3, buf, &length, NULL, 0);
-    if (err == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl");
-        free(buf);
-        return 1;
-    }
-
-    *procList = buf;
-    *procCount = length / sizeof(struct kinfo_proc);
-    return 0;
-}
-
-
-/*
- * XXX no longer used; it probably makese sense to remove it.
- * Borrowed from psi Python System Information project
- *
- * Get command arguments and environment variables.
- *
- * Based on code from ps.
- *
- * Returns:
- *      0 for success;
- *      -1 for failure (Exception raised);
- *      1 for insufficient privileges.
- */
-static char
-*psutil_get_cmd_args(pid_t pid, size_t *argsize) {
-    int mib[4];
-    int argmax;
-    size_t size = sizeof(argmax);
-    char *procargs = NULL;
-
-    // Get the maximum process arguments size.
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_ARGMAX;
-
-    size = sizeof(argmax);
-    if (sysctl(mib, 2, &argmax, &size, NULL, 0) == -1)
-        return NULL;
-
-    // Allocate space for the arguments.
-    procargs = (char *)malloc(argmax);
-    if (procargs == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    // Make a sysctl() call to get the raw argument space of the process.
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_ARGS;
-    mib[3] = pid;
-
-    size = argmax;
-    if (sysctl(mib, 4, procargs, &size, NULL, 0) == -1) {
-        free(procargs);
-        PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_ARGS)");
-        return NULL;
-    }
-
-    // return string and set the length of arguments
-    *argsize = size;
-    return procargs;
-}
-
-
-// returns the command line as a python list object
-PyObject *
-psutil_get_cmdline(pid_t pid) {
-    char *argstr = NULL;
-    size_t pos = 0;
-    size_t argsize = 0;
-    PyObject *py_retlist = Py_BuildValue("[]");
-    PyObject *py_arg = NULL;
-
-    if (pid < 0)
-        return py_retlist;
-    argstr = psutil_get_cmd_args(pid, &argsize);
-    if (argstr == NULL)
-        goto error;
-
-    // args are returned as a flattened string with \0 separators between
-    // arguments add each string to the list then step forward to the next
-    // separator
-    if (argsize > 0) {
-        while (pos < argsize) {
-            py_arg = PyUnicode_DecodeFSDefault(&argstr[pos]);
-            if (!py_arg)
-                goto error;
-            if (PyList_Append(py_retlist, py_arg))
-                goto error;
-            Py_DECREF(py_arg);
-            pos = pos + strlen(&argstr[pos]) + 1;
-        }
-    }
-
-    free(argstr);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_arg);
-    Py_DECREF(py_retlist);
-    if (argstr != NULL)
-        free(argstr);
-    return NULL;
-}
-
-
-/*
- * Return process pathname executable.
- * Thanks to Robert N. M. Watson:
- * http://fxr.googlebit.com/source/usr.bin/procstat/procstat_bin.c?v=8-CURRENT
- */
-PyObject *
-psutil_proc_exe(PyObject *self, PyObject *args) {
-    pid_t pid;
-    char pathname[PATH_MAX];
-    int error;
-    int mib[4];
-    int ret;
-    size_t size;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PATHNAME;
-    mib[3] = pid;
-
-    size = sizeof(pathname);
-    error = sysctl(mib, 4, pathname, &size, NULL, 0);
-    if (error == -1) {
-        // see: https://github.com/giampaolo/psutil/issues/907
-        if (errno == ENOENT) {
-            return PyUnicode_DecodeFSDefault("");
-        }
-        else {
-            return \
-                PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_PATHNAME)");
-        }
-    }
-    if (size == 0 || strlen(pathname) == 0) {
-        ret = psutil_pid_exists(pid);
-        if (ret == -1)
-            return NULL;
-        else if (ret == 0)
-            return NoSuchProcess("psutil_pid_exists");
-        else
-            strcpy(pathname, "");
-    }
-
-    return PyUnicode_DecodeFSDefault(pathname);
-}
-
-
-PyObject *
-psutil_proc_num_threads(PyObject *self, PyObject *args) {
-    // Return number of threads used by process as a Python integer.
-    pid_t pid;
-    struct kinfo_proc kp;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-    return Py_BuildValue("l", (long)kp.ki_numthreads);
-}
-
-
-PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    // Retrieves all threads used by process returning a list of tuples
-    // including thread id, user time and system time.
-    // Thanks to Robert N. M. Watson:
-    // http://code.metager.de/source/xref/freebsd/usr.bin/procstat/
-    //     procstat_threads.c
-    pid_t pid;
-    int mib[4];
-    struct kinfo_proc *kip = NULL;
-    struct kinfo_proc *kipp = NULL;
-    int error;
-    unsigned int i;
-    size_t size;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-
-    // we need to re-query for thread information, so don't use *kipp
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PID | KERN_PROC_INC_THREAD;
-    mib[3] = pid;
-
-    size = 0;
-    error = sysctl(mib, 4, NULL, &size, NULL, 0);
-    if (error == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_INC_THREAD)");
-        goto error;
-    }
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        goto error;
-    }
-
-    kip = malloc(size);
-    if (kip == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    error = sysctl(mib, 4, kip, &size, NULL, 0);
-    if (error == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_INC_THREAD)");
-        goto error;
-    }
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        goto error;
-    }
-
-    for (i = 0; i < size / sizeof(*kipp); i++) {
-        kipp = &kip[i];
-        py_tuple = Py_BuildValue("Idd",
-                                 kipp->ki_tid,
-                                 PSUTIL_TV2DOUBLE(kipp->ki_rusage.ru_utime),
-                                 PSUTIL_TV2DOUBLE(kipp->ki_rusage.ru_stime));
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_tuple);
-    }
-    free(kip);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (kip != NULL)
-        free(kip);
-    return NULL;
-}
-
-
-PyObject *
-psutil_cpu_count_phys(PyObject *self, PyObject *args) {
-    // Return an XML string from which we'll determine the number of
-    // physical CPU cores in the system.
-    void *topology = NULL;
-    size_t size = 0;
-    PyObject *py_str;
-
-    if (sysctlbyname("kern.sched.topology_spec", NULL, &size, NULL, 0))
-        goto error;
-
-    topology = malloc(size);
-    if (!topology) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    if (sysctlbyname("kern.sched.topology_spec", topology, &size, NULL, 0))
-        goto error;
-
-    py_str = Py_BuildValue("s", topology);
-    free(topology);
-    return py_str;
-
-error:
-    if (topology != NULL)
-        free(topology);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Return virtual memory usage statistics.
- */
-PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    unsigned long  total;
-    unsigned int   active, inactive, wired, cached, free;
-    size_t         size = sizeof(total);
-    struct vmtotal vm;
-    int            mib[] = {CTL_VM, VM_METER};
-    long           pagesize = getpagesize();
-#if __FreeBSD_version > 702101
-    long buffers;
-#else
-    int buffers;
-#endif
-    size_t buffers_size = sizeof(buffers);
-
-    if (sysctlbyname("hw.physmem", &total, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall("sysctlbyname('hw.physmem')");
-    }
-    if (sysctlbyname("vm.stats.vm.v_active_count", &active, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_active_count')");
-    }
-    if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive, &size, NULL, 0))
-    {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_inactive_count')");
-    }
-    if (sysctlbyname("vm.stats.vm.v_wire_count", &wired, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_wire_count')");
-    }
-    // https://github.com/giampaolo/psutil/issues/997
-    if (sysctlbyname("vm.stats.vm.v_cache_count", &cached, &size, NULL, 0)) {
-        cached = 0;
-    }
-    if (sysctlbyname("vm.stats.vm.v_free_count", &free, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_free_count')");
-    }
-    if (sysctlbyname("vfs.bufspace", &buffers, &buffers_size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall("sysctlbyname('vfs.bufspace')");
-    }
-
-    size = sizeof(vm);
-    if (sysctl(mib, 2, &vm, &size, NULL, 0) != 0) {
-        return PyErr_SetFromOSErrnoWithSyscall("sysctl(CTL_VM | VM_METER)");
-    }
-
-    return Py_BuildValue("KKKKKKKK",
-        (unsigned long long) total,
-        (unsigned long long) free     * pagesize,
-        (unsigned long long) active   * pagesize,
-        (unsigned long long) inactive * pagesize,
-        (unsigned long long) wired    * pagesize,
-        (unsigned long long) cached   * pagesize,
-        (unsigned long long) buffers,
-        (unsigned long long) (vm.t_vmshr + vm.t_rmshr) * pagesize  // shared
-    );
-}
-
-
-PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-    // Return swap memory stats (see 'swapinfo' cmdline tool)
-    kvm_t *kd;
-    struct kvm_swap kvmsw[1];
-    unsigned int swapin, swapout, nodein, nodeout;
-    size_t size = sizeof(unsigned int);
-    int pagesize;
-
-    kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open failed");
-    if (kd == NULL) {
-        PyErr_SetString(PyExc_RuntimeError, "kvm_open() syscall failed");
-        return NULL;
-    }
-
-    if (kvm_getswapinfo(kd, kvmsw, 1, 0) < 0) {
-        kvm_close(kd);
-        PyErr_SetString(PyExc_RuntimeError,
-                        "kvm_getswapinfo() syscall failed");
-        return NULL;
-    }
-
-    kvm_close(kd);
-
-    if (sysctlbyname("vm.stats.vm.v_swapin", &swapin, &size, NULL, 0) == -1) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_swapin)'");
-    }
-    if (sysctlbyname("vm.stats.vm.v_swapout", &swapout, &size, NULL, 0) == -1){
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_swapout)'");
-    }
-    if (sysctlbyname("vm.stats.vm.v_vnodein", &nodein, &size, NULL, 0) == -1) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_vnodein)'");
-    }
-    if (sysctlbyname("vm.stats.vm.v_vnodeout", &nodeout, &size, NULL, 0) == -1) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.vm.v_vnodeout)'");
-    }
-
-    pagesize = getpagesize();
-    if (pagesize <= 0) {
-        PyErr_SetString(PyExc_ValueError, "invalid getpagesize()");
-        return NULL;
-    }
-
-    return Py_BuildValue(
-        "(KKKII)",
-        (unsigned long long)kvmsw[0].ksw_total * pagesize,  // total
-        (unsigned long long)kvmsw[0].ksw_used * pagesize,  // used
-        (unsigned long long)kvmsw[0].ksw_total * pagesize - // free
-                                kvmsw[0].ksw_used * pagesize,
-        swapin + swapout,  // swap in
-        nodein + nodeout  // swap out
-    );
-}
-
-
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000
-PyObject *
-psutil_proc_cwd(PyObject *self, PyObject *args) {
-    pid_t pid;
-    struct kinfo_file *freep = NULL;
-    struct kinfo_file *kif;
-    struct kinfo_proc kipp;
-    PyObject *py_path = NULL;
-
-    int i, cnt;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-    if (psutil_kinfo_proc(pid, &kipp) == -1)
-        goto error;
-
-    errno = 0;
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-        psutil_raise_for_pid(pid, "kinfo_getfile()");
-        goto error;
-    }
-
-    for (i = 0; i < cnt; i++) {
-        kif = &freep[i];
-        if (kif->kf_fd == KF_FD_TYPE_CWD) {
-            py_path = PyUnicode_DecodeFSDefault(kif->kf_path);
-            if (!py_path)
-                goto error;
-            break;
-        }
-    }
-    /*
-     * For lower pids it seems we can't retrieve any information
-     * (lsof can't do that it either).  Since this happens even
-     * as root we return an empty string instead of AccessDenied.
-     */
-    if (py_path == NULL)
-        py_path = PyUnicode_DecodeFSDefault("");
-    free(freep);
-    return py_path;
-
-error:
-    Py_XDECREF(py_path);
-    if (freep != NULL)
-        free(freep);
-    return NULL;
-}
-#endif
-
-
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000
-PyObject *
-psutil_proc_num_fds(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int cnt;
-
-    struct kinfo_file *freep;
-    struct kinfo_proc kipp;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kipp) == -1)
-        return NULL;
-
-    errno = 0;
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-        psutil_raise_for_pid(pid, "kinfo_getfile()");
-        return NULL;
-    }
-    free(freep);
-
-    return Py_BuildValue("i", cnt);
-}
-#endif
-
-
-PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    static int maxcpus;
-    int mib[2];
-    int ncpu;
-    size_t len;
-    size_t size;
-    int i;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_cputime = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    // retrieve maxcpus value
-    size = sizeof(maxcpus);
-    if (sysctlbyname("kern.smp.maxcpus", &maxcpus, &size, NULL, 0) < 0) {
-        Py_DECREF(py_retlist);
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('kern.smp.maxcpus')");
-    }
-    long cpu_time[maxcpus][CPUSTATES];
-
-    // retrieve the number of cpus
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    len = sizeof(ncpu);
-    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctl(HW_NCPU)");
-        goto error;
-    }
-
-    // per-cpu info
-    size = sizeof(cpu_time);
-    if (sysctlbyname("kern.cp_times", &cpu_time, &size, NULL, 0) == -1) {
-        PyErr_SetFromOSErrnoWithSyscall("sysctlbyname('kern.smp.maxcpus')");
-        goto error;
-    }
-
-    for (i = 0; i < ncpu; i++) {
-        py_cputime = Py_BuildValue(
-            "(ddddd)",
-            (double)cpu_time[i][CP_USER] / CLOCKS_PER_SEC,
-            (double)cpu_time[i][CP_NICE] / CLOCKS_PER_SEC,
-            (double)cpu_time[i][CP_SYS] / CLOCKS_PER_SEC,
-            (double)cpu_time[i][CP_IDLE] / CLOCKS_PER_SEC,
-            (double)cpu_time[i][CP_INTR] / CLOCKS_PER_SEC);
-        if (!py_cputime)
-            goto error;
-        if (PyList_Append(py_retlist, py_cputime))
-            goto error;
-        Py_DECREF(py_cputime);
-    }
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    int i;
-    struct statinfo stats;
-
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_disk_info = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    if (devstat_checkversion(NULL) < 0) {
-        PyErr_Format(PyExc_RuntimeError,
-                     "devstat_checkversion() syscall failed");
-        goto error;
-    }
-
-    stats.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
-    if (stats.dinfo == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    bzero(stats.dinfo, sizeof(struct devinfo));
-
-    if (devstat_getdevs(NULL, &stats) == -1) {
-        PyErr_Format(PyExc_RuntimeError, "devstat_getdevs() syscall failed");
-        goto error;
-    }
-
-    for (i = 0; i < stats.dinfo->numdevs; i++) {
-        py_disk_info = NULL;
-        struct devstat current;
-        char disk_name[128];
-        current = stats.dinfo->devices[i];
-        snprintf(disk_name, sizeof(disk_name), "%s%d",
-                 current.device_name,
-                 current.unit_number);
-
-        py_disk_info = Py_BuildValue(
-            "(KKKKLLL)",
-            current.operations[DEVSTAT_READ],   // no reads
-            current.operations[DEVSTAT_WRITE],  // no writes
-            current.bytes[DEVSTAT_READ],        // bytes read
-            current.bytes[DEVSTAT_WRITE],       // bytes written
-            (long long) PSUTIL_BT2MSEC(current.duration[DEVSTAT_READ]),  // r time
-            (long long) PSUTIL_BT2MSEC(current.duration[DEVSTAT_WRITE]),  // w time
-            (long long) PSUTIL_BT2MSEC(current.busy_time)  // busy time
-        );      // finished transactions
-        if (!py_disk_info)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, disk_name, py_disk_info))
-            goto error;
-        Py_DECREF(py_disk_info);
-    }
-
-    if (stats.dinfo->mem_ptr)
-        free(stats.dinfo->mem_ptr);
-    free(stats.dinfo);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    if (stats.dinfo != NULL)
-        free(stats.dinfo);
-    return NULL;
-}
-
-
-PyObject *
-psutil_proc_memory_maps(PyObject *self, PyObject *args) {
-    // Return a list of tuples for every process memory maps.
-    // 'procstat' cmdline utility has been used as an example.
-    pid_t pid;
-    int ptrwidth;
-    int i, cnt;
-    char addr[1000];
-    char perms[4];
-    char *path;
-    struct kinfo_proc kp;
-    struct kinfo_vmentry *freep = NULL;
-    struct kinfo_vmentry *kve;
-    ptrwidth = 2 * sizeof(void *);
-    PyObject *py_tuple = NULL;
-    PyObject *py_path = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        goto error;
-
-    errno = 0;
-    freep = kinfo_getvmmap(pid, &cnt);
-    if (freep == NULL) {
-        psutil_raise_for_pid(pid, "kinfo_getvmmap()");
-        goto error;
-    }
-    for (i = 0; i < cnt; i++) {
-        py_tuple = NULL;
-        kve = &freep[i];
-        addr[0] = '\0';
-        perms[0] = '\0';
-        sprintf(addr, "%#*jx-%#*jx", ptrwidth, (uintmax_t)kve->kve_start,
-                ptrwidth, (uintmax_t)kve->kve_end);
-        psutil_remove_spaces(addr);
-        strlcat(perms, kve->kve_protection & KVME_PROT_READ ? "r" : "-",
-                sizeof(perms));
-        strlcat(perms, kve->kve_protection & KVME_PROT_WRITE ? "w" : "-",
-                sizeof(perms));
-        strlcat(perms, kve->kve_protection & KVME_PROT_EXEC ? "x" : "-",
-                sizeof(perms));
-
-        if (strlen(kve->kve_path) == 0) {
-            switch (kve->kve_type) {
-                case KVME_TYPE_NONE:
-                    path = "[none]";
-                    break;
-                case KVME_TYPE_DEFAULT:
-                    path = "[default]";
-                    break;
-                case KVME_TYPE_VNODE:
-                    path = "[vnode]";
-                    break;
-                case KVME_TYPE_SWAP:
-                    path = "[swap]";
-                    break;
-                case KVME_TYPE_DEVICE:
-                    path = "[device]";
-                    break;
-                case KVME_TYPE_PHYS:
-                    path = "[phys]";
-                    break;
-                case KVME_TYPE_DEAD:
-                    path = "[dead]";
-                    break;
-                case KVME_TYPE_SG:
-                    path = "[sg]";
-                    break;
-                case KVME_TYPE_UNKNOWN:
-                    path = "[unknown]";
-                    break;
-                default:
-                    path = "[?]";
-                    break;
-            }
-        }
-        else {
-            path = kve->kve_path;
-        }
-
-        py_path = PyUnicode_DecodeFSDefault(path);
-        if (! py_path)
-            goto error;
-        py_tuple = Py_BuildValue("ssOiiii",
-            addr,                       // "start-end" address
-            perms,                      // "rwx" permissions
-            py_path,                    // path
-            kve->kve_resident,          // rss
-            kve->kve_private_resident,  // private
-            kve->kve_ref_count,         // ref count
-            kve->kve_shadow_count);     // shadow count
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_path);
-        Py_DECREF(py_tuple);
-    }
-    free(freep);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_path);
-    Py_DECREF(py_retlist);
-    if (freep != NULL)
-        free(freep);
-    return NULL;
-}
-
-
-PyObject*
-psutil_proc_cpu_affinity_get(PyObject* self, PyObject* args) {
-    // Get process CPU affinity.
-    // Reference:
-    // http://sources.freebsd.org/RELENG_9/src/usr.bin/cpuset/cpuset.c
-    pid_t pid;
-    int ret;
-    int i;
-    cpuset_t mask;
-    PyObject* py_retlist;
-    PyObject* py_cpu_num;
-
-    if (!PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    ret = cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid,
-                             sizeof(mask), &mask);
-    if (ret != 0)
-        return PyErr_SetFromErrno(PyExc_OSError);
-
-    py_retlist = PyList_New(0);
-    if (py_retlist == NULL)
-        return NULL;
-
-    for (i = 0; i < CPU_SETSIZE; i++) {
-        if (CPU_ISSET(i, &mask)) {
-            py_cpu_num = Py_BuildValue("i", i);
-            if (py_cpu_num == NULL)
-                goto error;
-            if (PyList_Append(py_retlist, py_cpu_num))
-                goto error;
-        }
-    }
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cpu_num);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_proc_cpu_affinity_set(PyObject *self, PyObject *args) {
-    // Set process CPU affinity.
-    // Reference:
-    // http://sources.freebsd.org/RELENG_9/src/usr.bin/cpuset/cpuset.c
-    pid_t pid;
-    int i;
-    int seq_len;
-    int ret;
-    cpuset_t cpu_set;
-    PyObject *py_cpu_set;
-    PyObject *py_cpu_seq = NULL;
-
-    if (!PyArg_ParseTuple(args, _Py_PARSE_PID "O", &pid, &py_cpu_set))
-        return NULL;
-
-    py_cpu_seq = PySequence_Fast(py_cpu_set, "expected a sequence or integer");
-    if (!py_cpu_seq)
-        return NULL;
-    seq_len = PySequence_Fast_GET_SIZE(py_cpu_seq);
-
-    // calculate the mask
-    CPU_ZERO(&cpu_set);
-    for (i = 0; i < seq_len; i++) {
-        PyObject *item = PySequence_Fast_GET_ITEM(py_cpu_seq, i);
-#if PY_MAJOR_VERSION >= 3
-        long value = PyLong_AsLong(item);
-#else
-        long value = PyInt_AsLong(item);
-#endif
-        if (value == -1 || PyErr_Occurred())
-            goto error;
-        CPU_SET(value, &cpu_set);
-    }
-
-    // set affinity
-    ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid,
-                             sizeof(cpu_set), &cpu_set);
-    if (ret != 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    Py_DECREF(py_cpu_seq);
-    Py_RETURN_NONE;
-
-error:
-    if (py_cpu_seq != NULL)
-        Py_DECREF(py_cpu_seq);
-    return NULL;
-}
-
-
-PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    unsigned int v_soft;
-    unsigned int v_intr;
-    unsigned int v_syscall;
-    unsigned int v_trap;
-    unsigned int v_swtch;
-    size_t size = sizeof(v_soft);
-
-    if (sysctlbyname("vm.stats.sys.v_soft", &v_soft, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.sys.v_soft')");
-    }
-    if (sysctlbyname("vm.stats.sys.v_intr", &v_intr, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.sys.v_intr')");
-    }
-    if (sysctlbyname("vm.stats.sys.v_syscall", &v_syscall, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.sys.v_syscall')");
-    }
-    if (sysctlbyname("vm.stats.sys.v_trap", &v_trap, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.sys.v_trap')");
-    }
-    if (sysctlbyname("vm.stats.sys.v_swtch", &v_swtch, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('vm.stats.sys.v_swtch')");
-    }
-
-    return Py_BuildValue(
-        "IIIII",
-        v_swtch,  // ctx switches
-        v_intr,  // interrupts
-        v_soft,  // software interrupts
-        v_syscall,  // syscalls
-        v_trap  // traps
-    );
-}
-
-
-/*
- * Return battery information.
- */
-PyObject *
-psutil_sensors_battery(PyObject *self, PyObject *args) {
-    int percent;
-    int minsleft;
-    int power_plugged;
-    size_t size = sizeof(percent);
-
-    if (sysctlbyname("hw.acpi.battery.life", &percent, &size, NULL, 0))
-        goto error;
-    if (sysctlbyname("hw.acpi.battery.time", &minsleft, &size, NULL, 0))
-        goto error;
-    if (sysctlbyname("hw.acpi.acline", &power_plugged, &size, NULL, 0))
-        goto error;
-    return Py_BuildValue("iii", percent, minsleft, power_plugged);
-
-error:
-    // see: https://github.com/giampaolo/psutil/issues/1074
-    if (errno == ENOENT)
-        PyErr_SetString(PyExc_NotImplementedError, "no battery");
-    else
-        PyErr_SetFromErrno(PyExc_OSError);
-    return NULL;
-}
-
-
-/*
- * Return temperature information for a given CPU core number.
- */
-PyObject *
-psutil_sensors_cpu_temperature(PyObject *self, PyObject *args) {
-    int current;
-    int tjmax;
-    int core;
-    char sensor[26];
-    size_t size = sizeof(current);
-
-    if (! PyArg_ParseTuple(args, "i", &core))
-        return NULL;
-    sprintf(sensor, "dev.cpu.%d.temperature", core);
-    if (sysctlbyname(sensor, &current, &size, NULL, 0))
-        goto error;
-    current = DECIKELVIN_2_CELCIUS(current);
-
-    // Return -273 in case of faliure.
-    sprintf(sensor, "dev.cpu.%d.coretemp.tjmax", core);
-    if (sysctlbyname(sensor, &tjmax, &size, NULL, 0))
-        tjmax = 0;
-    tjmax = DECIKELVIN_2_CELCIUS(tjmax);
-
-    return Py_BuildValue("ii", current, tjmax);
-
-error:
-    if (errno == ENOENT)
-        PyErr_SetString(PyExc_NotImplementedError, "no temperature sensors");
-    else
-        PyErr_SetFromErrno(PyExc_OSError);
-    return NULL;
-}
-
-
-/*
- * Return frequency information of a given CPU.
- * As of Dec 2018 only CPU 0 appears to be supported and all other
- * cores match the frequency of CPU 0.
- */
-PyObject *
-psutil_cpu_freq(PyObject *self, PyObject *args) {
-    int current;
-    int core;
-    char sensor[26];
-    char available_freq_levels[1000];
-    size_t size = sizeof(current);
-
-    if (! PyArg_ParseTuple(args, "i", &core))
-        return NULL;
-    // https://www.unix.com/man-page/FreeBSD/4/cpufreq/
-    sprintf(sensor, "dev.cpu.%d.freq", core);
-    if (sysctlbyname(sensor, &current, &size, NULL, 0))
-        goto error;
-
-    size = sizeof(available_freq_levels);
-    // https://www.unix.com/man-page/FreeBSD/4/cpufreq/
-    // In case of failure, an empty string is returned.
-    sprintf(sensor, "dev.cpu.%d.freq_levels", core);
-    sysctlbyname(sensor, &available_freq_levels, &size, NULL, 0);
-
-    return Py_BuildValue("is", current, available_freq_levels);
-
-error:
-    if (errno == ENOENT)
-        PyErr_SetString(PyExc_NotImplementedError, "unable to read frequency");
-    else
-        PyErr_SetFromErrno(PyExc_OSError);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/specific.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/specific.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/specific.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/specific.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-typedef struct kinfo_proc kinfo_proc;
-
-int psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount);
-int psutil_kinfo_proc(const pid_t pid, struct kinfo_proc *proc);
-
-//
-PyObject* psutil_cpu_count_phys(PyObject* self, PyObject* args);
-PyObject* psutil_disk_io_counters(PyObject* self, PyObject* args);
-PyObject* psutil_get_cmdline(long pid);
-PyObject* psutil_per_cpu_times(PyObject* self, PyObject* args);
-PyObject* psutil_proc_cpu_affinity_get(PyObject* self, PyObject* args);
-PyObject* psutil_proc_cpu_affinity_set(PyObject* self, PyObject* args);
-PyObject* psutil_proc_cwd(PyObject* self, PyObject* args);
-PyObject* psutil_proc_exe(PyObject* self, PyObject* args);
-PyObject* psutil_proc_memory_maps(PyObject* self, PyObject* args);
-PyObject* psutil_proc_num_fds(PyObject* self, PyObject* args);
-PyObject* psutil_proc_num_threads(PyObject* self, PyObject* args);
-PyObject* psutil_proc_threads(PyObject* self, PyObject* args);
-PyObject* psutil_swap_mem(PyObject* self, PyObject* args);
-PyObject* psutil_virtual_mem(PyObject* self, PyObject* args);
-PyObject* psutil_cpu_stats(PyObject* self, PyObject* args);
-#if defined(PSUTIL_FREEBSD)
-PyObject* psutil_sensors_battery(PyObject* self, PyObject* args);
-PyObject* psutil_sensors_cpu_temperature(PyObject* self, PyObject* args);
-PyObject* psutil_cpu_freq(PyObject* self, PyObject* args);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,363 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Retrieves system-wide open socket connections. This is based off of
- * sockstat utility source code:
- * https://github.com/freebsd/freebsd/blob/master/usr.bin/sockstat/sockstat.c
- */
-
-#include <Python.h>
-#include <sys/user.h>
-#include <sys/file.h>
-#include <sys/socketvar.h>    // for struct xsocket
-#include <sys/un.h>
-#include <sys/unpcb.h>
-#include <sys/sysctl.h>
-#include <netinet/in.h>   // for xinpcb struct
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/tcp_var.h>   // for struct xtcpcb
-#include <arpa/inet.h>         // for inet_ntop()
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-
-static struct xfile *psutil_xfiles;
-static int psutil_nxfiles;
-
-
-int
-psutil_populate_xfiles() {
-    size_t len;
-
-    if ((psutil_xfiles = malloc(len = sizeof *psutil_xfiles)) == NULL) {
-        PyErr_NoMemory();
-        return 0;
-    }
-    while (sysctlbyname("kern.file", psutil_xfiles, &len, 0, 0) == -1) {
-        if (errno != ENOMEM) {
-            PyErr_SetFromErrno(0);
-            return 0;
-        }
-        len *= 2;
-        if ((psutil_xfiles = realloc(psutil_xfiles, len)) == NULL) {
-            PyErr_NoMemory();
-            return 0;
-        }
-    }
-    if (len > 0 && psutil_xfiles->xf_size != sizeof *psutil_xfiles) {
-        PyErr_Format(PyExc_RuntimeError, "struct xfile size mismatch");
-        return 0;
-    }
-    psutil_nxfiles = len / sizeof *psutil_xfiles;
-    return 1;
-}
-
-
-struct xfile *
-psutil_get_file_from_sock(void *sock) {
-    struct xfile *xf;
-    int n;
-
-    for (xf = psutil_xfiles, n = 0; n < psutil_nxfiles; ++n, ++xf) {
-        if (xf->xf_data == sock)
-            return xf;
-    }
-    return NULL;
-}
-
-
-// Reference:
-// https://github.com/freebsd/freebsd/blob/master/usr.bin/sockstat/sockstat.c
-int psutil_gather_inet(int proto, PyObject *py_retlist) {
-    struct xinpgen *xig, *exig;
-    struct xinpcb *xip;
-    struct xtcpcb *xtp;
-#if __FreeBSD_version >= 1200026
-    struct xinpcb *inp;
-#else
-    struct inpcb *inp;
-#endif
-    struct xsocket *so;
-    const char *varname = NULL;
-    size_t len, bufsize;
-    void *buf;
-    int retry;
-    int type;
-
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-
-    switch (proto) {
-        case IPPROTO_TCP:
-            varname = "net.inet.tcp.pcblist";
-            type = SOCK_STREAM;
-            break;
-        case IPPROTO_UDP:
-            varname = "net.inet.udp.pcblist";
-            type = SOCK_DGRAM;
-            break;
-    }
-
-    buf = NULL;
-    bufsize = 8192;
-    retry = 5;
-    do {
-        for (;;) {
-            buf = realloc(buf, bufsize);
-            if (buf == NULL)
-                continue;  // XXX
-            len = bufsize;
-            if (sysctlbyname(varname, buf, &len, NULL, 0) == 0)
-                break;
-            if (errno != ENOMEM) {
-                PyErr_SetFromErrno(0);
-                goto error;
-            }
-            bufsize *= 2;
-        }
-        xig = (struct xinpgen *)buf;
-        exig = (struct xinpgen *)(void *)((char *)buf + len - sizeof *exig);
-        if (xig->xig_len != sizeof *xig || exig->xig_len != sizeof *exig) {
-            PyErr_Format(PyExc_RuntimeError, "struct xinpgen size mismatch");
-            goto error;
-        }
-    } while (xig->xig_gen != exig->xig_gen && retry--);
-
-    for (;;) {
-        struct xfile *xf;
-        int lport, rport, status, family;
-
-        xig = (struct xinpgen *)(void *)((char *)xig + xig->xig_len);
-        if (xig >= exig)
-            break;
-
-        switch (proto) {
-            case IPPROTO_TCP:
-                xtp = (struct xtcpcb *)xig;
-                if (xtp->xt_len != sizeof *xtp) {
-                    PyErr_Format(PyExc_RuntimeError,
-                                 "struct xtcpcb size mismatch");
-                    goto error;
-                }
-                inp = &xtp->xt_inp;
-#if __FreeBSD_version >= 1200026
-                so = &inp->xi_socket;
-                status = xtp->t_state;
-#else
-                so = &xtp->xt_socket;
-                status = xtp->xt_tp.t_state;
-#endif
-                break;
-            case IPPROTO_UDP:
-                xip = (struct xinpcb *)xig;
-                if (xip->xi_len != sizeof *xip) {
-                    PyErr_Format(PyExc_RuntimeError,
-                                 "struct xinpcb size mismatch");
-                    goto error;
-                }
-#if __FreeBSD_version >= 1200026
-                inp = xip;
-#else
-                inp = &xip->xi_inp;
-#endif
-                so = &xip->xi_socket;
-                status = PSUTIL_CONN_NONE;
-                break;
-            default:
-                PyErr_Format(PyExc_RuntimeError, "invalid proto");
-                goto error;
-        }
-
-        char lip[200], rip[200];
-
-        xf = psutil_get_file_from_sock(so->xso_so);
-        if (xf == NULL)
-            continue;
-        lport = ntohs(inp->inp_lport);
-        rport = ntohs(inp->inp_fport);
-
-        if (inp->inp_vflag & INP_IPV4) {
-            family = AF_INET;
-            inet_ntop(AF_INET, &inp->inp_laddr.s_addr, lip, sizeof(lip));
-            inet_ntop(AF_INET, &inp->inp_faddr.s_addr, rip, sizeof(rip));
-        }
-        else if (inp->inp_vflag & INP_IPV6) {
-            family = AF_INET6;
-            inet_ntop(AF_INET6, &inp->in6p_laddr.s6_addr, lip, sizeof(lip));
-            inet_ntop(AF_INET6, &inp->in6p_faddr.s6_addr, rip, sizeof(rip));
-        }
-
-        // construct python tuple/list
-        py_laddr = Py_BuildValue("(si)", lip, lport);
-        if (!py_laddr)
-            goto error;
-        if (rport != 0)
-            py_raddr = Py_BuildValue("(si)", rip, rport);
-        else
-            py_raddr = Py_BuildValue("()");
-        if (!py_raddr)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "iiiNNi" _Py_PARSE_PID,
-            xf->xf_fd, // fd
-            family,    // family
-            type,      // type
-            py_laddr,  // laddr
-            py_raddr,  // raddr
-            status,    // status
-            xf->xf_pid // pid
-        );
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-    }
-
-    free(buf);
-    return 1;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    free(buf);
-    return 0;
-}
-
-
-int psutil_gather_unix(int proto, PyObject *py_retlist) {
-    struct xunpgen *xug, *exug;
-    struct xunpcb *xup;
-    const char *varname = NULL;
-    const char *protoname = NULL;
-    size_t len;
-    size_t bufsize;
-    void *buf;
-    int retry;
-    struct sockaddr_un *sun;
-    char path[PATH_MAX];
-
-    PyObject *py_tuple = NULL;
-    PyObject *py_lpath = NULL;
-
-    switch (proto) {
-        case SOCK_STREAM:
-            varname = "net.local.stream.pcblist";
-            protoname = "stream";
-            break;
-        case SOCK_DGRAM:
-            varname = "net.local.dgram.pcblist";
-            protoname = "dgram";
-            break;
-    }
-
-    buf = NULL;
-    bufsize = 8192;
-    retry = 5;
-
-    do {
-        for (;;) {
-            buf = realloc(buf, bufsize);
-            if (buf == NULL) {
-                PyErr_NoMemory();
-                goto error;
-            }
-            len = bufsize;
-            if (sysctlbyname(varname, buf, &len, NULL, 0) == 0)
-                break;
-            if (errno != ENOMEM) {
-                PyErr_SetFromErrno(0);
-                goto error;
-            }
-            bufsize *= 2;
-        }
-        xug = (struct xunpgen *)buf;
-        exug = (struct xunpgen *)(void *)
-            ((char *)buf + len - sizeof *exug);
-        if (xug->xug_len != sizeof *xug || exug->xug_len != sizeof *exug) {
-            PyErr_Format(PyExc_RuntimeError, "struct xinpgen size mismatch");
-            goto error;
-        }
-    } while (xug->xug_gen != exug->xug_gen && retry--);
-
-    for (;;) {
-        struct xfile *xf;
-
-        xug = (struct xunpgen *)(void *)((char *)xug + xug->xug_len);
-        if (xug >= exug)
-            break;
-        xup = (struct xunpcb *)xug;
-        if (xup->xu_len != sizeof *xup)
-            goto error;
-
-        xf = psutil_get_file_from_sock(xup->xu_socket.xso_so);
-        if (xf == NULL)
-            continue;
-
-        sun = (struct sockaddr_un *)&xup->xu_addr;
-        snprintf(path, sizeof(path), "%.*s",
-                 (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))),
-                 sun->sun_path);
-        py_lpath = PyUnicode_DecodeFSDefault(path);
-        if (! py_lpath)
-            goto error;
-
-        py_tuple = Py_BuildValue("(iiiOsii)",
-            xf->xf_fd,         // fd
-            AF_UNIX,           // family
-            proto,             // type
-            py_lpath,          // lpath
-            "",                // rath
-            PSUTIL_CONN_NONE,  // status
-            xf->xf_pid);       // pid
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_lpath);
-        Py_DECREF(py_tuple);
-    }
-
-    free(buf);
-    return 1;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_lpath);
-    free(buf);
-    return 0;
-}
-
-
-PyObject*
-psutil_net_connections(PyObject* self, PyObject* args) {
-    // Return system-wide open connections.
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (psutil_populate_xfiles() != 1)
-        goto error;
-    if (psutil_gather_inet(IPPROTO_TCP, py_retlist) == 0)
-        goto error;
-    if (psutil_gather_inet(IPPROTO_UDP, py_retlist) == 0)
-        goto error;
-    if (psutil_gather_unix(SOCK_STREAM, py_retlist) == 0)
-       goto error;
-    if (psutil_gather_unix(SOCK_DGRAM, py_retlist) == 0)
-        goto error;
-
-    free(psutil_xfiles);
-    return py_retlist;
-
-error:
-    Py_DECREF(py_retlist);
-    free(psutil_xfiles);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/freebsd/sys_socks.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject* psutil_net_connections(PyObject* self, PyObject* args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/socks.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/socks.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/socks.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/socks.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'.
- * Copyright (c) 2015, Ryo ONODERA.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/sysctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <sys/cdefs.h>
-#include <arpa/inet.h>
-#include <sys/queue.h>
-#include <sys/un.h>
-#include <sys/file.h>
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-
-
-// address family filter
-enum af_filter {
-    INET,
-    INET4,
-    INET6,
-    TCP,
-    TCP4,
-    TCP6,
-    UDP,
-    UDP4,
-    UDP6,
-    UNIX,
-    ALL,
-};
-
-// kinfo_file results
-struct kif {
-    SLIST_ENTRY(kif) kifs;
-    struct kinfo_file *kif;
-};
-
-// kinfo_file results list
-SLIST_HEAD(kifhead, kif) kihead = SLIST_HEAD_INITIALIZER(kihead);
-
-
-// kinfo_pcb results
-struct kpcb {
-    SLIST_ENTRY(kpcb) kpcbs;
-    struct kinfo_pcb *kpcb;
-};
-
-// kinfo_pcb results list
-SLIST_HEAD(kpcbhead, kpcb) kpcbhead = SLIST_HEAD_INITIALIZER(kpcbhead);
-
-static void psutil_kiflist_init(void);
-static void psutil_kiflist_clear(void);
-static void psutil_kpcblist_init(void);
-static void psutil_kpcblist_clear(void);
-static int psutil_get_files(void);
-static int psutil_get_sockets(const char *name);
-static int psutil_get_info(int aff);
-
-
-// Initialize kinfo_file results list.
-static void
-psutil_kiflist_init(void) {
-    SLIST_INIT(&kihead);
-    return;
-}
-
-
-// Clear kinfo_file results list.
-static void
-psutil_kiflist_clear(void) {
-     while (!SLIST_EMPTY(&kihead)) {
-             SLIST_REMOVE_HEAD(&kihead, kifs);
-     }
-
-    return;
-}
-
-
-// Initialize kinof_pcb result list.
-static void
-psutil_kpcblist_init(void) {
-    SLIST_INIT(&kpcbhead);
-    return;
-}
-
-
-// Clear kinof_pcb result list.
-static void
-psutil_kpcblist_clear(void) {
-     while (!SLIST_EMPTY(&kpcbhead)) {
-             SLIST_REMOVE_HEAD(&kpcbhead, kpcbs);
-     }
-
-    return;
-}
-
-
-// Get all open files including socket.
-static int
-psutil_get_files(void) {
-    size_t len;
-    size_t j;
-    int mib[6];
-    char *buf;
-    off_t offset;
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_FILE2;
-    mib[2] = KERN_FILE_BYFILE;
-    mib[3] = 0;
-    mib[4] = sizeof(struct kinfo_file);
-    mib[5] = 0;
-
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    offset = len % sizeof(off_t);
-    mib[5] = len / sizeof(struct kinfo_file);
-
-    if ((buf = malloc(len + offset)) == NULL) {
-        PyErr_NoMemory();
-        return -1;
-    }
-
-    if (sysctl(mib, 6, buf + offset, &len, NULL, 0) == -1) {
-        free(buf);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    len /= sizeof(struct kinfo_file);
-    struct kinfo_file *ki = (struct kinfo_file *)(buf + offset);
-
-    for (j = 0; j < len; j++) {
-        struct kif *kif = malloc(sizeof(struct kif));
-        kif->kif = &ki[j];
-        SLIST_INSERT_HEAD(&kihead, kif, kifs);
-    }
-
-    /*
-    // debug
-    struct kif *k;
-    SLIST_FOREACH(k, &kihead, kifs) {
-            printf("%d\n", k->kif->ki_pid);
-    }
-    */
-
-    return 0;
-}
-
-
-// Get open sockets.
-static int
-psutil_get_sockets(const char *name) {
-    size_t namelen;
-    int mib[8];
-    struct kinfo_pcb *pcb;
-    size_t len;
-    size_t j;
-
-    memset(mib, 0, sizeof(mib));
-
-    if (sysctlnametomib(name, mib, &namelen) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    if (sysctl(mib, __arraycount(mib), NULL, &len, NULL, 0) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    if ((pcb = malloc(len)) == NULL) {
-        PyErr_NoMemory();
-        return -1;
-    }
-    memset(pcb, 0, len);
-
-    mib[6] = sizeof(*pcb);
-    mib[7] = len / sizeof(*pcb);
-
-    if (sysctl(mib, __arraycount(mib), pcb, &len, NULL, 0) == -1) {
-        free(pcb);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    len /= sizeof(struct kinfo_pcb);
-    struct kinfo_pcb *kp = (struct kinfo_pcb *)pcb;
-
-    for (j = 0; j < len; j++) {
-        struct kpcb *kpcb = malloc(sizeof(struct kpcb));
-        kpcb->kpcb = &kp[j];
-        SLIST_INSERT_HEAD(&kpcbhead, kpcb, kpcbs);
-    }
-
-    /*
-    // debug
-    struct kif *k;
-    struct kpcb *k;
-    SLIST_FOREACH(k, &kpcbhead, kpcbs) {
-            printf("ki_type: %d\n", k->kpcb->ki_type);
-            printf("ki_family: %d\n", k->kpcb->ki_family);
-    }
-    */
-
-    return 0;
-}
-
-
-// Collect open file and connections.
-static int
-psutil_get_info(int aff) {
-    switch (aff) {
-        case INET:
-            if (psutil_get_sockets("net.inet.tcp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet.udp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.tcp6.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.udp6.pcblist") != 0)
-                return -1;
-            break;
-        case INET4:
-            if (psutil_get_sockets("net.inet.tcp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet.udp.pcblist") != 0)
-                return -1;
-            break;
-        case INET6:
-            if (psutil_get_sockets("net.inet6.tcp6.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.udp6.pcblist") != 0)
-                return -1;
-            break;
-        case TCP:
-            if (psutil_get_sockets("net.inet.tcp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.tcp6.pcblist") != 0)
-                return -1;
-            break;
-        case TCP4:
-            if (psutil_get_sockets("net.inet.tcp.pcblist") != 0)
-                return -1;
-            break;
-        case TCP6:
-            if (psutil_get_sockets("net.inet6.tcp6.pcblist") != 0)
-                return -1;
-            break;
-        case UDP:
-            if (psutil_get_sockets("net.inet.udp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.udp6.pcblist") != 0)
-                return -1;
-            break;
-        case UDP4:
-            if (psutil_get_sockets("net.inet.udp.pcblist") != 0)
-                return -1;
-            break;
-        case UDP6:
-            if (psutil_get_sockets("net.inet6.udp6.pcblist") != 0)
-                return -1;
-            break;
-        case UNIX:
-            if (psutil_get_sockets("net.local.stream.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.local.seqpacket.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.local.dgram.pcblist") != 0)
-                return -1;
-            break;
-        case ALL:
-            if (psutil_get_sockets("net.inet.tcp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet.udp.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.tcp6.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.inet6.udp6.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.local.stream.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.local.seqpacket.pcblist") != 0)
-                return -1;
-            if (psutil_get_sockets("net.local.dgram.pcblist") != 0)
-                return -1;
-            break;
-    }
-
-    return 0;
-}
-
-
-/*
- * Return system-wide connections (unless a pid != -1 is passed).
- */
-PyObject *
-psutil_net_connections(PyObject *self, PyObject *args) {
-    char laddr[PATH_MAX];
-    char raddr[PATH_MAX];
-    int32_t lport;
-    int32_t rport;
-    int32_t status;
-    pid_t pid;
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-
-    psutil_kiflist_init();
-    psutil_kpcblist_init();
-    if (psutil_get_files() != 0)
-        goto error;
-    if (psutil_get_info(ALL) != 0)
-        goto error;
-
-    struct kif *k;
-    SLIST_FOREACH(k, &kihead, kifs) {
-        struct kpcb *kp;
-        if ((pid != -1) && (k->kif->ki_pid != (unsigned int)pid))
-            continue;
-        SLIST_FOREACH(kp, &kpcbhead, kpcbs) {
-            if (k->kif->ki_fdata != kp->kpcb->ki_sockaddr)
-                continue;
-
-            // IPv4 or IPv6
-            if ((kp->kpcb->ki_family == AF_INET) ||
-                    (kp->kpcb->ki_family == AF_INET6)) {
-
-                if (kp->kpcb->ki_family == AF_INET) {
-                    // IPv4
-                    struct sockaddr_in *sin_src =
-                        (struct sockaddr_in *)&kp->kpcb->ki_src;
-                    struct sockaddr_in *sin_dst =
-                        (struct sockaddr_in *)&kp->kpcb->ki_dst;
-                    // source addr and port
-                    inet_ntop(AF_INET, &sin_src->sin_addr, laddr,
-                              sizeof(laddr));
-                    lport = ntohs(sin_src->sin_port);
-                    // remote addr and port
-                    inet_ntop(AF_INET, &sin_dst->sin_addr, raddr,
-                              sizeof(raddr));
-                    rport = ntohs(sin_dst->sin_port);
-                }
-                else {
-                    // IPv6
-                    struct sockaddr_in6 *sin6_src =
-                        (struct sockaddr_in6 *)&kp->kpcb->ki_src;
-                    struct sockaddr_in6 *sin6_dst =
-                        (struct sockaddr_in6 *)&kp->kpcb->ki_dst;
-                    // local addr and port
-                    inet_ntop(AF_INET6, &sin6_src->sin6_addr, laddr,
-                              sizeof(laddr));
-                    lport = ntohs(sin6_src->sin6_port);
-                    // remote addr and port
-                    inet_ntop(AF_INET6, &sin6_dst->sin6_addr, raddr,
-                              sizeof(raddr));
-                    rport = ntohs(sin6_dst->sin6_port);
-                }
-
-                // status
-                if (kp->kpcb->ki_type == SOCK_STREAM)
-                    status = kp->kpcb->ki_tstate;
-                else
-                    status = PSUTIL_CONN_NONE;
-
-                // build addr tuple
-                py_laddr = Py_BuildValue("(si)", laddr, lport);
-                if (! py_laddr)
-                    goto error;
-                if (rport != 0)
-                    py_raddr = Py_BuildValue("(si)", raddr, rport);
-                else
-                    py_raddr = Py_BuildValue("()");
-                if (! py_raddr)
-                    goto error;
-            }
-            else if (kp->kpcb->ki_family == AF_UNIX) {
-                // UNIX sockets
-                struct sockaddr_un *sun_src =
-                    (struct sockaddr_un *)&kp->kpcb->ki_src;
-                struct sockaddr_un *sun_dst =
-                    (struct sockaddr_un *)&kp->kpcb->ki_dst;
-                strcpy(laddr, sun_src->sun_path);
-                strcpy(raddr, sun_dst->sun_path);
-                status = PSUTIL_CONN_NONE;
-                py_laddr = PyUnicode_DecodeFSDefault(laddr);
-                if (! py_laddr)
-                    goto error;
-                py_raddr = PyUnicode_DecodeFSDefault(raddr);
-                if (! py_raddr)
-                    goto error;
-            }
-            else {
-                continue;
-            }
-
-            // append tuple to list
-            py_tuple = Py_BuildValue(
-                "(iiiOOii)",
-                k->kif->ki_fd,
-                kp->kpcb->ki_family,
-                kp->kpcb->ki_type,
-                py_laddr,
-                py_raddr,
-                status,
-                k->kif->ki_pid);
-            if (! py_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_DECREF(py_laddr);
-            Py_DECREF(py_raddr);
-            Py_DECREF(py_tuple);
-        }
-    }
-
-    psutil_kiflist_clear();
-    psutil_kpcblist_clear();
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    return 0;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/socks.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/socks.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/socks.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/socks.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'.
- * Copyright (c) 2015, Ryo ONODERA.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-PyObject *psutil_proc_connections(PyObject *, PyObject *);
-PyObject *psutil_net_connections(PyObject *, PyObject *);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/specific.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/specific.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/specific.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,688 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Platform-specific module methods for NetBSD.
- */
-
-#if defined(PSUTIL_NETBSD)
-    #define _KMEMUSER
-#endif
-
-#include <Python.h>
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/swap.h>  // for swap_mem
-#include <signal.h>
-#include <kvm.h>
-// connection stuff
-#include <netdb.h>  // for NI_MAXHOST
-#include <sys/socket.h>
-#include <sys/sched.h>  // for CPUSTATES & CP_*
-#define _KERNEL  // for DTYPE_*
-    #include <sys/file.h>
-#undef _KERNEL
-#include <sys/disk.h>  // struct diskstats
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-#include "specific.h"
-
-
-#define PSUTIL_KPT2DOUBLE(t) (t ## _sec + t ## _usec / 1000000.0)
-#define PSUTIL_TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
-
-
-// ============================================================================
-// Utility functions
-// ============================================================================
-
-
-int
-psutil_kinfo_proc(pid_t pid, kinfo_proc *proc) {
-    // Fills a kinfo_proc struct based on process pid.
-    int ret;
-    int mib[6];
-    size_t size = sizeof(kinfo_proc);
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC2;
-    mib[2] = KERN_PROC_PID;
-    mib[3] = pid;
-    mib[4] = size;
-    mib[5] = 1;
-
-    ret = sysctl((int*)mib, 6, proc, &size, NULL, 0);
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-    // sysctl stores 0 in the size if we can't find the process information.
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        return -1;
-    }
-    return 0;
-}
-
-
-struct kinfo_file *
-kinfo_getfile(pid_t pid, int* cnt) {
-    // Mimic's FreeBSD kinfo_file call, taking a pid and a ptr to an
-    // int as arg and returns an array with cnt struct kinfo_file.
-    int mib[6];
-    size_t len;
-    struct kinfo_file* kf;
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_FILE2;
-    mib[2] = KERN_FILE_BYPID;
-    mib[3] = (int) pid;
-    mib[4] = sizeof(struct kinfo_file);
-    mib[5] = 0;
-
-    // get the size of what would be returned
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    if ((kf = malloc(len)) == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    mib[5] = (int)(len / sizeof(struct kinfo_file));
-    if (sysctl(mib, 6, kf, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    *cnt = (int)(len / sizeof(struct kinfo_file));
-    return kf;
-}
-
-PyObject *
-psutil_proc_cwd(PyObject *self, PyObject *args) {
-    long pid;
-
-    char path[MAXPATHLEN];
-    size_t pathlen = sizeof path;
-
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-
-#ifdef KERN_PROC_CWD
-    int name[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_CWD};
-    if (sysctl(name, 4, path, &pathlen, NULL, 0) != 0) {
-        if (errno == ENOENT)
-            NoSuchProcess("");
-        else
-            PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-#else
-    char *buf;
-    if (asprintf(&buf, "/proc/%d/cwd", (int)pid) < 0) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    ssize_t len = readlink(buf, path, sizeof(path) - 1);
-    free(buf);
-    if (len == -1) {
-        if (errno == ENOENT)
-            NoSuchProcess("readlink (ENOENT)");
-        else
-            PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    path[len] = '\0';
-#endif
-
-    return PyUnicode_DecodeFSDefault(path);
-}
-
-
-// XXX: This is no longer used as per
-// https://github.com/giampaolo/psutil/pull/557#issuecomment-171912820
-// Current implementation uses /proc instead.
-// Left here just in case.
-/*
-PyObject *
-psutil_proc_exe(PyObject *self, PyObject *args) {
-#if __NetBSD_Version__ >= 799000000
-    pid_t pid;
-    char pathname[MAXPATHLEN];
-    int error;
-    int mib[4];
-    int ret;
-    size_t size;
-
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-    if (pid == 0) {
-        // else returns ENOENT
-        return Py_BuildValue("s", "");
-    }
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC_ARGS;
-    mib[2] = pid;
-    mib[3] = KERN_PROC_PATHNAME;
-
-    size = sizeof(pathname);
-    error = sysctl(mib, 4, NULL, &size, NULL, 0);
-    if (error == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    error = sysctl(mib, 4, pathname, &size, NULL, 0);
-    if (error == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    if (size == 0 || strlen(pathname) == 0) {
-        ret = psutil_pid_exists(pid);
-        if (ret == -1)
-            return NULL;
-        else if (ret == 0)
-            return NoSuchProcess("psutil_pid_exists");
-        else
-            strcpy(pathname, "");
-    }
-
-    return PyUnicode_DecodeFSDefault(pathname);
-#else
-    return Py_BuildValue("s", "");
-#endif
-}
-*/
-
-PyObject *
-psutil_proc_num_threads(PyObject *self, PyObject *args) {
-    // Return number of threads used by process as a Python integer.
-    long pid;
-    kinfo_proc kp;
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-    return Py_BuildValue("l", (long)kp.p_nlwps);
-}
-
-PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int mib[5];
-    int i, nlwps;
-    ssize_t st;
-    size_t size;
-    struct kinfo_lwp *kl = NULL;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        goto error;
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_LWP;
-    mib[2] = pid;
-    mib[3] = sizeof(struct kinfo_lwp);
-    mib[4] = 0;
-
-    st = sysctl(mib, 5, NULL, &size, NULL, 0);
-    if (st == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        goto error;
-    }
-
-    mib[4] = size / sizeof(size_t);
-    kl = malloc(size);
-    if (kl == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    st = sysctl(mib, 5, kl, &size, NULL, 0);
-    if (st == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        goto error;
-    }
-
-    nlwps = (int)(size / sizeof(struct kinfo_lwp));
-    for (i = 0; i < nlwps; i++) {
-        py_tuple = Py_BuildValue("idd",
-                                 (&kl[i])->l_lid,
-                                 PSUTIL_KPT2DOUBLE((&kl[i])->l_rtime),
-                                 PSUTIL_KPT2DOUBLE((&kl[i])->l_rtime));
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_tuple);
-    }
-    free(kl);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (kl != NULL)
-        free(kl);
-    return NULL;
-}
-
-
-// ============================================================================
-// APIS
-// ============================================================================
-
-int
-psutil_get_proc_list(kinfo_proc **procList, size_t *procCount) {
-    // Returns a list of all BSD processes on the system.  This routine
-    // allocates the list and puts it in *procList and a count of the
-    // number of entries in *procCount.  You are responsible for freeing
-    // this list (use "free" from System framework).
-    // On success, the function returns 0.
-    // On error, the function returns a BSD errno value.
-    kinfo_proc *result;
-    // Declaring name as const requires us to cast it when passing it to
-    // sysctl because the prototype doesn't include the const modifier.
-    char errbuf[_POSIX2_LINE_MAX];
-    int cnt;
-    kvm_t *kd;
-
-    assert( procList != NULL);
-    assert(*procList == NULL);
-    assert(procCount != NULL);
-
-    kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
-
-    if (kd == NULL) {
-        PyErr_Format(
-            PyExc_RuntimeError, "kvm_openfiles() syscall failed: %s", errbuf);
-        return 1;
-    }
-
-    result = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(kinfo_proc), &cnt);
-    if (result == NULL) {
-        PyErr_Format(PyExc_RuntimeError, "kvm_getproc2() syscall failed");
-        kvm_close(kd);
-        return 1;
-    }
-
-    *procCount = (size_t)cnt;
-
-    size_t mlen = cnt * sizeof(kinfo_proc);
-
-    if ((*procList = malloc(mlen)) == NULL) {
-        PyErr_NoMemory();
-        kvm_close(kd);
-        return 1;
-    }
-
-    memcpy(*procList, result, mlen);
-    assert(*procList != NULL);
-    kvm_close(kd);
-
-    return 0;
-}
-
-
-char *
-psutil_get_cmd_args(pid_t pid, size_t *argsize) {
-    int mib[4];
-    int st;
-    size_t len;
-    char *procargs;
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC_ARGS;
-    mib[2] = pid;
-    mib[3] = KERN_PROC_ARGV;
-    len = 0;
-
-    st = sysctl(mib, __arraycount(mib), NULL, &len, NULL, 0);
-    if (st == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    procargs = (char *)malloc(len);
-    if (procargs == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    st = sysctl(mib, __arraycount(mib), procargs, &len, NULL, 0);
-    if (st == -1) {
-        free(procargs);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    *argsize = len;
-    return procargs;
-}
-
-
-// Return the command line as a python list object.
-// XXX - most of the times sysctl() returns a truncated string.
-// Also /proc/pid/cmdline behaves the same so it looks like this
-// is a kernel bug.
-PyObject *
-psutil_get_cmdline(pid_t pid) {
-    char *argstr = NULL;
-    size_t pos = 0;
-    size_t argsize = 0;
-    PyObject *py_arg = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (pid == 0)
-        return py_retlist;
-
-    argstr = psutil_get_cmd_args(pid, &argsize);
-    if (argstr == NULL)
-        goto error;
-
-    // args are returned as a flattened string with \0 separators between
-    // arguments add each string to the list then step forward to the next
-    // separator
-    if (argsize > 0) {
-        while (pos < argsize) {
-            py_arg = PyUnicode_DecodeFSDefault(&argstr[pos]);
-            if (!py_arg)
-                goto error;
-            if (PyList_Append(py_retlist, py_arg))
-                goto error;
-            Py_DECREF(py_arg);
-            pos = pos + strlen(&argstr[pos]) + 1;
-        }
-    }
-
-    free(argstr);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_arg);
-    Py_DECREF(py_retlist);
-    if (argstr != NULL)
-        free(argstr);
-    return NULL;
-}
-
-
-/*
- * Virtual memory stats, taken from:
- * https://github.com/satterly/zabbix-stats/blob/master/src/libs/zbxsysinfo/
- *     netbsd/memory.c
- */
-PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    size_t size;
-    struct uvmexp_sysctl uv;
-    int mib[] = {CTL_VM, VM_UVMEXP2};
-    long pagesize = getpagesize();
-
-    size = sizeof(uv);
-    if (sysctl(mib, 2, &uv, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue("KKKKKKKK",
-        (unsigned long long) uv.npages << uv.pageshift,  // total
-        (unsigned long long) uv.free << uv.pageshift,  // free
-        (unsigned long long) uv.active << uv.pageshift,  // active
-        (unsigned long long) uv.inactive << uv.pageshift,  // inactive
-        (unsigned long long) uv.wired << uv.pageshift,  // wired
-        (unsigned long long) uv.filepages + uv.execpages * pagesize,  // cached
-        // These are determined from /proc/meminfo in Python.
-        (unsigned long long) 0,  // buffers
-        (unsigned long long) 0  // shared
-    );
-}
-
-
-PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-    uint64_t swap_total, swap_free;
-    struct swapent *swdev;
-    int nswap, i;
-
-    nswap = swapctl(SWAP_NSWAP, 0, 0);
-    if (nswap == 0) {
-        // This means there's no swap partition.
-        return Py_BuildValue("(iiiii)", 0, 0, 0, 0, 0);
-    }
-
-    swdev = calloc(nswap, sizeof(*swdev));
-    if (swdev == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    if (swapctl(SWAP_STATS, swdev, nswap) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    // Total things up.
-    swap_total = swap_free = 0;
-    for (i = 0; i < nswap; i++) {
-        if (swdev[i].se_flags & SWF_ENABLE) {
-            swap_total += swdev[i].se_nblks * DEV_BSIZE;
-            swap_free += (swdev[i].se_nblks - swdev[i].se_inuse) * DEV_BSIZE;
-        }
-    }
-    free(swdev);
-
-    // Get swap in/out
-    unsigned int total;
-    size_t size = sizeof(total);
-    struct uvmexp_sysctl uv;
-    int mib[] = {CTL_VM, VM_UVMEXP2};
-    long pagesize = getpagesize();
-    size = sizeof(uv);
-    if (sysctl(mib, 2, &uv, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    return Py_BuildValue("(LLLll)",
-                         swap_total,
-                         (swap_total - swap_free),
-                         swap_free,
-                         (long) uv.pgswapin * pagesize,  // swap in
-                         (long) uv.pgswapout * pagesize);  // swap out
-
-error:
-    free(swdev);
-    return NULL;
-}
-
-
-PyObject *
-psutil_proc_num_fds(PyObject *self, PyObject *args) {
-    long pid;
-    int cnt;
-
-    struct kinfo_file *freep;
-
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-
-    errno = 0;
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-        psutil_raise_for_pid(pid, "kinfo_getfile()");
-        return NULL;
-    }
-    free(freep);
-
-    return Py_BuildValue("i", cnt);
-}
-
-
-PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    // XXX: why static?
-    int mib[3];
-    int ncpu;
-    size_t len;
-    size_t size;
-    int i;
-    PyObject *py_cputime = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    // retrieve the number of cpus
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    len = sizeof(ncpu);
-    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    uint64_t cpu_time[CPUSTATES];
-
-    for (i = 0; i < ncpu; i++) {
-        // per-cpu info
-        mib[0] = CTL_KERN;
-        mib[1] = KERN_CP_TIME;
-        mib[2] = i;
-        size = sizeof(cpu_time);
-        if (sysctl(mib, 3, &cpu_time, &size, NULL, 0) == -1) {
-            warn("failed to get kern.cptime2");
-            PyErr_SetFromErrno(PyExc_OSError);
-            return NULL;
-        }
-
-        py_cputime = Py_BuildValue(
-            "(ddddd)",
-            (double)cpu_time[CP_USER] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_NICE] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_SYS] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_IDLE] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_INTR] / CLOCKS_PER_SEC);
-        if (!py_cputime)
-            goto error;
-        if (PyList_Append(py_retlist, py_cputime))
-            goto error;
-        Py_DECREF(py_cputime);
-    }
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    int i, dk_ndrive, mib[3];
-    size_t len;
-    struct io_sysctl *stats = NULL;
-    PyObject *py_disk_info = NULL;
-    PyObject *py_retdict = PyDict_New();
-
-    if (py_retdict == NULL)
-        return NULL;
-    mib[0] = CTL_HW;
-    mib[1] = HW_IOSTATS;
-    mib[2] = sizeof(struct io_sysctl);
-    len = 0;
-    if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0) {
-        warn("can't get HW_IOSTATS");
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    dk_ndrive = (int)(len / sizeof(struct io_sysctl));
-
-    stats = malloc(len);
-    if (stats == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    if (sysctl(mib, 3, stats, &len, NULL, 0) < 0 ) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < dk_ndrive; i++) {
-        py_disk_info = Py_BuildValue(
-            "(KKKK)",
-            stats[i].rxfer,
-            stats[i].wxfer,
-            stats[i].rbytes,
-            stats[i].wbytes
-        );
-        if (!py_disk_info)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, stats[i].name, py_disk_info))
-            goto error;
-        Py_DECREF(py_disk_info);
-    }
-
-    free(stats);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    if (stats != NULL)
-        free(stats);
-    return NULL;
-}
-
-
-PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    size_t size;
-    struct uvmexp_sysctl uv;
-    int uvmexp_mib[] = {CTL_VM, VM_UVMEXP2};
-
-    size = sizeof(uv);
-    if (sysctl(uvmexp_mib, 2, &uv, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue(
-        "IIIIIII",
-        uv.swtch,  // ctx switches
-        uv.intrs,  // interrupts - XXX always 0, will be determined via /proc
-        uv.softs,  // soft interrupts
-        uv.syscalls,  // syscalls - XXX always 0
-        uv.traps,  // traps
-        uv.faults,  // faults
-        uv.forks  // forks
-    );
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/specific.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/specific.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/netbsd/specific.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/netbsd/specific.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-typedef struct kinfo_proc2 kinfo_proc;
-
-int psutil_kinfo_proc(pid_t pid, kinfo_proc *proc);
-struct kinfo_file * kinfo_getfile(pid_t pid, int* cnt);
-int psutil_get_proc_list(kinfo_proc **procList, size_t *procCount);
-char *psutil_get_cmd_args(pid_t pid, size_t *argsize);
-
-//
-PyObject *psutil_get_cmdline(pid_t pid);
-PyObject *psutil_proc_threads(PyObject *self, PyObject *args);
-PyObject *psutil_virtual_mem(PyObject *self, PyObject *args);
-PyObject *psutil_swap_mem(PyObject *self, PyObject *args);
-PyObject *psutil_proc_num_fds(PyObject *self, PyObject *args);
-PyObject *psutil_proc_connections(PyObject *self, PyObject *args);
-PyObject *psutil_per_cpu_times(PyObject *self, PyObject *args);
-PyObject* psutil_disk_io_counters(PyObject* self, PyObject* args);
-PyObject* psutil_proc_exe(PyObject* self, PyObject* args);
-PyObject* psutil_proc_num_threads(PyObject* self, PyObject* args);
-PyObject* psutil_cpu_stats(PyObject* self, PyObject* args);
-PyObject *psutil_proc_cwd(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/openbsd/specific.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/openbsd/specific.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/openbsd/specific.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/openbsd/specific.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,800 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Platform-specific module methods for OpenBSD.
- */
-
-#include <Python.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#include <sys/proc.h>
-#include <sys/mount.h>  // for VFS_*
-#include <sys/swap.h>  // for swap_mem
-#include <sys/vmmeter.h>  // for vmtotal struct
-#include <signal.h>
-#include <kvm.h>
-// connection stuff
-#include <netdb.h>  // for NI_MAXHOST
-#include <sys/socket.h>
-#include <sys/sched.h>  // for CPUSTATES & CP_*
-#define _KERNEL  // for DTYPE_*
-#include <sys/file.h>
-#undef _KERNEL
-#include <sys/disk.h>  // struct diskstats
-#include <arpa/inet.h> // for inet_ntoa()
-#include <err.h> // for warn() & err()
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-
-#define PSUTIL_KPT2DOUBLE(t) (t ## _sec + t ## _usec / 1000000.0)
-// #define PSUTIL_TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
-
-
-// ============================================================================
-// Utility functions
-// ============================================================================
-
-
-static void
-convert_kvm_err(const char *syscall, char *errbuf) {
-    char fullmsg[8192];
-
-    sprintf(fullmsg, "(originated from %s: %s)", syscall, errbuf);
-    if (strstr(errbuf, "Permission denied") != NULL)
-        AccessDenied(fullmsg);
-    else if (strstr(errbuf, "Operation not permitted") != NULL)
-        AccessDenied(fullmsg);
-    else
-        PyErr_Format(PyExc_RuntimeError, fullmsg);
-}
-
-
-int
-psutil_kinfo_proc(pid_t pid, struct kinfo_proc *proc) {
-    // Fills a kinfo_proc struct based on process pid.
-    int ret;
-    int mib[6];
-    size_t size = sizeof(struct kinfo_proc);
-
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PID;
-    mib[3] = pid;
-    mib[4] = size;
-    mib[5] = 1;
-
-    ret = sysctl((int*)mib, 6, proc, &size, NULL, 0);
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-    // sysctl stores 0 in the size if we can't find the process information.
-    if (size == 0) {
-        NoSuchProcess("sysctl (size = 0)");
-        return -1;
-    }
-    return 0;
-}
-
-
-struct kinfo_file *
-kinfo_getfile(pid_t pid, int* cnt) {
-    // Mimic's FreeBSD kinfo_file call, taking a pid and a ptr to an
-    // int as arg and returns an array with cnt struct kinfo_file.
-    int mib[6];
-    size_t len;
-    struct kinfo_file* kf;
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_FILE;
-    mib[2] = KERN_FILE_BYPID;
-    mib[3] = pid;
-    mib[4] = sizeof(struct kinfo_file);
-    mib[5] = 0;
-
-    /* get the size of what would be returned */
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    if ((kf = malloc(len)) == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    mib[5] = (int)(len / sizeof(struct kinfo_file));
-    if (sysctl(mib, 6, kf, &len, NULL, 0) < 0) {
-        free(kf);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    *cnt = (int)(len / sizeof(struct kinfo_file));
-    return kf;
-}
-
-
-// ============================================================================
-// APIS
-// ============================================================================
-
-int
-psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount) {
-    // Returns a list of all BSD processes on the system.  This routine
-    // allocates the list and puts it in *procList and a count of the
-    // number of entries in *procCount.  You are responsible for freeing
-    // this list (use "free" from System framework).
-    // On success, the function returns 0.
-    // On error, the function returns a BSD errno value.
-    struct kinfo_proc *result;
-    // Declaring name as const requires us to cast it when passing it to
-    // sysctl because the prototype doesn't include the const modifier.
-    char errbuf[_POSIX2_LINE_MAX];
-    int cnt;
-    kvm_t *kd;
-
-    assert(procList != NULL);
-    assert(*procList == NULL);
-    assert(procCount != NULL);
-
-    kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
-    if (! kd) {
-        convert_kvm_err("kvm_openfiles", errbuf);
-        return 1;
-    }
-
-    result = kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &cnt);
-    if (result == NULL) {
-        PyErr_Format(PyExc_RuntimeError, "kvm_getprocs syscall failed");
-        kvm_close(kd);
-        return 1;
-    }
-
-    *procCount = (size_t)cnt;
-
-    size_t mlen = cnt * sizeof(struct kinfo_proc);
-
-    if ((*procList = malloc(mlen)) == NULL) {
-        PyErr_NoMemory();
-        kvm_close(kd);
-        return 1;
-    }
-
-    memcpy(*procList, result, mlen);
-    assert(*procList != NULL);
-    kvm_close(kd);
-
-    return 0;
-}
-
-
-static char **
-_psutil_get_argv(pid_t pid) {
-    static char **argv;
-    int argv_mib[] = {CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ARGV};
-    size_t argv_size = 128;
-    // Loop and reallocate until we have enough space to fit argv.
-    for (;; argv_size *= 2) {
-        if (argv_size >= 8192) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            "can't allocate enough space for KERN_PROC_ARGV");
-            return NULL;
-        }
-        if ((argv = realloc(argv, argv_size)) == NULL)
-            continue;
-        if (sysctl(argv_mib, 4, argv, &argv_size, NULL, 0) == 0)
-            return argv;
-        if (errno == ENOMEM)
-            continue;
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-}
-
-
-// returns the command line as a python list object
-PyObject *
-psutil_get_cmdline(pid_t pid) {
-    static char **argv;
-    char **p;
-    PyObject *py_arg = NULL;
-    PyObject *py_retlist = Py_BuildValue("[]");
-
-    if (!py_retlist)
-        return NULL;
-    if (pid < 0)
-        return py_retlist;
-
-    if ((argv = _psutil_get_argv(pid)) == NULL)
-        goto error;
-
-    for (p = argv; *p != NULL; p++) {
-        py_arg = PyUnicode_DecodeFSDefault(*p);
-        if (!py_arg)
-            goto error;
-        if (PyList_Append(py_retlist, py_arg))
-            goto error;
-        Py_DECREF(py_arg);
-    }
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_arg);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    // OpenBSD reference:
-    // https://github.com/janmojzis/pstree/blob/master/proc_kvm.c
-    // Note: this requires root access, else it will fail trying
-    // to access /dev/kmem.
-    pid_t pid;
-    kvm_t *kd = NULL;
-    int nentries, i;
-    char errbuf[4096];
-    struct kinfo_proc *kp;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-
-    kd = kvm_openfiles(0, 0, 0, O_RDONLY, errbuf);
-    if (! kd) {
-        convert_kvm_err("kvm_openfiles()", errbuf);
-        goto error;
-    }
-
-    kp = kvm_getprocs(
-        kd, KERN_PROC_PID | KERN_PROC_SHOW_THREADS | KERN_PROC_KTHREAD, pid,
-        sizeof(*kp), &nentries);
-    if (! kp) {
-        if (strstr(errbuf, "Permission denied") != NULL)
-            AccessDenied("kvm_getprocs");
-        else
-            PyErr_Format(PyExc_RuntimeError, "kvm_getprocs() syscall failed");
-        goto error;
-    }
-
-    for (i = 0; i < nentries; i++) {
-        if (kp[i].p_tid < 0)
-            continue;
-        if (kp[i].p_pid == pid) {
-            py_tuple = Py_BuildValue(
-                _Py_PARSE_PID "dd",
-                kp[i].p_tid,
-                PSUTIL_KPT2DOUBLE(kp[i].p_uutime),
-                PSUTIL_KPT2DOUBLE(kp[i].p_ustime));
-            if (py_tuple == NULL)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_DECREF(py_tuple);
-        }
-    }
-
-    kvm_close(kd);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (kd != NULL)
-        kvm_close(kd);
-    return NULL;
-}
-
-
-PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    int64_t total_physmem;
-    int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
-    int bcstats_mib[] = {CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT};
-    int physmem_mib[] = {CTL_HW, HW_PHYSMEM64};
-    int vmmeter_mib[] = {CTL_VM, VM_METER};
-    size_t size;
-    struct uvmexp uvmexp;
-    struct bcachestats bcstats;
-    struct vmtotal vmdata;
-    long pagesize = getpagesize();
-
-    size = sizeof(total_physmem);
-    if (sysctl(physmem_mib, 2, &total_physmem, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    size = sizeof(uvmexp);
-    if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    size = sizeof(bcstats);
-    if (sysctl(bcstats_mib, 3, &bcstats, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    size = sizeof(vmdata);
-    if (sysctl(vmmeter_mib, 2, &vmdata, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue("KKKKKKKK",
-        // Note: many programs calculate total memory as
-        // "uvmexp.npages * pagesize" but this is incorrect and does not
-        // match "sysctl | grep hw.physmem".
-        (unsigned long long) total_physmem,
-        (unsigned long long) uvmexp.free * pagesize,
-        (unsigned long long) uvmexp.active * pagesize,
-        (unsigned long long) uvmexp.inactive * pagesize,
-        (unsigned long long) uvmexp.wired * pagesize,
-        // this is how "top" determines it
-        (unsigned long long) bcstats.numbufpages * pagesize,  // cached
-        (unsigned long long) 0,  // buffers
-        (unsigned long long) vmdata.t_vmshr + vmdata.t_rmshr  // shared
-    );
-}
-
-
-PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-    uint64_t swap_total, swap_free;
-    struct swapent *swdev;
-    int nswap, i;
-
-    if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    if (swapctl(SWAP_STATS, swdev, nswap) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    // Total things up.
-    swap_total = swap_free = 0;
-    for (i = 0; i < nswap; i++) {
-        if (swdev[i].se_flags & SWF_ENABLE) {
-            swap_free += (swdev[i].se_nblks - swdev[i].se_inuse);
-            swap_total += swdev[i].se_nblks;
-        }
-    }
-
-    free(swdev);
-    return Py_BuildValue("(LLLII)",
-                         swap_total * DEV_BSIZE,
-                         (swap_total - swap_free) * DEV_BSIZE,
-                         swap_free * DEV_BSIZE,
-                         // swap in / swap out is not supported as the
-                         // swapent struct does not provide any info
-                         // about it.
-                         0, 0);
-
-error:
-    free(swdev);
-    return NULL;
-}
-
-
-PyObject *
-psutil_proc_num_fds(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int cnt;
-
-    struct kinfo_file *freep;
-    struct kinfo_proc kipp;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    if (psutil_kinfo_proc(pid, &kipp) == -1)
-        return NULL;
-
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL)
-        return NULL;
-
-    free(freep);
-    return Py_BuildValue("i", cnt);
-}
-
-
-PyObject *
-psutil_proc_cwd(PyObject *self, PyObject *args) {
-    // Reference:
-    // https://github.com/openbsd/src/blob/
-    //     588f7f8c69786211f2d16865c552afb91b1c7cba/bin/ps/print.c#L191
-    pid_t pid;
-    struct kinfo_proc kp;
-    char path[MAXPATHLEN];
-    size_t pathlen = sizeof path;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-
-    int name[] = { CTL_KERN, KERN_PROC_CWD, pid };
-    if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    return PyUnicode_DecodeFSDefault(path);
-}
-
-
-// see sys/kern/kern_sysctl.c lines 1100 and
-// usr.bin/fstat/fstat.c print_inet_details()
-static char *
-psutil_convert_ipv4(int family, uint32_t addr[4]) {
-    struct in_addr a;
-    memcpy(&a, addr, sizeof(a));
-    return inet_ntoa(a);
-}
-
-
-static char *
-psutil_inet6_addrstr(struct in6_addr *p)
-{
-    struct sockaddr_in6 sin6;
-    static char hbuf[NI_MAXHOST];
-    const int niflags = NI_NUMERICHOST;
-
-    memset(&sin6, 0, sizeof(sin6));
-    sin6.sin6_family = AF_INET6;
-    sin6.sin6_len = sizeof(struct sockaddr_in6);
-    sin6.sin6_addr = *p;
-    if (IN6_IS_ADDR_LINKLOCAL(p) &&
-        *(u_int16_t *)&sin6.sin6_addr.s6_addr[2] != 0) {
-        sin6.sin6_scope_id =
-            ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
-        sin6.sin6_addr.s6_addr[2] = sin6.sin6_addr.s6_addr[3] = 0;
-    }
-
-    if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
-        hbuf, sizeof(hbuf), NULL, 0, niflags))
-        return "invalid";
-
-    return hbuf;
-}
-
-
-/*
- * List process connections.
- * Note: there is no net_connections() on OpenBSD. The Python
- * implementation will iterate over all processes and use this
- * function.
- * Note: local and remote paths cannot be determined for UNIX sockets.
- */
-PyObject *
-psutil_proc_connections(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int i;
-    int cnt;
-    struct kinfo_file *freep = NULL;
-    struct kinfo_file *kif;
-    char *tcplist = NULL;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-    PyObject *py_af_filter = NULL;
-    PyObject *py_type_filter = NULL;
-    PyObject *py_family = NULL;
-    PyObject *_type = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "OO", &pid, &py_af_filter,
-                           &py_type_filter))
-        goto error;
-    if (!PySequence_Check(py_af_filter) || !PySequence_Check(py_type_filter)) {
-        PyErr_SetString(PyExc_TypeError, "arg 2 or 3 is not a sequence");
-        goto error;
-    }
-
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-        goto error;
-    }
-
-    for (i = 0; i < cnt; i++) {
-        int state;
-        int lport;
-        int rport;
-        char addrbuf[NI_MAXHOST + 2];
-        int inseq;
-        struct in6_addr laddr6;
-        py_tuple = NULL;
-        py_laddr = NULL;
-        py_raddr = NULL;
-
-        kif = &freep[i];
-        if (kif->f_type == DTYPE_SOCKET) {
-            // apply filters
-            py_family = PyLong_FromLong((long)kif->so_family);
-            inseq = PySequence_Contains(py_af_filter, py_family);
-            Py_DECREF(py_family);
-            if (inseq == 0)
-                continue;
-            _type = PyLong_FromLong((long)kif->so_type);
-            inseq = PySequence_Contains(py_type_filter, _type);
-            Py_DECREF(_type);
-            if (inseq == 0)
-                continue;
-
-            // IPv4 / IPv6 socket
-            if ((kif->so_family == AF_INET) || (kif->so_family == AF_INET6)) {
-                // fill status
-                if (kif->so_type == SOCK_STREAM)
-                    state = kif->t_state;
-                else
-                    state = PSUTIL_CONN_NONE;
-
-                // ports
-                lport = ntohs(kif->inp_lport);
-                rport = ntohs(kif->inp_fport);
-
-                // local address, IPv4
-                if (kif->so_family == AF_INET) {
-                    py_laddr = Py_BuildValue(
-                        "(si)",
-                        psutil_convert_ipv4(kif->so_family, kif->inp_laddru),
-                        lport);
-                    if (!py_laddr)
-                        goto error;
-                }
-                else {
-                    // local address, IPv6
-                    memcpy(&laddr6, kif->inp_laddru, sizeof(laddr6));
-                    snprintf(addrbuf, sizeof(addrbuf), "%s",
-                             psutil_inet6_addrstr(&laddr6));
-                    py_laddr = Py_BuildValue("(si)", addrbuf, lport);
-                    if (!py_laddr)
-                        goto error;
-                }
-
-                if (rport != 0) {
-                    // remote address, IPv4
-                    if (kif->so_family == AF_INET) {
-                        py_raddr = Py_BuildValue(
-                            "(si)",
-                            psutil_convert_ipv4(
-                                kif->so_family, kif->inp_faddru),
-                            rport);
-                    }
-                    else {
-                        // remote address, IPv6
-                        memcpy(&laddr6, kif->inp_faddru, sizeof(laddr6));
-                        snprintf(addrbuf, sizeof(addrbuf), "%s",
-                                 psutil_inet6_addrstr(&laddr6));
-                        py_raddr = Py_BuildValue("(si)", addrbuf, rport);
-                        if (!py_raddr)
-                            goto error;
-                    }
-                }
-                else {
-                    py_raddr = Py_BuildValue("()");
-                }
-
-                if (!py_raddr)
-                    goto error;
-                py_tuple = Py_BuildValue(
-                    "(iiiNNi)",
-                    kif->fd_fd,
-                    kif->so_family,
-                    kif->so_type,
-                    py_laddr,
-                    py_raddr,
-                    state);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_DECREF(py_tuple);
-            }
-            // UNIX socket.
-            // XXX: local addr is supposed to be in "unp_path" but it
-            // always empty; also "fstat" command is not able to show
-            // UNIX socket paths.
-            else if (kif->so_family == AF_UNIX) {
-                py_tuple = Py_BuildValue(
-                    "(iiissi)",
-                    kif->fd_fd,
-                    kif->so_family,
-                    kif->so_type,
-                    "",  // laddr (kif->unp_path is empty)
-                    "",  // raddr
-                    PSUTIL_CONN_NONE);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_DECREF(py_tuple);
-                Py_INCREF(Py_None);
-            }
-        }
-    }
-    free(freep);
-    free(tcplist);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    Py_DECREF(py_retlist);
-    if (freep != NULL)
-        free(freep);
-    if (tcplist != NULL)
-        free(tcplist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    int mib[3];
-    int ncpu;
-    size_t len;
-    size_t size;
-    int i;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_cputime = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-
-    // retrieve the number of cpus
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    len = sizeof(ncpu);
-    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    uint64_t cpu_time[CPUSTATES];
-
-    for (i = 0; i < ncpu; i++) {
-        // per-cpu info
-        mib[0] = CTL_KERN;
-        mib[1] = KERN_CPTIME2;
-        mib[2] = i;
-        size = sizeof(cpu_time);
-        if (sysctl(mib, 3, &cpu_time, &size, NULL, 0) == -1) {
-            warn("failed to get kern.cptime2");
-            PyErr_SetFromErrno(PyExc_OSError);
-            return NULL;
-        }
-
-        py_cputime = Py_BuildValue(
-            "(ddddd)",
-            (double)cpu_time[CP_USER] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_NICE] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_SYS] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_IDLE] / CLOCKS_PER_SEC,
-            (double)cpu_time[CP_INTR] / CLOCKS_PER_SEC);
-        if (!py_cputime)
-            goto error;
-        if (PyList_Append(py_retlist, py_cputime))
-            goto error;
-        Py_DECREF(py_cputime);
-    }
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    int i, dk_ndrive, mib[3];
-    size_t len;
-    struct diskstats *stats = NULL;
-
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_disk_info = NULL;
-    if (py_retdict == NULL)
-        return NULL;
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_DISKSTATS;
-    len = 0;
-    if (sysctl(mib, 2, NULL, &len, NULL, 0) < 0) {
-        warn("can't get hw.diskstats size");
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    dk_ndrive = (int)(len / sizeof(struct diskstats));
-
-    stats = malloc(len);
-    if (stats == NULL) {
-        warn("can't malloc");
-        PyErr_NoMemory();
-        goto error;
-    }
-    if (sysctl(mib, 2, stats, &len, NULL, 0) < 0 ) {
-        warn("could not read hw.diskstats");
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < dk_ndrive; i++) {
-        py_disk_info = Py_BuildValue(
-            "(KKKK)",
-            stats[i].ds_rxfer,  // num reads
-            stats[i].ds_wxfer,  // num writes
-            stats[i].ds_rbytes,  // read bytes
-            stats[i].ds_wbytes  // write bytes
-        );
-        if (!py_disk_info)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, stats[i].ds_name, py_disk_info))
-            goto error;
-        Py_DECREF(py_disk_info);
-    }
-
-    free(stats);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    if (stats != NULL)
-        free(stats);
-    return NULL;
-}
-
-
-PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    size_t size;
-    struct uvmexp uv;
-    int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
-
-    size = sizeof(uv);
-    if (sysctl(uvmexp_mib, 2, &uv, &size, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue(
-        "IIIIIII",
-        uv.swtch,  // ctx switches
-        uv.intrs,  // interrupts - XXX always 0, will be determined via /proc
-        uv.softs,  // soft interrupts
-        uv.syscalls,  // syscalls - XXX always 0
-        uv.traps,  // traps
-        uv.faults,  // faults
-        uv.forks  // forks
-    );
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/openbsd/specific.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/openbsd/specific.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/openbsd/specific.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/openbsd/specific.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil.
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-typedef struct kinfo_proc kinfo_proc;
-
-int psutil_kinfo_proc(pid_t pid, struct kinfo_proc *proc);
-struct kinfo_file * kinfo_getfile(pid_t pid, int* cnt);
-int psutil_get_proc_list(struct kinfo_proc **procList, size_t *procCount);
-char **_psutil_get_argv(pid_t pid);
-PyObject * psutil_get_cmdline(pid_t pid);
-
-//
-PyObject *psutil_proc_threads(PyObject *self, PyObject *args);
-PyObject *psutil_virtual_mem(PyObject *self, PyObject *args);
-PyObject *psutil_swap_mem(PyObject *self, PyObject *args);
-PyObject *psutil_proc_num_fds(PyObject *self, PyObject *args);
-PyObject *psutil_proc_cwd(PyObject *self, PyObject *args);
-PyObject *psutil_proc_connections(PyObject *self, PyObject *args);
-PyObject *psutil_per_cpu_times(PyObject *self, PyObject *args);
-PyObject* psutil_disk_io_counters(PyObject* self, PyObject* args);
-PyObject* psutil_cpu_stats(PyObject* self, PyObject* args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/osx/process_info.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/osx/process_info.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/osx/process_info.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/osx/process_info.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,382 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Helper functions related to fetching process information.
- * Used by _psutil_osx module methods.
- */
-
-
-#include <Python.h>
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>  // for INT_MAX
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/sysctl.h>
-#include <libproc.h>
-
-#include "../../_psutil_common.h"
-#include "../../_psutil_posix.h"
-#include "process_info.h"
-
-/*
- * Returns a list of all BSD processes on the system.  This routine
- * allocates the list and puts it in *procList and a count of the
- * number of entries in *procCount.  You are responsible for freeing
- * this list (use "free" from System framework).
- * On success, the function returns 0.
- * On error, the function returns a BSD errno value.
- */
-int
-psutil_get_proc_list(kinfo_proc **procList, size_t *procCount) {
-    int mib3[3] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
-    size_t size, size2;
-    void *ptr;
-    int err;
-    int lim = 8;  // some limit
-
-    assert( procList != NULL);
-    assert(*procList == NULL);
-    assert(procCount != NULL);
-
-    *procCount = 0;
-
-    /*
-     * We start by calling sysctl with ptr == NULL and size == 0.
-     * That will succeed, and set size to the appropriate length.
-     * We then allocate a buffer of at least that size and call
-     * sysctl with that buffer.  If that succeeds, we're done.
-     * If that call fails with ENOMEM, we throw the buffer away
-     * and try again.
-     * Note that the loop calls sysctl with NULL again.  This is
-     * is necessary because the ENOMEM failure case sets size to
-     * the amount of data returned, not the amount of data that
-     * could have been returned.
-     */
-    while (lim-- > 0) {
-        size = 0;
-        if (sysctl((int *)mib3, 3, NULL, &size, NULL, 0) == -1) {
-            PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_ALL)");
-            return 1;
-        }
-        size2 = size + (size >> 3);  // add some
-        if (size2 > size) {
-            ptr = malloc(size2);
-            if (ptr == NULL)
-                ptr = malloc(size);
-            else
-                size = size2;
-        }
-        else {
-            ptr = malloc(size);
-        }
-        if (ptr == NULL) {
-            PyErr_NoMemory();
-            return 1;
-        }
-
-        if (sysctl((int *)mib3, 3, ptr, &size, NULL, 0) == -1) {
-            err = errno;
-            free(ptr);
-            if (err != ENOMEM) {
-                PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_PROC_ALL)");
-                return 1;
-            }
-        }
-        else {
-            *procList = (kinfo_proc *)ptr;
-            *procCount = size / sizeof(kinfo_proc);
-            if (procCount <= 0) {
-                PyErr_Format(PyExc_RuntimeError, "no PIDs found");
-                return 1;
-            }
-            return 0;  // success
-        }
-    }
-
-    PyErr_Format(PyExc_RuntimeError, "couldn't collect PIDs list");
-    return 1;
-}
-
-
-// Read the maximum argument size for processes
-int
-psutil_get_argmax() {
-    int argmax;
-    int mib[] = { CTL_KERN, KERN_ARGMAX };
-    size_t size = sizeof(argmax);
-
-    if (sysctl(mib, 2, &argmax, &size, NULL, 0) == 0)
-        return argmax;
-    PyErr_SetFromOSErrnoWithSyscall("sysctl(KERN_ARGMAX)");
-    return 0;
-}
-
-
-// Return 1 if pid refers to a zombie process else 0.
-int
-psutil_is_zombie(pid_t pid) {
-    struct kinfo_proc kp;
-
-    if (psutil_get_kinfo_proc(pid, &kp) == -1)
-        return 0;
-    return (kp.kp_proc.p_stat == SZOMB) ? 1 : 0;
-}
-
-
-
-// return process args as a python list
-PyObject *
-psutil_get_cmdline(pid_t pid) {
-    int mib[3];
-    int nargs;
-    size_t len;
-    char *procargs = NULL;
-    char *arg_ptr;
-    char *arg_end;
-    char *curr_arg;
-    size_t argmax;
-
-    PyObject *py_arg = NULL;
-    PyObject *py_retlist = NULL;
-
-    // special case for PID 0 (kernel_task) where cmdline cannot be fetched
-    if (pid == 0)
-        return Py_BuildValue("[]");
-
-    // read argmax and allocate memory for argument space.
-    argmax = psutil_get_argmax();
-    if (! argmax)
-        goto error;
-
-    procargs = (char *)malloc(argmax);
-    if (NULL == procargs) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // read argument space
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROCARGS2;
-    mib[2] = pid;
-    if (sysctl(mib, 3, procargs, &argmax, NULL, 0) < 0) {
-        // In case of zombie process we'll get EINVAL. We translate it
-        // to NSP and _psosx.py will translate it to ZP.
-        if ((errno == EINVAL) && (psutil_pid_exists(pid)))
-            NoSuchProcess("sysctl");
-        else
-            PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    arg_end = &procargs[argmax];
-    // copy the number of arguments to nargs
-    memcpy(&nargs, procargs, sizeof(nargs));
-
-    arg_ptr = procargs + sizeof(nargs);
-    len = strlen(arg_ptr);
-    arg_ptr += len + 1;
-
-    if (arg_ptr == arg_end) {
-        free(procargs);
-        return Py_BuildValue("[]");
-    }
-
-    // skip ahead to the first argument
-    for (; arg_ptr < arg_end; arg_ptr++) {
-        if (*arg_ptr != '\0')
-            break;
-    }
-
-    // iterate through arguments
-    curr_arg = arg_ptr;
-    py_retlist = Py_BuildValue("[]");
-    if (!py_retlist)
-        goto error;
-    while (arg_ptr < arg_end && nargs > 0) {
-        if (*arg_ptr++ == '\0') {
-            py_arg = PyUnicode_DecodeFSDefault(curr_arg);
-            if (! py_arg)
-                goto error;
-            if (PyList_Append(py_retlist, py_arg))
-                goto error;
-            Py_DECREF(py_arg);
-            // iterate to next arg and decrement # of args
-            curr_arg = arg_ptr;
-            nargs--;
-        }
-    }
-
-    free(procargs);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_arg);
-    Py_XDECREF(py_retlist);
-    if (procargs != NULL)
-        free(procargs);
-    return NULL;
-}
-
-
-// return process environment as a python string
-PyObject *
-psutil_get_environ(pid_t pid) {
-    int mib[3];
-    int nargs;
-    char *procargs = NULL;
-    char *procenv = NULL;
-    char *arg_ptr;
-    char *arg_end;
-    char *env_start;
-    size_t argmax;
-    PyObject *py_ret = NULL;
-
-    // special case for PID 0 (kernel_task) where cmdline cannot be fetched
-    if (pid == 0)
-        goto empty;
-
-    // read argmax and allocate memory for argument space.
-    argmax = psutil_get_argmax();
-    if (! argmax)
-        goto error;
-
-    procargs = (char *)malloc(argmax);
-    if (NULL == procargs) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // read argument space
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROCARGS2;
-    mib[2] = pid;
-    if (sysctl(mib, 3, procargs, &argmax, NULL, 0) < 0) {
-        // In case of zombie process we'll get EINVAL. We translate it
-        // to NSP and _psosx.py will translate it to ZP.
-        if ((errno == EINVAL) && (psutil_pid_exists(pid)))
-            NoSuchProcess("sysctl");
-        else
-            PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    arg_end = &procargs[argmax];
-    // copy the number of arguments to nargs
-    memcpy(&nargs, procargs, sizeof(nargs));
-
-    // skip executable path
-    arg_ptr = procargs + sizeof(nargs);
-    arg_ptr = memchr(arg_ptr, '\0', arg_end - arg_ptr);
-
-    if (arg_ptr == NULL || arg_ptr == arg_end)
-        goto empty;
-
-    // skip ahead to the first argument
-    for (; arg_ptr < arg_end; arg_ptr++) {
-        if (*arg_ptr != '\0')
-            break;
-    }
-
-    // iterate through arguments
-    while (arg_ptr < arg_end && nargs > 0) {
-        if (*arg_ptr++ == '\0')
-            nargs--;
-    }
-
-    // build an environment variable block
-    env_start = arg_ptr;
-
-    procenv = calloc(1, arg_end - arg_ptr);
-    if (procenv == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    while (*arg_ptr != '\0' && arg_ptr < arg_end) {
-        char *s = memchr(arg_ptr + 1, '\0', arg_end - arg_ptr);
-
-        if (s == NULL)
-            break;
-
-        memcpy(procenv + (arg_ptr - env_start), arg_ptr, s - arg_ptr);
-
-        arg_ptr = s + 1;
-    }
-
-    py_ret = PyUnicode_DecodeFSDefaultAndSize(
-        procenv, arg_ptr - env_start + 1);
-    if (!py_ret) {
-        // XXX: don't want to free() this as per:
-        // https://github.com/giampaolo/psutil/issues/926
-        // It sucks but not sure what else to do.
-        procargs = NULL;
-        goto error;
-    }
-
-    free(procargs);
-    free(procenv);
-
-    return py_ret;
-
-empty:
-    if (procargs != NULL)
-        free(procargs);
-    return Py_BuildValue("s", "");
-
-error:
-    Py_XDECREF(py_ret);
-    if (procargs != NULL)
-        free(procargs);
-    if (procenv != NULL)
-        free(procargs);
-    return NULL;
-}
-
-
-int
-psutil_get_kinfo_proc(pid_t pid, struct kinfo_proc *kp) {
-    int mib[4];
-    size_t len;
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_PROC;
-    mib[2] = KERN_PROC_PID;
-    mib[3] = pid;
-
-    // fetch the info with sysctl()
-    len = sizeof(struct kinfo_proc);
-
-    // now read the data from sysctl
-    if (sysctl(mib, 4, kp, &len, NULL, 0) == -1) {
-        // raise an exception and throw errno as the error
-        PyErr_SetFromErrno(PyExc_OSError);
-        return -1;
-    }
-
-    // sysctl succeeds but len is zero, happens when process has gone away
-    if (len == 0) {
-        NoSuchProcess("sysctl (len == 0)");
-        return -1;
-    }
-    return 0;
-}
-
-
-/*
- * A wrapper around proc_pidinfo().
- * Returns 0 on failure (and Python exception gets already set).
- */
-int
-psutil_proc_pidinfo(pid_t pid, int flavor, uint64_t arg, void *pti, int size) {
-    errno = 0;
-    int ret = proc_pidinfo(pid, flavor, arg, pti, size);
-    if ((ret <= 0) || ((unsigned long)ret < sizeof(pti))) {
-        psutil_raise_for_pid(pid, "proc_pidinfo()");
-        return 0;
-    }
-    return ret;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/osx/process_info.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/osx/process_info.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/osx/process_info.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/osx/process_info.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-typedef struct kinfo_proc kinfo_proc;
-
-int psutil_get_argmax(void);
-int psutil_is_zombie(pid_t pid);
-int psutil_get_kinfo_proc(pid_t pid, struct kinfo_proc *kp);
-int psutil_get_proc_list(kinfo_proc **procList, size_t *procCount);
-int psutil_proc_pidinfo(
-    pid_t pid, int flavor, uint64_t arg, void *pti, int size);
-PyObject* psutil_get_cmdline(pid_t pid);
-PyObject* psutil_get_environ(pid_t pid);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/environ.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/environ.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/environ.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/environ.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,404 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Oleksii Shevchuk.
- * All rights reserved. Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- *
- * Functions specific for Process.environ().
- */
-
-#define _STRUCTURED_PROC 1
-
-#include <Python.h>
-
-#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
-    #undef _FILE_OFFSET_BITS
-    #undef _LARGEFILE64_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/procfs.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "environ.h"
-
-
-#define STRING_SEARCH_BUF_SIZE 512
-
-
-/*
- * Open address space of specified process and return file descriptor.
- *  @param pid a pid of process.
- *  @param procfs_path a path to mounted procfs filesystem.
- *  @return file descriptor or -1 in case of error.
- */
-static int
-open_address_space(pid_t pid, const char *procfs_path) {
-    int fd;
-    char proc_path[PATH_MAX];
-
-    snprintf(proc_path, PATH_MAX, "%s/%i/as", procfs_path, pid);
-    fd = open(proc_path, O_RDONLY);
-    if (fd < 0)
-        PyErr_SetFromErrno(PyExc_OSError);
-
-    return fd;
-}
-
-
-/*
- * Read chunk of data by offset to specified buffer of the same size.
- * @param fd a file descriptor.
- * @param offset an required offset in file.
- * @param buf a buffer where to store result.
- * @param buf_size a size of buffer where data will be stored.
- * @return amount of bytes stored to the buffer or -1 in case of
- *         error.
- */
-static int
-read_offt(int fd, off_t offset, char *buf, size_t buf_size) {
-    size_t to_read = buf_size;
-    size_t stored  = 0;
-    int r;
-
-    while (to_read) {
-        r = pread(fd, buf + stored, to_read, offset + stored);
-        if (r < 0)
-            goto error;
-        else if (r == 0)
-            break;
-
-        to_read -= r;
-        stored += r;
-    }
-
-    return stored;
-
- error:
-    PyErr_SetFromErrno(PyExc_OSError);
-    return -1;
-}
-
-
-/*
- * Read null-terminated string from file descriptor starting from
- * specified offset.
- * @param fd a file descriptor of opened address space.
- * @param offset an offset in specified file descriptor.
- * @return allocated null-terminated string or NULL in case of error.
-*/
-static char *
-read_cstring_offt(int fd, off_t offset) {
-    int r;
-    int i = 0;
-    off_t end = offset;
-    size_t len;
-    char buf[STRING_SEARCH_BUF_SIZE];
-    char *result = NULL;
-
-    if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    // Search end of string
-    for (;;) {
-        r = read(fd, buf, sizeof(buf));
-        if (r == -1) {
-            PyErr_SetFromErrno(PyExc_OSError);
-            goto error;
-        }
-        else if (r == 0) {
-            break;
-        }
-        else {
-            for (i=0; i<r; i++)
-                if (! buf[i])
-                    goto found;
-        }
-
-        end += r;
-    }
-
-found:
-    len = end + i - offset;
-
-    result = malloc(len+1);
-    if (! result) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    if (len) {
-        if (read_offt(fd, offset, result, len) < 0) {
-            goto error;
-        }
-    }
-
-    result[len] = '\0';
-    return result;
-
- error:
-    if (result)
-        free(result);
-    return NULL;
-}
-
-
-/*
- * Read block of addresses by offset, dereference them one by one
- * and create an array of null terminated C strings from them.
- * @param fd a file descriptor of address space of interesting process.
- * @param offset an offset of address block in address space.
- * @param ptr_size a size of pointer. Only 4 or 8 are valid values.
- * @param count amount of pointers in block.
- * @return allocated array of strings dereferenced and read by offset.
- * Number of elements in array are count. In case of error function
- * returns NULL.
- */
-static char **
-read_cstrings_block(int fd, off_t offset, size_t ptr_size, size_t count) {
-    char **result = NULL;
-    char *pblock = NULL;
-    size_t pblock_size;
-    int i;
-
-    assert(ptr_size == 4 || ptr_size == 8);
-
-    if (!count)
-        goto error;
-
-    pblock_size = ptr_size * count;
-
-    pblock = malloc(pblock_size);
-    if (! pblock) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    if (read_offt(fd, offset, pblock, pblock_size) != pblock_size)
-        goto error;
-
-    result = (char **) calloc(count, sizeof(char *));
-    if (! result) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    for (i=0; i<count; i++) {
-        result[i] = read_cstring_offt(
-            fd, (ptr_size == 4?
-                ((uint32_t *) pblock)[i]:
-                ((uint64_t *) pblock)[i]));
-
-        if (!result[i])
-            goto error;
-    }
-
-    free(pblock);
-    return result;
-
- error:
-    if (result)
-        psutil_free_cstrings_array(result, i);
-    if (pblock)
-        free(pblock);
-    return NULL;
-}
-
-
-/*
- * Check that caller process can extract proper values from psinfo_t
- * structure.
- * @param info a pointer to process info (psinfo_t) structure of the
- *             interesting process.
- *  @return 1 in case if caller process can extract proper values from
- *          psinfo_t structure, or 0 otherwise.
- */
-static inline int
-is_ptr_dereference_possible(psinfo_t info) {
-#if !defined(_LP64)
-    return info.pr_dmodel == PR_MODEL_ILP32;
-#else
-    return 1;
-#endif
-}
-
-
-/*
- * Return pointer size according to psinfo_t structure
- * @param info a ponter to process info (psinfo_t) structure of the
- *             interesting process.
- * @return pointer size (4 or 8).
- */
-static inline int
-ptr_size_by_psinfo(psinfo_t info) {
-    return info.pr_dmodel == PR_MODEL_ILP32? 4 : 8;
-}
-
-
-/*
- * Count amount of pointers in a block which ends with NULL.
- * @param fd a discriptor of /proc/PID/as special file.
- * @param offt an offset of block of pointers at the file.
- * @param ptr_size a pointer size (allowed values: {4, 8}).
- * @return amount of non-NULL pointers or -1 in case of error.
- */
-static int
-search_pointers_vector_size_offt(int fd, off_t offt, size_t ptr_size) {
-    int count = 0;
-    int r;
-    char buf[8];
-    static const char zeros[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-    assert(ptr_size == 4 || ptr_size == 8);
-
-    if (lseek(fd, offt, SEEK_SET) == (off_t)-1)
-        goto error;
-
-    for (;; count ++) {
-        r = read(fd, buf, ptr_size);
-
-        if (r < 0)
-            goto error;
-
-        if (r == 0)
-            break;
-
-        if (r != ptr_size) {
-            PyErr_SetString(
-                PyExc_RuntimeError, "pointer block is truncated");
-            return -1;
-        }
-
-        if (! memcmp(buf, zeros, ptr_size))
-            break;
-    }
-
-    return count;
-
- error:
-    PyErr_SetFromErrno(PyExc_OSError);
-    return -1;
-}
-
-
-/*
- * Derefence and read array of strings by psinfo_t.pr_argv pointer from
- * remote process.
- * @param info a ponter to process info (psinfo_t) structure of the
- *             interesting process
- * @param procfs_path a cstring with path to mounted procfs filesystem.
- * @param count a pointer to variable where to store amount of elements in
- *        returned array. In case of error value of variable will not be
-          changed.
- * @return allocated array of cstrings or NULL in case of error.
- */
-char **
-psutil_read_raw_args(psinfo_t info, const char *procfs_path, size_t *count) {
-    int as;
-    char **result;
-
-    if (! is_ptr_dereference_possible(info)) {
-        PyErr_SetString(
-            PyExc_NotImplementedError,
-            "can't get env of a 64 bit process from a 32 bit process");
-        return NULL;
-    }
-
-    if (! (info.pr_argv && info.pr_argc)) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "process doesn't have arguments block");
-
-        return NULL;
-    }
-
-    as = open_address_space(info.pr_pid, procfs_path);
-    if (as < 0)
-        return NULL;
-
-    result = read_cstrings_block(
-        as, info.pr_argv, ptr_size_by_psinfo(info), info.pr_argc
-    );
-
-    if (result && count)
-        *count = info.pr_argc;
-
-    close(as);
-
-    return result;
-}
-
-
-/*
- * Dereference and read array of strings by psinfo_t.pr_envp pointer
- * from remote process.
- * @param info a ponter to process info (psinfo_t) structure of the
- *             interesting process.
- * @param procfs_path a cstring with path to mounted procfs filesystem.
- * @param count a pointer to variable where to store amount of elements in
- *        returned array. In case of error value of variable will not be
- *        changed. To detect special case (described later) variable should be
- *        initialized by -1 or other negative value.
- * @return allocated array of cstrings or NULL in case of error.
- *         Special case: count set to 0, return NULL.
- *         Special case means there is no error acquired, but no data
- *         retrieved.
- *         Special case exists because the nature of the process. From the
- *         beginning it's not clean how many pointers in envp array. Also
- *         situation when environment is empty is common for kernel processes.
- */
-char **
-psutil_read_raw_env(psinfo_t info, const char *procfs_path, ssize_t *count) {
-    int as;
-    int env_count;
-    int ptr_size;
-    char **result = NULL;
-
-    if (! is_ptr_dereference_possible(info)) {
-        PyErr_SetString(
-            PyExc_NotImplementedError,
-            "can't get env of a 64 bit process from a 32 bit process");
-        return NULL;
-    }
-
-    as = open_address_space(info.pr_pid, procfs_path);
-    if (as < 0)
-        return NULL;
-
-    ptr_size = ptr_size_by_psinfo(info);
-
-    env_count = search_pointers_vector_size_offt(
-        as, info.pr_envp, ptr_size);
-
-    if (env_count >= 0 && count)
-        *count = env_count;
-
-    if (env_count > 0)
-        result = read_cstrings_block(
-            as, info.pr_envp, ptr_size, env_count);
-
-    close(as);
-    return result;
-}
-
-
-/*
- * Free array of cstrings.
- * @param array an array of cstrings returned by psutil_read_raw_env,
- *              psutil_read_raw_args or any other function.
- * @param count a count of strings in the passed array
- */
-void
-psutil_free_cstrings_array(char **array, size_t count) {
-    int i;
-
-    if (!array)
-        return;
-    for (i=0; i<count; i++) {
-        if (array[i]) {
-            free(array[i]);
-        }
-    }
-    free(array);
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/environ.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/environ.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/environ.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/environ.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Oleksii Shevchuk.
- * All rights reserved. Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-#ifndef PROCESS_AS_UTILS_H
-#define PROCESS_AS_UTILS_H
-
-char **
-psutil_read_raw_args(psinfo_t info, const char *procfs_path, size_t *count);
-
-char **
-psutil_read_raw_env(psinfo_t info, const char *procfs_path, ssize_t *count);
-
-void
-psutil_free_cstrings_array(char **array, size_t count);
-
-#endif // PROCESS_AS_UTILS_H
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/* Refrences:
- * https://lists.samba.org/archive/samba-technical/2009-February/063079.html
- * http://stackoverflow.com/questions/4139405/#4139811
- * https://github.com/steve-o/openpgm/blob/master/openpgm/pgm/getifaddrs.c
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-
-#include "ifaddrs.h"
-
-#define MAX(x,y) ((x)>(y)?(x):(y))
-#define SIZE(p) MAX((p).ss_len,sizeof(p))
-
-
-static struct sockaddr *
-sa_dup (struct sockaddr_storage *sa1)
-{
-    struct sockaddr *sa2;
-    size_t sz = sizeof(struct sockaddr_storage);
-    sa2 = (struct sockaddr *) calloc(1,sz);
-    memcpy(sa2,sa1,sz);
-    return(sa2);
-}
-
-
-void freeifaddrs (struct ifaddrs *ifp)
-{
-    if (NULL == ifp) return;
-    free(ifp->ifa_name);
-    free(ifp->ifa_addr);
-    free(ifp->ifa_netmask);
-    free(ifp->ifa_dstaddr);
-    freeifaddrs(ifp->ifa_next);
-    free(ifp);
-}
-
-
-int getifaddrs (struct ifaddrs **ifap)
-{
-    int sd = -1;
-    char *ccp, *ecp;
-    struct lifconf ifc;
-    struct lifreq *ifr;
-    struct lifnum lifn;
-    struct ifaddrs *cifa = NULL; /* current */
-    struct ifaddrs *pifa = NULL; /* previous */
-    const size_t IFREQSZ = sizeof(struct lifreq);
-
-    sd = socket(AF_INET, SOCK_STREAM, 0);
-    if (sd < 0)
-        goto error;
-
-    ifc.lifc_buf = NULL;
-    *ifap = NULL;
-    /* find how much memory to allocate for the SIOCGLIFCONF call */
-    lifn.lifn_family = AF_UNSPEC;
-    lifn.lifn_flags = 0;
-    if (ioctl(sd, SIOCGLIFNUM, &lifn) < 0)
-        goto error;
-
-    /* Sun and Apple code likes to pad the interface count here in case interfaces
-     * are coming up between calls */
-    lifn.lifn_count += 4;
-
-    ifc.lifc_family = AF_UNSPEC;
-    ifc.lifc_len = lifn.lifn_count * sizeof(struct lifreq);
-    ifc.lifc_buf = calloc(1, ifc.lifc_len);
-    if (ioctl(sd, SIOCGLIFCONF, &ifc) < 0)
-        goto error;
-
-    ccp = (char *)ifc.lifc_req;
-    ecp = ccp + ifc.lifc_len;
-
-    while (ccp < ecp) {
-
-        ifr = (struct lifreq *) ccp;
-        cifa = (struct ifaddrs *) calloc(1, sizeof(struct ifaddrs));
-        cifa->ifa_next = NULL;
-        cifa->ifa_name = strdup(ifr->lifr_name);
-
-        if (pifa == NULL) *ifap = cifa; /* first one */
-        else pifa->ifa_next = cifa;
-
-        if (ioctl(sd, SIOCGLIFADDR, ifr, IFREQSZ) < 0)
-            goto error;
-        cifa->ifa_addr = sa_dup(&ifr->lifr_addr);
-
-        if (ioctl(sd, SIOCGLIFNETMASK, ifr, IFREQSZ) < 0)
-            goto error;
-        cifa->ifa_netmask = sa_dup(&ifr->lifr_addr);
-
-        cifa->ifa_flags = 0;
-        cifa->ifa_dstaddr = NULL;
-
-        if (0 == ioctl(sd, SIOCGLIFFLAGS, ifr)) /* optional */
-            cifa->ifa_flags = ifr->lifr_flags;
-
-        if (ioctl(sd, SIOCGLIFDSTADDR, ifr, IFREQSZ) < 0) {
-            if (0 == ioctl(sd, SIOCGLIFBRDADDR, ifr, IFREQSZ))
-                cifa->ifa_dstaddr = sa_dup(&ifr->lifr_addr);
-        }
-        else cifa->ifa_dstaddr = sa_dup(&ifr->lifr_addr);
-
-        pifa = cifa;
-        ccp += IFREQSZ;
-    }
-    free(ifc.lifc_buf);
-    close(sd);
-    return 0;
-error:
-    if (ifc.lifc_buf != NULL)
-        free(ifc.lifc_buf);
-    if (sd != -1)
-        close(sd);
-    freeifaddrs(*ifap);
-    return (-1);
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/solaris/v10/ifaddrs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* Reference: https://lists.samba.org/archive/samba-technical/2009-February/063079.html */
-
-
-#ifndef __IFADDRS_H__
-#define __IFADDRS_H__
-
-#include <sys/socket.h>
-#include <net/if.h>
-
-#undef  ifa_dstaddr
-#undef  ifa_broadaddr
-#define ifa_broadaddr ifa_dstaddr
-
-struct ifaddrs {
-    struct ifaddrs  *ifa_next;
-    char            *ifa_name;
-    unsigned int     ifa_flags;
-    struct sockaddr *ifa_addr;
-    struct sockaddr *ifa_netmask;
-    struct sockaddr *ifa_dstaddr;
-};
-
-extern int getifaddrs(struct ifaddrs **);
-extern void freeifaddrs(struct ifaddrs *);
-
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/cpu.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/cpu.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/cpu.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/cpu.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <windows.h>
-#include <PowrProf.h>
-
-#include "../../_psutil_common.h"
-
-
-/*
- * Return the number of logical, active CPUs. Return 0 if undetermined.
- * See discussion at: https://bugs.python.org/issue33166#msg314631
- */
-static unsigned int
-psutil_get_num_cpus(int fail_on_err) {
-    unsigned int ncpus = 0;
-
-    // Minimum requirement: Windows 7
-    if (GetActiveProcessorCount != NULL) {
-        ncpus = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
-        if ((ncpus == 0) && (fail_on_err == 1)) {
-            PyErr_SetFromWindowsErr(0);
-        }
-    }
-    else {
-        psutil_debug("GetActiveProcessorCount() not available; "
-                     "using GetSystemInfo()");
-        ncpus = (unsigned int)PSUTIL_SYSTEM_INFO.dwNumberOfProcessors;
-        if ((ncpus <= 0) && (fail_on_err == 1)) {
-            PyErr_SetString(
-                PyExc_RuntimeError,
-                "GetSystemInfo() failed to retrieve CPU count");
-        }
-    }
-    return ncpus;
-}
-
-
-/*
- * Retrieves system CPU timing information as a (user, system, idle)
- * tuple. On a multiprocessor system, the values returned are the
- * sum of the designated times across all processors.
- */
-PyObject *
-psutil_cpu_times(PyObject *self, PyObject *args) {
-    double idle, kernel, user, system;
-    FILETIME idle_time, kernel_time, user_time;
-
-    if (!GetSystemTimes(&idle_time, &kernel_time, &user_time)) {
-        PyErr_SetFromWindowsErr(0);
-        return NULL;
-    }
-
-    idle = (double)((HI_T * idle_time.dwHighDateTime) + \
-                   (LO_T * idle_time.dwLowDateTime));
-    user = (double)((HI_T * user_time.dwHighDateTime) + \
-                   (LO_T * user_time.dwLowDateTime));
-    kernel = (double)((HI_T * kernel_time.dwHighDateTime) + \
-                     (LO_T * kernel_time.dwLowDateTime));
-
-    // Kernel time includes idle time.
-    // We return only busy kernel time subtracting idle time from
-    // kernel time.
-    system = (kernel - idle);
-    return Py_BuildValue("(ddd)", user, system, idle);
-}
-
-
-/*
- * Same as above but for all system CPUs.
- */
-PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    double idle, kernel, systemt, user, interrupt, dpc;
-    NTSTATUS status;
-    _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi = NULL;
-    UINT i;
-    unsigned int ncpus;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    // retrieves number of processors
-    ncpus = psutil_get_num_cpus(1);
-    if (ncpus == 0)
-        goto error;
-
-    // allocates an array of _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION
-    // structures, one per processor
-    sppi = (_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *) \
-        malloc(ncpus * sizeof(_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
-    if (sppi == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // gets cpu time informations
-    status = NtQuerySystemInformation(
-        SystemProcessorPerformanceInformation,
-        sppi,
-        ncpus * sizeof(_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION),
-        NULL);
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status,
-            "NtQuerySystemInformation(SystemProcessorPerformanceInformation)"
-        );
-        goto error;
-    }
-
-    // computes system global times summing each
-    // processor value
-    idle = user = kernel = interrupt = dpc = 0;
-    for (i = 0; i < ncpus; i++) {
-        py_tuple = NULL;
-        user = (double)((HI_T * sppi[i].UserTime.HighPart) +
-                       (LO_T * sppi[i].UserTime.LowPart));
-        idle = (double)((HI_T * sppi[i].IdleTime.HighPart) +
-                       (LO_T * sppi[i].IdleTime.LowPart));
-        kernel = (double)((HI_T * sppi[i].KernelTime.HighPart) +
-                         (LO_T * sppi[i].KernelTime.LowPart));
-        interrupt = (double)((HI_T * sppi[i].InterruptTime.HighPart) +
-                            (LO_T * sppi[i].InterruptTime.LowPart));
-        dpc = (double)((HI_T * sppi[i].DpcTime.HighPart) +
-                      (LO_T * sppi[i].DpcTime.LowPart));
-
-        // kernel time includes idle time on windows
-        // we return only busy kernel time subtracting
-        // idle time from kernel time
-        systemt = kernel - idle;
-        py_tuple = Py_BuildValue(
-            "(ddddd)",
-            user,
-            systemt,
-            idle,
-            interrupt,
-            dpc
-        );
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-    }
-
-    free(sppi);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (sppi)
-        free(sppi);
-    return NULL;
-}
-
-
-/*
- * Return the number of active, logical CPUs.
- */
-PyObject *
-psutil_cpu_count_logical(PyObject *self, PyObject *args) {
-    unsigned int ncpus;
-
-    ncpus = psutil_get_num_cpus(0);
-    if (ncpus != 0)
-        return Py_BuildValue("I", ncpus);
-    else
-        Py_RETURN_NONE;  // mimick os.cpu_count()
-}
-
-
-/*
- * Return the number of physical CPU cores (hyper-thread CPUs count
- * is excluded).
- */
-PyObject *
-psutil_cpu_count_phys(PyObject *self, PyObject *args) {
-    DWORD rc;
-    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer = NULL;
-    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX ptr = NULL;
-    DWORD length = 0;
-    DWORD offset = 0;
-    DWORD ncpus = 0;
-    DWORD prev_processor_info_size = 0;
-
-    // GetLogicalProcessorInformationEx() is available from Windows 7
-    // onward. Differently from GetLogicalProcessorInformation()
-    // it supports process groups, meaning this is able to report more
-    // than 64 CPUs. See:
-    // https://bugs.python.org/issue33166
-    if (GetLogicalProcessorInformationEx == NULL) {
-        psutil_debug("Win < 7; cpu_count_phys() forced to None");
-        Py_RETURN_NONE;
-    }
-
-    while (1) {
-        rc = GetLogicalProcessorInformationEx(
-            RelationAll, buffer, &length);
-        if (rc == FALSE) {
-            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-                if (buffer) {
-                    free(buffer);
-                }
-                buffer = \
-                    (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)malloc(length);
-                if (NULL == buffer) {
-                    PyErr_NoMemory();
-                    return NULL;
-                }
-            }
-            else {
-                psutil_debug("GetLogicalProcessorInformationEx() returned ",
-                             GetLastError());
-                goto return_none;
-            }
-        }
-        else {
-            break;
-        }
-    }
-
-    ptr = buffer;
-    while (offset < length) {
-        // Advance ptr by the size of the previous
-        // SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX struct.
-        ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*) \
-            (((char*)ptr) + prev_processor_info_size);
-
-        if (ptr->Relationship == RelationProcessorCore) {
-            ncpus += 1;
-        }
-
-        // When offset == length, we've reached the last processor
-        // info struct in the buffer.
-        offset += ptr->Size;
-        prev_processor_info_size = ptr->Size;
-    }
-
-    free(buffer);
-    if (ncpus != 0) {
-        return Py_BuildValue("I", ncpus);
-    }
-    else {
-        psutil_debug("GetLogicalProcessorInformationEx() count was 0");
-        Py_RETURN_NONE;  // mimick os.cpu_count()
-    }
-
-return_none:
-    if (buffer != NULL)
-        free(buffer);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Return CPU statistics.
- */
-PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    NTSTATUS status;
-    _SYSTEM_PERFORMANCE_INFORMATION *spi = NULL;
-    _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi = NULL;
-    _SYSTEM_INTERRUPT_INFORMATION *InterruptInformation = NULL;
-    unsigned int ncpus;
-    UINT i;
-    ULONG64 dpcs = 0;
-    ULONG interrupts = 0;
-
-    // retrieves number of processors
-    ncpus = psutil_get_num_cpus(1);
-    if (ncpus == 0)
-        goto error;
-
-    // get syscalls / ctx switches
-    spi = (_SYSTEM_PERFORMANCE_INFORMATION *) \
-           malloc(ncpus * sizeof(_SYSTEM_PERFORMANCE_INFORMATION));
-    if (spi == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    status = NtQuerySystemInformation(
-        SystemPerformanceInformation,
-        spi,
-        ncpus * sizeof(_SYSTEM_PERFORMANCE_INFORMATION),
-        NULL);
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQuerySystemInformation(SystemPerformanceInformation)");
-        goto error;
-    }
-
-    // get DPCs
-    InterruptInformation = \
-        malloc(sizeof(_SYSTEM_INTERRUPT_INFORMATION) * ncpus);
-    if (InterruptInformation == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    status = NtQuerySystemInformation(
-        SystemInterruptInformation,
-        InterruptInformation,
-        ncpus * sizeof(SYSTEM_INTERRUPT_INFORMATION),
-        NULL);
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQuerySystemInformation(SystemInterruptInformation)");
-        goto error;
-    }
-    for (i = 0; i < ncpus; i++) {
-        dpcs += InterruptInformation[i].DpcCount;
-    }
-
-    // get interrupts
-    sppi = (_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *) \
-        malloc(ncpus * sizeof(_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
-    if (sppi == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    status = NtQuerySystemInformation(
-        SystemProcessorPerformanceInformation,
-        sppi,
-        ncpus * sizeof(_SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION),
-        NULL);
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status,
-            "NtQuerySystemInformation(SystemProcessorPerformanceInformation)");
-        goto error;
-    }
-
-    for (i = 0; i < ncpus; i++) {
-        interrupts += sppi[i].InterruptCount;
-    }
-
-    // done
-    free(spi);
-    free(InterruptInformation);
-    free(sppi);
-    return Py_BuildValue(
-        "kkkk",
-        spi->ContextSwitches,
-        interrupts,
-        (unsigned long)dpcs,
-        spi->SystemCalls
-    );
-
-error:
-    if (spi)
-        free(spi);
-    if (InterruptInformation)
-        free(InterruptInformation);
-    if (sppi)
-        free(sppi);
-    return NULL;
-}
-
-
-/*
- * Return CPU frequency.
- */
-PyObject *
-psutil_cpu_freq(PyObject *self, PyObject *args) {
-    PROCESSOR_POWER_INFORMATION *ppi;
-    NTSTATUS ret;
-    ULONG size;
-    LPBYTE pBuffer = NULL;
-    ULONG current;
-    ULONG max;
-    unsigned int ncpus;
-
-    // Get the number of CPUs.
-    ncpus = psutil_get_num_cpus(1);
-    if (ncpus == 0)
-        return NULL;
-
-    // Allocate size.
-    size = ncpus * sizeof(PROCESSOR_POWER_INFORMATION);
-    pBuffer = (BYTE*)LocalAlloc(LPTR, size);
-    if (! pBuffer) {
-        PyErr_SetFromWindowsErr(0);
-        return NULL;
-    }
-
-    // Syscall.
-    ret = CallNtPowerInformation(
-        ProcessorInformation, NULL, 0, pBuffer, size);
-    if (ret != 0) {
-        PyErr_SetString(PyExc_RuntimeError,
-                        "CallNtPowerInformation syscall failed");
-        goto error;
-    }
-
-    // Results.
-    ppi = (PROCESSOR_POWER_INFORMATION *)pBuffer;
-    max = ppi->MaxMhz;
-    current = ppi->CurrentMhz;
-    LocalFree(pBuffer);
-
-    return Py_BuildValue("kk", current, max);
-
-error:
-    if (pBuffer != NULL)
-        LocalFree(pBuffer);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/cpu.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/cpu.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/cpu.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/cpu.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject *psutil_cpu_count_logical(PyObject *self, PyObject *args);
-PyObject *psutil_cpu_count_phys(PyObject *self, PyObject *args);
-PyObject *psutil_cpu_freq(PyObject *self, PyObject *args);
-PyObject *psutil_cpu_stats(PyObject *self, PyObject *args);
-PyObject *psutil_cpu_times(PyObject *self, PyObject *args);
-PyObject *psutil_per_cpu_times(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/disk.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/disk.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/disk.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/disk.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <windows.h>
-#include <tchar.h>
-
-#include "../../_psutil_common.h"
-
-
-#ifndef _ARRAYSIZE
-#define _ARRAYSIZE(a) (sizeof(a)/sizeof(a[0]))
-#endif
-
-static char *psutil_get_drive_type(int type) {
-    switch (type) {
-        case DRIVE_FIXED:
-            return "fixed";
-        case DRIVE_CDROM:
-            return "cdrom";
-        case DRIVE_REMOVABLE:
-            return "removable";
-        case DRIVE_UNKNOWN:
-            return "unknown";
-        case DRIVE_NO_ROOT_DIR:
-            return "unmounted";
-        case DRIVE_REMOTE:
-            return "remote";
-        case DRIVE_RAMDISK:
-            return "ramdisk";
-        default:
-            return "?";
-    }
-}
-
-
-/*
- * Return path's disk total and free as a Python tuple.
- */
-PyObject *
-psutil_disk_usage(PyObject *self, PyObject *args) {
-    BOOL retval;
-    ULARGE_INTEGER _, total, free;
-    char *path;
-
-    if (PyArg_ParseTuple(args, "u", &path)) {
-        Py_BEGIN_ALLOW_THREADS
-        retval = GetDiskFreeSpaceExW((LPCWSTR)path, &_, &total, &free);
-        Py_END_ALLOW_THREADS
-        goto return_;
-    }
-
-    // on Python 2 we also want to accept plain strings other
-    // than Unicode
-#if PY_MAJOR_VERSION <= 2
-    PyErr_Clear();  // drop the argument parsing error
-    if (PyArg_ParseTuple(args, "s", &path)) {
-        Py_BEGIN_ALLOW_THREADS
-        retval = GetDiskFreeSpaceEx(path, &_, &total, &free);
-        Py_END_ALLOW_THREADS
-        goto return_;
-    }
-#endif
-
-    return NULL;
-
-return_:
-    if (retval == 0)
-        return PyErr_SetFromWindowsErrWithFilename(0, path);
-    else
-        return Py_BuildValue("(LL)", total.QuadPart, free.QuadPart);
-}
-
-
-/*
- * Return a Python dict of tuples for disk I/O information. This may
- * require running "diskperf -y" command first.
- */
-PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    DISK_PERFORMANCE diskPerformance;
-    DWORD dwSize;
-    HANDLE hDevice = NULL;
-    char szDevice[MAX_PATH];
-    char szDeviceDisplay[MAX_PATH];
-    int devNum;
-    int i;
-    DWORD ioctrlSize;
-    BOOL ret;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_tuple = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    // Apparently there's no way to figure out how many times we have
-    // to iterate in order to find valid drives.
-    // Let's assume 32, which is higher than 26, the number of letters
-    // in the alphabet (from A:\ to Z:\).
-    for (devNum = 0; devNum <= 32; ++devNum) {
-        py_tuple = NULL;
-        sprintf_s(szDevice, MAX_PATH, "\\\\.\\PhysicalDrive%d", devNum);
-        hDevice = CreateFile(szDevice, 0, FILE_SHARE_READ | FILE_SHARE_WRITE,
-                             NULL, OPEN_EXISTING, 0, NULL);
-        if (hDevice == INVALID_HANDLE_VALUE)
-            continue;
-
-        // DeviceIoControl() sucks!
-        i = 0;
-        ioctrlSize = sizeof(diskPerformance);
-        while (1) {
-            i += 1;
-            ret = DeviceIoControl(
-                hDevice, IOCTL_DISK_PERFORMANCE, NULL, 0, &diskPerformance,
-                ioctrlSize, &dwSize, NULL);
-            if (ret != 0)
-                break;  // OK!
-            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-                // Retry with a bigger buffer (+ limit for retries).
-                if (i <= 1024) {
-                    ioctrlSize *= 2;
-                    continue;
-                }
-            }
-            else if (GetLastError() == ERROR_INVALID_FUNCTION) {
-                // This happens on AppVeyor:
-                // https://ci.appveyor.com/project/giampaolo/psutil/build/
-                //      1364/job/ascpdi271b06jle3
-                // Assume it means we're dealing with some exotic disk
-                // and go on.
-                psutil_debug("DeviceIoControl -> ERROR_INVALID_FUNCTION; "
-                             "ignore PhysicalDrive%i", devNum);
-                goto next;
-            }
-            else if (GetLastError() == ERROR_NOT_SUPPORTED) {
-                // Again, let's assume we're dealing with some exotic disk.
-                psutil_debug("DeviceIoControl -> ERROR_NOT_SUPPORTED; "
-                             "ignore PhysicalDrive%i", devNum);
-                goto next;
-            }
-            // XXX: it seems we should also catch ERROR_INVALID_PARAMETER:
-            // https://sites.ualberta.ca/dept/aict/uts/software/openbsd/
-            //     ports/4.1/i386/openafs/w-openafs-1.4.14-transarc/
-            //     openafs-1.4.14/src/usd/usd_nt.c
-
-            // XXX: we can also bump into ERROR_MORE_DATA in which case
-            // (quoting doc) we're supposed to retry with a bigger buffer
-            // and specify  a new "starting point", whatever it means.
-            PyErr_SetFromWindowsErr(0);
-            goto error;
-        }
-
-        sprintf_s(szDeviceDisplay, MAX_PATH, "PhysicalDrive%i", devNum);
-        py_tuple = Py_BuildValue(
-            "(IILLKK)",
-            diskPerformance.ReadCount,
-            diskPerformance.WriteCount,
-            diskPerformance.BytesRead,
-            diskPerformance.BytesWritten,
-            // convert to ms:
-            // https://github.com/giampaolo/psutil/issues/1012
-            (unsigned long long)
-                (diskPerformance.ReadTime.QuadPart) / 10000000,
-            (unsigned long long)
-                (diskPerformance.WriteTime.QuadPart) / 10000000);
-        if (!py_tuple)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, szDeviceDisplay, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-
-next:
-        CloseHandle(hDevice);
-    }
-
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retdict);
-    if (hDevice != NULL)
-        CloseHandle(hDevice);
-    return NULL;
-}
-
-
-/*
- * Return disk partitions as a list of tuples such as
- * (drive_letter, drive_letter, type, "")
- */
-PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    DWORD num_bytes;
-    char drive_strings[255];
-    char *drive_letter = drive_strings;
-    char mp_buf[MAX_PATH];
-    char mp_path[MAX_PATH];
-    int all;
-    int type;
-    int ret;
-    unsigned int old_mode = 0;
-    char opts[20];
-    HANDLE mp_h;
-    BOOL mp_flag= TRUE;
-    LPTSTR fs_type[MAX_PATH + 1] = { 0 };
-    DWORD pflags = 0;
-    PyObject *py_all;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-
-    if (py_retlist == NULL) {
-        return NULL;
-    }
-
-    // avoid to visualize a message box in case something goes wrong
-    // see https://github.com/giampaolo/psutil/issues/264
-    old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
-
-    if (! PyArg_ParseTuple(args, "O", &py_all))
-        goto error;
-    all = PyObject_IsTrue(py_all);
-
-    Py_BEGIN_ALLOW_THREADS
-    num_bytes = GetLogicalDriveStrings(254, drive_letter);
-    Py_END_ALLOW_THREADS
-
-    if (num_bytes == 0) {
-        PyErr_SetFromWindowsErr(0);
-        goto error;
-    }
-
-    while (*drive_letter != 0) {
-        py_tuple = NULL;
-        opts[0] = 0;
-        fs_type[0] = 0;
-
-        Py_BEGIN_ALLOW_THREADS
-        type = GetDriveType(drive_letter);
-        Py_END_ALLOW_THREADS
-
-        // by default we only show hard drives and cd-roms
-        if (all == 0) {
-            if ((type == DRIVE_UNKNOWN) ||
-                    (type == DRIVE_NO_ROOT_DIR) ||
-                    (type == DRIVE_REMOTE) ||
-                    (type == DRIVE_RAMDISK)) {
-                goto next;
-            }
-            // floppy disk: skip it by default as it introduces a
-            // considerable slowdown.
-            if ((type == DRIVE_REMOVABLE) &&
-                    (strcmp(drive_letter, "A:\\")  == 0)) {
-                goto next;
-            }
-        }
-
-        ret = GetVolumeInformation(
-            (LPCTSTR)drive_letter, NULL, _ARRAYSIZE(drive_letter),
-            NULL, NULL, &pflags, (LPTSTR)fs_type, _ARRAYSIZE(fs_type));
-        if (ret == 0) {
-            // We might get here in case of a floppy hard drive, in
-            // which case the error is (21, "device not ready").
-            // Let's pretend it didn't happen as we already have
-            // the drive name and type ('removable').
-            strcat_s(opts, _countof(opts), "");
-            SetLastError(0);
-        }
-        else {
-            if (pflags & FILE_READ_ONLY_VOLUME)
-                strcat_s(opts, _countof(opts), "ro");
-            else
-                strcat_s(opts, _countof(opts), "rw");
-            if (pflags & FILE_VOLUME_IS_COMPRESSED)
-                strcat_s(opts, _countof(opts), ",compressed");
-
-            // Check for mount points on this volume and add/get info
-            // (checks first to know if we can even have mount points)
-            if (pflags & FILE_SUPPORTS_REPARSE_POINTS) {
-                mp_h = FindFirstVolumeMountPoint(
-                    drive_letter, mp_buf, MAX_PATH);
-                if (mp_h != INVALID_HANDLE_VALUE) {
-                    while (mp_flag) {
-
-                        // Append full mount path with drive letter
-                        strcpy_s(mp_path, _countof(mp_path), drive_letter);
-                        strcat_s(mp_path, _countof(mp_path), mp_buf);
-
-                        py_tuple = Py_BuildValue(
-                            "(ssss)",
-                            drive_letter,
-                            mp_path,
-                            fs_type, // Typically NTFS
-                            opts);
-
-                        if (!py_tuple ||
-                                PyList_Append(py_retlist, py_tuple) == -1) {
-                            FindVolumeMountPointClose(mp_h);
-                            goto error;
-                        }
-
-                        Py_CLEAR(py_tuple);
-
-                        // Continue looking for more mount points
-                        mp_flag = FindNextVolumeMountPoint(
-                            mp_h, mp_buf, MAX_PATH);
-                    }
-                    FindVolumeMountPointClose(mp_h);
-                }
-
-            }
-        }
-
-        if (strlen(opts) > 0)
-            strcat_s(opts, _countof(opts), ",");
-        strcat_s(opts, _countof(opts), psutil_get_drive_type(type));
-
-        py_tuple = Py_BuildValue(
-            "(ssss)",
-            drive_letter,
-            drive_letter,
-            fs_type,  // either FAT, FAT32, NTFS, HPFS, CDFS, UDF or NWFS
-            opts);
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-        goto next;
-
-next:
-        drive_letter = strchr(drive_letter, 0) + 1;
-    }
-
-    SetErrorMode(old_mode);
-    return py_retlist;
-
-error:
-    SetErrorMode(old_mode);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-/*
- Accept a filename's drive in native  format like "\Device\HarddiskVolume1\"
- and return the corresponding drive letter (e.g. "C:\\").
- If no match is found return an empty string.
-*/
-PyObject *
-psutil_win32_QueryDosDevice(PyObject *self, PyObject *args) {
-    LPCTSTR lpDevicePath;
-    TCHAR d = TEXT('A');
-    TCHAR szBuff[5];
-
-    if (!PyArg_ParseTuple(args, "s", &lpDevicePath))
-        return NULL;
-
-    while (d <= TEXT('Z')) {
-        TCHAR szDeviceName[3] = {d, TEXT(':'), TEXT('\0')};
-        TCHAR szTarget[512] = {0};
-        if (QueryDosDevice(szDeviceName, szTarget, 511) != 0) {
-            if (_tcscmp(lpDevicePath, szTarget) == 0) {
-                _stprintf_s(szBuff, _countof(szBuff), TEXT("%c:"), d);
-                return Py_BuildValue("s", szBuff);
-            }
-        }
-        d++;
-    }
-    return Py_BuildValue("s", "");
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/disk.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/disk.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/disk.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/disk.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject *psutil_disk_io_counters(PyObject *self, PyObject *args);
-PyObject *psutil_disk_partitions(PyObject *self, PyObject *args);
-PyObject *psutil_disk_usage(PyObject *self, PyObject *args);
-PyObject *psutil_win32_QueryDosDevice(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/net.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/net.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/net.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/net.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Fixes clash between winsock2.h and windows.h
-#define WIN32_LEAN_AND_MEAN
-
-#include <Python.h>
-#include <windows.h>
-#include <wchar.h>
-#include <ws2tcpip.h>
-
-#include "../../_psutil_common.h"
-
-
-static PIP_ADAPTER_ADDRESSES
-psutil_get_nic_addresses() {
-    // allocate a 15 KB buffer to start with
-    int outBufLen = 15000;
-    DWORD dwRetVal = 0;
-    ULONG attempts = 0;
-    PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-
-    do {
-        pAddresses = (IP_ADAPTER_ADDRESSES *) malloc(outBufLen);
-        if (pAddresses == NULL) {
-            PyErr_NoMemory();
-            return NULL;
-        }
-
-        dwRetVal = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, pAddresses,
-                                        &outBufLen);
-        if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
-            free(pAddresses);
-            pAddresses = NULL;
-        }
-        else {
-            break;
-        }
-
-        attempts++;
-    } while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (attempts < 3));
-
-    if (dwRetVal != NO_ERROR) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "GetAdaptersAddresses() syscall failed.");
-        return NULL;
-    }
-
-    return pAddresses;
-}
-
-
-/*
- * Return a Python list of named tuples with overall network I/O information
- */
-PyObject *
-psutil_net_io_counters(PyObject *self, PyObject *args) {
-    DWORD dwRetVal = 0;
-    MIB_IF_ROW2 *pIfRow = NULL;
-    PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-    PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_nic_info = NULL;
-    PyObject *py_nic_name = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    pAddresses = psutil_get_nic_addresses();
-    if (pAddresses == NULL)
-        goto error;
-    pCurrAddresses = pAddresses;
-
-    while (pCurrAddresses) {
-        py_nic_name = NULL;
-        py_nic_info = NULL;
-
-        pIfRow = (MIB_IF_ROW2 *) malloc(sizeof(MIB_IF_ROW2));
-        if (pIfRow == NULL) {
-            PyErr_NoMemory();
-            goto error;
-        }
-
-        SecureZeroMemory((PVOID)pIfRow, sizeof(MIB_IF_ROW2));
-        pIfRow->InterfaceIndex = pCurrAddresses->IfIndex;
-        dwRetVal = GetIfEntry2(pIfRow);
-        if (dwRetVal != NO_ERROR) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            "GetIfEntry() or GetIfEntry2() syscalls failed.");
-            goto error;
-        }
-
-        py_nic_info = Py_BuildValue(
-            "(KKKKKKKK)",
-            pIfRow->OutOctets,
-            pIfRow->InOctets,
-            (pIfRow->OutUcastPkts + pIfRow->OutNUcastPkts),
-            (pIfRow->InUcastPkts + pIfRow->InNUcastPkts),
-            pIfRow->InErrors,
-            pIfRow->OutErrors,
-            pIfRow->InDiscards,
-            pIfRow->OutDiscards);
-        if (!py_nic_info)
-            goto error;
-
-        py_nic_name = PyUnicode_FromWideChar(
-            pCurrAddresses->FriendlyName,
-            wcslen(pCurrAddresses->FriendlyName));
-
-        if (py_nic_name == NULL)
-            goto error;
-        if (PyDict_SetItem(py_retdict, py_nic_name, py_nic_info))
-            goto error;
-        Py_CLEAR(py_nic_name);
-        Py_CLEAR(py_nic_info);
-
-        free(pIfRow);
-        pCurrAddresses = pCurrAddresses->Next;
-    }
-
-    free(pAddresses);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_nic_name);
-    Py_XDECREF(py_nic_info);
-    Py_DECREF(py_retdict);
-    if (pAddresses != NULL)
-        free(pAddresses);
-    if (pIfRow != NULL)
-        free(pIfRow);
-    return NULL;
-}
-
-
-/*
- * Return NICs addresses.
- */
-PyObject *
-psutil_net_if_addrs(PyObject *self, PyObject *args) {
-    unsigned int i = 0;
-    ULONG family;
-    PCTSTR intRet;
-    PCTSTR netmaskIntRet;
-    char *ptr;
-    char buff_addr[1024];
-    char buff_macaddr[1024];
-    char buff_netmask[1024];
-    DWORD dwRetVal = 0;
-    ULONG converted_netmask;
-    UINT netmask_bits;
-    struct in_addr in_netmask;
-    PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-    PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
-    PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_address = NULL;
-    PyObject *py_mac_address = NULL;
-    PyObject *py_nic_name = NULL;
-    PyObject *py_netmask = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    pAddresses = psutil_get_nic_addresses();
-    if (pAddresses == NULL)
-        goto error;
-    pCurrAddresses = pAddresses;
-
-    while (pCurrAddresses) {
-        pUnicast = pCurrAddresses->FirstUnicastAddress;
-
-        netmaskIntRet = NULL;
-        py_nic_name = NULL;
-        py_nic_name = PyUnicode_FromWideChar(
-            pCurrAddresses->FriendlyName,
-            wcslen(pCurrAddresses->FriendlyName));
-        if (py_nic_name == NULL)
-            goto error;
-
-        // MAC address
-        if (pCurrAddresses->PhysicalAddressLength != 0) {
-            ptr = buff_macaddr;
-            *ptr = '\0';
-            for (i = 0; i < (int) pCurrAddresses->PhysicalAddressLength; i++) {
-                if (i == (pCurrAddresses->PhysicalAddressLength - 1)) {
-                    sprintf_s(ptr, _countof(buff_macaddr), "%.2X\n",
-                            (int)pCurrAddresses->PhysicalAddress[i]);
-                }
-                else {
-                    sprintf_s(ptr, _countof(buff_macaddr), "%.2X-",
-                            (int)pCurrAddresses->PhysicalAddress[i]);
-                }
-                ptr += 3;
-            }
-            *--ptr = '\0';
-
-            py_mac_address = Py_BuildValue("s", buff_macaddr);
-            if (py_mac_address == NULL)
-                goto error;
-
-            Py_INCREF(Py_None);
-            Py_INCREF(Py_None);
-            Py_INCREF(Py_None);
-            py_tuple = Py_BuildValue(
-                "(OiOOOO)",
-                py_nic_name,
-                -1,  // this will be converted later to AF_LINK
-                py_mac_address,
-                Py_None,  // netmask (not supported)
-                Py_None,  // broadcast (not supported)
-                Py_None  // ptp (not supported on Windows)
-            );
-            if (! py_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_CLEAR(py_tuple);
-            Py_CLEAR(py_mac_address);
-        }
-
-        // find out the IP address associated with the NIC
-        if (pUnicast != NULL) {
-            for (i = 0; pUnicast != NULL; i++) {
-                family = pUnicast->Address.lpSockaddr->sa_family;
-                if (family == AF_INET) {
-                    struct sockaddr_in *sa_in = (struct sockaddr_in *)
-                        pUnicast->Address.lpSockaddr;
-                    intRet = inet_ntop(AF_INET, &(sa_in->sin_addr), buff_addr,
-                                       sizeof(buff_addr));
-                    if (!intRet)
-                        goto error;
-                    netmask_bits = pUnicast->OnLinkPrefixLength;
-                    dwRetVal = ConvertLengthToIpv4Mask(
-                        netmask_bits, &converted_netmask);
-                    if (dwRetVal == NO_ERROR) {
-                        in_netmask.s_addr = converted_netmask;
-                        netmaskIntRet = inet_ntop(
-                            AF_INET, &in_netmask, buff_netmask,
-                            sizeof(buff_netmask));
-                        if (!netmaskIntRet)
-                            goto error;
-                    }
-                }
-                else if (family == AF_INET6) {
-                    struct sockaddr_in6 *sa_in6 = (struct sockaddr_in6 *)
-                        pUnicast->Address.lpSockaddr;
-                    intRet = inet_ntop(AF_INET6, &(sa_in6->sin6_addr),
-                                       buff_addr, sizeof(buff_addr));
-                    if (!intRet)
-                        goto error;
-                }
-                else {
-                    // we should never get here
-                    pUnicast = pUnicast->Next;
-                    continue;
-                }
-
-#if PY_MAJOR_VERSION >= 3
-                py_address = PyUnicode_FromString(buff_addr);
-#else
-                py_address = PyString_FromString(buff_addr);
-#endif
-                if (py_address == NULL)
-                    goto error;
-
-                if (netmaskIntRet != NULL) {
-#if PY_MAJOR_VERSION >= 3
-                    py_netmask = PyUnicode_FromString(buff_netmask);
-#else
-                    py_netmask = PyString_FromString(buff_netmask);
-#endif
-                } else {
-                    Py_INCREF(Py_None);
-                    py_netmask = Py_None;
-                }
-
-                Py_INCREF(Py_None);
-                Py_INCREF(Py_None);
-                py_tuple = Py_BuildValue(
-                    "(OiOOOO)",
-                    py_nic_name,
-                    family,
-                    py_address,
-                    py_netmask,
-                    Py_None,  // broadcast (not supported)
-                    Py_None  // ptp (not supported on Windows)
-                );
-
-                if (! py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-                Py_CLEAR(py_address);
-                Py_CLEAR(py_netmask);
-
-                pUnicast = pUnicast->Next;
-            }
-        }
-        Py_CLEAR(py_nic_name);
-        pCurrAddresses = pCurrAddresses->Next;
-    }
-
-    free(pAddresses);
-    return py_retlist;
-
-error:
-    if (pAddresses)
-        free(pAddresses);
-    Py_DECREF(py_retlist);
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_address);
-    Py_XDECREF(py_nic_name);
-    Py_XDECREF(py_netmask);
-    return NULL;
-}
-
-
-/*
- * Provides stats about NIC interfaces installed on the system.
- * TODO: get 'duplex' (currently it's hard coded to '2', aka
-         'full duplex')
- */
-PyObject *
-psutil_net_if_stats(PyObject *self, PyObject *args) {
-    int i;
-    DWORD dwSize = 0;
-    DWORD dwRetVal = 0;
-    MIB_IFTABLE *pIfTable;
-    MIB_IFROW *pIfRow;
-    PIP_ADAPTER_ADDRESSES pAddresses = NULL;
-    PIP_ADAPTER_ADDRESSES pCurrAddresses = NULL;
-    char descr[MAX_PATH];
-    int ifname_found;
-
-    PyObject *py_nic_name = NULL;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_ifc_info = NULL;
-    PyObject *py_is_up = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-
-    pAddresses = psutil_get_nic_addresses();
-    if (pAddresses == NULL)
-        goto error;
-
-    pIfTable = (MIB_IFTABLE *) malloc(sizeof (MIB_IFTABLE));
-    if (pIfTable == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    dwSize = sizeof(MIB_IFTABLE);
-    if (GetIfTable(pIfTable, &dwSize, FALSE) == ERROR_INSUFFICIENT_BUFFER) {
-        free(pIfTable);
-        pIfTable = (MIB_IFTABLE *) malloc(dwSize);
-        if (pIfTable == NULL) {
-            PyErr_NoMemory();
-            goto error;
-        }
-    }
-    // Make a second call to GetIfTable to get the actual
-    // data we want.
-    if ((dwRetVal = GetIfTable(pIfTable, &dwSize, FALSE)) != NO_ERROR) {
-        PyErr_SetString(PyExc_RuntimeError, "GetIfTable() syscall failed");
-        goto error;
-    }
-
-    for (i = 0; i < (int) pIfTable->dwNumEntries; i++) {
-        pIfRow = (MIB_IFROW *) & pIfTable->table[i];
-
-        // GetIfTable is not able to give us NIC with "friendly names"
-        // so we determine them via GetAdapterAddresses() which
-        // provides friendly names *and* descriptions and find the
-        // ones that match.
-        ifname_found = 0;
-        pCurrAddresses = pAddresses;
-        while (pCurrAddresses) {
-            sprintf_s(descr, MAX_PATH, "%wS", pCurrAddresses->Description);
-            if (lstrcmp(descr, pIfRow->bDescr) == 0) {
-                py_nic_name = PyUnicode_FromWideChar(
-                    pCurrAddresses->FriendlyName,
-                    wcslen(pCurrAddresses->FriendlyName));
-                if (py_nic_name == NULL)
-                    goto error;
-                ifname_found = 1;
-                break;
-            }
-            pCurrAddresses = pCurrAddresses->Next;
-        }
-        if (ifname_found == 0) {
-            // Name not found means GetAdapterAddresses() doesn't list
-            // this NIC, only GetIfTable, meaning it's not really a NIC
-            // interface so we skip it.
-            continue;
-        }
-
-        // is up?
-        if ((pIfRow->dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED ||
-                pIfRow->dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) &&
-                pIfRow->dwAdminStatus == 1 ) {
-            py_is_up = Py_True;
-        }
-        else {
-            py_is_up = Py_False;
-        }
-        Py_INCREF(py_is_up);
-
-        py_ifc_info = Py_BuildValue(
-            "(Oikk)",
-            py_is_up,
-            2,  // there's no way to know duplex so let's assume 'full'
-            pIfRow->dwSpeed / 1000000,  // expressed in bytes, we want Mb
-            pIfRow->dwMtu
-        );
-        if (!py_ifc_info)
-            goto error;
-        if (PyDict_SetItem(py_retdict, py_nic_name, py_ifc_info))
-            goto error;
-        Py_CLEAR(py_nic_name);
-        Py_CLEAR(py_ifc_info);
-    }
-
-    free(pIfTable);
-    free(pAddresses);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_is_up);
-    Py_XDECREF(py_ifc_info);
-    Py_XDECREF(py_nic_name);
-    Py_DECREF(py_retdict);
-    if (pIfTable != NULL)
-        free(pIfTable);
-    if (pAddresses != NULL)
-        free(pAddresses);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/net.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/net.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/net.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/net.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject *psutil_net_if_addrs(PyObject *self, PyObject *args);
-PyObject *psutil_net_if_stats(PyObject *self, PyObject *args);
-PyObject *psutil_net_io_counters(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/ntextapi.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/ntextapi.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/ntextapi.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/ntextapi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- * Define Windows structs and constants which are considered private.
- */
-
-#if !defined(__NTEXTAPI_H__)
-#define __NTEXTAPI_H__
-#include <winternl.h>
-#include <iphlpapi.h>
-
-typedef LONG NTSTATUS;
-
-// https://github.com/ajkhoury/TestDll/blob/master/nt_ddk.h
-#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
-#define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
-#define STATUS_ACCESS_DENIED ((NTSTATUS)0xC0000022L)
-#define STATUS_NOT_FOUND ((NTSTATUS)0xC0000225L)
-#define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005L)
-
-// ================================================================
-// Enums
-// ================================================================
-
-#undef  SystemExtendedHandleInformation
-#define SystemExtendedHandleInformation 64
-#undef  MemoryWorkingSetInformation
-#define MemoryWorkingSetInformation 0x1
-#undef  ObjectNameInformation
-#define ObjectNameInformation 1
-#undef  ProcessIoPriority
-#define ProcessIoPriority 33
-#undef  ProcessWow64Information
-#define ProcessWow64Information 26
-#undef  SystemProcessIdInformation
-#define SystemProcessIdInformation 88
-
-// process suspend() / resume()
-typedef enum _KTHREAD_STATE {
-    Initialized,
-    Ready,
-    Running,
-    Standby,
-    Terminated,
-    Waiting,
-    Transition,
-    DeferredReady,
-    GateWait,
-    MaximumThreadState
-} KTHREAD_STATE, *PKTHREAD_STATE;
-
-typedef enum _KWAIT_REASON {
-    Executive,
-    FreePage,
-    PageIn,
-    PoolAllocation,
-    DelayExecution,
-    Suspended,
-    UserRequest,
-    WrExecutive,
-    WrFreePage,
-    WrPageIn,
-    WrPoolAllocation,
-    WrDelayExecution,
-    WrSuspended,
-    WrUserRequest,
-    WrEventPair,
-    WrQueue,
-    WrLpcReceive,
-    WrLpcReply,
-    WrVirtualMemory,
-    WrPageOut,
-    WrRendezvous,
-    WrKeyedEvent,
-    WrTerminated,
-    WrProcessInSwap,
-    WrCpuRateControl,
-    WrCalloutStack,
-    WrKernel,
-    WrResource,
-    WrPushLock,
-    WrMutex,
-    WrQuantumEnd,
-    WrDispatchInt,
-    WrPreempted,
-    WrYieldExecution,
-    WrFastMutex,
-    WrGuardedMutex,
-    WrRundown,
-    WrAlertByThreadId,
-    WrDeferredPreempt,
-    MaximumWaitReason
-} KWAIT_REASON, *PKWAIT_REASON;
-
-// ================================================================
-// Structs.
-// ================================================================
-
-// cpu_stats(), per_cpu_times()
-typedef struct {
-    LARGE_INTEGER IdleTime;
-    LARGE_INTEGER KernelTime;
-    LARGE_INTEGER UserTime;
-    LARGE_INTEGER DpcTime;
-    LARGE_INTEGER InterruptTime;
-    ULONG InterruptCount;
-} _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
-
-// cpu_stats()
-typedef struct {
-    LARGE_INTEGER IdleProcessTime;
-    LARGE_INTEGER IoReadTransferCount;
-    LARGE_INTEGER IoWriteTransferCount;
-    LARGE_INTEGER IoOtherTransferCount;
-    ULONG IoReadOperationCount;
-    ULONG IoWriteOperationCount;
-    ULONG IoOtherOperationCount;
-    ULONG AvailablePages;
-    ULONG CommittedPages;
-    ULONG CommitLimit;
-    ULONG PeakCommitment;
-    ULONG PageFaultCount;
-    ULONG CopyOnWriteCount;
-    ULONG TransitionCount;
-    ULONG CacheTransitionCount;
-    ULONG DemandZeroCount;
-    ULONG PageReadCount;
-    ULONG PageReadIoCount;
-    ULONG CacheReadCount;
-    ULONG CacheIoCount;
-    ULONG DirtyPagesWriteCount;
-    ULONG DirtyWriteIoCount;
-    ULONG MappedPagesWriteCount;
-    ULONG MappedWriteIoCount;
-    ULONG PagedPoolPages;
-    ULONG NonPagedPoolPages;
-    ULONG PagedPoolAllocs;
-    ULONG PagedPoolFrees;
-    ULONG NonPagedPoolAllocs;
-    ULONG NonPagedPoolFrees;
-    ULONG FreeSystemPtes;
-    ULONG ResidentSystemCodePage;
-    ULONG TotalSystemDriverPages;
-    ULONG TotalSystemCodePages;
-    ULONG NonPagedPoolLookasideHits;
-    ULONG PagedPoolLookasideHits;
-    ULONG AvailablePagedPoolPages;
-    ULONG ResidentSystemCachePage;
-    ULONG ResidentPagedPoolPage;
-    ULONG ResidentSystemDriverPage;
-    ULONG CcFastReadNoWait;
-    ULONG CcFastReadWait;
-    ULONG CcFastReadResourceMiss;
-    ULONG CcFastReadNotPossible;
-    ULONG CcFastMdlReadNoWait;
-    ULONG CcFastMdlReadWait;
-    ULONG CcFastMdlReadResourceMiss;
-    ULONG CcFastMdlReadNotPossible;
-    ULONG CcMapDataNoWait;
-    ULONG CcMapDataWait;
-    ULONG CcMapDataNoWaitMiss;
-    ULONG CcMapDataWaitMiss;
-    ULONG CcPinMappedDataCount;
-    ULONG CcPinReadNoWait;
-    ULONG CcPinReadWait;
-    ULONG CcPinReadNoWaitMiss;
-    ULONG CcPinReadWaitMiss;
-    ULONG CcCopyReadNoWait;
-    ULONG CcCopyReadWait;
-    ULONG CcCopyReadNoWaitMiss;
-    ULONG CcCopyReadWaitMiss;
-    ULONG CcMdlReadNoWait;
-    ULONG CcMdlReadWait;
-    ULONG CcMdlReadNoWaitMiss;
-    ULONG CcMdlReadWaitMiss;
-    ULONG CcReadAheadIos;
-    ULONG CcLazyWriteIos;
-    ULONG CcLazyWritePages;
-    ULONG CcDataFlushes;
-    ULONG CcDataPages;
-    ULONG ContextSwitches;
-    ULONG FirstLevelTbFills;
-    ULONG SecondLevelTbFills;
-    ULONG SystemCalls;
-} _SYSTEM_PERFORMANCE_INFORMATION;
-
-// cpu_stats()
-typedef struct {
-    ULONG ContextSwitches;
-    ULONG DpcCount;
-    ULONG DpcRate;
-    ULONG TimeIncrement;
-    ULONG DpcBypassCount;
-    ULONG ApcBypassCount;
-} _SYSTEM_INTERRUPT_INFORMATION;
-
-typedef struct _SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX {
-    PVOID Object;
-    HANDLE UniqueProcessId;
-    HANDLE HandleValue;
-    ULONG GrantedAccess;
-    USHORT CreatorBackTraceIndex;
-    USHORT ObjectTypeIndex;
-    ULONG HandleAttributes;
-    ULONG Reserved;
-} SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX, *PSYSTEM_HANDLE_TABLE_ENTRY_INFO_EX;
-
-typedef struct _SYSTEM_HANDLE_INFORMATION_EX {
-    ULONG_PTR NumberOfHandles;
-    ULONG_PTR Reserved;
-    SYSTEM_HANDLE_TABLE_ENTRY_INFO_EX Handles[1];
-} SYSTEM_HANDLE_INFORMATION_EX, *PSYSTEM_HANDLE_INFORMATION_EX;
-
-typedef struct _CLIENT_ID2 {
-    HANDLE UniqueProcess;
-    HANDLE UniqueThread;
-} CLIENT_ID2, *PCLIENT_ID2;
-
-#define CLIENT_ID CLIENT_ID2
-#define PCLIENT_ID PCLIENT_ID2
-
-typedef struct _SYSTEM_THREAD_INFORMATION2 {
-    LARGE_INTEGER KernelTime;
-    LARGE_INTEGER UserTime;
-    LARGE_INTEGER CreateTime;
-    ULONG WaitTime;
-    PVOID StartAddress;
-    CLIENT_ID ClientId;
-    LONG Priority;
-    LONG BasePriority;
-    ULONG ContextSwitches;
-    ULONG ThreadState;
-    KWAIT_REASON WaitReason;
-} SYSTEM_THREAD_INFORMATION2, *PSYSTEM_THREAD_INFORMATION2;
-
-#define SYSTEM_THREAD_INFORMATION SYSTEM_THREAD_INFORMATION2
-#define PSYSTEM_THREAD_INFORMATION PSYSTEM_THREAD_INFORMATION2
-
-typedef struct _SYSTEM_PROCESS_INFORMATION2 {
-    ULONG NextEntryOffset;
-    ULONG NumberOfThreads;
-    LARGE_INTEGER SpareLi1;
-    LARGE_INTEGER SpareLi2;
-    LARGE_INTEGER SpareLi3;
-    LARGE_INTEGER CreateTime;
-    LARGE_INTEGER UserTime;
-    LARGE_INTEGER KernelTime;
-    UNICODE_STRING ImageName;
-    LONG BasePriority;
-    HANDLE UniqueProcessId;
-    HANDLE InheritedFromUniqueProcessId;
-    ULONG HandleCount;
-    ULONG SessionId;
-    ULONG_PTR PageDirectoryBase;
-    SIZE_T PeakVirtualSize;
-    SIZE_T VirtualSize;
-    DWORD PageFaultCount;
-    SIZE_T PeakWorkingSetSize;
-    SIZE_T WorkingSetSize;
-    SIZE_T QuotaPeakPagedPoolUsage;
-    SIZE_T QuotaPagedPoolUsage;
-    SIZE_T QuotaPeakNonPagedPoolUsage;
-    SIZE_T QuotaNonPagedPoolUsage;
-    SIZE_T PagefileUsage;
-    SIZE_T PeakPagefileUsage;
-    SIZE_T PrivatePageCount;
-    LARGE_INTEGER ReadOperationCount;
-    LARGE_INTEGER WriteOperationCount;
-    LARGE_INTEGER OtherOperationCount;
-    LARGE_INTEGER ReadTransferCount;
-    LARGE_INTEGER WriteTransferCount;
-    LARGE_INTEGER OtherTransferCount;
-    SYSTEM_THREAD_INFORMATION Threads[1];
-} SYSTEM_PROCESS_INFORMATION2, *PSYSTEM_PROCESS_INFORMATION2;
-
-#define SYSTEM_PROCESS_INFORMATION SYSTEM_PROCESS_INFORMATION2
-#define PSYSTEM_PROCESS_INFORMATION PSYSTEM_PROCESS_INFORMATION2
-
-// cpu_freq()
-typedef struct _PROCESSOR_POWER_INFORMATION {
-   ULONG Number;
-   ULONG MaxMhz;
-   ULONG CurrentMhz;
-   ULONG MhzLimit;
-   ULONG MaxIdleState;
-   ULONG CurrentIdleState;
-} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
-
-#ifndef __IPHLPAPI_H__
-typedef struct in6_addr {
-    union {
-        UCHAR Byte[16];
-        USHORT Word[8];
-    } u;
-} IN6_ADDR, *PIN6_ADDR, FAR *LPIN6_ADDR;
-#endif
-
-// PEB / cmdline(), cwd(), environ()
-typedef struct {
-    BYTE Reserved1[16];
-    PVOID Reserved2[5];
-    UNICODE_STRING CurrentDirectoryPath;
-    PVOID CurrentDirectoryHandle;
-    UNICODE_STRING DllPath;
-    UNICODE_STRING ImagePathName;
-    UNICODE_STRING CommandLine;
-    LPCWSTR env;
-} RTL_USER_PROCESS_PARAMETERS_, *PRTL_USER_PROCESS_PARAMETERS_;
-
-// users()
-typedef struct _WINSTATION_INFO {
-    BYTE Reserved1[72];
-    ULONG SessionId;
-    BYTE Reserved2[4];
-    FILETIME ConnectTime;
-    FILETIME DisconnectTime;
-    FILETIME LastInputTime;
-    FILETIME LoginTime;
-    BYTE Reserved3[1096];
-    FILETIME CurrentTime;
-} WINSTATION_INFO, *PWINSTATION_INFO;
-
-// cpu_count_phys()
-#if (_WIN32_WINNT < 0x0601)  // Windows < 7 (Vista and XP)
-typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX {
-    LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
-    DWORD Size;
-    _ANONYMOUS_UNION
-    union {
-        PROCESSOR_RELATIONSHIP Processor;
-        NUMA_NODE_RELATIONSHIP NumaNode;
-        CACHE_RELATIONSHIP Cache;
-        GROUP_RELATIONSHIP Group;
-    } DUMMYUNIONNAME;
-} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, \
-    *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;
-#endif
-
-// memory_uss()
-typedef struct _MEMORY_WORKING_SET_BLOCK {
-    ULONG_PTR Protection : 5;
-    ULONG_PTR ShareCount : 3;
-    ULONG_PTR Shared : 1;
-    ULONG_PTR Node : 3;
-#ifdef _WIN64
-    ULONG_PTR VirtualPage : 52;
-#else
-    ULONG VirtualPage : 20;
-#endif
-} MEMORY_WORKING_SET_BLOCK, *PMEMORY_WORKING_SET_BLOCK;
-
-// memory_uss()
-typedef struct _MEMORY_WORKING_SET_INFORMATION {
-    ULONG_PTR NumberOfEntries;
-    MEMORY_WORKING_SET_BLOCK WorkingSetInfo[1];
-} MEMORY_WORKING_SET_INFORMATION, *PMEMORY_WORKING_SET_INFORMATION;
-
-// memory_uss()
-typedef struct _PSUTIL_PROCESS_WS_COUNTERS {
-    SIZE_T NumberOfPages;
-    SIZE_T NumberOfPrivatePages;
-    SIZE_T NumberOfSharedPages;
-    SIZE_T NumberOfShareablePages;
-} PSUTIL_PROCESS_WS_COUNTERS, *PPSUTIL_PROCESS_WS_COUNTERS;
-
-// exe()
-typedef struct _SYSTEM_PROCESS_ID_INFORMATION {
-    HANDLE ProcessId;
-    UNICODE_STRING ImageName;
-} SYSTEM_PROCESS_ID_INFORMATION, *PSYSTEM_PROCESS_ID_INFORMATION;
-
-// ====================================================================
-// PEB structs for cmdline(), cwd(), environ()
-// ====================================================================
-
-#ifdef _WIN64
-typedef struct {
-    BYTE Reserved1[2];
-    BYTE BeingDebugged;
-    BYTE Reserved2[21];
-    PVOID LoaderData;
-    PRTL_USER_PROCESS_PARAMETERS_ ProcessParameters;
-    // more fields...
-} PEB_;
-
-// When we are a 64 bit process accessing a 32 bit (WoW64)
-// process we need to use the 32 bit structure layout.
-typedef struct {
-    USHORT Length;
-    USHORT MaxLength;
-    DWORD Buffer;
-} UNICODE_STRING32;
-
-typedef struct {
-    BYTE Reserved1[16];
-    DWORD Reserved2[5];
-    UNICODE_STRING32 CurrentDirectoryPath;
-    DWORD CurrentDirectoryHandle;
-    UNICODE_STRING32 DllPath;
-    UNICODE_STRING32 ImagePathName;
-    UNICODE_STRING32 CommandLine;
-    DWORD env;
-} RTL_USER_PROCESS_PARAMETERS32;
-
-typedef struct {
-    BYTE Reserved1[2];
-    BYTE BeingDebugged;
-    BYTE Reserved2[1];
-    DWORD Reserved3[2];
-    DWORD Ldr;
-    DWORD ProcessParameters;
-    // more fields...
-} PEB32;
-#else  // ! _WIN64
-typedef struct {
-    BYTE Reserved1[2];
-    BYTE BeingDebugged;
-    BYTE Reserved2[1];
-    PVOID Reserved3[2];
-    PVOID Ldr;
-    PRTL_USER_PROCESS_PARAMETERS_ ProcessParameters;
-    // more fields...
-} PEB_;
-
-// When we are a 32 bit (WoW64) process accessing a 64 bit process
-// we need to use the 64 bit structure layout and a special function
-// to read its memory.
-typedef NTSTATUS (NTAPI *_NtWow64ReadVirtualMemory64)(
-    HANDLE ProcessHandle,
-    PVOID64 BaseAddress,
-    PVOID Buffer,
-    ULONG64 Size,
-    PULONG64 NumberOfBytesRead);
-
-typedef struct {
-    PVOID Reserved1[2];
-    PVOID64 PebBaseAddress;
-    PVOID Reserved2[4];
-    PVOID UniqueProcessId[2];
-    PVOID Reserved3[2];
-} PROCESS_BASIC_INFORMATION64;
-
-typedef struct {
-    USHORT Length;
-    USHORT MaxLength;
-    PVOID64 Buffer;
-} UNICODE_STRING64;
-
-typedef struct {
-    BYTE Reserved1[16];
-    PVOID64 Reserved2[5];
-    UNICODE_STRING64 CurrentDirectoryPath;
-    PVOID64 CurrentDirectoryHandle;
-    UNICODE_STRING64 DllPath;
-    UNICODE_STRING64 ImagePathName;
-    UNICODE_STRING64 CommandLine;
-    PVOID64 env;
-} RTL_USER_PROCESS_PARAMETERS64;
-
-typedef struct {
-    BYTE Reserved1[2];
-    BYTE BeingDebugged;
-    BYTE Reserved2[21];
-    PVOID64 LoaderData;
-    PVOID64 ProcessParameters;
-    // more fields...
-} PEB64;
-#endif  // _WIN64
-
-// ================================================================
-// Type defs for modules loaded at runtime.
-// ================================================================
-
-BOOL (WINAPI *_GetLogicalProcessorInformationEx) (
-    LOGICAL_PROCESSOR_RELATIONSHIP relationship,
-    PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer,
-    PDWORD ReturnLength);
-
-#define GetLogicalProcessorInformationEx _GetLogicalProcessorInformationEx
-
-BOOLEAN (WINAPI * _WinStationQueryInformationW) (
-    HANDLE ServerHandle,
-    ULONG SessionId,
-    WINSTATIONINFOCLASS WinStationInformationClass,
-    PVOID pWinStationInformation,
-    ULONG WinStationInformationLength,
-    PULONG pReturnLength);
-
-#define WinStationQueryInformationW _WinStationQueryInformationW
-
-NTSTATUS (NTAPI *_NtQueryInformationProcess) (
-    HANDLE ProcessHandle,
-    DWORD ProcessInformationClass,
-    PVOID ProcessInformation,
-    DWORD ProcessInformationLength,
-    PDWORD ReturnLength);
-
-#define NtQueryInformationProcess _NtQueryInformationProcess
-
-NTSTATUS (NTAPI *_NtQuerySystemInformation) (
-    ULONG SystemInformationClass,
-    PVOID SystemInformation,
-    ULONG SystemInformationLength,
-    PULONG ReturnLength);
-
-#define NtQuerySystemInformation _NtQuerySystemInformation
-
-NTSTATUS (NTAPI *_NtSetInformationProcess) (
-    HANDLE ProcessHandle,
-    DWORD ProcessInformationClass,
-    PVOID ProcessInformation,
-    DWORD ProcessInformationLength);
-
-#define NtSetInformationProcess _NtSetInformationProcess
-
-PSTR (NTAPI * _RtlIpv4AddressToStringA) (
-    struct in_addr *Addr,
-    PSTR S);
-
-#define RtlIpv4AddressToStringA _RtlIpv4AddressToStringA
-
-PSTR (NTAPI * _RtlIpv6AddressToStringA) (
-    struct in6_addr *Addr,
-    PSTR P);
-
-#define RtlIpv6AddressToStringA _RtlIpv6AddressToStringA
-
-DWORD (WINAPI * _GetExtendedTcpTable) (
-    PVOID pTcpTable,
-    PDWORD pdwSize,
-    BOOL bOrder,
-    ULONG ulAf,
-    TCP_TABLE_CLASS TableClass,
-    ULONG Reserved);
-
-#define GetExtendedTcpTable _GetExtendedTcpTable
-
-DWORD (WINAPI * _GetExtendedUdpTable) (
-    PVOID pUdpTable,
-    PDWORD pdwSize,
-    BOOL bOrder,
-    ULONG ulAf,
-    UDP_TABLE_CLASS TableClass,
-    ULONG Reserved);
-
-#define GetExtendedUdpTable _GetExtendedUdpTable
-
-DWORD (CALLBACK *_GetActiveProcessorCount) (
-    WORD GroupNumber);
-
-#define GetActiveProcessorCount _GetActiveProcessorCount
-
-ULONGLONG (CALLBACK *_GetTickCount64) (
-    void);
-
-#define GetTickCount64 _GetTickCount64
-
-NTSTATUS (NTAPI *_NtQueryObject) (
-    HANDLE Handle,
-    OBJECT_INFORMATION_CLASS ObjectInformationClass,
-    PVOID ObjectInformation,
-    ULONG ObjectInformationLength,
-    PULONG ReturnLength);
-
-#define NtQueryObject _NtQueryObject
-
-NTSTATUS (WINAPI *_RtlGetVersion) (
-    PRTL_OSVERSIONINFOW lpVersionInformation
-);
-
-#define RtlGetVersion _RtlGetVersion
-
-NTSTATUS (WINAPI *_NtResumeProcess) (
-    HANDLE hProcess
-);
-
-#define NtResumeProcess _NtResumeProcess
-
-NTSTATUS (WINAPI *_NtSuspendProcess) (
-    HANDLE hProcess
-);
-
-#define NtSuspendProcess _NtSuspendProcess
-
-NTSTATUS (NTAPI *_NtQueryVirtualMemory) (
-    HANDLE ProcessHandle,
-    PVOID BaseAddress,
-    int MemoryInformationClass,
-    PVOID MemoryInformation,
-    SIZE_T MemoryInformationLength,
-    PSIZE_T ReturnLength
-);
-
-#define NtQueryVirtualMemory _NtQueryVirtualMemory
-
-ULONG (WINAPI *_RtlNtStatusToDosErrorNoTeb) (
-    NTSTATUS status
-);
-
-#define RtlNtStatusToDosErrorNoTeb _RtlNtStatusToDosErrorNoTeb
-
-#endif // __NTEXTAPI_H__
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_handles.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_handles.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_handles.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_handles.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/*
- * This module retrieves handles opened by a process.
- * We use NtQuerySystemInformation to enumerate them and NtQueryObject
- * to obtain the corresponding file name.
- * Since NtQueryObject hangs for certain handle types we call it in a
- * separate thread which gets killed if it doesn't complete within 100ms.
- * This is a limitation of the Windows API and ProcessHacker uses the
- * same trick: https://github.com/giampaolo/psutil/pull/597
- *
- * CREDITS: original implementation was written by Jeff Tang.
- * It was then rewritten by Giampaolo Rodola many years later.
- * Utility functions for getting the file handles and names were re-adapted
- * from the excellent ProcessHacker.
- */
-
-#include <windows.h>
-#include <Python.h>
-
-#include "../../_psutil_common.h"
-#include "process_utils.h"
-
-
-#define THREAD_TIMEOUT 100  // ms
-// Global object shared between the 2 threads.
-PUNICODE_STRING globalFileName = NULL;
-
-
-static int
-psutil_enum_handles(PSYSTEM_HANDLE_INFORMATION_EX *handles) {
-    static ULONG initialBufferSize = 0x10000;
-    NTSTATUS status;
-    PVOID buffer;
-    ULONG bufferSize;
-
-    bufferSize = initialBufferSize;
-    buffer = MALLOC_ZERO(bufferSize);
-    if (buffer == NULL) {
-        PyErr_NoMemory();
-        return 1;
-    }
-
-    while ((status = NtQuerySystemInformation(
-        SystemExtendedHandleInformation,
-        buffer,
-        bufferSize,
-        NULL
-        )) == STATUS_INFO_LENGTH_MISMATCH)
-    {
-        FREE(buffer);
-        bufferSize *= 2;
-
-        // Fail if we're resizing the buffer to something very large.
-        if (bufferSize > 256 * 1024 * 1024) {
-            PyErr_SetString(
-                PyExc_RuntimeError,
-                "SystemExtendedHandleInformation buffer too big");
-            return 1;
-        }
-
-        buffer = MALLOC_ZERO(bufferSize);
-        if (buffer == NULL) {
-            PyErr_NoMemory();
-            return 1;
-        }
-    }
-
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(status, "NtQuerySystemInformation");
-        FREE(buffer);
-        return 1;
-    }
-
-    *handles = (PSYSTEM_HANDLE_INFORMATION_EX)buffer;
-    return 0;
-}
-
-
-static int
-psutil_get_filename(LPVOID lpvParam) {
-    HANDLE hFile = *((HANDLE*)lpvParam);
-    NTSTATUS status;
-    ULONG bufferSize;
-    ULONG attempts = 8;
-
-    bufferSize = 0x200;
-    globalFileName = MALLOC_ZERO(bufferSize);
-    if (globalFileName == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-
-    // Note: also this is supposed to hang, hence why we do it in here.
-    if (GetFileType(hFile) != FILE_TYPE_DISK) {
-        SetLastError(0);
-        globalFileName->Length = 0;
-        return 0;
-    }
-
-    // A loop is needed because the I/O subsystem likes to give us the
-    // wrong return lengths...
-    do {
-        status = NtQueryObject(
-            hFile,
-            ObjectNameInformation,
-            globalFileName,
-            bufferSize,
-            &bufferSize
-            );
-        if (status == STATUS_BUFFER_OVERFLOW ||
-                status == STATUS_INFO_LENGTH_MISMATCH ||
-                status == STATUS_BUFFER_TOO_SMALL)
-        {
-            FREE(globalFileName);
-            globalFileName = MALLOC_ZERO(bufferSize);
-            if (globalFileName == NULL) {
-                PyErr_NoMemory();
-                goto error;
-            }
-        }
-        else {
-            break;
-        }
-    } while (--attempts);
-
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(status, "NtQuerySystemInformation");
-        FREE(globalFileName);
-        globalFileName = NULL;
-        return 1;
-    }
-
-    return 0;
-
-error:
-    if (globalFileName != NULL) {
-        FREE(globalFileName);
-        globalFileName = NULL;
-    }
-    return 1;
-}
-
-
-static DWORD
-psutil_threaded_get_filename(HANDLE hFile) {
-    DWORD dwWait;
-    HANDLE hThread;
-    DWORD threadRetValue;
-
-    hThread = CreateThread(
-        NULL, 0, (LPTHREAD_START_ROUTINE)psutil_get_filename, &hFile, 0, NULL);
-    if (hThread == NULL) {
-        PyErr_SetFromOSErrnoWithSyscall("CreateThread");
-        return 1;
-    }
-
-    // Wait for the worker thread to finish.
-    dwWait = WaitForSingleObject(hThread, THREAD_TIMEOUT);
-
-    // If the thread hangs, kill it and cleanup.
-    if (dwWait == WAIT_TIMEOUT) {
-        psutil_debug(
-            "get handle name thread timed out after %i ms", THREAD_TIMEOUT);
-        if (TerminateThread(hThread, 0) == 0) {
-            PyErr_SetFromOSErrnoWithSyscall("TerminateThread");
-            CloseHandle(hThread);
-            return 1;
-        }
-        CloseHandle(hThread);
-        return 0;
-    }
-
-    if (dwWait == WAIT_FAILED) {
-        psutil_debug("WaitForSingleObject -> WAIT_FAILED");
-        if (TerminateThread(hThread, 0) == 0) {
-            PyErr_SetFromOSErrnoWithSyscall(
-                "WaitForSingleObject -> WAIT_FAILED -> TerminateThread");
-            CloseHandle(hThread);
-            return 1;
-        }
-        PyErr_SetFromOSErrnoWithSyscall("WaitForSingleObject");
-        CloseHandle(hThread);
-        return 1;
-    }
-
-    if (GetExitCodeThread(hThread, &threadRetValue) == 0) {
-        if (TerminateThread(hThread, 0) == 0) {
-            PyErr_SetFromOSErrnoWithSyscall(
-                "GetExitCodeThread (failed) -> TerminateThread");
-            CloseHandle(hThread);
-            return 1;
-        }
-
-        CloseHandle(hThread);
-        PyErr_SetFromOSErrnoWithSyscall("GetExitCodeThread");
-        return 1;
-    }
-    CloseHandle(hThread);
-    return threadRetValue;
-}
-
-
-PyObject *
-psutil_get_open_files(DWORD dwPid, HANDLE hProcess) {
-    PSYSTEM_HANDLE_INFORMATION_EX       handlesList = NULL;
-    PSYSTEM_HANDLE_TABLE_ENTRY_INFO_EX  hHandle = NULL;
-    HANDLE                              hFile = NULL;
-    ULONG                               i = 0;
-    BOOLEAN                             errorOccurred = FALSE;
-    PyObject*                           py_path = NULL;
-    PyObject*                           py_retlist = PyList_New(0);;
-
-    if (!py_retlist)
-        return NULL;
-
-    // Due to the use of global variables, ensure only 1 call
-    // to psutil_get_open_files() is running.
-    EnterCriticalSection(&PSUTIL_CRITICAL_SECTION);
-
-    if (psutil_enum_handles(&handlesList) != 0)
-        goto error;
-
-    for (i = 0; i < handlesList->NumberOfHandles; i++) {
-        hHandle = &handlesList->Handles[i];
-        if ((ULONG_PTR)hHandle->UniqueProcessId != dwPid)
-            continue;
-        if (! DuplicateHandle(
-                hProcess,
-                hHandle->HandleValue,
-                GetCurrentProcess(),
-                &hFile,
-                0,
-                TRUE,
-                DUPLICATE_SAME_ACCESS))
-        {
-            // Will fail if not a regular file; just skip it.
-            continue;
-        }
-
-        // This will set *globalFileName* global variable.
-        if (psutil_threaded_get_filename(hFile) != 0)
-            goto error;
-
-        if (globalFileName->Length > 0) {
-            py_path = PyUnicode_FromWideChar(globalFileName->Buffer,
-                                             wcslen(globalFileName->Buffer));
-            if (! py_path)
-                goto error;
-            if (PyList_Append(py_retlist, py_path))
-                goto error;
-            Py_CLEAR(py_path);  // also sets to NULL
-        }
-
-        // Loop cleanup section.
-        if (globalFileName != NULL) {
-            FREE(globalFileName);
-            globalFileName = NULL;
-        }
-        CloseHandle(hFile);
-        hFile = NULL;
-    }
-
-    goto exit;
-
-error:
-    Py_XDECREF(py_retlist);
-    errorOccurred = TRUE;
-    goto exit;
-
-exit:
-    if (hFile != NULL)
-        CloseHandle(hFile);
-    if (globalFileName != NULL) {
-        FREE(globalFileName);
-        globalFileName = NULL;
-    }
-    if (py_path != NULL)
-        Py_DECREF(py_path);
-    if (handlesList != NULL)
-        FREE(handlesList);
-
-    LeaveCriticalSection(&PSUTIL_CRITICAL_SECTION);
-    if (errorOccurred == TRUE)
-        return NULL;
-    return py_retlist;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_handles.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_handles.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_handles.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_handles.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <windows.h>
-
-PyObject* psutil_get_open_files(DWORD pid, HANDLE hProcess);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_info.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_info.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_info.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_info.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,733 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Helper functions related to fetching process information. Used by
- * _psutil_windows module methods.
- */
-
-#include <Python.h>
-#include <windows.h>
-
-#include "../../_psutil_common.h"
-#include "process_info.h"
-#include "process_utils.h"
-
-
-#ifndef _WIN64
-typedef NTSTATUS (NTAPI *__NtQueryInformationProcess)(
-    HANDLE ProcessHandle,
-    DWORD ProcessInformationClass,
-    PVOID ProcessInformation,
-    DWORD ProcessInformationLength,
-    PDWORD ReturnLength);
-#endif
-
-
-/*
- * Given a pointer into a process's memory, figure out how much
- * data can be read from it.
- */
-static int
-psutil_get_process_region_size(HANDLE hProcess, LPCVOID src, SIZE_T *psize) {
-    MEMORY_BASIC_INFORMATION info;
-
-    if (!VirtualQueryEx(hProcess, src, &info, sizeof(info))) {
-        PyErr_SetFromOSErrnoWithSyscall("VirtualQueryEx");
-        return -1;
-    }
-
-    *psize = info.RegionSize - ((char*)src - (char*)info.BaseAddress);
-    return 0;
-}
-
-
-enum psutil_process_data_kind {
-    KIND_CMDLINE,
-    KIND_CWD,
-    KIND_ENVIRON,
-};
-
-
-/*
- * Get data from the process with the given pid.  The data is returned
- * in the pdata output member as a nul terminated string which must be
- * freed on success.
- * On success 0 is returned.  On error the output parameter is not touched,
- * -1 is returned, and an appropriate Python exception is set.
- */
-static int
-psutil_get_process_data(DWORD pid,
-                        enum psutil_process_data_kind kind,
-                        WCHAR **pdata,
-                        SIZE_T *psize) {
-    /* This function is quite complex because there are several cases to be
-       considered:
-
-       Two cases are really simple:  we (i.e. the python interpreter) and the
-       target process are both 32 bit or both 64 bit.  In that case the memory
-       layout of the structures matches up and all is well.
-
-       When we are 64 bit and the target process is 32 bit we need to use
-       custom 32 bit versions of the structures.
-
-       When we are 32 bit and the target process is 64 bit we need to use
-       custom 64 bit version of the structures.  Also we need to use separate
-       Wow64 functions to get the information.
-
-       A few helper structs are defined above so that the compiler can handle
-       calculating the correct offsets.
-
-       Additional help also came from the following sources:
-
-         https://github.com/kohsuke/winp and
-         http://wj32.org/wp/2009/01/24/howto-get-the-command-line-of-processes/
-         http://stackoverflow.com/a/14012919
-         http://www.drdobbs.com/embracing-64-bit-windows/184401966
-     */
-    SIZE_T size = 0;
-#ifndef _WIN64
-    static __NtQueryInformationProcess NtWow64QueryInformationProcess64 = NULL;
-    static _NtWow64ReadVirtualMemory64 NtWow64ReadVirtualMemory64 = NULL;
-#endif
-    HANDLE hProcess = NULL;
-    LPCVOID src;
-    WCHAR *buffer = NULL;
-#ifdef _WIN64
-    LPVOID ppeb32 = NULL;
-#else
-    PVOID64 src64;
-    BOOL weAreWow64;
-    BOOL theyAreWow64;
-#endif
-    DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ;
-    NTSTATUS status;
-
-    hProcess = psutil_handle_from_pid(pid, access);
-    if (hProcess == NULL)
-        return -1;
-
-#ifdef _WIN64
-    /* 64 bit case.  Check if the target is a 32 bit process running in WoW64
-     * mode. */
-    status = NtQueryInformationProcess(
-        hProcess,
-        ProcessWow64Information,
-        &ppeb32,
-        sizeof(LPVOID),
-        NULL);
-
-    if (!NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQueryInformationProcess(ProcessWow64Information)");
-        goto error;
-    }
-
-    if (ppeb32 != NULL) {
-        /* We are 64 bit.  Target process is 32 bit running in WoW64 mode. */
-        PEB32 peb32;
-        RTL_USER_PROCESS_PARAMETERS32 procParameters32;
-
-        // read PEB
-        if (!ReadProcessMemory(hProcess, ppeb32, &peb32, sizeof(peb32), NULL)) {
-            // May fail with ERROR_PARTIAL_COPY, see:
-            // https://github.com/giampaolo/psutil/issues/875
-            PyErr_SetFromWindowsErr(0);
-            goto error;
-        }
-
-        // read process parameters
-        if (!ReadProcessMemory(hProcess,
-                               UlongToPtr(peb32.ProcessParameters),
-                               &procParameters32,
-                               sizeof(procParameters32),
-                               NULL))
-        {
-            // May fail with ERROR_PARTIAL_COPY, see:
-            // https://github.com/giampaolo/psutil/issues/875
-            PyErr_SetFromWindowsErr(0);
-            goto error;
-        }
-
-        switch (kind) {
-            case KIND_CMDLINE:
-                src = UlongToPtr(procParameters32.CommandLine.Buffer),
-                size = procParameters32.CommandLine.Length;
-                break;
-            case KIND_CWD:
-                src = UlongToPtr(procParameters32.CurrentDirectoryPath.Buffer);
-                size = procParameters32.CurrentDirectoryPath.Length;
-                break;
-            case KIND_ENVIRON:
-                src = UlongToPtr(procParameters32.env);
-                break;
-        }
-    } else
-#else
-    /* 32 bit case.  Check if the target is also 32 bit. */
-    if (!IsWow64Process(GetCurrentProcess(), &weAreWow64) ||
-            !IsWow64Process(hProcess, &theyAreWow64)) {
-        PyErr_SetFromOSErrnoWithSyscall("IsWow64Process");
-        goto error;
-    }
-
-    if (weAreWow64 && !theyAreWow64) {
-        /* We are 32 bit running in WoW64 mode.  Target process is 64 bit. */
-        PROCESS_BASIC_INFORMATION64 pbi64;
-        PEB64 peb64;
-        RTL_USER_PROCESS_PARAMETERS64 procParameters64;
-
-        if (NtWow64QueryInformationProcess64 == NULL) {
-            NtWow64QueryInformationProcess64 = \
-                psutil_GetProcAddressFromLib(
-                    "ntdll.dll", "NtWow64QueryInformationProcess64");
-            if (NtWow64QueryInformationProcess64 == NULL) {
-                PyErr_Clear();
-                AccessDenied("can't query 64-bit process in 32-bit-WoW mode");
-                goto error;
-            }
-        }
-        if (NtWow64ReadVirtualMemory64 == NULL) {
-            NtWow64ReadVirtualMemory64 = \
-                psutil_GetProcAddressFromLib(
-                    "ntdll.dll", "NtWow64ReadVirtualMemory64");
-            if (NtWow64ReadVirtualMemory64 == NULL) {
-                PyErr_Clear();
-                AccessDenied("can't query 64-bit process in 32-bit-WoW mode");
-                goto error;
-            }
-        }
-
-        status = NtWow64QueryInformationProcess64(
-                hProcess,
-                ProcessBasicInformation,
-                &pbi64,
-                sizeof(pbi64),
-                NULL);
-        if (!NT_SUCCESS(status)) {
-            psutil_SetFromNTStatusErr(
-                    status,
-                    "NtWow64QueryInformationProcess64(ProcessBasicInformation)"
-            );
-            goto error;
-        }
-
-        // read peb
-        status = NtWow64ReadVirtualMemory64(
-                hProcess,
-                pbi64.PebBaseAddress,
-                &peb64,
-                sizeof(peb64),
-                NULL);
-        if (!NT_SUCCESS(status)) {
-            psutil_SetFromNTStatusErr(status, "NtWow64ReadVirtualMemory64");
-            goto error;
-        }
-
-        // read process parameters
-        status = NtWow64ReadVirtualMemory64(
-                hProcess,
-                peb64.ProcessParameters,
-                &procParameters64,
-                sizeof(procParameters64),
-                NULL);
-        if (!NT_SUCCESS(status)) {
-            psutil_SetFromNTStatusErr(
-                    status,
-                    "NtWow64ReadVirtualMemory64(ProcessParameters)"
-            );
-            goto error;
-        }
-
-        switch (kind) {
-            case KIND_CMDLINE:
-                src64 = procParameters64.CommandLine.Buffer;
-                size = procParameters64.CommandLine.Length;
-                break;
-            case KIND_CWD:
-                src64 = procParameters64.CurrentDirectoryPath.Buffer,
-                size = procParameters64.CurrentDirectoryPath.Length;
-                break;
-            case KIND_ENVIRON:
-                src64 = procParameters64.env;
-                break;
-        }
-    } else
-#endif
-    /* Target process is of the same bitness as us. */
-    {
-        PROCESS_BASIC_INFORMATION pbi;
-        PEB_ peb;
-        RTL_USER_PROCESS_PARAMETERS_ procParameters;
-
-        status = NtQueryInformationProcess(
-            hProcess,
-            ProcessBasicInformation,
-            &pbi,
-            sizeof(pbi),
-            NULL);
-
-        if (!NT_SUCCESS(status)) {
-            psutil_SetFromNTStatusErr(
-                status, "NtQueryInformationProcess(ProcessBasicInformation)");
-            goto error;
-        }
-
-
-        // read peb
-        if (!ReadProcessMemory(hProcess,
-                               pbi.PebBaseAddress,
-                               &peb,
-                               sizeof(peb),
-                               NULL))
-        {
-            // May fail with ERROR_PARTIAL_COPY, see:
-            // https://github.com/giampaolo/psutil/issues/875
-            PyErr_SetFromWindowsErr(0);
-            goto error;
-        }
-
-        // read process parameters
-        if (!ReadProcessMemory(hProcess,
-                               peb.ProcessParameters,
-                               &procParameters,
-                               sizeof(procParameters),
-                               NULL))
-        {
-            // May fail with ERROR_PARTIAL_COPY, see:
-            // https://github.com/giampaolo/psutil/issues/875
-            PyErr_SetFromWindowsErr(0);
-            goto error;
-        }
-
-        switch (kind) {
-            case KIND_CMDLINE:
-                src = procParameters.CommandLine.Buffer;
-                size = procParameters.CommandLine.Length;
-                break;
-            case KIND_CWD:
-                src = procParameters.CurrentDirectoryPath.Buffer;
-                size = procParameters.CurrentDirectoryPath.Length;
-                break;
-            case KIND_ENVIRON:
-                src = procParameters.env;
-                break;
-        }
-    }
-
-    if (kind == KIND_ENVIRON) {
-#ifndef _WIN64
-        if (weAreWow64 && !theyAreWow64) {
-            AccessDenied("can't query 64-bit process in 32-bit-WoW mode");
-            goto error;
-        }
-        else
-#endif
-        if (psutil_get_process_region_size(hProcess, src, &size) != 0)
-            goto error;
-    }
-
-    buffer = calloc(size + 2, 1);
-    if (buffer == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-#ifndef _WIN64
-    if (weAreWow64 && !theyAreWow64) {
-        status = NtWow64ReadVirtualMemory64(
-                hProcess,
-                src64,
-                buffer,
-                size,
-                NULL);
-        if (!NT_SUCCESS(status)) {
-            psutil_SetFromNTStatusErr(status, "NtWow64ReadVirtualMemory64");
-            goto error;
-        }
-    } else
-#endif
-    if (!ReadProcessMemory(hProcess, src, buffer, size, NULL)) {
-        // May fail with ERROR_PARTIAL_COPY, see:
-        // https://github.com/giampaolo/psutil/issues/875
-        PyErr_SetFromWindowsErr(0);
-        goto error;
-    }
-
-    CloseHandle(hProcess);
-
-    *pdata = buffer;
-    *psize = size;
-
-    return 0;
-
-error:
-    if (hProcess != NULL)
-        CloseHandle(hProcess);
-    if (buffer != NULL)
-        free(buffer);
-    return -1;
-}
-
-
-/*
- * Get process cmdline by using NtQueryInformationProcess. This is a
- * method alternative to PEB which is less likely to result in
- * AccessDenied. Requires Windows 8.1+.
- */
-static int
-psutil_cmdline_query_proc(DWORD pid, WCHAR **pdata, SIZE_T *psize) {
-    HANDLE hProcess = NULL;
-    ULONG bufLen = 0;
-    NTSTATUS status;
-    char * buffer = NULL;
-    WCHAR * bufWchar = NULL;
-    PUNICODE_STRING tmp = NULL;
-    size_t size;
-    int ProcessCommandLineInformation = 60;
-
-    if (PSUTIL_WINVER < PSUTIL_WINDOWS_8_1) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "requires Windows 8.1+");
-        goto error;
-    }
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (hProcess == NULL)
-        goto error;
-
-    // get the right buf size
-    status = NtQueryInformationProcess(
-        hProcess,
-        ProcessCommandLineInformation,
-        NULL,
-        0,
-        &bufLen);
-
-    // https://github.com/giampaolo/psutil/issues/1501
-    if (status == STATUS_NOT_FOUND) {
-        AccessDenied("NtQueryInformationProcess(ProcessBasicInformation) -> "
-                     "STATUS_NOT_FOUND translated into PermissionError");
-        goto error;
-    }
-
-    if (status != STATUS_BUFFER_OVERFLOW && \
-            status != STATUS_BUFFER_TOO_SMALL && \
-            status != STATUS_INFO_LENGTH_MISMATCH) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQueryInformationProcess(ProcessBasicInformation)");
-        goto error;
-    }
-
-    // allocate memory
-    buffer = calloc(bufLen, 1);
-    if (buffer == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // get the cmdline
-    status = NtQueryInformationProcess(
-        hProcess,
-        ProcessCommandLineInformation,
-        buffer,
-        bufLen,
-        &bufLen
-    );
-    if (!NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQueryInformationProcess(ProcessCommandLineInformation)");
-        goto error;
-    }
-
-    // build the string
-    tmp = (PUNICODE_STRING)buffer;
-    size = wcslen(tmp->Buffer) + 1;
-    bufWchar = (WCHAR *)calloc(size, sizeof(WCHAR));
-    if (bufWchar == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    wcscpy_s(bufWchar, size, tmp->Buffer);
-    *pdata = bufWchar;
-    *psize = size * sizeof(WCHAR);
-    free(buffer);
-    CloseHandle(hProcess);
-    return 0;
-
-error:
-    if (buffer != NULL)
-        free(buffer);
-    if (hProcess != NULL)
-        CloseHandle(hProcess);
-    return -1;
-}
-
-
-/*
- * Return a Python list representing the arguments for the process
- * with given pid or NULL on error.
- */
-PyObject *
-psutil_get_cmdline(DWORD pid, int use_peb) {
-    PyObject *ret = NULL;
-    WCHAR *data = NULL;
-    SIZE_T size;
-    PyObject *py_retlist = NULL;
-    PyObject *py_unicode = NULL;
-    LPWSTR *szArglist = NULL;
-    int nArgs, i;
-    int func_ret;
-
-    /*
-    Reading the PEB to get the cmdline seem to be the best method if
-    somebody has tampered with the parameters after creating the process.
-    For instance, create a process as suspended, patch the command line
-    in its PEB and unfreeze it. It requires more privileges than
-    NtQueryInformationProcess though (the fallback):
-    - https://github.com/giampaolo/psutil/pull/1398
-    - https://blog.xpnsec.com/how-to-argue-like-cobalt-strike/
-    */
-    if (use_peb == 1)
-        func_ret = psutil_get_process_data(pid, KIND_CMDLINE, &data, &size);
-    else
-        func_ret = psutil_cmdline_query_proc(pid, &data, &size);
-    if (func_ret != 0)
-        goto out;
-
-    // attempt to parse the command line using Win32 API
-    szArglist = CommandLineToArgvW(data, &nArgs);
-    if (szArglist == NULL) {
-        PyErr_SetFromOSErrnoWithSyscall("CommandLineToArgvW");
-        goto out;
-    }
-
-    // arglist parsed as array of UNICODE_STRING, so convert each to
-    // Python string object and add to arg list
-    py_retlist = PyList_New(nArgs);
-    if (py_retlist == NULL)
-        goto out;
-    for (i = 0; i < nArgs; i++) {
-        py_unicode = PyUnicode_FromWideChar(szArglist[i],
-            wcslen(szArglist[i]));
-        if (py_unicode == NULL)
-            goto out;
-        PyList_SET_ITEM(py_retlist, i, py_unicode);
-        py_unicode = NULL;
-    }
-    ret = py_retlist;
-    py_retlist = NULL;
-
-out:
-    if (szArglist != NULL)
-        LocalFree(szArglist);
-    if (data != NULL)
-        free(data);
-    Py_XDECREF(py_unicode);
-    Py_XDECREF(py_retlist);
-    return ret;
-}
-
-
-PyObject *
-psutil_get_cwd(DWORD pid) {
-    PyObject *ret = NULL;
-    WCHAR *data = NULL;
-    SIZE_T size;
-
-    if (psutil_get_process_data(pid, KIND_CWD, &data, &size) != 0)
-        goto out;
-
-    // convert wchar array to a Python unicode string
-    ret = PyUnicode_FromWideChar(data, wcslen(data));
-
-out:
-    if (data != NULL)
-        free(data);
-
-    return ret;
-}
-
-
-/*
- * returns a Python string containing the environment variable data for the
- * process with given pid or NULL on error.
- */
-PyObject *
-psutil_get_environ(DWORD pid) {
-    PyObject *ret = NULL;
-    WCHAR *data = NULL;
-    SIZE_T size;
-
-    if (psutil_get_process_data(pid, KIND_ENVIRON, &data, &size) != 0)
-        goto out;
-
-    // convert wchar array to a Python unicode string
-    ret = PyUnicode_FromWideChar(data, size / 2);
-
-out:
-    if (data != NULL)
-        free(data);
-    return ret;
-}
-
-
-/*
- * Given a process PID and a PSYSTEM_PROCESS_INFORMATION structure
- * fills the structure with various process information in one shot
- * by using NtQuerySystemInformation.
- * We use this as a fallback when faster functions fail with access
- * denied. This is slower because it iterates over all processes
- * but it doesn't require any privilege (also work for PID 0).
- * On success return 1, else 0 with Python exception already set.
- */
-int
-psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
-                     PVOID *retBuffer) {
-    static ULONG initialBufferSize = 0x4000;
-    NTSTATUS status;
-    PVOID buffer;
-    ULONG bufferSize;
-    PSYSTEM_PROCESS_INFORMATION process;
-
-    bufferSize = initialBufferSize;
-    buffer = malloc(bufferSize);
-    if (buffer == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    while (TRUE) {
-        status = NtQuerySystemInformation(
-            SystemProcessInformation,
-            buffer,
-            bufferSize,
-            &bufferSize);
-        if (status == STATUS_BUFFER_TOO_SMALL ||
-                status == STATUS_INFO_LENGTH_MISMATCH)
-        {
-            free(buffer);
-            buffer = malloc(bufferSize);
-            if (buffer == NULL) {
-                PyErr_NoMemory();
-                goto error;
-            }
-        }
-        else {
-            break;
-        }
-    }
-
-    if (! NT_SUCCESS(status)) {
-        psutil_SetFromNTStatusErr(
-            status, "NtQuerySystemInformation(SystemProcessInformation)");
-        goto error;
-    }
-
-    if (bufferSize <= 0x20000)
-        initialBufferSize = bufferSize;
-
-    process = PSUTIL_FIRST_PROCESS(buffer);
-    do {
-        if ((ULONG_PTR)process->UniqueProcessId == pid) {
-            *retProcess = process;
-            *retBuffer = buffer;
-            return 1;
-        }
-    } while ((process = PSUTIL_NEXT_PROCESS(process)));
-
-    NoSuchProcess("NtQuerySystemInformation (no PID found)");
-    goto error;
-
-error:
-    if (buffer != NULL)
-        free(buffer);
-    return 0;
-}
-
-
-/*
- * Get various process information by using NtQuerySystemInformation.
- * We use this as a fallback when faster functions fail with access
- * denied. This is slower because it iterates over all processes.
- * Returned tuple includes the following process info:
- *
- * - num_threads()
- * - ctx_switches()
- * - num_handles() (fallback)
- * - cpu_times() (fallback)
- * - create_time() (fallback)
- * - io_counters() (fallback)
- * - memory_info() (fallback)
- */
-PyObject *
-psutil_proc_info(PyObject *self, PyObject *args) {
-    DWORD pid;
-    PSYSTEM_PROCESS_INFORMATION process;
-    PVOID buffer;
-    ULONG i;
-    ULONG ctx_switches = 0;
-    double user_time;
-    double kernel_time;
-    double create_time;
-    PyObject *py_retlist;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (! psutil_get_proc_info(pid, &process, &buffer))
-        return NULL;
-
-    for (i = 0; i < process->NumberOfThreads; i++)
-        ctx_switches += process->Threads[i].ContextSwitches;
-    user_time = (double)process->UserTime.HighPart * HI_T + \
-                (double)process->UserTime.LowPart * LO_T;
-    kernel_time = (double)process->KernelTime.HighPart * HI_T + \
-                    (double)process->KernelTime.LowPart * LO_T;
-
-    // Convert the LARGE_INTEGER union to a Unix time.
-    // It's the best I could find by googling and borrowing code here
-    // and there. The time returned has a precision of 1 second.
-    if (0 == pid || 4 == pid) {
-        // the python module will translate this into BOOT_TIME later
-        create_time = 0;
-    }
-    else {
-        create_time = psutil_LargeIntegerToUnixTime(process->CreateTime);
-    }
-
-    py_retlist = Py_BuildValue(
-#if defined(_WIN64)
-        "kkdddiKKKKKK" "kKKKKKKKKK",
-#else
-        "kkdddiKKKKKK" "kIIIIIIIII",
-#endif
-        process->HandleCount,                   // num handles
-        ctx_switches,                           // num ctx switches
-        user_time,                              // cpu user time
-        kernel_time,                            // cpu kernel time
-        create_time,                            // create time
-        (int)process->NumberOfThreads,          // num threads
-        // IO counters
-        process->ReadOperationCount.QuadPart,   // io rcount
-        process->WriteOperationCount.QuadPart,  // io wcount
-        process->ReadTransferCount.QuadPart,    // io rbytes
-        process->WriteTransferCount.QuadPart,   // io wbytes
-        process->OtherOperationCount.QuadPart,  // io others count
-        process->OtherTransferCount.QuadPart,   // io others bytes
-        // memory
-        process->PageFaultCount,                // num page faults
-        process->PeakWorkingSetSize,            // peak wset
-        process->WorkingSetSize,                // wset
-        process->QuotaPeakPagedPoolUsage,       // peak paged pool
-        process->QuotaPagedPoolUsage,           // paged pool
-        process->QuotaPeakNonPagedPoolUsage,    // peak non paged pool
-        process->QuotaNonPagedPoolUsage,        // non paged pool
-        process->PagefileUsage,                 // pagefile
-        process->PeakPagefileUsage,             // peak pagefile
-        process->PrivatePageCount               // private
-    );
-
-    free(buffer);
-    return py_retlist;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_info.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_info.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_info.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_info.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-#define PSUTIL_FIRST_PROCESS(Processes) ( \
-    (PSYSTEM_PROCESS_INFORMATION)(Processes))
-#define PSUTIL_NEXT_PROCESS(Process) ( \
-   ((PSYSTEM_PROCESS_INFORMATION)(Process))->NextEntryOffset ? \
-   (PSYSTEM_PROCESS_INFORMATION)((PCHAR)(Process) + \
-        ((PSYSTEM_PROCESS_INFORMATION)(Process))->NextEntryOffset) : NULL)
-
-int psutil_get_proc_info(DWORD pid, PSYSTEM_PROCESS_INFORMATION *retProcess,
-                         PVOID *retBuffer);
-PyObject* psutil_get_cmdline(DWORD pid, int use_peb);
-PyObject* psutil_get_cwd(DWORD pid);
-PyObject* psutil_get_environ(DWORD pid);
-PyObject* psutil_proc_info(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_utils.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_utils.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_utils.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_utils.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Helper process functions.
- */
-
-#include <Python.h>
-#include <windows.h>
-#include <Psapi.h>  // EnumProcesses
-
-#include "../../_psutil_common.h"
-#include "process_utils.h"
-
-
-DWORD *
-psutil_get_pids(DWORD *numberOfReturnedPIDs) {
-    // Win32 SDK says the only way to know if our process array
-    // wasn't large enough is to check the returned size and make
-    // sure that it doesn't match the size of the array.
-    // If it does we allocate a larger array and try again
-
-    // Stores the actual array
-    DWORD *procArray = NULL;
-    DWORD procArrayByteSz;
-    int procArraySz = 0;
-
-    // Stores the byte size of the returned array from enumprocesses
-    DWORD enumReturnSz = 0;
-
-    do {
-        procArraySz += 1024;
-        if (procArray != NULL)
-            free(procArray);
-        procArrayByteSz = procArraySz * sizeof(DWORD);
-        procArray = malloc(procArrayByteSz);
-        if (procArray == NULL) {
-            PyErr_NoMemory();
-            return NULL;
-        }
-        if (! EnumProcesses(procArray, procArrayByteSz, &enumReturnSz)) {
-            free(procArray);
-            PyErr_SetFromWindowsErr(0);
-            return NULL;
-        }
-    } while (enumReturnSz == procArraySz * sizeof(DWORD));
-
-    // The number of elements is the returned size / size of each element
-    *numberOfReturnedPIDs = enumReturnSz / sizeof(DWORD);
-
-    return procArray;
-}
-
-
-// Return 1 if PID exists, 0 if not, -1 on error.
-int
-psutil_pid_in_pids(DWORD pid) {
-    DWORD *proclist = NULL;
-    DWORD numberOfReturnedPIDs;
-    DWORD i;
-
-    proclist = psutil_get_pids(&numberOfReturnedPIDs);
-    if (proclist == NULL)
-        return -1;
-    for (i = 0; i < numberOfReturnedPIDs; i++) {
-        if (proclist[i] == pid) {
-            free(proclist);
-            return 1;
-        }
-    }
-    free(proclist);
-    return 0;
-}
-
-
-// Given a process handle checks whether it's actually running. If it
-// does return the handle, else return NULL with Python exception set.
-// This is needed because OpenProcess API sucks.
-HANDLE
-psutil_check_phandle(HANDLE hProcess, DWORD pid) {
-    DWORD exitCode;
-
-    if (hProcess == NULL) {
-        if (GetLastError() == ERROR_INVALID_PARAMETER) {
-            // Yeah, this is the actual error code in case of
-            // "no such process".
-            NoSuchProcess("OpenProcess");
-            return NULL;
-        }
-        PyErr_SetFromOSErrnoWithSyscall("OpenProcess");
-        return NULL;
-    }
-
-    if (GetExitCodeProcess(hProcess, &exitCode)) {
-        // XXX - maybe STILL_ACTIVE is not fully reliable as per:
-        // http://stackoverflow.com/questions/1591342/#comment47830782_1591379
-        if (exitCode == STILL_ACTIVE) {
-            return hProcess;
-        }
-        if (psutil_pid_in_pids(pid) == 1) {
-            return hProcess;
-        }
-        CloseHandle(hProcess);
-        NoSuchProcess("GetExitCodeProcess != STILL_ACTIVE");
-        return NULL;
-    }
-
-    if (GetLastError() == ERROR_ACCESS_DENIED) {
-        psutil_debug("GetExitCodeProcess -> ERROR_ACCESS_DENIED (ignored)");
-        SetLastError(0);
-        return hProcess;
-    }
-    PyErr_SetFromOSErrnoWithSyscall("GetExitCodeProcess");
-    CloseHandle(hProcess);
-    return NULL;
-}
-
-
-// A wrapper around OpenProcess setting NSP exception if process no
-// longer exists. *pid* is the process PID, *access* is the first
-// argument to OpenProcess.
-// Return a process handle or NULL with exception set.
-HANDLE
-psutil_handle_from_pid(DWORD pid, DWORD access) {
-    HANDLE hProcess;
-
-    if (pid == 0) {
-        // otherwise we'd get NoSuchProcess
-        return AccessDenied("automatically set for PID 0");
-    }
-
-    hProcess = OpenProcess(access, FALSE, pid);
-
-    if ((hProcess == NULL) && (GetLastError() == ERROR_ACCESS_DENIED)) {
-        PyErr_SetFromOSErrnoWithSyscall("OpenProcess");
-        return NULL;
-    }
-
-    hProcess = psutil_check_phandle(hProcess, pid);
-    return hProcess;
-}
-
-
-// Check for PID existance. Return 1 if pid exists, 0 if not, -1 on error.
-int
-psutil_pid_is_running(DWORD pid) {
-    HANDLE hProcess;
-
-    // Special case for PID 0 System Idle Process
-    if (pid == 0)
-        return 1;
-    if (pid < 0)
-        return 0;
-
-    hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid);
-
-    // Access denied means there's a process to deny access to.
-    if ((hProcess == NULL) && (GetLastError() == ERROR_ACCESS_DENIED))
-        return 1;
-
-    hProcess = psutil_check_phandle(hProcess, pid);
-    if (hProcess != NULL) {
-        CloseHandle(hProcess);
-        return 1;
-    }
-
-    CloseHandle(hProcess);
-    PyErr_Clear();
-    return psutil_pid_in_pids(pid);
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_utils.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_utils.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/process_utils.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/process_utils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-DWORD* psutil_get_pids(DWORD *numberOfReturnedPIDs);
-HANDLE psutil_handle_from_pid(DWORD pid, DWORD dwDesiredAccess);
-int psutil_pid_is_running(DWORD pid);
-int psutil_assert_pid_exists(DWORD pid, char *err);
-int psutil_assert_pid_not_exists(DWORD pid, char *err);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/security.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/security.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/security.c	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/security.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Security related functions for Windows platform (Set privileges such as
- * SE DEBUG).
- */
-
-#include <windows.h>
-#include <Python.h>
-
-#include "../../_psutil_common.h"
-
-
-static BOOL
-psutil_set_privilege(HANDLE hToken, LPCTSTR Privilege, BOOL bEnablePrivilege) {
-    TOKEN_PRIVILEGES tp;
-    LUID luid;
-    TOKEN_PRIVILEGES tpPrevious;
-    DWORD cbPrevious = sizeof(TOKEN_PRIVILEGES);
-
-    if (! LookupPrivilegeValue(NULL, Privilege, &luid)) {
-        PyErr_SetFromOSErrnoWithSyscall("LookupPrivilegeValue");
-        return 1;
-    }
-
-    // first pass.  get current privilege setting
-    tp.PrivilegeCount = 1;
-    tp.Privileges[0].Luid = luid;
-    tp.Privileges[0].Attributes = 0;
-
-    if (! AdjustTokenPrivileges(
-            hToken,
-            FALSE,
-            &tp,
-            sizeof(TOKEN_PRIVILEGES),
-            &tpPrevious,
-            &cbPrevious))
-    {
-        PyErr_SetFromOSErrnoWithSyscall("AdjustTokenPrivileges");
-        return 1;
-    }
-
-    // Second pass. Set privilege based on previous setting.
-    tpPrevious.PrivilegeCount = 1;
-    tpPrevious.Privileges[0].Luid = luid;
-
-    if (bEnablePrivilege)
-        tpPrevious.Privileges[0].Attributes |= (SE_PRIVILEGE_ENABLED);
-    else
-        tpPrevious.Privileges[0].Attributes ^=
-            (SE_PRIVILEGE_ENABLED & tpPrevious.Privileges[0].Attributes);
-
-    if (! AdjustTokenPrivileges(
-            hToken,
-            FALSE,
-            &tpPrevious,
-            cbPrevious,
-            NULL,
-            NULL))
-    {
-        PyErr_SetFromOSErrnoWithSyscall("AdjustTokenPrivileges");
-        return 1;
-    }
-
-    return 0;
-}
-
-
-static HANDLE
-psutil_get_thisproc_token() {
-    HANDLE hToken = NULL;
-    HANDLE me = GetCurrentProcess();
-
-    if (! OpenProcessToken(
-            me, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
-    {
-        if (GetLastError() == ERROR_NO_TOKEN)
-        {
-            if (! ImpersonateSelf(SecurityImpersonation)) {
-                PyErr_SetFromOSErrnoWithSyscall("ImpersonateSelf");
-                return NULL;
-            }
-            if (! OpenProcessToken(
-                    me, TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
-            {
-                PyErr_SetFromOSErrnoWithSyscall("OpenProcessToken");
-                return NULL;
-            }
-        }
-        else {
-            PyErr_SetFromOSErrnoWithSyscall("OpenProcessToken");
-            return NULL;
-        }
-    }
-
-    return hToken;
-}
-
-
-static void
-psutil_print_err() {
-    char *msg = "psutil module couldn't set SE DEBUG mode for this process; " \
-        "please file an issue against psutil bug tracker";
-    psutil_debug(msg);
-    if (GetLastError() != ERROR_ACCESS_DENIED)
-        PyErr_WarnEx(PyExc_RuntimeWarning, msg, 1);
-    PyErr_Clear();
-}
-
-
-/*
- * Set this process in SE DEBUG mode so that we have more chances of
- * querying processes owned by other users, including many owned by
- * Administrator and Local System.
- * https://docs.microsoft.com/windows-hardware/drivers/debugger/debug-privilege
- * This is executed on module import and we don't crash on error.
- */
-int
-psutil_set_se_debug() {
-    HANDLE hToken;
-
-    if ((hToken = psutil_get_thisproc_token()) == NULL) {
-        // "return 1;" to get an exception
-        psutil_print_err();
-        return 0;
-    }
-
-    if (psutil_set_privilege(hToken, SE_DEBUG_NAME, TRUE) != 0) {
-        // "return 1;" to get an exception
-        psutil_print_err();
-    }
-
-    RevertToSelf();
-    CloseHandle(hToken);
-    return 0;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/security.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/security.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/security.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/security.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Security related functions for Windows platform (Set privileges such as
- * SeDebug), as well as security helper functions.
- */
-
-#include <windows.h>
-
-int psutil_set_se_debug();
-
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/services.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/services.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/services.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/services.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <windows.h>
-#include <Winsvc.h>
-
-#include "../../_psutil_common.h"
-#include "services.h"
-
-
-// ==================================================================
-// utils
-// ==================================================================
-
-SC_HANDLE
-psutil_get_service_handler(char *service_name, DWORD scm_access, DWORD access)
-{
-    SC_HANDLE sc = NULL;
-    SC_HANDLE hService = NULL;
-
-    sc = OpenSCManager(NULL, NULL, scm_access);
-    if (sc == NULL) {
-        PyErr_SetFromOSErrnoWithSyscall("OpenSCManager");
-        return NULL;
-    }
-    hService = OpenService(sc, service_name, access);
-    if (hService == NULL) {
-        PyErr_SetFromOSErrnoWithSyscall("OpenService");
-        CloseServiceHandle(sc);
-        return NULL;
-    }
-    CloseServiceHandle(sc);
-    return hService;
-}
-
-
-// XXX - expose these as constants?
-static const char *
-get_startup_string(DWORD startup) {
-    switch (startup) {
-        case SERVICE_AUTO_START:
-            return "automatic";
-        case SERVICE_DEMAND_START:
-            return "manual";
-        case SERVICE_DISABLED:
-            return "disabled";
-/*
-        // drivers only (since we use EnumServicesStatusEx() with
-        // SERVICE_WIN32)
-        case SERVICE_BOOT_START:
-            return "boot-start";
-        case SERVICE_SYSTEM_START:
-            return "system-start";
-*/
-        default:
-            return "unknown";
-    }
-}
-
-
-// XXX - expose these as constants?
-static const char *
-get_state_string(DWORD state) {
-    switch (state) {
-        case SERVICE_RUNNING:
-            return "running";
-        case SERVICE_PAUSED:
-            return "paused";
-        case SERVICE_START_PENDING:
-            return "start_pending";
-        case SERVICE_PAUSE_PENDING:
-            return "pause_pending";
-        case SERVICE_CONTINUE_PENDING:
-            return "continue_pending";
-        case SERVICE_STOP_PENDING:
-            return "stop_pending";
-        case SERVICE_STOPPED:
-            return "stopped";
-        default:
-            return "unknown";
-    }
-}
-
-
-// ==================================================================
-// APIs
-// ==================================================================
-
-/*
- * Enumerate all services.
- */
-PyObject *
-psutil_winservice_enumerate(PyObject *self, PyObject *args) {
-    ENUM_SERVICE_STATUS_PROCESSW *lpService = NULL;
-    BOOL ok;
-    SC_HANDLE sc = NULL;
-    DWORD bytesNeeded = 0;
-    DWORD srvCount;
-    DWORD resumeHandle = 0;
-    DWORD dwBytes = 0;
-    DWORD i;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_name = NULL;
-    PyObject *py_display_name = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    sc = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE);
-    if (sc == NULL) {
-        PyErr_SetFromOSErrnoWithSyscall("OpenSCManager");
-        return NULL;
-    }
-
-    for (;;) {
-        ok = EnumServicesStatusExW(
-            sc,
-            SC_ENUM_PROCESS_INFO,
-            SERVICE_WIN32,  // XXX - extend this to include drivers etc.?
-            SERVICE_STATE_ALL,
-            (LPBYTE)lpService,
-            dwBytes,
-            &bytesNeeded,
-            &srvCount,
-            &resumeHandle,
-            NULL);
-        if (ok || (GetLastError() != ERROR_MORE_DATA))
-            break;
-        if (lpService)
-            free(lpService);
-        dwBytes = bytesNeeded;
-        lpService = (ENUM_SERVICE_STATUS_PROCESSW*)malloc(dwBytes);
-    }
-
-    for (i = 0; i < srvCount; i++) {
-        // Get unicode name / display name.
-        py_name = NULL;
-        py_name = PyUnicode_FromWideChar(
-            lpService[i].lpServiceName, wcslen(lpService[i].lpServiceName));
-        if (py_name == NULL)
-            goto error;
-
-        py_display_name = NULL;
-        py_display_name = PyUnicode_FromWideChar(
-            lpService[i].lpDisplayName, wcslen(lpService[i].lpDisplayName));
-        if (py_display_name == NULL)
-            goto error;
-
-        // Construct the result.
-        py_tuple = Py_BuildValue("(OO)", py_name, py_display_name);
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_display_name);
-        Py_DECREF(py_name);
-        Py_DECREF(py_tuple);
-    }
-
-    // Free resources.
-    CloseServiceHandle(sc);
-    free(lpService);
-    return py_retlist;
-
-error:
-    Py_DECREF(py_name);
-    Py_XDECREF(py_display_name);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (sc != NULL)
-        CloseServiceHandle(sc);
-    if (lpService != NULL)
-        free(lpService);
-    return NULL;
-}
-
-
-/*
- * Get service config information. Returns:
- * - display_name
- * - binpath
- * - username
- * - startup_type
- */
-PyObject *
-psutil_winservice_query_config(PyObject *self, PyObject *args) {
-    char *service_name;
-    SC_HANDLE hService = NULL;
-    BOOL ok;
-    DWORD bytesNeeded = 0;
-    QUERY_SERVICE_CONFIGW *qsc = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_unicode_display_name = NULL;
-    PyObject *py_unicode_binpath = NULL;
-    PyObject *py_unicode_username = NULL;
-
-    if (!PyArg_ParseTuple(args, "s", &service_name))
-        return NULL;
-    hService = psutil_get_service_handler(
-        service_name, SC_MANAGER_ENUMERATE_SERVICE, SERVICE_QUERY_CONFIG);
-    if (hService == NULL)
-        goto error;
-
-    // First call to QueryServiceConfigW() is necessary to get the
-    // right size.
-    bytesNeeded = 0;
-    QueryServiceConfigW(hService, NULL, 0, &bytesNeeded);
-    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceConfigW");
-        goto error;
-    }
-    qsc = (QUERY_SERVICE_CONFIGW *)malloc(bytesNeeded);
-    ok = QueryServiceConfigW(hService, qsc, bytesNeeded, &bytesNeeded);
-    if (ok == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceConfigW");
-        goto error;
-    }
-
-    // Get unicode display name.
-    py_unicode_display_name = PyUnicode_FromWideChar(
-        qsc->lpDisplayName, wcslen(qsc->lpDisplayName));
-    if (py_unicode_display_name == NULL)
-        goto error;
-
-    // Get unicode bin path.
-    py_unicode_binpath = PyUnicode_FromWideChar(
-        qsc->lpBinaryPathName, wcslen(qsc->lpBinaryPathName));
-    if (py_unicode_binpath == NULL)
-        goto error;
-
-    // Get unicode username.
-    py_unicode_username = PyUnicode_FromWideChar(
-        qsc->lpServiceStartName, wcslen(qsc->lpServiceStartName));
-    if (py_unicode_username == NULL)
-        goto error;
-
-    // Construct result tuple.
-    py_tuple = Py_BuildValue(
-        "(OOOs)",
-        py_unicode_display_name,
-        py_unicode_binpath,
-        py_unicode_username,
-        get_startup_string(qsc->dwStartType)  // startup
-    );
-    if (py_tuple == NULL)
-        goto error;
-
-    // Free resources.
-    Py_DECREF(py_unicode_display_name);
-    Py_DECREF(py_unicode_binpath);
-    Py_DECREF(py_unicode_username);
-    free(qsc);
-    CloseServiceHandle(hService);
-    return py_tuple;
-
-error:
-    Py_XDECREF(py_unicode_display_name);
-    Py_XDECREF(py_unicode_binpath);
-    Py_XDECREF(py_unicode_username);
-    Py_XDECREF(py_tuple);
-    if (hService != NULL)
-        CloseServiceHandle(hService);
-    if (qsc != NULL)
-        free(qsc);
-    return NULL;
-}
-
-
-/*
- * Get service status information. Returns:
- * - status
- * - pid
- */
-PyObject *
-psutil_winservice_query_status(PyObject *self, PyObject *args) {
-    char *service_name;
-    SC_HANDLE hService = NULL;
-    BOOL ok;
-    DWORD bytesNeeded = 0;
-    SERVICE_STATUS_PROCESS  *ssp = NULL;
-    PyObject *py_tuple = NULL;
-
-    if (!PyArg_ParseTuple(args, "s", &service_name))
-        return NULL;
-    hService = psutil_get_service_handler(
-        service_name, SC_MANAGER_ENUMERATE_SERVICE, SERVICE_QUERY_STATUS);
-    if (hService == NULL)
-        goto error;
-
-    // First call to QueryServiceStatusEx() is necessary to get the
-    // right size.
-    QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, NULL, 0,
-                         &bytesNeeded);
-    if (GetLastError() == ERROR_MUI_FILE_NOT_FOUND) {
-        // Also services.msc fails in the same manner, so we return an
-        // empty string.
-        CloseServiceHandle(hService);
-        return Py_BuildValue("s", "");
-    }
-    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceStatusEx");
-        goto error;
-    }
-    ssp = (SERVICE_STATUS_PROCESS *)HeapAlloc(
-        GetProcessHeap(), 0, bytesNeeded);
-    if (ssp == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // Actual call.
-    ok = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (LPBYTE)ssp,
-                              bytesNeeded, &bytesNeeded);
-    if (ok == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceStatusEx");
-        goto error;
-    }
-
-    py_tuple = Py_BuildValue(
-        "(sk)",
-        get_state_string(ssp->dwCurrentState),
-        ssp->dwProcessId
-    );
-    if (py_tuple == NULL)
-        goto error;
-
-    CloseServiceHandle(hService);
-    HeapFree(GetProcessHeap(), 0, ssp);
-    return py_tuple;
-
-error:
-    Py_XDECREF(py_tuple);
-    if (hService != NULL)
-        CloseServiceHandle(hService);
-    if (ssp != NULL)
-        HeapFree(GetProcessHeap(), 0, ssp);
-    return NULL;
-}
-
-
-/*
- * Get service description.
- */
-PyObject *
-psutil_winservice_query_descr(PyObject *self, PyObject *args) {
-    ENUM_SERVICE_STATUS_PROCESSW *lpService = NULL;
-    BOOL ok;
-    DWORD bytesNeeded = 0;
-    SC_HANDLE hService = NULL;
-    SERVICE_DESCRIPTIONW *scd = NULL;
-    char *service_name;
-    PyObject *py_retstr = NULL;
-
-    if (!PyArg_ParseTuple(args, "s", &service_name))
-        return NULL;
-    hService = psutil_get_service_handler(
-        service_name, SC_MANAGER_ENUMERATE_SERVICE, SERVICE_QUERY_CONFIG);
-    if (hService == NULL)
-        goto error;
-
-    // This first call to QueryServiceConfig2W() is necessary in order
-    // to get the right size.
-    bytesNeeded = 0;
-    QueryServiceConfig2W(hService, SERVICE_CONFIG_DESCRIPTION, NULL, 0,
-                         &bytesNeeded);
-    if (GetLastError() == ERROR_MUI_FILE_NOT_FOUND) {
-        // Also services.msc fails in the same manner, so we return an
-        // empty string.
-        CloseServiceHandle(hService);
-        return Py_BuildValue("s", "");
-    }
-    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceConfig2W");
-        goto error;
-    }
-
-    scd = (SERVICE_DESCRIPTIONW *)malloc(bytesNeeded);
-    ok = QueryServiceConfig2W(hService, SERVICE_CONFIG_DESCRIPTION,
-                              (LPBYTE)scd, bytesNeeded, &bytesNeeded);
-    if (ok == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("QueryServiceConfig2W");
-        goto error;
-    }
-
-    if (scd->lpDescription == NULL) {
-        py_retstr = Py_BuildValue("s", "");
-    }
-    else {
-        py_retstr = PyUnicode_FromWideChar(
-            scd->lpDescription,  wcslen(scd->lpDescription));
-    }
-    if (!py_retstr)
-        goto error;
-
-    free(scd);
-    CloseServiceHandle(hService);
-    return py_retstr;
-
-error:
-    if (hService != NULL)
-        CloseServiceHandle(hService);
-    if (lpService != NULL)
-        free(lpService);
-    return NULL;
-}
-
-
-/*
- * Start service.
- * XXX - note: this is exposed but not used.
- */
-PyObject *
-psutil_winservice_start(PyObject *self, PyObject *args) {
-    char *service_name;
-    BOOL ok;
-    SC_HANDLE hService = NULL;
-
-    if (!PyArg_ParseTuple(args, "s", &service_name))
-        return NULL;
-    hService = psutil_get_service_handler(
-        service_name, SC_MANAGER_ALL_ACCESS, SERVICE_START);
-    if (hService == NULL) {
-        goto error;
-    }
-    ok = StartService(hService, 0, NULL);
-    if (ok == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("StartService");
-        goto error;
-    }
-
-    Py_RETURN_NONE;
-
-error:
-    if (hService != NULL)
-        CloseServiceHandle(hService);
-    return NULL;
-}
-
-
-/*
- * Stop service.
- * XXX - note: this is exposed but not used.
- */
-PyObject *
-psutil_winservice_stop(PyObject *self, PyObject *args) {
-    char *service_name;
-    BOOL ok;
-    SC_HANDLE hService = NULL;
-    SERVICE_STATUS ssp;
-
-    if (!PyArg_ParseTuple(args, "s", &service_name))
-        return NULL;
-    hService = psutil_get_service_handler(
-        service_name, SC_MANAGER_ALL_ACCESS, SERVICE_STOP);
-    if (hService == NULL)
-        goto error;
-
-    // Note: this can hang for 30 secs.
-    Py_BEGIN_ALLOW_THREADS
-    ok = ControlService(hService, SERVICE_CONTROL_STOP, &ssp);
-    Py_END_ALLOW_THREADS
-    if (ok == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("ControlService");
-        goto error;
-    }
-
-    CloseServiceHandle(hService);
-    Py_RETURN_NONE;
-
-error:
-    if (hService != NULL)
-        CloseServiceHandle(hService);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/services.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/services.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/services.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/services.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-#include <Winsvc.h>
-
-SC_HANDLE psutil_get_service_handle(
-    char service_name, DWORD scm_access, DWORD access);
-PyObject *psutil_winservice_enumerate(PyObject *self, PyObject *args);
-PyObject *psutil_winservice_query_config(PyObject *self, PyObject *args);
-PyObject *psutil_winservice_query_status(PyObject *self, PyObject *args);
-PyObject *psutil_winservice_query_descr(PyObject *self, PyObject *args);
-PyObject *psutil_winservice_start(PyObject *self, PyObject *args);
-PyObject *psutil_winservice_stop(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/socks.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/socks.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/socks.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/socks.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// Fixes clash between winsock2.h and windows.h
-#define WIN32_LEAN_AND_MEAN
-
-#include <Python.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-
-#include "../../_psutil_common.h"
-#include "process_utils.h"
-
-
-#define BYTESWAP_USHORT(x) ((((USHORT)(x) << 8) | ((USHORT)(x) >> 8)) & 0xffff)
-#define STATUS_UNSUCCESSFUL 0xC0000001
-
-ULONG g_TcpTableSize = 0;
-ULONG g_UdpTableSize = 0;
-
-
-// Note about GetExtended[Tcp|Udp]Table syscalls: due to other processes
-// being active on the machine, it's possible that the size of the table
-// increases between the moment we query the size and the moment we query
-// the data. Therefore we retry if that happens. See:
-// https://github.com/giampaolo/psutil/pull/1335
-// https://github.com/giampaolo/psutil/issues/1294
-// A global and ever increasing size is used in order to avoid calling
-// GetExtended[Tcp|Udp]Table twice per call (faster).
-
-
-static PVOID __GetExtendedTcpTable(ULONG family) {
-    DWORD err;
-    PVOID table;
-    ULONG size;
-    TCP_TABLE_CLASS class = TCP_TABLE_OWNER_PID_ALL;
-
-    size = g_TcpTableSize;
-    if (size == 0) {
-        GetExtendedTcpTable(NULL, &size, FALSE, family, class, 0);
-        // reserve 25% more space
-        size = size + (size / 2 / 2);
-        g_TcpTableSize = size;
-    }
-
-    table = malloc(size);
-    if (table == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    err = GetExtendedTcpTable(table, &size, FALSE, family, class, 0);
-    if (err == NO_ERROR)
-        return table;
-
-    free(table);
-    if (err == ERROR_INSUFFICIENT_BUFFER || err == STATUS_UNSUCCESSFUL) {
-        psutil_debug("GetExtendedTcpTable: retry with different bufsize");
-        g_TcpTableSize = 0;
-        return __GetExtendedTcpTable(family);
-    }
-
-    PyErr_SetString(PyExc_RuntimeError, "GetExtendedTcpTable failed");
-    return NULL;
-}
-
-
-static PVOID __GetExtendedUdpTable(ULONG family) {
-    DWORD err;
-    PVOID table;
-    ULONG size;
-    UDP_TABLE_CLASS class = UDP_TABLE_OWNER_PID;
-
-    size = g_UdpTableSize;
-    if (size == 0) {
-        GetExtendedUdpTable(NULL, &size, FALSE, family, class, 0);
-        // reserve 25% more space
-        size = size + (size / 2 / 2);
-        g_UdpTableSize = size;
-    }
-
-    table = malloc(size);
-    if (table == NULL) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-
-    err = GetExtendedUdpTable(table, &size, FALSE, family, class, 0);
-    if (err == NO_ERROR)
-        return table;
-
-    free(table);
-    if (err == ERROR_INSUFFICIENT_BUFFER || err == STATUS_UNSUCCESSFUL) {
-        psutil_debug("GetExtendedUdpTable: retry with different bufsize");
-        g_UdpTableSize = 0;
-        return __GetExtendedUdpTable(family);
-    }
-
-    PyErr_SetString(PyExc_RuntimeError, "GetExtendedUdpTable failed");
-    return NULL;
-}
-
-
-#define psutil_conn_decref_objs() \
-    Py_DECREF(_AF_INET); \
-    Py_DECREF(_AF_INET6);\
-    Py_DECREF(_SOCK_STREAM);\
-    Py_DECREF(_SOCK_DGRAM);
-
-
-/*
- * Return a list of network connections opened by a process
- */
-PyObject *
-psutil_net_connections(PyObject *self, PyObject *args) {
-    static long null_address[4] = { 0, 0, 0, 0 };
-    DWORD pid;
-    int pid_return;
-    PVOID table = NULL;
-    PMIB_TCPTABLE_OWNER_PID tcp4Table;
-    PMIB_UDPTABLE_OWNER_PID udp4Table;
-    PMIB_TCP6TABLE_OWNER_PID tcp6Table;
-    PMIB_UDP6TABLE_OWNER_PID udp6Table;
-    ULONG i;
-    CHAR addressBufferLocal[65];
-    CHAR addressBufferRemote[65];
-
-    PyObject *py_retlist = NULL;
-    PyObject *py_conn_tuple = NULL;
-    PyObject *py_af_filter = NULL;
-    PyObject *py_type_filter = NULL;
-    PyObject *py_addr_tuple_local = NULL;
-    PyObject *py_addr_tuple_remote = NULL;
-    PyObject *_AF_INET = PyLong_FromLong((long)AF_INET);
-    PyObject *_AF_INET6 = PyLong_FromLong((long)AF_INET6);
-    PyObject *_SOCK_STREAM = PyLong_FromLong((long)SOCK_STREAM);
-    PyObject *_SOCK_DGRAM = PyLong_FromLong((long)SOCK_DGRAM);
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "OO", &pid, &py_af_filter,
-                           &py_type_filter))
-    {
-        goto error;
-    }
-
-    if (!PySequence_Check(py_af_filter) || !PySequence_Check(py_type_filter)) {
-        psutil_conn_decref_objs();
-        PyErr_SetString(PyExc_TypeError, "arg 2 or 3 is not a sequence");
-        return NULL;
-    }
-
-    if (pid != -1) {
-        pid_return = psutil_pid_is_running(pid);
-        if (pid_return == 0) {
-            psutil_conn_decref_objs();
-            return NoSuchProcess("psutil_pid_is_running");
-        }
-        else if (pid_return == -1) {
-            psutil_conn_decref_objs();
-            return NULL;
-        }
-    }
-
-    py_retlist = PyList_New(0);
-    if (py_retlist == NULL) {
-        psutil_conn_decref_objs();
-        return NULL;
-    }
-
-    // TCP IPv4
-
-    if ((PySequence_Contains(py_af_filter, _AF_INET) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1))
-    {
-        table = NULL;
-        py_conn_tuple = NULL;
-        py_addr_tuple_local = NULL;
-        py_addr_tuple_remote = NULL;
-
-        table = __GetExtendedTcpTable(AF_INET);
-        if (table == NULL)
-            goto error;
-        tcp4Table = table;
-        for (i = 0; i < tcp4Table->dwNumEntries; i++) {
-            if (pid != -1) {
-                if (tcp4Table->table[i].dwOwningPid != pid) {
-                    continue;
-                }
-            }
-
-            if (tcp4Table->table[i].dwLocalAddr != 0 ||
-                    tcp4Table->table[i].dwLocalPort != 0)
-            {
-                struct in_addr addr;
-
-                addr.S_un.S_addr = tcp4Table->table[i].dwLocalAddr;
-                RtlIpv4AddressToStringA(&addr, addressBufferLocal);
-                py_addr_tuple_local = Py_BuildValue(
-                    "(si)",
-                    addressBufferLocal,
-                    BYTESWAP_USHORT(tcp4Table->table[i].dwLocalPort));
-            }
-            else {
-                py_addr_tuple_local = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_local == NULL)
-                goto error;
-
-            // On Windows <= XP, remote addr is filled even if socket
-            // is in LISTEN mode in which case we just ignore it.
-            if ((tcp4Table->table[i].dwRemoteAddr != 0 ||
-                    tcp4Table->table[i].dwRemotePort != 0) &&
-                    (tcp4Table->table[i].dwState != MIB_TCP_STATE_LISTEN))
-            {
-                struct in_addr addr;
-
-                addr.S_un.S_addr = tcp4Table->table[i].dwRemoteAddr;
-                RtlIpv4AddressToStringA(&addr, addressBufferRemote);
-                py_addr_tuple_remote = Py_BuildValue(
-                    "(si)",
-                    addressBufferRemote,
-                    BYTESWAP_USHORT(tcp4Table->table[i].dwRemotePort));
-            }
-            else
-            {
-                py_addr_tuple_remote = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_remote == NULL)
-                goto error;
-
-            py_conn_tuple = Py_BuildValue(
-                "(iiiNNiI)",
-                -1,
-                AF_INET,
-                SOCK_STREAM,
-                py_addr_tuple_local,
-                py_addr_tuple_remote,
-                tcp4Table->table[i].dwState,
-                tcp4Table->table[i].dwOwningPid);
-            if (!py_conn_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_conn_tuple))
-                goto error;
-            Py_CLEAR(py_conn_tuple);
-        }
-
-        free(table);
-        table = NULL;
-    }
-
-    // TCP IPv6
-    if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_STREAM) == 1) &&
-            (RtlIpv6AddressToStringA != NULL))
-    {
-        table = NULL;
-        py_conn_tuple = NULL;
-        py_addr_tuple_local = NULL;
-        py_addr_tuple_remote = NULL;
-
-        table = __GetExtendedTcpTable(AF_INET6);
-        if (table == NULL)
-            goto error;
-        tcp6Table = table;
-        for (i = 0; i < tcp6Table->dwNumEntries; i++)
-        {
-            if (pid != -1) {
-                if (tcp6Table->table[i].dwOwningPid != pid) {
-                    continue;
-                }
-            }
-
-            if (memcmp(tcp6Table->table[i].ucLocalAddr, null_address, 16)
-                    != 0 || tcp6Table->table[i].dwLocalPort != 0)
-            {
-                struct in6_addr addr;
-
-                memcpy(&addr, tcp6Table->table[i].ucLocalAddr, 16);
-                RtlIpv6AddressToStringA(&addr, addressBufferLocal);
-                py_addr_tuple_local = Py_BuildValue(
-                    "(si)",
-                    addressBufferLocal,
-                    BYTESWAP_USHORT(tcp6Table->table[i].dwLocalPort));
-            }
-            else {
-                py_addr_tuple_local = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_local == NULL)
-                goto error;
-
-            // On Windows <= XP, remote addr is filled even if socket
-            // is in LISTEN mode in which case we just ignore it.
-            if ((memcmp(tcp6Table->table[i].ucRemoteAddr, null_address, 16)
-                    != 0 ||
-                    tcp6Table->table[i].dwRemotePort != 0) &&
-                    (tcp6Table->table[i].dwState != MIB_TCP_STATE_LISTEN))
-            {
-                struct in6_addr addr;
-
-                memcpy(&addr, tcp6Table->table[i].ucRemoteAddr, 16);
-                RtlIpv6AddressToStringA(&addr, addressBufferRemote);
-                py_addr_tuple_remote = Py_BuildValue(
-                    "(si)",
-                    addressBufferRemote,
-                    BYTESWAP_USHORT(tcp6Table->table[i].dwRemotePort));
-            }
-            else {
-                py_addr_tuple_remote = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_remote == NULL)
-                goto error;
-
-            py_conn_tuple = Py_BuildValue(
-                "(iiiNNiI)",
-                -1,
-                AF_INET6,
-                SOCK_STREAM,
-                py_addr_tuple_local,
-                py_addr_tuple_remote,
-                tcp6Table->table[i].dwState,
-                tcp6Table->table[i].dwOwningPid);
-            if (!py_conn_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_conn_tuple))
-                goto error;
-            Py_CLEAR(py_conn_tuple);
-        }
-
-        free(table);
-        table = NULL;
-    }
-
-    // UDP IPv4
-
-    if ((PySequence_Contains(py_af_filter, _AF_INET) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1))
-    {
-        table = NULL;
-        py_conn_tuple = NULL;
-        py_addr_tuple_local = NULL;
-        py_addr_tuple_remote = NULL;
-        table = __GetExtendedUdpTable(AF_INET);
-        if (table == NULL)
-            goto error;
-        udp4Table = table;
-        for (i = 0; i < udp4Table->dwNumEntries; i++)
-        {
-            if (pid != -1) {
-                if (udp4Table->table[i].dwOwningPid != pid) {
-                    continue;
-                }
-            }
-
-            if (udp4Table->table[i].dwLocalAddr != 0 ||
-                udp4Table->table[i].dwLocalPort != 0)
-            {
-                struct in_addr addr;
-
-                addr.S_un.S_addr = udp4Table->table[i].dwLocalAddr;
-                RtlIpv4AddressToStringA(&addr, addressBufferLocal);
-                py_addr_tuple_local = Py_BuildValue(
-                    "(si)",
-                    addressBufferLocal,
-                    BYTESWAP_USHORT(udp4Table->table[i].dwLocalPort));
-            }
-            else {
-                py_addr_tuple_local = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_local == NULL)
-                goto error;
-
-            py_conn_tuple = Py_BuildValue(
-                "(iiiNNiI)",
-                -1,
-                AF_INET,
-                SOCK_DGRAM,
-                py_addr_tuple_local,
-                PyTuple_New(0),
-                PSUTIL_CONN_NONE,
-                udp4Table->table[i].dwOwningPid);
-            if (!py_conn_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_conn_tuple))
-                goto error;
-            Py_CLEAR(py_conn_tuple);
-        }
-
-        free(table);
-        table = NULL;
-    }
-
-    // UDP IPv6
-
-    if ((PySequence_Contains(py_af_filter, _AF_INET6) == 1) &&
-            (PySequence_Contains(py_type_filter, _SOCK_DGRAM) == 1) &&
-            (RtlIpv6AddressToStringA != NULL))
-    {
-        table = NULL;
-        py_conn_tuple = NULL;
-        py_addr_tuple_local = NULL;
-        py_addr_tuple_remote = NULL;
-        table = __GetExtendedUdpTable(AF_INET6);
-        if (table == NULL)
-            goto error;
-        udp6Table = table;
-        for (i = 0; i < udp6Table->dwNumEntries; i++) {
-            if (pid != -1) {
-                if (udp6Table->table[i].dwOwningPid != pid) {
-                    continue;
-                }
-            }
-
-            if (memcmp(udp6Table->table[i].ucLocalAddr, null_address, 16)
-                    != 0 || udp6Table->table[i].dwLocalPort != 0)
-            {
-                struct in6_addr addr;
-
-                memcpy(&addr, udp6Table->table[i].ucLocalAddr, 16);
-                RtlIpv6AddressToStringA(&addr, addressBufferLocal);
-                py_addr_tuple_local = Py_BuildValue(
-                    "(si)",
-                    addressBufferLocal,
-                    BYTESWAP_USHORT(udp6Table->table[i].dwLocalPort));
-            }
-            else {
-                py_addr_tuple_local = PyTuple_New(0);
-            }
-
-            if (py_addr_tuple_local == NULL)
-                goto error;
-
-            py_conn_tuple = Py_BuildValue(
-                "(iiiNNiI)",
-                -1,
-                AF_INET6,
-                SOCK_DGRAM,
-                py_addr_tuple_local,
-                PyTuple_New(0),
-                PSUTIL_CONN_NONE,
-                udp6Table->table[i].dwOwningPid);
-            if (!py_conn_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_conn_tuple))
-                goto error;
-            Py_CLEAR(py_conn_tuple);
-        }
-
-        free(table);
-        table = NULL;
-    }
-
-    psutil_conn_decref_objs();
-    return py_retlist;
-
-error:
-    psutil_conn_decref_objs();
-    Py_XDECREF(py_conn_tuple);
-    Py_XDECREF(py_addr_tuple_local);
-    Py_XDECREF(py_addr_tuple_remote);
-    Py_DECREF(py_retlist);
-    if (table != NULL)
-        free(table);
-    return NULL;
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/socks.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/socks.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/socks.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/socks.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Jeff Tang. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject *psutil_net_connections(PyObject *self, PyObject *args);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/wmi.c firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/wmi.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/wmi.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/wmi.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Functions related to the Windows Management Instrumentation API.
- */
-
-#include <Python.h>
-#include <windows.h>
-#include <pdh.h>
-
-
-// We use an exponentially weighted moving average, just like Unix systems do
-// https://en.wikipedia.org/wiki/Load_(computing)#Unix-style_load_calculation
-//
-// These constants serve as the damping factor and are calculated with
-// 1 / exp(sampling interval in seconds / window size in seconds)
-//
-// This formula comes from linux's include/linux/sched/loadavg.h
-// https://github.com/torvalds/linux/blob/345671ea0f9258f410eb057b9ced9cefbbe5dc78/include/linux/sched/loadavg.h#L20-L23
-#define LOADAVG_FACTOR_1F  0.9200444146293232478931553241
-#define LOADAVG_FACTOR_5F  0.9834714538216174894737477501
-#define LOADAVG_FACTOR_15F 0.9944598480048967508795473394
-// The time interval in seconds between taking load counts, same as Linux
-#define SAMPLING_INTERVAL 5
-
-double load_avg_1m = 0;
-double load_avg_5m = 0;
-double load_avg_15m = 0;
-
-
-VOID CALLBACK LoadAvgCallback(PVOID hCounter) {
-    PDH_FMT_COUNTERVALUE displayValue;
-    double currentLoad;
-    PDH_STATUS err;
-
-    err = PdhGetFormattedCounterValue(
-        (PDH_HCOUNTER)hCounter, PDH_FMT_DOUBLE, 0, &displayValue);
-    // Skip updating the load if we can't get the value successfully
-    if (err != ERROR_SUCCESS) {
-        return;
-    }
-    currentLoad = displayValue.doubleValue;
-
-    load_avg_1m = load_avg_1m * LOADAVG_FACTOR_1F + currentLoad * \
-        (1.0 - LOADAVG_FACTOR_1F);
-    load_avg_5m = load_avg_5m * LOADAVG_FACTOR_5F + currentLoad * \
-        (1.0 - LOADAVG_FACTOR_5F);
-    load_avg_15m = load_avg_15m * LOADAVG_FACTOR_15F + currentLoad * \
-        (1.0 - LOADAVG_FACTOR_15F);
-}
-
-
-PyObject *
-psutil_init_loadavg_counter(PyObject *self, PyObject *args) {
-    WCHAR *szCounterPath = L"\\System\\Processor Queue Length";
-    PDH_STATUS s;
-    BOOL ret;
-    HQUERY hQuery;
-    HCOUNTER hCounter;
-    HANDLE event;
-    HANDLE waitHandle;
-
-    if ((PdhOpenQueryW(NULL, 0, &hQuery)) != ERROR_SUCCESS)
-        goto error;
-
-    s = PdhAddEnglishCounterW(hQuery, szCounterPath, 0, &hCounter);
-    if (s != ERROR_SUCCESS)
-        goto error;
-
-    event = CreateEventW(NULL, FALSE, FALSE, L"LoadUpdateEvent");
-    if (event == NULL) {
-        PyErr_SetFromWindowsErr(GetLastError());
-        return NULL;
-    }
-
-    s = PdhCollectQueryDataEx(hQuery, SAMPLING_INTERVAL, event);
-    if (s != ERROR_SUCCESS)
-        goto error;
-
-    ret = RegisterWaitForSingleObject(
-        &waitHandle,
-        event,
-        (WAITORTIMERCALLBACK)LoadAvgCallback,
-        (PVOID)
-        hCounter,
-        INFINITE,
-        WT_EXECUTEDEFAULT);
-
-    if (ret == 0) {
-        PyErr_SetFromWindowsErr(GetLastError());
-        return NULL;
-    }
-
-    Py_RETURN_NONE;
-
-error:
-    PyErr_SetFromWindowsErr(0);
-    return NULL;
-}
-
-
-/*
- * Gets the emulated 1 minute, 5 minute and 15 minute load averages
- * (processor queue length) for the system.
- * `init_loadavg_counter` must be called before this function to engage the
- * mechanism that records load values.
- */
-PyObject *
-psutil_get_loadavg(PyObject *self, PyObject *args) {
-    return Py_BuildValue("(ddd)", load_avg_1m, load_avg_5m, load_avg_15m);
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/wmi.h firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/wmi.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/arch/windows/wmi.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/arch/windows/wmi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-PyObject* psutil_init_loadavg_counter();
-PyObject* psutil_get_loadavg();
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_common.py firefox-85.0+build1/third_party/python/psutil/psutil/_common.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_common.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_common.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,846 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Common objects shared by __init__.py and _ps*.py modules."""
-
-# Note: this module is imported by setup.py so it should not import
-# psutil or third-party modules.
-
-from __future__ import division, print_function
-
-import contextlib
-import errno
-import functools
-import os
-import socket
-import stat
-import sys
-import threading
-import warnings
-from collections import defaultdict
-from collections import namedtuple
-from socket import AF_INET
-from socket import SOCK_DGRAM
-from socket import SOCK_STREAM
-
-try:
-    from socket import AF_INET6
-except ImportError:
-    AF_INET6 = None
-try:
-    from socket import AF_UNIX
-except ImportError:
-    AF_UNIX = None
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-# can't take it from _common.py as this script is imported by setup.py
-PY3 = sys.version_info[0] == 3
-
-__all__ = [
-    # OS constants
-    'FREEBSD', 'BSD', 'LINUX', 'NETBSD', 'OPENBSD', 'MACOS', 'OSX', 'POSIX',
-    'SUNOS', 'WINDOWS',
-    # connection constants
-    'CONN_CLOSE', 'CONN_CLOSE_WAIT', 'CONN_CLOSING', 'CONN_ESTABLISHED',
-    'CONN_FIN_WAIT1', 'CONN_FIN_WAIT2', 'CONN_LAST_ACK', 'CONN_LISTEN',
-    'CONN_NONE', 'CONN_SYN_RECV', 'CONN_SYN_SENT', 'CONN_TIME_WAIT',
-    # net constants
-    'NIC_DUPLEX_FULL', 'NIC_DUPLEX_HALF', 'NIC_DUPLEX_UNKNOWN',
-    # process status constants
-    'STATUS_DEAD', 'STATUS_DISK_SLEEP', 'STATUS_IDLE', 'STATUS_LOCKED',
-    'STATUS_RUNNING', 'STATUS_SLEEPING', 'STATUS_STOPPED', 'STATUS_SUSPENDED',
-    'STATUS_TRACING_STOP', 'STATUS_WAITING', 'STATUS_WAKE_KILL',
-    'STATUS_WAKING', 'STATUS_ZOMBIE', 'STATUS_PARKED',
-    # other constants
-    'ENCODING', 'ENCODING_ERRS', 'AF_INET6',
-    # named tuples
-    'pconn', 'pcputimes', 'pctxsw', 'pgids', 'pio', 'pionice', 'popenfile',
-    'pthread', 'puids', 'sconn', 'scpustats', 'sdiskio', 'sdiskpart',
-    'sdiskusage', 'snetio', 'snicaddr', 'snicstats', 'sswap', 'suser',
-    # utility functions
-    'conn_tmap', 'deprecated_method', 'isfile_strict', 'memoize',
-    'parse_environ_block', 'path_exists_strict', 'usage_percent',
-    'supports_ipv6', 'sockfam_to_enum', 'socktype_to_enum', "wrap_numbers",
-    'bytes2human', 'conn_to_ntuple', 'debug',
-    # shell utils
-    'hilite', 'term_supports_colors', 'print_color',
-]
-
-
-# ===================================================================
-# --- OS constants
-# ===================================================================
-
-
-POSIX = os.name == "posix"
-WINDOWS = os.name == "nt"
-LINUX = sys.platform.startswith("linux")
-MACOS = sys.platform.startswith("darwin")
-OSX = MACOS  # deprecated alias
-FREEBSD = sys.platform.startswith("freebsd")
-OPENBSD = sys.platform.startswith("openbsd")
-NETBSD = sys.platform.startswith("netbsd")
-BSD = FREEBSD or OPENBSD or NETBSD
-SUNOS = sys.platform.startswith(("sunos", "solaris"))
-AIX = sys.platform.startswith("aix")
-
-
-# ===================================================================
-# --- API constants
-# ===================================================================
-
-
-# Process.status()
-STATUS_RUNNING = "running"
-STATUS_SLEEPING = "sleeping"
-STATUS_DISK_SLEEP = "disk-sleep"
-STATUS_STOPPED = "stopped"
-STATUS_TRACING_STOP = "tracing-stop"
-STATUS_ZOMBIE = "zombie"
-STATUS_DEAD = "dead"
-STATUS_WAKE_KILL = "wake-kill"
-STATUS_WAKING = "waking"
-STATUS_IDLE = "idle"  # Linux, macOS, FreeBSD
-STATUS_LOCKED = "locked"  # FreeBSD
-STATUS_WAITING = "waiting"  # FreeBSD
-STATUS_SUSPENDED = "suspended"  # NetBSD
-STATUS_PARKED = "parked"  # Linux
-
-# Process.connections() and psutil.net_connections()
-CONN_ESTABLISHED = "ESTABLISHED"
-CONN_SYN_SENT = "SYN_SENT"
-CONN_SYN_RECV = "SYN_RECV"
-CONN_FIN_WAIT1 = "FIN_WAIT1"
-CONN_FIN_WAIT2 = "FIN_WAIT2"
-CONN_TIME_WAIT = "TIME_WAIT"
-CONN_CLOSE = "CLOSE"
-CONN_CLOSE_WAIT = "CLOSE_WAIT"
-CONN_LAST_ACK = "LAST_ACK"
-CONN_LISTEN = "LISTEN"
-CONN_CLOSING = "CLOSING"
-CONN_NONE = "NONE"
-
-# net_if_stats()
-if enum is None:
-    NIC_DUPLEX_FULL = 2
-    NIC_DUPLEX_HALF = 1
-    NIC_DUPLEX_UNKNOWN = 0
-else:
-    class NicDuplex(enum.IntEnum):
-        NIC_DUPLEX_FULL = 2
-        NIC_DUPLEX_HALF = 1
-        NIC_DUPLEX_UNKNOWN = 0
-
-    globals().update(NicDuplex.__members__)
-
-# sensors_battery()
-if enum is None:
-    POWER_TIME_UNKNOWN = -1
-    POWER_TIME_UNLIMITED = -2
-else:
-    class BatteryTime(enum.IntEnum):
-        POWER_TIME_UNKNOWN = -1
-        POWER_TIME_UNLIMITED = -2
-
-    globals().update(BatteryTime.__members__)
-
-# --- others
-
-ENCODING = sys.getfilesystemencoding()
-if not PY3:
-    ENCODING_ERRS = "replace"
-else:
-    try:
-        ENCODING_ERRS = sys.getfilesystemencodeerrors()  # py 3.6
-    except AttributeError:
-        ENCODING_ERRS = "surrogateescape" if POSIX else "replace"
-
-
-# ===================================================================
-# --- namedtuples
-# ===================================================================
-
-# --- for system functions
-
-# psutil.swap_memory()
-sswap = namedtuple('sswap', ['total', 'used', 'free', 'percent', 'sin',
-                             'sout'])
-# psutil.disk_usage()
-sdiskusage = namedtuple('sdiskusage', ['total', 'used', 'free', 'percent'])
-# psutil.disk_io_counters()
-sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                 'read_bytes', 'write_bytes',
-                                 'read_time', 'write_time'])
-# psutil.disk_partitions()
-sdiskpart = namedtuple('sdiskpart', ['device', 'mountpoint', 'fstype', 'opts'])
-# psutil.net_io_counters()
-snetio = namedtuple('snetio', ['bytes_sent', 'bytes_recv',
-                               'packets_sent', 'packets_recv',
-                               'errin', 'errout',
-                               'dropin', 'dropout'])
-# psutil.users()
-suser = namedtuple('suser', ['name', 'terminal', 'host', 'started', 'pid'])
-# psutil.net_connections()
-sconn = namedtuple('sconn', ['fd', 'family', 'type', 'laddr', 'raddr',
-                             'status', 'pid'])
-# psutil.net_if_addrs()
-snicaddr = namedtuple('snicaddr',
-                      ['family', 'address', 'netmask', 'broadcast', 'ptp'])
-# psutil.net_if_stats()
-snicstats = namedtuple('snicstats', ['isup', 'duplex', 'speed', 'mtu'])
-# psutil.cpu_stats()
-scpustats = namedtuple(
-    'scpustats', ['ctx_switches', 'interrupts', 'soft_interrupts', 'syscalls'])
-# psutil.cpu_freq()
-scpufreq = namedtuple('scpufreq', ['current', 'min', 'max'])
-# psutil.sensors_temperatures()
-shwtemp = namedtuple(
-    'shwtemp', ['label', 'current', 'high', 'critical'])
-# psutil.sensors_battery()
-sbattery = namedtuple('sbattery', ['percent', 'secsleft', 'power_plugged'])
-# psutil.sensors_fans()
-sfan = namedtuple('sfan', ['label', 'current'])
-
-# --- for Process methods
-
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.Process.open_files()
-popenfile = namedtuple('popenfile', ['path', 'fd'])
-# psutil.Process.threads()
-pthread = namedtuple('pthread', ['id', 'user_time', 'system_time'])
-# psutil.Process.uids()
-puids = namedtuple('puids', ['real', 'effective', 'saved'])
-# psutil.Process.gids()
-pgids = namedtuple('pgids', ['real', 'effective', 'saved'])
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes'])
-# psutil.Process.ionice()
-pionice = namedtuple('pionice', ['ioclass', 'value'])
-# psutil.Process.ctx_switches()
-pctxsw = namedtuple('pctxsw', ['voluntary', 'involuntary'])
-# psutil.Process.connections()
-pconn = namedtuple('pconn', ['fd', 'family', 'type', 'laddr', 'raddr',
-                             'status'])
-
-# psutil.connections() and psutil.Process.connections()
-addr = namedtuple('addr', ['ip', 'port'])
-
-
-# ===================================================================
-# --- Process.connections() 'kind' parameter mapping
-# ===================================================================
-
-
-conn_tmap = {
-    "all": ([AF_INET, AF_INET6, AF_UNIX], [SOCK_STREAM, SOCK_DGRAM]),
-    "tcp": ([AF_INET, AF_INET6], [SOCK_STREAM]),
-    "tcp4": ([AF_INET], [SOCK_STREAM]),
-    "udp": ([AF_INET, AF_INET6], [SOCK_DGRAM]),
-    "udp4": ([AF_INET], [SOCK_DGRAM]),
-    "inet": ([AF_INET, AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
-    "inet4": ([AF_INET], [SOCK_STREAM, SOCK_DGRAM]),
-    "inet6": ([AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
-}
-
-if AF_INET6 is not None:
-    conn_tmap.update({
-        "tcp6": ([AF_INET6], [SOCK_STREAM]),
-        "udp6": ([AF_INET6], [SOCK_DGRAM]),
-    })
-
-if AF_UNIX is not None:
-    conn_tmap.update({
-        "unix": ([AF_UNIX], [SOCK_STREAM, SOCK_DGRAM]),
-    })
-
-
-# =====================================================================
-# --- Exceptions
-# =====================================================================
-
-
-class Error(Exception):
-    """Base exception class. All other psutil exceptions inherit
-    from this one.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, msg=""):
-        Exception.__init__(self, msg)
-        self.msg = msg
-
-    def __repr__(self):
-        ret = "psutil.%s %s" % (self.__class__.__name__, self.msg)
-        return ret.strip()
-
-    __str__ = __repr__
-
-
-class NoSuchProcess(Error):
-    """Exception raised when a process with a certain PID doesn't
-    or no longer exists.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, pid, name=None, msg=None):
-        Error.__init__(self, msg)
-        self.pid = pid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            if name:
-                details = "(pid=%s, name=%s)" % (self.pid, repr(self.name))
-            else:
-                details = "(pid=%s)" % self.pid
-            self.msg = "process no longer exists " + details
-
-    def __path__(self):
-        return 'xxx'
-
-
-class ZombieProcess(NoSuchProcess):
-    """Exception raised when querying a zombie process. This is
-    raised on macOS, BSD and Solaris only, and not always: depending
-    on the query the OS may be able to succeed anyway.
-    On Linux all zombie processes are querable (hence this is never
-    raised). Windows doesn't have zombie processes.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, pid, name=None, ppid=None, msg=None):
-        NoSuchProcess.__init__(self, msg)
-        self.pid = pid
-        self.ppid = ppid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            args = ["pid=%s" % pid]
-            if name:
-                args.append("name=%s" % repr(self.name))
-            if ppid:
-                args.append("ppid=%s" % self.ppid)
-            details = "(%s)" % ", ".join(args)
-            self.msg = "process still exists but it's a zombie " + details
-
-
-class AccessDenied(Error):
-    """Exception raised when permission to perform an action is denied."""
-    __module__ = 'psutil'
-
-    def __init__(self, pid=None, name=None, msg=None):
-        Error.__init__(self, msg)
-        self.pid = pid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            if (pid is not None) and (name is not None):
-                self.msg = "(pid=%s, name=%s)" % (pid, repr(name))
-            elif (pid is not None):
-                self.msg = "(pid=%s)" % self.pid
-            else:
-                self.msg = ""
-
-
-class TimeoutExpired(Error):
-    """Raised on Process.wait(timeout) if timeout expires and process
-    is still alive.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, seconds, pid=None, name=None):
-        Error.__init__(self, "timeout after %s seconds" % seconds)
-        self.seconds = seconds
-        self.pid = pid
-        self.name = name
-        if (pid is not None) and (name is not None):
-            self.msg += " (pid=%s, name=%s)" % (pid, repr(name))
-        elif (pid is not None):
-            self.msg += " (pid=%s)" % self.pid
-
-
-# ===================================================================
-# --- utils
-# ===================================================================
-
-
-def usage_percent(used, total, round_=None):
-    """Calculate percentage usage of 'used' against 'total'."""
-    try:
-        ret = (float(used) / total) * 100
-    except ZeroDivisionError:
-        return 0.0
-    else:
-        if round_ is not None:
-            ret = round(ret, round_)
-        return ret
-
-
-def memoize(fun):
-    """A simple memoize decorator for functions supporting (hashable)
-    positional arguments.
-    It also provides a cache_clear() function for clearing the cache:
-
-    >>> @memoize
-    ... def foo()
-    ...     return 1
-        ...
-    >>> foo()
-    1
-    >>> foo.cache_clear()
-    >>>
-    """
-    @functools.wraps(fun)
-    def wrapper(*args, **kwargs):
-        key = (args, frozenset(sorted(kwargs.items())))
-        try:
-            return cache[key]
-        except KeyError:
-            ret = cache[key] = fun(*args, **kwargs)
-            return ret
-
-    def cache_clear():
-        """Clear cache."""
-        cache.clear()
-
-    cache = {}
-    wrapper.cache_clear = cache_clear
-    return wrapper
-
-
-def memoize_when_activated(fun):
-    """A memoize decorator which is disabled by default. It can be
-    activated and deactivated on request.
-    For efficiency reasons it can be used only against class methods
-    accepting no arguments.
-
-    >>> class Foo:
-    ...     @memoize
-    ...     def foo()
-    ...         print(1)
-    ...
-    >>> f = Foo()
-    >>> # deactivated (default)
-    >>> foo()
-    1
-    >>> foo()
-    1
-    >>>
-    >>> # activated
-    >>> foo.cache_activate(self)
-    >>> foo()
-    1
-    >>> foo()
-    >>> foo()
-    >>>
-    """
-    @functools.wraps(fun)
-    def wrapper(self):
-        try:
-            # case 1: we previously entered oneshot() ctx
-            ret = self._cache[fun]
-        except AttributeError:
-            # case 2: we never entered oneshot() ctx
-            return fun(self)
-        except KeyError:
-            # case 3: we entered oneshot() ctx but there's no cache
-            # for this entry yet
-            ret = self._cache[fun] = fun(self)
-        return ret
-
-    def cache_activate(proc):
-        """Activate cache. Expects a Process instance. Cache will be
-        stored as a "_cache" instance attribute."""
-        proc._cache = {}
-
-    def cache_deactivate(proc):
-        """Deactivate and clear cache."""
-        try:
-            del proc._cache
-        except AttributeError:
-            pass
-
-    wrapper.cache_activate = cache_activate
-    wrapper.cache_deactivate = cache_deactivate
-    return wrapper
-
-
-def isfile_strict(path):
-    """Same as os.path.isfile() but does not swallow EACCES / EPERM
-    exceptions, see:
-    http://mail.python.org/pipermail/python-dev/2012-June/120787.html
-    """
-    try:
-        st = os.stat(path)
-    except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
-            raise
-        return False
-    else:
-        return stat.S_ISREG(st.st_mode)
-
-
-def path_exists_strict(path):
-    """Same as os.path.exists() but does not swallow EACCES / EPERM
-    exceptions, see:
-    http://mail.python.org/pipermail/python-dev/2012-June/120787.html
-    """
-    try:
-        os.stat(path)
-    except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
-            raise
-        return False
-    else:
-        return True
-
-
-@memoize
-def supports_ipv6():
-    """Return True if IPv6 is supported on this platform."""
-    if not socket.has_ipv6 or AF_INET6 is None:
-        return False
-    try:
-        sock = socket.socket(AF_INET6, socket.SOCK_STREAM)
-        with contextlib.closing(sock):
-            sock.bind(("::1", 0))
-        return True
-    except socket.error:
-        return False
-
-
-def parse_environ_block(data):
-    """Parse a C environ block of environment variables into a dictionary."""
-    # The block is usually raw data from the target process.  It might contain
-    # trailing garbage and lines that do not look like assignments.
-    ret = {}
-    pos = 0
-
-    # localize global variable to speed up access.
-    WINDOWS_ = WINDOWS
-    while True:
-        next_pos = data.find("\0", pos)
-        # nul byte at the beginning or double nul byte means finish
-        if next_pos <= pos:
-            break
-        # there might not be an equals sign
-        equal_pos = data.find("=", pos, next_pos)
-        if equal_pos > pos:
-            key = data[pos:equal_pos]
-            value = data[equal_pos + 1:next_pos]
-            # Windows expects environment variables to be uppercase only
-            if WINDOWS_:
-                key = key.upper()
-            ret[key] = value
-        pos = next_pos + 1
-
-    return ret
-
-
-def sockfam_to_enum(num):
-    """Convert a numeric socket family value to an IntEnum member.
-    If it's not a known member, return the numeric value itself.
-    """
-    if enum is None:
-        return num
-    else:  # pragma: no cover
-        try:
-            return socket.AddressFamily(num)
-        except ValueError:
-            return num
-
-
-def socktype_to_enum(num):
-    """Convert a numeric socket type value to an IntEnum member.
-    If it's not a known member, return the numeric value itself.
-    """
-    if enum is None:
-        return num
-    else:  # pragma: no cover
-        try:
-            return socket.SocketKind(num)
-        except ValueError:
-            return num
-
-
-def conn_to_ntuple(fd, fam, type_, laddr, raddr, status, status_map, pid=None):
-    """Convert a raw connection tuple to a proper ntuple."""
-    if fam in (socket.AF_INET, AF_INET6):
-        if laddr:
-            laddr = addr(*laddr)
-        if raddr:
-            raddr = addr(*raddr)
-    if type_ == socket.SOCK_STREAM and fam in (AF_INET, AF_INET6):
-        status = status_map.get(status, CONN_NONE)
-    else:
-        status = CONN_NONE  # ignore whatever C returned to us
-    fam = sockfam_to_enum(fam)
-    type_ = socktype_to_enum(type_)
-    if pid is None:
-        return pconn(fd, fam, type_, laddr, raddr, status)
-    else:
-        return sconn(fd, fam, type_, laddr, raddr, status, pid)
-
-
-def deprecated_method(replacement):
-    """A decorator which can be used to mark a method as deprecated
-    'replcement' is the method name which will be called instead.
-    """
-    def outer(fun):
-        msg = "%s() is deprecated and will be removed; use %s() instead" % (
-            fun.__name__, replacement)
-        if fun.__doc__ is None:
-            fun.__doc__ = msg
-
-        @functools.wraps(fun)
-        def inner(self, *args, **kwargs):
-            warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
-            return getattr(self, replacement)(*args, **kwargs)
-        return inner
-    return outer
-
-
-class _WrapNumbers:
-    """Watches numbers so that they don't overflow and wrap
-    (reset to zero).
-    """
-
-    def __init__(self):
-        self.lock = threading.Lock()
-        self.cache = {}
-        self.reminders = {}
-        self.reminder_keys = {}
-
-    def _add_dict(self, input_dict, name):
-        assert name not in self.cache
-        assert name not in self.reminders
-        assert name not in self.reminder_keys
-        self.cache[name] = input_dict
-        self.reminders[name] = defaultdict(int)
-        self.reminder_keys[name] = defaultdict(set)
-
-    def _remove_dead_reminders(self, input_dict, name):
-        """In case the number of keys changed between calls (e.g. a
-        disk disappears) this removes the entry from self.reminders.
-        """
-        old_dict = self.cache[name]
-        gone_keys = set(old_dict.keys()) - set(input_dict.keys())
-        for gone_key in gone_keys:
-            for remkey in self.reminder_keys[name][gone_key]:
-                del self.reminders[name][remkey]
-            del self.reminder_keys[name][gone_key]
-
-    def run(self, input_dict, name):
-        """Cache dict and sum numbers which overflow and wrap.
-        Return an updated copy of `input_dict`
-        """
-        if name not in self.cache:
-            # This was the first call.
-            self._add_dict(input_dict, name)
-            return input_dict
-
-        self._remove_dead_reminders(input_dict, name)
-
-        old_dict = self.cache[name]
-        new_dict = {}
-        for key in input_dict.keys():
-            input_tuple = input_dict[key]
-            try:
-                old_tuple = old_dict[key]
-            except KeyError:
-                # The input dict has a new key (e.g. a new disk or NIC)
-                # which didn't exist in the previous call.
-                new_dict[key] = input_tuple
-                continue
-
-            bits = []
-            for i in range(len(input_tuple)):
-                input_value = input_tuple[i]
-                old_value = old_tuple[i]
-                remkey = (key, i)
-                if input_value < old_value:
-                    # it wrapped!
-                    self.reminders[name][remkey] += old_value
-                    self.reminder_keys[name][key].add(remkey)
-                bits.append(input_value + self.reminders[name][remkey])
-
-            new_dict[key] = tuple(bits)
-
-        self.cache[name] = input_dict
-        return new_dict
-
-    def cache_clear(self, name=None):
-        """Clear the internal cache, optionally only for function 'name'."""
-        with self.lock:
-            if name is None:
-                self.cache.clear()
-                self.reminders.clear()
-                self.reminder_keys.clear()
-            else:
-                self.cache.pop(name, None)
-                self.reminders.pop(name, None)
-                self.reminder_keys.pop(name, None)
-
-    def cache_info(self):
-        """Return internal cache dicts as a tuple of 3 elements."""
-        with self.lock:
-            return (self.cache, self.reminders, self.reminder_keys)
-
-
-def wrap_numbers(input_dict, name):
-    """Given an `input_dict` and a function `name`, adjust the numbers
-    which "wrap" (restart from zero) across different calls by adding
-    "old value" to "new value" and return an updated dict.
-    """
-    with _wn.lock:
-        return _wn.run(input_dict, name)
-
-
-_wn = _WrapNumbers()
-wrap_numbers.cache_clear = _wn.cache_clear
-wrap_numbers.cache_info = _wn.cache_info
-
-
-def open_binary(fname, **kwargs):
-    return open(fname, "rb", **kwargs)
-
-
-def open_text(fname, **kwargs):
-    """On Python 3 opens a file in text mode by using fs encoding and
-    a proper en/decoding errors handler.
-    On Python 2 this is just an alias for open(name, 'rt').
-    """
-    if PY3:
-        # See:
-        # https://github.com/giampaolo/psutil/issues/675
-        # https://github.com/giampaolo/psutil/pull/733
-        kwargs.setdefault('encoding', ENCODING)
-        kwargs.setdefault('errors', ENCODING_ERRS)
-    return open(fname, "rt", **kwargs)
-
-
-def bytes2human(n, format="%(value).1f%(symbol)s"):
-    """Used by various scripts. See:
-    http://goo.gl/zeJZl
-
-    >>> bytes2human(10000)
-    '9.8K'
-    >>> bytes2human(100001221)
-    '95.4M'
-    """
-    symbols = ('B', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
-    prefix = {}
-    for i, s in enumerate(symbols[1:]):
-        prefix[s] = 1 << (i + 1) * 10
-    for symbol in reversed(symbols[1:]):
-        if n >= prefix[symbol]:
-            value = float(n) / prefix[symbol]
-            return format % locals()
-    return format % dict(symbol=symbols[0], value=n)
-
-
-def get_procfs_path():
-    """Return updated psutil.PROCFS_PATH constant."""
-    return sys.modules['psutil'].PROCFS_PATH
-
-
-if PY3:
-    def decode(s):
-        return s.decode(encoding=ENCODING, errors=ENCODING_ERRS)
-else:
-    def decode(s):
-        return s
-
-
-# =====================================================================
-# --- shell utils
-# =====================================================================
-
-
-@memoize
-def term_supports_colors(file=sys.stdout):
-    if os.name == 'nt':
-        return True
-    try:
-        import curses
-        assert file.isatty()
-        curses.setupterm()
-        assert curses.tigetnum("colors") > 0
-    except Exception:
-        return False
-    else:
-        return True
-
-
-def hilite(s, color="green", bold=False):
-    """Return an highlighted version of 'string'."""
-    if not term_supports_colors():
-        return s
-    attr = []
-    colors = dict(green='32', red='91', brown='33')
-    colors[None] = '29'
-    try:
-        color = colors[color]
-    except KeyError:
-        raise ValueError("invalid color %r; choose between %s" % (
-            list(colors.keys())))
-    attr.append(color)
-    if bold:
-        attr.append('1')
-    return '\x1b[%sm%s\x1b[0m' % (';'.join(attr), s)
-
-
-def print_color(s, color="green", bold=False, file=sys.stdout):
-    """Print a colorized version of string."""
-    if not term_supports_colors():
-        print(s, file=file)
-    elif POSIX:
-        print(hilite(s, color, bold), file=file)
-    else:
-        import ctypes
-
-        DEFAULT_COLOR = 7
-        GetStdHandle = ctypes.windll.Kernel32.GetStdHandle
-        SetConsoleTextAttribute = \
-            ctypes.windll.Kernel32.SetConsoleTextAttribute
-
-        colors = dict(green=2, red=4, brown=6)
-        colors[None] = DEFAULT_COLOR
-        try:
-            color = colors[color]
-        except KeyError:
-            raise ValueError("invalid color %r; choose between %r" % (
-                color, list(colors.keys())))
-        if bold and color <= 7:
-            color += 8
-
-        handle_id = -12 if file is sys.stderr else -11
-        GetStdHandle.restype = ctypes.c_ulong
-        handle = GetStdHandle(handle_id)
-        SetConsoleTextAttribute(handle, color)
-        try:
-            print(s, file=file)
-        finally:
-            SetConsoleTextAttribute(handle, DEFAULT_COLOR)
-
-
-if bool(os.getenv('PSUTIL_DEBUG', 0)):
-    import inspect
-
-    def debug(msg):
-        """If PSUTIL_DEBUG env var is set, print a debug message to stderr."""
-        fname, lineno, func_name, lines, index = inspect.getframeinfo(
-            inspect.currentframe().f_back)
-        print("psutil-debug [%s:%s]> %s" % (fname, lineno, msg),
-              file=sys.stderr)
-else:
-    def debug(msg):
-        pass
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_compat.py firefox-85.0+build1/third_party/python/psutil/psutil/_compat.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_compat.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_compat.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Module which provides compatibility with older Python versions."""
-
-import collections
-import errno
-import functools
-import os
-import sys
-
-__all__ = ["PY3", "long", "xrange", "unicode", "basestring", "u", "b",
-           "lru_cache", "which", "get_terminal_size",
-           "FileNotFoundError", "PermissionError", "ProcessLookupError",
-           "InterruptedError", "ChildProcessError", "FileExistsError"]
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    long = int
-    xrange = range
-    unicode = str
-    basestring = str
-
-    def u(s):
-        return s
-
-    def b(s):
-        return s.encode("latin-1")
-else:
-    long = long
-    xrange = xrange
-    unicode = unicode
-    basestring = basestring
-
-    def u(s):
-        return unicode(s, "unicode_escape")
-
-    def b(s):
-        return s
-
-
-# --- exceptions
-
-
-if PY3:
-    FileNotFoundError = FileNotFoundError  # NOQA
-    PermissionError = PermissionError  # NOQA
-    ProcessLookupError = ProcessLookupError  # NOQA
-    InterruptedError = InterruptedError  # NOQA
-    ChildProcessError = ChildProcessError  # NOQA
-    FileExistsError = FileExistsError  # NOQA
-else:
-    # https://github.com/PythonCharmers/python-future/blob/exceptions/
-    #     src/future/types/exceptions/pep3151.py
-    import platform
-
-    _singleton = object()
-
-    def instance_checking_exception(base_exception=Exception):
-        def wrapped(instance_checker):
-            class TemporaryClass(base_exception):
-
-                def __init__(self, *args, **kwargs):
-                    if len(args) == 1 and isinstance(args[0], TemporaryClass):
-                        unwrap_me = args[0]
-                        for attr in dir(unwrap_me):
-                            if not attr.startswith('__'):
-                                setattr(self, attr, getattr(unwrap_me, attr))
-                    else:
-                        super(TemporaryClass, self).__init__(*args, **kwargs)
-
-                class __metaclass__(type):
-                    def __instancecheck__(cls, inst):
-                        return instance_checker(inst)
-
-                    def __subclasscheck__(cls, classinfo):
-                        value = sys.exc_info()[1]
-                        return isinstance(value, cls)
-
-            TemporaryClass.__name__ = instance_checker.__name__
-            TemporaryClass.__doc__ = instance_checker.__doc__
-            return TemporaryClass
-
-        return wrapped
-
-    @instance_checking_exception(EnvironmentError)
-    def FileNotFoundError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ENOENT
-
-    @instance_checking_exception(EnvironmentError)
-    def ProcessLookupError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ESRCH
-
-    @instance_checking_exception(EnvironmentError)
-    def PermissionError(inst):
-        return getattr(inst, 'errno', _singleton) in (
-            errno.EACCES, errno.EPERM)
-
-    @instance_checking_exception(EnvironmentError)
-    def InterruptedError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.EINTR
-
-    @instance_checking_exception(EnvironmentError)
-    def ChildProcessError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ECHILD
-
-    @instance_checking_exception(EnvironmentError)
-    def FileExistsError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.EEXIST
-
-    if platform.python_implementation() != "CPython":
-        try:
-            raise OSError(errno.EEXIST, "perm")
-        except FileExistsError:
-            pass
-        except OSError:
-            raise RuntimeError(
-                "broken / incompatible Python implementation, see: "
-                "https://github.com/giampaolo/psutil/issues/1659")
-
-
-# --- stdlib additions
-
-
-# py 3.2 functools.lru_cache
-# Taken from: http://code.activestate.com/recipes/578078
-# Credit: Raymond Hettinger
-try:
-    from functools import lru_cache
-except ImportError:
-    try:
-        from threading import RLock
-    except ImportError:
-        from dummy_threading import RLock
-
-    _CacheInfo = collections.namedtuple(
-        "CacheInfo", ["hits", "misses", "maxsize", "currsize"])
-
-    class _HashedSeq(list):
-        __slots__ = 'hashvalue'
-
-        def __init__(self, tup, hash=hash):
-            self[:] = tup
-            self.hashvalue = hash(tup)
-
-        def __hash__(self):
-            return self.hashvalue
-
-    def _make_key(args, kwds, typed,
-                  kwd_mark=(object(), ),
-                  fasttypes=set((int, str, frozenset, type(None))),
-                  sorted=sorted, tuple=tuple, type=type, len=len):
-        key = args
-        if kwds:
-            sorted_items = sorted(kwds.items())
-            key += kwd_mark
-            for item in sorted_items:
-                key += item
-        if typed:
-            key += tuple(type(v) for v in args)
-            if kwds:
-                key += tuple(type(v) for k, v in sorted_items)
-        elif len(key) == 1 and type(key[0]) in fasttypes:
-            return key[0]
-        return _HashedSeq(key)
-
-    def lru_cache(maxsize=100, typed=False):
-        """Least-recently-used cache decorator, see:
-        http://docs.python.org/3/library/functools.html#functools.lru_cache
-        """
-        def decorating_function(user_function):
-            cache = dict()
-            stats = [0, 0]
-            HITS, MISSES = 0, 1
-            make_key = _make_key
-            cache_get = cache.get
-            _len = len
-            lock = RLock()
-            root = []
-            root[:] = [root, root, None, None]
-            nonlocal_root = [root]
-            PREV, NEXT, KEY, RESULT = 0, 1, 2, 3
-            if maxsize == 0:
-                def wrapper(*args, **kwds):
-                    result = user_function(*args, **kwds)
-                    stats[MISSES] += 1
-                    return result
-            elif maxsize is None:
-                def wrapper(*args, **kwds):
-                    key = make_key(args, kwds, typed)
-                    result = cache_get(key, root)
-                    if result is not root:
-                        stats[HITS] += 1
-                        return result
-                    result = user_function(*args, **kwds)
-                    cache[key] = result
-                    stats[MISSES] += 1
-                    return result
-            else:
-                def wrapper(*args, **kwds):
-                    if kwds or typed:
-                        key = make_key(args, kwds, typed)
-                    else:
-                        key = args
-                    lock.acquire()
-                    try:
-                        link = cache_get(key)
-                        if link is not None:
-                            root, = nonlocal_root
-                            link_prev, link_next, key, result = link
-                            link_prev[NEXT] = link_next
-                            link_next[PREV] = link_prev
-                            last = root[PREV]
-                            last[NEXT] = root[PREV] = link
-                            link[PREV] = last
-                            link[NEXT] = root
-                            stats[HITS] += 1
-                            return result
-                    finally:
-                        lock.release()
-                    result = user_function(*args, **kwds)
-                    lock.acquire()
-                    try:
-                        root, = nonlocal_root
-                        if key in cache:
-                            pass
-                        elif _len(cache) >= maxsize:
-                            oldroot = root
-                            oldroot[KEY] = key
-                            oldroot[RESULT] = result
-                            root = nonlocal_root[0] = oldroot[NEXT]
-                            oldkey = root[KEY]
-                            root[KEY] = root[RESULT] = None
-                            del cache[oldkey]
-                            cache[key] = oldroot
-                        else:
-                            last = root[PREV]
-                            link = [last, root, key, result]
-                            last[NEXT] = root[PREV] = cache[key] = link
-                        stats[MISSES] += 1
-                    finally:
-                        lock.release()
-                    return result
-
-            def cache_info():
-                """Report cache statistics"""
-                lock.acquire()
-                try:
-                    return _CacheInfo(stats[HITS], stats[MISSES], maxsize,
-                                      len(cache))
-                finally:
-                    lock.release()
-
-            def cache_clear():
-                """Clear the cache and cache statistics"""
-                lock.acquire()
-                try:
-                    cache.clear()
-                    root = nonlocal_root[0]
-                    root[:] = [root, root, None, None]
-                    stats[:] = [0, 0]
-                finally:
-                    lock.release()
-
-            wrapper.__wrapped__ = user_function
-            wrapper.cache_info = cache_info
-            wrapper.cache_clear = cache_clear
-            return functools.update_wrapper(wrapper, user_function)
-
-        return decorating_function
-
-
-# python 3.3
-try:
-    from shutil import which
-except ImportError:
-    def which(cmd, mode=os.F_OK | os.X_OK, path=None):
-        """Given a command, mode, and a PATH string, return the path which
-        conforms to the given mode on the PATH, or None if there is no such
-        file.
-
-        `mode` defaults to os.F_OK | os.X_OK. `path` defaults to the result
-        of os.environ.get("PATH"), or can be overridden with a custom search
-        path.
-        """
-        def _access_check(fn, mode):
-            return (os.path.exists(fn) and os.access(fn, mode) and
-                    not os.path.isdir(fn))
-
-        if os.path.dirname(cmd):
-            if _access_check(cmd, mode):
-                return cmd
-            return None
-
-        if path is None:
-            path = os.environ.get("PATH", os.defpath)
-        if not path:
-            return None
-        path = path.split(os.pathsep)
-
-        if sys.platform == "win32":
-            if os.curdir not in path:
-                path.insert(0, os.curdir)
-
-            pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-            if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
-                files = [cmd]
-            else:
-                files = [cmd + ext for ext in pathext]
-        else:
-            files = [cmd]
-
-        seen = set()
-        for dir in path:
-            normdir = os.path.normcase(dir)
-            if normdir not in seen:
-                seen.add(normdir)
-                for thefile in files:
-                    name = os.path.join(dir, thefile)
-                    if _access_check(name, mode):
-                        return name
-        return None
-
-
-# python 3.3
-try:
-    from shutil import get_terminal_size
-except ImportError:
-    def get_terminal_size(fallback=(80, 24)):
-        try:
-            import fcntl
-            import termios
-            import struct
-        except ImportError:
-            return fallback
-        else:
-            try:
-                # This should work on Linux.
-                res = struct.unpack(
-                    'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, '1234'))
-                return (res[1], res[0])
-            except Exception:
-                return fallback
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/__init__.py firefox-85.0+build1/third_party/python/psutil/psutil/__init__.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/__init__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2409 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""psutil is a cross-platform library for retrieving information on
-running processes and system utilization (CPU, memory, disks, network,
-sensors) in Python. Supported platforms:
-
- - Linux
- - Windows
- - macOS
- - FreeBSD
- - OpenBSD
- - NetBSD
- - Sun Solaris
- - AIX
-
-Works with Python versions from 2.6 to 3.4+.
-"""
-
-from __future__ import division
-
-import collections
-import contextlib
-import datetime
-import functools
-import os
-import signal
-import subprocess
-import sys
-import threading
-import time
-try:
-    import pwd
-except ImportError:
-    pwd = None
-
-from . import _common
-from ._common import AccessDenied
-from ._common import deprecated_method
-from ._common import Error
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import TimeoutExpired
-from ._common import wrap_numbers as _wrap_numbers
-from ._common import ZombieProcess
-from ._compat import long
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3 as _PY3
-
-from ._common import STATUS_DEAD
-from ._common import STATUS_DISK_SLEEP
-from ._common import STATUS_IDLE
-from ._common import STATUS_LOCKED
-from ._common import STATUS_PARKED
-from ._common import STATUS_RUNNING
-from ._common import STATUS_SLEEPING
-from ._common import STATUS_STOPPED
-from ._common import STATUS_TRACING_STOP
-from ._common import STATUS_WAITING
-from ._common import STATUS_WAKING
-from ._common import STATUS_ZOMBIE
-
-from ._common import CONN_CLOSE
-from ._common import CONN_CLOSE_WAIT
-from ._common import CONN_CLOSING
-from ._common import CONN_ESTABLISHED
-from ._common import CONN_FIN_WAIT1
-from ._common import CONN_FIN_WAIT2
-from ._common import CONN_LAST_ACK
-from ._common import CONN_LISTEN
-from ._common import CONN_NONE
-from ._common import CONN_SYN_RECV
-from ._common import CONN_SYN_SENT
-from ._common import CONN_TIME_WAIT
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-
-from ._common import AIX
-from ._common import BSD
-from ._common import FREEBSD  # NOQA
-from ._common import LINUX
-from ._common import MACOS
-from ._common import NETBSD  # NOQA
-from ._common import OPENBSD  # NOQA
-from ._common import OSX  # deprecated alias
-from ._common import POSIX  # NOQA
-from ._common import SUNOS
-from ._common import WINDOWS
-
-if LINUX:
-    # This is public API and it will be retrieved from _pslinux.py
-    # via sys.modules.
-    PROCFS_PATH = "/proc"
-
-    from . import _pslinux as _psplatform
-
-    from ._pslinux import IOPRIO_CLASS_BE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_IDLE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_NONE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_RT  # NOQA
-    # Linux >= 2.6.36
-    if _psplatform.HAS_PRLIMIT:
-        from ._psutil_linux import RLIM_INFINITY  # NOQA
-        from ._psutil_linux import RLIMIT_AS  # NOQA
-        from ._psutil_linux import RLIMIT_CORE  # NOQA
-        from ._psutil_linux import RLIMIT_CPU  # NOQA
-        from ._psutil_linux import RLIMIT_DATA  # NOQA
-        from ._psutil_linux import RLIMIT_FSIZE  # NOQA
-        from ._psutil_linux import RLIMIT_LOCKS  # NOQA
-        from ._psutil_linux import RLIMIT_MEMLOCK  # NOQA
-        from ._psutil_linux import RLIMIT_NOFILE  # NOQA
-        from ._psutil_linux import RLIMIT_NPROC  # NOQA
-        from ._psutil_linux import RLIMIT_RSS  # NOQA
-        from ._psutil_linux import RLIMIT_STACK  # NOQA
-        # Kinda ugly but considerably faster than using hasattr() and
-        # setattr() against the module object (we are at import time:
-        # speed matters).
-        from . import _psutil_linux
-        try:
-            RLIMIT_MSGQUEUE = _psutil_linux.RLIMIT_MSGQUEUE
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_NICE = _psutil_linux.RLIMIT_NICE
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_RTPRIO = _psutil_linux.RLIMIT_RTPRIO
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_RTTIME = _psutil_linux.RLIMIT_RTTIME
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_SIGPENDING = _psutil_linux.RLIMIT_SIGPENDING
-        except AttributeError:
-            pass
-
-elif WINDOWS:
-    from . import _pswindows as _psplatform
-    from ._psutil_windows import ABOVE_NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import BELOW_NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import HIGH_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import IDLE_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import REALTIME_PRIORITY_CLASS  # NOQA
-    from ._pswindows import CONN_DELETE_TCB  # NOQA
-    from ._pswindows import IOPRIO_VERYLOW  # NOQA
-    from ._pswindows import IOPRIO_LOW  # NOQA
-    from ._pswindows import IOPRIO_NORMAL  # NOQA
-    from ._pswindows import IOPRIO_HIGH  # NOQA
-
-elif MACOS:
-    from . import _psosx as _psplatform
-
-elif BSD:
-    from . import _psbsd as _psplatform
-
-elif SUNOS:
-    from . import _pssunos as _psplatform
-    from ._pssunos import CONN_BOUND  # NOQA
-    from ._pssunos import CONN_IDLE  # NOQA
-
-    # This is public writable API which is read from _pslinux.py and
-    # _pssunos.py via sys.modules.
-    PROCFS_PATH = "/proc"
-
-elif AIX:
-    from . import _psaix as _psplatform
-
-    # This is public API and it will be retrieved from _pslinux.py
-    # via sys.modules.
-    PROCFS_PATH = "/proc"
-
-else:  # pragma: no cover
-    raise NotImplementedError('platform %s is not supported' % sys.platform)
-
-
-__all__ = [
-    # exceptions
-    "Error", "NoSuchProcess", "ZombieProcess", "AccessDenied",
-    "TimeoutExpired",
-
-    # constants
-    "version_info", "__version__",
-
-    "STATUS_RUNNING", "STATUS_IDLE", "STATUS_SLEEPING", "STATUS_DISK_SLEEP",
-    "STATUS_STOPPED", "STATUS_TRACING_STOP", "STATUS_ZOMBIE", "STATUS_DEAD",
-    "STATUS_WAKING", "STATUS_LOCKED", "STATUS_WAITING", "STATUS_LOCKED",
-    "STATUS_PARKED",
-
-    "CONN_ESTABLISHED", "CONN_SYN_SENT", "CONN_SYN_RECV", "CONN_FIN_WAIT1",
-    "CONN_FIN_WAIT2", "CONN_TIME_WAIT", "CONN_CLOSE", "CONN_CLOSE_WAIT",
-    "CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", "CONN_NONE",
-
-    "AF_LINK",
-
-    "NIC_DUPLEX_FULL", "NIC_DUPLEX_HALF", "NIC_DUPLEX_UNKNOWN",
-
-    "POWER_TIME_UNKNOWN", "POWER_TIME_UNLIMITED",
-
-    "BSD", "FREEBSD", "LINUX", "NETBSD", "OPENBSD", "MACOS", "OSX", "POSIX",
-    "SUNOS", "WINDOWS", "AIX",
-
-    # classes
-    "Process", "Popen",
-
-    # functions
-    "pid_exists", "pids", "process_iter", "wait_procs",             # proc
-    "virtual_memory", "swap_memory",                                # memory
-    "cpu_times", "cpu_percent", "cpu_times_percent", "cpu_count",   # cpu
-    "cpu_stats",  # "cpu_freq", "getloadavg"
-    "net_io_counters", "net_connections", "net_if_addrs",           # network
-    "net_if_stats",
-    "disk_io_counters", "disk_partitions", "disk_usage",            # disk
-    # "sensors_temperatures", "sensors_battery", "sensors_fans"     # sensors
-    "users", "boot_time",                                           # others
-]
-
-
-__all__.extend(_psplatform.__extra__all__)
-__author__ = "Giampaolo Rodola'"
-__version__ = "5.7.0"
-version_info = tuple([int(num) for num in __version__.split('.')])
-
-_timer = getattr(time, 'monotonic', time.time)
-AF_LINK = _psplatform.AF_LINK
-POWER_TIME_UNLIMITED = _common.POWER_TIME_UNLIMITED
-POWER_TIME_UNKNOWN = _common.POWER_TIME_UNKNOWN
-_TOTAL_PHYMEM = None
-_LOWEST_PID = None
-
-# Sanity check in case the user messed up with psutil installation
-# or did something weird with sys.path. In this case we might end
-# up importing a python module using a C extension module which
-# was compiled for a different version of psutil.
-# We want to prevent that by failing sooner rather than later.
-# See: https://github.com/giampaolo/psutil/issues/564
-if (int(__version__.replace('.', '')) !=
-        getattr(_psplatform.cext, 'version', None)):
-    msg = "version conflict: %r C extension module was built for another " \
-          "version of psutil" % getattr(_psplatform.cext, "__file__")
-    if hasattr(_psplatform.cext, 'version'):
-        msg += " (%s instead of %s)" % (
-            '.'.join([x for x in str(_psplatform.cext.version)]), __version__)
-    else:
-        msg += " (different than %s)" % __version__
-    msg += "; you may try to 'pip uninstall psutil', manually remove %s" % (
-        getattr(_psplatform.cext, "__file__",
-                "the existing psutil install directory"))
-    msg += " or clean the virtual env somehow, then reinstall"
-    raise ImportError(msg)
-
-
-# =====================================================================
-# --- Utils
-# =====================================================================
-
-
-if hasattr(_psplatform, 'ppid_map'):
-    # Faster version (Windows and Linux).
-    _ppid_map = _psplatform.ppid_map
-else:
-    def _ppid_map():
-        """Return a {pid: ppid, ...} dict for all running processes in
-        one shot. Used to speed up Process.children().
-        """
-        ret = {}
-        for pid in pids():
-            try:
-                ret[pid] = _psplatform.Process(pid).ppid()
-            except (NoSuchProcess, ZombieProcess):
-                pass
-        return ret
-
-
-def _assert_pid_not_reused(fun):
-    """Decorator which raises NoSuchProcess in case a process is no
-    longer running or its PID has been reused.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        if not self.is_running():
-            raise NoSuchProcess(self.pid, self._name)
-        return fun(self, *args, **kwargs)
-    return wrapper
-
-
-def _pprint_secs(secs):
-    """Format seconds in a human readable form."""
-    now = time.time()
-    secs_ago = int(now - secs)
-    if secs_ago < 60 * 60 * 24:
-        fmt = "%H:%M:%S"
-    else:
-        fmt = "%Y-%m-%d %H:%M:%S"
-    return datetime.datetime.fromtimestamp(secs).strftime(fmt)
-
-
-# =====================================================================
-# --- Process class
-# =====================================================================
-
-
-class Process(object):
-    """Represents an OS process with the given PID.
-    If PID is omitted current process PID (os.getpid()) is used.
-    Raise NoSuchProcess if PID does not exist.
-
-    Note that most of the methods of this class do not make sure
-    the PID of the process being queried has been reused over time.
-    That means you might end up retrieving an information referring
-    to another process in case the original one this instance
-    refers to is gone in the meantime.
-
-    The only exceptions for which process identity is pre-emptively
-    checked and guaranteed are:
-
-     - parent()
-     - children()
-     - nice() (set)
-     - ionice() (set)
-     - rlimit() (set)
-     - cpu_affinity (set)
-     - suspend()
-     - resume()
-     - send_signal()
-     - terminate()
-     - kill()
-
-    To prevent this problem for all other methods you can:
-     - use is_running() before querying the process
-     - if you're continuously iterating over a set of Process
-       instances use process_iter() which pre-emptively checks
-     process identity for every yielded instance
-    """
-
-    def __init__(self, pid=None):
-        self._init(pid)
-
-    def _init(self, pid, _ignore_nsp=False):
-        if pid is None:
-            pid = os.getpid()
-        else:
-            if not _PY3 and not isinstance(pid, (int, long)):
-                raise TypeError('pid must be an integer (got %r)' % pid)
-            if pid < 0:
-                raise ValueError('pid must be a positive integer (got %s)'
-                                 % pid)
-        self._pid = pid
-        self._name = None
-        self._exe = None
-        self._create_time = None
-        self._gone = False
-        self._hash = None
-        self._lock = threading.RLock()
-        # used for caching on Windows only (on POSIX ppid may change)
-        self._ppid = None
-        # platform-specific modules define an _psplatform.Process
-        # implementation class
-        self._proc = _psplatform.Process(pid)
-        self._last_sys_cpu_times = None
-        self._last_proc_cpu_times = None
-        # cache creation time for later use in is_running() method
-        try:
-            self.create_time()
-        except AccessDenied:
-            # We should never get here as AFAIK we're able to get
-            # process creation time on all platforms even as a
-            # limited user.
-            pass
-        except ZombieProcess:
-            # Zombies can still be queried by this class (although
-            # not always) and pids() return them so just go on.
-            pass
-        except NoSuchProcess:
-            if not _ignore_nsp:
-                msg = 'no process found with pid %s' % pid
-                raise NoSuchProcess(pid, None, msg)
-            else:
-                self._gone = True
-        # This pair is supposed to indentify a Process instance
-        # univocally over time (the PID alone is not enough as
-        # it might refer to a process whose PID has been reused).
-        # This will be used later in __eq__() and is_running().
-        self._ident = (self.pid, self._create_time)
-
-    def __str__(self):
-        try:
-            info = collections.OrderedDict()
-        except AttributeError:
-            info = {}  # Python 2.6
-        info["pid"] = self.pid
-        try:
-            info["name"] = self.name()
-            if self._create_time:
-                info['started'] = _pprint_secs(self._create_time)
-        except ZombieProcess:
-            info["status"] = "zombie"
-        except NoSuchProcess:
-            info["status"] = "terminated"
-        except AccessDenied:
-            pass
-        return "%s.%s(%s)" % (
-            self.__class__.__module__,
-            self.__class__.__name__,
-            ", ".join(["%s=%r" % (k, v) for k, v in info.items()]))
-
-    __repr__ = __str__
-
-    def __eq__(self, other):
-        # Test for equality with another Process object based
-        # on PID and creation time.
-        if not isinstance(other, Process):
-            return NotImplemented
-        return self._ident == other._ident
-
-    def __ne__(self, other):
-        return not self == other
-
-    def __hash__(self):
-        if self._hash is None:
-            self._hash = hash(self._ident)
-        return self._hash
-
-    @property
-    def pid(self):
-        """The process PID."""
-        return self._pid
-
-    # --- utility methods
-
-    @contextlib.contextmanager
-    def oneshot(self):
-        """Utility context manager which considerably speeds up the
-        retrieval of multiple process information at the same time.
-
-        Internally different process info (e.g. name, ppid, uids,
-        gids, ...) may be fetched by using the same routine, but
-        only one information is returned and the others are discarded.
-        When using this context manager the internal routine is
-        executed once (in the example below on name()) and the
-        other info are cached.
-
-        The cache is cleared when exiting the context manager block.
-        The advice is to use this every time you retrieve more than
-        one information about the process. If you're lucky, you'll
-        get a hell of a speedup.
-
-        >>> import psutil
-        >>> p = psutil.Process()
-        >>> with p.oneshot():
-        ...     p.name()  # collect multiple info
-        ...     p.cpu_times()  # return cached value
-        ...     p.cpu_percent()  # return cached value
-        ...     p.create_time()  # return cached value
-        ...
-        >>>
-        """
-        with self._lock:
-            if hasattr(self, "_cache"):
-                # NOOP: this covers the use case where the user enters the
-                # context twice:
-                #
-                # >>> with p.oneshot():
-                # ...    with p.oneshot():
-                # ...
-                #
-                # Also, since as_dict() internally uses oneshot()
-                # I expect that the code below will be a pretty common
-                # "mistake" that the user will make, so let's guard
-                # against that:
-                #
-                # >>> with p.oneshot():
-                # ...    p.as_dict()
-                # ...
-                yield
-            else:
-                try:
-                    # cached in case cpu_percent() is used
-                    self.cpu_times.cache_activate(self)
-                    # cached in case memory_percent() is used
-                    self.memory_info.cache_activate(self)
-                    # cached in case parent() is used
-                    self.ppid.cache_activate(self)
-                    # cached in case username() is used
-                    if POSIX:
-                        self.uids.cache_activate(self)
-                    # specific implementation cache
-                    self._proc.oneshot_enter()
-                    yield
-                finally:
-                    self.cpu_times.cache_deactivate(self)
-                    self.memory_info.cache_deactivate(self)
-                    self.ppid.cache_deactivate(self)
-                    if POSIX:
-                        self.uids.cache_deactivate(self)
-                    self._proc.oneshot_exit()
-
-    def as_dict(self, attrs=None, ad_value=None):
-        """Utility method returning process information as a
-        hashable dictionary.
-        If *attrs* is specified it must be a list of strings
-        reflecting available Process class' attribute names
-        (e.g. ['cpu_times', 'name']) else all public (read
-        only) attributes are assumed.
-        *ad_value* is the value which gets assigned in case
-        AccessDenied or ZombieProcess exception is raised when
-        retrieving that particular process information.
-        """
-        valid_names = _as_dict_attrnames
-        if attrs is not None:
-            if not isinstance(attrs, (list, tuple, set, frozenset)):
-                raise TypeError("invalid attrs type %s" % type(attrs))
-            attrs = set(attrs)
-            invalid_names = attrs - valid_names
-            if invalid_names:
-                raise ValueError("invalid attr name%s %s" % (
-                    "s" if len(invalid_names) > 1 else "",
-                    ", ".join(map(repr, invalid_names))))
-
-        retdict = dict()
-        ls = attrs or valid_names
-        with self.oneshot():
-            for name in ls:
-                try:
-                    if name == 'pid':
-                        ret = self.pid
-                    else:
-                        meth = getattr(self, name)
-                        ret = meth()
-                except (AccessDenied, ZombieProcess):
-                    ret = ad_value
-                except NotImplementedError:
-                    # in case of not implemented functionality (may happen
-                    # on old or exotic systems) we want to crash only if
-                    # the user explicitly asked for that particular attr
-                    if attrs:
-                        raise
-                    continue
-                retdict[name] = ret
-        return retdict
-
-    def parent(self):
-        """Return the parent process as a Process object pre-emptively
-        checking whether PID has been reused.
-        If no parent is known return None.
-        """
-        lowest_pid = _LOWEST_PID if _LOWEST_PID is not None else pids()[0]
-        if self.pid == lowest_pid:
-            return None
-        ppid = self.ppid()
-        if ppid is not None:
-            ctime = self.create_time()
-            try:
-                parent = Process(ppid)
-                if parent.create_time() <= ctime:
-                    return parent
-                # ...else ppid has been reused by another process
-            except NoSuchProcess:
-                pass
-
-    def parents(self):
-        """Return the parents of this process as a list of Process
-        instances. If no parents are known return an empty list.
-        """
-        parents = []
-        proc = self.parent()
-        while proc is not None:
-            parents.append(proc)
-            proc = proc.parent()
-        return parents
-
-    def is_running(self):
-        """Return whether this process is running.
-        It also checks if PID has been reused by another process in
-        which case return False.
-        """
-        if self._gone:
-            return False
-        try:
-            # Checking if PID is alive is not enough as the PID might
-            # have been reused by another process: we also want to
-            # verify process identity.
-            # Process identity / uniqueness over time is guaranteed by
-            # (PID + creation time) and that is verified in __eq__.
-            return self == Process(self.pid)
-        except ZombieProcess:
-            # We should never get here as it's already handled in
-            # Process.__init__; here just for extra safety.
-            return True
-        except NoSuchProcess:
-            self._gone = True
-            return False
-
-    # --- actual API
-
-    @memoize_when_activated
-    def ppid(self):
-        """The process parent PID.
-        On Windows the return value is cached after first call.
-        """
-        # On POSIX we don't want to cache the ppid as it may unexpectedly
-        # change to 1 (init) in case this process turns into a zombie:
-        # https://github.com/giampaolo/psutil/issues/321
-        # http://stackoverflow.com/questions/356722/
-
-        # XXX should we check creation time here rather than in
-        # Process.parent()?
-        if POSIX:
-            return self._proc.ppid()
-        else:  # pragma: no cover
-            self._ppid = self._ppid or self._proc.ppid()
-            return self._ppid
-
-    def name(self):
-        """The process name. The return value is cached after first call."""
-        # Process name is only cached on Windows as on POSIX it may
-        # change, see:
-        # https://github.com/giampaolo/psutil/issues/692
-        if WINDOWS and self._name is not None:
-            return self._name
-        name = self._proc.name()
-        if POSIX and len(name) >= 15:
-            # On UNIX the name gets truncated to the first 15 characters.
-            # If it matches the first part of the cmdline we return that
-            # one instead because it's usually more explicative.
-            # Examples are "gnome-keyring-d" vs. "gnome-keyring-daemon".
-            try:
-                cmdline = self.cmdline()
-            except AccessDenied:
-                pass
-            else:
-                if cmdline:
-                    extended_name = os.path.basename(cmdline[0])
-                    if extended_name.startswith(name):
-                        name = extended_name
-        self._name = name
-        self._proc._name = name
-        return name
-
-    def exe(self):
-        """The process executable as an absolute path.
-        May also be an empty string.
-        The return value is cached after first call.
-        """
-        def guess_it(fallback):
-            # try to guess exe from cmdline[0] in absence of a native
-            # exe representation
-            cmdline = self.cmdline()
-            if cmdline and hasattr(os, 'access') and hasattr(os, 'X_OK'):
-                exe = cmdline[0]  # the possible exe
-                # Attempt to guess only in case of an absolute path.
-                # It is not safe otherwise as the process might have
-                # changed cwd.
-                if (os.path.isabs(exe) and
-                        os.path.isfile(exe) and
-                        os.access(exe, os.X_OK)):
-                    return exe
-            if isinstance(fallback, AccessDenied):
-                raise fallback
-            return fallback
-
-        if self._exe is None:
-            try:
-                exe = self._proc.exe()
-            except AccessDenied as err:
-                return guess_it(fallback=err)
-            else:
-                if not exe:
-                    # underlying implementation can legitimately return an
-                    # empty string; if that's the case we don't want to
-                    # raise AD while guessing from the cmdline
-                    try:
-                        exe = guess_it(fallback=exe)
-                    except AccessDenied:
-                        pass
-                self._exe = exe
-        return self._exe
-
-    def cmdline(self):
-        """The command line this process has been called with."""
-        return self._proc.cmdline()
-
-    def status(self):
-        """The process current status as a STATUS_* constant."""
-        try:
-            return self._proc.status()
-        except ZombieProcess:
-            return STATUS_ZOMBIE
-
-    def username(self):
-        """The name of the user that owns the process.
-        On UNIX this is calculated by using *real* process uid.
-        """
-        if POSIX:
-            if pwd is None:
-                # might happen if python was installed from sources
-                raise ImportError(
-                    "requires pwd module shipped with standard python")
-            real_uid = self.uids().real
-            try:
-                return pwd.getpwuid(real_uid).pw_name
-            except KeyError:
-                # the uid can't be resolved by the system
-                return str(real_uid)
-        else:
-            return self._proc.username()
-
-    def create_time(self):
-        """The process creation time as a floating point number
-        expressed in seconds since the epoch, in UTC.
-        The return value is cached after first call.
-        """
-        if self._create_time is None:
-            self._create_time = self._proc.create_time()
-        return self._create_time
-
-    def cwd(self):
-        """Process current working directory as an absolute path."""
-        return self._proc.cwd()
-
-    def nice(self, value=None):
-        """Get or set process niceness (priority)."""
-        if value is None:
-            return self._proc.nice_get()
-        else:
-            if not self.is_running():
-                raise NoSuchProcess(self.pid, self._name)
-            self._proc.nice_set(value)
-
-    if POSIX:
-
-        @memoize_when_activated
-        def uids(self):
-            """Return process UIDs as a (real, effective, saved)
-            namedtuple.
-            """
-            return self._proc.uids()
-
-        def gids(self):
-            """Return process GIDs as a (real, effective, saved)
-            namedtuple.
-            """
-            return self._proc.gids()
-
-        def terminal(self):
-            """The terminal associated with this process, if any,
-            else None.
-            """
-            return self._proc.terminal()
-
-        def num_fds(self):
-            """Return the number of file descriptors opened by this
-            process (POSIX only).
-            """
-            return self._proc.num_fds()
-
-    # Linux, BSD, AIX and Windows only
-    if hasattr(_psplatform.Process, "io_counters"):
-
-        def io_counters(self):
-            """Return process I/O statistics as a
-            (read_count, write_count, read_bytes, write_bytes)
-            namedtuple.
-            Those are the number of read/write calls performed and the
-            amount of bytes read and written by the process.
-            """
-            return self._proc.io_counters()
-
-    # Linux and Windows
-    if hasattr(_psplatform.Process, "ionice_get"):
-
-        def ionice(self, ioclass=None, value=None):
-            """Get or set process I/O niceness (priority).
-
-            On Linux *ioclass* is one of the IOPRIO_CLASS_* constants.
-            *value* is a number which goes from 0 to 7. The higher the
-            value, the lower the I/O priority of the process.
-
-            On Windows only *ioclass* is used and it can be set to 2
-            (normal), 1 (low) or 0 (very low).
-
-            Available on Linux and Windows > Vista only.
-            """
-            if ioclass is None:
-                if value is not None:
-                    raise ValueError("'ioclass' argument must be specified")
-                return self._proc.ionice_get()
-            else:
-                return self._proc.ionice_set(ioclass, value)
-
-    # Linux only
-    if hasattr(_psplatform.Process, "rlimit"):
-
-        def rlimit(self, resource, limits=None):
-            """Get or set process resource limits as a (soft, hard)
-            tuple.
-
-            *resource* is one of the RLIMIT_* constants.
-            *limits* is supposed to be a (soft, hard)  tuple.
-
-            See "man prlimit" for further info.
-            Available on Linux only.
-            """
-            if limits is None:
-                return self._proc.rlimit(resource)
-            else:
-                return self._proc.rlimit(resource, limits)
-
-    # Windows, Linux and FreeBSD only
-    if hasattr(_psplatform.Process, "cpu_affinity_get"):
-
-        def cpu_affinity(self, cpus=None):
-            """Get or set process CPU affinity.
-            If specified, *cpus* must be a list of CPUs for which you
-            want to set the affinity (e.g. [0, 1]).
-            If an empty list is passed, all egible CPUs are assumed
-            (and set).
-            (Windows, Linux and BSD only).
-            """
-            if cpus is None:
-                return list(set(self._proc.cpu_affinity_get()))
-            else:
-                if not cpus:
-                    if hasattr(self._proc, "_get_eligible_cpus"):
-                        cpus = self._proc._get_eligible_cpus()
-                    else:
-                        cpus = tuple(range(len(cpu_times(percpu=True))))
-                self._proc.cpu_affinity_set(list(set(cpus)))
-
-    # Linux, FreeBSD, SunOS
-    if hasattr(_psplatform.Process, "cpu_num"):
-
-        def cpu_num(self):
-            """Return what CPU this process is currently running on.
-            The returned number should be <= psutil.cpu_count()
-            and <= len(psutil.cpu_percent(percpu=True)).
-            It may be used in conjunction with
-            psutil.cpu_percent(percpu=True) to observe the system
-            workload distributed across CPUs.
-            """
-            return self._proc.cpu_num()
-
-    # Linux, macOS, Windows, Solaris, AIX
-    if hasattr(_psplatform.Process, "environ"):
-
-        def environ(self):
-            """The environment variables of the process as a dict.  Note: this
-            might not reflect changes made after the process started.  """
-            return self._proc.environ()
-
-    if WINDOWS:
-
-        def num_handles(self):
-            """Return the number of handles opened by this process
-            (Windows only).
-            """
-            return self._proc.num_handles()
-
-    def num_ctx_switches(self):
-        """Return the number of voluntary and involuntary context
-        switches performed by this process.
-        """
-        return self._proc.num_ctx_switches()
-
-    def num_threads(self):
-        """Return the number of threads used by this process."""
-        return self._proc.num_threads()
-
-    if hasattr(_psplatform.Process, "threads"):
-
-        def threads(self):
-            """Return threads opened by process as a list of
-            (id, user_time, system_time) namedtuples representing
-            thread id and thread CPU times (user/system).
-            On OpenBSD this method requires root access.
-            """
-            return self._proc.threads()
-
-    @_assert_pid_not_reused
-    def children(self, recursive=False):
-        """Return the children of this process as a list of Process
-        instances, pre-emptively checking whether PID has been reused.
-        If *recursive* is True return all the parent descendants.
-
-        Example (A == this process):
-
-         A ─�
-            │
-            ├─ B (child) ─�
-            │             └─ X (grandchild) ─�
-            │                                └─ Y (great grandchild)
-            ├─ C (child)
-            └─ D (child)
-
-        >>> import psutil
-        >>> p = psutil.Process()
-        >>> p.children()
-        B, C, D
-        >>> p.children(recursive=True)
-        B, X, Y, C, D
-
-        Note that in the example above if process X disappears
-        process Y won't be listed as the reference to process A
-        is lost.
-        """
-        ppid_map = _ppid_map()
-        ret = []
-        if not recursive:
-            for pid, ppid in ppid_map.items():
-                if ppid == self.pid:
-                    try:
-                        child = Process(pid)
-                        # if child happens to be older than its parent
-                        # (self) it means child's PID has been reused
-                        if self.create_time() <= child.create_time():
-                            ret.append(child)
-                    except (NoSuchProcess, ZombieProcess):
-                        pass
-        else:
-            # Construct a {pid: [child pids]} dict
-            reverse_ppid_map = collections.defaultdict(list)
-            for pid, ppid in ppid_map.items():
-                reverse_ppid_map[ppid].append(pid)
-            # Recursively traverse that dict, starting from self.pid,
-            # such that we only call Process() on actual children
-            seen = set()
-            stack = [self.pid]
-            while stack:
-                pid = stack.pop()
-                if pid in seen:
-                    # Since pids can be reused while the ppid_map is
-                    # constructed, there may be rare instances where
-                    # there's a cycle in the recorded process "tree".
-                    continue
-                seen.add(pid)
-                for child_pid in reverse_ppid_map[pid]:
-                    try:
-                        child = Process(child_pid)
-                        # if child happens to be older than its parent
-                        # (self) it means child's PID has been reused
-                        intime = self.create_time() <= child.create_time()
-                        if intime:
-                            ret.append(child)
-                            stack.append(child_pid)
-                    except (NoSuchProcess, ZombieProcess):
-                        pass
-        return ret
-
-    def cpu_percent(self, interval=None):
-        """Return a float representing the current process CPU
-        utilization as a percentage.
-
-        When *interval* is 0.0 or None (default) compares process times
-        to system CPU times elapsed since last call, returning
-        immediately (non-blocking). That means that the first time
-        this is called it will return a meaningful 0.0 value.
-
-        When *interval* is > 0.0 compares process times to system CPU
-        times elapsed before and after the interval (blocking).
-
-        In this case is recommended for accuracy that this function
-        be called with at least 0.1 seconds between calls.
-
-        A value > 100.0 can be returned in case of processes running
-        multiple threads on different CPU cores.
-
-        The returned value is explicitly NOT split evenly between
-        all available logical CPUs. This means that a busy loop process
-        running on a system with 2 logical CPUs will be reported as
-        having 100% CPU utilization instead of 50%.
-
-        Examples:
-
-          >>> import psutil
-          >>> p = psutil.Process(os.getpid())
-          >>> # blocking
-          >>> p.cpu_percent(interval=1)
-          2.0
-          >>> # non-blocking (percentage since last call)
-          >>> p.cpu_percent(interval=None)
-          2.9
-          >>>
-        """
-        blocking = interval is not None and interval > 0.0
-        if interval is not None and interval < 0:
-            raise ValueError("interval is not positive (got %r)" % interval)
-        num_cpus = cpu_count() or 1
-
-        def timer():
-            return _timer() * num_cpus
-
-        if blocking:
-            st1 = timer()
-            pt1 = self._proc.cpu_times()
-            time.sleep(interval)
-            st2 = timer()
-            pt2 = self._proc.cpu_times()
-        else:
-            st1 = self._last_sys_cpu_times
-            pt1 = self._last_proc_cpu_times
-            st2 = timer()
-            pt2 = self._proc.cpu_times()
-            if st1 is None or pt1 is None:
-                self._last_sys_cpu_times = st2
-                self._last_proc_cpu_times = pt2
-                return 0.0
-
-        delta_proc = (pt2.user - pt1.user) + (pt2.system - pt1.system)
-        delta_time = st2 - st1
-        # reset values for next call in case of interval == None
-        self._last_sys_cpu_times = st2
-        self._last_proc_cpu_times = pt2
-
-        try:
-            # This is the utilization split evenly between all CPUs.
-            # E.g. a busy loop process on a 2-CPU-cores system at this
-            # point is reported as 50% instead of 100%.
-            overall_cpus_percent = ((delta_proc / delta_time) * 100)
-        except ZeroDivisionError:
-            # interval was too low
-            return 0.0
-        else:
-            # Note 1:
-            # in order to emulate "top" we multiply the value for the num
-            # of CPU cores. This way the busy process will be reported as
-            # having 100% (or more) usage.
-            #
-            # Note 2:
-            # taskmgr.exe on Windows differs in that it will show 50%
-            # instead.
-            #
-            # Note 3:
-            # a percentage > 100 is legitimate as it can result from a
-            # process with multiple threads running on different CPU
-            # cores (top does the same), see:
-            # http://stackoverflow.com/questions/1032357
-            # https://github.com/giampaolo/psutil/issues/474
-            single_cpu_percent = overall_cpus_percent * num_cpus
-            return round(single_cpu_percent, 1)
-
-    @memoize_when_activated
-    def cpu_times(self):
-        """Return a (user, system, children_user, children_system)
-        namedtuple representing the accumulated process time, in
-        seconds.
-        This is similar to os.times() but per-process.
-        On macOS and Windows children_user and children_system are
-        always set to 0.
-        """
-        return self._proc.cpu_times()
-
-    @memoize_when_activated
-    def memory_info(self):
-        """Return a namedtuple with variable fields depending on the
-        platform, representing memory information about the process.
-
-        The "portable" fields available on all plaforms are `rss` and `vms`.
-
-        All numbers are expressed in bytes.
-        """
-        return self._proc.memory_info()
-
-    @deprecated_method(replacement="memory_info")
-    def memory_info_ex(self):
-        return self.memory_info()
-
-    def memory_full_info(self):
-        """This method returns the same information as memory_info(),
-        plus, on some platform (Linux, macOS, Windows), also provides
-        additional metrics (USS, PSS and swap).
-        The additional metrics provide a better representation of actual
-        process memory usage.
-
-        Namely USS is the memory which is unique to a process and which
-        would be freed if the process was terminated right now.
-
-        It does so by passing through the whole process address.
-        As such it usually requires higher user privileges than
-        memory_info() and is considerably slower.
-        """
-        return self._proc.memory_full_info()
-
-    def memory_percent(self, memtype="rss"):
-        """Compare process memory to total physical system memory and
-        calculate process memory utilization as a percentage.
-        *memtype* argument is a string that dictates what type of
-        process memory you want to compare against (defaults to "rss").
-        The list of available strings can be obtained like this:
-
-        >>> psutil.Process().memory_info()._fields
-        ('rss', 'vms', 'shared', 'text', 'lib', 'data', 'dirty', 'uss', 'pss')
-        """
-        valid_types = list(_psplatform.pfullmem._fields)
-        if memtype not in valid_types:
-            raise ValueError("invalid memtype %r; valid types are %r" % (
-                memtype, tuple(valid_types)))
-        fun = self.memory_info if memtype in _psplatform.pmem._fields else \
-            self.memory_full_info
-        metrics = fun()
-        value = getattr(metrics, memtype)
-
-        # use cached value if available
-        total_phymem = _TOTAL_PHYMEM or virtual_memory().total
-        if not total_phymem > 0:
-            # we should never get here
-            raise ValueError(
-                "can't calculate process memory percent because "
-                "total physical system memory is not positive (%r)"
-                % total_phymem)
-        return (value / float(total_phymem)) * 100
-
-    if hasattr(_psplatform.Process, "memory_maps"):
-        def memory_maps(self, grouped=True):
-            """Return process' mapped memory regions as a list of namedtuples
-            whose fields are variable depending on the platform.
-
-            If *grouped* is True the mapped regions with the same 'path'
-            are grouped together and the different memory fields are summed.
-
-            If *grouped* is False every mapped region is shown as a single
-            entity and the namedtuple will also include the mapped region's
-            address space ('addr') and permission set ('perms').
-            """
-            it = self._proc.memory_maps()
-            if grouped:
-                d = {}
-                for tupl in it:
-                    path = tupl[2]
-                    nums = tupl[3:]
-                    try:
-                        d[path] = map(lambda x, y: x + y, d[path], nums)
-                    except KeyError:
-                        d[path] = nums
-                nt = _psplatform.pmmap_grouped
-                return [nt(path, *d[path]) for path in d]  # NOQA
-            else:
-                nt = _psplatform.pmmap_ext
-                return [nt(*x) for x in it]
-
-    def open_files(self):
-        """Return files opened by process as a list of
-        (path, fd) namedtuples including the absolute file name
-        and file descriptor number.
-        """
-        return self._proc.open_files()
-
-    def connections(self, kind='inet'):
-        """Return socket connections opened by process as a list of
-        (fd, family, type, laddr, raddr, status) namedtuples.
-        The *kind* parameter filters for connections that match the
-        following criteria:
-
-        +------------+----------------------------------------------------+
-        | Kind Value | Connections using                                  |
-        +------------+----------------------------------------------------+
-        | inet       | IPv4 and IPv6                                      |
-        | inet4      | IPv4                                               |
-        | inet6      | IPv6                                               |
-        | tcp        | TCP                                                |
-        | tcp4       | TCP over IPv4                                      |
-        | tcp6       | TCP over IPv6                                      |
-        | udp        | UDP                                                |
-        | udp4       | UDP over IPv4                                      |
-        | udp6       | UDP over IPv6                                      |
-        | unix       | UNIX socket (both UDP and TCP protocols)           |
-        | all        | the sum of all the possible families and protocols |
-        +------------+----------------------------------------------------+
-        """
-        return self._proc.connections(kind)
-
-    # --- signals
-
-    if POSIX:
-        def _send_signal(self, sig):
-            assert not self.pid < 0, self.pid
-            if self.pid == 0:
-                # see "man 2 kill"
-                raise ValueError(
-                    "preventing sending signal to process with PID 0 as it "
-                    "would affect every process in the process group of the "
-                    "calling process (os.getpid()) instead of PID 0")
-            try:
-                os.kill(self.pid, sig)
-            except ProcessLookupError:
-                if OPENBSD and pid_exists(self.pid):
-                    # We do this because os.kill() lies in case of
-                    # zombie processes.
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-                else:
-                    self._gone = True
-                    raise NoSuchProcess(self.pid, self._name)
-            except PermissionError:
-                raise AccessDenied(self.pid, self._name)
-
-    @_assert_pid_not_reused
-    def send_signal(self, sig):
-        """Send a signal *sig* to process pre-emptively checking
-        whether PID has been reused (see signal module constants) .
-        On Windows only SIGTERM is valid and is treated as an alias
-        for kill().
-        """
-        if POSIX:
-            self._send_signal(sig)
-        else:  # pragma: no cover
-            self._proc.send_signal(sig)
-
-    @_assert_pid_not_reused
-    def suspend(self):
-        """Suspend process execution with SIGSTOP pre-emptively checking
-        whether PID has been reused.
-        On Windows this has the effect ot suspending all process threads.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGSTOP)
-        else:  # pragma: no cover
-            self._proc.suspend()
-
-    @_assert_pid_not_reused
-    def resume(self):
-        """Resume process execution with SIGCONT pre-emptively checking
-        whether PID has been reused.
-        On Windows this has the effect of resuming all process threads.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGCONT)
-        else:  # pragma: no cover
-            self._proc.resume()
-
-    @_assert_pid_not_reused
-    def terminate(self):
-        """Terminate the process with SIGTERM pre-emptively checking
-        whether PID has been reused.
-        On Windows this is an alias for kill().
-        """
-        if POSIX:
-            self._send_signal(signal.SIGTERM)
-        else:  # pragma: no cover
-            self._proc.kill()
-
-    @_assert_pid_not_reused
-    def kill(self):
-        """Kill the current process with SIGKILL pre-emptively checking
-        whether PID has been reused.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGKILL)
-        else:  # pragma: no cover
-            self._proc.kill()
-
-    def wait(self, timeout=None):
-        """Wait for process to terminate and, if process is a children
-        of os.getpid(), also return its exit code, else None.
-        On Windows there's no such limitation (exit code is always
-        returned).
-
-        If the process is already terminated immediately return None
-        instead of raising NoSuchProcess.
-
-        If *timeout* (in seconds) is specified and process is still
-        alive raise TimeoutExpired.
-
-        To wait for multiple Process(es) use psutil.wait_procs().
-        """
-        if timeout is not None and not timeout >= 0:
-            raise ValueError("timeout must be a positive integer")
-        return self._proc.wait(timeout)
-
-
-# =====================================================================
-# --- Popen class
-# =====================================================================
-
-
-class Popen(Process):
-    """A more convenient interface to stdlib subprocess.Popen class.
-    It starts a sub process and deals with it exactly as when using
-    subprocess.Popen class but in addition also provides all the
-    properties and methods of psutil.Process class as a unified
-    interface:
-
-      >>> import psutil
-      >>> from subprocess import PIPE
-      >>> p = psutil.Popen(["python", "-c", "print 'hi'"], stdout=PIPE)
-      >>> p.name()
-      'python'
-      >>> p.uids()
-      user(real=1000, effective=1000, saved=1000)
-      >>> p.username()
-      'giampaolo'
-      >>> p.communicate()
-      ('hi\n', None)
-      >>> p.terminate()
-      >>> p.wait(timeout=2)
-      0
-      >>>
-
-    For method names common to both classes such as kill(), terminate()
-    and wait(), psutil.Process implementation takes precedence.
-
-    Unlike subprocess.Popen this class pre-emptively checks whether PID
-    has been reused on send_signal(), terminate() and kill() so that
-    you don't accidentally terminate another process, fixing
-    http://bugs.python.org/issue6973.
-
-    For a complete documentation refer to:
-    http://docs.python.org/3/library/subprocess.html
-    """
-
-    def __init__(self, *args, **kwargs):
-        # Explicitly avoid to raise NoSuchProcess in case the process
-        # spawned by subprocess.Popen terminates too quickly, see:
-        # https://github.com/giampaolo/psutil/issues/193
-        self.__subproc = subprocess.Popen(*args, **kwargs)
-        self._init(self.__subproc.pid, _ignore_nsp=True)
-
-    def __dir__(self):
-        return sorted(set(dir(Popen) + dir(subprocess.Popen)))
-
-    def __enter__(self):
-        if hasattr(self.__subproc, '__enter__'):
-            self.__subproc.__enter__()
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        if hasattr(self.__subproc, '__exit__'):
-            return self.__subproc.__exit__(*args, **kwargs)
-        else:
-            if self.stdout:
-                self.stdout.close()
-            if self.stderr:
-                self.stderr.close()
-            try:
-                # Flushing a BufferedWriter may raise an error.
-                if self.stdin:
-                    self.stdin.close()
-            finally:
-                # Wait for the process to terminate, to avoid zombies.
-                self.wait()
-
-    def __getattribute__(self, name):
-        try:
-            return object.__getattribute__(self, name)
-        except AttributeError:
-            try:
-                return object.__getattribute__(self.__subproc, name)
-            except AttributeError:
-                raise AttributeError("%s instance has no attribute '%s'"
-                                     % (self.__class__.__name__, name))
-
-    def wait(self, timeout=None):
-        if self.__subproc.returncode is not None:
-            return self.__subproc.returncode
-        ret = super(Popen, self).wait(timeout)
-        self.__subproc.returncode = ret
-        return ret
-
-
-# The valid attr names which can be processed by Process.as_dict().
-_as_dict_attrnames = set(
-    [x for x in dir(Process) if not x.startswith('_') and x not in
-     ['send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
-      'is_running', 'as_dict', 'parent', 'parents', 'children', 'rlimit',
-      'memory_info_ex', 'oneshot']])
-
-
-# =====================================================================
-# --- system processes related functions
-# =====================================================================
-
-
-def pids():
-    """Return a list of current running PIDs."""
-    global _LOWEST_PID
-    ret = sorted(_psplatform.pids())
-    _LOWEST_PID = ret[0]
-    return ret
-
-
-def pid_exists(pid):
-    """Return True if given PID exists in the current process list.
-    This is faster than doing "pid in psutil.pids()" and
-    should be preferred.
-    """
-    if pid < 0:
-        return False
-    elif pid == 0 and POSIX:
-        # On POSIX we use os.kill() to determine PID existence.
-        # According to "man 2 kill" PID 0 has a special meaning
-        # though: it refers to <<every process in the process
-        # group of the calling process>> and that is not we want
-        # to do here.
-        return pid in pids()
-    else:
-        return _psplatform.pid_exists(pid)
-
-
-_pmap = {}
-_lock = threading.Lock()
-
-
-def process_iter(attrs=None, ad_value=None):
-    """Return a generator yielding a Process instance for all
-    running processes.
-
-    Every new Process instance is only created once and then cached
-    into an internal table which is updated every time this is used.
-
-    Cached Process instances are checked for identity so that you're
-    safe in case a PID has been reused by another process, in which
-    case the cached instance is updated.
-
-    The sorting order in which processes are yielded is based on
-    their PIDs.
-
-    *attrs* and *ad_value* have the same meaning as in
-    Process.as_dict(). If *attrs* is specified as_dict() is called
-    and the resulting dict is stored as a 'info' attribute attached
-    to returned Process instance.
-    If *attrs* is an empty list it will retrieve all process info
-    (slow).
-    """
-    def add(pid):
-        proc = Process(pid)
-        if attrs is not None:
-            proc.info = proc.as_dict(attrs=attrs, ad_value=ad_value)
-        with _lock:
-            _pmap[proc.pid] = proc
-        return proc
-
-    def remove(pid):
-        with _lock:
-            _pmap.pop(pid, None)
-
-    a = set(pids())
-    b = set(_pmap.keys())
-    new_pids = a - b
-    gone_pids = b - a
-    for pid in gone_pids:
-        remove(pid)
-
-    with _lock:
-        ls = sorted(list(_pmap.items()) +
-                    list(dict.fromkeys(new_pids).items()))
-
-    for pid, proc in ls:
-        try:
-            if proc is None:  # new process
-                yield add(pid)
-            else:
-                # use is_running() to check whether PID has been reused by
-                # another process in which case yield a new Process instance
-                if proc.is_running():
-                    if attrs is not None:
-                        proc.info = proc.as_dict(
-                            attrs=attrs, ad_value=ad_value)
-                    yield proc
-                else:
-                    yield add(pid)
-        except NoSuchProcess:
-            remove(pid)
-        except AccessDenied:
-            # Process creation time can't be determined hence there's
-            # no way to tell whether the pid of the cached process
-            # has been reused. Just return the cached version.
-            if proc is None and pid in _pmap:
-                try:
-                    yield _pmap[pid]
-                except KeyError:
-                    # If we get here it is likely that 2 threads were
-                    # using process_iter().
-                    pass
-            else:
-                raise
-
-
-def wait_procs(procs, timeout=None, callback=None):
-    """Convenience function which waits for a list of processes to
-    terminate.
-
-    Return a (gone, alive) tuple indicating which processes
-    are gone and which ones are still alive.
-
-    The gone ones will have a new *returncode* attribute indicating
-    process exit status (may be None).
-
-    *callback* is a function which gets called every time a process
-    terminates (a Process instance is passed as callback argument).
-
-    Function will return as soon as all processes terminate or when
-    *timeout* occurs.
-    Differently from Process.wait() it will not raise TimeoutExpired if
-    *timeout* occurs.
-
-    Typical use case is:
-
-     - send SIGTERM to a list of processes
-     - give them some time to terminate
-     - send SIGKILL to those ones which are still alive
-
-    Example:
-
-    >>> def on_terminate(proc):
-    ...     print("process {} terminated".format(proc))
-    ...
-    >>> for p in procs:
-    ...    p.terminate()
-    ...
-    >>> gone, alive = wait_procs(procs, timeout=3, callback=on_terminate)
-    >>> for p in alive:
-    ...     p.kill()
-    """
-    def check_gone(proc, timeout):
-        try:
-            returncode = proc.wait(timeout=timeout)
-        except TimeoutExpired:
-            pass
-        else:
-            if returncode is not None or not proc.is_running():
-                # Set new Process instance attribute.
-                proc.returncode = returncode
-                gone.add(proc)
-                if callback is not None:
-                    callback(proc)
-
-    if timeout is not None and not timeout >= 0:
-        msg = "timeout must be a positive integer, got %s" % timeout
-        raise ValueError(msg)
-    gone = set()
-    alive = set(procs)
-    if callback is not None and not callable(callback):
-        raise TypeError("callback %r is not a callable" % callable)
-    if timeout is not None:
-        deadline = _timer() + timeout
-
-    while alive:
-        if timeout is not None and timeout <= 0:
-            break
-        for proc in alive:
-            # Make sure that every complete iteration (all processes)
-            # will last max 1 sec.
-            # We do this because we don't want to wait too long on a
-            # single process: in case it terminates too late other
-            # processes may disappear in the meantime and their PID
-            # reused.
-            max_timeout = 1.0 / len(alive)
-            if timeout is not None:
-                timeout = min((deadline - _timer()), max_timeout)
-                if timeout <= 0:
-                    break
-                check_gone(proc, timeout)
-            else:
-                check_gone(proc, max_timeout)
-        alive = alive - gone
-
-    if alive:
-        # Last attempt over processes survived so far.
-        # timeout == 0 won't make this function wait any further.
-        for proc in alive:
-            check_gone(proc, 0)
-        alive = alive - gone
-
-    return (list(gone), list(alive))
-
-
-# =====================================================================
-# --- CPU related functions
-# =====================================================================
-
-
-def cpu_count(logical=True):
-    """Return the number of logical CPUs in the system (same as
-    os.cpu_count() in Python 3.4).
-
-    If *logical* is False return the number of physical cores only
-    (e.g. hyper thread CPUs are excluded).
-
-    Return None if undetermined.
-
-    The return value is cached after first call.
-    If desired cache can be cleared like this:
-
-    >>> psutil.cpu_count.cache_clear()
-    """
-    if logical:
-        ret = _psplatform.cpu_count_logical()
-    else:
-        ret = _psplatform.cpu_count_physical()
-    if ret is not None and ret < 1:
-        ret = None
-    return ret
-
-
-def cpu_times(percpu=False):
-    """Return system-wide CPU times as a namedtuple.
-    Every CPU time represents the seconds the CPU has spent in the
-    given mode. The namedtuple's fields availability varies depending on the
-    platform:
-
-     - user
-     - system
-     - idle
-     - nice (UNIX)
-     - iowait (Linux)
-     - irq (Linux, FreeBSD)
-     - softirq (Linux)
-     - steal (Linux >= 2.6.11)
-     - guest (Linux >= 2.6.24)
-     - guest_nice (Linux >= 3.2.0)
-
-    When *percpu* is True return a list of namedtuples for each CPU.
-    First element of the list refers to first CPU, second element
-    to second CPU and so on.
-    The order of the list is consistent across calls.
-    """
-    if not percpu:
-        return _psplatform.cpu_times()
-    else:
-        return _psplatform.per_cpu_times()
-
-
-try:
-    _last_cpu_times = cpu_times()
-except Exception:
-    # Don't want to crash at import time.
-    _last_cpu_times = None
-
-try:
-    _last_per_cpu_times = cpu_times(percpu=True)
-except Exception:
-    # Don't want to crash at import time.
-    _last_per_cpu_times = None
-
-
-def _cpu_tot_time(times):
-    """Given a cpu_time() ntuple calculates the total CPU time
-    (including idle time).
-    """
-    tot = sum(times)
-    if LINUX:
-        # On Linux guest times are already accounted in "user" or
-        # "nice" times, so we subtract them from total.
-        # Htop does the same. References:
-        # https://github.com/giampaolo/psutil/pull/940
-        # http://unix.stackexchange.com/questions/178045
-        # https://github.com/torvalds/linux/blob/
-        #     447976ef4fd09b1be88b316d1a81553f1aa7cd07/kernel/sched/
-        #     cputime.c#L158
-        tot -= getattr(times, "guest", 0)  # Linux 2.6.24+
-        tot -= getattr(times, "guest_nice", 0)  # Linux 3.2.0+
-    return tot
-
-
-def _cpu_busy_time(times):
-    """Given a cpu_time() ntuple calculates the busy CPU time.
-    We do so by subtracting all idle CPU times.
-    """
-    busy = _cpu_tot_time(times)
-    busy -= times.idle
-    # Linux: "iowait" is time during which the CPU does not do anything
-    # (waits for IO to complete). On Linux IO wait is *not* accounted
-    # in "idle" time so we subtract it. Htop does the same.
-    # References:
-    # https://github.com/torvalds/linux/blob/
-    #     447976ef4fd09b1be88b316d1a81553f1aa7cd07/kernel/sched/cputime.c#L244
-    busy -= getattr(times, "iowait", 0)
-    return busy
-
-
-def _cpu_times_deltas(t1, t2):
-    assert t1._fields == t2._fields, (t1, t2)
-    field_deltas = []
-    for field in _psplatform.scputimes._fields:
-        field_delta = getattr(t2, field) - getattr(t1, field)
-        # CPU times are always supposed to increase over time
-        # or at least remain the same and that's because time
-        # cannot go backwards.
-        # Surprisingly sometimes this might not be the case (at
-        # least on Windows and Linux), see:
-        # https://github.com/giampaolo/psutil/issues/392
-        # https://github.com/giampaolo/psutil/issues/645
-        # https://github.com/giampaolo/psutil/issues/1210
-        # Trim negative deltas to zero to ignore decreasing fields.
-        # top does the same. Reference:
-        # https://gitlab.com/procps-ng/procps/blob/v3.3.12/top/top.c#L5063
-        field_delta = max(0, field_delta)
-        field_deltas.append(field_delta)
-    return _psplatform.scputimes(*field_deltas)
-
-
-def cpu_percent(interval=None, percpu=False):
-    """Return a float representing the current system-wide CPU
-    utilization as a percentage.
-
-    When *interval* is > 0.0 compares system CPU times elapsed before
-    and after the interval (blocking).
-
-    When *interval* is 0.0 or None compares system CPU times elapsed
-    since last call or module import, returning immediately (non
-    blocking). That means the first time this is called it will
-    return a meaningless 0.0 value which you should ignore.
-    In this case is recommended for accuracy that this function be
-    called with at least 0.1 seconds between calls.
-
-    When *percpu* is True returns a list of floats representing the
-    utilization as a percentage for each CPU.
-    First element of the list refers to first CPU, second element
-    to second CPU and so on.
-    The order of the list is consistent across calls.
-
-    Examples:
-
-      >>> # blocking, system-wide
-      >>> psutil.cpu_percent(interval=1)
-      2.0
-      >>>
-      >>> # blocking, per-cpu
-      >>> psutil.cpu_percent(interval=1, percpu=True)
-      [2.0, 1.0]
-      >>>
-      >>> # non-blocking (percentage since last call)
-      >>> psutil.cpu_percent(interval=None)
-      2.9
-      >>>
-    """
-    global _last_cpu_times
-    global _last_per_cpu_times
-    blocking = interval is not None and interval > 0.0
-    if interval is not None and interval < 0:
-        raise ValueError("interval is not positive (got %r)" % interval)
-
-    def calculate(t1, t2):
-        times_delta = _cpu_times_deltas(t1, t2)
-
-        all_delta = _cpu_tot_time(times_delta)
-        busy_delta = _cpu_busy_time(times_delta)
-
-        try:
-            busy_perc = (busy_delta / all_delta) * 100
-        except ZeroDivisionError:
-            return 0.0
-        else:
-            return round(busy_perc, 1)
-
-    # system-wide usage
-    if not percpu:
-        if blocking:
-            t1 = cpu_times()
-            time.sleep(interval)
-        else:
-            t1 = _last_cpu_times
-            if t1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                t1 = cpu_times()
-        _last_cpu_times = cpu_times()
-        return calculate(t1, _last_cpu_times)
-    # per-cpu usage
-    else:
-        ret = []
-        if blocking:
-            tot1 = cpu_times(percpu=True)
-            time.sleep(interval)
-        else:
-            tot1 = _last_per_cpu_times
-            if tot1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                tot1 = cpu_times(percpu=True)
-        _last_per_cpu_times = cpu_times(percpu=True)
-        for t1, t2 in zip(tot1, _last_per_cpu_times):
-            ret.append(calculate(t1, t2))
-        return ret
-
-
-# Use separate global vars for cpu_times_percent() so that it's
-# independent from cpu_percent() and they can both be used within
-# the same program.
-_last_cpu_times_2 = _last_cpu_times
-_last_per_cpu_times_2 = _last_per_cpu_times
-
-
-def cpu_times_percent(interval=None, percpu=False):
-    """Same as cpu_percent() but provides utilization percentages
-    for each specific CPU time as is returned by cpu_times().
-    For instance, on Linux we'll get:
-
-      >>> cpu_times_percent()
-      cpupercent(user=4.8, nice=0.0, system=4.8, idle=90.5, iowait=0.0,
-                 irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-      >>>
-
-    *interval* and *percpu* arguments have the same meaning as in
-    cpu_percent().
-    """
-    global _last_cpu_times_2
-    global _last_per_cpu_times_2
-    blocking = interval is not None and interval > 0.0
-    if interval is not None and interval < 0:
-        raise ValueError("interval is not positive (got %r)" % interval)
-
-    def calculate(t1, t2):
-        nums = []
-        times_delta = _cpu_times_deltas(t1, t2)
-        all_delta = _cpu_tot_time(times_delta)
-        # "scale" is the value to multiply each delta with to get percentages.
-        # We use "max" to avoid division by zero (if all_delta is 0, then all
-        # fields are 0 so percentages will be 0 too. all_delta cannot be a
-        # fraction because cpu times are integers)
-        scale = 100.0 / max(1, all_delta)
-        for field_delta in times_delta:
-            field_perc = field_delta * scale
-            field_perc = round(field_perc, 1)
-            # make sure we don't return negative values or values over 100%
-            field_perc = min(max(0.0, field_perc), 100.0)
-            nums.append(field_perc)
-        return _psplatform.scputimes(*nums)
-
-    # system-wide usage
-    if not percpu:
-        if blocking:
-            t1 = cpu_times()
-            time.sleep(interval)
-        else:
-            t1 = _last_cpu_times_2
-            if t1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                t1 = cpu_times()
-        _last_cpu_times_2 = cpu_times()
-        return calculate(t1, _last_cpu_times_2)
-    # per-cpu usage
-    else:
-        ret = []
-        if blocking:
-            tot1 = cpu_times(percpu=True)
-            time.sleep(interval)
-        else:
-            tot1 = _last_per_cpu_times_2
-            if tot1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                tot1 = cpu_times(percpu=True)
-        _last_per_cpu_times_2 = cpu_times(percpu=True)
-        for t1, t2 in zip(tot1, _last_per_cpu_times_2):
-            ret.append(calculate(t1, t2))
-        return ret
-
-
-def cpu_stats():
-    """Return CPU statistics."""
-    return _psplatform.cpu_stats()
-
-
-if hasattr(_psplatform, "cpu_freq"):
-
-    def cpu_freq(percpu=False):
-        """Return CPU frequency as a nameduple including current,
-        min and max frequency expressed in Mhz.
-
-        If *percpu* is True and the system supports per-cpu frequency
-        retrieval (Linux only) a list of frequencies is returned for
-        each CPU. If not a list with one element is returned.
-        """
-        ret = _psplatform.cpu_freq()
-        if percpu:
-            return ret
-        else:
-            num_cpus = float(len(ret))
-            if num_cpus == 0:
-                return None
-            elif num_cpus == 1:
-                return ret[0]
-            else:
-                currs, mins, maxs = 0.0, 0.0, 0.0
-                set_none = False
-                for cpu in ret:
-                    currs += cpu.current
-                    # On Linux if /proc/cpuinfo is used min/max are set
-                    # to None.
-                    if LINUX and cpu.min is None:
-                        set_none = True
-                        continue
-                    mins += cpu.min
-                    maxs += cpu.max
-
-                current = currs / num_cpus
-
-                if set_none:
-                    min_ = max_ = None
-                else:
-                    min_ = mins / num_cpus
-                    max_ = maxs / num_cpus
-
-                return _common.scpufreq(current, min_, max_)
-
-    __all__.append("cpu_freq")
-
-
-if hasattr(os, "getloadavg") or hasattr(_psplatform, "getloadavg"):
-    # Perform this hasattr check once on import time to either use the
-    # platform based code or proxy straight from the os module.
-    if hasattr(os, "getloadavg"):
-        getloadavg = os.getloadavg
-    else:
-        getloadavg = _psplatform.getloadavg
-
-    __all__.append("getloadavg")
-
-
-# =====================================================================
-# --- system memory related functions
-# =====================================================================
-
-
-def virtual_memory():
-    """Return statistics about system memory usage as a namedtuple
-    including the following fields, expressed in bytes:
-
-     - total:
-       total physical memory available.
-
-     - available:
-       the memory that can be given instantly to processes without the
-       system going into swap.
-       This is calculated by summing different memory values depending
-       on the platform and it is supposed to be used to monitor actual
-       memory usage in a cross platform fashion.
-
-     - percent:
-       the percentage usage calculated as (total - available) / total * 100
-
-     - used:
-        memory used, calculated differently depending on the platform and
-        designed for informational purposes only:
-        macOS: active + wired
-        BSD: active + wired + cached
-        Linux: total - free
-
-     - free:
-       memory not being used at all (zeroed) that is readily available;
-       note that this doesn't reflect the actual memory available
-       (use 'available' instead)
-
-    Platform-specific fields:
-
-     - active (UNIX):
-       memory currently in use or very recently used, and so it is in RAM.
-
-     - inactive (UNIX):
-       memory that is marked as not used.
-
-     - buffers (BSD, Linux):
-       cache for things like file system metadata.
-
-     - cached (BSD, macOS):
-       cache for various things.
-
-     - wired (macOS, BSD):
-       memory that is marked to always stay in RAM. It is never moved to disk.
-
-     - shared (BSD):
-       memory that may be simultaneously accessed by multiple processes.
-
-    The sum of 'used' and 'available' does not necessarily equal total.
-    On Windows 'available' and 'free' are the same.
-    """
-    global _TOTAL_PHYMEM
-    ret = _psplatform.virtual_memory()
-    # cached for later use in Process.memory_percent()
-    _TOTAL_PHYMEM = ret.total
-    return ret
-
-
-def swap_memory():
-    """Return system swap memory statistics as a namedtuple including
-    the following fields:
-
-     - total:   total swap memory in bytes
-     - used:    used swap memory in bytes
-     - free:    free swap memory in bytes
-     - percent: the percentage usage
-     - sin:     no. of bytes the system has swapped in from disk (cumulative)
-     - sout:    no. of bytes the system has swapped out from disk (cumulative)
-
-    'sin' and 'sout' on Windows are meaningless and always set to 0.
-    """
-    return _psplatform.swap_memory()
-
-
-# =====================================================================
-# --- disks/paritions related functions
-# =====================================================================
-
-
-def disk_usage(path):
-    """Return disk usage statistics about the given *path* as a
-    namedtuple including total, used and free space expressed in bytes
-    plus the percentage usage.
-    """
-    return _psplatform.disk_usage(path)
-
-
-def disk_partitions(all=False):
-    """Return mounted partitions as a list of
-    (device, mountpoint, fstype, opts) namedtuple.
-    'opts' field is a raw string separated by commas indicating mount
-    options which may vary depending on the platform.
-
-    If *all* parameter is False return physical devices only and ignore
-    all others.
-    """
-    return _psplatform.disk_partitions(all)
-
-
-def disk_io_counters(perdisk=False, nowrap=True):
-    """Return system disk I/O statistics as a namedtuple including
-    the following fields:
-
-     - read_count:  number of reads
-     - write_count: number of writes
-     - read_bytes:  number of bytes read
-     - write_bytes: number of bytes written
-     - read_time:   time spent reading from disk (in ms)
-     - write_time:  time spent writing to disk (in ms)
-
-    Platform specific:
-
-     - busy_time: (Linux, FreeBSD) time spent doing actual I/Os (in ms)
-     - read_merged_count (Linux): number of merged reads
-     - write_merged_count (Linux): number of merged writes
-
-    If *perdisk* is True return the same information for every
-    physical disk installed on the system as a dictionary
-    with partition names as the keys and the namedtuple
-    described above as the values.
-
-    If *nowrap* is True it detects and adjust the numbers which overflow
-    and wrap (restart from 0) and add "old value" to "new value" so that
-    the returned numbers will always be increasing or remain the same,
-    but never decrease.
-    "disk_io_counters.cache_clear()" can be used to invalidate the
-    cache.
-
-    On recent Windows versions 'diskperf -y' command may need to be
-    executed first otherwise this function won't find any disk.
-    """
-    kwargs = dict(perdisk=perdisk) if LINUX else {}
-    rawdict = _psplatform.disk_io_counters(**kwargs)
-    if not rawdict:
-        return {} if perdisk else None
-    if nowrap:
-        rawdict = _wrap_numbers(rawdict, 'psutil.disk_io_counters')
-    nt = getattr(_psplatform, "sdiskio", _common.sdiskio)
-    if perdisk:
-        for disk, fields in rawdict.items():
-            rawdict[disk] = nt(*fields)
-        return rawdict
-    else:
-        return nt(*[sum(x) for x in zip(*rawdict.values())])
-
-
-disk_io_counters.cache_clear = functools.partial(
-    _wrap_numbers.cache_clear, 'psutil.disk_io_counters')
-disk_io_counters.cache_clear.__doc__ = "Clears nowrap argument cache"
-
-
-# =====================================================================
-# --- network related functions
-# =====================================================================
-
-
-def net_io_counters(pernic=False, nowrap=True):
-    """Return network I/O statistics as a namedtuple including
-    the following fields:
-
-     - bytes_sent:   number of bytes sent
-     - bytes_recv:   number of bytes received
-     - packets_sent: number of packets sent
-     - packets_recv: number of packets received
-     - errin:        total number of errors while receiving
-     - errout:       total number of errors while sending
-     - dropin:       total number of incoming packets which were dropped
-     - dropout:      total number of outgoing packets which were dropped
-                     (always 0 on macOS and BSD)
-
-    If *pernic* is True return the same information for every
-    network interface installed on the system as a dictionary
-    with network interface names as the keys and the namedtuple
-    described above as the values.
-
-    If *nowrap* is True it detects and adjust the numbers which overflow
-    and wrap (restart from 0) and add "old value" to "new value" so that
-    the returned numbers will always be increasing or remain the same,
-    but never decrease.
-    "disk_io_counters.cache_clear()" can be used to invalidate the
-    cache.
-    """
-    rawdict = _psplatform.net_io_counters()
-    if not rawdict:
-        return {} if pernic else None
-    if nowrap:
-        rawdict = _wrap_numbers(rawdict, 'psutil.net_io_counters')
-    if pernic:
-        for nic, fields in rawdict.items():
-            rawdict[nic] = _common.snetio(*fields)
-        return rawdict
-    else:
-        return _common.snetio(*[sum(x) for x in zip(*rawdict.values())])
-
-
-net_io_counters.cache_clear = functools.partial(
-    _wrap_numbers.cache_clear, 'psutil.net_io_counters')
-net_io_counters.cache_clear.__doc__ = "Clears nowrap argument cache"
-
-
-def net_connections(kind='inet'):
-    """Return system-wide socket connections as a list of
-    (fd, family, type, laddr, raddr, status, pid) namedtuples.
-    In case of limited privileges 'fd' and 'pid' may be set to -1
-    and None respectively.
-    The *kind* parameter filters for connections that fit the
-    following criteria:
-
-    +------------+----------------------------------------------------+
-    | Kind Value | Connections using                                  |
-    +------------+----------------------------------------------------+
-    | inet       | IPv4 and IPv6                                      |
-    | inet4      | IPv4                                               |
-    | inet6      | IPv6                                               |
-    | tcp        | TCP                                                |
-    | tcp4       | TCP over IPv4                                      |
-    | tcp6       | TCP over IPv6                                      |
-    | udp        | UDP                                                |
-    | udp4       | UDP over IPv4                                      |
-    | udp6       | UDP over IPv6                                      |
-    | unix       | UNIX socket (both UDP and TCP protocols)           |
-    | all        | the sum of all the possible families and protocols |
-    +------------+----------------------------------------------------+
-
-    On macOS this function requires root privileges.
-    """
-    return _psplatform.net_connections(kind)
-
-
-def net_if_addrs():
-    """Return the addresses associated to each NIC (network interface
-    card) installed on the system as a dictionary whose keys are the
-    NIC names and value is a list of namedtuples for each address
-    assigned to the NIC. Each namedtuple includes 5 fields:
-
-     - family: can be either socket.AF_INET, socket.AF_INET6 or
-               psutil.AF_LINK, which refers to a MAC address.
-     - address: is the primary address and it is always set.
-     - netmask: and 'broadcast' and 'ptp' may be None.
-     - ptp: stands for "point to point" and references the
-            destination address on a point to point interface
-            (typically a VPN).
-     - broadcast: and *ptp* are mutually exclusive.
-
-    Note: you can have more than one address of the same family
-    associated with each interface.
-    """
-    has_enums = sys.version_info >= (3, 4)
-    if has_enums:
-        import socket
-    rawlist = _psplatform.net_if_addrs()
-    rawlist.sort(key=lambda x: x[1])  # sort by family
-    ret = collections.defaultdict(list)
-    for name, fam, addr, mask, broadcast, ptp in rawlist:
-        if has_enums:
-            try:
-                fam = socket.AddressFamily(fam)
-            except ValueError:
-                if WINDOWS and fam == -1:
-                    fam = _psplatform.AF_LINK
-                elif (hasattr(_psplatform, "AF_LINK") and
-                        _psplatform.AF_LINK == fam):
-                    # Linux defines AF_LINK as an alias for AF_PACKET.
-                    # We re-set the family here so that repr(family)
-                    # will show AF_LINK rather than AF_PACKET
-                    fam = _psplatform.AF_LINK
-        if fam == _psplatform.AF_LINK:
-            # The underlying C function may return an incomplete MAC
-            # address in which case we fill it with null bytes, see:
-            # https://github.com/giampaolo/psutil/issues/786
-            separator = ":" if POSIX else "-"
-            while addr.count(separator) < 5:
-                addr += "%s00" % separator
-        ret[name].append(_common.snicaddr(fam, addr, mask, broadcast, ptp))
-    return dict(ret)
-
-
-def net_if_stats():
-    """Return information about each NIC (network interface card)
-    installed on the system as a dictionary whose keys are the
-    NIC names and value is a namedtuple with the following fields:
-
-     - isup: whether the interface is up (bool)
-     - duplex: can be either NIC_DUPLEX_FULL, NIC_DUPLEX_HALF or
-               NIC_DUPLEX_UNKNOWN
-     - speed: the NIC speed expressed in mega bits (MB); if it can't
-              be determined (e.g. 'localhost') it will be set to 0.
-     - mtu: the maximum transmission unit expressed in bytes.
-    """
-    return _psplatform.net_if_stats()
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-# Linux, macOS
-if hasattr(_psplatform, "sensors_temperatures"):
-
-    def sensors_temperatures(fahrenheit=False):
-        """Return hardware temperatures. Each entry is a namedtuple
-        representing a certain hardware sensor (it may be a CPU, an
-        hard disk or something else, depending on the OS and its
-        configuration).
-        All temperatures are expressed in celsius unless *fahrenheit*
-        is set to True.
-        """
-        def convert(n):
-            if n is not None:
-                return (float(n) * 9 / 5) + 32 if fahrenheit else n
-
-        ret = collections.defaultdict(list)
-        rawdict = _psplatform.sensors_temperatures()
-
-        for name, values in rawdict.items():
-            while values:
-                label, current, high, critical = values.pop(0)
-                current = convert(current)
-                high = convert(high)
-                critical = convert(critical)
-
-                if high and not critical:
-                    critical = high
-                elif critical and not high:
-                    high = critical
-
-                ret[name].append(
-                    _common.shwtemp(label, current, high, critical))
-
-        return dict(ret)
-
-    __all__.append("sensors_temperatures")
-
-
-# Linux, macOS
-if hasattr(_psplatform, "sensors_fans"):
-
-    def sensors_fans():
-        """Return fans speed. Each entry is a namedtuple
-        representing a certain hardware sensor.
-        All speed are expressed in RPM (rounds per minute).
-        """
-        return _psplatform.sensors_fans()
-
-    __all__.append("sensors_fans")
-
-
-# Linux, Windows, FreeBSD, macOS
-if hasattr(_psplatform, "sensors_battery"):
-
-    def sensors_battery():
-        """Return battery information. If no battery is installed
-        returns None.
-
-         - percent: battery power left as a percentage.
-         - secsleft: a rough approximation of how many seconds are left
-                     before the battery runs out of power. May be
-                     POWER_TIME_UNLIMITED or POWER_TIME_UNLIMITED.
-         - power_plugged: True if the AC power cable is connected.
-        """
-        return _psplatform.sensors_battery()
-
-    __all__.append("sensors_battery")
-
-
-# =====================================================================
-# --- other system related functions
-# =====================================================================
-
-
-def boot_time():
-    """Return the system boot time expressed in seconds since the epoch."""
-    # Note: we are not caching this because it is subject to
-    # system clock updates.
-    return _psplatform.boot_time()
-
-
-def users():
-    """Return users currently connected on the system as a list of
-    namedtuples including the following fields.
-
-     - user: the name of the user
-     - terminal: the tty or pseudo-tty associated with the user, if any.
-     - host: the host name associated with the entry, if any.
-     - started: the creation time as a floating point number expressed in
-       seconds since the epoch.
-    """
-    return _psplatform.users()
-
-
-# =====================================================================
-# --- Windows services
-# =====================================================================
-
-
-if WINDOWS:
-
-    def win_service_iter():
-        """Return a generator yielding a WindowsService instance for all
-        Windows services installed.
-        """
-        return _psplatform.win_service_iter()
-
-    def win_service_get(name):
-        """Get a Windows service by *name*.
-        Raise NoSuchProcess if no service with such name exists.
-        """
-        return _psplatform.win_service_get(name)
-
-
-# =====================================================================
-
-
-def test():  # pragma: no cover
-    from ._common import bytes2human
-    from ._compat import get_terminal_size
-
-    today_day = datetime.date.today()
-    templ = "%-10s %5s %5s %7s %7s %5s %6s %6s %6s  %s"
-    attrs = ['pid', 'memory_percent', 'name', 'cmdline', 'cpu_times',
-             'create_time', 'memory_info', 'status', 'nice', 'username']
-    print(templ % ("USER", "PID", "%MEM", "VSZ", "RSS", "NICE",
-                   "STATUS", "START", "TIME", "CMDLINE"))
-    for p in process_iter(attrs, ad_value=None):
-        if p.info['create_time']:
-            ctime = datetime.datetime.fromtimestamp(p.info['create_time'])
-            if ctime.date() == today_day:
-                ctime = ctime.strftime("%H:%M")
-            else:
-                ctime = ctime.strftime("%b%d")
-        else:
-            ctime = ''
-        if p.info['cpu_times']:
-            cputime = time.strftime("%M:%S",
-                                    time.localtime(sum(p.info['cpu_times'])))
-        else:
-            cputime = ''
-
-        user = p.info['username'] or ''
-        if not user and POSIX:
-            try:
-                user = p.uids()[0]
-            except Error:
-                pass
-        if user and WINDOWS and '\\' in user:
-            user = user.split('\\')[1]
-        user = user[:9]
-        vms = bytes2human(p.info['memory_info'].vms) if \
-            p.info['memory_info'] is not None else ''
-        rss = bytes2human(p.info['memory_info'].rss) if \
-            p.info['memory_info'] is not None else ''
-        memp = round(p.info['memory_percent'], 1) if \
-            p.info['memory_percent'] is not None else ''
-        nice = int(p.info['nice']) if p.info['nice'] else ''
-        if p.info['cmdline']:
-            cmdline = ' '.join(p.info['cmdline'])
-        else:
-            cmdline = p.info['name']
-        status = p.info['status'][:5] if p.info['status'] else ''
-
-        line = templ % (
-            user[:10],
-            p.info['pid'],
-            memp,
-            vms,
-            rss,
-            nice,
-            status,
-            ctime,
-            cputime,
-            cmdline)
-        print(line[:get_terminal_size()[0]])
-
-
-del memoize, memoize_when_activated, division, deprecated_method
-if sys.version_info[0] < 3:
-    del num, x
-
-if __name__ == "__main__":
-    test()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psaix.py firefox-85.0+build1/third_party/python/psutil/psutil/_psaix.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psaix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psaix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,550 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'
-# Copyright (c) 2017, Arnon Yaari
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""AIX platform implementation."""
-
-import functools
-import glob
-import os
-import re
-import subprocess
-import sys
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_aix as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_to_ntuple
-from ._common import get_procfs_path
-from ._common import memoize_when_activated
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-from ._common import NoSuchProcess
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-
-__extra__all__ = ["PROCFS_PATH"]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-HAS_THREADS = hasattr(cext, "proc_threads")
-HAS_NET_IO_COUNTERS = hasattr(cext, "net_io_counters")
-HAS_PROC_IO_COUNTERS = hasattr(cext, "proc_io_counters")
-
-PAGE_SIZE = os.sysconf('SC_PAGE_SIZE')
-AF_LINK = cext_posix.AF_LINK
-
-PROC_STATUSES = {
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-    cext.SACTIVE: _common.STATUS_RUNNING,
-    cext.SSWAP: _common.STATUS_RUNNING,      # TODO what status is this?
-    cext.SSTOP: _common.STATUS_STOPPED,
-}
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-proc_info_map = dict(
-    ppid=0,
-    rss=1,
-    vms=2,
-    create_time=3,
-    nice=4,
-    num_threads=5,
-    status=6,
-    ttynr=7)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms'])
-# psutil.Process.memory_full_info()
-pfullmem = pmem
-# psutil.Process.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'system', 'idle', 'iowait'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    total, avail, free, pinned, inuse = cext.virtual_mem()
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, inuse, free)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    total, free, sin, sout = cext.swap_mem()
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system-wide CPU times as a named tuple"""
-    ret = cext.per_cpu_times()
-    return scputimes(*[sum(x) for x in zip(*ret)])
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples"""
-    ret = cext.per_cpu_times()
-    return [scputimes(*x) for x in ret]
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # mimic os.cpu_count() behavior
-        return None
-
-
-def cpu_count_physical():
-    cmd = "lsdev -Cc processor"
-    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-    stdout, stderr = p.communicate()
-    if PY3:
-        stdout, stderr = [x.decode(sys.stdout.encoding)
-                          for x in (stdout, stderr)]
-    if p.returncode != 0:
-        raise RuntimeError("%r command error\n%s" % (cmd, stderr))
-    processors = stdout.strip().splitlines()
-    return len(processors) or None
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    ctx_switches, interrupts, soft_interrupts, syscalls = cext.cpu_stats()
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-disk_usage = _psposix.disk_usage
-
-
-def disk_partitions(all=False):
-    """Return system disk partitions."""
-    # TODO - the filtering logic should be better checked so that
-    # it tries to reflect 'df' as much as possible
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            # Differently from, say, Linux, we don't have a list of
-            # common fs types so the best we can do, AFAIK, is to
-            # filter by filesystem having a total size > 0.
-            if not disk_usage(mountpoint).total:
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_if_addrs = cext_posix.net_if_addrs
-
-if HAS_NET_IO_COUNTERS:
-    net_io_counters = cext.net_io_counters
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    """
-    cmap = _common.conn_tmap
-    if kind not in cmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in cmap])))
-    families, types = _common.conn_tmap[kind]
-    rawlist = cext.net_connections(_pid)
-    ret = []
-    for item in rawlist:
-        fd, fam, type_, laddr, raddr, status, pid = item
-        if fam not in families:
-            continue
-        if type_ not in types:
-            continue
-        nt = conn_to_ntuple(fd, fam, type_, laddr, raddr, status,
-                            TCP_STATUSES, pid=pid if _pid == -1 else None)
-        ret.append(nt)
-    return ret
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    duplex_map = {"Full": NIC_DUPLEX_FULL,
-                  "Half": NIC_DUPLEX_HALF}
-    names = set([x[0] for x in net_if_addrs()])
-    ret = {}
-    for name in names:
-        isup, mtu = cext.net_if_stats(name)
-
-        # try to get speed and duplex
-        # TODO: rewrite this in C (entstat forks, so use truss -f to follow.
-        # looks like it is using an undocumented ioctl?)
-        duplex = ""
-        speed = 0
-        p = subprocess.Popen(["/usr/bin/entstat", "-d", name],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if p.returncode == 0:
-            re_result = re.search(
-                r"Running: (\d+) Mbps.*?(\w+) Duplex", stdout)
-            if re_result is not None:
-                speed = int(re_result.group(1))
-                duplex = re_result.group(2)
-
-        duplex = duplex_map.get(duplex, NIC_DUPLEX_UNKNOWN)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    localhost = (':0.0', ':0')
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in localhost:
-            hostname = 'localhost'
-        nt = _common.suser(user, tty, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(get_procfs_path()) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix pid."""
-    return os.path.exists(os.path.join(get_procfs_path(), str(pid), "psinfo"))
-
-
-def wrap_exceptions(fun):
-    """Call callable into a try/except clause and translate ENOENT,
-    EACCES and EPERM in NoSuchProcess or AccessDenied exceptions.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except (FileNotFoundError, ProcessLookupError):
-            # ENOENT (no such file or directory) gets raised on open().
-            # ESRCH (no such process) can get raised on read() if
-            # process is gone in meantime.
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def oneshot_enter(self):
-        self._proc_basic_info.cache_activate(self)
-        self._proc_cred.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_basic_info.cache_deactivate(self)
-        self._proc_cred.cache_deactivate(self)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_basic_info(self):
-        return cext.proc_basic_info(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_cred(self):
-        return cext.proc_cred(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def name(self):
-        if self.pid == 0:
-            return "swapper"
-        # note: max 16 characters
-        return cext.proc_name(self.pid, self._procfs_path).rstrip("\x00")
-
-    @wrap_exceptions
-    def exe(self):
-        # there is no way to get executable path in AIX other than to guess,
-        # and guessing is more complex than what's in the wrapping class
-        cmdline = self.cmdline()
-        if not cmdline:
-            return ''
-        exe = cmdline[0]
-        if os.path.sep in exe:
-            # relative or absolute path
-            if not os.path.isabs(exe):
-                # if cwd has changed, we're out of luck - this may be wrong!
-                exe = os.path.abspath(os.path.join(self.cwd(), exe))
-            if (os.path.isabs(exe) and
-                    os.path.isfile(exe) and
-                    os.access(exe, os.X_OK)):
-                return exe
-            # not found, move to search in PATH using basename only
-            exe = os.path.basename(exe)
-        # search for exe name PATH
-        for path in os.environ["PATH"].split(":"):
-            possible_exe = os.path.abspath(os.path.join(path, exe))
-            if (os.path.isfile(possible_exe) and
-                    os.access(possible_exe, os.X_OK)):
-                return possible_exe
-        return ''
-
-    @wrap_exceptions
-    def cmdline(self):
-        return cext.proc_args(self.pid)
-
-    @wrap_exceptions
-    def environ(self):
-        return cext.proc_environ(self.pid)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._proc_basic_info()[proc_info_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_basic_info()[proc_info_map['num_threads']]
-
-    if HAS_THREADS:
-        @wrap_exceptions
-        def threads(self):
-            rawlist = cext.proc_threads(self.pid)
-            retlist = []
-            for thread_id, utime, stime in rawlist:
-                ntuple = _common.pthread(thread_id, utime, stime)
-                retlist.append(ntuple)
-            # The underlying C implementation retrieves all OS threads
-            # and filters them by PID.  At this point we can't tell whether
-            # an empty list means there were no connections for process or
-            # process is no longer active so we force NSP in case the PID
-            # is no longer there.
-            if not retlist:
-                # will raise NSP if process is gone
-                os.stat('%s/%s' % (self._procfs_path, self.pid))
-            return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = net_connections(kind, _pid=self.pid)
-        # The underlying C implementation retrieves all OS connections
-        # and filters them by PID.  At this point we can't tell whether
-        # an empty list means there were no connections for process or
-        # process is no longer active so we force NSP in case the PID
-        # is no longer there.
-        if not ret:
-            # will raise NSP if process is gone
-            os.stat('%s/%s' % (self._procfs_path, self.pid))
-        return ret
-
-    @wrap_exceptions
-    def nice_get(self):
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._proc_basic_info()[proc_info_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        real, effective, saved, _, _, _ = self._proc_cred()
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def gids(self):
-        _, _, _, real, effective, saved = self._proc_cred()
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def cpu_times(self):
-        cpu_times = cext.proc_cpu_times(self.pid, self._procfs_path)
-        return _common.pcputimes(*cpu_times)
-
-    @wrap_exceptions
-    def terminal(self):
-        ttydev = self._proc_basic_info()[proc_info_map['ttynr']]
-        # convert from 64-bit dev_t to 32-bit dev_t and then map the device
-        ttydev = (((ttydev & 0x0000FFFF00000000) >> 16) | (ttydev & 0xFFFF))
-        # try to match rdev of /dev/pts/* files ttydev
-        for dev in glob.glob("/dev/**/*"):
-            if os.stat(dev).st_rdev == ttydev:
-                return dev
-        return None
-
-    @wrap_exceptions
-    def cwd(self):
-        procfs_path = self._procfs_path
-        try:
-            result = os.readlink("%s/%s/cwd" % (procfs_path, self.pid))
-            return result.rstrip('/')
-        except FileNotFoundError:
-            os.stat("%s/%s" % (procfs_path, self.pid))  # raise NSP or AD
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        ret = self._proc_basic_info()
-        rss = ret[proc_info_map['rss']] * 1024
-        vms = ret[proc_info_map['vms']] * 1024
-        return pmem(rss, vms)
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def status(self):
-        code = self._proc_basic_info()[proc_info_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    def open_files(self):
-        # TODO rewrite without using procfiles (stat /proc/pid/fd/* and then
-        # find matching name of the inode)
-        p = subprocess.Popen(["/usr/bin/procfiles", "-n", str(self.pid)],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if "no such process" in stderr.lower():
-            raise NoSuchProcess(self.pid, self._name)
-        procfiles = re.findall(r"(\d+): S_IFREG.*\s*.*name:(.*)\n", stdout)
-        retlist = []
-        for fd, path in procfiles:
-            path = path.strip()
-            if path.startswith("//"):
-                path = path[1:]
-            if path.lower() == "cannot be retrieved":
-                continue
-            retlist.append(_common.popenfile(path, int(fd)))
-        return retlist
-
-    @wrap_exceptions
-    def num_fds(self):
-        if self.pid == 0:       # no /proc/0/fd
-            return 0
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        return _common.pctxsw(
-            *cext.proc_num_ctx_switches(self.pid))
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    if HAS_PROC_IO_COUNTERS:
-        @wrap_exceptions
-        def io_counters(self):
-            try:
-                rc, wc, rb, wb = cext.proc_io_counters(self.pid)
-            except OSError:
-                # if process is terminated, proc_io_counters returns OSError
-                # instead of NSP
-                if not pid_exists(self.pid):
-                    raise NoSuchProcess(self.pid, self._name)
-                raise
-            return _common.pio(rc, wc, rb, wb)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psbsd.py firefox-85.0+build1/third_party/python/psutil/psutil/_psbsd.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psbsd.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psbsd.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,903 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""FreeBSD, OpenBSD and NetBSD platforms implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-import xml.etree.ElementTree as ET
-from collections import namedtuple
-from collections import defaultdict
-
-from . import _common
-from . import _psposix
-from . import _psutil_bsd as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import FREEBSD
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NETBSD
-from ._common import NoSuchProcess
-from ._common import OPENBSD
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import which
-
-
-__extra__all__ = []
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-if FREEBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SRUN: _common.STATUS_RUNNING,
-        cext.SSLEEP: _common.STATUS_SLEEPING,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SWAIT: _common.STATUS_WAITING,
-        cext.SLOCK: _common.STATUS_LOCKED,
-    }
-elif OPENBSD or NETBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SSLEEP: _common.STATUS_SLEEPING,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        # According to /usr/include/sys/proc.h SZOMB is unused.
-        # test_zombie_process() shows that SDEAD is the right
-        # equivalent. Also it appears there's no equivalent of
-        # psutil.STATUS_DEAD. SDEAD really means STATUS_ZOMBIE.
-        # cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SDEAD: _common.STATUS_ZOMBIE,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        # From http://www.eecs.harvard.edu/~margo/cs161/videos/proc.h.txt
-        # OpenBSD has SRUN and SONPROC: SRUN indicates that a process
-        # is runnable but *not* yet running, i.e. is on a run queue.
-        # SONPROC indicates that the process is actually executing on
-        # a CPU, i.e. it is no longer on a run queue.
-        # As such we'll map SRUN to STATUS_WAKING and SONPROC to
-        # STATUS_RUNNING
-        cext.SRUN: _common.STATUS_WAKING,
-        cext.SONPROC: _common.STATUS_RUNNING,
-    }
-elif NETBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SACTIVE: _common.STATUS_RUNNING,
-        cext.SDYING: _common.STATUS_ZOMBIE,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SDEAD: _common.STATUS_DEAD,
-        cext.SSUSPENDED: _common.STATUS_SUSPENDED,  # unique to NetBSD
-    }
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RECEIVED: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-if NETBSD:
-    PAGESIZE = os.sysconf("SC_PAGESIZE")
-else:
-    PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-AF_LINK = cext_posix.AF_LINK
-
-HAS_PER_CPU_TIMES = hasattr(cext, "per_cpu_times")
-HAS_PROC_NUM_THREADS = hasattr(cext, "proc_num_threads")
-HAS_PROC_OPEN_FILES = hasattr(cext, 'proc_open_files')
-HAS_PROC_NUM_FDS = hasattr(cext, 'proc_num_fds')
-
-kinfo_proc_map = dict(
-    ppid=0,
-    status=1,
-    real_uid=2,
-    effective_uid=3,
-    saved_uid=4,
-    real_gid=5,
-    effective_gid=6,
-    saved_gid=7,
-    ttynr=8,
-    create_time=9,
-    ctx_switches_vol=10,
-    ctx_switches_unvol=11,
-    read_io_count=12,
-    write_io_count=13,
-    user_time=14,
-    sys_time=15,
-    ch_user_time=16,
-    ch_sys_time=17,
-    rss=18,
-    vms=19,
-    memtext=20,
-    memdata=21,
-    memstack=22,
-    cpunum=23,
-    name=24,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'buffers', 'cached', 'shared', 'wired'])
-# psutil.cpu_times()
-scputimes = namedtuple(
-    'scputimes', ['user', 'nice', 'system', 'idle', 'irq'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms', 'text', 'data', 'stack'])
-# psutil.Process.memory_full_info()
-pfullmem = pmem
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple(
-    'pmmap_grouped', 'path rss, private, ref_count, shadow_count')
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr, perms path rss, private, ref_count, shadow_count')
-# psutil.disk_io_counters()
-if FREEBSD:
-    sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                     'read_bytes', 'write_bytes',
-                                     'read_time', 'write_time',
-                                     'busy_time'])
-else:
-    sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                     'read_bytes', 'write_bytes'])
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    mem = cext.virtual_mem()
-    total, free, active, inactive, wired, cached, buffers, shared = mem
-    if NETBSD:
-        # On NetBSD buffers and shared mem is determined via /proc.
-        # The C ext set them to 0.
-        with open('/proc/meminfo', 'rb') as f:
-            for line in f:
-                if line.startswith(b'Buffers:'):
-                    buffers = int(line.split()[1]) * 1024
-                elif line.startswith(b'MemShared:'):
-                    shared = int(line.split()[1]) * 1024
-    avail = inactive + cached + free
-    used = active + wired + cached
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, buffers, cached, shared, wired)
-
-
-def swap_memory():
-    """System swap memory as (total, used, free, sin, sout) namedtuple."""
-    total, used, free, sin, sout = cext.swap_mem()
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system per-CPU times as a namedtuple"""
-    user, nice, system, idle, irq = cext.cpu_times()
-    return scputimes(user, nice, system, idle, irq)
-
-
-if HAS_PER_CPU_TIMES:
-    def per_cpu_times():
-        """Return system CPU times as a namedtuple"""
-        ret = []
-        for cpu_t in cext.per_cpu_times():
-            user, nice, system, idle, irq = cpu_t
-            item = scputimes(user, nice, system, idle, irq)
-            ret.append(item)
-        return ret
-else:
-    # XXX
-    # Ok, this is very dirty.
-    # On FreeBSD < 8 we cannot gather per-cpu information, see:
-    # https://github.com/giampaolo/psutil/issues/226
-    # If num cpus > 1, on first call we return single cpu times to avoid a
-    # crash at psutil import time.
-    # Next calls will fail with NotImplementedError
-    def per_cpu_times():
-        """Return system CPU times as a namedtuple"""
-        if cpu_count_logical() == 1:
-            return [cpu_times()]
-        if per_cpu_times.__called__:
-            raise NotImplementedError("supported only starting from FreeBSD 8")
-        per_cpu_times.__called__ = True
-        return [cpu_times()]
-
-    per_cpu_times.__called__ = False
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-if OPENBSD or NETBSD:
-    def cpu_count_physical():
-        # OpenBSD and NetBSD do not implement this.
-        return 1 if cpu_count_logical() == 1 else None
-else:
-    def cpu_count_physical():
-        """Return the number of physical CPUs in the system."""
-        # From the C module we'll get an XML string similar to this:
-        # http://manpages.ubuntu.com/manpages/precise/man4/smp.4freebsd.html
-        # We may get None in case "sysctl kern.sched.topology_spec"
-        # is not supported on this BSD version, in which case we'll mimic
-        # os.cpu_count() and return None.
-        ret = None
-        s = cext.cpu_count_phys()
-        if s is not None:
-            # get rid of padding chars appended at the end of the string
-            index = s.rfind("</groups>")
-            if index != -1:
-                s = s[:index + 9]
-                root = ET.fromstring(s)
-                try:
-                    ret = len(root.findall('group/children/group/cpu')) or None
-                finally:
-                    # needed otherwise it will memleak
-                    root.clear()
-        if not ret:
-            # If logical CPUs are 1 it's obvious we'll have only 1
-            # physical CPU.
-            if cpu_count_logical() == 1:
-                return 1
-        return ret
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    if FREEBSD:
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps.
-        ctxsw, intrs, soft_intrs, syscalls, traps = cext.cpu_stats()
-    elif NETBSD:
-        # XXX
-        # Note about intrs: the C extension returns 0. intrs
-        # can be determined via /proc/stat; it has the same value as
-        # soft_intrs thought so the kernel is faking it (?).
-        #
-        # Note about syscalls: the C extension always sets it to 0 (?).
-        #
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps, faults and forks.
-        ctxsw, intrs, soft_intrs, syscalls, traps, faults, forks = \
-            cext.cpu_stats()
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'intr'):
-                    intrs = int(line.split()[1])
-    elif OPENBSD:
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps, faults and forks.
-        ctxsw, intrs, soft_intrs, syscalls, traps, faults, forks = \
-            cext.cpu_stats()
-    return _common.scpustats(ctxsw, intrs, soft_intrs, syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples.
-    'all' argument is ignored, see:
-    https://github.com/giampaolo/psutil/issues/906
-    """
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-disk_usage = _psposix.disk_usage
-disk_io_counters = cext.disk_io_counters
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext_posix.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            if hasattr(_common, 'NicDuplex'):
-                duplex = _common.NicDuplex(duplex)
-            ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-def net_connections(kind):
-    """System-wide network connections."""
-    if OPENBSD:
-        ret = []
-        for pid in pids():
-            try:
-                cons = Process(pid).connections(kind)
-            except (NoSuchProcess, ZombieProcess):
-                continue
-            else:
-                for conn in cons:
-                    conn = list(conn)
-                    conn.append(pid)
-                    ret.append(_common.sconn(*conn))
-        return ret
-
-    if kind not in _common.conn_tmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in conn_tmap])))
-    families, types = conn_tmap[kind]
-    ret = set()
-    if NETBSD:
-        rawlist = cext.net_connections(-1)
-    else:
-        rawlist = cext.net_connections()
-    for item in rawlist:
-        fd, fam, type, laddr, raddr, status, pid = item
-        # TODO: apply filter at C level
-        if fam in families and type in types:
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES, pid)
-            ret.add(nt)
-    return list(ret)
-
-
-# =====================================================================
-#  --- sensors
-# =====================================================================
-
-
-if FREEBSD:
-
-    def sensors_battery():
-        """Return battery info."""
-        try:
-            percent, minsleft, power_plugged = cext.sensors_battery()
-        except NotImplementedError:
-            # See: https://github.com/giampaolo/psutil/issues/1074
-            return None
-        power_plugged = power_plugged == 1
-        if power_plugged:
-            secsleft = _common.POWER_TIME_UNLIMITED
-        elif minsleft == -1:
-            secsleft = _common.POWER_TIME_UNKNOWN
-        else:
-            secsleft = minsleft * 60
-        return _common.sbattery(percent, secsleft, power_plugged)
-
-    def sensors_temperatures():
-        "Return CPU cores temperatures if available, else an empty dict."
-        ret = defaultdict(list)
-        num_cpus = cpu_count_logical()
-        for cpu in range(num_cpus):
-            try:
-                current, high = cext.sensors_cpu_temperature(cpu)
-                if high <= 0:
-                    high = None
-                name = "Core %s" % cpu
-                ret["coretemp"].append(
-                    _common.shwtemp(name, current, high, high))
-            except NotImplementedError:
-                pass
-
-        return ret
-
-    def cpu_freq():
-        """Return frequency metrics for CPUs. As of Dec 2018 only
-        CPU 0 appears to be supported by FreeBSD and all other cores
-        match the frequency of CPU 0.
-        """
-        ret = []
-        num_cpus = cpu_count_logical()
-        for cpu in range(num_cpus):
-            try:
-                current, available_freq = cext.cpu_frequency(cpu)
-            except NotImplementedError:
-                continue
-            if available_freq:
-                try:
-                    min_freq = int(available_freq.split(" ")[-1].split("/")[0])
-                except(IndexError, ValueError):
-                    min_freq = None
-                try:
-                    max_freq = int(available_freq.split(" ")[0].split("/")[0])
-                except(IndexError, ValueError):
-                    max_freq = None
-            ret.append(_common.scpufreq(current, min_freq, max_freq))
-        return ret
-
-
-# =====================================================================
-#  --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, pid = item
-        if pid == -1:
-            assert OPENBSD
-            pid = None
-        if tty == '~':
-            continue  # reboot or shutdown
-        nt = _common.suser(user, tty or None, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-@memoize
-def _pid_0_exists():
-    try:
-        Process(0).name()
-    except NoSuchProcess:
-        return False
-    except AccessDenied:
-        return True
-    else:
-        return True
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    ret = cext.pids()
-    if OPENBSD and (0 not in ret) and _pid_0_exists():
-        # On OpenBSD the kernel does not return PID 0 (neither does
-        # ps) but it's actually querable (Process(0) will succeed).
-        ret.insert(0, 0)
-    return ret
-
-
-if OPENBSD or NETBSD:
-    def pid_exists(pid):
-        """Return True if pid exists."""
-        exists = _psposix.pid_exists(pid)
-        if not exists:
-            # We do this because _psposix.pid_exists() lies in case of
-            # zombie processes.
-            return pid in pids()
-        else:
-            return True
-else:
-    pid_exists = _psposix.pid_exists
-
-
-def is_zombie(pid):
-    try:
-        st = cext.proc_oneshot_info(pid)[kinfo_proc_map['status']]
-        return st == cext.SZOMB
-    except Exception:
-        return False
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError exceptions into
-    NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except ProcessLookupError:
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except OSError:
-            if self.pid == 0:
-                if 0 in pids():
-                    raise AccessDenied(self.pid, self._name)
-                else:
-                    raise
-            raise
-    return wrapper
-
-
-@contextlib.contextmanager
-def wrap_exceptions_procfs(inst):
-    """Same as above, for routines relying on reading /proc fs."""
-    try:
-        yield
-    except (ProcessLookupError, FileNotFoundError):
-        # ENOENT (no such file or directory) gets raised on open().
-        # ESRCH (no such process) can get raised on read() if
-        # process is gone in meantime.
-        if not pid_exists(inst.pid):
-            raise NoSuchProcess(inst.pid, inst._name)
-        else:
-            raise ZombieProcess(inst.pid, inst._name, inst._ppid)
-    except PermissionError:
-        raise AccessDenied(inst.pid, inst._name)
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def oneshot(self):
-        """Retrieves multiple process info in one shot as a raw tuple."""
-        ret = cext.proc_oneshot_info(self.pid)
-        assert len(ret) == len(kinfo_proc_map)
-        return ret
-
-    def oneshot_enter(self):
-        self.oneshot.cache_activate(self)
-
-    def oneshot_exit(self):
-        self.oneshot.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self.oneshot()[kinfo_proc_map['name']]
-        return name if name is not None else cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    def exe(self):
-        if FREEBSD:
-            if self.pid == 0:
-                return ''  # else NSP
-            return cext.proc_exe(self.pid)
-        elif NETBSD:
-            if self.pid == 0:
-                # /proc/0 dir exists but /proc/0/exe doesn't
-                return ""
-            with wrap_exceptions_procfs(self):
-                return os.readlink("/proc/%s/exe" % self.pid)
-        else:
-            # OpenBSD: exe cannot be determined; references:
-            # https://chromium.googlesource.com/chromium/src/base/+/
-            #     master/base_paths_posix.cc
-            # We try our best guess by using which against the first
-            # cmdline arg (may return None).
-            cmdline = self.cmdline()
-            if cmdline:
-                return which(cmdline[0]) or ""
-            else:
-                return ""
-
-    @wrap_exceptions
-    def cmdline(self):
-        if OPENBSD and self.pid == 0:
-            return []  # ...else it crashes
-        elif NETBSD:
-            # XXX - most of the times the underlying sysctl() call on Net
-            # and Open BSD returns a truncated string.
-            # Also /proc/pid/cmdline behaves the same so it looks
-            # like this is a kernel bug.
-            try:
-                return cext.proc_cmdline(self.pid)
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    if is_zombie(self.pid):
-                        raise ZombieProcess(self.pid, self._name, self._ppid)
-                    elif not pid_exists(self.pid):
-                        raise NoSuchProcess(self.pid, self._name, self._ppid)
-                    else:
-                        # XXX: this happens with unicode tests. It means the C
-                        # routine is unable to decode invalid unicode chars.
-                        return []
-                else:
-                    raise
-        else:
-            return cext.proc_cmdline(self.pid)
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = self.oneshot()[kinfo_proc_map['ttynr']]
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self.oneshot()[kinfo_proc_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        rawtuple = self.oneshot()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['real_uid']],
-            rawtuple[kinfo_proc_map['effective_uid']],
-            rawtuple[kinfo_proc_map['saved_uid']])
-
-    @wrap_exceptions
-    def gids(self):
-        rawtuple = self.oneshot()
-        return _common.pgids(
-            rawtuple[kinfo_proc_map['real_gid']],
-            rawtuple[kinfo_proc_map['effective_gid']],
-            rawtuple[kinfo_proc_map['saved_gid']])
-
-    @wrap_exceptions
-    def cpu_times(self):
-        rawtuple = self.oneshot()
-        return _common.pcputimes(
-            rawtuple[kinfo_proc_map['user_time']],
-            rawtuple[kinfo_proc_map['sys_time']],
-            rawtuple[kinfo_proc_map['ch_user_time']],
-            rawtuple[kinfo_proc_map['ch_sys_time']])
-
-    if FREEBSD:
-        @wrap_exceptions
-        def cpu_num(self):
-            return self.oneshot()[kinfo_proc_map['cpunum']]
-
-    @wrap_exceptions
-    def memory_info(self):
-        rawtuple = self.oneshot()
-        return pmem(
-            rawtuple[kinfo_proc_map['rss']],
-            rawtuple[kinfo_proc_map['vms']],
-            rawtuple[kinfo_proc_map['memtext']],
-            rawtuple[kinfo_proc_map['memdata']],
-            rawtuple[kinfo_proc_map['memstack']])
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def create_time(self):
-        return self.oneshot()[kinfo_proc_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        if HAS_PROC_NUM_THREADS:
-            # FreeBSD
-            return cext.proc_num_threads(self.pid)
-        else:
-            return len(self.threads())
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        rawtuple = self.oneshot()
-        return _common.pctxsw(
-            rawtuple[kinfo_proc_map['ctx_switches_vol']],
-            rawtuple[kinfo_proc_map['ctx_switches_unvol']])
-
-    @wrap_exceptions
-    def threads(self):
-        # Note: on OpenSBD this (/dev/mem) requires root access.
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        if OPENBSD:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        if kind not in conn_tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in conn_tmap])))
-
-        if NETBSD:
-            families, types = conn_tmap[kind]
-            ret = []
-            rawlist = cext.net_connections(self.pid)
-            for item in rawlist:
-                fd, fam, type, laddr, raddr, status, pid = item
-                assert pid == self.pid
-                if fam in families and type in types:
-                    nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                        TCP_STATUSES)
-                    ret.append(nt)
-            self._assert_alive()
-            return list(ret)
-
-        families, types = conn_tmap[kind]
-        rawlist = cext.proc_connections(self.pid, families, types)
-        ret = []
-        for item in rawlist:
-            fd, fam, type, laddr, raddr, status = item
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES)
-            ret.append(nt)
-
-        if OPENBSD:
-            self._assert_alive()
-
-        return ret
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def nice_get(self):
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def status(self):
-        code = self.oneshot()[kinfo_proc_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def io_counters(self):
-        rawtuple = self.oneshot()
-        return _common.pio(
-            rawtuple[kinfo_proc_map['read_io_count']],
-            rawtuple[kinfo_proc_map['write_io_count']],
-            -1,
-            -1)
-
-    @wrap_exceptions
-    def cwd(self):
-        """Return process current working directory."""
-        # sometimes we get an empty string, in which case we turn
-        # it into None
-        if OPENBSD and self.pid == 0:
-            return None  # ...else it would raise EINVAL
-        elif NETBSD or HAS_PROC_OPEN_FILES:
-            # FreeBSD < 8 does not support functions based on
-            # kinfo_getfile() and kinfo_getvmmap()
-            return cext.proc_cwd(self.pid) or None
-        else:
-            raise NotImplementedError(
-                "supported only starting from FreeBSD 8" if
-                FREEBSD else "")
-
-    nt_mmap_grouped = namedtuple(
-        'mmap', 'path rss, private, ref_count, shadow_count')
-    nt_mmap_ext = namedtuple(
-        'mmap', 'addr, perms path rss, private, ref_count, shadow_count')
-
-    def _not_implemented(self):
-        raise NotImplementedError
-
-    # FreeBSD < 8 does not support functions based on kinfo_getfile()
-    # and kinfo_getvmmap()
-    if HAS_PROC_OPEN_FILES:
-        @wrap_exceptions
-        def open_files(self):
-            """Return files opened by process as a list of namedtuples."""
-            rawlist = cext.proc_open_files(self.pid)
-            return [_common.popenfile(path, fd) for path, fd in rawlist]
-    else:
-        open_files = _not_implemented
-
-    # FreeBSD < 8 does not support functions based on kinfo_getfile()
-    # and kinfo_getvmmap()
-    if HAS_PROC_NUM_FDS:
-        @wrap_exceptions
-        def num_fds(self):
-            """Return the number of file descriptors opened by this process."""
-            ret = cext.proc_num_fds(self.pid)
-            if NETBSD:
-                self._assert_alive()
-            return ret
-    else:
-        num_fds = _not_implemented
-
-    # --- FreeBSD only APIs
-
-    if FREEBSD:
-
-        @wrap_exceptions
-        def cpu_affinity_get(self):
-            return cext.proc_cpu_affinity_get(self.pid)
-
-        @wrap_exceptions
-        def cpu_affinity_set(self, cpus):
-            # Pre-emptively check if CPUs are valid because the C
-            # function has a weird behavior in case of invalid CPUs,
-            # see: https://github.com/giampaolo/psutil/issues/586
-            allcpus = tuple(range(len(per_cpu_times())))
-            for cpu in cpus:
-                if cpu not in allcpus:
-                    raise ValueError("invalid CPU #%i (choose between %s)"
-                                     % (cpu, allcpus))
-            try:
-                cext.proc_cpu_affinity_set(self.pid, cpus)
-            except OSError as err:
-                # 'man cpuset_setaffinity' about EDEADLK:
-                # <<the call would leave a thread without a valid CPU to run
-                # on because the set does not overlap with the thread's
-                # anonymous mask>>
-                if err.errno in (errno.EINVAL, errno.EDEADLK):
-                    for cpu in cpus:
-                        if cpu not in allcpus:
-                            raise ValueError(
-                                "invalid CPU #%i (choose between %s)" % (
-                                    cpu, allcpus))
-                raise
-
-        @wrap_exceptions
-        def memory_maps(self):
-            return cext.proc_memory_maps(self.pid)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_pslinux.py firefox-85.0+build1/third_party/python/psutil/psutil/_pslinux.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_pslinux.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_pslinux.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2095 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Linux platform implementation."""
-
-from __future__ import division
-
-import base64
-import collections
-import errno
-import functools
-import glob
-import os
-import re
-import socket
-import struct
-import sys
-import traceback
-import warnings
-from collections import defaultdict
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_linux as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import debug
-from ._common import decode
-from ._common import get_procfs_path
-from ._common import isfile_strict
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-from ._common import NoSuchProcess
-from ._common import open_binary
-from ._common import open_text
-from ._common import parse_environ_block
-from ._common import path_exists_strict
-from ._common import supports_ipv6
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import b
-from ._compat import basestring
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-__extra__all__ = [
-    #
-    'PROCFS_PATH',
-    # io prio constants
-    "IOPRIO_CLASS_NONE", "IOPRIO_CLASS_RT", "IOPRIO_CLASS_BE",
-    "IOPRIO_CLASS_IDLE",
-    # connection status constants
-    "CONN_ESTABLISHED", "CONN_SYN_SENT", "CONN_SYN_RECV", "CONN_FIN_WAIT1",
-    "CONN_FIN_WAIT2", "CONN_TIME_WAIT", "CONN_CLOSE", "CONN_CLOSE_WAIT",
-    "CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", ]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-POWER_SUPPLY_PATH = "/sys/class/power_supply"
-HAS_SMAPS = os.path.exists('/proc/%s/smaps' % os.getpid())
-HAS_PRLIMIT = hasattr(cext, "linux_prlimit")
-HAS_PROC_IO_PRIORITY = hasattr(cext, "proc_ioprio_get")
-HAS_CPU_AFFINITY = hasattr(cext, "proc_cpu_affinity_get")
-_DEFAULT = object()
-
-# RLIMIT_* constants, not guaranteed to be present on all kernels
-if HAS_PRLIMIT:
-    for name in dir(cext):
-        if name.startswith('RLIM'):
-            __extra__all__.append(name)
-
-# Number of clock ticks per second
-CLOCK_TICKS = os.sysconf("SC_CLK_TCK")
-PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-BOOT_TIME = None  # set later
-# Used when reading "big" files, namely /proc/{pid}/smaps and /proc/net/*.
-# On Python 2, using a buffer with open() for such files may result in a
-# speedup, see: https://github.com/giampaolo/psutil/issues/708
-BIGFILE_BUFFERING = -1 if PY3 else 8192
-LITTLE_ENDIAN = sys.byteorder == 'little'
-
-# "man iostat" states that sectors are equivalent with blocks and have
-# a size of 512 bytes. Despite this value can be queried at runtime
-# via /sys/block/{DISK}/queue/hw_sector_size and results may vary
-# between 1k, 2k, or 4k... 512 appears to be a magic constant used
-# throughout Linux source code:
-# * https://stackoverflow.com/a/38136179/376587
-# * https://lists.gt.net/linux/kernel/2241060
-# * https://github.com/giampaolo/psutil/issues/1305
-# * https://github.com/torvalds/linux/blob/
-#     4f671fe2f9523a1ea206f63fe60a7c7b3a56d5c7/include/linux/bio.h#L99
-# * https://lkml.org/lkml/2015/8/17/234
-DISK_SECTOR_SIZE = 512
-
-if enum is None:
-    AF_LINK = socket.AF_PACKET
-else:
-    AddressFamily = enum.IntEnum('AddressFamily',
-                                 {'AF_LINK': int(socket.AF_PACKET)})
-    AF_LINK = AddressFamily.AF_LINK
-
-# ioprio_* constants http://linux.die.net/man/2/ioprio_get
-if enum is None:
-    IOPRIO_CLASS_NONE = 0
-    IOPRIO_CLASS_RT = 1
-    IOPRIO_CLASS_BE = 2
-    IOPRIO_CLASS_IDLE = 3
-else:
-    class IOPriority(enum.IntEnum):
-        IOPRIO_CLASS_NONE = 0
-        IOPRIO_CLASS_RT = 1
-        IOPRIO_CLASS_BE = 2
-        IOPRIO_CLASS_IDLE = 3
-
-    globals().update(IOPriority.__members__)
-
-# See:
-# https://github.com/torvalds/linux/blame/master/fs/proc/array.c
-# ...and (TASK_* constants):
-# https://github.com/torvalds/linux/blob/master/include/linux/sched.h
-PROC_STATUSES = {
-    "R": _common.STATUS_RUNNING,
-    "S": _common.STATUS_SLEEPING,
-    "D": _common.STATUS_DISK_SLEEP,
-    "T": _common.STATUS_STOPPED,
-    "t": _common.STATUS_TRACING_STOP,
-    "Z": _common.STATUS_ZOMBIE,
-    "X": _common.STATUS_DEAD,
-    "x": _common.STATUS_DEAD,
-    "K": _common.STATUS_WAKE_KILL,
-    "W": _common.STATUS_WAKING,
-    "I": _common.STATUS_IDLE,
-    "P": _common.STATUS_PARKED,
-}
-
-# https://github.com/torvalds/linux/blob/master/include/net/tcp_states.h
-TCP_STATUSES = {
-    "01": _common.CONN_ESTABLISHED,
-    "02": _common.CONN_SYN_SENT,
-    "03": _common.CONN_SYN_RECV,
-    "04": _common.CONN_FIN_WAIT1,
-    "05": _common.CONN_FIN_WAIT2,
-    "06": _common.CONN_TIME_WAIT,
-    "07": _common.CONN_CLOSE,
-    "08": _common.CONN_CLOSE_WAIT,
-    "09": _common.CONN_LAST_ACK,
-    "0A": _common.CONN_LISTEN,
-    "0B": _common.CONN_CLOSING
-}
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'buffers', 'cached', 'shared', 'slab'])
-# psutil.disk_io_counters()
-sdiskio = namedtuple(
-    'sdiskio', ['read_count', 'write_count',
-                'read_bytes', 'write_bytes',
-                'read_time', 'write_time',
-                'read_merged_count', 'write_merged_count',
-                'busy_time'])
-# psutil.Process().open_files()
-popenfile = namedtuple(
-    'popenfile', ['path', 'fd', 'position', 'mode', 'flags'])
-# psutil.Process().memory_info()
-pmem = namedtuple('pmem', 'rss vms shared text lib data dirty')
-# psutil.Process().memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', 'pss', 'swap'))
-# psutil.Process().memory_maps(grouped=True)
-pmmap_grouped = namedtuple(
-    'pmmap_grouped',
-    ['path', 'rss', 'size', 'pss', 'shared_clean', 'shared_dirty',
-     'private_clean', 'private_dirty', 'referenced', 'anonymous', 'swap'])
-# psutil.Process().memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes',
-                         'read_chars', 'write_chars'])
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system',
-                        'iowait'])
-
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-def readlink(path):
-    """Wrapper around os.readlink()."""
-    assert isinstance(path, basestring), path
-    path = os.readlink(path)
-    # readlink() might return paths containing null bytes ('\x00')
-    # resulting in "TypeError: must be encoded string without NULL
-    # bytes, not str" errors when the string is passed to other
-    # fs-related functions (os.*, open(), ...).
-    # Apparently everything after '\x00' is garbage (we can have
-    # ' (deleted)', 'new' and possibly others), see:
-    # https://github.com/giampaolo/psutil/issues/717
-    path = path.split('\x00')[0]
-    # Certain paths have ' (deleted)' appended. Usually this is
-    # bogus as the file actually exists. Even if it doesn't we
-    # don't care.
-    if path.endswith(' (deleted)') and not path_exists_strict(path):
-        path = path[:-10]
-    return path
-
-
-def file_flags_to_mode(flags):
-    """Convert file's open() flags into a readable string.
-    Used by Process.open_files().
-    """
-    modes_map = {os.O_RDONLY: 'r', os.O_WRONLY: 'w', os.O_RDWR: 'w+'}
-    mode = modes_map[flags & (os.O_RDONLY | os.O_WRONLY | os.O_RDWR)]
-    if flags & os.O_APPEND:
-        mode = mode.replace('w', 'a', 1)
-    mode = mode.replace('w+', 'r+')
-    # possible values: r, w, a, r+, a+
-    return mode
-
-
-def is_storage_device(name):
-    """Return True if the given name refers to a root device (e.g.
-    "sda", "nvme0n1") as opposed to a logical partition (e.g.  "sda1",
-    "nvme0n1p1"). If name is a virtual device (e.g. "loop1", "ram")
-    return True.
-    """
-    # Readapted from iostat source code, see:
-    # https://github.com/sysstat/sysstat/blob/
-    #     97912938cd476645b267280069e83b1c8dc0e1c7/common.c#L208
-    # Some devices may have a slash in their name (e.g. cciss/c0d0...).
-    name = name.replace('/', '!')
-    including_virtual = True
-    if including_virtual:
-        path = "/sys/block/%s" % name
-    else:
-        path = "/sys/block/%s/device" % name
-    return os.access(path, os.F_OK)
-
-
-@memoize
-def set_scputimes_ntuple(procfs_path):
-    """Set a namedtuple of variable fields depending on the CPU times
-    available on this Linux kernel version which may be:
-    (user, nice, system, idle, iowait, irq, softirq, [steal, [guest,
-     [guest_nice]]])
-    Used by cpu_times() function.
-    """
-    global scputimes
-    with open_binary('%s/stat' % procfs_path) as f:
-        values = f.readline().split()[1:]
-    fields = ['user', 'nice', 'system', 'idle', 'iowait', 'irq', 'softirq']
-    vlen = len(values)
-    if vlen >= 8:
-        # Linux >= 2.6.11
-        fields.append('steal')
-    if vlen >= 9:
-        # Linux >= 2.6.24
-        fields.append('guest')
-    if vlen >= 10:
-        # Linux >= 3.2.0
-        fields.append('guest_nice')
-    scputimes = namedtuple('scputimes', fields)
-
-
-def cat(fname, fallback=_DEFAULT, binary=True):
-    """Return file content.
-    fallback: the value returned in case the file does not exist or
-              cannot be read
-    binary: whether to open the file in binary or text mode.
-    """
-    try:
-        with open_binary(fname) if binary else open_text(fname) as f:
-            return f.read().strip()
-    except (IOError, OSError):
-        if fallback is not _DEFAULT:
-            return fallback
-        else:
-            raise
-
-
-try:
-    set_scputimes_ntuple("/proc")
-except Exception:
-    # Don't want to crash at import time.
-    traceback.print_exc()
-    scputimes = namedtuple('scputimes', 'user system idle')(0.0, 0.0, 0.0)
-
-
-# =====================================================================
-# --- system memory
-# =====================================================================
-
-
-def calculate_avail_vmem(mems):
-    """Fallback for kernels < 3.14 where /proc/meminfo does not provide
-    "MemAvailable:" column, see:
-    https://blog.famzah.net/2014/09/24/
-    This code reimplements the algorithm outlined here:
-    https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
-        commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-
-    XXX: on recent kernels this calculation differs by ~1.5% than
-    "MemAvailable:" as it's calculated slightly differently, see:
-    https://gitlab.com/procps-ng/procps/issues/42
-    https://github.com/famzah/linux-memavailable-procfs/issues/2
-    It is still way more realistic than doing (free + cached) though.
-    """
-    # Fallback for very old distros. According to
-    # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
-    #     commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-    # ...long ago "avail" was calculated as (free + cached).
-    # We might fallback in such cases:
-    # "Active(file)" not available: 2.6.28 / Dec 2008
-    # "Inactive(file)" not available: 2.6.28 / Dec 2008
-    # "SReclaimable:" not available: 2.6.19 / Nov 2006
-    # /proc/zoneinfo not available: 2.6.13 / Aug 2005
-    free = mems[b'MemFree:']
-    fallback = free + mems.get(b"Cached:", 0)
-    try:
-        lru_active_file = mems[b'Active(file):']
-        lru_inactive_file = mems[b'Inactive(file):']
-        slab_reclaimable = mems[b'SReclaimable:']
-    except KeyError:
-        return fallback
-    try:
-        f = open_binary('%s/zoneinfo' % get_procfs_path())
-    except IOError:
-        return fallback  # kernel 2.6.13
-
-    watermark_low = 0
-    with f:
-        for line in f:
-            line = line.strip()
-            if line.startswith(b'low'):
-                watermark_low += int(line.split()[1])
-    watermark_low *= PAGESIZE
-    watermark_low = watermark_low
-
-    avail = free - watermark_low
-    pagecache = lru_active_file + lru_inactive_file
-    pagecache -= min(pagecache / 2, watermark_low)
-    avail += pagecache
-    avail += slab_reclaimable - min(slab_reclaimable / 2.0, watermark_low)
-    return int(avail)
-
-
-def virtual_memory():
-    """Report virtual memory stats.
-    This implementation matches "free" and "vmstat -s" cmdline
-    utility values and procps-ng-3.3.12 source was used as a reference
-    (2016-09-18):
-    https://gitlab.com/procps-ng/procps/blob/
-        24fd2605c51fccc375ab0287cec33aa767f06718/proc/sysinfo.c
-    For reference, procps-ng-3.3.10 is the version available on Ubuntu
-    16.04.
-
-    Note about "available" memory: up until psutil 4.3 it was
-    calculated as "avail = (free + buffers + cached)". Now
-    "MemAvailable:" column (kernel 3.14) from /proc/meminfo is used as
-    it's more accurate.
-    That matches "available" column in newer versions of "free".
-    """
-    missing_fields = []
-    mems = {}
-    with open_binary('%s/meminfo' % get_procfs_path()) as f:
-        for line in f:
-            fields = line.split()
-            mems[fields[0]] = int(fields[1]) * 1024
-
-    # /proc doc states that the available fields in /proc/meminfo vary
-    # by architecture and compile options, but these 3 values are also
-    # returned by sysinfo(2); as such we assume they are always there.
-    total = mems[b'MemTotal:']
-    free = mems[b'MemFree:']
-    try:
-        buffers = mems[b'Buffers:']
-    except KeyError:
-        # https://github.com/giampaolo/psutil/issues/1010
-        buffers = 0
-        missing_fields.append('buffers')
-    try:
-        cached = mems[b"Cached:"]
-    except KeyError:
-        cached = 0
-        missing_fields.append('cached')
-    else:
-        # "free" cmdline utility sums reclaimable to cached.
-        # Older versions of procps used to add slab memory instead.
-        # This got changed in:
-        # https://gitlab.com/procps-ng/procps/commit/
-        #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-        cached += mems.get(b"SReclaimable:", 0)  # since kernel 2.6.19
-
-    try:
-        shared = mems[b'Shmem:']  # since kernel 2.6.32
-    except KeyError:
-        try:
-            shared = mems[b'MemShared:']  # kernels 2.4
-        except KeyError:
-            shared = 0
-            missing_fields.append('shared')
-
-    try:
-        active = mems[b"Active:"]
-    except KeyError:
-        active = 0
-        missing_fields.append('active')
-
-    try:
-        inactive = mems[b"Inactive:"]
-    except KeyError:
-        try:
-            inactive = \
-                mems[b"Inact_dirty:"] + \
-                mems[b"Inact_clean:"] + \
-                mems[b"Inact_laundry:"]
-        except KeyError:
-            inactive = 0
-            missing_fields.append('inactive')
-
-    try:
-        slab = mems[b"Slab:"]
-    except KeyError:
-        slab = 0
-
-    used = total - free - cached - buffers
-    if used < 0:
-        # May be symptomatic of running within a LCX container where such
-        # values will be dramatically distorted over those of the host.
-        used = total - free
-
-    # - starting from 4.4.0 we match free's "available" column.
-    #   Before 4.4.0 we calculated it as (free + buffers + cached)
-    #   which matched htop.
-    # - free and htop available memory differs as per:
-    #   http://askubuntu.com/a/369589
-    #   http://unix.stackexchange.com/a/65852/168884
-    # - MemAvailable has been introduced in kernel 3.14
-    try:
-        avail = mems[b'MemAvailable:']
-    except KeyError:
-        avail = calculate_avail_vmem(mems)
-
-    if avail < 0:
-        avail = 0
-        missing_fields.append('available')
-
-    # If avail is greater than total or our calculation overflows,
-    # that's symptomatic of running within a LCX container where such
-    # values will be dramatically distorted over those of the host.
-    # https://gitlab.com/procps-ng/procps/blob/
-    #     24fd2605c51fccc375ab0287cec33aa767f06718/proc/sysinfo.c#L764
-    if avail > total:
-        avail = free
-
-    percent = usage_percent((total - avail), total, round_=1)
-
-    # Warn about missing metrics which are set to 0.
-    if missing_fields:
-        msg = "%s memory stats couldn't be determined and %s set to 0" % (
-            ", ".join(missing_fields),
-            "was" if len(missing_fields) == 1 else "were")
-        warnings.warn(msg, RuntimeWarning)
-
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, buffers, cached, shared, slab)
-
-
-def swap_memory():
-    """Return swap memory metrics."""
-    mems = {}
-    with open_binary('%s/meminfo' % get_procfs_path()) as f:
-        for line in f:
-            fields = line.split()
-            mems[fields[0]] = int(fields[1]) * 1024
-    # We prefer /proc/meminfo over sysinfo() syscall so that
-    # psutil.PROCFS_PATH can be used in order to allow retrieval
-    # for linux containers, see:
-    # https://github.com/giampaolo/psutil/issues/1015
-    try:
-        total = mems[b'SwapTotal:']
-        free = mems[b'SwapFree:']
-    except KeyError:
-        _, _, _, _, total, free, unit_multiplier = cext.linux_sysinfo()
-        total *= unit_multiplier
-        free *= unit_multiplier
-
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    # get pgin/pgouts
-    try:
-        f = open_binary("%s/vmstat" % get_procfs_path())
-    except IOError as err:
-        # see https://github.com/giampaolo/psutil/issues/722
-        msg = "'sin' and 'sout' swap memory stats couldn't " \
-              "be determined and were set to 0 (%s)" % str(err)
-        warnings.warn(msg, RuntimeWarning)
-        sin = sout = 0
-    else:
-        with f:
-            sin = sout = None
-            for line in f:
-                # values are expressed in 4 kilo bytes, we want
-                # bytes instead
-                if line.startswith(b'pswpin'):
-                    sin = int(line.split(b' ')[1]) * 4 * 1024
-                elif line.startswith(b'pswpout'):
-                    sout = int(line.split(b' ')[1]) * 4 * 1024
-                if sin is not None and sout is not None:
-                    break
-            else:
-                # we might get here when dealing with exotic Linux
-                # flavors, see:
-                # https://github.com/giampaolo/psutil/issues/313
-                msg = "'sin' and 'sout' swap memory stats couldn't " \
-                      "be determined and were set to 0"
-                warnings.warn(msg, RuntimeWarning)
-                sin = sout = 0
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return a named tuple representing the following system-wide
-    CPU times:
-    (user, nice, system, idle, iowait, irq, softirq [steal, [guest,
-     [guest_nice]]])
-    Last 3 fields may not be available on all Linux kernel versions.
-    """
-    procfs_path = get_procfs_path()
-    set_scputimes_ntuple(procfs_path)
-    with open_binary('%s/stat' % procfs_path) as f:
-        values = f.readline().split()
-    fields = values[1:len(scputimes._fields) + 1]
-    fields = [float(x) / CLOCK_TICKS for x in fields]
-    return scputimes(*fields)
-
-
-def per_cpu_times():
-    """Return a list of namedtuple representing the CPU times
-    for every CPU available on the system.
-    """
-    procfs_path = get_procfs_path()
-    set_scputimes_ntuple(procfs_path)
-    cpus = []
-    with open_binary('%s/stat' % procfs_path) as f:
-        # get rid of the first line which refers to system wide CPU stats
-        f.readline()
-        for line in f:
-            if line.startswith(b'cpu'):
-                values = line.split()
-                fields = values[1:len(scputimes._fields) + 1]
-                fields = [float(x) / CLOCK_TICKS for x in fields]
-                entry = scputimes(*fields)
-                cpus.append(entry)
-        return cpus
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # as a second fallback we try to parse /proc/cpuinfo
-        num = 0
-        with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-            for line in f:
-                if line.lower().startswith(b'processor'):
-                    num += 1
-
-        # unknown format (e.g. amrel/sparc architectures), see:
-        # https://github.com/giampaolo/psutil/issues/200
-        # try to parse /proc/stat as a last resort
-        if num == 0:
-            search = re.compile(r'cpu\d')
-            with open_text('%s/stat' % get_procfs_path()) as f:
-                for line in f:
-                    line = line.split(' ')[0]
-                    if search.match(line):
-                        num += 1
-
-        if num == 0:
-            # mimic os.cpu_count()
-            return None
-        return num
-
-
-def cpu_count_physical():
-    """Return the number of physical cores in the system."""
-    # Method #1
-    core_ids = set()
-    for path in glob.glob(
-            "/sys/devices/system/cpu/cpu[0-9]*/topology/core_id"):
-        with open_binary(path) as f:
-            core_ids.add(int(f.read()))
-    result = len(core_ids)
-    if result != 0:
-        return result
-
-    # Method #2
-    mapping = {}
-    current_info = {}
-    with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-        for line in f:
-            line = line.strip().lower()
-            if not line:
-                # new section
-                if (b'physical id' in current_info and
-                        b'cpu cores' in current_info):
-                    mapping[current_info[b'physical id']] = \
-                        current_info[b'cpu cores']
-                current_info = {}
-            else:
-                # ongoing section
-                if (line.startswith(b'physical id') or
-                        line.startswith(b'cpu cores')):
-                    key, value = line.split(b'\t:', 1)
-                    current_info[key] = int(value)
-
-    result = sum(mapping.values())
-    return result or None  # mimic os.cpu_count()
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    with open_binary('%s/stat' % get_procfs_path()) as f:
-        ctx_switches = None
-        interrupts = None
-        soft_interrupts = None
-        for line in f:
-            if line.startswith(b'ctxt'):
-                ctx_switches = int(line.split()[1])
-            elif line.startswith(b'intr'):
-                interrupts = int(line.split()[1])
-            elif line.startswith(b'softirq'):
-                soft_interrupts = int(line.split()[1])
-            if ctx_switches is not None and soft_interrupts is not None \
-                    and interrupts is not None:
-                break
-    syscalls = 0
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-if os.path.exists("/sys/devices/system/cpu/cpufreq/policy0") or \
-        os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq"):
-    def cpu_freq():
-        """Return frequency metrics for all CPUs.
-        Contrarily to other OSes, Linux updates these values in
-        real-time.
-        """
-        def get_path(num):
-            for p in ("/sys/devices/system/cpu/cpufreq/policy%s" % num,
-                      "/sys/devices/system/cpu/cpu%s/cpufreq" % num):
-                if os.path.exists(p):
-                    return p
-
-        ret = []
-        for n in range(cpu_count_logical()):
-            path = get_path(n)
-            if not path:
-                continue
-
-            pjoin = os.path.join
-            curr = cat(pjoin(path, "scaling_cur_freq"), fallback=None)
-            if curr is None:
-                # Likely an old RedHat, see:
-                # https://github.com/giampaolo/psutil/issues/1071
-                curr = cat(pjoin(path, "cpuinfo_cur_freq"), fallback=None)
-                if curr is None:
-                    raise NotImplementedError(
-                        "can't find current frequency file")
-            curr = int(curr) / 1000
-            max_ = int(cat(pjoin(path, "scaling_max_freq"))) / 1000
-            min_ = int(cat(pjoin(path, "scaling_min_freq"))) / 1000
-            ret.append(_common.scpufreq(curr, min_, max_))
-        return ret
-
-elif os.path.exists("/proc/cpuinfo"):
-    def cpu_freq():
-        """Alternate implementation using /proc/cpuinfo.
-        min and max frequencies are not available and are set to None.
-        """
-        ret = []
-        with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-            for line in f:
-                if line.lower().startswith(b'cpu mhz'):
-                    key, value = line.split(b'\t:', 1)
-                    ret.append(_common.scpufreq(float(value), 0., 0.))
-        return ret
-
-else:
-    def cpu_freq():
-        """Dummy implementation when none of the above files are present.
-        """
-        return []
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_if_addrs = cext_posix.net_if_addrs
-
-
-class _Ipv6UnsupportedError(Exception):
-    pass
-
-
-class Connections:
-    """A wrapper on top of /proc/net/* files, retrieving per-process
-    and system-wide open connections (TCP, UDP, UNIX) similarly to
-    "netstat -an".
-
-    Note: in case of UNIX sockets we're only able to determine the
-    local endpoint/path, not the one it's connected to.
-    According to [1] it would be possible but not easily.
-
-    [1] http://serverfault.com/a/417946
-    """
-
-    def __init__(self):
-        # The string represents the basename of the corresponding
-        # /proc/net/{proto_name} file.
-        tcp4 = ("tcp", socket.AF_INET, socket.SOCK_STREAM)
-        tcp6 = ("tcp6", socket.AF_INET6, socket.SOCK_STREAM)
-        udp4 = ("udp", socket.AF_INET, socket.SOCK_DGRAM)
-        udp6 = ("udp6", socket.AF_INET6, socket.SOCK_DGRAM)
-        unix = ("unix", socket.AF_UNIX, None)
-        self.tmap = {
-            "all": (tcp4, tcp6, udp4, udp6, unix),
-            "tcp": (tcp4, tcp6),
-            "tcp4": (tcp4,),
-            "tcp6": (tcp6,),
-            "udp": (udp4, udp6),
-            "udp4": (udp4,),
-            "udp6": (udp6,),
-            "unix": (unix,),
-            "inet": (tcp4, tcp6, udp4, udp6),
-            "inet4": (tcp4, udp4),
-            "inet6": (tcp6, udp6),
-        }
-        self._procfs_path = None
-
-    def get_proc_inodes(self, pid):
-        inodes = defaultdict(list)
-        for fd in os.listdir("%s/%s/fd" % (self._procfs_path, pid)):
-            try:
-                inode = readlink("%s/%s/fd/%s" % (self._procfs_path, pid, fd))
-            except (FileNotFoundError, ProcessLookupError):
-                # ENOENT == file which is gone in the meantime;
-                # os.stat('/proc/%s' % self.pid) will be done later
-                # to force NSP (if it's the case)
-                continue
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    # not a link
-                    continue
-                raise
-            else:
-                if inode.startswith('socket:['):
-                    # the process is using a socket
-                    inode = inode[8:][:-1]
-                    inodes[inode].append((pid, int(fd)))
-        return inodes
-
-    def get_all_inodes(self):
-        inodes = {}
-        for pid in pids():
-            try:
-                inodes.update(self.get_proc_inodes(pid))
-            except (FileNotFoundError, ProcessLookupError, PermissionError):
-                # os.listdir() is gonna raise a lot of access denied
-                # exceptions in case of unprivileged user; that's fine
-                # as we'll just end up returning a connection with PID
-                # and fd set to None anyway.
-                # Both netstat -an and lsof does the same so it's
-                # unlikely we can do any better.
-                # ENOENT just means a PID disappeared on us.
-                continue
-        return inodes
-
-    @staticmethod
-    def decode_address(addr, family):
-        """Accept an "ip:port" address as displayed in /proc/net/*
-        and convert it into a human readable form, like:
-
-        "0500000A:0016" -> ("10.0.0.5", 22)
-        "0000000000000000FFFF00000100007F:9E49" -> ("::ffff:127.0.0.1", 40521)
-
-        The IP address portion is a little or big endian four-byte
-        hexadecimal number; that is, the least significant byte is listed
-        first, so we need to reverse the order of the bytes to convert it
-        to an IP address.
-        The port is represented as a two-byte hexadecimal number.
-
-        Reference:
-        http://linuxdevcenter.com/pub/a/linux/2000/11/16/LinuxAdmin.html
-        """
-        ip, port = addr.split(':')
-        port = int(port, 16)
-        # this usually refers to a local socket in listen mode with
-        # no end-points connected
-        if not port:
-            return ()
-        if PY3:
-            ip = ip.encode('ascii')
-        if family == socket.AF_INET:
-            # see: https://github.com/giampaolo/psutil/issues/201
-            if LITTLE_ENDIAN:
-                ip = socket.inet_ntop(family, base64.b16decode(ip)[::-1])
-            else:
-                ip = socket.inet_ntop(family, base64.b16decode(ip))
-        else:  # IPv6
-            # old version - let's keep it, just in case...
-            # ip = ip.decode('hex')
-            # return socket.inet_ntop(socket.AF_INET6,
-            #          ''.join(ip[i:i+4][::-1] for i in xrange(0, 16, 4)))
-            ip = base64.b16decode(ip)
-            try:
-                # see: https://github.com/giampaolo/psutil/issues/201
-                if LITTLE_ENDIAN:
-                    ip = socket.inet_ntop(
-                        socket.AF_INET6,
-                        struct.pack('>4I', *struct.unpack('<4I', ip)))
-                else:
-                    ip = socket.inet_ntop(
-                        socket.AF_INET6,
-                        struct.pack('<4I', *struct.unpack('<4I', ip)))
-            except ValueError:
-                # see: https://github.com/giampaolo/psutil/issues/623
-                if not supports_ipv6():
-                    raise _Ipv6UnsupportedError
-                else:
-                    raise
-        return _common.addr(ip, port)
-
-    @staticmethod
-    def process_inet(file, family, type_, inodes, filter_pid=None):
-        """Parse /proc/net/tcp* and /proc/net/udp* files."""
-        if file.endswith('6') and not os.path.exists(file):
-            # IPv6 not supported
-            return
-        with open_text(file, buffering=BIGFILE_BUFFERING) as f:
-            f.readline()  # skip the first line
-            for lineno, line in enumerate(f, 1):
-                try:
-                    _, laddr, raddr, status, _, _, _, _, _, inode = \
-                        line.split()[:10]
-                except ValueError:
-                    raise RuntimeError(
-                        "error while parsing %s; malformed line %s %r" % (
-                            file, lineno, line))
-                if inode in inodes:
-                    # # We assume inet sockets are unique, so we error
-                    # # out if there are multiple references to the
-                    # # same inode. We won't do this for UNIX sockets.
-                    # if len(inodes[inode]) > 1 and family != socket.AF_UNIX:
-                    #     raise ValueError("ambiguos inode with multiple "
-                    #                      "PIDs references")
-                    pid, fd = inodes[inode][0]
-                else:
-                    pid, fd = None, -1
-                if filter_pid is not None and filter_pid != pid:
-                    continue
-                else:
-                    if type_ == socket.SOCK_STREAM:
-                        status = TCP_STATUSES[status]
-                    else:
-                        status = _common.CONN_NONE
-                    try:
-                        laddr = Connections.decode_address(laddr, family)
-                        raddr = Connections.decode_address(raddr, family)
-                    except _Ipv6UnsupportedError:
-                        continue
-                    yield (fd, family, type_, laddr, raddr, status, pid)
-
-    @staticmethod
-    def process_unix(file, family, inodes, filter_pid=None):
-        """Parse /proc/net/unix files."""
-        with open_text(file, buffering=BIGFILE_BUFFERING) as f:
-            f.readline()  # skip the first line
-            for line in f:
-                tokens = line.split()
-                try:
-                    _, _, _, _, type_, _, inode = tokens[0:7]
-                except ValueError:
-                    if ' ' not in line:
-                        # see: https://github.com/giampaolo/psutil/issues/766
-                        continue
-                    raise RuntimeError(
-                        "error while parsing %s; malformed line %r" % (
-                            file, line))
-                if inode in inodes:
-                    # With UNIX sockets we can have a single inode
-                    # referencing many file descriptors.
-                    pairs = inodes[inode]
-                else:
-                    pairs = [(None, -1)]
-                for pid, fd in pairs:
-                    if filter_pid is not None and filter_pid != pid:
-                        continue
-                    else:
-                        if len(tokens) == 8:
-                            path = tokens[-1]
-                        else:
-                            path = ""
-                        type_ = _common.socktype_to_enum(int(type_))
-                        # XXX: determining the remote endpoint of a
-                        # UNIX socket on Linux is not possible, see:
-                        # https://serverfault.com/questions/252723/
-                        raddr = ""
-                        status = _common.CONN_NONE
-                        yield (fd, family, type_, path, raddr, status, pid)
-
-    def retrieve(self, kind, pid=None):
-        if kind not in self.tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in self.tmap])))
-        self._procfs_path = get_procfs_path()
-        if pid is not None:
-            inodes = self.get_proc_inodes(pid)
-            if not inodes:
-                # no connections for this process
-                return []
-        else:
-            inodes = self.get_all_inodes()
-        ret = set()
-        for proto_name, family, type_ in self.tmap[kind]:
-            path = "%s/net/%s" % (self._procfs_path, proto_name)
-            if family in (socket.AF_INET, socket.AF_INET6):
-                ls = self.process_inet(
-                    path, family, type_, inodes, filter_pid=pid)
-            else:
-                ls = self.process_unix(
-                    path, family, inodes, filter_pid=pid)
-            for fd, family, type_, laddr, raddr, status, bound_pid in ls:
-                if pid:
-                    conn = _common.pconn(fd, family, type_, laddr, raddr,
-                                         status)
-                else:
-                    conn = _common.sconn(fd, family, type_, laddr, raddr,
-                                         status, bound_pid)
-                ret.add(conn)
-        return list(ret)
-
-
-_connections = Connections()
-
-
-def net_connections(kind='inet'):
-    """Return system-wide open connections."""
-    return _connections.retrieve(kind)
-
-
-def net_io_counters():
-    """Return network I/O statistics for every network interface
-    installed on the system as a dict of raw tuples.
-    """
-    with open_text("%s/net/dev" % get_procfs_path()) as f:
-        lines = f.readlines()
-    retdict = {}
-    for line in lines[2:]:
-        colon = line.rfind(':')
-        assert colon > 0, repr(line)
-        name = line[:colon].strip()
-        fields = line[colon + 1:].strip().split()
-
-        # in
-        (bytes_recv,
-         packets_recv,
-         errin,
-         dropin,
-         fifoin,  # unused
-         framein,  # unused
-         compressedin,  # unused
-         multicastin,  # unused
-         # out
-         bytes_sent,
-         packets_sent,
-         errout,
-         dropout,
-         fifoout,  # unused
-         collisionsout,  # unused
-         carrierout,  # unused
-         compressedout) = map(int, fields)
-
-        retdict[name] = (bytes_sent, bytes_recv, packets_sent, packets_recv,
-                         errin, errout, dropin, dropout)
-    return retdict
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    duplex_map = {cext.DUPLEX_FULL: NIC_DUPLEX_FULL,
-                  cext.DUPLEX_HALF: NIC_DUPLEX_HALF,
-                  cext.DUPLEX_UNKNOWN: NIC_DUPLEX_UNKNOWN}
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            ret[name] = _common.snicstats(isup, duplex_map[duplex], speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_usage = _psposix.disk_usage
-
-
-def disk_io_counters(perdisk=False):
-    """Return disk I/O statistics for every disk installed on the
-    system as a dict of raw tuples.
-    """
-    def read_procfs():
-        # OK, this is a bit confusing. The format of /proc/diskstats can
-        # have 3 variations.
-        # On Linux 2.4 each line has always 15 fields, e.g.:
-        # "3     0   8 hda 8 8 8 8 8 8 8 8 8 8 8"
-        # On Linux 2.6+ each line *usually* has 14 fields, and the disk
-        # name is in another position, like this:
-        # "3    0   hda 8 8 8 8 8 8 8 8 8 8 8"
-        # ...unless (Linux 2.6) the line refers to a partition instead
-        # of a disk, in which case the line has less fields (7):
-        # "3    1   hda1 8 8 8 8"
-        # 4.18+ has 4 fields added:
-        # "3    0   hda 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0"
-        # 5.5 has 2 more fields.
-        # See:
-        # https://www.kernel.org/doc/Documentation/iostats.txt
-        # https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats
-        with open_text("%s/diskstats" % get_procfs_path()) as f:
-            lines = f.readlines()
-        for line in lines:
-            fields = line.split()
-            flen = len(fields)
-            if flen == 15:
-                # Linux 2.4
-                name = fields[3]
-                reads = int(fields[2])
-                (reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time, _) = map(int, fields[4:14])
-            elif flen == 14 or flen >= 18:
-                # Linux 2.6+, line referring to a disk
-                name = fields[2]
-                (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time, _) = map(int, fields[3:14])
-            elif flen == 7:
-                # Linux 2.6+, line referring to a partition
-                name = fields[2]
-                reads, rbytes, writes, wbytes = map(int, fields[3:])
-                rtime = wtime = reads_merged = writes_merged = busy_time = 0
-            else:
-                raise ValueError("not sure how to interpret line %r" % line)
-            yield (name, reads, writes, rbytes, wbytes, rtime, wtime,
-                   reads_merged, writes_merged, busy_time)
-
-    def read_sysfs():
-        for block in os.listdir('/sys/block'):
-            for root, _, files in os.walk(os.path.join('/sys/block', block)):
-                if 'stat' not in files:
-                    continue
-                with open_text(os.path.join(root, 'stat')) as f:
-                    fields = f.read().strip().split()
-                name = os.path.basename(root)
-                (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time) = map(int, fields[:10])
-                yield (name, reads, writes, rbytes, wbytes, rtime,
-                       wtime, reads_merged, writes_merged, busy_time)
-
-    if os.path.exists('%s/diskstats' % get_procfs_path()):
-        gen = read_procfs()
-    elif os.path.exists('/sys/block'):
-        gen = read_sysfs()
-    else:
-        raise NotImplementedError(
-            "%s/diskstats nor /sys/block filesystem are available on this "
-            "system" % get_procfs_path())
-
-    retdict = {}
-    for entry in gen:
-        (name, reads, writes, rbytes, wbytes, rtime, wtime, reads_merged,
-            writes_merged, busy_time) = entry
-        if not perdisk and not is_storage_device(name):
-            # perdisk=False means we want to calculate totals so we skip
-            # partitions (e.g. 'sda1', 'nvme0n1p1') and only include
-            # base disk devices (e.g. 'sda', 'nvme0n1'). Base disks
-            # include a total of all their partitions + some extra size
-            # of their own:
-            #     $ cat /proc/diskstats
-            #     259       0 sda 10485760 ...
-            #     259       1 sda1 5186039 ...
-            #     259       1 sda2 5082039 ...
-            # See:
-            # https://github.com/giampaolo/psutil/pull/1313
-            continue
-
-        rbytes *= DISK_SECTOR_SIZE
-        wbytes *= DISK_SECTOR_SIZE
-        retdict[name] = (reads, writes, rbytes, wbytes, rtime, wtime,
-                         reads_merged, writes_merged, busy_time)
-
-    return retdict
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples."""
-    fstypes = set()
-    procfs_path = get_procfs_path()
-    with open_text("%s/filesystems" % procfs_path) as f:
-        for line in f:
-            line = line.strip()
-            if not line.startswith("nodev"):
-                fstypes.add(line.strip())
-            else:
-                # ignore all lines starting with "nodev" except "nodev zfs"
-                fstype = line.split("\t")[1]
-                if fstype == "zfs":
-                    fstypes.add("zfs")
-
-    # See: https://github.com/giampaolo/psutil/issues/1307
-    if procfs_path == "/proc" and os.path.isfile('/etc/mtab'):
-        mounts_path = os.path.realpath("/etc/mtab")
-    else:
-        mounts_path = os.path.realpath("%s/self/mounts" % procfs_path)
-
-    retlist = []
-    partitions = cext.disk_partitions(mounts_path)
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            if device == '' or fstype not in fstypes:
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-
-    return retlist
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_temperatures():
-    """Return hardware (CPU and others) temperatures as a dict
-    including hardware name, label, current, max and critical
-    temperatures.
-
-    Implementation notes:
-    - /sys/class/hwmon looks like the most recent interface to
-      retrieve this info, and this implementation relies on it
-      only (old distros will probably use something else)
-    - lm-sensors on Ubuntu 16.04 relies on /sys/class/hwmon
-    - /sys/class/thermal/thermal_zone* is another one but it's more
-      difficult to parse
-    """
-    ret = collections.defaultdict(list)
-    basenames = glob.glob('/sys/class/hwmon/hwmon*/temp*_*')
-    # CentOS has an intermediate /device directory:
-    # https://github.com/giampaolo/psutil/issues/971
-    # https://github.com/nicolargo/glances/issues/1060
-    basenames.extend(glob.glob('/sys/class/hwmon/hwmon*/device/temp*_*'))
-    basenames.extend(glob.glob(
-        '/sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_*'))
-    basenames = sorted(set([x.split('_')[0] for x in basenames]))
-
-    for base in basenames:
-        try:
-            path = base + '_input'
-            current = float(cat(path)) / 1000.0
-            path = os.path.join(os.path.dirname(base), 'name')
-            unit_name = cat(path, binary=False)
-        except (IOError, OSError, ValueError):
-            # A lot of things can go wrong here, so let's just skip the
-            # whole entry. Sure thing is Linux's /sys/class/hwmon really
-            # is a stinky broken mess.
-            # https://github.com/giampaolo/psutil/issues/1009
-            # https://github.com/giampaolo/psutil/issues/1101
-            # https://github.com/giampaolo/psutil/issues/1129
-            # https://github.com/giampaolo/psutil/issues/1245
-            # https://github.com/giampaolo/psutil/issues/1323
-            continue
-
-        high = cat(base + '_max', fallback=None)
-        critical = cat(base + '_crit', fallback=None)
-        label = cat(base + '_label', fallback='', binary=False)
-
-        if high is not None:
-            try:
-                high = float(high) / 1000.0
-            except ValueError:
-                high = None
-        if critical is not None:
-            try:
-                critical = float(critical) / 1000.0
-            except ValueError:
-                critical = None
-
-        ret[unit_name].append((label, current, high, critical))
-
-    # Indication that no sensors were detected in /sys/class/hwmon/
-    if not basenames:
-        basenames = glob.glob('/sys/class/thermal/thermal_zone*')
-        basenames = sorted(set(basenames))
-
-        for base in basenames:
-            try:
-                path = os.path.join(base, 'temp')
-                current = float(cat(path)) / 1000.0
-                path = os.path.join(base, 'type')
-                unit_name = cat(path, binary=False)
-            except (IOError, OSError, ValueError) as err:
-                debug("ignoring %r for file %r" % (err, path))
-                continue
-
-            trip_paths = glob.glob(base + '/trip_point*')
-            trip_points = set(['_'.join(
-                os.path.basename(p).split('_')[0:3]) for p in trip_paths])
-            critical = None
-            high = None
-            for trip_point in trip_points:
-                path = os.path.join(base, trip_point + "_type")
-                trip_type = cat(path, fallback='', binary=False)
-                if trip_type == 'critical':
-                    critical = cat(os.path.join(base, trip_point + "_temp"),
-                                   fallback=None)
-                elif trip_type == 'high':
-                    high = cat(os.path.join(base, trip_point + "_temp"),
-                               fallback=None)
-
-                if high is not None:
-                    try:
-                        high = float(high) / 1000.0
-                    except ValueError:
-                        high = None
-                if critical is not None:
-                    try:
-                        critical = float(critical) / 1000.0
-                    except ValueError:
-                        critical = None
-
-            ret[unit_name].append(('', current, high, critical))
-
-    return dict(ret)
-
-
-def sensors_fans():
-    """Return hardware fans info (for CPU and other peripherals) as a
-    dict including hardware label and current speed.
-
-    Implementation notes:
-    - /sys/class/hwmon looks like the most recent interface to
-      retrieve this info, and this implementation relies on it
-      only (old distros will probably use something else)
-    - lm-sensors on Ubuntu 16.04 relies on /sys/class/hwmon
-    """
-    ret = collections.defaultdict(list)
-    basenames = glob.glob('/sys/class/hwmon/hwmon*/fan*_*')
-    if not basenames:
-        # CentOS has an intermediate /device directory:
-        # https://github.com/giampaolo/psutil/issues/971
-        basenames = glob.glob('/sys/class/hwmon/hwmon*/device/fan*_*')
-
-    basenames = sorted(set([x.split('_')[0] for x in basenames]))
-    for base in basenames:
-        try:
-            current = int(cat(base + '_input'))
-        except (IOError, OSError) as err:
-            warnings.warn("ignoring %r" % err, RuntimeWarning)
-            continue
-        unit_name = cat(os.path.join(os.path.dirname(base), 'name'),
-                        binary=False)
-        label = cat(base + '_label', fallback='', binary=False)
-        ret[unit_name].append(_common.sfan(label, current))
-
-    return dict(ret)
-
-
-def sensors_battery():
-    """Return battery information.
-    Implementation note: it appears /sys/class/power_supply/BAT0/
-    directory structure may vary and provide files with the same
-    meaning but under different names, see:
-    https://github.com/giampaolo/psutil/issues/966
-    """
-    null = object()
-
-    def multi_cat(*paths):
-        """Attempt to read the content of multiple files which may
-        not exist. If none of them exist return None.
-        """
-        for path in paths:
-            ret = cat(path, fallback=null)
-            if ret != null:
-                return int(ret) if ret.isdigit() else ret
-        return None
-
-    bats = [x for x in os.listdir(POWER_SUPPLY_PATH) if x.startswith('BAT')]
-    if not bats:
-        return None
-    # Get the first available battery. Usually this is "BAT0", except
-    # some rare exceptions:
-    # https://github.com/giampaolo/psutil/issues/1238
-    root = os.path.join(POWER_SUPPLY_PATH, sorted(bats)[0])
-
-    # Base metrics.
-    energy_now = multi_cat(
-        root + "/energy_now",
-        root + "/charge_now")
-    power_now = multi_cat(
-        root + "/power_now",
-        root + "/current_now")
-    energy_full = multi_cat(
-        root + "/energy_full",
-        root + "/charge_full")
-    if energy_now is None or power_now is None:
-        return None
-
-    # Percent. If we have energy_full the percentage will be more
-    # accurate compared to reading /capacity file (float vs. int).
-    if energy_full is not None:
-        try:
-            percent = 100.0 * energy_now / energy_full
-        except ZeroDivisionError:
-            percent = 0.0
-    else:
-        percent = int(cat(root + "/capacity", fallback=-1))
-        if percent == -1:
-            return None
-
-    # Is AC power cable plugged in?
-    # Note: AC0 is not always available and sometimes (e.g. CentOS7)
-    # it's called "AC".
-    power_plugged = None
-    online = multi_cat(
-        os.path.join(POWER_SUPPLY_PATH, "AC0/online"),
-        os.path.join(POWER_SUPPLY_PATH, "AC/online"))
-    if online is not None:
-        power_plugged = online == 1
-    else:
-        status = cat(root + "/status", fallback="", binary=False).lower()
-        if status == "discharging":
-            power_plugged = False
-        elif status in ("charging", "full"):
-            power_plugged = True
-
-    # Seconds left.
-    # Note to self: we may also calculate the charging ETA as per:
-    # https://github.com/thialfihar/dotfiles/blob/
-    #     013937745fd9050c30146290e8f963d65c0179e6/bin/battery.py#L55
-    if power_plugged:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    else:
-        try:
-            secsleft = int(energy_now / power_now * 3600)
-        except ZeroDivisionError:
-            secsleft = _common.POWER_TIME_UNKNOWN
-
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in (':0.0', ':0'):
-            hostname = 'localhost'
-        nt = _common.suser(user, tty or None, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-def boot_time():
-    """Return the system boot time expressed in seconds since the epoch."""
-    global BOOT_TIME
-    path = '%s/stat' % get_procfs_path()
-    with open_binary(path) as f:
-        for line in f:
-            if line.startswith(b'btime'):
-                ret = float(line.strip().split()[1])
-                BOOT_TIME = ret
-                return ret
-        raise RuntimeError(
-            "line 'btime' not found in %s" % path)
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(b(get_procfs_path())) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix PID. Linux TIDs are not
-    supported (always return False).
-    """
-    if not _psposix.pid_exists(pid):
-        return False
-    else:
-        # Linux's apparently does not distinguish between PIDs and TIDs
-        # (thread IDs).
-        # listdir("/proc") won't show any TID (only PIDs) but
-        # os.stat("/proc/{tid}") will succeed if {tid} exists.
-        # os.kill() can also be passed a TID. This is quite confusing.
-        # In here we want to enforce this distinction and support PIDs
-        # only, see:
-        # https://github.com/giampaolo/psutil/issues/687
-        try:
-            # Note: already checked that this is faster than using a
-            # regular expr. Also (a lot) faster than doing
-            # 'return pid in pids()'
-            path = "%s/%s/status" % (get_procfs_path(), pid)
-            with open_binary(path) as f:
-                for line in f:
-                    if line.startswith(b"Tgid:"):
-                        tgid = int(line.split()[1])
-                        # If tgid and pid are the same then we're
-                        # dealing with a process PID.
-                        return tgid == pid
-                raise ValueError("'Tgid' line not found in %s" % path)
-        except (EnvironmentError, ValueError):
-            return pid in pids()
-
-
-def ppid_map():
-    """Obtain a {pid: ppid, ...} dict for all running processes in
-    one shot. Used to speed up Process.children().
-    """
-    ret = {}
-    procfs_path = get_procfs_path()
-    for pid in pids():
-        try:
-            with open_binary("%s/%s/stat" % (procfs_path, pid)) as f:
-                data = f.read()
-        except (FileNotFoundError, ProcessLookupError):
-            # Note: we should be able to access /stat for all processes
-            # aka it's unlikely we'll bump into EPERM, which is good.
-            pass
-        else:
-            rpar = data.rfind(b')')
-            dset = data[rpar + 2:].split()
-            ppid = int(dset[1])
-            ret[pid] = ppid
-    return ret
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError and IOError exceptions
-    into NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except ProcessLookupError:
-            raise NoSuchProcess(self.pid, self._name)
-        except FileNotFoundError:
-            if not os.path.exists("%s/%s" % (self._procfs_path, self.pid)):
-                raise NoSuchProcess(self.pid, self._name)
-            # Note: zombies will keep existing under /proc until they're
-            # gone so there's no way to distinguish them in here.
-            raise
-    return wrapper
-
-
-class Process(object):
-    """Linux process implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _parse_stat_file(self):
-        """Parse /proc/{pid}/stat file and return a dict with various
-        process info.
-        Using "man proc" as a reference: where "man proc" refers to
-        position N always substract 3 (e.g ppid position 4 in
-        'man proc' == position 1 in here).
-        The return value is cached in case oneshot() ctx manager is
-        in use.
-        """
-        with open_binary("%s/%s/stat" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        # Process name is between parentheses. It can contain spaces and
-        # other parentheses. This is taken into account by looking for
-        # the first occurrence of "(" and the last occurence of ")".
-        rpar = data.rfind(b')')
-        name = data[data.find(b'(') + 1:rpar]
-        fields = data[rpar + 2:].split()
-
-        ret = {}
-        ret['name'] = name
-        ret['status'] = fields[0]
-        ret['ppid'] = fields[1]
-        ret['ttynr'] = fields[4]
-        ret['utime'] = fields[11]
-        ret['stime'] = fields[12]
-        ret['children_utime'] = fields[13]
-        ret['children_stime'] = fields[14]
-        ret['create_time'] = fields[19]
-        ret['cpu_num'] = fields[36]
-        ret['blkio_ticks'] = fields[39]  # aka 'delayacct_blkio_ticks'
-
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _read_status_file(self):
-        """Read /proc/{pid}/stat file and return its content.
-        The return value is cached in case oneshot() ctx manager is
-        in use.
-        """
-        with open_binary("%s/%s/status" % (self._procfs_path, self.pid)) as f:
-            return f.read()
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _read_smaps_file(self):
-        with open_binary("%s/%s/smaps" % (self._procfs_path, self.pid),
-                         buffering=BIGFILE_BUFFERING) as f:
-            return f.read().strip()
-
-    def oneshot_enter(self):
-        self._parse_stat_file.cache_activate(self)
-        self._read_status_file.cache_activate(self)
-        self._read_smaps_file.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._parse_stat_file.cache_deactivate(self)
-        self._read_status_file.cache_deactivate(self)
-        self._read_smaps_file.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self._parse_stat_file()['name']
-        if PY3:
-            name = decode(name)
-        # XXX - gets changed later and probably needs refactoring
-        return name
-
-    def exe(self):
-        try:
-            return readlink("%s/%s/exe" % (self._procfs_path, self.pid))
-        except (FileNotFoundError, ProcessLookupError):
-            # no such file error; might be raised also if the
-            # path actually exists for system processes with
-            # low pids (about 0-20)
-            if os.path.lexists("%s/%s" % (self._procfs_path, self.pid)):
-                return ""
-            else:
-                if not pid_exists(self.pid):
-                    raise NoSuchProcess(self.pid, self._name)
-                else:
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-
-    @wrap_exceptions
-    def cmdline(self):
-        with open_text("%s/%s/cmdline" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        if not data:
-            # may happen in case of zombie process
-            return []
-        # 'man proc' states that args are separated by null bytes '\0'
-        # and last char is supposed to be a null byte. Nevertheless
-        # some processes may change their cmdline after being started
-        # (via setproctitle() or similar), they are usually not
-        # compliant with this rule and use spaces instead. Google
-        # Chrome process is an example. See:
-        # https://github.com/giampaolo/psutil/issues/1179
-        sep = '\x00' if data.endswith('\x00') else ' '
-        if data.endswith(sep):
-            data = data[:-1]
-        cmdline = data.split(sep)
-        # Sometimes last char is a null byte '\0' but the args are
-        # separated by spaces, see: https://github.com/giampaolo/psutil/
-        # issues/1179#issuecomment-552984549
-        if sep == '\x00' and len(cmdline) == 1 and ' ' in data:
-            cmdline = data.split(' ')
-        return cmdline
-
-    @wrap_exceptions
-    def environ(self):
-        with open_text("%s/%s/environ" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        return parse_environ_block(data)
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = int(self._parse_stat_file()['ttynr'])
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    # May not be available on old kernels.
-    if os.path.exists('/proc/%s/io' % os.getpid()):
-        @wrap_exceptions
-        def io_counters(self):
-            fname = "%s/%s/io" % (self._procfs_path, self.pid)
-            fields = {}
-            with open_binary(fname) as f:
-                for line in f:
-                    # https://github.com/giampaolo/psutil/issues/1004
-                    line = line.strip()
-                    if line:
-                        try:
-                            name, value = line.split(b': ')
-                        except ValueError:
-                            # https://github.com/giampaolo/psutil/issues/1004
-                            continue
-                        else:
-                            fields[name] = int(value)
-            if not fields:
-                raise RuntimeError("%s file was empty" % fname)
-            try:
-                return pio(
-                    fields[b'syscr'],  # read syscalls
-                    fields[b'syscw'],  # write syscalls
-                    fields[b'read_bytes'],  # read bytes
-                    fields[b'write_bytes'],  # write bytes
-                    fields[b'rchar'],  # read chars
-                    fields[b'wchar'],  # write chars
-                )
-            except KeyError as err:
-                raise ValueError("%r field was not found in %s; found fields "
-                                 "are %r" % (err[0], fname, fields))
-
-    @wrap_exceptions
-    def cpu_times(self):
-        values = self._parse_stat_file()
-        utime = float(values['utime']) / CLOCK_TICKS
-        stime = float(values['stime']) / CLOCK_TICKS
-        children_utime = float(values['children_utime']) / CLOCK_TICKS
-        children_stime = float(values['children_stime']) / CLOCK_TICKS
-        iowait = float(values['blkio_ticks']) / CLOCK_TICKS
-        return pcputimes(utime, stime, children_utime, children_stime, iowait)
-
-    @wrap_exceptions
-    def cpu_num(self):
-        """What CPU the process is on."""
-        return int(self._parse_stat_file()['cpu_num'])
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def create_time(self):
-        ctime = float(self._parse_stat_file()['create_time'])
-        # According to documentation, starttime is in field 21 and the
-        # unit is jiffies (clock ticks).
-        # We first divide it for clock ticks and then add uptime returning
-        # seconds since the epoch, in UTC.
-        # Also use cached value if available.
-        bt = BOOT_TIME or boot_time()
-        return (ctime / CLOCK_TICKS) + bt
-
-    @wrap_exceptions
-    def memory_info(self):
-        #  ============================================================
-        # | FIELD  | DESCRIPTION                         | AKA  | TOP  |
-        #  ============================================================
-        # | rss    | resident set size                   |      | RES  |
-        # | vms    | total program size                  | size | VIRT |
-        # | shared | shared pages (from shared mappings) |      | SHR  |
-        # | text   | text ('code')                       | trs  | CODE |
-        # | lib    | library (unused in Linux 2.6)       | lrs  |      |
-        # | data   | data + stack                        | drs  | DATA |
-        # | dirty  | dirty pages (unused in Linux 2.6)   | dt   |      |
-        #  ============================================================
-        with open_binary("%s/%s/statm" % (self._procfs_path, self.pid)) as f:
-            vms, rss, shared, text, lib, data, dirty = \
-                [int(x) * PAGESIZE for x in f.readline().split()[:7]]
-        return pmem(rss, vms, shared, text, lib, data, dirty)
-
-    # /proc/pid/smaps does not exist on kernels < 2.6.14 or if
-    # CONFIG_MMU kernel configuration option is not enabled.
-    if HAS_SMAPS:
-
-        @wrap_exceptions
-        def memory_full_info(
-                self,
-                # Gets Private_Clean, Private_Dirty, Private_Hugetlb.
-                _private_re=re.compile(br"\nPrivate.*:\s+(\d+)"),
-                _pss_re=re.compile(br"\nPss\:\s+(\d+)"),
-                _swap_re=re.compile(br"\nSwap\:\s+(\d+)")):
-            basic_mem = self.memory_info()
-            # Note: using 3 regexes is faster than reading the file
-            # line by line.
-            # XXX: on Python 3 the 2 regexes are 30% slower than on
-            # Python 2 though. Figure out why.
-            #
-            # You might be tempted to calculate USS by subtracting
-            # the "shared" value from the "resident" value in
-            # /proc/<pid>/statm. But at least on Linux, statm's "shared"
-            # value actually counts pages backed by files, which has
-            # little to do with whether the pages are actually shared.
-            # /proc/self/smaps on the other hand appears to give us the
-            # correct information.
-            smaps_data = self._read_smaps_file()
-            # Note: smaps file can be empty for certain processes.
-            # The code below will not crash though and will result to 0.
-            uss = sum(map(int, _private_re.findall(smaps_data))) * 1024
-            pss = sum(map(int, _pss_re.findall(smaps_data))) * 1024
-            swap = sum(map(int, _swap_re.findall(smaps_data))) * 1024
-            return pfullmem(*basic_mem + (uss, pss, swap))
-
-    else:
-        memory_full_info = memory_info
-
-    if HAS_SMAPS:
-
-        @wrap_exceptions
-        def memory_maps(self):
-            """Return process's mapped memory regions as a list of named
-            tuples. Fields are explained in 'man proc'; here is an updated
-            (Apr 2012) version: http://goo.gl/fmebo
-
-            /proc/{PID}/smaps does not exist on kernels < 2.6.14 or if
-            CONFIG_MMU kernel configuration option is not enabled.
-            """
-            def get_blocks(lines, current_block):
-                data = {}
-                for line in lines:
-                    fields = line.split(None, 5)
-                    if not fields[0].endswith(b':'):
-                        # new block section
-                        yield (current_block.pop(), data)
-                        current_block.append(line)
-                    else:
-                        try:
-                            data[fields[0]] = int(fields[1]) * 1024
-                        except ValueError:
-                            if fields[0].startswith(b'VmFlags:'):
-                                # see issue #369
-                                continue
-                            else:
-                                raise ValueError("don't know how to inte"
-                                                 "rpret line %r" % line)
-                yield (current_block.pop(), data)
-
-            data = self._read_smaps_file()
-            # Note: smaps file can be empty for certain processes.
-            if not data:
-                return []
-            lines = data.split(b'\n')
-            ls = []
-            first_line = lines.pop(0)
-            current_block = [first_line]
-            for header, data in get_blocks(lines, current_block):
-                hfields = header.split(None, 5)
-                try:
-                    addr, perms, offset, dev, inode, path = hfields
-                except ValueError:
-                    addr, perms, offset, dev, inode, path = \
-                        hfields + ['']
-                if not path:
-                    path = '[anon]'
-                else:
-                    if PY3:
-                        path = decode(path)
-                    path = path.strip()
-                    if (path.endswith(' (deleted)') and not
-                            path_exists_strict(path)):
-                        path = path[:-10]
-                ls.append((
-                    decode(addr), decode(perms), path,
-                    data.get(b'Rss:', 0),
-                    data.get(b'Size:', 0),
-                    data.get(b'Pss:', 0),
-                    data.get(b'Shared_Clean:', 0),
-                    data.get(b'Shared_Dirty:', 0),
-                    data.get(b'Private_Clean:', 0),
-                    data.get(b'Private_Dirty:', 0),
-                    data.get(b'Referenced:', 0),
-                    data.get(b'Anonymous:', 0),
-                    data.get(b'Swap:', 0)
-                ))
-            return ls
-
-    @wrap_exceptions
-    def cwd(self):
-        try:
-            return readlink("%s/%s/cwd" % (self._procfs_path, self.pid))
-        except (FileNotFoundError, ProcessLookupError):
-            # https://github.com/giampaolo/psutil/issues/986
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-
-    @wrap_exceptions
-    def num_ctx_switches(self,
-                         _ctxsw_re=re.compile(br'ctxt_switches:\t(\d+)')):
-        data = self._read_status_file()
-        ctxsw = _ctxsw_re.findall(data)
-        if not ctxsw:
-            raise NotImplementedError(
-                "'voluntary_ctxt_switches' and 'nonvoluntary_ctxt_switches'"
-                "lines were not found in %s/%s/status; the kernel is "
-                "probably older than 2.6.23" % (
-                    self._procfs_path, self.pid))
-        else:
-            return _common.pctxsw(int(ctxsw[0]), int(ctxsw[1]))
-
-    @wrap_exceptions
-    def num_threads(self, _num_threads_re=re.compile(br'Threads:\t(\d+)')):
-        # Note: on Python 3 using a re is faster than iterating over file
-        # line by line. On Python 2 is the exact opposite, and iterating
-        # over a file on Python 3 is slower than on Python 2.
-        data = self._read_status_file()
-        return int(_num_threads_re.findall(data)[0])
-
-    @wrap_exceptions
-    def threads(self):
-        thread_ids = os.listdir("%s/%s/task" % (self._procfs_path, self.pid))
-        thread_ids.sort()
-        retlist = []
-        hit_enoent = False
-        for thread_id in thread_ids:
-            fname = "%s/%s/task/%s/stat" % (
-                self._procfs_path, self.pid, thread_id)
-            try:
-                with open_binary(fname) as f:
-                    st = f.read().strip()
-            except FileNotFoundError:
-                # no such file or directory; it means thread
-                # disappeared on us
-                hit_enoent = True
-                continue
-            # ignore the first two values ("pid (exe)")
-            st = st[st.find(b')') + 2:]
-            values = st.split(b' ')
-            utime = float(values[11]) / CLOCK_TICKS
-            stime = float(values[12]) / CLOCK_TICKS
-            ntuple = _common.pthread(int(thread_id), utime, stime)
-            retlist.append(ntuple)
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def nice_get(self):
-        # with open_text('%s/%s/stat' % (self._procfs_path, self.pid)) as f:
-        #   data = f.read()
-        #   return int(data.split()[18])
-
-        # Use C implementation
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    # starting from CentOS 6.
-    if HAS_CPU_AFFINITY:
-
-        @wrap_exceptions
-        def cpu_affinity_get(self):
-            return cext.proc_cpu_affinity_get(self.pid)
-
-        def _get_eligible_cpus(
-                self, _re=re.compile(br"Cpus_allowed_list:\t(\d+)-(\d+)")):
-            # See: https://github.com/giampaolo/psutil/issues/956
-            data = self._read_status_file()
-            match = _re.findall(data)
-            if match:
-                return list(range(int(match[0][0]), int(match[0][1]) + 1))
-            else:
-                return list(range(len(per_cpu_times())))
-
-        @wrap_exceptions
-        def cpu_affinity_set(self, cpus):
-            try:
-                cext.proc_cpu_affinity_set(self.pid, cpus)
-            except (OSError, ValueError) as err:
-                if isinstance(err, ValueError) or err.errno == errno.EINVAL:
-                    eligible_cpus = self._get_eligible_cpus()
-                    all_cpus = tuple(range(len(per_cpu_times())))
-                    for cpu in cpus:
-                        if cpu not in all_cpus:
-                            raise ValueError(
-                                "invalid CPU number %r; choose between %s" % (
-                                    cpu, eligible_cpus))
-                        if cpu not in eligible_cpus:
-                            raise ValueError(
-                                "CPU number %r is not eligible; choose "
-                                "between %s" % (cpu, eligible_cpus))
-                raise
-
-    # only starting from kernel 2.6.13
-    if HAS_PROC_IO_PRIORITY:
-
-        @wrap_exceptions
-        def ionice_get(self):
-            ioclass, value = cext.proc_ioprio_get(self.pid)
-            if enum is not None:
-                ioclass = IOPriority(ioclass)
-            return _common.pionice(ioclass, value)
-
-        @wrap_exceptions
-        def ionice_set(self, ioclass, value):
-            if value is None:
-                value = 0
-            if value and ioclass in (IOPRIO_CLASS_IDLE, IOPRIO_CLASS_NONE):
-                raise ValueError("%r ioclass accepts no value" % ioclass)
-            if value < 0 or value > 7:
-                raise ValueError("value not in 0-7 range")
-            return cext.proc_ioprio_set(self.pid, ioclass, value)
-
-    if HAS_PRLIMIT:
-
-        @wrap_exceptions
-        def rlimit(self, resource, limits=None):
-            # If pid is 0 prlimit() applies to the calling process and
-            # we don't want that. We should never get here though as
-            # PID 0 is not supported on Linux.
-            if self.pid == 0:
-                raise ValueError("can't use prlimit() against PID 0 process")
-            try:
-                if limits is None:
-                    # get
-                    return cext.linux_prlimit(self.pid, resource)
-                else:
-                    # set
-                    if len(limits) != 2:
-                        raise ValueError(
-                            "second argument must be a (soft, hard) tuple, "
-                            "got %s" % repr(limits))
-                    soft, hard = limits
-                    cext.linux_prlimit(self.pid, resource, soft, hard)
-            except OSError as err:
-                if err.errno == errno.ENOSYS and pid_exists(self.pid):
-                    # I saw this happening on Travis:
-                    # https://travis-ci.org/giampaolo/psutil/jobs/51368273
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-                else:
-                    raise
-
-    @wrap_exceptions
-    def status(self):
-        letter = self._parse_stat_file()['status']
-        if PY3:
-            letter = letter.decode()
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(letter, '?')
-
-    @wrap_exceptions
-    def open_files(self):
-        retlist = []
-        files = os.listdir("%s/%s/fd" % (self._procfs_path, self.pid))
-        hit_enoent = False
-        for fd in files:
-            file = "%s/%s/fd/%s" % (self._procfs_path, self.pid, fd)
-            try:
-                path = readlink(file)
-            except (FileNotFoundError, ProcessLookupError):
-                # ENOENT == file which is gone in the meantime
-                hit_enoent = True
-                continue
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    # not a link
-                    continue
-                raise
-            else:
-                # If path is not an absolute there's no way to tell
-                # whether it's a regular file or not, so we skip it.
-                # A regular file is always supposed to be have an
-                # absolute path though.
-                if path.startswith('/') and isfile_strict(path):
-                    # Get file position and flags.
-                    file = "%s/%s/fdinfo/%s" % (
-                        self._procfs_path, self.pid, fd)
-                    try:
-                        with open_binary(file) as f:
-                            pos = int(f.readline().split()[1])
-                            flags = int(f.readline().split()[1], 8)
-                    except FileNotFoundError:
-                        # fd gone in the meantime; process may
-                        # still be alive
-                        hit_enoent = True
-                    else:
-                        mode = file_flags_to_mode(flags)
-                        ntuple = popenfile(
-                            path, int(fd), int(pos), mode, flags)
-                        retlist.append(ntuple)
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = _connections.retrieve(kind, self.pid)
-        self._assert_alive()
-        return ret
-
-    @wrap_exceptions
-    def num_fds(self):
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def ppid(self):
-        return int(self._parse_stat_file()['ppid'])
-
-    @wrap_exceptions
-    def uids(self, _uids_re=re.compile(br'Uid:\t(\d+)\t(\d+)\t(\d+)')):
-        data = self._read_status_file()
-        real, effective, saved = _uids_re.findall(data)[0]
-        return _common.puids(int(real), int(effective), int(saved))
-
-    @wrap_exceptions
-    def gids(self, _gids_re=re.compile(br'Gid:\t(\d+)\t(\d+)\t(\d+)')):
-        data = self._read_status_file()
-        real, effective, saved = _gids_re.findall(data)[0]
-        return _common.pgids(int(real), int(effective), int(saved))
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psosx.py firefox-85.0+build1/third_party/python/psutil/psutil/_psosx.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psosx.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psosx.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,564 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""macOS platform implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_osx as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import isfile_strict
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import parse_environ_block
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-
-
-__extra__all__ = []
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-AF_LINK = cext_posix.AF_LINK
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RECEIVED: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-PROC_STATUSES = {
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SRUN: _common.STATUS_RUNNING,
-    cext.SSLEEP: _common.STATUS_SLEEPING,
-    cext.SSTOP: _common.STATUS_STOPPED,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-}
-
-kinfo_proc_map = dict(
-    ppid=0,
-    ruid=1,
-    euid=2,
-    suid=3,
-    rgid=4,
-    egid=5,
-    sgid=6,
-    ttynr=7,
-    ctime=8,
-    status=9,
-    name=10,
-)
-
-pidtaskinfo_map = dict(
-    cpuutime=0,
-    cpustime=1,
-    rss=2,
-    vms=3,
-    pfaults=4,
-    pageins=5,
-    numthreads=6,
-    volctxsw=7,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'nice', 'system', 'idle'])
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'wired'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms', 'pfaults', 'pageins'])
-# psutil.Process.memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', ))
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    total, active, inactive, wired, free, speculative = cext.virtual_mem()
-    # This is how Zabbix calculate avail and used mem:
-    # https://github.com/zabbix/zabbix/blob/trunk/src/libs/zbxsysinfo/
-    #     osx/memory.c
-    # Also see: https://github.com/giampaolo/psutil/issues/1277
-    avail = inactive + free
-    used = active + wired
-    # This is NOT how Zabbix calculates free mem but it matches "free"
-    # cmdline utility.
-    free -= speculative
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, wired)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    total, used, free, sin, sout = cext.swap_mem()
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system CPU times as a namedtuple."""
-    user, nice, system, idle = cext.cpu_times()
-    return scputimes(user, nice, system, idle)
-
-
-def per_cpu_times():
-    """Return system CPU times as a named tuple"""
-    ret = []
-    for cpu_t in cext.per_cpu_times():
-        user, nice, system, idle = cpu_t
-        item = scputimes(user, nice, system, idle)
-        ret.append(item)
-    return ret
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-def cpu_count_physical():
-    """Return the number of physical CPUs in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    ctx_switches, interrupts, soft_interrupts, syscalls, traps = \
-        cext.cpu_stats()
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-def cpu_freq():
-    """Return CPU frequency.
-    On macOS per-cpu frequency is not supported.
-    Also, the returned frequency never changes, see:
-    https://arstechnica.com/civis/viewtopic.php?f=19&t=465002
-    """
-    curr, min_, max_ = cext.cpu_freq()
-    return [_common.scpufreq(curr, min_, max_)]
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_usage = _psposix.disk_usage
-disk_io_counters = cext.disk_io_counters
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples."""
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            if not os.path.isabs(device) or not os.path.exists(device):
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_battery():
-    """Return battery information."""
-    try:
-        percent, minsleft, power_plugged = cext.sensors_battery()
-    except NotImplementedError:
-        # no power source - return None according to interface
-        return None
-    power_plugged = power_plugged == 1
-    if power_plugged:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    elif minsleft == -1:
-        secsleft = _common.POWER_TIME_UNKNOWN
-    else:
-        secsleft = minsleft * 60
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_connections(kind='inet'):
-    """System-wide network connections."""
-    # Note: on macOS this will fail with AccessDenied unless
-    # the process is owned by root.
-    ret = []
-    for pid in pids():
-        try:
-            cons = Process(pid).connections(kind)
-        except NoSuchProcess:
-            continue
-        else:
-            if cons:
-                for c in cons:
-                    c = list(c) + [pid]
-                    ret.append(_common.sconn(*c))
-    return ret
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext_posix.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            if hasattr(_common, 'NicDuplex'):
-                duplex = _common.NicDuplex(duplex)
-            ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, pid = item
-        if tty == '~':
-            continue  # reboot or shutdown
-        if not tstamp:
-            continue
-        nt = _common.suser(user, tty or None, hostname or None, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    ls = cext.pids()
-    if 0 not in ls:
-        # On certain macOS versions pids() C doesn't return PID 0 but
-        # "ps" does and the process is querable via sysctl():
-        # https://travis-ci.org/giampaolo/psutil/jobs/309619941
-        try:
-            Process(0).create_time()
-            ls.insert(0, 0)
-        except NoSuchProcess:
-            pass
-        except AccessDenied:
-            ls.insert(0, 0)
-    return ls
-
-
-pid_exists = _psposix.pid_exists
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError exceptions into
-    NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except ProcessLookupError:
-            raise NoSuchProcess(self.pid, self._name)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except cext.ZombieProcessError:
-            raise ZombieProcess(self.pid, self._name, self._ppid)
-    return wrapper
-
-
-@contextlib.contextmanager
-def catch_zombie(proc):
-    """There are some poor C APIs which incorrectly raise ESRCH when
-    the process is still alive or it's a zombie, or even RuntimeError
-    (those who don't set errno). This is here in order to solve:
-    https://github.com/giampaolo/psutil/issues/1044
-    """
-    try:
-        yield
-    except (OSError, RuntimeError) as err:
-        if isinstance(err, RuntimeError) or err.errno == errno.ESRCH:
-            try:
-                # status() is not supposed to lie and correctly detect
-                # zombies so if it raises ESRCH it's true.
-                status = proc.status()
-            except NoSuchProcess:
-                raise err
-            else:
-                if status == _common.STATUS_ZOMBIE:
-                    raise ZombieProcess(proc.pid, proc._name, proc._ppid)
-                else:
-                    raise AccessDenied(proc.pid, proc._name)
-        else:
-            raise
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _get_kinfo_proc(self):
-        # Note: should work with all PIDs without permission issues.
-        ret = cext.proc_kinfo_oneshot(self.pid)
-        assert len(ret) == len(kinfo_proc_map)
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _get_pidtaskinfo(self):
-        # Note: should work for PIDs owned by user only.
-        with catch_zombie(self):
-            ret = cext.proc_pidtaskinfo_oneshot(self.pid)
-        assert len(ret) == len(pidtaskinfo_map)
-        return ret
-
-    def oneshot_enter(self):
-        self._get_kinfo_proc.cache_activate(self)
-        self._get_pidtaskinfo.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._get_kinfo_proc.cache_deactivate(self)
-        self._get_pidtaskinfo.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self._get_kinfo_proc()[kinfo_proc_map['name']]
-        return name if name is not None else cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    def exe(self):
-        with catch_zombie(self):
-            return cext.proc_exe(self.pid)
-
-    @wrap_exceptions
-    def cmdline(self):
-        with catch_zombie(self):
-            return cext.proc_cmdline(self.pid)
-
-    @wrap_exceptions
-    def environ(self):
-        with catch_zombie(self):
-            return parse_environ_block(cext.proc_environ(self.pid))
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._get_kinfo_proc()[kinfo_proc_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def cwd(self):
-        with catch_zombie(self):
-            return cext.proc_cwd(self.pid)
-
-    @wrap_exceptions
-    def uids(self):
-        rawtuple = self._get_kinfo_proc()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['ruid']],
-            rawtuple[kinfo_proc_map['euid']],
-            rawtuple[kinfo_proc_map['suid']])
-
-    @wrap_exceptions
-    def gids(self):
-        rawtuple = self._get_kinfo_proc()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['rgid']],
-            rawtuple[kinfo_proc_map['egid']],
-            rawtuple[kinfo_proc_map['sgid']])
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = self._get_kinfo_proc()[kinfo_proc_map['ttynr']]
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        rawtuple = self._get_pidtaskinfo()
-        return pmem(
-            rawtuple[pidtaskinfo_map['rss']],
-            rawtuple[pidtaskinfo_map['vms']],
-            rawtuple[pidtaskinfo_map['pfaults']],
-            rawtuple[pidtaskinfo_map['pageins']],
-        )
-
-    @wrap_exceptions
-    def memory_full_info(self):
-        basic_mem = self.memory_info()
-        uss = cext.proc_memory_uss(self.pid)
-        return pfullmem(*basic_mem + (uss, ))
-
-    @wrap_exceptions
-    def cpu_times(self):
-        rawtuple = self._get_pidtaskinfo()
-        return _common.pcputimes(
-            rawtuple[pidtaskinfo_map['cpuutime']],
-            rawtuple[pidtaskinfo_map['cpustime']],
-            # children user / system times are not retrievable (set to 0)
-            0.0, 0.0)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._get_kinfo_proc()[kinfo_proc_map['ctime']]
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        # Unvoluntary value seems not to be available;
-        # getrusage() numbers seems to confirm this theory.
-        # We set it to 0.
-        vol = self._get_pidtaskinfo()[pidtaskinfo_map['volctxsw']]
-        return _common.pctxsw(vol, 0)
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._get_pidtaskinfo()[pidtaskinfo_map['numthreads']]
-
-    @wrap_exceptions
-    def open_files(self):
-        if self.pid == 0:
-            return []
-        files = []
-        with catch_zombie(self):
-            rawlist = cext.proc_open_files(self.pid)
-        for path, fd in rawlist:
-            if isfile_strict(path):
-                ntuple = _common.popenfile(path, fd)
-                files.append(ntuple)
-        return files
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        if kind not in conn_tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in conn_tmap])))
-        families, types = conn_tmap[kind]
-        with catch_zombie(self):
-            rawlist = cext.proc_connections(self.pid, families, types)
-        ret = []
-        for item in rawlist:
-            fd, fam, type, laddr, raddr, status = item
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES)
-            ret.append(nt)
-        return ret
-
-    @wrap_exceptions
-    def num_fds(self):
-        if self.pid == 0:
-            return 0
-        with catch_zombie(self):
-            return cext.proc_num_fds(self.pid)
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def nice_get(self):
-        with catch_zombie(self):
-            return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        with catch_zombie(self):
-            return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def status(self):
-        code = self._get_kinfo_proc()[kinfo_proc_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def threads(self):
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        return retlist
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psposix.py firefox-85.0+build1/third_party/python/psutil/psutil/_psposix.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psposix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psposix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Routines common to all posix systems."""
-
-import glob
-import os
-import sys
-import time
-
-from ._common import memoize
-from ._common import sdiskusage
-from ._common import TimeoutExpired
-from ._common import usage_percent
-from ._compat import ChildProcessError
-from ._compat import FileNotFoundError
-from ._compat import InterruptedError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-from ._compat import unicode
-
-
-__all__ = ['pid_exists', 'wait_pid', 'disk_usage', 'get_terminal_map']
-
-
-def pid_exists(pid):
-    """Check whether pid exists in the current process table."""
-    if pid == 0:
-        # According to "man 2 kill" PID 0 has a special meaning:
-        # it refers to <<every process in the process group of the
-        # calling process>> so we don't want to go any further.
-        # If we get here it means this UNIX platform *does* have
-        # a process with id 0.
-        return True
-    try:
-        os.kill(pid, 0)
-    except ProcessLookupError:
-        return False
-    except PermissionError:
-        # EPERM clearly means there's a process to deny access to
-        return True
-    # According to "man 2 kill" possible error values are
-    # (EINVAL, EPERM, ESRCH)
-    else:
-        return True
-
-
-def wait_pid(pid, timeout=None, proc_name=None):
-    """Wait for process with pid 'pid' to terminate and return its
-    exit status code as an integer.
-
-    If pid is not a children of os.getpid() (current process) just
-    waits until the process disappears and return None.
-
-    If pid does not exist at all return None immediately.
-
-    Raise TimeoutExpired on timeout expired.
-    """
-    def check_timeout(delay):
-        if timeout is not None:
-            if timer() >= stop_at:
-                raise TimeoutExpired(timeout, pid=pid, name=proc_name)
-        time.sleep(delay)
-        return min(delay * 2, 0.04)
-
-    timer = getattr(time, 'monotonic', time.time)
-    if timeout is not None:
-        def waitcall():
-            return os.waitpid(pid, os.WNOHANG)
-        stop_at = timer() + timeout
-    else:
-        def waitcall():
-            return os.waitpid(pid, 0)
-
-    delay = 0.0001
-    while True:
-        try:
-            retpid, status = waitcall()
-        except InterruptedError:
-            delay = check_timeout(delay)
-        except ChildProcessError:
-            # This has two meanings:
-            # - pid is not a child of os.getpid() in which case
-            #   we keep polling until it's gone
-            # - pid never existed in the first place
-            # In both cases we'll eventually return None as we
-            # can't determine its exit status code.
-            while True:
-                if pid_exists(pid):
-                    delay = check_timeout(delay)
-                else:
-                    return
-        else:
-            if retpid == 0:
-                # WNOHANG was used, pid is still running
-                delay = check_timeout(delay)
-                continue
-            # process exited due to a signal; return the integer of
-            # that signal
-            if os.WIFSIGNALED(status):
-                return -os.WTERMSIG(status)
-            # process exited using exit(2) system call; return the
-            # integer exit(2) system call has been called with
-            elif os.WIFEXITED(status):
-                return os.WEXITSTATUS(status)
-            else:
-                # should never happen
-                raise ValueError("unknown process exit status %r" % status)
-
-
-def disk_usage(path):
-    """Return disk usage associated with path.
-    Note: UNIX usually reserves 5% disk space which is not accessible
-    by user. In this function "total" and "used" values reflect the
-    total and used disk space whereas "free" and "percent" represent
-    the "free" and "used percent" user disk space.
-    """
-    if PY3:
-        st = os.statvfs(path)
-    else:
-        # os.statvfs() does not support unicode on Python 2:
-        # - https://github.com/giampaolo/psutil/issues/416
-        # - http://bugs.python.org/issue18695
-        try:
-            st = os.statvfs(path)
-        except UnicodeEncodeError:
-            if isinstance(path, unicode):
-                try:
-                    path = path.encode(sys.getfilesystemencoding())
-                except UnicodeEncodeError:
-                    pass
-                st = os.statvfs(path)
-            else:
-                raise
-
-    # Total space which is only available to root (unless changed
-    # at system level).
-    total = (st.f_blocks * st.f_frsize)
-    # Remaining free space usable by root.
-    avail_to_root = (st.f_bfree * st.f_frsize)
-    # Remaining free space usable by user.
-    avail_to_user = (st.f_bavail * st.f_frsize)
-    # Total space being used in general.
-    used = (total - avail_to_root)
-    # Total space which is available to user (same as 'total' but
-    # for the user).
-    total_user = used + avail_to_user
-    # User usage percent compared to the total amount of space
-    # the user can use. This number would be higher if compared
-    # to root's because the user has less space (usually -5%).
-    usage_percent_user = usage_percent(used, total_user, round_=1)
-
-    # NB: the percentage is -5% than what shown by df due to
-    # reserved blocks that we are currently not considering:
-    # https://github.com/giampaolo/psutil/issues/829#issuecomment-223750462
-    return sdiskusage(
-        total=total, used=used, free=avail_to_user, percent=usage_percent_user)
-
-
-@memoize
-def get_terminal_map():
-    """Get a map of device-id -> path as a dict.
-    Used by Process.terminal()
-    """
-    ret = {}
-    ls = glob.glob('/dev/tty*') + glob.glob('/dev/pts/*')
-    for name in ls:
-        assert name not in ret, name
-        try:
-            ret[os.stat(name).st_rdev] = name
-        except FileNotFoundError:
-            pass
-    return ret
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_pssunos.py firefox-85.0+build1/third_party/python/psutil/psutil/_pssunos.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_pssunos.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_pssunos.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,725 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Sun OS Solaris platform implementation."""
-
-import errno
-import functools
-import os
-import socket
-import subprocess
-import sys
-from collections import namedtuple
-from socket import AF_INET
-
-from . import _common
-from . import _psposix
-from . import _psutil_posix as cext_posix
-from . import _psutil_sunos as cext
-from ._common import AccessDenied
-from ._common import AF_INET6
-from ._common import debug
-from ._common import get_procfs_path
-from ._common import isfile_strict
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import sockfam_to_enum
-from ._common import socktype_to_enum
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import b
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-
-__extra__all__ = ["CONN_IDLE", "CONN_BOUND", "PROCFS_PATH"]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-PAGE_SIZE = os.sysconf('SC_PAGE_SIZE')
-AF_LINK = cext_posix.AF_LINK
-IS_64_BIT = sys.maxsize > 2**32
-
-CONN_IDLE = "IDLE"
-CONN_BOUND = "BOUND"
-
-PROC_STATUSES = {
-    cext.SSLEEP: _common.STATUS_SLEEPING,
-    cext.SRUN: _common.STATUS_RUNNING,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-    cext.SSTOP: _common.STATUS_STOPPED,
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SONPROC: _common.STATUS_RUNNING,  # same as run
-    cext.SWAIT: _common.STATUS_WAITING,
-}
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-    cext.TCPS_IDLE: CONN_IDLE,  # sunos specific
-    cext.TCPS_BOUND: CONN_BOUND,  # sunos specific
-}
-
-proc_info_map = dict(
-    ppid=0,
-    rss=1,
-    vms=2,
-    create_time=3,
-    nice=4,
-    num_threads=5,
-    status=6,
-    ttynr=7,
-    uid=8,
-    euid=9,
-    gid=10,
-    egid=11)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'system', 'idle', 'iowait'])
-# psutil.cpu_times(percpu=True)
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms'])
-pfullmem = pmem
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple('pmmap_grouped',
-                           ['path', 'rss', 'anonymous', 'locked'])
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """Report virtual memory metrics."""
-    # we could have done this with kstat, but IMHO this is good enough
-    total = os.sysconf('SC_PHYS_PAGES') * PAGE_SIZE
-    # note: there's no difference on Solaris
-    free = avail = os.sysconf('SC_AVPHYS_PAGES') * PAGE_SIZE
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return svmem(total, avail, percent, used, free)
-
-
-def swap_memory():
-    """Report swap memory metrics."""
-    sin, sout = cext.swap_mem()
-    # XXX
-    # we are supposed to get total/free by doing so:
-    # http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/
-    #     usr/src/cmd/swap/swap.c
-    # ...nevertheless I can't manage to obtain the same numbers as 'swap'
-    # cmdline utility, so let's parse its output (sigh!)
-    p = subprocess.Popen(['/usr/bin/env', 'PATH=/usr/sbin:/sbin:%s' %
-                          os.environ['PATH'], 'swap', '-l'],
-                         stdout=subprocess.PIPE)
-    stdout, stderr = p.communicate()
-    if PY3:
-        stdout = stdout.decode(sys.stdout.encoding)
-    if p.returncode != 0:
-        raise RuntimeError("'swap -l' failed (retcode=%s)" % p.returncode)
-
-    lines = stdout.strip().split('\n')[1:]
-    if not lines:
-        raise RuntimeError('no swap device(s) configured')
-    total = free = 0
-    for line in lines:
-        line = line.split()
-        t, f = line[-2:]
-        total += int(int(t) * 512)
-        free += int(int(f) * 512)
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent,
-                         sin * PAGE_SIZE, sout * PAGE_SIZE)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system-wide CPU times as a named tuple"""
-    ret = cext.per_cpu_times()
-    return scputimes(*[sum(x) for x in zip(*ret)])
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples"""
-    ret = cext.per_cpu_times()
-    return [scputimes(*x) for x in ret]
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # mimic os.cpu_count() behavior
-        return None
-
-
-def cpu_count_physical():
-    """Return the number of physical CPUs in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    ctx_switches, interrupts, syscalls, traps = cext.cpu_stats()
-    soft_interrupts = 0
-    return _common.scpustats(ctx_switches, interrupts, soft_interrupts,
-                             syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-disk_usage = _psposix.disk_usage
-
-
-def disk_partitions(all=False):
-    """Return system disk partitions."""
-    # TODO - the filtering logic should be better checked so that
-    # it tries to reflect 'df' as much as possible
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            # Differently from, say, Linux, we don't have a list of
-            # common fs types so the best we can do, AFAIK, is to
-            # filter by filesystem having a total size > 0.
-            try:
-                if not disk_usage(mountpoint).total:
-                    continue
-            except OSError as err:
-                # https://github.com/giampaolo/psutil/issues/1674
-                debug("skipping %r: %r" % (mountpoint, err))
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    Only INET sockets are returned (UNIX are not).
-    """
-    cmap = _common.conn_tmap.copy()
-    if _pid == -1:
-        cmap.pop('unix', 0)
-    if kind not in cmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in cmap])))
-    families, types = _common.conn_tmap[kind]
-    rawlist = cext.net_connections(_pid)
-    ret = set()
-    for item in rawlist:
-        fd, fam, type_, laddr, raddr, status, pid = item
-        if fam not in families:
-            continue
-        if type_ not in types:
-            continue
-        # TODO: refactor and use _common.conn_to_ntuple.
-        if fam in (AF_INET, AF_INET6):
-            if laddr:
-                laddr = _common.addr(*laddr)
-            if raddr:
-                raddr = _common.addr(*raddr)
-        status = TCP_STATUSES[status]
-        fam = sockfam_to_enum(fam)
-        type_ = socktype_to_enum(type_)
-        if _pid == -1:
-            nt = _common.sconn(fd, fam, type_, laddr, raddr, status, pid)
-        else:
-            nt = _common.pconn(fd, fam, type_, laddr, raddr, status)
-        ret.add(nt)
-    return list(ret)
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    ret = cext.net_if_stats()
-    for name, items in ret.items():
-        isup, duplex, speed, mtu = items
-        if hasattr(_common, 'NicDuplex'):
-            duplex = _common.NicDuplex(duplex)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    localhost = (':0.0', ':0')
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in localhost:
-            hostname = 'localhost'
-        nt = _common.suser(user, tty, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(b(get_procfs_path())) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix pid."""
-    return _psposix.pid_exists(pid)
-
-
-def wrap_exceptions(fun):
-    """Call callable into a try/except clause and translate ENOENT,
-    EACCES and EPERM in NoSuchProcess or AccessDenied exceptions.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except (FileNotFoundError, ProcessLookupError):
-            # ENOENT (no such file or directory) gets raised on open().
-            # ESRCH (no such process) can get raised on read() if
-            # process is gone in meantime.
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except OSError:
-            if self.pid == 0:
-                if 0 in pids():
-                    raise AccessDenied(self.pid, self._name)
-                else:
-                    raise
-            raise
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-    def oneshot_enter(self):
-        self._proc_name_and_args.cache_activate(self)
-        self._proc_basic_info.cache_activate(self)
-        self._proc_cred.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_name_and_args.cache_deactivate(self)
-        self._proc_basic_info.cache_deactivate(self)
-        self._proc_cred.cache_deactivate(self)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_name_and_args(self):
-        return cext.proc_name_and_args(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_basic_info(self):
-        if self.pid == 0 and not \
-                os.path.exists('%s/%s/psinfo' % (self._procfs_path, self.pid)):
-            raise AccessDenied(self.pid)
-        ret = cext.proc_basic_info(self.pid, self._procfs_path)
-        assert len(ret) == len(proc_info_map)
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_cred(self):
-        return cext.proc_cred(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def name(self):
-        # note: max len == 15
-        return self._proc_name_and_args()[0]
-
-    @wrap_exceptions
-    def exe(self):
-        try:
-            return os.readlink(
-                "%s/%s/path/a.out" % (self._procfs_path, self.pid))
-        except OSError:
-            pass    # continue and guess the exe name from the cmdline
-        # Will be guessed later from cmdline but we want to explicitly
-        # invoke cmdline here in order to get an AccessDenied
-        # exception if the user has not enough privileges.
-        self.cmdline()
-        return ""
-
-    @wrap_exceptions
-    def cmdline(self):
-        return self._proc_name_and_args()[1].split(' ')
-
-    @wrap_exceptions
-    def environ(self):
-        return cext.proc_environ(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._proc_basic_info()[proc_info_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_basic_info()[proc_info_map['num_threads']]
-
-    @wrap_exceptions
-    def nice_get(self):
-        # Note #1: getpriority(3) doesn't work for realtime processes.
-        # Psinfo is what ps uses, see:
-        # https://github.com/giampaolo/psutil/issues/1194
-        return self._proc_basic_info()[proc_info_map['nice']]
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        if self.pid in (2, 3):
-            # Special case PIDs: internally setpriority(3) return ESRCH
-            # (no such process), no matter what.
-            # The process actually exists though, as it has a name,
-            # creation time, etc.
-            raise AccessDenied(self.pid, self._name)
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._proc_basic_info()[proc_info_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        try:
-            real, effective, saved, _, _, _ = self._proc_cred()
-        except AccessDenied:
-            real = self._proc_basic_info()[proc_info_map['uid']]
-            effective = self._proc_basic_info()[proc_info_map['euid']]
-            saved = None
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def gids(self):
-        try:
-            _, _, _, real, effective, saved = self._proc_cred()
-        except AccessDenied:
-            real = self._proc_basic_info()[proc_info_map['gid']]
-            effective = self._proc_basic_info()[proc_info_map['egid']]
-            saved = None
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def cpu_times(self):
-        try:
-            times = cext.proc_cpu_times(self.pid, self._procfs_path)
-        except OSError as err:
-            if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                # We may get here if we attempt to query a 64bit process
-                # with a 32bit python.
-                # Error originates from read() and also tools like "cat"
-                # fail in the same way (!).
-                # Since there simply is no way to determine CPU times we
-                # return 0.0 as a fallback. See:
-                # https://github.com/giampaolo/psutil/issues/857
-                times = (0.0, 0.0, 0.0, 0.0)
-            else:
-                raise
-        return _common.pcputimes(*times)
-
-    @wrap_exceptions
-    def cpu_num(self):
-        return cext.proc_cpu_num(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def terminal(self):
-        procfs_path = self._procfs_path
-        hit_enoent = False
-        tty = wrap_exceptions(
-            self._proc_basic_info()[proc_info_map['ttynr']])
-        if tty != cext.PRNODEV:
-            for x in (0, 1, 2, 255):
-                try:
-                    return os.readlink(
-                        '%s/%d/path/%d' % (procfs_path, self.pid, x))
-                except FileNotFoundError:
-                    hit_enoent = True
-                    continue
-        if hit_enoent:
-            self._assert_alive()
-
-    @wrap_exceptions
-    def cwd(self):
-        # /proc/PID/path/cwd may not be resolved by readlink() even if
-        # it exists (ls shows it). If that's the case and the process
-        # is still alive return None (we can return None also on BSD).
-        # Reference: http://goo.gl/55XgO
-        procfs_path = self._procfs_path
-        try:
-            return os.readlink("%s/%s/path/cwd" % (procfs_path, self.pid))
-        except FileNotFoundError:
-            os.stat("%s/%s" % (procfs_path, self.pid))  # raise NSP or AD
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        ret = self._proc_basic_info()
-        rss = ret[proc_info_map['rss']] * 1024
-        vms = ret[proc_info_map['vms']] * 1024
-        return pmem(rss, vms)
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def status(self):
-        code = self._proc_basic_info()[proc_info_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def threads(self):
-        procfs_path = self._procfs_path
-        ret = []
-        tids = os.listdir('%s/%d/lwp' % (procfs_path, self.pid))
-        hit_enoent = False
-        for tid in tids:
-            tid = int(tid)
-            try:
-                utime, stime = cext.query_process_thread(
-                    self.pid, tid, procfs_path)
-            except EnvironmentError as err:
-                if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                    # We may get here if we attempt to query a 64bit process
-                    # with a 32bit python.
-                    # Error originates from read() and also tools like "cat"
-                    # fail in the same way (!).
-                    # Since there simply is no way to determine CPU times we
-                    # return 0.0 as a fallback. See:
-                    # https://github.com/giampaolo/psutil/issues/857
-                    continue
-                # ENOENT == thread gone in meantime
-                if err.errno == errno.ENOENT:
-                    hit_enoent = True
-                    continue
-                raise
-            else:
-                nt = _common.pthread(tid, utime, stime)
-                ret.append(nt)
-        if hit_enoent:
-            self._assert_alive()
-        return ret
-
-    @wrap_exceptions
-    def open_files(self):
-        retlist = []
-        hit_enoent = False
-        procfs_path = self._procfs_path
-        pathdir = '%s/%d/path' % (procfs_path, self.pid)
-        for fd in os.listdir('%s/%d/fd' % (procfs_path, self.pid)):
-            path = os.path.join(pathdir, fd)
-            if os.path.islink(path):
-                try:
-                    file = os.readlink(path)
-                except FileNotFoundError:
-                    hit_enoent = True
-                    continue
-                else:
-                    if isfile_strict(file):
-                        retlist.append(_common.popenfile(file, int(fd)))
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    def _get_unix_sockets(self, pid):
-        """Get UNIX sockets used by process by parsing 'pfiles' output."""
-        # TODO: rewrite this in C (...but the damn netstat source code
-        # does not include this part! Argh!!)
-        cmd = "pfiles %s" % pid
-        p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if p.returncode != 0:
-            if 'permission denied' in stderr.lower():
-                raise AccessDenied(self.pid, self._name)
-            if 'no such process' in stderr.lower():
-                raise NoSuchProcess(self.pid, self._name)
-            raise RuntimeError("%r command error\n%s" % (cmd, stderr))
-
-        lines = stdout.split('\n')[2:]
-        for i, line in enumerate(lines):
-            line = line.lstrip()
-            if line.startswith('sockname: AF_UNIX'):
-                path = line.split(' ', 2)[2]
-                type = lines[i - 2].strip()
-                if type == 'SOCK_STREAM':
-                    type = socket.SOCK_STREAM
-                elif type == 'SOCK_DGRAM':
-                    type = socket.SOCK_DGRAM
-                else:
-                    type = -1
-                yield (-1, socket.AF_UNIX, type, path, "", _common.CONN_NONE)
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = net_connections(kind, _pid=self.pid)
-        # The underlying C implementation retrieves all OS connections
-        # and filters them by PID.  At this point we can't tell whether
-        # an empty list means there were no connections for process or
-        # process is no longer active so we force NSP in case the PID
-        # is no longer there.
-        if not ret:
-            # will raise NSP if process is gone
-            os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-        # UNIX sockets
-        if kind in ('all', 'unix'):
-            ret.extend([_common.pconn(*conn) for conn in
-                        self._get_unix_sockets(self.pid)])
-        return ret
-
-    nt_mmap_grouped = namedtuple('mmap', 'path rss anon locked')
-    nt_mmap_ext = namedtuple('mmap', 'addr perms path rss anon locked')
-
-    @wrap_exceptions
-    def memory_maps(self):
-        def toaddr(start, end):
-            return '%s-%s' % (hex(start)[2:].strip('L'),
-                              hex(end)[2:].strip('L'))
-
-        procfs_path = self._procfs_path
-        retlist = []
-        try:
-            rawlist = cext.proc_memory_maps(self.pid, procfs_path)
-        except OSError as err:
-            if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                # We may get here if we attempt to query a 64bit process
-                # with a 32bit python.
-                # Error originates from read() and also tools like "cat"
-                # fail in the same way (!).
-                # Since there simply is no way to determine CPU times we
-                # return 0.0 as a fallback. See:
-                # https://github.com/giampaolo/psutil/issues/857
-                return []
-            else:
-                raise
-        hit_enoent = False
-        for item in rawlist:
-            addr, addrsize, perm, name, rss, anon, locked = item
-            addr = toaddr(addr, addrsize)
-            if not name.startswith('['):
-                try:
-                    name = os.readlink(
-                        '%s/%s/path/%s' % (procfs_path, self.pid, name))
-                except OSError as err:
-                    if err.errno == errno.ENOENT:
-                        # sometimes the link may not be resolved by
-                        # readlink() even if it exists (ls shows it).
-                        # If that's the case we just return the
-                        # unresolved link path.
-                        # This seems an incosistency with /proc similar
-                        # to: http://goo.gl/55XgO
-                        name = '%s/%s/path/%s' % (procfs_path, self.pid, name)
-                        hit_enoent = True
-                    else:
-                        raise
-            retlist.append((addr, perm, name, rss, anon, locked))
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def num_fds(self):
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        return _common.pctxsw(
-            *cext.proc_num_ctx_switches(self.pid, self._procfs_path))
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_aix.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_aix.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_aix.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_aix.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1136 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'
- * Copyright (c) 2017, Arnon Yaari
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/*
- * AIX support is experimental at this time.
- * The following functions and methods are unsupported on the AIX platform:
- * - psutil.Process.memory_maps
- *
- * Known limitations:
- * - psutil.Process.io_counters read count is always 0
- * - psutil.Process.io_counters may not be available on older AIX versions
- * - psutil.Process.threads may not be available on older AIX versions
- * - psutil.net_io_counters may not be available on older AIX versions
- * - reading basic process info may fail or return incorrect values when
- *   process is starting (see IBM APAR IV58499 - fixed in newer AIX versions)
- * - sockets and pipes may not be counted in num_fds (fixed in newer AIX
- *    versions)
- *
- * Useful resources:
- * - proc filesystem: http://www-01.ibm.com/support/knowledgecenter/
- *       ssw_aix_72/com.ibm.aix.files/proc.htm
- * - libperfstat: http://www-01.ibm.com/support/knowledgecenter/
- *       ssw_aix_72/com.ibm.aix.files/libperfstat.h.htm
- */
-
-#include <Python.h>
-#include <sys/limits.h>
-#include <sys/proc.h>
-#include <sys/procfs.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/sysinfo.h>
-#include <sys/thread.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <utmp.h>
-#include <utmpx.h>
-#include <mntent.h>
-#include <sys/ioctl.h>
-#include <sys/tihdr.h>
-#include <stropts.h>
-#include <netinet/tcp_fsm.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <libperfstat.h>
-#include <unistd.h>
-
-#include "_psutil_common.h"
-#include "_psutil_posix.h"
-#include "arch/aix/ifaddrs.h"
-#include "arch/aix/net_connections.h"
-#include "arch/aix/common.h"
-
-
-#define TV2DOUBLE(t)   (((t).tv_nsec * 0.000000001) + (t).tv_sec)
-
-/*
- * Read a file content and fills a C structure with it.
- */
-int
-psutil_file_to_struct(char *path, void *fstruct, size_t size) {
-    int fd;
-    size_t nbytes;
-    fd = open(path, O_RDONLY);
-    if (fd == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
-        return 0;
-    }
-    nbytes = read(fd, fstruct, size);
-    if (nbytes <= 0) {
-        close(fd);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return 0;
-    }
-    if (nbytes != size) {
-        close(fd);
-        PyErr_SetString(PyExc_RuntimeError, "structure size mismatch");
-        return 0;
-    }
-    close(fd);
-    return nbytes;
-}
-
-
-/*
- * Return process ppid, rss, vms, ctime, nice, nthreads, status and tty
- * as a Python tuple.
- */
-static PyObject *
-psutil_proc_basic_info(PyObject *self, PyObject *args) {
-    int pid;
-    char path[100];
-    psinfo_t info;
-    pstatus_t status;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-
-    sprintf(path, "%s/%i/psinfo", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-
-    if (info.pr_nlwp == 0 && info.pr_lwp.pr_lwpid == 0) {
-        // From the /proc docs: "If the process is a zombie, the pr_nlwp
-        // and pr_lwp.pr_lwpid flags are zero."
-        status.pr_stat = SZOMB;
-    } else if (info.pr_flag & SEXIT) {
-        // "exiting" processes don't have /proc/<pid>/status
-        // There are other "exiting" processes that 'ps' shows as "active"
-        status.pr_stat = SACTIVE;
-    } else {
-        sprintf(path, "%s/%i/status", procfs_path, pid);
-        if (! psutil_file_to_struct(path, (void *)&status, sizeof(status)))
-            return NULL;
-    }
-
-    return Py_BuildValue("KKKdiiiK",
-        (unsigned long long) info.pr_ppid,      // parent pid
-        (unsigned long long) info.pr_rssize,    // rss
-        (unsigned long long) info.pr_size,      // vms
-        TV2DOUBLE(info.pr_start),               // create time
-        (int) info.pr_lwp.pr_nice,              // nice
-        (int) info.pr_nlwp,                     // no. of threads
-        (int) status.pr_stat,                   // status code
-        (unsigned long long)info.pr_ttydev      // tty nr
-        );
-}
-
-
-/*
- * Return process name as a Python string.
- */
-static PyObject *
-psutil_proc_name(PyObject *self, PyObject *args) {
-    int pid;
-    char path[100];
-    psinfo_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/psinfo", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-
-    return PyUnicode_DecodeFSDefaultAndSize(info.pr_fname, PRFNSZ);
-}
-
-
-/*
- * Return process command line arguments as a Python list
- */
-static PyObject *
-psutil_proc_args(PyObject *self, PyObject *args) {
-    int pid;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_arg = NULL;
-    struct procsinfo procbuf;
-    long arg_max;
-    char *argbuf = NULL;
-    char *curarg = NULL;
-    int ret;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (!PyArg_ParseTuple(args, "i", &pid))
-        goto error;
-    arg_max = sysconf(_SC_ARG_MAX);
-    argbuf = malloc(arg_max);
-    if (argbuf == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    procbuf.pi_pid = pid;
-    ret = getargs(&procbuf, sizeof(procbuf), argbuf, ARG_MAX);
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    curarg = argbuf;
-    /* getargs will always append an extra NULL to end the arg list,
-     * even if the buffer is not big enough (even though it is supposed
-     * to be) so the following 'while' is safe */
-    while (*curarg != '\0') {
-        py_arg = PyUnicode_DecodeFSDefault(curarg);
-        if (!py_arg)
-            goto error;
-        if (PyList_Append(py_retlist, py_arg))
-            goto error;
-        Py_DECREF(py_arg);
-        curarg = strchr(curarg, '\0') + 1;
-    }
-
-    free(argbuf);
-
-    return py_retlist;
-
-error:
-    if (argbuf != NULL)
-        free(argbuf);
-    Py_XDECREF(py_retlist);
-    Py_XDECREF(py_arg);
-    return NULL;
-}
-
-
-/*
- * Return process environment variables as a Python dict
- */
-static PyObject *
-psutil_proc_environ(PyObject *self, PyObject *args) {
-    int pid;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_key = NULL;
-    PyObject *py_val = NULL;
-    struct procsinfo procbuf;
-    long env_max;
-    char *envbuf = NULL;
-    char *curvar = NULL;
-    char *separator = NULL;
-    int ret;
-
-    if (py_retdict == NULL)
-        return NULL;
-    if (!PyArg_ParseTuple(args, "i", &pid))
-        goto error;
-    env_max = sysconf(_SC_ARG_MAX);
-    envbuf = malloc(env_max);
-    if (envbuf == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    procbuf.pi_pid = pid;
-    ret = getevars(&procbuf, sizeof(procbuf), envbuf, ARG_MAX);
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    curvar = envbuf;
-    /* getevars will always append an extra NULL to end the arg list,
-     * even if the buffer is not big enough (even though it is supposed
-     * to be) so the following 'while' is safe */
-    while (*curvar != '\0') {
-        separator = strchr(curvar, '=');
-        if (separator != NULL) {
-            py_key = PyUnicode_DecodeFSDefaultAndSize(
-                curvar,
-                (Py_ssize_t)(separator - curvar)
-            );
-            if (!py_key)
-                goto error;
-            py_val = PyUnicode_DecodeFSDefault(separator + 1);
-            if (!py_val)
-                goto error;
-            if (PyDict_SetItem(py_retdict, py_key, py_val))
-                goto error;
-            Py_CLEAR(py_key);
-            Py_CLEAR(py_val);
-        }
-        curvar = strchr(curvar, '\0') + 1;
-    }
-
-    free(envbuf);
-
-    return py_retdict;
-
-error:
-    if (envbuf != NULL)
-        free(envbuf);
-    Py_XDECREF(py_retdict);
-    Py_XDECREF(py_key);
-    Py_XDECREF(py_val);
-    return NULL;
-}
-
-
-#ifdef CURR_VERSION_THREAD
-
-/*
- * Retrieves all threads used by process returning a list of tuples
- * including thread id, user time and system time.
- */
-static PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    long pid;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    perfstat_thread_t *threadt = NULL;
-    perfstat_id_t id;
-    int i, rc, thread_count;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        goto error;
-
-    /* Get the count of threads */
-    thread_count = perfstat_thread(NULL, NULL, sizeof(perfstat_thread_t), 0);
-    if (thread_count <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    /* Allocate enough memory */
-    threadt = (perfstat_thread_t *)calloc(thread_count,
-        sizeof(perfstat_thread_t));
-    if (threadt == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    strcpy(id.name, "");
-    rc = perfstat_thread(&id, threadt, sizeof(perfstat_thread_t),
-        thread_count);
-    if (rc <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < thread_count; i++) {
-        if (threadt[i].pid != pid)
-            continue;
-
-        py_tuple = Py_BuildValue("Idd",
-                                 threadt[i].tid,
-                                 threadt[i].ucpu_time,
-                                 threadt[i].scpu_time);
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_DECREF(py_tuple);
-    }
-    free(threadt);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (threadt != NULL)
-        free(threadt);
-    return NULL;
-}
-
-#endif
-
-
-#ifdef CURR_VERSION_PROCESS
-
-static PyObject *
-psutil_proc_io_counters(PyObject *self, PyObject *args) {
-    long pid;
-    int rc;
-    perfstat_process_t procinfo;
-    perfstat_id_t id;
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        return NULL;
-
-    snprintf(id.name, sizeof(id.name), "%ld", pid);
-    rc = perfstat_process(&id, &procinfo, sizeof(perfstat_process_t), 1);
-    if (rc <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue("(KKKK)",
-                         procinfo.inOps,      // XXX always 0
-                         procinfo.outOps,
-                         procinfo.inBytes,    // XXX always 0
-                         procinfo.outBytes);
-}
-
-#endif
-
-
-/*
- * Return process user and system CPU times as a Python tuple.
- */
-static PyObject *
-psutil_proc_cpu_times(PyObject *self, PyObject *args) {
-    int pid;
-    char path[100];
-    pstatus_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/status", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    // results are more precise than os.times()
-    return Py_BuildValue("dddd",
-                         TV2DOUBLE(info.pr_utime),
-                         TV2DOUBLE(info.pr_stime),
-                         TV2DOUBLE(info.pr_cutime),
-                         TV2DOUBLE(info.pr_cstime));
-}
-
-
-/*
- * Return process uids/gids as a Python tuple.
- */
-static PyObject *
-psutil_proc_cred(PyObject *self, PyObject *args) {
-    int pid;
-    char path[100];
-    prcred_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/cred", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    return Py_BuildValue("iiiiii",
-                         info.pr_ruid, info.pr_euid, info.pr_suid,
-                         info.pr_rgid, info.pr_egid, info.pr_sgid);
-}
-
-
-/*
- * Return process voluntary and involuntary context switches as a Python tuple.
- */
-static PyObject *
-psutil_proc_num_ctx_switches(PyObject *self, PyObject *args) {
-    PyObject *py_tuple = NULL;
-    pid32_t requested_pid;
-    pid32_t pid = 0;
-    int np = 0;
-    struct procentry64 *processes = (struct procentry64 *)NULL;
-    struct procentry64 *p;
-
-    if (! PyArg_ParseTuple(args, "i", &requested_pid))
-        return NULL;
-
-    processes = psutil_read_process_table(&np);
-    if (!processes)
-        return NULL;
-
-    /* Loop through processes */
-    for (p = processes; np > 0; np--, p++) {
-        pid = p->pi_pid;
-        if (requested_pid != pid)
-            continue;
-        py_tuple = Py_BuildValue("LL",
-            (long long) p->pi_ru.ru_nvcsw,    /* voluntary context switches */
-            (long long) p->pi_ru.ru_nivcsw);  /* involuntary */
-        free(processes);
-        return py_tuple;
-    }
-
-    /* finished iteration without finding requested pid */
-    free(processes);
-    return NoSuchProcess("psutil_read_process_table (no PID found)");
-}
-
-
-/*
- * Return users currently connected on the system.
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    struct utmpx *ut;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_username = NULL;
-    PyObject *py_tty = NULL;
-    PyObject *py_hostname = NULL;
-    PyObject *py_user_proc = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    setutxent();
-    while (NULL != (ut = getutxent())) {
-        if (ut->ut_type == USER_PROCESS)
-            py_user_proc = Py_True;
-        else
-            py_user_proc = Py_False;
-        py_username = PyUnicode_DecodeFSDefault(ut->ut_user);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(ut->ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(ut->ut_host);
-        if (! py_hostname)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOOfOi)",
-            py_username,              // username
-            py_tty,                   // tty
-            py_hostname,              // hostname
-            (float)ut->ut_tv.tv_sec,  // tstamp
-            py_user_proc,             // (bool) user process
-            ut->ut_pid                // process id
-        );
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-    }
-    endutxent();
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tty);
-    Py_XDECREF(py_hostname);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (ut != NULL)
-        endutxent();
-    return NULL;
-}
-
-
-/*
- * Return disk mounted partitions as a list of tuples including device,
- * mount point and filesystem type.
- */
-static PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    FILE *file = NULL;
-    struct mntent * mt = NULL;
-    PyObject *py_dev = NULL;
-    PyObject *py_mountp = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    file = setmntent(MNTTAB, "rb");
-    if (file == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    mt = getmntent(file);
-    while (mt != NULL) {
-        py_dev = PyUnicode_DecodeFSDefault(mt->mnt_fsname);
-        if (! py_dev)
-            goto error;
-        py_mountp = PyUnicode_DecodeFSDefault(mt->mnt_dir);
-        if (! py_mountp)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOss)",
-            py_dev,         // device
-            py_mountp,      // mount point
-            mt->mnt_type,   // fs type
-            mt->mnt_opts);  // options
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_dev);
-        Py_CLEAR(py_mountp);
-        Py_CLEAR(py_tuple);
-        mt = getmntent(file);
-    }
-    endmntent(file);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_dev);
-    Py_XDECREF(py_mountp);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (file != NULL)
-        endmntent(file);
-    return NULL;
-}
-
-
-#if defined(CURR_VERSION_NETINTERFACE) && CURR_VERSION_NETINTERFACE >= 3
-
-/*
- * Return a list of tuples for network I/O statistics.
- */
-static PyObject *
-psutil_net_io_counters(PyObject *self, PyObject *args) {
-    perfstat_netinterface_t *statp = NULL;
-    int tot, i;
-    perfstat_id_t first;
-
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_ifc_info = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-
-    /* check how many perfstat_netinterface_t structures are available */
-    tot = perfstat_netinterface(
-        NULL, NULL, sizeof(perfstat_netinterface_t), 0);
-    if (tot == 0) {
-        // no network interfaces - return empty dict
-        return py_retdict;
-    }
-    if (tot < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    statp = (perfstat_netinterface_t *)
-        malloc(tot * sizeof(perfstat_netinterface_t));
-    if (statp == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    strcpy(first.name, FIRST_NETINTERFACE);
-    tot = perfstat_netinterface(&first, statp,
-        sizeof(perfstat_netinterface_t), tot);
-    if (tot < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < tot; i++) {
-        py_ifc_info = Py_BuildValue("(KKKKKKKK)",
-            statp[i].obytes,      /* number of bytes sent on interface */
-            statp[i].ibytes,      /* number of bytes received on interface */
-            statp[i].opackets,    /* number of packets sent on interface */
-            statp[i].ipackets,    /* number of packets received on interface */
-            statp[i].ierrors,     /* number of input errors on interface */
-            statp[i].oerrors,     /* number of output errors on interface */
-            statp[i].if_iqdrops,  /* Dropped on input, this interface */
-            statp[i].xmitdrops    /* number of packets not transmitted */
-           );
-        if (!py_ifc_info)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, statp[i].name, py_ifc_info))
-            goto error;
-        Py_DECREF(py_ifc_info);
-    }
-
-    free(statp);
-    return py_retdict;
-
-error:
-    if (statp != NULL)
-        free(statp);
-    Py_XDECREF(py_ifc_info);
-    Py_DECREF(py_retdict);
-    return NULL;
-}
-
-#endif
-
-
-static PyObject*
-psutil_net_if_stats(PyObject* self, PyObject* args) {
-    char *nic_name;
-    int sock = 0;
-    int ret;
-    int mtu;
-    struct ifreq ifr;
-    PyObject *py_is_up = NULL;
-    PyObject *py_retlist = NULL;
-
-    if (! PyArg_ParseTuple(args, "s", &nic_name))
-        return NULL;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1)
-        goto error;
-
-    strncpy(ifr.ifr_name, nic_name, sizeof(ifr.ifr_name));
-
-    // is up?
-    ret = ioctl(sock, SIOCGIFFLAGS, &ifr);
-    if (ret == -1)
-        goto error;
-    if ((ifr.ifr_flags & IFF_UP) != 0)
-        py_is_up = Py_True;
-    else
-        py_is_up = Py_False;
-    Py_INCREF(py_is_up);
-
-    // MTU
-    ret = ioctl(sock, SIOCGIFMTU, &ifr);
-    if (ret == -1)
-        goto error;
-    mtu = ifr.ifr_mtu;
-
-    close(sock);
-    py_retlist = Py_BuildValue("[Oi]", py_is_up, mtu);
-    if (!py_retlist)
-        goto error;
-    Py_DECREF(py_is_up);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_is_up);
-    if (sock != 0)
-        close(sock);
-    PyErr_SetFromErrno(PyExc_OSError);
-    return NULL;
-}
-
-
-static PyObject *
-psutil_boot_time(PyObject *self, PyObject *args) {
-    float boot_time = 0.0;
-    struct utmpx *ut;
-
-    setutxent();
-    while (NULL != (ut = getutxent())) {
-        if (ut->ut_type == BOOT_TIME) {
-            boot_time = (float)ut->ut_tv.tv_sec;
-            break;
-        }
-    }
-    endutxent();
-    if (boot_time == 0.0) {
-        /* could not find BOOT_TIME in getutxent loop */
-        PyErr_SetString(PyExc_RuntimeError, "can't determine boot time");
-        return NULL;
-    }
-    return Py_BuildValue("f", boot_time);
-}
-
-
-/*
- * Return a Python list of tuple representing per-cpu times
- */
-static PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    int ncpu, rc, i;
-    long ticks;
-    perfstat_cpu_t *cpu = NULL;
-    perfstat_id_t id;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_cputime = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    /* get the number of ticks per second */
-    ticks = sysconf(_SC_CLK_TCK);
-    if (ticks < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    /* get the number of cpus in ncpu */
-    ncpu = perfstat_cpu(NULL, NULL, sizeof(perfstat_cpu_t), 0);
-    if (ncpu <= 0){
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    /* allocate enough memory to hold the ncpu structures */
-    cpu = (perfstat_cpu_t *) malloc(ncpu * sizeof(perfstat_cpu_t));
-    if (cpu == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    strcpy(id.name, "");
-    rc = perfstat_cpu(&id, cpu, sizeof(perfstat_cpu_t), ncpu);
-
-    if (rc <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < ncpu; i++) {
-        py_cputime = Py_BuildValue(
-            "(dddd)",
-            (double)cpu[i].user / ticks,
-            (double)cpu[i].sys / ticks,
-            (double)cpu[i].idle / ticks,
-            (double)cpu[i].wait / ticks);
-        if (!py_cputime)
-            goto error;
-        if (PyList_Append(py_retlist, py_cputime))
-            goto error;
-        Py_DECREF(py_cputime);
-    }
-    free(cpu);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    if (cpu != NULL)
-        free(cpu);
-    return NULL;
-}
-
-
-/*
- * Return disk IO statistics.
- */
-static PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_disk_info = NULL;
-    perfstat_disk_t *diskt = NULL;
-    perfstat_id_t id;
-    int i, rc, disk_count;
-
-    if (py_retdict == NULL)
-        return NULL;
-
-    /* Get the count of disks */
-    disk_count = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0);
-    if (disk_count <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    /* Allocate enough memory */
-    diskt = (perfstat_disk_t *)calloc(disk_count,
-        sizeof(perfstat_disk_t));
-    if (diskt == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    strcpy(id.name, FIRST_DISK);
-    rc = perfstat_disk(&id, diskt, sizeof(perfstat_disk_t),
-        disk_count);
-    if (rc <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < disk_count; i++) {
-        py_disk_info = Py_BuildValue(
-            "KKKKKK",
-            diskt[i].__rxfers,
-            diskt[i].xfers - diskt[i].__rxfers,
-            diskt[i].rblks * diskt[i].bsize,
-            diskt[i].wblks * diskt[i].bsize,
-            diskt[i].rserv / 1000 / 1000,  // from nano to milli secs
-            diskt[i].wserv / 1000 / 1000   // from nano to milli secs
-        );
-        if (py_disk_info == NULL)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, diskt[i].name,
-                                 py_disk_info))
-            goto error;
-        Py_DECREF(py_disk_info);
-    }
-    free(diskt);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    if (diskt != NULL)
-        free(diskt);
-    return NULL;
-}
-
-
-/*
- * Return virtual memory usage statistics.
- */
-static PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    int rc;
-    int pagesize = getpagesize();
-    perfstat_memory_total_t memory;
-
-    rc = perfstat_memory_total(
-        NULL, &memory, sizeof(perfstat_memory_total_t), 1);
-    if (rc <= 0){
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue("KKKKK",
-        (unsigned long long) memory.real_total * pagesize,
-        (unsigned long long) memory.real_avail * pagesize,
-        (unsigned long long) memory.real_free * pagesize,
-        (unsigned long long) memory.real_pinned * pagesize,
-        (unsigned long long) memory.real_inuse * pagesize
-    );
-}
-
-
-/*
- * Return stats about swap memory.
- */
-static PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-    int rc;
-    int pagesize = getpagesize();
-    perfstat_memory_total_t memory;
-
-    rc = perfstat_memory_total(
-        NULL, &memory, sizeof(perfstat_memory_total_t), 1);
-    if (rc <= 0){
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    return Py_BuildValue("KKKK",
-        (unsigned long long) memory.pgsp_total * pagesize,
-        (unsigned long long) memory.pgsp_free * pagesize,
-        (unsigned long long) memory.pgins * pagesize,
-        (unsigned long long) memory.pgouts * pagesize
-    );
-}
-
-
-/*
- * Return CPU statistics.
- */
-static PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    int ncpu, rc, i;
-    // perfstat_cpu_total_t doesn't have invol/vol cswitch, only pswitch
-    // which is apparently something else. We have to sum over all cpus
-    perfstat_cpu_t *cpu = NULL;
-    perfstat_id_t id;
-    u_longlong_t cswitches = 0;
-    u_longlong_t devintrs = 0;
-    u_longlong_t softintrs = 0;
-    u_longlong_t syscall = 0;
-
-    /* get the number of cpus in ncpu */
-    ncpu = perfstat_cpu(NULL, NULL, sizeof(perfstat_cpu_t), 0);
-    if (ncpu <= 0){
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    /* allocate enough memory to hold the ncpu structures */
-    cpu = (perfstat_cpu_t *) malloc(ncpu * sizeof(perfstat_cpu_t));
-    if (cpu == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    strcpy(id.name, "");
-    rc = perfstat_cpu(&id, cpu, sizeof(perfstat_cpu_t), ncpu);
-
-    if (rc <= 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < ncpu; i++) {
-        cswitches += cpu[i].invol_cswitch + cpu[i].vol_cswitch;
-        devintrs += cpu[i].devintrs;
-        softintrs += cpu[i].softintrs;
-        syscall += cpu[i].syscall;
-    }
-
-    free(cpu);
-
-    return Py_BuildValue(
-        "KKKK",
-        cswitches,
-        devintrs,
-        softintrs,
-        syscall
-    );
-
-error:
-    if (cpu != NULL)
-        free(cpu);
-    return NULL;
-}
-
-
-/*
- * define the psutil C module methods and initialize the module.
- */
-static PyMethodDef
-PsutilMethods[] =
-{
-    // --- process-related functions
-    {"proc_basic_info", psutil_proc_basic_info, METH_VARARGS,
-     "Return process ppid, rss, vms, ctime, nice, nthreads, status and tty"},
-    {"proc_name", psutil_proc_name, METH_VARARGS,
-     "Return process name."},
-    {"proc_args", psutil_proc_args, METH_VARARGS,
-     "Return process command line arguments."},
-    {"proc_environ", psutil_proc_environ, METH_VARARGS,
-     "Return process environment variables."},
-    {"proc_cpu_times", psutil_proc_cpu_times, METH_VARARGS,
-     "Return process user and system CPU times."},
-    {"proc_cred", psutil_proc_cred, METH_VARARGS,
-     "Return process uids/gids."},
-#ifdef CURR_VERSION_THREAD
-    {"proc_threads", psutil_proc_threads, METH_VARARGS,
-     "Return process threads"},
-#endif
-#ifdef CURR_VERSION_PROCESS
-    {"proc_io_counters", psutil_proc_io_counters, METH_VARARGS,
-     "Get process I/O counters."},
-#endif
-    {"proc_num_ctx_switches", psutil_proc_num_ctx_switches, METH_VARARGS,
-     "Get process I/O counters."},
-
-    // --- system-related functions
-    {"users", psutil_users, METH_VARARGS,
-     "Return currently connected users."},
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return disk partitions."},
-    {"boot_time", psutil_boot_time, METH_VARARGS,
-     "Return system boot time in seconds since the EPOCH."},
-    {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS,
-     "Return system per-cpu times as a list of tuples"},
-    {"disk_io_counters", psutil_disk_io_counters, METH_VARARGS,
-     "Return a Python dict of tuples for disk I/O statistics."},
-    {"virtual_mem", psutil_virtual_mem, METH_VARARGS,
-     "Return system virtual memory usage statistics"},
-    {"swap_mem", psutil_swap_mem, METH_VARARGS,
-     "Return stats about swap memory, in bytes"},
-#if defined(CURR_VERSION_NETINTERFACE) && CURR_VERSION_NETINTERFACE >= 3
-    {"net_io_counters", psutil_net_io_counters, METH_VARARGS,
-     "Return a Python dict of tuples for network I/O statistics."},
-#endif
-    {"net_connections", psutil_net_connections, METH_VARARGS,
-     "Return system-wide connections"},
-    {"net_if_stats", psutil_net_if_stats, METH_VARARGS,
-     "Return NIC stats (isup, mtu)"},
-    {"cpu_stats", psutil_cpu_stats, METH_VARARGS,
-     "Return CPU statistics"},
-
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-
-struct module_state {
-    PyObject *error;
-};
-
-#if PY_MAJOR_VERSION >= 3
-#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
-#else
-#define GETSTATE(m) (&_state)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-
-static int
-psutil_aix_traverse(PyObject *m, visitproc visit, void *arg) {
-    Py_VISIT(GETSTATE(m)->error);
-    return 0;
-}
-
-static int
-psutil_aix_clear(PyObject *m) {
-    Py_CLEAR(GETSTATE(m)->error);
-    return 0;
-}
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "psutil_aix",
-    NULL,
-    sizeof(struct module_state),
-    PsutilMethods,
-    NULL,
-    psutil_aix_traverse,
-    psutil_aix_clear,
-    NULL
-};
-
-#define INITERROR return NULL
-
-PyMODINIT_FUNC PyInit__psutil_aix(void)
-
-#else
-#define INITERROR return
-
-void init_psutil_aix(void)
-#endif
-{
-#if PY_MAJOR_VERSION >= 3
-    PyObject *module = PyModule_Create(&moduledef);
-#else
-    PyObject *module = Py_InitModule("_psutil_aix", PsutilMethods);
-#endif
-    PyModule_AddIntConstant(module, "version", PSUTIL_VERSION);
-
-    PyModule_AddIntConstant(module, "SIDL", SIDL);
-    PyModule_AddIntConstant(module, "SZOMB", SZOMB);
-    PyModule_AddIntConstant(module, "SACTIVE", SACTIVE);
-    PyModule_AddIntConstant(module, "SSWAP", SSWAP);
-    PyModule_AddIntConstant(module, "SSTOP", SSTOP);
-
-    PyModule_AddIntConstant(module, "TCPS_CLOSED", TCPS_CLOSED);
-    PyModule_AddIntConstant(module, "TCPS_CLOSING", TCPS_CLOSING);
-    PyModule_AddIntConstant(module, "TCPS_CLOSE_WAIT", TCPS_CLOSE_WAIT);
-    PyModule_AddIntConstant(module, "TCPS_LISTEN", TCPS_LISTEN);
-    PyModule_AddIntConstant(module, "TCPS_ESTABLISHED", TCPS_ESTABLISHED);
-    PyModule_AddIntConstant(module, "TCPS_SYN_SENT", TCPS_SYN_SENT);
-    PyModule_AddIntConstant(module, "TCPS_SYN_RCVD", TCPS_SYN_RECEIVED);
-    PyModule_AddIntConstant(module, "TCPS_FIN_WAIT_1", TCPS_FIN_WAIT_1);
-    PyModule_AddIntConstant(module, "TCPS_FIN_WAIT_2", TCPS_FIN_WAIT_2);
-    PyModule_AddIntConstant(module, "TCPS_LAST_ACK", TCPS_LAST_ACK);
-    PyModule_AddIntConstant(module, "TCPS_TIME_WAIT", TCPS_TIME_WAIT);
-    PyModule_AddIntConstant(module, "PSUTIL_CONN_NONE", PSUTIL_CONN_NONE);
-
-    psutil_setup();
-
-    if (module == NULL)
-        INITERROR;
-#if PY_MAJOR_VERSION >= 3
-    return module;
-#endif
-}
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_bsd.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_bsd.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_bsd.c	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_bsd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1102 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola', Landry Breuil (OpenBSD).
- * All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Platform-specific module methods for FreeBSD and OpenBSD.
-
- * OpenBSD references:
- * - OpenBSD source code: https://github.com/openbsd/src
- *
- * OpenBSD / NetBSD: missing APIs compared to FreeBSD implementation:
- * - psutil.net_connections()
- * - psutil.Process.get/set_cpu_affinity()  (not supported natively)
- * - psutil.Process.memory_maps()
- */
-
-#if defined(PSUTIL_NETBSD)
-    #define _KMEMUSER
-#endif
-
-#include <Python.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#if !defined(__NetBSD__)
-    #include <sys/user.h>
-#endif
-#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <net/route.h>
-#include <sys/socketvar.h>    // for struct xsocket
-#include <sys/un.h>
-#include <sys/unpcb.h>
-// for xinpcb struct
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp_var.h>   // for struct xtcpcb
-#include <netinet/tcp_fsm.h>   // for TCP connection states
-#include <arpa/inet.h>         // for inet_ntop()
-#include <sys/mount.h>
-#include <net/if.h>       // net io counters
-#include <net/if_dl.h>
-#include <net/route.h>
-#include <netinet/in.h>   // process open files/connections
-#include <sys/un.h>
-
-#include "_psutil_common.h"
-#include "_psutil_posix.h"
-
-#ifdef PSUTIL_FREEBSD
-    #include "arch/freebsd/specific.h"
-    #include "arch/freebsd/sys_socks.h"
-    #include "arch/freebsd/proc_socks.h"
-
-    #include <net/if_media.h>
-    #include <devstat.h>  // get io counters
-    #include <libutil.h>  // process open files, shared libs (kinfo_getvmmap)
-    #if __FreeBSD_version < 900000
-        #include <utmp.h>  // system users
-    #else
-        #include <utmpx.h>
-    #endif
-#elif PSUTIL_OPENBSD
-    #include "arch/openbsd/specific.h"
-
-    #include <utmp.h>
-    #include <sys/vnode.h>  // for VREG
-    #define _KERNEL  // for DTYPE_VNODE
-    #include <sys/file.h>
-    #undef _KERNEL
-    #include <sys/sched.h>  // for CPUSTATES & CP_*
-#elif PSUTIL_NETBSD
-    #include "arch/netbsd/specific.h"
-    #include "arch/netbsd/socks.h"
-
-    #include <utmpx.h>
-    #include <sys/vnode.h>  // for VREG
-    #include <sys/sched.h>  // for CPUSTATES & CP_*
-    #ifndef DTYPE_VNODE
-        #define DTYPE_VNODE 1
-    #endif
-#endif
-
-
-// convert a timeval struct to a double
-#define PSUTIL_TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
-
-#ifdef PSUTIL_FREEBSD
-    // convert a bintime struct to milliseconds
-    #define PSUTIL_BT2MSEC(bt) (bt.sec * 1000 + (((uint64_t) 1000000000 * \
-                           (uint32_t) (bt.frac >> 32) ) >> 32 ) / 1000000)
-#endif
-
-#if defined(PSUTIL_OPENBSD) || defined (PSUTIL_NETBSD)
-    #define PSUTIL_KPT2DOUBLE(t) (t ## _sec + t ## _usec / 1000000.0)
-#endif
-
-
-/*
- * Return a Python list of all the PIDs running on the system.
- */
-static PyObject *
-psutil_pids(PyObject *self, PyObject *args) {
-    kinfo_proc *proclist = NULL;
-    kinfo_proc *orig_address = NULL;
-    size_t num_processes;
-    size_t idx;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_pid = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (psutil_get_proc_list(&proclist, &num_processes) != 0)
-        goto error;
-
-    if (num_processes > 0) {
-        orig_address = proclist; // save so we can free it after we're done
-        for (idx = 0; idx < num_processes; idx++) {
-#ifdef PSUTIL_FREEBSD
-            py_pid = PyLong_FromPid(proclist->ki_pid);
-#elif defined(PSUTIL_OPENBSD) || defined(PSUTIL_NETBSD)
-            py_pid = PyLong_FromPid(proclist->p_pid);
-#endif
-            if (!py_pid)
-                goto error;
-            if (PyList_Append(py_retlist, py_pid))
-                goto error;
-            Py_CLEAR(py_pid);
-            proclist++;
-        }
-        free(orig_address);
-    }
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_pid);
-    Py_DECREF(py_retlist);
-    if (orig_address != NULL)
-        free(orig_address);
-    return NULL;
-}
-
-
-/*
- * Return a Python float indicating the system boot time expressed in
- * seconds since the epoch.
- */
-static PyObject *
-psutil_boot_time(PyObject *self, PyObject *args) {
-    // fetch sysctl "kern.boottime"
-    static int request[2] = { CTL_KERN, KERN_BOOTTIME };
-    struct timeval boottime;
-    size_t len = sizeof(boottime);
-
-    if (sysctl(request, 2, &boottime, &len, NULL, 0) == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    return Py_BuildValue("d", (double)boottime.tv_sec);
-}
-
-
-/*
- * Collect different info about a process in one shot and return
- * them as a big Python tuple.
- */
-static PyObject *
-psutil_proc_oneshot_info(PyObject *self, PyObject *args) {
-    pid_t pid;
-    long rss;
-    long vms;
-    long memtext;
-    long memdata;
-    long memstack;
-    int oncpu;
-    kinfo_proc kp;
-    long pagesize = sysconf(_SC_PAGESIZE);
-    char str[1000];
-    PyObject *py_name;
-    PyObject *py_ppid;
-    PyObject *py_retlist;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-
-    // Process
-#ifdef PSUTIL_FREEBSD
-    sprintf(str, "%s", kp.ki_comm);
-#elif defined(PSUTIL_OPENBSD) || defined(PSUTIL_NETBSD)
-    sprintf(str, "%s", kp.p_comm);
-#endif
-    py_name = PyUnicode_DecodeFSDefault(str);
-    if (! py_name) {
-        // Likely a decoding error. We don't want to fail the whole
-        // operation. The python module may retry with proc_name().
-        PyErr_Clear();
-        py_name = Py_None;
-    }
-    // Py_INCREF(py_name);
-
-    // Calculate memory.
-#ifdef PSUTIL_FREEBSD
-    rss = (long)kp.ki_rssize * pagesize;
-    vms = (long)kp.ki_size;
-    memtext = (long)kp.ki_tsize * pagesize;
-    memdata = (long)kp.ki_dsize * pagesize;
-    memstack = (long)kp.ki_ssize * pagesize;
-#else
-    rss = (long)kp.p_vm_rssize * pagesize;
-    #ifdef PSUTIL_OPENBSD
-        // VMS, this is how ps determines it on OpenBSD:
-        // https://github.com/openbsd/src/blob/
-        //     588f7f8c69786211f2d16865c552afb91b1c7cba/bin/ps/print.c#L505
-        vms = (long)(kp.p_vm_dsize + kp.p_vm_ssize + kp.p_vm_tsize) * pagesize;
-    #elif PSUTIL_NETBSD
-        // VMS, this is how top determines it on NetBSD:
-        // https://github.com/IIJ-NetBSD/netbsd-src/blob/master/external/
-        //     bsd/top/dist/machine/m_netbsd.c
-        vms = (long)kp.p_vm_msize * pagesize;
-    #endif
-        memtext = (long)kp.p_vm_tsize * pagesize;
-        memdata = (long)kp.p_vm_dsize * pagesize;
-        memstack = (long)kp.p_vm_ssize * pagesize;
-#endif
-
-#ifdef PSUTIL_FREEBSD
-    // what CPU we're on; top was used as an example:
-    // https://svnweb.freebsd.org/base/head/usr.bin/top/machine.c?
-    //     view=markup&pathrev=273835
-    // XXX - note: for "intr" PID this is -1.
-    if (kp.ki_stat == SRUN && kp.ki_oncpu != NOCPU)
-        oncpu = kp.ki_oncpu;
-    else
-        oncpu = kp.ki_lastcpu;
-#else
-    // On Net/OpenBSD we have kp.p_cpuid but it appears it's always
-    // set to KI_NOCPU. Even if it's not, ki_lastcpu does not exist
-    // so there's no way to determine where "sleeping" processes
-    // were. Not supported.
-    oncpu = -1;
-#endif
-
-#ifdef PSUTIL_FREEBSD
-    py_ppid = PyLong_FromPid(kp.ki_ppid);
-#elif defined(PSUTIL_OPENBSD) || defined(PSUTIL_NETBSD)
-    py_ppid = PyLong_FromPid(kp.p_ppid);
-#else
-    py_ppid = Py_BuildfValue(-1);
-#endif
-    if (! py_ppid)
-        return NULL;
-
-    // Return a single big tuple with all process info.
-    py_retlist = Py_BuildValue(
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
-        "(OillllllLdllllddddlllllbO)",
-#else
-        "(OillllllidllllddddlllllbO)",
-#endif
-#ifdef PSUTIL_FREEBSD
-        py_ppid,                         // (pid_t) ppid
-        (int)kp.ki_stat,                 // (int) status
-        // UIDs
-        (long)kp.ki_ruid,                // (long) real uid
-        (long)kp.ki_uid,                 // (long) effective uid
-        (long)kp.ki_svuid,               // (long) saved uid
-        // GIDs
-        (long)kp.ki_rgid,                // (long) real gid
-        (long)kp.ki_groups[0],           // (long) effective gid
-        (long)kp.ki_svuid,               // (long) saved gid
-        //
-        kp.ki_tdev,                      // (int or long long) tty nr
-        PSUTIL_TV2DOUBLE(kp.ki_start),   // (double) create time
-        // ctx switches
-        kp.ki_rusage.ru_nvcsw,           // (long) ctx switches (voluntary)
-        kp.ki_rusage.ru_nivcsw,          // (long) ctx switches (unvoluntary)
-        // IO count
-        kp.ki_rusage.ru_inblock,         // (long) read io count
-        kp.ki_rusage.ru_oublock,         // (long) write io count
-        // CPU times: convert from micro seconds to seconds.
-        PSUTIL_TV2DOUBLE(kp.ki_rusage.ru_utime),     // (double) user time
-        PSUTIL_TV2DOUBLE(kp.ki_rusage.ru_stime),     // (double) sys time
-        PSUTIL_TV2DOUBLE(kp.ki_rusage_ch.ru_utime),  // (double) children utime
-        PSUTIL_TV2DOUBLE(kp.ki_rusage_ch.ru_stime),  // (double) children stime
-        // memory
-        rss,                              // (long) rss
-        vms,                              // (long) vms
-        memtext,                          // (long) mem text
-        memdata,                          // (long) mem data
-        memstack,                         // (long) mem stack
-        // others
-        oncpu,                            // (int) the CPU we are on
-#elif defined(PSUTIL_OPENBSD) || defined(PSUTIL_NETBSD)
-        py_ppid,                         // (pid_t) ppid
-        (int)kp.p_stat,                  // (int) status
-        // UIDs
-        (long)kp.p_ruid,                 // (long) real uid
-        (long)kp.p_uid,                  // (long) effective uid
-        (long)kp.p_svuid,                // (long) saved uid
-        // GIDs
-        (long)kp.p_rgid,                 // (long) real gid
-        (long)kp.p_groups[0],            // (long) effective gid
-        (long)kp.p_svuid,                // (long) saved gid
-        //
-        kp.p_tdev,                       // (int) tty nr
-        PSUTIL_KPT2DOUBLE(kp.p_ustart),  // (double) create time
-        // ctx switches
-        kp.p_uru_nvcsw,                  // (long) ctx switches (voluntary)
-        kp.p_uru_nivcsw,                 // (long) ctx switches (unvoluntary)
-        // IO count
-        kp.p_uru_inblock,                // (long) read io count
-        kp.p_uru_oublock,                // (long) write io count
-        // CPU times: convert from micro seconds to seconds.
-        PSUTIL_KPT2DOUBLE(kp.p_uutime),  // (double) user time
-        PSUTIL_KPT2DOUBLE(kp.p_ustime),  // (double) sys time
-        // OpenBSD and NetBSD provide children user + system times summed
-        // together (no distinction).
-        kp.p_uctime_sec + kp.p_uctime_usec / 1000000.0,  // (double) ch utime
-        kp.p_uctime_sec + kp.p_uctime_usec / 1000000.0,  // (double) ch stime
-        // memory
-        rss,                              // (long) rss
-        vms,                              // (long) vms
-        memtext,                          // (long) mem text
-        memdata,                          // (long) mem data
-        memstack,                         // (long) mem stack
-        // others
-        oncpu,                            // (int) the CPU we are on
-#endif
-        py_name                           // (pystr) name
-    );
-
-    Py_DECREF(py_name);
-    Py_DECREF(py_ppid);
-    return py_retlist;
-}
-
-
-/*
- * Return process name from kinfo_proc as a Python string.
- */
-static PyObject *
-psutil_proc_name(PyObject *self, PyObject *args) {
-    pid_t pid;
-    kinfo_proc kp;
-    char str[1000];
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-
-#ifdef PSUTIL_FREEBSD
-    sprintf(str, "%s", kp.ki_comm);
-#elif defined(PSUTIL_OPENBSD) || defined(PSUTIL_NETBSD)
-    sprintf(str, "%s", kp.p_comm);
-#endif
-    return PyUnicode_DecodeFSDefault(str);
-}
-
-
-/*
- * Return process cmdline as a Python list of cmdline arguments.
- */
-static PyObject *
-psutil_proc_cmdline(PyObject *self, PyObject *args) {
-    pid_t pid;
-    PyObject *py_retlist = NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    py_retlist = psutil_get_cmdline(pid);
-    if (py_retlist == NULL)
-        return NULL;
-    return Py_BuildValue("N", py_retlist);
-}
-
-
-/*
- * Return the number of logical CPUs in the system.
- * XXX this could be shared with macOS
- */
-static PyObject *
-psutil_cpu_count_logical(PyObject *self, PyObject *args) {
-    int mib[2];
-    int ncpu;
-    size_t len;
-
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    len = sizeof(ncpu);
-
-    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1)
-        Py_RETURN_NONE;  // mimic os.cpu_count()
-    else
-        return Py_BuildValue("i", ncpu);
-}
-
-
-/*
- * Return a Python tuple representing user, kernel and idle CPU times
- */
-static PyObject *
-psutil_cpu_times(PyObject *self, PyObject *args) {
-#ifdef PSUTIL_NETBSD
-    u_int64_t cpu_time[CPUSTATES];
-#else
-    long cpu_time[CPUSTATES];
-#endif
-    size_t size = sizeof(cpu_time);
-    int ret;
-
-#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_NETBSD)
-    ret = sysctlbyname("kern.cp_time", &cpu_time, &size, NULL, 0);
-#elif PSUTIL_OPENBSD
-    int mib[] = {CTL_KERN, KERN_CPTIME};
-    ret = sysctl(mib, 2, &cpu_time, &size, NULL, 0);
-#endif
-    if (ret == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    return Py_BuildValue("(ddddd)",
-                         (double)cpu_time[CP_USER] / CLOCKS_PER_SEC,
-                         (double)cpu_time[CP_NICE] / CLOCKS_PER_SEC,
-                         (double)cpu_time[CP_SYS] / CLOCKS_PER_SEC,
-                         (double)cpu_time[CP_IDLE] / CLOCKS_PER_SEC,
-                         (double)cpu_time[CP_INTR] / CLOCKS_PER_SEC
-                        );
-}
-
-
- /*
- * Return files opened by process as a list of (path, fd) tuples.
- * TODO: this is broken as it may report empty paths. 'procstat'
- * utility has the same problem see:
- * https://github.com/giampaolo/psutil/issues/595
- */
-#if (defined(__FreeBSD_version) && __FreeBSD_version >= 800000) || PSUTIL_OPENBSD || defined(PSUTIL_NETBSD)
-static PyObject *
-psutil_proc_open_files(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int i;
-    int cnt;
-    int regular;
-    int fd;
-    char *path;
-    struct kinfo_file *freep = NULL;
-    struct kinfo_file *kif;
-    kinfo_proc kipp;
-    PyObject *py_tuple = NULL;
-    PyObject *py_path = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-    if (psutil_kinfo_proc(pid, &kipp) == -1)
-        goto error;
-
-    errno = 0;
-    freep = kinfo_getfile(pid, &cnt);
-    if (freep == NULL) {
-#if !defined(PSUTIL_OPENBSD)
-        psutil_raise_for_pid(pid, "kinfo_getfile()");
-#endif
-        goto error;
-    }
-
-    for (i = 0; i < cnt; i++) {
-        kif = &freep[i];
-
-#ifdef PSUTIL_FREEBSD
-        regular = (kif->kf_type == KF_TYPE_VNODE) && \
-            (kif->kf_vnode_type == KF_VTYPE_VREG);
-        fd = kif->kf_fd;
-        path = kif->kf_path;
-#elif PSUTIL_OPENBSD
-        regular = (kif->f_type == DTYPE_VNODE) && (kif->v_type == VREG);
-        fd = kif->fd_fd;
-        // XXX - it appears path is not exposed in the kinfo_file struct.
-        path = "";
-#elif PSUTIL_NETBSD
-        regular = (kif->ki_ftype == DTYPE_VNODE) && (kif->ki_vtype == VREG);
-        fd = kif->ki_fd;
-        // XXX - it appears path is not exposed in the kinfo_file struct.
-        path = "";
-#endif
-        if (regular == 1) {
-            py_path = PyUnicode_DecodeFSDefault(path);
-            if (! py_path)
-                goto error;
-            py_tuple = Py_BuildValue("(Oi)", py_path, fd);
-            if (py_tuple == NULL)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_CLEAR(py_path);
-            Py_CLEAR(py_tuple);
-        }
-    }
-    free(freep);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (freep != NULL)
-        free(freep);
-    return NULL;
-}
-#endif
-
-
-/*
- * Return a list of tuples including device, mount point and fs type
- * for all partitions mounted on the system.
- */
-static PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    int num;
-    int i;
-    long len;
-    uint64_t flags;
-    char opts[200];
-#ifdef PSUTIL_NETBSD
-    struct statvfs *fs = NULL;
-#else
-    struct statfs *fs = NULL;
-#endif
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_dev = NULL;
-    PyObject *py_mountp = NULL;
-    PyObject *py_tuple = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    // get the number of mount points
-    Py_BEGIN_ALLOW_THREADS
-#ifdef PSUTIL_NETBSD
-    num = getvfsstat(NULL, 0, MNT_NOWAIT);
-#else
-    num = getfsstat(NULL, 0, MNT_NOWAIT);
-#endif
-    Py_END_ALLOW_THREADS
-    if (num == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    len = sizeof(*fs) * num;
-    fs = malloc(len);
-    if (fs == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-#ifdef PSUTIL_NETBSD
-    num = getvfsstat(fs, len, MNT_NOWAIT);
-#else
-    num = getfsstat(fs, len, MNT_NOWAIT);
-#endif
-    Py_END_ALLOW_THREADS
-    if (num == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < num; i++) {
-        py_tuple = NULL;
-        opts[0] = 0;
-#ifdef PSUTIL_NETBSD
-        flags = fs[i].f_flag;
-#else
-        flags = fs[i].f_flags;
-#endif
-
-        // see sys/mount.h
-        if (flags & MNT_RDONLY)
-            strlcat(opts, "ro", sizeof(opts));
-        else
-            strlcat(opts, "rw", sizeof(opts));
-        if (flags & MNT_SYNCHRONOUS)
-            strlcat(opts, ",sync", sizeof(opts));
-        if (flags & MNT_NOEXEC)
-            strlcat(opts, ",noexec", sizeof(opts));
-        if (flags & MNT_NOSUID)
-            strlcat(opts, ",nosuid", sizeof(opts));
-        if (flags & MNT_ASYNC)
-            strlcat(opts, ",async", sizeof(opts));
-        if (flags & MNT_NOATIME)
-            strlcat(opts, ",noatime", sizeof(opts));
-        if (flags & MNT_SOFTDEP)
-            strlcat(opts, ",softdep", sizeof(opts));
-#ifdef PSUTIL_FREEBSD
-        if (flags & MNT_UNION)
-            strlcat(opts, ",union", sizeof(opts));
-        if (flags & MNT_SUIDDIR)
-            strlcat(opts, ",suiddir", sizeof(opts));
-        if (flags & MNT_SOFTDEP)
-            strlcat(opts, ",softdep", sizeof(opts));
-        if (flags & MNT_NOSYMFOLLOW)
-            strlcat(opts, ",nosymfollow", sizeof(opts));
-        if (flags & MNT_GJOURNAL)
-            strlcat(opts, ",gjournal", sizeof(opts));
-        if (flags & MNT_MULTILABEL)
-            strlcat(opts, ",multilabel", sizeof(opts));
-        if (flags & MNT_ACLS)
-            strlcat(opts, ",acls", sizeof(opts));
-        if (flags & MNT_NOCLUSTERR)
-            strlcat(opts, ",noclusterr", sizeof(opts));
-        if (flags & MNT_NOCLUSTERW)
-            strlcat(opts, ",noclusterw", sizeof(opts));
-        if (flags & MNT_NFS4ACLS)
-            strlcat(opts, ",nfs4acls", sizeof(opts));
-#elif PSUTIL_NETBSD
-        if (flags & MNT_NODEV)
-            strlcat(opts, ",nodev", sizeof(opts));
-        if (flags & MNT_UNION)
-            strlcat(opts, ",union", sizeof(opts));
-        if (flags & MNT_NOCOREDUMP)
-            strlcat(opts, ",nocoredump", sizeof(opts));
-#ifdef MNT_RELATIME
-        if (flags & MNT_RELATIME)
-            strlcat(opts, ",relatime", sizeof(opts));
-#endif
-        if (flags & MNT_IGNORE)
-            strlcat(opts, ",ignore", sizeof(opts));
-#ifdef MNT_DISCARD
-        if (flags & MNT_DISCARD)
-            strlcat(opts, ",discard", sizeof(opts));
-#endif
-#ifdef MNT_EXTATTR
-        if (flags & MNT_EXTATTR)
-            strlcat(opts, ",extattr", sizeof(opts));
-#endif
-        if (flags & MNT_LOG)
-            strlcat(opts, ",log", sizeof(opts));
-        if (flags & MNT_SYMPERM)
-            strlcat(opts, ",symperm", sizeof(opts));
-        if (flags & MNT_NODEVMTIME)
-            strlcat(opts, ",nodevmtime", sizeof(opts));
-#endif
-        py_dev = PyUnicode_DecodeFSDefault(fs[i].f_mntfromname);
-        if (! py_dev)
-            goto error;
-        py_mountp = PyUnicode_DecodeFSDefault(fs[i].f_mntonname);
-        if (! py_mountp)
-            goto error;
-        py_tuple = Py_BuildValue("(OOss)",
-                                 py_dev,               // device
-                                 py_mountp,            // mount point
-                                 fs[i].f_fstypename,   // fs type
-                                 opts);                // options
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_dev);
-        Py_CLEAR(py_mountp);
-        Py_CLEAR(py_tuple);
-    }
-
-    free(fs);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_dev);
-    Py_XDECREF(py_mountp);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (fs != NULL)
-        free(fs);
-    return NULL;
-}
-
-
-/*
- * Return a Python list of named tuples with overall network I/O information
- */
-static PyObject *
-psutil_net_io_counters(PyObject *self, PyObject *args) {
-    char *buf = NULL, *lim, *next;
-    struct if_msghdr *ifm;
-    int mib[6];
-    size_t len;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_ifc_info = NULL;
-    if (py_retdict == NULL)
-        return NULL;
-
-    mib[0] = CTL_NET;          // networking subsystem
-    mib[1] = PF_ROUTE;         // type of information
-    mib[2] = 0;                // protocol (IPPROTO_xxx)
-    mib[3] = 0;                // address family
-    mib[4] = NET_RT_IFLIST;   // operation
-    mib[5] = 0;
-
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    buf = malloc(len);
-    if (buf == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    lim = buf + len;
-
-    for (next = buf; next < lim; ) {
-        py_ifc_info = NULL;
-        ifm = (struct if_msghdr *)next;
-        next += ifm->ifm_msglen;
-
-        if (ifm->ifm_type == RTM_IFINFO) {
-            struct if_msghdr *if2m = (struct if_msghdr *)ifm;
-            struct sockaddr_dl *sdl = (struct sockaddr_dl *)(if2m + 1);
-            char ifc_name[32];
-
-            strncpy(ifc_name, sdl->sdl_data, sdl->sdl_nlen);
-            ifc_name[sdl->sdl_nlen] = 0;
-            // XXX: ignore usbus interfaces:
-            // http://lists.freebsd.org/pipermail/freebsd-current/
-            //     2011-October/028752.html
-            // 'ifconfig -a' doesn't show them, nor do we.
-            if (strncmp(ifc_name, "usbus", 5) == 0)
-                continue;
-
-            py_ifc_info = Py_BuildValue("(kkkkkkki)",
-                                        if2m->ifm_data.ifi_obytes,
-                                        if2m->ifm_data.ifi_ibytes,
-                                        if2m->ifm_data.ifi_opackets,
-                                        if2m->ifm_data.ifi_ipackets,
-                                        if2m->ifm_data.ifi_ierrors,
-                                        if2m->ifm_data.ifi_oerrors,
-                                        if2m->ifm_data.ifi_iqdrops,
-#ifdef _IFI_OQDROPS
-                                        if2m->ifm_data.ifi_oqdrops
-#else
-                                        0
-#endif
-                                        );
-            if (!py_ifc_info)
-                goto error;
-            if (PyDict_SetItemString(py_retdict, ifc_name, py_ifc_info))
-                goto error;
-            Py_CLEAR(py_ifc_info);
-        }
-        else {
-            continue;
-        }
-    }
-
-    free(buf);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_ifc_info);
-    Py_DECREF(py_retdict);
-    if (buf != NULL)
-        free(buf);
-    return NULL;
-}
-
-
-/*
- * Return currently connected users as a list of tuples.
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_username = NULL;
-    PyObject *py_tty = NULL;
-    PyObject *py_hostname = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_pid = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-#if (defined(__FreeBSD_version) && (__FreeBSD_version < 900000)) || PSUTIL_OPENBSD
-    struct utmp ut;
-    FILE *fp;
-
-    Py_BEGIN_ALLOW_THREADS
-    fp = fopen(_PATH_UTMP, "r");
-    Py_END_ALLOW_THREADS
-    if (fp == NULL) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, _PATH_UTMP);
-        goto error;
-    }
-
-    while (fread(&ut, sizeof(ut), 1, fp) == 1) {
-        if (*ut.ut_name == '\0')
-            continue;
-        py_username = PyUnicode_DecodeFSDefault(ut.ut_name);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(ut.ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(ut.ut_host);
-        if (! py_hostname)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOOfi)",
-            py_username,        // username
-            py_tty,             // tty
-            py_hostname,        // hostname
-            (float)ut.ut_time,  // start time
-#ifdef PSUTIL_OPENBSD
-            -1                  // process id (set to None later)
-#else
-            ut.ut_pid           // TODO: use PyLong_FromPid
-#endif
-        );
-        if (!py_tuple) {
-            fclose(fp);
-            goto error;
-        }
-        if (PyList_Append(py_retlist, py_tuple)) {
-            fclose(fp);
-            goto error;
-        }
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-    }
-
-    fclose(fp);
-#else
-    struct utmpx *utx;
-    setutxent();
-    while ((utx = getutxent()) != NULL) {
-        if (utx->ut_type != USER_PROCESS)
-            continue;
-        py_username = PyUnicode_DecodeFSDefault(utx->ut_user);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(utx->ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(utx->ut_host);
-        if (! py_hostname)
-            goto error;
-#ifdef PSUTIL_OPENBSD
-        py_pid = Py_BuildValue("i", -1);  // set to None later
-#else
-        py_pid = PyLong_FromPid(utx->ut_pid);
-#endif
-        if (! py_pid)
-            goto error;
-
-        py_tuple = Py_BuildValue(
-            "(OOOfO)",
-            py_username,   // username
-            py_tty,        // tty
-            py_hostname,   // hostname
-            (float)utx->ut_tv.tv_sec,  // start time
-            py_pid         // process id
-        );
-
-        if (!py_tuple) {
-            endutxent();
-            goto error;
-        }
-        if (PyList_Append(py_retlist, py_tuple)) {
-            endutxent();
-            goto error;
-        }
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-        Py_CLEAR(py_pid);
-    }
-
-    endutxent();
-#endif
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tty);
-    Py_XDECREF(py_hostname);
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_pid);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-/*
- * define the psutil C module methods and initialize the module.
- */
-static PyMethodDef mod_methods[] = {
-    // --- per-process functions
-
-    {"proc_oneshot_info", psutil_proc_oneshot_info, METH_VARARGS,
-     "Return multiple info about a process"},
-    {"proc_name", psutil_proc_name, METH_VARARGS,
-     "Return process name"},
-    {"proc_cmdline", psutil_proc_cmdline, METH_VARARGS,
-     "Return process cmdline as a list of cmdline arguments"},
-    {"proc_threads", psutil_proc_threads, METH_VARARGS,
-     "Return process threads"},
-#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_OPENBSD)
-    {"proc_connections", psutil_proc_connections, METH_VARARGS,
-     "Return connections opened by process"},
-#endif
-    {"proc_cwd", psutil_proc_cwd, METH_VARARGS,
-     "Return process current working directory."},
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000 || PSUTIL_OPENBSD || defined(PSUTIL_NETBSD)
-    {"proc_num_fds", psutil_proc_num_fds, METH_VARARGS,
-     "Return the number of file descriptors opened by this process"},
-    {"proc_open_files", psutil_proc_open_files, METH_VARARGS,
-     "Return files opened by process as a list of (path, fd) tuples"},
-#endif
-#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_NETBSD)
-    {"proc_num_threads", psutil_proc_num_threads, METH_VARARGS,
-     "Return number of threads used by process"},
-#endif
-#if defined(PSUTIL_FREEBSD)
-    {"proc_exe", psutil_proc_exe, METH_VARARGS,
-     "Return process pathname executable"},
-    {"proc_memory_maps", psutil_proc_memory_maps, METH_VARARGS,
-     "Return a list of tuples for every process's memory map"},
-    {"proc_cpu_affinity_get", psutil_proc_cpu_affinity_get, METH_VARARGS,
-     "Return process CPU affinity."},
-    {"proc_cpu_affinity_set", psutil_proc_cpu_affinity_set, METH_VARARGS,
-     "Set process CPU affinity."},
-    {"cpu_count_phys", psutil_cpu_count_phys, METH_VARARGS,
-     "Return an XML string to determine the number physical CPUs."},
-#endif
-
-    // --- system-related functions
-
-    {"pids", psutil_pids, METH_VARARGS,
-     "Returns a list of PIDs currently running on the system"},
-    {"cpu_count_logical", psutil_cpu_count_logical, METH_VARARGS,
-     "Return number of logical CPUs on the system"},
-    {"virtual_mem", psutil_virtual_mem, METH_VARARGS,
-     "Return system virtual memory usage statistics"},
-    {"swap_mem", psutil_swap_mem, METH_VARARGS,
-     "Return swap mem stats"},
-    {"cpu_times", psutil_cpu_times, METH_VARARGS,
-     "Return system cpu times as a tuple (user, system, nice, idle, irc)"},
-    {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS,
-     "Return system per-cpu times as a list of tuples"},
-    {"boot_time", psutil_boot_time, METH_VARARGS,
-     "Return the system boot time expressed in seconds since the epoch."},
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return a list of tuples including device, mount point and "
-     "fs type for all partitions mounted on the system."},
-    {"net_io_counters", psutil_net_io_counters, METH_VARARGS,
-     "Return dict of tuples of networks I/O information."},
-    {"disk_io_counters", psutil_disk_io_counters, METH_VARARGS,
-     "Return a Python dict of tuples for disk I/O information"},
-    {"users", psutil_users, METH_VARARGS,
-     "Return currently connected users as a list of tuples"},
-    {"cpu_stats", psutil_cpu_stats, METH_VARARGS,
-     "Return CPU statistics"},
-#if defined(PSUTIL_FREEBSD) || defined(PSUTIL_NETBSD)
-    {"net_connections", psutil_net_connections, METH_VARARGS,
-     "Return system-wide open connections."},
-#endif
-#if defined(PSUTIL_FREEBSD)
-    {"sensors_battery", psutil_sensors_battery, METH_VARARGS,
-     "Return battery information."},
-    {"sensors_cpu_temperature", psutil_sensors_cpu_temperature, METH_VARARGS,
-     "Return temperature information for a given CPU core number."},
-    {"cpu_frequency", psutil_cpu_freq, METH_VARARGS,
-     "Return frequency of a given CPU"},
-#endif
-
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-#if PY_MAJOR_VERSION >= 3
-    #define INITERR return NULL
-
-    static struct PyModuleDef moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "_psutil_bsd",
-        NULL,
-        -1,
-        mod_methods,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-    };
-
-    PyObject *PyInit__psutil_bsd(void)
-#else  /* PY_MAJOR_VERSION */
-    #define INITERR return
-
-    void init_psutil_bsd(void)
-#endif  /* PY_MAJOR_VERSION */
-{
-    PyObject *v;
-#if PY_MAJOR_VERSION >= 3
-    PyObject *mod = PyModule_Create(&moduledef);
-#else
-    PyObject *mod = Py_InitModule("_psutil_bsd", mod_methods);
-#endif
-    if (mod == NULL)
-        INITERR;
-
-    if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
-    // process status constants
-
-#ifdef PSUTIL_FREEBSD
-    if (PyModule_AddIntConstant(mod, "SIDL", SIDL)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SRUN", SRUN)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSLEEP", SSLEEP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSTOP", SSTOP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SZOMB", SZOMB)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SWAIT", SWAIT)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SLOCK", SLOCK)) INITERR;
-#elif  PSUTIL_OPENBSD
-    if (PyModule_AddIntConstant(mod, "SIDL", SIDL)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SRUN", SRUN)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSLEEP", SSLEEP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSTOP", SSTOP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SZOMB", SZOMB)) INITERR; // unused
-    if (PyModule_AddIntConstant(mod, "SDEAD", SDEAD)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SONPROC", SONPROC)) INITERR;
-#elif defined(PSUTIL_NETBSD)
-    if (PyModule_AddIntConstant(mod, "SIDL", LSIDL)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SRUN", LSRUN)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSLEEP", LSSLEEP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SSTOP", LSSTOP)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SZOMB", LSZOMB)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SDEAD", LSDEAD)) INITERR;
-    if (PyModule_AddIntConstant(mod, "SONPROC", LSONPROC)) INITERR;
-    // unique to NetBSD
-    if (PyModule_AddIntConstant(mod, "SSUSPENDED", LSSUSPENDED)) INITERR;
-#endif
-
-    // connection status constants
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSED", TCPS_CLOSED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSING", TCPS_CLOSING))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSE_WAIT", TCPS_CLOSE_WAIT))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_LISTEN", TCPS_LISTEN))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_ESTABLISHED", TCPS_ESTABLISHED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_SYN_SENT", TCPS_SYN_SENT))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_SYN_RECEIVED", TCPS_SYN_RECEIVED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_FIN_WAIT_1", TCPS_FIN_WAIT_1))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_FIN_WAIT_2", TCPS_FIN_WAIT_2))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_LAST_ACK", TCPS_LAST_ACK))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_TIME_WAIT", TCPS_TIME_WAIT))
-        INITERR;
-    // PSUTIL_CONN_NONE
-    if (PyModule_AddIntConstant(mod, "PSUTIL_CONN_NONE", 128)) INITERR;
-
-    psutil_setup();
-
-    if (mod == NULL)
-        INITERR;
-#if PY_MAJOR_VERSION >= 3
-    return mod;
-#endif
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_common.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_common.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_common.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_common.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,403 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Routines common to all platforms.
- */
-
-#include <Python.h>
-#include "_psutil_common.h"
-
-// ====================================================================
-// --- Global vars
-// ====================================================================
-
-int PSUTIL_DEBUG = 0;
-int PSUTIL_TESTING = 0;
-// PSUTIL_CONN_NONE
-
-
-// ====================================================================
-// --- Backward compatibility with missing Python.h APIs
-// ====================================================================
-
-// PyPy on Windows
-#if defined(PSUTIL_WINDOWS) && \
-    defined(PYPY_VERSION) && \
-    !defined(PyErr_SetFromWindowsErrWithFilename)
-PyObject *
-PyErr_SetFromWindowsErrWithFilename(int winerr, const char *filename) {
-    PyObject *py_exc = NULL;
-    PyObject *py_winerr = NULL;
-
-    if (winerr == 0)
-        winerr = GetLastError();
-    if (filename == NULL) {
-        py_exc = PyObject_CallFunction(PyExc_OSError, "(is)", winerr,
-                                       strerror(winerr));
-    }
-    else {
-        py_exc = PyObject_CallFunction(PyExc_OSError, "(iss)", winerr,
-                                       strerror(winerr), filename);
-    }
-    if (py_exc == NULL)
-        return NULL;
-
-    py_winerr = Py_BuildValue("i", winerr);
-    if (py_winerr == NULL)
-        goto error;
-    if (PyObject_SetAttrString(py_exc, "winerror", py_winerr) != 0)
-        goto error;
-    PyErr_SetObject(PyExc_OSError, py_exc);
-    Py_XDECREF(py_exc);
-    return NULL;
-
-error:
-    Py_XDECREF(py_exc);
-    Py_XDECREF(py_winerr);
-    return NULL;
-}
-#endif  // PYPY on Windows
-
-
-// ====================================================================
-// --- Custom exceptions
-// ====================================================================
-
-/*
- * Same as PyErr_SetFromErrno(0) but adds the syscall to the exception
- * message.
- */
-PyObject *
-PyErr_SetFromOSErrnoWithSyscall(const char *syscall) {
-    char fullmsg[1024];
-
-#ifdef PSUTIL_WINDOWS
-    sprintf(fullmsg, "(originated from %s)", syscall);
-    PyErr_SetFromWindowsErrWithFilename(GetLastError(), fullmsg);
-#else
-    PyObject *exc;
-    sprintf(fullmsg, "%s (originated from %s)", strerror(errno), syscall);
-    exc = PyObject_CallFunction(PyExc_OSError, "(is)", errno, fullmsg);
-    PyErr_SetObject(PyExc_OSError, exc);
-    Py_XDECREF(exc);
-#endif
-    return NULL;
-}
-
-
-/*
- * Set OSError(errno=ESRCH, strerror="No such process (originated from")
- * Python exception.
- */
-PyObject *
-NoSuchProcess(const char *syscall) {
-    PyObject *exc;
-    char msg[1024];
-
-    sprintf(msg, "No such process (originated from %s)", syscall);
-    exc = PyObject_CallFunction(PyExc_OSError, "(is)", ESRCH, msg);
-    PyErr_SetObject(PyExc_OSError, exc);
-    Py_XDECREF(exc);
-    return NULL;
-}
-
-
-/*
- * Set OSError(errno=EACCES, strerror="Permission denied" (originated from ...)
- * Python exception.
- */
-PyObject *
-AccessDenied(const char *syscall) {
-    PyObject *exc;
-    char msg[1024];
-
-    sprintf(msg, "Access denied (originated from %s)", syscall);
-    exc = PyObject_CallFunction(PyExc_OSError, "(is)", EACCES, msg);
-    PyErr_SetObject(PyExc_OSError, exc);
-    Py_XDECREF(exc);
-    return NULL;
-}
-
-
-// ====================================================================
-// --- Global utils
-// ====================================================================
-
-/*
- * Enable testing mode. This has the same effect as setting PSUTIL_TESTING
- * env var. This dual method exists because updating os.environ on
- * Windows has no effect. Called on unit tests setup.
- */
-PyObject *
-psutil_set_testing(PyObject *self, PyObject *args) {
-    PSUTIL_TESTING = 1;
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-
-/*
- * Print a debug message on stderr. No-op if PSUTIL_DEBUG env var is not set.
- */
-void
-psutil_debug(const char* format, ...) {
-    va_list argptr;
-    if (PSUTIL_DEBUG) {
-        va_start(argptr, format);
-        fprintf(stderr, "psutil-debug> ");
-        vfprintf(stderr, format, argptr);
-        fprintf(stderr, "\n");
-        va_end(argptr);
-    }
-}
-
-
-/*
- * Called on module import on all platforms.
- */
-int
-psutil_setup(void) {
-    if (getenv("PSUTIL_DEBUG") != NULL)
-        PSUTIL_DEBUG = 1;
-    if (getenv("PSUTIL_TESTING") != NULL)
-        PSUTIL_TESTING = 1;
-    return 0;
-}
-
-
-// ====================================================================
-// --- Windows
-// ====================================================================
-
-#ifdef PSUTIL_WINDOWS
-#include <windows.h>
-
-// Needed to make these globally visible.
-int PSUTIL_WINVER;
-SYSTEM_INFO          PSUTIL_SYSTEM_INFO;
-CRITICAL_SECTION     PSUTIL_CRITICAL_SECTION;
-
-#define NT_FACILITY_MASK 0xfff
-#define NT_FACILITY_SHIFT 16
-#define NT_FACILITY(Status) \
-    ((((ULONG)(Status)) >> NT_FACILITY_SHIFT) & NT_FACILITY_MASK)
-#define NT_NTWIN32(status) (NT_FACILITY(Status) == FACILITY_WIN32)
-#define WIN32_FROM_NTSTATUS(Status) (((ULONG)(Status)) & 0xffff)
-
-
-// A wrapper around GetModuleHandle and GetProcAddress.
-PVOID
-psutil_GetProcAddress(LPCSTR libname, LPCSTR procname) {
-    HMODULE mod;
-    FARPROC addr;
-
-    if ((mod = GetModuleHandleA(libname)) == NULL) {
-        PyErr_SetFromWindowsErrWithFilename(0, libname);
-        return NULL;
-    }
-    if ((addr = GetProcAddress(mod, procname)) == NULL) {
-        PyErr_SetFromWindowsErrWithFilename(0, procname);
-        return NULL;
-    }
-    return addr;
-}
-
-
-// A wrapper around LoadLibrary and GetProcAddress.
-PVOID
-psutil_GetProcAddressFromLib(LPCSTR libname, LPCSTR procname) {
-    HMODULE mod;
-    FARPROC addr;
-
-    Py_BEGIN_ALLOW_THREADS
-    mod = LoadLibraryA(libname);
-    Py_END_ALLOW_THREADS
-    if (mod  == NULL) {
-        PyErr_SetFromWindowsErrWithFilename(0, libname);
-        return NULL;
-    }
-    if ((addr = GetProcAddress(mod, procname)) == NULL) {
-        PyErr_SetFromWindowsErrWithFilename(0, procname);
-        FreeLibrary(mod);
-        return NULL;
-    }
-    // Causes crash.
-    // FreeLibrary(mod);
-    return addr;
-}
-
-
-/*
- * Convert a NTSTATUS value to a Win32 error code and set the proper
- * Python exception.
- */
-PVOID
-psutil_SetFromNTStatusErr(NTSTATUS Status, const char *syscall) {
-    ULONG err;
-    char fullmsg[1024];
-
-    if (NT_NTWIN32(Status))
-        err = WIN32_FROM_NTSTATUS(Status);
-    else
-        err = RtlNtStatusToDosErrorNoTeb(Status);
-    // if (GetLastError() != 0)
-    //     err = GetLastError();
-    sprintf(fullmsg, "(originated from %s)", syscall);
-    return PyErr_SetFromWindowsErrWithFilename(err, fullmsg);
-}
-
-
-static int
-psutil_loadlibs() {
-    // --- Mandatory
-    NtQuerySystemInformation = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "NtQuerySystemInformation");
-    if (! NtQuerySystemInformation)
-        return 1;
-    NtQueryInformationProcess = psutil_GetProcAddress(
-        "ntdll.dll", "NtQueryInformationProcess");
-    if (! NtQueryInformationProcess)
-        return 1;
-    NtSetInformationProcess = psutil_GetProcAddress(
-        "ntdll.dll", "NtSetInformationProcess");
-    if (! NtSetInformationProcess)
-        return 1;
-    WinStationQueryInformationW = psutil_GetProcAddressFromLib(
-        "winsta.dll", "WinStationQueryInformationW");
-    if (! WinStationQueryInformationW)
-        return 1;
-    NtQueryObject = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "NtQueryObject");
-    if (! NtQueryObject)
-        return 1;
-    RtlIpv4AddressToStringA = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "RtlIpv4AddressToStringA");
-    if (! RtlIpv4AddressToStringA)
-        return 1;
-    GetExtendedTcpTable = psutil_GetProcAddressFromLib(
-        "iphlpapi.dll", "GetExtendedTcpTable");
-    if (! GetExtendedTcpTable)
-        return 1;
-    GetExtendedUdpTable = psutil_GetProcAddressFromLib(
-        "iphlpapi.dll", "GetExtendedUdpTable");
-    if (! GetExtendedUdpTable)
-        return 1;
-    RtlGetVersion = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "RtlGetVersion");
-    if (! RtlGetVersion)
-        return 1;
-    NtSuspendProcess = psutil_GetProcAddressFromLib(
-        "ntdll", "NtSuspendProcess");
-    if (! NtSuspendProcess)
-        return 1;
-    NtResumeProcess = psutil_GetProcAddressFromLib(
-        "ntdll", "NtResumeProcess");
-    if (! NtResumeProcess)
-        return 1;
-    NtQueryVirtualMemory = psutil_GetProcAddressFromLib(
-        "ntdll", "NtQueryVirtualMemory");
-    if (! NtQueryVirtualMemory)
-        return 1;
-    RtlNtStatusToDosErrorNoTeb = psutil_GetProcAddressFromLib(
-        "ntdll", "RtlNtStatusToDosErrorNoTeb");
-    if (! RtlNtStatusToDosErrorNoTeb)
-        return 1;
-    GetTickCount64 = psutil_GetProcAddress(
-        "kernel32", "GetTickCount64");
-    if (! GetTickCount64)
-        return 1;
-    RtlIpv6AddressToStringA = psutil_GetProcAddressFromLib(
-        "ntdll.dll", "RtlIpv6AddressToStringA");
-    if (! RtlIpv6AddressToStringA)
-        return 1;
-
-    // --- Optional
-    // minimum requirement: Win 7
-    GetActiveProcessorCount = psutil_GetProcAddress(
-        "kernel32", "GetActiveProcessorCount");
-    // minumum requirement: Win 7
-    GetLogicalProcessorInformationEx = psutil_GetProcAddressFromLib(
-        "kernel32", "GetLogicalProcessorInformationEx");
-
-    PyErr_Clear();
-    return 0;
-}
-
-
-static int
-psutil_set_winver() {
-    RTL_OSVERSIONINFOEXW versionInfo;
-    ULONG maj;
-    ULONG min;
-
-    versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
-    memset(&versionInfo, 0, sizeof(RTL_OSVERSIONINFOEXW));
-    RtlGetVersion((PRTL_OSVERSIONINFOW)&versionInfo);
-    maj = versionInfo.dwMajorVersion;
-    min = versionInfo.dwMinorVersion;
-    if (maj == 6 && min == 0)
-        PSUTIL_WINVER = PSUTIL_WINDOWS_VISTA;  // or Server 2008
-    else if (maj == 6 && min == 1)
-        PSUTIL_WINVER = PSUTIL_WINDOWS_7;
-    else if (maj == 6 && min == 2)
-        PSUTIL_WINVER = PSUTIL_WINDOWS_8;
-    else if (maj == 6 && min == 3)
-        PSUTIL_WINVER = PSUTIL_WINDOWS_8_1;
-    else if (maj == 10 && min == 0)
-        PSUTIL_WINVER = PSUTIL_WINDOWS_10;
-    else
-        PSUTIL_WINVER = PSUTIL_WINDOWS_NEW;
-    return 0;
-}
-
-
-int
-psutil_load_globals() {
-    if (psutil_loadlibs() != 0)
-        return 1;
-    if (psutil_set_winver() != 0)
-        return 1;
-    GetSystemInfo(&PSUTIL_SYSTEM_INFO);
-    InitializeCriticalSection(&PSUTIL_CRITICAL_SECTION);
-    return 0;
-}
-
-
-/*
- * Convert the hi and lo parts of a FILETIME structure or a LARGE_INTEGER
- * to a UNIX time.
- * A FILETIME contains a 64-bit value representing the number of
- * 100-nanosecond intervals since January 1, 1601 (UTC).
- * A UNIX time is the number of seconds that have elapsed since the
- * UNIX epoch, that is the time 00:00:00 UTC on 1 January 1970.
- */
-static double
-_to_unix_time(ULONGLONG hiPart, ULONGLONG loPart) {
-    ULONGLONG ret;
-
-    // 100 nanosecond intervals since January 1, 1601.
-    ret = hiPart << 32;
-    ret += loPart;
-    // Change starting time to the Epoch (00:00:00 UTC, January 1, 1970).
-    ret -= 116444736000000000ull;
-    // Convert nano secs to secs.
-    return (double) ret / 10000000ull;
-}
-
-
-double
-psutil_FiletimeToUnixTime(FILETIME ft) {
-    return _to_unix_time((ULONGLONG)ft.dwHighDateTime,
-                         (ULONGLONG)ft.dwLowDateTime);
-
-}
-
-
-double
-psutil_LargeIntegerToUnixTime(LARGE_INTEGER li) {
-    return _to_unix_time((ULONGLONG)li.HighPart,
-                         (ULONGLONG)li.LowPart);
-}
-#endif  // PSUTIL_WINDOWS
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_common.h firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_common.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_common.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <Python.h>
-
-// ====================================================================
-// --- Global vars / constants
-// ====================================================================
-
-extern int PSUTIL_TESTING;
-extern int PSUTIL_DEBUG;
-// a signaler for connections without an actual status
-static const int PSUTIL_CONN_NONE = 128;
-
-// ====================================================================
-// --- Backward compatibility with missing Python.h APIs
-// ====================================================================
-
-#if PY_MAJOR_VERSION < 3
-    // On Python 2 we just return a plain byte string, which is never
-    // supposed to raise decoding errors, see:
-    // https://github.com/giampaolo/psutil/issues/1040
-    #define PyUnicode_DecodeFSDefault          PyString_FromString
-    #define PyUnicode_DecodeFSDefaultAndSize   PyString_FromStringAndSize
-#endif
-
-#if defined(PSUTIL_WINDOWS) && \
-        defined(PYPY_VERSION) && \
-        !defined(PyErr_SetFromWindowsErrWithFilename)
-    PyObject *PyErr_SetFromWindowsErrWithFilename(int ierr,
-                                                  const char *filename);
-#endif
-
-// --- _Py_PARSE_PID
-
-// SIZEOF_INT|LONG is missing on Linux + PyPy (only?).
-// SIZEOF_PID_T is missing on Windows + Python2.
-// In this case we guess it from setup.py. It's not 100% bullet proof,
-// If wrong we'll probably get compiler warnings.
-// FWIW on all UNIX platforms I've seen pid_t is defined as an int.
-// _getpid() on Windows also returns an int.
-#if !defined(SIZEOF_INT)
-    #define SIZEOF_INT 4
-#endif
-#if !defined(SIZEOF_LONG)
-    #define SIZEOF_LONG 8
-#endif
-#if !defined(SIZEOF_PID_T)
-    #define SIZEOF_PID_T PSUTIL_SIZEOF_PID_T  // set as a macro in setup.py
-#endif
-
-// _Py_PARSE_PID is Python 3 only, but since it's private make sure it's
-// always present.
-#ifndef _Py_PARSE_PID
-    #if SIZEOF_PID_T == SIZEOF_INT
-        #define _Py_PARSE_PID "i"
-    #elif SIZEOF_PID_T == SIZEOF_LONG
-        #define _Py_PARSE_PID "l"
-    #elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
-        #define _Py_PARSE_PID "L"
-    #else
-        #error "_Py_PARSE_PID: sizeof(pid_t) is neither sizeof(int), "
-               "sizeof(long) or sizeof(long long)"
-    #endif
-#endif
-
-// Python 2 or PyPy on Windows
-#ifndef PyLong_FromPid
-    #if ((SIZEOF_PID_T == SIZEOF_INT) || (SIZEOF_PID_T == SIZEOF_LONG))
-        #if PY_MAJOR_VERSION >= 3
-            #define PyLong_FromPid PyLong_FromLong
-        #else
-            #define PyLong_FromPid PyInt_FromLong
-        #endif
-    #elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG
-        #define PyLong_FromPid PyLong_FromLongLong
-    #else
-        #error "PyLong_FromPid: sizeof(pid_t) is neither sizeof(int), "
-               "sizeof(long) or sizeof(long long)"
-    #endif
-#endif
-
-// ====================================================================
-// --- Custom exceptions
-// ====================================================================
-
-PyObject* AccessDenied(const char *msg);
-PyObject* NoSuchProcess(const char *msg);
-PyObject* PyErr_SetFromOSErrnoWithSyscall(const char *syscall);
-
-// ====================================================================
-// --- Global utils
-// ====================================================================
-
-PyObject* psutil_set_testing(PyObject *self, PyObject *args);
-void psutil_debug(const char* format, ...);
-int psutil_setup(void);
-
-// ====================================================================
-// --- Windows
-// ====================================================================
-
-#ifdef PSUTIL_WINDOWS
-    #include <windows.h>
-    // make it available to any file which includes this module
-    #include "arch/windows/ntextapi.h"
-
-    extern int PSUTIL_WINVER;
-    extern SYSTEM_INFO          PSUTIL_SYSTEM_INFO;
-    extern CRITICAL_SECTION     PSUTIL_CRITICAL_SECTION;
-
-    #define PSUTIL_WINDOWS_VISTA 60
-    #define PSUTIL_WINDOWS_7 61
-    #define PSUTIL_WINDOWS_8 62
-    #define PSUTIL_WINDOWS_8_1 63
-    #define PSUTIL_WINDOWS_10 100
-    #define PSUTIL_WINDOWS_NEW MAXLONG
-
-    #define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
-    #define MALLOC_ZERO(x) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (x))
-    #define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
-
-    #define LO_T 1e-7
-    #define HI_T 429.4967296
-
-    #ifndef AF_INET6
-        #define AF_INET6 23
-    #endif
-
-    int psutil_load_globals();
-    PVOID psutil_GetProcAddress(LPCSTR libname, LPCSTR procname);
-    PVOID psutil_GetProcAddressFromLib(LPCSTR libname, LPCSTR procname);
-    PVOID psutil_SetFromNTStatusErr(NTSTATUS Status, const char *syscall);
-    double psutil_FiletimeToUnixTime(FILETIME ft);
-    double psutil_LargeIntegerToUnixTime(LARGE_INTEGER li);
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_linux.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_linux.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_linux.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_linux.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,673 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Linux-specific functions.
- */
-
-#ifndef _GNU_SOURCE
-    #define _GNU_SOURCE 1
-#endif
-#include <Python.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <mntent.h>
-#include <features.h>
-#include <utmp.h>
-#include <sched.h>
-#include <linux/version.h>
-#include <sys/syscall.h>
-#include <sys/sysinfo.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <linux/sockios.h>
-#include <linux/if.h>
-
-// see: https://github.com/giampaolo/psutil/issues/659
-#ifdef PSUTIL_ETHTOOL_MISSING_TYPES
-    #include <linux/types.h>
-    typedef __u64 u64;
-    typedef __u32 u32;
-    typedef __u16 u16;
-    typedef __u8 u8;
-#endif
-/* Avoid redefinition of struct sysinfo with musl libc */
-#define _LINUX_SYSINFO_H
-#include <linux/ethtool.h>
-
-/* The minimum number of CPUs allocated in a cpu_set_t */
-static const int NCPUS_START = sizeof(unsigned long) * CHAR_BIT;
-
-// Linux >= 2.6.13
-#define PSUTIL_HAVE_IOPRIO defined(__NR_ioprio_get) && defined(__NR_ioprio_set)
-
-// Linux >= 2.6.36 (supposedly) and glibc >= 13
-#define PSUTIL_HAVE_PRLIMIT \
-    (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) && \
-    (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 13) && \
-    defined(__NR_prlimit64)
-
-#if PSUTIL_HAVE_PRLIMIT
-    #define _FILE_OFFSET_BITS 64
-    #include <time.h>
-    #include <sys/resource.h>
-#endif
-
-// Should exist starting from CentOS 6 (year 2011).
-#ifdef CPU_ALLOC
-    #define PSUTIL_HAVE_CPU_AFFINITY
-#endif
-
-#include "_psutil_common.h"
-#include "_psutil_posix.h"
-
-// May happen on old RedHat versions, see:
-// https://github.com/giampaolo/psutil/issues/607
-#ifndef DUPLEX_UNKNOWN
-    #define DUPLEX_UNKNOWN 0xff
-#endif
-
-
-#if PSUTIL_HAVE_IOPRIO
-enum {
-    IOPRIO_WHO_PROCESS = 1,
-};
-
-static inline int
-ioprio_get(int which, int who) {
-    return syscall(__NR_ioprio_get, which, who);
-}
-
-static inline int
-ioprio_set(int which, int who, int ioprio) {
-    return syscall(__NR_ioprio_set, which, who, ioprio);
-}
-
-#define IOPRIO_CLASS_SHIFT 13
-#define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1)
-
-#define IOPRIO_PRIO_CLASS(mask) ((mask) >> IOPRIO_CLASS_SHIFT)
-#define IOPRIO_PRIO_DATA(mask) ((mask) & IOPRIO_PRIO_MASK)
-#define IOPRIO_PRIO_VALUE(class, data) (((class) << IOPRIO_CLASS_SHIFT) | data)
-
-
-/*
- * Return a (ioclass, iodata) Python tuple representing process I/O priority.
- */
-static PyObject *
-psutil_proc_ioprio_get(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int ioprio, ioclass, iodata;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    ioprio = ioprio_get(IOPRIO_WHO_PROCESS, pid);
-    if (ioprio == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    ioclass = IOPRIO_PRIO_CLASS(ioprio);
-    iodata = IOPRIO_PRIO_DATA(ioprio);
-    return Py_BuildValue("ii", ioclass, iodata);
-}
-
-
-/*
- * A wrapper around ioprio_set(); sets process I/O priority.
- * ioclass can be either IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE
- * or 0. iodata goes from 0 to 7 depending on ioclass specified.
- */
-static PyObject *
-psutil_proc_ioprio_set(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int ioprio, ioclass, iodata;
-    int retval;
-
-    if (! PyArg_ParseTuple(
-            args, _Py_PARSE_PID "ii", &pid, &ioclass, &iodata)) {
-        return NULL;
-    }
-    ioprio = IOPRIO_PRIO_VALUE(ioclass, iodata);
-    retval = ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio);
-    if (retval == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    Py_RETURN_NONE;
-}
-#endif
-
-
-#if PSUTIL_HAVE_PRLIMIT
-/*
- * A wrapper around prlimit(2); sets process resource limits.
- * This can be used for both get and set, in which case extra
- * 'soft' and 'hard' args must be provided.
- */
-static PyObject *
-psutil_linux_prlimit(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int ret, resource;
-    struct rlimit old, new;
-    struct rlimit *newp = NULL;
-    PyObject *py_soft = NULL;
-    PyObject *py_hard = NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "i|OO", &pid, &resource,
-                           &py_soft, &py_hard)) {
-        return NULL;
-    }
-
-    // get
-    if (py_soft == NULL && py_hard == NULL) {
-        ret = prlimit(pid, resource, NULL, &old);
-        if (ret == -1)
-            return PyErr_SetFromErrno(PyExc_OSError);
-#if defined(PSUTIL_HAVE_LONG_LONG)
-        if (sizeof(old.rlim_cur) > sizeof(long)) {
-            return Py_BuildValue("LL",
-                                 (PY_LONG_LONG)old.rlim_cur,
-                                 (PY_LONG_LONG)old.rlim_max);
-        }
-#endif
-        return Py_BuildValue("ll", (long)old.rlim_cur, (long)old.rlim_max);
-    }
-
-    // set
-    else {
-#if defined(PSUTIL_HAVE_LARGEFILE_SUPPORT)
-        new.rlim_cur = PyLong_AsLongLong(py_soft);
-        if (new.rlim_cur == (rlim_t) - 1 && PyErr_Occurred())
-            return NULL;
-        new.rlim_max = PyLong_AsLongLong(py_hard);
-        if (new.rlim_max == (rlim_t) - 1 && PyErr_Occurred())
-            return NULL;
-#else
-        new.rlim_cur = PyLong_AsLong(py_soft);
-        if (new.rlim_cur == (rlim_t) - 1 && PyErr_Occurred())
-            return NULL;
-        new.rlim_max = PyLong_AsLong(py_hard);
-        if (new.rlim_max == (rlim_t) - 1 && PyErr_Occurred())
-            return NULL;
-#endif
-        newp = &new;
-        ret = prlimit(pid, resource, newp, &old);
-        if (ret == -1)
-            return PyErr_SetFromErrno(PyExc_OSError);
-        Py_RETURN_NONE;
-    }
-}
-#endif
-
-
-/*
- * Return disk mounted partitions as a list of tuples including device,
- * mount point and filesystem type
- */
-static PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    FILE *file = NULL;
-    struct mntent *entry;
-    char *mtab_path;
-    PyObject *py_dev = NULL;
-    PyObject *py_mountp = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (!PyArg_ParseTuple(args, "s", &mtab_path))
-        return NULL;
-
-    Py_BEGIN_ALLOW_THREADS
-    file = setmntent(mtab_path, "r");
-    Py_END_ALLOW_THREADS
-    if ((file == 0) || (file == NULL)) {
-        psutil_debug("setmntent() failed");
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, mtab_path);
-        goto error;
-    }
-
-    while ((entry = getmntent(file))) {
-        if (entry == NULL) {
-            PyErr_Format(PyExc_RuntimeError, "getmntent() syscall failed");
-            goto error;
-        }
-        py_dev = PyUnicode_DecodeFSDefault(entry->mnt_fsname);
-        if (! py_dev)
-            goto error;
-        py_mountp = PyUnicode_DecodeFSDefault(entry->mnt_dir);
-        if (! py_mountp)
-            goto error;
-        py_tuple = Py_BuildValue("(OOss)",
-                                 py_dev,             // device
-                                 py_mountp,          // mount point
-                                 entry->mnt_type,    // fs type
-                                 entry->mnt_opts);   // options
-        if (! py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_dev);
-        Py_CLEAR(py_mountp);
-        Py_CLEAR(py_tuple);
-    }
-    endmntent(file);
-    return py_retlist;
-
-error:
-    if (file != NULL)
-        endmntent(file);
-    Py_XDECREF(py_dev);
-    Py_XDECREF(py_mountp);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-/*
- * A wrapper around sysinfo(), return system memory usage statistics.
- */
-static PyObject *
-psutil_linux_sysinfo(PyObject *self, PyObject *args) {
-    struct sysinfo info;
-
-    if (sysinfo(&info) != 0)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    // note: boot time might also be determined from here
-    return Py_BuildValue(
-        "(kkkkkkI)",
-        info.totalram,  // total
-        info.freeram,  // free
-        info.bufferram, // buffer
-        info.sharedram, // shared
-        info.totalswap, // swap tot
-        info.freeswap,  // swap free
-        info.mem_unit  // multiplier
-    );
-}
-
-
-/*
- * Return process CPU affinity as a Python list
- */
-#ifdef PSUTIL_HAVE_CPU_AFFINITY
-
-static PyObject *
-psutil_proc_cpu_affinity_get(PyObject *self, PyObject *args) {
-    int cpu, ncpus, count, cpucount_s;
-    pid_t pid;
-    size_t setsize;
-    cpu_set_t *mask = NULL;
-    PyObject *py_list = NULL;
-
-    if (!PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    ncpus = NCPUS_START;
-    while (1) {
-        setsize = CPU_ALLOC_SIZE(ncpus);
-        mask = CPU_ALLOC(ncpus);
-        if (mask == NULL) {
-            psutil_debug("CPU_ALLOC() failed");
-            return PyErr_NoMemory();
-        }
-        if (sched_getaffinity(pid, setsize, mask) == 0)
-            break;
-        CPU_FREE(mask);
-        if (errno != EINVAL)
-            return PyErr_SetFromErrno(PyExc_OSError);
-        if (ncpus > INT_MAX / 2) {
-            PyErr_SetString(PyExc_OverflowError, "could not allocate "
-                            "a large enough CPU set");
-            return NULL;
-        }
-        ncpus = ncpus * 2;
-    }
-
-    py_list = PyList_New(0);
-    if (py_list == NULL)
-        goto error;
-
-    cpucount_s = CPU_COUNT_S(setsize, mask);
-    for (cpu = 0, count = cpucount_s; count; cpu++) {
-        if (CPU_ISSET_S(cpu, setsize, mask)) {
-#if PY_MAJOR_VERSION >= 3
-            PyObject *cpu_num = PyLong_FromLong(cpu);
-#else
-            PyObject *cpu_num = PyInt_FromLong(cpu);
-#endif
-            if (cpu_num == NULL)
-                goto error;
-            if (PyList_Append(py_list, cpu_num)) {
-                Py_DECREF(cpu_num);
-                goto error;
-            }
-            Py_DECREF(cpu_num);
-            --count;
-        }
-    }
-    CPU_FREE(mask);
-    return py_list;
-
-error:
-    if (mask)
-        CPU_FREE(mask);
-    Py_XDECREF(py_list);
-    return NULL;
-}
-
-
-/*
- * Set process CPU affinity; expects a bitmask
- */
-static PyObject *
-psutil_proc_cpu_affinity_set(PyObject *self, PyObject *args) {
-    cpu_set_t cpu_set;
-    size_t len;
-    pid_t pid;
-    int i, seq_len;
-    PyObject *py_cpu_set;
-    PyObject *py_cpu_seq = NULL;
-
-    if (!PyArg_ParseTuple(args, _Py_PARSE_PID "O", &pid, &py_cpu_set))
-        return NULL;
-
-    if (!PySequence_Check(py_cpu_set)) {
-        PyErr_Format(PyExc_TypeError, "sequence argument expected, got %s",
-                     Py_TYPE(py_cpu_set)->tp_name);
-        goto error;
-    }
-
-    py_cpu_seq = PySequence_Fast(py_cpu_set, "expected a sequence or integer");
-    if (!py_cpu_seq)
-        goto error;
-    seq_len = PySequence_Fast_GET_SIZE(py_cpu_seq);
-    CPU_ZERO(&cpu_set);
-    for (i = 0; i < seq_len; i++) {
-        PyObject *item = PySequence_Fast_GET_ITEM(py_cpu_seq, i);
-#if PY_MAJOR_VERSION >= 3
-        long value = PyLong_AsLong(item);
-#else
-        long value = PyInt_AsLong(item);
-#endif
-        if ((value == -1) || PyErr_Occurred()) {
-            if (!PyErr_Occurred())
-                PyErr_SetString(PyExc_ValueError, "invalid CPU value");
-            goto error;
-        }
-        CPU_SET(value, &cpu_set);
-    }
-
-    len = sizeof(cpu_set);
-    if (sched_setaffinity(pid, len, &cpu_set)) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    Py_DECREF(py_cpu_seq);
-    Py_RETURN_NONE;
-
-error:
-    if (py_cpu_seq != NULL)
-        Py_DECREF(py_cpu_seq);
-    return NULL;
-}
-#endif  /* PSUTIL_HAVE_CPU_AFFINITY */
-
-
-/*
- * Return currently connected users as a list of tuples.
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    struct utmp *ut;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_username = NULL;
-    PyObject *py_tty = NULL;
-    PyObject *py_hostname = NULL;
-    PyObject *py_user_proc = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    setutent();
-    while (NULL != (ut = getutent())) {
-        py_tuple = NULL;
-        py_user_proc = NULL;
-        if (ut->ut_type == USER_PROCESS)
-            py_user_proc = Py_True;
-        else
-            py_user_proc = Py_False;
-        py_username = PyUnicode_DecodeFSDefault(ut->ut_user);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(ut->ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(ut->ut_host);
-        if (! py_hostname)
-            goto error;
-
-        py_tuple = Py_BuildValue(
-            "OOOfO" _Py_PARSE_PID,
-            py_username,              // username
-            py_tty,                   // tty
-            py_hostname,              // hostname
-            (float)ut->ut_tv.tv_sec,  // tstamp
-            py_user_proc,             // (bool) user process
-            ut->ut_pid                // process id
-        );
-        if (! py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-    }
-    endutent();
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tty);
-    Py_XDECREF(py_hostname);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    endutent();
-    return NULL;
-}
-
-
-/*
- * Return stats about a particular network
- * interface.  References:
- * https://github.com/dpaleino/wicd/blob/master/wicd/backends/be-ioctl.py
- * http://www.i-scream.org/libstatgrab/
- */
-static PyObject*
-psutil_net_if_duplex_speed(PyObject* self, PyObject* args) {
-    char *nic_name;
-    int sock = 0;
-    int ret;
-    int duplex;
-    int speed;
-    struct ifreq ifr;
-    struct ethtool_cmd ethcmd;
-    PyObject *py_retlist = NULL;
-
-    if (! PyArg_ParseTuple(args, "s", &nic_name))
-        return NULL;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1)
-        return PyErr_SetFromOSErrnoWithSyscall("socket()");
-    strncpy(ifr.ifr_name, nic_name, sizeof(ifr.ifr_name));
-
-    // duplex and speed
-    memset(&ethcmd, 0, sizeof ethcmd);
-    ethcmd.cmd = ETHTOOL_GSET;
-    ifr.ifr_data = (void *)&ethcmd;
-    ret = ioctl(sock, SIOCETHTOOL, &ifr);
-
-    if (ret != -1) {
-        duplex = ethcmd.duplex;
-        speed = ethcmd.speed;
-    }
-    else {
-        if ((errno == EOPNOTSUPP) || (errno == EINVAL)) {
-            // EOPNOTSUPP may occur in case of wi-fi cards.
-            // For EINVAL see:
-            // https://github.com/giampaolo/psutil/issues/797
-            //     #issuecomment-202999532
-            duplex = DUPLEX_UNKNOWN;
-            speed = 0;
-        }
-        else {
-            PyErr_SetFromOSErrnoWithSyscall("ioctl(SIOCETHTOOL)");
-            goto error;
-        }
-    }
-
-    py_retlist = Py_BuildValue("[ii]", duplex, speed);
-    if (!py_retlist)
-        goto error;
-    close(sock);
-    return py_retlist;
-
-error:
-    if (sock != -1)
-        close(sock);
-    return NULL;
-}
-
-
-/*
- * Module init.
- */
-
-static PyMethodDef mod_methods[] = {
-    // --- per-process functions
-
-#if PSUTIL_HAVE_IOPRIO
-    {"proc_ioprio_get", psutil_proc_ioprio_get, METH_VARARGS,
-     "Get process I/O priority"},
-    {"proc_ioprio_set", psutil_proc_ioprio_set, METH_VARARGS,
-     "Set process I/O priority"},
-#endif
-#ifdef PSUTIL_HAVE_CPU_AFFINITY
-    {"proc_cpu_affinity_get", psutil_proc_cpu_affinity_get, METH_VARARGS,
-     "Return process CPU affinity as a Python long (the bitmask)."},
-    {"proc_cpu_affinity_set", psutil_proc_cpu_affinity_set, METH_VARARGS,
-     "Set process CPU affinity; expects a bitmask."},
-#endif
-
-    // --- system related functions
-
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return disk mounted partitions as a list of tuples including "
-     "device, mount point and filesystem type"},
-    {"users", psutil_users, METH_VARARGS,
-     "Return currently connected users as a list of tuples"},
-    {"net_if_duplex_speed", psutil_net_if_duplex_speed, METH_VARARGS,
-     "Return duplex and speed info about a NIC"},
-
-    // --- linux specific
-
-    {"linux_sysinfo", psutil_linux_sysinfo, METH_VARARGS,
-     "A wrapper around sysinfo(), return system memory usage statistics"},
-#if PSUTIL_HAVE_PRLIMIT
-    {"linux_prlimit", psutil_linux_prlimit, METH_VARARGS,
-     "Get or set process resource limits."},
-#endif
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-
-#if PY_MAJOR_VERSION >= 3
-    #define INITERR return NULL
-
-    static struct PyModuleDef moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "_psutil_linux",
-        NULL,
-        -1,
-        mod_methods,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-    };
-
-    PyObject *PyInit__psutil_linux(void)
-#else  /* PY_MAJOR_VERSION */
-    #define INITERR return
-
-    void init_psutil_linux(void)
-#endif  /* PY_MAJOR_VERSION */
-{
-    PyObject *v;
-#if PY_MAJOR_VERSION >= 3
-    PyObject *mod = PyModule_Create(&moduledef);
-#else
-    PyObject *mod = Py_InitModule("_psutil_linux", mod_methods);
-#endif
-    if (mod == NULL)
-        INITERR;
-
-    if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION)) INITERR;
-#if PSUTIL_HAVE_PRLIMIT
-    if (PyModule_AddIntConstant(mod, "RLIMIT_AS", RLIMIT_AS)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_CORE", RLIMIT_CORE)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_CPU", RLIMIT_CPU)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_DATA", RLIMIT_DATA)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_FSIZE", RLIMIT_FSIZE)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_LOCKS", RLIMIT_LOCKS)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_MEMLOCK", RLIMIT_MEMLOCK)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_NOFILE", RLIMIT_NOFILE)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_NPROC", RLIMIT_NPROC)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_RSS", RLIMIT_RSS)) INITERR;
-    if (PyModule_AddIntConstant(mod, "RLIMIT_STACK", RLIMIT_STACK)) INITERR;
-
-#if defined(HAVE_LONG_LONG)
-    if (sizeof(RLIM_INFINITY) > sizeof(long)) {
-        v = PyLong_FromLongLong((PY_LONG_LONG) RLIM_INFINITY);
-    } else
-#endif
-    {
-        v = PyLong_FromLong((long) RLIM_INFINITY);
-    }
-    if (v) {
-        PyModule_AddObject(mod, "RLIM_INFINITY", v);
-    }
-
-#ifdef RLIMIT_MSGQUEUE
-    if (PyModule_AddIntConstant(mod, "RLIMIT_MSGQUEUE", RLIMIT_MSGQUEUE)) INITERR;
-#endif
-#ifdef RLIMIT_NICE
-    if (PyModule_AddIntConstant(mod, "RLIMIT_NICE", RLIMIT_NICE)) INITERR;
-#endif
-#ifdef RLIMIT_RTPRIO
-    if (PyModule_AddIntConstant(mod, "RLIMIT_RTPRIO", RLIMIT_RTPRIO)) INITERR;
-#endif
-#ifdef RLIMIT_RTTIME
-    if (PyModule_AddIntConstant(mod, "RLIMIT_RTTIME", RLIMIT_RTTIME)) INITERR;
-#endif
-#ifdef RLIMIT_SIGPENDING
-    if (PyModule_AddIntConstant(mod, "RLIMIT_SIGPENDING", RLIMIT_SIGPENDING))
-        INITERR;
-#endif
-#endif
-    if (PyModule_AddIntConstant(mod, "DUPLEX_HALF", DUPLEX_HALF)) INITERR;
-    if (PyModule_AddIntConstant(mod, "DUPLEX_FULL", DUPLEX_FULL)) INITERR;
-    if (PyModule_AddIntConstant(mod, "DUPLEX_UNKNOWN", DUPLEX_UNKNOWN)) INITERR;
-
-    if (mod == NULL)
-        INITERR;
-#if PY_MAJOR_VERSION >= 3
-    return mod;
-#endif
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_osx.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_osx.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_osx.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_osx.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1906 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * macOS platform-specific module methods.
- */
-
-#include <Python.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <utmpx.h>
-#include <sys/sysctl.h>
-#include <sys/vmmeter.h>
-#include <libproc.h>
-#include <sys/proc_info.h>
-#include <netinet/tcp_fsm.h>
-#include <arpa/inet.h>
-#include <net/if_dl.h>
-#include <pwd.h>
-
-#include <mach/mach.h>
-#include <mach/task.h>
-#include <mach/mach_init.h>
-#include <mach/host_info.h>
-#include <mach/mach_host.h>
-#include <mach/mach_traps.h>
-#include <mach/mach_vm.h>
-#include <mach/shared_region.h>
-
-#include <mach-o/loader.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/IOKitLib.h>
-#include <IOKit/storage/IOBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/IOBSD.h>
-#include <IOKit/ps/IOPowerSources.h>
-#include <IOKit/ps/IOPSKeys.h>
-
-#include "_psutil_common.h"
-#include "_psutil_posix.h"
-#include "arch/osx/process_info.h"
-
-
-#define PSUTIL_TV2DOUBLE(t) ((t).tv_sec + (t).tv_usec / 1000000.0)
-
-static PyObject *ZombieProcessError;
-
-
-/*
- * A wrapper around host_statistics() invoked with HOST_VM_INFO.
- */
-int
-psutil_sys_vminfo(vm_statistics_data_t *vmstat) {
-    kern_return_t ret;
-    mach_msg_type_number_t count = sizeof(*vmstat) / sizeof(integer_t);
-    mach_port_t mport = mach_host_self();
-
-    ret = host_statistics(mport, HOST_VM_INFO, (host_info_t)vmstat, &count);
-    if (ret != KERN_SUCCESS) {
-        PyErr_Format(
-            PyExc_RuntimeError,
-            "host_statistics(HOST_VM_INFO) syscall failed: %s",
-            mach_error_string(ret));
-        return 0;
-    }
-    mach_port_deallocate(mach_task_self(), mport);
-    return 1;
-}
-
-
-/*
- * A wrapper around task_for_pid() which sucks big time:
- * - it's not documented
- * - errno is set only sometimes
- * - sometimes errno is ENOENT (?!?)
- * - for PIDs != getpid() or PIDs which are not members of the procmod
- *   it requires root
- * As such we can only guess what the heck went wrong and fail either
- * with NoSuchProcess, ZombieProcessError or giveup with AccessDenied.
- * Here's some history:
- * https://github.com/giampaolo/psutil/issues/1181
- * https://github.com/giampaolo/psutil/issues/1209
- * https://github.com/giampaolo/psutil/issues/1291#issuecomment-396062519
- */
-int
-psutil_task_for_pid(pid_t pid, mach_port_t *task)
-{
-    // See: https://github.com/giampaolo/psutil/issues/1181
-    kern_return_t err = KERN_SUCCESS;
-
-    err = task_for_pid(mach_task_self(), pid, task);
-    if (err != KERN_SUCCESS) {
-        if (psutil_pid_exists(pid) == 0)
-            NoSuchProcess("task_for_pid");
-        else if (psutil_is_zombie(pid) == 1)
-            PyErr_SetString(ZombieProcessError, "task_for_pid() failed");
-        else {
-            psutil_debug(
-                "task_for_pid() failed (pid=%ld, err=%i, errno=%i, msg='%s'); "
-                "setting AccessDenied()",
-                pid, err, errno, mach_error_string(err));
-            AccessDenied("task_for_pid");
-        }
-        return 1;
-    }
-    return 0;
-}
-
-
-/*
- * Return a Python list of all the PIDs running on the system.
- */
-static PyObject *
-psutil_pids(PyObject *self, PyObject *args) {
-    kinfo_proc *proclist = NULL;
-    kinfo_proc *orig_address = NULL;
-    size_t num_processes;
-    size_t idx;
-    PyObject *py_pid = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (psutil_get_proc_list(&proclist, &num_processes) != 0)
-        goto error;
-
-    // save the address of proclist so we can free it later
-    orig_address = proclist;
-    for (idx = 0; idx < num_processes; idx++) {
-        py_pid = PyLong_FromPid(proclist->kp_proc.p_pid);
-        if (! py_pid)
-            goto error;
-        if (PyList_Append(py_retlist, py_pid))
-            goto error;
-        Py_CLEAR(py_pid);
-        proclist++;
-    }
-    free(orig_address);
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_pid);
-    Py_DECREF(py_retlist);
-    if (orig_address != NULL)
-        free(orig_address);
-    return NULL;
-}
-
-
-/*
- * Return multiple process info as a Python tuple in one shot by
- * using sysctl() and filling up a kinfo_proc struct.
- * It should be possible to do this for all processes without
- * incurring into permission (EPERM) errors.
- * This will also succeed for zombie processes returning correct
- * information.
- */
-static PyObject *
-psutil_proc_kinfo_oneshot(PyObject *self, PyObject *args) {
-    pid_t pid;
-    struct kinfo_proc kp;
-    PyObject *py_name;
-    PyObject *py_retlist;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_get_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-
-    py_name = PyUnicode_DecodeFSDefault(kp.kp_proc.p_comm);
-    if (! py_name) {
-        // Likely a decoding error. We don't want to fail the whole
-        // operation. The python module may retry with proc_name().
-        PyErr_Clear();
-        py_name = Py_None;
-    }
-
-    py_retlist = Py_BuildValue(
-        _Py_PARSE_PID "llllllidiO",
-        kp.kp_eproc.e_ppid,                        // (pid_t) ppid
-        (long)kp.kp_eproc.e_pcred.p_ruid,          // (long) real uid
-        (long)kp.kp_eproc.e_ucred.cr_uid,          // (long) effective uid
-        (long)kp.kp_eproc.e_pcred.p_svuid,         // (long) saved uid
-        (long)kp.kp_eproc.e_pcred.p_rgid,          // (long) real gid
-        (long)kp.kp_eproc.e_ucred.cr_groups[0],    // (long) effective gid
-        (long)kp.kp_eproc.e_pcred.p_svgid,         // (long) saved gid
-        kp.kp_eproc.e_tdev,                        // (int) tty nr
-        PSUTIL_TV2DOUBLE(kp.kp_proc.p_starttime),  // (double) create time
-        (int)kp.kp_proc.p_stat,                    // (int) status
-        py_name                                    // (pystr) name
-    );
-
-    if (py_retlist != NULL) {
-        // XXX shall we decref() also in case of Py_BuildValue() error?
-        Py_DECREF(py_name);
-    }
-    return py_retlist;
-}
-
-
-/*
- * Return multiple process info as a Python tuple in one shot by
- * using proc_pidinfo(PROC_PIDTASKINFO) and filling a proc_taskinfo
- * struct.
- * Contrarily from proc_kinfo above this function will fail with
- * EACCES for PIDs owned by another user and with ESRCH for zombie
- * processes.
- */
-static PyObject *
-psutil_proc_pidtaskinfo_oneshot(PyObject *self, PyObject *args) {
-    pid_t pid;
-    struct proc_taskinfo pti;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_proc_pidinfo(pid, PROC_PIDTASKINFO, 0, &pti, sizeof(pti)) <= 0)
-        return NULL;
-
-    return Py_BuildValue(
-        "(ddKKkkkk)",
-        (float)pti.pti_total_user / 1000000000.0,     // (float) cpu user time
-        (float)pti.pti_total_system / 1000000000.0,   // (float) cpu sys time
-        // Note about memory: determining other mem stats on macOS is a mess:
-        // http://www.opensource.apple.com/source/top/top-67/libtop.c?txt
-        // I just give up.
-        // struct proc_regioninfo pri;
-        // psutil_proc_pidinfo(pid, PROC_PIDREGIONINFO, 0, &pri, sizeof(pri))
-        pti.pti_resident_size,  // (uns long long) rss
-        pti.pti_virtual_size,   // (uns long long) vms
-        pti.pti_faults,         // (uns long) number of page faults (pages)
-        pti.pti_pageins,        // (uns long) number of actual pageins (pages)
-        pti.pti_threadnum,      // (uns long) num threads
-        // Unvoluntary value seems not to be available;
-        // pti.pti_csw probably refers to the sum of the two;
-        // getrusage() numbers seems to confirm this theory.
-        pti.pti_csw             // (uns long) voluntary ctx switches
-    );
-}
-
-
-/*
- * Return process name from kinfo_proc as a Python string.
- */
-static PyObject *
-psutil_proc_name(PyObject *self, PyObject *args) {
-    pid_t pid;
-    struct kinfo_proc kp;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (psutil_get_kinfo_proc(pid, &kp) == -1)
-        return NULL;
-    return PyUnicode_DecodeFSDefault(kp.kp_proc.p_comm);
-}
-
-
-/*
- * Return process current working directory.
- * Raises NSP in case of zombie process.
- */
-static PyObject *
-psutil_proc_cwd(PyObject *self, PyObject *args) {
-    pid_t pid;
-    struct proc_vnodepathinfo pathinfo;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    if (psutil_proc_pidinfo(
-            pid, PROC_PIDVNODEPATHINFO, 0, &pathinfo, sizeof(pathinfo)) <= 0)
-    {
-        return NULL;
-    }
-
-    return PyUnicode_DecodeFSDefault(pathinfo.pvi_cdir.vip_path);
-}
-
-
-/*
- * Return path of the process executable.
- */
-static PyObject *
-psutil_proc_exe(PyObject *self, PyObject *args) {
-    pid_t pid;
-    char buf[PATH_MAX];
-    int ret;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    errno = 0;
-    ret = proc_pidpath(pid, &buf, sizeof(buf));
-    if (ret == 0) {
-        if (pid == 0)
-            AccessDenied("automatically set for PID 0");
-        else
-            psutil_raise_for_pid(pid, "proc_pidpath()");
-        return NULL;
-    }
-    return PyUnicode_DecodeFSDefault(buf);
-}
-
-
-/*
- * Return process cmdline as a Python list of cmdline arguments.
- */
-static PyObject *
-psutil_proc_cmdline(PyObject *self, PyObject *args) {
-    pid_t pid;
-    PyObject *py_retlist = NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    // get the commandline, defined in arch/osx/process_info.c
-    py_retlist = psutil_get_cmdline(pid);
-    return py_retlist;
-}
-
-
-/*
- * Return process environment as a Python string.
- */
-static PyObject *
-psutil_proc_environ(PyObject *self, PyObject *args) {
-    pid_t pid;
-    PyObject *py_retdict = NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    // get the environment block, defined in arch/osx/process_info.c
-    py_retdict = psutil_get_environ(pid);
-    return py_retdict;
-}
-
-
-/*
- * Return the number of logical CPUs in the system.
- * XXX this could be shared with BSD.
- */
-static PyObject *
-psutil_cpu_count_logical(PyObject *self, PyObject *args) {
-    /*
-    int mib[2];
-    int ncpu;
-    size_t len;
-    mib[0] = CTL_HW;
-    mib[1] = HW_NCPU;
-    len = sizeof(ncpu);
-
-    if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1)
-        Py_RETURN_NONE;  // mimic os.cpu_count()
-    else
-        return Py_BuildValue("i", ncpu);
-    */
-    int num;
-    size_t size = sizeof(int);
-
-    if (sysctlbyname("hw.logicalcpu", &num, &size, NULL, 2))
-        Py_RETURN_NONE;  // mimic os.cpu_count()
-    else
-        return Py_BuildValue("i", num);
-}
-
-
-/*
- * Return the number of physical CPUs in the system.
- */
-static PyObject *
-psutil_cpu_count_phys(PyObject *self, PyObject *args) {
-    int num;
-    size_t size = sizeof(int);
-
-    if (sysctlbyname("hw.physicalcpu", &num, &size, NULL, 0))
-        Py_RETURN_NONE;  // mimic os.cpu_count()
-    else
-        return Py_BuildValue("i", num);
-}
-
-
-/*
- * Indicates if the given virtual address on the given architecture is in the
- * shared VM region.
- */
-static bool
-psutil_in_shared_region(mach_vm_address_t addr, cpu_type_t type) {
-    mach_vm_address_t base;
-    mach_vm_address_t size;
-
-    switch (type) {
-        case CPU_TYPE_ARM:
-            base = SHARED_REGION_BASE_ARM;
-            size = SHARED_REGION_SIZE_ARM;
-            break;
-        case CPU_TYPE_I386:
-            base = SHARED_REGION_BASE_I386;
-            size = SHARED_REGION_SIZE_I386;
-            break;
-        case CPU_TYPE_X86_64:
-            base = SHARED_REGION_BASE_X86_64;
-            size = SHARED_REGION_SIZE_X86_64;
-            break;
-        default:
-            return false;
-    }
-
-    return base <= addr && addr < (base + size);
-}
-
-
-/*
- * Returns the USS (unique set size) of the process. Reference:
- * https://dxr.mozilla.org/mozilla-central/source/xpcom/base/
- *     nsMemoryReporterManager.cpp
- */
-static PyObject *
-psutil_proc_memory_uss(PyObject *self, PyObject *args) {
-    pid_t pid;
-    size_t len;
-    cpu_type_t cpu_type;
-    size_t private_pages = 0;
-    mach_vm_size_t size = 0;
-    mach_msg_type_number_t info_count = VM_REGION_TOP_INFO_COUNT;
-    kern_return_t kr;
-    vm_size_t page_size;
-    mach_vm_address_t addr = MACH_VM_MIN_ADDRESS;
-    mach_port_t task = MACH_PORT_NULL;
-    vm_region_top_info_data_t info;
-    mach_port_t object_name;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    if (psutil_task_for_pid(pid, &task) != 0)
-        return NULL;
-
-    len = sizeof(cpu_type);
-    if (sysctlbyname("sysctl.proc_cputype", &cpu_type, &len, NULL, 0) != 0) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('sysctl.proc_cputype')");
-    }
-
-    // Roughly based on libtop_update_vm_regions in
-    // http://www.opensource.apple.com/source/top/top-100.1.2/libtop.c
-    for (addr = 0; ; addr += size) {
-        kr = mach_vm_region(
-            task, &addr, &size, VM_REGION_TOP_INFO, (vm_region_info_t)&info,
-            &info_count, &object_name);
-        if (kr == KERN_INVALID_ADDRESS) {
-            // Done iterating VM regions.
-            break;
-        }
-        else if (kr != KERN_SUCCESS) {
-            PyErr_Format(
-                PyExc_RuntimeError,
-                "mach_vm_region(VM_REGION_TOP_INFO) syscall failed");
-            return NULL;
-        }
-
-        if (psutil_in_shared_region(addr, cpu_type) &&
-                info.share_mode != SM_PRIVATE) {
-            continue;
-        }
-
-        switch (info.share_mode) {
-#ifdef SM_LARGE_PAGE
-            case SM_LARGE_PAGE:
-                // NB: Large pages are not shareable and always resident.
-#endif
-            case SM_PRIVATE:
-                private_pages += info.private_pages_resident;
-                private_pages += info.shared_pages_resident;
-                break;
-            case SM_COW:
-                private_pages += info.private_pages_resident;
-                if (info.ref_count == 1) {
-                    // Treat copy-on-write pages as private if they only
-                    // have one reference.
-                    private_pages += info.shared_pages_resident;
-                }
-                break;
-            case SM_SHARED:
-            default:
-                break;
-        }
-    }
-
-    mach_port_deallocate(mach_task_self(), task);
-
-    if (host_page_size(mach_host_self(), &page_size) != KERN_SUCCESS)
-        page_size = PAGE_SIZE;
-
-    return Py_BuildValue("K", private_pages * page_size);
-}
-
-
-/*
- * Return system virtual memory stats.
- * See:
- * https://opensource.apple.com/source/system_cmds/system_cmds-790/
- *     vm_stat.tproj/vm_stat.c.auto.html
- */
-static PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    int      mib[2];
-    uint64_t total;
-    size_t   len = sizeof(total);
-    vm_statistics_data_t vm;
-    int pagesize = getpagesize();
-    // physical mem
-    mib[0] = CTL_HW;
-    mib[1] = HW_MEMSIZE;
-
-    // This is also available as sysctlbyname("hw.memsize").
-    if (sysctl(mib, 2, &total, &len, NULL, 0)) {
-        if (errno != 0)
-            PyErr_SetFromErrno(PyExc_OSError);
-        else
-            PyErr_Format(
-                PyExc_RuntimeError, "sysctl(HW_MEMSIZE) syscall failed");
-        return NULL;
-    }
-
-    // vm
-    if (!psutil_sys_vminfo(&vm))
-        return NULL;
-
-    return Py_BuildValue(
-        "KKKKKK",
-        total,
-        (unsigned long long) vm.active_count * pagesize,  // active
-        (unsigned long long) vm.inactive_count * pagesize,  // inactive
-        (unsigned long long) vm.wire_count * pagesize,  // wired
-        (unsigned long long) vm.free_count * pagesize,  // free
-        (unsigned long long) vm.speculative_count * pagesize  // speculative
-    );
-}
-
-
-/*
- * Return stats about swap memory.
- */
-static PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-    int mib[2];
-    size_t size;
-    struct xsw_usage totals;
-    vm_statistics_data_t vmstat;
-    int pagesize = getpagesize();
-
-    mib[0] = CTL_VM;
-    mib[1] = VM_SWAPUSAGE;
-    size = sizeof(totals);
-    if (sysctl(mib, 2, &totals, &size, NULL, 0) == -1) {
-        if (errno != 0)
-            PyErr_SetFromErrno(PyExc_OSError);
-        else
-            PyErr_Format(
-                PyExc_RuntimeError, "sysctl(VM_SWAPUSAGE) syscall failed");
-        return NULL;
-    }
-    if (!psutil_sys_vminfo(&vmstat))
-        return NULL;
-
-    return Py_BuildValue(
-        "LLLKK",
-        totals.xsu_total,
-        totals.xsu_used,
-        totals.xsu_avail,
-        (unsigned long long)vmstat.pageins * pagesize,
-        (unsigned long long)vmstat.pageouts * pagesize);
-}
-
-
-/*
- * Return a Python tuple representing user, kernel and idle CPU times
- */
-static PyObject *
-psutil_cpu_times(PyObject *self, PyObject *args) {
-    mach_msg_type_number_t count = HOST_CPU_LOAD_INFO_COUNT;
-    kern_return_t error;
-    host_cpu_load_info_data_t r_load;
-
-    mach_port_t host_port = mach_host_self();
-    error = host_statistics(host_port, HOST_CPU_LOAD_INFO,
-                            (host_info_t)&r_load, &count);
-    if (error != KERN_SUCCESS) {
-        return PyErr_Format(
-            PyExc_RuntimeError,
-            "host_statistics(HOST_CPU_LOAD_INFO) syscall failed: %s",
-            mach_error_string(error));
-    }
-    mach_port_deallocate(mach_task_self(), host_port);
-
-    return Py_BuildValue(
-        "(dddd)",
-        (double)r_load.cpu_ticks[CPU_STATE_USER] / CLK_TCK,
-        (double)r_load.cpu_ticks[CPU_STATE_NICE] / CLK_TCK,
-        (double)r_load.cpu_ticks[CPU_STATE_SYSTEM] / CLK_TCK,
-        (double)r_load.cpu_ticks[CPU_STATE_IDLE] / CLK_TCK
-    );
-}
-
-
-/*
- * Return a Python list of tuple representing per-cpu times
- */
-static PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    natural_t cpu_count;
-    natural_t i;
-    processor_info_array_t info_array;
-    mach_msg_type_number_t info_count;
-    kern_return_t error;
-    processor_cpu_load_info_data_t *cpu_load_info = NULL;
-    int ret;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_cputime = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    mach_port_t host_port = mach_host_self();
-    error = host_processor_info(host_port, PROCESSOR_CPU_LOAD_INFO,
-                                &cpu_count, &info_array, &info_count);
-    if (error != KERN_SUCCESS) {
-        PyErr_Format(
-            PyExc_RuntimeError,
-            "host_processor_info(PROCESSOR_CPU_LOAD_INFO) syscall failed: %s",
-             mach_error_string(error));
-        goto error;
-    }
-    mach_port_deallocate(mach_task_self(), host_port);
-
-    cpu_load_info = (processor_cpu_load_info_data_t *) info_array;
-
-    for (i = 0; i < cpu_count; i++) {
-        py_cputime = Py_BuildValue(
-            "(dddd)",
-            (double)cpu_load_info[i].cpu_ticks[CPU_STATE_USER] / CLK_TCK,
-            (double)cpu_load_info[i].cpu_ticks[CPU_STATE_NICE] / CLK_TCK,
-            (double)cpu_load_info[i].cpu_ticks[CPU_STATE_SYSTEM] / CLK_TCK,
-            (double)cpu_load_info[i].cpu_ticks[CPU_STATE_IDLE] / CLK_TCK
-        );
-        if (!py_cputime)
-            goto error;
-        if (PyList_Append(py_retlist, py_cputime))
-            goto error;
-        Py_CLEAR(py_cputime);
-    }
-
-    ret = vm_deallocate(mach_task_self(), (vm_address_t)info_array,
-                        info_count * sizeof(int));
-    if (ret != KERN_SUCCESS)
-        PyErr_WarnEx(PyExc_RuntimeWarning, "vm_deallocate() failed", 2);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    if (cpu_load_info != NULL) {
-        ret = vm_deallocate(mach_task_self(), (vm_address_t)info_array,
-                            info_count * sizeof(int));
-        if (ret != KERN_SUCCESS)
-            PyErr_WarnEx(PyExc_RuntimeWarning, "vm_deallocate() failed", 2);
-    }
-    return NULL;
-}
-
-
-/*
- * Retrieve CPU frequency.
- */
-static PyObject *
-psutil_cpu_freq(PyObject *self, PyObject *args) {
-    int64_t curr;
-    int64_t min;
-    int64_t max;
-    size_t size = sizeof(int64_t);
-
-    if (sysctlbyname("hw.cpufrequency", &curr, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('hw.cpufrequency')");
-    }
-    if (sysctlbyname("hw.cpufrequency_min", &min, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('hw.cpufrequency_min')");
-    }
-    if (sysctlbyname("hw.cpufrequency_max", &max, &size, NULL, 0)) {
-        return PyErr_SetFromOSErrnoWithSyscall(
-            "sysctlbyname('hw.cpufrequency_max')");
-    }
-
-    return Py_BuildValue(
-        "KKK",
-        curr / 1000 / 1000,
-        min / 1000 / 1000,
-        max / 1000 / 1000);
-}
-
-
-/*
- * Return a Python float indicating the system boot time expressed in
- * seconds since the epoch.
- */
-static PyObject *
-psutil_boot_time(PyObject *self, PyObject *args) {
-    // fetch sysctl "kern.boottime"
-    static int request[2] = { CTL_KERN, KERN_BOOTTIME };
-    struct timeval result;
-    size_t result_len = sizeof result;
-    time_t boot_time = 0;
-
-    if (sysctl(request, 2, &result, &result_len, NULL, 0) == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    boot_time = result.tv_sec;
-    return Py_BuildValue("f", (float)boot_time);
-}
-
-
-/*
- * Return a list of tuples including device, mount point and fs type
- * for all partitions mounted on the system.
- */
-static PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    int num;
-    int i;
-    int len;
-    uint64_t flags;
-    char opts[400];
-    struct statfs *fs = NULL;
-    PyObject *py_dev = NULL;
-    PyObject *py_mountp = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    // get the number of mount points
-    Py_BEGIN_ALLOW_THREADS
-    num = getfsstat(NULL, 0, MNT_NOWAIT);
-    Py_END_ALLOW_THREADS
-    if (num == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    len = sizeof(*fs) * num;
-    fs = malloc(len);
-    if (fs == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    Py_BEGIN_ALLOW_THREADS
-    num = getfsstat(fs, len, MNT_NOWAIT);
-    Py_END_ALLOW_THREADS
-    if (num == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (i = 0; i < num; i++) {
-        opts[0] = 0;
-        flags = fs[i].f_flags;
-
-        // see sys/mount.h
-        if (flags & MNT_RDONLY)
-            strlcat(opts, "ro", sizeof(opts));
-        else
-            strlcat(opts, "rw", sizeof(opts));
-        if (flags & MNT_SYNCHRONOUS)
-            strlcat(opts, ",sync", sizeof(opts));
-        if (flags & MNT_NOEXEC)
-            strlcat(opts, ",noexec", sizeof(opts));
-        if (flags & MNT_NOSUID)
-            strlcat(opts, ",nosuid", sizeof(opts));
-        if (flags & MNT_UNION)
-            strlcat(opts, ",union", sizeof(opts));
-        if (flags & MNT_ASYNC)
-            strlcat(opts, ",async", sizeof(opts));
-        if (flags & MNT_EXPORTED)
-            strlcat(opts, ",exported", sizeof(opts));
-        if (flags & MNT_QUARANTINE)
-            strlcat(opts, ",quarantine", sizeof(opts));
-        if (flags & MNT_LOCAL)
-            strlcat(opts, ",local", sizeof(opts));
-        if (flags & MNT_QUOTA)
-            strlcat(opts, ",quota", sizeof(opts));
-        if (flags & MNT_ROOTFS)
-            strlcat(opts, ",rootfs", sizeof(opts));
-        if (flags & MNT_DOVOLFS)
-            strlcat(opts, ",dovolfs", sizeof(opts));
-        if (flags & MNT_DONTBROWSE)
-            strlcat(opts, ",dontbrowse", sizeof(opts));
-        if (flags & MNT_IGNORE_OWNERSHIP)
-            strlcat(opts, ",ignore-ownership", sizeof(opts));
-        if (flags & MNT_AUTOMOUNTED)
-            strlcat(opts, ",automounted", sizeof(opts));
-        if (flags & MNT_JOURNALED)
-            strlcat(opts, ",journaled", sizeof(opts));
-        if (flags & MNT_NOUSERXATTR)
-            strlcat(opts, ",nouserxattr", sizeof(opts));
-        if (flags & MNT_DEFWRITE)
-            strlcat(opts, ",defwrite", sizeof(opts));
-        if (flags & MNT_MULTILABEL)
-            strlcat(opts, ",multilabel", sizeof(opts));
-        if (flags & MNT_NOATIME)
-            strlcat(opts, ",noatime", sizeof(opts));
-        if (flags & MNT_UPDATE)
-            strlcat(opts, ",update", sizeof(opts));
-        if (flags & MNT_RELOAD)
-            strlcat(opts, ",reload", sizeof(opts));
-        if (flags & MNT_FORCE)
-            strlcat(opts, ",force", sizeof(opts));
-        if (flags & MNT_CMDFLAGS)
-            strlcat(opts, ",cmdflags", sizeof(opts));
-
-        py_dev = PyUnicode_DecodeFSDefault(fs[i].f_mntfromname);
-        if (! py_dev)
-            goto error;
-        py_mountp = PyUnicode_DecodeFSDefault(fs[i].f_mntonname);
-        if (! py_mountp)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOss)",
-            py_dev,               // device
-            py_mountp,            // mount point
-            fs[i].f_fstypename,   // fs type
-            opts);                // options
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_dev);
-        Py_CLEAR(py_mountp);
-        Py_CLEAR(py_tuple);
-    }
-
-    free(fs);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_dev);
-    Py_XDECREF(py_mountp);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (fs != NULL)
-        free(fs);
-    return NULL;
-}
-
-
-/*
- * Return process threads
- */
-static PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int err, ret;
-    kern_return_t kr;
-    unsigned int info_count = TASK_BASIC_INFO_COUNT;
-    mach_port_t task = MACH_PORT_NULL;
-    struct task_basic_info tasks_info;
-    thread_act_port_array_t thread_list = NULL;
-    thread_info_data_t thinfo_basic;
-    thread_basic_info_t basic_info_th;
-    mach_msg_type_number_t thread_count, thread_info_count, j;
-
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-
-    if (psutil_task_for_pid(pid, &task) != 0)
-        goto error;
-
-    info_count = TASK_BASIC_INFO_COUNT;
-    err = task_info(task, TASK_BASIC_INFO, (task_info_t)&tasks_info,
-                    &info_count);
-    if (err != KERN_SUCCESS) {
-        // errcode 4 is "invalid argument" (access denied)
-        if (err == 4) {
-            AccessDenied("task_info");
-        }
-        else {
-            // otherwise throw a runtime error with appropriate error code
-            PyErr_Format(PyExc_RuntimeError,
-                         "task_info(TASK_BASIC_INFO) syscall failed");
-        }
-        goto error;
-    }
-
-    err = task_threads(task, &thread_list, &thread_count);
-    if (err != KERN_SUCCESS) {
-        PyErr_Format(PyExc_RuntimeError, "task_threads() syscall failed");
-        goto error;
-    }
-
-    for (j = 0; j < thread_count; j++) {
-        thread_info_count = THREAD_INFO_MAX;
-        kr = thread_info(thread_list[j], THREAD_BASIC_INFO,
-                         (thread_info_t)thinfo_basic, &thread_info_count);
-        if (kr != KERN_SUCCESS) {
-            PyErr_Format(PyExc_RuntimeError,
-                         "thread_info(THREAD_BASIC_INFO) syscall failed");
-            goto error;
-        }
-
-        basic_info_th = (thread_basic_info_t)thinfo_basic;
-        py_tuple = Py_BuildValue(
-            "Iff",
-            j + 1,
-            basic_info_th->user_time.seconds + \
-                (float)basic_info_th->user_time.microseconds / 1000000.0,
-            basic_info_th->system_time.seconds + \
-                (float)basic_info_th->system_time.microseconds / 1000000.0
-        );
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-    }
-
-    ret = vm_deallocate(task, (vm_address_t)thread_list,
-                        thread_count * sizeof(int));
-    if (ret != KERN_SUCCESS)
-        PyErr_WarnEx(PyExc_RuntimeWarning, "vm_deallocate() failed", 2);
-
-    mach_port_deallocate(mach_task_self(), task);
-
-    return py_retlist;
-
-error:
-    if (task != MACH_PORT_NULL)
-        mach_port_deallocate(mach_task_self(), task);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (thread_list != NULL) {
-        ret = vm_deallocate(task, (vm_address_t)thread_list,
-                            thread_count * sizeof(int));
-        if (ret != KERN_SUCCESS)
-            PyErr_WarnEx(PyExc_RuntimeWarning, "vm_deallocate() failed", 2);
-    }
-    return NULL;
-}
-
-
-/*
- * Return process open files as a Python tuple.
- * References:
- * - lsof source code: http://goo.gl/SYW79 and http://goo.gl/m78fd
- * - /usr/include/sys/proc_info.h
- */
-static PyObject *
-psutil_proc_open_files(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int pidinfo_result;
-    int iterations;
-    int i;
-    unsigned long nb;
-
-    struct proc_fdinfo *fds_pointer = NULL;
-    struct proc_fdinfo *fdp_pointer;
-    struct vnode_fdinfowithpath vi;
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_path = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-
-    pidinfo_result = psutil_proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);
-    if (pidinfo_result <= 0)
-        goto error;
-
-    fds_pointer = malloc(pidinfo_result);
-    if (fds_pointer == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-    pidinfo_result = psutil_proc_pidinfo(
-        pid, PROC_PIDLISTFDS, 0, fds_pointer, pidinfo_result);
-    if (pidinfo_result <= 0)
-        goto error;
-
-    iterations = (pidinfo_result / PROC_PIDLISTFD_SIZE);
-
-    for (i = 0; i < iterations; i++) {
-        fdp_pointer = &fds_pointer[i];
-
-        if (fdp_pointer->proc_fdtype == PROX_FDTYPE_VNODE) {
-            errno = 0;
-            nb = proc_pidfdinfo((pid_t)pid,
-                                fdp_pointer->proc_fd,
-                                PROC_PIDFDVNODEPATHINFO,
-                                &vi,
-                                sizeof(vi));
-
-            // --- errors checking
-            if ((nb <= 0) || nb < sizeof(vi)) {
-                if ((errno == ENOENT) || (errno == EBADF)) {
-                    // no such file or directory or bad file descriptor;
-                    // let's assume the file has been closed or removed
-                    continue;
-                }
-                else {
-                    psutil_raise_for_pid(
-                        pid, "proc_pidinfo(PROC_PIDFDVNODEPATHINFO)");
-                    goto error;
-                }
-            }
-            // --- /errors checking
-
-            // --- construct python list
-            py_path = PyUnicode_DecodeFSDefault(vi.pvip.vip_path);
-            if (! py_path)
-                goto error;
-            py_tuple = Py_BuildValue(
-                "(Oi)",
-                py_path,
-                (int)fdp_pointer->proc_fd);
-            if (!py_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_CLEAR(py_tuple);
-            Py_CLEAR(py_path);
-            // --- /construct python list
-        }
-    }
-
-    free(fds_pointer);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_path);
-    Py_DECREF(py_retlist);
-    if (fds_pointer != NULL)
-        free(fds_pointer);
-    return NULL;  // exception has already been set earlier
-}
-
-
-/*
- * Return process TCP and UDP connections as a list of tuples.
- * Raises NSP in case of zombie process.
- * References:
- * - lsof source code: http://goo.gl/SYW79 and http://goo.gl/wNrC0
- * - /usr/include/sys/proc_info.h
- */
-static PyObject *
-psutil_proc_connections(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int pidinfo_result;
-    int iterations;
-    int i;
-    unsigned long nb;
-
-    struct proc_fdinfo *fds_pointer = NULL;
-    struct proc_fdinfo *fdp_pointer;
-    struct socket_fdinfo si;
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-    PyObject *py_af_filter = NULL;
-    PyObject *py_type_filter = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "OO", &pid, &py_af_filter,
-                           &py_type_filter)) {
-        goto error;
-    }
-
-    if (!PySequence_Check(py_af_filter) || !PySequence_Check(py_type_filter)) {
-        PyErr_SetString(PyExc_TypeError, "arg 2 or 3 is not a sequence");
-        goto error;
-    }
-
-    if (pid == 0)
-        return py_retlist;
-    pidinfo_result = psutil_proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);
-    if (pidinfo_result <= 0)
-        goto error;
-
-    fds_pointer = malloc(pidinfo_result);
-    if (fds_pointer == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    pidinfo_result = psutil_proc_pidinfo(
-        pid, PROC_PIDLISTFDS, 0, fds_pointer, pidinfo_result);
-    if (pidinfo_result <= 0)
-        goto error;
-
-    iterations = (pidinfo_result / PROC_PIDLISTFD_SIZE);
-    for (i = 0; i < iterations; i++) {
-        py_tuple = NULL;
-        py_laddr = NULL;
-        py_raddr = NULL;
-        fdp_pointer = &fds_pointer[i];
-
-        if (fdp_pointer->proc_fdtype == PROX_FDTYPE_SOCKET) {
-            errno = 0;
-            nb = proc_pidfdinfo(pid, fdp_pointer->proc_fd,
-                                PROC_PIDFDSOCKETINFO, &si, sizeof(si));
-
-            // --- errors checking
-            if ((nb <= 0) || (nb < sizeof(si))) {
-                if (errno == EBADF) {
-                    // let's assume socket has been closed
-                    continue;
-                }
-                else {
-                    psutil_raise_for_pid(
-                        pid, "proc_pidinfo(PROC_PIDFDSOCKETINFO)");
-                    goto error;
-                }
-            }
-            // --- /errors checking
-
-            //
-            int fd, family, type, lport, rport, state;
-            char lip[200], rip[200];
-            int inseq;
-            PyObject *py_family;
-            PyObject *py_type;
-
-            fd = (int)fdp_pointer->proc_fd;
-            family = si.psi.soi_family;
-            type = si.psi.soi_type;
-
-            // apply filters
-            py_family = PyLong_FromLong((long)family);
-            inseq = PySequence_Contains(py_af_filter, py_family);
-            Py_DECREF(py_family);
-            if (inseq == 0)
-                continue;
-            py_type = PyLong_FromLong((long)type);
-            inseq = PySequence_Contains(py_type_filter, py_type);
-            Py_DECREF(py_type);
-            if (inseq == 0)
-                continue;
-
-            if (errno != 0) {
-                PyErr_SetFromErrno(PyExc_OSError);
-                goto error;
-            }
-
-            if ((family == AF_INET) || (family == AF_INET6)) {
-                if (family == AF_INET) {
-                    inet_ntop(AF_INET,
-                              &si.psi.soi_proto.pri_tcp.tcpsi_ini. \
-                                  insi_laddr.ina_46.i46a_addr4,
-                              lip,
-                              sizeof(lip));
-                    inet_ntop(AF_INET,
-                              &si.psi.soi_proto.pri_tcp.tcpsi_ini.insi_faddr. \
-                                  ina_46.i46a_addr4,
-                              rip,
-                              sizeof(rip));
-                }
-                else {
-                    inet_ntop(AF_INET6,
-                              &si.psi.soi_proto.pri_tcp.tcpsi_ini. \
-                                  insi_laddr.ina_6,
-                              lip, sizeof(lip));
-                    inet_ntop(AF_INET6,
-                              &si.psi.soi_proto.pri_tcp.tcpsi_ini. \
-                                  insi_faddr.ina_6,
-                              rip, sizeof(rip));
-                }
-
-                // check for inet_ntop failures
-                if (errno != 0) {
-                    PyErr_SetFromOSErrnoWithSyscall("inet_ntop()");
-                    goto error;
-                }
-
-                lport = ntohs(si.psi.soi_proto.pri_tcp.tcpsi_ini.insi_lport);
-                rport = ntohs(si.psi.soi_proto.pri_tcp.tcpsi_ini.insi_fport);
-                if (type == SOCK_STREAM)
-                    state = (int)si.psi.soi_proto.pri_tcp.tcpsi_state;
-                else
-                    state = PSUTIL_CONN_NONE;
-
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                if (rport != 0)
-                    py_raddr = Py_BuildValue("(si)", rip, rport);
-                else
-                    py_raddr = Py_BuildValue("()");
-                if (!py_raddr)
-                    goto error;
-
-                // construct the python list
-                py_tuple = Py_BuildValue(
-                    "(iiiNNi)", fd, family, type, py_laddr, py_raddr, state);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-            }
-            else if (family == AF_UNIX) {
-                py_laddr = PyUnicode_DecodeFSDefault(
-                    si.psi.soi_proto.pri_un.unsi_addr.ua_sun.sun_path);
-                if (!py_laddr)
-                    goto error;
-                py_raddr = PyUnicode_DecodeFSDefault(
-                    si.psi.soi_proto.pri_un.unsi_caddr.ua_sun.sun_path);
-                if (!py_raddr)
-                    goto error;
-                // construct the python list
-                py_tuple = Py_BuildValue(
-                    "(iiiOOi)",
-                    fd, family, type,
-                    py_laddr,
-                    py_raddr,
-                    PSUTIL_CONN_NONE);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-                Py_CLEAR(py_laddr);
-                Py_CLEAR(py_raddr);
-            }
-        }
-    }
-
-    free(fds_pointer);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    Py_DECREF(py_retlist);
-    if (fds_pointer != NULL)
-        free(fds_pointer);
-    return NULL;
-}
-
-
-/*
- * Return number of file descriptors opened by process.
- * Raises NSP in case of zombie process.
- */
-static PyObject *
-psutil_proc_num_fds(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int pidinfo_result;
-    int num;
-    struct proc_fdinfo *fds_pointer;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    pidinfo_result = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, NULL, 0);
-    if (pidinfo_result <= 0)
-        return PyErr_SetFromErrno(PyExc_OSError);
-
-    fds_pointer = malloc(pidinfo_result);
-    if (fds_pointer == NULL)
-        return PyErr_NoMemory();
-    pidinfo_result = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fds_pointer,
-                                  pidinfo_result);
-    if (pidinfo_result <= 0) {
-        free(fds_pointer);
-        return PyErr_SetFromErrno(PyExc_OSError);
-    }
-
-    num = (pidinfo_result / PROC_PIDLISTFD_SIZE);
-    free(fds_pointer);
-    return Py_BuildValue("i", num);
-}
-
-
-/*
- * Return a Python list of named tuples with overall network I/O information
- */
-static PyObject *
-psutil_net_io_counters(PyObject *self, PyObject *args) {
-    char *buf = NULL, *lim, *next;
-    struct if_msghdr *ifm;
-    int mib[6];
-    mib[0] = CTL_NET;          // networking subsystem
-    mib[1] = PF_ROUTE;         // type of information
-    mib[2] = 0;                // protocol (IPPROTO_xxx)
-    mib[3] = 0;                // address family
-    mib[4] = NET_RT_IFLIST2;   // operation
-    mib[5] = 0;
-    size_t len;
-    PyObject *py_ifc_info = NULL;
-    PyObject *py_retdict = PyDict_New();
-
-    if (py_retdict == NULL)
-        return NULL;
-
-    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    buf = malloc(len);
-    if (buf == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    lim = buf + len;
-
-    for (next = buf; next < lim; ) {
-        ifm = (struct if_msghdr *)next;
-        next += ifm->ifm_msglen;
-
-        if (ifm->ifm_type == RTM_IFINFO2) {
-            py_ifc_info = NULL;
-            struct if_msghdr2 *if2m = (struct if_msghdr2 *)ifm;
-            struct sockaddr_dl *sdl = (struct sockaddr_dl *)(if2m + 1);
-            char ifc_name[32];
-
-            strncpy(ifc_name, sdl->sdl_data, sdl->sdl_nlen);
-            ifc_name[sdl->sdl_nlen] = 0;
-
-            py_ifc_info = Py_BuildValue(
-                "(KKKKKKKi)",
-                if2m->ifm_data.ifi_obytes,
-                if2m->ifm_data.ifi_ibytes,
-                if2m->ifm_data.ifi_opackets,
-                if2m->ifm_data.ifi_ipackets,
-                if2m->ifm_data.ifi_ierrors,
-                if2m->ifm_data.ifi_oerrors,
-                if2m->ifm_data.ifi_iqdrops,
-                0);  // dropout not supported
-
-            if (!py_ifc_info)
-                goto error;
-            if (PyDict_SetItemString(py_retdict, ifc_name, py_ifc_info))
-                goto error;
-            Py_CLEAR(py_ifc_info);
-        }
-        else {
-            continue;
-        }
-    }
-
-    free(buf);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_ifc_info);
-    Py_DECREF(py_retdict);
-    if (buf != NULL)
-        free(buf);
-    return NULL;
-}
-
-
-/*
- * Return a Python dict of tuples for disk I/O information
- */
-static PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    CFDictionaryRef parent_dict;
-    CFDictionaryRef props_dict;
-    CFDictionaryRef stats_dict;
-    io_registry_entry_t parent;
-    io_registry_entry_t disk;
-    io_iterator_t disk_list;
-    PyObject *py_disk_info = NULL;
-    PyObject *py_retdict = PyDict_New();
-
-    if (py_retdict == NULL)
-        return NULL;
-
-    // Get list of disks
-    if (IOServiceGetMatchingServices(kIOMasterPortDefault,
-                                     IOServiceMatching(kIOMediaClass),
-                                     &disk_list) != kIOReturnSuccess) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "unable to get the list of disks.");
-        goto error;
-    }
-
-    // Iterate over disks
-    while ((disk = IOIteratorNext(disk_list)) != 0) {
-        py_disk_info = NULL;
-        parent_dict = NULL;
-        props_dict = NULL;
-        stats_dict = NULL;
-
-        if (IORegistryEntryGetParentEntry(disk, kIOServicePlane, &parent)
-                != kIOReturnSuccess) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            "unable to get the disk's parent.");
-            IOObjectRelease(disk);
-            goto error;
-        }
-
-        if (IOObjectConformsTo(parent, "IOBlockStorageDriver")) {
-            if (IORegistryEntryCreateCFProperties(
-                    disk,
-                    (CFMutableDictionaryRef *) &parent_dict,
-                    kCFAllocatorDefault,
-                    kNilOptions
-                ) != kIOReturnSuccess)
-            {
-                PyErr_SetString(PyExc_RuntimeError,
-                                "unable to get the parent's properties.");
-                IOObjectRelease(disk);
-                IOObjectRelease(parent);
-                goto error;
-            }
-
-            if (IORegistryEntryCreateCFProperties(
-                    parent,
-                    (CFMutableDictionaryRef *) &props_dict,
-                    kCFAllocatorDefault,
-                    kNilOptions
-                ) != kIOReturnSuccess)
-            {
-                PyErr_SetString(PyExc_RuntimeError,
-                                "unable to get the disk properties.");
-                CFRelease(props_dict);
-                IOObjectRelease(disk);
-                IOObjectRelease(parent);
-                goto error;
-            }
-
-            const int kMaxDiskNameSize = 64;
-            CFStringRef disk_name_ref = (CFStringRef)CFDictionaryGetValue(
-                parent_dict, CFSTR(kIOBSDNameKey));
-            char disk_name[kMaxDiskNameSize];
-
-            CFStringGetCString(disk_name_ref,
-                               disk_name,
-                               kMaxDiskNameSize,
-                               CFStringGetSystemEncoding());
-
-            stats_dict = (CFDictionaryRef)CFDictionaryGetValue(
-                props_dict, CFSTR(kIOBlockStorageDriverStatisticsKey));
-
-            if (stats_dict == NULL) {
-                PyErr_SetString(PyExc_RuntimeError,
-                                "Unable to get disk stats.");
-                goto error;
-            }
-
-            CFNumberRef number;
-            int64_t reads = 0;
-            int64_t writes = 0;
-            int64_t read_bytes = 0;
-            int64_t write_bytes = 0;
-            int64_t read_time = 0;
-            int64_t write_time = 0;
-
-            // Get disk reads/writes
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsReadsKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &reads);
-            }
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsWritesKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &writes);
-            }
-
-            // Get disk bytes read/written
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsBytesReadKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &read_bytes);
-            }
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsBytesWrittenKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &write_bytes);
-            }
-
-            // Get disk time spent reading/writing (nanoseconds)
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsTotalReadTimeKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &read_time);
-            }
-            if ((number = (CFNumberRef)CFDictionaryGetValue(
-                    stats_dict,
-                    CFSTR(kIOBlockStorageDriverStatisticsTotalWriteTimeKey))))
-            {
-                CFNumberGetValue(number, kCFNumberSInt64Type, &write_time);
-            }
-
-            // Read/Write time on macOS comes back in nanoseconds and in psutil
-            // we've standardized on milliseconds so do the conversion.
-            py_disk_info = Py_BuildValue(
-                "(KKKKKK)",
-                reads,
-                writes,
-                read_bytes,
-                write_bytes,
-                read_time / 1000 / 1000,
-                write_time / 1000 / 1000);
-           if (!py_disk_info)
-                goto error;
-            if (PyDict_SetItemString(py_retdict, disk_name, py_disk_info))
-                goto error;
-            Py_CLEAR(py_disk_info);
-
-            CFRelease(parent_dict);
-            IOObjectRelease(parent);
-            CFRelease(props_dict);
-            IOObjectRelease(disk);
-        }
-    }
-
-    IOObjectRelease (disk_list);
-
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    return NULL;
-}
-
-
-/*
- * Return currently connected users as a list of tuples.
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    struct utmpx *utx;
-    PyObject *py_username = NULL;
-    PyObject *py_tty = NULL;
-    PyObject *py_hostname = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    while ((utx = getutxent()) != NULL) {
-        if (utx->ut_type != USER_PROCESS)
-            continue;
-        py_username = PyUnicode_DecodeFSDefault(utx->ut_user);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(utx->ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(utx->ut_host);
-        if (! py_hostname)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOOfi)",
-            py_username,              // username
-            py_tty,                   // tty
-            py_hostname,              // hostname
-            (float)utx->ut_tv.tv_sec, // start time
-            utx->ut_pid               // process id
-        );
-        if (!py_tuple) {
-            endutxent();
-            goto error;
-        }
-        if (PyList_Append(py_retlist, py_tuple)) {
-            endutxent();
-            goto error;
-        }
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-    }
-
-    endutxent();
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tty);
-    Py_XDECREF(py_hostname);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    return NULL;
-}
-
-
-/*
- * Return CPU statistics.
- */
-static PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    struct vmmeter vmstat;
-    kern_return_t ret;
-    mach_msg_type_number_t count = sizeof(vmstat) / sizeof(integer_t);
-    mach_port_t mport = mach_host_self();
-
-    ret = host_statistics(mport, HOST_VM_INFO, (host_info_t)&vmstat, &count);
-    if (ret != KERN_SUCCESS) {
-        PyErr_Format(
-            PyExc_RuntimeError,
-            "host_statistics(HOST_VM_INFO) failed: %s",
-            mach_error_string(ret));
-        return NULL;
-    }
-    mach_port_deallocate(mach_task_self(), mport);
-
-    return Py_BuildValue(
-        "IIIII",
-        vmstat.v_swtch,  // ctx switches
-        vmstat.v_intr,  // interrupts
-        vmstat.v_soft,  // software interrupts
-        vmstat.v_syscall,  // syscalls
-        vmstat.v_trap  // traps
-    );
-}
-
-
-/*
- * Return battery information.
- */
-static PyObject *
-psutil_sensors_battery(PyObject *self, PyObject *args) {
-    PyObject *py_tuple = NULL;
-    CFTypeRef power_info = NULL;
-    CFArrayRef power_sources_list = NULL;
-    CFDictionaryRef power_sources_information = NULL;
-    CFNumberRef capacity_ref = NULL;
-    CFNumberRef time_to_empty_ref = NULL;
-    CFStringRef ps_state_ref = NULL;
-    uint32_t capacity;     /* units are percent */
-    int time_to_empty;     /* units are minutes */
-    int is_power_plugged;
-
-    power_info = IOPSCopyPowerSourcesInfo();
-
-    if (!power_info) {
-        PyErr_SetString(PyExc_RuntimeError,
-            "IOPSCopyPowerSourcesInfo() syscall failed");
-        goto error;
-    }
-
-    power_sources_list = IOPSCopyPowerSourcesList(power_info);
-    if (!power_sources_list) {
-        PyErr_SetString(PyExc_RuntimeError,
-            "IOPSCopyPowerSourcesList() syscall failed");
-        goto error;
-    }
-
-    /* Should only get one source. But in practice, check for > 0 sources */
-    if (!CFArrayGetCount(power_sources_list)) {
-        PyErr_SetString(PyExc_NotImplementedError, "no battery");
-        goto error;
-    }
-
-    power_sources_information = IOPSGetPowerSourceDescription(
-        power_info, CFArrayGetValueAtIndex(power_sources_list, 0));
-
-    capacity_ref = (CFNumberRef)  CFDictionaryGetValue(
-        power_sources_information, CFSTR(kIOPSCurrentCapacityKey));
-    if (!CFNumberGetValue(capacity_ref, kCFNumberSInt32Type, &capacity)) {
-        PyErr_SetString(PyExc_RuntimeError,
-            "No battery capacity infomration in power sources info");
-        goto error;
-    }
-
-    ps_state_ref = (CFStringRef) CFDictionaryGetValue(
-        power_sources_information, CFSTR(kIOPSPowerSourceStateKey));
-    is_power_plugged = CFStringCompare(
-        ps_state_ref, CFSTR(kIOPSACPowerValue), 0)
-        == kCFCompareEqualTo;
-
-    time_to_empty_ref = (CFNumberRef) CFDictionaryGetValue(
-        power_sources_information, CFSTR(kIOPSTimeToEmptyKey));
-    if (!CFNumberGetValue(time_to_empty_ref,
-                          kCFNumberIntType, &time_to_empty)) {
-        /* This value is recommended for non-Apple power sources, so it's not
-         * an error if it doesn't exist. We'll return -1 for "unknown" */
-        /* A value of -1 indicates "Still Calculating the Time" also for
-         * apple power source */
-        time_to_empty = -1;
-    }
-
-    py_tuple = Py_BuildValue("Iii",
-        capacity, time_to_empty, is_power_plugged);
-    if (!py_tuple) {
-        goto error;
-    }
-
-    CFRelease(power_info);
-    CFRelease(power_sources_list);
-    /* Caller should NOT release power_sources_information */
-
-    return py_tuple;
-
-error:
-    if (power_info)
-        CFRelease(power_info);
-    if (power_sources_list)
-        CFRelease(power_sources_list);
-    Py_XDECREF(py_tuple);
-    return NULL;
-}
-
-
-/*
- * define the psutil C module methods and initialize the module.
- */
-static PyMethodDef mod_methods[] = {
-    // --- per-process functions
-
-    {"proc_kinfo_oneshot", psutil_proc_kinfo_oneshot, METH_VARARGS,
-     "Return multiple process info."},
-    {"proc_pidtaskinfo_oneshot", psutil_proc_pidtaskinfo_oneshot, METH_VARARGS,
-     "Return multiple process info."},
-    {"proc_name", psutil_proc_name, METH_VARARGS,
-     "Return process name"},
-    {"proc_cmdline", psutil_proc_cmdline, METH_VARARGS,
-     "Return process cmdline as a list of cmdline arguments"},
-    {"proc_environ", psutil_proc_environ, METH_VARARGS,
-     "Return process environment data"},
-    {"proc_exe", psutil_proc_exe, METH_VARARGS,
-     "Return path of the process executable"},
-    {"proc_cwd", psutil_proc_cwd, METH_VARARGS,
-     "Return process current working directory."},
-    {"proc_memory_uss", psutil_proc_memory_uss, METH_VARARGS,
-     "Return process USS memory"},
-    {"proc_threads", psutil_proc_threads, METH_VARARGS,
-     "Return process threads as a list of tuples"},
-    {"proc_open_files", psutil_proc_open_files, METH_VARARGS,
-     "Return files opened by process as a list of tuples"},
-    {"proc_num_fds", psutil_proc_num_fds, METH_VARARGS,
-     "Return the number of fds opened by process."},
-    {"proc_connections", psutil_proc_connections, METH_VARARGS,
-     "Get process TCP and UDP connections as a list of tuples"},
-
-    // --- system-related functions
-
-    {"pids", psutil_pids, METH_VARARGS,
-     "Returns a list of PIDs currently running on the system"},
-    {"cpu_count_logical", psutil_cpu_count_logical, METH_VARARGS,
-     "Return number of logical CPUs on the system"},
-    {"cpu_count_phys", psutil_cpu_count_phys, METH_VARARGS,
-     "Return number of physical CPUs on the system"},
-    {"virtual_mem", psutil_virtual_mem, METH_VARARGS,
-     "Return system virtual memory stats"},
-    {"swap_mem", psutil_swap_mem, METH_VARARGS,
-     "Return stats about swap memory, in bytes"},
-    {"cpu_times", psutil_cpu_times, METH_VARARGS,
-     "Return system cpu times as a tuple (user, system, nice, idle, irc)"},
-    {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS,
-     "Return system per-cpu times as a list of tuples"},
-    {"cpu_freq", psutil_cpu_freq, METH_VARARGS,
-     "Return cpu current frequency"},
-    {"boot_time", psutil_boot_time, METH_VARARGS,
-     "Return the system boot time expressed in seconds since the epoch."},
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return a list of tuples including device, mount point and "
-     "fs type for all partitions mounted on the system."},
-    {"net_io_counters", psutil_net_io_counters, METH_VARARGS,
-     "Return dict of tuples of networks I/O information."},
-    {"disk_io_counters", psutil_disk_io_counters, METH_VARARGS,
-     "Return dict of tuples of disks I/O information."},
-    {"users", psutil_users, METH_VARARGS,
-     "Return currently connected users as a list of tuples"},
-    {"cpu_stats", psutil_cpu_stats, METH_VARARGS,
-     "Return CPU statistics"},
-    {"sensors_battery", psutil_sensors_battery, METH_VARARGS,
-     "Return battery information."},
-
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-
-#if PY_MAJOR_VERSION >= 3
-    #define INITERR return NULL
-
-    static struct PyModuleDef moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "_psutil_osx",
-        NULL,
-        -1,
-        mod_methods,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-    };
-
-    PyObject *PyInit__psutil_osx(void)
-#else  /* PY_MAJOR_VERSION */
-    #define INITERR return
-
-    void init_psutil_osx(void)
-#endif  /* PY_MAJOR_VERSION */
-{
-#if PY_MAJOR_VERSION >= 3
-    PyObject *mod = PyModule_Create(&moduledef);
-#else
-    PyObject *mod = Py_InitModule("_psutil_osx", mod_methods);
-#endif
-    if (mod == NULL)
-        INITERR;
-
-    if (psutil_setup() != 0)
-        INITERR;
-
-    if (PyModule_AddIntConstant(mod, "version", PSUTIL_VERSION))
-        INITERR;
-    // process status constants, defined in:
-    // http://fxr.watson.org/fxr/source/bsd/sys/proc.h?v=xnu-792.6.70#L149
-    if (PyModule_AddIntConstant(mod, "SIDL", SIDL))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "SRUN", SRUN))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "SSLEEP", SSLEEP))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "SSTOP", SSTOP))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "SZOMB", SZOMB))
-        INITERR;
-    // connection status constants
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSED", TCPS_CLOSED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSING", TCPS_CLOSING))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_CLOSE_WAIT", TCPS_CLOSE_WAIT))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_LISTEN", TCPS_LISTEN))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_ESTABLISHED", TCPS_ESTABLISHED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_SYN_SENT", TCPS_SYN_SENT))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_SYN_RECEIVED", TCPS_SYN_RECEIVED))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_FIN_WAIT_1", TCPS_FIN_WAIT_1))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_FIN_WAIT_2", TCPS_FIN_WAIT_2))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_LAST_ACK", TCPS_LAST_ACK))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "TCPS_TIME_WAIT", TCPS_TIME_WAIT))
-        INITERR;
-    if (PyModule_AddIntConstant(mod, "PSUTIL_CONN_NONE", PSUTIL_CONN_NONE))
-        INITERR;
-
-    // Exception.
-    ZombieProcessError = PyErr_NewException(
-        "_psutil_osx.ZombieProcessError", NULL, NULL);
-    if (ZombieProcessError == NULL)
-        INITERR;
-    Py_INCREF(ZombieProcessError);
-    if (PyModule_AddObject(mod, "ZombieProcessError", ZombieProcessError)) {
-        Py_DECREF(ZombieProcessError);
-        INITERR;
-    }
-
-    if (mod == NULL)
-        INITERR;
-#if PY_MAJOR_VERSION >= 3
-    return mod;
-#endif
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_posix.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_posix.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_posix.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_posix.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,680 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Functions specific to all POSIX compliant platforms.
- */
-
-#include <Python.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-
-#ifdef PSUTIL_SUNOS10
-    #include "arch/solaris/v10/ifaddrs.h"
-#elif PSUTIL_AIX
-    #include "arch/aix/ifaddrs.h"
-#else
-    #include <ifaddrs.h>
-#endif
-
-#if defined(PSUTIL_LINUX)
-    #include <netdb.h>
-    #include <linux/types.h>
-    #include <linux/if_packet.h>
-#elif defined(PSUTIL_BSD) || defined(PSUTIL_OSX)
-    #include <netdb.h>
-    #include <netinet/in.h>
-    #include <net/if_dl.h>
-    #include <sys/sockio.h>
-    #include <net/if_media.h>
-    #include <net/if.h>
-#elif defined(PSUTIL_SUNOS)
-    #include <netdb.h>
-    #include <sys/sockio.h>
-#elif defined(PSUTIL_AIX)
-    #include <netdb.h>
-#endif
-
-#include "_psutil_common.h"
-
-/*
- * Check if PID exists. Return values:
- * 1: exists
- * 0: does not exist
- * -1: error (Python exception is set)
- */
-int
-psutil_pid_exists(pid_t pid) {
-    int ret;
-
-    // No negative PID exists, plus -1 is an alias for sending signal
-    // too all processes except system ones. Not what we want.
-    if (pid < 0)
-        return 0;
-
-    // As per "man 2 kill" PID 0 is an alias for sending the signal to
-    // every process in the process group of the calling process.
-    // Not what we want. Some platforms have PID 0, some do not.
-    // We decide that at runtime.
-    if (pid == 0) {
-#if defined(PSUTIL_LINUX) || defined(PSUTIL_FREEBSD)
-        return 0;
-#else
-        return 1;
-#endif
-    }
-
-    ret = kill(pid , 0);
-    if (ret == 0)
-        return 1;
-    else {
-        if (errno == ESRCH) {
-            // ESRCH == No such process
-            return 0;
-        }
-        else if (errno == EPERM) {
-            // EPERM clearly indicates there's a process to deny
-            // access to.
-            return 1;
-        }
-        else {
-            // According to "man 2 kill" possible error values are
-            // (EINVAL, EPERM, ESRCH) therefore we should never get
-            // here. If we do let's be explicit in considering this
-            // an error.
-            PyErr_SetFromErrno(PyExc_OSError);
-            return -1;
-        }
-    }
-}
-
-
-/*
- * Utility used for those syscalls which do not return a meaningful
- * error that we can translate into an exception which makes sense.
- * As such, we'll have to guess.
- * On UNIX, if errno is set, we return that one (OSError).
- * Else, if PID does not exist we assume the syscall failed because
- * of that so we raise NoSuchProcess.
- * If none of this is true we giveup and raise RuntimeError(msg).
- * This will always set a Python exception and return NULL.
- */
-void
-psutil_raise_for_pid(long pid, char *syscall) {
-    if (errno != 0)  // unlikely
-        PyErr_SetFromOSErrnoWithSyscall(syscall);
-    else if (psutil_pid_exists(pid) == 0)
-        NoSuchProcess(syscall);
-    else
-        PyErr_Format(PyExc_RuntimeError, "%s syscall failed", syscall);
-}
-
-
-/*
- * Given a PID return process priority as a Python integer.
- */
-static PyObject *
-psutil_posix_getpriority(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int priority;
-    errno = 0;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-#ifdef PSUTIL_OSX
-    priority = getpriority(PRIO_PROCESS, (id_t)pid);
-#else
-    priority = getpriority(PRIO_PROCESS, pid);
-#endif
-    if (errno != 0)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    return Py_BuildValue("i", priority);
-}
-
-
-/*
- * Given a PID and a value change process priority.
- */
-static PyObject *
-psutil_posix_setpriority(PyObject *self, PyObject *args) {
-    pid_t pid;
-    int priority;
-    int retval;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "i", &pid, &priority))
-        return NULL;
-
-#ifdef PSUTIL_OSX
-    retval = setpriority(PRIO_PROCESS, (id_t)pid, priority);
-#else
-    retval = setpriority(PRIO_PROCESS, pid, priority);
-#endif
-    if (retval == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Translate a sockaddr struct into a Python string.
- * Return None if address family is not AF_INET* or AF_PACKET.
- */
-static PyObject *
-psutil_convert_ipaddr(struct sockaddr *addr, int family) {
-    char buf[NI_MAXHOST];
-    int err;
-    int addrlen;
-    size_t n;
-    size_t len;
-    const char *data;
-    char *ptr;
-
-    if (addr == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-    else if (family == AF_INET || family == AF_INET6) {
-        if (family == AF_INET)
-            addrlen = sizeof(struct sockaddr_in);
-        else
-            addrlen = sizeof(struct sockaddr_in6);
-        err = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
-                          NI_NUMERICHOST);
-        if (err != 0) {
-            // XXX we get here on FreeBSD when processing 'lo' / AF_INET6
-            // broadcast. Not sure what to do other than returning None.
-            // ifconfig does not show anything BTW.
-            // PyErr_Format(PyExc_RuntimeError, gai_strerror(err));
-            // return NULL;
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        else {
-            return Py_BuildValue("s", buf);
-        }
-    }
-#ifdef PSUTIL_LINUX
-    else if (family == AF_PACKET) {
-        struct sockaddr_ll *lladdr = (struct sockaddr_ll *)addr;
-        len = lladdr->sll_halen;
-        data = (const char *)lladdr->sll_addr;
-    }
-#elif defined(PSUTIL_BSD) || defined(PSUTIL_OSX)
-    else if (addr->sa_family == AF_LINK) {
-        // Note: prior to Python 3.4 socket module does not expose
-        // AF_LINK so we'll do.
-        struct sockaddr_dl *dladdr = (struct sockaddr_dl *)addr;
-        len = dladdr->sdl_alen;
-        data = LLADDR(dladdr);
-    }
-#endif
-    else {
-        // unknown family
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    // AF_PACKET or AF_LINK
-    if (len > 0) {
-        ptr = buf;
-        for (n = 0; n < len; ++n) {
-            sprintf(ptr, "%02x:", data[n] & 0xff);
-            ptr += 3;
-        }
-        *--ptr = '\0';
-        return Py_BuildValue("s", buf);
-    }
-    else {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-}
-
-
-/*
- * Return NICs information a-la ifconfig as a list of tuples.
- * TODO: on Solaris we won't get any MAC address.
- */
-static PyObject*
-psutil_net_if_addrs(PyObject* self, PyObject* args) {
-    struct ifaddrs *ifaddr, *ifa;
-    int family;
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_address = NULL;
-    PyObject *py_netmask = NULL;
-    PyObject *py_broadcast = NULL;
-    PyObject *py_ptp = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (getifaddrs(&ifaddr) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-        if (!ifa->ifa_addr)
-            continue;
-        family = ifa->ifa_addr->sa_family;
-        py_address = psutil_convert_ipaddr(ifa->ifa_addr, family);
-        // If the primary address can't be determined just skip it.
-        // I've never seen this happen on Linux but I did on FreeBSD.
-        if (py_address == Py_None)
-            continue;
-        if (py_address == NULL)
-            goto error;
-        py_netmask = psutil_convert_ipaddr(ifa->ifa_netmask, family);
-        if (py_netmask == NULL)
-            goto error;
-
-        if (ifa->ifa_flags & IFF_BROADCAST) {
-            py_broadcast = psutil_convert_ipaddr(ifa->ifa_broadaddr, family);
-            Py_INCREF(Py_None);
-            py_ptp = Py_None;
-        }
-        else if (ifa->ifa_flags & IFF_POINTOPOINT) {
-            py_ptp = psutil_convert_ipaddr(ifa->ifa_dstaddr, family);
-            Py_INCREF(Py_None);
-            py_broadcast = Py_None;
-        }
-        else {
-            Py_INCREF(Py_None);
-            Py_INCREF(Py_None);
-            py_broadcast = Py_None;
-            py_ptp = Py_None;
-        }
-
-        if ((py_broadcast == NULL) || (py_ptp == NULL))
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(siOOOO)",
-            ifa->ifa_name,
-            family,
-            py_address,
-            py_netmask,
-            py_broadcast,
-            py_ptp
-        );
-
-        if (! py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_tuple);
-        Py_CLEAR(py_address);
-        Py_CLEAR(py_netmask);
-        Py_CLEAR(py_broadcast);
-        Py_CLEAR(py_ptp);
-    }
-
-    freeifaddrs(ifaddr);
-    return py_retlist;
-
-error:
-    if (ifaddr != NULL)
-        freeifaddrs(ifaddr);
-    Py_DECREF(py_retlist);
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_address);
-    Py_XDECREF(py_netmask);
-    Py_XDECREF(py_broadcast);
-    Py_XDECREF(py_ptp);
-    return NULL;
-}
-
-
-/*
- * Return NIC MTU. References:
- * http://www.i-scream.org/libstatgrab/
- */
-static PyObject *
-psutil_net_if_mtu(PyObject *self, PyObject *args) {
-    char *nic_name;
-    int sock = -1;
-    int ret;
-#ifdef PSUTIL_SUNOS10
-    struct lifreq lifr;
-#else
-    struct ifreq ifr;
-#endif
-
-    if (! PyArg_ParseTuple(args, "s", &nic_name))
-        return NULL;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1)
-        goto error;
-
-#ifdef PSUTIL_SUNOS10
-    strncpy(lifr.lifr_name, nic_name, sizeof(lifr.lifr_name));
-    ret = ioctl(sock, SIOCGIFMTU, &lifr);
-#else
-    strncpy(ifr.ifr_name, nic_name, sizeof(ifr.ifr_name));
-    ret = ioctl(sock, SIOCGIFMTU, &ifr);
-#endif
-    if (ret == -1)
-        goto error;
-    close(sock);
-
-#ifdef PSUTIL_SUNOS10
-    return Py_BuildValue("i", lifr.lifr_mtu);
-#else
-    return Py_BuildValue("i", ifr.ifr_mtu);
-#endif
-
-error:
-    if (sock != -1)
-        close(sock);
-    return PyErr_SetFromErrno(PyExc_OSError);
-}
-
-
-/*
- * Inspect NIC flags, returns a bool indicating whether the NIC is
- * running. References:
- * http://www.i-scream.org/libstatgrab/
- */
-static PyObject *
-psutil_net_if_flags(PyObject *self, PyObject *args) {
-    char *nic_name;
-    int sock = -1;
-    int ret;
-    struct ifreq ifr;
-
-    if (! PyArg_ParseTuple(args, "s", &nic_name))
-        return NULL;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1)
-        goto error;
-
-    strncpy(ifr.ifr_name, nic_name, sizeof(ifr.ifr_name));
-    ret = ioctl(sock, SIOCGIFFLAGS, &ifr);
-    if (ret == -1)
-        goto error;
-
-    close(sock);
-    if ((ifr.ifr_flags & IFF_UP) != 0)
-        return Py_BuildValue("O", Py_True);
-    else
-        return Py_BuildValue("O", Py_False);
-
-error:
-    if (sock != -1)
-        close(sock);
-    return PyErr_SetFromErrno(PyExc_OSError);
-}
-
-
-/*
- * net_if_stats() macOS/BSD implementation.
- */
-#if defined(PSUTIL_BSD) || defined(PSUTIL_OSX)
-
-int psutil_get_nic_speed(int ifm_active) {
-    // Determine NIC speed. Taken from:
-    // http://www.i-scream.org/libstatgrab/
-    // Assuming only ETHER devices
-    switch(IFM_TYPE(ifm_active)) {
-        case IFM_ETHER:
-            switch(IFM_SUBTYPE(ifm_active)) {
-#if defined(IFM_HPNA_1) && ((!defined(IFM_10G_LR)) \
-    || (IFM_10G_LR != IFM_HPNA_1))
-                // HomePNA 1.0 (1Mb/s)
-                case(IFM_HPNA_1):
-                    return 1;
-#endif
-                // 10 Mbit
-                case(IFM_10_T):  // 10BaseT - RJ45
-                case(IFM_10_2):  // 10Base2 - Thinnet
-                case(IFM_10_5):  // 10Base5 - AUI
-                case(IFM_10_STP):  // 10BaseT over shielded TP
-                case(IFM_10_FL):  // 10baseFL - Fiber
-                    return 10;
-                // 100 Mbit
-                case(IFM_100_TX):  // 100BaseTX - RJ45
-                case(IFM_100_FX):  // 100BaseFX - Fiber
-                case(IFM_100_T4):  // 100BaseT4 - 4 pair cat 3
-                case(IFM_100_VG):  // 100VG-AnyLAN
-                case(IFM_100_T2):  // 100BaseT2
-                    return 100;
-                // 1000 Mbit
-                case(IFM_1000_SX):  // 1000BaseSX - multi-mode fiber
-                case(IFM_1000_LX):  // 1000baseLX - single-mode fiber
-                case(IFM_1000_CX):  // 1000baseCX - 150ohm STP
-#if defined(IFM_1000_TX) && !defined(PSUTIL_OPENBSD)
-                // FreeBSD 4 and others (but NOT OpenBSD) -> #define IFM_1000_T in net/if_media.h
-                case(IFM_1000_TX):
-#endif
-#ifdef IFM_1000_FX
-                case(IFM_1000_FX):
-#endif
-#ifdef IFM_1000_T
-                case(IFM_1000_T):
-#endif
-                    return 1000;
-#if defined(IFM_10G_SR) || defined(IFM_10G_LR) || defined(IFM_10G_CX4) \
-         || defined(IFM_10G_T)
-#ifdef IFM_10G_SR
-                case(IFM_10G_SR):
-#endif
-#ifdef IFM_10G_LR
-                case(IFM_10G_LR):
-#endif
-#ifdef IFM_10G_CX4
-                case(IFM_10G_CX4):
-#endif
-#ifdef IFM_10G_TWINAX
-                case(IFM_10G_TWINAX):
-#endif
-#ifdef IFM_10G_TWINAX_LONG
-                case(IFM_10G_TWINAX_LONG):
-#endif
-#ifdef IFM_10G_T
-                case(IFM_10G_T):
-#endif
-                    return 10000;
-#endif
-#if defined(IFM_2500_SX)
-#ifdef IFM_2500_SX
-                case(IFM_2500_SX):
-#endif
-                    return 2500;
-#endif // any 2.5GBit stuff...
-                // We don't know what it is
-                default:
-                    return 0;
-            }
-            break;
-
-#ifdef IFM_TOKEN
-        case IFM_TOKEN:
-            switch(IFM_SUBTYPE(ifm_active)) {
-                case IFM_TOK_STP4:  // Shielded twisted pair 4m - DB9
-                case IFM_TOK_UTP4:  // Unshielded twisted pair 4m - RJ45
-                    return 4;
-                case IFM_TOK_STP16:  // Shielded twisted pair 16m - DB9
-                case IFM_TOK_UTP16:  // Unshielded twisted pair 16m - RJ45
-                    return 16;
-#if defined(IFM_TOK_STP100) || defined(IFM_TOK_UTP100)
-#ifdef IFM_TOK_STP100
-                case IFM_TOK_STP100:  // Shielded twisted pair 100m - DB9
-#endif
-#ifdef IFM_TOK_UTP100
-                case IFM_TOK_UTP100:  // Unshielded twisted pair 100m - RJ45
-#endif
-                    return 100;
-#endif
-                // We don't know what it is
-                default:
-                    return 0;
-            }
-            break;
-#endif
-
-#ifdef IFM_FDDI
-        case IFM_FDDI:
-            switch(IFM_SUBTYPE(ifm_active)) {
-                // We don't know what it is
-                default:
-                    return 0;
-            }
-            break;
-#endif
-        case IFM_IEEE80211:
-            switch(IFM_SUBTYPE(ifm_active)) {
-                case IFM_IEEE80211_FH1:  // Frequency Hopping 1Mbps
-                case IFM_IEEE80211_DS1:  // Direct Sequence 1Mbps
-                    return 1;
-                case IFM_IEEE80211_FH2:  // Frequency Hopping 2Mbps
-                case IFM_IEEE80211_DS2:  // Direct Sequence 2Mbps
-                    return 2;
-                case IFM_IEEE80211_DS5:  // Direct Sequence 5Mbps
-                    return 5;
-                case IFM_IEEE80211_DS11:  // Direct Sequence 11Mbps
-                    return 11;
-                case IFM_IEEE80211_DS22:  // Direct Sequence 22Mbps
-                    return 22;
-                // We don't know what it is
-                default:
-                    return 0;
-            }
-            break;
-
-        default:
-            return 0;
-    }
-}
-
-
-/*
- * Return stats about a particular network interface.
- * References:
- * http://www.i-scream.org/libstatgrab/
- */
-static PyObject *
-psutil_net_if_duplex_speed(PyObject *self, PyObject *args) {
-    char *nic_name;
-    int sock = -1;
-    int ret;
-    int duplex;
-    int speed;
-    struct ifreq ifr;
-    struct ifmediareq ifmed;
-
-    if (! PyArg_ParseTuple(args, "s", &nic_name))
-        return NULL;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1)
-        return PyErr_SetFromErrno(PyExc_OSError);
-    strncpy(ifr.ifr_name, nic_name, sizeof(ifr.ifr_name));
-
-    // speed / duplex
-    memset(&ifmed, 0, sizeof(struct ifmediareq));
-    strlcpy(ifmed.ifm_name, nic_name, sizeof(ifmed.ifm_name));
-    ret = ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed);
-    if (ret == -1) {
-        speed = 0;
-        duplex = 0;
-    }
-    else {
-        speed = psutil_get_nic_speed(ifmed.ifm_active);
-        if ((ifmed.ifm_active | IFM_FDX) == ifmed.ifm_active)
-            duplex = 2;
-        else if ((ifmed.ifm_active | IFM_HDX) == ifmed.ifm_active)
-            duplex = 1;
-        else
-            duplex = 0;
-    }
-
-    close(sock);
-    return Py_BuildValue("[ii]", duplex, speed);
-}
-#endif  // net_if_stats() macOS/BSD implementation
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
- * define the psutil C module methods and initialize the module.
- */
-static PyMethodDef mod_methods[] = {
-    {"getpriority", psutil_posix_getpriority, METH_VARARGS,
-     "Return process priority"},
-    {"setpriority", psutil_posix_setpriority, METH_VARARGS,
-     "Set process priority"},
-    {"net_if_addrs", psutil_net_if_addrs, METH_VARARGS,
-     "Retrieve NICs information"},
-    {"net_if_mtu", psutil_net_if_mtu, METH_VARARGS,
-     "Retrieve NIC MTU"},
-    {"net_if_flags", psutil_net_if_flags, METH_VARARGS,
-     "Retrieve NIC flags"},
-#if defined(PSUTIL_BSD) || defined(PSUTIL_OSX)
-    {"net_if_duplex_speed", psutil_net_if_duplex_speed, METH_VARARGS,
-     "Return NIC stats."},
-#endif
-    {NULL, NULL, 0, NULL}
-};
-
-
-#if PY_MAJOR_VERSION >= 3
-    #define INITERR return NULL
-
-    static struct PyModuleDef moduledef = {
-        PyModuleDef_HEAD_INIT,
-        "_psutil_posix",
-        NULL,
-        -1,
-        mod_methods,
-        NULL,
-        NULL,
-        NULL,
-        NULL
-    };
-
-    PyObject *PyInit__psutil_posix(void)
-#else  /* PY_MAJOR_VERSION */
-    #define INITERR return
-
-    void init_psutil_posix(void)
-#endif  /* PY_MAJOR_VERSION */
-{
-#if PY_MAJOR_VERSION >= 3
-    PyObject *mod = PyModule_Create(&moduledef);
-#else
-    PyObject *mod = Py_InitModule("_psutil_posix", mod_methods);
-#endif
-    if (mod == NULL)
-        INITERR;
-
-#if defined(PSUTIL_BSD) || \
-        defined(PSUTIL_OSX) || \
-        defined(PSUTIL_SUNOS) || \
-        defined(PSUTIL_AIX)
-    if (PyModule_AddIntConstant(mod, "AF_LINK", AF_LINK)) INITERR;
-#endif
-
-    if (mod == NULL)
-        INITERR;
-#if PY_MAJOR_VERSION >= 3
-    return mod;
-#endif
-}
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_posix.h firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_posix.h
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_posix.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_posix.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-int psutil_pid_exists(pid_t pid);
-void psutil_raise_for_pid(pid_t pid, char *msg);
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_sunos.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_sunos.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_sunos.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_sunos.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1787 +0,0 @@
-/*
- * Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Functions specific to Sun OS Solaris platforms.
- *
- * Thanks to Justin Venus who originally wrote a consistent part of
- * this in Cython which I later on translated in C.
- */
-
-/* fix compilation issue on SunOS 5.10, see:
- * https://github.com/giampaolo/psutil/issues/421
- * https://github.com/giampaolo/psutil/issues/1077
-*/
-
-#define _STRUCTURED_PROC 1
-
-#include <Python.h>
-
-#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
-#  undef _FILE_OFFSET_BITS
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/proc.h>
-#include <sys/swap.h>
-#include <sys/sysinfo.h>
-#include <sys/mntent.h>  // for MNTTAB
-#include <sys/mnttab.h>
-#include <sys/procfs.h>
-#include <sys/sockio.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <utmpx.h>
-#include <kstat.h>
-#include <sys/ioctl.h>
-#include <sys/tihdr.h>
-#include <stropts.h>
-#include <inet/tcp.h>
-#ifndef NEW_MIB_COMPLIANT
-/*
- * Solaris introduced NEW_MIB_COMPLIANT macro with Update 4.
- * See https://github.com/giampaolo/psutil/issues/421
- * Prior to Update 4, one has to include mib2 by hand.
- */
-#include <inet/mib2.h>
-#endif
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <math.h> // fabs()
-
-#include "_psutil_common.h"
-#include "_psutil_posix.h"
-
-#include "arch/solaris/environ.h"
-
-#define PSUTIL_TV2DOUBLE(t) (((t).tv_nsec * 0.000000001) + (t).tv_sec)
-
-
-/*
- * Read a file content and fills a C structure with it.
- */
-static int
-psutil_file_to_struct(char *path, void *fstruct, size_t size) {
-    int fd;
-    ssize_t nbytes;
-    fd = open(path, O_RDONLY);
-    if (fd == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
-        return 0;
-    }
-    nbytes = read(fd, fstruct, size);
-    if (nbytes == -1) {
-        close(fd);
-        PyErr_SetFromErrno(PyExc_OSError);
-        return 0;
-    }
-    if (nbytes != (ssize_t) size) {
-        close(fd);
-        PyErr_SetString(
-            PyExc_RuntimeError, "read() file structure size mismatch");
-        return 0;
-    }
-    close(fd);
-    return nbytes;
-}
-
-
-/*
- * Return process ppid, rss, vms, ctime, nice, nthreads, status and tty
- * as a Python tuple.
- */
-static PyObject *
-psutil_proc_basic_info(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    psinfo_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-
-    sprintf(path, "%s/%i/psinfo", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    return Py_BuildValue(
-        "ikkdiiikiiii",
-        info.pr_ppid,              // parent pid
-        info.pr_rssize,            // rss
-        info.pr_size,              // vms
-        PSUTIL_TV2DOUBLE(info.pr_start),  // create time
-        info.pr_lwp.pr_nice,       // nice
-        info.pr_nlwp,              // no. of threads
-        info.pr_lwp.pr_state,      // status code
-        info.pr_ttydev,            // tty nr
-        (int)info.pr_uid,          // real user id
-        (int)info.pr_euid,         // effective user id
-        (int)info.pr_gid,          // real group id
-        (int)info.pr_egid          // effective group id
-        );
-}
-
-/*
- * Join array of C strings to C string with delemiter dm.
- * Omit empty records.
- */
-static int
-cstrings_array_to_string(char **joined, char ** array, size_t count, char dm) {
-    int i;
-    size_t total_length = 0;
-    size_t item_length = 0;
-    char *result = NULL;
-    char *last = NULL;
-
-    if (!array || !joined)
-        return 0;
-
-    for (i=0; i<count; i++) {
-        if (!array[i])
-            continue;
-
-        item_length = strlen(array[i]) + 1;
-        total_length += item_length;
-    }
-
-    if (!total_length) {
-        return 0;
-    }
-
-    result = malloc(total_length);
-    if (!result) {
-        PyErr_NoMemory();
-        return -1;
-    }
-
-    result[0] = '\0';
-    last = result;
-
-    for (i=0; i<count; i++) {
-        if (!array[i])
-            continue;
-
-        item_length = strlen(array[i]);
-        memcpy(last, array[i], item_length);
-        last[item_length] = dm;
-
-        last += item_length + 1;
-    }
-
-    result[total_length-1] = '\0';
-    *joined = result;
-
-    return total_length;
-}
-
-/*
- * Return process name and args as a Python tuple.
- */
-static PyObject *
-psutil_proc_name_and_args(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    psinfo_t info;
-    size_t argc;
-    int joined;
-    char **argv;
-    char *argv_plain;
-    const char *procfs_path;
-    PyObject *py_name = NULL;
-    PyObject *py_args = NULL;
-    PyObject *py_retlist = NULL;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/psinfo", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-
-    py_name = PyUnicode_DecodeFSDefault(info.pr_fname);
-    if (!py_name)
-        goto error;
-
-    /* SunOS truncates arguments to length PRARGSZ, very likely args are truncated.
-     * The only way to retrieve full command line is to parse process memory */
-    if (info.pr_argc && strlen(info.pr_psargs) == PRARGSZ-1) {
-        argv = psutil_read_raw_args(info, procfs_path, &argc);
-        if (argv) {
-            joined = cstrings_array_to_string(&argv_plain, argv, argc, ' ');
-            if (joined > 0) {
-                py_args = PyUnicode_DecodeFSDefault(argv_plain);
-                free(argv_plain);
-            } else if (joined < 0) {
-                goto error;
-            }
-
-            psutil_free_cstrings_array(argv, argc);
-        }
-    }
-
-    /* If we can't read process memory or can't decode the result
-     * then return args from /proc. */
-    if (!py_args) {
-        PyErr_Clear();
-        py_args = PyUnicode_DecodeFSDefault(info.pr_psargs);
-    }
-
-    /* Both methods has been failed. */
-    if (!py_args)
-        goto error;
-
-    py_retlist = Py_BuildValue("OO", py_name, py_args);
-    if (!py_retlist)
-        goto error;
-
-    Py_DECREF(py_name);
-    Py_DECREF(py_args);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_name);
-    Py_XDECREF(py_args);
-    Py_XDECREF(py_retlist);
-    return NULL;
-}
-
-
-/*
- * Return process environ block.
- */
-static PyObject *
-psutil_proc_environ(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    psinfo_t info;
-    const char *procfs_path;
-    char **env = NULL;
-    ssize_t env_count = -1;
-    char *dm;
-    int i = 0;
-    PyObject *py_envname = NULL;
-    PyObject *py_envval = NULL;
-    PyObject *py_retdict = PyDict_New();
-
-    if (! py_retdict)
-        return PyErr_NoMemory();
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-
-    sprintf(path, "%s/%i/psinfo", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        goto error;
-
-    if (! info.pr_envp) {
-        AccessDenied("/proc/pid/psinfo struct not set");
-        goto error;
-    }
-
-    env = psutil_read_raw_env(info, procfs_path, &env_count);
-    if (! env && env_count != 0)
-        goto error;
-
-    for (i=0; i<env_count; i++) {
-        if (! env[i])
-            break;
-
-        dm = strchr(env[i], '=');
-        if (! dm)
-            continue;
-
-        *dm = '\0';
-
-        py_envname = PyUnicode_DecodeFSDefault(env[i]);
-        if (! py_envname)
-            goto error;
-
-        py_envval = PyUnicode_DecodeFSDefault(dm+1);
-        if (! py_envname)
-            goto error;
-
-        if (PyDict_SetItem(py_retdict, py_envname, py_envval) < 0)
-            goto error;
-
-        Py_CLEAR(py_envname);
-        Py_CLEAR(py_envval);
-    }
-
-    psutil_free_cstrings_array(env, env_count);
-    return py_retdict;
-
- error:
-    if (env && env_count >= 0)
-        psutil_free_cstrings_array(env, env_count);
-
-    Py_XDECREF(py_envname);
-    Py_XDECREF(py_envval);
-    Py_XDECREF(py_retdict);
-    return NULL;
-}
-
-
-/*
- * Return process user and system CPU times as a Python tuple.
- */
-static PyObject *
-psutil_proc_cpu_times(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    pstatus_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/status", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    // results are more precise than os.times()
-    return Py_BuildValue(
-        "(dddd)",
-         PSUTIL_TV2DOUBLE(info.pr_utime),
-         PSUTIL_TV2DOUBLE(info.pr_stime),
-         PSUTIL_TV2DOUBLE(info.pr_cutime),
-         PSUTIL_TV2DOUBLE(info.pr_cstime)
-    );
-}
-
-
-/*
- * Return what CPU the process is running on.
- */
-static PyObject *
-psutil_proc_cpu_num(PyObject *self, PyObject *args) {
-    int fd = NULL;
-    int pid;
-    char path[1000];
-    struct prheader header;
-    struct lwpsinfo *lwp = NULL;
-    int nent;
-    int size;
-    int proc_num;
-    ssize_t nbytes;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-
-    sprintf(path, "%s/%i/lpsinfo", procfs_path, pid);
-    fd = open(path, O_RDONLY);
-    if (fd == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, path);
-        return NULL;
-    }
-
-    // read header
-    nbytes = pread(fd, &header, sizeof(header), 0);
-    if (nbytes == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    if (nbytes != sizeof(header)) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "read() file structure size mismatch");
-        goto error;
-    }
-
-    // malloc
-    nent = header.pr_nent;
-    size = header.pr_entsize * nent;
-    lwp = malloc(size);
-    if (lwp == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    // read the rest
-    nbytes = pread(fd, lwp, size, sizeof(header));
-    if (nbytes == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    if (nbytes != size) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "read() file structure size mismatch");
-        goto error;
-    }
-
-    // done
-    proc_num = lwp->pr_onpro;
-    close(fd);
-    free(lwp);
-    return Py_BuildValue("i", proc_num);
-
-error:
-    if (fd != -1)
-        close(fd);
-    free(lwp);
-    return NULL;
-}
-
-
-/*
- * Return process uids/gids as a Python tuple.
- */
-static PyObject *
-psutil_proc_cred(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    prcred_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/cred", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    return Py_BuildValue("iiiiii",
-                         info.pr_ruid, info.pr_euid, info.pr_suid,
-                         info.pr_rgid, info.pr_egid, info.pr_sgid);
-}
-
-
-/*
- * Return process voluntary and involuntary context switches as a Python tuple.
- */
-static PyObject *
-psutil_proc_num_ctx_switches(PyObject *self, PyObject *args) {
-    int pid;
-    char path[1000];
-    prusage_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/usage", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    return Py_BuildValue("kk", info.pr_vctx, info.pr_ictx);
-}
-
-
-/*
- * Process IO counters.
- *
- * Commented out and left here as a reminder.  Apparently we cannot
- * retrieve process IO stats because:
- * - 'pr_ioch' is a sum of chars read and written, with no distinction
- * - 'pr_inblk' and 'pr_oublk', which should be the number of bytes
- *    read and written, hardly increase and according to:
- *    http://www.brendangregg.com/Solaris/paper_diskubyp1.pdf
- *    ...they should be meaningless anyway.
- *
-static PyObject*
-proc_io_counters(PyObject* self, PyObject* args) {
-    int pid;
-    char path[1000];
-    prusage_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/usage", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-
-    // On Solaris we only have 'pr_ioch' which accounts for bytes read
-    // *and* written.
-    // 'pr_inblk' and 'pr_oublk' should be expressed in blocks of
-    // 8KB according to:
-    // http://www.brendangregg.com/Solaris/paper_diskubyp1.pdf (pag. 8)
-    return Py_BuildValue("kkkk",
-                         info.pr_ioch,
-                         info.pr_ioch,
-                         info.pr_inblk,
-                         info.pr_oublk);
-}
-*/
-
-
-/*
- * Return information about a given process thread.
- */
-static PyObject *
-psutil_proc_query_thread(PyObject *self, PyObject *args) {
-    int pid, tid;
-    char path[1000];
-    lwpstatus_t info;
-    const char *procfs_path;
-
-    if (! PyArg_ParseTuple(args, "iis", &pid, &tid, &procfs_path))
-        return NULL;
-    sprintf(path, "%s/%i/lwp/%i/lwpstatus", procfs_path, pid, tid);
-    if (! psutil_file_to_struct(path, (void *)&info, sizeof(info)))
-        return NULL;
-    return Py_BuildValue("dd",
-                         PSUTIL_TV2DOUBLE(info.pr_utime),
-                         PSUTIL_TV2DOUBLE(info.pr_stime));
-}
-
-
-/*
- * Return information about system virtual memory.
- */
-static PyObject *
-psutil_swap_mem(PyObject *self, PyObject *args) {
-// XXX (arghhh!)
-// total/free swap mem: commented out as for some reason I can't
-// manage to get the same results shown by "swap -l", despite the
-// code below is exactly the same as:
-// http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/
-//    cmd/swap/swap.c
-// We're going to parse "swap -l" output from Python (sigh!)
-
-/*
-    struct swaptable     *st;
-    struct swapent    *swapent;
-    int    i;
-    struct stat64 statbuf;
-    char *path;
-    char fullpath[MAXPATHLEN+1];
-    int    num;
-
-    if ((num = swapctl(SC_GETNSWP, NULL)) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-    if (num == 0) {
-        PyErr_SetString(PyExc_RuntimeError, "no swap devices configured");
-        return NULL;
-    }
-    if ((st = malloc(num * sizeof(swapent_t) + sizeof (int))) == NULL) {
-        PyErr_SetString(PyExc_RuntimeError, "malloc failed");
-        return NULL;
-    }
-    if ((path = malloc(num * MAXPATHLEN)) == NULL) {
-        PyErr_SetString(PyExc_RuntimeError, "malloc failed");
-        return NULL;
-    }
-    swapent = st->swt_ent;
-    for (i = 0; i < num; i++, swapent++) {
-        swapent->ste_path = path;
-        path += MAXPATHLEN;
-    }
-    st->swt_n = num;
-    if ((num = swapctl(SC_LIST, st)) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        return NULL;
-    }
-
-    swapent = st->swt_ent;
-    long t = 0, f = 0;
-    for (i = 0; i < num; i++, swapent++) {
-        int diskblks_per_page =(int)(sysconf(_SC_PAGESIZE) >> DEV_BSHIFT);
-        t += (long)swapent->ste_pages;
-        f += (long)swapent->ste_free;
-    }
-
-    free(st);
-    return Py_BuildValue("(kk)", t, f);
-*/
-
-    kstat_ctl_t *kc;
-    kstat_t     *k;
-    cpu_stat_t  *cpu;
-    int         cpu_count = 0;
-    int         flag = 0;
-    uint_t      sin = 0;
-    uint_t      sout = 0;
-
-    kc = kstat_open();
-    if (kc == NULL)
-        return PyErr_SetFromErrno(PyExc_OSError);;
-
-    k = kc->kc_chain;
-    while (k != NULL) {
-        if ((strncmp(k->ks_name, "cpu_stat", 8) == 0) && \
-                (kstat_read(kc, k, NULL) != -1) )
-        {
-            flag = 1;
-            cpu = (cpu_stat_t *) k->ks_data;
-            sin += cpu->cpu_vminfo.pgswapin;    // num pages swapped in
-            sout += cpu->cpu_vminfo.pgswapout;  // num pages swapped out
-        }
-        cpu_count += 1;
-        k = k->ks_next;
-    }
-    kstat_close(kc);
-    if (!flag) {
-        PyErr_SetString(PyExc_RuntimeError, "no swap device was found");
-        return NULL;
-    }
-    return Py_BuildValue("(II)", sin, sout);
-}
-
-
-/*
- * Return users currently connected on the system.
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    struct utmpx *ut;
-    PyObject *py_tuple = NULL;
-    PyObject *py_username = NULL;
-    PyObject *py_tty = NULL;
-    PyObject *py_hostname = NULL;
-    PyObject *py_user_proc = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    setutxent();
-    while (NULL != (ut = getutxent())) {
-        if (ut->ut_type == USER_PROCESS)
-            py_user_proc = Py_True;
-        else
-            py_user_proc = Py_False;
-        py_username = PyUnicode_DecodeFSDefault(ut->ut_user);
-        if (! py_username)
-            goto error;
-        py_tty = PyUnicode_DecodeFSDefault(ut->ut_line);
-        if (! py_tty)
-            goto error;
-        py_hostname = PyUnicode_DecodeFSDefault(ut->ut_host);
-        if (! py_hostname)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOOfOi)",
-            py_username,              // username
-            py_tty,                   // tty
-            py_hostname,              // hostname
-            (float)ut->ut_tv.tv_sec,  // tstamp
-            py_user_proc,             // (bool) user process
-            ut->ut_pid                // process id
-        );
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_tty);
-        Py_CLEAR(py_hostname);
-        Py_CLEAR(py_tuple);
-    }
-    endutxent();
-
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tty);
-    Py_XDECREF(py_hostname);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    endutxent();
-    return NULL;
-}
-
-
-/*
- * Return disk mounted partitions as a list of tuples including device,
- * mount point and filesystem type.
- */
-static PyObject *
-psutil_disk_partitions(PyObject *self, PyObject *args) {
-    FILE *file;
-    struct mnttab mt;
-    PyObject *py_dev = NULL;
-    PyObject *py_mountp = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    file = fopen(MNTTAB, "rb");
-    if (file == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    while (getmntent(file, &mt) == 0) {
-        py_dev = PyUnicode_DecodeFSDefault(mt.mnt_special);
-        if (! py_dev)
-            goto error;
-        py_mountp = PyUnicode_DecodeFSDefault(mt.mnt_mountp);
-        if (! py_mountp)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "(OOss)",
-            py_dev,           // device
-            py_mountp,        // mount point
-            mt.mnt_fstype,    // fs type
-            mt.mnt_mntopts);  // options
-        if (py_tuple == NULL)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_dev);
-        Py_CLEAR(py_mountp);
-        Py_CLEAR(py_tuple);
-    }
-    fclose(file);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_dev);
-    Py_XDECREF(py_mountp);
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (file != NULL)
-        fclose(file);
-    return NULL;
-}
-
-
-/*
- * Return system-wide CPU times.
- */
-static PyObject *
-psutil_per_cpu_times(PyObject *self, PyObject *args) {
-    kstat_ctl_t *kc;
-    kstat_t *ksp;
-    cpu_stat_t cs;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_cputime = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    kc = kstat_open();
-    if (kc == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (ksp = kc->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
-        if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
-            if (kstat_read(kc, ksp, &cs) == -1) {
-                PyErr_SetFromErrno(PyExc_OSError);
-                goto error;
-            }
-            py_cputime = Py_BuildValue("ffff",
-                                       (float)cs.cpu_sysinfo.cpu[CPU_USER],
-                                       (float)cs.cpu_sysinfo.cpu[CPU_KERNEL],
-                                       (float)cs.cpu_sysinfo.cpu[CPU_IDLE],
-                                       (float)cs.cpu_sysinfo.cpu[CPU_WAIT]);
-            if (py_cputime == NULL)
-                goto error;
-            if (PyList_Append(py_retlist, py_cputime))
-                goto error;
-            Py_CLEAR(py_cputime);
-        }
-    }
-
-    kstat_close(kc);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_cputime);
-    Py_DECREF(py_retlist);
-    if (kc != NULL)
-        kstat_close(kc);
-    return NULL;
-}
-
-
-/*
- * Return disk IO statistics.
- */
-static PyObject *
-psutil_disk_io_counters(PyObject *self, PyObject *args) {
-    kstat_ctl_t *kc;
-    kstat_t *ksp;
-    kstat_io_t kio;
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_disk_info = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    kc = kstat_open();
-    if (kc == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);;
-        goto error;
-    }
-    ksp = kc->kc_chain;
-    while (ksp != NULL) {
-        if (ksp->ks_type == KSTAT_TYPE_IO) {
-            if (strcmp(ksp->ks_class, "disk") == 0) {
-                if (kstat_read(kc, ksp, &kio) == -1) {
-                    kstat_close(kc);
-                    return PyErr_SetFromErrno(PyExc_OSError);;
-                }
-                py_disk_info = Py_BuildValue(
-                    "(IIKKLL)",
-                    kio.reads,
-                    kio.writes,
-                    kio.nread,
-                    kio.nwritten,
-                    kio.rtime / 1000 / 1000,  // from nano to milli secs
-                    kio.wtime / 1000 / 1000   // from nano to milli secs
-                );
-                if (!py_disk_info)
-                    goto error;
-                if (PyDict_SetItemString(py_retdict, ksp->ks_name,
-                                         py_disk_info))
-                    goto error;
-                Py_CLEAR(py_disk_info);
-            }
-        }
-        ksp = ksp->ks_next;
-    }
-    kstat_close(kc);
-
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_disk_info);
-    Py_DECREF(py_retdict);
-    if (kc != NULL)
-        kstat_close(kc);
-    return NULL;
-}
-
-
-/*
- * Return process memory mappings.
- */
-static PyObject *
-psutil_proc_memory_maps(PyObject *self, PyObject *args) {
-    int pid;
-    int fd = -1;
-    char path[1000];
-    char perms[10];
-    const char *name;
-    struct stat st;
-    pstatus_t status;
-
-    prxmap_t *xmap = NULL, *p;
-    off_t size;
-    size_t nread;
-    int nmap;
-    uintptr_t pr_addr_sz;
-    uintptr_t stk_base_sz, brk_base_sz;
-    const char *procfs_path;
-
-    PyObject *py_tuple = NULL;
-    PyObject *py_path = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, "is", &pid, &procfs_path))
-        goto error;
-
-    sprintf(path, "%s/%i/status", procfs_path, pid);
-    if (! psutil_file_to_struct(path, (void *)&status, sizeof(status)))
-        goto error;
-
-    sprintf(path, "%s/%i/xmap", procfs_path, pid);
-    if (stat(path, &st) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    size = st.st_size;
-
-    fd = open(path, O_RDONLY);
-    if (fd == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    xmap = (prxmap_t *)malloc(size);
-    if (xmap == NULL) {
-        PyErr_NoMemory();
-        goto error;
-    }
-
-    nread = pread(fd, xmap, size, 0);
-    nmap = nread / sizeof(prxmap_t);
-    p = xmap;
-
-    while (nmap) {
-        nmap -= 1;
-        if (p == NULL) {
-            p += 1;
-            continue;
-        }
-
-        perms[0] = '\0';
-        pr_addr_sz = p->pr_vaddr + p->pr_size;
-
-        // perms
-        sprintf(perms, "%c%c%c%c", p->pr_mflags & MA_READ ? 'r' : '-',
-                p->pr_mflags & MA_WRITE ? 'w' : '-',
-                p->pr_mflags & MA_EXEC ? 'x' : '-',
-                p->pr_mflags & MA_SHARED ? 's' : '-');
-
-        // name
-        if (strlen(p->pr_mapname) > 0) {
-            name = p->pr_mapname;
-        }
-        else {
-            if ((p->pr_mflags & MA_ISM) || (p->pr_mflags & MA_SHM)) {
-                name = "[shmid]";
-            }
-            else {
-                stk_base_sz = status.pr_stkbase + status.pr_stksize;
-                brk_base_sz = status.pr_brkbase + status.pr_brksize;
-
-                if ((pr_addr_sz > status.pr_stkbase) &&
-                        (p->pr_vaddr < stk_base_sz)) {
-                    name = "[stack]";
-                }
-                else if ((p->pr_mflags & MA_ANON) && \
-                         (pr_addr_sz > status.pr_brkbase) && \
-                         (p->pr_vaddr < brk_base_sz)) {
-                    name = "[heap]";
-                }
-                else {
-                    name = "[anon]";
-                }
-            }
-        }
-
-        py_path = PyUnicode_DecodeFSDefault(name);
-        if (! py_path)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "kksOkkk",
-            (unsigned long)p->pr_vaddr,
-            (unsigned long)pr_addr_sz,
-            perms,
-            py_path,
-            (unsigned long)p->pr_rss * p->pr_pagesize,
-            (unsigned long)p->pr_anon * p->pr_pagesize,
-            (unsigned long)p->pr_locked * p->pr_pagesize);
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_path);
-        Py_CLEAR(py_tuple);
-
-        // increment pointer
-        p += 1;
-    }
-
-    close(fd);
-    free(xmap);
-    return py_retlist;
-
-error:
-    if (fd != -1)
-        close(fd);
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_path);
-    Py_DECREF(py_retlist);
-    if (xmap != NULL)
-        free(xmap);
-    return NULL;
-}
-
-
-/*
- * Return a list of tuples for network I/O statistics.
- */
-static PyObject *
-psutil_net_io_counters(PyObject *self, PyObject *args) {
-    kstat_ctl_t    *kc = NULL;
-    kstat_t *ksp;
-    kstat_named_t *rbytes, *wbytes, *rpkts, *wpkts, *ierrs, *oerrs;
-    int ret;
-    int sock = -1;
-    struct lifreq ifr;
-
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_ifc_info = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    kc = kstat_open();
-    if (kc == NULL)
-        goto error;
-
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    ksp = kc->kc_chain;
-    while (ksp != NULL) {
-        if (ksp->ks_type != KSTAT_TYPE_NAMED)
-            goto next;
-        if (strcmp(ksp->ks_class, "net") != 0)
-            goto next;
-        // skip 'lo' (localhost) because it doesn't have the statistics we need
-        // and it makes kstat_data_lookup() fail
-        if (strcmp(ksp->ks_module, "lo") == 0)
-            goto next;
-
-        // check if this is a network interface by sending a ioctl
-        strncpy(ifr.lifr_name, ksp->ks_name, sizeof(ifr.lifr_name));
-        ret = ioctl(sock, SIOCGLIFFLAGS, &ifr);
-        if (ret == -1)
-            goto next;
-
-        if (kstat_read(kc, ksp, NULL) == -1) {
-            errno = 0;
-            goto next;
-        }
-
-        rbytes = (kstat_named_t *)kstat_data_lookup(ksp, "rbytes");
-        wbytes = (kstat_named_t *)kstat_data_lookup(ksp, "obytes");
-        rpkts = (kstat_named_t *)kstat_data_lookup(ksp, "ipackets");
-        wpkts = (kstat_named_t *)kstat_data_lookup(ksp, "opackets");
-        ierrs = (kstat_named_t *)kstat_data_lookup(ksp, "ierrors");
-        oerrs = (kstat_named_t *)kstat_data_lookup(ksp, "oerrors");
-
-        if ((rbytes == NULL) || (wbytes == NULL) || (rpkts == NULL) ||
-                (wpkts == NULL) || (ierrs == NULL) || (oerrs == NULL))
-        {
-            PyErr_SetString(PyExc_RuntimeError, "kstat_data_lookup() failed");
-            goto error;
-        }
-
-        if (rbytes->data_type == KSTAT_DATA_UINT64)
-        {
-            py_ifc_info = Py_BuildValue("(KKKKIIii)",
-                                        wbytes->value.ui64,
-                                        rbytes->value.ui64,
-                                        wpkts->value.ui64,
-                                        rpkts->value.ui64,
-                                        ierrs->value.ui32,
-                                        oerrs->value.ui32,
-                                        0,  // dropin not supported
-                                        0   // dropout not supported
-                                       );
-        }
-        else
-        {
-            py_ifc_info = Py_BuildValue("(IIIIIIii)",
-                                        wbytes->value.ui32,
-                                        rbytes->value.ui32,
-                                        wpkts->value.ui32,
-                                        rpkts->value.ui32,
-                                        ierrs->value.ui32,
-                                        oerrs->value.ui32,
-                                        0,  // dropin not supported
-                                        0   // dropout not supported
-                                       );
-        }
-        if (!py_ifc_info)
-            goto error;
-        if (PyDict_SetItemString(py_retdict, ksp->ks_name, py_ifc_info))
-            goto error;
-        Py_CLEAR(py_ifc_info);
-        goto next;
-
-next:
-        ksp = ksp->ks_next;
-    }
-
-    kstat_close(kc);
-    close(sock);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_ifc_info);
-    Py_DECREF(py_retdict);
-    if (kc != NULL)
-        kstat_close(kc);
-    if (sock != -1) {
-        close(sock);
-    }
-    return NULL;
-}
-
-
-/*
- * Return TCP and UDP connections opened by process.
- * UNIX sockets are excluded.
- *
- * Thanks to:
- * https://github.com/DavidGriffith/finx/blob/master/
- *     nxsensor-3.5.0-1/src/sysdeps/solaris.c
- * ...and:
- * https://hg.java.net/hg/solaris~on-src/file/tip/usr/src/cmd/
- *     cmd-inet/usr.bin/netstat/netstat.c
- */
-static PyObject *
-psutil_net_connections(PyObject *self, PyObject *args) {
-    long pid;
-    int sd = 0;
-    mib2_tcpConnEntry_t tp;
-    mib2_udpEntry_t     ude;
-#if defined(AF_INET6)
-    mib2_tcp6ConnEntry_t tp6;
-    mib2_udp6Entry_t     ude6;
-#endif
-    char buf[512];
-    int i, flags, getcode, num_ent, state, ret;
-    char lip[INET6_ADDRSTRLEN], rip[INET6_ADDRSTRLEN];
-    int lport, rport;
-    int processed_pid;
-    int databuf_init = 0;
-    struct strbuf ctlbuf, databuf;
-    struct T_optmgmt_req tor = {0};
-    struct T_optmgmt_ack toa = {0};
-    struct T_error_ack   tea = {0};
-    struct opthdr        mibhdr = {0};
-
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_laddr = NULL;
-    PyObject *py_raddr = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, "l", &pid))
-        goto error;
-
-    sd = open("/dev/arp", O_RDWR);
-    if (sd == -1) {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/arp");
-        goto error;
-    }
-
-    ret = ioctl(sd, I_PUSH, "tcp");
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    ret = ioctl(sd, I_PUSH, "udp");
-    if (ret == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-    //
-    // OK, this mess is basically copied and pasted from nxsensor project
-    // which copied and pasted it from netstat source code, mibget()
-    // function.  Also see:
-    // http://stackoverflow.com/questions/8723598/
-    tor.PRIM_type = T_SVR4_OPTMGMT_REQ;
-    tor.OPT_offset = sizeof (struct T_optmgmt_req);
-    tor.OPT_length = sizeof (struct opthdr);
-    tor.MGMT_flags = T_CURRENT;
-    mibhdr.level = MIB2_IP;
-    mibhdr.name  = 0;
-
-#ifdef NEW_MIB_COMPLIANT
-    mibhdr.len   = 1;
-#else
-    mibhdr.len   = 0;
-#endif
-    memcpy(buf, &tor, sizeof tor);
-    memcpy(buf + tor.OPT_offset, &mibhdr, sizeof mibhdr);
-
-    ctlbuf.buf = buf;
-    ctlbuf.len = tor.OPT_offset + tor.OPT_length;
-    flags = 0;  // request to be sent in non-priority
-
-    if (putmsg(sd, &ctlbuf, (struct strbuf *)0, flags) == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    ctlbuf.maxlen = sizeof (buf);
-    for (;;) {
-        flags = 0;
-        getcode = getmsg(sd, &ctlbuf, (struct strbuf *)0, &flags);
-        memcpy(&toa, buf, sizeof toa);
-        memcpy(&tea, buf, sizeof tea);
-
-        if (getcode != MOREDATA ||
-                ctlbuf.len < (int)sizeof (struct T_optmgmt_ack) ||
-                toa.PRIM_type != T_OPTMGMT_ACK ||
-                toa.MGMT_flags != T_SUCCESS)
-        {
-            break;
-        }
-        if (ctlbuf.len >= (int)sizeof (struct T_error_ack) &&
-                tea.PRIM_type == T_ERROR_ACK)
-        {
-            PyErr_SetString(PyExc_RuntimeError, "ERROR_ACK");
-            goto error;
-        }
-        if (getcode == 0 &&
-                ctlbuf.len >= (int)sizeof (struct T_optmgmt_ack) &&
-                toa.PRIM_type == T_OPTMGMT_ACK &&
-                toa.MGMT_flags == T_SUCCESS)
-        {
-            PyErr_SetString(PyExc_RuntimeError, "ERROR_T_OPTMGMT_ACK");
-            goto error;
-        }
-
-        memset(&mibhdr, 0x0, sizeof(mibhdr));
-        memcpy(&mibhdr, buf + toa.OPT_offset, toa.OPT_length);
-
-        databuf.maxlen = mibhdr.len;
-        databuf.len = 0;
-        databuf.buf = (char *)malloc((int)mibhdr.len);
-        if (!databuf.buf) {
-            PyErr_NoMemory();
-            goto error;
-        }
-        databuf_init = 1;
-
-        flags = 0;
-        getcode = getmsg(sd, (struct strbuf *)0, &databuf, &flags);
-        if (getcode < 0) {
-            PyErr_SetFromErrno(PyExc_OSError);
-            goto error;
-        }
-
-        // TCPv4
-        if (mibhdr.level == MIB2_TCP && mibhdr.name == MIB2_TCP_13) {
-            num_ent = mibhdr.len / sizeof(mib2_tcpConnEntry_t);
-            for (i = 0; i < num_ent; i++) {
-                memcpy(&tp, databuf.buf + i * sizeof tp, sizeof tp);
-#ifdef NEW_MIB_COMPLIANT
-                processed_pid = tp.tcpConnCreationProcess;
-#else
-                processed_pid = 0;
-#endif
-                if (pid != -1 && processed_pid != pid)
-                    continue;
-                // construct local/remote addresses
-                inet_ntop(AF_INET, &tp.tcpConnLocalAddress, lip, sizeof(lip));
-                inet_ntop(AF_INET, &tp.tcpConnRemAddress, rip, sizeof(rip));
-                lport = tp.tcpConnLocalPort;
-                rport = tp.tcpConnRemPort;
-
-                // contruct python tuple/list
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                if (rport != 0)
-                    py_raddr = Py_BuildValue("(si)", rip, rport);
-                else {
-                    py_raddr = Py_BuildValue("()");
-                }
-                if (!py_raddr)
-                    goto error;
-                state = tp.tcpConnEntryInfo.ce_state;
-
-                // add item
-                py_tuple = Py_BuildValue("(iiiNNiI)", -1, AF_INET, SOCK_STREAM,
-                                         py_laddr, py_raddr, state,
-                                         processed_pid);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-            }
-        }
-#if defined(AF_INET6)
-        // TCPv6
-        else if (mibhdr.level == MIB2_TCP6 && mibhdr.name == MIB2_TCP6_CONN)
-        {
-            num_ent = mibhdr.len / sizeof(mib2_tcp6ConnEntry_t);
-
-            for (i = 0; i < num_ent; i++) {
-                memcpy(&tp6, databuf.buf + i * sizeof tp6, sizeof tp6);
-#ifdef NEW_MIB_COMPLIANT
-                processed_pid = tp6.tcp6ConnCreationProcess;
-#else
-                        processed_pid = 0;
-#endif
-                if (pid != -1 && processed_pid != pid)
-                    continue;
-                // construct local/remote addresses
-                inet_ntop(AF_INET6, &tp6.tcp6ConnLocalAddress, lip, sizeof(lip));
-                inet_ntop(AF_INET6, &tp6.tcp6ConnRemAddress, rip, sizeof(rip));
-                lport = tp6.tcp6ConnLocalPort;
-                rport = tp6.tcp6ConnRemPort;
-
-                // contruct python tuple/list
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                if (rport != 0)
-                    py_raddr = Py_BuildValue("(si)", rip, rport);
-                else
-                    py_raddr = Py_BuildValue("()");
-                if (!py_raddr)
-                    goto error;
-                state = tp6.tcp6ConnEntryInfo.ce_state;
-
-                // add item
-                py_tuple = Py_BuildValue("(iiiNNiI)", -1, AF_INET6, SOCK_STREAM,
-                                         py_laddr, py_raddr, state, processed_pid);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-            }
-        }
-#endif
-        // UDPv4
-        else if (mibhdr.level == MIB2_UDP || mibhdr.level == MIB2_UDP_ENTRY) {
-            num_ent = mibhdr.len / sizeof(mib2_udpEntry_t);
-            assert(num_ent * sizeof(mib2_udpEntry_t) == mibhdr.len);
-            for (i = 0; i < num_ent; i++) {
-                memcpy(&ude, databuf.buf + i * sizeof ude, sizeof ude);
-#ifdef NEW_MIB_COMPLIANT
-                processed_pid = ude.udpCreationProcess;
-#else
-                processed_pid = 0;
-#endif
-                if (pid != -1 && processed_pid != pid)
-                    continue;
-                // XXX Very ugly hack! It seems we get here only the first
-                // time we bump into a UDPv4 socket.  PID is a very high
-                // number (clearly impossible) and the address does not
-                // belong to any valid interface.  Not sure what else
-                // to do other than skipping.
-                if (processed_pid > 131072)
-                    continue;
-                inet_ntop(AF_INET, &ude.udpLocalAddress, lip, sizeof(lip));
-                lport = ude.udpLocalPort;
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                py_raddr = Py_BuildValue("()");
-                if (!py_raddr)
-                    goto error;
-                py_tuple = Py_BuildValue("(iiiNNiI)", -1, AF_INET, SOCK_DGRAM,
-                                         py_laddr, py_raddr, PSUTIL_CONN_NONE,
-                                         processed_pid);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-            }
-        }
-#if defined(AF_INET6)
-        // UDPv6
-        else if (mibhdr.level == MIB2_UDP6 ||
-                    mibhdr.level == MIB2_UDP6_ENTRY)
-            {
-            num_ent = mibhdr.len / sizeof(mib2_udp6Entry_t);
-            for (i = 0; i < num_ent; i++) {
-                memcpy(&ude6, databuf.buf + i * sizeof ude6, sizeof ude6);
-#ifdef NEW_MIB_COMPLIANT
-                processed_pid = ude6.udp6CreationProcess;
-#else
-                processed_pid = 0;
-#endif
-                if (pid != -1 && processed_pid != pid)
-                    continue;
-                inet_ntop(AF_INET6, &ude6.udp6LocalAddress, lip, sizeof(lip));
-                lport = ude6.udp6LocalPort;
-                py_laddr = Py_BuildValue("(si)", lip, lport);
-                if (!py_laddr)
-                    goto error;
-                py_raddr = Py_BuildValue("()");
-                if (!py_raddr)
-                    goto error;
-                py_tuple = Py_BuildValue("(iiiNNiI)", -1, AF_INET6, SOCK_DGRAM,
-                                         py_laddr, py_raddr, PSUTIL_CONN_NONE,
-                                         processed_pid);
-                if (!py_tuple)
-                    goto error;
-                if (PyList_Append(py_retlist, py_tuple))
-                    goto error;
-                Py_CLEAR(py_tuple);
-            }
-        }
-#endif
-        free(databuf.buf);
-    }
-
-    close(sd);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_laddr);
-    Py_XDECREF(py_raddr);
-    Py_DECREF(py_retlist);
-    if (databuf_init == 1)
-        free(databuf.buf);
-    if (sd != 0)
-        close(sd);
-    return NULL;
-}
-
-
-static PyObject *
-psutil_boot_time(PyObject *self, PyObject *args) {
-    float boot_time = 0.0;
-    struct utmpx *ut;
-
-    setutxent();
-    while (NULL != (ut = getutxent())) {
-        if (ut->ut_type == BOOT_TIME) {
-            boot_time = (float)ut->ut_tv.tv_sec;
-            break;
-        }
-    }
-    endutxent();
-    if (fabs(boot_time) < 0.000001) {
-        /* could not find BOOT_TIME in getutxent loop */
-        PyErr_SetString(PyExc_RuntimeError, "can't determine boot time");
-        return NULL;
-    }
-    return Py_BuildValue("f", boot_time);
-}
-
-
-/*
- * Return the number of physical CPU cores on the system.
- */
-static PyObject *
-psutil_cpu_count_phys(PyObject *self, PyObject *args) {
-    kstat_ctl_t *kc;
-    kstat_t *ksp;
-    int ncpus = 0;
-
-    kc = kstat_open();
-    if (kc == NULL)
-        goto error;
-    ksp = kstat_lookup(kc, "cpu_info", -1, NULL);
-    if (ksp == NULL)
-        goto error;
-
-    for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
-        if (strcmp(ksp->ks_module, "cpu_info") != 0)
-            continue;
-        if (kstat_read(kc, ksp, NULL) == -1)
-            goto error;
-        ncpus += 1;
-    }
-
-    kstat_close(kc);
-    if (ncpus > 0)
-        return Py_BuildValue("i", ncpus);
-    else
-        goto error;
-
-error:
-    // mimic os.cpu_count()
-    if (kc != NULL)
-        kstat_close(kc);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Return stats about a particular network
- * interface.  References:
- * https://github.com/dpaleino/wicd/blob/master/wicd/backends/be-ioctl.py
- * http://www.i-scream.org/libstatgrab/
- */
-static PyObject*
-psutil_net_if_stats(PyObject* self, PyObject* args) {
-    kstat_ctl_t *kc = NULL;
-    kstat_t *ksp;
-    kstat_named_t *knp;
-    int ret;
-    int sock = -1;
-    int duplex;
-    int speed;
-
-    PyObject *py_retdict = PyDict_New();
-    PyObject *py_ifc_info = NULL;
-    PyObject *py_is_up = NULL;
-
-    if (py_retdict == NULL)
-        return NULL;
-    kc = kstat_open();
-    if (kc == NULL)
-        goto error;
-    sock = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock == -1) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
-        if (strcmp(ksp->ks_class, "net") == 0) {
-            struct lifreq ifr;
-
-            kstat_read(kc, ksp, NULL);
-            if (ksp->ks_type != KSTAT_TYPE_NAMED)
-                continue;
-            if (strcmp(ksp->ks_class, "net") != 0)
-                continue;
-
-            strncpy(ifr.lifr_name, ksp->ks_name, sizeof(ifr.lifr_name));
-            ret = ioctl(sock, SIOCGLIFFLAGS, &ifr);
-            if (ret == -1)
-                continue;  // not a network interface
-
-            // is up?
-            if ((ifr.lifr_flags & IFF_UP) != 0) {
-                if ((knp = kstat_data_lookup(ksp, "link_up")) != NULL) {
-                    if (knp->value.ui32 != 0u)
-                        py_is_up = Py_True;
-                    else
-                        py_is_up = Py_False;
-                }
-                else {
-                    py_is_up = Py_True;
-                }
-            }
-            else {
-                py_is_up = Py_False;
-            }
-            Py_INCREF(py_is_up);
-
-            // duplex
-            duplex = 0;  // unknown
-            if ((knp = kstat_data_lookup(ksp, "link_duplex")) != NULL) {
-                if (knp->value.ui32 == 1)
-                    duplex = 1;  // half
-                else if (knp->value.ui32 == 2)
-                    duplex = 2;  // full
-            }
-
-            // speed
-            if ((knp = kstat_data_lookup(ksp, "ifspeed")) != NULL)
-                // expressed in bits per sec, we want mega bits per sec
-                speed = (int)knp->value.ui64 / 1000000;
-            else
-                speed = 0;
-
-            // mtu
-            ret = ioctl(sock, SIOCGLIFMTU, &ifr);
-            if (ret == -1)
-                goto error;
-
-            py_ifc_info = Py_BuildValue("(Oiii)", py_is_up, duplex, speed,
-                                        ifr.lifr_mtu);
-            if (!py_ifc_info)
-                goto error;
-            if (PyDict_SetItemString(py_retdict, ksp->ks_name, py_ifc_info))
-                goto error;
-            Py_CLEAR(py_ifc_info);
-        }
-    }
-
-    close(sock);
-    kstat_close(kc);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_is_up);
-    Py_XDECREF(py_ifc_info);
-    Py_DECREF(py_retdict);
-    if (sock != -1)
-        close(sock);
-    if (kc != NULL)
-        kstat_close(kc);
-    PyErr_SetFromErrno(PyExc_OSError);
-    return NULL;
-}
-
-
-/*
- * Return CPU statistics.
- */
-static PyObject *
-psutil_cpu_stats(PyObject *self, PyObject *args) {
-    kstat_ctl_t *kc;
-    kstat_t *ksp;
-    cpu_stat_t cs;
-    unsigned int ctx_switches = 0;
-    unsigned int interrupts = 0;
-    unsigned int traps = 0;
-    unsigned int syscalls = 0;
-
-    kc = kstat_open();
-    if (kc == NULL) {
-        PyErr_SetFromErrno(PyExc_OSError);
-        goto error;
-    }
-
-    for (ksp = kc->kc_chain; ksp != NULL; ksp = ksp->ks_next) {
-        if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
-            if (kstat_read(kc, ksp, &cs) == -1) {
-                PyErr_SetFromErrno(PyExc_OSError);
-                goto error;
-            }
-            // voluntary + involuntary
-            ctx_switches += cs.cpu_sysinfo.pswitch + cs.cpu_sysinfo.inv_swtch;
-            interrupts += cs.cpu_sysinfo.intr;
-            traps += cs.cpu_sysinfo.trap;
-            syscalls += cs.cpu_sysinfo.syscall;
-        }
-    }
-
-    kstat_close(kc);
-    return Py_BuildValue(
-        "IIII", ctx_switches, interrupts, syscalls, traps);
-
-error:
-    if (kc != NULL)
-        kstat_close(kc);
-    return NULL;
-}
-
-
-/*
- * define the psutil C module methods and initialize the module.
- */
-static PyMethodDef
-PsutilMethods[] = {
-    // --- process-related functions
-    {"proc_basic_info", psutil_proc_basic_info, METH_VARARGS,
-     "Return process ppid, rss, vms, ctime, nice, nthreads, status and tty"},
-    {"proc_name_and_args", psutil_proc_name_and_args, METH_VARARGS,
-     "Return process name and args."},
-    {"proc_environ", psutil_proc_environ, METH_VARARGS,
-      "Return process environment."},
-    {"proc_cpu_times", psutil_proc_cpu_times, METH_VARARGS,
-     "Return process user and system CPU times."},
-    {"proc_cred", psutil_proc_cred, METH_VARARGS,
-     "Return process uids/gids."},
-    {"query_process_thread", psutil_proc_query_thread, METH_VARARGS,
-     "Return info about a process thread"},
-    {"proc_memory_maps", psutil_proc_memory_maps, METH_VARARGS,
-     "Return process memory mappings"},
-    {"proc_num_ctx_switches", psutil_proc_num_ctx_switches, METH_VARARGS,
-     "Return the number of context switches performed by process"},
-    {"proc_cpu_num", psutil_proc_cpu_num, METH_VARARGS,
-     "Return what CPU the process is on"},
-
-    // --- system-related functions
-    {"swap_mem", psutil_swap_mem, METH_VARARGS,
-     "Return information about system swap memory."},
-    {"users", psutil_users, METH_VARARGS,
-     "Return currently connected users."},
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return disk partitions."},
-    {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS,
-     "Return system per-CPU times."},
-    {"disk_io_counters", psutil_disk_io_counters, METH_VARARGS,
-     "Return a Python dict of tuples for disk I/O statistics."},
-    {"net_io_counters", psutil_net_io_counters, METH_VARARGS,
-     "Return a Python dict of tuples for network I/O statistics."},
-    {"boot_time", psutil_boot_time, METH_VARARGS,
-     "Return system boot time in seconds since the EPOCH."},
-    {"cpu_count_phys", psutil_cpu_count_phys, METH_VARARGS,
-     "Return the number of physical CPUs on the system."},
-    {"net_connections", psutil_net_connections, METH_VARARGS,
-     "Return TCP and UDP syste-wide open connections."},
-    {"net_if_stats", psutil_net_if_stats, METH_VARARGS,
-     "Return NIC stats (isup, duplex, speed, mtu)"},
-    {"cpu_stats", psutil_cpu_stats, METH_VARARGS,
-     "Return CPU statistics"},
-
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-
-struct module_state {
-    PyObject *error;
-};
-
-#if PY_MAJOR_VERSION >= 3
-#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
-#else
-#define GETSTATE(m) (&_state)
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-
-static int
-psutil_sunos_traverse(PyObject *m, visitproc visit, void *arg) {
-    Py_VISIT(GETSTATE(m)->error);
-    return 0;
-}
-
-static int
-psutil_sunos_clear(PyObject *m) {
-    Py_CLEAR(GETSTATE(m)->error);
-    return 0;
-}
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "psutil_sunos",
-    NULL,
-    sizeof(struct module_state),
-    PsutilMethods,
-    NULL,
-    psutil_sunos_traverse,
-    psutil_sunos_clear,
-    NULL
-};
-
-#define INITERROR return NULL
-
-PyMODINIT_FUNC PyInit__psutil_sunos(void)
-
-#else
-#define INITERROR return
-
-void init_psutil_sunos(void)
-#endif
-{
-#if PY_MAJOR_VERSION >= 3
-    PyObject *module = PyModule_Create(&moduledef);
-#else
-    PyObject *module = Py_InitModule("_psutil_sunos", PsutilMethods);
-#endif
-    if (module == NULL)
-        INITERROR;
-
-    if (psutil_setup() != 0)
-        INITERROR;
-
-    PyModule_AddIntConstant(module, "version", PSUTIL_VERSION);
-
-    PyModule_AddIntConstant(module, "SSLEEP", SSLEEP);
-    PyModule_AddIntConstant(module, "SRUN", SRUN);
-    PyModule_AddIntConstant(module, "SZOMB", SZOMB);
-    PyModule_AddIntConstant(module, "SSTOP", SSTOP);
-    PyModule_AddIntConstant(module, "SIDL", SIDL);
-    PyModule_AddIntConstant(module, "SONPROC", SONPROC);
-#ifdef SWAIT
-    PyModule_AddIntConstant(module, "SWAIT", SWAIT);
-#else
-    /* sys/proc.h started defining SWAIT somewhere
-     * after Update 3 and prior to Update 5 included.
-     */
-    PyModule_AddIntConstant(module, "SWAIT", 0);
-#endif
-
-    PyModule_AddIntConstant(module, "PRNODEV", PRNODEV);  // for process tty
-
-    PyModule_AddIntConstant(module, "TCPS_CLOSED", TCPS_CLOSED);
-    PyModule_AddIntConstant(module, "TCPS_CLOSING", TCPS_CLOSING);
-    PyModule_AddIntConstant(module, "TCPS_CLOSE_WAIT", TCPS_CLOSE_WAIT);
-    PyModule_AddIntConstant(module, "TCPS_LISTEN", TCPS_LISTEN);
-    PyModule_AddIntConstant(module, "TCPS_ESTABLISHED", TCPS_ESTABLISHED);
-    PyModule_AddIntConstant(module, "TCPS_SYN_SENT", TCPS_SYN_SENT);
-    PyModule_AddIntConstant(module, "TCPS_SYN_RCVD", TCPS_SYN_RCVD);
-    PyModule_AddIntConstant(module, "TCPS_FIN_WAIT_1", TCPS_FIN_WAIT_1);
-    PyModule_AddIntConstant(module, "TCPS_FIN_WAIT_2", TCPS_FIN_WAIT_2);
-    PyModule_AddIntConstant(module, "TCPS_LAST_ACK", TCPS_LAST_ACK);
-    PyModule_AddIntConstant(module, "TCPS_TIME_WAIT", TCPS_TIME_WAIT);
-    // sunos specific
-    PyModule_AddIntConstant(module, "TCPS_IDLE", TCPS_IDLE);
-    // sunos specific
-    PyModule_AddIntConstant(module, "TCPS_BOUND", TCPS_BOUND);
-    PyModule_AddIntConstant(module, "PSUTIL_CONN_NONE", PSUTIL_CONN_NONE);
-
-    if (module == NULL)
-        INITERROR;
-#if PY_MAJOR_VERSION >= 3
-    return module;
-#endif
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_windows.c firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_windows.c
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_psutil_windows.c	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_psutil_windows.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1825 +0,0 @@
-/*
- * Copyright (c) 2009, Jay Loden, Giampaolo Rodola'. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Windows platform-specific module methods for _psutil_windows.
- *
- * List of undocumented Windows NT APIs which are used in here and in
- * other modules:
- * - NtQuerySystemInformation
- * - NtQueryInformationProcess
- * - NtQueryObject
- * - NtSuspendProcess
- * - NtResumeProcess
- */
-
-// Fixes clash between winsock2.h and windows.h
-#define WIN32_LEAN_AND_MEAN
-
-#include <Python.h>
-#include <windows.h>
-#include <Psapi.h>  // memory_info(), memory_maps()
-#include <signal.h>
-#include <tlhelp32.h>  // threads(), PROCESSENTRY32
-#include <wtsapi32.h>  // users()
-
-// Link with Iphlpapi.lib
-#pragma comment(lib, "IPHLPAPI.lib")
-
-#include "_psutil_common.h"
-#include "arch/windows/security.h"
-#include "arch/windows/process_utils.h"
-#include "arch/windows/process_info.h"
-#include "arch/windows/process_handles.h"
-#include "arch/windows/disk.h"
-#include "arch/windows/cpu.h"
-#include "arch/windows/net.h"
-#include "arch/windows/services.h"
-#include "arch/windows/socks.h"
-#include "arch/windows/wmi.h"
-
-// Raised by Process.wait().
-static PyObject *TimeoutExpired;
-static PyObject *TimeoutAbandoned;
-
-
-/*
- * Return the number of logical, active CPUs. Return 0 if undetermined.
- * See discussion at: https://bugs.python.org/issue33166#msg314631
- */
-unsigned int
-psutil_get_num_cpus(int fail_on_err) {
-    unsigned int ncpus = 0;
-
-    // Minimum requirement: Windows 7
-    if (GetActiveProcessorCount != NULL) {
-        ncpus = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
-        if ((ncpus == 0) && (fail_on_err == 1)) {
-            PyErr_SetFromWindowsErr(0);
-        }
-    }
-    else {
-        psutil_debug("GetActiveProcessorCount() not available; "
-                     "using GetSystemInfo()");
-        ncpus = (unsigned int)PSUTIL_SYSTEM_INFO.dwNumberOfProcessors;
-        if ((ncpus <= 0) && (fail_on_err == 1)) {
-            PyErr_SetString(
-                PyExc_RuntimeError,
-                "GetSystemInfo() failed to retrieve CPU count");
-        }
-    }
-    return ncpus;
-}
-
-
-/*
- * Return a Python float representing the system uptime expressed in seconds
- * since the epoch.
- */
-static PyObject *
-psutil_boot_time(PyObject *self, PyObject *args) {
-    ULONGLONG upTime;
-    FILETIME fileTime;
-
-    GetSystemTimeAsFileTime(&fileTime);
-    // Number of milliseconds that have elapsed since the system was started.
-    upTime = GetTickCount64() / 1000ull;
-    return Py_BuildValue("d", psutil_FiletimeToUnixTime(fileTime) - upTime);
-}
-
-
-/*
- * Return 1 if PID exists in the current process list, else 0.
- */
-static PyObject *
-psutil_pid_exists(PyObject *self, PyObject *args) {
-    DWORD pid;
-    int status;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    status = psutil_pid_is_running(pid);
-    if (-1 == status)
-        return NULL; // exception raised in psutil_pid_is_running()
-    return PyBool_FromLong(status);
-}
-
-
-/*
- * Return a Python list of all the PIDs running on the system.
- */
-static PyObject *
-psutil_pids(PyObject *self, PyObject *args) {
-    DWORD *proclist = NULL;
-    DWORD numberOfReturnedPIDs;
-    DWORD i;
-    PyObject *py_pid = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    proclist = psutil_get_pids(&numberOfReturnedPIDs);
-    if (proclist == NULL)
-        goto error;
-
-    for (i = 0; i < numberOfReturnedPIDs; i++) {
-        py_pid = PyLong_FromPid(proclist[i]);
-        if (!py_pid)
-            goto error;
-        if (PyList_Append(py_retlist, py_pid))
-            goto error;
-        Py_CLEAR(py_pid);
-    }
-
-    // free C array allocated for PIDs
-    free(proclist);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_pid);
-    Py_DECREF(py_retlist);
-    if (proclist != NULL)
-        free(proclist);
-    return NULL;
-}
-
-
-/*
- * Kill a process given its PID.
- */
-static PyObject *
-psutil_proc_kill(PyObject *self, PyObject *args) {
-    HANDLE hProcess;
-    DWORD pid;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (pid == 0)
-        return AccessDenied("automatically set for PID 0");
-
-    hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
-    if (hProcess == NULL) {
-        if (GetLastError() == ERROR_INVALID_PARAMETER) {
-            // see https://github.com/giampaolo/psutil/issues/24
-            psutil_debug("OpenProcess -> ERROR_INVALID_PARAMETER turned "
-                         "into NoSuchProcess");
-            NoSuchProcess("OpenProcess");
-        }
-        else {
-            PyErr_SetFromWindowsErr(0);
-        }
-        return NULL;
-    }
-
-    if (! TerminateProcess(hProcess, SIGTERM)) {
-        // ERROR_ACCESS_DENIED may happen if the process already died. See:
-        // https://github.com/giampaolo/psutil/issues/1099
-        if (GetLastError() != ERROR_ACCESS_DENIED) {
-            PyErr_SetFromOSErrnoWithSyscall("TerminateProcess");
-            return NULL;
-        }
-    }
-
-    CloseHandle(hProcess);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Wait for process to terminate and return its exit code.
- */
-static PyObject *
-psutil_proc_wait(PyObject *self, PyObject *args) {
-    HANDLE hProcess;
-    DWORD ExitCode;
-    DWORD retVal;
-    DWORD pid;
-    long timeout;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "l", &pid, &timeout))
-        return NULL;
-    if (pid == 0)
-        return AccessDenied("automatically set for PID 0");
-
-    hProcess = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
-                           FALSE, pid);
-    if (hProcess == NULL) {
-        if (GetLastError() == ERROR_INVALID_PARAMETER) {
-            // no such process; we do not want to raise NSP but
-            // return None instead.
-            Py_RETURN_NONE;
-        }
-        else {
-            PyErr_SetFromWindowsErr(0);
-            return NULL;
-        }
-    }
-
-    // wait until the process has terminated
-    Py_BEGIN_ALLOW_THREADS
-    retVal = WaitForSingleObject(hProcess, timeout);
-    Py_END_ALLOW_THREADS
-
-    // handle return code
-    if (retVal == WAIT_FAILED) {
-        PyErr_SetFromOSErrnoWithSyscall("WaitForSingleObject");
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    if (retVal == WAIT_TIMEOUT) {
-        PyErr_SetString(TimeoutExpired,
-                        "WaitForSingleObject() returned WAIT_TIMEOUT");
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    if (retVal == WAIT_ABANDONED) {
-        psutil_debug("WaitForSingleObject() -> WAIT_ABANDONED");
-        PyErr_SetString(TimeoutAbandoned,
-                        "WaitForSingleObject() returned WAIT_ABANDONED");
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    // WaitForSingleObject() returned WAIT_OBJECT_0. It means the
-    // process is gone so we can get its process exit code. The PID
-    // may still stick around though but we'll handle that from Python.
-    if (GetExitCodeProcess(hProcess, &ExitCode) == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("GetExitCodeProcess");
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-
-#if PY_MAJOR_VERSION >= 3
-    return PyLong_FromLong((long) ExitCode);
-#else
-    return PyInt_FromLong((long) ExitCode);
-#endif
-}
-
-
-/*
- * Return a Python tuple (user_time, kernel_time)
- */
-static PyObject *
-psutil_proc_times(PyObject *self, PyObject *args) {
-    DWORD       pid;
-    HANDLE      hProcess;
-    FILETIME    ftCreate, ftExit, ftKernel, ftUser;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-
-    if (hProcess == NULL)
-        return NULL;
-    if (! GetProcessTimes(hProcess, &ftCreate, &ftExit, &ftKernel, &ftUser)) {
-        if (GetLastError() == ERROR_ACCESS_DENIED) {
-            // usually means the process has died so we throw a NoSuchProcess
-            // here
-            NoSuchProcess("GetProcessTimes");
-        }
-        else {
-            PyErr_SetFromWindowsErr(0);
-        }
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-
-    /*
-     * User and kernel times are represented as a FILETIME structure
-     * which contains a 64-bit value representing the number of
-     * 100-nanosecond intervals since January 1, 1601 (UTC):
-     * http://msdn.microsoft.com/en-us/library/ms724284(VS.85).aspx
-     * To convert it into a float representing the seconds that the
-     * process has executed in user/kernel mode I borrowed the code
-     * below from Python's Modules/posixmodule.c
-     */
-    return Py_BuildValue(
-       "(ddd)",
-       (double)(ftUser.dwHighDateTime * HI_T + \
-                ftUser.dwLowDateTime * LO_T),
-       (double)(ftKernel.dwHighDateTime * HI_T + \
-                ftKernel.dwLowDateTime * LO_T),
-       psutil_FiletimeToUnixTime(ftCreate)
-   );
-}
-
-
-/*
- * Return process cmdline as a Python list of cmdline arguments.
- */
-static PyObject *
-psutil_proc_cmdline(PyObject *self, PyObject *args, PyObject *kwdict) {
-    DWORD pid;
-    int pid_return;
-    int use_peb;
-    PyObject *py_usepeb = Py_True;
-    static char *keywords[] = {"pid", "use_peb", NULL};
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwdict, _Py_PARSE_PID "|O",
-                                     keywords, &pid, &py_usepeb))
-    {
-        return NULL;
-    }
-    if ((pid == 0) || (pid == 4))
-        return Py_BuildValue("[]");
-
-    pid_return = psutil_pid_is_running(pid);
-    if (pid_return == 0)
-        return NoSuchProcess("psutil_pid_is_running");
-    if (pid_return == -1)
-        return NULL;
-
-    use_peb = (py_usepeb == Py_True) ? 1 : 0;
-    return psutil_get_cmdline(pid, use_peb);
-}
-
-
-/*
- * Return process cmdline as a Python list of cmdline arguments.
- */
-static PyObject *
-psutil_proc_environ(PyObject *self, PyObject *args) {
-    DWORD pid;
-    int pid_return;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if ((pid == 0) || (pid == 4))
-        return Py_BuildValue("s", "");
-
-    pid_return = psutil_pid_is_running(pid);
-    if (pid_return == 0)
-        return NoSuchProcess("psutil_pid_is_running");
-    if (pid_return == -1)
-        return NULL;
-
-    return psutil_get_environ(pid);
-}
-
-
-/*
- * Return process executable path. Works for all processes regardless of
- * privilege. NtQuerySystemInformation has some sort of internal cache,
- * since it succeeds even when a process is gone (but not if a PID never
- * existed).
- */
-static PyObject *
-psutil_proc_exe(PyObject *self, PyObject *args) {
-    DWORD pid;
-    NTSTATUS status;
-    PVOID buffer;
-    ULONG bufferSize = 0x100;
-    SYSTEM_PROCESS_ID_INFORMATION processIdInfo;
-    PyObject *py_exe;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    if (pid == 0)
-        return AccessDenied("forced for PID 0");
-
-    buffer = MALLOC_ZERO(bufferSize);
-    if (! buffer)
-        return PyErr_NoMemory();
-    processIdInfo.ProcessId = (HANDLE)(ULONG_PTR)pid;
-    processIdInfo.ImageName.Length = 0;
-    processIdInfo.ImageName.MaximumLength = (USHORT)bufferSize;
-    processIdInfo.ImageName.Buffer = buffer;
-
-    status = NtQuerySystemInformation(
-        SystemProcessIdInformation,
-        &processIdInfo,
-        sizeof(SYSTEM_PROCESS_ID_INFORMATION),
-        NULL);
-
-    if (status == STATUS_INFO_LENGTH_MISMATCH) {
-        // Required length is stored in MaximumLength.
-        FREE(buffer);
-        buffer = MALLOC_ZERO(processIdInfo.ImageName.MaximumLength);
-        if (! buffer)
-            return PyErr_NoMemory();
-        processIdInfo.ImageName.Buffer = buffer;
-
-        status = NtQuerySystemInformation(
-            SystemProcessIdInformation,
-            &processIdInfo,
-            sizeof(SYSTEM_PROCESS_ID_INFORMATION),
-            NULL);
-    }
-
-    if (! NT_SUCCESS(status)) {
-        FREE(buffer);
-        if (psutil_pid_is_running(pid) == 0)
-            NoSuchProcess("NtQuerySystemInformation");
-        else
-            psutil_SetFromNTStatusErr(status, "NtQuerySystemInformation");
-        return NULL;
-    }
-
-    if (processIdInfo.ImageName.Buffer == NULL) {
-        // Happens for PID 4.
-        py_exe = Py_BuildValue("s", "");
-    }
-    else {
-        py_exe = PyUnicode_FromWideChar(processIdInfo.ImageName.Buffer,
-                                        processIdInfo.ImageName.Length / 2);
-    }
-    FREE(buffer);
-    return py_exe;
-}
-
-
-/*
- * Return process memory information as a Python tuple.
- */
-static PyObject *
-psutil_proc_memory_info(PyObject *self, PyObject *args) {
-    HANDLE hProcess;
-    DWORD pid;
-    PROCESS_MEMORY_COUNTERS_EX cnt;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (NULL == hProcess)
-        return NULL;
-
-    if (! GetProcessMemoryInfo(hProcess, (PPROCESS_MEMORY_COUNTERS)&cnt,
-                               sizeof(cnt))) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    CloseHandle(hProcess);
-
-    // PROCESS_MEMORY_COUNTERS values are defined as SIZE_T which on 64bits
-    // is an (unsigned long long) and on 32bits is an (unsigned int).
-    // "_WIN64" is defined if we're running a 64bit Python interpreter not
-    // exclusively if the *system* is 64bit.
-#if defined(_WIN64)
-    return Py_BuildValue(
-        "(kKKKKKKKKK)",
-        cnt.PageFaultCount,  // unsigned long
-        (unsigned long long)cnt.PeakWorkingSetSize,
-        (unsigned long long)cnt.WorkingSetSize,
-        (unsigned long long)cnt.QuotaPeakPagedPoolUsage,
-        (unsigned long long)cnt.QuotaPagedPoolUsage,
-        (unsigned long long)cnt.QuotaPeakNonPagedPoolUsage,
-        (unsigned long long)cnt.QuotaNonPagedPoolUsage,
-        (unsigned long long)cnt.PagefileUsage,
-        (unsigned long long)cnt.PeakPagefileUsage,
-        (unsigned long long)cnt.PrivateUsage);
-#else
-    return Py_BuildValue(
-        "(kIIIIIIIII)",
-        cnt.PageFaultCount,    // unsigned long
-        (unsigned int)cnt.PeakWorkingSetSize,
-        (unsigned int)cnt.WorkingSetSize,
-        (unsigned int)cnt.QuotaPeakPagedPoolUsage,
-        (unsigned int)cnt.QuotaPagedPoolUsage,
-        (unsigned int)cnt.QuotaPeakNonPagedPoolUsage,
-        (unsigned int)cnt.QuotaNonPagedPoolUsage,
-        (unsigned int)cnt.PagefileUsage,
-        (unsigned int)cnt.PeakPagefileUsage,
-        (unsigned int)cnt.PrivateUsage);
-#endif
-}
-
-
-static int
-psutil_GetProcWsetInformation(
-        DWORD pid,
-        HANDLE hProcess,
-        PMEMORY_WORKING_SET_INFORMATION *wSetInfo)
-{
-    NTSTATUS status;
-    PVOID buffer;
-    SIZE_T bufferSize;
-
-    bufferSize = 0x8000;
-    buffer = MALLOC_ZERO(bufferSize);
-    if (! buffer) {
-        PyErr_NoMemory();
-        return 1;
-    }
-
-    while ((status = NtQueryVirtualMemory(
-            hProcess,
-            NULL,
-            MemoryWorkingSetInformation,
-            buffer,
-            bufferSize,
-            NULL)) == STATUS_INFO_LENGTH_MISMATCH)
-    {
-        FREE(buffer);
-        bufferSize *= 2;
-        // Fail if we're resizing the buffer to something very large.
-        if (bufferSize > 256 * 1024 * 1024) {
-            PyErr_SetString(PyExc_RuntimeError,
-                            "NtQueryVirtualMemory bufsize is too large");
-            return 1;
-        }
-        buffer = MALLOC_ZERO(bufferSize);
-        if (! buffer) {
-            PyErr_NoMemory();
-            return 1;
-        }
-    }
-
-    if (!NT_SUCCESS(status)) {
-        if (status == STATUS_ACCESS_DENIED) {
-            AccessDenied("NtQueryVirtualMemory");
-        }
-        else if (psutil_pid_is_running(pid) == 0) {
-            NoSuchProcess("psutil_pid_is_running");
-        }
-        else {
-            PyErr_Clear();
-            psutil_SetFromNTStatusErr(
-                status, "NtQueryVirtualMemory(MemoryWorkingSetInformation)");
-        }
-        HeapFree(GetProcessHeap(), 0, buffer);
-        return 1;
-    }
-
-    *wSetInfo = (PMEMORY_WORKING_SET_INFORMATION)buffer;
-    return 0;
-}
-
-
-/*
- * Returns the USS of the process.
- * Reference:
- * https://dxr.mozilla.org/mozilla-central/source/xpcom/base/
- *     nsMemoryReporterManager.cpp
- */
-static PyObject *
-psutil_proc_memory_uss(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    PSUTIL_PROCESS_WS_COUNTERS wsCounters;
-    PMEMORY_WORKING_SET_INFORMATION wsInfo;
-    ULONG_PTR i;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_INFORMATION);
-    if (hProcess == NULL)
-        return NULL;
-
-    if (psutil_GetProcWsetInformation(pid, hProcess, &wsInfo) != 0) {
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    memset(&wsCounters, 0, sizeof(PSUTIL_PROCESS_WS_COUNTERS));
-
-    for (i = 0; i < wsInfo->NumberOfEntries; i++) {
-        // This is what ProcessHacker does.
-        /*
-        wsCounters.NumberOfPages++;
-        if (wsInfo->WorkingSetInfo[i].ShareCount > 1)
-            wsCounters.NumberOfSharedPages++;
-        if (wsInfo->WorkingSetInfo[i].ShareCount == 0)
-            wsCounters.NumberOfPrivatePages++;
-        if (wsInfo->WorkingSetInfo[i].Shared)
-            wsCounters.NumberOfShareablePages++;
-        */
-
-        // This is what we do: count shared pages that only one process
-        // is using as private (USS).
-        if (!wsInfo->WorkingSetInfo[i].Shared ||
-                wsInfo->WorkingSetInfo[i].ShareCount <= 1) {
-            wsCounters.NumberOfPrivatePages++;
-        }
-    }
-
-    HeapFree(GetProcessHeap(), 0, wsInfo);
-    CloseHandle(hProcess);
-
-    return Py_BuildValue("I", wsCounters.NumberOfPrivatePages);
-}
-
-
-/*
- * Return a Python integer indicating the total amount of physical memory
- * in bytes.
- */
-static PyObject *
-psutil_virtual_mem(PyObject *self, PyObject *args) {
-    MEMORYSTATUSEX memInfo;
-    memInfo.dwLength = sizeof(MEMORYSTATUSEX);
-
-    if (! GlobalMemoryStatusEx(&memInfo)) {
-        PyErr_SetFromWindowsErr(0);
-        return NULL;
-    }
-    return Py_BuildValue("(LLLLLL)",
-                         memInfo.ullTotalPhys,      // total
-                         memInfo.ullAvailPhys,      // avail
-                         memInfo.ullTotalPageFile,  // total page file
-                         memInfo.ullAvailPageFile,  // avail page file
-                         memInfo.ullTotalVirtual,   // total virtual
-                         memInfo.ullAvailVirtual);  // avail virtual
-}
-
-
-/*
- * Return process current working directory as a Python string.
- */
-static PyObject *
-psutil_proc_cwd(PyObject *self, PyObject *args) {
-    DWORD pid;
-    int pid_return;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    pid_return = psutil_pid_is_running(pid);
-    if (pid_return == 0)
-        return NoSuchProcess("psutil_pid_is_running");
-    if (pid_return == -1)
-        return NULL;
-
-    return psutil_get_cwd(pid);
-}
-
-
-/*
- * Resume or suspends a process
- */
-static PyObject *
-psutil_proc_suspend_or_resume(PyObject *self, PyObject *args) {
-    DWORD pid;
-    NTSTATUS status;
-    HANDLE hProcess;
-    PyObject* suspend;
-
-        if (! PyArg_ParseTuple(args, _Py_PARSE_PID "O", &pid, &suspend))
-            return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_SUSPEND_RESUME);
-    if (hProcess == NULL)
-        return NULL;
-
-    if (PyObject_IsTrue(suspend))
-        status = NtSuspendProcess(hProcess);
-    else
-        status = NtResumeProcess(hProcess);
-
-    if (! NT_SUCCESS(status)) {
-        CloseHandle(hProcess);
-        return psutil_SetFromNTStatusErr(status, "NtSuspend|ResumeProcess");
-    }
-
-    CloseHandle(hProcess);
-    Py_RETURN_NONE;
-}
-
-
-static PyObject *
-psutil_proc_threads(PyObject *self, PyObject *args) {
-    HANDLE hThread = NULL;
-    THREADENTRY32 te32 = {0};
-    DWORD pid;
-    int pid_return;
-    int rc;
-    FILETIME ftDummy, ftKernel, ftUser;
-    HANDLE hThreadSnap = NULL;
-    PyObject *py_tuple = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-    if (pid == 0) {
-        // raise AD instead of returning 0 as procexp is able to
-        // retrieve useful information somehow
-        AccessDenied("automatically set for PID 0");
-        goto error;
-    }
-
-    pid_return = psutil_pid_is_running(pid);
-    if (pid_return == 0) {
-        NoSuchProcess("psutil_pid_is_running");
-        goto error;
-    }
-    if (pid_return == -1)
-        goto error;
-
-    hThreadSnap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
-    if (hThreadSnap == INVALID_HANDLE_VALUE) {
-        PyErr_SetFromOSErrnoWithSyscall("CreateToolhelp32Snapshot");
-        goto error;
-    }
-
-    // Fill in the size of the structure before using it
-    te32.dwSize = sizeof(THREADENTRY32);
-
-    if (! Thread32First(hThreadSnap, &te32)) {
-        PyErr_SetFromOSErrnoWithSyscall("Thread32First");
-        goto error;
-    }
-
-    // Walk the thread snapshot to find all threads of the process.
-    // If the thread belongs to the process, increase the counter.
-    do {
-        if (te32.th32OwnerProcessID == pid) {
-            py_tuple = NULL;
-            hThread = NULL;
-            hThread = OpenThread(THREAD_QUERY_INFORMATION,
-                                 FALSE, te32.th32ThreadID);
-            if (hThread == NULL) {
-                // thread has disappeared on us
-                continue;
-            }
-
-            rc = GetThreadTimes(hThread, &ftDummy, &ftDummy, &ftKernel,
-                                &ftUser);
-            if (rc == 0) {
-                PyErr_SetFromOSErrnoWithSyscall("GetThreadTimes");
-                goto error;
-            }
-
-            /*
-             * User and kernel times are represented as a FILETIME structure
-             * which contains a 64-bit value representing the number of
-             * 100-nanosecond intervals since January 1, 1601 (UTC):
-             * http://msdn.microsoft.com/en-us/library/ms724284(VS.85).aspx
-             * To convert it into a float representing the seconds that the
-             * process has executed in user/kernel mode I borrowed the code
-             * below from Python's Modules/posixmodule.c
-             */
-            py_tuple = Py_BuildValue(
-                "kdd",
-                te32.th32ThreadID,
-                (double)(ftUser.dwHighDateTime * HI_T + \
-                         ftUser.dwLowDateTime * LO_T),
-                (double)(ftKernel.dwHighDateTime * HI_T + \
-                         ftKernel.dwLowDateTime * LO_T));
-            if (!py_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_CLEAR(py_tuple);
-
-            CloseHandle(hThread);
-        }
-    } while (Thread32Next(hThreadSnap, &te32));
-
-    CloseHandle(hThreadSnap);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_DECREF(py_retlist);
-    if (hThread != NULL)
-        CloseHandle(hThread);
-    if (hThreadSnap != NULL)
-        CloseHandle(hThreadSnap);
-    return NULL;
-}
-
-
-static PyObject *
-psutil_proc_open_files(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE processHandle;
-    DWORD access = PROCESS_DUP_HANDLE | PROCESS_QUERY_INFORMATION;
-    PyObject *py_retlist;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    processHandle = psutil_handle_from_pid(pid, access);
-    if (processHandle == NULL)
-        return NULL;
-
-    py_retlist = psutil_get_open_files(pid, processHandle);
-    CloseHandle(processHandle);
-    return py_retlist;
-}
-
-
-/*
- * Return process username as a "DOMAIN//USERNAME" string.
- */
-static PyObject *
-psutil_proc_username(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE processHandle = NULL;
-    HANDLE tokenHandle = NULL;
-    PTOKEN_USER user = NULL;
-    ULONG bufferSize;
-    WCHAR *name = NULL;
-    WCHAR *domainName = NULL;
-    ULONG nameSize;
-    ULONG domainNameSize;
-    SID_NAME_USE nameUse;
-    PyObject *py_username = NULL;
-    PyObject *py_domain = NULL;
-    PyObject *py_tuple = NULL;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    processHandle = psutil_handle_from_pid(
-        pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (processHandle == NULL)
-        return NULL;
-
-    if (!OpenProcessToken(processHandle, TOKEN_QUERY, &tokenHandle)) {
-        PyErr_SetFromOSErrnoWithSyscall("OpenProcessToken");
-        goto error;
-    }
-
-    CloseHandle(processHandle);
-    processHandle = NULL;
-
-    // Get the user SID.
-    bufferSize = 0x100;
-    while (1) {
-        user = malloc(bufferSize);
-        if (user == NULL) {
-            PyErr_NoMemory();
-            goto error;
-        }
-        if (!GetTokenInformation(tokenHandle, TokenUser, user, bufferSize,
-                                 &bufferSize))
-        {
-            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-                free(user);
-                continue;
-            }
-            else {
-                PyErr_SetFromOSErrnoWithSyscall("GetTokenInformation");
-                goto error;
-            }
-        }
-        break;
-    }
-
-    CloseHandle(tokenHandle);
-    tokenHandle = NULL;
-
-    // resolve the SID to a name
-    nameSize = 0x100;
-    domainNameSize = 0x100;
-    while (1) {
-        name = malloc(nameSize * sizeof(WCHAR));
-        if (name == NULL) {
-            PyErr_NoMemory();
-            goto error;
-        }
-        domainName = malloc(domainNameSize * sizeof(WCHAR));
-        if (domainName == NULL) {
-            PyErr_NoMemory();
-            goto error;
-        }
-        if (!LookupAccountSidW(NULL, user->User.Sid, name, &nameSize,
-                               domainName, &domainNameSize, &nameUse))
-        {
-            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-                free(name);
-                free(domainName);
-                continue;
-            }
-            else {
-                PyErr_SetFromOSErrnoWithSyscall("LookupAccountSidW");
-                goto error;
-            }
-        }
-        break;
-    }
-
-    py_domain = PyUnicode_FromWideChar(domainName, wcslen(domainName));
-    if (! py_domain)
-        goto error;
-    py_username = PyUnicode_FromWideChar(name, wcslen(name));
-    if (! py_username)
-        goto error;
-    py_tuple = Py_BuildValue("OO", py_domain, py_username);
-    if (! py_tuple)
-        goto error;
-    Py_DECREF(py_domain);
-    Py_DECREF(py_username);
-
-    free(name);
-    free(domainName);
-    free(user);
-
-    return py_tuple;
-
-error:
-    if (processHandle != NULL)
-        CloseHandle(processHandle);
-    if (tokenHandle != NULL)
-        CloseHandle(tokenHandle);
-    if (name != NULL)
-        free(name);
-    if (domainName != NULL)
-        free(domainName);
-    if (user != NULL)
-        free(user);
-    Py_XDECREF(py_domain);
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tuple);
-    return NULL;
-}
-
-
-/*
- * Get process priority as a Python integer.
- */
-static PyObject *
-psutil_proc_priority_get(PyObject *self, PyObject *args) {
-    DWORD pid;
-    DWORD priority;
-    HANDLE hProcess;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (hProcess == NULL)
-        return NULL;
-
-    priority = GetPriorityClass(hProcess);
-    if (priority == 0) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    CloseHandle(hProcess);
-    return Py_BuildValue("i", priority);
-}
-
-
-/*
- * Set process priority.
- */
-static PyObject *
-psutil_proc_priority_set(PyObject *self, PyObject *args) {
-    DWORD pid;
-    int priority;
-    int retval;
-    HANDLE hProcess;
-    DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "i", &pid, &priority))
-        return NULL;
-    hProcess = psutil_handle_from_pid(pid, access);
-    if (hProcess == NULL)
-        return NULL;
-
-    retval = SetPriorityClass(hProcess, priority);
-    if (retval == 0) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Get process IO priority as a Python integer.
- */
-static PyObject *
-psutil_proc_io_priority_get(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    DWORD IoPriority;
-    NTSTATUS status;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (hProcess == NULL)
-        return NULL;
-
-    status = NtQueryInformationProcess(
-        hProcess,
-        ProcessIoPriority,
-        &IoPriority,
-        sizeof(DWORD),
-        NULL
-    );
-
-    CloseHandle(hProcess);
-    if (! NT_SUCCESS(status))
-        return psutil_SetFromNTStatusErr(status, "NtQueryInformationProcess");
-    return Py_BuildValue("i", IoPriority);
-}
-
-
-/*
- * Set process IO priority.
- */
-static PyObject *
-psutil_proc_io_priority_set(PyObject *self, PyObject *args) {
-    DWORD pid;
-    DWORD prio;
-    HANDLE hProcess;
-    NTSTATUS status;
-    DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "i", &pid, &prio))
-        return NULL;
-
-    hProcess = psutil_handle_from_pid(pid, access);
-    if (hProcess == NULL)
-        return NULL;
-
-    status = NtSetInformationProcess(
-        hProcess,
-        ProcessIoPriority,
-        (PVOID)&prio,
-        sizeof(DWORD)
-    );
-
-    CloseHandle(hProcess);
-    if (! NT_SUCCESS(status))
-        return psutil_SetFromNTStatusErr(status, "NtSetInformationProcess");
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Return a Python tuple referencing process I/O counters.
- */
-static PyObject *
-psutil_proc_io_counters(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    IO_COUNTERS IoCounters;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (NULL == hProcess)
-        return NULL;
-
-    if (! GetProcessIoCounters(hProcess, &IoCounters)) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-    return Py_BuildValue("(KKKKKK)",
-                         IoCounters.ReadOperationCount,
-                         IoCounters.WriteOperationCount,
-                         IoCounters.ReadTransferCount,
-                         IoCounters.WriteTransferCount,
-                         IoCounters.OtherOperationCount,
-                         IoCounters.OtherTransferCount);
-}
-
-
-/*
- * Return process CPU affinity as a bitmask
- */
-static PyObject *
-psutil_proc_cpu_affinity_get(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    DWORD_PTR proc_mask;
-    DWORD_PTR system_mask;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (hProcess == NULL) {
-        return NULL;
-    }
-    if (GetProcessAffinityMask(hProcess, &proc_mask, &system_mask) == 0) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-#ifdef _WIN64
-    return Py_BuildValue("K", (unsigned long long)proc_mask);
-#else
-    return Py_BuildValue("k", (unsigned long)proc_mask);
-#endif
-}
-
-
-/*
- * Set process CPU affinity
- */
-static PyObject *
-psutil_proc_cpu_affinity_set(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_SET_INFORMATION;
-    DWORD_PTR mask;
-
-#ifdef _WIN64
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "K", &pid, &mask))
-#else
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID "k", &pid, &mask))
-#endif
-    {
-        return NULL;
-    }
-    hProcess = psutil_handle_from_pid(pid, access);
-    if (hProcess == NULL)
-        return NULL;
-
-    if (SetProcessAffinityMask(hProcess, mask) == 0) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-
-    CloseHandle(hProcess);
-    Py_RETURN_NONE;
-}
-
-
-/*
- * Return True if all process threads are in waiting/suspended state.
- */
-static PyObject *
-psutil_proc_is_suspended(PyObject *self, PyObject *args) {
-    DWORD pid;
-    ULONG i;
-    PSYSTEM_PROCESS_INFORMATION process;
-    PVOID buffer;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    if (! psutil_get_proc_info(pid, &process, &buffer))
-        return NULL;
-    for (i = 0; i < process->NumberOfThreads; i++) {
-        if (process->Threads[i].ThreadState != Waiting ||
-                process->Threads[i].WaitReason != Suspended)
-        {
-            free(buffer);
-            Py_RETURN_FALSE;
-        }
-    }
-    free(buffer);
-    Py_RETURN_TRUE;
-}
-
-
-/*
- * Return a Python dict of tuples for disk I/O information
- */
-static PyObject *
-psutil_users(PyObject *self, PyObject *args) {
-    HANDLE hServer = WTS_CURRENT_SERVER_HANDLE;
-    WCHAR *buffer_user = NULL;
-    LPTSTR buffer_addr = NULL;
-    PWTS_SESSION_INFO sessions = NULL;
-    DWORD count;
-    DWORD i;
-    DWORD sessionId;
-    DWORD bytes;
-    PWTS_CLIENT_ADDRESS address;
-    char address_str[50];
-    WINSTATION_INFO station_info;
-    ULONG returnLen;
-    PyObject *py_tuple = NULL;
-    PyObject *py_address = NULL;
-    PyObject *py_username = NULL;
-    PyObject *py_retlist = PyList_New(0);
-
-    if (py_retlist == NULL)
-        return NULL;
-
-    if (WTSEnumerateSessions(hServer, 0, 1, &sessions, &count) == 0) {
-        PyErr_SetFromOSErrnoWithSyscall("WTSEnumerateSessions");
-        goto error;
-    }
-
-    for (i = 0; i < count; i++) {
-        py_address = NULL;
-        py_tuple = NULL;
-        sessionId = sessions[i].SessionId;
-        if (buffer_user != NULL)
-            WTSFreeMemory(buffer_user);
-        if (buffer_addr != NULL)
-            WTSFreeMemory(buffer_addr);
-
-        buffer_user = NULL;
-        buffer_addr = NULL;
-
-        // username
-        bytes = 0;
-        if (WTSQuerySessionInformationW(hServer, sessionId, WTSUserName,
-                                        &buffer_user, &bytes) == 0) {
-            PyErr_SetFromOSErrnoWithSyscall("WTSQuerySessionInformationW");
-            goto error;
-        }
-        if (bytes <= 2)
-            continue;
-
-        // address
-        bytes = 0;
-        if (WTSQuerySessionInformation(hServer, sessionId, WTSClientAddress,
-                                       &buffer_addr, &bytes) == 0) {
-            PyErr_SetFromOSErrnoWithSyscall("WTSQuerySessionInformation");
-            goto error;
-        }
-
-        address = (PWTS_CLIENT_ADDRESS)buffer_addr;
-        if (address->AddressFamily == 0) {  // AF_INET
-            sprintf_s(address_str,
-                      _countof(address_str),
-                      "%u.%u.%u.%u",
-                      address->Address[0],
-                      address->Address[1],
-                      address->Address[2],
-                      address->Address[3]);
-            py_address = Py_BuildValue("s", address_str);
-            if (!py_address)
-                goto error;
-        }
-        else {
-            py_address = Py_None;
-        }
-
-        // login time
-        if (! WinStationQueryInformationW(
-                hServer,
-                sessionId,
-                WinStationInformation,
-                &station_info,
-                sizeof(station_info),
-                &returnLen))
-        {
-            PyErr_SetFromOSErrnoWithSyscall("WinStationQueryInformationW");
-            goto error;
-        }
-
-        py_username = PyUnicode_FromWideChar(buffer_user, wcslen(buffer_user));
-        if (py_username == NULL)
-            goto error;
-        py_tuple = Py_BuildValue(
-            "OOd",
-            py_username,
-            py_address,
-            psutil_FiletimeToUnixTime(station_info.ConnectTime)
-        );
-        if (!py_tuple)
-            goto error;
-        if (PyList_Append(py_retlist, py_tuple))
-            goto error;
-        Py_CLEAR(py_username);
-        Py_CLEAR(py_address);
-        Py_CLEAR(py_tuple);
-    }
-
-    WTSFreeMemory(sessions);
-    WTSFreeMemory(buffer_user);
-    WTSFreeMemory(buffer_addr);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_username);
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_address);
-    Py_DECREF(py_retlist);
-
-    if (sessions != NULL)
-        WTSFreeMemory(sessions);
-    if (buffer_user != NULL)
-        WTSFreeMemory(buffer_user);
-    if (buffer_addr != NULL)
-        WTSFreeMemory(buffer_addr);
-    return NULL;
-}
-
-
-/*
- * Return the number of handles opened by process.
- */
-static PyObject *
-psutil_proc_num_handles(PyObject *self, PyObject *args) {
-    DWORD pid;
-    HANDLE hProcess;
-    DWORD handleCount;
-
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        return NULL;
-    hProcess = psutil_handle_from_pid(pid, PROCESS_QUERY_LIMITED_INFORMATION);
-    if (NULL == hProcess)
-        return NULL;
-    if (! GetProcessHandleCount(hProcess, &handleCount)) {
-        PyErr_SetFromWindowsErr(0);
-        CloseHandle(hProcess);
-        return NULL;
-    }
-    CloseHandle(hProcess);
-    return Py_BuildValue("k", handleCount);
-}
-
-
-static char *get_region_protection_string(ULONG protection) {
-    switch (protection & 0xff) {
-        case PAGE_NOACCESS:
-            return "";
-        case PAGE_READONLY:
-            return "r";
-        case PAGE_READWRITE:
-            return "rw";
-        case PAGE_WRITECOPY:
-            return "wc";
-        case PAGE_EXECUTE:
-            return "x";
-        case PAGE_EXECUTE_READ:
-            return "xr";
-        case PAGE_EXECUTE_READWRITE:
-            return "xrw";
-        case PAGE_EXECUTE_WRITECOPY:
-            return "xwc";
-        default:
-            return "?";
-    }
-}
-
-
-/*
- * Return a list of process's memory mappings.
- */
-static PyObject *
-psutil_proc_memory_maps(PyObject *self, PyObject *args) {
-    MEMORY_BASIC_INFORMATION basicInfo;
-    DWORD pid;
-    HANDLE hProcess = NULL;
-    PVOID baseAddress;
-    WCHAR mappedFileName[MAX_PATH];
-    LPVOID maxAddr;
-    // required by GetMappedFileNameW
-    DWORD access = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ;
-    PyObject *py_retlist = PyList_New(0);
-    PyObject *py_tuple = NULL;
-    PyObject *py_str = NULL;
-
-    if (py_retlist == NULL)
-        return NULL;
-    if (! PyArg_ParseTuple(args, _Py_PARSE_PID, &pid))
-        goto error;
-    hProcess = psutil_handle_from_pid(pid, access);
-    if (NULL == hProcess)
-        goto error;
-
-    maxAddr = PSUTIL_SYSTEM_INFO.lpMaximumApplicationAddress;
-    baseAddress = NULL;
-
-    while (VirtualQueryEx(hProcess, baseAddress, &basicInfo,
-                          sizeof(MEMORY_BASIC_INFORMATION)))
-    {
-        py_tuple = NULL;
-        if (baseAddress > maxAddr)
-            break;
-        if (GetMappedFileNameW(hProcess, baseAddress, mappedFileName,
-                               sizeof(mappedFileName)))
-        {
-            py_str = PyUnicode_FromWideChar(mappedFileName,
-                                            wcslen(mappedFileName));
-            if (py_str == NULL)
-                goto error;
-#ifdef _WIN64
-           py_tuple = Py_BuildValue(
-              "(KsOI)",
-              (unsigned long long)baseAddress,
-#else
-           py_tuple = Py_BuildValue(
-              "(ksOI)",
-              (unsigned long)baseAddress,
-#endif
-              get_region_protection_string(basicInfo.Protect),
-              py_str,
-              basicInfo.RegionSize);
-
-            if (!py_tuple)
-                goto error;
-            if (PyList_Append(py_retlist, py_tuple))
-                goto error;
-            Py_CLEAR(py_tuple);
-            Py_CLEAR(py_str);
-        }
-        baseAddress = (PCHAR)baseAddress + basicInfo.RegionSize;
-    }
-
-    CloseHandle(hProcess);
-    return py_retlist;
-
-error:
-    Py_XDECREF(py_tuple);
-    Py_XDECREF(py_str);
-    Py_DECREF(py_retlist);
-    if (hProcess != NULL)
-        CloseHandle(hProcess);
-    return NULL;
-}
-
-
-/*
- * Return a {pid:ppid, ...} dict for all running processes.
- */
-static PyObject *
-psutil_ppid_map(PyObject *self, PyObject *args) {
-    PyObject *py_pid = NULL;
-    PyObject *py_ppid = NULL;
-    PyObject *py_retdict = PyDict_New();
-    HANDLE handle = NULL;
-    PROCESSENTRY32 pe = {0};
-    pe.dwSize = sizeof(PROCESSENTRY32);
-
-    if (py_retdict == NULL)
-        return NULL;
-    handle = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (handle == INVALID_HANDLE_VALUE) {
-        PyErr_SetFromWindowsErr(0);
-        Py_DECREF(py_retdict);
-        return NULL;
-    }
-
-    if (Process32First(handle, &pe)) {
-        do {
-            py_pid = PyLong_FromPid(pe.th32ProcessID);
-            if (py_pid == NULL)
-                goto error;
-            py_ppid = PyLong_FromPid(pe.th32ParentProcessID);
-            if (py_ppid == NULL)
-                goto error;
-            if (PyDict_SetItem(py_retdict, py_pid, py_ppid))
-                goto error;
-            Py_CLEAR(py_pid);
-            Py_CLEAR(py_ppid);
-        } while (Process32Next(handle, &pe));
-    }
-
-    CloseHandle(handle);
-    return py_retdict;
-
-error:
-    Py_XDECREF(py_pid);
-    Py_XDECREF(py_ppid);
-    Py_DECREF(py_retdict);
-    CloseHandle(handle);
-    return NULL;
-}
-
-
-/*
- * Return battery usage stats.
- */
-static PyObject *
-psutil_sensors_battery(PyObject *self, PyObject *args) {
-    SYSTEM_POWER_STATUS sps;
-
-    if (GetSystemPowerStatus(&sps) == 0) {
-        PyErr_SetFromWindowsErr(0);
-        return NULL;
-    }
-    return Py_BuildValue(
-        "iiiI",
-        sps.ACLineStatus,  // whether AC is connected: 0=no, 1=yes, 255=unknown
-        // status flag:
-        // 1, 2, 4 = high, low, critical
-        // 8 = charging
-        // 128 = no battery
-        sps.BatteryFlag,
-        sps.BatteryLifePercent,  // percent
-        sps.BatteryLifeTime  // remaining secs
-    );
-}
-
-
-/*
- * System memory page size as an int.
- */
-static PyObject *
-psutil_getpagesize(PyObject *self, PyObject *args) {
-    // XXX: we may want to use GetNativeSystemInfo to differentiate
-    // page size for WoW64 processes (but am not sure).
-    return Py_BuildValue("I", PSUTIL_SYSTEM_INFO.dwPageSize);
-}
-
-
-// ------------------------ Python init ---------------------------
-
-static PyMethodDef
-PsutilMethods[] = {
-    // --- per-process functions
-    {"proc_cmdline", (PyCFunction)(void(*)(void))psutil_proc_cmdline,
-        METH_VARARGS | METH_KEYWORDS,
-     "Return process cmdline as a list of cmdline arguments"},
-    {"proc_environ", psutil_proc_environ, METH_VARARGS,
-     "Return process environment data"},
-    {"proc_exe", psutil_proc_exe, METH_VARARGS,
-     "Return path of the process executable"},
-    {"proc_kill", psutil_proc_kill, METH_VARARGS,
-     "Kill the process identified by the given PID"},
-    {"proc_times", psutil_proc_times, METH_VARARGS,
-     "Return tuple of user/kern time for the given PID"},
-    {"proc_memory_info", psutil_proc_memory_info, METH_VARARGS,
-     "Return a tuple of process memory information"},
-    {"proc_memory_uss", psutil_proc_memory_uss, METH_VARARGS,
-     "Return the USS of the process"},
-    {"proc_cwd", psutil_proc_cwd, METH_VARARGS,
-     "Return process current working directory"},
-    {"proc_suspend_or_resume", psutil_proc_suspend_or_resume, METH_VARARGS,
-     "Suspend or resume a process"},
-    {"proc_open_files", psutil_proc_open_files, METH_VARARGS,
-     "Return files opened by process"},
-    {"proc_username", psutil_proc_username, METH_VARARGS,
-     "Return the username of a process"},
-    {"proc_threads", psutil_proc_threads, METH_VARARGS,
-     "Return process threads information as a list of tuple"},
-    {"proc_wait", psutil_proc_wait, METH_VARARGS,
-     "Wait for process to terminate and return its exit code."},
-    {"proc_priority_get", psutil_proc_priority_get, METH_VARARGS,
-     "Return process priority."},
-    {"proc_priority_set", psutil_proc_priority_set, METH_VARARGS,
-     "Set process priority."},
-    {"proc_io_priority_get", psutil_proc_io_priority_get, METH_VARARGS,
-     "Return process IO priority."},
-    {"proc_io_priority_set", psutil_proc_io_priority_set, METH_VARARGS,
-     "Set process IO priority."},
-    {"proc_cpu_affinity_get", psutil_proc_cpu_affinity_get, METH_VARARGS,
-     "Return process CPU affinity as a bitmask."},
-    {"proc_cpu_affinity_set", psutil_proc_cpu_affinity_set, METH_VARARGS,
-     "Set process CPU affinity."},
-    {"proc_io_counters", psutil_proc_io_counters, METH_VARARGS,
-     "Get process I/O counters."},
-    {"proc_is_suspended", psutil_proc_is_suspended, METH_VARARGS,
-     "Return True if one of the process threads is in a suspended state"},
-    {"proc_num_handles", psutil_proc_num_handles, METH_VARARGS,
-     "Return the number of handles opened by process."},
-    {"proc_memory_maps", psutil_proc_memory_maps, METH_VARARGS,
-     "Return a list of process's memory mappings"},
-
-    // --- alternative pinfo interface
-    {"proc_info", psutil_proc_info, METH_VARARGS,
-     "Various process information"},
-
-    // --- system-related functions
-    {"pids", psutil_pids, METH_VARARGS,
-     "Returns a list of PIDs currently running on the system"},
-    {"ppid_map", psutil_ppid_map, METH_VARARGS,
-     "Return a {pid:ppid, ...} dict for all running processes"},
-    {"pid_exists", psutil_pid_exists, METH_VARARGS,
-     "Determine if the process exists in the current process list."},
-    {"cpu_count_logical", psutil_cpu_count_logical, METH_VARARGS,
-     "Returns the number of logical CPUs on the system"},
-    {"cpu_count_phys", psutil_cpu_count_phys, METH_VARARGS,
-     "Returns the number of physical CPUs on the system"},
-    {"boot_time", psutil_boot_time, METH_VARARGS,
-     "Return the system boot time expressed in seconds since the epoch."},
-    {"virtual_mem", psutil_virtual_mem, METH_VARARGS,
-     "Return the total amount of physical memory, in bytes"},
-    {"cpu_times", psutil_cpu_times, METH_VARARGS,
-     "Return system cpu times as a list"},
-    {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS,
-     "Return system per-cpu times as a list of tuples"},
-    {"disk_usage", psutil_disk_usage, METH_VARARGS,
-     "Return path's disk total and free as a Python tuple."},
-    {"net_io_counters", psutil_net_io_counters, METH_VARARGS,
-     "Return dict of tuples of networks I/O information."},
-    {"disk_io_counters", psutil_disk_io_counters, METH_VARARGS,
-     "Return dict of tuples of disks I/O information."},
-    {"users", psutil_users, METH_VARARGS,
-     "Return a list of currently connected users."},
-    {"disk_partitions", psutil_disk_partitions, METH_VARARGS,
-     "Return disk partitions."},
-    {"net_connections", psutil_net_connections, METH_VARARGS,
-     "Return system-wide connections"},
-    {"net_if_addrs", psutil_net_if_addrs, METH_VARARGS,
-     "Return NICs addresses."},
-    {"net_if_stats", psutil_net_if_stats, METH_VARARGS,
-     "Return NICs stats."},
-    {"cpu_stats", psutil_cpu_stats, METH_VARARGS,
-     "Return NICs stats."},
-    {"cpu_freq", psutil_cpu_freq, METH_VARARGS,
-     "Return CPU frequency."},
-    {"init_loadavg_counter", (PyCFunction)psutil_init_loadavg_counter,
-     METH_VARARGS,
-     "Initializes the emulated load average calculator."},
-    {"getloadavg", (PyCFunction)psutil_get_loadavg, METH_VARARGS,
-     "Returns the emulated POSIX-like load average."},
-    {"sensors_battery", psutil_sensors_battery, METH_VARARGS,
-     "Return battery metrics usage."},
-    {"getpagesize", psutil_getpagesize, METH_VARARGS,
-     "Return system memory page size."},
-
-    // --- windows services
-    {"winservice_enumerate", psutil_winservice_enumerate, METH_VARARGS,
-     "List all services"},
-    {"winservice_query_config", psutil_winservice_query_config, METH_VARARGS,
-     "Return service config"},
-    {"winservice_query_status", psutil_winservice_query_status, METH_VARARGS,
-     "Return service config"},
-    {"winservice_query_descr", psutil_winservice_query_descr, METH_VARARGS,
-     "Return the description of a service"},
-    {"winservice_start", psutil_winservice_start, METH_VARARGS,
-     "Start a service"},
-    {"winservice_stop", psutil_winservice_stop, METH_VARARGS,
-     "Stop a service"},
-
-    // --- windows API bindings
-    {"win32_QueryDosDevice", psutil_win32_QueryDosDevice, METH_VARARGS,
-     "QueryDosDevice binding"},
-
-    // --- others
-    {"set_testing", psutil_set_testing, METH_NOARGS,
-     "Set psutil in testing mode"},
-
-    {NULL, NULL, 0, NULL}
-};
-
-
-struct module_state {
-    PyObject *error;
-};
-
-#if PY_MAJOR_VERSION >= 3
-#define GETSTATE(m) ((struct module_state*)PyModule_GetState(m))
-#else
-#define GETSTATE(m) (&_state)
-static struct module_state _state;
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-
-static int psutil_windows_traverse(PyObject *m, visitproc visit, void *arg) {
-    Py_VISIT(GETSTATE(m)->error);
-    return 0;
-}
-
-static int psutil_windows_clear(PyObject *m) {
-    Py_CLEAR(GETSTATE(m)->error);
-    return 0;
-}
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "psutil_windows",
-    NULL,
-    sizeof(struct module_state),
-    PsutilMethods,
-    NULL,
-    psutil_windows_traverse,
-    psutil_windows_clear,
-    NULL
-};
-
-#define INITERROR return NULL
-
-PyMODINIT_FUNC PyInit__psutil_windows(void)
-
-#else
-#define INITERROR return
-void init_psutil_windows(void)
-#endif
-{
-    struct module_state *st = NULL;
-#if PY_MAJOR_VERSION >= 3
-    PyObject *module = PyModule_Create(&moduledef);
-#else
-    PyObject *module = Py_InitModule("_psutil_windows", PsutilMethods);
-#endif
-    if (module == NULL)
-        INITERROR;
-
-    if (psutil_setup() != 0)
-        INITERROR;
-    if (psutil_load_globals() != 0)
-        INITERROR;
-    if (psutil_set_se_debug() != 0)
-        INITERROR;
-
-    st = GETSTATE(module);
-    st->error = PyErr_NewException("_psutil_windows.Error", NULL, NULL);
-    if (st->error == NULL) {
-        Py_DECREF(module);
-        INITERROR;
-    }
-
-    // Exceptions.
-    TimeoutExpired = PyErr_NewException(
-        "_psutil_windows.TimeoutExpired", NULL, NULL);
-    Py_INCREF(TimeoutExpired);
-    PyModule_AddObject(module, "TimeoutExpired", TimeoutExpired);
-
-    TimeoutAbandoned = PyErr_NewException(
-        "_psutil_windows.TimeoutAbandoned", NULL, NULL);
-    Py_INCREF(TimeoutAbandoned);
-    PyModule_AddObject(module, "TimeoutAbandoned", TimeoutAbandoned);
-
-    // version constant
-    PyModule_AddIntConstant(module, "version", PSUTIL_VERSION);
-
-    // process status constants
-    // http://msdn.microsoft.com/en-us/library/ms683211(v=vs.85).aspx
-    PyModule_AddIntConstant(
-        module, "ABOVE_NORMAL_PRIORITY_CLASS", ABOVE_NORMAL_PRIORITY_CLASS);
-    PyModule_AddIntConstant(
-        module, "BELOW_NORMAL_PRIORITY_CLASS", BELOW_NORMAL_PRIORITY_CLASS);
-    PyModule_AddIntConstant(
-        module, "HIGH_PRIORITY_CLASS", HIGH_PRIORITY_CLASS);
-    PyModule_AddIntConstant(
-        module, "IDLE_PRIORITY_CLASS", IDLE_PRIORITY_CLASS);
-    PyModule_AddIntConstant(
-        module, "NORMAL_PRIORITY_CLASS", NORMAL_PRIORITY_CLASS);
-    PyModule_AddIntConstant(
-        module, "REALTIME_PRIORITY_CLASS", REALTIME_PRIORITY_CLASS);
-
-    // connection status constants
-    // http://msdn.microsoft.com/en-us/library/cc669305.aspx
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_CLOSED", MIB_TCP_STATE_CLOSED);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_CLOSING", MIB_TCP_STATE_CLOSING);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_CLOSE_WAIT", MIB_TCP_STATE_CLOSE_WAIT);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_LISTEN", MIB_TCP_STATE_LISTEN);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_ESTAB", MIB_TCP_STATE_ESTAB);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_SYN_SENT", MIB_TCP_STATE_SYN_SENT);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_SYN_RCVD", MIB_TCP_STATE_SYN_RCVD);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_FIN_WAIT1", MIB_TCP_STATE_FIN_WAIT1);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_FIN_WAIT2", MIB_TCP_STATE_FIN_WAIT2);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_LAST_ACK", MIB_TCP_STATE_LAST_ACK);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_TIME_WAIT", MIB_TCP_STATE_TIME_WAIT);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_TIME_WAIT", MIB_TCP_STATE_TIME_WAIT);
-    PyModule_AddIntConstant(
-        module, "MIB_TCP_STATE_DELETE_TCB", MIB_TCP_STATE_DELETE_TCB);
-    PyModule_AddIntConstant(
-        module, "PSUTIL_CONN_NONE", PSUTIL_CONN_NONE);
-
-    // service status constants
-    /*
-    PyModule_AddIntConstant(
-        module, "SERVICE_CONTINUE_PENDING", SERVICE_CONTINUE_PENDING);
-    PyModule_AddIntConstant(
-        module, "SERVICE_PAUSE_PENDING", SERVICE_PAUSE_PENDING);
-    PyModule_AddIntConstant(
-        module, "SERVICE_PAUSED", SERVICE_PAUSED);
-    PyModule_AddIntConstant(
-        module, "SERVICE_RUNNING", SERVICE_RUNNING);
-    PyModule_AddIntConstant(
-        module, "SERVICE_START_PENDING", SERVICE_START_PENDING);
-    PyModule_AddIntConstant(
-        module, "SERVICE_STOP_PENDING", SERVICE_STOP_PENDING);
-    PyModule_AddIntConstant(
-        module, "SERVICE_STOPPED", SERVICE_STOPPED);
-    */
-
-    // ...for internal use in _psutil_windows.py
-    PyModule_AddIntConstant(
-        module, "INFINITE", INFINITE);
-    PyModule_AddIntConstant(
-        module, "ERROR_ACCESS_DENIED", ERROR_ACCESS_DENIED);
-    PyModule_AddIntConstant(
-        module, "ERROR_INVALID_NAME", ERROR_INVALID_NAME);
-    PyModule_AddIntConstant(
-        module, "ERROR_SERVICE_DOES_NOT_EXIST", ERROR_SERVICE_DOES_NOT_EXIST);
-    PyModule_AddIntConstant(
-        module, "ERROR_PRIVILEGE_NOT_HELD", ERROR_PRIVILEGE_NOT_HELD);
-    PyModule_AddIntConstant(
-        module, "WINVER", PSUTIL_WINVER);
-    PyModule_AddIntConstant(
-        module, "WINDOWS_VISTA", PSUTIL_WINDOWS_VISTA);
-    PyModule_AddIntConstant(
-        module, "WINDOWS_7", PSUTIL_WINDOWS_7);
-    PyModule_AddIntConstant(
-        module, "WINDOWS_8", PSUTIL_WINDOWS_8);
-    PyModule_AddIntConstant(
-        module, "WINDOWS_8_1", PSUTIL_WINDOWS_8_1);
-    PyModule_AddIntConstant(
-        module, "WINDOWS_10", PSUTIL_WINDOWS_10);
-
-#if PY_MAJOR_VERSION >= 3
-    return module;
-#endif
-}
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/_pswindows.py firefox-85.0+build1/third_party/python/psutil/psutil/_pswindows.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/_pswindows.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/_pswindows.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1105 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Windows platform implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-import signal
-import sys
-import time
-from collections import namedtuple
-
-from . import _common
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import debug
-from ._common import ENCODING
-from ._common import ENCODING_ERRS
-from ._common import isfile_strict
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import parse_environ_block
-from ._common import TimeoutExpired
-from ._common import usage_percent
-from ._compat import long
-from ._compat import lru_cache
-from ._compat import PY3
-from ._compat import unicode
-from ._compat import xrange
-from ._psutil_windows import ABOVE_NORMAL_PRIORITY_CLASS
-from ._psutil_windows import BELOW_NORMAL_PRIORITY_CLASS
-from ._psutil_windows import HIGH_PRIORITY_CLASS
-from ._psutil_windows import IDLE_PRIORITY_CLASS
-from ._psutil_windows import NORMAL_PRIORITY_CLASS
-from ._psutil_windows import REALTIME_PRIORITY_CLASS
-
-try:
-    from . import _psutil_windows as cext
-except ImportError as err:
-    if str(err).lower().startswith("dll load failed") and \
-            sys.getwindowsversion()[0] < 6:
-        # We may get here if:
-        # 1) we are on an old Windows version
-        # 2) psutil was installed via pip + wheel
-        # See: https://github.com/giampaolo/psutil/issues/811
-        msg = "this Windows version is too old (< Windows Vista); "
-        msg += "psutil 3.4.2 is the latest version which supports Windows "
-        msg += "2000, XP and 2003 server"
-        raise RuntimeError(msg)
-    else:
-        raise
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-# process priority constants, import from __init__.py:
-# http://msdn.microsoft.com/en-us/library/ms686219(v=vs.85).aspx
-__extra__all__ = [
-    "win_service_iter", "win_service_get",
-    # Process priority
-    "ABOVE_NORMAL_PRIORITY_CLASS", "BELOW_NORMAL_PRIORITY_CLASS",
-    "HIGH_PRIORITY_CLASS", "IDLE_PRIORITY_CLASS", "NORMAL_PRIORITY_CLASS",
-    "REALTIME_PRIORITY_CLASS",
-    # IO priority
-    "IOPRIO_VERYLOW", "IOPRIO_LOW", "IOPRIO_NORMAL", "IOPRIO_HIGH",
-    # others
-    "CONN_DELETE_TCB", "AF_LINK",
-]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-CONN_DELETE_TCB = "DELETE_TCB"
-ERROR_PARTIAL_COPY = 299
-PYPY = '__pypy__' in sys.builtin_module_names
-
-if enum is None:
-    AF_LINK = -1
-else:
-    AddressFamily = enum.IntEnum('AddressFamily', {'AF_LINK': -1})
-    AF_LINK = AddressFamily.AF_LINK
-
-TCP_STATUSES = {
-    cext.MIB_TCP_STATE_ESTAB: _common.CONN_ESTABLISHED,
-    cext.MIB_TCP_STATE_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.MIB_TCP_STATE_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.MIB_TCP_STATE_FIN_WAIT1: _common.CONN_FIN_WAIT1,
-    cext.MIB_TCP_STATE_FIN_WAIT2: _common.CONN_FIN_WAIT2,
-    cext.MIB_TCP_STATE_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.MIB_TCP_STATE_CLOSED: _common.CONN_CLOSE,
-    cext.MIB_TCP_STATE_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.MIB_TCP_STATE_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.MIB_TCP_STATE_LISTEN: _common.CONN_LISTEN,
-    cext.MIB_TCP_STATE_CLOSING: _common.CONN_CLOSING,
-    cext.MIB_TCP_STATE_DELETE_TCB: CONN_DELETE_TCB,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-if enum is not None:
-    class Priority(enum.IntEnum):
-        ABOVE_NORMAL_PRIORITY_CLASS = ABOVE_NORMAL_PRIORITY_CLASS
-        BELOW_NORMAL_PRIORITY_CLASS = BELOW_NORMAL_PRIORITY_CLASS
-        HIGH_PRIORITY_CLASS = HIGH_PRIORITY_CLASS
-        IDLE_PRIORITY_CLASS = IDLE_PRIORITY_CLASS
-        NORMAL_PRIORITY_CLASS = NORMAL_PRIORITY_CLASS
-        REALTIME_PRIORITY_CLASS = REALTIME_PRIORITY_CLASS
-
-    globals().update(Priority.__members__)
-
-if enum is None:
-    IOPRIO_VERYLOW = 0
-    IOPRIO_LOW = 1
-    IOPRIO_NORMAL = 2
-    IOPRIO_HIGH = 3
-else:
-    class IOPriority(enum.IntEnum):
-        IOPRIO_VERYLOW = 0
-        IOPRIO_LOW = 1
-        IOPRIO_NORMAL = 2
-        IOPRIO_HIGH = 3
-    globals().update(IOPriority.__members__)
-
-pinfo_map = dict(
-    num_handles=0,
-    ctx_switches=1,
-    user_time=2,
-    kernel_time=3,
-    create_time=4,
-    num_threads=5,
-    io_rcount=6,
-    io_wcount=7,
-    io_rbytes=8,
-    io_wbytes=9,
-    io_count_others=10,
-    io_bytes_others=11,
-    num_page_faults=12,
-    peak_wset=13,
-    wset=14,
-    peak_paged_pool=15,
-    paged_pool=16,
-    peak_non_paged_pool=17,
-    non_paged_pool=18,
-    pagefile=19,
-    peak_pagefile=20,
-    mem_private=21,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes',
-                       ['user', 'system', 'idle', 'interrupt', 'dpc'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-# psutil.Process.memory_info()
-pmem = namedtuple(
-    'pmem', ['rss', 'vms',
-             'num_page_faults', 'peak_wset', 'wset', 'peak_paged_pool',
-             'paged_pool', 'peak_nonpaged_pool', 'nonpaged_pool',
-             'pagefile', 'peak_pagefile', 'private'])
-# psutil.Process.memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', ))
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple('pmmap_grouped', ['path', 'rss'])
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes',
-                         'other_count', 'other_bytes'])
-
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-@lru_cache(maxsize=512)
-def convert_dos_path(s):
-    r"""Convert paths using native DOS format like:
-        "\Device\HarddiskVolume1\Windows\systemew\file.txt"
-    into:
-        "C:\Windows\systemew\file.txt"
-    """
-    rawdrive = '\\'.join(s.split('\\')[:3])
-    driveletter = cext.win32_QueryDosDevice(rawdrive)
-    remainder = s[len(rawdrive):]
-    return os.path.join(driveletter, remainder)
-
-
-def py2_strencode(s):
-    """Encode a unicode string to a byte string by using the default fs
-    encoding + "replace" error handler.
-    """
-    if PY3:
-        return s
-    else:
-        if isinstance(s, str):
-            return s
-        else:
-            return s.encode(ENCODING, ENCODING_ERRS)
-
-
-@memoize
-def getpagesize():
-    return cext.getpagesize()
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    mem = cext.virtual_mem()
-    totphys, availphys, totpagef, availpagef, totvirt, freevirt = mem
-    #
-    total = totphys
-    avail = availphys
-    free = availphys
-    used = total - avail
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    mem = cext.virtual_mem()
-    total = mem[2]
-    free = mem[3]
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, 0, 0)
-
-
-# =====================================================================
-# --- disk
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-
-
-def disk_usage(path):
-    """Return disk usage associated with path."""
-    if PY3 and isinstance(path, bytes):
-        # XXX: do we want to use "strict"? Probably yes, in order
-        # to fail immediately. After all we are accepting input here...
-        path = path.decode(ENCODING, errors="strict")
-    total, free = cext.disk_usage(path)
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sdiskusage(total, used, free, percent)
-
-
-def disk_partitions(all):
-    """Return disk partitions."""
-    rawlist = cext.disk_partitions(all)
-    return [_common.sdiskpart(*x) for x in rawlist]
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system CPU times as a named tuple."""
-    user, system, idle = cext.cpu_times()
-    # Internally, GetSystemTimes() is used, and it doesn't return
-    # interrupt and dpc times. cext.per_cpu_times() does, so we
-    # rely on it to get those only.
-    percpu_summed = scputimes(*[sum(n) for n in zip(*cext.per_cpu_times())])
-    return scputimes(user, system, idle,
-                     percpu_summed.interrupt, percpu_summed.dpc)
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples."""
-    ret = []
-    for user, system, idle, interrupt, dpc in cext.per_cpu_times():
-        item = scputimes(user, system, idle, interrupt, dpc)
-        ret.append(item)
-    return ret
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-def cpu_count_physical():
-    """Return the number of physical CPU cores in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    """Return CPU statistics."""
-    ctx_switches, interrupts, dpcs, syscalls = cext.cpu_stats()
-    soft_interrupts = 0
-    return _common.scpustats(ctx_switches, interrupts, soft_interrupts,
-                             syscalls)
-
-
-def cpu_freq():
-    """Return CPU frequency.
-    On Windows per-cpu frequency is not supported.
-    """
-    curr, max_ = cext.cpu_freq()
-    min_ = 0.0
-    return [_common.scpufreq(float(curr), min_, float(max_))]
-
-
-_loadavg_inititialized = False
-
-
-def getloadavg():
-    """Return the number of processes in the system run queue averaged
-    over the last 1, 5, and 15 minutes respectively as a tuple"""
-    global _loadavg_inititialized
-
-    if not _loadavg_inititialized:
-        cext.init_loadavg_counter()
-        _loadavg_inititialized = True
-
-    # Drop to 2 decimal points which is what Linux does
-    raw_loads = cext.getloadavg()
-    return tuple([round(load, 2) for load in raw_loads])
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    """
-    if kind not in conn_tmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in conn_tmap])))
-    families, types = conn_tmap[kind]
-    rawlist = cext.net_connections(_pid, families, types)
-    ret = set()
-    for item in rawlist:
-        fd, fam, type, laddr, raddr, status, pid = item
-        nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status, TCP_STATUSES,
-                            pid=pid if _pid == -1 else None)
-        ret.add(nt)
-    return list(ret)
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    ret = {}
-    rawdict = cext.net_if_stats()
-    for name, items in rawdict.items():
-        if not PY3:
-            assert isinstance(name, unicode), type(name)
-            name = py2_strencode(name)
-        isup, duplex, speed, mtu = items
-        if hasattr(_common, 'NicDuplex'):
-            duplex = _common.NicDuplex(duplex)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-def net_io_counters():
-    """Return network I/O statistics for every network interface
-    installed on the system as a dict of raw tuples.
-    """
-    ret = cext.net_io_counters()
-    return dict([(py2_strencode(k), v) for k, v in ret.items()])
-
-
-def net_if_addrs():
-    """Return the addresses associated to each NIC."""
-    ret = []
-    for items in cext.net_if_addrs():
-        items = list(items)
-        items[0] = py2_strencode(items[0])
-        ret.append(items)
-    return ret
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_battery():
-    """Return battery information."""
-    # For constants meaning see:
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/
-    #     aa373232(v=vs.85).aspx
-    acline_status, flags, percent, secsleft = cext.sensors_battery()
-    power_plugged = acline_status == 1
-    no_battery = bool(flags & 128)
-    charging = bool(flags & 8)
-
-    if no_battery:
-        return None
-    if power_plugged or charging:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    elif secsleft == -1:
-        secsleft = _common.POWER_TIME_UNKNOWN
-
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-_last_btime = 0
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    # This dirty hack is to adjust the precision of the returned
-    # value which may have a 1 second fluctuation, see:
-    # https://github.com/giampaolo/psutil/issues/1007
-    global _last_btime
-    ret = float(cext.boot_time())
-    if abs(ret - _last_btime) <= 1:
-        return _last_btime
-    else:
-        _last_btime = ret
-        return ret
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, hostname, tstamp = item
-        user = py2_strencode(user)
-        nt = _common.suser(user, None, hostname, tstamp, None)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- Windows services
-# =====================================================================
-
-
-def win_service_iter():
-    """Yields a list of WindowsService instances."""
-    for name, display_name in cext.winservice_enumerate():
-        yield WindowsService(py2_strencode(name), py2_strencode(display_name))
-
-
-def win_service_get(name):
-    """Open a Windows service and return it as a WindowsService instance."""
-    service = WindowsService(name, None)
-    service._display_name = service._query_config()['display_name']
-    return service
-
-
-class WindowsService(object):
-    """Represents an installed Windows service."""
-
-    def __init__(self, name, display_name):
-        self._name = name
-        self._display_name = display_name
-
-    def __str__(self):
-        details = "(name=%r, display_name=%r)" % (
-            self._name, self._display_name)
-        return "%s%s" % (self.__class__.__name__, details)
-
-    def __repr__(self):
-        return "<%s at %s>" % (self.__str__(), id(self))
-
-    def __eq__(self, other):
-        # Test for equality with another WindosService object based
-        # on name.
-        if not isinstance(other, WindowsService):
-            return NotImplemented
-        return self._name == other._name
-
-    def __ne__(self, other):
-        return not self == other
-
-    def _query_config(self):
-        with self._wrap_exceptions():
-            display_name, binpath, username, start_type = \
-                cext.winservice_query_config(self._name)
-        # XXX - update _self.display_name?
-        return dict(
-            display_name=py2_strencode(display_name),
-            binpath=py2_strencode(binpath),
-            username=py2_strencode(username),
-            start_type=py2_strencode(start_type))
-
-    def _query_status(self):
-        with self._wrap_exceptions():
-            status, pid = cext.winservice_query_status(self._name)
-        if pid == 0:
-            pid = None
-        return dict(status=status, pid=pid)
-
-    @contextlib.contextmanager
-    def _wrap_exceptions(self):
-        """Ctx manager which translates bare OSError and WindowsError
-        exceptions into NoSuchProcess and AccessDenied.
-        """
-        try:
-            yield
-        except OSError as err:
-            if is_permission_err(err):
-                raise AccessDenied(
-                    pid=None, name=self._name,
-                    msg="service %r is not querable (not enough privileges)" %
-                        self._name)
-            elif err.winerror in (cext.ERROR_INVALID_NAME,
-                                  cext.ERROR_SERVICE_DOES_NOT_EXIST):
-                raise NoSuchProcess(
-                    pid=None, name=self._name,
-                    msg="service %r does not exist)" % self._name)
-            else:
-                raise
-
-    # config query
-
-    def name(self):
-        """The service name. This string is how a service is referenced
-        and can be passed to win_service_get() to get a new
-        WindowsService instance.
-        """
-        return self._name
-
-    def display_name(self):
-        """The service display name. The value is cached when this class
-        is instantiated.
-        """
-        return self._display_name
-
-    def binpath(self):
-        """The fully qualified path to the service binary/exe file as
-        a string, including command line arguments.
-        """
-        return self._query_config()['binpath']
-
-    def username(self):
-        """The name of the user that owns this service."""
-        return self._query_config()['username']
-
-    def start_type(self):
-        """A string which can either be "automatic", "manual" or
-        "disabled".
-        """
-        return self._query_config()['start_type']
-
-    # status query
-
-    def pid(self):
-        """The process PID, if any, else None. This can be passed
-        to Process class to control the service's process.
-        """
-        return self._query_status()['pid']
-
-    def status(self):
-        """Service status as a string."""
-        return self._query_status()['status']
-
-    def description(self):
-        """Service long description."""
-        return py2_strencode(cext.winservice_query_descr(self.name()))
-
-    # utils
-
-    def as_dict(self):
-        """Utility method retrieving all the information above as a
-        dictionary.
-        """
-        d = self._query_config()
-        d.update(self._query_status())
-        d['name'] = self.name()
-        d['display_name'] = self.display_name()
-        d['description'] = self.description()
-        return d
-
-    # actions
-    # XXX: the necessary C bindings for start() and stop() are
-    # implemented but for now I prefer not to expose them.
-    # I may change my mind in the future. Reasons:
-    # - they require Administrator privileges
-    # - can't implement a timeout for stop() (unless by using a thread,
-    #   which sucks)
-    # - would require adding ServiceAlreadyStarted and
-    #   ServiceAlreadyStopped exceptions, adding two new APIs.
-    # - we might also want to have modify(), which would basically mean
-    #   rewriting win32serviceutil.ChangeServiceConfig, which involves a
-    #   lot of stuff (and API constants which would pollute the API), see:
-    #   http://pyxr.sourceforge.net/PyXR/c/python24/lib/site-packages/
-    #       win32/lib/win32serviceutil.py.html#0175
-    # - psutil is typically about "read only" monitoring stuff;
-    #   win_service_* APIs should only be used to retrieve a service and
-    #   check whether it's running
-
-    # def start(self, timeout=None):
-    #     with self._wrap_exceptions():
-    #         cext.winservice_start(self.name())
-    #         if timeout:
-    #             giveup_at = time.time() + timeout
-    #             while True:
-    #                 if self.status() == "running":
-    #                     return
-    #                 else:
-    #                     if time.time() > giveup_at:
-    #                         raise TimeoutExpired(timeout)
-    #                     else:
-    #                         time.sleep(.1)
-
-    # def stop(self):
-    #     # Note: timeout is not implemented because it's just not
-    #     # possible, see:
-    #     # http://stackoverflow.com/questions/11973228/
-    #     with self._wrap_exceptions():
-    #         return cext.winservice_stop(self.name())
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-pids = cext.pids
-pid_exists = cext.pid_exists
-ppid_map = cext.ppid_map  # used internally by Process.children()
-
-
-def is_permission_err(exc):
-    """Return True if this is a permission error."""
-    assert isinstance(exc, OSError), exc
-    # On Python 2 OSError doesn't always have 'winerror'. Sometimes
-    # it does, in which case the original exception was WindowsError
-    # (which is a subclass of OSError).
-    return exc.errno in (errno.EPERM, errno.EACCES) or \
-        getattr(exc, "winerror", -1) in (cext.ERROR_ACCESS_DENIED,
-                                         cext.ERROR_PRIVILEGE_NOT_HELD)
-
-
-def convert_oserror(exc, pid=None, name=None):
-    """Convert OSError into NoSuchProcess or AccessDenied."""
-    assert isinstance(exc, OSError), exc
-    if is_permission_err(exc):
-        return AccessDenied(pid=pid, name=name)
-    if exc.errno == errno.ESRCH:
-        return NoSuchProcess(pid=pid, name=name)
-    raise exc
-
-
-def wrap_exceptions(fun):
-    """Decorator which converts OSError into NoSuchProcess or AccessDenied."""
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except OSError as err:
-            raise convert_oserror(err, pid=self.pid, name=self._name)
-    return wrapper
-
-
-def retry_error_partial_copy(fun):
-    """Workaround for https://github.com/giampaolo/psutil/issues/875.
-    See: https://stackoverflow.com/questions/4457745#4457745
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        delay = 0.0001
-        times = 33
-        for x in range(times):  # retries for roughly 1 second
-            try:
-                return fun(self, *args, **kwargs)
-            except WindowsError as _:
-                err = _
-                if err.winerror == ERROR_PARTIAL_COPY:
-                    time.sleep(delay)
-                    delay = min(delay * 2, 0.04)
-                    continue
-                else:
-                    raise
-        else:
-            msg = "%s retried %s times, converted to AccessDenied as it's " \
-                "still returning %r" % (fun, times, err)
-            raise AccessDenied(pid=self.pid, name=self._name, msg=msg)
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    # --- oneshot() stuff
-
-    def oneshot_enter(self):
-        self._proc_info.cache_activate(self)
-        self.exe.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_info.cache_deactivate(self)
-        self.exe.cache_deactivate(self)
-
-    @memoize_when_activated
-    def _proc_info(self):
-        """Return multiple information about this process as a
-        raw tuple.
-        """
-        ret = cext.proc_info(self.pid)
-        assert len(ret) == len(pinfo_map)
-        return ret
-
-    def name(self):
-        """Return process name, which on Windows is always the final
-        part of the executable.
-        """
-        # This is how PIDs 0 and 4 are always represented in taskmgr
-        # and process-hacker.
-        if self.pid == 0:
-            return "System Idle Process"
-        if self.pid == 4:
-            return "System"
-        return os.path.basename(self.exe())
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def exe(self):
-        if PYPY:
-            try:
-                exe = cext.proc_exe(self.pid)
-            except WindowsError as err:
-                # 24 = ERROR_TOO_MANY_OPEN_FILES. Not sure why this happens
-                # (perhaps PyPy's JIT delaying garbage collection of files?).
-                if err.errno == 24:
-                    debug("%r forced into AccessDenied" % err)
-                    raise AccessDenied(self.pid, self._name)
-                raise
-        else:
-            exe = cext.proc_exe(self.pid)
-        if not PY3:
-            exe = py2_strencode(exe)
-        if exe.startswith('\\'):
-            return convert_dos_path(exe)
-        return exe  # May be "Registry", "MemCompression", ...
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def cmdline(self):
-        if cext.WINVER >= cext.WINDOWS_8_1:
-            # PEB method detects cmdline changes but requires more
-            # privileges: https://github.com/giampaolo/psutil/pull/1398
-            try:
-                ret = cext.proc_cmdline(self.pid, use_peb=True)
-            except OSError as err:
-                if is_permission_err(err):
-                    ret = cext.proc_cmdline(self.pid, use_peb=False)
-                else:
-                    raise
-        else:
-            ret = cext.proc_cmdline(self.pid, use_peb=True)
-        if PY3:
-            return ret
-        else:
-            return [py2_strencode(s) for s in ret]
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def environ(self):
-        ustr = cext.proc_environ(self.pid)
-        if ustr and not PY3:
-            assert isinstance(ustr, unicode), type(ustr)
-        return parse_environ_block(py2_strencode(ustr))
-
-    def ppid(self):
-        try:
-            return ppid_map()[self.pid]
-        except KeyError:
-            raise NoSuchProcess(self.pid, self._name)
-
-    def _get_raw_meminfo(self):
-        try:
-            return cext.proc_memory_info(self.pid)
-        except OSError as err:
-            if is_permission_err(err):
-                # TODO: the C ext can probably be refactored in order
-                # to get this from cext.proc_info()
-                info = self._proc_info()
-                return (
-                    info[pinfo_map['num_page_faults']],
-                    info[pinfo_map['peak_wset']],
-                    info[pinfo_map['wset']],
-                    info[pinfo_map['peak_paged_pool']],
-                    info[pinfo_map['paged_pool']],
-                    info[pinfo_map['peak_non_paged_pool']],
-                    info[pinfo_map['non_paged_pool']],
-                    info[pinfo_map['pagefile']],
-                    info[pinfo_map['peak_pagefile']],
-                    info[pinfo_map['mem_private']],
-                )
-            raise
-
-    @wrap_exceptions
-    def memory_info(self):
-        # on Windows RSS == WorkingSetSize and VSM == PagefileUsage.
-        # Underlying C function returns fields of PROCESS_MEMORY_COUNTERS
-        # struct.
-        t = self._get_raw_meminfo()
-        rss = t[2]  # wset
-        vms = t[7]  # pagefile
-        return pmem(*(rss, vms, ) + t)
-
-    @wrap_exceptions
-    def memory_full_info(self):
-        basic_mem = self.memory_info()
-        uss = cext.proc_memory_uss(self.pid)
-        uss *= getpagesize()
-        return pfullmem(*basic_mem + (uss, ))
-
-    def memory_maps(self):
-        try:
-            raw = cext.proc_memory_maps(self.pid)
-        except OSError as err:
-            # XXX - can't use wrap_exceptions decorator as we're
-            # returning a generator; probably needs refactoring.
-            raise convert_oserror(err, self.pid, self._name)
-        else:
-            for addr, perm, path, rss in raw:
-                path = convert_dos_path(path)
-                if not PY3:
-                    path = py2_strencode(path)
-                addr = hex(addr)
-                yield (addr, perm, path, rss)
-
-    @wrap_exceptions
-    def kill(self):
-        return cext.proc_kill(self.pid)
-
-    @wrap_exceptions
-    def send_signal(self, sig):
-        if sig == signal.SIGTERM:
-            cext.proc_kill(self.pid)
-        # py >= 2.7
-        elif sig in (getattr(signal, "CTRL_C_EVENT", object()),
-                     getattr(signal, "CTRL_BREAK_EVENT", object())):
-            os.kill(self.pid, sig)
-        else:
-            raise ValueError(
-                "only SIGTERM, CTRL_C_EVENT and CTRL_BREAK_EVENT signals "
-                "are supported on Windows")
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        if timeout is None:
-            cext_timeout = cext.INFINITE
-        else:
-            # WaitForSingleObject() expects time in milliseconds.
-            cext_timeout = int(timeout * 1000)
-
-        timer = getattr(time, 'monotonic', time.time)
-        stop_at = timer() + timeout if timeout is not None else None
-
-        try:
-            # Exit code is supposed to come from GetExitCodeProcess().
-            # May also be None if OpenProcess() failed with
-            # ERROR_INVALID_PARAMETER, meaning PID is already gone.
-            exit_code = cext.proc_wait(self.pid, cext_timeout)
-        except cext.TimeoutExpired:
-            # WaitForSingleObject() returned WAIT_TIMEOUT. Just raise.
-            raise TimeoutExpired(timeout, self.pid, self._name)
-        except cext.TimeoutAbandoned:
-            # WaitForSingleObject() returned WAIT_ABANDONED, see:
-            # https://github.com/giampaolo/psutil/issues/1224
-            # We'll just rely on the internal polling and return None
-            # when the PID disappears. Subprocess module does the same
-            # (return None):
-            # https://github.com/python/cpython/blob/
-            #     be50a7b627d0aa37e08fa8e2d5568891f19903ce/
-            #     Lib/subprocess.py#L1193-L1194
-            exit_code = None
-
-        # At this point WaitForSingleObject() returned WAIT_OBJECT_0,
-        # meaning the process is gone. Stupidly there are cases where
-        # its PID may still stick around so we do a further internal
-        # polling.
-        delay = 0.0001
-        while True:
-            if not pid_exists(self.pid):
-                return exit_code
-            if stop_at and timer() >= stop_at:
-                raise TimeoutExpired(timeout, pid=self.pid, name=self._name)
-            time.sleep(delay)
-            delay = min(delay * 2, 0.04)  # incremental delay
-
-    @wrap_exceptions
-    def username(self):
-        if self.pid in (0, 4):
-            return 'NT AUTHORITY\\SYSTEM'
-        domain, user = cext.proc_username(self.pid)
-        return py2_strencode(domain) + '\\' + py2_strencode(user)
-
-    @wrap_exceptions
-    def create_time(self):
-        # Note: proc_times() not put under oneshot() 'cause create_time()
-        # is already cached by the main Process class.
-        try:
-            user, system, created = cext.proc_times(self.pid)
-            return created
-        except OSError as err:
-            if is_permission_err(err):
-                return self._proc_info()[pinfo_map['create_time']]
-            raise
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_info()[pinfo_map['num_threads']]
-
-    @wrap_exceptions
-    def threads(self):
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        return retlist
-
-    @wrap_exceptions
-    def cpu_times(self):
-        try:
-            user, system, created = cext.proc_times(self.pid)
-        except OSError as err:
-            if not is_permission_err(err):
-                raise
-            info = self._proc_info()
-            user = info[pinfo_map['user_time']]
-            system = info[pinfo_map['kernel_time']]
-        # Children user/system times are not retrievable (set to 0).
-        return _common.pcputimes(user, system, 0.0, 0.0)
-
-    @wrap_exceptions
-    def suspend(self):
-        cext.proc_suspend_or_resume(self.pid, True)
-
-    @wrap_exceptions
-    def resume(self):
-        cext.proc_suspend_or_resume(self.pid, False)
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def cwd(self):
-        if self.pid in (0, 4):
-            raise AccessDenied(self.pid, self._name)
-        # return a normalized pathname since the native C function appends
-        # "\\" at the and of the path
-        path = cext.proc_cwd(self.pid)
-        return py2_strencode(os.path.normpath(path))
-
-    @wrap_exceptions
-    def open_files(self):
-        if self.pid in (0, 4):
-            return []
-        ret = set()
-        # Filenames come in in native format like:
-        # "\Device\HarddiskVolume1\Windows\systemew\file.txt"
-        # Convert the first part in the corresponding drive letter
-        # (e.g. "C:\") by using Windows's QueryDosDevice()
-        raw_file_names = cext.proc_open_files(self.pid)
-        for _file in raw_file_names:
-            _file = convert_dos_path(_file)
-            if isfile_strict(_file):
-                if not PY3:
-                    _file = py2_strencode(_file)
-                ntuple = _common.popenfile(_file, -1)
-                ret.add(ntuple)
-        return list(ret)
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        return net_connections(kind, _pid=self.pid)
-
-    @wrap_exceptions
-    def nice_get(self):
-        value = cext.proc_priority_get(self.pid)
-        if enum is not None:
-            value = Priority(value)
-        return value
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext.proc_priority_set(self.pid, value)
-
-    @wrap_exceptions
-    def ionice_get(self):
-        ret = cext.proc_io_priority_get(self.pid)
-        if enum is not None:
-            ret = IOPriority(ret)
-        return ret
-
-    @wrap_exceptions
-    def ionice_set(self, ioclass, value):
-        if value:
-            raise TypeError("value argument not accepted on Windows")
-        if ioclass not in (IOPRIO_VERYLOW, IOPRIO_LOW, IOPRIO_NORMAL,
-                           IOPRIO_HIGH):
-            raise ValueError("%s is not a valid priority" % ioclass)
-        cext.proc_io_priority_set(self.pid, ioclass)
-
-    @wrap_exceptions
-    def io_counters(self):
-        try:
-            ret = cext.proc_io_counters(self.pid)
-        except OSError as err:
-            if not is_permission_err(err):
-                raise
-            info = self._proc_info()
-            ret = (
-                info[pinfo_map['io_rcount']],
-                info[pinfo_map['io_wcount']],
-                info[pinfo_map['io_rbytes']],
-                info[pinfo_map['io_wbytes']],
-                info[pinfo_map['io_count_others']],
-                info[pinfo_map['io_bytes_others']],
-            )
-        return pio(*ret)
-
-    @wrap_exceptions
-    def status(self):
-        suspended = cext.proc_is_suspended(self.pid)
-        if suspended:
-            return _common.STATUS_STOPPED
-        else:
-            return _common.STATUS_RUNNING
-
-    @wrap_exceptions
-    def cpu_affinity_get(self):
-        def from_bitmask(x):
-            return [i for i in xrange(64) if (1 << i) & x]
-        bitmask = cext.proc_cpu_affinity_get(self.pid)
-        return from_bitmask(bitmask)
-
-    @wrap_exceptions
-    def cpu_affinity_set(self, value):
-        def to_bitmask(l):
-            if not l:
-                raise ValueError("invalid argument %r" % l)
-            out = 0
-            for b in l:
-                out |= 2 ** b
-            return out
-
-        # SetProcessAffinityMask() states that ERROR_INVALID_PARAMETER
-        # is returned for an invalid CPU but this seems not to be true,
-        # therefore we check CPUs validy beforehand.
-        allcpus = list(range(len(per_cpu_times())))
-        for cpu in value:
-            if cpu not in allcpus:
-                if not isinstance(cpu, (int, long)):
-                    raise TypeError(
-                        "invalid CPU %r; an integer is required" % cpu)
-                else:
-                    raise ValueError("invalid CPU %r" % cpu)
-
-        bitmask = to_bitmask(value)
-        cext.proc_cpu_affinity_set(self.pid, bitmask)
-
-    @wrap_exceptions
-    def num_handles(self):
-        try:
-            return cext.proc_num_handles(self.pid)
-        except OSError as err:
-            if is_permission_err(err):
-                return self._proc_info()[pinfo_map['num_handles']]
-            raise
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        ctx_switches = self._proc_info()[pinfo_map['ctx_switches']]
-        # only voluntary ctx switches are supported
-        return _common.pctxsw(ctx_switches, 0)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/__init__.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/__init__.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/__init__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1137 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Test utilities.
-"""
-
-from __future__ import print_function
-
-import atexit
-import contextlib
-import ctypes
-import errno
-import functools
-import os
-import random
-import re
-import select
-import shutil
-import socket
-import stat
-import subprocess
-import sys
-import tempfile
-import textwrap
-import threading
-import time
-import traceback
-import warnings
-from socket import AF_INET
-from socket import AF_INET6
-from socket import SOCK_STREAM
-
-import psutil
-from psutil import AIX
-from psutil import MACOS
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import supports_ipv6
-from psutil._compat import ChildProcessError
-from psutil._compat import FileExistsError
-from psutil._compat import FileNotFoundError
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil._compat import unicode
-from psutil._compat import which
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest  # requires "pip install unittest2"
-else:
-    import unittest
-
-try:
-    from unittest import mock  # py3
-except ImportError:
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        import mock  # NOQA - requires "pip install mock"
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-__all__ = [
-    # constants
-    'APPVEYOR', 'DEVNULL', 'GLOBAL_TIMEOUT', 'MEMORY_TOLERANCE', 'NO_RETRIES',
-    'PYPY', 'PYTHON_EXE', 'ROOT_DIR', 'SCRIPTS_DIR', 'TESTFILE_PREFIX',
-    'TESTFN', 'TESTFN_UNICODE', 'TOX', 'TRAVIS', 'CIRRUS', 'CI_TESTING',
-    'VALID_PROC_STATUSES',
-    "HAS_CPU_AFFINITY", "HAS_CPU_FREQ", "HAS_ENVIRON", "HAS_PROC_IO_COUNTERS",
-    "HAS_IONICE", "HAS_MEMORY_MAPS", "HAS_PROC_CPU_NUM", "HAS_RLIMIT",
-    "HAS_SENSORS_BATTERY", "HAS_BATTERY", "HAS_SENSORS_FANS",
-    "HAS_SENSORS_TEMPERATURES", "HAS_MEMORY_FULL_INFO",
-    # subprocesses
-    'pyrun', 'reap_children', 'get_test_subprocess', 'create_zombie_proc',
-    'create_proc_children_pair',
-    # threads
-    'ThreadTask'
-    # test utils
-    'unittest', 'skip_on_access_denied', 'skip_on_not_implemented',
-    'retry_on_failure',
-    # install utils
-    'install_pip', 'install_test_deps',
-    # fs utils
-    'chdir', 'safe_rmpath', 'create_exe', 'decode_path', 'encode_path',
-    'unique_filename',
-    # os
-    'get_winver', 'get_kernel_version',
-    # sync primitives
-    'call_until', 'wait_for_pid', 'wait_for_file',
-    # network
-    'check_net_address',
-    'get_free_port', 'unix_socket_path', 'bind_socket', 'bind_unix_socket',
-    'tcp_socketpair', 'unix_socketpair', 'create_sockets',
-    # compat
-    'reload_module', 'import_module_by_path',
-    # others
-    'warn', 'copyload_shared_lib', 'is_namedtuple',
-]
-
-
-# ===================================================================
-# --- constants
-# ===================================================================
-
-# --- platforms
-
-TOX = os.getenv('TOX') or '' in ('1', 'true')
-PYPY = '__pypy__' in sys.builtin_module_names
-# whether we're running this test suite on a Continuous Integration service
-TRAVIS = bool(os.environ.get('TRAVIS'))
-APPVEYOR = bool(os.environ.get('APPVEYOR'))
-CIRRUS = bool(os.environ.get('CIRRUS'))
-CI_TESTING = TRAVIS or APPVEYOR or CIRRUS
-
-# --- configurable defaults
-
-# how many times retry_on_failure() decorator will retry
-NO_RETRIES = 10
-# bytes tolerance for system-wide memory related tests
-MEMORY_TOLERANCE = 500 * 1024  # 500KB
-# the timeout used in functions which have to wait
-GLOBAL_TIMEOUT = 5
-# be more tolerant if we're on travis / appveyor in order to avoid
-# false positives
-if TRAVIS or APPVEYOR:
-    NO_RETRIES *= 3
-    GLOBAL_TIMEOUT *= 3
-
-# --- files
-
-TESTFILE_PREFIX = '$testfn'
-if os.name == 'java':
-    # Jython disallows @ in module names
-    TESTFILE_PREFIX = '$psutil-test-'
-else:
-    TESTFILE_PREFIX = '@psutil-test-'
-TESTFN = os.path.join(os.path.realpath(os.getcwd()), TESTFILE_PREFIX)
-# Disambiguate TESTFN for parallel testing, while letting it remain a valid
-# module name.
-TESTFN = TESTFN + str(os.getpid())
-
-_TESTFN = TESTFN + '-internal'
-TESTFN_UNICODE = TESTFN + u("-Æ’Å‘Å‘")
-ASCII_FS = sys.getfilesystemencoding().lower() in ('ascii', 'us-ascii')
-
-# --- paths
-
-ROOT_DIR = os.path.realpath(
-    os.path.join(os.path.dirname(__file__), '..', '..'))
-SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts')
-HERE = os.path.realpath(os.path.dirname(__file__))
-
-# --- support
-
-HAS_CONNECTIONS_UNIX = POSIX and not SUNOS
-HAS_CPU_AFFINITY = hasattr(psutil.Process, "cpu_affinity")
-HAS_CPU_FREQ = hasattr(psutil, "cpu_freq")
-HAS_GETLOADAVG = hasattr(psutil, "getloadavg")
-HAS_ENVIRON = hasattr(psutil.Process, "environ")
-HAS_IONICE = hasattr(psutil.Process, "ionice")
-HAS_MEMORY_MAPS = hasattr(psutil.Process, "memory_maps")
-HAS_NET_IO_COUNTERS = hasattr(psutil, "net_io_counters")
-HAS_PROC_CPU_NUM = hasattr(psutil.Process, "cpu_num")
-HAS_PROC_IO_COUNTERS = hasattr(psutil.Process, "io_counters")
-HAS_RLIMIT = hasattr(psutil.Process, "rlimit")
-HAS_SENSORS_BATTERY = hasattr(psutil, "sensors_battery")
-try:
-    HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery())
-except Exception:
-    HAS_BATTERY = True
-HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
-HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
-HAS_THREADS = hasattr(psutil.Process, "threads")
-SKIP_SYSCONS = (MACOS or AIX) and os.getuid() != 0
-
-# --- misc
-
-
-def _get_py_exe():
-    def attempt(exe):
-        try:
-            subprocess.check_call(
-                [exe, "-V"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        except Exception:
-            return None
-        else:
-            return exe
-
-    if MACOS:
-        exe = \
-            attempt(sys.executable) or \
-            attempt(os.path.realpath(sys.executable)) or \
-            attempt(which("python%s.%s" % sys.version_info[:2])) or \
-            attempt(psutil.Process().exe())
-        if not exe:
-            raise ValueError("can't find python exe real abspath")
-        return exe
-    else:
-        exe = os.path.realpath(sys.executable)
-        assert os.path.exists(exe), exe
-        return exe
-
-
-PYTHON_EXE = _get_py_exe()
-DEVNULL = open(os.devnull, 'r+')
-VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil)
-                       if x.startswith('STATUS_')]
-AF_UNIX = getattr(socket, "AF_UNIX", object())
-
-_subprocesses_started = set()
-_pids_started = set()
-_testfiles_created = set()
-
-
-@atexit.register
-def cleanup_test_files():
-    DEVNULL.close()
-    for name in os.listdir(u('.')):
-        if isinstance(name, unicode):
-            prefix = u(TESTFILE_PREFIX)
-        else:
-            prefix = TESTFILE_PREFIX
-        if name.startswith(prefix):
-            try:
-                safe_rmpath(name)
-            except Exception:
-                traceback.print_exc()
-    for path in _testfiles_created:
-        try:
-            safe_rmpath(path)
-        except Exception:
-            traceback.print_exc()
-
-
-# this is executed first
-@atexit.register
-def cleanup_test_procs():
-    reap_children(recursive=True)
-
-
-# ===================================================================
-# --- threads
-# ===================================================================
-
-
-class ThreadTask(threading.Thread):
-    """A thread task which does nothing expect staying alive."""
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self._running = False
-        self._interval = 0.001
-        self._flag = threading.Event()
-
-    def __repr__(self):
-        name = self.__class__.__name__
-        return '<%s running=%s at %#x>' % (name, self._running, id(self))
-
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        self.stop()
-
-    def start(self):
-        """Start thread and keep it running until an explicit
-        stop() request. Polls for shutdown every 'timeout' seconds.
-        """
-        if self._running:
-            raise ValueError("already started")
-        threading.Thread.start(self)
-        self._flag.wait()
-
-    def run(self):
-        self._running = True
-        self._flag.set()
-        while self._running:
-            time.sleep(self._interval)
-
-    def stop(self):
-        """Stop thread execution and and waits until it is stopped."""
-        if not self._running:
-            raise ValueError("already stopped")
-        self._running = False
-        self.join()
-
-
-# ===================================================================
-# --- subprocesses
-# ===================================================================
-
-
-def _reap_children_on_err(fun):
-    @functools.wraps(fun)
-    def wrapper(*args, **kwargs):
-        try:
-            return fun(*args, **kwargs)
-        except Exception:
-            reap_children()
-            raise
-    return wrapper
-
-
-@_reap_children_on_err
-def get_test_subprocess(cmd=None, **kwds):
-    """Creates a python subprocess which does nothing for 60 secs and
-    return it as subprocess.Popen instance.
-    If "cmd" is specified that is used instead of python.
-    By default stdin and stdout are redirected to /dev/null.
-    It also attemps to make sure the process is in a reasonably
-    initialized state.
-    The process is registered for cleanup on reap_children().
-    """
-    kwds.setdefault("stdin", DEVNULL)
-    kwds.setdefault("stdout", DEVNULL)
-    kwds.setdefault("cwd", os.getcwd())
-    kwds.setdefault("env", os.environ)
-    if WINDOWS:
-        # Prevents the subprocess to open error dialogs. This will also
-        # cause stderr to be suppressed, which is suboptimal in order
-        # to debug broken tests.
-        CREATE_NO_WINDOW = 0x8000000
-        kwds.setdefault("creationflags", CREATE_NO_WINDOW)
-    if cmd is None:
-        safe_rmpath(_TESTFN)
-        pyline = "from time import sleep;" \
-                 "open(r'%s', 'w').close();" \
-                 "sleep(60);" % _TESTFN
-        cmd = [PYTHON_EXE, "-c", pyline]
-        sproc = subprocess.Popen(cmd, **kwds)
-        _subprocesses_started.add(sproc)
-        wait_for_file(_TESTFN, delete=True, empty=True)
-    else:
-        sproc = subprocess.Popen(cmd, **kwds)
-        _subprocesses_started.add(sproc)
-        wait_for_pid(sproc.pid)
-    return sproc
-
-
-@_reap_children_on_err
-def create_proc_children_pair():
-    """Create a subprocess which creates another one as in:
-    A (us) -> B (child) -> C (grandchild).
-    Return a (child, grandchild) tuple.
-    The 2 processes are fully initialized and will live for 60 secs
-    and are registered for cleanup on reap_children().
-    """
-    _TESTFN2 = os.path.basename(_TESTFN) + '2'  # need to be relative
-    s = textwrap.dedent("""\
-        import subprocess, os, sys, time
-        s = "import os, time;"
-        s += "f = open('%s', 'w');"
-        s += "f.write(str(os.getpid()));"
-        s += "f.close();"
-        s += "time.sleep(60);"
-        p = subprocess.Popen([r'%s', '-c', s])
-        p.wait()
-        """ % (_TESTFN2, PYTHON_EXE))
-    # On Windows if we create a subprocess with CREATE_NO_WINDOW flag
-    # set (which is the default) a "conhost.exe" extra process will be
-    # spawned as a child. We don't want that.
-    if WINDOWS:
-        subp = pyrun(s, creationflags=0)
-    else:
-        subp = pyrun(s)
-    child1 = psutil.Process(subp.pid)
-    data = wait_for_file(_TESTFN2, delete=False, empty=False)
-    safe_rmpath(_TESTFN2)
-    child2_pid = int(data)
-    _pids_started.add(child2_pid)
-    child2 = psutil.Process(child2_pid)
-    return (child1, child2)
-
-
-def create_zombie_proc():
-    """Create a zombie process and return its PID."""
-    assert psutil.POSIX
-    unix_file = tempfile.mktemp(prefix=TESTFILE_PREFIX) if MACOS else TESTFN
-    src = textwrap.dedent("""\
-        import os, sys, time, socket, contextlib
-        child_pid = os.fork()
-        if child_pid > 0:
-            time.sleep(3000)
-        else:
-            # this is the zombie process
-            s = socket.socket(socket.AF_UNIX)
-            with contextlib.closing(s):
-                s.connect('%s')
-                if sys.version_info < (3, ):
-                    pid = str(os.getpid())
-                else:
-                    pid = bytes(str(os.getpid()), 'ascii')
-                s.sendall(pid)
-        """ % unix_file)
-    with contextlib.closing(socket.socket(socket.AF_UNIX)) as sock:
-        sock.settimeout(GLOBAL_TIMEOUT)
-        sock.bind(unix_file)
-        sock.listen(5)
-        pyrun(src)
-        conn, _ = sock.accept()
-        try:
-            select.select([conn.fileno()], [], [], GLOBAL_TIMEOUT)
-            zpid = int(conn.recv(1024))
-            _pids_started.add(zpid)
-            zproc = psutil.Process(zpid)
-            call_until(lambda: zproc.status(), "ret == psutil.STATUS_ZOMBIE")
-            return zpid
-        finally:
-            conn.close()
-
-
-@_reap_children_on_err
-def pyrun(src, **kwds):
-    """Run python 'src' code string in a separate interpreter.
-    Returns a subprocess.Popen instance.
-    """
-    kwds.setdefault("stdout", None)
-    kwds.setdefault("stderr", None)
-    with tempfile.NamedTemporaryFile(
-            prefix=TESTFILE_PREFIX, mode="wt", delete=False) as f:
-        _testfiles_created.add(f.name)
-        f.write(src)
-        f.flush()
-        subp = get_test_subprocess([PYTHON_EXE, f.name], **kwds)
-        wait_for_pid(subp.pid)
-    return subp
-
-
-@_reap_children_on_err
-def sh(cmd, **kwds):
-    """run cmd in a subprocess and return its output.
-    raises RuntimeError on error.
-    """
-    shell = True if isinstance(cmd, (str, unicode)) else False
-    # Prevents subprocess to open error dialogs in case of error.
-    flags = 0x8000000 if WINDOWS and shell else 0
-    kwds.setdefault("shell", shell)
-    kwds.setdefault("stdout", subprocess.PIPE)
-    kwds.setdefault("stderr", subprocess.PIPE)
-    kwds.setdefault("universal_newlines", True)
-    kwds.setdefault("creationflags", flags)
-    p = subprocess.Popen(cmd, **kwds)
-    _subprocesses_started.add(p)
-    if PY3:
-        stdout, stderr = p.communicate(timeout=GLOBAL_TIMEOUT)
-    else:
-        stdout, stderr = p.communicate()
-    if p.returncode != 0:
-        raise RuntimeError(stderr)
-    if stderr:
-        warn(stderr)
-    if stdout.endswith('\n'):
-        stdout = stdout[:-1]
-    return stdout
-
-
-def reap_children(recursive=False):
-    """Terminate and wait() any subprocess started by this test suite
-    and ensure that no zombies stick around to hog resources and
-    create problems  when looking for refleaks.
-
-    If resursive is True it also tries to terminate and wait()
-    all grandchildren started by this process.
-    """
-    # This is here to make sure wait_procs() behaves properly and
-    # investigate:
-    # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-    #     jiq2cgd6stsbtn60
-    def assert_gone(pid):
-        assert not psutil.pid_exists(pid), pid
-        assert pid not in psutil.pids(), pid
-        try:
-            p = psutil.Process(pid)
-            assert not p.is_running(), pid
-        except psutil.NoSuchProcess:
-            pass
-        else:
-            assert 0, "pid %s is not gone" % pid
-
-    # Get the children here, before terminating the children sub
-    # processes as we don't want to lose the intermediate reference
-    # in case of grandchildren.
-    if recursive:
-        children = set(psutil.Process().children(recursive=True))
-    else:
-        children = set()
-
-    # Terminate subprocess.Popen instances "cleanly" by closing their
-    # fds and wiat()ing for them in order to avoid zombies.
-    while _subprocesses_started:
-        subp = _subprocesses_started.pop()
-        _pids_started.add(subp.pid)
-        try:
-            subp.terminate()
-        except OSError as err:
-            if WINDOWS and err.winerror == 6:  # "invalid handle"
-                pass
-            elif err.errno != errno.ESRCH:
-                raise
-        if subp.stdout:
-            subp.stdout.close()
-        if subp.stderr:
-            subp.stderr.close()
-        try:
-            # Flushing a BufferedWriter may raise an error.
-            if subp.stdin:
-                subp.stdin.close()
-        finally:
-            # Wait for the process to terminate, to avoid zombies.
-            try:
-                subp.wait()
-            except ChildProcessError:
-                pass
-
-    # Terminate started pids.
-    while _pids_started:
-        pid = _pids_started.pop()
-        try:
-            p = psutil.Process(pid)
-        except psutil.NoSuchProcess:
-            assert_gone(pid)
-        else:
-            children.add(p)
-
-    # Terminate children.
-    if children:
-        for p in children:
-            try:
-                p.terminate()
-            except psutil.NoSuchProcess:
-                pass
-        gone, alive = psutil.wait_procs(children, timeout=GLOBAL_TIMEOUT)
-        for p in alive:
-            warn("couldn't terminate process %r; attempting kill()" % p)
-            try:
-                p.kill()
-            except psutil.NoSuchProcess:
-                pass
-        gone, alive = psutil.wait_procs(alive, timeout=GLOBAL_TIMEOUT)
-        if alive:
-            for p in alive:
-                warn("process %r survived kill()" % p)
-
-        for p in children:
-            assert_gone(p.pid)
-
-
-# ===================================================================
-# --- OS
-# ===================================================================
-
-
-def get_kernel_version():
-    """Return a tuple such as (2, 6, 36)."""
-    if not POSIX:
-        raise NotImplementedError("not POSIX")
-    s = ""
-    uname = os.uname()[2]
-    for c in uname:
-        if c.isdigit() or c == '.':
-            s += c
-        else:
-            break
-    if not s:
-        raise ValueError("can't parse %r" % uname)
-    minor = 0
-    micro = 0
-    nums = s.split('.')
-    major = int(nums[0])
-    if len(nums) >= 2:
-        minor = int(nums[1])
-    if len(nums) >= 3:
-        micro = int(nums[2])
-    return (major, minor, micro)
-
-
-def get_winver():
-    if not WINDOWS:
-        raise NotImplementedError("not WINDOWS")
-    wv = sys.getwindowsversion()
-    if hasattr(wv, 'service_pack_major'):  # python >= 2.7
-        sp = wv.service_pack_major or 0
-    else:
-        r = re.search(r"\s\d$", wv[4])
-        if r:
-            sp = int(r.group(0))
-        else:
-            sp = 0
-    return (wv[0], wv[1], sp)
-
-
-# ===================================================================
-# --- sync primitives
-# ===================================================================
-
-
-class retry(object):
-    """A retry decorator."""
-
-    def __init__(self,
-                 exception=Exception,
-                 timeout=None,
-                 retries=None,
-                 interval=0.001,
-                 logfun=None,
-                 ):
-        if timeout and retries:
-            raise ValueError("timeout and retries args are mutually exclusive")
-        self.exception = exception
-        self.timeout = timeout
-        self.retries = retries
-        self.interval = interval
-        self.logfun = logfun
-
-    def __iter__(self):
-        if self.timeout:
-            stop_at = time.time() + self.timeout
-            while time.time() < stop_at:
-                yield
-        elif self.retries:
-            for _ in range(self.retries):
-                yield
-        else:
-            while True:
-                yield
-
-    def sleep(self):
-        if self.interval is not None:
-            time.sleep(self.interval)
-
-    def __call__(self, fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            exc = None
-            for _ in self:
-                try:
-                    return fun(*args, **kwargs)
-                except self.exception as _:  # NOQA
-                    exc = _
-                    if self.logfun is not None:
-                        self.logfun(exc)
-                    self.sleep()
-                    continue
-            if PY3:
-                raise exc
-            else:
-                raise
-
-        # This way the user of the decorated function can change config
-        # parameters.
-        wrapper.decorator = self
-        return wrapper
-
-
-@retry(exception=psutil.NoSuchProcess, logfun=None, timeout=GLOBAL_TIMEOUT,
-       interval=0.001)
-def wait_for_pid(pid):
-    """Wait for pid to show up in the process list then return.
-    Used in the test suite to give time the sub process to initialize.
-    """
-    psutil.Process(pid)
-    if WINDOWS:
-        # give it some more time to allow better initialization
-        time.sleep(0.01)
-
-
-@retry(exception=(EnvironmentError, AssertionError), logfun=None,
-       timeout=GLOBAL_TIMEOUT, interval=0.001)
-def wait_for_file(fname, delete=True, empty=False):
-    """Wait for a file to be written on disk with some content."""
-    with open(fname, "rb") as f:
-        data = f.read()
-    if not empty:
-        assert data
-    if delete:
-        safe_rmpath(fname)
-    return data
-
-
-@retry(exception=AssertionError, logfun=None, timeout=GLOBAL_TIMEOUT,
-       interval=0.001)
-def call_until(fun, expr):
-    """Keep calling function for timeout secs and exit if eval()
-    expression is True.
-    """
-    ret = fun()
-    assert eval(expr)
-    return ret
-
-
-# ===================================================================
-# --- fs
-# ===================================================================
-
-
-def safe_rmpath(path):
-    "Convenience function for removing temporary test files or dirs"
-    def retry_fun(fun):
-        # On Windows it could happen that the file or directory has
-        # open handles or references preventing the delete operation
-        # to succeed immediately, so we retry for a while. See:
-        # https://bugs.python.org/issue33240
-        stop_at = time.time() + 1
-        while time.time() < stop_at:
-            try:
-                return fun()
-            except FileNotFoundError:
-                pass
-            except WindowsError as _:
-                err = _
-                warn("ignoring %s" % (str(err)))
-            time.sleep(0.01)
-        raise err
-
-    try:
-        st = os.stat(path)
-        if stat.S_ISDIR(st.st_mode):
-            fun = functools.partial(shutil.rmtree, path)
-        else:
-            fun = functools.partial(os.remove, path)
-        if POSIX:
-            fun()
-        else:
-            retry_fun(fun)
-    except FileNotFoundError:
-        pass
-
-
-def safe_mkdir(dir):
-    "Convenience function for creating a directory"
-    try:
-        os.mkdir(dir)
-    except FileExistsError:
-        pass
-
-
-@contextlib.contextmanager
-def chdir(dirname):
-    "Context manager which temporarily changes the current directory."
-    curdir = os.getcwd()
-    try:
-        os.chdir(dirname)
-        yield
-    finally:
-        os.chdir(curdir)
-
-
-def create_exe(outpath, c_code=None):
-    """Creates an executable file in the given location."""
-    assert not os.path.exists(outpath), outpath
-    if c_code:
-        if not which("gcc"):
-            raise ValueError("gcc is not installed")
-        if isinstance(c_code, bool):        # c_code is True
-            c_code = textwrap.dedent(
-                """
-                #include <unistd.h>
-                int main() {
-                    pause();
-                    return 1;
-                }
-                """)
-        assert isinstance(c_code, str), c_code
-        with tempfile.NamedTemporaryFile(
-                suffix='.c', delete=False, mode='wt') as f:
-            f.write(c_code)
-        try:
-            subprocess.check_call(["gcc", f.name, "-o", outpath])
-        finally:
-            safe_rmpath(f.name)
-    else:
-        # copy python executable
-        shutil.copyfile(PYTHON_EXE, outpath)
-        if POSIX:
-            st = os.stat(outpath)
-            os.chmod(outpath, st.st_mode | stat.S_IEXEC)
-
-
-def unique_filename(prefix=TESTFILE_PREFIX, suffix=""):
-    return tempfile.mktemp(prefix=prefix, suffix=suffix)
-
-
-# ===================================================================
-# --- testing
-# ===================================================================
-
-
-class TestCase(unittest.TestCase):
-
-    # Print a full path representation of the single unit tests
-    # being run.
-    def __str__(self):
-        fqmod = self.__class__.__module__
-        if not fqmod.startswith('psutil.'):
-            fqmod = 'psutil.tests.' + fqmod
-        return "%s.%s.%s" % (
-            fqmod, self.__class__.__name__, self._testMethodName)
-
-    # assertRaisesRegexp renamed to assertRaisesRegex in 3.3;
-    # add support for the new name.
-    if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
-# override default unittest.TestCase
-unittest.TestCase = TestCase
-
-
-def retry_on_failure(retries=NO_RETRIES):
-    """Decorator which runs a test function and retries N times before
-    actually failing.
-    """
-    def logfun(exc):
-        print("%r, retrying" % exc, file=sys.stderr)
-
-    return retry(exception=AssertionError, timeout=None, retries=retries,
-                 logfun=logfun)
-
-
-def skip_on_access_denied(only_if=None):
-    """Decorator to Ignore AccessDenied exceptions."""
-    def decorator(fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except psutil.AccessDenied:
-                if only_if is not None:
-                    if not only_if:
-                        raise
-                raise unittest.SkipTest("raises AccessDenied")
-        return wrapper
-    return decorator
-
-
-def skip_on_not_implemented(only_if=None):
-    """Decorator to Ignore NotImplementedError exceptions."""
-    def decorator(fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except NotImplementedError:
-                if only_if is not None:
-                    if not only_if:
-                        raise
-                msg = "%r was skipped because it raised NotImplementedError" \
-                      % fun.__name__
-                raise unittest.SkipTest(msg)
-        return wrapper
-    return decorator
-
-
-# ===================================================================
-# --- network
-# ===================================================================
-
-
-def get_free_port(host='127.0.0.1'):
-    """Return an unused TCP port."""
-    with contextlib.closing(socket.socket()) as sock:
-        sock.bind((host, 0))
-        return sock.getsockname()[1]
-
-
-@contextlib.contextmanager
-def unix_socket_path(suffix=""):
-    """A context manager which returns a non-existent file name
-    and tries to delete it on exit.
-    """
-    assert psutil.POSIX
-    path = unique_filename(suffix=suffix)
-    try:
-        yield path
-    finally:
-        try:
-            os.unlink(path)
-        except OSError:
-            pass
-
-
-def bind_socket(family=AF_INET, type=SOCK_STREAM, addr=None):
-    """Binds a generic socket."""
-    if addr is None and family in (AF_INET, AF_INET6):
-        addr = ("", 0)
-    sock = socket.socket(family, type)
-    try:
-        if os.name not in ('nt', 'cygwin'):
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind(addr)
-        if type == socket.SOCK_STREAM:
-            sock.listen(5)
-        return sock
-    except Exception:
-        sock.close()
-        raise
-
-
-def bind_unix_socket(name, type=socket.SOCK_STREAM):
-    """Bind a UNIX socket."""
-    assert psutil.POSIX
-    assert not os.path.exists(name), name
-    sock = socket.socket(socket.AF_UNIX, type)
-    try:
-        sock.bind(name)
-        if type == socket.SOCK_STREAM:
-            sock.listen(5)
-    except Exception:
-        sock.close()
-        raise
-    return sock
-
-
-def tcp_socketpair(family, addr=("", 0)):
-    """Build a pair of TCP sockets connected to each other.
-    Return a (server, client) tuple.
-    """
-    with contextlib.closing(socket.socket(family, SOCK_STREAM)) as ll:
-        ll.bind(addr)
-        ll.listen(5)
-        addr = ll.getsockname()
-        c = socket.socket(family, SOCK_STREAM)
-        try:
-            c.connect(addr)
-            caddr = c.getsockname()
-            while True:
-                a, addr = ll.accept()
-                # check that we've got the correct client
-                if addr == caddr:
-                    return (a, c)
-                a.close()
-        except OSError:
-            c.close()
-            raise
-
-
-def unix_socketpair(name):
-    """Build a pair of UNIX sockets connected to each other through
-    the same UNIX file name.
-    Return a (server, client) tuple.
-    """
-    assert psutil.POSIX
-    server = client = None
-    try:
-        server = bind_unix_socket(name, type=socket.SOCK_STREAM)
-        server.setblocking(0)
-        client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        client.setblocking(0)
-        client.connect(name)
-        # new = server.accept()
-    except Exception:
-        if server is not None:
-            server.close()
-        if client is not None:
-            client.close()
-        raise
-    return (server, client)
-
-
-@contextlib.contextmanager
-def create_sockets():
-    """Open as many socket families / types as possible."""
-    socks = []
-    fname1 = fname2 = None
-    try:
-        socks.append(bind_socket(socket.AF_INET, socket.SOCK_STREAM))
-        socks.append(bind_socket(socket.AF_INET, socket.SOCK_DGRAM))
-        if supports_ipv6():
-            socks.append(bind_socket(socket.AF_INET6, socket.SOCK_STREAM))
-            socks.append(bind_socket(socket.AF_INET6, socket.SOCK_DGRAM))
-        if POSIX and HAS_CONNECTIONS_UNIX:
-            fname1 = unix_socket_path().__enter__()
-            fname2 = unix_socket_path().__enter__()
-            s1, s2 = unix_socketpair(fname1)
-            s3 = bind_unix_socket(fname2, type=socket.SOCK_DGRAM)
-            # self.addCleanup(safe_rmpath, fname1)
-            # self.addCleanup(safe_rmpath, fname2)
-            for s in (s1, s2, s3):
-                socks.append(s)
-        yield socks
-    finally:
-        for s in socks:
-            s.close()
-        if fname1 is not None:
-            safe_rmpath(fname1)
-        if fname2 is not None:
-            safe_rmpath(fname2)
-
-
-def check_net_address(addr, family):
-    """Check a net address validity. Supported families are IPv4,
-    IPv6 and MAC addresses.
-    """
-    import ipaddress  # python >= 3.3 / requires "pip install ipaddress"
-    if enum and PY3:
-        assert isinstance(family, enum.IntEnum), family
-    if family == socket.AF_INET:
-        octs = [int(x) for x in addr.split('.')]
-        assert len(octs) == 4, addr
-        for num in octs:
-            assert 0 <= num <= 255, addr
-        if not PY3:
-            addr = unicode(addr)
-        ipaddress.IPv4Address(addr)
-    elif family == socket.AF_INET6:
-        assert isinstance(addr, str), addr
-        if not PY3:
-            addr = unicode(addr)
-        ipaddress.IPv6Address(addr)
-    elif family == psutil.AF_LINK:
-        assert re.match(r'([a-fA-F0-9]{2}[:|\-]?){6}', addr) is not None, addr
-    else:
-        raise ValueError("unknown family %r", family)
-
-
-# ===================================================================
-# --- compatibility
-# ===================================================================
-
-
-def reload_module(module):
-    """Backport of importlib.reload of Python 3.3+."""
-    try:
-        import importlib
-        if not hasattr(importlib, 'reload'):  # python <=3.3
-            raise ImportError
-    except ImportError:
-        import imp
-        return imp.reload(module)
-    else:
-        return importlib.reload(module)
-
-
-def import_module_by_path(path):
-    name = os.path.splitext(os.path.basename(path))[0]
-    if sys.version_info[0] == 2:
-        import imp
-        return imp.load_source(name, path)
-    elif sys.version_info[:2] <= (3, 4):
-        from importlib.machinery import SourceFileLoader
-        return SourceFileLoader(name, path).load_module()
-    else:
-        import importlib.util
-        spec = importlib.util.spec_from_file_location(name, path)
-        mod = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(mod)
-        return mod
-
-
-# ===================================================================
-# --- others
-# ===================================================================
-
-
-def warn(msg):
-    """Raise a warning msg."""
-    warnings.warn(msg, UserWarning)
-
-
-def is_namedtuple(x):
-    """Check if object is an instance of namedtuple."""
-    t = type(x)
-    b = t.__bases__
-    if len(b) != 1 or b[0] != tuple:
-        return False
-    f = getattr(t, '_fields', None)
-    if not isinstance(f, tuple):
-        return False
-    return all(type(n) == str for n in f)
-
-
-if POSIX:
-    @contextlib.contextmanager
-    def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
-        """Ctx manager which picks up a random shared CO lib used
-        by this process, copies it in another location and loads it
-        in memory via ctypes. Return the new absolutized path.
-        """
-        exe = 'pypy' if PYPY else 'python'
-        ext = ".so"
-        dst = tempfile.mktemp(prefix=dst_prefix, suffix=ext)
-        libs = [x.path for x in psutil.Process().memory_maps() if
-                os.path.splitext(x.path)[1] == ext and
-                exe in x.path.lower()]
-        src = random.choice(libs)
-        shutil.copyfile(src, dst)
-        try:
-            ctypes.CDLL(dst)
-            yield dst
-        finally:
-            safe_rmpath(dst)
-else:
-    @contextlib.contextmanager
-    def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
-        """Ctx manager which picks up a random shared DLL lib used
-        by this process, copies it in another location and loads it
-        in memory via ctypes.
-        Return the new absolutized, normcased path.
-        """
-        from ctypes import wintypes
-        from ctypes import WinError
-        ext = ".dll"
-        dst = tempfile.mktemp(prefix=dst_prefix, suffix=ext)
-        libs = [x.path for x in psutil.Process().memory_maps() if
-                x.path.lower().endswith(ext) and
-                'python' in os.path.basename(x.path).lower() and
-                'wow64' not in x.path.lower()]
-        if PYPY and not libs:
-            libs = [x.path for x in psutil.Process().memory_maps() if
-                    'pypy' in os.path.basename(x.path).lower()]
-        src = random.choice(libs)
-        shutil.copyfile(src, dst)
-        cfile = None
-        try:
-            cfile = ctypes.WinDLL(dst)
-            yield dst
-        finally:
-            # Work around OverflowError:
-            # - https://ci.appveyor.com/project/giampaolo/psutil/build/1207/
-            #       job/o53330pbnri9bcw7
-            # - http://bugs.python.org/issue30286
-            # - http://stackoverflow.com/questions/23522055
-            if cfile is not None:
-                FreeLibrary = ctypes.windll.kernel32.FreeLibrary
-                FreeLibrary.argtypes = [wintypes.HMODULE]
-                ret = FreeLibrary(cfile._handle)
-                if ret == 0:
-                    WinError()
-            safe_rmpath(dst)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/__main__.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/__main__.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/__main__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/__main__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Run unit tests. This is invoked by:
-$ python -m psutil.tests
-"""
-
-from .runner import main
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/README.rst firefox-85.0+build1/third_party/python/psutil/psutil/tests/README.rst
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/README.rst	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-Instructions for running tests
-==============================
-
-* There are two ways of running tests. As a "user", if psutil is already
-  installed and you just want to test it works::
-
-    python -m psutil.tests
-
-  As a "developer", if you have a copy of the source code and you wish to hack
-  on psutil::
-
-    make setup-dev-env  # install missing third-party deps
-    make test
-
-* To run tests on all supported Python versions install tox
-  (``pip install tox``) then run ``tox`` from within psutil root directory.
-
-* Every time a commit is pushed tests are automatically run on Travis
-  (Linux, MACOS) and appveyor (Windows):
-
-  * Travis builds: https://travis-ci.org/giampaolo/psutil
-  * AppVeyor builds: https://ci.appveyor.com/project/giampaolo/psutil
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/runner.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/runner.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/runner.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/runner.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Unit test runner, providing new features on top of unittest module:
-- colourized output (error, skip)
-- print failures/tracebacks on CTRL+C
-- re-run failed tests only (make test-failed)
-"""
-
-from __future__ import print_function
-import optparse
-import os
-import sys
-import unittest
-from unittest import TestResult
-from unittest import TextTestResult
-from unittest import TextTestRunner
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-
-import psutil
-from psutil._common import hilite
-from psutil._common import print_color
-from psutil._common import term_supports_colors
-from psutil.tests import safe_rmpath
-from psutil.tests import TOX
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-VERBOSITY = 1 if TOX else 2
-FAILED_TESTS_FNAME = '.failed-tests.txt'
-
-
-# =====================================================================
-# --- unittest subclasses
-# =====================================================================
-
-
-class ColouredResult(TextTestResult):
-
-    def _print_color(self, s, color, bold=False):
-        file = sys.stderr if color == "red" else sys.stdout
-        print_color(s, color, bold=bold, file=file)
-
-    def addSuccess(self, test):
-        TestResult.addSuccess(self, test)
-        self._print_color("OK", "green")
-
-    def addError(self, test, err):
-        TestResult.addError(self, test, err)
-        self._print_color("ERROR", "red", bold=True)
-
-    def addFailure(self, test, err):
-        TestResult.addFailure(self, test, err)
-        self._print_color("FAIL", "red")
-
-    def addSkip(self, test, reason):
-        TestResult.addSkip(self, test, reason)
-        self._print_color("skipped: %s" % reason, "brown")
-
-    def printErrorList(self, flavour, errors):
-        flavour = hilite(flavour, "red", bold=flavour == 'ERROR')
-        TextTestResult.printErrorList(self, flavour, errors)
-
-
-class ColouredRunner(TextTestRunner):
-    resultclass = ColouredResult if term_supports_colors() else TextTestResult
-
-    def _makeResult(self):
-        # Store result instance so that it can be accessed on
-        # KeyboardInterrupt.
-        self.result = TextTestRunner._makeResult(self)
-        return self.result
-
-
-# =====================================================================
-# --- public API
-# =====================================================================
-
-
-def setup_tests():
-    if 'PSUTIL_TESTING' not in os.environ:
-        # This won't work on Windows but set_testing() below will do it.
-        os.environ['PSUTIL_TESTING'] = '1'
-    psutil._psplatform.cext.set_testing()
-
-
-def get_suite(name=None):
-    suite = unittest.TestSuite()
-    if name is None:
-        testmods = [os.path.splitext(x)[0] for x in os.listdir(HERE)
-                    if x.endswith('.py') and x.startswith('test_') and not
-                    x.startswith('test_memory_leaks')]
-        if "WHEELHOUSE_UPLOADER_USERNAME" in os.environ:
-            testmods = [x for x in testmods if not x.endswith((
-                        "osx", "posix", "linux"))]
-        for tm in testmods:
-            # ...so that the full test paths are printed on screen
-            tm = "psutil.tests.%s" % tm
-            suite.addTest(unittest.defaultTestLoader.loadTestsFromName(tm))
-    else:
-        name = os.path.splitext(os.path.basename(name))[0]
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromName(name))
-    return suite
-
-
-def get_suite_from_failed():
-    # ...from previously failed test run
-    suite = unittest.TestSuite()
-    if not os.path.isfile(FAILED_TESTS_FNAME):
-        return suite
-    with open(FAILED_TESTS_FNAME, 'rt') as f:
-        names = f.read().split()
-    for n in names:
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromName(n))
-    return suite
-
-
-def save_failed_tests(result):
-    if result.wasSuccessful():
-        return safe_rmpath(FAILED_TESTS_FNAME)
-    with open(FAILED_TESTS_FNAME, 'wt') as f:
-        for t in result.errors + result.failures:
-            tname = str(t[0])
-            unittest.defaultTestLoader.loadTestsFromName(tname)
-            f.write(tname + '\n')
-
-
-def run(name=None, last_failed=False):
-    setup_tests()
-    runner = ColouredRunner(verbosity=VERBOSITY)
-    suite = get_suite_from_failed() if last_failed else get_suite(name)
-    try:
-        result = runner.run(suite)
-    except (KeyboardInterrupt, SystemExit) as err:
-        print("received %s" % err.__class__.__name__, file=sys.stderr)
-        runner.result.printErrors()
-        sys.exit(1)
-    else:
-        save_failed_tests(result)
-        success = result.wasSuccessful()
-        sys.exit(0 if success else 1)
-
-
-def main():
-    usage = "python3 -m psutil.tests [opts]"
-    parser = optparse.OptionParser(usage=usage, description="run unit tests")
-    parser.add_option("--last-failed",
-                      action="store_true", default=False,
-                      help="only run last failed tests")
-    opts, args = parser.parse_args()
-    run(last_failed=opts.last_failed)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_aix.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_aix.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_aix.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_aix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'
-# Copyright (c) 2017, Arnon Yaari
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""AIX specific tests."""
-
-import re
-
-from psutil import AIX
-from psutil.tests import sh
-from psutil.tests import unittest
-import psutil
-
-
-@unittest.skipIf(not AIX, "AIX only")
-class AIXSpecificTestCase(unittest.TestCase):
-
-    def test_virtual_memory(self):
-        out = sh('/usr/bin/svmon -O unit=KB')
-        re_pattern = r"memory\s*"
-        for field in ("size inuse free pin virtual available mmode").split():
-            re_pattern += r"(?P<%s>\S+)\s+" % (field,)
-        matchobj = re.search(re_pattern, out)
-
-        self.assertIsNotNone(
-            matchobj, "svmon command returned unexpected output")
-
-        KB = 1024
-        total = int(matchobj.group("size")) * KB
-        available = int(matchobj.group("available")) * KB
-        used = int(matchobj.group("inuse")) * KB
-        free = int(matchobj.group("free")) * KB
-
-        psutil_result = psutil.virtual_memory()
-
-        # MEMORY_TOLERANCE from psutil.tests is not enough. For some reason
-        # we're seeing differences of ~1.2 MB. 2 MB is still a good tolerance
-        # when compared to GBs.
-        MEMORY_TOLERANCE = 2 * KB * KB   # 2 MB
-        self.assertEqual(psutil_result.total, total)
-        self.assertAlmostEqual(
-            psutil_result.used, used, delta=MEMORY_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.available, available, delta=MEMORY_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.free, free, delta=MEMORY_TOLERANCE)
-
-    def test_swap_memory(self):
-        out = sh('/usr/sbin/lsps -a')
-        # From the man page, "The size is given in megabytes" so we assume
-        # we'll always have 'MB' in the result
-        # TODO maybe try to use "swap -l" to check "used" too, but its units
-        # are not guaranteed to be "MB" so parsing may not be consistent
-        matchobj = re.search(r"(?P<space>\S+)\s+"
-                             r"(?P<vol>\S+)\s+"
-                             r"(?P<vg>\S+)\s+"
-                             r"(?P<size>\d+)MB", out)
-
-        self.assertIsNotNone(
-            matchobj, "lsps command returned unexpected output")
-
-        total_mb = int(matchobj.group("size"))
-        MB = 1024 ** 2
-        psutil_result = psutil.swap_memory()
-        # we divide our result by MB instead of multiplying the lsps value by
-        # MB because lsps may round down, so we round down too
-        self.assertEqual(int(psutil_result.total / MB), total_mb)
-
-    def test_cpu_stats(self):
-        out = sh('/usr/bin/mpstat -a')
-
-        re_pattern = r"ALL\s*"
-        for field in ("min maj mpcs mpcr dev soft dec ph cs ics bound rq "
-                      "push S3pull S3grd S0rd S1rd S2rd S3rd S4rd S5rd "
-                      "sysc").split():
-            re_pattern += r"(?P<%s>\S+)\s+" % (field,)
-        matchobj = re.search(re_pattern, out)
-
-        self.assertIsNotNone(
-            matchobj, "mpstat command returned unexpected output")
-
-        # numbers are usually in the millions so 1000 is ok for tolerance
-        CPU_STATS_TOLERANCE = 1000
-        psutil_result = psutil.cpu_stats()
-        self.assertAlmostEqual(
-            psutil_result.ctx_switches,
-            int(matchobj.group("cs")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.syscalls,
-            int(matchobj.group("sysc")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.interrupts,
-            int(matchobj.group("dev")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.soft_interrupts,
-            int(matchobj.group("soft")),
-            delta=CPU_STATS_TOLERANCE)
-
-    def test_cpu_count_logical(self):
-        out = sh('/usr/bin/mpstat -a')
-        mpstat_lcpu = int(re.search(r"lcpu=(\d+)", out).group(1))
-        psutil_lcpu = psutil.cpu_count(logical=True)
-        self.assertEqual(mpstat_lcpu, psutil_lcpu)
-
-    def test_net_if_addrs_names(self):
-        out = sh('/etc/ifconfig -l')
-        ifconfig_names = set(out.split())
-        psutil_names = set(psutil.net_if_addrs().keys())
-        self.assertSetEqual(ifconfig_names, psutil_names)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_bsd.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_bsd.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_bsd.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_bsd.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,565 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# TODO: (FreeBSD) add test for comparing connections with 'sockstat' cmd.
-
-
-"""Tests specific to all BSD platforms."""
-
-
-import datetime
-import os
-import re
-import time
-
-import psutil
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-from psutil.tests import which
-
-
-if BSD:
-    PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-    if os.getuid() == 0:  # muse requires root privileges
-        MUSE_AVAILABLE = which('muse')
-    else:
-        MUSE_AVAILABLE = False
-else:
-    MUSE_AVAILABLE = False
-
-
-def sysctl(cmdline):
-    """Expects a sysctl command with an argument and parse the result
-    returning only the value of interest.
-    """
-    result = sh("sysctl " + cmdline)
-    if FREEBSD:
-        result = result[result.find(": ") + 2:]
-    elif OPENBSD or NETBSD:
-        result = result[result.find("=") + 1:]
-    try:
-        return int(result)
-    except ValueError:
-        return result
-
-
-def muse(field):
-    """Thin wrapper around 'muse' cmdline utility."""
-    out = sh('muse')
-    for line in out.split('\n'):
-        if line.startswith(field):
-            break
-    else:
-        raise ValueError("line not found")
-    return int(line.split()[1])
-
-
-# =====================================================================
-# --- All BSD*
-# =====================================================================
-
-
-@unittest.skipIf(not BSD, "BSD only")
-class BSDTestCase(unittest.TestCase):
-    """Generic tests common to all BSD variants."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    @unittest.skipIf(NETBSD, "-o lstart doesn't work on NETBSD")
-    def test_process_create_time(self):
-        output = sh("ps -o lstart -p %s" % self.pid)
-        start_ps = output.replace('STARTED', '').strip()
-        start_psutil = psutil.Process(self.pid).create_time()
-        start_psutil = time.strftime("%a %b %e %H:%M:%S %Y",
-                                     time.localtime(start_psutil))
-        self.assertEqual(start_ps, start_psutil)
-
-    def test_disks(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -k "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total = int(total) * 1024
-            used = int(used) * 1024
-            free = int(free) * 1024
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(part.device, dev)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.free, free))
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.used, used))
-
-    @unittest.skipIf(not which('sysctl'), "sysctl cmd not available")
-    def test_cpu_count_logical(self):
-        syst = sysctl("hw.ncpu")
-        self.assertEqual(psutil.cpu_count(logical=True), syst)
-
-    @unittest.skipIf(not which('sysctl'), "sysctl cmd not available")
-    def test_virtual_memory_total(self):
-        num = sysctl('hw.physmem')
-        self.assertEqual(num, psutil.virtual_memory().total)
-
-    def test_net_if_stats(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                if "mtu" in out:
-                    self.assertEqual(stats.mtu,
-                                     int(re.findall(r'mtu (\d+)', out)[0]))
-
-
-# =====================================================================
-# --- FreeBSD
-# =====================================================================
-
-
-@unittest.skipIf(not FREEBSD, "FREEBSD only")
-class FreeBSDProcessTestCase(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    @retry_on_failure()
-    def test_memory_maps(self):
-        out = sh('procstat -v %s' % self.pid)
-        maps = psutil.Process(self.pid).memory_maps(grouped=False)
-        lines = out.split('\n')[1:]
-        while lines:
-            line = lines.pop()
-            fields = line.split()
-            _, start, stop, perms, res = fields[:5]
-            map = maps.pop()
-            self.assertEqual("%s-%s" % (start, stop), map.addr)
-            self.assertEqual(int(res), map.rss)
-            if not map.path.startswith('['):
-                self.assertEqual(fields[10], map.path)
-
-    def test_exe(self):
-        out = sh('procstat -b %s' % self.pid)
-        self.assertEqual(psutil.Process(self.pid).exe(),
-                         out.split('\n')[1].split()[-1])
-
-    def test_cmdline(self):
-        out = sh('procstat -c %s' % self.pid)
-        self.assertEqual(' '.join(psutil.Process(self.pid).cmdline()),
-                         ' '.join(out.split('\n')[1].split()[2:]))
-
-    def test_uids_gids(self):
-        out = sh('procstat -s %s' % self.pid)
-        euid, ruid, suid, egid, rgid, sgid = out.split('\n')[1].split()[2:8]
-        p = psutil.Process(self.pid)
-        uids = p.uids()
-        gids = p.gids()
-        self.assertEqual(uids.real, int(ruid))
-        self.assertEqual(uids.effective, int(euid))
-        self.assertEqual(uids.saved, int(suid))
-        self.assertEqual(gids.real, int(rgid))
-        self.assertEqual(gids.effective, int(egid))
-        self.assertEqual(gids.saved, int(sgid))
-
-    @retry_on_failure()
-    def test_ctx_switches(self):
-        tested = []
-        out = sh('procstat -r %s' % self.pid)
-        p = psutil.Process(self.pid)
-        for line in out.split('\n'):
-            line = line.lower().strip()
-            if ' voluntary context' in line:
-                pstat_value = int(line.split()[-1])
-                psutil_value = p.num_ctx_switches().voluntary
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-            elif ' involuntary context' in line:
-                pstat_value = int(line.split()[-1])
-                psutil_value = p.num_ctx_switches().involuntary
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-        if len(tested) != 2:
-            raise RuntimeError("couldn't find lines match in procstat out")
-
-    @retry_on_failure()
-    def test_cpu_times(self):
-        tested = []
-        out = sh('procstat -r %s' % self.pid)
-        p = psutil.Process(self.pid)
-        for line in out.split('\n'):
-            line = line.lower().strip()
-            if 'user time' in line:
-                pstat_value = float('0.' + line.split()[-1].split('.')[-1])
-                psutil_value = p.cpu_times().user
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-            elif 'system time' in line:
-                pstat_value = float('0.' + line.split()[-1].split('.')[-1])
-                psutil_value = p.cpu_times().system
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-        if len(tested) != 2:
-            raise RuntimeError("couldn't find lines match in procstat out")
-
-
-@unittest.skipIf(not FREEBSD, "FREEBSD only")
-class FreeBSDSystemTestCase(unittest.TestCase):
-
-    @staticmethod
-    def parse_swapinfo():
-        # the last line is always the total
-        output = sh("swapinfo -k").splitlines()[-1]
-        parts = re.split(r'\s+', output)
-
-        if not parts:
-            raise ValueError("Can't parse swapinfo: %s" % output)
-
-        # the size is in 1k units, so multiply by 1024
-        total, used, free = (int(p) * 1024 for p in parts[1:4])
-        return total, used, free
-
-    def test_cpu_frequency_against_sysctl(self):
-        # Currently only cpu 0 is frequency is supported in FreeBSD
-        # All other cores use the same frequency.
-        sensor = "dev.cpu.0.freq"
-        try:
-            sysctl_result = int(sysctl(sensor))
-        except RuntimeError:
-            self.skipTest("frequencies not supported by kernel")
-        self.assertEqual(psutil.cpu_freq().current, sysctl_result)
-
-        sensor = "dev.cpu.0.freq_levels"
-        sysctl_result = sysctl(sensor)
-        # sysctl returns a string of the format:
-        # <freq_level_1>/<voltage_level_1> <freq_level_2>/<voltage_level_2>...
-        # Ordered highest available to lowest available.
-        max_freq = int(sysctl_result.split()[0].split("/")[0])
-        min_freq = int(sysctl_result.split()[-1].split("/")[0])
-        self.assertEqual(psutil.cpu_freq().max, max_freq)
-        self.assertEqual(psutil.cpu_freq().min, min_freq)
-
-    # --- virtual_memory(); tests against sysctl
-
-    @retry_on_failure()
-    def test_vmem_active(self):
-        syst = sysctl("vm.stats.vm.v_active_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().active, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_inactive(self):
-        syst = sysctl("vm.stats.vm.v_inactive_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().inactive, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_wired(self):
-        syst = sysctl("vm.stats.vm.v_wire_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().wired, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_cached(self):
-        syst = sysctl("vm.stats.vm.v_cache_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().cached, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_free(self):
-        syst = sysctl("vm.stats.vm.v_free_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().free, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_buffers(self):
-        syst = sysctl("vfs.bufspace")
-        self.assertAlmostEqual(psutil.virtual_memory().buffers, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    # --- virtual_memory(); tests against muse
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    def test_muse_vmem_total(self):
-        num = muse('Total')
-        self.assertEqual(psutil.virtual_memory().total, num)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_active(self):
-        num = muse('Active')
-        self.assertAlmostEqual(psutil.virtual_memory().active, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_inactive(self):
-        num = muse('Inactive')
-        self.assertAlmostEqual(psutil.virtual_memory().inactive, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_wired(self):
-        num = muse('Wired')
-        self.assertAlmostEqual(psutil.virtual_memory().wired, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_cached(self):
-        num = muse('Cache')
-        self.assertAlmostEqual(psutil.virtual_memory().cached, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_free(self):
-        num = muse('Free')
-        self.assertAlmostEqual(psutil.virtual_memory().free, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_buffers(self):
-        num = muse('Buffer')
-        self.assertAlmostEqual(psutil.virtual_memory().buffers, num,
-                               delta=MEMORY_TOLERANCE)
-
-    def test_cpu_stats_ctx_switches(self):
-        self.assertAlmostEqual(psutil.cpu_stats().ctx_switches,
-                               sysctl('vm.stats.sys.v_swtch'), delta=1000)
-
-    def test_cpu_stats_interrupts(self):
-        self.assertAlmostEqual(psutil.cpu_stats().interrupts,
-                               sysctl('vm.stats.sys.v_intr'), delta=1000)
-
-    def test_cpu_stats_soft_interrupts(self):
-        self.assertAlmostEqual(psutil.cpu_stats().soft_interrupts,
-                               sysctl('vm.stats.sys.v_soft'), delta=1000)
-
-    @retry_on_failure()
-    def test_cpu_stats_syscalls(self):
-        # pretty high tolerance but it looks like it's OK.
-        self.assertAlmostEqual(psutil.cpu_stats().syscalls,
-                               sysctl('vm.stats.sys.v_syscall'), delta=200000)
-
-    # def test_cpu_stats_traps(self):
-    #    self.assertAlmostEqual(psutil.cpu_stats().traps,
-    #                           sysctl('vm.stats.sys.v_trap'), delta=1000)
-
-    # --- swap memory
-
-    def test_swapmem_free(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().free, free, delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_used(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().used, used, delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_total(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().total, total, delta=MEMORY_TOLERANCE)
-
-    # --- others
-
-    def test_boot_time(self):
-        s = sysctl('sysctl kern.boottime')
-        s = s[s.find(" sec = ") + 7:]
-        s = s[:s.find(',')]
-        btime = int(s)
-        self.assertEqual(btime, psutil.boot_time())
-
-    # --- sensors_battery
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        def secs2hours(secs):
-            m, s = divmod(secs, 60)
-            h, m = divmod(m, 60)
-            return "%d:%02d" % (h, m)
-
-        out = sh("acpiconf -i 0")
-        fields = dict([(x.split('\t')[0], x.split('\t')[-1])
-                       for x in out.split("\n")])
-        metrics = psutil.sensors_battery()
-        percent = int(fields['Remaining capacity:'].replace('%', ''))
-        remaining_time = fields['Remaining time:']
-        self.assertEqual(metrics.percent, percent)
-        if remaining_time == 'unknown':
-            self.assertEqual(metrics.secsleft, psutil.POWER_TIME_UNLIMITED)
-        else:
-            self.assertEqual(secs2hours(metrics.secsleft), remaining_time)
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery_against_sysctl(self):
-        self.assertEqual(psutil.sensors_battery().percent,
-                         sysctl("hw.acpi.battery.life"))
-        self.assertEqual(psutil.sensors_battery().power_plugged,
-                         sysctl("hw.acpi.acline") == 1)
-        secsleft = psutil.sensors_battery().secsleft
-        if secsleft < 0:
-            self.assertEqual(sysctl("hw.acpi.battery.time"), -1)
-        else:
-            self.assertEqual(secsleft, sysctl("hw.acpi.battery.time") * 60)
-
-    @unittest.skipIf(HAS_BATTERY, "has battery")
-    def test_sensors_battery_no_battery(self):
-        # If no battery is present one of these calls is supposed
-        # to fail, see:
-        # https://github.com/giampaolo/psutil/issues/1074
-        with self.assertRaises(RuntimeError):
-            sysctl("hw.acpi.battery.life")
-            sysctl("hw.acpi.battery.time")
-            sysctl("hw.acpi.acline")
-        self.assertIsNone(psutil.sensors_battery())
-
-    # --- sensors_temperatures
-
-    def test_sensors_temperatures_against_sysctl(self):
-        num_cpus = psutil.cpu_count(True)
-        for cpu in range(num_cpus):
-            sensor = "dev.cpu.%s.temperature" % cpu
-            # sysctl returns a string in the format 46.0C
-            try:
-                sysctl_result = int(float(sysctl(sensor)[:-1]))
-            except RuntimeError:
-                self.skipTest("temperatures not supported by kernel")
-            self.assertAlmostEqual(
-                psutil.sensors_temperatures()["coretemp"][cpu].current,
-                sysctl_result, delta=10)
-
-            sensor = "dev.cpu.%s.coretemp.tjmax" % cpu
-            sysctl_result = int(float(sysctl(sensor)[:-1]))
-            self.assertEqual(
-                psutil.sensors_temperatures()["coretemp"][cpu].high,
-                sysctl_result)
-
-# =====================================================================
-# --- OpenBSD
-# =====================================================================
-
-
-@unittest.skipIf(not OPENBSD, "OPENBSD only")
-class OpenBSDTestCase(unittest.TestCase):
-
-    def test_boot_time(self):
-        s = sysctl('kern.boottime')
-        sys_bt = datetime.datetime.strptime(s, "%a %b %d %H:%M:%S %Y")
-        psutil_bt = datetime.datetime.fromtimestamp(psutil.boot_time())
-        self.assertEqual(sys_bt, psutil_bt)
-
-
-# =====================================================================
-# --- NetBSD
-# =====================================================================
-
-
-@unittest.skipIf(not NETBSD, "NETBSD only")
-class NetBSDTestCase(unittest.TestCase):
-
-    @staticmethod
-    def parse_meminfo(look_for):
-        with open('/proc/meminfo', 'rt') as f:
-            for line in f:
-                if line.startswith(look_for):
-                    return int(line.split()[1]) * 1024
-        raise ValueError("can't find %s" % look_for)
-
-    def test_vmem_total(self):
-        self.assertEqual(
-            psutil.virtual_memory().total, self.parse_meminfo("MemTotal:"))
-
-    def test_vmem_free(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().free, self.parse_meminfo("MemFree:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_vmem_buffers(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().buffers, self.parse_meminfo("Buffers:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_vmem_shared(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().shared, self.parse_meminfo("MemShared:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_total(self):
-        self.assertAlmostEqual(
-            psutil.swap_memory().total, self.parse_meminfo("SwapTotal:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_free(self):
-        self.assertAlmostEqual(
-            psutil.swap_memory().free, self.parse_meminfo("SwapFree:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_used(self):
-        smem = psutil.swap_memory()
-        self.assertEqual(smem.used, smem.total - smem.free)
-
-    def test_cpu_stats_interrupts(self):
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'intr'):
-                    interrupts = int(line.split()[1])
-                    break
-            else:
-                raise ValueError("couldn't find line")
-        self.assertAlmostEqual(
-            psutil.cpu_stats().interrupts, interrupts, delta=1000)
-
-    def test_cpu_stats_ctx_switches(self):
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'ctxt'):
-                    ctx_switches = int(line.split()[1])
-                    break
-            else:
-                raise ValueError("couldn't find line")
-        self.assertAlmostEqual(
-            psutil.cpu_stats().ctx_switches, ctx_switches, delta=1000)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_connections.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_connections.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_connections.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_connections.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,637 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for net_connections() and Process.connections() APIs."""
-
-import contextlib
-import errno
-import os
-import socket
-import textwrap
-from contextlib import closing
-from socket import AF_INET
-from socket import AF_INET6
-from socket import SOCK_DGRAM
-from socket import SOCK_STREAM
-
-import psutil
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import supports_ipv6
-from psutil._compat import PY3
-from psutil.tests import AF_UNIX
-from psutil.tests import bind_socket
-from psutil.tests import bind_unix_socket
-from psutil.tests import check_net_address
-from psutil.tests import CIRRUS
-from psutil.tests import create_sockets
-from psutil.tests import enum
-from psutil.tests import get_free_port
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import pyrun
-from psutil.tests import reap_children
-from psutil.tests import safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import SKIP_SYSCONS
-from psutil.tests import tcp_socketpair
-from psutil.tests import TESTFN
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-from psutil.tests import unix_socketpair
-from psutil.tests import wait_for_file
-
-
-thisproc = psutil.Process()
-SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object())
-
-
-class Base(object):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-        if not (NETBSD or FREEBSD):
-            # process opens a UNIX socket to /var/log/run.
-            cons = thisproc.connections(kind='all')
-            assert not cons, cons
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-        reap_children()
-        if not (FREEBSD or NETBSD):
-            # Make sure we closed all resources.
-            # NetBSD opens a UNIX socket to /var/log/run.
-            cons = thisproc.connections(kind='all')
-            assert not cons, cons
-
-    def compare_procsys_connections(self, pid, proc_cons, kind='all'):
-        """Given a process PID and its list of connections compare
-        those against system-wide connections retrieved via
-        psutil.net_connections.
-        """
-        try:
-            sys_cons = psutil.net_connections(kind=kind)
-        except psutil.AccessDenied:
-            # On MACOS, system-wide connections are retrieved by iterating
-            # over all processes
-            if MACOS:
-                return
-            else:
-                raise
-        # Filter for this proc PID and exlucde PIDs from the tuple.
-        sys_cons = [c[:-1] for c in sys_cons if c.pid == pid]
-        sys_cons.sort()
-        proc_cons.sort()
-        self.assertEqual(proc_cons, sys_cons)
-
-    def check_connection_ntuple(self, conn):
-        """Check validity of a connection namedtuple."""
-        def check_ntuple(conn):
-            has_pid = len(conn) == 7
-            self.assertIn(len(conn), (6, 7))
-            self.assertEqual(conn[0], conn.fd)
-            self.assertEqual(conn[1], conn.family)
-            self.assertEqual(conn[2], conn.type)
-            self.assertEqual(conn[3], conn.laddr)
-            self.assertEqual(conn[4], conn.raddr)
-            self.assertEqual(conn[5], conn.status)
-            if has_pid:
-                self.assertEqual(conn[6], conn.pid)
-
-        def check_family(conn):
-            self.assertIn(conn.family, (AF_INET, AF_INET6, AF_UNIX))
-            if enum is not None:
-                assert isinstance(conn.family, enum.IntEnum), conn
-            else:
-                assert isinstance(conn.family, int), conn
-            if conn.family == AF_INET:
-                # actually try to bind the local socket; ignore IPv6
-                # sockets as their address might be represented as
-                # an IPv4-mapped-address (e.g. "::127.0.0.1")
-                # and that's rejected by bind()
-                s = socket.socket(conn.family, conn.type)
-                with contextlib.closing(s):
-                    try:
-                        s.bind((conn.laddr[0], 0))
-                    except socket.error as err:
-                        if err.errno != errno.EADDRNOTAVAIL:
-                            raise
-            elif conn.family == AF_UNIX:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        def check_type(conn):
-            # SOCK_SEQPACKET may happen in case of AF_UNIX socks
-            self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET))
-            if enum is not None:
-                assert isinstance(conn.type, enum.IntEnum), conn
-            else:
-                assert isinstance(conn.type, int), conn
-            if conn.type == SOCK_DGRAM:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        def check_addrs(conn):
-            # check IP address and port sanity
-            for addr in (conn.laddr, conn.raddr):
-                if conn.family in (AF_INET, AF_INET6):
-                    self.assertIsInstance(addr, tuple)
-                    if not addr:
-                        continue
-                    self.assertIsInstance(addr.port, int)
-                    assert 0 <= addr.port <= 65535, addr.port
-                    check_net_address(addr.ip, conn.family)
-                elif conn.family == AF_UNIX:
-                    self.assertIsInstance(addr, str)
-
-        def check_status(conn):
-            self.assertIsInstance(conn.status, str)
-            valids = [getattr(psutil, x) for x in dir(psutil)
-                      if x.startswith('CONN_')]
-            self.assertIn(conn.status, valids)
-            if conn.family in (AF_INET, AF_INET6) and conn.type == SOCK_STREAM:
-                self.assertNotEqual(conn.status, psutil.CONN_NONE)
-            else:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        check_ntuple(conn)
-        check_family(conn)
-        check_type(conn)
-        check_addrs(conn)
-        check_status(conn)
-
-
-class TestBase(Base, unittest.TestCase):
-
-    @unittest.skipIf(SKIP_SYSCONS, "requires root")
-    def test_system(self):
-        with create_sockets():
-            for conn in psutil.net_connections(kind='all'):
-                self.check_connection_ntuple(conn)
-
-    def test_process(self):
-        with create_sockets():
-            for conn in psutil.Process().connections(kind='all'):
-                self.check_connection_ntuple(conn)
-
-    def test_invalid_kind(self):
-        self.assertRaises(ValueError, thisproc.connections, kind='???')
-        self.assertRaises(ValueError, psutil.net_connections, kind='???')
-
-
-class TestUnconnectedSockets(Base, unittest.TestCase):
-    """Tests sockets which are open but not connected to anything."""
-
-    def get_conn_from_sock(self, sock):
-        cons = thisproc.connections(kind='all')
-        smap = dict([(c.fd, c) for c in cons])
-        if NETBSD or FREEBSD:
-            # NetBSD opens a UNIX socket to /var/log/run
-            # so there may be more connections.
-            return smap[sock.fileno()]
-        else:
-            self.assertEqual(len(cons), 1)
-            if cons[0].fd != -1:
-                self.assertEqual(smap[sock.fileno()].fd, sock.fileno())
-            return cons[0]
-
-    def check_socket(self, sock):
-        """Given a socket, makes sure it matches the one obtained
-        via psutil. It assumes this process created one connection
-        only (the one supposed to be checked).
-        """
-        conn = self.get_conn_from_sock(sock)
-        self.check_connection_ntuple(conn)
-
-        # fd, family, type
-        if conn.fd != -1:
-            self.assertEqual(conn.fd, sock.fileno())
-        self.assertEqual(conn.family, sock.family)
-        # see: http://bugs.python.org/issue30204
-        self.assertEqual(
-            conn.type, sock.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE))
-
-        # local address
-        laddr = sock.getsockname()
-        if not laddr and PY3 and isinstance(laddr, bytes):
-            # See: http://bugs.python.org/issue30205
-            laddr = laddr.decode()
-        if sock.family == AF_INET6:
-            laddr = laddr[:2]
-        if sock.family == AF_UNIX and OPENBSD:
-            # No addresses are set for UNIX sockets on OpenBSD.
-            pass
-        else:
-            self.assertEqual(conn.laddr, laddr)
-
-        # XXX Solaris can't retrieve system-wide UNIX sockets
-        if sock.family == AF_UNIX and HAS_CONNECTIONS_UNIX:
-            cons = thisproc.connections(kind='all')
-            self.compare_procsys_connections(os.getpid(), cons, kind='all')
-        return conn
-
-    def test_tcp_v4(self):
-        addr = ("127.0.0.1", get_free_port())
-        with closing(bind_socket(AF_INET, SOCK_STREAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_LISTEN)
-
-    @unittest.skipIf(not supports_ipv6(), "IPv6 not supported")
-    def test_tcp_v6(self):
-        addr = ("::1", get_free_port())
-        with closing(bind_socket(AF_INET6, SOCK_STREAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_LISTEN)
-
-    def test_udp_v4(self):
-        addr = ("127.0.0.1", get_free_port())
-        with closing(bind_socket(AF_INET, SOCK_DGRAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not supports_ipv6(), "IPv6 not supported")
-    def test_udp_v6(self):
-        addr = ("::1", get_free_port())
-        with closing(bind_socket(AF_INET6, SOCK_DGRAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix_tcp(self):
-        with unix_socket_path() as name:
-            with closing(bind_unix_socket(name, type=SOCK_STREAM)) as sock:
-                conn = self.check_socket(sock)
-                assert not conn.raddr
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix_udp(self):
-        with unix_socket_path() as name:
-            with closing(bind_unix_socket(name, type=SOCK_STREAM)) as sock:
-                conn = self.check_socket(sock)
-                assert not conn.raddr
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-
-class TestConnectedSocket(Base, unittest.TestCase):
-    """Test socket pairs which are are actually connected to
-    each other.
-    """
-
-    # On SunOS, even after we close() it, the server socket stays around
-    # in TIME_WAIT state.
-    @unittest.skipIf(SUNOS, "unreliable on SUONS")
-    def test_tcp(self):
-        addr = ("127.0.0.1", get_free_port())
-        assert not thisproc.connections(kind='tcp4')
-        server, client = tcp_socketpair(AF_INET, addr=addr)
-        try:
-            cons = thisproc.connections(kind='tcp4')
-            self.assertEqual(len(cons), 2)
-            self.assertEqual(cons[0].status, psutil.CONN_ESTABLISHED)
-            self.assertEqual(cons[1].status, psutil.CONN_ESTABLISHED)
-            # May not be fast enough to change state so it stays
-            # commenteed.
-            # client.close()
-            # cons = thisproc.connections(kind='all')
-            # self.assertEqual(len(cons), 1)
-            # self.assertEqual(cons[0].status, psutil.CONN_CLOSE_WAIT)
-        finally:
-            server.close()
-            client.close()
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix(self):
-        with unix_socket_path() as name:
-            server, client = unix_socketpair(name)
-            try:
-                cons = thisproc.connections(kind='unix')
-                assert not (cons[0].laddr and cons[0].raddr)
-                assert not (cons[1].laddr and cons[1].raddr)
-                if NETBSD or FREEBSD:
-                    # On NetBSD creating a UNIX socket will cause
-                    # a UNIX connection to  /var/run/log.
-                    cons = [c for c in cons if c.raddr != '/var/run/log']
-                    if CIRRUS:
-                        cons = [c for c in cons if c.fd in
-                                (server.fileno(), client.fileno())]
-                self.assertEqual(len(cons), 2, msg=cons)
-                if LINUX or FREEBSD or SUNOS:
-                    # remote path is never set
-                    self.assertEqual(cons[0].raddr, "")
-                    self.assertEqual(cons[1].raddr, "")
-                    # one local address should though
-                    self.assertEqual(name, cons[0].laddr or cons[1].laddr)
-                elif OPENBSD:
-                    # No addresses whatsoever here.
-                    for addr in (cons[0].laddr, cons[0].raddr,
-                                 cons[1].laddr, cons[1].raddr):
-                        self.assertEqual(addr, "")
-                else:
-                    # On other systems either the laddr or raddr
-                    # of both peers are set.
-                    self.assertEqual(cons[0].laddr or cons[1].laddr, name)
-                    self.assertEqual(cons[0].raddr or cons[1].raddr, name)
-            finally:
-                server.close()
-                client.close()
-
-
-class TestFilters(Base, unittest.TestCase):
-
-    def test_filters(self):
-        def check(kind, families, types):
-            for conn in thisproc.connections(kind=kind):
-                self.assertIn(conn.family, families)
-                self.assertIn(conn.type, types)
-            if not SKIP_SYSCONS:
-                for conn in psutil.net_connections(kind=kind):
-                    self.assertIn(conn.family, families)
-                    self.assertIn(conn.type, types)
-
-        with create_sockets():
-            check('all',
-                  [AF_INET, AF_INET6, AF_UNIX],
-                  [SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET])
-            check('inet',
-                  [AF_INET, AF_INET6],
-                  [SOCK_STREAM, SOCK_DGRAM])
-            check('inet4',
-                  [AF_INET],
-                  [SOCK_STREAM, SOCK_DGRAM])
-            check('tcp',
-                  [AF_INET, AF_INET6],
-                  [SOCK_STREAM])
-            check('tcp4',
-                  [AF_INET],
-                  [SOCK_STREAM])
-            check('tcp6',
-                  [AF_INET6],
-                  [SOCK_STREAM])
-            check('udp',
-                  [AF_INET, AF_INET6],
-                  [SOCK_DGRAM])
-            check('udp4',
-                  [AF_INET],
-                  [SOCK_DGRAM])
-            check('udp6',
-                  [AF_INET6],
-                  [SOCK_DGRAM])
-            if HAS_CONNECTIONS_UNIX:
-                check('unix',
-                      [AF_UNIX],
-                      [SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET])
-
-    @skip_on_access_denied(only_if=MACOS)
-    def test_combos(self):
-        def check_conn(proc, conn, family, type, laddr, raddr, status, kinds):
-            all_kinds = ("all", "inet", "inet4", "inet6", "tcp", "tcp4",
-                         "tcp6", "udp", "udp4", "udp6")
-            self.check_connection_ntuple(conn)
-            self.assertEqual(conn.family, family)
-            self.assertEqual(conn.type, type)
-            self.assertEqual(conn.laddr, laddr)
-            self.assertEqual(conn.raddr, raddr)
-            self.assertEqual(conn.status, status)
-            for kind in all_kinds:
-                cons = proc.connections(kind=kind)
-                if kind in kinds:
-                    assert cons
-                else:
-                    assert not cons, cons
-            # compare against system-wide connections
-            # XXX Solaris can't retrieve system-wide UNIX
-            # sockets.
-            if HAS_CONNECTIONS_UNIX:
-                self.compare_procsys_connections(proc.pid, [conn])
-
-        tcp_template = textwrap.dedent("""
-            import socket, time
-            s = socket.socket($family, socket.SOCK_STREAM)
-            s.bind(('$addr', 0))
-            s.listen(5)
-            with open('$testfn', 'w') as f:
-                f.write(str(s.getsockname()[:2]))
-            time.sleep(60)
-        """)
-
-        udp_template = textwrap.dedent("""
-            import socket, time
-            s = socket.socket($family, socket.SOCK_DGRAM)
-            s.bind(('$addr', 0))
-            with open('$testfn', 'w') as f:
-                f.write(str(s.getsockname()[:2]))
-            time.sleep(60)
-        """)
-
-        from string import Template
-        testfile = os.path.basename(TESTFN)
-        tcp4_template = Template(tcp_template).substitute(
-            family=int(AF_INET), addr="127.0.0.1", testfn=testfile)
-        udp4_template = Template(udp_template).substitute(
-            family=int(AF_INET), addr="127.0.0.1", testfn=testfile)
-        tcp6_template = Template(tcp_template).substitute(
-            family=int(AF_INET6), addr="::1", testfn=testfile)
-        udp6_template = Template(udp_template).substitute(
-            family=int(AF_INET6), addr="::1", testfn=testfile)
-
-        # launch various subprocess instantiating a socket of various
-        # families and types to enrich psutil results
-        tcp4_proc = pyrun(tcp4_template)
-        tcp4_addr = eval(wait_for_file(testfile))
-        udp4_proc = pyrun(udp4_template)
-        udp4_addr = eval(wait_for_file(testfile))
-        if supports_ipv6():
-            tcp6_proc = pyrun(tcp6_template)
-            tcp6_addr = eval(wait_for_file(testfile))
-            udp6_proc = pyrun(udp6_template)
-            udp6_addr = eval(wait_for_file(testfile))
-        else:
-            tcp6_proc = None
-            udp6_proc = None
-            tcp6_addr = None
-            udp6_addr = None
-
-        for p in thisproc.children():
-            cons = p.connections()
-            self.assertEqual(len(cons), 1)
-            for conn in cons:
-                # TCP v4
-                if p.pid == tcp4_proc.pid:
-                    check_conn(p, conn, AF_INET, SOCK_STREAM, tcp4_addr, (),
-                               psutil.CONN_LISTEN,
-                               ("all", "inet", "inet4", "tcp", "tcp4"))
-                # UDP v4
-                elif p.pid == udp4_proc.pid:
-                    check_conn(p, conn, AF_INET, SOCK_DGRAM, udp4_addr, (),
-                               psutil.CONN_NONE,
-                               ("all", "inet", "inet4", "udp", "udp4"))
-                # TCP v6
-                elif p.pid == getattr(tcp6_proc, "pid", None):
-                    check_conn(p, conn, AF_INET6, SOCK_STREAM, tcp6_addr, (),
-                               psutil.CONN_LISTEN,
-                               ("all", "inet", "inet6", "tcp", "tcp6"))
-                # UDP v6
-                elif p.pid == getattr(udp6_proc, "pid", None):
-                    check_conn(p, conn, AF_INET6, SOCK_DGRAM, udp6_addr, (),
-                               psutil.CONN_NONE,
-                               ("all", "inet", "inet6", "udp", "udp6"))
-
-    def test_count(self):
-        with create_sockets():
-            # tcp
-            cons = thisproc.connections(kind='tcp')
-            self.assertEqual(len(cons), 2 if supports_ipv6() else 1)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertEqual(conn.type, SOCK_STREAM)
-            # tcp4
-            cons = thisproc.connections(kind='tcp4')
-            self.assertEqual(len(cons), 1)
-            self.assertEqual(cons[0].family, AF_INET)
-            self.assertEqual(cons[0].type, SOCK_STREAM)
-            # tcp6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='tcp6')
-                self.assertEqual(len(cons), 1)
-                self.assertEqual(cons[0].family, AF_INET6)
-                self.assertEqual(cons[0].type, SOCK_STREAM)
-            # udp
-            cons = thisproc.connections(kind='udp')
-            self.assertEqual(len(cons), 2 if supports_ipv6() else 1)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertEqual(conn.type, SOCK_DGRAM)
-            # udp4
-            cons = thisproc.connections(kind='udp4')
-            self.assertEqual(len(cons), 1)
-            self.assertEqual(cons[0].family, AF_INET)
-            self.assertEqual(cons[0].type, SOCK_DGRAM)
-            # udp6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='udp6')
-                self.assertEqual(len(cons), 1)
-                self.assertEqual(cons[0].family, AF_INET6)
-                self.assertEqual(cons[0].type, SOCK_DGRAM)
-            # inet
-            cons = thisproc.connections(kind='inet')
-            self.assertEqual(len(cons), 4 if supports_ipv6() else 2)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-            # inet6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='inet6')
-                self.assertEqual(len(cons), 2)
-                for conn in cons:
-                    self.assertEqual(conn.family, AF_INET6)
-                    self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-            # Skipped on BSD becayse by default the Python process
-            # creates a UNIX socket to '/var/run/log'.
-            if HAS_CONNECTIONS_UNIX and not (FREEBSD or NETBSD):
-                cons = thisproc.connections(kind='unix')
-                self.assertEqual(len(cons), 3)
-                for conn in cons:
-                    self.assertEqual(conn.family, AF_UNIX)
-                    self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-
-
-@unittest.skipIf(SKIP_SYSCONS, "requires root")
-class TestSystemWideConnections(Base, unittest.TestCase):
-    """Tests for net_connections()."""
-
-    def test_it(self):
-        def check(cons, families, types_):
-            for conn in cons:
-                self.assertIn(conn.family, families, msg=conn)
-                if conn.family != AF_UNIX:
-                    self.assertIn(conn.type, types_, msg=conn)
-                self.check_connection_ntuple(conn)
-
-        with create_sockets():
-            from psutil._common import conn_tmap
-            for kind, groups in conn_tmap.items():
-                # XXX: SunOS does not retrieve UNIX sockets.
-                if kind == 'unix' and not HAS_CONNECTIONS_UNIX:
-                    continue
-                families, types_ = groups
-                cons = psutil.net_connections(kind)
-                self.assertEqual(len(cons), len(set(cons)))
-                check(cons, families, types_)
-
-    # See: https://travis-ci.org/giampaolo/psutil/jobs/237566297
-    @unittest.skipIf(MACOS and TRAVIS, "unreliable on MACOS + TRAVIS")
-    def test_multi_sockets_procs(self):
-        # Creates multiple sub processes, each creating different
-        # sockets. For each process check that proc.connections()
-        # and net_connections() return the same results.
-        # This is done mainly to check whether net_connections()'s
-        # pid is properly set, see:
-        # https://github.com/giampaolo/psutil/issues/1013
-        with create_sockets() as socks:
-            expected = len(socks)
-        pids = []
-        times = 10
-        for i in range(times):
-            fname = os.path.realpath(TESTFN) + str(i)
-            src = textwrap.dedent("""\
-                import time, os
-                from psutil.tests import create_sockets
-                with create_sockets():
-                    with open(r'%s', 'w') as f:
-                        f.write(str(os.getpid()))
-                    time.sleep(60)
-                """ % fname)
-            sproc = pyrun(src)
-            pids.append(sproc.pid)
-            self.addCleanup(safe_rmpath, fname)
-
-        # sync
-        for i in range(times):
-            fname = TESTFN + str(i)
-            wait_for_file(fname)
-
-        syscons = [x for x in psutil.net_connections(kind='all') if x.pid
-                   in pids]
-        for pid in pids:
-            self.assertEqual(len([x for x in syscons if x.pid == pid]),
-                             expected)
-            p = psutil.Process(pid)
-            self.assertEqual(len(p.connections('all')), expected)
-
-
-class TestMisc(unittest.TestCase):
-
-    def test_connection_constants(self):
-        ints = []
-        strs = []
-        for name in dir(psutil):
-            if name.startswith('CONN_'):
-                num = getattr(psutil, name)
-                str_ = str(num)
-                assert str_.isupper(), str_
-                self.assertNotIn(str, strs)
-                self.assertNotIn(num, ints)
-                ints.append(num)
-                strs.append(str_)
-        if SUNOS:
-            psutil.CONN_IDLE
-            psutil.CONN_BOUND
-        if WINDOWS:
-            psutil.CONN_DELETE_TCB
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_contracts.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_contracts.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_contracts.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_contracts.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,690 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Contracts tests. These tests mainly check API sanity in terms of
-returned types and APIs availability.
-Some of these are duplicates of tests test_system.py and test_process.py
-"""
-
-import errno
-import os
-import stat
-import time
-import traceback
-
-from psutil import AIX
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import OSX
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._compat import long
-from psutil.tests import create_sockets
-from psutil.tests import enum
-from psutil.tests import get_kernel_version
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import is_namedtuple
-from psutil.tests import safe_rmpath
-from psutil.tests import SKIP_SYSCONS
-from psutil.tests import TESTFN
-from psutil.tests import unittest
-from psutil.tests import VALID_PROC_STATUSES
-from psutil.tests import warn
-import psutil
-
-
-# ===================================================================
-# --- APIs availability
-# ===================================================================
-
-# Make sure code reflects what doc promises in terms of APIs
-# availability.
-
-class TestAvailConstantsAPIs(unittest.TestCase):
-
-    def test_PROCFS_PATH(self):
-        self.assertEqual(hasattr(psutil, "PROCFS_PATH"),
-                         LINUX or SUNOS or AIX)
-
-    def test_win_priority(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "ABOVE_NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "BELOW_NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "HIGH_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "IDLE_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "REALTIME_PRIORITY_CLASS"), WINDOWS)
-
-    def test_linux_ioprio_linux(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "IOPRIO_CLASS_NONE"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_RT"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_BE"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_IDLE"), LINUX)
-
-    def test_linux_ioprio_windows(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "IOPRIO_HIGH"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_NORMAL"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_LOW"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_VERYLOW"), WINDOWS)
-
-    def test_linux_rlimit(self):
-        ae = self.assertEqual
-        hasit = LINUX and get_kernel_version() >= (2, 6, 36)
-        ae(hasattr(psutil.Process, "rlimit"), hasit)
-        ae(hasattr(psutil, "RLIM_INFINITY"), hasit)
-        ae(hasattr(psutil, "RLIMIT_AS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_CORE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_CPU"), hasit)
-        ae(hasattr(psutil, "RLIMIT_DATA"), hasit)
-        ae(hasattr(psutil, "RLIMIT_FSIZE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_LOCKS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_MEMLOCK"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NOFILE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NPROC"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RSS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_STACK"), hasit)
-
-        hasit = LINUX and get_kernel_version() >= (3, 0)
-        ae(hasattr(psutil, "RLIMIT_MSGQUEUE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NICE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RTPRIO"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RTTIME"), hasit)
-        ae(hasattr(psutil, "RLIMIT_SIGPENDING"), hasit)
-
-
-class TestAvailSystemAPIs(unittest.TestCase):
-
-    def test_win_service_iter(self):
-        self.assertEqual(hasattr(psutil, "win_service_iter"), WINDOWS)
-
-    def test_win_service_get(self):
-        self.assertEqual(hasattr(psutil, "win_service_get"), WINDOWS)
-
-    def test_cpu_freq(self):
-        linux = (LINUX and
-                 (os.path.exists("/sys/devices/system/cpu/cpufreq") or
-                  os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq")))
-        self.assertEqual(hasattr(psutil, "cpu_freq"),
-                         linux or MACOS or WINDOWS or FREEBSD)
-
-    def test_sensors_temperatures(self):
-        self.assertEqual(
-            hasattr(psutil, "sensors_temperatures"), LINUX or FREEBSD)
-
-    def test_sensors_fans(self):
-        self.assertEqual(hasattr(psutil, "sensors_fans"), LINUX)
-
-    def test_battery(self):
-        self.assertEqual(hasattr(psutil, "sensors_battery"),
-                         LINUX or WINDOWS or FREEBSD or MACOS)
-
-
-class TestAvailProcessAPIs(unittest.TestCase):
-
-    def test_environ(self):
-        self.assertEqual(hasattr(psutil.Process, "environ"),
-                         LINUX or MACOS or WINDOWS or AIX or SUNOS)
-
-    def test_uids(self):
-        self.assertEqual(hasattr(psutil.Process, "uids"), POSIX)
-
-    def test_gids(self):
-        self.assertEqual(hasattr(psutil.Process, "uids"), POSIX)
-
-    def test_terminal(self):
-        self.assertEqual(hasattr(psutil.Process, "terminal"), POSIX)
-
-    def test_ionice(self):
-        self.assertEqual(hasattr(psutil.Process, "ionice"), LINUX or WINDOWS)
-
-    def test_rlimit(self):
-        self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX)
-
-    def test_io_counters(self):
-        hasit = hasattr(psutil.Process, "io_counters")
-        self.assertEqual(hasit, False if MACOS or SUNOS else True)
-
-    def test_num_fds(self):
-        self.assertEqual(hasattr(psutil.Process, "num_fds"), POSIX)
-
-    def test_num_handles(self):
-        self.assertEqual(hasattr(psutil.Process, "num_handles"), WINDOWS)
-
-    def test_cpu_affinity(self):
-        self.assertEqual(hasattr(psutil.Process, "cpu_affinity"),
-                         LINUX or WINDOWS or FREEBSD)
-
-    def test_cpu_num(self):
-        self.assertEqual(hasattr(psutil.Process, "cpu_num"),
-                         LINUX or FREEBSD or SUNOS)
-
-    def test_memory_maps(self):
-        hasit = hasattr(psutil.Process, "memory_maps")
-        self.assertEqual(
-            hasit, False if OPENBSD or NETBSD or AIX or MACOS else True)
-
-
-# ===================================================================
-# --- System API types
-# ===================================================================
-
-
-class TestSystemAPITypes(unittest.TestCase):
-    """Check the return types of system related APIs.
-    Mainly we want to test we never return unicode on Python 2, see:
-    https://github.com/giampaolo/psutil/issues/1039
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.proc = psutil.Process()
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-
-    def assert_ntuple_of_nums(self, nt, type_=float, gezero=True):
-        assert is_namedtuple(nt)
-        for n in nt:
-            self.assertIsInstance(n, type_)
-            if gezero:
-                self.assertGreaterEqual(n, 0)
-
-    def test_cpu_times(self):
-        self.assert_ntuple_of_nums(psutil.cpu_times())
-        for nt in psutil.cpu_times(percpu=True):
-            self.assert_ntuple_of_nums(nt)
-
-    def test_cpu_percent(self):
-        self.assertIsInstance(psutil.cpu_percent(interval=None), float)
-        self.assertIsInstance(psutil.cpu_percent(interval=0.00001), float)
-
-    def test_cpu_times_percent(self):
-        self.assert_ntuple_of_nums(psutil.cpu_times_percent(interval=None))
-        self.assert_ntuple_of_nums(psutil.cpu_times_percent(interval=0.0001))
-
-    def test_cpu_count(self):
-        self.assertIsInstance(psutil.cpu_count(), int)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_cpu_freq(self):
-        if psutil.cpu_freq() is None:
-            raise self.skipTest("cpu_freq() returns None")
-        self.assert_ntuple_of_nums(psutil.cpu_freq(), type_=(float, int, long))
-
-    def test_disk_io_counters(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for k, v in psutil.disk_io_counters(perdisk=True).items():
-            self.assertIsInstance(k, str)
-            self.assert_ntuple_of_nums(v, type_=(int, long))
-
-    def test_disk_partitions(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for disk in psutil.disk_partitions():
-            self.assertIsInstance(disk.device, str)
-            self.assertIsInstance(disk.mountpoint, str)
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-
-    @unittest.skipIf(SKIP_SYSCONS, "requires root")
-    def test_net_connections(self):
-        with create_sockets():
-            ret = psutil.net_connections('all')
-            self.assertEqual(len(ret), len(set(ret)))
-            for conn in ret:
-                assert is_namedtuple(conn)
-
-    def test_net_if_addrs(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, addrs in psutil.net_if_addrs().items():
-            self.assertIsInstance(ifname, str)
-            for addr in addrs:
-                if enum is not None:
-                    assert isinstance(addr.family, enum.IntEnum), addr
-                else:
-                    assert isinstance(addr.family, int), addr
-                self.assertIsInstance(addr.address, str)
-                self.assertIsInstance(addr.netmask, (str, type(None)))
-                self.assertIsInstance(addr.broadcast, (str, type(None)))
-
-    def test_net_if_stats(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, info in psutil.net_if_stats().items():
-            self.assertIsInstance(ifname, str)
-            self.assertIsInstance(info.isup, bool)
-            if enum is not None:
-                self.assertIsInstance(info.duplex, enum.IntEnum)
-            else:
-                self.assertIsInstance(info.duplex, int)
-            self.assertIsInstance(info.speed, int)
-            self.assertIsInstance(info.mtu, int)
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, _ in psutil.net_io_counters(pernic=True).items():
-            self.assertIsInstance(ifname, str)
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for name, units in psutil.sensors_fans().items():
-            self.assertIsInstance(name, str)
-            for unit in units:
-                self.assertIsInstance(unit.label, str)
-                self.assertIsInstance(unit.current, (float, int, type(None)))
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for name, units in psutil.sensors_temperatures().items():
-            self.assertIsInstance(name, str)
-            for unit in units:
-                self.assertIsInstance(unit.label, str)
-                self.assertIsInstance(unit.current, (float, int, type(None)))
-                self.assertIsInstance(unit.high, (float, int, type(None)))
-                self.assertIsInstance(unit.critical, (float, int, type(None)))
-
-    def test_boot_time(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        self.assertIsInstance(psutil.boot_time(), float)
-
-    def test_users(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for user in psutil.users():
-            self.assertIsInstance(user.name, str)
-            self.assertIsInstance(user.terminal, (str, type(None)))
-            self.assertIsInstance(user.host, (str, type(None)))
-            self.assertIsInstance(user.pid, (int, type(None)))
-
-
-# ===================================================================
-# --- Featch all processes test
-# ===================================================================
-
-
-class TestFetchAllProcesses(unittest.TestCase):
-    """Test which iterates over all running processes and performs
-    some sanity checks against Process API's returned values.
-    """
-
-    def get_attr_names(self):
-        excluded_names = set([
-            'send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
-            'as_dict', 'parent', 'parents', 'children', 'memory_info_ex',
-            'oneshot',
-        ])
-        if LINUX and not HAS_RLIMIT:
-            excluded_names.add('rlimit')
-        attrs = []
-        for name in dir(psutil.Process):
-            if name.startswith("_"):
-                continue
-            if name in excluded_names:
-                continue
-            attrs.append(name)
-        return attrs
-
-    def iter_procs(self):
-        attrs = self.get_attr_names()
-        for p in psutil.process_iter():
-            with p.oneshot():
-                for name in attrs:
-                    yield (p, name)
-
-    def call_meth(self, p, name):
-        args = ()
-        kwargs = {}
-        attr = getattr(p, name, None)
-        if attr is not None and callable(attr):
-            if name == 'rlimit':
-                args = (psutil.RLIMIT_NOFILE,)
-            elif name == 'memory_maps':
-                kwargs = {'grouped': False}
-            return attr(*args, **kwargs)
-        else:
-            return attr
-
-    def test_fetch_all(self):
-        valid_procs = 0
-        default = object()
-        failures = []
-        for p, name in self.iter_procs():
-            ret = default
-            try:
-                ret = self.call_meth(p, name)
-            except NotImplementedError:
-                msg = "%r was skipped because not implemented" % (
-                    self.__class__.__name__ + '.test_' + name)
-                warn(msg)
-            except (psutil.NoSuchProcess, psutil.AccessDenied) as err:
-                self.assertEqual(err.pid, p.pid)
-                if err.name:
-                    # make sure exception's name attr is set
-                    # with the actual process name
-                    self.assertEqual(err.name, p.name())
-                assert str(err)
-                assert err.msg
-            except Exception:
-                s = '\n' + '=' * 70 + '\n'
-                s += "FAIL: test_%s (proc=%s" % (name, p)
-                if ret != default:
-                    s += ", ret=%s)" % repr(ret)
-                s += ')\n'
-                s += '-' * 70
-                s += "\n%s" % traceback.format_exc()
-                s = "\n".join((" " * 4) + i for i in s.splitlines())
-                s += '\n'
-                failures.append(s)
-                break
-            else:
-                valid_procs += 1
-                if ret not in (0, 0.0, [], None, '', {}):
-                    assert ret, ret
-                meth = getattr(self, name)
-                meth(ret, p)
-
-        if failures:
-            self.fail(''.join(failures))
-
-        # we should always have a non-empty list, not including PID 0 etc.
-        # special cases.
-        assert valid_procs
-
-    def cmdline(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for part in ret:
-            self.assertIsInstance(part, str)
-
-    def exe(self, ret, proc):
-        self.assertIsInstance(ret, (str, type(None)))
-        if not ret:
-            self.assertEqual(ret, '')
-        else:
-            if WINDOWS and not ret.endswith('.exe'):
-                return  # May be "Registry", "MemCompression", ...
-            assert os.path.isabs(ret), ret
-            # Note: os.stat() may return False even if the file is there
-            # hence we skip the test, see:
-            # http://stackoverflow.com/questions/3112546/os-path-exists-lies
-            if POSIX and os.path.isfile(ret):
-                if hasattr(os, 'access') and hasattr(os, "X_OK"):
-                    # XXX may fail on MACOS
-                    assert os.access(ret, os.X_OK)
-
-    def pid(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def ppid(self, ret, proc):
-        self.assertIsInstance(ret, (int, long))
-        self.assertGreaterEqual(ret, 0)
-
-    def name(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        # on AIX, "<exiting>" processes don't have names
-        if not AIX:
-            assert ret
-
-    def create_time(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        try:
-            self.assertGreaterEqual(ret, 0)
-        except AssertionError:
-            # XXX
-            if OPENBSD and proc.status() == psutil.STATUS_ZOMBIE:
-                pass
-            else:
-                raise
-        # this can't be taken for granted on all platforms
-        # self.assertGreaterEqual(ret, psutil.boot_time())
-        # make sure returned value can be pretty printed
-        # with strftime
-        time.strftime("%Y %m %d %H:%M:%S", time.localtime(ret))
-
-    def uids(self, ret, proc):
-        assert is_namedtuple(ret)
-        for uid in ret:
-            self.assertIsInstance(uid, int)
-            self.assertGreaterEqual(uid, 0)
-
-    def gids(self, ret, proc):
-        assert is_namedtuple(ret)
-        # note: testing all gids as above seems not to be reliable for
-        # gid == 30 (nodoby); not sure why.
-        for gid in ret:
-            self.assertIsInstance(gid, int)
-            if not MACOS and not NETBSD:
-                self.assertGreaterEqual(gid, 0)
-
-    def username(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        assert ret
-
-    def status(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        assert ret
-        self.assertNotEqual(ret, '?')  # XXX
-        self.assertIn(ret, VALID_PROC_STATUSES)
-
-    def io_counters(self, ret, proc):
-        assert is_namedtuple(ret)
-        for field in ret:
-            self.assertIsInstance(field, (int, long))
-            if field != -1:
-                self.assertGreaterEqual(field, 0)
-
-    def ionice(self, ret, proc):
-        if LINUX:
-            self.assertIsInstance(ret.ioclass, int)
-            self.assertIsInstance(ret.value, int)
-            self.assertGreaterEqual(ret.ioclass, 0)
-            self.assertGreaterEqual(ret.value, 0)
-        else:  # Windows, Cygwin
-            choices = [
-                psutil.IOPRIO_VERYLOW,
-                psutil.IOPRIO_LOW,
-                psutil.IOPRIO_NORMAL,
-                psutil.IOPRIO_HIGH]
-            self.assertIsInstance(ret, int)
-            self.assertGreaterEqual(ret, 0)
-            self.assertIn(ret, choices)
-
-    def num_threads(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 1)
-
-    def threads(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for t in ret:
-            assert is_namedtuple(t)
-            self.assertGreaterEqual(t.id, 0)
-            self.assertGreaterEqual(t.user_time, 0)
-            self.assertGreaterEqual(t.system_time, 0)
-            for field in t:
-                self.assertIsInstance(field, (int, float))
-
-    def cpu_times(self, ret, proc):
-        assert is_namedtuple(ret)
-        for n in ret:
-            self.assertIsInstance(n, float)
-            self.assertGreaterEqual(n, 0)
-        # TODO: check ntuple fields
-
-    def cpu_percent(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        assert 0.0 <= ret <= 100.0, ret
-
-    def cpu_num(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        if FREEBSD and ret == -1:
-            return
-        self.assertGreaterEqual(ret, 0)
-        if psutil.cpu_count() == 1:
-            self.assertEqual(ret, 0)
-        self.assertIn(ret, list(range(psutil.cpu_count())))
-
-    def memory_info(self, ret, proc):
-        assert is_namedtuple(ret)
-        for value in ret:
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0)
-        if WINDOWS:
-            self.assertGreaterEqual(ret.peak_wset, ret.wset)
-            self.assertGreaterEqual(ret.peak_paged_pool, ret.paged_pool)
-            self.assertGreaterEqual(ret.peak_nonpaged_pool, ret.nonpaged_pool)
-            self.assertGreaterEqual(ret.peak_pagefile, ret.pagefile)
-
-    def memory_full_info(self, ret, proc):
-        assert is_namedtuple(ret)
-        total = psutil.virtual_memory().total
-        for name in ret._fields:
-            value = getattr(ret, name)
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0, msg=(name, value))
-            if LINUX or OSX and name in ('vms', 'data'):
-                # On Linux there are processes (e.g. 'goa-daemon') whose
-                # VMS is incredibly high for some reason.
-                continue
-            self.assertLessEqual(value, total, msg=(name, value, total))
-
-        if LINUX:
-            self.assertGreaterEqual(ret.pss, ret.uss)
-
-    def open_files(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for f in ret:
-            self.assertIsInstance(f.fd, int)
-            self.assertIsInstance(f.path, str)
-            if WINDOWS:
-                self.assertEqual(f.fd, -1)
-            elif LINUX:
-                self.assertIsInstance(f.position, int)
-                self.assertIsInstance(f.mode, str)
-                self.assertIsInstance(f.flags, int)
-                self.assertGreaterEqual(f.position, 0)
-                self.assertIn(f.mode, ('r', 'w', 'a', 'r+', 'a+'))
-                self.assertGreater(f.flags, 0)
-            elif BSD and not f.path:
-                # XXX see: https://github.com/giampaolo/psutil/issues/595
-                continue
-            assert os.path.isabs(f.path), f
-            assert os.path.isfile(f.path), f
-
-    def num_fds(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def connections(self, ret, proc):
-        with create_sockets():
-            self.assertEqual(len(ret), len(set(ret)))
-            for conn in ret:
-                assert is_namedtuple(conn)
-
-    def cwd(self, ret, proc):
-        if ret:     # 'ret' can be None or empty
-            self.assertIsInstance(ret, str)
-            assert os.path.isabs(ret), ret
-            try:
-                st = os.stat(ret)
-            except OSError as err:
-                if WINDOWS and err.errno in \
-                        psutil._psplatform.ACCESS_DENIED_SET:
-                    pass
-                # directory has been removed in mean time
-                elif err.errno != errno.ENOENT:
-                    raise
-            else:
-                assert stat.S_ISDIR(st.st_mode)
-
-    def memory_percent(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        assert 0 <= ret <= 100, ret
-
-    def is_running(self, ret, proc):
-        self.assertIsInstance(ret, bool)
-
-    def cpu_affinity(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        assert ret != [], ret
-        cpus = range(psutil.cpu_count())
-        for n in ret:
-            self.assertIsInstance(n, int)
-            self.assertIn(n, cpus)
-
-    def terminal(self, ret, proc):
-        self.assertIsInstance(ret, (str, type(None)))
-        if ret is not None:
-            assert os.path.isabs(ret), ret
-            assert os.path.exists(ret), ret
-
-    def memory_maps(self, ret, proc):
-        for nt in ret:
-            self.assertIsInstance(nt.addr, str)
-            self.assertIsInstance(nt.perms, str)
-            self.assertIsInstance(nt.path, str)
-            for fname in nt._fields:
-                value = getattr(nt, fname)
-                if fname == 'path':
-                    if not value.startswith('['):
-                        assert os.path.isabs(nt.path), nt.path
-                        # commented as on Linux we might get
-                        # '/foo/bar (deleted)'
-                        # assert os.path.exists(nt.path), nt.path
-                elif fname == 'addr':
-                    assert value, repr(value)
-                elif fname == 'perms':
-                    if not WINDOWS:
-                        assert value, repr(value)
-                else:
-                    self.assertIsInstance(value, (int, long))
-                    self.assertGreaterEqual(value, 0)
-
-    def num_handles(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def nice(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        if POSIX:
-            assert -20 <= ret <= 20, ret
-        else:
-            priorities = [getattr(psutil, x) for x in dir(psutil)
-                          if x.endswith('_PRIORITY_CLASS')]
-            self.assertIn(ret, priorities)
-
-    def num_ctx_switches(self, ret, proc):
-        assert is_namedtuple(ret)
-        for value in ret:
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0)
-
-    def rlimit(self, ret, proc):
-        self.assertIsInstance(ret, tuple)
-        self.assertEqual(len(ret), 2)
-        self.assertGreaterEqual(ret[0], -1)
-        self.assertGreaterEqual(ret[1], -1)
-
-    def environ(self, ret, proc):
-        self.assertIsInstance(ret, dict)
-        for k, v in ret.items():
-            self.assertIsInstance(k, str)
-            self.assertIsInstance(v, str)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_linux.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_linux.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_linux.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_linux.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2118 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Linux specific tests."""
-
-from __future__ import division
-import collections
-import contextlib
-import errno
-import glob
-import io
-import os
-import re
-import shutil
-import socket
-import struct
-import tempfile
-import textwrap
-import time
-import warnings
-
-import psutil
-from psutil import LINUX
-from psutil._compat import basestring
-from psutil._compat import FileNotFoundError
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil.tests import call_until
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_GETLOADAVG
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import pyrun
-from psutil.tests import reap_children
-from psutil.tests import reload_module
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import sh
-from psutil.tests import skip_on_not_implemented
-from psutil.tests import TESTFN
-from psutil.tests import ThreadTask
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import which
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-SIOCGIFADDR = 0x8915
-SIOCGIFCONF = 0x8912
-SIOCGIFHWADDR = 0x8927
-if LINUX:
-    SECTOR_SIZE = 512
-EMPTY_TEMPERATURES = not glob.glob('/sys/class/hwmon/hwmon*')
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-def get_ipv4_address(ifname):
-    import fcntl
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
-        return socket.inet_ntoa(
-            fcntl.ioctl(s.fileno(),
-                        SIOCGIFADDR,
-                        struct.pack('256s', ifname))[20:24])
-
-
-def get_mac_address(ifname):
-    import fcntl
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
-        info = fcntl.ioctl(
-            s.fileno(), SIOCGIFHWADDR, struct.pack('256s', ifname))
-        if PY3:
-            def ord(x):
-                return x
-        else:
-            import __builtin__
-            ord = __builtin__.ord
-        return ''.join(['%02x:' % ord(char) for char in info[18:24]])[:-1]
-
-
-def free_swap():
-    """Parse 'free' cmd and return swap memory's s total, used and free
-    values.
-    """
-    out = sh('free -b', env={"LANG": "C.UTF-8"})
-    lines = out.split('\n')
-    for line in lines:
-        if line.startswith('Swap'):
-            _, total, used, free = line.split()
-            nt = collections.namedtuple('free', 'total used free')
-            return nt(int(total), int(used), int(free))
-    raise ValueError(
-        "can't find 'Swap' in 'free' output:\n%s" % '\n'.join(lines))
-
-
-def free_physmem():
-    """Parse 'free' cmd and return physical memory's total, used
-    and free values.
-    """
-    # Note: free can have 2 different formats, invalidating 'shared'
-    # and 'cached' memory which may have different positions so we
-    # do not return them.
-    # https://github.com/giampaolo/psutil/issues/538#issuecomment-57059946
-    out = sh('free -b', env={"LANG": "C.UTF-8"})
-    lines = out.split('\n')
-    for line in lines:
-        if line.startswith('Mem'):
-            total, used, free, shared = \
-                [int(x) for x in line.split()[1:5]]
-            nt = collections.namedtuple(
-                'free', 'total used free shared output')
-            return nt(total, used, free, shared, out)
-    raise ValueError(
-        "can't find 'Mem' in 'free' output:\n%s" % '\n'.join(lines))
-
-
-def vmstat(stat):
-    out = sh("vmstat -s", env={"LANG": "C.UTF-8"})
-    for line in out.split("\n"):
-        line = line.strip()
-        if stat in line:
-            return int(line.split(' ')[0])
-    raise ValueError("can't find %r in 'vmstat' output" % stat)
-
-
-def get_free_version_info():
-    out = sh("free -V").strip()
-    return tuple(map(int, out.split()[-1].split('.')))
-
-
-@contextlib.contextmanager
-def mock_open_content(for_path, content):
-    """Mock open() builtin and forces it to return a certain `content`
-    on read() if the path being opened matches `for_path`.
-    """
-    def open_mock(name, *args, **kwargs):
-        if name == for_path:
-            if PY3:
-                if isinstance(content, basestring):
-                    return io.StringIO(content)
-                else:
-                    return io.BytesIO(content)
-            else:
-                return io.BytesIO(content)
-        else:
-            return orig_open(name, *args, **kwargs)
-
-    orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-        yield m
-
-
-@contextlib.contextmanager
-def mock_open_exception(for_path, exc):
-    """Mock open() builtin and raises `exc` if the path being opened
-    matches `for_path`.
-    """
-    def open_mock(name, *args, **kwargs):
-        if name == for_path:
-            raise exc
-        else:
-            return orig_open(name, *args, **kwargs)
-
-    orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-        yield m
-
-
-# =====================================================================
-# --- system virtual memory
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemVirtualMemory(unittest.TestCase):
-
-    def test_total(self):
-        # free_value = free_physmem().total
-        # psutil_value = psutil.virtual_memory().total
-        # self.assertEqual(free_value, psutil_value)
-        vmstat_value = vmstat('total memory') * 1024
-        psutil_value = psutil.virtual_memory().total
-        self.assertAlmostEqual(vmstat_value, psutil_value)
-
-    # Older versions of procps used slab memory to calculate used memory.
-    # This got changed in:
-    # https://gitlab.com/procps-ng/procps/commit/
-    #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-    @unittest.skipIf(LINUX and get_free_version_info() < (3, 3, 12),
-                     "old free version")
-    @retry_on_failure()
-    def test_used(self):
-        free = free_physmem()
-        free_value = free.used
-        psutil_value = psutil.virtual_memory().used
-        self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE,
-            msg='%s %s \n%s' % (free_value, psutil_value, free.output))
-
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_free(self):
-        vmstat_value = vmstat('free memory') * 1024
-        psutil_value = psutil.virtual_memory().free
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_buffers(self):
-        vmstat_value = vmstat('buffer memory') * 1024
-        psutil_value = psutil.virtual_memory().buffers
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    # https://travis-ci.org/giampaolo/psutil/jobs/226719664
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_active(self):
-        vmstat_value = vmstat('active memory') * 1024
-        psutil_value = psutil.virtual_memory().active
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    # https://travis-ci.org/giampaolo/psutil/jobs/227242952
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_inactive(self):
-        vmstat_value = vmstat('inactive memory') * 1024
-        psutil_value = psutil.virtual_memory().inactive
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_shared(self):
-        free = free_physmem()
-        free_value = free.shared
-        if free_value == 0:
-            raise unittest.SkipTest("free does not support 'shared' column")
-        psutil_value = psutil.virtual_memory().shared
-        self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE,
-            msg='%s %s \n%s' % (free_value, psutil_value, free.output))
-
-    @retry_on_failure()
-    def test_available(self):
-        # "free" output format has changed at some point:
-        # https://github.com/giampaolo/psutil/issues/538#issuecomment-147192098
-        out = sh("free -b")
-        lines = out.split('\n')
-        if 'available' not in lines[0]:
-            raise unittest.SkipTest("free does not support 'available' column")
-        else:
-            free_value = int(lines[1].split()[-1])
-            psutil_value = psutil.virtual_memory().available
-            self.assertAlmostEqual(
-                free_value, psutil_value, delta=MEMORY_TOLERANCE,
-                msg='%s %s \n%s' % (free_value, psutil_value, out))
-
-    def test_warnings_on_misses(self):
-        # Emulate a case where /proc/meminfo provides few info.
-        # psutil is supposed to set the missing fields to 0 and
-        # raise a warning.
-        with mock_open_content(
-            '/proc/meminfo',
-            textwrap.dedent("""\
-                Active(anon):    6145416 kB
-                Active(file):    2950064 kB
-                Inactive(anon):   574764 kB
-                Inactive(file):  1567648 kB
-                MemAvailable:         -1 kB
-                MemFree:         2057400 kB
-                MemTotal:       16325648 kB
-                SReclaimable:     346648 kB
-                """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.virtual_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "memory stats couldn't be determined", str(w.message))
-                self.assertIn("cached", str(w.message))
-                self.assertIn("shared", str(w.message))
-                self.assertIn("active", str(w.message))
-                self.assertIn("inactive", str(w.message))
-                self.assertIn("buffers", str(w.message))
-                self.assertIn("available", str(w.message))
-                self.assertEqual(ret.cached, 0)
-                self.assertEqual(ret.active, 0)
-                self.assertEqual(ret.inactive, 0)
-                self.assertEqual(ret.shared, 0)
-                self.assertEqual(ret.buffers, 0)
-                self.assertEqual(ret.available, 0)
-                self.assertEqual(ret.slab, 0)
-
-    @retry_on_failure()
-    def test_avail_old_percent(self):
-        # Make sure that our calculation of avail mem for old kernels
-        # is off by max 15%.
-        from psutil._pslinux import calculate_avail_vmem
-        from psutil._pslinux import open_binary
-
-        mems = {}
-        with open_binary('/proc/meminfo') as f:
-            for line in f:
-                fields = line.split()
-                mems[fields[0]] = int(fields[1]) * 1024
-
-        a = calculate_avail_vmem(mems)
-        if b'MemAvailable:' in mems:
-            b = mems[b'MemAvailable:']
-            diff_percent = abs(a - b) / a * 100
-            self.assertLess(diff_percent, 15)
-
-    def test_avail_old_comes_from_kernel(self):
-        # Make sure "MemAvailable:" coluimn is used instead of relying
-        # on our internal algorithm to calculate avail mem.
-        with mock_open_content(
-            '/proc/meminfo',
-            textwrap.dedent("""\
-                Active:          9444728 kB
-                Active(anon):    6145416 kB
-                Active(file):    2950064 kB
-                Buffers:          287952 kB
-                Cached:          4818144 kB
-                Inactive(file):  1578132 kB
-                Inactive(anon):   574764 kB
-                Inactive(file):  1567648 kB
-                MemAvailable:    6574984 kB
-                MemFree:         2057400 kB
-                MemTotal:       16325648 kB
-                Shmem:            577588 kB
-                SReclaimable:     346648 kB
-                """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                ret = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(ret.available, 6574984 * 1024)
-            w = ws[0]
-            self.assertIn(
-                "inactive memory stats couldn't be determined", str(w.message))
-
-    def test_avail_old_missing_fields(self):
-        # Remove Active(file), Inactive(file) and SReclaimable
-        # from /proc/meminfo and make sure the fallback is used
-        # (free + cached),
-        with mock_open_content(
-            "/proc/meminfo",
-            textwrap.dedent("""\
-                    Active:          9444728 kB
-                    Active(anon):    6145416 kB
-                    Buffers:          287952 kB
-                    Cached:          4818144 kB
-                    Inactive(file):  1578132 kB
-                    Inactive(anon):   574764 kB
-                    MemFree:         2057400 kB
-                    MemTotal:       16325648 kB
-                    Shmem:            577588 kB
-                    """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                ret = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
-            w = ws[0]
-            self.assertIn(
-                "inactive memory stats couldn't be determined", str(w.message))
-
-    def test_avail_old_missing_zoneinfo(self):
-        # Remove /proc/zoneinfo file. Make sure fallback is used
-        # (free + cached).
-        with mock_open_content(
-                "/proc/meminfo",
-                textwrap.dedent("""\
-                    Active:          9444728 kB
-                    Active(anon):    6145416 kB
-                    Active(file):    2950064 kB
-                    Buffers:          287952 kB
-                    Cached:          4818144 kB
-                    Inactive(file):  1578132 kB
-                    Inactive(anon):   574764 kB
-                    Inactive(file):  1567648 kB
-                    MemFree:         2057400 kB
-                    MemTotal:       16325648 kB
-                    Shmem:            577588 kB
-                    SReclaimable:     346648 kB
-                    """).encode()):
-            with mock_open_exception(
-                    "/proc/zoneinfo",
-                    IOError(errno.ENOENT, 'no such file or directory')):
-                with warnings.catch_warnings(record=True) as ws:
-                    ret = psutil.virtual_memory()
-                    self.assertEqual(
-                        ret.available, 2057400 * 1024 + 4818144 * 1024)
-                    w = ws[0]
-                    self.assertIn(
-                        "inactive memory stats couldn't be determined",
-                        str(w.message))
-
-    def test_virtual_memory_mocked(self):
-        # Emulate /proc/meminfo because neither vmstat nor free return slab.
-        def open_mock(name, *args, **kwargs):
-            if name == '/proc/meminfo':
-                return io.BytesIO(textwrap.dedent("""\
-                    MemTotal:              100 kB
-                    MemFree:               2 kB
-                    MemAvailable:          3 kB
-                    Buffers:               4 kB
-                    Cached:                5 kB
-                    SwapCached:            6 kB
-                    Active:                7 kB
-                    Inactive:              8 kB
-                    Active(anon):          9 kB
-                    Inactive(anon):        10 kB
-                    Active(file):          11 kB
-                    Inactive(file):        12 kB
-                    Unevictable:           13 kB
-                    Mlocked:               14 kB
-                    SwapTotal:             15 kB
-                    SwapFree:              16 kB
-                    Dirty:                 17 kB
-                    Writeback:             18 kB
-                    AnonPages:             19 kB
-                    Mapped:                20 kB
-                    Shmem:                 21 kB
-                    Slab:                  22 kB
-                    SReclaimable:          23 kB
-                    SUnreclaim:            24 kB
-                    KernelStack:           25 kB
-                    PageTables:            26 kB
-                    NFS_Unstable:          27 kB
-                    Bounce:                28 kB
-                    WritebackTmp:          29 kB
-                    CommitLimit:           30 kB
-                    Committed_AS:          31 kB
-                    VmallocTotal:          32 kB
-                    VmallocUsed:           33 kB
-                    VmallocChunk:          34 kB
-                    HardwareCorrupted:     35 kB
-                    AnonHugePages:         36 kB
-                    ShmemHugePages:        37 kB
-                    ShmemPmdMapped:        38 kB
-                    CmaTotal:              39 kB
-                    CmaFree:               40 kB
-                    HugePages_Total:       41 kB
-                    HugePages_Free:        42 kB
-                    HugePages_Rsvd:        43 kB
-                    HugePages_Surp:        44 kB
-                    Hugepagesize:          45 kB
-                    DirectMap46k:          46 kB
-                    DirectMap47M:          47 kB
-                    DirectMap48G:          48 kB
-                    """).encode())
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-            mem = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(mem.total, 100 * 1024)
-            self.assertEqual(mem.free, 2 * 1024)
-            self.assertEqual(mem.buffers, 4 * 1024)
-            # cached mem also includes reclaimable memory
-            self.assertEqual(mem.cached, (5 + 23) * 1024)
-            self.assertEqual(mem.shared, 21 * 1024)
-            self.assertEqual(mem.active, 7 * 1024)
-            self.assertEqual(mem.inactive, 8 * 1024)
-            self.assertEqual(mem.slab, 22 * 1024)
-            self.assertEqual(mem.available, 3 * 1024)
-
-
-# =====================================================================
-# --- system swap memory
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemSwapMemory(unittest.TestCase):
-
-    @staticmethod
-    def meminfo_has_swap_info():
-        """Return True if /proc/meminfo provides swap metrics."""
-        with open("/proc/meminfo") as f:
-            data = f.read()
-        return 'SwapTotal:' in data and 'SwapFree:' in data
-
-    def test_total(self):
-        free_value = free_swap().total
-        psutil_value = psutil.swap_memory().total
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_used(self):
-        free_value = free_swap().used
-        psutil_value = psutil.swap_memory().used
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_free(self):
-        free_value = free_swap().free
-        psutil_value = psutil.swap_memory().free
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    def test_missing_sin_sout(self):
-        with mock.patch('psutil._common.open', create=True) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.swap_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "'sin' and 'sout' swap memory stats couldn't "
-                    "be determined", str(w.message))
-                self.assertEqual(ret.sin, 0)
-                self.assertEqual(ret.sout, 0)
-
-    def test_no_vmstat_mocked(self):
-        # see https://github.com/giampaolo/psutil/issues/722
-        with mock_open_exception(
-                "/proc/vmstat",
-                IOError(errno.ENOENT, 'no such file or directory')) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.swap_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "'sin' and 'sout' swap memory stats couldn't "
-                    "be determined and were set to 0",
-                    str(w.message))
-                self.assertEqual(ret.sin, 0)
-                self.assertEqual(ret.sout, 0)
-
-    def test_meminfo_against_sysinfo(self):
-        # Make sure the content of /proc/meminfo about swap memory
-        # matches sysinfo() syscall, see:
-        # https://github.com/giampaolo/psutil/issues/1015
-        if not self.meminfo_has_swap_info():
-            return unittest.skip("/proc/meminfo has no swap metrics")
-        with mock.patch('psutil._pslinux.cext.linux_sysinfo') as m:
-            swap = psutil.swap_memory()
-        assert not m.called
-        import psutil._psutil_linux as cext
-        _, _, _, _, total, free, unit_multiplier = cext.linux_sysinfo()
-        total *= unit_multiplier
-        free *= unit_multiplier
-        self.assertEqual(swap.total, total)
-        self.assertAlmostEqual(swap.free, free, delta=MEMORY_TOLERANCE)
-
-    def test_emulate_meminfo_has_no_metrics(self):
-        # Emulate a case where /proc/meminfo provides no swap metrics
-        # in which case sysinfo() syscall is supposed to be used
-        # as a fallback.
-        with mock_open_content("/proc/meminfo", b"") as m:
-            psutil.swap_memory()
-            assert m.called
-
-
-# =====================================================================
-# --- system CPU
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUTimes(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "unknown failure on travis")
-    def test_fields(self):
-        fields = psutil.cpu_times()._fields
-        kernel_ver = re.findall(r'\d+\.\d+\.\d+', os.uname()[2])[0]
-        kernel_ver_info = tuple(map(int, kernel_ver.split('.')))
-        if kernel_ver_info >= (2, 6, 11):
-            self.assertIn('steal', fields)
-        else:
-            self.assertNotIn('steal', fields)
-        if kernel_ver_info >= (2, 6, 24):
-            self.assertIn('guest', fields)
-        else:
-            self.assertNotIn('guest', fields)
-        if kernel_ver_info >= (3, 2, 0):
-            self.assertIn('guest_nice', fields)
-        else:
-            self.assertNotIn('guest_nice', fields)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUCountLogical(unittest.TestCase):
-
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu/online"),
-                     "/sys/devices/system/cpu/online does not exist")
-    def test_against_sysdev_cpu_online(self):
-        with open("/sys/devices/system/cpu/online") as f:
-            value = f.read().strip()
-        if "-" in str(value):
-            value = int(value.split('-')[1]) + 1
-            self.assertEqual(psutil.cpu_count(), value)
-
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"),
-                     "/sys/devices/system/cpu does not exist")
-    def test_against_sysdev_cpu_num(self):
-        ls = os.listdir("/sys/devices/system/cpu")
-        count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None])
-        self.assertEqual(psutil.cpu_count(), count)
-
-    @unittest.skipIf(not which("nproc"), "nproc utility not available")
-    def test_against_nproc(self):
-        num = int(sh("nproc --all"))
-        self.assertEqual(psutil.cpu_count(logical=True), num)
-
-    @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-    def test_against_lscpu(self):
-        out = sh("lscpu -p")
-        num = len([x for x in out.split('\n') if not x.startswith('#')])
-        self.assertEqual(psutil.cpu_count(logical=True), num)
-
-    def test_emulate_fallbacks(self):
-        import psutil._pslinux
-        original = psutil._pslinux.cpu_count_logical()
-        # Here we want to mock os.sysconf("SC_NPROCESSORS_ONLN") in
-        # order to cause the parsing of /proc/cpuinfo and /proc/stat.
-        with mock.patch(
-                'psutil._pslinux.os.sysconf', side_effect=ValueError) as m:
-            self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-            assert m.called
-
-            # Let's have open() return emtpy data and make sure None is
-            # returned ('cause we mimick os.cpu_count()).
-            with mock.patch('psutil._common.open', create=True) as m:
-                self.assertIsNone(psutil._pslinux.cpu_count_logical())
-                self.assertEqual(m.call_count, 2)
-                # /proc/stat should be the last one
-                self.assertEqual(m.call_args[0][0], '/proc/stat')
-
-            # Let's push this a bit further and make sure /proc/cpuinfo
-            # parsing works as expected.
-            with open('/proc/cpuinfo', 'rb') as f:
-                cpuinfo_data = f.read()
-            fake_file = io.BytesIO(cpuinfo_data)
-            with mock.patch('psutil._common.open',
-                            return_value=fake_file, create=True) as m:
-                self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-
-            # Finally, let's make /proc/cpuinfo return meaningless data;
-            # this way we'll fall back on relying on /proc/stat
-            with mock_open_content('/proc/cpuinfo', b"") as m:
-                self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-                m.called
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUCountPhysical(unittest.TestCase):
-
-    @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-    def test_against_lscpu(self):
-        out = sh("lscpu -p")
-        core_ids = set()
-        for line in out.split('\n'):
-            if not line.startswith('#'):
-                fields = line.split(',')
-                core_ids.add(fields[1])
-        self.assertEqual(psutil.cpu_count(logical=False), len(core_ids))
-
-    def test_emulate_none(self):
-        with mock.patch('glob.glob', return_value=[]) as m1:
-            with mock.patch('psutil._common.open', create=True) as m2:
-                self.assertIsNone(psutil._pslinux.cpu_count_physical())
-        assert m1.called
-        assert m2.called
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUFrequency(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_use_second_file(self):
-        # https://github.com/giampaolo/psutil/issues/981
-        def path_exists_mock(path):
-            if path.startswith("/sys/devices/system/cpu/cpufreq/policy"):
-                return False
-            else:
-                return orig_exists(path)
-
-        orig_exists = os.path.exists
-        with mock.patch("os.path.exists", side_effect=path_exists_mock,
-                        create=True):
-            assert psutil.cpu_freq()
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_use_cpuinfo(self):
-        # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
-        # exist and /proc/cpuinfo is used instead.
-        def path_exists_mock(path):
-            if path.startswith('/sys/devices/system/cpu/'):
-                return False
-            else:
-                if path == "/proc/cpuinfo":
-                    flags.append(None)
-                return os_path_exists(path)
-
-        flags = []
-        os_path_exists = os.path.exists
-        try:
-            with mock.patch("os.path.exists", side_effect=path_exists_mock):
-                reload_module(psutil._pslinux)
-                ret = psutil.cpu_freq()
-                assert ret
-                assert flags
-                self.assertEqual(ret.max, 0.0)
-                self.assertEqual(ret.min, 0.0)
-                for freq in psutil.cpu_freq(percpu=True):
-                    self.assertEqual(ret.max, 0.0)
-                    self.assertEqual(ret.min, 0.0)
-        finally:
-            reload_module(psutil._pslinux)
-            reload_module(psutil)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_data(self):
-        def open_mock(name, *args, **kwargs):
-            if (name.endswith('/scaling_cur_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"500000")
-            elif (name.endswith('/scaling_min_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"600000")
-            elif (name.endswith('/scaling_max_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"700000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 500")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch(
-                    'os.path.exists', return_value=True):
-                freq = psutil.cpu_freq()
-                self.assertEqual(freq.current, 500.0)
-                # when /proc/cpuinfo is used min and max frequencies are not
-                # available and are set to 0.
-                if freq.min != 0.0:
-                    self.assertEqual(freq.min, 600.0)
-                if freq.max != 0.0:
-                    self.assertEqual(freq.max, 700.0)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_multi_cpu(self):
-        def open_mock(name, *args, **kwargs):
-            n = name
-            if (n.endswith('/scaling_cur_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"100000")
-            elif (n.endswith('/scaling_min_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"200000")
-            elif (n.endswith('/scaling_max_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"300000")
-            elif (n.endswith('/scaling_cur_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"400000")
-            elif (n.endswith('/scaling_min_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"500000")
-            elif (n.endswith('/scaling_max_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"600000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 100\n"
-                                  b"cpu MHz		: 400")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('os.path.exists', return_value=True):
-                with mock.patch('psutil._pslinux.cpu_count_logical',
-                                return_value=2):
-                    freq = psutil.cpu_freq(percpu=True)
-                    self.assertEqual(freq[0].current, 100.0)
-                    if freq[0].min != 0.0:
-                        self.assertEqual(freq[0].min, 200.0)
-                    if freq[0].max != 0.0:
-                        self.assertEqual(freq[0].max, 300.0)
-                    self.assertEqual(freq[1].current, 400.0)
-                    if freq[1].min != 0.0:
-                        self.assertEqual(freq[1].min, 500.0)
-                    if freq[1].max != 0.0:
-                        self.assertEqual(freq[1].max, 600.0)
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_no_scaling_cur_freq_file(self):
-        # See: https://github.com/giampaolo/psutil/issues/1071
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/scaling_cur_freq'):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith('/cpuinfo_cur_freq'):
-                return io.BytesIO(b"200000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 200")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('os.path.exists', return_value=True):
-                with mock.patch('psutil._pslinux.cpu_count_logical',
-                                return_value=1):
-                    freq = psutil.cpu_freq()
-                    self.assertEqual(freq.current, 200)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUStats(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    def test_ctx_switches(self):
-        vmstat_value = vmstat("context switches")
-        psutil_value = psutil.cpu_stats().ctx_switches
-        self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    def test_interrupts(self):
-        vmstat_value = vmstat("interrupts")
-        psutil_value = psutil.cpu_stats().interrupts
-        self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestLoadAvg(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_GETLOADAVG, "not supported")
-    def test_getloadavg(self):
-        psutil_value = psutil.getloadavg()
-        with open("/proc/loadavg", "r") as f:
-            proc_value = f.read().split()
-
-        self.assertAlmostEqual(float(proc_value[0]), psutil_value[0], delta=1)
-        self.assertAlmostEqual(float(proc_value[1]), psutil_value[1], delta=1)
-        self.assertAlmostEqual(float(proc_value[2]), psutil_value[2], delta=1)
-
-
-# =====================================================================
-# --- system network
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIfAddrs(unittest.TestCase):
-
-    def test_ips(self):
-        for name, addrs in psutil.net_if_addrs().items():
-            for addr in addrs:
-                if addr.family == psutil.AF_LINK:
-                    self.assertEqual(addr.address, get_mac_address(name))
-                elif addr.family == socket.AF_INET:
-                    self.assertEqual(addr.address, get_ipv4_address(name))
-                # TODO: test for AF_INET6 family
-
-    # XXX - not reliable when having virtual NICs installed by Docker.
-    # @unittest.skipIf(not which('ip'), "'ip' utility not available")
-    # @unittest.skipIf(TRAVIS, "skipped on Travis")
-    # def test_net_if_names(self):
-    #     out = sh("ip addr").strip()
-    #     nics = [x for x in psutil.net_if_addrs().keys() if ':' not in x]
-    #     found = 0
-    #     for line in out.split('\n'):
-    #         line = line.strip()
-    #         if re.search(r"^\d+:", line):
-    #             found += 1
-    #             name = line.split(':')[1].strip()
-    #             self.assertIn(name, nics)
-    #     self.assertEqual(len(nics), found, msg="%s\n---\n%s" % (
-    #         pprint.pformat(nics), out))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIfStats(unittest.TestCase):
-
-    def test_against_ifconfig(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                # Not always reliable.
-                # self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                self.assertEqual(stats.mtu,
-                                 int(re.findall(r'(?i)MTU[: ](\d+)', out)[0]))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIOCounters(unittest.TestCase):
-
-    @retry_on_failure()
-    def test_against_ifconfig(self):
-        def ifconfig(nic):
-            ret = {}
-            out = sh("ifconfig %s" % name)
-            ret['packets_recv'] = int(
-                re.findall(r'RX packets[: ](\d+)', out)[0])
-            ret['packets_sent'] = int(
-                re.findall(r'TX packets[: ](\d+)', out)[0])
-            ret['errin'] = int(re.findall(r'errors[: ](\d+)', out)[0])
-            ret['errout'] = int(re.findall(r'errors[: ](\d+)', out)[1])
-            ret['dropin'] = int(re.findall(r'dropped[: ](\d+)', out)[0])
-            ret['dropout'] = int(re.findall(r'dropped[: ](\d+)', out)[1])
-            ret['bytes_recv'] = int(
-                re.findall(r'RX (?:packets \d+ +)?bytes[: ](\d+)', out)[0])
-            ret['bytes_sent'] = int(
-                re.findall(r'TX (?:packets \d+ +)?bytes[: ](\d+)', out)[0])
-            return ret
-
-        nio = psutil.net_io_counters(pernic=True, nowrap=False)
-        for name, stats in nio.items():
-            try:
-                ifconfig_ret = ifconfig(name)
-            except RuntimeError:
-                continue
-            self.assertAlmostEqual(
-                stats.bytes_recv, ifconfig_ret['bytes_recv'], delta=1024 * 5)
-            self.assertAlmostEqual(
-                stats.bytes_sent, ifconfig_ret['bytes_sent'], delta=1024 * 5)
-            self.assertAlmostEqual(
-                stats.packets_recv, ifconfig_ret['packets_recv'], delta=1024)
-            self.assertAlmostEqual(
-                stats.packets_sent, ifconfig_ret['packets_sent'], delta=1024)
-            self.assertAlmostEqual(
-                stats.errin, ifconfig_ret['errin'], delta=10)
-            self.assertAlmostEqual(
-                stats.errout, ifconfig_ret['errout'], delta=10)
-            self.assertAlmostEqual(
-                stats.dropin, ifconfig_ret['dropin'], delta=10)
-            self.assertAlmostEqual(
-                stats.dropout, ifconfig_ret['dropout'], delta=10)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetConnections(unittest.TestCase):
-
-    @mock.patch('psutil._pslinux.socket.inet_ntop', side_effect=ValueError)
-    @mock.patch('psutil._pslinux.supports_ipv6', return_value=False)
-    def test_emulate_ipv6_unsupported(self, supports_ipv6, inet_ntop):
-        # see: https://github.com/giampaolo/psutil/issues/623
-        try:
-            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-            self.addCleanup(s.close)
-            s.bind(("::1", 0))
-        except socket.error:
-            pass
-        psutil.net_connections(kind='inet6')
-
-    def test_emulate_unix(self):
-        with mock_open_content(
-            '/proc/net/unix',
-            textwrap.dedent("""\
-                0: 00000003 000 000 0001 03 462170 @/tmp/dbus-Qw2hMPIU3n
-                0: 00000003 000 000 0001 03 35010 @/tmp/dbus-tB2X8h69BQ
-                0: 00000003 000 000 0001 03 34424 @/tmp/dbus-cHy80Y8O
-                000000000000000000000000000000000000000000000000000000
-                """)) as m:
-            psutil.net_connections(kind='unix')
-            assert m.called
-
-
-# =====================================================================
-# --- system disks
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemDiskPartitions(unittest.TestCase):
-
-    @unittest.skipIf(not hasattr(os, 'statvfs'), "os.statvfs() not available")
-    @skip_on_not_implemented()
-    def test_against_df(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -P -B 1 "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total, used, free = int(total), int(used), int(free)
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.free, free))
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.used, used))
-
-    def test_zfs_fs(self):
-        # Test that ZFS partitions are returned.
-        with open("/proc/filesystems", "r") as f:
-            data = f.read()
-        if 'zfs' in data:
-            for part in psutil.disk_partitions():
-                if part.fstype == 'zfs':
-                    break
-            else:
-                self.fail("couldn't find any ZFS partition")
-        else:
-            # No ZFS partitions on this system. Let's fake one.
-            fake_file = io.StringIO(u("nodev\tzfs\n"))
-            with mock.patch('psutil._common.open',
-                            return_value=fake_file, create=True) as m1:
-                with mock.patch(
-                        'psutil._pslinux.cext.disk_partitions',
-                        return_value=[('/dev/sdb3', '/', 'zfs', 'rw')]) as m2:
-                    ret = psutil.disk_partitions()
-                    assert m1.called
-                    assert m2.called
-                    assert ret
-                    self.assertEqual(ret[0].fstype, 'zfs')
-
-    def test_emulate_realpath_fail(self):
-        # See: https://github.com/giampaolo/psutil/issues/1307
-        try:
-            with mock.patch('os.path.realpath',
-                            return_value='/non/existent') as m:
-                with self.assertRaises(FileNotFoundError):
-                    psutil.disk_partitions()
-                assert m.called
-        finally:
-            psutil.PROCFS_PATH = "/proc"
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemDiskIoCounters(unittest.TestCase):
-
-    def test_emulate_kernel_2_4(self):
-        # Tests /proc/diskstats parsing format for 2.4 kernels, see:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3     0   1 hda 2 3 4 5 6 7 8 9 10 11 12"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_merged_count, 2)
-                self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
-                self.assertEqual(ret.read_time, 4)
-                self.assertEqual(ret.write_count, 5)
-                self.assertEqual(ret.write_merged_count, 6)
-                self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
-                self.assertEqual(ret.write_time, 8)
-                self.assertEqual(ret.busy_time, 10)
-
-    def test_emulate_kernel_2_6_full(self):
-        # Tests /proc/diskstats parsing format for 2.6 kernels,
-        # lines reporting all metrics:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3    0   hda 1 2 3 4 5 6 7 8 9 10 11"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_merged_count, 2)
-                self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
-                self.assertEqual(ret.read_time, 4)
-                self.assertEqual(ret.write_count, 5)
-                self.assertEqual(ret.write_merged_count, 6)
-                self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
-                self.assertEqual(ret.write_time, 8)
-                self.assertEqual(ret.busy_time, 10)
-
-    def test_emulate_kernel_2_6_limited(self):
-        # Tests /proc/diskstats parsing format for 2.6 kernels,
-        # where one line of /proc/partitions return a limited
-        # amount of metrics when it bumps into a partition
-        # (instead of a disk). See:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3    1   hda 1 2 3 4"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_bytes, 2 * SECTOR_SIZE)
-                self.assertEqual(ret.write_count, 3)
-                self.assertEqual(ret.write_bytes, 4 * SECTOR_SIZE)
-
-                self.assertEqual(ret.read_merged_count, 0)
-                self.assertEqual(ret.read_time, 0)
-                self.assertEqual(ret.write_merged_count, 0)
-                self.assertEqual(ret.write_time, 0)
-                self.assertEqual(ret.busy_time, 0)
-
-    def test_emulate_include_partitions(self):
-        # Make sure that when perdisk=True disk partitions are returned,
-        # see:
-        # https://github.com/giampaolo/psutil/pull/1313#issuecomment-408626842
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=False):
-                ret = psutil.disk_io_counters(perdisk=True, nowrap=False)
-                self.assertEqual(len(ret), 2)
-                self.assertEqual(ret['nvme0n1'].read_count, 1)
-                self.assertEqual(ret['nvme0n1p1'].read_count, 1)
-                self.assertEqual(ret['nvme0n1'].write_count, 5)
-                self.assertEqual(ret['nvme0n1p1'].write_count, 5)
-
-    def test_emulate_exclude_partitions(self):
-        # Make sure that when perdisk=False partitions (e.g. 'sda1',
-        # 'nvme0n1p1') are skipped and not included in the total count.
-        # https://github.com/giampaolo/psutil/pull/1313#issuecomment-408626842
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=False):
-                ret = psutil.disk_io_counters(perdisk=False, nowrap=False)
-                self.assertIsNone(ret)
-
-        #
-        def is_storage_device(name):
-            return name == 'nvme0n1'
-
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            create=True, side_effect=is_storage_device):
-                ret = psutil.disk_io_counters(perdisk=False, nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.write_count, 5)
-
-    def test_emulate_use_sysfs(self):
-        def exists(path):
-            if path == '/proc/diskstats':
-                return False
-            return True
-
-        wprocfs = psutil.disk_io_counters(perdisk=True)
-        with mock.patch('psutil._pslinux.os.path.exists',
-                        create=True, side_effect=exists):
-            wsysfs = psutil.disk_io_counters(perdisk=True)
-        self.assertEqual(len(wprocfs), len(wsysfs))
-
-    def test_emulate_not_impl(self):
-        def exists(path):
-            return False
-
-        with mock.patch('psutil._pslinux.os.path.exists',
-                        create=True, side_effect=exists):
-            self.assertRaises(NotImplementedError, psutil.disk_io_counters)
-
-
-# =====================================================================
-# --- misc
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestMisc(unittest.TestCase):
-
-    def test_boot_time(self):
-        vmstat_value = vmstat('boot time')
-        psutil_value = psutil.boot_time()
-        self.assertEqual(int(vmstat_value), int(psutil_value))
-
-    def test_no_procfs_on_import(self):
-        my_procfs = tempfile.mkdtemp()
-
-        with open(os.path.join(my_procfs, 'stat'), 'w') as f:
-            f.write('cpu   0 0 0 0 0 0 0 0 0 0\n')
-            f.write('cpu0  0 0 0 0 0 0 0 0 0 0\n')
-            f.write('cpu1  0 0 0 0 0 0 0 0 0 0\n')
-
-        try:
-            orig_open = open
-
-            def open_mock(name, *args, **kwargs):
-                if name.startswith('/proc'):
-                    raise IOError(errno.ENOENT, 'rejecting access for test')
-                return orig_open(name, *args, **kwargs)
-
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-            with mock.patch(patch_point, side_effect=open_mock):
-                reload_module(psutil)
-
-                self.assertRaises(IOError, psutil.cpu_times)
-                self.assertRaises(IOError, psutil.cpu_times, percpu=True)
-                self.assertRaises(IOError, psutil.cpu_percent)
-                self.assertRaises(IOError, psutil.cpu_percent, percpu=True)
-                self.assertRaises(IOError, psutil.cpu_times_percent)
-                self.assertRaises(
-                    IOError, psutil.cpu_times_percent, percpu=True)
-
-                psutil.PROCFS_PATH = my_procfs
-
-                self.assertEqual(psutil.cpu_percent(), 0)
-                self.assertEqual(sum(psutil.cpu_times_percent()), 0)
-
-                # since we don't know the number of CPUs at import time,
-                # we awkwardly say there are none until the second call
-                per_cpu_percent = psutil.cpu_percent(percpu=True)
-                self.assertEqual(sum(per_cpu_percent), 0)
-
-                # ditto awkward length
-                per_cpu_times_percent = psutil.cpu_times_percent(percpu=True)
-                self.assertEqual(sum(map(sum, per_cpu_times_percent)), 0)
-
-                # much user, very busy
-                with open(os.path.join(my_procfs, 'stat'), 'w') as f:
-                    f.write('cpu   1 0 0 0 0 0 0 0 0 0\n')
-                    f.write('cpu0  1 0 0 0 0 0 0 0 0 0\n')
-                    f.write('cpu1  1 0 0 0 0 0 0 0 0 0\n')
-
-                self.assertNotEqual(psutil.cpu_percent(), 0)
-                self.assertNotEqual(
-                    sum(psutil.cpu_percent(percpu=True)), 0)
-                self.assertNotEqual(sum(psutil.cpu_times_percent()), 0)
-                self.assertNotEqual(
-                    sum(map(sum, psutil.cpu_times_percent(percpu=True))), 0)
-        finally:
-            shutil.rmtree(my_procfs)
-            reload_module(psutil)
-
-        self.assertEqual(psutil.PROCFS_PATH, '/proc')
-
-    def test_cpu_steal_decrease(self):
-        # Test cumulative cpu stats decrease. We should ignore this.
-        # See issue #1210.
-        with mock_open_content(
-            "/proc/stat",
-            textwrap.dedent("""\
-                cpu   0 0 0 0 0 0 0 1 0 0
-                cpu0  0 0 0 0 0 0 0 1 0 0
-                cpu1  0 0 0 0 0 0 0 1 0 0
-                """).encode()) as m:
-            # first call to "percent" functions should read the new stat file
-            # and compare to the "real" file read at import time - so the
-            # values are meaningless
-            psutil.cpu_percent()
-            assert m.called
-            psutil.cpu_percent(percpu=True)
-            psutil.cpu_times_percent()
-            psutil.cpu_times_percent(percpu=True)
-
-        with mock_open_content(
-            "/proc/stat",
-            textwrap.dedent("""\
-                cpu   1 0 0 0 0 0 0 0 0 0
-                cpu0  1 0 0 0 0 0 0 0 0 0
-                cpu1  1 0 0 0 0 0 0 0 0 0
-                """).encode()) as m:
-            # Increase "user" while steal goes "backwards" to zero.
-            cpu_percent = psutil.cpu_percent()
-            assert m.called
-            cpu_percent_percpu = psutil.cpu_percent(percpu=True)
-            cpu_times_percent = psutil.cpu_times_percent()
-            cpu_times_percent_percpu = psutil.cpu_times_percent(percpu=True)
-            self.assertNotEqual(cpu_percent, 0)
-            self.assertNotEqual(sum(cpu_percent_percpu), 0)
-            self.assertNotEqual(sum(cpu_times_percent), 0)
-            self.assertNotEqual(sum(cpu_times_percent), 100.0)
-            self.assertNotEqual(sum(map(sum, cpu_times_percent_percpu)), 0)
-            self.assertNotEqual(sum(map(sum, cpu_times_percent_percpu)), 100.0)
-            self.assertEqual(cpu_times_percent.steal, 0)
-            self.assertNotEqual(cpu_times_percent.user, 0)
-
-    def test_boot_time_mocked(self):
-        with mock.patch('psutil._common.open', create=True) as m:
-            self.assertRaises(
-                RuntimeError,
-                psutil._pslinux.boot_time)
-            assert m.called
-
-    def test_users_mocked(self):
-        # Make sure ':0' and ':0.0' (returned by C ext) are converted
-        # to 'localhost'.
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', ':0',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'localhost')
-            assert m.called
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', ':0.0',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'localhost')
-            assert m.called
-        # ...otherwise it should be returned as-is
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', 'foo',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'foo')
-            assert m.called
-
-    def test_procfs_path(self):
-        tdir = tempfile.mkdtemp()
-        try:
-            psutil.PROCFS_PATH = tdir
-            self.assertRaises(IOError, psutil.virtual_memory)
-            self.assertRaises(IOError, psutil.cpu_times)
-            self.assertRaises(IOError, psutil.cpu_times, percpu=True)
-            self.assertRaises(IOError, psutil.boot_time)
-            # self.assertRaises(IOError, psutil.pids)
-            self.assertRaises(IOError, psutil.net_connections)
-            self.assertRaises(IOError, psutil.net_io_counters)
-            self.assertRaises(IOError, psutil.net_if_stats)
-            # self.assertRaises(IOError, psutil.disk_io_counters)
-            self.assertRaises(IOError, psutil.disk_partitions)
-            self.assertRaises(psutil.NoSuchProcess, psutil.Process)
-        finally:
-            psutil.PROCFS_PATH = "/proc"
-            os.rmdir(tdir)
-
-    def test_issue_687(self):
-        # In case of thread ID:
-        # - pid_exists() is supposed to return False
-        # - Process(tid) is supposed to work
-        # - pids() should not return the TID
-        # See: https://github.com/giampaolo/psutil/issues/687
-        t = ThreadTask()
-        t.start()
-        try:
-            p = psutil.Process()
-            tid = p.threads()[1].id
-            assert not psutil.pid_exists(tid), tid
-            pt = psutil.Process(tid)
-            pt.as_dict()
-            self.assertNotIn(tid, psutil.pids())
-        finally:
-            t.stop()
-
-    def test_pid_exists_no_proc_status(self):
-        # Internally pid_exists relies on /proc/{pid}/status.
-        # Emulate a case where this file is empty in which case
-        # psutil is supposed to fall back on using pids().
-        with mock_open_content("/proc/%s/status", "") as m:
-            assert psutil.pid_exists(os.getpid())
-            assert m.called
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-@unittest.skipIf(not HAS_BATTERY, "no battery")
-class TestSensorsBattery(unittest.TestCase):
-
-    @unittest.skipIf(not which("acpi"), "acpi utility not available")
-    def test_percent(self):
-        out = sh("acpi -b")
-        acpi_value = int(out.split(",")[1].strip().replace('%', ''))
-        psutil_value = psutil.sensors_battery().percent
-        self.assertAlmostEqual(acpi_value, psutil_value, delta=1)
-
-    @unittest.skipIf(not which("acpi"), "acpi utility not available")
-    def test_power_plugged(self):
-        out = sh("acpi -b")
-        if 'unknown' in out.lower():
-            return unittest.skip("acpi output not reliable")
-        if 'discharging at zero rate' in out:
-            plugged = True
-        else:
-            plugged = "Charging" in out.split('\n')[0]
-        self.assertEqual(psutil.sensors_battery().power_plugged, plugged)
-
-    def test_emulate_power_plugged(self):
-        # Pretend the AC power cable is connected.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                return io.BytesIO(b"1")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, True)
-            self.assertEqual(
-                psutil.sensors_battery().secsleft, psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_power_plugged_2(self):
-        # Same as above but pretend /AC0/online does not exist in which
-        # case code relies on /status file.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u("charging"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, True)
-            assert m.called
-
-    def test_emulate_power_not_plugged(self):
-        # Pretend the AC power cable is not connected.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                return io.BytesIO(b"0")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, False)
-            assert m.called
-
-    def test_emulate_power_not_plugged_2(self):
-        # Same as above but pretend /AC0/online does not exist in which
-        # case code relies on /status file.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u("discharging"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, False)
-            assert m.called
-
-    def test_emulate_power_undetermined(self):
-        # Pretend we can't know whether the AC power cable not
-        # connected (assert fallback to False).
-        def open_mock(name, *args, **kwargs):
-            if name.startswith("/sys/class/power_supply/AC0/online") or \
-                    name.startswith("/sys/class/power_supply/AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.startswith("/sys/class/power_supply/BAT0/status"):
-                return io.BytesIO(b"???")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertIsNone(psutil.sensors_battery().power_plugged)
-            assert m.called
-
-    def test_emulate_no_base_files(self):
-        # Emulate a case where base metrics files are not present,
-        # in which case we're supposed to get None.
-        with mock_open_exception(
-                "/sys/class/power_supply/BAT0/energy_now",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/BAT0/charge_now",
-                    IOError(errno.ENOENT, "")):
-                self.assertIsNone(psutil.sensors_battery())
-
-    def test_emulate_energy_full_0(self):
-        # Emulate a case where energy_full files returns 0.
-        with mock_open_content(
-                "/sys/class/power_supply/BAT0/energy_full", b"0") as m:
-            self.assertEqual(psutil.sensors_battery().percent, 0)
-            assert m.called
-
-    def test_emulate_energy_full_not_avail(self):
-        # Emulate a case where energy_full file does not exist.
-        # Expected fallback on /capacity.
-        with mock_open_exception(
-                "/sys/class/power_supply/BAT0/energy_full",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/BAT0/charge_full",
-                    IOError(errno.ENOENT, "")):
-                with mock_open_content(
-                        "/sys/class/power_supply/BAT0/capacity", b"88"):
-                    self.assertEqual(psutil.sensors_battery().percent, 88)
-
-    def test_emulate_no_power(self):
-        # Emulate a case where /AC0/online file nor /BAT0/status exist.
-        with mock_open_exception(
-                "/sys/class/power_supply/AC/online",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/AC0/online",
-                    IOError(errno.ENOENT, "")):
-                with mock_open_exception(
-                        "/sys/class/power_supply/BAT0/status",
-                        IOError(errno.ENOENT, "")):
-                    self.assertIsNone(psutil.sensors_battery().power_plugged)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSensorsTemperatures(unittest.TestCase):
-
-    def test_emulate_class_hwmon(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/name'):
-                return io.StringIO(u("name"))
-            elif name.endswith('/temp1_label'):
-                return io.StringIO(u("label"))
-            elif name.endswith('/temp1_input'):
-                return io.BytesIO(b"30000")
-            elif name.endswith('/temp1_max'):
-                return io.BytesIO(b"40000")
-            elif name.endswith('/temp1_crit'):
-                return io.BytesIO(b"50000")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            # Test case with /sys/class/hwmon
-            with mock.patch('glob.glob',
-                            return_value=['/sys/class/hwmon/hwmon0/temp1']):
-                temp = psutil.sensors_temperatures()['name'][0]
-                self.assertEqual(temp.label, 'label')
-                self.assertEqual(temp.current, 30.0)
-                self.assertEqual(temp.high, 40.0)
-                self.assertEqual(temp.critical, 50.0)
-
-    def test_emulate_class_thermal(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('0_temp'):
-                return io.BytesIO(b"50000")
-            elif name.endswith('temp'):
-                return io.BytesIO(b"30000")
-            elif name.endswith('0_type'):
-                return io.StringIO(u("critical"))
-            elif name.endswith('type'):
-                return io.StringIO(u("name"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        def glob_mock(path):
-            if path == '/sys/class/hwmon/hwmon*/temp*_*':
-                return []
-            elif path == '/sys/class/hwmon/hwmon*/device/temp*_*':
-                return []
-            elif path == '/sys/class/thermal/thermal_zone*':
-                return ['/sys/class/thermal/thermal_zone0']
-            elif path == '/sys/class/thermal/thermal_zone0/trip_point*':
-                return ['/sys/class/thermal/thermal_zone1/trip_point_0_type',
-                        '/sys/class/thermal/thermal_zone1/trip_point_0_temp']
-            return []
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('glob.glob', create=True, side_effect=glob_mock):
-                temp = psutil.sensors_temperatures()['name'][0]
-                self.assertEqual(temp.label, '')
-                self.assertEqual(temp.current, 30.0)
-                self.assertEqual(temp.high, 50.0)
-                self.assertEqual(temp.critical, 50.0)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSensorsFans(unittest.TestCase):
-
-    def test_emulate_data(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/name'):
-                return io.StringIO(u("name"))
-            elif name.endswith('/fan1_label'):
-                return io.StringIO(u("label"))
-            elif name.endswith('/fan1_input'):
-                return io.StringIO(u("2000"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('glob.glob',
-                            return_value=['/sys/class/hwmon/hwmon2/fan1']):
-                fan = psutil.sensors_fans()['name'][0]
-                self.assertEqual(fan.label, 'label')
-                self.assertEqual(fan.current, 2000)
-
-
-# =====================================================================
-# --- test process
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestProcess(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    tearDown = setUp
-
-    def test_memory_full_info(self):
-        src = textwrap.dedent("""
-            import time
-            with open("%s", "w") as f:
-                time.sleep(10)
-            """ % TESTFN)
-        sproc = pyrun(src)
-        self.addCleanup(reap_children)
-        call_until(lambda: os.listdir('.'), "'%s' not in ret" % TESTFN)
-        p = psutil.Process(sproc.pid)
-        time.sleep(.1)
-        mem = p.memory_full_info()
-        maps = p.memory_maps(grouped=False)
-        self.assertAlmostEqual(
-            mem.uss, sum([x.private_dirty + x.private_clean for x in maps]),
-            delta=4096)
-        self.assertAlmostEqual(
-            mem.pss, sum([x.pss for x in maps]), delta=4096)
-        self.assertAlmostEqual(
-            mem.swap, sum([x.swap for x in maps]), delta=4096)
-
-    def test_memory_full_info_mocked(self):
-        # See: https://github.com/giampaolo/psutil/issues/1222
-        with mock_open_content(
-            "/proc/%s/smaps" % os.getpid(),
-            textwrap.dedent("""\
-                fffff0 r-xp 00000000 00:00 0                  [vsyscall]
-                Size:                  1 kB
-                Rss:                   2 kB
-                Pss:                   3 kB
-                Shared_Clean:          4 kB
-                Shared_Dirty:          5 kB
-                Private_Clean:         6 kB
-                Private_Dirty:         7 kB
-                Referenced:            8 kB
-                Anonymous:             9 kB
-                LazyFree:              10 kB
-                AnonHugePages:         11 kB
-                ShmemPmdMapped:        12 kB
-                Shared_Hugetlb:        13 kB
-                Private_Hugetlb:       14 kB
-                Swap:                  15 kB
-                SwapPss:               16 kB
-                KernelPageSize:        17 kB
-                MMUPageSize:           18 kB
-                Locked:                19 kB
-                VmFlags: rd ex
-                """).encode()) as m:
-            p = psutil.Process()
-            mem = p.memory_full_info()
-            assert m.called
-            self.assertEqual(mem.uss, (6 + 7 + 14) * 1024)
-            self.assertEqual(mem.pss, 3 * 1024)
-            self.assertEqual(mem.swap, 15 * 1024)
-
-    # On PYPY file descriptors are not closed fast enough.
-    @unittest.skipIf(PYPY, "unreliable on PYPY")
-    def test_open_files_mode(self):
-        def get_test_file():
-            p = psutil.Process()
-            giveup_at = time.time() + 2
-            while True:
-                for file in p.open_files():
-                    if file.path == os.path.abspath(TESTFN):
-                        return file
-                    elif time.time() > giveup_at:
-                        break
-            raise RuntimeError("timeout looking for test file")
-
-        #
-        with open(TESTFN, "w"):
-            self.assertEqual(get_test_file().mode, "w")
-        with open(TESTFN, "r"):
-            self.assertEqual(get_test_file().mode, "r")
-        with open(TESTFN, "a"):
-            self.assertEqual(get_test_file().mode, "a")
-        #
-        with open(TESTFN, "r+"):
-            self.assertEqual(get_test_file().mode, "r+")
-        with open(TESTFN, "w+"):
-            self.assertEqual(get_test_file().mode, "r+")
-        with open(TESTFN, "a+"):
-            self.assertEqual(get_test_file().mode, "a+")
-        # note: "x" bit is not supported
-        if PY3:
-            safe_rmpath(TESTFN)
-            with open(TESTFN, "x"):
-                self.assertEqual(get_test_file().mode, "w")
-            safe_rmpath(TESTFN)
-            with open(TESTFN, "x+"):
-                self.assertEqual(get_test_file().mode, "r+")
-
-    def test_open_files_file_gone(self):
-        # simulates a file which gets deleted during open_files()
-        # execution
-        p = psutil.Process()
-        files = p.open_files()
-        with tempfile.NamedTemporaryFile():
-            # give the kernel some time to see the new file
-            call_until(p.open_files, "len(ret) != %i" % len(files))
-            with mock.patch('psutil._pslinux.os.readlink',
-                            side_effect=OSError(errno.ENOENT, "")) as m:
-                files = p.open_files()
-                assert not files
-                assert m.called
-            # also simulate the case where os.readlink() returns EINVAL
-            # in which case psutil is supposed to 'continue'
-            with mock.patch('psutil._pslinux.os.readlink',
-                            side_effect=OSError(errno.EINVAL, "")) as m:
-                self.assertEqual(p.open_files(), [])
-                assert m.called
-
-    def test_open_files_fd_gone(self):
-        # Simulate a case where /proc/{pid}/fdinfo/{fd} disappears
-        # while iterating through fds.
-        # https://travis-ci.org/giampaolo/psutil/jobs/225694530
-        p = psutil.Process()
-        files = p.open_files()
-        with tempfile.NamedTemporaryFile():
-            # give the kernel some time to see the new file
-            call_until(p.open_files, "len(ret) != %i" % len(files))
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-            with mock.patch(patch_point,
-                            side_effect=IOError(errno.ENOENT, "")) as m:
-                files = p.open_files()
-                assert not files
-                assert m.called
-
-    # --- mocked tests
-
-    def test_terminal_mocked(self):
-        with mock.patch('psutil._pslinux._psposix.get_terminal_map',
-                        return_value={}) as m:
-            self.assertIsNone(psutil._pslinux.Process(os.getpid()).terminal())
-            assert m.called
-
-    # TODO: re-enable this test.
-    # def test_num_ctx_switches_mocked(self):
-    #     with mock.patch('psutil._common.open', create=True) as m:
-    #         self.assertRaises(
-    #             NotImplementedError,
-    #             psutil._pslinux.Process(os.getpid()).num_ctx_switches)
-    #         assert m.called
-
-    def test_cmdline_mocked(self):
-        # see: https://github.com/giampaolo/psutil/issues/639
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo\x00bar\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-        fake_file = io.StringIO(u('foo\x00bar\x00\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar', ''])
-            assert m.called
-
-    def test_cmdline_spaces_mocked(self):
-        # see: https://github.com/giampaolo/psutil/issues/1179
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo bar '))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-        fake_file = io.StringIO(u('foo bar  '))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar', ''])
-            assert m.called
-
-    def test_cmdline_mixed_separators(self):
-        # https://github.com/giampaolo/psutil/issues/
-        #    1179#issuecomment-552984549
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo\x20bar\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-
-    def test_readlink_path_deleted_mocked(self):
-        with mock.patch('psutil._pslinux.os.readlink',
-                        return_value='/home/foo (deleted)'):
-            self.assertEqual(psutil.Process().exe(), "/home/foo")
-            self.assertEqual(psutil.Process().cwd(), "/home/foo")
-
-    def test_threads_mocked(self):
-        # Test the case where os.listdir() returns a file (thread)
-        # which no longer exists by the time we open() it (race
-        # condition). threads() is supposed to ignore that instead
-        # of raising NSP.
-        def open_mock(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.ENOENT, "")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            ret = psutil.Process().threads()
-            assert m.called
-            self.assertEqual(ret, [])
-
-        # ...but if it bumps into something != ENOENT we want an
-        # exception.
-        def open_mock(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.EPERM, "")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        with mock.patch(patch_point, side_effect=open_mock):
-            self.assertRaises(psutil.AccessDenied, psutil.Process().threads)
-
-    def test_exe_mocked(self):
-        with mock.patch('psutil._pslinux.readlink',
-                        side_effect=OSError(errno.ENOENT, "")) as m1:
-            with mock.patch('psutil.Process.cmdline',
-                            side_effect=psutil.AccessDenied(0, "")) as m2:
-                # No such file error; might be raised also if /proc/pid/exe
-                # path actually exists for system processes with low pids
-                # (about 0-20). In this case psutil is supposed to return
-                # an empty string.
-                ret = psutil.Process().exe()
-                assert m1.called
-                assert m2.called
-                self.assertEqual(ret, "")
-
-                # ...but if /proc/pid no longer exist we're supposed to treat
-                # it as an alias for zombie process
-                with mock.patch('psutil._pslinux.os.path.lexists',
-                                return_value=False):
-                    self.assertRaises(
-                        psutil.ZombieProcess, psutil.Process().exe)
-
-    def test_issue_1014(self):
-        # Emulates a case where smaps file does not exist. In this case
-        # wrap_exception decorator should not raise NoSuchProcess.
-        with mock_open_exception(
-                '/proc/%s/smaps' % os.getpid(),
-                IOError(errno.ENOENT, "")) as m:
-            p = psutil.Process()
-            with self.assertRaises(FileNotFoundError):
-                p.memory_maps()
-            assert m.called
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_zombie(self):
-        # Emulate a case where rlimit() raises ENOSYS, which may
-        # happen in case of zombie process:
-        # https://travis-ci.org/giampaolo/psutil/jobs/51368273
-        with mock.patch("psutil._pslinux.cext.linux_prlimit",
-                        side_effect=OSError(errno.ENOSYS, "")) as m:
-            p = psutil.Process()
-            p.name()
-            with self.assertRaises(psutil.ZombieProcess) as exc:
-                p.rlimit(psutil.RLIMIT_NOFILE)
-            assert m.called
-        self.assertEqual(exc.exception.pid, p.pid)
-        self.assertEqual(exc.exception.name, p.name())
-
-    def test_cwd_zombie(self):
-        with mock.patch("psutil._pslinux.os.readlink",
-                        side_effect=OSError(errno.ENOENT, "")) as m:
-            p = psutil.Process()
-            p.name()
-            with self.assertRaises(psutil.ZombieProcess) as exc:
-                p.cwd()
-            assert m.called
-        self.assertEqual(exc.exception.pid, p.pid)
-        self.assertEqual(exc.exception.name, p.name())
-
-    def test_stat_file_parsing(self):
-        from psutil._pslinux import CLOCK_TICKS
-
-        args = [
-            "0",      # pid
-            "(cat)",  # name
-            "Z",      # status
-            "1",      # ppid
-            "0",      # pgrp
-            "0",      # session
-            "0",      # tty
-            "0",      # tpgid
-            "0",      # flags
-            "0",      # minflt
-            "0",      # cminflt
-            "0",      # majflt
-            "0",      # cmajflt
-            "2",      # utime
-            "3",      # stime
-            "4",      # cutime
-            "5",      # cstime
-            "0",      # priority
-            "0",      # nice
-            "0",      # num_threads
-            "0",      # itrealvalue
-            "6",      # starttime
-            "0",      # vsize
-            "0",      # rss
-            "0",      # rsslim
-            "0",      # startcode
-            "0",      # endcode
-            "0",      # startstack
-            "0",      # kstkesp
-            "0",      # kstkeip
-            "0",      # signal
-            "0",      # blocked
-            "0",      # sigignore
-            "0",      # sigcatch
-            "0",      # wchan
-            "0",      # nswap
-            "0",      # cnswap
-            "0",      # exit_signal
-            "6",      # processor
-            "0",      # rt priority
-            "0",      # policy
-            "7",      # delayacct_blkio_ticks
-        ]
-        content = " ".join(args).encode()
-        with mock_open_content('/proc/%s/stat' % os.getpid(), content):
-            p = psutil.Process()
-            self.assertEqual(p.name(), 'cat')
-            self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-            self.assertEqual(p.ppid(), 1)
-            self.assertEqual(
-                p.create_time(), 6 / CLOCK_TICKS + psutil.boot_time())
-            cpu = p.cpu_times()
-            self.assertEqual(cpu.user, 2 / CLOCK_TICKS)
-            self.assertEqual(cpu.system, 3 / CLOCK_TICKS)
-            self.assertEqual(cpu.children_user, 4 / CLOCK_TICKS)
-            self.assertEqual(cpu.children_system, 5 / CLOCK_TICKS)
-            self.assertEqual(cpu.iowait, 7 / CLOCK_TICKS)
-            self.assertEqual(p.cpu_num(), 6)
-
-    def test_status_file_parsing(self):
-        with mock_open_content(
-            '/proc/%s/status' % os.getpid(),
-            textwrap.dedent("""\
-                Uid:\t1000\t1001\t1002\t1003
-                Gid:\t1004\t1005\t1006\t1007
-                Threads:\t66
-                Cpus_allowed:\tf
-                Cpus_allowed_list:\t0-7
-                voluntary_ctxt_switches:\t12
-                nonvoluntary_ctxt_switches:\t13""").encode()):
-            p = psutil.Process()
-            self.assertEqual(p.num_ctx_switches().voluntary, 12)
-            self.assertEqual(p.num_ctx_switches().involuntary, 13)
-            self.assertEqual(p.num_threads(), 66)
-            uids = p.uids()
-            self.assertEqual(uids.real, 1000)
-            self.assertEqual(uids.effective, 1001)
-            self.assertEqual(uids.saved, 1002)
-            gids = p.gids()
-            self.assertEqual(gids.real, 1004)
-            self.assertEqual(gids.effective, 1005)
-            self.assertEqual(gids.saved, 1006)
-            self.assertEqual(p._proc._get_eligible_cpus(), list(range(0, 8)))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestProcessAgainstStatus(unittest.TestCase):
-    """/proc/pid/stat and /proc/pid/status have many values in common.
-    Whenever possible, psutil uses /proc/pid/stat (it's faster).
-    For all those cases we check that the value found in
-    /proc/pid/stat (by psutil) matches the one found in
-    /proc/pid/status.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.proc = psutil.Process()
-
-    def read_status_file(self, linestart):
-        with psutil._psplatform.open_text(
-                '/proc/%s/status' % self.proc.pid) as f:
-            for line in f:
-                line = line.strip()
-                if line.startswith(linestart):
-                    value = line.partition('\t')[2]
-                    try:
-                        return int(value)
-                    except ValueError:
-                        return value
-            raise ValueError("can't find %r" % linestart)
-
-    def test_name(self):
-        value = self.read_status_file("Name:")
-        self.assertEqual(self.proc.name(), value)
-
-    def test_status(self):
-        value = self.read_status_file("State:")
-        value = value[value.find('(') + 1:value.rfind(')')]
-        value = value.replace(' ', '-')
-        self.assertEqual(self.proc.status(), value)
-
-    def test_ppid(self):
-        value = self.read_status_file("PPid:")
-        self.assertEqual(self.proc.ppid(), value)
-
-    def test_num_threads(self):
-        value = self.read_status_file("Threads:")
-        self.assertEqual(self.proc.num_threads(), value)
-
-    def test_uids(self):
-        value = self.read_status_file("Uid:")
-        value = tuple(map(int, value.split()[1:4]))
-        self.assertEqual(self.proc.uids(), value)
-
-    def test_gids(self):
-        value = self.read_status_file("Gid:")
-        value = tuple(map(int, value.split()[1:4]))
-        self.assertEqual(self.proc.gids(), value)
-
-    @retry_on_failure()
-    def test_num_ctx_switches(self):
-        value = self.read_status_file("voluntary_ctxt_switches:")
-        self.assertEqual(self.proc.num_ctx_switches().voluntary, value)
-        value = self.read_status_file("nonvoluntary_ctxt_switches:")
-        self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
-
-    def test_cpu_affinity(self):
-        value = self.read_status_file("Cpus_allowed_list:")
-        if '-' in str(value):
-            min_, max_ = map(int, value.split('-'))
-            self.assertEqual(
-                self.proc.cpu_affinity(), list(range(min_, max_ + 1)))
-
-    def test_cpu_affinity_eligible_cpus(self):
-        value = self.read_status_file("Cpus_allowed_list:")
-        with mock.patch("psutil._pslinux.per_cpu_times") as m:
-            self.proc._proc._get_eligible_cpus()
-        if '-' in str(value):
-            assert not m.called
-        else:
-            assert m.called
-
-
-# =====================================================================
-# --- test utils
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestUtils(unittest.TestCase):
-
-    def test_readlink(self):
-        with mock.patch("os.readlink", return_value="foo (deleted)") as m:
-            self.assertEqual(psutil._psplatform.readlink("bar"), "foo")
-            assert m.called
-
-    def test_cat(self):
-        fname = os.path.abspath(TESTFN)
-        with open(fname, "wt") as f:
-            f.write("foo ")
-        self.assertEqual(psutil._psplatform.cat(TESTFN, binary=False), "foo")
-        self.assertEqual(psutil._psplatform.cat(TESTFN, binary=True), b"foo")
-        self.assertEqual(
-            psutil._psplatform.cat(TESTFN + '??', fallback="bar"), "bar")
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_memory_leaks.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_memory_leaks.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_memory_leaks.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_memory_leaks.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,600 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Tests for detecting function memory leaks (typically the ones
-implemented in C). It does so by calling a function many times and
-checking whether process memory usage keeps increasing between
-calls or over time.
-Note that this may produce false positives (especially on Windows
-for some reason).
-PyPy appears to be completely unstable for this framework, probably
-because of how its JIT handles memory, so tests are skipped.
-"""
-
-from __future__ import print_function
-import functools
-import gc
-import os
-import sys
-import threading
-import time
-
-import psutil
-import psutil._common
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import bytes2human
-from psutil._compat import ProcessLookupError
-from psutil._compat import xrange
-from psutil.tests import CIRRUS
-from psutil.tests import create_sockets
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CPU_AFFINITY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_IONICE
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_PROC_CPU_NUM
-from psutil.tests import HAS_PROC_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TESTFN
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-
-
-# configurable opts
-LOOPS = 1000
-MEMORY_TOLERANCE = 4096
-RETRY_FOR = 3
-SKIP_PYTHON_IMPL = True
-
-cext = psutil._psplatform.cext
-thisproc = psutil.Process()
-
-
-# ===================================================================
-# utils
-# ===================================================================
-
-
-def skip_if_linux():
-    return unittest.skipIf(LINUX and SKIP_PYTHON_IMPL,
-                           "worthless on LINUX (pure python)")
-
-
-@unittest.skipIf(PYPY, "unreliable on PYPY")
-class TestMemLeak(unittest.TestCase):
-    """Base framework class which calls a function many times and
-    produces a failure if process memory usage keeps increasing
-    between calls or over time.
-    """
-    tolerance = MEMORY_TOLERANCE
-    loops = LOOPS
-    retry_for = RETRY_FOR
-
-    def setUp(self):
-        gc.collect()
-
-    def execute(self, fun, *args, **kwargs):
-        """Test a callable."""
-        def call_many_times():
-            for x in xrange(loops):
-                self._call(fun, *args, **kwargs)
-            del x
-            gc.collect()
-
-        tolerance = kwargs.pop('tolerance_', None) or self.tolerance
-        loops = kwargs.pop('loops_', None) or self.loops
-        retry_for = kwargs.pop('retry_for_', None) or self.retry_for
-
-        # warm up
-        for x in range(10):
-            self._call(fun, *args, **kwargs)
-        self.assertEqual(gc.garbage, [])
-        self.assertEqual(threading.active_count(), 1)
-        self.assertEqual(thisproc.children(), [])
-
-        # Get 2 distinct memory samples, before and after having
-        # called fun repeadetly.
-        # step 1
-        call_many_times()
-        mem1 = self._get_mem()
-        # step 2
-        call_many_times()
-        mem2 = self._get_mem()
-
-        diff1 = mem2 - mem1
-        if diff1 > tolerance:
-            # This doesn't necessarily mean we have a leak yet.
-            # At this point we assume that after having called the
-            # function so many times the memory usage is stabilized
-            # and if there are no leaks it should not increase
-            # anymore.
-            # Let's keep calling fun for 3 more seconds and fail if
-            # we notice any difference.
-            ncalls = 0
-            stop_at = time.time() + retry_for
-            while time.time() <= stop_at:
-                self._call(fun, *args, **kwargs)
-                ncalls += 1
-
-            del stop_at
-            gc.collect()
-            mem3 = self._get_mem()
-            diff2 = mem3 - mem2
-
-            if mem3 > mem2:
-                # failure
-                extra_proc_mem = bytes2human(diff1 + diff2)
-                print("exta proc mem: %s" % extra_proc_mem, file=sys.stderr)
-                msg = "+%s after %s calls, +%s after another %s calls, "
-                msg += "+%s extra proc mem"
-                msg = msg % (
-                    bytes2human(diff1), loops, bytes2human(diff2), ncalls,
-                    extra_proc_mem)
-                self.fail(msg)
-
-    def execute_w_exc(self, exc, fun, *args, **kwargs):
-        """Convenience function which tests a callable raising
-        an exception.
-        """
-        def call():
-            self.assertRaises(exc, fun, *args, **kwargs)
-
-        self.execute(call)
-
-    @staticmethod
-    def _get_mem():
-        # By using USS memory it seems it's less likely to bump
-        # into false positives.
-        if LINUX or WINDOWS or MACOS:
-            return thisproc.memory_full_info().uss
-        else:
-            return thisproc.memory_info().rss
-
-    @staticmethod
-    def _call(fun, *args, **kwargs):
-        fun(*args, **kwargs)
-
-
-# ===================================================================
-# Process class
-# ===================================================================
-
-
-class TestProcessObjectLeaks(TestMemLeak):
-    """Test leaks of Process class methods."""
-
-    proc = thisproc
-
-    def test_coverage(self):
-        skip = set((
-            "pid", "as_dict", "children", "cpu_affinity", "cpu_percent",
-            "ionice", "is_running", "kill", "memory_info_ex", "memory_percent",
-            "nice", "oneshot", "parent", "parents", "rlimit", "send_signal",
-            "suspend", "terminate", "wait"))
-        for name in dir(psutil.Process):
-            if name.startswith('_'):
-                continue
-            if name in skip:
-                continue
-            self.assertTrue(hasattr(self, "test_" + name), msg=name)
-
-    @skip_if_linux()
-    def test_name(self):
-        self.execute(self.proc.name)
-
-    @skip_if_linux()
-    def test_cmdline(self):
-        self.execute(self.proc.cmdline)
-
-    @skip_if_linux()
-    def test_exe(self):
-        self.execute(self.proc.exe)
-
-    @skip_if_linux()
-    def test_ppid(self):
-        self.execute(self.proc.ppid)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_uids(self):
-        self.execute(self.proc.uids)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_gids(self):
-        self.execute(self.proc.gids)
-
-    @skip_if_linux()
-    def test_status(self):
-        self.execute(self.proc.status)
-
-    def test_nice_get(self):
-        self.execute(self.proc.nice)
-
-    def test_nice_set(self):
-        niceness = thisproc.nice()
-        self.execute(self.proc.nice, niceness)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    def test_ionice_get(self):
-        self.execute(self.proc.ionice)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    def test_ionice_set(self):
-        if WINDOWS:
-            value = thisproc.ionice()
-            self.execute(self.proc.ionice, value)
-        else:
-            self.execute(self.proc.ionice, psutil.IOPRIO_CLASS_NONE)
-            fun = functools.partial(cext.proc_ioprio_set, os.getpid(), -1, 0)
-            self.execute_w_exc(OSError, fun)
-
-    @unittest.skipIf(not HAS_PROC_IO_COUNTERS, "not supported")
-    @skip_if_linux()
-    def test_io_counters(self):
-        self.execute(self.proc.io_counters)
-
-    @unittest.skipIf(POSIX, "worthless on POSIX")
-    def test_username(self):
-        self.execute(self.proc.username)
-
-    @skip_if_linux()
-    def test_create_time(self):
-        self.execute(self.proc.create_time)
-
-    @skip_if_linux()
-    @skip_on_access_denied(only_if=OPENBSD)
-    def test_num_threads(self):
-        self.execute(self.proc.num_threads)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_num_handles(self):
-        self.execute(self.proc.num_handles)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_num_fds(self):
-        self.execute(self.proc.num_fds)
-
-    @skip_if_linux()
-    def test_num_ctx_switches(self):
-        self.execute(self.proc.num_ctx_switches)
-
-    @skip_if_linux()
-    @skip_on_access_denied(only_if=OPENBSD)
-    def test_threads(self):
-        self.execute(self.proc.threads)
-
-    @skip_if_linux()
-    def test_cpu_times(self):
-        self.execute(self.proc.cpu_times)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_PROC_CPU_NUM, "not supported")
-    def test_cpu_num(self):
-        self.execute(self.proc.cpu_num)
-
-    @skip_if_linux()
-    def test_memory_info(self):
-        self.execute(self.proc.memory_info)
-
-    @skip_if_linux()
-    def test_memory_full_info(self):
-        self.execute(self.proc.memory_full_info)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_terminal(self):
-        self.execute(self.proc.terminal)
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_resume(self):
-        self.execute(self.proc.resume)
-
-    @skip_if_linux()
-    def test_cwd(self):
-        self.execute(self.proc.cwd)
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, "not supported")
-    def test_cpu_affinity_get(self):
-        self.execute(self.proc.cpu_affinity)
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, "not supported")
-    def test_cpu_affinity_set(self):
-        affinity = thisproc.cpu_affinity()
-        self.execute(self.proc.cpu_affinity, affinity)
-        if not TRAVIS:
-            self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1])
-
-    @skip_if_linux()
-    def test_open_files(self):
-        safe_rmpath(TESTFN)  # needed after UNIX socket test has run
-        with open(TESTFN, 'w'):
-            self.execute(self.proc.open_files)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    @skip_if_linux()
-    def test_memory_maps(self):
-        self.execute(self.proc.memory_maps)
-
-    @unittest.skipIf(not LINUX, "LINUX only")
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_get(self):
-        self.execute(self.proc.rlimit, psutil.RLIMIT_NOFILE)
-
-    @unittest.skipIf(not LINUX, "LINUX only")
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_set(self):
-        limit = thisproc.rlimit(psutil.RLIMIT_NOFILE)
-        self.execute(self.proc.rlimit, psutil.RLIMIT_NOFILE, limit)
-        self.execute_w_exc(OSError, self.proc.rlimit, -1)
-
-    @skip_if_linux()
-    # Windows implementation is based on a single system-wide
-    # function (tested later).
-    @unittest.skipIf(WINDOWS, "worthless on WINDOWS")
-    def test_connections(self):
-        # TODO: UNIX sockets are temporarily implemented by parsing
-        # 'pfiles' cmd  output; we don't want that part of the code to
-        # be executed.
-        with create_sockets():
-            kind = 'inet' if SUNOS else 'all'
-            self.execute(self.proc.connections, kind)
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    def test_environ(self):
-        self.execute(self.proc.environ)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_proc_info(self):
-        self.execute(cext.proc_info, os.getpid())
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcessDualImplementation(TestMemLeak):
-
-    def test_cmdline_peb_true(self):
-        self.execute(cext.proc_cmdline, os.getpid(), use_peb=True)
-
-    def test_cmdline_peb_false(self):
-        self.execute(cext.proc_cmdline, os.getpid(), use_peb=False)
-
-
-class TestTerminatedProcessLeaks(TestProcessObjectLeaks):
-    """Repeat the tests above looking for leaks occurring when dealing
-    with terminated processes raising NoSuchProcess exception.
-    The C functions are still invoked but will follow different code
-    paths. We'll check those code paths.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestTerminatedProcessLeaks, cls).setUpClass()
-        p = get_test_subprocess()
-        cls.proc = psutil.Process(p.pid)
-        cls.proc.kill()
-        cls.proc.wait()
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestTerminatedProcessLeaks, cls).tearDownClass()
-        reap_children()
-
-    def _call(self, fun, *args, **kwargs):
-        try:
-            fun(*args, **kwargs)
-        except psutil.NoSuchProcess:
-            pass
-
-    if WINDOWS:
-
-        def test_kill(self):
-            self.execute(self.proc.kill)
-
-        def test_terminate(self):
-            self.execute(self.proc.terminate)
-
-        def test_suspend(self):
-            self.execute(self.proc.suspend)
-
-        def test_resume(self):
-            self.execute(self.proc.resume)
-
-        def test_wait(self):
-            self.execute(self.proc.wait)
-
-        def test_proc_info(self):
-            # test dual implementation
-            def call():
-                try:
-                    return cext.proc_info(self.proc.pid)
-                except ProcessLookupError:
-                    pass
-
-            self.execute(call)
-
-
-# ===================================================================
-# system APIs
-# ===================================================================
-
-
-class TestModuleFunctionsLeaks(TestMemLeak):
-    """Test leaks of psutil module functions."""
-
-    def test_coverage(self):
-        skip = set((
-            "version_info", "__version__", "process_iter", "wait_procs",
-            "cpu_percent", "cpu_times_percent", "cpu_count"))
-        for name in psutil.__all__:
-            if not name.islower():
-                continue
-            if name in skip:
-                continue
-            self.assertTrue(hasattr(self, "test_" + name), msg=name)
-
-    # --- cpu
-
-    @skip_if_linux()
-    def test_cpu_count_logical(self):
-        self.execute(psutil.cpu_count, logical=True)
-
-    @skip_if_linux()
-    def test_cpu_count_physical(self):
-        self.execute(psutil.cpu_count, logical=False)
-
-    @skip_if_linux()
-    def test_cpu_times(self):
-        self.execute(psutil.cpu_times)
-
-    @skip_if_linux()
-    def test_per_cpu_times(self):
-        self.execute(psutil.cpu_times, percpu=True)
-
-    @skip_if_linux()
-    def test_cpu_stats(self):
-        self.execute(psutil.cpu_stats)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_cpu_freq(self):
-        self.execute(psutil.cpu_freq)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_getloadavg(self):
-        self.execute(psutil.getloadavg)
-
-    # --- mem
-
-    def test_virtual_memory(self):
-        self.execute(psutil.virtual_memory)
-
-    # TODO: remove this skip when this gets fixed
-    @unittest.skipIf(SUNOS, "worthless on SUNOS (uses a subprocess)")
-    def test_swap_memory(self):
-        self.execute(psutil.swap_memory)
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_pid_exists(self):
-        self.execute(psutil.pid_exists, os.getpid())
-
-    # --- disk
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_disk_usage(self):
-        self.execute(psutil.disk_usage, '.')
-
-    def test_disk_partitions(self):
-        self.execute(psutil.disk_partitions)
-
-    @unittest.skipIf(LINUX and not os.path.exists('/proc/diskstats'),
-                     '/proc/diskstats not available on this Linux version')
-    @skip_if_linux()
-    def test_disk_io_counters(self):
-        self.execute(psutil.disk_io_counters, nowrap=False)
-
-    # --- proc
-
-    @skip_if_linux()
-    def test_pids(self):
-        self.execute(psutil.pids)
-
-    # --- net
-
-    @unittest.skipIf(TRAVIS and MACOS, "false positive on TRAVIS + MACOS")
-    @unittest.skipIf(CIRRUS and FREEBSD, "false positive on CIRRUS + FREEBSD")
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        self.execute(psutil.net_io_counters, nowrap=False)
-
-    @skip_if_linux()
-    @unittest.skipIf(MACOS and os.getuid() != 0, "need root access")
-    def test_net_connections(self):
-        with create_sockets():
-            self.execute(psutil.net_connections)
-
-    def test_net_if_addrs(self):
-        # Note: verified that on Windows this was a false positive.
-        self.execute(psutil.net_if_addrs,
-                     tolerance_=80 * 1024 if WINDOWS else None)
-
-    @unittest.skipIf(TRAVIS, "EPERM on travis")
-    def test_net_if_stats(self):
-        self.execute(psutil.net_if_stats)
-
-    # --- sensors
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    def test_sensors_battery(self):
-        self.execute(psutil.sensors_battery)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        self.execute(psutil.sensors_temperatures)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        self.execute(psutil.sensors_fans)
-
-    # --- others
-
-    @skip_if_linux()
-    def test_boot_time(self):
-        self.execute(psutil.boot_time)
-
-    @unittest.skipIf(WINDOWS, "XXX produces a false positive on Windows")
-    def test_users(self):
-        self.execute(psutil.users)
-
-    if WINDOWS:
-
-        # --- win services
-
-        def test_win_service_iter(self):
-            self.execute(cext.winservice_enumerate)
-
-        def test_win_service_get(self):
-            pass
-
-        def test_win_service_get_config(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_config, name)
-
-        def test_win_service_get_status(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_status, name)
-
-        def test_win_service_get_description(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_descr, name)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_misc.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_misc.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_misc.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_misc.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1065 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Miscellaneous tests.
-"""
-
-import ast
-import collections
-import contextlib
-import errno
-import json
-import os
-import pickle
-import socket
-import stat
-
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import NETBSD
-from psutil import POSIX
-from psutil import WINDOWS
-from psutil._common import memoize
-from psutil._common import memoize_when_activated
-from psutil._common import supports_ipv6
-from psutil._common import wrap_numbers
-from psutil._common import open_text
-from psutil._common import open_binary
-from psutil._compat import PY3
-from psutil.tests import APPVEYOR
-from psutil.tests import bind_socket
-from psutil.tests import bind_unix_socket
-from psutil.tests import call_until
-from psutil.tests import chdir
-from psutil.tests import CI_TESTING
-from psutil.tests import create_proc_children_pair
-from psutil.tests import create_sockets
-from psutil.tests import create_zombie_proc
-from psutil.tests import DEVNULL
-from psutil.tests import get_free_port
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import import_module_by_path
-from psutil.tests import is_namedtuple
-from psutil.tests import mock
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import reload_module
-from psutil.tests import retry
-from psutil.tests import ROOT_DIR
-from psutil.tests import safe_mkdir
-from psutil.tests import safe_rmpath
-from psutil.tests import SCRIPTS_DIR
-from psutil.tests import sh
-from psutil.tests import tcp_socketpair
-from psutil.tests import TESTFN
-from psutil.tests import TOX
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-from psutil.tests import unix_socketpair
-from psutil.tests import wait_for_file
-from psutil.tests import wait_for_pid
-import psutil
-import psutil.tests
-
-
-# ===================================================================
-# --- Misc / generic tests.
-# ===================================================================
-
-
-class TestMisc(unittest.TestCase):
-
-    def test_process__repr__(self, func=repr):
-        p = psutil.Process()
-        r = func(p)
-        self.assertIn("psutil.Process", r)
-        self.assertIn("pid=%s" % p.pid, r)
-        self.assertIn("name=", r)
-        self.assertIn(p.name(), r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.ZombieProcess(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertIn("zombie", r)
-            self.assertNotIn("name=", r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.NoSuchProcess(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertIn("terminated", r)
-            self.assertNotIn("name=", r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.AccessDenied(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertNotIn("name=", r)
-
-    def test_process__str__(self):
-        self.test_process__repr__(func=str)
-
-    def test_no_such_process__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321)),
-            "psutil.NoSuchProcess process no longer exists (pid=321)")
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321, name='foo')),
-            "psutil.NoSuchProcess process no longer exists (pid=321, "
-            "name='foo')")
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321, msg='foo')),
-            "psutil.NoSuchProcess foo")
-
-    def test_zombie_process__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321)),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321)")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, name='foo')),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321, name='foo')")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, name='foo', ppid=1)),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321, name='foo', ppid=1)")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, msg='foo')),
-            "psutil.ZombieProcess foo")
-
-    def test_access_denied__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.AccessDenied(321)),
-            "psutil.AccessDenied (pid=321)")
-        self.assertEqual(
-            repr(psutil.AccessDenied(321, name='foo')),
-            "psutil.AccessDenied (pid=321, name='foo')")
-        self.assertEqual(
-            repr(psutil.AccessDenied(321, msg='foo')),
-            "psutil.AccessDenied foo")
-
-    def test_timeout_expired__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321)),
-            "psutil.TimeoutExpired timeout after 321 seconds")
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321, pid=111)),
-            "psutil.TimeoutExpired timeout after 321 seconds (pid=111)")
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321, pid=111, name='foo')),
-            "psutil.TimeoutExpired timeout after 321 seconds "
-            "(pid=111, name='foo')")
-
-    def test_process__eq__(self):
-        p1 = psutil.Process()
-        p2 = psutil.Process()
-        self.assertEqual(p1, p2)
-        p2._ident = (0, 0)
-        self.assertNotEqual(p1, p2)
-        self.assertNotEqual(p1, 'foo')
-
-    def test_process__hash__(self):
-        s = set([psutil.Process(), psutil.Process()])
-        self.assertEqual(len(s), 1)
-
-    def test__all__(self):
-        dir_psutil = dir(psutil)
-        for name in dir_psutil:
-            if name in ('callable', 'error', 'namedtuple', 'tests',
-                        'long', 'test', 'NUM_CPUS', 'BOOT_TIME',
-                        'TOTAL_PHYMEM', 'PermissionError',
-                        'ProcessLookupError'):
-                continue
-            if not name.startswith('_'):
-                try:
-                    __import__(name)
-                except ImportError:
-                    if name not in psutil.__all__:
-                        fun = getattr(psutil, name)
-                        if fun is None:
-                            continue
-                        if (fun.__doc__ is not None and
-                                'deprecated' not in fun.__doc__.lower()):
-                            self.fail('%r not in psutil.__all__' % name)
-
-        # Import 'star' will break if __all__ is inconsistent, see:
-        # https://github.com/giampaolo/psutil/issues/656
-        # Can't do `from psutil import *` as it won't work on python 3
-        # so we simply iterate over __all__.
-        for name in psutil.__all__:
-            self.assertIn(name, dir_psutil)
-
-    def test_version(self):
-        self.assertEqual('.'.join([str(x) for x in psutil.version_info]),
-                         psutil.__version__)
-
-    def test_process_as_dict_no_new_names(self):
-        # See https://github.com/giampaolo/psutil/issues/813
-        p = psutil.Process()
-        p.foo = '1'
-        self.assertNotIn('foo', p.as_dict())
-
-    def test_memoize(self):
-        @memoize
-        def foo(*args, **kwargs):
-            "foo docstring"
-            calls.append(None)
-            return (args, kwargs)
-
-        calls = []
-        # no args
-        for x in range(2):
-            ret = foo()
-            expected = ((), {})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 1)
-        # with args
-        for x in range(2):
-            ret = foo(1)
-            expected = ((1, ), {})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 2)
-        # with args + kwargs
-        for x in range(2):
-            ret = foo(1, bar=2)
-            expected = ((1, ), {'bar': 2})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 3)
-        # clear cache
-        foo.cache_clear()
-        ret = foo()
-        expected = ((), {})
-        self.assertEqual(ret, expected)
-        self.assertEqual(len(calls), 4)
-        # docstring
-        self.assertEqual(foo.__doc__, "foo docstring")
-
-    def test_memoize_when_activated(self):
-        class Foo:
-
-            @memoize_when_activated
-            def foo(self):
-                calls.append(None)
-
-        f = Foo()
-        calls = []
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 2)
-
-        # activate
-        calls = []
-        f.foo.cache_activate(f)
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 1)
-
-        # deactivate
-        calls = []
-        f.foo.cache_deactivate(f)
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 2)
-
-    def test_parse_environ_block(self):
-        from psutil._common import parse_environ_block
-
-        def k(s):
-            return s.upper() if WINDOWS else s
-
-        self.assertEqual(parse_environ_block("a=1\0"),
-                         {k("a"): "1"})
-        self.assertEqual(parse_environ_block("a=1\0b=2\0\0"),
-                         {k("a"): "1", k("b"): "2"})
-        self.assertEqual(parse_environ_block("a=1\0b=\0\0"),
-                         {k("a"): "1", k("b"): ""})
-        # ignore everything after \0\0
-        self.assertEqual(parse_environ_block("a=1\0b=2\0\0c=3\0"),
-                         {k("a"): "1", k("b"): "2"})
-        # ignore everything that is not an assignment
-        self.assertEqual(parse_environ_block("xxx\0a=1\0"), {k("a"): "1"})
-        self.assertEqual(parse_environ_block("a=1\0=b=2\0"), {k("a"): "1"})
-        # do not fail if the block is incomplete
-        self.assertEqual(parse_environ_block("a=1\0b=2"), {k("a"): "1"})
-
-    def test_supports_ipv6(self):
-        self.addCleanup(supports_ipv6.cache_clear)
-        if supports_ipv6():
-            with mock.patch('psutil._common.socket') as s:
-                s.has_ipv6 = False
-                supports_ipv6.cache_clear()
-                assert not supports_ipv6()
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket',
-                            side_effect=socket.error) as s:
-                assert not supports_ipv6()
-                assert s.called
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket',
-                            side_effect=socket.gaierror) as s:
-                assert not supports_ipv6()
-                supports_ipv6.cache_clear()
-                assert s.called
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket.bind',
-                            side_effect=socket.gaierror) as s:
-                assert not supports_ipv6()
-                supports_ipv6.cache_clear()
-                assert s.called
-        else:
-            with self.assertRaises(Exception):
-                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-                sock.bind(("::1", 0))
-
-    def test_isfile_strict(self):
-        from psutil._common import isfile_strict
-        this_file = os.path.abspath(__file__)
-        assert isfile_strict(this_file)
-        assert not isfile_strict(os.path.dirname(this_file))
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EPERM, "foo")):
-            self.assertRaises(OSError, isfile_strict, this_file)
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EACCES, "foo")):
-            self.assertRaises(OSError, isfile_strict, this_file)
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EINVAL, "foo")):
-            assert not isfile_strict(this_file)
-        with mock.patch('psutil._common.stat.S_ISREG', return_value=False):
-            assert not isfile_strict(this_file)
-
-    def test_serialization(self):
-        def check(ret):
-            if json is not None:
-                json.loads(json.dumps(ret))
-            a = pickle.dumps(ret)
-            b = pickle.loads(a)
-            self.assertEqual(ret, b)
-
-        check(psutil.Process().as_dict())
-        check(psutil.virtual_memory())
-        check(psutil.swap_memory())
-        check(psutil.cpu_times())
-        check(psutil.cpu_times_percent(interval=0))
-        check(psutil.net_io_counters())
-        if LINUX and not os.path.exists('/proc/diskstats'):
-            pass
-        else:
-            if not APPVEYOR:
-                check(psutil.disk_io_counters())
-        check(psutil.disk_partitions())
-        check(psutil.disk_usage(os.getcwd()))
-        check(psutil.users())
-
-    def test_setup_script(self):
-        setup_py = os.path.join(ROOT_DIR, 'setup.py')
-        if TRAVIS and not os.path.exists(setup_py):
-            return self.skipTest("can't find setup.py")
-        module = import_module_by_path(setup_py)
-        self.assertRaises(SystemExit, module.setup)
-        self.assertEqual(module.get_version(), psutil.__version__)
-
-    def test_ad_on_process_creation(self):
-        # We are supposed to be able to instantiate Process also in case
-        # of zombie processes or access denied.
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=psutil.AccessDenied) as meth:
-            psutil.Process()
-            assert meth.called
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=psutil.ZombieProcess(1)) as meth:
-            psutil.Process()
-            assert meth.called
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=ValueError) as meth:
-            with self.assertRaises(ValueError):
-                psutil.Process()
-            assert meth.called
-
-    def test_sanity_version_check(self):
-        # see: https://github.com/giampaolo/psutil/issues/564
-        with mock.patch(
-                "psutil._psplatform.cext.version", return_value="0.0.0"):
-            with self.assertRaises(ImportError) as cm:
-                reload_module(psutil)
-            self.assertIn("version conflict", str(cm.exception).lower())
-
-
-# ===================================================================
-# --- Tests for wrap_numbers() function.
-# ===================================================================
-
-
-nt = collections.namedtuple('foo', 'a b c')
-
-
-class TestWrapNumbers(unittest.TestCase):
-
-    def setUp(self):
-        wrap_numbers.cache_clear()
-
-    tearDown = setUp
-
-    def test_first_call(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_input_hasnt_changed(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_increase_but_no_wrap(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(10, 15, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(20, 25, 30)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(20, 25, 30)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_wrap(self):
-        # let's say 100 is the threshold
-        input = {'disk1': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # first wrap restarts from 10
-        input = {'disk1': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 110)})
-        # then it remains the same
-        input = {'disk1': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 110)})
-        # then it goes up
-        input = {'disk1': nt(100, 100, 90)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 190)})
-        # then it wraps again
-        input = {'disk1': nt(100, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 210)})
-        # and remains the same
-        input = {'disk1': nt(100, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 210)})
-        # now wrap another num
-        input = {'disk1': nt(50, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(150, 100, 210)})
-        # and again
-        input = {'disk1': nt(40, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(190, 100, 210)})
-        # keep it the same
-        input = {'disk1': nt(40, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(190, 100, 210)})
-
-    def test_changing_keys(self):
-        # Emulate a case where the second call to disk_io()
-        # (or whatever) provides a new disk, then the new disk
-        # disappears on the third call.
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(5, 5, 5),
-                 'disk2': nt(7, 7, 7)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(8, 8, 8)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_changing_keys_w_wrap(self):
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # disk 2 wraps
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(50, 50, 50),
-                          'disk2': nt(100, 100, 110)})
-        # disk 2 disappears
-        input = {'disk1': nt(50, 50, 50)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-        # then it appears again; the old wrap is supposed to be
-        # gone.
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # remains the same
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # and then wraps again
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(50, 50, 50),
-                          'disk2': nt(100, 100, 110)})
-
-    def test_real_data(self):
-        d = {'nvme0n1': (300, 508, 640, 1571, 5970, 1987, 2049, 451751, 47048),
-             'nvme0n1p1': (1171, 2, 5600256, 1024, 516, 0, 0, 0, 8),
-             'nvme0n1p2': (54, 54, 2396160, 5165056, 4, 24, 30, 1207, 28),
-             'nvme0n1p3': (2389, 4539, 5154, 150, 4828, 1844, 2019, 398, 348)}
-        self.assertEqual(wrap_numbers(d, 'disk_io'), d)
-        self.assertEqual(wrap_numbers(d, 'disk_io'), d)
-        # decrease this   ↓
-        d = {'nvme0n1': (100, 508, 640, 1571, 5970, 1987, 2049, 451751, 47048),
-             'nvme0n1p1': (1171, 2, 5600256, 1024, 516, 0, 0, 0, 8),
-             'nvme0n1p2': (54, 54, 2396160, 5165056, 4, 24, 30, 1207, 28),
-             'nvme0n1p3': (2389, 4539, 5154, 150, 4828, 1844, 2019, 398, 348)}
-        out = wrap_numbers(d, 'disk_io')
-        self.assertEqual(out['nvme0n1'][0], 400)
-
-    # --- cache tests
-
-    def test_cache_first_call(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(cache[1], {'disk_io': {}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_call_twice(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        input = {'disk1': nt(10, 10, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 0}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_wrap(self):
-        # let's say 100 is the threshold
-        input = {'disk1': nt(100, 100, 100)}
-        wrap_numbers(input, 'disk_io')
-
-        # first wrap restarts from 10
-        input = {'disk1': nt(100, 100, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 100}})
-        self.assertEqual(cache[2], {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-        def assert_():
-            cache = wrap_numbers.cache_info()
-            self.assertEqual(
-                cache[1],
-                {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0,
-                             ('disk1', 2): 100}})
-            self.assertEqual(cache[2],
-                             {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-        # then it remains the same
-        input = {'disk1': nt(100, 100, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        assert_()
-
-        # then it goes up
-        input = {'disk1': nt(100, 100, 90)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        assert_()
-
-        # then it wraps again
-        input = {'disk1': nt(100, 100, 20)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 190}})
-        self.assertEqual(cache[2], {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-    def test_cache_changing_keys(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        input = {'disk1': nt(5, 5, 5),
-                 'disk2': nt(7, 7, 7)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 0}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_clear(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        wrap_numbers(input, 'disk_io')
-        wrap_numbers.cache_clear('disk_io')
-        self.assertEqual(wrap_numbers.cache_info(), ({}, {}, {}))
-        wrap_numbers.cache_clear('disk_io')
-        wrap_numbers.cache_clear('?!?')
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_cache_clear_public_apis(self):
-        if not psutil.disk_io_counters() or not psutil.net_io_counters():
-            return self.skipTest("no disks or NICs available")
-        psutil.disk_io_counters()
-        psutil.net_io_counters()
-        caches = wrap_numbers.cache_info()
-        for cache in caches:
-            self.assertIn('psutil.disk_io_counters', cache)
-            self.assertIn('psutil.net_io_counters', cache)
-
-        psutil.disk_io_counters.cache_clear()
-        caches = wrap_numbers.cache_info()
-        for cache in caches:
-            self.assertIn('psutil.net_io_counters', cache)
-            self.assertNotIn('psutil.disk_io_counters', cache)
-
-        psutil.net_io_counters.cache_clear()
-        caches = wrap_numbers.cache_info()
-        self.assertEqual(caches, ({}, {}, {}))
-
-
-# ===================================================================
-# --- Example script tests
-# ===================================================================
-
-
-@unittest.skipIf(TOX, "can't test on TOX")
-# See: https://travis-ci.org/giampaolo/psutil/jobs/295224806
-@unittest.skipIf(TRAVIS and not os.path.exists(SCRIPTS_DIR),
-                 "can't locate scripts directory")
-class TestScripts(unittest.TestCase):
-    """Tests for scripts in the "scripts" directory."""
-
-    @staticmethod
-    def assert_stdout(exe, *args, **kwargs):
-        exe = '%s' % os.path.join(SCRIPTS_DIR, exe)
-        cmd = [PYTHON_EXE, exe]
-        for arg in args:
-            cmd.append(arg)
-        try:
-            out = sh(cmd, **kwargs).strip()
-        except RuntimeError as err:
-            if 'AccessDenied' in str(err):
-                return str(err)
-            else:
-                raise
-        assert out, out
-        return out
-
-    @staticmethod
-    def assert_syntax(exe, args=None):
-        exe = os.path.join(SCRIPTS_DIR, exe)
-        if PY3:
-            f = open(exe, 'rt', encoding='utf8')
-        else:
-            f = open(exe, 'rt')
-        with f:
-            src = f.read()
-        ast.parse(src)
-
-    def test_coverage(self):
-        # make sure all example scripts have a test method defined
-        meths = dir(self)
-        for name in os.listdir(SCRIPTS_DIR):
-            if name.endswith('.py'):
-                if 'test_' + os.path.splitext(name)[0] not in meths:
-                    # self.assert_stdout(name)
-                    self.fail('no test defined for %r script'
-                              % os.path.join(SCRIPTS_DIR, name))
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_executable(self):
-        for name in os.listdir(SCRIPTS_DIR):
-            if name.endswith('.py'):
-                path = os.path.join(SCRIPTS_DIR, name)
-                if not stat.S_IXUSR & os.stat(path)[stat.ST_MODE]:
-                    self.fail('%r is not executable' % path)
-
-    def test_disk_usage(self):
-        self.assert_stdout('disk_usage.py')
-
-    def test_free(self):
-        self.assert_stdout('free.py')
-
-    def test_meminfo(self):
-        self.assert_stdout('meminfo.py')
-
-    def test_procinfo(self):
-        self.assert_stdout('procinfo.py', str(os.getpid()))
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "no users")
-    def test_who(self):
-        self.assert_stdout('who.py')
-
-    def test_ps(self):
-        self.assert_stdout('ps.py')
-
-    def test_pstree(self):
-        self.assert_stdout('pstree.py')
-
-    def test_netstat(self):
-        self.assert_stdout('netstat.py')
-
-    # permission denied on travis
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_ifconfig(self):
-        self.assert_stdout('ifconfig.py')
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_pmap(self):
-        self.assert_stdout('pmap.py', str(os.getpid()))
-
-    def test_procsmem(self):
-        if 'uss' not in psutil.Process().memory_full_info()._fields:
-            raise self.skipTest("not supported")
-        self.assert_stdout('procsmem.py', stderr=DEVNULL)
-
-    def test_killall(self):
-        self.assert_syntax('killall.py')
-
-    def test_nettop(self):
-        self.assert_syntax('nettop.py')
-
-    def test_top(self):
-        self.assert_syntax('top.py')
-
-    def test_iotop(self):
-        self.assert_syntax('iotop.py')
-
-    def test_pidof(self):
-        output = self.assert_stdout('pidof.py', psutil.Process().name())
-        self.assertIn(str(os.getpid()), output)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_winservices(self):
-        self.assert_stdout('winservices.py')
-
-    def test_cpu_distribution(self):
-        self.assert_syntax('cpu_distribution.py')
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_temperatures(self):
-        if not psutil.sensors_temperatures():
-            self.skipTest("no temperatures")
-        self.assert_stdout('temperatures.py')
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_fans(self):
-        if not psutil.sensors_fans():
-            self.skipTest("no fans")
-        self.assert_stdout('fans.py')
-
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_battery(self):
-        self.assert_stdout('battery.py')
-
-    def test_sensors(self):
-        self.assert_stdout('sensors.py')
-
-
-# ===================================================================
-# --- Unit tests for test utilities.
-# ===================================================================
-
-
-class TestRetryDecorator(unittest.TestCase):
-
-    @mock.patch('time.sleep')
-    def test_retry_success(self, sleep):
-        # Fail 3 times out of 5; make sure the decorated fun returns.
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            while queue:
-                queue.pop()
-                1 / 0
-            return 1
-
-        queue = list(range(3))
-        self.assertEqual(foo(), 1)
-        self.assertEqual(sleep.call_count, 3)
-
-    @mock.patch('time.sleep')
-    def test_retry_failure(self, sleep):
-        # Fail 6 times out of 5; th function is supposed to raise exc.
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            while queue:
-                queue.pop()
-                1 / 0
-            return 1
-
-        queue = list(range(6))
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 5)
-
-    @mock.patch('time.sleep')
-    def test_exception_arg(self, sleep):
-        @retry(exception=ValueError, interval=1)
-        def foo():
-            raise TypeError
-
-        self.assertRaises(TypeError, foo)
-        self.assertEqual(sleep.call_count, 0)
-
-    @mock.patch('time.sleep')
-    def test_no_interval_arg(self, sleep):
-        # if interval is not specified sleep is not supposed to be called
-
-        @retry(retries=5, interval=None, logfun=None)
-        def foo():
-            1 / 0
-
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 0)
-
-    @mock.patch('time.sleep')
-    def test_retries_arg(self, sleep):
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            1 / 0
-
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 5)
-
-    @mock.patch('time.sleep')
-    def test_retries_and_timeout_args(self, sleep):
-        self.assertRaises(ValueError, retry, retries=5, timeout=1)
-
-
-class TestSyncTestUtils(unittest.TestCase):
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-
-    def test_wait_for_pid(self):
-        wait_for_pid(os.getpid())
-        nopid = max(psutil.pids()) + 99999
-        with mock.patch('psutil.tests.retry.__iter__', return_value=iter([0])):
-            self.assertRaises(psutil.NoSuchProcess, wait_for_pid, nopid)
-
-    def test_wait_for_file(self):
-        with open(TESTFN, 'w') as f:
-            f.write('foo')
-        wait_for_file(TESTFN)
-        assert not os.path.exists(TESTFN)
-
-    def test_wait_for_file_empty(self):
-        with open(TESTFN, 'w'):
-            pass
-        wait_for_file(TESTFN, empty=True)
-        assert not os.path.exists(TESTFN)
-
-    def test_wait_for_file_no_file(self):
-        with mock.patch('psutil.tests.retry.__iter__', return_value=iter([0])):
-            self.assertRaises(IOError, wait_for_file, TESTFN)
-
-    def test_wait_for_file_no_delete(self):
-        with open(TESTFN, 'w') as f:
-            f.write('foo')
-        wait_for_file(TESTFN, delete=False)
-        assert os.path.exists(TESTFN)
-
-    def test_call_until(self):
-        ret = call_until(lambda: 1, "ret == 1")
-        self.assertEqual(ret, 1)
-
-
-class TestFSTestUtils(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    tearDown = setUp
-
-    def test_open_text(self):
-        with open_text(__file__) as f:
-            self.assertEqual(f.mode, 'rt')
-
-    def test_open_binary(self):
-        with open_binary(__file__) as f:
-            self.assertEqual(f.mode, 'rb')
-
-    def test_safe_mkdir(self):
-        safe_mkdir(TESTFN)
-        assert os.path.isdir(TESTFN)
-        safe_mkdir(TESTFN)
-        assert os.path.isdir(TESTFN)
-
-    def test_safe_rmpath(self):
-        # test file is removed
-        open(TESTFN, 'w').close()
-        safe_rmpath(TESTFN)
-        assert not os.path.exists(TESTFN)
-        # test no exception if path does not exist
-        safe_rmpath(TESTFN)
-        # test dir is removed
-        os.mkdir(TESTFN)
-        safe_rmpath(TESTFN)
-        assert not os.path.exists(TESTFN)
-        # test other exceptions are raised
-        with mock.patch('psutil.tests.os.stat',
-                        side_effect=OSError(errno.EINVAL, "")) as m:
-            with self.assertRaises(OSError):
-                safe_rmpath(TESTFN)
-            assert m.called
-
-    def test_chdir(self):
-        base = os.getcwd()
-        os.mkdir(TESTFN)
-        with chdir(TESTFN):
-            self.assertEqual(os.getcwd(), os.path.join(base, TESTFN))
-        self.assertEqual(os.getcwd(), base)
-
-
-class TestProcessUtils(unittest.TestCase):
-
-    def test_reap_children(self):
-        subp = get_test_subprocess()
-        p = psutil.Process(subp.pid)
-        assert p.is_running()
-        reap_children()
-        assert not p.is_running()
-        assert not psutil.tests._pids_started
-        assert not psutil.tests._subprocesses_started
-
-    def test_create_proc_children_pair(self):
-        p1, p2 = create_proc_children_pair()
-        self.assertNotEqual(p1.pid, p2.pid)
-        assert p1.is_running()
-        assert p2.is_running()
-        children = psutil.Process().children(recursive=True)
-        self.assertEqual(len(children), 2)
-        self.assertIn(p1, children)
-        self.assertIn(p2, children)
-        self.assertEqual(p1.ppid(), os.getpid())
-        self.assertEqual(p2.ppid(), p1.pid)
-
-        # make sure both of them are cleaned up
-        reap_children()
-        assert not p1.is_running()
-        assert not p2.is_running()
-        assert not psutil.tests._pids_started
-        assert not psutil.tests._subprocesses_started
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_create_zombie_proc(self):
-        zpid = create_zombie_proc()
-        self.addCleanup(reap_children, recursive=True)
-        p = psutil.Process(zpid)
-        self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-
-
-class TestNetUtils(unittest.TestCase):
-
-    def bind_socket(self):
-        port = get_free_port()
-        with contextlib.closing(bind_socket(addr=('', port))) as s:
-            self.assertEqual(s.getsockname()[1], port)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_bind_unix_socket(self):
-        with unix_socket_path() as name:
-            sock = bind_unix_socket(name)
-            with contextlib.closing(sock):
-                self.assertEqual(sock.family, socket.AF_UNIX)
-                self.assertEqual(sock.type, socket.SOCK_STREAM)
-                self.assertEqual(sock.getsockname(), name)
-                assert os.path.exists(name)
-                assert stat.S_ISSOCK(os.stat(name).st_mode)
-        # UDP
-        with unix_socket_path() as name:
-            sock = bind_unix_socket(name, type=socket.SOCK_DGRAM)
-            with contextlib.closing(sock):
-                self.assertEqual(sock.type, socket.SOCK_DGRAM)
-
-    def tcp_tcp_socketpair(self):
-        addr = ("127.0.0.1", get_free_port())
-        server, client = tcp_socketpair(socket.AF_INET, addr=addr)
-        with contextlib.closing(server):
-            with contextlib.closing(client):
-                # Ensure they are connected and the positions are
-                # correct.
-                self.assertEqual(server.getsockname(), addr)
-                self.assertEqual(client.getpeername(), addr)
-                self.assertNotEqual(client.getsockname(), addr)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @unittest.skipIf(NETBSD or FREEBSD,
-                     "/var/run/log UNIX socket opened by default")
-    def test_unix_socketpair(self):
-        p = psutil.Process()
-        num_fds = p.num_fds()
-        assert not p.connections(kind='unix')
-        with unix_socket_path() as name:
-            server, client = unix_socketpair(name)
-            try:
-                assert os.path.exists(name)
-                assert stat.S_ISSOCK(os.stat(name).st_mode)
-                self.assertEqual(p.num_fds() - num_fds, 2)
-                self.assertEqual(len(p.connections(kind='unix')), 2)
-                self.assertEqual(server.getsockname(), name)
-                self.assertEqual(client.getpeername(), name)
-            finally:
-                client.close()
-                server.close()
-
-    def test_create_sockets(self):
-        with create_sockets() as socks:
-            fams = collections.defaultdict(int)
-            types = collections.defaultdict(int)
-            for s in socks:
-                fams[s.family] += 1
-                # work around http://bugs.python.org/issue30204
-                types[s.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE)] += 1
-            self.assertGreaterEqual(fams[socket.AF_INET], 2)
-            if supports_ipv6():
-                self.assertGreaterEqual(fams[socket.AF_INET6], 2)
-            if POSIX and HAS_CONNECTIONS_UNIX:
-                self.assertGreaterEqual(fams[socket.AF_UNIX], 2)
-            self.assertGreaterEqual(types[socket.SOCK_STREAM], 2)
-            self.assertGreaterEqual(types[socket.SOCK_DGRAM], 2)
-
-
-class TestOtherUtils(unittest.TestCase):
-
-    def test_is_namedtuple(self):
-        assert is_namedtuple(collections.namedtuple('foo', 'a b c')(1, 2, 3))
-        assert not is_namedtuple(tuple())
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_osx.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_osx.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_osx.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_osx.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""MACOS specific tests."""
-
-import os
-import re
-import time
-
-import psutil
-from psutil import MACOS
-from psutil.tests import create_zombie_proc
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-PAGESIZE = os.sysconf("SC_PAGE_SIZE") if MACOS else None
-
-
-def sysctl(cmdline):
-    """Expects a sysctl command with an argument and parse the result
-    returning only the value of interest.
-    """
-    out = sh(cmdline)
-    result = out.split()[1]
-    try:
-        return int(result)
-    except ValueError:
-        return result
-
-
-def vm_stat(field):
-    """Wrapper around 'vm_stat' cmdline utility."""
-    out = sh('vm_stat')
-    for line in out.split('\n'):
-        if field in line:
-            break
-    else:
-        raise ValueError("line not found")
-    return int(re.search(r'\d+', line).group(0)) * PAGESIZE
-
-
-# http://code.activestate.com/recipes/578019/
-def human2bytes(s):
-    SYMBOLS = {
-        'customary': ('B', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'),
-    }
-    init = s
-    num = ""
-    while s and s[0:1].isdigit() or s[0:1] == '.':
-        num += s[0]
-        s = s[1:]
-    num = float(num)
-    letter = s.strip()
-    for name, sset in SYMBOLS.items():
-        if letter in sset:
-            break
-    else:
-        if letter == 'k':
-            sset = SYMBOLS['customary']
-            letter = letter.upper()
-        else:
-            raise ValueError("can't interpret %r" % init)
-    prefix = {sset[0]: 1}
-    for i, s in enumerate(sset[1:]):
-        prefix[s] = 1 << (i + 1) * 10
-    return int(num * prefix[letter])
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestProcess(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_process_create_time(self):
-        output = sh("ps -o lstart -p %s" % self.pid)
-        start_ps = output.replace('STARTED', '').strip()
-        hhmmss = start_ps.split(' ')[-2]
-        year = start_ps.split(' ')[-1]
-        start_psutil = psutil.Process(self.pid).create_time()
-        self.assertEqual(
-            hhmmss,
-            time.strftime("%H:%M:%S", time.localtime(start_psutil)))
-        self.assertEqual(
-            year,
-            time.strftime("%Y", time.localtime(start_psutil)))
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestZombieProcessAPIs(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        zpid = create_zombie_proc()
-        cls.p = psutil.Process(zpid)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children(recursive=True)
-
-    def test_pidtask_info(self):
-        self.assertEqual(self.p.status(), psutil.STATUS_ZOMBIE)
-        self.p.ppid()
-        self.p.uids()
-        self.p.gids()
-        self.p.terminal()
-        self.p.create_time()
-
-    def test_exe(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.exe)
-
-    def test_cmdline(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cmdline)
-
-    def test_environ(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.environ)
-
-    def test_cwd(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cwd)
-
-    def test_memory_full_info(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.memory_full_info)
-
-    def test_cpu_times(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cpu_times)
-
-    def test_num_ctx_switches(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_ctx_switches)
-
-    def test_num_threads(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_threads)
-
-    def test_open_files(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.open_files)
-
-    def test_connections(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.connections)
-
-    def test_num_fds(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_fds)
-
-    def test_threads(self):
-        self.assertRaises((psutil.ZombieProcess, psutil.AccessDenied),
-                          self.p.threads)
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestSystemAPIs(unittest.TestCase):
-
-    # --- disk
-
-    def test_disks(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -k "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total = int(total) * 1024
-            used = int(used) * 1024
-            free = int(free) * 1024
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(part.device, dev)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % usage.free, free)
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % usage.used, used)
-
-    # --- cpu
-
-    def test_cpu_count_logical(self):
-        num = sysctl("sysctl hw.logicalcpu")
-        self.assertEqual(num, psutil.cpu_count(logical=True))
-
-    def test_cpu_count_physical(self):
-        num = sysctl("sysctl hw.physicalcpu")
-        self.assertEqual(num, psutil.cpu_count(logical=False))
-
-    def test_cpu_freq(self):
-        freq = psutil.cpu_freq()
-        self.assertEqual(
-            freq.current * 1000 * 1000, sysctl("sysctl hw.cpufrequency"))
-        self.assertEqual(
-            freq.min * 1000 * 1000, sysctl("sysctl hw.cpufrequency_min"))
-        self.assertEqual(
-            freq.max * 1000 * 1000, sysctl("sysctl hw.cpufrequency_max"))
-
-    # --- virtual mem
-
-    def test_vmem_total(self):
-        sysctl_hwphymem = sysctl('sysctl hw.memsize')
-        self.assertEqual(sysctl_hwphymem, psutil.virtual_memory().total)
-
-    @retry_on_failure()
-    def test_vmem_free(self):
-        vmstat_val = vm_stat("free")
-        psutil_val = psutil.virtual_memory().free
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_active(self):
-        vmstat_val = vm_stat("active")
-        psutil_val = psutil.virtual_memory().active
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_inactive(self):
-        vmstat_val = vm_stat("inactive")
-        psutil_val = psutil.virtual_memory().inactive
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_wired(self):
-        vmstat_val = vm_stat("wired")
-        psutil_val = psutil.virtual_memory().wired
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    # --- swap mem
-
-    @retry_on_failure()
-    def test_swapmem_sin(self):
-        vmstat_val = vm_stat("Pageins")
-        psutil_val = psutil.swap_memory().sin
-        self.assertEqual(psutil_val, vmstat_val)
-
-    @retry_on_failure()
-    def test_swapmem_sout(self):
-        vmstat_val = vm_stat("Pageout")
-        psutil_val = psutil.swap_memory().sout
-        self.assertEqual(psutil_val, vmstat_val)
-
-    # Not very reliable.
-    # def test_swapmem_total(self):
-    #     out = sh('sysctl vm.swapusage')
-    #     out = out.replace('vm.swapusage: ', '')
-    #     total, used, free = re.findall('\d+.\d+\w', out)
-    #     psutil_smem = psutil.swap_memory()
-    #     self.assertEqual(psutil_smem.total, human2bytes(total))
-    #     self.assertEqual(psutil_smem.used, human2bytes(used))
-    #     self.assertEqual(psutil_smem.free, human2bytes(free))
-
-    # --- network
-
-    def test_net_if_stats(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                self.assertEqual(stats.mtu,
-                                 int(re.findall(r'mtu (\d+)', out)[0]))
-
-    # --- sensors_battery
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        out = sh("pmset -g batt")
-        percent = re.search(r"(\d+)%", out).group(1)
-        drawing_from = re.search("Now drawing from '([^']+)'", out).group(1)
-        power_plugged = drawing_from == "AC Power"
-        psutil_result = psutil.sensors_battery()
-        self.assertEqual(psutil_result.power_plugged, power_plugged)
-        self.assertEqual(psutil_result.percent, int(percent))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_posix.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_posix.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_posix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_posix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,453 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""POSIX specific tests."""
-
-import datetime
-import errno
-import os
-import re
-import subprocess
-import time
-
-import psutil
-from psutil import AIX
-from psutil import BSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil.tests import CI_TESTING
-from psutil.tests import get_kernel_version
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import mock
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import wait_for_pid
-from psutil.tests import which
-
-
-def ps(fmt, pid=None):
-    """
-    Wrapper for calling the ps command with a little bit of cross-platform
-    support for a narrow range of features.
-    """
-
-    cmd = ['ps']
-
-    if LINUX:
-        cmd.append('--no-headers')
-
-    if pid is not None:
-        cmd.extend(['-p', str(pid)])
-    else:
-        if SUNOS or AIX:
-            cmd.append('-A')
-        else:
-            cmd.append('ax')
-
-    if SUNOS:
-        fmt_map = set(('command', 'comm', 'start', 'stime'))
-        fmt = fmt_map.get(fmt, fmt)
-
-    cmd.extend(['-o', fmt])
-
-    output = sh(cmd)
-
-    if LINUX:
-        output = output.splitlines()
-    else:
-        output = output.splitlines()[1:]
-
-    all_output = []
-    for line in output:
-        line = line.strip()
-
-        try:
-            line = int(line)
-        except ValueError:
-            pass
-
-        all_output.append(line)
-
-    if pid is None:
-        return all_output
-    else:
-        return all_output[0]
-
-# ps "-o" field names differ wildly between platforms.
-# "comm" means "only executable name" but is not available on BSD platforms.
-# "args" means "command with all its arguments", and is also not available
-# on BSD platforms.
-# "command" is like "args" on most platforms, but like "comm" on AIX,
-# and not available on SUNOS.
-# so for the executable name we can use "comm" on Solaris and split "command"
-# on other platforms.
-# to get the cmdline (with args) we have to use "args" on AIX and
-# Solaris, and can use "command" on all others.
-
-
-def ps_name(pid):
-    field = "command"
-    if SUNOS:
-        field = "comm"
-    return ps(field, pid).split()[0]
-
-
-def ps_args(pid):
-    field = "command"
-    if AIX or SUNOS:
-        field = "args"
-    return ps(field, pid)
-
-
-def ps_rss(pid):
-    field = "rss"
-    if AIX:
-        field = "rssize"
-    return ps(field, pid)
-
-
-def ps_vsz(pid):
-    field = "vsz"
-    if AIX:
-        field = "vsize"
-    return ps(field, pid)
-
-
-@unittest.skipIf(not POSIX, "POSIX only")
-class TestProcess(unittest.TestCase):
-    """Compare psutil results against 'ps' command line utility (mainly)."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess([PYTHON_EXE, "-E", "-O"],
-                                      stdin=subprocess.PIPE).pid
-        wait_for_pid(cls.pid)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_ppid(self):
-        ppid_ps = ps('ppid', self.pid)
-        ppid_psutil = psutil.Process(self.pid).ppid()
-        self.assertEqual(ppid_ps, ppid_psutil)
-
-    def test_uid(self):
-        uid_ps = ps('uid', self.pid)
-        uid_psutil = psutil.Process(self.pid).uids().real
-        self.assertEqual(uid_ps, uid_psutil)
-
-    def test_gid(self):
-        gid_ps = ps('rgid', self.pid)
-        gid_psutil = psutil.Process(self.pid).gids().real
-        self.assertEqual(gid_ps, gid_psutil)
-
-    def test_username(self):
-        username_ps = ps('user', self.pid)
-        username_psutil = psutil.Process(self.pid).username()
-        self.assertEqual(username_ps, username_psutil)
-
-    def test_username_no_resolution(self):
-        # Emulate a case where the system can't resolve the uid to
-        # a username in which case psutil is supposed to return
-        # the stringified uid.
-        p = psutil.Process()
-        with mock.patch("psutil.pwd.getpwuid", side_effect=KeyError) as fun:
-            self.assertEqual(p.username(), str(p.uids().real))
-            assert fun.called
-
-    @skip_on_access_denied()
-    @retry_on_failure()
-    def test_rss_memory(self):
-        # give python interpreter some time to properly initialize
-        # so that the results are the same
-        time.sleep(0.1)
-        rss_ps = ps_rss(self.pid)
-        rss_psutil = psutil.Process(self.pid).memory_info()[0] / 1024
-        self.assertEqual(rss_ps, rss_psutil)
-
-    @skip_on_access_denied()
-    @retry_on_failure()
-    def test_vsz_memory(self):
-        # give python interpreter some time to properly initialize
-        # so that the results are the same
-        time.sleep(0.1)
-        vsz_ps = ps_vsz(self.pid)
-        vsz_psutil = psutil.Process(self.pid).memory_info()[1] / 1024
-        self.assertEqual(vsz_ps, vsz_psutil)
-
-    def test_name(self):
-        name_ps = ps_name(self.pid)
-        # remove path if there is any, from the command
-        name_ps = os.path.basename(name_ps).lower()
-        name_psutil = psutil.Process(self.pid).name().lower()
-        # ...because of how we calculate PYTHON_EXE; on MACOS this may
-        # be "pythonX.Y".
-        name_ps = re.sub(r"\d.\d", "", name_ps)
-        name_psutil = re.sub(r"\d.\d", "", name_psutil)
-        # ...may also be "python.X"
-        name_ps = re.sub(r"\d", "", name_ps)
-        name_psutil = re.sub(r"\d", "", name_psutil)
-        self.assertEqual(name_ps, name_psutil)
-
-    def test_name_long(self):
-        # On UNIX the kernel truncates the name to the first 15
-        # characters. In such a case psutil tries to determine the
-        # full name from the cmdline.
-        name = "long-program-name"
-        cmdline = ["long-program-name-extended", "foo", "bar"]
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            return_value=cmdline):
-                p = psutil.Process()
-                self.assertEqual(p.name(), "long-program-name-extended")
-
-    def test_name_long_cmdline_ad_exc(self):
-        # Same as above but emulates a case where cmdline() raises
-        # AccessDenied in which case psutil is supposed to return
-        # the truncated name instead of crashing.
-        name = "long-program-name"
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            side_effect=psutil.AccessDenied(0, "")):
-                p = psutil.Process()
-                self.assertEqual(p.name(), "long-program-name")
-
-    def test_name_long_cmdline_nsp_exc(self):
-        # Same as above but emulates a case where cmdline() raises NSP
-        # which is supposed to propagate.
-        name = "long-program-name"
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            side_effect=psutil.NoSuchProcess(0, "")):
-                p = psutil.Process()
-                self.assertRaises(psutil.NoSuchProcess, p.name)
-
-    @unittest.skipIf(MACOS or BSD, 'ps -o start not available')
-    def test_create_time(self):
-        time_ps = ps('start', self.pid)
-        time_psutil = psutil.Process(self.pid).create_time()
-        time_psutil_tstamp = datetime.datetime.fromtimestamp(
-            time_psutil).strftime("%H:%M:%S")
-        # sometimes ps shows the time rounded up instead of down, so we check
-        # for both possible values
-        round_time_psutil = round(time_psutil)
-        round_time_psutil_tstamp = datetime.datetime.fromtimestamp(
-            round_time_psutil).strftime("%H:%M:%S")
-        self.assertIn(time_ps, [time_psutil_tstamp, round_time_psutil_tstamp])
-
-    def test_exe(self):
-        ps_pathname = ps_name(self.pid)
-        psutil_pathname = psutil.Process(self.pid).exe()
-        try:
-            self.assertEqual(ps_pathname, psutil_pathname)
-        except AssertionError:
-            # certain platforms such as BSD are more accurate returning:
-            # "/usr/local/bin/python2.7"
-            # ...instead of:
-            # "/usr/local/bin/python"
-            # We do not want to consider this difference in accuracy
-            # an error.
-            adjusted_ps_pathname = ps_pathname[:len(ps_pathname)]
-            self.assertEqual(ps_pathname, adjusted_ps_pathname)
-
-    def test_cmdline(self):
-        ps_cmdline = ps_args(self.pid)
-        psutil_cmdline = " ".join(psutil.Process(self.pid).cmdline())
-        self.assertEqual(ps_cmdline, psutil_cmdline)
-
-    # On SUNOS "ps" reads niceness /proc/pid/psinfo which returns an
-    # incorrect value (20); the real deal is getpriority(2) which
-    # returns 0; psutil relies on it, see:
-    # https://github.com/giampaolo/psutil/issues/1082
-    # AIX has the same issue
-    @unittest.skipIf(SUNOS, "not reliable on SUNOS")
-    @unittest.skipIf(AIX, "not reliable on AIX")
-    def test_nice(self):
-        ps_nice = ps('nice', self.pid)
-        psutil_nice = psutil.Process().nice()
-        self.assertEqual(ps_nice, psutil_nice)
-
-    def test_num_fds(self):
-        # Note: this fails from time to time; I'm keen on thinking
-        # it doesn't mean something is broken
-        def call(p, attr):
-            args = ()
-            attr = getattr(p, name, None)
-            if attr is not None and callable(attr):
-                if name == 'rlimit':
-                    args = (psutil.RLIMIT_NOFILE,)
-                attr(*args)
-            else:
-                attr
-
-        p = psutil.Process(os.getpid())
-        failures = []
-        ignored_names = ['terminate', 'kill', 'suspend', 'resume', 'nice',
-                         'send_signal', 'wait', 'children', 'as_dict',
-                         'memory_info_ex', 'parent', 'parents']
-        if LINUX and get_kernel_version() < (2, 6, 36):
-            ignored_names.append('rlimit')
-        if LINUX and get_kernel_version() < (2, 6, 23):
-            ignored_names.append('num_ctx_switches')
-        for name in dir(psutil.Process):
-            if (name.startswith('_') or name in ignored_names):
-                continue
-            else:
-                try:
-                    num1 = p.num_fds()
-                    for x in range(2):
-                        call(p, name)
-                    num2 = p.num_fds()
-                except psutil.AccessDenied:
-                    pass
-                else:
-                    if abs(num2 - num1) > 1:
-                        fail = "failure while processing Process.%s method " \
-                               "(before=%s, after=%s)" % (name, num1, num2)
-                        failures.append(fail)
-        if failures:
-            self.fail('\n' + '\n'.join(failures))
-
-
-@unittest.skipIf(not POSIX, "POSIX only")
-class TestSystemAPIs(unittest.TestCase):
-    """Test some system APIs."""
-
-    @retry_on_failure()
-    def test_pids(self):
-        # Note: this test might fail if the OS is starting/killing
-        # other processes in the meantime
-        pids_ps = sorted(ps("pid"))
-        pids_psutil = psutil.pids()
-
-        # on MACOS and OPENBSD ps doesn't show pid 0
-        if MACOS or OPENBSD and 0 not in pids_ps:
-            pids_ps.insert(0, 0)
-
-        # There will often be one more process in pids_ps for ps itself
-        if len(pids_ps) - len(pids_psutil) > 1:
-            difference = [x for x in pids_psutil if x not in pids_ps] + \
-                         [x for x in pids_ps if x not in pids_psutil]
-            self.fail("difference: " + str(difference))
-
-    # for some reason ifconfig -a does not report all interfaces
-    # returned by psutil
-    @unittest.skipIf(SUNOS, "unreliable on SUNOS")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @unittest.skipIf(not which('ifconfig'), "no ifconfig cmd")
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, "not supported")
-    def test_nic_names(self):
-        output = sh("ifconfig -a")
-        for nic in psutil.net_io_counters(pernic=True).keys():
-            for line in output.split():
-                if line.startswith(nic):
-                    break
-            else:
-                self.fail(
-                    "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
-                        nic, output))
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-    @retry_on_failure()
-    def test_users(self):
-        out = sh("who")
-        lines = out.split('\n')
-        if not lines:
-            raise self.skipTest("no users on this system")
-        users = [x.split()[0] for x in lines]
-        terminals = [x.split()[1] for x in lines]
-        self.assertEqual(len(users), len(psutil.users()))
-        for u in psutil.users():
-            self.assertIn(u.name, users)
-            self.assertIn(u.terminal, terminals)
-
-    def test_pid_exists_let_raise(self):
-        # According to "man 2 kill" possible error values for kill
-        # are (EINVAL, EPERM, ESRCH). Test that any other errno
-        # results in an exception.
-        with mock.patch("psutil._psposix.os.kill",
-                        side_effect=OSError(errno.EBADF, "")) as m:
-            self.assertRaises(OSError, psutil._psposix.pid_exists, os.getpid())
-            assert m.called
-
-    def test_os_waitpid_let_raise(self):
-        # os.waitpid() is supposed to catch EINTR and ECHILD only.
-        # Test that any other errno results in an exception.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        side_effect=OSError(errno.EBADF, "")) as m:
-            self.assertRaises(OSError, psutil._psposix.wait_pid, os.getpid())
-            assert m.called
-
-    def test_os_waitpid_eintr(self):
-        # os.waitpid() is supposed to "retry" on EINTR.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        side_effect=OSError(errno.EINTR, "")) as m:
-            self.assertRaises(
-                psutil._psposix.TimeoutExpired,
-                psutil._psposix.wait_pid, os.getpid(), timeout=0.01)
-            assert m.called
-
-    def test_os_waitpid_bad_ret_status(self):
-        # Simulate os.waitpid() returning a bad status.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        return_value=(1, -1)) as m:
-            self.assertRaises(ValueError,
-                              psutil._psposix.wait_pid, os.getpid())
-            assert m.called
-
-    # AIX can return '-' in df output instead of numbers, e.g. for /proc
-    @unittest.skipIf(AIX, "unreliable on AIX")
-    def test_disk_usage(self):
-        def df(device):
-            out = sh("df -k %s" % device).strip()
-            line = out.split('\n')[1]
-            fields = line.split()
-            total = int(fields[1]) * 1024
-            used = int(fields[2]) * 1024
-            free = int(fields[3]) * 1024
-            percent = float(fields[4].replace('%', ''))
-            return (total, used, free, percent)
-
-        tolerance = 4 * 1024 * 1024  # 4MB
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            try:
-                total, used, free, percent = df(part.device)
-            except RuntimeError as err:
-                # see:
-                # https://travis-ci.org/giampaolo/psutil/jobs/138338464
-                # https://travis-ci.org/giampaolo/psutil/jobs/138343361
-                err = str(err).lower()
-                if "no such file or directory" in err or \
-                        "raw devices not supported" in err or \
-                        "permission denied" in err:
-                    continue
-                else:
-                    raise
-            else:
-                self.assertAlmostEqual(usage.total, total, delta=tolerance)
-                self.assertAlmostEqual(usage.used, used, delta=tolerance)
-                self.assertAlmostEqual(usage.free, free, delta=tolerance)
-                self.assertAlmostEqual(usage.percent, percent, delta=1)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_process.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_process.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_process.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_process.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1643 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for psutil.Process class."""
-
-import collections
-import errno
-import getpass
-import itertools
-import os
-import signal
-import socket
-import subprocess
-import sys
-import tempfile
-import textwrap
-import time
-import types
-
-import psutil
-
-from psutil import AIX
-from psutil import BSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import OSX
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import open_text
-from psutil._compat import long
-from psutil._compat import PY3
-from psutil.tests import APPVEYOR
-from psutil.tests import call_until
-from psutil.tests import CIRRUS
-from psutil.tests import copyload_shared_lib
-from psutil.tests import create_exe
-from psutil.tests import create_proc_children_pair
-from psutil.tests import create_zombie_proc
-from psutil.tests import enum
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CPU_AFFINITY
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_IONICE
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_PROC_CPU_NUM
-from psutil.tests import HAS_PROC_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_THREADS
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import sh
-from psutil.tests import skip_on_access_denied
-from psutil.tests import skip_on_not_implemented
-from psutil.tests import TESTFILE_PREFIX
-from psutil.tests import TESTFN
-from psutil.tests import ThreadTask
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import wait_for_pid
-
-
-# ===================================================================
-# --- psutil.Process class tests
-# ===================================================================
-
-class TestProcess(unittest.TestCase):
-    """Tests for psutil.Process class."""
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    def tearDown(self):
-        reap_children()
-
-    def test_pid(self):
-        p = psutil.Process()
-        self.assertEqual(p.pid, os.getpid())
-        sproc = get_test_subprocess()
-        self.assertEqual(psutil.Process(sproc.pid).pid, sproc.pid)
-        with self.assertRaises(AttributeError):
-            p.pid = 33
-
-    def test_kill(self):
-        sproc = get_test_subprocess()
-        test_pid = sproc.pid
-        p = psutil.Process(test_pid)
-        p.kill()
-        sig = p.wait()
-        self.assertFalse(psutil.pid_exists(test_pid))
-        if POSIX:
-            self.assertEqual(sig, -signal.SIGKILL)
-
-    def test_terminate(self):
-        sproc = get_test_subprocess()
-        test_pid = sproc.pid
-        p = psutil.Process(test_pid)
-        p.terminate()
-        sig = p.wait()
-        self.assertFalse(psutil.pid_exists(test_pid))
-        if POSIX:
-            self.assertEqual(sig, -signal.SIGTERM)
-
-    def test_send_signal(self):
-        sig = signal.SIGKILL if POSIX else signal.SIGTERM
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.send_signal(sig)
-        exit_sig = p.wait()
-        self.assertFalse(psutil.pid_exists(p.pid))
-        if POSIX:
-            self.assertEqual(exit_sig, -sig)
-            #
-            sproc = get_test_subprocess()
-            p = psutil.Process(sproc.pid)
-            p.send_signal(sig)
-            with mock.patch('psutil.os.kill',
-                            side_effect=OSError(errno.ESRCH, "")):
-                with self.assertRaises(psutil.NoSuchProcess):
-                    p.send_signal(sig)
-            #
-            sproc = get_test_subprocess()
-            p = psutil.Process(sproc.pid)
-            p.send_signal(sig)
-            with mock.patch('psutil.os.kill',
-                            side_effect=OSError(errno.EPERM, "")):
-                with self.assertRaises(psutil.AccessDenied):
-                    psutil.Process().send_signal(sig)
-            # Sending a signal to process with PID 0 is not allowed as
-            # it would affect every process in the process group of
-            # the calling process (os.getpid()) instead of PID 0").
-            if 0 in psutil.pids():
-                p = psutil.Process(0)
-                self.assertRaises(ValueError, p.send_signal, signal.SIGTERM)
-
-    def test_wait(self):
-        # check exit code signal
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        code = p.wait()
-        if POSIX:
-            self.assertEqual(code, -signal.SIGKILL)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.terminate()
-        code = p.wait()
-        if POSIX:
-            self.assertEqual(code, -signal.SIGTERM)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-        # check sys.exit() code
-        code = "import time, sys; time.sleep(0.01); sys.exit(5);"
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", code])
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.wait(), 5)
-        self.assertFalse(p.is_running())
-
-        # Test wait() issued twice.
-        # It is not supposed to raise NSP when the process is gone.
-        # On UNIX this should return None, on Windows it should keep
-        # returning the exit code.
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", code])
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.wait(), 5)
-        self.assertIn(p.wait(), (5, None))
-
-        # test timeout
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.name()
-        self.assertRaises(psutil.TimeoutExpired, p.wait, 0.01)
-
-        # timeout < 0 not allowed
-        self.assertRaises(ValueError, p.wait, -1)
-
-    def test_wait_non_children(self):
-        # Test wait() against a process which is not our direct
-        # child.
-        p1, p2 = create_proc_children_pair()
-        self.assertRaises(psutil.TimeoutExpired, p1.wait, 0.01)
-        self.assertRaises(psutil.TimeoutExpired, p2.wait, 0.01)
-        # We also terminate the direct child otherwise the
-        # grandchild will hang until the parent is gone.
-        p1.terminate()
-        p2.terminate()
-        ret1 = p1.wait()
-        ret2 = p2.wait()
-        if POSIX:
-            self.assertEqual(ret1, -signal.SIGTERM)
-            # For processes which are not our children we're supposed
-            # to get None.
-            self.assertEqual(ret2, None)
-        else:
-            self.assertEqual(ret1, signal.SIGTERM)
-            self.assertEqual(ret1, signal.SIGTERM)
-
-    def test_wait_timeout_0(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertRaises(psutil.TimeoutExpired, p.wait, 0)
-        p.kill()
-        stop_at = time.time() + 2
-        while True:
-            try:
-                code = p.wait(0)
-            except psutil.TimeoutExpired:
-                if time.time() >= stop_at:
-                    raise
-            else:
-                break
-        if POSIX:
-            self.assertEqual(code, -signal.SIGKILL)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-    def test_cpu_percent(self):
-        p = psutil.Process()
-        p.cpu_percent(interval=0.001)
-        p.cpu_percent(interval=0.001)
-        for x in range(100):
-            percent = p.cpu_percent(interval=None)
-            self.assertIsInstance(percent, float)
-            self.assertGreaterEqual(percent, 0.0)
-        with self.assertRaises(ValueError):
-            p.cpu_percent(interval=-1)
-
-    def test_cpu_percent_numcpus_none(self):
-        # See: https://github.com/giampaolo/psutil/issues/1087
-        with mock.patch('psutil.cpu_count', return_value=None) as m:
-            psutil.Process().cpu_percent()
-            assert m.called
-
-    def test_cpu_times(self):
-        times = psutil.Process().cpu_times()
-        assert (times.user > 0.0) or (times.system > 0.0), times
-        assert (times.children_user >= 0.0), times
-        assert (times.children_system >= 0.0), times
-        if LINUX:
-            assert times.iowait >= 0.0, times
-        # make sure returned values can be pretty printed with strftime
-        for name in times._fields:
-            time.strftime("%H:%M:%S", time.localtime(getattr(times, name)))
-
-    def test_cpu_times_2(self):
-        user_time, kernel_time = psutil.Process().cpu_times()[:2]
-        utime, ktime = os.times()[:2]
-
-        # Use os.times()[:2] as base values to compare our results
-        # using a tolerance  of +/- 0.1 seconds.
-        # It will fail if the difference between the values is > 0.1s.
-        if (max([user_time, utime]) - min([user_time, utime])) > 0.1:
-            self.fail("expected: %s, found: %s" % (utime, user_time))
-
-        if (max([kernel_time, ktime]) - min([kernel_time, ktime])) > 0.1:
-            self.fail("expected: %s, found: %s" % (ktime, kernel_time))
-
-    @unittest.skipIf(not HAS_PROC_CPU_NUM, "not supported")
-    def test_cpu_num(self):
-        p = psutil.Process()
-        num = p.cpu_num()
-        self.assertGreaterEqual(num, 0)
-        if psutil.cpu_count() == 1:
-            self.assertEqual(num, 0)
-        self.assertIn(p.cpu_num(), range(psutil.cpu_count()))
-
-    def test_create_time(self):
-        sproc = get_test_subprocess()
-        now = time.time()
-        p = psutil.Process(sproc.pid)
-        create_time = p.create_time()
-
-        # Use time.time() as base value to compare our result using a
-        # tolerance of +/- 1 second.
-        # It will fail if the difference between the values is > 2s.
-        difference = abs(create_time - now)
-        if difference > 2:
-            self.fail("expected: %s, found: %s, difference: %s"
-                      % (now, create_time, difference))
-
-        # make sure returned value can be pretty printed with strftime
-        time.strftime("%Y %m %d %H:%M:%S", time.localtime(p.create_time()))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    @unittest.skipIf(TRAVIS or CIRRUS, 'not reliable on TRAVIS/CIRRUS')
-    def test_terminal(self):
-        terminal = psutil.Process().terminal()
-        if sys.stdin.isatty() or sys.stdout.isatty():
-            tty = os.path.realpath(sh('tty'))
-            self.assertEqual(terminal, tty)
-        else:
-            self.assertIsNone(terminal)
-
-    @unittest.skipIf(not HAS_PROC_IO_COUNTERS, 'not supported')
-    @skip_on_not_implemented(only_if=LINUX)
-    def test_io_counters(self):
-        p = psutil.Process()
-        # test reads
-        io1 = p.io_counters()
-        with open(PYTHON_EXE, 'rb') as f:
-            f.read()
-        io2 = p.io_counters()
-        if not BSD and not AIX:
-            self.assertGreater(io2.read_count, io1.read_count)
-            self.assertEqual(io2.write_count, io1.write_count)
-            if LINUX:
-                self.assertGreater(io2.read_chars, io1.read_chars)
-                self.assertEqual(io2.write_chars, io1.write_chars)
-        else:
-            self.assertGreaterEqual(io2.read_bytes, io1.read_bytes)
-            self.assertGreaterEqual(io2.write_bytes, io1.write_bytes)
-
-        # test writes
-        io1 = p.io_counters()
-        with tempfile.TemporaryFile(prefix=TESTFILE_PREFIX) as f:
-            if PY3:
-                f.write(bytes("x" * 1000000, 'ascii'))
-            else:
-                f.write("x" * 1000000)
-        io2 = p.io_counters()
-        self.assertGreaterEqual(io2.write_count, io1.write_count)
-        self.assertGreaterEqual(io2.write_bytes, io1.write_bytes)
-        self.assertGreaterEqual(io2.read_count, io1.read_count)
-        self.assertGreaterEqual(io2.read_bytes, io1.read_bytes)
-        if LINUX:
-            self.assertGreater(io2.write_chars, io1.write_chars)
-            self.assertGreaterEqual(io2.read_chars, io1.read_chars)
-
-        # sanity check
-        for i in range(len(io2)):
-            if BSD and i >= 2:
-                # On BSD read_bytes and write_bytes are always set to -1.
-                continue
-            self.assertGreaterEqual(io2[i], 0)
-            self.assertGreaterEqual(io2[i], 0)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    @unittest.skipIf(not LINUX, "linux only")
-    def test_ionice_linux(self):
-        p = psutil.Process()
-        self.assertEqual(p.ionice()[0], psutil.IOPRIO_CLASS_NONE)
-        self.assertEqual(psutil.IOPRIO_CLASS_NONE, 0)
-        self.assertEqual(psutil.IOPRIO_CLASS_RT, 1)  # high
-        self.assertEqual(psutil.IOPRIO_CLASS_BE, 2)  # normal
-        self.assertEqual(psutil.IOPRIO_CLASS_IDLE, 3)  # low
-        try:
-            # low
-            p.ionice(psutil.IOPRIO_CLASS_IDLE)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_IDLE, 0))
-            with self.assertRaises(ValueError):  # accepts no value
-                p.ionice(psutil.IOPRIO_CLASS_IDLE, value=7)
-            # normal
-            p.ionice(psutil.IOPRIO_CLASS_BE)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_BE, 0))
-            p.ionice(psutil.IOPRIO_CLASS_BE, value=7)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_BE, 7))
-            with self.assertRaises(ValueError):
-                p.ionice(psutil.IOPRIO_CLASS_BE, value=8)
-            # high
-            if os.getuid() == 0:  # root
-                p.ionice(psutil.IOPRIO_CLASS_RT)
-                self.assertEqual(tuple(p.ionice()),
-                                 (psutil.IOPRIO_CLASS_RT, 0))
-                p.ionice(psutil.IOPRIO_CLASS_RT, value=7)
-                self.assertEqual(tuple(p.ionice()),
-                                 (psutil.IOPRIO_CLASS_RT, 7))
-                with self.assertRaises(ValueError):
-                    p.ionice(psutil.IOPRIO_CLASS_IDLE, value=8)
-            # errs
-            self.assertRaisesRegex(
-                ValueError, "ioclass accepts no value",
-                p.ionice, psutil.IOPRIO_CLASS_NONE, 1)
-            self.assertRaisesRegex(
-                ValueError, "ioclass accepts no value",
-                p.ionice, psutil.IOPRIO_CLASS_IDLE, 1)
-            self.assertRaisesRegex(
-                ValueError, "'ioclass' argument must be specified",
-                p.ionice, value=1)
-        finally:
-            p.ionice(psutil.IOPRIO_CLASS_BE)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    @unittest.skipIf(not WINDOWS, 'not supported on this win version')
-    def test_ionice_win(self):
-        p = psutil.Process()
-        self.assertEqual(p.ionice(), psutil.IOPRIO_NORMAL)
-        try:
-            # base
-            p.ionice(psutil.IOPRIO_VERYLOW)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_VERYLOW)
-            p.ionice(psutil.IOPRIO_LOW)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_LOW)
-            try:
-                p.ionice(psutil.IOPRIO_HIGH)
-            except psutil.AccessDenied:
-                pass
-            else:
-                self.assertEqual(p.ionice(), psutil.IOPRIO_HIGH)
-            # errs
-            self.assertRaisesRegex(
-                TypeError, "value argument not accepted on Windows",
-                p.ionice, psutil.IOPRIO_NORMAL, value=1)
-            self.assertRaisesRegex(
-                ValueError, "is not a valid priority",
-                p.ionice, psutil.IOPRIO_HIGH + 1)
-        finally:
-            p.ionice(psutil.IOPRIO_NORMAL)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_NORMAL)
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_get(self):
-        import resource
-        p = psutil.Process(os.getpid())
-        names = [x for x in dir(psutil) if x.startswith('RLIMIT')]
-        assert names, names
-        for name in names:
-            value = getattr(psutil, name)
-            self.assertGreaterEqual(value, 0)
-            if name in dir(resource):
-                self.assertEqual(value, getattr(resource, name))
-                # XXX - On PyPy RLIMIT_INFINITY returned by
-                # resource.getrlimit() is reported as a very big long
-                # number instead of -1. It looks like a bug with PyPy.
-                if PYPY:
-                    continue
-                self.assertEqual(p.rlimit(value), resource.getrlimit(value))
-            else:
-                ret = p.rlimit(value)
-                self.assertEqual(len(ret), 2)
-                self.assertGreaterEqual(ret[0], -1)
-                self.assertGreaterEqual(ret[1], -1)
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_set(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.rlimit(psutil.RLIMIT_NOFILE, (5, 5))
-        self.assertEqual(p.rlimit(psutil.RLIMIT_NOFILE), (5, 5))
-        # If pid is 0 prlimit() applies to the calling process and
-        # we don't want that.
-        with self.assertRaises(ValueError):
-            psutil._psplatform.Process(0).rlimit(0)
-        with self.assertRaises(ValueError):
-            p.rlimit(psutil.RLIMIT_NOFILE, (5, 5, 5))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit(self):
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        try:
-            p.rlimit(psutil.RLIMIT_FSIZE, (1024, hard))
-            with open(TESTFN, "wb") as f:
-                f.write(b"X" * 1024)
-            # write() or flush() doesn't always cause the exception
-            # but close() will.
-            with self.assertRaises(IOError) as exc:
-                with open(TESTFN, "wb") as f:
-                    f.write(b"X" * 1025)
-            self.assertEqual(exc.exception.errno if PY3 else exc.exception[0],
-                             errno.EFBIG)
-        finally:
-            p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-            self.assertEqual(p.rlimit(psutil.RLIMIT_FSIZE), (soft, hard))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_infinity(self):
-        # First set a limit, then re-set it by specifying INFINITY
-        # and assume we overridden the previous limit.
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        try:
-            p.rlimit(psutil.RLIMIT_FSIZE, (1024, hard))
-            p.rlimit(psutil.RLIMIT_FSIZE, (psutil.RLIM_INFINITY, hard))
-            with open(TESTFN, "wb") as f:
-                f.write(b"X" * 2048)
-        finally:
-            p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-            self.assertEqual(p.rlimit(psutil.RLIMIT_FSIZE), (soft, hard))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_infinity_value(self):
-        # RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really
-        # big number on a platform with large file support.  On these
-        # platforms we need to test that the get/setrlimit functions
-        # properly convert the number to a C long long and that the
-        # conversion doesn't raise an error.
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        self.assertEqual(psutil.RLIM_INFINITY, hard)
-        p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-
-    def test_num_threads(self):
-        # on certain platforms such as Linux we might test for exact
-        # thread number, since we always have with 1 thread per process,
-        # but this does not apply across all platforms (MACOS, Windows)
-        p = psutil.Process()
-        if OPENBSD:
-            try:
-                step1 = p.num_threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest("on OpenBSD this requires root access")
-        else:
-            step1 = p.num_threads()
-
-        with ThreadTask():
-            step2 = p.num_threads()
-            self.assertEqual(step2, step1 + 1)
-
-    @unittest.skipIf(not WINDOWS, 'WINDOWS only')
-    def test_num_handles(self):
-        # a better test is done later into test/_windows.py
-        p = psutil.Process()
-        self.assertGreater(p.num_handles(), 0)
-
-    @unittest.skipIf(not HAS_THREADS, 'not supported')
-    def test_threads(self):
-        p = psutil.Process()
-        if OPENBSD:
-            try:
-                step1 = p.threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest("on OpenBSD this requires root access")
-        else:
-            step1 = p.threads()
-
-        with ThreadTask():
-            step2 = p.threads()
-            self.assertEqual(len(step2), len(step1) + 1)
-            athread = step2[0]
-            # test named tuple
-            self.assertEqual(athread.id, athread[0])
-            self.assertEqual(athread.user_time, athread[1])
-            self.assertEqual(athread.system_time, athread[2])
-
-    @retry_on_failure()
-    @skip_on_access_denied(only_if=MACOS)
-    @unittest.skipIf(not HAS_THREADS, 'not supported')
-    def test_threads_2(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        if OPENBSD:
-            try:
-                p.threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest(
-                    "on OpenBSD this requires root access")
-        self.assertAlmostEqual(
-            p.cpu_times().user,
-            sum([x.user_time for x in p.threads()]), delta=0.1)
-        self.assertAlmostEqual(
-            p.cpu_times().system,
-            sum([x.system_time for x in p.threads()]), delta=0.1)
-
-    def test_memory_info(self):
-        p = psutil.Process()
-
-        # step 1 - get a base value to compare our results
-        rss1, vms1 = p.memory_info()[:2]
-        percent1 = p.memory_percent()
-        self.assertGreater(rss1, 0)
-        self.assertGreater(vms1, 0)
-
-        # step 2 - allocate some memory
-        memarr = [None] * 1500000
-
-        rss2, vms2 = p.memory_info()[:2]
-        percent2 = p.memory_percent()
-
-        # step 3 - make sure that the memory usage bumped up
-        self.assertGreater(rss2, rss1)
-        self.assertGreaterEqual(vms2, vms1)  # vms might be equal
-        self.assertGreater(percent2, percent1)
-        del memarr
-
-        if WINDOWS:
-            mem = p.memory_info()
-            self.assertEqual(mem.rss, mem.wset)
-            self.assertEqual(mem.vms, mem.pagefile)
-
-        mem = p.memory_info()
-        for name in mem._fields:
-            self.assertGreaterEqual(getattr(mem, name), 0)
-
-    def test_memory_full_info(self):
-        total = psutil.virtual_memory().total
-        mem = psutil.Process().memory_full_info()
-        for name in mem._fields:
-            value = getattr(mem, name)
-            self.assertGreaterEqual(value, 0, msg=(name, value))
-            if name == 'vms' and OSX or LINUX:
-                continue
-            self.assertLessEqual(value, total, msg=(name, value, total))
-        if LINUX or WINDOWS or MACOS:
-            self.assertGreaterEqual(mem.uss, 0)
-        if LINUX:
-            self.assertGreaterEqual(mem.pss, 0)
-            self.assertGreaterEqual(mem.swap, 0)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_memory_maps(self):
-        p = psutil.Process()
-        maps = p.memory_maps()
-        paths = [x for x in maps]
-        self.assertEqual(len(paths), len(set(paths)))
-        ext_maps = p.memory_maps(grouped=False)
-
-        for nt in maps:
-            if not nt.path.startswith('['):
-                assert os.path.isabs(nt.path), nt.path
-                if POSIX:
-                    try:
-                        assert os.path.exists(nt.path) or \
-                            os.path.islink(nt.path), nt.path
-                    except AssertionError:
-                        if not LINUX:
-                            raise
-                        else:
-                            # https://github.com/giampaolo/psutil/issues/759
-                            with open_text('/proc/self/smaps') as f:
-                                data = f.read()
-                            if "%s (deleted)" % nt.path not in data:
-                                raise
-                else:
-                    # XXX - On Windows we have this strange behavior with
-                    # 64 bit dlls: they are visible via explorer but cannot
-                    # be accessed via os.stat() (wtf?).
-                    if '64' not in os.path.basename(nt.path):
-                        assert os.path.exists(nt.path), nt.path
-        for nt in ext_maps:
-            for fname in nt._fields:
-                value = getattr(nt, fname)
-                if fname == 'path':
-                    continue
-                elif fname in ('addr', 'perms'):
-                    assert value, value
-                else:
-                    self.assertIsInstance(value, (int, long))
-                    assert value >= 0, value
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_memory_maps_lists_lib(self):
-        # Make sure a newly loaded shared lib is listed.
-        with copyload_shared_lib() as path:
-            def normpath(p):
-                return os.path.realpath(os.path.normcase(p))
-            libpaths = [normpath(x.path)
-                        for x in psutil.Process().memory_maps()]
-            self.assertIn(normpath(path), libpaths)
-
-    def test_memory_percent(self):
-        p = psutil.Process()
-        p.memory_percent()
-        self.assertRaises(ValueError, p.memory_percent, memtype="?!?")
-        if LINUX or MACOS or WINDOWS:
-            p.memory_percent(memtype='uss')
-
-    def test_is_running(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        assert p.is_running()
-        assert p.is_running()
-        p.kill()
-        p.wait()
-        assert not p.is_running()
-        assert not p.is_running()
-
-    def test_exe(self):
-        sproc = get_test_subprocess()
-        exe = psutil.Process(sproc.pid).exe()
-        try:
-            self.assertEqual(exe, PYTHON_EXE)
-        except AssertionError:
-            if WINDOWS and len(exe) == len(PYTHON_EXE):
-                # on Windows we don't care about case sensitivity
-                normcase = os.path.normcase
-                self.assertEqual(normcase(exe), normcase(PYTHON_EXE))
-            else:
-                # certain platforms such as BSD are more accurate returning:
-                # "/usr/local/bin/python2.7"
-                # ...instead of:
-                # "/usr/local/bin/python"
-                # We do not want to consider this difference in accuracy
-                # an error.
-                ver = "%s.%s" % (sys.version_info[0], sys.version_info[1])
-                try:
-                    self.assertEqual(exe.replace(ver, ''),
-                                     PYTHON_EXE.replace(ver, ''))
-                except AssertionError:
-                    # Tipically MACOS. Really not sure what to do here.
-                    pass
-
-        out = sh([exe, "-c", "import os; print('hey')"])
-        self.assertEqual(out, 'hey')
-
-    def test_cmdline(self):
-        cmdline = [PYTHON_EXE, "-c", "import time; time.sleep(60)"]
-        sproc = get_test_subprocess(cmdline)
-        try:
-            self.assertEqual(' '.join(psutil.Process(sproc.pid).cmdline()),
-                             ' '.join(cmdline))
-        except AssertionError:
-            # XXX - most of the times the underlying sysctl() call on Net
-            # and Open BSD returns a truncated string.
-            # Also /proc/pid/cmdline behaves the same so it looks
-            # like this is a kernel bug.
-            # XXX - AIX truncates long arguments in /proc/pid/cmdline
-            if NETBSD or OPENBSD or AIX:
-                self.assertEqual(
-                    psutil.Process(sproc.pid).cmdline()[0], PYTHON_EXE)
-            else:
-                raise
-
-    @unittest.skipIf(PYPY, "broken on PYPY")
-    def test_long_cmdline(self):
-        create_exe(TESTFN)
-        self.addCleanup(safe_rmpath, TESTFN)
-        cmdline = [TESTFN] + (["0123456789"] * 20)
-        sproc = get_test_subprocess(cmdline)
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.cmdline(), cmdline)
-
-    def test_name(self):
-        sproc = get_test_subprocess(PYTHON_EXE)
-        name = psutil.Process(sproc.pid).name().lower()
-        pyexe = os.path.basename(os.path.realpath(sys.executable)).lower()
-        assert pyexe.startswith(name), (pyexe, name)
-
-    @unittest.skipIf(PYPY, "unreliable on PYPY")
-    def test_long_name(self):
-        long_name = TESTFN + ("0123456789" * 2)
-        create_exe(long_name)
-        self.addCleanup(safe_rmpath, long_name)
-        sproc = get_test_subprocess(long_name)
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.name(), os.path.basename(long_name))
-
-    # XXX
-    @unittest.skipIf(SUNOS, "broken on SUNOS")
-    @unittest.skipIf(AIX, "broken on AIX")
-    @unittest.skipIf(PYPY, "broken on PYPY")
-    def test_prog_w_funky_name(self):
-        # Test that name(), exe() and cmdline() correctly handle programs
-        # with funky chars such as spaces and ")", see:
-        # https://github.com/giampaolo/psutil/issues/628
-
-        def rm():
-            # Try to limit occasional failures on Appveyor:
-            # https://ci.appveyor.com/project/giampaolo/psutil/build/1350/
-            #     job/lbo3bkju55le850n
-            try:
-                safe_rmpath(funky_path)
-            except OSError:
-                pass
-
-        funky_path = TESTFN + 'foo bar )'
-        create_exe(funky_path)
-        self.addCleanup(rm)
-        cmdline = [funky_path, "-c",
-                   "import time; [time.sleep(0.01) for x in range(3000)];"
-                   "arg1", "arg2", "", "arg3", ""]
-        sproc = get_test_subprocess(cmdline)
-        p = psutil.Process(sproc.pid)
-        # ...in order to try to prevent occasional failures on travis
-        if TRAVIS:
-            wait_for_pid(p.pid)
-        self.assertEqual(p.cmdline(), cmdline)
-        self.assertEqual(p.name(), os.path.basename(funky_path))
-        self.assertEqual(os.path.normcase(p.exe()),
-                         os.path.normcase(funky_path))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_uids(self):
-        p = psutil.Process()
-        real, effective, saved = p.uids()
-        # os.getuid() refers to "real" uid
-        self.assertEqual(real, os.getuid())
-        # os.geteuid() refers to "effective" uid
-        self.assertEqual(effective, os.geteuid())
-        # No such thing as os.getsuid() ("saved" uid), but starting
-        # from python 2.7 we have os.getresuid() which returns all
-        # of them.
-        if hasattr(os, "getresuid"):
-            self.assertEqual(os.getresuid(), p.uids())
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_gids(self):
-        p = psutil.Process()
-        real, effective, saved = p.gids()
-        # os.getuid() refers to "real" uid
-        self.assertEqual(real, os.getgid())
-        # os.geteuid() refers to "effective" uid
-        self.assertEqual(effective, os.getegid())
-        # No such thing as os.getsgid() ("saved" gid), but starting
-        # from python 2.7 we have os.getresgid() which returns all
-        # of them.
-        if hasattr(os, "getresuid"):
-            self.assertEqual(os.getresgid(), p.gids())
-
-    def test_nice(self):
-        p = psutil.Process()
-        self.assertRaises(TypeError, p.nice, "str")
-        if WINDOWS:
-            try:
-                init = p.nice()
-                if sys.version_info > (3, 4):
-                    self.assertIsInstance(init, enum.IntEnum)
-                else:
-                    self.assertIsInstance(init, int)
-                self.assertEqual(init, psutil.NORMAL_PRIORITY_CLASS)
-                p.nice(psutil.HIGH_PRIORITY_CLASS)
-                self.assertEqual(p.nice(), psutil.HIGH_PRIORITY_CLASS)
-                p.nice(psutil.NORMAL_PRIORITY_CLASS)
-                self.assertEqual(p.nice(), psutil.NORMAL_PRIORITY_CLASS)
-            finally:
-                p.nice(psutil.NORMAL_PRIORITY_CLASS)
-        else:
-            first_nice = p.nice()
-            try:
-                if hasattr(os, "getpriority"):
-                    self.assertEqual(
-                        os.getpriority(os.PRIO_PROCESS, os.getpid()), p.nice())
-                p.nice(1)
-                self.assertEqual(p.nice(), 1)
-                if hasattr(os, "getpriority"):
-                    self.assertEqual(
-                        os.getpriority(os.PRIO_PROCESS, os.getpid()), p.nice())
-                # XXX - going back to previous nice value raises
-                # AccessDenied on MACOS
-                if not MACOS:
-                    p.nice(0)
-                    self.assertEqual(p.nice(), 0)
-            except psutil.AccessDenied:
-                pass
-            finally:
-                try:
-                    p.nice(first_nice)
-                except psutil.AccessDenied:
-                    pass
-
-    def test_status(self):
-        p = psutil.Process()
-        self.assertEqual(p.status(), psutil.STATUS_RUNNING)
-
-    def test_username(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        username = p.username()
-        if WINDOWS:
-            domain, username = username.split('\\')
-            self.assertEqual(username, getpass.getuser())
-            if 'USERDOMAIN' in os.environ:
-                self.assertEqual(domain, os.environ['USERDOMAIN'])
-        else:
-            self.assertEqual(username, getpass.getuser())
-
-    def test_cwd(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_cwd_2(self):
-        cmd = [PYTHON_EXE, "-c",
-               "import os, time; os.chdir('..'); time.sleep(60)"]
-        sproc = get_test_subprocess(cmd)
-        p = psutil.Process(sproc.pid)
-        call_until(p.cwd, "ret == os.path.dirname(os.getcwd())")
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity(self):
-        p = psutil.Process()
-        initial = p.cpu_affinity()
-        assert initial, initial
-        self.addCleanup(p.cpu_affinity, initial)
-
-        if hasattr(os, "sched_getaffinity"):
-            self.assertEqual(initial, list(os.sched_getaffinity(p.pid)))
-        self.assertEqual(len(initial), len(set(initial)))
-
-        all_cpus = list(range(len(psutil.cpu_percent(percpu=True))))
-        # Work around travis failure:
-        # https://travis-ci.org/giampaolo/psutil/builds/284173194
-        for n in all_cpus if not TRAVIS else initial:
-            p.cpu_affinity([n])
-            self.assertEqual(p.cpu_affinity(), [n])
-            if hasattr(os, "sched_getaffinity"):
-                self.assertEqual(p.cpu_affinity(),
-                                 list(os.sched_getaffinity(p.pid)))
-            # also test num_cpu()
-            if hasattr(p, "num_cpu"):
-                self.assertEqual(p.cpu_affinity()[0], p.num_cpu())
-
-        # [] is an alias for "all eligible CPUs"; on Linux this may
-        # not be equal to all available CPUs, see:
-        # https://github.com/giampaolo/psutil/issues/956
-        p.cpu_affinity([])
-        if LINUX:
-            self.assertEqual(p.cpu_affinity(), p._proc._get_eligible_cpus())
-        else:
-            self.assertEqual(p.cpu_affinity(), all_cpus)
-        if hasattr(os, "sched_getaffinity"):
-            self.assertEqual(p.cpu_affinity(),
-                             list(os.sched_getaffinity(p.pid)))
-        #
-        self.assertRaises(TypeError, p.cpu_affinity, 1)
-        p.cpu_affinity(initial)
-        # it should work with all iterables, not only lists
-        if not TRAVIS:
-            p.cpu_affinity(set(all_cpus))
-            p.cpu_affinity(tuple(all_cpus))
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity_errs(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        invalid_cpu = [len(psutil.cpu_times(percpu=True)) + 10]
-        self.assertRaises(ValueError, p.cpu_affinity, invalid_cpu)
-        self.assertRaises(ValueError, p.cpu_affinity, range(10000, 11000))
-        self.assertRaises(TypeError, p.cpu_affinity, [0, "1"])
-        self.assertRaises(ValueError, p.cpu_affinity, [0, -1])
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity_all_combinations(self):
-        p = psutil.Process()
-        initial = p.cpu_affinity()
-        assert initial, initial
-        self.addCleanup(p.cpu_affinity, initial)
-
-        # All possible CPU set combinations.
-        if len(initial) > 12:
-            initial = initial[:12]  # ...otherwise it will take forever
-        combos = []
-        for l in range(0, len(initial) + 1):
-            for subset in itertools.combinations(initial, l):
-                if subset:
-                    combos.append(list(subset))
-
-        for combo in combos:
-            p.cpu_affinity(combo)
-            self.assertEqual(p.cpu_affinity(), combo)
-
-    # TODO: #595
-    @unittest.skipIf(BSD, "broken on BSD")
-    # can't find any process file on Appveyor
-    @unittest.skipIf(APPVEYOR, "unreliable on APPVEYOR")
-    def test_open_files(self):
-        # current process
-        p = psutil.Process()
-        files = p.open_files()
-        self.assertFalse(TESTFN in files)
-        with open(TESTFN, 'wb') as f:
-            f.write(b'x' * 1024)
-            f.flush()
-            # give the kernel some time to see the new file
-            files = call_until(p.open_files, "len(ret) != %i" % len(files))
-            filenames = [os.path.normcase(x.path) for x in files]
-            self.assertIn(os.path.normcase(TESTFN), filenames)
-            if LINUX:
-                for file in files:
-                    if file.path == TESTFN:
-                        self.assertEqual(file.position, 1024)
-        for file in files:
-            assert os.path.isfile(file.path), file
-
-        # another process
-        cmdline = "import time; f = open(r'%s', 'r'); time.sleep(60);" % TESTFN
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", cmdline])
-        p = psutil.Process(sproc.pid)
-
-        for x in range(100):
-            filenames = [os.path.normcase(x.path) for x in p.open_files()]
-            if TESTFN in filenames:
-                break
-            time.sleep(.01)
-        else:
-            self.assertIn(os.path.normcase(TESTFN), filenames)
-        for file in filenames:
-            assert os.path.isfile(file), file
-
-    # TODO: #595
-    @unittest.skipIf(BSD, "broken on BSD")
-    # can't find any process file on Appveyor
-    @unittest.skipIf(APPVEYOR, "unreliable on APPVEYOR")
-    def test_open_files_2(self):
-        # test fd and path fields
-        normcase = os.path.normcase
-        with open(TESTFN, 'w') as fileobj:
-            p = psutil.Process()
-            for file in p.open_files():
-                if normcase(file.path) == normcase(fileobj.name) or \
-                        file.fd == fileobj.fileno():
-                    break
-            else:
-                self.fail("no file found; files=%s" % repr(p.open_files()))
-            self.assertEqual(normcase(file.path), normcase(fileobj.name))
-            if WINDOWS:
-                self.assertEqual(file.fd, -1)
-            else:
-                self.assertEqual(file.fd, fileobj.fileno())
-            # test positions
-            ntuple = p.open_files()[0]
-            self.assertEqual(ntuple[0], ntuple.path)
-            self.assertEqual(ntuple[1], ntuple.fd)
-            # test file is gone
-            self.assertNotIn(fileobj.name, p.open_files())
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_num_fds(self):
-        p = psutil.Process()
-        start = p.num_fds()
-        file = open(TESTFN, 'w')
-        self.addCleanup(file.close)
-        self.assertEqual(p.num_fds(), start + 1)
-        sock = socket.socket()
-        self.addCleanup(sock.close)
-        self.assertEqual(p.num_fds(), start + 2)
-        file.close()
-        sock.close()
-        self.assertEqual(p.num_fds(), start)
-
-    @skip_on_not_implemented(only_if=LINUX)
-    @unittest.skipIf(OPENBSD or NETBSD, "not reliable on OPENBSD & NETBSD")
-    def test_num_ctx_switches(self):
-        p = psutil.Process()
-        before = sum(p.num_ctx_switches())
-        for x in range(500000):
-            after = sum(p.num_ctx_switches())
-            if after > before:
-                return
-        self.fail("num ctx switches still the same after 50.000 iterations")
-
-    def test_ppid(self):
-        if hasattr(os, 'getppid'):
-            self.assertEqual(psutil.Process().ppid(), os.getppid())
-        this_parent = os.getpid()
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.ppid(), this_parent)
-        # no other process is supposed to have us as parent
-        reap_children(recursive=True)
-        if APPVEYOR:
-            # Occasional failures, see:
-            # https://ci.appveyor.com/project/giampaolo/psutil/build/
-            #     job/0hs623nenj7w4m33
-            return
-        for p in psutil.process_iter():
-            if p.pid == sproc.pid:
-                continue
-            # XXX: sometimes this fails on Windows; not sure why.
-            self.assertNotEqual(p.ppid(), this_parent, msg=p)
-
-    def test_parent(self):
-        this_parent = os.getpid()
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.parent().pid, this_parent)
-
-        lowest_pid = psutil.pids()[0]
-        self.assertIsNone(psutil.Process(lowest_pid).parent())
-
-    def test_parent_multi(self):
-        p1, p2 = create_proc_children_pair()
-        self.assertEqual(p2.parent(), p1)
-        self.assertEqual(p1.parent(), psutil.Process())
-
-    def test_parent_disappeared(self):
-        # Emulate a case where the parent process disappeared.
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        with mock.patch("psutil.Process",
-                        side_effect=psutil.NoSuchProcess(0, 'foo')):
-            self.assertIsNone(p.parent())
-
-    @retry_on_failure()
-    def test_parents(self):
-        assert psutil.Process().parents()
-        p1, p2 = create_proc_children_pair()
-        self.assertEqual(p1.parents()[0], psutil.Process())
-        self.assertEqual(p2.parents()[0], p1)
-        self.assertEqual(p2.parents()[1], psutil.Process())
-
-    def test_children(self):
-        reap_children(recursive=True)
-        p = psutil.Process()
-        self.assertEqual(p.children(), [])
-        self.assertEqual(p.children(recursive=True), [])
-        # On Windows we set the flag to 0 in order to cancel out the
-        # CREATE_NO_WINDOW flag (enabled by default) which creates
-        # an extra "conhost.exe" child.
-        sproc = get_test_subprocess(creationflags=0)
-        children1 = p.children()
-        children2 = p.children(recursive=True)
-        for children in (children1, children2):
-            self.assertEqual(len(children), 1)
-            self.assertEqual(children[0].pid, sproc.pid)
-            self.assertEqual(children[0].ppid(), os.getpid())
-
-    def test_children_recursive(self):
-        # Test children() against two sub processes, p1 and p2, where
-        # p1 (our child) spawned p2 (our grandchild).
-        p1, p2 = create_proc_children_pair()
-        p = psutil.Process()
-        self.assertEqual(p.children(), [p1])
-        self.assertEqual(p.children(recursive=True), [p1, p2])
-        # If the intermediate process is gone there's no way for
-        # children() to recursively find it.
-        p1.terminate()
-        p1.wait()
-        self.assertEqual(p.children(recursive=True), [])
-
-    def test_children_duplicates(self):
-        # find the process which has the highest number of children
-        table = collections.defaultdict(int)
-        for p in psutil.process_iter():
-            try:
-                table[p.ppid()] += 1
-            except psutil.Error:
-                pass
-        # this is the one, now let's make sure there are no duplicates
-        pid = sorted(table.items(), key=lambda x: x[1])[-1][0]
-        p = psutil.Process(pid)
-        try:
-            c = p.children(recursive=True)
-        except psutil.AccessDenied:  # windows
-            pass
-        else:
-            self.assertEqual(len(c), len(set(c)))
-
-    def test_parents_and_children(self):
-        p1, p2 = create_proc_children_pair()
-        me = psutil.Process()
-        # forward
-        children = me.children(recursive=True)
-        self.assertEqual(len(children), 2)
-        self.assertEqual(children[0], p1)
-        self.assertEqual(children[1], p2)
-        # backward
-        parents = p2.parents()
-        self.assertEqual(parents[0], p1)
-        self.assertEqual(parents[1], me)
-
-    def test_suspend_resume(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.suspend()
-        for x in range(100):
-            if p.status() == psutil.STATUS_STOPPED:
-                break
-            time.sleep(0.01)
-        p.resume()
-        self.assertNotEqual(p.status(), psutil.STATUS_STOPPED)
-
-    def test_invalid_pid(self):
-        self.assertRaises(TypeError, psutil.Process, "1")
-        self.assertRaises(ValueError, psutil.Process, -1)
-
-    def test_as_dict(self):
-        p = psutil.Process()
-        d = p.as_dict(attrs=['exe', 'name'])
-        self.assertEqual(sorted(d.keys()), ['exe', 'name'])
-
-        p = psutil.Process(min(psutil.pids()))
-        d = p.as_dict(attrs=['connections'], ad_value='foo')
-        if not isinstance(d['connections'], list):
-            self.assertEqual(d['connections'], 'foo')
-
-        # Test ad_value is set on AccessDenied.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.AccessDenied):
-            self.assertEqual(
-                p.as_dict(attrs=["nice"], ad_value=1), {"nice": 1})
-
-        # Test that NoSuchProcess bubbles up.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.NoSuchProcess(p.pid, "name")):
-            self.assertRaises(
-                psutil.NoSuchProcess, p.as_dict, attrs=["nice"])
-
-        # Test that ZombieProcess is swallowed.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.ZombieProcess(p.pid, "name")):
-            self.assertEqual(
-                p.as_dict(attrs=["nice"], ad_value="foo"), {"nice": "foo"})
-
-        # By default APIs raising NotImplementedError are
-        # supposed to be skipped.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=NotImplementedError):
-            d = p.as_dict()
-            self.assertNotIn('nice', list(d.keys()))
-            # ...unless the user explicitly asked for some attr.
-            with self.assertRaises(NotImplementedError):
-                p.as_dict(attrs=["nice"])
-
-        # errors
-        with self.assertRaises(TypeError):
-            p.as_dict('name')
-        with self.assertRaises(ValueError):
-            p.as_dict(['foo'])
-        with self.assertRaises(ValueError):
-            p.as_dict(['foo', 'bar'])
-
-    def test_oneshot(self):
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p = psutil.Process()
-            with p.oneshot():
-                p.cpu_times()
-                p.cpu_times()
-            self.assertEqual(m.call_count, 1)
-
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p.cpu_times()
-            p.cpu_times()
-        self.assertEqual(m.call_count, 2)
-
-    def test_oneshot_twice(self):
-        # Test the case where the ctx manager is __enter__ed twice.
-        # The second __enter__ is supposed to resut in a NOOP.
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m1:
-            with mock.patch("psutil._psplatform.Process.oneshot_enter") as m2:
-                p = psutil.Process()
-                with p.oneshot():
-                    p.cpu_times()
-                    p.cpu_times()
-                    with p.oneshot():
-                        p.cpu_times()
-                        p.cpu_times()
-                self.assertEqual(m1.call_count, 1)
-                self.assertEqual(m2.call_count, 1)
-
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p.cpu_times()
-            p.cpu_times()
-        self.assertEqual(m.call_count, 2)
-
-    def test_oneshot_cache(self):
-        # Make sure oneshot() cache is nonglobal. Instead it's
-        # supposed to be bound to the Process instance, see:
-        # https://github.com/giampaolo/psutil/issues/1373
-        p1, p2 = create_proc_children_pair()
-        p1_ppid = p1.ppid()
-        p2_ppid = p2.ppid()
-        self.assertNotEqual(p1_ppid, p2_ppid)
-        with p1.oneshot():
-            self.assertEqual(p1.ppid(), p1_ppid)
-            self.assertEqual(p2.ppid(), p2_ppid)
-        with p2.oneshot():
-            self.assertEqual(p1.ppid(), p1_ppid)
-            self.assertEqual(p2.ppid(), p2_ppid)
-
-    def test_halfway_terminated_process(self):
-        # Test that NoSuchProcess exception gets raised in case the
-        # process dies after we create the Process object.
-        # Example:
-        # >>> proc = Process(1234)
-        # >>> time.sleep(2)  # time-consuming task, process dies in meantime
-        # >>> proc.name()
-        # Refers to Issue #15
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.terminate()
-        p.wait()
-        if WINDOWS:
-            call_until(psutil.pids, "%s not in ret" % p.pid)
-        assert not p.is_running()
-
-        if WINDOWS:
-            with self.assertRaises(psutil.NoSuchProcess):
-                p.send_signal(signal.CTRL_C_EVENT)
-            with self.assertRaises(psutil.NoSuchProcess):
-                p.send_signal(signal.CTRL_BREAK_EVENT)
-
-        excluded_names = ['pid', 'is_running', 'wait', 'create_time',
-                          'oneshot', 'memory_info_ex']
-        if LINUX and not HAS_RLIMIT:
-            excluded_names.append('rlimit')
-        for name in dir(p):
-            if (name.startswith('_') or
-                    name in excluded_names):
-                continue
-            try:
-                meth = getattr(p, name)
-                # get/set methods
-                if name == 'nice':
-                    if POSIX:
-                        ret = meth(1)
-                    else:
-                        ret = meth(psutil.NORMAL_PRIORITY_CLASS)
-                elif name == 'ionice':
-                    ret = meth()
-                    ret = meth(2)
-                elif name == 'rlimit':
-                    ret = meth(psutil.RLIMIT_NOFILE)
-                    ret = meth(psutil.RLIMIT_NOFILE, (5, 5))
-                elif name == 'cpu_affinity':
-                    ret = meth()
-                    ret = meth([0])
-                elif name == 'send_signal':
-                    ret = meth(signal.SIGTERM)
-                else:
-                    ret = meth()
-            except psutil.ZombieProcess:
-                self.fail("ZombieProcess for %r was not supposed to happen" %
-                          name)
-            except psutil.NoSuchProcess:
-                pass
-            except psutil.AccessDenied:
-                if OPENBSD and name in ('threads', 'num_threads'):
-                    pass
-                else:
-                    raise
-            except NotImplementedError:
-                pass
-            else:
-                # NtQuerySystemInformation succeeds if process is gone.
-                if WINDOWS and name in ('exe', 'name'):
-                    normcase = os.path.normcase
-                    if name == 'exe':
-                        self.assertEqual(normcase(ret), normcase(PYTHON_EXE))
-                    else:
-                        self.assertEqual(
-                            normcase(ret),
-                            normcase(os.path.basename(PYTHON_EXE)))
-                    continue
-                self.fail(
-                    "NoSuchProcess exception not raised for %r, retval=%s" % (
-                        name, ret))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process(self):
-        def succeed_or_zombie_p_exc(fun, *args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except (psutil.ZombieProcess, psutil.AccessDenied):
-                pass
-
-        zpid = create_zombie_proc()
-        self.addCleanup(reap_children, recursive=True)
-        # A zombie process should always be instantiable
-        zproc = psutil.Process(zpid)
-        # ...and at least its status always be querable
-        self.assertEqual(zproc.status(), psutil.STATUS_ZOMBIE)
-        # ...and it should be considered 'running'
-        self.assertTrue(zproc.is_running())
-        # ...and as_dict() shouldn't crash
-        zproc.as_dict()
-        # if cmdline succeeds it should be an empty list
-        ret = succeed_or_zombie_p_exc(zproc.suspend)
-        if ret is not None:
-            self.assertEqual(ret, [])
-
-        if hasattr(zproc, "rlimit"):
-            succeed_or_zombie_p_exc(zproc.rlimit, psutil.RLIMIT_NOFILE)
-            succeed_or_zombie_p_exc(zproc.rlimit, psutil.RLIMIT_NOFILE,
-                                    (5, 5))
-        # set methods
-        succeed_or_zombie_p_exc(zproc.parent)
-        if hasattr(zproc, 'cpu_affinity'):
-            try:
-                succeed_or_zombie_p_exc(zproc.cpu_affinity, [0])
-            except ValueError as err:
-                if TRAVIS and LINUX and "not eligible" in str(err):
-                    # https://travis-ci.org/giampaolo/psutil/jobs/279890461
-                    pass
-                else:
-                    raise
-
-        succeed_or_zombie_p_exc(zproc.nice, 0)
-        if hasattr(zproc, 'ionice'):
-            if LINUX:
-                succeed_or_zombie_p_exc(zproc.ionice, 2, 0)
-            else:
-                succeed_or_zombie_p_exc(zproc.ionice, 0)  # Windows
-        if hasattr(zproc, 'rlimit'):
-            succeed_or_zombie_p_exc(zproc.rlimit,
-                                    psutil.RLIMIT_NOFILE, (5, 5))
-        succeed_or_zombie_p_exc(zproc.suspend)
-        succeed_or_zombie_p_exc(zproc.resume)
-        succeed_or_zombie_p_exc(zproc.terminate)
-        succeed_or_zombie_p_exc(zproc.kill)
-
-        # ...its parent should 'see' it
-        # edit: not true on BSD and MACOS
-        # descendants = [x.pid for x in psutil.Process().children(
-        #                recursive=True)]
-        # self.assertIn(zpid, descendants)
-        # XXX should we also assume ppid be usable?  Note: this
-        # would be an important use case as the only way to get
-        # rid of a zombie is to kill its parent.
-        # self.assertEqual(zpid.ppid(), os.getpid())
-        # ...and all other APIs should be able to deal with it
-        self.assertTrue(psutil.pid_exists(zpid))
-        if not TRAVIS and MACOS:
-            # For some reason this started failing all of the sudden.
-            # Maybe they upgraded MACOS version?
-            # https://travis-ci.org/giampaolo/psutil/jobs/310896404
-            self.assertIn(zpid, psutil.pids())
-            self.assertIn(zpid, [x.pid for x in psutil.process_iter()])
-            psutil._pmap = {}
-            self.assertIn(zpid, [x.pid for x in psutil.process_iter()])
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process_is_running_w_exc(self):
-        # Emulate a case where internally is_running() raises
-        # ZombieProcess.
-        p = psutil.Process()
-        with mock.patch("psutil.Process",
-                        side_effect=psutil.ZombieProcess(0)) as m:
-            assert p.is_running()
-            assert m.called
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process_status_w_exc(self):
-        # Emulate a case where internally status() raises
-        # ZombieProcess.
-        p = psutil.Process()
-        with mock.patch("psutil._psplatform.Process.status",
-                        side_effect=psutil.ZombieProcess(0)) as m:
-            self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-            assert m.called
-
-    def test_pid_0(self):
-        # Process(0) is supposed to work on all platforms except Linux
-        if 0 not in psutil.pids():
-            self.assertRaises(psutil.NoSuchProcess, psutil.Process, 0)
-            return
-
-        # test all methods
-        p = psutil.Process(0)
-        for name in psutil._as_dict_attrnames:
-            if name == 'pid':
-                continue
-            meth = getattr(p, name)
-            try:
-                ret = meth()
-            except psutil.AccessDenied:
-                pass
-            else:
-                if name in ("uids", "gids"):
-                    self.assertEqual(ret.real, 0)
-                elif name == "username":
-                    if POSIX:
-                        self.assertEqual(p.username(), 'root')
-                    elif WINDOWS:
-                        self.assertEqual(p.username(), 'NT AUTHORITY\\SYSTEM')
-                elif name == "name":
-                    assert name, name
-
-        if hasattr(p, 'rlimit'):
-            try:
-                p.rlimit(psutil.RLIMIT_FSIZE)
-            except psutil.AccessDenied:
-                pass
-
-        p.as_dict()
-
-        if not OPENBSD:
-            self.assertIn(0, psutil.pids())
-            self.assertTrue(psutil.pid_exists(0))
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    def test_environ(self):
-        def clean_dict(d):
-            # Most of these are problematic on Travis.
-            d.pop("PSUTIL_TESTING", None)
-            d.pop("PLAT", None)
-            d.pop("HOME", None)
-            if MACOS:
-                d.pop("__CF_USER_TEXT_ENCODING", None)
-                d.pop("VERSIONER_PYTHON_PREFER_32_BIT", None)
-                d.pop("VERSIONER_PYTHON_VERSION", None)
-            return dict(
-                [(k.replace("\r", "").replace("\n", ""),
-                  v.replace("\r", "").replace("\n", ""))
-                 for k, v in d.items()])
-
-        self.maxDiff = None
-        p = psutil.Process()
-        d1 = clean_dict(p.environ())
-        d2 = clean_dict(os.environ.copy())
-        self.assertEqual(d1, d2)
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_weird_environ(self):
-        # environment variables can contain values without an equals sign
-        code = textwrap.dedent("""
-            #include <unistd.h>
-            #include <fcntl.h>
-            char * const argv[] = {"cat", 0};
-            char * const envp[] = {"A=1", "X", "C=3", 0};
-            int main(void) {
-                /* Close stderr on exec so parent can wait for the execve to
-                 * finish. */
-                if (fcntl(2, F_SETFD, FD_CLOEXEC) != 0)
-                    return 0;
-                return execve("/bin/cat", argv, envp);
-            }
-            """)
-        path = TESTFN
-        create_exe(path, c_code=code)
-        self.addCleanup(safe_rmpath, path)
-        sproc = get_test_subprocess([path],
-                                    stdin=subprocess.PIPE,
-                                    stderr=subprocess.PIPE)
-        p = psutil.Process(sproc.pid)
-        wait_for_pid(p.pid)
-        self.assertTrue(p.is_running())
-        # Wait for process to exec or exit.
-        self.assertEqual(sproc.stderr.read(), b"")
-        self.assertEqual(p.environ(), {"A": "1", "C": "3"})
-        sproc.communicate()
-        self.assertEqual(sproc.returncode, 0)
-
-
-# ===================================================================
-# --- Limited user tests
-# ===================================================================
-
-
-if POSIX and os.getuid() == 0:
-    class LimitedUserTestCase(TestProcess):
-        """Repeat the previous tests by using a limited user.
-        Executed only on UNIX and only if the user who run the test script
-        is root.
-        """
-        # the uid/gid the test suite runs under
-        if hasattr(os, 'getuid'):
-            PROCESS_UID = os.getuid()
-            PROCESS_GID = os.getgid()
-
-        def __init__(self, *args, **kwargs):
-            TestProcess.__init__(self, *args, **kwargs)
-            # re-define all existent test methods in order to
-            # ignore AccessDenied exceptions
-            for attr in [x for x in dir(self) if x.startswith('test')]:
-                meth = getattr(self, attr)
-
-                def test_(self):
-                    try:
-                        meth()
-                    except psutil.AccessDenied:
-                        pass
-                setattr(self, attr, types.MethodType(test_, self))
-
-        def setUp(self):
-            safe_rmpath(TESTFN)
-            TestProcess.setUp(self)
-            os.setegid(1000)
-            os.seteuid(1000)
-
-        def tearDown(self):
-            os.setegid(self.PROCESS_UID)
-            os.seteuid(self.PROCESS_GID)
-            TestProcess.tearDown(self)
-
-        def test_nice(self):
-            try:
-                psutil.Process().nice(-1)
-            except psutil.AccessDenied:
-                pass
-            else:
-                self.fail("exception not raised")
-
-        def test_zombie_process(self):
-            # causes problems if test test suite is run as root
-            pass
-
-
-# ===================================================================
-# --- psutil.Popen tests
-# ===================================================================
-
-
-class TestPopen(unittest.TestCase):
-    """Tests for psutil.Popen class."""
-
-    def tearDown(self):
-        reap_children()
-
-    def test_misc(self):
-        # XXX this test causes a ResourceWarning on Python 3 because
-        # psutil.__subproc instance doesn't get propertly freed.
-        # Not sure what to do though.
-        cmd = [PYTHON_EXE, "-c", "import time; time.sleep(60);"]
-        with psutil.Popen(cmd, stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE) as proc:
-            proc.name()
-            proc.cpu_times()
-            proc.stdin
-            self.assertTrue(dir(proc))
-            self.assertRaises(AttributeError, getattr, proc, 'foo')
-            proc.terminate()
-
-    def test_ctx_manager(self):
-        with psutil.Popen([PYTHON_EXE, "-V"],
-                          stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE,
-                          stdin=subprocess.PIPE) as proc:
-            proc.communicate()
-        assert proc.stdout.closed
-        assert proc.stderr.closed
-        assert proc.stdin.closed
-        self.assertEqual(proc.returncode, 0)
-
-    def test_kill_terminate(self):
-        # subprocess.Popen()'s terminate(), kill() and send_signal() do
-        # not raise exception after the process is gone. psutil.Popen
-        # diverges from that.
-        cmd = [PYTHON_EXE, "-c", "import time; time.sleep(60);"]
-        with psutil.Popen(cmd, stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE) as proc:
-            proc.terminate()
-            proc.wait()
-            self.assertRaises(psutil.NoSuchProcess, proc.terminate)
-            self.assertRaises(psutil.NoSuchProcess, proc.kill)
-            self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                              signal.SIGTERM)
-            if WINDOWS and sys.version_info >= (2, 7):
-                self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                                  signal.CTRL_C_EVENT)
-                self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                                  signal.CTRL_BREAK_EVENT)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_sunos.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_sunos.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_sunos.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_sunos.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Sun OS specific tests."""
-
-import os
-
-import psutil
-from psutil import SUNOS
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-@unittest.skipIf(not SUNOS, "SUNOS only")
-class SunOSSpecificTestCase(unittest.TestCase):
-
-    def test_swap_memory(self):
-        out = sh('env PATH=/usr/sbin:/sbin:%s swap -l' % os.environ['PATH'])
-        lines = out.strip().split('\n')[1:]
-        if not lines:
-            raise ValueError('no swap device(s) configured')
-        total = free = 0
-        for line in lines:
-            line = line.split()
-            t, f = line[-2:]
-            total += int(int(t) * 512)
-            free += int(int(f) * 512)
-        used = total - free
-
-        psutil_swap = psutil.swap_memory()
-        self.assertEqual(psutil_swap.total, total)
-        self.assertEqual(psutil_swap.used, used)
-        self.assertEqual(psutil_swap.free, free)
-
-    def test_cpu_count(self):
-        out = sh("/usr/sbin/psrinfo")
-        self.assertEqual(psutil.cpu_count(), len(out.split('\n')))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_system.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_system.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_system.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_system.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,904 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for system APIS."""
-
-import contextlib
-import datetime
-import errno
-import os
-import pprint
-import shutil
-import signal
-import socket
-import sys
-import tempfile
-import time
-
-import psutil
-from psutil import AIX
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._compat import FileNotFoundError
-from psutil._compat import long
-from psutil.tests import ASCII_FS
-from psutil.tests import check_net_address
-from psutil.tests import CI_TESTING
-from psutil.tests import DEVNULL
-from psutil.tests import enum
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_GETLOADAVG
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import TESTFN
-from psutil.tests import TESTFN_UNICODE
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-
-
-# ===================================================================
-# --- System-related API tests
-# ===================================================================
-
-
-class TestProcessAPIs(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    def tearDown(self):
-        reap_children()
-
-    def test_process_iter(self):
-        self.assertIn(os.getpid(), [x.pid for x in psutil.process_iter()])
-        sproc = get_test_subprocess()
-        self.assertIn(sproc.pid, [x.pid for x in psutil.process_iter()])
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        p.wait()
-        self.assertNotIn(sproc.pid, [x.pid for x in psutil.process_iter()])
-
-        with mock.patch('psutil.Process',
-                        side_effect=psutil.NoSuchProcess(os.getpid())):
-            self.assertEqual(list(psutil.process_iter()), [])
-        with mock.patch('psutil.Process',
-                        side_effect=psutil.AccessDenied(os.getpid())):
-            with self.assertRaises(psutil.AccessDenied):
-                list(psutil.process_iter())
-
-    def test_prcess_iter_w_attrs(self):
-        for p in psutil.process_iter(attrs=['pid']):
-            self.assertEqual(list(p.info.keys()), ['pid'])
-        with self.assertRaises(ValueError):
-            list(psutil.process_iter(attrs=['foo']))
-        with mock.patch("psutil._psplatform.Process.cpu_times",
-                        side_effect=psutil.AccessDenied(0, "")) as m:
-            for p in psutil.process_iter(attrs=["pid", "cpu_times"]):
-                self.assertIsNone(p.info['cpu_times'])
-                self.assertGreaterEqual(p.info['pid'], 0)
-            assert m.called
-        with mock.patch("psutil._psplatform.Process.cpu_times",
-                        side_effect=psutil.AccessDenied(0, "")) as m:
-            flag = object()
-            for p in psutil.process_iter(
-                    attrs=["pid", "cpu_times"], ad_value=flag):
-                self.assertIs(p.info['cpu_times'], flag)
-                self.assertGreaterEqual(p.info['pid'], 0)
-            assert m.called
-
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "get_test_subprocess() unreliable on PYPY + WINDOWS")
-    def test_wait_procs(self):
-        def callback(p):
-            pids.append(p.pid)
-
-        pids = []
-        sproc1 = get_test_subprocess()
-        sproc2 = get_test_subprocess()
-        sproc3 = get_test_subprocess()
-        procs = [psutil.Process(x.pid) for x in (sproc1, sproc2, sproc3)]
-        self.assertRaises(ValueError, psutil.wait_procs, procs, timeout=-1)
-        self.assertRaises(TypeError, psutil.wait_procs, procs, callback=1)
-        t = time.time()
-        gone, alive = psutil.wait_procs(procs, timeout=0.01, callback=callback)
-
-        self.assertLess(time.time() - t, 0.5)
-        self.assertEqual(gone, [])
-        self.assertEqual(len(alive), 3)
-        self.assertEqual(pids, [])
-        for p in alive:
-            self.assertFalse(hasattr(p, 'returncode'))
-
-        @retry_on_failure(30)
-        def test(procs, callback):
-            gone, alive = psutil.wait_procs(procs, timeout=0.03,
-                                            callback=callback)
-            self.assertEqual(len(gone), 1)
-            self.assertEqual(len(alive), 2)
-            return gone, alive
-
-        sproc3.terminate()
-        gone, alive = test(procs, callback)
-        self.assertIn(sproc3.pid, [x.pid for x in gone])
-        if POSIX:
-            self.assertEqual(gone.pop().returncode, -signal.SIGTERM)
-        else:
-            self.assertEqual(gone.pop().returncode, 1)
-        self.assertEqual(pids, [sproc3.pid])
-        for p in alive:
-            self.assertFalse(hasattr(p, 'returncode'))
-
-        @retry_on_failure(30)
-        def test(procs, callback):
-            gone, alive = psutil.wait_procs(procs, timeout=0.03,
-                                            callback=callback)
-            self.assertEqual(len(gone), 3)
-            self.assertEqual(len(alive), 0)
-            return gone, alive
-
-        sproc1.terminate()
-        sproc2.terminate()
-        gone, alive = test(procs, callback)
-        self.assertEqual(set(pids), set([sproc1.pid, sproc2.pid, sproc3.pid]))
-        for p in gone:
-            self.assertTrue(hasattr(p, 'returncode'))
-
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "get_test_subprocess() unreliable on PYPY + WINDOWS")
-    def test_wait_procs_no_timeout(self):
-        sproc1 = get_test_subprocess()
-        sproc2 = get_test_subprocess()
-        sproc3 = get_test_subprocess()
-        procs = [psutil.Process(x.pid) for x in (sproc1, sproc2, sproc3)]
-        for p in procs:
-            p.terminate()
-        gone, alive = psutil.wait_procs(procs)
-
-    def test_pid_exists(self):
-        sproc = get_test_subprocess()
-        self.assertTrue(psutil.pid_exists(sproc.pid))
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        p.wait()
-        self.assertFalse(psutil.pid_exists(sproc.pid))
-        self.assertFalse(psutil.pid_exists(-1))
-        self.assertEqual(psutil.pid_exists(0), 0 in psutil.pids())
-
-    def test_pid_exists_2(self):
-        reap_children()
-        pids = psutil.pids()
-        for pid in pids:
-            try:
-                assert psutil.pid_exists(pid)
-            except AssertionError:
-                # in case the process disappeared in meantime fail only
-                # if it is no longer in psutil.pids()
-                time.sleep(.1)
-                if pid in psutil.pids():
-                    self.fail(pid)
-        pids = range(max(pids) + 5000, max(pids) + 6000)
-        for pid in pids:
-            self.assertFalse(psutil.pid_exists(pid), msg=pid)
-
-    def test_pids(self):
-        pidslist = psutil.pids()
-        procslist = [x.pid for x in psutil.process_iter()]
-        # make sure every pid is unique
-        self.assertEqual(sorted(set(pidslist)), pidslist)
-        self.assertEqual(pidslist, procslist)
-
-
-class TestMiscAPIs(unittest.TestCase):
-
-    def test_boot_time(self):
-        bt = psutil.boot_time()
-        self.assertIsInstance(bt, float)
-        self.assertGreater(bt, 0)
-        self.assertLess(bt, time.time())
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-    def test_users(self):
-        users = psutil.users()
-        self.assertNotEqual(users, [])
-        for user in users:
-            assert user.name, user
-            self.assertIsInstance(user.name, str)
-            self.assertIsInstance(user.terminal, (str, type(None)))
-            if user.host is not None:
-                self.assertIsInstance(user.host, (str, type(None)))
-            user.terminal
-            user.host
-            assert user.started > 0.0, user
-            datetime.datetime.fromtimestamp(user.started)
-            if WINDOWS or OPENBSD:
-                self.assertIsNone(user.pid)
-            else:
-                psutil.Process(user.pid)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_PAGESIZE(self):
-        # pagesize is used internally to perform different calculations
-        # and it's determined by using SC_PAGE_SIZE; make sure
-        # getpagesize() returns the same value.
-        import resource
-        self.assertEqual(os.sysconf("SC_PAGE_SIZE"), resource.getpagesize())
-
-    def test_test(self):
-        # test for psutil.test() function
-        stdout = sys.stdout
-        sys.stdout = DEVNULL
-        try:
-            psutil.test()
-        finally:
-            sys.stdout = stdout
-
-    def test_os_constants(self):
-        names = ["POSIX", "WINDOWS", "LINUX", "MACOS", "FREEBSD", "OPENBSD",
-                 "NETBSD", "BSD", "SUNOS"]
-        for name in names:
-            self.assertIsInstance(getattr(psutil, name), bool, msg=name)
-
-        if os.name == 'posix':
-            assert psutil.POSIX
-            assert not psutil.WINDOWS
-            names.remove("POSIX")
-            if "linux" in sys.platform.lower():
-                assert psutil.LINUX
-                names.remove("LINUX")
-            elif "bsd" in sys.platform.lower():
-                assert psutil.BSD
-                self.assertEqual([psutil.FREEBSD, psutil.OPENBSD,
-                                  psutil.NETBSD].count(True), 1)
-                names.remove("BSD")
-                names.remove("FREEBSD")
-                names.remove("OPENBSD")
-                names.remove("NETBSD")
-            elif "sunos" in sys.platform.lower() or \
-                    "solaris" in sys.platform.lower():
-                assert psutil.SUNOS
-                names.remove("SUNOS")
-            elif "darwin" in sys.platform.lower():
-                assert psutil.MACOS
-                names.remove("MACOS")
-        else:
-            assert psutil.WINDOWS
-            assert not psutil.POSIX
-            names.remove("WINDOWS")
-
-        # assert all other constants are set to False
-        for name in names:
-            self.assertIs(getattr(psutil, name), False, msg=name)
-
-
-class TestMemoryAPIs(unittest.TestCase):
-
-    def test_virtual_memory(self):
-        mem = psutil.virtual_memory()
-        assert mem.total > 0, mem
-        assert mem.available > 0, mem
-        assert 0 <= mem.percent <= 100, mem
-        assert mem.used > 0, mem
-        assert mem.free >= 0, mem
-        for name in mem._fields:
-            value = getattr(mem, name)
-            if name != 'percent':
-                self.assertIsInstance(value, (int, long))
-            if name != 'total':
-                if not value >= 0:
-                    self.fail("%r < 0 (%s)" % (name, value))
-                if value > mem.total:
-                    self.fail("%r > total (total=%s, %s=%s)"
-                              % (name, mem.total, name, value))
-
-    def test_swap_memory(self):
-        mem = psutil.swap_memory()
-        self.assertEqual(
-            mem._fields, ('total', 'used', 'free', 'percent', 'sin', 'sout'))
-
-        assert mem.total >= 0, mem
-        assert mem.used >= 0, mem
-        if mem.total > 0:
-            # likely a system with no swap partition
-            assert mem.free > 0, mem
-        else:
-            assert mem.free == 0, mem
-        assert 0 <= mem.percent <= 100, mem
-        assert mem.sin >= 0, mem
-        assert mem.sout >= 0, mem
-
-
-class TestCpuAPIs(unittest.TestCase):
-
-    def test_cpu_count_logical(self):
-        logical = psutil.cpu_count()
-        self.assertIsNotNone(logical)
-        self.assertEqual(logical, len(psutil.cpu_times(percpu=True)))
-        self.assertGreaterEqual(logical, 1)
-        #
-        if os.path.exists("/proc/cpuinfo"):
-            with open("/proc/cpuinfo") as fd:
-                cpuinfo_data = fd.read()
-            if "physical id" not in cpuinfo_data:
-                raise unittest.SkipTest("cpuinfo doesn't include physical id")
-
-    def test_cpu_count_physical(self):
-        logical = psutil.cpu_count()
-        physical = psutil.cpu_count(logical=False)
-        if physical is None:
-            raise self.skipTest("physical cpu_count() is None")
-        if WINDOWS and sys.getwindowsversion()[:2] <= (6, 1):  # <= Vista
-            self.assertIsNone(physical)
-        else:
-            self.assertGreaterEqual(physical, 1)
-            self.assertGreaterEqual(logical, physical)
-
-    def test_cpu_count_none(self):
-        # https://github.com/giampaolo/psutil/issues/1085
-        for val in (-1, 0, None):
-            with mock.patch('psutil._psplatform.cpu_count_logical',
-                            return_value=val) as m:
-                self.assertIsNone(psutil.cpu_count())
-                assert m.called
-            with mock.patch('psutil._psplatform.cpu_count_physical',
-                            return_value=val) as m:
-                self.assertIsNone(psutil.cpu_count(logical=False))
-                assert m.called
-
-    def test_cpu_times(self):
-        # Check type, value >= 0, str().
-        total = 0
-        times = psutil.cpu_times()
-        sum(times)
-        for cp_time in times:
-            self.assertIsInstance(cp_time, float)
-            self.assertGreaterEqual(cp_time, 0.0)
-            total += cp_time
-        self.assertEqual(total, sum(times))
-        str(times)
-        # CPU times are always supposed to increase over time
-        # or at least remain the same and that's because time
-        # cannot go backwards.
-        # Surprisingly sometimes this might not be the case (at
-        # least on Windows and Linux), see:
-        # https://github.com/giampaolo/psutil/issues/392
-        # https://github.com/giampaolo/psutil/issues/645
-        # if not WINDOWS:
-        #     last = psutil.cpu_times()
-        #     for x in range(100):
-        #         new = psutil.cpu_times()
-        #         for field in new._fields:
-        #             new_t = getattr(new, field)
-        #             last_t = getattr(last, field)
-        #             self.assertGreaterEqual(new_t, last_t,
-        #                                     msg="%s %s" % (new_t, last_t))
-        #         last = new
-
-    def test_cpu_times_time_increases(self):
-        # Make sure time increases between calls.
-        t1 = sum(psutil.cpu_times())
-        stop_at = time.time() + 1
-        while time.time() < stop_at:
-            t2 = sum(psutil.cpu_times())
-            if t2 > t1:
-                return
-        self.fail("time remained the same")
-
-    def test_per_cpu_times(self):
-        # Check type, value >= 0, str().
-        for times in psutil.cpu_times(percpu=True):
-            total = 0
-            sum(times)
-            for cp_time in times:
-                self.assertIsInstance(cp_time, float)
-                self.assertGreaterEqual(cp_time, 0.0)
-                total += cp_time
-            self.assertEqual(total, sum(times))
-            str(times)
-        self.assertEqual(len(psutil.cpu_times(percpu=True)[0]),
-                         len(psutil.cpu_times(percpu=False)))
-
-        # Note: in theory CPU times are always supposed to increase over
-        # time or remain the same but never go backwards. In practice
-        # sometimes this is not the case.
-        # This issue seemd to be afflict Windows:
-        # https://github.com/giampaolo/psutil/issues/392
-        # ...but it turns out also Linux (rarely) behaves the same.
-        # last = psutil.cpu_times(percpu=True)
-        # for x in range(100):
-        #     new = psutil.cpu_times(percpu=True)
-        #     for index in range(len(new)):
-        #         newcpu = new[index]
-        #         lastcpu = last[index]
-        #         for field in newcpu._fields:
-        #             new_t = getattr(newcpu, field)
-        #             last_t = getattr(lastcpu, field)
-        #             self.assertGreaterEqual(
-        #                 new_t, last_t, msg="%s %s" % (lastcpu, newcpu))
-        #     last = new
-
-    def test_per_cpu_times_2(self):
-        # Simulate some work load then make sure time have increased
-        # between calls.
-        tot1 = psutil.cpu_times(percpu=True)
-        giveup_at = time.time() + 1
-        while True:
-            if time.time() >= giveup_at:
-                return self.fail("timeout")
-            tot2 = psutil.cpu_times(percpu=True)
-            for t1, t2 in zip(tot1, tot2):
-                t1, t2 = psutil._cpu_busy_time(t1), psutil._cpu_busy_time(t2)
-                difference = t2 - t1
-                if difference >= 0.05:
-                    return
-
-    def test_cpu_times_comparison(self):
-        # Make sure the sum of all per cpu times is almost equal to
-        # base "one cpu" times.
-        base = psutil.cpu_times()
-        per_cpu = psutil.cpu_times(percpu=True)
-        summed_values = base._make([sum(num) for num in zip(*per_cpu)])
-        for field in base._fields:
-            self.assertAlmostEqual(
-                getattr(base, field), getattr(summed_values, field), delta=1)
-
-    def _test_cpu_percent(self, percent, last_ret, new_ret):
-        try:
-            self.assertIsInstance(percent, float)
-            self.assertGreaterEqual(percent, 0.0)
-            self.assertIsNot(percent, -0.0)
-            self.assertLessEqual(percent, 100.0 * psutil.cpu_count())
-        except AssertionError as err:
-            raise AssertionError("\n%s\nlast=%s\nnew=%s" % (
-                err, pprint.pformat(last_ret), pprint.pformat(new_ret)))
-
-    def test_cpu_percent(self):
-        last = psutil.cpu_percent(interval=0.001)
-        for x in range(100):
-            new = psutil.cpu_percent(interval=None)
-            self._test_cpu_percent(new, last, new)
-            last = new
-        with self.assertRaises(ValueError):
-            psutil.cpu_percent(interval=-1)
-
-    def test_per_cpu_percent(self):
-        last = psutil.cpu_percent(interval=0.001, percpu=True)
-        self.assertEqual(len(last), psutil.cpu_count())
-        for x in range(100):
-            new = psutil.cpu_percent(interval=None, percpu=True)
-            for percent in new:
-                self._test_cpu_percent(percent, last, new)
-            last = new
-        with self.assertRaises(ValueError):
-            psutil.cpu_percent(interval=-1, percpu=True)
-
-    def test_cpu_times_percent(self):
-        last = psutil.cpu_times_percent(interval=0.001)
-        for x in range(100):
-            new = psutil.cpu_times_percent(interval=None)
-            for percent in new:
-                self._test_cpu_percent(percent, last, new)
-            self._test_cpu_percent(sum(new), last, new)
-            last = new
-
-    def test_per_cpu_times_percent(self):
-        last = psutil.cpu_times_percent(interval=0.001, percpu=True)
-        self.assertEqual(len(last), psutil.cpu_count())
-        for x in range(100):
-            new = psutil.cpu_times_percent(interval=None, percpu=True)
-            for cpu in new:
-                for percent in cpu:
-                    self._test_cpu_percent(percent, last, new)
-                self._test_cpu_percent(sum(cpu), last, new)
-            last = new
-
-    def test_per_cpu_times_percent_negative(self):
-        # see: https://github.com/giampaolo/psutil/issues/645
-        psutil.cpu_times_percent(percpu=True)
-        zero_times = [x._make([0 for x in range(len(x._fields))])
-                      for x in psutil.cpu_times(percpu=True)]
-        with mock.patch('psutil.cpu_times', return_value=zero_times):
-            for cpu in psutil.cpu_times_percent(percpu=True):
-                for percent in cpu:
-                    self._test_cpu_percent(percent, None, None)
-
-    def test_cpu_stats(self):
-        # Tested more extensively in per-platform test modules.
-        infos = psutil.cpu_stats()
-        self.assertEqual(
-            infos._fields,
-            ('ctx_switches', 'interrupts', 'soft_interrupts', 'syscalls'))
-        for name in infos._fields:
-            value = getattr(infos, name)
-            self.assertGreaterEqual(value, 0)
-            # on AIX, ctx_switches is always 0
-            if not AIX and name in ('ctx_switches', 'interrupts'):
-                self.assertGreater(value, 0)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not suported")
-    def test_cpu_freq(self):
-        def check_ls(ls):
-            for nt in ls:
-                self.assertEqual(nt._fields, ('current', 'min', 'max'))
-                if nt.max != 0.0:
-                    self.assertLessEqual(nt.current, nt.max)
-                for name in nt._fields:
-                    value = getattr(nt, name)
-                    self.assertIsInstance(value, (int, long, float))
-                    self.assertGreaterEqual(value, 0)
-
-        ls = psutil.cpu_freq(percpu=True)
-        if TRAVIS and not ls:
-            raise self.skipTest("skipped on Travis")
-        if FREEBSD and not ls:
-            raise self.skipTest("returns empty list on FreeBSD")
-
-        assert ls, ls
-        check_ls([psutil.cpu_freq(percpu=False)])
-
-        if LINUX:
-            self.assertEqual(len(ls), psutil.cpu_count())
-
-    @unittest.skipIf(not HAS_GETLOADAVG, "not supported")
-    def test_getloadavg(self):
-        loadavg = psutil.getloadavg()
-        assert len(loadavg) == 3
-
-        for load in loadavg:
-            self.assertIsInstance(load, float)
-            self.assertGreaterEqual(load, 0.0)
-
-
-class TestDiskAPIs(unittest.TestCase):
-
-    def test_disk_usage(self):
-        usage = psutil.disk_usage(os.getcwd())
-        self.assertEqual(usage._fields, ('total', 'used', 'free', 'percent'))
-
-        assert usage.total > 0, usage
-        assert usage.used > 0, usage
-        assert usage.free > 0, usage
-        assert usage.total > usage.used, usage
-        assert usage.total > usage.free, usage
-        assert 0 <= usage.percent <= 100, usage.percent
-        if hasattr(shutil, 'disk_usage'):
-            # py >= 3.3, see: http://bugs.python.org/issue12442
-            shutil_usage = shutil.disk_usage(os.getcwd())
-            tolerance = 5 * 1024 * 1024  # 5MB
-            self.assertEqual(usage.total, shutil_usage.total)
-            self.assertAlmostEqual(usage.free, shutil_usage.free,
-                                   delta=tolerance)
-            self.assertAlmostEqual(usage.used, shutil_usage.used,
-                                   delta=tolerance)
-
-        # if path does not exist OSError ENOENT is expected across
-        # all platforms
-        fname = tempfile.mktemp()
-        with self.assertRaises(FileNotFoundError):
-            psutil.disk_usage(fname)
-
-    def test_disk_usage_unicode(self):
-        # See: https://github.com/giampaolo/psutil/issues/416
-        if ASCII_FS:
-            with self.assertRaises(UnicodeEncodeError):
-                psutil.disk_usage(TESTFN_UNICODE)
-
-    def test_disk_usage_bytes(self):
-        psutil.disk_usage(b'.')
-
-    def test_disk_partitions(self):
-        # all = False
-        ls = psutil.disk_partitions(all=False)
-        # on travis we get:
-        #     self.assertEqual(p.cpu_affinity(), [n])
-        # AssertionError: Lists differ: [0, 1, 2, 3, 4, 5, 6, 7,... != [0]
-        self.assertTrue(ls, msg=ls)
-        for disk in ls:
-            self.assertIsInstance(disk.device, str)
-            self.assertIsInstance(disk.mountpoint, str)
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-            if WINDOWS and 'cdrom' in disk.opts:
-                continue
-            if not POSIX:
-                assert os.path.exists(disk.device), disk
-            else:
-                # we cannot make any assumption about this, see:
-                # http://goo.gl/p9c43
-                disk.device
-            # on modern systems mount points can also be files
-            assert os.path.exists(disk.mountpoint), disk
-            assert disk.fstype, disk
-
-        # all = True
-        ls = psutil.disk_partitions(all=True)
-        self.assertTrue(ls, msg=ls)
-        for disk in psutil.disk_partitions(all=True):
-            if not WINDOWS and disk.mountpoint:
-                try:
-                    os.stat(disk.mountpoint)
-                except OSError as err:
-                    if TRAVIS and MACOS and err.errno == errno.EIO:
-                        continue
-                    # http://mail.python.org/pipermail/python-dev/
-                    #     2012-June/120787.html
-                    if err.errno not in (errno.EPERM, errno.EACCES):
-                        raise
-                else:
-                    assert os.path.exists(disk.mountpoint), disk
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-
-        def find_mount_point(path):
-            path = os.path.abspath(path)
-            while not os.path.ismount(path):
-                path = os.path.dirname(path)
-            return path.lower()
-
-        mount = find_mount_point(__file__)
-        mounts = [x.mountpoint.lower() for x in
-                  psutil.disk_partitions(all=True) if x.mountpoint]
-        self.assertIn(mount, mounts)
-        psutil.disk_usage(mount)
-
-    @unittest.skipIf(LINUX and not os.path.exists('/proc/diskstats'),
-                     '/proc/diskstats not available on this linux version')
-    @unittest.skipIf(CI_TESTING and not psutil.disk_io_counters(),
-                     "unreliable on CI")  # no visible disks
-    def test_disk_io_counters(self):
-        def check_ntuple(nt):
-            self.assertEqual(nt[0], nt.read_count)
-            self.assertEqual(nt[1], nt.write_count)
-            self.assertEqual(nt[2], nt.read_bytes)
-            self.assertEqual(nt[3], nt.write_bytes)
-            if not (OPENBSD or NETBSD):
-                self.assertEqual(nt[4], nt.read_time)
-                self.assertEqual(nt[5], nt.write_time)
-                if LINUX:
-                    self.assertEqual(nt[6], nt.read_merged_count)
-                    self.assertEqual(nt[7], nt.write_merged_count)
-                    self.assertEqual(nt[8], nt.busy_time)
-                elif FREEBSD:
-                    self.assertEqual(nt[6], nt.busy_time)
-            for name in nt._fields:
-                assert getattr(nt, name) >= 0, nt
-
-        ret = psutil.disk_io_counters(perdisk=False)
-        assert ret is not None, "no disks on this system?"
-        check_ntuple(ret)
-        ret = psutil.disk_io_counters(perdisk=True)
-        # make sure there are no duplicates
-        self.assertEqual(len(ret), len(set(ret)))
-        for key in ret:
-            assert key, key
-            check_ntuple(ret[key])
-
-    def test_disk_io_counters_no_disks(self):
-        # Emulate a case where no disks are installed, see:
-        # https://github.com/giampaolo/psutil/issues/1062
-        with mock.patch('psutil._psplatform.disk_io_counters',
-                        return_value={}) as m:
-            self.assertIsNone(psutil.disk_io_counters(perdisk=False))
-            self.assertEqual(psutil.disk_io_counters(perdisk=True), {})
-            assert m.called
-
-
-class TestNetAPIs(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        def check_ntuple(nt):
-            self.assertEqual(nt[0], nt.bytes_sent)
-            self.assertEqual(nt[1], nt.bytes_recv)
-            self.assertEqual(nt[2], nt.packets_sent)
-            self.assertEqual(nt[3], nt.packets_recv)
-            self.assertEqual(nt[4], nt.errin)
-            self.assertEqual(nt[5], nt.errout)
-            self.assertEqual(nt[6], nt.dropin)
-            self.assertEqual(nt[7], nt.dropout)
-            assert nt.bytes_sent >= 0, nt
-            assert nt.bytes_recv >= 0, nt
-            assert nt.packets_sent >= 0, nt
-            assert nt.packets_recv >= 0, nt
-            assert nt.errin >= 0, nt
-            assert nt.errout >= 0, nt
-            assert nt.dropin >= 0, nt
-            assert nt.dropout >= 0, nt
-
-        ret = psutil.net_io_counters(pernic=False)
-        check_ntuple(ret)
-        ret = psutil.net_io_counters(pernic=True)
-        self.assertNotEqual(ret, [])
-        for key in ret:
-            self.assertTrue(key)
-            self.assertIsInstance(key, str)
-            check_ntuple(ret[key])
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters_no_nics(self):
-        # Emulate a case where no NICs are installed, see:
-        # https://github.com/giampaolo/psutil/issues/1062
-        with mock.patch('psutil._psplatform.net_io_counters',
-                        return_value={}) as m:
-            self.assertIsNone(psutil.net_io_counters(pernic=False))
-            self.assertEqual(psutil.net_io_counters(pernic=True), {})
-            assert m.called
-
-    def test_net_if_addrs(self):
-        nics = psutil.net_if_addrs()
-        assert nics, nics
-
-        nic_stats = psutil.net_if_stats()
-
-        # Not reliable on all platforms (net_if_addrs() reports more
-        # interfaces).
-        # self.assertEqual(sorted(nics.keys()),
-        #                  sorted(psutil.net_io_counters(pernic=True).keys()))
-
-        families = set([socket.AF_INET, socket.AF_INET6, psutil.AF_LINK])
-        for nic, addrs in nics.items():
-            self.assertIsInstance(nic, str)
-            self.assertEqual(len(set(addrs)), len(addrs))
-            for addr in addrs:
-                self.assertIsInstance(addr.family, int)
-                self.assertIsInstance(addr.address, str)
-                self.assertIsInstance(addr.netmask, (str, type(None)))
-                self.assertIsInstance(addr.broadcast, (str, type(None)))
-                self.assertIn(addr.family, families)
-                if sys.version_info >= (3, 4):
-                    self.assertIsInstance(addr.family, enum.IntEnum)
-                if nic_stats[nic].isup:
-                    # Do not test binding to addresses of interfaces
-                    # that are down
-                    if addr.family == socket.AF_INET:
-                        s = socket.socket(addr.family)
-                        with contextlib.closing(s):
-                            s.bind((addr.address, 0))
-                    elif addr.family == socket.AF_INET6:
-                        info = socket.getaddrinfo(
-                            addr.address, 0, socket.AF_INET6,
-                            socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
-                        af, socktype, proto, canonname, sa = info
-                        s = socket.socket(af, socktype, proto)
-                        with contextlib.closing(s):
-                            s.bind(sa)
-                for ip in (addr.address, addr.netmask, addr.broadcast,
-                           addr.ptp):
-                    if ip is not None:
-                        # TODO: skip AF_INET6 for now because I get:
-                        # AddressValueError: Only hex digits permitted in
-                        # u'c6f3%lxcbr0' in u'fe80::c8e0:fff:fe54:c6f3%lxcbr0'
-                        if addr.family != socket.AF_INET6:
-                            check_net_address(ip, addr.family)
-                # broadcast and ptp addresses are mutually exclusive
-                if addr.broadcast:
-                    self.assertIsNone(addr.ptp)
-                elif addr.ptp:
-                    self.assertIsNone(addr.broadcast)
-
-        if BSD or MACOS or SUNOS:
-            if hasattr(socket, "AF_LINK"):
-                self.assertEqual(psutil.AF_LINK, socket.AF_LINK)
-        elif LINUX:
-            self.assertEqual(psutil.AF_LINK, socket.AF_PACKET)
-        elif WINDOWS:
-            self.assertEqual(psutil.AF_LINK, -1)
-
-    def test_net_if_addrs_mac_null_bytes(self):
-        # Simulate that the underlying C function returns an incomplete
-        # MAC address. psutil is supposed to fill it with null bytes.
-        # https://github.com/giampaolo/psutil/issues/786
-        if POSIX:
-            ret = [('em1', psutil.AF_LINK, '06:3d:29', None, None, None)]
-        else:
-            ret = [('em1', -1, '06-3d-29', None, None, None)]
-        with mock.patch('psutil._psplatform.net_if_addrs',
-                        return_value=ret) as m:
-            addr = psutil.net_if_addrs()['em1'][0]
-            assert m.called
-            if POSIX:
-                self.assertEqual(addr.address, '06:3d:29:00:00:00')
-            else:
-                self.assertEqual(addr.address, '06-3d-29-00-00-00')
-
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")  # raises EPERM
-    def test_net_if_stats(self):
-        nics = psutil.net_if_stats()
-        assert nics, nics
-        all_duplexes = (psutil.NIC_DUPLEX_FULL,
-                        psutil.NIC_DUPLEX_HALF,
-                        psutil.NIC_DUPLEX_UNKNOWN)
-        for name, stats in nics.items():
-            self.assertIsInstance(name, str)
-            isup, duplex, speed, mtu = stats
-            self.assertIsInstance(isup, bool)
-            self.assertIn(duplex, all_duplexes)
-            self.assertIn(duplex, all_duplexes)
-            self.assertGreaterEqual(speed, 0)
-            self.assertGreaterEqual(mtu, 0)
-
-    @unittest.skipIf(not (LINUX or BSD or MACOS),
-                     "LINUX or BSD or MACOS specific")
-    def test_net_if_stats_enodev(self):
-        # See: https://github.com/giampaolo/psutil/issues/1279
-        with mock.patch('psutil._psutil_posix.net_if_mtu',
-                        side_effect=OSError(errno.ENODEV, "")) as m:
-            ret = psutil.net_if_stats()
-            self.assertEqual(ret, {})
-            assert m.called
-
-
-class TestSensorsAPIs(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        temps = psutil.sensors_temperatures()
-        for name, entries in temps.items():
-            self.assertIsInstance(name, str)
-            for entry in entries:
-                self.assertIsInstance(entry.label, str)
-                if entry.current is not None:
-                    self.assertGreaterEqual(entry.current, 0)
-                if entry.high is not None:
-                    self.assertGreaterEqual(entry.high, 0)
-                if entry.critical is not None:
-                    self.assertGreaterEqual(entry.critical, 0)
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures_fahreneit(self):
-        d = {'coretemp': [('label', 50.0, 60.0, 70.0)]}
-        with mock.patch("psutil._psplatform.sensors_temperatures",
-                        return_value=d) as m:
-            temps = psutil.sensors_temperatures(
-                fahrenheit=True)['coretemp'][0]
-            assert m.called
-            self.assertEqual(temps.current, 122.0)
-            self.assertEqual(temps.high, 140.0)
-            self.assertEqual(temps.critical, 158.0)
-
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        ret = psutil.sensors_battery()
-        self.assertGreaterEqual(ret.percent, 0)
-        self.assertLessEqual(ret.percent, 100)
-        if ret.secsleft not in (psutil.POWER_TIME_UNKNOWN,
-                                psutil.POWER_TIME_UNLIMITED):
-            self.assertGreaterEqual(ret.secsleft, 0)
-        else:
-            if ret.secsleft == psutil.POWER_TIME_UNLIMITED:
-                self.assertTrue(ret.power_plugged)
-        self.assertIsInstance(ret.power_plugged, bool)
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        fans = psutil.sensors_fans()
-        for name, entries in fans.items():
-            self.assertIsInstance(name, str)
-            for entry in entries:
-                self.assertIsInstance(entry.label, str)
-                self.assertIsInstance(entry.current, (int, long))
-                self.assertGreaterEqual(entry.current, 0)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_unicode.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_unicode.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_unicode.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_unicode.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,372 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Notes about unicode handling in psutil
-======================================
-
-Starting from version 5.3.0 psutil adds unicode support, see:
-https://github.com/giampaolo/psutil/issues/1040
-The notes below apply to *any* API returning a string such as
-process exe(), cwd() or username():
-
-* all strings are encoded by using the OS filesystem encoding
-  (sys.getfilesystemencoding()) which varies depending on the platform
-  (e.g. "UTF-8" on macOS, "mbcs" on Win)
-* no API call is supposed to crash with UnicodeDecodeError
-* instead, in case of badly encoded data returned by the OS, the
-  following error handlers are used to replace the corrupted characters in
-  the string:
-    * Python 3: sys.getfilesystemencodeerrors() (PY 3.6+) or
-      "surrogatescape" on POSIX and "replace" on Windows
-    * Python 2: "replace"
-* on Python 2 all APIs return bytes (str type), never unicode
-* on Python 2, you can go back to unicode by doing:
-
-    >>> unicode(p.exe(), sys.getdefaultencoding(), errors="replace")
-
-For a detailed explanation of how psutil handles unicode see #1040.
-
-Tests
-=====
-
-List of APIs returning or dealing with a string:
-('not tested' means they are not tested to deal with non-ASCII strings):
-
-* Process.cmdline()
-* Process.connections('unix')
-* Process.cwd()
-* Process.environ()
-* Process.exe()
-* Process.memory_maps()
-* Process.name()
-* Process.open_files()
-* Process.username()             (not tested)
-
-* disk_io_counters()             (not tested)
-* disk_partitions()              (not tested)
-* disk_usage(str)
-* net_connections('unix')
-* net_if_addrs()                 (not tested)
-* net_if_stats()                 (not tested)
-* net_io_counters()              (not tested)
-* sensors_fans()                 (not tested)
-* sensors_temperatures()         (not tested)
-* users()                        (not tested)
-
-* WindowsService.binpath()       (not tested)
-* WindowsService.description()   (not tested)
-* WindowsService.display_name()  (not tested)
-* WindowsService.name()          (not tested)
-* WindowsService.status()        (not tested)
-* WindowsService.username()      (not tested)
-
-In here we create a unicode path with a funky non-ASCII name and (where
-possible) make psutil return it back (e.g. on name(), exe(), open_files(),
-etc.) and make sure that:
-
-* psutil never crashes with UnicodeDecodeError
-* the returned path matches
-"""
-
-import os
-import traceback
-import warnings
-from contextlib import closing
-
-from psutil import BSD
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import WINDOWS
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil.tests import APPVEYOR
-from psutil.tests import CIRRUS
-from psutil.tests import ASCII_FS
-from psutil.tests import bind_unix_socket
-from psutil.tests import chdir
-from psutil.tests import copyload_shared_lib
-from psutil.tests import create_exe
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import safe_mkdir
-from psutil.tests import safe_rmpath as _safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TESTFILE_PREFIX
-from psutil.tests import TESTFN
-from psutil.tests import TESTFN_UNICODE
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-import psutil
-
-
-def safe_rmpath(path):
-    if APPVEYOR:
-        # TODO - this is quite random and I'm not sure why it happens,
-        # nor I can reproduce it locally:
-        # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-        #     jiq2cgd6stsbtn60
-        # safe_rmpath() happens after reap_children() so this is weird
-        # Perhaps wait_procs() on Windows is broken? Maybe because
-        # of STILL_ACTIVE?
-        # https://github.com/giampaolo/psutil/blob/
-        #     68c7a70728a31d8b8b58f4be6c4c0baa2f449eda/psutil/arch/
-        #     windows/process_info.c#L146
-        try:
-            return _safe_rmpath(path)
-        except WindowsError:
-            traceback.print_exc()
-    else:
-        return _safe_rmpath(path)
-
-
-def subprocess_supports_unicode(name):
-    """Return True if both the fs and the subprocess module can
-    deal with a unicode file name.
-    """
-    if PY3:
-        return True
-    try:
-        safe_rmpath(name)
-        create_exe(name)
-        get_test_subprocess(cmd=[name])
-    except UnicodeEncodeError:
-        return False
-    else:
-        return True
-    finally:
-        reap_children()
-
-
-# An invalid unicode string.
-if PY3:
-    INVALID_NAME = (TESTFN.encode('utf8') + b"f\xc0\x80").decode(
-        'utf8', 'surrogateescape')
-else:
-    INVALID_NAME = TESTFN + "f\xc0\x80"
-
-
-# ===================================================================
-# FS APIs
-# ===================================================================
-
-
-class _BaseFSAPIsTests(object):
-    funky_name = None
-
-    @classmethod
-    def setUpClass(cls):
-        safe_rmpath(cls.funky_name)
-        create_exe(cls.funky_name)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-        safe_rmpath(cls.funky_name)
-
-    def tearDown(self):
-        reap_children()
-
-    def expect_exact_path_match(self):
-        raise NotImplementedError("must be implemented in subclass")
-
-    def test_proc_exe(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        p = psutil.Process(subp.pid)
-        exe = p.exe()
-        self.assertIsInstance(exe, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(os.path.normcase(exe),
-                             os.path.normcase(self.funky_name))
-
-    def test_proc_name(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        name = psutil.Process(subp.pid).name()
-        self.assertIsInstance(name, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(name, os.path.basename(self.funky_name))
-
-    def test_proc_cmdline(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        p = psutil.Process(subp.pid)
-        cmdline = p.cmdline()
-        for part in cmdline:
-            self.assertIsInstance(part, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(cmdline, [self.funky_name])
-
-    def test_proc_cwd(self):
-        dname = self.funky_name + "2"
-        self.addCleanup(safe_rmpath, dname)
-        safe_mkdir(dname)
-        with chdir(dname):
-            p = psutil.Process()
-            cwd = p.cwd()
-        self.assertIsInstance(p.cwd(), str)
-        if self.expect_exact_path_match():
-            self.assertEqual(cwd, dname)
-
-    @unittest.skipIf(PYPY and WINDOWS, "fails on PYPY + WINDOWS")
-    def test_proc_open_files(self):
-        p = psutil.Process()
-        start = set(p.open_files())
-        with open(self.funky_name, 'rb'):
-            new = set(p.open_files())
-        path = (new - start).pop().path
-        self.assertIsInstance(path, str)
-        if BSD and not path:
-            # XXX - see https://github.com/giampaolo/psutil/issues/595
-            return self.skipTest("open_files on BSD is broken")
-        if self.expect_exact_path_match():
-            self.assertEqual(os.path.normcase(path),
-                             os.path.normcase(self.funky_name))
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_proc_connections(self):
-        suffix = os.path.basename(self.funky_name)
-        with unix_socket_path(suffix=suffix) as name:
-            try:
-                sock = bind_unix_socket(name)
-            except UnicodeEncodeError:
-                if PY3:
-                    raise
-                else:
-                    raise unittest.SkipTest("not supported")
-            with closing(sock):
-                conn = psutil.Process().connections('unix')[0]
-                self.assertIsInstance(conn.laddr, str)
-                # AF_UNIX addr not set on OpenBSD
-                if not OPENBSD and not CIRRUS:  # XXX
-                    self.assertEqual(conn.laddr, name)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @unittest.skipIf(not HAS_CONNECTIONS_UNIX, "can't list UNIX sockets")
-    @skip_on_access_denied()
-    def test_net_connections(self):
-        def find_sock(cons):
-            for conn in cons:
-                if os.path.basename(conn.laddr).startswith(TESTFILE_PREFIX):
-                    return conn
-            raise ValueError("connection not found")
-
-        suffix = os.path.basename(self.funky_name)
-        with unix_socket_path(suffix=suffix) as name:
-            try:
-                sock = bind_unix_socket(name)
-            except UnicodeEncodeError:
-                if PY3:
-                    raise
-                else:
-                    raise unittest.SkipTest("not supported")
-            with closing(sock):
-                cons = psutil.net_connections(kind='unix')
-                # AF_UNIX addr not set on OpenBSD
-                if not OPENBSD:
-                    conn = find_sock(cons)
-                    self.assertIsInstance(conn.laddr, str)
-                    self.assertEqual(conn.laddr, name)
-
-    def test_disk_usage(self):
-        dname = self.funky_name + "2"
-        self.addCleanup(safe_rmpath, dname)
-        safe_mkdir(dname)
-        psutil.disk_usage(dname)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    @unittest.skipIf(not PY3, "ctypes does not support unicode on PY2")
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "copyload_shared_lib() unsupported on PYPY + WINDOWS")
-    def test_memory_maps(self):
-        # XXX: on Python 2, using ctypes.CDLL with a unicode path
-        # opens a message box which blocks the test run.
-        with copyload_shared_lib(dst_prefix=self.funky_name) as funky_path:
-            def normpath(p):
-                return os.path.realpath(os.path.normcase(p))
-            libpaths = [normpath(x.path)
-                        for x in psutil.Process().memory_maps()]
-            # ...just to have a clearer msg in case of failure
-            libpaths = [x for x in libpaths if TESTFILE_PREFIX in x]
-            self.assertIn(normpath(funky_path), libpaths)
-            for path in libpaths:
-                self.assertIsInstance(path, str)
-
-
-# https://travis-ci.org/giampaolo/psutil/jobs/440073249
-@unittest.skipIf(PYPY and TRAVIS, "unreliable on PYPY + TRAVIS")
-@unittest.skipIf(MACOS and TRAVIS, "unreliable on TRAVIS")  # TODO
-@unittest.skipIf(ASCII_FS, "ASCII fs")
-@unittest.skipIf(not subprocess_supports_unicode(TESTFN_UNICODE),
-                 "subprocess can't deal with unicode")
-class TestFSAPIs(_BaseFSAPIsTests, unittest.TestCase):
-    """Test FS APIs with a funky, valid, UTF8 path name."""
-    funky_name = TESTFN_UNICODE
-
-    @classmethod
-    def expect_exact_path_match(cls):
-        # Do not expect psutil to correctly handle unicode paths on
-        # Python 2 if os.listdir() is not able either.
-        here = '.' if isinstance(cls.funky_name, str) else u('.')
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            return cls.funky_name in os.listdir(here)
-
-
-@unittest.skipIf(PYPY and TRAVIS, "unreliable on PYPY + TRAVIS")
-@unittest.skipIf(MACOS and TRAVIS, "unreliable on TRAVIS")  # TODO
-@unittest.skipIf(PYPY, "unreliable on PYPY")
-@unittest.skipIf(not subprocess_supports_unicode(INVALID_NAME),
-                 "subprocess can't deal with invalid unicode")
-class TestFSAPIsWithInvalidPath(_BaseFSAPIsTests, unittest.TestCase):
-    """Test FS APIs with a funky, invalid path name."""
-    funky_name = INVALID_NAME
-
-    @classmethod
-    def expect_exact_path_match(cls):
-        # Invalid unicode names are supposed to work on Python 2.
-        return True
-
-
-# ===================================================================
-# Non fs APIs
-# ===================================================================
-
-
-class TestNonFSAPIS(unittest.TestCase):
-    """Unicode tests for non fs-related APIs."""
-
-    def tearDown(self):
-        reap_children()
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    @unittest.skipIf(PYPY and WINDOWS, "segfaults on PYPY + WINDOWS")
-    def test_proc_environ(self):
-        # Note: differently from others, this test does not deal
-        # with fs paths. On Python 2 subprocess module is broken as
-        # it's not able to handle with non-ASCII env vars, so
-        # we use "è", which is part of the extended ASCII table
-        # (unicode point <= 255).
-        env = os.environ.copy()
-        funky_str = TESTFN_UNICODE if PY3 else 'è'
-        env['FUNNY_ARG'] = funky_str
-        sproc = get_test_subprocess(env=env)
-        p = psutil.Process(sproc.pid)
-        env = p.environ()
-        for k, v in env.items():
-            self.assertIsInstance(k, str)
-            self.assertIsInstance(v, str)
-        self.assertEqual(env['FUNNY_ARG'], funky_str)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_windows.py firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_windows.py
--- firefox-84.0.2+build1/third_party/python/psutil/psutil/tests/test_windows.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/psutil/tests/test_windows.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,870 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: UTF-8 -*
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Windows specific tests."""
-
-import datetime
-import errno
-import glob
-import os
-import platform
-import re
-import signal
-import subprocess
-import sys
-import time
-import warnings
-
-import psutil
-from psutil import WINDOWS
-from psutil._compat import FileNotFoundError
-from psutil.tests import APPVEYOR
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import mock
-from psutil.tests import PY3
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-if WINDOWS and not PYPY:
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        import win32api  # requires "pip install pypiwin32"
-        import win32con
-        import win32process
-        import wmi  # requires "pip install wmi" / "make setup-dev-env"
-
-
-cext = psutil._psplatform.cext
-
-# are we a 64 bit process
-IS_64_BIT = sys.maxsize > 2**32
-
-
-def wrap_exceptions(fun):
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except OSError as err:
-            from psutil._pswindows import ACCESS_DENIED_SET
-            if err.errno in ACCESS_DENIED_SET:
-                raise psutil.AccessDenied(None, None)
-            if err.errno == errno.ESRCH:
-                raise psutil.NoSuchProcess(None, None)
-            raise
-    return wrapper
-
-
-@unittest.skipIf(PYPY, "pywin32 not available on PYPY")  # skip whole module
-class TestCase(unittest.TestCase):
-    pass
-
-
-# ===================================================================
-# System APIs
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestCpuAPIs(TestCase):
-
-    @unittest.skipIf('NUMBER_OF_PROCESSORS' not in os.environ,
-                     'NUMBER_OF_PROCESSORS env var is not available')
-    def test_cpu_count_vs_NUMBER_OF_PROCESSORS(self):
-        # Will likely fail on many-cores systems:
-        # https://stackoverflow.com/questions/31209256
-        num_cpus = int(os.environ['NUMBER_OF_PROCESSORS'])
-        self.assertEqual(num_cpus, psutil.cpu_count())
-
-    def test_cpu_count_vs_GetSystemInfo(self):
-        # Will likely fail on many-cores systems:
-        # https://stackoverflow.com/questions/31209256
-        sys_value = win32api.GetSystemInfo()[5]
-        psutil_value = psutil.cpu_count()
-        self.assertEqual(sys_value, psutil_value)
-
-    def test_cpu_count_logical_vs_wmi(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(psutil.cpu_count(), proc.NumberOfLogicalProcessors)
-
-    def test_cpu_count_phys_vs_wmi(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(psutil.cpu_count(logical=False), proc.NumberOfCores)
-
-    def test_cpu_count_vs_cpu_times(self):
-        self.assertEqual(psutil.cpu_count(),
-                         len(psutil.cpu_times(percpu=True)))
-
-    def test_cpu_freq(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(proc.CurrentClockSpeed, psutil.cpu_freq().current)
-        self.assertEqual(proc.MaxClockSpeed, psutil.cpu_freq().max)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestSystemAPIs(TestCase):
-
-    def test_nic_names(self):
-        out = sh('ipconfig /all')
-        nics = psutil.net_io_counters(pernic=True).keys()
-        for nic in nics:
-            if "pseudo-interface" in nic.replace(' ', '-').lower():
-                continue
-            if nic not in out:
-                self.fail(
-                    "%r nic wasn't found in 'ipconfig /all' output" % nic)
-
-    def test_total_phymem(self):
-        w = wmi.WMI().Win32_ComputerSystem()[0]
-        self.assertEqual(int(w.TotalPhysicalMemory),
-                         psutil.virtual_memory().total)
-
-    # @unittest.skipIf(wmi is None, "wmi module is not installed")
-    # def test__UPTIME(self):
-    #     # _UPTIME constant is not public but it is used internally
-    #     # as value to return for pid 0 creation time.
-    #     # WMI behaves the same.
-    #     w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-    #     p = psutil.Process(0)
-    #     wmic_create = str(w.CreationDate.split('.')[0])
-    #     psutil_create = time.strftime("%Y%m%d%H%M%S",
-    #                                   time.localtime(p.create_time()))
-
-    # Note: this test is not very reliable
-    @unittest.skipIf(APPVEYOR, "test not relieable on appveyor")
-    @retry_on_failure()
-    def test_pids(self):
-        # Note: this test might fail if the OS is starting/killing
-        # other processes in the meantime
-        w = wmi.WMI().Win32_Process()
-        wmi_pids = set([x.ProcessId for x in w])
-        psutil_pids = set(psutil.pids())
-        self.assertEqual(wmi_pids, psutil_pids)
-
-    @retry_on_failure()
-    def test_disks(self):
-        ps_parts = psutil.disk_partitions(all=True)
-        wmi_parts = wmi.WMI().Win32_LogicalDisk()
-        for ps_part in ps_parts:
-            for wmi_part in wmi_parts:
-                if ps_part.device.replace('\\', '') == wmi_part.DeviceID:
-                    if not ps_part.mountpoint:
-                        # this is usually a CD-ROM with no disk inserted
-                        break
-                    if 'cdrom' in ps_part.opts:
-                        break
-                    try:
-                        usage = psutil.disk_usage(ps_part.mountpoint)
-                    except FileNotFoundError:
-                        # usually this is the floppy
-                        break
-                    self.assertEqual(usage.total, int(wmi_part.Size))
-                    wmi_free = int(wmi_part.FreeSpace)
-                    self.assertEqual(usage.free, wmi_free)
-                    # 10 MB tollerance
-                    if abs(usage.free - wmi_free) > 10 * 1024 * 1024:
-                        self.fail("psutil=%s, wmi=%s" % (
-                            usage.free, wmi_free))
-                    break
-            else:
-                self.fail("can't find partition %s" % repr(ps_part))
-
-    def test_disk_usage(self):
-        for disk in psutil.disk_partitions():
-            if 'cdrom' in disk.opts:
-                continue
-            sys_value = win32api.GetDiskFreeSpaceEx(disk.mountpoint)
-            psutil_value = psutil.disk_usage(disk.mountpoint)
-            self.assertAlmostEqual(sys_value[0], psutil_value.free,
-                                   delta=1024 * 1024)
-            self.assertAlmostEqual(sys_value[1], psutil_value.total,
-                                   delta=1024 * 1024)
-            self.assertEqual(psutil_value.used,
-                             psutil_value.total - psutil_value.free)
-
-    def test_disk_partitions(self):
-        sys_value = [
-            x + '\\' for x in win32api.GetLogicalDriveStrings().split("\\\x00")
-            if x and not x.startswith('A:')]
-        psutil_value = [x.mountpoint for x in psutil.disk_partitions(all=True)]
-        self.assertEqual(sys_value, psutil_value)
-
-    def test_net_if_stats(self):
-        ps_names = set(cext.net_if_stats())
-        wmi_adapters = wmi.WMI().Win32_NetworkAdapter()
-        wmi_names = set()
-        for wmi_adapter in wmi_adapters:
-            wmi_names.add(wmi_adapter.Name)
-            wmi_names.add(wmi_adapter.NetConnectionID)
-        self.assertTrue(ps_names & wmi_names,
-                        "no common entries in %s, %s" % (ps_names, wmi_names))
-
-    def test_boot_time(self):
-        wmi_os = wmi.WMI().Win32_OperatingSystem()
-        wmi_btime_str = wmi_os[0].LastBootUpTime.split('.')[0]
-        wmi_btime_dt = datetime.datetime.strptime(
-            wmi_btime_str, "%Y%m%d%H%M%S")
-        psutil_dt = datetime.datetime.fromtimestamp(psutil.boot_time())
-        diff = abs((wmi_btime_dt - psutil_dt).total_seconds())
-        self.assertLessEqual(diff, 3)
-
-    def test_boot_time_fluctuation(self):
-        # https://github.com/giampaolo/psutil/issues/1007
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=5):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=4):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=6):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=333):
-            self.assertEqual(psutil.boot_time(), 333)
-
-
-# ===================================================================
-# sensors_battery()
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestSensorsBattery(TestCase):
-
-    def test_has_battery(self):
-        if win32api.GetPwrCapabilities()['SystemBatteriesPresent']:
-            self.assertIsNotNone(psutil.sensors_battery())
-        else:
-            self.assertIsNone(psutil.sensors_battery())
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_percent(self):
-        w = wmi.WMI()
-        battery_wmi = w.query('select * from Win32_Battery')[0]
-        battery_psutil = psutil.sensors_battery()
-        self.assertAlmostEqual(
-            battery_psutil.percent, battery_wmi.EstimatedChargeRemaining,
-            delta=1)
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_power_plugged(self):
-        w = wmi.WMI()
-        battery_wmi = w.query('select * from Win32_Battery')[0]
-        battery_psutil = psutil.sensors_battery()
-        # Status codes:
-        # https://msdn.microsoft.com/en-us/library/aa394074(v=vs.85).aspx
-        self.assertEqual(battery_psutil.power_plugged,
-                         battery_wmi.BatteryStatus == 2)
-
-    def test_emulate_no_battery(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 128, 0, 0)) as m:
-            self.assertIsNone(psutil.sensors_battery())
-            assert m.called
-
-    def test_emulate_power_connected(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(1, 0, 0, 0)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_power_charging(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 8, 0, 0)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_secs_left_unknown(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 0, 0, -1)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNKNOWN)
-            assert m.called
-
-
-# ===================================================================
-# Process APIs
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcess(TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_issue_24(self):
-        p = psutil.Process(0)
-        self.assertRaises(psutil.AccessDenied, p.kill)
-
-    def test_special_pid(self):
-        p = psutil.Process(4)
-        self.assertEqual(p.name(), 'System')
-        # use __str__ to access all common Process properties to check
-        # that nothing strange happens
-        str(p)
-        p.username()
-        self.assertTrue(p.create_time() >= 0.0)
-        try:
-            rss, vms = p.memory_info()[:2]
-        except psutil.AccessDenied:
-            # expected on Windows Vista and Windows 7
-            if not platform.uname()[1] in ('vista', 'win-7', 'win7'):
-                raise
-        else:
-            self.assertTrue(rss > 0)
-
-    def test_send_signal(self):
-        p = psutil.Process(self.pid)
-        self.assertRaises(ValueError, p.send_signal, signal.SIGINT)
-
-    def test_num_handles_increment(self):
-        p = psutil.Process(os.getpid())
-        before = p.num_handles()
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        after = p.num_handles()
-        self.assertEqual(after, before + 1)
-        win32api.CloseHandle(handle)
-        self.assertEqual(p.num_handles(), before)
-
-    def test_handles_leak(self):
-        # Call all Process methods and make sure no handles are left
-        # open. This is here mainly to make sure functions using
-        # OpenProcess() always call CloseHandle().
-        def call(p, attr):
-            attr = getattr(p, name, None)
-            if attr is not None and callable(attr):
-                attr()
-            else:
-                attr
-
-        p = psutil.Process(self.pid)
-        failures = []
-        for name in dir(psutil.Process):
-            if name.startswith('_') \
-                    or name in ('terminate', 'kill', 'suspend', 'resume',
-                                'nice', 'send_signal', 'wait', 'children',
-                                'as_dict', 'memory_info_ex'):
-                continue
-            else:
-                try:
-                    call(p, name)
-                    num1 = p.num_handles()
-                    call(p, name)
-                    num2 = p.num_handles()
-                except (psutil.NoSuchProcess, psutil.AccessDenied):
-                    pass
-                else:
-                    if num2 > num1:
-                        fail = \
-                            "failure while processing Process.%s method " \
-                            "(before=%s, after=%s)" % (name, num1, num2)
-                        failures.append(fail)
-        if failures:
-            self.fail('\n' + '\n'.join(failures))
-
-    @unittest.skipIf(not sys.version_info >= (2, 7),
-                     "CTRL_* signals not supported")
-    def test_ctrl_signals(self):
-        p = psutil.Process(get_test_subprocess().pid)
-        p.send_signal(signal.CTRL_C_EVENT)
-        p.send_signal(signal.CTRL_BREAK_EVENT)
-        p.kill()
-        p.wait()
-        self.assertRaises(psutil.NoSuchProcess,
-                          p.send_signal, signal.CTRL_C_EVENT)
-        self.assertRaises(psutil.NoSuchProcess,
-                          p.send_signal, signal.CTRL_BREAK_EVENT)
-
-    def test_username(self):
-        self.assertEqual(psutil.Process().username(),
-                         win32api.GetUserNameEx(win32con.NameSamCompatible))
-
-    def test_cmdline(self):
-        sys_value = re.sub(' +', ' ', win32api.GetCommandLine()).strip()
-        psutil_value = ' '.join(psutil.Process().cmdline())
-        self.assertEqual(sys_value, psutil_value)
-
-    # XXX - occasional failures
-
-    # def test_cpu_times(self):
-    #     handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-    #                                   win32con.FALSE, os.getpid())
-    #     self.addCleanup(win32api.CloseHandle, handle)
-    #     sys_value = win32process.GetProcessTimes(handle)
-    #     psutil_value = psutil.Process().cpu_times()
-    #     self.assertAlmostEqual(
-    #         psutil_value.user, sys_value['UserTime'] / 10000000.0,
-    #         delta=0.2)
-    #     self.assertAlmostEqual(
-    #         psutil_value.user, sys_value['KernelTime'] / 10000000.0,
-    #         delta=0.2)
-
-    def test_nice(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetPriorityClass(handle)
-        psutil_value = psutil.Process().nice()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_memory_info(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetProcessMemoryInfo(handle)
-        psutil_value = psutil.Process(self.pid).memory_info()
-        self.assertEqual(
-            sys_value['PeakWorkingSetSize'], psutil_value.peak_wset)
-        self.assertEqual(
-            sys_value['WorkingSetSize'], psutil_value.wset)
-        self.assertEqual(
-            sys_value['QuotaPeakPagedPoolUsage'], psutil_value.peak_paged_pool)
-        self.assertEqual(
-            sys_value['QuotaPagedPoolUsage'], psutil_value.paged_pool)
-        self.assertEqual(
-            sys_value['QuotaPeakNonPagedPoolUsage'],
-            psutil_value.peak_nonpaged_pool)
-        self.assertEqual(
-            sys_value['QuotaNonPagedPoolUsage'], psutil_value.nonpaged_pool)
-        self.assertEqual(
-            sys_value['PagefileUsage'], psutil_value.pagefile)
-        self.assertEqual(
-            sys_value['PeakPagefileUsage'], psutil_value.peak_pagefile)
-
-        self.assertEqual(psutil_value.rss, psutil_value.wset)
-        self.assertEqual(psutil_value.vms, psutil_value.pagefile)
-
-    def test_wait(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        p = psutil.Process(self.pid)
-        p.terminate()
-        psutil_value = p.wait()
-        sys_value = win32process.GetExitCodeProcess(handle)
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_cpu_affinity(self):
-        def from_bitmask(x):
-            return [i for i in range(64) if (1 << i) & x]
-
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = from_bitmask(
-            win32process.GetProcessAffinityMask(handle)[0])
-        psutil_value = psutil.Process(self.pid).cpu_affinity()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_io_counters(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetProcessIoCounters(handle)
-        psutil_value = psutil.Process().io_counters()
-        self.assertEqual(
-            psutil_value.read_count, sys_value['ReadOperationCount'])
-        self.assertEqual(
-            psutil_value.write_count, sys_value['WriteOperationCount'])
-        self.assertEqual(
-            psutil_value.read_bytes, sys_value['ReadTransferCount'])
-        self.assertEqual(
-            psutil_value.write_bytes, sys_value['WriteTransferCount'])
-        self.assertEqual(
-            psutil_value.other_count, sys_value['OtherOperationCount'])
-        self.assertEqual(
-            psutil_value.other_bytes, sys_value['OtherTransferCount'])
-
-    def test_num_handles(self):
-        import ctypes
-        import ctypes.wintypes
-        PROCESS_QUERY_INFORMATION = 0x400
-        handle = ctypes.windll.kernel32.OpenProcess(
-            PROCESS_QUERY_INFORMATION, 0, self.pid)
-        self.addCleanup(ctypes.windll.kernel32.CloseHandle, handle)
-
-        hndcnt = ctypes.wintypes.DWORD()
-        ctypes.windll.kernel32.GetProcessHandleCount(
-            handle, ctypes.byref(hndcnt))
-        sys_value = hndcnt.value
-        psutil_value = psutil.Process(self.pid).num_handles()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_error_partial_copy(self):
-        # https://github.com/giampaolo/psutil/issues/875
-        exc = WindowsError()
-        exc.winerror = 299
-        with mock.patch("psutil._psplatform.cext.proc_cwd", side_effect=exc):
-            with mock.patch("time.sleep") as m:
-                p = psutil.Process()
-                self.assertRaises(psutil.AccessDenied, p.cwd)
-        self.assertGreaterEqual(m.call_count, 5)
-
-    def test_exe(self):
-        # NtQuerySystemInformation succeeds if process is gone. Make sure
-        # it raises NSP for a non existent pid.
-        pid = psutil.pids()[-1] + 99999
-        proc = psutil._psplatform.Process(pid)
-        self.assertRaises(psutil.NoSuchProcess, proc.exe)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcessWMI(TestCase):
-    """Compare Process API results with WMI."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_name(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        self.assertEqual(p.name(), w.Caption)
-
-    def test_exe(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        # Note: wmi reports the exe as a lower case string.
-        # Being Windows paths case-insensitive we ignore that.
-        self.assertEqual(p.exe().lower(), w.ExecutablePath.lower())
-
-    def test_cmdline(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        self.assertEqual(' '.join(p.cmdline()),
-                         w.CommandLine.replace('"', ''))
-
-    def test_username(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        domain, _, username = w.GetOwner()
-        username = "%s\\%s" % (domain, username)
-        self.assertEqual(p.username(), username)
-
-    def test_memory_rss(self):
-        time.sleep(0.1)
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        rss = p.memory_info().rss
-        self.assertEqual(rss, int(w.WorkingSetSize))
-
-    def test_memory_vms(self):
-        time.sleep(0.1)
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        vms = p.memory_info().vms
-        # http://msdn.microsoft.com/en-us/library/aa394372(VS.85).aspx
-        # ...claims that PageFileUsage is represented in Kilo
-        # bytes but funnily enough on certain platforms bytes are
-        # returned instead.
-        wmi_usage = int(w.PageFileUsage)
-        if (vms != wmi_usage) and (vms != wmi_usage * 1024):
-            self.fail("wmi=%s, psutil=%s" % (wmi_usage, vms))
-
-    def test_create_time(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        wmic_create = str(w.CreationDate.split('.')[0])
-        psutil_create = time.strftime("%Y%m%d%H%M%S",
-                                      time.localtime(p.create_time()))
-        self.assertEqual(wmic_create, psutil_create)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestDualProcessImplementation(TestCase):
-    """
-    Certain APIs on Windows have 2 internal implementations, one
-    based on documented Windows APIs, another one based
-    NtQuerySystemInformation() which gets called as fallback in
-    case the first fails because of limited permission error.
-    Here we test that the two methods return the exact same value,
-    see:
-    https://github.com/giampaolo/psutil/issues/304
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_memory_info(self):
-        mem_1 = psutil.Process(self.pid).memory_info()
-        with mock.patch("psutil._psplatform.cext.proc_memory_info",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            mem_2 = psutil.Process(self.pid).memory_info()
-            self.assertEqual(len(mem_1), len(mem_2))
-            for i in range(len(mem_1)):
-                self.assertGreaterEqual(mem_1[i], 0)
-                self.assertGreaterEqual(mem_2[i], 0)
-                self.assertAlmostEqual(mem_1[i], mem_2[i], delta=512)
-            assert fun.called
-
-    def test_create_time(self):
-        ctime = psutil.Process(self.pid).create_time()
-        with mock.patch("psutil._psplatform.cext.proc_times",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            self.assertEqual(psutil.Process(self.pid).create_time(), ctime)
-            assert fun.called
-
-    def test_cpu_times(self):
-        cpu_times_1 = psutil.Process(self.pid).cpu_times()
-        with mock.patch("psutil._psplatform.cext.proc_times",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            cpu_times_2 = psutil.Process(self.pid).cpu_times()
-            assert fun.called
-            self.assertAlmostEqual(
-                cpu_times_1.user, cpu_times_2.user, delta=0.01)
-            self.assertAlmostEqual(
-                cpu_times_1.system, cpu_times_2.system, delta=0.01)
-
-    def test_io_counters(self):
-        io_counters_1 = psutil.Process(self.pid).io_counters()
-        with mock.patch("psutil._psplatform.cext.proc_io_counters",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            io_counters_2 = psutil.Process(self.pid).io_counters()
-            for i in range(len(io_counters_1)):
-                self.assertAlmostEqual(
-                    io_counters_1[i], io_counters_2[i], delta=5)
-            assert fun.called
-
-    def test_num_handles(self):
-        num_handles = psutil.Process(self.pid).num_handles()
-        with mock.patch("psutil._psplatform.cext.proc_num_handles",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            self.assertEqual(psutil.Process(self.pid).num_handles(),
-                             num_handles)
-            assert fun.called
-
-    def test_cmdline(self):
-        from psutil._pswindows import convert_oserror
-        for pid in psutil.pids():
-            try:
-                a = cext.proc_cmdline(pid, use_peb=True)
-                b = cext.proc_cmdline(pid, use_peb=False)
-            except OSError as err:
-                err = convert_oserror(err)
-                if not isinstance(err, (psutil.AccessDenied,
-                                        psutil.NoSuchProcess)):
-                    raise
-            else:
-                self.assertEqual(a, b)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class RemoteProcessTestCase(TestCase):
-    """Certain functions require calling ReadProcessMemory.
-    This trivially works when called on the current process.
-    Check that this works on other processes, especially when they
-    have a different bitness.
-    """
-
-    @staticmethod
-    def find_other_interpreter():
-        # find a python interpreter that is of the opposite bitness from us
-        code = "import sys; sys.stdout.write(str(sys.maxsize > 2**32))"
-
-        # XXX: a different and probably more stable approach might be to access
-        # the registry but accessing 64 bit paths from a 32 bit process
-        for filename in glob.glob(r"C:\Python*\python.exe"):
-            proc = subprocess.Popen(args=[filename, "-c", code],
-                                    stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
-            output, _ = proc.communicate()
-            if output == str(not IS_64_BIT):
-                return filename
-
-    @classmethod
-    def setUpClass(cls):
-        other_python = cls.find_other_interpreter()
-
-        if other_python is None:
-            raise unittest.SkipTest(
-                "could not find interpreter with opposite bitness")
-
-        if IS_64_BIT:
-            cls.python64 = sys.executable
-            cls.python32 = other_python
-        else:
-            cls.python64 = other_python
-            cls.python32 = sys.executable
-
-    test_args = ["-c", "import sys; sys.stdin.read()"]
-
-    def setUp(self):
-        env = os.environ.copy()
-        env["THINK_OF_A_NUMBER"] = str(os.getpid())
-        self.proc32 = get_test_subprocess([self.python32] + self.test_args,
-                                          env=env,
-                                          stdin=subprocess.PIPE)
-        self.proc64 = get_test_subprocess([self.python64] + self.test_args,
-                                          env=env,
-                                          stdin=subprocess.PIPE)
-
-    def tearDown(self):
-        self.proc32.communicate()
-        self.proc64.communicate()
-        reap_children()
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_cmdline_32(self):
-        p = psutil.Process(self.proc32.pid)
-        self.assertEqual(len(p.cmdline()), 3)
-        self.assertEqual(p.cmdline()[1:], self.test_args)
-
-    def test_cmdline_64(self):
-        p = psutil.Process(self.proc64.pid)
-        self.assertEqual(len(p.cmdline()), 3)
-        self.assertEqual(p.cmdline()[1:], self.test_args)
-
-    def test_cwd_32(self):
-        p = psutil.Process(self.proc32.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_cwd_64(self):
-        p = psutil.Process(self.proc64.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_environ_32(self):
-        p = psutil.Process(self.proc32.pid)
-        e = p.environ()
-        self.assertIn("THINK_OF_A_NUMBER", e)
-        self.assertEquals(e["THINK_OF_A_NUMBER"], str(os.getpid()))
-
-    def test_environ_64(self):
-        p = psutil.Process(self.proc64.pid)
-        try:
-            p.environ()
-        except psutil.AccessDenied:
-            pass
-
-
-# ===================================================================
-# Windows services
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestServices(TestCase):
-
-    def test_win_service_iter(self):
-        valid_statuses = set([
-            "running",
-            "paused",
-            "start",
-            "pause",
-            "continue",
-            "stop",
-            "stopped",
-        ])
-        valid_start_types = set([
-            "automatic",
-            "manual",
-            "disabled",
-        ])
-        valid_statuses = set([
-            "running",
-            "paused",
-            "start_pending",
-            "pause_pending",
-            "continue_pending",
-            "stop_pending",
-            "stopped"
-        ])
-        for serv in psutil.win_service_iter():
-            data = serv.as_dict()
-            self.assertIsInstance(data['name'], str)
-            self.assertNotEqual(data['name'].strip(), "")
-            self.assertIsInstance(data['display_name'], str)
-            self.assertIsInstance(data['username'], str)
-            self.assertIn(data['status'], valid_statuses)
-            if data['pid'] is not None:
-                psutil.Process(data['pid'])
-            self.assertIsInstance(data['binpath'], str)
-            self.assertIsInstance(data['username'], str)
-            self.assertIsInstance(data['start_type'], str)
-            self.assertIn(data['start_type'], valid_start_types)
-            self.assertIn(data['status'], valid_statuses)
-            self.assertIsInstance(data['description'], str)
-            pid = serv.pid()
-            if pid is not None:
-                p = psutil.Process(pid)
-                self.assertTrue(p.is_running())
-            # win_service_get
-            s = psutil.win_service_get(serv.name())
-            # test __eq__
-            self.assertEqual(serv, s)
-
-    def test_win_service_get(self):
-        ERROR_SERVICE_DOES_NOT_EXIST = \
-            psutil._psplatform.cext.ERROR_SERVICE_DOES_NOT_EXIST
-        ERROR_ACCESS_DENIED = psutil._psplatform.cext.ERROR_ACCESS_DENIED
-
-        name = next(psutil.win_service_iter()).name()
-        with self.assertRaises(psutil.NoSuchProcess) as cm:
-            psutil.win_service_get(name + '???')
-        self.assertEqual(cm.exception.name, name + '???')
-
-        # test NoSuchProcess
-        service = psutil.win_service_get(name)
-        if PY3:
-            args = (0, "msg", 0, ERROR_SERVICE_DOES_NOT_EXIST)
-        else:
-            args = (ERROR_SERVICE_DOES_NOT_EXIST, "msg")
-        exc = WindowsError(*args)
-        with mock.patch("psutil._psplatform.cext.winservice_query_status",
-                        side_effect=exc):
-            self.assertRaises(psutil.NoSuchProcess, service.status)
-        with mock.patch("psutil._psplatform.cext.winservice_query_config",
-                        side_effect=exc):
-            self.assertRaises(psutil.NoSuchProcess, service.username)
-
-        # test AccessDenied
-        if PY3:
-            args = (0, "msg", 0, ERROR_ACCESS_DENIED)
-        else:
-            args = (ERROR_ACCESS_DENIED, "msg")
-        exc = WindowsError(*args)
-        with mock.patch("psutil._psplatform.cext.winservice_query_status",
-                        side_effect=exc):
-            self.assertRaises(psutil.AccessDenied, service.status)
-        with mock.patch("psutil._psplatform.cext.winservice_query_config",
-                        side_effect=exc):
-            self.assertRaises(psutil.AccessDenied, service.username)
-
-        # test __str__ and __repr__
-        self.assertIn(service.name(), str(service))
-        self.assertIn(service.display_name(), str(service))
-        self.assertIn(service.name(), repr(service))
-        self.assertIn(service.display_name(), repr(service))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/README.rst firefox-85.0+build1/third_party/python/psutil/README.rst
--- firefox-84.0.2+build1/third_party/python/psutil/README.rst	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/README.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,521 +0,0 @@
-|  |downloads| |stars| |forks| |contributors| |coverage| |quality|
-|  |version| |py-versions| |packages| |license|
-|  |travis| |appveyor| |cirrus| |doc| |twitter| |tidelift|
-
-.. |downloads| image:: https://img.shields.io/pypi/dm/psutil.svg
-    :target: https://pepy.tech/project/psutil
-    :alt: Downloads
-
-.. |stars| image:: https://img.shields.io/github/stars/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/stargazers
-    :alt: Github stars
-
-.. |forks| image:: https://img.shields.io/github/forks/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/network/members
-    :alt: Github forks
-
-.. |contributors| image:: https://img.shields.io/github/contributors/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/graphs/contributors
-    :alt: Contributors
-
-.. |quality| image:: https://img.shields.io/codacy/grade/ce63e7f7f69d44b5b59682196e6fbfca.svg
-    :target: https://www.codacy.com/app/g-rodola/psutil?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=giampaolo/psutil&amp;utm_campaign=Badge_Grade
-    :alt: Code quality
-
-.. |travis| image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux,%20OSX,%20PyPy
-    :target: https://travis-ci.org/giampaolo/psutil
-    :alt: Linux tests (Travis)
-
-.. |appveyor| image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows
-    :target: https://ci.appveyor.com/project/giampaolo/psutil
-    :alt: Windows tests (Appveyor)
-
-.. |cirrus| image:: https://img.shields.io/cirrus/github/giampaolo/psutil?label=FreeBSD
-    :target: https://cirrus-ci.com/github/giampaolo/psutil-cirrus-ci
-    :alt: FreeBSD tests (Cirrus-Ci)
-
-.. |coverage| image:: https://img.shields.io/coveralls/github/giampaolo/psutil.svg?label=test%20coverage
-    :target: https://coveralls.io/github/giampaolo/psutil?branch=master
-    :alt: Test coverage (coverall.io)
-
-.. |doc| image:: https://readthedocs.org/projects/psutil/badge/?version=latest
-    :target: http://psutil.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
-
-.. |version| image:: https://img.shields.io/pypi/v/psutil.svg?label=pypi
-    :target: https://pypi.org/project/psutil
-    :alt: Latest version
-
-.. |py-versions| image:: https://img.shields.io/pypi/pyversions/psutil.svg
-    :target: https://pypi.org/project/psutil
-    :alt: Supported Python versions
-
-.. |packages| image:: https://repology.org/badge/tiny-repos/python:psutil.svg
-    :target: https://repology.org/metapackage/python:psutil/versions
-    :alt: Binary packages
-
-.. |license| image:: https://img.shields.io/pypi/l/psutil.svg
-    :target: https://github.com/giampaolo/psutil/blob/master/LICENSE
-    :alt: License
-
-.. |twitter| image:: https://img.shields.io/twitter/follow/grodola.svg?label=follow&style=flat&logo=twitter&logoColor=4FADFF
-    :target: https://twitter.com/grodola
-    :alt: Twitter Follow
-
-.. |tidelift| image:: https://tidelift.com/badges/github/giampaolo/psutil?style=flat
-    :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-    :alt: Tidelift
-
------
-
-Quick links
-===========
-
-- `Home page <https://github.com/giampaolo/psutil>`_
-- `Install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`_
-- `Documentation <http://psutil.readthedocs.io>`_
-- `Download <https://pypi.org/project/psutil/#files>`_
-- `Forum <http://groups.google.com/group/psutil/topics>`_
-- `StackOverflow <https://stackoverflow.com/questions/tagged/psutil>`_
-- `Blog <http://grodola.blogspot.com/search/label/psutil>`_
-- `Development guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`_
-- `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`_
-
-Summary
-=======
-
-psutil (process and system utilities) is a cross-platform library for
-retrieving information on **running processes** and **system utilization**
-(CPU, memory, disks, network, sensors) in Python.
-It is useful mainly for **system monitoring**, **profiling and limiting process
-resources** and **management of running processes**.
-It implements many functionalities offered by classic UNIX command line tools
-such as *ps, top, iotop, lsof, netstat, ifconfig, free* and others.
-psutil currently supports the following platforms:
-
-- **Linux**
-- **Windows**
-- **macOS**
-- **FreeBSD, OpenBSD**, **NetBSD**
-- **Sun Solaris**
-- **AIX**
-
-...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy3 <http://pypy.org/>`__ is also known to work.
-
-psutil for enterprise
-=====================
-
-.. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
-   :width: 150
-   :alt: Tidelift
-   :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-
-.. list-table::
-   :widths: 10 150
-
-   * - |tideliftlogo|
-     - The maintainer of psutil and thousands of other packages are working
-       with Tidelift to deliver commercial support and maintenance for the open
-       source dependencies you use to build your applications. Save time,
-       reduce risk, and improve code health, while paying the maintainers of
-       the exact dependencies you use.
-       `Learn more <https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`__.
-
-       By subscribing to Tidelift you will help me (`Giampaolo Rodola`_) support
-       psutil future development. Alternatively consider making a small
-       `donation`_.
-
-Security
-========
-
-To report a security vulnerability, please use the `Tidelift security
-contact`_.  Tidelift will coordinate the fix and disclosure.
-
-Example applications
-====================
-
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/top-small.png      |
-|    :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo.png          |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/top.png          |
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap-small.png     |
-|     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem.png         |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap.png         |
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-
-Also see `scripts directory <https://github.com/giampaolo/psutil/tree/master/scripts>`__
-and `doc recipes <http://psutil.readthedocs.io/#recipes/>`__.
-
-Projects using psutil
-=====================
-
-psutil has roughly the following monthly downloads:
-
-.. image:: https://img.shields.io/pypi/dm/psutil.svg
-    :target: https://pepy.tech/project/psutil
-    :alt: Downloads
-
-There are over
-`10.000 open source projects <https://libraries.io/pypi/psutil/dependent_repositories?page=1>`__
-on github which depend from psutil.
-Here's some I find particularly interesting:
-
-- https://github.com/google/grr
-- https://github.com/facebook/osquery/
-- https://github.com/nicolargo/glances
-- https://github.com/Jahaja/psdash
-- https://github.com/ajenti/ajenti
-- https://github.com/home-assistant/home-assistant/
-
-
-Portings
-========
-
-- Go: https://github.com/shirou/gopsutil
-- C: https://github.com/hamon-in/cpslib
-- Rust: https://github.com/borntyping/rust-psutil
-- Nim: https://github.com/johnscillieri/psutil-nim
-
-
-Example usages
-==============
-
-This represents pretty much the whole psutil API.
-
-CPU
----
-
-.. code-block:: python
-
-    >>> import psutil
-    >>>
-    >>> psutil.cpu_times()
-    scputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540, iowait=629.59, irq=0.0, softirq=19.42, steal=0.0, guest=0, nice=0.0)
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_percent(interval=1)
-    ...
-    4.0
-    5.9
-    3.8
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_percent(interval=1, percpu=True)
-    ...
-    [4.0, 6.9, 3.7, 9.2]
-    [7.0, 8.5, 2.4, 2.1]
-    [1.2, 9.0, 9.9, 7.2]
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_times_percent(interval=1, percpu=False)
-    ...
-    scputimes(user=1.5, nice=0.0, system=0.5, idle=96.5, iowait=1.5, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    scputimes(user=1.0, nice=0.0, system=0.0, idle=99.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    scputimes(user=2.0, nice=0.0, system=0.0, idle=98.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    >>>
-    >>> psutil.cpu_count()
-    4
-    >>> psutil.cpu_count(logical=False)
-    2
-    >>>
-    >>> psutil.cpu_stats()
-    scpustats(ctx_switches=20455687, interrupts=6598984, soft_interrupts=2134212, syscalls=0)
-    >>>
-    >>> psutil.cpu_freq()
-    scpufreq(current=931.42925, min=800.0, max=3500.0)
-    >>>
-    >>> psutil.getloadavg()  # also on Windows (emulated)
-    (3.14, 3.89, 4.67)
-
-Memory
-------
-
-.. code-block:: python
-
-    >>> psutil.virtual_memory()
-    svmem(total=10367352832, available=6472179712, percent=37.6, used=8186245120, free=2181107712, active=4748992512, inactive=2758115328, buffers=790724608, cached=3500347392, shared=787554304)
-    >>> psutil.swap_memory()
-    sswap(total=2097147904, used=296128512, free=1801019392, percent=14.1, sin=304193536, sout=677842944)
-    >>>
-
-Disks
------
-
-.. code-block:: python
-
-    >>> psutil.disk_partitions()
-    [sdiskpart(device='/dev/sda1', mountpoint='/', fstype='ext4', opts='rw,nosuid'),
-     sdiskpart(device='/dev/sda2', mountpoint='/home', fstype='ext, opts='rw')]
-    >>>
-    >>> psutil.disk_usage('/')
-    sdiskusage(total=21378641920, used=4809781248, free=15482871808, percent=22.5)
-    >>>
-    >>> psutil.disk_io_counters(perdisk=False)
-    sdiskio(read_count=719566, write_count=1082197, read_bytes=18626220032, write_bytes=24081764352, read_time=5023392, write_time=63199568, read_merged_count=619166, write_merged_count=812396, busy_time=4523412)
-    >>>
-
-Network
--------
-
-.. code-block:: python
-
-    >>> psutil.net_io_counters(pernic=True)
-    {'eth0': netio(bytes_sent=485291293, bytes_recv=6004858642, packets_sent=3251564, packets_recv=4787798, errin=0, errout=0, dropin=0, dropout=0),
-     'lo': netio(bytes_sent=2838627, bytes_recv=2838627, packets_sent=30567, packets_recv=30567, errin=0, errout=0, dropin=0, dropout=0)}
-    >>>
-    >>> psutil.net_connections()
-    [sconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED', pid=1254),
-     sconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING', pid=2987),
-     ...]
-    >>>
-    >>> psutil.net_if_addrs()
-    {'lo': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='127.0.0.1', netmask='255.0.0.0', broadcast='127.0.0.1', ptp=None),
-            snicaddr(family=<AddressFamily.AF_INET6: 10>, address='::1', netmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff', broadcast=None, ptp=None),
-            snicaddr(family=<AddressFamily.AF_LINK: 17>, address='00:00:00:00:00:00', netmask=None, broadcast='00:00:00:00:00:00', ptp=None)],
-     'wlan0': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='192.168.1.3', netmask='255.255.255.0', broadcast='192.168.1.255', ptp=None),
-               snicaddr(family=<AddressFamily.AF_INET6: 10>, address='fe80::c685:8ff:fe45:641%wlan0', netmask='ffff:ffff:ffff:ffff::', broadcast=None, ptp=None),
-               snicaddr(family=<AddressFamily.AF_LINK: 17>, address='c4:85:08:45:06:41', netmask=None, broadcast='ff:ff:ff:ff:ff:ff', ptp=None)]}
-    >>>
-    >>> psutil.net_if_stats()
-    {'lo': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_UNKNOWN: 0>, speed=0, mtu=65536),
-     'wlan0': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>, speed=100, mtu=1500)}
-    >>>
-
-Sensors
--------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.sensors_temperatures()
-    {'acpitz': [shwtemp(label='', current=47.0, high=103.0, critical=103.0)],
-     'asus': [shwtemp(label='', current=47.0, high=None, critical=None)],
-     'coretemp': [shwtemp(label='Physical id 0', current=52.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 0', current=45.0, high=100.0, critical=100.0)]}
-    >>>
-    >>> psutil.sensors_fans()
-    {'asus': [sfan(label='cpu_fan', current=3200)]}
-    >>>
-    >>> psutil.sensors_battery()
-    sbattery(percent=93, secsleft=16628, power_plugged=False)
-    >>>
-
-Other system info
------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.users()
-    [suser(name='giampaolo', terminal='pts/2', host='localhost', started=1340737536.0, pid=1352),
-     suser(name='giampaolo', terminal='pts/3', host='localhost', started=1340737792.0, pid=1788)]
-    >>>
-    >>> psutil.boot_time()
-    1365519115.0
-    >>>
-
-Process management
-------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.pids()
-    [1, 2, 3, 4, 5, 6, 7, 46, 48, 50, 51, 178, 182, 222, 223, 224, 268, 1215, 1216, 1220, 1221, 1243, 1244,
-     1301, 1601, 2237, 2355, 2637, 2774, 3932, 4176, 4177, 4185, 4187, 4189, 4225, 4243, 4245, 4263, 4282,
-     4306, 4311, 4312, 4313, 4314, 4337, 4339, 4357, 4358, 4363, 4383, 4395, 4408, 4433, 4443, 4445, 4446,
-     5167, 5234, 5235, 5252, 5318, 5424, 5644, 6987, 7054, 7055, 7071]
-    >>>
-    >>> p = psutil.Process(7055)
-    >>> p
-    psutil.Process(pid=7055, name='python', started='09:04:44')
-    >>> p.name()
-    'python'
-    >>> p.exe()
-    '/usr/bin/python'
-    >>> p.cwd()
-    '/home/giampaolo'
-    >>> p.cmdline()
-    ['/usr/bin/python', 'main.py']
-    >>>
-    >>> p.pid
-    7055
-    >>> p.ppid()
-    7054
-    >>> p.children(recursive=True)
-    [psutil.Process(pid=29835, name='python2.7', started='11:45:38'),
-     psutil.Process(pid=29836, name='python2.7', started='11:43:39')]
-    >>>
-    >>> p.parent()
-    psutil.Process(pid=4699, name='bash', started='09:06:44')
-    >>> p.parents()
-    [psutil.Process(pid=4699, name='bash', started='09:06:44'),
-     psutil.Process(pid=4689, name='gnome-terminal-server', started='0:06:44'),
-     psutil.Process(pid=1, name='systemd', started='05:56:55')]
-    >>>
-    >>> p.status()
-    'running'
-    >>> p.username()
-    'giampaolo'
-    >>> p.create_time()
-    1267551141.5019531
-    >>> p.terminal()
-    '/dev/pts/0'
-    >>>
-    >>> p.uids()
-    puids(real=1000, effective=1000, saved=1000)
-    >>> p.gids()
-    pgids(real=1000, effective=1000, saved=1000)
-    >>>
-    >>> p.cpu_times()
-    pcputimes(user=1.02, system=0.31, children_user=0.32, children_system=0.1, iowait=0.0)
-    >>> p.cpu_percent(interval=1.0)
-    12.1
-    >>> p.cpu_affinity()
-    [0, 1, 2, 3]
-    >>> p.cpu_affinity([0, 1])  # set
-    >>> p.cpu_num()
-    1
-    >>>
-    >>> p.memory_info()
-    pmem(rss=10915840, vms=67608576, shared=3313664, text=2310144, lib=0, data=7262208, dirty=0)
-    >>> p.memory_full_info()  # "real" USS memory usage (Linux, macOS, Win only)
-    pfullmem(rss=10199040, vms=52133888, shared=3887104, text=2867200, lib=0, data=5967872, dirty=0, uss=6545408, pss=6872064, swap=0)
-    >>> p.memory_percent()
-    0.7823
-    >>> p.memory_maps()
-    [pmmap_grouped(path='/lib/x8664-linux-gnu/libutil-2.15.so', rss=32768, size=2125824, pss=32768, shared_clean=0, shared_dirty=0, private_clean=20480, private_dirty=12288, referenced=32768, anonymous=12288, swap=0),
-     pmmap_grouped(path='/lib/x8664-linux-gnu/libc-2.15.so', rss=3821568, size=3842048, pss=3821568, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=3821568, referenced=3575808, anonymous=3821568, swap=0),
-     pmmap_grouped(path='[heap]',  rss=32768, size=139264, pss=32768, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=32768, referenced=32768, anonymous=32768, swap=0),
-     pmmap_grouped(path='[stack]', rss=2465792, size=2494464, pss=2465792, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=2465792, referenced=2277376, anonymous=2465792, swap=0),
-     ...]
-    >>>
-    >>> p.io_counters()
-    pio(read_count=478001, write_count=59371, read_bytes=700416, write_bytes=69632, read_chars=456232, write_chars=517543)
-    >>>
-    >>> p.open_files()
-    [popenfile(path='/home/giampaolo/monit.py', fd=3, position=0, mode='r', flags=32768),
-     popenfile(path='/var/log/monit.log', fd=4, position=235542, mode='a', flags=33793)]
-    >>>
-    >>> p.connections()
-    [pconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED'),
-     pconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING')]
-    >>>
-    >>> p.num_threads()
-    4
-    >>> p.num_fds()
-    8
-    >>> p.threads()
-    [pthread(id=5234, user_time=22.5, system_time=9.2891),
-     pthread(id=5237, user_time=0.0707, system_time=1.1)]
-    >>>
-    >>> p.num_ctx_switches()
-    pctxsw(voluntary=78, involuntary=19)
-    >>>
-    >>> p.nice()
-    0
-    >>> p.nice(10)  # set
-    >>>
-    >>> p.ionice(psutil.IOPRIO_CLASS_IDLE)  # IO priority (Win and Linux only)
-    >>> p.ionice()
-    pionice(ioclass=<IOPriority.IOPRIO_CLASS_IDLE: 3>, value=0)
-    >>>
-    >>> p.rlimit(psutil.RLIMIT_NOFILE, (5, 5))  # set resource limits (Linux only)
-    >>> p.rlimit(psutil.RLIMIT_NOFILE)
-    (5, 5)
-    >>>
-    >>> p.environ()
-    {'LC_PAPER': 'it_IT.UTF-8', 'SHELL': '/bin/bash', 'GREP_OPTIONS': '--color=auto',
-    'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg',
-     ...}
-    >>>
-    >>> p.as_dict()
-    {'status': 'running', 'num_ctx_switches': pctxsw(voluntary=63, involuntary=1), 'pid': 5457, ...}
-    >>> p.is_running()
-    True
-    >>> p.suspend()
-    >>> p.resume()
-    >>>
-    >>> p.terminate()
-    >>> p.kill()
-    >>> p.wait(timeout=3)
-    0
-    >>>
-    >>> psutil.test()
-    USER         PID %CPU %MEM     VSZ     RSS TTY        START    TIME  COMMAND
-    root           1  0.0  0.0   24584    2240            Jun17   00:00  init
-    root           2  0.0  0.0       0       0            Jun17   00:00  kthreadd
-    ...
-    giampaolo  31475  0.0  0.0   20760    3024 /dev/pts/0 Jun19   00:00  python2.4
-    giampaolo  31721  0.0  2.2  773060  181896            00:04   10:30  chrome
-    root       31763  0.0  0.0       0       0            00:05   00:00  kworker/0:1
-    >>>
-
-Further process APIs
---------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> for proc in psutil.process_iter(['pid', 'name']):
-    ...     print(proc.info)
-    ...
-    {'pid': 1, 'name': 'systemd'}
-    {'pid': 2, 'name': 'kthreadd'}
-    {'pid': 3, 'name': 'ksoftirqd/0'}
-    ...
-    >>>
-    >>> psutil.pid_exists(3)
-    True
-    >>>
-    >>> def on_terminate(proc):
-    ...     print("process {} terminated".format(proc))
-    ...
-    >>> # waits for multiple processes to terminate
-    >>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
-    >>>
-
-Popen wrapper:
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> from subprocess import PIPE
-    >>> p = psutil.Popen(["/usr/bin/python", "-c", "print('hello')"], stdout=PIPE)
-    >>> p.name()
-    'python'
-    >>> p.username()
-    'giampaolo'
-    >>> p.communicate()
-    ('hello\n', None)
-    >>> p.wait(timeout=2)
-    0
-    >>>
-
-Windows services
-----------------
-
-.. code-block:: python
-
-    >>> list(psutil.win_service_iter())
-    [<WindowsService(name='AeLookupSvc', display_name='Application Experience') at 38850096>,
-     <WindowsService(name='ALG', display_name='Application Layer Gateway Service') at 38850128>,
-     <WindowsService(name='APNMCP', display_name='Ask Update Service') at 38850160>,
-     <WindowsService(name='AppIDSvc', display_name='Application Identity') at 38850192>,
-     ...]
-    >>> s = psutil.win_service_get('alg')
-    >>> s.as_dict()
-    {'binpath': 'C:\\Windows\\System32\\alg.exe',
-     'description': 'Provides support for 3rd party protocol plug-ins for Internet Connection Sharing',
-     'display_name': 'Application Layer Gateway Service',
-     'name': 'alg',
-     'pid': None,
-     'start_type': 'manual',
-     'status': 'stopped',
-     'username': 'NT AUTHORITY\\LocalService'}
-
-
-.. _`Giampaolo Rodola`: http://grodola.blogspot.com/p/about.html
-.. _`donation`: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A9ZS7PKKRM3S8
-.. _Tidelift security contact: https://tidelift.com/security
-.. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/battery.py firefox-85.0+build1/third_party/python/psutil/scripts/battery.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/battery.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/battery.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Show battery information.
-
-$ python scripts/battery.py
-charge:     74%
-left:       2:11:31
-status:     discharging
-plugged in: no
-"""
-
-from __future__ import print_function
-import sys
-
-import psutil
-
-
-def secs2hours(secs):
-    mm, ss = divmod(secs, 60)
-    hh, mm = divmod(mm, 60)
-    return "%d:%02d:%02d" % (hh, mm, ss)
-
-
-def main():
-    if not hasattr(psutil, "sensors_battery"):
-        return sys.exit("platform not supported")
-    batt = psutil.sensors_battery()
-    if batt is None:
-        return sys.exit("no battery is installed")
-
-    print("charge:     %s%%" % round(batt.percent, 2))
-    if batt.power_plugged:
-        print("status:     %s" % (
-            "charging" if batt.percent < 100 else "fully charged"))
-        print("plugged in: yes")
-    else:
-        print("left:       %s" % secs2hours(batt.secsleft))
-        print("status:     %s" % "discharging")
-        print("plugged in: no")
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/cpu_distribution.py firefox-85.0+build1/third_party/python/psutil/scripts/cpu_distribution.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/cpu_distribution.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/cpu_distribution.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Shows CPU workload split across different CPUs.
-
-$ python scripts/cpu_workload.py
-CPU 0     CPU 1     CPU 2     CPU 3     CPU 4     CPU 5     CPU 6     CPU 7
-19.8      20.6      18.2      15.8      6.9       17.3      5.0       20.4
-gvfsd     pytho     kwork     chrom     unity     kwork     kwork     kwork
-chrom     chrom     indic     ibus-     whoop     nfsd      (sd-p     gvfsd
-ibus-     cat       at-sp     chrom     Modem     nfsd4     light     upsta
-ibus-     iprt-     ibus-     nacl_     cfg80     kwork     nfsd      bluet
-chrom     irqba     gpg-a     chrom     ext4-     biose     nfsd      dio/n
-chrom     acpid     bamfd     nvidi     kwork     scsi_     sshd      rpc.m
-upsta     rsysl     dbus-     nfsd      biose     scsi_     ext4-     polki
-rtkit     avahi     upowe     Netwo     scsi_     biose     UVM T     irq/9
-light     rpcbi     snapd     cron      ipv6_     biose     kwork     dbus-
-agett     kvm-i     avahi     kwork     biose     biose     scsi_     syste
-nfsd      syste     rpc.i     biose     biose     kbloc     kthro     UVM g
-nfsd      kwork     kwork     biose     vmsta     kwork     crypt     kaudi
-nfsd      scsi_     charg     biose     md        ksoft     kwork     kwork
-memca     biose     ksmd      ecryp     ksoft     watch     migra     nvme
-therm     biose     kcomp     kswap     migra     cpuhp     watch     biose
-syste     biose     kdevt     khuge     watch               cpuhp     biose
-led_w     devfr     kwork     write     cpuhp                         biose
-rpcio     oom_r     ksoft     kwork     syste                         biose
-kwork     kwork     watch     migra                                   acpi_
-biose     ksoft     cpuhp     watch                                   watch
-biose     migra               cpuhp                                   kinte
-biose     watch               rcu_s                                   netns
-biose     cpuhp               kthre                                   kwork
-cpuhp                                                                 ksoft
-watch                                                                 migra
-rcu_b                                                                 cpuhp
-kwork
-"""
-
-from __future__ import print_function
-import collections
-import os
-import sys
-import time
-
-import psutil
-from psutil._compat import get_terminal_size
-
-
-if not hasattr(psutil.Process, "cpu_num"):
-    sys.exit("platform not supported")
-
-
-def clean_screen():
-    if psutil.POSIX:
-        os.system('clear')
-    else:
-        os.system('cls')
-
-
-def main():
-    num_cpus = psutil.cpu_count()
-    if num_cpus > 8:
-        num_cpus = 8  # try to fit into screen
-        cpus_hidden = True
-    else:
-        cpus_hidden = False
-
-    while True:
-        # header
-        clean_screen()
-        cpus_percent = psutil.cpu_percent(percpu=True)
-        for i in range(num_cpus):
-            print("CPU %-6i" % i, end="")
-        if cpus_hidden:
-            print(" (+ hidden)", end="")
-
-        print()
-        for _ in range(num_cpus):
-            print("%-10s" % cpus_percent.pop(0), end="")
-        print()
-
-        # processes
-        procs = collections.defaultdict(list)
-        for p in psutil.process_iter(['name', 'cpu_num']):
-            procs[p.info['cpu_num']].append(p.info['name'][:5])
-
-        curr_line = 3
-        while True:
-            for num in range(num_cpus):
-                try:
-                    pname = procs[num].pop()
-                except IndexError:
-                    pname = ""
-                print("%-10s" % pname[:10], end="")
-            print()
-            curr_line += 1
-            if curr_line >= get_terminal_size()[1]:
-                break
-
-        time.sleep(1)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/disk_usage.py firefox-85.0+build1/third_party/python/psutil/scripts/disk_usage.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/disk_usage.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/disk_usage.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-List all mounted disk partitions a-la "df -h" command.
-
-$ python scripts/disk_usage.py
-Device               Total     Used     Free  Use %      Type  Mount
-/dev/sdb3            18.9G    14.7G     3.3G    77%      ext4  /
-/dev/sda6           345.9G    83.8G   244.5G    24%      ext4  /home
-/dev/sda1           296.0M    43.1M   252.9M    14%      vfat  /boot/efi
-/dev/sda2           600.0M   312.4M   287.6M    52%   fuseblk  /media/Recovery
-"""
-
-import sys
-import os
-import psutil
-from psutil._common import bytes2human
-
-
-def main():
-    templ = "%-17s %8s %8s %8s %5s%% %9s  %s"
-    print(templ % ("Device", "Total", "Used", "Free", "Use ", "Type",
-                   "Mount"))
-    for part in psutil.disk_partitions(all=False):
-        if os.name == 'nt':
-            if 'cdrom' in part.opts or part.fstype == '':
-                # skip cd-rom drives with no disk in it; they may raise
-                # ENOENT, pop-up a Windows GUI error for a non-ready
-                # partition or just hang.
-                continue
-        usage = psutil.disk_usage(part.mountpoint)
-        print(templ % (
-            part.device,
-            bytes2human(usage.total),
-            bytes2human(usage.used),
-            bytes2human(usage.free),
-            int(usage.percent),
-            part.fstype,
-            part.mountpoint))
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/fans.py firefox-85.0+build1/third_party/python/psutil/scripts/fans.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/fans.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/fans.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Show fans information.
-
-$ python fans.py
-asus
-    cpu_fan              3200 RPM
-"""
-
-from __future__ import print_function
-import sys
-
-import psutil
-
-
-def main():
-    if not hasattr(psutil, "sensors_fans"):
-        return sys.exit("platform not supported")
-    fans = psutil.sensors_fans()
-    if not fans:
-        print("no fans detected")
-        return
-    for name, entries in fans.items():
-        print(name)
-        for entry in entries:
-            print("    %-20s %s RPM" % (entry.label or name, entry.current))
-        print()
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/free.py firefox-85.0+build1/third_party/python/psutil/scripts/free.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/free.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/free.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'free' cmdline utility.
-
-$ python scripts/free.py
-             total       used       free     shared    buffers      cache
-Mem:      10125520    8625996    1499524          0     349500    3307836
-Swap:            0          0          0
-"""
-
-import psutil
-
-
-def main():
-    virt = psutil.virtual_memory()
-    swap = psutil.swap_memory()
-    templ = "%-7s %10s %10s %10s %10s %10s %10s"
-    print(templ % ('', 'total', 'used', 'free', 'shared', 'buffers', 'cache'))
-    print(templ % (
-        'Mem:',
-        int(virt.total / 1024),
-        int(virt.used / 1024),
-        int(virt.free / 1024),
-        int(getattr(virt, 'shared', 0) / 1024),
-        int(getattr(virt, 'buffers', 0) / 1024),
-        int(getattr(virt, 'cached', 0) / 1024)))
-    print(templ % (
-        'Swap:', int(swap.total / 1024),
-        int(swap.used / 1024),
-        int(swap.free / 1024),
-        '',
-        '',
-        ''))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/ifconfig.py firefox-85.0+build1/third_party/python/psutil/scripts/ifconfig.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/ifconfig.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/ifconfig.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,100 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'ifconfig' on UNIX.
-
-$ python scripts/ifconfig.py
-lo:
-    stats          : speed=0MB, duplex=?, mtu=65536, up=yes
-    incoming       : bytes=1.95M, pkts=22158, errs=0, drops=0
-    outgoing       : bytes=1.95M, pkts=22158, errs=0, drops=0
-    IPv4 address   : 127.0.0.1
-         netmask   : 255.0.0.0
-    IPv6 address   : ::1
-         netmask   : ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-    MAC  address   : 00:00:00:00:00:00
-
-docker0:
-    stats          : speed=0MB, duplex=?, mtu=1500, up=yes
-    incoming       : bytes=3.48M, pkts=65470, errs=0, drops=0
-    outgoing       : bytes=164.06M, pkts=112993, errs=0, drops=0
-    IPv4 address   : 172.17.0.1
-         broadcast : 172.17.0.1
-         netmask   : 255.255.0.0
-    IPv6 address   : fe80::42:27ff:fe5e:799e%docker0
-         netmask   : ffff:ffff:ffff:ffff::
-    MAC  address   : 02:42:27:5e:79:9e
-         broadcast : ff:ff:ff:ff:ff:ff
-
-wlp3s0:
-    stats          : speed=0MB, duplex=?, mtu=1500, up=yes
-    incoming       : bytes=7.04G, pkts=5637208, errs=0, drops=0
-    outgoing       : bytes=372.01M, pkts=3200026, errs=0, drops=0
-    IPv4 address   : 10.0.0.2
-         broadcast : 10.255.255.255
-         netmask   : 255.0.0.0
-    IPv6 address   : fe80::ecb3:1584:5d17:937%wlp3s0
-         netmask   : ffff:ffff:ffff:ffff::
-    MAC  address   : 48:45:20:59:a4:0c
-         broadcast : ff:ff:ff:ff:ff:ff
-"""
-
-from __future__ import print_function
-import socket
-
-import psutil
-from psutil._common import bytes2human
-
-
-af_map = {
-    socket.AF_INET: 'IPv4',
-    socket.AF_INET6: 'IPv6',
-    psutil.AF_LINK: 'MAC',
-}
-
-duplex_map = {
-    psutil.NIC_DUPLEX_FULL: "full",
-    psutil.NIC_DUPLEX_HALF: "half",
-    psutil.NIC_DUPLEX_UNKNOWN: "?",
-}
-
-
-def main():
-    stats = psutil.net_if_stats()
-    io_counters = psutil.net_io_counters(pernic=True)
-    for nic, addrs in psutil.net_if_addrs().items():
-        print("%s:" % (nic))
-        if nic in stats:
-            st = stats[nic]
-            print("    stats          : ", end='')
-            print("speed=%sMB, duplex=%s, mtu=%s, up=%s" % (
-                st.speed, duplex_map[st.duplex], st.mtu,
-                "yes" if st.isup else "no"))
-        if nic in io_counters:
-            io = io_counters[nic]
-            print("    incoming       : ", end='')
-            print("bytes=%s, pkts=%s, errs=%s, drops=%s" % (
-                bytes2human(io.bytes_recv), io.packets_recv, io.errin,
-                io.dropin))
-            print("    outgoing       : ", end='')
-            print("bytes=%s, pkts=%s, errs=%s, drops=%s" % (
-                bytes2human(io.bytes_sent), io.packets_sent, io.errout,
-                io.dropout))
-        for addr in addrs:
-            print("    %-4s" % af_map.get(addr.family, addr.family), end="")
-            print(" address   : %s" % addr.address)
-            if addr.broadcast:
-                print("         broadcast : %s" % addr.broadcast)
-            if addr.netmask:
-                print("         netmask   : %s" % addr.netmask)
-            if addr.ptp:
-                print("      p2p       : %s" % addr.ptp)
-        print("")
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/bench_oneshot_2.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/bench_oneshot_2.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/bench_oneshot_2.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/bench_oneshot_2.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Same as bench_oneshot.py but uses perf module instead, which is
-supposed to be more precise.
-"""
-
-import sys
-
-import pyperf  # requires "pip install pyperf"
-
-import psutil
-from bench_oneshot import names
-
-
-p = psutil.Process()
-funs = [getattr(p, n) for n in names]
-
-
-def call_normal():
-    for fun in funs:
-        fun()
-
-
-def call_oneshot():
-    with p.oneshot():
-        for fun in funs:
-            fun()
-
-
-def add_cmdline_args(cmd, args):
-    cmd.append(args.benchmark)
-
-
-def main():
-    runner = pyperf.Runner()
-
-    args = runner.parse_args()
-    if not args.worker:
-        print("%s methods involved on platform %r (psutil %s):" % (
-            len(names), sys.platform, psutil.__version__))
-        for name in sorted(names):
-            print("    " + name)
-
-    runner.bench_func("normal", call_normal)
-    runner.bench_func("oneshot", call_oneshot)
-
-
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/bench_oneshot.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/bench_oneshot.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/bench_oneshot.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/bench_oneshot.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,154 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A simple micro benchmark script which prints the speedup when using
-Process.oneshot() ctx manager.
-See: https://github.com/giampaolo/psutil/issues/799
-"""
-
-from __future__ import print_function, division
-import sys
-import timeit
-import textwrap
-
-import psutil
-
-
-ITERATIONS = 1000
-
-# The list of Process methods which gets collected in one shot and
-# as such get advantage of the speedup.
-names = [
-    'cpu_times',
-    'cpu_percent',
-    'memory_info',
-    'memory_percent',
-    'ppid',
-    'parent',
-]
-
-if psutil.POSIX:
-    names.append('uids')
-    names.append('username')
-
-if psutil.LINUX:
-    names += [
-        # 'memory_full_info',
-        # 'memory_maps',
-        'cpu_num',
-        'cpu_times',
-        'gids',
-        'name',
-        'num_ctx_switches',
-        'num_threads',
-        'ppid',
-        'status',
-        'terminal',
-        'uids',
-    ]
-elif psutil.BSD:
-    names = [
-        'cpu_times',
-        'gids',
-        'io_counters',
-        'memory_full_info',
-        'memory_info',
-        'name',
-        'num_ctx_switches',
-        'ppid',
-        'status',
-        'terminal',
-        'uids',
-    ]
-    if psutil.FREEBSD:
-        names.append('cpu_num')
-elif psutil.SUNOS:
-    names += [
-        'cmdline',
-        'gids',
-        'memory_full_info',
-        'memory_info',
-        'name',
-        'num_threads',
-        'ppid',
-        'status',
-        'terminal',
-        'uids',
-    ]
-elif psutil.MACOS:
-    names += [
-        'cpu_times',
-        'create_time',
-        'gids',
-        'memory_info',
-        'name',
-        'num_ctx_switches',
-        'num_threads',
-        'ppid',
-        'terminal',
-        'uids',
-    ]
-elif psutil.WINDOWS:
-    names += [
-        'num_ctx_switches',
-        'num_threads',
-        # dual implementation, called in case of AccessDenied
-        'num_handles',
-        'cpu_times',
-        'create_time',
-        'num_threads',
-        'io_counters',
-        'memory_info',
-    ]
-
-names = sorted(set(names))
-
-setup = textwrap.dedent("""
-    from __main__ import names
-    import psutil
-
-    def call_normal(funs):
-        for fun in funs:
-            fun()
-
-    def call_oneshot(funs):
-        with p.oneshot():
-            for fun in funs:
-                fun()
-
-    p = psutil.Process()
-    funs = [getattr(p, n) for n in names]
-    """)
-
-
-def main():
-    print("%s methods involved on platform %r (%s iterations, psutil %s):" % (
-        len(names), sys.platform, ITERATIONS, psutil.__version__))
-    for name in sorted(names):
-        print("    " + name)
-
-    # "normal" run
-    elapsed1 = timeit.timeit(
-        "call_normal(funs)", setup=setup, number=ITERATIONS)
-    print("normal:  %.3f secs" % elapsed1)
-
-    # "one shot" run
-    elapsed2 = timeit.timeit(
-        "call_oneshot(funs)", setup=setup, number=ITERATIONS)
-    print("onshot:  %.3f secs" % elapsed2)
-
-    # done
-    if elapsed2 < elapsed1:
-        print("speedup: +%.2fx" % (elapsed1 / elapsed2))
-    elif elapsed2 > elapsed1:
-        print("slowdown: -%.2fx" % (elapsed2 / elapsed1))
-    else:
-        print("same speed")
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/check_broken_links.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/check_broken_links.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/check_broken_links.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/check_broken_links.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,259 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola', Himanshu Shekhar.
-# All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-
-"""
-Checks for broken links in file names specified as command line
-parameters.
-
-There are a ton of a solutions available for validating URLs in string
-using regex, but less for searching, of which very few are accurate.
-This snippet is intended to just do the required work, and avoid
-complexities. Django Validator has pretty good regex for validation,
-but we have to find urls instead of validating them (REFERENCES [7]).
-There's always room for improvement.
-
-Method:
-* Match URLs using regex (REFERENCES [1]])
-* Some URLs need to be fixed, as they have < (or) > due to inefficient
-  regex.
-* Remove duplicates (because regex is not 100% efficient as of now).
-* Check validity of URL, using HEAD request. (HEAD to save bandwidth)
-  Uses requests module for others are painful to use. REFERENCES[9]
-  Handles redirects, http, https, ftp as well.
-
-REFERENCES:
-Using [1] with some modificatons for including ftp
-[1] http://stackoverflow.com/a/6883094/5163807
-[2] http://stackoverflow.com/a/31952097/5163807
-[3] http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-[4] https://mathiasbynens.be/demo/url-regex
-[5] https://github.com/django/django/blob/master/django/core/validators.py
-[6] https://data.iana.org/TLD/tlds-alpha-by-domain.txt
-[7] https://codereview.stackexchange.com/questions/19663/http-url-validating
-[8] https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD
-[9] http://docs.python-requests.org/
-
-Author: Himanshu Shekhar <https://github.com/himanshub16> (2017)
-"""
-
-from __future__ import print_function
-
-import concurrent.futures
-import functools
-import os
-import re
-import sys
-import traceback
-
-import requests
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-REGEX = re.compile(
-    r'(?:http|ftp|https)?://'
-    r'(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+')
-REQUEST_TIMEOUT = 15
-# There are some status codes sent by websites on HEAD request.
-# Like 503 by Microsoft, and 401 by Apple
-# They need to be sent GET request
-RETRY_STATUSES = [503, 401, 403]
-
-
-def memoize(fun):
-    """A memoize decorator."""
-    @functools.wraps(fun)
-    def wrapper(*args, **kwargs):
-        key = (args, frozenset(sorted(kwargs.items())))
-        try:
-            return cache[key]
-        except KeyError:
-            ret = cache[key] = fun(*args, **kwargs)
-            return ret
-
-    cache = {}
-    return wrapper
-
-
-def sanitize_url(url):
-    url = url.rstrip(',')
-    url = url.rstrip('.')
-    url = url.lstrip('(')
-    url = url.rstrip(')')
-    url = url.lstrip('[')
-    url = url.rstrip(']')
-    url = url.lstrip('<')
-    url = url.rstrip('>')
-    return url
-
-
-def find_urls(s):
-    matches = REGEX.findall(s) or []
-    return list(set([sanitize_url(x) for x in matches]))
-
-
-def parse_rst(fname):
-    """Look for links in a .rst file."""
-    with open(fname) as f:
-        text = f.read()
-    urls = find_urls(text)
-    # HISTORY file has a lot of dead links.
-    if fname == 'HISTORY.rst' and urls:
-        urls = [
-            x for x in urls if
-            not x.startswith('https://github.com/giampaolo/psutil/issues')]
-    return urls
-
-
-def parse_py(fname):
-    """Look for links in a .py file."""
-    with open(fname) as f:
-        lines = f.readlines()
-    urls = set()
-    for i, line in enumerate(lines):
-        for url in find_urls(line):
-            # comment block
-            if line.lstrip().startswith('# '):
-                subidx = i + 1
-                while True:
-                    nextline = lines[subidx].strip()
-                    if re.match('^#     .+', nextline):
-                        url += nextline[1:].strip()
-                    else:
-                        break
-                    subidx += 1
-            urls.add(url)
-    return list(urls)
-
-
-def parse_c(fname):
-    """Look for links in a .py file."""
-    with open(fname) as f:
-        lines = f.readlines()
-    urls = set()
-    for i, line in enumerate(lines):
-        for url in find_urls(line):
-            # comment block //
-            if line.lstrip().startswith('// '):
-                subidx = i + 1
-                while True:
-                    nextline = lines[subidx].strip()
-                    if re.match('^//     .+', nextline):
-                        url += nextline[2:].strip()
-                    else:
-                        break
-                    subidx += 1
-            # comment block /*
-            elif line.lstrip().startswith('* '):
-                subidx = i + 1
-                while True:
-                    nextline = lines[subidx].strip()
-                    if re.match(r'^\*     .+', nextline):
-                        url += nextline[1:].strip()
-                    else:
-                        break
-                    subidx += 1
-            urls.add(url)
-    return list(urls)
-
-
-def parse_generic(fname):
-    with open(fname, 'rt', errors='ignore') as f:
-        text = f.read()
-    return find_urls(text)
-
-
-def get_urls(fname):
-    """Extracts all URLs in fname and return them as a list."""
-    if fname.endswith('.rst'):
-        return parse_rst(fname)
-    elif fname.endswith('.py'):
-        return parse_py(fname)
-    elif fname.endswith('.c') or fname.endswith('.h'):
-        return parse_c(fname)
-    else:
-        with open(fname, 'rt', errors='ignore') as f:
-            if f.readline().strip().startswith('#!/usr/bin/env python3'):
-                return parse_py(fname)
-        return parse_generic(fname)
-
-
-@memoize
-def validate_url(url):
-    """Validate the URL by attempting an HTTP connection.
-    Makes an HTTP-HEAD request for each URL.
-    """
-    try:
-        res = requests.head(url, timeout=REQUEST_TIMEOUT)
-        # some websites deny 503, like Microsoft
-        # and some send 401, like Apple, observations
-        if (not res.ok) and (res.status_code in RETRY_STATUSES):
-            res = requests.get(url, timeout=REQUEST_TIMEOUT)
-        return res.ok
-    except requests.exceptions.RequestException:
-        return False
-
-
-def parallel_validator(urls):
-    """validates all urls in parallel
-    urls: tuple(filename, url)
-    """
-    fails = []  # list of tuples (filename, url)
-    current = 0
-    total = len(urls)
-    with concurrent.futures.ThreadPoolExecutor() as executor:
-        fut_to_url = {executor.submit(validate_url, url[1]): url
-                      for url in urls}
-        for fut in concurrent.futures.as_completed(fut_to_url):
-            current += 1
-            sys.stdout.write("\r%s / %s" % (current, total))
-            sys.stdout.flush()
-            fname, url = fut_to_url[fut]
-            try:
-                ok = fut.result()
-            except Exception:
-                fails.append((fname, url))
-                print()
-                print("warn: error while validating %s" % url, file=sys.stderr)
-                traceback.print_exc()
-            else:
-                if not ok:
-                    fails.append((fname, url))
-
-    print()
-    return fails
-
-
-def main():
-    files = sys.argv[1:]
-    if not files:
-        print("usage: %s <FILES...>" % sys.argv[0], file=sys.stderr)
-        return sys.exit(1)
-
-    all_urls = []
-    for fname in files:
-        urls = get_urls(fname)
-        if urls:
-            print("%4s %s" % (len(urls), fname))
-            for url in urls:
-                all_urls.append((fname, url))
-
-    fails = parallel_validator(all_urls)
-    if not fails:
-        print("all links are valid; cheers!")
-    else:
-        for fail in fails:
-            fname, url = fail
-            print("%-30s: %s " % (fname, url))
-        print('-' * 20)
-        print("total: %s fails!" % len(fails))
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    try:
-        main()
-    except (KeyboardInterrupt, SystemExit):
-        os._exit(0)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/clinter.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/clinter.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/clinter.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/clinter.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""A super simple linter to check C syntax."""
-
-from __future__ import print_function
-import argparse
-import sys
-
-
-warned = False
-
-
-def warn(path, line, lineno, msg):
-    global warned
-    warned = True
-    print("%s:%s: %s" % (path, lineno, msg), file=sys.stderr)
-
-
-def check_line(path, line, idx, lines):
-    s = line
-    lineno = idx + 1
-    eof = lineno == len(lines)
-    if s.endswith(' \n'):
-        warn(path, line, lineno, "extra space at EOL")
-    elif '\t' in line:
-        warn(path, line, lineno, "line has a tab")
-    elif s.endswith('\r\n'):
-        warn(path, line, lineno, "Windows line ending")
-    # end of global block, e.g. "}newfunction...":
-    elif s == "}\n":
-        if not eof:
-            nextline = lines[idx + 1]
-            # "#" is a pre-processor line
-            if nextline != '\n' and \
-                    nextline.strip()[0] != '#' and \
-                    nextline.strip()[:2] != '*/':
-                warn(path, line, lineno, "expected 1 blank line")
-
-    sls = s.lstrip()
-    if sls.startswith('//') and sls[2] != ' ' and line.strip() != '//':
-        warn(path, line, lineno, "no space after // comment")
-
-    # e.g. "if(..." after keywords
-    keywords = ("if", "else", "while", "do", "enum", "for")
-    for kw in keywords:
-        if sls.startswith(kw + '('):
-            warn(path, line, lineno, "missing space between %r and '('" % kw)
-    # eof
-    if eof:
-        if not line.endswith('\n'):
-            warn(path, line, lineno, "no blank line at EOF")
-
-
-def process(path):
-    with open(path, 'rt') as f:
-        lines = f.readlines()
-    for idx, line in enumerate(lines):
-        check_line(path, line, idx, lines)
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('paths', nargs='+', help='path(s) to a file(s)')
-    args = parser.parse_args()
-    for path in args.paths:
-        process(path)
-    if warned:
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/fix_flake8.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/fix_flake8.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/fix_flake8.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/fix_flake8.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Fix some flake8 errors by rewriting files for which flake8 emitted
-an error/warning. Usage (from the root dir):
-
-    $ python3 -m flake8 --exit-zero | python3 scripts/fix_flake8.py
-"""
-
-import sys
-import tempfile
-import shutil
-from collections import defaultdict
-from collections import namedtuple
-from pprint import pprint as pp  # NOQA
-
-
-ntentry = namedtuple('ntentry', 'msg, issue, lineno, pos, descr')
-
-
-# =====================================================================
-# utils
-# =====================================================================
-
-
-def enter_pdb():
-    from pdb import set_trace as st  # trick GIT commit hook
-    sys.stdin = open('/dev/tty')
-    st()
-
-
-def read_lines(fname):
-    with open(fname, 'rt') as f:
-        return f.readlines()
-
-
-def read_line(fname, lineno):
-    with open(fname, 'rt') as f:
-        for i, line in enumerate(f, 1):
-            if i == lineno:
-                return line
-    raise ValueError("lineno too big")
-
-
-def write_file(fname, newlines):
-    with tempfile.NamedTemporaryFile('wt', delete=False) as f:
-        for line in newlines:
-            f.write(line)
-    shutil.move(f.name, fname)
-
-
-# =====================================================================
-# handlers
-# =====================================================================
-
-
-def handle_f401(fname, lineno):
-    """ This is 'module imported but not used'
-    Able to handle this case:
-        import os
-
-    ...but not this:
-        from os import listdir
-    """
-    line = read_line(fname, lineno).strip()
-    if line.startswith('import '):
-        return True
-    else:
-        mods = line.partition(' import ')[2]  # everything after import
-        return ',' not in mods
-
-
-# =====================================================================
-# converters
-# =====================================================================
-
-
-def remove_lines(fname, entries):
-    """Check if we should remove lines, then do it.
-    Return the numner of lines removed.
-    """
-    to_remove = []
-    for entry in entries:
-        msg, issue, lineno, pos, descr = entry
-        # 'module imported but not used'
-        if issue == 'F401' and handle_f401(fname, lineno):
-            to_remove.append(lineno)
-        # 'blank line(s) at end of file'
-        elif issue == 'W391':
-            lines = read_lines(fname)
-            i = len(lines) - 1
-            while lines[i] == '\n':
-                to_remove.append(i + 1)
-                i -= 1
-        # 'too many blank lines'
-        elif issue == 'E303':
-            howmany = descr.replace('(', '').replace(')', '')
-            howmany = int(howmany[-1])
-            for x in range(lineno - howmany, lineno):
-                to_remove.append(x)
-
-    if to_remove:
-        newlines = []
-        for i, line in enumerate(read_lines(fname), 1):
-            if i not in to_remove:
-                newlines.append(line)
-        print("removing line(s) from %s" % fname)
-        write_file(fname, newlines)
-
-    return len(to_remove)
-
-
-def add_lines(fname, entries):
-    """Check if we should remove lines, then do it.
-    Return the numner of lines removed.
-    """
-    EXPECTED_BLANK_LINES = (
-        'E302',  # 'expected 2 blank limes, found 1'
-        'E305')  # ìexpected 2 blank lines after class or fun definition'
-    to_add = {}
-    for entry in entries:
-        msg, issue, lineno, pos, descr = entry
-        if issue in EXPECTED_BLANK_LINES:
-            howmany = 2 if descr.endswith('0') else 1
-            to_add[lineno] = howmany
-
-    if to_add:
-        newlines = []
-        for i, line in enumerate(read_lines(fname), 1):
-            if i in to_add:
-                newlines.append('\n' * to_add[i])
-            newlines.append(line)
-        print("adding line(s) to %s" % fname)
-        write_file(fname, newlines)
-
-    return len(to_add)
-
-
-# =====================================================================
-# main
-# =====================================================================
-
-
-def build_table():
-    table = defaultdict(list)
-    for line in sys.stdin:
-        line = line.strip()
-        if not line:
-            break
-        fields = line.split(':')
-        fname, lineno, pos = fields[:3]
-        issue = fields[3].split()[0]
-        descr = fields[3].strip().partition(' ')[2]
-        lineno, pos = int(lineno), int(pos)
-        table[fname].append(ntentry(line, issue, lineno, pos, descr))
-    return table
-
-
-def main():
-    table = build_table()
-
-    # remove lines (unused imports)
-    removed = 0
-    for fname, entries in table.items():
-        removed += remove_lines(fname, entries)
-    if removed:
-        print("%s lines were removed from some file(s); please re-run" %
-              removed)
-        return
-
-    # add lines (missing \n between functions/classes)
-    added = 0
-    for fname, entries in table.items():
-        added += add_lines(fname, entries)
-    if added:
-        print("%s lines were added from some file(s); please re-run" %
-              added)
-        return
-
-
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/generate_manifest.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/generate_manifest.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/generate_manifest.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/generate_manifest.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Generate MANIFEST.in file.
-"""
-
-import os
-import subprocess
-
-
-SKIP_EXTS = ('.png', '.jpg', '.jpeg')
-SKIP_FILES = ('.travis.yml', 'appveyor.yml')
-SKIP_PREFIXES = ('.ci/', '.github/')
-
-
-def sh(cmd):
-    return subprocess.check_output(
-        cmd, shell=True, universal_newlines=True).strip()
-
-
-def main():
-    files = sh("git ls-files").split('\n')
-    for file in files:
-        if file.startswith(SKIP_PREFIXES) or \
-                os.path.splitext(file)[1].lower() in SKIP_EXTS or \
-                file in SKIP_FILES:
-            continue
-        print("include " + file)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/.git-pre-commit firefox-85.0+build1/third_party/python/psutil/scripts/internal/.git-pre-commit
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/.git-pre-commit	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/.git-pre-commit	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-This gets executed on 'git commit' and rejects the commit in case the
-submitted code does not pass validation. Validation is run only against
-the *.py files which were modified in the commit. Checks:
-
-- assert no space at EOLs
-- assert not pdb.set_trace in code
-- assert no bare except clause ("except:") in code
-- assert "flake8" returns no warnings
-
-Install this with "make install-git-hooks".
-"""
-
-from __future__ import print_function
-import os
-import subprocess
-import sys
-
-
-def term_supports_colors():
-    try:
-        import curses
-        assert sys.stderr.isatty()
-        curses.setupterm()
-        assert curses.tigetnum("colors") > 0
-    except Exception:
-        return False
-    else:
-        return True
-
-
-def hilite(s, ok=True, bold=False):
-    """Return an highlighted version of 'string'."""
-    if not term_supports_colors():
-        return s
-    attr = []
-    if ok is None:  # no color
-        pass
-    elif ok:   # green
-        attr.append('32')
-    else:   # red
-        attr.append('31')
-    if bold:
-        attr.append('1')
-    return '\x1b[%sm%s\x1b[0m' % (';'.join(attr), s)
-
-
-def exit(msg):
-    msg = hilite(msg, ok=False)
-    print(msg, file=sys.stderr)
-    sys.exit(1)
-
-
-def sh(cmd):
-    """run cmd in a subprocess and return its output.
-    raises RuntimeError on error.
-    """
-    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE, universal_newlines=True)
-    stdout, stderr = p.communicate()
-    if p.returncode != 0:
-        raise RuntimeError(stderr)
-    if stderr:
-        print(stderr, file=sys.stderr)
-    if stdout.endswith('\n'):
-        stdout = stdout[:-1]
-    return stdout
-
-
-def main():
-    out = sh("git diff --cached --name-only")
-    py_files = [x for x in out.split('\n') if x.endswith('.py') and
-                os.path.exists(x)]
-    c_files = [x for x in out.split('\n') if x.endswith(('.c', '.h')) and
-               os.path.exists(x)]
-
-    lineno = 0
-    kw = {'encoding': 'utf8'} if sys.version_info[0] == 3 else {}
-    for path in py_files:
-        with open(path, 'rt', **kw) as f:
-            for line in f:
-                lineno += 1
-                # space at end of line
-                if line.endswith(' '):
-                    print("%s:%s %r" % (path, lineno, line))
-                    return exit(
-                        "commit aborted: space at end of line")
-                line = line.rstrip()
-                # pdb
-                if "pdb.set_trace" in line:
-                    print("%s:%s %s" % (path, lineno, line))
-                    return exit(
-                        "commit aborted: you forgot a pdb in your python code")
-                # bare except clause
-                if "except:" in line and not line.endswith("# NOQA"):
-                    print("%s:%s %s" % (path, lineno, line))
-                    return exit("commit aborted: bare except clause")
-
-    # Python linter
-    if py_files:
-        try:
-            import flake8  # NOQA
-        except ImportError:
-            return exit("commit aborted: flake8 is not installed; "
-                        "run 'make setup-dev-env'")
-
-        # XXX: we should escape spaces and possibly other amenities here
-        ret = subprocess.call(
-            "%s -m flake8 %s" % (sys.executable, " ".join(py_files)),
-            shell=True)
-        if ret != 0:
-            return exit("commit aborted: python code is not flake8 compliant")
-
-    # C linter
-    if c_files:
-        # XXX: we should escape spaces and possibly other amenities here
-        cmd = "%s scripts/internal/clinter.py %s" % (
-            sys.executable, " ".join(c_files))
-        print(cmd)
-        ret = subprocess.call(cmd, shell=True)
-        if ret != 0:
-            return exit("commit aborted: C code didn't pass style check")
-
-
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_access_denied.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_access_denied.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_access_denied.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_access_denied.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Helper script iterates over all processes and .
-It prints how many AccessDenied exceptions are raised in total and
-for what Process method.
-
-$ make print-access-denied
-API                  AD    Percent   Outcome
-memory_info          0        0.0%   SUCCESS
-uids                 0        0.0%   SUCCESS
-cmdline              0        0.0%   SUCCESS
-create_time          0        0.0%   SUCCESS
-status               0        0.0%   SUCCESS
-num_ctx_switches     0        0.0%   SUCCESS
-username             0        0.0%   SUCCESS
-ionice               0        0.0%   SUCCESS
-memory_percent       0        0.0%   SUCCESS
-gids                 0        0.0%   SUCCESS
-cpu_times            0        0.0%   SUCCESS
-nice                 0        0.0%   SUCCESS
-pid                  0        0.0%   SUCCESS
-cpu_percent          0        0.0%   SUCCESS
-num_threads          0        0.0%   SUCCESS
-cpu_num              0        0.0%   SUCCESS
-ppid                 0        0.0%   SUCCESS
-terminal             0        0.0%   SUCCESS
-name                 0        0.0%   SUCCESS
-threads              0        0.0%   SUCCESS
-cpu_affinity         0        0.0%   SUCCESS
-memory_maps          71      21.3%   ACCESS DENIED
-memory_full_info     71      21.3%   ACCESS DENIED
-exe                  174     52.1%   ACCESS DENIED
-environ              238     71.3%   ACCESS DENIED
-num_fds              238     71.3%   ACCESS DENIED
-io_counters          238     71.3%   ACCESS DENIED
-cwd                  238     71.3%   ACCESS DENIED
-connections          238     71.3%   ACCESS DENIED
-open_files           238     71.3%   ACCESS DENIED
---------------------------------------------------
-Totals: access-denied=1744, calls=10020, processes=334
-"""
-
-from __future__ import print_function, division
-from collections import defaultdict
-import time
-
-import psutil
-from psutil._common import print_color
-
-
-def main():
-    # collect
-    tot_procs = 0
-    tot_ads = 0
-    tot_calls = 0
-    signaler = object()
-    d = defaultdict(int)
-    start = time.time()
-    for p in psutil.process_iter(attrs=[], ad_value=signaler):
-        tot_procs += 1
-        for methname, value in p.info.items():
-            tot_calls += 1
-            if value is signaler:
-                tot_ads += 1
-                d[methname] += 1
-            else:
-                d[methname] += 0
-    elapsed = time.time() - start
-
-    # print
-    templ = "%-20s %-5s %-9s %s"
-    s = templ % ("API", "AD", "Percent", "Outcome")
-    print_color(s, color=None, bold=True)
-    for methname, ads in sorted(d.items(), key=lambda x: (x[1], x[0])):
-        perc = (ads / tot_procs) * 100
-        outcome = "SUCCESS" if not ads else "ACCESS DENIED"
-        s = templ % (methname, ads, "%6.1f%%" % perc, outcome)
-        print_color(s, "red" if ads else None)
-    tot_perc = round((tot_ads / tot_calls) * 100, 1)
-    print("-" * 50)
-    print("Totals: access-denied=%s (%s%%), calls=%s, processes=%s, "
-          "elapsed=%ss" % (tot_ads, tot_perc, tot_calls, tot_procs,
-                           round(elapsed, 2)))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_announce.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_announce.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_announce.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_announce.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Prints release announce based on HISTORY.rst file content.
-"""
-
-import os
-import re
-
-from psutil import __version__ as PRJ_VERSION
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-HISTORY = os.path.abspath(os.path.join(HERE, '../../HISTORY.rst'))
-
-PRJ_NAME = 'psutil'
-PRJ_URL_HOME = 'https://github.com/giampaolo/psutil'
-PRJ_URL_DOC = 'http://psutil.readthedocs.io'
-PRJ_URL_DOWNLOAD = 'https://pypi.org/project/psutil/#files'
-PRJ_URL_WHATSNEW = \
-    'https://github.com/giampaolo/psutil/blob/master/HISTORY.rst'
-
-template = """\
-Hello all,
-I'm glad to announce the release of {prj_name} {prj_version}:
-{prj_urlhome}
-
-About
-=====
-
-psutil (process and system utilities) is a cross-platform library for \
-retrieving information on running processes and system utilization (CPU, \
-memory, disks, network) in Python. It is useful mainly for system \
-monitoring, profiling and limiting process resources and management of \
-running processes. It implements many functionalities offered by command \
-line tools such as: ps, top, lsof, netstat, ifconfig, who, df, kill, free, \
-nice, ionice, iostat, iotop, uptime, pidof, tty, taskset, pmap. It \
-currently supports Linux, Windows, macOS, Sun Solaris, FreeBSD, OpenBSD, \
-NetBSD and AIX, both 32-bit and 64-bit architectures.  Supported Python \
-versions are 2.6, 2.7 and 3.4+. PyPy is also known to work.
-
-What's new
-==========
-
-{changes}
-
-Links
-=====
-
-- Home page: {prj_urlhome}
-- Download: {prj_urldownload}
-- Documentation: {prj_urldoc}
-- What's new: {prj_urlwhatsnew}
-
---
-
-Giampaolo - http://grodola.blogspot.com
-"""
-
-
-def get_changes():
-    """Get the most recent changes for this release by parsing
-    HISTORY.rst file.
-    """
-    with open(HISTORY) as f:
-        lines = f.readlines()
-
-    block = []
-
-    # eliminate the part preceding the first block
-    for i, line in enumerate(lines):
-        line = lines.pop(0)
-        if line.startswith('===='):
-            break
-    lines.pop(0)
-
-    for i, line in enumerate(lines):
-        line = lines.pop(0)
-        line = line.rstrip()
-        if re.match(r"^- \d+_: ", line):
-            num, _, rest = line.partition(': ')
-            num = ''.join([x for x in num if x.isdigit()])
-            line = "- #%s: %s" % (num, rest)
-
-        if line.startswith('===='):
-            break
-        block.append(line)
-
-    # eliminate bottom empty lines
-    block.pop(-1)
-    while not block[-1]:
-        block.pop(-1)
-
-    return "\n".join(block)
-
-
-def main():
-    changes = get_changes()
-    print(template.format(
-        prj_name=PRJ_NAME,
-        prj_version=PRJ_VERSION,
-        prj_urlhome=PRJ_URL_HOME,
-        prj_urldownload=PRJ_URL_DOWNLOAD,
-        prj_urldoc=PRJ_URL_DOC,
-        prj_urlwhatsnew=PRJ_URL_WHATSNEW,
-        changes=changes,
-    ))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_api_speed.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_api_speed.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_api_speed.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_api_speed.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Benchmark all API calls.
-
-$ make print_api_speed
-SYSTEM APIS               SECONDS
-----------------------------------
-cpu_count                 0.000014
-disk_usage                0.000027
-cpu_times                 0.000037
-cpu_percent               0.000045
-...
-
-PROCESS APIS              SECONDS
-----------------------------------
-create_time               0.000001
-nice                      0.000005
-cwd                       0.000011
-cpu_affinity              0.000011
-ionice                    0.000013
-...
-"""
-
-from __future__ import print_function, division
-from timeit import default_timer as timer
-import inspect
-import os
-
-import psutil
-from psutil._common import print_color
-
-
-timings = []
-templ = "%-25s %s"
-
-
-def print_timings():
-    timings.sort(key=lambda x: x[1])
-    i = 0
-    while timings[:]:
-        title, elapsed = timings.pop(0)
-        s = templ % (title, "%f" % elapsed)
-        if i > len(timings) - 5:
-            print_color(s, color="red")
-        else:
-            print(s)
-
-
-def timecall(title, fun, *args, **kw):
-    t = timer()
-    fun(*args, **kw)
-    elapsed = timer() - t
-    timings.append((title, elapsed))
-
-
-def main():
-    # --- system
-
-    public_apis = []
-    ignore = ['wait_procs', 'process_iter', 'win_service_get',
-              'win_service_iter']
-    if psutil.MACOS:
-        ignore.append('net_connections')  # raises AD
-    for name in psutil.__all__:
-        obj = getattr(psutil, name, None)
-        if inspect.isfunction(obj):
-            if name not in ignore:
-                public_apis.append(name)
-
-    print_color(templ % ("SYSTEM APIS", "SECONDS"), color=None, bold=True)
-    print("-" * 34)
-    for name in public_apis:
-        fun = getattr(psutil, name)
-        args = ()
-        if name == 'pid_exists':
-            args = (os.getpid(), )
-        elif name == 'disk_usage':
-            args = (os.getcwd(), )
-        timecall(name, fun, *args)
-    timecall('cpu_count (cores)', psutil.cpu_count, logical=False)
-    timecall('process_iter (all)', lambda: list(psutil.process_iter()))
-    print_timings()
-
-    # --- process
-    print("")
-    print_color(templ % ("PROCESS APIS", "SECONDS"), color=None, bold=True)
-    print("-" * 34)
-    ignore = ['send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
-              'as_dict', 'parent', 'parents', 'memory_info_ex', 'oneshot',
-              'pid', 'rlimit']
-    if psutil.MACOS:
-        ignore.append('memory_maps')  # XXX
-    p = psutil.Process()
-    for name in sorted(dir(p)):
-        if not name.startswith('_') and name not in ignore:
-            fun = getattr(p, name)
-            timecall(name, fun)
-    print_timings()
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_timeline.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_timeline.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/print_timeline.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/print_timeline.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Prints releases' timeline in RST format.
-"""
-
-import subprocess
-
-
-entry = """\
-- {date}:
-  `{ver} <https://pypi.org/project/psutil/#files>`__ -
-  `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#{nodotver}>`__ -
-  `diff <https://github.com/giampaolo/psutil/compare/{prevtag}...{tag}#files_bucket>`__"""  # NOQA
-
-
-def sh(cmd):
-    return subprocess.check_output(
-        cmd, shell=True, universal_newlines=True).strip()
-
-
-def get_tag_date(tag):
-    out = sh(r"git log -1 --format=%ai {}".format(tag))
-    return out.split(' ')[0]
-
-
-def main():
-    releases = []
-    out = sh("git tag")
-    for line in out.split('\n'):
-        tag = line.split(' ')[0]
-        ver = tag.replace('release-', '')
-        nodotver = ver.replace('.', '')
-        date = get_tag_date(tag)
-        releases.append((tag, ver, nodotver, date))
-    releases.sort(reverse=True)
-
-    for i, rel in enumerate(releases):
-        tag, ver, nodotver, date = rel
-        try:
-            prevtag = releases[i + 1][0]
-        except IndexError:
-            # get first commit
-            prevtag = sh("git rev-list --max-parents=0 HEAD")
-        print(entry.format(**locals()))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/purge_installation.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/purge_installation.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/purge_installation.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/purge_installation.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Purge psutil installation by removing psutil-related files and
-directories found in site-packages directories. This is needed mainly
-because sometimes "import psutil" imports a leftover installation
-from site-packages directory instead of the main working directory.
-"""
-
-import os
-import shutil
-import site
-
-
-PKGNAME = "psutil"
-
-
-def rmpath(path):
-    if os.path.isdir(path):
-        print("rmdir " + path)
-        shutil.rmtree(path)
-    else:
-        print("rm " + path)
-        os.remove(path)
-
-
-def main():
-    locations = [site.getusersitepackages()]
-    locations.extend(site.getsitepackages())
-    for root in locations:
-        if os.path.isdir(root):
-            for name in os.listdir(root):
-                if PKGNAME in name:
-                    abspath = os.path.join(root, name)
-                    rmpath(abspath)
-
-
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/README firefox-85.0+build1/third_party/python/psutil/scripts/internal/README
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/README	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-This directory contains scripts which are meant to be used internally
-(benchmarks, CI automation, etc.).
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/win_download_wheels.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/win_download_wheels.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/win_download_wheels.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/win_download_wheels.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Script which downloads exe and wheel files hosted on AppVeyor:
-https://ci.appveyor.com/project/giampaolo/psutil
-Readapted from the original recipe of Ibarra Corretge'
-<saghul@gmail.com>:
-http://code.saghul.net/index.php/2015/09/09/
-"""
-
-from __future__ import print_function
-import argparse
-import concurrent.futures
-import errno
-import os
-import requests
-import shutil
-import sys
-
-from psutil import __version__ as PSUTIL_VERSION
-from psutil._common import bytes2human
-from psutil._common import print_color
-
-
-BASE_URL = 'https://ci.appveyor.com/api'
-PY_VERSIONS = ['2.7', '3.5', '3.6', '3.7', '3.8']
-TIMEOUT = 30
-COLORS = True
-
-
-def safe_makedirs(path):
-    try:
-        os.makedirs(path)
-    except OSError as err:
-        if err.errno == errno.EEXIST:
-            if not os.path.isdir(path):
-                raise
-        else:
-            raise
-
-
-def safe_rmtree(path):
-    def onerror(fun, path, excinfo):
-        exc = excinfo[1]
-        if exc.errno != errno.ENOENT:
-            raise
-
-    shutil.rmtree(path, onerror=onerror)
-
-
-def download_file(url):
-    local_fname = url.split('/')[-1]
-    local_fname = os.path.join('dist', local_fname)
-    safe_makedirs('dist')
-    r = requests.get(url, stream=True, timeout=TIMEOUT)
-    tot_bytes = 0
-    with open(local_fname, 'wb') as f:
-        for chunk in r.iter_content(chunk_size=16384):
-            if chunk:    # filter out keep-alive new chunks
-                f.write(chunk)
-                tot_bytes += len(chunk)
-    return local_fname
-
-
-def get_file_urls(options):
-    with requests.Session() as session:
-        data = session.get(
-            BASE_URL + '/projects/' + options.user + '/' + options.project,
-            timeout=TIMEOUT)
-        data = data.json()
-
-        urls = []
-        for job in (job['jobId'] for job in data['build']['jobs']):
-            job_url = BASE_URL + '/buildjobs/' + job + '/artifacts'
-            data = session.get(job_url, timeout=TIMEOUT)
-            data = data.json()
-            for item in data:
-                file_url = job_url + '/' + item['fileName']
-                urls.append(file_url)
-        if not urls:
-            print_color("no artifacts found", 'ret')
-            sys.exit(1)
-        else:
-            for url in sorted(urls, key=lambda x: os.path.basename(x)):
-                yield url
-
-
-def rename_27_wheels():
-    # See: https://github.com/giampaolo/psutil/issues/810
-    src = 'dist/psutil-%s-cp27-cp27m-win32.whl' % PSUTIL_VERSION
-    dst = 'dist/psutil-%s-cp27-none-win32.whl' % PSUTIL_VERSION
-    print("rename: %s\n        %s" % (src, dst))
-    os.rename(src, dst)
-    src = 'dist/psutil-%s-cp27-cp27m-win_amd64.whl' % PSUTIL_VERSION
-    dst = 'dist/psutil-%s-cp27-none-win_amd64.whl' % PSUTIL_VERSION
-    print("rename: %s\n        %s" % (src, dst))
-    os.rename(src, dst)
-
-
-def run(options):
-    safe_rmtree('dist')
-    urls = get_file_urls(options)
-    completed = 0
-    exc = None
-    with concurrent.futures.ThreadPoolExecutor() as e:
-        fut_to_url = {e.submit(download_file, url): url for url in urls}
-        for fut in concurrent.futures.as_completed(fut_to_url):
-            url = fut_to_url[fut]
-            try:
-                local_fname = fut.result()
-            except Exception:
-                print_color("error while downloading %s" % (url), 'red')
-                raise
-            else:
-                completed += 1
-                print("downloaded %-45s %s" % (
-                    local_fname, bytes2human(os.path.getsize(local_fname))))
-    # 2 wheels (32 and 64 bit) per supported python version
-    expected = len(PY_VERSIONS) * 2
-    if expected != completed:
-        return exit("expected %s files, got %s" % (expected, completed))
-    if exc:
-        return exit()
-    rename_27_wheels()
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description='AppVeyor artifact downloader')
-    parser.add_argument('--user', required=True)
-    parser.add_argument('--project', required=True)
-    args = parser.parse_args()
-    run(args)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/winmake.py firefox-85.0+build1/third_party/python/psutil/scripts/internal/winmake.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/internal/winmake.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/internal/winmake.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,608 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-"""Shortcuts for various tasks, emulating UNIX "make" on Windows.
-This is supposed to be invoked by "make.bat" and not used directly.
-This was originally written as a bat file but they suck so much
-that they should be deemed illegal!
-"""
-
-from __future__ import print_function
-import argparse
-import atexit
-import ctypes
-import errno
-import fnmatch
-import os
-import shutil
-import site
-import ssl
-import subprocess
-import sys
-import tempfile
-
-
-APPVEYOR = bool(os.environ.get('APPVEYOR'))
-if APPVEYOR:
-    PYTHON = sys.executable
-else:
-    PYTHON = os.getenv('PYTHON', sys.executable)
-TEST_SCRIPT = 'psutil\\tests\\runner.py'
-GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
-PY3 = sys.version_info[0] == 3
-HERE = os.path.abspath(os.path.dirname(__file__))
-ROOT_DIR = os.path.realpath(os.path.join(HERE, "..", ".."))
-PYPY = '__pypy__' in sys.builtin_module_names
-DEPS = [
-    "coverage",
-    "flake8",
-    "nose",
-    "pdbpp",
-    "pip",
-    "pyperf",
-    "pyreadline",
-    "setuptools",
-    "wheel",
-    "wmi",
-    "requests"
-]
-if sys.version_info[:2] <= (2, 6):
-    DEPS.append('unittest2')
-if sys.version_info[:2] <= (2, 7):
-    DEPS.append('mock')
-if sys.version_info[:2] <= (3, 2):
-    DEPS.append('ipaddress')
-if PYPY:
-    pass
-elif sys.version_info[:2] <= (3, 4):
-    DEPS.append("pypiwin32==219")
-else:
-    DEPS.append("pypiwin32")
-
-_cmds = {}
-if PY3:
-    basestring = str
-
-GREEN = 2
-LIGHTBLUE = 3
-YELLOW = 6
-RED = 4
-DEFAULT_COLOR = 7
-
-
-# ===================================================================
-# utils
-# ===================================================================
-
-
-def safe_print(text, file=sys.stdout, flush=False):
-    """Prints a (unicode) string to the console, encoded depending on
-    the stdout/file encoding (eg. cp437 on Windows). This is to avoid
-    encoding errors in case of funky path names.
-    Works with Python 2 and 3.
-    """
-    if not isinstance(text, basestring):
-        return print(text, file=file)
-    try:
-        file.write(text)
-    except UnicodeEncodeError:
-        bytes_string = text.encode(file.encoding, 'backslashreplace')
-        if hasattr(file, 'buffer'):
-            file.buffer.write(bytes_string)
-        else:
-            text = bytes_string.decode(file.encoding, 'strict')
-            file.write(text)
-    file.write("\n")
-
-
-def stderr_handle():
-    GetStdHandle = ctypes.windll.Kernel32.GetStdHandle
-    STD_ERROR_HANDLE_ID = ctypes.c_ulong(0xfffffff4)
-    GetStdHandle.restype = ctypes.c_ulong
-    handle = GetStdHandle(STD_ERROR_HANDLE_ID)
-    atexit.register(ctypes.windll.Kernel32.CloseHandle, handle)
-    return handle
-
-
-def win_colorprint(s, color=LIGHTBLUE):
-    color += 8  # bold
-    handle = stderr_handle()
-    SetConsoleTextAttribute = ctypes.windll.Kernel32.SetConsoleTextAttribute
-    SetConsoleTextAttribute(handle, color)
-    try:
-        print(s)
-    finally:
-        SetConsoleTextAttribute(handle, DEFAULT_COLOR)
-
-
-def sh(cmd, nolog=False):
-    if not nolog:
-        safe_print("cmd: " + cmd)
-    p = subprocess.Popen(cmd, shell=True, env=os.environ, cwd=os.getcwd())
-    p.communicate()
-    if p.returncode != 0:
-        sys.exit(p.returncode)
-
-
-def rm(pattern, directory=False):
-    """Recursively remove a file or dir by pattern."""
-    def safe_remove(path):
-        try:
-            os.remove(path)
-        except OSError as err:
-            if err.errno != errno.ENOENT:
-                raise
-        else:
-            safe_print("rm %s" % path)
-
-    def safe_rmtree(path):
-        def onerror(fun, path, excinfo):
-            exc = excinfo[1]
-            if exc.errno != errno.ENOENT:
-                raise
-
-        existed = os.path.isdir(path)
-        shutil.rmtree(path, onerror=onerror)
-        if existed:
-            safe_print("rmdir -f %s" % path)
-
-    if "*" not in pattern:
-        if directory:
-            safe_rmtree(pattern)
-        else:
-            safe_remove(pattern)
-        return
-
-    for root, subdirs, subfiles in os.walk('.'):
-        root = os.path.normpath(root)
-        if root.startswith('.git/'):
-            continue
-        found = fnmatch.filter(subdirs if directory else subfiles, pattern)
-        for name in found:
-            path = os.path.join(root, name)
-            if directory:
-                safe_print("rmdir -f %s" % path)
-                safe_rmtree(path)
-            else:
-                safe_print("rm %s" % path)
-                safe_remove(path)
-
-
-def safe_remove(path):
-    try:
-        os.remove(path)
-    except OSError as err:
-        if err.errno != errno.ENOENT:
-            raise
-    else:
-        safe_print("rm %s" % path)
-
-
-def safe_rmtree(path):
-    def onerror(fun, path, excinfo):
-        exc = excinfo[1]
-        if exc.errno != errno.ENOENT:
-            raise
-
-    existed = os.path.isdir(path)
-    shutil.rmtree(path, onerror=onerror)
-    if existed:
-        safe_print("rmdir -f %s" % path)
-
-
-def recursive_rm(*patterns):
-    """Recursively remove a file or matching a list of patterns."""
-    for root, subdirs, subfiles in os.walk(u'.'):
-        root = os.path.normpath(root)
-        if root.startswith('.git/'):
-            continue
-        for file in subfiles:
-            for pattern in patterns:
-                if fnmatch.fnmatch(file, pattern):
-                    safe_remove(os.path.join(root, file))
-        for dir in subdirs:
-            for pattern in patterns:
-                if fnmatch.fnmatch(dir, pattern):
-                    safe_rmtree(os.path.join(root, dir))
-
-
-def test_setup():
-    os.environ['PYTHONWARNINGS'] = 'all'
-    os.environ['PSUTIL_TESTING'] = '1'
-    os.environ['PSUTIL_DEBUG'] = '1'
-
-
-# ===================================================================
-# commands
-# ===================================================================
-
-
-def build():
-    """Build / compile"""
-    # Make sure setuptools is installed (needed for 'develop' /
-    # edit mode).
-    sh('%s -c "import setuptools"' % PYTHON)
-
-    # Print coloured warnings in real time.
-    cmd = [PYTHON, "setup.py", "build"]
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    try:
-        for line in iter(p.stdout.readline, b''):
-            if PY3:
-                line = line.decode()
-            line = line.strip()
-            if 'warning' in line:
-                win_colorprint(line, YELLOW)
-            elif 'error' in line:
-                win_colorprint(line, RED)
-            else:
-                print(line)
-        # retcode = p.poll()
-        p.communicate()
-        if p.returncode:
-            win_colorprint("failure", RED)
-            sys.exit(p.returncode)
-    finally:
-        p.terminate()
-        p.wait()
-
-    # Copies compiled *.pyd files in ./psutil directory in order to
-    # allow "import psutil" when using the interactive interpreter
-    # from within this directory.
-    sh("%s setup.py build_ext -i" % PYTHON)
-    # Make sure it actually worked.
-    sh('%s -c "import psutil"' % PYTHON)
-    win_colorprint("build + import successful", GREEN)
-
-
-def wheel():
-    """Create wheel file."""
-    build()
-    sh("%s setup.py bdist_wheel" % PYTHON)
-
-
-def upload_wheels():
-    """Upload wheel files on PyPI."""
-    build()
-    sh("%s -m twine upload dist/*.whl" % PYTHON)
-
-
-def install_pip():
-    """Install pip"""
-    try:
-        sh('%s -c "import pip"' % PYTHON)
-    except SystemExit:
-        if PY3:
-            from urllib.request import urlopen
-        else:
-            from urllib2 import urlopen
-
-        if hasattr(ssl, '_create_unverified_context'):
-            ctx = ssl._create_unverified_context()
-        else:
-            ctx = None
-        kw = dict(context=ctx) if ctx else {}
-        safe_print("downloading %s" % GET_PIP_URL)
-        req = urlopen(GET_PIP_URL, **kw)
-        data = req.read()
-
-        tfile = os.path.join(tempfile.gettempdir(), 'get-pip.py')
-        with open(tfile, 'wb') as f:
-            f.write(data)
-
-        try:
-            sh('%s %s --user' % (PYTHON, tfile))
-        finally:
-            os.remove(tfile)
-
-
-def install():
-    """Install in develop / edit mode"""
-    build()
-    sh("%s setup.py develop" % PYTHON)
-
-
-def uninstall():
-    """Uninstall psutil"""
-    # Uninstalling psutil on Windows seems to be tricky.
-    # On "import psutil" tests may import a psutil version living in
-    # C:\PythonXY\Lib\site-packages which is not what we want, so
-    # we try both "pip uninstall psutil" and manually remove stuff
-    # from site-packages.
-    clean()
-    install_pip()
-    here = os.getcwd()
-    try:
-        os.chdir('C:\\')
-        while True:
-            try:
-                import psutil  # NOQA
-            except ImportError:
-                break
-            else:
-                sh("%s -m pip uninstall -y psutil" % PYTHON)
-    finally:
-        os.chdir(here)
-
-    for dir in site.getsitepackages():
-        for name in os.listdir(dir):
-            if name.startswith('psutil'):
-                rm(os.path.join(dir, name))
-            elif name == 'easy-install.pth':
-                # easy_install can add a line (installation path) into
-                # easy-install.pth; that line alters sys.path.
-                path = os.path.join(dir, name)
-                with open(path, 'rt') as f:
-                    lines = f.readlines()
-                    hasit = False
-                    for line in lines:
-                        if 'psutil' in line:
-                            hasit = True
-                            break
-                if hasit:
-                    with open(path, 'wt') as f:
-                        for line in lines:
-                            if 'psutil' not in line:
-                                f.write(line)
-                            else:
-                                print("removed line %r from %r" % (line, path))
-
-
-def clean():
-    """Deletes dev files"""
-    recursive_rm(
-        "$testfn*",
-        "*.bak",
-        "*.core",
-        "*.egg-info",
-        "*.orig",
-        "*.pyc",
-        "*.pyd",
-        "*.pyo",
-        "*.rej",
-        "*.so",
-        "*.~",
-        "*__pycache__",
-        ".coverage",
-        ".failed-tests.txt",
-        ".tox",
-    )
-    safe_rmtree("build")
-    safe_rmtree(".coverage")
-    safe_rmtree("dist")
-    safe_rmtree("docs/_build")
-    safe_rmtree("htmlcov")
-    safe_rmtree("tmp")
-
-
-def setup_dev_env():
-    """Install useful deps"""
-    install_pip()
-    install_git_hooks()
-    sh("%s -m pip install -U %s" % (PYTHON, " ".join(DEPS)))
-
-
-def lint():
-    """Run flake8 against all py files"""
-    py_files = subprocess.check_output("git ls-files")
-    if PY3:
-        py_files = py_files.decode()
-    py_files = [x for x in py_files.split() if x.endswith('.py')]
-    py_files = ' '.join(py_files)
-    sh("%s -m flake8 %s" % (PYTHON, py_files), nolog=True)
-
-
-def test(script=TEST_SCRIPT):
-    """Run tests"""
-    install()
-    test_setup()
-    cmdline = "%s %s" % (PYTHON, script)
-    safe_print(cmdline)
-    sh(cmdline)
-
-
-def coverage():
-    """Run coverage tests."""
-    # Note: coverage options are controlled by .coveragerc file
-    install()
-    test_setup()
-    sh("%s -m coverage run %s" % (PYTHON, TEST_SCRIPT))
-    sh("%s -m coverage report" % PYTHON)
-    sh("%s -m coverage html" % PYTHON)
-    sh("%s -m webbrowser -t htmlcov/index.html" % PYTHON)
-
-
-def test_process():
-    """Run process tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_process.py" % PYTHON)
-
-
-def test_system():
-    """Run system tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_system.py" % PYTHON)
-
-
-def test_platform():
-    """Run windows only tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_windows.py" % PYTHON)
-
-
-def test_misc():
-    """Run misc tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_misc.py" % PYTHON)
-
-
-def test_unicode():
-    """Run unicode tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_unicode.py" % PYTHON)
-
-
-def test_connections():
-    """Run connections tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_connections.py" % PYTHON)
-
-
-def test_contracts():
-    """Run contracts tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_contracts.py" % PYTHON)
-
-
-def test_by_name(name):
-    """Run test by name"""
-    install()
-    test_setup()
-    sh("%s -m unittest -v %s" % (PYTHON, name))
-
-
-def test_failed():
-    """Re-run tests which failed on last run."""
-    install()
-    test_setup()
-    sh('%s -c "import psutil.tests.runner as r; r.run(last_failed=True)"' % (
-        PYTHON))
-
-
-def test_memleaks():
-    """Run memory leaks tests"""
-    install()
-    test_setup()
-    sh("%s psutil\\tests\\test_memory_leaks.py" % PYTHON)
-
-
-def install_git_hooks():
-    """Install GIT pre-commit hook."""
-    if os.path.isdir('.git'):
-        src = os.path.join(ROOT_DIR, "scripts", "internal", ".git-pre-commit")
-        dst = os.path.realpath(
-            os.path.join(ROOT_DIR, ".git", "hooks", "pre-commit"))
-        with open(src, "rt") as s:
-            with open(dst, "wt") as d:
-                d.write(s.read())
-
-
-def bench_oneshot():
-    """Benchmarks for oneshot() ctx manager (see #799)."""
-    sh("%s -Wa scripts\\internal\\bench_oneshot.py" % PYTHON)
-
-
-def bench_oneshot_2():
-    """Same as above but using perf module (supposed to be more precise)."""
-    sh("%s -Wa scripts\\internal\\bench_oneshot_2.py" % PYTHON)
-
-
-def print_access_denied():
-    """Print AD exceptions raised by all Process methods."""
-    install()
-    test_setup()
-    sh("%s -Wa scripts\\internal\\print_access_denied.py" % PYTHON)
-
-
-def print_api_speed():
-    """Benchmark all API calls."""
-    install()
-    test_setup()
-    sh("%s -Wa scripts\\internal\\print_api_speed.py" % PYTHON)
-
-
-def get_python(path):
-    if not path:
-        return sys.executable
-    if os.path.isabs(path):
-        return path
-    # try to look for a python installation given a shortcut name
-    path = path.replace('.', '')
-    vers = ('26', '27', '36', '37', '38',
-            '26-64', '27-64', '36-64', '37-64', '38-64'
-            '26-32', '27-32', '36-32', '37-32', '38-32')
-    for v in vers:
-        pypath = r'C:\\python%s\python.exe' % v
-        if path in pypath and os.path.isfile(pypath):
-            return pypath
-
-
-def main():
-    global PYTHON
-    parser = argparse.ArgumentParser()
-    # option shared by all commands
-    parser.add_argument(
-        '-p', '--python',
-        help="use python executable path")
-    sp = parser.add_subparsers(dest='command', title='targets')
-    sp.add_parser('bench-oneshot', help="benchmarks for oneshot()")
-    sp.add_parser('bench-oneshot_2', help="benchmarks for oneshot() (perf)")
-    sp.add_parser('build', help="build")
-    sp.add_parser('clean', help="deletes dev files")
-    sp.add_parser('coverage', help="run coverage tests.")
-    sp.add_parser('help', help="print this help")
-    sp.add_parser('install', help="build + install in develop/edit mode")
-    sp.add_parser('install-git-hooks', help="install GIT pre-commit hook")
-    sp.add_parser('install-pip', help="install pip")
-    sp.add_parser('lint', help="run flake8 against all py files")
-    sp.add_parser('print-access-denied', help="print AD exceptions")
-    sp.add_parser('print-api-speed', help="benchmark all API calls")
-    sp.add_parser('setup-dev-env', help="install deps")
-    test = sp.add_parser('test', help="[ARG] run tests")
-    test_by_name = sp.add_parser('test-by-name', help="<ARG> run test by name")
-    sp.add_parser('test-connections', help="run connections tests")
-    sp.add_parser('test-contracts', help="run contracts tests")
-    sp.add_parser('test-failed', help="re-run tests which failed on last run")
-    sp.add_parser('test-memleaks', help="run memory leaks tests")
-    sp.add_parser('test-misc', help="run misc tests")
-    sp.add_parser('test-platform', help="run windows only tests")
-    sp.add_parser('test-process', help="run process tests")
-    sp.add_parser('test-system', help="run system tests")
-    sp.add_parser('test-unicode', help="run unicode tests")
-    sp.add_parser('uninstall', help="uninstall psutil")
-    sp.add_parser('upload-wheels', help="upload wheel files on PyPI")
-    sp.add_parser('wheel', help="create wheel file")
-
-    for p in (test, test_by_name):
-        p.add_argument('arg', type=str, nargs='?', default="", help="arg")
-    args = parser.parse_args()
-
-    # set python exe
-    PYTHON = get_python(args.python)
-    if not PYTHON:
-        return sys.exit(
-            "can't find any python installation matching %r" % args.python)
-    os.putenv('PYTHON', PYTHON)
-    win_colorprint("using " + PYTHON)
-
-    if not args.command or args.command == 'help':
-        parser.print_help(sys.stderr)
-        sys.exit(1)
-
-    fname = args.command.replace('-', '_')
-    fun = getattr(sys.modules[__name__], fname)  # err if fun not defined
-    funargs = []
-    # mandatory args
-    if args.command in ('test-by-name', 'test-script'):
-        if not args.arg:
-            sys.exit('command needs an argument')
-        funargs = [args.arg]
-    # optional args
-    if args.command == 'test' and args.arg:
-        funargs = [args.arg]
-    fun(*funargs)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/iotop.py firefox-85.0+build1/third_party/python/psutil/scripts/iotop.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/iotop.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/iotop.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,163 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of iotop (http://guichaz.free.fr/iotop/) showing real time
-disk I/O statistics.
-
-It works on Linux only (FreeBSD and macOS are missing support for IO
-counters).
-It doesn't work on Windows as curses module is required.
-
-Example output:
-
-$ python scripts/iotop.py
-Total DISK READ: 0.00 B/s | Total DISK WRITE: 472.00 K/s
-PID   USER      DISK READ  DISK WRITE  COMMAND
-13155 giampao    0.00 B/s  428.00 K/s  /usr/bin/google-chrome-beta
-3260  giampao    0.00 B/s    0.00 B/s  bash
-3779  giampao    0.00 B/s    0.00 B/s  gnome-session --session=ubuntu
-3830  giampao    0.00 B/s    0.00 B/s  /usr/bin/dbus-launch
-3831  giampao    0.00 B/s    0.00 B/s  //bin/dbus-daemon --fork --print-pid 5
-3841  giampao    0.00 B/s    0.00 B/s  /usr/lib/at-spi-bus-launcher
-3845  giampao    0.00 B/s    0.00 B/s  /bin/dbus-daemon
-3848  giampao    0.00 B/s    0.00 B/s  /usr/lib/at-spi2-core/at-spi2-registryd
-3862  giampao    0.00 B/s    0.00 B/s  /usr/lib/gnome-settings-daemon
-
-Author: Giampaolo Rodola' <g.rodola@gmail.com>
-"""
-
-import atexit
-import time
-import sys
-try:
-    import curses
-except ImportError:
-    sys.exit('platform not supported')
-
-import psutil
-from psutil._common import bytes2human
-
-
-def tear_down():
-    win.keypad(0)
-    curses.nocbreak()
-    curses.echo()
-    curses.endwin()
-
-
-win = curses.initscr()
-atexit.register(tear_down)
-curses.endwin()
-lineno = 0
-
-
-def print_line(line, highlight=False):
-    """A thin wrapper around curses's addstr()."""
-    global lineno
-    try:
-        if highlight:
-            line += " " * (win.getmaxyx()[1] - len(line))
-            win.addstr(lineno, 0, line, curses.A_REVERSE)
-        else:
-            win.addstr(lineno, 0, line, 0)
-    except curses.error:
-        lineno = 0
-        win.refresh()
-        raise
-    else:
-        lineno += 1
-
-
-def poll(interval):
-    """Calculate IO usage by comparing IO statics before and
-    after the interval.
-    Return a tuple including all currently running processes
-    sorted by IO activity and total disks I/O activity.
-    """
-    # first get a list of all processes and disk io counters
-    procs = [p for p in psutil.process_iter()]
-    for p in procs[:]:
-        try:
-            p._before = p.io_counters()
-        except psutil.Error:
-            procs.remove(p)
-            continue
-    disks_before = psutil.disk_io_counters()
-
-    # sleep some time
-    time.sleep(interval)
-
-    # then retrieve the same info again
-    for p in procs[:]:
-        with p.oneshot():
-            try:
-                p._after = p.io_counters()
-                p._cmdline = ' '.join(p.cmdline())
-                if not p._cmdline:
-                    p._cmdline = p.name()
-                p._username = p.username()
-            except (psutil.NoSuchProcess, psutil.ZombieProcess):
-                procs.remove(p)
-    disks_after = psutil.disk_io_counters()
-
-    # finally calculate results by comparing data before and
-    # after the interval
-    for p in procs:
-        p._read_per_sec = p._after.read_bytes - p._before.read_bytes
-        p._write_per_sec = p._after.write_bytes - p._before.write_bytes
-        p._total = p._read_per_sec + p._write_per_sec
-
-    disks_read_per_sec = disks_after.read_bytes - disks_before.read_bytes
-    disks_write_per_sec = disks_after.write_bytes - disks_before.write_bytes
-
-    # sort processes by total disk IO so that the more intensive
-    # ones get listed first
-    processes = sorted(procs, key=lambda p: p._total, reverse=True)
-
-    return (processes, disks_read_per_sec, disks_write_per_sec)
-
-
-def refresh_window(procs, disks_read, disks_write):
-    """Print results on screen by using curses."""
-    curses.endwin()
-    templ = "%-5s %-7s %11s %11s  %s"
-    win.erase()
-
-    disks_tot = "Total DISK READ: %s | Total DISK WRITE: %s" \
-                % (bytes2human(disks_read), bytes2human(disks_write))
-    print_line(disks_tot)
-
-    header = templ % ("PID", "USER", "DISK READ", "DISK WRITE", "COMMAND")
-    print_line(header, highlight=True)
-
-    for p in procs:
-        line = templ % (
-            p.pid,
-            p._username[:7],
-            bytes2human(p._read_per_sec),
-            bytes2human(p._write_per_sec),
-            p._cmdline)
-        try:
-            print_line(line)
-        except curses.error:
-            break
-    win.refresh()
-
-
-def main():
-    try:
-        interval = 0
-        while True:
-            args = poll(interval)
-            refresh_window(*args)
-            interval = 1
-    except (KeyboardInterrupt, SystemExit):
-        pass
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/killall.py firefox-85.0+build1/third_party/python/psutil/scripts/killall.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/killall.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/killall.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Kill a process by name.
-"""
-
-import os
-import sys
-import psutil
-
-
-def main():
-    if len(sys.argv) != 2:
-        sys.exit('usage: %s name' % __file__)
-    else:
-        NAME = sys.argv[1]
-
-    killed = []
-    for proc in psutil.process_iter():
-        if proc.name() == NAME and proc.pid != os.getpid():
-            proc.kill()
-            killed.append(proc.pid)
-    if not killed:
-        sys.exit('%s: no process found' % NAME)
-    else:
-        sys.exit(0)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/meminfo.py firefox-85.0+build1/third_party/python/psutil/scripts/meminfo.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/meminfo.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/meminfo.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Print system memory information.
-
-$ python scripts/meminfo.py
-MEMORY
-------
-Total      :    9.7G
-Available  :    4.9G
-Percent    :    49.0
-Used       :    8.2G
-Free       :    1.4G
-Active     :    5.6G
-Inactive   :    2.1G
-Buffers    :  341.2M
-Cached     :    3.2G
-
-SWAP
-----
-Total      :      0B
-Used       :      0B
-Free       :      0B
-Percent    :     0.0
-Sin        :      0B
-Sout       :      0B
-"""
-
-import psutil
-from psutil._common import bytes2human
-
-
-def pprint_ntuple(nt):
-    for name in nt._fields:
-        value = getattr(nt, name)
-        if name != 'percent':
-            value = bytes2human(value)
-        print('%-10s : %7s' % (name.capitalize(), value))
-
-
-def main():
-    print('MEMORY\n------')
-    pprint_ntuple(psutil.virtual_memory())
-    print('\nSWAP\n----')
-    pprint_ntuple(psutil.swap_memory())
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/netstat.py firefox-85.0+build1/third_party/python/psutil/scripts/netstat.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/netstat.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/netstat.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'netstat -antp' on Linux.
-
-$ python scripts/netstat.py
-Proto Local address      Remote address   Status        PID    Program name
-tcp   127.0.0.1:48256    127.0.0.1:45884  ESTABLISHED   13646  chrome
-tcp   127.0.0.1:47073    127.0.0.1:45884  ESTABLISHED   13646  chrome
-tcp   127.0.0.1:47072    127.0.0.1:45884  ESTABLISHED   13646  chrome
-tcp   127.0.0.1:45884    -                LISTEN        13651  GoogleTalkPlugi
-tcp   127.0.0.1:60948    -                LISTEN        13651  GoogleTalkPlugi
-tcp   172.17.42.1:49102  127.0.0.1:19305  CLOSE_WAIT    13651  GoogleTalkPlugi
-tcp   172.17.42.1:55797  127.0.0.1:443    CLOSE_WAIT    13651  GoogleTalkPlugi
-...
-"""
-
-import socket
-from socket import AF_INET, SOCK_STREAM, SOCK_DGRAM
-
-import psutil
-
-
-AD = "-"
-AF_INET6 = getattr(socket, 'AF_INET6', object())
-proto_map = {
-    (AF_INET, SOCK_STREAM): 'tcp',
-    (AF_INET6, SOCK_STREAM): 'tcp6',
-    (AF_INET, SOCK_DGRAM): 'udp',
-    (AF_INET6, SOCK_DGRAM): 'udp6',
-}
-
-
-def main():
-    templ = "%-5s %-30s %-30s %-13s %-6s %s"
-    print(templ % (
-        "Proto", "Local address", "Remote address", "Status", "PID",
-        "Program name"))
-    proc_names = {}
-    for p in psutil.process_iter(['pid', 'name']):
-        proc_names[p.info['pid']] = p.info['name']
-    for c in psutil.net_connections(kind='inet'):
-        laddr = "%s:%s" % (c.laddr)
-        raddr = ""
-        if c.raddr:
-            raddr = "%s:%s" % (c.raddr)
-        print(templ % (
-            proto_map[(c.family, c.type)],
-            laddr,
-            raddr or AD,
-            c.status,
-            c.pid or AD,
-            proc_names.get(c.pid, '?')[:15],
-        ))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/nettop.py firefox-85.0+build1/third_party/python/psutil/scripts/nettop.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/nettop.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/nettop.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-#!/usr/bin/env python3
-#
-# $Id: iotop.py 1160 2011-10-14 18:50:36Z g.rodola@gmail.com $
-#
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Shows real-time network statistics.
-
-Author: Giampaolo Rodola' <g.rodola@gmail.com>
-
-$ python scripts/nettop.py
------------------------------------------------------------
-total bytes:           sent: 1.49 G       received: 4.82 G
-total packets:         sent: 7338724      received: 8082712
-
-wlan0                     TOTAL         PER-SEC
------------------------------------------------------------
-bytes-sent               1.29 G        0.00 B/s
-bytes-recv               3.48 G        0.00 B/s
-pkts-sent               7221782               0
-pkts-recv               6753724               0
-
-eth1                      TOTAL         PER-SEC
------------------------------------------------------------
-bytes-sent             131.77 M        0.00 B/s
-bytes-recv               1.28 G        0.00 B/s
-pkts-sent                     0               0
-pkts-recv               1214470               0
-"""
-
-import atexit
-import time
-import sys
-try:
-    import curses
-except ImportError:
-    sys.exit('platform not supported')
-
-import psutil
-from psutil._common import bytes2human
-
-
-def tear_down():
-    win.keypad(0)
-    curses.nocbreak()
-    curses.echo()
-    curses.endwin()
-
-
-win = curses.initscr()
-atexit.register(tear_down)
-curses.endwin()
-lineno = 0
-
-
-def print_line(line, highlight=False):
-    """A thin wrapper around curses's addstr()."""
-    global lineno
-    try:
-        if highlight:
-            line += " " * (win.getmaxyx()[1] - len(line))
-            win.addstr(lineno, 0, line, curses.A_REVERSE)
-        else:
-            win.addstr(lineno, 0, line, 0)
-    except curses.error:
-        lineno = 0
-        win.refresh()
-        raise
-    else:
-        lineno += 1
-
-
-def poll(interval):
-    """Retrieve raw stats within an interval window."""
-    tot_before = psutil.net_io_counters()
-    pnic_before = psutil.net_io_counters(pernic=True)
-    # sleep some time
-    time.sleep(interval)
-    tot_after = psutil.net_io_counters()
-    pnic_after = psutil.net_io_counters(pernic=True)
-    return (tot_before, tot_after, pnic_before, pnic_after)
-
-
-def refresh_window(tot_before, tot_after, pnic_before, pnic_after):
-    """Print stats on screen."""
-    global lineno
-
-    # totals
-    print_line("total bytes:           sent: %-10s   received: %s" % (
-        bytes2human(tot_after.bytes_sent),
-        bytes2human(tot_after.bytes_recv))
-    )
-    print_line("total packets:         sent: %-10s   received: %s" % (
-        tot_after.packets_sent, tot_after.packets_recv))
-
-    # per-network interface details: let's sort network interfaces so
-    # that the ones which generated more traffic are shown first
-    print_line("")
-    nic_names = list(pnic_after.keys())
-    nic_names.sort(key=lambda x: sum(pnic_after[x]), reverse=True)
-    for name in nic_names:
-        stats_before = pnic_before[name]
-        stats_after = pnic_after[name]
-        templ = "%-15s %15s %15s"
-        print_line(templ % (name, "TOTAL", "PER-SEC"), highlight=True)
-        print_line(templ % (
-            "bytes-sent",
-            bytes2human(stats_after.bytes_sent),
-            bytes2human(
-                stats_after.bytes_sent - stats_before.bytes_sent) + '/s',
-        ))
-        print_line(templ % (
-            "bytes-recv",
-            bytes2human(stats_after.bytes_recv),
-            bytes2human(
-                stats_after.bytes_recv - stats_before.bytes_recv) + '/s',
-        ))
-        print_line(templ % (
-            "pkts-sent",
-            stats_after.packets_sent,
-            stats_after.packets_sent - stats_before.packets_sent,
-        ))
-        print_line(templ % (
-            "pkts-recv",
-            stats_after.packets_recv,
-            stats_after.packets_recv - stats_before.packets_recv,
-        ))
-        print_line("")
-    win.refresh()
-    lineno = 0
-
-
-def main():
-    try:
-        interval = 0
-        while True:
-            args = poll(interval)
-            refresh_window(*args)
-            interval = 1
-    except (KeyboardInterrupt, SystemExit):
-        pass
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/pidof.py firefox-85.0+build1/third_party/python/psutil/scripts/pidof.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/pidof.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/pidof.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola', karthikrev. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-"""
-A clone of 'pidof' cmdline utility.
-$ pidof python
-1140 1138 1136 1134 1133 1129 1127 1125 1121 1120 1119
-"""
-
-from __future__ import print_function
-import psutil
-import sys
-
-
-def pidof(pgname):
-    pids = []
-    for proc in psutil.process_iter(['name', 'cmdline']):
-        # search for matches in the process name and cmdline
-        if proc.info['name'] == pgname or \
-                proc.info['cmdline'] and proc.info['cmdline'][0] == pgname:
-            pids.append(str(proc.pid))
-    return pids
-
-
-def main():
-    if len(sys.argv) != 2:
-        sys.exit('usage: %s pgname' % __file__)
-    else:
-        pgname = sys.argv[1]
-    pids = pidof(pgname)
-    if pids:
-        print(" ".join(pids))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/pmap.py firefox-85.0+build1/third_party/python/psutil/scripts/pmap.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/pmap.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/pmap.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'pmap' utility on Linux, 'vmmap' on macOS and 'procstat -v' on BSD.
-Report memory map of a process.
-
-$ python scripts/pmap.py 32402
-Address                 RSS  Mode    Mapping
-0000000000400000      1200K  r-xp    /usr/bin/python2.7
-0000000000838000         4K  r--p    /usr/bin/python2.7
-0000000000839000       304K  rw-p    /usr/bin/python2.7
-00000000008ae000        68K  rw-p    [anon]
-000000000275e000      5396K  rw-p    [heap]
-00002b29bb1e0000       124K  r-xp    /lib/x86_64-linux-gnu/ld-2.17.so
-00002b29bb203000         8K  rw-p    [anon]
-00002b29bb220000       528K  rw-p    [anon]
-00002b29bb2d8000       768K  rw-p    [anon]
-00002b29bb402000         4K  r--p    /lib/x86_64-linux-gnu/ld-2.17.so
-00002b29bb403000         8K  rw-p    /lib/x86_64-linux-gnu/ld-2.17.so
-00002b29bb405000        60K  r-xp    /lib/x86_64-linux-gnu/libpthread-2.17.so
-00002b29bb41d000         0K  ---p    /lib/x86_64-linux-gnu/libpthread-2.17.so
-00007fff94be6000        48K  rw-p    [stack]
-00007fff94dd1000         4K  r-xp    [vdso]
-ffffffffff600000         0K  r-xp    [vsyscall]
-...
-"""
-
-import sys
-
-import psutil
-from psutil._common import bytes2human
-from psutil._compat import get_terminal_size
-
-
-def safe_print(s):
-    s = s[:get_terminal_size()[0]]
-    try:
-        print(s)
-    except UnicodeEncodeError:
-        print(s.encode('ascii', 'ignore').decode())
-
-
-def main():
-    if len(sys.argv) != 2:
-        sys.exit('usage: pmap <pid>')
-    p = psutil.Process(int(sys.argv[1]))
-    templ = "%-20s %10s  %-7s %s"
-    print(templ % ("Address", "RSS", "Mode", "Mapping"))
-    total_rss = 0
-    for m in p.memory_maps(grouped=False):
-        total_rss += m.rss
-        safe_print(templ % (
-            m.addr.split('-')[0].zfill(16),
-            bytes2human(m.rss),
-            m.perms,
-            m.path))
-    print("-" * 31)
-    print(templ % ("Total", bytes2human(total_rss), '', ''))
-    safe_print("PID = %s, name = %s" % (p.pid, p.name()))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/procinfo.py firefox-85.0+build1/third_party/python/psutil/scripts/procinfo.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/procinfo.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/procinfo.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,328 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Print detailed information about a process.
-Author: Giampaolo Rodola' <g.rodola@gmail.com>
-
-$ python scripts/procinfo.py
-pid           4600
-name          chrome
-parent        4554 (bash)
-exe           /opt/google/chrome/chrome
-cwd           /home/giampaolo
-cmdline       /opt/google/chrome/chrome
-started       2016-09-19 11:12
-cpu-tspent    27:27.68
-cpu-times     user=8914.32, system=3530.59,
-              children_user=1.46, children_system=1.31
-cpu-affinity  [0, 1, 2, 3, 4, 5, 6, 7]
-memory        rss=520.5M, vms=1.9G, shared=132.6M, text=95.0M, lib=0B,
-              data=816.5M, dirty=0B
-memory %      3.26
-user          giampaolo
-uids          real=1000, effective=1000, saved=1000
-uids          real=1000, effective=1000, saved=1000
-terminal      /dev/pts/2
-status        sleeping
-nice          0
-ionice        class=IOPriority.IOPRIO_CLASS_NONE, value=0
-num-threads   47
-num-fds       379
-I/O           read_count=96.6M, write_count=80.7M,
-              read_bytes=293.2M, write_bytes=24.5G
-ctx-switches  voluntary=30426463, involuntary=460108
-children      PID    NAME
-              4605   cat
-              4606   cat
-              4609   chrome
-              4669   chrome
-open-files    PATH
-              /opt/google/chrome/icudtl.dat
-              /opt/google/chrome/snapshot_blob.bin
-              /opt/google/chrome/natives_blob.bin
-              /opt/google/chrome/chrome_100_percent.pak
-              [...]
-connections   PROTO LOCAL ADDR            REMOTE ADDR               STATUS
-              UDP   10.0.0.3:3693         *:*                       NONE
-              TCP   10.0.0.3:55102        172.217.22.14:443         ESTABLISHED
-              UDP   10.0.0.3:35172        *:*                       NONE
-              TCP   10.0.0.3:32922        172.217.16.163:443        ESTABLISHED
-              UDP   :::5353               *:*                       NONE
-              UDP   10.0.0.3:59925        *:*                       NONE
-threads       TID              USER          SYSTEM
-              11795             0.7            1.35
-              11796            0.68            1.37
-              15887            0.74            0.03
-              19055            0.77            0.01
-              [...]
-              total=47
-res-limits    RLIMIT                     SOFT       HARD
-              virtualmem             infinity   infinity
-              coredumpsize                  0   infinity
-              cputime                infinity   infinity
-              datasize               infinity   infinity
-              filesize               infinity   infinity
-              locks                  infinity   infinity
-              memlock                   65536      65536
-              msgqueue                 819200     819200
-              nice                          0          0
-              openfiles                  8192      65536
-              maxprocesses              63304      63304
-              rss                    infinity   infinity
-              realtimeprio                  0          0
-              rtimesched             infinity   infinity
-              sigspending               63304      63304
-              stack                   8388608   infinity
-mem-maps      RSS      PATH
-              381.4M   [anon]
-              62.8M    /opt/google/chrome/chrome
-              15.8M    /home/giampaolo/.config/google-chrome/Default/History
-              6.6M     /home/giampaolo/.config/google-chrome/Default/Favicons
-              [...]
-"""
-
-import argparse
-import datetime
-import socket
-import sys
-
-import psutil
-from psutil._common import bytes2human
-
-
-ACCESS_DENIED = ''
-NON_VERBOSE_ITERATIONS = 4
-RLIMITS_MAP = {
-    "RLIMIT_AS": "virtualmem",
-    "RLIMIT_CORE": "coredumpsize",
-    "RLIMIT_CPU": "cputime",
-    "RLIMIT_DATA": "datasize",
-    "RLIMIT_FSIZE": "filesize",
-    "RLIMIT_LOCKS": "locks",
-    "RLIMIT_MEMLOCK": "memlock",
-    "RLIMIT_MSGQUEUE": "msgqueue",
-    "RLIMIT_NICE": "nice",
-    "RLIMIT_NOFILE": "openfiles",
-    "RLIMIT_NPROC": "maxprocesses",
-    "RLIMIT_RSS": "rss",
-    "RLIMIT_RTPRIO": "realtimeprio",
-    "RLIMIT_RTTIME": "rtimesched",
-    "RLIMIT_SIGPENDING": "sigspending",
-    "RLIMIT_STACK": "stack",
-}
-
-
-def print_(a, b):
-    if sys.stdout.isatty() and psutil.POSIX:
-        fmt = '\x1b[1;32m%-13s\x1b[0m %s' % (a, b)
-    else:
-        fmt = '%-11s %s' % (a, b)
-    print(fmt)
-
-
-def str_ntuple(nt, convert_bytes=False):
-    if nt == ACCESS_DENIED:
-        return ""
-    if not convert_bytes:
-        return ", ".join(["%s=%s" % (x, getattr(nt, x)) for x in nt._fields])
-    else:
-        return ", ".join(["%s=%s" % (x, bytes2human(getattr(nt, x)))
-                          for x in nt._fields])
-
-
-def run(pid, verbose=False):
-    try:
-        proc = psutil.Process(pid)
-        pinfo = proc.as_dict(ad_value=ACCESS_DENIED)
-    except psutil.NoSuchProcess as err:
-        sys.exit(str(err))
-
-    # collect other proc info
-    with proc.oneshot():
-        try:
-            parent = proc.parent()
-            if parent:
-                parent = '(%s)' % parent.name()
-            else:
-                parent = ''
-        except psutil.Error:
-            parent = ''
-        try:
-            pinfo['children'] = proc.children()
-        except psutil.Error:
-            pinfo['children'] = []
-        if pinfo['create_time']:
-            started = datetime.datetime.fromtimestamp(
-                pinfo['create_time']).strftime('%Y-%m-%d %H:%M')
-        else:
-            started = ACCESS_DENIED
-
-    # here we go
-    print_('pid', pinfo['pid'])
-    print_('name', pinfo['name'])
-    print_('parent', '%s %s' % (pinfo['ppid'], parent))
-    print_('exe', pinfo['exe'])
-    print_('cwd', pinfo['cwd'])
-    print_('cmdline', ' '.join(pinfo['cmdline']))
-    print_('started', started)
-
-    cpu_tot_time = datetime.timedelta(seconds=sum(pinfo['cpu_times']))
-    cpu_tot_time = "%s:%s.%s" % (
-        cpu_tot_time.seconds // 60 % 60,
-        str((cpu_tot_time.seconds % 60)).zfill(2),
-        str(cpu_tot_time.microseconds)[:2])
-    print_('cpu-tspent', cpu_tot_time)
-    print_('cpu-times', str_ntuple(pinfo['cpu_times']))
-    if hasattr(proc, "cpu_affinity"):
-        print_("cpu-affinity", pinfo["cpu_affinity"])
-    if hasattr(proc, "cpu_num"):
-        print_("cpu-num", pinfo["cpu_num"])
-
-    print_('memory', str_ntuple(pinfo['memory_info'], convert_bytes=True))
-    print_('memory %', round(pinfo['memory_percent'], 2))
-    print_('user', pinfo['username'])
-    if psutil.POSIX:
-        print_('uids', str_ntuple(pinfo['uids']))
-    if psutil.POSIX:
-        print_('uids', str_ntuple(pinfo['uids']))
-    if psutil.POSIX:
-        print_('terminal', pinfo['terminal'] or '')
-
-    print_('status', pinfo['status'])
-    print_('nice', pinfo['nice'])
-    if hasattr(proc, "ionice"):
-        try:
-            ionice = proc.ionice()
-        except psutil.Error:
-            pass
-        else:
-            if psutil.WINDOWS:
-                print_("ionice", ionice)
-            else:
-                print_("ionice", "class=%s, value=%s" % (
-                    str(ionice.ioclass), ionice.value))
-
-    print_('num-threads', pinfo['num_threads'])
-    if psutil.POSIX:
-        print_('num-fds', pinfo['num_fds'])
-    if psutil.WINDOWS:
-        print_('num-handles', pinfo['num_handles'])
-
-    if 'io_counters' in pinfo:
-        print_('I/O', str_ntuple(pinfo['io_counters'], convert_bytes=True))
-    if 'num_ctx_switches' in pinfo:
-        print_("ctx-switches", str_ntuple(pinfo['num_ctx_switches']))
-    if pinfo['children']:
-        template = "%-6s %s"
-        print_("children", template % ("PID", "NAME"))
-        for child in pinfo['children']:
-            try:
-                print_('', template % (child.pid, child.name()))
-            except psutil.AccessDenied:
-                print_('', template % (child.pid, ""))
-            except psutil.NoSuchProcess:
-                pass
-
-    if pinfo['open_files']:
-        print_('open-files', 'PATH')
-        for i, file in enumerate(pinfo['open_files']):
-            if not verbose and i >= NON_VERBOSE_ITERATIONS:
-                print_("", "[...]")
-                break
-            print_('', file.path)
-    else:
-        print_('open-files', '')
-
-    if pinfo['connections']:
-        template = '%-5s %-25s %-25s %s'
-        print_('connections',
-               template % ('PROTO', 'LOCAL ADDR', 'REMOTE ADDR', 'STATUS'))
-        for conn in pinfo['connections']:
-            if conn.type == socket.SOCK_STREAM:
-                type = 'TCP'
-            elif conn.type == socket.SOCK_DGRAM:
-                type = 'UDP'
-            else:
-                type = 'UNIX'
-            lip, lport = conn.laddr
-            if not conn.raddr:
-                rip, rport = '*', '*'
-            else:
-                rip, rport = conn.raddr
-            print_('', template % (
-                type,
-                "%s:%s" % (lip, lport),
-                "%s:%s" % (rip, rport),
-                conn.status))
-    else:
-        print_('connections', '')
-
-    if pinfo['threads'] and len(pinfo['threads']) > 1:
-        template = "%-5s %12s %12s"
-        print_('threads', template % ("TID", "USER", "SYSTEM"))
-        for i, thread in enumerate(pinfo['threads']):
-            if not verbose and i >= NON_VERBOSE_ITERATIONS:
-                print_("", "[...]")
-                break
-            print_('', template % thread)
-        print_('', "total=%s" % len(pinfo['threads']))
-    else:
-        print_('threads', '')
-
-    if hasattr(proc, "rlimit"):
-        res_names = [x for x in dir(psutil) if x.startswith("RLIMIT")]
-        resources = []
-        for res_name in res_names:
-            try:
-                soft, hard = proc.rlimit(getattr(psutil, res_name))
-            except psutil.AccessDenied:
-                pass
-            else:
-                resources.append((res_name, soft, hard))
-        if resources:
-            template = "%-12s %15s %15s"
-            print_("res-limits", template % ("RLIMIT", "SOFT", "HARD"))
-            for res_name, soft, hard in resources:
-                if soft == psutil.RLIM_INFINITY:
-                    soft = "infinity"
-                if hard == psutil.RLIM_INFINITY:
-                    hard = "infinity"
-                print_('', template % (
-                    RLIMITS_MAP.get(res_name, res_name), soft, hard))
-
-    if hasattr(proc, "environ") and pinfo['environ']:
-        template = "%-25s %s"
-        print_("environ", template % ("NAME", "VALUE"))
-        for i, k in enumerate(sorted(pinfo['environ'])):
-            if not verbose and i >= NON_VERBOSE_ITERATIONS:
-                print_("", "[...]")
-                break
-            print_("", template % (k, pinfo['environ'][k]))
-
-    if pinfo.get('memory_maps', None):
-        template = "%-8s %s"
-        print_("mem-maps", template % ("RSS", "PATH"))
-        maps = sorted(pinfo['memory_maps'], key=lambda x: x.rss, reverse=True)
-        for i, region in enumerate(maps):
-            if not verbose and i >= NON_VERBOSE_ITERATIONS:
-                print_("", "[...]")
-                break
-            print_("", template % (bytes2human(region.rss), region.path))
-
-
-def main(argv=None):
-    parser = argparse.ArgumentParser(
-        description="print information about a process")
-    parser.add_argument("pid", type=int, help="process pid")
-    parser.add_argument('--verbose', '-v', action='store_true',
-                        help="print more info")
-    args = parser.parse_args()
-    run(args.pid, args.verbose)
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/procsmem.py firefox-85.0+build1/third_party/python/psutil/scripts/procsmem.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/procsmem.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/procsmem.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Show detailed memory usage about all (querable) processes.
-
-Processes are sorted by their "USS" (Unique Set Size) memory, which is
-probably the most representative metric for determining how much memory
-is actually being used by a process.
-
-This is similar to "smem" cmdline utility on Linux:
-https://www.selenic.com/smem/
-
-Author: Giampaolo Rodola' <g.rodola@gmail.com>
-
-~/svn/psutil$ ./scripts/procsmem.py
-PID     User    Cmdline                            USS     PSS    Swap     RSS
-==============================================================================
-...
-3986    giampao /usr/bin/python3 /usr/bin/indi   15.3M   16.6M      0B   25.6M
-3906    giampao /usr/lib/ibus/ibus-ui-gtk3       17.6M   18.1M      0B   26.7M
-3991    giampao python /usr/bin/hp-systray -x    19.0M   23.3M      0B   40.7M
-3830    giampao /usr/bin/ibus-daemon --daemoni   19.0M   19.0M      0B   21.4M
-20529   giampao /opt/sublime_text/plugin_host    19.9M   20.1M      0B   22.0M
-3990    giampao nautilus -n                      20.6M   29.9M      0B   50.2M
-3898    giampao /usr/lib/unity/unity-panel-ser   27.1M   27.9M      0B   37.7M
-4176    giampao /usr/lib/evolution/evolution-c   35.7M   36.2M      0B   41.5M
-20712   giampao /usr/bin/python -B /home/giamp   45.6M   45.9M      0B   49.4M
-3880    giampao /usr/lib/x86_64-linux-gnu/hud/   51.6M   52.7M      0B   61.3M
-20513   giampao /opt/sublime_text/sublime_text   65.8M   73.0M      0B   87.9M
-3976    giampao compiz                          115.0M  117.0M      0B  130.9M
-32486   giampao skype                           145.1M  147.5M      0B  149.6M
-"""
-
-from __future__ import print_function
-import sys
-
-import psutil
-
-
-if not (psutil.LINUX or psutil.MACOS or psutil.WINDOWS):
-    sys.exit("platform not supported")
-
-
-def convert_bytes(n):
-    symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
-    prefix = {}
-    for i, s in enumerate(symbols):
-        prefix[s] = 1 << (i + 1) * 10
-    for s in reversed(symbols):
-        if n >= prefix[s]:
-            value = float(n) / prefix[s]
-            return '%.1f%s' % (value, s)
-    return "%sB" % n
-
-
-def main():
-    ad_pids = []
-    procs = []
-    for p in psutil.process_iter():
-        with p.oneshot():
-            try:
-                mem = p.memory_full_info()
-                info = p.as_dict(["cmdline", "username"])
-            except psutil.AccessDenied:
-                ad_pids.append(p.pid)
-            except psutil.NoSuchProcess:
-                pass
-            else:
-                p._uss = mem.uss
-                p._rss = mem.rss
-                if not p._uss:
-                    continue
-                p._pss = getattr(mem, "pss", "")
-                p._swap = getattr(mem, "swap", "")
-                p._info = info
-                procs.append(p)
-
-    procs.sort(key=lambda p: p._uss)
-    templ = "%-7s %-7s %-30s %7s %7s %7s %7s"
-    print(templ % ("PID", "User", "Cmdline", "USS", "PSS", "Swap", "RSS"))
-    print("=" * 78)
-    for p in procs[:86]:
-        line = templ % (
-            p.pid,
-            p._info["username"][:7] if p._info["username"] else "",
-            " ".join(p._info["cmdline"])[:30],
-            convert_bytes(p._uss),
-            convert_bytes(p._pss) if p._pss != "" else "",
-            convert_bytes(p._swap) if p._swap != "" else "",
-            convert_bytes(p._rss),
-        )
-        print(line)
-    if ad_pids:
-        print("warning: access denied for %s pids" % (len(ad_pids)),
-              file=sys.stderr)
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/ps.py firefox-85.0+build1/third_party/python/psutil/scripts/ps.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/ps.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/ps.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'ps aux'.
-
-$ python scripts/ps.py
-USER         PID  %MEM     VSZ     RSS  NICE STATUS  START   TIME  CMDLINE
-root           1   0.0  220.9M    6.5M        sleep  Mar27  09:10  /lib/systemd
-root           2   0.0    0.0B    0.0B        sleep  Mar27  00:00  kthreadd
-root           4   0.0    0.0B    0.0B   -20   idle  Mar27  00:00  kworker/0:0H
-root           6   0.0    0.0B    0.0B   -20   idle  Mar27  00:00  mm_percpu_wq
-root           7   0.0    0.0B    0.0B        sleep  Mar27  00:06  ksoftirqd/0
-root           8   0.0    0.0B    0.0B         idle  Mar27  03:32  rcu_sched
-root           9   0.0    0.0B    0.0B         idle  Mar27  00:00  rcu_bh
-root          10   0.0    0.0B    0.0B        sleep  Mar27  00:00  migration/0
-root          11   0.0    0.0B    0.0B        sleep  Mar27  00:00  watchdog/0
-root          12   0.0    0.0B    0.0B        sleep  Mar27  00:00  cpuhp/0
-root          13   0.0    0.0B    0.0B        sleep  Mar27  00:00  cpuhp/1
-root          14   0.0    0.0B    0.0B        sleep  Mar27  00:01  watchdog/1
-root          15   0.0    0.0B    0.0B        sleep  Mar27  00:00  migration/1
-[...]
-giampaolo  19704   1.5    1.9G  235.6M        sleep  17:39  01:11  firefox
-root       20414   0.0    0.0B    0.0B         idle  Apr04  00:00  kworker/4:2
-giampaolo  20952   0.0   10.7M  100.0K        sleep  Mar28  00:00  sh -c /usr
-giampaolo  20953   0.0  269.0M  528.0K        sleep  Mar28  00:00  /usr/lib/
-giampaolo  22150   3.3    2.4G  525.5M        sleep  Apr02  49:09  /usr/lib/
-root       22338   0.0    0.0B    0.0B         idle  02:04  00:00  kworker/1:2
-giampaolo  24123   0.0   35.0M    7.0M        sleep  02:12  00:02  bash
-"""
-
-import datetime
-import time
-
-import psutil
-from psutil._common import bytes2human
-from psutil._compat import get_terminal_size
-
-
-def main():
-    today_day = datetime.date.today()
-    templ = "%-10s %5s %5s %7s %7s %5s %6s %6s %6s  %s"
-    attrs = ['pid', 'memory_percent', 'name', 'cmdline', 'cpu_times',
-             'create_time', 'memory_info', 'status', 'nice', 'username']
-    print(templ % ("USER", "PID", "%MEM", "VSZ", "RSS", "NICE",
-                   "STATUS", "START", "TIME", "CMDLINE"))
-    for p in psutil.process_iter(attrs, ad_value=None):
-        if p.info['create_time']:
-            ctime = datetime.datetime.fromtimestamp(p.info['create_time'])
-            if ctime.date() == today_day:
-                ctime = ctime.strftime("%H:%M")
-            else:
-                ctime = ctime.strftime("%b%d")
-        else:
-            ctime = ''
-        if p.info['cpu_times']:
-            cputime = time.strftime("%M:%S",
-                                    time.localtime(sum(p.info['cpu_times'])))
-        else:
-            cputime = ''
-
-        user = p.info['username']
-        if not user and psutil.POSIX:
-            try:
-                user = p.uids()[0]
-            except psutil.Error:
-                pass
-        if user and psutil.WINDOWS and '\\' in user:
-            user = user.split('\\')[1]
-        if not user:
-            user = ''
-        user = user[:9]
-        vms = bytes2human(p.info['memory_info'].vms) if \
-            p.info['memory_info'] is not None else ''
-        rss = bytes2human(p.info['memory_info'].rss) if \
-            p.info['memory_info'] is not None else ''
-        memp = round(p.info['memory_percent'], 1) if \
-            p.info['memory_percent'] is not None else ''
-        nice = int(p.info['nice']) if p.info['nice'] else ''
-        if p.info['cmdline']:
-            cmdline = ' '.join(p.info['cmdline'])
-        else:
-            cmdline = p.info['name']
-        status = p.info['status'][:5] if p.info['status'] else ''
-
-        line = templ % (
-            user,
-            p.info['pid'],
-            memp,
-            vms,
-            rss,
-            nice,
-            status,
-            ctime,
-            cputime,
-            cmdline)
-        print(line[:get_terminal_size()[0]])
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/pstree.py firefox-85.0+build1/third_party/python/psutil/scripts/pstree.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/pstree.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/pstree.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Similar to 'ps aux --forest' on Linux, prints the process list
-as a tree structure.
-
-$ python scripts/pstree.py
-0 ?
-|- 1 init
-| |- 289 cgmanager
-| |- 616 upstart-socket-bridge
-| |- 628 rpcbind
-| |- 892 upstart-file-bridge
-| |- 907 dbus-daemon
-| |- 978 avahi-daemon
-| | `_ 979 avahi-daemon
-| |- 987 NetworkManager
-| | |- 2242 dnsmasq
-| | `_ 10699 dhclient
-| |- 993 polkitd
-| |- 1061 getty
-| |- 1066 su
-| | `_ 1190 salt-minion...
-...
-"""
-
-from __future__ import print_function
-import collections
-import sys
-
-import psutil
-
-
-def print_tree(parent, tree, indent=''):
-    try:
-        name = psutil.Process(parent).name()
-    except psutil.Error:
-        name = "?"
-    print(parent, name)
-    if parent not in tree:
-        return
-    children = tree[parent][:-1]
-    for child in children:
-        sys.stdout.write(indent + "|- ")
-        print_tree(child, tree, indent + "| ")
-    child = tree[parent][-1]
-    sys.stdout.write(indent + "`_ ")
-    print_tree(child, tree, indent + "  ")
-
-
-def main():
-    # construct a dict where 'values' are all the processes
-    # having 'key' as their parent
-    tree = collections.defaultdict(list)
-    for p in psutil.process_iter():
-        try:
-            tree[p.ppid()].append(p.pid)
-        except (psutil.NoSuchProcess, psutil.ZombieProcess):
-            pass
-    # on systems supporting PID 0, PID 0's parent is usually 0
-    if 0 in tree and 0 in tree[0]:
-        tree[0].remove(0)
-    print_tree(min(tree), tree)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/sensors.py firefox-85.0+build1/third_party/python/psutil/scripts/sensors.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/sensors.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/sensors.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'sensors' utility on Linux printing hardware temperatures,
-fans speed and battery info.
-
-$ python scripts/sensors.py
-asus
-    Temperatures:
-        asus                 57.0°C (high=None°C, critical=None°C)
-    Fans:
-        cpu_fan              3500 RPM
-acpitz
-    Temperatures:
-        acpitz               57.0°C (high=108.0°C, critical=108.0°C)
-coretemp
-    Temperatures:
-        Physical id 0        61.0°C (high=87.0°C, critical=105.0°C)
-        Core 0               61.0°C (high=87.0°C, critical=105.0°C)
-        Core 1               59.0°C (high=87.0°C, critical=105.0°C)
-Battery:
-    charge:     84.95%
-    status:     charging
-    plugged in: yes
-"""
-
-from __future__ import print_function
-
-import psutil
-
-
-def secs2hours(secs):
-    mm, ss = divmod(secs, 60)
-    hh, mm = divmod(mm, 60)
-    return "%d:%02d:%02d" % (hh, mm, ss)
-
-
-def main():
-    if hasattr(psutil, "sensors_temperatures"):
-        temps = psutil.sensors_temperatures()
-    else:
-        temps = {}
-    if hasattr(psutil, "sensors_fans"):
-        fans = psutil.sensors_fans()
-    else:
-        fans = {}
-    if hasattr(psutil, "sensors_battery"):
-        battery = psutil.sensors_battery()
-    else:
-        battery = None
-
-    if not any((temps, fans, battery)):
-        print("can't read any temperature, fans or battery info")
-        return
-
-    names = set(list(temps.keys()) + list(fans.keys()))
-    for name in names:
-        print(name)
-        # Temperatures.
-        if name in temps:
-            print("    Temperatures:")
-            for entry in temps[name]:
-                print("        %-20s %s°C (high=%s°C, critical=%s°C)" % (
-                    entry.label or name, entry.current, entry.high,
-                    entry.critical))
-        # Fans.
-        if name in fans:
-            print("    Fans:")
-            for entry in fans[name]:
-                print("        %-20s %s RPM" % (
-                    entry.label or name, entry.current))
-
-    # Battery.
-    if battery:
-        print("Battery:")
-        print("    charge:     %s%%" % round(battery.percent, 2))
-        if battery.power_plugged:
-            print("    status:     %s" % (
-                "charging" if battery.percent < 100 else "fully charged"))
-            print("    plugged in: yes")
-        else:
-            print("    left:       %s" % secs2hours(battery.secsleft))
-            print("    status:     %s" % "discharging")
-            print("    plugged in: no")
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/temperatures.py firefox-85.0+build1/third_party/python/psutil/scripts/temperatures.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/temperatures.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/temperatures.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'sensors' utility on Linux printing hardware temperatures.
-
-$ python scripts/sensors.py
-asus
-    asus                 47.0 °C (high = None °C, critical = None °C)
-
-acpitz
-    acpitz               47.0 °C (high = 103.0 °C, critical = 103.0 °C)
-
-coretemp
-    Physical id 0        54.0 °C (high = 100.0 °C, critical = 100.0 °C)
-    Core 0               47.0 °C (high = 100.0 °C, critical = 100.0 °C)
-    Core 1               48.0 °C (high = 100.0 °C, critical = 100.0 °C)
-    Core 2               47.0 °C (high = 100.0 °C, critical = 100.0 °C)
-    Core 3               54.0 °C (high = 100.0 °C, critical = 100.0 °C)
-"""
-
-from __future__ import print_function
-import sys
-
-import psutil
-
-
-def main():
-    if not hasattr(psutil, "sensors_temperatures"):
-        sys.exit("platform not supported")
-    temps = psutil.sensors_temperatures()
-    if not temps:
-        sys.exit("can't read any temperature")
-    for name, entries in temps.items():
-        print(name)
-        for entry in entries:
-            print("    %-20s %s °C (high = %s °C, critical = %s °C)" % (
-                entry.label or name, entry.current, entry.high,
-                entry.critical))
-        print()
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/top.py firefox-85.0+build1/third_party/python/psutil/scripts/top.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/top.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/top.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,218 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of top / htop.
-
-Author: Giampaolo Rodola' <g.rodola@gmail.com>
-
-$ python scripts/top.py
- CPU0  [||||                                    ]  10.9%
- CPU1  [|||||                                   ]  13.1%
- CPU2  [|||||                                   ]  12.8%
- CPU3  [||||                                    ]  11.5%
- Mem   [|||||||||||||||||||||||||||||           ]  73.0% 11017M / 15936M
- Swap  [                                        ]   1.3%   276M / 20467M
- Processes: 347 (sleeping=273, running=1, idle=73)
- Load average: 1.10 1.28 1.34  Uptime: 8 days, 21:15:40
-
-PID    USER       NI   VIRT    RES  CPU%  MEM%     TIME+  NAME
-5368   giampaol    0   7.2G   4.3G  41.8  27.7  56:34.18  VirtualBox
-24976  giampaol    0   2.1G 487.2M  18.7   3.1  22:05.16  Web Content
-22731  giampaol    0   3.2G 596.2M  11.6   3.7  35:04.90  firefox
-1202   root        0 807.4M 288.5M  10.6   1.8  12:22.12  Xorg
-22811  giampaol    0   2.8G 741.8M   9.0   4.7   2:26.61  Web Content
-2590   giampaol    0   2.3G 579.4M   5.5   3.6  28:02.70  compiz
-22990  giampaol    0   3.0G   1.2G   4.2   7.6   4:30.32  Web Content
-18412  giampaol    0  90.1M  14.5M   3.5   0.1   0:00.26  python3
-26971  netdata     0  20.8M   3.9M   2.9   0.0   3:17.14  apps.plugin
-2421   giampaol    0   3.3G  36.9M   2.3   0.2  57:14.21  pulseaudio
-...
-"""
-
-import atexit
-import datetime
-import sys
-import time
-try:
-    import curses
-except ImportError:
-    sys.exit('platform not supported')
-
-import psutil
-from psutil._common import bytes2human
-
-
-# --- curses stuff
-
-def tear_down():
-    win.keypad(0)
-    curses.nocbreak()
-    curses.echo()
-    curses.endwin()
-
-
-win = curses.initscr()
-atexit.register(tear_down)
-curses.endwin()
-lineno = 0
-
-
-def print_line(line, highlight=False):
-    """A thin wrapper around curses's addstr()."""
-    global lineno
-    try:
-        if highlight:
-            line += " " * (win.getmaxyx()[1] - len(line))
-            win.addstr(lineno, 0, line, curses.A_REVERSE)
-        else:
-            win.addstr(lineno, 0, line, 0)
-    except curses.error:
-        lineno = 0
-        win.refresh()
-        raise
-    else:
-        lineno += 1
-
-# --- /curses stuff
-
-
-def poll(interval):
-    # sleep some time
-    time.sleep(interval)
-    procs = []
-    procs_status = {}
-    for p in psutil.process_iter():
-        try:
-            p.dict = p.as_dict(['username', 'nice', 'memory_info',
-                                'memory_percent', 'cpu_percent',
-                                'cpu_times', 'name', 'status'])
-            try:
-                procs_status[p.dict['status']] += 1
-            except KeyError:
-                procs_status[p.dict['status']] = 1
-        except psutil.NoSuchProcess:
-            pass
-        else:
-            procs.append(p)
-
-    # return processes sorted by CPU percent usage
-    processes = sorted(procs, key=lambda p: p.dict['cpu_percent'],
-                       reverse=True)
-    return (processes, procs_status)
-
-
-def print_header(procs_status, num_procs):
-    """Print system-related info, above the process list."""
-
-    def get_dashes(perc):
-        dashes = "|" * int((float(perc) / 10 * 4))
-        empty_dashes = " " * (40 - len(dashes))
-        return dashes, empty_dashes
-
-    # cpu usage
-    percs = psutil.cpu_percent(interval=0, percpu=True)
-    for cpu_num, perc in enumerate(percs):
-        dashes, empty_dashes = get_dashes(perc)
-        print_line(" CPU%-2s [%s%s] %5s%%" % (cpu_num, dashes, empty_dashes,
-                                              perc))
-    mem = psutil.virtual_memory()
-    dashes, empty_dashes = get_dashes(mem.percent)
-    line = " Mem   [%s%s] %5s%% %6s / %s" % (
-        dashes, empty_dashes,
-        mem.percent,
-        str(int(mem.used / 1024 / 1024)) + "M",
-        str(int(mem.total / 1024 / 1024)) + "M"
-    )
-    print_line(line)
-
-    # swap usage
-    swap = psutil.swap_memory()
-    dashes, empty_dashes = get_dashes(swap.percent)
-    line = " Swap  [%s%s] %5s%% %6s / %s" % (
-        dashes, empty_dashes,
-        swap.percent,
-        str(int(swap.used / 1024 / 1024)) + "M",
-        str(int(swap.total / 1024 / 1024)) + "M"
-    )
-    print_line(line)
-
-    # processes number and status
-    st = []
-    for x, y in procs_status.items():
-        if y:
-            st.append("%s=%s" % (x, y))
-    st.sort(key=lambda x: x[:3] in ('run', 'sle'), reverse=1)
-    print_line(" Processes: %s (%s)" % (num_procs, ', '.join(st)))
-    # load average, uptime
-    uptime = datetime.datetime.now() - \
-        datetime.datetime.fromtimestamp(psutil.boot_time())
-    av1, av2, av3 = psutil.getloadavg()
-    line = " Load average: %.2f %.2f %.2f  Uptime: %s" \
-        % (av1, av2, av3, str(uptime).split('.')[0])
-    print_line(line)
-
-
-def refresh_window(procs, procs_status):
-    """Print results on screen by using curses."""
-    curses.endwin()
-    templ = "%-6s %-8s %4s %6s %6s %5s %5s %9s  %2s"
-    win.erase()
-    header = templ % ("PID", "USER", "NI", "VIRT", "RES", "CPU%", "MEM%",
-                      "TIME+", "NAME")
-    print_header(procs_status, len(procs))
-    print_line("")
-    print_line(header, highlight=True)
-    for p in procs:
-        # TIME+ column shows process CPU cumulative time and it
-        # is expressed as: "mm:ss.ms"
-        if p.dict['cpu_times'] is not None:
-            ctime = datetime.timedelta(seconds=sum(p.dict['cpu_times']))
-            ctime = "%s:%s.%s" % (ctime.seconds // 60 % 60,
-                                  str((ctime.seconds % 60)).zfill(2),
-                                  str(ctime.microseconds)[:2])
-        else:
-            ctime = ''
-        if p.dict['memory_percent'] is not None:
-            p.dict['memory_percent'] = round(p.dict['memory_percent'], 1)
-        else:
-            p.dict['memory_percent'] = ''
-        if p.dict['cpu_percent'] is None:
-            p.dict['cpu_percent'] = ''
-        if p.dict['username']:
-            username = p.dict['username'][:8]
-        else:
-            username = ""
-        line = templ % (p.pid,
-                        username,
-                        p.dict['nice'],
-                        bytes2human(getattr(p.dict['memory_info'], 'vms', 0)),
-                        bytes2human(getattr(p.dict['memory_info'], 'rss', 0)),
-                        p.dict['cpu_percent'],
-                        p.dict['memory_percent'],
-                        ctime,
-                        p.dict['name'] or '',
-                        )
-        try:
-            print_line(line)
-        except curses.error:
-            break
-        win.refresh()
-
-
-def main():
-    try:
-        interval = 0
-        while True:
-            args = poll(interval)
-            refresh_window(*args)
-            interval = 1
-    except (KeyboardInterrupt, SystemExit):
-        pass
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/who.py firefox-85.0+build1/third_party/python/psutil/scripts/who.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/who.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/who.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-A clone of 'who' command; print information about users who are
-currently logged in.
-
-$ python scripts/who.py
-giampaolo    console    2017-03-25 22:24                loginwindow
-giampaolo    ttys000    2017-03-25 23:28 (10.0.2.2)     sshd
-"""
-
-from datetime import datetime
-
-import psutil
-
-
-def main():
-    users = psutil.users()
-    for user in users:
-        proc_name = psutil.Process(user.pid).name() if user.pid else ""
-        print("%-12s %-10s %-10s %-14s %s" % (
-            user.name,
-            user.terminal or '-',
-            datetime.fromtimestamp(user.started).strftime("%Y-%m-%d %H:%M"),
-            "(%s)" % user.host if user.host else "",
-            proc_name
-        ))
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/scripts/winservices.py firefox-85.0+build1/third_party/python/psutil/scripts/winservices.py
--- firefox-84.0.2+build1/third_party/python/psutil/scripts/winservices.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/scripts/winservices.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-r"""
-List all Windows services installed.
-
-$ python scripts/winservices.py
-AeLookupSvc (Application Experience)
-status: stopped, start: manual, username: localSystem, pid: None
-binpath: C:\Windows\system32\svchost.exe -k netsvcs
-
-ALG (Application Layer Gateway Service)
-status: stopped, start: manual, username: NT AUTHORITY\LocalService, pid: None
-binpath: C:\Windows\System32\alg.exe
-
-APNMCP (Ask Update Service)
-status: running, start: automatic, username: LocalSystem, pid: 1108
-binpath: "C:\Program Files (x86)\AskPartnerNetwork\Toolbar\apnmcp.exe"
-
-AppIDSvc (Application Identity)
-status: stopped, start: manual, username: NT Authority\LocalService, pid: None
-binpath: C:\Windows\system32\svchost.exe -k LocalServiceAndNoImpersonation
-
-Appinfo (Application Information)
-status: stopped, start: manual, username: LocalSystem, pid: None
-binpath: C:\Windows\system32\svchost.exe -k netsvcs
-...
-"""
-
-
-import os
-import sys
-
-import psutil
-
-
-if os.name != 'nt':
-    sys.exit("platform not supported (Windows only)")
-
-
-def main():
-    for service in psutil.win_service_iter():
-        info = service.as_dict()
-        print("%r (%r)" % (info['name'], info['display_name']))
-        print("status: %s, start: %s, username: %s, pid: %s" % (
-            info['status'], info['start_type'], info['username'], info['pid']))
-        print("binpath: %s" % info['binpath'])
-        print("")
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/setup.cfg firefox-85.0+build1/third_party/python/psutil/setup.cfg
--- firefox-84.0.2+build1/third_party/python/psutil/setup.cfg	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/setup.cfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/setup.py firefox-85.0+build1/third_party/python/psutil/setup.py
--- firefox-84.0.2+build1/third_party/python/psutil/setup.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/setup.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,426 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009 Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Cross-platform lib for process and system monitoring in Python."""
-
-from __future__ import print_function
-import contextlib
-import io
-import os
-import platform
-import re
-import shutil
-import struct
-import sys
-import tempfile
-import warnings
-
-with warnings.catch_warnings():
-    warnings.simplefilter("ignore")
-    try:
-        import setuptools
-        from setuptools import setup, Extension
-    except ImportError:
-        setuptools = None
-        from distutils.core import setup, Extension
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-
-# ...so we can import _common.py and _compat.py
-sys.path.insert(0, os.path.join(HERE, "psutil"))
-
-from _common import AIX  # NOQA
-from _common import BSD  # NOQA
-from _common import FREEBSD  # NOQA
-from _common import hilite  # NOQA
-from _common import LINUX  # NOQA
-from _common import MACOS  # NOQA
-from _common import NETBSD  # NOQA
-from _common import OPENBSD  # NOQA
-from _common import POSIX  # NOQA
-from _common import SUNOS  # NOQA
-from _common import WINDOWS  # NOQA
-from _compat import PY3  # NOQA
-from _compat import which  # NOQA
-
-
-macros = []
-if POSIX:
-    macros.append(("PSUTIL_POSIX", 1))
-if BSD:
-    macros.append(("PSUTIL_BSD", 1))
-
-# Needed to determine _Py_PARSE_PID in case it's missing (Python 2, PyPy).
-# Taken from Lib/test/test_fcntl.py.
-# XXX: not bullet proof as the (long long) case is missing.
-if struct.calcsize('l') <= 8:
-    macros.append(('PSUTIL_SIZEOF_PID_T', '4'))  # int
-else:
-    macros.append(('PSUTIL_SIZEOF_PID_T', '8'))  # long
-
-
-sources = ['psutil/_psutil_common.c']
-if POSIX:
-    sources.append('psutil/_psutil_posix.c')
-
-
-extras_require = {}
-if sys.version_info[:2] <= (3, 3):
-    extras_require.update(dict(enum='enum34'))
-
-
-def get_version():
-    INIT = os.path.join(HERE, 'psutil/__init__.py')
-    with open(INIT, 'r') as f:
-        for line in f:
-            if line.startswith('__version__'):
-                ret = eval(line.strip().split(' = ')[1])
-                assert ret.count('.') == 2, ret
-                for num in ret.split('.'):
-                    assert num.isdigit(), ret
-                return ret
-        raise ValueError("couldn't find version string")
-
-
-VERSION = get_version()
-macros.append(('PSUTIL_VERSION', int(VERSION.replace('.', ''))))
-
-
-def get_description():
-    README = os.path.join(HERE, 'README.rst')
-    with open(README, 'r') as f:
-        return f.read()
-
-
-@contextlib.contextmanager
-def silenced_output(stream_name):
-    class DummyFile(io.BytesIO):
-        # see: https://github.com/giampaolo/psutil/issues/678
-        errors = "ignore"
-
-        def write(self, s):
-            pass
-
-    orig = getattr(sys, stream_name)
-    try:
-        setattr(sys, stream_name, DummyFile())
-        yield
-    finally:
-        setattr(sys, stream_name, orig)
-
-
-def missdeps(msg):
-    s = hilite("C compiler or Python headers are not installed ", ok=False)
-    s += hilite("on this system. Try to run:\n", ok=False)
-    s += hilite(msg, ok=False, bold=True)
-    print(s, file=sys.stderr)
-
-
-if WINDOWS:
-    def get_winver():
-        maj, min = sys.getwindowsversion()[0:2]
-        return '0x0%s' % ((maj * 100) + min)
-
-    if sys.getwindowsversion()[0] < 6:
-        msg = "this Windows version is too old (< Windows Vista); "
-        msg += "psutil 3.4.2 is the latest version which supports Windows "
-        msg += "2000, XP and 2003 server"
-        raise RuntimeError(msg)
-
-    macros.append(("PSUTIL_WINDOWS", 1))
-    macros.extend([
-        # be nice to mingw, see:
-        # http://www.mingw.org/wiki/Use_more_recent_defined_functions
-        ('_WIN32_WINNT', get_winver()),
-        ('_AVAIL_WINVER_', get_winver()),
-        ('_CRT_SECURE_NO_WARNINGS', None),
-        # see: https://github.com/giampaolo/psutil/issues/348
-        ('PSAPI_VERSION', 1),
-    ])
-
-    ext = Extension(
-        'psutil._psutil_windows',
-        sources=sources + [
-            'psutil/_psutil_windows.c',
-            'psutil/arch/windows/process_utils.c',
-            'psutil/arch/windows/process_info.c',
-            'psutil/arch/windows/process_handles.c',
-            'psutil/arch/windows/disk.c',
-            'psutil/arch/windows/net.c',
-            'psutil/arch/windows/cpu.c',
-            'psutil/arch/windows/security.c',
-            'psutil/arch/windows/services.c',
-            'psutil/arch/windows/socks.c',
-            'psutil/arch/windows/wmi.c',
-        ],
-        define_macros=macros,
-        libraries=[
-            "psapi", "kernel32", "advapi32", "shell32", "netapi32",
-            "wtsapi32", "ws2_32", "PowrProf", "pdh",
-        ],
-        # extra_compile_args=["/W 4"],
-        # extra_link_args=["/DEBUG"]
-    )
-
-elif MACOS:
-    macros.append(("PSUTIL_OSX", 1))
-    ext = Extension(
-        'psutil._psutil_osx',
-        sources=sources + [
-            'psutil/_psutil_osx.c',
-            'psutil/arch/osx/process_info.c',
-        ],
-        define_macros=macros,
-        extra_link_args=[
-            '-framework', 'CoreFoundation', '-framework', 'IOKit'
-        ])
-
-elif FREEBSD:
-    macros.append(("PSUTIL_FREEBSD", 1))
-    ext = Extension(
-        'psutil._psutil_bsd',
-        sources=sources + [
-            'psutil/_psutil_bsd.c',
-            'psutil/arch/freebsd/specific.c',
-            'psutil/arch/freebsd/sys_socks.c',
-            'psutil/arch/freebsd/proc_socks.c',
-        ],
-        define_macros=macros,
-        libraries=["devstat"])
-
-elif OPENBSD:
-    macros.append(("PSUTIL_OPENBSD", 1))
-    ext = Extension(
-        'psutil._psutil_bsd',
-        sources=sources + [
-            'psutil/_psutil_bsd.c',
-            'psutil/arch/openbsd/specific.c',
-        ],
-        define_macros=macros,
-        libraries=["kvm"])
-
-elif NETBSD:
-    macros.append(("PSUTIL_NETBSD", 1))
-    ext = Extension(
-        'psutil._psutil_bsd',
-        sources=sources + [
-            'psutil/_psutil_bsd.c',
-            'psutil/arch/netbsd/specific.c',
-            'psutil/arch/netbsd/socks.c',
-        ],
-        define_macros=macros,
-        libraries=["kvm"])
-
-elif LINUX:
-    def get_ethtool_macro():
-        # see: https://github.com/giampaolo/psutil/issues/659
-        from distutils.unixccompiler import UnixCCompiler
-        from distutils.errors import CompileError
-
-        with tempfile.NamedTemporaryFile(
-                suffix='.c', delete=False, mode="wt") as f:
-            f.write("#include <linux/ethtool.h>")
-
-        output_dir = tempfile.mkdtemp()
-        try:
-            compiler = UnixCCompiler()
-            # https://github.com/giampaolo/psutil/pull/1568
-            if os.getenv('CC'):
-                compiler.set_executable('compiler_so', os.getenv('CC'))
-            with silenced_output('stderr'):
-                with silenced_output('stdout'):
-                    compiler.compile([f.name], output_dir=output_dir)
-        except CompileError:
-            return ("PSUTIL_ETHTOOL_MISSING_TYPES", 1)
-        else:
-            return None
-        finally:
-            os.remove(f.name)
-            shutil.rmtree(output_dir)
-
-    macros.append(("PSUTIL_LINUX", 1))
-    ETHTOOL_MACRO = get_ethtool_macro()
-    if ETHTOOL_MACRO is not None:
-        macros.append(ETHTOOL_MACRO)
-    ext = Extension(
-        'psutil._psutil_linux',
-        sources=sources + ['psutil/_psutil_linux.c'],
-        define_macros=macros)
-
-elif SUNOS:
-    macros.append(("PSUTIL_SUNOS", 1))
-    ext = Extension(
-        'psutil._psutil_sunos',
-        sources=sources + [
-            'psutil/_psutil_sunos.c',
-            'psutil/arch/solaris/v10/ifaddrs.c',
-            'psutil/arch/solaris/environ.c'
-        ],
-        define_macros=macros,
-        libraries=['kstat', 'nsl', 'socket'])
-
-elif AIX:
-    macros.append(("PSUTIL_AIX", 1))
-    ext = Extension(
-        'psutil._psutil_aix',
-        sources=sources + [
-            'psutil/_psutil_aix.c',
-            'psutil/arch/aix/net_connections.c',
-            'psutil/arch/aix/common.c',
-            'psutil/arch/aix/ifaddrs.c'],
-        libraries=['perfstat'],
-        define_macros=macros)
-
-else:
-    sys.exit('platform %s is not supported' % sys.platform)
-
-
-if POSIX:
-    posix_extension = Extension(
-        'psutil._psutil_posix',
-        define_macros=macros,
-        sources=sources)
-    if SUNOS:
-        def get_sunos_update():
-            # See https://serverfault.com/q/524883
-            # for an explanation of Solaris /etc/release
-            with open('/etc/release') as f:
-                update = re.search(r'(?<=s10s_u)[0-9]{1,2}', f.readline())
-                if update is None:
-                    return 0
-                else:
-                    return int(update.group(0))
-
-        posix_extension.libraries.append('socket')
-        if platform.release() == '5.10':
-            # Detect Solaris 5.10, update >= 4, see:
-            # https://github.com/giampaolo/psutil/pull/1638
-            if get_sunos_update() >= 4:
-                # MIB compliancy starts with SunOS 5.10 Update 4:
-                posix_extension.define_macros.append(('NEW_MIB_COMPLIANT', 1))
-            posix_extension.sources.append('psutil/arch/solaris/v10/ifaddrs.c')
-            posix_extension.define_macros.append(('PSUTIL_SUNOS10', 1))
-        else:
-            # Other releases are by default considered to be new mib compliant.
-            posix_extension.define_macros.append(('NEW_MIB_COMPLIANT', 1))
-    elif AIX:
-        posix_extension.sources.append('psutil/arch/aix/ifaddrs.c')
-
-    extensions = [ext, posix_extension]
-else:
-    extensions = [ext]
-
-
-def main():
-    kwargs = dict(
-        name='psutil',
-        version=VERSION,
-        description=__doc__ .replace('\n', ' ').strip() if __doc__ else '',
-        long_description=get_description(),
-        keywords=[
-            'ps', 'top', 'kill', 'free', 'lsof', 'netstat', 'nice', 'tty',
-            'ionice', 'uptime', 'taskmgr', 'process', 'df', 'iotop', 'iostat',
-            'ifconfig', 'taskset', 'who', 'pidof', 'pmap', 'smem', 'pstree',
-            'monitoring', 'ulimit', 'prlimit', 'smem', 'performance',
-            'metrics', 'agent', 'observability',
-        ],
-        author='Giampaolo Rodola',
-        author_email='g.rodola@gmail.com',
-        url='https://github.com/giampaolo/psutil',
-        platforms='Platform Independent',
-        license='BSD',
-        packages=['psutil', 'psutil.tests'],
-        ext_modules=extensions,
-        classifiers=[
-            'Development Status :: 5 - Production/Stable',
-            'Environment :: Console',
-            'Environment :: Win32 (MS Windows)',
-            'Intended Audience :: Developers',
-            'Intended Audience :: Information Technology',
-            'Intended Audience :: System Administrators',
-            'License :: OSI Approved :: BSD License',
-            'Operating System :: MacOS :: MacOS X',
-            'Operating System :: Microsoft :: Windows :: Windows 10',
-            'Operating System :: Microsoft :: Windows :: Windows 7',
-            'Operating System :: Microsoft :: Windows :: Windows 8',
-            'Operating System :: Microsoft :: Windows :: Windows 8.1',
-            'Operating System :: Microsoft :: Windows :: Windows Server 2003',
-            'Operating System :: Microsoft :: Windows :: Windows Server 2008',
-            'Operating System :: Microsoft :: Windows :: Windows Vista',
-            'Operating System :: Microsoft',
-            'Operating System :: OS Independent',
-            'Operating System :: POSIX :: AIX',
-            'Operating System :: POSIX :: BSD :: FreeBSD',
-            'Operating System :: POSIX :: BSD :: NetBSD',
-            'Operating System :: POSIX :: BSD :: OpenBSD',
-            'Operating System :: POSIX :: BSD',
-            'Operating System :: POSIX :: Linux',
-            'Operating System :: POSIX :: SunOS/Solaris',
-            'Operating System :: POSIX',
-            'Programming Language :: C',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.6',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: Implementation :: CPython',
-            'Programming Language :: Python :: Implementation :: PyPy',
-            'Programming Language :: Python',
-            'Topic :: Software Development :: Libraries :: Python Modules',
-            'Topic :: Software Development :: Libraries',
-            'Topic :: System :: Benchmark',
-            'Topic :: System :: Hardware :: Hardware Drivers',
-            'Topic :: System :: Hardware',
-            'Topic :: System :: Monitoring',
-            'Topic :: System :: Networking :: Monitoring :: Hardware Watchdog',
-            'Topic :: System :: Networking :: Monitoring',
-            'Topic :: System :: Networking',
-            'Topic :: System :: Operating System',
-            'Topic :: System :: Systems Administration',
-            'Topic :: Utilities',
-        ],
-    )
-    if setuptools is not None:
-        kwargs.update(
-            python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
-            extras_require=extras_require,
-            zip_safe=False,
-        )
-    success = False
-    try:
-        setup(**kwargs)
-        success = True
-    finally:
-        if not success and POSIX and not which('gcc'):
-            py3 = "3" if PY3 else ""
-            if LINUX:
-                if which('dpkg'):
-                    missdeps("sudo apt-get install gcc python%s-dev" % py3)
-                elif which('rpm'):
-                    missdeps("sudo yum install gcc python%s-devel" % py3)
-            elif MACOS:
-                print(hilite("XCode (https://developer.apple.com/xcode/) "
-                             "is not installed"), ok=False, file=sys.stderr)
-            elif FREEBSD:
-                missdeps("pkg install gcc python%s" % py3)
-            elif OPENBSD:
-                missdeps("pkg_add -v gcc python%s" % py3)
-            elif NETBSD:
-                missdeps("pkgin install gcc python%s" % py3)
-            elif SUNOS:
-                missdeps("sudo ln -s /usr/bin/gcc /usr/local/bin/cc && "
-                         "pkg install gcc")
-        elif not success and WINDOWS:
-            if PY3:
-                ur = "http://www.visualstudio.com/en-au/news/vs2015-preview-vs"
-            else:
-                ur = "http://www.microsoft.com/en-us/download/"
-                ur += "details.aspx?id=44266"
-            s = "VisualStudio is not installed; get it from %s" % ur
-            print(hilite(s, ok=False), file=sys.stderr)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil/tox.ini firefox-85.0+build1/third_party/python/psutil/tox.ini
--- firefox-84.0.2+build1/third_party/python/psutil/tox.ini	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil/tox.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Tox (http://tox.testrun.org/) is a tool for running tests
-# in multiple virtualenvs. This configuration file will run the
-# test suite on all supported python versions.
-# To use it run "pip install tox" and then run "tox" from this
-# directory.
-
-[tox]
-envlist = py26, py27, py34, py35, py36, py37, py38, lint
-
-[testenv]
-deps =
-    py26: ipaddress
-    py26: mock==1.0.1
-    py26: unittest2
-    py27: ipaddress
-    py27: mock
-
-setenv =
-    TOX = 1
-
-commands = python psutil/tests/runner.py
-
-usedevelop = True
-
-[testenv:lint]
-deps = flake8
-commands = flake8
-skip_install = True
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_common.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_common.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_common.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_common.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,846 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Common objects shared by __init__.py and _ps*.py modules."""
-
-# Note: this module is imported by setup.py so it should not import
-# psutil or third-party modules.
-
-from __future__ import division, print_function
-
-import contextlib
-import errno
-import functools
-import os
-import socket
-import stat
-import sys
-import threading
-import warnings
-from collections import defaultdict
-from collections import namedtuple
-from socket import AF_INET
-from socket import SOCK_DGRAM
-from socket import SOCK_STREAM
-
-try:
-    from socket import AF_INET6
-except ImportError:
-    AF_INET6 = None
-try:
-    from socket import AF_UNIX
-except ImportError:
-    AF_UNIX = None
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-# can't take it from _common.py as this script is imported by setup.py
-PY3 = sys.version_info[0] == 3
-
-__all__ = [
-    # OS constants
-    'FREEBSD', 'BSD', 'LINUX', 'NETBSD', 'OPENBSD', 'MACOS', 'OSX', 'POSIX',
-    'SUNOS', 'WINDOWS',
-    # connection constants
-    'CONN_CLOSE', 'CONN_CLOSE_WAIT', 'CONN_CLOSING', 'CONN_ESTABLISHED',
-    'CONN_FIN_WAIT1', 'CONN_FIN_WAIT2', 'CONN_LAST_ACK', 'CONN_LISTEN',
-    'CONN_NONE', 'CONN_SYN_RECV', 'CONN_SYN_SENT', 'CONN_TIME_WAIT',
-    # net constants
-    'NIC_DUPLEX_FULL', 'NIC_DUPLEX_HALF', 'NIC_DUPLEX_UNKNOWN',
-    # process status constants
-    'STATUS_DEAD', 'STATUS_DISK_SLEEP', 'STATUS_IDLE', 'STATUS_LOCKED',
-    'STATUS_RUNNING', 'STATUS_SLEEPING', 'STATUS_STOPPED', 'STATUS_SUSPENDED',
-    'STATUS_TRACING_STOP', 'STATUS_WAITING', 'STATUS_WAKE_KILL',
-    'STATUS_WAKING', 'STATUS_ZOMBIE', 'STATUS_PARKED',
-    # other constants
-    'ENCODING', 'ENCODING_ERRS', 'AF_INET6',
-    # named tuples
-    'pconn', 'pcputimes', 'pctxsw', 'pgids', 'pio', 'pionice', 'popenfile',
-    'pthread', 'puids', 'sconn', 'scpustats', 'sdiskio', 'sdiskpart',
-    'sdiskusage', 'snetio', 'snicaddr', 'snicstats', 'sswap', 'suser',
-    # utility functions
-    'conn_tmap', 'deprecated_method', 'isfile_strict', 'memoize',
-    'parse_environ_block', 'path_exists_strict', 'usage_percent',
-    'supports_ipv6', 'sockfam_to_enum', 'socktype_to_enum', "wrap_numbers",
-    'bytes2human', 'conn_to_ntuple', 'debug',
-    # shell utils
-    'hilite', 'term_supports_colors', 'print_color',
-]
-
-
-# ===================================================================
-# --- OS constants
-# ===================================================================
-
-
-POSIX = os.name == "posix"
-WINDOWS = os.name == "nt"
-LINUX = sys.platform.startswith("linux")
-MACOS = sys.platform.startswith("darwin")
-OSX = MACOS  # deprecated alias
-FREEBSD = sys.platform.startswith("freebsd")
-OPENBSD = sys.platform.startswith("openbsd")
-NETBSD = sys.platform.startswith("netbsd")
-BSD = FREEBSD or OPENBSD or NETBSD
-SUNOS = sys.platform.startswith(("sunos", "solaris"))
-AIX = sys.platform.startswith("aix")
-
-
-# ===================================================================
-# --- API constants
-# ===================================================================
-
-
-# Process.status()
-STATUS_RUNNING = "running"
-STATUS_SLEEPING = "sleeping"
-STATUS_DISK_SLEEP = "disk-sleep"
-STATUS_STOPPED = "stopped"
-STATUS_TRACING_STOP = "tracing-stop"
-STATUS_ZOMBIE = "zombie"
-STATUS_DEAD = "dead"
-STATUS_WAKE_KILL = "wake-kill"
-STATUS_WAKING = "waking"
-STATUS_IDLE = "idle"  # Linux, macOS, FreeBSD
-STATUS_LOCKED = "locked"  # FreeBSD
-STATUS_WAITING = "waiting"  # FreeBSD
-STATUS_SUSPENDED = "suspended"  # NetBSD
-STATUS_PARKED = "parked"  # Linux
-
-# Process.connections() and psutil.net_connections()
-CONN_ESTABLISHED = "ESTABLISHED"
-CONN_SYN_SENT = "SYN_SENT"
-CONN_SYN_RECV = "SYN_RECV"
-CONN_FIN_WAIT1 = "FIN_WAIT1"
-CONN_FIN_WAIT2 = "FIN_WAIT2"
-CONN_TIME_WAIT = "TIME_WAIT"
-CONN_CLOSE = "CLOSE"
-CONN_CLOSE_WAIT = "CLOSE_WAIT"
-CONN_LAST_ACK = "LAST_ACK"
-CONN_LISTEN = "LISTEN"
-CONN_CLOSING = "CLOSING"
-CONN_NONE = "NONE"
-
-# net_if_stats()
-if enum is None:
-    NIC_DUPLEX_FULL = 2
-    NIC_DUPLEX_HALF = 1
-    NIC_DUPLEX_UNKNOWN = 0
-else:
-    class NicDuplex(enum.IntEnum):
-        NIC_DUPLEX_FULL = 2
-        NIC_DUPLEX_HALF = 1
-        NIC_DUPLEX_UNKNOWN = 0
-
-    globals().update(NicDuplex.__members__)
-
-# sensors_battery()
-if enum is None:
-    POWER_TIME_UNKNOWN = -1
-    POWER_TIME_UNLIMITED = -2
-else:
-    class BatteryTime(enum.IntEnum):
-        POWER_TIME_UNKNOWN = -1
-        POWER_TIME_UNLIMITED = -2
-
-    globals().update(BatteryTime.__members__)
-
-# --- others
-
-ENCODING = sys.getfilesystemencoding()
-if not PY3:
-    ENCODING_ERRS = "replace"
-else:
-    try:
-        ENCODING_ERRS = sys.getfilesystemencodeerrors()  # py 3.6
-    except AttributeError:
-        ENCODING_ERRS = "surrogateescape" if POSIX else "replace"
-
-
-# ===================================================================
-# --- namedtuples
-# ===================================================================
-
-# --- for system functions
-
-# psutil.swap_memory()
-sswap = namedtuple('sswap', ['total', 'used', 'free', 'percent', 'sin',
-                             'sout'])
-# psutil.disk_usage()
-sdiskusage = namedtuple('sdiskusage', ['total', 'used', 'free', 'percent'])
-# psutil.disk_io_counters()
-sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                 'read_bytes', 'write_bytes',
-                                 'read_time', 'write_time'])
-# psutil.disk_partitions()
-sdiskpart = namedtuple('sdiskpart', ['device', 'mountpoint', 'fstype', 'opts'])
-# psutil.net_io_counters()
-snetio = namedtuple('snetio', ['bytes_sent', 'bytes_recv',
-                               'packets_sent', 'packets_recv',
-                               'errin', 'errout',
-                               'dropin', 'dropout'])
-# psutil.users()
-suser = namedtuple('suser', ['name', 'terminal', 'host', 'started', 'pid'])
-# psutil.net_connections()
-sconn = namedtuple('sconn', ['fd', 'family', 'type', 'laddr', 'raddr',
-                             'status', 'pid'])
-# psutil.net_if_addrs()
-snicaddr = namedtuple('snicaddr',
-                      ['family', 'address', 'netmask', 'broadcast', 'ptp'])
-# psutil.net_if_stats()
-snicstats = namedtuple('snicstats', ['isup', 'duplex', 'speed', 'mtu'])
-# psutil.cpu_stats()
-scpustats = namedtuple(
-    'scpustats', ['ctx_switches', 'interrupts', 'soft_interrupts', 'syscalls'])
-# psutil.cpu_freq()
-scpufreq = namedtuple('scpufreq', ['current', 'min', 'max'])
-# psutil.sensors_temperatures()
-shwtemp = namedtuple(
-    'shwtemp', ['label', 'current', 'high', 'critical'])
-# psutil.sensors_battery()
-sbattery = namedtuple('sbattery', ['percent', 'secsleft', 'power_plugged'])
-# psutil.sensors_fans()
-sfan = namedtuple('sfan', ['label', 'current'])
-
-# --- for Process methods
-
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.Process.open_files()
-popenfile = namedtuple('popenfile', ['path', 'fd'])
-# psutil.Process.threads()
-pthread = namedtuple('pthread', ['id', 'user_time', 'system_time'])
-# psutil.Process.uids()
-puids = namedtuple('puids', ['real', 'effective', 'saved'])
-# psutil.Process.gids()
-pgids = namedtuple('pgids', ['real', 'effective', 'saved'])
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes'])
-# psutil.Process.ionice()
-pionice = namedtuple('pionice', ['ioclass', 'value'])
-# psutil.Process.ctx_switches()
-pctxsw = namedtuple('pctxsw', ['voluntary', 'involuntary'])
-# psutil.Process.connections()
-pconn = namedtuple('pconn', ['fd', 'family', 'type', 'laddr', 'raddr',
-                             'status'])
-
-# psutil.connections() and psutil.Process.connections()
-addr = namedtuple('addr', ['ip', 'port'])
-
-
-# ===================================================================
-# --- Process.connections() 'kind' parameter mapping
-# ===================================================================
-
-
-conn_tmap = {
-    "all": ([AF_INET, AF_INET6, AF_UNIX], [SOCK_STREAM, SOCK_DGRAM]),
-    "tcp": ([AF_INET, AF_INET6], [SOCK_STREAM]),
-    "tcp4": ([AF_INET], [SOCK_STREAM]),
-    "udp": ([AF_INET, AF_INET6], [SOCK_DGRAM]),
-    "udp4": ([AF_INET], [SOCK_DGRAM]),
-    "inet": ([AF_INET, AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
-    "inet4": ([AF_INET], [SOCK_STREAM, SOCK_DGRAM]),
-    "inet6": ([AF_INET6], [SOCK_STREAM, SOCK_DGRAM]),
-}
-
-if AF_INET6 is not None:
-    conn_tmap.update({
-        "tcp6": ([AF_INET6], [SOCK_STREAM]),
-        "udp6": ([AF_INET6], [SOCK_DGRAM]),
-    })
-
-if AF_UNIX is not None:
-    conn_tmap.update({
-        "unix": ([AF_UNIX], [SOCK_STREAM, SOCK_DGRAM]),
-    })
-
-
-# =====================================================================
-# --- Exceptions
-# =====================================================================
-
-
-class Error(Exception):
-    """Base exception class. All other psutil exceptions inherit
-    from this one.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, msg=""):
-        Exception.__init__(self, msg)
-        self.msg = msg
-
-    def __repr__(self):
-        ret = "psutil.%s %s" % (self.__class__.__name__, self.msg)
-        return ret.strip()
-
-    __str__ = __repr__
-
-
-class NoSuchProcess(Error):
-    """Exception raised when a process with a certain PID doesn't
-    or no longer exists.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, pid, name=None, msg=None):
-        Error.__init__(self, msg)
-        self.pid = pid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            if name:
-                details = "(pid=%s, name=%s)" % (self.pid, repr(self.name))
-            else:
-                details = "(pid=%s)" % self.pid
-            self.msg = "process no longer exists " + details
-
-    def __path__(self):
-        return 'xxx'
-
-
-class ZombieProcess(NoSuchProcess):
-    """Exception raised when querying a zombie process. This is
-    raised on macOS, BSD and Solaris only, and not always: depending
-    on the query the OS may be able to succeed anyway.
-    On Linux all zombie processes are querable (hence this is never
-    raised). Windows doesn't have zombie processes.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, pid, name=None, ppid=None, msg=None):
-        NoSuchProcess.__init__(self, msg)
-        self.pid = pid
-        self.ppid = ppid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            args = ["pid=%s" % pid]
-            if name:
-                args.append("name=%s" % repr(self.name))
-            if ppid:
-                args.append("ppid=%s" % self.ppid)
-            details = "(%s)" % ", ".join(args)
-            self.msg = "process still exists but it's a zombie " + details
-
-
-class AccessDenied(Error):
-    """Exception raised when permission to perform an action is denied."""
-    __module__ = 'psutil'
-
-    def __init__(self, pid=None, name=None, msg=None):
-        Error.__init__(self, msg)
-        self.pid = pid
-        self.name = name
-        self.msg = msg
-        if msg is None:
-            if (pid is not None) and (name is not None):
-                self.msg = "(pid=%s, name=%s)" % (pid, repr(name))
-            elif (pid is not None):
-                self.msg = "(pid=%s)" % self.pid
-            else:
-                self.msg = ""
-
-
-class TimeoutExpired(Error):
-    """Raised on Process.wait(timeout) if timeout expires and process
-    is still alive.
-    """
-    __module__ = 'psutil'
-
-    def __init__(self, seconds, pid=None, name=None):
-        Error.__init__(self, "timeout after %s seconds" % seconds)
-        self.seconds = seconds
-        self.pid = pid
-        self.name = name
-        if (pid is not None) and (name is not None):
-            self.msg += " (pid=%s, name=%s)" % (pid, repr(name))
-        elif (pid is not None):
-            self.msg += " (pid=%s)" % self.pid
-
-
-# ===================================================================
-# --- utils
-# ===================================================================
-
-
-def usage_percent(used, total, round_=None):
-    """Calculate percentage usage of 'used' against 'total'."""
-    try:
-        ret = (float(used) / total) * 100
-    except ZeroDivisionError:
-        return 0.0
-    else:
-        if round_ is not None:
-            ret = round(ret, round_)
-        return ret
-
-
-def memoize(fun):
-    """A simple memoize decorator for functions supporting (hashable)
-    positional arguments.
-    It also provides a cache_clear() function for clearing the cache:
-
-    >>> @memoize
-    ... def foo()
-    ...     return 1
-        ...
-    >>> foo()
-    1
-    >>> foo.cache_clear()
-    >>>
-    """
-    @functools.wraps(fun)
-    def wrapper(*args, **kwargs):
-        key = (args, frozenset(sorted(kwargs.items())))
-        try:
-            return cache[key]
-        except KeyError:
-            ret = cache[key] = fun(*args, **kwargs)
-            return ret
-
-    def cache_clear():
-        """Clear cache."""
-        cache.clear()
-
-    cache = {}
-    wrapper.cache_clear = cache_clear
-    return wrapper
-
-
-def memoize_when_activated(fun):
-    """A memoize decorator which is disabled by default. It can be
-    activated and deactivated on request.
-    For efficiency reasons it can be used only against class methods
-    accepting no arguments.
-
-    >>> class Foo:
-    ...     @memoize
-    ...     def foo()
-    ...         print(1)
-    ...
-    >>> f = Foo()
-    >>> # deactivated (default)
-    >>> foo()
-    1
-    >>> foo()
-    1
-    >>>
-    >>> # activated
-    >>> foo.cache_activate(self)
-    >>> foo()
-    1
-    >>> foo()
-    >>> foo()
-    >>>
-    """
-    @functools.wraps(fun)
-    def wrapper(self):
-        try:
-            # case 1: we previously entered oneshot() ctx
-            ret = self._cache[fun]
-        except AttributeError:
-            # case 2: we never entered oneshot() ctx
-            return fun(self)
-        except KeyError:
-            # case 3: we entered oneshot() ctx but there's no cache
-            # for this entry yet
-            ret = self._cache[fun] = fun(self)
-        return ret
-
-    def cache_activate(proc):
-        """Activate cache. Expects a Process instance. Cache will be
-        stored as a "_cache" instance attribute."""
-        proc._cache = {}
-
-    def cache_deactivate(proc):
-        """Deactivate and clear cache."""
-        try:
-            del proc._cache
-        except AttributeError:
-            pass
-
-    wrapper.cache_activate = cache_activate
-    wrapper.cache_deactivate = cache_deactivate
-    return wrapper
-
-
-def isfile_strict(path):
-    """Same as os.path.isfile() but does not swallow EACCES / EPERM
-    exceptions, see:
-    http://mail.python.org/pipermail/python-dev/2012-June/120787.html
-    """
-    try:
-        st = os.stat(path)
-    except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
-            raise
-        return False
-    else:
-        return stat.S_ISREG(st.st_mode)
-
-
-def path_exists_strict(path):
-    """Same as os.path.exists() but does not swallow EACCES / EPERM
-    exceptions, see:
-    http://mail.python.org/pipermail/python-dev/2012-June/120787.html
-    """
-    try:
-        os.stat(path)
-    except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
-            raise
-        return False
-    else:
-        return True
-
-
-@memoize
-def supports_ipv6():
-    """Return True if IPv6 is supported on this platform."""
-    if not socket.has_ipv6 or AF_INET6 is None:
-        return False
-    try:
-        sock = socket.socket(AF_INET6, socket.SOCK_STREAM)
-        with contextlib.closing(sock):
-            sock.bind(("::1", 0))
-        return True
-    except socket.error:
-        return False
-
-
-def parse_environ_block(data):
-    """Parse a C environ block of environment variables into a dictionary."""
-    # The block is usually raw data from the target process.  It might contain
-    # trailing garbage and lines that do not look like assignments.
-    ret = {}
-    pos = 0
-
-    # localize global variable to speed up access.
-    WINDOWS_ = WINDOWS
-    while True:
-        next_pos = data.find("\0", pos)
-        # nul byte at the beginning or double nul byte means finish
-        if next_pos <= pos:
-            break
-        # there might not be an equals sign
-        equal_pos = data.find("=", pos, next_pos)
-        if equal_pos > pos:
-            key = data[pos:equal_pos]
-            value = data[equal_pos + 1:next_pos]
-            # Windows expects environment variables to be uppercase only
-            if WINDOWS_:
-                key = key.upper()
-            ret[key] = value
-        pos = next_pos + 1
-
-    return ret
-
-
-def sockfam_to_enum(num):
-    """Convert a numeric socket family value to an IntEnum member.
-    If it's not a known member, return the numeric value itself.
-    """
-    if enum is None:
-        return num
-    else:  # pragma: no cover
-        try:
-            return socket.AddressFamily(num)
-        except ValueError:
-            return num
-
-
-def socktype_to_enum(num):
-    """Convert a numeric socket type value to an IntEnum member.
-    If it's not a known member, return the numeric value itself.
-    """
-    if enum is None:
-        return num
-    else:  # pragma: no cover
-        try:
-            return socket.SocketKind(num)
-        except ValueError:
-            return num
-
-
-def conn_to_ntuple(fd, fam, type_, laddr, raddr, status, status_map, pid=None):
-    """Convert a raw connection tuple to a proper ntuple."""
-    if fam in (socket.AF_INET, AF_INET6):
-        if laddr:
-            laddr = addr(*laddr)
-        if raddr:
-            raddr = addr(*raddr)
-    if type_ == socket.SOCK_STREAM and fam in (AF_INET, AF_INET6):
-        status = status_map.get(status, CONN_NONE)
-    else:
-        status = CONN_NONE  # ignore whatever C returned to us
-    fam = sockfam_to_enum(fam)
-    type_ = socktype_to_enum(type_)
-    if pid is None:
-        return pconn(fd, fam, type_, laddr, raddr, status)
-    else:
-        return sconn(fd, fam, type_, laddr, raddr, status, pid)
-
-
-def deprecated_method(replacement):
-    """A decorator which can be used to mark a method as deprecated
-    'replcement' is the method name which will be called instead.
-    """
-    def outer(fun):
-        msg = "%s() is deprecated and will be removed; use %s() instead" % (
-            fun.__name__, replacement)
-        if fun.__doc__ is None:
-            fun.__doc__ = msg
-
-        @functools.wraps(fun)
-        def inner(self, *args, **kwargs):
-            warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
-            return getattr(self, replacement)(*args, **kwargs)
-        return inner
-    return outer
-
-
-class _WrapNumbers:
-    """Watches numbers so that they don't overflow and wrap
-    (reset to zero).
-    """
-
-    def __init__(self):
-        self.lock = threading.Lock()
-        self.cache = {}
-        self.reminders = {}
-        self.reminder_keys = {}
-
-    def _add_dict(self, input_dict, name):
-        assert name not in self.cache
-        assert name not in self.reminders
-        assert name not in self.reminder_keys
-        self.cache[name] = input_dict
-        self.reminders[name] = defaultdict(int)
-        self.reminder_keys[name] = defaultdict(set)
-
-    def _remove_dead_reminders(self, input_dict, name):
-        """In case the number of keys changed between calls (e.g. a
-        disk disappears) this removes the entry from self.reminders.
-        """
-        old_dict = self.cache[name]
-        gone_keys = set(old_dict.keys()) - set(input_dict.keys())
-        for gone_key in gone_keys:
-            for remkey in self.reminder_keys[name][gone_key]:
-                del self.reminders[name][remkey]
-            del self.reminder_keys[name][gone_key]
-
-    def run(self, input_dict, name):
-        """Cache dict and sum numbers which overflow and wrap.
-        Return an updated copy of `input_dict`
-        """
-        if name not in self.cache:
-            # This was the first call.
-            self._add_dict(input_dict, name)
-            return input_dict
-
-        self._remove_dead_reminders(input_dict, name)
-
-        old_dict = self.cache[name]
-        new_dict = {}
-        for key in input_dict.keys():
-            input_tuple = input_dict[key]
-            try:
-                old_tuple = old_dict[key]
-            except KeyError:
-                # The input dict has a new key (e.g. a new disk or NIC)
-                # which didn't exist in the previous call.
-                new_dict[key] = input_tuple
-                continue
-
-            bits = []
-            for i in range(len(input_tuple)):
-                input_value = input_tuple[i]
-                old_value = old_tuple[i]
-                remkey = (key, i)
-                if input_value < old_value:
-                    # it wrapped!
-                    self.reminders[name][remkey] += old_value
-                    self.reminder_keys[name][key].add(remkey)
-                bits.append(input_value + self.reminders[name][remkey])
-
-            new_dict[key] = tuple(bits)
-
-        self.cache[name] = input_dict
-        return new_dict
-
-    def cache_clear(self, name=None):
-        """Clear the internal cache, optionally only for function 'name'."""
-        with self.lock:
-            if name is None:
-                self.cache.clear()
-                self.reminders.clear()
-                self.reminder_keys.clear()
-            else:
-                self.cache.pop(name, None)
-                self.reminders.pop(name, None)
-                self.reminder_keys.pop(name, None)
-
-    def cache_info(self):
-        """Return internal cache dicts as a tuple of 3 elements."""
-        with self.lock:
-            return (self.cache, self.reminders, self.reminder_keys)
-
-
-def wrap_numbers(input_dict, name):
-    """Given an `input_dict` and a function `name`, adjust the numbers
-    which "wrap" (restart from zero) across different calls by adding
-    "old value" to "new value" and return an updated dict.
-    """
-    with _wn.lock:
-        return _wn.run(input_dict, name)
-
-
-_wn = _WrapNumbers()
-wrap_numbers.cache_clear = _wn.cache_clear
-wrap_numbers.cache_info = _wn.cache_info
-
-
-def open_binary(fname, **kwargs):
-    return open(fname, "rb", **kwargs)
-
-
-def open_text(fname, **kwargs):
-    """On Python 3 opens a file in text mode by using fs encoding and
-    a proper en/decoding errors handler.
-    On Python 2 this is just an alias for open(name, 'rt').
-    """
-    if PY3:
-        # See:
-        # https://github.com/giampaolo/psutil/issues/675
-        # https://github.com/giampaolo/psutil/pull/733
-        kwargs.setdefault('encoding', ENCODING)
-        kwargs.setdefault('errors', ENCODING_ERRS)
-    return open(fname, "rt", **kwargs)
-
-
-def bytes2human(n, format="%(value).1f%(symbol)s"):
-    """Used by various scripts. See:
-    http://goo.gl/zeJZl
-
-    >>> bytes2human(10000)
-    '9.8K'
-    >>> bytes2human(100001221)
-    '95.4M'
-    """
-    symbols = ('B', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
-    prefix = {}
-    for i, s in enumerate(symbols[1:]):
-        prefix[s] = 1 << (i + 1) * 10
-    for symbol in reversed(symbols[1:]):
-        if n >= prefix[symbol]:
-            value = float(n) / prefix[symbol]
-            return format % locals()
-    return format % dict(symbol=symbols[0], value=n)
-
-
-def get_procfs_path():
-    """Return updated psutil.PROCFS_PATH constant."""
-    return sys.modules['psutil'].PROCFS_PATH
-
-
-if PY3:
-    def decode(s):
-        return s.decode(encoding=ENCODING, errors=ENCODING_ERRS)
-else:
-    def decode(s):
-        return s
-
-
-# =====================================================================
-# --- shell utils
-# =====================================================================
-
-
-@memoize
-def term_supports_colors(file=sys.stdout):
-    if os.name == 'nt':
-        return True
-    try:
-        import curses
-        assert file.isatty()
-        curses.setupterm()
-        assert curses.tigetnum("colors") > 0
-    except Exception:
-        return False
-    else:
-        return True
-
-
-def hilite(s, color="green", bold=False):
-    """Return an highlighted version of 'string'."""
-    if not term_supports_colors():
-        return s
-    attr = []
-    colors = dict(green='32', red='91', brown='33')
-    colors[None] = '29'
-    try:
-        color = colors[color]
-    except KeyError:
-        raise ValueError("invalid color %r; choose between %r" % (
-            list(colors.keys())))
-    attr.append(color)
-    if bold:
-        attr.append('1')
-    return '\x1b[%sm%s\x1b[0m' % (';'.join(attr), s)
-
-
-def print_color(s, color="green", bold=False, file=sys.stdout):
-    """Print a colorized version of string."""
-    if not term_supports_colors():
-        print(s, file=file)
-    elif POSIX:
-        print(hilite(s, color, bold), file=file)
-    else:
-        import ctypes
-
-        DEFAULT_COLOR = 7
-        GetStdHandle = ctypes.windll.Kernel32.GetStdHandle
-        SetConsoleTextAttribute = \
-            ctypes.windll.Kernel32.SetConsoleTextAttribute
-
-        colors = dict(green=2, red=4, brown=6)
-        colors[None] = DEFAULT_COLOR
-        try:
-            color = colors[color]
-        except KeyError:
-            raise ValueError("invalid color %r; choose between %r" % (
-                color, list(colors.keys())))
-        if bold and color <= 7:
-            color += 8
-
-        handle_id = -12 if file is sys.stderr else -11
-        GetStdHandle.restype = ctypes.c_ulong
-        handle = GetStdHandle(handle_id)
-        SetConsoleTextAttribute(handle, color)
-        try:
-            print(s, file=file)
-        finally:
-            SetConsoleTextAttribute(handle, DEFAULT_COLOR)
-
-
-if bool(os.getenv('PSUTIL_DEBUG', 0)):
-    import inspect
-
-    def debug(msg):
-        """If PSUTIL_DEBUG env var is set, print a debug message to stderr."""
-        fname, lineno, func_name, lines, index = inspect.getframeinfo(
-            inspect.currentframe().f_back)
-        print("psutil-debug [%s:%s]> %s" % (fname, lineno, msg),
-              file=sys.stderr)
-else:
-    def debug(msg):
-        pass
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_compat.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_compat.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_compat.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_compat.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Module which provides compatibility with older Python versions."""
-
-import collections
-import errno
-import functools
-import os
-import sys
-
-__all__ = ["PY3", "long", "xrange", "unicode", "basestring", "u", "b",
-           "lru_cache", "which", "get_terminal_size",
-           "FileNotFoundError", "PermissionError", "ProcessLookupError",
-           "InterruptedError", "ChildProcessError", "FileExistsError"]
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    long = int
-    xrange = range
-    unicode = str
-    basestring = str
-
-    def u(s):
-        return s
-
-    def b(s):
-        return s.encode("latin-1")
-else:
-    long = long
-    xrange = xrange
-    unicode = unicode
-    basestring = basestring
-
-    def u(s):
-        return unicode(s, "unicode_escape")
-
-    def b(s):
-        return s
-
-
-# --- exceptions
-
-
-if PY3:
-    FileNotFoundError = FileNotFoundError  # NOQA
-    PermissionError = PermissionError  # NOQA
-    ProcessLookupError = ProcessLookupError  # NOQA
-    InterruptedError = InterruptedError  # NOQA
-    ChildProcessError = ChildProcessError  # NOQA
-    FileExistsError = FileExistsError  # NOQA
-else:
-    # https://github.com/PythonCharmers/python-future/blob/exceptions/
-    #     src/future/types/exceptions/pep3151.py
-    import platform
-
-    _singleton = object()
-
-    def instance_checking_exception(base_exception=Exception):
-        def wrapped(instance_checker):
-            class TemporaryClass(base_exception):
-
-                def __init__(self, *args, **kwargs):
-                    if len(args) == 1 and isinstance(args[0], TemporaryClass):
-                        unwrap_me = args[0]
-                        for attr in dir(unwrap_me):
-                            if not attr.startswith('__'):
-                                setattr(self, attr, getattr(unwrap_me, attr))
-                    else:
-                        super(TemporaryClass, self).__init__(*args, **kwargs)
-
-                class __metaclass__(type):
-                    def __instancecheck__(cls, inst):
-                        return instance_checker(inst)
-
-                    def __subclasscheck__(cls, classinfo):
-                        value = sys.exc_info()[1]
-                        return isinstance(value, cls)
-
-            TemporaryClass.__name__ = instance_checker.__name__
-            TemporaryClass.__doc__ = instance_checker.__doc__
-            return TemporaryClass
-
-        return wrapped
-
-    @instance_checking_exception(EnvironmentError)
-    def FileNotFoundError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ENOENT
-
-    @instance_checking_exception(EnvironmentError)
-    def ProcessLookupError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ESRCH
-
-    @instance_checking_exception(EnvironmentError)
-    def PermissionError(inst):
-        return getattr(inst, 'errno', _singleton) in (
-            errno.EACCES, errno.EPERM)
-
-    @instance_checking_exception(EnvironmentError)
-    def InterruptedError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.EINTR
-
-    @instance_checking_exception(EnvironmentError)
-    def ChildProcessError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.ECHILD
-
-    @instance_checking_exception(EnvironmentError)
-    def FileExistsError(inst):
-        return getattr(inst, 'errno', _singleton) == errno.EEXIST
-
-    if platform.python_implementation() != "CPython":
-        try:
-            raise OSError(errno.EEXIST, "perm")
-        except FileExistsError:
-            pass
-        except OSError:
-            raise RuntimeError(
-                "broken / incompatible Python implementation, see: "
-                "https://github.com/giampaolo/psutil/issues/1659")
-
-
-# --- stdlib additions
-
-
-# py 3.2 functools.lru_cache
-# Taken from: http://code.activestate.com/recipes/578078
-# Credit: Raymond Hettinger
-try:
-    from functools import lru_cache
-except ImportError:
-    try:
-        from threading import RLock
-    except ImportError:
-        from dummy_threading import RLock
-
-    _CacheInfo = collections.namedtuple(
-        "CacheInfo", ["hits", "misses", "maxsize", "currsize"])
-
-    class _HashedSeq(list):
-        __slots__ = 'hashvalue'
-
-        def __init__(self, tup, hash=hash):
-            self[:] = tup
-            self.hashvalue = hash(tup)
-
-        def __hash__(self):
-            return self.hashvalue
-
-    def _make_key(args, kwds, typed,
-                  kwd_mark=(object(), ),
-                  fasttypes=set((int, str, frozenset, type(None))),
-                  sorted=sorted, tuple=tuple, type=type, len=len):
-        key = args
-        if kwds:
-            sorted_items = sorted(kwds.items())
-            key += kwd_mark
-            for item in sorted_items:
-                key += item
-        if typed:
-            key += tuple(type(v) for v in args)
-            if kwds:
-                key += tuple(type(v) for k, v in sorted_items)
-        elif len(key) == 1 and type(key[0]) in fasttypes:
-            return key[0]
-        return _HashedSeq(key)
-
-    def lru_cache(maxsize=100, typed=False):
-        """Least-recently-used cache decorator, see:
-        http://docs.python.org/3/library/functools.html#functools.lru_cache
-        """
-        def decorating_function(user_function):
-            cache = dict()
-            stats = [0, 0]
-            HITS, MISSES = 0, 1
-            make_key = _make_key
-            cache_get = cache.get
-            _len = len
-            lock = RLock()
-            root = []
-            root[:] = [root, root, None, None]
-            nonlocal_root = [root]
-            PREV, NEXT, KEY, RESULT = 0, 1, 2, 3
-            if maxsize == 0:
-                def wrapper(*args, **kwds):
-                    result = user_function(*args, **kwds)
-                    stats[MISSES] += 1
-                    return result
-            elif maxsize is None:
-                def wrapper(*args, **kwds):
-                    key = make_key(args, kwds, typed)
-                    result = cache_get(key, root)
-                    if result is not root:
-                        stats[HITS] += 1
-                        return result
-                    result = user_function(*args, **kwds)
-                    cache[key] = result
-                    stats[MISSES] += 1
-                    return result
-            else:
-                def wrapper(*args, **kwds):
-                    if kwds or typed:
-                        key = make_key(args, kwds, typed)
-                    else:
-                        key = args
-                    lock.acquire()
-                    try:
-                        link = cache_get(key)
-                        if link is not None:
-                            root, = nonlocal_root
-                            link_prev, link_next, key, result = link
-                            link_prev[NEXT] = link_next
-                            link_next[PREV] = link_prev
-                            last = root[PREV]
-                            last[NEXT] = root[PREV] = link
-                            link[PREV] = last
-                            link[NEXT] = root
-                            stats[HITS] += 1
-                            return result
-                    finally:
-                        lock.release()
-                    result = user_function(*args, **kwds)
-                    lock.acquire()
-                    try:
-                        root, = nonlocal_root
-                        if key in cache:
-                            pass
-                        elif _len(cache) >= maxsize:
-                            oldroot = root
-                            oldroot[KEY] = key
-                            oldroot[RESULT] = result
-                            root = nonlocal_root[0] = oldroot[NEXT]
-                            oldkey = root[KEY]
-                            root[KEY] = root[RESULT] = None
-                            del cache[oldkey]
-                            cache[key] = oldroot
-                        else:
-                            last = root[PREV]
-                            link = [last, root, key, result]
-                            last[NEXT] = root[PREV] = cache[key] = link
-                        stats[MISSES] += 1
-                    finally:
-                        lock.release()
-                    return result
-
-            def cache_info():
-                """Report cache statistics"""
-                lock.acquire()
-                try:
-                    return _CacheInfo(stats[HITS], stats[MISSES], maxsize,
-                                      len(cache))
-                finally:
-                    lock.release()
-
-            def cache_clear():
-                """Clear the cache and cache statistics"""
-                lock.acquire()
-                try:
-                    cache.clear()
-                    root = nonlocal_root[0]
-                    root[:] = [root, root, None, None]
-                    stats[:] = [0, 0]
-                finally:
-                    lock.release()
-
-            wrapper.__wrapped__ = user_function
-            wrapper.cache_info = cache_info
-            wrapper.cache_clear = cache_clear
-            return functools.update_wrapper(wrapper, user_function)
-
-        return decorating_function
-
-
-# python 3.3
-try:
-    from shutil import which
-except ImportError:
-    def which(cmd, mode=os.F_OK | os.X_OK, path=None):
-        """Given a command, mode, and a PATH string, return the path which
-        conforms to the given mode on the PATH, or None if there is no such
-        file.
-
-        `mode` defaults to os.F_OK | os.X_OK. `path` defaults to the result
-        of os.environ.get("PATH"), or can be overridden with a custom search
-        path.
-        """
-        def _access_check(fn, mode):
-            return (os.path.exists(fn) and os.access(fn, mode) and
-                    not os.path.isdir(fn))
-
-        if os.path.dirname(cmd):
-            if _access_check(cmd, mode):
-                return cmd
-            return None
-
-        if path is None:
-            path = os.environ.get("PATH", os.defpath)
-        if not path:
-            return None
-        path = path.split(os.pathsep)
-
-        if sys.platform == "win32":
-            if os.curdir not in path:
-                path.insert(0, os.curdir)
-
-            pathext = os.environ.get("PATHEXT", "").split(os.pathsep)
-            if any(cmd.lower().endswith(ext.lower()) for ext in pathext):
-                files = [cmd]
-            else:
-                files = [cmd + ext for ext in pathext]
-        else:
-            files = [cmd]
-
-        seen = set()
-        for dir in path:
-            normdir = os.path.normcase(dir)
-            if normdir not in seen:
-                seen.add(normdir)
-                for thefile in files:
-                    name = os.path.join(dir, thefile)
-                    if _access_check(name, mode):
-                        return name
-        return None
-
-
-# python 3.3
-try:
-    from shutil import get_terminal_size
-except ImportError:
-    def get_terminal_size(fallback=(80, 24)):
-        try:
-            import fcntl
-            import termios
-            import struct
-        except ImportError:
-            return fallback
-        else:
-            try:
-                # This should work on Linux.
-                res = struct.unpack(
-                    'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, '1234'))
-                return (res[1], res[0])
-            except Exception:
-                return fallback
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/__init__.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/__init__.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/__init__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2409 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""psutil is a cross-platform library for retrieving information on
-running processes and system utilization (CPU, memory, disks, network,
-sensors) in Python. Supported platforms:
-
- - Linux
- - Windows
- - macOS
- - FreeBSD
- - OpenBSD
- - NetBSD
- - Sun Solaris
- - AIX
-
-Works with Python versions from 2.6 to 3.4+.
-"""
-
-from __future__ import division
-
-import collections
-import contextlib
-import datetime
-import functools
-import os
-import signal
-import subprocess
-import sys
-import threading
-import time
-try:
-    import pwd
-except ImportError:
-    pwd = None
-
-from . import _common
-from ._common import AccessDenied
-from ._common import deprecated_method
-from ._common import Error
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import TimeoutExpired
-from ._common import wrap_numbers as _wrap_numbers
-from ._common import ZombieProcess
-from ._compat import long
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3 as _PY3
-
-from ._common import STATUS_DEAD
-from ._common import STATUS_DISK_SLEEP
-from ._common import STATUS_IDLE
-from ._common import STATUS_LOCKED
-from ._common import STATUS_PARKED
-from ._common import STATUS_RUNNING
-from ._common import STATUS_SLEEPING
-from ._common import STATUS_STOPPED
-from ._common import STATUS_TRACING_STOP
-from ._common import STATUS_WAITING
-from ._common import STATUS_WAKING
-from ._common import STATUS_ZOMBIE
-
-from ._common import CONN_CLOSE
-from ._common import CONN_CLOSE_WAIT
-from ._common import CONN_CLOSING
-from ._common import CONN_ESTABLISHED
-from ._common import CONN_FIN_WAIT1
-from ._common import CONN_FIN_WAIT2
-from ._common import CONN_LAST_ACK
-from ._common import CONN_LISTEN
-from ._common import CONN_NONE
-from ._common import CONN_SYN_RECV
-from ._common import CONN_SYN_SENT
-from ._common import CONN_TIME_WAIT
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-
-from ._common import AIX
-from ._common import BSD
-from ._common import FREEBSD  # NOQA
-from ._common import LINUX
-from ._common import MACOS
-from ._common import NETBSD  # NOQA
-from ._common import OPENBSD  # NOQA
-from ._common import OSX  # deprecated alias
-from ._common import POSIX  # NOQA
-from ._common import SUNOS
-from ._common import WINDOWS
-
-if LINUX:
-    # This is public API and it will be retrieved from _pslinux.py
-    # via sys.modules.
-    PROCFS_PATH = "/proc"
-
-    from . import _pslinux as _psplatform
-
-    from ._pslinux import IOPRIO_CLASS_BE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_IDLE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_NONE  # NOQA
-    from ._pslinux import IOPRIO_CLASS_RT  # NOQA
-    # Linux >= 2.6.36
-    if _psplatform.HAS_PRLIMIT:
-        from ._psutil_linux import RLIM_INFINITY  # NOQA
-        from ._psutil_linux import RLIMIT_AS  # NOQA
-        from ._psutil_linux import RLIMIT_CORE  # NOQA
-        from ._psutil_linux import RLIMIT_CPU  # NOQA
-        from ._psutil_linux import RLIMIT_DATA  # NOQA
-        from ._psutil_linux import RLIMIT_FSIZE  # NOQA
-        from ._psutil_linux import RLIMIT_LOCKS  # NOQA
-        from ._psutil_linux import RLIMIT_MEMLOCK  # NOQA
-        from ._psutil_linux import RLIMIT_NOFILE  # NOQA
-        from ._psutil_linux import RLIMIT_NPROC  # NOQA
-        from ._psutil_linux import RLIMIT_RSS  # NOQA
-        from ._psutil_linux import RLIMIT_STACK  # NOQA
-        # Kinda ugly but considerably faster than using hasattr() and
-        # setattr() against the module object (we are at import time:
-        # speed matters).
-        from . import _psutil_linux
-        try:
-            RLIMIT_MSGQUEUE = _psutil_linux.RLIMIT_MSGQUEUE
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_NICE = _psutil_linux.RLIMIT_NICE
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_RTPRIO = _psutil_linux.RLIMIT_RTPRIO
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_RTTIME = _psutil_linux.RLIMIT_RTTIME
-        except AttributeError:
-            pass
-        try:
-            RLIMIT_SIGPENDING = _psutil_linux.RLIMIT_SIGPENDING
-        except AttributeError:
-            pass
-
-elif WINDOWS:
-    from . import _pswindows as _psplatform
-    from ._psutil_windows import ABOVE_NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import BELOW_NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import HIGH_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import IDLE_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import NORMAL_PRIORITY_CLASS  # NOQA
-    from ._psutil_windows import REALTIME_PRIORITY_CLASS  # NOQA
-    from ._pswindows import CONN_DELETE_TCB  # NOQA
-    from ._pswindows import IOPRIO_VERYLOW  # NOQA
-    from ._pswindows import IOPRIO_LOW  # NOQA
-    from ._pswindows import IOPRIO_NORMAL  # NOQA
-    from ._pswindows import IOPRIO_HIGH  # NOQA
-
-elif MACOS:
-    from . import _psosx as _psplatform
-
-elif BSD:
-    from . import _psbsd as _psplatform
-
-elif SUNOS:
-    from . import _pssunos as _psplatform
-    from ._pssunos import CONN_BOUND  # NOQA
-    from ._pssunos import CONN_IDLE  # NOQA
-
-    # This is public writable API which is read from _pslinux.py and
-    # _pssunos.py via sys.modules.
-    PROCFS_PATH = "/proc"
-
-elif AIX:
-    from . import _psaix as _psplatform
-
-    # This is public API and it will be retrieved from _pslinux.py
-    # via sys.modules.
-    PROCFS_PATH = "/proc"
-
-else:  # pragma: no cover
-    raise NotImplementedError('platform %s is not supported' % sys.platform)
-
-
-__all__ = [
-    # exceptions
-    "Error", "NoSuchProcess", "ZombieProcess", "AccessDenied",
-    "TimeoutExpired",
-
-    # constants
-    "version_info", "__version__",
-
-    "STATUS_RUNNING", "STATUS_IDLE", "STATUS_SLEEPING", "STATUS_DISK_SLEEP",
-    "STATUS_STOPPED", "STATUS_TRACING_STOP", "STATUS_ZOMBIE", "STATUS_DEAD",
-    "STATUS_WAKING", "STATUS_LOCKED", "STATUS_WAITING", "STATUS_LOCKED",
-    "STATUS_PARKED",
-
-    "CONN_ESTABLISHED", "CONN_SYN_SENT", "CONN_SYN_RECV", "CONN_FIN_WAIT1",
-    "CONN_FIN_WAIT2", "CONN_TIME_WAIT", "CONN_CLOSE", "CONN_CLOSE_WAIT",
-    "CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", "CONN_NONE",
-
-    "AF_LINK",
-
-    "NIC_DUPLEX_FULL", "NIC_DUPLEX_HALF", "NIC_DUPLEX_UNKNOWN",
-
-    "POWER_TIME_UNKNOWN", "POWER_TIME_UNLIMITED",
-
-    "BSD", "FREEBSD", "LINUX", "NETBSD", "OPENBSD", "MACOS", "OSX", "POSIX",
-    "SUNOS", "WINDOWS", "AIX",
-
-    # classes
-    "Process", "Popen",
-
-    # functions
-    "pid_exists", "pids", "process_iter", "wait_procs",             # proc
-    "virtual_memory", "swap_memory",                                # memory
-    "cpu_times", "cpu_percent", "cpu_times_percent", "cpu_count",   # cpu
-    "cpu_stats",  # "cpu_freq", "getloadavg"
-    "net_io_counters", "net_connections", "net_if_addrs",           # network
-    "net_if_stats",
-    "disk_io_counters", "disk_partitions", "disk_usage",            # disk
-    # "sensors_temperatures", "sensors_battery", "sensors_fans"     # sensors
-    "users", "boot_time",                                           # others
-]
-
-
-__all__.extend(_psplatform.__extra__all__)
-__author__ = "Giampaolo Rodola'"
-__version__ = "5.7.0"
-version_info = tuple([int(num) for num in __version__.split('.')])
-
-_timer = getattr(time, 'monotonic', time.time)
-AF_LINK = _psplatform.AF_LINK
-POWER_TIME_UNLIMITED = _common.POWER_TIME_UNLIMITED
-POWER_TIME_UNKNOWN = _common.POWER_TIME_UNKNOWN
-_TOTAL_PHYMEM = None
-_LOWEST_PID = None
-
-# Sanity check in case the user messed up with psutil installation
-# or did something weird with sys.path. In this case we might end
-# up importing a python module using a C extension module which
-# was compiled for a different version of psutil.
-# We want to prevent that by failing sooner rather than later.
-# See: https://github.com/giampaolo/psutil/issues/564
-if (int(__version__.replace('.', '')) !=
-        getattr(_psplatform.cext, 'version', None)):
-    msg = "version conflict: %r C extension module was built for another " \
-          "version of psutil" % getattr(_psplatform.cext, "__file__")
-    if hasattr(_psplatform.cext, 'version'):
-        msg += " (%s instead of %s)" % (
-            '.'.join([x for x in str(_psplatform.cext.version)]), __version__)
-    else:
-        msg += " (different than %s)" % __version__
-    msg += "; you may try to 'pip uninstall psutil', manually remove %s" % (
-        getattr(_psplatform.cext, "__file__",
-                "the existing psutil install directory"))
-    msg += " or clean the virtual env somehow, then reinstall"
-    raise ImportError(msg)
-
-
-# =====================================================================
-# --- Utils
-# =====================================================================
-
-
-if hasattr(_psplatform, 'ppid_map'):
-    # Faster version (Windows and Linux).
-    _ppid_map = _psplatform.ppid_map
-else:
-    def _ppid_map():
-        """Return a {pid: ppid, ...} dict for all running processes in
-        one shot. Used to speed up Process.children().
-        """
-        ret = {}
-        for pid in pids():
-            try:
-                ret[pid] = _psplatform.Process(pid).ppid()
-            except (NoSuchProcess, ZombieProcess):
-                pass
-        return ret
-
-
-def _assert_pid_not_reused(fun):
-    """Decorator which raises NoSuchProcess in case a process is no
-    longer running or its PID has been reused.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        if not self.is_running():
-            raise NoSuchProcess(self.pid, self._name)
-        return fun(self, *args, **kwargs)
-    return wrapper
-
-
-def _pprint_secs(secs):
-    """Format seconds in a human readable form."""
-    now = time.time()
-    secs_ago = int(now - secs)
-    if secs_ago < 60 * 60 * 24:
-        fmt = "%H:%M:%S"
-    else:
-        fmt = "%Y-%m-%d %H:%M:%S"
-    return datetime.datetime.fromtimestamp(secs).strftime(fmt)
-
-
-# =====================================================================
-# --- Process class
-# =====================================================================
-
-
-class Process(object):
-    """Represents an OS process with the given PID.
-    If PID is omitted current process PID (os.getpid()) is used.
-    Raise NoSuchProcess if PID does not exist.
-
-    Note that most of the methods of this class do not make sure
-    the PID of the process being queried has been reused over time.
-    That means you might end up retrieving an information referring
-    to another process in case the original one this instance
-    refers to is gone in the meantime.
-
-    The only exceptions for which process identity is pre-emptively
-    checked and guaranteed are:
-
-     - parent()
-     - children()
-     - nice() (set)
-     - ionice() (set)
-     - rlimit() (set)
-     - cpu_affinity (set)
-     - suspend()
-     - resume()
-     - send_signal()
-     - terminate()
-     - kill()
-
-    To prevent this problem for all other methods you can:
-     - use is_running() before querying the process
-     - if you're continuously iterating over a set of Process
-       instances use process_iter() which pre-emptively checks
-     process identity for every yielded instance
-    """
-
-    def __init__(self, pid=None):
-        self._init(pid)
-
-    def _init(self, pid, _ignore_nsp=False):
-        if pid is None:
-            pid = os.getpid()
-        else:
-            if not _PY3 and not isinstance(pid, (int, long)):
-                raise TypeError('pid must be an integer (got %r)' % pid)
-            if pid < 0:
-                raise ValueError('pid must be a positive integer (got %s)'
-                                 % pid)
-        self._pid = pid
-        self._name = None
-        self._exe = None
-        self._create_time = None
-        self._gone = False
-        self._hash = None
-        self._lock = threading.RLock()
-        # used for caching on Windows only (on POSIX ppid may change)
-        self._ppid = None
-        # platform-specific modules define an _psplatform.Process
-        # implementation class
-        self._proc = _psplatform.Process(pid)
-        self._last_sys_cpu_times = None
-        self._last_proc_cpu_times = None
-        # cache creation time for later use in is_running() method
-        try:
-            self.create_time()
-        except AccessDenied:
-            # We should never get here as AFAIK we're able to get
-            # process creation time on all platforms even as a
-            # limited user.
-            pass
-        except ZombieProcess:
-            # Zombies can still be queried by this class (although
-            # not always) and pids() return them so just go on.
-            pass
-        except NoSuchProcess:
-            if not _ignore_nsp:
-                msg = 'no process found with pid %s' % pid
-                raise NoSuchProcess(pid, None, msg)
-            else:
-                self._gone = True
-        # This pair is supposed to indentify a Process instance
-        # univocally over time (the PID alone is not enough as
-        # it might refer to a process whose PID has been reused).
-        # This will be used later in __eq__() and is_running().
-        self._ident = (self.pid, self._create_time)
-
-    def __str__(self):
-        try:
-            info = collections.OrderedDict()
-        except AttributeError:
-            info = {}  # Python 2.6
-        info["pid"] = self.pid
-        try:
-            info["name"] = self.name()
-            if self._create_time:
-                info['started'] = _pprint_secs(self._create_time)
-        except ZombieProcess:
-            info["status"] = "zombie"
-        except NoSuchProcess:
-            info["status"] = "terminated"
-        except AccessDenied:
-            pass
-        return "%s.%s(%s)" % (
-            self.__class__.__module__,
-            self.__class__.__name__,
-            ", ".join(["%s=%r" % (k, v) for k, v in info.items()]))
-
-    __repr__ = __str__
-
-    def __eq__(self, other):
-        # Test for equality with another Process object based
-        # on PID and creation time.
-        if not isinstance(other, Process):
-            return NotImplemented
-        return self._ident == other._ident
-
-    def __ne__(self, other):
-        return not self == other
-
-    def __hash__(self):
-        if self._hash is None:
-            self._hash = hash(self._ident)
-        return self._hash
-
-    @property
-    def pid(self):
-        """The process PID."""
-        return self._pid
-
-    # --- utility methods
-
-    @contextlib.contextmanager
-    def oneshot(self):
-        """Utility context manager which considerably speeds up the
-        retrieval of multiple process information at the same time.
-
-        Internally different process info (e.g. name, ppid, uids,
-        gids, ...) may be fetched by using the same routine, but
-        only one information is returned and the others are discarded.
-        When using this context manager the internal routine is
-        executed once (in the example below on name()) and the
-        other info are cached.
-
-        The cache is cleared when exiting the context manager block.
-        The advice is to use this every time you retrieve more than
-        one information about the process. If you're lucky, you'll
-        get a hell of a speedup.
-
-        >>> import psutil
-        >>> p = psutil.Process()
-        >>> with p.oneshot():
-        ...     p.name()  # collect multiple info
-        ...     p.cpu_times()  # return cached value
-        ...     p.cpu_percent()  # return cached value
-        ...     p.create_time()  # return cached value
-        ...
-        >>>
-        """
-        with self._lock:
-            if hasattr(self, "_cache"):
-                # NOOP: this covers the use case where the user enters the
-                # context twice:
-                #
-                # >>> with p.oneshot():
-                # ...    with p.oneshot():
-                # ...
-                #
-                # Also, since as_dict() internally uses oneshot()
-                # I expect that the code below will be a pretty common
-                # "mistake" that the user will make, so let's guard
-                # against that:
-                #
-                # >>> with p.oneshot():
-                # ...    p.as_dict()
-                # ...
-                yield
-            else:
-                try:
-                    # cached in case cpu_percent() is used
-                    self.cpu_times.cache_activate(self)
-                    # cached in case memory_percent() is used
-                    self.memory_info.cache_activate(self)
-                    # cached in case parent() is used
-                    self.ppid.cache_activate(self)
-                    # cached in case username() is used
-                    if POSIX:
-                        self.uids.cache_activate(self)
-                    # specific implementation cache
-                    self._proc.oneshot_enter()
-                    yield
-                finally:
-                    self.cpu_times.cache_deactivate(self)
-                    self.memory_info.cache_deactivate(self)
-                    self.ppid.cache_deactivate(self)
-                    if POSIX:
-                        self.uids.cache_deactivate(self)
-                    self._proc.oneshot_exit()
-
-    def as_dict(self, attrs=None, ad_value=None):
-        """Utility method returning process information as a
-        hashable dictionary.
-        If *attrs* is specified it must be a list of strings
-        reflecting available Process class' attribute names
-        (e.g. ['cpu_times', 'name']) else all public (read
-        only) attributes are assumed.
-        *ad_value* is the value which gets assigned in case
-        AccessDenied or ZombieProcess exception is raised when
-        retrieving that particular process information.
-        """
-        valid_names = _as_dict_attrnames
-        if attrs is not None:
-            if not isinstance(attrs, (list, tuple, set, frozenset)):
-                raise TypeError("invalid attrs type %s" % type(attrs))
-            attrs = set(attrs)
-            invalid_names = attrs - valid_names
-            if invalid_names:
-                raise ValueError("invalid attr name%s %s" % (
-                    "s" if len(invalid_names) > 1 else "",
-                    ", ".join(map(repr, invalid_names))))
-
-        retdict = dict()
-        ls = attrs or valid_names
-        with self.oneshot():
-            for name in ls:
-                try:
-                    if name == 'pid':
-                        ret = self.pid
-                    else:
-                        meth = getattr(self, name)
-                        ret = meth()
-                except (AccessDenied, ZombieProcess):
-                    ret = ad_value
-                except NotImplementedError:
-                    # in case of not implemented functionality (may happen
-                    # on old or exotic systems) we want to crash only if
-                    # the user explicitly asked for that particular attr
-                    if attrs:
-                        raise
-                    continue
-                retdict[name] = ret
-        return retdict
-
-    def parent(self):
-        """Return the parent process as a Process object pre-emptively
-        checking whether PID has been reused.
-        If no parent is known return None.
-        """
-        lowest_pid = _LOWEST_PID if _LOWEST_PID is not None else pids()[0]
-        if self.pid == lowest_pid:
-            return None
-        ppid = self.ppid()
-        if ppid is not None:
-            ctime = self.create_time()
-            try:
-                parent = Process(ppid)
-                if parent.create_time() <= ctime:
-                    return parent
-                # ...else ppid has been reused by another process
-            except NoSuchProcess:
-                pass
-
-    def parents(self):
-        """Return the parents of this process as a list of Process
-        instances. If no parents are known return an empty list.
-        """
-        parents = []
-        proc = self.parent()
-        while proc is not None:
-            parents.append(proc)
-            proc = proc.parent()
-        return parents
-
-    def is_running(self):
-        """Return whether this process is running.
-        It also checks if PID has been reused by another process in
-        which case return False.
-        """
-        if self._gone:
-            return False
-        try:
-            # Checking if PID is alive is not enough as the PID might
-            # have been reused by another process: we also want to
-            # verify process identity.
-            # Process identity / uniqueness over time is guaranteed by
-            # (PID + creation time) and that is verified in __eq__.
-            return self == Process(self.pid)
-        except ZombieProcess:
-            # We should never get here as it's already handled in
-            # Process.__init__; here just for extra safety.
-            return True
-        except NoSuchProcess:
-            self._gone = True
-            return False
-
-    # --- actual API
-
-    @memoize_when_activated
-    def ppid(self):
-        """The process parent PID.
-        On Windows the return value is cached after first call.
-        """
-        # On POSIX we don't want to cache the ppid as it may unexpectedly
-        # change to 1 (init) in case this process turns into a zombie:
-        # https://github.com/giampaolo/psutil/issues/321
-        # http://stackoverflow.com/questions/356722/
-
-        # XXX should we check creation time here rather than in
-        # Process.parent()?
-        if POSIX:
-            return self._proc.ppid()
-        else:  # pragma: no cover
-            self._ppid = self._ppid or self._proc.ppid()
-            return self._ppid
-
-    def name(self):
-        """The process name. The return value is cached after first call."""
-        # Process name is only cached on Windows as on POSIX it may
-        # change, see:
-        # https://github.com/giampaolo/psutil/issues/692
-        if WINDOWS and self._name is not None:
-            return self._name
-        name = self._proc.name()
-        if POSIX and len(name) >= 15:
-            # On UNIX the name gets truncated to the first 15 characters.
-            # If it matches the first part of the cmdline we return that
-            # one instead because it's usually more explicative.
-            # Examples are "gnome-keyring-d" vs. "gnome-keyring-daemon".
-            try:
-                cmdline = self.cmdline()
-            except AccessDenied:
-                pass
-            else:
-                if cmdline:
-                    extended_name = os.path.basename(cmdline[0])
-                    if extended_name.startswith(name):
-                        name = extended_name
-        self._name = name
-        self._proc._name = name
-        return name
-
-    def exe(self):
-        """The process executable as an absolute path.
-        May also be an empty string.
-        The return value is cached after first call.
-        """
-        def guess_it(fallback):
-            # try to guess exe from cmdline[0] in absence of a native
-            # exe representation
-            cmdline = self.cmdline()
-            if cmdline and hasattr(os, 'access') and hasattr(os, 'X_OK'):
-                exe = cmdline[0]  # the possible exe
-                # Attempt to guess only in case of an absolute path.
-                # It is not safe otherwise as the process might have
-                # changed cwd.
-                if (os.path.isabs(exe) and
-                        os.path.isfile(exe) and
-                        os.access(exe, os.X_OK)):
-                    return exe
-            if isinstance(fallback, AccessDenied):
-                raise fallback
-            return fallback
-
-        if self._exe is None:
-            try:
-                exe = self._proc.exe()
-            except AccessDenied as err:
-                return guess_it(fallback=err)
-            else:
-                if not exe:
-                    # underlying implementation can legitimately return an
-                    # empty string; if that's the case we don't want to
-                    # raise AD while guessing from the cmdline
-                    try:
-                        exe = guess_it(fallback=exe)
-                    except AccessDenied:
-                        pass
-                self._exe = exe
-        return self._exe
-
-    def cmdline(self):
-        """The command line this process has been called with."""
-        return self._proc.cmdline()
-
-    def status(self):
-        """The process current status as a STATUS_* constant."""
-        try:
-            return self._proc.status()
-        except ZombieProcess:
-            return STATUS_ZOMBIE
-
-    def username(self):
-        """The name of the user that owns the process.
-        On UNIX this is calculated by using *real* process uid.
-        """
-        if POSIX:
-            if pwd is None:
-                # might happen if python was installed from sources
-                raise ImportError(
-                    "requires pwd module shipped with standard python")
-            real_uid = self.uids().real
-            try:
-                return pwd.getpwuid(real_uid).pw_name
-            except KeyError:
-                # the uid can't be resolved by the system
-                return str(real_uid)
-        else:
-            return self._proc.username()
-
-    def create_time(self):
-        """The process creation time as a floating point number
-        expressed in seconds since the epoch, in UTC.
-        The return value is cached after first call.
-        """
-        if self._create_time is None:
-            self._create_time = self._proc.create_time()
-        return self._create_time
-
-    def cwd(self):
-        """Process current working directory as an absolute path."""
-        return self._proc.cwd()
-
-    def nice(self, value=None):
-        """Get or set process niceness (priority)."""
-        if value is None:
-            return self._proc.nice_get()
-        else:
-            if not self.is_running():
-                raise NoSuchProcess(self.pid, self._name)
-            self._proc.nice_set(value)
-
-    if POSIX:
-
-        @memoize_when_activated
-        def uids(self):
-            """Return process UIDs as a (real, effective, saved)
-            namedtuple.
-            """
-            return self._proc.uids()
-
-        def gids(self):
-            """Return process GIDs as a (real, effective, saved)
-            namedtuple.
-            """
-            return self._proc.gids()
-
-        def terminal(self):
-            """The terminal associated with this process, if any,
-            else None.
-            """
-            return self._proc.terminal()
-
-        def num_fds(self):
-            """Return the number of file descriptors opened by this
-            process (POSIX only).
-            """
-            return self._proc.num_fds()
-
-    # Linux, BSD, AIX and Windows only
-    if hasattr(_psplatform.Process, "io_counters"):
-
-        def io_counters(self):
-            """Return process I/O statistics as a
-            (read_count, write_count, read_bytes, write_bytes)
-            namedtuple.
-            Those are the number of read/write calls performed and the
-            amount of bytes read and written by the process.
-            """
-            return self._proc.io_counters()
-
-    # Linux and Windows
-    if hasattr(_psplatform.Process, "ionice_get"):
-
-        def ionice(self, ioclass=None, value=None):
-            """Get or set process I/O niceness (priority).
-
-            On Linux *ioclass* is one of the IOPRIO_CLASS_* constants.
-            *value* is a number which goes from 0 to 7. The higher the
-            value, the lower the I/O priority of the process.
-
-            On Windows only *ioclass* is used and it can be set to 2
-            (normal), 1 (low) or 0 (very low).
-
-            Available on Linux and Windows > Vista only.
-            """
-            if ioclass is None:
-                if value is not None:
-                    raise ValueError("'ioclass' argument must be specified")
-                return self._proc.ionice_get()
-            else:
-                return self._proc.ionice_set(ioclass, value)
-
-    # Linux only
-    if hasattr(_psplatform.Process, "rlimit"):
-
-        def rlimit(self, resource, limits=None):
-            """Get or set process resource limits as a (soft, hard)
-            tuple.
-
-            *resource* is one of the RLIMIT_* constants.
-            *limits* is supposed to be a (soft, hard)  tuple.
-
-            See "man prlimit" for further info.
-            Available on Linux only.
-            """
-            if limits is None:
-                return self._proc.rlimit(resource)
-            else:
-                return self._proc.rlimit(resource, limits)
-
-    # Windows, Linux and FreeBSD only
-    if hasattr(_psplatform.Process, "cpu_affinity_get"):
-
-        def cpu_affinity(self, cpus=None):
-            """Get or set process CPU affinity.
-            If specified, *cpus* must be a list of CPUs for which you
-            want to set the affinity (e.g. [0, 1]).
-            If an empty list is passed, all egible CPUs are assumed
-            (and set).
-            (Windows, Linux and BSD only).
-            """
-            if cpus is None:
-                return list(set(self._proc.cpu_affinity_get()))
-            else:
-                if not cpus:
-                    if hasattr(self._proc, "_get_eligible_cpus"):
-                        cpus = self._proc._get_eligible_cpus()
-                    else:
-                        cpus = tuple(range(len(cpu_times(percpu=True))))
-                self._proc.cpu_affinity_set(list(set(cpus)))
-
-    # Linux, FreeBSD, SunOS
-    if hasattr(_psplatform.Process, "cpu_num"):
-
-        def cpu_num(self):
-            """Return what CPU this process is currently running on.
-            The returned number should be <= psutil.cpu_count()
-            and <= len(psutil.cpu_percent(percpu=True)).
-            It may be used in conjunction with
-            psutil.cpu_percent(percpu=True) to observe the system
-            workload distributed across CPUs.
-            """
-            return self._proc.cpu_num()
-
-    # Linux, macOS, Windows, Solaris, AIX
-    if hasattr(_psplatform.Process, "environ"):
-
-        def environ(self):
-            """The environment variables of the process as a dict.  Note: this
-            might not reflect changes made after the process started.  """
-            return self._proc.environ()
-
-    if WINDOWS:
-
-        def num_handles(self):
-            """Return the number of handles opened by this process
-            (Windows only).
-            """
-            return self._proc.num_handles()
-
-    def num_ctx_switches(self):
-        """Return the number of voluntary and involuntary context
-        switches performed by this process.
-        """
-        return self._proc.num_ctx_switches()
-
-    def num_threads(self):
-        """Return the number of threads used by this process."""
-        return self._proc.num_threads()
-
-    if hasattr(_psplatform.Process, "threads"):
-
-        def threads(self):
-            """Return threads opened by process as a list of
-            (id, user_time, system_time) namedtuples representing
-            thread id and thread CPU times (user/system).
-            On OpenBSD this method requires root access.
-            """
-            return self._proc.threads()
-
-    @_assert_pid_not_reused
-    def children(self, recursive=False):
-        """Return the children of this process as a list of Process
-        instances, pre-emptively checking whether PID has been reused.
-        If *recursive* is True return all the parent descendants.
-
-        Example (A == this process):
-
-         A ─�
-            │
-            ├─ B (child) ─�
-            │             └─ X (grandchild) ─�
-            │                                └─ Y (great grandchild)
-            ├─ C (child)
-            └─ D (child)
-
-        >>> import psutil
-        >>> p = psutil.Process()
-        >>> p.children()
-        B, C, D
-        >>> p.children(recursive=True)
-        B, X, Y, C, D
-
-        Note that in the example above if process X disappears
-        process Y won't be listed as the reference to process A
-        is lost.
-        """
-        ppid_map = _ppid_map()
-        ret = []
-        if not recursive:
-            for pid, ppid in ppid_map.items():
-                if ppid == self.pid:
-                    try:
-                        child = Process(pid)
-                        # if child happens to be older than its parent
-                        # (self) it means child's PID has been reused
-                        if self.create_time() <= child.create_time():
-                            ret.append(child)
-                    except (NoSuchProcess, ZombieProcess):
-                        pass
-        else:
-            # Construct a {pid: [child pids]} dict
-            reverse_ppid_map = collections.defaultdict(list)
-            for pid, ppid in ppid_map.items():
-                reverse_ppid_map[ppid].append(pid)
-            # Recursively traverse that dict, starting from self.pid,
-            # such that we only call Process() on actual children
-            seen = set()
-            stack = [self.pid]
-            while stack:
-                pid = stack.pop()
-                if pid in seen:
-                    # Since pids can be reused while the ppid_map is
-                    # constructed, there may be rare instances where
-                    # there's a cycle in the recorded process "tree".
-                    continue
-                seen.add(pid)
-                for child_pid in reverse_ppid_map[pid]:
-                    try:
-                        child = Process(child_pid)
-                        # if child happens to be older than its parent
-                        # (self) it means child's PID has been reused
-                        intime = self.create_time() <= child.create_time()
-                        if intime:
-                            ret.append(child)
-                            stack.append(child_pid)
-                    except (NoSuchProcess, ZombieProcess):
-                        pass
-        return ret
-
-    def cpu_percent(self, interval=None):
-        """Return a float representing the current process CPU
-        utilization as a percentage.
-
-        When *interval* is 0.0 or None (default) compares process times
-        to system CPU times elapsed since last call, returning
-        immediately (non-blocking). That means that the first time
-        this is called it will return a meaningful 0.0 value.
-
-        When *interval* is > 0.0 compares process times to system CPU
-        times elapsed before and after the interval (blocking).
-
-        In this case is recommended for accuracy that this function
-        be called with at least 0.1 seconds between calls.
-
-        A value > 100.0 can be returned in case of processes running
-        multiple threads on different CPU cores.
-
-        The returned value is explicitly NOT split evenly between
-        all available logical CPUs. This means that a busy loop process
-        running on a system with 2 logical CPUs will be reported as
-        having 100% CPU utilization instead of 50%.
-
-        Examples:
-
-          >>> import psutil
-          >>> p = psutil.Process(os.getpid())
-          >>> # blocking
-          >>> p.cpu_percent(interval=1)
-          2.0
-          >>> # non-blocking (percentage since last call)
-          >>> p.cpu_percent(interval=None)
-          2.9
-          >>>
-        """
-        blocking = interval is not None and interval > 0.0
-        if interval is not None and interval < 0:
-            raise ValueError("interval is not positive (got %r)" % interval)
-        num_cpus = cpu_count() or 1
-
-        def timer():
-            return _timer() * num_cpus
-
-        if blocking:
-            st1 = timer()
-            pt1 = self._proc.cpu_times()
-            time.sleep(interval)
-            st2 = timer()
-            pt2 = self._proc.cpu_times()
-        else:
-            st1 = self._last_sys_cpu_times
-            pt1 = self._last_proc_cpu_times
-            st2 = timer()
-            pt2 = self._proc.cpu_times()
-            if st1 is None or pt1 is None:
-                self._last_sys_cpu_times = st2
-                self._last_proc_cpu_times = pt2
-                return 0.0
-
-        delta_proc = (pt2.user - pt1.user) + (pt2.system - pt1.system)
-        delta_time = st2 - st1
-        # reset values for next call in case of interval == None
-        self._last_sys_cpu_times = st2
-        self._last_proc_cpu_times = pt2
-
-        try:
-            # This is the utilization split evenly between all CPUs.
-            # E.g. a busy loop process on a 2-CPU-cores system at this
-            # point is reported as 50% instead of 100%.
-            overall_cpus_percent = ((delta_proc / delta_time) * 100)
-        except ZeroDivisionError:
-            # interval was too low
-            return 0.0
-        else:
-            # Note 1:
-            # in order to emulate "top" we multiply the value for the num
-            # of CPU cores. This way the busy process will be reported as
-            # having 100% (or more) usage.
-            #
-            # Note 2:
-            # taskmgr.exe on Windows differs in that it will show 50%
-            # instead.
-            #
-            # Note 3:
-            # a percentage > 100 is legitimate as it can result from a
-            # process with multiple threads running on different CPU
-            # cores (top does the same), see:
-            # http://stackoverflow.com/questions/1032357
-            # https://github.com/giampaolo/psutil/issues/474
-            single_cpu_percent = overall_cpus_percent * num_cpus
-            return round(single_cpu_percent, 1)
-
-    @memoize_when_activated
-    def cpu_times(self):
-        """Return a (user, system, children_user, children_system)
-        namedtuple representing the accumulated process time, in
-        seconds.
-        This is similar to os.times() but per-process.
-        On macOS and Windows children_user and children_system are
-        always set to 0.
-        """
-        return self._proc.cpu_times()
-
-    @memoize_when_activated
-    def memory_info(self):
-        """Return a namedtuple with variable fields depending on the
-        platform, representing memory information about the process.
-
-        The "portable" fields available on all plaforms are `rss` and `vms`.
-
-        All numbers are expressed in bytes.
-        """
-        return self._proc.memory_info()
-
-    @deprecated_method(replacement="memory_info")
-    def memory_info_ex(self):
-        return self.memory_info()
-
-    def memory_full_info(self):
-        """This method returns the same information as memory_info(),
-        plus, on some platform (Linux, macOS, Windows), also provides
-        additional metrics (USS, PSS and swap).
-        The additional metrics provide a better representation of actual
-        process memory usage.
-
-        Namely USS is the memory which is unique to a process and which
-        would be freed if the process was terminated right now.
-
-        It does so by passing through the whole process address.
-        As such it usually requires higher user privileges than
-        memory_info() and is considerably slower.
-        """
-        return self._proc.memory_full_info()
-
-    def memory_percent(self, memtype="rss"):
-        """Compare process memory to total physical system memory and
-        calculate process memory utilization as a percentage.
-        *memtype* argument is a string that dictates what type of
-        process memory you want to compare against (defaults to "rss").
-        The list of available strings can be obtained like this:
-
-        >>> psutil.Process().memory_info()._fields
-        ('rss', 'vms', 'shared', 'text', 'lib', 'data', 'dirty', 'uss', 'pss')
-        """
-        valid_types = list(_psplatform.pfullmem._fields)
-        if memtype not in valid_types:
-            raise ValueError("invalid memtype %r; valid types are %r" % (
-                memtype, tuple(valid_types)))
-        fun = self.memory_info if memtype in _psplatform.pmem._fields else \
-            self.memory_full_info
-        metrics = fun()
-        value = getattr(metrics, memtype)
-
-        # use cached value if available
-        total_phymem = _TOTAL_PHYMEM or virtual_memory().total
-        if not total_phymem > 0:
-            # we should never get here
-            raise ValueError(
-                "can't calculate process memory percent because "
-                "total physical system memory is not positive (%r)"
-                % total_phymem)
-        return (value / float(total_phymem)) * 100
-
-    if hasattr(_psplatform.Process, "memory_maps"):
-        def memory_maps(self, grouped=True):
-            """Return process' mapped memory regions as a list of namedtuples
-            whose fields are variable depending on the platform.
-
-            If *grouped* is True the mapped regions with the same 'path'
-            are grouped together and the different memory fields are summed.
-
-            If *grouped* is False every mapped region is shown as a single
-            entity and the namedtuple will also include the mapped region's
-            address space ('addr') and permission set ('perms').
-            """
-            it = self._proc.memory_maps()
-            if grouped:
-                d = {}
-                for tupl in it:
-                    path = tupl[2]
-                    nums = tupl[3:]
-                    try:
-                        d[path] = map(lambda x, y: x + y, d[path], nums)
-                    except KeyError:
-                        d[path] = nums
-                nt = _psplatform.pmmap_grouped
-                return [nt(path, *d[path]) for path in d]  # NOQA
-            else:
-                nt = _psplatform.pmmap_ext
-                return [nt(*x) for x in it]
-
-    def open_files(self):
-        """Return files opened by process as a list of
-        (path, fd) namedtuples including the absolute file name
-        and file descriptor number.
-        """
-        return self._proc.open_files()
-
-    def connections(self, kind='inet'):
-        """Return socket connections opened by process as a list of
-        (fd, family, type, laddr, raddr, status) namedtuples.
-        The *kind* parameter filters for connections that match the
-        following criteria:
-
-        +------------+----------------------------------------------------+
-        | Kind Value | Connections using                                  |
-        +------------+----------------------------------------------------+
-        | inet       | IPv4 and IPv6                                      |
-        | inet4      | IPv4                                               |
-        | inet6      | IPv6                                               |
-        | tcp        | TCP                                                |
-        | tcp4       | TCP over IPv4                                      |
-        | tcp6       | TCP over IPv6                                      |
-        | udp        | UDP                                                |
-        | udp4       | UDP over IPv4                                      |
-        | udp6       | UDP over IPv6                                      |
-        | unix       | UNIX socket (both UDP and TCP protocols)           |
-        | all        | the sum of all the possible families and protocols |
-        +------------+----------------------------------------------------+
-        """
-        return self._proc.connections(kind)
-
-    # --- signals
-
-    if POSIX:
-        def _send_signal(self, sig):
-            assert not self.pid < 0, self.pid
-            if self.pid == 0:
-                # see "man 2 kill"
-                raise ValueError(
-                    "preventing sending signal to process with PID 0 as it "
-                    "would affect every process in the process group of the "
-                    "calling process (os.getpid()) instead of PID 0")
-            try:
-                os.kill(self.pid, sig)
-            except ProcessLookupError:
-                if OPENBSD and pid_exists(self.pid):
-                    # We do this because os.kill() lies in case of
-                    # zombie processes.
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-                else:
-                    self._gone = True
-                    raise NoSuchProcess(self.pid, self._name)
-            except PermissionError:
-                raise AccessDenied(self.pid, self._name)
-
-    @_assert_pid_not_reused
-    def send_signal(self, sig):
-        """Send a signal *sig* to process pre-emptively checking
-        whether PID has been reused (see signal module constants) .
-        On Windows only SIGTERM is valid and is treated as an alias
-        for kill().
-        """
-        if POSIX:
-            self._send_signal(sig)
-        else:  # pragma: no cover
-            self._proc.send_signal(sig)
-
-    @_assert_pid_not_reused
-    def suspend(self):
-        """Suspend process execution with SIGSTOP pre-emptively checking
-        whether PID has been reused.
-        On Windows this has the effect ot suspending all process threads.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGSTOP)
-        else:  # pragma: no cover
-            self._proc.suspend()
-
-    @_assert_pid_not_reused
-    def resume(self):
-        """Resume process execution with SIGCONT pre-emptively checking
-        whether PID has been reused.
-        On Windows this has the effect of resuming all process threads.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGCONT)
-        else:  # pragma: no cover
-            self._proc.resume()
-
-    @_assert_pid_not_reused
-    def terminate(self):
-        """Terminate the process with SIGTERM pre-emptively checking
-        whether PID has been reused.
-        On Windows this is an alias for kill().
-        """
-        if POSIX:
-            self._send_signal(signal.SIGTERM)
-        else:  # pragma: no cover
-            self._proc.kill()
-
-    @_assert_pid_not_reused
-    def kill(self):
-        """Kill the current process with SIGKILL pre-emptively checking
-        whether PID has been reused.
-        """
-        if POSIX:
-            self._send_signal(signal.SIGKILL)
-        else:  # pragma: no cover
-            self._proc.kill()
-
-    def wait(self, timeout=None):
-        """Wait for process to terminate and, if process is a children
-        of os.getpid(), also return its exit code, else None.
-        On Windows there's no such limitation (exit code is always
-        returned).
-
-        If the process is already terminated immediately return None
-        instead of raising NoSuchProcess.
-
-        If *timeout* (in seconds) is specified and process is still
-        alive raise TimeoutExpired.
-
-        To wait for multiple Process(es) use psutil.wait_procs().
-        """
-        if timeout is not None and not timeout >= 0:
-            raise ValueError("timeout must be a positive integer")
-        return self._proc.wait(timeout)
-
-
-# =====================================================================
-# --- Popen class
-# =====================================================================
-
-
-class Popen(Process):
-    """A more convenient interface to stdlib subprocess.Popen class.
-    It starts a sub process and deals with it exactly as when using
-    subprocess.Popen class but in addition also provides all the
-    properties and methods of psutil.Process class as a unified
-    interface:
-
-      >>> import psutil
-      >>> from subprocess import PIPE
-      >>> p = psutil.Popen(["python", "-c", "print 'hi'"], stdout=PIPE)
-      >>> p.name()
-      'python'
-      >>> p.uids()
-      user(real=1000, effective=1000, saved=1000)
-      >>> p.username()
-      'giampaolo'
-      >>> p.communicate()
-      ('hi\n', None)
-      >>> p.terminate()
-      >>> p.wait(timeout=2)
-      0
-      >>>
-
-    For method names common to both classes such as kill(), terminate()
-    and wait(), psutil.Process implementation takes precedence.
-
-    Unlike subprocess.Popen this class pre-emptively checks whether PID
-    has been reused on send_signal(), terminate() and kill() so that
-    you don't accidentally terminate another process, fixing
-    http://bugs.python.org/issue6973.
-
-    For a complete documentation refer to:
-    http://docs.python.org/3/library/subprocess.html
-    """
-
-    def __init__(self, *args, **kwargs):
-        # Explicitly avoid to raise NoSuchProcess in case the process
-        # spawned by subprocess.Popen terminates too quickly, see:
-        # https://github.com/giampaolo/psutil/issues/193
-        self.__subproc = subprocess.Popen(*args, **kwargs)
-        self._init(self.__subproc.pid, _ignore_nsp=True)
-
-    def __dir__(self):
-        return sorted(set(dir(Popen) + dir(subprocess.Popen)))
-
-    def __enter__(self):
-        if hasattr(self.__subproc, '__enter__'):
-            self.__subproc.__enter__()
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        if hasattr(self.__subproc, '__exit__'):
-            return self.__subproc.__exit__(*args, **kwargs)
-        else:
-            if self.stdout:
-                self.stdout.close()
-            if self.stderr:
-                self.stderr.close()
-            try:
-                # Flushing a BufferedWriter may raise an error.
-                if self.stdin:
-                    self.stdin.close()
-            finally:
-                # Wait for the process to terminate, to avoid zombies.
-                self.wait()
-
-    def __getattribute__(self, name):
-        try:
-            return object.__getattribute__(self, name)
-        except AttributeError:
-            try:
-                return object.__getattribute__(self.__subproc, name)
-            except AttributeError:
-                raise AttributeError("%s instance has no attribute '%s'"
-                                     % (self.__class__.__name__, name))
-
-    def wait(self, timeout=None):
-        if self.__subproc.returncode is not None:
-            return self.__subproc.returncode
-        ret = super(Popen, self).wait(timeout)
-        self.__subproc.returncode = ret
-        return ret
-
-
-# The valid attr names which can be processed by Process.as_dict().
-_as_dict_attrnames = set(
-    [x for x in dir(Process) if not x.startswith('_') and x not in
-     ['send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
-      'is_running', 'as_dict', 'parent', 'parents', 'children', 'rlimit',
-      'memory_info_ex', 'oneshot']])
-
-
-# =====================================================================
-# --- system processes related functions
-# =====================================================================
-
-
-def pids():
-    """Return a list of current running PIDs."""
-    global _LOWEST_PID
-    ret = sorted(_psplatform.pids())
-    _LOWEST_PID = ret[0]
-    return ret
-
-
-def pid_exists(pid):
-    """Return True if given PID exists in the current process list.
-    This is faster than doing "pid in psutil.pids()" and
-    should be preferred.
-    """
-    if pid < 0:
-        return False
-    elif pid == 0 and POSIX:
-        # On POSIX we use os.kill() to determine PID existence.
-        # According to "man 2 kill" PID 0 has a special meaning
-        # though: it refers to <<every process in the process
-        # group of the calling process>> and that is not we want
-        # to do here.
-        return pid in pids()
-    else:
-        return _psplatform.pid_exists(pid)
-
-
-_pmap = {}
-_lock = threading.Lock()
-
-
-def process_iter(attrs=None, ad_value=None):
-    """Return a generator yielding a Process instance for all
-    running processes.
-
-    Every new Process instance is only created once and then cached
-    into an internal table which is updated every time this is used.
-
-    Cached Process instances are checked for identity so that you're
-    safe in case a PID has been reused by another process, in which
-    case the cached instance is updated.
-
-    The sorting order in which processes are yielded is based on
-    their PIDs.
-
-    *attrs* and *ad_value* have the same meaning as in
-    Process.as_dict(). If *attrs* is specified as_dict() is called
-    and the resulting dict is stored as a 'info' attribute attached
-    to returned Process instance.
-    If *attrs* is an empty list it will retrieve all process info
-    (slow).
-    """
-    def add(pid):
-        proc = Process(pid)
-        if attrs is not None:
-            proc.info = proc.as_dict(attrs=attrs, ad_value=ad_value)
-        with _lock:
-            _pmap[proc.pid] = proc
-        return proc
-
-    def remove(pid):
-        with _lock:
-            _pmap.pop(pid, None)
-
-    a = set(pids())
-    b = set(_pmap.keys())
-    new_pids = a - b
-    gone_pids = b - a
-    for pid in gone_pids:
-        remove(pid)
-
-    with _lock:
-        ls = sorted(list(_pmap.items()) +
-                    list(dict.fromkeys(new_pids).items()))
-
-    for pid, proc in ls:
-        try:
-            if proc is None:  # new process
-                yield add(pid)
-            else:
-                # use is_running() to check whether PID has been reused by
-                # another process in which case yield a new Process instance
-                if proc.is_running():
-                    if attrs is not None:
-                        proc.info = proc.as_dict(
-                            attrs=attrs, ad_value=ad_value)
-                    yield proc
-                else:
-                    yield add(pid)
-        except NoSuchProcess:
-            remove(pid)
-        except AccessDenied:
-            # Process creation time can't be determined hence there's
-            # no way to tell whether the pid of the cached process
-            # has been reused. Just return the cached version.
-            if proc is None and pid in _pmap:
-                try:
-                    yield _pmap[pid]
-                except KeyError:
-                    # If we get here it is likely that 2 threads were
-                    # using process_iter().
-                    pass
-            else:
-                raise
-
-
-def wait_procs(procs, timeout=None, callback=None):
-    """Convenience function which waits for a list of processes to
-    terminate.
-
-    Return a (gone, alive) tuple indicating which processes
-    are gone and which ones are still alive.
-
-    The gone ones will have a new *returncode* attribute indicating
-    process exit status (may be None).
-
-    *callback* is a function which gets called every time a process
-    terminates (a Process instance is passed as callback argument).
-
-    Function will return as soon as all processes terminate or when
-    *timeout* occurs.
-    Differently from Process.wait() it will not raise TimeoutExpired if
-    *timeout* occurs.
-
-    Typical use case is:
-
-     - send SIGTERM to a list of processes
-     - give them some time to terminate
-     - send SIGKILL to those ones which are still alive
-
-    Example:
-
-    >>> def on_terminate(proc):
-    ...     print("process {} terminated".format(proc))
-    ...
-    >>> for p in procs:
-    ...    p.terminate()
-    ...
-    >>> gone, alive = wait_procs(procs, timeout=3, callback=on_terminate)
-    >>> for p in alive:
-    ...     p.kill()
-    """
-    def check_gone(proc, timeout):
-        try:
-            returncode = proc.wait(timeout=timeout)
-        except TimeoutExpired:
-            pass
-        else:
-            if returncode is not None or not proc.is_running():
-                # Set new Process instance attribute.
-                proc.returncode = returncode
-                gone.add(proc)
-                if callback is not None:
-                    callback(proc)
-
-    if timeout is not None and not timeout >= 0:
-        msg = "timeout must be a positive integer, got %s" % timeout
-        raise ValueError(msg)
-    gone = set()
-    alive = set(procs)
-    if callback is not None and not callable(callback):
-        raise TypeError("callback %r is not a callable" % callable)
-    if timeout is not None:
-        deadline = _timer() + timeout
-
-    while alive:
-        if timeout is not None and timeout <= 0:
-            break
-        for proc in alive:
-            # Make sure that every complete iteration (all processes)
-            # will last max 1 sec.
-            # We do this because we don't want to wait too long on a
-            # single process: in case it terminates too late other
-            # processes may disappear in the meantime and their PID
-            # reused.
-            max_timeout = 1.0 / len(alive)
-            if timeout is not None:
-                timeout = min((deadline - _timer()), max_timeout)
-                if timeout <= 0:
-                    break
-                check_gone(proc, timeout)
-            else:
-                check_gone(proc, max_timeout)
-        alive = alive - gone
-
-    if alive:
-        # Last attempt over processes survived so far.
-        # timeout == 0 won't make this function wait any further.
-        for proc in alive:
-            check_gone(proc, 0)
-        alive = alive - gone
-
-    return (list(gone), list(alive))
-
-
-# =====================================================================
-# --- CPU related functions
-# =====================================================================
-
-
-def cpu_count(logical=True):
-    """Return the number of logical CPUs in the system (same as
-    os.cpu_count() in Python 3.4).
-
-    If *logical* is False return the number of physical cores only
-    (e.g. hyper thread CPUs are excluded).
-
-    Return None if undetermined.
-
-    The return value is cached after first call.
-    If desired cache can be cleared like this:
-
-    >>> psutil.cpu_count.cache_clear()
-    """
-    if logical:
-        ret = _psplatform.cpu_count_logical()
-    else:
-        ret = _psplatform.cpu_count_physical()
-    if ret is not None and ret < 1:
-        ret = None
-    return ret
-
-
-def cpu_times(percpu=False):
-    """Return system-wide CPU times as a namedtuple.
-    Every CPU time represents the seconds the CPU has spent in the
-    given mode. The namedtuple's fields availability varies depending on the
-    platform:
-
-     - user
-     - system
-     - idle
-     - nice (UNIX)
-     - iowait (Linux)
-     - irq (Linux, FreeBSD)
-     - softirq (Linux)
-     - steal (Linux >= 2.6.11)
-     - guest (Linux >= 2.6.24)
-     - guest_nice (Linux >= 3.2.0)
-
-    When *percpu* is True return a list of namedtuples for each CPU.
-    First element of the list refers to first CPU, second element
-    to second CPU and so on.
-    The order of the list is consistent across calls.
-    """
-    if not percpu:
-        return _psplatform.cpu_times()
-    else:
-        return _psplatform.per_cpu_times()
-
-
-try:
-    _last_cpu_times = cpu_times()
-except Exception:
-    # Don't want to crash at import time.
-    _last_cpu_times = None
-
-try:
-    _last_per_cpu_times = cpu_times(percpu=True)
-except Exception:
-    # Don't want to crash at import time.
-    _last_per_cpu_times = None
-
-
-def _cpu_tot_time(times):
-    """Given a cpu_time() ntuple calculates the total CPU time
-    (including idle time).
-    """
-    tot = sum(times)
-    if LINUX:
-        # On Linux guest times are already accounted in "user" or
-        # "nice" times, so we subtract them from total.
-        # Htop does the same. References:
-        # https://github.com/giampaolo/psutil/pull/940
-        # http://unix.stackexchange.com/questions/178045
-        # https://github.com/torvalds/linux/blob/
-        #     447976ef4fd09b1be88b316d1a81553f1aa7cd07/kernel/sched/
-        #     cputime.c#L158
-        tot -= getattr(times, "guest", 0)  # Linux 2.6.24+
-        tot -= getattr(times, "guest_nice", 0)  # Linux 3.2.0+
-    return tot
-
-
-def _cpu_busy_time(times):
-    """Given a cpu_time() ntuple calculates the busy CPU time.
-    We do so by subtracting all idle CPU times.
-    """
-    busy = _cpu_tot_time(times)
-    busy -= times.idle
-    # Linux: "iowait" is time during which the CPU does not do anything
-    # (waits for IO to complete). On Linux IO wait is *not* accounted
-    # in "idle" time so we subtract it. Htop does the same.
-    # References:
-    # https://github.com/torvalds/linux/blob/
-    #     447976ef4fd09b1be88b316d1a81553f1aa7cd07/kernel/sched/cputime.c#L244
-    busy -= getattr(times, "iowait", 0)
-    return busy
-
-
-def _cpu_times_deltas(t1, t2):
-    assert t1._fields == t2._fields, (t1, t2)
-    field_deltas = []
-    for field in _psplatform.scputimes._fields:
-        field_delta = getattr(t2, field) - getattr(t1, field)
-        # CPU times are always supposed to increase over time
-        # or at least remain the same and that's because time
-        # cannot go backwards.
-        # Surprisingly sometimes this might not be the case (at
-        # least on Windows and Linux), see:
-        # https://github.com/giampaolo/psutil/issues/392
-        # https://github.com/giampaolo/psutil/issues/645
-        # https://github.com/giampaolo/psutil/issues/1210
-        # Trim negative deltas to zero to ignore decreasing fields.
-        # top does the same. Reference:
-        # https://gitlab.com/procps-ng/procps/blob/v3.3.12/top/top.c#L5063
-        field_delta = max(0, field_delta)
-        field_deltas.append(field_delta)
-    return _psplatform.scputimes(*field_deltas)
-
-
-def cpu_percent(interval=None, percpu=False):
-    """Return a float representing the current system-wide CPU
-    utilization as a percentage.
-
-    When *interval* is > 0.0 compares system CPU times elapsed before
-    and after the interval (blocking).
-
-    When *interval* is 0.0 or None compares system CPU times elapsed
-    since last call or module import, returning immediately (non
-    blocking). That means the first time this is called it will
-    return a meaningless 0.0 value which you should ignore.
-    In this case is recommended for accuracy that this function be
-    called with at least 0.1 seconds between calls.
-
-    When *percpu* is True returns a list of floats representing the
-    utilization as a percentage for each CPU.
-    First element of the list refers to first CPU, second element
-    to second CPU and so on.
-    The order of the list is consistent across calls.
-
-    Examples:
-
-      >>> # blocking, system-wide
-      >>> psutil.cpu_percent(interval=1)
-      2.0
-      >>>
-      >>> # blocking, per-cpu
-      >>> psutil.cpu_percent(interval=1, percpu=True)
-      [2.0, 1.0]
-      >>>
-      >>> # non-blocking (percentage since last call)
-      >>> psutil.cpu_percent(interval=None)
-      2.9
-      >>>
-    """
-    global _last_cpu_times
-    global _last_per_cpu_times
-    blocking = interval is not None and interval > 0.0
-    if interval is not None and interval < 0:
-        raise ValueError("interval is not positive (got %r)" % interval)
-
-    def calculate(t1, t2):
-        times_delta = _cpu_times_deltas(t1, t2)
-
-        all_delta = _cpu_tot_time(times_delta)
-        busy_delta = _cpu_busy_time(times_delta)
-
-        try:
-            busy_perc = (busy_delta / all_delta) * 100
-        except ZeroDivisionError:
-            return 0.0
-        else:
-            return round(busy_perc, 1)
-
-    # system-wide usage
-    if not percpu:
-        if blocking:
-            t1 = cpu_times()
-            time.sleep(interval)
-        else:
-            t1 = _last_cpu_times
-            if t1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                t1 = cpu_times()
-        _last_cpu_times = cpu_times()
-        return calculate(t1, _last_cpu_times)
-    # per-cpu usage
-    else:
-        ret = []
-        if blocking:
-            tot1 = cpu_times(percpu=True)
-            time.sleep(interval)
-        else:
-            tot1 = _last_per_cpu_times
-            if tot1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                tot1 = cpu_times(percpu=True)
-        _last_per_cpu_times = cpu_times(percpu=True)
-        for t1, t2 in zip(tot1, _last_per_cpu_times):
-            ret.append(calculate(t1, t2))
-        return ret
-
-
-# Use separate global vars for cpu_times_percent() so that it's
-# independent from cpu_percent() and they can both be used within
-# the same program.
-_last_cpu_times_2 = _last_cpu_times
-_last_per_cpu_times_2 = _last_per_cpu_times
-
-
-def cpu_times_percent(interval=None, percpu=False):
-    """Same as cpu_percent() but provides utilization percentages
-    for each specific CPU time as is returned by cpu_times().
-    For instance, on Linux we'll get:
-
-      >>> cpu_times_percent()
-      cpupercent(user=4.8, nice=0.0, system=4.8, idle=90.5, iowait=0.0,
-                 irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-      >>>
-
-    *interval* and *percpu* arguments have the same meaning as in
-    cpu_percent().
-    """
-    global _last_cpu_times_2
-    global _last_per_cpu_times_2
-    blocking = interval is not None and interval > 0.0
-    if interval is not None and interval < 0:
-        raise ValueError("interval is not positive (got %r)" % interval)
-
-    def calculate(t1, t2):
-        nums = []
-        times_delta = _cpu_times_deltas(t1, t2)
-        all_delta = _cpu_tot_time(times_delta)
-        # "scale" is the value to multiply each delta with to get percentages.
-        # We use "max" to avoid division by zero (if all_delta is 0, then all
-        # fields are 0 so percentages will be 0 too. all_delta cannot be a
-        # fraction because cpu times are integers)
-        scale = 100.0 / max(1, all_delta)
-        for field_delta in times_delta:
-            field_perc = field_delta * scale
-            field_perc = round(field_perc, 1)
-            # make sure we don't return negative values or values over 100%
-            field_perc = min(max(0.0, field_perc), 100.0)
-            nums.append(field_perc)
-        return _psplatform.scputimes(*nums)
-
-    # system-wide usage
-    if not percpu:
-        if blocking:
-            t1 = cpu_times()
-            time.sleep(interval)
-        else:
-            t1 = _last_cpu_times_2
-            if t1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                t1 = cpu_times()
-        _last_cpu_times_2 = cpu_times()
-        return calculate(t1, _last_cpu_times_2)
-    # per-cpu usage
-    else:
-        ret = []
-        if blocking:
-            tot1 = cpu_times(percpu=True)
-            time.sleep(interval)
-        else:
-            tot1 = _last_per_cpu_times_2
-            if tot1 is None:
-                # Something bad happened at import time. We'll
-                # get a meaningful result on the next call. See:
-                # https://github.com/giampaolo/psutil/pull/715
-                tot1 = cpu_times(percpu=True)
-        _last_per_cpu_times_2 = cpu_times(percpu=True)
-        for t1, t2 in zip(tot1, _last_per_cpu_times_2):
-            ret.append(calculate(t1, t2))
-        return ret
-
-
-def cpu_stats():
-    """Return CPU statistics."""
-    return _psplatform.cpu_stats()
-
-
-if hasattr(_psplatform, "cpu_freq"):
-
-    def cpu_freq(percpu=False):
-        """Return CPU frequency as a nameduple including current,
-        min and max frequency expressed in Mhz.
-
-        If *percpu* is True and the system supports per-cpu frequency
-        retrieval (Linux only) a list of frequencies is returned for
-        each CPU. If not a list with one element is returned.
-        """
-        ret = _psplatform.cpu_freq()
-        if percpu:
-            return ret
-        else:
-            num_cpus = float(len(ret))
-            if num_cpus == 0:
-                return None
-            elif num_cpus == 1:
-                return ret[0]
-            else:
-                currs, mins, maxs = 0.0, 0.0, 0.0
-                set_none = False
-                for cpu in ret:
-                    currs += cpu.current
-                    # On Linux if /proc/cpuinfo is used min/max are set
-                    # to None.
-                    if LINUX and cpu.min is None:
-                        set_none = True
-                        continue
-                    mins += cpu.min
-                    maxs += cpu.max
-
-                current = currs / num_cpus
-
-                if set_none:
-                    min_ = max_ = None
-                else:
-                    min_ = mins / num_cpus
-                    max_ = maxs / num_cpus
-
-                return _common.scpufreq(current, min_, max_)
-
-    __all__.append("cpu_freq")
-
-
-if hasattr(os, "getloadavg") or hasattr(_psplatform, "getloadavg"):
-    # Perform this hasattr check once on import time to either use the
-    # platform based code or proxy straight from the os module.
-    if hasattr(os, "getloadavg"):
-        getloadavg = os.getloadavg
-    else:
-        getloadavg = _psplatform.getloadavg
-
-    __all__.append("getloadavg")
-
-
-# =====================================================================
-# --- system memory related functions
-# =====================================================================
-
-
-def virtual_memory():
-    """Return statistics about system memory usage as a namedtuple
-    including the following fields, expressed in bytes:
-
-     - total:
-       total physical memory available.
-
-     - available:
-       the memory that can be given instantly to processes without the
-       system going into swap.
-       This is calculated by summing different memory values depending
-       on the platform and it is supposed to be used to monitor actual
-       memory usage in a cross platform fashion.
-
-     - percent:
-       the percentage usage calculated as (total - available) / total * 100
-
-     - used:
-        memory used, calculated differently depending on the platform and
-        designed for informational purposes only:
-        macOS: active + wired
-        BSD: active + wired + cached
-        Linux: total - free
-
-     - free:
-       memory not being used at all (zeroed) that is readily available;
-       note that this doesn't reflect the actual memory available
-       (use 'available' instead)
-
-    Platform-specific fields:
-
-     - active (UNIX):
-       memory currently in use or very recently used, and so it is in RAM.
-
-     - inactive (UNIX):
-       memory that is marked as not used.
-
-     - buffers (BSD, Linux):
-       cache for things like file system metadata.
-
-     - cached (BSD, macOS):
-       cache for various things.
-
-     - wired (macOS, BSD):
-       memory that is marked to always stay in RAM. It is never moved to disk.
-
-     - shared (BSD):
-       memory that may be simultaneously accessed by multiple processes.
-
-    The sum of 'used' and 'available' does not necessarily equal total.
-    On Windows 'available' and 'free' are the same.
-    """
-    global _TOTAL_PHYMEM
-    ret = _psplatform.virtual_memory()
-    # cached for later use in Process.memory_percent()
-    _TOTAL_PHYMEM = ret.total
-    return ret
-
-
-def swap_memory():
-    """Return system swap memory statistics as a namedtuple including
-    the following fields:
-
-     - total:   total swap memory in bytes
-     - used:    used swap memory in bytes
-     - free:    free swap memory in bytes
-     - percent: the percentage usage
-     - sin:     no. of bytes the system has swapped in from disk (cumulative)
-     - sout:    no. of bytes the system has swapped out from disk (cumulative)
-
-    'sin' and 'sout' on Windows are meaningless and always set to 0.
-    """
-    return _psplatform.swap_memory()
-
-
-# =====================================================================
-# --- disks/paritions related functions
-# =====================================================================
-
-
-def disk_usage(path):
-    """Return disk usage statistics about the given *path* as a
-    namedtuple including total, used and free space expressed in bytes
-    plus the percentage usage.
-    """
-    return _psplatform.disk_usage(path)
-
-
-def disk_partitions(all=False):
-    """Return mounted partitions as a list of
-    (device, mountpoint, fstype, opts) namedtuple.
-    'opts' field is a raw string separated by commas indicating mount
-    options which may vary depending on the platform.
-
-    If *all* parameter is False return physical devices only and ignore
-    all others.
-    """
-    return _psplatform.disk_partitions(all)
-
-
-def disk_io_counters(perdisk=False, nowrap=True):
-    """Return system disk I/O statistics as a namedtuple including
-    the following fields:
-
-     - read_count:  number of reads
-     - write_count: number of writes
-     - read_bytes:  number of bytes read
-     - write_bytes: number of bytes written
-     - read_time:   time spent reading from disk (in ms)
-     - write_time:  time spent writing to disk (in ms)
-
-    Platform specific:
-
-     - busy_time: (Linux, FreeBSD) time spent doing actual I/Os (in ms)
-     - read_merged_count (Linux): number of merged reads
-     - write_merged_count (Linux): number of merged writes
-
-    If *perdisk* is True return the same information for every
-    physical disk installed on the system as a dictionary
-    with partition names as the keys and the namedtuple
-    described above as the values.
-
-    If *nowrap* is True it detects and adjust the numbers which overflow
-    and wrap (restart from 0) and add "old value" to "new value" so that
-    the returned numbers will always be increasing or remain the same,
-    but never decrease.
-    "disk_io_counters.cache_clear()" can be used to invalidate the
-    cache.
-
-    On recent Windows versions 'diskperf -y' command may need to be
-    executed first otherwise this function won't find any disk.
-    """
-    kwargs = dict(perdisk=perdisk) if LINUX else {}
-    rawdict = _psplatform.disk_io_counters(**kwargs)
-    if not rawdict:
-        return {} if perdisk else None
-    if nowrap:
-        rawdict = _wrap_numbers(rawdict, 'psutil.disk_io_counters')
-    nt = getattr(_psplatform, "sdiskio", _common.sdiskio)
-    if perdisk:
-        for disk, fields in rawdict.items():
-            rawdict[disk] = nt(*fields)
-        return rawdict
-    else:
-        return nt(*[sum(x) for x in zip(*rawdict.values())])
-
-
-disk_io_counters.cache_clear = functools.partial(
-    _wrap_numbers.cache_clear, 'psutil.disk_io_counters')
-disk_io_counters.cache_clear.__doc__ = "Clears nowrap argument cache"
-
-
-# =====================================================================
-# --- network related functions
-# =====================================================================
-
-
-def net_io_counters(pernic=False, nowrap=True):
-    """Return network I/O statistics as a namedtuple including
-    the following fields:
-
-     - bytes_sent:   number of bytes sent
-     - bytes_recv:   number of bytes received
-     - packets_sent: number of packets sent
-     - packets_recv: number of packets received
-     - errin:        total number of errors while receiving
-     - errout:       total number of errors while sending
-     - dropin:       total number of incoming packets which were dropped
-     - dropout:      total number of outgoing packets which were dropped
-                     (always 0 on macOS and BSD)
-
-    If *pernic* is True return the same information for every
-    network interface installed on the system as a dictionary
-    with network interface names as the keys and the namedtuple
-    described above as the values.
-
-    If *nowrap* is True it detects and adjust the numbers which overflow
-    and wrap (restart from 0) and add "old value" to "new value" so that
-    the returned numbers will always be increasing or remain the same,
-    but never decrease.
-    "disk_io_counters.cache_clear()" can be used to invalidate the
-    cache.
-    """
-    rawdict = _psplatform.net_io_counters()
-    if not rawdict:
-        return {} if pernic else None
-    if nowrap:
-        rawdict = _wrap_numbers(rawdict, 'psutil.net_io_counters')
-    if pernic:
-        for nic, fields in rawdict.items():
-            rawdict[nic] = _common.snetio(*fields)
-        return rawdict
-    else:
-        return _common.snetio(*[sum(x) for x in zip(*rawdict.values())])
-
-
-net_io_counters.cache_clear = functools.partial(
-    _wrap_numbers.cache_clear, 'psutil.net_io_counters')
-net_io_counters.cache_clear.__doc__ = "Clears nowrap argument cache"
-
-
-def net_connections(kind='inet'):
-    """Return system-wide socket connections as a list of
-    (fd, family, type, laddr, raddr, status, pid) namedtuples.
-    In case of limited privileges 'fd' and 'pid' may be set to -1
-    and None respectively.
-    The *kind* parameter filters for connections that fit the
-    following criteria:
-
-    +------------+----------------------------------------------------+
-    | Kind Value | Connections using                                  |
-    +------------+----------------------------------------------------+
-    | inet       | IPv4 and IPv6                                      |
-    | inet4      | IPv4                                               |
-    | inet6      | IPv6                                               |
-    | tcp        | TCP                                                |
-    | tcp4       | TCP over IPv4                                      |
-    | tcp6       | TCP over IPv6                                      |
-    | udp        | UDP                                                |
-    | udp4       | UDP over IPv4                                      |
-    | udp6       | UDP over IPv6                                      |
-    | unix       | UNIX socket (both UDP and TCP protocols)           |
-    | all        | the sum of all the possible families and protocols |
-    +------------+----------------------------------------------------+
-
-    On macOS this function requires root privileges.
-    """
-    return _psplatform.net_connections(kind)
-
-
-def net_if_addrs():
-    """Return the addresses associated to each NIC (network interface
-    card) installed on the system as a dictionary whose keys are the
-    NIC names and value is a list of namedtuples for each address
-    assigned to the NIC. Each namedtuple includes 5 fields:
-
-     - family: can be either socket.AF_INET, socket.AF_INET6 or
-               psutil.AF_LINK, which refers to a MAC address.
-     - address: is the primary address and it is always set.
-     - netmask: and 'broadcast' and 'ptp' may be None.
-     - ptp: stands for "point to point" and references the
-            destination address on a point to point interface
-            (typically a VPN).
-     - broadcast: and *ptp* are mutually exclusive.
-
-    Note: you can have more than one address of the same family
-    associated with each interface.
-    """
-    has_enums = sys.version_info >= (3, 4)
-    if has_enums:
-        import socket
-    rawlist = _psplatform.net_if_addrs()
-    rawlist.sort(key=lambda x: x[1])  # sort by family
-    ret = collections.defaultdict(list)
-    for name, fam, addr, mask, broadcast, ptp in rawlist:
-        if has_enums:
-            try:
-                fam = socket.AddressFamily(fam)
-            except ValueError:
-                if WINDOWS and fam == -1:
-                    fam = _psplatform.AF_LINK
-                elif (hasattr(_psplatform, "AF_LINK") and
-                        _psplatform.AF_LINK == fam):
-                    # Linux defines AF_LINK as an alias for AF_PACKET.
-                    # We re-set the family here so that repr(family)
-                    # will show AF_LINK rather than AF_PACKET
-                    fam = _psplatform.AF_LINK
-        if fam == _psplatform.AF_LINK:
-            # The underlying C function may return an incomplete MAC
-            # address in which case we fill it with null bytes, see:
-            # https://github.com/giampaolo/psutil/issues/786
-            separator = ":" if POSIX else "-"
-            while addr.count(separator) < 5:
-                addr += "%s00" % separator
-        ret[name].append(_common.snicaddr(fam, addr, mask, broadcast, ptp))
-    return dict(ret)
-
-
-def net_if_stats():
-    """Return information about each NIC (network interface card)
-    installed on the system as a dictionary whose keys are the
-    NIC names and value is a namedtuple with the following fields:
-
-     - isup: whether the interface is up (bool)
-     - duplex: can be either NIC_DUPLEX_FULL, NIC_DUPLEX_HALF or
-               NIC_DUPLEX_UNKNOWN
-     - speed: the NIC speed expressed in mega bits (MB); if it can't
-              be determined (e.g. 'localhost') it will be set to 0.
-     - mtu: the maximum transmission unit expressed in bytes.
-    """
-    return _psplatform.net_if_stats()
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-# Linux, macOS
-if hasattr(_psplatform, "sensors_temperatures"):
-
-    def sensors_temperatures(fahrenheit=False):
-        """Return hardware temperatures. Each entry is a namedtuple
-        representing a certain hardware sensor (it may be a CPU, an
-        hard disk or something else, depending on the OS and its
-        configuration).
-        All temperatures are expressed in celsius unless *fahrenheit*
-        is set to True.
-        """
-        def convert(n):
-            if n is not None:
-                return (float(n) * 9 / 5) + 32 if fahrenheit else n
-
-        ret = collections.defaultdict(list)
-        rawdict = _psplatform.sensors_temperatures()
-
-        for name, values in rawdict.items():
-            while values:
-                label, current, high, critical = values.pop(0)
-                current = convert(current)
-                high = convert(high)
-                critical = convert(critical)
-
-                if high and not critical:
-                    critical = high
-                elif critical and not high:
-                    high = critical
-
-                ret[name].append(
-                    _common.shwtemp(label, current, high, critical))
-
-        return dict(ret)
-
-    __all__.append("sensors_temperatures")
-
-
-# Linux, macOS
-if hasattr(_psplatform, "sensors_fans"):
-
-    def sensors_fans():
-        """Return fans speed. Each entry is a namedtuple
-        representing a certain hardware sensor.
-        All speed are expressed in RPM (rounds per minute).
-        """
-        return _psplatform.sensors_fans()
-
-    __all__.append("sensors_fans")
-
-
-# Linux, Windows, FreeBSD, macOS
-if hasattr(_psplatform, "sensors_battery"):
-
-    def sensors_battery():
-        """Return battery information. If no battery is installed
-        returns None.
-
-         - percent: battery power left as a percentage.
-         - secsleft: a rough approximation of how many seconds are left
-                     before the battery runs out of power. May be
-                     POWER_TIME_UNLIMITED or POWER_TIME_UNLIMITED.
-         - power_plugged: True if the AC power cable is connected.
-        """
-        return _psplatform.sensors_battery()
-
-    __all__.append("sensors_battery")
-
-
-# =====================================================================
-# --- other system related functions
-# =====================================================================
-
-
-def boot_time():
-    """Return the system boot time expressed in seconds since the epoch."""
-    # Note: we are not caching this because it is subject to
-    # system clock updates.
-    return _psplatform.boot_time()
-
-
-def users():
-    """Return users currently connected on the system as a list of
-    namedtuples including the following fields.
-
-     - user: the name of the user
-     - terminal: the tty or pseudo-tty associated with the user, if any.
-     - host: the host name associated with the entry, if any.
-     - started: the creation time as a floating point number expressed in
-       seconds since the epoch.
-    """
-    return _psplatform.users()
-
-
-# =====================================================================
-# --- Windows services
-# =====================================================================
-
-
-if WINDOWS:
-
-    def win_service_iter():
-        """Return a generator yielding a WindowsService instance for all
-        Windows services installed.
-        """
-        return _psplatform.win_service_iter()
-
-    def win_service_get(name):
-        """Get a Windows service by *name*.
-        Raise NoSuchProcess if no service with such name exists.
-        """
-        return _psplatform.win_service_get(name)
-
-
-# =====================================================================
-
-
-def test():  # pragma: no cover
-    from ._common import bytes2human
-    from ._compat import get_terminal_size
-
-    today_day = datetime.date.today()
-    templ = "%-10s %5s %5s %7s %7s %5s %6s %6s %6s  %s"
-    attrs = ['pid', 'memory_percent', 'name', 'cmdline', 'cpu_times',
-             'create_time', 'memory_info', 'status', 'nice', 'username']
-    print(templ % ("USER", "PID", "%MEM", "VSZ", "RSS", "NICE",
-                   "STATUS", "START", "TIME", "CMDLINE"))
-    for p in process_iter(attrs, ad_value=None):
-        if p.info['create_time']:
-            ctime = datetime.datetime.fromtimestamp(p.info['create_time'])
-            if ctime.date() == today_day:
-                ctime = ctime.strftime("%H:%M")
-            else:
-                ctime = ctime.strftime("%b%d")
-        else:
-            ctime = ''
-        if p.info['cpu_times']:
-            cputime = time.strftime("%M:%S",
-                                    time.localtime(sum(p.info['cpu_times'])))
-        else:
-            cputime = ''
-
-        user = p.info['username'] or ''
-        if not user and POSIX:
-            try:
-                user = p.uids()[0]
-            except Error:
-                pass
-        if user and WINDOWS and '\\' in user:
-            user = user.split('\\')[1]
-        user = user[:9]
-        vms = bytes2human(p.info['memory_info'].vms) if \
-            p.info['memory_info'] is not None else ''
-        rss = bytes2human(p.info['memory_info'].rss) if \
-            p.info['memory_info'] is not None else ''
-        memp = round(p.info['memory_percent'], 1) if \
-            p.info['memory_percent'] is not None else ''
-        nice = int(p.info['nice']) if p.info['nice'] else ''
-        if p.info['cmdline']:
-            cmdline = ' '.join(p.info['cmdline'])
-        else:
-            cmdline = p.info['name']
-        status = p.info['status'][:5] if p.info['status'] else ''
-
-        line = templ % (
-            user[:10],
-            p.info['pid'],
-            memp,
-            vms,
-            rss,
-            nice,
-            status,
-            ctime,
-            cputime,
-            cmdline)
-        print(line[:get_terminal_size()[0]])
-
-
-del memoize, memoize_when_activated, division, deprecated_method
-if sys.version_info[0] < 3:
-    del num, x
-
-if __name__ == "__main__":
-    test()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psaix.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psaix.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psaix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psaix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,550 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'
-# Copyright (c) 2017, Arnon Yaari
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""AIX platform implementation."""
-
-import functools
-import glob
-import os
-import re
-import subprocess
-import sys
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_aix as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_to_ntuple
-from ._common import get_procfs_path
-from ._common import memoize_when_activated
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-from ._common import NoSuchProcess
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-
-__extra__all__ = ["PROCFS_PATH"]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-HAS_THREADS = hasattr(cext, "proc_threads")
-HAS_NET_IO_COUNTERS = hasattr(cext, "net_io_counters")
-HAS_PROC_IO_COUNTERS = hasattr(cext, "proc_io_counters")
-
-PAGE_SIZE = os.sysconf('SC_PAGE_SIZE')
-AF_LINK = cext_posix.AF_LINK
-
-PROC_STATUSES = {
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-    cext.SACTIVE: _common.STATUS_RUNNING,
-    cext.SSWAP: _common.STATUS_RUNNING,      # TODO what status is this?
-    cext.SSTOP: _common.STATUS_STOPPED,
-}
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-proc_info_map = dict(
-    ppid=0,
-    rss=1,
-    vms=2,
-    create_time=3,
-    nice=4,
-    num_threads=5,
-    status=6,
-    ttynr=7)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms'])
-# psutil.Process.memory_full_info()
-pfullmem = pmem
-# psutil.Process.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'system', 'idle', 'iowait'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    total, avail, free, pinned, inuse = cext.virtual_mem()
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, inuse, free)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    total, free, sin, sout = cext.swap_mem()
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system-wide CPU times as a named tuple"""
-    ret = cext.per_cpu_times()
-    return scputimes(*[sum(x) for x in zip(*ret)])
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples"""
-    ret = cext.per_cpu_times()
-    return [scputimes(*x) for x in ret]
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # mimic os.cpu_count() behavior
-        return None
-
-
-def cpu_count_physical():
-    cmd = "lsdev -Cc processor"
-    p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-    stdout, stderr = p.communicate()
-    if PY3:
-        stdout, stderr = [x.decode(sys.stdout.encoding)
-                          for x in (stdout, stderr)]
-    if p.returncode != 0:
-        raise RuntimeError("%r command error\n%s" % (cmd, stderr))
-    processors = stdout.strip().splitlines()
-    return len(processors) or None
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    ctx_switches, interrupts, soft_interrupts, syscalls = cext.cpu_stats()
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-disk_usage = _psposix.disk_usage
-
-
-def disk_partitions(all=False):
-    """Return system disk partitions."""
-    # TODO - the filtering logic should be better checked so that
-    # it tries to reflect 'df' as much as possible
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            # Differently from, say, Linux, we don't have a list of
-            # common fs types so the best we can do, AFAIK, is to
-            # filter by filesystem having a total size > 0.
-            if not disk_usage(mountpoint).total:
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_if_addrs = cext_posix.net_if_addrs
-
-if HAS_NET_IO_COUNTERS:
-    net_io_counters = cext.net_io_counters
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    """
-    cmap = _common.conn_tmap
-    if kind not in cmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in cmap])))
-    families, types = _common.conn_tmap[kind]
-    rawlist = cext.net_connections(_pid)
-    ret = []
-    for item in rawlist:
-        fd, fam, type_, laddr, raddr, status, pid = item
-        if fam not in families:
-            continue
-        if type_ not in types:
-            continue
-        nt = conn_to_ntuple(fd, fam, type_, laddr, raddr, status,
-                            TCP_STATUSES, pid=pid if _pid == -1 else None)
-        ret.append(nt)
-    return ret
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    duplex_map = {"Full": NIC_DUPLEX_FULL,
-                  "Half": NIC_DUPLEX_HALF}
-    names = set([x[0] for x in net_if_addrs()])
-    ret = {}
-    for name in names:
-        isup, mtu = cext.net_if_stats(name)
-
-        # try to get speed and duplex
-        # TODO: rewrite this in C (entstat forks, so use truss -f to follow.
-        # looks like it is using an undocumented ioctl?)
-        duplex = ""
-        speed = 0
-        p = subprocess.Popen(["/usr/bin/entstat", "-d", name],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if p.returncode == 0:
-            re_result = re.search(
-                r"Running: (\d+) Mbps.*?(\w+) Duplex", stdout)
-            if re_result is not None:
-                speed = int(re_result.group(1))
-                duplex = re_result.group(2)
-
-        duplex = duplex_map.get(duplex, NIC_DUPLEX_UNKNOWN)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    localhost = (':0.0', ':0')
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in localhost:
-            hostname = 'localhost'
-        nt = _common.suser(user, tty, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(get_procfs_path()) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix pid."""
-    return os.path.exists(os.path.join(get_procfs_path(), str(pid), "psinfo"))
-
-
-def wrap_exceptions(fun):
-    """Call callable into a try/except clause and translate ENOENT,
-    EACCES and EPERM in NoSuchProcess or AccessDenied exceptions.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except (FileNotFoundError, ProcessLookupError):
-            # ENOENT (no such file or directory) gets raised on open().
-            # ESRCH (no such process) can get raised on read() if
-            # process is gone in meantime.
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def oneshot_enter(self):
-        self._proc_basic_info.cache_activate(self)
-        self._proc_cred.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_basic_info.cache_deactivate(self)
-        self._proc_cred.cache_deactivate(self)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_basic_info(self):
-        return cext.proc_basic_info(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_cred(self):
-        return cext.proc_cred(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def name(self):
-        if self.pid == 0:
-            return "swapper"
-        # note: max 16 characters
-        return cext.proc_name(self.pid, self._procfs_path).rstrip("\x00")
-
-    @wrap_exceptions
-    def exe(self):
-        # there is no way to get executable path in AIX other than to guess,
-        # and guessing is more complex than what's in the wrapping class
-        cmdline = self.cmdline()
-        if not cmdline:
-            return ''
-        exe = cmdline[0]
-        if os.path.sep in exe:
-            # relative or absolute path
-            if not os.path.isabs(exe):
-                # if cwd has changed, we're out of luck - this may be wrong!
-                exe = os.path.abspath(os.path.join(self.cwd(), exe))
-            if (os.path.isabs(exe) and
-                    os.path.isfile(exe) and
-                    os.access(exe, os.X_OK)):
-                return exe
-            # not found, move to search in PATH using basename only
-            exe = os.path.basename(exe)
-        # search for exe name PATH
-        for path in os.environ["PATH"].split(":"):
-            possible_exe = os.path.abspath(os.path.join(path, exe))
-            if (os.path.isfile(possible_exe) and
-                    os.access(possible_exe, os.X_OK)):
-                return possible_exe
-        return ''
-
-    @wrap_exceptions
-    def cmdline(self):
-        return cext.proc_args(self.pid)
-
-    @wrap_exceptions
-    def environ(self):
-        return cext.proc_environ(self.pid)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._proc_basic_info()[proc_info_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_basic_info()[proc_info_map['num_threads']]
-
-    if HAS_THREADS:
-        @wrap_exceptions
-        def threads(self):
-            rawlist = cext.proc_threads(self.pid)
-            retlist = []
-            for thread_id, utime, stime in rawlist:
-                ntuple = _common.pthread(thread_id, utime, stime)
-                retlist.append(ntuple)
-            # The underlying C implementation retrieves all OS threads
-            # and filters them by PID.  At this point we can't tell whether
-            # an empty list means there were no connections for process or
-            # process is no longer active so we force NSP in case the PID
-            # is no longer there.
-            if not retlist:
-                # will raise NSP if process is gone
-                os.stat('%s/%s' % (self._procfs_path, self.pid))
-            return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = net_connections(kind, _pid=self.pid)
-        # The underlying C implementation retrieves all OS connections
-        # and filters them by PID.  At this point we can't tell whether
-        # an empty list means there were no connections for process or
-        # process is no longer active so we force NSP in case the PID
-        # is no longer there.
-        if not ret:
-            # will raise NSP if process is gone
-            os.stat('%s/%s' % (self._procfs_path, self.pid))
-        return ret
-
-    @wrap_exceptions
-    def nice_get(self):
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._proc_basic_info()[proc_info_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        real, effective, saved, _, _, _ = self._proc_cred()
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def gids(self):
-        _, _, _, real, effective, saved = self._proc_cred()
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def cpu_times(self):
-        cpu_times = cext.proc_cpu_times(self.pid, self._procfs_path)
-        return _common.pcputimes(*cpu_times)
-
-    @wrap_exceptions
-    def terminal(self):
-        ttydev = self._proc_basic_info()[proc_info_map['ttynr']]
-        # convert from 64-bit dev_t to 32-bit dev_t and then map the device
-        ttydev = (((ttydev & 0x0000FFFF00000000) >> 16) | (ttydev & 0xFFFF))
-        # try to match rdev of /dev/pts/* files ttydev
-        for dev in glob.glob("/dev/**/*"):
-            if os.stat(dev).st_rdev == ttydev:
-                return dev
-        return None
-
-    @wrap_exceptions
-    def cwd(self):
-        procfs_path = self._procfs_path
-        try:
-            result = os.readlink("%s/%s/cwd" % (procfs_path, self.pid))
-            return result.rstrip('/')
-        except FileNotFoundError:
-            os.stat("%s/%s" % (procfs_path, self.pid))  # raise NSP or AD
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        ret = self._proc_basic_info()
-        rss = ret[proc_info_map['rss']] * 1024
-        vms = ret[proc_info_map['vms']] * 1024
-        return pmem(rss, vms)
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def status(self):
-        code = self._proc_basic_info()[proc_info_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    def open_files(self):
-        # TODO rewrite without using procfiles (stat /proc/pid/fd/* and then
-        # find matching name of the inode)
-        p = subprocess.Popen(["/usr/bin/procfiles", "-n", str(self.pid)],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if "no such process" in stderr.lower():
-            raise NoSuchProcess(self.pid, self._name)
-        procfiles = re.findall(r"(\d+): S_IFREG.*\s*.*name:(.*)\n", stdout)
-        retlist = []
-        for fd, path in procfiles:
-            path = path.strip()
-            if path.startswith("//"):
-                path = path[1:]
-            if path.lower() == "cannot be retrieved":
-                continue
-            retlist.append(_common.popenfile(path, int(fd)))
-        return retlist
-
-    @wrap_exceptions
-    def num_fds(self):
-        if self.pid == 0:       # no /proc/0/fd
-            return 0
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        return _common.pctxsw(
-            *cext.proc_num_ctx_switches(self.pid))
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    if HAS_PROC_IO_COUNTERS:
-        @wrap_exceptions
-        def io_counters(self):
-            try:
-                rc, wc, rb, wb = cext.proc_io_counters(self.pid)
-            except OSError:
-                # if process is terminated, proc_io_counters returns OSError
-                # instead of NSP
-                if not pid_exists(self.pid):
-                    raise NoSuchProcess(self.pid, self._name)
-                raise
-            return _common.pio(rc, wc, rb, wb)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psbsd.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psbsd.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psbsd.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psbsd.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,903 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""FreeBSD, OpenBSD and NetBSD platforms implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-import xml.etree.ElementTree as ET
-from collections import namedtuple
-from collections import defaultdict
-
-from . import _common
-from . import _psposix
-from . import _psutil_bsd as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import FREEBSD
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NETBSD
-from ._common import NoSuchProcess
-from ._common import OPENBSD
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import which
-
-
-__extra__all__ = []
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-if FREEBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SRUN: _common.STATUS_RUNNING,
-        cext.SSLEEP: _common.STATUS_SLEEPING,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SWAIT: _common.STATUS_WAITING,
-        cext.SLOCK: _common.STATUS_LOCKED,
-    }
-elif OPENBSD or NETBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SSLEEP: _common.STATUS_SLEEPING,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        # According to /usr/include/sys/proc.h SZOMB is unused.
-        # test_zombie_process() shows that SDEAD is the right
-        # equivalent. Also it appears there's no equivalent of
-        # psutil.STATUS_DEAD. SDEAD really means STATUS_ZOMBIE.
-        # cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SDEAD: _common.STATUS_ZOMBIE,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        # From http://www.eecs.harvard.edu/~margo/cs161/videos/proc.h.txt
-        # OpenBSD has SRUN and SONPROC: SRUN indicates that a process
-        # is runnable but *not* yet running, i.e. is on a run queue.
-        # SONPROC indicates that the process is actually executing on
-        # a CPU, i.e. it is no longer on a run queue.
-        # As such we'll map SRUN to STATUS_WAKING and SONPROC to
-        # STATUS_RUNNING
-        cext.SRUN: _common.STATUS_WAKING,
-        cext.SONPROC: _common.STATUS_RUNNING,
-    }
-elif NETBSD:
-    PROC_STATUSES = {
-        cext.SIDL: _common.STATUS_IDLE,
-        cext.SACTIVE: _common.STATUS_RUNNING,
-        cext.SDYING: _common.STATUS_ZOMBIE,
-        cext.SSTOP: _common.STATUS_STOPPED,
-        cext.SZOMB: _common.STATUS_ZOMBIE,
-        cext.SDEAD: _common.STATUS_DEAD,
-        cext.SSUSPENDED: _common.STATUS_SUSPENDED,  # unique to NetBSD
-    }
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RECEIVED: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-if NETBSD:
-    PAGESIZE = os.sysconf("SC_PAGESIZE")
-else:
-    PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-AF_LINK = cext_posix.AF_LINK
-
-HAS_PER_CPU_TIMES = hasattr(cext, "per_cpu_times")
-HAS_PROC_NUM_THREADS = hasattr(cext, "proc_num_threads")
-HAS_PROC_OPEN_FILES = hasattr(cext, 'proc_open_files')
-HAS_PROC_NUM_FDS = hasattr(cext, 'proc_num_fds')
-
-kinfo_proc_map = dict(
-    ppid=0,
-    status=1,
-    real_uid=2,
-    effective_uid=3,
-    saved_uid=4,
-    real_gid=5,
-    effective_gid=6,
-    saved_gid=7,
-    ttynr=8,
-    create_time=9,
-    ctx_switches_vol=10,
-    ctx_switches_unvol=11,
-    read_io_count=12,
-    write_io_count=13,
-    user_time=14,
-    sys_time=15,
-    ch_user_time=16,
-    ch_sys_time=17,
-    rss=18,
-    vms=19,
-    memtext=20,
-    memdata=21,
-    memstack=22,
-    cpunum=23,
-    name=24,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'buffers', 'cached', 'shared', 'wired'])
-# psutil.cpu_times()
-scputimes = namedtuple(
-    'scputimes', ['user', 'nice', 'system', 'idle', 'irq'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms', 'text', 'data', 'stack'])
-# psutil.Process.memory_full_info()
-pfullmem = pmem
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple(
-    'pmmap_grouped', 'path rss, private, ref_count, shadow_count')
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr, perms path rss, private, ref_count, shadow_count')
-# psutil.disk_io_counters()
-if FREEBSD:
-    sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                     'read_bytes', 'write_bytes',
-                                     'read_time', 'write_time',
-                                     'busy_time'])
-else:
-    sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
-                                     'read_bytes', 'write_bytes'])
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    mem = cext.virtual_mem()
-    total, free, active, inactive, wired, cached, buffers, shared = mem
-    if NETBSD:
-        # On NetBSD buffers and shared mem is determined via /proc.
-        # The C ext set them to 0.
-        with open('/proc/meminfo', 'rb') as f:
-            for line in f:
-                if line.startswith(b'Buffers:'):
-                    buffers = int(line.split()[1]) * 1024
-                elif line.startswith(b'MemShared:'):
-                    shared = int(line.split()[1]) * 1024
-    avail = inactive + cached + free
-    used = active + wired + cached
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, buffers, cached, shared, wired)
-
-
-def swap_memory():
-    """System swap memory as (total, used, free, sin, sout) namedtuple."""
-    total, used, free, sin, sout = cext.swap_mem()
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system per-CPU times as a namedtuple"""
-    user, nice, system, idle, irq = cext.cpu_times()
-    return scputimes(user, nice, system, idle, irq)
-
-
-if HAS_PER_CPU_TIMES:
-    def per_cpu_times():
-        """Return system CPU times as a namedtuple"""
-        ret = []
-        for cpu_t in cext.per_cpu_times():
-            user, nice, system, idle, irq = cpu_t
-            item = scputimes(user, nice, system, idle, irq)
-            ret.append(item)
-        return ret
-else:
-    # XXX
-    # Ok, this is very dirty.
-    # On FreeBSD < 8 we cannot gather per-cpu information, see:
-    # https://github.com/giampaolo/psutil/issues/226
-    # If num cpus > 1, on first call we return single cpu times to avoid a
-    # crash at psutil import time.
-    # Next calls will fail with NotImplementedError
-    def per_cpu_times():
-        """Return system CPU times as a namedtuple"""
-        if cpu_count_logical() == 1:
-            return [cpu_times()]
-        if per_cpu_times.__called__:
-            raise NotImplementedError("supported only starting from FreeBSD 8")
-        per_cpu_times.__called__ = True
-        return [cpu_times()]
-
-    per_cpu_times.__called__ = False
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-if OPENBSD or NETBSD:
-    def cpu_count_physical():
-        # OpenBSD and NetBSD do not implement this.
-        return 1 if cpu_count_logical() == 1 else None
-else:
-    def cpu_count_physical():
-        """Return the number of physical CPUs in the system."""
-        # From the C module we'll get an XML string similar to this:
-        # http://manpages.ubuntu.com/manpages/precise/man4/smp.4freebsd.html
-        # We may get None in case "sysctl kern.sched.topology_spec"
-        # is not supported on this BSD version, in which case we'll mimic
-        # os.cpu_count() and return None.
-        ret = None
-        s = cext.cpu_count_phys()
-        if s is not None:
-            # get rid of padding chars appended at the end of the string
-            index = s.rfind("</groups>")
-            if index != -1:
-                s = s[:index + 9]
-                root = ET.fromstring(s)
-                try:
-                    ret = len(root.findall('group/children/group/cpu')) or None
-                finally:
-                    # needed otherwise it will memleak
-                    root.clear()
-        if not ret:
-            # If logical CPUs are 1 it's obvious we'll have only 1
-            # physical CPU.
-            if cpu_count_logical() == 1:
-                return 1
-        return ret
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    if FREEBSD:
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps.
-        ctxsw, intrs, soft_intrs, syscalls, traps = cext.cpu_stats()
-    elif NETBSD:
-        # XXX
-        # Note about intrs: the C extension returns 0. intrs
-        # can be determined via /proc/stat; it has the same value as
-        # soft_intrs thought so the kernel is faking it (?).
-        #
-        # Note about syscalls: the C extension always sets it to 0 (?).
-        #
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps, faults and forks.
-        ctxsw, intrs, soft_intrs, syscalls, traps, faults, forks = \
-            cext.cpu_stats()
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'intr'):
-                    intrs = int(line.split()[1])
-    elif OPENBSD:
-        # Note: the C ext is returning some metrics we are not exposing:
-        # traps, faults and forks.
-        ctxsw, intrs, soft_intrs, syscalls, traps, faults, forks = \
-            cext.cpu_stats()
-    return _common.scpustats(ctxsw, intrs, soft_intrs, syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples.
-    'all' argument is ignored, see:
-    https://github.com/giampaolo/psutil/issues/906
-    """
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-disk_usage = _psposix.disk_usage
-disk_io_counters = cext.disk_io_counters
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext_posix.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            if hasattr(_common, 'NicDuplex'):
-                duplex = _common.NicDuplex(duplex)
-            ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-def net_connections(kind):
-    """System-wide network connections."""
-    if OPENBSD:
-        ret = []
-        for pid in pids():
-            try:
-                cons = Process(pid).connections(kind)
-            except (NoSuchProcess, ZombieProcess):
-                continue
-            else:
-                for conn in cons:
-                    conn = list(conn)
-                    conn.append(pid)
-                    ret.append(_common.sconn(*conn))
-        return ret
-
-    if kind not in _common.conn_tmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in conn_tmap])))
-    families, types = conn_tmap[kind]
-    ret = set()
-    if NETBSD:
-        rawlist = cext.net_connections(-1)
-    else:
-        rawlist = cext.net_connections()
-    for item in rawlist:
-        fd, fam, type, laddr, raddr, status, pid = item
-        # TODO: apply filter at C level
-        if fam in families and type in types:
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES, pid)
-            ret.add(nt)
-    return list(ret)
-
-
-# =====================================================================
-#  --- sensors
-# =====================================================================
-
-
-if FREEBSD:
-
-    def sensors_battery():
-        """Return battery info."""
-        try:
-            percent, minsleft, power_plugged = cext.sensors_battery()
-        except NotImplementedError:
-            # See: https://github.com/giampaolo/psutil/issues/1074
-            return None
-        power_plugged = power_plugged == 1
-        if power_plugged:
-            secsleft = _common.POWER_TIME_UNLIMITED
-        elif minsleft == -1:
-            secsleft = _common.POWER_TIME_UNKNOWN
-        else:
-            secsleft = minsleft * 60
-        return _common.sbattery(percent, secsleft, power_plugged)
-
-    def sensors_temperatures():
-        "Return CPU cores temperatures if available, else an empty dict."
-        ret = defaultdict(list)
-        num_cpus = cpu_count_logical()
-        for cpu in range(num_cpus):
-            try:
-                current, high = cext.sensors_cpu_temperature(cpu)
-                if high <= 0:
-                    high = None
-                name = "Core %s" % cpu
-                ret["coretemp"].append(
-                    _common.shwtemp(name, current, high, high))
-            except NotImplementedError:
-                pass
-
-        return ret
-
-    def cpu_freq():
-        """Return frequency metrics for CPUs. As of Dec 2018 only
-        CPU 0 appears to be supported by FreeBSD and all other cores
-        match the frequency of CPU 0.
-        """
-        ret = []
-        num_cpus = cpu_count_logical()
-        for cpu in range(num_cpus):
-            try:
-                current, available_freq = cext.cpu_frequency(cpu)
-            except NotImplementedError:
-                continue
-            if available_freq:
-                try:
-                    min_freq = int(available_freq.split(" ")[-1].split("/")[0])
-                except(IndexError, ValueError):
-                    min_freq = None
-                try:
-                    max_freq = int(available_freq.split(" ")[0].split("/")[0])
-                except(IndexError, ValueError):
-                    max_freq = None
-            ret.append(_common.scpufreq(current, min_freq, max_freq))
-        return ret
-
-
-# =====================================================================
-#  --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, pid = item
-        if pid == -1:
-            assert OPENBSD
-            pid = None
-        if tty == '~':
-            continue  # reboot or shutdown
-        nt = _common.suser(user, tty or None, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-@memoize
-def _pid_0_exists():
-    try:
-        Process(0).name()
-    except NoSuchProcess:
-        return False
-    except AccessDenied:
-        return True
-    else:
-        return True
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    ret = cext.pids()
-    if OPENBSD and (0 not in ret) and _pid_0_exists():
-        # On OpenBSD the kernel does not return PID 0 (neither does
-        # ps) but it's actually querable (Process(0) will succeed).
-        ret.insert(0, 0)
-    return ret
-
-
-if OPENBSD or NETBSD:
-    def pid_exists(pid):
-        """Return True if pid exists."""
-        exists = _psposix.pid_exists(pid)
-        if not exists:
-            # We do this because _psposix.pid_exists() lies in case of
-            # zombie processes.
-            return pid in pids()
-        else:
-            return True
-else:
-    pid_exists = _psposix.pid_exists
-
-
-def is_zombie(pid):
-    try:
-        st = cext.proc_oneshot_info(pid)[kinfo_proc_map['status']]
-        return st == cext.SZOMB
-    except Exception:
-        return False
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError exceptions into
-    NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except ProcessLookupError:
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except OSError:
-            if self.pid == 0:
-                if 0 in pids():
-                    raise AccessDenied(self.pid, self._name)
-                else:
-                    raise
-            raise
-    return wrapper
-
-
-@contextlib.contextmanager
-def wrap_exceptions_procfs(inst):
-    """Same as above, for routines relying on reading /proc fs."""
-    try:
-        yield
-    except (ProcessLookupError, FileNotFoundError):
-        # ENOENT (no such file or directory) gets raised on open().
-        # ESRCH (no such process) can get raised on read() if
-        # process is gone in meantime.
-        if not pid_exists(inst.pid):
-            raise NoSuchProcess(inst.pid, inst._name)
-        else:
-            raise ZombieProcess(inst.pid, inst._name, inst._ppid)
-    except PermissionError:
-        raise AccessDenied(inst.pid, inst._name)
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def oneshot(self):
-        """Retrieves multiple process info in one shot as a raw tuple."""
-        ret = cext.proc_oneshot_info(self.pid)
-        assert len(ret) == len(kinfo_proc_map)
-        return ret
-
-    def oneshot_enter(self):
-        self.oneshot.cache_activate(self)
-
-    def oneshot_exit(self):
-        self.oneshot.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self.oneshot()[kinfo_proc_map['name']]
-        return name if name is not None else cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    def exe(self):
-        if FREEBSD:
-            if self.pid == 0:
-                return ''  # else NSP
-            return cext.proc_exe(self.pid)
-        elif NETBSD:
-            if self.pid == 0:
-                # /proc/0 dir exists but /proc/0/exe doesn't
-                return ""
-            with wrap_exceptions_procfs(self):
-                return os.readlink("/proc/%s/exe" % self.pid)
-        else:
-            # OpenBSD: exe cannot be determined; references:
-            # https://chromium.googlesource.com/chromium/src/base/+/
-            #     master/base_paths_posix.cc
-            # We try our best guess by using which against the first
-            # cmdline arg (may return None).
-            cmdline = self.cmdline()
-            if cmdline:
-                return which(cmdline[0]) or ""
-            else:
-                return ""
-
-    @wrap_exceptions
-    def cmdline(self):
-        if OPENBSD and self.pid == 0:
-            return []  # ...else it crashes
-        elif NETBSD:
-            # XXX - most of the times the underlying sysctl() call on Net
-            # and Open BSD returns a truncated string.
-            # Also /proc/pid/cmdline behaves the same so it looks
-            # like this is a kernel bug.
-            try:
-                return cext.proc_cmdline(self.pid)
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    if is_zombie(self.pid):
-                        raise ZombieProcess(self.pid, self._name, self._ppid)
-                    elif not pid_exists(self.pid):
-                        raise NoSuchProcess(self.pid, self._name, self._ppid)
-                    else:
-                        # XXX: this happens with unicode tests. It means the C
-                        # routine is unable to decode invalid unicode chars.
-                        return []
-                else:
-                    raise
-        else:
-            return cext.proc_cmdline(self.pid)
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = self.oneshot()[kinfo_proc_map['ttynr']]
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self.oneshot()[kinfo_proc_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        rawtuple = self.oneshot()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['real_uid']],
-            rawtuple[kinfo_proc_map['effective_uid']],
-            rawtuple[kinfo_proc_map['saved_uid']])
-
-    @wrap_exceptions
-    def gids(self):
-        rawtuple = self.oneshot()
-        return _common.pgids(
-            rawtuple[kinfo_proc_map['real_gid']],
-            rawtuple[kinfo_proc_map['effective_gid']],
-            rawtuple[kinfo_proc_map['saved_gid']])
-
-    @wrap_exceptions
-    def cpu_times(self):
-        rawtuple = self.oneshot()
-        return _common.pcputimes(
-            rawtuple[kinfo_proc_map['user_time']],
-            rawtuple[kinfo_proc_map['sys_time']],
-            rawtuple[kinfo_proc_map['ch_user_time']],
-            rawtuple[kinfo_proc_map['ch_sys_time']])
-
-    if FREEBSD:
-        @wrap_exceptions
-        def cpu_num(self):
-            return self.oneshot()[kinfo_proc_map['cpunum']]
-
-    @wrap_exceptions
-    def memory_info(self):
-        rawtuple = self.oneshot()
-        return pmem(
-            rawtuple[kinfo_proc_map['rss']],
-            rawtuple[kinfo_proc_map['vms']],
-            rawtuple[kinfo_proc_map['memtext']],
-            rawtuple[kinfo_proc_map['memdata']],
-            rawtuple[kinfo_proc_map['memstack']])
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def create_time(self):
-        return self.oneshot()[kinfo_proc_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        if HAS_PROC_NUM_THREADS:
-            # FreeBSD
-            return cext.proc_num_threads(self.pid)
-        else:
-            return len(self.threads())
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        rawtuple = self.oneshot()
-        return _common.pctxsw(
-            rawtuple[kinfo_proc_map['ctx_switches_vol']],
-            rawtuple[kinfo_proc_map['ctx_switches_unvol']])
-
-    @wrap_exceptions
-    def threads(self):
-        # Note: on OpenSBD this (/dev/mem) requires root access.
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        if OPENBSD:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        if kind not in conn_tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in conn_tmap])))
-
-        if NETBSD:
-            families, types = conn_tmap[kind]
-            ret = []
-            rawlist = cext.net_connections(self.pid)
-            for item in rawlist:
-                fd, fam, type, laddr, raddr, status, pid = item
-                assert pid == self.pid
-                if fam in families and type in types:
-                    nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                        TCP_STATUSES)
-                    ret.append(nt)
-            self._assert_alive()
-            return list(ret)
-
-        families, types = conn_tmap[kind]
-        rawlist = cext.proc_connections(self.pid, families, types)
-        ret = []
-        for item in rawlist:
-            fd, fam, type, laddr, raddr, status = item
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES)
-            ret.append(nt)
-
-        if OPENBSD:
-            self._assert_alive()
-
-        return ret
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def nice_get(self):
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def status(self):
-        code = self.oneshot()[kinfo_proc_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def io_counters(self):
-        rawtuple = self.oneshot()
-        return _common.pio(
-            rawtuple[kinfo_proc_map['read_io_count']],
-            rawtuple[kinfo_proc_map['write_io_count']],
-            -1,
-            -1)
-
-    @wrap_exceptions
-    def cwd(self):
-        """Return process current working directory."""
-        # sometimes we get an empty string, in which case we turn
-        # it into None
-        if OPENBSD and self.pid == 0:
-            return None  # ...else it would raise EINVAL
-        elif NETBSD or HAS_PROC_OPEN_FILES:
-            # FreeBSD < 8 does not support functions based on
-            # kinfo_getfile() and kinfo_getvmmap()
-            return cext.proc_cwd(self.pid) or None
-        else:
-            raise NotImplementedError(
-                "supported only starting from FreeBSD 8" if
-                FREEBSD else "")
-
-    nt_mmap_grouped = namedtuple(
-        'mmap', 'path rss, private, ref_count, shadow_count')
-    nt_mmap_ext = namedtuple(
-        'mmap', 'addr, perms path rss, private, ref_count, shadow_count')
-
-    def _not_implemented(self):
-        raise NotImplementedError
-
-    # FreeBSD < 8 does not support functions based on kinfo_getfile()
-    # and kinfo_getvmmap()
-    if HAS_PROC_OPEN_FILES:
-        @wrap_exceptions
-        def open_files(self):
-            """Return files opened by process as a list of namedtuples."""
-            rawlist = cext.proc_open_files(self.pid)
-            return [_common.popenfile(path, fd) for path, fd in rawlist]
-    else:
-        open_files = _not_implemented
-
-    # FreeBSD < 8 does not support functions based on kinfo_getfile()
-    # and kinfo_getvmmap()
-    if HAS_PROC_NUM_FDS:
-        @wrap_exceptions
-        def num_fds(self):
-            """Return the number of file descriptors opened by this process."""
-            ret = cext.proc_num_fds(self.pid)
-            if NETBSD:
-                self._assert_alive()
-            return ret
-    else:
-        num_fds = _not_implemented
-
-    # --- FreeBSD only APIs
-
-    if FREEBSD:
-
-        @wrap_exceptions
-        def cpu_affinity_get(self):
-            return cext.proc_cpu_affinity_get(self.pid)
-
-        @wrap_exceptions
-        def cpu_affinity_set(self, cpus):
-            # Pre-emptively check if CPUs are valid because the C
-            # function has a weird behavior in case of invalid CPUs,
-            # see: https://github.com/giampaolo/psutil/issues/586
-            allcpus = tuple(range(len(per_cpu_times())))
-            for cpu in cpus:
-                if cpu not in allcpus:
-                    raise ValueError("invalid CPU #%i (choose between %s)"
-                                     % (cpu, allcpus))
-            try:
-                cext.proc_cpu_affinity_set(self.pid, cpus)
-            except OSError as err:
-                # 'man cpuset_setaffinity' about EDEADLK:
-                # <<the call would leave a thread without a valid CPU to run
-                # on because the set does not overlap with the thread's
-                # anonymous mask>>
-                if err.errno in (errno.EINVAL, errno.EDEADLK):
-                    for cpu in cpus:
-                        if cpu not in allcpus:
-                            raise ValueError(
-                                "invalid CPU #%i (choose between %s)" % (
-                                    cpu, allcpus))
-                raise
-
-        @wrap_exceptions
-        def memory_maps(self):
-            return cext.proc_memory_maps(self.pid)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pslinux.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pslinux.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pslinux.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pslinux.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2095 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Linux platform implementation."""
-
-from __future__ import division
-
-import base64
-import collections
-import errno
-import functools
-import glob
-import os
-import re
-import socket
-import struct
-import sys
-import traceback
-import warnings
-from collections import defaultdict
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_linux as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import debug
-from ._common import decode
-from ._common import get_procfs_path
-from ._common import isfile_strict
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NIC_DUPLEX_FULL
-from ._common import NIC_DUPLEX_HALF
-from ._common import NIC_DUPLEX_UNKNOWN
-from ._common import NoSuchProcess
-from ._common import open_binary
-from ._common import open_text
-from ._common import parse_environ_block
-from ._common import path_exists_strict
-from ._common import supports_ipv6
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import b
-from ._compat import basestring
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-__extra__all__ = [
-    #
-    'PROCFS_PATH',
-    # io prio constants
-    "IOPRIO_CLASS_NONE", "IOPRIO_CLASS_RT", "IOPRIO_CLASS_BE",
-    "IOPRIO_CLASS_IDLE",
-    # connection status constants
-    "CONN_ESTABLISHED", "CONN_SYN_SENT", "CONN_SYN_RECV", "CONN_FIN_WAIT1",
-    "CONN_FIN_WAIT2", "CONN_TIME_WAIT", "CONN_CLOSE", "CONN_CLOSE_WAIT",
-    "CONN_LAST_ACK", "CONN_LISTEN", "CONN_CLOSING", ]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-POWER_SUPPLY_PATH = "/sys/class/power_supply"
-HAS_SMAPS = os.path.exists('/proc/%s/smaps' % os.getpid())
-HAS_PRLIMIT = hasattr(cext, "linux_prlimit")
-HAS_PROC_IO_PRIORITY = hasattr(cext, "proc_ioprio_get")
-HAS_CPU_AFFINITY = hasattr(cext, "proc_cpu_affinity_get")
-_DEFAULT = object()
-
-# RLIMIT_* constants, not guaranteed to be present on all kernels
-if HAS_PRLIMIT:
-    for name in dir(cext):
-        if name.startswith('RLIM'):
-            __extra__all__.append(name)
-
-# Number of clock ticks per second
-CLOCK_TICKS = os.sysconf("SC_CLK_TCK")
-PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-BOOT_TIME = None  # set later
-# Used when reading "big" files, namely /proc/{pid}/smaps and /proc/net/*.
-# On Python 2, using a buffer with open() for such files may result in a
-# speedup, see: https://github.com/giampaolo/psutil/issues/708
-BIGFILE_BUFFERING = -1 if PY3 else 8192
-LITTLE_ENDIAN = sys.byteorder == 'little'
-
-# "man iostat" states that sectors are equivalent with blocks and have
-# a size of 512 bytes. Despite this value can be queried at runtime
-# via /sys/block/{DISK}/queue/hw_sector_size and results may vary
-# between 1k, 2k, or 4k... 512 appears to be a magic constant used
-# throughout Linux source code:
-# * https://stackoverflow.com/a/38136179/376587
-# * https://lists.gt.net/linux/kernel/2241060
-# * https://github.com/giampaolo/psutil/issues/1305
-# * https://github.com/torvalds/linux/blob/
-#     4f671fe2f9523a1ea206f63fe60a7c7b3a56d5c7/include/linux/bio.h#L99
-# * https://lkml.org/lkml/2015/8/17/234
-DISK_SECTOR_SIZE = 512
-
-if enum is None:
-    AF_LINK = socket.AF_PACKET
-else:
-    AddressFamily = enum.IntEnum('AddressFamily',
-                                 {'AF_LINK': int(socket.AF_PACKET)})
-    AF_LINK = AddressFamily.AF_LINK
-
-# ioprio_* constants http://linux.die.net/man/2/ioprio_get
-if enum is None:
-    IOPRIO_CLASS_NONE = 0
-    IOPRIO_CLASS_RT = 1
-    IOPRIO_CLASS_BE = 2
-    IOPRIO_CLASS_IDLE = 3
-else:
-    class IOPriority(enum.IntEnum):
-        IOPRIO_CLASS_NONE = 0
-        IOPRIO_CLASS_RT = 1
-        IOPRIO_CLASS_BE = 2
-        IOPRIO_CLASS_IDLE = 3
-
-    globals().update(IOPriority.__members__)
-
-# See:
-# https://github.com/torvalds/linux/blame/master/fs/proc/array.c
-# ...and (TASK_* constants):
-# https://github.com/torvalds/linux/blob/master/include/linux/sched.h
-PROC_STATUSES = {
-    "R": _common.STATUS_RUNNING,
-    "S": _common.STATUS_SLEEPING,
-    "D": _common.STATUS_DISK_SLEEP,
-    "T": _common.STATUS_STOPPED,
-    "t": _common.STATUS_TRACING_STOP,
-    "Z": _common.STATUS_ZOMBIE,
-    "X": _common.STATUS_DEAD,
-    "x": _common.STATUS_DEAD,
-    "K": _common.STATUS_WAKE_KILL,
-    "W": _common.STATUS_WAKING,
-    "I": _common.STATUS_IDLE,
-    "P": _common.STATUS_PARKED,
-}
-
-# https://github.com/torvalds/linux/blob/master/include/net/tcp_states.h
-TCP_STATUSES = {
-    "01": _common.CONN_ESTABLISHED,
-    "02": _common.CONN_SYN_SENT,
-    "03": _common.CONN_SYN_RECV,
-    "04": _common.CONN_FIN_WAIT1,
-    "05": _common.CONN_FIN_WAIT2,
-    "06": _common.CONN_TIME_WAIT,
-    "07": _common.CONN_CLOSE,
-    "08": _common.CONN_CLOSE_WAIT,
-    "09": _common.CONN_LAST_ACK,
-    "0A": _common.CONN_LISTEN,
-    "0B": _common.CONN_CLOSING
-}
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'buffers', 'cached', 'shared', 'slab'])
-# psutil.disk_io_counters()
-sdiskio = namedtuple(
-    'sdiskio', ['read_count', 'write_count',
-                'read_bytes', 'write_bytes',
-                'read_time', 'write_time',
-                'read_merged_count', 'write_merged_count',
-                'busy_time'])
-# psutil.Process().open_files()
-popenfile = namedtuple(
-    'popenfile', ['path', 'fd', 'position', 'mode', 'flags'])
-# psutil.Process().memory_info()
-pmem = namedtuple('pmem', 'rss vms shared text lib data dirty')
-# psutil.Process().memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', 'pss', 'swap'))
-# psutil.Process().memory_maps(grouped=True)
-pmmap_grouped = namedtuple(
-    'pmmap_grouped',
-    ['path', 'rss', 'size', 'pss', 'shared_clean', 'shared_dirty',
-     'private_clean', 'private_dirty', 'referenced', 'anonymous', 'swap'])
-# psutil.Process().memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes',
-                         'read_chars', 'write_chars'])
-# psutil.Process.cpu_times()
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system',
-                        'iowait'])
-
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-def readlink(path):
-    """Wrapper around os.readlink()."""
-    assert isinstance(path, basestring), path
-    path = os.readlink(path)
-    # readlink() might return paths containing null bytes ('\x00')
-    # resulting in "TypeError: must be encoded string without NULL
-    # bytes, not str" errors when the string is passed to other
-    # fs-related functions (os.*, open(), ...).
-    # Apparently everything after '\x00' is garbage (we can have
-    # ' (deleted)', 'new' and possibly others), see:
-    # https://github.com/giampaolo/psutil/issues/717
-    path = path.split('\x00')[0]
-    # Certain paths have ' (deleted)' appended. Usually this is
-    # bogus as the file actually exists. Even if it doesn't we
-    # don't care.
-    if path.endswith(' (deleted)') and not path_exists_strict(path):
-        path = path[:-10]
-    return path
-
-
-def file_flags_to_mode(flags):
-    """Convert file's open() flags into a readable string.
-    Used by Process.open_files().
-    """
-    modes_map = {os.O_RDONLY: 'r', os.O_WRONLY: 'w', os.O_RDWR: 'w+'}
-    mode = modes_map[flags & (os.O_RDONLY | os.O_WRONLY | os.O_RDWR)]
-    if flags & os.O_APPEND:
-        mode = mode.replace('w', 'a', 1)
-    mode = mode.replace('w+', 'r+')
-    # possible values: r, w, a, r+, a+
-    return mode
-
-
-def is_storage_device(name):
-    """Return True if the given name refers to a root device (e.g.
-    "sda", "nvme0n1") as opposed to a logical partition (e.g.  "sda1",
-    "nvme0n1p1"). If name is a virtual device (e.g. "loop1", "ram")
-    return True.
-    """
-    # Readapted from iostat source code, see:
-    # https://github.com/sysstat/sysstat/blob/
-    #     97912938cd476645b267280069e83b1c8dc0e1c7/common.c#L208
-    # Some devices may have a slash in their name (e.g. cciss/c0d0...).
-    name = name.replace('/', '!')
-    including_virtual = True
-    if including_virtual:
-        path = "/sys/block/%s" % name
-    else:
-        path = "/sys/block/%s/device" % name
-    return os.access(path, os.F_OK)
-
-
-@memoize
-def set_scputimes_ntuple(procfs_path):
-    """Set a namedtuple of variable fields depending on the CPU times
-    available on this Linux kernel version which may be:
-    (user, nice, system, idle, iowait, irq, softirq, [steal, [guest,
-     [guest_nice]]])
-    Used by cpu_times() function.
-    """
-    global scputimes
-    with open_binary('%s/stat' % procfs_path) as f:
-        values = f.readline().split()[1:]
-    fields = ['user', 'nice', 'system', 'idle', 'iowait', 'irq', 'softirq']
-    vlen = len(values)
-    if vlen >= 8:
-        # Linux >= 2.6.11
-        fields.append('steal')
-    if vlen >= 9:
-        # Linux >= 2.6.24
-        fields.append('guest')
-    if vlen >= 10:
-        # Linux >= 3.2.0
-        fields.append('guest_nice')
-    scputimes = namedtuple('scputimes', fields)
-
-
-def cat(fname, fallback=_DEFAULT, binary=True):
-    """Return file content.
-    fallback: the value returned in case the file does not exist or
-              cannot be read
-    binary: whether to open the file in binary or text mode.
-    """
-    try:
-        with open_binary(fname) if binary else open_text(fname) as f:
-            return f.read().strip()
-    except (IOError, OSError):
-        if fallback is not _DEFAULT:
-            return fallback
-        else:
-            raise
-
-
-try:
-    set_scputimes_ntuple("/proc")
-except Exception:
-    # Don't want to crash at import time.
-    traceback.print_exc()
-    scputimes = namedtuple('scputimes', 'user system idle')(0.0, 0.0, 0.0)
-
-
-# =====================================================================
-# --- system memory
-# =====================================================================
-
-
-def calculate_avail_vmem(mems):
-    """Fallback for kernels < 3.14 where /proc/meminfo does not provide
-    "MemAvailable:" column, see:
-    https://blog.famzah.net/2014/09/24/
-    This code reimplements the algorithm outlined here:
-    https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
-        commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-
-    XXX: on recent kernels this calculation differs by ~1.5% than
-    "MemAvailable:" as it's calculated slightly differently, see:
-    https://gitlab.com/procps-ng/procps/issues/42
-    https://github.com/famzah/linux-memavailable-procfs/issues/2
-    It is still way more realistic than doing (free + cached) though.
-    """
-    # Fallback for very old distros. According to
-    # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
-    #     commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-    # ...long ago "avail" was calculated as (free + cached).
-    # We might fallback in such cases:
-    # "Active(file)" not available: 2.6.28 / Dec 2008
-    # "Inactive(file)" not available: 2.6.28 / Dec 2008
-    # "SReclaimable:" not available: 2.6.19 / Nov 2006
-    # /proc/zoneinfo not available: 2.6.13 / Aug 2005
-    free = mems[b'MemFree:']
-    fallback = free + mems.get(b"Cached:", 0)
-    try:
-        lru_active_file = mems[b'Active(file):']
-        lru_inactive_file = mems[b'Inactive(file):']
-        slab_reclaimable = mems[b'SReclaimable:']
-    except KeyError:
-        return fallback
-    try:
-        f = open_binary('%s/zoneinfo' % get_procfs_path())
-    except IOError:
-        return fallback  # kernel 2.6.13
-
-    watermark_low = 0
-    with f:
-        for line in f:
-            line = line.strip()
-            if line.startswith(b'low'):
-                watermark_low += int(line.split()[1])
-    watermark_low *= PAGESIZE
-    watermark_low = watermark_low
-
-    avail = free - watermark_low
-    pagecache = lru_active_file + lru_inactive_file
-    pagecache -= min(pagecache / 2, watermark_low)
-    avail += pagecache
-    avail += slab_reclaimable - min(slab_reclaimable / 2.0, watermark_low)
-    return int(avail)
-
-
-def virtual_memory():
-    """Report virtual memory stats.
-    This implementation matches "free" and "vmstat -s" cmdline
-    utility values and procps-ng-3.3.12 source was used as a reference
-    (2016-09-18):
-    https://gitlab.com/procps-ng/procps/blob/
-        24fd2605c51fccc375ab0287cec33aa767f06718/proc/sysinfo.c
-    For reference, procps-ng-3.3.10 is the version available on Ubuntu
-    16.04.
-
-    Note about "available" memory: up until psutil 4.3 it was
-    calculated as "avail = (free + buffers + cached)". Now
-    "MemAvailable:" column (kernel 3.14) from /proc/meminfo is used as
-    it's more accurate.
-    That matches "available" column in newer versions of "free".
-    """
-    missing_fields = []
-    mems = {}
-    with open_binary('%s/meminfo' % get_procfs_path()) as f:
-        for line in f:
-            fields = line.split()
-            mems[fields[0]] = int(fields[1]) * 1024
-
-    # /proc doc states that the available fields in /proc/meminfo vary
-    # by architecture and compile options, but these 3 values are also
-    # returned by sysinfo(2); as such we assume they are always there.
-    total = mems[b'MemTotal:']
-    free = mems[b'MemFree:']
-    try:
-        buffers = mems[b'Buffers:']
-    except KeyError:
-        # https://github.com/giampaolo/psutil/issues/1010
-        buffers = 0
-        missing_fields.append('buffers')
-    try:
-        cached = mems[b"Cached:"]
-    except KeyError:
-        cached = 0
-        missing_fields.append('cached')
-    else:
-        # "free" cmdline utility sums reclaimable to cached.
-        # Older versions of procps used to add slab memory instead.
-        # This got changed in:
-        # https://gitlab.com/procps-ng/procps/commit/
-        #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-        cached += mems.get(b"SReclaimable:", 0)  # since kernel 2.6.19
-
-    try:
-        shared = mems[b'Shmem:']  # since kernel 2.6.32
-    except KeyError:
-        try:
-            shared = mems[b'MemShared:']  # kernels 2.4
-        except KeyError:
-            shared = 0
-            missing_fields.append('shared')
-
-    try:
-        active = mems[b"Active:"]
-    except KeyError:
-        active = 0
-        missing_fields.append('active')
-
-    try:
-        inactive = mems[b"Inactive:"]
-    except KeyError:
-        try:
-            inactive = \
-                mems[b"Inact_dirty:"] + \
-                mems[b"Inact_clean:"] + \
-                mems[b"Inact_laundry:"]
-        except KeyError:
-            inactive = 0
-            missing_fields.append('inactive')
-
-    try:
-        slab = mems[b"Slab:"]
-    except KeyError:
-        slab = 0
-
-    used = total - free - cached - buffers
-    if used < 0:
-        # May be symptomatic of running within a LCX container where such
-        # values will be dramatically distorted over those of the host.
-        used = total - free
-
-    # - starting from 4.4.0 we match free's "available" column.
-    #   Before 4.4.0 we calculated it as (free + buffers + cached)
-    #   which matched htop.
-    # - free and htop available memory differs as per:
-    #   http://askubuntu.com/a/369589
-    #   http://unix.stackexchange.com/a/65852/168884
-    # - MemAvailable has been introduced in kernel 3.14
-    try:
-        avail = mems[b'MemAvailable:']
-    except KeyError:
-        avail = calculate_avail_vmem(mems)
-
-    if avail < 0:
-        avail = 0
-        missing_fields.append('available')
-
-    # If avail is greater than total or our calculation overflows,
-    # that's symptomatic of running within a LCX container where such
-    # values will be dramatically distorted over those of the host.
-    # https://gitlab.com/procps-ng/procps/blob/
-    #     24fd2605c51fccc375ab0287cec33aa767f06718/proc/sysinfo.c#L764
-    if avail > total:
-        avail = free
-
-    percent = usage_percent((total - avail), total, round_=1)
-
-    # Warn about missing metrics which are set to 0.
-    if missing_fields:
-        msg = "%s memory stats couldn't be determined and %s set to 0" % (
-            ", ".join(missing_fields),
-            "was" if len(missing_fields) == 1 else "were")
-        warnings.warn(msg, RuntimeWarning)
-
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, buffers, cached, shared, slab)
-
-
-def swap_memory():
-    """Return swap memory metrics."""
-    mems = {}
-    with open_binary('%s/meminfo' % get_procfs_path()) as f:
-        for line in f:
-            fields = line.split()
-            mems[fields[0]] = int(fields[1]) * 1024
-    # We prefer /proc/meminfo over sysinfo() syscall so that
-    # psutil.PROCFS_PATH can be used in order to allow retrieval
-    # for linux containers, see:
-    # https://github.com/giampaolo/psutil/issues/1015
-    try:
-        total = mems[b'SwapTotal:']
-        free = mems[b'SwapFree:']
-    except KeyError:
-        _, _, _, _, total, free, unit_multiplier = cext.linux_sysinfo()
-        total *= unit_multiplier
-        free *= unit_multiplier
-
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    # get pgin/pgouts
-    try:
-        f = open_binary("%s/vmstat" % get_procfs_path())
-    except IOError as err:
-        # see https://github.com/giampaolo/psutil/issues/722
-        msg = "'sin' and 'sout' swap memory stats couldn't " \
-              "be determined and were set to 0 (%s)" % str(err)
-        warnings.warn(msg, RuntimeWarning)
-        sin = sout = 0
-    else:
-        with f:
-            sin = sout = None
-            for line in f:
-                # values are expressed in 4 kilo bytes, we want
-                # bytes instead
-                if line.startswith(b'pswpin'):
-                    sin = int(line.split(b' ')[1]) * 4 * 1024
-                elif line.startswith(b'pswpout'):
-                    sout = int(line.split(b' ')[1]) * 4 * 1024
-                if sin is not None and sout is not None:
-                    break
-            else:
-                # we might get here when dealing with exotic Linux
-                # flavors, see:
-                # https://github.com/giampaolo/psutil/issues/313
-                msg = "'sin' and 'sout' swap memory stats couldn't " \
-                      "be determined and were set to 0"
-                warnings.warn(msg, RuntimeWarning)
-                sin = sout = 0
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return a named tuple representing the following system-wide
-    CPU times:
-    (user, nice, system, idle, iowait, irq, softirq [steal, [guest,
-     [guest_nice]]])
-    Last 3 fields may not be available on all Linux kernel versions.
-    """
-    procfs_path = get_procfs_path()
-    set_scputimes_ntuple(procfs_path)
-    with open_binary('%s/stat' % procfs_path) as f:
-        values = f.readline().split()
-    fields = values[1:len(scputimes._fields) + 1]
-    fields = [float(x) / CLOCK_TICKS for x in fields]
-    return scputimes(*fields)
-
-
-def per_cpu_times():
-    """Return a list of namedtuple representing the CPU times
-    for every CPU available on the system.
-    """
-    procfs_path = get_procfs_path()
-    set_scputimes_ntuple(procfs_path)
-    cpus = []
-    with open_binary('%s/stat' % procfs_path) as f:
-        # get rid of the first line which refers to system wide CPU stats
-        f.readline()
-        for line in f:
-            if line.startswith(b'cpu'):
-                values = line.split()
-                fields = values[1:len(scputimes._fields) + 1]
-                fields = [float(x) / CLOCK_TICKS for x in fields]
-                entry = scputimes(*fields)
-                cpus.append(entry)
-        return cpus
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # as a second fallback we try to parse /proc/cpuinfo
-        num = 0
-        with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-            for line in f:
-                if line.lower().startswith(b'processor'):
-                    num += 1
-
-        # unknown format (e.g. amrel/sparc architectures), see:
-        # https://github.com/giampaolo/psutil/issues/200
-        # try to parse /proc/stat as a last resort
-        if num == 0:
-            search = re.compile(r'cpu\d')
-            with open_text('%s/stat' % get_procfs_path()) as f:
-                for line in f:
-                    line = line.split(' ')[0]
-                    if search.match(line):
-                        num += 1
-
-        if num == 0:
-            # mimic os.cpu_count()
-            return None
-        return num
-
-
-def cpu_count_physical():
-    """Return the number of physical cores in the system."""
-    # Method #1
-    core_ids = set()
-    for path in glob.glob(
-            "/sys/devices/system/cpu/cpu[0-9]*/topology/core_id"):
-        with open_binary(path) as f:
-            core_ids.add(int(f.read()))
-    result = len(core_ids)
-    if result != 0:
-        return result
-
-    # Method #2
-    mapping = {}
-    current_info = {}
-    with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-        for line in f:
-            line = line.strip().lower()
-            if not line:
-                # new section
-                if (b'physical id' in current_info and
-                        b'cpu cores' in current_info):
-                    mapping[current_info[b'physical id']] = \
-                        current_info[b'cpu cores']
-                current_info = {}
-            else:
-                # ongoing section
-                if (line.startswith(b'physical id') or
-                        line.startswith(b'cpu cores')):
-                    key, value = line.split(b'\t:', 1)
-                    current_info[key] = int(value)
-
-    result = sum(mapping.values())
-    return result or None  # mimic os.cpu_count()
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    with open_binary('%s/stat' % get_procfs_path()) as f:
-        ctx_switches = None
-        interrupts = None
-        soft_interrupts = None
-        for line in f:
-            if line.startswith(b'ctxt'):
-                ctx_switches = int(line.split()[1])
-            elif line.startswith(b'intr'):
-                interrupts = int(line.split()[1])
-            elif line.startswith(b'softirq'):
-                soft_interrupts = int(line.split()[1])
-            if ctx_switches is not None and soft_interrupts is not None \
-                    and interrupts is not None:
-                break
-    syscalls = 0
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-if os.path.exists("/sys/devices/system/cpu/cpufreq/policy0") or \
-        os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq"):
-    def cpu_freq():
-        """Return frequency metrics for all CPUs.
-        Contrarily to other OSes, Linux updates these values in
-        real-time.
-        """
-        def get_path(num):
-            for p in ("/sys/devices/system/cpu/cpufreq/policy%s" % num,
-                      "/sys/devices/system/cpu/cpu%s/cpufreq" % num):
-                if os.path.exists(p):
-                    return p
-
-        ret = []
-        for n in range(cpu_count_logical()):
-            path = get_path(n)
-            if not path:
-                continue
-
-            pjoin = os.path.join
-            curr = cat(pjoin(path, "scaling_cur_freq"), fallback=None)
-            if curr is None:
-                # Likely an old RedHat, see:
-                # https://github.com/giampaolo/psutil/issues/1071
-                curr = cat(pjoin(path, "cpuinfo_cur_freq"), fallback=None)
-                if curr is None:
-                    raise NotImplementedError(
-                        "can't find current frequency file")
-            curr = int(curr) / 1000
-            max_ = int(cat(pjoin(path, "scaling_max_freq"))) / 1000
-            min_ = int(cat(pjoin(path, "scaling_min_freq"))) / 1000
-            ret.append(_common.scpufreq(curr, min_, max_))
-        return ret
-
-elif os.path.exists("/proc/cpuinfo"):
-    def cpu_freq():
-        """Alternate implementation using /proc/cpuinfo.
-        min and max frequencies are not available and are set to None.
-        """
-        ret = []
-        with open_binary('%s/cpuinfo' % get_procfs_path()) as f:
-            for line in f:
-                if line.lower().startswith(b'cpu mhz'):
-                    key, value = line.split(b'\t:', 1)
-                    ret.append(_common.scpufreq(float(value), 0., 0.))
-        return ret
-
-else:
-    def cpu_freq():
-        """Dummy implementation when none of the above files are present.
-        """
-        return []
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_if_addrs = cext_posix.net_if_addrs
-
-
-class _Ipv6UnsupportedError(Exception):
-    pass
-
-
-class Connections:
-    """A wrapper on top of /proc/net/* files, retrieving per-process
-    and system-wide open connections (TCP, UDP, UNIX) similarly to
-    "netstat -an".
-
-    Note: in case of UNIX sockets we're only able to determine the
-    local endpoint/path, not the one it's connected to.
-    According to [1] it would be possible but not easily.
-
-    [1] http://serverfault.com/a/417946
-    """
-
-    def __init__(self):
-        # The string represents the basename of the corresponding
-        # /proc/net/{proto_name} file.
-        tcp4 = ("tcp", socket.AF_INET, socket.SOCK_STREAM)
-        tcp6 = ("tcp6", socket.AF_INET6, socket.SOCK_STREAM)
-        udp4 = ("udp", socket.AF_INET, socket.SOCK_DGRAM)
-        udp6 = ("udp6", socket.AF_INET6, socket.SOCK_DGRAM)
-        unix = ("unix", socket.AF_UNIX, None)
-        self.tmap = {
-            "all": (tcp4, tcp6, udp4, udp6, unix),
-            "tcp": (tcp4, tcp6),
-            "tcp4": (tcp4,),
-            "tcp6": (tcp6,),
-            "udp": (udp4, udp6),
-            "udp4": (udp4,),
-            "udp6": (udp6,),
-            "unix": (unix,),
-            "inet": (tcp4, tcp6, udp4, udp6),
-            "inet4": (tcp4, udp4),
-            "inet6": (tcp6, udp6),
-        }
-        self._procfs_path = None
-
-    def get_proc_inodes(self, pid):
-        inodes = defaultdict(list)
-        for fd in os.listdir("%s/%s/fd" % (self._procfs_path, pid)):
-            try:
-                inode = readlink("%s/%s/fd/%s" % (self._procfs_path, pid, fd))
-            except (FileNotFoundError, ProcessLookupError):
-                # ENOENT == file which is gone in the meantime;
-                # os.stat('/proc/%s' % self.pid) will be done later
-                # to force NSP (if it's the case)
-                continue
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    # not a link
-                    continue
-                raise
-            else:
-                if inode.startswith('socket:['):
-                    # the process is using a socket
-                    inode = inode[8:][:-1]
-                    inodes[inode].append((pid, int(fd)))
-        return inodes
-
-    def get_all_inodes(self):
-        inodes = {}
-        for pid in pids():
-            try:
-                inodes.update(self.get_proc_inodes(pid))
-            except (FileNotFoundError, ProcessLookupError, PermissionError):
-                # os.listdir() is gonna raise a lot of access denied
-                # exceptions in case of unprivileged user; that's fine
-                # as we'll just end up returning a connection with PID
-                # and fd set to None anyway.
-                # Both netstat -an and lsof does the same so it's
-                # unlikely we can do any better.
-                # ENOENT just means a PID disappeared on us.
-                continue
-        return inodes
-
-    @staticmethod
-    def decode_address(addr, family):
-        """Accept an "ip:port" address as displayed in /proc/net/*
-        and convert it into a human readable form, like:
-
-        "0500000A:0016" -> ("10.0.0.5", 22)
-        "0000000000000000FFFF00000100007F:9E49" -> ("::ffff:127.0.0.1", 40521)
-
-        The IP address portion is a little or big endian four-byte
-        hexadecimal number; that is, the least significant byte is listed
-        first, so we need to reverse the order of the bytes to convert it
-        to an IP address.
-        The port is represented as a two-byte hexadecimal number.
-
-        Reference:
-        http://linuxdevcenter.com/pub/a/linux/2000/11/16/LinuxAdmin.html
-        """
-        ip, port = addr.split(':')
-        port = int(port, 16)
-        # this usually refers to a local socket in listen mode with
-        # no end-points connected
-        if not port:
-            return ()
-        if PY3:
-            ip = ip.encode('ascii')
-        if family == socket.AF_INET:
-            # see: https://github.com/giampaolo/psutil/issues/201
-            if LITTLE_ENDIAN:
-                ip = socket.inet_ntop(family, base64.b16decode(ip)[::-1])
-            else:
-                ip = socket.inet_ntop(family, base64.b16decode(ip))
-        else:  # IPv6
-            # old version - let's keep it, just in case...
-            # ip = ip.decode('hex')
-            # return socket.inet_ntop(socket.AF_INET6,
-            #          ''.join(ip[i:i+4][::-1] for i in xrange(0, 16, 4)))
-            ip = base64.b16decode(ip)
-            try:
-                # see: https://github.com/giampaolo/psutil/issues/201
-                if LITTLE_ENDIAN:
-                    ip = socket.inet_ntop(
-                        socket.AF_INET6,
-                        struct.pack('>4I', *struct.unpack('<4I', ip)))
-                else:
-                    ip = socket.inet_ntop(
-                        socket.AF_INET6,
-                        struct.pack('<4I', *struct.unpack('<4I', ip)))
-            except ValueError:
-                # see: https://github.com/giampaolo/psutil/issues/623
-                if not supports_ipv6():
-                    raise _Ipv6UnsupportedError
-                else:
-                    raise
-        return _common.addr(ip, port)
-
-    @staticmethod
-    def process_inet(file, family, type_, inodes, filter_pid=None):
-        """Parse /proc/net/tcp* and /proc/net/udp* files."""
-        if file.endswith('6') and not os.path.exists(file):
-            # IPv6 not supported
-            return
-        with open_text(file, buffering=BIGFILE_BUFFERING) as f:
-            f.readline()  # skip the first line
-            for lineno, line in enumerate(f, 1):
-                try:
-                    _, laddr, raddr, status, _, _, _, _, _, inode = \
-                        line.split()[:10]
-                except ValueError:
-                    raise RuntimeError(
-                        "error while parsing %s; malformed line %s %r" % (
-                            file, lineno, line))
-                if inode in inodes:
-                    # # We assume inet sockets are unique, so we error
-                    # # out if there are multiple references to the
-                    # # same inode. We won't do this for UNIX sockets.
-                    # if len(inodes[inode]) > 1 and family != socket.AF_UNIX:
-                    #     raise ValueError("ambiguos inode with multiple "
-                    #                      "PIDs references")
-                    pid, fd = inodes[inode][0]
-                else:
-                    pid, fd = None, -1
-                if filter_pid is not None and filter_pid != pid:
-                    continue
-                else:
-                    if type_ == socket.SOCK_STREAM:
-                        status = TCP_STATUSES[status]
-                    else:
-                        status = _common.CONN_NONE
-                    try:
-                        laddr = Connections.decode_address(laddr, family)
-                        raddr = Connections.decode_address(raddr, family)
-                    except _Ipv6UnsupportedError:
-                        continue
-                    yield (fd, family, type_, laddr, raddr, status, pid)
-
-    @staticmethod
-    def process_unix(file, family, inodes, filter_pid=None):
-        """Parse /proc/net/unix files."""
-        with open_text(file, buffering=BIGFILE_BUFFERING) as f:
-            f.readline()  # skip the first line
-            for line in f:
-                tokens = line.split()
-                try:
-                    _, _, _, _, type_, _, inode = tokens[0:7]
-                except ValueError:
-                    if ' ' not in line:
-                        # see: https://github.com/giampaolo/psutil/issues/766
-                        continue
-                    raise RuntimeError(
-                        "error while parsing %s; malformed line %r" % (
-                            file, line))
-                if inode in inodes:
-                    # With UNIX sockets we can have a single inode
-                    # referencing many file descriptors.
-                    pairs = inodes[inode]
-                else:
-                    pairs = [(None, -1)]
-                for pid, fd in pairs:
-                    if filter_pid is not None and filter_pid != pid:
-                        continue
-                    else:
-                        if len(tokens) == 8:
-                            path = tokens[-1]
-                        else:
-                            path = ""
-                        type_ = _common.socktype_to_enum(int(type_))
-                        # XXX: determining the remote endpoint of a
-                        # UNIX socket on Linux is not possible, see:
-                        # https://serverfault.com/questions/252723/
-                        raddr = ""
-                        status = _common.CONN_NONE
-                        yield (fd, family, type_, path, raddr, status, pid)
-
-    def retrieve(self, kind, pid=None):
-        if kind not in self.tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in self.tmap])))
-        self._procfs_path = get_procfs_path()
-        if pid is not None:
-            inodes = self.get_proc_inodes(pid)
-            if not inodes:
-                # no connections for this process
-                return []
-        else:
-            inodes = self.get_all_inodes()
-        ret = set()
-        for proto_name, family, type_ in self.tmap[kind]:
-            path = "%s/net/%s" % (self._procfs_path, proto_name)
-            if family in (socket.AF_INET, socket.AF_INET6):
-                ls = self.process_inet(
-                    path, family, type_, inodes, filter_pid=pid)
-            else:
-                ls = self.process_unix(
-                    path, family, inodes, filter_pid=pid)
-            for fd, family, type_, laddr, raddr, status, bound_pid in ls:
-                if pid:
-                    conn = _common.pconn(fd, family, type_, laddr, raddr,
-                                         status)
-                else:
-                    conn = _common.sconn(fd, family, type_, laddr, raddr,
-                                         status, bound_pid)
-                ret.add(conn)
-        return list(ret)
-
-
-_connections = Connections()
-
-
-def net_connections(kind='inet'):
-    """Return system-wide open connections."""
-    return _connections.retrieve(kind)
-
-
-def net_io_counters():
-    """Return network I/O statistics for every network interface
-    installed on the system as a dict of raw tuples.
-    """
-    with open_text("%s/net/dev" % get_procfs_path()) as f:
-        lines = f.readlines()
-    retdict = {}
-    for line in lines[2:]:
-        colon = line.rfind(':')
-        assert colon > 0, repr(line)
-        name = line[:colon].strip()
-        fields = line[colon + 1:].strip().split()
-
-        # in
-        (bytes_recv,
-         packets_recv,
-         errin,
-         dropin,
-         fifoin,  # unused
-         framein,  # unused
-         compressedin,  # unused
-         multicastin,  # unused
-         # out
-         bytes_sent,
-         packets_sent,
-         errout,
-         dropout,
-         fifoout,  # unused
-         collisionsout,  # unused
-         carrierout,  # unused
-         compressedout) = map(int, fields)
-
-        retdict[name] = (bytes_sent, bytes_recv, packets_sent, packets_recv,
-                         errin, errout, dropin, dropout)
-    return retdict
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    duplex_map = {cext.DUPLEX_FULL: NIC_DUPLEX_FULL,
-                  cext.DUPLEX_HALF: NIC_DUPLEX_HALF,
-                  cext.DUPLEX_UNKNOWN: NIC_DUPLEX_UNKNOWN}
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            ret[name] = _common.snicstats(isup, duplex_map[duplex], speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_usage = _psposix.disk_usage
-
-
-def disk_io_counters(perdisk=False):
-    """Return disk I/O statistics for every disk installed on the
-    system as a dict of raw tuples.
-    """
-    def read_procfs():
-        # OK, this is a bit confusing. The format of /proc/diskstats can
-        # have 3 variations.
-        # On Linux 2.4 each line has always 15 fields, e.g.:
-        # "3     0   8 hda 8 8 8 8 8 8 8 8 8 8 8"
-        # On Linux 2.6+ each line *usually* has 14 fields, and the disk
-        # name is in another position, like this:
-        # "3    0   hda 8 8 8 8 8 8 8 8 8 8 8"
-        # ...unless (Linux 2.6) the line refers to a partition instead
-        # of a disk, in which case the line has less fields (7):
-        # "3    1   hda1 8 8 8 8"
-        # 4.18+ has 4 fields added:
-        # "3    0   hda 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0"
-        # 5.5 has 2 more fields.
-        # See:
-        # https://www.kernel.org/doc/Documentation/iostats.txt
-        # https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats
-        with open_text("%s/diskstats" % get_procfs_path()) as f:
-            lines = f.readlines()
-        for line in lines:
-            fields = line.split()
-            flen = len(fields)
-            if flen == 15:
-                # Linux 2.4
-                name = fields[3]
-                reads = int(fields[2])
-                (reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time, _) = map(int, fields[4:14])
-            elif flen == 14 or flen >= 18:
-                # Linux 2.6+, line referring to a disk
-                name = fields[2]
-                (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time, _) = map(int, fields[3:14])
-            elif flen == 7:
-                # Linux 2.6+, line referring to a partition
-                name = fields[2]
-                reads, rbytes, writes, wbytes = map(int, fields[3:])
-                rtime = wtime = reads_merged = writes_merged = busy_time = 0
-            else:
-                raise ValueError("not sure how to interpret line %r" % line)
-            yield (name, reads, writes, rbytes, wbytes, rtime, wtime,
-                   reads_merged, writes_merged, busy_time)
-
-    def read_sysfs():
-        for block in os.listdir('/sys/block'):
-            for root, _, files in os.walk(os.path.join('/sys/block', block)):
-                if 'stat' not in files:
-                    continue
-                with open_text(os.path.join(root, 'stat')) as f:
-                    fields = f.read().strip().split()
-                name = os.path.basename(root)
-                (reads, reads_merged, rbytes, rtime, writes, writes_merged,
-                    wbytes, wtime, _, busy_time) = map(int, fields[:10])
-                yield (name, reads, writes, rbytes, wbytes, rtime,
-                       wtime, reads_merged, writes_merged, busy_time)
-
-    if os.path.exists('%s/diskstats' % get_procfs_path()):
-        gen = read_procfs()
-    elif os.path.exists('/sys/block'):
-        gen = read_sysfs()
-    else:
-        raise NotImplementedError(
-            "%s/diskstats nor /sys/block filesystem are available on this "
-            "system" % get_procfs_path())
-
-    retdict = {}
-    for entry in gen:
-        (name, reads, writes, rbytes, wbytes, rtime, wtime, reads_merged,
-            writes_merged, busy_time) = entry
-        if not perdisk and not is_storage_device(name):
-            # perdisk=False means we want to calculate totals so we skip
-            # partitions (e.g. 'sda1', 'nvme0n1p1') and only include
-            # base disk devices (e.g. 'sda', 'nvme0n1'). Base disks
-            # include a total of all their partitions + some extra size
-            # of their own:
-            #     $ cat /proc/diskstats
-            #     259       0 sda 10485760 ...
-            #     259       1 sda1 5186039 ...
-            #     259       1 sda2 5082039 ...
-            # See:
-            # https://github.com/giampaolo/psutil/pull/1313
-            continue
-
-        rbytes *= DISK_SECTOR_SIZE
-        wbytes *= DISK_SECTOR_SIZE
-        retdict[name] = (reads, writes, rbytes, wbytes, rtime, wtime,
-                         reads_merged, writes_merged, busy_time)
-
-    return retdict
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples."""
-    fstypes = set()
-    procfs_path = get_procfs_path()
-    with open_text("%s/filesystems" % procfs_path) as f:
-        for line in f:
-            line = line.strip()
-            if not line.startswith("nodev"):
-                fstypes.add(line.strip())
-            else:
-                # ignore all lines starting with "nodev" except "nodev zfs"
-                fstype = line.split("\t")[1]
-                if fstype == "zfs":
-                    fstypes.add("zfs")
-
-    # See: https://github.com/giampaolo/psutil/issues/1307
-    if procfs_path == "/proc" and os.path.isfile('/etc/mtab'):
-        mounts_path = os.path.realpath("/etc/mtab")
-    else:
-        mounts_path = os.path.realpath("%s/self/mounts" % procfs_path)
-
-    retlist = []
-    partitions = cext.disk_partitions(mounts_path)
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            if device == '' or fstype not in fstypes:
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-
-    return retlist
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_temperatures():
-    """Return hardware (CPU and others) temperatures as a dict
-    including hardware name, label, current, max and critical
-    temperatures.
-
-    Implementation notes:
-    - /sys/class/hwmon looks like the most recent interface to
-      retrieve this info, and this implementation relies on it
-      only (old distros will probably use something else)
-    - lm-sensors on Ubuntu 16.04 relies on /sys/class/hwmon
-    - /sys/class/thermal/thermal_zone* is another one but it's more
-      difficult to parse
-    """
-    ret = collections.defaultdict(list)
-    basenames = glob.glob('/sys/class/hwmon/hwmon*/temp*_*')
-    # CentOS has an intermediate /device directory:
-    # https://github.com/giampaolo/psutil/issues/971
-    # https://github.com/nicolargo/glances/issues/1060
-    basenames.extend(glob.glob('/sys/class/hwmon/hwmon*/device/temp*_*'))
-    basenames.extend(glob.glob(
-        '/sys/devices/platform/coretemp.*/hwmon/hwmon*/temp*_*'))
-    basenames = sorted(set([x.split('_')[0] for x in basenames]))
-
-    for base in basenames:
-        try:
-            path = base + '_input'
-            current = float(cat(path)) / 1000.0
-            path = os.path.join(os.path.dirname(base), 'name')
-            unit_name = cat(path, binary=False)
-        except (IOError, OSError, ValueError):
-            # A lot of things can go wrong here, so let's just skip the
-            # whole entry. Sure thing is Linux's /sys/class/hwmon really
-            # is a stinky broken mess.
-            # https://github.com/giampaolo/psutil/issues/1009
-            # https://github.com/giampaolo/psutil/issues/1101
-            # https://github.com/giampaolo/psutil/issues/1129
-            # https://github.com/giampaolo/psutil/issues/1245
-            # https://github.com/giampaolo/psutil/issues/1323
-            continue
-
-        high = cat(base + '_max', fallback=None)
-        critical = cat(base + '_crit', fallback=None)
-        label = cat(base + '_label', fallback='', binary=False)
-
-        if high is not None:
-            try:
-                high = float(high) / 1000.0
-            except ValueError:
-                high = None
-        if critical is not None:
-            try:
-                critical = float(critical) / 1000.0
-            except ValueError:
-                critical = None
-
-        ret[unit_name].append((label, current, high, critical))
-
-    # Indication that no sensors were detected in /sys/class/hwmon/
-    if not basenames:
-        basenames = glob.glob('/sys/class/thermal/thermal_zone*')
-        basenames = sorted(set(basenames))
-
-        for base in basenames:
-            try:
-                path = os.path.join(base, 'temp')
-                current = float(cat(path)) / 1000.0
-                path = os.path.join(base, 'type')
-                unit_name = cat(path, binary=False)
-            except (IOError, OSError, ValueError) as err:
-                debug("ignoring %r for file %r" % (err, path))
-                continue
-
-            trip_paths = glob.glob(base + '/trip_point*')
-            trip_points = set(['_'.join(
-                os.path.basename(p).split('_')[0:3]) for p in trip_paths])
-            critical = None
-            high = None
-            for trip_point in trip_points:
-                path = os.path.join(base, trip_point + "_type")
-                trip_type = cat(path, fallback='', binary=False)
-                if trip_type == 'critical':
-                    critical = cat(os.path.join(base, trip_point + "_temp"),
-                                   fallback=None)
-                elif trip_type == 'high':
-                    high = cat(os.path.join(base, trip_point + "_temp"),
-                               fallback=None)
-
-                if high is not None:
-                    try:
-                        high = float(high) / 1000.0
-                    except ValueError:
-                        high = None
-                if critical is not None:
-                    try:
-                        critical = float(critical) / 1000.0
-                    except ValueError:
-                        critical = None
-
-            ret[unit_name].append(('', current, high, critical))
-
-    return dict(ret)
-
-
-def sensors_fans():
-    """Return hardware fans info (for CPU and other peripherals) as a
-    dict including hardware label and current speed.
-
-    Implementation notes:
-    - /sys/class/hwmon looks like the most recent interface to
-      retrieve this info, and this implementation relies on it
-      only (old distros will probably use something else)
-    - lm-sensors on Ubuntu 16.04 relies on /sys/class/hwmon
-    """
-    ret = collections.defaultdict(list)
-    basenames = glob.glob('/sys/class/hwmon/hwmon*/fan*_*')
-    if not basenames:
-        # CentOS has an intermediate /device directory:
-        # https://github.com/giampaolo/psutil/issues/971
-        basenames = glob.glob('/sys/class/hwmon/hwmon*/device/fan*_*')
-
-    basenames = sorted(set([x.split('_')[0] for x in basenames]))
-    for base in basenames:
-        try:
-            current = int(cat(base + '_input'))
-        except (IOError, OSError) as err:
-            warnings.warn("ignoring %r" % err, RuntimeWarning)
-            continue
-        unit_name = cat(os.path.join(os.path.dirname(base), 'name'),
-                        binary=False)
-        label = cat(base + '_label', fallback='', binary=False)
-        ret[unit_name].append(_common.sfan(label, current))
-
-    return dict(ret)
-
-
-def sensors_battery():
-    """Return battery information.
-    Implementation note: it appears /sys/class/power_supply/BAT0/
-    directory structure may vary and provide files with the same
-    meaning but under different names, see:
-    https://github.com/giampaolo/psutil/issues/966
-    """
-    null = object()
-
-    def multi_cat(*paths):
-        """Attempt to read the content of multiple files which may
-        not exist. If none of them exist return None.
-        """
-        for path in paths:
-            ret = cat(path, fallback=null)
-            if ret != null:
-                return int(ret) if ret.isdigit() else ret
-        return None
-
-    bats = [x for x in os.listdir(POWER_SUPPLY_PATH) if x.startswith('BAT')]
-    if not bats:
-        return None
-    # Get the first available battery. Usually this is "BAT0", except
-    # some rare exceptions:
-    # https://github.com/giampaolo/psutil/issues/1238
-    root = os.path.join(POWER_SUPPLY_PATH, sorted(bats)[0])
-
-    # Base metrics.
-    energy_now = multi_cat(
-        root + "/energy_now",
-        root + "/charge_now")
-    power_now = multi_cat(
-        root + "/power_now",
-        root + "/current_now")
-    energy_full = multi_cat(
-        root + "/energy_full",
-        root + "/charge_full")
-    if energy_now is None or power_now is None:
-        return None
-
-    # Percent. If we have energy_full the percentage will be more
-    # accurate compared to reading /capacity file (float vs. int).
-    if energy_full is not None:
-        try:
-            percent = 100.0 * energy_now / energy_full
-        except ZeroDivisionError:
-            percent = 0.0
-    else:
-        percent = int(cat(root + "/capacity", fallback=-1))
-        if percent == -1:
-            return None
-
-    # Is AC power cable plugged in?
-    # Note: AC0 is not always available and sometimes (e.g. CentOS7)
-    # it's called "AC".
-    power_plugged = None
-    online = multi_cat(
-        os.path.join(POWER_SUPPLY_PATH, "AC0/online"),
-        os.path.join(POWER_SUPPLY_PATH, "AC/online"))
-    if online is not None:
-        power_plugged = online == 1
-    else:
-        status = cat(root + "/status", fallback="", binary=False).lower()
-        if status == "discharging":
-            power_plugged = False
-        elif status in ("charging", "full"):
-            power_plugged = True
-
-    # Seconds left.
-    # Note to self: we may also calculate the charging ETA as per:
-    # https://github.com/thialfihar/dotfiles/blob/
-    #     013937745fd9050c30146290e8f963d65c0179e6/bin/battery.py#L55
-    if power_plugged:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    else:
-        try:
-            secsleft = int(energy_now / power_now * 3600)
-        except ZeroDivisionError:
-            secsleft = _common.POWER_TIME_UNKNOWN
-
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in (':0.0', ':0'):
-            hostname = 'localhost'
-        nt = _common.suser(user, tty or None, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-def boot_time():
-    """Return the system boot time expressed in seconds since the epoch."""
-    global BOOT_TIME
-    path = '%s/stat' % get_procfs_path()
-    with open_binary(path) as f:
-        for line in f:
-            if line.startswith(b'btime'):
-                ret = float(line.strip().split()[1])
-                BOOT_TIME = ret
-                return ret
-        raise RuntimeError(
-            "line 'btime' not found in %s" % path)
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(b(get_procfs_path())) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix PID. Linux TIDs are not
-    supported (always return False).
-    """
-    if not _psposix.pid_exists(pid):
-        return False
-    else:
-        # Linux's apparently does not distinguish between PIDs and TIDs
-        # (thread IDs).
-        # listdir("/proc") won't show any TID (only PIDs) but
-        # os.stat("/proc/{tid}") will succeed if {tid} exists.
-        # os.kill() can also be passed a TID. This is quite confusing.
-        # In here we want to enforce this distinction and support PIDs
-        # only, see:
-        # https://github.com/giampaolo/psutil/issues/687
-        try:
-            # Note: already checked that this is faster than using a
-            # regular expr. Also (a lot) faster than doing
-            # 'return pid in pids()'
-            path = "%s/%s/status" % (get_procfs_path(), pid)
-            with open_binary(path) as f:
-                for line in f:
-                    if line.startswith(b"Tgid:"):
-                        tgid = int(line.split()[1])
-                        # If tgid and pid are the same then we're
-                        # dealing with a process PID.
-                        return tgid == pid
-                raise ValueError("'Tgid' line not found in %s" % path)
-        except (EnvironmentError, ValueError):
-            return pid in pids()
-
-
-def ppid_map():
-    """Obtain a {pid: ppid, ...} dict for all running processes in
-    one shot. Used to speed up Process.children().
-    """
-    ret = {}
-    procfs_path = get_procfs_path()
-    for pid in pids():
-        try:
-            with open_binary("%s/%s/stat" % (procfs_path, pid)) as f:
-                data = f.read()
-        except (FileNotFoundError, ProcessLookupError):
-            # Note: we should be able to access /stat for all processes
-            # aka it's unlikely we'll bump into EPERM, which is good.
-            pass
-        else:
-            rpar = data.rfind(b')')
-            dset = data[rpar + 2:].split()
-            ppid = int(dset[1])
-            ret[pid] = ppid
-    return ret
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError and IOError exceptions
-    into NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except ProcessLookupError:
-            raise NoSuchProcess(self.pid, self._name)
-        except FileNotFoundError:
-            if not os.path.exists("%s/%s" % (self._procfs_path, self.pid)):
-                raise NoSuchProcess(self.pid, self._name)
-            # Note: zombies will keep existing under /proc until they're
-            # gone so there's no way to distinguish them in here.
-            raise
-    return wrapper
-
-
-class Process(object):
-    """Linux process implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _parse_stat_file(self):
-        """Parse /proc/{pid}/stat file and return a dict with various
-        process info.
-        Using "man proc" as a reference: where "man proc" refers to
-        position N always substract 3 (e.g ppid position 4 in
-        'man proc' == position 1 in here).
-        The return value is cached in case oneshot() ctx manager is
-        in use.
-        """
-        with open_binary("%s/%s/stat" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        # Process name is between parentheses. It can contain spaces and
-        # other parentheses. This is taken into account by looking for
-        # the first occurrence of "(" and the last occurence of ")".
-        rpar = data.rfind(b')')
-        name = data[data.find(b'(') + 1:rpar]
-        fields = data[rpar + 2:].split()
-
-        ret = {}
-        ret['name'] = name
-        ret['status'] = fields[0]
-        ret['ppid'] = fields[1]
-        ret['ttynr'] = fields[4]
-        ret['utime'] = fields[11]
-        ret['stime'] = fields[12]
-        ret['children_utime'] = fields[13]
-        ret['children_stime'] = fields[14]
-        ret['create_time'] = fields[19]
-        ret['cpu_num'] = fields[36]
-        ret['blkio_ticks'] = fields[39]  # aka 'delayacct_blkio_ticks'
-
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _read_status_file(self):
-        """Read /proc/{pid}/stat file and return its content.
-        The return value is cached in case oneshot() ctx manager is
-        in use.
-        """
-        with open_binary("%s/%s/status" % (self._procfs_path, self.pid)) as f:
-            return f.read()
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _read_smaps_file(self):
-        with open_binary("%s/%s/smaps" % (self._procfs_path, self.pid),
-                         buffering=BIGFILE_BUFFERING) as f:
-            return f.read().strip()
-
-    def oneshot_enter(self):
-        self._parse_stat_file.cache_activate(self)
-        self._read_status_file.cache_activate(self)
-        self._read_smaps_file.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._parse_stat_file.cache_deactivate(self)
-        self._read_status_file.cache_deactivate(self)
-        self._read_smaps_file.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self._parse_stat_file()['name']
-        if PY3:
-            name = decode(name)
-        # XXX - gets changed later and probably needs refactoring
-        return name
-
-    def exe(self):
-        try:
-            return readlink("%s/%s/exe" % (self._procfs_path, self.pid))
-        except (FileNotFoundError, ProcessLookupError):
-            # no such file error; might be raised also if the
-            # path actually exists for system processes with
-            # low pids (about 0-20)
-            if os.path.lexists("%s/%s" % (self._procfs_path, self.pid)):
-                return ""
-            else:
-                if not pid_exists(self.pid):
-                    raise NoSuchProcess(self.pid, self._name)
-                else:
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-
-    @wrap_exceptions
-    def cmdline(self):
-        with open_text("%s/%s/cmdline" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        if not data:
-            # may happen in case of zombie process
-            return []
-        # 'man proc' states that args are separated by null bytes '\0'
-        # and last char is supposed to be a null byte. Nevertheless
-        # some processes may change their cmdline after being started
-        # (via setproctitle() or similar), they are usually not
-        # compliant with this rule and use spaces instead. Google
-        # Chrome process is an example. See:
-        # https://github.com/giampaolo/psutil/issues/1179
-        sep = '\x00' if data.endswith('\x00') else ' '
-        if data.endswith(sep):
-            data = data[:-1]
-        cmdline = data.split(sep)
-        # Sometimes last char is a null byte '\0' but the args are
-        # separated by spaces, see: https://github.com/giampaolo/psutil/
-        # issues/1179#issuecomment-552984549
-        if sep == '\x00' and len(cmdline) == 1 and ' ' in data:
-            cmdline = data.split(' ')
-        return cmdline
-
-    @wrap_exceptions
-    def environ(self):
-        with open_text("%s/%s/environ" % (self._procfs_path, self.pid)) as f:
-            data = f.read()
-        return parse_environ_block(data)
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = int(self._parse_stat_file()['ttynr'])
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    # May not be available on old kernels.
-    if os.path.exists('/proc/%s/io' % os.getpid()):
-        @wrap_exceptions
-        def io_counters(self):
-            fname = "%s/%s/io" % (self._procfs_path, self.pid)
-            fields = {}
-            with open_binary(fname) as f:
-                for line in f:
-                    # https://github.com/giampaolo/psutil/issues/1004
-                    line = line.strip()
-                    if line:
-                        try:
-                            name, value = line.split(b': ')
-                        except ValueError:
-                            # https://github.com/giampaolo/psutil/issues/1004
-                            continue
-                        else:
-                            fields[name] = int(value)
-            if not fields:
-                raise RuntimeError("%s file was empty" % fname)
-            try:
-                return pio(
-                    fields[b'syscr'],  # read syscalls
-                    fields[b'syscw'],  # write syscalls
-                    fields[b'read_bytes'],  # read bytes
-                    fields[b'write_bytes'],  # write bytes
-                    fields[b'rchar'],  # read chars
-                    fields[b'wchar'],  # write chars
-                )
-            except KeyError as err:
-                raise ValueError("%r field was not found in %s; found fields "
-                                 "are %r" % (err[0], fname, fields))
-
-    @wrap_exceptions
-    def cpu_times(self):
-        values = self._parse_stat_file()
-        utime = float(values['utime']) / CLOCK_TICKS
-        stime = float(values['stime']) / CLOCK_TICKS
-        children_utime = float(values['children_utime']) / CLOCK_TICKS
-        children_stime = float(values['children_stime']) / CLOCK_TICKS
-        iowait = float(values['blkio_ticks']) / CLOCK_TICKS
-        return pcputimes(utime, stime, children_utime, children_stime, iowait)
-
-    @wrap_exceptions
-    def cpu_num(self):
-        """What CPU the process is on."""
-        return int(self._parse_stat_file()['cpu_num'])
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def create_time(self):
-        ctime = float(self._parse_stat_file()['create_time'])
-        # According to documentation, starttime is in field 21 and the
-        # unit is jiffies (clock ticks).
-        # We first divide it for clock ticks and then add uptime returning
-        # seconds since the epoch, in UTC.
-        # Also use cached value if available.
-        bt = BOOT_TIME or boot_time()
-        return (ctime / CLOCK_TICKS) + bt
-
-    @wrap_exceptions
-    def memory_info(self):
-        #  ============================================================
-        # | FIELD  | DESCRIPTION                         | AKA  | TOP  |
-        #  ============================================================
-        # | rss    | resident set size                   |      | RES  |
-        # | vms    | total program size                  | size | VIRT |
-        # | shared | shared pages (from shared mappings) |      | SHR  |
-        # | text   | text ('code')                       | trs  | CODE |
-        # | lib    | library (unused in Linux 2.6)       | lrs  |      |
-        # | data   | data + stack                        | drs  | DATA |
-        # | dirty  | dirty pages (unused in Linux 2.6)   | dt   |      |
-        #  ============================================================
-        with open_binary("%s/%s/statm" % (self._procfs_path, self.pid)) as f:
-            vms, rss, shared, text, lib, data, dirty = \
-                [int(x) * PAGESIZE for x in f.readline().split()[:7]]
-        return pmem(rss, vms, shared, text, lib, data, dirty)
-
-    # /proc/pid/smaps does not exist on kernels < 2.6.14 or if
-    # CONFIG_MMU kernel configuration option is not enabled.
-    if HAS_SMAPS:
-
-        @wrap_exceptions
-        def memory_full_info(
-                self,
-                # Gets Private_Clean, Private_Dirty, Private_Hugetlb.
-                _private_re=re.compile(br"\nPrivate.*:\s+(\d+)"),
-                _pss_re=re.compile(br"\nPss\:\s+(\d+)"),
-                _swap_re=re.compile(br"\nSwap\:\s+(\d+)")):
-            basic_mem = self.memory_info()
-            # Note: using 3 regexes is faster than reading the file
-            # line by line.
-            # XXX: on Python 3 the 2 regexes are 30% slower than on
-            # Python 2 though. Figure out why.
-            #
-            # You might be tempted to calculate USS by subtracting
-            # the "shared" value from the "resident" value in
-            # /proc/<pid>/statm. But at least on Linux, statm's "shared"
-            # value actually counts pages backed by files, which has
-            # little to do with whether the pages are actually shared.
-            # /proc/self/smaps on the other hand appears to give us the
-            # correct information.
-            smaps_data = self._read_smaps_file()
-            # Note: smaps file can be empty for certain processes.
-            # The code below will not crash though and will result to 0.
-            uss = sum(map(int, _private_re.findall(smaps_data))) * 1024
-            pss = sum(map(int, _pss_re.findall(smaps_data))) * 1024
-            swap = sum(map(int, _swap_re.findall(smaps_data))) * 1024
-            return pfullmem(*basic_mem + (uss, pss, swap))
-
-    else:
-        memory_full_info = memory_info
-
-    if HAS_SMAPS:
-
-        @wrap_exceptions
-        def memory_maps(self):
-            """Return process's mapped memory regions as a list of named
-            tuples. Fields are explained in 'man proc'; here is an updated
-            (Apr 2012) version: http://goo.gl/fmebo
-
-            /proc/{PID}/smaps does not exist on kernels < 2.6.14 or if
-            CONFIG_MMU kernel configuration option is not enabled.
-            """
-            def get_blocks(lines, current_block):
-                data = {}
-                for line in lines:
-                    fields = line.split(None, 5)
-                    if not fields[0].endswith(b':'):
-                        # new block section
-                        yield (current_block.pop(), data)
-                        current_block.append(line)
-                    else:
-                        try:
-                            data[fields[0]] = int(fields[1]) * 1024
-                        except ValueError:
-                            if fields[0].startswith(b'VmFlags:'):
-                                # see issue #369
-                                continue
-                            else:
-                                raise ValueError("don't know how to inte"
-                                                 "rpret line %r" % line)
-                yield (current_block.pop(), data)
-
-            data = self._read_smaps_file()
-            # Note: smaps file can be empty for certain processes.
-            if not data:
-                return []
-            lines = data.split(b'\n')
-            ls = []
-            first_line = lines.pop(0)
-            current_block = [first_line]
-            for header, data in get_blocks(lines, current_block):
-                hfields = header.split(None, 5)
-                try:
-                    addr, perms, offset, dev, inode, path = hfields
-                except ValueError:
-                    addr, perms, offset, dev, inode, path = \
-                        hfields + ['']
-                if not path:
-                    path = '[anon]'
-                else:
-                    if PY3:
-                        path = decode(path)
-                    path = path.strip()
-                    if (path.endswith(' (deleted)') and not
-                            path_exists_strict(path)):
-                        path = path[:-10]
-                ls.append((
-                    decode(addr), decode(perms), path,
-                    data.get(b'Rss:', 0),
-                    data.get(b'Size:', 0),
-                    data.get(b'Pss:', 0),
-                    data.get(b'Shared_Clean:', 0),
-                    data.get(b'Shared_Dirty:', 0),
-                    data.get(b'Private_Clean:', 0),
-                    data.get(b'Private_Dirty:', 0),
-                    data.get(b'Referenced:', 0),
-                    data.get(b'Anonymous:', 0),
-                    data.get(b'Swap:', 0)
-                ))
-            return ls
-
-    @wrap_exceptions
-    def cwd(self):
-        try:
-            return readlink("%s/%s/cwd" % (self._procfs_path, self.pid))
-        except (FileNotFoundError, ProcessLookupError):
-            # https://github.com/giampaolo/psutil/issues/986
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-
-    @wrap_exceptions
-    def num_ctx_switches(self,
-                         _ctxsw_re=re.compile(br'ctxt_switches:\t(\d+)')):
-        data = self._read_status_file()
-        ctxsw = _ctxsw_re.findall(data)
-        if not ctxsw:
-            raise NotImplementedError(
-                "'voluntary_ctxt_switches' and 'nonvoluntary_ctxt_switches'"
-                "lines were not found in %s/%s/status; the kernel is "
-                "probably older than 2.6.23" % (
-                    self._procfs_path, self.pid))
-        else:
-            return _common.pctxsw(int(ctxsw[0]), int(ctxsw[1]))
-
-    @wrap_exceptions
-    def num_threads(self, _num_threads_re=re.compile(br'Threads:\t(\d+)')):
-        # Note: on Python 3 using a re is faster than iterating over file
-        # line by line. On Python 2 is the exact opposite, and iterating
-        # over a file on Python 3 is slower than on Python 2.
-        data = self._read_status_file()
-        return int(_num_threads_re.findall(data)[0])
-
-    @wrap_exceptions
-    def threads(self):
-        thread_ids = os.listdir("%s/%s/task" % (self._procfs_path, self.pid))
-        thread_ids.sort()
-        retlist = []
-        hit_enoent = False
-        for thread_id in thread_ids:
-            fname = "%s/%s/task/%s/stat" % (
-                self._procfs_path, self.pid, thread_id)
-            try:
-                with open_binary(fname) as f:
-                    st = f.read().strip()
-            except FileNotFoundError:
-                # no such file or directory; it means thread
-                # disappeared on us
-                hit_enoent = True
-                continue
-            # ignore the first two values ("pid (exe)")
-            st = st[st.find(b')') + 2:]
-            values = st.split(b' ')
-            utime = float(values[11]) / CLOCK_TICKS
-            stime = float(values[12]) / CLOCK_TICKS
-            ntuple = _common.pthread(int(thread_id), utime, stime)
-            retlist.append(ntuple)
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def nice_get(self):
-        # with open_text('%s/%s/stat' % (self._procfs_path, self.pid)) as f:
-        #   data = f.read()
-        #   return int(data.split()[18])
-
-        # Use C implementation
-        return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext_posix.setpriority(self.pid, value)
-
-    # starting from CentOS 6.
-    if HAS_CPU_AFFINITY:
-
-        @wrap_exceptions
-        def cpu_affinity_get(self):
-            return cext.proc_cpu_affinity_get(self.pid)
-
-        def _get_eligible_cpus(
-                self, _re=re.compile(br"Cpus_allowed_list:\t(\d+)-(\d+)")):
-            # See: https://github.com/giampaolo/psutil/issues/956
-            data = self._read_status_file()
-            match = _re.findall(data)
-            if match:
-                return list(range(int(match[0][0]), int(match[0][1]) + 1))
-            else:
-                return list(range(len(per_cpu_times())))
-
-        @wrap_exceptions
-        def cpu_affinity_set(self, cpus):
-            try:
-                cext.proc_cpu_affinity_set(self.pid, cpus)
-            except (OSError, ValueError) as err:
-                if isinstance(err, ValueError) or err.errno == errno.EINVAL:
-                    eligible_cpus = self._get_eligible_cpus()
-                    all_cpus = tuple(range(len(per_cpu_times())))
-                    for cpu in cpus:
-                        if cpu not in all_cpus:
-                            raise ValueError(
-                                "invalid CPU number %r; choose between %s" % (
-                                    cpu, eligible_cpus))
-                        if cpu not in eligible_cpus:
-                            raise ValueError(
-                                "CPU number %r is not eligible; choose "
-                                "between %s" % (cpu, eligible_cpus))
-                raise
-
-    # only starting from kernel 2.6.13
-    if HAS_PROC_IO_PRIORITY:
-
-        @wrap_exceptions
-        def ionice_get(self):
-            ioclass, value = cext.proc_ioprio_get(self.pid)
-            if enum is not None:
-                ioclass = IOPriority(ioclass)
-            return _common.pionice(ioclass, value)
-
-        @wrap_exceptions
-        def ionice_set(self, ioclass, value):
-            if value is None:
-                value = 0
-            if value and ioclass in (IOPRIO_CLASS_IDLE, IOPRIO_CLASS_NONE):
-                raise ValueError("%r ioclass accepts no value" % ioclass)
-            if value < 0 or value > 7:
-                raise ValueError("value not in 0-7 range")
-            return cext.proc_ioprio_set(self.pid, ioclass, value)
-
-    if HAS_PRLIMIT:
-
-        @wrap_exceptions
-        def rlimit(self, resource, limits=None):
-            # If pid is 0 prlimit() applies to the calling process and
-            # we don't want that. We should never get here though as
-            # PID 0 is not supported on Linux.
-            if self.pid == 0:
-                raise ValueError("can't use prlimit() against PID 0 process")
-            try:
-                if limits is None:
-                    # get
-                    return cext.linux_prlimit(self.pid, resource)
-                else:
-                    # set
-                    if len(limits) != 2:
-                        raise ValueError(
-                            "second argument must be a (soft, hard) tuple, "
-                            "got %s" % repr(limits))
-                    soft, hard = limits
-                    cext.linux_prlimit(self.pid, resource, soft, hard)
-            except OSError as err:
-                if err.errno == errno.ENOSYS and pid_exists(self.pid):
-                    # I saw this happening on Travis:
-                    # https://travis-ci.org/giampaolo/psutil/jobs/51368273
-                    raise ZombieProcess(self.pid, self._name, self._ppid)
-                else:
-                    raise
-
-    @wrap_exceptions
-    def status(self):
-        letter = self._parse_stat_file()['status']
-        if PY3:
-            letter = letter.decode()
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(letter, '?')
-
-    @wrap_exceptions
-    def open_files(self):
-        retlist = []
-        files = os.listdir("%s/%s/fd" % (self._procfs_path, self.pid))
-        hit_enoent = False
-        for fd in files:
-            file = "%s/%s/fd/%s" % (self._procfs_path, self.pid, fd)
-            try:
-                path = readlink(file)
-            except (FileNotFoundError, ProcessLookupError):
-                # ENOENT == file which is gone in the meantime
-                hit_enoent = True
-                continue
-            except OSError as err:
-                if err.errno == errno.EINVAL:
-                    # not a link
-                    continue
-                raise
-            else:
-                # If path is not an absolute there's no way to tell
-                # whether it's a regular file or not, so we skip it.
-                # A regular file is always supposed to be have an
-                # absolute path though.
-                if path.startswith('/') and isfile_strict(path):
-                    # Get file position and flags.
-                    file = "%s/%s/fdinfo/%s" % (
-                        self._procfs_path, self.pid, fd)
-                    try:
-                        with open_binary(file) as f:
-                            pos = int(f.readline().split()[1])
-                            flags = int(f.readline().split()[1], 8)
-                    except FileNotFoundError:
-                        # fd gone in the meantime; process may
-                        # still be alive
-                        hit_enoent = True
-                    else:
-                        mode = file_flags_to_mode(flags)
-                        ntuple = popenfile(
-                            path, int(fd), int(pos), mode, flags)
-                        retlist.append(ntuple)
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = _connections.retrieve(kind, self.pid)
-        self._assert_alive()
-        return ret
-
-    @wrap_exceptions
-    def num_fds(self):
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def ppid(self):
-        return int(self._parse_stat_file()['ppid'])
-
-    @wrap_exceptions
-    def uids(self, _uids_re=re.compile(br'Uid:\t(\d+)\t(\d+)\t(\d+)')):
-        data = self._read_status_file()
-        real, effective, saved = _uids_re.findall(data)[0]
-        return _common.puids(int(real), int(effective), int(saved))
-
-    @wrap_exceptions
-    def gids(self, _gids_re=re.compile(br'Gid:\t(\d+)\t(\d+)\t(\d+)')):
-        data = self._read_status_file()
-        real, effective, saved = _gids_re.findall(data)[0]
-        return _common.pgids(int(real), int(effective), int(saved))
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psosx.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psosx.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psosx.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psosx.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,564 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""macOS platform implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-from collections import namedtuple
-
-from . import _common
-from . import _psposix
-from . import _psutil_osx as cext
-from . import _psutil_posix as cext_posix
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import isfile_strict
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import parse_environ_block
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-
-
-__extra__all__ = []
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-AF_LINK = cext_posix.AF_LINK
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RECEIVED: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-PROC_STATUSES = {
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SRUN: _common.STATUS_RUNNING,
-    cext.SSLEEP: _common.STATUS_SLEEPING,
-    cext.SSTOP: _common.STATUS_STOPPED,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-}
-
-kinfo_proc_map = dict(
-    ppid=0,
-    ruid=1,
-    euid=2,
-    suid=3,
-    rgid=4,
-    egid=5,
-    sgid=6,
-    ttynr=7,
-    ctime=8,
-    status=9,
-    name=10,
-)
-
-pidtaskinfo_map = dict(
-    cpuutime=0,
-    cpustime=1,
-    rss=2,
-    vms=3,
-    pfaults=4,
-    pageins=5,
-    numthreads=6,
-    volctxsw=7,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'nice', 'system', 'idle'])
-# psutil.virtual_memory()
-svmem = namedtuple(
-    'svmem', ['total', 'available', 'percent', 'used', 'free',
-              'active', 'inactive', 'wired'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms', 'pfaults', 'pageins'])
-# psutil.Process.memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', ))
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    total, active, inactive, wired, free, speculative = cext.virtual_mem()
-    # This is how Zabbix calculate avail and used mem:
-    # https://github.com/zabbix/zabbix/blob/trunk/src/libs/zbxsysinfo/
-    #     osx/memory.c
-    # Also see: https://github.com/giampaolo/psutil/issues/1277
-    avail = inactive + free
-    used = active + wired
-    # This is NOT how Zabbix calculates free mem but it matches "free"
-    # cmdline utility.
-    free -= speculative
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free,
-                 active, inactive, wired)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    total, used, free, sin, sout = cext.swap_mem()
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, sin, sout)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system CPU times as a namedtuple."""
-    user, nice, system, idle = cext.cpu_times()
-    return scputimes(user, nice, system, idle)
-
-
-def per_cpu_times():
-    """Return system CPU times as a named tuple"""
-    ret = []
-    for cpu_t in cext.per_cpu_times():
-        user, nice, system, idle = cpu_t
-        item = scputimes(user, nice, system, idle)
-        ret.append(item)
-    return ret
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-def cpu_count_physical():
-    """Return the number of physical CPUs in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    ctx_switches, interrupts, soft_interrupts, syscalls, traps = \
-        cext.cpu_stats()
-    return _common.scpustats(
-        ctx_switches, interrupts, soft_interrupts, syscalls)
-
-
-def cpu_freq():
-    """Return CPU frequency.
-    On macOS per-cpu frequency is not supported.
-    Also, the returned frequency never changes, see:
-    https://arstechnica.com/civis/viewtopic.php?f=19&t=465002
-    """
-    curr, min_, max_ = cext.cpu_freq()
-    return [_common.scpufreq(curr, min_, max_)]
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_usage = _psposix.disk_usage
-disk_io_counters = cext.disk_io_counters
-
-
-def disk_partitions(all=False):
-    """Return mounted disk partitions as a list of namedtuples."""
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            if not os.path.isabs(device) or not os.path.exists(device):
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_battery():
-    """Return battery information."""
-    try:
-        percent, minsleft, power_plugged = cext.sensors_battery()
-    except NotImplementedError:
-        # no power source - return None according to interface
-        return None
-    power_plugged = power_plugged == 1
-    if power_plugged:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    elif minsleft == -1:
-        secsleft = _common.POWER_TIME_UNKNOWN
-    else:
-        secsleft = minsleft * 60
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_connections(kind='inet'):
-    """System-wide network connections."""
-    # Note: on macOS this will fail with AccessDenied unless
-    # the process is owned by root.
-    ret = []
-    for pid in pids():
-        try:
-            cons = Process(pid).connections(kind)
-        except NoSuchProcess:
-            continue
-        else:
-            if cons:
-                for c in cons:
-                    c = list(c) + [pid]
-                    ret.append(_common.sconn(*c))
-    return ret
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    names = net_io_counters().keys()
-    ret = {}
-    for name in names:
-        try:
-            mtu = cext_posix.net_if_mtu(name)
-            isup = cext_posix.net_if_flags(name)
-            duplex, speed = cext_posix.net_if_duplex_speed(name)
-        except OSError as err:
-            # https://github.com/giampaolo/psutil/issues/1279
-            if err.errno != errno.ENODEV:
-                raise
-        else:
-            if hasattr(_common, 'NicDuplex'):
-                duplex = _common.NicDuplex(duplex)
-            ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, tty, hostname, tstamp, pid = item
-        if tty == '~':
-            continue  # reboot or shutdown
-        if not tstamp:
-            continue
-        nt = _common.suser(user, tty or None, hostname or None, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    ls = cext.pids()
-    if 0 not in ls:
-        # On certain macOS versions pids() C doesn't return PID 0 but
-        # "ps" does and the process is querable via sysctl():
-        # https://travis-ci.org/giampaolo/psutil/jobs/309619941
-        try:
-            Process(0).create_time()
-            ls.insert(0, 0)
-        except NoSuchProcess:
-            pass
-        except AccessDenied:
-            ls.insert(0, 0)
-    return ls
-
-
-pid_exists = _psposix.pid_exists
-
-
-def wrap_exceptions(fun):
-    """Decorator which translates bare OSError exceptions into
-    NoSuchProcess and AccessDenied.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except ProcessLookupError:
-            raise NoSuchProcess(self.pid, self._name)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except cext.ZombieProcessError:
-            raise ZombieProcess(self.pid, self._name, self._ppid)
-    return wrapper
-
-
-@contextlib.contextmanager
-def catch_zombie(proc):
-    """There are some poor C APIs which incorrectly raise ESRCH when
-    the process is still alive or it's a zombie, or even RuntimeError
-    (those who don't set errno). This is here in order to solve:
-    https://github.com/giampaolo/psutil/issues/1044
-    """
-    try:
-        yield
-    except (OSError, RuntimeError) as err:
-        if isinstance(err, RuntimeError) or err.errno == errno.ESRCH:
-            try:
-                # status() is not supposed to lie and correctly detect
-                # zombies so if it raises ESRCH it's true.
-                status = proc.status()
-            except NoSuchProcess:
-                raise err
-            else:
-                if status == _common.STATUS_ZOMBIE:
-                    raise ZombieProcess(proc.pid, proc._name, proc._ppid)
-                else:
-                    raise AccessDenied(proc.pid, proc._name)
-        else:
-            raise
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _get_kinfo_proc(self):
-        # Note: should work with all PIDs without permission issues.
-        ret = cext.proc_kinfo_oneshot(self.pid)
-        assert len(ret) == len(kinfo_proc_map)
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _get_pidtaskinfo(self):
-        # Note: should work for PIDs owned by user only.
-        with catch_zombie(self):
-            ret = cext.proc_pidtaskinfo_oneshot(self.pid)
-        assert len(ret) == len(pidtaskinfo_map)
-        return ret
-
-    def oneshot_enter(self):
-        self._get_kinfo_proc.cache_activate(self)
-        self._get_pidtaskinfo.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._get_kinfo_proc.cache_deactivate(self)
-        self._get_pidtaskinfo.cache_deactivate(self)
-
-    @wrap_exceptions
-    def name(self):
-        name = self._get_kinfo_proc()[kinfo_proc_map['name']]
-        return name if name is not None else cext.proc_name(self.pid)
-
-    @wrap_exceptions
-    def exe(self):
-        with catch_zombie(self):
-            return cext.proc_exe(self.pid)
-
-    @wrap_exceptions
-    def cmdline(self):
-        with catch_zombie(self):
-            return cext.proc_cmdline(self.pid)
-
-    @wrap_exceptions
-    def environ(self):
-        with catch_zombie(self):
-            return parse_environ_block(cext.proc_environ(self.pid))
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._get_kinfo_proc()[kinfo_proc_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def cwd(self):
-        with catch_zombie(self):
-            return cext.proc_cwd(self.pid)
-
-    @wrap_exceptions
-    def uids(self):
-        rawtuple = self._get_kinfo_proc()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['ruid']],
-            rawtuple[kinfo_proc_map['euid']],
-            rawtuple[kinfo_proc_map['suid']])
-
-    @wrap_exceptions
-    def gids(self):
-        rawtuple = self._get_kinfo_proc()
-        return _common.puids(
-            rawtuple[kinfo_proc_map['rgid']],
-            rawtuple[kinfo_proc_map['egid']],
-            rawtuple[kinfo_proc_map['sgid']])
-
-    @wrap_exceptions
-    def terminal(self):
-        tty_nr = self._get_kinfo_proc()[kinfo_proc_map['ttynr']]
-        tmap = _psposix.get_terminal_map()
-        try:
-            return tmap[tty_nr]
-        except KeyError:
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        rawtuple = self._get_pidtaskinfo()
-        return pmem(
-            rawtuple[pidtaskinfo_map['rss']],
-            rawtuple[pidtaskinfo_map['vms']],
-            rawtuple[pidtaskinfo_map['pfaults']],
-            rawtuple[pidtaskinfo_map['pageins']],
-        )
-
-    @wrap_exceptions
-    def memory_full_info(self):
-        basic_mem = self.memory_info()
-        uss = cext.proc_memory_uss(self.pid)
-        return pfullmem(*basic_mem + (uss, ))
-
-    @wrap_exceptions
-    def cpu_times(self):
-        rawtuple = self._get_pidtaskinfo()
-        return _common.pcputimes(
-            rawtuple[pidtaskinfo_map['cpuutime']],
-            rawtuple[pidtaskinfo_map['cpustime']],
-            # children user / system times are not retrievable (set to 0)
-            0.0, 0.0)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._get_kinfo_proc()[kinfo_proc_map['ctime']]
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        # Unvoluntary value seems not to be available;
-        # getrusage() numbers seems to confirm this theory.
-        # We set it to 0.
-        vol = self._get_pidtaskinfo()[pidtaskinfo_map['volctxsw']]
-        return _common.pctxsw(vol, 0)
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._get_pidtaskinfo()[pidtaskinfo_map['numthreads']]
-
-    @wrap_exceptions
-    def open_files(self):
-        if self.pid == 0:
-            return []
-        files = []
-        with catch_zombie(self):
-            rawlist = cext.proc_open_files(self.pid)
-        for path, fd in rawlist:
-            if isfile_strict(path):
-                ntuple = _common.popenfile(path, fd)
-                files.append(ntuple)
-        return files
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        if kind not in conn_tmap:
-            raise ValueError("invalid %r kind argument; choose between %s"
-                             % (kind, ', '.join([repr(x) for x in conn_tmap])))
-        families, types = conn_tmap[kind]
-        with catch_zombie(self):
-            rawlist = cext.proc_connections(self.pid, families, types)
-        ret = []
-        for item in rawlist:
-            fd, fam, type, laddr, raddr, status = item
-            nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status,
-                                TCP_STATUSES)
-            ret.append(nt)
-        return ret
-
-    @wrap_exceptions
-    def num_fds(self):
-        if self.pid == 0:
-            return 0
-        with catch_zombie(self):
-            return cext.proc_num_fds(self.pid)
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
-
-    @wrap_exceptions
-    def nice_get(self):
-        with catch_zombie(self):
-            return cext_posix.getpriority(self.pid)
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        with catch_zombie(self):
-            return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def status(self):
-        code = self._get_kinfo_proc()[kinfo_proc_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def threads(self):
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        return retlist
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psposix.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psposix.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psposix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psposix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Routines common to all posix systems."""
-
-import glob
-import os
-import sys
-import time
-
-from ._common import memoize
-from ._common import sdiskusage
-from ._common import TimeoutExpired
-from ._common import usage_percent
-from ._compat import ChildProcessError
-from ._compat import FileNotFoundError
-from ._compat import InterruptedError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-from ._compat import unicode
-
-
-__all__ = ['pid_exists', 'wait_pid', 'disk_usage', 'get_terminal_map']
-
-
-def pid_exists(pid):
-    """Check whether pid exists in the current process table."""
-    if pid == 0:
-        # According to "man 2 kill" PID 0 has a special meaning:
-        # it refers to <<every process in the process group of the
-        # calling process>> so we don't want to go any further.
-        # If we get here it means this UNIX platform *does* have
-        # a process with id 0.
-        return True
-    try:
-        os.kill(pid, 0)
-    except ProcessLookupError:
-        return False
-    except PermissionError:
-        # EPERM clearly means there's a process to deny access to
-        return True
-    # According to "man 2 kill" possible error values are
-    # (EINVAL, EPERM, ESRCH)
-    else:
-        return True
-
-
-def wait_pid(pid, timeout=None, proc_name=None):
-    """Wait for process with pid 'pid' to terminate and return its
-    exit status code as an integer.
-
-    If pid is not a children of os.getpid() (current process) just
-    waits until the process disappears and return None.
-
-    If pid does not exist at all return None immediately.
-
-    Raise TimeoutExpired on timeout expired.
-    """
-    def check_timeout(delay):
-        if timeout is not None:
-            if timer() >= stop_at:
-                raise TimeoutExpired(timeout, pid=pid, name=proc_name)
-        time.sleep(delay)
-        return min(delay * 2, 0.04)
-
-    timer = getattr(time, 'monotonic', time.time)
-    if timeout is not None:
-        def waitcall():
-            return os.waitpid(pid, os.WNOHANG)
-        stop_at = timer() + timeout
-    else:
-        def waitcall():
-            return os.waitpid(pid, 0)
-
-    delay = 0.0001
-    while True:
-        try:
-            retpid, status = waitcall()
-        except InterruptedError:
-            delay = check_timeout(delay)
-        except ChildProcessError:
-            # This has two meanings:
-            # - pid is not a child of os.getpid() in which case
-            #   we keep polling until it's gone
-            # - pid never existed in the first place
-            # In both cases we'll eventually return None as we
-            # can't determine its exit status code.
-            while True:
-                if pid_exists(pid):
-                    delay = check_timeout(delay)
-                else:
-                    return
-        else:
-            if retpid == 0:
-                # WNOHANG was used, pid is still running
-                delay = check_timeout(delay)
-                continue
-            # process exited due to a signal; return the integer of
-            # that signal
-            if os.WIFSIGNALED(status):
-                return -os.WTERMSIG(status)
-            # process exited using exit(2) system call; return the
-            # integer exit(2) system call has been called with
-            elif os.WIFEXITED(status):
-                return os.WEXITSTATUS(status)
-            else:
-                # should never happen
-                raise ValueError("unknown process exit status %r" % status)
-
-
-def disk_usage(path):
-    """Return disk usage associated with path.
-    Note: UNIX usually reserves 5% disk space which is not accessible
-    by user. In this function "total" and "used" values reflect the
-    total and used disk space whereas "free" and "percent" represent
-    the "free" and "used percent" user disk space.
-    """
-    if PY3:
-        st = os.statvfs(path)
-    else:
-        # os.statvfs() does not support unicode on Python 2:
-        # - https://github.com/giampaolo/psutil/issues/416
-        # - http://bugs.python.org/issue18695
-        try:
-            st = os.statvfs(path)
-        except UnicodeEncodeError:
-            if isinstance(path, unicode):
-                try:
-                    path = path.encode(sys.getfilesystemencoding())
-                except UnicodeEncodeError:
-                    pass
-                st = os.statvfs(path)
-            else:
-                raise
-
-    # Total space which is only available to root (unless changed
-    # at system level).
-    total = (st.f_blocks * st.f_frsize)
-    # Remaining free space usable by root.
-    avail_to_root = (st.f_bfree * st.f_frsize)
-    # Remaining free space usable by user.
-    avail_to_user = (st.f_bavail * st.f_frsize)
-    # Total space being used in general.
-    used = (total - avail_to_root)
-    # Total space which is available to user (same as 'total' but
-    # for the user).
-    total_user = used + avail_to_user
-    # User usage percent compared to the total amount of space
-    # the user can use. This number would be higher if compared
-    # to root's because the user has less space (usually -5%).
-    usage_percent_user = usage_percent(used, total_user, round_=1)
-
-    # NB: the percentage is -5% than what shown by df due to
-    # reserved blocks that we are currently not considering:
-    # https://github.com/giampaolo/psutil/issues/829#issuecomment-223750462
-    return sdiskusage(
-        total=total, used=used, free=avail_to_user, percent=usage_percent_user)
-
-
-@memoize
-def get_terminal_map():
-    """Get a map of device-id -> path as a dict.
-    Used by Process.terminal()
-    """
-    ret = {}
-    ls = glob.glob('/dev/tty*') + glob.glob('/dev/pts/*')
-    for name in ls:
-        assert name not in ret, name
-        try:
-            ret[os.stat(name).st_rdev] = name
-        except FileNotFoundError:
-            pass
-    return ret
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pssunos.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pssunos.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pssunos.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pssunos.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,725 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Sun OS Solaris platform implementation."""
-
-import errno
-import functools
-import os
-import socket
-import subprocess
-import sys
-from collections import namedtuple
-from socket import AF_INET
-
-from . import _common
-from . import _psposix
-from . import _psutil_posix as cext_posix
-from . import _psutil_sunos as cext
-from ._common import AccessDenied
-from ._common import AF_INET6
-from ._common import debug
-from ._common import get_procfs_path
-from ._common import isfile_strict
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import sockfam_to_enum
-from ._common import socktype_to_enum
-from ._common import usage_percent
-from ._common import ZombieProcess
-from ._compat import b
-from ._compat import FileNotFoundError
-from ._compat import PermissionError
-from ._compat import ProcessLookupError
-from ._compat import PY3
-
-
-__extra__all__ = ["CONN_IDLE", "CONN_BOUND", "PROCFS_PATH"]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-
-PAGE_SIZE = os.sysconf('SC_PAGE_SIZE')
-AF_LINK = cext_posix.AF_LINK
-IS_64_BIT = sys.maxsize > 2**32
-
-CONN_IDLE = "IDLE"
-CONN_BOUND = "BOUND"
-
-PROC_STATUSES = {
-    cext.SSLEEP: _common.STATUS_SLEEPING,
-    cext.SRUN: _common.STATUS_RUNNING,
-    cext.SZOMB: _common.STATUS_ZOMBIE,
-    cext.SSTOP: _common.STATUS_STOPPED,
-    cext.SIDL: _common.STATUS_IDLE,
-    cext.SONPROC: _common.STATUS_RUNNING,  # same as run
-    cext.SWAIT: _common.STATUS_WAITING,
-}
-
-TCP_STATUSES = {
-    cext.TCPS_ESTABLISHED: _common.CONN_ESTABLISHED,
-    cext.TCPS_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.TCPS_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.TCPS_FIN_WAIT_1: _common.CONN_FIN_WAIT1,
-    cext.TCPS_FIN_WAIT_2: _common.CONN_FIN_WAIT2,
-    cext.TCPS_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.TCPS_CLOSED: _common.CONN_CLOSE,
-    cext.TCPS_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.TCPS_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.TCPS_LISTEN: _common.CONN_LISTEN,
-    cext.TCPS_CLOSING: _common.CONN_CLOSING,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-    cext.TCPS_IDLE: CONN_IDLE,  # sunos specific
-    cext.TCPS_BOUND: CONN_BOUND,  # sunos specific
-}
-
-proc_info_map = dict(
-    ppid=0,
-    rss=1,
-    vms=2,
-    create_time=3,
-    nice=4,
-    num_threads=5,
-    status=6,
-    ttynr=7,
-    uid=8,
-    euid=9,
-    gid=10,
-    egid=11)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes', ['user', 'system', 'idle', 'iowait'])
-# psutil.cpu_times(percpu=True)
-pcputimes = namedtuple('pcputimes',
-                       ['user', 'system', 'children_user', 'children_system'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-# psutil.Process.memory_info()
-pmem = namedtuple('pmem', ['rss', 'vms'])
-pfullmem = pmem
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple('pmmap_grouped',
-                           ['path', 'rss', 'anonymous', 'locked'])
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """Report virtual memory metrics."""
-    # we could have done this with kstat, but IMHO this is good enough
-    total = os.sysconf('SC_PHYS_PAGES') * PAGE_SIZE
-    # note: there's no difference on Solaris
-    free = avail = os.sysconf('SC_AVPHYS_PAGES') * PAGE_SIZE
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return svmem(total, avail, percent, used, free)
-
-
-def swap_memory():
-    """Report swap memory metrics."""
-    sin, sout = cext.swap_mem()
-    # XXX
-    # we are supposed to get total/free by doing so:
-    # http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/
-    #     usr/src/cmd/swap/swap.c
-    # ...nevertheless I can't manage to obtain the same numbers as 'swap'
-    # cmdline utility, so let's parse its output (sigh!)
-    p = subprocess.Popen(['/usr/bin/env', 'PATH=/usr/sbin:/sbin:%s' %
-                          os.environ['PATH'], 'swap', '-l'],
-                         stdout=subprocess.PIPE)
-    stdout, stderr = p.communicate()
-    if PY3:
-        stdout = stdout.decode(sys.stdout.encoding)
-    if p.returncode != 0:
-        raise RuntimeError("'swap -l' failed (retcode=%s)" % p.returncode)
-
-    lines = stdout.strip().split('\n')[1:]
-    if not lines:
-        raise RuntimeError('no swap device(s) configured')
-    total = free = 0
-    for line in lines:
-        line = line.split()
-        t, f = line[-2:]
-        total += int(int(t) * 512)
-        free += int(int(f) * 512)
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent,
-                         sin * PAGE_SIZE, sout * PAGE_SIZE)
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system-wide CPU times as a named tuple"""
-    ret = cext.per_cpu_times()
-    return scputimes(*[sum(x) for x in zip(*ret)])
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples"""
-    ret = cext.per_cpu_times()
-    return [scputimes(*x) for x in ret]
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    try:
-        return os.sysconf("SC_NPROCESSORS_ONLN")
-    except ValueError:
-        # mimic os.cpu_count() behavior
-        return None
-
-
-def cpu_count_physical():
-    """Return the number of physical CPUs in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    """Return various CPU stats as a named tuple."""
-    ctx_switches, interrupts, syscalls, traps = cext.cpu_stats()
-    soft_interrupts = 0
-    return _common.scpustats(ctx_switches, interrupts, soft_interrupts,
-                             syscalls)
-
-
-# =====================================================================
-# --- disks
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-disk_usage = _psposix.disk_usage
-
-
-def disk_partitions(all=False):
-    """Return system disk partitions."""
-    # TODO - the filtering logic should be better checked so that
-    # it tries to reflect 'df' as much as possible
-    retlist = []
-    partitions = cext.disk_partitions()
-    for partition in partitions:
-        device, mountpoint, fstype, opts = partition
-        if device == 'none':
-            device = ''
-        if not all:
-            # Differently from, say, Linux, we don't have a list of
-            # common fs types so the best we can do, AFAIK, is to
-            # filter by filesystem having a total size > 0.
-            try:
-                if not disk_usage(mountpoint).total:
-                    continue
-            except OSError as err:
-                # https://github.com/giampaolo/psutil/issues/1674
-                debug("skipping %r: %r" % (mountpoint, err))
-                continue
-        ntuple = _common.sdiskpart(device, mountpoint, fstype, opts)
-        retlist.append(ntuple)
-    return retlist
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-net_io_counters = cext.net_io_counters
-net_if_addrs = cext_posix.net_if_addrs
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    Only INET sockets are returned (UNIX are not).
-    """
-    cmap = _common.conn_tmap.copy()
-    if _pid == -1:
-        cmap.pop('unix', 0)
-    if kind not in cmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in cmap])))
-    families, types = _common.conn_tmap[kind]
-    rawlist = cext.net_connections(_pid)
-    ret = set()
-    for item in rawlist:
-        fd, fam, type_, laddr, raddr, status, pid = item
-        if fam not in families:
-            continue
-        if type_ not in types:
-            continue
-        # TODO: refactor and use _common.conn_to_ntuple.
-        if fam in (AF_INET, AF_INET6):
-            if laddr:
-                laddr = _common.addr(*laddr)
-            if raddr:
-                raddr = _common.addr(*raddr)
-        status = TCP_STATUSES[status]
-        fam = sockfam_to_enum(fam)
-        type_ = socktype_to_enum(type_)
-        if _pid == -1:
-            nt = _common.sconn(fd, fam, type_, laddr, raddr, status, pid)
-        else:
-            nt = _common.pconn(fd, fam, type_, laddr, raddr, status)
-        ret.add(nt)
-    return list(ret)
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    ret = cext.net_if_stats()
-    for name, items in ret.items():
-        isup, duplex, speed, mtu = items
-        if hasattr(_common, 'NicDuplex'):
-            duplex = _common.NicDuplex(duplex)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    return cext.boot_time()
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    localhost = (':0.0', ':0')
-    for item in rawlist:
-        user, tty, hostname, tstamp, user_process, pid = item
-        # note: the underlying C function includes entries about
-        # system boot, run level and others.  We might want
-        # to use them in the future.
-        if not user_process:
-            continue
-        if hostname in localhost:
-            hostname = 'localhost'
-        nt = _common.suser(user, tty, hostname, tstamp, pid)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-def pids():
-    """Returns a list of PIDs currently running on the system."""
-    return [int(x) for x in os.listdir(b(get_procfs_path())) if x.isdigit()]
-
-
-def pid_exists(pid):
-    """Check for the existence of a unix pid."""
-    return _psposix.pid_exists(pid)
-
-
-def wrap_exceptions(fun):
-    """Call callable into a try/except clause and translate ENOENT,
-    EACCES and EPERM in NoSuchProcess or AccessDenied exceptions.
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except (FileNotFoundError, ProcessLookupError):
-            # ENOENT (no such file or directory) gets raised on open().
-            # ESRCH (no such process) can get raised on read() if
-            # process is gone in meantime.
-            if not pid_exists(self.pid):
-                raise NoSuchProcess(self.pid, self._name)
-            else:
-                raise ZombieProcess(self.pid, self._name, self._ppid)
-        except PermissionError:
-            raise AccessDenied(self.pid, self._name)
-        except OSError:
-            if self.pid == 0:
-                if 0 in pids():
-                    raise AccessDenied(self.pid, self._name)
-                else:
-                    raise
-            raise
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-        self._procfs_path = get_procfs_path()
-
-    def _assert_alive(self):
-        """Raise NSP if the process disappeared on us."""
-        # For those C function who do not raise NSP, possibly returning
-        # incorrect or incomplete result.
-        os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-    def oneshot_enter(self):
-        self._proc_name_and_args.cache_activate(self)
-        self._proc_basic_info.cache_activate(self)
-        self._proc_cred.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_name_and_args.cache_deactivate(self)
-        self._proc_basic_info.cache_deactivate(self)
-        self._proc_cred.cache_deactivate(self)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_name_and_args(self):
-        return cext.proc_name_and_args(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_basic_info(self):
-        if self.pid == 0 and not \
-                os.path.exists('%s/%s/psinfo' % (self._procfs_path, self.pid)):
-            raise AccessDenied(self.pid)
-        ret = cext.proc_basic_info(self.pid, self._procfs_path)
-        assert len(ret) == len(proc_info_map)
-        return ret
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def _proc_cred(self):
-        return cext.proc_cred(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def name(self):
-        # note: max len == 15
-        return self._proc_name_and_args()[0]
-
-    @wrap_exceptions
-    def exe(self):
-        try:
-            return os.readlink(
-                "%s/%s/path/a.out" % (self._procfs_path, self.pid))
-        except OSError:
-            pass    # continue and guess the exe name from the cmdline
-        # Will be guessed later from cmdline but we want to explicitly
-        # invoke cmdline here in order to get an AccessDenied
-        # exception if the user has not enough privileges.
-        self.cmdline()
-        return ""
-
-    @wrap_exceptions
-    def cmdline(self):
-        return self._proc_name_and_args()[1].split(' ')
-
-    @wrap_exceptions
-    def environ(self):
-        return cext.proc_environ(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def create_time(self):
-        return self._proc_basic_info()[proc_info_map['create_time']]
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_basic_info()[proc_info_map['num_threads']]
-
-    @wrap_exceptions
-    def nice_get(self):
-        # Note #1: getpriority(3) doesn't work for realtime processes.
-        # Psinfo is what ps uses, see:
-        # https://github.com/giampaolo/psutil/issues/1194
-        return self._proc_basic_info()[proc_info_map['nice']]
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        if self.pid in (2, 3):
-            # Special case PIDs: internally setpriority(3) return ESRCH
-            # (no such process), no matter what.
-            # The process actually exists though, as it has a name,
-            # creation time, etc.
-            raise AccessDenied(self.pid, self._name)
-        return cext_posix.setpriority(self.pid, value)
-
-    @wrap_exceptions
-    def ppid(self):
-        self._ppid = self._proc_basic_info()[proc_info_map['ppid']]
-        return self._ppid
-
-    @wrap_exceptions
-    def uids(self):
-        try:
-            real, effective, saved, _, _, _ = self._proc_cred()
-        except AccessDenied:
-            real = self._proc_basic_info()[proc_info_map['uid']]
-            effective = self._proc_basic_info()[proc_info_map['euid']]
-            saved = None
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def gids(self):
-        try:
-            _, _, _, real, effective, saved = self._proc_cred()
-        except AccessDenied:
-            real = self._proc_basic_info()[proc_info_map['gid']]
-            effective = self._proc_basic_info()[proc_info_map['egid']]
-            saved = None
-        return _common.puids(real, effective, saved)
-
-    @wrap_exceptions
-    def cpu_times(self):
-        try:
-            times = cext.proc_cpu_times(self.pid, self._procfs_path)
-        except OSError as err:
-            if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                # We may get here if we attempt to query a 64bit process
-                # with a 32bit python.
-                # Error originates from read() and also tools like "cat"
-                # fail in the same way (!).
-                # Since there simply is no way to determine CPU times we
-                # return 0.0 as a fallback. See:
-                # https://github.com/giampaolo/psutil/issues/857
-                times = (0.0, 0.0, 0.0, 0.0)
-            else:
-                raise
-        return _common.pcputimes(*times)
-
-    @wrap_exceptions
-    def cpu_num(self):
-        return cext.proc_cpu_num(self.pid, self._procfs_path)
-
-    @wrap_exceptions
-    def terminal(self):
-        procfs_path = self._procfs_path
-        hit_enoent = False
-        tty = wrap_exceptions(
-            self._proc_basic_info()[proc_info_map['ttynr']])
-        if tty != cext.PRNODEV:
-            for x in (0, 1, 2, 255):
-                try:
-                    return os.readlink(
-                        '%s/%d/path/%d' % (procfs_path, self.pid, x))
-                except FileNotFoundError:
-                    hit_enoent = True
-                    continue
-        if hit_enoent:
-            self._assert_alive()
-
-    @wrap_exceptions
-    def cwd(self):
-        # /proc/PID/path/cwd may not be resolved by readlink() even if
-        # it exists (ls shows it). If that's the case and the process
-        # is still alive return None (we can return None also on BSD).
-        # Reference: http://goo.gl/55XgO
-        procfs_path = self._procfs_path
-        try:
-            return os.readlink("%s/%s/path/cwd" % (procfs_path, self.pid))
-        except FileNotFoundError:
-            os.stat("%s/%s" % (procfs_path, self.pid))  # raise NSP or AD
-            return None
-
-    @wrap_exceptions
-    def memory_info(self):
-        ret = self._proc_basic_info()
-        rss = ret[proc_info_map['rss']] * 1024
-        vms = ret[proc_info_map['vms']] * 1024
-        return pmem(rss, vms)
-
-    memory_full_info = memory_info
-
-    @wrap_exceptions
-    def status(self):
-        code = self._proc_basic_info()[proc_info_map['status']]
-        # XXX is '?' legit? (we're not supposed to return it anyway)
-        return PROC_STATUSES.get(code, '?')
-
-    @wrap_exceptions
-    def threads(self):
-        procfs_path = self._procfs_path
-        ret = []
-        tids = os.listdir('%s/%d/lwp' % (procfs_path, self.pid))
-        hit_enoent = False
-        for tid in tids:
-            tid = int(tid)
-            try:
-                utime, stime = cext.query_process_thread(
-                    self.pid, tid, procfs_path)
-            except EnvironmentError as err:
-                if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                    # We may get here if we attempt to query a 64bit process
-                    # with a 32bit python.
-                    # Error originates from read() and also tools like "cat"
-                    # fail in the same way (!).
-                    # Since there simply is no way to determine CPU times we
-                    # return 0.0 as a fallback. See:
-                    # https://github.com/giampaolo/psutil/issues/857
-                    continue
-                # ENOENT == thread gone in meantime
-                if err.errno == errno.ENOENT:
-                    hit_enoent = True
-                    continue
-                raise
-            else:
-                nt = _common.pthread(tid, utime, stime)
-                ret.append(nt)
-        if hit_enoent:
-            self._assert_alive()
-        return ret
-
-    @wrap_exceptions
-    def open_files(self):
-        retlist = []
-        hit_enoent = False
-        procfs_path = self._procfs_path
-        pathdir = '%s/%d/path' % (procfs_path, self.pid)
-        for fd in os.listdir('%s/%d/fd' % (procfs_path, self.pid)):
-            path = os.path.join(pathdir, fd)
-            if os.path.islink(path):
-                try:
-                    file = os.readlink(path)
-                except FileNotFoundError:
-                    hit_enoent = True
-                    continue
-                else:
-                    if isfile_strict(file):
-                        retlist.append(_common.popenfile(file, int(fd)))
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    def _get_unix_sockets(self, pid):
-        """Get UNIX sockets used by process by parsing 'pfiles' output."""
-        # TODO: rewrite this in C (...but the damn netstat source code
-        # does not include this part! Argh!!)
-        cmd = "pfiles %s" % pid
-        p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE)
-        stdout, stderr = p.communicate()
-        if PY3:
-            stdout, stderr = [x.decode(sys.stdout.encoding)
-                              for x in (stdout, stderr)]
-        if p.returncode != 0:
-            if 'permission denied' in stderr.lower():
-                raise AccessDenied(self.pid, self._name)
-            if 'no such process' in stderr.lower():
-                raise NoSuchProcess(self.pid, self._name)
-            raise RuntimeError("%r command error\n%s" % (cmd, stderr))
-
-        lines = stdout.split('\n')[2:]
-        for i, line in enumerate(lines):
-            line = line.lstrip()
-            if line.startswith('sockname: AF_UNIX'):
-                path = line.split(' ', 2)[2]
-                type = lines[i - 2].strip()
-                if type == 'SOCK_STREAM':
-                    type = socket.SOCK_STREAM
-                elif type == 'SOCK_DGRAM':
-                    type = socket.SOCK_DGRAM
-                else:
-                    type = -1
-                yield (-1, socket.AF_UNIX, type, path, "", _common.CONN_NONE)
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        ret = net_connections(kind, _pid=self.pid)
-        # The underlying C implementation retrieves all OS connections
-        # and filters them by PID.  At this point we can't tell whether
-        # an empty list means there were no connections for process or
-        # process is no longer active so we force NSP in case the PID
-        # is no longer there.
-        if not ret:
-            # will raise NSP if process is gone
-            os.stat('%s/%s' % (self._procfs_path, self.pid))
-
-        # UNIX sockets
-        if kind in ('all', 'unix'):
-            ret.extend([_common.pconn(*conn) for conn in
-                        self._get_unix_sockets(self.pid)])
-        return ret
-
-    nt_mmap_grouped = namedtuple('mmap', 'path rss anon locked')
-    nt_mmap_ext = namedtuple('mmap', 'addr perms path rss anon locked')
-
-    @wrap_exceptions
-    def memory_maps(self):
-        def toaddr(start, end):
-            return '%s-%s' % (hex(start)[2:].strip('L'),
-                              hex(end)[2:].strip('L'))
-
-        procfs_path = self._procfs_path
-        retlist = []
-        try:
-            rawlist = cext.proc_memory_maps(self.pid, procfs_path)
-        except OSError as err:
-            if err.errno == errno.EOVERFLOW and not IS_64_BIT:
-                # We may get here if we attempt to query a 64bit process
-                # with a 32bit python.
-                # Error originates from read() and also tools like "cat"
-                # fail in the same way (!).
-                # Since there simply is no way to determine CPU times we
-                # return 0.0 as a fallback. See:
-                # https://github.com/giampaolo/psutil/issues/857
-                return []
-            else:
-                raise
-        hit_enoent = False
-        for item in rawlist:
-            addr, addrsize, perm, name, rss, anon, locked = item
-            addr = toaddr(addr, addrsize)
-            if not name.startswith('['):
-                try:
-                    name = os.readlink(
-                        '%s/%s/path/%s' % (procfs_path, self.pid, name))
-                except OSError as err:
-                    if err.errno == errno.ENOENT:
-                        # sometimes the link may not be resolved by
-                        # readlink() even if it exists (ls shows it).
-                        # If that's the case we just return the
-                        # unresolved link path.
-                        # This seems an incosistency with /proc similar
-                        # to: http://goo.gl/55XgO
-                        name = '%s/%s/path/%s' % (procfs_path, self.pid, name)
-                        hit_enoent = True
-                    else:
-                        raise
-            retlist.append((addr, perm, name, rss, anon, locked))
-        if hit_enoent:
-            self._assert_alive()
-        return retlist
-
-    @wrap_exceptions
-    def num_fds(self):
-        return len(os.listdir("%s/%s/fd" % (self._procfs_path, self.pid)))
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        return _common.pctxsw(
-            *cext.proc_num_ctx_switches(self.pid, self._procfs_path))
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        return _psposix.wait_pid(self.pid, timeout, self._name)
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psutil_windows.pyd and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_psutil_windows.pyd differ
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pswindows.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pswindows.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pswindows.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/_pswindows.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1105 +0,0 @@
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Windows platform implementation."""
-
-import contextlib
-import errno
-import functools
-import os
-import signal
-import sys
-import time
-from collections import namedtuple
-
-from . import _common
-from ._common import AccessDenied
-from ._common import conn_tmap
-from ._common import conn_to_ntuple
-from ._common import debug
-from ._common import ENCODING
-from ._common import ENCODING_ERRS
-from ._common import isfile_strict
-from ._common import memoize
-from ._common import memoize_when_activated
-from ._common import NoSuchProcess
-from ._common import parse_environ_block
-from ._common import TimeoutExpired
-from ._common import usage_percent
-from ._compat import long
-from ._compat import lru_cache
-from ._compat import PY3
-from ._compat import unicode
-from ._compat import xrange
-from ._psutil_windows import ABOVE_NORMAL_PRIORITY_CLASS
-from ._psutil_windows import BELOW_NORMAL_PRIORITY_CLASS
-from ._psutil_windows import HIGH_PRIORITY_CLASS
-from ._psutil_windows import IDLE_PRIORITY_CLASS
-from ._psutil_windows import NORMAL_PRIORITY_CLASS
-from ._psutil_windows import REALTIME_PRIORITY_CLASS
-
-try:
-    from . import _psutil_windows as cext
-except ImportError as err:
-    if str(err).lower().startswith("dll load failed") and \
-            sys.getwindowsversion()[0] < 6:
-        # We may get here if:
-        # 1) we are on an old Windows version
-        # 2) psutil was installed via pip + wheel
-        # See: https://github.com/giampaolo/psutil/issues/811
-        msg = "this Windows version is too old (< Windows Vista); "
-        msg += "psutil 3.4.2 is the latest version which supports Windows "
-        msg += "2000, XP and 2003 server"
-        raise RuntimeError(msg)
-    else:
-        raise
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-# process priority constants, import from __init__.py:
-# http://msdn.microsoft.com/en-us/library/ms686219(v=vs.85).aspx
-__extra__all__ = [
-    "win_service_iter", "win_service_get",
-    # Process priority
-    "ABOVE_NORMAL_PRIORITY_CLASS", "BELOW_NORMAL_PRIORITY_CLASS",
-    "HIGH_PRIORITY_CLASS", "IDLE_PRIORITY_CLASS", "NORMAL_PRIORITY_CLASS",
-    "REALTIME_PRIORITY_CLASS",
-    # IO priority
-    "IOPRIO_VERYLOW", "IOPRIO_LOW", "IOPRIO_NORMAL", "IOPRIO_HIGH",
-    # others
-    "CONN_DELETE_TCB", "AF_LINK",
-]
-
-
-# =====================================================================
-# --- globals
-# =====================================================================
-
-CONN_DELETE_TCB = "DELETE_TCB"
-ERROR_PARTIAL_COPY = 299
-PYPY = '__pypy__' in sys.builtin_module_names
-
-if enum is None:
-    AF_LINK = -1
-else:
-    AddressFamily = enum.IntEnum('AddressFamily', {'AF_LINK': -1})
-    AF_LINK = AddressFamily.AF_LINK
-
-TCP_STATUSES = {
-    cext.MIB_TCP_STATE_ESTAB: _common.CONN_ESTABLISHED,
-    cext.MIB_TCP_STATE_SYN_SENT: _common.CONN_SYN_SENT,
-    cext.MIB_TCP_STATE_SYN_RCVD: _common.CONN_SYN_RECV,
-    cext.MIB_TCP_STATE_FIN_WAIT1: _common.CONN_FIN_WAIT1,
-    cext.MIB_TCP_STATE_FIN_WAIT2: _common.CONN_FIN_WAIT2,
-    cext.MIB_TCP_STATE_TIME_WAIT: _common.CONN_TIME_WAIT,
-    cext.MIB_TCP_STATE_CLOSED: _common.CONN_CLOSE,
-    cext.MIB_TCP_STATE_CLOSE_WAIT: _common.CONN_CLOSE_WAIT,
-    cext.MIB_TCP_STATE_LAST_ACK: _common.CONN_LAST_ACK,
-    cext.MIB_TCP_STATE_LISTEN: _common.CONN_LISTEN,
-    cext.MIB_TCP_STATE_CLOSING: _common.CONN_CLOSING,
-    cext.MIB_TCP_STATE_DELETE_TCB: CONN_DELETE_TCB,
-    cext.PSUTIL_CONN_NONE: _common.CONN_NONE,
-}
-
-if enum is not None:
-    class Priority(enum.IntEnum):
-        ABOVE_NORMAL_PRIORITY_CLASS = ABOVE_NORMAL_PRIORITY_CLASS
-        BELOW_NORMAL_PRIORITY_CLASS = BELOW_NORMAL_PRIORITY_CLASS
-        HIGH_PRIORITY_CLASS = HIGH_PRIORITY_CLASS
-        IDLE_PRIORITY_CLASS = IDLE_PRIORITY_CLASS
-        NORMAL_PRIORITY_CLASS = NORMAL_PRIORITY_CLASS
-        REALTIME_PRIORITY_CLASS = REALTIME_PRIORITY_CLASS
-
-    globals().update(Priority.__members__)
-
-if enum is None:
-    IOPRIO_VERYLOW = 0
-    IOPRIO_LOW = 1
-    IOPRIO_NORMAL = 2
-    IOPRIO_HIGH = 3
-else:
-    class IOPriority(enum.IntEnum):
-        IOPRIO_VERYLOW = 0
-        IOPRIO_LOW = 1
-        IOPRIO_NORMAL = 2
-        IOPRIO_HIGH = 3
-    globals().update(IOPriority.__members__)
-
-pinfo_map = dict(
-    num_handles=0,
-    ctx_switches=1,
-    user_time=2,
-    kernel_time=3,
-    create_time=4,
-    num_threads=5,
-    io_rcount=6,
-    io_wcount=7,
-    io_rbytes=8,
-    io_wbytes=9,
-    io_count_others=10,
-    io_bytes_others=11,
-    num_page_faults=12,
-    peak_wset=13,
-    wset=14,
-    peak_paged_pool=15,
-    paged_pool=16,
-    peak_non_paged_pool=17,
-    non_paged_pool=18,
-    pagefile=19,
-    peak_pagefile=20,
-    mem_private=21,
-)
-
-
-# =====================================================================
-# --- named tuples
-# =====================================================================
-
-
-# psutil.cpu_times()
-scputimes = namedtuple('scputimes',
-                       ['user', 'system', 'idle', 'interrupt', 'dpc'])
-# psutil.virtual_memory()
-svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free'])
-# psutil.Process.memory_info()
-pmem = namedtuple(
-    'pmem', ['rss', 'vms',
-             'num_page_faults', 'peak_wset', 'wset', 'peak_paged_pool',
-             'paged_pool', 'peak_nonpaged_pool', 'nonpaged_pool',
-             'pagefile', 'peak_pagefile', 'private'])
-# psutil.Process.memory_full_info()
-pfullmem = namedtuple('pfullmem', pmem._fields + ('uss', ))
-# psutil.Process.memory_maps(grouped=True)
-pmmap_grouped = namedtuple('pmmap_grouped', ['path', 'rss'])
-# psutil.Process.memory_maps(grouped=False)
-pmmap_ext = namedtuple(
-    'pmmap_ext', 'addr perms ' + ' '.join(pmmap_grouped._fields))
-# psutil.Process.io_counters()
-pio = namedtuple('pio', ['read_count', 'write_count',
-                         'read_bytes', 'write_bytes',
-                         'other_count', 'other_bytes'])
-
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-@lru_cache(maxsize=512)
-def convert_dos_path(s):
-    r"""Convert paths using native DOS format like:
-        "\Device\HarddiskVolume1\Windows\systemew\file.txt"
-    into:
-        "C:\Windows\systemew\file.txt"
-    """
-    rawdrive = '\\'.join(s.split('\\')[:3])
-    driveletter = cext.win32_QueryDosDevice(rawdrive)
-    remainder = s[len(rawdrive):]
-    return os.path.join(driveletter, remainder)
-
-
-def py2_strencode(s):
-    """Encode a unicode string to a byte string by using the default fs
-    encoding + "replace" error handler.
-    """
-    if PY3:
-        return s
-    else:
-        if isinstance(s, str):
-            return s
-        else:
-            return s.encode(ENCODING, ENCODING_ERRS)
-
-
-@memoize
-def getpagesize():
-    return cext.getpagesize()
-
-
-# =====================================================================
-# --- memory
-# =====================================================================
-
-
-def virtual_memory():
-    """System virtual memory as a namedtuple."""
-    mem = cext.virtual_mem()
-    totphys, availphys, totpagef, availpagef, totvirt, freevirt = mem
-    #
-    total = totphys
-    avail = availphys
-    free = availphys
-    used = total - avail
-    percent = usage_percent((total - avail), total, round_=1)
-    return svmem(total, avail, percent, used, free)
-
-
-def swap_memory():
-    """Swap system memory as a (total, used, free, sin, sout) tuple."""
-    mem = cext.virtual_mem()
-    total = mem[2]
-    free = mem[3]
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sswap(total, used, free, percent, 0, 0)
-
-
-# =====================================================================
-# --- disk
-# =====================================================================
-
-
-disk_io_counters = cext.disk_io_counters
-
-
-def disk_usage(path):
-    """Return disk usage associated with path."""
-    if PY3 and isinstance(path, bytes):
-        # XXX: do we want to use "strict"? Probably yes, in order
-        # to fail immediately. After all we are accepting input here...
-        path = path.decode(ENCODING, errors="strict")
-    total, free = cext.disk_usage(path)
-    used = total - free
-    percent = usage_percent(used, total, round_=1)
-    return _common.sdiskusage(total, used, free, percent)
-
-
-def disk_partitions(all):
-    """Return disk partitions."""
-    rawlist = cext.disk_partitions(all)
-    return [_common.sdiskpart(*x) for x in rawlist]
-
-
-# =====================================================================
-# --- CPU
-# =====================================================================
-
-
-def cpu_times():
-    """Return system CPU times as a named tuple."""
-    user, system, idle = cext.cpu_times()
-    # Internally, GetSystemTimes() is used, and it doesn't return
-    # interrupt and dpc times. cext.per_cpu_times() does, so we
-    # rely on it to get those only.
-    percpu_summed = scputimes(*[sum(n) for n in zip(*cext.per_cpu_times())])
-    return scputimes(user, system, idle,
-                     percpu_summed.interrupt, percpu_summed.dpc)
-
-
-def per_cpu_times():
-    """Return system per-CPU times as a list of named tuples."""
-    ret = []
-    for user, system, idle, interrupt, dpc in cext.per_cpu_times():
-        item = scputimes(user, system, idle, interrupt, dpc)
-        ret.append(item)
-    return ret
-
-
-def cpu_count_logical():
-    """Return the number of logical CPUs in the system."""
-    return cext.cpu_count_logical()
-
-
-def cpu_count_physical():
-    """Return the number of physical CPU cores in the system."""
-    return cext.cpu_count_phys()
-
-
-def cpu_stats():
-    """Return CPU statistics."""
-    ctx_switches, interrupts, dpcs, syscalls = cext.cpu_stats()
-    soft_interrupts = 0
-    return _common.scpustats(ctx_switches, interrupts, soft_interrupts,
-                             syscalls)
-
-
-def cpu_freq():
-    """Return CPU frequency.
-    On Windows per-cpu frequency is not supported.
-    """
-    curr, max_ = cext.cpu_freq()
-    min_ = 0.0
-    return [_common.scpufreq(float(curr), min_, float(max_))]
-
-
-_loadavg_inititialized = False
-
-
-def getloadavg():
-    """Return the number of processes in the system run queue averaged
-    over the last 1, 5, and 15 minutes respectively as a tuple"""
-    global _loadavg_inititialized
-
-    if not _loadavg_inititialized:
-        cext.init_loadavg_counter()
-        _loadavg_inititialized = True
-
-    # Drop to 2 decimal points which is what Linux does
-    raw_loads = cext.getloadavg()
-    return tuple([round(load, 2) for load in raw_loads])
-
-
-# =====================================================================
-# --- network
-# =====================================================================
-
-
-def net_connections(kind, _pid=-1):
-    """Return socket connections.  If pid == -1 return system-wide
-    connections (as opposed to connections opened by one process only).
-    """
-    if kind not in conn_tmap:
-        raise ValueError("invalid %r kind argument; choose between %s"
-                         % (kind, ', '.join([repr(x) for x in conn_tmap])))
-    families, types = conn_tmap[kind]
-    rawlist = cext.net_connections(_pid, families, types)
-    ret = set()
-    for item in rawlist:
-        fd, fam, type, laddr, raddr, status, pid = item
-        nt = conn_to_ntuple(fd, fam, type, laddr, raddr, status, TCP_STATUSES,
-                            pid=pid if _pid == -1 else None)
-        ret.add(nt)
-    return list(ret)
-
-
-def net_if_stats():
-    """Get NIC stats (isup, duplex, speed, mtu)."""
-    ret = {}
-    rawdict = cext.net_if_stats()
-    for name, items in rawdict.items():
-        if not PY3:
-            assert isinstance(name, unicode), type(name)
-            name = py2_strencode(name)
-        isup, duplex, speed, mtu = items
-        if hasattr(_common, 'NicDuplex'):
-            duplex = _common.NicDuplex(duplex)
-        ret[name] = _common.snicstats(isup, duplex, speed, mtu)
-    return ret
-
-
-def net_io_counters():
-    """Return network I/O statistics for every network interface
-    installed on the system as a dict of raw tuples.
-    """
-    ret = cext.net_io_counters()
-    return dict([(py2_strencode(k), v) for k, v in ret.items()])
-
-
-def net_if_addrs():
-    """Return the addresses associated to each NIC."""
-    ret = []
-    for items in cext.net_if_addrs():
-        items = list(items)
-        items[0] = py2_strencode(items[0])
-        ret.append(items)
-    return ret
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-def sensors_battery():
-    """Return battery information."""
-    # For constants meaning see:
-    # https://msdn.microsoft.com/en-us/library/windows/desktop/
-    #     aa373232(v=vs.85).aspx
-    acline_status, flags, percent, secsleft = cext.sensors_battery()
-    power_plugged = acline_status == 1
-    no_battery = bool(flags & 128)
-    charging = bool(flags & 8)
-
-    if no_battery:
-        return None
-    if power_plugged or charging:
-        secsleft = _common.POWER_TIME_UNLIMITED
-    elif secsleft == -1:
-        secsleft = _common.POWER_TIME_UNKNOWN
-
-    return _common.sbattery(percent, secsleft, power_plugged)
-
-
-# =====================================================================
-# --- other system functions
-# =====================================================================
-
-
-_last_btime = 0
-
-
-def boot_time():
-    """The system boot time expressed in seconds since the epoch."""
-    # This dirty hack is to adjust the precision of the returned
-    # value which may have a 1 second fluctuation, see:
-    # https://github.com/giampaolo/psutil/issues/1007
-    global _last_btime
-    ret = float(cext.boot_time())
-    if abs(ret - _last_btime) <= 1:
-        return _last_btime
-    else:
-        _last_btime = ret
-        return ret
-
-
-def users():
-    """Return currently connected users as a list of namedtuples."""
-    retlist = []
-    rawlist = cext.users()
-    for item in rawlist:
-        user, hostname, tstamp = item
-        user = py2_strencode(user)
-        nt = _common.suser(user, None, hostname, tstamp, None)
-        retlist.append(nt)
-    return retlist
-
-
-# =====================================================================
-# --- Windows services
-# =====================================================================
-
-
-def win_service_iter():
-    """Yields a list of WindowsService instances."""
-    for name, display_name in cext.winservice_enumerate():
-        yield WindowsService(py2_strencode(name), py2_strencode(display_name))
-
-
-def win_service_get(name):
-    """Open a Windows service and return it as a WindowsService instance."""
-    service = WindowsService(name, None)
-    service._display_name = service._query_config()['display_name']
-    return service
-
-
-class WindowsService(object):
-    """Represents an installed Windows service."""
-
-    def __init__(self, name, display_name):
-        self._name = name
-        self._display_name = display_name
-
-    def __str__(self):
-        details = "(name=%r, display_name=%r)" % (
-            self._name, self._display_name)
-        return "%s%s" % (self.__class__.__name__, details)
-
-    def __repr__(self):
-        return "<%s at %s>" % (self.__str__(), id(self))
-
-    def __eq__(self, other):
-        # Test for equality with another WindosService object based
-        # on name.
-        if not isinstance(other, WindowsService):
-            return NotImplemented
-        return self._name == other._name
-
-    def __ne__(self, other):
-        return not self == other
-
-    def _query_config(self):
-        with self._wrap_exceptions():
-            display_name, binpath, username, start_type = \
-                cext.winservice_query_config(self._name)
-        # XXX - update _self.display_name?
-        return dict(
-            display_name=py2_strencode(display_name),
-            binpath=py2_strencode(binpath),
-            username=py2_strencode(username),
-            start_type=py2_strencode(start_type))
-
-    def _query_status(self):
-        with self._wrap_exceptions():
-            status, pid = cext.winservice_query_status(self._name)
-        if pid == 0:
-            pid = None
-        return dict(status=status, pid=pid)
-
-    @contextlib.contextmanager
-    def _wrap_exceptions(self):
-        """Ctx manager which translates bare OSError and WindowsError
-        exceptions into NoSuchProcess and AccessDenied.
-        """
-        try:
-            yield
-        except OSError as err:
-            if is_permission_err(err):
-                raise AccessDenied(
-                    pid=None, name=self._name,
-                    msg="service %r is not querable (not enough privileges)" %
-                        self._name)
-            elif err.winerror in (cext.ERROR_INVALID_NAME,
-                                  cext.ERROR_SERVICE_DOES_NOT_EXIST):
-                raise NoSuchProcess(
-                    pid=None, name=self._name,
-                    msg="service %r does not exist)" % self._name)
-            else:
-                raise
-
-    # config query
-
-    def name(self):
-        """The service name. This string is how a service is referenced
-        and can be passed to win_service_get() to get a new
-        WindowsService instance.
-        """
-        return self._name
-
-    def display_name(self):
-        """The service display name. The value is cached when this class
-        is instantiated.
-        """
-        return self._display_name
-
-    def binpath(self):
-        """The fully qualified path to the service binary/exe file as
-        a string, including command line arguments.
-        """
-        return self._query_config()['binpath']
-
-    def username(self):
-        """The name of the user that owns this service."""
-        return self._query_config()['username']
-
-    def start_type(self):
-        """A string which can either be "automatic", "manual" or
-        "disabled".
-        """
-        return self._query_config()['start_type']
-
-    # status query
-
-    def pid(self):
-        """The process PID, if any, else None. This can be passed
-        to Process class to control the service's process.
-        """
-        return self._query_status()['pid']
-
-    def status(self):
-        """Service status as a string."""
-        return self._query_status()['status']
-
-    def description(self):
-        """Service long description."""
-        return py2_strencode(cext.winservice_query_descr(self.name()))
-
-    # utils
-
-    def as_dict(self):
-        """Utility method retrieving all the information above as a
-        dictionary.
-        """
-        d = self._query_config()
-        d.update(self._query_status())
-        d['name'] = self.name()
-        d['display_name'] = self.display_name()
-        d['description'] = self.description()
-        return d
-
-    # actions
-    # XXX: the necessary C bindings for start() and stop() are
-    # implemented but for now I prefer not to expose them.
-    # I may change my mind in the future. Reasons:
-    # - they require Administrator privileges
-    # - can't implement a timeout for stop() (unless by using a thread,
-    #   which sucks)
-    # - would require adding ServiceAlreadyStarted and
-    #   ServiceAlreadyStopped exceptions, adding two new APIs.
-    # - we might also want to have modify(), which would basically mean
-    #   rewriting win32serviceutil.ChangeServiceConfig, which involves a
-    #   lot of stuff (and API constants which would pollute the API), see:
-    #   http://pyxr.sourceforge.net/PyXR/c/python24/lib/site-packages/
-    #       win32/lib/win32serviceutil.py.html#0175
-    # - psutil is typically about "read only" monitoring stuff;
-    #   win_service_* APIs should only be used to retrieve a service and
-    #   check whether it's running
-
-    # def start(self, timeout=None):
-    #     with self._wrap_exceptions():
-    #         cext.winservice_start(self.name())
-    #         if timeout:
-    #             giveup_at = time.time() + timeout
-    #             while True:
-    #                 if self.status() == "running":
-    #                     return
-    #                 else:
-    #                     if time.time() > giveup_at:
-    #                         raise TimeoutExpired(timeout)
-    #                     else:
-    #                         time.sleep(.1)
-
-    # def stop(self):
-    #     # Note: timeout is not implemented because it's just not
-    #     # possible, see:
-    #     # http://stackoverflow.com/questions/11973228/
-    #     with self._wrap_exceptions():
-    #         return cext.winservice_stop(self.name())
-
-
-# =====================================================================
-# --- processes
-# =====================================================================
-
-
-pids = cext.pids
-pid_exists = cext.pid_exists
-ppid_map = cext.ppid_map  # used internally by Process.children()
-
-
-def is_permission_err(exc):
-    """Return True if this is a permission error."""
-    assert isinstance(exc, OSError), exc
-    # On Python 2 OSError doesn't always have 'winerror'. Sometimes
-    # it does, in which case the original exception was WindowsError
-    # (which is a subclass of OSError).
-    return exc.errno in (errno.EPERM, errno.EACCES) or \
-        getattr(exc, "winerror", -1) in (cext.ERROR_ACCESS_DENIED,
-                                         cext.ERROR_PRIVILEGE_NOT_HELD)
-
-
-def convert_oserror(exc, pid=None, name=None):
-    """Convert OSError into NoSuchProcess or AccessDenied."""
-    assert isinstance(exc, OSError), exc
-    if is_permission_err(exc):
-        return AccessDenied(pid=pid, name=name)
-    if exc.errno == errno.ESRCH:
-        return NoSuchProcess(pid=pid, name=name)
-    raise exc
-
-
-def wrap_exceptions(fun):
-    """Decorator which converts OSError into NoSuchProcess or AccessDenied."""
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except OSError as err:
-            raise convert_oserror(err, pid=self.pid, name=self._name)
-    return wrapper
-
-
-def retry_error_partial_copy(fun):
-    """Workaround for https://github.com/giampaolo/psutil/issues/875.
-    See: https://stackoverflow.com/questions/4457745#4457745
-    """
-    @functools.wraps(fun)
-    def wrapper(self, *args, **kwargs):
-        delay = 0.0001
-        times = 33
-        for x in range(times):  # retries for roughly 1 second
-            try:
-                return fun(self, *args, **kwargs)
-            except WindowsError as _:
-                err = _
-                if err.winerror == ERROR_PARTIAL_COPY:
-                    time.sleep(delay)
-                    delay = min(delay * 2, 0.04)
-                    continue
-                else:
-                    raise
-        else:
-            msg = "%s retried %s times, converted to AccessDenied as it's " \
-                "still returning %r" % (fun, times, err)
-            raise AccessDenied(pid=self.pid, name=self._name, msg=msg)
-    return wrapper
-
-
-class Process(object):
-    """Wrapper class around underlying C implementation."""
-
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
-
-    def __init__(self, pid):
-        self.pid = pid
-        self._name = None
-        self._ppid = None
-
-    # --- oneshot() stuff
-
-    def oneshot_enter(self):
-        self._proc_info.cache_activate(self)
-        self.exe.cache_activate(self)
-
-    def oneshot_exit(self):
-        self._proc_info.cache_deactivate(self)
-        self.exe.cache_deactivate(self)
-
-    @memoize_when_activated
-    def _proc_info(self):
-        """Return multiple information about this process as a
-        raw tuple.
-        """
-        ret = cext.proc_info(self.pid)
-        assert len(ret) == len(pinfo_map)
-        return ret
-
-    def name(self):
-        """Return process name, which on Windows is always the final
-        part of the executable.
-        """
-        # This is how PIDs 0 and 4 are always represented in taskmgr
-        # and process-hacker.
-        if self.pid == 0:
-            return "System Idle Process"
-        if self.pid == 4:
-            return "System"
-        return os.path.basename(self.exe())
-
-    @wrap_exceptions
-    @memoize_when_activated
-    def exe(self):
-        if PYPY:
-            try:
-                exe = cext.proc_exe(self.pid)
-            except WindowsError as err:
-                # 24 = ERROR_TOO_MANY_OPEN_FILES. Not sure why this happens
-                # (perhaps PyPy's JIT delaying garbage collection of files?).
-                if err.errno == 24:
-                    debug("%r forced into AccessDenied" % err)
-                    raise AccessDenied(self.pid, self._name)
-                raise
-        else:
-            exe = cext.proc_exe(self.pid)
-        if not PY3:
-            exe = py2_strencode(exe)
-        if exe.startswith('\\'):
-            return convert_dos_path(exe)
-        return exe  # May be "Registry", "MemCompression", ...
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def cmdline(self):
-        if cext.WINVER >= cext.WINDOWS_8_1:
-            # PEB method detects cmdline changes but requires more
-            # privileges: https://github.com/giampaolo/psutil/pull/1398
-            try:
-                ret = cext.proc_cmdline(self.pid, use_peb=True)
-            except OSError as err:
-                if is_permission_err(err):
-                    ret = cext.proc_cmdline(self.pid, use_peb=False)
-                else:
-                    raise
-        else:
-            ret = cext.proc_cmdline(self.pid, use_peb=True)
-        if PY3:
-            return ret
-        else:
-            return [py2_strencode(s) for s in ret]
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def environ(self):
-        ustr = cext.proc_environ(self.pid)
-        if ustr and not PY3:
-            assert isinstance(ustr, unicode), type(ustr)
-        return parse_environ_block(py2_strencode(ustr))
-
-    def ppid(self):
-        try:
-            return ppid_map()[self.pid]
-        except KeyError:
-            raise NoSuchProcess(self.pid, self._name)
-
-    def _get_raw_meminfo(self):
-        try:
-            return cext.proc_memory_info(self.pid)
-        except OSError as err:
-            if is_permission_err(err):
-                # TODO: the C ext can probably be refactored in order
-                # to get this from cext.proc_info()
-                info = self._proc_info()
-                return (
-                    info[pinfo_map['num_page_faults']],
-                    info[pinfo_map['peak_wset']],
-                    info[pinfo_map['wset']],
-                    info[pinfo_map['peak_paged_pool']],
-                    info[pinfo_map['paged_pool']],
-                    info[pinfo_map['peak_non_paged_pool']],
-                    info[pinfo_map['non_paged_pool']],
-                    info[pinfo_map['pagefile']],
-                    info[pinfo_map['peak_pagefile']],
-                    info[pinfo_map['mem_private']],
-                )
-            raise
-
-    @wrap_exceptions
-    def memory_info(self):
-        # on Windows RSS == WorkingSetSize and VSM == PagefileUsage.
-        # Underlying C function returns fields of PROCESS_MEMORY_COUNTERS
-        # struct.
-        t = self._get_raw_meminfo()
-        rss = t[2]  # wset
-        vms = t[7]  # pagefile
-        return pmem(*(rss, vms, ) + t)
-
-    @wrap_exceptions
-    def memory_full_info(self):
-        basic_mem = self.memory_info()
-        uss = cext.proc_memory_uss(self.pid)
-        uss *= getpagesize()
-        return pfullmem(*basic_mem + (uss, ))
-
-    def memory_maps(self):
-        try:
-            raw = cext.proc_memory_maps(self.pid)
-        except OSError as err:
-            # XXX - can't use wrap_exceptions decorator as we're
-            # returning a generator; probably needs refactoring.
-            raise convert_oserror(err, self.pid, self._name)
-        else:
-            for addr, perm, path, rss in raw:
-                path = convert_dos_path(path)
-                if not PY3:
-                    path = py2_strencode(path)
-                addr = hex(addr)
-                yield (addr, perm, path, rss)
-
-    @wrap_exceptions
-    def kill(self):
-        return cext.proc_kill(self.pid)
-
-    @wrap_exceptions
-    def send_signal(self, sig):
-        if sig == signal.SIGTERM:
-            cext.proc_kill(self.pid)
-        # py >= 2.7
-        elif sig in (getattr(signal, "CTRL_C_EVENT", object()),
-                     getattr(signal, "CTRL_BREAK_EVENT", object())):
-            os.kill(self.pid, sig)
-        else:
-            raise ValueError(
-                "only SIGTERM, CTRL_C_EVENT and CTRL_BREAK_EVENT signals "
-                "are supported on Windows")
-
-    @wrap_exceptions
-    def wait(self, timeout=None):
-        if timeout is None:
-            cext_timeout = cext.INFINITE
-        else:
-            # WaitForSingleObject() expects time in milliseconds.
-            cext_timeout = int(timeout * 1000)
-
-        timer = getattr(time, 'monotonic', time.time)
-        stop_at = timer() + timeout if timeout is not None else None
-
-        try:
-            # Exit code is supposed to come from GetExitCodeProcess().
-            # May also be None if OpenProcess() failed with
-            # ERROR_INVALID_PARAMETER, meaning PID is already gone.
-            exit_code = cext.proc_wait(self.pid, cext_timeout)
-        except cext.TimeoutExpired:
-            # WaitForSingleObject() returned WAIT_TIMEOUT. Just raise.
-            raise TimeoutExpired(timeout, self.pid, self._name)
-        except cext.TimeoutAbandoned:
-            # WaitForSingleObject() returned WAIT_ABANDONED, see:
-            # https://github.com/giampaolo/psutil/issues/1224
-            # We'll just rely on the internal polling and return None
-            # when the PID disappears. Subprocess module does the same
-            # (return None):
-            # https://github.com/python/cpython/blob/
-            #     be50a7b627d0aa37e08fa8e2d5568891f19903ce/
-            #     Lib/subprocess.py#L1193-L1194
-            exit_code = None
-
-        # At this point WaitForSingleObject() returned WAIT_OBJECT_0,
-        # meaning the process is gone. Stupidly there are cases where
-        # its PID may still stick around so we do a further internal
-        # polling.
-        delay = 0.0001
-        while True:
-            if not pid_exists(self.pid):
-                return exit_code
-            if stop_at and timer() >= stop_at:
-                raise TimeoutExpired(timeout, pid=self.pid, name=self._name)
-            time.sleep(delay)
-            delay = min(delay * 2, 0.04)  # incremental delay
-
-    @wrap_exceptions
-    def username(self):
-        if self.pid in (0, 4):
-            return 'NT AUTHORITY\\SYSTEM'
-        domain, user = cext.proc_username(self.pid)
-        return py2_strencode(domain) + '\\' + py2_strencode(user)
-
-    @wrap_exceptions
-    def create_time(self):
-        # Note: proc_times() not put under oneshot() 'cause create_time()
-        # is already cached by the main Process class.
-        try:
-            user, system, created = cext.proc_times(self.pid)
-            return created
-        except OSError as err:
-            if is_permission_err(err):
-                return self._proc_info()[pinfo_map['create_time']]
-            raise
-
-    @wrap_exceptions
-    def num_threads(self):
-        return self._proc_info()[pinfo_map['num_threads']]
-
-    @wrap_exceptions
-    def threads(self):
-        rawlist = cext.proc_threads(self.pid)
-        retlist = []
-        for thread_id, utime, stime in rawlist:
-            ntuple = _common.pthread(thread_id, utime, stime)
-            retlist.append(ntuple)
-        return retlist
-
-    @wrap_exceptions
-    def cpu_times(self):
-        try:
-            user, system, created = cext.proc_times(self.pid)
-        except OSError as err:
-            if not is_permission_err(err):
-                raise
-            info = self._proc_info()
-            user = info[pinfo_map['user_time']]
-            system = info[pinfo_map['kernel_time']]
-        # Children user/system times are not retrievable (set to 0).
-        return _common.pcputimes(user, system, 0.0, 0.0)
-
-    @wrap_exceptions
-    def suspend(self):
-        cext.proc_suspend_or_resume(self.pid, True)
-
-    @wrap_exceptions
-    def resume(self):
-        cext.proc_suspend_or_resume(self.pid, False)
-
-    @wrap_exceptions
-    @retry_error_partial_copy
-    def cwd(self):
-        if self.pid in (0, 4):
-            raise AccessDenied(self.pid, self._name)
-        # return a normalized pathname since the native C function appends
-        # "\\" at the and of the path
-        path = cext.proc_cwd(self.pid)
-        return py2_strencode(os.path.normpath(path))
-
-    @wrap_exceptions
-    def open_files(self):
-        if self.pid in (0, 4):
-            return []
-        ret = set()
-        # Filenames come in in native format like:
-        # "\Device\HarddiskVolume1\Windows\systemew\file.txt"
-        # Convert the first part in the corresponding drive letter
-        # (e.g. "C:\") by using Windows's QueryDosDevice()
-        raw_file_names = cext.proc_open_files(self.pid)
-        for _file in raw_file_names:
-            _file = convert_dos_path(_file)
-            if isfile_strict(_file):
-                if not PY3:
-                    _file = py2_strencode(_file)
-                ntuple = _common.popenfile(_file, -1)
-                ret.add(ntuple)
-        return list(ret)
-
-    @wrap_exceptions
-    def connections(self, kind='inet'):
-        return net_connections(kind, _pid=self.pid)
-
-    @wrap_exceptions
-    def nice_get(self):
-        value = cext.proc_priority_get(self.pid)
-        if enum is not None:
-            value = Priority(value)
-        return value
-
-    @wrap_exceptions
-    def nice_set(self, value):
-        return cext.proc_priority_set(self.pid, value)
-
-    @wrap_exceptions
-    def ionice_get(self):
-        ret = cext.proc_io_priority_get(self.pid)
-        if enum is not None:
-            ret = IOPriority(ret)
-        return ret
-
-    @wrap_exceptions
-    def ionice_set(self, ioclass, value):
-        if value:
-            raise TypeError("value argument not accepted on Windows")
-        if ioclass not in (IOPRIO_VERYLOW, IOPRIO_LOW, IOPRIO_NORMAL,
-                           IOPRIO_HIGH):
-            raise ValueError("%s is not a valid priority" % ioclass)
-        cext.proc_io_priority_set(self.pid, ioclass)
-
-    @wrap_exceptions
-    def io_counters(self):
-        try:
-            ret = cext.proc_io_counters(self.pid)
-        except OSError as err:
-            if not is_permission_err(err):
-                raise
-            info = self._proc_info()
-            ret = (
-                info[pinfo_map['io_rcount']],
-                info[pinfo_map['io_wcount']],
-                info[pinfo_map['io_rbytes']],
-                info[pinfo_map['io_wbytes']],
-                info[pinfo_map['io_count_others']],
-                info[pinfo_map['io_bytes_others']],
-            )
-        return pio(*ret)
-
-    @wrap_exceptions
-    def status(self):
-        suspended = cext.proc_is_suspended(self.pid)
-        if suspended:
-            return _common.STATUS_STOPPED
-        else:
-            return _common.STATUS_RUNNING
-
-    @wrap_exceptions
-    def cpu_affinity_get(self):
-        def from_bitmask(x):
-            return [i for i in xrange(64) if (1 << i) & x]
-        bitmask = cext.proc_cpu_affinity_get(self.pid)
-        return from_bitmask(bitmask)
-
-    @wrap_exceptions
-    def cpu_affinity_set(self, value):
-        def to_bitmask(l):
-            if not l:
-                raise ValueError("invalid argument %r" % l)
-            out = 0
-            for b in l:
-                out |= 2 ** b
-            return out
-
-        # SetProcessAffinityMask() states that ERROR_INVALID_PARAMETER
-        # is returned for an invalid CPU but this seems not to be true,
-        # therefore we check CPUs validy beforehand.
-        allcpus = list(range(len(per_cpu_times())))
-        for cpu in value:
-            if cpu not in allcpus:
-                if not isinstance(cpu, (int, long)):
-                    raise TypeError(
-                        "invalid CPU %r; an integer is required" % cpu)
-                else:
-                    raise ValueError("invalid CPU %r" % cpu)
-
-        bitmask = to_bitmask(value)
-        cext.proc_cpu_affinity_set(self.pid, bitmask)
-
-    @wrap_exceptions
-    def num_handles(self):
-        try:
-            return cext.proc_num_handles(self.pid)
-        except OSError as err:
-            if is_permission_err(err):
-                return self._proc_info()[pinfo_map['num_handles']]
-            raise
-
-    @wrap_exceptions
-    def num_ctx_switches(self):
-        ctx_switches = self._proc_info()[pinfo_map['ctx_switches']]
-        # only voluntary ctx switches are supported
-        return _common.pctxsw(ctx_switches, 0)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__init__.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__init__.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__init__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__init__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1137 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Test utilities.
-"""
-
-from __future__ import print_function
-
-import atexit
-import contextlib
-import ctypes
-import errno
-import functools
-import os
-import random
-import re
-import select
-import shutil
-import socket
-import stat
-import subprocess
-import sys
-import tempfile
-import textwrap
-import threading
-import time
-import traceback
-import warnings
-from socket import AF_INET
-from socket import AF_INET6
-from socket import SOCK_STREAM
-
-import psutil
-from psutil import AIX
-from psutil import MACOS
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import supports_ipv6
-from psutil._compat import ChildProcessError
-from psutil._compat import FileExistsError
-from psutil._compat import FileNotFoundError
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil._compat import unicode
-from psutil._compat import which
-
-if sys.version_info < (2, 7):
-    import unittest2 as unittest  # requires "pip install unittest2"
-else:
-    import unittest
-
-try:
-    from unittest import mock  # py3
-except ImportError:
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        import mock  # NOQA - requires "pip install mock"
-
-if sys.version_info >= (3, 4):
-    import enum
-else:
-    enum = None
-
-
-__all__ = [
-    # constants
-    'APPVEYOR', 'DEVNULL', 'GLOBAL_TIMEOUT', 'MEMORY_TOLERANCE', 'NO_RETRIES',
-    'PYPY', 'PYTHON_EXE', 'ROOT_DIR', 'SCRIPTS_DIR', 'TESTFILE_PREFIX',
-    'TESTFN', 'TESTFN_UNICODE', 'TOX', 'TRAVIS', 'CIRRUS', 'CI_TESTING',
-    'VALID_PROC_STATUSES',
-    "HAS_CPU_AFFINITY", "HAS_CPU_FREQ", "HAS_ENVIRON", "HAS_PROC_IO_COUNTERS",
-    "HAS_IONICE", "HAS_MEMORY_MAPS", "HAS_PROC_CPU_NUM", "HAS_RLIMIT",
-    "HAS_SENSORS_BATTERY", "HAS_BATTERY", "HAS_SENSORS_FANS",
-    "HAS_SENSORS_TEMPERATURES", "HAS_MEMORY_FULL_INFO",
-    # subprocesses
-    'pyrun', 'reap_children', 'get_test_subprocess', 'create_zombie_proc',
-    'create_proc_children_pair',
-    # threads
-    'ThreadTask'
-    # test utils
-    'unittest', 'skip_on_access_denied', 'skip_on_not_implemented',
-    'retry_on_failure',
-    # install utils
-    'install_pip', 'install_test_deps',
-    # fs utils
-    'chdir', 'safe_rmpath', 'create_exe', 'decode_path', 'encode_path',
-    'unique_filename',
-    # os
-    'get_winver', 'get_kernel_version',
-    # sync primitives
-    'call_until', 'wait_for_pid', 'wait_for_file',
-    # network
-    'check_net_address',
-    'get_free_port', 'unix_socket_path', 'bind_socket', 'bind_unix_socket',
-    'tcp_socketpair', 'unix_socketpair', 'create_sockets',
-    # compat
-    'reload_module', 'import_module_by_path',
-    # others
-    'warn', 'copyload_shared_lib', 'is_namedtuple',
-]
-
-
-# ===================================================================
-# --- constants
-# ===================================================================
-
-# --- platforms
-
-TOX = os.getenv('TOX') or '' in ('1', 'true')
-PYPY = '__pypy__' in sys.builtin_module_names
-# whether we're running this test suite on a Continuous Integration service
-TRAVIS = bool(os.environ.get('TRAVIS'))
-APPVEYOR = bool(os.environ.get('APPVEYOR'))
-CIRRUS = bool(os.environ.get('CIRRUS'))
-CI_TESTING = TRAVIS or APPVEYOR or CIRRUS
-
-# --- configurable defaults
-
-# how many times retry_on_failure() decorator will retry
-NO_RETRIES = 10
-# bytes tolerance for system-wide memory related tests
-MEMORY_TOLERANCE = 500 * 1024  # 500KB
-# the timeout used in functions which have to wait
-GLOBAL_TIMEOUT = 5
-# be more tolerant if we're on travis / appveyor in order to avoid
-# false positives
-if TRAVIS or APPVEYOR:
-    NO_RETRIES *= 3
-    GLOBAL_TIMEOUT *= 3
-
-# --- files
-
-TESTFILE_PREFIX = '$testfn'
-if os.name == 'java':
-    # Jython disallows @ in module names
-    TESTFILE_PREFIX = '$psutil-test-'
-else:
-    TESTFILE_PREFIX = '@psutil-test-'
-TESTFN = os.path.join(os.path.realpath(os.getcwd()), TESTFILE_PREFIX)
-# Disambiguate TESTFN for parallel testing, while letting it remain a valid
-# module name.
-TESTFN = TESTFN + str(os.getpid())
-
-_TESTFN = TESTFN + '-internal'
-TESTFN_UNICODE = TESTFN + u("-Æ’Å‘Å‘")
-ASCII_FS = sys.getfilesystemencoding().lower() in ('ascii', 'us-ascii')
-
-# --- paths
-
-ROOT_DIR = os.path.realpath(
-    os.path.join(os.path.dirname(__file__), '..', '..'))
-SCRIPTS_DIR = os.path.join(ROOT_DIR, 'scripts')
-HERE = os.path.realpath(os.path.dirname(__file__))
-
-# --- support
-
-HAS_CONNECTIONS_UNIX = POSIX and not SUNOS
-HAS_CPU_AFFINITY = hasattr(psutil.Process, "cpu_affinity")
-HAS_CPU_FREQ = hasattr(psutil, "cpu_freq")
-HAS_GETLOADAVG = hasattr(psutil, "getloadavg")
-HAS_ENVIRON = hasattr(psutil.Process, "environ")
-HAS_IONICE = hasattr(psutil.Process, "ionice")
-HAS_MEMORY_MAPS = hasattr(psutil.Process, "memory_maps")
-HAS_NET_IO_COUNTERS = hasattr(psutil, "net_io_counters")
-HAS_PROC_CPU_NUM = hasattr(psutil.Process, "cpu_num")
-HAS_PROC_IO_COUNTERS = hasattr(psutil.Process, "io_counters")
-HAS_RLIMIT = hasattr(psutil.Process, "rlimit")
-HAS_SENSORS_BATTERY = hasattr(psutil, "sensors_battery")
-try:
-    HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery())
-except Exception:
-    HAS_BATTERY = True
-HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
-HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
-HAS_THREADS = hasattr(psutil.Process, "threads")
-SKIP_SYSCONS = (MACOS or AIX) and os.getuid() != 0
-
-# --- misc
-
-
-def _get_py_exe():
-    def attempt(exe):
-        try:
-            subprocess.check_call(
-                [exe, "-V"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        except Exception:
-            return None
-        else:
-            return exe
-
-    if MACOS:
-        exe = \
-            attempt(sys.executable) or \
-            attempt(os.path.realpath(sys.executable)) or \
-            attempt(which("python%s.%s" % sys.version_info[:2])) or \
-            attempt(psutil.Process().exe())
-        if not exe:
-            raise ValueError("can't find python exe real abspath")
-        return exe
-    else:
-        exe = os.path.realpath(sys.executable)
-        assert os.path.exists(exe), exe
-        return exe
-
-
-PYTHON_EXE = _get_py_exe()
-DEVNULL = open(os.devnull, 'r+')
-VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil)
-                       if x.startswith('STATUS_')]
-AF_UNIX = getattr(socket, "AF_UNIX", object())
-
-_subprocesses_started = set()
-_pids_started = set()
-_testfiles_created = set()
-
-
-@atexit.register
-def cleanup_test_files():
-    DEVNULL.close()
-    for name in os.listdir(u('.')):
-        if isinstance(name, unicode):
-            prefix = u(TESTFILE_PREFIX)
-        else:
-            prefix = TESTFILE_PREFIX
-        if name.startswith(prefix):
-            try:
-                safe_rmpath(name)
-            except Exception:
-                traceback.print_exc()
-    for path in _testfiles_created:
-        try:
-            safe_rmpath(path)
-        except Exception:
-            traceback.print_exc()
-
-
-# this is executed first
-@atexit.register
-def cleanup_test_procs():
-    reap_children(recursive=True)
-
-
-# ===================================================================
-# --- threads
-# ===================================================================
-
-
-class ThreadTask(threading.Thread):
-    """A thread task which does nothing expect staying alive."""
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self._running = False
-        self._interval = 0.001
-        self._flag = threading.Event()
-
-    def __repr__(self):
-        name = self.__class__.__name__
-        return '<%s running=%s at %#x>' % (name, self._running, id(self))
-
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        self.stop()
-
-    def start(self):
-        """Start thread and keep it running until an explicit
-        stop() request. Polls for shutdown every 'timeout' seconds.
-        """
-        if self._running:
-            raise ValueError("already started")
-        threading.Thread.start(self)
-        self._flag.wait()
-
-    def run(self):
-        self._running = True
-        self._flag.set()
-        while self._running:
-            time.sleep(self._interval)
-
-    def stop(self):
-        """Stop thread execution and and waits until it is stopped."""
-        if not self._running:
-            raise ValueError("already stopped")
-        self._running = False
-        self.join()
-
-
-# ===================================================================
-# --- subprocesses
-# ===================================================================
-
-
-def _reap_children_on_err(fun):
-    @functools.wraps(fun)
-    def wrapper(*args, **kwargs):
-        try:
-            return fun(*args, **kwargs)
-        except Exception:
-            reap_children()
-            raise
-    return wrapper
-
-
-@_reap_children_on_err
-def get_test_subprocess(cmd=None, **kwds):
-    """Creates a python subprocess which does nothing for 60 secs and
-    return it as subprocess.Popen instance.
-    If "cmd" is specified that is used instead of python.
-    By default stdin and stdout are redirected to /dev/null.
-    It also attemps to make sure the process is in a reasonably
-    initialized state.
-    The process is registered for cleanup on reap_children().
-    """
-    kwds.setdefault("stdin", DEVNULL)
-    kwds.setdefault("stdout", DEVNULL)
-    kwds.setdefault("cwd", os.getcwd())
-    kwds.setdefault("env", os.environ)
-    if WINDOWS:
-        # Prevents the subprocess to open error dialogs. This will also
-        # cause stderr to be suppressed, which is suboptimal in order
-        # to debug broken tests.
-        CREATE_NO_WINDOW = 0x8000000
-        kwds.setdefault("creationflags", CREATE_NO_WINDOW)
-    if cmd is None:
-        safe_rmpath(_TESTFN)
-        pyline = "from time import sleep;" \
-                 "open(r'%s', 'w').close();" \
-                 "sleep(60);" % _TESTFN
-        cmd = [PYTHON_EXE, "-c", pyline]
-        sproc = subprocess.Popen(cmd, **kwds)
-        _subprocesses_started.add(sproc)
-        wait_for_file(_TESTFN, delete=True, empty=True)
-    else:
-        sproc = subprocess.Popen(cmd, **kwds)
-        _subprocesses_started.add(sproc)
-        wait_for_pid(sproc.pid)
-    return sproc
-
-
-@_reap_children_on_err
-def create_proc_children_pair():
-    """Create a subprocess which creates another one as in:
-    A (us) -> B (child) -> C (grandchild).
-    Return a (child, grandchild) tuple.
-    The 2 processes are fully initialized and will live for 60 secs
-    and are registered for cleanup on reap_children().
-    """
-    _TESTFN2 = os.path.basename(_TESTFN) + '2'  # need to be relative
-    s = textwrap.dedent("""\
-        import subprocess, os, sys, time
-        s = "import os, time;"
-        s += "f = open('%s', 'w');"
-        s += "f.write(str(os.getpid()));"
-        s += "f.close();"
-        s += "time.sleep(60);"
-        p = subprocess.Popen([r'%s', '-c', s])
-        p.wait()
-        """ % (_TESTFN2, PYTHON_EXE))
-    # On Windows if we create a subprocess with CREATE_NO_WINDOW flag
-    # set (which is the default) a "conhost.exe" extra process will be
-    # spawned as a child. We don't want that.
-    if WINDOWS:
-        subp = pyrun(s, creationflags=0)
-    else:
-        subp = pyrun(s)
-    child1 = psutil.Process(subp.pid)
-    data = wait_for_file(_TESTFN2, delete=False, empty=False)
-    safe_rmpath(_TESTFN2)
-    child2_pid = int(data)
-    _pids_started.add(child2_pid)
-    child2 = psutil.Process(child2_pid)
-    return (child1, child2)
-
-
-def create_zombie_proc():
-    """Create a zombie process and return its PID."""
-    assert psutil.POSIX
-    unix_file = tempfile.mktemp(prefix=TESTFILE_PREFIX) if MACOS else TESTFN
-    src = textwrap.dedent("""\
-        import os, sys, time, socket, contextlib
-        child_pid = os.fork()
-        if child_pid > 0:
-            time.sleep(3000)
-        else:
-            # this is the zombie process
-            s = socket.socket(socket.AF_UNIX)
-            with contextlib.closing(s):
-                s.connect('%s')
-                if sys.version_info < (3, ):
-                    pid = str(os.getpid())
-                else:
-                    pid = bytes(str(os.getpid()), 'ascii')
-                s.sendall(pid)
-        """ % unix_file)
-    with contextlib.closing(socket.socket(socket.AF_UNIX)) as sock:
-        sock.settimeout(GLOBAL_TIMEOUT)
-        sock.bind(unix_file)
-        sock.listen(5)
-        pyrun(src)
-        conn, _ = sock.accept()
-        try:
-            select.select([conn.fileno()], [], [], GLOBAL_TIMEOUT)
-            zpid = int(conn.recv(1024))
-            _pids_started.add(zpid)
-            zproc = psutil.Process(zpid)
-            call_until(lambda: zproc.status(), "ret == psutil.STATUS_ZOMBIE")
-            return zpid
-        finally:
-            conn.close()
-
-
-@_reap_children_on_err
-def pyrun(src, **kwds):
-    """Run python 'src' code string in a separate interpreter.
-    Returns a subprocess.Popen instance.
-    """
-    kwds.setdefault("stdout", None)
-    kwds.setdefault("stderr", None)
-    with tempfile.NamedTemporaryFile(
-            prefix=TESTFILE_PREFIX, mode="wt", delete=False) as f:
-        _testfiles_created.add(f.name)
-        f.write(src)
-        f.flush()
-        subp = get_test_subprocess([PYTHON_EXE, f.name], **kwds)
-        wait_for_pid(subp.pid)
-    return subp
-
-
-@_reap_children_on_err
-def sh(cmd, **kwds):
-    """run cmd in a subprocess and return its output.
-    raises RuntimeError on error.
-    """
-    shell = True if isinstance(cmd, (str, unicode)) else False
-    # Prevents subprocess to open error dialogs in case of error.
-    flags = 0x8000000 if WINDOWS and shell else 0
-    kwds.setdefault("shell", shell)
-    kwds.setdefault("stdout", subprocess.PIPE)
-    kwds.setdefault("stderr", subprocess.PIPE)
-    kwds.setdefault("universal_newlines", True)
-    kwds.setdefault("creationflags", flags)
-    p = subprocess.Popen(cmd, **kwds)
-    _subprocesses_started.add(p)
-    if PY3:
-        stdout, stderr = p.communicate(timeout=GLOBAL_TIMEOUT)
-    else:
-        stdout, stderr = p.communicate()
-    if p.returncode != 0:
-        raise RuntimeError(stderr)
-    if stderr:
-        warn(stderr)
-    if stdout.endswith('\n'):
-        stdout = stdout[:-1]
-    return stdout
-
-
-def reap_children(recursive=False):
-    """Terminate and wait() any subprocess started by this test suite
-    and ensure that no zombies stick around to hog resources and
-    create problems  when looking for refleaks.
-
-    If resursive is True it also tries to terminate and wait()
-    all grandchildren started by this process.
-    """
-    # This is here to make sure wait_procs() behaves properly and
-    # investigate:
-    # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-    #     jiq2cgd6stsbtn60
-    def assert_gone(pid):
-        assert not psutil.pid_exists(pid), pid
-        assert pid not in psutil.pids(), pid
-        try:
-            p = psutil.Process(pid)
-            assert not p.is_running(), pid
-        except psutil.NoSuchProcess:
-            pass
-        else:
-            assert 0, "pid %s is not gone" % pid
-
-    # Get the children here, before terminating the children sub
-    # processes as we don't want to lose the intermediate reference
-    # in case of grandchildren.
-    if recursive:
-        children = set(psutil.Process().children(recursive=True))
-    else:
-        children = set()
-
-    # Terminate subprocess.Popen instances "cleanly" by closing their
-    # fds and wiat()ing for them in order to avoid zombies.
-    while _subprocesses_started:
-        subp = _subprocesses_started.pop()
-        _pids_started.add(subp.pid)
-        try:
-            subp.terminate()
-        except OSError as err:
-            if WINDOWS and err.winerror == 6:  # "invalid handle"
-                pass
-            elif err.errno != errno.ESRCH:
-                raise
-        if subp.stdout:
-            subp.stdout.close()
-        if subp.stderr:
-            subp.stderr.close()
-        try:
-            # Flushing a BufferedWriter may raise an error.
-            if subp.stdin:
-                subp.stdin.close()
-        finally:
-            # Wait for the process to terminate, to avoid zombies.
-            try:
-                subp.wait()
-            except ChildProcessError:
-                pass
-
-    # Terminate started pids.
-    while _pids_started:
-        pid = _pids_started.pop()
-        try:
-            p = psutil.Process(pid)
-        except psutil.NoSuchProcess:
-            assert_gone(pid)
-        else:
-            children.add(p)
-
-    # Terminate children.
-    if children:
-        for p in children:
-            try:
-                p.terminate()
-            except psutil.NoSuchProcess:
-                pass
-        gone, alive = psutil.wait_procs(children, timeout=GLOBAL_TIMEOUT)
-        for p in alive:
-            warn("couldn't terminate process %r; attempting kill()" % p)
-            try:
-                p.kill()
-            except psutil.NoSuchProcess:
-                pass
-        gone, alive = psutil.wait_procs(alive, timeout=GLOBAL_TIMEOUT)
-        if alive:
-            for p in alive:
-                warn("process %r survived kill()" % p)
-
-        for p in children:
-            assert_gone(p.pid)
-
-
-# ===================================================================
-# --- OS
-# ===================================================================
-
-
-def get_kernel_version():
-    """Return a tuple such as (2, 6, 36)."""
-    if not POSIX:
-        raise NotImplementedError("not POSIX")
-    s = ""
-    uname = os.uname()[2]
-    for c in uname:
-        if c.isdigit() or c == '.':
-            s += c
-        else:
-            break
-    if not s:
-        raise ValueError("can't parse %r" % uname)
-    minor = 0
-    micro = 0
-    nums = s.split('.')
-    major = int(nums[0])
-    if len(nums) >= 2:
-        minor = int(nums[1])
-    if len(nums) >= 3:
-        micro = int(nums[2])
-    return (major, minor, micro)
-
-
-def get_winver():
-    if not WINDOWS:
-        raise NotImplementedError("not WINDOWS")
-    wv = sys.getwindowsversion()
-    if hasattr(wv, 'service_pack_major'):  # python >= 2.7
-        sp = wv.service_pack_major or 0
-    else:
-        r = re.search(r"\s\d$", wv[4])
-        if r:
-            sp = int(r.group(0))
-        else:
-            sp = 0
-    return (wv[0], wv[1], sp)
-
-
-# ===================================================================
-# --- sync primitives
-# ===================================================================
-
-
-class retry(object):
-    """A retry decorator."""
-
-    def __init__(self,
-                 exception=Exception,
-                 timeout=None,
-                 retries=None,
-                 interval=0.001,
-                 logfun=None,
-                 ):
-        if timeout and retries:
-            raise ValueError("timeout and retries args are mutually exclusive")
-        self.exception = exception
-        self.timeout = timeout
-        self.retries = retries
-        self.interval = interval
-        self.logfun = logfun
-
-    def __iter__(self):
-        if self.timeout:
-            stop_at = time.time() + self.timeout
-            while time.time() < stop_at:
-                yield
-        elif self.retries:
-            for _ in range(self.retries):
-                yield
-        else:
-            while True:
-                yield
-
-    def sleep(self):
-        if self.interval is not None:
-            time.sleep(self.interval)
-
-    def __call__(self, fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            exc = None
-            for _ in self:
-                try:
-                    return fun(*args, **kwargs)
-                except self.exception as _:  # NOQA
-                    exc = _
-                    if self.logfun is not None:
-                        self.logfun(exc)
-                    self.sleep()
-                    continue
-            if PY3:
-                raise exc
-            else:
-                raise
-
-        # This way the user of the decorated function can change config
-        # parameters.
-        wrapper.decorator = self
-        return wrapper
-
-
-@retry(exception=psutil.NoSuchProcess, logfun=None, timeout=GLOBAL_TIMEOUT,
-       interval=0.001)
-def wait_for_pid(pid):
-    """Wait for pid to show up in the process list then return.
-    Used in the test suite to give time the sub process to initialize.
-    """
-    psutil.Process(pid)
-    if WINDOWS:
-        # give it some more time to allow better initialization
-        time.sleep(0.01)
-
-
-@retry(exception=(EnvironmentError, AssertionError), logfun=None,
-       timeout=GLOBAL_TIMEOUT, interval=0.001)
-def wait_for_file(fname, delete=True, empty=False):
-    """Wait for a file to be written on disk with some content."""
-    with open(fname, "rb") as f:
-        data = f.read()
-    if not empty:
-        assert data
-    if delete:
-        safe_rmpath(fname)
-    return data
-
-
-@retry(exception=AssertionError, logfun=None, timeout=GLOBAL_TIMEOUT,
-       interval=0.001)
-def call_until(fun, expr):
-    """Keep calling function for timeout secs and exit if eval()
-    expression is True.
-    """
-    ret = fun()
-    assert eval(expr)
-    return ret
-
-
-# ===================================================================
-# --- fs
-# ===================================================================
-
-
-def safe_rmpath(path):
-    "Convenience function for removing temporary test files or dirs"
-    def retry_fun(fun):
-        # On Windows it could happen that the file or directory has
-        # open handles or references preventing the delete operation
-        # to succeed immediately, so we retry for a while. See:
-        # https://bugs.python.org/issue33240
-        stop_at = time.time() + 1
-        while time.time() < stop_at:
-            try:
-                return fun()
-            except FileNotFoundError:
-                pass
-            except WindowsError as _:
-                err = _
-                warn("ignoring %s" % (str(err)))
-            time.sleep(0.01)
-        raise err
-
-    try:
-        st = os.stat(path)
-        if stat.S_ISDIR(st.st_mode):
-            fun = functools.partial(shutil.rmtree, path)
-        else:
-            fun = functools.partial(os.remove, path)
-        if POSIX:
-            fun()
-        else:
-            retry_fun(fun)
-    except FileNotFoundError:
-        pass
-
-
-def safe_mkdir(dir):
-    "Convenience function for creating a directory"
-    try:
-        os.mkdir(dir)
-    except FileExistsError:
-        pass
-
-
-@contextlib.contextmanager
-def chdir(dirname):
-    "Context manager which temporarily changes the current directory."
-    curdir = os.getcwd()
-    try:
-        os.chdir(dirname)
-        yield
-    finally:
-        os.chdir(curdir)
-
-
-def create_exe(outpath, c_code=None):
-    """Creates an executable file in the given location."""
-    assert not os.path.exists(outpath), outpath
-    if c_code:
-        if not which("gcc"):
-            raise ValueError("gcc is not installed")
-        if isinstance(c_code, bool):        # c_code is True
-            c_code = textwrap.dedent(
-                """
-                #include <unistd.h>
-                int main() {
-                    pause();
-                    return 1;
-                }
-                """)
-        assert isinstance(c_code, str), c_code
-        with tempfile.NamedTemporaryFile(
-                suffix='.c', delete=False, mode='wt') as f:
-            f.write(c_code)
-        try:
-            subprocess.check_call(["gcc", f.name, "-o", outpath])
-        finally:
-            safe_rmpath(f.name)
-    else:
-        # copy python executable
-        shutil.copyfile(PYTHON_EXE, outpath)
-        if POSIX:
-            st = os.stat(outpath)
-            os.chmod(outpath, st.st_mode | stat.S_IEXEC)
-
-
-def unique_filename(prefix=TESTFILE_PREFIX, suffix=""):
-    return tempfile.mktemp(prefix=prefix, suffix=suffix)
-
-
-# ===================================================================
-# --- testing
-# ===================================================================
-
-
-class TestCase(unittest.TestCase):
-
-    # Print a full path representation of the single unit tests
-    # being run.
-    def __str__(self):
-        fqmod = self.__class__.__module__
-        if not fqmod.startswith('psutil.'):
-            fqmod = 'psutil.tests.' + fqmod
-        return "%s.%s.%s" % (
-            fqmod, self.__class__.__name__, self._testMethodName)
-
-    # assertRaisesRegexp renamed to assertRaisesRegex in 3.3;
-    # add support for the new name.
-    if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
-# override default unittest.TestCase
-unittest.TestCase = TestCase
-
-
-def retry_on_failure(retries=NO_RETRIES):
-    """Decorator which runs a test function and retries N times before
-    actually failing.
-    """
-    def logfun(exc):
-        print("%r, retrying" % exc, file=sys.stderr)
-
-    return retry(exception=AssertionError, timeout=None, retries=retries,
-                 logfun=logfun)
-
-
-def skip_on_access_denied(only_if=None):
-    """Decorator to Ignore AccessDenied exceptions."""
-    def decorator(fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except psutil.AccessDenied:
-                if only_if is not None:
-                    if not only_if:
-                        raise
-                raise unittest.SkipTest("raises AccessDenied")
-        return wrapper
-    return decorator
-
-
-def skip_on_not_implemented(only_if=None):
-    """Decorator to Ignore NotImplementedError exceptions."""
-    def decorator(fun):
-        @functools.wraps(fun)
-        def wrapper(*args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except NotImplementedError:
-                if only_if is not None:
-                    if not only_if:
-                        raise
-                msg = "%r was skipped because it raised NotImplementedError" \
-                      % fun.__name__
-                raise unittest.SkipTest(msg)
-        return wrapper
-    return decorator
-
-
-# ===================================================================
-# --- network
-# ===================================================================
-
-
-def get_free_port(host='127.0.0.1'):
-    """Return an unused TCP port."""
-    with contextlib.closing(socket.socket()) as sock:
-        sock.bind((host, 0))
-        return sock.getsockname()[1]
-
-
-@contextlib.contextmanager
-def unix_socket_path(suffix=""):
-    """A context manager which returns a non-existent file name
-    and tries to delete it on exit.
-    """
-    assert psutil.POSIX
-    path = unique_filename(suffix=suffix)
-    try:
-        yield path
-    finally:
-        try:
-            os.unlink(path)
-        except OSError:
-            pass
-
-
-def bind_socket(family=AF_INET, type=SOCK_STREAM, addr=None):
-    """Binds a generic socket."""
-    if addr is None and family in (AF_INET, AF_INET6):
-        addr = ("", 0)
-    sock = socket.socket(family, type)
-    try:
-        if os.name not in ('nt', 'cygwin'):
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        sock.bind(addr)
-        if type == socket.SOCK_STREAM:
-            sock.listen(5)
-        return sock
-    except Exception:
-        sock.close()
-        raise
-
-
-def bind_unix_socket(name, type=socket.SOCK_STREAM):
-    """Bind a UNIX socket."""
-    assert psutil.POSIX
-    assert not os.path.exists(name), name
-    sock = socket.socket(socket.AF_UNIX, type)
-    try:
-        sock.bind(name)
-        if type == socket.SOCK_STREAM:
-            sock.listen(5)
-    except Exception:
-        sock.close()
-        raise
-    return sock
-
-
-def tcp_socketpair(family, addr=("", 0)):
-    """Build a pair of TCP sockets connected to each other.
-    Return a (server, client) tuple.
-    """
-    with contextlib.closing(socket.socket(family, SOCK_STREAM)) as ll:
-        ll.bind(addr)
-        ll.listen(5)
-        addr = ll.getsockname()
-        c = socket.socket(family, SOCK_STREAM)
-        try:
-            c.connect(addr)
-            caddr = c.getsockname()
-            while True:
-                a, addr = ll.accept()
-                # check that we've got the correct client
-                if addr == caddr:
-                    return (a, c)
-                a.close()
-        except OSError:
-            c.close()
-            raise
-
-
-def unix_socketpair(name):
-    """Build a pair of UNIX sockets connected to each other through
-    the same UNIX file name.
-    Return a (server, client) tuple.
-    """
-    assert psutil.POSIX
-    server = client = None
-    try:
-        server = bind_unix_socket(name, type=socket.SOCK_STREAM)
-        server.setblocking(0)
-        client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        client.setblocking(0)
-        client.connect(name)
-        # new = server.accept()
-    except Exception:
-        if server is not None:
-            server.close()
-        if client is not None:
-            client.close()
-        raise
-    return (server, client)
-
-
-@contextlib.contextmanager
-def create_sockets():
-    """Open as many socket families / types as possible."""
-    socks = []
-    fname1 = fname2 = None
-    try:
-        socks.append(bind_socket(socket.AF_INET, socket.SOCK_STREAM))
-        socks.append(bind_socket(socket.AF_INET, socket.SOCK_DGRAM))
-        if supports_ipv6():
-            socks.append(bind_socket(socket.AF_INET6, socket.SOCK_STREAM))
-            socks.append(bind_socket(socket.AF_INET6, socket.SOCK_DGRAM))
-        if POSIX and HAS_CONNECTIONS_UNIX:
-            fname1 = unix_socket_path().__enter__()
-            fname2 = unix_socket_path().__enter__()
-            s1, s2 = unix_socketpair(fname1)
-            s3 = bind_unix_socket(fname2, type=socket.SOCK_DGRAM)
-            # self.addCleanup(safe_rmpath, fname1)
-            # self.addCleanup(safe_rmpath, fname2)
-            for s in (s1, s2, s3):
-                socks.append(s)
-        yield socks
-    finally:
-        for s in socks:
-            s.close()
-        if fname1 is not None:
-            safe_rmpath(fname1)
-        if fname2 is not None:
-            safe_rmpath(fname2)
-
-
-def check_net_address(addr, family):
-    """Check a net address validity. Supported families are IPv4,
-    IPv6 and MAC addresses.
-    """
-    import ipaddress  # python >= 3.3 / requires "pip install ipaddress"
-    if enum and PY3:
-        assert isinstance(family, enum.IntEnum), family
-    if family == socket.AF_INET:
-        octs = [int(x) for x in addr.split('.')]
-        assert len(octs) == 4, addr
-        for num in octs:
-            assert 0 <= num <= 255, addr
-        if not PY3:
-            addr = unicode(addr)
-        ipaddress.IPv4Address(addr)
-    elif family == socket.AF_INET6:
-        assert isinstance(addr, str), addr
-        if not PY3:
-            addr = unicode(addr)
-        ipaddress.IPv6Address(addr)
-    elif family == psutil.AF_LINK:
-        assert re.match(r'([a-fA-F0-9]{2}[:|\-]?){6}', addr) is not None, addr
-    else:
-        raise ValueError("unknown family %r", family)
-
-
-# ===================================================================
-# --- compatibility
-# ===================================================================
-
-
-def reload_module(module):
-    """Backport of importlib.reload of Python 3.3+."""
-    try:
-        import importlib
-        if not hasattr(importlib, 'reload'):  # python <=3.3
-            raise ImportError
-    except ImportError:
-        import imp
-        return imp.reload(module)
-    else:
-        return importlib.reload(module)
-
-
-def import_module_by_path(path):
-    name = os.path.splitext(os.path.basename(path))[0]
-    if sys.version_info[0] == 2:
-        import imp
-        return imp.load_source(name, path)
-    elif sys.version_info[:2] <= (3, 4):
-        from importlib.machinery import SourceFileLoader
-        return SourceFileLoader(name, path).load_module()
-    else:
-        import importlib.util
-        spec = importlib.util.spec_from_file_location(name, path)
-        mod = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(mod)
-        return mod
-
-
-# ===================================================================
-# --- others
-# ===================================================================
-
-
-def warn(msg):
-    """Raise a warning msg."""
-    warnings.warn(msg, UserWarning)
-
-
-def is_namedtuple(x):
-    """Check if object is an instance of namedtuple."""
-    t = type(x)
-    b = t.__bases__
-    if len(b) != 1 or b[0] != tuple:
-        return False
-    f = getattr(t, '_fields', None)
-    if not isinstance(f, tuple):
-        return False
-    return all(type(n) == str for n in f)
-
-
-if POSIX:
-    @contextlib.contextmanager
-    def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
-        """Ctx manager which picks up a random shared CO lib used
-        by this process, copies it in another location and loads it
-        in memory via ctypes. Return the new absolutized path.
-        """
-        exe = 'pypy' if PYPY else 'python'
-        ext = ".so"
-        dst = tempfile.mktemp(prefix=dst_prefix, suffix=ext)
-        libs = [x.path for x in psutil.Process().memory_maps() if
-                os.path.splitext(x.path)[1] == ext and
-                exe in x.path.lower()]
-        src = random.choice(libs)
-        shutil.copyfile(src, dst)
-        try:
-            ctypes.CDLL(dst)
-            yield dst
-        finally:
-            safe_rmpath(dst)
-else:
-    @contextlib.contextmanager
-    def copyload_shared_lib(dst_prefix=TESTFILE_PREFIX):
-        """Ctx manager which picks up a random shared DLL lib used
-        by this process, copies it in another location and loads it
-        in memory via ctypes.
-        Return the new absolutized, normcased path.
-        """
-        from ctypes import wintypes
-        from ctypes import WinError
-        ext = ".dll"
-        dst = tempfile.mktemp(prefix=dst_prefix, suffix=ext)
-        libs = [x.path for x in psutil.Process().memory_maps() if
-                x.path.lower().endswith(ext) and
-                'python' in os.path.basename(x.path).lower() and
-                'wow64' not in x.path.lower()]
-        if PYPY and not libs:
-            libs = [x.path for x in psutil.Process().memory_maps() if
-                    'pypy' in os.path.basename(x.path).lower()]
-        src = random.choice(libs)
-        shutil.copyfile(src, dst)
-        cfile = None
-        try:
-            cfile = ctypes.WinDLL(dst)
-            yield dst
-        finally:
-            # Work around OverflowError:
-            # - https://ci.appveyor.com/project/giampaolo/psutil/build/1207/
-            #       job/o53330pbnri9bcw7
-            # - http://bugs.python.org/issue30286
-            # - http://stackoverflow.com/questions/23522055
-            if cfile is not None:
-                FreeLibrary = ctypes.windll.kernel32.FreeLibrary
-                FreeLibrary.argtypes = [wintypes.HMODULE]
-                ret = FreeLibrary(cfile._handle)
-                if ret == 0:
-                    WinError()
-            safe_rmpath(dst)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__main__.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__main__.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__main__.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/__main__.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Run unit tests. This is invoked by:
-$ python -m psutil.tests
-"""
-
-from .runner import main
-main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/runner.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/runner.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/runner.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/runner.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,162 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Unit test runner, providing new features on top of unittest module:
-- colourized output (error, skip)
-- print failures/tracebacks on CTRL+C
-- re-run failed tests only (make test-failed)
-"""
-
-from __future__ import print_function
-import optparse
-import os
-import sys
-import unittest
-from unittest import TestResult
-from unittest import TextTestResult
-from unittest import TextTestRunner
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-
-import psutil
-from psutil._common import hilite
-from psutil._common import print_color
-from psutil._common import term_supports_colors
-from psutil.tests import safe_rmpath
-from psutil.tests import TOX
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-VERBOSITY = 1 if TOX else 2
-FAILED_TESTS_FNAME = '.failed-tests.txt'
-
-
-# =====================================================================
-# --- unittest subclasses
-# =====================================================================
-
-
-class ColouredResult(TextTestResult):
-
-    def _print_color(self, s, color, bold=False):
-        file = sys.stderr if color == "red" else sys.stdout
-        print_color(s, color, bold=bold, file=file)
-
-    def addSuccess(self, test):
-        TestResult.addSuccess(self, test)
-        self._print_color("OK", "green")
-
-    def addError(self, test, err):
-        TestResult.addError(self, test, err)
-        self._print_color("ERROR", "red", bold=True)
-
-    def addFailure(self, test, err):
-        TestResult.addFailure(self, test, err)
-        self._print_color("FAIL", "red")
-
-    def addSkip(self, test, reason):
-        TestResult.addSkip(self, test, reason)
-        self._print_color("skipped: %s" % reason, "brown")
-
-    def printErrorList(self, flavour, errors):
-        flavour = hilite(flavour, "red", bold=flavour == 'ERROR')
-        TextTestResult.printErrorList(self, flavour, errors)
-
-
-class ColouredRunner(TextTestRunner):
-    resultclass = ColouredResult if term_supports_colors() else TextTestResult
-
-    def _makeResult(self):
-        # Store result instance so that it can be accessed on
-        # KeyboardInterrupt.
-        self.result = TextTestRunner._makeResult(self)
-        return self.result
-
-
-# =====================================================================
-# --- public API
-# =====================================================================
-
-
-def setup_tests():
-    if 'PSUTIL_TESTING' not in os.environ:
-        # This won't work on Windows but set_testing() below will do it.
-        os.environ['PSUTIL_TESTING'] = '1'
-    psutil._psplatform.cext.set_testing()
-
-
-def get_suite(name=None):
-    suite = unittest.TestSuite()
-    if name is None:
-        testmods = [os.path.splitext(x)[0] for x in os.listdir(HERE)
-                    if x.endswith('.py') and x.startswith('test_') and not
-                    x.startswith('test_memory_leaks')]
-        if "WHEELHOUSE_UPLOADER_USERNAME" in os.environ:
-            testmods = [x for x in testmods if not x.endswith((
-                        "osx", "posix", "linux"))]
-        for tm in testmods:
-            # ...so that the full test paths are printed on screen
-            tm = "psutil.tests.%s" % tm
-            suite.addTest(unittest.defaultTestLoader.loadTestsFromName(tm))
-    else:
-        name = os.path.splitext(os.path.basename(name))[0]
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromName(name))
-    return suite
-
-
-def get_suite_from_failed():
-    # ...from previously failed test run
-    suite = unittest.TestSuite()
-    if not os.path.isfile(FAILED_TESTS_FNAME):
-        return suite
-    with open(FAILED_TESTS_FNAME, 'rt') as f:
-        names = f.read().split()
-    for n in names:
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromName(n))
-    return suite
-
-
-def save_failed_tests(result):
-    if result.wasSuccessful():
-        return safe_rmpath(FAILED_TESTS_FNAME)
-    with open(FAILED_TESTS_FNAME, 'wt') as f:
-        for t in result.errors + result.failures:
-            tname = str(t[0])
-            unittest.defaultTestLoader.loadTestsFromName(tname)
-            f.write(tname + '\n')
-
-
-def run(name=None, last_failed=False):
-    setup_tests()
-    runner = ColouredRunner(verbosity=VERBOSITY)
-    suite = get_suite_from_failed() if last_failed else get_suite(name)
-    try:
-        result = runner.run(suite)
-    except (KeyboardInterrupt, SystemExit) as err:
-        print("received %s" % err.__class__.__name__, file=sys.stderr)
-        runner.result.printErrors()
-        sys.exit(1)
-    else:
-        save_failed_tests(result)
-        success = result.wasSuccessful()
-        sys.exit(0 if success else 1)
-
-
-def main():
-    usage = "python3 -m psutil.tests [opts]"
-    parser = optparse.OptionParser(usage=usage, description="run unit tests")
-    parser.add_option("--last-failed",
-                      action="store_true", default=False,
-                      help="only run last failed tests")
-    opts, args = parser.parse_args()
-    run(last_failed=opts.last_failed)
-
-
-if __name__ == '__main__':
-    main()
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_aix.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_aix.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_aix.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_aix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'
-# Copyright (c) 2017, Arnon Yaari
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""AIX specific tests."""
-
-import re
-
-from psutil import AIX
-from psutil.tests import sh
-from psutil.tests import unittest
-import psutil
-
-
-@unittest.skipIf(not AIX, "AIX only")
-class AIXSpecificTestCase(unittest.TestCase):
-
-    def test_virtual_memory(self):
-        out = sh('/usr/bin/svmon -O unit=KB')
-        re_pattern = r"memory\s*"
-        for field in ("size inuse free pin virtual available mmode").split():
-            re_pattern += r"(?P<%s>\S+)\s+" % (field,)
-        matchobj = re.search(re_pattern, out)
-
-        self.assertIsNotNone(
-            matchobj, "svmon command returned unexpected output")
-
-        KB = 1024
-        total = int(matchobj.group("size")) * KB
-        available = int(matchobj.group("available")) * KB
-        used = int(matchobj.group("inuse")) * KB
-        free = int(matchobj.group("free")) * KB
-
-        psutil_result = psutil.virtual_memory()
-
-        # MEMORY_TOLERANCE from psutil.tests is not enough. For some reason
-        # we're seeing differences of ~1.2 MB. 2 MB is still a good tolerance
-        # when compared to GBs.
-        MEMORY_TOLERANCE = 2 * KB * KB   # 2 MB
-        self.assertEqual(psutil_result.total, total)
-        self.assertAlmostEqual(
-            psutil_result.used, used, delta=MEMORY_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.available, available, delta=MEMORY_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.free, free, delta=MEMORY_TOLERANCE)
-
-    def test_swap_memory(self):
-        out = sh('/usr/sbin/lsps -a')
-        # From the man page, "The size is given in megabytes" so we assume
-        # we'll always have 'MB' in the result
-        # TODO maybe try to use "swap -l" to check "used" too, but its units
-        # are not guaranteed to be "MB" so parsing may not be consistent
-        matchobj = re.search(r"(?P<space>\S+)\s+"
-                             r"(?P<vol>\S+)\s+"
-                             r"(?P<vg>\S+)\s+"
-                             r"(?P<size>\d+)MB", out)
-
-        self.assertIsNotNone(
-            matchobj, "lsps command returned unexpected output")
-
-        total_mb = int(matchobj.group("size"))
-        MB = 1024 ** 2
-        psutil_result = psutil.swap_memory()
-        # we divide our result by MB instead of multiplying the lsps value by
-        # MB because lsps may round down, so we round down too
-        self.assertEqual(int(psutil_result.total / MB), total_mb)
-
-    def test_cpu_stats(self):
-        out = sh('/usr/bin/mpstat -a')
-
-        re_pattern = r"ALL\s*"
-        for field in ("min maj mpcs mpcr dev soft dec ph cs ics bound rq "
-                      "push S3pull S3grd S0rd S1rd S2rd S3rd S4rd S5rd "
-                      "sysc").split():
-            re_pattern += r"(?P<%s>\S+)\s+" % (field,)
-        matchobj = re.search(re_pattern, out)
-
-        self.assertIsNotNone(
-            matchobj, "mpstat command returned unexpected output")
-
-        # numbers are usually in the millions so 1000 is ok for tolerance
-        CPU_STATS_TOLERANCE = 1000
-        psutil_result = psutil.cpu_stats()
-        self.assertAlmostEqual(
-            psutil_result.ctx_switches,
-            int(matchobj.group("cs")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.syscalls,
-            int(matchobj.group("sysc")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.interrupts,
-            int(matchobj.group("dev")),
-            delta=CPU_STATS_TOLERANCE)
-        self.assertAlmostEqual(
-            psutil_result.soft_interrupts,
-            int(matchobj.group("soft")),
-            delta=CPU_STATS_TOLERANCE)
-
-    def test_cpu_count_logical(self):
-        out = sh('/usr/bin/mpstat -a')
-        mpstat_lcpu = int(re.search(r"lcpu=(\d+)", out).group(1))
-        psutil_lcpu = psutil.cpu_count(logical=True)
-        self.assertEqual(mpstat_lcpu, psutil_lcpu)
-
-    def test_net_if_addrs_names(self):
-        out = sh('/etc/ifconfig -l')
-        ifconfig_names = set(out.split())
-        psutil_names = set(psutil.net_if_addrs().keys())
-        self.assertSetEqual(ifconfig_names, psutil_names)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_bsd.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_bsd.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_bsd.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_bsd.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,565 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# TODO: (FreeBSD) add test for comparing connections with 'sockstat' cmd.
-
-
-"""Tests specific to all BSD platforms."""
-
-
-import datetime
-import os
-import re
-import time
-
-import psutil
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-from psutil.tests import which
-
-
-if BSD:
-    PAGESIZE = os.sysconf("SC_PAGE_SIZE")
-    if os.getuid() == 0:  # muse requires root privileges
-        MUSE_AVAILABLE = which('muse')
-    else:
-        MUSE_AVAILABLE = False
-else:
-    MUSE_AVAILABLE = False
-
-
-def sysctl(cmdline):
-    """Expects a sysctl command with an argument and parse the result
-    returning only the value of interest.
-    """
-    result = sh("sysctl " + cmdline)
-    if FREEBSD:
-        result = result[result.find(": ") + 2:]
-    elif OPENBSD or NETBSD:
-        result = result[result.find("=") + 1:]
-    try:
-        return int(result)
-    except ValueError:
-        return result
-
-
-def muse(field):
-    """Thin wrapper around 'muse' cmdline utility."""
-    out = sh('muse')
-    for line in out.split('\n'):
-        if line.startswith(field):
-            break
-    else:
-        raise ValueError("line not found")
-    return int(line.split()[1])
-
-
-# =====================================================================
-# --- All BSD*
-# =====================================================================
-
-
-@unittest.skipIf(not BSD, "BSD only")
-class BSDTestCase(unittest.TestCase):
-    """Generic tests common to all BSD variants."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    @unittest.skipIf(NETBSD, "-o lstart doesn't work on NETBSD")
-    def test_process_create_time(self):
-        output = sh("ps -o lstart -p %s" % self.pid)
-        start_ps = output.replace('STARTED', '').strip()
-        start_psutil = psutil.Process(self.pid).create_time()
-        start_psutil = time.strftime("%a %b %e %H:%M:%S %Y",
-                                     time.localtime(start_psutil))
-        self.assertEqual(start_ps, start_psutil)
-
-    def test_disks(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -k "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total = int(total) * 1024
-            used = int(used) * 1024
-            free = int(free) * 1024
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(part.device, dev)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.free, free))
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.used, used))
-
-    @unittest.skipIf(not which('sysctl'), "sysctl cmd not available")
-    def test_cpu_count_logical(self):
-        syst = sysctl("hw.ncpu")
-        self.assertEqual(psutil.cpu_count(logical=True), syst)
-
-    @unittest.skipIf(not which('sysctl'), "sysctl cmd not available")
-    def test_virtual_memory_total(self):
-        num = sysctl('hw.physmem')
-        self.assertEqual(num, psutil.virtual_memory().total)
-
-    def test_net_if_stats(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                if "mtu" in out:
-                    self.assertEqual(stats.mtu,
-                                     int(re.findall(r'mtu (\d+)', out)[0]))
-
-
-# =====================================================================
-# --- FreeBSD
-# =====================================================================
-
-
-@unittest.skipIf(not FREEBSD, "FREEBSD only")
-class FreeBSDProcessTestCase(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    @retry_on_failure()
-    def test_memory_maps(self):
-        out = sh('procstat -v %s' % self.pid)
-        maps = psutil.Process(self.pid).memory_maps(grouped=False)
-        lines = out.split('\n')[1:]
-        while lines:
-            line = lines.pop()
-            fields = line.split()
-            _, start, stop, perms, res = fields[:5]
-            map = maps.pop()
-            self.assertEqual("%s-%s" % (start, stop), map.addr)
-            self.assertEqual(int(res), map.rss)
-            if not map.path.startswith('['):
-                self.assertEqual(fields[10], map.path)
-
-    def test_exe(self):
-        out = sh('procstat -b %s' % self.pid)
-        self.assertEqual(psutil.Process(self.pid).exe(),
-                         out.split('\n')[1].split()[-1])
-
-    def test_cmdline(self):
-        out = sh('procstat -c %s' % self.pid)
-        self.assertEqual(' '.join(psutil.Process(self.pid).cmdline()),
-                         ' '.join(out.split('\n')[1].split()[2:]))
-
-    def test_uids_gids(self):
-        out = sh('procstat -s %s' % self.pid)
-        euid, ruid, suid, egid, rgid, sgid = out.split('\n')[1].split()[2:8]
-        p = psutil.Process(self.pid)
-        uids = p.uids()
-        gids = p.gids()
-        self.assertEqual(uids.real, int(ruid))
-        self.assertEqual(uids.effective, int(euid))
-        self.assertEqual(uids.saved, int(suid))
-        self.assertEqual(gids.real, int(rgid))
-        self.assertEqual(gids.effective, int(egid))
-        self.assertEqual(gids.saved, int(sgid))
-
-    @retry_on_failure()
-    def test_ctx_switches(self):
-        tested = []
-        out = sh('procstat -r %s' % self.pid)
-        p = psutil.Process(self.pid)
-        for line in out.split('\n'):
-            line = line.lower().strip()
-            if ' voluntary context' in line:
-                pstat_value = int(line.split()[-1])
-                psutil_value = p.num_ctx_switches().voluntary
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-            elif ' involuntary context' in line:
-                pstat_value = int(line.split()[-1])
-                psutil_value = p.num_ctx_switches().involuntary
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-        if len(tested) != 2:
-            raise RuntimeError("couldn't find lines match in procstat out")
-
-    @retry_on_failure()
-    def test_cpu_times(self):
-        tested = []
-        out = sh('procstat -r %s' % self.pid)
-        p = psutil.Process(self.pid)
-        for line in out.split('\n'):
-            line = line.lower().strip()
-            if 'user time' in line:
-                pstat_value = float('0.' + line.split()[-1].split('.')[-1])
-                psutil_value = p.cpu_times().user
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-            elif 'system time' in line:
-                pstat_value = float('0.' + line.split()[-1].split('.')[-1])
-                psutil_value = p.cpu_times().system
-                self.assertEqual(pstat_value, psutil_value)
-                tested.append(None)
-        if len(tested) != 2:
-            raise RuntimeError("couldn't find lines match in procstat out")
-
-
-@unittest.skipIf(not FREEBSD, "FREEBSD only")
-class FreeBSDSystemTestCase(unittest.TestCase):
-
-    @staticmethod
-    def parse_swapinfo():
-        # the last line is always the total
-        output = sh("swapinfo -k").splitlines()[-1]
-        parts = re.split(r'\s+', output)
-
-        if not parts:
-            raise ValueError("Can't parse swapinfo: %s" % output)
-
-        # the size is in 1k units, so multiply by 1024
-        total, used, free = (int(p) * 1024 for p in parts[1:4])
-        return total, used, free
-
-    def test_cpu_frequency_against_sysctl(self):
-        # Currently only cpu 0 is frequency is supported in FreeBSD
-        # All other cores use the same frequency.
-        sensor = "dev.cpu.0.freq"
-        try:
-            sysctl_result = int(sysctl(sensor))
-        except RuntimeError:
-            self.skipTest("frequencies not supported by kernel")
-        self.assertEqual(psutil.cpu_freq().current, sysctl_result)
-
-        sensor = "dev.cpu.0.freq_levels"
-        sysctl_result = sysctl(sensor)
-        # sysctl returns a string of the format:
-        # <freq_level_1>/<voltage_level_1> <freq_level_2>/<voltage_level_2>...
-        # Ordered highest available to lowest available.
-        max_freq = int(sysctl_result.split()[0].split("/")[0])
-        min_freq = int(sysctl_result.split()[-1].split("/")[0])
-        self.assertEqual(psutil.cpu_freq().max, max_freq)
-        self.assertEqual(psutil.cpu_freq().min, min_freq)
-
-    # --- virtual_memory(); tests against sysctl
-
-    @retry_on_failure()
-    def test_vmem_active(self):
-        syst = sysctl("vm.stats.vm.v_active_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().active, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_inactive(self):
-        syst = sysctl("vm.stats.vm.v_inactive_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().inactive, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_wired(self):
-        syst = sysctl("vm.stats.vm.v_wire_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().wired, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_cached(self):
-        syst = sysctl("vm.stats.vm.v_cache_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().cached, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_free(self):
-        syst = sysctl("vm.stats.vm.v_free_count") * PAGESIZE
-        self.assertAlmostEqual(psutil.virtual_memory().free, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_buffers(self):
-        syst = sysctl("vfs.bufspace")
-        self.assertAlmostEqual(psutil.virtual_memory().buffers, syst,
-                               delta=MEMORY_TOLERANCE)
-
-    # --- virtual_memory(); tests against muse
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    def test_muse_vmem_total(self):
-        num = muse('Total')
-        self.assertEqual(psutil.virtual_memory().total, num)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_active(self):
-        num = muse('Active')
-        self.assertAlmostEqual(psutil.virtual_memory().active, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_inactive(self):
-        num = muse('Inactive')
-        self.assertAlmostEqual(psutil.virtual_memory().inactive, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_wired(self):
-        num = muse('Wired')
-        self.assertAlmostEqual(psutil.virtual_memory().wired, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_cached(self):
-        num = muse('Cache')
-        self.assertAlmostEqual(psutil.virtual_memory().cached, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_free(self):
-        num = muse('Free')
-        self.assertAlmostEqual(psutil.virtual_memory().free, num,
-                               delta=MEMORY_TOLERANCE)
-
-    @unittest.skipIf(not MUSE_AVAILABLE, "muse not installed")
-    @retry_on_failure()
-    def test_muse_vmem_buffers(self):
-        num = muse('Buffer')
-        self.assertAlmostEqual(psutil.virtual_memory().buffers, num,
-                               delta=MEMORY_TOLERANCE)
-
-    def test_cpu_stats_ctx_switches(self):
-        self.assertAlmostEqual(psutil.cpu_stats().ctx_switches,
-                               sysctl('vm.stats.sys.v_swtch'), delta=1000)
-
-    def test_cpu_stats_interrupts(self):
-        self.assertAlmostEqual(psutil.cpu_stats().interrupts,
-                               sysctl('vm.stats.sys.v_intr'), delta=1000)
-
-    def test_cpu_stats_soft_interrupts(self):
-        self.assertAlmostEqual(psutil.cpu_stats().soft_interrupts,
-                               sysctl('vm.stats.sys.v_soft'), delta=1000)
-
-    @retry_on_failure()
-    def test_cpu_stats_syscalls(self):
-        # pretty high tolerance but it looks like it's OK.
-        self.assertAlmostEqual(psutil.cpu_stats().syscalls,
-                               sysctl('vm.stats.sys.v_syscall'), delta=200000)
-
-    # def test_cpu_stats_traps(self):
-    #    self.assertAlmostEqual(psutil.cpu_stats().traps,
-    #                           sysctl('vm.stats.sys.v_trap'), delta=1000)
-
-    # --- swap memory
-
-    def test_swapmem_free(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().free, free, delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_used(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().used, used, delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_total(self):
-        total, used, free = self.parse_swapinfo()
-        self.assertAlmostEqual(
-            psutil.swap_memory().total, total, delta=MEMORY_TOLERANCE)
-
-    # --- others
-
-    def test_boot_time(self):
-        s = sysctl('sysctl kern.boottime')
-        s = s[s.find(" sec = ") + 7:]
-        s = s[:s.find(',')]
-        btime = int(s)
-        self.assertEqual(btime, psutil.boot_time())
-
-    # --- sensors_battery
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        def secs2hours(secs):
-            m, s = divmod(secs, 60)
-            h, m = divmod(m, 60)
-            return "%d:%02d" % (h, m)
-
-        out = sh("acpiconf -i 0")
-        fields = dict([(x.split('\t')[0], x.split('\t')[-1])
-                       for x in out.split("\n")])
-        metrics = psutil.sensors_battery()
-        percent = int(fields['Remaining capacity:'].replace('%', ''))
-        remaining_time = fields['Remaining time:']
-        self.assertEqual(metrics.percent, percent)
-        if remaining_time == 'unknown':
-            self.assertEqual(metrics.secsleft, psutil.POWER_TIME_UNLIMITED)
-        else:
-            self.assertEqual(secs2hours(metrics.secsleft), remaining_time)
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery_against_sysctl(self):
-        self.assertEqual(psutil.sensors_battery().percent,
-                         sysctl("hw.acpi.battery.life"))
-        self.assertEqual(psutil.sensors_battery().power_plugged,
-                         sysctl("hw.acpi.acline") == 1)
-        secsleft = psutil.sensors_battery().secsleft
-        if secsleft < 0:
-            self.assertEqual(sysctl("hw.acpi.battery.time"), -1)
-        else:
-            self.assertEqual(secsleft, sysctl("hw.acpi.battery.time") * 60)
-
-    @unittest.skipIf(HAS_BATTERY, "has battery")
-    def test_sensors_battery_no_battery(self):
-        # If no battery is present one of these calls is supposed
-        # to fail, see:
-        # https://github.com/giampaolo/psutil/issues/1074
-        with self.assertRaises(RuntimeError):
-            sysctl("hw.acpi.battery.life")
-            sysctl("hw.acpi.battery.time")
-            sysctl("hw.acpi.acline")
-        self.assertIsNone(psutil.sensors_battery())
-
-    # --- sensors_temperatures
-
-    def test_sensors_temperatures_against_sysctl(self):
-        num_cpus = psutil.cpu_count(True)
-        for cpu in range(num_cpus):
-            sensor = "dev.cpu.%s.temperature" % cpu
-            # sysctl returns a string in the format 46.0C
-            try:
-                sysctl_result = int(float(sysctl(sensor)[:-1]))
-            except RuntimeError:
-                self.skipTest("temperatures not supported by kernel")
-            self.assertAlmostEqual(
-                psutil.sensors_temperatures()["coretemp"][cpu].current,
-                sysctl_result, delta=10)
-
-            sensor = "dev.cpu.%s.coretemp.tjmax" % cpu
-            sysctl_result = int(float(sysctl(sensor)[:-1]))
-            self.assertEqual(
-                psutil.sensors_temperatures()["coretemp"][cpu].high,
-                sysctl_result)
-
-# =====================================================================
-# --- OpenBSD
-# =====================================================================
-
-
-@unittest.skipIf(not OPENBSD, "OPENBSD only")
-class OpenBSDTestCase(unittest.TestCase):
-
-    def test_boot_time(self):
-        s = sysctl('kern.boottime')
-        sys_bt = datetime.datetime.strptime(s, "%a %b %d %H:%M:%S %Y")
-        psutil_bt = datetime.datetime.fromtimestamp(psutil.boot_time())
-        self.assertEqual(sys_bt, psutil_bt)
-
-
-# =====================================================================
-# --- NetBSD
-# =====================================================================
-
-
-@unittest.skipIf(not NETBSD, "NETBSD only")
-class NetBSDTestCase(unittest.TestCase):
-
-    @staticmethod
-    def parse_meminfo(look_for):
-        with open('/proc/meminfo', 'rt') as f:
-            for line in f:
-                if line.startswith(look_for):
-                    return int(line.split()[1]) * 1024
-        raise ValueError("can't find %s" % look_for)
-
-    def test_vmem_total(self):
-        self.assertEqual(
-            psutil.virtual_memory().total, self.parse_meminfo("MemTotal:"))
-
-    def test_vmem_free(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().free, self.parse_meminfo("MemFree:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_vmem_buffers(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().buffers, self.parse_meminfo("Buffers:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_vmem_shared(self):
-        self.assertAlmostEqual(
-            psutil.virtual_memory().shared, self.parse_meminfo("MemShared:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_total(self):
-        self.assertAlmostEqual(
-            psutil.swap_memory().total, self.parse_meminfo("SwapTotal:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_free(self):
-        self.assertAlmostEqual(
-            psutil.swap_memory().free, self.parse_meminfo("SwapFree:"),
-            delta=MEMORY_TOLERANCE)
-
-    def test_swapmem_used(self):
-        smem = psutil.swap_memory()
-        self.assertEqual(smem.used, smem.total - smem.free)
-
-    def test_cpu_stats_interrupts(self):
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'intr'):
-                    interrupts = int(line.split()[1])
-                    break
-            else:
-                raise ValueError("couldn't find line")
-        self.assertAlmostEqual(
-            psutil.cpu_stats().interrupts, interrupts, delta=1000)
-
-    def test_cpu_stats_ctx_switches(self):
-        with open('/proc/stat', 'rb') as f:
-            for line in f:
-                if line.startswith(b'ctxt'):
-                    ctx_switches = int(line.split()[1])
-                    break
-            else:
-                raise ValueError("couldn't find line")
-        self.assertAlmostEqual(
-            psutil.cpu_stats().ctx_switches, ctx_switches, delta=1000)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_connections.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_connections.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_connections.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_connections.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,637 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for net_connections() and Process.connections() APIs."""
-
-import contextlib
-import errno
-import os
-import socket
-import textwrap
-from contextlib import closing
-from socket import AF_INET
-from socket import AF_INET6
-from socket import SOCK_DGRAM
-from socket import SOCK_STREAM
-
-import psutil
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import supports_ipv6
-from psutil._compat import PY3
-from psutil.tests import AF_UNIX
-from psutil.tests import bind_socket
-from psutil.tests import bind_unix_socket
-from psutil.tests import check_net_address
-from psutil.tests import CIRRUS
-from psutil.tests import create_sockets
-from psutil.tests import enum
-from psutil.tests import get_free_port
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import pyrun
-from psutil.tests import reap_children
-from psutil.tests import safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import SKIP_SYSCONS
-from psutil.tests import tcp_socketpair
-from psutil.tests import TESTFN
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-from psutil.tests import unix_socketpair
-from psutil.tests import wait_for_file
-
-
-thisproc = psutil.Process()
-SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object())
-
-
-class Base(object):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-        if not (NETBSD or FREEBSD):
-            # process opens a UNIX socket to /var/log/run.
-            cons = thisproc.connections(kind='all')
-            assert not cons, cons
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-        reap_children()
-        if not (FREEBSD or NETBSD):
-            # Make sure we closed all resources.
-            # NetBSD opens a UNIX socket to /var/log/run.
-            cons = thisproc.connections(kind='all')
-            assert not cons, cons
-
-    def compare_procsys_connections(self, pid, proc_cons, kind='all'):
-        """Given a process PID and its list of connections compare
-        those against system-wide connections retrieved via
-        psutil.net_connections.
-        """
-        try:
-            sys_cons = psutil.net_connections(kind=kind)
-        except psutil.AccessDenied:
-            # On MACOS, system-wide connections are retrieved by iterating
-            # over all processes
-            if MACOS:
-                return
-            else:
-                raise
-        # Filter for this proc PID and exlucde PIDs from the tuple.
-        sys_cons = [c[:-1] for c in sys_cons if c.pid == pid]
-        sys_cons.sort()
-        proc_cons.sort()
-        self.assertEqual(proc_cons, sys_cons)
-
-    def check_connection_ntuple(self, conn):
-        """Check validity of a connection namedtuple."""
-        def check_ntuple(conn):
-            has_pid = len(conn) == 7
-            self.assertIn(len(conn), (6, 7))
-            self.assertEqual(conn[0], conn.fd)
-            self.assertEqual(conn[1], conn.family)
-            self.assertEqual(conn[2], conn.type)
-            self.assertEqual(conn[3], conn.laddr)
-            self.assertEqual(conn[4], conn.raddr)
-            self.assertEqual(conn[5], conn.status)
-            if has_pid:
-                self.assertEqual(conn[6], conn.pid)
-
-        def check_family(conn):
-            self.assertIn(conn.family, (AF_INET, AF_INET6, AF_UNIX))
-            if enum is not None:
-                assert isinstance(conn.family, enum.IntEnum), conn
-            else:
-                assert isinstance(conn.family, int), conn
-            if conn.family == AF_INET:
-                # actually try to bind the local socket; ignore IPv6
-                # sockets as their address might be represented as
-                # an IPv4-mapped-address (e.g. "::127.0.0.1")
-                # and that's rejected by bind()
-                s = socket.socket(conn.family, conn.type)
-                with contextlib.closing(s):
-                    try:
-                        s.bind((conn.laddr[0], 0))
-                    except socket.error as err:
-                        if err.errno != errno.EADDRNOTAVAIL:
-                            raise
-            elif conn.family == AF_UNIX:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        def check_type(conn):
-            # SOCK_SEQPACKET may happen in case of AF_UNIX socks
-            self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET))
-            if enum is not None:
-                assert isinstance(conn.type, enum.IntEnum), conn
-            else:
-                assert isinstance(conn.type, int), conn
-            if conn.type == SOCK_DGRAM:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        def check_addrs(conn):
-            # check IP address and port sanity
-            for addr in (conn.laddr, conn.raddr):
-                if conn.family in (AF_INET, AF_INET6):
-                    self.assertIsInstance(addr, tuple)
-                    if not addr:
-                        continue
-                    self.assertIsInstance(addr.port, int)
-                    assert 0 <= addr.port <= 65535, addr.port
-                    check_net_address(addr.ip, conn.family)
-                elif conn.family == AF_UNIX:
-                    self.assertIsInstance(addr, str)
-
-        def check_status(conn):
-            self.assertIsInstance(conn.status, str)
-            valids = [getattr(psutil, x) for x in dir(psutil)
-                      if x.startswith('CONN_')]
-            self.assertIn(conn.status, valids)
-            if conn.family in (AF_INET, AF_INET6) and conn.type == SOCK_STREAM:
-                self.assertNotEqual(conn.status, psutil.CONN_NONE)
-            else:
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-        check_ntuple(conn)
-        check_family(conn)
-        check_type(conn)
-        check_addrs(conn)
-        check_status(conn)
-
-
-class TestBase(Base, unittest.TestCase):
-
-    @unittest.skipIf(SKIP_SYSCONS, "requires root")
-    def test_system(self):
-        with create_sockets():
-            for conn in psutil.net_connections(kind='all'):
-                self.check_connection_ntuple(conn)
-
-    def test_process(self):
-        with create_sockets():
-            for conn in psutil.Process().connections(kind='all'):
-                self.check_connection_ntuple(conn)
-
-    def test_invalid_kind(self):
-        self.assertRaises(ValueError, thisproc.connections, kind='???')
-        self.assertRaises(ValueError, psutil.net_connections, kind='???')
-
-
-class TestUnconnectedSockets(Base, unittest.TestCase):
-    """Tests sockets which are open but not connected to anything."""
-
-    def get_conn_from_sock(self, sock):
-        cons = thisproc.connections(kind='all')
-        smap = dict([(c.fd, c) for c in cons])
-        if NETBSD or FREEBSD:
-            # NetBSD opens a UNIX socket to /var/log/run
-            # so there may be more connections.
-            return smap[sock.fileno()]
-        else:
-            self.assertEqual(len(cons), 1)
-            if cons[0].fd != -1:
-                self.assertEqual(smap[sock.fileno()].fd, sock.fileno())
-            return cons[0]
-
-    def check_socket(self, sock):
-        """Given a socket, makes sure it matches the one obtained
-        via psutil. It assumes this process created one connection
-        only (the one supposed to be checked).
-        """
-        conn = self.get_conn_from_sock(sock)
-        self.check_connection_ntuple(conn)
-
-        # fd, family, type
-        if conn.fd != -1:
-            self.assertEqual(conn.fd, sock.fileno())
-        self.assertEqual(conn.family, sock.family)
-        # see: http://bugs.python.org/issue30204
-        self.assertEqual(
-            conn.type, sock.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE))
-
-        # local address
-        laddr = sock.getsockname()
-        if not laddr and PY3 and isinstance(laddr, bytes):
-            # See: http://bugs.python.org/issue30205
-            laddr = laddr.decode()
-        if sock.family == AF_INET6:
-            laddr = laddr[:2]
-        if sock.family == AF_UNIX and OPENBSD:
-            # No addresses are set for UNIX sockets on OpenBSD.
-            pass
-        else:
-            self.assertEqual(conn.laddr, laddr)
-
-        # XXX Solaris can't retrieve system-wide UNIX sockets
-        if sock.family == AF_UNIX and HAS_CONNECTIONS_UNIX:
-            cons = thisproc.connections(kind='all')
-            self.compare_procsys_connections(os.getpid(), cons, kind='all')
-        return conn
-
-    def test_tcp_v4(self):
-        addr = ("127.0.0.1", get_free_port())
-        with closing(bind_socket(AF_INET, SOCK_STREAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_LISTEN)
-
-    @unittest.skipIf(not supports_ipv6(), "IPv6 not supported")
-    def test_tcp_v6(self):
-        addr = ("::1", get_free_port())
-        with closing(bind_socket(AF_INET6, SOCK_STREAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_LISTEN)
-
-    def test_udp_v4(self):
-        addr = ("127.0.0.1", get_free_port())
-        with closing(bind_socket(AF_INET, SOCK_DGRAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not supports_ipv6(), "IPv6 not supported")
-    def test_udp_v6(self):
-        addr = ("::1", get_free_port())
-        with closing(bind_socket(AF_INET6, SOCK_DGRAM, addr=addr)) as sock:
-            conn = self.check_socket(sock)
-            assert not conn.raddr
-            self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix_tcp(self):
-        with unix_socket_path() as name:
-            with closing(bind_unix_socket(name, type=SOCK_STREAM)) as sock:
-                conn = self.check_socket(sock)
-                assert not conn.raddr
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix_udp(self):
-        with unix_socket_path() as name:
-            with closing(bind_unix_socket(name, type=SOCK_STREAM)) as sock:
-                conn = self.check_socket(sock)
-                assert not conn.raddr
-                self.assertEqual(conn.status, psutil.CONN_NONE)
-
-
-class TestConnectedSocket(Base, unittest.TestCase):
-    """Test socket pairs which are are actually connected to
-    each other.
-    """
-
-    # On SunOS, even after we close() it, the server socket stays around
-    # in TIME_WAIT state.
-    @unittest.skipIf(SUNOS, "unreliable on SUONS")
-    def test_tcp(self):
-        addr = ("127.0.0.1", get_free_port())
-        assert not thisproc.connections(kind='tcp4')
-        server, client = tcp_socketpair(AF_INET, addr=addr)
-        try:
-            cons = thisproc.connections(kind='tcp4')
-            self.assertEqual(len(cons), 2)
-            self.assertEqual(cons[0].status, psutil.CONN_ESTABLISHED)
-            self.assertEqual(cons[1].status, psutil.CONN_ESTABLISHED)
-            # May not be fast enough to change state so it stays
-            # commenteed.
-            # client.close()
-            # cons = thisproc.connections(kind='all')
-            # self.assertEqual(len(cons), 1)
-            # self.assertEqual(cons[0].status, psutil.CONN_CLOSE_WAIT)
-        finally:
-            server.close()
-            client.close()
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_unix(self):
-        with unix_socket_path() as name:
-            server, client = unix_socketpair(name)
-            try:
-                cons = thisproc.connections(kind='unix')
-                assert not (cons[0].laddr and cons[0].raddr)
-                assert not (cons[1].laddr and cons[1].raddr)
-                if NETBSD or FREEBSD:
-                    # On NetBSD creating a UNIX socket will cause
-                    # a UNIX connection to  /var/run/log.
-                    cons = [c for c in cons if c.raddr != '/var/run/log']
-                    if CIRRUS:
-                        cons = [c for c in cons if c.fd in
-                                (server.fileno(), client.fileno())]
-                self.assertEqual(len(cons), 2, msg=cons)
-                if LINUX or FREEBSD or SUNOS:
-                    # remote path is never set
-                    self.assertEqual(cons[0].raddr, "")
-                    self.assertEqual(cons[1].raddr, "")
-                    # one local address should though
-                    self.assertEqual(name, cons[0].laddr or cons[1].laddr)
-                elif OPENBSD:
-                    # No addresses whatsoever here.
-                    for addr in (cons[0].laddr, cons[0].raddr,
-                                 cons[1].laddr, cons[1].raddr):
-                        self.assertEqual(addr, "")
-                else:
-                    # On other systems either the laddr or raddr
-                    # of both peers are set.
-                    self.assertEqual(cons[0].laddr or cons[1].laddr, name)
-                    self.assertEqual(cons[0].raddr or cons[1].raddr, name)
-            finally:
-                server.close()
-                client.close()
-
-
-class TestFilters(Base, unittest.TestCase):
-
-    def test_filters(self):
-        def check(kind, families, types):
-            for conn in thisproc.connections(kind=kind):
-                self.assertIn(conn.family, families)
-                self.assertIn(conn.type, types)
-            if not SKIP_SYSCONS:
-                for conn in psutil.net_connections(kind=kind):
-                    self.assertIn(conn.family, families)
-                    self.assertIn(conn.type, types)
-
-        with create_sockets():
-            check('all',
-                  [AF_INET, AF_INET6, AF_UNIX],
-                  [SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET])
-            check('inet',
-                  [AF_INET, AF_INET6],
-                  [SOCK_STREAM, SOCK_DGRAM])
-            check('inet4',
-                  [AF_INET],
-                  [SOCK_STREAM, SOCK_DGRAM])
-            check('tcp',
-                  [AF_INET, AF_INET6],
-                  [SOCK_STREAM])
-            check('tcp4',
-                  [AF_INET],
-                  [SOCK_STREAM])
-            check('tcp6',
-                  [AF_INET6],
-                  [SOCK_STREAM])
-            check('udp',
-                  [AF_INET, AF_INET6],
-                  [SOCK_DGRAM])
-            check('udp4',
-                  [AF_INET],
-                  [SOCK_DGRAM])
-            check('udp6',
-                  [AF_INET6],
-                  [SOCK_DGRAM])
-            if HAS_CONNECTIONS_UNIX:
-                check('unix',
-                      [AF_UNIX],
-                      [SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET])
-
-    @skip_on_access_denied(only_if=MACOS)
-    def test_combos(self):
-        def check_conn(proc, conn, family, type, laddr, raddr, status, kinds):
-            all_kinds = ("all", "inet", "inet4", "inet6", "tcp", "tcp4",
-                         "tcp6", "udp", "udp4", "udp6")
-            self.check_connection_ntuple(conn)
-            self.assertEqual(conn.family, family)
-            self.assertEqual(conn.type, type)
-            self.assertEqual(conn.laddr, laddr)
-            self.assertEqual(conn.raddr, raddr)
-            self.assertEqual(conn.status, status)
-            for kind in all_kinds:
-                cons = proc.connections(kind=kind)
-                if kind in kinds:
-                    assert cons
-                else:
-                    assert not cons, cons
-            # compare against system-wide connections
-            # XXX Solaris can't retrieve system-wide UNIX
-            # sockets.
-            if HAS_CONNECTIONS_UNIX:
-                self.compare_procsys_connections(proc.pid, [conn])
-
-        tcp_template = textwrap.dedent("""
-            import socket, time
-            s = socket.socket($family, socket.SOCK_STREAM)
-            s.bind(('$addr', 0))
-            s.listen(5)
-            with open('$testfn', 'w') as f:
-                f.write(str(s.getsockname()[:2]))
-            time.sleep(60)
-        """)
-
-        udp_template = textwrap.dedent("""
-            import socket, time
-            s = socket.socket($family, socket.SOCK_DGRAM)
-            s.bind(('$addr', 0))
-            with open('$testfn', 'w') as f:
-                f.write(str(s.getsockname()[:2]))
-            time.sleep(60)
-        """)
-
-        from string import Template
-        testfile = os.path.basename(TESTFN)
-        tcp4_template = Template(tcp_template).substitute(
-            family=int(AF_INET), addr="127.0.0.1", testfn=testfile)
-        udp4_template = Template(udp_template).substitute(
-            family=int(AF_INET), addr="127.0.0.1", testfn=testfile)
-        tcp6_template = Template(tcp_template).substitute(
-            family=int(AF_INET6), addr="::1", testfn=testfile)
-        udp6_template = Template(udp_template).substitute(
-            family=int(AF_INET6), addr="::1", testfn=testfile)
-
-        # launch various subprocess instantiating a socket of various
-        # families and types to enrich psutil results
-        tcp4_proc = pyrun(tcp4_template)
-        tcp4_addr = eval(wait_for_file(testfile))
-        udp4_proc = pyrun(udp4_template)
-        udp4_addr = eval(wait_for_file(testfile))
-        if supports_ipv6():
-            tcp6_proc = pyrun(tcp6_template)
-            tcp6_addr = eval(wait_for_file(testfile))
-            udp6_proc = pyrun(udp6_template)
-            udp6_addr = eval(wait_for_file(testfile))
-        else:
-            tcp6_proc = None
-            udp6_proc = None
-            tcp6_addr = None
-            udp6_addr = None
-
-        for p in thisproc.children():
-            cons = p.connections()
-            self.assertEqual(len(cons), 1)
-            for conn in cons:
-                # TCP v4
-                if p.pid == tcp4_proc.pid:
-                    check_conn(p, conn, AF_INET, SOCK_STREAM, tcp4_addr, (),
-                               psutil.CONN_LISTEN,
-                               ("all", "inet", "inet4", "tcp", "tcp4"))
-                # UDP v4
-                elif p.pid == udp4_proc.pid:
-                    check_conn(p, conn, AF_INET, SOCK_DGRAM, udp4_addr, (),
-                               psutil.CONN_NONE,
-                               ("all", "inet", "inet4", "udp", "udp4"))
-                # TCP v6
-                elif p.pid == getattr(tcp6_proc, "pid", None):
-                    check_conn(p, conn, AF_INET6, SOCK_STREAM, tcp6_addr, (),
-                               psutil.CONN_LISTEN,
-                               ("all", "inet", "inet6", "tcp", "tcp6"))
-                # UDP v6
-                elif p.pid == getattr(udp6_proc, "pid", None):
-                    check_conn(p, conn, AF_INET6, SOCK_DGRAM, udp6_addr, (),
-                               psutil.CONN_NONE,
-                               ("all", "inet", "inet6", "udp", "udp6"))
-
-    def test_count(self):
-        with create_sockets():
-            # tcp
-            cons = thisproc.connections(kind='tcp')
-            self.assertEqual(len(cons), 2 if supports_ipv6() else 1)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertEqual(conn.type, SOCK_STREAM)
-            # tcp4
-            cons = thisproc.connections(kind='tcp4')
-            self.assertEqual(len(cons), 1)
-            self.assertEqual(cons[0].family, AF_INET)
-            self.assertEqual(cons[0].type, SOCK_STREAM)
-            # tcp6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='tcp6')
-                self.assertEqual(len(cons), 1)
-                self.assertEqual(cons[0].family, AF_INET6)
-                self.assertEqual(cons[0].type, SOCK_STREAM)
-            # udp
-            cons = thisproc.connections(kind='udp')
-            self.assertEqual(len(cons), 2 if supports_ipv6() else 1)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertEqual(conn.type, SOCK_DGRAM)
-            # udp4
-            cons = thisproc.connections(kind='udp4')
-            self.assertEqual(len(cons), 1)
-            self.assertEqual(cons[0].family, AF_INET)
-            self.assertEqual(cons[0].type, SOCK_DGRAM)
-            # udp6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='udp6')
-                self.assertEqual(len(cons), 1)
-                self.assertEqual(cons[0].family, AF_INET6)
-                self.assertEqual(cons[0].type, SOCK_DGRAM)
-            # inet
-            cons = thisproc.connections(kind='inet')
-            self.assertEqual(len(cons), 4 if supports_ipv6() else 2)
-            for conn in cons:
-                self.assertIn(conn.family, (AF_INET, AF_INET6))
-                self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-            # inet6
-            if supports_ipv6():
-                cons = thisproc.connections(kind='inet6')
-                self.assertEqual(len(cons), 2)
-                for conn in cons:
-                    self.assertEqual(conn.family, AF_INET6)
-                    self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-            # Skipped on BSD becayse by default the Python process
-            # creates a UNIX socket to '/var/run/log'.
-            if HAS_CONNECTIONS_UNIX and not (FREEBSD or NETBSD):
-                cons = thisproc.connections(kind='unix')
-                self.assertEqual(len(cons), 3)
-                for conn in cons:
-                    self.assertEqual(conn.family, AF_UNIX)
-                    self.assertIn(conn.type, (SOCK_STREAM, SOCK_DGRAM))
-
-
-@unittest.skipIf(SKIP_SYSCONS, "requires root")
-class TestSystemWideConnections(Base, unittest.TestCase):
-    """Tests for net_connections()."""
-
-    def test_it(self):
-        def check(cons, families, types_):
-            for conn in cons:
-                self.assertIn(conn.family, families, msg=conn)
-                if conn.family != AF_UNIX:
-                    self.assertIn(conn.type, types_, msg=conn)
-                self.check_connection_ntuple(conn)
-
-        with create_sockets():
-            from psutil._common import conn_tmap
-            for kind, groups in conn_tmap.items():
-                # XXX: SunOS does not retrieve UNIX sockets.
-                if kind == 'unix' and not HAS_CONNECTIONS_UNIX:
-                    continue
-                families, types_ = groups
-                cons = psutil.net_connections(kind)
-                self.assertEqual(len(cons), len(set(cons)))
-                check(cons, families, types_)
-
-    # See: https://travis-ci.org/giampaolo/psutil/jobs/237566297
-    @unittest.skipIf(MACOS and TRAVIS, "unreliable on MACOS + TRAVIS")
-    def test_multi_sockets_procs(self):
-        # Creates multiple sub processes, each creating different
-        # sockets. For each process check that proc.connections()
-        # and net_connections() return the same results.
-        # This is done mainly to check whether net_connections()'s
-        # pid is properly set, see:
-        # https://github.com/giampaolo/psutil/issues/1013
-        with create_sockets() as socks:
-            expected = len(socks)
-        pids = []
-        times = 10
-        for i in range(times):
-            fname = os.path.realpath(TESTFN) + str(i)
-            src = textwrap.dedent("""\
-                import time, os
-                from psutil.tests import create_sockets
-                with create_sockets():
-                    with open(r'%s', 'w') as f:
-                        f.write(str(os.getpid()))
-                    time.sleep(60)
-                """ % fname)
-            sproc = pyrun(src)
-            pids.append(sproc.pid)
-            self.addCleanup(safe_rmpath, fname)
-
-        # sync
-        for i in range(times):
-            fname = TESTFN + str(i)
-            wait_for_file(fname)
-
-        syscons = [x for x in psutil.net_connections(kind='all') if x.pid
-                   in pids]
-        for pid in pids:
-            self.assertEqual(len([x for x in syscons if x.pid == pid]),
-                             expected)
-            p = psutil.Process(pid)
-            self.assertEqual(len(p.connections('all')), expected)
-
-
-class TestMisc(unittest.TestCase):
-
-    def test_connection_constants(self):
-        ints = []
-        strs = []
-        for name in dir(psutil):
-            if name.startswith('CONN_'):
-                num = getattr(psutil, name)
-                str_ = str(num)
-                assert str_.isupper(), str_
-                self.assertNotIn(str, strs)
-                self.assertNotIn(num, ints)
-                ints.append(num)
-                strs.append(str_)
-        if SUNOS:
-            psutil.CONN_IDLE
-            psutil.CONN_BOUND
-        if WINDOWS:
-            psutil.CONN_DELETE_TCB
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_contracts.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_contracts.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_contracts.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_contracts.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,690 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Contracts tests. These tests mainly check API sanity in terms of
-returned types and APIs availability.
-Some of these are duplicates of tests test_system.py and test_process.py
-"""
-
-import errno
-import os
-import stat
-import time
-import traceback
-
-from psutil import AIX
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import OSX
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._compat import long
-from psutil.tests import create_sockets
-from psutil.tests import enum
-from psutil.tests import get_kernel_version
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import is_namedtuple
-from psutil.tests import safe_rmpath
-from psutil.tests import SKIP_SYSCONS
-from psutil.tests import TESTFN
-from psutil.tests import unittest
-from psutil.tests import VALID_PROC_STATUSES
-from psutil.tests import warn
-import psutil
-
-
-# ===================================================================
-# --- APIs availability
-# ===================================================================
-
-# Make sure code reflects what doc promises in terms of APIs
-# availability.
-
-class TestAvailConstantsAPIs(unittest.TestCase):
-
-    def test_PROCFS_PATH(self):
-        self.assertEqual(hasattr(psutil, "PROCFS_PATH"),
-                         LINUX or SUNOS or AIX)
-
-    def test_win_priority(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "ABOVE_NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "BELOW_NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "HIGH_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "IDLE_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "NORMAL_PRIORITY_CLASS"), WINDOWS)
-        ae(hasattr(psutil, "REALTIME_PRIORITY_CLASS"), WINDOWS)
-
-    def test_linux_ioprio_linux(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "IOPRIO_CLASS_NONE"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_RT"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_BE"), LINUX)
-        ae(hasattr(psutil, "IOPRIO_CLASS_IDLE"), LINUX)
-
-    def test_linux_ioprio_windows(self):
-        ae = self.assertEqual
-        ae(hasattr(psutil, "IOPRIO_HIGH"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_NORMAL"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_LOW"), WINDOWS)
-        ae(hasattr(psutil, "IOPRIO_VERYLOW"), WINDOWS)
-
-    def test_linux_rlimit(self):
-        ae = self.assertEqual
-        hasit = LINUX and get_kernel_version() >= (2, 6, 36)
-        ae(hasattr(psutil.Process, "rlimit"), hasit)
-        ae(hasattr(psutil, "RLIM_INFINITY"), hasit)
-        ae(hasattr(psutil, "RLIMIT_AS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_CORE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_CPU"), hasit)
-        ae(hasattr(psutil, "RLIMIT_DATA"), hasit)
-        ae(hasattr(psutil, "RLIMIT_FSIZE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_LOCKS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_MEMLOCK"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NOFILE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NPROC"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RSS"), hasit)
-        ae(hasattr(psutil, "RLIMIT_STACK"), hasit)
-
-        hasit = LINUX and get_kernel_version() >= (3, 0)
-        ae(hasattr(psutil, "RLIMIT_MSGQUEUE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_NICE"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RTPRIO"), hasit)
-        ae(hasattr(psutil, "RLIMIT_RTTIME"), hasit)
-        ae(hasattr(psutil, "RLIMIT_SIGPENDING"), hasit)
-
-
-class TestAvailSystemAPIs(unittest.TestCase):
-
-    def test_win_service_iter(self):
-        self.assertEqual(hasattr(psutil, "win_service_iter"), WINDOWS)
-
-    def test_win_service_get(self):
-        self.assertEqual(hasattr(psutil, "win_service_get"), WINDOWS)
-
-    def test_cpu_freq(self):
-        linux = (LINUX and
-                 (os.path.exists("/sys/devices/system/cpu/cpufreq") or
-                  os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq")))
-        self.assertEqual(hasattr(psutil, "cpu_freq"),
-                         linux or MACOS or WINDOWS or FREEBSD)
-
-    def test_sensors_temperatures(self):
-        self.assertEqual(
-            hasattr(psutil, "sensors_temperatures"), LINUX or FREEBSD)
-
-    def test_sensors_fans(self):
-        self.assertEqual(hasattr(psutil, "sensors_fans"), LINUX)
-
-    def test_battery(self):
-        self.assertEqual(hasattr(psutil, "sensors_battery"),
-                         LINUX or WINDOWS or FREEBSD or MACOS)
-
-
-class TestAvailProcessAPIs(unittest.TestCase):
-
-    def test_environ(self):
-        self.assertEqual(hasattr(psutil.Process, "environ"),
-                         LINUX or MACOS or WINDOWS or AIX or SUNOS)
-
-    def test_uids(self):
-        self.assertEqual(hasattr(psutil.Process, "uids"), POSIX)
-
-    def test_gids(self):
-        self.assertEqual(hasattr(psutil.Process, "uids"), POSIX)
-
-    def test_terminal(self):
-        self.assertEqual(hasattr(psutil.Process, "terminal"), POSIX)
-
-    def test_ionice(self):
-        self.assertEqual(hasattr(psutil.Process, "ionice"), LINUX or WINDOWS)
-
-    def test_rlimit(self):
-        self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX)
-
-    def test_io_counters(self):
-        hasit = hasattr(psutil.Process, "io_counters")
-        self.assertEqual(hasit, False if MACOS or SUNOS else True)
-
-    def test_num_fds(self):
-        self.assertEqual(hasattr(psutil.Process, "num_fds"), POSIX)
-
-    def test_num_handles(self):
-        self.assertEqual(hasattr(psutil.Process, "num_handles"), WINDOWS)
-
-    def test_cpu_affinity(self):
-        self.assertEqual(hasattr(psutil.Process, "cpu_affinity"),
-                         LINUX or WINDOWS or FREEBSD)
-
-    def test_cpu_num(self):
-        self.assertEqual(hasattr(psutil.Process, "cpu_num"),
-                         LINUX or FREEBSD or SUNOS)
-
-    def test_memory_maps(self):
-        hasit = hasattr(psutil.Process, "memory_maps")
-        self.assertEqual(
-            hasit, False if OPENBSD or NETBSD or AIX or MACOS else True)
-
-
-# ===================================================================
-# --- System API types
-# ===================================================================
-
-
-class TestSystemAPITypes(unittest.TestCase):
-    """Check the return types of system related APIs.
-    Mainly we want to test we never return unicode on Python 2, see:
-    https://github.com/giampaolo/psutil/issues/1039
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.proc = psutil.Process()
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-
-    def assert_ntuple_of_nums(self, nt, type_=float, gezero=True):
-        assert is_namedtuple(nt)
-        for n in nt:
-            self.assertIsInstance(n, type_)
-            if gezero:
-                self.assertGreaterEqual(n, 0)
-
-    def test_cpu_times(self):
-        self.assert_ntuple_of_nums(psutil.cpu_times())
-        for nt in psutil.cpu_times(percpu=True):
-            self.assert_ntuple_of_nums(nt)
-
-    def test_cpu_percent(self):
-        self.assertIsInstance(psutil.cpu_percent(interval=None), float)
-        self.assertIsInstance(psutil.cpu_percent(interval=0.00001), float)
-
-    def test_cpu_times_percent(self):
-        self.assert_ntuple_of_nums(psutil.cpu_times_percent(interval=None))
-        self.assert_ntuple_of_nums(psutil.cpu_times_percent(interval=0.0001))
-
-    def test_cpu_count(self):
-        self.assertIsInstance(psutil.cpu_count(), int)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_cpu_freq(self):
-        if psutil.cpu_freq() is None:
-            raise self.skipTest("cpu_freq() returns None")
-        self.assert_ntuple_of_nums(psutil.cpu_freq(), type_=(float, int, long))
-
-    def test_disk_io_counters(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for k, v in psutil.disk_io_counters(perdisk=True).items():
-            self.assertIsInstance(k, str)
-            self.assert_ntuple_of_nums(v, type_=(int, long))
-
-    def test_disk_partitions(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for disk in psutil.disk_partitions():
-            self.assertIsInstance(disk.device, str)
-            self.assertIsInstance(disk.mountpoint, str)
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-
-    @unittest.skipIf(SKIP_SYSCONS, "requires root")
-    def test_net_connections(self):
-        with create_sockets():
-            ret = psutil.net_connections('all')
-            self.assertEqual(len(ret), len(set(ret)))
-            for conn in ret:
-                assert is_namedtuple(conn)
-
-    def test_net_if_addrs(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, addrs in psutil.net_if_addrs().items():
-            self.assertIsInstance(ifname, str)
-            for addr in addrs:
-                if enum is not None:
-                    assert isinstance(addr.family, enum.IntEnum), addr
-                else:
-                    assert isinstance(addr.family, int), addr
-                self.assertIsInstance(addr.address, str)
-                self.assertIsInstance(addr.netmask, (str, type(None)))
-                self.assertIsInstance(addr.broadcast, (str, type(None)))
-
-    def test_net_if_stats(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, info in psutil.net_if_stats().items():
-            self.assertIsInstance(ifname, str)
-            self.assertIsInstance(info.isup, bool)
-            if enum is not None:
-                self.assertIsInstance(info.duplex, enum.IntEnum)
-            else:
-                self.assertIsInstance(info.duplex, int)
-            self.assertIsInstance(info.speed, int)
-            self.assertIsInstance(info.mtu, int)
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for ifname, _ in psutil.net_io_counters(pernic=True).items():
-            self.assertIsInstance(ifname, str)
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for name, units in psutil.sensors_fans().items():
-            self.assertIsInstance(name, str)
-            for unit in units:
-                self.assertIsInstance(unit.label, str)
-                self.assertIsInstance(unit.current, (float, int, type(None)))
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for name, units in psutil.sensors_temperatures().items():
-            self.assertIsInstance(name, str)
-            for unit in units:
-                self.assertIsInstance(unit.label, str)
-                self.assertIsInstance(unit.current, (float, int, type(None)))
-                self.assertIsInstance(unit.high, (float, int, type(None)))
-                self.assertIsInstance(unit.critical, (float, int, type(None)))
-
-    def test_boot_time(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        self.assertIsInstance(psutil.boot_time(), float)
-
-    def test_users(self):
-        # Duplicate of test_system.py. Keep it anyway.
-        for user in psutil.users():
-            self.assertIsInstance(user.name, str)
-            self.assertIsInstance(user.terminal, (str, type(None)))
-            self.assertIsInstance(user.host, (str, type(None)))
-            self.assertIsInstance(user.pid, (int, type(None)))
-
-
-# ===================================================================
-# --- Featch all processes test
-# ===================================================================
-
-
-class TestFetchAllProcesses(unittest.TestCase):
-    """Test which iterates over all running processes and performs
-    some sanity checks against Process API's returned values.
-    """
-
-    def get_attr_names(self):
-        excluded_names = set([
-            'send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
-            'as_dict', 'parent', 'parents', 'children', 'memory_info_ex',
-            'oneshot',
-        ])
-        if LINUX and not HAS_RLIMIT:
-            excluded_names.add('rlimit')
-        attrs = []
-        for name in dir(psutil.Process):
-            if name.startswith("_"):
-                continue
-            if name in excluded_names:
-                continue
-            attrs.append(name)
-        return attrs
-
-    def iter_procs(self):
-        attrs = self.get_attr_names()
-        for p in psutil.process_iter():
-            with p.oneshot():
-                for name in attrs:
-                    yield (p, name)
-
-    def call_meth(self, p, name):
-        args = ()
-        kwargs = {}
-        attr = getattr(p, name, None)
-        if attr is not None and callable(attr):
-            if name == 'rlimit':
-                args = (psutil.RLIMIT_NOFILE,)
-            elif name == 'memory_maps':
-                kwargs = {'grouped': False}
-            return attr(*args, **kwargs)
-        else:
-            return attr
-
-    def test_fetch_all(self):
-        valid_procs = 0
-        default = object()
-        failures = []
-        for p, name in self.iter_procs():
-            ret = default
-            try:
-                ret = self.call_meth(p, name)
-            except NotImplementedError:
-                msg = "%r was skipped because not implemented" % (
-                    self.__class__.__name__ + '.test_' + name)
-                warn(msg)
-            except (psutil.NoSuchProcess, psutil.AccessDenied) as err:
-                self.assertEqual(err.pid, p.pid)
-                if err.name:
-                    # make sure exception's name attr is set
-                    # with the actual process name
-                    self.assertEqual(err.name, p.name())
-                assert str(err)
-                assert err.msg
-            except Exception:
-                s = '\n' + '=' * 70 + '\n'
-                s += "FAIL: test_%s (proc=%s" % (name, p)
-                if ret != default:
-                    s += ", ret=%s)" % repr(ret)
-                s += ')\n'
-                s += '-' * 70
-                s += "\n%s" % traceback.format_exc()
-                s = "\n".join((" " * 4) + i for i in s.splitlines())
-                s += '\n'
-                failures.append(s)
-                break
-            else:
-                valid_procs += 1
-                if ret not in (0, 0.0, [], None, '', {}):
-                    assert ret, ret
-                meth = getattr(self, name)
-                meth(ret, p)
-
-        if failures:
-            self.fail(''.join(failures))
-
-        # we should always have a non-empty list, not including PID 0 etc.
-        # special cases.
-        assert valid_procs
-
-    def cmdline(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for part in ret:
-            self.assertIsInstance(part, str)
-
-    def exe(self, ret, proc):
-        self.assertIsInstance(ret, (str, type(None)))
-        if not ret:
-            self.assertEqual(ret, '')
-        else:
-            if WINDOWS and not ret.endswith('.exe'):
-                return  # May be "Registry", "MemCompression", ...
-            assert os.path.isabs(ret), ret
-            # Note: os.stat() may return False even if the file is there
-            # hence we skip the test, see:
-            # http://stackoverflow.com/questions/3112546/os-path-exists-lies
-            if POSIX and os.path.isfile(ret):
-                if hasattr(os, 'access') and hasattr(os, "X_OK"):
-                    # XXX may fail on MACOS
-                    assert os.access(ret, os.X_OK)
-
-    def pid(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def ppid(self, ret, proc):
-        self.assertIsInstance(ret, (int, long))
-        self.assertGreaterEqual(ret, 0)
-
-    def name(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        # on AIX, "<exiting>" processes don't have names
-        if not AIX:
-            assert ret
-
-    def create_time(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        try:
-            self.assertGreaterEqual(ret, 0)
-        except AssertionError:
-            # XXX
-            if OPENBSD and proc.status() == psutil.STATUS_ZOMBIE:
-                pass
-            else:
-                raise
-        # this can't be taken for granted on all platforms
-        # self.assertGreaterEqual(ret, psutil.boot_time())
-        # make sure returned value can be pretty printed
-        # with strftime
-        time.strftime("%Y %m %d %H:%M:%S", time.localtime(ret))
-
-    def uids(self, ret, proc):
-        assert is_namedtuple(ret)
-        for uid in ret:
-            self.assertIsInstance(uid, int)
-            self.assertGreaterEqual(uid, 0)
-
-    def gids(self, ret, proc):
-        assert is_namedtuple(ret)
-        # note: testing all gids as above seems not to be reliable for
-        # gid == 30 (nodoby); not sure why.
-        for gid in ret:
-            self.assertIsInstance(gid, int)
-            if not MACOS and not NETBSD:
-                self.assertGreaterEqual(gid, 0)
-
-    def username(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        assert ret
-
-    def status(self, ret, proc):
-        self.assertIsInstance(ret, str)
-        assert ret
-        self.assertNotEqual(ret, '?')  # XXX
-        self.assertIn(ret, VALID_PROC_STATUSES)
-
-    def io_counters(self, ret, proc):
-        assert is_namedtuple(ret)
-        for field in ret:
-            self.assertIsInstance(field, (int, long))
-            if field != -1:
-                self.assertGreaterEqual(field, 0)
-
-    def ionice(self, ret, proc):
-        if LINUX:
-            self.assertIsInstance(ret.ioclass, int)
-            self.assertIsInstance(ret.value, int)
-            self.assertGreaterEqual(ret.ioclass, 0)
-            self.assertGreaterEqual(ret.value, 0)
-        else:  # Windows, Cygwin
-            choices = [
-                psutil.IOPRIO_VERYLOW,
-                psutil.IOPRIO_LOW,
-                psutil.IOPRIO_NORMAL,
-                psutil.IOPRIO_HIGH]
-            self.assertIsInstance(ret, int)
-            self.assertGreaterEqual(ret, 0)
-            self.assertIn(ret, choices)
-
-    def num_threads(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 1)
-
-    def threads(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for t in ret:
-            assert is_namedtuple(t)
-            self.assertGreaterEqual(t.id, 0)
-            self.assertGreaterEqual(t.user_time, 0)
-            self.assertGreaterEqual(t.system_time, 0)
-            for field in t:
-                self.assertIsInstance(field, (int, float))
-
-    def cpu_times(self, ret, proc):
-        assert is_namedtuple(ret)
-        for n in ret:
-            self.assertIsInstance(n, float)
-            self.assertGreaterEqual(n, 0)
-        # TODO: check ntuple fields
-
-    def cpu_percent(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        assert 0.0 <= ret <= 100.0, ret
-
-    def cpu_num(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        if FREEBSD and ret == -1:
-            return
-        self.assertGreaterEqual(ret, 0)
-        if psutil.cpu_count() == 1:
-            self.assertEqual(ret, 0)
-        self.assertIn(ret, list(range(psutil.cpu_count())))
-
-    def memory_info(self, ret, proc):
-        assert is_namedtuple(ret)
-        for value in ret:
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0)
-        if WINDOWS:
-            self.assertGreaterEqual(ret.peak_wset, ret.wset)
-            self.assertGreaterEqual(ret.peak_paged_pool, ret.paged_pool)
-            self.assertGreaterEqual(ret.peak_nonpaged_pool, ret.nonpaged_pool)
-            self.assertGreaterEqual(ret.peak_pagefile, ret.pagefile)
-
-    def memory_full_info(self, ret, proc):
-        assert is_namedtuple(ret)
-        total = psutil.virtual_memory().total
-        for name in ret._fields:
-            value = getattr(ret, name)
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0, msg=(name, value))
-            if LINUX or OSX and name in ('vms', 'data'):
-                # On Linux there are processes (e.g. 'goa-daemon') whose
-                # VMS is incredibly high for some reason.
-                continue
-            self.assertLessEqual(value, total, msg=(name, value, total))
-
-        if LINUX:
-            self.assertGreaterEqual(ret.pss, ret.uss)
-
-    def open_files(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        for f in ret:
-            self.assertIsInstance(f.fd, int)
-            self.assertIsInstance(f.path, str)
-            if WINDOWS:
-                self.assertEqual(f.fd, -1)
-            elif LINUX:
-                self.assertIsInstance(f.position, int)
-                self.assertIsInstance(f.mode, str)
-                self.assertIsInstance(f.flags, int)
-                self.assertGreaterEqual(f.position, 0)
-                self.assertIn(f.mode, ('r', 'w', 'a', 'r+', 'a+'))
-                self.assertGreater(f.flags, 0)
-            elif BSD and not f.path:
-                # XXX see: https://github.com/giampaolo/psutil/issues/595
-                continue
-            assert os.path.isabs(f.path), f
-            assert os.path.isfile(f.path), f
-
-    def num_fds(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def connections(self, ret, proc):
-        with create_sockets():
-            self.assertEqual(len(ret), len(set(ret)))
-            for conn in ret:
-                assert is_namedtuple(conn)
-
-    def cwd(self, ret, proc):
-        if ret:     # 'ret' can be None or empty
-            self.assertIsInstance(ret, str)
-            assert os.path.isabs(ret), ret
-            try:
-                st = os.stat(ret)
-            except OSError as err:
-                if WINDOWS and err.errno in \
-                        psutil._psplatform.ACCESS_DENIED_SET:
-                    pass
-                # directory has been removed in mean time
-                elif err.errno != errno.ENOENT:
-                    raise
-            else:
-                assert stat.S_ISDIR(st.st_mode)
-
-    def memory_percent(self, ret, proc):
-        self.assertIsInstance(ret, float)
-        assert 0 <= ret <= 100, ret
-
-    def is_running(self, ret, proc):
-        self.assertIsInstance(ret, bool)
-
-    def cpu_affinity(self, ret, proc):
-        self.assertIsInstance(ret, list)
-        assert ret != [], ret
-        cpus = range(psutil.cpu_count())
-        for n in ret:
-            self.assertIsInstance(n, int)
-            self.assertIn(n, cpus)
-
-    def terminal(self, ret, proc):
-        self.assertIsInstance(ret, (str, type(None)))
-        if ret is not None:
-            assert os.path.isabs(ret), ret
-            assert os.path.exists(ret), ret
-
-    def memory_maps(self, ret, proc):
-        for nt in ret:
-            self.assertIsInstance(nt.addr, str)
-            self.assertIsInstance(nt.perms, str)
-            self.assertIsInstance(nt.path, str)
-            for fname in nt._fields:
-                value = getattr(nt, fname)
-                if fname == 'path':
-                    if not value.startswith('['):
-                        assert os.path.isabs(nt.path), nt.path
-                        # commented as on Linux we might get
-                        # '/foo/bar (deleted)'
-                        # assert os.path.exists(nt.path), nt.path
-                elif fname == 'addr':
-                    assert value, repr(value)
-                elif fname == 'perms':
-                    if not WINDOWS:
-                        assert value, repr(value)
-                else:
-                    self.assertIsInstance(value, (int, long))
-                    self.assertGreaterEqual(value, 0)
-
-    def num_handles(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        self.assertGreaterEqual(ret, 0)
-
-    def nice(self, ret, proc):
-        self.assertIsInstance(ret, int)
-        if POSIX:
-            assert -20 <= ret <= 20, ret
-        else:
-            priorities = [getattr(psutil, x) for x in dir(psutil)
-                          if x.endswith('_PRIORITY_CLASS')]
-            self.assertIn(ret, priorities)
-
-    def num_ctx_switches(self, ret, proc):
-        assert is_namedtuple(ret)
-        for value in ret:
-            self.assertIsInstance(value, (int, long))
-            self.assertGreaterEqual(value, 0)
-
-    def rlimit(self, ret, proc):
-        self.assertIsInstance(ret, tuple)
-        self.assertEqual(len(ret), 2)
-        self.assertGreaterEqual(ret[0], -1)
-        self.assertGreaterEqual(ret[1], -1)
-
-    def environ(self, ret, proc):
-        self.assertIsInstance(ret, dict)
-        for k, v in ret.items():
-            self.assertIsInstance(k, str)
-            self.assertIsInstance(v, str)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_linux.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_linux.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_linux.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_linux.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,2118 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Linux specific tests."""
-
-from __future__ import division
-import collections
-import contextlib
-import errno
-import glob
-import io
-import os
-import re
-import shutil
-import socket
-import struct
-import tempfile
-import textwrap
-import time
-import warnings
-
-import psutil
-from psutil import LINUX
-from psutil._compat import basestring
-from psutil._compat import FileNotFoundError
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil.tests import call_until
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_GETLOADAVG
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import pyrun
-from psutil.tests import reap_children
-from psutil.tests import reload_module
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import sh
-from psutil.tests import skip_on_not_implemented
-from psutil.tests import TESTFN
-from psutil.tests import ThreadTask
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import which
-
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-SIOCGIFADDR = 0x8915
-SIOCGIFCONF = 0x8912
-SIOCGIFHWADDR = 0x8927
-if LINUX:
-    SECTOR_SIZE = 512
-EMPTY_TEMPERATURES = not glob.glob('/sys/class/hwmon/hwmon*')
-
-# =====================================================================
-# --- utils
-# =====================================================================
-
-
-def get_ipv4_address(ifname):
-    import fcntl
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
-        return socket.inet_ntoa(
-            fcntl.ioctl(s.fileno(),
-                        SIOCGIFADDR,
-                        struct.pack('256s', ifname))[20:24])
-
-
-def get_mac_address(ifname):
-    import fcntl
-    ifname = ifname[:15]
-    if PY3:
-        ifname = bytes(ifname, 'ascii')
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    with contextlib.closing(s):
-        info = fcntl.ioctl(
-            s.fileno(), SIOCGIFHWADDR, struct.pack('256s', ifname))
-        if PY3:
-            def ord(x):
-                return x
-        else:
-            import __builtin__
-            ord = __builtin__.ord
-        return ''.join(['%02x:' % ord(char) for char in info[18:24]])[:-1]
-
-
-def free_swap():
-    """Parse 'free' cmd and return swap memory's s total, used and free
-    values.
-    """
-    out = sh('free -b', env={"LANG": "C.UTF-8"})
-    lines = out.split('\n')
-    for line in lines:
-        if line.startswith('Swap'):
-            _, total, used, free = line.split()
-            nt = collections.namedtuple('free', 'total used free')
-            return nt(int(total), int(used), int(free))
-    raise ValueError(
-        "can't find 'Swap' in 'free' output:\n%s" % '\n'.join(lines))
-
-
-def free_physmem():
-    """Parse 'free' cmd and return physical memory's total, used
-    and free values.
-    """
-    # Note: free can have 2 different formats, invalidating 'shared'
-    # and 'cached' memory which may have different positions so we
-    # do not return them.
-    # https://github.com/giampaolo/psutil/issues/538#issuecomment-57059946
-    out = sh('free -b', env={"LANG": "C.UTF-8"})
-    lines = out.split('\n')
-    for line in lines:
-        if line.startswith('Mem'):
-            total, used, free, shared = \
-                [int(x) for x in line.split()[1:5]]
-            nt = collections.namedtuple(
-                'free', 'total used free shared output')
-            return nt(total, used, free, shared, out)
-    raise ValueError(
-        "can't find 'Mem' in 'free' output:\n%s" % '\n'.join(lines))
-
-
-def vmstat(stat):
-    out = sh("vmstat -s", env={"LANG": "C.UTF-8"})
-    for line in out.split("\n"):
-        line = line.strip()
-        if stat in line:
-            return int(line.split(' ')[0])
-    raise ValueError("can't find %r in 'vmstat' output" % stat)
-
-
-def get_free_version_info():
-    out = sh("free -V").strip()
-    return tuple(map(int, out.split()[-1].split('.')))
-
-
-@contextlib.contextmanager
-def mock_open_content(for_path, content):
-    """Mock open() builtin and forces it to return a certain `content`
-    on read() if the path being opened matches `for_path`.
-    """
-    def open_mock(name, *args, **kwargs):
-        if name == for_path:
-            if PY3:
-                if isinstance(content, basestring):
-                    return io.StringIO(content)
-                else:
-                    return io.BytesIO(content)
-            else:
-                return io.BytesIO(content)
-        else:
-            return orig_open(name, *args, **kwargs)
-
-    orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-        yield m
-
-
-@contextlib.contextmanager
-def mock_open_exception(for_path, exc):
-    """Mock open() builtin and raises `exc` if the path being opened
-    matches `for_path`.
-    """
-    def open_mock(name, *args, **kwargs):
-        if name == for_path:
-            raise exc
-        else:
-            return orig_open(name, *args, **kwargs)
-
-    orig_open = open
-    patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-    with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-        yield m
-
-
-# =====================================================================
-# --- system virtual memory
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemVirtualMemory(unittest.TestCase):
-
-    def test_total(self):
-        # free_value = free_physmem().total
-        # psutil_value = psutil.virtual_memory().total
-        # self.assertEqual(free_value, psutil_value)
-        vmstat_value = vmstat('total memory') * 1024
-        psutil_value = psutil.virtual_memory().total
-        self.assertAlmostEqual(vmstat_value, psutil_value)
-
-    # Older versions of procps used slab memory to calculate used memory.
-    # This got changed in:
-    # https://gitlab.com/procps-ng/procps/commit/
-    #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-    @unittest.skipIf(LINUX and get_free_version_info() < (3, 3, 12),
-                     "old free version")
-    @retry_on_failure()
-    def test_used(self):
-        free = free_physmem()
-        free_value = free.used
-        psutil_value = psutil.virtual_memory().used
-        self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE,
-            msg='%s %s \n%s' % (free_value, psutil_value, free.output))
-
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_free(self):
-        vmstat_value = vmstat('free memory') * 1024
-        psutil_value = psutil.virtual_memory().free
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_buffers(self):
-        vmstat_value = vmstat('buffer memory') * 1024
-        psutil_value = psutil.virtual_memory().buffers
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    # https://travis-ci.org/giampaolo/psutil/jobs/226719664
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_active(self):
-        vmstat_value = vmstat('active memory') * 1024
-        psutil_value = psutil.virtual_memory().active
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    # https://travis-ci.org/giampaolo/psutil/jobs/227242952
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @retry_on_failure()
-    def test_inactive(self):
-        vmstat_value = vmstat('inactive memory') * 1024
-        psutil_value = psutil.virtual_memory().inactive
-        self.assertAlmostEqual(
-            vmstat_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_shared(self):
-        free = free_physmem()
-        free_value = free.shared
-        if free_value == 0:
-            raise unittest.SkipTest("free does not support 'shared' column")
-        psutil_value = psutil.virtual_memory().shared
-        self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE,
-            msg='%s %s \n%s' % (free_value, psutil_value, free.output))
-
-    @retry_on_failure()
-    def test_available(self):
-        # "free" output format has changed at some point:
-        # https://github.com/giampaolo/psutil/issues/538#issuecomment-147192098
-        out = sh("free -b")
-        lines = out.split('\n')
-        if 'available' not in lines[0]:
-            raise unittest.SkipTest("free does not support 'available' column")
-        else:
-            free_value = int(lines[1].split()[-1])
-            psutil_value = psutil.virtual_memory().available
-            self.assertAlmostEqual(
-                free_value, psutil_value, delta=MEMORY_TOLERANCE,
-                msg='%s %s \n%s' % (free_value, psutil_value, out))
-
-    def test_warnings_on_misses(self):
-        # Emulate a case where /proc/meminfo provides few info.
-        # psutil is supposed to set the missing fields to 0 and
-        # raise a warning.
-        with mock_open_content(
-            '/proc/meminfo',
-            textwrap.dedent("""\
-                Active(anon):    6145416 kB
-                Active(file):    2950064 kB
-                Inactive(anon):   574764 kB
-                Inactive(file):  1567648 kB
-                MemAvailable:         -1 kB
-                MemFree:         2057400 kB
-                MemTotal:       16325648 kB
-                SReclaimable:     346648 kB
-                """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.virtual_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "memory stats couldn't be determined", str(w.message))
-                self.assertIn("cached", str(w.message))
-                self.assertIn("shared", str(w.message))
-                self.assertIn("active", str(w.message))
-                self.assertIn("inactive", str(w.message))
-                self.assertIn("buffers", str(w.message))
-                self.assertIn("available", str(w.message))
-                self.assertEqual(ret.cached, 0)
-                self.assertEqual(ret.active, 0)
-                self.assertEqual(ret.inactive, 0)
-                self.assertEqual(ret.shared, 0)
-                self.assertEqual(ret.buffers, 0)
-                self.assertEqual(ret.available, 0)
-                self.assertEqual(ret.slab, 0)
-
-    @retry_on_failure()
-    def test_avail_old_percent(self):
-        # Make sure that our calculation of avail mem for old kernels
-        # is off by max 15%.
-        from psutil._pslinux import calculate_avail_vmem
-        from psutil._pslinux import open_binary
-
-        mems = {}
-        with open_binary('/proc/meminfo') as f:
-            for line in f:
-                fields = line.split()
-                mems[fields[0]] = int(fields[1]) * 1024
-
-        a = calculate_avail_vmem(mems)
-        if b'MemAvailable:' in mems:
-            b = mems[b'MemAvailable:']
-            diff_percent = abs(a - b) / a * 100
-            self.assertLess(diff_percent, 15)
-
-    def test_avail_old_comes_from_kernel(self):
-        # Make sure "MemAvailable:" coluimn is used instead of relying
-        # on our internal algorithm to calculate avail mem.
-        with mock_open_content(
-            '/proc/meminfo',
-            textwrap.dedent("""\
-                Active:          9444728 kB
-                Active(anon):    6145416 kB
-                Active(file):    2950064 kB
-                Buffers:          287952 kB
-                Cached:          4818144 kB
-                Inactive(file):  1578132 kB
-                Inactive(anon):   574764 kB
-                Inactive(file):  1567648 kB
-                MemAvailable:    6574984 kB
-                MemFree:         2057400 kB
-                MemTotal:       16325648 kB
-                Shmem:            577588 kB
-                SReclaimable:     346648 kB
-                """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                ret = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(ret.available, 6574984 * 1024)
-            w = ws[0]
-            self.assertIn(
-                "inactive memory stats couldn't be determined", str(w.message))
-
-    def test_avail_old_missing_fields(self):
-        # Remove Active(file), Inactive(file) and SReclaimable
-        # from /proc/meminfo and make sure the fallback is used
-        # (free + cached),
-        with mock_open_content(
-            "/proc/meminfo",
-            textwrap.dedent("""\
-                    Active:          9444728 kB
-                    Active(anon):    6145416 kB
-                    Buffers:          287952 kB
-                    Cached:          4818144 kB
-                    Inactive(file):  1578132 kB
-                    Inactive(anon):   574764 kB
-                    MemFree:         2057400 kB
-                    MemTotal:       16325648 kB
-                    Shmem:            577588 kB
-                    """).encode()) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                ret = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
-            w = ws[0]
-            self.assertIn(
-                "inactive memory stats couldn't be determined", str(w.message))
-
-    def test_avail_old_missing_zoneinfo(self):
-        # Remove /proc/zoneinfo file. Make sure fallback is used
-        # (free + cached).
-        with mock_open_content(
-                "/proc/meminfo",
-                textwrap.dedent("""\
-                    Active:          9444728 kB
-                    Active(anon):    6145416 kB
-                    Active(file):    2950064 kB
-                    Buffers:          287952 kB
-                    Cached:          4818144 kB
-                    Inactive(file):  1578132 kB
-                    Inactive(anon):   574764 kB
-                    Inactive(file):  1567648 kB
-                    MemFree:         2057400 kB
-                    MemTotal:       16325648 kB
-                    Shmem:            577588 kB
-                    SReclaimable:     346648 kB
-                    """).encode()):
-            with mock_open_exception(
-                    "/proc/zoneinfo",
-                    IOError(errno.ENOENT, 'no such file or directory')):
-                with warnings.catch_warnings(record=True) as ws:
-                    ret = psutil.virtual_memory()
-                    self.assertEqual(
-                        ret.available, 2057400 * 1024 + 4818144 * 1024)
-                    w = ws[0]
-                    self.assertIn(
-                        "inactive memory stats couldn't be determined",
-                        str(w.message))
-
-    def test_virtual_memory_mocked(self):
-        # Emulate /proc/meminfo because neither vmstat nor free return slab.
-        def open_mock(name, *args, **kwargs):
-            if name == '/proc/meminfo':
-                return io.BytesIO(textwrap.dedent("""\
-                    MemTotal:              100 kB
-                    MemFree:               2 kB
-                    MemAvailable:          3 kB
-                    Buffers:               4 kB
-                    Cached:                5 kB
-                    SwapCached:            6 kB
-                    Active:                7 kB
-                    Inactive:              8 kB
-                    Active(anon):          9 kB
-                    Inactive(anon):        10 kB
-                    Active(file):          11 kB
-                    Inactive(file):        12 kB
-                    Unevictable:           13 kB
-                    Mlocked:               14 kB
-                    SwapTotal:             15 kB
-                    SwapFree:              16 kB
-                    Dirty:                 17 kB
-                    Writeback:             18 kB
-                    AnonPages:             19 kB
-                    Mapped:                20 kB
-                    Shmem:                 21 kB
-                    Slab:                  22 kB
-                    SReclaimable:          23 kB
-                    SUnreclaim:            24 kB
-                    KernelStack:           25 kB
-                    PageTables:            26 kB
-                    NFS_Unstable:          27 kB
-                    Bounce:                28 kB
-                    WritebackTmp:          29 kB
-                    CommitLimit:           30 kB
-                    Committed_AS:          31 kB
-                    VmallocTotal:          32 kB
-                    VmallocUsed:           33 kB
-                    VmallocChunk:          34 kB
-                    HardwareCorrupted:     35 kB
-                    AnonHugePages:         36 kB
-                    ShmemHugePages:        37 kB
-                    ShmemPmdMapped:        38 kB
-                    CmaTotal:              39 kB
-                    CmaFree:               40 kB
-                    HugePages_Total:       41 kB
-                    HugePages_Free:        42 kB
-                    HugePages_Rsvd:        43 kB
-                    HugePages_Surp:        44 kB
-                    Hugepagesize:          45 kB
-                    DirectMap46k:          46 kB
-                    DirectMap47M:          47 kB
-                    DirectMap48G:          48 kB
-                    """).encode())
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, create=True, side_effect=open_mock) as m:
-            mem = psutil.virtual_memory()
-            assert m.called
-            self.assertEqual(mem.total, 100 * 1024)
-            self.assertEqual(mem.free, 2 * 1024)
-            self.assertEqual(mem.buffers, 4 * 1024)
-            # cached mem also includes reclaimable memory
-            self.assertEqual(mem.cached, (5 + 23) * 1024)
-            self.assertEqual(mem.shared, 21 * 1024)
-            self.assertEqual(mem.active, 7 * 1024)
-            self.assertEqual(mem.inactive, 8 * 1024)
-            self.assertEqual(mem.slab, 22 * 1024)
-            self.assertEqual(mem.available, 3 * 1024)
-
-
-# =====================================================================
-# --- system swap memory
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemSwapMemory(unittest.TestCase):
-
-    @staticmethod
-    def meminfo_has_swap_info():
-        """Return True if /proc/meminfo provides swap metrics."""
-        with open("/proc/meminfo") as f:
-            data = f.read()
-        return 'SwapTotal:' in data and 'SwapFree:' in data
-
-    def test_total(self):
-        free_value = free_swap().total
-        psutil_value = psutil.swap_memory().total
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_used(self):
-        free_value = free_swap().used
-        psutil_value = psutil.swap_memory().used
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_free(self):
-        free_value = free_swap().free
-        psutil_value = psutil.swap_memory().free
-        return self.assertAlmostEqual(
-            free_value, psutil_value, delta=MEMORY_TOLERANCE)
-
-    def test_missing_sin_sout(self):
-        with mock.patch('psutil._common.open', create=True) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.swap_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "'sin' and 'sout' swap memory stats couldn't "
-                    "be determined", str(w.message))
-                self.assertEqual(ret.sin, 0)
-                self.assertEqual(ret.sout, 0)
-
-    def test_no_vmstat_mocked(self):
-        # see https://github.com/giampaolo/psutil/issues/722
-        with mock_open_exception(
-                "/proc/vmstat",
-                IOError(errno.ENOENT, 'no such file or directory')) as m:
-            with warnings.catch_warnings(record=True) as ws:
-                warnings.simplefilter("always")
-                ret = psutil.swap_memory()
-                assert m.called
-                self.assertEqual(len(ws), 1)
-                w = ws[0]
-                assert w.filename.endswith('psutil/_pslinux.py')
-                self.assertIn(
-                    "'sin' and 'sout' swap memory stats couldn't "
-                    "be determined and were set to 0",
-                    str(w.message))
-                self.assertEqual(ret.sin, 0)
-                self.assertEqual(ret.sout, 0)
-
-    def test_meminfo_against_sysinfo(self):
-        # Make sure the content of /proc/meminfo about swap memory
-        # matches sysinfo() syscall, see:
-        # https://github.com/giampaolo/psutil/issues/1015
-        if not self.meminfo_has_swap_info():
-            return unittest.skip("/proc/meminfo has no swap metrics")
-        with mock.patch('psutil._pslinux.cext.linux_sysinfo') as m:
-            swap = psutil.swap_memory()
-        assert not m.called
-        import psutil._psutil_linux as cext
-        _, _, _, _, total, free, unit_multiplier = cext.linux_sysinfo()
-        total *= unit_multiplier
-        free *= unit_multiplier
-        self.assertEqual(swap.total, total)
-        self.assertAlmostEqual(swap.free, free, delta=MEMORY_TOLERANCE)
-
-    def test_emulate_meminfo_has_no_metrics(self):
-        # Emulate a case where /proc/meminfo provides no swap metrics
-        # in which case sysinfo() syscall is supposed to be used
-        # as a fallback.
-        with mock_open_content("/proc/meminfo", b"") as m:
-            psutil.swap_memory()
-            assert m.called
-
-
-# =====================================================================
-# --- system CPU
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUTimes(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "unknown failure on travis")
-    def test_fields(self):
-        fields = psutil.cpu_times()._fields
-        kernel_ver = re.findall(r'\d+\.\d+\.\d+', os.uname()[2])[0]
-        kernel_ver_info = tuple(map(int, kernel_ver.split('.')))
-        if kernel_ver_info >= (2, 6, 11):
-            self.assertIn('steal', fields)
-        else:
-            self.assertNotIn('steal', fields)
-        if kernel_ver_info >= (2, 6, 24):
-            self.assertIn('guest', fields)
-        else:
-            self.assertNotIn('guest', fields)
-        if kernel_ver_info >= (3, 2, 0):
-            self.assertIn('guest_nice', fields)
-        else:
-            self.assertNotIn('guest_nice', fields)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUCountLogical(unittest.TestCase):
-
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu/online"),
-                     "/sys/devices/system/cpu/online does not exist")
-    def test_against_sysdev_cpu_online(self):
-        with open("/sys/devices/system/cpu/online") as f:
-            value = f.read().strip()
-        if "-" in str(value):
-            value = int(value.split('-')[1]) + 1
-            self.assertEqual(psutil.cpu_count(), value)
-
-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"),
-                     "/sys/devices/system/cpu does not exist")
-    def test_against_sysdev_cpu_num(self):
-        ls = os.listdir("/sys/devices/system/cpu")
-        count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None])
-        self.assertEqual(psutil.cpu_count(), count)
-
-    @unittest.skipIf(not which("nproc"), "nproc utility not available")
-    def test_against_nproc(self):
-        num = int(sh("nproc --all"))
-        self.assertEqual(psutil.cpu_count(logical=True), num)
-
-    @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-    def test_against_lscpu(self):
-        out = sh("lscpu -p")
-        num = len([x for x in out.split('\n') if not x.startswith('#')])
-        self.assertEqual(psutil.cpu_count(logical=True), num)
-
-    def test_emulate_fallbacks(self):
-        import psutil._pslinux
-        original = psutil._pslinux.cpu_count_logical()
-        # Here we want to mock os.sysconf("SC_NPROCESSORS_ONLN") in
-        # order to cause the parsing of /proc/cpuinfo and /proc/stat.
-        with mock.patch(
-                'psutil._pslinux.os.sysconf', side_effect=ValueError) as m:
-            self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-            assert m.called
-
-            # Let's have open() return emtpy data and make sure None is
-            # returned ('cause we mimick os.cpu_count()).
-            with mock.patch('psutil._common.open', create=True) as m:
-                self.assertIsNone(psutil._pslinux.cpu_count_logical())
-                self.assertEqual(m.call_count, 2)
-                # /proc/stat should be the last one
-                self.assertEqual(m.call_args[0][0], '/proc/stat')
-
-            # Let's push this a bit further and make sure /proc/cpuinfo
-            # parsing works as expected.
-            with open('/proc/cpuinfo', 'rb') as f:
-                cpuinfo_data = f.read()
-            fake_file = io.BytesIO(cpuinfo_data)
-            with mock.patch('psutil._common.open',
-                            return_value=fake_file, create=True) as m:
-                self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-
-            # Finally, let's make /proc/cpuinfo return meaningless data;
-            # this way we'll fall back on relying on /proc/stat
-            with mock_open_content('/proc/cpuinfo', b"") as m:
-                self.assertEqual(psutil._pslinux.cpu_count_logical(), original)
-                m.called
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUCountPhysical(unittest.TestCase):
-
-    @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-    def test_against_lscpu(self):
-        out = sh("lscpu -p")
-        core_ids = set()
-        for line in out.split('\n'):
-            if not line.startswith('#'):
-                fields = line.split(',')
-                core_ids.add(fields[1])
-        self.assertEqual(psutil.cpu_count(logical=False), len(core_ids))
-
-    def test_emulate_none(self):
-        with mock.patch('glob.glob', return_value=[]) as m1:
-            with mock.patch('psutil._common.open', create=True) as m2:
-                self.assertIsNone(psutil._pslinux.cpu_count_physical())
-        assert m1.called
-        assert m2.called
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUFrequency(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_use_second_file(self):
-        # https://github.com/giampaolo/psutil/issues/981
-        def path_exists_mock(path):
-            if path.startswith("/sys/devices/system/cpu/cpufreq/policy"):
-                return False
-            else:
-                return orig_exists(path)
-
-        orig_exists = os.path.exists
-        with mock.patch("os.path.exists", side_effect=path_exists_mock,
-                        create=True):
-            assert psutil.cpu_freq()
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_use_cpuinfo(self):
-        # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
-        # exist and /proc/cpuinfo is used instead.
-        def path_exists_mock(path):
-            if path.startswith('/sys/devices/system/cpu/'):
-                return False
-            else:
-                if path == "/proc/cpuinfo":
-                    flags.append(None)
-                return os_path_exists(path)
-
-        flags = []
-        os_path_exists = os.path.exists
-        try:
-            with mock.patch("os.path.exists", side_effect=path_exists_mock):
-                reload_module(psutil._pslinux)
-                ret = psutil.cpu_freq()
-                assert ret
-                assert flags
-                self.assertEqual(ret.max, 0.0)
-                self.assertEqual(ret.min, 0.0)
-                for freq in psutil.cpu_freq(percpu=True):
-                    self.assertEqual(ret.max, 0.0)
-                    self.assertEqual(ret.min, 0.0)
-        finally:
-            reload_module(psutil._pslinux)
-            reload_module(psutil)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_data(self):
-        def open_mock(name, *args, **kwargs):
-            if (name.endswith('/scaling_cur_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"500000")
-            elif (name.endswith('/scaling_min_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"600000")
-            elif (name.endswith('/scaling_max_freq') and
-                    name.startswith("/sys/devices/system/cpu/cpufreq/policy")):
-                return io.BytesIO(b"700000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 500")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch(
-                    'os.path.exists', return_value=True):
-                freq = psutil.cpu_freq()
-                self.assertEqual(freq.current, 500.0)
-                # when /proc/cpuinfo is used min and max frequencies are not
-                # available and are set to 0.
-                if freq.min != 0.0:
-                    self.assertEqual(freq.min, 600.0)
-                if freq.max != 0.0:
-                    self.assertEqual(freq.max, 700.0)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_multi_cpu(self):
-        def open_mock(name, *args, **kwargs):
-            n = name
-            if (n.endswith('/scaling_cur_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"100000")
-            elif (n.endswith('/scaling_min_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"200000")
-            elif (n.endswith('/scaling_max_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy0")):
-                return io.BytesIO(b"300000")
-            elif (n.endswith('/scaling_cur_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"400000")
-            elif (n.endswith('/scaling_min_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"500000")
-            elif (n.endswith('/scaling_max_freq') and
-                    n.startswith("/sys/devices/system/cpu/cpufreq/policy1")):
-                return io.BytesIO(b"600000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 100\n"
-                                  b"cpu MHz		: 400")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('os.path.exists', return_value=True):
-                with mock.patch('psutil._pslinux.cpu_count_logical',
-                                return_value=2):
-                    freq = psutil.cpu_freq(percpu=True)
-                    self.assertEqual(freq[0].current, 100.0)
-                    if freq[0].min != 0.0:
-                        self.assertEqual(freq[0].min, 200.0)
-                    if freq[0].max != 0.0:
-                        self.assertEqual(freq[0].max, 300.0)
-                    self.assertEqual(freq[1].current, 400.0)
-                    if freq[1].min != 0.0:
-                        self.assertEqual(freq[1].min, 500.0)
-                    if freq[1].max != 0.0:
-                        self.assertEqual(freq[1].max, 600.0)
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_emulate_no_scaling_cur_freq_file(self):
-        # See: https://github.com/giampaolo/psutil/issues/1071
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/scaling_cur_freq'):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith('/cpuinfo_cur_freq'):
-                return io.BytesIO(b"200000")
-            elif name == '/proc/cpuinfo':
-                return io.BytesIO(b"cpu MHz		: 200")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('os.path.exists', return_value=True):
-                with mock.patch('psutil._pslinux.cpu_count_logical',
-                                return_value=1):
-                    freq = psutil.cpu_freq()
-                    self.assertEqual(freq.current, 200)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemCPUStats(unittest.TestCase):
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    def test_ctx_switches(self):
-        vmstat_value = vmstat("context switches")
-        psutil_value = psutil.cpu_stats().ctx_switches
-        self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
-
-    @unittest.skipIf(TRAVIS, "fails on Travis")
-    def test_interrupts(self):
-        vmstat_value = vmstat("interrupts")
-        psutil_value = psutil.cpu_stats().interrupts
-        self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestLoadAvg(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_GETLOADAVG, "not supported")
-    def test_getloadavg(self):
-        psutil_value = psutil.getloadavg()
-        with open("/proc/loadavg", "r") as f:
-            proc_value = f.read().split()
-
-        self.assertAlmostEqual(float(proc_value[0]), psutil_value[0], delta=1)
-        self.assertAlmostEqual(float(proc_value[1]), psutil_value[1], delta=1)
-        self.assertAlmostEqual(float(proc_value[2]), psutil_value[2], delta=1)
-
-
-# =====================================================================
-# --- system network
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIfAddrs(unittest.TestCase):
-
-    def test_ips(self):
-        for name, addrs in psutil.net_if_addrs().items():
-            for addr in addrs:
-                if addr.family == psutil.AF_LINK:
-                    self.assertEqual(addr.address, get_mac_address(name))
-                elif addr.family == socket.AF_INET:
-                    self.assertEqual(addr.address, get_ipv4_address(name))
-                # TODO: test for AF_INET6 family
-
-    # XXX - not reliable when having virtual NICs installed by Docker.
-    # @unittest.skipIf(not which('ip'), "'ip' utility not available")
-    # @unittest.skipIf(TRAVIS, "skipped on Travis")
-    # def test_net_if_names(self):
-    #     out = sh("ip addr").strip()
-    #     nics = [x for x in psutil.net_if_addrs().keys() if ':' not in x]
-    #     found = 0
-    #     for line in out.split('\n'):
-    #         line = line.strip()
-    #         if re.search(r"^\d+:", line):
-    #             found += 1
-    #             name = line.split(':')[1].strip()
-    #             self.assertIn(name, nics)
-    #     self.assertEqual(len(nics), found, msg="%s\n---\n%s" % (
-    #         pprint.pformat(nics), out))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIfStats(unittest.TestCase):
-
-    def test_against_ifconfig(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                # Not always reliable.
-                # self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                self.assertEqual(stats.mtu,
-                                 int(re.findall(r'(?i)MTU[: ](\d+)', out)[0]))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetIOCounters(unittest.TestCase):
-
-    @retry_on_failure()
-    def test_against_ifconfig(self):
-        def ifconfig(nic):
-            ret = {}
-            out = sh("ifconfig %s" % name)
-            ret['packets_recv'] = int(
-                re.findall(r'RX packets[: ](\d+)', out)[0])
-            ret['packets_sent'] = int(
-                re.findall(r'TX packets[: ](\d+)', out)[0])
-            ret['errin'] = int(re.findall(r'errors[: ](\d+)', out)[0])
-            ret['errout'] = int(re.findall(r'errors[: ](\d+)', out)[1])
-            ret['dropin'] = int(re.findall(r'dropped[: ](\d+)', out)[0])
-            ret['dropout'] = int(re.findall(r'dropped[: ](\d+)', out)[1])
-            ret['bytes_recv'] = int(
-                re.findall(r'RX (?:packets \d+ +)?bytes[: ](\d+)', out)[0])
-            ret['bytes_sent'] = int(
-                re.findall(r'TX (?:packets \d+ +)?bytes[: ](\d+)', out)[0])
-            return ret
-
-        nio = psutil.net_io_counters(pernic=True, nowrap=False)
-        for name, stats in nio.items():
-            try:
-                ifconfig_ret = ifconfig(name)
-            except RuntimeError:
-                continue
-            self.assertAlmostEqual(
-                stats.bytes_recv, ifconfig_ret['bytes_recv'], delta=1024 * 5)
-            self.assertAlmostEqual(
-                stats.bytes_sent, ifconfig_ret['bytes_sent'], delta=1024 * 5)
-            self.assertAlmostEqual(
-                stats.packets_recv, ifconfig_ret['packets_recv'], delta=1024)
-            self.assertAlmostEqual(
-                stats.packets_sent, ifconfig_ret['packets_sent'], delta=1024)
-            self.assertAlmostEqual(
-                stats.errin, ifconfig_ret['errin'], delta=10)
-            self.assertAlmostEqual(
-                stats.errout, ifconfig_ret['errout'], delta=10)
-            self.assertAlmostEqual(
-                stats.dropin, ifconfig_ret['dropin'], delta=10)
-            self.assertAlmostEqual(
-                stats.dropout, ifconfig_ret['dropout'], delta=10)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemNetConnections(unittest.TestCase):
-
-    @mock.patch('psutil._pslinux.socket.inet_ntop', side_effect=ValueError)
-    @mock.patch('psutil._pslinux.supports_ipv6', return_value=False)
-    def test_emulate_ipv6_unsupported(self, supports_ipv6, inet_ntop):
-        # see: https://github.com/giampaolo/psutil/issues/623
-        try:
-            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-            self.addCleanup(s.close)
-            s.bind(("::1", 0))
-        except socket.error:
-            pass
-        psutil.net_connections(kind='inet6')
-
-    def test_emulate_unix(self):
-        with mock_open_content(
-            '/proc/net/unix',
-            textwrap.dedent("""\
-                0: 00000003 000 000 0001 03 462170 @/tmp/dbus-Qw2hMPIU3n
-                0: 00000003 000 000 0001 03 35010 @/tmp/dbus-tB2X8h69BQ
-                0: 00000003 000 000 0001 03 34424 @/tmp/dbus-cHy80Y8O
-                000000000000000000000000000000000000000000000000000000
-                """)) as m:
-            psutil.net_connections(kind='unix')
-            assert m.called
-
-
-# =====================================================================
-# --- system disks
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemDiskPartitions(unittest.TestCase):
-
-    @unittest.skipIf(not hasattr(os, 'statvfs'), "os.statvfs() not available")
-    @skip_on_not_implemented()
-    def test_against_df(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -P -B 1 "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total, used, free = int(total), int(used), int(free)
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.free, free))
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % (usage.used, used))
-
-    def test_zfs_fs(self):
-        # Test that ZFS partitions are returned.
-        with open("/proc/filesystems", "r") as f:
-            data = f.read()
-        if 'zfs' in data:
-            for part in psutil.disk_partitions():
-                if part.fstype == 'zfs':
-                    break
-            else:
-                self.fail("couldn't find any ZFS partition")
-        else:
-            # No ZFS partitions on this system. Let's fake one.
-            fake_file = io.StringIO(u("nodev\tzfs\n"))
-            with mock.patch('psutil._common.open',
-                            return_value=fake_file, create=True) as m1:
-                with mock.patch(
-                        'psutil._pslinux.cext.disk_partitions',
-                        return_value=[('/dev/sdb3', '/', 'zfs', 'rw')]) as m2:
-                    ret = psutil.disk_partitions()
-                    assert m1.called
-                    assert m2.called
-                    assert ret
-                    self.assertEqual(ret[0].fstype, 'zfs')
-
-    def test_emulate_realpath_fail(self):
-        # See: https://github.com/giampaolo/psutil/issues/1307
-        try:
-            with mock.patch('os.path.realpath',
-                            return_value='/non/existent') as m:
-                with self.assertRaises(FileNotFoundError):
-                    psutil.disk_partitions()
-                assert m.called
-        finally:
-            psutil.PROCFS_PATH = "/proc"
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSystemDiskIoCounters(unittest.TestCase):
-
-    def test_emulate_kernel_2_4(self):
-        # Tests /proc/diskstats parsing format for 2.4 kernels, see:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3     0   1 hda 2 3 4 5 6 7 8 9 10 11 12"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_merged_count, 2)
-                self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
-                self.assertEqual(ret.read_time, 4)
-                self.assertEqual(ret.write_count, 5)
-                self.assertEqual(ret.write_merged_count, 6)
-                self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
-                self.assertEqual(ret.write_time, 8)
-                self.assertEqual(ret.busy_time, 10)
-
-    def test_emulate_kernel_2_6_full(self):
-        # Tests /proc/diskstats parsing format for 2.6 kernels,
-        # lines reporting all metrics:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3    0   hda 1 2 3 4 5 6 7 8 9 10 11"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_merged_count, 2)
-                self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
-                self.assertEqual(ret.read_time, 4)
-                self.assertEqual(ret.write_count, 5)
-                self.assertEqual(ret.write_merged_count, 6)
-                self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
-                self.assertEqual(ret.write_time, 8)
-                self.assertEqual(ret.busy_time, 10)
-
-    def test_emulate_kernel_2_6_limited(self):
-        # Tests /proc/diskstats parsing format for 2.6 kernels,
-        # where one line of /proc/partitions return a limited
-        # amount of metrics when it bumps into a partition
-        # (instead of a disk). See:
-        # https://github.com/giampaolo/psutil/issues/767
-        with mock_open_content(
-                '/proc/diskstats',
-                "   3    1   hda 1 2 3 4"):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=True):
-                ret = psutil.disk_io_counters(nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.read_bytes, 2 * SECTOR_SIZE)
-                self.assertEqual(ret.write_count, 3)
-                self.assertEqual(ret.write_bytes, 4 * SECTOR_SIZE)
-
-                self.assertEqual(ret.read_merged_count, 0)
-                self.assertEqual(ret.read_time, 0)
-                self.assertEqual(ret.write_merged_count, 0)
-                self.assertEqual(ret.write_time, 0)
-                self.assertEqual(ret.busy_time, 0)
-
-    def test_emulate_include_partitions(self):
-        # Make sure that when perdisk=True disk partitions are returned,
-        # see:
-        # https://github.com/giampaolo/psutil/pull/1313#issuecomment-408626842
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=False):
-                ret = psutil.disk_io_counters(perdisk=True, nowrap=False)
-                self.assertEqual(len(ret), 2)
-                self.assertEqual(ret['nvme0n1'].read_count, 1)
-                self.assertEqual(ret['nvme0n1p1'].read_count, 1)
-                self.assertEqual(ret['nvme0n1'].write_count, 5)
-                self.assertEqual(ret['nvme0n1p1'].write_count, 5)
-
-    def test_emulate_exclude_partitions(self):
-        # Make sure that when perdisk=False partitions (e.g. 'sda1',
-        # 'nvme0n1p1') are skipped and not included in the total count.
-        # https://github.com/giampaolo/psutil/pull/1313#issuecomment-408626842
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            return_value=False):
-                ret = psutil.disk_io_counters(perdisk=False, nowrap=False)
-                self.assertIsNone(ret)
-
-        #
-        def is_storage_device(name):
-            return name == 'nvme0n1'
-
-        with mock_open_content(
-                '/proc/diskstats',
-                textwrap.dedent("""\
-                    3    0   nvme0n1 1 2 3 4 5 6 7 8 9 10 11
-                    3    0   nvme0n1p1 1 2 3 4 5 6 7 8 9 10 11
-                    """)):
-            with mock.patch('psutil._pslinux.is_storage_device',
-                            create=True, side_effect=is_storage_device):
-                ret = psutil.disk_io_counters(perdisk=False, nowrap=False)
-                self.assertEqual(ret.read_count, 1)
-                self.assertEqual(ret.write_count, 5)
-
-    def test_emulate_use_sysfs(self):
-        def exists(path):
-            if path == '/proc/diskstats':
-                return False
-            return True
-
-        wprocfs = psutil.disk_io_counters(perdisk=True)
-        with mock.patch('psutil._pslinux.os.path.exists',
-                        create=True, side_effect=exists):
-            wsysfs = psutil.disk_io_counters(perdisk=True)
-        self.assertEqual(len(wprocfs), len(wsysfs))
-
-    def test_emulate_not_impl(self):
-        def exists(path):
-            return False
-
-        with mock.patch('psutil._pslinux.os.path.exists',
-                        create=True, side_effect=exists):
-            self.assertRaises(NotImplementedError, psutil.disk_io_counters)
-
-
-# =====================================================================
-# --- misc
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestMisc(unittest.TestCase):
-
-    def test_boot_time(self):
-        vmstat_value = vmstat('boot time')
-        psutil_value = psutil.boot_time()
-        self.assertEqual(int(vmstat_value), int(psutil_value))
-
-    def test_no_procfs_on_import(self):
-        my_procfs = tempfile.mkdtemp()
-
-        with open(os.path.join(my_procfs, 'stat'), 'w') as f:
-            f.write('cpu   0 0 0 0 0 0 0 0 0 0\n')
-            f.write('cpu0  0 0 0 0 0 0 0 0 0 0\n')
-            f.write('cpu1  0 0 0 0 0 0 0 0 0 0\n')
-
-        try:
-            orig_open = open
-
-            def open_mock(name, *args, **kwargs):
-                if name.startswith('/proc'):
-                    raise IOError(errno.ENOENT, 'rejecting access for test')
-                return orig_open(name, *args, **kwargs)
-
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-            with mock.patch(patch_point, side_effect=open_mock):
-                reload_module(psutil)
-
-                self.assertRaises(IOError, psutil.cpu_times)
-                self.assertRaises(IOError, psutil.cpu_times, percpu=True)
-                self.assertRaises(IOError, psutil.cpu_percent)
-                self.assertRaises(IOError, psutil.cpu_percent, percpu=True)
-                self.assertRaises(IOError, psutil.cpu_times_percent)
-                self.assertRaises(
-                    IOError, psutil.cpu_times_percent, percpu=True)
-
-                psutil.PROCFS_PATH = my_procfs
-
-                self.assertEqual(psutil.cpu_percent(), 0)
-                self.assertEqual(sum(psutil.cpu_times_percent()), 0)
-
-                # since we don't know the number of CPUs at import time,
-                # we awkwardly say there are none until the second call
-                per_cpu_percent = psutil.cpu_percent(percpu=True)
-                self.assertEqual(sum(per_cpu_percent), 0)
-
-                # ditto awkward length
-                per_cpu_times_percent = psutil.cpu_times_percent(percpu=True)
-                self.assertEqual(sum(map(sum, per_cpu_times_percent)), 0)
-
-                # much user, very busy
-                with open(os.path.join(my_procfs, 'stat'), 'w') as f:
-                    f.write('cpu   1 0 0 0 0 0 0 0 0 0\n')
-                    f.write('cpu0  1 0 0 0 0 0 0 0 0 0\n')
-                    f.write('cpu1  1 0 0 0 0 0 0 0 0 0\n')
-
-                self.assertNotEqual(psutil.cpu_percent(), 0)
-                self.assertNotEqual(
-                    sum(psutil.cpu_percent(percpu=True)), 0)
-                self.assertNotEqual(sum(psutil.cpu_times_percent()), 0)
-                self.assertNotEqual(
-                    sum(map(sum, psutil.cpu_times_percent(percpu=True))), 0)
-        finally:
-            shutil.rmtree(my_procfs)
-            reload_module(psutil)
-
-        self.assertEqual(psutil.PROCFS_PATH, '/proc')
-
-    def test_cpu_steal_decrease(self):
-        # Test cumulative cpu stats decrease. We should ignore this.
-        # See issue #1210.
-        with mock_open_content(
-            "/proc/stat",
-            textwrap.dedent("""\
-                cpu   0 0 0 0 0 0 0 1 0 0
-                cpu0  0 0 0 0 0 0 0 1 0 0
-                cpu1  0 0 0 0 0 0 0 1 0 0
-                """).encode()) as m:
-            # first call to "percent" functions should read the new stat file
-            # and compare to the "real" file read at import time - so the
-            # values are meaningless
-            psutil.cpu_percent()
-            assert m.called
-            psutil.cpu_percent(percpu=True)
-            psutil.cpu_times_percent()
-            psutil.cpu_times_percent(percpu=True)
-
-        with mock_open_content(
-            "/proc/stat",
-            textwrap.dedent("""\
-                cpu   1 0 0 0 0 0 0 0 0 0
-                cpu0  1 0 0 0 0 0 0 0 0 0
-                cpu1  1 0 0 0 0 0 0 0 0 0
-                """).encode()) as m:
-            # Increase "user" while steal goes "backwards" to zero.
-            cpu_percent = psutil.cpu_percent()
-            assert m.called
-            cpu_percent_percpu = psutil.cpu_percent(percpu=True)
-            cpu_times_percent = psutil.cpu_times_percent()
-            cpu_times_percent_percpu = psutil.cpu_times_percent(percpu=True)
-            self.assertNotEqual(cpu_percent, 0)
-            self.assertNotEqual(sum(cpu_percent_percpu), 0)
-            self.assertNotEqual(sum(cpu_times_percent), 0)
-            self.assertNotEqual(sum(cpu_times_percent), 100.0)
-            self.assertNotEqual(sum(map(sum, cpu_times_percent_percpu)), 0)
-            self.assertNotEqual(sum(map(sum, cpu_times_percent_percpu)), 100.0)
-            self.assertEqual(cpu_times_percent.steal, 0)
-            self.assertNotEqual(cpu_times_percent.user, 0)
-
-    def test_boot_time_mocked(self):
-        with mock.patch('psutil._common.open', create=True) as m:
-            self.assertRaises(
-                RuntimeError,
-                psutil._pslinux.boot_time)
-            assert m.called
-
-    def test_users_mocked(self):
-        # Make sure ':0' and ':0.0' (returned by C ext) are converted
-        # to 'localhost'.
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', ':0',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'localhost')
-            assert m.called
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', ':0.0',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'localhost')
-            assert m.called
-        # ...otherwise it should be returned as-is
-        with mock.patch('psutil._pslinux.cext.users',
-                        return_value=[('giampaolo', 'pts/2', 'foo',
-                                       1436573184.0, True, 2)]) as m:
-            self.assertEqual(psutil.users()[0].host, 'foo')
-            assert m.called
-
-    def test_procfs_path(self):
-        tdir = tempfile.mkdtemp()
-        try:
-            psutil.PROCFS_PATH = tdir
-            self.assertRaises(IOError, psutil.virtual_memory)
-            self.assertRaises(IOError, psutil.cpu_times)
-            self.assertRaises(IOError, psutil.cpu_times, percpu=True)
-            self.assertRaises(IOError, psutil.boot_time)
-            # self.assertRaises(IOError, psutil.pids)
-            self.assertRaises(IOError, psutil.net_connections)
-            self.assertRaises(IOError, psutil.net_io_counters)
-            self.assertRaises(IOError, psutil.net_if_stats)
-            # self.assertRaises(IOError, psutil.disk_io_counters)
-            self.assertRaises(IOError, psutil.disk_partitions)
-            self.assertRaises(psutil.NoSuchProcess, psutil.Process)
-        finally:
-            psutil.PROCFS_PATH = "/proc"
-            os.rmdir(tdir)
-
-    def test_issue_687(self):
-        # In case of thread ID:
-        # - pid_exists() is supposed to return False
-        # - Process(tid) is supposed to work
-        # - pids() should not return the TID
-        # See: https://github.com/giampaolo/psutil/issues/687
-        t = ThreadTask()
-        t.start()
-        try:
-            p = psutil.Process()
-            tid = p.threads()[1].id
-            assert not psutil.pid_exists(tid), tid
-            pt = psutil.Process(tid)
-            pt.as_dict()
-            self.assertNotIn(tid, psutil.pids())
-        finally:
-            t.stop()
-
-    def test_pid_exists_no_proc_status(self):
-        # Internally pid_exists relies on /proc/{pid}/status.
-        # Emulate a case where this file is empty in which case
-        # psutil is supposed to fall back on using pids().
-        with mock_open_content("/proc/%s/status", "") as m:
-            assert psutil.pid_exists(os.getpid())
-            assert m.called
-
-
-# =====================================================================
-# --- sensors
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-@unittest.skipIf(not HAS_BATTERY, "no battery")
-class TestSensorsBattery(unittest.TestCase):
-
-    @unittest.skipIf(not which("acpi"), "acpi utility not available")
-    def test_percent(self):
-        out = sh("acpi -b")
-        acpi_value = int(out.split(",")[1].strip().replace('%', ''))
-        psutil_value = psutil.sensors_battery().percent
-        self.assertAlmostEqual(acpi_value, psutil_value, delta=1)
-
-    @unittest.skipIf(not which("acpi"), "acpi utility not available")
-    def test_power_plugged(self):
-        out = sh("acpi -b")
-        if 'unknown' in out.lower():
-            return unittest.skip("acpi output not reliable")
-        if 'discharging at zero rate' in out:
-            plugged = True
-        else:
-            plugged = "Charging" in out.split('\n')[0]
-        self.assertEqual(psutil.sensors_battery().power_plugged, plugged)
-
-    def test_emulate_power_plugged(self):
-        # Pretend the AC power cable is connected.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                return io.BytesIO(b"1")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, True)
-            self.assertEqual(
-                psutil.sensors_battery().secsleft, psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_power_plugged_2(self):
-        # Same as above but pretend /AC0/online does not exist in which
-        # case code relies on /status file.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u("charging"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, True)
-            assert m.called
-
-    def test_emulate_power_not_plugged(self):
-        # Pretend the AC power cable is not connected.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                return io.BytesIO(b"0")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, False)
-            assert m.called
-
-    def test_emulate_power_not_plugged_2(self):
-        # Same as above but pretend /AC0/online does not exist in which
-        # case code relies on /status file.
-        def open_mock(name, *args, **kwargs):
-            if name.endswith("AC0/online") or name.endswith("AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.endswith("/status"):
-                return io.StringIO(u("discharging"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertEqual(psutil.sensors_battery().power_plugged, False)
-            assert m.called
-
-    def test_emulate_power_undetermined(self):
-        # Pretend we can't know whether the AC power cable not
-        # connected (assert fallback to False).
-        def open_mock(name, *args, **kwargs):
-            if name.startswith("/sys/class/power_supply/AC0/online") or \
-                    name.startswith("/sys/class/power_supply/AC/online"):
-                raise IOError(errno.ENOENT, "")
-            elif name.startswith("/sys/class/power_supply/BAT0/status"):
-                return io.BytesIO(b"???")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertIsNone(psutil.sensors_battery().power_plugged)
-            assert m.called
-
-    def test_emulate_no_base_files(self):
-        # Emulate a case where base metrics files are not present,
-        # in which case we're supposed to get None.
-        with mock_open_exception(
-                "/sys/class/power_supply/BAT0/energy_now",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/BAT0/charge_now",
-                    IOError(errno.ENOENT, "")):
-                self.assertIsNone(psutil.sensors_battery())
-
-    def test_emulate_energy_full_0(self):
-        # Emulate a case where energy_full files returns 0.
-        with mock_open_content(
-                "/sys/class/power_supply/BAT0/energy_full", b"0") as m:
-            self.assertEqual(psutil.sensors_battery().percent, 0)
-            assert m.called
-
-    def test_emulate_energy_full_not_avail(self):
-        # Emulate a case where energy_full file does not exist.
-        # Expected fallback on /capacity.
-        with mock_open_exception(
-                "/sys/class/power_supply/BAT0/energy_full",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/BAT0/charge_full",
-                    IOError(errno.ENOENT, "")):
-                with mock_open_content(
-                        "/sys/class/power_supply/BAT0/capacity", b"88"):
-                    self.assertEqual(psutil.sensors_battery().percent, 88)
-
-    def test_emulate_no_power(self):
-        # Emulate a case where /AC0/online file nor /BAT0/status exist.
-        with mock_open_exception(
-                "/sys/class/power_supply/AC/online",
-                IOError(errno.ENOENT, "")):
-            with mock_open_exception(
-                    "/sys/class/power_supply/AC0/online",
-                    IOError(errno.ENOENT, "")):
-                with mock_open_exception(
-                        "/sys/class/power_supply/BAT0/status",
-                        IOError(errno.ENOENT, "")):
-                    self.assertIsNone(psutil.sensors_battery().power_plugged)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSensorsTemperatures(unittest.TestCase):
-
-    def test_emulate_class_hwmon(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/name'):
-                return io.StringIO(u("name"))
-            elif name.endswith('/temp1_label'):
-                return io.StringIO(u("label"))
-            elif name.endswith('/temp1_input'):
-                return io.BytesIO(b"30000")
-            elif name.endswith('/temp1_max'):
-                return io.BytesIO(b"40000")
-            elif name.endswith('/temp1_crit'):
-                return io.BytesIO(b"50000")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            # Test case with /sys/class/hwmon
-            with mock.patch('glob.glob',
-                            return_value=['/sys/class/hwmon/hwmon0/temp1']):
-                temp = psutil.sensors_temperatures()['name'][0]
-                self.assertEqual(temp.label, 'label')
-                self.assertEqual(temp.current, 30.0)
-                self.assertEqual(temp.high, 40.0)
-                self.assertEqual(temp.critical, 50.0)
-
-    def test_emulate_class_thermal(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('0_temp'):
-                return io.BytesIO(b"50000")
-            elif name.endswith('temp'):
-                return io.BytesIO(b"30000")
-            elif name.endswith('0_type'):
-                return io.StringIO(u("critical"))
-            elif name.endswith('type'):
-                return io.StringIO(u("name"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        def glob_mock(path):
-            if path == '/sys/class/hwmon/hwmon*/temp*_*':
-                return []
-            elif path == '/sys/class/hwmon/hwmon*/device/temp*_*':
-                return []
-            elif path == '/sys/class/thermal/thermal_zone*':
-                return ['/sys/class/thermal/thermal_zone0']
-            elif path == '/sys/class/thermal/thermal_zone0/trip_point*':
-                return ['/sys/class/thermal/thermal_zone1/trip_point_0_type',
-                        '/sys/class/thermal/thermal_zone1/trip_point_0_temp']
-            return []
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('glob.glob', create=True, side_effect=glob_mock):
-                temp = psutil.sensors_temperatures()['name'][0]
-                self.assertEqual(temp.label, '')
-                self.assertEqual(temp.current, 30.0)
-                self.assertEqual(temp.high, 50.0)
-                self.assertEqual(temp.critical, 50.0)
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestSensorsFans(unittest.TestCase):
-
-    def test_emulate_data(self):
-        def open_mock(name, *args, **kwargs):
-            if name.endswith('/name'):
-                return io.StringIO(u("name"))
-            elif name.endswith('/fan1_label'):
-                return io.StringIO(u("label"))
-            elif name.endswith('/fan1_input'):
-                return io.StringIO(u("2000"))
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock):
-            with mock.patch('glob.glob',
-                            return_value=['/sys/class/hwmon/hwmon2/fan1']):
-                fan = psutil.sensors_fans()['name'][0]
-                self.assertEqual(fan.label, 'label')
-                self.assertEqual(fan.current, 2000)
-
-
-# =====================================================================
-# --- test process
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestProcess(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    tearDown = setUp
-
-    def test_memory_full_info(self):
-        src = textwrap.dedent("""
-            import time
-            with open("%s", "w") as f:
-                time.sleep(10)
-            """ % TESTFN)
-        sproc = pyrun(src)
-        self.addCleanup(reap_children)
-        call_until(lambda: os.listdir('.'), "'%s' not in ret" % TESTFN)
-        p = psutil.Process(sproc.pid)
-        time.sleep(.1)
-        mem = p.memory_full_info()
-        maps = p.memory_maps(grouped=False)
-        self.assertAlmostEqual(
-            mem.uss, sum([x.private_dirty + x.private_clean for x in maps]),
-            delta=4096)
-        self.assertAlmostEqual(
-            mem.pss, sum([x.pss for x in maps]), delta=4096)
-        self.assertAlmostEqual(
-            mem.swap, sum([x.swap for x in maps]), delta=4096)
-
-    def test_memory_full_info_mocked(self):
-        # See: https://github.com/giampaolo/psutil/issues/1222
-        with mock_open_content(
-            "/proc/%s/smaps" % os.getpid(),
-            textwrap.dedent("""\
-                fffff0 r-xp 00000000 00:00 0                  [vsyscall]
-                Size:                  1 kB
-                Rss:                   2 kB
-                Pss:                   3 kB
-                Shared_Clean:          4 kB
-                Shared_Dirty:          5 kB
-                Private_Clean:         6 kB
-                Private_Dirty:         7 kB
-                Referenced:            8 kB
-                Anonymous:             9 kB
-                LazyFree:              10 kB
-                AnonHugePages:         11 kB
-                ShmemPmdMapped:        12 kB
-                Shared_Hugetlb:        13 kB
-                Private_Hugetlb:       14 kB
-                Swap:                  15 kB
-                SwapPss:               16 kB
-                KernelPageSize:        17 kB
-                MMUPageSize:           18 kB
-                Locked:                19 kB
-                VmFlags: rd ex
-                """).encode()) as m:
-            p = psutil.Process()
-            mem = p.memory_full_info()
-            assert m.called
-            self.assertEqual(mem.uss, (6 + 7 + 14) * 1024)
-            self.assertEqual(mem.pss, 3 * 1024)
-            self.assertEqual(mem.swap, 15 * 1024)
-
-    # On PYPY file descriptors are not closed fast enough.
-    @unittest.skipIf(PYPY, "unreliable on PYPY")
-    def test_open_files_mode(self):
-        def get_test_file():
-            p = psutil.Process()
-            giveup_at = time.time() + 2
-            while True:
-                for file in p.open_files():
-                    if file.path == os.path.abspath(TESTFN):
-                        return file
-                    elif time.time() > giveup_at:
-                        break
-            raise RuntimeError("timeout looking for test file")
-
-        #
-        with open(TESTFN, "w"):
-            self.assertEqual(get_test_file().mode, "w")
-        with open(TESTFN, "r"):
-            self.assertEqual(get_test_file().mode, "r")
-        with open(TESTFN, "a"):
-            self.assertEqual(get_test_file().mode, "a")
-        #
-        with open(TESTFN, "r+"):
-            self.assertEqual(get_test_file().mode, "r+")
-        with open(TESTFN, "w+"):
-            self.assertEqual(get_test_file().mode, "r+")
-        with open(TESTFN, "a+"):
-            self.assertEqual(get_test_file().mode, "a+")
-        # note: "x" bit is not supported
-        if PY3:
-            safe_rmpath(TESTFN)
-            with open(TESTFN, "x"):
-                self.assertEqual(get_test_file().mode, "w")
-            safe_rmpath(TESTFN)
-            with open(TESTFN, "x+"):
-                self.assertEqual(get_test_file().mode, "r+")
-
-    def test_open_files_file_gone(self):
-        # simulates a file which gets deleted during open_files()
-        # execution
-        p = psutil.Process()
-        files = p.open_files()
-        with tempfile.NamedTemporaryFile():
-            # give the kernel some time to see the new file
-            call_until(p.open_files, "len(ret) != %i" % len(files))
-            with mock.patch('psutil._pslinux.os.readlink',
-                            side_effect=OSError(errno.ENOENT, "")) as m:
-                files = p.open_files()
-                assert not files
-                assert m.called
-            # also simulate the case where os.readlink() returns EINVAL
-            # in which case psutil is supposed to 'continue'
-            with mock.patch('psutil._pslinux.os.readlink',
-                            side_effect=OSError(errno.EINVAL, "")) as m:
-                self.assertEqual(p.open_files(), [])
-                assert m.called
-
-    def test_open_files_fd_gone(self):
-        # Simulate a case where /proc/{pid}/fdinfo/{fd} disappears
-        # while iterating through fds.
-        # https://travis-ci.org/giampaolo/psutil/jobs/225694530
-        p = psutil.Process()
-        files = p.open_files()
-        with tempfile.NamedTemporaryFile():
-            # give the kernel some time to see the new file
-            call_until(p.open_files, "len(ret) != %i" % len(files))
-            patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-            with mock.patch(patch_point,
-                            side_effect=IOError(errno.ENOENT, "")) as m:
-                files = p.open_files()
-                assert not files
-                assert m.called
-
-    # --- mocked tests
-
-    def test_terminal_mocked(self):
-        with mock.patch('psutil._pslinux._psposix.get_terminal_map',
-                        return_value={}) as m:
-            self.assertIsNone(psutil._pslinux.Process(os.getpid()).terminal())
-            assert m.called
-
-    # TODO: re-enable this test.
-    # def test_num_ctx_switches_mocked(self):
-    #     with mock.patch('psutil._common.open', create=True) as m:
-    #         self.assertRaises(
-    #             NotImplementedError,
-    #             psutil._pslinux.Process(os.getpid()).num_ctx_switches)
-    #         assert m.called
-
-    def test_cmdline_mocked(self):
-        # see: https://github.com/giampaolo/psutil/issues/639
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo\x00bar\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-        fake_file = io.StringIO(u('foo\x00bar\x00\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar', ''])
-            assert m.called
-
-    def test_cmdline_spaces_mocked(self):
-        # see: https://github.com/giampaolo/psutil/issues/1179
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo bar '))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-        fake_file = io.StringIO(u('foo bar  '))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar', ''])
-            assert m.called
-
-    def test_cmdline_mixed_separators(self):
-        # https://github.com/giampaolo/psutil/issues/
-        #    1179#issuecomment-552984549
-        p = psutil.Process()
-        fake_file = io.StringIO(u('foo\x20bar\x00'))
-        with mock.patch('psutil._common.open',
-                        return_value=fake_file, create=True) as m:
-            self.assertEqual(p.cmdline(), ['foo', 'bar'])
-            assert m.called
-
-    def test_readlink_path_deleted_mocked(self):
-        with mock.patch('psutil._pslinux.os.readlink',
-                        return_value='/home/foo (deleted)'):
-            self.assertEqual(psutil.Process().exe(), "/home/foo")
-            self.assertEqual(psutil.Process().cwd(), "/home/foo")
-
-    def test_threads_mocked(self):
-        # Test the case where os.listdir() returns a file (thread)
-        # which no longer exists by the time we open() it (race
-        # condition). threads() is supposed to ignore that instead
-        # of raising NSP.
-        def open_mock(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.ENOENT, "")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        orig_open = open
-        patch_point = 'builtins.open' if PY3 else '__builtin__.open'
-        with mock.patch(patch_point, side_effect=open_mock) as m:
-            ret = psutil.Process().threads()
-            assert m.called
-            self.assertEqual(ret, [])
-
-        # ...but if it bumps into something != ENOENT we want an
-        # exception.
-        def open_mock(name, *args, **kwargs):
-            if name.startswith('/proc/%s/task' % os.getpid()):
-                raise IOError(errno.EPERM, "")
-            else:
-                return orig_open(name, *args, **kwargs)
-
-        with mock.patch(patch_point, side_effect=open_mock):
-            self.assertRaises(psutil.AccessDenied, psutil.Process().threads)
-
-    def test_exe_mocked(self):
-        with mock.patch('psutil._pslinux.readlink',
-                        side_effect=OSError(errno.ENOENT, "")) as m1:
-            with mock.patch('psutil.Process.cmdline',
-                            side_effect=psutil.AccessDenied(0, "")) as m2:
-                # No such file error; might be raised also if /proc/pid/exe
-                # path actually exists for system processes with low pids
-                # (about 0-20). In this case psutil is supposed to return
-                # an empty string.
-                ret = psutil.Process().exe()
-                assert m1.called
-                assert m2.called
-                self.assertEqual(ret, "")
-
-                # ...but if /proc/pid no longer exist we're supposed to treat
-                # it as an alias for zombie process
-                with mock.patch('psutil._pslinux.os.path.lexists',
-                                return_value=False):
-                    self.assertRaises(
-                        psutil.ZombieProcess, psutil.Process().exe)
-
-    def test_issue_1014(self):
-        # Emulates a case where smaps file does not exist. In this case
-        # wrap_exception decorator should not raise NoSuchProcess.
-        with mock_open_exception(
-                '/proc/%s/smaps' % os.getpid(),
-                IOError(errno.ENOENT, "")) as m:
-            p = psutil.Process()
-            with self.assertRaises(FileNotFoundError):
-                p.memory_maps()
-            assert m.called
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_zombie(self):
-        # Emulate a case where rlimit() raises ENOSYS, which may
-        # happen in case of zombie process:
-        # https://travis-ci.org/giampaolo/psutil/jobs/51368273
-        with mock.patch("psutil._pslinux.cext.linux_prlimit",
-                        side_effect=OSError(errno.ENOSYS, "")) as m:
-            p = psutil.Process()
-            p.name()
-            with self.assertRaises(psutil.ZombieProcess) as exc:
-                p.rlimit(psutil.RLIMIT_NOFILE)
-            assert m.called
-        self.assertEqual(exc.exception.pid, p.pid)
-        self.assertEqual(exc.exception.name, p.name())
-
-    def test_cwd_zombie(self):
-        with mock.patch("psutil._pslinux.os.readlink",
-                        side_effect=OSError(errno.ENOENT, "")) as m:
-            p = psutil.Process()
-            p.name()
-            with self.assertRaises(psutil.ZombieProcess) as exc:
-                p.cwd()
-            assert m.called
-        self.assertEqual(exc.exception.pid, p.pid)
-        self.assertEqual(exc.exception.name, p.name())
-
-    def test_stat_file_parsing(self):
-        from psutil._pslinux import CLOCK_TICKS
-
-        args = [
-            "0",      # pid
-            "(cat)",  # name
-            "Z",      # status
-            "1",      # ppid
-            "0",      # pgrp
-            "0",      # session
-            "0",      # tty
-            "0",      # tpgid
-            "0",      # flags
-            "0",      # minflt
-            "0",      # cminflt
-            "0",      # majflt
-            "0",      # cmajflt
-            "2",      # utime
-            "3",      # stime
-            "4",      # cutime
-            "5",      # cstime
-            "0",      # priority
-            "0",      # nice
-            "0",      # num_threads
-            "0",      # itrealvalue
-            "6",      # starttime
-            "0",      # vsize
-            "0",      # rss
-            "0",      # rsslim
-            "0",      # startcode
-            "0",      # endcode
-            "0",      # startstack
-            "0",      # kstkesp
-            "0",      # kstkeip
-            "0",      # signal
-            "0",      # blocked
-            "0",      # sigignore
-            "0",      # sigcatch
-            "0",      # wchan
-            "0",      # nswap
-            "0",      # cnswap
-            "0",      # exit_signal
-            "6",      # processor
-            "0",      # rt priority
-            "0",      # policy
-            "7",      # delayacct_blkio_ticks
-        ]
-        content = " ".join(args).encode()
-        with mock_open_content('/proc/%s/stat' % os.getpid(), content):
-            p = psutil.Process()
-            self.assertEqual(p.name(), 'cat')
-            self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-            self.assertEqual(p.ppid(), 1)
-            self.assertEqual(
-                p.create_time(), 6 / CLOCK_TICKS + psutil.boot_time())
-            cpu = p.cpu_times()
-            self.assertEqual(cpu.user, 2 / CLOCK_TICKS)
-            self.assertEqual(cpu.system, 3 / CLOCK_TICKS)
-            self.assertEqual(cpu.children_user, 4 / CLOCK_TICKS)
-            self.assertEqual(cpu.children_system, 5 / CLOCK_TICKS)
-            self.assertEqual(cpu.iowait, 7 / CLOCK_TICKS)
-            self.assertEqual(p.cpu_num(), 6)
-
-    def test_status_file_parsing(self):
-        with mock_open_content(
-            '/proc/%s/status' % os.getpid(),
-            textwrap.dedent("""\
-                Uid:\t1000\t1001\t1002\t1003
-                Gid:\t1004\t1005\t1006\t1007
-                Threads:\t66
-                Cpus_allowed:\tf
-                Cpus_allowed_list:\t0-7
-                voluntary_ctxt_switches:\t12
-                nonvoluntary_ctxt_switches:\t13""").encode()):
-            p = psutil.Process()
-            self.assertEqual(p.num_ctx_switches().voluntary, 12)
-            self.assertEqual(p.num_ctx_switches().involuntary, 13)
-            self.assertEqual(p.num_threads(), 66)
-            uids = p.uids()
-            self.assertEqual(uids.real, 1000)
-            self.assertEqual(uids.effective, 1001)
-            self.assertEqual(uids.saved, 1002)
-            gids = p.gids()
-            self.assertEqual(gids.real, 1004)
-            self.assertEqual(gids.effective, 1005)
-            self.assertEqual(gids.saved, 1006)
-            self.assertEqual(p._proc._get_eligible_cpus(), list(range(0, 8)))
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestProcessAgainstStatus(unittest.TestCase):
-    """/proc/pid/stat and /proc/pid/status have many values in common.
-    Whenever possible, psutil uses /proc/pid/stat (it's faster).
-    For all those cases we check that the value found in
-    /proc/pid/stat (by psutil) matches the one found in
-    /proc/pid/status.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.proc = psutil.Process()
-
-    def read_status_file(self, linestart):
-        with psutil._psplatform.open_text(
-                '/proc/%s/status' % self.proc.pid) as f:
-            for line in f:
-                line = line.strip()
-                if line.startswith(linestart):
-                    value = line.partition('\t')[2]
-                    try:
-                        return int(value)
-                    except ValueError:
-                        return value
-            raise ValueError("can't find %r" % linestart)
-
-    def test_name(self):
-        value = self.read_status_file("Name:")
-        self.assertEqual(self.proc.name(), value)
-
-    def test_status(self):
-        value = self.read_status_file("State:")
-        value = value[value.find('(') + 1:value.rfind(')')]
-        value = value.replace(' ', '-')
-        self.assertEqual(self.proc.status(), value)
-
-    def test_ppid(self):
-        value = self.read_status_file("PPid:")
-        self.assertEqual(self.proc.ppid(), value)
-
-    def test_num_threads(self):
-        value = self.read_status_file("Threads:")
-        self.assertEqual(self.proc.num_threads(), value)
-
-    def test_uids(self):
-        value = self.read_status_file("Uid:")
-        value = tuple(map(int, value.split()[1:4]))
-        self.assertEqual(self.proc.uids(), value)
-
-    def test_gids(self):
-        value = self.read_status_file("Gid:")
-        value = tuple(map(int, value.split()[1:4]))
-        self.assertEqual(self.proc.gids(), value)
-
-    @retry_on_failure()
-    def test_num_ctx_switches(self):
-        value = self.read_status_file("voluntary_ctxt_switches:")
-        self.assertEqual(self.proc.num_ctx_switches().voluntary, value)
-        value = self.read_status_file("nonvoluntary_ctxt_switches:")
-        self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
-
-    def test_cpu_affinity(self):
-        value = self.read_status_file("Cpus_allowed_list:")
-        if '-' in str(value):
-            min_, max_ = map(int, value.split('-'))
-            self.assertEqual(
-                self.proc.cpu_affinity(), list(range(min_, max_ + 1)))
-
-    def test_cpu_affinity_eligible_cpus(self):
-        value = self.read_status_file("Cpus_allowed_list:")
-        with mock.patch("psutil._pslinux.per_cpu_times") as m:
-            self.proc._proc._get_eligible_cpus()
-        if '-' in str(value):
-            assert not m.called
-        else:
-            assert m.called
-
-
-# =====================================================================
-# --- test utils
-# =====================================================================
-
-
-@unittest.skipIf(not LINUX, "LINUX only")
-class TestUtils(unittest.TestCase):
-
-    def test_readlink(self):
-        with mock.patch("os.readlink", return_value="foo (deleted)") as m:
-            self.assertEqual(psutil._psplatform.readlink("bar"), "foo")
-            assert m.called
-
-    def test_cat(self):
-        fname = os.path.abspath(TESTFN)
-        with open(fname, "wt") as f:
-            f.write("foo ")
-        self.assertEqual(psutil._psplatform.cat(TESTFN, binary=False), "foo")
-        self.assertEqual(psutil._psplatform.cat(TESTFN, binary=True), b"foo")
-        self.assertEqual(
-            psutil._psplatform.cat(TESTFN + '??', fallback="bar"), "bar")
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_memory_leaks.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_memory_leaks.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_memory_leaks.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_memory_leaks.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,600 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Tests for detecting function memory leaks (typically the ones
-implemented in C). It does so by calling a function many times and
-checking whether process memory usage keeps increasing between
-calls or over time.
-Note that this may produce false positives (especially on Windows
-for some reason).
-PyPy appears to be completely unstable for this framework, probably
-because of how its JIT handles memory, so tests are skipped.
-"""
-
-from __future__ import print_function
-import functools
-import gc
-import os
-import sys
-import threading
-import time
-
-import psutil
-import psutil._common
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import bytes2human
-from psutil._compat import ProcessLookupError
-from psutil._compat import xrange
-from psutil.tests import CIRRUS
-from psutil.tests import create_sockets
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CPU_AFFINITY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_IONICE
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_PROC_CPU_NUM
-from psutil.tests import HAS_PROC_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TESTFN
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-
-
-# configurable opts
-LOOPS = 1000
-MEMORY_TOLERANCE = 4096
-RETRY_FOR = 3
-SKIP_PYTHON_IMPL = True
-
-cext = psutil._psplatform.cext
-thisproc = psutil.Process()
-
-
-# ===================================================================
-# utils
-# ===================================================================
-
-
-def skip_if_linux():
-    return unittest.skipIf(LINUX and SKIP_PYTHON_IMPL,
-                           "worthless on LINUX (pure python)")
-
-
-@unittest.skipIf(PYPY, "unreliable on PYPY")
-class TestMemLeak(unittest.TestCase):
-    """Base framework class which calls a function many times and
-    produces a failure if process memory usage keeps increasing
-    between calls or over time.
-    """
-    tolerance = MEMORY_TOLERANCE
-    loops = LOOPS
-    retry_for = RETRY_FOR
-
-    def setUp(self):
-        gc.collect()
-
-    def execute(self, fun, *args, **kwargs):
-        """Test a callable."""
-        def call_many_times():
-            for x in xrange(loops):
-                self._call(fun, *args, **kwargs)
-            del x
-            gc.collect()
-
-        tolerance = kwargs.pop('tolerance_', None) or self.tolerance
-        loops = kwargs.pop('loops_', None) or self.loops
-        retry_for = kwargs.pop('retry_for_', None) or self.retry_for
-
-        # warm up
-        for x in range(10):
-            self._call(fun, *args, **kwargs)
-        self.assertEqual(gc.garbage, [])
-        self.assertEqual(threading.active_count(), 1)
-        self.assertEqual(thisproc.children(), [])
-
-        # Get 2 distinct memory samples, before and after having
-        # called fun repeadetly.
-        # step 1
-        call_many_times()
-        mem1 = self._get_mem()
-        # step 2
-        call_many_times()
-        mem2 = self._get_mem()
-
-        diff1 = mem2 - mem1
-        if diff1 > tolerance:
-            # This doesn't necessarily mean we have a leak yet.
-            # At this point we assume that after having called the
-            # function so many times the memory usage is stabilized
-            # and if there are no leaks it should not increase
-            # anymore.
-            # Let's keep calling fun for 3 more seconds and fail if
-            # we notice any difference.
-            ncalls = 0
-            stop_at = time.time() + retry_for
-            while time.time() <= stop_at:
-                self._call(fun, *args, **kwargs)
-                ncalls += 1
-
-            del stop_at
-            gc.collect()
-            mem3 = self._get_mem()
-            diff2 = mem3 - mem2
-
-            if mem3 > mem2:
-                # failure
-                extra_proc_mem = bytes2human(diff1 + diff2)
-                print("exta proc mem: %s" % extra_proc_mem, file=sys.stderr)
-                msg = "+%s after %s calls, +%s after another %s calls, "
-                msg += "+%s extra proc mem"
-                msg = msg % (
-                    bytes2human(diff1), loops, bytes2human(diff2), ncalls,
-                    extra_proc_mem)
-                self.fail(msg)
-
-    def execute_w_exc(self, exc, fun, *args, **kwargs):
-        """Convenience function which tests a callable raising
-        an exception.
-        """
-        def call():
-            self.assertRaises(exc, fun, *args, **kwargs)
-
-        self.execute(call)
-
-    @staticmethod
-    def _get_mem():
-        # By using USS memory it seems it's less likely to bump
-        # into false positives.
-        if LINUX or WINDOWS or MACOS:
-            return thisproc.memory_full_info().uss
-        else:
-            return thisproc.memory_info().rss
-
-    @staticmethod
-    def _call(fun, *args, **kwargs):
-        fun(*args, **kwargs)
-
-
-# ===================================================================
-# Process class
-# ===================================================================
-
-
-class TestProcessObjectLeaks(TestMemLeak):
-    """Test leaks of Process class methods."""
-
-    proc = thisproc
-
-    def test_coverage(self):
-        skip = set((
-            "pid", "as_dict", "children", "cpu_affinity", "cpu_percent",
-            "ionice", "is_running", "kill", "memory_info_ex", "memory_percent",
-            "nice", "oneshot", "parent", "parents", "rlimit", "send_signal",
-            "suspend", "terminate", "wait"))
-        for name in dir(psutil.Process):
-            if name.startswith('_'):
-                continue
-            if name in skip:
-                continue
-            self.assertTrue(hasattr(self, "test_" + name), msg=name)
-
-    @skip_if_linux()
-    def test_name(self):
-        self.execute(self.proc.name)
-
-    @skip_if_linux()
-    def test_cmdline(self):
-        self.execute(self.proc.cmdline)
-
-    @skip_if_linux()
-    def test_exe(self):
-        self.execute(self.proc.exe)
-
-    @skip_if_linux()
-    def test_ppid(self):
-        self.execute(self.proc.ppid)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_uids(self):
-        self.execute(self.proc.uids)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_gids(self):
-        self.execute(self.proc.gids)
-
-    @skip_if_linux()
-    def test_status(self):
-        self.execute(self.proc.status)
-
-    def test_nice_get(self):
-        self.execute(self.proc.nice)
-
-    def test_nice_set(self):
-        niceness = thisproc.nice()
-        self.execute(self.proc.nice, niceness)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    def test_ionice_get(self):
-        self.execute(self.proc.ionice)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    def test_ionice_set(self):
-        if WINDOWS:
-            value = thisproc.ionice()
-            self.execute(self.proc.ionice, value)
-        else:
-            self.execute(self.proc.ionice, psutil.IOPRIO_CLASS_NONE)
-            fun = functools.partial(cext.proc_ioprio_set, os.getpid(), -1, 0)
-            self.execute_w_exc(OSError, fun)
-
-    @unittest.skipIf(not HAS_PROC_IO_COUNTERS, "not supported")
-    @skip_if_linux()
-    def test_io_counters(self):
-        self.execute(self.proc.io_counters)
-
-    @unittest.skipIf(POSIX, "worthless on POSIX")
-    def test_username(self):
-        self.execute(self.proc.username)
-
-    @skip_if_linux()
-    def test_create_time(self):
-        self.execute(self.proc.create_time)
-
-    @skip_if_linux()
-    @skip_on_access_denied(only_if=OPENBSD)
-    def test_num_threads(self):
-        self.execute(self.proc.num_threads)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_num_handles(self):
-        self.execute(self.proc.num_handles)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_num_fds(self):
-        self.execute(self.proc.num_fds)
-
-    @skip_if_linux()
-    def test_num_ctx_switches(self):
-        self.execute(self.proc.num_ctx_switches)
-
-    @skip_if_linux()
-    @skip_on_access_denied(only_if=OPENBSD)
-    def test_threads(self):
-        self.execute(self.proc.threads)
-
-    @skip_if_linux()
-    def test_cpu_times(self):
-        self.execute(self.proc.cpu_times)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_PROC_CPU_NUM, "not supported")
-    def test_cpu_num(self):
-        self.execute(self.proc.cpu_num)
-
-    @skip_if_linux()
-    def test_memory_info(self):
-        self.execute(self.proc.memory_info)
-
-    @skip_if_linux()
-    def test_memory_full_info(self):
-        self.execute(self.proc.memory_full_info)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @skip_if_linux()
-    def test_terminal(self):
-        self.execute(self.proc.terminal)
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_resume(self):
-        self.execute(self.proc.resume)
-
-    @skip_if_linux()
-    def test_cwd(self):
-        self.execute(self.proc.cwd)
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, "not supported")
-    def test_cpu_affinity_get(self):
-        self.execute(self.proc.cpu_affinity)
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, "not supported")
-    def test_cpu_affinity_set(self):
-        affinity = thisproc.cpu_affinity()
-        self.execute(self.proc.cpu_affinity, affinity)
-        if not TRAVIS:
-            self.execute_w_exc(ValueError, self.proc.cpu_affinity, [-1])
-
-    @skip_if_linux()
-    def test_open_files(self):
-        safe_rmpath(TESTFN)  # needed after UNIX socket test has run
-        with open(TESTFN, 'w'):
-            self.execute(self.proc.open_files)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    @skip_if_linux()
-    def test_memory_maps(self):
-        self.execute(self.proc.memory_maps)
-
-    @unittest.skipIf(not LINUX, "LINUX only")
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_get(self):
-        self.execute(self.proc.rlimit, psutil.RLIMIT_NOFILE)
-
-    @unittest.skipIf(not LINUX, "LINUX only")
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_set(self):
-        limit = thisproc.rlimit(psutil.RLIMIT_NOFILE)
-        self.execute(self.proc.rlimit, psutil.RLIMIT_NOFILE, limit)
-        self.execute_w_exc(OSError, self.proc.rlimit, -1)
-
-    @skip_if_linux()
-    # Windows implementation is based on a single system-wide
-    # function (tested later).
-    @unittest.skipIf(WINDOWS, "worthless on WINDOWS")
-    def test_connections(self):
-        # TODO: UNIX sockets are temporarily implemented by parsing
-        # 'pfiles' cmd  output; we don't want that part of the code to
-        # be executed.
-        with create_sockets():
-            kind = 'inet' if SUNOS else 'all'
-            self.execute(self.proc.connections, kind)
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    def test_environ(self):
-        self.execute(self.proc.environ)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_proc_info(self):
-        self.execute(cext.proc_info, os.getpid())
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcessDualImplementation(TestMemLeak):
-
-    def test_cmdline_peb_true(self):
-        self.execute(cext.proc_cmdline, os.getpid(), use_peb=True)
-
-    def test_cmdline_peb_false(self):
-        self.execute(cext.proc_cmdline, os.getpid(), use_peb=False)
-
-
-class TestTerminatedProcessLeaks(TestProcessObjectLeaks):
-    """Repeat the tests above looking for leaks occurring when dealing
-    with terminated processes raising NoSuchProcess exception.
-    The C functions are still invoked but will follow different code
-    paths. We'll check those code paths.
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestTerminatedProcessLeaks, cls).setUpClass()
-        p = get_test_subprocess()
-        cls.proc = psutil.Process(p.pid)
-        cls.proc.kill()
-        cls.proc.wait()
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestTerminatedProcessLeaks, cls).tearDownClass()
-        reap_children()
-
-    def _call(self, fun, *args, **kwargs):
-        try:
-            fun(*args, **kwargs)
-        except psutil.NoSuchProcess:
-            pass
-
-    if WINDOWS:
-
-        def test_kill(self):
-            self.execute(self.proc.kill)
-
-        def test_terminate(self):
-            self.execute(self.proc.terminate)
-
-        def test_suspend(self):
-            self.execute(self.proc.suspend)
-
-        def test_resume(self):
-            self.execute(self.proc.resume)
-
-        def test_wait(self):
-            self.execute(self.proc.wait)
-
-        def test_proc_info(self):
-            # test dual implementation
-            def call():
-                try:
-                    return cext.proc_info(self.proc.pid)
-                except ProcessLookupError:
-                    pass
-
-            self.execute(call)
-
-
-# ===================================================================
-# system APIs
-# ===================================================================
-
-
-class TestModuleFunctionsLeaks(TestMemLeak):
-    """Test leaks of psutil module functions."""
-
-    def test_coverage(self):
-        skip = set((
-            "version_info", "__version__", "process_iter", "wait_procs",
-            "cpu_percent", "cpu_times_percent", "cpu_count"))
-        for name in psutil.__all__:
-            if not name.islower():
-                continue
-            if name in skip:
-                continue
-            self.assertTrue(hasattr(self, "test_" + name), msg=name)
-
-    # --- cpu
-
-    @skip_if_linux()
-    def test_cpu_count_logical(self):
-        self.execute(psutil.cpu_count, logical=True)
-
-    @skip_if_linux()
-    def test_cpu_count_physical(self):
-        self.execute(psutil.cpu_count, logical=False)
-
-    @skip_if_linux()
-    def test_cpu_times(self):
-        self.execute(psutil.cpu_times)
-
-    @skip_if_linux()
-    def test_per_cpu_times(self):
-        self.execute(psutil.cpu_times, percpu=True)
-
-    @skip_if_linux()
-    def test_cpu_stats(self):
-        self.execute(psutil.cpu_stats)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-    def test_cpu_freq(self):
-        self.execute(psutil.cpu_freq)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_getloadavg(self):
-        self.execute(psutil.getloadavg)
-
-    # --- mem
-
-    def test_virtual_memory(self):
-        self.execute(psutil.virtual_memory)
-
-    # TODO: remove this skip when this gets fixed
-    @unittest.skipIf(SUNOS, "worthless on SUNOS (uses a subprocess)")
-    def test_swap_memory(self):
-        self.execute(psutil.swap_memory)
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_pid_exists(self):
-        self.execute(psutil.pid_exists, os.getpid())
-
-    # --- disk
-
-    @unittest.skipIf(POSIX and SKIP_PYTHON_IMPL,
-                     "worthless on POSIX (pure python)")
-    def test_disk_usage(self):
-        self.execute(psutil.disk_usage, '.')
-
-    def test_disk_partitions(self):
-        self.execute(psutil.disk_partitions)
-
-    @unittest.skipIf(LINUX and not os.path.exists('/proc/diskstats'),
-                     '/proc/diskstats not available on this Linux version')
-    @skip_if_linux()
-    def test_disk_io_counters(self):
-        self.execute(psutil.disk_io_counters, nowrap=False)
-
-    # --- proc
-
-    @skip_if_linux()
-    def test_pids(self):
-        self.execute(psutil.pids)
-
-    # --- net
-
-    @unittest.skipIf(TRAVIS and MACOS, "false positive on TRAVIS + MACOS")
-    @unittest.skipIf(CIRRUS and FREEBSD, "false positive on CIRRUS + FREEBSD")
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        self.execute(psutil.net_io_counters, nowrap=False)
-
-    @skip_if_linux()
-    @unittest.skipIf(MACOS and os.getuid() != 0, "need root access")
-    def test_net_connections(self):
-        with create_sockets():
-            self.execute(psutil.net_connections)
-
-    def test_net_if_addrs(self):
-        # Note: verified that on Windows this was a false positive.
-        self.execute(psutil.net_if_addrs,
-                     tolerance_=80 * 1024 if WINDOWS else None)
-
-    @unittest.skipIf(TRAVIS, "EPERM on travis")
-    def test_net_if_stats(self):
-        self.execute(psutil.net_if_stats)
-
-    # --- sensors
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    def test_sensors_battery(self):
-        self.execute(psutil.sensors_battery)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        self.execute(psutil.sensors_temperatures)
-
-    @skip_if_linux()
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        self.execute(psutil.sensors_fans)
-
-    # --- others
-
-    @skip_if_linux()
-    def test_boot_time(self):
-        self.execute(psutil.boot_time)
-
-    @unittest.skipIf(WINDOWS, "XXX produces a false positive on Windows")
-    def test_users(self):
-        self.execute(psutil.users)
-
-    if WINDOWS:
-
-        # --- win services
-
-        def test_win_service_iter(self):
-            self.execute(cext.winservice_enumerate)
-
-        def test_win_service_get(self):
-            pass
-
-        def test_win_service_get_config(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_config, name)
-
-        def test_win_service_get_status(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_status, name)
-
-        def test_win_service_get_description(self):
-            name = next(psutil.win_service_iter()).name()
-            self.execute(cext.winservice_query_descr, name)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_misc.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_misc.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_misc.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_misc.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1065 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Miscellaneous tests.
-"""
-
-import ast
-import collections
-import contextlib
-import errno
-import json
-import os
-import pickle
-import socket
-import stat
-
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import NETBSD
-from psutil import POSIX
-from psutil import WINDOWS
-from psutil._common import memoize
-from psutil._common import memoize_when_activated
-from psutil._common import supports_ipv6
-from psutil._common import wrap_numbers
-from psutil._common import open_text
-from psutil._common import open_binary
-from psutil._compat import PY3
-from psutil.tests import APPVEYOR
-from psutil.tests import bind_socket
-from psutil.tests import bind_unix_socket
-from psutil.tests import call_until
-from psutil.tests import chdir
-from psutil.tests import CI_TESTING
-from psutil.tests import create_proc_children_pair
-from psutil.tests import create_sockets
-from psutil.tests import create_zombie_proc
-from psutil.tests import DEVNULL
-from psutil.tests import get_free_port
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import import_module_by_path
-from psutil.tests import is_namedtuple
-from psutil.tests import mock
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import reload_module
-from psutil.tests import retry
-from psutil.tests import ROOT_DIR
-from psutil.tests import safe_mkdir
-from psutil.tests import safe_rmpath
-from psutil.tests import SCRIPTS_DIR
-from psutil.tests import sh
-from psutil.tests import tcp_socketpair
-from psutil.tests import TESTFN
-from psutil.tests import TOX
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-from psutil.tests import unix_socketpair
-from psutil.tests import wait_for_file
-from psutil.tests import wait_for_pid
-import psutil
-import psutil.tests
-
-
-# ===================================================================
-# --- Misc / generic tests.
-# ===================================================================
-
-
-class TestMisc(unittest.TestCase):
-
-    def test_process__repr__(self, func=repr):
-        p = psutil.Process()
-        r = func(p)
-        self.assertIn("psutil.Process", r)
-        self.assertIn("pid=%s" % p.pid, r)
-        self.assertIn("name=", r)
-        self.assertIn(p.name(), r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.ZombieProcess(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertIn("zombie", r)
-            self.assertNotIn("name=", r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.NoSuchProcess(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertIn("terminated", r)
-            self.assertNotIn("name=", r)
-        with mock.patch.object(psutil.Process, "name",
-                               side_effect=psutil.AccessDenied(os.getpid())):
-            p = psutil.Process()
-            r = func(p)
-            self.assertIn("pid=%s" % p.pid, r)
-            self.assertNotIn("name=", r)
-
-    def test_process__str__(self):
-        self.test_process__repr__(func=str)
-
-    def test_no_such_process__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321)),
-            "psutil.NoSuchProcess process no longer exists (pid=321)")
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321, name='foo')),
-            "psutil.NoSuchProcess process no longer exists (pid=321, "
-            "name='foo')")
-        self.assertEqual(
-            repr(psutil.NoSuchProcess(321, msg='foo')),
-            "psutil.NoSuchProcess foo")
-
-    def test_zombie_process__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321)),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321)")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, name='foo')),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321, name='foo')")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, name='foo', ppid=1)),
-            "psutil.ZombieProcess process still exists but it's a zombie "
-            "(pid=321, name='foo', ppid=1)")
-        self.assertEqual(
-            repr(psutil.ZombieProcess(321, msg='foo')),
-            "psutil.ZombieProcess foo")
-
-    def test_access_denied__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.AccessDenied(321)),
-            "psutil.AccessDenied (pid=321)")
-        self.assertEqual(
-            repr(psutil.AccessDenied(321, name='foo')),
-            "psutil.AccessDenied (pid=321, name='foo')")
-        self.assertEqual(
-            repr(psutil.AccessDenied(321, msg='foo')),
-            "psutil.AccessDenied foo")
-
-    def test_timeout_expired__repr__(self, func=repr):
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321)),
-            "psutil.TimeoutExpired timeout after 321 seconds")
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321, pid=111)),
-            "psutil.TimeoutExpired timeout after 321 seconds (pid=111)")
-        self.assertEqual(
-            repr(psutil.TimeoutExpired(321, pid=111, name='foo')),
-            "psutil.TimeoutExpired timeout after 321 seconds "
-            "(pid=111, name='foo')")
-
-    def test_process__eq__(self):
-        p1 = psutil.Process()
-        p2 = psutil.Process()
-        self.assertEqual(p1, p2)
-        p2._ident = (0, 0)
-        self.assertNotEqual(p1, p2)
-        self.assertNotEqual(p1, 'foo')
-
-    def test_process__hash__(self):
-        s = set([psutil.Process(), psutil.Process()])
-        self.assertEqual(len(s), 1)
-
-    def test__all__(self):
-        dir_psutil = dir(psutil)
-        for name in dir_psutil:
-            if name in ('callable', 'error', 'namedtuple', 'tests',
-                        'long', 'test', 'NUM_CPUS', 'BOOT_TIME',
-                        'TOTAL_PHYMEM', 'PermissionError',
-                        'ProcessLookupError'):
-                continue
-            if not name.startswith('_'):
-                try:
-                    __import__(name)
-                except ImportError:
-                    if name not in psutil.__all__:
-                        fun = getattr(psutil, name)
-                        if fun is None:
-                            continue
-                        if (fun.__doc__ is not None and
-                                'deprecated' not in fun.__doc__.lower()):
-                            self.fail('%r not in psutil.__all__' % name)
-
-        # Import 'star' will break if __all__ is inconsistent, see:
-        # https://github.com/giampaolo/psutil/issues/656
-        # Can't do `from psutil import *` as it won't work on python 3
-        # so we simply iterate over __all__.
-        for name in psutil.__all__:
-            self.assertIn(name, dir_psutil)
-
-    def test_version(self):
-        self.assertEqual('.'.join([str(x) for x in psutil.version_info]),
-                         psutil.__version__)
-
-    def test_process_as_dict_no_new_names(self):
-        # See https://github.com/giampaolo/psutil/issues/813
-        p = psutil.Process()
-        p.foo = '1'
-        self.assertNotIn('foo', p.as_dict())
-
-    def test_memoize(self):
-        @memoize
-        def foo(*args, **kwargs):
-            "foo docstring"
-            calls.append(None)
-            return (args, kwargs)
-
-        calls = []
-        # no args
-        for x in range(2):
-            ret = foo()
-            expected = ((), {})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 1)
-        # with args
-        for x in range(2):
-            ret = foo(1)
-            expected = ((1, ), {})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 2)
-        # with args + kwargs
-        for x in range(2):
-            ret = foo(1, bar=2)
-            expected = ((1, ), {'bar': 2})
-            self.assertEqual(ret, expected)
-            self.assertEqual(len(calls), 3)
-        # clear cache
-        foo.cache_clear()
-        ret = foo()
-        expected = ((), {})
-        self.assertEqual(ret, expected)
-        self.assertEqual(len(calls), 4)
-        # docstring
-        self.assertEqual(foo.__doc__, "foo docstring")
-
-    def test_memoize_when_activated(self):
-        class Foo:
-
-            @memoize_when_activated
-            def foo(self):
-                calls.append(None)
-
-        f = Foo()
-        calls = []
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 2)
-
-        # activate
-        calls = []
-        f.foo.cache_activate(f)
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 1)
-
-        # deactivate
-        calls = []
-        f.foo.cache_deactivate(f)
-        f.foo()
-        f.foo()
-        self.assertEqual(len(calls), 2)
-
-    def test_parse_environ_block(self):
-        from psutil._common import parse_environ_block
-
-        def k(s):
-            return s.upper() if WINDOWS else s
-
-        self.assertEqual(parse_environ_block("a=1\0"),
-                         {k("a"): "1"})
-        self.assertEqual(parse_environ_block("a=1\0b=2\0\0"),
-                         {k("a"): "1", k("b"): "2"})
-        self.assertEqual(parse_environ_block("a=1\0b=\0\0"),
-                         {k("a"): "1", k("b"): ""})
-        # ignore everything after \0\0
-        self.assertEqual(parse_environ_block("a=1\0b=2\0\0c=3\0"),
-                         {k("a"): "1", k("b"): "2"})
-        # ignore everything that is not an assignment
-        self.assertEqual(parse_environ_block("xxx\0a=1\0"), {k("a"): "1"})
-        self.assertEqual(parse_environ_block("a=1\0=b=2\0"), {k("a"): "1"})
-        # do not fail if the block is incomplete
-        self.assertEqual(parse_environ_block("a=1\0b=2"), {k("a"): "1"})
-
-    def test_supports_ipv6(self):
-        self.addCleanup(supports_ipv6.cache_clear)
-        if supports_ipv6():
-            with mock.patch('psutil._common.socket') as s:
-                s.has_ipv6 = False
-                supports_ipv6.cache_clear()
-                assert not supports_ipv6()
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket',
-                            side_effect=socket.error) as s:
-                assert not supports_ipv6()
-                assert s.called
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket',
-                            side_effect=socket.gaierror) as s:
-                assert not supports_ipv6()
-                supports_ipv6.cache_clear()
-                assert s.called
-
-            supports_ipv6.cache_clear()
-            with mock.patch('psutil._common.socket.socket.bind',
-                            side_effect=socket.gaierror) as s:
-                assert not supports_ipv6()
-                supports_ipv6.cache_clear()
-                assert s.called
-        else:
-            with self.assertRaises(Exception):
-                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-                sock.bind(("::1", 0))
-
-    def test_isfile_strict(self):
-        from psutil._common import isfile_strict
-        this_file = os.path.abspath(__file__)
-        assert isfile_strict(this_file)
-        assert not isfile_strict(os.path.dirname(this_file))
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EPERM, "foo")):
-            self.assertRaises(OSError, isfile_strict, this_file)
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EACCES, "foo")):
-            self.assertRaises(OSError, isfile_strict, this_file)
-        with mock.patch('psutil._common.os.stat',
-                        side_effect=OSError(errno.EINVAL, "foo")):
-            assert not isfile_strict(this_file)
-        with mock.patch('psutil._common.stat.S_ISREG', return_value=False):
-            assert not isfile_strict(this_file)
-
-    def test_serialization(self):
-        def check(ret):
-            if json is not None:
-                json.loads(json.dumps(ret))
-            a = pickle.dumps(ret)
-            b = pickle.loads(a)
-            self.assertEqual(ret, b)
-
-        check(psutil.Process().as_dict())
-        check(psutil.virtual_memory())
-        check(psutil.swap_memory())
-        check(psutil.cpu_times())
-        check(psutil.cpu_times_percent(interval=0))
-        check(psutil.net_io_counters())
-        if LINUX and not os.path.exists('/proc/diskstats'):
-            pass
-        else:
-            if not APPVEYOR:
-                check(psutil.disk_io_counters())
-        check(psutil.disk_partitions())
-        check(psutil.disk_usage(os.getcwd()))
-        check(psutil.users())
-
-    def test_setup_script(self):
-        setup_py = os.path.join(ROOT_DIR, 'setup.py')
-        if TRAVIS and not os.path.exists(setup_py):
-            return self.skipTest("can't find setup.py")
-        module = import_module_by_path(setup_py)
-        self.assertRaises(SystemExit, module.setup)
-        self.assertEqual(module.get_version(), psutil.__version__)
-
-    def test_ad_on_process_creation(self):
-        # We are supposed to be able to instantiate Process also in case
-        # of zombie processes or access denied.
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=psutil.AccessDenied) as meth:
-            psutil.Process()
-            assert meth.called
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=psutil.ZombieProcess(1)) as meth:
-            psutil.Process()
-            assert meth.called
-        with mock.patch.object(psutil.Process, 'create_time',
-                               side_effect=ValueError) as meth:
-            with self.assertRaises(ValueError):
-                psutil.Process()
-            assert meth.called
-
-    def test_sanity_version_check(self):
-        # see: https://github.com/giampaolo/psutil/issues/564
-        with mock.patch(
-                "psutil._psplatform.cext.version", return_value="0.0.0"):
-            with self.assertRaises(ImportError) as cm:
-                reload_module(psutil)
-            self.assertIn("version conflict", str(cm.exception).lower())
-
-
-# ===================================================================
-# --- Tests for wrap_numbers() function.
-# ===================================================================
-
-
-nt = collections.namedtuple('foo', 'a b c')
-
-
-class TestWrapNumbers(unittest.TestCase):
-
-    def setUp(self):
-        wrap_numbers.cache_clear()
-
-    tearDown = setUp
-
-    def test_first_call(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_input_hasnt_changed(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_increase_but_no_wrap(self):
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(10, 15, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(20, 25, 30)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(20, 25, 30)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_wrap(self):
-        # let's say 100 is the threshold
-        input = {'disk1': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # first wrap restarts from 10
-        input = {'disk1': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 110)})
-        # then it remains the same
-        input = {'disk1': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 110)})
-        # then it goes up
-        input = {'disk1': nt(100, 100, 90)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 190)})
-        # then it wraps again
-        input = {'disk1': nt(100, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 210)})
-        # and remains the same
-        input = {'disk1': nt(100, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(100, 100, 210)})
-        # now wrap another num
-        input = {'disk1': nt(50, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(150, 100, 210)})
-        # and again
-        input = {'disk1': nt(40, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(190, 100, 210)})
-        # keep it the same
-        input = {'disk1': nt(40, 100, 20)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(190, 100, 210)})
-
-    def test_changing_keys(self):
-        # Emulate a case where the second call to disk_io()
-        # (or whatever) provides a new disk, then the new disk
-        # disappears on the third call.
-        input = {'disk1': nt(5, 5, 5)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(5, 5, 5),
-                 'disk2': nt(7, 7, 7)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        input = {'disk1': nt(8, 8, 8)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-    def test_changing_keys_w_wrap(self):
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # disk 2 wraps
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(50, 50, 50),
-                          'disk2': nt(100, 100, 110)})
-        # disk 2 disappears
-        input = {'disk1': nt(50, 50, 50)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-
-        # then it appears again; the old wrap is supposed to be
-        # gone.
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # remains the same
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 100)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'), input)
-        # and then wraps again
-        input = {'disk1': nt(50, 50, 50),
-                 'disk2': nt(100, 100, 10)}
-        self.assertEqual(wrap_numbers(input, 'disk_io'),
-                         {'disk1': nt(50, 50, 50),
-                          'disk2': nt(100, 100, 110)})
-
-    def test_real_data(self):
-        d = {'nvme0n1': (300, 508, 640, 1571, 5970, 1987, 2049, 451751, 47048),
-             'nvme0n1p1': (1171, 2, 5600256, 1024, 516, 0, 0, 0, 8),
-             'nvme0n1p2': (54, 54, 2396160, 5165056, 4, 24, 30, 1207, 28),
-             'nvme0n1p3': (2389, 4539, 5154, 150, 4828, 1844, 2019, 398, 348)}
-        self.assertEqual(wrap_numbers(d, 'disk_io'), d)
-        self.assertEqual(wrap_numbers(d, 'disk_io'), d)
-        # decrease this   ↓
-        d = {'nvme0n1': (100, 508, 640, 1571, 5970, 1987, 2049, 451751, 47048),
-             'nvme0n1p1': (1171, 2, 5600256, 1024, 516, 0, 0, 0, 8),
-             'nvme0n1p2': (54, 54, 2396160, 5165056, 4, 24, 30, 1207, 28),
-             'nvme0n1p3': (2389, 4539, 5154, 150, 4828, 1844, 2019, 398, 348)}
-        out = wrap_numbers(d, 'disk_io')
-        self.assertEqual(out['nvme0n1'][0], 400)
-
-    # --- cache tests
-
-    def test_cache_first_call(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(cache[1], {'disk_io': {}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_call_twice(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        input = {'disk1': nt(10, 10, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 0}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_wrap(self):
-        # let's say 100 is the threshold
-        input = {'disk1': nt(100, 100, 100)}
-        wrap_numbers(input, 'disk_io')
-
-        # first wrap restarts from 10
-        input = {'disk1': nt(100, 100, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 100}})
-        self.assertEqual(cache[2], {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-        def assert_():
-            cache = wrap_numbers.cache_info()
-            self.assertEqual(
-                cache[1],
-                {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0,
-                             ('disk1', 2): 100}})
-            self.assertEqual(cache[2],
-                             {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-        # then it remains the same
-        input = {'disk1': nt(100, 100, 10)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        assert_()
-
-        # then it goes up
-        input = {'disk1': nt(100, 100, 90)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        assert_()
-
-        # then it wraps again
-        input = {'disk1': nt(100, 100, 20)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 190}})
-        self.assertEqual(cache[2], {'disk_io': {'disk1': set([('disk1', 2)])}})
-
-    def test_cache_changing_keys(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        input = {'disk1': nt(5, 5, 5),
-                 'disk2': nt(7, 7, 7)}
-        wrap_numbers(input, 'disk_io')
-        cache = wrap_numbers.cache_info()
-        self.assertEqual(cache[0], {'disk_io': input})
-        self.assertEqual(
-            cache[1],
-            {'disk_io': {('disk1', 0): 0, ('disk1', 1): 0, ('disk1', 2): 0}})
-        self.assertEqual(cache[2], {'disk_io': {}})
-
-    def test_cache_clear(self):
-        input = {'disk1': nt(5, 5, 5)}
-        wrap_numbers(input, 'disk_io')
-        wrap_numbers(input, 'disk_io')
-        wrap_numbers.cache_clear('disk_io')
-        self.assertEqual(wrap_numbers.cache_info(), ({}, {}, {}))
-        wrap_numbers.cache_clear('disk_io')
-        wrap_numbers.cache_clear('?!?')
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_cache_clear_public_apis(self):
-        if not psutil.disk_io_counters() or not psutil.net_io_counters():
-            return self.skipTest("no disks or NICs available")
-        psutil.disk_io_counters()
-        psutil.net_io_counters()
-        caches = wrap_numbers.cache_info()
-        for cache in caches:
-            self.assertIn('psutil.disk_io_counters', cache)
-            self.assertIn('psutil.net_io_counters', cache)
-
-        psutil.disk_io_counters.cache_clear()
-        caches = wrap_numbers.cache_info()
-        for cache in caches:
-            self.assertIn('psutil.net_io_counters', cache)
-            self.assertNotIn('psutil.disk_io_counters', cache)
-
-        psutil.net_io_counters.cache_clear()
-        caches = wrap_numbers.cache_info()
-        self.assertEqual(caches, ({}, {}, {}))
-
-
-# ===================================================================
-# --- Example script tests
-# ===================================================================
-
-
-@unittest.skipIf(TOX, "can't test on TOX")
-# See: https://travis-ci.org/giampaolo/psutil/jobs/295224806
-@unittest.skipIf(TRAVIS and not os.path.exists(SCRIPTS_DIR),
-                 "can't locate scripts directory")
-class TestScripts(unittest.TestCase):
-    """Tests for scripts in the "scripts" directory."""
-
-    @staticmethod
-    def assert_stdout(exe, *args, **kwargs):
-        exe = '%s' % os.path.join(SCRIPTS_DIR, exe)
-        cmd = [PYTHON_EXE, exe]
-        for arg in args:
-            cmd.append(arg)
-        try:
-            out = sh(cmd, **kwargs).strip()
-        except RuntimeError as err:
-            if 'AccessDenied' in str(err):
-                return str(err)
-            else:
-                raise
-        assert out, out
-        return out
-
-    @staticmethod
-    def assert_syntax(exe, args=None):
-        exe = os.path.join(SCRIPTS_DIR, exe)
-        if PY3:
-            f = open(exe, 'rt', encoding='utf8')
-        else:
-            f = open(exe, 'rt')
-        with f:
-            src = f.read()
-        ast.parse(src)
-
-    def test_coverage(self):
-        # make sure all example scripts have a test method defined
-        meths = dir(self)
-        for name in os.listdir(SCRIPTS_DIR):
-            if name.endswith('.py'):
-                if 'test_' + os.path.splitext(name)[0] not in meths:
-                    # self.assert_stdout(name)
-                    self.fail('no test defined for %r script'
-                              % os.path.join(SCRIPTS_DIR, name))
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_executable(self):
-        for name in os.listdir(SCRIPTS_DIR):
-            if name.endswith('.py'):
-                path = os.path.join(SCRIPTS_DIR, name)
-                if not stat.S_IXUSR & os.stat(path)[stat.ST_MODE]:
-                    self.fail('%r is not executable' % path)
-
-    def test_disk_usage(self):
-        self.assert_stdout('disk_usage.py')
-
-    def test_free(self):
-        self.assert_stdout('free.py')
-
-    def test_meminfo(self):
-        self.assert_stdout('meminfo.py')
-
-    def test_procinfo(self):
-        self.assert_stdout('procinfo.py', str(os.getpid()))
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "no users")
-    def test_who(self):
-        self.assert_stdout('who.py')
-
-    def test_ps(self):
-        self.assert_stdout('ps.py')
-
-    def test_pstree(self):
-        self.assert_stdout('pstree.py')
-
-    def test_netstat(self):
-        self.assert_stdout('netstat.py')
-
-    # permission denied on travis
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_ifconfig(self):
-        self.assert_stdout('ifconfig.py')
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_pmap(self):
-        self.assert_stdout('pmap.py', str(os.getpid()))
-
-    def test_procsmem(self):
-        if 'uss' not in psutil.Process().memory_full_info()._fields:
-            raise self.skipTest("not supported")
-        self.assert_stdout('procsmem.py', stderr=DEVNULL)
-
-    def test_killall(self):
-        self.assert_syntax('killall.py')
-
-    def test_nettop(self):
-        self.assert_syntax('nettop.py')
-
-    def test_top(self):
-        self.assert_syntax('top.py')
-
-    def test_iotop(self):
-        self.assert_syntax('iotop.py')
-
-    def test_pidof(self):
-        output = self.assert_stdout('pidof.py', psutil.Process().name())
-        self.assertIn(str(os.getpid()), output)
-
-    @unittest.skipIf(not WINDOWS, "WINDOWS only")
-    def test_winservices(self):
-        self.assert_stdout('winservices.py')
-
-    def test_cpu_distribution(self):
-        self.assert_syntax('cpu_distribution.py')
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_temperatures(self):
-        if not psutil.sensors_temperatures():
-            self.skipTest("no temperatures")
-        self.assert_stdout('temperatures.py')
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    def test_fans(self):
-        if not psutil.sensors_fans():
-            self.skipTest("no fans")
-        self.assert_stdout('fans.py')
-
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_battery(self):
-        self.assert_stdout('battery.py')
-
-    def test_sensors(self):
-        self.assert_stdout('sensors.py')
-
-
-# ===================================================================
-# --- Unit tests for test utilities.
-# ===================================================================
-
-
-class TestRetryDecorator(unittest.TestCase):
-
-    @mock.patch('time.sleep')
-    def test_retry_success(self, sleep):
-        # Fail 3 times out of 5; make sure the decorated fun returns.
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            while queue:
-                queue.pop()
-                1 / 0
-            return 1
-
-        queue = list(range(3))
-        self.assertEqual(foo(), 1)
-        self.assertEqual(sleep.call_count, 3)
-
-    @mock.patch('time.sleep')
-    def test_retry_failure(self, sleep):
-        # Fail 6 times out of 5; th function is supposed to raise exc.
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            while queue:
-                queue.pop()
-                1 / 0
-            return 1
-
-        queue = list(range(6))
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 5)
-
-    @mock.patch('time.sleep')
-    def test_exception_arg(self, sleep):
-        @retry(exception=ValueError, interval=1)
-        def foo():
-            raise TypeError
-
-        self.assertRaises(TypeError, foo)
-        self.assertEqual(sleep.call_count, 0)
-
-    @mock.patch('time.sleep')
-    def test_no_interval_arg(self, sleep):
-        # if interval is not specified sleep is not supposed to be called
-
-        @retry(retries=5, interval=None, logfun=None)
-        def foo():
-            1 / 0
-
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 0)
-
-    @mock.patch('time.sleep')
-    def test_retries_arg(self, sleep):
-
-        @retry(retries=5, interval=1, logfun=None)
-        def foo():
-            1 / 0
-
-        self.assertRaises(ZeroDivisionError, foo)
-        self.assertEqual(sleep.call_count, 5)
-
-    @mock.patch('time.sleep')
-    def test_retries_and_timeout_args(self, sleep):
-        self.assertRaises(ValueError, retry, retries=5, timeout=1)
-
-
-class TestSyncTestUtils(unittest.TestCase):
-
-    def tearDown(self):
-        safe_rmpath(TESTFN)
-
-    def test_wait_for_pid(self):
-        wait_for_pid(os.getpid())
-        nopid = max(psutil.pids()) + 99999
-        with mock.patch('psutil.tests.retry.__iter__', return_value=iter([0])):
-            self.assertRaises(psutil.NoSuchProcess, wait_for_pid, nopid)
-
-    def test_wait_for_file(self):
-        with open(TESTFN, 'w') as f:
-            f.write('foo')
-        wait_for_file(TESTFN)
-        assert not os.path.exists(TESTFN)
-
-    def test_wait_for_file_empty(self):
-        with open(TESTFN, 'w'):
-            pass
-        wait_for_file(TESTFN, empty=True)
-        assert not os.path.exists(TESTFN)
-
-    def test_wait_for_file_no_file(self):
-        with mock.patch('psutil.tests.retry.__iter__', return_value=iter([0])):
-            self.assertRaises(IOError, wait_for_file, TESTFN)
-
-    def test_wait_for_file_no_delete(self):
-        with open(TESTFN, 'w') as f:
-            f.write('foo')
-        wait_for_file(TESTFN, delete=False)
-        assert os.path.exists(TESTFN)
-
-    def test_call_until(self):
-        ret = call_until(lambda: 1, "ret == 1")
-        self.assertEqual(ret, 1)
-
-
-class TestFSTestUtils(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    tearDown = setUp
-
-    def test_open_text(self):
-        with open_text(__file__) as f:
-            self.assertEqual(f.mode, 'rt')
-
-    def test_open_binary(self):
-        with open_binary(__file__) as f:
-            self.assertEqual(f.mode, 'rb')
-
-    def test_safe_mkdir(self):
-        safe_mkdir(TESTFN)
-        assert os.path.isdir(TESTFN)
-        safe_mkdir(TESTFN)
-        assert os.path.isdir(TESTFN)
-
-    def test_safe_rmpath(self):
-        # test file is removed
-        open(TESTFN, 'w').close()
-        safe_rmpath(TESTFN)
-        assert not os.path.exists(TESTFN)
-        # test no exception if path does not exist
-        safe_rmpath(TESTFN)
-        # test dir is removed
-        os.mkdir(TESTFN)
-        safe_rmpath(TESTFN)
-        assert not os.path.exists(TESTFN)
-        # test other exceptions are raised
-        with mock.patch('psutil.tests.os.stat',
-                        side_effect=OSError(errno.EINVAL, "")) as m:
-            with self.assertRaises(OSError):
-                safe_rmpath(TESTFN)
-            assert m.called
-
-    def test_chdir(self):
-        base = os.getcwd()
-        os.mkdir(TESTFN)
-        with chdir(TESTFN):
-            self.assertEqual(os.getcwd(), os.path.join(base, TESTFN))
-        self.assertEqual(os.getcwd(), base)
-
-
-class TestProcessUtils(unittest.TestCase):
-
-    def test_reap_children(self):
-        subp = get_test_subprocess()
-        p = psutil.Process(subp.pid)
-        assert p.is_running()
-        reap_children()
-        assert not p.is_running()
-        assert not psutil.tests._pids_started
-        assert not psutil.tests._subprocesses_started
-
-    def test_create_proc_children_pair(self):
-        p1, p2 = create_proc_children_pair()
-        self.assertNotEqual(p1.pid, p2.pid)
-        assert p1.is_running()
-        assert p2.is_running()
-        children = psutil.Process().children(recursive=True)
-        self.assertEqual(len(children), 2)
-        self.assertIn(p1, children)
-        self.assertIn(p2, children)
-        self.assertEqual(p1.ppid(), os.getpid())
-        self.assertEqual(p2.ppid(), p1.pid)
-
-        # make sure both of them are cleaned up
-        reap_children()
-        assert not p1.is_running()
-        assert not p2.is_running()
-        assert not psutil.tests._pids_started
-        assert not psutil.tests._subprocesses_started
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_create_zombie_proc(self):
-        zpid = create_zombie_proc()
-        self.addCleanup(reap_children, recursive=True)
-        p = psutil.Process(zpid)
-        self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-
-
-class TestNetUtils(unittest.TestCase):
-
-    def bind_socket(self):
-        port = get_free_port()
-        with contextlib.closing(bind_socket(addr=('', port))) as s:
-            self.assertEqual(s.getsockname()[1], port)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_bind_unix_socket(self):
-        with unix_socket_path() as name:
-            sock = bind_unix_socket(name)
-            with contextlib.closing(sock):
-                self.assertEqual(sock.family, socket.AF_UNIX)
-                self.assertEqual(sock.type, socket.SOCK_STREAM)
-                self.assertEqual(sock.getsockname(), name)
-                assert os.path.exists(name)
-                assert stat.S_ISSOCK(os.stat(name).st_mode)
-        # UDP
-        with unix_socket_path() as name:
-            sock = bind_unix_socket(name, type=socket.SOCK_DGRAM)
-            with contextlib.closing(sock):
-                self.assertEqual(sock.type, socket.SOCK_DGRAM)
-
-    def tcp_tcp_socketpair(self):
-        addr = ("127.0.0.1", get_free_port())
-        server, client = tcp_socketpair(socket.AF_INET, addr=addr)
-        with contextlib.closing(server):
-            with contextlib.closing(client):
-                # Ensure they are connected and the positions are
-                # correct.
-                self.assertEqual(server.getsockname(), addr)
-                self.assertEqual(client.getpeername(), addr)
-                self.assertNotEqual(client.getsockname(), addr)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @unittest.skipIf(NETBSD or FREEBSD,
-                     "/var/run/log UNIX socket opened by default")
-    def test_unix_socketpair(self):
-        p = psutil.Process()
-        num_fds = p.num_fds()
-        assert not p.connections(kind='unix')
-        with unix_socket_path() as name:
-            server, client = unix_socketpair(name)
-            try:
-                assert os.path.exists(name)
-                assert stat.S_ISSOCK(os.stat(name).st_mode)
-                self.assertEqual(p.num_fds() - num_fds, 2)
-                self.assertEqual(len(p.connections(kind='unix')), 2)
-                self.assertEqual(server.getsockname(), name)
-                self.assertEqual(client.getpeername(), name)
-            finally:
-                client.close()
-                server.close()
-
-    def test_create_sockets(self):
-        with create_sockets() as socks:
-            fams = collections.defaultdict(int)
-            types = collections.defaultdict(int)
-            for s in socks:
-                fams[s.family] += 1
-                # work around http://bugs.python.org/issue30204
-                types[s.getsockopt(socket.SOL_SOCKET, socket.SO_TYPE)] += 1
-            self.assertGreaterEqual(fams[socket.AF_INET], 2)
-            if supports_ipv6():
-                self.assertGreaterEqual(fams[socket.AF_INET6], 2)
-            if POSIX and HAS_CONNECTIONS_UNIX:
-                self.assertGreaterEqual(fams[socket.AF_UNIX], 2)
-            self.assertGreaterEqual(types[socket.SOCK_STREAM], 2)
-            self.assertGreaterEqual(types[socket.SOCK_DGRAM], 2)
-
-
-class TestOtherUtils(unittest.TestCase):
-
-    def test_is_namedtuple(self):
-        assert is_namedtuple(collections.namedtuple('foo', 'a b c')(1, 2, 3))
-        assert not is_namedtuple(tuple())
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_osx.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_osx.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_osx.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_osx.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,294 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""MACOS specific tests."""
-
-import os
-import re
-import time
-
-import psutil
-from psutil import MACOS
-from psutil.tests import create_zombie_proc
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import MEMORY_TOLERANCE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-PAGESIZE = os.sysconf("SC_PAGE_SIZE") if MACOS else None
-
-
-def sysctl(cmdline):
-    """Expects a sysctl command with an argument and parse the result
-    returning only the value of interest.
-    """
-    out = sh(cmdline)
-    result = out.split()[1]
-    try:
-        return int(result)
-    except ValueError:
-        return result
-
-
-def vm_stat(field):
-    """Wrapper around 'vm_stat' cmdline utility."""
-    out = sh('vm_stat')
-    for line in out.split('\n'):
-        if field in line:
-            break
-    else:
-        raise ValueError("line not found")
-    return int(re.search(r'\d+', line).group(0)) * PAGESIZE
-
-
-# http://code.activestate.com/recipes/578019/
-def human2bytes(s):
-    SYMBOLS = {
-        'customary': ('B', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'),
-    }
-    init = s
-    num = ""
-    while s and s[0:1].isdigit() or s[0:1] == '.':
-        num += s[0]
-        s = s[1:]
-    num = float(num)
-    letter = s.strip()
-    for name, sset in SYMBOLS.items():
-        if letter in sset:
-            break
-    else:
-        if letter == 'k':
-            sset = SYMBOLS['customary']
-            letter = letter.upper()
-        else:
-            raise ValueError("can't interpret %r" % init)
-    prefix = {sset[0]: 1}
-    for i, s in enumerate(sset[1:]):
-        prefix[s] = 1 << (i + 1) * 10
-    return int(num * prefix[letter])
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestProcess(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_process_create_time(self):
-        output = sh("ps -o lstart -p %s" % self.pid)
-        start_ps = output.replace('STARTED', '').strip()
-        hhmmss = start_ps.split(' ')[-2]
-        year = start_ps.split(' ')[-1]
-        start_psutil = psutil.Process(self.pid).create_time()
-        self.assertEqual(
-            hhmmss,
-            time.strftime("%H:%M:%S", time.localtime(start_psutil)))
-        self.assertEqual(
-            year,
-            time.strftime("%Y", time.localtime(start_psutil)))
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestZombieProcessAPIs(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        zpid = create_zombie_proc()
-        cls.p = psutil.Process(zpid)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children(recursive=True)
-
-    def test_pidtask_info(self):
-        self.assertEqual(self.p.status(), psutil.STATUS_ZOMBIE)
-        self.p.ppid()
-        self.p.uids()
-        self.p.gids()
-        self.p.terminal()
-        self.p.create_time()
-
-    def test_exe(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.exe)
-
-    def test_cmdline(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cmdline)
-
-    def test_environ(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.environ)
-
-    def test_cwd(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cwd)
-
-    def test_memory_full_info(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.memory_full_info)
-
-    def test_cpu_times(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.cpu_times)
-
-    def test_num_ctx_switches(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_ctx_switches)
-
-    def test_num_threads(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_threads)
-
-    def test_open_files(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.open_files)
-
-    def test_connections(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.connections)
-
-    def test_num_fds(self):
-        self.assertRaises(psutil.ZombieProcess, self.p.num_fds)
-
-    def test_threads(self):
-        self.assertRaises((psutil.ZombieProcess, psutil.AccessDenied),
-                          self.p.threads)
-
-
-@unittest.skipIf(not MACOS, "MACOS only")
-class TestSystemAPIs(unittest.TestCase):
-
-    # --- disk
-
-    def test_disks(self):
-        # test psutil.disk_usage() and psutil.disk_partitions()
-        # against "df -a"
-        def df(path):
-            out = sh('df -k "%s"' % path).strip()
-            lines = out.split('\n')
-            lines.pop(0)
-            line = lines.pop(0)
-            dev, total, used, free = line.split()[:4]
-            if dev == 'none':
-                dev = ''
-            total = int(total) * 1024
-            used = int(used) * 1024
-            free = int(free) * 1024
-            return dev, total, used, free
-
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            dev, total, used, free = df(part.mountpoint)
-            self.assertEqual(part.device, dev)
-            self.assertEqual(usage.total, total)
-            # 10 MB tollerance
-            if abs(usage.free - free) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % usage.free, free)
-            if abs(usage.used - used) > 10 * 1024 * 1024:
-                self.fail("psutil=%s, df=%s" % usage.used, used)
-
-    # --- cpu
-
-    def test_cpu_count_logical(self):
-        num = sysctl("sysctl hw.logicalcpu")
-        self.assertEqual(num, psutil.cpu_count(logical=True))
-
-    def test_cpu_count_physical(self):
-        num = sysctl("sysctl hw.physicalcpu")
-        self.assertEqual(num, psutil.cpu_count(logical=False))
-
-    def test_cpu_freq(self):
-        freq = psutil.cpu_freq()
-        self.assertEqual(
-            freq.current * 1000 * 1000, sysctl("sysctl hw.cpufrequency"))
-        self.assertEqual(
-            freq.min * 1000 * 1000, sysctl("sysctl hw.cpufrequency_min"))
-        self.assertEqual(
-            freq.max * 1000 * 1000, sysctl("sysctl hw.cpufrequency_max"))
-
-    # --- virtual mem
-
-    def test_vmem_total(self):
-        sysctl_hwphymem = sysctl('sysctl hw.memsize')
-        self.assertEqual(sysctl_hwphymem, psutil.virtual_memory().total)
-
-    @retry_on_failure()
-    def test_vmem_free(self):
-        vmstat_val = vm_stat("free")
-        psutil_val = psutil.virtual_memory().free
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_active(self):
-        vmstat_val = vm_stat("active")
-        psutil_val = psutil.virtual_memory().active
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_inactive(self):
-        vmstat_val = vm_stat("inactive")
-        psutil_val = psutil.virtual_memory().inactive
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    @retry_on_failure()
-    def test_vmem_wired(self):
-        vmstat_val = vm_stat("wired")
-        psutil_val = psutil.virtual_memory().wired
-        self.assertAlmostEqual(psutil_val, vmstat_val, delta=MEMORY_TOLERANCE)
-
-    # --- swap mem
-
-    @retry_on_failure()
-    def test_swapmem_sin(self):
-        vmstat_val = vm_stat("Pageins")
-        psutil_val = psutil.swap_memory().sin
-        self.assertEqual(psutil_val, vmstat_val)
-
-    @retry_on_failure()
-    def test_swapmem_sout(self):
-        vmstat_val = vm_stat("Pageout")
-        psutil_val = psutil.swap_memory().sout
-        self.assertEqual(psutil_val, vmstat_val)
-
-    # Not very reliable.
-    # def test_swapmem_total(self):
-    #     out = sh('sysctl vm.swapusage')
-    #     out = out.replace('vm.swapusage: ', '')
-    #     total, used, free = re.findall('\d+.\d+\w', out)
-    #     psutil_smem = psutil.swap_memory()
-    #     self.assertEqual(psutil_smem.total, human2bytes(total))
-    #     self.assertEqual(psutil_smem.used, human2bytes(used))
-    #     self.assertEqual(psutil_smem.free, human2bytes(free))
-
-    # --- network
-
-    def test_net_if_stats(self):
-        for name, stats in psutil.net_if_stats().items():
-            try:
-                out = sh("ifconfig %s" % name)
-            except RuntimeError:
-                pass
-            else:
-                self.assertEqual(stats.isup, 'RUNNING' in out, msg=out)
-                self.assertEqual(stats.mtu,
-                                 int(re.findall(r'mtu (\d+)', out)[0]))
-
-    # --- sensors_battery
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        out = sh("pmset -g batt")
-        percent = re.search(r"(\d+)%", out).group(1)
-        drawing_from = re.search("Now drawing from '([^']+)'", out).group(1)
-        power_plugged = drawing_from == "AC Power"
-        psutil_result = psutil.sensors_battery()
-        self.assertEqual(psutil_result.power_plugged, power_plugged)
-        self.assertEqual(psutil_result.percent, int(percent))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_posix.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_posix.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_posix.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_posix.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,453 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""POSIX specific tests."""
-
-import datetime
-import errno
-import os
-import re
-import subprocess
-import time
-
-import psutil
-from psutil import AIX
-from psutil import BSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil.tests import CI_TESTING
-from psutil.tests import get_kernel_version
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import mock
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import wait_for_pid
-from psutil.tests import which
-
-
-def ps(fmt, pid=None):
-    """
-    Wrapper for calling the ps command with a little bit of cross-platform
-    support for a narrow range of features.
-    """
-
-    cmd = ['ps']
-
-    if LINUX:
-        cmd.append('--no-headers')
-
-    if pid is not None:
-        cmd.extend(['-p', str(pid)])
-    else:
-        if SUNOS or AIX:
-            cmd.append('-A')
-        else:
-            cmd.append('ax')
-
-    if SUNOS:
-        fmt_map = set(('command', 'comm', 'start', 'stime'))
-        fmt = fmt_map.get(fmt, fmt)
-
-    cmd.extend(['-o', fmt])
-
-    output = sh(cmd)
-
-    if LINUX:
-        output = output.splitlines()
-    else:
-        output = output.splitlines()[1:]
-
-    all_output = []
-    for line in output:
-        line = line.strip()
-
-        try:
-            line = int(line)
-        except ValueError:
-            pass
-
-        all_output.append(line)
-
-    if pid is None:
-        return all_output
-    else:
-        return all_output[0]
-
-# ps "-o" field names differ wildly between platforms.
-# "comm" means "only executable name" but is not available on BSD platforms.
-# "args" means "command with all its arguments", and is also not available
-# on BSD platforms.
-# "command" is like "args" on most platforms, but like "comm" on AIX,
-# and not available on SUNOS.
-# so for the executable name we can use "comm" on Solaris and split "command"
-# on other platforms.
-# to get the cmdline (with args) we have to use "args" on AIX and
-# Solaris, and can use "command" on all others.
-
-
-def ps_name(pid):
-    field = "command"
-    if SUNOS:
-        field = "comm"
-    return ps(field, pid).split()[0]
-
-
-def ps_args(pid):
-    field = "command"
-    if AIX or SUNOS:
-        field = "args"
-    return ps(field, pid)
-
-
-def ps_rss(pid):
-    field = "rss"
-    if AIX:
-        field = "rssize"
-    return ps(field, pid)
-
-
-def ps_vsz(pid):
-    field = "vsz"
-    if AIX:
-        field = "vsize"
-    return ps(field, pid)
-
-
-@unittest.skipIf(not POSIX, "POSIX only")
-class TestProcess(unittest.TestCase):
-    """Compare psutil results against 'ps' command line utility (mainly)."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess([PYTHON_EXE, "-E", "-O"],
-                                      stdin=subprocess.PIPE).pid
-        wait_for_pid(cls.pid)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_ppid(self):
-        ppid_ps = ps('ppid', self.pid)
-        ppid_psutil = psutil.Process(self.pid).ppid()
-        self.assertEqual(ppid_ps, ppid_psutil)
-
-    def test_uid(self):
-        uid_ps = ps('uid', self.pid)
-        uid_psutil = psutil.Process(self.pid).uids().real
-        self.assertEqual(uid_ps, uid_psutil)
-
-    def test_gid(self):
-        gid_ps = ps('rgid', self.pid)
-        gid_psutil = psutil.Process(self.pid).gids().real
-        self.assertEqual(gid_ps, gid_psutil)
-
-    def test_username(self):
-        username_ps = ps('user', self.pid)
-        username_psutil = psutil.Process(self.pid).username()
-        self.assertEqual(username_ps, username_psutil)
-
-    def test_username_no_resolution(self):
-        # Emulate a case where the system can't resolve the uid to
-        # a username in which case psutil is supposed to return
-        # the stringified uid.
-        p = psutil.Process()
-        with mock.patch("psutil.pwd.getpwuid", side_effect=KeyError) as fun:
-            self.assertEqual(p.username(), str(p.uids().real))
-            assert fun.called
-
-    @skip_on_access_denied()
-    @retry_on_failure()
-    def test_rss_memory(self):
-        # give python interpreter some time to properly initialize
-        # so that the results are the same
-        time.sleep(0.1)
-        rss_ps = ps_rss(self.pid)
-        rss_psutil = psutil.Process(self.pid).memory_info()[0] / 1024
-        self.assertEqual(rss_ps, rss_psutil)
-
-    @skip_on_access_denied()
-    @retry_on_failure()
-    def test_vsz_memory(self):
-        # give python interpreter some time to properly initialize
-        # so that the results are the same
-        time.sleep(0.1)
-        vsz_ps = ps_vsz(self.pid)
-        vsz_psutil = psutil.Process(self.pid).memory_info()[1] / 1024
-        self.assertEqual(vsz_ps, vsz_psutil)
-
-    def test_name(self):
-        name_ps = ps_name(self.pid)
-        # remove path if there is any, from the command
-        name_ps = os.path.basename(name_ps).lower()
-        name_psutil = psutil.Process(self.pid).name().lower()
-        # ...because of how we calculate PYTHON_EXE; on MACOS this may
-        # be "pythonX.Y".
-        name_ps = re.sub(r"\d.\d", "", name_ps)
-        name_psutil = re.sub(r"\d.\d", "", name_psutil)
-        # ...may also be "python.X"
-        name_ps = re.sub(r"\d", "", name_ps)
-        name_psutil = re.sub(r"\d", "", name_psutil)
-        self.assertEqual(name_ps, name_psutil)
-
-    def test_name_long(self):
-        # On UNIX the kernel truncates the name to the first 15
-        # characters. In such a case psutil tries to determine the
-        # full name from the cmdline.
-        name = "long-program-name"
-        cmdline = ["long-program-name-extended", "foo", "bar"]
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            return_value=cmdline):
-                p = psutil.Process()
-                self.assertEqual(p.name(), "long-program-name-extended")
-
-    def test_name_long_cmdline_ad_exc(self):
-        # Same as above but emulates a case where cmdline() raises
-        # AccessDenied in which case psutil is supposed to return
-        # the truncated name instead of crashing.
-        name = "long-program-name"
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            side_effect=psutil.AccessDenied(0, "")):
-                p = psutil.Process()
-                self.assertEqual(p.name(), "long-program-name")
-
-    def test_name_long_cmdline_nsp_exc(self):
-        # Same as above but emulates a case where cmdline() raises NSP
-        # which is supposed to propagate.
-        name = "long-program-name"
-        with mock.patch("psutil._psplatform.Process.name",
-                        return_value=name):
-            with mock.patch("psutil._psplatform.Process.cmdline",
-                            side_effect=psutil.NoSuchProcess(0, "")):
-                p = psutil.Process()
-                self.assertRaises(psutil.NoSuchProcess, p.name)
-
-    @unittest.skipIf(MACOS or BSD, 'ps -o start not available')
-    def test_create_time(self):
-        time_ps = ps('start', self.pid)
-        time_psutil = psutil.Process(self.pid).create_time()
-        time_psutil_tstamp = datetime.datetime.fromtimestamp(
-            time_psutil).strftime("%H:%M:%S")
-        # sometimes ps shows the time rounded up instead of down, so we check
-        # for both possible values
-        round_time_psutil = round(time_psutil)
-        round_time_psutil_tstamp = datetime.datetime.fromtimestamp(
-            round_time_psutil).strftime("%H:%M:%S")
-        self.assertIn(time_ps, [time_psutil_tstamp, round_time_psutil_tstamp])
-
-    def test_exe(self):
-        ps_pathname = ps_name(self.pid)
-        psutil_pathname = psutil.Process(self.pid).exe()
-        try:
-            self.assertEqual(ps_pathname, psutil_pathname)
-        except AssertionError:
-            # certain platforms such as BSD are more accurate returning:
-            # "/usr/local/bin/python2.7"
-            # ...instead of:
-            # "/usr/local/bin/python"
-            # We do not want to consider this difference in accuracy
-            # an error.
-            adjusted_ps_pathname = ps_pathname[:len(ps_pathname)]
-            self.assertEqual(ps_pathname, adjusted_ps_pathname)
-
-    def test_cmdline(self):
-        ps_cmdline = ps_args(self.pid)
-        psutil_cmdline = " ".join(psutil.Process(self.pid).cmdline())
-        self.assertEqual(ps_cmdline, psutil_cmdline)
-
-    # On SUNOS "ps" reads niceness /proc/pid/psinfo which returns an
-    # incorrect value (20); the real deal is getpriority(2) which
-    # returns 0; psutil relies on it, see:
-    # https://github.com/giampaolo/psutil/issues/1082
-    # AIX has the same issue
-    @unittest.skipIf(SUNOS, "not reliable on SUNOS")
-    @unittest.skipIf(AIX, "not reliable on AIX")
-    def test_nice(self):
-        ps_nice = ps('nice', self.pid)
-        psutil_nice = psutil.Process().nice()
-        self.assertEqual(ps_nice, psutil_nice)
-
-    def test_num_fds(self):
-        # Note: this fails from time to time; I'm keen on thinking
-        # it doesn't mean something is broken
-        def call(p, attr):
-            args = ()
-            attr = getattr(p, name, None)
-            if attr is not None and callable(attr):
-                if name == 'rlimit':
-                    args = (psutil.RLIMIT_NOFILE,)
-                attr(*args)
-            else:
-                attr
-
-        p = psutil.Process(os.getpid())
-        failures = []
-        ignored_names = ['terminate', 'kill', 'suspend', 'resume', 'nice',
-                         'send_signal', 'wait', 'children', 'as_dict',
-                         'memory_info_ex', 'parent', 'parents']
-        if LINUX and get_kernel_version() < (2, 6, 36):
-            ignored_names.append('rlimit')
-        if LINUX and get_kernel_version() < (2, 6, 23):
-            ignored_names.append('num_ctx_switches')
-        for name in dir(psutil.Process):
-            if (name.startswith('_') or name in ignored_names):
-                continue
-            else:
-                try:
-                    num1 = p.num_fds()
-                    for x in range(2):
-                        call(p, name)
-                    num2 = p.num_fds()
-                except psutil.AccessDenied:
-                    pass
-                else:
-                    if abs(num2 - num1) > 1:
-                        fail = "failure while processing Process.%s method " \
-                               "(before=%s, after=%s)" % (name, num1, num2)
-                        failures.append(fail)
-        if failures:
-            self.fail('\n' + '\n'.join(failures))
-
-
-@unittest.skipIf(not POSIX, "POSIX only")
-class TestSystemAPIs(unittest.TestCase):
-    """Test some system APIs."""
-
-    @retry_on_failure()
-    def test_pids(self):
-        # Note: this test might fail if the OS is starting/killing
-        # other processes in the meantime
-        pids_ps = sorted(ps("pid"))
-        pids_psutil = psutil.pids()
-
-        # on MACOS and OPENBSD ps doesn't show pid 0
-        if MACOS or OPENBSD and 0 not in pids_ps:
-            pids_ps.insert(0, 0)
-
-        # There will often be one more process in pids_ps for ps itself
-        if len(pids_ps) - len(pids_psutil) > 1:
-            difference = [x for x in pids_psutil if x not in pids_ps] + \
-                         [x for x in pids_ps if x not in pids_psutil]
-            self.fail("difference: " + str(difference))
-
-    # for some reason ifconfig -a does not report all interfaces
-    # returned by psutil
-    @unittest.skipIf(SUNOS, "unreliable on SUNOS")
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")
-    @unittest.skipIf(not which('ifconfig'), "no ifconfig cmd")
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, "not supported")
-    def test_nic_names(self):
-        output = sh("ifconfig -a")
-        for nic in psutil.net_io_counters(pernic=True).keys():
-            for line in output.split():
-                if line.startswith(nic):
-                    break
-            else:
-                self.fail(
-                    "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
-                        nic, output))
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-    @retry_on_failure()
-    def test_users(self):
-        out = sh("who")
-        lines = out.split('\n')
-        if not lines:
-            raise self.skipTest("no users on this system")
-        users = [x.split()[0] for x in lines]
-        terminals = [x.split()[1] for x in lines]
-        self.assertEqual(len(users), len(psutil.users()))
-        for u in psutil.users():
-            self.assertIn(u.name, users)
-            self.assertIn(u.terminal, terminals)
-
-    def test_pid_exists_let_raise(self):
-        # According to "man 2 kill" possible error values for kill
-        # are (EINVAL, EPERM, ESRCH). Test that any other errno
-        # results in an exception.
-        with mock.patch("psutil._psposix.os.kill",
-                        side_effect=OSError(errno.EBADF, "")) as m:
-            self.assertRaises(OSError, psutil._psposix.pid_exists, os.getpid())
-            assert m.called
-
-    def test_os_waitpid_let_raise(self):
-        # os.waitpid() is supposed to catch EINTR and ECHILD only.
-        # Test that any other errno results in an exception.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        side_effect=OSError(errno.EBADF, "")) as m:
-            self.assertRaises(OSError, psutil._psposix.wait_pid, os.getpid())
-            assert m.called
-
-    def test_os_waitpid_eintr(self):
-        # os.waitpid() is supposed to "retry" on EINTR.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        side_effect=OSError(errno.EINTR, "")) as m:
-            self.assertRaises(
-                psutil._psposix.TimeoutExpired,
-                psutil._psposix.wait_pid, os.getpid(), timeout=0.01)
-            assert m.called
-
-    def test_os_waitpid_bad_ret_status(self):
-        # Simulate os.waitpid() returning a bad status.
-        with mock.patch("psutil._psposix.os.waitpid",
-                        return_value=(1, -1)) as m:
-            self.assertRaises(ValueError,
-                              psutil._psposix.wait_pid, os.getpid())
-            assert m.called
-
-    # AIX can return '-' in df output instead of numbers, e.g. for /proc
-    @unittest.skipIf(AIX, "unreliable on AIX")
-    def test_disk_usage(self):
-        def df(device):
-            out = sh("df -k %s" % device).strip()
-            line = out.split('\n')[1]
-            fields = line.split()
-            total = int(fields[1]) * 1024
-            used = int(fields[2]) * 1024
-            free = int(fields[3]) * 1024
-            percent = float(fields[4].replace('%', ''))
-            return (total, used, free, percent)
-
-        tolerance = 4 * 1024 * 1024  # 4MB
-        for part in psutil.disk_partitions(all=False):
-            usage = psutil.disk_usage(part.mountpoint)
-            try:
-                total, used, free, percent = df(part.device)
-            except RuntimeError as err:
-                # see:
-                # https://travis-ci.org/giampaolo/psutil/jobs/138338464
-                # https://travis-ci.org/giampaolo/psutil/jobs/138343361
-                err = str(err).lower()
-                if "no such file or directory" in err or \
-                        "raw devices not supported" in err or \
-                        "permission denied" in err:
-                    continue
-                else:
-                    raise
-            else:
-                self.assertAlmostEqual(usage.total, total, delta=tolerance)
-                self.assertAlmostEqual(usage.used, used, delta=tolerance)
-                self.assertAlmostEqual(usage.free, free, delta=tolerance)
-                self.assertAlmostEqual(usage.percent, percent, delta=1)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_process.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_process.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_process.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_process.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1643 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for psutil.Process class."""
-
-import collections
-import errno
-import getpass
-import itertools
-import os
-import signal
-import socket
-import subprocess
-import sys
-import tempfile
-import textwrap
-import time
-import types
-
-import psutil
-
-from psutil import AIX
-from psutil import BSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import OSX
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._common import open_text
-from psutil._compat import long
-from psutil._compat import PY3
-from psutil.tests import APPVEYOR
-from psutil.tests import call_until
-from psutil.tests import CIRRUS
-from psutil.tests import copyload_shared_lib
-from psutil.tests import create_exe
-from psutil.tests import create_proc_children_pair
-from psutil.tests import create_zombie_proc
-from psutil.tests import enum
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CPU_AFFINITY
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_IONICE
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import HAS_PROC_CPU_NUM
-from psutil.tests import HAS_PROC_IO_COUNTERS
-from psutil.tests import HAS_RLIMIT
-from psutil.tests import HAS_THREADS
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import PYTHON_EXE
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import sh
-from psutil.tests import skip_on_access_denied
-from psutil.tests import skip_on_not_implemented
-from psutil.tests import TESTFILE_PREFIX
-from psutil.tests import TESTFN
-from psutil.tests import ThreadTask
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import wait_for_pid
-
-
-# ===================================================================
-# --- psutil.Process class tests
-# ===================================================================
-
-class TestProcess(unittest.TestCase):
-    """Tests for psutil.Process class."""
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    def tearDown(self):
-        reap_children()
-
-    def test_pid(self):
-        p = psutil.Process()
-        self.assertEqual(p.pid, os.getpid())
-        sproc = get_test_subprocess()
-        self.assertEqual(psutil.Process(sproc.pid).pid, sproc.pid)
-        with self.assertRaises(AttributeError):
-            p.pid = 33
-
-    def test_kill(self):
-        sproc = get_test_subprocess()
-        test_pid = sproc.pid
-        p = psutil.Process(test_pid)
-        p.kill()
-        sig = p.wait()
-        self.assertFalse(psutil.pid_exists(test_pid))
-        if POSIX:
-            self.assertEqual(sig, -signal.SIGKILL)
-
-    def test_terminate(self):
-        sproc = get_test_subprocess()
-        test_pid = sproc.pid
-        p = psutil.Process(test_pid)
-        p.terminate()
-        sig = p.wait()
-        self.assertFalse(psutil.pid_exists(test_pid))
-        if POSIX:
-            self.assertEqual(sig, -signal.SIGTERM)
-
-    def test_send_signal(self):
-        sig = signal.SIGKILL if POSIX else signal.SIGTERM
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.send_signal(sig)
-        exit_sig = p.wait()
-        self.assertFalse(psutil.pid_exists(p.pid))
-        if POSIX:
-            self.assertEqual(exit_sig, -sig)
-            #
-            sproc = get_test_subprocess()
-            p = psutil.Process(sproc.pid)
-            p.send_signal(sig)
-            with mock.patch('psutil.os.kill',
-                            side_effect=OSError(errno.ESRCH, "")):
-                with self.assertRaises(psutil.NoSuchProcess):
-                    p.send_signal(sig)
-            #
-            sproc = get_test_subprocess()
-            p = psutil.Process(sproc.pid)
-            p.send_signal(sig)
-            with mock.patch('psutil.os.kill',
-                            side_effect=OSError(errno.EPERM, "")):
-                with self.assertRaises(psutil.AccessDenied):
-                    psutil.Process().send_signal(sig)
-            # Sending a signal to process with PID 0 is not allowed as
-            # it would affect every process in the process group of
-            # the calling process (os.getpid()) instead of PID 0").
-            if 0 in psutil.pids():
-                p = psutil.Process(0)
-                self.assertRaises(ValueError, p.send_signal, signal.SIGTERM)
-
-    def test_wait(self):
-        # check exit code signal
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        code = p.wait()
-        if POSIX:
-            self.assertEqual(code, -signal.SIGKILL)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.terminate()
-        code = p.wait()
-        if POSIX:
-            self.assertEqual(code, -signal.SIGTERM)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-        # check sys.exit() code
-        code = "import time, sys; time.sleep(0.01); sys.exit(5);"
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", code])
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.wait(), 5)
-        self.assertFalse(p.is_running())
-
-        # Test wait() issued twice.
-        # It is not supposed to raise NSP when the process is gone.
-        # On UNIX this should return None, on Windows it should keep
-        # returning the exit code.
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", code])
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.wait(), 5)
-        self.assertIn(p.wait(), (5, None))
-
-        # test timeout
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.name()
-        self.assertRaises(psutil.TimeoutExpired, p.wait, 0.01)
-
-        # timeout < 0 not allowed
-        self.assertRaises(ValueError, p.wait, -1)
-
-    def test_wait_non_children(self):
-        # Test wait() against a process which is not our direct
-        # child.
-        p1, p2 = create_proc_children_pair()
-        self.assertRaises(psutil.TimeoutExpired, p1.wait, 0.01)
-        self.assertRaises(psutil.TimeoutExpired, p2.wait, 0.01)
-        # We also terminate the direct child otherwise the
-        # grandchild will hang until the parent is gone.
-        p1.terminate()
-        p2.terminate()
-        ret1 = p1.wait()
-        ret2 = p2.wait()
-        if POSIX:
-            self.assertEqual(ret1, -signal.SIGTERM)
-            # For processes which are not our children we're supposed
-            # to get None.
-            self.assertEqual(ret2, None)
-        else:
-            self.assertEqual(ret1, signal.SIGTERM)
-            self.assertEqual(ret1, signal.SIGTERM)
-
-    def test_wait_timeout_0(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertRaises(psutil.TimeoutExpired, p.wait, 0)
-        p.kill()
-        stop_at = time.time() + 2
-        while True:
-            try:
-                code = p.wait(0)
-            except psutil.TimeoutExpired:
-                if time.time() >= stop_at:
-                    raise
-            else:
-                break
-        if POSIX:
-            self.assertEqual(code, -signal.SIGKILL)
-        else:
-            self.assertEqual(code, signal.SIGTERM)
-        self.assertFalse(p.is_running())
-
-    def test_cpu_percent(self):
-        p = psutil.Process()
-        p.cpu_percent(interval=0.001)
-        p.cpu_percent(interval=0.001)
-        for x in range(100):
-            percent = p.cpu_percent(interval=None)
-            self.assertIsInstance(percent, float)
-            self.assertGreaterEqual(percent, 0.0)
-        with self.assertRaises(ValueError):
-            p.cpu_percent(interval=-1)
-
-    def test_cpu_percent_numcpus_none(self):
-        # See: https://github.com/giampaolo/psutil/issues/1087
-        with mock.patch('psutil.cpu_count', return_value=None) as m:
-            psutil.Process().cpu_percent()
-            assert m.called
-
-    def test_cpu_times(self):
-        times = psutil.Process().cpu_times()
-        assert (times.user > 0.0) or (times.system > 0.0), times
-        assert (times.children_user >= 0.0), times
-        assert (times.children_system >= 0.0), times
-        if LINUX:
-            assert times.iowait >= 0.0, times
-        # make sure returned values can be pretty printed with strftime
-        for name in times._fields:
-            time.strftime("%H:%M:%S", time.localtime(getattr(times, name)))
-
-    def test_cpu_times_2(self):
-        user_time, kernel_time = psutil.Process().cpu_times()[:2]
-        utime, ktime = os.times()[:2]
-
-        # Use os.times()[:2] as base values to compare our results
-        # using a tolerance  of +/- 0.1 seconds.
-        # It will fail if the difference between the values is > 0.1s.
-        if (max([user_time, utime]) - min([user_time, utime])) > 0.1:
-            self.fail("expected: %s, found: %s" % (utime, user_time))
-
-        if (max([kernel_time, ktime]) - min([kernel_time, ktime])) > 0.1:
-            self.fail("expected: %s, found: %s" % (ktime, kernel_time))
-
-    @unittest.skipIf(not HAS_PROC_CPU_NUM, "not supported")
-    def test_cpu_num(self):
-        p = psutil.Process()
-        num = p.cpu_num()
-        self.assertGreaterEqual(num, 0)
-        if psutil.cpu_count() == 1:
-            self.assertEqual(num, 0)
-        self.assertIn(p.cpu_num(), range(psutil.cpu_count()))
-
-    def test_create_time(self):
-        sproc = get_test_subprocess()
-        now = time.time()
-        p = psutil.Process(sproc.pid)
-        create_time = p.create_time()
-
-        # Use time.time() as base value to compare our result using a
-        # tolerance of +/- 1 second.
-        # It will fail if the difference between the values is > 2s.
-        difference = abs(create_time - now)
-        if difference > 2:
-            self.fail("expected: %s, found: %s, difference: %s"
-                      % (now, create_time, difference))
-
-        # make sure returned value can be pretty printed with strftime
-        time.strftime("%Y %m %d %H:%M:%S", time.localtime(p.create_time()))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    @unittest.skipIf(TRAVIS or CIRRUS, 'not reliable on TRAVIS/CIRRUS')
-    def test_terminal(self):
-        terminal = psutil.Process().terminal()
-        if sys.stdin.isatty() or sys.stdout.isatty():
-            tty = os.path.realpath(sh('tty'))
-            self.assertEqual(terminal, tty)
-        else:
-            self.assertIsNone(terminal)
-
-    @unittest.skipIf(not HAS_PROC_IO_COUNTERS, 'not supported')
-    @skip_on_not_implemented(only_if=LINUX)
-    def test_io_counters(self):
-        p = psutil.Process()
-        # test reads
-        io1 = p.io_counters()
-        with open(PYTHON_EXE, 'rb') as f:
-            f.read()
-        io2 = p.io_counters()
-        if not BSD and not AIX:
-            self.assertGreater(io2.read_count, io1.read_count)
-            self.assertEqual(io2.write_count, io1.write_count)
-            if LINUX:
-                self.assertGreater(io2.read_chars, io1.read_chars)
-                self.assertEqual(io2.write_chars, io1.write_chars)
-        else:
-            self.assertGreaterEqual(io2.read_bytes, io1.read_bytes)
-            self.assertGreaterEqual(io2.write_bytes, io1.write_bytes)
-
-        # test writes
-        io1 = p.io_counters()
-        with tempfile.TemporaryFile(prefix=TESTFILE_PREFIX) as f:
-            if PY3:
-                f.write(bytes("x" * 1000000, 'ascii'))
-            else:
-                f.write("x" * 1000000)
-        io2 = p.io_counters()
-        self.assertGreaterEqual(io2.write_count, io1.write_count)
-        self.assertGreaterEqual(io2.write_bytes, io1.write_bytes)
-        self.assertGreaterEqual(io2.read_count, io1.read_count)
-        self.assertGreaterEqual(io2.read_bytes, io1.read_bytes)
-        if LINUX:
-            self.assertGreater(io2.write_chars, io1.write_chars)
-            self.assertGreaterEqual(io2.read_chars, io1.read_chars)
-
-        # sanity check
-        for i in range(len(io2)):
-            if BSD and i >= 2:
-                # On BSD read_bytes and write_bytes are always set to -1.
-                continue
-            self.assertGreaterEqual(io2[i], 0)
-            self.assertGreaterEqual(io2[i], 0)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    @unittest.skipIf(not LINUX, "linux only")
-    def test_ionice_linux(self):
-        p = psutil.Process()
-        self.assertEqual(p.ionice()[0], psutil.IOPRIO_CLASS_NONE)
-        self.assertEqual(psutil.IOPRIO_CLASS_NONE, 0)
-        self.assertEqual(psutil.IOPRIO_CLASS_RT, 1)  # high
-        self.assertEqual(psutil.IOPRIO_CLASS_BE, 2)  # normal
-        self.assertEqual(psutil.IOPRIO_CLASS_IDLE, 3)  # low
-        try:
-            # low
-            p.ionice(psutil.IOPRIO_CLASS_IDLE)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_IDLE, 0))
-            with self.assertRaises(ValueError):  # accepts no value
-                p.ionice(psutil.IOPRIO_CLASS_IDLE, value=7)
-            # normal
-            p.ionice(psutil.IOPRIO_CLASS_BE)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_BE, 0))
-            p.ionice(psutil.IOPRIO_CLASS_BE, value=7)
-            self.assertEqual(tuple(p.ionice()), (psutil.IOPRIO_CLASS_BE, 7))
-            with self.assertRaises(ValueError):
-                p.ionice(psutil.IOPRIO_CLASS_BE, value=8)
-            # high
-            if os.getuid() == 0:  # root
-                p.ionice(psutil.IOPRIO_CLASS_RT)
-                self.assertEqual(tuple(p.ionice()),
-                                 (psutil.IOPRIO_CLASS_RT, 0))
-                p.ionice(psutil.IOPRIO_CLASS_RT, value=7)
-                self.assertEqual(tuple(p.ionice()),
-                                 (psutil.IOPRIO_CLASS_RT, 7))
-                with self.assertRaises(ValueError):
-                    p.ionice(psutil.IOPRIO_CLASS_IDLE, value=8)
-            # errs
-            self.assertRaisesRegex(
-                ValueError, "ioclass accepts no value",
-                p.ionice, psutil.IOPRIO_CLASS_NONE, 1)
-            self.assertRaisesRegex(
-                ValueError, "ioclass accepts no value",
-                p.ionice, psutil.IOPRIO_CLASS_IDLE, 1)
-            self.assertRaisesRegex(
-                ValueError, "'ioclass' argument must be specified",
-                p.ionice, value=1)
-        finally:
-            p.ionice(psutil.IOPRIO_CLASS_BE)
-
-    @unittest.skipIf(not HAS_IONICE, "not supported")
-    @unittest.skipIf(not WINDOWS, 'not supported on this win version')
-    def test_ionice_win(self):
-        p = psutil.Process()
-        self.assertEqual(p.ionice(), psutil.IOPRIO_NORMAL)
-        try:
-            # base
-            p.ionice(psutil.IOPRIO_VERYLOW)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_VERYLOW)
-            p.ionice(psutil.IOPRIO_LOW)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_LOW)
-            try:
-                p.ionice(psutil.IOPRIO_HIGH)
-            except psutil.AccessDenied:
-                pass
-            else:
-                self.assertEqual(p.ionice(), psutil.IOPRIO_HIGH)
-            # errs
-            self.assertRaisesRegex(
-                TypeError, "value argument not accepted on Windows",
-                p.ionice, psutil.IOPRIO_NORMAL, value=1)
-            self.assertRaisesRegex(
-                ValueError, "is not a valid priority",
-                p.ionice, psutil.IOPRIO_HIGH + 1)
-        finally:
-            p.ionice(psutil.IOPRIO_NORMAL)
-            self.assertEqual(p.ionice(), psutil.IOPRIO_NORMAL)
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_get(self):
-        import resource
-        p = psutil.Process(os.getpid())
-        names = [x for x in dir(psutil) if x.startswith('RLIMIT')]
-        assert names, names
-        for name in names:
-            value = getattr(psutil, name)
-            self.assertGreaterEqual(value, 0)
-            if name in dir(resource):
-                self.assertEqual(value, getattr(resource, name))
-                # XXX - On PyPy RLIMIT_INFINITY returned by
-                # resource.getrlimit() is reported as a very big long
-                # number instead of -1. It looks like a bug with PyPy.
-                if PYPY:
-                    continue
-                self.assertEqual(p.rlimit(value), resource.getrlimit(value))
-            else:
-                ret = p.rlimit(value)
-                self.assertEqual(len(ret), 2)
-                self.assertGreaterEqual(ret[0], -1)
-                self.assertGreaterEqual(ret[1], -1)
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_set(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.rlimit(psutil.RLIMIT_NOFILE, (5, 5))
-        self.assertEqual(p.rlimit(psutil.RLIMIT_NOFILE), (5, 5))
-        # If pid is 0 prlimit() applies to the calling process and
-        # we don't want that.
-        with self.assertRaises(ValueError):
-            psutil._psplatform.Process(0).rlimit(0)
-        with self.assertRaises(ValueError):
-            p.rlimit(psutil.RLIMIT_NOFILE, (5, 5, 5))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit(self):
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        try:
-            p.rlimit(psutil.RLIMIT_FSIZE, (1024, hard))
-            with open(TESTFN, "wb") as f:
-                f.write(b"X" * 1024)
-            # write() or flush() doesn't always cause the exception
-            # but close() will.
-            with self.assertRaises(IOError) as exc:
-                with open(TESTFN, "wb") as f:
-                    f.write(b"X" * 1025)
-            self.assertEqual(exc.exception.errno if PY3 else exc.exception[0],
-                             errno.EFBIG)
-        finally:
-            p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-            self.assertEqual(p.rlimit(psutil.RLIMIT_FSIZE), (soft, hard))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_infinity(self):
-        # First set a limit, then re-set it by specifying INFINITY
-        # and assume we overridden the previous limit.
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        try:
-            p.rlimit(psutil.RLIMIT_FSIZE, (1024, hard))
-            p.rlimit(psutil.RLIMIT_FSIZE, (psutil.RLIM_INFINITY, hard))
-            with open(TESTFN, "wb") as f:
-                f.write(b"X" * 2048)
-        finally:
-            p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-            self.assertEqual(p.rlimit(psutil.RLIMIT_FSIZE), (soft, hard))
-
-    @unittest.skipIf(not HAS_RLIMIT, "not supported")
-    def test_rlimit_infinity_value(self):
-        # RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really
-        # big number on a platform with large file support.  On these
-        # platforms we need to test that the get/setrlimit functions
-        # properly convert the number to a C long long and that the
-        # conversion doesn't raise an error.
-        p = psutil.Process()
-        soft, hard = p.rlimit(psutil.RLIMIT_FSIZE)
-        self.assertEqual(psutil.RLIM_INFINITY, hard)
-        p.rlimit(psutil.RLIMIT_FSIZE, (soft, hard))
-
-    def test_num_threads(self):
-        # on certain platforms such as Linux we might test for exact
-        # thread number, since we always have with 1 thread per process,
-        # but this does not apply across all platforms (MACOS, Windows)
-        p = psutil.Process()
-        if OPENBSD:
-            try:
-                step1 = p.num_threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest("on OpenBSD this requires root access")
-        else:
-            step1 = p.num_threads()
-
-        with ThreadTask():
-            step2 = p.num_threads()
-            self.assertEqual(step2, step1 + 1)
-
-    @unittest.skipIf(not WINDOWS, 'WINDOWS only')
-    def test_num_handles(self):
-        # a better test is done later into test/_windows.py
-        p = psutil.Process()
-        self.assertGreater(p.num_handles(), 0)
-
-    @unittest.skipIf(not HAS_THREADS, 'not supported')
-    def test_threads(self):
-        p = psutil.Process()
-        if OPENBSD:
-            try:
-                step1 = p.threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest("on OpenBSD this requires root access")
-        else:
-            step1 = p.threads()
-
-        with ThreadTask():
-            step2 = p.threads()
-            self.assertEqual(len(step2), len(step1) + 1)
-            athread = step2[0]
-            # test named tuple
-            self.assertEqual(athread.id, athread[0])
-            self.assertEqual(athread.user_time, athread[1])
-            self.assertEqual(athread.system_time, athread[2])
-
-    @retry_on_failure()
-    @skip_on_access_denied(only_if=MACOS)
-    @unittest.skipIf(not HAS_THREADS, 'not supported')
-    def test_threads_2(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        if OPENBSD:
-            try:
-                p.threads()
-            except psutil.AccessDenied:
-                raise unittest.SkipTest(
-                    "on OpenBSD this requires root access")
-        self.assertAlmostEqual(
-            p.cpu_times().user,
-            sum([x.user_time for x in p.threads()]), delta=0.1)
-        self.assertAlmostEqual(
-            p.cpu_times().system,
-            sum([x.system_time for x in p.threads()]), delta=0.1)
-
-    def test_memory_info(self):
-        p = psutil.Process()
-
-        # step 1 - get a base value to compare our results
-        rss1, vms1 = p.memory_info()[:2]
-        percent1 = p.memory_percent()
-        self.assertGreater(rss1, 0)
-        self.assertGreater(vms1, 0)
-
-        # step 2 - allocate some memory
-        memarr = [None] * 1500000
-
-        rss2, vms2 = p.memory_info()[:2]
-        percent2 = p.memory_percent()
-
-        # step 3 - make sure that the memory usage bumped up
-        self.assertGreater(rss2, rss1)
-        self.assertGreaterEqual(vms2, vms1)  # vms might be equal
-        self.assertGreater(percent2, percent1)
-        del memarr
-
-        if WINDOWS:
-            mem = p.memory_info()
-            self.assertEqual(mem.rss, mem.wset)
-            self.assertEqual(mem.vms, mem.pagefile)
-
-        mem = p.memory_info()
-        for name in mem._fields:
-            self.assertGreaterEqual(getattr(mem, name), 0)
-
-    def test_memory_full_info(self):
-        total = psutil.virtual_memory().total
-        mem = psutil.Process().memory_full_info()
-        for name in mem._fields:
-            value = getattr(mem, name)
-            self.assertGreaterEqual(value, 0, msg=(name, value))
-            if name == 'vms' and OSX or LINUX:
-                continue
-            self.assertLessEqual(value, total, msg=(name, value, total))
-        if LINUX or WINDOWS or MACOS:
-            self.assertGreaterEqual(mem.uss, 0)
-        if LINUX:
-            self.assertGreaterEqual(mem.pss, 0)
-            self.assertGreaterEqual(mem.swap, 0)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_memory_maps(self):
-        p = psutil.Process()
-        maps = p.memory_maps()
-        paths = [x for x in maps]
-        self.assertEqual(len(paths), len(set(paths)))
-        ext_maps = p.memory_maps(grouped=False)
-
-        for nt in maps:
-            if not nt.path.startswith('['):
-                assert os.path.isabs(nt.path), nt.path
-                if POSIX:
-                    try:
-                        assert os.path.exists(nt.path) or \
-                            os.path.islink(nt.path), nt.path
-                    except AssertionError:
-                        if not LINUX:
-                            raise
-                        else:
-                            # https://github.com/giampaolo/psutil/issues/759
-                            with open_text('/proc/self/smaps') as f:
-                                data = f.read()
-                            if "%s (deleted)" % nt.path not in data:
-                                raise
-                else:
-                    # XXX - On Windows we have this strange behavior with
-                    # 64 bit dlls: they are visible via explorer but cannot
-                    # be accessed via os.stat() (wtf?).
-                    if '64' not in os.path.basename(nt.path):
-                        assert os.path.exists(nt.path), nt.path
-        for nt in ext_maps:
-            for fname in nt._fields:
-                value = getattr(nt, fname)
-                if fname == 'path':
-                    continue
-                elif fname in ('addr', 'perms'):
-                    assert value, value
-                else:
-                    self.assertIsInstance(value, (int, long))
-                    assert value >= 0, value
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    def test_memory_maps_lists_lib(self):
-        # Make sure a newly loaded shared lib is listed.
-        with copyload_shared_lib() as path:
-            def normpath(p):
-                return os.path.realpath(os.path.normcase(p))
-            libpaths = [normpath(x.path)
-                        for x in psutil.Process().memory_maps()]
-            self.assertIn(normpath(path), libpaths)
-
-    def test_memory_percent(self):
-        p = psutil.Process()
-        p.memory_percent()
-        self.assertRaises(ValueError, p.memory_percent, memtype="?!?")
-        if LINUX or MACOS or WINDOWS:
-            p.memory_percent(memtype='uss')
-
-    def test_is_running(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        assert p.is_running()
-        assert p.is_running()
-        p.kill()
-        p.wait()
-        assert not p.is_running()
-        assert not p.is_running()
-
-    def test_exe(self):
-        sproc = get_test_subprocess()
-        exe = psutil.Process(sproc.pid).exe()
-        try:
-            self.assertEqual(exe, PYTHON_EXE)
-        except AssertionError:
-            if WINDOWS and len(exe) == len(PYTHON_EXE):
-                # on Windows we don't care about case sensitivity
-                normcase = os.path.normcase
-                self.assertEqual(normcase(exe), normcase(PYTHON_EXE))
-            else:
-                # certain platforms such as BSD are more accurate returning:
-                # "/usr/local/bin/python2.7"
-                # ...instead of:
-                # "/usr/local/bin/python"
-                # We do not want to consider this difference in accuracy
-                # an error.
-                ver = "%s.%s" % (sys.version_info[0], sys.version_info[1])
-                try:
-                    self.assertEqual(exe.replace(ver, ''),
-                                     PYTHON_EXE.replace(ver, ''))
-                except AssertionError:
-                    # Tipically MACOS. Really not sure what to do here.
-                    pass
-
-        out = sh([exe, "-c", "import os; print('hey')"])
-        self.assertEqual(out, 'hey')
-
-    def test_cmdline(self):
-        cmdline = [PYTHON_EXE, "-c", "import time; time.sleep(60)"]
-        sproc = get_test_subprocess(cmdline)
-        try:
-            self.assertEqual(' '.join(psutil.Process(sproc.pid).cmdline()),
-                             ' '.join(cmdline))
-        except AssertionError:
-            # XXX - most of the times the underlying sysctl() call on Net
-            # and Open BSD returns a truncated string.
-            # Also /proc/pid/cmdline behaves the same so it looks
-            # like this is a kernel bug.
-            # XXX - AIX truncates long arguments in /proc/pid/cmdline
-            if NETBSD or OPENBSD or AIX:
-                self.assertEqual(
-                    psutil.Process(sproc.pid).cmdline()[0], PYTHON_EXE)
-            else:
-                raise
-
-    @unittest.skipIf(PYPY, "broken on PYPY")
-    def test_long_cmdline(self):
-        create_exe(TESTFN)
-        self.addCleanup(safe_rmpath, TESTFN)
-        cmdline = [TESTFN] + (["0123456789"] * 20)
-        sproc = get_test_subprocess(cmdline)
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.cmdline(), cmdline)
-
-    def test_name(self):
-        sproc = get_test_subprocess(PYTHON_EXE)
-        name = psutil.Process(sproc.pid).name().lower()
-        pyexe = os.path.basename(os.path.realpath(sys.executable)).lower()
-        assert pyexe.startswith(name), (pyexe, name)
-
-    @unittest.skipIf(PYPY, "unreliable on PYPY")
-    def test_long_name(self):
-        long_name = TESTFN + ("0123456789" * 2)
-        create_exe(long_name)
-        self.addCleanup(safe_rmpath, long_name)
-        sproc = get_test_subprocess(long_name)
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.name(), os.path.basename(long_name))
-
-    # XXX
-    @unittest.skipIf(SUNOS, "broken on SUNOS")
-    @unittest.skipIf(AIX, "broken on AIX")
-    @unittest.skipIf(PYPY, "broken on PYPY")
-    def test_prog_w_funky_name(self):
-        # Test that name(), exe() and cmdline() correctly handle programs
-        # with funky chars such as spaces and ")", see:
-        # https://github.com/giampaolo/psutil/issues/628
-
-        def rm():
-            # Try to limit occasional failures on Appveyor:
-            # https://ci.appveyor.com/project/giampaolo/psutil/build/1350/
-            #     job/lbo3bkju55le850n
-            try:
-                safe_rmpath(funky_path)
-            except OSError:
-                pass
-
-        funky_path = TESTFN + 'foo bar )'
-        create_exe(funky_path)
-        self.addCleanup(rm)
-        cmdline = [funky_path, "-c",
-                   "import time; [time.sleep(0.01) for x in range(3000)];"
-                   "arg1", "arg2", "", "arg3", ""]
-        sproc = get_test_subprocess(cmdline)
-        p = psutil.Process(sproc.pid)
-        # ...in order to try to prevent occasional failures on travis
-        if TRAVIS:
-            wait_for_pid(p.pid)
-        self.assertEqual(p.cmdline(), cmdline)
-        self.assertEqual(p.name(), os.path.basename(funky_path))
-        self.assertEqual(os.path.normcase(p.exe()),
-                         os.path.normcase(funky_path))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_uids(self):
-        p = psutil.Process()
-        real, effective, saved = p.uids()
-        # os.getuid() refers to "real" uid
-        self.assertEqual(real, os.getuid())
-        # os.geteuid() refers to "effective" uid
-        self.assertEqual(effective, os.geteuid())
-        # No such thing as os.getsuid() ("saved" uid), but starting
-        # from python 2.7 we have os.getresuid() which returns all
-        # of them.
-        if hasattr(os, "getresuid"):
-            self.assertEqual(os.getresuid(), p.uids())
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_gids(self):
-        p = psutil.Process()
-        real, effective, saved = p.gids()
-        # os.getuid() refers to "real" uid
-        self.assertEqual(real, os.getgid())
-        # os.geteuid() refers to "effective" uid
-        self.assertEqual(effective, os.getegid())
-        # No such thing as os.getsgid() ("saved" gid), but starting
-        # from python 2.7 we have os.getresgid() which returns all
-        # of them.
-        if hasattr(os, "getresuid"):
-            self.assertEqual(os.getresgid(), p.gids())
-
-    def test_nice(self):
-        p = psutil.Process()
-        self.assertRaises(TypeError, p.nice, "str")
-        if WINDOWS:
-            try:
-                init = p.nice()
-                if sys.version_info > (3, 4):
-                    self.assertIsInstance(init, enum.IntEnum)
-                else:
-                    self.assertIsInstance(init, int)
-                self.assertEqual(init, psutil.NORMAL_PRIORITY_CLASS)
-                p.nice(psutil.HIGH_PRIORITY_CLASS)
-                self.assertEqual(p.nice(), psutil.HIGH_PRIORITY_CLASS)
-                p.nice(psutil.NORMAL_PRIORITY_CLASS)
-                self.assertEqual(p.nice(), psutil.NORMAL_PRIORITY_CLASS)
-            finally:
-                p.nice(psutil.NORMAL_PRIORITY_CLASS)
-        else:
-            first_nice = p.nice()
-            try:
-                if hasattr(os, "getpriority"):
-                    self.assertEqual(
-                        os.getpriority(os.PRIO_PROCESS, os.getpid()), p.nice())
-                p.nice(1)
-                self.assertEqual(p.nice(), 1)
-                if hasattr(os, "getpriority"):
-                    self.assertEqual(
-                        os.getpriority(os.PRIO_PROCESS, os.getpid()), p.nice())
-                # XXX - going back to previous nice value raises
-                # AccessDenied on MACOS
-                if not MACOS:
-                    p.nice(0)
-                    self.assertEqual(p.nice(), 0)
-            except psutil.AccessDenied:
-                pass
-            finally:
-                try:
-                    p.nice(first_nice)
-                except psutil.AccessDenied:
-                    pass
-
-    def test_status(self):
-        p = psutil.Process()
-        self.assertEqual(p.status(), psutil.STATUS_RUNNING)
-
-    def test_username(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        username = p.username()
-        if WINDOWS:
-            domain, username = username.split('\\')
-            self.assertEqual(username, getpass.getuser())
-            if 'USERDOMAIN' in os.environ:
-                self.assertEqual(domain, os.environ['USERDOMAIN'])
-        else:
-            self.assertEqual(username, getpass.getuser())
-
-    def test_cwd(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_cwd_2(self):
-        cmd = [PYTHON_EXE, "-c",
-               "import os, time; os.chdir('..'); time.sleep(60)"]
-        sproc = get_test_subprocess(cmd)
-        p = psutil.Process(sproc.pid)
-        call_until(p.cwd, "ret == os.path.dirname(os.getcwd())")
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity(self):
-        p = psutil.Process()
-        initial = p.cpu_affinity()
-        assert initial, initial
-        self.addCleanup(p.cpu_affinity, initial)
-
-        if hasattr(os, "sched_getaffinity"):
-            self.assertEqual(initial, list(os.sched_getaffinity(p.pid)))
-        self.assertEqual(len(initial), len(set(initial)))
-
-        all_cpus = list(range(len(psutil.cpu_percent(percpu=True))))
-        # Work around travis failure:
-        # https://travis-ci.org/giampaolo/psutil/builds/284173194
-        for n in all_cpus if not TRAVIS else initial:
-            p.cpu_affinity([n])
-            self.assertEqual(p.cpu_affinity(), [n])
-            if hasattr(os, "sched_getaffinity"):
-                self.assertEqual(p.cpu_affinity(),
-                                 list(os.sched_getaffinity(p.pid)))
-            # also test num_cpu()
-            if hasattr(p, "num_cpu"):
-                self.assertEqual(p.cpu_affinity()[0], p.num_cpu())
-
-        # [] is an alias for "all eligible CPUs"; on Linux this may
-        # not be equal to all available CPUs, see:
-        # https://github.com/giampaolo/psutil/issues/956
-        p.cpu_affinity([])
-        if LINUX:
-            self.assertEqual(p.cpu_affinity(), p._proc._get_eligible_cpus())
-        else:
-            self.assertEqual(p.cpu_affinity(), all_cpus)
-        if hasattr(os, "sched_getaffinity"):
-            self.assertEqual(p.cpu_affinity(),
-                             list(os.sched_getaffinity(p.pid)))
-        #
-        self.assertRaises(TypeError, p.cpu_affinity, 1)
-        p.cpu_affinity(initial)
-        # it should work with all iterables, not only lists
-        if not TRAVIS:
-            p.cpu_affinity(set(all_cpus))
-            p.cpu_affinity(tuple(all_cpus))
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity_errs(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        invalid_cpu = [len(psutil.cpu_times(percpu=True)) + 10]
-        self.assertRaises(ValueError, p.cpu_affinity, invalid_cpu)
-        self.assertRaises(ValueError, p.cpu_affinity, range(10000, 11000))
-        self.assertRaises(TypeError, p.cpu_affinity, [0, "1"])
-        self.assertRaises(ValueError, p.cpu_affinity, [0, -1])
-
-    @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported')
-    def test_cpu_affinity_all_combinations(self):
-        p = psutil.Process()
-        initial = p.cpu_affinity()
-        assert initial, initial
-        self.addCleanup(p.cpu_affinity, initial)
-
-        # All possible CPU set combinations.
-        if len(initial) > 12:
-            initial = initial[:12]  # ...otherwise it will take forever
-        combos = []
-        for l in range(0, len(initial) + 1):
-            for subset in itertools.combinations(initial, l):
-                if subset:
-                    combos.append(list(subset))
-
-        for combo in combos:
-            p.cpu_affinity(combo)
-            self.assertEqual(p.cpu_affinity(), combo)
-
-    # TODO: #595
-    @unittest.skipIf(BSD, "broken on BSD")
-    # can't find any process file on Appveyor
-    @unittest.skipIf(APPVEYOR, "unreliable on APPVEYOR")
-    def test_open_files(self):
-        # current process
-        p = psutil.Process()
-        files = p.open_files()
-        self.assertFalse(TESTFN in files)
-        with open(TESTFN, 'wb') as f:
-            f.write(b'x' * 1024)
-            f.flush()
-            # give the kernel some time to see the new file
-            files = call_until(p.open_files, "len(ret) != %i" % len(files))
-            filenames = [os.path.normcase(x.path) for x in files]
-            self.assertIn(os.path.normcase(TESTFN), filenames)
-            if LINUX:
-                for file in files:
-                    if file.path == TESTFN:
-                        self.assertEqual(file.position, 1024)
-        for file in files:
-            assert os.path.isfile(file.path), file
-
-        # another process
-        cmdline = "import time; f = open(r'%s', 'r'); time.sleep(60);" % TESTFN
-        sproc = get_test_subprocess([PYTHON_EXE, "-c", cmdline])
-        p = psutil.Process(sproc.pid)
-
-        for x in range(100):
-            filenames = [os.path.normcase(x.path) for x in p.open_files()]
-            if TESTFN in filenames:
-                break
-            time.sleep(.01)
-        else:
-            self.assertIn(os.path.normcase(TESTFN), filenames)
-        for file in filenames:
-            assert os.path.isfile(file), file
-
-    # TODO: #595
-    @unittest.skipIf(BSD, "broken on BSD")
-    # can't find any process file on Appveyor
-    @unittest.skipIf(APPVEYOR, "unreliable on APPVEYOR")
-    def test_open_files_2(self):
-        # test fd and path fields
-        normcase = os.path.normcase
-        with open(TESTFN, 'w') as fileobj:
-            p = psutil.Process()
-            for file in p.open_files():
-                if normcase(file.path) == normcase(fileobj.name) or \
-                        file.fd == fileobj.fileno():
-                    break
-            else:
-                self.fail("no file found; files=%s" % repr(p.open_files()))
-            self.assertEqual(normcase(file.path), normcase(fileobj.name))
-            if WINDOWS:
-                self.assertEqual(file.fd, -1)
-            else:
-                self.assertEqual(file.fd, fileobj.fileno())
-            # test positions
-            ntuple = p.open_files()[0]
-            self.assertEqual(ntuple[0], ntuple.path)
-            self.assertEqual(ntuple[1], ntuple.fd)
-            # test file is gone
-            self.assertNotIn(fileobj.name, p.open_files())
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_num_fds(self):
-        p = psutil.Process()
-        start = p.num_fds()
-        file = open(TESTFN, 'w')
-        self.addCleanup(file.close)
-        self.assertEqual(p.num_fds(), start + 1)
-        sock = socket.socket()
-        self.addCleanup(sock.close)
-        self.assertEqual(p.num_fds(), start + 2)
-        file.close()
-        sock.close()
-        self.assertEqual(p.num_fds(), start)
-
-    @skip_on_not_implemented(only_if=LINUX)
-    @unittest.skipIf(OPENBSD or NETBSD, "not reliable on OPENBSD & NETBSD")
-    def test_num_ctx_switches(self):
-        p = psutil.Process()
-        before = sum(p.num_ctx_switches())
-        for x in range(500000):
-            after = sum(p.num_ctx_switches())
-            if after > before:
-                return
-        self.fail("num ctx switches still the same after 50.000 iterations")
-
-    def test_ppid(self):
-        if hasattr(os, 'getppid'):
-            self.assertEqual(psutil.Process().ppid(), os.getppid())
-        this_parent = os.getpid()
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.ppid(), this_parent)
-        # no other process is supposed to have us as parent
-        reap_children(recursive=True)
-        if APPVEYOR:
-            # Occasional failures, see:
-            # https://ci.appveyor.com/project/giampaolo/psutil/build/
-            #     job/0hs623nenj7w4m33
-            return
-        for p in psutil.process_iter():
-            if p.pid == sproc.pid:
-                continue
-            # XXX: sometimes this fails on Windows; not sure why.
-            self.assertNotEqual(p.ppid(), this_parent, msg=p)
-
-    def test_parent(self):
-        this_parent = os.getpid()
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        self.assertEqual(p.parent().pid, this_parent)
-
-        lowest_pid = psutil.pids()[0]
-        self.assertIsNone(psutil.Process(lowest_pid).parent())
-
-    def test_parent_multi(self):
-        p1, p2 = create_proc_children_pair()
-        self.assertEqual(p2.parent(), p1)
-        self.assertEqual(p1.parent(), psutil.Process())
-
-    def test_parent_disappeared(self):
-        # Emulate a case where the parent process disappeared.
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        with mock.patch("psutil.Process",
-                        side_effect=psutil.NoSuchProcess(0, 'foo')):
-            self.assertIsNone(p.parent())
-
-    @retry_on_failure()
-    def test_parents(self):
-        assert psutil.Process().parents()
-        p1, p2 = create_proc_children_pair()
-        self.assertEqual(p1.parents()[0], psutil.Process())
-        self.assertEqual(p2.parents()[0], p1)
-        self.assertEqual(p2.parents()[1], psutil.Process())
-
-    def test_children(self):
-        reap_children(recursive=True)
-        p = psutil.Process()
-        self.assertEqual(p.children(), [])
-        self.assertEqual(p.children(recursive=True), [])
-        # On Windows we set the flag to 0 in order to cancel out the
-        # CREATE_NO_WINDOW flag (enabled by default) which creates
-        # an extra "conhost.exe" child.
-        sproc = get_test_subprocess(creationflags=0)
-        children1 = p.children()
-        children2 = p.children(recursive=True)
-        for children in (children1, children2):
-            self.assertEqual(len(children), 1)
-            self.assertEqual(children[0].pid, sproc.pid)
-            self.assertEqual(children[0].ppid(), os.getpid())
-
-    def test_children_recursive(self):
-        # Test children() against two sub processes, p1 and p2, where
-        # p1 (our child) spawned p2 (our grandchild).
-        p1, p2 = create_proc_children_pair()
-        p = psutil.Process()
-        self.assertEqual(p.children(), [p1])
-        self.assertEqual(p.children(recursive=True), [p1, p2])
-        # If the intermediate process is gone there's no way for
-        # children() to recursively find it.
-        p1.terminate()
-        p1.wait()
-        self.assertEqual(p.children(recursive=True), [])
-
-    def test_children_duplicates(self):
-        # find the process which has the highest number of children
-        table = collections.defaultdict(int)
-        for p in psutil.process_iter():
-            try:
-                table[p.ppid()] += 1
-            except psutil.Error:
-                pass
-        # this is the one, now let's make sure there are no duplicates
-        pid = sorted(table.items(), key=lambda x: x[1])[-1][0]
-        p = psutil.Process(pid)
-        try:
-            c = p.children(recursive=True)
-        except psutil.AccessDenied:  # windows
-            pass
-        else:
-            self.assertEqual(len(c), len(set(c)))
-
-    def test_parents_and_children(self):
-        p1, p2 = create_proc_children_pair()
-        me = psutil.Process()
-        # forward
-        children = me.children(recursive=True)
-        self.assertEqual(len(children), 2)
-        self.assertEqual(children[0], p1)
-        self.assertEqual(children[1], p2)
-        # backward
-        parents = p2.parents()
-        self.assertEqual(parents[0], p1)
-        self.assertEqual(parents[1], me)
-
-    def test_suspend_resume(self):
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.suspend()
-        for x in range(100):
-            if p.status() == psutil.STATUS_STOPPED:
-                break
-            time.sleep(0.01)
-        p.resume()
-        self.assertNotEqual(p.status(), psutil.STATUS_STOPPED)
-
-    def test_invalid_pid(self):
-        self.assertRaises(TypeError, psutil.Process, "1")
-        self.assertRaises(ValueError, psutil.Process, -1)
-
-    def test_as_dict(self):
-        p = psutil.Process()
-        d = p.as_dict(attrs=['exe', 'name'])
-        self.assertEqual(sorted(d.keys()), ['exe', 'name'])
-
-        p = psutil.Process(min(psutil.pids()))
-        d = p.as_dict(attrs=['connections'], ad_value='foo')
-        if not isinstance(d['connections'], list):
-            self.assertEqual(d['connections'], 'foo')
-
-        # Test ad_value is set on AccessDenied.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.AccessDenied):
-            self.assertEqual(
-                p.as_dict(attrs=["nice"], ad_value=1), {"nice": 1})
-
-        # Test that NoSuchProcess bubbles up.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.NoSuchProcess(p.pid, "name")):
-            self.assertRaises(
-                psutil.NoSuchProcess, p.as_dict, attrs=["nice"])
-
-        # Test that ZombieProcess is swallowed.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=psutil.ZombieProcess(p.pid, "name")):
-            self.assertEqual(
-                p.as_dict(attrs=["nice"], ad_value="foo"), {"nice": "foo"})
-
-        # By default APIs raising NotImplementedError are
-        # supposed to be skipped.
-        with mock.patch('psutil.Process.nice', create=True,
-                        side_effect=NotImplementedError):
-            d = p.as_dict()
-            self.assertNotIn('nice', list(d.keys()))
-            # ...unless the user explicitly asked for some attr.
-            with self.assertRaises(NotImplementedError):
-                p.as_dict(attrs=["nice"])
-
-        # errors
-        with self.assertRaises(TypeError):
-            p.as_dict('name')
-        with self.assertRaises(ValueError):
-            p.as_dict(['foo'])
-        with self.assertRaises(ValueError):
-            p.as_dict(['foo', 'bar'])
-
-    def test_oneshot(self):
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p = psutil.Process()
-            with p.oneshot():
-                p.cpu_times()
-                p.cpu_times()
-            self.assertEqual(m.call_count, 1)
-
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p.cpu_times()
-            p.cpu_times()
-        self.assertEqual(m.call_count, 2)
-
-    def test_oneshot_twice(self):
-        # Test the case where the ctx manager is __enter__ed twice.
-        # The second __enter__ is supposed to resut in a NOOP.
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m1:
-            with mock.patch("psutil._psplatform.Process.oneshot_enter") as m2:
-                p = psutil.Process()
-                with p.oneshot():
-                    p.cpu_times()
-                    p.cpu_times()
-                    with p.oneshot():
-                        p.cpu_times()
-                        p.cpu_times()
-                self.assertEqual(m1.call_count, 1)
-                self.assertEqual(m2.call_count, 1)
-
-        with mock.patch("psutil._psplatform.Process.cpu_times") as m:
-            p.cpu_times()
-            p.cpu_times()
-        self.assertEqual(m.call_count, 2)
-
-    def test_oneshot_cache(self):
-        # Make sure oneshot() cache is nonglobal. Instead it's
-        # supposed to be bound to the Process instance, see:
-        # https://github.com/giampaolo/psutil/issues/1373
-        p1, p2 = create_proc_children_pair()
-        p1_ppid = p1.ppid()
-        p2_ppid = p2.ppid()
-        self.assertNotEqual(p1_ppid, p2_ppid)
-        with p1.oneshot():
-            self.assertEqual(p1.ppid(), p1_ppid)
-            self.assertEqual(p2.ppid(), p2_ppid)
-        with p2.oneshot():
-            self.assertEqual(p1.ppid(), p1_ppid)
-            self.assertEqual(p2.ppid(), p2_ppid)
-
-    def test_halfway_terminated_process(self):
-        # Test that NoSuchProcess exception gets raised in case the
-        # process dies after we create the Process object.
-        # Example:
-        # >>> proc = Process(1234)
-        # >>> time.sleep(2)  # time-consuming task, process dies in meantime
-        # >>> proc.name()
-        # Refers to Issue #15
-        sproc = get_test_subprocess()
-        p = psutil.Process(sproc.pid)
-        p.terminate()
-        p.wait()
-        if WINDOWS:
-            call_until(psutil.pids, "%s not in ret" % p.pid)
-        assert not p.is_running()
-
-        if WINDOWS:
-            with self.assertRaises(psutil.NoSuchProcess):
-                p.send_signal(signal.CTRL_C_EVENT)
-            with self.assertRaises(psutil.NoSuchProcess):
-                p.send_signal(signal.CTRL_BREAK_EVENT)
-
-        excluded_names = ['pid', 'is_running', 'wait', 'create_time',
-                          'oneshot', 'memory_info_ex']
-        if LINUX and not HAS_RLIMIT:
-            excluded_names.append('rlimit')
-        for name in dir(p):
-            if (name.startswith('_') or
-                    name in excluded_names):
-                continue
-            try:
-                meth = getattr(p, name)
-                # get/set methods
-                if name == 'nice':
-                    if POSIX:
-                        ret = meth(1)
-                    else:
-                        ret = meth(psutil.NORMAL_PRIORITY_CLASS)
-                elif name == 'ionice':
-                    ret = meth()
-                    ret = meth(2)
-                elif name == 'rlimit':
-                    ret = meth(psutil.RLIMIT_NOFILE)
-                    ret = meth(psutil.RLIMIT_NOFILE, (5, 5))
-                elif name == 'cpu_affinity':
-                    ret = meth()
-                    ret = meth([0])
-                elif name == 'send_signal':
-                    ret = meth(signal.SIGTERM)
-                else:
-                    ret = meth()
-            except psutil.ZombieProcess:
-                self.fail("ZombieProcess for %r was not supposed to happen" %
-                          name)
-            except psutil.NoSuchProcess:
-                pass
-            except psutil.AccessDenied:
-                if OPENBSD and name in ('threads', 'num_threads'):
-                    pass
-                else:
-                    raise
-            except NotImplementedError:
-                pass
-            else:
-                # NtQuerySystemInformation succeeds if process is gone.
-                if WINDOWS and name in ('exe', 'name'):
-                    normcase = os.path.normcase
-                    if name == 'exe':
-                        self.assertEqual(normcase(ret), normcase(PYTHON_EXE))
-                    else:
-                        self.assertEqual(
-                            normcase(ret),
-                            normcase(os.path.basename(PYTHON_EXE)))
-                    continue
-                self.fail(
-                    "NoSuchProcess exception not raised for %r, retval=%s" % (
-                        name, ret))
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process(self):
-        def succeed_or_zombie_p_exc(fun, *args, **kwargs):
-            try:
-                return fun(*args, **kwargs)
-            except (psutil.ZombieProcess, psutil.AccessDenied):
-                pass
-
-        zpid = create_zombie_proc()
-        self.addCleanup(reap_children, recursive=True)
-        # A zombie process should always be instantiable
-        zproc = psutil.Process(zpid)
-        # ...and at least its status always be querable
-        self.assertEqual(zproc.status(), psutil.STATUS_ZOMBIE)
-        # ...and it should be considered 'running'
-        self.assertTrue(zproc.is_running())
-        # ...and as_dict() shouldn't crash
-        zproc.as_dict()
-        # if cmdline succeeds it should be an empty list
-        ret = succeed_or_zombie_p_exc(zproc.suspend)
-        if ret is not None:
-            self.assertEqual(ret, [])
-
-        if hasattr(zproc, "rlimit"):
-            succeed_or_zombie_p_exc(zproc.rlimit, psutil.RLIMIT_NOFILE)
-            succeed_or_zombie_p_exc(zproc.rlimit, psutil.RLIMIT_NOFILE,
-                                    (5, 5))
-        # set methods
-        succeed_or_zombie_p_exc(zproc.parent)
-        if hasattr(zproc, 'cpu_affinity'):
-            try:
-                succeed_or_zombie_p_exc(zproc.cpu_affinity, [0])
-            except ValueError as err:
-                if TRAVIS and LINUX and "not eligible" in str(err):
-                    # https://travis-ci.org/giampaolo/psutil/jobs/279890461
-                    pass
-                else:
-                    raise
-
-        succeed_or_zombie_p_exc(zproc.nice, 0)
-        if hasattr(zproc, 'ionice'):
-            if LINUX:
-                succeed_or_zombie_p_exc(zproc.ionice, 2, 0)
-            else:
-                succeed_or_zombie_p_exc(zproc.ionice, 0)  # Windows
-        if hasattr(zproc, 'rlimit'):
-            succeed_or_zombie_p_exc(zproc.rlimit,
-                                    psutil.RLIMIT_NOFILE, (5, 5))
-        succeed_or_zombie_p_exc(zproc.suspend)
-        succeed_or_zombie_p_exc(zproc.resume)
-        succeed_or_zombie_p_exc(zproc.terminate)
-        succeed_or_zombie_p_exc(zproc.kill)
-
-        # ...its parent should 'see' it
-        # edit: not true on BSD and MACOS
-        # descendants = [x.pid for x in psutil.Process().children(
-        #                recursive=True)]
-        # self.assertIn(zpid, descendants)
-        # XXX should we also assume ppid be usable?  Note: this
-        # would be an important use case as the only way to get
-        # rid of a zombie is to kill its parent.
-        # self.assertEqual(zpid.ppid(), os.getpid())
-        # ...and all other APIs should be able to deal with it
-        self.assertTrue(psutil.pid_exists(zpid))
-        if not TRAVIS and MACOS:
-            # For some reason this started failing all of the sudden.
-            # Maybe they upgraded MACOS version?
-            # https://travis-ci.org/giampaolo/psutil/jobs/310896404
-            self.assertIn(zpid, psutil.pids())
-            self.assertIn(zpid, [x.pid for x in psutil.process_iter()])
-            psutil._pmap = {}
-            self.assertIn(zpid, [x.pid for x in psutil.process_iter()])
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process_is_running_w_exc(self):
-        # Emulate a case where internally is_running() raises
-        # ZombieProcess.
-        p = psutil.Process()
-        with mock.patch("psutil.Process",
-                        side_effect=psutil.ZombieProcess(0)) as m:
-            assert p.is_running()
-            assert m.called
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_zombie_process_status_w_exc(self):
-        # Emulate a case where internally status() raises
-        # ZombieProcess.
-        p = psutil.Process()
-        with mock.patch("psutil._psplatform.Process.status",
-                        side_effect=psutil.ZombieProcess(0)) as m:
-            self.assertEqual(p.status(), psutil.STATUS_ZOMBIE)
-            assert m.called
-
-    def test_pid_0(self):
-        # Process(0) is supposed to work on all platforms except Linux
-        if 0 not in psutil.pids():
-            self.assertRaises(psutil.NoSuchProcess, psutil.Process, 0)
-            return
-
-        # test all methods
-        p = psutil.Process(0)
-        for name in psutil._as_dict_attrnames:
-            if name == 'pid':
-                continue
-            meth = getattr(p, name)
-            try:
-                ret = meth()
-            except psutil.AccessDenied:
-                pass
-            else:
-                if name in ("uids", "gids"):
-                    self.assertEqual(ret.real, 0)
-                elif name == "username":
-                    if POSIX:
-                        self.assertEqual(p.username(), 'root')
-                    elif WINDOWS:
-                        self.assertEqual(p.username(), 'NT AUTHORITY\\SYSTEM')
-                elif name == "name":
-                    assert name, name
-
-        if hasattr(p, 'rlimit'):
-            try:
-                p.rlimit(psutil.RLIMIT_FSIZE)
-            except psutil.AccessDenied:
-                pass
-
-        p.as_dict()
-
-        if not OPENBSD:
-            self.assertIn(0, psutil.pids())
-            self.assertTrue(psutil.pid_exists(0))
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    def test_environ(self):
-        def clean_dict(d):
-            # Most of these are problematic on Travis.
-            d.pop("PSUTIL_TESTING", None)
-            d.pop("PLAT", None)
-            d.pop("HOME", None)
-            if MACOS:
-                d.pop("__CF_USER_TEXT_ENCODING", None)
-                d.pop("VERSIONER_PYTHON_PREFER_32_BIT", None)
-                d.pop("VERSIONER_PYTHON_VERSION", None)
-            return dict(
-                [(k.replace("\r", "").replace("\n", ""),
-                  v.replace("\r", "").replace("\n", ""))
-                 for k, v in d.items()])
-
-        self.maxDiff = None
-        p = psutil.Process()
-        d1 = clean_dict(p.environ())
-        d2 = clean_dict(os.environ.copy())
-        self.assertEqual(d1, d2)
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_weird_environ(self):
-        # environment variables can contain values without an equals sign
-        code = textwrap.dedent("""
-            #include <unistd.h>
-            #include <fcntl.h>
-            char * const argv[] = {"cat", 0};
-            char * const envp[] = {"A=1", "X", "C=3", 0};
-            int main(void) {
-                /* Close stderr on exec so parent can wait for the execve to
-                 * finish. */
-                if (fcntl(2, F_SETFD, FD_CLOEXEC) != 0)
-                    return 0;
-                return execve("/bin/cat", argv, envp);
-            }
-            """)
-        path = TESTFN
-        create_exe(path, c_code=code)
-        self.addCleanup(safe_rmpath, path)
-        sproc = get_test_subprocess([path],
-                                    stdin=subprocess.PIPE,
-                                    stderr=subprocess.PIPE)
-        p = psutil.Process(sproc.pid)
-        wait_for_pid(p.pid)
-        self.assertTrue(p.is_running())
-        # Wait for process to exec or exit.
-        self.assertEqual(sproc.stderr.read(), b"")
-        self.assertEqual(p.environ(), {"A": "1", "C": "3"})
-        sproc.communicate()
-        self.assertEqual(sproc.returncode, 0)
-
-
-# ===================================================================
-# --- Limited user tests
-# ===================================================================
-
-
-if POSIX and os.getuid() == 0:
-    class LimitedUserTestCase(TestProcess):
-        """Repeat the previous tests by using a limited user.
-        Executed only on UNIX and only if the user who run the test script
-        is root.
-        """
-        # the uid/gid the test suite runs under
-        if hasattr(os, 'getuid'):
-            PROCESS_UID = os.getuid()
-            PROCESS_GID = os.getgid()
-
-        def __init__(self, *args, **kwargs):
-            TestProcess.__init__(self, *args, **kwargs)
-            # re-define all existent test methods in order to
-            # ignore AccessDenied exceptions
-            for attr in [x for x in dir(self) if x.startswith('test')]:
-                meth = getattr(self, attr)
-
-                def test_(self):
-                    try:
-                        meth()
-                    except psutil.AccessDenied:
-                        pass
-                setattr(self, attr, types.MethodType(test_, self))
-
-        def setUp(self):
-            safe_rmpath(TESTFN)
-            TestProcess.setUp(self)
-            os.setegid(1000)
-            os.seteuid(1000)
-
-        def tearDown(self):
-            os.setegid(self.PROCESS_UID)
-            os.seteuid(self.PROCESS_GID)
-            TestProcess.tearDown(self)
-
-        def test_nice(self):
-            try:
-                psutil.Process().nice(-1)
-            except psutil.AccessDenied:
-                pass
-            else:
-                self.fail("exception not raised")
-
-        def test_zombie_process(self):
-            # causes problems if test test suite is run as root
-            pass
-
-
-# ===================================================================
-# --- psutil.Popen tests
-# ===================================================================
-
-
-class TestPopen(unittest.TestCase):
-    """Tests for psutil.Popen class."""
-
-    def tearDown(self):
-        reap_children()
-
-    def test_misc(self):
-        # XXX this test causes a ResourceWarning on Python 3 because
-        # psutil.__subproc instance doesn't get propertly freed.
-        # Not sure what to do though.
-        cmd = [PYTHON_EXE, "-c", "import time; time.sleep(60);"]
-        with psutil.Popen(cmd, stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE) as proc:
-            proc.name()
-            proc.cpu_times()
-            proc.stdin
-            self.assertTrue(dir(proc))
-            self.assertRaises(AttributeError, getattr, proc, 'foo')
-            proc.terminate()
-
-    def test_ctx_manager(self):
-        with psutil.Popen([PYTHON_EXE, "-V"],
-                          stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE,
-                          stdin=subprocess.PIPE) as proc:
-            proc.communicate()
-        assert proc.stdout.closed
-        assert proc.stderr.closed
-        assert proc.stdin.closed
-        self.assertEqual(proc.returncode, 0)
-
-    def test_kill_terminate(self):
-        # subprocess.Popen()'s terminate(), kill() and send_signal() do
-        # not raise exception after the process is gone. psutil.Popen
-        # diverges from that.
-        cmd = [PYTHON_EXE, "-c", "import time; time.sleep(60);"]
-        with psutil.Popen(cmd, stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE) as proc:
-            proc.terminate()
-            proc.wait()
-            self.assertRaises(psutil.NoSuchProcess, proc.terminate)
-            self.assertRaises(psutil.NoSuchProcess, proc.kill)
-            self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                              signal.SIGTERM)
-            if WINDOWS and sys.version_info >= (2, 7):
-                self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                                  signal.CTRL_C_EVENT)
-                self.assertRaises(psutil.NoSuchProcess, proc.send_signal,
-                                  signal.CTRL_BREAK_EVENT)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_sunos.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_sunos.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_sunos.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_sunos.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Sun OS specific tests."""
-
-import os
-
-import psutil
-from psutil import SUNOS
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-@unittest.skipIf(not SUNOS, "SUNOS only")
-class SunOSSpecificTestCase(unittest.TestCase):
-
-    def test_swap_memory(self):
-        out = sh('env PATH=/usr/sbin:/sbin:%s swap -l' % os.environ['PATH'])
-        lines = out.strip().split('\n')[1:]
-        if not lines:
-            raise ValueError('no swap device(s) configured')
-        total = free = 0
-        for line in lines:
-            line = line.split()
-            t, f = line[-2:]
-            total += int(int(t) * 512)
-            free += int(int(f) * 512)
-        used = total - free
-
-        psutil_swap = psutil.swap_memory()
-        self.assertEqual(psutil_swap.total, total)
-        self.assertEqual(psutil_swap.used, used)
-        self.assertEqual(psutil_swap.free, free)
-
-    def test_cpu_count(self):
-        out = sh("/usr/sbin/psrinfo")
-        self.assertEqual(psutil.cpu_count(), len(out.split('\n')))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_system.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_system.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_system.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_system.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,904 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Tests for system APIS."""
-
-import contextlib
-import datetime
-import errno
-import os
-import pprint
-import shutil
-import signal
-import socket
-import sys
-import tempfile
-import time
-
-import psutil
-from psutil import AIX
-from psutil import BSD
-from psutil import FREEBSD
-from psutil import LINUX
-from psutil import MACOS
-from psutil import NETBSD
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import SUNOS
-from psutil import WINDOWS
-from psutil._compat import FileNotFoundError
-from psutil._compat import long
-from psutil.tests import ASCII_FS
-from psutil.tests import check_net_address
-from psutil.tests import CI_TESTING
-from psutil.tests import DEVNULL
-from psutil.tests import enum
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import HAS_CPU_FREQ
-from psutil.tests import HAS_GETLOADAVG
-from psutil.tests import HAS_NET_IO_COUNTERS
-from psutil.tests import HAS_SENSORS_BATTERY
-from psutil.tests import HAS_SENSORS_FANS
-from psutil.tests import HAS_SENSORS_TEMPERATURES
-from psutil.tests import mock
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import safe_rmpath
-from psutil.tests import TESTFN
-from psutil.tests import TESTFN_UNICODE
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-
-
-# ===================================================================
-# --- System-related API tests
-# ===================================================================
-
-
-class TestProcessAPIs(unittest.TestCase):
-
-    def setUp(self):
-        safe_rmpath(TESTFN)
-
-    def tearDown(self):
-        reap_children()
-
-    def test_process_iter(self):
-        self.assertIn(os.getpid(), [x.pid for x in psutil.process_iter()])
-        sproc = get_test_subprocess()
-        self.assertIn(sproc.pid, [x.pid for x in psutil.process_iter()])
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        p.wait()
-        self.assertNotIn(sproc.pid, [x.pid for x in psutil.process_iter()])
-
-        with mock.patch('psutil.Process',
-                        side_effect=psutil.NoSuchProcess(os.getpid())):
-            self.assertEqual(list(psutil.process_iter()), [])
-        with mock.patch('psutil.Process',
-                        side_effect=psutil.AccessDenied(os.getpid())):
-            with self.assertRaises(psutil.AccessDenied):
-                list(psutil.process_iter())
-
-    def test_prcess_iter_w_attrs(self):
-        for p in psutil.process_iter(attrs=['pid']):
-            self.assertEqual(list(p.info.keys()), ['pid'])
-        with self.assertRaises(ValueError):
-            list(psutil.process_iter(attrs=['foo']))
-        with mock.patch("psutil._psplatform.Process.cpu_times",
-                        side_effect=psutil.AccessDenied(0, "")) as m:
-            for p in psutil.process_iter(attrs=["pid", "cpu_times"]):
-                self.assertIsNone(p.info['cpu_times'])
-                self.assertGreaterEqual(p.info['pid'], 0)
-            assert m.called
-        with mock.patch("psutil._psplatform.Process.cpu_times",
-                        side_effect=psutil.AccessDenied(0, "")) as m:
-            flag = object()
-            for p in psutil.process_iter(
-                    attrs=["pid", "cpu_times"], ad_value=flag):
-                self.assertIs(p.info['cpu_times'], flag)
-                self.assertGreaterEqual(p.info['pid'], 0)
-            assert m.called
-
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "get_test_subprocess() unreliable on PYPY + WINDOWS")
-    def test_wait_procs(self):
-        def callback(p):
-            pids.append(p.pid)
-
-        pids = []
-        sproc1 = get_test_subprocess()
-        sproc2 = get_test_subprocess()
-        sproc3 = get_test_subprocess()
-        procs = [psutil.Process(x.pid) for x in (sproc1, sproc2, sproc3)]
-        self.assertRaises(ValueError, psutil.wait_procs, procs, timeout=-1)
-        self.assertRaises(TypeError, psutil.wait_procs, procs, callback=1)
-        t = time.time()
-        gone, alive = psutil.wait_procs(procs, timeout=0.01, callback=callback)
-
-        self.assertLess(time.time() - t, 0.5)
-        self.assertEqual(gone, [])
-        self.assertEqual(len(alive), 3)
-        self.assertEqual(pids, [])
-        for p in alive:
-            self.assertFalse(hasattr(p, 'returncode'))
-
-        @retry_on_failure(30)
-        def test(procs, callback):
-            gone, alive = psutil.wait_procs(procs, timeout=0.03,
-                                            callback=callback)
-            self.assertEqual(len(gone), 1)
-            self.assertEqual(len(alive), 2)
-            return gone, alive
-
-        sproc3.terminate()
-        gone, alive = test(procs, callback)
-        self.assertIn(sproc3.pid, [x.pid for x in gone])
-        if POSIX:
-            self.assertEqual(gone.pop().returncode, -signal.SIGTERM)
-        else:
-            self.assertEqual(gone.pop().returncode, 1)
-        self.assertEqual(pids, [sproc3.pid])
-        for p in alive:
-            self.assertFalse(hasattr(p, 'returncode'))
-
-        @retry_on_failure(30)
-        def test(procs, callback):
-            gone, alive = psutil.wait_procs(procs, timeout=0.03,
-                                            callback=callback)
-            self.assertEqual(len(gone), 3)
-            self.assertEqual(len(alive), 0)
-            return gone, alive
-
-        sproc1.terminate()
-        sproc2.terminate()
-        gone, alive = test(procs, callback)
-        self.assertEqual(set(pids), set([sproc1.pid, sproc2.pid, sproc3.pid]))
-        for p in gone:
-            self.assertTrue(hasattr(p, 'returncode'))
-
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "get_test_subprocess() unreliable on PYPY + WINDOWS")
-    def test_wait_procs_no_timeout(self):
-        sproc1 = get_test_subprocess()
-        sproc2 = get_test_subprocess()
-        sproc3 = get_test_subprocess()
-        procs = [psutil.Process(x.pid) for x in (sproc1, sproc2, sproc3)]
-        for p in procs:
-            p.terminate()
-        gone, alive = psutil.wait_procs(procs)
-
-    def test_pid_exists(self):
-        sproc = get_test_subprocess()
-        self.assertTrue(psutil.pid_exists(sproc.pid))
-        p = psutil.Process(sproc.pid)
-        p.kill()
-        p.wait()
-        self.assertFalse(psutil.pid_exists(sproc.pid))
-        self.assertFalse(psutil.pid_exists(-1))
-        self.assertEqual(psutil.pid_exists(0), 0 in psutil.pids())
-
-    def test_pid_exists_2(self):
-        reap_children()
-        pids = psutil.pids()
-        for pid in pids:
-            try:
-                assert psutil.pid_exists(pid)
-            except AssertionError:
-                # in case the process disappeared in meantime fail only
-                # if it is no longer in psutil.pids()
-                time.sleep(.1)
-                if pid in psutil.pids():
-                    self.fail(pid)
-        pids = range(max(pids) + 5000, max(pids) + 6000)
-        for pid in pids:
-            self.assertFalse(psutil.pid_exists(pid), msg=pid)
-
-    def test_pids(self):
-        pidslist = psutil.pids()
-        procslist = [x.pid for x in psutil.process_iter()]
-        # make sure every pid is unique
-        self.assertEqual(sorted(set(pidslist)), pidslist)
-        self.assertEqual(pidslist, procslist)
-
-
-class TestMiscAPIs(unittest.TestCase):
-
-    def test_boot_time(self):
-        bt = psutil.boot_time()
-        self.assertIsInstance(bt, float)
-        self.assertGreater(bt, 0)
-        self.assertLess(bt, time.time())
-
-    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-    def test_users(self):
-        users = psutil.users()
-        self.assertNotEqual(users, [])
-        for user in users:
-            assert user.name, user
-            self.assertIsInstance(user.name, str)
-            self.assertIsInstance(user.terminal, (str, type(None)))
-            if user.host is not None:
-                self.assertIsInstance(user.host, (str, type(None)))
-            user.terminal
-            user.host
-            assert user.started > 0.0, user
-            datetime.datetime.fromtimestamp(user.started)
-            if WINDOWS or OPENBSD:
-                self.assertIsNone(user.pid)
-            else:
-                psutil.Process(user.pid)
-
-    @unittest.skipIf(not POSIX, 'POSIX only')
-    def test_PAGESIZE(self):
-        # pagesize is used internally to perform different calculations
-        # and it's determined by using SC_PAGE_SIZE; make sure
-        # getpagesize() returns the same value.
-        import resource
-        self.assertEqual(os.sysconf("SC_PAGE_SIZE"), resource.getpagesize())
-
-    def test_test(self):
-        # test for psutil.test() function
-        stdout = sys.stdout
-        sys.stdout = DEVNULL
-        try:
-            psutil.test()
-        finally:
-            sys.stdout = stdout
-
-    def test_os_constants(self):
-        names = ["POSIX", "WINDOWS", "LINUX", "MACOS", "FREEBSD", "OPENBSD",
-                 "NETBSD", "BSD", "SUNOS"]
-        for name in names:
-            self.assertIsInstance(getattr(psutil, name), bool, msg=name)
-
-        if os.name == 'posix':
-            assert psutil.POSIX
-            assert not psutil.WINDOWS
-            names.remove("POSIX")
-            if "linux" in sys.platform.lower():
-                assert psutil.LINUX
-                names.remove("LINUX")
-            elif "bsd" in sys.platform.lower():
-                assert psutil.BSD
-                self.assertEqual([psutil.FREEBSD, psutil.OPENBSD,
-                                  psutil.NETBSD].count(True), 1)
-                names.remove("BSD")
-                names.remove("FREEBSD")
-                names.remove("OPENBSD")
-                names.remove("NETBSD")
-            elif "sunos" in sys.platform.lower() or \
-                    "solaris" in sys.platform.lower():
-                assert psutil.SUNOS
-                names.remove("SUNOS")
-            elif "darwin" in sys.platform.lower():
-                assert psutil.MACOS
-                names.remove("MACOS")
-        else:
-            assert psutil.WINDOWS
-            assert not psutil.POSIX
-            names.remove("WINDOWS")
-
-        # assert all other constants are set to False
-        for name in names:
-            self.assertIs(getattr(psutil, name), False, msg=name)
-
-
-class TestMemoryAPIs(unittest.TestCase):
-
-    def test_virtual_memory(self):
-        mem = psutil.virtual_memory()
-        assert mem.total > 0, mem
-        assert mem.available > 0, mem
-        assert 0 <= mem.percent <= 100, mem
-        assert mem.used > 0, mem
-        assert mem.free >= 0, mem
-        for name in mem._fields:
-            value = getattr(mem, name)
-            if name != 'percent':
-                self.assertIsInstance(value, (int, long))
-            if name != 'total':
-                if not value >= 0:
-                    self.fail("%r < 0 (%s)" % (name, value))
-                if value > mem.total:
-                    self.fail("%r > total (total=%s, %s=%s)"
-                              % (name, mem.total, name, value))
-
-    def test_swap_memory(self):
-        mem = psutil.swap_memory()
-        self.assertEqual(
-            mem._fields, ('total', 'used', 'free', 'percent', 'sin', 'sout'))
-
-        assert mem.total >= 0, mem
-        assert mem.used >= 0, mem
-        if mem.total > 0:
-            # likely a system with no swap partition
-            assert mem.free > 0, mem
-        else:
-            assert mem.free == 0, mem
-        assert 0 <= mem.percent <= 100, mem
-        assert mem.sin >= 0, mem
-        assert mem.sout >= 0, mem
-
-
-class TestCpuAPIs(unittest.TestCase):
-
-    def test_cpu_count_logical(self):
-        logical = psutil.cpu_count()
-        self.assertIsNotNone(logical)
-        self.assertEqual(logical, len(psutil.cpu_times(percpu=True)))
-        self.assertGreaterEqual(logical, 1)
-        #
-        if os.path.exists("/proc/cpuinfo"):
-            with open("/proc/cpuinfo") as fd:
-                cpuinfo_data = fd.read()
-            if "physical id" not in cpuinfo_data:
-                raise unittest.SkipTest("cpuinfo doesn't include physical id")
-
-    def test_cpu_count_physical(self):
-        logical = psutil.cpu_count()
-        physical = psutil.cpu_count(logical=False)
-        if physical is None:
-            raise self.skipTest("physical cpu_count() is None")
-        if WINDOWS and sys.getwindowsversion()[:2] <= (6, 1):  # <= Vista
-            self.assertIsNone(physical)
-        else:
-            self.assertGreaterEqual(physical, 1)
-            self.assertGreaterEqual(logical, physical)
-
-    def test_cpu_count_none(self):
-        # https://github.com/giampaolo/psutil/issues/1085
-        for val in (-1, 0, None):
-            with mock.patch('psutil._psplatform.cpu_count_logical',
-                            return_value=val) as m:
-                self.assertIsNone(psutil.cpu_count())
-                assert m.called
-            with mock.patch('psutil._psplatform.cpu_count_physical',
-                            return_value=val) as m:
-                self.assertIsNone(psutil.cpu_count(logical=False))
-                assert m.called
-
-    def test_cpu_times(self):
-        # Check type, value >= 0, str().
-        total = 0
-        times = psutil.cpu_times()
-        sum(times)
-        for cp_time in times:
-            self.assertIsInstance(cp_time, float)
-            self.assertGreaterEqual(cp_time, 0.0)
-            total += cp_time
-        self.assertEqual(total, sum(times))
-        str(times)
-        # CPU times are always supposed to increase over time
-        # or at least remain the same and that's because time
-        # cannot go backwards.
-        # Surprisingly sometimes this might not be the case (at
-        # least on Windows and Linux), see:
-        # https://github.com/giampaolo/psutil/issues/392
-        # https://github.com/giampaolo/psutil/issues/645
-        # if not WINDOWS:
-        #     last = psutil.cpu_times()
-        #     for x in range(100):
-        #         new = psutil.cpu_times()
-        #         for field in new._fields:
-        #             new_t = getattr(new, field)
-        #             last_t = getattr(last, field)
-        #             self.assertGreaterEqual(new_t, last_t,
-        #                                     msg="%s %s" % (new_t, last_t))
-        #         last = new
-
-    def test_cpu_times_time_increases(self):
-        # Make sure time increases between calls.
-        t1 = sum(psutil.cpu_times())
-        stop_at = time.time() + 1
-        while time.time() < stop_at:
-            t2 = sum(psutil.cpu_times())
-            if t2 > t1:
-                return
-        self.fail("time remained the same")
-
-    def test_per_cpu_times(self):
-        # Check type, value >= 0, str().
-        for times in psutil.cpu_times(percpu=True):
-            total = 0
-            sum(times)
-            for cp_time in times:
-                self.assertIsInstance(cp_time, float)
-                self.assertGreaterEqual(cp_time, 0.0)
-                total += cp_time
-            self.assertEqual(total, sum(times))
-            str(times)
-        self.assertEqual(len(psutil.cpu_times(percpu=True)[0]),
-                         len(psutil.cpu_times(percpu=False)))
-
-        # Note: in theory CPU times are always supposed to increase over
-        # time or remain the same but never go backwards. In practice
-        # sometimes this is not the case.
-        # This issue seemd to be afflict Windows:
-        # https://github.com/giampaolo/psutil/issues/392
-        # ...but it turns out also Linux (rarely) behaves the same.
-        # last = psutil.cpu_times(percpu=True)
-        # for x in range(100):
-        #     new = psutil.cpu_times(percpu=True)
-        #     for index in range(len(new)):
-        #         newcpu = new[index]
-        #         lastcpu = last[index]
-        #         for field in newcpu._fields:
-        #             new_t = getattr(newcpu, field)
-        #             last_t = getattr(lastcpu, field)
-        #             self.assertGreaterEqual(
-        #                 new_t, last_t, msg="%s %s" % (lastcpu, newcpu))
-        #     last = new
-
-    def test_per_cpu_times_2(self):
-        # Simulate some work load then make sure time have increased
-        # between calls.
-        tot1 = psutil.cpu_times(percpu=True)
-        giveup_at = time.time() + 1
-        while True:
-            if time.time() >= giveup_at:
-                return self.fail("timeout")
-            tot2 = psutil.cpu_times(percpu=True)
-            for t1, t2 in zip(tot1, tot2):
-                t1, t2 = psutil._cpu_busy_time(t1), psutil._cpu_busy_time(t2)
-                difference = t2 - t1
-                if difference >= 0.05:
-                    return
-
-    def test_cpu_times_comparison(self):
-        # Make sure the sum of all per cpu times is almost equal to
-        # base "one cpu" times.
-        base = psutil.cpu_times()
-        per_cpu = psutil.cpu_times(percpu=True)
-        summed_values = base._make([sum(num) for num in zip(*per_cpu)])
-        for field in base._fields:
-            self.assertAlmostEqual(
-                getattr(base, field), getattr(summed_values, field), delta=1)
-
-    def _test_cpu_percent(self, percent, last_ret, new_ret):
-        try:
-            self.assertIsInstance(percent, float)
-            self.assertGreaterEqual(percent, 0.0)
-            self.assertIsNot(percent, -0.0)
-            self.assertLessEqual(percent, 100.0 * psutil.cpu_count())
-        except AssertionError as err:
-            raise AssertionError("\n%s\nlast=%s\nnew=%s" % (
-                err, pprint.pformat(last_ret), pprint.pformat(new_ret)))
-
-    def test_cpu_percent(self):
-        last = psutil.cpu_percent(interval=0.001)
-        for x in range(100):
-            new = psutil.cpu_percent(interval=None)
-            self._test_cpu_percent(new, last, new)
-            last = new
-        with self.assertRaises(ValueError):
-            psutil.cpu_percent(interval=-1)
-
-    def test_per_cpu_percent(self):
-        last = psutil.cpu_percent(interval=0.001, percpu=True)
-        self.assertEqual(len(last), psutil.cpu_count())
-        for x in range(100):
-            new = psutil.cpu_percent(interval=None, percpu=True)
-            for percent in new:
-                self._test_cpu_percent(percent, last, new)
-            last = new
-        with self.assertRaises(ValueError):
-            psutil.cpu_percent(interval=-1, percpu=True)
-
-    def test_cpu_times_percent(self):
-        last = psutil.cpu_times_percent(interval=0.001)
-        for x in range(100):
-            new = psutil.cpu_times_percent(interval=None)
-            for percent in new:
-                self._test_cpu_percent(percent, last, new)
-            self._test_cpu_percent(sum(new), last, new)
-            last = new
-
-    def test_per_cpu_times_percent(self):
-        last = psutil.cpu_times_percent(interval=0.001, percpu=True)
-        self.assertEqual(len(last), psutil.cpu_count())
-        for x in range(100):
-            new = psutil.cpu_times_percent(interval=None, percpu=True)
-            for cpu in new:
-                for percent in cpu:
-                    self._test_cpu_percent(percent, last, new)
-                self._test_cpu_percent(sum(cpu), last, new)
-            last = new
-
-    def test_per_cpu_times_percent_negative(self):
-        # see: https://github.com/giampaolo/psutil/issues/645
-        psutil.cpu_times_percent(percpu=True)
-        zero_times = [x._make([0 for x in range(len(x._fields))])
-                      for x in psutil.cpu_times(percpu=True)]
-        with mock.patch('psutil.cpu_times', return_value=zero_times):
-            for cpu in psutil.cpu_times_percent(percpu=True):
-                for percent in cpu:
-                    self._test_cpu_percent(percent, None, None)
-
-    def test_cpu_stats(self):
-        # Tested more extensively in per-platform test modules.
-        infos = psutil.cpu_stats()
-        self.assertEqual(
-            infos._fields,
-            ('ctx_switches', 'interrupts', 'soft_interrupts', 'syscalls'))
-        for name in infos._fields:
-            value = getattr(infos, name)
-            self.assertGreaterEqual(value, 0)
-            # on AIX, ctx_switches is always 0
-            if not AIX and name in ('ctx_switches', 'interrupts'):
-                self.assertGreater(value, 0)
-
-    @unittest.skipIf(not HAS_CPU_FREQ, "not suported")
-    def test_cpu_freq(self):
-        def check_ls(ls):
-            for nt in ls:
-                self.assertEqual(nt._fields, ('current', 'min', 'max'))
-                if nt.max != 0.0:
-                    self.assertLessEqual(nt.current, nt.max)
-                for name in nt._fields:
-                    value = getattr(nt, name)
-                    self.assertIsInstance(value, (int, long, float))
-                    self.assertGreaterEqual(value, 0)
-
-        ls = psutil.cpu_freq(percpu=True)
-        if TRAVIS and not ls:
-            raise self.skipTest("skipped on Travis")
-        if FREEBSD and not ls:
-            raise self.skipTest("returns empty list on FreeBSD")
-
-        assert ls, ls
-        check_ls([psutil.cpu_freq(percpu=False)])
-
-        if LINUX:
-            self.assertEqual(len(ls), psutil.cpu_count())
-
-    @unittest.skipIf(not HAS_GETLOADAVG, "not supported")
-    def test_getloadavg(self):
-        loadavg = psutil.getloadavg()
-        assert len(loadavg) == 3
-
-        for load in loadavg:
-            self.assertIsInstance(load, float)
-            self.assertGreaterEqual(load, 0.0)
-
-
-class TestDiskAPIs(unittest.TestCase):
-
-    def test_disk_usage(self):
-        usage = psutil.disk_usage(os.getcwd())
-        self.assertEqual(usage._fields, ('total', 'used', 'free', 'percent'))
-
-        assert usage.total > 0, usage
-        assert usage.used > 0, usage
-        assert usage.free > 0, usage
-        assert usage.total > usage.used, usage
-        assert usage.total > usage.free, usage
-        assert 0 <= usage.percent <= 100, usage.percent
-        if hasattr(shutil, 'disk_usage'):
-            # py >= 3.3, see: http://bugs.python.org/issue12442
-            shutil_usage = shutil.disk_usage(os.getcwd())
-            tolerance = 5 * 1024 * 1024  # 5MB
-            self.assertEqual(usage.total, shutil_usage.total)
-            self.assertAlmostEqual(usage.free, shutil_usage.free,
-                                   delta=tolerance)
-            self.assertAlmostEqual(usage.used, shutil_usage.used,
-                                   delta=tolerance)
-
-        # if path does not exist OSError ENOENT is expected across
-        # all platforms
-        fname = tempfile.mktemp()
-        with self.assertRaises(FileNotFoundError):
-            psutil.disk_usage(fname)
-
-    def test_disk_usage_unicode(self):
-        # See: https://github.com/giampaolo/psutil/issues/416
-        if ASCII_FS:
-            with self.assertRaises(UnicodeEncodeError):
-                psutil.disk_usage(TESTFN_UNICODE)
-
-    def test_disk_usage_bytes(self):
-        psutil.disk_usage(b'.')
-
-    def test_disk_partitions(self):
-        # all = False
-        ls = psutil.disk_partitions(all=False)
-        # on travis we get:
-        #     self.assertEqual(p.cpu_affinity(), [n])
-        # AssertionError: Lists differ: [0, 1, 2, 3, 4, 5, 6, 7,... != [0]
-        self.assertTrue(ls, msg=ls)
-        for disk in ls:
-            self.assertIsInstance(disk.device, str)
-            self.assertIsInstance(disk.mountpoint, str)
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-            if WINDOWS and 'cdrom' in disk.opts:
-                continue
-            if not POSIX:
-                assert os.path.exists(disk.device), disk
-            else:
-                # we cannot make any assumption about this, see:
-                # http://goo.gl/p9c43
-                disk.device
-            # on modern systems mount points can also be files
-            assert os.path.exists(disk.mountpoint), disk
-            assert disk.fstype, disk
-
-        # all = True
-        ls = psutil.disk_partitions(all=True)
-        self.assertTrue(ls, msg=ls)
-        for disk in psutil.disk_partitions(all=True):
-            if not WINDOWS and disk.mountpoint:
-                try:
-                    os.stat(disk.mountpoint)
-                except OSError as err:
-                    if TRAVIS and MACOS and err.errno == errno.EIO:
-                        continue
-                    # http://mail.python.org/pipermail/python-dev/
-                    #     2012-June/120787.html
-                    if err.errno not in (errno.EPERM, errno.EACCES):
-                        raise
-                else:
-                    assert os.path.exists(disk.mountpoint), disk
-            self.assertIsInstance(disk.fstype, str)
-            self.assertIsInstance(disk.opts, str)
-
-        def find_mount_point(path):
-            path = os.path.abspath(path)
-            while not os.path.ismount(path):
-                path = os.path.dirname(path)
-            return path.lower()
-
-        mount = find_mount_point(__file__)
-        mounts = [x.mountpoint.lower() for x in
-                  psutil.disk_partitions(all=True) if x.mountpoint]
-        self.assertIn(mount, mounts)
-        psutil.disk_usage(mount)
-
-    @unittest.skipIf(LINUX and not os.path.exists('/proc/diskstats'),
-                     '/proc/diskstats not available on this linux version')
-    @unittest.skipIf(CI_TESTING and not psutil.disk_io_counters(),
-                     "unreliable on CI")  # no visible disks
-    def test_disk_io_counters(self):
-        def check_ntuple(nt):
-            self.assertEqual(nt[0], nt.read_count)
-            self.assertEqual(nt[1], nt.write_count)
-            self.assertEqual(nt[2], nt.read_bytes)
-            self.assertEqual(nt[3], nt.write_bytes)
-            if not (OPENBSD or NETBSD):
-                self.assertEqual(nt[4], nt.read_time)
-                self.assertEqual(nt[5], nt.write_time)
-                if LINUX:
-                    self.assertEqual(nt[6], nt.read_merged_count)
-                    self.assertEqual(nt[7], nt.write_merged_count)
-                    self.assertEqual(nt[8], nt.busy_time)
-                elif FREEBSD:
-                    self.assertEqual(nt[6], nt.busy_time)
-            for name in nt._fields:
-                assert getattr(nt, name) >= 0, nt
-
-        ret = psutil.disk_io_counters(perdisk=False)
-        assert ret is not None, "no disks on this system?"
-        check_ntuple(ret)
-        ret = psutil.disk_io_counters(perdisk=True)
-        # make sure there are no duplicates
-        self.assertEqual(len(ret), len(set(ret)))
-        for key in ret:
-            assert key, key
-            check_ntuple(ret[key])
-
-    def test_disk_io_counters_no_disks(self):
-        # Emulate a case where no disks are installed, see:
-        # https://github.com/giampaolo/psutil/issues/1062
-        with mock.patch('psutil._psplatform.disk_io_counters',
-                        return_value={}) as m:
-            self.assertIsNone(psutil.disk_io_counters(perdisk=False))
-            self.assertEqual(psutil.disk_io_counters(perdisk=True), {})
-            assert m.called
-
-
-class TestNetAPIs(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters(self):
-        def check_ntuple(nt):
-            self.assertEqual(nt[0], nt.bytes_sent)
-            self.assertEqual(nt[1], nt.bytes_recv)
-            self.assertEqual(nt[2], nt.packets_sent)
-            self.assertEqual(nt[3], nt.packets_recv)
-            self.assertEqual(nt[4], nt.errin)
-            self.assertEqual(nt[5], nt.errout)
-            self.assertEqual(nt[6], nt.dropin)
-            self.assertEqual(nt[7], nt.dropout)
-            assert nt.bytes_sent >= 0, nt
-            assert nt.bytes_recv >= 0, nt
-            assert nt.packets_sent >= 0, nt
-            assert nt.packets_recv >= 0, nt
-            assert nt.errin >= 0, nt
-            assert nt.errout >= 0, nt
-            assert nt.dropin >= 0, nt
-            assert nt.dropout >= 0, nt
-
-        ret = psutil.net_io_counters(pernic=False)
-        check_ntuple(ret)
-        ret = psutil.net_io_counters(pernic=True)
-        self.assertNotEqual(ret, [])
-        for key in ret:
-            self.assertTrue(key)
-            self.assertIsInstance(key, str)
-            check_ntuple(ret[key])
-
-    @unittest.skipIf(not HAS_NET_IO_COUNTERS, 'not supported')
-    def test_net_io_counters_no_nics(self):
-        # Emulate a case where no NICs are installed, see:
-        # https://github.com/giampaolo/psutil/issues/1062
-        with mock.patch('psutil._psplatform.net_io_counters',
-                        return_value={}) as m:
-            self.assertIsNone(psutil.net_io_counters(pernic=False))
-            self.assertEqual(psutil.net_io_counters(pernic=True), {})
-            assert m.called
-
-    def test_net_if_addrs(self):
-        nics = psutil.net_if_addrs()
-        assert nics, nics
-
-        nic_stats = psutil.net_if_stats()
-
-        # Not reliable on all platforms (net_if_addrs() reports more
-        # interfaces).
-        # self.assertEqual(sorted(nics.keys()),
-        #                  sorted(psutil.net_io_counters(pernic=True).keys()))
-
-        families = set([socket.AF_INET, socket.AF_INET6, psutil.AF_LINK])
-        for nic, addrs in nics.items():
-            self.assertIsInstance(nic, str)
-            self.assertEqual(len(set(addrs)), len(addrs))
-            for addr in addrs:
-                self.assertIsInstance(addr.family, int)
-                self.assertIsInstance(addr.address, str)
-                self.assertIsInstance(addr.netmask, (str, type(None)))
-                self.assertIsInstance(addr.broadcast, (str, type(None)))
-                self.assertIn(addr.family, families)
-                if sys.version_info >= (3, 4):
-                    self.assertIsInstance(addr.family, enum.IntEnum)
-                if nic_stats[nic].isup:
-                    # Do not test binding to addresses of interfaces
-                    # that are down
-                    if addr.family == socket.AF_INET:
-                        s = socket.socket(addr.family)
-                        with contextlib.closing(s):
-                            s.bind((addr.address, 0))
-                    elif addr.family == socket.AF_INET6:
-                        info = socket.getaddrinfo(
-                            addr.address, 0, socket.AF_INET6,
-                            socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
-                        af, socktype, proto, canonname, sa = info
-                        s = socket.socket(af, socktype, proto)
-                        with contextlib.closing(s):
-                            s.bind(sa)
-                for ip in (addr.address, addr.netmask, addr.broadcast,
-                           addr.ptp):
-                    if ip is not None:
-                        # TODO: skip AF_INET6 for now because I get:
-                        # AddressValueError: Only hex digits permitted in
-                        # u'c6f3%lxcbr0' in u'fe80::c8e0:fff:fe54:c6f3%lxcbr0'
-                        if addr.family != socket.AF_INET6:
-                            check_net_address(ip, addr.family)
-                # broadcast and ptp addresses are mutually exclusive
-                if addr.broadcast:
-                    self.assertIsNone(addr.ptp)
-                elif addr.ptp:
-                    self.assertIsNone(addr.broadcast)
-
-        if BSD or MACOS or SUNOS:
-            if hasattr(socket, "AF_LINK"):
-                self.assertEqual(psutil.AF_LINK, socket.AF_LINK)
-        elif LINUX:
-            self.assertEqual(psutil.AF_LINK, socket.AF_PACKET)
-        elif WINDOWS:
-            self.assertEqual(psutil.AF_LINK, -1)
-
-    def test_net_if_addrs_mac_null_bytes(self):
-        # Simulate that the underlying C function returns an incomplete
-        # MAC address. psutil is supposed to fill it with null bytes.
-        # https://github.com/giampaolo/psutil/issues/786
-        if POSIX:
-            ret = [('em1', psutil.AF_LINK, '06:3d:29', None, None, None)]
-        else:
-            ret = [('em1', -1, '06-3d-29', None, None, None)]
-        with mock.patch('psutil._psplatform.net_if_addrs',
-                        return_value=ret) as m:
-            addr = psutil.net_if_addrs()['em1'][0]
-            assert m.called
-            if POSIX:
-                self.assertEqual(addr.address, '06:3d:29:00:00:00')
-            else:
-                self.assertEqual(addr.address, '06-3d-29-00-00-00')
-
-    @unittest.skipIf(TRAVIS, "unreliable on TRAVIS")  # raises EPERM
-    def test_net_if_stats(self):
-        nics = psutil.net_if_stats()
-        assert nics, nics
-        all_duplexes = (psutil.NIC_DUPLEX_FULL,
-                        psutil.NIC_DUPLEX_HALF,
-                        psutil.NIC_DUPLEX_UNKNOWN)
-        for name, stats in nics.items():
-            self.assertIsInstance(name, str)
-            isup, duplex, speed, mtu = stats
-            self.assertIsInstance(isup, bool)
-            self.assertIn(duplex, all_duplexes)
-            self.assertIn(duplex, all_duplexes)
-            self.assertGreaterEqual(speed, 0)
-            self.assertGreaterEqual(mtu, 0)
-
-    @unittest.skipIf(not (LINUX or BSD or MACOS),
-                     "LINUX or BSD or MACOS specific")
-    def test_net_if_stats_enodev(self):
-        # See: https://github.com/giampaolo/psutil/issues/1279
-        with mock.patch('psutil._psutil_posix.net_if_mtu',
-                        side_effect=OSError(errno.ENODEV, "")) as m:
-            ret = psutil.net_if_stats()
-            self.assertEqual(ret, {})
-            assert m.called
-
-
-class TestSensorsAPIs(unittest.TestCase):
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures(self):
-        temps = psutil.sensors_temperatures()
-        for name, entries in temps.items():
-            self.assertIsInstance(name, str)
-            for entry in entries:
-                self.assertIsInstance(entry.label, str)
-                if entry.current is not None:
-                    self.assertGreaterEqual(entry.current, 0)
-                if entry.high is not None:
-                    self.assertGreaterEqual(entry.high, 0)
-                if entry.critical is not None:
-                    self.assertGreaterEqual(entry.critical, 0)
-
-    @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
-    def test_sensors_temperatures_fahreneit(self):
-        d = {'coretemp': [('label', 50.0, 60.0, 70.0)]}
-        with mock.patch("psutil._psplatform.sensors_temperatures",
-                        return_value=d) as m:
-            temps = psutil.sensors_temperatures(
-                fahrenheit=True)['coretemp'][0]
-            assert m.called
-            self.assertEqual(temps.current, 122.0)
-            self.assertEqual(temps.high, 140.0)
-            self.assertEqual(temps.critical, 158.0)
-
-    @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_sensors_battery(self):
-        ret = psutil.sensors_battery()
-        self.assertGreaterEqual(ret.percent, 0)
-        self.assertLessEqual(ret.percent, 100)
-        if ret.secsleft not in (psutil.POWER_TIME_UNKNOWN,
-                                psutil.POWER_TIME_UNLIMITED):
-            self.assertGreaterEqual(ret.secsleft, 0)
-        else:
-            if ret.secsleft == psutil.POWER_TIME_UNLIMITED:
-                self.assertTrue(ret.power_plugged)
-        self.assertIsInstance(ret.power_plugged, bool)
-
-    @unittest.skipIf(not HAS_SENSORS_FANS, "not supported")
-    def test_sensors_fans(self):
-        fans = psutil.sensors_fans()
-        for name, entries in fans.items():
-            self.assertIsInstance(name, str)
-            for entry in entries:
-                self.assertIsInstance(entry.label, str)
-                self.assertIsInstance(entry.current, (int, long))
-                self.assertGreaterEqual(entry.current, 0)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_unicode.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_unicode.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_unicode.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_unicode.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,372 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-Notes about unicode handling in psutil
-======================================
-
-Starting from version 5.3.0 psutil adds unicode support, see:
-https://github.com/giampaolo/psutil/issues/1040
-The notes below apply to *any* API returning a string such as
-process exe(), cwd() or username():
-
-* all strings are encoded by using the OS filesystem encoding
-  (sys.getfilesystemencoding()) which varies depending on the platform
-  (e.g. "UTF-8" on macOS, "mbcs" on Win)
-* no API call is supposed to crash with UnicodeDecodeError
-* instead, in case of badly encoded data returned by the OS, the
-  following error handlers are used to replace the corrupted characters in
-  the string:
-    * Python 3: sys.getfilesystemencodeerrors() (PY 3.6+) or
-      "surrogatescape" on POSIX and "replace" on Windows
-    * Python 2: "replace"
-* on Python 2 all APIs return bytes (str type), never unicode
-* on Python 2, you can go back to unicode by doing:
-
-    >>> unicode(p.exe(), sys.getdefaultencoding(), errors="replace")
-
-For a detailed explanation of how psutil handles unicode see #1040.
-
-Tests
-=====
-
-List of APIs returning or dealing with a string:
-('not tested' means they are not tested to deal with non-ASCII strings):
-
-* Process.cmdline()
-* Process.connections('unix')
-* Process.cwd()
-* Process.environ()
-* Process.exe()
-* Process.memory_maps()
-* Process.name()
-* Process.open_files()
-* Process.username()             (not tested)
-
-* disk_io_counters()             (not tested)
-* disk_partitions()              (not tested)
-* disk_usage(str)
-* net_connections('unix')
-* net_if_addrs()                 (not tested)
-* net_if_stats()                 (not tested)
-* net_io_counters()              (not tested)
-* sensors_fans()                 (not tested)
-* sensors_temperatures()         (not tested)
-* users()                        (not tested)
-
-* WindowsService.binpath()       (not tested)
-* WindowsService.description()   (not tested)
-* WindowsService.display_name()  (not tested)
-* WindowsService.name()          (not tested)
-* WindowsService.status()        (not tested)
-* WindowsService.username()      (not tested)
-
-In here we create a unicode path with a funky non-ASCII name and (where
-possible) make psutil return it back (e.g. on name(), exe(), open_files(),
-etc.) and make sure that:
-
-* psutil never crashes with UnicodeDecodeError
-* the returned path matches
-"""
-
-import os
-import traceback
-import warnings
-from contextlib import closing
-
-from psutil import BSD
-from psutil import MACOS
-from psutil import OPENBSD
-from psutil import POSIX
-from psutil import WINDOWS
-from psutil._compat import PY3
-from psutil._compat import u
-from psutil.tests import APPVEYOR
-from psutil.tests import CIRRUS
-from psutil.tests import ASCII_FS
-from psutil.tests import bind_unix_socket
-from psutil.tests import chdir
-from psutil.tests import copyload_shared_lib
-from psutil.tests import create_exe
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_CONNECTIONS_UNIX
-from psutil.tests import HAS_ENVIRON
-from psutil.tests import HAS_MEMORY_MAPS
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import safe_mkdir
-from psutil.tests import safe_rmpath as _safe_rmpath
-from psutil.tests import skip_on_access_denied
-from psutil.tests import TESTFILE_PREFIX
-from psutil.tests import TESTFN
-from psutil.tests import TESTFN_UNICODE
-from psutil.tests import TRAVIS
-from psutil.tests import unittest
-from psutil.tests import unix_socket_path
-import psutil
-
-
-def safe_rmpath(path):
-    if APPVEYOR:
-        # TODO - this is quite random and I'm not sure why it happens,
-        # nor I can reproduce it locally:
-        # https://ci.appveyor.com/project/giampaolo/psutil/build/job/
-        #     jiq2cgd6stsbtn60
-        # safe_rmpath() happens after reap_children() so this is weird
-        # Perhaps wait_procs() on Windows is broken? Maybe because
-        # of STILL_ACTIVE?
-        # https://github.com/giampaolo/psutil/blob/
-        #     68c7a70728a31d8b8b58f4be6c4c0baa2f449eda/psutil/arch/
-        #     windows/process_info.c#L146
-        try:
-            return _safe_rmpath(path)
-        except WindowsError:
-            traceback.print_exc()
-    else:
-        return _safe_rmpath(path)
-
-
-def subprocess_supports_unicode(name):
-    """Return True if both the fs and the subprocess module can
-    deal with a unicode file name.
-    """
-    if PY3:
-        return True
-    try:
-        safe_rmpath(name)
-        create_exe(name)
-        get_test_subprocess(cmd=[name])
-    except UnicodeEncodeError:
-        return False
-    else:
-        return True
-    finally:
-        reap_children()
-
-
-# An invalid unicode string.
-if PY3:
-    INVALID_NAME = (TESTFN.encode('utf8') + b"f\xc0\x80").decode(
-        'utf8', 'surrogateescape')
-else:
-    INVALID_NAME = TESTFN + "f\xc0\x80"
-
-
-# ===================================================================
-# FS APIs
-# ===================================================================
-
-
-class _BaseFSAPIsTests(object):
-    funky_name = None
-
-    @classmethod
-    def setUpClass(cls):
-        safe_rmpath(cls.funky_name)
-        create_exe(cls.funky_name)
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-        safe_rmpath(cls.funky_name)
-
-    def tearDown(self):
-        reap_children()
-
-    def expect_exact_path_match(self):
-        raise NotImplementedError("must be implemented in subclass")
-
-    def test_proc_exe(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        p = psutil.Process(subp.pid)
-        exe = p.exe()
-        self.assertIsInstance(exe, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(os.path.normcase(exe),
-                             os.path.normcase(self.funky_name))
-
-    def test_proc_name(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        name = psutil.Process(subp.pid).name()
-        self.assertIsInstance(name, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(name, os.path.basename(self.funky_name))
-
-    def test_proc_cmdline(self):
-        subp = get_test_subprocess(cmd=[self.funky_name])
-        p = psutil.Process(subp.pid)
-        cmdline = p.cmdline()
-        for part in cmdline:
-            self.assertIsInstance(part, str)
-        if self.expect_exact_path_match():
-            self.assertEqual(cmdline, [self.funky_name])
-
-    def test_proc_cwd(self):
-        dname = self.funky_name + "2"
-        self.addCleanup(safe_rmpath, dname)
-        safe_mkdir(dname)
-        with chdir(dname):
-            p = psutil.Process()
-            cwd = p.cwd()
-        self.assertIsInstance(p.cwd(), str)
-        if self.expect_exact_path_match():
-            self.assertEqual(cwd, dname)
-
-    @unittest.skipIf(PYPY and WINDOWS, "fails on PYPY + WINDOWS")
-    def test_proc_open_files(self):
-        p = psutil.Process()
-        start = set(p.open_files())
-        with open(self.funky_name, 'rb'):
-            new = set(p.open_files())
-        path = (new - start).pop().path
-        self.assertIsInstance(path, str)
-        if BSD and not path:
-            # XXX - see https://github.com/giampaolo/psutil/issues/595
-            return self.skipTest("open_files on BSD is broken")
-        if self.expect_exact_path_match():
-            self.assertEqual(os.path.normcase(path),
-                             os.path.normcase(self.funky_name))
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    def test_proc_connections(self):
-        suffix = os.path.basename(self.funky_name)
-        with unix_socket_path(suffix=suffix) as name:
-            try:
-                sock = bind_unix_socket(name)
-            except UnicodeEncodeError:
-                if PY3:
-                    raise
-                else:
-                    raise unittest.SkipTest("not supported")
-            with closing(sock):
-                conn = psutil.Process().connections('unix')[0]
-                self.assertIsInstance(conn.laddr, str)
-                # AF_UNIX addr not set on OpenBSD
-                if not OPENBSD and not CIRRUS:  # XXX
-                    self.assertEqual(conn.laddr, name)
-
-    @unittest.skipIf(not POSIX, "POSIX only")
-    @unittest.skipIf(not HAS_CONNECTIONS_UNIX, "can't list UNIX sockets")
-    @skip_on_access_denied()
-    def test_net_connections(self):
-        def find_sock(cons):
-            for conn in cons:
-                if os.path.basename(conn.laddr).startswith(TESTFILE_PREFIX):
-                    return conn
-            raise ValueError("connection not found")
-
-        suffix = os.path.basename(self.funky_name)
-        with unix_socket_path(suffix=suffix) as name:
-            try:
-                sock = bind_unix_socket(name)
-            except UnicodeEncodeError:
-                if PY3:
-                    raise
-                else:
-                    raise unittest.SkipTest("not supported")
-            with closing(sock):
-                cons = psutil.net_connections(kind='unix')
-                # AF_UNIX addr not set on OpenBSD
-                if not OPENBSD:
-                    conn = find_sock(cons)
-                    self.assertIsInstance(conn.laddr, str)
-                    self.assertEqual(conn.laddr, name)
-
-    def test_disk_usage(self):
-        dname = self.funky_name + "2"
-        self.addCleanup(safe_rmpath, dname)
-        safe_mkdir(dname)
-        psutil.disk_usage(dname)
-
-    @unittest.skipIf(not HAS_MEMORY_MAPS, "not supported")
-    @unittest.skipIf(not PY3, "ctypes does not support unicode on PY2")
-    @unittest.skipIf(PYPY and WINDOWS,
-                     "copyload_shared_lib() unsupported on PYPY + WINDOWS")
-    def test_memory_maps(self):
-        # XXX: on Python 2, using ctypes.CDLL with a unicode path
-        # opens a message box which blocks the test run.
-        with copyload_shared_lib(dst_prefix=self.funky_name) as funky_path:
-            def normpath(p):
-                return os.path.realpath(os.path.normcase(p))
-            libpaths = [normpath(x.path)
-                        for x in psutil.Process().memory_maps()]
-            # ...just to have a clearer msg in case of failure
-            libpaths = [x for x in libpaths if TESTFILE_PREFIX in x]
-            self.assertIn(normpath(funky_path), libpaths)
-            for path in libpaths:
-                self.assertIsInstance(path, str)
-
-
-# https://travis-ci.org/giampaolo/psutil/jobs/440073249
-@unittest.skipIf(PYPY and TRAVIS, "unreliable on PYPY + TRAVIS")
-@unittest.skipIf(MACOS and TRAVIS, "unreliable on TRAVIS")  # TODO
-@unittest.skipIf(ASCII_FS, "ASCII fs")
-@unittest.skipIf(not subprocess_supports_unicode(TESTFN_UNICODE),
-                 "subprocess can't deal with unicode")
-class TestFSAPIs(_BaseFSAPIsTests, unittest.TestCase):
-    """Test FS APIs with a funky, valid, UTF8 path name."""
-    funky_name = TESTFN_UNICODE
-
-    @classmethod
-    def expect_exact_path_match(cls):
-        # Do not expect psutil to correctly handle unicode paths on
-        # Python 2 if os.listdir() is not able either.
-        here = '.' if isinstance(cls.funky_name, str) else u('.')
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore")
-            return cls.funky_name in os.listdir(here)
-
-
-@unittest.skipIf(PYPY and TRAVIS, "unreliable on PYPY + TRAVIS")
-@unittest.skipIf(MACOS and TRAVIS, "unreliable on TRAVIS")  # TODO
-@unittest.skipIf(PYPY, "unreliable on PYPY")
-@unittest.skipIf(not subprocess_supports_unicode(INVALID_NAME),
-                 "subprocess can't deal with invalid unicode")
-class TestFSAPIsWithInvalidPath(_BaseFSAPIsTests, unittest.TestCase):
-    """Test FS APIs with a funky, invalid path name."""
-    funky_name = INVALID_NAME
-
-    @classmethod
-    def expect_exact_path_match(cls):
-        # Invalid unicode names are supposed to work on Python 2.
-        return True
-
-
-# ===================================================================
-# Non fs APIs
-# ===================================================================
-
-
-class TestNonFSAPIS(unittest.TestCase):
-    """Unicode tests for non fs-related APIs."""
-
-    def tearDown(self):
-        reap_children()
-
-    @unittest.skipIf(not HAS_ENVIRON, "not supported")
-    @unittest.skipIf(PYPY and WINDOWS, "segfaults on PYPY + WINDOWS")
-    def test_proc_environ(self):
-        # Note: differently from others, this test does not deal
-        # with fs paths. On Python 2 subprocess module is broken as
-        # it's not able to handle with non-ASCII env vars, so
-        # we use "è", which is part of the extended ASCII table
-        # (unicode point <= 255).
-        env = os.environ.copy()
-        funky_str = TESTFN_UNICODE if PY3 else 'è'
-        env['FUNNY_ARG'] = funky_str
-        sproc = get_test_subprocess(env=env)
-        p = psutil.Process(sproc.pid)
-        env = p.environ()
-        for k, v in env.items():
-            self.assertIsInstance(k, str)
-            self.assertIsInstance(v, str)
-        self.assertEqual(env['FUNNY_ARG'], funky_str)
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_windows.py firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_windows.py
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_windows.py	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil/tests/test_windows.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,870 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: UTF-8 -*
-
-# Copyright (c) 2009, Giampaolo Rodola'. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Windows specific tests."""
-
-import datetime
-import errno
-import glob
-import os
-import platform
-import re
-import signal
-import subprocess
-import sys
-import time
-import warnings
-
-import psutil
-from psutil import WINDOWS
-from psutil._compat import FileNotFoundError
-from psutil.tests import APPVEYOR
-from psutil.tests import get_test_subprocess
-from psutil.tests import HAS_BATTERY
-from psutil.tests import mock
-from psutil.tests import PY3
-from psutil.tests import PYPY
-from psutil.tests import reap_children
-from psutil.tests import retry_on_failure
-from psutil.tests import sh
-from psutil.tests import unittest
-
-
-if WINDOWS and not PYPY:
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        import win32api  # requires "pip install pypiwin32"
-        import win32con
-        import win32process
-        import wmi  # requires "pip install wmi" / "make setup-dev-env"
-
-
-cext = psutil._psplatform.cext
-
-# are we a 64 bit process
-IS_64_BIT = sys.maxsize > 2**32
-
-
-def wrap_exceptions(fun):
-    def wrapper(self, *args, **kwargs):
-        try:
-            return fun(self, *args, **kwargs)
-        except OSError as err:
-            from psutil._pswindows import ACCESS_DENIED_SET
-            if err.errno in ACCESS_DENIED_SET:
-                raise psutil.AccessDenied(None, None)
-            if err.errno == errno.ESRCH:
-                raise psutil.NoSuchProcess(None, None)
-            raise
-    return wrapper
-
-
-@unittest.skipIf(PYPY, "pywin32 not available on PYPY")  # skip whole module
-class TestCase(unittest.TestCase):
-    pass
-
-
-# ===================================================================
-# System APIs
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestCpuAPIs(TestCase):
-
-    @unittest.skipIf('NUMBER_OF_PROCESSORS' not in os.environ,
-                     'NUMBER_OF_PROCESSORS env var is not available')
-    def test_cpu_count_vs_NUMBER_OF_PROCESSORS(self):
-        # Will likely fail on many-cores systems:
-        # https://stackoverflow.com/questions/31209256
-        num_cpus = int(os.environ['NUMBER_OF_PROCESSORS'])
-        self.assertEqual(num_cpus, psutil.cpu_count())
-
-    def test_cpu_count_vs_GetSystemInfo(self):
-        # Will likely fail on many-cores systems:
-        # https://stackoverflow.com/questions/31209256
-        sys_value = win32api.GetSystemInfo()[5]
-        psutil_value = psutil.cpu_count()
-        self.assertEqual(sys_value, psutil_value)
-
-    def test_cpu_count_logical_vs_wmi(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(psutil.cpu_count(), proc.NumberOfLogicalProcessors)
-
-    def test_cpu_count_phys_vs_wmi(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(psutil.cpu_count(logical=False), proc.NumberOfCores)
-
-    def test_cpu_count_vs_cpu_times(self):
-        self.assertEqual(psutil.cpu_count(),
-                         len(psutil.cpu_times(percpu=True)))
-
-    def test_cpu_freq(self):
-        w = wmi.WMI()
-        proc = w.Win32_Processor()[0]
-        self.assertEqual(proc.CurrentClockSpeed, psutil.cpu_freq().current)
-        self.assertEqual(proc.MaxClockSpeed, psutil.cpu_freq().max)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestSystemAPIs(TestCase):
-
-    def test_nic_names(self):
-        out = sh('ipconfig /all')
-        nics = psutil.net_io_counters(pernic=True).keys()
-        for nic in nics:
-            if "pseudo-interface" in nic.replace(' ', '-').lower():
-                continue
-            if nic not in out:
-                self.fail(
-                    "%r nic wasn't found in 'ipconfig /all' output" % nic)
-
-    def test_total_phymem(self):
-        w = wmi.WMI().Win32_ComputerSystem()[0]
-        self.assertEqual(int(w.TotalPhysicalMemory),
-                         psutil.virtual_memory().total)
-
-    # @unittest.skipIf(wmi is None, "wmi module is not installed")
-    # def test__UPTIME(self):
-    #     # _UPTIME constant is not public but it is used internally
-    #     # as value to return for pid 0 creation time.
-    #     # WMI behaves the same.
-    #     w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-    #     p = psutil.Process(0)
-    #     wmic_create = str(w.CreationDate.split('.')[0])
-    #     psutil_create = time.strftime("%Y%m%d%H%M%S",
-    #                                   time.localtime(p.create_time()))
-
-    # Note: this test is not very reliable
-    @unittest.skipIf(APPVEYOR, "test not relieable on appveyor")
-    @retry_on_failure()
-    def test_pids(self):
-        # Note: this test might fail if the OS is starting/killing
-        # other processes in the meantime
-        w = wmi.WMI().Win32_Process()
-        wmi_pids = set([x.ProcessId for x in w])
-        psutil_pids = set(psutil.pids())
-        self.assertEqual(wmi_pids, psutil_pids)
-
-    @retry_on_failure()
-    def test_disks(self):
-        ps_parts = psutil.disk_partitions(all=True)
-        wmi_parts = wmi.WMI().Win32_LogicalDisk()
-        for ps_part in ps_parts:
-            for wmi_part in wmi_parts:
-                if ps_part.device.replace('\\', '') == wmi_part.DeviceID:
-                    if not ps_part.mountpoint:
-                        # this is usually a CD-ROM with no disk inserted
-                        break
-                    if 'cdrom' in ps_part.opts:
-                        break
-                    try:
-                        usage = psutil.disk_usage(ps_part.mountpoint)
-                    except FileNotFoundError:
-                        # usually this is the floppy
-                        break
-                    self.assertEqual(usage.total, int(wmi_part.Size))
-                    wmi_free = int(wmi_part.FreeSpace)
-                    self.assertEqual(usage.free, wmi_free)
-                    # 10 MB tollerance
-                    if abs(usage.free - wmi_free) > 10 * 1024 * 1024:
-                        self.fail("psutil=%s, wmi=%s" % (
-                            usage.free, wmi_free))
-                    break
-            else:
-                self.fail("can't find partition %s" % repr(ps_part))
-
-    def test_disk_usage(self):
-        for disk in psutil.disk_partitions():
-            if 'cdrom' in disk.opts:
-                continue
-            sys_value = win32api.GetDiskFreeSpaceEx(disk.mountpoint)
-            psutil_value = psutil.disk_usage(disk.mountpoint)
-            self.assertAlmostEqual(sys_value[0], psutil_value.free,
-                                   delta=1024 * 1024)
-            self.assertAlmostEqual(sys_value[1], psutil_value.total,
-                                   delta=1024 * 1024)
-            self.assertEqual(psutil_value.used,
-                             psutil_value.total - psutil_value.free)
-
-    def test_disk_partitions(self):
-        sys_value = [
-            x + '\\' for x in win32api.GetLogicalDriveStrings().split("\\\x00")
-            if x and not x.startswith('A:')]
-        psutil_value = [x.mountpoint for x in psutil.disk_partitions(all=True)]
-        self.assertEqual(sys_value, psutil_value)
-
-    def test_net_if_stats(self):
-        ps_names = set(cext.net_if_stats())
-        wmi_adapters = wmi.WMI().Win32_NetworkAdapter()
-        wmi_names = set()
-        for wmi_adapter in wmi_adapters:
-            wmi_names.add(wmi_adapter.Name)
-            wmi_names.add(wmi_adapter.NetConnectionID)
-        self.assertTrue(ps_names & wmi_names,
-                        "no common entries in %s, %s" % (ps_names, wmi_names))
-
-    def test_boot_time(self):
-        wmi_os = wmi.WMI().Win32_OperatingSystem()
-        wmi_btime_str = wmi_os[0].LastBootUpTime.split('.')[0]
-        wmi_btime_dt = datetime.datetime.strptime(
-            wmi_btime_str, "%Y%m%d%H%M%S")
-        psutil_dt = datetime.datetime.fromtimestamp(psutil.boot_time())
-        diff = abs((wmi_btime_dt - psutil_dt).total_seconds())
-        self.assertLessEqual(diff, 3)
-
-    def test_boot_time_fluctuation(self):
-        # https://github.com/giampaolo/psutil/issues/1007
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=5):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=4):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=6):
-            self.assertEqual(psutil.boot_time(), 5)
-        with mock.patch('psutil._pswindows.cext.boot_time', return_value=333):
-            self.assertEqual(psutil.boot_time(), 333)
-
-
-# ===================================================================
-# sensors_battery()
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestSensorsBattery(TestCase):
-
-    def test_has_battery(self):
-        if win32api.GetPwrCapabilities()['SystemBatteriesPresent']:
-            self.assertIsNotNone(psutil.sensors_battery())
-        else:
-            self.assertIsNone(psutil.sensors_battery())
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_percent(self):
-        w = wmi.WMI()
-        battery_wmi = w.query('select * from Win32_Battery')[0]
-        battery_psutil = psutil.sensors_battery()
-        self.assertAlmostEqual(
-            battery_psutil.percent, battery_wmi.EstimatedChargeRemaining,
-            delta=1)
-
-    @unittest.skipIf(not HAS_BATTERY, "no battery")
-    def test_power_plugged(self):
-        w = wmi.WMI()
-        battery_wmi = w.query('select * from Win32_Battery')[0]
-        battery_psutil = psutil.sensors_battery()
-        # Status codes:
-        # https://msdn.microsoft.com/en-us/library/aa394074(v=vs.85).aspx
-        self.assertEqual(battery_psutil.power_plugged,
-                         battery_wmi.BatteryStatus == 2)
-
-    def test_emulate_no_battery(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 128, 0, 0)) as m:
-            self.assertIsNone(psutil.sensors_battery())
-            assert m.called
-
-    def test_emulate_power_connected(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(1, 0, 0, 0)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_power_charging(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 8, 0, 0)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNLIMITED)
-            assert m.called
-
-    def test_emulate_secs_left_unknown(self):
-        with mock.patch("psutil._pswindows.cext.sensors_battery",
-                        return_value=(0, 0, 0, -1)) as m:
-            self.assertEqual(psutil.sensors_battery().secsleft,
-                             psutil.POWER_TIME_UNKNOWN)
-            assert m.called
-
-
-# ===================================================================
-# Process APIs
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcess(TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_issue_24(self):
-        p = psutil.Process(0)
-        self.assertRaises(psutil.AccessDenied, p.kill)
-
-    def test_special_pid(self):
-        p = psutil.Process(4)
-        self.assertEqual(p.name(), 'System')
-        # use __str__ to access all common Process properties to check
-        # that nothing strange happens
-        str(p)
-        p.username()
-        self.assertTrue(p.create_time() >= 0.0)
-        try:
-            rss, vms = p.memory_info()[:2]
-        except psutil.AccessDenied:
-            # expected on Windows Vista and Windows 7
-            if not platform.uname()[1] in ('vista', 'win-7', 'win7'):
-                raise
-        else:
-            self.assertTrue(rss > 0)
-
-    def test_send_signal(self):
-        p = psutil.Process(self.pid)
-        self.assertRaises(ValueError, p.send_signal, signal.SIGINT)
-
-    def test_num_handles_increment(self):
-        p = psutil.Process(os.getpid())
-        before = p.num_handles()
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        after = p.num_handles()
-        self.assertEqual(after, before + 1)
-        win32api.CloseHandle(handle)
-        self.assertEqual(p.num_handles(), before)
-
-    def test_handles_leak(self):
-        # Call all Process methods and make sure no handles are left
-        # open. This is here mainly to make sure functions using
-        # OpenProcess() always call CloseHandle().
-        def call(p, attr):
-            attr = getattr(p, name, None)
-            if attr is not None and callable(attr):
-                attr()
-            else:
-                attr
-
-        p = psutil.Process(self.pid)
-        failures = []
-        for name in dir(psutil.Process):
-            if name.startswith('_') \
-                    or name in ('terminate', 'kill', 'suspend', 'resume',
-                                'nice', 'send_signal', 'wait', 'children',
-                                'as_dict', 'memory_info_ex'):
-                continue
-            else:
-                try:
-                    call(p, name)
-                    num1 = p.num_handles()
-                    call(p, name)
-                    num2 = p.num_handles()
-                except (psutil.NoSuchProcess, psutil.AccessDenied):
-                    pass
-                else:
-                    if num2 > num1:
-                        fail = \
-                            "failure while processing Process.%s method " \
-                            "(before=%s, after=%s)" % (name, num1, num2)
-                        failures.append(fail)
-        if failures:
-            self.fail('\n' + '\n'.join(failures))
-
-    @unittest.skipIf(not sys.version_info >= (2, 7),
-                     "CTRL_* signals not supported")
-    def test_ctrl_signals(self):
-        p = psutil.Process(get_test_subprocess().pid)
-        p.send_signal(signal.CTRL_C_EVENT)
-        p.send_signal(signal.CTRL_BREAK_EVENT)
-        p.kill()
-        p.wait()
-        self.assertRaises(psutil.NoSuchProcess,
-                          p.send_signal, signal.CTRL_C_EVENT)
-        self.assertRaises(psutil.NoSuchProcess,
-                          p.send_signal, signal.CTRL_BREAK_EVENT)
-
-    def test_username(self):
-        self.assertEqual(psutil.Process().username(),
-                         win32api.GetUserNameEx(win32con.NameSamCompatible))
-
-    def test_cmdline(self):
-        sys_value = re.sub(' +', ' ', win32api.GetCommandLine()).strip()
-        psutil_value = ' '.join(psutil.Process().cmdline())
-        self.assertEqual(sys_value, psutil_value)
-
-    # XXX - occasional failures
-
-    # def test_cpu_times(self):
-    #     handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-    #                                   win32con.FALSE, os.getpid())
-    #     self.addCleanup(win32api.CloseHandle, handle)
-    #     sys_value = win32process.GetProcessTimes(handle)
-    #     psutil_value = psutil.Process().cpu_times()
-    #     self.assertAlmostEqual(
-    #         psutil_value.user, sys_value['UserTime'] / 10000000.0,
-    #         delta=0.2)
-    #     self.assertAlmostEqual(
-    #         psutil_value.user, sys_value['KernelTime'] / 10000000.0,
-    #         delta=0.2)
-
-    def test_nice(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetPriorityClass(handle)
-        psutil_value = psutil.Process().nice()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_memory_info(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetProcessMemoryInfo(handle)
-        psutil_value = psutil.Process(self.pid).memory_info()
-        self.assertEqual(
-            sys_value['PeakWorkingSetSize'], psutil_value.peak_wset)
-        self.assertEqual(
-            sys_value['WorkingSetSize'], psutil_value.wset)
-        self.assertEqual(
-            sys_value['QuotaPeakPagedPoolUsage'], psutil_value.peak_paged_pool)
-        self.assertEqual(
-            sys_value['QuotaPagedPoolUsage'], psutil_value.paged_pool)
-        self.assertEqual(
-            sys_value['QuotaPeakNonPagedPoolUsage'],
-            psutil_value.peak_nonpaged_pool)
-        self.assertEqual(
-            sys_value['QuotaNonPagedPoolUsage'], psutil_value.nonpaged_pool)
-        self.assertEqual(
-            sys_value['PagefileUsage'], psutil_value.pagefile)
-        self.assertEqual(
-            sys_value['PeakPagefileUsage'], psutil_value.peak_pagefile)
-
-        self.assertEqual(psutil_value.rss, psutil_value.wset)
-        self.assertEqual(psutil_value.vms, psutil_value.pagefile)
-
-    def test_wait(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        p = psutil.Process(self.pid)
-        p.terminate()
-        psutil_value = p.wait()
-        sys_value = win32process.GetExitCodeProcess(handle)
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_cpu_affinity(self):
-        def from_bitmask(x):
-            return [i for i in range(64) if (1 << i) & x]
-
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, self.pid)
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = from_bitmask(
-            win32process.GetProcessAffinityMask(handle)[0])
-        psutil_value = psutil.Process(self.pid).cpu_affinity()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_io_counters(self):
-        handle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION,
-                                      win32con.FALSE, os.getpid())
-        self.addCleanup(win32api.CloseHandle, handle)
-        sys_value = win32process.GetProcessIoCounters(handle)
-        psutil_value = psutil.Process().io_counters()
-        self.assertEqual(
-            psutil_value.read_count, sys_value['ReadOperationCount'])
-        self.assertEqual(
-            psutil_value.write_count, sys_value['WriteOperationCount'])
-        self.assertEqual(
-            psutil_value.read_bytes, sys_value['ReadTransferCount'])
-        self.assertEqual(
-            psutil_value.write_bytes, sys_value['WriteTransferCount'])
-        self.assertEqual(
-            psutil_value.other_count, sys_value['OtherOperationCount'])
-        self.assertEqual(
-            psutil_value.other_bytes, sys_value['OtherTransferCount'])
-
-    def test_num_handles(self):
-        import ctypes
-        import ctypes.wintypes
-        PROCESS_QUERY_INFORMATION = 0x400
-        handle = ctypes.windll.kernel32.OpenProcess(
-            PROCESS_QUERY_INFORMATION, 0, self.pid)
-        self.addCleanup(ctypes.windll.kernel32.CloseHandle, handle)
-
-        hndcnt = ctypes.wintypes.DWORD()
-        ctypes.windll.kernel32.GetProcessHandleCount(
-            handle, ctypes.byref(hndcnt))
-        sys_value = hndcnt.value
-        psutil_value = psutil.Process(self.pid).num_handles()
-        self.assertEqual(psutil_value, sys_value)
-
-    def test_error_partial_copy(self):
-        # https://github.com/giampaolo/psutil/issues/875
-        exc = WindowsError()
-        exc.winerror = 299
-        with mock.patch("psutil._psplatform.cext.proc_cwd", side_effect=exc):
-            with mock.patch("time.sleep") as m:
-                p = psutil.Process()
-                self.assertRaises(psutil.AccessDenied, p.cwd)
-        self.assertGreaterEqual(m.call_count, 5)
-
-    def test_exe(self):
-        # NtQuerySystemInformation succeeds if process is gone. Make sure
-        # it raises NSP for a non existent pid.
-        pid = psutil.pids()[-1] + 99999
-        proc = psutil._psplatform.Process(pid)
-        self.assertRaises(psutil.NoSuchProcess, proc.exe)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestProcessWMI(TestCase):
-    """Compare Process API results with WMI."""
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_name(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        self.assertEqual(p.name(), w.Caption)
-
-    def test_exe(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        # Note: wmi reports the exe as a lower case string.
-        # Being Windows paths case-insensitive we ignore that.
-        self.assertEqual(p.exe().lower(), w.ExecutablePath.lower())
-
-    def test_cmdline(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        self.assertEqual(' '.join(p.cmdline()),
-                         w.CommandLine.replace('"', ''))
-
-    def test_username(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        domain, _, username = w.GetOwner()
-        username = "%s\\%s" % (domain, username)
-        self.assertEqual(p.username(), username)
-
-    def test_memory_rss(self):
-        time.sleep(0.1)
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        rss = p.memory_info().rss
-        self.assertEqual(rss, int(w.WorkingSetSize))
-
-    def test_memory_vms(self):
-        time.sleep(0.1)
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        vms = p.memory_info().vms
-        # http://msdn.microsoft.com/en-us/library/aa394372(VS.85).aspx
-        # ...claims that PageFileUsage is represented in Kilo
-        # bytes but funnily enough on certain platforms bytes are
-        # returned instead.
-        wmi_usage = int(w.PageFileUsage)
-        if (vms != wmi_usage) and (vms != wmi_usage * 1024):
-            self.fail("wmi=%s, psutil=%s" % (wmi_usage, vms))
-
-    def test_create_time(self):
-        w = wmi.WMI().Win32_Process(ProcessId=self.pid)[0]
-        p = psutil.Process(self.pid)
-        wmic_create = str(w.CreationDate.split('.')[0])
-        psutil_create = time.strftime("%Y%m%d%H%M%S",
-                                      time.localtime(p.create_time()))
-        self.assertEqual(wmic_create, psutil_create)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestDualProcessImplementation(TestCase):
-    """
-    Certain APIs on Windows have 2 internal implementations, one
-    based on documented Windows APIs, another one based
-    NtQuerySystemInformation() which gets called as fallback in
-    case the first fails because of limited permission error.
-    Here we test that the two methods return the exact same value,
-    see:
-    https://github.com/giampaolo/psutil/issues/304
-    """
-
-    @classmethod
-    def setUpClass(cls):
-        cls.pid = get_test_subprocess().pid
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_memory_info(self):
-        mem_1 = psutil.Process(self.pid).memory_info()
-        with mock.patch("psutil._psplatform.cext.proc_memory_info",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            mem_2 = psutil.Process(self.pid).memory_info()
-            self.assertEqual(len(mem_1), len(mem_2))
-            for i in range(len(mem_1)):
-                self.assertGreaterEqual(mem_1[i], 0)
-                self.assertGreaterEqual(mem_2[i], 0)
-                self.assertAlmostEqual(mem_1[i], mem_2[i], delta=512)
-            assert fun.called
-
-    def test_create_time(self):
-        ctime = psutil.Process(self.pid).create_time()
-        with mock.patch("psutil._psplatform.cext.proc_times",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            self.assertEqual(psutil.Process(self.pid).create_time(), ctime)
-            assert fun.called
-
-    def test_cpu_times(self):
-        cpu_times_1 = psutil.Process(self.pid).cpu_times()
-        with mock.patch("psutil._psplatform.cext.proc_times",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            cpu_times_2 = psutil.Process(self.pid).cpu_times()
-            assert fun.called
-            self.assertAlmostEqual(
-                cpu_times_1.user, cpu_times_2.user, delta=0.01)
-            self.assertAlmostEqual(
-                cpu_times_1.system, cpu_times_2.system, delta=0.01)
-
-    def test_io_counters(self):
-        io_counters_1 = psutil.Process(self.pid).io_counters()
-        with mock.patch("psutil._psplatform.cext.proc_io_counters",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            io_counters_2 = psutil.Process(self.pid).io_counters()
-            for i in range(len(io_counters_1)):
-                self.assertAlmostEqual(
-                    io_counters_1[i], io_counters_2[i], delta=5)
-            assert fun.called
-
-    def test_num_handles(self):
-        num_handles = psutil.Process(self.pid).num_handles()
-        with mock.patch("psutil._psplatform.cext.proc_num_handles",
-                        side_effect=OSError(errno.EPERM, "msg")) as fun:
-            self.assertEqual(psutil.Process(self.pid).num_handles(),
-                             num_handles)
-            assert fun.called
-
-    def test_cmdline(self):
-        from psutil._pswindows import convert_oserror
-        for pid in psutil.pids():
-            try:
-                a = cext.proc_cmdline(pid, use_peb=True)
-                b = cext.proc_cmdline(pid, use_peb=False)
-            except OSError as err:
-                err = convert_oserror(err)
-                if not isinstance(err, (psutil.AccessDenied,
-                                        psutil.NoSuchProcess)):
-                    raise
-            else:
-                self.assertEqual(a, b)
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class RemoteProcessTestCase(TestCase):
-    """Certain functions require calling ReadProcessMemory.
-    This trivially works when called on the current process.
-    Check that this works on other processes, especially when they
-    have a different bitness.
-    """
-
-    @staticmethod
-    def find_other_interpreter():
-        # find a python interpreter that is of the opposite bitness from us
-        code = "import sys; sys.stdout.write(str(sys.maxsize > 2**32))"
-
-        # XXX: a different and probably more stable approach might be to access
-        # the registry but accessing 64 bit paths from a 32 bit process
-        for filename in glob.glob(r"C:\Python*\python.exe"):
-            proc = subprocess.Popen(args=[filename, "-c", code],
-                                    stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT)
-            output, _ = proc.communicate()
-            if output == str(not IS_64_BIT):
-                return filename
-
-    @classmethod
-    def setUpClass(cls):
-        other_python = cls.find_other_interpreter()
-
-        if other_python is None:
-            raise unittest.SkipTest(
-                "could not find interpreter with opposite bitness")
-
-        if IS_64_BIT:
-            cls.python64 = sys.executable
-            cls.python32 = other_python
-        else:
-            cls.python64 = other_python
-            cls.python32 = sys.executable
-
-    test_args = ["-c", "import sys; sys.stdin.read()"]
-
-    def setUp(self):
-        env = os.environ.copy()
-        env["THINK_OF_A_NUMBER"] = str(os.getpid())
-        self.proc32 = get_test_subprocess([self.python32] + self.test_args,
-                                          env=env,
-                                          stdin=subprocess.PIPE)
-        self.proc64 = get_test_subprocess([self.python64] + self.test_args,
-                                          env=env,
-                                          stdin=subprocess.PIPE)
-
-    def tearDown(self):
-        self.proc32.communicate()
-        self.proc64.communicate()
-        reap_children()
-
-    @classmethod
-    def tearDownClass(cls):
-        reap_children()
-
-    def test_cmdline_32(self):
-        p = psutil.Process(self.proc32.pid)
-        self.assertEqual(len(p.cmdline()), 3)
-        self.assertEqual(p.cmdline()[1:], self.test_args)
-
-    def test_cmdline_64(self):
-        p = psutil.Process(self.proc64.pid)
-        self.assertEqual(len(p.cmdline()), 3)
-        self.assertEqual(p.cmdline()[1:], self.test_args)
-
-    def test_cwd_32(self):
-        p = psutil.Process(self.proc32.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_cwd_64(self):
-        p = psutil.Process(self.proc64.pid)
-        self.assertEqual(p.cwd(), os.getcwd())
-
-    def test_environ_32(self):
-        p = psutil.Process(self.proc32.pid)
-        e = p.environ()
-        self.assertIn("THINK_OF_A_NUMBER", e)
-        self.assertEquals(e["THINK_OF_A_NUMBER"], str(os.getpid()))
-
-    def test_environ_64(self):
-        p = psutil.Process(self.proc64.pid)
-        try:
-            p.environ()
-        except psutil.AccessDenied:
-            pass
-
-
-# ===================================================================
-# Windows services
-# ===================================================================
-
-
-@unittest.skipIf(not WINDOWS, "WINDOWS only")
-class TestServices(TestCase):
-
-    def test_win_service_iter(self):
-        valid_statuses = set([
-            "running",
-            "paused",
-            "start",
-            "pause",
-            "continue",
-            "stop",
-            "stopped",
-        ])
-        valid_start_types = set([
-            "automatic",
-            "manual",
-            "disabled",
-        ])
-        valid_statuses = set([
-            "running",
-            "paused",
-            "start_pending",
-            "pause_pending",
-            "continue_pending",
-            "stop_pending",
-            "stopped"
-        ])
-        for serv in psutil.win_service_iter():
-            data = serv.as_dict()
-            self.assertIsInstance(data['name'], str)
-            self.assertNotEqual(data['name'].strip(), "")
-            self.assertIsInstance(data['display_name'], str)
-            self.assertIsInstance(data['username'], str)
-            self.assertIn(data['status'], valid_statuses)
-            if data['pid'] is not None:
-                psutil.Process(data['pid'])
-            self.assertIsInstance(data['binpath'], str)
-            self.assertIsInstance(data['username'], str)
-            self.assertIsInstance(data['start_type'], str)
-            self.assertIn(data['start_type'], valid_start_types)
-            self.assertIn(data['status'], valid_statuses)
-            self.assertIsInstance(data['description'], str)
-            pid = serv.pid()
-            if pid is not None:
-                p = psutil.Process(pid)
-                self.assertTrue(p.is_running())
-            # win_service_get
-            s = psutil.win_service_get(serv.name())
-            # test __eq__
-            self.assertEqual(serv, s)
-
-    def test_win_service_get(self):
-        ERROR_SERVICE_DOES_NOT_EXIST = \
-            psutil._psplatform.cext.ERROR_SERVICE_DOES_NOT_EXIST
-        ERROR_ACCESS_DENIED = psutil._psplatform.cext.ERROR_ACCESS_DENIED
-
-        name = next(psutil.win_service_iter()).name()
-        with self.assertRaises(psutil.NoSuchProcess) as cm:
-            psutil.win_service_get(name + '???')
-        self.assertEqual(cm.exception.name, name + '???')
-
-        # test NoSuchProcess
-        service = psutil.win_service_get(name)
-        if PY3:
-            args = (0, "msg", 0, ERROR_SERVICE_DOES_NOT_EXIST)
-        else:
-            args = (ERROR_SERVICE_DOES_NOT_EXIST, "msg")
-        exc = WindowsError(*args)
-        with mock.patch("psutil._psplatform.cext.winservice_query_status",
-                        side_effect=exc):
-            self.assertRaises(psutil.NoSuchProcess, service.status)
-        with mock.patch("psutil._psplatform.cext.winservice_query_config",
-                        side_effect=exc):
-            self.assertRaises(psutil.NoSuchProcess, service.username)
-
-        # test AccessDenied
-        if PY3:
-            args = (0, "msg", 0, ERROR_ACCESS_DENIED)
-        else:
-            args = (ERROR_ACCESS_DENIED, "msg")
-        exc = WindowsError(*args)
-        with mock.patch("psutil._psplatform.cext.winservice_query_status",
-                        side_effect=exc):
-            self.assertRaises(psutil.AccessDenied, service.status)
-        with mock.patch("psutil._psplatform.cext.winservice_query_config",
-                        side_effect=exc):
-            self.assertRaises(psutil.AccessDenied, service.username)
-
-        # test __str__ and __repr__
-        self.assertIn(service.name(), str(service))
-        self.assertIn(service.display_name(), str(service))
-        self.assertIn(service.name(), repr(service))
-        self.assertIn(service.display_name(), repr(service))
-
-
-if __name__ == '__main__':
-    from psutil.tests.runner import run
-    run(__file__)
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/LICENSE firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/LICENSE
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/LICENSE	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'
-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.
-
- * Neither the name of the psutil authors nor the names of its contributors
-   may be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-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 OWNER 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-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/METADATA firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/METADATA
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/METADATA	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/METADATA	1970-01-01 00:00:00.000000000 +0000
@@ -1,582 +0,0 @@
-Metadata-Version: 2.1
-Name: psutil
-Version: 5.7.0
-Summary: Cross-platform lib for process and system monitoring in Python.
-Home-page: https://github.com/giampaolo/psutil
-Author: Giampaolo Rodola
-Author-email: g.rodola@gmail.com
-License: BSD
-Keywords: ps,top,kill,free,lsof,netstat,nice,tty,ionice,uptime,taskmgr,process,df,iotop,iostat,ifconfig,taskset,who,pidof,pmap,smem,pstree,monitoring,ulimit,prlimit,smem,performance,metrics,agent,observability
-Platform: Platform Independent
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Environment :: Win32 (MS Windows)
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows :: Windows 10
-Classifier: Operating System :: Microsoft :: Windows :: Windows 7
-Classifier: Operating System :: Microsoft :: Windows :: Windows 8
-Classifier: Operating System :: Microsoft :: Windows :: Windows 8.1
-Classifier: Operating System :: Microsoft :: Windows :: Windows Server 2003
-Classifier: Operating System :: Microsoft :: Windows :: Windows Server 2008
-Classifier: Operating System :: Microsoft :: Windows :: Windows Vista
-Classifier: Operating System :: Microsoft
-Classifier: Operating System :: OS Independent
-Classifier: Operating System :: POSIX :: AIX
-Classifier: Operating System :: POSIX :: BSD :: FreeBSD
-Classifier: Operating System :: POSIX :: BSD :: NetBSD
-Classifier: Operating System :: POSIX :: BSD :: OpenBSD
-Classifier: Operating System :: POSIX :: BSD
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Operating System :: POSIX :: SunOS/Solaris
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: C
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: System :: Benchmark
-Classifier: Topic :: System :: Hardware :: Hardware Drivers
-Classifier: Topic :: System :: Hardware
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: System :: Networking :: Monitoring :: Hardware Watchdog
-Classifier: Topic :: System :: Networking :: Monitoring
-Classifier: Topic :: System :: Networking
-Classifier: Topic :: System :: Operating System
-Classifier: Topic :: System :: Systems Administration
-Classifier: Topic :: Utilities
-Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
-Provides-Extra: enum
-Requires-Dist: enum34 ; extra == 'enum'
-
-|  |downloads| |stars| |forks| |contributors| |coverage| |quality|
-|  |version| |py-versions| |packages| |license|
-|  |travis| |appveyor| |cirrus| |doc| |twitter| |tidelift|
-
-.. |downloads| image:: https://img.shields.io/pypi/dm/psutil.svg
-    :target: https://pepy.tech/project/psutil
-    :alt: Downloads
-
-.. |stars| image:: https://img.shields.io/github/stars/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/stargazers
-    :alt: Github stars
-
-.. |forks| image:: https://img.shields.io/github/forks/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/network/members
-    :alt: Github forks
-
-.. |contributors| image:: https://img.shields.io/github/contributors/giampaolo/psutil.svg
-    :target: https://github.com/giampaolo/psutil/graphs/contributors
-    :alt: Contributors
-
-.. |quality| image:: https://img.shields.io/codacy/grade/ce63e7f7f69d44b5b59682196e6fbfca.svg
-    :target: https://www.codacy.com/app/g-rodola/psutil?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=giampaolo/psutil&amp;utm_campaign=Badge_Grade
-    :alt: Code quality
-
-.. |travis| image:: https://img.shields.io/travis/giampaolo/psutil/master.svg?maxAge=3600&label=Linux,%20OSX,%20PyPy
-    :target: https://travis-ci.org/giampaolo/psutil
-    :alt: Linux tests (Travis)
-
-.. |appveyor| image:: https://img.shields.io/appveyor/ci/giampaolo/psutil/master.svg?maxAge=3600&label=Windows
-    :target: https://ci.appveyor.com/project/giampaolo/psutil
-    :alt: Windows tests (Appveyor)
-
-.. |cirrus| image:: https://img.shields.io/cirrus/github/giampaolo/psutil?label=FreeBSD
-    :target: https://cirrus-ci.com/github/giampaolo/psutil-cirrus-ci
-    :alt: FreeBSD tests (Cirrus-Ci)
-
-.. |coverage| image:: https://img.shields.io/coveralls/github/giampaolo/psutil.svg?label=test%20coverage
-    :target: https://coveralls.io/github/giampaolo/psutil?branch=master
-    :alt: Test coverage (coverall.io)
-
-.. |doc| image:: https://readthedocs.org/projects/psutil/badge/?version=latest
-    :target: http://psutil.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
-
-.. |version| image:: https://img.shields.io/pypi/v/psutil.svg?label=pypi
-    :target: https://pypi.org/project/psutil
-    :alt: Latest version
-
-.. |py-versions| image:: https://img.shields.io/pypi/pyversions/psutil.svg
-    :target: https://pypi.org/project/psutil
-    :alt: Supported Python versions
-
-.. |packages| image:: https://repology.org/badge/tiny-repos/python:psutil.svg
-    :target: https://repology.org/metapackage/python:psutil/versions
-    :alt: Binary packages
-
-.. |license| image:: https://img.shields.io/pypi/l/psutil.svg
-    :target: https://github.com/giampaolo/psutil/blob/master/LICENSE
-    :alt: License
-
-.. |twitter| image:: https://img.shields.io/twitter/follow/grodola.svg?label=follow&style=flat&logo=twitter&logoColor=4FADFF
-    :target: https://twitter.com/grodola
-    :alt: Twitter Follow
-
-.. |tidelift| image:: https://tidelift.com/badges/github/giampaolo/psutil?style=flat
-    :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-    :alt: Tidelift
-
------
-
-Quick links
-===========
-
-- `Home page <https://github.com/giampaolo/psutil>`_
-- `Install <https://github.com/giampaolo/psutil/blob/master/INSTALL.rst>`_
-- `Documentation <http://psutil.readthedocs.io>`_
-- `Download <https://pypi.org/project/psutil/#files>`_
-- `Forum <http://groups.google.com/group/psutil/topics>`_
-- `StackOverflow <https://stackoverflow.com/questions/tagged/psutil>`_
-- `Blog <http://grodola.blogspot.com/search/label/psutil>`_
-- `Development guide <https://github.com/giampaolo/psutil/blob/master/docs/DEVGUIDE.rst>`_
-- `What's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst>`_
-
-Summary
-=======
-
-psutil (process and system utilities) is a cross-platform library for
-retrieving information on **running processes** and **system utilization**
-(CPU, memory, disks, network, sensors) in Python.
-It is useful mainly for **system monitoring**, **profiling and limiting process
-resources** and **management of running processes**.
-It implements many functionalities offered by classic UNIX command line tools
-such as *ps, top, iotop, lsof, netstat, ifconfig, free* and others.
-psutil currently supports the following platforms:
-
-- **Linux**
-- **Windows**
-- **macOS**
-- **FreeBSD, OpenBSD**, **NetBSD**
-- **Sun Solaris**
-- **AIX**
-
-...both **32-bit** and **64-bit** architectures. Supported Python versions are **2.6**, **2.7** and **3.4+**. `PyPy3 <http://pypy.org/>`__ is also known to work.
-
-psutil for enterprise
-=====================
-
-.. |tideliftlogo| image:: https://nedbatchelder.com/pix/Tidelift_Logos_RGB_Tidelift_Shorthand_On-White_small.png
-   :width: 150
-   :alt: Tidelift
-   :target: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-
-.. list-table::
-   :widths: 10 150
-
-   * - |tideliftlogo|
-     - The maintainer of psutil and thousands of other packages are working
-       with Tidelift to deliver commercial support and maintenance for the open
-       source dependencies you use to build your applications. Save time,
-       reduce risk, and improve code health, while paying the maintainers of
-       the exact dependencies you use.
-       `Learn more <https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`__.
-
-       By subscribing to Tidelift you will help me (`Giampaolo Rodola`_) support
-       psutil future development. Alternatively consider making a small
-       `donation`_.
-
-Security
-========
-
-To report a security vulnerability, please use the `Tidelift security
-contact`_.  Tidelift will coordinate the fix and disclosure.
-
-Example applications
-====================
-
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/top-small.png      |
-|    :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procinfo.png          |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/top.png          |
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-| .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem-small.png     | .. image:: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap-small.png     |
-|     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/procsmem.png         |     :target: https://github.com/giampaolo/psutil/blob/master/docs/_static/pmap.png         |
-+------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------+
-
-Also see `scripts directory <https://github.com/giampaolo/psutil/tree/master/scripts>`__
-and `doc recipes <http://psutil.readthedocs.io/#recipes/>`__.
-
-Projects using psutil
-=====================
-
-psutil has roughly the following monthly downloads:
-
-.. image:: https://img.shields.io/pypi/dm/psutil.svg
-    :target: https://pepy.tech/project/psutil
-    :alt: Downloads
-
-There are over
-`10.000 open source projects <https://libraries.io/pypi/psutil/dependent_repositories?page=1>`__
-on github which depend from psutil.
-Here's some I find particularly interesting:
-
-- https://github.com/google/grr
-- https://github.com/facebook/osquery/
-- https://github.com/nicolargo/glances
-- https://github.com/Jahaja/psdash
-- https://github.com/ajenti/ajenti
-- https://github.com/home-assistant/home-assistant/
-
-
-Portings
-========
-
-- Go: https://github.com/shirou/gopsutil
-- C: https://github.com/hamon-in/cpslib
-- Rust: https://github.com/borntyping/rust-psutil
-- Nim: https://github.com/johnscillieri/psutil-nim
-
-
-Example usages
-==============
-
-This represents pretty much the whole psutil API.
-
-CPU
----
-
-.. code-block:: python
-
-    >>> import psutil
-    >>>
-    >>> psutil.cpu_times()
-    scputimes(user=3961.46, nice=169.729, system=2150.659, idle=16900.540, iowait=629.59, irq=0.0, softirq=19.42, steal=0.0, guest=0, nice=0.0)
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_percent(interval=1)
-    ...
-    4.0
-    5.9
-    3.8
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_percent(interval=1, percpu=True)
-    ...
-    [4.0, 6.9, 3.7, 9.2]
-    [7.0, 8.5, 2.4, 2.1]
-    [1.2, 9.0, 9.9, 7.2]
-    >>>
-    >>> for x in range(3):
-    ...     psutil.cpu_times_percent(interval=1, percpu=False)
-    ...
-    scputimes(user=1.5, nice=0.0, system=0.5, idle=96.5, iowait=1.5, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    scputimes(user=1.0, nice=0.0, system=0.0, idle=99.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    scputimes(user=2.0, nice=0.0, system=0.0, idle=98.0, iowait=0.0, irq=0.0, softirq=0.0, steal=0.0, guest=0.0, guest_nice=0.0)
-    >>>
-    >>> psutil.cpu_count()
-    4
-    >>> psutil.cpu_count(logical=False)
-    2
-    >>>
-    >>> psutil.cpu_stats()
-    scpustats(ctx_switches=20455687, interrupts=6598984, soft_interrupts=2134212, syscalls=0)
-    >>>
-    >>> psutil.cpu_freq()
-    scpufreq(current=931.42925, min=800.0, max=3500.0)
-    >>>
-    >>> psutil.getloadavg()  # also on Windows (emulated)
-    (3.14, 3.89, 4.67)
-
-Memory
-------
-
-.. code-block:: python
-
-    >>> psutil.virtual_memory()
-    svmem(total=10367352832, available=6472179712, percent=37.6, used=8186245120, free=2181107712, active=4748992512, inactive=2758115328, buffers=790724608, cached=3500347392, shared=787554304)
-    >>> psutil.swap_memory()
-    sswap(total=2097147904, used=296128512, free=1801019392, percent=14.1, sin=304193536, sout=677842944)
-    >>>
-
-Disks
------
-
-.. code-block:: python
-
-    >>> psutil.disk_partitions()
-    [sdiskpart(device='/dev/sda1', mountpoint='/', fstype='ext4', opts='rw,nosuid'),
-     sdiskpart(device='/dev/sda2', mountpoint='/home', fstype='ext, opts='rw')]
-    >>>
-    >>> psutil.disk_usage('/')
-    sdiskusage(total=21378641920, used=4809781248, free=15482871808, percent=22.5)
-    >>>
-    >>> psutil.disk_io_counters(perdisk=False)
-    sdiskio(read_count=719566, write_count=1082197, read_bytes=18626220032, write_bytes=24081764352, read_time=5023392, write_time=63199568, read_merged_count=619166, write_merged_count=812396, busy_time=4523412)
-    >>>
-
-Network
--------
-
-.. code-block:: python
-
-    >>> psutil.net_io_counters(pernic=True)
-    {'eth0': netio(bytes_sent=485291293, bytes_recv=6004858642, packets_sent=3251564, packets_recv=4787798, errin=0, errout=0, dropin=0, dropout=0),
-     'lo': netio(bytes_sent=2838627, bytes_recv=2838627, packets_sent=30567, packets_recv=30567, errin=0, errout=0, dropin=0, dropout=0)}
-    >>>
-    >>> psutil.net_connections()
-    [sconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED', pid=1254),
-     sconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING', pid=2987),
-     ...]
-    >>>
-    >>> psutil.net_if_addrs()
-    {'lo': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='127.0.0.1', netmask='255.0.0.0', broadcast='127.0.0.1', ptp=None),
-            snicaddr(family=<AddressFamily.AF_INET6: 10>, address='::1', netmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff', broadcast=None, ptp=None),
-            snicaddr(family=<AddressFamily.AF_LINK: 17>, address='00:00:00:00:00:00', netmask=None, broadcast='00:00:00:00:00:00', ptp=None)],
-     'wlan0': [snicaddr(family=<AddressFamily.AF_INET: 2>, address='192.168.1.3', netmask='255.255.255.0', broadcast='192.168.1.255', ptp=None),
-               snicaddr(family=<AddressFamily.AF_INET6: 10>, address='fe80::c685:8ff:fe45:641%wlan0', netmask='ffff:ffff:ffff:ffff::', broadcast=None, ptp=None),
-               snicaddr(family=<AddressFamily.AF_LINK: 17>, address='c4:85:08:45:06:41', netmask=None, broadcast='ff:ff:ff:ff:ff:ff', ptp=None)]}
-    >>>
-    >>> psutil.net_if_stats()
-    {'lo': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_UNKNOWN: 0>, speed=0, mtu=65536),
-     'wlan0': snicstats(isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>, speed=100, mtu=1500)}
-    >>>
-
-Sensors
--------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.sensors_temperatures()
-    {'acpitz': [shwtemp(label='', current=47.0, high=103.0, critical=103.0)],
-     'asus': [shwtemp(label='', current=47.0, high=None, critical=None)],
-     'coretemp': [shwtemp(label='Physical id 0', current=52.0, high=100.0, critical=100.0),
-                  shwtemp(label='Core 0', current=45.0, high=100.0, critical=100.0)]}
-    >>>
-    >>> psutil.sensors_fans()
-    {'asus': [sfan(label='cpu_fan', current=3200)]}
-    >>>
-    >>> psutil.sensors_battery()
-    sbattery(percent=93, secsleft=16628, power_plugged=False)
-    >>>
-
-Other system info
------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.users()
-    [suser(name='giampaolo', terminal='pts/2', host='localhost', started=1340737536.0, pid=1352),
-     suser(name='giampaolo', terminal='pts/3', host='localhost', started=1340737792.0, pid=1788)]
-    >>>
-    >>> psutil.boot_time()
-    1365519115.0
-    >>>
-
-Process management
-------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> psutil.pids()
-    [1, 2, 3, 4, 5, 6, 7, 46, 48, 50, 51, 178, 182, 222, 223, 224, 268, 1215, 1216, 1220, 1221, 1243, 1244,
-     1301, 1601, 2237, 2355, 2637, 2774, 3932, 4176, 4177, 4185, 4187, 4189, 4225, 4243, 4245, 4263, 4282,
-     4306, 4311, 4312, 4313, 4314, 4337, 4339, 4357, 4358, 4363, 4383, 4395, 4408, 4433, 4443, 4445, 4446,
-     5167, 5234, 5235, 5252, 5318, 5424, 5644, 6987, 7054, 7055, 7071]
-    >>>
-    >>> p = psutil.Process(7055)
-    >>> p
-    psutil.Process(pid=7055, name='python', started='09:04:44')
-    >>> p.name()
-    'python'
-    >>> p.exe()
-    '/usr/bin/python'
-    >>> p.cwd()
-    '/home/giampaolo'
-    >>> p.cmdline()
-    ['/usr/bin/python', 'main.py']
-    >>>
-    >>> p.pid
-    7055
-    >>> p.ppid()
-    7054
-    >>> p.children(recursive=True)
-    [psutil.Process(pid=29835, name='python2.7', started='11:45:38'),
-     psutil.Process(pid=29836, name='python2.7', started='11:43:39')]
-    >>>
-    >>> p.parent()
-    psutil.Process(pid=4699, name='bash', started='09:06:44')
-    >>> p.parents()
-    [psutil.Process(pid=4699, name='bash', started='09:06:44'),
-     psutil.Process(pid=4689, name='gnome-terminal-server', started='0:06:44'),
-     psutil.Process(pid=1, name='systemd', started='05:56:55')]
-    >>>
-    >>> p.status()
-    'running'
-    >>> p.username()
-    'giampaolo'
-    >>> p.create_time()
-    1267551141.5019531
-    >>> p.terminal()
-    '/dev/pts/0'
-    >>>
-    >>> p.uids()
-    puids(real=1000, effective=1000, saved=1000)
-    >>> p.gids()
-    pgids(real=1000, effective=1000, saved=1000)
-    >>>
-    >>> p.cpu_times()
-    pcputimes(user=1.02, system=0.31, children_user=0.32, children_system=0.1, iowait=0.0)
-    >>> p.cpu_percent(interval=1.0)
-    12.1
-    >>> p.cpu_affinity()
-    [0, 1, 2, 3]
-    >>> p.cpu_affinity([0, 1])  # set
-    >>> p.cpu_num()
-    1
-    >>>
-    >>> p.memory_info()
-    pmem(rss=10915840, vms=67608576, shared=3313664, text=2310144, lib=0, data=7262208, dirty=0)
-    >>> p.memory_full_info()  # "real" USS memory usage (Linux, macOS, Win only)
-    pfullmem(rss=10199040, vms=52133888, shared=3887104, text=2867200, lib=0, data=5967872, dirty=0, uss=6545408, pss=6872064, swap=0)
-    >>> p.memory_percent()
-    0.7823
-    >>> p.memory_maps()
-    [pmmap_grouped(path='/lib/x8664-linux-gnu/libutil-2.15.so', rss=32768, size=2125824, pss=32768, shared_clean=0, shared_dirty=0, private_clean=20480, private_dirty=12288, referenced=32768, anonymous=12288, swap=0),
-     pmmap_grouped(path='/lib/x8664-linux-gnu/libc-2.15.so', rss=3821568, size=3842048, pss=3821568, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=3821568, referenced=3575808, anonymous=3821568, swap=0),
-     pmmap_grouped(path='[heap]',  rss=32768, size=139264, pss=32768, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=32768, referenced=32768, anonymous=32768, swap=0),
-     pmmap_grouped(path='[stack]', rss=2465792, size=2494464, pss=2465792, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=2465792, referenced=2277376, anonymous=2465792, swap=0),
-     ...]
-    >>>
-    >>> p.io_counters()
-    pio(read_count=478001, write_count=59371, read_bytes=700416, write_bytes=69632, read_chars=456232, write_chars=517543)
-    >>>
-    >>> p.open_files()
-    [popenfile(path='/home/giampaolo/monit.py', fd=3, position=0, mode='r', flags=32768),
-     popenfile(path='/var/log/monit.log', fd=4, position=235542, mode='a', flags=33793)]
-    >>>
-    >>> p.connections()
-    [pconn(fd=115, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=48776), raddr=addr(ip='93.186.135.91', port=80), status='ESTABLISHED'),
-     pconn(fd=117, family=<AddressFamily.AF_INET: 2>, type=<SocketType.SOCK_STREAM: 1>, laddr=addr(ip='10.0.0.1', port=43761), raddr=addr(ip='72.14.234.100', port=80), status='CLOSING')]
-    >>>
-    >>> p.num_threads()
-    4
-    >>> p.num_fds()
-    8
-    >>> p.threads()
-    [pthread(id=5234, user_time=22.5, system_time=9.2891),
-     pthread(id=5237, user_time=0.0707, system_time=1.1)]
-    >>>
-    >>> p.num_ctx_switches()
-    pctxsw(voluntary=78, involuntary=19)
-    >>>
-    >>> p.nice()
-    0
-    >>> p.nice(10)  # set
-    >>>
-    >>> p.ionice(psutil.IOPRIO_CLASS_IDLE)  # IO priority (Win and Linux only)
-    >>> p.ionice()
-    pionice(ioclass=<IOPriority.IOPRIO_CLASS_IDLE: 3>, value=0)
-    >>>
-    >>> p.rlimit(psutil.RLIMIT_NOFILE, (5, 5))  # set resource limits (Linux only)
-    >>> p.rlimit(psutil.RLIMIT_NOFILE)
-    (5, 5)
-    >>>
-    >>> p.environ()
-    {'LC_PAPER': 'it_IT.UTF-8', 'SHELL': '/bin/bash', 'GREP_OPTIONS': '--color=auto',
-    'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg',
-     ...}
-    >>>
-    >>> p.as_dict()
-    {'status': 'running', 'num_ctx_switches': pctxsw(voluntary=63, involuntary=1), 'pid': 5457, ...}
-    >>> p.is_running()
-    True
-    >>> p.suspend()
-    >>> p.resume()
-    >>>
-    >>> p.terminate()
-    >>> p.kill()
-    >>> p.wait(timeout=3)
-    0
-    >>>
-    >>> psutil.test()
-    USER         PID %CPU %MEM     VSZ     RSS TTY        START    TIME  COMMAND
-    root           1  0.0  0.0   24584    2240            Jun17   00:00  init
-    root           2  0.0  0.0       0       0            Jun17   00:00  kthreadd
-    ...
-    giampaolo  31475  0.0  0.0   20760    3024 /dev/pts/0 Jun19   00:00  python2.4
-    giampaolo  31721  0.0  2.2  773060  181896            00:04   10:30  chrome
-    root       31763  0.0  0.0       0       0            00:05   00:00  kworker/0:1
-    >>>
-
-Further process APIs
---------------------
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> for proc in psutil.process_iter(['pid', 'name']):
-    ...     print(proc.info)
-    ...
-    {'pid': 1, 'name': 'systemd'}
-    {'pid': 2, 'name': 'kthreadd'}
-    {'pid': 3, 'name': 'ksoftirqd/0'}
-    ...
-    >>>
-    >>> psutil.pid_exists(3)
-    True
-    >>>
-    >>> def on_terminate(proc):
-    ...     print("process {} terminated".format(proc))
-    ...
-    >>> # waits for multiple processes to terminate
-    >>> gone, alive = psutil.wait_procs(procs_list, timeout=3, callback=on_terminate)
-    >>>
-
-Popen wrapper:
-
-.. code-block:: python
-
-    >>> import psutil
-    >>> from subprocess import PIPE
-    >>> p = psutil.Popen(["/usr/bin/python", "-c", "print('hello')"], stdout=PIPE)
-    >>> p.name()
-    'python'
-    >>> p.username()
-    'giampaolo'
-    >>> p.communicate()
-    ('hello\n', None)
-    >>> p.wait(timeout=2)
-    0
-    >>>
-
-Windows services
-----------------
-
-.. code-block:: python
-
-    >>> list(psutil.win_service_iter())
-    [<WindowsService(name='AeLookupSvc', display_name='Application Experience') at 38850096>,
-     <WindowsService(name='ALG', display_name='Application Layer Gateway Service') at 38850128>,
-     <WindowsService(name='APNMCP', display_name='Ask Update Service') at 38850160>,
-     <WindowsService(name='AppIDSvc', display_name='Application Identity') at 38850192>,
-     ...]
-    >>> s = psutil.win_service_get('alg')
-    >>> s.as_dict()
-    {'binpath': 'C:\\Windows\\System32\\alg.exe',
-     'description': 'Provides support for 3rd party protocol plug-ins for Internet Connection Sharing',
-     'display_name': 'Application Layer Gateway Service',
-     'name': 'alg',
-     'pid': None,
-     'start_type': 'manual',
-     'status': 'stopped',
-     'username': 'NT AUTHORITY\\LocalService'}
-
-
-.. _`Giampaolo Rodola`: http://grodola.blogspot.com/p/about.html
-.. _`donation`: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A9ZS7PKKRM3S8
-.. _Tidelift security contact: https://tidelift.com/security
-.. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-psutil?utm_source=pypi-psutil&utm_medium=referral&utm_campaign=readme
-
-
-
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/RECORD firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/RECORD
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/RECORD	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/RECORD	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-psutil/__init__.py,sha256=gkuk8_HMEBXTFl0y4l8A5QGNCjUH1T0tpF_Y8hPJCPA,87126
-psutil/_common.py,sha256=6kuDg4DKKv3OGndSXLQ3LftF_hPySIEOprC8HE49eag,26001
-psutil/_compat.py,sha256=lrMSZr32TO6y9FQw7C2xTNyKwAnPU2o11xQrA_fS_Qw,11607
-psutil/_psaix.py,sha256=u9M_jJqkiGqNgdhum9MZTbnS4pjIfdCHNr3HAYHA0GQ,18458
-psutil/_psbsd.py,sha256=LHfBJ-iKy4fuumIcSjO7b6VFOvU_d-Pzwp7Eg84rHSw,30534
-psutil/_pslinux.py,sha256=WtQtqOAhXd-zqtVPV-E0re91Vqj4DYrKQ3Mj9CfBWak,79806
-psutil/_psosx.py,sha256=kvG3GKxA-L581H_UgU_BYaZ3eMPX7qMtEBM7AGC-t10,17090
-psutil/_psposix.py,sha256=FtbNSosrJiiUb9l0gfFdTwNxUwQb6Icy4L3si0x6ZMA,6047
-psutil/_pssunos.py,sha256=c-0et4xslK83ZiTizQ9W3LH0pMZy11ATEIBbQBJ_v-g,25398
-psutil/_psutil_windows.pyd,sha256=jERIIv4AR_vfAvx8oOqkyv41JBPuMskRgnM1O8KdokE,62976
-psutil/_pswindows.py,sha256=iFcfbA5KZehjdZfe1b-cLGRdavGNryI4Zxpkqb12UjU,36839
-psutil/tests/__init__.py,sha256=uH3lPOnYc6179FxdSy4xfMeJOBvB9CZid268Pg_owC0,35141
-psutil/tests/__main__.py,sha256=bBfMPu_gPzyiA4gfAFSZLk7LyLSPTUIHQFU1kFcj_Ok,291
-psutil/tests/runner.py,sha256=l7BrTzIOdjPgNB3D3kiir8jBiK_QJKMlJSYu4Zr0_po,5188
-psutil/tests/test_aix.py,sha256=LA8PR-1vx5DN2OkjU57MsO8uzNOB0y1ScR1yx5bZJyc,4464
-psutil/tests/test_bsd.py,sha256=3zlUvefRm2fFTbyLrqM9u8NMK8CThLT7irioTGgnNts,20612
-psutil/tests/test_connections.py,sha256=U2KCl7eW6kRds8S7t8SmZ62OrVSPfdBuksHsDlk2C28,25293
-psutil/tests/test_contracts.py,sha256=BOKrRiZs625Xj3KZBzOZ8Kr6edAQgzHq0OlznoCxKzw,25355
-psutil/tests/test_linux.py,sha256=KvqJ-LiINvbQQ3y18uM2SZRKnpnH4PqlA7CqWLRIH5s,87573
-psutil/tests/test_memory_leaks.py,sha256=M5nWBv_PYfN7bIoaz6r0UqEYY79hO6wvvDfkKWFMETI,18499
-psutil/tests/test_misc.py,sha256=wqXpnXL2ycHyE1vu3GB43XTET5auTKz9VdBSjr-vdp0,38748
-psutil/tests/test_osx.py,sha256=oQIO0YReUtH0PFFAwyk8FpUqvjIiuhVPehMFS1AWJpM,9257
-psutil/tests/test_posix.py,sha256=fSi5J1LxPhA7ZocrnLnqCSBn6JUuOtBeAljBWughIf4,16537
-psutil/tests/test_process.py,sha256=JJB9VdAwKFYK-rlpvWn1NyeYasmr0nL_XetzFHHjaJU,63924
-psutil/tests/test_sunos.py,sha256=GwqWfAP46nrxWlJr-srg85cPNEU2DXvoMelAgqegfLA,1294
-psutil/tests/test_system.py,sha256=4nWe_fFRmnaB8epV7Eji_0JFnIJbvbykMgSi8LFzbKM,36162
-psutil/tests/test_unicode.py,sha256=5v1hFoOQoi9_2Wg4ZTIWY_YDd29G00-59ln9FOe8Tsg,13246
-psutil/tests/test_windows.py,sha256=cGjEspgL48Sb5BQeSG5kIU0DSeImPU1bL9cpFfNX2Tk,33666
-psutil-5.7.0.dist-info/LICENSE,sha256=JMEphFAMqgf_3OGe68BjlsXm0kS1c7xsQ49KbvjlbBs,1549
-psutil-5.7.0.dist-info/METADATA,sha256=RmX2_-V4HrxQ1p78U2Os4H5Q0ZFvF5oc0uUTUt9-sRo,25022
-psutil-5.7.0.dist-info/WHEEL,sha256=Yt_rpa18HI_NXs5dEYG1uWuZ-4QRLVJrN8TSetG3BOI,106
-psutil-5.7.0.dist-info/top_level.txt,sha256=gCNhn57wzksDjSAISmgMJ0aiXzQulk0GJhb2-BAyYgw,7
-psutil-5.7.0.dist-info/RECORD,,
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/top_level.txt firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/top_level.txt
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/top_level.txt	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-psutil
diff -Nru firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/WHEEL firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/WHEEL
--- firefox-84.0.2+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/WHEEL	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/psutil-cp27-none-win_amd64/psutil-5.7.0.dist-info/WHEEL	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
-Root-Is-Purelib: false
-Tag: cp27-cp27m-win_amd64
-
diff -Nru firefox-84.0.2+build1/third_party/python/requirements.in firefox-85.0+build1/third_party/python/requirements.in
--- firefox-84.0.2+build1/third_party/python/requirements.in	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/requirements.in	2021-01-18 19:58:25.000000000 +0000
@@ -34,7 +34,6 @@
 pathspec==0.8
 pip-tools==5.3.1
 ply==3.10
-psutil==5.7.0
 pyasn1==0.4.8
 pyflakes==2.2.0
 pytest==3.6.2
diff -Nru firefox-84.0.2+build1/third_party/python/requirements.txt firefox-85.0+build1/third_party/python/requirements.txt
--- firefox-84.0.2+build1/third_party/python/requirements.txt	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/python/requirements.txt	2021-01-18 19:58:25.000000000 +0000
@@ -169,19 +169,6 @@
 ply==3.10 \
     --hash=sha256:96e94af7dd7031d8d6dd6e2a8e0de593b511c211a86e28a9c9621c275ac8bacb \
     # via -r requirements-mach-vendor-python.in
-psutil==5.7.0 \
-    --hash=sha256:1413f4158eb50e110777c4f15d7c759521703bd6beb58926f1d562da40180058 \
-    --hash=sha256:298af2f14b635c3c7118fd9183843f4e73e681bb6f01e12284d4d70d48a60953 \
-    --hash=sha256:60b86f327c198561f101a92be1995f9ae0399736b6eced8f24af41ec64fb88d4 \
-    --hash=sha256:685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e \
-    --hash=sha256:73f35ab66c6c7a9ce82ba44b1e9b1050be2a80cd4dcc3352cc108656b115c74f \
-    --hash=sha256:75e22717d4dbc7ca529ec5063000b2b294fc9a367f9c9ede1f65846c7955fd38 \
-    --hash=sha256:a02f4ac50d4a23253b68233b07e7cdb567bd025b982d5cf0ee78296990c22d9e \
-    --hash=sha256:d008ddc00c6906ec80040d26dc2d3e3962109e40ad07fd8a12d0284ce5e0e4f8 \
-    --hash=sha256:d84029b190c8a66a946e28b4d3934d2ca1528ec94764b180f7d6ea57b0e75e26 \
-    --hash=sha256:e2d0c5b07c6fe5a87fa27b7855017edb0d52ee73b71e6ee368fae268605cc3f5 \
-    --hash=sha256:f344ca230dd8e8d5eee16827596f1c22ec0876127c28e800d7ae20ed44c4b310 \
-    # via -r requirements-mach-vendor-python.in
 py==1.5.4 \
     --hash=sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7 \
     --hash=sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e \
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/.cargo-checksum.json firefox-85.0+build1/third_party/rust/ansi_term/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/ansi_term/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"48df4570f3bbfba5b3c19731a54abf70ac8608e4dab6f4dae6a694b18d6ad102","LICENCE":"a24742368cf773bbb8b6f0fcbe86ca4b802c2b7c081bc8bebf14ac38618e7c63","README.md":"779b02ebacd6f4d08e01ef289bd7976a4467054f40355593817fd6df7e8c9dd4","examples/colours.rs":"e4870671adb9574607e37a0e4145643f9047c881c310113de114ec20d76aaf4b","src/ansi.rs":"b8f5de966e7ec2fba7a4d5a373d0aceafe19ea6e20a3f4daaf448e119c989ae7","src/debug.rs":"0ab28b65c39538825707d8b7e81c6f91c78310856c936bba0ee609e06d138543","src/difference.rs":"da68156310cbaf57a3619160d0fb966f496f970c32a2e57601127cc8f54a2fbf","src/display.rs":"a43f19b7cf4d95e90e4f3954399405d8350523d423f0beed9f01399e17527b17","src/lib.rs":"b6df00ab61ca0d82c9f7b3798d516384dd2617fe73e8981f37125ecccc970dd7","src/style.rs":"7c5c2524428f0dfbe3b8d5876ddb81c47d8635704ee31ef63ddeb2429a67f457","src/windows.rs":"3b52469eed89fdc258139e4fd978f0e30c72168863966247df781da8715f0841","src/write.rs":"247c518f8b0c103c970bbe7bc70caba3ee961ab0d37095e2da5c69db98d2fc24"},"package":"ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/Cargo.toml firefox-85.0+build1/third_party/rust/ansi_term/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/ansi_term/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "ansi_term"
-version = "0.11.0"
-authors = ["ogham@bsago.me", "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>", "Josh Triplett <josh@joshtriplett.org>"]
-description = "Library for ANSI terminal colours and styles (bold, underline)"
-homepage = "https://github.com/ogham/rust-ansi-term"
-documentation = "https://docs.rs/ansi_term"
-readme = "README.md"
-license = "MIT"
-
-[lib]
-name = "ansi_term"
-[target."cfg(target_os=\"windows\")".dependencies.winapi]
-version = "0.3.4"
-features = ["errhandlingapi", "consoleapi", "processenv"]
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/examples/colours.rs firefox-85.0+build1/third_party/rust/ansi_term/examples/colours.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/examples/colours.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/examples/colours.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-extern crate ansi_term;
-use ansi_term::Colour::*;
-
-fn main() {
-    println!("{}", Black.paint("Black"));
-    println!("{}", Red.paint("Red"));
-    println!("{}", Green.paint("Green"));
-    println!("{}", Yellow.paint("Yellow"));
-    println!("{}", Blue.paint("Blue"));
-    println!("{}", Purple.paint("Purple"));
-    println!("{}", Cyan.paint("Cyan"));
-    println!("{}", White.paint("White"));
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/LICENCE firefox-85.0+build1/third_party/rust/ansi_term/LICENCE
--- firefox-84.0.2+build1/third_party/rust/ansi_term/LICENCE	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/LICENCE	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Benjamin Sago
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/README.md firefox-85.0+build1/third_party/rust/ansi_term/README.md
--- firefox-84.0.2+build1/third_party/rust/ansi_term/README.md	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-# rust-ansi-term [![ansi-term on crates.io](http://meritbadge.herokuapp.com/ansi-term)](https://crates.io/crates/ansi_term) [![Build status](https://travis-ci.org/ogham/rust-ansi-term.svg?branch=master)](https://travis-ci.org/ogham/rust-ansi-term) [![Coverage status](https://coveralls.io/repos/ogham/rust-ansi-term/badge.svg?branch=master&service=github)](https://coveralls.io/github/ogham/rust-ansi-term?branch=master)
-
-This is a library for controlling colours and formatting, such as red bold text or blue underlined text, on ANSI terminals.
-
-### [View the Rustdoc](https://docs.rs/ansi_term/0.9.0/ansi_term/)
-
-
-# Installation
-
-This crate works with [Cargo](http://crates.io). Add the following to your `Cargo.toml` dependencies section:
-
-```toml
-[dependencies]
-ansi_term = "0.9"
-```
-
-
-## Basic usage
-
-There are two main data structures in this crate that you need to be concerned with: `ANSIString` and `Style`.
-A `Style` holds stylistic information: colours, whether the text should be bold, or blinking, or whatever.
-There are also `Colour` variants that represent simple foreground colour styles.
-An `ANSIString` is a string paired with a `Style`.
-
-(Yes, it’s British English, but you won’t have to write “colour� very often. `Style` is used the majority of the time.)
-
-To format a string, call the `paint` method on a `Style` or a `Colour`, passing in the string you want to format as the argument.
-For example, here’s how to get some red text:
-
-```rust
-use ansi_term::Colour::Red;
-println!("This is in red: {}", Red.paint("a red string"));
-```
-
-It’s important to note that the `paint` method does *not* actually return a string with the ANSI control characters surrounding it.
-Instead, it returns an `ANSIString` value that has a `Display` implementation that, when formatted, returns the characters.
-This allows strings to be printed with a minimum of `String` allocations being performed behind the scenes.
-
-If you *do* want to get at the escape codes, then you can convert the `ANSIString` to a string as you would any other `Display` value:
-
-```rust
-use ansi_term::Colour::Red;
-use std::string::ToString;
-let red_string = Red.paint("a red string").to_string();
-```
-
-**Note for Windows 10 users:** On Windows 10, the application must enable ANSI support first:
-
-```rust
-let enabled = ansi_term::enable_ansi_support();
-```
-
-## Bold, underline, background, and other styles
-
-For anything more complex than plain foreground colour changes, you need to construct `Style` objects themselves, rather than beginning with a `Colour`.
-You can do this by chaining methods based on a new `Style`, created with `Style::new()`.
-Each method creates a new style that has that specific property set.
-For example:
-
-```rust
-use ansi_term::Style;
-println!("How about some {} and {}?",
-         Style::new().bold().paint("bold"),
-         Style::new().underline().paint("underline"));
-```
-
-For brevity, these methods have also been implemented for `Colour` values, so you can give your styles a foreground colour without having to begin with an empty `Style` value:
-
-```rust
-use ansi_term::Colour::{Blue, Yellow};
-println!("Demonstrating {} and {}!",
-         Blue.bold().paint("blue bold"),
-         Yellow.underline().paint("yellow underline"));
-println!("Yellow on blue: {}", Yellow.on(Blue).paint("wow!"));
-```
-
-The complete list of styles you can use are:
-`bold`, `dimmed`, `italic`, `underline`, `blink`, `reverse`, `hidden`, and `on` for background colours.
-
-In some cases, you may find it easier to change the foreground on an existing `Style` rather than starting from the appropriate `Colour`.
-You can do this using the `fg` method:
-
-```rust
-    use ansi_term::Style;
-    use ansi_term::Colour::{Blue, Cyan, Yellow};
-    println!("Yellow on blue: {}", Style::new().on(Blue).fg(Yellow).paint("yow!"));
-    println!("Also yellow on blue: {}", Cyan.on(Blue).fg(Yellow).paint("zow!"));
-```
-
-Finally, you can turn a `Colour` into a `Style` with the `normal` method.
-This will produce the exact same `ANSIString` as if you just used the `paint` method on the `Colour` directly, but it’s useful in certain cases: for example, you may have a method that returns `Styles`, and need to represent both the “red bold� and “red, but not bold� styles with values of the same type. The `Style` struct also has a `Default` implementation if you want to have a style with *nothing* set.
-
-```rust
-use ansi_term::Style;
-use ansi_term::Colour::Red;
-Red.normal().paint("yet another red string");
-Style::default().paint("a completely regular string");
-```
-
-
-## Extended colours
-
-You can access the extended range of 256 colours by using the `Fixed` colour variant, which takes an argument of the colour number to use.
-This can be included wherever you would use a `Colour`:
-
-```rust
-use ansi_term::Colour::Fixed;
-Fixed(134).paint("A sort of light purple");
-Fixed(221).on(Fixed(124)).paint("Mustard in the ketchup");
-```
-
-The first sixteen of these values are the same as the normal and bold standard colour variants.
-There’s nothing stopping you from using these as `Fixed` colours instead, but there’s nothing to be gained by doing so either.
-
-You can also access full 24-bit color by using the `RGB` colour variant, which takes separate `u8` arguments for red, green, and blue:
-
-```rust
-    use ansi_term::Colour::RGB;
-    RGB(70, 130, 180).paint("Steel blue");
-```
-
-## Combining successive coloured strings
-
-The benefit of writing ANSI escape codes to the terminal is that they *stack*: you do not need to end every coloured string with a reset code if the text that follows it is of a similar style.
-For example, if you want to have some blue text followed by some blue bold text, it’s possible to send the ANSI code for blue, followed by the ANSI code for bold, and finishing with a reset code without having to have an extra one between the two strings.
-
-This crate can optimise the ANSI codes that get printed in situations like this, making life easier for your terminal renderer.
-The `ANSIStrings` struct takes a slice of several `ANSIString` values, and will iterate over each of them, printing only the codes for the styles that need to be updated as part of its formatting routine.
-
-The following code snippet uses this to enclose a binary number displayed in red bold text inside some red, but not bold, brackets:
-
-```rust
-use ansi_term::Colour::Red;
-use ansi_term::{ANSIString, ANSIStrings};
-let some_value = format!("{:b}", 42);
-let strings: &[ANSIString<'static>] = &[
-    Red.paint("["),
-    Red.bold().paint(some_value),
-    Red.paint("]"),
-];
-println!("Value: {}", ANSIStrings(strings));
-```
-
-There are several things to note here.
-Firstly, the `paint` method can take *either* an owned `String` or a borrowed `&str`.
-Internally, an `ANSIString` holds a copy-on-write (`Cow`) string value to deal with both owned and borrowed strings at the same time.
-This is used here to display a `String`, the result of the `format!` call, using the same mechanism as some statically-available `&str` slices.
-Secondly, that the `ANSIStrings` value works in the same way as its singular counterpart, with a `Display` implementation that only performs the formatting when required.
-
-## Byte strings
-
-This library also supports formatting `[u8]` byte strings; this supports
-applications working with text in an unknown encoding.  `Style` and
-`Color` support painting `[u8]` values, resulting in an `ANSIByteString`.
-This type does not implement `Display`, as it may not contain UTF-8, but
-it does provide a method `write_to` to write the result to any
-`io::Write`:
-
-```rust
-use ansi_term::Colour::Green;
-Green.paint("user data".as_bytes()).write_to(&mut std::io::stdout()).unwrap();
-```
-
-Similarly, the type `ANSIByteStrings` supports writing a list of
-`ANSIByteString` values with minimal escape sequences:
-
-```rust
-use ansi_term::Colour::Green;
-use ansi_term::ANSIByteStrings;
-ANSIByteStrings(&[
-    Green.paint("user data 1\n".as_bytes()),
-    Green.bold().paint("user data 2\n".as_bytes()),
-]).write_to(&mut std::io::stdout()).unwrap();
-```
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/ansi.rs firefox-85.0+build1/third_party/rust/ansi_term/src/ansi.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/ansi.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/ansi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,258 +0,0 @@
-use style::{Colour, Style};
-
-use std::fmt;
-
-use write::AnyWrite;
-
-
-// ---- generating ANSI codes ----
-
-impl Style {
-
-    /// Write any ANSI codes that go *before* a piece of text. These should be
-    /// the codes to set the terminal to a different colour or font style.
-    fn write_prefix<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-
-        // If there are actually no styles here, then don’t write *any* codes
-        // as the prefix. An empty ANSI code may not affect the terminal
-        // output at all, but a user may just want a code-free string.
-        if self.is_plain() {
-            return Ok(());
-        }
-
-        // Write the codes’ prefix, then write numbers, separated by
-        // semicolons, for each text style we want to apply.
-        write!(f, "\x1B[")?;
-        let mut written_anything = false;
-
-        {
-            let mut write_char = |c| {
-                if written_anything { write!(f, ";")?; }
-                written_anything = true;
-                write!(f, "{}", c)?;
-                Ok(())
-            };
-
-            if self.is_bold           { write_char('1')? }
-            if self.is_dimmed         { write_char('2')? }
-            if self.is_italic         { write_char('3')? }
-            if self.is_underline      { write_char('4')? }
-            if self.is_blink          { write_char('5')? }
-            if self.is_reverse        { write_char('7')? }
-            if self.is_hidden         { write_char('8')? }
-            if self.is_strikethrough  { write_char('9')? }
-        }
-
-        // The foreground and background colours, if specified, need to be
-        // handled specially because the number codes are more complicated.
-        // (see `write_background_code` and `write_foreground_code`)
-        if let Some(bg) = self.background {
-            if written_anything { write!(f, ";")?; }
-            written_anything = true;
-            bg.write_background_code(f)?;
-        }
-
-        if let Some(fg) = self.foreground {
-            if written_anything { write!(f, ";")?; }
-            fg.write_foreground_code(f)?;
-        }
-
-        // All the codes end with an `m`, because reasons.
-        write!(f, "m")?;
-
-        Ok(())
-    }
-
-    /// Write any ANSI codes that go *after* a piece of text. These should be
-    /// the codes to *reset* the terminal back to its normal colour and style.
-    fn write_suffix<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        if self.is_plain() {
-            Ok(())
-        }
-        else {
-            write!(f, "{}", RESET)
-        }
-    }
-}
-
-
-/// The code to send to reset all styles and return to `Style::default()`.
-pub static RESET: &str = "\x1B[0m";
-
-
-
-impl Colour {
-    fn write_foreground_code<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        match *self {
-            Colour::Black      => write!(f, "30"),
-            Colour::Red        => write!(f, "31"),
-            Colour::Green      => write!(f, "32"),
-            Colour::Yellow     => write!(f, "33"),
-            Colour::Blue       => write!(f, "34"),
-            Colour::Purple     => write!(f, "35"),
-            Colour::Cyan       => write!(f, "36"),
-            Colour::White      => write!(f, "37"),
-            Colour::Fixed(num) => write!(f, "38;5;{}", &num),
-            Colour::RGB(r,g,b) => write!(f, "38;2;{};{};{}", &r, &g, &b),
-        }
-    }
-
-    fn write_background_code<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        match *self {
-            Colour::Black      => write!(f, "40"),
-            Colour::Red        => write!(f, "41"),
-            Colour::Green      => write!(f, "42"),
-            Colour::Yellow     => write!(f, "43"),
-            Colour::Blue       => write!(f, "44"),
-            Colour::Purple     => write!(f, "45"),
-            Colour::Cyan       => write!(f, "46"),
-            Colour::White      => write!(f, "47"),
-            Colour::Fixed(num) => write!(f, "48;5;{}", &num),
-            Colour::RGB(r,g,b) => write!(f, "48;2;{};{};{}", &r, &g, &b),
-        }
-    }
-}
-
-
-/// Like `ANSIString`, but only displays the style prefix.
-#[derive(Clone, Copy, Debug)]
-pub struct Prefix(Style);
-
-/// Like `ANSIString`, but only displays the difference between two
-/// styles.
-#[derive(Clone, Copy, Debug)]
-pub struct Infix(Style, Style);
-
-/// Like `ANSIString`, but only displays the style suffix.
-#[derive(Clone, Copy, Debug)]
-pub struct Suffix(Style);
-
-
-impl Style {
-
-    /// The prefix for this style.
-    pub fn prefix(self) -> Prefix {
-        Prefix(self)
-    }
-
-    /// The infix between this style and another.
-    pub fn infix(self, other: Style) -> Infix {
-        Infix(self, other)
-    }
-
-    /// The suffix for this style.
-    pub fn suffix(self) -> Suffix {
-        Suffix(self)
-    }
-}
-
-
-impl Colour {
-
-    /// The prefix for this colour.
-    pub fn prefix(self) -> Prefix {
-        Prefix(self.normal())
-    }
-
-    /// The infix between this colour and another.
-    pub fn infix(self, other: Colour) -> Infix {
-        Infix(self.normal(), other.normal())
-    }
-
-    /// The suffix for this colour.
-    pub fn suffix(self) -> Suffix {
-        Suffix(self.normal())
-    }
-}
-
-
-impl fmt::Display for Prefix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut fmt::Write = f;
-        self.0.write_prefix(f)
-    }
-}
-
-
-impl fmt::Display for Infix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use difference::Difference;
-
-        match Difference::between(&self.0, &self.1) {
-            Difference::ExtraStyles(style) => {
-                let f: &mut fmt::Write = f;
-                style.write_prefix(f)
-            },
-            Difference::Reset => {
-                let f: &mut fmt::Write = f;
-                write!(f, "{}{}", RESET, self.0.prefix())
-            },
-            Difference::NoDifference => {
-                Ok(())   // nothing to write
-            },
-        }
-    }
-}
-
-
-impl fmt::Display for Suffix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut fmt::Write = f;
-        self.0.write_suffix(f)
-    }
-}
-
-
-
-#[cfg(test)]
-mod test {
-    use style::Style;
-    use style::Colour::*;
-
-    macro_rules! test {
-        ($name: ident: $style: expr; $input: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($style.paint($input).to_string(), $result.to_string());
-
-                let mut v = Vec::new();
-                $style.paint($input.as_bytes()).write_to(&mut v).unwrap();
-                assert_eq!(v.as_slice(), $result.as_bytes());
-            }
-        };
-    }
-
-    test!(plain:                 Style::default();                  "text/plain" => "text/plain");
-    test!(red:                   Red;                               "hi" => "\x1B[31mhi\x1B[0m");
-    test!(black:                 Black.normal();                    "hi" => "\x1B[30mhi\x1B[0m");
-    test!(yellow_bold:           Yellow.bold();                     "hi" => "\x1B[1;33mhi\x1B[0m");
-    test!(yellow_bold_2:         Yellow.normal().bold();            "hi" => "\x1B[1;33mhi\x1B[0m");
-    test!(blue_underline:        Blue.underline();                  "hi" => "\x1B[4;34mhi\x1B[0m");
-    test!(green_bold_ul:         Green.bold().underline();          "hi" => "\x1B[1;4;32mhi\x1B[0m");
-    test!(green_bold_ul_2:       Green.underline().bold();          "hi" => "\x1B[1;4;32mhi\x1B[0m");
-    test!(purple_on_white:       Purple.on(White);                  "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(purple_on_white_2:     Purple.normal().on(White);         "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(yellow_on_blue:        Style::new().on(Blue).fg(Yellow);  "hi" => "\x1B[44;33mhi\x1B[0m");
-    test!(yellow_on_blue_2:      Cyan.on(Blue).fg(Yellow);          "hi" => "\x1B[44;33mhi\x1B[0m");
-    test!(cyan_bold_on_white:    Cyan.bold().on(White);             "hi" => "\x1B[1;47;36mhi\x1B[0m");
-    test!(cyan_ul_on_white:      Cyan.underline().on(White);        "hi" => "\x1B[4;47;36mhi\x1B[0m");
-    test!(cyan_bold_ul_on_white: Cyan.bold().underline().on(White); "hi" => "\x1B[1;4;47;36mhi\x1B[0m");
-    test!(cyan_ul_bold_on_white: Cyan.underline().bold().on(White); "hi" => "\x1B[1;4;47;36mhi\x1B[0m");
-    test!(fixed:                 Fixed(100);                        "hi" => "\x1B[38;5;100mhi\x1B[0m");
-    test!(fixed_on_purple:       Fixed(100).on(Purple);             "hi" => "\x1B[45;38;5;100mhi\x1B[0m");
-    test!(fixed_on_fixed:        Fixed(100).on(Fixed(200));         "hi" => "\x1B[48;5;200;38;5;100mhi\x1B[0m");
-    test!(rgb:                   RGB(70,130,180);                   "hi" => "\x1B[38;2;70;130;180mhi\x1B[0m");
-    test!(rgb_on_blue:           RGB(70,130,180).on(Blue);          "hi" => "\x1B[44;38;2;70;130;180mhi\x1B[0m");
-    test!(blue_on_rgb:           Blue.on(RGB(70,130,180));          "hi" => "\x1B[48;2;70;130;180;34mhi\x1B[0m");
-    test!(rgb_on_rgb:            RGB(70,130,180).on(RGB(5,10,15));  "hi" => "\x1B[48;2;5;10;15;38;2;70;130;180mhi\x1B[0m");
-    test!(bold:                  Style::new().bold();               "hi" => "\x1B[1mhi\x1B[0m");
-    test!(underline:             Style::new().underline();          "hi" => "\x1B[4mhi\x1B[0m");
-    test!(bunderline:            Style::new().bold().underline();   "hi" => "\x1B[1;4mhi\x1B[0m");
-    test!(dimmed:                Style::new().dimmed();             "hi" => "\x1B[2mhi\x1B[0m");
-    test!(italic:                Style::new().italic();             "hi" => "\x1B[3mhi\x1B[0m");
-    test!(blink:                 Style::new().blink();              "hi" => "\x1B[5mhi\x1B[0m");
-    test!(reverse:               Style::new().reverse();            "hi" => "\x1B[7mhi\x1B[0m");
-    test!(hidden:                Style::new().hidden();             "hi" => "\x1B[8mhi\x1B[0m");
-    test!(stricken:              Style::new().strikethrough();      "hi" => "\x1B[9mhi\x1B[0m");
-
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/debug.rs firefox-85.0+build1/third_party/rust/ansi_term/src/debug.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/debug.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/debug.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,122 +0,0 @@
-use std::fmt;
-
-use style::Style;
-
-
-/// Styles have a special `Debug` implementation that only shows the fields that
-/// are set. Fields that haven’t been touched aren’t included in the output.
-///
-/// This behaviour gets bypassed when using the alternate formatting mode
-/// `format!("{:#?}")`.
-///
-///     use ansi_term::Colour::{Red, Blue};
-///     assert_eq!("Style { fg(Red), on(Blue), bold, italic }",
-///                format!("{:?}", Red.on(Blue).bold().italic()));
-impl fmt::Debug for Style {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        if fmt.alternate() {
-            fmt.debug_struct("Style")
-               .field("foreground",    &self.foreground)
-               .field("background",    &self.background)
-               .field("blink",         &self.is_blink)
-               .field("bold",          &self.is_bold)
-               .field("dimmed",        &self.is_dimmed)
-               .field("hidden",        &self.is_hidden)
-               .field("italic",        &self.is_italic)
-               .field("reverse",       &self.is_reverse)
-               .field("strikethrough", &self.is_strikethrough)
-               .field("underline",     &self.is_underline)
-               .finish()
-        }
-        else if self.is_plain() {
-            fmt.write_str("Style {}")
-        }
-        else {
-            fmt.write_str("Style { ")?;
-
-            let mut written_anything = false;
-
-            if let Some(fg) = self.foreground {
-                if written_anything { fmt.write_str(", ")? }
-                written_anything = true;
-                write!(fmt, "fg({:?})", fg)?
-            }
-
-            if let Some(bg) = self.background {
-                if written_anything { fmt.write_str(", ")? }
-                written_anything = true;
-                write!(fmt, "on({:?})", bg)?
-            }
-
-            {
-                let mut write_flag = |name| {
-                    if written_anything { fmt.write_str(", ")? }
-                    written_anything = true;
-                    fmt.write_str(name)
-                };
-
-                if self.is_blink          { write_flag("blink")? }
-                if self.is_bold           { write_flag("bold")? }
-                if self.is_dimmed         { write_flag("dimmed")? }
-                if self.is_hidden         { write_flag("hidden")? }
-                if self.is_italic         { write_flag("italic")? }
-                if self.is_reverse        { write_flag("reverse")? }
-                if self.is_strikethrough  { write_flag("strikethrough")? }
-                if self.is_underline      { write_flag("underline")? }
-            }
-
-            write!(fmt, " }}")
-        }
-    }
-}
-
-
-#[cfg(test)]
-mod test {
-    use style::Colour::*;
-    use style::Style;
-
-    fn style() -> Style {
-        Style::new()
-    }
-
-    macro_rules! test {
-        ($name: ident: $obj: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($result, format!("{:?}", $obj));
-            }
-        };
-    }
-
-    test!(empty:   style()                  => "Style {}");
-    test!(bold:    style().bold()           => "Style { bold }");
-    test!(italic:  style().italic()         => "Style { italic }");
-    test!(both:    style().bold().italic()  => "Style { bold, italic }");
-
-    test!(red:     Red.normal()                     => "Style { fg(Red) }");
-    test!(redblue: Red.normal().on(RGB(3, 2, 4))    => "Style { fg(Red), on(RGB(3, 2, 4)) }");
-
-    test!(everything:
-            Red.on(Blue).blink().bold().dimmed().hidden().italic().reverse().strikethrough().underline() =>
-            "Style { fg(Red), on(Blue), blink, bold, dimmed, hidden, italic, reverse, strikethrough, underline }");
-
-    #[test]
-    fn long_and_detailed() {
-        let debug = r##"Style {
-    foreground: Some(
-        Blue
-    ),
-    background: None,
-    blink: false,
-    bold: true,
-    dimmed: false,
-    hidden: false,
-    italic: false,
-    reverse: false,
-    strikethrough: false,
-    underline: false
-}"##;
-        assert_eq!(debug, format!("{:#?}", Blue.bold()));
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/difference.rs firefox-85.0+build1/third_party/rust/ansi_term/src/difference.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/difference.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/difference.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-use super::Style;
-
-
-/// When printing out one coloured string followed by another, use one of
-/// these rules to figure out which *extra* control codes need to be sent.
-#[derive(PartialEq, Clone, Copy, Debug)]
-pub enum Difference {
-
-    /// Print out the control codes specified by this style to end up looking
-    /// like the second string's styles.
-    ExtraStyles(Style),
-
-    /// Converting between these two is impossible, so just send a reset
-    /// command and then the second string's styles.
-    Reset,
-
-    /// The before style is exactly the same as the after style, so no further
-    /// control codes need to be printed.
-    NoDifference,
-}
-
-
-impl Difference {
-
-    /// Compute the 'style difference' required to turn an existing style into
-    /// the given, second style.
-    ///
-    /// For example, to turn green text into green bold text, it's redundant
-    /// to write a reset command then a second green+bold command, instead of
-    /// just writing one bold command. This method should see that both styles
-    /// use the foreground colour green, and reduce it to a single command.
-    ///
-    /// This method returns an enum value because it's not actually always
-    /// possible to turn one style into another: for example, text could be
-    /// made bold and underlined, but you can't remove the bold property
-    /// without also removing the underline property. So when this has to
-    /// happen, this function returns None, meaning that the entire set of
-    /// styles should be reset and begun again.
-    pub fn between(first: &Style, next: &Style) -> Difference {
-        use self::Difference::*;
-
-        // XXX(Havvy): This algorithm is kind of hard to replicate without
-        // having the Plain/Foreground enum variants, so I'm just leaving
-        // it commented out for now, and defaulting to Reset.
-
-        if first == next {
-            return NoDifference;
-        }
-
-        // Cannot un-bold, so must Reset.
-        if first.is_bold && !next.is_bold {
-            return Reset;
-        }
-
-        if first.is_dimmed && !next.is_dimmed {
-            return Reset;
-        }
-
-        if first.is_italic && !next.is_italic {
-            return Reset;
-        }
-
-        // Cannot un-underline, so must Reset.
-        if first.is_underline && !next.is_underline {
-            return Reset;
-        }
-
-        if first.is_blink && !next.is_blink {
-            return Reset;
-        }
-
-        if first.is_reverse && !next.is_reverse {
-            return Reset;
-        }
-
-        if first.is_hidden && !next.is_hidden {
-            return Reset;
-        }
-
-        if first.is_strikethrough && !next.is_strikethrough {
-            return Reset;
-        }
-
-        // Cannot go from foreground to no foreground, so must Reset.
-        if first.foreground.is_some() && next.foreground.is_none() {
-            return Reset;
-        }
-
-        // Cannot go from background to no background, so must Reset.
-        if first.background.is_some() && next.background.is_none() {
-            return Reset;
-        }
-
-        let mut extra_styles = Style::default();
-
-        if first.is_bold != next.is_bold {
-            extra_styles.is_bold = true;
-        }
-
-        if first.is_dimmed != next.is_dimmed {
-            extra_styles.is_dimmed = true;
-        }
-
-        if first.is_italic != next.is_italic {
-            extra_styles.is_italic = true;
-        }
-
-        if first.is_underline != next.is_underline {
-            extra_styles.is_underline = true;
-        }
-
-        if first.is_blink != next.is_blink {
-            extra_styles.is_blink = true;
-        }
-
-        if first.is_reverse != next.is_reverse {
-            extra_styles.is_reverse = true;
-        }
-
-        if first.is_hidden != next.is_hidden {
-            extra_styles.is_hidden = true;
-        }
-
-        if first.is_strikethrough != next.is_strikethrough {
-            extra_styles.is_strikethrough = true;
-        }
-
-        if first.foreground != next.foreground {
-            extra_styles.foreground = next.foreground;
-        }
-
-        if first.background != next.background {
-            extra_styles.background = next.background;
-        }
-
-        ExtraStyles(extra_styles)
-    }
-}
-
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use super::Difference::*;
-    use style::Colour::*;
-    use style::Style;
-
-    fn style() -> Style {
-        Style::new()
-    }
-
-    macro_rules! test {
-        ($name: ident: $first: expr; $next: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($result, Difference::between(&$first, &$next));
-            }
-        };
-    }
-
-    test!(nothing:    Green.normal(); Green.normal()  => NoDifference);
-    test!(uppercase:  Green.normal(); Green.bold()    => ExtraStyles(style().bold()));
-    test!(lowercase:  Green.bold();   Green.normal()  => Reset);
-    test!(nothing2:   Green.bold();   Green.bold()    => NoDifference);
-
-    test!(colour_change: Red.normal(); Blue.normal() => ExtraStyles(Blue.normal()));
-
-    test!(addition_of_blink:          style(); style().blink()          => ExtraStyles(style().blink()));
-    test!(addition_of_dimmed:         style(); style().dimmed()         => ExtraStyles(style().dimmed()));
-    test!(addition_of_hidden:         style(); style().hidden()         => ExtraStyles(style().hidden()));
-    test!(addition_of_reverse:        style(); style().reverse()        => ExtraStyles(style().reverse()));
-    test!(addition_of_strikethrough:  style(); style().strikethrough()  => ExtraStyles(style().strikethrough()));
-
-    test!(removal_of_strikethrough:   style().strikethrough(); style()  => Reset);
-    test!(removal_of_reverse:         style().reverse();       style()  => Reset);
-    test!(removal_of_hidden:          style().hidden();        style()  => Reset);
-    test!(removal_of_dimmed:          style().dimmed();        style()  => Reset);
-    test!(removal_of_blink:           style().blink();         style()  => Reset);
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/display.rs firefox-85.0+build1/third_party/rust/ansi_term/src/display.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/display.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/display.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-use std::borrow::Cow;
-use std::fmt;
-use std::io;
-use std::ops::Deref;
-
-use ansi::RESET;
-use difference::Difference;
-use style::{Style, Colour};
-use write::AnyWrite;
-
-
-/// An `ANSIGenericString` includes a generic string type and a `Style` to
-/// display that string.  `ANSIString` and `ANSIByteString` are aliases for
-/// this type on `str` and `[u8]`, respectively.
-#[derive(PartialEq, Debug)]
-pub struct ANSIGenericString<'a, S: 'a + ToOwned + ?Sized>
-where <S as ToOwned>::Owned: fmt::Debug {
-    style: Style,
-    string: Cow<'a, S>,
-}
-
-
-/// Cloning an `ANSIGenericString` will clone its underlying string.
-///
-/// ### Examples
-///
-/// ```
-/// use ansi_term::ANSIString;
-///
-/// let plain_string = ANSIString::from("a plain string");
-/// let clone_string = plain_string.clone();
-/// assert_eq!(clone_string, plain_string);
-/// ```
-impl<'a, S: 'a + ToOwned + ?Sized> Clone for ANSIGenericString<'a, S>
-where <S as ToOwned>::Owned: fmt::Debug {
-    fn clone(&self) -> ANSIGenericString<'a, S> {
-        ANSIGenericString {
-            style: self.style,
-            string: self.string.clone(),
-        }
-    }
-}
-
-// You might think that the hand-written Clone impl above is the same as the
-// one that gets generated with #[derive]. But it’s not *quite* the same!
-//
-// `str` is not Clone, and the derived Clone implementation puts a Clone
-// constraint on the S type parameter (generated using --pretty=expanded):
-//
-//                  ↓_________________↓
-//     impl <'a, S: ::std::clone::Clone + 'a + ToOwned + ?Sized> ::std::clone::Clone
-//     for ANSIGenericString<'a, S> where
-//     <S as ToOwned>::Owned: fmt::Debug { ... }
-//
-// This resulted in compile errors when you tried to derive Clone on a type
-// that used it:
-//
-//     #[derive(PartialEq, Debug, Clone, Default)]
-//     pub struct TextCellContents(Vec<ANSIString<'static>>);
-//                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-//     error[E0277]: the trait `std::clone::Clone` is not implemented for `str`
-//
-// The hand-written impl above can ignore that constraint and still compile.
-
-
-
-/// An ANSI String is a string coupled with the `Style` to display it
-/// in a terminal.
-///
-/// Although not technically a string itself, it can be turned into
-/// one with the `to_string` method.
-///
-/// ### Examples
-///
-/// ```no_run
-/// use ansi_term::ANSIString;
-/// use ansi_term::Colour::Red;
-///
-/// let red_string = Red.paint("a red string");
-/// println!("{}", red_string);
-/// ```
-///
-/// ```
-/// use ansi_term::ANSIString;
-///
-/// let plain_string = ANSIString::from("a plain string");
-/// assert_eq!(&*plain_string, "a plain string");
-/// ```
-pub type ANSIString<'a> = ANSIGenericString<'a, str>;
-
-/// An `ANSIByteString` represents a formatted series of bytes.  Use
-/// `ANSIByteString` when styling text with an unknown encoding.
-pub type ANSIByteString<'a> = ANSIGenericString<'a, [u8]>;
-
-impl<'a, I, S: 'a + ToOwned + ?Sized> From<I> for ANSIGenericString<'a, S>
-where I: Into<Cow<'a, S>>,
-      <S as ToOwned>::Owned: fmt::Debug {
-    fn from(input: I) -> ANSIGenericString<'a, S> {
-        ANSIGenericString {
-            string: input.into(),
-            style:  Style::default(),
-        }
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> Deref for ANSIGenericString<'a, S>
-where <S as ToOwned>::Owned: fmt::Debug {
-    type Target = S;
-
-    fn deref(&self) -> &S {
-        self.string.deref()
-    }
-}
-
-
-/// A set of `ANSIGenericString`s collected together, in order to be
-/// written with a minimum of control characters.
-pub struct ANSIGenericStrings<'a, S: 'a + ToOwned + ?Sized>
-    (pub &'a [ANSIGenericString<'a, S>])
-    where <S as ToOwned>::Owned: fmt::Debug;
-
-/// A set of `ANSIString`s collected together, in order to be written with a
-/// minimum of control characters.
-pub type ANSIStrings<'a> = ANSIGenericStrings<'a, str>;
-
-/// A function to construct an `ANSIStrings` instance.
-#[allow(non_snake_case)]
-pub fn ANSIStrings<'a>(arg: &'a [ANSIString<'a>]) -> ANSIStrings<'a> {
-    ANSIGenericStrings(arg)
-}
-
-/// A set of `ANSIByteString`s collected together, in order to be
-/// written with a minimum of control characters.
-pub type ANSIByteStrings<'a> = ANSIGenericStrings<'a, [u8]>;
-
-/// A function to construct an `ANSIByteStrings` instance.
-#[allow(non_snake_case)]
-pub fn ANSIByteStrings<'a>(arg: &'a [ANSIByteString<'a>]) -> ANSIByteStrings<'a> {
-    ANSIGenericStrings(arg)
-}
-
-
-// ---- paint functions ----
-
-impl Style {
-
-    /// Paints the given text with this colour, returning an ANSI string.
-    pub fn paint<'a, I, S: 'a + ToOwned + ?Sized>(self, input: I) -> ANSIGenericString<'a, S>
-    where I: Into<Cow<'a, S>>,
-          <S as ToOwned>::Owned: fmt::Debug {
-        ANSIGenericString {
-            string: input.into(),
-            style:  self,
-        }
-    }
-}
-
-
-impl Colour {
-
-    /// Paints the given text with this colour, returning an ANSI string.
-    /// This is a short-cut so you don’t have to use `Blue.normal()` just
-    /// to get blue text.
-    ///
-    /// ```
-    /// use ansi_term::Colour::Blue;
-    /// println!("{}", Blue.paint("da ba dee"));
-    /// ```
-    pub fn paint<'a, I, S: 'a + ToOwned + ?Sized>(self, input: I) -> ANSIGenericString<'a, S>
-    where I: Into<Cow<'a, S>>,
-          <S as ToOwned>::Owned: fmt::Debug {
-        ANSIGenericString {
-            string: input.into(),
-            style:  self.normal(),
-        }
-    }
-}
-
-
-// ---- writers for individual ANSI strings ----
-
-impl<'a> fmt::Display for ANSIString<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let w: &mut fmt::Write = f;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a> ANSIByteString<'a> {
-    /// Write an `ANSIByteString` to an `io::Write`.  This writes the escape
-    /// sequences for the associated `Style` around the bytes.
-    pub fn write_to<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
-        let w: &mut io::Write = w;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> ANSIGenericString<'a, S>
-where <S as ToOwned>::Owned: fmt::Debug, &'a S: AsRef<[u8]> {
-    fn write_to_any<W: AnyWrite<wstr=S> + ?Sized>(&self, w: &mut W) -> Result<(), W::Error> {
-        write!(w, "{}", self.style.prefix())?;
-        w.write_str(self.string.as_ref())?;
-        write!(w, "{}", self.style.suffix())
-    }
-}
-
-
-// ---- writers for combined ANSI strings ----
-
-impl<'a> fmt::Display for ANSIStrings<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut fmt::Write = f;
-        self.write_to_any(f)
-    }
-}
-
-impl<'a> ANSIByteStrings<'a> {
-    /// Write `ANSIByteStrings` to an `io::Write`.  This writes the minimal
-    /// escape sequences for the associated `Style`s around each set of
-    /// bytes.
-    pub fn write_to<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
-        let w: &mut io::Write = w;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> ANSIGenericStrings<'a, S>
-where <S as ToOwned>::Owned: fmt::Debug, &'a S: AsRef<[u8]> {
-    fn write_to_any<W: AnyWrite<wstr=S> + ?Sized>(&self, w: &mut W) -> Result<(), W::Error> {
-        use self::Difference::*;
-
-        let first = match self.0.first() {
-            None => return Ok(()),
-            Some(f) => f,
-        };
-
-        write!(w, "{}", first.style.prefix())?;
-        w.write_str(first.string.as_ref())?;
-
-        for window in self.0.windows(2) {
-            match Difference::between(&window[0].style, &window[1].style) {
-                ExtraStyles(style) => write!(w, "{}", style.prefix())?,
-                Reset              => write!(w, "{}{}", RESET, window[1].style.prefix())?,
-                NoDifference       => {/* Do nothing! */},
-            }
-
-            w.write_str(&window[1].string)?;
-        }
-
-        // Write the final reset string after all of the ANSIStrings have been
-        // written, *except* if the last one has no styles, because it would
-        // have already been written by this point.
-        if let Some(last) = self.0.last() {
-            if !last.style.is_plain() {
-                write!(w, "{}", RESET)?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-
-// ---- tests ----
-
-#[cfg(test)]
-mod tests {
-    pub use super::super::ANSIStrings;
-    pub use style::Style;
-    pub use style::Colour::*;
-
-    #[test]
-    fn no_control_codes_for_plain() {
-        let one = Style::default().paint("one");
-        let two = Style::default().paint("two");
-        let output = format!("{}", ANSIStrings( &[ one, two ] ));
-        assert_eq!(&*output, "onetwo");
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/lib.rs firefox-85.0+build1/third_party/rust/ansi_term/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-//! This is a library for controlling colours and formatting, such as
-//! red bold text or blue underlined text, on ANSI terminals.
-//!
-//!
-//! ## Basic usage
-//!
-//! There are two main data structures in this crate that you need to be
-//! concerned with: `ANSIString` and `Style`. A `Style` holds stylistic
-//! information: colours, whether the text should be bold, or blinking, or
-//! whatever. There are also `Colour` variants that represent simple foreground
-//! colour styles. An `ANSIString` is a string paired with a `Style`.
-//!
-//! (Yes, it’s British English, but you won’t have to write “colour� very often.
-//! `Style` is used the majority of the time.)
-//!
-//! To format a string, call the `paint` method on a `Style` or a `Colour`,
-//! passing in the string you want to format as the argument. For example,
-//! here’s how to get some red text:
-//!
-//!     use ansi_term::Colour::Red;
-//!     println!("This is in red: {}", Red.paint("a red string"));
-//!
-//! It’s important to note that the `paint` method does *not* actually return a
-//! string with the ANSI control characters surrounding it. Instead, it returns
-//! an `ANSIString` value that has a `Display` implementation that, when
-//! formatted, returns the characters. This allows strings to be printed with a
-//! minimum of `String` allocations being performed behind the scenes.
-//!
-//! If you *do* want to get at the escape codes, then you can convert the
-//! `ANSIString` to a string as you would any other `Display` value:
-//!
-//!     use ansi_term::Colour::Red;
-//!     use std::string::ToString;
-//!     let red_string = Red.paint("a red string").to_string();
-//!
-//!
-//! ## Bold, underline, background, and other styles
-//!
-//! For anything more complex than plain foreground colour changes, you need to
-//! construct `Style` objects themselves, rather than beginning with a `Colour`.
-//! You can do this by chaining methods based on a new `Style`, created with
-//! `Style::new()`. Each method creates a new style that has that specific
-//! property set. For example:
-//!
-//!     use ansi_term::Style;
-//!     println!("How about some {} and {}?",
-//!              Style::new().bold().paint("bold"),
-//!              Style::new().underline().paint("underline"));
-//!
-//! For brevity, these methods have also been implemented for `Colour` values,
-//! so you can give your styles a foreground colour without having to begin with
-//! an empty `Style` value:
-//!
-//!     use ansi_term::Colour::{Blue, Yellow};
-//!     println!("Demonstrating {} and {}!",
-//!              Blue.bold().paint("blue bold"),
-//!              Yellow.underline().paint("yellow underline"));
-//!     println!("Yellow on blue: {}", Yellow.on(Blue).paint("wow!"));
-//!
-//! The complete list of styles you can use are: `bold`, `dimmed`, `italic`,
-//! `underline`, `blink`, `reverse`, `hidden`, `strikethrough`, and `on` for
-//! background colours.
-//!
-//! In some cases, you may find it easier to change the foreground on an
-//! existing `Style` rather than starting from the appropriate `Colour`.
-//! You can do this using the `fg` method:
-//!
-//!     use ansi_term::Style;
-//!     use ansi_term::Colour::{Blue, Cyan, Yellow};
-//!     println!("Yellow on blue: {}", Style::new().on(Blue).fg(Yellow).paint("yow!"));
-//!     println!("Also yellow on blue: {}", Cyan.on(Blue).fg(Yellow).paint("zow!"));
-//!
-//! Finally, you can turn a `Colour` into a `Style` with the `normal` method.
-//! This will produce the exact same `ANSIString` as if you just used the
-//! `paint` method on the `Colour` directly, but it’s useful in certain cases:
-//! for example, you may have a method that returns `Styles`, and need to
-//! represent both the “red bold� and “red, but not bold� styles with values of
-//! the same type. The `Style` struct also has a `Default` implementation if you
-//! want to have a style with *nothing* set.
-//!
-//!     use ansi_term::Style;
-//!     use ansi_term::Colour::Red;
-//!     Red.normal().paint("yet another red string");
-//!     Style::default().paint("a completely regular string");
-//!
-//!
-//! ## Extended colours
-//!
-//! You can access the extended range of 256 colours by using the `Fixed` colour
-//! variant, which takes an argument of the colour number to use. This can be
-//! included wherever you would use a `Colour`:
-//!
-//!     use ansi_term::Colour::Fixed;
-//!     Fixed(134).paint("A sort of light purple");
-//!     Fixed(221).on(Fixed(124)).paint("Mustard in the ketchup");
-//!
-//! The first sixteen of these values are the same as the normal and bold
-//! standard colour variants. There’s nothing stopping you from using these as
-//! `Fixed` colours instead, but there’s nothing to be gained by doing so
-//! either.
-//!
-//! You can also access full 24-bit color by using the `RGB` colour variant,
-//! which takes separate `u8` arguments for red, green, and blue:
-//!
-//!     use ansi_term::Colour::RGB;
-//!     RGB(70, 130, 180).paint("Steel blue");
-//!
-//! ## Combining successive coloured strings
-//!
-//! The benefit of writing ANSI escape codes to the terminal is that they
-//! *stack*: you do not need to end every coloured string with a reset code if
-//! the text that follows it is of a similar style. For example, if you want to
-//! have some blue text followed by some blue bold text, it’s possible to send
-//! the ANSI code for blue, followed by the ANSI code for bold, and finishing
-//! with a reset code without having to have an extra one between the two
-//! strings.
-//!
-//! This crate can optimise the ANSI codes that get printed in situations like
-//! this, making life easier for your terminal renderer. The `ANSIStrings`
-//! struct takes a slice of several `ANSIString` values, and will iterate over
-//! each of them, printing only the codes for the styles that need to be updated
-//! as part of its formatting routine.
-//!
-//! The following code snippet uses this to enclose a binary number displayed in
-//! red bold text inside some red, but not bold, brackets:
-//!
-//!     use ansi_term::Colour::Red;
-//!     use ansi_term::{ANSIString, ANSIStrings};
-//!     let some_value = format!("{:b}", 42);
-//!     let strings: &[ANSIString<'static>] = &[
-//!         Red.paint("["),
-//!         Red.bold().paint(some_value),
-//!         Red.paint("]"),
-//!     ];
-//!     println!("Value: {}", ANSIStrings(strings));
-//!
-//! There are several things to note here. Firstly, the `paint` method can take
-//! *either* an owned `String` or a borrowed `&str`. Internally, an `ANSIString`
-//! holds a copy-on-write (`Cow`) string value to deal with both owned and
-//! borrowed strings at the same time. This is used here to display a `String`,
-//! the result of the `format!` call, using the same mechanism as some
-//! statically-available `&str` slices. Secondly, that the `ANSIStrings` value
-//! works in the same way as its singular counterpart, with a `Display`
-//! implementation that only performs the formatting when required.
-//!
-//! ## Byte strings
-//!
-//! This library also supports formatting `[u8]` byte strings; this supports
-//! applications working with text in an unknown encoding.  `Style` and
-//! `Color` support painting `[u8]` values, resulting in an `ANSIByteString`.
-//! This type does not implement `Display`, as it may not contain UTF-8, but
-//! it does provide a method `write_to` to write the result to any
-//! `io::Write`:
-//!
-//!     use ansi_term::Colour::Green;
-//!     Green.paint("user data".as_bytes()).write_to(&mut std::io::stdout()).unwrap();
-//!
-//! Similarly, the type `ANSIByteStrings` supports writing a list of
-//! `ANSIByteString` values with minimal escape sequences:
-//!
-//!     use ansi_term::Colour::Green;
-//!     use ansi_term::ANSIByteStrings;
-//!     ANSIByteStrings(&[
-//!         Green.paint("user data 1\n".as_bytes()),
-//!         Green.bold().paint("user data 2\n".as_bytes()),
-//!     ]).write_to(&mut std::io::stdout()).unwrap();
-
-
-#![crate_name = "ansi_term"]
-#![crate_type = "rlib"]
-#![crate_type = "dylib"]
-
-#![warn(missing_copy_implementations)]
-#![warn(missing_docs)]
-#![warn(trivial_casts, trivial_numeric_casts)]
-#![warn(unused_extern_crates, unused_qualifications)]
-
-#[cfg(target_os="windows")]
-extern crate winapi;
-
-mod ansi;
-pub use ansi::{Prefix, Infix, Suffix};
-
-mod style;
-pub use style::{Colour, Style};
-
-/// Color is a type alias for Colour for those who can't be bothered.
-pub use Colour as Color;
-
-// I'm not beyond calling Colour Colour, rather than Color, but I did
-// purposefully name this crate 'ansi-term' so people wouldn't get
-// confused when they tried to install it.
-//
-// Only *after* they'd installed it.
-
-mod difference;
-mod display;
-pub use display::*;
-
-mod write;
-
-mod windows;
-pub use windows::*;
-
-mod debug;
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/style.rs firefox-85.0+build1/third_party/rust/ansi_term/src/style.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/style.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/style.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,259 +0,0 @@
-/// A style is a collection of properties that can format a string
-/// using ANSI escape codes.
-#[derive(PartialEq, Clone, Copy)]
-pub struct Style {
-
-    /// The style's foreground colour, if it has one.
-    pub foreground: Option<Colour>,
-
-    /// The style's background colour, if it has one.
-    pub background: Option<Colour>,
-
-    /// Whether this style is bold.
-    pub is_bold: bool,
-
-    /// Whether this style is dimmed.
-    pub is_dimmed: bool,
-
-    /// Whether this style is italic.
-    pub is_italic: bool,
-
-    /// Whether this style is underlined.
-    pub is_underline: bool,
-
-    /// Whether this style is blinking.
-    pub is_blink: bool,
-
-    /// Whether this style has reverse colours.
-    pub is_reverse: bool,
-
-    /// Whether this style is hidden.
-    pub is_hidden: bool,
-
-    /// Whether this style is struckthrough.
-    pub is_strikethrough: bool
-}
-
-impl Style {
-    /// Creates a new Style with no differences.
-    pub fn new() -> Style {
-        Style::default()
-    }
-
-    /// Returns a `Style` with the bold property set.
-    pub fn bold(&self) -> Style {
-        Style { is_bold: true, .. *self }
-    }
-
-    /// Returns a `Style` with the dimmed property set.
-    pub fn dimmed(&self) -> Style {
-        Style { is_dimmed: true, .. *self }
-    }
-
-    /// Returns a `Style` with the italic property set.
-    pub fn italic(&self) -> Style {
-        Style { is_italic: true, .. *self }
-    }
-
-    /// Returns a `Style` with the underline property set.
-    pub fn underline(&self) -> Style {
-        Style { is_underline: true, .. *self }
-    }
-
-    /// Returns a `Style` with the blink property set.
-    pub fn blink(&self) -> Style {
-        Style { is_blink: true, .. *self }
-    }
-
-    /// Returns a `Style` with the reverse property set.
-    pub fn reverse(&self) -> Style {
-        Style { is_reverse: true, .. *self }
-    }
-
-    /// Returns a `Style` with the hidden property set.
-    pub fn hidden(&self) -> Style {
-        Style { is_hidden: true, .. *self }
-    }
-
-    /// Returns a `Style` with the hidden property set.
-    pub fn strikethrough(&self) -> Style {
-        Style { is_strikethrough: true, .. *self }
-    }
-
-    /// Returns a `Style` with the foreground colour property set.
-    pub fn fg(&self, foreground: Colour) -> Style {
-        Style { foreground: Some(foreground), .. *self }
-    }
-
-    /// Returns a `Style` with the background colour property set.
-    pub fn on(&self, background: Colour) -> Style {
-        Style { background: Some(background), .. *self }
-    }
-
-    /// Return true if this `Style` has no actual styles, and can be written
-    /// without any control characters.
-    pub fn is_plain(self) -> bool {
-        self == Style::default()
-    }
-}
-
-impl Default for Style {
-
-    /// Returns a style with *no* properties set. Formatting text using this
-    /// style returns the exact same text.
-    ///
-    /// ```
-    /// use ansi_term::Style;
-    /// assert_eq!(None,  Style::default().foreground);
-    /// assert_eq!(None,  Style::default().background);
-    /// assert_eq!(false, Style::default().is_bold);
-    /// assert_eq!("txt", Style::default().paint("txt").to_string());
-    /// ```
-    fn default() -> Style {
-        Style {
-            foreground: None,
-            background: None,
-            is_bold: false,
-            is_dimmed: false,
-            is_italic: false,
-            is_underline: false,
-            is_blink: false,
-            is_reverse: false,
-            is_hidden: false,
-            is_strikethrough: false,
-        }
-    }
-}
-
-
-// ---- colours ----
-
-/// A colour is one specific type of ANSI escape code, and can refer
-/// to either the foreground or background colour.
-///
-/// These use the standard numeric sequences.
-/// See <http://invisible-island.net/xterm/ctlseqs/ctlseqs.html>
-#[derive(PartialEq, Clone, Copy, Debug)]
-pub enum Colour {
-
-    /// Colour #0 (foreground code `30`, background code `40`).
-    ///
-    /// This is not necessarily the background colour, and using it as one may
-    /// render the text hard to read on terminals with dark backgrounds.
-    Black,
-
-    /// Colour #1 (foreground code `31`, background code `41`).
-    Red,
-
-    /// Colour #2 (foreground code `32`, background code `42`).
-    Green,
-
-    /// Colour #3 (foreground code `33`, background code `43`).
-    Yellow,
-
-    /// Colour #4 (foreground code `34`, background code `44`).
-    Blue,
-
-    /// Colour #5 (foreground code `35`, background code `45`).
-    Purple,
-
-    /// Colour #6 (foreground code `36`, background code `46`).
-    Cyan,
-
-    /// Colour #7 (foreground code `37`, background code `47`).
-    ///
-    /// As above, this is not necessarily the foreground colour, and may be
-    /// hard to read on terminals with light backgrounds.
-    White,
-
-    /// A colour number from 0 to 255, for use in 256-colour terminal
-    /// environments.
-    ///
-    /// - Colours 0 to 7 are the `Black` to `White` variants respectively.
-    ///   These colours can usually be changed in the terminal emulator.
-    /// - Colours 8 to 15 are brighter versions of the eight colours above.
-    ///   These can also usually be changed in the terminal emulator, or it
-    ///   could be configured to use the original colours and show the text in
-    ///   bold instead. It varies depending on the program.
-    /// - Colours 16 to 231 contain several palettes of bright colours,
-    ///   arranged in six squares measuring six by six each.
-    /// - Colours 232 to 255 are shades of grey from black to white.
-    ///
-    /// It might make more sense to look at a [colour chart][cc].
-    ///
-    /// [cc]: https://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg
-    Fixed(u8),
-
-    /// A 24-bit RGB color, as specified by ISO-8613-3.
-    RGB(u8, u8, u8),
-}
-
-
-impl Colour {
-    /// Return a `Style` with the foreground colour set to this colour.
-    pub fn normal(self) -> Style {
-        Style { foreground: Some(self), .. Style::default() }
-    }
-
-    /// Returns a `Style` with the bold property set.
-    pub fn bold(self) -> Style {
-        Style { foreground: Some(self), is_bold: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the dimmed property set.
-    pub fn dimmed(self) -> Style {
-        Style { foreground: Some(self), is_dimmed: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the italic property set.
-    pub fn italic(self) -> Style {
-        Style { foreground: Some(self), is_italic: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the underline property set.
-    pub fn underline(self) -> Style {
-        Style { foreground: Some(self), is_underline: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the blink property set.
-    pub fn blink(self) -> Style {
-        Style { foreground: Some(self), is_blink: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the reverse property set.
-    pub fn reverse(self) -> Style {
-        Style { foreground: Some(self), is_reverse: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the hidden property set.
-    pub fn hidden(self) -> Style {
-        Style { foreground: Some(self), is_hidden: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the strikethrough property set.
-    pub fn strikethrough(self) -> Style {
-        Style { foreground: Some(self), is_strikethrough: true, .. Style::default() }
-    }
-
-    /// Returns a `Style` with the background colour property set.
-    pub fn on(self, background: Colour) -> Style {
-        Style { foreground: Some(self), background: Some(background), .. Style::default() }
-    }
-}
-
-impl From<Colour> for Style {
-
-    /// You can turn a `Colour` into a `Style` with the foreground colour set
-    /// with the `From` trait.
-    ///
-    /// ```
-    /// use ansi_term::{Style, Colour};
-    /// let green_foreground = Style::default().fg(Colour::Green);
-    /// assert_eq!(green_foreground, Colour::Green.normal());
-    /// assert_eq!(green_foreground, Colour::Green.into());
-    /// assert_eq!(green_foreground, Style::from(Colour::Green));
-    /// ```
-    fn from(colour: Colour) -> Style {
-        colour.normal()
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/windows.rs firefox-85.0+build1/third_party/rust/ansi_term/src/windows.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/windows.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/windows.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/// Enables ANSI code support on Windows 10.
-///
-/// This uses Windows API calls to alter the properties of the console that
-/// the program is running in.
-///
-/// https://msdn.microsoft.com/en-us/library/windows/desktop/mt638032(v=vs.85).aspx
-///
-/// Returns a `Result` with the Windows error code if unsuccessful.
-#[cfg(windows)]
-pub fn enable_ansi_support() -> Result<(), u32> {
-    use winapi::um::processenv::GetStdHandle;
-    use winapi::um::errhandlingapi::GetLastError;
-    use winapi::um::consoleapi::{GetConsoleMode, SetConsoleMode};
-
-    const STD_OUT_HANDLE: u32 = -11i32 as u32;
-    const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
-
-    unsafe {
-        // https://docs.microsoft.com/en-us/windows/console/getstdhandle
-        let std_out_handle = GetStdHandle(STD_OUT_HANDLE);
-        let error_code = GetLastError();
-        if error_code != 0 { return Err(error_code); }
-        
-        // https://docs.microsoft.com/en-us/windows/console/getconsolemode
-        let mut console_mode: u32 = 0;
-        GetConsoleMode(std_out_handle, &mut console_mode);
-        let error_code = GetLastError();
-        if error_code != 0 { return Err(error_code); }
-
-        // VT processing not already enabled?
-        if console_mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0 {
-            // https://docs.microsoft.com/en-us/windows/console/setconsolemode
-            SetConsoleMode(std_out_handle, console_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-            let error_code = GetLastError();
-            if error_code != 0 { return Err(error_code); }
-        }
-    }
-
-    return Ok(());
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/ansi_term/src/write.rs firefox-85.0+build1/third_party/rust/ansi_term/src/write.rs
--- firefox-84.0.2+build1/third_party/rust/ansi_term/src/write.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/ansi_term/src/write.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-use std::fmt;
-use std::io;
-
-
-pub trait AnyWrite {
-    type wstr: ?Sized;
-    type Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error>;
-
-    fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error>;
-}
-
-
-impl<'a> AnyWrite for fmt::Write + 'a {
-    type wstr = str;
-    type Error = fmt::Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> {
-        fmt::Write::write_fmt(self, fmt)
-    }
-
-    fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error> {
-        fmt::Write::write_str(self, s)
-    }
-}
-
-
-impl<'a> AnyWrite for io::Write + 'a {
-    type wstr = [u8];
-    type Error = io::Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> {
-        io::Write::write_fmt(self, fmt)
-    }
-
-    fn write_str(&mut self, s: &Self::wstr) -> Result<(), Self::Error> {
-        io::Write::write_all(self, s)
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/chardetng/.cargo-checksum.json firefox-85.0+build1/third_party/rust/chardetng/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/chardetng/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/chardetng/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"0e64fb3dd5a00e3fd528de6442de3f2ca851bd718c45cca0871aaf4eedac9ee1","COPYRIGHT":"2fd0d7e90bd241b79804de129c5b70089988f82a7bbb0fe580a55b67b2968928","Cargo.toml":"6fbe49f956e99101cf3883c1f6abcafbabb546cace4ab677b0e2e17bfeecb8bd","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"a6c97d91989aee4c8afed918340ce6287652cbdd6fed833e20f76367c7953db9","src/data.rs":"be48f1486ef9fc264f6cda2e10944b7dcf8ed0a904b53227340a1384803796c7","src/lib.rs":"4b5056ed09c69960f740c2ff8adc39f29adc8e1257ccbef6f496f55f7c026314","src/tld.rs":"295c3c90c60c5bb6edd753b77c261eed10be2d431badda4e02168e740a0f2d7e"},"package":"7817bfb797fd08f0b1cf095378254b28cb0b5000412ca32b490c9d9e225ffc38"}
\ No newline at end of file
+{"files":{"CONTRIBUTING.md":"0e64fb3dd5a00e3fd528de6442de3f2ca851bd718c45cca0871aaf4eedac9ee1","COPYRIGHT":"2fd0d7e90bd241b79804de129c5b70089988f82a7bbb0fe580a55b67b2968928","Cargo.toml":"ab767659696eb10dbaab743b566910bd29fc8f8f6998d9580494397a8903bd34","LICENSE-APACHE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","LICENSE-MIT":"4ad721b5b6a3d39ca3e2202f403d897c4a1d42896486dd58963a81f8e64ef61d","README.md":"a6c97d91989aee4c8afed918340ce6287652cbdd6fed833e20f76367c7953db9","src/data.rs":"be48f1486ef9fc264f6cda2e10944b7dcf8ed0a904b53227340a1384803796c7","src/lib.rs":"f70618ea5b783cd2aac8a6ee17babb659257b12d996b0289cf8b5f5e09b3fdd8","src/tld.rs":"295c3c90c60c5bb6edd753b77c261eed10be2d431badda4e02168e740a0f2d7e"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/chardetng/Cargo.toml firefox-85.0+build1/third_party/rust/chardetng/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/chardetng/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/chardetng/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,35 +1,23 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
 [package]
-edition = "2018"
 name = "chardetng"
+description = "A character encoding detector for legacy Web content"
 version = "0.1.9"
 authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
-description = "A character encoding detector for legacy Web content"
-homepage = "https://docs.rs/chardetng/"
-documentation = "https://docs.rs/chardetng/"
+edition = "2018"
+license = "Apache-2.0 OR MIT"
 readme = "README.md"
+documentation = "https://docs.rs/chardetng/"
+homepage = "https://docs.rs/chardetng/"
+repository = "https://github.com/hsivonen/chardetng"
 keywords = ["encoding", "web", "unicode", "charset"]
 categories = ["text-processing", "encoding", "web-programming", "internationalization"]
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/hsivonen/chardetng"
-[dependencies.encoding_rs]
-version = "0.8.17"
 
-[dependencies.memchr]
-version = "2.2.0"
-[dev-dependencies.detone]
-version = "1.0.0"
+[dependencies]
+encoding_rs = "0.8.17"
+memchr = "2.2.0"
+
+[dev-dependencies]
+detone = "1.0.0"
 
 [features]
-testing-only-no-semver-guarantees-do-not-use = []
+testing-only-no-semver-guarantees-do-not-use = []
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/chardetng/src/lib.rs firefox-85.0+build1/third_party/rust/chardetng/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/chardetng/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/chardetng/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -982,6 +982,11 @@
                         score += CJK_LATIN_ADJACENCY_PENALTY;
                     }
                     self.prev = LatinCj::AsciiLetter;
+                } else if u == 0x20AC {
+                    // euro sign
+                    self.pending_score = None; // Discard pending score
+                    // Should there even be a penalty?
+                    self.prev = LatinCj::Other;
                 } else if u >= 0x4E00 && u <= 0x9FA5 {
                     if let Some(pending) = self.pending_score {
                         score += pending;
@@ -1244,6 +1249,13 @@
                         0..=0x7F => {
                             self.pending_score = None; // Discard pending score
                         }
+                        0x80 => {
+                            // This is a control character that overlaps euro
+                            // in windows-1252 and happens to be a non-error
+                            // is Shift_JIS.
+                            self.pending_score = None; // Discard pending score
+                            score += IMPLAUSIBILITY_PENALTY;
+                        }
                         _ => {
                             if let Some(pending) = self.pending_score {
                                 score += pending;
@@ -3221,4 +3233,10 @@
     fn test_numero() {
         check("Nº", WINDOWS_1252);
     }
+
+    #[test]
+    fn test_euro() {
+        check(" €9", WINDOWS_1252);
+    }
+
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cloudabi/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cloudabi/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cloudabi/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cloudabi/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"8f287443ede083f9f2816bccdd6a23f0b58e70337315c06a34a9ae06029242d1","cloudabi.rs":"5660f8ac289098a3fc9b39df2c8ec1f218bbbd8a98ec38b17f24a1dd8fbc0bdb"},"package":"4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cloudabi/Cargo.toml firefox-85.0+build1/third_party/rust/cloudabi/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cloudabi/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cloudabi/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "cloudabi"
-version = "0.1.0"
-authors = ["Nuxi (https://nuxi.nl/) and contributors"]
-description = "Low level interface to CloudABI. Contains all syscalls and related types."
-homepage = "https://cloudabi.org/"
-documentation = "https://docs.rs/cloudabi/"
-keywords = ["cloudabi"]
-license = "BSD-2-Clause"
-repository = "https://github.com/nuxinl/cloudabi"
-
-[lib]
-path = "cloudabi.rs"
-[dependencies.bitflags]
-version = "1.2.1"
-optional = true
-
-[features]
-default = ["bitflags"]
diff -Nru firefox-84.0.2+build1/third_party/rust/cloudabi/cloudabi.rs firefox-85.0+build1/third_party/rust/cloudabi/cloudabi.rs
--- firefox-84.0.2+build1/third_party/rust/cloudabi/cloudabi.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cloudabi/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,3030 +0,0 @@
-// Copyright (c) 2016-2017 Nuxi (https://nuxi.nl/) and contributors.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 2. 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 AUTHOR 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 AUTHOR 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.
-//
-// This file is automatically generated. Do not edit.
-//
-// Source: https://github.com/NuxiNL/cloudabi
-
-// Appease Rust's tidy.
-// ignore-license
-// ignore-tidy-linelength
-
-//! **PLEASE NOTE: This entire crate including this
-//! documentation is automatically generated from
-//! [`cloudabi.txt`](https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt)**
-//!
-//! # Nuxi CloudABI
-//!
-//! CloudABI is what you get if you take POSIX, add capability-based
-//! security, and remove everything that's incompatible with that. The
-//! result is a minimal ABI consisting of only 49 syscalls.
-//!
-//! CloudABI doesn't have its own kernel, but instead is implemented in existing
-//! kernels: FreeBSD has CloudABI support for x86-64 and arm64, and [a patch-set
-//! for NetBSD](https://github.com/NuxiNL/netbsd) and [a patch-set for
-//! Linux](https://github.com/NuxiNL/linux) are available as well. This means that
-//! CloudABI binaries can be executed on different operating systems, without any
-//! modification.
-//!
-//! ## Capability-Based Security
-//!
-//! Capability-based security means that processes can only perform
-//! actions that have no global impact. Processes cannot open files by
-//! their absolute path, cannot open network connections, and cannot
-//! observe global system state such as the process table.
-//!
-//! The capabilities of a process are fully determined by its set of open
-//! file descriptors (fds). For example, files can only be opened if the
-//! process already has a file descriptor to a directory the file is in.
-//!
-//! Unlike in POSIX, where processes are normally started with file
-//! descriptors 0, 1, and 2 reserved for standard input, output, and
-//! error, CloudABI does not reserve any file descriptor numbers for
-//! specific purposes.
-//!
-//! In CloudABI, a process depends on its parent process to launch it with
-//! the right set of resources, since the process will not be able to open
-//! any new resources. For example, a simple static web server would need
-//! to be started with a file descriptor to a [TCP
-//! listener](https://github.com/NuxiNL/flower), and a file descriptor to
-//! the directory for which to serve files. The web server will then be
-//! unable to do anything other than reading files in that directory, and
-//! process incoming network connections.
-//!
-//! So, unknown CloudABI binaries can safely be executed without the need
-//! for containers, virtual machines, or other sandboxing technologies.
-//!
-//! Watch [Ed Schouten's Talk at
-//! 32C3](https://www.youtube.com/watch?v=3N29vrPoDv8) for more
-//! information about what capability-based security for UNIX means.
-//!
-//! ## Cloudlibc
-//!
-//! [Cloudlibc](https://github.com/NuxiNL/cloudlibc) is an implementation
-//! of the C standard library, without all CloudABI-incompatible
-//! functions. For example, Cloudlibc does not have `printf`, but does
-//! have `fprintf`. It does not have `open`, but does have `openat`.
-//!
-//! ## CloudABI-Ports
-//!
-//! [CloudABI-Ports](https://github.com/NuxiNL/cloudabi-ports) is a
-//! collection of ports of commonly used libraries and applications to
-//! CloudABI. It contains software such as `zlib`, `libpng`, `boost`,
-//! `memcached`, and much more. The software is patched to not depend on
-//! any global state, such as files in `/etc` or `/dev`, using `open()`,
-//! etc.
-//!
-//! ## Using CloudABI
-//!
-//! Instructions for using CloudABI (including kernel modules/patches,
-//! toolchain, and ports) are available for several operating systems:
-//!
-//! - [FreeBSD](https://cloudabi.org/run/freebsd/)
-//! - [Linux](https://cloudabi.org/run/linux/)
-//! - [macOS](https://cloudabi.org/run/macos/)
-//!
-//! ## Specification of the ABI
-//!
-//! The entire ABI is specified in a file called
-//! [`cloudabi.txt`](https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt),
-//! from which all
-//! [headers](https://github.com/NuxiNL/cloudabi/tree/master/headers)
-//! and documentation (including the one you're reading now) is generated.
-
-#![no_std]
-#![allow(non_camel_case_types)]
-
-#[cfg(feature = "bitflags")]
-use bitflags::bitflags;
-
-// Minimal implementation of bitflags! in case we can't depend on the bitflags
-// crate. Only implements `bits()` and a `from_bits_unchecked()`.
-#[cfg(not(feature = "bitflags"))]
-macro_rules! bitflags {
-  (
-    $(#[$attr:meta])*
-    pub struct $name:ident: $type:ty {
-      $($(#[$const_attr:meta])* const $const:ident = $val:expr;)*
-    }
-  ) => {
-    $(#[$attr])*
-    #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-    pub struct $name { bits: $type }
-    impl $name {
-      $($(#[$const_attr])* pub const $const: $name = $name{ bits: $val };)*
-      pub const fn bits(&self) -> $type { self.bits }
-      pub const unsafe fn from_bits_unchecked(bits: $type) -> Self { $name{ bits } }
-    }
-  }
-}
-
-/// File or memory access pattern advisory information.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum advice {
-  /// The application expects that it will not access the
-  /// specified data in the near future.
-  DONTNEED   = 1,
-  /// The application expects to access the specified data
-  /// once and then not reuse it thereafter.
-  NOREUSE    = 2,
-  /// The application has no advice to give on its behavior
-  /// with respect to the specified data.
-  NORMAL     = 3,
-  /// The application expects to access the specified data
-  /// in a random order.
-  RANDOM     = 4,
-  /// The application expects to access the specified data
-  /// sequentially from lower offsets to higher offsets.
-  SEQUENTIAL = 5,
-  /// The application expects to access the specified data
-  /// in the near future.
-  WILLNEED   = 6,
-}
-
-/// Enumeration describing the kind of value stored in [`auxv`](struct.auxv.html).
-#[repr(u32)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum auxtype {
-  /// Base address of the binary argument data provided to
-  /// [`proc_exec()`](fn.proc_exec.html).
-  ARGDATA      = 256,
-  /// Length of the binary argument data provided to
-  /// [`proc_exec()`](fn.proc_exec.html).
-  ARGDATALEN   = 257,
-  /// Base address at which the executable is placed in
-  /// memory.
-  BASE         =   7,
-  /// Base address of a buffer of random data that may be
-  /// used for non-cryptographic purposes, for example as a
-  /// canary for stack smashing protection.
-  CANARY       = 258,
-  /// Length of a buffer of random data that may be used
-  /// for non-cryptographic purposes, for example as a
-  /// canary for stack smashing protection.
-  CANARYLEN    = 259,
-  /// Number of CPUs that the system this process is running
-  /// on has.
-  NCPUS        = 260,
-  /// Terminator of the auxiliary vector.
-  NULL         =   0,
-  /// Smallest memory object size for which individual
-  /// memory protection controls can be configured.
-  PAGESZ       =   6,
-  /// Address of the first ELF program header of the
-  /// executable.
-  PHDR         =   3,
-  /// Number of ELF program headers of the executable.
-  PHNUM        =   4,
-  /// Identifier of the process.
-  ///
-  /// This environment does not provide any simple numerical
-  /// process identifiers, for the reason that these are not
-  /// useful in distributed contexts. Instead, processes are
-  /// identified by a UUID.
-  ///
-  /// This record should point to sixteen bytes of binary
-  /// data, containing a version 4 UUID (fully random).
-  PID          = 263,
-  /// Address of the ELF header of the vDSO.
-  ///
-  /// The vDSO is a shared library that is mapped in the
-  /// address space of the process. It provides entry points
-  /// for every system call supported by the environment,
-  /// all having a corresponding symbol that is prefixed
-  /// with `cloudabi_sys_`. System calls should be invoked
-  /// through these entry points.
-  ///
-  /// The first advantage of letting processes call into a
-  /// vDSO to perform system calls instead of raising
-  /// hardware traps is that it allows for easy emulation of
-  /// executables on top of existing operating systems. The
-  /// second advantage is that in cases where an operating
-  /// system provides native support for CloudABI executables,
-  /// it may still implement partial userspace
-  /// implementations of these system calls to improve
-  /// performance (e.g., [`clock_time_get()`](fn.clock_time_get.html)). It also provides
-  /// a more dynamic way of adding, removing or replacing
-  /// system calls.
-  SYSINFO_EHDR = 262,
-  /// Thread ID of the initial thread of the process.
-  TID          = 261,
-}
-
-/// Identifiers for clocks.
-#[repr(u32)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum clockid {
-  /// The system-wide monotonic clock, which is defined as a
-  /// clock measuring real time, whose value cannot be
-  /// adjusted and which cannot have negative clock jumps.
-  ///
-  /// The epoch of this clock is undefined. The absolute
-  /// time value of this clock therefore has no meaning.
-  MONOTONIC          = 1,
-  /// The CPU-time clock associated with the current
-  /// process.
-  PROCESS_CPUTIME_ID = 2,
-  /// The system-wide clock measuring real time. Time value
-  /// zero corresponds with 1970-01-01T00:00:00Z.
-  REALTIME           = 3,
-  /// The CPU-time clock associated with the current thread.
-  THREAD_CPUTIME_ID  = 4,
-}
-
-/// A userspace condition variable.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct condvar(pub u32);
-/// The condition variable is in its initial state. There
-/// are no threads waiting to be woken up. If the
-/// condition variable has any other value, the kernel
-/// must be called to wake up any sleeping threads.
-pub const CONDVAR_HAS_NO_WAITERS: condvar = condvar(0);
-
-/// Identifier for a device containing a file system. Can be used
-/// in combination with [`inode`](struct.inode.html) to uniquely identify a file on the
-/// local system.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct device(pub u64);
-
-/// A reference to the offset of a directory entry.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct dircookie(pub u64);
-/// Permanent reference to the first directory entry
-/// within a directory.
-pub const DIRCOOKIE_START: dircookie = dircookie(0);
-
-/// Error codes returned by system calls.
-///
-/// Not all of these error codes are returned by the system calls
-/// provided by this environment, but are either used in userspace
-/// exclusively or merely provided for alignment with POSIX.
-#[repr(u16)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum errno {
-  /// No error occurred. System call completed successfully.
-  SUCCESS        =  0,
-  /// Argument list too long.
-  TOOBIG         =  1,
-  /// Permission denied.
-  ACCES          =  2,
-  /// Address in use.
-  ADDRINUSE      =  3,
-  /// Address not available.
-  ADDRNOTAVAIL   =  4,
-  /// Address family not supported.
-  AFNOSUPPORT    =  5,
-  /// Resource unavailable, or operation would block.
-  AGAIN          =  6,
-  /// Connection already in progress.
-  ALREADY        =  7,
-  /// Bad file descriptor.
-  BADF           =  8,
-  /// Bad message.
-  BADMSG         =  9,
-  /// Device or resource busy.
-  BUSY           = 10,
-  /// Operation canceled.
-  CANCELED       = 11,
-  /// No child processes.
-  CHILD          = 12,
-  /// Connection aborted.
-  CONNABORTED    = 13,
-  /// Connection refused.
-  CONNREFUSED    = 14,
-  /// Connection reset.
-  CONNRESET      = 15,
-  /// Resource deadlock would occur.
-  DEADLK         = 16,
-  /// Destination address required.
-  DESTADDRREQ    = 17,
-  /// Mathematics argument out of domain of function.
-  DOM            = 18,
-  /// Reserved.
-  DQUOT          = 19,
-  /// File exists.
-  EXIST          = 20,
-  /// Bad address.
-  FAULT          = 21,
-  /// File too large.
-  FBIG           = 22,
-  /// Host is unreachable.
-  HOSTUNREACH    = 23,
-  /// Identifier removed.
-  IDRM           = 24,
-  /// Illegal byte sequence.
-  ILSEQ          = 25,
-  /// Operation in progress.
-  INPROGRESS     = 26,
-  /// Interrupted function.
-  INTR           = 27,
-  /// Invalid argument.
-  INVAL          = 28,
-  /// I/O error.
-  IO             = 29,
-  /// Socket is connected.
-  ISCONN         = 30,
-  /// Is a directory.
-  ISDIR          = 31,
-  /// Too many levels of symbolic links.
-  LOOP           = 32,
-  /// File descriptor value too large.
-  MFILE          = 33,
-  /// Too many links.
-  MLINK          = 34,
-  /// Message too large.
-  MSGSIZE        = 35,
-  /// Reserved.
-  MULTIHOP       = 36,
-  /// Filename too long.
-  NAMETOOLONG    = 37,
-  /// Network is down.
-  NETDOWN        = 38,
-  /// Connection aborted by network.
-  NETRESET       = 39,
-  /// Network unreachable.
-  NETUNREACH     = 40,
-  /// Too many files open in system.
-  NFILE          = 41,
-  /// No buffer space available.
-  NOBUFS         = 42,
-  /// No such device.
-  NODEV          = 43,
-  /// No such file or directory.
-  NOENT          = 44,
-  /// Executable file format error.
-  NOEXEC         = 45,
-  /// No locks available.
-  NOLCK          = 46,
-  /// Reserved.
-  NOLINK         = 47,
-  /// Not enough space.
-  NOMEM          = 48,
-  /// No message of the desired type.
-  NOMSG          = 49,
-  /// Protocol not available.
-  NOPROTOOPT     = 50,
-  /// No space left on device.
-  NOSPC          = 51,
-  /// Function not supported.
-  NOSYS          = 52,
-  /// The socket is not connected.
-  NOTCONN        = 53,
-  /// Not a directory or a symbolic link to a directory.
-  NOTDIR         = 54,
-  /// Directory not empty.
-  NOTEMPTY       = 55,
-  /// State not recoverable.
-  NOTRECOVERABLE = 56,
-  /// Not a socket.
-  NOTSOCK        = 57,
-  /// Not supported, or operation not supported on socket.
-  NOTSUP         = 58,
-  /// Inappropriate I/O control operation.
-  NOTTY          = 59,
-  /// No such device or address.
-  NXIO           = 60,
-  /// Value too large to be stored in data type.
-  OVERFLOW       = 61,
-  /// Previous owner died.
-  OWNERDEAD      = 62,
-  /// Operation not permitted.
-  PERM           = 63,
-  /// Broken pipe.
-  PIPE           = 64,
-  /// Protocol error.
-  PROTO          = 65,
-  /// Protocol not supported.
-  PROTONOSUPPORT = 66,
-  /// Protocol wrong type for socket.
-  PROTOTYPE      = 67,
-  /// Result too large.
-  RANGE          = 68,
-  /// Read-only file system.
-  ROFS           = 69,
-  /// Invalid seek.
-  SPIPE          = 70,
-  /// No such process.
-  SRCH           = 71,
-  /// Reserved.
-  STALE          = 72,
-  /// Connection timed out.
-  TIMEDOUT       = 73,
-  /// Text file busy.
-  TXTBSY         = 74,
-  /// Cross-device link.
-  XDEV           = 75,
-  /// Extension: Capabilities insufficient.
-  NOTCAPABLE     = 76,
-}
-
-bitflags! {
-  /// The state of the file descriptor subscribed to with
-  /// [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
-  #[repr(C)]
-  pub struct eventrwflags: u16 {
-    /// The peer of this socket has closed or disconnected.
-    const HANGUP = 0x0001;
-  }
-}
-
-/// Type of a subscription to an event or its occurrence.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum eventtype {
-  /// The time value of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id)
-  /// has reached timestamp [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout).
-  CLOCK          = 1,
-  /// Condition variable [`subscription.union.condvar.condvar`](struct.subscription_condvar.html#structfield.condvar) has
-  /// been woken up and [`subscription.union.condvar.lock`](struct.subscription_condvar.html#structfield.lock) has been
-  /// acquired for writing.
-  CONDVAR        = 2,
-  /// File descriptor [`subscription.union.fd_readwrite.fd`](struct.subscription_fd_readwrite.html#structfield.fd) has
-  /// data available for reading. This event always triggers
-  /// for regular files.
-  FD_READ        = 3,
-  /// File descriptor [`subscription.union.fd_readwrite.fd`](struct.subscription_fd_readwrite.html#structfield.fd) has
-  /// capacity available for writing. This event always
-  /// triggers for regular files.
-  FD_WRITE       = 4,
-  /// Lock [`subscription.union.lock.lock`](struct.subscription_lock.html#structfield.lock) has been acquired for
-  /// reading.
-  LOCK_RDLOCK    = 5,
-  /// Lock [`subscription.union.lock.lock`](struct.subscription_lock.html#structfield.lock) has been acquired for
-  /// writing.
-  LOCK_WRLOCK    = 6,
-  /// The process associated with process descriptor
-  /// [`subscription.union.proc_terminate.fd`](struct.subscription_proc_terminate.html#structfield.fd) has terminated.
-  PROC_TERMINATE = 7,
-}
-
-/// Exit code generated by a process when exiting.
-pub type exitcode = u32;
-
-/// A file descriptor number.
-///
-/// Unlike on POSIX-compliant systems, none of the file descriptor
-/// numbers are reserved for a purpose (e.g., stdin, stdout,
-/// stderr). Operating systems are not required to allocate new
-/// file descriptors in ascending order.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct fd(pub u32);
-/// Returned to the child process by [`proc_fork()`](fn.proc_fork.html).
-pub const PROCESS_CHILD: fd = fd(0xffffffff);
-/// Passed to [`mem_map()`](fn.mem_map.html) when creating a mapping to
-/// anonymous memory.
-pub const MAP_ANON_FD  : fd = fd(0xffffffff);
-
-bitflags! {
-  /// File descriptor flags.
-  #[repr(C)]
-  pub struct fdflags: u16 {
-    /// Append mode: Data written to the file is always
-    /// appended to the file's end.
-    const APPEND   = 0x0001;
-    /// Write according to synchronized I/O data integrity
-    /// completion. Only the data stored in the file is
-    /// synchronized.
-    const DSYNC    = 0x0002;
-    /// Non-blocking mode.
-    const NONBLOCK = 0x0004;
-    /// Synchronized read I/O operations.
-    const RSYNC    = 0x0008;
-    /// Write according to synchronized I/O file integrity
-    /// completion. In addition to synchronizing the data
-    /// stored in the file, the system may also synchronously
-    /// update the file's metadata.
-    const SYNC     = 0x0010;
-  }
-}
-
-bitflags! {
-  /// Which file descriptor attributes to adjust.
-  #[repr(C)]
-  pub struct fdsflags: u16 {
-    /// Adjust the file descriptor flags stored in
-    /// [`fdstat.fs_flags`](struct.fdstat.html#structfield.fs_flags).
-    const FLAGS  = 0x0001;
-    /// Restrict the rights of the file descriptor to the
-    /// rights stored in [`fdstat.fs_rights_base`](struct.fdstat.html#structfield.fs_rights_base) and
-    /// [`fdstat.fs_rights_inheriting`](struct.fdstat.html#structfield.fs_rights_inheriting).
-    const RIGHTS = 0x0002;
-  }
-}
-
-/// Relative offset within a file.
-pub type filedelta = i64;
-
-/// Non-negative file size or length of a region within a file.
-pub type filesize = u64;
-
-/// The type of a file descriptor or file.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum filetype {
-  /// The type of the file descriptor or file is unknown or
-  /// is different from any of the other types specified.
-  UNKNOWN          =   0,
-  /// The file descriptor or file refers to a block device
-  /// inode.
-  BLOCK_DEVICE     =  16,
-  /// The file descriptor or file refers to a character
-  /// device inode.
-  CHARACTER_DEVICE =  17,
-  /// The file descriptor or file refers to a directory
-  /// inode.
-  DIRECTORY        =  32,
-  /// The file descriptor refers to a process handle.
-  PROCESS          =  80,
-  /// The file descriptor or file refers to a regular file
-  /// inode.
-  REGULAR_FILE     =  96,
-  /// The file descriptor refers to a shared memory object.
-  SHARED_MEMORY    = 112,
-  /// The file descriptor or file refers to a datagram
-  /// socket.
-  SOCKET_DGRAM     = 128,
-  /// The file descriptor or file refers to a byte-stream
-  /// socket.
-  SOCKET_STREAM    = 130,
-  /// The file refers to a symbolic link inode.
-  SYMBOLIC_LINK    = 144,
-}
-
-bitflags! {
-  /// Which file attributes to adjust.
-  #[repr(C)]
-  pub struct fsflags: u16 {
-    /// Adjust the last data access timestamp to the value
-    /// stored in [`filestat.st_atim`](struct.filestat.html#structfield.st_atim).
-    const ATIM     = 0x0001;
-    /// Adjust the last data access timestamp to the time
-    /// of clock [`REALTIME`](enum.clockid.html#variant.REALTIME).
-    const ATIM_NOW = 0x0002;
-    /// Adjust the last data modification timestamp to the
-    /// value stored in [`filestat.st_mtim`](struct.filestat.html#structfield.st_mtim).
-    const MTIM     = 0x0004;
-    /// Adjust the last data modification timestamp to the
-    /// time of clock [`REALTIME`](enum.clockid.html#variant.REALTIME).
-    const MTIM_NOW = 0x0008;
-    /// Truncate or extend the file to the size stored in
-    /// [`filestat.st_size`](struct.filestat.html#structfield.st_size).
-    const SIZE     = 0x0010;
-  }
-}
-
-/// File serial number that is unique within its file system.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct inode(pub u64);
-
-/// Number of hard links to an inode.
-pub type linkcount = u32;
-
-/// A userspace read-recursive readers-writer lock, similar to a
-/// Linux futex or a FreeBSD umtx.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct lock(pub u32);
-/// Value indicating that the lock is in its initial
-/// unlocked state.
-pub const LOCK_UNLOCKED      : lock = lock(0x00000000);
-/// Bitmask indicating that the lock is write-locked. If
-/// set, the lower 30 bits of the lock contain the
-/// identifier of the thread that owns the write lock.
-/// Otherwise, the lower 30 bits of the lock contain the
-/// number of acquired read locks.
-pub const LOCK_WRLOCKED      : lock = lock(0x40000000);
-/// Bitmask indicating that the lock is either read locked
-/// or write locked, and that one or more threads have
-/// their execution suspended, waiting to acquire the
-/// lock. The last owner of the lock must call the
-/// kernel to unlock.
-///
-/// When the lock is acquired for reading and this bit is
-/// set, it means that one or more threads are attempting
-/// to acquire this lock for writing. In that case, other
-/// threads should only acquire additional read locks if
-/// suspending execution would cause a deadlock. It is
-/// preferred to suspend execution, as this prevents
-/// starvation of writers.
-pub const LOCK_KERNEL_MANAGED: lock = lock(0x80000000);
-/// Value indicating that the lock is in an incorrect
-/// state. A lock cannot be in its initial unlocked state,
-/// while also managed by the kernel.
-pub const LOCK_BOGUS         : lock = lock(0x80000000);
-
-bitflags! {
-  /// Flags determining the method of how paths are resolved.
-  #[repr(C)]
-  pub struct lookupflags: u32 {
-    /// As long as the resolved path corresponds to a symbolic
-    /// link, it is expanded.
-    const SYMLINK_FOLLOW = 0x00000001;
-  }
-}
-
-bitflags! {
-  /// Memory mapping flags.
-  #[repr(C)]
-  pub struct mflags: u8 {
-    /// Instead of mapping the contents of the file provided,
-    /// create a mapping to anonymous memory. The file
-    /// descriptor argument must be set to [`MAP_ANON_FD`](constant.MAP_ANON_FD.html),
-    /// and the offset must be set to zero.
-    const ANON    = 0x01;
-    /// Require that the mapping is performed at the base
-    /// address provided.
-    const FIXED   = 0x02;
-    /// Changes are private.
-    const PRIVATE = 0x04;
-    /// Changes are shared.
-    const SHARED  = 0x08;
-  }
-}
-
-bitflags! {
-  /// Memory page protection options.
-  ///
-  /// This implementation enforces the `W^X` property: Pages cannot be
-  /// mapped for execution while also mapped for writing.
-  #[repr(C)]
-  pub struct mprot: u8 {
-    /// Page can be executed.
-    const EXEC  = 0x01;
-    /// Page can be written.
-    const WRITE = 0x02;
-    /// Page can be read.
-    const READ  = 0x04;
-  }
-}
-
-bitflags! {
-  /// Methods of synchronizing memory with physical storage.
-  #[repr(C)]
-  pub struct msflags: u8 {
-    /// Perform asynchronous writes.
-    const ASYNC      = 0x01;
-    /// Invalidate cached data.
-    const INVALIDATE = 0x02;
-    /// Perform synchronous writes.
-    const SYNC       = 0x04;
-  }
-}
-
-/// Specifies the number of threads sleeping on a condition
-/// variable that should be woken up.
-pub type nthreads = u32;
-
-bitflags! {
-  /// Open flags used by [`file_open()`](fn.file_open.html).
-  #[repr(C)]
-  pub struct oflags: u16 {
-    /// Create file if it does not exist.
-    const CREAT     = 0x0001;
-    /// Fail if not a directory.
-    const DIRECTORY = 0x0002;
-    /// Fail if file already exists.
-    const EXCL      = 0x0004;
-    /// Truncate file to size 0.
-    const TRUNC     = 0x0008;
-  }
-}
-
-bitflags! {
-  /// Flags provided to [`sock_recv()`](fn.sock_recv.html).
-  #[repr(C)]
-  pub struct riflags: u16 {
-    /// Returns the message without removing it from the
-    /// socket's receive queue.
-    const PEEK    = 0x0004;
-    /// On byte-stream sockets, block until the full amount
-    /// of data can be returned.
-    const WAITALL = 0x0010;
-  }
-}
-
-bitflags! {
-  /// File descriptor rights, determining which actions may be
-  /// performed.
-  #[repr(C)]
-  pub struct rights: u64 {
-    /// The right to invoke [`fd_datasync()`](fn.fd_datasync.html).
-    ///
-    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
-    /// invoke [`file_open()`](fn.file_open.html) with [`DSYNC`](struct.fdflags.html#associatedconstant.DSYNC).
-    const FD_DATASYNC           = 0x0000000000000001;
-    /// The right to invoke [`fd_read()`](fn.fd_read.html) and [`sock_recv()`](fn.sock_recv.html).
-    ///
-    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, includes the right to
-    /// invoke [`mem_map()`](fn.mem_map.html) with memory protection option
-    /// [`READ`](struct.mprot.html#associatedconstant.READ).
-    ///
-    /// If [`FD_SEEK`](struct.rights.html#associatedconstant.FD_SEEK) is set, includes the right to invoke
-    /// [`fd_pread()`](fn.fd_pread.html).
-    const FD_READ               = 0x0000000000000002;
-    /// The right to invoke [`fd_seek()`](fn.fd_seek.html). This flag implies
-    /// [`FD_TELL`](struct.rights.html#associatedconstant.FD_TELL).
-    const FD_SEEK               = 0x0000000000000004;
-    /// The right to invoke [`fd_stat_put()`](fn.fd_stat_put.html) with
-    /// [`FLAGS`](struct.fdsflags.html#associatedconstant.FLAGS).
-    const FD_STAT_PUT_FLAGS     = 0x0000000000000008;
-    /// The right to invoke [`fd_sync()`](fn.fd_sync.html).
-    ///
-    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
-    /// invoke [`file_open()`](fn.file_open.html) with [`RSYNC`](struct.fdflags.html#associatedconstant.RSYNC) and
-    /// [`DSYNC`](struct.fdflags.html#associatedconstant.DSYNC).
-    const FD_SYNC               = 0x0000000000000010;
-    /// The right to invoke [`fd_seek()`](fn.fd_seek.html) in such a way that the
-    /// file offset remains unaltered (i.e., [`CUR`](enum.whence.html#variant.CUR) with
-    /// offset zero).
-    const FD_TELL               = 0x0000000000000020;
-    /// The right to invoke [`fd_write()`](fn.fd_write.html) and [`sock_send()`](fn.sock_send.html).
-    ///
-    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, includes the right to
-    /// invoke [`mem_map()`](fn.mem_map.html) with memory protection option
-    /// [`WRITE`](struct.mprot.html#associatedconstant.WRITE).
-    ///
-    /// If [`FD_SEEK`](struct.rights.html#associatedconstant.FD_SEEK) is set, includes the right to
-    /// invoke [`fd_pwrite()`](fn.fd_pwrite.html).
-    const FD_WRITE              = 0x0000000000000040;
-    /// The right to invoke [`file_advise()`](fn.file_advise.html).
-    const FILE_ADVISE           = 0x0000000000000080;
-    /// The right to invoke [`file_allocate()`](fn.file_allocate.html).
-    const FILE_ALLOCATE         = 0x0000000000000100;
-    /// The right to invoke [`file_create()`](fn.file_create.html) with
-    /// [`DIRECTORY`](enum.filetype.html#variant.DIRECTORY).
-    const FILE_CREATE_DIRECTORY = 0x0000000000000200;
-    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, the right to invoke
-    /// [`file_open()`](fn.file_open.html) with [`CREAT`](struct.oflags.html#associatedconstant.CREAT).
-    const FILE_CREATE_FILE      = 0x0000000000000400;
-    /// The right to invoke [`file_link()`](fn.file_link.html) with the file
-    /// descriptor as the source directory.
-    const FILE_LINK_SOURCE      = 0x0000000000001000;
-    /// The right to invoke [`file_link()`](fn.file_link.html) with the file
-    /// descriptor as the target directory.
-    const FILE_LINK_TARGET      = 0x0000000000002000;
-    /// The right to invoke [`file_open()`](fn.file_open.html).
-    const FILE_OPEN             = 0x0000000000004000;
-    /// The right to invoke [`file_readdir()`](fn.file_readdir.html).
-    const FILE_READDIR          = 0x0000000000008000;
-    /// The right to invoke [`file_readlink()`](fn.file_readlink.html).
-    const FILE_READLINK         = 0x0000000000010000;
-    /// The right to invoke [`file_rename()`](fn.file_rename.html) with the file
-    /// descriptor as the source directory.
-    const FILE_RENAME_SOURCE    = 0x0000000000020000;
-    /// The right to invoke [`file_rename()`](fn.file_rename.html) with the file
-    /// descriptor as the target directory.
-    const FILE_RENAME_TARGET    = 0x0000000000040000;
-    /// The right to invoke [`file_stat_fget()`](fn.file_stat_fget.html).
-    const FILE_STAT_FGET        = 0x0000000000080000;
-    /// The right to invoke [`file_stat_fput()`](fn.file_stat_fput.html) with
-    /// [`SIZE`](struct.fsflags.html#associatedconstant.SIZE).
-    ///
-    /// If [`FILE_OPEN`](struct.rights.html#associatedconstant.FILE_OPEN) is set, includes the right to
-    /// invoke [`file_open()`](fn.file_open.html) with [`TRUNC`](struct.oflags.html#associatedconstant.TRUNC).
-    const FILE_STAT_FPUT_SIZE   = 0x0000000000100000;
-    /// The right to invoke [`file_stat_fput()`](fn.file_stat_fput.html) with
-    /// [`ATIM`](struct.fsflags.html#associatedconstant.ATIM), [`ATIM_NOW`](struct.fsflags.html#associatedconstant.ATIM_NOW), [`MTIM`](struct.fsflags.html#associatedconstant.MTIM),
-    /// and [`MTIM_NOW`](struct.fsflags.html#associatedconstant.MTIM_NOW).
-    const FILE_STAT_FPUT_TIMES  = 0x0000000000200000;
-    /// The right to invoke [`file_stat_get()`](fn.file_stat_get.html).
-    const FILE_STAT_GET         = 0x0000000000400000;
-    /// The right to invoke [`file_stat_put()`](fn.file_stat_put.html) with
-    /// [`ATIM`](struct.fsflags.html#associatedconstant.ATIM), [`ATIM_NOW`](struct.fsflags.html#associatedconstant.ATIM_NOW), [`MTIM`](struct.fsflags.html#associatedconstant.MTIM),
-    /// and [`MTIM_NOW`](struct.fsflags.html#associatedconstant.MTIM_NOW).
-    const FILE_STAT_PUT_TIMES   = 0x0000000000800000;
-    /// The right to invoke [`file_symlink()`](fn.file_symlink.html).
-    const FILE_SYMLINK          = 0x0000000001000000;
-    /// The right to invoke [`file_unlink()`](fn.file_unlink.html).
-    const FILE_UNLINK           = 0x0000000002000000;
-    /// The right to invoke [`mem_map()`](fn.mem_map.html) with [`mprot`](struct.mprot.html) set to
-    /// zero.
-    const MEM_MAP               = 0x0000000004000000;
-    /// If [`MEM_MAP`](struct.rights.html#associatedconstant.MEM_MAP) is set, the right to invoke
-    /// [`mem_map()`](fn.mem_map.html) with [`EXEC`](struct.mprot.html#associatedconstant.EXEC).
-    const MEM_MAP_EXEC          = 0x0000000008000000;
-    /// If [`FD_READ`](struct.rights.html#associatedconstant.FD_READ) is set, includes the right to
-    /// invoke [`poll()`](fn.poll.html) to subscribe to [`FD_READ`](enum.eventtype.html#variant.FD_READ).
-    ///
-    /// If [`FD_WRITE`](struct.rights.html#associatedconstant.FD_WRITE) is set, includes the right to
-    /// invoke [`poll()`](fn.poll.html) to subscribe to [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
-    const POLL_FD_READWRITE     = 0x0000000010000000;
-    /// The right to invoke [`poll()`](fn.poll.html) to subscribe to
-    /// [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
-    const POLL_PROC_TERMINATE   = 0x0000000040000000;
-    /// The right to invoke [`proc_exec()`](fn.proc_exec.html).
-    const PROC_EXEC             = 0x0000000100000000;
-    /// The right to invoke [`sock_shutdown()`](fn.sock_shutdown.html).
-    const SOCK_SHUTDOWN         = 0x0000008000000000;
-  }
-}
-
-bitflags! {
-  /// Flags returned by [`sock_recv()`](fn.sock_recv.html).
-  #[repr(C)]
-  pub struct roflags: u16 {
-    /// Returned by [`sock_recv()`](fn.sock_recv.html): List of file descriptors
-    /// has been truncated.
-    const FDS_TRUNCATED  = 0x0001;
-    /// Returned by [`sock_recv()`](fn.sock_recv.html): Message data has been
-    /// truncated.
-    const DATA_TRUNCATED = 0x0008;
-  }
-}
-
-/// Indicates whether an object is stored in private or shared
-/// memory.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum scope {
-  /// The object is stored in private memory.
-  PRIVATE = 4,
-  /// The object is stored in shared memory.
-  SHARED  = 8,
-}
-
-bitflags! {
-  /// Which channels on a socket need to be shut down.
-  #[repr(C)]
-  pub struct sdflags: u8 {
-    /// Disables further receive operations.
-    const RD = 0x01;
-    /// Disables further send operations.
-    const WR = 0x02;
-  }
-}
-
-bitflags! {
-  /// Flags provided to [`sock_send()`](fn.sock_send.html). As there are currently no flags
-  /// defined, it must be set to zero.
-  #[repr(C)]
-  pub struct siflags: u16 {
-    const DEFAULT = 0;
-  }
-}
-
-/// Signal condition.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum signal {
-  /// Process abort signal.
-  ///
-  /// Action: Terminates the process.
-  ABRT   =  1,
-  /// Alarm clock.
-  ///
-  /// Action: Terminates the process.
-  ALRM   =  2,
-  /// Access to an undefined portion of a memory object.
-  ///
-  /// Action: Terminates the process.
-  BUS    =  3,
-  /// Child process terminated, stopped, or continued.
-  ///
-  /// Action: Ignored.
-  CHLD   =  4,
-  /// Continue executing, if stopped.
-  ///
-  /// Action: Continues executing, if stopped.
-  CONT   =  5,
-  /// Erroneous arithmetic operation.
-  ///
-  /// Action: Terminates the process.
-  FPE    =  6,
-  /// Hangup.
-  ///
-  /// Action: Terminates the process.
-  HUP    =  7,
-  /// Illegal instruction.
-  ///
-  /// Action: Terminates the process.
-  ILL    =  8,
-  /// Terminate interrupt signal.
-  ///
-  /// Action: Terminates the process.
-  INT    =  9,
-  /// Kill.
-  ///
-  /// Action: Terminates the process.
-  KILL   = 10,
-  /// Write on a pipe with no one to read it.
-  ///
-  /// Action: Ignored.
-  PIPE   = 11,
-  /// Terminal quit signal.
-  ///
-  /// Action: Terminates the process.
-  QUIT   = 12,
-  /// Invalid memory reference.
-  ///
-  /// Action: Terminates the process.
-  SEGV   = 13,
-  /// Stop executing.
-  ///
-  /// Action: Stops executing.
-  STOP   = 14,
-  /// Bad system call.
-  ///
-  /// Action: Terminates the process.
-  SYS    = 15,
-  /// Termination signal.
-  ///
-  /// Action: Terminates the process.
-  TERM   = 16,
-  /// Trace/breakpoint trap.
-  ///
-  /// Action: Terminates the process.
-  TRAP   = 17,
-  /// Terminal stop signal.
-  ///
-  /// Action: Stops executing.
-  TSTP   = 18,
-  /// Background process attempting read.
-  ///
-  /// Action: Stops executing.
-  TTIN   = 19,
-  /// Background process attempting write.
-  ///
-  /// Action: Stops executing.
-  TTOU   = 20,
-  /// High bandwidth data is available at a socket.
-  ///
-  /// Action: Ignored.
-  URG    = 21,
-  /// User-defined signal 1.
-  ///
-  /// Action: Terminates the process.
-  USR1   = 22,
-  /// User-defined signal 2.
-  ///
-  /// Action: Terminates the process.
-  USR2   = 23,
-  /// Virtual timer expired.
-  ///
-  /// Action: Terminates the process.
-  VTALRM = 24,
-  /// CPU time limit exceeded.
-  ///
-  /// Action: Terminates the process.
-  XCPU   = 25,
-  /// File size limit exceeded.
-  ///
-  /// Action: Terminates the process.
-  XFSZ   = 26,
-}
-
-bitflags! {
-  /// Flags determining how the timestamp provided in
-  /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) should be interpreted.
-  #[repr(C)]
-  pub struct subclockflags: u16 {
-    /// If set, treat the timestamp provided in
-    /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) as an absolute timestamp
-    /// of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id).
-    ///
-    /// If clear, treat the timestamp provided in
-    /// [`subscription.union.clock.timeout`](struct.subscription_clock.html#structfield.timeout) relative to the current
-    /// time value of clock [`subscription.union.clock.clock_id`](struct.subscription_clock.html#structfield.clock_id).
-    const ABSTIME = 0x0001;
-  }
-}
-
-bitflags! {
-  /// Flags influencing the method of polling for read or writing on
-  /// a file descriptor.
-  #[repr(C)]
-  pub struct subrwflags: u16 {
-    /// Deprecated. Must be set by callers and ignored by
-    /// implementations.
-    const POLL = 0x0001;
-  }
-}
-
-/// Unique system-local identifier of a thread. This identifier is
-/// only valid during the lifetime of the thread.
-///
-/// Threads must be aware of their thread identifier, as it is
-/// written it into locks when acquiring them for writing. It is
-/// not advised to use these identifiers for any other purpose.
-///
-/// As the thread identifier is also stored in [`lock`](struct.lock.html) when
-/// [`LOCK_WRLOCKED`](constant.LOCK_WRLOCKED.html) is set, the top two bits of the thread
-/// must always be set to zero.
-#[repr(C)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-pub struct tid(pub u32);
-
-/// Timestamp in nanoseconds.
-pub type timestamp = u64;
-
-bitflags! {
-  /// Specifies whether files are unlinked or directories are
-  /// removed.
-  #[repr(C)]
-  pub struct ulflags: u8 {
-    /// If set, removes a directory. Otherwise, unlinks any
-    /// non-directory file.
-    const REMOVEDIR = 0x01;
-  }
-}
-
-/// User-provided value that can be attached to objects that is
-/// retained when extracted from the kernel.
-pub type userdata = u64;
-
-/// Relative to which position the offset of the file descriptor
-/// should be set.
-#[repr(u8)]
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[non_exhaustive]
-pub enum whence {
-  /// Seek relative to current position.
-  CUR = 1,
-  /// Seek relative to end-of-file.
-  END = 2,
-  /// Seek relative to start-of-file.
-  SET = 3,
-}
-
-/// Auxiliary vector entry.
-///
-/// The auxiliary vector is a list of key-value pairs that is
-/// provided to the process on startup. Unlike structures, it is
-/// extensible, as it is possible to add new records later on.
-/// The auxiliary vector is always terminated by an entry having
-/// type [`NULL`](enum.auxtype.html#variant.NULL).
-///
-/// The auxiliary vector is part of the x86-64 ABI, but is used by
-/// this environment on all architectures.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct auxv {
-  /// The type of the auxiliary vector entry.
-  pub a_type: auxtype,
-  pub union: auxv_union
-}
-/// A union inside `auxv`.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union auxv_union {
-  /// Used when [`a_type`](struct.auxv.html#structfield.a_type) is [`ARGDATALEN`](enum.auxtype.html#variant.ARGDATALEN), [`CANARYLEN`](enum.auxtype.html#variant.CANARYLEN), [`NCPUS`](enum.auxtype.html#variant.NCPUS), [`PAGESZ`](enum.auxtype.html#variant.PAGESZ), [`PHNUM`](enum.auxtype.html#variant.PHNUM), or [`TID`](enum.auxtype.html#variant.TID).
-  /// A numerical value.
-  pub a_val: usize,
-  /// Used when [`a_type`](struct.auxv.html#structfield.a_type) is [`ARGDATA`](enum.auxtype.html#variant.ARGDATA), [`BASE`](enum.auxtype.html#variant.BASE), [`CANARY`](enum.auxtype.html#variant.CANARY), [`PHDR`](enum.auxtype.html#variant.PHDR), [`PID`](enum.auxtype.html#variant.PID), or [`SYSINFO_EHDR`](enum.auxtype.html#variant.SYSINFO_EHDR).
-  /// A pointer value.
-  pub a_ptr: *mut (),
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn auxv_layout_test_32() {
-  assert_eq!(core::mem::size_of::<auxv>(), 8);
-  assert_eq!(core::mem::align_of::<auxv>(), 4);
-  let mut obj = auxv {
-    a_type: auxtype::ARGDATA,
-    union: auxv_union {
-      a_val: 0,
-    },
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.a_type as *const _ as usize - base, 0);
-  obj.union.a_val = 0;
-  unsafe {
-    assert_eq!(&obj.union.a_val as *const _ as usize - base, 4);
-  }
-  obj.union.a_ptr = 0 as *mut ();
-  unsafe {
-    assert_eq!(&obj.union.a_ptr as *const _ as usize - base, 4);
-  }
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn auxv_layout_test_64() {
-  assert_eq!(core::mem::size_of::<auxv>(), 16);
-  assert_eq!(core::mem::align_of::<auxv>(), 8);
-  let mut obj = auxv {
-    a_type: auxtype::ARGDATA,
-    union: auxv_union {
-      a_val: 0,
-    },
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.a_type as *const _ as usize - base, 0);
-  obj.union.a_val = 0;
-  unsafe {
-    assert_eq!(&obj.union.a_val as *const _ as usize - base, 8);
-  }
-  obj.union.a_ptr = 0 as *mut ();
-  unsafe {
-    assert_eq!(&obj.union.a_ptr as *const _ as usize - base, 8);
-  }
-}
-
-/// A region of memory for scatter/gather writes.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ciovec {
-  /// The address and length of the buffer to be written.
-  pub buf: (*const (), usize),
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn ciovec_layout_test_32() {
-  assert_eq!(core::mem::size_of::<ciovec>(), 8);
-  assert_eq!(core::mem::align_of::<ciovec>(), 4);
-  let obj = ciovec {
-    buf: (0 as *const _, 0),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.buf.1 as *const _ as usize - base, 4);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn ciovec_layout_test_64() {
-  assert_eq!(core::mem::size_of::<ciovec>(), 16);
-  assert_eq!(core::mem::align_of::<ciovec>(), 8);
-  let obj = ciovec {
-    buf: (0 as *const _, 0),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.buf.1 as *const _ as usize - base, 8);
-}
-
-/// A directory entry.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct dirent {
-  /// The offset of the next directory entry stored in this
-  /// directory.
-  pub d_next: dircookie,
-  /// The serial number of the file referred to by this
-  /// directory entry.
-  pub d_ino: inode,
-  /// The length of the name of the directory entry.
-  pub d_namlen: u32,
-  /// The type of the file referred to by this directory
-  /// entry.
-  pub d_type: filetype,
-}
-#[test]
-fn dirent_layout_test() {
-  assert_eq!(core::mem::size_of::<dirent>(), 24);
-  assert_eq!(core::mem::align_of::<dirent>(), 8);
-  let obj = dirent {
-    d_next: dircookie(0),
-    d_ino: inode(0),
-    d_namlen: 0,
-    d_type: filetype::UNKNOWN,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.d_next as *const _ as usize - base, 0);
-  assert_eq!(&obj.d_ino as *const _ as usize - base, 8);
-  assert_eq!(&obj.d_namlen as *const _ as usize - base, 16);
-  assert_eq!(&obj.d_type as *const _ as usize - base, 20);
-}
-
-/// An event that occurred.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct event {
-  /// User-provided value that got attached to
-  /// [`subscription.userdata`](struct.subscription.html#structfield.userdata).
-  pub userdata: userdata,
-  /// If non-zero, an error that occurred while processing
-  /// the subscription request.
-  pub error: errno,
-  /// The type of the event that occurred.
-  pub r#type: eventtype,
-  pub union: event_union
-}
-/// A union inside `event`.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union event_union {
-  /// Used when [`type`](struct.event.html#structfield.type) is [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
-  pub fd_readwrite: event_fd_readwrite,
-  /// Used when [`type`](struct.event.html#structfield.type) is [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
-  pub proc_terminate: event_proc_terminate,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct event_fd_readwrite {
-  /// The number of bytes available
-  /// for reading or writing.
-  pub nbytes: filesize,
-  /// Obsolete.
-  pub unused: [u8; 4],
-  /// The state of the file
-  /// descriptor.
-  pub flags: eventrwflags,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct event_proc_terminate {
-  /// Obsolete.
-  pub unused: [u8; 4],
-  /// If zero, the process has
-  /// exited.
-  /// Otherwise, the signal
-  /// condition causing it to
-  /// terminated.
-  pub signal: signal,
-  /// If exited, the exit code of
-  /// the process.
-  pub exitcode: exitcode,
-}
-#[test]
-fn event_layout_test() {
-  assert_eq!(core::mem::size_of::<event>(), 32);
-  assert_eq!(core::mem::align_of::<event>(), 8);
-  let mut obj = event {
-    userdata: 0,
-    error: errno::SUCCESS,
-    r#type: eventtype::CLOCK,
-    union: event_union {
-      fd_readwrite: event_fd_readwrite {
-        nbytes: 0,
-        unused: [0; 4],
-        flags: eventrwflags::HANGUP,
-      },
-    },
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.userdata as *const _ as usize - base, 0);
-  assert_eq!(&obj.error as *const _ as usize - base, 8);
-  assert_eq!(&obj.r#type as *const _ as usize - base, 10);
-  obj.union.fd_readwrite = event_fd_readwrite {
-    nbytes: 0,
-    unused: [0; 4],
-    flags: eventrwflags::HANGUP,
-  };
-  unsafe {
-    assert_eq!(&obj.union.fd_readwrite.nbytes as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.fd_readwrite.unused as *const _ as usize - base, 24);
-    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 28);
-  }
-  obj.union.proc_terminate = event_proc_terminate {
-    unused: [0; 4],
-    signal: signal::ABRT,
-    exitcode: 0,
-  };
-  unsafe {
-    assert_eq!(&obj.union.proc_terminate.unused as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.proc_terminate.signal as *const _ as usize - base, 20);
-    assert_eq!(&obj.union.proc_terminate.exitcode as *const _ as usize - base, 24);
-  }
-}
-
-/// File descriptor attributes.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct fdstat {
-  /// File type.
-  pub fs_filetype: filetype,
-  /// File descriptor flags.
-  pub fs_flags: fdflags,
-  /// Rights that apply to this file descriptor.
-  pub fs_rights_base: rights,
-  /// Maximum set of rights that can be installed on new
-  /// file descriptors that are created through this file
-  /// descriptor, e.g., through [`file_open()`](fn.file_open.html).
-  pub fs_rights_inheriting: rights,
-}
-#[test]
-fn fdstat_layout_test() {
-  assert_eq!(core::mem::size_of::<fdstat>(), 24);
-  assert_eq!(core::mem::align_of::<fdstat>(), 8);
-  let obj = fdstat {
-    fs_filetype: filetype::UNKNOWN,
-    fs_flags: fdflags::APPEND,
-    fs_rights_base: rights::FD_DATASYNC,
-    fs_rights_inheriting: rights::FD_DATASYNC,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.fs_filetype as *const _ as usize - base, 0);
-  assert_eq!(&obj.fs_flags as *const _ as usize - base, 2);
-  assert_eq!(&obj.fs_rights_base as *const _ as usize - base, 8);
-  assert_eq!(&obj.fs_rights_inheriting as *const _ as usize - base, 16);
-}
-
-/// File attributes.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct filestat {
-  /// Device ID of device containing the file.
-  pub st_dev: device,
-  /// File serial number.
-  pub st_ino: inode,
-  /// File type.
-  pub st_filetype: filetype,
-  /// Number of hard links to the file.
-  pub st_nlink: linkcount,
-  /// For regular files, the file size in bytes. For
-  /// symbolic links, the length in bytes of the pathname
-  /// contained in the symbolic link.
-  pub st_size: filesize,
-  /// Last data access timestamp.
-  pub st_atim: timestamp,
-  /// Last data modification timestamp.
-  pub st_mtim: timestamp,
-  /// Last file status change timestamp.
-  pub st_ctim: timestamp,
-}
-#[test]
-fn filestat_layout_test() {
-  assert_eq!(core::mem::size_of::<filestat>(), 56);
-  assert_eq!(core::mem::align_of::<filestat>(), 8);
-  let obj = filestat {
-    st_dev: device(0),
-    st_ino: inode(0),
-    st_filetype: filetype::UNKNOWN,
-    st_nlink: 0,
-    st_size: 0,
-    st_atim: 0,
-    st_mtim: 0,
-    st_ctim: 0,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.st_dev as *const _ as usize - base, 0);
-  assert_eq!(&obj.st_ino as *const _ as usize - base, 8);
-  assert_eq!(&obj.st_filetype as *const _ as usize - base, 16);
-  assert_eq!(&obj.st_nlink as *const _ as usize - base, 20);
-  assert_eq!(&obj.st_size as *const _ as usize - base, 24);
-  assert_eq!(&obj.st_atim as *const _ as usize - base, 32);
-  assert_eq!(&obj.st_mtim as *const _ as usize - base, 40);
-  assert_eq!(&obj.st_ctim as *const _ as usize - base, 48);
-}
-
-/// A region of memory for scatter/gather reads.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct iovec {
-  /// The address and length of the buffer to be filled.
-  pub buf: (*mut (), usize),
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn iovec_layout_test_32() {
-  assert_eq!(core::mem::size_of::<iovec>(), 8);
-  assert_eq!(core::mem::align_of::<iovec>(), 4);
-  let obj = iovec {
-    buf: (0 as *mut _, 0),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.buf.1 as *const _ as usize - base, 4);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn iovec_layout_test_64() {
-  assert_eq!(core::mem::size_of::<iovec>(), 16);
-  assert_eq!(core::mem::align_of::<iovec>(), 8);
-  let obj = iovec {
-    buf: (0 as *mut _, 0),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.buf.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.buf.1 as *const _ as usize - base, 8);
-}
-
-/// Path lookup properties.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct lookup {
-  /// The working directory at which the resolution of the
-  /// path starts.
-  pub fd: fd,
-  /// Flags determining the method of how the path is
-  /// resolved.
-  pub flags: lookupflags,
-}
-#[test]
-fn lookup_layout_test() {
-  assert_eq!(core::mem::size_of::<lookup>(), 8);
-  assert_eq!(core::mem::align_of::<lookup>(), 4);
-  let obj = lookup {
-    fd: fd(0),
-    flags: lookupflags::SYMLINK_FOLLOW,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.fd as *const _ as usize - base, 0);
-  assert_eq!(&obj.flags as *const _ as usize - base, 4);
-}
-
-/// Entry point for a process (`_start`).
-///
-/// **auxv**:
-/// The auxiliary vector. See [`auxv`](struct.auxv.html).
-pub type processentry = unsafe extern "C" fn(
-  auxv: *const auxv,
-) -> ();
-
-/// Arguments of [`sock_recv()`](fn.sock_recv.html).
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct recv_in {
-  /// List of scatter/gather vectors where message data
-  /// should be stored.
-  pub ri_data: (*const iovec, usize),
-  /// Buffer where numbers of incoming file descriptors
-  /// should be stored.
-  pub ri_fds: (*mut fd, usize),
-  /// Message flags.
-  pub ri_flags: riflags,
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn recv_in_layout_test_32() {
-  assert_eq!(core::mem::size_of::<recv_in>(), 20);
-  assert_eq!(core::mem::align_of::<recv_in>(), 4);
-  let obj = recv_in {
-    ri_data: (0 as *const _, 0),
-    ri_fds: (0 as *mut _, 0),
-    ri_flags: riflags::PEEK,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.ri_data.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.ri_data.1 as *const _ as usize - base, 4);
-  assert_eq!(&obj.ri_fds.0 as *const _ as usize - base, 8);
-  assert_eq!(&obj.ri_fds.1 as *const _ as usize - base, 12);
-  assert_eq!(&obj.ri_flags as *const _ as usize - base, 16);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn recv_in_layout_test_64() {
-  assert_eq!(core::mem::size_of::<recv_in>(), 40);
-  assert_eq!(core::mem::align_of::<recv_in>(), 8);
-  let obj = recv_in {
-    ri_data: (0 as *const _, 0),
-    ri_fds: (0 as *mut _, 0),
-    ri_flags: riflags::PEEK,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.ri_data.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.ri_data.1 as *const _ as usize - base, 8);
-  assert_eq!(&obj.ri_fds.0 as *const _ as usize - base, 16);
-  assert_eq!(&obj.ri_fds.1 as *const _ as usize - base, 24);
-  assert_eq!(&obj.ri_flags as *const _ as usize - base, 32);
-}
-
-/// Results of [`sock_recv()`](fn.sock_recv.html).
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct recv_out {
-  /// Number of bytes stored in [`recv_in.ri_data`](struct.recv_in.html#structfield.ri_data).
-  pub ro_datalen: usize,
-  /// Number of file descriptors stored in [`recv_in.ri_fds`](struct.recv_in.html#structfield.ri_fds).
-  pub ro_fdslen: usize,
-  /// Fields that were used by previous implementations.
-  pub ro_unused: [u8; 40],
-  /// Message flags.
-  pub ro_flags: roflags,
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn recv_out_layout_test_32() {
-  assert_eq!(core::mem::size_of::<recv_out>(), 52);
-  assert_eq!(core::mem::align_of::<recv_out>(), 4);
-  let obj = recv_out {
-    ro_datalen: 0,
-    ro_fdslen: 0,
-    ro_unused: [0; 40],
-    ro_flags: roflags::FDS_TRUNCATED,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.ro_datalen as *const _ as usize - base, 0);
-  assert_eq!(&obj.ro_fdslen as *const _ as usize - base, 4);
-  assert_eq!(&obj.ro_unused as *const _ as usize - base, 8);
-  assert_eq!(&obj.ro_flags as *const _ as usize - base, 48);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn recv_out_layout_test_64() {
-  assert_eq!(core::mem::size_of::<recv_out>(), 64);
-  assert_eq!(core::mem::align_of::<recv_out>(), 8);
-  let obj = recv_out {
-    ro_datalen: 0,
-    ro_fdslen: 0,
-    ro_unused: [0; 40],
-    ro_flags: roflags::FDS_TRUNCATED,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.ro_datalen as *const _ as usize - base, 0);
-  assert_eq!(&obj.ro_fdslen as *const _ as usize - base, 8);
-  assert_eq!(&obj.ro_unused as *const _ as usize - base, 16);
-  assert_eq!(&obj.ro_flags as *const _ as usize - base, 56);
-}
-
-/// Arguments of [`sock_send()`](fn.sock_send.html).
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct send_in {
-  /// List of scatter/gather vectors where message data
-  /// should be retrieved.
-  pub si_data: (*const ciovec, usize),
-  /// File descriptors that need to be attached to the
-  /// message.
-  pub si_fds: (*const fd, usize),
-  /// Message flags.
-  pub si_flags: siflags,
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn send_in_layout_test_32() {
-  assert_eq!(core::mem::size_of::<send_in>(), 20);
-  assert_eq!(core::mem::align_of::<send_in>(), 4);
-  let obj = send_in {
-    si_data: (0 as *const _, 0),
-    si_fds: (0 as *const _, 0),
-    si_flags: siflags::DEFAULT,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.si_data.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.si_data.1 as *const _ as usize - base, 4);
-  assert_eq!(&obj.si_fds.0 as *const _ as usize - base, 8);
-  assert_eq!(&obj.si_fds.1 as *const _ as usize - base, 12);
-  assert_eq!(&obj.si_flags as *const _ as usize - base, 16);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn send_in_layout_test_64() {
-  assert_eq!(core::mem::size_of::<send_in>(), 40);
-  assert_eq!(core::mem::align_of::<send_in>(), 8);
-  let obj = send_in {
-    si_data: (0 as *const _, 0),
-    si_fds: (0 as *const _, 0),
-    si_flags: siflags::DEFAULT,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.si_data.0 as *const _ as usize - base, 0);
-  assert_eq!(&obj.si_data.1 as *const _ as usize - base, 8);
-  assert_eq!(&obj.si_fds.0 as *const _ as usize - base, 16);
-  assert_eq!(&obj.si_fds.1 as *const _ as usize - base, 24);
-  assert_eq!(&obj.si_flags as *const _ as usize - base, 32);
-}
-
-/// Results of [`sock_send()`](fn.sock_send.html).
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct send_out {
-  /// Number of bytes transmitted.
-  pub so_datalen: usize,
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn send_out_layout_test_32() {
-  assert_eq!(core::mem::size_of::<send_out>(), 4);
-  assert_eq!(core::mem::align_of::<send_out>(), 4);
-  let obj = send_out {
-    so_datalen: 0,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.so_datalen as *const _ as usize - base, 0);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn send_out_layout_test_64() {
-  assert_eq!(core::mem::size_of::<send_out>(), 8);
-  assert_eq!(core::mem::align_of::<send_out>(), 8);
-  let obj = send_out {
-    so_datalen: 0,
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.so_datalen as *const _ as usize - base, 0);
-}
-
-/// Subscription to an event.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription {
-  /// User-provided value that is attached to the
-  /// subscription in the kernel and returned through
-  /// [`event.userdata`](struct.event.html#structfield.userdata).
-  pub userdata: userdata,
-  /// Used by previous implementations. Ignored.
-  pub unused: u16,
-  /// The type of the event to which to subscribe.
-  ///
-  /// Currently, [`CONDVAR`](enum.eventtype.html#variant.CONDVAR),
-  /// [`LOCK_RDLOCK`](enum.eventtype.html#variant.LOCK_RDLOCK), and [`LOCK_WRLOCK`](enum.eventtype.html#variant.LOCK_WRLOCK)
-  /// must be provided as the first subscription and may
-  /// only be followed by up to one other subscription,
-  /// having type [`CLOCK`](enum.eventtype.html#variant.CLOCK).
-  pub r#type: eventtype,
-  pub union: subscription_union
-}
-/// A union inside `subscription`.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union subscription_union {
-  /// Used when [`type`](struct.subscription.html#structfield.type) is [`CLOCK`](enum.eventtype.html#variant.CLOCK).
-  pub clock: subscription_clock,
-  /// Used when [`type`](struct.subscription.html#structfield.type) is [`CONDVAR`](enum.eventtype.html#variant.CONDVAR).
-  pub condvar: subscription_condvar,
-  /// Used when [`type`](struct.subscription.html#structfield.type) is [`FD_READ`](enum.eventtype.html#variant.FD_READ) or [`FD_WRITE`](enum.eventtype.html#variant.FD_WRITE).
-  pub fd_readwrite: subscription_fd_readwrite,
-  /// Used when [`type`](struct.subscription.html#structfield.type) is [`LOCK_RDLOCK`](enum.eventtype.html#variant.LOCK_RDLOCK) or [`LOCK_WRLOCK`](enum.eventtype.html#variant.LOCK_WRLOCK).
-  pub lock: subscription_lock,
-  /// Used when [`type`](struct.subscription.html#structfield.type) is [`PROC_TERMINATE`](enum.eventtype.html#variant.PROC_TERMINATE).
-  pub proc_terminate: subscription_proc_terminate,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription_clock {
-  /// The user-defined unique
-  /// identifier of the clock.
-  pub identifier: userdata,
-  /// The clock against which the
-  /// timestamp should be compared.
-  pub clock_id: clockid,
-  /// The absolute or relative
-  /// timestamp.
-  pub timeout: timestamp,
-  /// The amount of time that the
-  /// kernel may wait additionally
-  /// to coalesce with other events.
-  pub precision: timestamp,
-  /// Flags specifying whether the
-  /// timeout is absolute or
-  /// relative.
-  pub flags: subclockflags,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription_condvar {
-  /// The condition variable on
-  /// which to wait to be woken up.
-  pub condvar: *mut condvar,
-  /// The lock that will be
-  /// released while waiting.
-  ///
-  /// The lock will be reacquired
-  /// for writing when the condition
-  /// variable triggers.
-  pub lock: *mut lock,
-  /// Whether the condition variable
-  /// is stored in private or shared
-  /// memory.
-  pub condvar_scope: scope,
-  /// Whether the lock is stored in
-  /// private or shared memory.
-  pub lock_scope: scope,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription_fd_readwrite {
-  /// The file descriptor on which
-  /// to wait for it to become ready
-  /// for reading or writing.
-  pub fd: fd,
-  /// Under which conditions to
-  /// trigger.
-  pub flags: subrwflags,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription_lock {
-  /// The lock that will be acquired
-  /// for reading or writing.
-  pub lock: *mut lock,
-  /// Whether the lock is stored in
-  /// private or shared memory.
-  pub lock_scope: scope,
-}
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct subscription_proc_terminate {
-  /// The process descriptor on
-  /// which to wait for process
-  /// termination.
-  pub fd: fd,
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn subscription_layout_test_32() {
-  assert_eq!(core::mem::size_of::<subscription>(), 56);
-  assert_eq!(core::mem::align_of::<subscription>(), 8);
-  let mut obj = subscription {
-    userdata: 0,
-    unused: 0,
-    r#type: eventtype::CLOCK,
-    union: subscription_union {
-      clock: subscription_clock {
-        identifier: 0,
-        clock_id: clockid::MONOTONIC,
-        timeout: 0,
-        precision: 0,
-        flags: subclockflags::ABSTIME,
-      },
-    },
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.userdata as *const _ as usize - base, 0);
-  assert_eq!(&obj.unused as *const _ as usize - base, 8);
-  assert_eq!(&obj.r#type as *const _ as usize - base, 10);
-  obj.union.clock = subscription_clock {
-    identifier: 0,
-    clock_id: clockid::MONOTONIC,
-    timeout: 0,
-    precision: 0,
-    flags: subclockflags::ABSTIME,
-  };
-  unsafe {
-    assert_eq!(&obj.union.clock.identifier as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.clock.clock_id as *const _ as usize - base, 24);
-    assert_eq!(&obj.union.clock.timeout as *const _ as usize - base, 32);
-    assert_eq!(&obj.union.clock.precision as *const _ as usize - base, 40);
-    assert_eq!(&obj.union.clock.flags as *const _ as usize - base, 48);
-  }
-  obj.union.condvar = subscription_condvar {
-    condvar: 0 as *mut condvar,
-    lock: 0 as *mut lock,
-    condvar_scope: scope::PRIVATE,
-    lock_scope: scope::PRIVATE,
-  };
-  unsafe {
-    assert_eq!(&obj.union.condvar.condvar as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.condvar.lock as *const _ as usize - base, 20);
-    assert_eq!(&obj.union.condvar.condvar_scope as *const _ as usize - base, 24);
-    assert_eq!(&obj.union.condvar.lock_scope as *const _ as usize - base, 25);
-  }
-  obj.union.fd_readwrite = subscription_fd_readwrite {
-    fd: fd(0),
-    flags: subrwflags::POLL,
-  };
-  unsafe {
-    assert_eq!(&obj.union.fd_readwrite.fd as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 20);
-  }
-  obj.union.lock = subscription_lock {
-    lock: 0 as *mut lock,
-    lock_scope: scope::PRIVATE,
-  };
-  unsafe {
-    assert_eq!(&obj.union.lock.lock as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.lock.lock_scope as *const _ as usize - base, 20);
-  }
-  obj.union.proc_terminate = subscription_proc_terminate {
-    fd: fd(0),
-  };
-  unsafe {
-    assert_eq!(&obj.union.proc_terminate.fd as *const _ as usize - base, 16);
-  }
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn subscription_layout_test_64() {
-  assert_eq!(core::mem::size_of::<subscription>(), 56);
-  assert_eq!(core::mem::align_of::<subscription>(), 8);
-  let mut obj = subscription {
-    userdata: 0,
-    unused: 0,
-    r#type: eventtype::CLOCK,
-    union: subscription_union {
-      clock: subscription_clock {
-        identifier: 0,
-        clock_id: clockid::MONOTONIC,
-        timeout: 0,
-        precision: 0,
-        flags: subclockflags::ABSTIME,
-      },
-    },
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.userdata as *const _ as usize - base, 0);
-  assert_eq!(&obj.unused as *const _ as usize - base, 8);
-  assert_eq!(&obj.r#type as *const _ as usize - base, 10);
-  obj.union.clock = subscription_clock {
-    identifier: 0,
-    clock_id: clockid::MONOTONIC,
-    timeout: 0,
-    precision: 0,
-    flags: subclockflags::ABSTIME,
-  };
-  unsafe {
-    assert_eq!(&obj.union.clock.identifier as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.clock.clock_id as *const _ as usize - base, 24);
-    assert_eq!(&obj.union.clock.timeout as *const _ as usize - base, 32);
-    assert_eq!(&obj.union.clock.precision as *const _ as usize - base, 40);
-    assert_eq!(&obj.union.clock.flags as *const _ as usize - base, 48);
-  }
-  obj.union.condvar = subscription_condvar {
-    condvar: 0 as *mut condvar,
-    lock: 0 as *mut lock,
-    condvar_scope: scope::PRIVATE,
-    lock_scope: scope::PRIVATE,
-  };
-  unsafe {
-    assert_eq!(&obj.union.condvar.condvar as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.condvar.lock as *const _ as usize - base, 24);
-    assert_eq!(&obj.union.condvar.condvar_scope as *const _ as usize - base, 32);
-    assert_eq!(&obj.union.condvar.lock_scope as *const _ as usize - base, 33);
-  }
-  obj.union.fd_readwrite = subscription_fd_readwrite {
-    fd: fd(0),
-    flags: subrwflags::POLL,
-  };
-  unsafe {
-    assert_eq!(&obj.union.fd_readwrite.fd as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.fd_readwrite.flags as *const _ as usize - base, 20);
-  }
-  obj.union.lock = subscription_lock {
-    lock: 0 as *mut lock,
-    lock_scope: scope::PRIVATE,
-  };
-  unsafe {
-    assert_eq!(&obj.union.lock.lock as *const _ as usize - base, 16);
-    assert_eq!(&obj.union.lock.lock_scope as *const _ as usize - base, 24);
-  }
-  obj.union.proc_terminate = subscription_proc_terminate {
-    fd: fd(0),
-  };
-  unsafe {
-    assert_eq!(&obj.union.proc_terminate.fd as *const _ as usize - base, 16);
-  }
-}
-
-/// The Thread Control Block (TCB).
-///
-/// After a thread begins execution (at program startup or when
-/// created through [`thread_create()`](fn.thread_create.html)), the CPU's registers
-/// controlling Thread-Local Storage (TLS) will already be
-/// initialized. They will point to an area only containing the
-/// TCB.
-///
-/// If the thread needs space for storing thread-specific
-/// variables, the thread may allocate a larger area and adjust
-/// the CPU's registers to point to that area instead. However, it
-/// does need to make sure that the TCB is copied over to the new
-/// TLS area.
-///
-/// The purpose of the TCB is that it allows light-weight
-/// emulators to store information related to individual threads.
-/// For example, it may be used to store a copy of the CPU
-/// registers prior emulation, so that TLS for the host system
-/// can be restored if needed.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct tcb {
-  /// Pointer that may be freely assigned by the system. Its
-  /// value cannot be interpreted by the application.
-  pub parent: *mut (),
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn tcb_layout_test_32() {
-  assert_eq!(core::mem::size_of::<tcb>(), 4);
-  assert_eq!(core::mem::align_of::<tcb>(), 4);
-  let obj = tcb {
-    parent: 0 as *mut (),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.parent as *const _ as usize - base, 0);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn tcb_layout_test_64() {
-  assert_eq!(core::mem::size_of::<tcb>(), 8);
-  assert_eq!(core::mem::align_of::<tcb>(), 8);
-  let obj = tcb {
-    parent: 0 as *mut (),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.parent as *const _ as usize - base, 0);
-}
-
-/// Entry point for additionally created threads.
-///
-/// **tid**:
-/// Thread ID of the current thread.
-///
-/// **aux**:
-/// Copy of the value stored in
-/// [`threadattr.argument`](struct.threadattr.html#structfield.argument).
-pub type threadentry = unsafe extern "C" fn(
-  tid: tid,
-  aux: *mut (),
-) -> ();
-
-/// Attributes for thread creation.
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct threadattr {
-  /// Initial program counter value.
-  pub entry_point: threadentry,
-  /// Region allocated to serve as stack space.
-  pub stack: (*mut (), usize),
-  /// Argument to be forwarded to the entry point function.
-  pub argument: *mut (),
-}
-#[test]
-#[cfg(target_pointer_width = "32")]
-fn threadattr_layout_test_32() {
-  assert_eq!(core::mem::size_of::<threadattr>(), 16);
-  assert_eq!(core::mem::align_of::<threadattr>(), 4);
-  let obj = threadattr {
-    entry_point: { extern "C" fn f(_: tid, _: *mut ()) -> () {} f },
-    stack: (0 as *mut _, 0),
-    argument: 0 as *mut (),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.entry_point as *const _ as usize - base, 0);
-  assert_eq!(&obj.stack.0 as *const _ as usize - base, 4);
-  assert_eq!(&obj.stack.1 as *const _ as usize - base, 8);
-  assert_eq!(&obj.argument as *const _ as usize - base, 12);
-}
-#[test]
-#[cfg(target_pointer_width = "64")]
-fn threadattr_layout_test_64() {
-  assert_eq!(core::mem::size_of::<threadattr>(), 32);
-  assert_eq!(core::mem::align_of::<threadattr>(), 8);
-  let obj = threadattr {
-    entry_point: { extern "C" fn f(_: tid, _: *mut ()) -> () {} f },
-    stack: (0 as *mut _, 0),
-    argument: 0 as *mut (),
-  };
-  let base = &obj as *const _ as usize;
-  assert_eq!(&obj.entry_point as *const _ as usize - base, 0);
-  assert_eq!(&obj.stack.0 as *const _ as usize - base, 8);
-  assert_eq!(&obj.stack.1 as *const _ as usize - base, 16);
-  assert_eq!(&obj.argument as *const _ as usize - base, 24);
-}
-
-/// The table with pointers to all syscall implementations.
-#[allow(improper_ctypes)]
-extern "C" {
-  fn cloudabi_sys_clock_res_get(_: clockid, _: *mut timestamp) -> errno;
-  fn cloudabi_sys_clock_time_get(_: clockid, _: timestamp, _: *mut timestamp) -> errno;
-  fn cloudabi_sys_condvar_signal(_: *mut condvar, _: scope, _: nthreads) -> errno;
-  fn cloudabi_sys_fd_close(_: fd) -> errno;
-  fn cloudabi_sys_fd_create1(_: filetype, _: *mut fd) -> errno;
-  fn cloudabi_sys_fd_create2(_: filetype, _: *mut fd, _: *mut fd) -> errno;
-  fn cloudabi_sys_fd_datasync(_: fd) -> errno;
-  fn cloudabi_sys_fd_dup(_: fd, _: *mut fd) -> errno;
-  fn cloudabi_sys_fd_pread(_: fd, _: *const iovec, _: usize, _: filesize, _: *mut usize) -> errno;
-  fn cloudabi_sys_fd_pwrite(_: fd, _: *const ciovec, _: usize, _: filesize, _: *mut usize) -> errno;
-  fn cloudabi_sys_fd_read(_: fd, _: *const iovec, _: usize, _: *mut usize) -> errno;
-  fn cloudabi_sys_fd_replace(_: fd, _: fd) -> errno;
-  fn cloudabi_sys_fd_seek(_: fd, _: filedelta, _: whence, _: *mut filesize) -> errno;
-  fn cloudabi_sys_fd_stat_get(_: fd, _: *mut fdstat) -> errno;
-  fn cloudabi_sys_fd_stat_put(_: fd, _: *const fdstat, _: fdsflags) -> errno;
-  fn cloudabi_sys_fd_sync(_: fd) -> errno;
-  fn cloudabi_sys_fd_write(_: fd, _: *const ciovec, _: usize, _: *mut usize) -> errno;
-  fn cloudabi_sys_file_advise(_: fd, _: filesize, _: filesize, _: advice) -> errno;
-  fn cloudabi_sys_file_allocate(_: fd, _: filesize, _: filesize) -> errno;
-  fn cloudabi_sys_file_create(_: fd, _: *const u8, _: usize, _: filetype) -> errno;
-  fn cloudabi_sys_file_link(_: lookup, _: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
-  fn cloudabi_sys_file_open(_: lookup, _: *const u8, _: usize, _: oflags, _: *const fdstat, _: *mut fd) -> errno;
-  fn cloudabi_sys_file_readdir(_: fd, _: *mut (), _: usize, _: dircookie, _: *mut usize) -> errno;
-  fn cloudabi_sys_file_readlink(_: fd, _: *const u8, _: usize, _: *mut u8, _: usize, _: *mut usize) -> errno;
-  fn cloudabi_sys_file_rename(_: fd, _: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
-  fn cloudabi_sys_file_stat_fget(_: fd, _: *mut filestat) -> errno;
-  fn cloudabi_sys_file_stat_fput(_: fd, _: *const filestat, _: fsflags) -> errno;
-  fn cloudabi_sys_file_stat_get(_: lookup, _: *const u8, _: usize, _: *mut filestat) -> errno;
-  fn cloudabi_sys_file_stat_put(_: lookup, _: *const u8, _: usize, _: *const filestat, _: fsflags) -> errno;
-  fn cloudabi_sys_file_symlink(_: *const u8, _: usize, _: fd, _: *const u8, _: usize) -> errno;
-  fn cloudabi_sys_file_unlink(_: fd, _: *const u8, _: usize, _: ulflags) -> errno;
-  fn cloudabi_sys_lock_unlock(_: *mut lock, _: scope) -> errno;
-  fn cloudabi_sys_mem_advise(_: *mut (), _: usize, _: advice) -> errno;
-  fn cloudabi_sys_mem_map(_: *mut (), _: usize, _: mprot, _: mflags, _: fd, _: filesize, _: *mut *mut ()) -> errno;
-  fn cloudabi_sys_mem_protect(_: *mut (), _: usize, _: mprot) -> errno;
-  fn cloudabi_sys_mem_sync(_: *mut (), _: usize, _: msflags) -> errno;
-  fn cloudabi_sys_mem_unmap(_: *mut (), _: usize) -> errno;
-  fn cloudabi_sys_poll(_: *const subscription, _: *mut event, _: usize, _: *mut usize) -> errno;
-  fn cloudabi_sys_proc_exec(_: fd, _: *const (), _: usize, _: *const fd, _: usize) -> errno;
-  fn cloudabi_sys_proc_exit(_: exitcode) -> !;
-  fn cloudabi_sys_proc_fork(_: *mut fd, _: *mut tid) -> errno;
-  fn cloudabi_sys_proc_raise(_: signal) -> errno;
-  fn cloudabi_sys_random_get(_: *mut (), _: usize) -> errno;
-  fn cloudabi_sys_sock_recv(_: fd, _: *const recv_in, _: *mut recv_out) -> errno;
-  fn cloudabi_sys_sock_send(_: fd, _: *const send_in, _: *mut send_out) -> errno;
-  fn cloudabi_sys_sock_shutdown(_: fd, _: sdflags) -> errno;
-  fn cloudabi_sys_thread_create(_: *mut threadattr, _: *mut tid) -> errno;
-  fn cloudabi_sys_thread_exit(_: *mut lock, _: scope) -> !;
-  fn cloudabi_sys_thread_yield() -> errno;
-}
-
-/// Obtains the resolution of a clock.
-///
-/// ## Parameters
-///
-/// **clock_id**:
-/// The clock for which the resolution needs to be
-/// returned.
-///
-/// **resolution**:
-/// The resolution of the clock.
-#[inline]
-pub unsafe fn clock_res_get(clock_id_: clockid, resolution_: *mut timestamp) -> errno {
-  cloudabi_sys_clock_res_get(clock_id_, resolution_)
-}
-
-/// Obtains the time value of a clock.
-///
-/// ## Parameters
-///
-/// **clock_id**:
-/// The clock for which the time needs to be
-/// returned.
-///
-/// **precision**:
-/// The maximum lag (exclusive) that the returned
-/// time value may have, compared to its actual
-/// value.
-///
-/// **time**:
-/// The time value of the clock.
-#[inline]
-pub unsafe fn clock_time_get(clock_id_: clockid, precision_: timestamp, time_: *mut timestamp) -> errno {
-  cloudabi_sys_clock_time_get(clock_id_, precision_, time_)
-}
-
-/// Wakes up threads waiting on a userspace condition variable.
-///
-/// If an invocation of this system call causes all waiting
-/// threads to be woken up, the value of the condition variable
-/// is set to [`CONDVAR_HAS_NO_WAITERS`](constant.CONDVAR_HAS_NO_WAITERS.html). As long as the condition
-/// variable is set to this value, it is not needed to invoke this
-/// system call.
-///
-/// ## Parameters
-///
-/// **condvar**:
-/// The userspace condition variable that has
-/// waiting threads.
-///
-/// **scope**:
-/// Whether the condition variable is stored in
-/// private or shared memory.
-///
-/// **nwaiters**:
-/// The number of threads that need to be woken
-/// up. If it exceeds the number of waiting
-/// threads, all threads are woken up.
-#[inline]
-pub unsafe fn condvar_signal(condvar_: *mut condvar, scope_: scope, nwaiters_: nthreads) -> errno {
-  cloudabi_sys_condvar_signal(condvar_, scope_, nwaiters_)
-}
-
-/// Closes a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor that needs to be closed.
-#[inline]
-pub unsafe fn fd_close(fd_: fd) -> errno {
-  cloudabi_sys_fd_close(fd_)
-}
-
-/// Creates a file descriptor.
-///
-/// ## Parameters
-///
-/// **type**:
-/// Possible values:
-///
-///   - [`SHARED_MEMORY`](enum.filetype.html#variant.SHARED_MEMORY):
-///     Creates an anonymous shared memory
-///     object.
-///
-/// **fd**:
-/// The file descriptor that has been created.
-#[inline]
-pub unsafe fn fd_create1(type_: filetype, fd_: *mut fd) -> errno {
-  cloudabi_sys_fd_create1(type_, fd_)
-}
-
-/// Creates a pair of file descriptors.
-///
-/// ## Parameters
-///
-/// **type**:
-/// Possible values:
-///
-///   - [`SOCKET_DGRAM`](enum.filetype.html#variant.SOCKET_DGRAM):
-///     Creates a UNIX datagram socket pair.
-///   - [`SOCKET_STREAM`](enum.filetype.html#variant.SOCKET_STREAM):
-///     Creates a UNIX byte-stream socket
-///     pair.
-///
-/// **fd1**:
-/// The first file descriptor of the pair.
-///
-/// **fd2**:
-/// The second file descriptor of the pair.
-#[inline]
-pub unsafe fn fd_create2(type_: filetype, fd1_: *mut fd, fd2_: *mut fd) -> errno {
-  cloudabi_sys_fd_create2(type_, fd1_, fd2_)
-}
-
-/// Synchronizes the data of a file to disk.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor of the file whose data
-/// needs to be synchronized to disk.
-#[inline]
-pub unsafe fn fd_datasync(fd_: fd) -> errno {
-  cloudabi_sys_fd_datasync(fd_)
-}
-
-/// Duplicates a file descriptor.
-///
-/// ## Parameters
-///
-/// **from**:
-/// The file descriptor that needs to be
-/// duplicated.
-///
-/// **fd**:
-/// The new file descriptor.
-#[inline]
-pub unsafe fn fd_dup(from_: fd, fd_: *mut fd) -> errno {
-  cloudabi_sys_fd_dup(from_, fd_)
-}
-
-/// Reads from a file descriptor, without using and updating the
-/// file descriptor's offset.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor from which data should be
-/// read.
-///
-/// **iovs**:
-/// List of scatter/gather vectors where data
-/// should be stored.
-///
-/// **offset**:
-/// The offset within the file at which reading
-/// should start.
-///
-/// **nread**:
-/// The number of bytes read.
-#[inline]
-pub unsafe fn fd_pread(fd_: fd, iovs_: &[iovec], offset_: filesize, nread_: *mut usize) -> errno {
-  cloudabi_sys_fd_pread(fd_, iovs_.as_ptr(), iovs_.len(), offset_, nread_)
-}
-
-/// Writes to a file descriptor, without using and updating the
-/// file descriptor's offset.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor to which data should be
-/// written.
-///
-/// **iovs**:
-/// List of scatter/gather vectors where data
-/// should be retrieved.
-///
-/// **offset**:
-/// The offset within the file at which writing
-/// should start.
-///
-/// **nwritten**:
-/// The number of bytes written.
-#[inline]
-pub unsafe fn fd_pwrite(fd_: fd, iovs_: &[ciovec], offset_: filesize, nwritten_: *mut usize) -> errno {
-  cloudabi_sys_fd_pwrite(fd_, iovs_.as_ptr(), iovs_.len(), offset_, nwritten_)
-}
-
-/// Reads from a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor from which data should be
-/// read.
-///
-/// **iovs**:
-/// List of scatter/gather vectors where data
-/// should be stored.
-///
-/// **nread**:
-/// The number of bytes read.
-#[inline]
-pub unsafe fn fd_read(fd_: fd, iovs_: &[iovec], nread_: *mut usize) -> errno {
-  cloudabi_sys_fd_read(fd_, iovs_.as_ptr(), iovs_.len(), nread_)
-}
-
-/// Atomically replaces a file descriptor by a copy of another
-/// file descriptor.
-///
-/// Due to the strong focus on thread safety, this environment
-/// does not provide a mechanism to duplicate a file descriptor to
-/// an arbitrary number, like dup2(). This would be prone to race
-/// conditions, as an actual file descriptor with the same number
-/// could be allocated by a different thread at the same time.
-///
-/// This system call provides a way to atomically replace file
-/// descriptors, which would disappear if dup2() were to be
-/// removed entirely.
-///
-/// ## Parameters
-///
-/// **from**:
-/// The file descriptor that needs to be copied.
-///
-/// **to**:
-/// The file descriptor that needs to be
-/// overwritten.
-#[inline]
-pub unsafe fn fd_replace(from_: fd, to_: fd) -> errno {
-  cloudabi_sys_fd_replace(from_, to_)
-}
-
-/// Moves the offset of the file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor whose offset has to be
-/// moved.
-///
-/// **offset**:
-/// The number of bytes to move.
-///
-/// **whence**:
-/// Relative to which position the move should
-/// take place.
-///
-/// **newoffset**:
-/// The new offset of the file descriptor,
-/// relative to the start of the file.
-#[inline]
-pub unsafe fn fd_seek(fd_: fd, offset_: filedelta, whence_: whence, newoffset_: *mut filesize) -> errno {
-  cloudabi_sys_fd_seek(fd_, offset_, whence_, newoffset_)
-}
-
-/// Gets attributes of a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor whose attributes have to
-/// be obtained.
-///
-/// **buf**:
-/// The buffer where the file descriptor's
-/// attributes are stored.
-#[inline]
-pub unsafe fn fd_stat_get(fd_: fd, buf_: *mut fdstat) -> errno {
-  cloudabi_sys_fd_stat_get(fd_, buf_)
-}
-
-/// Adjusts attributes of a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor whose attributes have to
-/// be adjusted.
-///
-/// **buf**:
-/// The desired values of the file descriptor
-/// attributes that are adjusted.
-///
-/// **flags**:
-/// A bitmask indicating which attributes have to
-/// be adjusted.
-#[inline]
-pub unsafe fn fd_stat_put(fd_: fd, buf_: *const fdstat, flags_: fdsflags) -> errno {
-  cloudabi_sys_fd_stat_put(fd_, buf_, flags_)
-}
-
-/// Synchronizes the data and metadata of a file to disk.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor of the file whose data
-/// and metadata needs to be synchronized to disk.
-#[inline]
-pub unsafe fn fd_sync(fd_: fd) -> errno {
-  cloudabi_sys_fd_sync(fd_)
-}
-
-/// Writes to a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor to which data should be
-/// written.
-///
-/// **iovs**:
-/// List of scatter/gather vectors where data
-/// should be retrieved.
-///
-/// **nwritten**:
-/// The number of bytes written.
-#[inline]
-pub unsafe fn fd_write(fd_: fd, iovs_: &[ciovec], nwritten_: *mut usize) -> errno {
-  cloudabi_sys_fd_write(fd_, iovs_.as_ptr(), iovs_.len(), nwritten_)
-}
-
-/// Provides file advisory information on a file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor for which to provide file
-/// advisory information.
-///
-/// **offset**:
-/// The offset within the file to which the
-/// advisory applies.
-///
-/// **len**:
-/// The length of the region to which the advisory
-/// applies.
-///
-/// **advice**:
-/// The advice.
-#[inline]
-pub unsafe fn file_advise(fd_: fd, offset_: filesize, len_: filesize, advice_: advice) -> errno {
-  cloudabi_sys_file_advise(fd_, offset_, len_, advice_)
-}
-
-/// Forces the allocation of space in a file.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file in which the space should be
-/// allocated.
-///
-/// **offset**:
-/// The offset at which the allocation should
-/// start.
-///
-/// **len**:
-/// The length of the area that is allocated.
-#[inline]
-pub unsafe fn file_allocate(fd_: fd, offset_: filesize, len_: filesize) -> errno {
-  cloudabi_sys_file_allocate(fd_, offset_, len_)
-}
-
-/// Creates a file of a specified type.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the file to be created starts.
-///
-/// **path**:
-/// The path at which the file should be created.
-///
-/// **type**:
-/// Possible values:
-///
-///   - [`DIRECTORY`](enum.filetype.html#variant.DIRECTORY):
-///     Creates a directory.
-#[inline]
-pub unsafe fn file_create(fd_: fd, path_: &[u8], type_: filetype) -> errno {
-  cloudabi_sys_file_create(fd_, path_.as_ptr(), path_.len(), type_)
-}
-
-/// Creates a hard link.
-///
-/// ## Parameters
-///
-/// **fd1**:
-/// The working directory at which the resolution
-/// of the source path starts.
-///
-/// **path1**:
-/// The source path of the file that should be
-/// hard linked.
-///
-/// **fd2**:
-/// The working directory at which the resolution
-/// of the destination path starts.
-///
-/// **path2**:
-/// The destination path at which the hard link
-/// should be created.
-#[inline]
-pub unsafe fn file_link(fd1_: lookup, path1_: &[u8], fd2_: fd, path2_: &[u8]) -> errno {
-  cloudabi_sys_file_link(fd1_, path1_.as_ptr(), path1_.len(), fd2_, path2_.as_ptr(), path2_.len())
-}
-
-/// Opens a file.
-///
-/// ## Parameters
-///
-/// **dirfd**:
-/// The working directory at which the resolution
-/// of the file to be opened starts.
-///
-/// **path**:
-/// The path of the file that should be opened.
-///
-/// **oflags**:
-/// The method at which the file should be opened.
-///
-/// **fds**:
-/// [`fdstat.fs_rights_base`](struct.fdstat.html#structfield.fs_rights_base) and
-/// [`fdstat.fs_rights_inheriting`](struct.fdstat.html#structfield.fs_rights_inheriting) specify the
-/// initial rights of the newly created file
-/// descriptor. The operating system is allowed to
-/// return a file descriptor with fewer rights
-/// than specified, if and only if those rights do
-/// not apply to the type of file being opened.
-///
-/// [`fdstat.fs_flags`](struct.fdstat.html#structfield.fs_flags) specifies the initial flags
-/// of the file descriptor.
-///
-/// [`fdstat.fs_filetype`](struct.fdstat.html#structfield.fs_filetype) is ignored.
-///
-/// **fd**:
-/// The file descriptor of the file that has been
-/// opened.
-#[inline]
-pub unsafe fn file_open(dirfd_: lookup, path_: &[u8], oflags_: oflags, fds_: *const fdstat, fd_: *mut fd) -> errno {
-  cloudabi_sys_file_open(dirfd_, path_.as_ptr(), path_.len(), oflags_, fds_, fd_)
-}
-
-/// Reads directory entries from a directory.
-///
-/// When successful, the contents of the output buffer consist of
-/// a sequence of directory entries. Each directory entry consists
-/// of a [`dirent`](struct.dirent.html) object, followed by [`dirent.d_namlen`](struct.dirent.html#structfield.d_namlen) bytes
-/// holding the name of the directory entry.
-///
-/// This system call fills the output buffer as much as possible,
-/// potentially truncating the last directory entry. This allows
-/// the caller to grow its read buffer size in case it's too small
-/// to fit a single large directory entry, or skip the oversized
-/// directory entry.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The directory from which to read the directory
-/// entries.
-///
-/// **buf**:
-/// The buffer where directory entries are stored.
-///
-/// **cookie**:
-/// The location within the directory to start
-/// reading.
-///
-/// **bufused**:
-/// The number of bytes stored in the read buffer.
-/// If less than the size of the read buffer, the
-/// end of the directory has been reached.
-#[inline]
-pub unsafe fn file_readdir(fd_: fd, buf_: &mut [u8], cookie_: dircookie, bufused_: *mut usize) -> errno {
-  cloudabi_sys_file_readdir(fd_, buf_.as_mut_ptr() as *mut (), buf_.len(), cookie_, bufused_)
-}
-
-/// Reads the contents of a symbolic link.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the path of the symbolic starts.
-///
-/// **path**:
-/// The path of the symbolic link whose contents
-/// should be read.
-///
-/// **buf**:
-/// The buffer where the contents of the symbolic
-/// link should be stored.
-///
-/// **bufused**:
-/// The number of bytes placed in the buffer.
-#[inline]
-pub unsafe fn file_readlink(fd_: fd, path_: &[u8], buf_: &mut [u8], bufused_: *mut usize) -> errno {
-  cloudabi_sys_file_readlink(fd_, path_.as_ptr(), path_.len(), buf_.as_mut_ptr(), buf_.len(), bufused_)
-}
-
-/// Renames a file.
-///
-/// ## Parameters
-///
-/// **fd1**:
-/// The working directory at which the resolution
-/// of the source path starts.
-///
-/// **path1**:
-/// The source path of the file that should be
-/// renamed.
-///
-/// **fd2**:
-/// The working directory at which the resolution
-/// of the destination path starts.
-///
-/// **path2**:
-/// The destination path to which the file should
-/// be renamed.
-#[inline]
-pub unsafe fn file_rename(fd1_: fd, path1_: &[u8], fd2_: fd, path2_: &[u8]) -> errno {
-  cloudabi_sys_file_rename(fd1_, path1_.as_ptr(), path1_.len(), fd2_, path2_.as_ptr(), path2_.len())
-}
-
-/// Gets attributes of a file by file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor whose attributes have to
-/// be obtained.
-///
-/// **buf**:
-/// The buffer where the file's attributes are
-/// stored.
-#[inline]
-pub unsafe fn file_stat_fget(fd_: fd, buf_: *mut filestat) -> errno {
-  cloudabi_sys_file_stat_fget(fd_, buf_)
-}
-
-/// Adjusts attributes of a file by file descriptor.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The file descriptor whose attributes have to
-/// be adjusted.
-///
-/// **buf**:
-/// The desired values of the file attributes that
-/// are adjusted.
-///
-/// **flags**:
-/// A bitmask indicating which attributes have to
-/// be adjusted.
-#[inline]
-pub unsafe fn file_stat_fput(fd_: fd, buf_: *const filestat, flags_: fsflags) -> errno {
-  cloudabi_sys_file_stat_fput(fd_, buf_, flags_)
-}
-
-/// Gets attributes of a file by path.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the path whose attributes have to be
-/// obtained starts.
-///
-/// **path**:
-/// The path of the file whose attributes have to
-/// be obtained.
-///
-/// **buf**:
-/// The buffer where the file's attributes are
-/// stored.
-#[inline]
-pub unsafe fn file_stat_get(fd_: lookup, path_: &[u8], buf_: *mut filestat) -> errno {
-  cloudabi_sys_file_stat_get(fd_, path_.as_ptr(), path_.len(), buf_)
-}
-
-/// Adjusts attributes of a file by path.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the path whose attributes have to be
-/// adjusted starts.
-///
-/// **path**:
-/// The path of the file whose attributes have to
-/// be adjusted.
-///
-/// **buf**:
-/// The desired values of the file attributes that
-/// are adjusted.
-///
-/// **flags**:
-/// A bitmask indicating which attributes have to
-/// be adjusted.
-#[inline]
-pub unsafe fn file_stat_put(fd_: lookup, path_: &[u8], buf_: *const filestat, flags_: fsflags) -> errno {
-  cloudabi_sys_file_stat_put(fd_, path_.as_ptr(), path_.len(), buf_, flags_)
-}
-
-/// Creates a symbolic link.
-///
-/// ## Parameters
-///
-/// **path1**:
-/// The contents of the symbolic link.
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the destination path starts.
-///
-/// **path2**:
-/// The destination path at which the symbolic
-/// link should be created.
-#[inline]
-pub unsafe fn file_symlink(path1_: &[u8], fd_: fd, path2_: &[u8]) -> errno {
-  cloudabi_sys_file_symlink(path1_.as_ptr(), path1_.len(), fd_, path2_.as_ptr(), path2_.len())
-}
-
-/// Unlinks a file, or removes a directory.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// The working directory at which the resolution
-/// of the path starts.
-///
-/// **path**:
-/// The path that needs to be unlinked or removed.
-///
-/// **flags**:
-/// Possible values:
-///
-///   - [`REMOVEDIR`](struct.ulflags.html#associatedconstant.REMOVEDIR):
-///     If set, attempt to remove a directory.
-///     Otherwise, unlink a file.
-#[inline]
-pub unsafe fn file_unlink(fd_: fd, path_: &[u8], flags_: ulflags) -> errno {
-  cloudabi_sys_file_unlink(fd_, path_.as_ptr(), path_.len(), flags_)
-}
-
-/// Unlocks a write-locked userspace lock.
-///
-/// If a userspace lock is unlocked while having its
-/// [`LOCK_KERNEL_MANAGED`](constant.LOCK_KERNEL_MANAGED.html) flag set, the lock cannot be unlocked in
-/// userspace directly. This system call needs to be performed
-/// instead, so that any waiting threads can be woken up.
-///
-/// To prevent spurious invocations of this system call, the lock
-/// must be locked for writing. This prevents other threads from
-/// acquiring additional read locks while the system call is in
-/// progress. If the lock is acquired for reading, it must first
-/// be upgraded to a write lock.
-///
-/// ## Parameters
-///
-/// **lock**:
-/// The userspace lock that is locked for writing
-/// by the calling thread.
-///
-/// **scope**:
-/// Whether the lock is stored in private or
-/// shared memory.
-#[inline]
-pub unsafe fn lock_unlock(lock_: *mut lock, scope_: scope) -> errno {
-  cloudabi_sys_lock_unlock(lock_, scope_)
-}
-
-/// Provides memory advisory information on a region of memory.
-///
-/// ## Parameters
-///
-/// **mapping**:
-/// The pages for which to provide memory advisory
-/// information.
-///
-/// **advice**:
-/// The advice.
-#[inline]
-pub unsafe fn mem_advise(mapping_: &mut [u8], advice_: advice) -> errno {
-  cloudabi_sys_mem_advise(mapping_.as_mut_ptr() as *mut (), mapping_.len(), advice_)
-}
-
-/// Creates a memory mapping, making the contents of a file
-/// accessible through memory.
-///
-/// ## Parameters
-///
-/// **addr**:
-/// If [`FIXED`](struct.mflags.html#associatedconstant.FIXED) is set, specifies to which
-/// address the file region is mapped. Otherwise,
-/// the mapping is performed at an unused
-/// location.
-///
-/// **len**:
-/// The length of the memory mapping to be
-/// created.
-///
-/// **prot**:
-/// Initial memory protection options for the
-/// memory mapping.
-///
-/// **flags**:
-/// Memory mapping flags.
-///
-/// **fd**:
-/// If [`ANON`](struct.mflags.html#associatedconstant.ANON) is set, this argument must be
-/// [`MAP_ANON_FD`](constant.MAP_ANON_FD.html). Otherwise, this argument
-/// specifies the file whose contents need to be
-/// mapped.
-///
-/// **off**:
-/// If [`ANON`](struct.mflags.html#associatedconstant.ANON) is set, this argument must be
-/// zero. Otherwise, this argument specifies the
-/// offset within the file at which the mapping
-/// starts.
-///
-/// **mem**:
-/// The starting address of the memory mapping.
-#[inline]
-pub unsafe fn mem_map(addr_: *mut (), len_: usize, prot_: mprot, flags_: mflags, fd_: fd, off_: filesize, mem_: *mut *mut ()) -> errno {
-  cloudabi_sys_mem_map(addr_, len_, prot_, flags_, fd_, off_, mem_)
-}
-
-/// Change the protection of a memory mapping.
-///
-/// ## Parameters
-///
-/// **mapping**:
-/// The pages that need their protection changed.
-///
-/// **prot**:
-/// New protection options.
-#[inline]
-pub unsafe fn mem_protect(mapping_: &mut [u8], prot_: mprot) -> errno {
-  cloudabi_sys_mem_protect(mapping_.as_mut_ptr() as *mut (), mapping_.len(), prot_)
-}
-
-/// Synchronize a region of memory with its physical storage.
-///
-/// ## Parameters
-///
-/// **mapping**:
-/// The pages that need to be synchronized.
-///
-/// **flags**:
-/// The method of synchronization.
-#[inline]
-pub unsafe fn mem_sync(mapping_: &mut [u8], flags_: msflags) -> errno {
-  cloudabi_sys_mem_sync(mapping_.as_mut_ptr() as *mut (), mapping_.len(), flags_)
-}
-
-/// Unmaps a region of memory.
-///
-/// ## Parameters
-///
-/// **mapping**:
-/// The pages that needs to be unmapped.
-#[inline]
-pub unsafe fn mem_unmap(mapping_: &mut [u8]) -> errno {
-  cloudabi_sys_mem_unmap(mapping_.as_mut_ptr() as *mut (), mapping_.len())
-}
-
-/// Concurrently polls for the occurrence of a set of events.
-///
-/// ## Parameters
-///
-/// **in**:
-/// The events to which to subscribe.
-///
-/// **out**:
-/// The events that have occurred.
-///
-/// **nsubscriptions**:
-/// Both the number of subscriptions and events.
-///
-/// **nevents**:
-/// The number of events stored.
-#[inline]
-pub unsafe fn poll(in_: *const subscription, out_: *mut event, nsubscriptions_: usize, nevents_: *mut usize) -> errno {
-  cloudabi_sys_poll(in_, out_, nsubscriptions_, nevents_)
-}
-
-/// Replaces the process by a new executable.
-///
-/// Process execution in CloudABI differs from POSIX in two ways:
-/// handling of arguments and inheritance of file descriptors.
-///
-/// CloudABI does not use string command line arguments. Instead,
-/// a buffer with binary data is copied into the address space of
-/// the new executable. The kernel does not enforce any specific
-/// structure to this data, although CloudABI's C library uses it
-/// to store a tree structure that is semantically identical to
-/// YAML.
-///
-/// Due to the strong focus on thread safety, file descriptors
-/// aren't inherited through close-on-exec flags. An explicit
-/// list of file descriptors that need to be retained needs to be
-/// provided. After execution, file descriptors are placed in the
-/// order in which they are stored in the array. This not only
-/// makes the execution process deterministic. It also prevents
-/// potential information disclosures about the layout of the
-/// original process.
-///
-/// ## Parameters
-///
-/// **fd**:
-/// A file descriptor of the new executable.
-///
-/// **data**:
-/// Binary argument data that is passed on to the
-/// new executable.
-///
-/// **fds**:
-/// The layout of the file descriptor table after
-/// execution.
-#[inline]
-pub unsafe fn proc_exec(fd_: fd, data_: &[u8], fds_: &[fd]) -> errno {
-  cloudabi_sys_proc_exec(fd_, data_.as_ptr() as *const (), data_.len(), fds_.as_ptr(), fds_.len())
-}
-
-/// Terminates the process normally.
-///
-/// ## Parameters
-///
-/// **rval**:
-/// The exit code returned by the process. The
-/// exit code can be obtained by other processes
-/// through [`event.union.proc_terminate.exitcode`](struct.event_proc_terminate.html#structfield.exitcode).
-#[inline]
-pub unsafe fn proc_exit(rval_: exitcode) -> ! {
-  cloudabi_sys_proc_exit(rval_)
-}
-
-/// Forks the process of the calling thread.
-///
-/// After forking, a new process shall be created, having only a
-/// copy of the calling thread. The parent process will obtain a
-/// process descriptor. When closed, the child process is
-/// automatically signaled with [`KILL`](enum.signal.html#variant.KILL).
-///
-/// ## Parameters
-///
-/// **fd**:
-/// In the parent process: the file descriptor
-/// number of the process descriptor.
-///
-/// In the child process: [`PROCESS_CHILD`](constant.PROCESS_CHILD.html).
-///
-/// **tid**:
-/// In the parent process: undefined.
-///
-/// In the child process: the thread ID of the
-/// initial thread of the child process.
-#[inline]
-pub unsafe fn proc_fork(fd_: *mut fd, tid_: *mut tid) -> errno {
-  cloudabi_sys_proc_fork(fd_, tid_)
-}
-
-/// Sends a signal to the process of the calling thread.
-///
-/// ## Parameters
-///
-/// **sig**:
-/// The signal condition that should be triggered.
-/// If the signal causes the process to terminate,
-/// its condition can be obtained by other
-/// processes through
-/// [`event.union.proc_terminate.signal`](struct.event_proc_terminate.html#structfield.signal).
-#[inline]
-pub unsafe fn proc_raise(sig_: signal) -> errno {
-  cloudabi_sys_proc_raise(sig_)
-}
-
-/// Obtains random data from the kernel random number generator.
-///
-/// As this interface is not guaranteed to be fast, it is advised
-/// that the random data obtained through this system call is used
-/// as the seed for a userspace pseudo-random number generator.
-///
-/// ## Parameters
-///
-/// **buf**:
-/// The buffer that needs to be filled with random
-/// data.
-#[inline]
-pub unsafe fn random_get(buf_: &mut [u8]) -> errno {
-  cloudabi_sys_random_get(buf_.as_mut_ptr() as *mut (), buf_.len())
-}
-
-/// Receives a message on a socket.
-///
-/// ## Parameters
-///
-/// **sock**:
-/// The socket on which a message should be
-/// received.
-///
-/// **in**:
-/// Input parameters.
-///
-/// **out**:
-/// Output parameters.
-#[inline]
-pub unsafe fn sock_recv(sock_: fd, in_: *const recv_in, out_: *mut recv_out) -> errno {
-  cloudabi_sys_sock_recv(sock_, in_, out_)
-}
-
-/// Sends a message on a socket.
-///
-/// ## Parameters
-///
-/// **sock**:
-/// The socket on which a message should be sent.
-///
-/// **in**:
-/// Input parameters.
-///
-/// **out**:
-/// Output parameters.
-#[inline]
-pub unsafe fn sock_send(sock_: fd, in_: *const send_in, out_: *mut send_out) -> errno {
-  cloudabi_sys_sock_send(sock_, in_, out_)
-}
-
-/// Shuts down socket send and receive channels.
-///
-/// ## Parameters
-///
-/// **sock**:
-/// The socket that needs its channels shut down.
-///
-/// **how**:
-/// Which channels on the socket need to be shut
-/// down.
-#[inline]
-pub unsafe fn sock_shutdown(sock_: fd, how_: sdflags) -> errno {
-  cloudabi_sys_sock_shutdown(sock_, how_)
-}
-
-/// Creates a new thread within the current process.
-///
-/// ## Parameters
-///
-/// **attr**:
-/// The desired attributes of the new thread.
-///
-/// **tid**:
-/// The thread ID of the new thread.
-#[inline]
-pub unsafe fn thread_create(attr_: *mut threadattr, tid_: *mut tid) -> errno {
-  cloudabi_sys_thread_create(attr_, tid_)
-}
-
-/// Terminates the calling thread.
-///
-/// This system call can also unlock a single userspace lock
-/// after termination, which can be used to implement thread
-/// joining.
-///
-/// ## Parameters
-///
-/// **lock**:
-/// Userspace lock that is locked for writing by
-/// the calling thread.
-///
-/// **scope**:
-/// Whether the lock is stored in private or
-/// shared memory.
-#[inline]
-pub unsafe fn thread_exit(lock_: *mut lock, scope_: scope) -> ! {
-  cloudabi_sys_thread_exit(lock_, scope_)
-}
-
-/// Temporarily yields execution of the calling thread.
-#[inline]
-pub unsafe fn thread_yield() -> errno {
-  cloudabi_sys_thread_yield()
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-bforest/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-bforest/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-bforest/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-bforest/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d0317b98ce3e0ec774584aba422be0a19c1f5ce8b309fda2f4c3d5889fce3e12","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"af367c67340fa7f6fb9a35b0aa637dcf303957f7ae7427a5f4f6356801c8bb04","src/lib.rs":"23a5c42d477197a947122e662068e681bb9ed31041c0b668c3267c3fce15d39e","src/map.rs":"a3b7f64cae7ec9c2a8038def315bcf90e8751552b1bc1c20b62fbb8c763866c4","src/node.rs":"28f7edd979f7b9712bc4ab30b0d2a1b8ad5485a4b1e8c09f3dcaf501b9b5ccd1","src/path.rs":"a86ee1c882c173e8af96fd53a416a0fb485dd3f045ac590ef313a9d9ecf90f56","src/pool.rs":"f6337b5417f7772e6878a160c1a40629199ff09997bdff18eb2a0ba770158600","src/set.rs":"281eb8b5ead1ffd395946464d881f9bb0e7fb61092aed701d72d2314b5f80994"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"b0ed8fc54833fd48846644e3f59fbead46e7a2ff456194e03d04ce8b95404522","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"af367c67340fa7f6fb9a35b0aa637dcf303957f7ae7427a5f4f6356801c8bb04","src/lib.rs":"4204f6bd3dd43dc307a57dc1b3543fc3d31feb4c5c8e64035578a45d88c725b3","src/map.rs":"a3b7f64cae7ec9c2a8038def315bcf90e8751552b1bc1c20b62fbb8c763866c4","src/node.rs":"28f7edd979f7b9712bc4ab30b0d2a1b8ad5485a4b1e8c09f3dcaf501b9b5ccd1","src/path.rs":"a86ee1c882c173e8af96fd53a416a0fb485dd3f045ac590ef313a9d9ecf90f56","src/pool.rs":"f6337b5417f7772e6878a160c1a40629199ff09997bdff18eb2a0ba770158600","src/set.rs":"281eb8b5ead1ffd395946464d881f9bb0e7fb61092aed701d72d2314b5f80994"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-bforest/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-bforest/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-bforest/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-bforest/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bforest"
-version = "0.67.0"
+version = "0.68.0"
 description = "A forest of B+-trees"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bforest"
@@ -12,7 +12,7 @@
 edition = "2018"
 
 [dependencies]
-cranelift-entity = { path = "../entity", version = "0.67.0", default-features = false }
+cranelift-entity = { path = "../entity", version = "0.68.0", default-features = false }
 
 [badges]
 maintenance = { status = "experimental" }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-bforest/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-bforest/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-bforest/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-bforest/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -23,8 +23,7 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
+        clippy::map_unwrap_or,
         clippy::print_stdout,
         clippy::unicode_not_nfc,
         clippy::use_self
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-codegen/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"e7e6963b0f0ca752e72830bc895a2b5556c3c44b4144ac9670047eec448a931f","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"e5127227a7db4a8aa92fa6613ed71801025790e696bb41b0323fb7f3c6f7495a","build.rs":"afe67e345d21f9a137ecad473bb595a8b4983d5d435ca0505c91021954c215a7","src/abi.rs":"8922d75a807798945c64ee135f7f22c58e97d8412c6d5b6bf6c4e75c6823d308","src/binemit/memorysink.rs":"6eb4af661c11461a85612729553eec8581984dd7ce5a3cb905dc3667a49ab954","src/binemit/mod.rs":"4fbd7566c56a02a9faa18a02a7f3ba97297a42bba62c8c60a291a160760abfad","src/binemit/relaxation.rs":"0547f1a33ea176b281d6f09d1bd7a253dcba895785008e61c114861f1a86307f","src/binemit/shrink.rs":"552d64dff3b044bca77f39891d0e39ee619f6ec0669bf9917132c97becea79b0","src/binemit/stack_map.rs":"cae6ef55b748a3700909d26f408c3d244a7dd76c0918b9b04c17127c18dbf8bf","src/bitset.rs":"ff667c19a63a6a9bcf06f99a46b6db839323f5d3d5cc5e7b00f1ab77d331fc77","src/cfg_printer.rs":"a4cd85ecb2c403b29dc3fc6c60ee7f97b6ed602e8ba88ec87accb988d009271e","src/constant_hash.rs":"8f53afb38891fbdab8553c7a89e61f0ce30947a22fb24ae84523c9a1ab025c3f","src/context.rs":"e3e1644565c1a6b6dd21daae36f9b22e9f69851fbb3c86e33b1756bb9a2e020e","src/cursor.rs":"eaa0e4ea65bec30aa79e2fb62e89c713b1adec6eeddd5592237d7fcce47c5fa7","src/dbg.rs":"1898d94cff0975815eb348651702e95c8f2f63886501d3b7043ee75668480472","src/dce.rs":"b98545dbf5c8d0c4a33b2ec6cd905d6371fe843481ad608ff59b4a009fc9be19","src/divconst_magic_numbers.rs":"e7f8f46f3a25ed7155890e9d76c10f5dde9dc5bbcebb623c8166fa415abdd959","src/dominator_tree.rs":"b3a5c7837150390a78ade90807965dfcb8768a7e3ae9ee02f2e4a1ad8f3bafa9","src/flowgraph.rs":"71490e2f7a1ea905758a258b2bebe77f125302f446f9839dd60003fdafaef5fe","src/fx.rs":"8a5d07487906d8316a179e826fcd817a92a4860686256a6fd9d78ba47c63f330","src/inst_predicates.rs":"ba71bba10250fada4f04bcd6690583b077061bab988c4d6609c41e8af7de5e98","src/ir/atomic_rmw_op.rs":"44311956feebef2ec01a0156e690a0d09f66b616e401d54a5fc5c9769c448be5","src/ir/builder.rs":"3425957b118a0c40847ef7f473543baef5a24f0c7d8af198955180c8f297ee5a","src/ir/constant.rs":"9c42014b7182a89bc2387e13d3956bbbd98025f32a3abeb5d253d2ba56ad279c","src/ir/dfg.rs":"e803858c6cef60cec09a82d686a73715d0eb142ac96742023cd6112dcf87073a","src/ir/entities.rs":"f0b49b9c351b94703d6c878b564e53a30010c142c47effaf603ec4ade784686b","src/ir/extfunc.rs":"d901ee549f2cf980d807481c3dd6c2b89db241044d465492146bf44db05e9f86","src/ir/extname.rs":"977b2e380094e99cfdd080112bda709ca61a6d942e1e4c2015d39eaf3ea80f4c","src/ir/function.rs":"3034e03ac2e6bcf300b91c9df03e144550ff6c91ef76b105c48ccbc7a752401b","src/ir/globalvalue.rs":"2f3a54cc2ade91439536b02c46ce790c3634a386a4cc4d27d7da7ad929b8bb90","src/ir/heap.rs":"a59d3e5901412b53c0b53a8cdf10765ff5921de9c410ae9acea226c89827df3c","src/ir/immediates.rs":"2f5366e9cd9f7731fdf4d9038bdd3c9976ea6dce38626ede289b37580407da16","src/ir/instructions.rs":"a25709234ce737a776060224cc10f61e0fc9b9ce51a020af7d1c5acb127658e4","src/ir/jumptable.rs":"184fa640957e8b0e451dc594e4b348f9aff5fb5b54ab3d856ab19df25f4f3322","src/ir/layout.rs":"2956643a822e67a0c1196f8d3c81af11d0c0122b2d97427ce3ed0c57bb633cbf","src/ir/libcall.rs":"7c9255bdef9a16937d817a3bfd542be4c2734eea3c8b8a870ff411eac2efaad8","src/ir/memflags.rs":"dbcf3798ab66dc764b73fb7f139a621c54cc6bcc683f1f70a33ed7e8c3486bfd","src/ir/mod.rs":"14cf95dae76a6192c755ed74837c3a36d92827ccdbe2e73f805abea29fc723d8","src/ir/progpoint.rs":"a985a7fccde1e985ca24bf2344f16faa4cda7cffb30cb56bf27fabbb5727bc62","src/ir/sourceloc.rs":"67c66adace734645ddf311ecb22e975f20756e07c91e10f698a830cfc2cd08aa","src/ir/stackslot.rs":"433b61e05263f40c022f73b0ab1141e3e45b348a0309ca02546e6450b2957792","src/ir/table.rs":"dcc3b663a989b2b084402b08dc9a0e928dbd052e194a46a1886cc6f0cf1a5f2c","src/ir/trapcode.rs":"7948d0c387f75695c5d1e03c2ea6808954f0e658ba3cbd636fbbbbbd9a623561","src/ir/types.rs":"dfd9470aa4325adc252eb7ebb2951a5b98d22d0dc31be482419f5cbbb74bf86d","src/ir/valueloc.rs":"628f292ee6b8375e07f360edaf3609b522fd4d7bea131fb8ad3cab237927e7ab","src/isa/aarch64/abi.rs":"88684c74cae823f43f696f44d92325b7ef7b1dd7dbaf98e41ad95ec5b2daeffa","src/isa/aarch64/inst/args.rs":"531232293e355312fb9aff23aa0be1b1168f5456345d3f1958ca7eccd58ac3d8","src/isa/aarch64/inst/emit.rs":"2d736168fad643aea7801c6c7e2593ac7519ec999cd3dcfc76d5f1a4f1b1915b","src/isa/aarch64/inst/emit_tests.rs":"43eb00924a9523d8d2a1be36adfab8b2e7c5c47b2445e819251bb785a40662fd","src/isa/aarch64/inst/imms.rs":"c99980c31bacf5454f9e299e9e351fdddd71b0ec5106c282b8504ee7462777f5","src/isa/aarch64/inst/mod.rs":"4b60b097644401f7095285be6a1f353d3696ce3dc767d5b59d042678adde58a5","src/isa/aarch64/inst/regs.rs":"2e3f52d48b5963a85a275823ee1fd8bc5debf8ee310c4e8cddc77d04f4da45ea","src/isa/aarch64/lower.rs":"c484e991eb583fc6ca21f394bac3374c3d0241911b71c017ab51edae79f3c66f","src/isa/aarch64/lower_inst.rs":"397d5668f5a1eeae41b47f828654366252a4058ace15b2d334b515bf293c89e1","src/isa/aarch64/mod.rs":"8343d3d9f5273ba26146ac3278429b6b0855f1dcbac0de2af62b921a1f46f137","src/isa/arm32/abi.rs":"9be6d9485af2f3e33424ef0edb8fbf641a86787c9ba5c49b09c2d6b6d375c935","src/isa/arm32/inst/args.rs":"3c00b0876c4d57130c2c1ccb56940886f49b09776ab37acbfc1817661e6e9651","src/isa/arm32/inst/emit.rs":"962a16039b9a1540a2e591015f289f59821594576639b20ff0d691cf78630c67","src/isa/arm32/inst/emit_tests.rs":"17dd44aece41b54979de00c6f1e0647af6cdd4254abb8e629797d5611a1a9dea","src/isa/arm32/inst/mod.rs":"e371c2946e1fbaaccd82cbe6958ce6dbbe2e9f3145a5f074cc9ba986ffe6fcee","src/isa/arm32/inst/regs.rs":"0a67309b3f006e3ceec6408e2cf89ed19d9bd303b0ae12eb3a1ed3756b853719","src/isa/arm32/lower.rs":"55fd734fa5e7cb02a9e2e5e6d5935bf7c66c74f10bcfb455094702c38a10e539","src/isa/arm32/lower_inst.rs":"7bfc74171dfb937013f848d8a274ef27c19993f87bc4b0d15195daca58c40a67","src/isa/arm32/mod.rs":"bf6e39e5b324d733eb2ead675c811740db54a3a275437c152d59ab05106f2d75","src/isa/call_conv.rs":"6b9991b4038529be9362fd5feeef679f4fb93140301b353534b78ab8653a68de","src/isa/constraints.rs":"296f473a95146a743ecb73d8d5908675be02e37607efd287f55322549dc25763","src/isa/enc_tables.rs":"382e714f9500afc292c563cb66d4c963d6787e58f197b1db242db7a099c22b9a","src/isa/encoding.rs":"22e21fdb8e15859c69e4f836bb61e1a82cd6838d093ce5fe641a90f16fb65c9e","src/isa/mod.rs":"47c3d25892691d196dc4dab437fc40c039e1a86a9caed7ddf61aeb2b27453dc8","src/isa/registers.rs":"61840d736b1943c3e54ac324db6f7de4f76170800f047dde267dcc9aa2d53e6a","src/isa/riscv/abi.rs":"aa60b701efcef417ee1262a95398343578dc1a30decc8e11044b74d41654ec51","src/isa/riscv/binemit.rs":"264d223da311d4482ebf2f55438b665c67b163058251bc78173c76ba983a31ef","src/isa/riscv/enc_tables.rs":"8491f2082b24c7dedeb7c36cfd913bf9aeaa0a4c8fc754166e9285f4ae002f40","src/isa/riscv/mod.rs":"03ee02848dbc3325a5ef38e66c05be571c380fbe4ca520b4f87c7572db228beb","src/isa/riscv/registers.rs":"6275ec3ef19195d16556c1856cb23095f25a80c31d6b429eaa749d549515a6d3","src/isa/riscv/settings.rs":"e3c063add822ca366e845f5a19d25b56635e828b157a37d29aca5355650e6a66","src/isa/stack.rs":"c391216fb8ee6566e3b14aa4bd83ba85aef2bd23422a9dca2c8c6f47016372e2","src/isa/test_utils.rs":"b579887191371a008e8b58462ea3cd333ddb109382c93e5f5c577a6d0ba7ffbf","src/isa/unwind.rs":"dab61943d7ca89e099604df2a36dba3b8a661fcf7c10dc13e1257ff8f4890bb3","src/isa/unwind/systemv.rs":"f93c36a366470a54ce2af229eea5ef7c299d28b34093dd656f3c5ad87ea94386","src/isa/unwind/winx64.rs":"2b2cbf0803c7967ecb0159ec2c649b45070f9d79a4f2e425ba51e6017b8167a3","src/isa/x64/abi.rs":"b908428e634af7c7402399a43daadb685ccc508c9ae8b94386fc73d947bff919","src/isa/x64/inst/args.rs":"27d9f3edcaf813d35666cba9abbcd3b8948ddeb79aadcaa31cc53b594952b64a","src/isa/x64/inst/emit.rs":"051e545a0e1c593747afe65510fa9be0036f7664051497617ce86df358496d11","src/isa/x64/inst/emit_tests.rs":"669a04ade8044d78cac48a1de741f5eef6530014283ffd9a2747c878653d12e8","src/isa/x64/inst/mod.rs":"c1c5e5307f9030588832ff63c53e478812b4d6a7dc15cec425304a15d21e243f","src/isa/x64/inst/regs.rs":"98fb494b533a6a0e24074cf61f55859d5406459cf239976a3d4fe14af337c456","src/isa/x64/lower.rs":"fbcd4986fe1d3b0e1937fb8a9407f6ae6b9d3a75d8d90925f1e5eb4524f47e67","src/isa/x64/mod.rs":"111fbe24a15ef71f3151f1c0c697f152ceeb2933e3c356e83d7a65f8ad3d16aa","src/isa/x64/settings.rs":"8e318036aab3e2c94edfcbf87137325e5423c1c04e14a3fac9e3cc73cebfa6e1","src/isa/x86/abi.rs":"451397a196eff3d1d4ee55b18b72165d97459509d8c3df14f7d4b54cd7199efd","src/isa/x86/binemit.rs":"fb5051471cd9c860455a0c1d74aec7d919d4c7229ada10222631c3694f9a091f","src/isa/x86/enc_tables.rs":"f8e9453eaa7b69b72a373741150db5c951415e7a3ad5c8f5319edadd1aa5cad0","src/isa/x86/mod.rs":"d22ab9590f1c93ac1b60ef8b264c3dc596a0a3d979914b711378b167fece15be","src/isa/x86/registers.rs":"1abbc1aa24c6fc4c7e610b6e840eab29046b821de08cf57fc05e2c2f665479c0","src/isa/x86/settings.rs":"d3e403db3507830f79bcc976c17340b57052cf1b50877fcf1a79549f2a054458","src/isa/x86/unwind.rs":"2fb77f98437c425b3c6438a9e964501568579ca47f74c1a7eba47ab59c7a5046","src/isa/x86/unwind/systemv.rs":"3b6a2534c2c560433646150549194d2af0b290a389760197fd4789e557b07bb5","src/isa/x86/unwind/winx64.rs":"a932f79615536c0cd313cde0f9bdf982815ba9700cc977526657085b24e59b06","src/iterators.rs":"d399a80bc65b97f7d650978e19086dcc1d280ac96d60628eac3d17eb363b0d71","src/legalizer/boundary.rs":"084e1a0c53b0dfed21e6b5e263a012604bffbf4c8e1cac290d0c8ef2eb8d030c","src/legalizer/call.rs":"be6074c64c1a00e5e81159dd94c8401fef62205b22c15e07e0c56cf922554d00","src/legalizer/globalvalue.rs":"a5d09ee41a04ba991d7f5d2d8d8c30a209748d38501a005e0ea568df2663cbb5","src/legalizer/heap.rs":"a6026d44c9ce31e0a21413c50581985dad1584700fde9dbab0b2cefafa5c9d14","src/legalizer/libcall.rs":"4f187c04acb41696bbb80abf0efc4a24b939205619fc6cc40aa8cff86ae1d84b","src/legalizer/mod.rs":"27f6c0d4d5938e096bbcd1777d6c07da50d0b7e9741559662f71c842bc6a850e","src/legalizer/split.rs":"697f08886dbf35fcc69eccc7b597986a58cc73ca7d3cf5d581fffc658a0dad33","src/legalizer/table.rs":"c36d03525312e3191aba8ee00c26a87c1ea200f9a9a0370f0cc84eeacff71786","src/lib.rs":"d9344914821f20e2553bbd9cbcdb6031c491e7a8252cded5fa55ecfab8f58f3a","src/licm.rs":"75e94228c37a7d32cc9b0d51644439f9b1837768df67fd3de08ee43b8cdf8123","src/loop_analysis.rs":"4f23c08df9bc95195d68e9721a3a040c6192276ad33894c1225647034f01b23d","src/machinst/abi.rs":"2470c97947237118ef8d243391b4cd0a9ffefbd0e45b08c667f1e56e884f4563","src/machinst/abi_impl.rs":"b2312225e20f683fb0058779ec6db59b3c52da3cdab58741ee25231f4058b684","src/machinst/adapter.rs":"caf5fcde25b0f41b49d108e3da72f6d9e5dfa97e24d5171698cf9eba1d283399","src/machinst/blockorder.rs":"04387238c1855051a44f8faffb76983514251a031af7d1837224551b8f574b60","src/machinst/buffer.rs":"900f7d41374f1fbe47abe03a4896241ed779524b0ead4af8c8d50e1014de8447","src/machinst/compile.rs":"27c36a0beb0e06d8f4f5c4b013de213d7071037c4f8a374b9615aa07bb42a036","src/machinst/helpers.rs":"05f16d72ef2cc06e7d4319feaee3f60c3f5e789c24b8e92d8af3b17310c33f02","src/machinst/inst_common.rs":"4d1cf90032ec7494d3a06d0bccd6ebd713e09377d7f1a8cfba0aa15452c95e42","src/machinst/lower.rs":"1e34eb52ecbd4ccd24406fbac6cc2d4bc0ed6b73a98295999aa27195fc177c49","src/machinst/mod.rs":"d719f1384ccd8934055d407b971b4bfdbb9729066b8ff35ea632d1c54d83b71d","src/machinst/pretty_print.rs":"6076d9ae0ec48ada9e674ad46c25f48e502adb6b8049c6e1edbcb3b68bd37f87","src/machinst/vcode.rs":"9127475e2883b027266371a06e58fb8d0846a0e33e94942526155b5e68dcaefa","src/nan_canonicalization.rs":"dd853d0b1c1b5274513e9fb24b8beb8db877aca8fdfea5ceccbd1a80309c8842","src/partition_slice.rs":"861e778f887ea5d0841d730963565690fd8c298edddf08848d0d215ae5125eba","src/peepmatic.rs":"78b5fc63ea64356fb4ffc76a3df4663999e36ad1cbfed853609a401072900caf","src/postopt.rs":"ab74e2811909805d467d470da5e66879328c8f47db263422efedf3f1c449d8b2","src/predicates.rs":"d4fa993d8b3036ac9e19d1c1d8880ab5b33030fff0a38d65e2a24b9f9d3956c9","src/preopt.peepmatic":"8b6a6c0f4bf6dcf06df1cc30c467ac39e285ccd85f13f4bc76496f5fd6268a51","src/preopt.serialized":"a7a0968f221417caf91edf9ab9d1a993b8e1aaef009e9f26f477a64b5351de75","src/print_errors.rs":"075b74520f47070b839b43714f55a46a7cc2697b9b0f24a7162d481b7e46b7d2","src/redundant_reload_remover.rs":"2c72cc013f33e1257425592ef4ee2b9437ab3dc84d9759589c15fd217bde83a2","src/regalloc/affinity.rs":"ec5d688c24043a8aa72efcfbfddc14497cd9bab288c9d339e5c0150cdade2b1d","src/regalloc/branch_splitting.rs":"32e34197f84e30cff758f4db611a9c70dd587dd8d094729c34aa00303538c0d0","src/regalloc/coalescing.rs":"154842e7f380f2626c698283dbc5e0d5e7f0cc5d22b938e90312d17b71a8bb72","src/regalloc/coloring.rs":"ded1d8e531c38412fb19fe746fed65a6b6598819a29cd76c9b4bd5c4d0d6011a","src/regalloc/context.rs":"7f041d9202d3d1f040f4658acfd0f2b37b5934854b2d5cfa83864d5d1a424076","src/regalloc/diversion.rs":"2e474940b0c38610ca231faba7c7c3cfadf401a2f24247b6f3730ac862fce21f","src/regalloc/live_value_tracker.rs":"845dc3f43cc6b795fea51bf293e7c6ab4961d59ab6ca2670fcab7a2a9bd996be","src/regalloc/liveness.rs":"0b027b8e4444a715af1b93d594a293d2fd430ad06940da05b06a4750535e9652","src/regalloc/liverange.rs":"2e98802e90868051b53ddc8555db0ea98aabc77df7789df2a92627650a43227e","src/regalloc/mod.rs":"a1a460c0bf747c7762655f1ea6f12749b839eb2a72a85144c91cf92fa2bc9476","src/regalloc/pressure.rs":"4565f701d87dff65694b37743fe72d6282dab133f467c448b2a73ef6f37ee9d3","src/regalloc/register_set.rs":"c740d10a061c4b8527ce319842b519d743e93e64db53851360f9ca2c099fd652","src/regalloc/reload.rs":"2132bd4cf45ce60b7799277d36bda35c05064ee1c60798388b8f55a0668fca47","src/regalloc/safepoint.rs":"e398457875d4079bb78ce7b34e2a2f16f3c70680e252fbafbfac17c1d42e17c7","src/regalloc/solver.rs":"e2da4779aba96f77af97c385196b2c498ab25e4b47fd6249a9e3ce813517ce91","src/regalloc/spilling.rs":"3b75be8be6568a091dd8a1fd174b099859c6e9969c03bd765b5fb50f52fcccb5","src/regalloc/virtregs.rs":"a01b5d3cb1753e344c6663dd73de00dd452d442990f89477610b22c86c9afdfd","src/remove_constant_phis.rs":"0e6c2cdce9229bf9a9275d4895d772b90370ed6b7dfb690e63c245c2a9f6c94d","src/result.rs":"7164a1b35f26aeb9a6eda79f773f64ecb97b80b50f5b01ea5d34b64361160cbd","src/scoped_hash_map.rs":"c8d0071ce7e19438e9995b5fca1ea0fca81234811943b06b344331f9742c3718","src/settings.rs":"58a7fe17dfcb6f9e1831fec5044967c8a9bf58ed2c57dcbdc8533764443c3beb","src/simple_gvn.rs":"1de1d0c0e028833350eda7186243f255c9db97fe04f0e6fa688b8a710caa78be","src/simple_preopt.rs":"cac21be7637415f54be27af6135c1cc777352146b47bf25ac8e0b30cf5ab4d44","src/souper_harvest.rs":"dd89016122959baf74575d6d5e9d5e331df7c8c94a76e46d5bfb872d63ab61ca","src/stack_layout.rs":"41d35401faa171d9823e9c6e26c1337f9e16c6b8ba613f0cd98c3c0032930496","src/timing.rs":"bbff7ca6f6ab8ce2f5d1ee0ce5785d19c0b03b6bf7bf65f8c9a2de7883f88506","src/topo_order.rs":"c092ee7a44e5f14962501eafd4478dfb855ce66af15d9c94a9b244ea30d6e991","src/unreachable_code.rs":"baea08a55b1e7eb2379fa2c4bb5ed4f5a536a35eafcb377f8ab79dc41d14d3d4","src/value_label.rs":"e464557e5bab579773929fcfca843e553af201174da1a73460d199446abc7fc7","src/verifier/cssa.rs":"2590b0ecbc134bbedac50915ed9c9e054c89f81e455c7bc0f37d4ddf57a38d05","src/verifier/flags.rs":"233a4c6fb42e32d92bcbef4ec094a26aa79bdd25cb478847236b6ce5d88d3d54","src/verifier/liveness.rs":"b6ab6dfb1390cea8091b71a6f2fd629ee356987b6a0714e8773d7b0eb7fa889f","src/verifier/locations.rs":"2b4e62e1bb79551725414b5a77425c00e9ad56ad766d6293db1eb261b64f51f9","src/verifier/mod.rs":"90c0b62c907414fe04b3ea35385742409a6ce3f30165355ec919a9c8552fca19","src/write.rs":"421cf2479f2875468476b593b06a236333e4113690ddcc57720d0d86377050cb"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"5de0add3f1ee70615a851ef91a95ca9f0e98b3d76811fa1d19686ee3034da5f0","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"e5127227a7db4a8aa92fa6613ed71801025790e696bb41b0323fb7f3c6f7495a","build.rs":"afe67e345d21f9a137ecad473bb595a8b4983d5d435ca0505c91021954c215a7","src/abi.rs":"8922d75a807798945c64ee135f7f22c58e97d8412c6d5b6bf6c4e75c6823d308","src/binemit/memorysink.rs":"70a4a20ed00dd4d9d0880247cf200453912003a40688330272a27fc17141710d","src/binemit/mod.rs":"15c637a744c2a30d620f5dbd8241d70e149c6d708bf59c0736cfe75b03cfdb87","src/binemit/relaxation.rs":"0547f1a33ea176b281d6f09d1bd7a253dcba895785008e61c114861f1a86307f","src/binemit/shrink.rs":"552d64dff3b044bca77f39891d0e39ee619f6ec0669bf9917132c97becea79b0","src/binemit/stack_map.rs":"cae6ef55b748a3700909d26f408c3d244a7dd76c0918b9b04c17127c18dbf8bf","src/bitset.rs":"ff667c19a63a6a9bcf06f99a46b6db839323f5d3d5cc5e7b00f1ab77d331fc77","src/cfg_printer.rs":"a4cd85ecb2c403b29dc3fc6c60ee7f97b6ed602e8ba88ec87accb988d009271e","src/constant_hash.rs":"8f53afb38891fbdab8553c7a89e61f0ce30947a22fb24ae84523c9a1ab025c3f","src/context.rs":"ebc8b7e3ed6676d47bc40de46dfb0f0f5c20d4992b3f5239ea2863bfec2a785e","src/cursor.rs":"eaa0e4ea65bec30aa79e2fb62e89c713b1adec6eeddd5592237d7fcce47c5fa7","src/data_value.rs":"a54197907d19f0b6b2ba2f9efee59298c51717ab16e250d058c278b0b65bfe2d","src/dbg.rs":"1898d94cff0975815eb348651702e95c8f2f63886501d3b7043ee75668480472","src/dce.rs":"b98545dbf5c8d0c4a33b2ec6cd905d6371fe843481ad608ff59b4a009fc9be19","src/divconst_magic_numbers.rs":"e7f8f46f3a25ed7155890e9d76c10f5dde9dc5bbcebb623c8166fa415abdd959","src/dominator_tree.rs":"b3a5c7837150390a78ade90807965dfcb8768a7e3ae9ee02f2e4a1ad8f3bafa9","src/flowgraph.rs":"71490e2f7a1ea905758a258b2bebe77f125302f446f9839dd60003fdafaef5fe","src/fx.rs":"8a5d07487906d8316a179e826fcd817a92a4860686256a6fd9d78ba47c63f330","src/inst_predicates.rs":"8230094ed489dc9aaa527c18fd72a74accfe961928d6af404ee8fbc7e3056ff2","src/ir/atomic_rmw_op.rs":"44311956feebef2ec01a0156e690a0d09f66b616e401d54a5fc5c9769c448be5","src/ir/builder.rs":"3425957b118a0c40847ef7f473543baef5a24f0c7d8af198955180c8f297ee5a","src/ir/constant.rs":"11ef9ffb670d8133e145810205dba0e87b1882ab8cda96a410eac81caea3497b","src/ir/dfg.rs":"e803858c6cef60cec09a82d686a73715d0eb142ac96742023cd6112dcf87073a","src/ir/entities.rs":"f0b49b9c351b94703d6c878b564e53a30010c142c47effaf603ec4ade784686b","src/ir/extfunc.rs":"d901ee549f2cf980d807481c3dd6c2b89db241044d465492146bf44db05e9f86","src/ir/extname.rs":"977b2e380094e99cfdd080112bda709ca61a6d942e1e4c2015d39eaf3ea80f4c","src/ir/function.rs":"8b67d93efa3f8eb7bdc343e9bc9fee47d0306ae3d6ce35a8a1b5ac32ee4d7ff2","src/ir/globalvalue.rs":"2f3a54cc2ade91439536b02c46ce790c3634a386a4cc4d27d7da7ad929b8bb90","src/ir/heap.rs":"a59d3e5901412b53c0b53a8cdf10765ff5921de9c410ae9acea226c89827df3c","src/ir/immediates.rs":"2dbadc1a0bd2f6e884d1831596ae5280b848ed464c646e556f97e0f057ba5fdf","src/ir/instructions.rs":"3c63d8f4e07e4cb1cd6f289a7b4533b9ba3413fac9bc9906d718eca6b2d772d3","src/ir/jumptable.rs":"184fa640957e8b0e451dc594e4b348f9aff5fb5b54ab3d856ab19df25f4f3322","src/ir/layout.rs":"2956643a822e67a0c1196f8d3c81af11d0c0122b2d97427ce3ed0c57bb633cbf","src/ir/libcall.rs":"7c9255bdef9a16937d817a3bfd542be4c2734eea3c8b8a870ff411eac2efaad8","src/ir/memflags.rs":"dbcf3798ab66dc764b73fb7f139a621c54cc6bcc683f1f70a33ed7e8c3486bfd","src/ir/mod.rs":"14cf95dae76a6192c755ed74837c3a36d92827ccdbe2e73f805abea29fc723d8","src/ir/progpoint.rs":"a985a7fccde1e985ca24bf2344f16faa4cda7cffb30cb56bf27fabbb5727bc62","src/ir/sourceloc.rs":"67c66adace734645ddf311ecb22e975f20756e07c91e10f698a830cfc2cd08aa","src/ir/stackslot.rs":"433b61e05263f40c022f73b0ab1141e3e45b348a0309ca02546e6450b2957792","src/ir/table.rs":"dcc3b663a989b2b084402b08dc9a0e928dbd052e194a46a1886cc6f0cf1a5f2c","src/ir/trapcode.rs":"510f4a9da3253c07b8f997f6a926e0ceb70e5f1b9a31204c9c4e3128a592493b","src/ir/types.rs":"dfd9470aa4325adc252eb7ebb2951a5b98d22d0dc31be482419f5cbbb74bf86d","src/ir/valueloc.rs":"628f292ee6b8375e07f360edaf3609b522fd4d7bea131fb8ad3cab237927e7ab","src/isa/aarch64/abi.rs":"29e09af9c6974a103eb6320452104d3b50e817e6a3f27da837052cffdc5bcf00","src/isa/aarch64/inst/args.rs":"cdd935d52938f73446acf292ba8265bd5c2afcd85d6226d16f1cc4c83f5f19ce","src/isa/aarch64/inst/emit.rs":"af8e02cc033d3e85c291b729e0707e40a613cbd5083ca9ab12bb6a869aa45c7d","src/isa/aarch64/inst/emit_tests.rs":"555957dda38f9799b491cdfcd0eeb3454294f1adf5f043078f5be0147169d5f4","src/isa/aarch64/inst/imms.rs":"a718fafe0cd080500c0a61165500aaeb6321decb27f30dc28c22448bc9b431ff","src/isa/aarch64/inst/mod.rs":"9c5b8b7ca077ceaf34a423c983dcafe9002de0f3a8d23594c6cc33243c1ae9d6","src/isa/aarch64/inst/regs.rs":"073b1c89fe01f297585ec0815cd15b60053b7a9ea4007d8da3a551172e5087c0","src/isa/aarch64/inst/unwind.rs":"da6f28ecbe70fdeceb1414c2ea706553a5efd25689ffc51b36195b9a497da644","src/isa/aarch64/inst/unwind/systemv.rs":"1fbf7b631bd8287bfd0efa5413b6279301c6711927c1043bbb4fc11b3d8a7ae7","src/isa/aarch64/lower.rs":"b135a2278a2c328d940fdb44dc7ebd13908deac72e0bd808d3a3036f6aa51158","src/isa/aarch64/lower_inst.rs":"bbd6c9cb1218448df40ed2401a931dac83968515b11a02eb5f5380c520d9fb25","src/isa/aarch64/mod.rs":"ba9c1e635180aa2cfbb0c1b8bcad6d044730da3abf6adee698cfc549ad62d2a6","src/isa/arm32/abi.rs":"603d8915d2293bcf9c205abfe7d21996c0ba2a2ab7f8c4667bc08f2e33f43555","src/isa/arm32/inst/args.rs":"13aca630f11c8819de44c699fafacd41f86b15493808febe3fff3261f59ad5d3","src/isa/arm32/inst/emit.rs":"679b54bbd830adb24ea0be270e2a8f9691139391bb62143ec20c415e6f09b325","src/isa/arm32/inst/emit_tests.rs":"e9555038dca5ad17d37749579b716638d439c26b3cd360c2ae7d1d4809dd99f9","src/isa/arm32/inst/mod.rs":"0ba77e18ab8c8898555cae3e4139cf7a3102c8b5ce9801197319eecce3890971","src/isa/arm32/inst/regs.rs":"0a67309b3f006e3ceec6408e2cf89ed19d9bd303b0ae12eb3a1ed3756b853719","src/isa/arm32/inst/unwind.rs":"c4e0d4d546b037aa72084ab50ff54c609cd0c1a4a44310f6ea0b84c56667ca29","src/isa/arm32/lower.rs":"55fd734fa5e7cb02a9e2e5e6d5935bf7c66c74f10bcfb455094702c38a10e539","src/isa/arm32/lower_inst.rs":"4ea8f9149cab6fdc190c23b30fabfecf1e748d289647e9aed4e529698db07831","src/isa/arm32/mod.rs":"0afde48b561e26fbc7de278b591f28ae87bec0e240a08acced7fcbc216557fce","src/isa/call_conv.rs":"6b9991b4038529be9362fd5feeef679f4fb93140301b353534b78ab8653a68de","src/isa/constraints.rs":"296f473a95146a743ecb73d8d5908675be02e37607efd287f55322549dc25763","src/isa/enc_tables.rs":"382e714f9500afc292c563cb66d4c963d6787e58f197b1db242db7a099c22b9a","src/isa/encoding.rs":"22e21fdb8e15859c69e4f836bb61e1a82cd6838d093ce5fe641a90f16fb65c9e","src/isa/mod.rs":"f042b08ecddc244667a411e40a632798ad6ec466f13647cdf85d4dc69282618e","src/isa/registers.rs":"61840d736b1943c3e54ac324db6f7de4f76170800f047dde267dcc9aa2d53e6a","src/isa/riscv/abi.rs":"aa60b701efcef417ee1262a95398343578dc1a30decc8e11044b74d41654ec51","src/isa/riscv/binemit.rs":"264d223da311d4482ebf2f55438b665c67b163058251bc78173c76ba983a31ef","src/isa/riscv/enc_tables.rs":"8491f2082b24c7dedeb7c36cfd913bf9aeaa0a4c8fc754166e9285f4ae002f40","src/isa/riscv/mod.rs":"03ee02848dbc3325a5ef38e66c05be571c380fbe4ca520b4f87c7572db228beb","src/isa/riscv/registers.rs":"6275ec3ef19195d16556c1856cb23095f25a80c31d6b429eaa749d549515a6d3","src/isa/riscv/settings.rs":"e3c063add822ca366e845f5a19d25b56635e828b157a37d29aca5355650e6a66","src/isa/stack.rs":"c391216fb8ee6566e3b14aa4bd83ba85aef2bd23422a9dca2c8c6f47016372e2","src/isa/test_utils.rs":"91c542c9488320ade04c21e16189c053ca3fad5db5ddf179e492ecd3fc55e368","src/isa/unwind.rs":"13a302b2d7fb5b78d6056deb2540f3796dbb028445ac3e0d93f641f85115a1d8","src/isa/unwind/systemv.rs":"b6b9544b09147d054c9dff61c4ccc1b46195258dd9f6b9e0aba6d5f58138802f","src/isa/unwind/winx64.rs":"73d7d24d885328ab8814dcd6d40a118613706573a0f36f8395daf98bb44333b4","src/isa/x64/abi.rs":"393f15d5fd42cf8f1cd17a6221e9aa4b7e99594e6140470e5e499e00d8b1e14f","src/isa/x64/inst/args.rs":"e4e9dc4296b5e8100bb56f3ba5095636abc54efcda8e95d06360fc9e7697c97b","src/isa/x64/inst/emit.rs":"50e543d6391b38255f2f81ea962c3e6b5e2252d3d3731580dd7bc248c6448db1","src/isa/x64/inst/emit_tests.rs":"06b20410d28f29e1bf8af90053702c32fd6552425138160547198e284728a2ef","src/isa/x64/inst/mod.rs":"2062bcf625565dc298149f579bdca08b1e8481ebb0259fff4df8bb82bbb4c09e","src/isa/x64/inst/regs.rs":"526de654b27bf31129ca471d42701a6ea9474197f9db448090b6fd8cecef032d","src/isa/x64/inst/unwind.rs":"acb3ae24610d2c9a80c3923604ead18f3b87de6fd5b51504a1614fa5f468a004","src/isa/x64/inst/unwind/systemv.rs":"d7f7cfb1b89c212acb60470cc72d11a5ccc3206ca41b7297facfc017df1016c5","src/isa/x64/lower.rs":"279164ee3e91306080b1241c7919f98b9df69bdcd48dcc3ecfc5de1ad062ded2","src/isa/x64/mod.rs":"26cc9558ac2293558f4ec23f850e14c713c726ec792c421aa0f30022a90f79e1","src/isa/x64/settings.rs":"8e318036aab3e2c94edfcbf87137325e5423c1c04e14a3fac9e3cc73cebfa6e1","src/isa/x86/abi.rs":"a4af65f99e6d6b9d3e3008e112228cd1d56bd1bb0e5b85077eae3d37622a528c","src/isa/x86/binemit.rs":"fb5051471cd9c860455a0c1d74aec7d919d4c7229ada10222631c3694f9a091f","src/isa/x86/enc_tables.rs":"cafb1d2fb0e6596bac500eaf239e6b6ff8665b09fb3ccf9108a357a20961c70a","src/isa/x86/mod.rs":"d22ab9590f1c93ac1b60ef8b264c3dc596a0a3d979914b711378b167fece15be","src/isa/x86/registers.rs":"1abbc1aa24c6fc4c7e610b6e840eab29046b821de08cf57fc05e2c2f665479c0","src/isa/x86/settings.rs":"d3e403db3507830f79bcc976c17340b57052cf1b50877fcf1a79549f2a054458","src/isa/x86/unwind.rs":"2730f898db437e81c3146fbd6b25f9dad326d05a07dd3303beddd7d3998a60ca","src/isa/x86/unwind/systemv.rs":"d0ed6a5c1ba458d5d73a5073ac5c328ecd41a339eb843628b8c3e02eb3605c17","src/isa/x86/unwind/winx64.rs":"f9f5fb87638500511793b528406fb53012f1e2e78432c2fcceb65950530c633c","src/iterators.rs":"d399a80bc65b97f7d650978e19086dcc1d280ac96d60628eac3d17eb363b0d71","src/legalizer/boundary.rs":"084e1a0c53b0dfed21e6b5e263a012604bffbf4c8e1cac290d0c8ef2eb8d030c","src/legalizer/call.rs":"be6074c64c1a00e5e81159dd94c8401fef62205b22c15e07e0c56cf922554d00","src/legalizer/globalvalue.rs":"a5d09ee41a04ba991d7f5d2d8d8c30a209748d38501a005e0ea568df2663cbb5","src/legalizer/heap.rs":"a6026d44c9ce31e0a21413c50581985dad1584700fde9dbab0b2cefafa5c9d14","src/legalizer/libcall.rs":"4f187c04acb41696bbb80abf0efc4a24b939205619fc6cc40aa8cff86ae1d84b","src/legalizer/mod.rs":"65582faaafbbcb6278666e51bff10abd29e3e210c910e5992450d6c88e953336","src/legalizer/split.rs":"697f08886dbf35fcc69eccc7b597986a58cc73ca7d3cf5d581fffc658a0dad33","src/legalizer/table.rs":"c36d03525312e3191aba8ee00c26a87c1ea200f9a9a0370f0cc84eeacff71786","src/lib.rs":"214295a2f3bf40c84dce148807ee5b3cc2faff4e580fc59e84111d183a6895a4","src/licm.rs":"4c19009605ad8e5259cb8589d2ff38e43e6c2d4ff919ba557e2259ad24658a6f","src/loop_analysis.rs":"4f23c08df9bc95195d68e9721a3a040c6192276ad33894c1225647034f01b23d","src/machinst/abi.rs":"5db05408f618b4d1be671ac1738a3332cc9dfce8c6e0e20be5e656b08a1f26dc","src/machinst/abi_impl.rs":"90657dd16dc46c191814afe21d7095b91beaad79ce9bd6a8a48391d6ffdb8675","src/machinst/adapter.rs":"f2e5aa7ead149f1fc5c9ca0f649be0edad79f271a0c6c7cc4b3dfea758f47dd4","src/machinst/blockorder.rs":"04387238c1855051a44f8faffb76983514251a031af7d1837224551b8f574b60","src/machinst/buffer.rs":"7233ae8db7cceb5ef94726f50c6e0938774a02c0dfde2f7d37335c7ba96b2dd3","src/machinst/compile.rs":"5f365f14a18cdf54d9835a9833486d395aa7486a88d91661a750981956e346f5","src/machinst/helpers.rs":"05f16d72ef2cc06e7d4319feaee3f60c3f5e789c24b8e92d8af3b17310c33f02","src/machinst/inst_common.rs":"4d1cf90032ec7494d3a06d0bccd6ebd713e09377d7f1a8cfba0aa15452c95e42","src/machinst/lower.rs":"bc9a90c10f1a422bc5c3936bdb4e575a5a4a3d892716c15ab46630f3c8ce8786","src/machinst/mod.rs":"d89d4d4757ff7da9e1eb4a45ed4583c13f9d666d566480a5c454c63a067a5592","src/machinst/vcode.rs":"cb0c86c89f1bad6d6f930a71cb165c0d43023982a3ed57c79f364a5fff086dde","src/nan_canonicalization.rs":"dd853d0b1c1b5274513e9fb24b8beb8db877aca8fdfea5ceccbd1a80309c8842","src/partition_slice.rs":"861e778f887ea5d0841d730963565690fd8c298edddf08848d0d215ae5125eba","src/peepmatic.rs":"9acc9a09c1ad32a8f33e07133780758fbbe657a36bfc6e6df5d2941ff85722b6","src/postopt.rs":"ab74e2811909805d467d470da5e66879328c8f47db263422efedf3f1c449d8b2","src/predicates.rs":"d4fa993d8b3036ac9e19d1c1d8880ab5b33030fff0a38d65e2a24b9f9d3956c9","src/preopt.peepmatic":"8b6a6c0f4bf6dcf06df1cc30c467ac39e285ccd85f13f4bc76496f5fd6268a51","src/preopt.serialized":"bbdeb6f75fbd510988d76d531d1fe43b35d912b296453257c70e323fa9c06703","src/print_errors.rs":"075b74520f47070b839b43714f55a46a7cc2697b9b0f24a7162d481b7e46b7d2","src/redundant_reload_remover.rs":"2c72cc013f33e1257425592ef4ee2b9437ab3dc84d9759589c15fd217bde83a2","src/regalloc/affinity.rs":"ec5d688c24043a8aa72efcfbfddc14497cd9bab288c9d339e5c0150cdade2b1d","src/regalloc/branch_splitting.rs":"32e34197f84e30cff758f4db611a9c70dd587dd8d094729c34aa00303538c0d0","src/regalloc/coalescing.rs":"154842e7f380f2626c698283dbc5e0d5e7f0cc5d22b938e90312d17b71a8bb72","src/regalloc/coloring.rs":"ded1d8e531c38412fb19fe746fed65a6b6598819a29cd76c9b4bd5c4d0d6011a","src/regalloc/context.rs":"7f041d9202d3d1f040f4658acfd0f2b37b5934854b2d5cfa83864d5d1a424076","src/regalloc/diversion.rs":"2e474940b0c38610ca231faba7c7c3cfadf401a2f24247b6f3730ac862fce21f","src/regalloc/live_value_tracker.rs":"845dc3f43cc6b795fea51bf293e7c6ab4961d59ab6ca2670fcab7a2a9bd996be","src/regalloc/liveness.rs":"0b027b8e4444a715af1b93d594a293d2fd430ad06940da05b06a4750535e9652","src/regalloc/liverange.rs":"2e98802e90868051b53ddc8555db0ea98aabc77df7789df2a92627650a43227e","src/regalloc/mod.rs":"a1a460c0bf747c7762655f1ea6f12749b839eb2a72a85144c91cf92fa2bc9476","src/regalloc/pressure.rs":"4565f701d87dff65694b37743fe72d6282dab133f467c448b2a73ef6f37ee9d3","src/regalloc/register_set.rs":"c740d10a061c4b8527ce319842b519d743e93e64db53851360f9ca2c099fd652","src/regalloc/reload.rs":"2132bd4cf45ce60b7799277d36bda35c05064ee1c60798388b8f55a0668fca47","src/regalloc/safepoint.rs":"e398457875d4079bb78ce7b34e2a2f16f3c70680e252fbafbfac17c1d42e17c7","src/regalloc/solver.rs":"e2da4779aba96f77af97c385196b2c498ab25e4b47fd6249a9e3ce813517ce91","src/regalloc/spilling.rs":"3b75be8be6568a091dd8a1fd174b099859c6e9969c03bd765b5fb50f52fcccb5","src/regalloc/virtregs.rs":"a01b5d3cb1753e344c6663dd73de00dd452d442990f89477610b22c86c9afdfd","src/remove_constant_phis.rs":"0e6c2cdce9229bf9a9275d4895d772b90370ed6b7dfb690e63c245c2a9f6c94d","src/result.rs":"7164a1b35f26aeb9a6eda79f773f64ecb97b80b50f5b01ea5d34b64361160cbd","src/scoped_hash_map.rs":"c8d0071ce7e19438e9995b5fca1ea0fca81234811943b06b344331f9742c3718","src/settings.rs":"58a7fe17dfcb6f9e1831fec5044967c8a9bf58ed2c57dcbdc8533764443c3beb","src/simple_gvn.rs":"1de1d0c0e028833350eda7186243f255c9db97fe04f0e6fa688b8a710caa78be","src/simple_preopt.rs":"cac21be7637415f54be27af6135c1cc777352146b47bf25ac8e0b30cf5ab4d44","src/souper_harvest.rs":"dd89016122959baf74575d6d5e9d5e331df7c8c94a76e46d5bfb872d63ab61ca","src/stack_layout.rs":"41d35401faa171d9823e9c6e26c1337f9e16c6b8ba613f0cd98c3c0032930496","src/timing.rs":"bbff7ca6f6ab8ce2f5d1ee0ce5785d19c0b03b6bf7bf65f8c9a2de7883f88506","src/topo_order.rs":"c092ee7a44e5f14962501eafd4478dfb855ce66af15d9c94a9b244ea30d6e991","src/unreachable_code.rs":"baea08a55b1e7eb2379fa2c4bb5ed4f5a536a35eafcb377f8ab79dc41d14d3d4","src/value_label.rs":"e464557e5bab579773929fcfca843e553af201174da1a73460d199446abc7fc7","src/verifier/cssa.rs":"2590b0ecbc134bbedac50915ed9c9e054c89f81e455c7bc0f37d4ddf57a38d05","src/verifier/flags.rs":"233a4c6fb42e32d92bcbef4ec094a26aa79bdd25cb478847236b6ce5d88d3d54","src/verifier/liveness.rs":"b6ab6dfb1390cea8091b71a6f2fd629ee356987b6a0714e8773d7b0eb7fa889f","src/verifier/locations.rs":"2b4e62e1bb79551725414b5a77425c00e9ad56ad766d6293db1eb261b64f51f9","src/verifier/mod.rs":"90c0b62c907414fe04b3ea35385742409a6ce3f30165355ec919a9c8552fca19","src/write.rs":"421cf2479f2875468476b593b06a236333e4113690ddcc57720d0d86377050cb"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-codegen/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen"
-version = "0.67.0"
+version = "0.68.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
@@ -13,31 +13,31 @@
 edition = "2018"
 
 [dependencies]
-cranelift-codegen-shared = { path = "./shared", version = "0.67.0" }
-cranelift-entity = { path = "../entity", version = "0.67.0" }
-cranelift-bforest = { path = "../bforest", version = "0.67.0" }
-hashbrown = { version = "0.7", optional = true }
+cranelift-codegen-shared = { path = "./shared", version = "0.68.0" }
+cranelift-entity = { path = "../entity", version = "0.68.0" }
+cranelift-bforest = { path = "../bforest", version = "0.68.0" }
+hashbrown = { version = "0.9.1", optional = true }
 target-lexicon = "0.11"
 log = { version = "0.4.6", default-features = false }
 serde = { version = "1.0.94", features = ["derive"], optional = true }
 bincode = { version = "1.2.1", optional = true }
-gimli = { version = "0.22.0", default-features = false, features = ["write"], optional = true }
+gimli = { version = "0.23.0", default-features = false, features = ["write"], optional = true }
 smallvec = { version = "1.0.0" }
 thiserror = "1.0.4"
 byteorder = { version = "1.3.2", default-features = false }
-peepmatic = { path = "../peepmatic", optional = true, version = "0.67.0" }
-peepmatic-traits = { path = "../peepmatic/crates/traits", optional = true, version = "0.67.0" }
-peepmatic-runtime = { path = "../peepmatic/crates/runtime", optional = true, version = "0.67.0" }
-regalloc = "0.0.30"
+peepmatic = { path = "../peepmatic", optional = true, version = "0.68.0" }
+peepmatic-traits = { path = "../peepmatic/crates/traits", optional = true, version = "0.68.0" }
+peepmatic-runtime = { path = "../peepmatic/crates/runtime", optional = true, version = "0.68.0" }
+regalloc = { git = "https://github.com/mozilla-spidermonkey/regalloc.rs", rev = "fc5d1d33317b0fbd36725757f80a95127eff5109" }
 souper-ir = { version = "1", optional = true }
-wast = { version = "25.0.0", optional = true }
+wast = { version = "27.0.0", optional = true }
 # It is a goal of the cranelift-codegen crate to have minimal external dependencies.
 # Please don't add any unless they are essential to the task of creating binary
 # machine code. Integration tests that need external dependencies can be
 # accomodated in `tests`.
 
 [build-dependencies]
-cranelift-codegen-meta = { path = "meta", version = "0.67.0" }
+cranelift-codegen-meta = { path = "meta", version = "0.68.0" }
 
 [features]
 default = ["std", "unwind"]
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/binemit/memorysink.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/binemit/memorysink.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/binemit/memorysink.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/binemit/memorysink.rs	2021-01-18 19:58:25.000000000 +0000
@@ -74,9 +74,6 @@
 
 /// A trait for receiving relocations for code that is emitted directly into memory.
 pub trait RelocSink {
-    /// Add a relocation referencing a block at the current offset.
-    fn reloc_block(&mut self, _: CodeOffset, _: Reloc, _: CodeOffset);
-
     /// Add a relocation referencing an external symbol at the current offset.
     fn reloc_external(
         &mut self,
@@ -138,11 +135,6 @@
         self.write(x);
     }
 
-    fn reloc_block(&mut self, rel: Reloc, block_offset: CodeOffset) {
-        let ofs = self.offset();
-        self.relocs.reloc_block(ofs, rel, block_offset);
-    }
-
     fn reloc_external(
         &mut self,
         srcloc: SourceLoc,
@@ -204,7 +196,6 @@
 pub struct NullRelocSink {}
 
 impl RelocSink for NullRelocSink {
-    fn reloc_block(&mut self, _: CodeOffset, _: Reloc, _: CodeOffset) {}
     fn reloc_external(
         &mut self,
         _: CodeOffset,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/binemit/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/binemit/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/binemit/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/binemit/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -140,9 +140,6 @@
     /// Add 8 bytes to the code section.
     fn put8(&mut self, _: u64);
 
-    /// Add a relocation referencing a block at the current offset.
-    fn reloc_block(&mut self, _: Reloc, _: CodeOffset);
-
     /// Add a relocation referencing an external symbol plus the addend at the current offset.
     fn reloc_external(&mut self, _: SourceLoc, _: Reloc, _: &ExternalName, _: Addend);
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/context.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/context.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/context.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/context.rs	2021-01-18 19:58:25.000000000 +0000
@@ -253,6 +253,17 @@
         &self,
         isa: &dyn TargetIsa,
     ) -> CodegenResult<Option<crate::isa::unwind::UnwindInfo>> {
+        if let Some(backend) = isa.get_mach_backend() {
+            use crate::isa::CallConv;
+            use crate::machinst::UnwindInfoKind;
+            let unwind_info_kind = match self.func.signature.call_conv {
+                CallConv::Fast | CallConv::Cold | CallConv::SystemV => UnwindInfoKind::SystemV,
+                CallConv::WindowsFastcall => UnwindInfoKind::Windows,
+                _ => UnwindInfoKind::None,
+            };
+            let result = self.mach_compile_result.as_ref().unwrap();
+            return backend.emit_unwind_info(result, unwind_info_kind);
+        }
         isa.create_unwind_info(&self.func)
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/data_value.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/data_value.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/data_value.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/data_value.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,231 @@
+//! This module gives users to instantiate values that Cranelift understands. These values are used,
+//! for example, during interpretation and for wrapping immediates.
+use crate::ir::immediates::{Ieee32, Ieee64, Offset32};
+use crate::ir::{types, ConstantData, Type};
+use core::convert::TryInto;
+use core::fmt::{self, Display, Formatter};
+use core::ptr;
+use thiserror::Error;
+
+/// Represent a data value. Where [Value] is an SSA reference, [DataValue] is the type + value
+/// that would be referred to by a [Value].
+///
+/// [Value]: crate::ir::Value
+#[allow(missing_docs)]
+#[derive(Clone, Debug, PartialEq, PartialOrd)]
+pub enum DataValue {
+    B(bool),
+    I8(i8),
+    I16(i16),
+    I32(i32),
+    I64(i64),
+    U8(u8),
+    U16(u16),
+    U32(u32),
+    U64(u64),
+    F32(Ieee32),
+    F64(Ieee64),
+    V128([u8; 16]),
+}
+
+impl DataValue {
+    /// Try to cast an immediate integer (a wrapped `i64` on most Cranelift instructions) to the
+    /// given Cranelift [Type].
+    pub fn from_integer(imm: i64, ty: Type) -> Result<DataValue, DataValueCastFailure> {
+        match ty {
+            types::I8 => Ok(DataValue::I8(imm as i8)),
+            types::I16 => Ok(DataValue::I16(imm as i16)),
+            types::I32 => Ok(DataValue::I32(imm as i32)),
+            types::I64 => Ok(DataValue::I64(imm)),
+            _ => Err(DataValueCastFailure::FromInteger(imm, ty)),
+        }
+    }
+
+    /// Return the Cranelift IR [Type] for this [DataValue].
+    pub fn ty(&self) -> Type {
+        match self {
+            DataValue::B(_) => types::B8, // A default type.
+            DataValue::I8(_) | DataValue::U8(_) => types::I8,
+            DataValue::I16(_) | DataValue::U16(_) => types::I16,
+            DataValue::I32(_) | DataValue::U32(_) => types::I32,
+            DataValue::I64(_) | DataValue::U64(_) => types::I64,
+            DataValue::F32(_) => types::F32,
+            DataValue::F64(_) => types::F64,
+            DataValue::V128(_) => types::I8X16, // A default type.
+        }
+    }
+
+    /// Return true if the value is a vector (i.e. `DataValue::V128`).
+    pub fn is_vector(&self) -> bool {
+        match self {
+            DataValue::V128(_) => true,
+            _ => false,
+        }
+    }
+
+    /// Write a [DataValue] to a memory location.
+    pub unsafe fn write_value_to(&self, p: *mut u128) {
+        match self {
+            DataValue::B(b) => ptr::write(p as *mut bool, *b),
+            DataValue::I8(i) => ptr::write(p as *mut i8, *i),
+            DataValue::I16(i) => ptr::write(p as *mut i16, *i),
+            DataValue::I32(i) => ptr::write(p as *mut i32, *i),
+            DataValue::I64(i) => ptr::write(p as *mut i64, *i),
+            DataValue::F32(f) => ptr::write(p as *mut Ieee32, *f),
+            DataValue::F64(f) => ptr::write(p as *mut Ieee64, *f),
+            DataValue::V128(b) => ptr::write(p as *mut [u8; 16], *b),
+            _ => unimplemented!(),
+        }
+    }
+
+    /// Read a [DataValue] from a memory location using a given [Type].
+    pub unsafe fn read_value_from(p: *const u128, ty: Type) -> Self {
+        match ty {
+            types::I8 => DataValue::I8(ptr::read(p as *const i8)),
+            types::I16 => DataValue::I16(ptr::read(p as *const i16)),
+            types::I32 => DataValue::I32(ptr::read(p as *const i32)),
+            types::I64 => DataValue::I64(ptr::read(p as *const i64)),
+            types::F32 => DataValue::F32(ptr::read(p as *const Ieee32)),
+            types::F64 => DataValue::F64(ptr::read(p as *const Ieee64)),
+            _ if ty.is_bool() => DataValue::B(ptr::read(p as *const bool)),
+            _ if ty.is_vector() && ty.bytes() == 16 => {
+                DataValue::V128(ptr::read(p as *const [u8; 16]))
+            }
+            _ => unimplemented!(),
+        }
+    }
+}
+
+/// Record failures to cast [DataValue].
+#[derive(Error, Debug, PartialEq)]
+#[allow(missing_docs)]
+pub enum DataValueCastFailure {
+    #[error("unable to cast data value of type {0} to type {1}")]
+    TryInto(Type, Type),
+    #[error("unable to cast i64({0}) to a data value of type {1}")]
+    FromInteger(i64, Type),
+}
+
+/// Helper for creating conversion implementations for [DataValue].
+macro_rules! build_conversion_impl {
+    ( $rust_ty:ty, $data_value_ty:ident, $cranelift_ty:ident ) => {
+        impl From<$rust_ty> for DataValue {
+            fn from(data: $rust_ty) -> Self {
+                DataValue::$data_value_ty(data)
+            }
+        }
+
+        impl TryInto<$rust_ty> for DataValue {
+            type Error = DataValueCastFailure;
+            fn try_into(self) -> Result<$rust_ty, Self::Error> {
+                if let DataValue::$data_value_ty(v) = self {
+                    Ok(v)
+                } else {
+                    Err(DataValueCastFailure::TryInto(
+                        self.ty(),
+                        types::$cranelift_ty,
+                    ))
+                }
+            }
+        }
+    };
+}
+build_conversion_impl!(bool, B, B8);
+build_conversion_impl!(i8, I8, I8);
+build_conversion_impl!(i16, I16, I16);
+build_conversion_impl!(i32, I32, I32);
+build_conversion_impl!(i64, I64, I64);
+build_conversion_impl!(u8, U8, I8);
+build_conversion_impl!(u16, U16, I16);
+build_conversion_impl!(u32, U32, I32);
+build_conversion_impl!(u64, U64, I64);
+build_conversion_impl!(Ieee32, F32, F32);
+build_conversion_impl!(Ieee64, F64, F64);
+build_conversion_impl!([u8; 16], V128, I8X16);
+impl From<Offset32> for DataValue {
+    fn from(o: Offset32) -> Self {
+        DataValue::from(Into::<i32>::into(o))
+    }
+}
+
+impl Display for DataValue {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            DataValue::B(dv) => write!(f, "{}", dv),
+            DataValue::I8(dv) => write!(f, "{}", dv),
+            DataValue::I16(dv) => write!(f, "{}", dv),
+            DataValue::I32(dv) => write!(f, "{}", dv),
+            DataValue::I64(dv) => write!(f, "{}", dv),
+            DataValue::U8(dv) => write!(f, "{}", dv),
+            DataValue::U16(dv) => write!(f, "{}", dv),
+            DataValue::U32(dv) => write!(f, "{}", dv),
+            DataValue::U64(dv) => write!(f, "{}", dv),
+            // The Ieee* wrappers here print the expected syntax.
+            DataValue::F32(dv) => write!(f, "{}", dv),
+            DataValue::F64(dv) => write!(f, "{}", dv),
+            // Again, for syntax consistency, use ConstantData, which in this case displays as hex.
+            DataValue::V128(dv) => write!(f, "{}", ConstantData::from(&dv[..])),
+        }
+    }
+}
+
+/// Helper structure for printing bracket-enclosed vectors of [DataValue]s.
+/// - for empty vectors, display `[]`
+/// - for single item vectors, display `42`, e.g.
+/// - for multiple item vectors, display `[42, 43, 44]`, e.g.
+pub struct DisplayDataValues<'a>(pub &'a [DataValue]);
+
+impl<'a> Display for DisplayDataValues<'a> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        if self.0.len() == 1 {
+            write!(f, "{}", self.0[0])
+        } else {
+            write!(f, "[")?;
+            write_data_value_list(f, &self.0)?;
+            write!(f, "]")
+        }
+    }
+}
+
+/// Helper function for displaying `Vec<DataValue>`.
+pub fn write_data_value_list(f: &mut Formatter<'_>, list: &[DataValue]) -> fmt::Result {
+    match list.len() {
+        0 => Ok(()),
+        1 => write!(f, "{}", list[0]),
+        _ => {
+            write!(f, "{}", list[0])?;
+            for dv in list.iter().skip(1) {
+                write!(f, ", {}", dv)?;
+            }
+            Ok(())
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn type_conversions() {
+        assert_eq!(DataValue::B(true).ty(), types::B8);
+        assert_eq!(
+            TryInto::<bool>::try_into(DataValue::B(false)).unwrap(),
+            false
+        );
+        assert_eq!(
+            TryInto::<i32>::try_into(DataValue::B(false)).unwrap_err(),
+            DataValueCastFailure::TryInto(types::B8, types::I32)
+        );
+
+        assert_eq!(DataValue::V128([0; 16]).ty(), types::I8X16);
+        assert_eq!(
+            TryInto::<[u8; 16]>::try_into(DataValue::V128([0; 16])).unwrap(),
+            [0; 16]
+        );
+        assert_eq!(
+            TryInto::<i32>::try_into(DataValue::V128([0; 16])).unwrap_err(),
+            DataValueCastFailure::TryInto(types::I8X16, types::I32)
+        );
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/inst_predicates.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/inst_predicates.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/inst_predicates.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/inst_predicates.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,6 +1,7 @@
 //! Instruction predicates/properties, shared by various analyses.
 
 use crate::ir::{DataFlowGraph, Function, Inst, InstructionData, Opcode};
+use crate::machinst::ty_bits;
 use cranelift_entity::EntityRef;
 
 /// Preserve instructions with used result values.
@@ -59,7 +60,21 @@
         &InstructionData::UnaryImm { imm, .. } => Some(imm.bits() as u64),
         &InstructionData::UnaryIeee32 { imm, .. } => Some(imm.bits() as u64),
         &InstructionData::UnaryIeee64 { imm, .. } => Some(imm.bits()),
-        &InstructionData::UnaryBool { imm, .. } => Some(if imm { 1 } else { 0 }),
+        &InstructionData::UnaryBool { imm, .. } => {
+            let imm = if imm {
+                let bits = ty_bits(func.dfg.value_type(func.dfg.inst_results(inst)[0]));
+
+                if bits < 64 {
+                    (1u64 << bits) - 1
+                } else {
+                    u64::MAX
+                }
+            } else {
+                0
+            };
+
+            Some(imm)
+        }
         _ => None,
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/constant.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/constant.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/constant.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/constant.rs	2021-01-18 19:58:25.000000000 +0000
@@ -63,6 +63,11 @@
         self.0.is_empty()
     }
 
+    /// Return the data as a slice.
+    pub fn as_slice(&self) -> &[u8] {
+        self.0.as_slice()
+    }
+
     /// Convert the data to a vector.
     pub fn into_vec(self) -> Vec<u8> {
         self.0
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/function.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/function.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/function.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/function.rs	2021-01-18 19:58:25.000000000 +0000
@@ -7,8 +7,9 @@
 use crate::entity::{PrimaryMap, SecondaryMap};
 use crate::ir;
 use crate::ir::{
-    Block, ExtFuncData, FuncRef, GlobalValue, GlobalValueData, Heap, HeapData, Inst, JumpTable,
-    JumpTableData, Opcode, SigRef, StackSlot, StackSlotData, Table, TableData,
+    instructions::BranchInfo, Block, ExtFuncData, FuncRef, GlobalValue, GlobalValueData, Heap,
+    HeapData, Inst, InstructionData, JumpTable, JumpTableData, Opcode, SigRef, StackSlot,
+    StackSlotData, Table, TableData,
 };
 use crate::ir::{BlockOffsets, InstEncodings, SourceLocs, StackSlots, ValueLocations};
 use crate::ir::{DataFlowGraph, ExternalName, Layout, Signature};
@@ -94,7 +95,7 @@
     /// The instructions that mark the start (inclusive) of an epilogue in the function.
     ///
     /// This is used for some ABIs to generate unwind information.
-    pub epilogues_start: Vec<Inst>,
+    pub epilogues_start: Vec<(Inst, Block)>,
 
     /// An optional global value which represents an expression evaluating to
     /// the stack limit for this function. This `GlobalValue` will be
@@ -270,6 +271,8 @@
 
     /// Changes the destination of a jump or branch instruction.
     /// Does nothing if called with a non-jump or non-branch instruction.
+    ///
+    /// Note that this method ignores multi-destination branches like `br_table`.
     pub fn change_branch_destination(&mut self, inst: Inst, new_dest: Block) {
         match self.dfg[inst].branch_destination_mut() {
             None => (),
@@ -277,6 +280,43 @@
         }
     }
 
+    /// Rewrite the branch destination to `new_dest` if the destination matches `old_dest`.
+    /// Does nothing if called with a non-jump or non-branch instruction.
+    ///
+    /// Unlike [change_branch_destination](Function::change_branch_destination), this method rewrite the destinations of
+    /// multi-destination branches like `br_table`.
+    pub fn rewrite_branch_destination(&mut self, inst: Inst, old_dest: Block, new_dest: Block) {
+        match self.dfg.analyze_branch(inst) {
+            BranchInfo::SingleDest(dest, ..) => {
+                if dest == old_dest {
+                    self.change_branch_destination(inst, new_dest);
+                }
+            }
+
+            BranchInfo::Table(table, default_dest) => {
+                self.jump_tables[table].iter_mut().for_each(|entry| {
+                    if *entry == old_dest {
+                        *entry = new_dest;
+                    }
+                });
+
+                if default_dest == Some(old_dest) {
+                    match &mut self.dfg[inst] {
+                        InstructionData::BranchTable { destination, .. } => {
+                            *destination = new_dest;
+                        }
+                        _ => panic!(
+                            "Unexpected instruction {} having default destination",
+                            self.dfg.display_inst(inst, None)
+                        ),
+                    }
+                }
+            }
+
+            BranchInfo::NotABranch => {}
+        }
+    }
+
     /// Checks that the specified block can be encoded as a basic block.
     ///
     /// On error, returns the first invalid instruction and an error message.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/immediates.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/immediates.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/immediates.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/immediates.rs	2021-01-18 19:58:25.000000000 +0000
@@ -5,6 +5,7 @@
 //! `cranelift-codegen/meta/src/shared/immediates` crate in the meta language.
 
 use alloc::vec::Vec;
+use core::cmp::Ordering;
 use core::fmt::{self, Display, Formatter};
 use core::str::FromStr;
 use core::{i32, u32};
@@ -450,6 +451,7 @@
 ///
 /// All bit patterns are allowed.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[repr(C)]
 pub struct Ieee32(u32);
 
 /// An IEEE binary64 immediate floating point value, represented as a u64
@@ -457,6 +459,7 @@
 ///
 /// All bit patterns are allowed.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[repr(C)]
 pub struct Ieee64(u64);
 
 /// Format a floating point number in a way that is reasonably human-readable, and that can be
@@ -737,6 +740,17 @@
     pub fn bits(self) -> u32 {
         self.0
     }
+
+    /// Check if the value is a NaN.
+    pub fn is_nan(&self) -> bool {
+        f32::from_bits(self.0).is_nan()
+    }
+}
+
+impl PartialOrd for Ieee32 {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        f32::from_bits(self.0).partial_cmp(&f32::from_bits(other.0))
+    }
 }
 
 impl Display for Ieee32 {
@@ -810,6 +824,18 @@
     pub fn bits(self) -> u64 {
         self.0
     }
+
+    /// Check if the value is a NaN. For [Ieee64], this means checking that the 11 exponent bits are
+    /// all set.
+    pub fn is_nan(&self) -> bool {
+        f64::from_bits(self.0).is_nan()
+    }
+}
+
+impl PartialOrd for Ieee64 {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        f64::from_bits(self.0).partial_cmp(&f64::from_bits(other.0))
+    }
 }
 
 impl Display for Ieee64 {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/instructions.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/instructions.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/instructions.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/instructions.rs	2021-01-18 19:58:25.000000000 +0000
@@ -17,6 +17,7 @@
 use crate::isa;
 
 use crate::bitset::BitSet;
+use crate::data_value::DataValue;
 use crate::entity;
 use ir::condcodes::{FloatCC, IntCC};
 
@@ -276,7 +277,7 @@
                 ref mut destination,
                 ..
             } => Some(destination),
-            Self::BranchTable { .. } => None,
+            Self::BranchTable { .. } | Self::IndirectJump { .. } => None,
             _ => {
                 debug_assert!(!self.opcode().is_branch());
                 None
@@ -284,6 +285,41 @@
         }
     }
 
+    /// Return the value of an immediate if the instruction has one or `None` otherwise. Only
+    /// immediate values are considered, not global values, constant handles, condition codes, etc.
+    pub fn imm_value(&self) -> Option<DataValue> {
+        match self {
+            &InstructionData::UnaryBool { imm, .. } => Some(DataValue::from(imm)),
+            // 8-bit.
+            &InstructionData::BinaryImm8 { imm, .. }
+            | &InstructionData::BranchTableEntry { imm, .. } => Some(DataValue::from(imm as i8)), // Note the switch from unsigned to signed.
+            // 32-bit
+            &InstructionData::UnaryIeee32 { imm, .. } => Some(DataValue::from(imm)),
+            &InstructionData::HeapAddr { imm, .. } => {
+                let imm: u32 = imm.into();
+                Some(DataValue::from(imm as i32)) // Note the switch from unsigned to signed.
+            }
+            &InstructionData::Load { offset, .. }
+            | &InstructionData::LoadComplex { offset, .. }
+            | &InstructionData::Store { offset, .. }
+            | &InstructionData::StoreComplex { offset, .. }
+            | &InstructionData::StackLoad { offset, .. }
+            | &InstructionData::StackStore { offset, .. }
+            | &InstructionData::TableAddr { offset, .. } => Some(DataValue::from(offset)),
+            // 64-bit.
+            &InstructionData::UnaryImm { imm, .. }
+            | &InstructionData::BinaryImm64 { imm, .. }
+            | &InstructionData::IntCompareImm { imm, .. } => Some(DataValue::from(imm.bits())),
+            &InstructionData::UnaryIeee64 { imm, .. } => Some(DataValue::from(imm)),
+            // 128-bit; though these immediates are present logically in the IR they are not
+            // included in the `InstructionData` for memory-size reasons. This case, returning
+            // `None`, is left here to alert users of this method that they should retrieve the
+            // value using the `DataFlowGraph`.
+            &InstructionData::Shuffle { mask: _, .. } => None,
+            _ => None,
+        }
+    }
+
     /// If this is a trapping instruction, get its trap code. Otherwise, return
     /// `None`.
     pub fn trap_code(&self) -> Option<TrapCode> {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/trapcode.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/trapcode.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/ir/trapcode.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/ir/trapcode.rs	2021-01-18 19:58:25.000000000 +0000
@@ -12,9 +12,6 @@
 #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
 pub enum TrapCode {
     /// The current stack space was exhausted.
-    ///
-    /// On some platforms, a stack overflow may also be indicated by a segmentation fault from the
-    /// stack guard page.
     StackOverflow,
 
     /// A `heap_addr` instruction detected an out-of-bounds error.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/abi.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/abi.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/abi.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/abi.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,7 +3,7 @@
 use crate::ir;
 use crate::ir::types;
 use crate::ir::types::*;
-use crate::ir::SourceLoc;
+use crate::ir::MemFlags;
 use crate::isa;
 use crate::isa::aarch64::{inst::EmitState, inst::*};
 use crate::machinst::*;
@@ -152,6 +152,11 @@
         64
     }
 
+    /// Return required stack alignment in bytes.
+    fn stack_align(_call_conv: isa::CallConv) -> u32 {
+        16
+    }
+
     fn compute_arg_locs(
         call_conv: isa::CallConv,
         params: &[ir::AbiParam],
@@ -308,11 +313,11 @@
     }
 
     fn gen_load_stack(mem: StackAMode, into_reg: Writable<Reg>, ty: Type) -> Inst {
-        Inst::gen_load(into_reg, mem.into(), ty)
+        Inst::gen_load(into_reg, mem.into(), ty, MemFlags::trusted())
     }
 
     fn gen_store_stack(mem: StackAMode, from_reg: Reg, ty: Type) -> Inst {
-        Inst::gen_store(mem.into(), from_reg, ty)
+        Inst::gen_store(mem.into(), from_reg, ty, MemFlags::trusted())
     }
 
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Inst {
@@ -375,7 +380,7 @@
             extendop: ExtendOp::UXTX,
         });
         insts.push(Inst::TrapIf {
-            trap_info: (ir::SourceLoc::default(), ir::TrapCode::StackOverflow),
+            trap_code: ir::TrapCode::StackOverflow,
             // Here `Lo` == "less than" when interpreting the two
             // operands as unsigned integers.
             kind: CondBrKind::Cond(Cond::Lo),
@@ -398,12 +403,12 @@
 
     fn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Inst {
         let mem = AMode::RegOffset(base, offset as i64, ty);
-        Inst::gen_load(into_reg, mem, ty)
+        Inst::gen_load(into_reg, mem, ty, MemFlags::trusted())
     }
 
     fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Inst {
         let mem = AMode::RegOffset(base, offset as i64, ty);
-        Inst::gen_store(mem, from_reg, ty)
+        Inst::gen_store(mem, from_reg, ty, MemFlags::trusted())
     }
 
     fn gen_sp_reg_adjust(amount: i32) -> SmallVec<[Inst; 2]> {
@@ -460,6 +465,7 @@
                 writable_stack_reg(),
                 SImm7Scaled::maybe_from_i64(-16, types::I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         });
         // mov fp (x29), sp. This uses the ADDI rd, rs, 0 form of `MOV` because
         // the usual encoding (`ORR`) does not work with SP.
@@ -496,6 +502,7 @@
                 writable_stack_reg(),
                 SImm7Scaled::maybe_from_i64(16, types::I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         });
 
         insts
@@ -508,9 +515,10 @@
         _: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
         fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> (u64, SmallVec<[Inst; 16]>) {
         let mut insts = SmallVec::new();
-        let (clobbered_int, clobbered_vec) = get_callee_saves(call_conv, clobbers);
+        let (clobbered_int, clobbered_vec) = get_regs_saved_in_prologue(call_conv, clobbers);
 
         let (int_save_bytes, vec_save_bytes) = saved_reg_stack_size(&clobbered_int, &clobbered_vec);
         let total_save_bytes = (vec_save_bytes + int_save_bytes) as i32;
@@ -537,6 +545,7 @@
                     stack_reg(),
                     SImm7Scaled::maybe_from_i64((i * 16) as i64, types::I64).unwrap(),
                 ),
+                flags: MemFlags::trusted(),
             });
         }
 
@@ -548,7 +557,7 @@
                     stack_reg(),
                     SImm9::maybe_from_i64((vec_offset + (i * 16)) as i64).unwrap(),
                 ),
-                srcloc: None,
+                flags: MemFlags::trusted(),
             });
         }
 
@@ -559,9 +568,11 @@
         call_conv: isa::CallConv,
         flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
+        _fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> SmallVec<[Inst; 16]> {
         let mut insts = SmallVec::new();
-        let (clobbered_int, clobbered_vec) = get_callee_saves(call_conv, clobbers);
+        let (clobbered_int, clobbered_vec) = get_regs_saved_in_prologue(call_conv, clobbers);
 
         let (int_save_bytes, vec_save_bytes) = saved_reg_stack_size(&clobbered_int, &clobbered_vec);
         for (i, reg_pair) in clobbered_int.chunks(2).enumerate() {
@@ -585,6 +596,7 @@
                     stack_reg(),
                     SImm7Scaled::maybe_from_i64((i * 16) as i64, types::I64).unwrap(),
                 ),
+                flags: MemFlags::trusted(),
             });
         }
 
@@ -595,7 +607,7 @@
                     stack_reg(),
                     SImm9::maybe_from_i64(((i * 16) + int_save_bytes) as i64).unwrap(),
                 ),
-                srcloc: None,
+                flags: MemFlags::trusted(),
             });
         }
 
@@ -616,6 +628,7 @@
                 writable_xreg(BALDRDASH_TLS_REG),
                 AMode::UnsignedOffset(fp_reg(), UImm12Scaled::maybe_from_i64(off, I64).unwrap()),
                 I64,
+                MemFlags::trusted(),
             ));
         }
 
@@ -626,9 +639,10 @@
         dest: &CallDest,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: ir::Opcode,
         tmp: Writable<Reg>,
+        callee_conv: isa::CallConv,
+        caller_conv: isa::CallConv,
     ) -> SmallVec<[(InstIsSafepoint, Inst); 2]> {
         let mut insts = SmallVec::new();
         match &dest {
@@ -639,8 +653,9 @@
                         dest: name.clone(),
                         uses,
                         defs,
-                        loc,
                         opcode,
+                        caller_callconv: caller_conv,
+                        callee_callconv: callee_conv,
                     }),
                 },
             )),
@@ -651,7 +666,6 @@
                         rd: tmp,
                         name: Box::new(name.clone()),
                         offset: 0,
-                        srcloc: loc,
                     },
                 ));
                 insts.push((
@@ -661,8 +675,9 @@
                             rn: tmp.to_reg(),
                             uses,
                             defs,
-                            loc,
                             opcode,
+                            caller_callconv: caller_conv,
+                            callee_callconv: callee_conv,
                         }),
                     },
                 ));
@@ -674,8 +689,9 @@
                         rn: *reg,
                         uses,
                         defs,
-                        loc,
                         opcode,
+                        caller_callconv: caller_conv,
+                        callee_callconv: callee_conv,
                     }),
                 },
             )),
@@ -704,17 +720,17 @@
         s.nominal_sp_to_fp
     }
 
-    fn get_caller_saves(call_conv: isa::CallConv) -> Vec<Writable<Reg>> {
+    fn get_regs_clobbered_by_call(call_conv_of_callee: isa::CallConv) -> Vec<Writable<Reg>> {
         let mut caller_saved = Vec::new();
         for i in 0..29 {
             let x = writable_xreg(i);
-            if is_caller_save_reg(call_conv, x.to_reg().to_real_reg()) {
+            if is_reg_clobbered_by_call(call_conv_of_callee, x.to_reg().to_real_reg()) {
                 caller_saved.push(x);
             }
         }
         for i in 0..32 {
             let v = writable_vreg(i);
-            if is_caller_save_reg(call_conv, v.to_reg().to_real_reg()) {
+            if is_reg_clobbered_by_call(call_conv_of_callee, v.to_reg().to_real_reg()) {
                 caller_saved.push(v);
             }
         }
@@ -731,7 +747,9 @@
     }
 }
 
-fn is_callee_save_reg(call_conv: isa::CallConv, r: RealReg) -> bool {
+/// Is the given register saved in the prologue if clobbered, i.e., is it a
+/// callee-save?
+fn is_reg_saved_in_prologue(call_conv: isa::CallConv, r: RealReg) -> bool {
     if call_conv.extends_baldrdash() {
         match r.get_class() {
             RegClass::I64 => {
@@ -759,14 +777,17 @@
     }
 }
 
-fn get_callee_saves(
+/// Return the set of all integer and vector registers that must be saved in the
+/// prologue and restored in the epilogue, given the set of all registers
+/// written by the function's body.
+fn get_regs_saved_in_prologue(
     call_conv: isa::CallConv,
     regs: &Set<Writable<RealReg>>,
 ) -> (Vec<Writable<RealReg>>, Vec<Writable<RealReg>>) {
     let mut int_saves = vec![];
     let mut vec_saves = vec![];
     for &reg in regs.iter() {
-        if is_callee_save_reg(call_conv, reg.to_reg()) {
+        if is_reg_saved_in_prologue(call_conv, reg.to_reg()) {
             match reg.to_reg().get_class() {
                 RegClass::I64 => int_saves.push(reg),
                 RegClass::V128 => vec_saves.push(reg),
@@ -781,8 +802,8 @@
     (int_saves, vec_saves)
 }
 
-fn is_caller_save_reg(call_conv: isa::CallConv, r: RealReg) -> bool {
-    if call_conv.extends_baldrdash() {
+fn is_reg_clobbered_by_call(call_conv_of_callee: isa::CallConv, r: RealReg) -> bool {
+    if call_conv_of_callee.extends_baldrdash() {
         match r.get_class() {
             RegClass::I64 => {
                 let enc = r.get_hw_encoding();
@@ -808,8 +829,21 @@
             r.get_hw_encoding() <= 17
         }
         RegClass::V128 => {
-            // v0 - v7 inclusive and v16 - v31 inclusive are caller-saves.
-            r.get_hw_encoding() <= 7 || (r.get_hw_encoding() >= 16 && r.get_hw_encoding() <= 31)
+            // v0 - v7 inclusive and v16 - v31 inclusive are caller-saves. The
+            // upper 64 bits of v8 - v15 inclusive are also caller-saves.
+            // However, because we cannot currently represent partial registers
+            // to regalloc.rs, we indicate here that every vector register is
+            // caller-save. Because this function is used at *callsites*,
+            // approximating in this direction (save more than necessary) is
+            // conservative and thus safe.
+            //
+            // Note that we set the 'not included in clobber set' flag in the
+            // regalloc.rs API when a call instruction's callee has the same ABI
+            // as the caller (the current function body); this is safe (anything
+            // clobbered by callee can be clobbered by caller as well) and
+            // avoids unnecessary saves of v8-v15 in the prologue even though we
+            // include them as defs here.
+            true
         }
         _ => panic!("Unexpected RegClass"),
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/args.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/args.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/args.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/args.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,7 +8,7 @@
 use crate::isa::aarch64::inst::*;
 use crate::machinst::{ty_bits, MachLabel};
 
-use regalloc::{RealRegUniverse, Reg, Writable};
+use regalloc::{PrettyPrint, RealRegUniverse, Reg, Writable};
 
 use core::convert::Into;
 use std::string::String;
@@ -348,19 +348,19 @@
     }
 }
 
-impl ShowWithRRU for ShiftOpAndAmt {
+impl PrettyPrint for ShiftOpAndAmt {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("{:?} {}", self.op(), self.amt().value())
     }
 }
 
-impl ShowWithRRU for ExtendOp {
+impl PrettyPrint for ExtendOp {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("{:?}", self)
     }
 }
 
-impl ShowWithRRU for MemLabel {
+impl PrettyPrint for MemLabel {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &MemLabel::PCRel(off) => format!("pc+{}", off),
@@ -379,7 +379,7 @@
     }
 }
 
-impl ShowWithRRU for AMode {
+impl PrettyPrint for AMode {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &AMode::Unscaled(reg, simm9) => {
@@ -458,7 +458,7 @@
     }
 }
 
-impl ShowWithRRU for PairAMode {
+impl PrettyPrint for PairAMode {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &PairAMode::SignedOffset(reg, simm7) => {
@@ -482,7 +482,7 @@
     }
 }
 
-impl ShowWithRRU for Cond {
+impl PrettyPrint for Cond {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         let mut s = format!("{:?}", self);
         s.make_ascii_lowercase();
@@ -490,7 +490,7 @@
     }
 }
 
-impl ShowWithRRU for BranchTarget {
+impl PrettyPrint for BranchTarget {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &BranchTarget::Label(label) => format!("label{:?}", label.get()),
@@ -579,6 +579,15 @@
         }
     }
 
+    /// Convert to an integer operand size.
+    pub fn operand_size(&self) -> OperandSize {
+        match self {
+            ScalarSize::Size32 => OperandSize::Size32,
+            ScalarSize::Size64 => OperandSize::Size64,
+            _ => panic!("Unexpected operand_size request for: {:?}", self),
+        }
+    }
+
     /// Convert from a type into the smallest size that fits.
     pub fn from_ty(ty: Type) -> ScalarSize {
         Self::from_bits(ty_bits(ty))
@@ -609,10 +618,27 @@
 }
 
 impl VectorSize {
+    /// Get the vector operand size with the given scalar size as lane size.
+    pub fn from_lane_size(size: ScalarSize, is_128bit: bool) -> VectorSize {
+        match (size, is_128bit) {
+            (ScalarSize::Size8, false) => VectorSize::Size8x8,
+            (ScalarSize::Size8, true) => VectorSize::Size8x16,
+            (ScalarSize::Size16, false) => VectorSize::Size16x4,
+            (ScalarSize::Size16, true) => VectorSize::Size16x8,
+            (ScalarSize::Size32, false) => VectorSize::Size32x2,
+            (ScalarSize::Size32, true) => VectorSize::Size32x4,
+            (ScalarSize::Size64, true) => VectorSize::Size64x2,
+            _ => panic!("Unexpected scalar FP operand size: {:?}", size),
+        }
+    }
+
     /// Convert from a type into a vector operand size.
     pub fn from_ty(ty: Type) -> VectorSize {
         match ty {
+            B8X16 => VectorSize::Size8x16,
+            B16X8 => VectorSize::Size16x8,
             B32X4 => VectorSize::Size32x4,
+            B64X2 => VectorSize::Size64x2,
             F32X2 => VectorSize::Size32x2,
             F32X4 => VectorSize::Size32x4,
             F64X2 => VectorSize::Size64x2,
@@ -660,6 +686,9 @@
         }
     }
 
+    /// Produces a `VectorSize` with lanes twice as wide.  Note that if the resulting
+    /// size would exceed 128 bits, then the number of lanes is also halved, so as to
+    /// ensure that the result size is at most 128 bits.
     pub fn widen(&self) -> VectorSize {
         match self {
             VectorSize::Size8x8 => VectorSize::Size16x8,
@@ -672,6 +701,7 @@
         }
     }
 
+    /// Produces a `VectorSize` that has the same lane width, but half as many lanes.
     pub fn halve(&self) -> VectorSize {
         match self {
             VectorSize::Size8x16 => VectorSize::Size8x8,
@@ -680,4 +710,19 @@
             _ => *self,
         }
     }
+
+    /// Return the encoding bits that are used by some SIMD instructions
+    /// for a particular operand size.
+    pub fn enc_size(&self) -> (u32, u32) {
+        let q = self.is_128bits() as u32;
+        let size = match self.lane_size() {
+            ScalarSize::Size8 => 0b00,
+            ScalarSize::Size16 => 0b01,
+            ScalarSize::Size32 => 0b10,
+            ScalarSize::Size64 => 0b11,
+            _ => unreachable!(),
+        };
+
+        (q, size)
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,7 +3,7 @@
 use crate::binemit::{CodeOffset, Reloc, StackMap};
 use crate::ir::constant::ConstantData;
 use crate::ir::types::*;
-use crate::ir::TrapCode;
+use crate::ir::{MemFlags, TrapCode};
 use crate::isa::aarch64::inst::*;
 use crate::machinst::ty_bits;
 
@@ -248,6 +248,16 @@
     (op_31_24 << 24) | (imm19 << 5) | machreg_to_gpr_or_vec(rd)
 }
 
+fn enc_ldst_vec(q: u32, size: u32, rn: Reg, rt: Writable<Reg>) -> u32 {
+    debug_assert_eq!(q & 0b1, q);
+    debug_assert_eq!(size & 0b11, size);
+    0b0_0_0011010_10_00000_110_0_00_00000_00000
+        | q << 30
+        | size << 10
+        | machreg_to_gpr(rn) << 5
+        | machreg_to_vec(rt.to_reg())
+}
+
 fn enc_extend(top22: u32, rd: Writable<Reg>, rn: Reg) -> u32 {
     (top22 << 10) | (machreg_to_gpr(rn) << 5) | machreg_to_gpr(rd.to_reg())
 }
@@ -427,6 +437,21 @@
         | machreg_to_gpr(rt)
 }
 
+fn enc_asimd_mod_imm(rd: Writable<Reg>, q_op: u32, cmode: u32, imm: u8) -> u32 {
+    let abc = (imm >> 5) as u32;
+    let defgh = (imm & 0b11111) as u32;
+
+    debug_assert_eq!(cmode & 0b1111, cmode);
+    debug_assert_eq!(q_op & 0b11, q_op);
+
+    0b0_0_0_0111100000_000_0000_01_00000_00000
+        | (q_op << 29)
+        | (abc << 16)
+        | (cmode << 12)
+        | (defgh << 5)
+        | machreg_to_vec(rd.to_reg())
+}
+
 /// State carried between emissions of a sequence of instructions.
 #[derive(Default, Clone, Debug)]
 pub struct EmitState {
@@ -437,6 +462,8 @@
     pub(crate) nominal_sp_to_fp: i64,
     /// Safepoint stack map for upcoming instruction, as provided to `pre_safepoint()`.
     stack_map: Option<StackMap>,
+    /// Current source-code location corresponding to instruction to be emitted.
+    cur_srcloc: SourceLoc,
 }
 
 impl MachInstEmitState<Inst> for EmitState {
@@ -445,12 +472,17 @@
             virtual_sp_offset: 0,
             nominal_sp_to_fp: abi.frame_size() as i64,
             stack_map: None,
+            cur_srcloc: SourceLoc::default(),
         }
     }
 
     fn pre_safepoint(&mut self, stack_map: StackMap) {
         self.stack_map = Some(stack_map);
     }
+
+    fn pre_sourceloc(&mut self, srcloc: SourceLoc) {
+        self.cur_srcloc = srcloc;
+    }
 }
 
 impl EmitState {
@@ -461,12 +493,33 @@
     fn clear_post_insn(&mut self) {
         self.stack_map = None;
     }
+
+    fn cur_srcloc(&self) -> SourceLoc {
+        self.cur_srcloc
+    }
+}
+
+/// Constant state used during function compilation.
+pub struct EmitInfo(settings::Flags);
+
+impl EmitInfo {
+    pub(crate) fn new(flags: settings::Flags) -> Self {
+        Self(flags)
+    }
+}
+
+impl MachInstEmitInfo for EmitInfo {
+    fn flags(&self) -> &settings::Flags {
+        &self.0
+    }
 }
 
 impl MachInstEmit for Inst {
     type State = EmitState;
+    type Info = EmitInfo;
+    type UnwindInfo = super::unwind::AArch64UnwindInfo;
 
-    fn emit(&self, sink: &mut MachBuffer<Inst>, flags: &settings::Flags, state: &mut EmitState) {
+    fn emit(&self, sink: &mut MachBuffer<Inst>, emit_info: &Self::Info, state: &mut EmitState) {
         // N.B.: we *must* not exceed the "worst-case size" used to compute
         // where to insert islands, except when islands are explicitly triggered
         // (with an `EmitIsland`). We check this in debug builds. This is `mut`
@@ -688,61 +741,22 @@
                 sink.put4(enc_bit_rr(size, op1, op2, rn, rd))
             }
 
-            &Inst::ULoad8 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::SLoad8 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::ULoad16 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::SLoad16 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::ULoad32 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::SLoad32 {
-                rd,
-                ref mem,
-                srcloc,
-            }
+            &Inst::ULoad8 { rd, ref mem, flags }
+            | &Inst::SLoad8 { rd, ref mem, flags }
+            | &Inst::ULoad16 { rd, ref mem, flags }
+            | &Inst::SLoad16 { rd, ref mem, flags }
+            | &Inst::ULoad32 { rd, ref mem, flags }
+            | &Inst::SLoad32 { rd, ref mem, flags }
             | &Inst::ULoad64 {
-                rd,
-                ref mem,
-                srcloc,
-                ..
-            }
-            | &Inst::FpuLoad32 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::FpuLoad64 {
-                rd,
-                ref mem,
-                srcloc,
+                rd, ref mem, flags, ..
             }
-            | &Inst::FpuLoad128 {
-                rd,
-                ref mem,
-                srcloc,
-            } => {
+            | &Inst::FpuLoad32 { rd, ref mem, flags }
+            | &Inst::FpuLoad64 { rd, ref mem, flags }
+            | &Inst::FpuLoad128 { rd, ref mem, flags } => {
                 let (mem_insts, mem) = mem_finalize(sink.cur_offset(), mem, state);
 
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
 
                 // ldst encoding helpers take Reg, not Writable<Reg>.
@@ -765,7 +779,8 @@
                     _ => unreachable!(),
                 };
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() && !flags.notrap() {
                     // Register the offset at which the actual load instruction starts.
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
@@ -848,46 +863,17 @@
                 }
             }
 
-            &Inst::Store8 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::Store16 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::Store32 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::Store64 {
-                rd,
-                ref mem,
-                srcloc,
-                ..
-            }
-            | &Inst::FpuStore32 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::FpuStore64 {
-                rd,
-                ref mem,
-                srcloc,
-            }
-            | &Inst::FpuStore128 {
-                rd,
-                ref mem,
-                srcloc,
-            } => {
+            &Inst::Store8 { rd, ref mem, flags }
+            | &Inst::Store16 { rd, ref mem, flags }
+            | &Inst::Store32 { rd, ref mem, flags }
+            | &Inst::Store64 { rd, ref mem, flags }
+            | &Inst::FpuStore32 { rd, ref mem, flags }
+            | &Inst::FpuStore64 { rd, ref mem, flags }
+            | &Inst::FpuStore128 { rd, ref mem, flags } => {
                 let (mem_insts, mem) = mem_finalize(sink.cur_offset(), mem, state);
 
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
 
                 let (op, bits) = match self {
@@ -901,7 +887,8 @@
                     _ => unreachable!(),
                 };
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() && !flags.notrap() {
                     // Register the offset at which the actual load instruction starts.
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
@@ -958,21 +945,44 @@
                 }
             }
 
-            &Inst::StoreP64 { rt, rt2, ref mem } => match mem {
-                &PairAMode::SignedOffset(reg, simm7) => {
-                    assert_eq!(simm7.scale_ty, I64);
-                    sink.put4(enc_ldst_pair(0b1010100100, simm7, reg, rt, rt2));
-                }
-                &PairAMode::PreIndexed(reg, simm7) => {
-                    assert_eq!(simm7.scale_ty, I64);
-                    sink.put4(enc_ldst_pair(0b1010100110, simm7, reg.to_reg(), rt, rt2));
-                }
-                &PairAMode::PostIndexed(reg, simm7) => {
-                    assert_eq!(simm7.scale_ty, I64);
-                    sink.put4(enc_ldst_pair(0b1010100010, simm7, reg.to_reg(), rt, rt2));
+            &Inst::StoreP64 {
+                rt,
+                rt2,
+                ref mem,
+                flags,
+            } => {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() && !flags.notrap() {
+                    // Register the offset at which the actual load instruction starts.
+                    sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
-            },
-            &Inst::LoadP64 { rt, rt2, ref mem } => {
+                match mem {
+                    &PairAMode::SignedOffset(reg, simm7) => {
+                        assert_eq!(simm7.scale_ty, I64);
+                        sink.put4(enc_ldst_pair(0b1010100100, simm7, reg, rt, rt2));
+                    }
+                    &PairAMode::PreIndexed(reg, simm7) => {
+                        assert_eq!(simm7.scale_ty, I64);
+                        sink.put4(enc_ldst_pair(0b1010100110, simm7, reg.to_reg(), rt, rt2));
+                    }
+                    &PairAMode::PostIndexed(reg, simm7) => {
+                        assert_eq!(simm7.scale_ty, I64);
+                        sink.put4(enc_ldst_pair(0b1010100010, simm7, reg.to_reg(), rt, rt2));
+                    }
+                }
+            }
+            &Inst::LoadP64 {
+                rt,
+                rt2,
+                ref mem,
+                flags,
+            } => {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() && !flags.notrap() {
+                    // Register the offset at which the actual load instruction starts.
+                    sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
+                }
+
                 let rt = rt.to_reg();
                 let rt2 = rt2.to_reg();
                 match mem {
@@ -1044,7 +1054,7 @@
             } => {
                 sink.put4(enc_ccmp_imm(size, rn, imm, nzcv, cond));
             }
-            &Inst::AtomicRMW { ty, op, srcloc } => {
+            &Inst::AtomicRMW { ty, op } => {
                 /* Emit this:
                       dmb         ish
                      again:
@@ -1082,7 +1092,8 @@
 
                 // again:
                 sink.bind_label(again_label);
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 sink.put4(enc_ldxr(ty, x27wr, x25)); // ldxr x27, [x25]
@@ -1103,7 +1114,8 @@
                     sink.put4(enc_arith_rrr(bits_31_21, 0b000000, x28wr, x27, x26));
                 }
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 sink.put4(enc_stxr(ty, x24wr, x28, x25)); // stxr w24, x28, [x25]
@@ -1120,7 +1132,7 @@
 
                 sink.put4(enc_dmb_ish()); // dmb ish
             }
-            &Inst::AtomicCAS { ty, srcloc } => {
+            &Inst::AtomicCAS { ty } => {
                 /* Emit this:
                      dmb         ish
                     again:
@@ -1153,7 +1165,8 @@
 
                 // again:
                 sink.bind_label(again_label);
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 sink.put4(enc_ldxr(ty, x27wr, x25)); // ldxr x27, [x25]
@@ -1188,7 +1201,8 @@
                 ));
                 sink.use_label_at_offset(br_out_offset, out_label, LabelUse::Branch19);
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 sink.put4(enc_stxr(ty, x24wr, x28, x25)); // stxr w24, x28, [x25]
@@ -1207,12 +1221,7 @@
                 sink.bind_label(out_label);
                 sink.put4(enc_dmb_ish()); // dmb ish
             }
-            &Inst::AtomicLoad {
-                ty,
-                r_data,
-                r_addr,
-                srcloc,
-            } => {
+            &Inst::AtomicLoad { ty, r_data, r_addr } => {
                 let op = match ty {
                     I8 => 0b0011100001,
                     I16 => 0b0111100001,
@@ -1222,7 +1231,8 @@
                 };
                 sink.put4(enc_dmb_ish()); // dmb ish
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 let uimm12scaled_zero = UImm12Scaled::zero(I8 /*irrelevant*/);
@@ -1233,12 +1243,7 @@
                     r_data.to_reg(),
                 ));
             }
-            &Inst::AtomicStore {
-                ty,
-                r_data,
-                r_addr,
-                srcloc,
-            } => {
+            &Inst::AtomicStore { ty, r_data, r_addr } => {
                 let op = match ty {
                     I8 => 0b0011100000,
                     I16 => 0b0111100000,
@@ -1247,7 +1252,8 @@
                     _ => unreachable!(),
                 };
 
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
                 let uimm12scaled_zero = UImm12Scaled::zero(I8 /*irrelevant*/);
@@ -1364,14 +1370,7 @@
                 sink.put4(enc_fpurrrr(top17, rd, rn, rm, ra));
             }
             &Inst::VecMisc { op, rd, rn, size } => {
-                let enc_size = match size.lane_size() {
-                    ScalarSize::Size8 => 0b00,
-                    ScalarSize::Size16 => 0b01,
-                    ScalarSize::Size32 => 0b10,
-                    ScalarSize::Size64 => 0b11,
-                    _ => unreachable!(),
-                };
-                let q = if size.is_128bits() { 1 } else { 0 };
+                let (q, enc_size) = size.enc_size();
                 let (u, bits_12_16, size) = match op {
                     VecMisc2::Not => (0b1, 0b00101, 0b00),
                     VecMisc2::Neg => (0b1, 0b01011, enc_size),
@@ -1413,6 +1412,22 @@
                         debug_assert!(size == VectorSize::Size32x4 || size == VectorSize::Size64x2);
                         (0b1, 0b11101, enc_size & 0b1)
                     }
+                    VecMisc2::Frintn => {
+                        debug_assert!(size == VectorSize::Size32x4 || size == VectorSize::Size64x2);
+                        (0b0, 0b11000, enc_size & 0b01)
+                    }
+                    VecMisc2::Frintz => {
+                        debug_assert!(size == VectorSize::Size32x4 || size == VectorSize::Size64x2);
+                        (0b0, 0b11001, enc_size | 0b10)
+                    }
+                    VecMisc2::Frintm => {
+                        debug_assert!(size == VectorSize::Size32x4 || size == VectorSize::Size64x2);
+                        (0b0, 0b11001, enc_size & 0b01)
+                    }
+                    VecMisc2::Frintp => {
+                        debug_assert!(size == VectorSize::Size32x4 || size == VectorSize::Size64x2);
+                        (0b0, 0b11000, enc_size | 0b10)
+                    }
                 };
                 sink.put4(enc_vec_rr_misc((q << 1) | u, size, bits_12_16, rd, rn));
             }
@@ -1425,9 +1440,67 @@
                 };
                 let (u, opcode) = match op {
                     VecLanesOp::Uminv => (0b1, 0b11010),
+                    VecLanesOp::Addv => (0b0, 0b11011),
                 };
                 sink.put4(enc_vec_lanes(q, u, size, opcode, rd, rn));
             }
+            &Inst::VecShiftImm {
+                op,
+                rd,
+                rn,
+                size,
+                imm,
+            } => {
+                let (is_shr, template) = match op {
+                    VecShiftImmOp::Ushr => (true, 0b_011_011110_0000_000_000001_00000_00000_u32),
+                    VecShiftImmOp::Sshr => (true, 0b_010_011110_0000_000_000001_00000_00000_u32),
+                    VecShiftImmOp::Shl => (false, 0b_010_011110_0000_000_010101_00000_00000_u32),
+                };
+                let imm = imm as u32;
+                // Deal with the somewhat strange encoding scheme for, and limits on,
+                // the shift amount.
+                let immh_immb = match (size, is_shr) {
+                    (VectorSize::Size64x2, true) if imm >= 1 && imm <= 64 => {
+                        0b_1000_000_u32 | (64 - imm)
+                    }
+                    (VectorSize::Size32x4, true) if imm >= 1 && imm <= 32 => {
+                        0b_0100_000_u32 | (32 - imm)
+                    }
+                    (VectorSize::Size16x8, true) if imm >= 1 && imm <= 16 => {
+                        0b_0010_000_u32 | (16 - imm)
+                    }
+                    (VectorSize::Size8x16, true) if imm >= 1 && imm <= 8 => {
+                        0b_0001_000_u32 | (8 - imm)
+                    }
+                    (VectorSize::Size64x2, false) if imm <= 63 => 0b_1000_000_u32 | imm,
+                    (VectorSize::Size32x4, false) if imm <= 31 => 0b_0100_000_u32 | imm,
+                    (VectorSize::Size16x8, false) if imm <= 15 => 0b_0010_000_u32 | imm,
+                    (VectorSize::Size8x16, false) if imm <= 7 => 0b_0001_000_u32 | imm,
+                    _ => panic!(
+                        "aarch64: Inst::VecShiftImm: emit: invalid op/size/imm {:?}, {:?}, {:?}",
+                        op, size, imm
+                    ),
+                };
+                let rn_enc = machreg_to_vec(rn);
+                let rd_enc = machreg_to_vec(rd.to_reg());
+                sink.put4(template | (immh_immb << 16) | (rn_enc << 5) | rd_enc);
+            }
+            &Inst::VecExtract { rd, rn, rm, imm4 } => {
+                if imm4 < 16 {
+                    let template = 0b_01_101110_000_00000_0_0000_0_00000_00000_u32;
+                    let rm_enc = machreg_to_vec(rm);
+                    let rn_enc = machreg_to_vec(rn);
+                    let rd_enc = machreg_to_vec(rd.to_reg());
+                    sink.put4(
+                        template | (rm_enc << 16) | ((imm4 as u32) << 11) | (rn_enc << 5) | rd_enc,
+                    );
+                } else {
+                    panic!(
+                        "aarch64: Inst::VecExtract: emit: invalid extract index {}",
+                        imm4
+                    );
+                }
+            }
             &Inst::VecTbl {
                 rd,
                 rn,
@@ -1494,43 +1567,30 @@
                 };
                 sink.put4(enc_inttofpu(top16, rd, rn));
             }
-            &Inst::LoadFpuConst32 { rd, const_data } => {
-                let inst = Inst::FpuLoad32 {
-                    rd,
-                    mem: AMode::Label(MemLabel::PCRel(8)),
-                    srcloc: None,
-                };
-                inst.emit(sink, flags, state);
-                let inst = Inst::Jump {
-                    dest: BranchTarget::ResolvedOffset(8),
-                };
-                inst.emit(sink, flags, state);
-                sink.put4(const_data.to_bits());
-            }
             &Inst::LoadFpuConst64 { rd, const_data } => {
                 let inst = Inst::FpuLoad64 {
                     rd,
                     mem: AMode::Label(MemLabel::PCRel(8)),
-                    srcloc: None,
+                    flags: MemFlags::trusted(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 let inst = Inst::Jump {
                     dest: BranchTarget::ResolvedOffset(12),
                 };
-                inst.emit(sink, flags, state);
-                sink.put8(const_data.to_bits());
+                inst.emit(sink, emit_info, state);
+                sink.put8(const_data);
             }
             &Inst::LoadFpuConst128 { rd, const_data } => {
                 let inst = Inst::FpuLoad128 {
                     rd,
                     mem: AMode::Label(MemLabel::PCRel(8)),
-                    srcloc: None,
+                    flags: MemFlags::trusted(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 let inst = Inst::Jump {
                     dest: BranchTarget::ResolvedOffset(20),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
 
                 for i in const_data.to_le_bytes().iter() {
                     sink.put1(*i);
@@ -1555,12 +1615,13 @@
                 };
                 sink.put4(enc_fround(top22, rd, rn));
             }
-            &Inst::MovToFpu { rd, rn } => {
-                sink.put4(
-                    0b100_11110_01_1_00_111_000000_00000_00000
-                        | (machreg_to_gpr(rn) << 5)
-                        | machreg_to_vec(rd.to_reg()),
-                );
+            &Inst::MovToFpu { rd, rn, size } => {
+                let template = match size {
+                    ScalarSize::Size32 => 0b000_11110_00_1_00_111_000000_00000_00000,
+                    ScalarSize::Size64 => 0b100_11110_01_1_00_111_000000_00000_00000,
+                    _ => unreachable!(),
+                };
+                sink.put4(template | (machreg_to_gpr(rn) << 5) | machreg_to_vec(rd.to_reg()));
             }
             &Inst::MovToVec { rd, rn, idx, size } => {
                 let (imm5, shift) = match size.lane_size() {
@@ -1657,6 +1718,53 @@
                         | machreg_to_vec(rd.to_reg()),
                 );
             }
+            &Inst::VecDupImm {
+                rd,
+                imm,
+                invert,
+                size,
+            } => {
+                let (imm, shift, shift_ones) = imm.value();
+                let (op, cmode) = match size.lane_size() {
+                    ScalarSize::Size8 => {
+                        assert!(!invert);
+                        assert_eq!(shift, 0);
+
+                        (0, 0b1110)
+                    }
+                    ScalarSize::Size16 => {
+                        let s = shift & 8;
+
+                        assert!(!shift_ones);
+                        assert_eq!(s, shift);
+
+                        (invert as u32, 0b1000 | (s >> 2))
+                    }
+                    ScalarSize::Size32 => {
+                        if shift_ones {
+                            assert!(shift == 8 || shift == 16);
+
+                            (invert as u32, 0b1100 | (shift >> 4))
+                        } else {
+                            let s = shift & 24;
+
+                            assert_eq!(s, shift);
+
+                            (invert as u32, 0b0000 | (s >> 2))
+                        }
+                    }
+                    ScalarSize::Size64 => {
+                        assert!(!invert);
+                        assert_eq!(shift, 0);
+
+                        (1, 0b1110)
+                    }
+                    _ => unreachable!(),
+                };
+                let q_op = op | ((size.is_128bits() as u32) << 1);
+
+                sink.put4(enc_asimd_mod_imm(rd, q_op, cmode, imm));
+            }
             &Inst::VecExtend {
                 t,
                 rd,
@@ -1709,8 +1817,8 @@
             &Inst::VecMovElement {
                 rd,
                 rn,
-                idx1,
-                idx2,
+                dest_idx,
+                src_idx,
                 size,
             } => {
                 let (imm5, shift) = match size.lane_size() {
@@ -1721,10 +1829,10 @@
                     _ => unreachable!(),
                 };
                 let mask = 0b11111 >> shift;
-                debug_assert_eq!(idx1 & mask, idx1);
-                debug_assert_eq!(idx2 & mask, idx2);
-                let imm4 = (idx2 as u32) << (shift - 1);
-                let imm5 = imm5 | ((idx1 as u32) << shift);
+                debug_assert_eq!(dest_idx & mask, dest_idx);
+                debug_assert_eq!(src_idx & mask, src_idx);
+                let imm4 = (src_idx as u32) << (shift - 1);
+                let imm5 = imm5 | ((dest_idx as u32) << shift);
                 sink.put4(
                     0b011_01110000_00000_0_0000_1_00000_00000
                         | (imm5 << 16)
@@ -1740,13 +1848,7 @@
                 alu_op,
                 size,
             } => {
-                let enc_size = match size.lane_size() {
-                    ScalarSize::Size8 => 0b00,
-                    ScalarSize::Size16 => 0b01,
-                    ScalarSize::Size32 => 0b10,
-                    ScalarSize::Size64 => 0b11,
-                    _ => unreachable!(),
-                };
+                let (q, enc_size) = size.enc_size();
                 let is_float = match alu_op {
                     VecALUOp::Fcmeq
                     | VecALUOp::Fcmgt
@@ -1760,6 +1862,7 @@
                     _ => false,
                 };
                 let enc_float_size = match (is_float, size) {
+                    (true, VectorSize::Size32x2) => 0b0,
                     (true, VectorSize::Size32x4) => 0b0,
                     (true, VectorSize::Size64x2) => 0b1,
                     (true, _) => unimplemented!(),
@@ -1767,58 +1870,112 @@
                 };
 
                 let (top11, bit15_10) = match alu_op {
-                    VecALUOp::Sqadd => (0b010_01110_00_1 | enc_size << 1, 0b000011),
-                    VecALUOp::Sqsub => (0b010_01110_00_1 | enc_size << 1, 0b001011),
-                    VecALUOp::Uqadd => (0b011_01110_00_1 | enc_size << 1, 0b000011),
-                    VecALUOp::Uqsub => (0b011_01110_00_1 | enc_size << 1, 0b001011),
-                    VecALUOp::Cmeq => (0b011_01110_00_1 | enc_size << 1, 0b100011),
-                    VecALUOp::Cmge => (0b010_01110_00_1 | enc_size << 1, 0b001111),
-                    VecALUOp::Cmgt => (0b010_01110_00_1 | enc_size << 1, 0b001101),
-                    VecALUOp::Cmhi => (0b011_01110_00_1 | enc_size << 1, 0b001101),
-                    VecALUOp::Cmhs => (0b011_01110_00_1 | enc_size << 1, 0b001111),
-                    VecALUOp::Fcmeq => (0b010_01110_00_1, 0b111001),
-                    VecALUOp::Fcmgt => (0b011_01110_10_1, 0b111001),
-                    VecALUOp::Fcmge => (0b011_01110_00_1, 0b111001),
+                    VecALUOp::Sqadd => (0b000_01110_00_1 | enc_size << 1, 0b000011),
+                    VecALUOp::Sqsub => (0b000_01110_00_1 | enc_size << 1, 0b001011),
+                    VecALUOp::Uqadd => (0b001_01110_00_1 | enc_size << 1, 0b000011),
+                    VecALUOp::Uqsub => (0b001_01110_00_1 | enc_size << 1, 0b001011),
+                    VecALUOp::Cmeq => (0b001_01110_00_1 | enc_size << 1, 0b100011),
+                    VecALUOp::Cmge => (0b000_01110_00_1 | enc_size << 1, 0b001111),
+                    VecALUOp::Cmgt => (0b000_01110_00_1 | enc_size << 1, 0b001101),
+                    VecALUOp::Cmhi => (0b001_01110_00_1 | enc_size << 1, 0b001101),
+                    VecALUOp::Cmhs => (0b001_01110_00_1 | enc_size << 1, 0b001111),
+                    VecALUOp::Fcmeq => (0b000_01110_00_1, 0b111001),
+                    VecALUOp::Fcmgt => (0b001_01110_10_1, 0b111001),
+                    VecALUOp::Fcmge => (0b001_01110_00_1, 0b111001),
                     // The following logical instructions operate on bytes, so are not encoded differently
                     // for the different vector types.
-                    VecALUOp::And => (0b010_01110_00_1, 0b000111),
-                    VecALUOp::Bic => (0b010_01110_01_1, 0b000111),
-                    VecALUOp::Orr => (0b010_01110_10_1, 0b000111),
-                    VecALUOp::Eor => (0b011_01110_00_1, 0b000111),
-                    VecALUOp::Bsl => (0b011_01110_01_1, 0b000111),
-                    VecALUOp::Umaxp => (0b011_01110_00_1 | enc_size << 1, 0b101001),
-                    VecALUOp::Add => (0b010_01110_00_1 | enc_size << 1, 0b100001),
-                    VecALUOp::Sub => (0b011_01110_00_1 | enc_size << 1, 0b100001),
+                    VecALUOp::And => (0b000_01110_00_1, 0b000111),
+                    VecALUOp::Bic => (0b000_01110_01_1, 0b000111),
+                    VecALUOp::Orr => (0b000_01110_10_1, 0b000111),
+                    VecALUOp::Eor => (0b001_01110_00_1, 0b000111),
+                    VecALUOp::Bsl => (0b001_01110_01_1, 0b000111),
+                    VecALUOp::Umaxp => (0b001_01110_00_1 | enc_size << 1, 0b101001),
+                    VecALUOp::Add => (0b000_01110_00_1 | enc_size << 1, 0b100001),
+                    VecALUOp::Sub => (0b001_01110_00_1 | enc_size << 1, 0b100001),
                     VecALUOp::Mul => {
                         debug_assert_ne!(size, VectorSize::Size64x2);
-                        (0b010_01110_00_1 | enc_size << 1, 0b100111)
+                        (0b000_01110_00_1 | enc_size << 1, 0b100111)
                     }
-                    VecALUOp::Sshl => (0b010_01110_00_1 | enc_size << 1, 0b010001),
-                    VecALUOp::Ushl => (0b011_01110_00_1 | enc_size << 1, 0b010001),
-                    VecALUOp::Umin => (0b011_01110_00_1 | enc_size << 1, 0b011011),
-                    VecALUOp::Smin => (0b010_01110_00_1 | enc_size << 1, 0b011011),
-                    VecALUOp::Umax => (0b011_01110_00_1 | enc_size << 1, 0b011001),
-                    VecALUOp::Smax => (0b010_01110_00_1 | enc_size << 1, 0b011001),
-                    VecALUOp::Urhadd => (0b011_01110_00_1 | enc_size << 1, 0b000101),
-                    VecALUOp::Fadd => (0b010_01110_00_1, 0b110101),
-                    VecALUOp::Fsub => (0b010_01110_10_1, 0b110101),
-                    VecALUOp::Fdiv => (0b011_01110_00_1, 0b111111),
-                    VecALUOp::Fmax => (0b010_01110_00_1, 0b111101),
-                    VecALUOp::Fmin => (0b010_01110_10_1, 0b111101),
-                    VecALUOp::Fmul => (0b011_01110_00_1, 0b110111),
-                    VecALUOp::Addp => (0b010_01110_00_1 | enc_size << 1, 0b101111),
+                    VecALUOp::Sshl => (0b000_01110_00_1 | enc_size << 1, 0b010001),
+                    VecALUOp::Ushl => (0b001_01110_00_1 | enc_size << 1, 0b010001),
+                    VecALUOp::Umin => (0b001_01110_00_1 | enc_size << 1, 0b011011),
+                    VecALUOp::Smin => (0b000_01110_00_1 | enc_size << 1, 0b011011),
+                    VecALUOp::Umax => (0b001_01110_00_1 | enc_size << 1, 0b011001),
+                    VecALUOp::Smax => (0b000_01110_00_1 | enc_size << 1, 0b011001),
+                    VecALUOp::Urhadd => (0b001_01110_00_1 | enc_size << 1, 0b000101),
+                    VecALUOp::Fadd => (0b000_01110_00_1, 0b110101),
+                    VecALUOp::Fsub => (0b000_01110_10_1, 0b110101),
+                    VecALUOp::Fdiv => (0b001_01110_00_1, 0b111111),
+                    VecALUOp::Fmax => (0b000_01110_00_1, 0b111101),
+                    VecALUOp::Fmin => (0b000_01110_10_1, 0b111101),
+                    VecALUOp::Fmul => (0b001_01110_00_1, 0b110111),
+                    VecALUOp::Addp => (0b000_01110_00_1 | enc_size << 1, 0b101111),
                     VecALUOp::Umlal => {
                         debug_assert!(!size.is_128bits());
                         (0b001_01110_00_1 | enc_size << 1, 0b100000)
                     }
+                    VecALUOp::Zip1 => (0b01001110_00_0 | enc_size << 1, 0b001110),
+                    VecALUOp::Smull => (0b000_01110_00_1 | enc_size << 1, 0b110000),
+                    VecALUOp::Smull2 => (0b010_01110_00_1 | enc_size << 1, 0b110000),
                 };
-                let top11 = if is_float {
-                    top11 | enc_float_size << 1
-                } else {
-                    top11
+                let top11 = match alu_op {
+                    VecALUOp::Smull | VecALUOp::Smull2 => top11,
+                    _ if is_float => top11 | (q << 9) | enc_float_size << 1,
+                    _ => top11 | (q << 9),
                 };
                 sink.put4(enc_vec_rrr(top11, rm, bit15_10, rn, rd));
             }
+            &Inst::VecLoadReplicate { rd, rn, size } => {
+                let (q, size) = size.enc_size();
+
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
+                    // Register the offset at which the actual load instruction starts.
+                    sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
+                }
+
+                sink.put4(enc_ldst_vec(q, size, rn, rd));
+            }
+            &Inst::VecCSel { rd, rn, rm, cond } => {
+                /* Emit this:
+                      b.cond  else
+                      mov     rd, rm
+                      b       out
+                     else:
+                      mov     rd, rn
+                     out:
+
+                   Note, we could do better in the cases where rd == rn or rd == rm.
+                */
+                let else_label = sink.get_label();
+                let out_label = sink.get_label();
+
+                // b.cond else
+                let br_else_offset = sink.cur_offset();
+                sink.put4(enc_conditional_br(
+                    BranchTarget::Label(else_label),
+                    CondBrKind::Cond(cond),
+                ));
+                sink.use_label_at_offset(br_else_offset, else_label, LabelUse::Branch19);
+
+                // mov rd, rm
+                sink.put4(enc_vecmov(/* 16b = */ true, rd, rm));
+
+                // b out
+                let b_out_offset = sink.cur_offset();
+                sink.use_label_at_offset(b_out_offset, out_label, LabelUse::Branch26);
+                sink.add_uncond_branch(b_out_offset, b_out_offset + 4, out_label);
+                sink.put4(enc_jump26(0b000101, 0 /* will be fixed up later */));
+
+                // else:
+                sink.bind_label(else_label);
+
+                // mov rd, rn
+                sink.put4(enc_vecmov(/* 16b = */ true, rd, rn));
+
+                // out:
+                sink.bind_label(out_label);
+            }
             &Inst::MovToNZCV { rn } => {
                 sink.put4(0xd51b4200 | machreg_to_gpr(rn));
             }
@@ -1854,7 +2011,7 @@
                 if top22 != 0 {
                     sink.put4(enc_extend(top22, rd, rn));
                 } else {
-                    Inst::mov32(rd, rn).emit(sink, flags, state);
+                    Inst::mov32(rd, rn).emit(sink, emit_info, state);
                 }
             }
             &Inst::Extend {
@@ -1877,7 +2034,7 @@
                     rn: zero_reg(),
                     rm: rd.to_reg(),
                 };
-                sub_inst.emit(sink, flags, state);
+                sub_inst.emit(sink, emit_info, state);
             }
             &Inst::Extend {
                 rd,
@@ -1916,10 +2073,11 @@
                 if let Some(s) = state.take_stack_map() {
                     sink.add_stack_map(StackMapExtent::UpcomingBytes(4), s);
                 }
-                sink.add_reloc(info.loc, Reloc::Arm64Call, &info.dest, 0);
+                let loc = state.cur_srcloc();
+                sink.add_reloc(loc, Reloc::Arm64Call, &info.dest, 0);
                 sink.put4(enc_jump26(0b100101, 0));
                 if info.opcode.is_call() {
-                    sink.add_call_site(info.loc, info.opcode);
+                    sink.add_call_site(loc, info.opcode);
                 }
             }
             &Inst::CallInd { ref info } => {
@@ -1927,8 +2085,9 @@
                     sink.add_stack_map(StackMapExtent::UpcomingBytes(4), s);
                 }
                 sink.put4(0b1101011_0001_11111_000000_00000_00000 | (machreg_to_gpr(info.rn) << 5));
+                let loc = state.cur_srcloc();
                 if info.opcode.is_call() {
-                    sink.add_call_site(info.loc, info.opcode);
+                    sink.add_call_site(loc, info.opcode);
                 }
             }
             &Inst::CondBr {
@@ -1953,7 +2112,7 @@
                 }
                 sink.put4(enc_jump26(0b000101, not_taken.as_offset26_or_zero()));
             }
-            &Inst::TrapIf { kind, trap_info } => {
+            &Inst::TrapIf { kind, trap_code } => {
                 // condbr KIND, LABEL
                 let off = sink.cur_offset();
                 let label = sink.get_label();
@@ -1963,8 +2122,8 @@
                 ));
                 sink.use_label_at_offset(off, label, LabelUse::Branch19);
                 // udf
-                let trap = Inst::Udf { trap_info };
-                trap.emit(sink, flags, state);
+                let trap = Inst::Udf { trap_code };
+                trap.emit(sink, emit_info, state);
                 // LABEL:
                 sink.bind_label(label);
             }
@@ -1978,9 +2137,9 @@
             &Inst::Brk => {
                 sink.put4(0xd4200000);
             }
-            &Inst::Udf { trap_info } => {
-                let (srcloc, code) = trap_info;
-                sink.add_trap(srcloc, code);
+            &Inst::Udf { trap_code } => {
+                let srcloc = state.cur_srcloc();
+                sink.add_trap(srcloc, trap_code);
                 if let Some(s) = state.take_stack_map() {
                     sink.add_stack_map(StackMapExtent::UpcomingBytes(4), s);
                 }
@@ -2022,10 +2181,10 @@
                 // Save index in a tmp (the live range of ridx only goes to start of this
                 // sequence; rtmp1 or rtmp2 may overwrite it).
                 let inst = Inst::gen_move(rtmp2, ridx, I64);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 // Load address of jump table
                 let inst = Inst::Adr { rd: rtmp1, off: 16 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 // Load value out of jump table
                 let inst = Inst::SLoad32 {
                     rd: rtmp2,
@@ -2035,9 +2194,9 @@
                         I32,
                         ExtendOp::UXTW,
                     ),
-                    srcloc: None, // can't cause a user trap.
+                    flags: MemFlags::trusted(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 // Add base of jump table to jump-table-sourced block offset
                 let inst = Inst::AluRRR {
                     alu_op: ALUOp::Add64,
@@ -2045,14 +2204,14 @@
                     rn: rtmp1.to_reg(),
                     rm: rtmp2.to_reg(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 // Branch to computed address. (`targets` here is only used for successor queries
                 // and is not needed for emission.)
                 let inst = Inst::IndirectBr {
                     rn: rtmp1.to_reg(),
                     targets: vec![],
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 // Emit jump table (table of 32-bit offsets).
                 let jt_off = sink.cur_offset();
                 for &target in info.targets.iter() {
@@ -2078,20 +2237,20 @@
                 rd,
                 ref name,
                 offset,
-                srcloc,
             } => {
                 let inst = Inst::ULoad64 {
                     rd,
                     mem: AMode::Label(MemLabel::PCRel(8)),
-                    srcloc: None, // can't cause a user trap.
+                    flags: MemFlags::trusted(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
                 let inst = Inst::Jump {
                     dest: BranchTarget::ResolvedOffset(12),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
+                let srcloc = state.cur_srcloc();
                 sink.add_reloc(srcloc, Reloc::Abs8, name, offset);
-                if flags.emit_all_ones_funcaddrs() {
+                if emit_info.flags().emit_all_ones_funcaddrs() {
                     sink.put8(u64::max_value());
                 } else {
                     sink.put8(0);
@@ -2100,12 +2259,15 @@
             &Inst::LoadAddr { rd, ref mem } => {
                 let (mem_insts, mem) = mem_finalize(sink.cur_offset(), mem, state);
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
 
-                let (reg, offset) = match mem {
-                    AMode::Unscaled(r, simm9) => (r, simm9.value()),
-                    AMode::UnsignedOffset(r, uimm12scaled) => (r, uimm12scaled.value() as i32),
+                let (reg, index_reg, offset) = match mem {
+                    AMode::RegExtended(r, idx, extendop) => (r, Some((idx, extendop)), 0),
+                    AMode::Unscaled(r, simm9) => (r, None, simm9.value()),
+                    AMode::UnsignedOffset(r, uimm12scaled) => {
+                        (r, None, uimm12scaled.value() as i32)
+                    }
                     _ => panic!("Unsupported case for LoadAddr: {:?}", mem),
                 };
                 let abs_offset = if offset < 0 {
@@ -2119,9 +2281,22 @@
                     ALUOp::Add64
                 };
 
-                if offset == 0 {
-                    let mov = Inst::mov(rd, reg);
-                    mov.emit(sink, flags, state);
+                if let Some((idx, extendop)) = index_reg {
+                    let add = Inst::AluRRRExtend {
+                        alu_op: ALUOp::Add64,
+                        rd,
+                        rn: reg,
+                        rm: idx,
+                        extendop,
+                    };
+
+                    add.emit(sink, emit_info, state);
+                } else if offset == 0 {
+                    if reg != rd.to_reg() {
+                        let mov = Inst::mov(rd, reg);
+
+                        mov.emit(sink, emit_info, state);
+                    }
                 } else if let Some(imm12) = Imm12::maybe_from_u64(abs_offset) {
                     let add = Inst::AluRRImm12 {
                         alu_op,
@@ -2129,7 +2304,7 @@
                         rn: reg,
                         imm12,
                     };
-                    add.emit(sink, flags, state);
+                    add.emit(sink, emit_info, state);
                 } else {
                     // Use `tmp2` here: `reg` may be `spilltmp` if the `AMode` on this instruction
                     // was initially an `SPOffset`. Assert that `tmp2` is truly free to use. Note
@@ -2140,7 +2315,7 @@
                     debug_assert!(reg != tmp2_reg());
                     let tmp = writable_tmp2_reg();
                     for insn in Inst::load_constant(tmp, abs_offset).into_iter() {
-                        insn.emit(sink, flags, state);
+                        insn.emit(sink, emit_info, state);
                     }
                     let add = Inst::AluRRR {
                         alu_op,
@@ -2148,7 +2323,7 @@
                         rn: reg,
                         rm: tmp.to_reg(),
                     };
-                    add.emit(sink, flags, state);
+                    add.emit(sink, emit_info, state);
                 }
             }
             &Inst::VirtualSPOffsetAdj { offset } => {
@@ -2165,7 +2340,7 @@
                     let jmp = Inst::Jump {
                         dest: BranchTarget::Label(jump_around_label),
                     };
-                    jmp.emit(sink, flags, state);
+                    jmp.emit(sink, emit_info, state);
                     sink.emit_island();
                     sink.bind_label(jump_around_label);
                 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit_tests.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit_tests.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit_tests.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/emit_tests.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,6 +1,7 @@
 use crate::ir::types::*;
 use crate::isa::aarch64::inst::*;
 use crate::isa::test_utils;
+use crate::isa::CallConv;
 use crate::settings;
 
 use alloc::boxed::Box;
@@ -8,7 +9,6 @@
 
 #[test]
 fn test_aarch64_binemit() {
-    let flags = settings::Flags::new(settings::builder());
     let mut insns = Vec::<(Inst, &str, &str)>::new();
 
     // N.B.: the architecture is little-endian, so when transcribing the 32-bit
@@ -1079,7 +1079,7 @@
         Inst::ULoad8 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41004038",
         "ldurb w1, [x2]",
@@ -1088,7 +1088,7 @@
         Inst::ULoad8 {
             rd: writable_xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::zero(I8)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41004039",
         "ldrb w1, [x2]",
@@ -1097,7 +1097,7 @@
         Inst::ULoad8 {
             rd: writable_xreg(1),
             mem: AMode::RegReg(xreg(2), xreg(5)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41686538",
         "ldrb w1, [x2, x5]",
@@ -1106,7 +1106,7 @@
         Inst::SLoad8 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41008038",
         "ldursb x1, [x2]",
@@ -1115,7 +1115,7 @@
         Inst::SLoad8 {
             rd: writable_xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(63, I8).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC8039",
         "ldrsb x1, [x2, #63]",
@@ -1124,7 +1124,7 @@
         Inst::SLoad8 {
             rd: writable_xreg(1),
             mem: AMode::RegReg(xreg(2), xreg(5)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "4168A538",
         "ldrsb x1, [x2, x5]",
@@ -1133,7 +1133,7 @@
         Inst::ULoad16 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::maybe_from_i64(5).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41504078",
         "ldurh w1, [x2, #5]",
@@ -1142,7 +1142,7 @@
         Inst::ULoad16 {
             rd: writable_xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(8, I16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41104079",
         "ldrh w1, [x2, #8]",
@@ -1151,7 +1151,7 @@
         Inst::ULoad16 {
             rd: writable_xreg(1),
             mem: AMode::RegScaled(xreg(2), xreg(3), I16),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41786378",
         "ldrh w1, [x2, x3, LSL #1]",
@@ -1160,7 +1160,7 @@
         Inst::SLoad16 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41008078",
         "ldursh x1, [x2]",
@@ -1169,7 +1169,7 @@
         Inst::SLoad16 {
             rd: writable_xreg(28),
             mem: AMode::UnsignedOffset(xreg(20), UImm12Scaled::maybe_from_i64(24, I16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "9C328079",
         "ldrsh x28, [x20, #24]",
@@ -1178,7 +1178,7 @@
         Inst::SLoad16 {
             rd: writable_xreg(28),
             mem: AMode::RegScaled(xreg(20), xreg(20), I16),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "9C7AB478",
         "ldrsh x28, [x20, x20, LSL #1]",
@@ -1187,7 +1187,7 @@
         Inst::ULoad32 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410040B8",
         "ldur w1, [x2]",
@@ -1196,7 +1196,7 @@
         Inst::ULoad32 {
             rd: writable_xreg(12),
             mem: AMode::UnsignedOffset(xreg(0), UImm12Scaled::maybe_from_i64(204, I32).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "0CCC40B9",
         "ldr w12, [x0, #204]",
@@ -1205,7 +1205,7 @@
         Inst::ULoad32 {
             rd: writable_xreg(1),
             mem: AMode::RegScaled(xreg(2), xreg(12), I32),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41786CB8",
         "ldr w1, [x2, x12, LSL #2]",
@@ -1214,7 +1214,7 @@
         Inst::SLoad32 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410080B8",
         "ldursw x1, [x2]",
@@ -1223,7 +1223,7 @@
         Inst::SLoad32 {
             rd: writable_xreg(12),
             mem: AMode::UnsignedOffset(xreg(1), UImm12Scaled::maybe_from_i64(16380, I32).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "2CFCBFB9",
         "ldrsw x12, [x1, #16380]",
@@ -1232,7 +1232,7 @@
         Inst::SLoad32 {
             rd: writable_xreg(1),
             mem: AMode::RegScaled(xreg(5), xreg(1), I32),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "A178A1B8",
         "ldrsw x1, [x5, x1, LSL #2]",
@@ -1241,7 +1241,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410040F8",
         "ldur x1, [x2]",
@@ -1250,7 +1250,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::maybe_from_i64(-256).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410050F8",
         "ldur x1, [x2, #-256]",
@@ -1259,7 +1259,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::maybe_from_i64(255).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41F04FF8",
         "ldur x1, [x2, #255]",
@@ -1268,7 +1268,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(32760, I64).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC7FF9",
         "ldr x1, [x2, #32760]",
@@ -1277,7 +1277,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegReg(xreg(2), xreg(3)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "416863F8",
         "ldr x1, [x2, x3]",
@@ -1286,7 +1286,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegScaled(xreg(2), xreg(3), I64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "417863F8",
         "ldr x1, [x2, x3, LSL #3]",
@@ -1295,7 +1295,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegScaledExtended(xreg(2), xreg(3), I64, ExtendOp::SXTW),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41D863F8",
         "ldr x1, [x2, w3, SXTW #3]",
@@ -1304,7 +1304,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegExtended(xreg(2), xreg(3), ExtendOp::SXTW),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41C863F8",
         "ldr x1, [x2, w3, SXTW]",
@@ -1313,7 +1313,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::Label(MemLabel::PCRel(64)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "01020058",
         "ldr x1, pc+64",
@@ -1322,7 +1322,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::PreIndexed(writable_xreg(2), SImm9::maybe_from_i64(16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410C41F8",
         "ldr x1, [x2, #16]!",
@@ -1331,7 +1331,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::PostIndexed(writable_xreg(2), SImm9::maybe_from_i64(16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410441F8",
         "ldr x1, [x2], #16",
@@ -1340,7 +1340,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::FPOffset(32768, I8),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "100090D2B063308B010240F9",
         "movz x16, #32768 ; add x16, fp, x16, UXTX ; ldr x1, [x16]",
@@ -1349,7 +1349,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::FPOffset(-32768, I8),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "F0FF8F92B063308B010240F9",
         "movn x16, #32767 ; add x16, fp, x16, UXTX ; ldr x1, [x16]",
@@ -1358,7 +1358,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::FPOffset(1048576, I8), // 2^20
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "1002A0D2B063308B010240F9",
         "movz x16, #16, LSL #16 ; add x16, fp, x16, UXTX ; ldr x1, [x16]",
@@ -1367,7 +1367,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::FPOffset(1048576 + 1, I8), // 2^20 + 1
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "300080521002A072B063308B010240F9",
         "movz w16, #1 ; movk w16, #16, LSL #16 ; add x16, fp, x16, UXTX ; ldr x1, [x16]",
@@ -1377,7 +1377,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegOffset(xreg(7), 8, I64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "E18040F8",
         "ldur x1, [x7, #8]",
@@ -1387,7 +1387,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegOffset(xreg(7), 1024, I64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "E10042F9",
         "ldr x1, [x7, #1024]",
@@ -1397,7 +1397,7 @@
         Inst::ULoad64 {
             rd: writable_xreg(1),
             mem: AMode::RegOffset(xreg(7), 1048576, I64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "1002A0D2F060308B010240F9",
         "movz x16, #16, LSL #16 ; add x16, x7, x16, UXTX ; ldr x1, [x16]",
@@ -1407,7 +1407,7 @@
         Inst::Store8 {
             rd: xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41000038",
         "sturb w1, [x2]",
@@ -1416,7 +1416,7 @@
         Inst::Store8 {
             rd: xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(4095, I8).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC3F39",
         "strb w1, [x2, #4095]",
@@ -1425,7 +1425,7 @@
         Inst::Store16 {
             rd: xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41000078",
         "sturh w1, [x2]",
@@ -1434,7 +1434,7 @@
         Inst::Store16 {
             rd: xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(8190, I16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC3F79",
         "strh w1, [x2, #8190]",
@@ -1443,7 +1443,7 @@
         Inst::Store32 {
             rd: xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410000B8",
         "stur w1, [x2]",
@@ -1452,7 +1452,7 @@
         Inst::Store32 {
             rd: xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(16380, I32).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC3FB9",
         "str w1, [x2, #16380]",
@@ -1461,7 +1461,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::Unscaled(xreg(2), SImm9::zero()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410000F8",
         "stur x1, [x2]",
@@ -1470,7 +1470,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::UnsignedOffset(xreg(2), UImm12Scaled::maybe_from_i64(32760, I64).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "41FC3FF9",
         "str x1, [x2, #32760]",
@@ -1479,7 +1479,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::RegReg(xreg(2), xreg(3)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "416823F8",
         "str x1, [x2, x3]",
@@ -1488,7 +1488,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::RegScaled(xreg(2), xreg(3), I64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "417823F8",
         "str x1, [x2, x3, LSL #3]",
@@ -1497,7 +1497,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::RegScaledExtended(xreg(2), xreg(3), I64, ExtendOp::UXTW),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "415823F8",
         "str x1, [x2, w3, UXTW #3]",
@@ -1506,7 +1506,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::RegExtended(xreg(2), xreg(3), ExtendOp::UXTW),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "414823F8",
         "str x1, [x2, w3, UXTW]",
@@ -1515,7 +1515,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::PreIndexed(writable_xreg(2), SImm9::maybe_from_i64(16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410C01F8",
         "str x1, [x2, #16]!",
@@ -1524,7 +1524,7 @@
         Inst::Store64 {
             rd: xreg(1),
             mem: AMode::PostIndexed(writable_xreg(2), SImm9::maybe_from_i64(16).unwrap()),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "410401F8",
         "str x1, [x2], #16",
@@ -1535,6 +1535,7 @@
             rt: xreg(8),
             rt2: xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::zero(I64)),
+            flags: MemFlags::trusted(),
         },
         "482500A9",
         "stp x8, x9, [x10]",
@@ -1544,6 +1545,7 @@
             rt: xreg(8),
             rt2: xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::maybe_from_i64(504, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "48A51FA9",
         "stp x8, x9, [x10, #504]",
@@ -1553,6 +1555,7 @@
             rt: xreg(8),
             rt2: xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::maybe_from_i64(-64, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "48253CA9",
         "stp x8, x9, [x10, #-64]",
@@ -1562,6 +1565,7 @@
             rt: xreg(21),
             rt2: xreg(28),
             mem: PairAMode::SignedOffset(xreg(1), SImm7Scaled::maybe_from_i64(-512, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "357020A9",
         "stp x21, x28, [x1, #-512]",
@@ -1574,6 +1578,7 @@
                 writable_xreg(10),
                 SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         },
         "4825BCA9",
         "stp x8, x9, [x10, #-64]!",
@@ -1586,6 +1591,7 @@
                 writable_xreg(20),
                 SImm7Scaled::maybe_from_i64(504, I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         },
         "8FC29FA8",
         "stp x15, x16, [x20], #504",
@@ -1596,6 +1602,7 @@
             rt: writable_xreg(8),
             rt2: writable_xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::zero(I64)),
+            flags: MemFlags::trusted(),
         },
         "482540A9",
         "ldp x8, x9, [x10]",
@@ -1605,6 +1612,7 @@
             rt: writable_xreg(8),
             rt2: writable_xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::maybe_from_i64(504, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "48A55FA9",
         "ldp x8, x9, [x10, #504]",
@@ -1614,6 +1622,7 @@
             rt: writable_xreg(8),
             rt2: writable_xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::maybe_from_i64(-64, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "48257CA9",
         "ldp x8, x9, [x10, #-64]",
@@ -1623,6 +1632,7 @@
             rt: writable_xreg(8),
             rt2: writable_xreg(9),
             mem: PairAMode::SignedOffset(xreg(10), SImm7Scaled::maybe_from_i64(-512, I64).unwrap()),
+            flags: MemFlags::trusted(),
         },
         "482560A9",
         "ldp x8, x9, [x10, #-512]",
@@ -1635,6 +1645,7 @@
                 writable_xreg(10),
                 SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         },
         "4825FCA9",
         "ldp x8, x9, [x10, #-64]!",
@@ -1647,6 +1658,7 @@
                 writable_xreg(12),
                 SImm7Scaled::maybe_from_i64(504, I64).unwrap(),
             ),
+            flags: MemFlags::trusted(),
         },
         "88E5DFA8",
         "ldp x8, x25, [x12], #504",
@@ -1860,11 +1872,21 @@
         Inst::MovToFpu {
             rd: writable_vreg(31),
             rn: xreg(0),
+            size: ScalarSize::Size64,
         },
         "1F00679E",
         "fmov d31, x0",
     ));
     insns.push((
+        Inst::MovToFpu {
+            rd: writable_vreg(1),
+            rn: xreg(28),
+            size: ScalarSize::Size32,
+        },
+        "8103271E",
+        "fmov s1, w28",
+    ));
+    insns.push((
         Inst::MovToVec {
             rd: writable_vreg(0),
             rn: xreg(0),
@@ -2035,6 +2057,26 @@
         "dup v18.2d, v10.d[0]",
     ));
     insns.push((
+        Inst::VecDupImm {
+            rd: writable_vreg(31),
+            imm: ASIMDMovModImm::maybe_from_u64(255, ScalarSize::Size8).unwrap(),
+            invert: false,
+            size: VectorSize::Size8x16,
+        },
+        "FFE7074F",
+        "movi v31.16b, #255",
+    ));
+    insns.push((
+        Inst::VecDupImm {
+            rd: writable_vreg(0),
+            imm: ASIMDMovModImm::zero(),
+            invert: true,
+            size: VectorSize::Size16x4,
+        },
+        "0084002F",
+        "mvni v0.4h, #0",
+    ));
+    insns.push((
         Inst::VecExtend {
             t: VecExtendOp::Sxtl8,
             rd: writable_vreg(4),
@@ -2099,8 +2141,8 @@
         Inst::VecMovElement {
             rd: writable_vreg(0),
             rn: vreg(31),
-            idx1: 7,
-            idx2: 7,
+            dest_idx: 7,
+            src_idx: 7,
             size: VectorSize::Size16x8,
         },
         "E0771E6E",
@@ -2111,8 +2153,8 @@
         Inst::VecMovElement {
             rd: writable_vreg(31),
             rn: vreg(16),
-            idx1: 1,
-            idx2: 0,
+            dest_idx: 1,
+            src_idx: 0,
             size: VectorSize::Size32x2,
         },
         "1F060C6E",
@@ -2533,10 +2575,10 @@
             rd: writable_vreg(28),
             rn: vreg(12),
             rm: vreg(4),
-            size: VectorSize::Size32x4,
+            size: VectorSize::Size32x2,
         },
-        "9CE5244E",
-        "fcmeq v28.4s, v12.4s, v4.4s",
+        "9CE5240E",
+        "fcmeq v28.2s, v12.2s, v4.2s",
     ));
 
     insns.push((
@@ -2965,10 +3007,10 @@
             rd: writable_vreg(6),
             rn: vreg(9),
             rm: vreg(8),
-            size: VectorSize::Size8x16,
+            size: VectorSize::Size8x8,
         },
-        "2665286E",
-        "umax v6.16b, v9.16b, v8.16b",
+        "2665282E",
+        "umax v6.8b, v9.8b, v8.8b",
     ));
 
     insns.push((
@@ -3176,6 +3218,126 @@
     ));
 
     insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Zip1,
+            rd: writable_vreg(16),
+            rn: vreg(12),
+            rm: vreg(1),
+            size: VectorSize::Size8x16,
+        },
+        "9039014E",
+        "zip1 v16.16b, v12.16b, v1.16b",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Zip1,
+            rd: writable_vreg(2),
+            rn: vreg(13),
+            rm: vreg(6),
+            size: VectorSize::Size16x8,
+        },
+        "A239464E",
+        "zip1 v2.8h, v13.8h, v6.8h",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Zip1,
+            rd: writable_vreg(8),
+            rn: vreg(12),
+            rm: vreg(14),
+            size: VectorSize::Size32x4,
+        },
+        "88398E4E",
+        "zip1 v8.4s, v12.4s, v14.4s",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Zip1,
+            rd: writable_vreg(9),
+            rn: vreg(20),
+            rm: vreg(17),
+            size: VectorSize::Size64x2,
+        },
+        "893AD14E",
+        "zip1 v9.2d, v20.2d, v17.2d",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull,
+            rd: writable_vreg(16),
+            rn: vreg(12),
+            rm: vreg(1),
+            size: VectorSize::Size8x16,
+        },
+        "90C1210E",
+        "smull v16.8h, v12.8b, v1.8b",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull,
+            rd: writable_vreg(2),
+            rn: vreg(13),
+            rm: vreg(6),
+            size: VectorSize::Size16x8,
+        },
+        "A2C1660E",
+        "smull v2.4s, v13.4h, v6.4h",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull,
+            rd: writable_vreg(8),
+            rn: vreg(12),
+            rm: vreg(14),
+            size: VectorSize::Size32x4,
+        },
+        "88C1AE0E",
+        "smull v8.2d, v12.2s, v14.2s",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull2,
+            rd: writable_vreg(16),
+            rn: vreg(12),
+            rm: vreg(1),
+            size: VectorSize::Size8x16,
+        },
+        "90C1214E",
+        "smull2 v16.8h, v12.16b, v1.16b",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull2,
+            rd: writable_vreg(2),
+            rn: vreg(13),
+            rm: vreg(6),
+            size: VectorSize::Size16x8,
+        },
+        "A2C1664E",
+        "smull2 v2.4s, v13.8h, v6.8h",
+    ));
+
+    insns.push((
+        Inst::VecRRR {
+            alu_op: VecALUOp::Smull2,
+            rd: writable_vreg(8),
+            rn: vreg(12),
+            rm: vreg(14),
+            size: VectorSize::Size32x4,
+        },
+        "88C1AE4E",
+        "smull2 v8.2d, v12.4s, v14.4s",
+    ));
+
+    insns.push((
         Inst::VecMisc {
             op: VecMisc2::Not,
             rd: writable_vreg(20),
@@ -3429,6 +3591,94 @@
     ));
 
     insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintn,
+            rd: writable_vreg(11),
+            rn: vreg(18),
+            size: VectorSize::Size32x4,
+        },
+        "4B8A214E",
+        "frintn v11.4s, v18.4s",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintn,
+            rd: writable_vreg(12),
+            rn: vreg(17),
+            size: VectorSize::Size64x2,
+        },
+        "2C8A614E",
+        "frintn v12.2d, v17.2d",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintz,
+            rd: writable_vreg(11),
+            rn: vreg(18),
+            size: VectorSize::Size32x4,
+        },
+        "4B9AA14E",
+        "frintz v11.4s, v18.4s",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintz,
+            rd: writable_vreg(12),
+            rn: vreg(17),
+            size: VectorSize::Size64x2,
+        },
+        "2C9AE14E",
+        "frintz v12.2d, v17.2d",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintm,
+            rd: writable_vreg(11),
+            rn: vreg(18),
+            size: VectorSize::Size32x4,
+        },
+        "4B9A214E",
+        "frintm v11.4s, v18.4s",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintm,
+            rd: writable_vreg(12),
+            rn: vreg(17),
+            size: VectorSize::Size64x2,
+        },
+        "2C9A614E",
+        "frintm v12.2d, v17.2d",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintp,
+            rd: writable_vreg(11),
+            rn: vreg(18),
+            size: VectorSize::Size32x4,
+        },
+        "4B8AA14E",
+        "frintp v11.4s, v18.4s",
+    ));
+
+    insns.push((
+        Inst::VecMisc {
+            op: VecMisc2::Frintp,
+            rd: writable_vreg(12),
+            rn: vreg(17),
+            size: VectorSize::Size64x2,
+        },
+        "2C8AE14E",
+        "frintp v12.2d, v17.2d",
+    ));
+
+    insns.push((
         Inst::VecLanes {
             op: VecLanesOp::Uminv,
             rd: writable_vreg(2),
@@ -3462,6 +3712,168 @@
     ));
 
     insns.push((
+        Inst::VecLanes {
+            op: VecLanesOp::Addv,
+            rd: writable_vreg(2),
+            rn: vreg(29),
+            size: VectorSize::Size8x16,
+        },
+        "A2BB314E",
+        "addv b2, v29.16b",
+    ));
+
+    insns.push((
+        Inst::VecLanes {
+            op: VecLanesOp::Addv,
+            rd: writable_vreg(3),
+            rn: vreg(21),
+            size: VectorSize::Size16x8,
+        },
+        "A3BA714E",
+        "addv h3, v21.8h",
+    ));
+
+    insns.push((
+        Inst::VecLanes {
+            op: VecLanesOp::Addv,
+            rd: writable_vreg(18),
+            rn: vreg(5),
+            size: VectorSize::Size32x4,
+        },
+        "B2B8B14E",
+        "addv s18, v5.4s",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Shl,
+            rd: writable_vreg(27),
+            rn: vreg(5),
+            imm: 7,
+            size: VectorSize::Size8x16,
+        },
+        "BB540F4F",
+        "shl v27.16b, v5.16b, #7",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Shl,
+            rd: writable_vreg(1),
+            rn: vreg(30),
+            imm: 0,
+            size: VectorSize::Size8x16,
+        },
+        "C157084F",
+        "shl v1.16b, v30.16b, #0",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Sshr,
+            rd: writable_vreg(26),
+            rn: vreg(6),
+            imm: 16,
+            size: VectorSize::Size16x8,
+        },
+        "DA04104F",
+        "sshr v26.8h, v6.8h, #16",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Sshr,
+            rd: writable_vreg(3),
+            rn: vreg(19),
+            imm: 1,
+            size: VectorSize::Size16x8,
+        },
+        "63061F4F",
+        "sshr v3.8h, v19.8h, #1",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Ushr,
+            rd: writable_vreg(25),
+            rn: vreg(6),
+            imm: 32,
+            size: VectorSize::Size32x4,
+        },
+        "D904206F",
+        "ushr v25.4s, v6.4s, #32",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Ushr,
+            rd: writable_vreg(5),
+            rn: vreg(21),
+            imm: 1,
+            size: VectorSize::Size32x4,
+        },
+        "A5063F6F",
+        "ushr v5.4s, v21.4s, #1",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Shl,
+            rd: writable_vreg(22),
+            rn: vreg(13),
+            imm: 63,
+            size: VectorSize::Size64x2,
+        },
+        "B6557F4F",
+        "shl v22.2d, v13.2d, #63",
+    ));
+
+    insns.push((
+        Inst::VecShiftImm {
+            op: VecShiftImmOp::Shl,
+            rd: writable_vreg(23),
+            rn: vreg(9),
+            imm: 0,
+            size: VectorSize::Size64x2,
+        },
+        "3755404F",
+        "shl v23.2d, v9.2d, #0",
+    ));
+
+    insns.push((
+        Inst::VecExtract {
+            rd: writable_vreg(1),
+            rn: vreg(30),
+            rm: vreg(17),
+            imm4: 0,
+        },
+        "C103116E",
+        "ext v1.16b, v30.16b, v17.16b, #0",
+    ));
+
+    insns.push((
+        Inst::VecExtract {
+            rd: writable_vreg(1),
+            rn: vreg(30),
+            rm: vreg(17),
+            imm4: 8,
+        },
+        "C143116E",
+        "ext v1.16b, v30.16b, v17.16b, #8",
+    ));
+
+    insns.push((
+        Inst::VecExtract {
+            rd: writable_vreg(1),
+            rn: vreg(30),
+            rm: vreg(17),
+            imm4: 15,
+        },
+        "C17B116E",
+        "ext v1.16b, v30.16b, v17.16b, #15",
+    ));
+
+    insns.push((
         Inst::VecTbl {
             rd: writable_vreg(0),
             rn: vreg(31),
@@ -3508,6 +3920,39 @@
     ));
 
     insns.push((
+        Inst::VecLoadReplicate {
+            rd: writable_vreg(31),
+            rn: xreg(0),
+
+            size: VectorSize::Size64x2,
+        },
+        "1FCC404D",
+        "ld1r { v31.2d }, [x0]",
+    ));
+
+    insns.push((
+        Inst::VecLoadReplicate {
+            rd: writable_vreg(0),
+            rn: xreg(25),
+
+            size: VectorSize::Size8x8,
+        },
+        "20C3400D",
+        "ld1r { v0.8b }, [x25]",
+    ));
+
+    insns.push((
+        Inst::VecCSel {
+            rd: writable_vreg(5),
+            rn: vreg(10),
+            rm: vreg(19),
+            cond: Cond::Gt,
+        },
+        "6C000054651EB34E02000014451DAA4E",
+        "vcsel v5.16b, v10.16b, v19.16b, gt (if-then-else diamond)",
+    ));
+
+    insns.push((
         Inst::Extend {
             rd: writable_xreg(1),
             rn: xreg(2),
@@ -3628,7 +4073,7 @@
 
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::NotZero(xreg(8)),
         },
         "480000B40000A0D4",
@@ -3636,7 +4081,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Zero(xreg(8)),
         },
         "480000B50000A0D4",
@@ -3644,7 +4089,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Ne),
         },
         "400000540000A0D4",
@@ -3652,7 +4097,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Eq),
         },
         "410000540000A0D4",
@@ -3660,7 +4105,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Lo),
         },
         "420000540000A0D4",
@@ -3668,7 +4113,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Hs),
         },
         "430000540000A0D4",
@@ -3676,7 +4121,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Pl),
         },
         "440000540000A0D4",
@@ -3684,7 +4129,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Mi),
         },
         "450000540000A0D4",
@@ -3692,7 +4137,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Vc),
         },
         "460000540000A0D4",
@@ -3700,7 +4145,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Vs),
         },
         "470000540000A0D4",
@@ -3708,7 +4153,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Ls),
         },
         "480000540000A0D4",
@@ -3716,7 +4161,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Hi),
         },
         "490000540000A0D4",
@@ -3724,7 +4169,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Lt),
         },
         "4A0000540000A0D4",
@@ -3732,7 +4177,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Ge),
         },
         "4B0000540000A0D4",
@@ -3740,7 +4185,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Le),
         },
         "4C0000540000A0D4",
@@ -3748,7 +4193,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Gt),
         },
         "4D0000540000A0D4",
@@ -3756,7 +4201,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Nv),
         },
         "4E0000540000A0D4",
@@ -3764,7 +4209,7 @@
     ));
     insns.push((
         Inst::TrapIf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
             kind: CondBrKind::Cond(Cond::Al),
         },
         "4F0000540000A0D4",
@@ -3787,8 +4232,9 @@
                 dest: ExternalName::testcase("test0"),
                 uses: Vec::new(),
                 defs: Vec::new(),
-                loc: SourceLoc::default(),
                 opcode: Opcode::Call,
+                caller_callconv: CallConv::SystemV,
+                callee_callconv: CallConv::SystemV,
             }),
         },
         "00000094",
@@ -3801,8 +4247,9 @@
                 rn: xreg(10),
                 uses: Vec::new(),
                 defs: Vec::new(),
-                loc: SourceLoc::default(),
                 opcode: Opcode::CallIndirect,
+                caller_callconv: CallConv::SystemV,
+                callee_callconv: CallConv::SystemV,
             }),
         },
         "40013FD6",
@@ -4371,7 +4818,7 @@
         Inst::FpuLoad32 {
             rd: writable_vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), F32),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "107969BC",
         "ldr s16, [x8, x9, LSL #2]",
@@ -4381,7 +4828,7 @@
         Inst::FpuLoad64 {
             rd: writable_vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), F64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "107969FC",
         "ldr d16, [x8, x9, LSL #3]",
@@ -4391,7 +4838,7 @@
         Inst::FpuLoad128 {
             rd: writable_vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), I128),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "1079E93C",
         "ldr q16, [x8, x9, LSL #4]",
@@ -4401,7 +4848,7 @@
         Inst::FpuLoad32 {
             rd: writable_vreg(16),
             mem: AMode::Label(MemLabel::PCRel(8)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "5000001C",
         "ldr s16, pc+8",
@@ -4411,7 +4858,7 @@
         Inst::FpuLoad64 {
             rd: writable_vreg(16),
             mem: AMode::Label(MemLabel::PCRel(8)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "5000005C",
         "ldr d16, pc+8",
@@ -4421,7 +4868,7 @@
         Inst::FpuLoad128 {
             rd: writable_vreg(16),
             mem: AMode::Label(MemLabel::PCRel(8)),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "5000009C",
         "ldr q16, pc+8",
@@ -4431,7 +4878,7 @@
         Inst::FpuStore32 {
             rd: vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), F32),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "107929BC",
         "str s16, [x8, x9, LSL #2]",
@@ -4441,7 +4888,7 @@
         Inst::FpuStore64 {
             rd: vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), F64),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "107929FC",
         "str d16, [x8, x9, LSL #3]",
@@ -4451,25 +4898,16 @@
         Inst::FpuStore128 {
             rd: vreg(16),
             mem: AMode::RegScaled(xreg(8), xreg(9), I128),
-            srcloc: None,
+            flags: MemFlags::trusted(),
         },
         "1079A93C",
         "str q16, [x8, x9, LSL #4]",
     ));
 
     insns.push((
-        Inst::LoadFpuConst32 {
-            rd: writable_vreg(16),
-            const_data: 1.0,
-        },
-        "5000001C020000140000803F",
-        "ldr s16, pc+8 ; b 8 ; data.f32 1",
-    ));
-
-    insns.push((
         Inst::LoadFpuConst64 {
             rd: writable_vreg(16),
-            const_data: 1.0,
+            const_data: 1.0_f64.to_bits(),
         },
         "5000005C03000014000000000000F03F",
         "ldr d16, pc+8 ; b 12 ; data.f64 1",
@@ -4583,7 +5021,6 @@
         Inst::AtomicRMW {
             ty: I16,
             op: inst_common::AtomicRmwOp::Xor,
-            srcloc: None,
         },
         "BF3B03D53B7F5F487C031ACA3C7F1848B8FFFFB5BF3B03D5",
         "atomically { 16_bits_at_[x25]) Xor= x26 ; x27 = old_value_at_[x25]; x24,x28 = trash }",
@@ -4593,7 +5030,6 @@
         Inst::AtomicRMW {
             ty: I32,
             op: inst_common::AtomicRmwOp::Xchg,
-            srcloc: None,
         },
         "BF3B03D53B7F5F88FC031AAA3C7F1888B8FFFFB5BF3B03D5",
         "atomically { 32_bits_at_[x25]) Xchg= x26 ; x27 = old_value_at_[x25]; x24,x28 = trash }",
@@ -4602,7 +5038,6 @@
     insns.push((
         Inst::AtomicCAS {
             ty: I8,
-            srcloc: None,
         },
         "BF3B03D53B7F5F08581F40927F0318EB610000543C7F180878FFFFB5BF3B03D5",
         "atomically { compare-and-swap(8_bits_at_[x25], x26 -> x28), x27 = old_value_at_[x25]; x24 = trash }"
@@ -4611,7 +5046,6 @@
     insns.push((
         Inst::AtomicCAS {
             ty: I64,
-            srcloc: None,
         },
         "BF3B03D53B7F5FC8F8031AAA7F0318EB610000543C7F18C878FFFFB5BF3B03D5",
         "atomically { compare-and-swap(64_bits_at_[x25], x26 -> x28), x27 = old_value_at_[x25]; x24 = trash }"
@@ -4622,7 +5056,6 @@
             ty: I8,
             r_data: writable_xreg(7),
             r_addr: xreg(28),
-            srcloc: None,
         },
         "BF3B03D587034039",
         "atomically { x7 = zero_extend_8_bits_at[x28] }",
@@ -4633,7 +5066,6 @@
             ty: I64,
             r_data: writable_xreg(28),
             r_addr: xreg(7),
-            srcloc: None,
         },
         "BF3B03D5FC0040F9",
         "atomically { x28 = zero_extend_64_bits_at[x7] }",
@@ -4644,7 +5076,6 @@
             ty: I16,
             r_data: xreg(17),
             r_addr: xreg(8),
-            srcloc: None,
         },
         "11010079BF3B03D5",
         "atomically { 16_bits_at[x8] = x17 }",
@@ -4655,7 +5086,6 @@
             ty: I32,
             r_data: xreg(18),
             r_addr: xreg(7),
-            srcloc: None,
         },
         "F20000B9BF3B03D5",
         "atomically { 32_bits_at[x7] = x18 }",
@@ -4663,7 +5093,9 @@
 
     insns.push((Inst::Fence {}, "BF3B03D5", "dmb ish"));
 
-    let rru = create_reg_universe(&settings::Flags::new(settings::builder()));
+    let flags = settings::Flags::new(settings::builder());
+    let rru = create_reg_universe(&flags);
+    let emit_info = EmitInfo::new(flags);
     for (insn, expected_encoding, expected_printing) in insns {
         println!(
             "AArch64: {:?}, {}, {}",
@@ -4676,7 +5108,7 @@
 
         let mut sink = test_utils::TestCodeSink::new();
         let mut buffer = MachBuffer::new();
-        insn.emit(&mut buffer, &flags, &mut Default::default());
+        insn.emit(&mut buffer, &emit_info, &mut Default::default());
         let buffer = buffer.finish();
         buffer.emit(&mut sink);
         let actual_encoding = &sink.stringify();
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/imms.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/imms.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/imms.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/imms.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,10 +4,9 @@
 #[allow(dead_code)]
 use crate::ir::types::*;
 use crate::ir::Type;
-use crate::isa::aarch64::inst::OperandSize;
-use crate::machinst::*;
+use crate::isa::aarch64::inst::{OperandSize, ScalarSize};
 
-use regalloc::RealRegUniverse;
+use regalloc::{PrettyPrint, RealRegUniverse};
 
 use core::convert::TryFrom;
 use std::string::String;
@@ -668,7 +667,41 @@
     }
 }
 
-impl ShowWithRRU for NZCV {
+/// Advanced SIMD modified immediate as used by MOVI/MVNI.
+#[derive(Clone, Copy, Debug)]
+pub struct ASIMDMovModImm {
+    imm: u8,
+    shift: u8,
+    shift_ones: bool,
+}
+
+impl ASIMDMovModImm {
+    pub fn maybe_from_u64(value: u64, size: ScalarSize) -> Option<ASIMDMovModImm> {
+        match size {
+            ScalarSize::Size8 => Some(ASIMDMovModImm {
+                imm: value as u8,
+                shift: 0,
+                shift_ones: false,
+            }),
+            _ => None,
+        }
+    }
+
+    /// Create a zero immediate of this format.
+    pub fn zero() -> Self {
+        ASIMDMovModImm {
+            imm: 0,
+            shift: 0,
+            shift_ones: false,
+        }
+    }
+
+    pub fn value(&self) -> (u8, u32, bool) {
+        (self.imm, self.shift as u32, self.shift_ones)
+    }
+}
+
+impl PrettyPrint for NZCV {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         let fmt = |c: char, v| if v { c.to_ascii_uppercase() } else { c };
         format!(
@@ -681,13 +714,13 @@
     }
 }
 
-impl ShowWithRRU for UImm5 {
+impl PrettyPrint for UImm5 {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for Imm12 {
+impl PrettyPrint for Imm12 {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         let shift = if self.shift12 { 12 } else { 0 };
         let value = u32::from(self.bits) << shift;
@@ -695,49 +728,49 @@
     }
 }
 
-impl ShowWithRRU for SImm7Scaled {
+impl PrettyPrint for SImm7Scaled {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for FPULeftShiftImm {
+impl PrettyPrint for FPULeftShiftImm {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.amount)
     }
 }
 
-impl ShowWithRRU for FPURightShiftImm {
+impl PrettyPrint for FPURightShiftImm {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.amount)
     }
 }
 
-impl ShowWithRRU for SImm9 {
+impl PrettyPrint for SImm9 {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for UImm12Scaled {
+impl PrettyPrint for UImm12Scaled {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for ImmLogic {
+impl PrettyPrint for ImmLogic {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value())
     }
 }
 
-impl ShowWithRRU for ImmShift {
+impl PrettyPrint for ImmShift {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.imm)
     }
 }
 
-impl ShowWithRRU for MoveWideConst {
+impl PrettyPrint for MoveWideConst {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         if self.shift == 0 {
             format!("#{}", self.bits)
@@ -746,6 +779,17 @@
         }
     }
 }
+
+impl PrettyPrint for ASIMDMovModImm {
+    fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
+        if self.shift == 0 {
+            format!("#{}", self.imm)
+        } else {
+            let shift_type = if self.shift_ones { "MSL" } else { "LSL" };
+            format!("#{}, {} #{}", self.imm, shift_type, self.shift)
+        }
+    }
+}
 
 #[cfg(test)]
 mod test {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,15 +8,17 @@
     B1, B16, B16X8, B32, B32X4, B64, B64X2, B8, B8X16, F32, F32X4, F64, F64X2, FFLAGS, I16, I16X8,
     I32, I32X4, I64, I64X2, I8, I8X16, IFLAGS, R32, R64,
 };
-use crate::ir::{ExternalName, Opcode, SourceLoc, TrapCode, Type};
+use crate::ir::{ExternalName, MemFlags, Opcode, SourceLoc, TrapCode, Type};
+use crate::isa::CallConv;
 use crate::machinst::*;
 use crate::{settings, CodegenError, CodegenResult};
 
-use regalloc::{RealRegUniverse, Reg, RegClass, SpillSlot, VirtualReg, Writable};
+use regalloc::{PrettyPrint, RealRegUniverse, Reg, RegClass, SpillSlot, VirtualReg, Writable};
 use regalloc::{RegUsageCollector, RegUsageMapper};
 
 use alloc::boxed::Box;
 use alloc::vec::Vec;
+use core::convert::TryFrom;
 use smallvec::{smallvec, SmallVec};
 use std::string::{String, ToString};
 
@@ -28,6 +30,7 @@
 pub use self::args::*;
 pub mod emit;
 pub use self::emit::*;
+pub mod unwind;
 
 #[cfg(test)]
 mod emit_tests;
@@ -286,6 +289,12 @@
     Addp,
     /// Unsigned multiply add long
     Umlal,
+    /// Zip vectors (primary) [meaning, high halves]
+    Zip1,
+    /// Signed multiply long (low halves)
+    Smull,
+    /// Signed multiply long (high halves)
+    Smull2,
 }
 
 /// A Vector miscellaneous operation with two registers.
@@ -315,6 +324,14 @@
     Scvtf,
     /// Unsigned integer convert to floating-point
     Ucvtf,
+    /// Floating point round to integral, rounding towards nearest
+    Frintn,
+    /// Floating point round to integral, rounding towards zero
+    Frintz,
+    /// Floating point round to integral, rounding towards minus infinity
+    Frintm,
+    /// Floating point round to integral, rounding towards plus infinity
+    Frintp,
 }
 
 /// A Vector narrowing operation with two registers.
@@ -331,10 +348,23 @@
 /// An operation across the lanes of vectors.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum VecLanesOp {
+    /// Integer addition across a vector
+    Addv,
     /// Unsigned minimum across a vector
     Uminv,
 }
 
+/// A shift-by-immediate operation on each lane of a vector.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+pub enum VecShiftImmOp {
+    // Unsigned shift left
+    Shl,
+    // Unsigned shift right
+    Ushr,
+    // Signed shift right
+    Sshr,
+}
+
 /// An operation on the bits of a register. This can be paired with several instruction formats
 /// below (see `Inst`) in any combination.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
@@ -390,8 +420,9 @@
     pub dest: ExternalName,
     pub uses: Vec<Reg>,
     pub defs: Vec<Writable<Reg>>,
-    pub loc: SourceLoc,
     pub opcode: Opcode,
+    pub caller_callconv: CallConv,
+    pub callee_callconv: CallConv,
 }
 
 /// Additional information for CallInd instructions, left out of line to lower the size of the Inst
@@ -401,8 +432,9 @@
     pub rn: Reg,
     pub uses: Vec<Reg>,
     pub defs: Vec<Writable<Reg>>,
-    pub loc: SourceLoc,
     pub opcode: Opcode,
+    pub caller_callconv: CallConv,
+    pub callee_callconv: CallConv,
 }
 
 /// Additional information for JTSequence instructions, left out of line to lower the size of the Inst
@@ -490,68 +522,68 @@
     ULoad8 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A signed (sign-extending) 8-bit load.
     SLoad8 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// An unsigned (zero-extending) 16-bit load.
     ULoad16 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A signed (sign-extending) 16-bit load.
     SLoad16 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// An unsigned (zero-extending) 32-bit load.
     ULoad32 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A signed (sign-extending) 32-bit load.
     SLoad32 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A 64-bit load.
     ULoad64 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
 
     /// An 8-bit store.
     Store8 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A 16-bit store.
     Store16 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A 32-bit store.
     Store32 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// A 64-bit store.
     Store64 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
 
     /// A store of a pair of registers.
@@ -559,12 +591,14 @@
         rt: Reg,
         rt2: Reg,
         mem: PairAMode,
+        flags: MemFlags,
     },
     /// A load of a pair of registers.
     LoadP64 {
         rt: Writable<Reg>,
         rt2: Writable<Reg>,
         mem: PairAMode,
+        flags: MemFlags,
     },
 
     /// A MOV instruction. These are encoded as ORR's (AluRRR form) but we
@@ -652,7 +686,6 @@
     AtomicRMW {
         ty: Type, // I8, I16, I32 or I64
         op: inst_common::AtomicRmwOp,
-        srcloc: Option<SourceLoc>,
     },
 
     /// Similar to AtomicRMW, a compare-and-swap operation implemented using a load-linked
@@ -669,7 +702,6 @@
     /// x24   (wr) scratch reg; value afterwards has no meaning
     AtomicCAS {
         ty: Type, // I8, I16, I32 or I64
-        srcloc: Option<SourceLoc>,
     },
 
     /// Read `ty` bits from address `r_addr`, zero extend the loaded value to 64 bits and put it
@@ -679,7 +711,6 @@
         ty: Type, // I8, I16, I32 or I64
         r_data: Writable<Reg>,
         r_addr: Reg,
-        srcloc: Option<SourceLoc>,
     },
 
     /// Write the lowest `ty` bits of `r_data` to address `r_addr`, with a memory fence
@@ -689,7 +720,6 @@
         ty: Type, // I8, I16, I32 or I64
         r_data: Reg,
         r_addr: Reg,
-        srcloc: Option<SourceLoc>,
     },
 
     /// A memory fence.  This must provide ordering to ensure that, at a minimum, neither loads
@@ -764,47 +794,42 @@
     FpuLoad32 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// Floating-point store, single-precision (32 bit).
     FpuStore32 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// Floating-point load, double-precision (64 bit).
     FpuLoad64 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// Floating-point store, double-precision (64 bit).
     FpuStore64 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// Floating-point/vector load, 128 bit.
     FpuLoad128 {
         rd: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
+        flags: MemFlags,
     },
     /// Floating-point/vector store, 128 bit.
     FpuStore128 {
         rd: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
-    },
-
-    LoadFpuConst32 {
-        rd: Writable<Reg>,
-        const_data: f32,
+        flags: MemFlags,
     },
 
     LoadFpuConst64 {
         rd: Writable<Reg>,
-        const_data: f64,
+        const_data: u64,
     },
 
     LoadFpuConst128 {
@@ -848,10 +873,13 @@
         rn: Reg,
     },
 
-    /// Move from a GPR to a scalar FP register.
+    /// Move from a GPR to a vector register.  The scalar value is parked in the lowest lane
+    /// of the destination, and all other lanes are zeroed out.  Currently only 32- and 64-bit
+    /// transactions are supported.
     MovToFpu {
         rd: Writable<Reg>,
         rn: Reg,
+        size: ScalarSize,
     },
 
     /// Move to a vector element from a GPR.
@@ -893,6 +921,14 @@
         size: VectorSize,
     },
 
+    /// Duplicate immediate to vector.
+    VecDupImm {
+        rd: Writable<Reg>,
+        imm: ASIMDMovModImm,
+        invert: bool,
+        size: VectorSize,
+    },
+
     /// Vector extend.
     VecExtend {
         t: VecExtendOp,
@@ -905,8 +941,8 @@
     VecMovElement {
         rd: Writable<Reg>,
         rn: Reg,
-        idx1: u8,
-        idx2: u8,
+        dest_idx: u8,
+        src_idx: u8,
         size: VectorSize,
     },
 
@@ -944,6 +980,28 @@
         size: VectorSize,
     },
 
+    /// Vector shift by immediate: Shift Left (immediate), Unsigned Shift Right (immediate),
+    /// Signed Shift Right (immediate).  These are somewhat unusual in that, for right shifts,
+    /// the allowed range of `imm` values is 1 to lane-size-in-bits, inclusive.  A zero
+    /// right-shift cannot be encoded.  Left shifts are "normal", though, having valid `imm`
+    /// values from 0 to lane-size-in-bits - 1 inclusive.
+    VecShiftImm {
+        op: VecShiftImmOp,
+        rd: Writable<Reg>,
+        rn: Reg,
+        size: VectorSize,
+        imm: u8,
+    },
+
+    /// Vector extract - create a new vector, being the concatenation of the lowest `imm4` bytes
+    /// of `rm` followed by the uppermost `16 - imm4` bytes of `rn`.
+    VecExtract {
+        rd: Writable<Reg>,
+        rn: Reg,
+        rm: Reg,
+        imm4: u8,
+    },
+
     /// Table vector lookup - single register table. The table consists of 8-bit elements and is
     /// stored in `rn`, while `rm` contains 8-bit element indices. `is_extension` specifies whether
     /// to emit a TBX or a TBL instruction, i.e. whether to leave the elements in the destination
@@ -970,6 +1028,22 @@
         is_extension: bool,
     },
 
+    /// Load an element and replicate to all lanes of a vector.
+    VecLoadReplicate {
+        rd: Writable<Reg>,
+        rn: Reg,
+        size: VectorSize,
+    },
+
+    /// Vector conditional select, 128 bit.  A synthetic instruction, which generates a 4-insn
+    /// control-flow diamond.
+    VecCSel {
+        rd: Writable<Reg>,
+        rn: Reg,
+        rm: Reg,
+        cond: Cond,
+    },
+
     /// Move to the NZCV flags (actually a `MSR NZCV, Xn` insn).
     MovToNZCV {
         rn: Reg,
@@ -1025,7 +1099,7 @@
     /// of this condition in a branch that skips the trap instruction.)
     TrapIf {
         kind: CondBrKind,
-        trap_info: (SourceLoc, TrapCode),
+        trap_code: TrapCode,
     },
 
     /// An indirect branch through a register, augmented with set of all
@@ -1041,7 +1115,7 @@
     /// An instruction guaranteed to always be undefined and to trigger an illegal instruction at
     /// runtime.
     Udf {
-        trap_info: (SourceLoc, TrapCode),
+        trap_code: TrapCode,
     },
 
     /// Compute the address (using a PC-relative offset) of a memory location, using the `ADR`
@@ -1076,7 +1150,6 @@
     LoadExtName {
         rd: Writable<Reg>,
         name: Box<ExternalName>,
-        srcloc: SourceLoc,
         offset: i64,
     },
 
@@ -1238,76 +1311,195 @@
         }
     }
 
-    /// Create an instruction that loads a 32-bit floating-point constant.
-    pub fn load_fp_constant32(rd: Writable<Reg>, value: f32) -> Inst {
-        // TODO: use FMOV immediate form when `value` has sufficiently few mantissa/exponent bits.
-        Inst::LoadFpuConst32 {
-            rd,
-            const_data: value,
+    /// Create instructions that load a 32-bit floating-point constant.
+    pub fn load_fp_constant32<F: FnMut(RegClass, Type) -> Writable<Reg>>(
+        rd: Writable<Reg>,
+        value: u32,
+        mut alloc_tmp: F,
+    ) -> SmallVec<[Inst; 4]> {
+        if value == 0 {
+            smallvec![Inst::VecDupImm {
+                rd,
+                imm: ASIMDMovModImm::zero(),
+                invert: false,
+                size: VectorSize::Size8x8
+            }]
+        } else {
+            // TODO: use FMOV immediate form when `value` has sufficiently few mantissa/exponent
+            // bits.
+            let tmp = alloc_tmp(RegClass::I64, I32);
+            let mut insts = Inst::load_constant(tmp, value as u64);
+
+            insts.push(Inst::MovToFpu {
+                rd,
+                rn: tmp.to_reg(),
+                size: ScalarSize::Size64,
+            });
+
+            insts
         }
     }
 
-    /// Create an instruction that loads a 64-bit floating-point constant.
-    pub fn load_fp_constant64(rd: Writable<Reg>, value: f64) -> Inst {
-        // TODO: use FMOV immediate form when `value` has sufficiently few mantissa/exponent bits.
-        Inst::LoadFpuConst64 {
-            rd,
-            const_data: value,
+    /// Create instructions that load a 64-bit floating-point constant.
+    pub fn load_fp_constant64<F: FnMut(RegClass, Type) -> Writable<Reg>>(
+        rd: Writable<Reg>,
+        const_data: u64,
+        mut alloc_tmp: F,
+    ) -> SmallVec<[Inst; 4]> {
+        if let Ok(const_data) = u32::try_from(const_data) {
+            Inst::load_fp_constant32(rd, const_data, alloc_tmp)
+        // TODO: use FMOV immediate form when `const_data` has sufficiently few mantissa/exponent
+        // bits.  Also, treat it as half of a 128-bit vector and consider replicated
+        // patterns. Scalar MOVI might also be an option.
+        } else if const_data & (u32::MAX as u64) == 0 {
+            let tmp = alloc_tmp(RegClass::I64, I64);
+            let mut insts = Inst::load_constant(tmp, const_data);
+
+            insts.push(Inst::MovToFpu {
+                rd,
+                rn: tmp.to_reg(),
+                size: ScalarSize::Size64,
+            });
+
+            insts
+        } else {
+            smallvec![Inst::LoadFpuConst64 { rd, const_data }]
         }
     }
 
-    /// Create an instruction that loads a 128-bit vector constant.
-    pub fn load_fp_constant128(rd: Writable<Reg>, value: u128) -> Inst {
-        Inst::LoadFpuConst128 {
-            rd,
-            const_data: value,
+    /// Create instructions that load a 128-bit vector constant.
+    pub fn load_fp_constant128<F: FnMut(RegClass, Type) -> Writable<Reg>>(
+        rd: Writable<Reg>,
+        const_data: u128,
+        alloc_tmp: F,
+    ) -> SmallVec<[Inst; 5]> {
+        if let Ok(const_data) = u64::try_from(const_data) {
+            SmallVec::from(&Inst::load_fp_constant64(rd, const_data, alloc_tmp)[..])
+        } else if let Some((pattern, size)) =
+            Inst::get_replicated_vector_pattern(const_data, ScalarSize::Size64)
+        {
+            Inst::load_replicated_vector_pattern(
+                rd,
+                pattern,
+                VectorSize::from_lane_size(size, true),
+                alloc_tmp,
+            )
+        } else {
+            smallvec![Inst::LoadFpuConst128 { rd, const_data }]
+        }
+    }
+
+    /// Determine whether a 128-bit constant represents a vector consisting of elements with
+    /// the same value.
+    pub fn get_replicated_vector_pattern(
+        value: u128,
+        size: ScalarSize,
+    ) -> Option<(u64, ScalarSize)> {
+        let (mask, shift, next_size) = match size {
+            ScalarSize::Size8 => (u8::MAX as u128, 8, ScalarSize::Size128),
+            ScalarSize::Size16 => (u16::MAX as u128, 16, ScalarSize::Size8),
+            ScalarSize::Size32 => (u32::MAX as u128, 32, ScalarSize::Size16),
+            ScalarSize::Size64 => (u64::MAX as u128, 64, ScalarSize::Size32),
+            _ => return None,
+        };
+        let mut r = None;
+        let v = value & mask;
+
+        if (value >> shift) & mask == v {
+            r = Inst::get_replicated_vector_pattern(v, next_size);
+
+            if r.is_none() {
+                r = Some((v as u64, size));
+            }
+        }
+
+        r
+    }
+
+    /// Create instructions that load a 128-bit vector constant consisting of elements with
+    /// the same value.
+    pub fn load_replicated_vector_pattern<F: FnMut(RegClass, Type) -> Writable<Reg>>(
+        rd: Writable<Reg>,
+        pattern: u64,
+        size: VectorSize,
+        mut alloc_tmp: F,
+    ) -> SmallVec<[Inst; 5]> {
+        let lane_size = size.lane_size();
+
+        if let Some(imm) = ASIMDMovModImm::maybe_from_u64(pattern, lane_size) {
+            smallvec![Inst::VecDupImm {
+                rd,
+                imm,
+                invert: false,
+                size
+            }]
+        } else if let Some(imm) = ASIMDMovModImm::maybe_from_u64(!pattern, lane_size) {
+            debug_assert_ne!(lane_size, ScalarSize::Size8);
+            debug_assert_ne!(lane_size, ScalarSize::Size64);
+
+            smallvec![Inst::VecDupImm {
+                rd,
+                imm,
+                invert: true,
+                size
+            }]
+        } else {
+            let tmp = alloc_tmp(RegClass::I64, I64);
+            let mut insts = SmallVec::from(&Inst::load_constant(tmp, pattern)[..]);
+
+            insts.push(Inst::VecDup {
+                rd,
+                rn: tmp.to_reg(),
+                size,
+            });
+
+            insts
         }
     }
 
     /// Generic constructor for a load (zero-extending where appropriate).
-    pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type) -> Inst {
+    pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type, flags: MemFlags) -> Inst {
         match ty {
             B1 | B8 | I8 => Inst::ULoad8 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B16 | I16 => Inst::ULoad16 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B32 | I32 | R32 => Inst::ULoad32 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B64 | I64 | R64 => Inst::ULoad64 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             F32 => Inst::FpuLoad32 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             F64 => Inst::FpuLoad64 {
                 rd: into_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             _ => {
                 if ty.is_vector() {
                     let bits = ty_bits(ty);
                     let rd = into_reg;
-                    let srcloc = None;
 
                     if bits == 128 {
-                        Inst::FpuLoad128 { rd, mem, srcloc }
+                        Inst::FpuLoad128 { rd, mem, flags }
                     } else {
                         assert_eq!(bits, 64);
-                        Inst::FpuLoad64 { rd, mem, srcloc }
+                        Inst::FpuLoad64 { rd, mem, flags }
                     }
                 } else {
                     unimplemented!("gen_load({})", ty);
@@ -1317,49 +1509,48 @@
     }
 
     /// Generic constructor for a store.
-    pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type) -> Inst {
+    pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type, flags: MemFlags) -> Inst {
         match ty {
             B1 | B8 | I8 => Inst::Store8 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B16 | I16 => Inst::Store16 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B32 | I32 | R32 => Inst::Store32 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             B64 | I64 | R64 => Inst::Store64 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             F32 => Inst::FpuStore32 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             F64 => Inst::FpuStore64 {
                 rd: from_reg,
                 mem,
-                srcloc: None,
+                flags,
             },
             _ => {
                 if ty.is_vector() {
                     let bits = ty_bits(ty);
                     let rd = from_reg;
-                    let srcloc = None;
 
                     if bits == 128 {
-                        Inst::FpuStore128 { rd, mem, srcloc }
+                        Inst::FpuStore128 { rd, mem, flags }
                     } else {
                         assert_eq!(bits, 64);
-                        Inst::FpuStore64 { rd, mem, srcloc }
+                        Inst::FpuStore64 { rd, mem, flags }
                     }
                 } else {
                     unimplemented!("gen_store({})", ty);
@@ -1572,6 +1763,15 @@
             collector.add_def(rd);
             collector.add_use(rn);
         }
+        &Inst::VecShiftImm { rd, rn, .. } => {
+            collector.add_def(rd);
+            collector.add_use(rn);
+        }
+        &Inst::VecExtract { rd, rn, rm, .. } => {
+            collector.add_def(rd);
+            collector.add_use(rn);
+            collector.add_use(rm);
+        }
         &Inst::VecTbl {
             rd,
             rn,
@@ -1604,7 +1804,15 @@
                 collector.add_def(rd);
             }
         }
-
+        &Inst::VecLoadReplicate { rd, rn, .. } => {
+            collector.add_def(rd);
+            collector.add_use(rn);
+        }
+        &Inst::VecCSel { rd, rn, rm, .. } => {
+            collector.add_def(rd);
+            collector.add_use(rn);
+            collector.add_use(rm);
+        }
         &Inst::FpuCmp32 { rn, rm } | &Inst::FpuCmp64 { rn, rm } => {
             collector.add_use(rn);
             collector.add_use(rm);
@@ -1633,9 +1841,7 @@
             collector.add_use(rd);
             memarg_regs(mem, collector);
         }
-        &Inst::LoadFpuConst32 { rd, .. }
-        | &Inst::LoadFpuConst64 { rd, .. }
-        | &Inst::LoadFpuConst128 { rd, .. } => {
+        &Inst::LoadFpuConst64 { rd, .. } | &Inst::LoadFpuConst128 { rd, .. } => {
             collector.add_def(rd);
         }
         &Inst::FpuToInt { rd, rn, .. } => {
@@ -1655,7 +1861,7 @@
             collector.add_def(rd);
             collector.add_use(rn);
         }
-        &Inst::MovToFpu { rd, rn } => {
+        &Inst::MovToFpu { rd, rn, .. } => {
             collector.add_def(rd);
             collector.add_use(rn);
         }
@@ -1675,6 +1881,9 @@
             collector.add_def(rd);
             collector.add_use(rn);
         }
+        &Inst::VecDupImm { rd, .. } => {
+            collector.add_def(rd);
+        }
         &Inst::VecExtend { rd, rn, .. } => {
             collector.add_def(rd);
             collector.add_use(rn);
@@ -1757,8 +1966,9 @@
         &Inst::LoadExtName { rd, .. } => {
             collector.add_def(rd);
         }
-        &Inst::LoadAddr { rd, mem: _ } => {
+        &Inst::LoadAddr { rd, ref mem } => {
             collector.add_def(rd);
+            memarg_regs(mem, collector);
         }
         &Inst::VirtualSPOffsetAdj { .. } => {}
         &Inst::EmitIsland { .. } => {}
@@ -2000,6 +2210,7 @@
             ref mut rt,
             ref mut rt2,
             ref mut mem,
+            ..
         } => {
             map_use(mapper, rt);
             map_use(mapper, rt2);
@@ -2009,6 +2220,7 @@
             ref mut rt,
             ref mut rt2,
             ref mut mem,
+            ..
         } => {
             map_def(mapper, rt);
             map_def(mapper, rt2);
@@ -2117,11 +2329,15 @@
             map_use(mapper, rm);
         }
         &mut Inst::FpuRRI {
+            fpu_op,
             ref mut rd,
             ref mut rn,
             ..
         } => {
-            map_def(mapper, rd);
+            match fpu_op {
+                FPUOpRI::UShr32(..) | FPUOpRI::UShr64(..) => map_def(mapper, rd),
+                FPUOpRI::Sli32(..) | FPUOpRI::Sli64(..) => map_mod(mapper, rd),
+            }
             map_use(mapper, rn);
         }
         &mut Inst::FpuRRRR {
@@ -2152,6 +2368,24 @@
             map_def(mapper, rd);
             map_use(mapper, rn);
         }
+        &mut Inst::VecShiftImm {
+            ref mut rd,
+            ref mut rn,
+            ..
+        } => {
+            map_def(mapper, rd);
+            map_use(mapper, rn);
+        }
+        &mut Inst::VecExtract {
+            ref mut rd,
+            ref mut rn,
+            ref mut rm,
+            ..
+        } => {
+            map_def(mapper, rd);
+            map_use(mapper, rn);
+            map_use(mapper, rm);
+        }
         &mut Inst::VecTbl {
             ref mut rd,
             ref mut rn,
@@ -2184,6 +2418,24 @@
                 map_def(mapper, rd);
             }
         }
+        &mut Inst::VecLoadReplicate {
+            ref mut rd,
+            ref mut rn,
+            ..
+        } => {
+            map_def(mapper, rd);
+            map_use(mapper, rn);
+        }
+        &mut Inst::VecCSel {
+            ref mut rd,
+            ref mut rn,
+            ref mut rm,
+            ..
+        } => {
+            map_def(mapper, rd);
+            map_use(mapper, rn);
+            map_use(mapper, rm);
+        }
         &mut Inst::FpuCmp32 {
             ref mut rn,
             ref mut rm,
@@ -2246,9 +2498,6 @@
             map_use(mapper, rd);
             map_mem(mapper, mem);
         }
-        &mut Inst::LoadFpuConst32 { ref mut rd, .. } => {
-            map_def(mapper, rd);
-        }
         &mut Inst::LoadFpuConst64 { ref mut rd, .. } => {
             map_def(mapper, rd);
         }
@@ -2302,6 +2551,7 @@
         &mut Inst::MovToFpu {
             ref mut rd,
             ref mut rn,
+            ..
         } => {
             map_def(mapper, rd);
             map_use(mapper, rn);
@@ -2343,6 +2593,9 @@
             map_def(mapper, rd);
             map_use(mapper, rn);
         }
+        &mut Inst::VecDupImm { ref mut rd, .. } => {
+            map_def(mapper, rd);
+        }
         &mut Inst::VecExtend {
             ref mut rd,
             ref mut rn,
@@ -2491,6 +2744,24 @@
         }
     }
 
+    fn is_included_in_clobbers(&self) -> bool {
+        // We exclude call instructions from the clobber-set when they are calls
+        // from caller to callee with the same ABI. Such calls cannot possibly
+        // force any new registers to be saved in the prologue, because anything
+        // that the callee clobbers, the caller is also allowed to clobber. This
+        // both saves work and enables us to more precisely follow the
+        // half-caller-save, half-callee-save SysV ABI for some vector
+        // registers.
+        //
+        // See the note in [crate::isa::aarch64::abi::is_caller_save_reg] for
+        // more information on this ABI-implementation hack.
+        match self {
+            &Inst::Call { ref info } => info.caller_callconv != info.callee_callconv,
+            &Inst::CallInd { ref info } => info.caller_callconv != info.callee_callconv,
+            _ => true,
+        }
+    }
+
     fn is_term<'a>(&'a self) -> MachTerminator<'a> {
         match self {
             &Inst::Ret | &Inst::EpiloguePlaceholder => MachTerminator::Ret,
@@ -2515,19 +2786,12 @@
         to_reg: Writable<Reg>,
         value: u64,
         ty: Type,
-        _alloc_tmp: F,
+        alloc_tmp: F,
     ) -> SmallVec<[Inst; 4]> {
         if ty == F64 {
-            let mut ret = SmallVec::new();
-            ret.push(Inst::load_fp_constant64(to_reg, f64::from_bits(value)));
-            ret
+            Inst::load_fp_constant64(to_reg, value, alloc_tmp)
         } else if ty == F32 {
-            let mut ret = SmallVec::new();
-            ret.push(Inst::load_fp_constant32(
-                to_reg,
-                f32::from_bits(value as u32),
-            ));
-            ret
+            Inst::load_fp_constant32(to_reg, value as u32, alloc_tmp)
         } else {
             // Must be an integer type.
             debug_assert!(
@@ -2623,7 +2887,7 @@
     (mem_str, mem)
 }
 
-impl ShowWithRRU for Inst {
+impl PrettyPrint for Inst {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         self.pretty_print(mb_rru, &mut EmitState::default())
     }
@@ -2778,37 +3042,36 @@
             &Inst::ULoad8 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::SLoad8 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::ULoad16 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::SLoad16 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::ULoad32 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::SLoad32 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::ULoad64 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
                 ..
             } => {
                 let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
@@ -2841,22 +3104,21 @@
             &Inst::Store8 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::Store16 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::Store32 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
+                ..
             }
             | &Inst::Store64 {
                 rd,
                 ref mem,
-                srcloc: _srcloc,
                 ..
             } => {
                 let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
@@ -2880,16 +3142,16 @@
                 let mem = mem.show_rru(mb_rru);
                 format!("{}{} {}, {}", mem_str, op, rd, mem)
             }
-            &Inst::StoreP64 { rt, rt2, ref mem } => {
+            &Inst::StoreP64 { rt, rt2, ref mem, .. } => {
                 let rt = rt.show_rru(mb_rru);
                 let rt2 = rt2.show_rru(mb_rru);
-                let mem = mem.show_rru_sized(mb_rru, /* size = */ 8);
+                let mem = mem.show_rru(mb_rru);
                 format!("stp {}, {}, {}", rt, rt2, mem)
             }
-            &Inst::LoadP64 { rt, rt2, ref mem } => {
+            &Inst::LoadP64 { rt, rt2, ref mem, .. } => {
                 let rt = rt.to_reg().show_rru(mb_rru);
                 let rt2 = rt2.to_reg().show_rru(mb_rru);
-                let mem = mem.show_rru_sized(mb_rru, /* size = */ 8);
+                let mem = mem.show_rru(mb_rru);
                 format!("ldp {}, {}, {}", rt, rt2, mem)
             }
             &Inst::Mov64 { rd, rm } => {
@@ -3100,13 +3362,9 @@
                 let mem = mem.show_rru(mb_rru);
                 format!("{}str {}, {}", mem_str, rd, mem)
             }
-            &Inst::LoadFpuConst32 { rd, const_data } => {
-                let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size32);
-                format!("ldr {}, pc+8 ; b 8 ; data.f32 {}", rd, const_data)
-            }
             &Inst::LoadFpuConst64 { rd, const_data } => {
                 let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
-                format!("ldr {}, pc+8 ; b 12 ; data.f64 {}", rd, const_data)
+                format!("ldr {}, pc+8 ; b 12 ; data.f64 {}", rd, f64::from_bits(const_data))
             }
             &Inst::LoadFpuConst128 { rd, const_data } => {
                 let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size128);
@@ -3171,9 +3429,10 @@
                 let rn = show_vreg_scalar(rn, mb_rru, size);
                 format!("{} {}, {}", inst, rd, rn)
             }
-            &Inst::MovToFpu { rd, rn } => {
-                let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
-                let rn = show_ireg_sized(rn, mb_rru, OperandSize::Size64);
+            &Inst::MovToFpu { rd, rn, size } => {
+                let operand_size = size.operand_size();
+                let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size);
+                let rn = show_ireg_sized(rn, mb_rru, operand_size);
                 format!("fmov {}, {}", rd, rn)
             }
             &Inst::MovToVec { rd, rn, idx, size } => {
@@ -3214,6 +3473,17 @@
                 let rn = show_vreg_element(rn, mb_rru, 0, size);
                 format!("dup {}, {}", rd, rn)
             }
+            &Inst::VecDupImm { rd, imm, invert, size } => {
+                let imm = imm.show_rru(mb_rru);
+                let op = if invert {
+                    "mvni"
+                } else {
+                    "movi"
+                };
+                let rd = show_vreg_vector(rd.to_reg(), mb_rru, size);
+
+                format!("{} {}, {}", op, rd, imm)
+            }
             &Inst::VecExtend { t, rd, rn, high_half } => {
                 let (op, dest, src) = match (t, high_half) {
                     (VecExtendOp::Sxtl8, false) => ("sxtl", VectorSize::Size16x8, VectorSize::Size8x8),
@@ -3236,12 +3506,12 @@
             &Inst::VecMovElement {
                 rd,
                 rn,
-                idx1,
-                idx2,
+                dest_idx,
+                src_idx,
                 size,
             } => {
-                let rd = show_vreg_element(rd.to_reg(), mb_rru, idx1, size);
-                let rn = show_vreg_element(rn, mb_rru, idx2, size);
+                let rd = show_vreg_element(rd.to_reg(), mb_rru, dest_idx, size);
+                let rn = show_vreg_element(rn, mb_rru, src_idx, size);
                 format!("mov {}, {}", rd, rn)
             }
             &Inst::VecMiscNarrow { op, rd, rn, size, high_half } => {
@@ -3307,15 +3577,22 @@
                     VecALUOp::Fmul => ("fmul", size),
                     VecALUOp::Addp => ("addp", size),
                     VecALUOp::Umlal => ("umlal", size),
+                    VecALUOp::Zip1 => ("zip1", size),
+                    VecALUOp::Smull => ("smull", size),
+                    VecALUOp::Smull2 => ("smull2", size),
+                };
+                let rd_size = match alu_op {
+                    VecALUOp::Umlal | VecALUOp::Smull | VecALUOp::Smull2 => size.widen(),
+                    _ => size
+                };
+                let rn_size = match alu_op {
+                    VecALUOp::Smull => size.halve(),
+                    _ => size
                 };
-                let rd_size = if alu_op == VecALUOp::Umlal {
-                    size.widen()
-                } else {
-                    size
-                };
+                let rm_size = rn_size;
                 let rd = show_vreg_vector(rd.to_reg(), mb_rru, rd_size);
-                let rn = show_vreg_vector(rn, mb_rru, size);
-                let rm = show_vreg_vector(rm, mb_rru, size);
+                let rn = show_vreg_vector(rn, mb_rru, rn_size);
+                let rm = show_vreg_vector(rm, mb_rru, rm_size);
                 format!("{} {}, {}, {}", op, rd, rn, rm)
             }
             &Inst::VecMisc { op, rd, rn, size } => {
@@ -3347,6 +3624,10 @@
                     VecMisc2::Fcvtzu => ("fcvtzu", size),
                     VecMisc2::Scvtf => ("scvtf", size),
                     VecMisc2::Ucvtf => ("ucvtf", size),
+                    VecMisc2::Frintn => ("frintn", size),
+                    VecMisc2::Frintz => ("frintz", size),
+                    VecMisc2::Frintm => ("frintm", size),
+                    VecMisc2::Frintp => ("frintp", size),
                 };
 
                 let rd_size = if is_shll { size.widen() } else { size };
@@ -3358,11 +3639,28 @@
             &Inst::VecLanes { op, rd, rn, size } => {
                 let op = match op {
                     VecLanesOp::Uminv => "uminv",
+                    VecLanesOp::Addv => "addv",
                 };
                 let rd = show_vreg_scalar(rd.to_reg(), mb_rru, size.lane_size());
                 let rn = show_vreg_vector(rn, mb_rru, size);
                 format!("{} {}, {}", op, rd, rn)
             }
+            &Inst::VecShiftImm { op, rd, rn, size, imm } => {
+                let op = match op {
+                    VecShiftImmOp::Shl => "shl",
+                    VecShiftImmOp::Ushr => "ushr",
+                    VecShiftImmOp::Sshr => "sshr",
+                };
+                let rd = show_vreg_vector(rd.to_reg(), mb_rru, size);
+                let rn = show_vreg_vector(rn, mb_rru, size);
+                format!("{} {}, {}, #{}", op, rd, rn, imm)
+            }
+            &Inst::VecExtract { rd, rn, rm, imm4 } => {
+                let rd = show_vreg_vector(rd.to_reg(), mb_rru, VectorSize::Size8x16);
+                let rn = show_vreg_vector(rn, mb_rru, VectorSize::Size8x16);
+                let rm = show_vreg_vector(rm, mb_rru, VectorSize::Size8x16);
+                format!("ext {}, {}, {}, #{}", rd, rn, rm, imm4)
+            }
             &Inst::VecTbl {
                 rd,
                 rn,
@@ -3389,6 +3687,19 @@
                 let rm = show_vreg_vector(rm, mb_rru, VectorSize::Size8x16);
                 format!("{} {}, {{ {}, {} }}, {}", op, rd, rn, rn2, rm)
             }
+            &Inst::VecLoadReplicate { rd, rn, size, .. } => {
+                let rd = show_vreg_vector(rd.to_reg(), mb_rru, size);
+                let rn = rn.show_rru(mb_rru);
+
+                format!("ld1r {{ {} }}, [{}]", rd, rn)
+            }
+            &Inst::VecCSel { rd, rn, rm, cond } => {
+                let rd = show_vreg_vector(rd.to_reg(), mb_rru, VectorSize::Size8x16);
+                let rn = show_vreg_vector(rn, mb_rru, VectorSize::Size8x16);
+                let rm = show_vreg_vector(rm, mb_rru, VectorSize::Size8x16);
+                let cond = cond.show_rru(mb_rru);
+                format!("vcsel {}, {}, {}, {} (if-then-else diamond)", rd, rn, rm, cond)
+            }
             &Inst::MovToNZCV { rn } => {
                 let rn = rn.show_rru(mb_rru);
                 format!("msr nzcv, {}", rn)
@@ -3553,7 +3864,6 @@
                 rd,
                 ref name,
                 offset,
-                srcloc: _srcloc,
             } => {
                 let rd = rd.show_rru(mb_rru);
                 format!("ldr {}, 8 ; b 12 ; data {:?} + {}", rd, name, offset)
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/regs.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/regs.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/regs.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/regs.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,10 +3,11 @@
 use crate::isa::aarch64::inst::OperandSize;
 use crate::isa::aarch64::inst::ScalarSize;
 use crate::isa::aarch64::inst::VectorSize;
-use crate::machinst::*;
 use crate::settings;
 
-use regalloc::{RealRegUniverse, Reg, RegClass, RegClassInfo, Writable, NUM_REG_CLASSES};
+use regalloc::{
+    PrettyPrint, RealRegUniverse, Reg, RegClass, RegClassInfo, Writable, NUM_REG_CLASSES,
+};
 
 use std::string::{String, ToString};
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind/systemv.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind/systemv.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind/systemv.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind/systemv.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,158 @@
+//! Unwind information for System V ABI (Aarch64).
+
+use crate::isa::aarch64::inst::regs;
+use crate::isa::unwind::input;
+use crate::isa::unwind::systemv::{RegisterMappingError, UnwindInfo};
+use crate::result::CodegenResult;
+use gimli::{write::CommonInformationEntry, Encoding, Format, Register};
+use regalloc::{Reg, RegClass};
+
+/// Creates a new aarch64 common information entry (CIE).
+pub fn create_cie() -> CommonInformationEntry {
+    use gimli::write::CallFrameInstruction;
+
+    let mut entry = CommonInformationEntry::new(
+        Encoding {
+            address_size: 8,
+            format: Format::Dwarf32,
+            version: 1,
+        },
+        4,  // Code alignment factor
+        -8, // Data alignment factor
+        Register(regs::link_reg().get_hw_encoding().into()),
+    );
+
+    // Every frame will start with the call frame address (CFA) at SP
+    let sp = Register(regs::stack_reg().get_hw_encoding().into());
+    entry.add_instruction(CallFrameInstruction::Cfa(sp, 0));
+
+    entry
+}
+
+/// Map Cranelift registers to their corresponding Gimli registers.
+pub fn map_reg(reg: Reg) -> Result<Register, RegisterMappingError> {
+    match reg.get_class() {
+        RegClass::I64 => Ok(Register(reg.get_hw_encoding().into())),
+        _ => Err(RegisterMappingError::UnsupportedRegisterBank("class?")),
+    }
+}
+
+pub(crate) fn create_unwind_info(
+    unwind: input::UnwindInfo<Reg>,
+) -> CodegenResult<Option<UnwindInfo>> {
+    struct RegisterMapper;
+    impl crate::isa::unwind::systemv::RegisterMapper<Reg> for RegisterMapper {
+        fn map(&self, reg: Reg) -> Result<u16, RegisterMappingError> {
+            Ok(map_reg(reg)?.0)
+        }
+        fn sp(&self) -> u16 {
+            regs::stack_reg().get_hw_encoding().into()
+        }
+    }
+    let map = RegisterMapper;
+    Ok(Some(UnwindInfo::build(unwind, &map)?))
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::cursor::{Cursor, FuncCursor};
+    use crate::ir::{
+        types, AbiParam, ExternalName, Function, InstBuilder, Signature, StackSlotData,
+        StackSlotKind,
+    };
+    use crate::isa::{lookup, CallConv};
+    use crate::settings::{builder, Flags};
+    use crate::Context;
+    use gimli::write::Address;
+    use std::str::FromStr;
+    use target_lexicon::triple;
+
+    #[test]
+    fn test_simple_func() {
+        let isa = lookup(triple!("aarch64"))
+            .expect("expect aarch64 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::SystemV,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 64)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let fde = match context
+            .create_unwind_info(isa.as_ref())
+            .expect("can create unwind info")
+        {
+            Some(crate::isa::unwind::UnwindInfo::SystemV(info)) => {
+                info.to_fde(Address::Constant(1234))
+            }
+            _ => panic!("expected unwind information"),
+        };
+
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(1234), length: 24, lsda: None, instructions: [(4, CfaOffset(16)), (4, Offset(Register(29), -16)), (4, Offset(Register(30), -8)), (8, CfaRegister(Register(29)))] }");
+    }
+
+    fn create_function(call_conv: CallConv, stack_slot: Option<StackSlotData>) -> Function {
+        let mut func =
+            Function::with_name_signature(ExternalName::user(0, 0), Signature::new(call_conv));
+
+        let block0 = func.dfg.make_block();
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().return_(&[]);
+
+        if let Some(stack_slot) = stack_slot {
+            func.stack_slots.push(stack_slot);
+        }
+
+        func
+    }
+
+    #[test]
+    fn test_multi_return_func() {
+        let isa = lookup(triple!("aarch64"))
+            .expect("expect aarch64 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_multi_return_function(CallConv::SystemV));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let fde = match context
+            .create_unwind_info(isa.as_ref())
+            .expect("can create unwind info")
+        {
+            Some(crate::isa::unwind::UnwindInfo::SystemV(info)) => {
+                info.to_fde(Address::Constant(4321))
+            }
+            _ => panic!("expected unwind information"),
+        };
+
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(4321), length: 40, lsda: None, instructions: [(4, CfaOffset(16)), (4, Offset(Register(29), -16)), (4, Offset(Register(30), -8)), (8, CfaRegister(Register(29)))] }");
+    }
+
+    fn create_multi_return_function(call_conv: CallConv) -> Function {
+        let mut sig = Signature::new(call_conv);
+        sig.params.push(AbiParam::new(types::I32));
+        let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+
+        let block0 = func.dfg.make_block();
+        let v0 = func.dfg.append_block_param(block0, types::I32);
+        let block1 = func.dfg.make_block();
+        let block2 = func.dfg.make_block();
+
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().brnz(v0, block2, &[]);
+        pos.ins().jump(block1, &[]);
+
+        pos.insert_block(block1);
+        pos.ins().return_(&[]);
+
+        pos.insert_block(block2);
+        pos.ins().return_(&[]);
+
+        func
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/inst/unwind.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,201 @@
+use super::*;
+use crate::isa::aarch64::inst::{args::PairAMode, imms::Imm12, regs, ALUOp, Inst};
+use crate::isa::unwind::input::{UnwindCode, UnwindInfo};
+use crate::machinst::UnwindInfoContext;
+use crate::result::CodegenResult;
+use alloc::vec::Vec;
+use regalloc::Reg;
+
+#[cfg(feature = "unwind")]
+pub(crate) mod systemv;
+
+pub struct AArch64UnwindInfo;
+
+impl UnwindInfoGenerator<Inst> for AArch64UnwindInfo {
+    fn create_unwind_info(
+        context: UnwindInfoContext<Inst>,
+    ) -> CodegenResult<Option<UnwindInfo<Reg>>> {
+        let word_size = 8u8;
+        let pair_size = word_size * 2;
+        let mut codes = Vec::new();
+
+        for i in context.prologue.clone() {
+            let i = i as usize;
+            let inst = &context.insts[i];
+            let offset = context.insts_layout[i];
+
+            match inst {
+                Inst::StoreP64 {
+                    rt,
+                    rt2,
+                    mem: PairAMode::PreIndexed(rn, imm7),
+                    ..
+                } if *rt == regs::fp_reg()
+                    && *rt2 == regs::link_reg()
+                    && *rn == regs::writable_stack_reg()
+                    && imm7.value == -(pair_size as i16) =>
+                {
+                    // stp fp (x29), lr (x30), [sp, #-16]!
+                    codes.push((
+                        offset,
+                        UnwindCode::StackAlloc {
+                            size: pair_size as u32,
+                        },
+                    ));
+                    codes.push((
+                        offset,
+                        UnwindCode::SaveRegister {
+                            reg: *rt,
+                            stack_offset: 0,
+                        },
+                    ));
+                    codes.push((
+                        offset,
+                        UnwindCode::SaveRegister {
+                            reg: *rt2,
+                            stack_offset: word_size as u32,
+                        },
+                    ));
+                }
+                Inst::StoreP64 {
+                    rt,
+                    rt2,
+                    mem: PairAMode::PreIndexed(rn, imm7),
+                    ..
+                } if rn.to_reg() == regs::stack_reg() && imm7.value % (pair_size as i16) == 0 => {
+                    // stp r1, r2, [sp, #(i * #16)]
+                    let stack_offset = imm7.value as u32;
+                    codes.push((
+                        offset,
+                        UnwindCode::SaveRegister {
+                            reg: *rt,
+                            stack_offset,
+                        },
+                    ));
+                    if *rt2 != regs::zero_reg() {
+                        codes.push((
+                            offset,
+                            UnwindCode::SaveRegister {
+                                reg: *rt2,
+                                stack_offset: stack_offset + word_size as u32,
+                            },
+                        ));
+                    }
+                }
+                Inst::AluRRImm12 {
+                    alu_op: ALUOp::Add64,
+                    rd,
+                    rn,
+                    imm12:
+                        Imm12 {
+                            bits: 0,
+                            shift12: false,
+                        },
+                } if *rd == regs::writable_fp_reg() && *rn == regs::stack_reg() => {
+                    // mov fp (x29), sp.
+                    codes.push((offset, UnwindCode::SetFramePointer { reg: rd.to_reg() }));
+                }
+                Inst::VirtualSPOffsetAdj { offset: adj } if offset > 0 => {
+                    codes.push((offset, UnwindCode::StackAlloc { size: *adj as u32 }));
+                }
+                _ => {}
+            }
+        }
+
+        // TODO epilogues
+
+        let prologue_size = if context.prologue.is_empty() {
+            0
+        } else {
+            context.insts_layout[context.prologue.end as usize - 1]
+        };
+
+        Ok(Some(UnwindInfo {
+            prologue_size,
+            prologue_unwind_codes: codes,
+            epilogues_unwind_codes: vec![],
+            function_size: context.len,
+            word_size,
+            initial_sp_offset: 0,
+        }))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::cursor::{Cursor, FuncCursor};
+    use crate::ir::{ExternalName, Function, InstBuilder, Signature, StackSlotData, StackSlotKind};
+    use crate::isa::{lookup, CallConv};
+    use crate::settings::{builder, Flags};
+    use crate::Context;
+    use std::str::FromStr;
+    use target_lexicon::triple;
+
+    #[test]
+    fn test_simple_func() {
+        let isa = lookup(triple!("aarch64"))
+            .expect("expect aarch64 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::SystemV,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 64)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let result = context.mach_compile_result.unwrap();
+        let unwind_info = result.unwind_info.unwrap();
+
+        assert_eq!(
+            unwind_info,
+            UnwindInfo {
+                prologue_size: 12,
+                prologue_unwind_codes: vec![
+                    (4, UnwindCode::StackAlloc { size: 16 }),
+                    (
+                        4,
+                        UnwindCode::SaveRegister {
+                            reg: regs::fp_reg(),
+                            stack_offset: 0
+                        }
+                    ),
+                    (
+                        4,
+                        UnwindCode::SaveRegister {
+                            reg: regs::link_reg(),
+                            stack_offset: 8
+                        }
+                    ),
+                    (
+                        8,
+                        UnwindCode::SetFramePointer {
+                            reg: regs::fp_reg()
+                        }
+                    )
+                ],
+                epilogues_unwind_codes: vec![],
+                function_size: 24,
+                word_size: 8,
+                initial_sp_offset: 0,
+            }
+        );
+    }
+
+    fn create_function(call_conv: CallConv, stack_slot: Option<StackSlotData>) -> Function {
+        let mut func =
+            Function::with_name_signature(ExternalName::user(0, 0), Signature::new(call_conv));
+
+        let block0 = func.dfg.make_block();
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().return_(&[]);
+
+        if let Some(stack_slot) = stack_slot {
+            func.stack_slots.push(stack_slot);
+        }
+
+        func
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower_inst.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower_inst.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower_inst.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower_inst.rs	2021-01-18 19:58:25.000000000 +0000
@@ -179,8 +179,16 @@
                 let vb = ctx.alloc_tmp(RegClass::V128, I128);
                 let ra = put_input_in_reg(ctx, inputs[0], narrow_mode);
                 let rb = put_input_in_reg(ctx, inputs[1], narrow_mode);
-                ctx.emit(Inst::MovToFpu { rd: va, rn: ra });
-                ctx.emit(Inst::MovToFpu { rd: vb, rn: rb });
+                ctx.emit(Inst::MovToFpu {
+                    rd: va,
+                    rn: ra,
+                    size: ScalarSize::Size64,
+                });
+                ctx.emit(Inst::MovToFpu {
+                    rd: vb,
+                    rn: rb,
+                    size: ScalarSize::Size64,
+                });
                 ctx.emit(Inst::FpuRRR {
                     fpu_op,
                     rd: va,
@@ -476,9 +484,9 @@
                 //   msub rd, rd, rm, rn  ; rd = rn - rd * rm
 
                 // Check for divide by 0.
-                let trap_info = (ctx.srcloc(insn), TrapCode::IntegerDivisionByZero);
+                let trap_code = TrapCode::IntegerDivisionByZero;
                 ctx.emit(Inst::TrapIf {
-                    trap_info,
+                    trap_code,
                     kind: CondBrKind::Zero(rm),
                 });
 
@@ -499,9 +507,9 @@
                     //   udf ; signed overflow
 
                     // Check for divide by 0.
-                    let trap_info = (ctx.srcloc(insn), TrapCode::IntegerDivisionByZero);
+                    let trap_code = TrapCode::IntegerDivisionByZero;
                     ctx.emit(Inst::TrapIf {
-                        trap_info,
+                        trap_code,
                         kind: CondBrKind::Zero(rm),
                     });
 
@@ -527,9 +535,9 @@
                         nzcv: NZCV::new(false, false, false, false),
                         cond: Cond::Eq,
                     });
-                    let trap_info = (ctx.srcloc(insn), TrapCode::IntegerOverflow);
+                    let trap_code = TrapCode::IntegerOverflow;
                     ctx.emit(Inst::TrapIf {
-                        trap_info,
+                        trap_code,
                         kind: CondBrKind::Cond(Cond::Vs),
                     });
                 } else {
@@ -537,9 +545,9 @@
                     //   udf ; divide by zero
 
                     // Check for divide by 0.
-                    let trap_info = (ctx.srcloc(insn), TrapCode::IntegerDivisionByZero);
+                    let trap_code = TrapCode::IntegerDivisionByZero;
                     ctx.emit(Inst::TrapIf {
-                        trap_info,
+                        trap_code,
                         kind: CondBrKind::Zero(rm),
                     });
                 }
@@ -1152,28 +1160,24 @@
 
             let mem = lower_address(ctx, elem_ty, &inputs[..], off);
             let rd = get_output_reg(ctx, outputs[0]);
-
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
+            let flags = ctx
+                .memflags(insn)
+                .expect("Load instruction should have memflags");
 
             ctx.emit(match (ty_bits(elem_ty), sign_extend, is_float) {
-                (1, _, _) => Inst::ULoad8 { rd, mem, srcloc },
-                (8, false, _) => Inst::ULoad8 { rd, mem, srcloc },
-                (8, true, _) => Inst::SLoad8 { rd, mem, srcloc },
-                (16, false, _) => Inst::ULoad16 { rd, mem, srcloc },
-                (16, true, _) => Inst::SLoad16 { rd, mem, srcloc },
-                (32, false, false) => Inst::ULoad32 { rd, mem, srcloc },
-                (32, true, false) => Inst::SLoad32 { rd, mem, srcloc },
-                (32, _, true) => Inst::FpuLoad32 { rd, mem, srcloc },
-                (64, _, false) => Inst::ULoad64 { rd, mem, srcloc },
+                (1, _, _) => Inst::ULoad8 { rd, mem, flags },
+                (8, false, _) => Inst::ULoad8 { rd, mem, flags },
+                (8, true, _) => Inst::SLoad8 { rd, mem, flags },
+                (16, false, _) => Inst::ULoad16 { rd, mem, flags },
+                (16, true, _) => Inst::SLoad16 { rd, mem, flags },
+                (32, false, false) => Inst::ULoad32 { rd, mem, flags },
+                (32, true, false) => Inst::SLoad32 { rd, mem, flags },
+                (32, _, true) => Inst::FpuLoad32 { rd, mem, flags },
+                (64, _, false) => Inst::ULoad64 { rd, mem, flags },
                 // Note that we treat some of the vector loads as scalar floating-point loads,
                 // which is correct in a little endian environment.
-                (64, _, true) => Inst::FpuLoad64 { rd, mem, srcloc },
-                (128, _, _) => Inst::FpuLoad128 { rd, mem, srcloc },
+                (64, _, true) => Inst::FpuLoad64 { rd, mem, flags },
+                (128, _, _) => Inst::FpuLoad128 { rd, mem, flags },
                 _ => panic!("Unsupported size in load"),
             });
 
@@ -1197,6 +1201,22 @@
             }
         }
 
+        Opcode::LoadSplat => {
+            let off = ctx.data(insn).load_store_offset().unwrap();
+            let ty = ty.unwrap();
+            let mem = lower_address(ctx, ty.lane_type(), &inputs[..], off);
+            let rd = get_output_reg(ctx, outputs[0]);
+            let size = VectorSize::from_ty(ty);
+            let tmp = ctx.alloc_tmp(RegClass::I64, I64);
+
+            ctx.emit(Inst::LoadAddr { rd: tmp, mem });
+            ctx.emit(Inst::VecLoadReplicate {
+                rd,
+                rn: tmp.to_reg(),
+                size,
+            });
+        }
+
         Opcode::Store
         | Opcode::Istore8
         | Opcode::Istore16
@@ -1214,25 +1234,21 @@
                 _ => unreachable!(),
             };
             let is_float = ty_has_float_or_vec_representation(elem_ty);
+            let flags = ctx
+                .memflags(insn)
+                .expect("Store instruction should have memflags");
 
             let mem = lower_address(ctx, elem_ty, &inputs[1..], off);
             let rd = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
 
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
-
             ctx.emit(match (ty_bits(elem_ty), is_float) {
-                (1, _) | (8, _) => Inst::Store8 { rd, mem, srcloc },
-                (16, _) => Inst::Store16 { rd, mem, srcloc },
-                (32, false) => Inst::Store32 { rd, mem, srcloc },
-                (32, true) => Inst::FpuStore32 { rd, mem, srcloc },
-                (64, false) => Inst::Store64 { rd, mem, srcloc },
-                (64, true) => Inst::FpuStore64 { rd, mem, srcloc },
-                (128, _) => Inst::FpuStore128 { rd, mem, srcloc },
+                (1, _) | (8, _) => Inst::Store8 { rd, mem, flags },
+                (16, _) => Inst::Store16 { rd, mem, flags },
+                (32, false) => Inst::Store32 { rd, mem, flags },
+                (32, true) => Inst::FpuStore32 { rd, mem, flags },
+                (64, false) => Inst::Store64 { rd, mem, flags },
+                (64, true) => Inst::FpuStore64 { rd, mem, flags },
+                (128, _) => Inst::FpuStore128 { rd, mem, flags },
                 _ => panic!("Unsupported size in store"),
             });
         }
@@ -1260,12 +1276,6 @@
             let mut r_arg2 = put_input_in_reg(ctx, inputs[1], NarrowValueMode::None);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
             // Make sure that both args are in virtual regs, since in effect
             // we have to do a parallel copy to get them safely to the AtomicRMW input
             // regs, and that's not guaranteed safe if either is in a real reg.
@@ -1276,11 +1286,7 @@
             ctx.emit(Inst::gen_move(Writable::from_reg(xreg(26)), r_arg2, I64));
             // Now the AtomicRMW insn itself
             let op = inst_common::AtomicRmwOp::from(ctx.data(insn).atomic_rmw_op().unwrap());
-            ctx.emit(Inst::AtomicRMW {
-                ty: ty_access,
-                op,
-                srcloc,
-            });
+            ctx.emit(Inst::AtomicRMW { ty: ty_access, op });
             // And finally, copy the preordained AtomicRMW output reg to its destination.
             ctx.emit(Inst::gen_move(r_dst, xreg(27), I64));
             // Also, x24 and x28 are trashed.  `fn aarch64_get_regs` must mention that.
@@ -1296,12 +1302,6 @@
             let mut r_replacement = put_input_in_reg(ctx, inputs[2], NarrowValueMode::None);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
             // Make sure that all three args are in virtual regs.  See corresponding comment
             // for `Opcode::AtomicRmw` above.
             r_addr = ctx.ensure_in_vreg(r_addr, I64);
@@ -1320,10 +1320,7 @@
                 I64,
             ));
             // Now the AtomicCAS itself, implemented in the normal way, with an LL-SC loop
-            ctx.emit(Inst::AtomicCAS {
-                ty: ty_access,
-                srcloc,
-            });
+            ctx.emit(Inst::AtomicCAS { ty: ty_access });
             // And finally, copy the preordained AtomicCAS output reg to its destination.
             ctx.emit(Inst::gen_move(r_dst, xreg(27), I64));
             // Also, x24 and x28 are trashed.  `fn aarch64_get_regs` must mention that.
@@ -1334,17 +1331,10 @@
             let r_addr = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
             ctx.emit(Inst::AtomicLoad {
                 ty: ty_access,
                 r_data,
                 r_addr,
-                srcloc,
             });
         }
 
@@ -1353,17 +1343,10 @@
             let r_addr = put_input_in_reg(ctx, inputs[1], NarrowValueMode::None);
             let ty_access = ctx.input_ty(insn, 0);
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
             ctx.emit(Inst::AtomicStore {
                 ty: ty_access,
                 r_data,
                 r_addr,
-                srcloc,
             });
         }
 
@@ -1435,6 +1418,8 @@
                 ctx.emit(Inst::FpuCSel32 { cond, rd, rn, rm });
             } else if is_float && bits == 64 {
                 ctx.emit(Inst::FpuCSel64 { cond, rd, rn, rm });
+            } else if is_float && bits == 128 {
+                ctx.emit(Inst::VecCSel { cond, rd, rn, rm });
             } else {
                 ctx.emit(Inst::CSel { cond, rd, rn, rm });
             }
@@ -1680,7 +1665,11 @@
                 }
                 (false, true) => {
                     let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::ZeroExtend64);
-                    ctx.emit(Inst::MovToFpu { rd, rn });
+                    ctx.emit(Inst::MovToFpu {
+                        rd,
+                        rn,
+                        size: ScalarSize::Size64,
+                    });
                 }
                 (true, false) => {
                     let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
@@ -1776,12 +1765,12 @@
         }
 
         Opcode::Trap | Opcode::ResumableTrap => {
-            let trap_info = (ctx.srcloc(insn), ctx.data(insn).trap_code().unwrap());
-            ctx.emit_safepoint(Inst::Udf { trap_info });
+            let trap_code = ctx.data(insn).trap_code().unwrap();
+            ctx.emit_safepoint(Inst::Udf { trap_code });
         }
 
         Opcode::Trapif | Opcode::Trapff => {
-            let trap_info = (ctx.srcloc(insn), ctx.data(insn).trap_code().unwrap());
+            let trap_code = ctx.data(insn).trap_code().unwrap();
 
             let cond = if maybe_input_insn(ctx, inputs[0], Opcode::IaddIfcout).is_some() {
                 let condcode = ctx.data(insn).cond_code().unwrap();
@@ -1812,7 +1801,7 @@
             };
 
             ctx.emit_safepoint(Inst::TrapIf {
-                trap_info,
+                trap_code,
                 kind: CondBrKind::Cond(cond),
             });
         }
@@ -1829,11 +1818,9 @@
             let rd = get_output_reg(ctx, outputs[0]);
             let (extname, _) = ctx.call_target(insn).unwrap();
             let extname = extname.clone();
-            let loc = ctx.srcloc(insn);
             ctx.emit(Inst::LoadExtName {
                 rd,
                 name: Box::new(extname),
-                srcloc: loc,
                 offset: 0,
             });
         }
@@ -1846,17 +1833,15 @@
             let rd = get_output_reg(ctx, outputs[0]);
             let (extname, _, offset) = ctx.symbol_value(insn).unwrap();
             let extname = extname.clone();
-            let loc = ctx.srcloc(insn);
             ctx.emit(Inst::LoadExtName {
                 rd,
                 name: Box::new(extname),
-                srcloc: loc,
                 offset,
             });
         }
 
         Opcode::Call | Opcode::CallIndirect => {
-            let loc = ctx.srcloc(insn);
+            let caller_conv = ctx.abi().call_conv();
             let (mut abi, inputs) = match op {
                 Opcode::Call => {
                     let (extname, dist) = ctx.call_target(insn).unwrap();
@@ -1865,7 +1850,7 @@
                     assert!(inputs.len() == sig.params.len());
                     assert!(outputs.len() == sig.returns.len());
                     (
-                        AArch64ABICaller::from_func(sig, &extname, dist, loc)?,
+                        AArch64ABICaller::from_func(sig, &extname, dist, caller_conv)?,
                         &inputs[..],
                     )
                 }
@@ -1874,7 +1859,10 @@
                     let sig = ctx.call_sig(insn).unwrap();
                     assert!(inputs.len() - 1 == sig.params.len());
                     assert!(outputs.len() == sig.returns.len());
-                    (AArch64ABICaller::from_ptr(sig, ptr, loc, op)?, &inputs[1..])
+                    (
+                        AArch64ABICaller::from_ptr(sig, ptr, op, caller_conv)?,
+                        &inputs[1..],
+                    )
                 }
                 _ => unreachable!(),
             };
@@ -1986,24 +1974,67 @@
                 ctx.emit(Inst::VecMovElement {
                     rd,
                     rn,
-                    idx1: idx,
-                    idx2: 0,
+                    dest_idx: idx,
+                    src_idx: 0,
                     size,
                 });
             }
         }
 
         Opcode::Splat => {
+            let rd = get_output_reg(ctx, outputs[0]);
+            let size = VectorSize::from_ty(ty.unwrap());
+
+            if let Some((_, insn)) = maybe_input_insn_multi(
+                ctx,
+                inputs[0],
+                &[
+                    Opcode::Bconst,
+                    Opcode::F32const,
+                    Opcode::F64const,
+                    Opcode::Iconst,
+                ],
+            ) {
+                lower_splat_const(ctx, rd, ctx.get_constant(insn).unwrap(), size);
+            } else if let Some(insn) =
+                maybe_input_insn_via_conv(ctx, inputs[0], Opcode::Iconst, Opcode::Ireduce)
+            {
+                lower_splat_const(ctx, rd, ctx.get_constant(insn).unwrap(), size);
+            } else if let Some(insn) =
+                maybe_input_insn_via_conv(ctx, inputs[0], Opcode::Bconst, Opcode::Breduce)
+            {
+                lower_splat_const(ctx, rd, ctx.get_constant(insn).unwrap(), size);
+            } else {
+                let input_ty = ctx.input_ty(insn, 0);
+                let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+                let inst = if ty_has_int_representation(input_ty) {
+                    Inst::VecDup { rd, rn, size }
+                } else {
+                    Inst::VecDupFromFpu { rd, rn, size }
+                };
+
+                ctx.emit(inst);
+            }
+        }
+
+        Opcode::ScalarToVector => {
             let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
             let rd = get_output_reg(ctx, outputs[0]);
             let input_ty = ctx.input_ty(insn, 0);
-            let size = VectorSize::from_ty(ty.unwrap());
-            let inst = if ty_has_int_representation(input_ty) {
-                Inst::VecDup { rd, rn, size }
+            if (input_ty == I32 && ty.unwrap() == I32X4)
+                || (input_ty == I64 && ty.unwrap() == I64X2)
+            {
+                ctx.emit(Inst::MovToFpu {
+                    rd,
+                    rn,
+                    size: ScalarSize::from_ty(input_ty),
+                });
             } else {
-                Inst::VecDupFromFpu { rd, rn, size }
-            };
-            ctx.emit(inst);
+                return Err(CodegenError::Unsupported(format!(
+                    "ScalarToVector: unsupported types {:?} -> {:?}",
+                    input_ty, ty
+                )));
+            }
         }
 
         Opcode::VanyTrue | Opcode::VallTrue => {
@@ -2056,6 +2087,197 @@
             normalize_bool_result(ctx, insn, rd);
         }
 
+        Opcode::VhighBits => {
+            let dst_r = get_output_reg(ctx, outputs[0]);
+            let src_v = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+            let ty = ctx.input_ty(insn, 0);
+            // All three sequences use one integer temporary and two vector temporaries.  The
+            // shift is done early so as to give the register allocator the possibility of using
+            // the same reg for `tmp_v1` and `src_v` in the case that this is the last use of
+            // `src_v`.  See https://github.com/WebAssembly/simd/pull/201 for the background and
+            // derivation of these sequences.  Alternative sequences are discussed in
+            // https://github.com/bytecodealliance/wasmtime/issues/2296, although they are not
+            // used here.
+            // Also .. FIXME: when https://github.com/bytecodealliance/wasmtime/pull/2310 is
+            // merged, use `lower_splat_constant` instead to generate the constants.
+            let tmp_r0 = ctx.alloc_tmp(RegClass::I64, I64);
+            let tmp_v0 = ctx.alloc_tmp(RegClass::V128, I8X16);
+            let tmp_v1 = ctx.alloc_tmp(RegClass::V128, I8X16);
+            match ty {
+                I8X16 => {
+                    // sshr  tmp_v1.16b, src_v.16b, #7
+                    // mov   tmp_r0, #0x0201
+                    // movk  tmp_r0, #0x0804, lsl 16
+                    // movk  tmp_r0, #0x2010, lsl 32
+                    // movk  tmp_r0, #0x8040, lsl 48
+                    // dup   tmp_v0.2d, tmp_r0
+                    // and   tmp_v1.16b, tmp_v1.16b, tmp_v0.16b
+                    // ext   tmp_v0.16b, tmp_v1.16b, tmp_v1.16b, #8
+                    // zip1  tmp_v0.16b, tmp_v1.16b, tmp_v0.16b
+                    // addv  tmp_v0h, tmp_v0.8h
+                    // mov   dst_r, tmp_v0.h[0]
+                    ctx.emit(Inst::VecShiftImm {
+                        op: VecShiftImmOp::Sshr,
+                        rd: tmp_v1,
+                        rn: src_v,
+                        size: VectorSize::Size8x16,
+                        imm: 7,
+                    });
+                    lower_constant_u64(ctx, tmp_r0, 0x8040201008040201u64);
+                    ctx.emit(Inst::VecDup {
+                        rd: tmp_v0,
+                        rn: tmp_r0.to_reg(),
+                        size: VectorSize::Size64x2,
+                    });
+                    ctx.emit(Inst::VecRRR {
+                        alu_op: VecALUOp::And,
+                        rd: tmp_v1,
+                        rn: tmp_v1.to_reg(),
+                        rm: tmp_v0.to_reg(),
+                        size: VectorSize::Size8x16,
+                    });
+                    ctx.emit(Inst::VecExtract {
+                        rd: tmp_v0,
+                        rn: tmp_v1.to_reg(),
+                        rm: tmp_v1.to_reg(),
+                        imm4: 8,
+                    });
+                    ctx.emit(Inst::VecRRR {
+                        alu_op: VecALUOp::Zip1,
+                        rd: tmp_v0,
+                        rn: tmp_v1.to_reg(),
+                        rm: tmp_v0.to_reg(),
+                        size: VectorSize::Size8x16,
+                    });
+                    ctx.emit(Inst::VecLanes {
+                        op: VecLanesOp::Addv,
+                        rd: tmp_v0,
+                        rn: tmp_v0.to_reg(),
+                        size: VectorSize::Size16x8,
+                    });
+                    ctx.emit(Inst::MovFromVec {
+                        rd: dst_r,
+                        rn: tmp_v0.to_reg(),
+                        idx: 0,
+                        size: VectorSize::Size16x8,
+                    });
+                }
+                I16X8 => {
+                    // sshr  tmp_v1.8h, src_v.8h, #15
+                    // mov   tmp_r0, #0x1
+                    // movk  tmp_r0, #0x2, lsl 16
+                    // movk  tmp_r0, #0x4, lsl 32
+                    // movk  tmp_r0, #0x8, lsl 48
+                    // dup   tmp_v0.2d, tmp_r0
+                    // shl   tmp_r0, tmp_r0, #4
+                    // mov   tmp_v0.d[1], tmp_r0
+                    // and   tmp_v0.16b, tmp_v1.16b, tmp_v0.16b
+                    // addv  tmp_v0h, tmp_v0.8h
+                    // mov   dst_r, tmp_v0.h[0]
+                    ctx.emit(Inst::VecShiftImm {
+                        op: VecShiftImmOp::Sshr,
+                        rd: tmp_v1,
+                        rn: src_v,
+                        size: VectorSize::Size16x8,
+                        imm: 15,
+                    });
+                    lower_constant_u64(ctx, tmp_r0, 0x0008000400020001u64);
+                    ctx.emit(Inst::VecDup {
+                        rd: tmp_v0,
+                        rn: tmp_r0.to_reg(),
+                        size: VectorSize::Size64x2,
+                    });
+                    ctx.emit(Inst::AluRRImmShift {
+                        alu_op: ALUOp::Lsl64,
+                        rd: tmp_r0,
+                        rn: tmp_r0.to_reg(),
+                        immshift: ImmShift { imm: 4 },
+                    });
+                    ctx.emit(Inst::MovToVec {
+                        rd: tmp_v0,
+                        rn: tmp_r0.to_reg(),
+                        idx: 1,
+                        size: VectorSize::Size64x2,
+                    });
+                    ctx.emit(Inst::VecRRR {
+                        alu_op: VecALUOp::And,
+                        rd: tmp_v0,
+                        rn: tmp_v1.to_reg(),
+                        rm: tmp_v0.to_reg(),
+                        size: VectorSize::Size8x16,
+                    });
+                    ctx.emit(Inst::VecLanes {
+                        op: VecLanesOp::Addv,
+                        rd: tmp_v0,
+                        rn: tmp_v0.to_reg(),
+                        size: VectorSize::Size16x8,
+                    });
+                    ctx.emit(Inst::MovFromVec {
+                        rd: dst_r,
+                        rn: tmp_v0.to_reg(),
+                        idx: 0,
+                        size: VectorSize::Size16x8,
+                    });
+                }
+                I32X4 => {
+                    // sshr  tmp_v1.4s, src_v.4s, #31
+                    // mov   tmp_r0, #0x1
+                    // movk  tmp_r0, #0x2, lsl 32
+                    // dup   tmp_v0.2d, tmp_r0
+                    // shl   tmp_r0, tmp_r0, #2
+                    // mov   tmp_v0.d[1], tmp_r0
+                    // and   tmp_v0.16b, tmp_v1.16b, tmp_v0.16b
+                    // addv  tmp_v0s, tmp_v0.4s
+                    // mov   dst_r, tmp_v0.s[0]
+                    ctx.emit(Inst::VecShiftImm {
+                        op: VecShiftImmOp::Sshr,
+                        rd: tmp_v1,
+                        rn: src_v,
+                        size: VectorSize::Size32x4,
+                        imm: 31,
+                    });
+                    lower_constant_u64(ctx, tmp_r0, 0x0000000200000001u64);
+                    ctx.emit(Inst::VecDup {
+                        rd: tmp_v0,
+                        rn: tmp_r0.to_reg(),
+                        size: VectorSize::Size64x2,
+                    });
+                    ctx.emit(Inst::AluRRImmShift {
+                        alu_op: ALUOp::Lsl64,
+                        rd: tmp_r0,
+                        rn: tmp_r0.to_reg(),
+                        immshift: ImmShift { imm: 2 },
+                    });
+                    ctx.emit(Inst::MovToVec {
+                        rd: tmp_v0,
+                        rn: tmp_r0.to_reg(),
+                        idx: 1,
+                        size: VectorSize::Size64x2,
+                    });
+                    ctx.emit(Inst::VecRRR {
+                        alu_op: VecALUOp::And,
+                        rd: tmp_v0,
+                        rn: tmp_v1.to_reg(),
+                        rm: tmp_v0.to_reg(),
+                        size: VectorSize::Size8x16,
+                    });
+                    ctx.emit(Inst::VecLanes {
+                        op: VecLanesOp::Addv,
+                        rd: tmp_v0,
+                        rn: tmp_v0.to_reg(),
+                        size: VectorSize::Size32x4,
+                    });
+                    ctx.emit(Inst::MovFromVec {
+                        rd: dst_r,
+                        rn: tmp_v0.to_reg(),
+                        idx: 0,
+                        size: VectorSize::Size32x4,
+                    });
+                }
+                _ => panic!("arm64 isel: VhighBits unhandled, ty = {:?}", ty),
+            }
+        }
+
         Opcode::Shuffle => {
             let mask = const_param_to_u128(ctx, insn).expect("Invalid immediate mask bytes");
             let rd = get_output_reg(ctx, outputs[0]);
@@ -2100,7 +2322,6 @@
 
         Opcode::Vsplit
         | Opcode::Vconcat
-        | Opcode::ScalarToVector
         | Opcode::Uload8x8Complex
         | Opcode::Sload8x8Complex
         | Opcode::Uload16x4Complex
@@ -2134,6 +2355,47 @@
             });
         }
 
+        Opcode::WideningPairwiseDotProductS => {
+            let r_y = get_output_reg(ctx, outputs[0]);
+            let r_a = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+            let r_b = put_input_in_reg(ctx, inputs[1], NarrowValueMode::None);
+            let ty = ty.unwrap();
+            if ty == I32X4 {
+                let tmp = ctx.alloc_tmp(RegClass::V128, I8X16);
+                // The args have type I16X8.
+                // "y = i32x4.dot_i16x8_s(a, b)"
+                // => smull  tmp, a, b
+                //    smull2 y,   a, b
+                //    addp   y,   tmp, y
+                ctx.emit(Inst::VecRRR {
+                    alu_op: VecALUOp::Smull,
+                    rd: tmp,
+                    rn: r_a,
+                    rm: r_b,
+                    size: VectorSize::Size16x8,
+                });
+                ctx.emit(Inst::VecRRR {
+                    alu_op: VecALUOp::Smull2,
+                    rd: r_y,
+                    rn: r_a,
+                    rm: r_b,
+                    size: VectorSize::Size16x8,
+                });
+                ctx.emit(Inst::VecRRR {
+                    alu_op: VecALUOp::Addp,
+                    rd: r_y,
+                    rn: tmp.to_reg(),
+                    rm: r_y.to_reg(),
+                    size: VectorSize::Size32x4,
+                });
+            } else {
+                return Err(CodegenError::Unsupported(format!(
+                    "Opcode::WideningPairwiseDotProductS: unsupported laneage: {:?}",
+                    ty
+                )));
+            }
+        }
+
         Opcode::Fadd | Opcode::Fsub | Opcode::Fmul | Opcode::Fdiv | Opcode::Fmin | Opcode::Fmax => {
             let ty = ty.unwrap();
             let bits = ty_bits(ty);
@@ -2178,6 +2440,43 @@
             }
         }
 
+        Opcode::FminPseudo | Opcode::FmaxPseudo => {
+            let ty = ctx.input_ty(insn, 0);
+            if ty == F32X4 || ty == F64X2 {
+                // pmin(a,b) => bitsel(b, a, cmpgt(a, b))
+                // pmax(a,b) => bitsel(b, a, cmpgt(b, a))
+                let r_dst = get_output_reg(ctx, outputs[0]);
+                let r_a = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+                let r_b = put_input_in_reg(ctx, inputs[1], NarrowValueMode::None);
+                // Since we're going to write the output register `r_dst` anyway, we might as
+                // well first use it to hold the comparison result.  This has the slightly unusual
+                // effect that we modify the output register in the first instruction (`fcmgt`)
+                // but read both the inputs again in the second instruction (`bsl`), which means
+                // that the output register can't be either of the input registers.  Regalloc
+                // should handle this correctly, nevertheless.
+                ctx.emit(Inst::VecRRR {
+                    alu_op: VecALUOp::Fcmgt,
+                    rd: r_dst,
+                    rn: if op == Opcode::FminPseudo { r_a } else { r_b },
+                    rm: if op == Opcode::FminPseudo { r_b } else { r_a },
+                    size: if ty == F32X4 {
+                        VectorSize::Size32x4
+                    } else {
+                        VectorSize::Size64x2
+                    },
+                });
+                ctx.emit(Inst::VecRRR {
+                    alu_op: VecALUOp::Bsl,
+                    rd: r_dst,
+                    rn: r_b,
+                    rm: r_a,
+                    size: VectorSize::Size8x16,
+                });
+            } else {
+                panic!("Opcode::FminPseudo | Opcode::FmaxPseudo: unhandled type");
+            }
+        }
+
         Opcode::Sqrt | Opcode::Fneg | Opcode::Fabs | Opcode::Fpromote | Opcode::Fdemote => {
             let ty = ty.unwrap();
             let bits = ty_bits(ty);
@@ -2216,21 +2515,39 @@
         }
 
         Opcode::Ceil | Opcode::Floor | Opcode::Trunc | Opcode::Nearest => {
-            let bits = ty_bits(ctx.output_ty(insn, 0));
-            let op = match (op, bits) {
-                (Opcode::Ceil, 32) => FpuRoundMode::Plus32,
-                (Opcode::Ceil, 64) => FpuRoundMode::Plus64,
-                (Opcode::Floor, 32) => FpuRoundMode::Minus32,
-                (Opcode::Floor, 64) => FpuRoundMode::Minus64,
-                (Opcode::Trunc, 32) => FpuRoundMode::Zero32,
-                (Opcode::Trunc, 64) => FpuRoundMode::Zero64,
-                (Opcode::Nearest, 32) => FpuRoundMode::Nearest32,
-                (Opcode::Nearest, 64) => FpuRoundMode::Nearest64,
-                _ => panic!("Unknown op/bits combination"),
-            };
-            let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
-            let rd = get_output_reg(ctx, outputs[0]);
-            ctx.emit(Inst::FpuRound { op, rd, rn });
+            let ty = ctx.output_ty(insn, 0);
+            if !ty.is_vector() {
+                let bits = ty_bits(ty);
+                let op = match (op, bits) {
+                    (Opcode::Ceil, 32) => FpuRoundMode::Plus32,
+                    (Opcode::Ceil, 64) => FpuRoundMode::Plus64,
+                    (Opcode::Floor, 32) => FpuRoundMode::Minus32,
+                    (Opcode::Floor, 64) => FpuRoundMode::Minus64,
+                    (Opcode::Trunc, 32) => FpuRoundMode::Zero32,
+                    (Opcode::Trunc, 64) => FpuRoundMode::Zero64,
+                    (Opcode::Nearest, 32) => FpuRoundMode::Nearest32,
+                    (Opcode::Nearest, 64) => FpuRoundMode::Nearest64,
+                    _ => panic!("Unknown op/bits combination (scalar)"),
+                };
+                let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+                let rd = get_output_reg(ctx, outputs[0]);
+                ctx.emit(Inst::FpuRound { op, rd, rn });
+            } else {
+                let (op, size) = match (op, ty) {
+                    (Opcode::Ceil, F32X4) => (VecMisc2::Frintp, VectorSize::Size32x4),
+                    (Opcode::Ceil, F64X2) => (VecMisc2::Frintp, VectorSize::Size64x2),
+                    (Opcode::Floor, F32X4) => (VecMisc2::Frintm, VectorSize::Size32x4),
+                    (Opcode::Floor, F64X2) => (VecMisc2::Frintm, VectorSize::Size64x2),
+                    (Opcode::Trunc, F32X4) => (VecMisc2::Frintz, VectorSize::Size32x4),
+                    (Opcode::Trunc, F64X2) => (VecMisc2::Frintz, VectorSize::Size64x2),
+                    (Opcode::Nearest, F32X4) => (VecMisc2::Frintn, VectorSize::Size32x4),
+                    (Opcode::Nearest, F64X2) => (VecMisc2::Frintn, VectorSize::Size64x2),
+                    _ => panic!("Unknown op/ty combination (vector){:?}", ty),
+                };
+                let rn = put_input_in_reg(ctx, inputs[0], NarrowValueMode::None);
+                let rd = get_output_reg(ctx, outputs[0]);
+                ctx.emit(Inst::VecMisc { op, rd, rn, size });
+            }
         }
 
         Opcode::Fma => {
@@ -2319,9 +2636,9 @@
             } else {
                 ctx.emit(Inst::FpuCmp64 { rn, rm: rn });
             }
-            let trap_info = (ctx.srcloc(insn), TrapCode::BadConversionToInteger);
+            let trap_code = TrapCode::BadConversionToInteger;
             ctx.emit(Inst::TrapIf {
-                trap_info,
+                trap_code,
                 kind: CondBrKind::Cond(lower_fp_condcode(FloatCC::Unordered)),
             });
 
@@ -2371,9 +2688,9 @@
                     rn,
                     rm: tmp.to_reg(),
                 });
-                let trap_info = (ctx.srcloc(insn), TrapCode::IntegerOverflow);
+                let trap_code = TrapCode::IntegerOverflow;
                 ctx.emit(Inst::TrapIf {
-                    trap_info,
+                    trap_code,
                     kind: CondBrKind::Cond(lower_fp_condcode(low_cond).invert()),
                 });
 
@@ -2383,9 +2700,9 @@
                     rn,
                     rm: tmp.to_reg(),
                 });
-                let trap_info = (ctx.srcloc(insn), TrapCode::IntegerOverflow);
+                let trap_code = TrapCode::IntegerOverflow;
                 ctx.emit(Inst::TrapIf {
-                    trap_info,
+                    trap_code,
                     kind: CondBrKind::Cond(lower_fp_condcode(FloatCC::LessThan).invert()),
                 });
             } else {
@@ -2424,9 +2741,9 @@
                     rn,
                     rm: tmp.to_reg(),
                 });
-                let trap_info = (ctx.srcloc(insn), TrapCode::IntegerOverflow);
+                let trap_code = TrapCode::IntegerOverflow;
                 ctx.emit(Inst::TrapIf {
-                    trap_info,
+                    trap_code,
                     kind: CondBrKind::Cond(lower_fp_condcode(low_cond).invert()),
                 });
 
@@ -2436,9 +2753,9 @@
                     rn,
                     rm: tmp.to_reg(),
                 });
-                let trap_info = (ctx.srcloc(insn), TrapCode::IntegerOverflow);
+                let trap_code = TrapCode::IntegerOverflow;
                 ctx.emit(Inst::TrapIf {
-                    trap_info,
+                    trap_code,
                     kind: CondBrKind::Cond(lower_fp_condcode(FloatCC::LessThan).invert()),
                 });
             };
@@ -2547,15 +2864,9 @@
                 let rtmp2 = ctx.alloc_tmp(RegClass::V128, in_ty);
 
                 if in_bits == 32 {
-                    ctx.emit(Inst::LoadFpuConst32 {
-                        rd: rtmp1,
-                        const_data: max as f32,
-                    });
+                    lower_constant_f32(ctx, rtmp1, max as f32);
                 } else {
-                    ctx.emit(Inst::LoadFpuConst64 {
-                        rd: rtmp1,
-                        const_data: max,
-                    });
+                    lower_constant_f64(ctx, rtmp1, max);
                 }
                 ctx.emit(Inst::FpuRRR {
                     fpu_op: choose_32_64(in_ty, FPUOp2::Min32, FPUOp2::Min64),
@@ -2564,15 +2875,9 @@
                     rm: rtmp1.to_reg(),
                 });
                 if in_bits == 32 {
-                    ctx.emit(Inst::LoadFpuConst32 {
-                        rd: rtmp1,
-                        const_data: min as f32,
-                    });
+                    lower_constant_f32(ctx, rtmp1, min as f32);
                 } else {
-                    ctx.emit(Inst::LoadFpuConst64 {
-                        rd: rtmp1,
-                        const_data: min,
-                    });
+                    lower_constant_f64(ctx, rtmp1, min);
                 }
                 ctx.emit(Inst::FpuRRR {
                     fpu_op: choose_32_64(in_ty, FPUOp2::Max32, FPUOp2::Max64),
@@ -2582,15 +2887,9 @@
                 });
                 if out_signed {
                     if in_bits == 32 {
-                        ctx.emit(Inst::LoadFpuConst32 {
-                            rd: rtmp1,
-                            const_data: 0.0,
-                        });
+                        lower_constant_f32(ctx, rtmp1, 0.0);
                     } else {
-                        ctx.emit(Inst::LoadFpuConst64 {
-                            rd: rtmp1,
-                            const_data: 0.0,
-                        });
+                        lower_constant_f64(ctx, rtmp1, 0.0);
                     }
                 }
                 if in_bits == 32 {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/lower.rs	2021-01-18 19:58:25.000000000 +0000
@@ -10,7 +10,7 @@
 use crate::ir::condcodes::{FloatCC, IntCC};
 use crate::ir::types::*;
 use crate::ir::Inst as IRInst;
-use crate::ir::{InstructionData, Opcode, Type};
+use crate::ir::{Opcode, Type};
 use crate::machinst::lower::*;
 use crate::machinst::*;
 use crate::CodegenResult;
@@ -20,6 +20,7 @@
 
 use super::lower_inst;
 
+use crate::data_value::DataValue;
 use log::{debug, trace};
 use regalloc::{Reg, RegClass, Writable};
 use smallvec::SmallVec;
@@ -126,22 +127,9 @@
     ctx: &mut C,
     inst: IRInst,
 ) -> Option<u128> {
-    let data = match ctx.data(inst) {
-        &InstructionData::Shuffle { mask, .. } => ctx.get_immediate(mask),
-        &InstructionData::UnaryConst {
-            constant_handle, ..
-        } => ctx.get_constant_data(constant_handle),
-        _ => return None,
-    };
-    let data = data.clone().into_vec();
-
-    if data.len() == 16 {
-        let mut bytes = [0u8; 16];
-
-        bytes.copy_from_slice(&data);
-        Some(u128::from_le_bytes(bytes))
-    } else {
-        None
+    match ctx.get_immediate(inst) {
+        Some(DataValue::V128(bytes)) => Some(u128::from_le_bytes(bytes)),
+        _ => None,
     }
 }
 
@@ -586,11 +574,11 @@
 /// - NarrowValueMode::ZeroExtend64: the associated input is 32 bits wide;
 ///                                  do a zero-extension.
 ///
-/// We do not descend further into the inputs of extensions, because supporting
-/// (e.g.) a 32-bit add that is later extended would require additional masking
-/// of high-order bits, which is too complex. So, in essence, we descend any
-/// number of adds from the roots, collecting all 64-bit address addends; then
-/// possibly support extensions at these leaves.
+/// We do not descend further into the inputs of extensions (unless it is a constant),
+/// because supporting (e.g.) a 32-bit add that is later extended would require
+/// additional masking of high-order bits, which is too complex. So, in essence, we
+/// descend any number of adds from the roots, collecting all 64-bit address addends;
+/// then possibly support extensions at these leaves.
 fn collect_address_addends<C: LowerCtx<I = Inst>>(
     ctx: &mut C,
     roots: &[InsnInput],
@@ -621,8 +609,20 @@
                         ExtendOp::SXTW
                     };
                     let extendee_input = InsnInput { insn, input: 0 };
-                    let reg = put_input_in_reg(ctx, extendee_input, NarrowValueMode::None);
-                    result32.push((reg, extendop));
+                    // If the input is a zero-extension of a constant, add the value to the known
+                    // offset.
+                    // Only do this for zero-extension, as generating a sign-extended
+                    // constant may be more instructions than using the 'SXTW' addressing mode.
+                    if let (Some(insn), ExtendOp::UXTW) = (
+                        maybe_input_insn(ctx, extendee_input, Opcode::Iconst),
+                        extendop,
+                    ) {
+                        let value = (ctx.get_constant(insn).unwrap() & 0xFFFF_FFFF_u64) as i64;
+                        offset += value;
+                    } else {
+                        let reg = put_input_in_reg(ctx, extendee_input, NarrowValueMode::None);
+                        result32.push((reg, extendop));
+                    }
                 }
                 Opcode::Uextend | Opcode::Sextend => {
                     let reg = put_input_in_reg(ctx, input, NarrowValueMode::None);
@@ -825,7 +825,11 @@
     rd: Writable<Reg>,
     value: f32,
 ) {
-    ctx.emit(Inst::load_fp_constant32(rd, value));
+    let alloc_tmp = |class, ty| ctx.alloc_tmp(class, ty);
+
+    for inst in Inst::load_fp_constant32(rd, value.to_bits(), alloc_tmp) {
+        ctx.emit(inst);
+    }
 }
 
 pub(crate) fn lower_constant_f64<C: LowerCtx<I = Inst>>(
@@ -833,7 +837,11 @@
     rd: Writable<Reg>,
     value: f64,
 ) {
-    ctx.emit(Inst::load_fp_constant64(rd, value));
+    let alloc_tmp = |class, ty| ctx.alloc_tmp(class, ty);
+
+    for inst in Inst::load_fp_constant64(rd, value.to_bits(), alloc_tmp) {
+        ctx.emit(inst);
+    }
 }
 
 pub(crate) fn lower_constant_f128<C: LowerCtx<I = Inst>>(
@@ -841,7 +849,48 @@
     rd: Writable<Reg>,
     value: u128,
 ) {
-    ctx.emit(Inst::load_fp_constant128(rd, value));
+    if value == 0 {
+        // Fast-track a common case.  The general case, viz, calling `Inst::load_fp_constant128`,
+        // is potentially expensive.
+        ctx.emit(Inst::VecDupImm {
+            rd,
+            imm: ASIMDMovModImm::zero(),
+            invert: false,
+            size: VectorSize::Size8x16,
+        });
+    } else {
+        let alloc_tmp = |class, ty| ctx.alloc_tmp(class, ty);
+        for inst in Inst::load_fp_constant128(rd, value, alloc_tmp) {
+            ctx.emit(inst);
+        }
+    }
+}
+
+pub(crate) fn lower_splat_const<C: LowerCtx<I = Inst>>(
+    ctx: &mut C,
+    rd: Writable<Reg>,
+    value: u64,
+    size: VectorSize,
+) {
+    let (value, narrow_size) = match size.lane_size() {
+        ScalarSize::Size8 => (value as u8 as u64, ScalarSize::Size128),
+        ScalarSize::Size16 => (value as u16 as u64, ScalarSize::Size8),
+        ScalarSize::Size32 => (value as u32 as u64, ScalarSize::Size16),
+        ScalarSize::Size64 => (value, ScalarSize::Size32),
+        _ => unreachable!(),
+    };
+    let (value, size) = match Inst::get_replicated_vector_pattern(value as u128, narrow_size) {
+        Some((value, lane_size)) => (
+            value,
+            VectorSize::from_lane_size(lane_size, size.is_128bits()),
+        ),
+        None => (value, size),
+    };
+    let alloc_tmp = |class, ty| ctx.alloc_tmp(class, ty);
+
+    for inst in Inst::load_replicated_vector_pattern(rd, value, size, alloc_tmp) {
+        ctx.emit(inst);
+    }
 }
 
 pub(crate) fn lower_condcode(cc: IntCC) -> Cond {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/aarch64/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,15 +3,13 @@
 use crate::ir::condcodes::IntCC;
 use crate::ir::Function;
 use crate::isa::Builder as IsaBuilder;
-use crate::machinst::{
-    compile, MachBackend, MachCompileResult, ShowWithRRU, TargetIsaAdapter, VCode,
-};
+use crate::machinst::{compile, MachBackend, MachCompileResult, TargetIsaAdapter, VCode};
 use crate::result::CodegenResult;
 use crate::settings;
 
 use alloc::boxed::Box;
 
-use regalloc::RealRegUniverse;
+use regalloc::{PrettyPrint, RealRegUniverse};
 use target_lexicon::{Aarch64Architecture, Architecture, Triple};
 
 // New backend:
@@ -22,6 +20,8 @@
 
 use inst::create_reg_universe;
 
+use self::inst::EmitInfo;
+
 /// An AArch64 backend.
 pub struct AArch64Backend {
     triple: Triple,
@@ -47,8 +47,9 @@
         func: &Function,
         flags: settings::Flags,
     ) -> CodegenResult<VCode<inst::Inst>> {
+        let emit_info = EmitInfo::new(flags.clone());
         let abi = Box::new(abi::AArch64ABICallee::new(func, flags)?);
-        compile::compile::<AArch64Backend>(func, self, abi)
+        compile::compile::<AArch64Backend>(func, self, abi, emit_info)
     }
 }
 
@@ -60,8 +61,10 @@
     ) -> CodegenResult<MachCompileResult> {
         let flags = self.flags();
         let vcode = self.compile_vcode(func, flags.clone())?;
+
         let buffer = vcode.emit();
         let frame_size = vcode.frame_size();
+        let unwind_info = vcode.unwind_info()?;
 
         let disasm = if want_disasm {
             Some(vcode.show_rru(Some(&create_reg_universe(flags))))
@@ -75,6 +78,7 @@
             buffer,
             frame_size,
             disasm,
+            unwind_info,
         })
     }
 
@@ -106,6 +110,31 @@
         // opposite of x86).
         IntCC::UnsignedLessThan
     }
+
+    #[cfg(feature = "unwind")]
+    fn emit_unwind_info(
+        &self,
+        result: &MachCompileResult,
+        kind: crate::machinst::UnwindInfoKind,
+    ) -> CodegenResult<Option<crate::isa::unwind::UnwindInfo>> {
+        use crate::isa::unwind::UnwindInfo;
+        use crate::machinst::UnwindInfoKind;
+        Ok(match (result.unwind_info.as_ref(), kind) {
+            (Some(info), UnwindInfoKind::SystemV) => {
+                inst::unwind::systemv::create_unwind_info(info.clone())?.map(UnwindInfo::SystemV)
+            }
+            (Some(_info), UnwindInfoKind::Windows) => {
+                // TODO: support Windows unwind info on AArch64
+                None
+            }
+            _ => None,
+        })
+    }
+
+    #[cfg(feature = "unwind")]
+    fn create_systemv_cie(&self) -> Option<gimli::write::CommonInformationEntry> {
+        Some(inst::unwind::systemv::create_cie())
+    }
 }
 
 /// Create a new `isa::Builder`.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/abi.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/abi.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/abi.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/abi.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,6 @@
 
 use crate::ir;
 use crate::ir::types::*;
-use crate::ir::SourceLoc;
 use crate::isa;
 use crate::isa::arm32::inst::*;
 use crate::machinst::*;
@@ -45,6 +44,11 @@
         32
     }
 
+    /// Return required stack alignment in bytes.
+    fn stack_align(_call_conv: isa::CallConv) -> u32 {
+        8
+    }
+
     fn compute_arg_locs(
         _call_conv: isa::CallConv,
         params: &[ir::AbiParam],
@@ -212,7 +216,7 @@
             rm: limit_reg,
         });
         insts.push(Inst::TrapIf {
-            trap_info: (ir::SourceLoc::default(), ir::TrapCode::StackOverflow),
+            trap_info: ir::TrapCode::StackOverflow,
             // Here `Lo` == "less than" when interpreting the two
             // operands as unsigned integers.
             cond: Cond::Lo,
@@ -308,6 +312,7 @@
         _flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
         fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> (u64, SmallVec<[Inst; 16]>) {
         let mut insts = SmallVec::new();
         if fixed_frame_storage_size > 0 {
@@ -336,6 +341,8 @@
         _call_conv: isa::CallConv,
         _flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
+        _fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> SmallVec<[Inst; 16]> {
         let mut insts = SmallVec::new();
         let clobbered_vec = get_callee_saves(clobbers);
@@ -358,9 +365,10 @@
         dest: &CallDest,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: ir::Opcode,
         tmp: Writable<Reg>,
+        _callee_conv: isa::CallConv,
+        _caller_conv: isa::CallConv,
     ) -> SmallVec<[(InstIsSafepoint, Inst); 2]> {
         let mut insts = SmallVec::new();
         match &dest {
@@ -371,7 +379,6 @@
                         dest: name.clone(),
                         uses,
                         defs,
-                        loc,
                         opcode,
                     }),
                 },
@@ -383,7 +390,6 @@
                         rt: tmp,
                         name: Box::new(name.clone()),
                         offset: 0,
-                        srcloc: loc,
                     },
                 ));
                 insts.push((
@@ -393,7 +399,6 @@
                             rm: tmp.to_reg(),
                             uses,
                             defs,
-                            loc,
                             opcode,
                         }),
                     },
@@ -406,7 +411,6 @@
                         rm: *reg,
                         uses,
                         defs,
-                        loc,
                         opcode,
                     }),
                 },
@@ -431,11 +435,11 @@
         s.nominal_sp_to_fp
     }
 
-    fn get_caller_saves(_call_conv: isa::CallConv) -> Vec<Writable<Reg>> {
+    fn get_regs_clobbered_by_call(_: isa::CallConv) -> Vec<Writable<Reg>> {
         let mut caller_saved = Vec::new();
         for i in 0..15 {
             let r = writable_rreg(i);
-            if is_caller_save(r.to_reg().to_real_reg()) {
+            if is_reg_clobbered_by_call(r.to_reg().to_real_reg()) {
                 caller_saved.push(r);
             }
         }
@@ -461,7 +465,7 @@
     ret
 }
 
-fn is_caller_save(r: RealReg) -> bool {
+fn is_reg_clobbered_by_call(r: RealReg) -> bool {
     let enc = r.get_hw_encoding();
     enc <= 3
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/args.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/args.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/args.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/args.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,7 @@
 
 use crate::isa::arm32::inst::*;
 
-use regalloc::{RealRegUniverse, Reg};
+use regalloc::{PrettyPrint, RealRegUniverse, Reg};
 
 use std::string::String;
 
@@ -265,7 +265,7 @@
     }
 }
 
-impl ShowWithRRU for ShiftOpAndAmt {
+impl PrettyPrint for ShiftOpAndAmt {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         let op = match self.op() {
             ShiftOp::LSL => "lsl",
@@ -277,19 +277,19 @@
     }
 }
 
-impl ShowWithRRU for UImm8 {
+impl PrettyPrint for UImm8 {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for UImm12 {
+impl PrettyPrint for UImm12 {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         format!("#{}", self.value)
     }
 }
 
-impl ShowWithRRU for AMode {
+impl PrettyPrint for AMode {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &AMode::RegReg(rn, rm, imm2) => {
@@ -317,7 +317,7 @@
     }
 }
 
-impl ShowWithRRU for Cond {
+impl PrettyPrint for Cond {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         let mut s = format!("{:?}", self);
         s.make_ascii_lowercase();
@@ -325,7 +325,7 @@
     }
 }
 
-impl ShowWithRRU for BranchTarget {
+impl PrettyPrint for BranchTarget {
     fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             &BranchTarget::Label(label) => format!("label{:?}", label.get()),
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,6 +1,7 @@
 //! 32-bit ARM ISA: binary code emission.
 
 use crate::binemit::{Reloc, StackMap};
+use crate::ir::SourceLoc;
 use crate::isa::arm32::inst::*;
 
 use core::convert::TryFrom;
@@ -229,6 +230,8 @@
     pub(crate) nominal_sp_to_fp: i64,
     /// Safepoint stack map for upcoming instruction, as provided to `pre_safepoint()`.
     stack_map: Option<StackMap>,
+    /// Source location of next machine code instruction to be emitted.
+    cur_srcloc: SourceLoc,
 }
 
 impl MachInstEmitState<Inst> for EmitState {
@@ -237,12 +240,17 @@
             virtual_sp_offset: 0,
             nominal_sp_to_fp: abi.frame_size() as i64,
             stack_map: None,
+            cur_srcloc: SourceLoc::default(),
         }
     }
 
     fn pre_safepoint(&mut self, stack_map: StackMap) {
         self.stack_map = Some(stack_map);
     }
+
+    fn pre_sourceloc(&mut self, srcloc: SourceLoc) {
+        self.cur_srcloc = srcloc;
+    }
 }
 
 impl EmitState {
@@ -253,12 +261,34 @@
     fn clear_post_insn(&mut self) {
         self.stack_map = None;
     }
+
+    fn cur_srcloc(&self) -> SourceLoc {
+        self.cur_srcloc
+    }
+}
+
+pub struct EmitInfo {
+    flags: settings::Flags,
+}
+
+impl EmitInfo {
+    pub(crate) fn new(flags: settings::Flags) -> Self {
+        EmitInfo { flags }
+    }
+}
+
+impl MachInstEmitInfo for EmitInfo {
+    fn flags(&self) -> &settings::Flags {
+        &self.flags
+    }
 }
 
 impl MachInstEmit for Inst {
+    type Info = EmitInfo;
     type State = EmitState;
+    type UnwindInfo = super::unwind::Arm32UnwindInfo;
 
-    fn emit(&self, sink: &mut MachBuffer<Inst>, flags: &settings::Flags, state: &mut EmitState) {
+    fn emit(&self, sink: &mut MachBuffer<Inst>, emit_info: &Self::Info, state: &mut EmitState) {
         let start_off = sink.cur_offset();
 
         match self {
@@ -438,17 +468,13 @@
                 let inst = enc_32_regs(inst, None, None, None, Some(rn));
                 emit_32(inst, sink);
             }
-            &Inst::Store {
-                rt,
-                ref mem,
-                srcloc,
-                bits,
-            } => {
+            &Inst::Store { rt, ref mem, bits } => {
                 let (mem_insts, mem) = mem_finalize(mem, state);
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     // Register the offset at which the store instruction starts.
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
@@ -478,15 +504,15 @@
             &Inst::Load {
                 rt,
                 ref mem,
-                srcloc,
                 bits,
                 sign_extend,
             } => {
                 let (mem_insts, mem) = mem_finalize(mem, state);
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
-                if let Some(srcloc) = srcloc {
+                let srcloc = state.cur_srcloc();
+                if srcloc != SourceLoc::default() {
                     // Register the offset at which the load instruction starts.
                     sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
                 }
@@ -537,7 +563,7 @@
             &Inst::LoadAddr { rd, ref mem } => {
                 let (mem_insts, mem) = mem_finalize(mem, state);
                 for inst in mem_insts.into_iter() {
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
                 let inst = match mem {
                     AMode::RegReg(reg1, reg2, shift) => {
@@ -574,7 +600,7 @@
                     }
                     _ => unreachable!(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
             }
             &Inst::Extend {
                 rd,
@@ -617,7 +643,7 @@
                     rn: rm,
                     imm8: UImm8::maybe_from_i64(1).unwrap(),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
 
                 if signed {
                     let inst = Inst::AluRRImm8 {
@@ -626,7 +652,7 @@
                         rn: rd.to_reg(),
                         imm8: UImm8::maybe_from_i64(1).unwrap(),
                     };
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, emit_info, state);
                 }
             }
             &Inst::Extend { .. } => {
@@ -638,7 +664,7 @@
 
                 sink.put2(enc_16_it(cond, insts));
                 for inst in insts.iter() {
-                    inst.inst.emit(sink, flags, state);
+                    inst.inst.emit(sink, emit_info, state);
                 }
             }
             &Inst::Push { ref reg_list } => match reg_list.len() {
@@ -678,23 +704,24 @@
                 }
             },
             &Inst::Call { ref info } => {
-                sink.add_reloc(info.loc, Reloc::Arm32Call, &info.dest, 0);
+                let srcloc = state.cur_srcloc();
+                sink.add_reloc(srcloc, Reloc::Arm32Call, &info.dest, 0);
                 emit_32(0b11110_0_0000000000_11_0_1_0_00000000000, sink);
                 if info.opcode.is_call() {
-                    sink.add_call_site(info.loc, info.opcode);
+                    sink.add_call_site(srcloc, info.opcode);
                 }
             }
             &Inst::CallInd { ref info } => {
+                let srcloc = state.cur_srcloc();
                 sink.put2(0b01000111_1_0000_000 | (machreg_to_gpr(info.rm) << 3));
                 if info.opcode.is_call() {
-                    sink.add_call_site(info.loc, info.opcode);
+                    sink.add_call_site(srcloc, info.opcode);
                 }
             }
             &Inst::LoadExtName {
                 rt,
                 ref name,
                 offset,
-                srcloc,
             } => {
                 //  maybe nop2          (0|2) bytes (pc is now 4-aligned)
                 //  ldr rt, [pc, #4]    4 bytes
@@ -703,7 +730,7 @@
                 // continue:
                 //
                 if start_off & 0x3 != 0 {
-                    Inst::Nop2.emit(sink, flags, state);
+                    Inst::Nop2.emit(sink, emit_info, state);
                 }
                 assert_eq!(sink.cur_offset() & 0x3, 0);
 
@@ -711,17 +738,17 @@
                 let inst = Inst::Load {
                     rt,
                     mem,
-                    srcloc: Some(srcloc),
                     bits: 32,
                     sign_extend: false,
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
 
                 let inst = Inst::Jump {
                     dest: BranchTarget::ResolvedOffset(4),
                 };
-                inst.emit(sink, flags, state);
+                inst.emit(sink, emit_info, state);
 
+                let srcloc = state.cur_srcloc();
                 sink.add_reloc(srcloc, Reloc::Abs4, name, offset.into());
                 sink.put4(0);
             }
@@ -766,7 +793,8 @@
                 sink.put2(inst);
             }
             &Inst::Udf { trap_info } => {
-                let (srcloc, code) = trap_info;
+                let srcloc = state.cur_srcloc();
+                let code = trap_info;
                 sink.add_trap(srcloc, code);
                 sink.put2(0b11011110_00000000);
             }
@@ -779,7 +807,7 @@
                 emit_32(enc_32_cond_branch(cond, dest), sink);
 
                 let trap = Inst::Udf { trap_info };
-                trap.emit(sink, flags, state);
+                trap.emit(sink, emit_info, state);
             }
             &Inst::VirtualSPOffsetAdj { offset } => {
                 debug!(
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit_tests.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit_tests.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit_tests.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/emit_tests.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1244,7 +1244,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 32,
         },
         "41F80200",
@@ -1254,7 +1253,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 3),
-            srcloc: None,
             bits: 32,
         },
         "49F83A80",
@@ -1264,7 +1262,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::RegOffset(rreg(1), 4095),
-            srcloc: None,
             bits: 32,
         },
         "C1F8FF0F",
@@ -1274,7 +1271,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::RegOffset(rreg(9), 0),
-            srcloc: None,
             bits: 32,
         },
         "C9F80080",
@@ -1284,7 +1280,6 @@
         Inst::Store {
             rt: rreg(7),
             mem: AMode::RegOffset(rreg(11), 65535),
-            srcloc: None,
             bits: 32,
         },
         "4FF6FF7C4BF80C70",
@@ -1294,7 +1289,6 @@
         Inst::Store {
             rt: rreg(10),
             mem: AMode::RegOffset(rreg(4), 16777215),
-            srcloc: None,
             bits: 32,
         },
         "4FF6FF7CC0F2FF0C44F80CA0",
@@ -1304,7 +1298,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 16,
         },
         "21F80200",
@@ -1314,7 +1307,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 2),
-            srcloc: None,
             bits: 16,
         },
         "29F82A80",
@@ -1324,7 +1316,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::RegOffset(rreg(1), 3210),
-            srcloc: None,
             bits: 16,
         },
         "A1F88A0C",
@@ -1334,7 +1325,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::RegOffset(rreg(9), 1),
-            srcloc: None,
             bits: 16,
         },
         "A9F80180",
@@ -1344,7 +1334,6 @@
         Inst::Store {
             rt: rreg(7),
             mem: AMode::RegOffset(rreg(11), 65535),
-            srcloc: None,
             bits: 16,
         },
         "4FF6FF7C2BF80C70",
@@ -1354,7 +1343,6 @@
         Inst::Store {
             rt: rreg(10),
             mem: AMode::RegOffset(rreg(4), 16777215),
-            srcloc: None,
             bits: 16,
         },
         "4FF6FF7CC0F2FF0C24F80CA0",
@@ -1364,7 +1352,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 8,
         },
         "01F80200",
@@ -1374,7 +1361,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 1),
-            srcloc: None,
             bits: 8,
         },
         "09F81A80",
@@ -1384,7 +1370,6 @@
         Inst::Store {
             rt: rreg(0),
             mem: AMode::RegOffset(rreg(1), 4),
-            srcloc: None,
             bits: 8,
         },
         "81F80400",
@@ -1394,7 +1379,6 @@
         Inst::Store {
             rt: rreg(8),
             mem: AMode::RegOffset(rreg(9), 777),
-            srcloc: None,
             bits: 8,
         },
         "89F80983",
@@ -1404,7 +1388,6 @@
         Inst::Store {
             rt: rreg(7),
             mem: AMode::RegOffset(rreg(11), 65535),
-            srcloc: None,
             bits: 8,
         },
         "4FF6FF7C0BF80C70",
@@ -1414,7 +1397,6 @@
         Inst::Store {
             rt: rreg(10),
             mem: AMode::RegOffset(rreg(4), 16777215),
-            srcloc: None,
             bits: 8,
         },
         "4FF6FF7CC0F2FF0C04F80CA0",
@@ -1424,7 +1406,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1435,7 +1416,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 1),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1446,7 +1426,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::RegOffset(rreg(1), 55),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1457,7 +1436,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::RegOffset(rreg(9), 1234),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1468,7 +1446,6 @@
         Inst::Load {
             rt: writable_rreg(7),
             mem: AMode::RegOffset(rreg(11), 9876),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1479,7 +1456,6 @@
         Inst::Load {
             rt: writable_rreg(10),
             mem: AMode::RegOffset(rreg(4), 252645135),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1490,7 +1466,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::PCRel(-56),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1501,7 +1476,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::PCRel(1024),
-            srcloc: None,
             bits: 32,
             sign_extend: false,
         },
@@ -1512,7 +1486,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 16,
             sign_extend: true,
         },
@@ -1523,7 +1496,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 2),
-            srcloc: None,
             bits: 16,
             sign_extend: false,
         },
@@ -1534,7 +1506,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::RegOffset(rreg(1), 55),
-            srcloc: None,
             bits: 16,
             sign_extend: false,
         },
@@ -1545,7 +1516,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::RegOffset(rreg(9), 1234),
-            srcloc: None,
             bits: 16,
             sign_extend: true,
         },
@@ -1556,7 +1526,6 @@
         Inst::Load {
             rt: writable_rreg(7),
             mem: AMode::RegOffset(rreg(11), 9876),
-            srcloc: None,
             bits: 16,
             sign_extend: true,
         },
@@ -1567,7 +1536,6 @@
         Inst::Load {
             rt: writable_rreg(10),
             mem: AMode::RegOffset(rreg(4), 252645135),
-            srcloc: None,
             bits: 16,
             sign_extend: false,
         },
@@ -1578,7 +1546,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::PCRel(56),
-            srcloc: None,
             bits: 16,
             sign_extend: false,
         },
@@ -1589,7 +1556,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::PCRel(-1000),
-            srcloc: None,
             bits: 16,
             sign_extend: true,
         },
@@ -1600,7 +1566,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::reg_plus_reg(rreg(1), rreg(2), 0),
-            srcloc: None,
             bits: 8,
             sign_extend: true,
         },
@@ -1611,7 +1576,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::reg_plus_reg(rreg(9), rreg(10), 3),
-            srcloc: None,
             bits: 8,
             sign_extend: false,
         },
@@ -1622,7 +1586,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::RegOffset(rreg(1), 55),
-            srcloc: None,
             bits: 8,
             sign_extend: false,
         },
@@ -1633,7 +1596,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::RegOffset(rreg(9), 1234),
-            srcloc: None,
             bits: 8,
             sign_extend: true,
         },
@@ -1644,7 +1606,6 @@
         Inst::Load {
             rt: writable_rreg(7),
             mem: AMode::RegOffset(rreg(11), 9876),
-            srcloc: None,
             bits: 8,
             sign_extend: true,
         },
@@ -1655,7 +1616,6 @@
         Inst::Load {
             rt: writable_rreg(10),
             mem: AMode::RegOffset(rreg(4), 252645135),
-            srcloc: None,
             bits: 8,
             sign_extend: false,
         },
@@ -1666,7 +1626,6 @@
         Inst::Load {
             rt: writable_rreg(0),
             mem: AMode::PCRel(72),
-            srcloc: None,
             bits: 8,
             sign_extend: false,
         },
@@ -1677,7 +1636,6 @@
         Inst::Load {
             rt: writable_rreg(8),
             mem: AMode::PCRel(-1234),
-            srcloc: None,
             bits: 8,
             sign_extend: true,
         },
@@ -1961,7 +1919,7 @@
     insns.push((
         Inst::TrapIf {
             cond: Cond::Eq,
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_info: TrapCode::Interrupt,
         },
         "40F0018000DE",
         "bne 2 ; udf #0",
@@ -1969,14 +1927,14 @@
     insns.push((
         Inst::TrapIf {
             cond: Cond::Hs,
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_info: TrapCode::Interrupt,
         },
         "C0F0018000DE",
         "blo 2 ; udf #0",
     ));
     insns.push((
         Inst::Udf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_info: TrapCode::Interrupt,
         },
         "00DE",
         "udf #0",
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,11 +4,11 @@
 
 use crate::binemit::CodeOffset;
 use crate::ir::types::{B1, B16, B32, B8, I16, I32, I8, IFLAGS};
-use crate::ir::{ExternalName, Opcode, SourceLoc, TrapCode, Type};
+use crate::ir::{ExternalName, Opcode, TrapCode, Type};
 use crate::machinst::*;
 use crate::{settings, CodegenError, CodegenResult};
 
-use regalloc::{RealRegUniverse, Reg, RegClass, SpillSlot, VirtualReg, Writable};
+use regalloc::{PrettyPrint, RealRegUniverse, Reg, RegClass, SpillSlot, VirtualReg, Writable};
 use regalloc::{RegUsageCollector, RegUsageMapper};
 
 use alloc::boxed::Box;
@@ -22,6 +22,7 @@
 pub use self::emit::*;
 mod regs;
 pub use self::regs::*;
+pub mod unwind;
 
 #[cfg(test)]
 mod emit_tests;
@@ -82,7 +83,6 @@
     pub dest: ExternalName,
     pub uses: Vec<Reg>,
     pub defs: Vec<Writable<Reg>>,
-    pub loc: SourceLoc,
     pub opcode: Opcode,
 }
 
@@ -93,7 +93,6 @@
     pub rm: Reg,
     pub uses: Vec<Reg>,
     pub defs: Vec<Writable<Reg>>,
-    pub loc: SourceLoc,
     pub opcode: Opcode,
 }
 
@@ -217,7 +216,6 @@
     Store {
         rt: Reg,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
         bits: u8,
     },
 
@@ -226,7 +224,6 @@
     Load {
         rt: Writable<Reg>,
         mem: AMode,
-        srcloc: Option<SourceLoc>,
         bits: u8,
         sign_extend: bool,
     },
@@ -275,7 +272,6 @@
     LoadExtName {
         rt: Writable<Reg>,
         name: Box<ExternalName>,
-        srcloc: SourceLoc,
         offset: i32,
     },
 
@@ -307,13 +303,13 @@
     /// unit to the register allocator.
     TrapIf {
         cond: Cond,
-        trap_info: (SourceLoc, TrapCode),
+        trap_info: TrapCode,
     },
 
     /// An instruction guaranteed to always be undefined and to trigger an illegal instruction at
     /// runtime.
     Udf {
-        trap_info: (SourceLoc, TrapCode),
+        trap_info: TrapCode,
     },
 
     /// A "breakpoint" instruction, used for e.g. traps and debug breakpoints.
@@ -389,7 +385,6 @@
         Inst::Load {
             rt: into_reg,
             mem,
-            srcloc: None,
             bits,
             sign_extend: false,
         }
@@ -404,7 +399,6 @@
         Inst::Store {
             rt: from_reg,
             mem,
-            srcloc: None,
             bits,
         }
     }
@@ -897,7 +891,7 @@
     (mem_str, mem)
 }
 
-impl ShowWithRRU for Inst {
+impl PrettyPrint for Inst {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         self.pretty_print(mb_rru, &mut EmitState::default())
     }
@@ -1188,7 +1182,6 @@
                 rt,
                 ref name,
                 offset,
-                srcloc: _srcloc,
             } => {
                 let rt = rt.show_rru(mb_rru);
                 format!("ldr {}, [pc, #4] ; b 4 ; data {:?} + {}", rt, name, offset)
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/unwind.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/unwind.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/unwind.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/inst/unwind.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,14 @@
+use super::*;
+use crate::isa::unwind::input::UnwindInfo;
+use crate::result::CodegenResult;
+
+pub struct Arm32UnwindInfo;
+
+impl UnwindInfoGenerator<Inst> for Arm32UnwindInfo {
+    fn create_unwind_info(
+        _context: UnwindInfoContext<Inst>,
+    ) -> CodegenResult<Option<UnwindInfo<Reg>>> {
+        // TODO
+        Ok(None)
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/lower_inst.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/lower_inst.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/lower_inst.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/lower_inst.rs	2021-01-18 19:58:25.000000000 +0000
@@ -386,19 +386,8 @@
             let base = input_to_reg(ctx, inputs[1], NarrowValueMode::None);
 
             let mem = AMode::RegOffset(base, i64::from(off));
-            let memflags = ctx.memflags(insn).expect("memory flags");
 
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
-            ctx.emit(Inst::Store {
-                rt,
-                mem,
-                srcloc,
-                bits,
-            });
+            ctx.emit(Inst::Store { rt, mem, bits });
         }
         Opcode::Load
         | Opcode::Uload8
@@ -429,17 +418,10 @@
             assert_eq!(inputs.len(), 2, "only one input for store memory operands");
             let base = input_to_reg(ctx, inputs[1], NarrowValueMode::None);
             let mem = AMode::RegOffset(base, i64::from(off));
-            let memflags = ctx.memflags(insn).expect("memory flags");
 
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
             ctx.emit(Inst::Load {
                 rt: out_reg,
                 mem,
-                srcloc,
                 bits,
                 sign_extend,
             });
@@ -484,7 +466,7 @@
             ctx.emit(Inst::Bkpt);
         }
         Opcode::Trap => {
-            let trap_info = (ctx.srcloc(insn), inst_trapcode(ctx.data(insn)).unwrap());
+            let trap_info = inst_trapcode(ctx.data(insn)).unwrap();
             ctx.emit(Inst::Udf { trap_info })
         }
         Opcode::Trapif => {
@@ -496,7 +478,7 @@
             debug_assert_eq!(ctx.data(cmp_insn).opcode(), Opcode::Ifcmp);
             emit_cmp(ctx, cmp_insn);
 
-            let trap_info = (ctx.srcloc(insn), inst_trapcode(ctx.data(insn)).unwrap());
+            let trap_info = inst_trapcode(ctx.data(insn)).unwrap();
             let condcode = inst_condcode(ctx.data(insn)).unwrap();
             let cond = lower_condcode(condcode);
 
@@ -512,7 +494,7 @@
             }
         }
         Opcode::Call | Opcode::CallIndirect => {
-            let loc = ctx.srcloc(insn);
+            let caller_conv = ctx.abi().call_conv();
             let (mut abi, inputs) = match op {
                 Opcode::Call => {
                     let (extname, dist) = ctx.call_target(insn).unwrap();
@@ -521,7 +503,7 @@
                     assert_eq!(inputs.len(), sig.params.len());
                     assert_eq!(outputs.len(), sig.returns.len());
                     (
-                        Arm32ABICaller::from_func(sig, &extname, dist, loc)?,
+                        Arm32ABICaller::from_func(sig, &extname, dist, caller_conv)?,
                         &inputs[..],
                     )
                 }
@@ -530,7 +512,10 @@
                     let sig = ctx.call_sig(insn).unwrap();
                     assert_eq!(inputs.len() - 1, sig.params.len());
                     assert_eq!(outputs.len(), sig.returns.len());
-                    (Arm32ABICaller::from_ptr(sig, ptr, loc, op)?, &inputs[1..])
+                    (
+                        Arm32ABICaller::from_ptr(sig, ptr, op, caller_conv)?,
+                        &inputs[1..],
+                    )
                 }
                 _ => unreachable!(),
             };
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/arm32/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/arm32/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,14 +3,12 @@
 use crate::ir::condcodes::IntCC;
 use crate::ir::Function;
 use crate::isa::Builder as IsaBuilder;
-use crate::machinst::{
-    compile, MachBackend, MachCompileResult, ShowWithRRU, TargetIsaAdapter, VCode,
-};
+use crate::machinst::{compile, MachBackend, MachCompileResult, TargetIsaAdapter, VCode};
 use crate::result::CodegenResult;
 use crate::settings;
 
 use alloc::boxed::Box;
-use regalloc::RealRegUniverse;
+use regalloc::{PrettyPrint, RealRegUniverse};
 use target_lexicon::{Architecture, ArmArchitecture, Triple};
 
 // New backend:
@@ -19,7 +17,7 @@
 mod lower;
 mod lower_inst;
 
-use inst::create_reg_universe;
+use inst::{create_reg_universe, EmitInfo};
 
 /// An ARM32 backend.
 pub struct Arm32Backend {
@@ -46,8 +44,9 @@
     ) -> CodegenResult<VCode<inst::Inst>> {
         // This performs lowering to VCode, register-allocates the code, computes
         // block layout and finalizes branches. The result is ready for binary emission.
+        let emit_info = EmitInfo::new(flags.clone());
         let abi = Box::new(abi::Arm32ABICallee::new(func, flags)?);
-        compile::compile::<Arm32Backend>(func, self, abi)
+        compile::compile::<Arm32Backend>(func, self, abi, emit_info)
     }
 }
 
@@ -74,6 +73,7 @@
             buffer,
             frame_size,
             disasm,
+            unwind_info: None,
         })
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -87,7 +87,6 @@
 #[cfg(feature = "arm64")]
 pub(crate) mod aarch64;
 
-#[cfg(feature = "unwind")]
 pub mod unwind;
 
 mod call_conv;
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/test_utils.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/test_utils.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/test_utils.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/test_utils.rs	2021-01-18 19:58:25.000000000 +0000
@@ -59,8 +59,6 @@
         }
     }
 
-    fn reloc_block(&mut self, _rel: Reloc, _block_offset: CodeOffset) {}
-
     fn reloc_external(
         &mut self,
         _srcloc: SourceLoc,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind/systemv.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind/systemv.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind/systemv.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind/systemv.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,5 +1,7 @@
 //! System V ABI unwind information.
 
+use crate::isa::unwind::input;
+use crate::result::{CodegenError, CodegenResult};
 use alloc::vec::Vec;
 use gimli::write::{Address, FrameDescriptionEntry};
 use thiserror::Error;
@@ -92,6 +94,14 @@
     }
 }
 
+/// Maps UnwindInfo register to gimli's index space.
+pub(crate) trait RegisterMapper<Reg> {
+    /// Maps Reg.
+    fn map(&self, reg: Reg) -> Result<Register, RegisterMappingError>;
+    /// Gets stack pointer register.
+    fn sp(&self) -> Register;
+}
+
 /// Represents unwind information for a single System V ABI function.
 ///
 /// This representation is not ISA specific.
@@ -103,8 +113,58 @@
 }
 
 impl UnwindInfo {
-    pub(crate) fn new(instructions: Vec<(u32, CallFrameInstruction)>, len: u32) -> Self {
-        Self { instructions, len }
+    pub(crate) fn build<'b, Reg: PartialEq + Copy>(
+        unwind: input::UnwindInfo<Reg>,
+        map_reg: &'b dyn RegisterMapper<Reg>,
+    ) -> CodegenResult<Self> {
+        use input::UnwindCode;
+        let mut builder = InstructionBuilder::new(unwind.initial_sp_offset, map_reg);
+
+        for (offset, c) in unwind.prologue_unwind_codes.iter().chain(
+            unwind
+                .epilogues_unwind_codes
+                .iter()
+                .map(|c| c.iter())
+                .flatten(),
+        ) {
+            match c {
+                UnwindCode::SaveRegister { reg, stack_offset } => {
+                    builder
+                        .save_reg(*offset, *reg, *stack_offset)
+                        .map_err(CodegenError::RegisterMappingError)?;
+                }
+                UnwindCode::StackAlloc { size } => {
+                    builder.adjust_sp_down_imm(*offset, *size as i64);
+                }
+                UnwindCode::StackDealloc { size } => {
+                    builder.adjust_sp_up_imm(*offset, *size as i64);
+                }
+                UnwindCode::RestoreRegister { reg } => {
+                    builder
+                        .restore_reg(*offset, *reg)
+                        .map_err(CodegenError::RegisterMappingError)?;
+                }
+                UnwindCode::SetFramePointer { reg } => {
+                    builder
+                        .set_cfa_reg(*offset, *reg)
+                        .map_err(CodegenError::RegisterMappingError)?;
+                }
+                UnwindCode::RestoreFramePointer => {
+                    builder.restore_cfa(*offset);
+                }
+                UnwindCode::RememberState => {
+                    builder.remember_state(*offset);
+                }
+                UnwindCode::RestoreState => {
+                    builder.restore_state(*offset);
+                }
+            }
+        }
+
+        let instructions = builder.instructions;
+        let len = unwind.function_size;
+
+        Ok(Self { instructions, len })
     }
 
     /// Converts the unwind information into a `FrameDescriptionEntry`.
@@ -118,3 +178,136 @@
         fde
     }
 }
+
+struct InstructionBuilder<'a, Reg: PartialEq + Copy> {
+    sp_offset: i32,
+    frame_register: Option<Reg>,
+    saved_state: Option<(i32, Option<Reg>)>,
+    map_reg: &'a dyn RegisterMapper<Reg>,
+    instructions: Vec<(u32, CallFrameInstruction)>,
+}
+
+impl<'a, Reg: PartialEq + Copy> InstructionBuilder<'a, Reg> {
+    fn new(sp_offset: u8, map_reg: &'a (dyn RegisterMapper<Reg> + 'a)) -> Self {
+        Self {
+            sp_offset: sp_offset as i32, // CFA offset starts at the specified offset to account for the return address on stack
+            saved_state: None,
+            frame_register: None,
+            map_reg,
+            instructions: Vec::new(),
+        }
+    }
+
+    fn save_reg(
+        &mut self,
+        offset: u32,
+        reg: Reg,
+        stack_offset: u32,
+    ) -> Result<(), RegisterMappingError> {
+        // Pushes in the prologue are register saves, so record an offset of the save
+        self.instructions.push((
+            offset,
+            CallFrameInstruction::Offset(
+                self.map_reg.map(reg)?,
+                stack_offset as i32 - self.sp_offset,
+            ),
+        ));
+
+        Ok(())
+    }
+
+    fn adjust_sp_down_imm(&mut self, offset: u32, imm: i64) {
+        assert!(imm <= core::u32::MAX as i64);
+
+        self.sp_offset += imm as i32;
+
+        // Don't adjust the CFA if we're using a frame pointer
+        if self.frame_register.is_some() {
+            return;
+        }
+
+        self.instructions
+            .push((offset, CallFrameInstruction::CfaOffset(self.sp_offset)));
+    }
+
+    fn adjust_sp_up_imm(&mut self, offset: u32, imm: i64) {
+        assert!(imm <= core::u32::MAX as i64);
+
+        self.sp_offset -= imm as i32;
+
+        // Don't adjust the CFA if we're using a frame pointer
+        if self.frame_register.is_some() {
+            return;
+        }
+
+        let cfa_inst_ofs = {
+            // Scan to find and merge with CFA instruction with the same offset.
+            let mut it = self.instructions.iter_mut();
+            loop {
+                match it.next_back() {
+                    Some((i_offset, i)) if *i_offset == offset => {
+                        if let CallFrameInstruction::Cfa(_, o) = i {
+                            break Some(o);
+                        }
+                    }
+                    _ => {
+                        break None;
+                    }
+                }
+            }
+        };
+
+        if let Some(o) = cfa_inst_ofs {
+            // Update previous CFA instruction.
+            *o = self.sp_offset;
+        } else {
+            // Add just CFA offset instruction.
+            self.instructions
+                .push((offset, CallFrameInstruction::CfaOffset(self.sp_offset)));
+        }
+    }
+
+    fn set_cfa_reg(&mut self, offset: u32, reg: Reg) -> Result<(), RegisterMappingError> {
+        self.instructions.push((
+            offset,
+            CallFrameInstruction::CfaRegister(self.map_reg.map(reg)?),
+        ));
+        self.frame_register = Some(reg);
+        Ok(())
+    }
+
+    fn restore_cfa(&mut self, offset: u32) {
+        // Restore SP and its offset.
+        self.instructions.push((
+            offset,
+            CallFrameInstruction::Cfa(self.map_reg.sp(), self.sp_offset),
+        ));
+        self.frame_register = None;
+    }
+
+    fn restore_reg(&mut self, offset: u32, reg: Reg) -> Result<(), RegisterMappingError> {
+        // Pops in the epilogue are register restores, so record a "same value" for the register
+        self.instructions.push((
+            offset,
+            CallFrameInstruction::SameValue(self.map_reg.map(reg)?),
+        ));
+
+        Ok(())
+    }
+
+    fn remember_state(&mut self, offset: u32) {
+        self.saved_state = Some((self.sp_offset, self.frame_register));
+
+        self.instructions
+            .push((offset, CallFrameInstruction::RememberState));
+    }
+
+    fn restore_state(&mut self, offset: u32) {
+        let (sp_offset, frame_register) = self.saved_state.take().unwrap();
+        self.sp_offset = sp_offset;
+        self.frame_register = frame_register;
+
+        self.instructions
+            .push((offset, CallFrameInstruction::RestoreState));
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind/winx64.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind/winx64.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind/winx64.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind/winx64.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,10 @@
 //! Windows x64 ABI unwind information.
 
+use crate::isa::{unwind::input, RegUnit};
+use crate::result::{CodegenError, CodegenResult};
 use alloc::vec::Vec;
 use byteorder::{ByteOrder, LittleEndian};
+use log::warn;
 #[cfg(feature = "enable-serde")]
 use serde::{Deserialize, Serialize};
 
@@ -134,6 +137,17 @@
     }
 }
 
+pub(crate) enum MappedRegister {
+    Int(u8),
+    Xmm(u8),
+}
+
+/// Maps UnwindInfo register to Windows x64 unwind data.
+pub(crate) trait RegisterMapper {
+    /// Maps RegUnit.
+    fn map(reg: RegUnit) -> MappedRegister;
+}
+
 /// Represents Windows x64 unwind information.
 ///
 /// For information about Windows x64 unwind info, see:
@@ -204,4 +218,77 @@
             .iter()
             .fold(0, |nodes, c| nodes + c.node_count())
     }
+
+    pub(crate) fn build<MR: RegisterMapper>(
+        unwind: input::UnwindInfo<RegUnit>,
+    ) -> CodegenResult<Self> {
+        use crate::isa::unwind::input::UnwindCode as InputUnwindCode;
+
+        let word_size: u32 = unwind.word_size.into();
+        let mut unwind_codes = Vec::new();
+        for (offset, c) in unwind.prologue_unwind_codes.iter() {
+            match c {
+                InputUnwindCode::SaveRegister { reg, stack_offset } => {
+                    let reg = MR::map(*reg);
+                    let offset = ensure_unwind_offset(*offset)?;
+                    match reg {
+                        MappedRegister::Int(reg) => {
+                            // Attempt to convert sequence of the `InputUnwindCode`:
+                            // `StackAlloc { size = word_size }`, `SaveRegister { stack_offset: 0 }`
+                            // to the shorter `UnwindCode::PushRegister`.
+                            let push_reg_sequence = if let Some(UnwindCode::StackAlloc {
+                                offset: alloc_offset,
+                                size,
+                            }) = unwind_codes.last()
+                            {
+                                *size == word_size && offset == *alloc_offset && *stack_offset == 0
+                            } else {
+                                false
+                            };
+                            if push_reg_sequence {
+                                *unwind_codes.last_mut().unwrap() =
+                                    UnwindCode::PushRegister { offset, reg };
+                            } else {
+                                // TODO add `UnwindCode::SaveRegister` to handle multiple register
+                                // pushes with single `UnwindCode::StackAlloc`.
+                                return Err(CodegenError::Unsupported(
+                                    "Unsupported UnwindCode::PushRegister sequence".into(),
+                                ));
+                            }
+                        }
+                        MappedRegister::Xmm(reg) => {
+                            unwind_codes.push(UnwindCode::SaveXmm {
+                                offset,
+                                reg,
+                                stack_offset: *stack_offset,
+                            });
+                        }
+                    }
+                }
+                InputUnwindCode::StackAlloc { size } => {
+                    unwind_codes.push(UnwindCode::StackAlloc {
+                        offset: ensure_unwind_offset(*offset)?,
+                        size: *size,
+                    });
+                }
+                _ => {}
+            }
+        }
+
+        Ok(Self {
+            flags: 0, // this assumes cranelift functions have no SEH handlers
+            prologue_size: ensure_unwind_offset(unwind.prologue_size)?,
+            frame_register: None,
+            frame_register_offset: 0,
+            unwind_codes,
+        })
+    }
+}
+
+fn ensure_unwind_offset(offset: u32) -> CodegenResult<u8> {
+    if offset > 255 {
+        warn!("function prologues cannot exceed 255 bytes in size for Windows x64");
+        return Err(CodegenError::CodeTooLarge);
+    }
+    Ok(offset as u8)
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/unwind.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/unwind.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,15 +2,87 @@
 #[cfg(feature = "enable-serde")]
 use serde::{Deserialize, Serialize};
 
+#[cfg(feature = "unwind")]
 pub mod systemv;
+
+#[cfg(feature = "unwind")]
 pub mod winx64;
 
 /// Represents unwind information for a single function.
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+#[non_exhaustive]
 pub enum UnwindInfo {
     /// Windows x64 ABI unwind information.
+    #[cfg(feature = "unwind")]
     WindowsX64(winx64::UnwindInfo),
     /// System V ABI unwind information.
+    #[cfg(feature = "unwind")]
     SystemV(systemv::UnwindInfo),
 }
+
+/// Intermediate representation for the unwind information
+/// generated by a backend.
+pub mod input {
+    use crate::binemit::CodeOffset;
+    use alloc::vec::Vec;
+    #[cfg(feature = "enable-serde")]
+    use serde::{Deserialize, Serialize};
+
+    /// Elementary operation in the unwind operations.
+    #[derive(Clone, Debug, PartialEq, Eq)]
+    #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+    pub enum UnwindCode<Reg> {
+        /// Defines that a register is saved at the specified offset.
+        SaveRegister {
+            /// The saved register.
+            reg: Reg,
+            /// The specified offset relative to the stack pointer.
+            stack_offset: u32,
+        },
+        /// Defines that a register is as defined before call.
+        RestoreRegister {
+            /// The restored register.
+            reg: Reg,
+        },
+        /// The stack pointer was adjusted to allocate the stack.
+        StackAlloc {
+            /// Size to allocate.
+            size: u32,
+        },
+        /// The stack pointer was adjusted to free the stack.
+        StackDealloc {
+            /// Size to deallocate.
+            size: u32,
+        },
+        /// The alternative register was assigned as frame pointer base.
+        SetFramePointer {
+            /// The specified register.
+            reg: Reg,
+        },
+        /// Restores a frame pointer base to default register.
+        RestoreFramePointer,
+        /// Saves the state.
+        RememberState,
+        /// Restores the state.
+        RestoreState,
+    }
+
+    /// Unwind information as generated by a backend.
+    #[derive(Clone, Debug, PartialEq, Eq)]
+    #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+    pub struct UnwindInfo<Reg> {
+        /// Size of the prologue.
+        pub prologue_size: CodeOffset,
+        /// Unwind codes for prologue.
+        pub prologue_unwind_codes: Vec<(CodeOffset, UnwindCode<Reg>)>,
+        /// Unwind codes for epilogues.
+        pub epilogues_unwind_codes: Vec<Vec<(CodeOffset, UnwindCode<Reg>)>>,
+        /// Entire function size.
+        pub function_size: CodeOffset,
+        /// Platform word size in bytes.
+        pub word_size: u8,
+        /// Initial stack pointer offset.
+        pub initial_sp_offset: u8,
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/abi.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/abi.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/abi.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/abi.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 //! Implementation of the standard x64 ABI.
 
 use crate::ir::types::*;
-use crate::ir::{self, types, SourceLoc, TrapCode, Type};
+use crate::ir::{self, types, MemFlags, TrapCode, Type};
 use crate::isa;
 use crate::isa::{x64::inst::*, CallConv};
 use crate::machinst::abi_impl::*;
@@ -90,6 +90,11 @@
         64
     }
 
+    /// Return required stack alignment in bytes.
+    fn stack_align(_call_conv: isa::CallConv) -> u32 {
+        16
+    }
+
     fn compute_arg_locs(
         call_conv: isa::CallConv,
         params: &[ir::AbiParam],
@@ -247,11 +252,11 @@
             _ if ty.bytes() == 16 => ExtKind::None,
             _ => panic!("load_stack({})", ty),
         };
-        Inst::load(ty, mem, into_reg, ext_kind, /* infallible */ None)
+        Inst::load(ty, mem, into_reg, ext_kind)
     }
 
     fn gen_store_stack(mem: StackAMode, from_reg: Reg, ty: Type) -> Self::I {
-        Inst::store(ty, from_reg, mem, /* infallible */ None)
+        Inst::store(ty, from_reg, mem)
     }
 
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Self::I {
@@ -269,18 +274,18 @@
         let ext_mode = ExtMode::new(from_bits as u16, to_bits as u16)
             .expect(&format!("invalid extension: {} -> {}", from_bits, to_bits));
         if is_signed {
-            Inst::movsx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg, None)
+            Inst::movsx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg)
         } else {
-            Inst::movzx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg, None)
+            Inst::movzx_rm_r(ext_mode, RegMem::reg(from_reg), to_reg)
         }
     }
 
     fn gen_ret() -> Self::I {
-        Inst::Ret
+        Inst::ret()
     }
 
     fn gen_epilogue_placeholder() -> Self::I {
-        Inst::EpiloguePlaceholder
+        Inst::epilogue_placeholder()
     }
 
     fn gen_add_imm(into_reg: Writable<Reg>, from_reg: Reg, imm: u32) -> SmallVec<[Self::I; 4]> {
@@ -303,7 +308,6 @@
             Inst::TrapIf {
                 // NBE == "> unsigned"; args above are reversed; this tests limit_reg > rsp.
                 cc: CC::NBE,
-                srcloc: SourceLoc::default(),
                 trap_code: TrapCode::StackOverflow,
             },
         ]
@@ -330,13 +334,13 @@
         assert_eq!(ty, I64);
         let simm32 = offset as u32;
         let mem = Amode::imm_reg(simm32, base);
-        Inst::load(ty, mem, into_reg, ExtKind::None, None)
+        Inst::load(ty, mem, into_reg, ExtKind::None)
     }
 
     fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Self::I {
         let simm32 = offset as u32;
         let mem = Amode::imm_reg(simm32, base);
-        Inst::store(ty, from_reg, mem, None)
+        Inst::store(ty, from_reg, mem)
     }
 
     fn gen_sp_reg_adjust(amount: i32) -> SmallVec<[Self::I; 2]> {
@@ -390,6 +394,7 @@
         _: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
         fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> (u64, SmallVec<[Self::I; 16]>) {
         let mut insts = SmallVec::new();
         // Find all clobbered registers that are callee-save. These are only I64
@@ -420,7 +425,6 @@
                         /* bytes = */ 8,
                         r_reg.to_reg(),
                         Amode::imm_reg(cur_offset, regs::rsp()),
-                        None,
                     ));
                     cur_offset += 8;
                 }
@@ -437,6 +441,8 @@
         call_conv: isa::CallConv,
         flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
+        _fixed_frame_storage_size: u32,
+        _outgoing_args_size: u32,
     ) -> SmallVec<[Self::I; 16]> {
         let mut insts = SmallVec::new();
 
@@ -453,7 +459,6 @@
                     insts.push(Inst::mov64_m_r(
                         Amode::imm_reg(cur_offset, regs::rsp()),
                         Writable::from_reg(rreg.to_reg()),
-                        None,
                     ));
                     cur_offset += 8;
                 }
@@ -478,7 +483,6 @@
             insts.push(Inst::mov64_m_r(
                 Amode::imm_reg(off as u32, regs::rbp()),
                 Writable::from_reg(regs::r14()),
-                None,
             ));
         }
 
@@ -490,16 +494,17 @@
         dest: &CallDest,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: ir::Opcode,
         tmp: Writable<Reg>,
+        _callee_conv: isa::CallConv,
+        _caller_conv: isa::CallConv,
     ) -> SmallVec<[(InstIsSafepoint, Self::I); 2]> {
         let mut insts = SmallVec::new();
         match dest {
             &CallDest::ExtName(ref name, RelocDistance::Near) => {
                 insts.push((
                     InstIsSafepoint::Yes,
-                    Inst::call_known(name.clone(), uses, defs, loc, opcode),
+                    Inst::call_known(name.clone(), uses, defs, opcode),
                 ));
             }
             &CallDest::ExtName(ref name, RelocDistance::Far) => {
@@ -509,18 +514,17 @@
                         dst: tmp,
                         name: Box::new(name.clone()),
                         offset: 0,
-                        srcloc: loc,
                     },
                 ));
                 insts.push((
                     InstIsSafepoint::Yes,
-                    Inst::call_unknown(RegMem::reg(tmp.to_reg()), uses, defs, loc, opcode),
+                    Inst::call_unknown(RegMem::reg(tmp.to_reg()), uses, defs, opcode),
                 ));
             }
             &CallDest::Reg(reg) => {
                 insts.push((
                     InstIsSafepoint::Yes,
-                    Inst::call_unknown(RegMem::reg(reg), uses, defs, loc, opcode),
+                    Inst::call_unknown(RegMem::reg(reg), uses, defs, opcode),
                 ));
             }
         }
@@ -545,7 +549,7 @@
         s.nominal_sp_to_fp
     }
 
-    fn get_caller_saves(call_conv: isa::CallConv) -> Vec<Writable<Reg>> {
+    fn get_regs_clobbered_by_call(call_conv_of_callee: isa::CallConv) -> Vec<Writable<Reg>> {
         let mut caller_saved = vec![
             // Systemv calling convention:
             // - GPR: all except RBX, RBP, R12 to R15 (which are callee-saved).
@@ -577,7 +581,7 @@
             Writable::from_reg(regs::xmm15()),
         ];
 
-        if call_conv.extends_baldrdash() {
+        if call_conv_of_callee.extends_baldrdash() {
             caller_saved.push(Writable::from_reg(regs::r12()));
             caller_saved.push(Writable::from_reg(regs::r13()));
             // Not r14; implicitly preserved in the entry.
@@ -601,6 +605,7 @@
                 SyntheticAmode::Real(Amode::ImmReg {
                     simm32,
                     base: regs::rbp(),
+                    flags: MemFlags::trusted(),
                 })
             }
             StackAMode::NominalSPOffset(off, _ty) => {
@@ -617,6 +622,7 @@
                 SyntheticAmode::Real(Amode::ImmReg {
                     simm32,
                     base: regs::rsp(),
+                    flags: MemFlags::trusted(),
                 })
             }
         }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/args.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/args.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/args.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/args.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,18 +3,25 @@
 use super::regs::{self, show_ireg_sized};
 use super::EmitState;
 use crate::ir::condcodes::{FloatCC, IntCC};
+use crate::ir::MemFlags;
 use crate::machinst::*;
-use core::fmt::Debug;
-use regalloc::{RealRegUniverse, Reg, RegClass, RegUsageCollector, RegUsageMapper, Writable};
+use regalloc::{
+    PrettyPrint, PrettyPrintSized, RealRegUniverse, Reg, RegClass, RegUsageCollector,
+    RegUsageMapper, Writable,
+};
 use std::fmt;
-use std::string::{String, ToString};
+use std::string::String;
 
 /// A possible addressing mode (amode) that can be used in instructions.
 /// These denote a 64-bit value only.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum Amode {
     /// Immediate sign-extended and a Register.
-    ImmReg { simm32: u32, base: Reg },
+    ImmReg {
+        simm32: u32,
+        base: Reg,
+        flags: MemFlags,
+    },
 
     /// sign-extend-32-to-64(Immediate) + Register1 + (Register2 << Shift)
     ImmRegRegShift {
@@ -22,17 +29,22 @@
         base: Reg,
         index: Reg,
         shift: u8, /* 0 .. 3 only */
+        flags: MemFlags,
     },
 
     /// sign-extend-32-to-64(Immediate) + RIP (instruction pointer).
     /// To wit: not supported in 32-bits mode.
-    RipRelative { target: BranchTarget },
+    RipRelative { target: MachLabel },
 }
 
 impl Amode {
     pub(crate) fn imm_reg(simm32: u32, base: Reg) -> Self {
         debug_assert!(base.get_class() == RegClass::I64);
-        Self::ImmReg { simm32, base }
+        Self::ImmReg {
+            simm32,
+            base,
+            flags: MemFlags::trusted(),
+        }
     }
 
     pub(crate) fn imm_reg_reg_shift(simm32: u32, base: Reg, index: Reg, shift: u8) -> Self {
@@ -44,13 +56,38 @@
             base,
             index,
             shift,
+            flags: MemFlags::trusted(),
         }
     }
 
-    pub(crate) fn rip_relative(target: BranchTarget) -> Self {
+    pub(crate) fn rip_relative(target: MachLabel) -> Self {
         Self::RipRelative { target }
     }
 
+    pub(crate) fn with_flags(&self, flags: MemFlags) -> Self {
+        match self {
+            &Self::ImmReg { simm32, base, .. } => Self::ImmReg {
+                simm32,
+                base,
+                flags,
+            },
+            &Self::ImmRegRegShift {
+                simm32,
+                base,
+                index,
+                shift,
+                ..
+            } => Self::ImmRegRegShift {
+                simm32,
+                base,
+                index,
+                shift,
+                flags,
+            },
+            _ => panic!("Amode {:?} cannot take memflags", self),
+        }
+    }
+
     /// Add the regs mentioned by `self` to `collector`.
     pub(crate) fn get_regs_as_uses(&self, collector: &mut RegUsageCollector) {
         match self {
@@ -66,12 +103,24 @@
             }
         }
     }
+
+    pub(crate) fn get_flags(&self) -> MemFlags {
+        match self {
+            Amode::ImmReg { flags, .. } => *flags,
+            Amode::ImmRegRegShift { flags, .. } => *flags,
+            Amode::RipRelative { .. } => MemFlags::trusted(),
+        }
+    }
+
+    pub(crate) fn can_trap(&self) -> bool {
+        !self.get_flags().notrap()
+    }
 }
 
-impl ShowWithRRU for Amode {
+impl PrettyPrint for Amode {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
-            Amode::ImmReg { simm32, base } => {
+            Amode::ImmReg { simm32, base, .. } => {
                 format!("{}({})", *simm32 as i32, base.show_rru(mb_rru))
             }
             Amode::ImmRegRegShift {
@@ -79,6 +128,7 @@
                 base,
                 index,
                 shift,
+                ..
             } => format!(
                 "{}({},{},{})",
                 *simm32 as i32,
@@ -86,13 +136,7 @@
                 index.show_rru(mb_rru),
                 1 << shift
             ),
-            Amode::RipRelative { ref target } => format!(
-                "{}(%rip)",
-                match target {
-                    BranchTarget::Label(label) => format!("label{}", label.get()),
-                    BranchTarget::ResolvedOffset(offset) => offset.to_string(),
-                }
-            ),
+            Amode::RipRelative { ref target } => format!("label{}(%rip)", target.get()),
         }
     }
 }
@@ -156,7 +200,7 @@
     }
 }
 
-impl ShowWithRRU for SyntheticAmode {
+impl PrettyPrint for SyntheticAmode {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         match self {
             SyntheticAmode::Real(addr) => addr.show_rru(mb_rru),
@@ -214,11 +258,13 @@
     }
 }
 
-impl ShowWithRRU for RegMemImm {
+impl PrettyPrint for RegMemImm {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         self.show_rru_sized(mb_rru, 8)
     }
+}
 
+impl PrettyPrintSized for RegMemImm {
     fn show_rru_sized(&self, mb_rru: Option<&RealRegUniverse>, size: u8) -> String {
         match self {
             Self::Reg { reg } => show_ireg_sized(*reg, mb_rru, size),
@@ -271,11 +317,13 @@
     }
 }
 
-impl ShowWithRRU for RegMem {
+impl PrettyPrint for RegMem {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         self.show_rru_sized(mb_rru, 8)
     }
+}
 
+impl PrettyPrintSized for RegMem {
     fn show_rru_sized(&self, mb_rru: Option<&RealRegUniverse>, size: u8) -> String {
         match self {
             RegMem::Reg { reg } => show_ireg_sized(*reg, mb_rru, size),
@@ -364,12 +412,14 @@
     Cmppd,
     Cmpss,
     Cmpsd,
+    Cvtdq2ps,
     Cvtsd2ss,
     Cvtsd2si,
     Cvtsi2ss,
     Cvtsi2sd,
     Cvtss2si,
     Cvtss2sd,
+    Cvttps2dq,
     Cvttss2si,
     Cvttsd2si,
     Divps,
@@ -391,6 +441,8 @@
     Movdqa,
     Movdqu,
     Movlhps,
+    Movmskps,
+    Movmskpd,
     Movq,
     Movss,
     Movsd,
@@ -405,6 +457,7 @@
     Pabsb,
     Pabsw,
     Pabsd,
+    Packsswb,
     Paddb,
     Paddd,
     Paddq,
@@ -413,6 +466,8 @@
     Paddsw,
     Paddusb,
     Paddusw,
+    Pand,
+    Pandn,
     Pavgb,
     Pavgw,
     Pcmpeqb,
@@ -441,6 +496,7 @@
     Pminub,
     Pminuw,
     Pminud,
+    Pmovmskb,
     Pmulld,
     Pmullw,
     Pmuludq,
@@ -459,6 +515,10 @@
     Psubd,
     Psubq,
     Psubw,
+    Psubsb,
+    Psubsw,
+    Psubusb,
+    Psubusw,
     Ptest,
     Pxor,
     Rcpss,
@@ -502,6 +562,7 @@
             | SseOpcode::Minss
             | SseOpcode::Movaps
             | SseOpcode::Movlhps
+            | SseOpcode::Movmskps
             | SseOpcode::Movss
             | SseOpcode::Movups
             | SseOpcode::Mulps
@@ -523,10 +584,12 @@
             | SseOpcode::Cmppd
             | SseOpcode::Cmpsd
             | SseOpcode::Comisd
+            | SseOpcode::Cvtdq2ps
             | SseOpcode::Cvtsd2ss
             | SseOpcode::Cvtsd2si
             | SseOpcode::Cvtsi2sd
             | SseOpcode::Cvtss2sd
+            | SseOpcode::Cvttps2dq
             | SseOpcode::Cvttsd2si
             | SseOpcode::Divpd
             | SseOpcode::Divsd
@@ -536,6 +599,7 @@
             | SseOpcode::Minsd
             | SseOpcode::Movapd
             | SseOpcode::Movd
+            | SseOpcode::Movmskpd
             | SseOpcode::Movq
             | SseOpcode::Movsd
             | SseOpcode::Movupd
@@ -544,6 +608,7 @@
             | SseOpcode::Mulpd
             | SseOpcode::Mulsd
             | SseOpcode::Orpd
+            | SseOpcode::Packsswb
             | SseOpcode::Paddb
             | SseOpcode::Paddd
             | SseOpcode::Paddq
@@ -552,6 +617,8 @@
             | SseOpcode::Paddsw
             | SseOpcode::Paddusb
             | SseOpcode::Paddusw
+            | SseOpcode::Pand
+            | SseOpcode::Pandn
             | SseOpcode::Pavgb
             | SseOpcode::Pavgw
             | SseOpcode::Pcmpeqb
@@ -566,6 +633,7 @@
             | SseOpcode::Pmaxub
             | SseOpcode::Pminsw
             | SseOpcode::Pminub
+            | SseOpcode::Pmovmskb
             | SseOpcode::Pmullw
             | SseOpcode::Pmuludq
             | SseOpcode::Por
@@ -582,6 +650,10 @@
             | SseOpcode::Psubd
             | SseOpcode::Psubq
             | SseOpcode::Psubw
+            | SseOpcode::Psubsb
+            | SseOpcode::Psubsw
+            | SseOpcode::Psubusb
+            | SseOpcode::Psubusw
             | SseOpcode::Pxor
             | SseOpcode::Sqrtpd
             | SseOpcode::Sqrtsd
@@ -641,12 +713,14 @@
             SseOpcode::Cmpsd => "cmpsd",
             SseOpcode::Comiss => "comiss",
             SseOpcode::Comisd => "comisd",
+            SseOpcode::Cvtdq2ps => "cvtdq2ps",
             SseOpcode::Cvtsd2ss => "cvtsd2ss",
             SseOpcode::Cvtsd2si => "cvtsd2si",
             SseOpcode::Cvtsi2ss => "cvtsi2ss",
             SseOpcode::Cvtsi2sd => "cvtsi2sd",
             SseOpcode::Cvtss2si => "cvtss2si",
             SseOpcode::Cvtss2sd => "cvtss2sd",
+            SseOpcode::Cvttps2dq => "cvttps2dq",
             SseOpcode::Cvttss2si => "cvttss2si",
             SseOpcode::Cvttsd2si => "cvttsd2si",
             SseOpcode::Divps => "divps",
@@ -668,6 +742,8 @@
             SseOpcode::Movdqa => "movdqa",
             SseOpcode::Movdqu => "movdqu",
             SseOpcode::Movlhps => "movlhps",
+            SseOpcode::Movmskps => "movmskps",
+            SseOpcode::Movmskpd => "movmskpd",
             SseOpcode::Movq => "movq",
             SseOpcode::Movss => "movss",
             SseOpcode::Movsd => "movsd",
@@ -682,6 +758,7 @@
             SseOpcode::Pabsb => "pabsb",
             SseOpcode::Pabsw => "pabsw",
             SseOpcode::Pabsd => "pabsd",
+            SseOpcode::Packsswb => "packsswb",
             SseOpcode::Paddb => "paddb",
             SseOpcode::Paddd => "paddd",
             SseOpcode::Paddq => "paddq",
@@ -690,6 +767,8 @@
             SseOpcode::Paddsw => "paddsw",
             SseOpcode::Paddusb => "paddusb",
             SseOpcode::Paddusw => "paddusw",
+            SseOpcode::Pand => "pand",
+            SseOpcode::Pandn => "pandn",
             SseOpcode::Pavgb => "pavgb",
             SseOpcode::Pavgw => "pavgw",
             SseOpcode::Pcmpeqb => "pcmpeqb",
@@ -718,6 +797,7 @@
             SseOpcode::Pminub => "pminub",
             SseOpcode::Pminuw => "pminuw",
             SseOpcode::Pminud => "pminud",
+            SseOpcode::Pmovmskb => "pmovmskb",
             SseOpcode::Pmulld => "pmulld",
             SseOpcode::Pmullw => "pmullw",
             SseOpcode::Pmuludq => "pmuludq",
@@ -736,6 +816,10 @@
             SseOpcode::Psubd => "psubd",
             SseOpcode::Psubq => "psubq",
             SseOpcode::Psubw => "psubw",
+            SseOpcode::Psubsb => "psubsb",
+            SseOpcode::Psubsw => "psubsw",
+            SseOpcode::Psubusb => "psubusb",
+            SseOpcode::Psubusw => "psubusw",
             SseOpcode::Ptest => "ptest",
             SseOpcode::Pxor => "pxor",
             SseOpcode::Rcpss => "rcpss",
@@ -1087,55 +1171,6 @@
     }
 }
 
-/// A branch target. Either unresolved (basic-block index) or resolved (offset
-/// from end of current instruction).
-#[derive(Clone, Copy, Debug)]
-pub enum BranchTarget {
-    /// An unresolved reference to a MachLabel.
-    Label(MachLabel),
-
-    /// A resolved reference to another instruction, in bytes.
-    ResolvedOffset(isize),
-}
-
-impl ShowWithRRU for BranchTarget {
-    fn show_rru(&self, _mb_rru: Option<&RealRegUniverse>) -> String {
-        match self {
-            BranchTarget::Label(l) => format!("{:?}", l),
-            BranchTarget::ResolvedOffset(offs) => format!("(offset {})", offs),
-        }
-    }
-}
-
-impl BranchTarget {
-    /// Get the label.
-    pub fn as_label(&self) -> Option<MachLabel> {
-        match self {
-            &BranchTarget::Label(l) => Some(l),
-            _ => None,
-        }
-    }
-
-    /// Get the offset as a signed 32 bit byte offset.  This returns the
-    /// offset in bytes between the first byte of the source and the first
-    /// byte of the target.  It does not take into account the Intel-specific
-    /// rule that a branch offset is encoded as relative to the start of the
-    /// following instruction.  That is a problem for the emitter to deal
-    /// with. If a label, returns zero.
-    pub fn as_offset32_or_zero(&self) -> i32 {
-        match self {
-            &BranchTarget::ResolvedOffset(off) => {
-                // Leave a bit of slack so that the emitter is guaranteed to
-                // be able to add the length of the jump instruction encoding
-                // to this value and still have a value in signed-32 range.
-                assert!(off >= -0x7FFF_FF00 && off <= 0x7FFF_FF00);
-                off as i32
-            }
-            _ => 0,
-        }
-    }
-}
-
 /// An operand's size in bits.
 #[derive(Clone, Copy, PartialEq)]
 pub enum OperandSize {
@@ -1169,6 +1204,7 @@
 
 /// An x64 memory fence kind.
 #[derive(Clone)]
+#[allow(dead_code)]
 pub enum FenceKind {
     /// `mfence` instruction ("Memory Fence")
     MFence,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,4 +1,4 @@
-use crate::binemit::Reloc;
+use crate::binemit::{Addend, Reloc};
 use crate::ir::immediates::{Ieee32, Ieee64};
 use crate::ir::TrapCode;
 use crate::isa::x64::inst::args::*;
@@ -7,7 +7,6 @@
 use core::convert::TryInto;
 use log::debug;
 use regalloc::{Reg, RegClass, Writable};
-use std::convert::TryFrom;
 
 fn low8_will_sign_extend_to_64(x: u32) -> bool {
     let xs = (x as i32) as i64;
@@ -182,6 +181,7 @@
 /// indicate a 64-bit operation.
 fn emit_std_enc_mem(
     sink: &mut MachBuffer<Inst>,
+    state: &EmitState,
     prefixes: LegacyPrefixes,
     opcodes: u32,
     mut num_opcodes: usize,
@@ -193,10 +193,15 @@
     // 64-bit integer registers, because they are part of an address
     // expression.  But `enc_g` can be derived from a register of any class.
 
+    let srcloc = state.cur_srcloc();
+    if srcloc != SourceLoc::default() && mem_e.can_trap() {
+        sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
+    }
+
     prefixes.emit(sink);
 
     match mem_e {
-        Amode::ImmReg { simm32, base } => {
+        Amode::ImmReg { simm32, base, .. } => {
             // First, the REX byte.
             let enc_e = int_reg_enc(*base);
             rex.emit_two_op(sink, enc_g, enc_e);
@@ -255,6 +260,7 @@
             base: reg_base,
             index: reg_index,
             shift,
+            ..
         } => {
             let enc_base = int_reg_enc(*reg_base);
             let enc_index = int_reg_enc(*reg_index);
@@ -296,18 +302,9 @@
             // RIP-relative is mod=00, rm=101.
             sink.put1(encode_modrm(0, enc_g & 7, 0b101));
 
-            match *target {
-                BranchTarget::Label(label) => {
-                    let offset = sink.cur_offset();
-                    sink.use_label_at_offset(offset, label, LabelUse::JmpRel32);
-                    sink.put4(0);
-                }
-                BranchTarget::ResolvedOffset(offset) => {
-                    let offset =
-                        u32::try_from(offset).expect("rip-relative can't hold >= U32_MAX values");
-                    sink.put4(offset);
-                }
-            }
+            let offset = sink.cur_offset();
+            sink.use_label_at_offset(offset, *target, LabelUse::JmpRel32);
+            sink.put4(0);
         }
     }
 }
@@ -352,6 +349,7 @@
 
 fn emit_std_reg_mem(
     sink: &mut MachBuffer<Inst>,
+    state: &EmitState,
     prefixes: LegacyPrefixes,
     opcodes: u32,
     num_opcodes: usize,
@@ -360,7 +358,16 @@
     rex: RexFlags,
 ) {
     let enc_g = reg_enc(reg_g);
-    emit_std_enc_mem(sink, prefixes, opcodes, num_opcodes, enc_g, mem_e, rex);
+    emit_std_enc_mem(
+        sink,
+        state,
+        prefixes,
+        opcodes,
+        num_opcodes,
+        enc_g,
+        mem_e,
+        rex,
+    );
 }
 
 fn emit_std_reg_reg(
@@ -390,7 +397,7 @@
 /// A small helper to generate a signed conversion instruction.
 fn emit_signed_cvt(
     sink: &mut MachBuffer<Inst>,
-    flags: &settings::Flags,
+    info: &EmitInfo,
     state: &mut EmitState,
     src: Reg,
     dst: Writable<Reg>,
@@ -404,7 +411,7 @@
         SseOpcode::Cvtsi2ss
     };
     let inst = Inst::gpr_to_xmm(op, RegMem::reg(src), OperandSize::Size64, dst);
-    inst.emit(sink, flags, state);
+    inst.emit(sink, info, state);
 }
 
 /// Emits a one way conditional jump if CC is set (true).
@@ -417,6 +424,18 @@
     sink.put4(0x0);
 }
 
+/// Emits a relocation, attaching the current source location as well.
+fn emit_reloc(
+    sink: &mut MachBuffer<Inst>,
+    state: &EmitState,
+    kind: Reloc,
+    name: &ExternalName,
+    addend: Addend,
+) {
+    let srcloc = state.cur_srcloc();
+    sink.add_reloc(srcloc, kind, name, addend);
+}
+
 /// The top-level emit function.
 ///
 /// Important!  Do not add improved (shortened) encoding cases to existing
@@ -472,9 +491,19 @@
 pub(crate) fn emit(
     inst: &Inst,
     sink: &mut MachBuffer<Inst>,
-    flags: &settings::Flags,
+    info: &EmitInfo,
     state: &mut EmitState,
 ) {
+    if let Some(iset_requirement) = inst.isa_requirement() {
+        match iset_requirement {
+            // Cranelift assumes SSE2 at least.
+            InstructionSet::SSE | InstructionSet::SSE2 => {}
+            InstructionSet::SSSE3 => assert!(info.isa_flags.has_ssse3()),
+            InstructionSet::SSE41 => assert!(info.isa_flags.has_sse41()),
+            InstructionSet::SSE42 => assert!(info.isa_flags.has_sse42()),
+        }
+    }
+
     match inst {
         Inst::AluRmiR {
             is_64,
@@ -505,13 +534,15 @@
                     }
 
                     RegMemImm::Mem { addr } => {
+                        let amode = addr.finalize(state);
                         emit_std_reg_mem(
                             sink,
+                            state,
                             LegacyPrefixes::None,
                             0x0FAF,
                             2,
                             reg_g.to_reg(),
-                            &addr.finalize(state),
+                            &amode,
                             rex,
                         );
                     }
@@ -562,13 +593,15 @@
 
                     RegMemImm::Mem { addr } => {
                         // Here we revert to the "normal" G-E ordering.
+                        let amode = addr.finalize(state);
                         emit_std_reg_mem(
                             sink,
+                            state,
                             LegacyPrefixes::None,
                             opcode_m,
                             1,
                             reg_g.to_reg(),
-                            &addr.finalize(state),
+                            &amode,
                             rex,
                         );
                     }
@@ -616,15 +649,19 @@
                     *src,
                     rex_flags,
                 ),
-                RegMem::Mem { addr: src } => emit_std_reg_mem(
-                    sink,
-                    prefix,
-                    opcode,
-                    num_opcodes,
-                    dst.to_reg(),
-                    &src.finalize(state),
-                    rex_flags,
-                ),
+                RegMem::Mem { addr: src } => {
+                    let amode = src.finalize(state);
+                    emit_std_reg_mem(
+                        sink,
+                        state,
+                        prefix,
+                        opcode,
+                        num_opcodes,
+                        dst.to_reg(),
+                        &amode,
+                        rex_flags,
+                    );
+                }
             }
         }
 
@@ -660,7 +697,6 @@
             size,
             signed,
             divisor,
-            loc,
         } => {
             let (opcode, prefix, rex_flags) = match size {
                 1 => (0xF6, LegacyPrefixes::None, RexFlags::clear_w()),
@@ -670,7 +706,8 @@
                 _ => unreachable!("{}", size),
             };
 
-            sink.add_trap(*loc, TrapCode::IntegerDivisionByZero);
+            let loc = state.cur_srcloc();
+            sink.add_trap(loc, TrapCode::IntegerDivisionByZero);
 
             let subopcode = if *signed { 7 } else { 6 };
             match divisor {
@@ -678,15 +715,10 @@
                     let src = int_reg_enc(*reg);
                     emit_std_enc_enc(sink, prefix, opcode, 1, subopcode, src, rex_flags)
                 }
-                RegMem::Mem { addr: src } => emit_std_enc_mem(
-                    sink,
-                    prefix,
-                    opcode,
-                    1,
-                    subopcode,
-                    &src.finalize(state),
-                    rex_flags,
-                ),
+                RegMem::Mem { addr: src } => {
+                    let amode = src.finalize(state);
+                    emit_std_enc_mem(sink, state, prefix, opcode, 1, subopcode, &amode, rex_flags);
+                }
             }
         }
 
@@ -704,15 +736,10 @@
                     let src = int_reg_enc(*reg);
                     emit_std_enc_enc(sink, prefix, 0xF7, 1, subopcode, src, rex_flags)
                 }
-                RegMem::Mem { addr: src } => emit_std_enc_mem(
-                    sink,
-                    prefix,
-                    0xF7,
-                    1,
-                    subopcode,
-                    &src.finalize(state),
-                    rex_flags,
-                ),
+                RegMem::Mem { addr: src } => {
+                    let amode = src.finalize(state);
+                    emit_std_enc_mem(sink, state, prefix, 0xF7, 1, subopcode, &amode, rex_flags);
+                }
             }
         }
 
@@ -737,7 +764,6 @@
             kind,
             size,
             divisor,
-            loc,
             tmp,
         } => {
             // Generates the following code sequence:
@@ -767,19 +793,19 @@
             // idiv %divisor
             //
             // $done:
-            debug_assert!(flags.avoid_div_traps());
+            debug_assert!(info.flags().avoid_div_traps());
 
             // Check if the divisor is zero, first.
             let inst = Inst::cmp_rmi_r(*size, RegMemImm::imm(0), divisor.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
-            let inst = Inst::trap_if(CC::Z, TrapCode::IntegerDivisionByZero, *loc);
-            inst.emit(sink, flags, state);
+            let inst = Inst::trap_if(CC::Z, TrapCode::IntegerDivisionByZero);
+            inst.emit(sink, info, state);
 
             let (do_op, done_label) = if kind.is_signed() {
                 // Now check if the divisor is -1.
                 let inst = Inst::cmp_rmi_r(*size, RegMemImm::imm(0xffffffff), divisor.to_reg());
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 let do_op = sink.get_label();
 
@@ -796,10 +822,10 @@
                         0,
                         Writable::from_reg(regs::rdx()),
                     );
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, info, state);
 
-                    let inst = Inst::jmp_known(BranchTarget::Label(done_label));
-                    inst.emit(sink, flags, state);
+                    let inst = Inst::jmp_known(done_label);
+                    inst.emit(sink, info, state);
 
                     (Some(do_op), Some(done_label))
                 } else {
@@ -808,18 +834,18 @@
                         let tmp = tmp.expect("temporary for i64 sdiv");
 
                         let inst = Inst::imm(OperandSize::Size64, 0x8000000000000000, tmp);
-                        inst.emit(sink, flags, state);
+                        inst.emit(sink, info, state);
 
                         let inst = Inst::cmp_rmi_r(8, RegMemImm::reg(tmp.to_reg()), regs::rax());
-                        inst.emit(sink, flags, state);
+                        inst.emit(sink, info, state);
                     } else {
                         let inst = Inst::cmp_rmi_r(*size, RegMemImm::imm(0x80000000), regs::rax());
-                        inst.emit(sink, flags, state);
+                        inst.emit(sink, info, state);
                     }
 
                     // If not equal, jump over the trap.
-                    let inst = Inst::trap_if(CC::Z, TrapCode::IntegerOverflow, *loc);
-                    inst.emit(sink, flags, state);
+                    let inst = Inst::trap_if(CC::Z, TrapCode::IntegerOverflow);
+                    inst.emit(sink, info, state);
 
                     (Some(do_op), None)
                 }
@@ -840,15 +866,15 @@
             if kind.is_signed() {
                 // sign-extend the sign-bit of rax into rdx, for signed opcodes.
                 let inst = Inst::sign_extend_data(*size);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
             } else {
                 // zero for unsigned opcodes.
                 let inst = Inst::imm(OperandSize::Size64, 0, Writable::from_reg(regs::rdx()));
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
             }
 
-            let inst = Inst::div(*size, kind.is_signed(), RegMem::reg(divisor.to_reg()), *loc);
-            inst.emit(sink, flags, state);
+            let inst = Inst::div(*size, kind.is_signed(), RegMem::reg(divisor.to_reg()));
+            inst.emit(sink, info, state);
 
             // Lowering takes care of moving the result back into the right register, see comment
             // there.
@@ -900,12 +926,7 @@
             emit_std_reg_reg(sink, LegacyPrefixes::None, 0x89, 1, *src, dst.to_reg(), rex);
         }
 
-        Inst::MovzxRmR {
-            ext_mode,
-            src,
-            dst,
-            srcloc,
-        } => {
+        Inst::MovzxRmR { ext_mode, src, dst } => {
             let (opcodes, num_opcodes, mut rex_flags) = match ext_mode {
                 ExtMode::BL => {
                     // MOVZBL is (REX.W==0) 0F B6 /r
@@ -963,13 +984,9 @@
                 RegMem::Mem { addr: src } => {
                     let src = &src.finalize(state);
 
-                    if let Some(srcloc) = *srcloc {
-                        // Register the offset at which the actual load instruction starts.
-                        sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-                    }
-
                     emit_std_reg_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         opcodes,
                         num_opcodes,
@@ -981,16 +998,12 @@
             }
         }
 
-        Inst::Mov64MR { src, dst, srcloc } => {
+        Inst::Mov64MR { src, dst } => {
             let src = &src.finalize(state);
 
-            if let Some(srcloc) = *srcloc {
-                // Register the offset at which the actual load instruction starts.
-                sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-            }
-
             emit_std_reg_mem(
                 sink,
+                state,
                 LegacyPrefixes::None,
                 0x8B,
                 1,
@@ -1000,22 +1013,22 @@
             )
         }
 
-        Inst::LoadEffectiveAddress { addr, dst } => emit_std_reg_mem(
-            sink,
-            LegacyPrefixes::None,
-            0x8D,
-            1,
-            dst.to_reg(),
-            &addr.finalize(state),
-            RexFlags::set_w(),
-        ),
+        Inst::LoadEffectiveAddress { addr, dst } => {
+            let amode = addr.finalize(state);
 
-        Inst::MovsxRmR {
-            ext_mode,
-            src,
-            dst,
-            srcloc,
-        } => {
+            emit_std_reg_mem(
+                sink,
+                state,
+                LegacyPrefixes::None,
+                0x8D,
+                1,
+                dst.to_reg(),
+                &amode,
+                RexFlags::set_w(),
+            );
+        }
+
+        Inst::MovsxRmR { ext_mode, src, dst } => {
             let (opcodes, num_opcodes, mut rex_flags) = match ext_mode {
                 ExtMode::BL => {
                     // MOVSBL is (REX.W==0) 0F BE /r
@@ -1065,13 +1078,9 @@
                 RegMem::Mem { addr: src } => {
                     let src = &src.finalize(state);
 
-                    if let Some(srcloc) = *srcloc {
-                        // Register the offset at which the actual load instruction starts.
-                        sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-                    }
-
                     emit_std_reg_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         opcodes,
                         num_opcodes,
@@ -1083,19 +1092,9 @@
             }
         }
 
-        Inst::MovRM {
-            size,
-            src,
-            dst,
-            srcloc,
-        } => {
+        Inst::MovRM { size, src, dst } => {
             let dst = &dst.finalize(state);
 
-            if let Some(srcloc) = *srcloc {
-                // Register the offset at which the actual load instruction starts.
-                sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-            }
-
             match size {
                 1 => {
                     // This is one of the few places where the presence of a
@@ -1109,13 +1108,14 @@
                     };
 
                     // MOV r8, r/m8 is (REX.W==0) 88 /r
-                    emit_std_reg_mem(sink, LegacyPrefixes::None, 0x88, 1, *src, dst, rex)
+                    emit_std_reg_mem(sink, state, LegacyPrefixes::None, 0x88, 1, *src, dst, rex)
                 }
 
                 2 => {
                     // MOV r16, r/m16 is 66 (REX.W==0) 89 /r
                     emit_std_reg_mem(
                         sink,
+                        state,
                         LegacyPrefixes::_66,
                         0x89,
                         1,
@@ -1129,6 +1129,7 @@
                     // MOV r32, r/m32 is (REX.W==0) 89 /r
                     emit_std_reg_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         0x89,
                         1,
@@ -1142,6 +1143,7 @@
                     // MOV r64, r/m64 is (REX.W==1) 89 /r
                     emit_std_reg_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         0x89,
                         1,
@@ -1248,7 +1250,16 @@
                     }
                     RegMemImm::Mem { addr } => {
                         let addr = &addr.finalize(state);
-                        emit_std_reg_mem(sink, prefix, opcode_bytes, 2, dst.to_reg(), addr, rex);
+                        emit_std_reg_mem(
+                            sink,
+                            state,
+                            prefix,
+                            opcode_bytes,
+                            2,
+                            dst.to_reg(),
+                            addr,
+                            rex,
+                        );
                     }
                     RegMemImm::Imm { .. } => unreachable!(),
                 }
@@ -1300,7 +1311,7 @@
                     let addr = &addr.finalize(state);
                     // Whereas here we revert to the "normal" G-E ordering.
                     let opcode = if *size == 1 { 0x3A } else { 0x3B };
-                    emit_std_reg_mem(sink, prefix, opcode, 1, *reg_g, addr, rex);
+                    emit_std_reg_mem(sink, state, prefix, opcode, 1, *reg_g, addr, rex);
                 }
 
                 RegMemImm::Imm { simm32 } => {
@@ -1358,7 +1369,16 @@
                 }
                 RegMem::Mem { addr } => {
                     let addr = &addr.finalize(state);
-                    emit_std_reg_mem(sink, prefix, opcode, 2, reg_g.to_reg(), addr, rex_flags);
+                    emit_std_reg_mem(
+                        sink,
+                        state,
+                        prefix,
+                        opcode,
+                        2,
+                        reg_g.to_reg(),
+                        addr,
+                        rex_flags,
+                    );
                 }
             }
         }
@@ -1382,7 +1402,7 @@
                 SseOpcode::Movss
             };
             let inst = Inst::xmm_unary_rm_r(op, src.clone(), *dst);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             sink.bind_label(next);
         }
@@ -1402,6 +1422,7 @@
                     let addr = &addr.finalize(state);
                     emit_std_enc_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         0xFF,
                         1,
@@ -1432,25 +1453,22 @@
             sink.put1(0x58 + (enc_dst & 7));
         }
 
-        Inst::CallKnown {
-            dest, loc, opcode, ..
-        } => {
+        Inst::CallKnown { dest, opcode, .. } => {
             if let Some(s) = state.take_stack_map() {
                 sink.add_stack_map(StackMapExtent::UpcomingBytes(5), s);
             }
             sink.put1(0xE8);
             // The addend adjusts for the difference between the end of the instruction and the
             // beginning of the immediate field.
-            sink.add_reloc(*loc, Reloc::X86CallPCRel4, &dest, -4);
+            emit_reloc(sink, state, Reloc::X86CallPCRel4, &dest, -4);
             sink.put4(0);
             if opcode.is_call() {
-                sink.add_call_site(*loc, *opcode);
+                let loc = state.cur_srcloc();
+                sink.add_call_site(loc, *opcode);
             }
         }
 
-        Inst::CallUnknown {
-            dest, opcode, loc, ..
-        } => {
+        Inst::CallUnknown { dest, opcode, .. } => {
             let start_offset = sink.cur_offset();
             match dest {
                 RegMem::Reg { reg } => {
@@ -1470,6 +1488,7 @@
                     let addr = &addr.finalize(state);
                     emit_std_enc_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         0xFF,
                         1,
@@ -1483,7 +1502,8 @@
                 sink.add_stack_map(StackMapExtent::StartedAtOffset(start_offset), s);
             }
             if opcode.is_call() {
-                sink.add_call_site(*loc, *opcode);
+                let loc = state.cur_srcloc();
+                sink.add_call_site(loc, *opcode);
             }
         }
 
@@ -1493,30 +1513,26 @@
             let br_start = sink.cur_offset();
             let br_disp_off = br_start + 1;
             let br_end = br_start + 5;
-            if let Some(l) = dst.as_label() {
-                sink.use_label_at_offset(br_disp_off, l, LabelUse::JmpRel32);
-                sink.add_uncond_branch(br_start, br_end, l);
-            }
 
-            let disp = dst.as_offset32_or_zero();
-            let disp = disp as u32;
+            sink.use_label_at_offset(br_disp_off, *dst, LabelUse::JmpRel32);
+            sink.add_uncond_branch(br_start, br_end, *dst);
+
             sink.put1(0xE9);
-            sink.put4(disp);
+            // Placeholder for the label value.
+            sink.put4(0x0);
         }
 
         Inst::JmpIf { cc, taken } => {
             let cond_start = sink.cur_offset();
             let cond_disp_off = cond_start + 2;
-            if let Some(l) = taken.as_label() {
-                sink.use_label_at_offset(cond_disp_off, l, LabelUse::JmpRel32);
-                // Since this is not a terminator, don't enroll in the branch inversion mechanism.
-            }
 
-            let taken_disp = taken.as_offset32_or_zero();
-            let taken_disp = taken_disp as u32;
+            sink.use_label_at_offset(cond_disp_off, *taken, LabelUse::JmpRel32);
+            // Since this is not a terminator, don't enroll in the branch inversion mechanism.
+
             sink.put1(0x0F);
             sink.put1(0x80 + cc.get_enc());
-            sink.put4(taken_disp);
+            // Placeholder for the label value.
+            sink.put4(0x0);
         }
 
         Inst::JmpCond {
@@ -1528,32 +1544,27 @@
             let cond_start = sink.cur_offset();
             let cond_disp_off = cond_start + 2;
             let cond_end = cond_start + 6;
-            if let Some(l) = taken.as_label() {
-                sink.use_label_at_offset(cond_disp_off, l, LabelUse::JmpRel32);
-                let inverted: [u8; 6] =
-                    [0x0F, 0x80 + (cc.invert().get_enc()), 0x00, 0x00, 0x00, 0x00];
-                sink.add_cond_branch(cond_start, cond_end, l, &inverted[..]);
-            }
 
-            let taken_disp = taken.as_offset32_or_zero();
-            let taken_disp = taken_disp as u32;
+            sink.use_label_at_offset(cond_disp_off, *taken, LabelUse::JmpRel32);
+            let inverted: [u8; 6] = [0x0F, 0x80 + (cc.invert().get_enc()), 0x00, 0x00, 0x00, 0x00];
+            sink.add_cond_branch(cond_start, cond_end, *taken, &inverted[..]);
+
             sink.put1(0x0F);
             sink.put1(0x80 + cc.get_enc());
-            sink.put4(taken_disp);
+            // Placeholder for the label value.
+            sink.put4(0x0);
 
             // If not taken.
             let uncond_start = sink.cur_offset();
             let uncond_disp_off = uncond_start + 1;
             let uncond_end = uncond_start + 5;
-            if let Some(l) = not_taken.as_label() {
-                sink.use_label_at_offset(uncond_disp_off, l, LabelUse::JmpRel32);
-                sink.add_uncond_branch(uncond_start, uncond_end, l);
-            }
 
-            let nt_disp = not_taken.as_offset32_or_zero();
-            let nt_disp = nt_disp as u32;
+            sink.use_label_at_offset(uncond_disp_off, *not_taken, LabelUse::JmpRel32);
+            sink.add_uncond_branch(uncond_start, uncond_end, *not_taken);
+
             sink.put1(0xE9);
-            sink.put4(nt_disp);
+            // Placeholder for the label value.
+            sink.put4(0x0);
         }
 
         Inst::JmpUnknown { target } => {
@@ -1575,6 +1586,7 @@
                     let addr = &addr.finalize(state);
                     emit_std_enc_mem(
                         sink,
+                        state,
                         LegacyPrefixes::None,
                         0xFF,
                         1,
@@ -1615,23 +1627,16 @@
             // j *%tmp1
             // $start_of_jump_table:
             // -- jump table entries
-            let default_label = match default_target {
-                BranchTarget::Label(label) => label,
-                _ => unreachable!(),
-            };
-            one_way_jmp(sink, CC::NB, *default_label); // idx unsigned >= jmp table size
+            one_way_jmp(sink, CC::NB, *default_target); // idx unsigned >= jmp table size
 
             // Copy the index (and make sure to clear the high 32-bits lane of tmp2).
-            let inst = Inst::movzx_rm_r(ExtMode::LQ, RegMem::reg(*idx), *tmp2, None);
-            inst.emit(sink, flags, state);
+            let inst = Inst::movzx_rm_r(ExtMode::LQ, RegMem::reg(*idx), *tmp2);
+            inst.emit(sink, info, state);
 
             // Load base address of jump table.
             let start_of_jumptable = sink.get_label();
-            let inst = Inst::lea(
-                Amode::rip_relative(BranchTarget::Label(start_of_jumptable)),
-                *tmp1,
-            );
-            inst.emit(sink, flags, state);
+            let inst = Inst::lea(Amode::rip_relative(start_of_jumptable), *tmp1);
+            inst.emit(sink, info, state);
 
             // Load value out of the jump table. It's a relative offset to the target block, so it
             // might be negative; use a sign-extension.
@@ -1639,9 +1644,8 @@
                 ExtMode::LQ,
                 RegMem::mem(Amode::imm_reg_reg_shift(0, tmp1.to_reg(), tmp2.to_reg(), 2)),
                 *tmp2,
-                None,
             );
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             // Add base of jump table to jump-table-sourced block offset.
             let inst = Inst::alu_rmi_r(
@@ -1650,11 +1654,11 @@
                 RegMemImm::reg(tmp2.to_reg()),
                 *tmp1,
             );
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             // Branch to computed address.
             let inst = Inst::jmp_unknown(RegMem::reg(tmp1.to_reg()));
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             // Emit jump table (table of 32-bit offsets).
             sink.bind_label(start_of_jumptable);
@@ -1666,24 +1670,20 @@
                 // with the extra addend, it'll be relative to the jump table's start, after
                 // patching.
                 let off_into_table = word_off - jt_off;
-                sink.use_label_at_offset(word_off, target.as_label().unwrap(), LabelUse::PCRel32);
+                sink.use_label_at_offset(word_off, target, LabelUse::PCRel32);
                 sink.put4(off_into_table);
             }
         }
 
-        Inst::TrapIf {
-            cc,
-            trap_code,
-            srcloc,
-        } => {
+        Inst::TrapIf { cc, trap_code } => {
             let else_label = sink.get_label();
 
             // Jump over if the invert of CC is set (i.e. CC is not set).
             one_way_jmp(sink, cc.invert(), else_label);
 
             // Trap!
-            let inst = Inst::trap(*srcloc, *trap_code);
-            inst.emit(sink, flags, state);
+            let inst = Inst::trap(*trap_code);
+            inst.emit(sink, info, state);
 
             sink.bind_label(else_label);
         }
@@ -1692,7 +1692,6 @@
             op,
             src: src_e,
             dst: reg_g,
-            srcloc,
         } => {
             let rex = RexFlags::clear_w();
 
@@ -1731,11 +1730,16 @@
                 }
                 RegMem::Mem { addr } => {
                     let addr = &addr.finalize(state);
-                    if let Some(srcloc) = *srcloc {
-                        // Register the offset at which the actual load instruction starts.
-                        sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-                    }
-                    emit_std_reg_mem(sink, prefix, opcode, num_opcodes, reg_g.to_reg(), addr, rex);
+                    emit_std_reg_mem(
+                        sink,
+                        state,
+                        prefix,
+                        opcode,
+                        num_opcodes,
+                        reg_g.to_reg(),
+                        addr,
+                        rex,
+                    );
                 }
             };
         }
@@ -1751,10 +1755,12 @@
                 SseOpcode::Addpd => (LegacyPrefixes::_66, 0x0F58, 2),
                 SseOpcode::Addss => (LegacyPrefixes::_F3, 0x0F58, 2),
                 SseOpcode::Addsd => (LegacyPrefixes::_F2, 0x0F58, 2),
-                SseOpcode::Andpd => (LegacyPrefixes::_66, 0x0F54, 2),
                 SseOpcode::Andps => (LegacyPrefixes::None, 0x0F54, 2),
+                SseOpcode::Andpd => (LegacyPrefixes::_66, 0x0F54, 2),
                 SseOpcode::Andnps => (LegacyPrefixes::None, 0x0F55, 2),
                 SseOpcode::Andnpd => (LegacyPrefixes::_66, 0x0F55, 2),
+                SseOpcode::Cvttps2dq => (LegacyPrefixes::_F3, 0x0F5B, 2),
+                SseOpcode::Cvtdq2ps => (LegacyPrefixes::None, 0x0F5B, 2),
                 SseOpcode::Divps => (LegacyPrefixes::None, 0x0F5E, 2),
                 SseOpcode::Divpd => (LegacyPrefixes::_66, 0x0F5E, 2),
                 SseOpcode::Divss => (LegacyPrefixes::_F3, 0x0F5E, 2),
@@ -1775,6 +1781,7 @@
                 SseOpcode::Mulsd => (LegacyPrefixes::_F2, 0x0F59, 2),
                 SseOpcode::Orpd => (LegacyPrefixes::_66, 0x0F56, 2),
                 SseOpcode::Orps => (LegacyPrefixes::None, 0x0F56, 2),
+                SseOpcode::Packsswb => (LegacyPrefixes::_66, 0x0F63, 2),
                 SseOpcode::Paddb => (LegacyPrefixes::_66, 0x0FFC, 2),
                 SseOpcode::Paddd => (LegacyPrefixes::_66, 0x0FFE, 2),
                 SseOpcode::Paddq => (LegacyPrefixes::_66, 0x0FD4, 2),
@@ -1783,6 +1790,8 @@
                 SseOpcode::Paddsw => (LegacyPrefixes::_66, 0x0FED, 2),
                 SseOpcode::Paddusb => (LegacyPrefixes::_66, 0x0FDC, 2),
                 SseOpcode::Paddusw => (LegacyPrefixes::_66, 0x0FDD, 2),
+                SseOpcode::Pand => (LegacyPrefixes::_66, 0x0FDB, 2),
+                SseOpcode::Pandn => (LegacyPrefixes::_66, 0x0FDF, 2),
                 SseOpcode::Pavgb => (LegacyPrefixes::_66, 0x0FE0, 2),
                 SseOpcode::Pavgw => (LegacyPrefixes::_66, 0x0FE3, 2),
                 SseOpcode::Pcmpeqb => (LegacyPrefixes::_66, 0x0F74, 2),
@@ -1814,6 +1823,10 @@
                 SseOpcode::Psubd => (LegacyPrefixes::_66, 0x0FFA, 2),
                 SseOpcode::Psubq => (LegacyPrefixes::_66, 0x0FFB, 2),
                 SseOpcode::Psubw => (LegacyPrefixes::_66, 0x0FF9, 2),
+                SseOpcode::Psubsb => (LegacyPrefixes::_66, 0x0FE8, 2),
+                SseOpcode::Psubsw => (LegacyPrefixes::_66, 0x0FE9, 2),
+                SseOpcode::Psubusb => (LegacyPrefixes::_66, 0x0FD8, 2),
+                SseOpcode::Psubusw => (LegacyPrefixes::_66, 0x0FD9, 2),
                 SseOpcode::Pxor => (LegacyPrefixes::_66, 0x0FEF, 2),
                 SseOpcode::Subps => (LegacyPrefixes::None, 0x0F5C, 2),
                 SseOpcode::Subpd => (LegacyPrefixes::_66, 0x0F5C, 2),
@@ -1830,7 +1843,16 @@
                 }
                 RegMem::Mem { addr } => {
                     let addr = &addr.finalize(state);
-                    emit_std_reg_mem(sink, prefix, opcode, length, reg_g.to_reg(), addr, rex);
+                    emit_std_reg_mem(
+                        sink,
+                        state,
+                        prefix,
+                        opcode,
+                        length,
+                        reg_g.to_reg(),
+                        addr,
+                        rex,
+                    );
                 }
             }
         }
@@ -1890,7 +1912,7 @@
             };
 
             let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(*lhs), rhs_dst.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::NZ, do_min_max);
             one_way_jmp(sink, CC::P, propagate_nan);
@@ -1900,23 +1922,23 @@
             // case, and are no-ops otherwise.
             let op = if *is_min { or_op } else { and_op };
             let inst = Inst::xmm_rm_r(op, RegMem::reg(*lhs), *rhs_dst);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
-            let inst = Inst::jmp_known(BranchTarget::Label(done));
-            inst.emit(sink, flags, state);
+            let inst = Inst::jmp_known(done);
+            inst.emit(sink, info, state);
 
             // x86's min/max are not symmetric; if either operand is a NaN, they return the
             // read-only operand: perform an addition between the two operands, which has the
             // desired NaN propagation effects.
             sink.bind_label(propagate_nan);
             let inst = Inst::xmm_rm_r(add_op, RegMem::reg(*lhs), *rhs_dst);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::P, done);
 
             sink.bind_label(do_min_max);
             let inst = Inst::xmm_rm_r(min_max_op, RegMem::reg(*lhs), *rhs_dst);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             sink.bind_label(done);
         }
@@ -1926,7 +1948,7 @@
             src,
             dst,
             imm,
-            is64: w,
+            is64,
         } => {
             let (prefix, opcode, len) = match op {
                 SseOpcode::Cmpps => (LegacyPrefixes::None, 0x0FC2, 2),
@@ -1943,7 +1965,7 @@
                 SseOpcode::Pshufd => (LegacyPrefixes::_66, 0x0F70, 2),
                 _ => unimplemented!("Opcode {:?} not implemented", op),
             };
-            let rex = if *w {
+            let rex = if *is64 {
                 RexFlags::set_w()
             } else {
                 RexFlags::clear_w()
@@ -1970,36 +1992,16 @@
                         !regs_swapped,
                         "No existing way to encode a mem argument in the ModRM r/m field."
                     );
-                    emit_std_reg_mem(sink, prefix, opcode, len, dst.to_reg(), addr, rex);
+                    emit_std_reg_mem(sink, state, prefix, opcode, len, dst.to_reg(), addr, rex);
                 }
             }
-            sink.put1(*imm)
+            sink.put1(*imm);
         }
 
-        Inst::XmmLoadConstSeq { val, dst, ty } => {
-            // This sequence is *one* instruction in the vcode, and is expanded only here at
-            // emission time, because we cannot allow the regalloc to insert spills/reloads in
-            // the middle; we depend on hardcoded PC-rel addressing below. TODO Eventually this
-            // "constant inline" code should be replaced by constant pool integration.
-
-            // Load the inline constant.
-            let constant_start_label = sink.get_label();
-            let load_offset = Amode::rip_relative(BranchTarget::Label(constant_start_label));
-            let load = Inst::load(*ty, load_offset, *dst, ExtKind::None, None);
-            load.emit(sink, flags, state);
-
-            // Jump over the constant.
-            let constant_end_label = sink.get_label();
-            let continue_at_offset = BranchTarget::Label(constant_end_label);
-            let jump = Inst::jmp_known(continue_at_offset);
-            jump.emit(sink, flags, state);
-
-            // Emit the constant.
-            sink.bind_label(constant_start_label);
-            for i in val.iter() {
-                sink.put1(*i);
-            }
-            sink.bind_label(constant_end_label);
+        Inst::XmmLoadConst { src, dst, ty } => {
+            let load_offset = Amode::rip_relative(sink.get_label_for_constant(*src));
+            let load = Inst::load(*ty, load_offset, *dst, ExtKind::None);
+            load.emit(sink, info, state);
         }
 
         Inst::XmmUninitializedValue { .. } => {
@@ -2007,12 +2009,7 @@
             // emitted.
         }
 
-        Inst::XmmMovRM {
-            op,
-            src,
-            dst,
-            srcloc,
-        } => {
+        Inst::XmmMovRM { op, src, dst } => {
             let (prefix, opcode) = match op {
                 SseOpcode::Movaps => (LegacyPrefixes::None, 0x0F29),
                 SseOpcode::Movapd => (LegacyPrefixes::_66, 0x0F29),
@@ -2025,11 +2022,16 @@
                 _ => unimplemented!("Opcode {:?} not implemented", op),
             };
             let dst = &dst.finalize(state);
-            if let Some(srcloc) = *srcloc {
-                // Register the offset at which the actual load instruction starts.
-                sink.add_trap(srcloc, TrapCode::HeapOutOfBounds);
-            }
-            emit_std_reg_mem(sink, prefix, opcode, 2, *src, dst, RexFlags::clear_w());
+            emit_std_reg_mem(
+                sink,
+                state,
+                prefix,
+                opcode,
+                2,
+                *src,
+                dst,
+                RexFlags::clear_w(),
+            );
         }
 
         Inst::XmmToGpr {
@@ -2039,11 +2041,14 @@
             dst_size,
         } => {
             let (prefix, opcode, dst_first) = match op {
+                SseOpcode::Cvttss2si => (LegacyPrefixes::_F3, 0x0F2C, true),
+                SseOpcode::Cvttsd2si => (LegacyPrefixes::_F2, 0x0F2C, true),
                 // Movd and movq use the same opcode; the presence of the REX prefix (set below)
                 // actually determines which is used.
                 SseOpcode::Movd | SseOpcode::Movq => (LegacyPrefixes::_66, 0x0F7E, false),
-                SseOpcode::Cvttss2si => (LegacyPrefixes::_F3, 0x0F2C, true),
-                SseOpcode::Cvttsd2si => (LegacyPrefixes::_F2, 0x0F2C, true),
+                SseOpcode::Movmskps => (LegacyPrefixes::None, 0x0F50, true),
+                SseOpcode::Movmskpd => (LegacyPrefixes::_66, 0x0F50, true),
+                SseOpcode::Pmovmskb => (LegacyPrefixes::_66, 0x0FD7, true),
                 _ => panic!("unexpected opcode {:?}", op),
             };
             let rex = match dst_size {
@@ -2084,7 +2089,7 @@
                 }
                 RegMem::Mem { addr } => {
                     let addr = &addr.finalize(state);
-                    emit_std_reg_mem(sink, prefix, opcode, 2, reg_g.to_reg(), addr, rex);
+                    emit_std_reg_mem(sink, state, prefix, opcode, 2, reg_g.to_reg(), addr, rex);
                 }
             }
         }
@@ -2104,7 +2109,7 @@
                 }
                 RegMem::Mem { addr } => {
                     let addr = &addr.finalize(state);
-                    emit_std_reg_mem(sink, prefix, opcode, len, *dst, addr, rex);
+                    emit_std_reg_mem(sink, state, prefix, opcode, len, *dst, addr, rex);
                 }
             }
         }
@@ -2151,30 +2156,30 @@
             // thing.
             // TODO use tst src, src here.
             let inst = Inst::cmp_rmi_r(8, RegMemImm::imm(0), src.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::L, handle_negative);
 
             // Handle a positive int64, which is the "easy" case: a signed conversion will do the
             // right thing.
-            emit_signed_cvt(sink, flags, state, src.to_reg(), *dst, *to_f64);
+            emit_signed_cvt(sink, info, state, src.to_reg(), *dst, *to_f64);
 
-            let inst = Inst::jmp_known(BranchTarget::Label(done));
-            inst.emit(sink, flags, state);
+            let inst = Inst::jmp_known(done);
+            inst.emit(sink, info, state);
 
             sink.bind_label(handle_negative);
 
             // Divide x by two to get it in range for the signed conversion, keep the LSB, and
             // scale it back up on the FP side.
             let inst = Inst::gen_move(*tmp_gpr1, src.to_reg(), types::I64);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             // tmp_gpr1 := src >> 1
             let inst = Inst::shift_r(8, ShiftKind::ShiftRightLogical, Some(1), *tmp_gpr1);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::gen_move(*tmp_gpr2, src.to_reg(), types::I64);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::alu_rmi_r(
                 true, /* 64bits */
@@ -2182,7 +2187,7 @@
                 RegMemImm::imm(1),
                 *tmp_gpr2,
             );
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::alu_rmi_r(
                 true, /* 64bits */
@@ -2190,9 +2195,9 @@
                 RegMemImm::reg(tmp_gpr1.to_reg()),
                 *tmp_gpr2,
             );
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
-            emit_signed_cvt(sink, flags, state, tmp_gpr2.to_reg(), *dst, *to_f64);
+            emit_signed_cvt(sink, info, state, tmp_gpr2.to_reg(), *dst, *to_f64);
 
             let add_op = if *to_f64 {
                 SseOpcode::Addsd
@@ -2200,7 +2205,7 @@
                 SseOpcode::Addss
             };
             let inst = Inst::xmm_rm_r(add_op, RegMem::reg(dst.to_reg()), *dst);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             sink.bind_label(done);
         }
@@ -2213,7 +2218,6 @@
             dst,
             tmp_gpr,
             tmp_xmm,
-            srcloc,
         } => {
             // Emits the following common sequence:
             //
@@ -2273,18 +2277,18 @@
 
             // The truncation.
             let inst = Inst::xmm_to_gpr(trunc_op, src, *dst, *dst_size);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             // Compare against 1, in case of overflow the dst operand was INT_MIN.
             let inst = Inst::cmp_rmi_r(dst_size.to_bytes(), RegMemImm::imm(1), dst.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::NO, done); // no overflow => done
 
             // Check for NaN.
 
             let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(src), src);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::NP, not_nan); // go to not_nan if not a NaN
 
@@ -2296,10 +2300,10 @@
                     RegMemImm::reg(dst.to_reg()),
                     *dst,
                 );
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
-                let inst = Inst::jmp_known(BranchTarget::Label(done));
-                inst.emit(sink, flags, state);
+                let inst = Inst::jmp_known(done);
+                inst.emit(sink, info, state);
 
                 sink.bind_label(not_nan);
 
@@ -2308,10 +2312,10 @@
                 // Zero out tmp_xmm.
                 let inst =
                     Inst::xmm_rm_r(SseOpcode::Xorpd, RegMem::reg(tmp_xmm.to_reg()), *tmp_xmm);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(src), tmp_xmm.to_reg());
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 // Jump if >= to done.
                 one_way_jmp(sink, CC::NB, done);
@@ -2319,16 +2323,16 @@
                 // Otherwise, put INT_MAX.
                 if *dst_size == OperandSize::Size64 {
                     let inst = Inst::imm(OperandSize::Size64, 0x7fffffffffffffff, *dst);
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, info, state);
                 } else {
                     let inst = Inst::imm(OperandSize::Size32, 0x7fffffff, *dst);
-                    inst.emit(sink, flags, state);
+                    inst.emit(sink, info, state);
                 }
             } else {
                 let check_positive = sink.get_label();
 
-                let inst = Inst::trap(*srcloc, TrapCode::BadConversionToInteger);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::BadConversionToInteger);
+                inst.emit(sink, info, state);
 
                 // Check if INT_MIN was the correct result: determine the smallest floating point
                 // number that would convert to INT_MIN, put it in a temporary register, and compare
@@ -2344,7 +2348,7 @@
                     OperandSize::Size32 => {
                         let cst = Ieee32::pow2(output_bits - 1).neg().bits();
                         let inst = Inst::imm(OperandSize::Size32, cst as u64, *tmp_gpr);
-                        inst.emit(sink, flags, state);
+                        inst.emit(sink, info, state);
                     }
                     OperandSize::Size64 => {
                         // An f64 can represent `i32::min_value() - 1` exactly with precision to spare,
@@ -2356,22 +2360,22 @@
                             Ieee64::pow2(output_bits - 1).neg()
                         };
                         let inst = Inst::imm(OperandSize::Size64, cst.bits(), *tmp_gpr);
-                        inst.emit(sink, flags, state);
+                        inst.emit(sink, info, state);
                     }
                 }
 
                 let inst =
                     Inst::gpr_to_xmm(cast_op, RegMem::reg(tmp_gpr.to_reg()), *src_size, *tmp_xmm);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(tmp_xmm.to_reg()), src);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 // jump over trap if src >= or > threshold
                 one_way_jmp(sink, no_overflow_cc, check_positive);
 
-                let inst = Inst::trap(*srcloc, TrapCode::IntegerOverflow);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::IntegerOverflow);
+                inst.emit(sink, info, state);
 
                 // If positive, it was a real overflow.
 
@@ -2380,15 +2384,15 @@
                 // Zero out the tmp_xmm register.
                 let inst =
                     Inst::xmm_rm_r(SseOpcode::Xorpd, RegMem::reg(tmp_xmm.to_reg()), *tmp_xmm);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(src), tmp_xmm.to_reg());
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 one_way_jmp(sink, CC::NB, done); // jump over trap if 0 >= src
 
-                let inst = Inst::trap(*srcloc, TrapCode::IntegerOverflow);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::IntegerOverflow);
+                inst.emit(sink, info, state);
             }
 
             sink.bind_label(done);
@@ -2402,7 +2406,6 @@
             dst,
             tmp_gpr,
             tmp_xmm,
-            srcloc,
         } => {
             // The only difference in behavior between saturating and non-saturating is how we
             // handle errors. Emits the following sequence:
@@ -2464,14 +2467,14 @@
             };
 
             let inst = Inst::imm(*src_size, cst, *tmp_gpr);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst =
                 Inst::gpr_to_xmm(cast_op, RegMem::reg(tmp_gpr.to_reg()), *src_size, *tmp_xmm);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::xmm_cmp_rm_r(cmp_op, RegMem::reg(tmp_xmm.to_reg()), src.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let handle_large = sink.get_label();
             one_way_jmp(sink, CC::NB, handle_large); // jump to handle_large if src >= large_threshold
@@ -2487,14 +2490,14 @@
                     RegMemImm::reg(dst.to_reg()),
                     *dst,
                 );
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
-                let inst = Inst::jmp_known(BranchTarget::Label(done));
-                inst.emit(sink, flags, state);
+                let inst = Inst::jmp_known(done);
+                inst.emit(sink, info, state);
             } else {
                 // Trap.
-                let inst = Inst::trap(*srcloc, TrapCode::BadConversionToInteger);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::BadConversionToInteger);
+                inst.emit(sink, info, state);
             }
 
             sink.bind_label(not_nan);
@@ -2503,10 +2506,10 @@
             // overflow.
 
             let inst = Inst::xmm_to_gpr(trunc_op, src.to_reg(), *dst, *dst_size);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::cmp_rmi_r(dst_size.to_bytes(), RegMemImm::imm(0), dst.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             one_way_jmp(sink, CC::NL, done); // if dst >= 0, jump to done
 
@@ -2519,14 +2522,14 @@
                     RegMemImm::reg(dst.to_reg()),
                     *dst,
                 );
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
-                let inst = Inst::jmp_known(BranchTarget::Label(done));
-                inst.emit(sink, flags, state);
+                let inst = Inst::jmp_known(done);
+                inst.emit(sink, info, state);
             } else {
                 // Trap.
-                let inst = Inst::trap(*srcloc, TrapCode::IntegerOverflow);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::IntegerOverflow);
+                inst.emit(sink, info, state);
             }
 
             // Now handle large inputs.
@@ -2534,13 +2537,13 @@
             sink.bind_label(handle_large);
 
             let inst = Inst::xmm_rm_r(sub_op, RegMem::reg(tmp_xmm.to_reg()), *src);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::xmm_to_gpr(trunc_op, src.to_reg(), *dst, *dst_size);
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let inst = Inst::cmp_rmi_r(dst_size.to_bytes(), RegMemImm::imm(0), dst.to_reg());
-            inst.emit(sink, flags, state);
+            inst.emit(sink, info, state);
 
             let next_is_large = sink.get_label();
             one_way_jmp(sink, CC::NL, next_is_large); // if dst >= 0, jump to next_is_large
@@ -2557,20 +2560,20 @@
                     },
                     *dst,
                 );
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
-                let inst = Inst::jmp_known(BranchTarget::Label(done));
-                inst.emit(sink, flags, state);
+                let inst = Inst::jmp_known(done);
+                inst.emit(sink, info, state);
             } else {
-                let inst = Inst::trap(*srcloc, TrapCode::IntegerOverflow);
-                inst.emit(sink, flags, state);
+                let inst = Inst::trap(TrapCode::IntegerOverflow);
+                inst.emit(sink, info, state);
             }
 
             sink.bind_label(next_is_large);
 
             if *dst_size == OperandSize::Size64 {
                 let inst = Inst::imm(OperandSize::Size64, 1 << 63, *tmp_gpr);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
 
                 let inst = Inst::alu_rmi_r(
                     true,
@@ -2578,44 +2581,31 @@
                     RegMemImm::reg(tmp_gpr.to_reg()),
                     *dst,
                 );
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
             } else {
                 let inst =
                     Inst::alu_rmi_r(false, AluRmiROpcode::Add, RegMemImm::imm(1 << 31), *dst);
-                inst.emit(sink, flags, state);
+                inst.emit(sink, info, state);
             }
 
             sink.bind_label(done);
         }
 
-        Inst::LoadExtName {
-            dst,
-            name,
-            offset,
-            srcloc,
-        } => {
+        Inst::LoadExtName { dst, name, offset } => {
             // The full address can be encoded in the register, with a relocation.
             // Generates: movabsq $name, %dst
             let enc_dst = int_reg_enc(dst.to_reg());
             sink.put1(0x48 | ((enc_dst >> 3) & 1));
             sink.put1(0xB8 | (enc_dst & 7));
-            sink.add_reloc(*srcloc, Reloc::Abs8, name, *offset);
-            if flags.emit_all_ones_funcaddrs() {
+            emit_reloc(sink, state, Reloc::Abs8, name, *offset);
+            if info.flags().emit_all_ones_funcaddrs() {
                 sink.put8(u64::max_value());
             } else {
                 sink.put8(0);
             }
         }
 
-        Inst::LockCmpxchg {
-            ty,
-            src,
-            dst,
-            srcloc,
-        } => {
-            if let Some(srcloc) = srcloc {
-                sink.add_trap(*srcloc, TrapCode::HeapOutOfBounds);
-            }
+        Inst::LockCmpxchg { ty, src, dst } => {
             // lock cmpxchg{b,w,l,q} %src, (dst)
             // Note that 0xF0 is the Lock prefix.
             let (prefix, rex, opcodes) = match *ty {
@@ -2632,10 +2622,11 @@
                 types::I64 => (LegacyPrefixes::_F0, RexFlags::set_w(), 0x0FB1),
                 _ => unreachable!(),
             };
-            emit_std_reg_mem(sink, prefix, opcodes, 2, *src, &dst.finalize(state), rex);
+            let amode = dst.finalize(state);
+            emit_std_reg_mem(sink, state, prefix, opcodes, 2, *src, &amode, rex);
         }
 
-        Inst::AtomicRmwSeq { ty, op, srcloc } => {
+        Inst::AtomicRmwSeq { ty, op } => {
             // Emit this:
             //
             //    mov{zbq,zwq,zlq,q}     (%r9), %rax  // rax = old value
@@ -2663,15 +2654,15 @@
 
             // mov{zbq,zwq,zlq,q} (%r9), %rax
             // No need to call `add_trap` here, since the `i1` emit will do that.
-            let i1 = Inst::load(*ty, amode.clone(), rax_w, ExtKind::ZeroExtend, *srcloc);
-            i1.emit(sink, flags, state);
+            let i1 = Inst::load(*ty, amode.clone(), rax_w, ExtKind::ZeroExtend);
+            i1.emit(sink, info, state);
 
             // again:
             sink.bind_label(again_label);
 
             // movq %rax, %r11
             let i2 = Inst::mov_r_r(true, rax, r11_w);
-            i2.emit(sink, flags, state);
+            i2.emit(sink, info, state);
 
             // opq %r10, %r11
             let r10_rmi = RegMemImm::reg(r10);
@@ -2688,7 +2679,7 @@
                 };
                 Inst::alu_rmi_r(true, alu_op, r10_rmi, r11_w)
             };
-            i3.emit(sink, flags, state);
+            i3.emit(sink, info, state);
 
             // lock cmpxchg{b,w,l,q} %r11, (%r9)
             // No need to call `add_trap` here, since the `i4` emit will do that.
@@ -2696,9 +2687,8 @@
                 ty: *ty,
                 src: r11,
                 dst: amode.into(),
-                srcloc: *srcloc,
             };
-            i4.emit(sink, flags, state);
+            i4.emit(sink, info, state);
 
             // jnz again
             one_way_jmp(sink, CC::NZ, again_label);
@@ -2718,8 +2708,9 @@
             sink.put1(0xcc);
         }
 
-        Inst::Ud2 { trap_info } => {
-            sink.add_trap(trap_info.0, trap_info.1);
+        Inst::Ud2 { trap_code } => {
+            let cur_srcloc = state.cur_srcloc();
+            sink.add_trap(cur_srcloc, *trap_code);
             if let Some(s) = state.take_stack_map() {
                 sink.add_stack_map(StackMapExtent::UpcomingBytes(2), s);
             }
@@ -2736,7 +2727,90 @@
             state.virtual_sp_offset += offset;
         }
 
-        Inst::Nop { .. } | Inst::EpiloguePlaceholder => {
+        Inst::Nop { len } => {
+            // These encodings can all be found in Intel's architecture manual, at the NOP
+            // instruction description.
+            let mut len = *len;
+            while len != 0 {
+                let emitted = u8::min(len, 9);
+                match emitted {
+                    0 => {}
+                    1 => sink.put1(0x90), // NOP
+                    2 => {
+                        // 66 NOP
+                        sink.put1(0x66);
+                        sink.put1(0x90);
+                    }
+                    3 => {
+                        // NOP [EAX]
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x00);
+                    }
+                    4 => {
+                        // NOP 0(EAX), with 0 a 1-byte immediate.
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x40);
+                        sink.put1(0x00);
+                    }
+                    5 => {
+                        // NOP [EAX, EAX, 1]
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x44);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                    }
+                    6 => {
+                        // 66 NOP [EAX, EAX, 1]
+                        sink.put1(0x66);
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x44);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                    }
+                    7 => {
+                        // NOP 0[EAX], but 0 is a 4 bytes immediate.
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x80);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                    }
+                    8 => {
+                        // NOP 0[EAX, EAX, 1], with 0 a 4 bytes immediate.
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x84);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                    }
+                    9 => {
+                        // 66 NOP 0[EAX, EAX, 1], with 0 a 4 bytes immediate.
+                        sink.put1(0x66);
+                        sink.put1(0x0F);
+                        sink.put1(0x1F);
+                        sink.put1(0x84);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                        sink.put1(0x00);
+                    }
+                    _ => unreachable!(),
+                }
+                len -= emitted;
+            }
+        }
+
+        Inst::EpiloguePlaceholder => {
             // Generate no code.
         }
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit_tests.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit_tests.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit_tests.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/emit_tests.rs	2021-01-18 19:58:25.000000000 +0000
@@ -14,6 +14,7 @@
 
 use super::*;
 use crate::isa::test_utils;
+use crate::isa::x64;
 use alloc::vec::Vec;
 
 #[test]
@@ -97,82 +98,82 @@
     //
     // Addr_IR, offset zero
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rax), w_rdi),
         "488B38",
         "movq    0(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rbx), w_rdi),
         "488B3B",
         "movq    0(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rcx), w_rdi),
         "488B39",
         "movq    0(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rdx), w_rdi),
         "488B3A",
         "movq    0(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rbp), w_rdi),
         "488B7D00",
         "movq    0(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rsp), w_rdi),
         "488B3C24",
         "movq    0(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rsi), w_rdi),
         "488B3E",
         "movq    0(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, rdi), w_rdi),
         "488B3F",
         "movq    0(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r8), w_rdi),
         "498B38",
         "movq    0(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r9), w_rdi),
         "498B39",
         "movq    0(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r10), w_rdi),
         "498B3A",
         "movq    0(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r11), w_rdi),
         "498B3B",
         "movq    0(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r12), w_rdi),
         "498B3C24",
         "movq    0(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r13), w_rdi),
         "498B7D00",
         "movq    0(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r14), w_rdi),
         "498B3E",
         "movq    0(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0, r15), w_rdi),
         "498B3F",
         "movq    0(%r15), %rdi",
     ));
@@ -180,82 +181,82 @@
     // ========================================================
     // Addr_IR, offset max simm8
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rax), w_rdi),
         "488B787F",
         "movq    127(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rbx), w_rdi),
         "488B7B7F",
         "movq    127(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rcx), w_rdi),
         "488B797F",
         "movq    127(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rdx), w_rdi),
         "488B7A7F",
         "movq    127(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rbp), w_rdi),
         "488B7D7F",
         "movq    127(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rsp), w_rdi),
         "488B7C247F",
         "movq    127(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rsi), w_rdi),
         "488B7E7F",
         "movq    127(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, rdi), w_rdi),
         "488B7F7F",
         "movq    127(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r8), w_rdi),
         "498B787F",
         "movq    127(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r9), w_rdi),
         "498B797F",
         "movq    127(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r10), w_rdi),
         "498B7A7F",
         "movq    127(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r11), w_rdi),
         "498B7B7F",
         "movq    127(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r12), w_rdi),
         "498B7C247F",
         "movq    127(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r13), w_rdi),
         "498B7D7F",
         "movq    127(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r14), w_rdi),
         "498B7E7F",
         "movq    127(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(127, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(127, r15), w_rdi),
         "498B7F7F",
         "movq    127(%r15), %rdi",
     ));
@@ -263,82 +264,82 @@
     // ========================================================
     // Addr_IR, offset min simm8
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rax), w_rdi),
         "488B7880",
         "movq    -128(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rbx), w_rdi),
         "488B7B80",
         "movq    -128(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rcx), w_rdi),
         "488B7980",
         "movq    -128(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rdx), w_rdi),
         "488B7A80",
         "movq    -128(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rbp), w_rdi),
         "488B7D80",
         "movq    -128(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rsp), w_rdi),
         "488B7C2480",
         "movq    -128(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rsi), w_rdi),
         "488B7E80",
         "movq    -128(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, rdi), w_rdi),
         "488B7F80",
         "movq    -128(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r8), w_rdi),
         "498B7880",
         "movq    -128(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r9), w_rdi),
         "498B7980",
         "movq    -128(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r10), w_rdi),
         "498B7A80",
         "movq    -128(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r11), w_rdi),
         "498B7B80",
         "movq    -128(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r12), w_rdi),
         "498B7C2480",
         "movq    -128(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r13), w_rdi),
         "498B7D80",
         "movq    -128(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r14), w_rdi),
         "498B7E80",
         "movq    -128(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-128i32 as u32, r15), w_rdi),
         "498B7F80",
         "movq    -128(%r15), %rdi",
     ));
@@ -346,82 +347,82 @@
     // ========================================================
     // Addr_IR, offset smallest positive simm32
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rax), w_rdi),
         "488BB880000000",
         "movq    128(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rbx), w_rdi),
         "488BBB80000000",
         "movq    128(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rcx), w_rdi),
         "488BB980000000",
         "movq    128(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rdx), w_rdi),
         "488BBA80000000",
         "movq    128(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rbp), w_rdi),
         "488BBD80000000",
         "movq    128(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rsp), w_rdi),
         "488BBC2480000000",
         "movq    128(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rsi), w_rdi),
         "488BBE80000000",
         "movq    128(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, rdi), w_rdi),
         "488BBF80000000",
         "movq    128(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r8), w_rdi),
         "498BB880000000",
         "movq    128(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r9), w_rdi),
         "498BB980000000",
         "movq    128(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r10), w_rdi),
         "498BBA80000000",
         "movq    128(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r11), w_rdi),
         "498BBB80000000",
         "movq    128(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r12), w_rdi),
         "498BBC2480000000",
         "movq    128(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r13), w_rdi),
         "498BBD80000000",
         "movq    128(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r14), w_rdi),
         "498BBE80000000",
         "movq    128(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(128, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(128, r15), w_rdi),
         "498BBF80000000",
         "movq    128(%r15), %rdi",
     ));
@@ -429,82 +430,82 @@
     // ========================================================
     // Addr_IR, offset smallest negative simm32
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rax), w_rdi),
         "488BB87FFFFFFF",
         "movq    -129(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rbx), w_rdi),
         "488BBB7FFFFFFF",
         "movq    -129(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rcx), w_rdi),
         "488BB97FFFFFFF",
         "movq    -129(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rdx), w_rdi),
         "488BBA7FFFFFFF",
         "movq    -129(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rbp), w_rdi),
         "488BBD7FFFFFFF",
         "movq    -129(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rsp), w_rdi),
         "488BBC247FFFFFFF",
         "movq    -129(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rsi), w_rdi),
         "488BBE7FFFFFFF",
         "movq    -129(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, rdi), w_rdi),
         "488BBF7FFFFFFF",
         "movq    -129(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r8), w_rdi),
         "498BB87FFFFFFF",
         "movq    -129(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r9), w_rdi),
         "498BB97FFFFFFF",
         "movq    -129(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r10), w_rdi),
         "498BBA7FFFFFFF",
         "movq    -129(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r11), w_rdi),
         "498BBB7FFFFFFF",
         "movq    -129(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r12), w_rdi),
         "498BBC247FFFFFFF",
         "movq    -129(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r13), w_rdi),
         "498BBD7FFFFFFF",
         "movq    -129(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r14), w_rdi),
         "498BBE7FFFFFFF",
         "movq    -129(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-129i32 as u32, r15), w_rdi),
         "498BBF7FFFFFFF",
         "movq    -129(%r15), %rdi",
     ));
@@ -512,82 +513,82 @@
     // ========================================================
     // Addr_IR, offset large positive simm32
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rax), w_rdi),
         "488BB877207317",
         "movq    393420919(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rbx), w_rdi),
         "488BBB77207317",
         "movq    393420919(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rcx), w_rdi),
         "488BB977207317",
         "movq    393420919(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rdx), w_rdi),
         "488BBA77207317",
         "movq    393420919(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rbp), w_rdi),
         "488BBD77207317",
         "movq    393420919(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rsp), w_rdi),
         "488BBC2477207317",
         "movq    393420919(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rsi), w_rdi),
         "488BBE77207317",
         "movq    393420919(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, rdi), w_rdi),
         "488BBF77207317",
         "movq    393420919(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r8), w_rdi),
         "498BB877207317",
         "movq    393420919(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r9), w_rdi),
         "498BB977207317",
         "movq    393420919(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r10), w_rdi),
         "498BBA77207317",
         "movq    393420919(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r11), w_rdi),
         "498BBB77207317",
         "movq    393420919(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r12), w_rdi),
         "498BBC2477207317",
         "movq    393420919(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r13), w_rdi),
         "498BBD77207317",
         "movq    393420919(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r14), w_rdi),
         "498BBE77207317",
         "movq    393420919(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(0x17732077, r15), w_rdi),
         "498BBF77207317",
         "movq    393420919(%r15), %rdi",
     ));
@@ -595,82 +596,82 @@
     // ========================================================
     // Addr_IR, offset large negative simm32
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rax), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rax), w_rdi),
         "488BB8D9A6BECE",
         "movq    -826366247(%rax), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rbx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rbx), w_rdi),
         "488BBBD9A6BECE",
         "movq    -826366247(%rbx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rcx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rcx), w_rdi),
         "488BB9D9A6BECE",
         "movq    -826366247(%rcx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rdx), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rdx), w_rdi),
         "488BBAD9A6BECE",
         "movq    -826366247(%rdx), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rbp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rbp), w_rdi),
         "488BBDD9A6BECE",
         "movq    -826366247(%rbp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rsp), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rsp), w_rdi),
         "488BBC24D9A6BECE",
         "movq    -826366247(%rsp), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rsi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rsi), w_rdi),
         "488BBED9A6BECE",
         "movq    -826366247(%rsi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rdi), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, rdi), w_rdi),
         "488BBFD9A6BECE",
         "movq    -826366247(%rdi), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r8), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r8), w_rdi),
         "498BB8D9A6BECE",
         "movq    -826366247(%r8), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r9), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r9), w_rdi),
         "498BB9D9A6BECE",
         "movq    -826366247(%r9), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r10), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r10), w_rdi),
         "498BBAD9A6BECE",
         "movq    -826366247(%r10), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r11), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r11), w_rdi),
         "498BBBD9A6BECE",
         "movq    -826366247(%r11), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r12), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r12), w_rdi),
         "498BBC24D9A6BECE",
         "movq    -826366247(%r12), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r13), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r13), w_rdi),
         "498BBDD9A6BECE",
         "movq    -826366247(%r13), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r14), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r14), w_rdi),
         "498BBED9A6BECE",
         "movq    -826366247(%r14), %rdi",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r15), w_rdi, None),
+        Inst::mov64_m_r(Amode::imm_reg(-0x31415927i32 as u32, r15), w_rdi),
         "498BBFD9A6BECE",
         "movq    -826366247(%r15), %rdi",
     ));
@@ -682,42 +683,42 @@
     //
     // Addr_IRRS, offset max simm8
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rax, rax, 0), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rax, rax, 0), w_r11),
         "4C8B5C007F",
         "movq    127(%rax,%rax,1), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rdi, rax, 1), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rdi, rax, 1), w_r11),
         "4C8B5C477F",
         "movq    127(%rdi,%rax,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r8, rax, 2), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r8, rax, 2), w_r11),
         "4D8B5C807F",
         "movq    127(%r8,%rax,4), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r15, rax, 3), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r15, rax, 3), w_r11),
         "4D8B5CC77F",
         "movq    127(%r15,%rax,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rax, rdi, 3), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rax, rdi, 3), w_r11),
         "4C8B5CF87F",
         "movq    127(%rax,%rdi,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rdi, rdi, 2), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, rdi, rdi, 2), w_r11),
         "4C8B5CBF7F",
         "movq    127(%rdi,%rdi,4), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r8, rdi, 1), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r8, rdi, 1), w_r11),
         "4D8B5C787F",
         "movq    127(%r8,%rdi,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r15, rdi, 0), w_r11, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(127, r15, rdi, 0), w_r11),
         "4D8B5C3F7F",
         "movq    127(%r15,%rdi,1), %r11",
     ));
@@ -725,74 +726,42 @@
     // ========================================================
     // Addr_IRRS, offset min simm8
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, rax, r8, 2),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, rax, r8, 2), w_r11),
         "4E8B5C8080",
         "movq    -128(%rax,%r8,4), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, rdi, r8, 3),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, rdi, r8, 3), w_r11),
         "4E8B5CC780",
         "movq    -128(%rdi,%r8,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, r8, r8, 0),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, r8, r8, 0), w_r11),
         "4F8B5C0080",
         "movq    -128(%r8,%r8,1), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, r15, r8, 1),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, r15, r8, 1), w_r11),
         "4F8B5C4780",
         "movq    -128(%r15,%r8,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, rax, r15, 1),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, rax, r15, 1), w_r11),
         "4E8B5C7880",
         "movq    -128(%rax,%r15,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, rdi, r15, 0),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, rdi, r15, 0), w_r11),
         "4E8B5C3F80",
         "movq    -128(%rdi,%r15,1), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, r8, r15, 3),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, r8, r15, 3), w_r11),
         "4F8B5CF880",
         "movq    -128(%r8,%r15,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(-128i32 as u32, r15, r15, 2),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(-128i32 as u32, r15, r15, 2), w_r11),
         "4F8B5CBF80",
         "movq    -128(%r15,%r15,4), %r11",
     ));
@@ -800,74 +769,42 @@
     // ========================================================
     // Addr_IRRS, offset large positive simm32
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, rax, rax, 0),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, rax, rax, 0), w_r11),
         "4C8B9C00BE25664F",
         "movq    1332094398(%rax,%rax,1), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, rdi, rax, 1),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, rdi, rax, 1), w_r11),
         "4C8B9C47BE25664F",
         "movq    1332094398(%rdi,%rax,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, r8, rax, 2),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, r8, rax, 2), w_r11),
         "4D8B9C80BE25664F",
         "movq    1332094398(%r8,%rax,4), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, r15, rax, 3),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, r15, rax, 3), w_r11),
         "4D8B9CC7BE25664F",
         "movq    1332094398(%r15,%rax,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, rax, rdi, 3),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, rax, rdi, 3), w_r11),
         "4C8B9CF8BE25664F",
         "movq    1332094398(%rax,%rdi,8), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, rdi, rdi, 2),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, rdi, rdi, 2), w_r11),
         "4C8B9CBFBE25664F",
         "movq    1332094398(%rdi,%rdi,4), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, r8, rdi, 1),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, r8, rdi, 1), w_r11),
         "4D8B9C78BE25664F",
         "movq    1332094398(%r8,%rdi,2), %r11",
     ));
     insns.push((
-        Inst::mov64_m_r(
-            Amode::imm_reg_reg_shift(0x4f6625be, r15, rdi, 0),
-            w_r11,
-            None,
-        ),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(0x4f6625be, r15, rdi, 0), w_r11),
         "4D8B9C3FBE25664F",
         "movq    1332094398(%r15,%rdi,1), %r11",
     ));
@@ -878,7 +815,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, rax, r8, 2),
             w_r11,
-            None,
         ),
         "4E8B9C8070E9B2D9",
         "movq    -642586256(%rax,%r8,4), %r11",
@@ -887,7 +823,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, rdi, r8, 3),
             w_r11,
-            None,
         ),
         "4E8B9CC770E9B2D9",
         "movq    -642586256(%rdi,%r8,8), %r11",
@@ -896,7 +831,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, r8, r8, 0),
             w_r11,
-            None,
         ),
         "4F8B9C0070E9B2D9",
         "movq    -642586256(%r8,%r8,1), %r11",
@@ -905,7 +839,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, r15, r8, 1),
             w_r11,
-            None,
         ),
         "4F8B9C4770E9B2D9",
         "movq    -642586256(%r15,%r8,2), %r11",
@@ -914,7 +847,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, rax, r15, 1),
             w_r11,
-            None,
         ),
         "4E8B9C7870E9B2D9",
         "movq    -642586256(%rax,%r15,2), %r11",
@@ -923,7 +855,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, rdi, r15, 0),
             w_r11,
-            None,
         ),
         "4E8B9C3F70E9B2D9",
         "movq    -642586256(%rdi,%r15,1), %r11",
@@ -932,7 +863,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, r8, r15, 3),
             w_r11,
-            None,
         ),
         "4F8B9CF870E9B2D9",
         "movq    -642586256(%r8,%r15,8), %r11",
@@ -941,7 +871,6 @@
         Inst::mov64_m_r(
             Amode::imm_reg_reg_shift(-0x264d1690i32 as u32, r15, r15, 2),
             w_r11,
-            None,
         ),
         "4F8B9CBF70E9B2D9",
         "movq    -642586256(%r15,%r15,4), %r11",
@@ -1291,42 +1220,22 @@
     // ========================================================
     // Div
     insns.push((
-        Inst::div(
-            4,
-            true, /*signed*/
-            RegMem::reg(regs::rsi()),
-            SourceLoc::default(),
-        ),
+        Inst::div(4, true /*signed*/, RegMem::reg(regs::rsi())),
         "F7FE",
         "idiv    %esi",
     ));
     insns.push((
-        Inst::div(
-            8,
-            true, /*signed*/
-            RegMem::reg(regs::r15()),
-            SourceLoc::default(),
-        ),
+        Inst::div(8, true /*signed*/, RegMem::reg(regs::r15())),
         "49F7FF",
         "idiv    %r15",
     ));
     insns.push((
-        Inst::div(
-            4,
-            false, /*signed*/
-            RegMem::reg(regs::r14()),
-            SourceLoc::default(),
-        ),
+        Inst::div(4, false /*signed*/, RegMem::reg(regs::r14())),
         "41F7F6",
         "div     %r14d",
     ));
     insns.push((
-        Inst::div(
-            8,
-            false, /*signed*/
-            RegMem::reg(regs::rdi()),
-            SourceLoc::default(),
-        ),
+        Inst::div(8, false /*signed*/, RegMem::reg(regs::rdi())),
         "48F7F7",
         "div     %rdi",
     ));
@@ -1454,17 +1363,17 @@
     // ========================================================
     // MovZX_RM_R
     insns.push((
-        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(rdi), w_rdi, None),
+        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(rdi), w_rdi),
         "400FB6FF",
         "movzbl  %dil, %edi",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(rax), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(rax), w_rsi),
         "0FB6F0",
         "movzbl  %al, %esi",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(r15), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::BL, RegMem::reg(r15), w_rsi),
         "410FB6F7",
         "movzbl  %r15b, %esi",
     ));
@@ -1473,7 +1382,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "0FB671F9",
         "movzbl  -7(%rcx), %esi",
@@ -1483,7 +1391,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "410FB658F9",
         "movzbl  -7(%r8), %ebx",
@@ -1493,7 +1400,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "450FB64AF9",
         "movzbl  -7(%r10), %r9d",
@@ -1503,18 +1409,17 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "410FB653F9",
         "movzbl  -7(%r11), %edx",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::BQ, RegMem::reg(rax), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::BQ, RegMem::reg(rax), w_rsi),
         "480FB6F0",
         "movzbq  %al, %rsi",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::BQ, RegMem::reg(r10), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::BQ, RegMem::reg(r10), w_rsi),
         "490FB6F2",
         "movzbq  %r10b, %rsi",
     ));
@@ -1523,7 +1428,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "480FB671F9",
         "movzbq  -7(%rcx), %rsi",
@@ -1533,7 +1437,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "490FB658F9",
         "movzbq  -7(%r8), %rbx",
@@ -1543,7 +1446,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "4D0FB64AF9",
         "movzbq  -7(%r10), %r9",
@@ -1553,18 +1455,17 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "490FB653F9",
         "movzbq  -7(%r11), %rdx",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::WL, RegMem::reg(rcx), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::WL, RegMem::reg(rcx), w_rsi),
         "0FB7F1",
         "movzwl  %cx, %esi",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::WL, RegMem::reg(r10), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::WL, RegMem::reg(r10), w_rsi),
         "410FB7F2",
         "movzwl  %r10w, %esi",
     ));
@@ -1573,7 +1474,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "0FB771F9",
         "movzwl  -7(%rcx), %esi",
@@ -1583,7 +1483,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "410FB758F9",
         "movzwl  -7(%r8), %ebx",
@@ -1593,7 +1492,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "450FB74AF9",
         "movzwl  -7(%r10), %r9d",
@@ -1603,18 +1501,17 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "410FB753F9",
         "movzwl  -7(%r11), %edx",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::WQ, RegMem::reg(rcx), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::WQ, RegMem::reg(rcx), w_rsi),
         "480FB7F1",
         "movzwq  %cx, %rsi",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::WQ, RegMem::reg(r11), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::WQ, RegMem::reg(r11), w_rsi),
         "490FB7F3",
         "movzwq  %r11w, %rsi",
     ));
@@ -1623,7 +1520,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "480FB771F9",
         "movzwq  -7(%rcx), %rsi",
@@ -1633,7 +1529,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "490FB758F9",
         "movzwq  -7(%r8), %rbx",
@@ -1643,7 +1538,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "4D0FB74AF9",
         "movzwq  -7(%r10), %r9",
@@ -1653,13 +1547,12 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "490FB753F9",
         "movzwq  -7(%r11), %rdx",
     ));
     insns.push((
-        Inst::movzx_rm_r(ExtMode::LQ, RegMem::reg(rcx), w_rsi, None),
+        Inst::movzx_rm_r(ExtMode::LQ, RegMem::reg(rcx), w_rsi),
         "8BF1",
         "movl    %ecx, %esi",
     ));
@@ -1668,7 +1561,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "8B71F9",
         "movl    -7(%rcx), %esi",
@@ -1678,7 +1570,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "418B58F9",
         "movl    -7(%r8), %ebx",
@@ -1688,7 +1579,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "458B4AF9",
         "movl    -7(%r10), %r9d",
@@ -1698,7 +1588,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "418B53F9",
         "movl    -7(%r11), %edx",
@@ -1707,42 +1596,42 @@
     // ========================================================
     // Mov64_M_R
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, rbx, 0), w_rcx, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, rbx, 0), w_rcx),
         "488B8C18B3000000",
         "movq    179(%rax,%rbx,1), %rcx",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, rbx, 0), w_r8, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, rbx, 0), w_r8),
         "4C8B8418B3000000",
         "movq    179(%rax,%rbx,1), %r8",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, r9, 0), w_rcx, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, r9, 0), w_rcx),
         "4A8B8C08B3000000",
         "movq    179(%rax,%r9,1), %rcx",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, r9, 0), w_r8, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, rax, r9, 0), w_r8),
         "4E8B8408B3000000",
         "movq    179(%rax,%r9,1), %r8",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, rbx, 0), w_rcx, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, rbx, 0), w_rcx),
         "498B8C1AB3000000",
         "movq    179(%r10,%rbx,1), %rcx",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, rbx, 0), w_r8, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, rbx, 0), w_r8),
         "4D8B841AB3000000",
         "movq    179(%r10,%rbx,1), %r8",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, r9, 0), w_rcx, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, r9, 0), w_rcx),
         "4B8B8C0AB3000000",
         "movq    179(%r10,%r9,1), %rcx",
     ));
     insns.push((
-        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, r9, 0), w_r8, None),
+        Inst::mov64_m_r(Amode::imm_reg_reg_shift(179, r10, r9, 0), w_r8),
         "4F8B840AB3000000",
         "movq    179(%r10,%r9,1), %r8",
     ));
@@ -1765,33 +1654,25 @@
         "lea     179(%r10,%r9,1), %r8",
     ));
     insns.push((
-        Inst::lea(Amode::rip_relative(BranchTarget::ResolvedOffset(0)), w_rdi),
+        Inst::lea(Amode::rip_relative(MachLabel::from_block(0)), w_rdi),
         "488D3D00000000",
-        "lea     0(%rip), %rdi",
-    ));
-    insns.push((
-        Inst::lea(
-            Amode::rip_relative(BranchTarget::ResolvedOffset(1337)),
-            w_r15,
-        ),
-        "4C8D3D39050000",
-        "lea     1337(%rip), %r15",
+        "lea     label0(%rip), %rdi",
     ));
 
     // ========================================================
     // MovSX_RM_R
     insns.push((
-        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rdi), w_rdi, None),
+        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rdi), w_rdi),
         "400FBEFF",
         "movsbl  %dil, %edi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rcx), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rcx), w_rsi),
         "0FBEF1",
         "movsbl  %cl, %esi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(r14), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(r14), w_rsi),
         "410FBEF6",
         "movsbl  %r14b, %esi",
     ));
@@ -1800,7 +1681,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "0FBE71F9",
         "movsbl  -7(%rcx), %esi",
@@ -1810,7 +1690,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "410FBE58F9",
         "movsbl  -7(%r8), %ebx",
@@ -1820,7 +1699,6 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "450FBE4AF9",
         "movsbl  -7(%r10), %r9d",
@@ -1830,18 +1708,17 @@
             ExtMode::BL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "410FBE53F9",
         "movsbl  -7(%r11), %edx",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::BQ, RegMem::reg(rcx), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::BQ, RegMem::reg(rcx), w_rsi),
         "480FBEF1",
         "movsbq  %cl, %rsi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::BQ, RegMem::reg(r15), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::BQ, RegMem::reg(r15), w_rsi),
         "490FBEF7",
         "movsbq  %r15b, %rsi",
     ));
@@ -1850,7 +1727,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "480FBE71F9",
         "movsbq  -7(%rcx), %rsi",
@@ -1860,7 +1736,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "490FBE58F9",
         "movsbq  -7(%r8), %rbx",
@@ -1870,7 +1745,6 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "4D0FBE4AF9",
         "movsbq  -7(%r10), %r9",
@@ -1880,18 +1754,17 @@
             ExtMode::BQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "490FBE53F9",
         "movsbq  -7(%r11), %rdx",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::WL, RegMem::reg(rcx), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::WL, RegMem::reg(rcx), w_rsi),
         "0FBFF1",
         "movswl  %cx, %esi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::WL, RegMem::reg(r14), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::WL, RegMem::reg(r14), w_rsi),
         "410FBFF6",
         "movswl  %r14w, %esi",
     ));
@@ -1900,7 +1773,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "0FBF71F9",
         "movswl  -7(%rcx), %esi",
@@ -1910,7 +1782,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "410FBF58F9",
         "movswl  -7(%r8), %ebx",
@@ -1920,7 +1791,6 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "450FBF4AF9",
         "movswl  -7(%r10), %r9d",
@@ -1930,18 +1800,17 @@
             ExtMode::WL,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "410FBF53F9",
         "movswl  -7(%r11), %edx",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::WQ, RegMem::reg(rcx), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::WQ, RegMem::reg(rcx), w_rsi),
         "480FBFF1",
         "movswq  %cx, %rsi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::WQ, RegMem::reg(r13), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::WQ, RegMem::reg(r13), w_rsi),
         "490FBFF5",
         "movswq  %r13w, %rsi",
     ));
@@ -1950,7 +1819,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "480FBF71F9",
         "movswq  -7(%rcx), %rsi",
@@ -1960,7 +1828,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "490FBF58F9",
         "movswq  -7(%r8), %rbx",
@@ -1970,7 +1837,6 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "4D0FBF4AF9",
         "movswq  -7(%r10), %r9",
@@ -1980,18 +1846,17 @@
             ExtMode::WQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "490FBF53F9",
         "movswq  -7(%r11), %rdx",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::LQ, RegMem::reg(rcx), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::LQ, RegMem::reg(rcx), w_rsi),
         "4863F1",
         "movslq  %ecx, %rsi",
     ));
     insns.push((
-        Inst::movsx_rm_r(ExtMode::LQ, RegMem::reg(r15), w_rsi, None),
+        Inst::movsx_rm_r(ExtMode::LQ, RegMem::reg(r15), w_rsi),
         "4963F7",
         "movslq  %r15d, %rsi",
     ));
@@ -2000,7 +1865,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, rcx)),
             w_rsi,
-            None,
         ),
         "486371F9",
         "movslq  -7(%rcx), %rsi",
@@ -2010,7 +1874,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r8)),
             w_rbx,
-            None,
         ),
         "496358F9",
         "movslq  -7(%r8), %rbx",
@@ -2020,7 +1883,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r10)),
             w_r9,
-            None,
         ),
         "4D634AF9",
         "movslq  -7(%r10), %r9",
@@ -2030,7 +1892,6 @@
             ExtMode::LQ,
             RegMem::mem(Amode::imm_reg(-7i32 as u32, r11)),
             w_rdx,
-            None,
         ),
         "496353F9",
         "movslq  -7(%r11), %rdx",
@@ -2039,325 +1900,325 @@
     // ========================================================
     // Mov_R_M.  Byte stores are tricky.  Check everything carefully.
     insns.push((
-        Inst::mov_r_m(8, rax, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(8, rax, Amode::imm_reg(99, rdi)),
         "48894763",
         "movq    %rax, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rbx, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(8, rbx, Amode::imm_reg(99, r8)),
         "49895863",
         "movq    %rbx, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rcx, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(8, rcx, Amode::imm_reg(99, rsi)),
         "48894E63",
         "movq    %rcx, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rdx, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(8, rdx, Amode::imm_reg(99, r9)),
         "49895163",
         "movq    %rdx, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rsi, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(8, rsi, Amode::imm_reg(99, rax)),
         "48897063",
         "movq    %rsi, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rdi, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(8, rdi, Amode::imm_reg(99, r15)),
         "49897F63",
         "movq    %rdi, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rsp, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(8, rsp, Amode::imm_reg(99, rcx)),
         "48896163",
         "movq    %rsp, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(8, rbp, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(8, rbp, Amode::imm_reg(99, r14)),
         "49896E63",
         "movq    %rbp, 99(%r14)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r8, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(8, r8, Amode::imm_reg(99, rdi)),
         "4C894763",
         "movq    %r8, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r9, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(8, r9, Amode::imm_reg(99, r8)),
         "4D894863",
         "movq    %r9, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r10, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(8, r10, Amode::imm_reg(99, rsi)),
         "4C895663",
         "movq    %r10, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r11, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(8, r11, Amode::imm_reg(99, r9)),
         "4D895963",
         "movq    %r11, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r12, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(8, r12, Amode::imm_reg(99, rax)),
         "4C896063",
         "movq    %r12, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r13, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(8, r13, Amode::imm_reg(99, r15)),
         "4D896F63",
         "movq    %r13, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r14, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(8, r14, Amode::imm_reg(99, rcx)),
         "4C897163",
         "movq    %r14, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(8, r15, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(8, r15, Amode::imm_reg(99, r14)),
         "4D897E63",
         "movq    %r15, 99(%r14)",
     ));
     //
     insns.push((
-        Inst::mov_r_m(4, rax, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(4, rax, Amode::imm_reg(99, rdi)),
         "894763",
         "movl    %eax, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rbx, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(4, rbx, Amode::imm_reg(99, r8)),
         "41895863",
         "movl    %ebx, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rcx, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(4, rcx, Amode::imm_reg(99, rsi)),
         "894E63",
         "movl    %ecx, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rdx, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(4, rdx, Amode::imm_reg(99, r9)),
         "41895163",
         "movl    %edx, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rsi, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(4, rsi, Amode::imm_reg(99, rax)),
         "897063",
         "movl    %esi, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rdi, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(4, rdi, Amode::imm_reg(99, r15)),
         "41897F63",
         "movl    %edi, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rsp, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(4, rsp, Amode::imm_reg(99, rcx)),
         "896163",
         "movl    %esp, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(4, rbp, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(4, rbp, Amode::imm_reg(99, r14)),
         "41896E63",
         "movl    %ebp, 99(%r14)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r8, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(4, r8, Amode::imm_reg(99, rdi)),
         "44894763",
         "movl    %r8d, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r9, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(4, r9, Amode::imm_reg(99, r8)),
         "45894863",
         "movl    %r9d, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r10, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(4, r10, Amode::imm_reg(99, rsi)),
         "44895663",
         "movl    %r10d, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r11, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(4, r11, Amode::imm_reg(99, r9)),
         "45895963",
         "movl    %r11d, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r12, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(4, r12, Amode::imm_reg(99, rax)),
         "44896063",
         "movl    %r12d, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r13, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(4, r13, Amode::imm_reg(99, r15)),
         "45896F63",
         "movl    %r13d, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r14, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(4, r14, Amode::imm_reg(99, rcx)),
         "44897163",
         "movl    %r14d, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(4, r15, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(4, r15, Amode::imm_reg(99, r14)),
         "45897E63",
         "movl    %r15d, 99(%r14)",
     ));
     //
     insns.push((
-        Inst::mov_r_m(2, rax, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(2, rax, Amode::imm_reg(99, rdi)),
         "66894763",
         "movw    %ax, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rbx, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(2, rbx, Amode::imm_reg(99, r8)),
         "6641895863",
         "movw    %bx, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rcx, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(2, rcx, Amode::imm_reg(99, rsi)),
         "66894E63",
         "movw    %cx, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rdx, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(2, rdx, Amode::imm_reg(99, r9)),
         "6641895163",
         "movw    %dx, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rsi, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(2, rsi, Amode::imm_reg(99, rax)),
         "66897063",
         "movw    %si, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rdi, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(2, rdi, Amode::imm_reg(99, r15)),
         "6641897F63",
         "movw    %di, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rsp, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(2, rsp, Amode::imm_reg(99, rcx)),
         "66896163",
         "movw    %sp, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(2, rbp, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(2, rbp, Amode::imm_reg(99, r14)),
         "6641896E63",
         "movw    %bp, 99(%r14)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r8, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(2, r8, Amode::imm_reg(99, rdi)),
         "6644894763",
         "movw    %r8w, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r9, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(2, r9, Amode::imm_reg(99, r8)),
         "6645894863",
         "movw    %r9w, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r10, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(2, r10, Amode::imm_reg(99, rsi)),
         "6644895663",
         "movw    %r10w, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r11, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(2, r11, Amode::imm_reg(99, r9)),
         "6645895963",
         "movw    %r11w, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r12, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(2, r12, Amode::imm_reg(99, rax)),
         "6644896063",
         "movw    %r12w, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r13, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(2, r13, Amode::imm_reg(99, r15)),
         "6645896F63",
         "movw    %r13w, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r14, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(2, r14, Amode::imm_reg(99, rcx)),
         "6644897163",
         "movw    %r14w, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(2, r15, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(2, r15, Amode::imm_reg(99, r14)),
         "6645897E63",
         "movw    %r15w, 99(%r14)",
     ));
     //
     insns.push((
-        Inst::mov_r_m(1, rax, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(1, rax, Amode::imm_reg(99, rdi)),
         "884763",
         "movb    %al, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rbx, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(1, rbx, Amode::imm_reg(99, r8)),
         "41885863",
         "movb    %bl, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rcx, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(1, rcx, Amode::imm_reg(99, rsi)),
         "884E63",
         "movb    %cl, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rdx, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(1, rdx, Amode::imm_reg(99, r9)),
         "41885163",
         "movb    %dl, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rsi, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(1, rsi, Amode::imm_reg(99, rax)),
         "40887063",
         "movb    %sil, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rdi, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(1, rdi, Amode::imm_reg(99, r15)),
         "41887F63",
         "movb    %dil, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rsp, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(1, rsp, Amode::imm_reg(99, rcx)),
         "40886163",
         "movb    %spl, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(1, rbp, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(1, rbp, Amode::imm_reg(99, r14)),
         "41886E63",
         "movb    %bpl, 99(%r14)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r8, Amode::imm_reg(99, rdi), None),
+        Inst::mov_r_m(1, r8, Amode::imm_reg(99, rdi)),
         "44884763",
         "movb    %r8b, 99(%rdi)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r9, Amode::imm_reg(99, r8), None),
+        Inst::mov_r_m(1, r9, Amode::imm_reg(99, r8)),
         "45884863",
         "movb    %r9b, 99(%r8)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r10, Amode::imm_reg(99, rsi), None),
+        Inst::mov_r_m(1, r10, Amode::imm_reg(99, rsi)),
         "44885663",
         "movb    %r10b, 99(%rsi)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r11, Amode::imm_reg(99, r9), None),
+        Inst::mov_r_m(1, r11, Amode::imm_reg(99, r9)),
         "45885963",
         "movb    %r11b, 99(%r9)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r12, Amode::imm_reg(99, rax), None),
+        Inst::mov_r_m(1, r12, Amode::imm_reg(99, rax)),
         "44886063",
         "movb    %r12b, 99(%rax)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r13, Amode::imm_reg(99, r15), None),
+        Inst::mov_r_m(1, r13, Amode::imm_reg(99, r15)),
         "45886F63",
         "movb    %r13b, 99(%r15)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r14, Amode::imm_reg(99, rcx), None),
+        Inst::mov_r_m(1, r14, Amode::imm_reg(99, rcx)),
         "44887163",
         "movb    %r14b, 99(%rcx)",
     ));
     insns.push((
-        Inst::mov_r_m(1, r15, Amode::imm_reg(99, r14), None),
+        Inst::mov_r_m(1, r15, Amode::imm_reg(99, r14)),
         "45887E63",
         "movb    %r15b, 99(%r14)",
     ));
@@ -2892,7 +2753,6 @@
             },
             Vec::new(),
             Vec::new(),
-            SourceLoc::default(),
             Opcode::Call,
         ),
         "E800000000",
@@ -2902,13 +2762,7 @@
     // ========================================================
     // CallUnknown
     fn call_unknown(rm: RegMem) -> Inst {
-        Inst::call_unknown(
-            rm,
-            Vec::new(),
-            Vec::new(),
-            SourceLoc::default(),
-            Opcode::CallIndirect,
-        )
+        Inst::call_unknown(rm, Vec::new(), Vec::new(), Opcode::CallIndirect)
     }
 
     insns.push((call_unknown(RegMem::reg(rbp)), "FFD5", "call    *%rbp"));
@@ -3136,6 +2990,30 @@
     ));
 
     insns.push((
+        Inst::xmm_rm_r(SseOpcode::Psubsb, RegMem::reg(xmm9), w_xmm5),
+        "66410FE8E9",
+        "psubsb  %xmm9, %xmm5",
+    ));
+
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Psubsw, RegMem::reg(xmm7), w_xmm6),
+        "660FE9F7",
+        "psubsw  %xmm7, %xmm6",
+    ));
+
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Psubusb, RegMem::reg(xmm12), w_xmm13),
+        "66450FD8EC",
+        "psubusb %xmm12, %xmm13",
+    ));
+
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Psubusw, RegMem::reg(xmm1), w_xmm8),
+        "66440FD9C1",
+        "psubusw %xmm1, %xmm8",
+    ));
+
+    insns.push((
         Inst::xmm_rm_r(SseOpcode::Pavgb, RegMem::reg(xmm12), w_xmm13),
         "66450FE0EC",
         "pavgb   %xmm12, %xmm13",
@@ -3273,14 +3151,34 @@
         "pshufb  %xmm11, %xmm2",
     ));
 
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Packsswb, RegMem::reg(xmm11), w_xmm2),
+        "66410F63D3",
+        "packsswb %xmm11, %xmm2",
+    ));
+
+    // ========================================================
+    // XMM_RM_R: Integer Conversion
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Cvtdq2ps, RegMem::reg(xmm1), w_xmm8),
+        "440F5BC1",
+        "cvtdq2ps %xmm1, %xmm8",
+    ));
+
+    insns.push((
+        Inst::xmm_rm_r(SseOpcode::Cvttps2dq, RegMem::reg(xmm9), w_xmm8),
+        "F3450F5BC1",
+        "cvttps2dq %xmm9, %xmm8",
+    ));
+
     // XMM_Mov_R_M: float stores
     insns.push((
-        Inst::xmm_mov_r_m(SseOpcode::Movss, xmm15, Amode::imm_reg(128, r12), None),
+        Inst::xmm_mov_r_m(SseOpcode::Movss, xmm15, Amode::imm_reg(128, r12)),
         "F3450F11BC2480000000",
         "movss   %xmm15, 128(%r12)",
     ));
     insns.push((
-        Inst::xmm_mov_r_m(SseOpcode::Movsd, xmm1, Amode::imm_reg(0, rsi), None),
+        Inst::xmm_mov_r_m(SseOpcode::Movsd, xmm1, Amode::imm_reg(0, rsi)),
         "F20F110E",
         "movsd   %xmm1, 0(%rsi)",
     ));
@@ -3390,6 +3288,22 @@
     ));
 
     insns.push((
+        Inst::xmm_to_gpr(SseOpcode::Pmovmskb, xmm10, w_rax, OperandSize::Size32),
+        "66410FD7C2",
+        "pmovmskb %xmm10, %eax",
+    ));
+    insns.push((
+        Inst::xmm_to_gpr(SseOpcode::Movmskps, xmm2, w_rax, OperandSize::Size32),
+        "0F50C2",
+        "movmskps %xmm2, %eax",
+    ));
+    insns.push((
+        Inst::xmm_to_gpr(SseOpcode::Movmskpd, xmm0, w_rcx, OperandSize::Size32),
+        "660F50C8",
+        "movmskpd %xmm0, %ecx",
+    ));
+
+    insns.push((
         Inst::gpr_to_xmm(
             SseOpcode::Movd,
             RegMem::reg(rax),
@@ -3494,7 +3408,6 @@
             ty: types::I8,
             src: rbx,
             dst: am1,
-            srcloc: None,
         },
         "F0410FB09C9241010000",
         "lock cmpxchgb %bl, 321(%r10,%rdx,4)",
@@ -3505,7 +3418,6 @@
             ty: types::I8,
             src: rdx,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F00FB094F1C7CFFFFF",
         "lock cmpxchgb %dl, -12345(%rcx,%rsi,8)",
@@ -3515,7 +3427,6 @@
             ty: types::I8,
             src: rsi,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F0400FB0B4F1C7CFFFFF",
         "lock cmpxchgb %sil, -12345(%rcx,%rsi,8)",
@@ -3525,7 +3436,6 @@
             ty: types::I8,
             src: r10,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F0440FB094F1C7CFFFFF",
         "lock cmpxchgb %r10b, -12345(%rcx,%rsi,8)",
@@ -3535,7 +3445,6 @@
             ty: types::I8,
             src: r15,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F0440FB0BCF1C7CFFFFF",
         "lock cmpxchgb %r15b, -12345(%rcx,%rsi,8)",
@@ -3546,7 +3455,6 @@
             ty: types::I16,
             src: rsi,
             dst: am2.clone(),
-            srcloc: None,
         },
         "66F00FB1B4F1C7CFFFFF",
         "lock cmpxchgw %si, -12345(%rcx,%rsi,8)",
@@ -3556,7 +3464,6 @@
             ty: types::I16,
             src: r10,
             dst: am2.clone(),
-            srcloc: None,
         },
         "66F0440FB194F1C7CFFFFF",
         "lock cmpxchgw %r10w, -12345(%rcx,%rsi,8)",
@@ -3567,7 +3474,6 @@
             ty: types::I32,
             src: rsi,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F00FB1B4F1C7CFFFFF",
         "lock cmpxchgl %esi, -12345(%rcx,%rsi,8)",
@@ -3577,7 +3483,6 @@
             ty: types::I32,
             src: r10,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F0440FB194F1C7CFFFFF",
         "lock cmpxchgl %r10d, -12345(%rcx,%rsi,8)",
@@ -3588,7 +3493,6 @@
             ty: types::I64,
             src: rsi,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F0480FB1B4F1C7CFFFFF",
         "lock cmpxchgq %rsi, -12345(%rcx,%rsi,8)",
@@ -3598,7 +3502,6 @@
             ty: types::I64,
             src: r10,
             dst: am2.clone(),
-            srcloc: None,
         },
         "F04C0FB194F1C7CFFFFF",
         "lock cmpxchgq %r10, -12345(%rcx,%rsi,8)",
@@ -3606,22 +3509,22 @@
 
     // AtomicRmwSeq
     insns.push((
-        Inst::AtomicRmwSeq { ty: types::I8, op: inst_common::AtomicRmwOp::Or, srcloc: None },
+        Inst::AtomicRmwSeq { ty: types::I8, op: inst_common::AtomicRmwOp::Or, },
         "490FB6014989C34D09D3F0450FB0190F85EFFFFFFF",
         "atomically { 8_bits_at_[%r9]) Or= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }"
     ));
     insns.push((
-        Inst::AtomicRmwSeq { ty: types::I16, op: inst_common::AtomicRmwOp::And, srcloc: None },
+        Inst::AtomicRmwSeq { ty: types::I16, op: inst_common::AtomicRmwOp::And, },
         "490FB7014989C34D21D366F0450FB1190F85EEFFFFFF",
         "atomically { 16_bits_at_[%r9]) And= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }"
     ));
     insns.push((
-        Inst::AtomicRmwSeq { ty: types::I32, op: inst_common::AtomicRmwOp::Xchg, srcloc: None },
+        Inst::AtomicRmwSeq { ty: types::I32, op: inst_common::AtomicRmwOp::Xchg, },
         "418B014989C34D89D3F0450FB1190F85EFFFFFFF",
         "atomically { 32_bits_at_[%r9]) Xchg= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }"
     ));
     insns.push((
-        Inst::AtomicRmwSeq { ty: types::I64, op: inst_common::AtomicRmwOp::Add, srcloc: None },
+        Inst::AtomicRmwSeq { ty: types::I64, op: inst_common::AtomicRmwOp::Add, },
         "498B014989C34D01D3F04D0FB1190F85EFFFFFFF",
         "atomically { 64_bits_at_[%r9]) Add= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }"
     ));
@@ -3654,20 +3557,34 @@
 
     insns.push((Inst::Hlt, "CC", "hlt"));
 
-    let trap_info = (SourceLoc::default(), TrapCode::UnreachableCodeReached);
-    insns.push((Inst::Ud2 { trap_info }, "0F0B", "ud2 unreachable"));
+    let trap_code = TrapCode::UnreachableCodeReached;
+    insns.push((Inst::Ud2 { trap_code }, "0F0B", "ud2 unreachable"));
 
     // ========================================================
     // Actually run the tests!
     let flags = settings::Flags::new(settings::builder());
+
+    use crate::settings::Configurable;
+    let mut isa_flag_builder = x64::settings::builder();
+    isa_flag_builder.enable("has_ssse3").unwrap();
+    isa_flag_builder.enable("has_sse41").unwrap();
+    let isa_flags = x64::settings::Flags::new(&flags, isa_flag_builder);
+
     let rru = regs::create_reg_universe_systemv(&flags);
+    let emit_info = EmitInfo::new(flags, isa_flags);
     for (insn, expected_encoding, expected_printing) in insns {
         // Check the printed text is as expected.
         let actual_printing = insn.show_rru(Some(&rru));
         assert_eq!(expected_printing, actual_printing);
         let mut sink = test_utils::TestCodeSink::new();
         let mut buffer = MachBuffer::new();
-        insn.emit(&mut buffer, &flags, &mut Default::default());
+
+        insn.emit(&mut buffer, &emit_info, &mut Default::default());
+
+        // Allow one label just after the instruction (so the offset is 0).
+        let label = buffer.get_label();
+        buffer.bind_label(label);
+
         let buffer = buffer.finish();
         buffer.emit(&mut sink);
         let actual_encoding = &sink.stringify();
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,15 +1,15 @@
 //! This module defines x86_64-specific machine instruction types.
-#![allow(dead_code)]
 
 use crate::binemit::{CodeOffset, StackMap};
 use crate::ir::{types, ExternalName, Opcode, SourceLoc, TrapCode, Type};
+use crate::isa::x64::settings as x64_settings;
 use crate::machinst::*;
 use crate::{settings, settings::Flags, CodegenError, CodegenResult};
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use regalloc::{
-    RealRegUniverse, Reg, RegClass, RegUsageCollector, RegUsageMapper, SpillSlot, VirtualReg,
-    Writable,
+    PrettyPrint, PrettyPrintSized, RealRegUniverse, Reg, RegClass, RegUsageCollector,
+    RegUsageMapper, SpillSlot, VirtualReg, Writable,
 };
 use smallvec::SmallVec;
 use std::fmt;
@@ -20,6 +20,7 @@
 #[cfg(test)]
 mod emit_tests;
 pub mod regs;
+pub mod unwind;
 
 use args::*;
 use regs::{create_reg_universe_systemv, show_ireg_sized};
@@ -70,7 +71,6 @@
         size: u8, // 1, 2, 4 or 8
         signed: bool,
         divisor: RegMem,
-        loc: SourceLoc,
     },
 
     /// The high bits (RDX) of a (un)signed multiply: RDX:RAX := RAX * rhs.
@@ -94,7 +94,6 @@
         /// different from the temporary.
         divisor: Writable<Reg>,
         tmp: Option<Writable<Reg>>,
-        loc: SourceLoc,
     },
 
     /// Do a sign-extend based on the sign of the value in rax into rdx: (cwd cdq cqo)
@@ -125,16 +124,12 @@
         ext_mode: ExtMode,
         src: RegMem,
         dst: Writable<Reg>,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// A plain 64-bit integer load, since MovZX_RM_R can't represent that.
     Mov64MR {
         src: SyntheticAmode,
         dst: Writable<Reg>,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// Loads the memory address of addr into dst.
@@ -148,8 +143,6 @@
         ext_mode: ExtMode,
         src: RegMem,
         dst: Writable<Reg>,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// Integer stores: mov (b w l q) reg addr.
@@ -157,8 +150,6 @@
         size: u8, // 1, 2, 4 or 8.
         src: Reg,
         dst: SyntheticAmode,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// Arithmetic shifts: (shl shr sar) (b w l q) imm reg.
@@ -224,8 +215,6 @@
         op: SseOpcode,
         src: RegMem,
         dst: Writable<Reg>,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// XMM (scalar or vector) unary op (from xmm to reg/mem): stores, movd, movq
@@ -233,13 +222,11 @@
         op: SseOpcode,
         src: Reg,
         dst: SyntheticAmode,
-        /// Source location, if the memory access can be out-of-bounds.
-        srcloc: Option<SourceLoc>,
     },
 
     /// XMM (vector) unary op (to move a constant value into an xmm register): movups
-    XmmLoadConstSeq {
-        val: Vec<u8>,
+    XmmLoadConst {
+        src: VCodeConstant,
         dst: Writable<Reg>,
         ty: Type,
     },
@@ -287,7 +274,6 @@
         dst: Writable<Reg>,
         tmp_gpr: Writable<Reg>,
         tmp_xmm: Writable<Reg>,
-        srcloc: SourceLoc,
     },
 
     /// Converts a scalar xmm to an unsigned int32/int64.
@@ -303,7 +289,6 @@
         dst: Writable<Reg>,
         tmp_gpr: Writable<Reg>,
         tmp_xmm: Writable<Reg>,
-        srcloc: SourceLoc,
     },
 
     /// A sequence to compute min/max with the proper NaN semantics for xmm registers.
@@ -347,7 +332,6 @@
         dest: ExternalName,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: Opcode,
     },
 
@@ -356,7 +340,6 @@
         dest: RegMem,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: Opcode,
     },
 
@@ -368,7 +351,7 @@
     EpiloguePlaceholder,
 
     /// Jump to a known target: jmp simm32.
-    JmpKnown { dst: BranchTarget },
+    JmpKnown { dst: MachLabel },
 
     /// One-way conditional branch: jcond cond target.
     ///
@@ -378,14 +361,14 @@
     /// A note of caution: in contexts where the branch target is another block, this has to be the
     /// same successor as the one specified in the terminator branch of the current block.
     /// Otherwise, this might confuse register allocation by creating new invisible edges.
-    JmpIf { cc: CC, taken: BranchTarget },
+    JmpIf { cc: CC, taken: MachLabel },
 
     /// Two-way conditional branch: jcond cond target target.
     /// Emitted as a compound sequence; the MachBuffer will shrink it as appropriate.
     JmpCond {
         cc: CC,
-        taken: BranchTarget,
-        not_taken: BranchTarget,
+        taken: MachLabel,
+        not_taken: MachLabel,
     },
 
     /// Jump-table sequence, as one compound instruction (see note in lower.rs for rationale).
@@ -396,8 +379,8 @@
         idx: Reg,
         tmp1: Writable<Reg>,
         tmp2: Writable<Reg>,
-        default_target: BranchTarget,
-        targets: Vec<BranchTarget>,
+        default_target: MachLabel,
+        targets: Vec<MachLabel>,
         targets_for_term: Vec<MachLabel>,
     },
 
@@ -405,23 +388,18 @@
     JmpUnknown { target: RegMem },
 
     /// Traps if the condition code is set.
-    TrapIf {
-        cc: CC,
-        trap_code: TrapCode,
-        srcloc: SourceLoc,
-    },
+    TrapIf { cc: CC, trap_code: TrapCode },
 
     /// A debug trap.
     Hlt,
 
     /// An instruction that will always trigger the illegal instruction exception.
-    Ud2 { trap_info: (SourceLoc, TrapCode) },
+    Ud2 { trap_code: TrapCode },
 
     /// Loads an external symbol in a register, with a relocation: movabsq $name, dst
     LoadExtName {
         dst: Writable<Reg>,
         name: Box<ExternalName>,
-        srcloc: SourceLoc,
         offset: i64,
     },
 
@@ -440,7 +418,6 @@
         ty: Type, // I8, I16, I32 or I64
         src: Reg,
         dst: SyntheticAmode,
-        srcloc: Option<SourceLoc>,
     },
 
     /// A synthetic instruction, based on a loop around a native `lock cmpxchg` instruction.
@@ -469,7 +446,6 @@
     AtomicRmwSeq {
         ty: Type, // I8, I16, I32 or I64
         op: inst_common::AtomicRmwOp,
-        srcloc: Option<SourceLoc>,
     },
 
     /// A memory fence (mfence, lfence or sfence).
@@ -501,6 +477,71 @@
     xs == ((xs << 32) >> 32)
 }
 
+impl Inst {
+    fn isa_requirement(&self) -> Option<InstructionSet> {
+        match self {
+            // These instructions are part of SSE2, which is a basic requirement in Cranelift, and
+            // don't have to be checked.
+            Inst::AluRmiR { .. }
+            | Inst::AtomicRmwSeq { .. }
+            | Inst::CallKnown { .. }
+            | Inst::CallUnknown { .. }
+            | Inst::CheckedDivOrRemSeq { .. }
+            | Inst::Cmove { .. }
+            | Inst::CmpRmiR { .. }
+            | Inst::CvtFloatToSintSeq { .. }
+            | Inst::CvtFloatToUintSeq { .. }
+            | Inst::CvtUint64ToFloatSeq { .. }
+            | Inst::Div { .. }
+            | Inst::EpiloguePlaceholder
+            | Inst::Fence { .. }
+            | Inst::Hlt
+            | Inst::Imm { .. }
+            | Inst::JmpCond { .. }
+            | Inst::JmpIf { .. }
+            | Inst::JmpKnown { .. }
+            | Inst::JmpTableSeq { .. }
+            | Inst::JmpUnknown { .. }
+            | Inst::LoadEffectiveAddress { .. }
+            | Inst::LoadExtName { .. }
+            | Inst::LockCmpxchg { .. }
+            | Inst::Mov64MR { .. }
+            | Inst::MovRM { .. }
+            | Inst::MovRR { .. }
+            | Inst::MovsxRmR { .. }
+            | Inst::MovzxRmR { .. }
+            | Inst::MulHi { .. }
+            | Inst::Neg { .. }
+            | Inst::Not { .. }
+            | Inst::Nop { .. }
+            | Inst::Pop64 { .. }
+            | Inst::Push64 { .. }
+            | Inst::Ret
+            | Inst::Setcc { .. }
+            | Inst::ShiftR { .. }
+            | Inst::SignExtendData { .. }
+            | Inst::TrapIf { .. }
+            | Inst::Ud2 { .. }
+            | Inst::UnaryRmR { .. }
+            | Inst::VirtualSPOffsetAdj { .. }
+            | Inst::XmmCmove { .. }
+            | Inst::XmmCmpRmR { .. }
+            | Inst::XmmLoadConst { .. }
+            | Inst::XmmMinMaxSeq { .. }
+            | Inst::XmmUninitializedValue { .. } => None,
+
+            // These use dynamic SSE opcodes.
+            Inst::GprToXmm { op, .. }
+            | Inst::XmmMovRM { op, .. }
+            | Inst::XmmRmiReg { opcode: op, .. }
+            | Inst::XmmRmR { op, .. }
+            | Inst::XmmRmRImm { op, .. }
+            | Inst::XmmToGpr { op, .. }
+            | Inst::XmmUnaryRmR { op, .. } => Some(op.available_from()),
+        }
+    }
+}
+
 // Handy constructors for Insts.
 
 impl Inst {
@@ -549,14 +590,13 @@
         Inst::Neg { size, src }
     }
 
-    pub(crate) fn div(size: u8, signed: bool, divisor: RegMem, loc: SourceLoc) -> Inst {
+    pub(crate) fn div(size: u8, signed: bool, divisor: RegMem) -> Inst {
         divisor.assert_regclass_is(RegClass::I64);
         debug_assert!(size == 8 || size == 4 || size == 2 || size == 1);
         Inst::Div {
             size,
             signed,
             divisor,
-            loc,
         }
     }
 
@@ -571,7 +611,6 @@
         size: u8,
         divisor: Writable<Reg>,
         tmp: Option<Writable<Reg>>,
-        loc: SourceLoc,
     ) -> Inst {
         debug_assert!(size == 8 || size == 4 || size == 2 || size == 1);
         debug_assert!(divisor.to_reg().get_class() == RegClass::I64);
@@ -583,7 +622,6 @@
             size,
             divisor,
             tmp,
-            loc,
         }
     }
 
@@ -611,39 +649,23 @@
     }
 
     // TODO Can be replaced by `Inst::move` (high-level) and `Inst::unary_rm_r` (low-level)
-    pub(crate) fn xmm_mov(
-        op: SseOpcode,
-        src: RegMem,
-        dst: Writable<Reg>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn xmm_mov(op: SseOpcode, src: RegMem, dst: Writable<Reg>) -> Inst {
         src.assert_regclass_is(RegClass::V128);
         debug_assert!(dst.to_reg().get_class() == RegClass::V128);
-        Inst::XmmUnaryRmR {
-            op,
-            src,
-            dst,
-            srcloc,
-        }
+        Inst::XmmUnaryRmR { op, src, dst }
     }
 
-    pub(crate) fn xmm_load_const_seq(val: Vec<u8>, dst: Writable<Reg>, ty: Type) -> Inst {
-        debug_assert!(val.len() == 16);
+    pub(crate) fn xmm_load_const(src: VCodeConstant, dst: Writable<Reg>, ty: Type) -> Inst {
         debug_assert!(dst.to_reg().get_class() == RegClass::V128);
         debug_assert!(ty.is_vector() && ty.bits() == 128);
-        Inst::XmmLoadConstSeq { val, dst, ty }
+        Inst::XmmLoadConst { src, dst, ty }
     }
 
     /// Convenient helper for unary float operations.
     pub(crate) fn xmm_unary_rm_r(op: SseOpcode, src: RegMem, dst: Writable<Reg>) -> Inst {
         src.assert_regclass_is(RegClass::V128);
         debug_assert!(dst.to_reg().get_class() == RegClass::V128);
-        Inst::XmmUnaryRmR {
-            op,
-            src,
-            dst,
-            srcloc: None,
-        }
+        Inst::XmmUnaryRmR { op, src, dst }
     }
 
     pub(crate) fn xmm_rm_r(op: SseOpcode, src: RegMem, dst: Writable<Reg>) -> Self {
@@ -657,18 +679,12 @@
         Inst::XmmUninitializedValue { dst }
     }
 
-    pub(crate) fn xmm_mov_r_m(
-        op: SseOpcode,
-        src: Reg,
-        dst: impl Into<SyntheticAmode>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn xmm_mov_r_m(op: SseOpcode, src: Reg, dst: impl Into<SyntheticAmode>) -> Inst {
         debug_assert!(src.get_class() == RegClass::V128);
         Inst::XmmMovRM {
             op,
             src,
             dst: dst.into(),
-            srcloc,
         }
     }
 
@@ -738,7 +754,6 @@
         dst: Writable<Reg>,
         tmp_gpr: Writable<Reg>,
         tmp_xmm: Writable<Reg>,
-        srcloc: SourceLoc,
     ) -> Inst {
         debug_assert!(src.to_reg().get_class() == RegClass::V128);
         debug_assert!(tmp_xmm.to_reg().get_class() == RegClass::V128);
@@ -752,7 +767,6 @@
             dst,
             tmp_gpr,
             tmp_xmm,
-            srcloc,
         }
     }
 
@@ -764,7 +778,6 @@
         dst: Writable<Reg>,
         tmp_gpr: Writable<Reg>,
         tmp_xmm: Writable<Reg>,
-        srcloc: SourceLoc,
     ) -> Inst {
         debug_assert!(src.to_reg().get_class() == RegClass::V128);
         debug_assert!(tmp_xmm.to_reg().get_class() == RegClass::V128);
@@ -778,7 +791,6 @@
             dst,
             tmp_gpr,
             tmp_xmm,
-            srcloc,
         }
     }
 
@@ -814,20 +826,10 @@
         }
     }
 
-    pub(crate) fn movzx_rm_r(
-        ext_mode: ExtMode,
-        src: RegMem,
-        dst: Writable<Reg>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn movzx_rm_r(ext_mode: ExtMode, src: RegMem, dst: Writable<Reg>) -> Inst {
         src.assert_regclass_is(RegClass::I64);
         debug_assert!(dst.to_reg().get_class() == RegClass::I64);
-        Inst::MovzxRmR {
-            ext_mode,
-            src,
-            dst,
-            srcloc,
-        }
+        Inst::MovzxRmR { ext_mode, src, dst }
     }
 
     pub(crate) fn xmm_rmi_reg(opcode: SseOpcode, src: RegMemImm, dst: Writable<Reg>) -> Inst {
@@ -836,41 +838,26 @@
         Inst::XmmRmiReg { opcode, src, dst }
     }
 
-    pub(crate) fn movsx_rm_r(
-        ext_mode: ExtMode,
-        src: RegMem,
-        dst: Writable<Reg>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn movsx_rm_r(ext_mode: ExtMode, src: RegMem, dst: Writable<Reg>) -> Inst {
         src.assert_regclass_is(RegClass::I64);
         debug_assert!(dst.to_reg().get_class() == RegClass::I64);
-        Inst::MovsxRmR {
-            ext_mode,
-            src,
-            dst,
-            srcloc,
-        }
+        Inst::MovsxRmR { ext_mode, src, dst }
     }
 
-    pub(crate) fn mov64_m_r(
-        src: impl Into<SyntheticAmode>,
-        dst: Writable<Reg>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn mov64_m_r(src: impl Into<SyntheticAmode>, dst: Writable<Reg>) -> Inst {
         debug_assert!(dst.to_reg().get_class() == RegClass::I64);
         Inst::Mov64MR {
             src: src.into(),
             dst,
-            srcloc,
         }
     }
 
     /// A convenience function to be able to use a RegMem as the source of a move.
-    pub(crate) fn mov64_rm_r(src: RegMem, dst: Writable<Reg>, srcloc: Option<SourceLoc>) -> Inst {
+    pub(crate) fn mov64_rm_r(src: RegMem, dst: Writable<Reg>) -> Inst {
         src.assert_regclass_is(RegClass::I64);
         match src {
             RegMem::Reg { reg } => Self::mov_r_r(true, reg, dst),
-            RegMem::Mem { addr } => Self::mov64_m_r(addr, dst, srcloc),
+            RegMem::Mem { addr } => Self::mov64_m_r(addr, dst),
         }
     }
 
@@ -878,7 +865,6 @@
         size: u8, // 1, 2, 4 or 8
         src: Reg,
         dst: impl Into<SyntheticAmode>,
-        srcloc: Option<SourceLoc>,
     ) -> Inst {
         debug_assert!(size == 8 || size == 4 || size == 2 || size == 1);
         debug_assert!(src.get_class() == RegClass::I64);
@@ -886,7 +872,6 @@
             size,
             src,
             dst: dst.into(),
-            srcloc,
         }
     }
 
@@ -932,9 +917,9 @@
         Inst::CmpRmiR { size, src, dst }
     }
 
-    pub(crate) fn trap(srcloc: SourceLoc, trap_code: TrapCode) -> Inst {
+    pub(crate) fn trap(trap_code: TrapCode) -> Inst {
         Inst::Ud2 {
-            trap_info: (srcloc, trap_code),
+            trap_code: trap_code,
         }
     }
 
@@ -974,14 +959,12 @@
         dest: ExternalName,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: Opcode,
     ) -> Inst {
         Inst::CallKnown {
             dest,
             uses,
             defs,
-            loc,
             opcode,
         }
     }
@@ -990,7 +973,6 @@
         dest: RegMem,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: Opcode,
     ) -> Inst {
         dest.assert_regclass_is(RegClass::I64);
@@ -998,7 +980,6 @@
             dest,
             uses,
             defs,
-            loc,
             opcode,
         }
     }
@@ -1011,15 +992,15 @@
         Inst::EpiloguePlaceholder
     }
 
-    pub(crate) fn jmp_known(dst: BranchTarget) -> Inst {
+    pub(crate) fn jmp_known(dst: MachLabel) -> Inst {
         Inst::JmpKnown { dst }
     }
 
-    pub(crate) fn jmp_if(cc: CC, taken: BranchTarget) -> Inst {
+    pub(crate) fn jmp_if(cc: CC, taken: MachLabel) -> Inst {
         Inst::JmpIf { cc, taken }
     }
 
-    pub(crate) fn jmp_cond(cc: CC, taken: BranchTarget, not_taken: BranchTarget) -> Inst {
+    pub(crate) fn jmp_cond(cc: CC, taken: MachLabel, not_taken: MachLabel) -> Inst {
         Inst::JmpCond {
             cc,
             taken,
@@ -1032,12 +1013,8 @@
         Inst::JmpUnknown { target }
     }
 
-    pub(crate) fn trap_if(cc: CC, trap_code: TrapCode, srcloc: SourceLoc) -> Inst {
-        Inst::TrapIf {
-            cc,
-            trap_code,
-            srcloc,
-        }
+    pub(crate) fn trap_if(cc: CC, trap_code: TrapCode) -> Inst {
+        Inst::TrapIf { cc, trap_code }
     }
 
     /// Choose which instruction to use for loading a register value from memory. For loads smaller
@@ -1048,7 +1025,6 @@
         from_addr: impl Into<SyntheticAmode>,
         to_reg: Writable<Reg>,
         ext_kind: ExtKind,
-        srcloc: Option<SourceLoc>,
     ) -> Inst {
         let rc = to_reg.to_reg().get_class();
         match rc {
@@ -1064,10 +1040,10 @@
                     // Values smaller than 64 bits must be extended in some way.
                     match ext_kind {
                         ExtKind::SignExtend => {
-                            Inst::movsx_rm_r(ext_mode, RegMem::mem(from_addr), to_reg, srcloc)
+                            Inst::movsx_rm_r(ext_mode, RegMem::mem(from_addr), to_reg)
                         }
                         ExtKind::ZeroExtend => {
-                            Inst::movzx_rm_r(ext_mode, RegMem::mem(from_addr), to_reg, srcloc)
+                            Inst::movzx_rm_r(ext_mode, RegMem::mem(from_addr), to_reg)
                         }
                         ExtKind::None => panic!(
                             "expected an extension kind for extension mode: {:?}",
@@ -1076,7 +1052,7 @@
                     }
                 } else {
                     // 64-bit values can be moved directly.
-                    Inst::mov64_m_r(from_addr, to_reg, srcloc)
+                    Inst::mov64_m_r(from_addr, to_reg)
                 }
             }
             RegClass::V128 => {
@@ -1095,15 +1071,14 @@
     }
 
     /// Choose which instruction to use for storing a register value to memory.
-    pub(crate) fn store(
-        ty: Type,
-        from_reg: Reg,
-        to_addr: impl Into<SyntheticAmode>,
-        srcloc: Option<SourceLoc>,
-    ) -> Inst {
+    pub(crate) fn store(ty: Type, from_reg: Reg, to_addr: impl Into<SyntheticAmode>) -> Inst {
         let rc = from_reg.get_class();
         match rc {
-            RegClass::I64 => Inst::mov_r_m(ty.bytes() as u8, from_reg, to_addr, srcloc),
+            RegClass::I64 => {
+                // Always store the full register, to ensure that the high bits are properly set
+                // when doing a full reload.
+                Inst::mov_r_m(8 /* bytes */, from_reg, to_addr)
+            }
             RegClass::V128 => {
                 let opcode = match ty {
                     types::F32 => SseOpcode::Movss,
@@ -1113,7 +1088,7 @@
                     _ if ty.is_vector() && ty.bits() == 128 => SseOpcode::Movdqu,
                     _ => unimplemented!("unable to store type: {}", ty),
                 };
-                Inst::xmm_mov_r_m(opcode, from_reg, to_addr, srcloc)
+                Inst::xmm_mov_r_m(opcode, from_reg, to_addr)
             }
             _ => panic!("unable to generate store for register class: {:?}", rc),
         }
@@ -1160,12 +1135,69 @@
             _ => false,
         }
     }
+
+    /// Choose which instruction to use for comparing two values for equality.
+    pub(crate) fn equals(ty: Type, from: RegMem, to: Writable<Reg>) -> Inst {
+        match ty {
+            types::I8X16 | types::B8X16 => Inst::xmm_rm_r(SseOpcode::Pcmpeqb, from, to),
+            types::I16X8 | types::B16X8 => Inst::xmm_rm_r(SseOpcode::Pcmpeqw, from, to),
+            types::I32X4 | types::B32X4 => Inst::xmm_rm_r(SseOpcode::Pcmpeqd, from, to),
+            types::I64X2 | types::B64X2 => Inst::xmm_rm_r(SseOpcode::Pcmpeqq, from, to),
+            types::F32X4 => {
+                Inst::xmm_rm_r_imm(SseOpcode::Cmpps, from, to, FcmpImm::Equal.encode(), false)
+            }
+            types::F64X2 => {
+                Inst::xmm_rm_r_imm(SseOpcode::Cmppd, from, to, FcmpImm::Equal.encode(), false)
+            }
+            _ => unimplemented!("unimplemented type for Inst::equals: {}", ty),
+        }
+    }
+
+    /// Choose which instruction to use for computing a bitwise AND on two values.
+    pub(crate) fn and(ty: Type, from: RegMem, to: Writable<Reg>) -> Inst {
+        match ty {
+            types::F32X4 => Inst::xmm_rm_r(SseOpcode::Andps, from, to),
+            types::F64X2 => Inst::xmm_rm_r(SseOpcode::Andpd, from, to),
+            _ if ty.is_vector() && ty.bits() == 128 => Inst::xmm_rm_r(SseOpcode::Pand, from, to),
+            _ => unimplemented!("unimplemented type for Inst::and: {}", ty),
+        }
+    }
+
+    /// Choose which instruction to use for computing a bitwise AND NOT on two values.
+    pub(crate) fn and_not(ty: Type, from: RegMem, to: Writable<Reg>) -> Inst {
+        match ty {
+            types::F32X4 => Inst::xmm_rm_r(SseOpcode::Andnps, from, to),
+            types::F64X2 => Inst::xmm_rm_r(SseOpcode::Andnpd, from, to),
+            _ if ty.is_vector() && ty.bits() == 128 => Inst::xmm_rm_r(SseOpcode::Pandn, from, to),
+            _ => unimplemented!("unimplemented type for Inst::and_not: {}", ty),
+        }
+    }
+
+    /// Choose which instruction to use for computing a bitwise OR on two values.
+    pub(crate) fn or(ty: Type, from: RegMem, to: Writable<Reg>) -> Inst {
+        match ty {
+            types::F32X4 => Inst::xmm_rm_r(SseOpcode::Orps, from, to),
+            types::F64X2 => Inst::xmm_rm_r(SseOpcode::Orpd, from, to),
+            _ if ty.is_vector() && ty.bits() == 128 => Inst::xmm_rm_r(SseOpcode::Por, from, to),
+            _ => unimplemented!("unimplemented type for Inst::or: {}", ty),
+        }
+    }
+
+    /// Choose which instruction to use for computing a bitwise XOR on two values.
+    pub(crate) fn xor(ty: Type, from: RegMem, to: Writable<Reg>) -> Inst {
+        match ty {
+            types::F32X4 => Inst::xmm_rm_r(SseOpcode::Xorps, from, to),
+            types::F64X2 => Inst::xmm_rm_r(SseOpcode::Xorpd, from, to),
+            _ if ty.is_vector() && ty.bits() == 128 => Inst::xmm_rm_r(SseOpcode::Pxor, from, to),
+            _ => unimplemented!("unimplemented type for Inst::xor: {}", ty),
+        }
+    }
 }
 
 //=============================================================================
 // Instructions: printing
 
-impl ShowWithRRU for Inst {
+impl PrettyPrint for Inst {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         fn ljustify(s: String) -> String {
             let w = 7;
@@ -1303,7 +1335,7 @@
                 dst.show_rru(mb_rru),
             ),
 
-            Inst::XmmRmR { op, src, dst } => format!(
+            Inst::XmmRmR { op, src, dst, .. } => format!(
                 "{} {}, {}",
                 ljustify(op.to_string()),
                 src.show_rru_sized(mb_rru, 8),
@@ -1333,7 +1365,7 @@
                 show_ireg_sized(rhs_dst.to_reg(), mb_rru, 8),
             ),
 
-            Inst::XmmRmRImm { op, src, dst, imm, is64 } => format!(
+            Inst::XmmRmRImm { op, src, dst, imm, is64, .. } => format!(
                 "{} ${}, {}, {}",
                 ljustify(format!("{}{}", op.to_string(), if *is64 { ".w" } else { "" })),
                 imm,
@@ -1347,8 +1379,8 @@
                 dst.show_rru(mb_rru),
             ),
 
-            Inst::XmmLoadConstSeq { val, dst, .. } => {
-                format!("load_const ${:?}, {}", val, dst.show_rru(mb_rru),)
+            Inst::XmmLoadConst { src, dst, .. } => {
+                format!("load_const {:?}, {}", src, dst.show_rru(mb_rru),)
             }
 
             Inst::XmmToGpr {
@@ -1613,13 +1645,13 @@
             Inst::EpiloguePlaceholder => "epilogue placeholder".to_string(),
 
             Inst::JmpKnown { dst } => {
-                format!("{} {}", ljustify("jmp".to_string()), dst.show_rru(mb_rru))
+                format!("{} {}", ljustify("jmp".to_string()), dst.to_string())
             }
 
             Inst::JmpIf { cc, taken } => format!(
                 "{} {}",
                 ljustify2("j".to_string(), cc.to_string()),
-                taken.show_rru(mb_rru),
+                taken.to_string(),
             ),
 
             Inst::JmpCond {
@@ -1629,8 +1661,8 @@
             } => format!(
                 "{} {}; j {}",
                 ljustify2("j".to_string(), cc.to_string()),
-                taken.show_rru(mb_rru),
-                not_taken.show_rru(mb_rru)
+                taken.to_string(),
+                not_taken.to_string()
             ),
 
             Inst::JmpTableSeq { idx, .. } => {
@@ -1681,7 +1713,7 @@
 
             Inst::Hlt => "hlt".into(),
 
-            Inst::Ud2 { trap_info } => format!("ud2 {}", trap_info.1),
+            Inst::Ud2 { trap_code } => format!("ud2 {}", trap_code),
         }
     }
 }
@@ -1778,7 +1810,7 @@
             }
         }
         Inst::XmmUninitializedValue { dst } => collector.add_def(*dst),
-        Inst::XmmLoadConstSeq { dst, .. } => collector.add_def(*dst),
+        Inst::XmmLoadConst { dst, .. } => collector.add_def(*dst),
         Inst::XmmMinMaxSeq { lhs, rhs_dst, .. } => {
             collector.add_use(*lhs);
             collector.add_mod(*rhs_dst);
@@ -2115,7 +2147,7 @@
         Inst::XmmUninitializedValue { ref mut dst, .. } => {
             map_def(mapper, dst);
         }
-        Inst::XmmLoadConstSeq { ref mut dst, .. } => {
+        Inst::XmmLoadConst { ref mut dst, .. } => {
             map_def(mapper, dst);
         }
         Inst::XmmMinMaxSeq {
@@ -2380,10 +2412,10 @@
         match self {
             // Interesting cases.
             &Self::Ret | &Self::EpiloguePlaceholder => MachTerminator::Ret,
-            &Self::JmpKnown { dst } => MachTerminator::Uncond(dst.as_label().unwrap()),
+            &Self::JmpKnown { dst } => MachTerminator::Uncond(dst),
             &Self::JmpCond {
                 taken, not_taken, ..
-            } => MachTerminator::Cond(taken.as_label().unwrap(), not_taken.as_label().unwrap()),
+            } => MachTerminator::Cond(taken, not_taken),
             &Self::JmpTableSeq {
                 ref targets_for_term,
                 ..
@@ -2401,10 +2433,12 @@
         match rc_dst {
             RegClass::I64 => Inst::mov_r_r(true, src_reg, dst_reg),
             RegClass::V128 => {
+                // The Intel optimization manual, in "3.5.1.13 Zero-Latency MOV Instructions",
+                // doesn't include MOVSS/MOVSD as instructions with zero-latency. Use movaps for
+                // those, which may write more lanes that we need, but are specified to have
+                // zero-latency.
                 let opcode = match ty {
-                    types::F32 => SseOpcode::Movss,
-                    types::F64 => SseOpcode::Movsd,
-                    types::F32X4 => SseOpcode::Movaps,
+                    types::F32 | types::F64 | types::F32X4 => SseOpcode::Movaps,
                     types::F64X2 => SseOpcode::Movapd,
                     _ if ty.is_vector() && ty.bits() == 128 => SseOpcode::Movdqa,
                     _ => unimplemented!("unable to move type: {}", ty),
@@ -2419,8 +2453,8 @@
         Inst::Nop { len: 0 }
     }
 
-    fn gen_nop(_preferred_size: usize) -> Inst {
-        unimplemented!()
+    fn gen_nop(preferred_size: usize) -> Inst {
+        Inst::nop((preferred_size % 16) as u8)
     }
 
     fn maybe_direct_reload(&self, _reg: VirtualReg, _slot: SpillSlot) -> Option<Inst> {
@@ -2451,7 +2485,7 @@
     }
 
     fn gen_jump(label: MachLabel) -> Inst {
-        Inst::jmp_known(BranchTarget::Label(label))
+        Inst::jmp_known(label)
     }
 
     fn gen_constant<F: FnMut(RegClass, Type) -> Writable<Reg>>(
@@ -2522,7 +2556,7 @@
             } else {
                 ret.push(Inst::imm(
                     OperandSize::from_bytes(ty.bytes()),
-                    value,
+                    value.into(),
                     to_reg,
                 ));
             }
@@ -2555,13 +2589,35 @@
     pub(crate) nominal_sp_to_fp: i64,
     /// Safepoint stack map for upcoming instruction, as provided to `pre_safepoint()`.
     stack_map: Option<StackMap>,
+    /// Current source location.
+    cur_srcloc: SourceLoc,
+}
+
+/// Constant state used during emissions of a sequence of instructions.
+pub struct EmitInfo {
+    flags: settings::Flags,
+    isa_flags: x64_settings::Flags,
+}
+
+impl EmitInfo {
+    pub(crate) fn new(flags: settings::Flags, isa_flags: x64_settings::Flags) -> Self {
+        Self { flags, isa_flags }
+    }
+}
+
+impl MachInstEmitInfo for EmitInfo {
+    fn flags(&self) -> &Flags {
+        &self.flags
+    }
 }
 
 impl MachInstEmit for Inst {
     type State = EmitState;
+    type Info = EmitInfo;
+    type UnwindInfo = unwind::X64UnwindInfo;
 
-    fn emit(&self, sink: &mut MachBuffer<Inst>, flags: &settings::Flags, state: &mut Self::State) {
-        emit::emit(self, sink, flags, state);
+    fn emit(&self, sink: &mut MachBuffer<Inst>, info: &Self::Info, state: &mut Self::State) {
+        emit::emit(self, sink, info, state);
     }
 
     fn pretty_print(&self, mb_rru: Option<&RealRegUniverse>, _: &mut Self::State) -> String {
@@ -2575,12 +2631,17 @@
             virtual_sp_offset: 0,
             nominal_sp_to_fp: abi.frame_size() as i64,
             stack_map: None,
+            cur_srcloc: SourceLoc::default(),
         }
     }
 
     fn pre_safepoint(&mut self, stack_map: StackMap) {
         self.stack_map = Some(stack_map);
     }
+
+    fn pre_sourceloc(&mut self, srcloc: SourceLoc) {
+        self.cur_srcloc = srcloc;
+    }
 }
 
 impl EmitState {
@@ -2591,6 +2652,10 @@
     fn clear_post_insn(&mut self) {
         self.stack_map = None;
     }
+
+    fn cur_srcloc(&self) -> SourceLoc {
+        self.cur_srcloc
+    }
 }
 
 /// A label-use (internal relocation) in generated code.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/regs.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/regs.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/regs.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/regs.rs	2021-01-18 19:58:25.000000000 +0000
@@ -10,9 +10,11 @@
 //! Also, they will have to be ABI dependent.  Need to find a way to avoid constructing a universe
 //! for each function we compile.
 
-use crate::{machinst::pretty_print::ShowWithRRU, settings};
+use crate::settings;
 use alloc::vec::Vec;
-use regalloc::{RealReg, RealRegUniverse, Reg, RegClass, RegClassInfo, NUM_REG_CLASSES};
+use regalloc::{
+    PrettyPrint, RealReg, RealRegUniverse, Reg, RegClass, RegClassInfo, NUM_REG_CLASSES,
+};
 use std::string::String;
 
 // Hardware encodings for a few registers.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind/systemv.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind/systemv.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind/systemv.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind/systemv.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,204 @@
+//! Unwind information for System V ABI (x86-64).
+
+use crate::isa::unwind::input;
+use crate::isa::unwind::systemv::{RegisterMappingError, UnwindInfo};
+use crate::result::CodegenResult;
+use gimli::{write::CommonInformationEntry, Encoding, Format, Register, X86_64};
+use regalloc::{Reg, RegClass};
+
+/// Creates a new x86-64 common information entry (CIE).
+pub fn create_cie() -> CommonInformationEntry {
+    use gimli::write::CallFrameInstruction;
+
+    let mut entry = CommonInformationEntry::new(
+        Encoding {
+            address_size: 8,
+            format: Format::Dwarf32,
+            version: 1,
+        },
+        1,  // Code alignment factor
+        -8, // Data alignment factor
+        X86_64::RA,
+    );
+
+    // Every frame will start with the call frame address (CFA) at RSP+8
+    // It is +8 to account for the push of the return address by the call instruction
+    entry.add_instruction(CallFrameInstruction::Cfa(X86_64::RSP, 8));
+
+    // Every frame will start with the return address at RSP (CFA-8 = RSP+8-8 = RSP)
+    entry.add_instruction(CallFrameInstruction::Offset(X86_64::RA, -8));
+
+    entry
+}
+
+/// Map Cranelift registers to their corresponding Gimli registers.
+pub fn map_reg(reg: Reg) -> Result<Register, RegisterMappingError> {
+    // Mapping from https://github.com/bytecodealliance/cranelift/pull/902 by @iximeow
+    const X86_GP_REG_MAP: [gimli::Register; 16] = [
+        X86_64::RAX,
+        X86_64::RCX,
+        X86_64::RDX,
+        X86_64::RBX,
+        X86_64::RSP,
+        X86_64::RBP,
+        X86_64::RSI,
+        X86_64::RDI,
+        X86_64::R8,
+        X86_64::R9,
+        X86_64::R10,
+        X86_64::R11,
+        X86_64::R12,
+        X86_64::R13,
+        X86_64::R14,
+        X86_64::R15,
+    ];
+    const X86_XMM_REG_MAP: [gimli::Register; 16] = [
+        X86_64::XMM0,
+        X86_64::XMM1,
+        X86_64::XMM2,
+        X86_64::XMM3,
+        X86_64::XMM4,
+        X86_64::XMM5,
+        X86_64::XMM6,
+        X86_64::XMM7,
+        X86_64::XMM8,
+        X86_64::XMM9,
+        X86_64::XMM10,
+        X86_64::XMM11,
+        X86_64::XMM12,
+        X86_64::XMM13,
+        X86_64::XMM14,
+        X86_64::XMM15,
+    ];
+
+    match reg.get_class() {
+        RegClass::I64 => {
+            // x86 GP registers have a weird mapping to DWARF registers, so we use a
+            // lookup table.
+            Ok(X86_GP_REG_MAP[reg.get_hw_encoding() as usize])
+        }
+        RegClass::V128 => Ok(X86_XMM_REG_MAP[reg.get_hw_encoding() as usize]),
+        _ => Err(RegisterMappingError::UnsupportedRegisterBank("class?")),
+    }
+}
+
+pub(crate) fn create_unwind_info(
+    unwind: input::UnwindInfo<Reg>,
+) -> CodegenResult<Option<UnwindInfo>> {
+    struct RegisterMapper;
+    impl crate::isa::unwind::systemv::RegisterMapper<Reg> for RegisterMapper {
+        fn map(&self, reg: Reg) -> Result<u16, RegisterMappingError> {
+            Ok(map_reg(reg)?.0)
+        }
+        fn sp(&self) -> u16 {
+            X86_64::RSP.0
+        }
+    }
+    let map = RegisterMapper;
+
+    Ok(Some(UnwindInfo::build(unwind, &map)?))
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::cursor::{Cursor, FuncCursor};
+    use crate::ir::{
+        types, AbiParam, ExternalName, Function, InstBuilder, Signature, StackSlotData,
+        StackSlotKind,
+    };
+    use crate::isa::{lookup, CallConv};
+    use crate::settings::{builder, Flags};
+    use crate::Context;
+    use gimli::write::Address;
+    use std::str::FromStr;
+    use target_lexicon::triple;
+
+    #[test]
+    fn test_simple_func() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::SystemV,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 64)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let fde = match context
+            .create_unwind_info(isa.as_ref())
+            .expect("can create unwind info")
+        {
+            Some(crate::isa::unwind::UnwindInfo::SystemV(info)) => {
+                info.to_fde(Address::Constant(1234))
+            }
+            _ => panic!("expected unwind information"),
+        };
+
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(1234), length: 13, lsda: None, instructions: [(1, CfaOffset(16)), (1, Offset(Register(6), -16)), (4, CfaRegister(Register(6)))] }");
+    }
+
+    fn create_function(call_conv: CallConv, stack_slot: Option<StackSlotData>) -> Function {
+        let mut func =
+            Function::with_name_signature(ExternalName::user(0, 0), Signature::new(call_conv));
+
+        let block0 = func.dfg.make_block();
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().return_(&[]);
+
+        if let Some(stack_slot) = stack_slot {
+            func.stack_slots.push(stack_slot);
+        }
+
+        func
+    }
+
+    #[test]
+    fn test_multi_return_func() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_multi_return_function(CallConv::SystemV));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let fde = match context
+            .create_unwind_info(isa.as_ref())
+            .expect("can create unwind info")
+        {
+            Some(crate::isa::unwind::UnwindInfo::SystemV(info)) => {
+                info.to_fde(Address::Constant(4321))
+            }
+            _ => panic!("expected unwind information"),
+        };
+
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(4321), length: 23, lsda: None, instructions: [(1, CfaOffset(16)), (1, Offset(Register(6), -16)), (4, CfaRegister(Register(6))), (16, RememberState), (18, RestoreState)] }");
+    }
+
+    fn create_multi_return_function(call_conv: CallConv) -> Function {
+        let mut sig = Signature::new(call_conv);
+        sig.params.push(AbiParam::new(types::I32));
+        let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+
+        let block0 = func.dfg.make_block();
+        let v0 = func.dfg.append_block_param(block0, types::I32);
+        let block1 = func.dfg.make_block();
+        let block2 = func.dfg.make_block();
+
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().brnz(v0, block2, &[]);
+        pos.ins().jump(block1, &[]);
+
+        pos.insert_block(block1);
+        pos.ins().return_(&[]);
+
+        pos.insert_block(block2);
+        pos.ins().return_(&[]);
+
+        func
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/inst/unwind.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,125 @@
+use crate::isa::unwind::input::UnwindInfo;
+use crate::isa::x64::inst::{
+    args::{AluRmiROpcode, Amode, RegMemImm, SyntheticAmode},
+    regs, Inst,
+};
+use crate::machinst::{UnwindInfoContext, UnwindInfoGenerator};
+use crate::result::CodegenResult;
+use alloc::vec::Vec;
+use regalloc::Reg;
+
+#[cfg(feature = "unwind")]
+pub(crate) mod systemv;
+
+pub struct X64UnwindInfo;
+
+impl UnwindInfoGenerator<Inst> for X64UnwindInfo {
+    fn create_unwind_info(
+        context: UnwindInfoContext<Inst>,
+    ) -> CodegenResult<Option<UnwindInfo<Reg>>> {
+        use crate::isa::unwind::input::{self, UnwindCode};
+        let mut codes = Vec::new();
+        const WORD_SIZE: u8 = 8;
+
+        for i in context.prologue.clone() {
+            let i = i as usize;
+            let inst = &context.insts[i];
+            let offset = context.insts_layout[i];
+
+            match inst {
+                Inst::Push64 {
+                    src: RegMemImm::Reg { reg },
+                } => {
+                    codes.push((
+                        offset,
+                        UnwindCode::StackAlloc {
+                            size: WORD_SIZE.into(),
+                        },
+                    ));
+                    codes.push((
+                        offset,
+                        UnwindCode::SaveRegister {
+                            reg: *reg,
+                            stack_offset: 0,
+                        },
+                    ));
+                }
+                Inst::MovRR { src, dst, .. } => {
+                    if *src == regs::rsp() {
+                        codes.push((offset, UnwindCode::SetFramePointer { reg: dst.to_reg() }));
+                    }
+                }
+                Inst::AluRmiR {
+                    is_64: true,
+                    op: AluRmiROpcode::Sub,
+                    src: RegMemImm::Imm { simm32 },
+                    dst,
+                    ..
+                } if dst.to_reg() == regs::rsp() => {
+                    let imm = *simm32;
+                    codes.push((offset, UnwindCode::StackAlloc { size: imm }));
+                }
+                Inst::MovRM {
+                    src,
+                    dst: SyntheticAmode::Real(Amode::ImmReg { simm32, base, .. }),
+                    ..
+                } if *base == regs::rsp() => {
+                    // `mov reg, imm(rsp)`
+                    let imm = *simm32;
+                    codes.push((
+                        offset,
+                        UnwindCode::SaveRegister {
+                            reg: *src,
+                            stack_offset: imm,
+                        },
+                    ));
+                }
+                Inst::AluRmiR {
+                    is_64: true,
+                    op: AluRmiROpcode::Add,
+                    src: RegMemImm::Imm { simm32 },
+                    dst,
+                    ..
+                } if dst.to_reg() == regs::rsp() => {
+                    let imm = *simm32;
+                    codes.push((offset, UnwindCode::StackDealloc { size: imm }));
+                }
+                _ => {}
+            }
+        }
+
+        let last_epilogue_end = context.len;
+        let epilogues_unwind_codes = context
+            .epilogues
+            .iter()
+            .map(|epilogue| {
+                // TODO add logic to process epilogue instruction instead of
+                // returning empty array.
+                let end = epilogue.end as usize - 1;
+                let end_offset = context.insts_layout[end];
+                if end_offset == last_epilogue_end {
+                    // Do not remember/restore for very last epilogue.
+                    return vec![];
+                }
+
+                let start = epilogue.start as usize;
+                let offset = context.insts_layout[start];
+                vec![
+                    (offset, UnwindCode::RememberState),
+                    // TODO epilogue instructions
+                    (end_offset, UnwindCode::RestoreState),
+                ]
+            })
+            .collect();
+
+        let prologue_size = context.insts_layout[context.prologue.end as usize];
+        Ok(Some(input::UnwindInfo {
+            prologue_size,
+            prologue_unwind_codes: codes,
+            epilogues_unwind_codes,
+            function_size: context.len,
+            word_size: WORD_SIZE,
+            initial_sp_offset: WORD_SIZE,
+        }))
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/lower.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/lower.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/lower.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/lower.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,5 +1,6 @@
 //! Lowering rules for X64.
 
+use crate::data_value::DataValue;
 use crate::ir::{
     condcodes::FloatCC, condcodes::IntCC, types, AbiParam, ArgumentPurpose, ExternalName,
     Inst as IRInst, InstructionData, LibCall, Opcode, Signature, Type,
@@ -69,6 +70,25 @@
     })
 }
 
+/// Returns whether the given specified `input` is a result produced by an instruction with any of
+/// the opcodes specified in `ops`.
+fn matches_input_any<C: LowerCtx<I = Inst>>(
+    ctx: &mut C,
+    input: InsnInput,
+    ops: &[Opcode],
+) -> Option<IRInst> {
+    let inputs = ctx.get_input(input.insn, input.input);
+    inputs.inst.and_then(|(src_inst, _)| {
+        let data = ctx.data(src_inst);
+        for &op in ops {
+            if data.opcode() == op {
+                return Some(src_inst);
+            }
+        }
+        None
+    })
+}
+
 fn lowerinput_to_reg(ctx: Ctx, input: LowerInput) -> Reg {
     ctx.use_input_reg(input);
     input.reg
@@ -136,14 +156,10 @@
     let dst = ctx.alloc_tmp(RegClass::I64, requested_ty);
     match ext_spec {
         ExtSpec::ZeroExtendTo32 | ExtSpec::ZeroExtendTo64 => {
-            ctx.emit(Inst::movzx_rm_r(
-                ext_mode, src, dst, /* infallible */ None,
-            ))
+            ctx.emit(Inst::movzx_rm_r(ext_mode, src, dst))
         }
         ExtSpec::SignExtendTo32 | ExtSpec::SignExtendTo64 => {
-            ctx.emit(Inst::movsx_rm_r(
-                ext_mode, src, dst, /* infallible */ None,
-            ))
+            ctx.emit(Inst::movsx_rm_r(ext_mode, src, dst))
         }
     }
     dst.to_reg()
@@ -384,9 +400,9 @@
     // TODO avoid recreating signatures for every single Libcall function.
     let call_conv = CallConv::for_libcall(flags, CallConv::triple_default(triple));
     let sig = make_libcall_sig(ctx, insn, call_conv, types::I64);
+    let caller_conv = ctx.abi().call_conv();
 
-    let loc = ctx.srcloc(insn);
-    let mut abi = X64ABICaller::from_func(&sig, &extname, dist, loc)?;
+    let mut abi = X64ABICaller::from_func(&sig, &extname, dist, caller_conv)?;
 
     abi.emit_stack_pre_adjust(ctx);
 
@@ -444,9 +460,14 @@
 ///
 /// Note: the 32-bit offset in Cranelift has to be sign-extended, which maps x86's behavior.
 fn lower_to_amode<C: LowerCtx<I = Inst>>(ctx: &mut C, spec: InsnInput, offset: i32) -> Amode {
+    let flags = ctx
+        .memflags(spec.insn)
+        .expect("Instruction with amode should have memflags");
+
     // We now either have an add that we must materialize, or some other input; as well as the
     // final offset.
     if let Some(add) = matches_input(ctx, spec, Opcode::Iadd) {
+        debug_assert_eq!(ctx.output_ty(add, 0), types::I64);
         let add_inputs = &[
             InsnInput {
                 insn: add,
@@ -478,11 +499,37 @@
             )
         } else {
             for i in 0..=1 {
-                if let Some(cst) = ctx.get_input(add, i).constant {
+                let input = ctx.get_input(add, i);
+
+                // Try to pierce through uextend.
+                if let Some(uextend) = matches_input(
+                    ctx,
+                    InsnInput {
+                        insn: add,
+                        input: i,
+                    },
+                    Opcode::Uextend,
+                ) {
+                    if let Some(cst) = ctx.get_input(uextend, 0).constant {
+                        // Zero the upper bits.
+                        let input_size = ctx.input_ty(uextend, 0).bits() as u64;
+                        let shift: u64 = 64 - input_size;
+                        let uext_cst: u64 = (cst << shift) >> shift;
+
+                        let final_offset = (offset as i64).wrapping_add(uext_cst as i64);
+                        if low32_will_sign_extend_to_64(final_offset as u64) {
+                            let base = put_input_in_reg(ctx, add_inputs[1 - i]);
+                            return Amode::imm_reg(final_offset as u32, base).with_flags(flags);
+                        }
+                    }
+                }
+
+                // If it's a constant, add it directly!
+                if let Some(cst) = input.constant {
                     let final_offset = (offset as i64).wrapping_add(cst as i64);
                     if low32_will_sign_extend_to_64(final_offset as u64) {
                         let base = put_input_in_reg(ctx, add_inputs[1 - i]);
-                        return Amode::imm_reg(final_offset as u32, base);
+                        return Amode::imm_reg(final_offset as u32, base).with_flags(flags);
                     }
                 }
             }
@@ -494,11 +541,11 @@
             )
         };
 
-        return Amode::imm_reg_reg_shift(offset as u32, base, index, shift);
+        return Amode::imm_reg_reg_shift(offset as u32, base, index, shift).with_flags(flags);
     }
 
     let input = put_input_in_reg(ctx, spec);
-    Amode::imm_reg(offset as u32, input)
+    Amode::imm_reg(offset as u32, input).with_flags(flags)
 }
 
 //=============================================================================
@@ -544,6 +591,8 @@
         | Opcode::SaddSat
         | Opcode::UaddSat
         | Opcode::Isub
+        | Opcode::SsubSat
+        | Opcode::UsubSat
         | Opcode::Imul
         | Opcode::AvgRound
         | Opcode::Band
@@ -576,6 +625,16 @@
                         types::I64X2 => SseOpcode::Psubq,
                         _ => panic!("Unsupported type for packed isub instruction: {}", ty),
                     },
+                    Opcode::SsubSat => match ty {
+                        types::I8X16 => SseOpcode::Psubsb,
+                        types::I16X8 => SseOpcode::Psubsw,
+                        _ => panic!("Unsupported type for packed ssub_sat instruction: {}", ty),
+                    },
+                    Opcode::UsubSat => match ty {
+                        types::I8X16 => SseOpcode::Psubusb,
+                        types::I16X8 => SseOpcode::Psubusw,
+                        _ => panic!("Unsupported type for packed usub_sat instruction: {}", ty),
+                    },
                     Opcode::Imul => match ty {
                         types::I16X8 => SseOpcode::Pmullw,
                         types::I32X4 => SseOpcode::Pmulld,
@@ -687,6 +746,21 @@
                         types::I16X8 => SseOpcode::Pavgw,
                         _ => panic!("Unsupported type for packed avg_round instruction: {}", ty),
                     },
+                    Opcode::Band => match ty {
+                        types::F32X4 => SseOpcode::Andps,
+                        types::F64X2 => SseOpcode::Andpd,
+                        _ => SseOpcode::Pand,
+                    },
+                    Opcode::Bor => match ty {
+                        types::F32X4 => SseOpcode::Orps,
+                        types::F64X2 => SseOpcode::Orpd,
+                        _ => SseOpcode::Por,
+                    },
+                    Opcode::Bxor => match ty {
+                        types::F32X4 => SseOpcode::Xorps,
+                        types::F64X2 => SseOpcode::Xorpd,
+                        _ => SseOpcode::Pxor,
+                    },
                     _ => panic!("Unsupported packed instruction: {}", op),
                 };
                 let lhs = put_input_in_reg(ctx, inputs[0]);
@@ -739,6 +813,23 @@
             }
         }
 
+        Opcode::BandNot => {
+            let ty = ty.unwrap();
+            debug_assert!(ty.is_vector() && ty.bytes() == 16);
+            let lhs = input_to_reg_mem(ctx, inputs[0]);
+            let rhs = put_input_in_reg(ctx, inputs[1]);
+            let dst = get_output_reg(ctx, outputs[0]);
+            let sse_op = match ty {
+                types::F32X4 => SseOpcode::Andnps,
+                types::F64X2 => SseOpcode::Andnpd,
+                _ => SseOpcode::Pandn,
+            };
+            // Note the flipping of operands: the `rhs` operand is used as the destination instead
+            // of the `lhs` as in the other bit operations above (e.g. `band`).
+            ctx.emit(Inst::gen_move(dst, rhs, ty));
+            ctx.emit(Inst::xmm_rm_r(sse_op, lhs, dst));
+        }
+
         Opcode::Iabs => {
             let src = input_to_reg_mem(ctx, inputs[0]);
             let dst = get_output_reg(ctx, outputs[0]);
@@ -800,19 +891,45 @@
 
         Opcode::Bnot => {
             let ty = ty.unwrap();
+            let size = ty.bytes() as u8;
+            let src = put_input_in_reg(ctx, inputs[0]);
+            let dst = get_output_reg(ctx, outputs[0]);
+            ctx.emit(Inst::gen_move(dst, src, ty));
+
             if ty.is_vector() {
-                unimplemented!("vector bnot");
+                let tmp = ctx.alloc_tmp(RegClass::V128, ty);
+                ctx.emit(Inst::equals(ty, RegMem::from(tmp), tmp));
+                ctx.emit(Inst::xor(ty, RegMem::from(tmp), dst));
             } else if ty.is_bool() {
                 unimplemented!("bool bnot")
             } else {
-                let size = ty.bytes() as u8;
-                let src = put_input_in_reg(ctx, inputs[0]);
-                let dst = get_output_reg(ctx, outputs[0]);
-                ctx.emit(Inst::gen_move(dst, src, ty));
                 ctx.emit(Inst::not(size, dst));
             }
         }
 
+        Opcode::Bitselect => {
+            let ty = ty.unwrap();
+            let condition = put_input_in_reg(ctx, inputs[0]);
+            let if_true = put_input_in_reg(ctx, inputs[1]);
+            let if_false = input_to_reg_mem(ctx, inputs[2]);
+            let dst = get_output_reg(ctx, outputs[0]);
+
+            if ty.is_vector() {
+                let tmp1 = ctx.alloc_tmp(RegClass::V128, ty);
+                ctx.emit(Inst::gen_move(tmp1, if_true, ty));
+                ctx.emit(Inst::and(ty, RegMem::reg(condition.clone()), tmp1));
+
+                let tmp2 = ctx.alloc_tmp(RegClass::V128, ty);
+                ctx.emit(Inst::gen_move(tmp2, condition, ty));
+                ctx.emit(Inst::and_not(ty, if_false, tmp2));
+
+                ctx.emit(Inst::gen_move(dst, tmp2.to_reg(), ty));
+                ctx.emit(Inst::or(ty, RegMem::from(tmp1), dst));
+            } else {
+                unimplemented!("scalar bitselect")
+            }
+        }
+
         Opcode::Ishl | Opcode::Ushr | Opcode::Sshr | Opcode::Rotl | Opcode::Rotr => {
             let dst_ty = ctx.output_ty(insn, 0);
             debug_assert_eq!(ctx.input_ty(insn, 0), dst_ty);
@@ -1018,7 +1135,7 @@
                 let cst = ctx.alloc_tmp(RegClass::I64, types::I64);
 
                 // mov src, tmp1
-                ctx.emit(Inst::mov64_rm_r(src.clone(), tmp1, None));
+                ctx.emit(Inst::mov64_rm_r(src.clone(), tmp1));
 
                 // shr $1, tmp1
                 ctx.emit(Inst::shift_r(
@@ -1040,7 +1157,7 @@
                 ));
 
                 // mov src, tmp2
-                ctx.emit(Inst::mov64_rm_r(src, tmp2, None));
+                ctx.emit(Inst::mov64_rm_r(src, tmp2));
 
                 // sub tmp1, tmp2
                 ctx.emit(Inst::alu_rmi_r(
@@ -1099,7 +1216,7 @@
                 ));
 
                 // mov tmp2, dst
-                ctx.emit(Inst::mov64_rm_r(RegMem::reg(tmp2.to_reg()), dst, None));
+                ctx.emit(Inst::mov64_rm_r(RegMem::reg(tmp2.to_reg()), dst));
 
                 // shr $4, dst
                 ctx.emit(Inst::shift_r(8, ShiftKind::ShiftRightLogical, Some(4), dst));
@@ -1149,7 +1266,7 @@
                 let tmp2 = ctx.alloc_tmp(RegClass::I64, types::I64);
 
                 // mov src, tmp1
-                ctx.emit(Inst::mov64_rm_r(src.clone(), tmp1, None));
+                ctx.emit(Inst::mov64_rm_r(src.clone(), tmp1));
 
                 // shr $1, tmp1
                 ctx.emit(Inst::shift_r(
@@ -1168,7 +1285,7 @@
                 ));
 
                 // mov src, tmp2
-                ctx.emit(Inst::mov64_rm_r(src, tmp2, None));
+                ctx.emit(Inst::mov64_rm_r(src, tmp2));
 
                 // sub tmp1, tmp2
                 ctx.emit(Inst::alu_rmi_r(
@@ -1227,7 +1344,7 @@
                 ));
 
                 // mov tmp2, dst
-                ctx.emit(Inst::mov64_rm_r(RegMem::reg(tmp2.to_reg()), dst, None));
+                ctx.emit(Inst::mov64_rm_r(RegMem::reg(tmp2.to_reg()), dst));
 
                 // shr $4, dst
                 ctx.emit(Inst::shift_r(4, ShiftKind::ShiftRightLogical, Some(4), dst));
@@ -1298,41 +1415,63 @@
             let src_ty = ctx.input_ty(insn, 0);
             let dst_ty = ctx.output_ty(insn, 0);
 
+            // Sextend requires a sign-extended move, but all the other opcodes are simply a move
+            // from a zero-extended source. Here is why this works, in each case:
+            //
+            // - Bint: Bool-to-int. We always represent a bool as a 0 or 1, so we merely need to
+            // zero-extend here.
+            //
+            // - Breduce, Bextend: changing width of a boolean. We represent a bool as a 0 or 1, so
+            // again, this is a zero-extend / no-op.
+            //
+            // - Ireduce: changing width of an integer. Smaller ints are stored with undefined
+            // high-order bits, so we can simply do a copy.
+
+            if src_ty == types::I32 && dst_ty == types::I64 && op != Opcode::Sextend {
+                // As a particular x64 extra-pattern matching opportunity, all the ALU opcodes on
+                // 32-bits will zero-extend the upper 32-bits, so we can even not generate a
+                // zero-extended move in this case.
+                // TODO add loads and shifts here.
+                if let Some(_) = matches_input_any(
+                    ctx,
+                    inputs[0],
+                    &[
+                        Opcode::Iadd,
+                        Opcode::IaddIfcout,
+                        Opcode::Isub,
+                        Opcode::Imul,
+                        Opcode::Band,
+                        Opcode::Bor,
+                        Opcode::Bxor,
+                    ],
+                ) {
+                    let src = put_input_in_reg(ctx, inputs[0]);
+                    let dst = get_output_reg(ctx, outputs[0]);
+                    ctx.emit(Inst::gen_move(dst, src, types::I64));
+                    return Ok(());
+                }
+            }
+
             let src = input_to_reg_mem(ctx, inputs[0]);
             let dst = get_output_reg(ctx, outputs[0]);
 
             let ext_mode = ExtMode::new(src_ty.bits(), dst_ty.bits());
-            assert!(
-                (src_ty.bits() < dst_ty.bits() && ext_mode.is_some()) || ext_mode.is_none(),
+            assert_eq!(
+                src_ty.bits() < dst_ty.bits(),
+                ext_mode.is_some(),
                 "unexpected extension: {} -> {}",
                 src_ty,
                 dst_ty
             );
 
-            // All of these other opcodes are simply a move from a zero-extended source.  Here
-            // is why this works, in each case:
-            //
-            // - Bint: Bool-to-int. We always represent a bool as a 0 or 1, so we
-            //   merely need to zero-extend here.
-            //
-            // - Breduce, Bextend: changing width of a boolean. We represent a
-            //   bool as a 0 or 1, so again, this is a zero-extend / no-op.
-            //
-            // - Ireduce: changing width of an integer. Smaller ints are stored
-            //   with undefined high-order bits, so we can simply do a copy.
-
             if let Some(ext_mode) = ext_mode {
                 if op == Opcode::Sextend {
-                    ctx.emit(Inst::movsx_rm_r(
-                        ext_mode, src, dst, /* infallible */ None,
-                    ));
+                    ctx.emit(Inst::movsx_rm_r(ext_mode, src, dst));
                 } else {
-                    ctx.emit(Inst::movzx_rm_r(
-                        ext_mode, src, dst, /* infallible */ None,
-                    ));
+                    ctx.emit(Inst::movzx_rm_r(ext_mode, src, dst));
                 }
             } else {
-                ctx.emit(Inst::mov64_rm_r(src, dst, /* infallible */ None));
+                ctx.emit(Inst::mov64_rm_r(src, dst));
             }
         }
 
@@ -1557,7 +1696,7 @@
         }
 
         Opcode::Call | Opcode::CallIndirect => {
-            let loc = ctx.srcloc(insn);
+            let caller_conv = ctx.abi().call_conv();
             let (mut abi, inputs) = match op {
                 Opcode::Call => {
                     let (extname, dist) = ctx.call_target(insn).unwrap();
@@ -1565,7 +1704,7 @@
                     assert_eq!(inputs.len(), sig.params.len());
                     assert_eq!(outputs.len(), sig.returns.len());
                     (
-                        X64ABICaller::from_func(sig, &extname, dist, loc)?,
+                        X64ABICaller::from_func(sig, &extname, dist, caller_conv)?,
                         &inputs[..],
                     )
                 }
@@ -1575,7 +1714,10 @@
                     let sig = ctx.call_sig(insn).unwrap();
                     assert_eq!(inputs.len() - 1, sig.params.len());
                     assert_eq!(outputs.len(), sig.returns.len());
-                    (X64ABICaller::from_ptr(sig, ptr, loc, op)?, &inputs[1..])
+                    (
+                        X64ABICaller::from_ptr(sig, ptr, op, caller_conv)?,
+                        &inputs[1..],
+                    )
                 }
 
                 _ => unreachable!(),
@@ -1600,12 +1742,11 @@
         }
 
         Opcode::Trap | Opcode::ResumableTrap => {
-            let trap_info = (ctx.srcloc(insn), ctx.data(insn).trap_code().unwrap());
-            ctx.emit_safepoint(Inst::Ud2 { trap_info });
+            let trap_code = ctx.data(insn).trap_code().unwrap();
+            ctx.emit_safepoint(Inst::Ud2 { trap_code });
         }
 
         Opcode::Trapif | Opcode::Trapff => {
-            let srcloc = ctx.srcloc(insn);
             let trap_code = ctx.data(insn).trap_code().unwrap();
 
             if matches_input(ctx, inputs[0], Opcode::IaddIfcout).is_some() {
@@ -1615,11 +1756,7 @@
                 // simply use the flags here.
                 let cc = CC::from_intcc(cond_code);
 
-                ctx.emit_safepoint(Inst::TrapIf {
-                    trap_code,
-                    srcloc,
-                    cc,
-                });
+                ctx.emit_safepoint(Inst::TrapIf { trap_code, cc });
             } else if op == Opcode::Trapif {
                 let cond_code = ctx.data(insn).cond_code().unwrap();
                 let cc = CC::from_intcc(cond_code);
@@ -1628,11 +1765,7 @@
                 let ifcmp = matches_input(ctx, inputs[0], Opcode::Ifcmp).unwrap();
                 emit_cmp(ctx, ifcmp);
 
-                ctx.emit_safepoint(Inst::TrapIf {
-                    trap_code,
-                    srcloc,
-                    cc,
-                });
+                ctx.emit_safepoint(Inst::TrapIf { trap_code, cc });
             } else {
                 let cond_code = ctx.data(insn).fp_cond_code().unwrap();
 
@@ -1640,11 +1773,9 @@
                 let ffcmp = matches_input(ctx, inputs[0], Opcode::Ffcmp).unwrap();
 
                 match emit_fcmp(ctx, ffcmp, cond_code, FcmpSpec::Normal) {
-                    FcmpCondResult::Condition(cc) => ctx.emit_safepoint(Inst::TrapIf {
-                        trap_code,
-                        srcloc,
-                        cc,
-                    }),
+                    FcmpCondResult::Condition(cc) => {
+                        ctx.emit_safepoint(Inst::TrapIf { trap_code, cc })
+                    }
                     FcmpCondResult::AndConditions(cc1, cc2) => {
                         // A bit unfortunate, but materialize the flags in their own register, and
                         // check against this.
@@ -1660,21 +1791,12 @@
                         ));
                         ctx.emit_safepoint(Inst::TrapIf {
                             trap_code,
-                            srcloc,
                             cc: CC::NZ,
                         });
                     }
                     FcmpCondResult::OrConditions(cc1, cc2) => {
-                        ctx.emit_safepoint(Inst::TrapIf {
-                            trap_code,
-                            srcloc,
-                            cc: cc1,
-                        });
-                        ctx.emit_safepoint(Inst::TrapIf {
-                            trap_code,
-                            srcloc,
-                            cc: cc2,
-                        });
+                        ctx.emit_safepoint(Inst::TrapIf { trap_code, cc: cc1 });
+                        ctx.emit_safepoint(Inst::TrapIf { trap_code, cc: cc2 });
                     }
                     FcmpCondResult::InvertedEqualOrConditions(_, _) => unreachable!(),
                 };
@@ -1837,7 +1959,7 @@
 
                     // Copy lhs into tmp
                     let tmp_xmm1 = ctx.alloc_tmp(RegClass::V128, output_ty);
-                    ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(lhs), tmp_xmm1, None));
+                    ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(lhs), tmp_xmm1));
 
                     // Perform min in reverse direction
                     ctx.emit(Inst::xmm_rm_r(min_op, RegMem::from(dst), tmp_xmm1));
@@ -1914,7 +2036,7 @@
 
                     // Copy lhs into tmp.
                     let tmp_xmm1 = ctx.alloc_tmp(RegClass::V128, types::F32);
-                    ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(lhs), tmp_xmm1, None));
+                    ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(lhs), tmp_xmm1));
 
                     // Perform max in reverse direction.
                     ctx.emit(Inst::xmm_rm_r(max_op, RegMem::reg(dst.to_reg()), tmp_xmm1));
@@ -1961,6 +2083,22 @@
             }
         }
 
+        Opcode::FminPseudo | Opcode::FmaxPseudo => {
+            let lhs = input_to_reg_mem(ctx, inputs[0]);
+            let rhs = put_input_in_reg(ctx, inputs[1]);
+            let dst = get_output_reg(ctx, outputs[0]);
+            let ty = ty.unwrap();
+            ctx.emit(Inst::gen_move(dst, rhs, ty));
+            let sse_opcode = match (ty, op) {
+                (types::F32X4, Opcode::FminPseudo) => SseOpcode::Minps,
+                (types::F32X4, Opcode::FmaxPseudo) => SseOpcode::Maxps,
+                (types::F64X2, Opcode::FminPseudo) => SseOpcode::Minpd,
+                (types::F64X2, Opcode::FmaxPseudo) => SseOpcode::Maxpd,
+                _ => unimplemented!("unsupported type {} for {}", ty, op),
+            };
+            ctx.emit(Inst::xmm_rm_r(sse_opcode, lhs, dst));
+        }
+
         Opcode::Sqrt => {
             let src = input_to_reg_mem(ctx, inputs[0]);
             let dst = get_output_reg(ctx, outputs[0]);
@@ -1993,28 +2131,41 @@
         }
 
         Opcode::FcvtFromSint => {
-            let (ext_spec, src_size) = match ctx.input_ty(insn, 0) {
-                types::I8 | types::I16 => (Some(ExtSpec::SignExtendTo32), OperandSize::Size32),
-                types::I32 => (None, OperandSize::Size32),
-                types::I64 => (None, OperandSize::Size64),
-                _ => unreachable!(),
-            };
+            let output_ty = ty.unwrap();
+            if !output_ty.is_vector() {
+                let (ext_spec, src_size) = match ctx.input_ty(insn, 0) {
+                    types::I8 | types::I16 => (Some(ExtSpec::SignExtendTo32), OperandSize::Size32),
+                    types::I32 => (None, OperandSize::Size32),
+                    types::I64 => (None, OperandSize::Size64),
+                    _ => unreachable!(),
+                };
 
-            let src = match ext_spec {
-                Some(ext_spec) => RegMem::reg(extend_input_to_reg(ctx, inputs[0], ext_spec)),
-                None => input_to_reg_mem(ctx, inputs[0]),
-            };
+                let src = match ext_spec {
+                    Some(ext_spec) => RegMem::reg(extend_input_to_reg(ctx, inputs[0], ext_spec)),
+                    None => input_to_reg_mem(ctx, inputs[0]),
+                };
 
-            let output_ty = ty.unwrap();
-            let opcode = if output_ty == types::F32 {
-                SseOpcode::Cvtsi2ss
+                let opcode = if output_ty == types::F32 {
+                    SseOpcode::Cvtsi2ss
+                } else {
+                    assert_eq!(output_ty, types::F64);
+                    SseOpcode::Cvtsi2sd
+                };
+                let dst = get_output_reg(ctx, outputs[0]);
+                ctx.emit(Inst::gpr_to_xmm(opcode, src, src_size, dst));
             } else {
-                assert_eq!(output_ty, types::F64);
-                SseOpcode::Cvtsi2sd
-            };
-
-            let dst = get_output_reg(ctx, outputs[0]);
-            ctx.emit(Inst::gpr_to_xmm(opcode, src, src_size, dst));
+                let ty = ty.unwrap();
+                let src = put_input_in_reg(ctx, inputs[0]);
+                let dst = get_output_reg(ctx, outputs[0]);
+                let opcode = match ctx.input_ty(insn, 0) {
+                    types::I32X4 => SseOpcode::Cvtdq2ps,
+                    _ => {
+                        unimplemented!("unable to use type {} for op {}", ctx.input_ty(insn, 0), op)
+                    }
+                };
+                ctx.emit(Inst::gen_move(dst, src, ty));
+                ctx.emit(Inst::xmm_rm_r(opcode, RegMem::from(dst), dst));
+            }
         }
 
         Opcode::FcvtFromUint => {
@@ -2022,41 +2173,104 @@
             let ty = ty.unwrap();
 
             let input_ty = ctx.input_ty(insn, 0);
-            match input_ty {
-                types::I8 | types::I16 | types::I32 => {
-                    // Conversion from an unsigned int smaller than 64-bit is easy: zero-extend +
-                    // do a signed conversion (which won't overflow).
-                    let opcode = if ty == types::F32 {
-                        SseOpcode::Cvtsi2ss
-                    } else {
-                        assert_eq!(ty, types::F64);
-                        SseOpcode::Cvtsi2sd
-                    };
+            if !ty.is_vector() {
+                match input_ty {
+                    types::I8 | types::I16 | types::I32 => {
+                        // Conversion from an unsigned int smaller than 64-bit is easy: zero-extend +
+                        // do a signed conversion (which won't overflow).
+                        let opcode = if ty == types::F32 {
+                            SseOpcode::Cvtsi2ss
+                        } else {
+                            assert_eq!(ty, types::F64);
+                            SseOpcode::Cvtsi2sd
+                        };
 
-                    let src =
-                        RegMem::reg(extend_input_to_reg(ctx, inputs[0], ExtSpec::ZeroExtendTo64));
-                    ctx.emit(Inst::gpr_to_xmm(opcode, src, OperandSize::Size64, dst));
-                }
+                        let src = RegMem::reg(extend_input_to_reg(
+                            ctx,
+                            inputs[0],
+                            ExtSpec::ZeroExtendTo64,
+                        ));
+                        ctx.emit(Inst::gpr_to_xmm(opcode, src, OperandSize::Size64, dst));
+                    }
 
-                types::I64 => {
-                    let src = put_input_in_reg(ctx, inputs[0]);
+                    types::I64 => {
+                        let src = put_input_in_reg(ctx, inputs[0]);
 
-                    let src_copy = ctx.alloc_tmp(RegClass::I64, types::I64);
-                    ctx.emit(Inst::gen_move(src_copy, src, types::I64));
+                        let src_copy = ctx.alloc_tmp(RegClass::I64, types::I64);
+                        ctx.emit(Inst::gen_move(src_copy, src, types::I64));
 
-                    let tmp_gpr1 = ctx.alloc_tmp(RegClass::I64, types::I64);
-                    let tmp_gpr2 = ctx.alloc_tmp(RegClass::I64, types::I64);
-                    ctx.emit(Inst::cvt_u64_to_float_seq(
-                        ty == types::F64,
-                        src_copy,
-                        tmp_gpr1,
-                        tmp_gpr2,
-                        dst,
-                    ));
-                }
+                        let tmp_gpr1 = ctx.alloc_tmp(RegClass::I64, types::I64);
+                        let tmp_gpr2 = ctx.alloc_tmp(RegClass::I64, types::I64);
+                        ctx.emit(Inst::cvt_u64_to_float_seq(
+                            ty == types::F64,
+                            src_copy,
+                            tmp_gpr1,
+                            tmp_gpr2,
+                            dst,
+                        ));
+                    }
+                    _ => panic!("unexpected input type for FcvtFromUint: {:?}", input_ty),
+                };
+            } else {
+                // Converting packed unsigned integers to packed floats requires a few steps.
+                // There is no single instruction lowering for converting unsigned floats but there
+                // is for converting packed signed integers to float (cvtdq2ps). In the steps below
+                // we isolate the upper half (16 bits) and lower half (16 bits) of each lane and
+                // then we convert each half separately using cvtdq2ps meant for signed integers.
+                // In order for this to work for the upper half bits we must shift right by 1
+                // (divide by 2) these bits in order to ensure the most significant bit is 0 not
+                // signed, and then after the conversion we double the value. Finally we add the
+                // converted values where addition will correctly round.
+                //
+                // Sequence:
+                // -> A = 0xffffffff
+                // -> Ah = 0xffff0000
+                // -> Al = 0x0000ffff
+                // -> Convert(Al) // Convert int to float
+                // -> Ah = Ah >> 1 // Shift right 1 to assure Ah conversion isn't treated as signed
+                // -> Convert(Ah) // Convert .. with no loss of significant digits from previous shift
+                // -> Ah = Ah + Ah // Double Ah to account for shift right before the conversion.
+                // -> dst = Ah + Al // Add the two floats together
 
-                _ => panic!("unexpected input type for FcvtFromUint: {:?}", input_ty),
-            };
+                assert_eq!(ctx.input_ty(insn, 0), types::I32X4);
+                let src = put_input_in_reg(ctx, inputs[0]);
+                let dst = get_output_reg(ctx, outputs[0]);
+
+                // Create a temporary register
+                let tmp = ctx.alloc_tmp(RegClass::V128, types::I32X4);
+                ctx.emit(Inst::xmm_unary_rm_r(
+                    SseOpcode::Movapd,
+                    RegMem::reg(src),
+                    tmp,
+                ));
+                ctx.emit(Inst::gen_move(dst, src, ty));
+
+                // Get the low 16 bits
+                ctx.emit(Inst::xmm_rmi_reg(SseOpcode::Pslld, RegMemImm::imm(16), tmp));
+                ctx.emit(Inst::xmm_rmi_reg(SseOpcode::Psrld, RegMemImm::imm(16), tmp));
+
+                // Get the high 16 bits
+                ctx.emit(Inst::xmm_rm_r(SseOpcode::Psubd, RegMem::from(tmp), dst));
+
+                // Convert the low 16 bits
+                ctx.emit(Inst::xmm_rm_r(SseOpcode::Cvtdq2ps, RegMem::from(tmp), tmp));
+
+                // Shift the high bits by 1, convert, and double to get the correct value.
+                ctx.emit(Inst::xmm_rmi_reg(SseOpcode::Psrld, RegMemImm::imm(1), dst));
+                ctx.emit(Inst::xmm_rm_r(SseOpcode::Cvtdq2ps, RegMem::from(dst), dst));
+                ctx.emit(Inst::xmm_rm_r(
+                    SseOpcode::Addps,
+                    RegMem::reg(dst.to_reg()),
+                    dst,
+                ));
+
+                // Add together the two converted values.
+                ctx.emit(Inst::xmm_rm_r(
+                    SseOpcode::Addps,
+                    RegMem::reg(tmp.to_reg()),
+                    dst,
+                ));
+            }
         }
 
         Opcode::FcvtToUint | Opcode::FcvtToUintSat | Opcode::FcvtToSint | Opcode::FcvtToSintSat => {
@@ -2064,39 +2278,105 @@
             let dst = get_output_reg(ctx, outputs[0]);
 
             let input_ty = ctx.input_ty(insn, 0);
-            let src_size = if input_ty == types::F32 {
-                OperandSize::Size32
-            } else {
-                assert_eq!(input_ty, types::F64);
-                OperandSize::Size64
-            };
+            if !input_ty.is_vector() {
+                let src_size = if input_ty == types::F32 {
+                    OperandSize::Size32
+                } else {
+                    assert_eq!(input_ty, types::F64);
+                    OperandSize::Size64
+                };
 
-            let output_ty = ty.unwrap();
-            let dst_size = if output_ty == types::I32 {
-                OperandSize::Size32
-            } else {
-                assert_eq!(output_ty, types::I64);
-                OperandSize::Size64
-            };
+                let output_ty = ty.unwrap();
+                let dst_size = if output_ty == types::I32 {
+                    OperandSize::Size32
+                } else {
+                    assert_eq!(output_ty, types::I64);
+                    OperandSize::Size64
+                };
 
-            let to_signed = op == Opcode::FcvtToSint || op == Opcode::FcvtToSintSat;
-            let is_sat = op == Opcode::FcvtToUintSat || op == Opcode::FcvtToSintSat;
+                let to_signed = op == Opcode::FcvtToSint || op == Opcode::FcvtToSintSat;
+                let is_sat = op == Opcode::FcvtToUintSat || op == Opcode::FcvtToSintSat;
 
-            let src_copy = ctx.alloc_tmp(RegClass::V128, input_ty);
-            ctx.emit(Inst::gen_move(src_copy, src, input_ty));
+                let src_copy = ctx.alloc_tmp(RegClass::V128, input_ty);
+                ctx.emit(Inst::gen_move(src_copy, src, input_ty));
 
-            let tmp_xmm = ctx.alloc_tmp(RegClass::V128, input_ty);
-            let tmp_gpr = ctx.alloc_tmp(RegClass::I64, output_ty);
+                let tmp_xmm = ctx.alloc_tmp(RegClass::V128, input_ty);
+                let tmp_gpr = ctx.alloc_tmp(RegClass::I64, output_ty);
 
-            let srcloc = ctx.srcloc(insn);
-            if to_signed {
-                ctx.emit(Inst::cvt_float_to_sint_seq(
-                    src_size, dst_size, is_sat, src_copy, dst, tmp_gpr, tmp_xmm, srcloc,
-                ));
+                if to_signed {
+                    ctx.emit(Inst::cvt_float_to_sint_seq(
+                        src_size, dst_size, is_sat, src_copy, dst, tmp_gpr, tmp_xmm,
+                    ));
+                } else {
+                    ctx.emit(Inst::cvt_float_to_uint_seq(
+                        src_size, dst_size, is_sat, src_copy, dst, tmp_gpr, tmp_xmm,
+                    ));
+                }
             } else {
-                ctx.emit(Inst::cvt_float_to_uint_seq(
-                    src_size, dst_size, is_sat, src_copy, dst, tmp_gpr, tmp_xmm, srcloc,
-                ));
+                if op == Opcode::FcvtToSintSat {
+                    // Sets destination to zero if float is NaN
+                    let tmp = ctx.alloc_tmp(RegClass::V128, types::I32X4);
+                    ctx.emit(Inst::xmm_unary_rm_r(
+                        SseOpcode::Movapd,
+                        RegMem::reg(src),
+                        tmp,
+                    ));
+                    ctx.emit(Inst::gen_move(dst, src, input_ty));
+                    let cond = FcmpImm::from(FloatCC::Equal);
+                    ctx.emit(Inst::xmm_rm_r_imm(
+                        SseOpcode::Cmpps,
+                        RegMem::reg(tmp.to_reg()),
+                        tmp,
+                        cond.encode(),
+                        false,
+                    ));
+                    ctx.emit(Inst::xmm_rm_r(
+                        SseOpcode::Andps,
+                        RegMem::reg(tmp.to_reg()),
+                        dst,
+                    ));
+
+                    // Sets top bit of tmp if float is positive
+                    // Setting up to set top bit on negative float values
+                    ctx.emit(Inst::xmm_rm_r(
+                        SseOpcode::Pxor,
+                        RegMem::reg(dst.to_reg()),
+                        tmp,
+                    ));
+
+                    // Convert the packed float to packed doubleword.
+                    ctx.emit(Inst::xmm_rm_r(
+                        SseOpcode::Cvttps2dq,
+                        RegMem::reg(dst.to_reg()),
+                        dst,
+                    ));
+
+                    // Set top bit only if < 0
+                    // Saturate lane with sign (top) bit.
+                    ctx.emit(Inst::xmm_rm_r(
+                        SseOpcode::Pand,
+                        RegMem::reg(dst.to_reg()),
+                        tmp,
+                    ));
+                    ctx.emit(Inst::xmm_rmi_reg(SseOpcode::Psrad, RegMemImm::imm(31), tmp));
+
+                    // On overflow 0x80000000 is returned to a lane.
+                    // Below sets positive overflow lanes to 0x7FFFFFFF
+                    // Keeps negative overflow lanes as is.
+                    ctx.emit(Inst::xmm_rm_r(
+                        SseOpcode::Pxor,
+                        RegMem::reg(tmp.to_reg()),
+                        dst,
+                    ));
+                } else if op == Opcode::FcvtToUintSat {
+                    unimplemented!("f32x4.convert_i32x4_u");
+                } else {
+                    // Since this branch is also guarded by a check for vector types
+                    // neither Opcode::FcvtToUint nor Opcode::FcvtToSint can reach here
+                    // due to vector varients not existing. The first two branches will
+                    // cover all reachable cases.
+                    unreachable!();
+                }
             }
         }
 
@@ -2272,14 +2552,9 @@
             }) {
                 ctx.emit(inst);
             }
-            ctx.emit(Inst::xmm_mov(
-                mov_op,
-                RegMem::reg(tmp_xmm1.to_reg()),
-                dst,
-                None,
-            ));
+            ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(tmp_xmm1.to_reg()), dst));
             ctx.emit(Inst::xmm_rm_r(and_not_op, RegMem::reg(lhs), dst));
-            ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(rhs), tmp_xmm2, None));
+            ctx.emit(Inst::xmm_mov(mov_op, RegMem::reg(rhs), tmp_xmm2));
             ctx.emit(Inst::xmm_rm_r(
                 and_op,
                 RegMem::reg(tmp_xmm1.to_reg()),
@@ -2382,51 +2657,36 @@
                     let base = put_input_in_reg(ctx, inputs[0]);
                     let index = put_input_in_reg(ctx, inputs[1]);
                     let shift = 0;
-                    Amode::imm_reg_reg_shift(offset as u32, base, index, shift)
+                    let flags = ctx.memflags(insn).expect("load should have memflags");
+                    Amode::imm_reg_reg_shift(offset as u32, base, index, shift).with_flags(flags)
                 }
 
                 _ => unreachable!(),
             };
 
-            let srcloc = Some(ctx.srcloc(insn));
-
             let dst = get_output_reg(ctx, outputs[0]);
             let is_xmm = elem_ty.is_float() || elem_ty.is_vector();
             match (sign_extend, is_xmm) {
                 (true, false) => {
                     // The load is sign-extended only when the output size is lower than 64 bits,
                     // so ext-mode is defined in this case.
-                    ctx.emit(Inst::movsx_rm_r(
-                        ext_mode.unwrap(),
-                        RegMem::mem(amode),
-                        dst,
-                        srcloc,
-                    ));
+                    ctx.emit(Inst::movsx_rm_r(ext_mode.unwrap(), RegMem::mem(amode), dst));
                 }
                 (false, false) => {
                     if elem_ty.bytes() == 8 {
                         // Use a plain load.
-                        ctx.emit(Inst::mov64_m_r(amode, dst, srcloc))
+                        ctx.emit(Inst::mov64_m_r(amode, dst))
                     } else {
                         // Use a zero-extended load.
-                        ctx.emit(Inst::movzx_rm_r(
-                            ext_mode.unwrap(),
-                            RegMem::mem(amode),
-                            dst,
-                            srcloc,
-                        ))
+                        ctx.emit(Inst::movzx_rm_r(ext_mode.unwrap(), RegMem::mem(amode), dst))
                     }
                 }
                 (_, true) => {
                     ctx.emit(match elem_ty {
-                        types::F32 => {
-                            Inst::xmm_mov(SseOpcode::Movss, RegMem::mem(amode), dst, srcloc)
-                        }
-                        types::F64 => {
-                            Inst::xmm_mov(SseOpcode::Movsd, RegMem::mem(amode), dst, srcloc)
-                        }
+                        types::F32 => Inst::xmm_mov(SseOpcode::Movss, RegMem::mem(amode), dst),
+                        types::F64 => Inst::xmm_mov(SseOpcode::Movsd, RegMem::mem(amode), dst),
                         _ if elem_ty.is_vector() && elem_ty.bits() == 128 => {
-                            Inst::xmm_mov(SseOpcode::Movups, RegMem::mem(amode), dst, srcloc)
+                            Inst::xmm_mov(SseOpcode::Movups, RegMem::mem(amode), dst)
                         } // TODO Specialize for different types: MOVUPD, MOVDQU
                         _ => unreachable!("unexpected type for load: {:?}", elem_ty),
                     });
@@ -2470,7 +2730,8 @@
                     let base = put_input_in_reg(ctx, inputs[1]);
                     let index = put_input_in_reg(ctx, inputs[2]);
                     let shift = 0;
-                    Amode::imm_reg_reg_shift(offset as u32, base, index, shift)
+                    let flags = ctx.memflags(insn).expect("store should have memflags");
+                    Amode::imm_reg_reg_shift(offset as u32, base, index, shift).with_flags(flags)
                 }
 
                 _ => unreachable!(),
@@ -2478,16 +2739,14 @@
 
             let src = put_input_in_reg(ctx, inputs[0]);
 
-            let srcloc = Some(ctx.srcloc(insn));
-
             ctx.emit(match elem_ty {
-                types::F32 => Inst::xmm_mov_r_m(SseOpcode::Movss, src, addr, srcloc),
-                types::F64 => Inst::xmm_mov_r_m(SseOpcode::Movsd, src, addr, srcloc),
+                types::F32 => Inst::xmm_mov_r_m(SseOpcode::Movss, src, addr),
+                types::F64 => Inst::xmm_mov_r_m(SseOpcode::Movsd, src, addr),
                 _ if elem_ty.is_vector() && elem_ty.bits() == 128 => {
                     // TODO Specialize for different types: MOVUPD, MOVDQU, etc.
-                    Inst::xmm_mov_r_m(SseOpcode::Movups, src, addr, srcloc)
+                    Inst::xmm_mov_r_m(SseOpcode::Movups, src, addr)
                 }
-                _ => Inst::mov_r_m(elem_ty.bytes() as u8, src, addr, srcloc),
+                _ => Inst::mov_r_m(elem_ty.bytes() as u8, src, addr),
             });
         }
 
@@ -2506,12 +2765,6 @@
             let mut arg2 = put_input_in_reg(ctx, inputs[1]);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
 
             // Make sure that both args are in virtual regs, since in effect we have to do a
             // parallel copy to get them safely to the AtomicRmwSeq input regs, and that's not
@@ -2535,11 +2788,7 @@
 
             // Now the AtomicRmwSeq (pseudo-) instruction itself
             let op = inst_common::AtomicRmwOp::from(ctx.data(insn).atomic_rmw_op().unwrap());
-            ctx.emit(Inst::AtomicRmwSeq {
-                ty: ty_access,
-                op,
-                srcloc,
-            });
+            ctx.emit(Inst::AtomicRmwSeq { ty: ty_access, op });
 
             // And finally, copy the preordained AtomicRmwSeq output reg to its destination.
             ctx.emit(Inst::gen_move(dst, regs::rax(), types::I64));
@@ -2554,12 +2803,6 @@
             let replacement = put_input_in_reg(ctx, inputs[2]);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
 
             // Move the expected value into %rax.  Because there's only one fixed register on
             // the input side, we don't have to use `ensure_in_vreg`, as is necessary in the
@@ -2573,7 +2816,6 @@
                 ty: ty_access,
                 src: replacement,
                 dst: addr.into(),
-                srcloc,
             });
             // And finally, copy the old value at the location to its destination reg.
             ctx.emit(Inst::gen_move(dst, regs::rax(), types::I64));
@@ -2587,23 +2829,17 @@
             let addr = lower_to_amode(ctx, inputs[0], 0);
             let ty_access = ty.unwrap();
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
 
             let rm = RegMem::mem(addr);
             if ty_access == types::I64 {
-                ctx.emit(Inst::mov64_rm_r(rm, data, srcloc));
+                ctx.emit(Inst::mov64_rm_r(rm, data));
             } else {
                 let ext_mode = ExtMode::new(ty_access.bits(), 64).expect(&format!(
                     "invalid extension during AtomicLoad: {} -> {}",
                     ty_access.bits(),
                     64
                 ));
-                ctx.emit(Inst::movzx_rm_r(ext_mode, rm, data, srcloc));
+                ctx.emit(Inst::movzx_rm_r(ext_mode, rm, data));
             }
         }
 
@@ -2613,14 +2849,8 @@
             let addr = lower_to_amode(ctx, inputs[1], 0);
             let ty_access = ctx.input_ty(insn, 0);
             assert!(is_valid_atomic_transaction_ty(ty_access));
-            let memflags = ctx.memflags(insn).expect("memory flags");
-            let srcloc = if !memflags.notrap() {
-                Some(ctx.srcloc(insn))
-            } else {
-                None
-            };
 
-            ctx.emit(Inst::mov_r_m(ty_access.bytes() as u8, data, addr, srcloc));
+            ctx.emit(Inst::mov_r_m(ty_access.bytes() as u8, data, addr));
             ctx.emit(Inst::Fence {
                 kind: FenceKind::MFence,
             });
@@ -2636,11 +2866,9 @@
             let dst = get_output_reg(ctx, outputs[0]);
             let (extname, _) = ctx.call_target(insn).unwrap();
             let extname = extname.clone();
-            let loc = ctx.srcloc(insn);
             ctx.emit(Inst::LoadExtName {
                 dst,
                 name: Box::new(extname),
-                srcloc: loc,
                 offset: 0,
             });
         }
@@ -2649,11 +2877,9 @@
             let dst = get_output_reg(ctx, outputs[0]);
             let (extname, _, offset) = ctx.symbol_value(insn).unwrap();
             let extname = extname.clone();
-            let loc = ctx.srcloc(insn);
             ctx.emit(Inst::LoadExtName {
                 dst,
                 name: Box::new(extname),
-                srcloc: loc,
                 offset,
             });
         }
@@ -2806,8 +3032,8 @@
                 if size == 1 {
                     // Sign-extend operands to 32, then do a cmove of size 4.
                     let lhs_se = ctx.alloc_tmp(RegClass::I64, types::I32);
-                    ctx.emit(Inst::movsx_rm_r(ExtMode::BL, lhs, lhs_se, None));
-                    ctx.emit(Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rhs), dst, None));
+                    ctx.emit(Inst::movsx_rm_r(ExtMode::BL, lhs, lhs_se));
+                    ctx.emit(Inst::movsx_rm_r(ExtMode::BL, RegMem::reg(rhs), dst));
                     ctx.emit(Inst::cmove(4, cc, RegMem::reg(lhs_se.to_reg()), dst));
                 } else {
                     ctx.emit(Inst::gen_move(dst, rhs, ty));
@@ -2836,7 +3062,6 @@
             let dividend = put_input_in_reg(ctx, inputs[0]);
             let dst = get_output_reg(ctx, outputs[0]);
 
-            let srcloc = ctx.srcloc(insn);
             ctx.emit(Inst::gen_move(
                 Writable::from_reg(regs::rax()),
                 dividend,
@@ -2867,13 +3092,7 @@
                     0,
                     Writable::from_reg(regs::rdx()),
                 ));
-                ctx.emit(Inst::checked_div_or_rem_seq(
-                    kind,
-                    size,
-                    divisor_copy,
-                    tmp,
-                    srcloc,
-                ));
+                ctx.emit(Inst::checked_div_or_rem_seq(kind, size, divisor_copy, tmp));
             } else {
                 let divisor = input_to_reg_mem(ctx, inputs[1]);
 
@@ -2887,7 +3106,6 @@
                         ExtMode::BL,
                         RegMem::reg(regs::rax()),
                         Writable::from_reg(regs::rax()),
-                        /* infallible */ None,
                     ));
                 } else {
                     // zero for unsigned opcodes.
@@ -2899,7 +3117,7 @@
                 }
 
                 // Emit the actual idiv.
-                ctx.emit(Inst::div(size, kind.is_signed(), divisor, ctx.srcloc(insn)));
+                ctx.emit(Inst::div(size, kind.is_signed(), divisor));
             }
 
             // Move the result back into the destination reg.
@@ -2950,17 +3168,21 @@
         }
 
         Opcode::Vconst => {
-            let val = if let &InstructionData::UnaryConst {
+            let used_constant = if let &InstructionData::UnaryConst {
                 constant_handle, ..
             } = ctx.data(insn)
             {
-                ctx.get_constant_data(constant_handle).clone().into_vec()
+                ctx.use_constant(VCodeConstantData::Pool(
+                    constant_handle,
+                    ctx.get_constant_data(constant_handle).clone(),
+                ))
             } else {
                 unreachable!("vconst should always have unary_const format")
             };
+            // TODO use Inst::gen_constant() instead.
             let dst = get_output_reg(ctx, outputs[0]);
             let ty = ty.unwrap();
-            ctx.emit(Inst::xmm_load_const_seq(val, dst, ty));
+            ctx.emit(Inst::xmm_load_const(used_constant, dst, ty));
         }
 
         Opcode::RawBitcast => {
@@ -2980,10 +3202,9 @@
             let lhs_ty = ctx.input_ty(insn, 0);
             let lhs = put_input_in_reg(ctx, inputs[0]);
             let rhs = put_input_in_reg(ctx, inputs[1]);
-            let mask = if let &InstructionData::Shuffle { mask, .. } = ctx.data(insn) {
-                ctx.get_immediate(mask).clone()
-            } else {
-                unreachable!("shuffle should always have the shuffle format")
+            let mask = match ctx.get_immediate(insn) {
+                Some(DataValue::V128(bytes)) => bytes.to_vec(),
+                _ => unreachable!("shuffle should always have a 16-byte immediate"),
             };
 
             // A mask-building helper: in 128-bit SIMD, 0-15 indicate which lane to read from and a
@@ -3002,8 +3223,9 @@
                     .map(|&b| if b > 15 { b.wrapping_sub(16) } else { b })
                     .map(zero_unknown_lane_index)
                     .collect();
+                let constant = ctx.use_constant(VCodeConstantData::Generated(constructed_mask));
                 let tmp = ctx.alloc_tmp(RegClass::V128, types::I8X16);
-                ctx.emit(Inst::xmm_load_const_seq(constructed_mask, tmp, ty));
+                ctx.emit(Inst::xmm_load_const(constant, tmp, ty));
                 // After loading the constructed mask in a temporary register, we use this to
                 // shuffle the `dst` register (remember that, in this case, it is the same as
                 // `src` so we disregard this register).
@@ -3017,8 +3239,9 @@
                 let tmp0 = ctx.alloc_tmp(RegClass::V128, lhs_ty);
                 ctx.emit(Inst::gen_move(tmp0, lhs, lhs_ty));
                 let constructed_mask = mask.iter().cloned().map(zero_unknown_lane_index).collect();
+                let constant = ctx.use_constant(VCodeConstantData::Generated(constructed_mask));
                 let tmp1 = ctx.alloc_tmp(RegClass::V128, types::I8X16);
-                ctx.emit(Inst::xmm_load_const_seq(constructed_mask, tmp1, ty));
+                ctx.emit(Inst::xmm_load_const(constant, tmp1, ty));
                 ctx.emit(Inst::xmm_rm_r(SseOpcode::Pshufb, RegMem::from(tmp1), tmp0));
 
                 // PSHUFB the second argument, placing zeroes for unused lanes.
@@ -3027,8 +3250,9 @@
                     .map(|b| b.wrapping_sub(16))
                     .map(zero_unknown_lane_index)
                     .collect();
+                let constant = ctx.use_constant(VCodeConstantData::Generated(constructed_mask));
                 let tmp2 = ctx.alloc_tmp(RegClass::V128, types::I8X16);
-                ctx.emit(Inst::xmm_load_const_seq(constructed_mask, tmp2, ty));
+                ctx.emit(Inst::xmm_load_const(constant, tmp2, ty));
                 ctx.emit(Inst::xmm_rm_r(SseOpcode::Pshufb, RegMem::from(tmp2), dst));
 
                 // OR the shuffled registers (the mechanism and lane-size for OR-ing the registers
@@ -3055,11 +3279,12 @@
 
             // Create a mask for zeroing out-of-bounds lanes of the swizzle mask.
             let zero_mask = ctx.alloc_tmp(RegClass::V128, types::I8X16);
-            let zero_mask_value = vec![
+            static ZERO_MASK_VALUE: [u8; 16] = [
                 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70,
                 0x70, 0x70,
             ];
-            ctx.emit(Inst::xmm_load_const_seq(zero_mask_value, zero_mask, ty));
+            let constant = ctx.use_constant(VCodeConstantData::WellKnown(&ZERO_MASK_VALUE));
+            ctx.emit(Inst::xmm_load_const(constant, zero_mask, ty));
 
             // Use the `zero_mask` on a writable `swizzle_mask`.
             let swizzle_mask = Writable::from_reg(swizzle_mask);
@@ -3146,18 +3371,30 @@
             }
         }
 
-        Opcode::Splat => {
+        Opcode::Splat | Opcode::LoadSplat => {
             let ty = ty.unwrap();
             assert_eq!(ty.bits(), 128);
             let src_ty = ctx.input_ty(insn, 0);
             assert!(src_ty.bits() < 128);
-            let src = input_to_reg_mem(ctx, inputs[0]);
+
+            let src = match op {
+                Opcode::Splat => input_to_reg_mem(ctx, inputs[0]),
+                Opcode::LoadSplat => {
+                    let offset = ctx.data(insn).load_store_offset().unwrap();
+                    let amode = lower_to_amode(ctx, inputs[0], offset);
+                    RegMem::mem(amode)
+                }
+                _ => unreachable!(),
+            };
             let dst = get_output_reg(ctx, outputs[0]);
 
             // We know that splat will overwrite all of the lanes of `dst` but it takes several
             // instructions to do so. Because of the multiple instructions, there is no good way to
             // declare `dst` a `def` except with the following pseudo-instruction.
             ctx.emit(Inst::xmm_uninit_value(dst));
+
+            // TODO: eventually many of these sequences could be optimized with AVX's VBROADCAST*
+            // and VPBROADCAST*.
             match ty.lane_bits() {
                 8 => {
                     emit_insert_lane(ctx, src, dst, 0, ty.lane_type());
@@ -3239,6 +3476,53 @@
             ctx.emit(Inst::setcc(CC::Z, dst));
         }
 
+        Opcode::VhighBits => {
+            let src = put_input_in_reg(ctx, inputs[0]);
+            let src_ty = ctx.input_ty(insn, 0);
+            debug_assert!(src_ty.is_vector() && src_ty.bits() == 128);
+            let dst = get_output_reg(ctx, outputs[0]);
+            debug_assert!(dst.to_reg().get_class() == RegClass::I64);
+
+            // The Intel specification allows using both 32-bit and 64-bit GPRs as destination for
+            // the "move mask" instructions. This is controlled by the REX.R bit: "In 64-bit mode,
+            // the instruction can access additional registers when used with a REX.R prefix. The
+            // default operand size is 64-bit in 64-bit mode" (PMOVMSKB in IA Software Development
+            // Manual, vol. 2). This being the case, we will always clear REX.W since its use is
+            // unnecessary (`OperandSize` is used for setting/clearing REX.W).
+            let size = OperandSize::Size32;
+
+            match src_ty {
+                types::I8X16 | types::B8X16 => {
+                    ctx.emit(Inst::xmm_to_gpr(SseOpcode::Pmovmskb, src, dst, size))
+                }
+                types::I32X4 | types::B32X4 | types::F32X4 => {
+                    ctx.emit(Inst::xmm_to_gpr(SseOpcode::Movmskps, src, dst, size))
+                }
+                types::I64X2 | types::B64X2 | types::F64X2 => {
+                    ctx.emit(Inst::xmm_to_gpr(SseOpcode::Movmskpd, src, dst, size))
+                }
+                types::I16X8 | types::B16X8 => {
+                    // There is no x86 instruction for extracting the high bit of 16-bit lanes so
+                    // here we:
+                    // - duplicate the 16-bit lanes of `src` into 8-bit lanes:
+                    //     PACKSSWB([x1, x2, ...], [x1, x2, ...]) = [x1', x2', ..., x1', x2', ...]
+                    // - use PMOVMSKB to gather the high bits; now we have duplicates, though
+                    // - shift away the bottom 8 high bits to remove the duplicates.
+                    let tmp = ctx.alloc_tmp(RegClass::V128, src_ty);
+                    ctx.emit(Inst::gen_move(tmp, src, src_ty));
+                    ctx.emit(Inst::xmm_rm_r(SseOpcode::Packsswb, RegMem::reg(src), tmp));
+                    ctx.emit(Inst::xmm_to_gpr(
+                        SseOpcode::Pmovmskb,
+                        tmp.to_reg(),
+                        dst,
+                        size,
+                    ));
+                    ctx.emit(Inst::shift_r(8, ShiftKind::ShiftRightLogical, Some(8), dst));
+                }
+                _ => unimplemented!("unknown input type {} for {}", src_ty, op),
+            }
+        }
+
         Opcode::IaddImm
         | Opcode::ImulImm
         | Opcode::UdivImm
@@ -3310,10 +3594,10 @@
             );
             assert!(op1 == Opcode::Jump || op1 == Opcode::Fallthrough);
 
-            let taken = BranchTarget::Label(targets[0]);
+            let taken = targets[0];
             let not_taken = match op1 {
-                Opcode::Jump => BranchTarget::Label(targets[1]),
-                Opcode::Fallthrough => BranchTarget::Label(fallthrough.unwrap()),
+                Opcode::Jump => targets[1],
+                Opcode::Fallthrough => fallthrough.unwrap(),
                 _ => unreachable!(), // assert above.
             };
 
@@ -3417,7 +3701,7 @@
             let op = ctx.data(branches[0]).opcode();
             match op {
                 Opcode::Jump | Opcode::Fallthrough => {
-                    ctx.emit(Inst::jmp_known(BranchTarget::Label(targets[0])));
+                    ctx.emit(Inst::jmp_known(targets[0]));
                 }
 
                 Opcode::BrTable => {
@@ -3460,13 +3744,9 @@
                     let tmp2 = ctx.alloc_tmp(RegClass::I64, types::I64);
 
                     let targets_for_term: Vec<MachLabel> = targets.to_vec();
-                    let default_target = BranchTarget::Label(targets[0]);
+                    let default_target = targets[0];
 
-                    let jt_targets: Vec<BranchTarget> = targets
-                        .iter()
-                        .skip(1)
-                        .map(|bix| BranchTarget::Label(*bix))
-                        .collect();
+                    let jt_targets: Vec<MachLabel> = targets.iter().skip(1).cloned().collect();
 
                     ctx.emit(Inst::JmpTableSeq {
                         idx,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x64/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x64/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,16 +1,16 @@
 //! X86_64-bit Instruction Set Architecture.
 
+use self::inst::EmitInfo;
+
 use super::TargetIsa;
 use crate::ir::{condcodes::IntCC, Function};
 use crate::isa::x64::{inst::regs::create_reg_universe_systemv, settings as x64_settings};
 use crate::isa::Builder as IsaBuilder;
-use crate::machinst::{
-    compile, pretty_print::ShowWithRRU, MachBackend, MachCompileResult, TargetIsaAdapter, VCode,
-};
+use crate::machinst::{compile, MachBackend, MachCompileResult, TargetIsaAdapter, VCode};
 use crate::result::CodegenResult;
 use crate::settings::{self as shared_settings, Flags};
 use alloc::boxed::Box;
-use regalloc::RealRegUniverse;
+use regalloc::{PrettyPrint, RealRegUniverse};
 use target_lexicon::Triple;
 
 mod abi;
@@ -22,7 +22,7 @@
 pub(crate) struct X64Backend {
     triple: Triple,
     flags: Flags,
-    _x64_flags: x64_settings::Flags,
+    x64_flags: x64_settings::Flags,
     reg_universe: RealRegUniverse,
 }
 
@@ -33,7 +33,7 @@
         Self {
             triple,
             flags,
-            _x64_flags: x64_flags,
+            x64_flags,
             reg_universe,
         }
     }
@@ -41,8 +41,9 @@
     fn compile_vcode(&self, func: &Function, flags: Flags) -> CodegenResult<VCode<inst::Inst>> {
         // This performs lowering to VCode, register-allocates the code, computes
         // block layout and finalizes branches. The result is ready for binary emission.
+        let emit_info = EmitInfo::new(flags.clone(), self.x64_flags.clone());
         let abi = Box::new(abi::X64ABICallee::new(&func, flags)?);
-        compile::compile::<Self>(&func, self, abi)
+        compile::compile::<Self>(&func, self, abi, emit_info)
     }
 }
 
@@ -54,9 +55,11 @@
     ) -> CodegenResult<MachCompileResult> {
         let flags = self.flags();
         let vcode = self.compile_vcode(func, flags.clone())?;
+
         let buffer = vcode.emit();
         let buffer = buffer.finish();
         let frame_size = vcode.frame_size();
+        let unwind_info = vcode.unwind_info()?;
 
         let disasm = if want_disasm {
             Some(vcode.show_rru(Some(&create_reg_universe_systemv(flags))))
@@ -68,6 +71,7 @@
             buffer,
             frame_size,
             disasm,
+            unwind_info,
         })
     }
 
@@ -98,6 +102,31 @@
         // underflow of a subtract (carry is borrow for subtract).
         IntCC::UnsignedGreaterThanOrEqual
     }
+
+    #[cfg(feature = "unwind")]
+    fn emit_unwind_info(
+        &self,
+        result: &MachCompileResult,
+        kind: crate::machinst::UnwindInfoKind,
+    ) -> CodegenResult<Option<crate::isa::unwind::UnwindInfo>> {
+        use crate::isa::unwind::UnwindInfo;
+        use crate::machinst::UnwindInfoKind;
+        Ok(match (result.unwind_info.as_ref(), kind) {
+            (Some(info), UnwindInfoKind::SystemV) => {
+                inst::unwind::systemv::create_unwind_info(info.clone())?.map(UnwindInfo::SystemV)
+            }
+            (Some(_info), UnwindInfoKind::Windows) => {
+                //TODO inst::unwind::winx64::create_unwind_info(info.clone())?.map(|u| UnwindInfo::WindowsX64(u))
+                None
+            }
+            _ => None,
+        })
+    }
+
+    #[cfg(feature = "unwind")]
+    fn create_systemv_cie(&self) -> Option<gimli::write::CommonInformationEntry> {
+        Some(inst::unwind::systemv::create_cie())
+    }
 }
 
 /// Create a new `isa::Builder`.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/abi.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/abi.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/abi.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/abi.rs	2021-01-18 19:58:25.000000000 +0000
@@ -993,7 +993,7 @@
         pos.goto_last_inst(block);
         if let Some(inst) = pos.current_inst() {
             if pos.func.dfg[inst].opcode().is_return() {
-                insert_common_epilogue(inst, stack_size, pos, reg_type, csrs, sp_arg_index);
+                insert_common_epilogue(inst, block, stack_size, pos, reg_type, csrs, sp_arg_index);
             }
         }
     }
@@ -1003,6 +1003,7 @@
 /// This is used by common calling conventions such as System V.
 fn insert_common_epilogue(
     inst: ir::Inst,
+    block: ir::Block,
     stack_size: i64,
     pos: &mut EncCursor,
     reg_type: ir::types::Type,
@@ -1062,12 +1063,13 @@
         assert!(csrs.iter(FPR).len() == 0);
     }
 
-    pos.func.epilogues_start.push(
+    pos.func.epilogues_start.push((
         first_fpr_load
             .or(sp_adjust_inst)
             .or(first_csr_pop_inst)
             .unwrap_or(fp_pop_inst),
-    );
+        block,
+    ));
 }
 
 #[cfg(feature = "unwind")]
@@ -1081,8 +1083,7 @@
     // In the future, we should be omitting frame pointer as an optimization, so this will change
     Ok(match func.signature.call_conv {
         CallConv::Fast | CallConv::Cold | CallConv::SystemV => {
-            super::unwind::systemv::create_unwind_info(func, isa, Some(RU::rbp.into()))?
-                .map(|u| UnwindInfo::SystemV(u))
+            super::unwind::systemv::create_unwind_info(func, isa)?.map(|u| UnwindInfo::SystemV(u))
         }
         CallConv::WindowsFastcall => {
             super::unwind::winx64::create_unwind_info(func, isa)?.map(|u| UnwindInfo::WindowsX64(u))
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/enc_tables.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/enc_tables.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/enc_tables.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/enc_tables.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1892,3 +1892,31 @@
         unreachable!();
     }
 }
+
+fn expand_load_splat(
+    inst: ir::Inst,
+    func: &mut ir::Function,
+    _cfg: &mut ControlFlowGraph,
+    _isa: &dyn TargetIsa,
+) {
+    let mut pos = FuncCursor::new(func).at_inst(inst);
+
+    pos.use_srcloc(inst);
+
+    let (ptr, offset, flags) = match pos.func.dfg[inst] {
+        ir::InstructionData::Load {
+            opcode: ir::Opcode::LoadSplat,
+            arg,
+            offset,
+            flags,
+        } => (arg, offset, flags),
+        _ => panic!(
+            "Expected load_splat: {}",
+            pos.func.dfg.display_inst(inst, None)
+        ),
+    };
+    let ty = pos.func.dfg.ctrl_typevar(inst);
+    let load = pos.ins().load(ty.lane_type(), flags, ptr, offset);
+
+    pos.func.dfg.replace(inst).splat(ty, load);
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/systemv.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/systemv.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/systemv.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/systemv.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,13 +1,11 @@
 //! Unwind information for System V ABI (x86-64).
 
-use crate::ir::{Function, Inst, InstructionData, Opcode, Value};
+use crate::ir::Function;
 use crate::isa::{
-    unwind::systemv::{CallFrameInstruction, RegisterMappingError, UnwindInfo},
-    x86::registers::RU,
+    unwind::systemv::{RegisterMappingError, UnwindInfo},
     CallConv, RegUnit, TargetIsa,
 };
-use crate::result::{CodegenError, CodegenResult};
-use alloc::vec::Vec;
+use crate::result::CodegenResult;
 use gimli::{write::CommonInformationEntry, Encoding, Format, Register, X86_64};
 
 /// Creates a new x86-64 common information entry (CIE).
@@ -94,195 +92,9 @@
     }
 }
 
-struct InstructionBuilder<'a> {
-    func: &'a Function,
-    isa: &'a dyn TargetIsa,
-    cfa_offset: i32,
-    frame_register: Option<RegUnit>,
-    instructions: Vec<(u32, CallFrameInstruction)>,
-    stack_size: Option<i32>,
-    epilogue_pop_offsets: Vec<u32>,
-}
-
-impl<'a> InstructionBuilder<'a> {
-    fn new(func: &'a Function, isa: &'a dyn TargetIsa, frame_register: Option<RegUnit>) -> Self {
-        Self {
-            func,
-            isa,
-            cfa_offset: 8, // CFA offset starts at 8 to account to return address on stack
-            frame_register,
-            instructions: Vec::new(),
-            stack_size: None,
-            epilogue_pop_offsets: Vec::new(),
-        }
-    }
-
-    fn push_reg(&mut self, offset: u32, arg: Value) -> Result<(), RegisterMappingError> {
-        self.cfa_offset += 8;
-
-        let reg = self.func.locations[arg].unwrap_reg();
-
-        // Update the CFA if this is the save of the frame pointer register or if a frame pointer isn't being used
-        // When using a frame pointer, we only need to update the CFA to account for the push of the frame pointer itself
-        if match self.frame_register {
-            Some(fp) => reg == fp,
-            None => true,
-        } {
-            self.instructions
-                .push((offset, CallFrameInstruction::CfaOffset(self.cfa_offset)));
-        }
-
-        // Pushes in the prologue are register saves, so record an offset of the save
-        self.instructions.push((
-            offset,
-            CallFrameInstruction::Offset(map_reg(self.isa, reg)?.0, -self.cfa_offset),
-        ));
-
-        Ok(())
-    }
-
-    fn adjust_sp_down(&mut self, offset: u32) {
-        // Don't adjust the CFA if we're using a frame pointer
-        if self.frame_register.is_some() {
-            return;
-        }
-
-        self.cfa_offset += self
-            .stack_size
-            .expect("expected a previous stack size instruction");
-        self.instructions
-            .push((offset, CallFrameInstruction::CfaOffset(self.cfa_offset)));
-    }
-
-    fn adjust_sp_down_imm(&mut self, offset: u32, imm: i64) {
-        assert!(imm <= core::u32::MAX as i64);
-
-        // Don't adjust the CFA if we're using a frame pointer
-        if self.frame_register.is_some() {
-            return;
-        }
-
-        self.cfa_offset += imm as i32;
-        self.instructions
-            .push((offset, CallFrameInstruction::CfaOffset(self.cfa_offset)));
-    }
-
-    fn adjust_sp_up_imm(&mut self, offset: u32, imm: i64) {
-        assert!(imm <= core::u32::MAX as i64);
-
-        // Don't adjust the CFA if we're using a frame pointer
-        if self.frame_register.is_some() {
-            return;
-        }
-
-        self.cfa_offset -= imm as i32;
-        self.instructions
-            .push((offset, CallFrameInstruction::CfaOffset(self.cfa_offset)));
-    }
-
-    fn move_reg(
-        &mut self,
-        offset: u32,
-        src: RegUnit,
-        dst: RegUnit,
-    ) -> Result<(), RegisterMappingError> {
-        if let Some(fp) = self.frame_register {
-            // Check for change in CFA register (RSP is always the starting CFA)
-            if src == (RU::rsp as RegUnit) && dst == fp {
-                self.instructions.push((
-                    offset,
-                    CallFrameInstruction::CfaRegister(map_reg(self.isa, dst)?.0),
-                ));
-            }
-        }
-
-        Ok(())
-    }
-
-    fn prologue_imm_const(&mut self, imm: i64) {
-        assert!(imm <= core::u32::MAX as i64);
-        assert!(self.stack_size.is_none());
-
-        // This instruction should only appear in a prologue to pass an
-        // argument of the stack size to a stack check function.
-        // Record the stack size so we know what it is when we encounter the adjustment
-        // instruction (which will adjust via the register assigned to this instruction).
-        self.stack_size = Some(imm as i32);
-    }
-
-    fn ret(&mut self, inst: Inst) -> Result<(), RegisterMappingError> {
-        let args = self.func.dfg.inst_args(inst);
-
-        for (i, arg) in args.iter().rev().enumerate() {
-            // Only walk back the args for the pop instructions encountered
-            if i >= self.epilogue_pop_offsets.len() {
-                break;
-            }
-
-            self.cfa_offset -= 8;
-            let reg = self.func.locations[*arg].unwrap_reg();
-
-            // Update the CFA if this is the restore of the frame pointer register or if a frame pointer isn't being used
-            match self.frame_register {
-                Some(fp) => {
-                    if reg == fp {
-                        self.instructions.push((
-                            self.epilogue_pop_offsets[i],
-                            CallFrameInstruction::Cfa(
-                                map_reg(self.isa, RU::rsp as RegUnit)?.0,
-                                self.cfa_offset,
-                            ),
-                        ));
-                    }
-                }
-                None => {
-                    self.instructions.push((
-                        self.epilogue_pop_offsets[i],
-                        CallFrameInstruction::CfaOffset(self.cfa_offset),
-                    ));
-
-                    // Pops in the epilogue are register restores, so record a "same value" for the register
-                    // This isn't necessary when using a frame pointer as the CFA doesn't change for CSR restores
-                    self.instructions.push((
-                        self.epilogue_pop_offsets[i],
-                        CallFrameInstruction::SameValue(map_reg(self.isa, reg)?.0),
-                    ));
-                }
-            };
-        }
-
-        self.epilogue_pop_offsets.clear();
-
-        Ok(())
-    }
-
-    fn insert_pop_offset(&mut self, offset: u32) {
-        self.epilogue_pop_offsets.push(offset);
-    }
-
-    fn remember_state(&mut self, offset: u32) {
-        self.instructions
-            .push((offset, CallFrameInstruction::RememberState));
-    }
-
-    fn restore_state(&mut self, offset: u32) {
-        self.instructions
-            .push((offset, CallFrameInstruction::RestoreState));
-    }
-
-    fn is_prologue_end(&self, inst: Inst) -> bool {
-        self.func.prologue_end == Some(inst)
-    }
-
-    fn is_epilogue_start(&self, inst: Inst) -> bool {
-        self.func.epilogues_start.contains(&inst)
-    }
-}
-
 pub(crate) fn create_unwind_info(
     func: &Function,
     isa: &dyn TargetIsa,
-    frame_register: Option<RegUnit>,
 ) -> CodegenResult<Option<UnwindInfo>> {
     // Only System V-like calling conventions are supported
     match func.signature.call_conv {
@@ -294,92 +106,25 @@
         return Ok(None);
     }
 
-    let mut builder = InstructionBuilder::new(func, isa, frame_register);
-    let mut in_prologue = true;
-    let mut in_epilogue = false;
-    let mut len = 0;
-
-    let mut blocks = func.layout.blocks().collect::<Vec<_>>();
-    blocks.sort_by_key(|b| func.offsets[*b]);
-
-    for (i, block) in blocks.iter().enumerate() {
-        for (offset, inst, size) in func.inst_offsets(*block, &isa.encoding_info()) {
-            let offset = offset + size;
-            assert!(len <= offset);
-            len = offset;
-
-            let is_last_block = i == blocks.len() - 1;
-
-            if in_prologue {
-                // Check for prologue end (inclusive)
-                in_prologue = !builder.is_prologue_end(inst);
-            } else if !in_epilogue && builder.is_epilogue_start(inst) {
-                // Now in an epilogue, emit a remember state instruction if not last block
-                in_epilogue = true;
-
-                if !is_last_block {
-                    builder.remember_state(offset);
-                }
-            } else if !in_epilogue {
-                // Ignore normal instructions
-                continue;
-            }
+    let unwind = match super::create_unwind_info(func, isa)? {
+        Some(u) => u,
+        None => {
+            return Ok(None);
+        }
+    };
 
-            match builder.func.dfg[inst] {
-                InstructionData::Unary { opcode, arg } => match opcode {
-                    Opcode::X86Push => {
-                        builder
-                            .push_reg(offset, arg)
-                            .map_err(CodegenError::RegisterMappingError)?;
-                    }
-                    Opcode::AdjustSpDown => {
-                        builder.adjust_sp_down(offset);
-                    }
-                    _ => {}
-                },
-                InstructionData::CopySpecial { src, dst, .. } => {
-                    builder
-                        .move_reg(offset, src, dst)
-                        .map_err(CodegenError::RegisterMappingError)?;
-                }
-                InstructionData::NullAry { opcode } => match opcode {
-                    Opcode::X86Pop => {
-                        builder.insert_pop_offset(offset);
-                    }
-                    _ => {}
-                },
-                InstructionData::UnaryImm { opcode, imm } => match opcode {
-                    Opcode::Iconst => {
-                        builder.prologue_imm_const(imm.into());
-                    }
-                    Opcode::AdjustSpDownImm => {
-                        builder.adjust_sp_down_imm(offset, imm.into());
-                    }
-                    Opcode::AdjustSpUpImm => {
-                        builder.adjust_sp_up_imm(offset, imm.into());
-                    }
-                    _ => {}
-                },
-                InstructionData::MultiAry { opcode, .. } => match opcode {
-                    Opcode::Return => {
-                        builder
-                            .ret(inst)
-                            .map_err(CodegenError::RegisterMappingError)?;
-
-                        if !is_last_block {
-                            builder.restore_state(offset);
-                        }
-
-                        in_epilogue = false;
-                    }
-                    _ => {}
-                },
-                _ => {}
-            };
+    struct RegisterMapper<'a, 'b>(&'a (dyn TargetIsa + 'b));
+    impl<'a, 'b> crate::isa::unwind::systemv::RegisterMapper<RegUnit> for RegisterMapper<'a, 'b> {
+        fn map(&self, reg: RegUnit) -> Result<u16, RegisterMappingError> {
+            Ok(map_reg(self.0, reg)?.0)
+        }
+        fn sp(&self) -> u16 {
+            X86_64::RSP.0
         }
     }
+    let map = RegisterMapper(isa);
 
-    Ok(Some(UnwindInfo::new(builder.instructions, len)))
+    Ok(Some(UnwindInfo::build(unwind, &map)?))
 }
 
 #[cfg(test)]
@@ -420,7 +165,7 @@
             _ => panic!("expected unwind information"),
         };
 
-        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(1234), length: 16, lsda: None, instructions: [(2, CfaOffset(16)), (2, Offset(Register(6), -16)), (5, CfaRegister(Register(6))), (15, Cfa(Register(7), 8))] }");
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(1234), length: 16, lsda: None, instructions: [(2, CfaOffset(16)), (2, Offset(Register(6), -16)), (5, CfaRegister(Register(6))), (15, SameValue(Register(6))), (15, Cfa(Register(7), 8))] }");
     }
 
     fn create_function(call_conv: CallConv, stack_slot: Option<StackSlotData>) -> Function {
@@ -460,7 +205,7 @@
             _ => panic!("expected unwind information"),
         };
 
-        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(4321), length: 16, lsda: None, instructions: [(2, CfaOffset(16)), (2, Offset(Register(6), -16)), (5, CfaRegister(Register(6))), (12, RememberState), (12, Cfa(Register(7), 8)), (13, RestoreState), (15, Cfa(Register(7), 0))] }");
+        assert_eq!(format!("{:?}", fde), "FrameDescriptionEntry { address: Constant(4321), length: 16, lsda: None, instructions: [(2, CfaOffset(16)), (2, Offset(Register(6), -16)), (5, CfaRegister(Register(6))), (12, RememberState), (12, SameValue(Register(6))), (12, Cfa(Register(7), 8)), (13, RestoreState), (15, SameValue(Register(6))), (15, Cfa(Register(7), 8))] }");
     }
 
     fn create_multi_return_function(call_conv: CallConv) -> Function {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/winx64.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/winx64.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/winx64.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind/winx64.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,14 +1,9 @@
 //! Unwind information for Windows x64 ABI.
 
-use crate::ir::{Function, InstructionData, Opcode, ValueLoc};
-use crate::isa::x86::registers::{FPR, GPR, RU};
-use crate::isa::{
-    unwind::winx64::{UnwindCode, UnwindInfo},
-    CallConv, RegUnit, TargetIsa,
-};
-use crate::result::{CodegenError, CodegenResult};
-use alloc::vec::Vec;
-use log::warn;
+use crate::ir::Function;
+use crate::isa::x86::registers::{FPR, GPR};
+use crate::isa::{unwind::winx64::UnwindInfo, CallConv, RegUnit, TargetIsa};
+use crate::result::CodegenResult;
 
 pub(crate) fn create_unwind_info(
     func: &Function,
@@ -19,115 +14,29 @@
         return Ok(None);
     }
 
-    let prologue_end = func.prologue_end.unwrap();
-    let entry_block = func.layout.entry_block().expect("missing entry block");
-
-    // Stores the stack size when SP is not adjusted via an immediate value
-    let mut stack_size = None;
-    let mut prologue_size = 0;
-    let mut unwind_codes = Vec::new();
-    let mut found_end = false;
-
-    for (offset, inst, size) in func.inst_offsets(entry_block, &isa.encoding_info()) {
-        // x64 ABI prologues cannot exceed 255 bytes in length
-        if (offset + size) > 255 {
-            warn!("function prologues cannot exceed 255 bytes in size for Windows x64");
-            return Err(CodegenError::CodeTooLarge);
+    let unwind = match super::create_unwind_info(func, isa)? {
+        Some(u) => u,
+        None => {
+            return Ok(None);
         }
+    };
 
-        prologue_size += size;
+    Ok(Some(UnwindInfo::build::<RegisterMapper>(unwind)?))
+}
 
-        let unwind_offset = (offset + size) as u8;
+struct RegisterMapper;
 
-        match func.dfg[inst] {
-            InstructionData::Unary { opcode, arg } => {
-                match opcode {
-                    Opcode::X86Push => {
-                        unwind_codes.push(UnwindCode::PushRegister {
-                            offset: unwind_offset,
-                            reg: GPR.index_of(func.locations[arg].unwrap_reg()) as u8,
-                        });
-                    }
-                    Opcode::AdjustSpDown => {
-                        let stack_size =
-                            stack_size.expect("expected a previous stack size instruction");
-
-                        // This is used when calling a stack check function
-                        // We need to track the assignment to RAX which has the size of the stack
-                        unwind_codes.push(UnwindCode::StackAlloc {
-                            offset: unwind_offset,
-                            size: stack_size,
-                        });
-                    }
-                    _ => {}
-                }
-            }
-            InstructionData::UnaryImm { opcode, imm } => {
-                match opcode {
-                    Opcode::Iconst => {
-                        let imm: i64 = imm.into();
-                        assert!(imm <= core::u32::MAX as i64);
-                        assert!(stack_size.is_none());
-
-                        // This instruction should only appear in a prologue to pass an
-                        // argument of the stack size to a stack check function.
-                        // Record the stack size so we know what it is when we encounter the adjustment
-                        // instruction (which will adjust via the register assigned to this instruction).
-                        stack_size = Some(imm as u32);
-                    }
-                    Opcode::AdjustSpDownImm => {
-                        let imm: i64 = imm.into();
-                        assert!(imm <= core::u32::MAX as i64);
-
-                        stack_size = Some(imm as u32);
-
-                        unwind_codes.push(UnwindCode::StackAlloc {
-                            offset: unwind_offset,
-                            size: imm as u32,
-                        });
-                    }
-                    _ => {}
-                }
-            }
-            InstructionData::Store {
-                opcode: Opcode::Store,
-                args: [arg1, arg2],
-                offset,
-                ..
-            } => {
-                if let (ValueLoc::Reg(src), ValueLoc::Reg(dst)) =
-                    (func.locations[arg1], func.locations[arg2])
-                {
-                    // If this is a save of an FPR, record an unwind operation
-                    // Note: the stack_offset here is relative to an adjusted SP
-                    if dst == (RU::rsp as RegUnit) && FPR.contains(src) {
-                        let offset: i32 = offset.into();
-                        unwind_codes.push(UnwindCode::SaveXmm {
-                            offset: unwind_offset,
-                            reg: src as u8,
-                            stack_offset: offset as u32,
-                        });
-                    }
-                }
-            }
-            _ => {}
-        };
-
-        if inst == prologue_end {
-            found_end = true;
-            break;
+impl crate::isa::unwind::winx64::RegisterMapper for RegisterMapper {
+    fn map(reg: RegUnit) -> crate::isa::unwind::winx64::MappedRegister {
+        use crate::isa::unwind::winx64::MappedRegister;
+        if GPR.contains(reg) {
+            MappedRegister::Int(GPR.index_of(reg) as u8)
+        } else if FPR.contains(reg) {
+            MappedRegister::Xmm(reg as u8)
+        } else {
+            panic!()
         }
     }
-
-    assert!(found_end);
-
-    Ok(Some(UnwindInfo {
-        flags: 0, // this assumes cranelift functions have no SEH handlers
-        prologue_size: prologue_size as u8,
-        frame_register: None,
-        frame_register_offset: 0,
-        unwind_codes,
-    }))
 }
 
 #[cfg(test)]
@@ -135,6 +44,8 @@
     use super::*;
     use crate::cursor::{Cursor, FuncCursor};
     use crate::ir::{ExternalName, InstBuilder, Signature, StackSlotData, StackSlotKind};
+    use crate::isa::unwind::winx64::UnwindCode;
+    use crate::isa::x86::registers::RU;
     use crate::isa::{lookup, CallConv};
     use crate::settings::{builder, Flags};
     use crate::Context;
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/isa/x86/unwind.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,3 +2,534 @@
 
 pub mod systemv;
 pub mod winx64;
+
+use crate::ir::{Function, InstructionData, Opcode, ValueLoc};
+use crate::isa::x86::registers::{FPR, RU};
+use crate::isa::{RegUnit, TargetIsa};
+use crate::result::CodegenResult;
+use alloc::vec::Vec;
+use std::collections::HashMap;
+
+use crate::isa::unwind::input::{UnwindCode, UnwindInfo};
+
+pub(crate) fn create_unwind_info(
+    func: &Function,
+    isa: &dyn TargetIsa,
+) -> CodegenResult<Option<UnwindInfo<RegUnit>>> {
+    // Find last block based on max offset.
+    let last_block = func
+        .layout
+        .blocks()
+        .max_by_key(|b| func.offsets[*b])
+        .expect("at least a block");
+    // Find last instruction offset + size, and make it function size.
+    let function_size = func
+        .inst_offsets(last_block, &isa.encoding_info())
+        .fold(0, |_, (offset, _, size)| offset + size);
+
+    let entry_block = func.layout.entry_block().expect("missing entry block");
+    let prologue_end = func.prologue_end.unwrap();
+    let epilogues_start = func
+        .epilogues_start
+        .iter()
+        .map(|(i, b)| (*b, *i))
+        .collect::<HashMap<_, _>>();
+
+    let word_size = isa.pointer_bytes();
+
+    let mut stack_size = None;
+    let mut prologue_size = 0;
+    let mut prologue_unwind_codes = Vec::new();
+    let mut epilogues_unwind_codes = Vec::new();
+    let mut frame_register: Option<RegUnit> = None;
+
+    // Process only entry block and blocks with epilogues.
+    let mut blocks = func
+        .epilogues_start
+        .iter()
+        .map(|(_, b)| *b)
+        .collect::<Vec<_>>();
+    if !blocks.contains(&entry_block) {
+        blocks.push(entry_block);
+    }
+    blocks.sort_by_key(|b| func.offsets[*b]);
+
+    for block in blocks.iter() {
+        let mut in_prologue = block == &entry_block;
+        let mut in_epilogue = false;
+        let mut epilogue_pop_offsets = Vec::new();
+
+        let epilogue_start = epilogues_start.get(block);
+        let is_last_block = block == &last_block;
+
+        for (offset, inst, size) in func.inst_offsets(*block, &isa.encoding_info()) {
+            let offset = offset + size;
+
+            let unwind_codes;
+            if in_prologue {
+                // Check for prologue end (inclusive)
+                if prologue_end == inst {
+                    in_prologue = false;
+                }
+                prologue_size += size;
+                unwind_codes = &mut prologue_unwind_codes;
+            } else if !in_epilogue && epilogue_start == Some(&inst) {
+                // Now in an epilogue, emit a remember state instruction if not last block
+                in_epilogue = true;
+
+                epilogues_unwind_codes.push(Vec::new());
+                unwind_codes = epilogues_unwind_codes.last_mut().unwrap();
+
+                if !is_last_block {
+                    unwind_codes.push((offset, UnwindCode::RememberState));
+                }
+            } else if in_epilogue {
+                unwind_codes = epilogues_unwind_codes.last_mut().unwrap();
+            } else {
+                // Ignore normal instructions
+                continue;
+            }
+
+            match func.dfg[inst] {
+                InstructionData::Unary { opcode, arg } => {
+                    match opcode {
+                        Opcode::X86Push => {
+                            let reg = func.locations[arg].unwrap_reg();
+                            unwind_codes.push((
+                                offset,
+                                UnwindCode::StackAlloc {
+                                    size: word_size.into(),
+                                },
+                            ));
+                            unwind_codes.push((
+                                offset,
+                                UnwindCode::SaveRegister {
+                                    reg,
+                                    stack_offset: 0,
+                                },
+                            ));
+                        }
+                        Opcode::AdjustSpDown => {
+                            let stack_size =
+                                stack_size.expect("expected a previous stack size instruction");
+
+                            // This is used when calling a stack check function
+                            // We need to track the assignment to RAX which has the size of the stack
+                            unwind_codes
+                                .push((offset, UnwindCode::StackAlloc { size: stack_size }));
+                        }
+                        _ => {}
+                    }
+                }
+                InstructionData::UnaryImm { opcode, imm } => {
+                    match opcode {
+                        Opcode::Iconst => {
+                            let imm: i64 = imm.into();
+                            assert!(imm <= core::u32::MAX as i64);
+                            assert!(stack_size.is_none());
+
+                            // This instruction should only appear in a prologue to pass an
+                            // argument of the stack size to a stack check function.
+                            // Record the stack size so we know what it is when we encounter the adjustment
+                            // instruction (which will adjust via the register assigned to this instruction).
+                            stack_size = Some(imm as u32);
+                        }
+                        Opcode::AdjustSpDownImm => {
+                            let imm: i64 = imm.into();
+                            assert!(imm <= core::u32::MAX as i64);
+
+                            stack_size = Some(imm as u32);
+
+                            unwind_codes
+                                .push((offset, UnwindCode::StackAlloc { size: imm as u32 }));
+                        }
+                        Opcode::AdjustSpUpImm => {
+                            let imm: i64 = imm.into();
+                            assert!(imm <= core::u32::MAX as i64);
+
+                            stack_size = Some(imm as u32);
+
+                            unwind_codes
+                                .push((offset, UnwindCode::StackDealloc { size: imm as u32 }));
+                        }
+                        _ => {}
+                    }
+                }
+                InstructionData::Store {
+                    opcode: Opcode::Store,
+                    args: [arg1, arg2],
+                    offset: stack_offset,
+                    ..
+                } => {
+                    if let (ValueLoc::Reg(src), ValueLoc::Reg(dst)) =
+                        (func.locations[arg1], func.locations[arg2])
+                    {
+                        // If this is a save of an FPR, record an unwind operation
+                        // Note: the stack_offset here is relative to an adjusted SP
+                        if dst == (RU::rsp as RegUnit) && FPR.contains(src) {
+                            let stack_offset: i32 = stack_offset.into();
+                            unwind_codes.push((
+                                offset,
+                                UnwindCode::SaveRegister {
+                                    reg: src,
+                                    stack_offset: stack_offset as u32,
+                                },
+                            ));
+                        }
+                    }
+                }
+                InstructionData::CopySpecial { src, dst, .. } if frame_register.is_none() => {
+                    // Check for change in CFA register (RSP is always the starting CFA)
+                    if src == (RU::rsp as RegUnit) {
+                        unwind_codes.push((offset, UnwindCode::SetFramePointer { reg: dst }));
+                        frame_register = Some(dst);
+                    }
+                }
+                InstructionData::NullAry { opcode } => match opcode {
+                    Opcode::X86Pop => {
+                        epilogue_pop_offsets.push(offset);
+                    }
+                    _ => {}
+                },
+                InstructionData::MultiAry { opcode, .. } if in_epilogue => match opcode {
+                    Opcode::Return => {
+                        let args = func.dfg.inst_args(inst);
+                        for (i, arg) in args.iter().rev().enumerate() {
+                            // Only walk back the args for the pop instructions encountered
+                            if i >= epilogue_pop_offsets.len() {
+                                break;
+                            }
+
+                            let offset = epilogue_pop_offsets[i];
+
+                            let reg = func.locations[*arg].unwrap_reg();
+                            unwind_codes.push((offset, UnwindCode::RestoreRegister { reg }));
+                            unwind_codes.push((
+                                offset,
+                                UnwindCode::StackDealloc {
+                                    size: word_size.into(),
+                                },
+                            ));
+
+                            if Some(reg) == frame_register {
+                                unwind_codes.push((offset, UnwindCode::RestoreFramePointer));
+                                // Keep frame_register assigned for next epilogue.
+                            }
+                        }
+                        epilogue_pop_offsets.clear();
+
+                        // TODO ensure unwind codes sorted by offsets ?
+
+                        if !is_last_block {
+                            unwind_codes.push((offset, UnwindCode::RestoreState));
+                        }
+
+                        in_epilogue = false;
+                    }
+                    _ => {}
+                },
+                _ => {}
+            };
+        }
+    }
+
+    Ok(Some(UnwindInfo {
+        prologue_size,
+        prologue_unwind_codes,
+        epilogues_unwind_codes,
+        function_size,
+        word_size,
+        initial_sp_offset: word_size,
+    }))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::cursor::{Cursor, FuncCursor};
+    use crate::ir::{
+        types, AbiParam, ExternalName, InstBuilder, Signature, StackSlotData, StackSlotKind,
+    };
+    use crate::isa::{lookup, CallConv};
+    use crate::settings::{builder, Flags};
+    use crate::Context;
+    use std::str::FromStr;
+    use target_lexicon::triple;
+
+    #[test]
+    #[cfg_attr(feature = "x64", should_panic)] // TODO #2079
+    fn test_small_alloc() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::WindowsFastcall,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 64)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let unwind = create_unwind_info(&context.func, &*isa)
+            .expect("can create unwind info")
+            .expect("expected unwind info");
+
+        assert_eq!(
+            unwind,
+            UnwindInfo {
+                prologue_size: 9,
+                prologue_unwind_codes: vec![
+                    (2, UnwindCode::StackAlloc { size: 8 }),
+                    (
+                        2,
+                        UnwindCode::SaveRegister {
+                            reg: RU::rbp.into(),
+                            stack_offset: 0,
+                        }
+                    ),
+                    (
+                        5,
+                        UnwindCode::SetFramePointer {
+                            reg: RU::rbp.into(),
+                        }
+                    ),
+                    (9, UnwindCode::StackAlloc { size: 64 })
+                ],
+                epilogues_unwind_codes: vec![vec![
+                    (13, UnwindCode::StackDealloc { size: 64 }),
+                    (
+                        15,
+                        UnwindCode::RestoreRegister {
+                            reg: RU::rbp.into()
+                        }
+                    ),
+                    (15, UnwindCode::StackDealloc { size: 8 }),
+                    (15, UnwindCode::RestoreFramePointer)
+                ]],
+                function_size: 16,
+                word_size: 8,
+                initial_sp_offset: 8,
+            }
+        );
+    }
+
+    #[test]
+    #[cfg_attr(feature = "x64", should_panic)] // TODO #2079
+    fn test_medium_alloc() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::WindowsFastcall,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 10000)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let unwind = create_unwind_info(&context.func, &*isa)
+            .expect("can create unwind info")
+            .expect("expected unwind info");
+
+        assert_eq!(
+            unwind,
+            UnwindInfo {
+                prologue_size: 27,
+                prologue_unwind_codes: vec![
+                    (2, UnwindCode::StackAlloc { size: 8 }),
+                    (
+                        2,
+                        UnwindCode::SaveRegister {
+                            reg: RU::rbp.into(),
+                            stack_offset: 0,
+                        }
+                    ),
+                    (
+                        5,
+                        UnwindCode::SetFramePointer {
+                            reg: RU::rbp.into(),
+                        }
+                    ),
+                    (27, UnwindCode::StackAlloc { size: 10000 })
+                ],
+                epilogues_unwind_codes: vec![vec![
+                    (34, UnwindCode::StackDealloc { size: 10000 }),
+                    (
+                        36,
+                        UnwindCode::RestoreRegister {
+                            reg: RU::rbp.into()
+                        }
+                    ),
+                    (36, UnwindCode::StackDealloc { size: 8 }),
+                    (36, UnwindCode::RestoreFramePointer)
+                ]],
+                function_size: 37,
+                word_size: 8,
+                initial_sp_offset: 8,
+            }
+        );
+    }
+
+    #[test]
+    #[cfg_attr(feature = "x64", should_panic)] // TODO #2079
+    fn test_large_alloc() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_function(
+            CallConv::WindowsFastcall,
+            Some(StackSlotData::new(StackSlotKind::ExplicitSlot, 1000000)),
+        ));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let unwind = create_unwind_info(&context.func, &*isa)
+            .expect("can create unwind info")
+            .expect("expected unwind info");
+
+        assert_eq!(
+            unwind,
+            UnwindInfo {
+                prologue_size: 27,
+                prologue_unwind_codes: vec![
+                    (2, UnwindCode::StackAlloc { size: 8 }),
+                    (
+                        2,
+                        UnwindCode::SaveRegister {
+                            reg: RU::rbp.into(),
+                            stack_offset: 0,
+                        }
+                    ),
+                    (
+                        5,
+                        UnwindCode::SetFramePointer {
+                            reg: RU::rbp.into(),
+                        }
+                    ),
+                    (27, UnwindCode::StackAlloc { size: 1000000 })
+                ],
+                epilogues_unwind_codes: vec![vec![
+                    (34, UnwindCode::StackDealloc { size: 1000000 }),
+                    (
+                        36,
+                        UnwindCode::RestoreRegister {
+                            reg: RU::rbp.into()
+                        }
+                    ),
+                    (36, UnwindCode::StackDealloc { size: 8 }),
+                    (36, UnwindCode::RestoreFramePointer)
+                ]],
+                function_size: 37,
+                word_size: 8,
+                initial_sp_offset: 8,
+            }
+        );
+    }
+
+    fn create_function(call_conv: CallConv, stack_slot: Option<StackSlotData>) -> Function {
+        let mut func =
+            Function::with_name_signature(ExternalName::user(0, 0), Signature::new(call_conv));
+
+        let block0 = func.dfg.make_block();
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().return_(&[]);
+
+        if let Some(stack_slot) = stack_slot {
+            func.stack_slots.push(stack_slot);
+        }
+
+        func
+    }
+
+    #[test]
+    #[cfg_attr(feature = "x64", should_panic)] // TODO #2079
+    fn test_multi_return_func() {
+        let isa = lookup(triple!("x86_64"))
+            .expect("expect x86 ISA")
+            .finish(Flags::new(builder()));
+
+        let mut context = Context::for_function(create_multi_return_function(CallConv::SystemV));
+
+        context.compile(&*isa).expect("expected compilation");
+
+        let unwind = create_unwind_info(&context.func, &*isa)
+            .expect("can create unwind info")
+            .expect("expected unwind info");
+
+        assert_eq!(
+            unwind,
+            UnwindInfo {
+                prologue_size: 5,
+                prologue_unwind_codes: vec![
+                    (2, UnwindCode::StackAlloc { size: 8 }),
+                    (
+                        2,
+                        UnwindCode::SaveRegister {
+                            reg: RU::rbp.into(),
+                            stack_offset: 0,
+                        }
+                    ),
+                    (
+                        5,
+                        UnwindCode::SetFramePointer {
+                            reg: RU::rbp.into()
+                        }
+                    )
+                ],
+                epilogues_unwind_codes: vec![
+                    vec![
+                        (12, UnwindCode::RememberState),
+                        (
+                            12,
+                            UnwindCode::RestoreRegister {
+                                reg: RU::rbp.into()
+                            }
+                        ),
+                        (12, UnwindCode::StackDealloc { size: 8 }),
+                        (12, UnwindCode::RestoreFramePointer),
+                        (13, UnwindCode::RestoreState)
+                    ],
+                    vec![
+                        (
+                            15,
+                            UnwindCode::RestoreRegister {
+                                reg: RU::rbp.into()
+                            }
+                        ),
+                        (15, UnwindCode::StackDealloc { size: 8 }),
+                        (15, UnwindCode::RestoreFramePointer)
+                    ]
+                ],
+                function_size: 16,
+                word_size: 8,
+                initial_sp_offset: 8,
+            }
+        );
+    }
+
+    fn create_multi_return_function(call_conv: CallConv) -> Function {
+        let mut sig = Signature::new(call_conv);
+        sig.params.push(AbiParam::new(types::I32));
+        let mut func = Function::with_name_signature(ExternalName::user(0, 0), sig);
+
+        let block0 = func.dfg.make_block();
+        let v0 = func.dfg.append_block_param(block0, types::I32);
+        let block1 = func.dfg.make_block();
+        let block2 = func.dfg.make_block();
+
+        let mut pos = FuncCursor::new(&mut func);
+        pos.insert_block(block0);
+        pos.ins().brnz(v0, block2, &[]);
+        pos.ins().jump(block1, &[]);
+
+        pos.insert_block(block1);
+        pos.ins().return_(&[]);
+
+        pos.insert_block(block2);
+        pos.ins().return_(&[]);
+
+        func
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/legalizer/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/legalizer/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/legalizer/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/legalizer/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -774,12 +774,12 @@
     let ty = pos.func.dfg.ctrl_typevar(inst);
     let ty_half = ty.half_width().unwrap();
 
-    let imm_low = pos
-        .ins()
-        .iconst(ty_half, imm & ((1u128 << ty_half.bits()) - 1) as i64);
-    let imm_high = pos
-        .ins()
-        .iconst(ty_half, imm.wrapping_shr(ty_half.bits().into()));
+    let mask = ((1u128 << ty_half.bits()) - 1) as i64;
+    let imm_low = pos.ins().iconst(ty_half, imm & mask);
+    let imm_high = pos.ins().iconst(
+        ty_half,
+        imm.checked_shr(ty_half.bits().into()).unwrap_or(0) & mask,
+    );
     let (arg_low, arg_high) = pos.ins().isplit(arg);
 
     match cond {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -31,8 +31,7 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
+        clippy::map_unwrap_or,
         clippy::unicode_not_nfc,
         clippy::use_self
     )
@@ -71,6 +70,7 @@
 pub mod binemit;
 pub mod cfg_printer;
 pub mod cursor;
+pub mod data_value;
 pub mod dbg;
 pub mod dominator_tree;
 pub mod flowgraph;
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/licm.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/licm.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/licm.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/licm.rs	2021-01-18 19:58:25.000000000 +0000
@@ -61,8 +61,8 @@
     domtree.compute(func, cfg);
 }
 
-// Insert a pre-header before the header, modifying the function layout and CFG to reflect it.
-// A jump instruction to the header is placed at the end of the pre-header.
+/// Insert a pre-header before the header, modifying the function layout and CFG to reflect it.
+/// A jump instruction to the header is placed at the end of the pre-header.
 fn create_pre_header(
     isa: &dyn TargetIsa,
     header: Block,
@@ -81,30 +81,31 @@
     for typ in header_args_types {
         pre_header_args_value.push(func.dfg.append_block_param(pre_header, typ), pool);
     }
+
     for BlockPredecessor {
         inst: last_inst, ..
     } in cfg.pred_iter(header)
     {
         // We only follow normal edges (not the back edges)
         if !domtree.dominates(header, last_inst, &func.layout) {
-            func.change_branch_destination(last_inst, pre_header);
+            func.rewrite_branch_destination(last_inst, header, pre_header);
         }
     }
-    {
-        let mut pos = EncCursor::new(func, isa).at_top(header);
-        // Inserts the pre-header at the right place in the layout.
-        pos.insert_block(pre_header);
-        pos.next_inst();
-        pos.ins().jump(header, pre_header_args_value.as_slice(pool));
-    }
+
+    // Inserts the pre-header at the right place in the layout.
+    let mut pos = EncCursor::new(func, isa).at_top(header);
+    pos.insert_block(pre_header);
+    pos.next_inst();
+    pos.ins().jump(header, pre_header_args_value.as_slice(pool));
+
     pre_header
 }
 
-// Detects if a loop header has a natural pre-header.
-//
-// A loop header has a pre-header if there is only one predecessor that the header doesn't
-// dominate.
-// Returns the pre-header Block and the instruction jumping to the header.
+/// Detects if a loop header has a natural pre-header.
+///
+/// A loop header has a pre-header if there is only one predecessor that the header doesn't
+/// dominate.
+/// Returns the pre-header Block and the instruction jumping to the header.
 fn has_pre_header(
     layout: &Layout,
     cfg: &ControlFlowGraph,
@@ -176,9 +177,9 @@
     true
 }
 
-// Traverses a loop in reverse post-order from a header block and identify loop-invariant
-// instructions. These loop-invariant instructions are then removed from the code and returned
-// (in reverse post-order) for later use.
+/// Traverses a loop in reverse post-order from a header block and identify loop-invariant
+/// instructions. These loop-invariant instructions are then removed from the code and returned
+/// (in reverse post-order) for later use.
 fn remove_loop_invariant_instructions(
     lp: Loop,
     func: &mut Function,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/abi_impl.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/abi_impl.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/abi_impl.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/abi_impl.rs	2021-01-18 19:58:25.000000000 +0000
@@ -111,7 +111,7 @@
 use super::abi::*;
 use crate::binemit::StackMap;
 use crate::ir::types::*;
-use crate::ir::{ArgumentExtension, SourceLoc, StackSlot};
+use crate::ir::{ArgumentExtension, StackSlot};
 use crate::machinst::*;
 use crate::settings;
 use crate::CodegenResult;
@@ -216,6 +216,9 @@
         }
     }
 
+    /// Returns required stack alignment in bytes.
+    fn stack_align(call_conv: isa::CallConv) -> u32;
+
     /// Process a list of parameters or return values and allocate them to registers
     /// and stack slots.
     ///
@@ -326,6 +329,7 @@
         flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
         fixed_frame_storage_size: u32,
+        outgoing_args_size: u32,
     ) -> (u64, SmallVec<[Self::I; 16]>);
 
     /// Generate a clobber-restore sequence. This sequence should perform the
@@ -336,6 +340,8 @@
         call_conv: isa::CallConv,
         flags: &settings::Flags,
         clobbers: &Set<Writable<RealReg>>,
+        fixed_frame_storage_size: u32,
+        outgoing_args_size: u32,
     ) -> SmallVec<[Self::I; 16]>;
 
     /// Generate a call instruction/sequence. This method is provided one
@@ -344,9 +350,10 @@
         dest: &CallDest,
         uses: Vec<Reg>,
         defs: Vec<Writable<Reg>>,
-        loc: SourceLoc,
         opcode: ir::Opcode,
         tmp: Writable<Reg>,
+        callee_conv: isa::CallConv,
+        callee_conv: isa::CallConv,
     ) -> SmallVec<[(InstIsSafepoint, Self::I); 2]>;
 
     /// Get the number of spillslots required for the given register-class and
@@ -359,8 +366,9 @@
     /// Get the "nominal SP to FP" offset from an instruction-emission state.
     fn get_nominal_sp_to_fp(s: &<Self::I as MachInstEmit>::State) -> i64;
 
-    /// Get all caller-save registers.
-    fn get_caller_saves(call_conv: isa::CallConv) -> Vec<Writable<Reg>>;
+    /// Get all caller-save registers, that is, registers that we expect
+    /// not to be saved across a call to a callee with the given ABI.
+    fn get_regs_clobbered_by_call(call_conv_of_callee: isa::CallConv) -> Vec<Writable<Reg>>;
 }
 
 /// ABI information shared between body (callee) and caller.
@@ -428,10 +436,16 @@
     stackslots: Vec<u32>,
     /// Total stack size of all stackslots.
     stackslots_size: u32,
+    /// Stack size to be reserved for outgoing arguments.
+    outgoing_args_size: u32,
     /// Clobbered registers, from regalloc.
     clobbered: Set<Writable<RealReg>>,
     /// Total number of spillslots, from regalloc.
     spillslots: Option<usize>,
+    /// Storage allocated for the fixed part of the stack frame.  This is
+    /// usually the same as the total frame size below, except in the case
+    /// of the baldrdash calling convention.
+    fixed_frame_storage_size: u32,
     /// "Total frame size", as defined by "distance between FP and nominal SP".
     /// Some items are pushed below nominal SP, so the function may actually use
     /// more stack than this would otherwise imply. It is simply the initial
@@ -516,8 +530,10 @@
             sig,
             stackslots,
             stackslots_size: stack_offset,
+            outgoing_args_size: 0,
             clobbered: Set::empty(),
             spillslots: None,
+            fixed_frame_storage_size: 0,
             total_frame_size: None,
             ret_area_ptr: None,
             call_conv,
@@ -678,10 +694,20 @@
         }
     }
 
+    fn accumulate_outgoing_args_size(&mut self, size: u32) {
+        if size > self.outgoing_args_size {
+            self.outgoing_args_size = size;
+        }
+    }
+
     fn flags(&self) -> &settings::Flags {
         &self.flags
     }
 
+    fn call_conv(&self) -> isa::CallConv {
+        self.sig.call_conv
+    }
+
     fn liveins(&self) -> Set<RealReg> {
         let mut set: Set<RealReg> = Set::empty();
         for &arg in &self.sig.args {
@@ -929,11 +955,9 @@
             );
             total_stacksize += self.flags.baldrdash_prologue_words() as u32 * bytes;
         }
-        let mask = 2 * bytes - 1;
+        let mask = M::stack_align(self.call_conv) - 1;
         let total_stacksize = (total_stacksize + mask) & !mask; // 16-align the stack.
 
-        let mut fixed_frame_storage_size = 0;
-
         if !self.call_conv.extends_baldrdash() {
             // Leaf functions with zero stack don't need a stack check if one's
             // specified, otherwise always insert the stack check.
@@ -944,7 +968,7 @@
                 }
             }
             if total_stacksize > 0 {
-                fixed_frame_storage_size += total_stacksize;
+                self.fixed_frame_storage_size += total_stacksize;
             }
         }
 
@@ -963,12 +987,14 @@
             self.call_conv,
             &self.flags,
             &self.clobbered,
-            fixed_frame_storage_size,
+            self.fixed_frame_storage_size,
+            self.outgoing_args_size,
         );
         insts.extend(clobber_insts);
 
-        if clobber_size > 0 {
-            insts.push(M::gen_nominal_sp_adj(clobber_size as i32));
+        let sp_adj = self.outgoing_args_size as i32 + clobber_size as i32;
+        if sp_adj > 0 {
+            insts.push(M::gen_nominal_sp_adj(sp_adj));
         }
 
         self.total_frame_size = Some(total_stacksize);
@@ -983,6 +1009,8 @@
             self.call_conv,
             &self.flags,
             &self.clobbered,
+            self.fixed_frame_storage_size,
+            self.outgoing_args_size,
         ));
 
         // N.B.: we do *not* emit a nominal SP adjustment here, because (i) there will be no
@@ -1027,6 +1055,18 @@
         let ty = ty_from_ty_hint_or_reg_class::<M>(to_reg.to_reg().to_reg(), ty);
         self.load_spillslot(from_slot, ty, to_reg.map(|r| r.to_reg()))
     }
+
+    fn unwind_info_kind(&self) -> UnwindInfoKind {
+        match self.sig.call_conv {
+            #[cfg(feature = "unwind")]
+            isa::CallConv::Fast | isa::CallConv::Cold | isa::CallConv::SystemV => {
+                UnwindInfoKind::SystemV
+            }
+            #[cfg(feature = "unwind")]
+            isa::CallConv::WindowsFastcall => UnwindInfoKind::Windows,
+            _ => UnwindInfoKind::None,
+        }
+    }
 }
 
 fn abisig_to_uses_and_defs<M: ABIMachineSpec>(sig: &ABISig) -> (Vec<Reg>, Vec<Writable<Reg>>) {
@@ -1040,7 +1080,7 @@
     }
 
     // Compute defs: all retval regs, and all caller-save (clobbered) regs.
-    let mut defs = M::get_caller_saves(sig.call_conv);
+    let mut defs = M::get_regs_clobbered_by_call(sig.call_conv);
     for ret in &sig.rets {
         match ret {
             &ABIArg::Reg(reg, ..) => defs.push(Writable::from_reg(reg.to_reg())),
@@ -1061,10 +1101,10 @@
     defs: Vec<Writable<Reg>>,
     /// Call destination.
     dest: CallDest,
-    /// Location of callsite.
-    loc: ir::SourceLoc,
-    /// Actuall call opcode; used to distinguish various types of calls.
+    /// Actual call opcode; used to distinguish various types of calls.
     opcode: ir::Opcode,
+    /// Caller's calling convention.
+    caller_conv: isa::CallConv,
 
     _mach: PhantomData<M>,
 }
@@ -1084,7 +1124,7 @@
         sig: &ir::Signature,
         extname: &ir::ExternalName,
         dist: RelocDistance,
-        loc: ir::SourceLoc,
+        caller_conv: isa::CallConv,
     ) -> CodegenResult<ABICallerImpl<M>> {
         let sig = ABISig::from_func_sig::<M>(sig)?;
         let (uses, defs) = abisig_to_uses_and_defs::<M>(&sig);
@@ -1093,8 +1133,8 @@
             uses,
             defs,
             dest: CallDest::ExtName(extname.clone(), dist),
-            loc,
             opcode: ir::Opcode::Call,
+            caller_conv,
             _mach: PhantomData,
         })
     }
@@ -1104,8 +1144,8 @@
     pub fn from_ptr(
         sig: &ir::Signature,
         ptr: Reg,
-        loc: ir::SourceLoc,
         opcode: ir::Opcode,
+        caller_conv: isa::CallConv,
     ) -> CodegenResult<ABICallerImpl<M>> {
         let sig = ABISig::from_func_sig::<M>(sig)?;
         let (uses, defs) = abisig_to_uses_and_defs::<M>(&sig);
@@ -1114,8 +1154,8 @@
             uses,
             defs,
             dest: CallDest::Reg(ptr),
-            loc,
             opcode,
+            caller_conv,
             _mach: PhantomData,
         })
     }
@@ -1147,6 +1187,11 @@
         }
     }
 
+    fn accumulate_outgoing_args_size<C: LowerCtx<I = Self::I>>(&self, ctx: &mut C) {
+        let off = self.sig.stack_arg_space + self.sig.stack_ret_space;
+        ctx.abi().accumulate_outgoing_args_size(off as u32);
+    }
+
     fn emit_stack_pre_adjust<C: LowerCtx<I = Self::I>>(&self, ctx: &mut C) {
         let off = self.sig.stack_arg_space + self.sig.stack_ret_space;
         adjust_stack_and_nominal_sp::<M, C>(ctx, off as i32, /* is_sub = */ true)
@@ -1255,8 +1300,16 @@
             self.emit_copy_reg_to_arg(ctx, i, rd.to_reg());
         }
         let tmp = ctx.alloc_tmp(word_rc, word_type);
-        for (is_safepoint, inst) in
-            M::gen_call(&self.dest, uses, defs, self.loc, self.opcode, tmp).into_iter()
+        for (is_safepoint, inst) in M::gen_call(
+            &self.dest,
+            uses,
+            defs,
+            self.opcode,
+            tmp,
+            self.sig.call_conv,
+            self.caller_conv,
+        )
+        .into_iter()
         {
             match is_safepoint {
                 InstIsSafepoint::Yes => ctx.emit_safepoint(inst),
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/abi.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/abi.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/abi.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/abi.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,6 +2,7 @@
 
 use crate::binemit::StackMap;
 use crate::ir::StackSlot;
+use crate::isa::CallConv;
 use crate::machinst::*;
 use crate::settings;
 
@@ -22,9 +23,18 @@
     /// lowering context exists.
     fn init(&mut self, maybe_tmp: Option<Writable<Reg>>);
 
+    /// Accumulate outgoing arguments.  This ensures that at least SIZE bytes
+    /// are allocated in the prologue to be available for use in function calls
+    /// to hold arguments and/or return values.  If this function is called
+    /// multiple times, the maximum of all SIZE values will be available.
+    fn accumulate_outgoing_args_size(&mut self, size: u32);
+
     /// Get the settings controlling this function's compilation.
     fn flags(&self) -> &settings::Flags;
 
+    /// Get the calling convention implemented by this ABI object.
+    fn call_conv(&self) -> CallConv;
+
     /// Get the liveins of the function.
     fn liveins(&self) -> Set<RealReg>;
 
@@ -151,6 +161,9 @@
         from_slot: SpillSlot,
         ty: Option<Type>,
     ) -> Self::I;
+
+    /// Desired unwind info type.
+    fn unwind_info_kind(&self) -> UnwindInfoKind;
 }
 
 /// Trait implemented by an object that tracks ABI-related state and can
@@ -196,6 +209,13 @@
     /// Emit code to post-adjust the satck, after call return and return-value copies.
     fn emit_stack_post_adjust<C: LowerCtx<I = Self::I>>(&self, ctx: &mut C);
 
+    /// Accumulate outgoing arguments.  This ensures that the caller (as
+    /// identified via the CTX argument) allocates enough space in the
+    /// prologue to hold all arguments and return values for this call.
+    /// There is no code emitted at the call site, everything is done
+    /// in the caller's function prologue.
+    fn accumulate_outgoing_args_size<C: LowerCtx<I = Self::I>>(&self, ctx: &mut C);
+
     /// Emit the call itself.
     ///
     /// The returned instruction should have proper use- and def-sets according
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/adapter.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/adapter.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/adapter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/adapter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -129,6 +129,11 @@
         self.backend.unsigned_sub_overflow_condition()
     }
 
+    #[cfg(feature = "unwind")]
+    fn create_systemv_cie(&self) -> Option<gimli::write::CommonInformationEntry> {
+        self.backend.create_systemv_cie()
+    }
+
     fn as_any(&self) -> &dyn Any {
         self as &dyn Any
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/buffer.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/buffer.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/buffer.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/buffer.rs	2021-01-18 19:58:25.000000000 +0000
@@ -142,12 +142,14 @@
 
 use crate::binemit::{Addend, CodeOffset, CodeSink, Reloc, StackMap};
 use crate::ir::{ExternalName, Opcode, SourceLoc, TrapCode};
-use crate::machinst::{BlockIndex, MachInstLabelUse, VCodeInst};
+use crate::machinst::{BlockIndex, MachInstLabelUse, VCodeConstant, VCodeConstants, VCodeInst};
 use crate::timing;
+use cranelift_entity::{entity_impl, SecondaryMap};
 
 use log::trace;
 use smallvec::SmallVec;
 use std::mem;
+use std::string::String;
 
 /// A buffer of output to be produced, fixed up, and then emitted to a CodeSink
 /// in bulk.
@@ -217,6 +219,8 @@
     /// when the offset has grown past this (`labels_at_tail_off`) point.
     /// Always <= `cur_offset()`.
     labels_at_tail_off: CodeOffset,
+    /// Map used constants to their [MachLabel].
+    constant_labels: SecondaryMap<VCodeConstant, MachLabel>,
 }
 
 /// A `MachBuffer` once emission is completed: holds generated code and records,
@@ -247,6 +251,7 @@
 /// appropriately when the label's location is eventually known.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct MachLabel(u32);
+entity_impl!(MachLabel);
 
 impl MachLabel {
     /// Get a label for a block. (The first N MachLabels are always reseved for
@@ -259,6 +264,17 @@
     pub fn get(self) -> u32 {
         self.0
     }
+
+    /// Creates a string representing this label, for convenience.
+    pub fn to_string(&self) -> String {
+        format!("label{}", self.0)
+    }
+}
+
+impl Default for MachLabel {
+    fn default() -> Self {
+        UNKNOWN_LABEL
+    }
 }
 
 /// A stack map extent, when creating a stack map.
@@ -293,6 +309,7 @@
             latest_branches: SmallVec::new(),
             labels_at_tail: SmallVec::new(),
             labels_at_tail_off: 0,
+            constant_labels: SecondaryMap::new(),
         }
     }
 
@@ -462,6 +479,24 @@
         // Post-invariant: as for `get_label()`.
     }
 
+    /// Reserve the next N MachLabels for constants.
+    pub fn reserve_labels_for_constants(&mut self, constants: &VCodeConstants) {
+        trace!(
+            "MachBuffer: next {} labels are for constants",
+            constants.len()
+        );
+        for c in constants.keys() {
+            self.constant_labels[c] = self.get_label();
+        }
+
+        // Post-invariant: as for `get_label()`.
+    }
+
+    /// Retrieve the reserved label for a constant.
+    pub fn get_label_for_constant(&self, constant: VCodeConstant) -> MachLabel {
+        self.constant_labels[constant]
+    }
+
     /// Bind a label to the current offset. A label can only be bound once.
     pub fn bind_label(&mut self, label: MachLabel) {
         trace!(
@@ -992,9 +1027,16 @@
         data: &[u8],
         max_distance: CodeOffset,
     ) {
-        let deadline = self.cur_offset() + max_distance;
+        trace!(
+            "defer_constant: eventually emit {} bytes aligned to {} at label {:?}",
+            data.len(),
+            align,
+            label
+        );
+        let deadline = self.cur_offset().saturating_add(max_distance);
         self.island_worst_case_size += data.len() as CodeOffset;
-        self.island_worst_case_size &= !(I::LabelUse::ALIGN - 1);
+        self.island_worst_case_size =
+            (self.island_worst_case_size + I::LabelUse::ALIGN - 1) & !(I::LabelUse::ALIGN - 1);
         self.pending_constants.push(MachLabelConstant {
             label,
             align,
@@ -1130,14 +1172,6 @@
     pub fn finish(mut self) -> MachBufferFinalized {
         let _tt = timing::vcode_emit_finish();
 
-        // Ensure that all labels are defined. This is a full (release-mode)
-        // assert because we must avoid looping indefinitely below; an
-        // unresolved label will prevent the fixup_records vec from emptying.
-        assert!(self
-            .label_offsets
-            .iter()
-            .all(|&off| off != UNKNOWN_LABEL_OFFSET));
-
         while !self.pending_constants.is_empty() || !self.fixup_records.is_empty() {
             // `emit_island()` will emit any pending veneers and constants, and
             // as a side-effect, will also take care of any fixups with resolved
@@ -1145,6 +1179,11 @@
             self.emit_island();
         }
 
+        // Ensure that all labels have been fixed up after the last island is emitted. This is a
+        // full (release-mode) assert because an unresolved label means the emitted code is
+        // incorrect.
+        assert!(self.fixup_records.is_empty());
+
         MachBufferFinalized {
             data: self.data,
             relocs: self.relocs,
@@ -1421,7 +1460,7 @@
 mod test {
     use super::*;
     use crate::isa::aarch64::inst::xreg;
-    use crate::isa::aarch64::inst::{BranchTarget, CondBrKind, Inst};
+    use crate::isa::aarch64::inst::{BranchTarget, CondBrKind, EmitInfo, Inst};
     use crate::machinst::MachInstEmit;
     use crate::settings;
     use std::default::Default;
@@ -1435,14 +1474,14 @@
 
     #[test]
     fn test_elide_jump_to_next() {
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
         buf.reserve_labels_for_blocks(2);
         buf.bind_label(label(0));
         let inst = Inst::Jump { dest: target(1) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
         buf.bind_label(label(1));
         let buf = buf.finish();
         assert_eq!(0, buf.total_size());
@@ -1450,7 +1489,7 @@
 
     #[test]
     fn test_elide_trivial_jump_blocks() {
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1462,15 +1501,15 @@
             taken: target(1),
             not_taken: target(2),
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         let inst = Inst::Jump { dest: target(3) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(2));
         let inst = Inst::Jump { dest: target(3) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(3));
 
@@ -1480,7 +1519,7 @@
 
     #[test]
     fn test_flip_cond() {
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1492,17 +1531,17 @@
             taken: target(1),
             not_taken: target(2),
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         let inst = Inst::Udf {
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(2));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(3));
 
@@ -1512,11 +1551,11 @@
         let mut state = Default::default();
         let inst = Inst::TrapIf {
             kind: CondBrKind::NotZero(xreg(0)),
-            trap_info: (SourceLoc::default(), TrapCode::Interrupt),
+            trap_code: TrapCode::Interrupt,
         };
-        inst.emit(&mut buf2, &flags, &mut state);
+        inst.emit(&mut buf2, &info, &mut state);
         let inst = Inst::Nop4;
-        inst.emit(&mut buf2, &flags, &mut state);
+        inst.emit(&mut buf2, &info, &mut state);
 
         let buf2 = buf2.finish();
 
@@ -1525,7 +1564,7 @@
 
     #[test]
     fn test_island() {
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1537,7 +1576,7 @@
             taken: target(2),
             not_taken: target(3),
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         while buf.cur_offset() < 2000000 {
@@ -1545,16 +1584,16 @@
                 buf.emit_island();
             }
             let inst = Inst::Nop4;
-            inst.emit(&mut buf, &flags, &mut state);
+            inst.emit(&mut buf, &info, &mut state);
         }
 
         buf.bind_label(label(2));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(3));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         let buf = buf.finish();
 
@@ -1567,7 +1606,7 @@
             taken: BranchTarget::ResolvedOffset(1048576 - 4),
             not_taken: BranchTarget::ResolvedOffset(2000000 + 4 - 4),
         };
-        inst.emit(&mut buf2, &flags, &mut state);
+        inst.emit(&mut buf2, &info, &mut state);
 
         let buf2 = buf2.finish();
 
@@ -1576,7 +1615,7 @@
 
     #[test]
     fn test_island_backward() {
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1584,16 +1623,16 @@
 
         buf.bind_label(label(0));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(2));
         while buf.cur_offset() < 2000000 {
             let inst = Inst::Nop4;
-            inst.emit(&mut buf, &flags, &mut state);
+            inst.emit(&mut buf, &info, &mut state);
         }
 
         buf.bind_label(label(3));
@@ -1602,7 +1641,7 @@
             taken: target(0),
             not_taken: target(1),
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         let buf = buf.finish();
 
@@ -1615,11 +1654,11 @@
             taken: BranchTarget::ResolvedOffset(8),
             not_taken: BranchTarget::ResolvedOffset(4 - (2000000 + 4)),
         };
-        inst.emit(&mut buf2, &flags, &mut state);
+        inst.emit(&mut buf2, &info, &mut state);
         let inst = Inst::Jump {
             dest: BranchTarget::ResolvedOffset(-(2000000 + 8)),
         };
-        inst.emit(&mut buf2, &flags, &mut state);
+        inst.emit(&mut buf2, &info, &mut state);
 
         let buf2 = buf2.finish();
 
@@ -1661,7 +1700,7 @@
         // label7:
         //   ret
 
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1673,38 +1712,38 @@
             taken: target(1),
             not_taken: target(2),
         };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         let inst = Inst::Jump { dest: target(3) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(2));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
         let inst = Inst::Jump { dest: target(0) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(3));
         let inst = Inst::Jump { dest: target(4) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(4));
         let inst = Inst::Jump { dest: target(5) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(5));
         let inst = Inst::Jump { dest: target(7) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(6));
         let inst = Inst::Nop4;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(7));
         let inst = Inst::Ret;
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         let buf = buf.finish();
 
@@ -1737,7 +1776,7 @@
         //
         // label0, label1, ..., label4:
         //   b label0
-        let flags = settings::Flags::new(settings::builder());
+        let info = EmitInfo::new(settings::Flags::new(settings::builder()));
         let mut buf = MachBuffer::new();
         let mut state = Default::default();
 
@@ -1745,23 +1784,23 @@
 
         buf.bind_label(label(0));
         let inst = Inst::Jump { dest: target(1) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(1));
         let inst = Inst::Jump { dest: target(2) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(2));
         let inst = Inst::Jump { dest: target(3) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(3));
         let inst = Inst::Jump { dest: target(4) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         buf.bind_label(label(4));
         let inst = Inst::Jump { dest: target(1) };
-        inst.emit(&mut buf, &flags, &mut state);
+        inst.emit(&mut buf, &info, &mut state);
 
         let buf = buf.finish();
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/compile.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/compile.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/compile.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/compile.rs	2021-01-18 19:58:25.000000000 +0000
@@ -6,7 +6,7 @@
 use crate::timing;
 
 use log::debug;
-use regalloc::{allocate_registers_with_opts, Algorithm, Options};
+use regalloc::{allocate_registers_with_opts, Algorithm, Options, PrettyPrint};
 
 /// Compile the given function down to VCode with allocated registers, ready
 /// for binary emission.
@@ -14,14 +14,15 @@
     f: &Function,
     b: &B,
     abi: Box<dyn ABICallee<I = B::MInst>>,
+    emit_info: <B::MInst as MachInstEmit>::Info,
 ) -> CodegenResult<VCode<B::MInst>>
 where
-    B::MInst: ShowWithRRU,
+    B::MInst: PrettyPrint,
 {
     // Compute lowered block order.
     let block_order = BlockLoweringOrder::new(f);
     // Build the lowering context.
-    let lower = Lower::new(f, abi, block_order)?;
+    let lower = Lower::new(f, abi, emit_info, block_order)?;
     // Lower the IR.
     let (mut vcode, stack_map_request_info) = {
         let _tt = timing::vcode_lower();
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/lower.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/lower.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/lower.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/lower.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,20 +8,21 @@
 use crate::ir::instructions::BranchInfo;
 use crate::ir::types::I64;
 use crate::ir::{
-    ArgumentPurpose, Block, Constant, ConstantData, ExternalName, Function, GlobalValueData,
-    Immediate, Inst, InstructionData, MemFlags, Opcode, Signature, SourceLoc, Type, Value,
-    ValueDef,
+    ArgumentPurpose, Block, Constant, ConstantData, ExternalName, Function, GlobalValueData, Inst,
+    InstructionData, MemFlags, Opcode, Signature, SourceLoc, Type, Value, ValueDef,
 };
 use crate::machinst::{
     ABICallee, BlockIndex, BlockLoweringOrder, LoweredBlock, MachLabel, VCode, VCodeBuilder,
-    VCodeInst,
+    VCodeConstant, VCodeConstantData, VCodeConstants, VCodeInst,
 };
 use crate::CodegenResult;
 
 use regalloc::{Reg, RegClass, StackmapRequestInfo, VirtualReg, Writable};
 
+use crate::data_value::DataValue;
 use alloc::boxed::Box;
 use alloc::vec::Vec;
+use core::convert::TryInto;
 use log::debug;
 use smallvec::SmallVec;
 
@@ -62,7 +63,7 @@
     // Function-level queries:
 
     /// Get the `ABICallee`.
-    fn abi(&mut self) -> &dyn ABICallee<I = Self::I>;
+    fn abi(&mut self) -> &mut dyn ABICallee<I = Self::I>;
     /// Get the (virtual) register that receives the return value. A return
     /// instruction should lower into a sequence that fills this register. (Why
     /// not allow the backend to specify its own result register for the return?
@@ -161,8 +162,11 @@
     fn is_reg_needed(&self, ir_inst: Inst, reg: Reg) -> bool;
     /// Retrieve constant data given a handle.
     fn get_constant_data(&self, constant_handle: Constant) -> &ConstantData;
-    /// Retrieve an immediate given a reference.
-    fn get_immediate(&self, imm: Immediate) -> &ConstantData;
+    /// Indicate that a constant should be emitted.
+    fn use_constant(&mut self, constant: VCodeConstantData) -> VCodeConstant;
+    /// Retrieve the value immediate from an instruction. This will perform necessary lookups on the
+    /// `DataFlowGraph` to retrieve even large immediates.
+    fn get_immediate(&self, ir_inst: Inst) -> Option<DataValue>;
     /// Cause the value in `reg` to be in a virtual reg, by copying it into a new virtual reg
     /// if `reg` is a real reg.  `ty` describes the type of the value in `reg`.
     fn ensure_in_vreg(&mut self, reg: Reg, ty: Type) -> Reg;
@@ -313,9 +317,11 @@
     pub fn new(
         f: &'func Function,
         abi: Box<dyn ABICallee<I = I>>,
+        emit_info: I::Info,
         block_order: BlockLoweringOrder,
     ) -> CodegenResult<Lower<'func, I>> {
-        let mut vcode = VCodeBuilder::new(abi, block_order);
+        let constants = VCodeConstants::with_capacity(f.dfg.constants.len());
+        let mut vcode = VCodeBuilder::new(abi, emit_info, block_order, constants);
 
         let mut next_vreg: u32 = 0;
 
@@ -847,7 +853,7 @@
 impl<'func, I: VCodeInst> LowerCtx for Lower<'func, I> {
     type I = I;
 
-    fn abi(&mut self) -> &dyn ABICallee<I = I> {
+    fn abi(&mut self) -> &mut dyn ABICallee<I = I> {
         self.vcode.abi()
     }
 
@@ -1007,8 +1013,27 @@
         self.f.dfg.constants.get(constant_handle)
     }
 
-    fn get_immediate(&self, imm: Immediate) -> &ConstantData {
-        self.f.dfg.immediates.get(imm).unwrap()
+    fn use_constant(&mut self, constant: VCodeConstantData) -> VCodeConstant {
+        self.vcode.constants().insert(constant)
+    }
+
+    fn get_immediate(&self, ir_inst: Inst) -> Option<DataValue> {
+        let inst_data = self.data(ir_inst);
+        match inst_data {
+            InstructionData::Shuffle { mask, .. } => {
+                let buffer = self.f.dfg.immediates.get(mask.clone()).unwrap().as_slice();
+                let value = DataValue::V128(buffer.try_into().expect("a 16-byte data buffer"));
+                Some(value)
+            }
+            InstructionData::UnaryConst {
+                constant_handle, ..
+            } => {
+                let buffer = self.f.dfg.constants.get(constant_handle.clone()).as_slice();
+                let value = DataValue::V128(buffer.try_into().expect("a 16-byte data buffer"));
+                Some(value)
+            }
+            _ => inst_data.imm_value(),
+        }
     }
 
     fn ensure_in_vreg(&mut self, reg: Reg, ty: Type) -> Reg {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/mod.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -98,13 +98,15 @@
 
 use crate::binemit::{CodeInfo, CodeOffset, StackMap};
 use crate::ir::condcodes::IntCC;
-use crate::ir::{Function, Type};
+use crate::ir::{Function, SourceLoc, Type};
+use crate::isa::unwind::input as unwind_input;
 use crate::result::CodegenResult;
 use crate::settings::Flags;
 
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::fmt::Debug;
+use core::ops::Range;
 use regalloc::RegUsageCollector;
 use regalloc::{
     RealReg, RealRegUniverse, Reg, RegClass, RegUsageMapper, SpillSlot, VirtualReg, Writable,
@@ -125,8 +127,6 @@
 pub use abi::*;
 pub mod abi_impl;
 pub use abi_impl::*;
-pub mod pretty_print;
-pub use pretty_print::*;
 pub mod buffer;
 pub use buffer::*;
 pub mod adapter;
@@ -156,6 +156,11 @@
     /// Returns true if the instruction is an epilogue placeholder.
     fn is_epilogue_placeholder(&self) -> bool;
 
+    /// Should this instruction be included in the clobber-set?
+    fn is_included_in_clobbers(&self) -> bool {
+        true
+    }
+
     /// Generate a move.
     fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Self;
 
@@ -272,12 +277,23 @@
 pub trait MachInstEmit: MachInst {
     /// Persistent state carried across `emit` invocations.
     type State: MachInstEmitState<Self>;
+    /// Constant information used in `emit` invocations.
+    type Info: MachInstEmitInfo;
+    /// Unwind info generator.
+    type UnwindInfo: UnwindInfoGenerator<Self>;
     /// Emit the instruction.
-    fn emit(&self, code: &mut MachBuffer<Self>, flags: &Flags, state: &mut Self::State);
+    fn emit(&self, code: &mut MachBuffer<Self>, info: &Self::Info, state: &mut Self::State);
     /// Pretty-print the instruction.
     fn pretty_print(&self, mb_rru: Option<&RealRegUniverse>, state: &mut Self::State) -> String;
 }
 
+/// Constant information used to emit an instruction.
+pub trait MachInstEmitInfo {
+    /// Return the target-independent settings used for the compilation of this
+    /// particular function.
+    fn flags(&self) -> &Flags;
+}
+
 /// A trait describing the emission state carried between MachInsts when
 /// emitting a function body.
 pub trait MachInstEmitState<I: MachInst>: Default + Clone + Debug {
@@ -286,6 +302,9 @@
     /// Update the emission state before emitting an instruction that is a
     /// safepoint.
     fn pre_safepoint(&mut self, _stack_map: StackMap) {}
+    /// Update the emission state to indicate instructions are associated with a
+    /// particular SourceLoc.
+    fn pre_sourceloc(&mut self, _srcloc: SourceLoc) {}
 }
 
 /// The result of a `MachBackend::compile_function()` call. Contains machine
@@ -297,6 +316,8 @@
     pub frame_size: u32,
     /// Disassembly, if requested.
     pub disasm: Option<String>,
+    /// Unwind info.
+    pub unwind_info: Option<unwind_input::UnwindInfo<Reg>>,
 }
 
 impl MachCompileResult {
@@ -341,4 +362,60 @@
     /// Machine-specific condcode info needed by TargetIsa.
     /// Condition that will be true when an IsubIfcout overflows.
     fn unsigned_sub_overflow_condition(&self) -> IntCC;
+
+    /// Produces unwind info based on backend results.
+    #[cfg(feature = "unwind")]
+    fn emit_unwind_info(
+        &self,
+        _result: &MachCompileResult,
+        _kind: UnwindInfoKind,
+    ) -> CodegenResult<Option<crate::isa::unwind::UnwindInfo>> {
+        // By default, an backend cannot produce unwind info.
+        Ok(None)
+    }
+
+    /// Machine-specific condcode info needed by TargetIsa.
+    /// Creates a new System V Common Information Entry for the ISA.
+    #[cfg(feature = "unwind")]
+    fn create_systemv_cie(&self) -> Option<gimli::write::CommonInformationEntry> {
+        // By default, an ISA cannot create a System V CIE
+        None
+    }
+}
+
+/// Expected unwind info type.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum UnwindInfoKind {
+    /// No unwind info.
+    None,
+    /// SystemV CIE/FDE unwind info.
+    #[cfg(feature = "unwind")]
+    SystemV,
+    /// Windows X64 Unwind info
+    #[cfg(feature = "unwind")]
+    Windows,
+}
+
+/// Input data for UnwindInfoGenerator.
+pub struct UnwindInfoContext<'a, Inst: MachInstEmit> {
+    /// Function instructions.
+    pub insts: &'a [Inst],
+    /// Instruction layout: end offsets
+    pub insts_layout: &'a [CodeOffset],
+    /// Length of the function.
+    pub len: CodeOffset,
+    /// Prologue range.
+    pub prologue: Range<u32>,
+    /// Epilogue ranges.
+    pub epilogues: &'a [Range<u32>],
+}
+
+/// UnwindInfo generator/helper.
+pub trait UnwindInfoGenerator<I: MachInstEmit> {
+    /// Creates unwind info based on function signature and
+    /// emitted instructions.
+    fn create_unwind_info(
+        context: UnwindInfoContext<I>,
+    ) -> CodegenResult<Option<unwind_input::UnwindInfo<Reg>>>;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/pretty_print.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/pretty_print.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/pretty_print.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/pretty_print.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-//! Pretty-printing for machine code (virtual-registerized or final).
-
-use regalloc::{RealRegUniverse, Reg, Writable};
-
-use std::fmt::Debug;
-use std::hash::Hash;
-use std::string::{String, ToString};
-
-// FIXME: Should this go into regalloc.rs instead?
-
-/// A trait for printing instruction bits and pieces, with the the ability to
-/// take a contextualising RealRegUniverse that is used to give proper names to
-/// registers.
-pub trait ShowWithRRU {
-    /// Return a string that shows the implementing object in context of the
-    /// given `RealRegUniverse`, if provided.
-    fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String;
-
-    /// The same as |show_rru|, but with an optional hint giving a size in
-    /// bytes.  Its interpretation is object-dependent, and it is intended to
-    /// pass around enough information to facilitate printing sub-parts of
-    /// real registers correctly.  Objects may ignore size hints that are
-    /// irrelevant to them.
-    fn show_rru_sized(&self, mb_rru: Option<&RealRegUniverse>, _size: u8) -> String {
-        // Default implementation is to ignore the hint.
-        self.show_rru(mb_rru)
-    }
-}
-
-impl ShowWithRRU for Reg {
-    fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
-        if self.is_real() {
-            if let Some(rru) = mb_rru {
-                let reg_ix = self.get_index();
-                if reg_ix < rru.regs.len() {
-                    return rru.regs[reg_ix].1.to_string();
-                } else {
-                    // We have a real reg which isn't listed in the universe.
-                    // Per the regalloc.rs interface requirements, this is
-                    // Totally Not Allowed.  Print it generically anyway, so
-                    // we have something to debug.
-                    return format!("!!{:?}!!", self);
-                }
-            }
-        }
-        // The reg is virtual, or we have no universe.  Be generic.
-        format!("%{:?}", self)
-    }
-
-    fn show_rru_sized(&self, _mb_rru: Option<&RealRegUniverse>, _size: u8) -> String {
-        // For the specific case of Reg, we demand not to have a size hint,
-        // since interpretation of the size is target specific, but this code
-        // is used by all targets.
-        panic!("Reg::show_rru_sized: impossible to implement");
-    }
-}
-
-impl<R: ShowWithRRU + Copy + Ord + Hash + Eq + Debug> ShowWithRRU for Writable<R> {
-    fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
-        self.to_reg().show_rru(mb_rru)
-    }
-
-    fn show_rru_sized(&self, mb_rru: Option<&RealRegUniverse>, size: u8) -> String {
-        self.to_reg().show_rru_sized(mb_rru, size)
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/vcode.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/vcode.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/machinst/vcode.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/machinst/vcode.rs	2021-01-18 19:58:25.000000000 +0000
@@ -17,7 +17,7 @@
 //! See the main module comment in `mod.rs` for more details on the VCode-based
 //! backend pipeline.
 
-use crate::ir::{self, types, SourceLoc};
+use crate::ir::{self, types, Constant, ConstantData, SourceLoc};
 use crate::machinst::*;
 use crate::settings;
 use crate::timing;
@@ -25,12 +25,15 @@
 use regalloc::Function as RegallocFunction;
 use regalloc::Set as RegallocSet;
 use regalloc::{
-    BlockIx, InstIx, Range, RegAllocResult, RegClass, RegUsageCollector, RegUsageMapper, SpillSlot,
-    StackmapRequestInfo,
+    BlockIx, InstIx, PrettyPrint, Range, RegAllocResult, RegClass, RegUsageCollector,
+    RegUsageMapper, SpillSlot, StackmapRequestInfo,
 };
 
 use alloc::boxed::Box;
 use alloc::{borrow::Cow, vec::Vec};
+use cranelift_entity::{entity_impl, Keys, PrimaryMap};
+use std::cell::RefCell;
+use std::collections::HashMap;
 use std::fmt;
 use std::iter;
 use std::string::String;
@@ -39,6 +42,8 @@
 pub type InsnIndex = u32;
 /// Index referring to a basic block in VCode.
 pub type BlockIndex = u32;
+/// Range of an instructions in VCode.
+pub type InsnRange = core::ops::Range<InsnIndex>;
 
 /// VCodeInst wraps all requirements for a MachInst to be in VCode: it must be
 /// a `MachInst` and it must be able to emit itself at least to a `SizeCodeSink`.
@@ -88,6 +93,10 @@
     /// ABI object.
     abi: Box<dyn ABICallee<I = I>>,
 
+    /// Constant information used during code emission. This should be
+    /// immutable across function compilations within the same module.
+    emit_info: I::Info,
+
     /// Safepoint instruction indices. Filled in post-regalloc. (Prior to
     /// regalloc, the safepoint instructions are listed in the separate
     /// `StackmapRequestInfo` held separate from the `VCode`.)
@@ -97,6 +106,15 @@
     /// These are used to generate actual stack maps at emission. Filled in
     /// post-regalloc.
     safepoint_slots: Vec<Vec<SpillSlot>>,
+
+    /// Ranges for prologue and epilogue instructions.
+    prologue_epilogue_ranges: Option<(InsnRange, Box<[InsnRange]>)>,
+
+    /// Instruction end offsets
+    insts_layout: RefCell<(Vec<u32>, u32)>,
+
+    /// Constants.
+    constants: VCodeConstants,
 }
 
 /// A builder for a VCode function body. This builder is designed for the
@@ -132,9 +150,14 @@
 
 impl<I: VCodeInst> VCodeBuilder<I> {
     /// Create a new VCodeBuilder.
-    pub fn new(abi: Box<dyn ABICallee<I = I>>, block_order: BlockLoweringOrder) -> VCodeBuilder<I> {
+    pub fn new(
+        abi: Box<dyn ABICallee<I = I>>,
+        emit_info: I::Info,
+        block_order: BlockLoweringOrder,
+        constants: VCodeConstants,
+    ) -> VCodeBuilder<I> {
         let reftype_class = I::ref_type_regclass(abi.flags());
-        let vcode = VCode::new(abi, block_order);
+        let vcode = VCode::new(abi, emit_info, block_order, constants);
         let stack_map_info = StackmapRequestInfo {
             reftype_class,
             reftyped_vregs: vec![],
@@ -238,6 +261,11 @@
         self.cur_srcloc = srcloc;
     }
 
+    /// Access the constants.
+    pub fn constants(&mut self) -> &mut VCodeConstants {
+        &mut self.vcode.constants
+    }
+
     /// Build the final VCode, returning the vcode itself as well as auxiliary
     /// information, such as the stack map request information.
     pub fn build(self) -> (VCode<I>, StackmapRequestInfo) {
@@ -263,7 +291,12 @@
 
 impl<I: VCodeInst> VCode<I> {
     /// New empty VCode.
-    fn new(abi: Box<dyn ABICallee<I = I>>, block_order: BlockLoweringOrder) -> VCode<I> {
+    fn new(
+        abi: Box<dyn ABICallee<I = I>>,
+        emit_info: I::Info,
+        block_order: BlockLoweringOrder,
+        constants: VCodeConstants,
+    ) -> VCode<I> {
         VCode {
             liveins: abi.liveins(),
             liveouts: abi.liveouts(),
@@ -277,8 +310,12 @@
             block_succs: vec![],
             block_order,
             abi,
+            emit_info,
             safepoint_insns: vec![],
             safepoint_slots: vec![],
+            prologue_epilogue_ranges: None,
+            insts_layout: RefCell::new((vec![], 0)),
+            constants,
         }
     }
 
@@ -340,6 +377,10 @@
         let mut final_safepoint_insns = vec![];
         let mut safept_idx = 0;
 
+        let mut prologue_start = None;
+        let mut prologue_end = None;
+        let mut epilogue_islands = vec![];
+
         assert!(result.target_map.elems().len() == self.num_blocks());
         for block in 0..self.num_blocks() {
             let start = result.target_map.elems()[block].get() as usize;
@@ -352,11 +393,13 @@
             let final_start = final_insns.len() as InsnIndex;
 
             if block == self.entry {
+                prologue_start = Some(final_insns.len() as InsnIndex);
                 // Start with the prologue.
                 let prologue = self.abi.gen_prologue();
                 let len = prologue.len();
                 final_insns.extend(prologue.into_iter());
                 final_srclocs.extend(iter::repeat(SourceLoc::default()).take(len));
+                prologue_end = Some(final_insns.len() as InsnIndex);
             }
 
             for i in start..end {
@@ -382,10 +425,12 @@
                 // with the epilogue.
                 let is_ret = insn.is_term() == MachTerminator::Ret;
                 if is_ret {
+                    let epilogue_start = final_insns.len() as InsnIndex;
                     let epilogue = self.abi.gen_epilogue();
                     let len = epilogue.len();
                     final_insns.extend(epilogue.into_iter());
                     final_srclocs.extend(iter::repeat(srcloc).take(len));
+                    epilogue_islands.push(epilogue_start..final_insns.len() as InsnIndex);
                 } else {
                     final_insns.push(insn.clone());
                     final_srclocs.push(srcloc);
@@ -417,6 +462,11 @@
         // for the machine backend during emission so that it can do
         // target-specific translations of slot numbers to stack offsets.
         self.safepoint_slots = result.stackmaps;
+
+        self.prologue_epilogue_ranges = Some((
+            prologue_start.unwrap()..prologue_end.unwrap(),
+            epilogue_islands.into_boxed_slice(),
+        ));
     }
 
     /// Emit the instructions to a `MachBuffer`, containing fixed-up code and external
@@ -429,9 +479,13 @@
         let mut buffer = MachBuffer::new();
         let mut state = I::State::new(&*self.abi);
 
-        buffer.reserve_labels_for_blocks(self.num_blocks() as BlockIndex); // first N MachLabels are simply block indices.
+        // The first M MachLabels are reserved for block indices, the next N MachLabels for
+        // constants.
+        buffer.reserve_labels_for_blocks(self.num_blocks() as BlockIndex);
+        buffer.reserve_labels_for_constants(&self.constants);
+
+        let mut insts_layout = vec![0; self.insts.len()];
 
-        let flags = self.abi.flags();
         let mut safepoint_idx = 0;
         let mut cur_srcloc = None;
         for block in 0..self.num_blocks() {
@@ -440,7 +494,7 @@
             while new_offset > buffer.cur_offset() {
                 // Pad with NOPs up to the aligned block offset.
                 let nop = I::gen_nop((new_offset - buffer.cur_offset()) as usize);
-                nop.emit(&mut buffer, flags, &mut Default::default());
+                nop.emit(&mut buffer, &self.emit_info, &mut Default::default());
             }
             assert_eq!(buffer.cur_offset(), new_offset);
 
@@ -455,6 +509,7 @@
                     buffer.start_srcloc(srcloc);
                     cur_srcloc = Some(srcloc);
                 }
+                state.pre_sourceloc(cur_srcloc.unwrap_or(SourceLoc::default()));
 
                 if safepoint_idx < self.safepoint_insns.len()
                     && self.safepoint_insns[safepoint_idx] == iix
@@ -469,7 +524,9 @@
                     safepoint_idx += 1;
                 }
 
-                self.insts[iix as usize].emit(&mut buffer, flags, &mut state);
+                self.insts[iix as usize].emit(&mut buffer, &self.emit_info, &mut state);
+
+                insts_layout[iix as usize] = buffer.cur_offset();
             }
 
             if cur_srcloc.is_some() {
@@ -490,9 +547,33 @@
             }
         }
 
+        // Emit the constants used by the function.
+        for (constant, data) in self.constants.iter() {
+            let label = buffer.get_label_for_constant(constant);
+            buffer.defer_constant(label, data.alignment(), data.as_slice(), u32::max_value());
+        }
+
+        *self.insts_layout.borrow_mut() = (insts_layout, buffer.cur_offset());
+
         buffer
     }
 
+    /// Generates unwind info.
+    pub fn unwind_info(
+        &self,
+    ) -> crate::result::CodegenResult<Option<crate::isa::unwind::input::UnwindInfo<Reg>>> {
+        let layout = &self.insts_layout.borrow();
+        let (prologue, epilogues) = self.prologue_epilogue_ranges.as_ref().unwrap();
+        let context = UnwindInfoContext {
+            insts: &self.insts,
+            insts_layout: &layout.0,
+            len: layout.1,
+            prologue: prologue.clone(),
+            epilogues,
+        };
+        I::UnwindInfo::create_unwind_info(context)
+    }
+
     /// Get the IR block for a BlockIndex, if one exists.
     pub fn bindex_to_bb(&self, block: BlockIndex) -> Option<ir::Block> {
         self.block_order.lowered_order()[block as usize].orig_block()
@@ -543,6 +624,10 @@
         }
     }
 
+    fn is_included_in_clobbers(&self, insn: &I) -> bool {
+        insn.is_included_in_clobbers()
+    }
+
     fn get_regs(insn: &I, collector: &mut RegUsageCollector) {
         insn.get_regs(collector)
     }
@@ -624,7 +709,7 @@
 }
 
 /// Pretty-printing with `RealRegUniverse` context.
-impl<I: VCodeInst> ShowWithRRU for VCode<I> {
+impl<I: VCodeInst> PrettyPrint for VCode<I> {
     fn show_rru(&self, mb_rru: Option<&RealRegUniverse>) -> String {
         use std::fmt::Write;
 
@@ -673,3 +758,138 @@
         s
     }
 }
+
+/// This structure tracks the large constants used in VCode that will be emitted separately by the
+/// [MachBuffer].
+///
+/// First, during the lowering phase, constants are inserted using
+/// [VCodeConstants.insert]; an intermediate handle, [VCodeConstant], tracks what constants are
+/// used in this phase. Some deduplication is performed, when possible, as constant
+/// values are inserted.
+///
+/// Secondly, during the emission phase, the [MachBuffer] assigns [MachLabel]s for each of the
+/// constants so that instructions can refer to the value's memory location. The [MachBuffer]
+/// then writes the constant values to the buffer.
+#[derive(Default)]
+pub struct VCodeConstants {
+    constants: PrimaryMap<VCodeConstant, VCodeConstantData>,
+    pool_uses: HashMap<Constant, VCodeConstant>,
+    well_known_uses: HashMap<*const [u8], VCodeConstant>,
+}
+impl VCodeConstants {
+    /// Initialize the structure with the expected number of constants.
+    pub fn with_capacity(expected_num_constants: usize) -> Self {
+        Self {
+            constants: PrimaryMap::with_capacity(expected_num_constants),
+            pool_uses: HashMap::with_capacity(expected_num_constants),
+            well_known_uses: HashMap::new(),
+        }
+    }
+
+    /// Insert a constant; using this method indicates that a constant value will be used and thus
+    /// will be emitted to the `MachBuffer`. The current implementation can deduplicate constants
+    /// that are [VCodeConstantData::Pool] or [VCodeConstantData::WellKnown] but not
+    /// [VCodeConstantData::Generated].
+    pub fn insert(&mut self, data: VCodeConstantData) -> VCodeConstant {
+        match data {
+            VCodeConstantData::Generated(_) => self.constants.push(data),
+            VCodeConstantData::Pool(constant, _) => match self.pool_uses.get(&constant) {
+                None => {
+                    let vcode_constant = self.constants.push(data);
+                    self.pool_uses.insert(constant, vcode_constant);
+                    vcode_constant
+                }
+                Some(&vcode_constant) => vcode_constant,
+            },
+            VCodeConstantData::WellKnown(data_ref) => {
+                match self.well_known_uses.get(&(data_ref as *const [u8])) {
+                    None => {
+                        let vcode_constant = self.constants.push(data);
+                        self.well_known_uses
+                            .insert(data_ref as *const [u8], vcode_constant);
+                        vcode_constant
+                    }
+                    Some(&vcode_constant) => vcode_constant,
+                }
+            }
+        }
+    }
+
+    /// Retrieve a byte slice for the given [VCodeConstant], if available.
+    pub fn get(&self, constant: VCodeConstant) -> Option<&[u8]> {
+        self.constants.get(constant).map(|d| d.as_slice())
+    }
+
+    /// Return the number of constants inserted.
+    pub fn len(&self) -> usize {
+        self.constants.len()
+    }
+
+    /// Iterate over the [VCodeConstant] keys inserted in this structure.
+    pub fn keys(&self) -> Keys<VCodeConstant> {
+        self.constants.keys()
+    }
+
+    /// Iterate over the [VCodeConstant] keys and the data (as a byte slice) inserted in this
+    /// structure.
+    pub fn iter(&self) -> impl Iterator<Item = (VCodeConstant, &VCodeConstantData)> {
+        self.constants.iter()
+    }
+}
+
+/// A use of a constant by one or more VCode instructions; see [VCodeConstants].
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct VCodeConstant(u32);
+entity_impl!(VCodeConstant);
+
+/// Identify the different types of constant that can be inserted into [VCodeConstants]. Tracking
+/// these separately instead of as raw byte buffers allows us to avoid some duplication.
+pub enum VCodeConstantData {
+    /// A constant already present in the Cranelift IR
+    /// [ConstantPool](crate::ir::constant::ConstantPool).
+    Pool(Constant, ConstantData),
+    /// A reference to a well-known constant value that is statically encoded within the compiler.
+    WellKnown(&'static [u8]),
+    /// A constant value generated during lowering; the value may depend on the instruction context
+    /// which makes it difficult to de-duplicate--if possible, use other variants.
+    Generated(ConstantData),
+}
+impl VCodeConstantData {
+    /// Retrieve the constant data as a byte slice.
+    pub fn as_slice(&self) -> &[u8] {
+        match self {
+            VCodeConstantData::Pool(_, d) | VCodeConstantData::Generated(d) => d.as_slice(),
+            VCodeConstantData::WellKnown(d) => d,
+        }
+    }
+
+    /// Calculate the alignment of the constant data.
+    pub fn alignment(&self) -> u32 {
+        if self.as_slice().len() <= 8 {
+            8
+        } else {
+            16
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use std::mem::size_of;
+
+    #[test]
+    fn size_of_constant_structs() {
+        assert_eq!(size_of::<Constant>(), 4);
+        assert_eq!(size_of::<VCodeConstant>(), 4);
+        assert_eq!(size_of::<ConstantData>(), 24);
+        assert_eq!(size_of::<VCodeConstantData>(), 32);
+        assert_eq!(
+            size_of::<PrimaryMap<VCodeConstant, VCodeConstantData>>(),
+            24
+        );
+        // TODO The VCodeConstants structure's memory size could be further optimized.
+        // With certain versions of Rust, each `HashMap` in `VCodeConstants` occupied at
+        // least 48 bytes, making an empty `VCodeConstants` cost 120 bytes.
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/peepmatic.rs firefox-85.0+build1/third_party/rust/cranelift-codegen/src/peepmatic.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/peepmatic.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen/src/peepmatic.rs	2021-01-18 19:58:25.000000000 +0000
@@ -14,14 +14,13 @@
     cc::ConditionCode,
     instruction_set::InstructionSet,
     part::{Constant, Part},
-    paths::Path,
     r#type::{BitWidth, Kind, Type},
     PeepholeOptimizations, PeepholeOptimizer,
 };
-use peepmatic_traits::TypingRules;
 use std::borrow::Cow;
 use std::boxed::Box;
 use std::convert::{TryFrom, TryInto};
+use std::iter;
 use std::ptr;
 use std::sync::atomic::{AtomicPtr, Ordering};
 
@@ -573,35 +572,6 @@
     }
 }
 
-fn get_immediate(dfg: &DataFlowGraph, inst: Inst, i: usize) -> Part<ValueOrInst> {
-    return match dfg[inst] {
-        InstructionData::BinaryImm64 { imm, .. } if i == 0 => imm.into(),
-        InstructionData::BranchIcmp { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::BranchInt { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::IntCompare { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::IntCompareImm { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::IntCompareImm { imm, .. } if i == 1 => imm.into(),
-        InstructionData::IntCond { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::IntCondTrap { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::IntSelect { cond, .. } if i == 0 => intcc_to_peepmatic(cond).into(),
-        InstructionData::UnaryBool { imm, .. } if i == 0 => {
-            Constant::Bool(imm, BitWidth::Polymorphic).into()
-        }
-        InstructionData::UnaryImm { imm, .. } if i == 0 => imm.into(),
-        ref otherwise => unsupported(otherwise),
-    };
-
-    #[inline(never)]
-    #[cold]
-    fn unsupported(data: &InstructionData) -> ! {
-        panic!("unsupported instruction data: {:?}", data)
-    }
-}
-
-fn get_argument(dfg: &DataFlowGraph, inst: Inst, i: usize) -> Option<Value> {
-    dfg.inst_args(inst).get(i).copied()
-}
-
 fn peepmatic_ty_to_ir_ty(ty: Type, dfg: &DataFlowGraph, root: Inst) -> types::Type {
     match (ty.kind, bit_width(dfg, ty.bit_width, root)) {
         (Kind::Int, 8) => types::I8,
@@ -681,39 +651,290 @@
         }
     }
 
-    fn get_part_at_path(
+    fn operator<E>(
         &self,
         pos: &mut FuncCursor<'b>,
-        root: ValueOrInst,
-        path: Path,
-    ) -> Option<Part<ValueOrInst>> {
-        // The root is path [0].
-        debug_assert!(!path.0.is_empty());
-        debug_assert_eq!(path.0[0], 0);
+        value_or_inst: ValueOrInst,
+        operands: &mut E,
+    ) -> Option<Opcode>
+    where
+        E: Extend<Part<Self::Instruction>>,
+    {
+        let inst = value_or_inst.resolve_inst(&pos.func.dfg)?;
+        Some(match pos.func.dfg[inst] {
+            InstructionData::Binary {
+                opcode: opcode @ Opcode::Band,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Bor,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Bxor,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Iadd,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Ifcmp,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Imul,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Ishl,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Isub,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Rotl,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Rotr,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Sdiv,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Srem,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Sshr,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Udiv,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Urem,
+                args,
+            }
+            | InstructionData::Binary {
+                opcode: opcode @ Opcode::Ushr,
+                args,
+            } => {
+                operands.extend(args.iter().map(|v| Part::Instruction((*v).into())));
+                opcode
+            }
 
-        let mut part = Part::Instruction(root);
-        for p in path.0[1..].iter().copied() {
-            let inst = part.as_instruction()?.resolve_inst(&pos.func.dfg)?;
-            let operator = pos.func.dfg[inst].opcode();
+            InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::BandImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::BorImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::BxorImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::IaddImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::IfcmpImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::ImulImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::IrsubImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::IshlImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::RotlImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::RotrImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::SdivImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::SremImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::SshrImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::UdivImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::UremImm,
+                imm,
+                arg,
+            }
+            | InstructionData::BinaryImm64 {
+                opcode: opcode @ Opcode::UshrImm,
+                imm,
+                arg,
+            } => {
+                operands.extend(
+                    iter::once(imm.into()).chain(iter::once(Part::Instruction(arg.into()))),
+                );
+                opcode
+            }
 
-            if p < operator.immediates_arity() {
-                part = get_immediate(&pos.func.dfg, inst, p as usize);
-                continue;
+            InstructionData::Branch {
+                opcode: opcode @ Opcode::Brnz,
+                ref args,
+                destination: _,
+            }
+            | InstructionData::Branch {
+                opcode: opcode @ Opcode::Brz,
+                ref args,
+                destination: _,
+            } => {
+                operands.extend(
+                    args.as_slice(&pos.func.dfg.value_lists)
+                        .iter()
+                        .map(|v| Part::Instruction((*v).into()))
+                        // NB: Peepmatic only knows about the condition, not any
+                        // of the arguments to the block, which are special
+                        // cased elsewhere, if/when we actually replace the
+                        // instruction.
+                        .take(1),
+                );
+                opcode
             }
 
-            let arg = p - operator.immediates_arity();
-            let arg = arg as usize;
-            let value = get_argument(&pos.func.dfg, inst, arg)?;
-            part = Part::Instruction(value.into());
-        }
+            InstructionData::CondTrap {
+                opcode: opcode @ Opcode::Trapnz,
+                arg,
+                code: _,
+            }
+            | InstructionData::CondTrap {
+                opcode: opcode @ Opcode::Trapz,
+                arg,
+                code: _,
+            } => {
+                operands.extend(iter::once(Part::Instruction(arg.into())));
+                opcode
+            }
 
-        log::trace!("get_part_at_path({:?}) = {:?}", path, part);
-        Some(part)
-    }
+            InstructionData::IntCompare {
+                opcode: opcode @ Opcode::Icmp,
+                cond,
+                args,
+            } => {
+                operands.extend(
+                    iter::once(intcc_to_peepmatic(cond).into())
+                        .chain(args.iter().map(|v| Part::Instruction((*v).into()))),
+                );
+                opcode
+            }
 
-    fn operator(&self, pos: &mut FuncCursor<'b>, value_or_inst: ValueOrInst) -> Option<Opcode> {
-        let inst = value_or_inst.resolve_inst(&pos.func.dfg)?;
-        Some(pos.func.dfg[inst].opcode())
+            InstructionData::IntCompareImm {
+                opcode: opcode @ Opcode::IcmpImm,
+                cond,
+                imm,
+                arg,
+            } => {
+                operands.extend(
+                    iter::once(intcc_to_peepmatic(cond).into())
+                        .chain(iter::once(Part::Constant(imm.into())))
+                        .chain(iter::once(Part::Instruction(arg.into()))),
+                );
+                opcode
+            }
+
+            InstructionData::Ternary {
+                opcode: opcode @ Opcode::Select,
+                ref args,
+            } => {
+                operands.extend(args.iter().map(|v| Part::Instruction((*v).into())));
+                opcode
+            }
+
+            InstructionData::Unary {
+                opcode: opcode @ Opcode::AdjustSpDown,
+                arg,
+            }
+            | InstructionData::Unary {
+                opcode: opcode @ Opcode::Bint,
+                arg,
+            }
+            | InstructionData::Unary {
+                opcode: opcode @ Opcode::Ireduce,
+                arg,
+            }
+            | InstructionData::Unary {
+                opcode: opcode @ Opcode::Sextend,
+                arg,
+            }
+            | InstructionData::Unary {
+                opcode: opcode @ Opcode::Uextend,
+                arg,
+            } => {
+                operands.extend(iter::once(Part::Instruction(arg.into())));
+                opcode
+            }
+
+            InstructionData::UnaryBool { opcode, imm } => {
+                operands.extend(iter::once(Part::Constant(Constant::Bool(
+                    imm,
+                    BitWidth::Polymorphic,
+                ))));
+                opcode
+            }
+
+            InstructionData::UnaryImm {
+                opcode: opcode @ Opcode::AdjustSpDownImm,
+                imm,
+            }
+            | InstructionData::UnaryImm {
+                opcode: opcode @ Opcode::Iconst,
+                imm,
+            } => {
+                operands.extend(iter::once(imm.into()));
+                opcode
+            }
+            ref otherwise => {
+                log::trace!("Not supported by Peepmatic: {:?}", otherwise);
+                return None;
+            }
+        })
     }
 
     fn make_inst_1(
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/third_party/rust/cranelift-codegen/src/preopt.serialized and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/third_party/rust/cranelift-codegen/src/preopt.serialized differ
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"7c40668950dc4e8edbacfc6d7e8cc2c66b8b92ae3f8a65d90c8c4d356dd1f69a","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"b123f056d0d458396679c5f7f2a16d2762af0258fcda4ac14b6655a95e5a0022","src/cdsl/ast.rs":"84a4b7e3301e3249716958a7aa4ea5ba8c6172e3c02f57ee3880504c4433ff19","src/cdsl/cpu_modes.rs":"996e45b374cfe85ac47c8c86c4459fe4c04b3158102b4c63b6ee434d5eed6a9e","src/cdsl/encodings.rs":"d884a564815a03c23369bcf31d13b122ae5ba84d0c80eda9312f0c0a829bf794","src/cdsl/formats.rs":"63e638305aa3ca6dd409ddf0e5e9605eeac1cc2631103e42fc6cbc87703d9b63","src/cdsl/instructions.rs":"a0f5212fa593caf66371f5ee4b15e501939a9407c4663bff6b3ba356b11ca1b4","src/cdsl/isa.rs":"ccabd6848b69eb069c10db61c7e7f86080777495714bb53d03e663c40541be94","src/cdsl/mod.rs":"0aa827923bf4c45e5ee2359573bd863e00f474acd532739f49dcd74a27553882","src/cdsl/operands.rs":"1c3411504de9c83112ff48e0ff1cfbb2e4ba5a9a15c1716f411ef31a4df59899","src/cdsl/recipes.rs":"80b7cd87332229b569e38086ceee8d557e679b9a32ad2e50bdb15c33337c3418","src/cdsl/regs.rs":"466a42a43355fc7623fe5d8e8d330622207a3af6a80cb9367bc0f06e224c9ee0","src/cdsl/settings.rs":"e6fd9a31925743b93b11f09c9c8271bab6aa2430aa053a2601957b4487df7d77","src/cdsl/type_inference.rs":"1efca8a095ffc899b7527bda6b9d9378c73d7283f8dceaa4819e8af599f8be21","src/cdsl/types.rs":"50620fb2a6271a7c9126dc30c433a1bf25646a4d84511f5745650aaaec700f42","src/cdsl/typevar.rs":"3cbe83a09d2402511b20415a8356f848fb82536926386bb42eaaa7740fb2457e","src/cdsl/xform.rs":"55da0c3f2403147b535ab6ae5d69c623fbe839edecf2a3af1de84420cd58402d","src/default_map.rs":"101bb0282a124f9c921f6bd095f529e8753621450d783c3273b0b0394c2c5c03","src/error.rs":"e9b11b2feb2d867b94c8810fdc5a6c4e0d9131604a0bfa5340ff2639a55100b4","src/gen_binemit.rs":"515e243420b30d1e01f8ea630282d9b6d78a715e1951f3f20392e19a48164442","src/gen_encodings.rs":"f00cded6b68a9b48c9e3cd39a8b6f0ba136f4062c8f8666109158a72c62c3ed1","src/gen_inst.rs":"1ff123ab481b48d82e13363043dfc98eaef837bbf6af485b8259c3863550e29c","src/gen_legalizer.rs":"a5e507eb46649a28252582cfc1907c77c9266fec7f92e959a03258bed7d124e9","src/gen_registers.rs":"a904119ed803c9de24dedd15149a65337ffc168bb1d63df53d7fdebfb5f4b158","src/gen_settings.rs":"f3cc3d31f6cc898f30606caf084f0de220db2d3b1b5e5e4145fa7c9a9a1597e2","src/gen_types.rs":"f6c090e1646a43bf2fe81ae0a7029cc6f7dc6d43285368f56d86c35a21c469a6","src/isa/arm32/mod.rs":"da18cb40c1a0a6b613ddefcc38a5d01d02c95de6f233ebd4ad84fefb992c008b","src/isa/arm64/mod.rs":"3a815eaa478d82b7f8b536b83f9debb6b79ec860f99fea6485f209a836c6939a","src/isa/mod.rs":"be483f9a406f603e69603f9489a41a53ee02aa0ece07f7ca396956dfe3815f71","src/isa/riscv/encodings.rs":"8abb1968d917588bc5fc5f5be6dd66bdec23ac456ba65f8138237c8e891e843c","src/isa/riscv/mod.rs":"a7b461a30bbfbc1e3b33645422ff40d5b1761c30cb5d4a8aa12e9a3b7f7aee51","src/isa/riscv/recipes.rs":"5be3bf7c9ba3c51ece384b7eee75a8f7fa0cbacc6a5babc9d0e1d92a2e54a4c2","src/isa/x86/encodings.rs":"e9f1645fec6e4b5cfba9b08cfff70f9d1a5ad3b392f5ee9f40cb1a8669a7c689","src/isa/x86/instructions.rs":"d4d581448f8f7bd5afb033650af0026468eecc6f4184b3bb7c06232bf08c456b","src/isa/x86/legalize.rs":"186c688dd8ac773f2b2c4c1f1cbdb7a66ca13a8ed90c03f87dfe7fdaa12c15b3","src/isa/x86/mod.rs":"31571c281318e6f9bf17680feb96830983f5c1f9811aa4a89736f99f3d9a1831","src/isa/x86/opcodes.rs":"745ef09f4927b5334d68155fa047910ef96311feef7ec20964bb033c3419cd3c","src/isa/x86/recipes.rs":"744292109344363b2210ac1b42cb4704b4b692aa8bf5583e4230557cf3749298","src/isa/x86/registers.rs":"4be0a45d8acd465c31746b7976124025b06b453e3f6d587f93efb5af0e12b1a8","src/isa/x86/settings.rs":"47a5e9fb3b7917cfe817d56dcc77c0470545e451e0f38a875af0531fbd9b6a58","src/lib.rs":"23259ba28aa8f0b3586e9c60f4e67ae50660369f146f2a94249e8cff7d07b27b","src/shared/entities.rs":"90f774a70e1c2a2e9a553c07a5e80e0fe54cf127434bd83e67274bba4e1a19ba","src/shared/formats.rs":"14b668244b2afd71197c2dd8469af0e0602d590fcb14252c2b0b40cb9905a4ae","src/shared/immediates.rs":"563fa33accb992eb11a43f0f63259c62a2c44db59801431cc67ceec4b94f2ca3","src/shared/instructions.rs":"25d321a9ee48c7a40058c27aef85f4b7af3f18ece88841e3ee6335c06f3bded0","src/shared/legalize.rs":"eb5f07fa107cadd67483881ccce29cc8fb9b698a0cd4f1d89853aac275cf7bcf","src/shared/mod.rs":"c219625990bf15507ac1077b349ce20e5312d4e4707426183676d469e78792b7","src/shared/settings.rs":"e7406ce17fb313fa05397dd8103f74eed67d35170d70b6e546e08954aef2ed87","src/shared/types.rs":"4702df132f4b5d70cc9411ec5221ba0b1bd4479252274e0223ae57b6d0331247","src/srcgen.rs":"dcfc159c8599270f17e6a978c4be255abca51556b5ef0da497faec4a4a1e62ce","src/unique_table.rs":"31aa54330ca4786af772d32e8cb6158b6504b88fa93fe177bf0c6cbe545a8d35"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"561ee9a55739ac9716bc2f024e2673d69aefa6edbc4ff8b61a221a1741ed862a","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"b123f056d0d458396679c5f7f2a16d2762af0258fcda4ac14b6655a95e5a0022","src/cdsl/ast.rs":"84a4b7e3301e3249716958a7aa4ea5ba8c6172e3c02f57ee3880504c4433ff19","src/cdsl/cpu_modes.rs":"996e45b374cfe85ac47c8c86c4459fe4c04b3158102b4c63b6ee434d5eed6a9e","src/cdsl/encodings.rs":"d884a564815a03c23369bcf31d13b122ae5ba84d0c80eda9312f0c0a829bf794","src/cdsl/formats.rs":"63e638305aa3ca6dd409ddf0e5e9605eeac1cc2631103e42fc6cbc87703d9b63","src/cdsl/instructions.rs":"a0f5212fa593caf66371f5ee4b15e501939a9407c4663bff6b3ba356b11ca1b4","src/cdsl/isa.rs":"ccabd6848b69eb069c10db61c7e7f86080777495714bb53d03e663c40541be94","src/cdsl/mod.rs":"0aa827923bf4c45e5ee2359573bd863e00f474acd532739f49dcd74a27553882","src/cdsl/operands.rs":"1c3411504de9c83112ff48e0ff1cfbb2e4ba5a9a15c1716f411ef31a4df59899","src/cdsl/recipes.rs":"80b7cd87332229b569e38086ceee8d557e679b9a32ad2e50bdb15c33337c3418","src/cdsl/regs.rs":"466a42a43355fc7623fe5d8e8d330622207a3af6a80cb9367bc0f06e224c9ee0","src/cdsl/settings.rs":"e6fd9a31925743b93b11f09c9c8271bab6aa2430aa053a2601957b4487df7d77","src/cdsl/type_inference.rs":"1efca8a095ffc899b7527bda6b9d9378c73d7283f8dceaa4819e8af599f8be21","src/cdsl/types.rs":"50620fb2a6271a7c9126dc30c433a1bf25646a4d84511f5745650aaaec700f42","src/cdsl/typevar.rs":"3cbe83a09d2402511b20415a8356f848fb82536926386bb42eaaa7740fb2457e","src/cdsl/xform.rs":"55da0c3f2403147b535ab6ae5d69c623fbe839edecf2a3af1de84420cd58402d","src/default_map.rs":"101bb0282a124f9c921f6bd095f529e8753621450d783c3273b0b0394c2c5c03","src/error.rs":"e9b11b2feb2d867b94c8810fdc5a6c4e0d9131604a0bfa5340ff2639a55100b4","src/gen_binemit.rs":"515e243420b30d1e01f8ea630282d9b6d78a715e1951f3f20392e19a48164442","src/gen_encodings.rs":"f00cded6b68a9b48c9e3cd39a8b6f0ba136f4062c8f8666109158a72c62c3ed1","src/gen_inst.rs":"1ff123ab481b48d82e13363043dfc98eaef837bbf6af485b8259c3863550e29c","src/gen_legalizer.rs":"a5e507eb46649a28252582cfc1907c77c9266fec7f92e959a03258bed7d124e9","src/gen_registers.rs":"a904119ed803c9de24dedd15149a65337ffc168bb1d63df53d7fdebfb5f4b158","src/gen_settings.rs":"f3cc3d31f6cc898f30606caf084f0de220db2d3b1b5e5e4145fa7c9a9a1597e2","src/gen_types.rs":"f6c090e1646a43bf2fe81ae0a7029cc6f7dc6d43285368f56d86c35a21c469a6","src/isa/arm32/mod.rs":"da18cb40c1a0a6b613ddefcc38a5d01d02c95de6f233ebd4ad84fefb992c008b","src/isa/arm64/mod.rs":"3a815eaa478d82b7f8b536b83f9debb6b79ec860f99fea6485f209a836c6939a","src/isa/mod.rs":"be483f9a406f603e69603f9489a41a53ee02aa0ece07f7ca396956dfe3815f71","src/isa/riscv/encodings.rs":"8abb1968d917588bc5fc5f5be6dd66bdec23ac456ba65f8138237c8e891e843c","src/isa/riscv/mod.rs":"a7b461a30bbfbc1e3b33645422ff40d5b1761c30cb5d4a8aa12e9a3b7f7aee51","src/isa/riscv/recipes.rs":"5be3bf7c9ba3c51ece384b7eee75a8f7fa0cbacc6a5babc9d0e1d92a2e54a4c2","src/isa/x86/encodings.rs":"e9f1645fec6e4b5cfba9b08cfff70f9d1a5ad3b392f5ee9f40cb1a8669a7c689","src/isa/x86/instructions.rs":"d4d581448f8f7bd5afb033650af0026468eecc6f4184b3bb7c06232bf08c456b","src/isa/x86/legalize.rs":"f2d3d1ece43c7f18bd7ef405715cd39f59433d8f33a7fa4d237c1de28528ff7c","src/isa/x86/mod.rs":"31571c281318e6f9bf17680feb96830983f5c1f9811aa4a89736f99f3d9a1831","src/isa/x86/opcodes.rs":"745ef09f4927b5334d68155fa047910ef96311feef7ec20964bb033c3419cd3c","src/isa/x86/recipes.rs":"744292109344363b2210ac1b42cb4704b4b692aa8bf5583e4230557cf3749298","src/isa/x86/registers.rs":"4be0a45d8acd465c31746b7976124025b06b453e3f6d587f93efb5af0e12b1a8","src/isa/x86/settings.rs":"47a5e9fb3b7917cfe817d56dcc77c0470545e451e0f38a875af0531fbd9b6a58","src/lib.rs":"23259ba28aa8f0b3586e9c60f4e67ae50660369f146f2a94249e8cff7d07b27b","src/shared/entities.rs":"90f774a70e1c2a2e9a553c07a5e80e0fe54cf127434bd83e67274bba4e1a19ba","src/shared/formats.rs":"14b668244b2afd71197c2dd8469af0e0602d590fcb14252c2b0b40cb9905a4ae","src/shared/immediates.rs":"563fa33accb992eb11a43f0f63259c62a2c44db59801431cc67ceec4b94f2ca3","src/shared/instructions.rs":"21d0f2b041a0bce64d3db614ca003ec9269ba0a31aa5dbdae34cb15e5a59d89f","src/shared/legalize.rs":"eb5f07fa107cadd67483881ccce29cc8fb9b698a0cd4f1d89853aac275cf7bcf","src/shared/mod.rs":"c219625990bf15507ac1077b349ce20e5312d4e4707426183676d469e78792b7","src/shared/settings.rs":"e7406ce17fb313fa05397dd8103f74eed67d35170d70b6e546e08954aef2ed87","src/shared/types.rs":"4702df132f4b5d70cc9411ec5221ba0b1bd4479252274e0223ae57b6d0331247","src/srcgen.rs":"dcfc159c8599270f17e6a978c4be255abca51556b5ef0da497faec4a4a1e62ce","src/unique_table.rs":"31aa54330ca4786af772d32e8cb6158b6504b88fa93fe177bf0c6cbe545a8d35"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-codegen-meta"
 authors = ["The Cranelift Project Developers"]
-version = "0.67.0"
+version = "0.68.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -12,8 +12,8 @@
 rustdoc-args = [ "--document-private-items" ]
 
 [dependencies]
-cranelift-codegen-shared = { path = "../shared", version = "0.67.0" }
-cranelift-entity = { path = "../../entity", version = "0.67.0" }
+cranelift-codegen-shared = { path = "../shared", version = "0.68.0" }
+cranelift-entity = { path = "../../entity", version = "0.68.0" }
 
 [badges]
 maintenance = { status = "experimental" }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/src/isa/x86/legalize.rs firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/src/isa/x86/legalize.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/src/isa/x86/legalize.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/src/isa/x86/legalize.rs	2021-01-18 19:58:25.000000000 +0000
@@ -396,6 +396,7 @@
     let insertlane = insts.by_name("insertlane");
     let ishl = insts.by_name("ishl");
     let ishl_imm = insts.by_name("ishl_imm");
+    let load_splat = insts.by_name("load_splat");
     let raw_bitcast = insts.by_name("raw_bitcast");
     let scalar_to_vector = insts.by_name("scalar_to_vector");
     let splat = insts.by_name("splat");
@@ -820,6 +821,7 @@
     narrow.custom_legalize(fcvt_to_sint_sat, "expand_fcvt_to_sint_sat_vector");
     narrow.custom_legalize(fmin, "expand_minmax_vector");
     narrow.custom_legalize(fmax, "expand_minmax_vector");
+    narrow.custom_legalize(load_splat, "expand_load_splat");
 
     narrow_avx.custom_legalize(imul, "convert_i64x2_imul");
     narrow_avx.custom_legalize(fcvt_from_uint, "expand_fcvt_from_uint_vector");
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/src/shared/instructions.rs firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/src/shared/instructions.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-meta/src/shared/instructions.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-meta/src/shared/instructions.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2193,6 +2193,24 @@
         .operands_out(vec![s]),
     );
 
+    let a = &Operand::new("a", TxN);
+    let x = &Operand::new("x", Int);
+
+    ig.push(
+        Inst::new(
+            "vhigh_bits",
+            r#"
+        Reduce a vector to a scalar integer.
+
+        Return a scalar integer, consisting of the concatenation of the most significant bit
+        of each lane of ``a``.
+        "#,
+            &formats.unary,
+        )
+        .operands_in(vec![a])
+        .operands_out(vec![x]),
+    );
+
     let a = &Operand::new("a", &Int.as_bool());
     let Cond = &Operand::new("Cond", &imm.intcc);
     let x = &Operand::new("x", Int);
@@ -3559,6 +3577,22 @@
         .operands_out(vec![a]),
     );
 
+    ig.push(
+        Inst::new(
+            "fmin_pseudo",
+            r#"
+        Floating point pseudo-minimum, propagating NaNs.  This behaves differently from ``fmin``.
+        See https://github.com/WebAssembly/simd/pull/122 for background.
+
+        The behaviour is defined as ``fmin_pseudo(a, b) = (b < a) ? b : a``, and the behaviour
+        for zero or NaN inputs follows from the behaviour of ``<`` with such inputs.
+        "#,
+            &formats.binary,
+        )
+        .operands_in(vec![x, y])
+        .operands_out(vec![a]),
+    );
+
     let a = &Operand::new("a", Float).with_doc("The larger of ``x`` and ``y``");
 
     ig.push(
@@ -3575,6 +3609,22 @@
         .operands_out(vec![a]),
     );
 
+    ig.push(
+        Inst::new(
+            "fmax_pseudo",
+            r#"
+        Floating point pseudo-maximum, propagating NaNs.  This behaves differently from ``fmax``.
+        See https://github.com/WebAssembly/simd/pull/122 for background.
+
+        The behaviour is defined as ``fmax_pseudo(a, b) = (a < b) ? b : a``, and the behaviour
+        for zero or NaN inputs follows from the behaviour of ``<`` with such inputs.
+        "#,
+            &formats.binary,
+        )
+        .operands_in(vec![x, y])
+        .operands_out(vec![a]),
+    );
+
     let a = &Operand::new("a", Float).with_doc("``x`` rounded to integral value");
 
     ig.push(
@@ -3748,12 +3798,9 @@
         Inst::new(
             "scalar_to_vector",
             r#"
-    Scalar To Vector -- move a value out of a scalar register and into a vector register; the
-    scalar will be moved to the lowest-order bits of the vector register. Note that this
-    instruction is intended as a low-level legalization instruction and frontends should prefer
-    insertlane; on certain architectures, scalar_to_vector may zero the highest-order bits for some
-    types (e.g. integers) but not for others (e.g. floats).
-    "#,
+            Copies a scalar value to a vector value.  The scalar is copied into the
+            least significant lane of the vector, and all other lanes will be zero.
+            "#,
             &formats.unary,
         )
         .operands_in(vec![s])
@@ -4028,6 +4075,41 @@
         .operands_out(vec![a]),
     );
 
+    let I16x8 = &TypeVar::new(
+        "I16x8",
+        "A SIMD vector type containing 8 integer lanes each 16 bits wide.",
+        TypeSetBuilder::new()
+            .ints(16..16)
+            .simd_lanes(8..8)
+            .includes_scalars(false)
+            .build(),
+    );
+
+    let x = &Operand::new("x", I16x8);
+    let y = &Operand::new("y", I16x8);
+    let a = &Operand::new("a", &I16x8.merge_lanes());
+
+    ig.push(
+        Inst::new(
+            "widening_pairwise_dot_product_s",
+            r#"
+        Takes corresponding elements in `x` and `y`, performs a sign-extending length-doubling
+        multiplication on them, then adds adjacent pairs of elements to form the result.  For
+        example, if the input vectors are `[x3, x2, x1, x0]` and `[y3, y2, y1, y0]`, it produces
+        the vector `[r1, r0]`, where `r1 = sx(x3) * sx(y3) + sx(x2) * sx(y2)` and
+        `r0 = sx(x1) * sx(y1) + sx(x0) * sx(y0)`, and `sx(n)` sign-extends `n` to twice its width.
+
+        This will double the lane width and halve the number of lanes.  So the resulting
+        vector has the same number of bits as `x` and `y` do (individually).
+
+        See https://github.com/WebAssembly/simd/pull/127 for background info.
+            "#,
+            &formats.binary,
+        )
+        .operands_in(vec![x, y])
+        .operands_out(vec![a]),
+    );
+
     let IntTo = &TypeVar::new(
         "IntTo",
         "A larger integer type with the same number of lanes",
@@ -4409,5 +4491,24 @@
         .other_side_effects(true),
     );
 
+    let Offset = &Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address");
+    let a = &Operand::new("a", TxN);
+
+    ig.push(
+        Inst::new(
+            "load_splat",
+            r#"
+        Load an element from memory at ``p + Offset`` and return a vector
+        whose lanes are all set to that element.
+
+        This is equivalent to ``load`` followed by ``splat``.
+        "#,
+            &formats.load,
+        )
+        .operands_in(vec![MemFlags, p, Offset])
+        .operands_out(vec![a])
+        .can_load(true),
+    );
+
     ig.build()
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c87e99b6131e876d16430cd2f40de7c03e6d72a8ba1423c8778b5c733bcd4362","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"a410bc2f5dcbde499c0cd299c2620bc8111e3c5b3fccdd9e2d85caf3c24fdab3","src/condcodes.rs":"b8d433b2217b86e172d25b6c65a3ce0cc8ca221062cad1b28b0c78d2159fbda9","src/constant_hash.rs":"ffc619f45aad62c6fdcb83553a05879691a72e9a0103375b2d6cc12d52cf72d0","src/constants.rs":"fed03a10a6316e06aa174091db6e7d1fbb5f73c82c31193012ec5ab52f1c603a","src/isa/mod.rs":"428a950eca14acbe783899ccb1aecf15027f8cbe205578308ebde203d10535f3","src/isa/x86/encoding_bits.rs":"7e013fb804b13f9f83a0d517c6f5105856938d08ad378cc44a6fe6a59adef270","src/isa/x86/mod.rs":"01ef4e4d7437f938badbe2137892183c1ac684da0f68a5bec7e06aad34f43b9b","src/lib.rs":"91f26f998f11fb9cb74d2ec171424e29badd417beef023674850ace57149c656"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"322ab8efd1588c57313b18aaa231ee30a888741828cf27283e6c62735d73d02d","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"a410bc2f5dcbde499c0cd299c2620bc8111e3c5b3fccdd9e2d85caf3c24fdab3","src/condcodes.rs":"b8d433b2217b86e172d25b6c65a3ce0cc8ca221062cad1b28b0c78d2159fbda9","src/constant_hash.rs":"ffc619f45aad62c6fdcb83553a05879691a72e9a0103375b2d6cc12d52cf72d0","src/constants.rs":"fed03a10a6316e06aa174091db6e7d1fbb5f73c82c31193012ec5ab52f1c603a","src/isa/mod.rs":"428a950eca14acbe783899ccb1aecf15027f8cbe205578308ebde203d10535f3","src/isa/x86/encoding_bits.rs":"7e013fb804b13f9f83a0d517c6f5105856938d08ad378cc44a6fe6a59adef270","src/isa/x86/mod.rs":"01ef4e4d7437f938badbe2137892183c1ac684da0f68a5bec7e06aad34f43b9b","src/lib.rs":"7a8eda4dafcf47100c41e61b5c985f089d1985c500624956dc183fcf6bc7b183"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen-shared"
-version = "0.67.0"
+version = "0.68.0"
 description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-codegen-shared/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-codegen-shared/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -12,8 +12,7 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
+        clippy::map_unwrap_or,
         clippy::print_stdout,
         clippy::unicode_not_nfc,
         clippy::use_self
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-entity/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-entity/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-entity/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-entity/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6caa0a14fad8486a13273989457e57d6180be91eb57ded8977f67a784d982f4a","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"96ceffbfd88fb06e3b41aa4d3087cffbbf8441d04eba7ab09662a72ab600a321","src/boxed_slice.rs":"69d539b72460c0aba1d30e0b72efb0c29d61558574d751c784794e14abf41352","src/iter.rs":"61fefdc49cafad4cacba5f5a7ad2396a23160642c688a7f0b0734277391847cd","src/keys.rs":"b8c2fba26dee15bf3d1880bb2b41e8d66fe1428d242ee6d9fd30ee94bbd0407d","src/lib.rs":"72aca3bf830dce85a8b5f2325b589810ca06ae09e8d2daf137524ad6e6737bbe","src/list.rs":"4bf609eb7cc7c000c18da746596d5fcc67eece3f919ee2d76e19f6ac371640d1","src/map.rs":"e5ce79a7536dc147092be4965785b55e24b11356554be57afab38a7a93f47f4e","src/packed_option.rs":"d931ba5ce07a5c77c8a62bb07316db21c101bc3fa1eb6ffd396f8a8944958185","src/primary.rs":"20fe2c1b9645606c5fd5d416225f1e6a4bea17ee7de73ef5492c113263a29dd6","src/set.rs":"b040054b8baa0599e64df9ee841640688e2a73b6eabbdc5a4f15334412db052a","src/sparse.rs":"536e31fdcf64450526f5e5b85e97406c26b998bc7e0d8161b6b449c24265449f"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"e2b299fe4d2287845ae2843e10b5e9eac1dab170dc7bddc25fe461ba0868ff69","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"96ceffbfd88fb06e3b41aa4d3087cffbbf8441d04eba7ab09662a72ab600a321","src/boxed_slice.rs":"69d539b72460c0aba1d30e0b72efb0c29d61558574d751c784794e14abf41352","src/iter.rs":"61fefdc49cafad4cacba5f5a7ad2396a23160642c688a7f0b0734277391847cd","src/keys.rs":"b8c2fba26dee15bf3d1880bb2b41e8d66fe1428d242ee6d9fd30ee94bbd0407d","src/lib.rs":"6c59d159948c2a0787d882e9278c269b5a87f073fdcb372df852a1dd2ba20695","src/list.rs":"4bf609eb7cc7c000c18da746596d5fcc67eece3f919ee2d76e19f6ac371640d1","src/map.rs":"e5ce79a7536dc147092be4965785b55e24b11356554be57afab38a7a93f47f4e","src/packed_option.rs":"d931ba5ce07a5c77c8a62bb07316db21c101bc3fa1eb6ffd396f8a8944958185","src/primary.rs":"20fe2c1b9645606c5fd5d416225f1e6a4bea17ee7de73ef5492c113263a29dd6","src/set.rs":"b040054b8baa0599e64df9ee841640688e2a73b6eabbdc5a4f15334412db052a","src/sparse.rs":"536e31fdcf64450526f5e5b85e97406c26b998bc7e0d8161b6b449c24265449f"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-entity/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-entity/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-entity/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-entity/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-entity"
-version = "0.67.0"
+version = "0.68.0"
 description = "Data structures using entity references as mapping keys"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-entity"
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-entity/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-entity/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-entity/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-entity/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -39,9 +39,8 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
-        clippy::print_stdout,
+        clippy::map_unwrap_or,
+        clippy::clippy::print_stdout,
         clippy::unicode_not_nfc,
         clippy::use_self
     )
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-frontend/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-frontend/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-frontend/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-frontend/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"c58c988dd6e749bd15cbae1115575fdf4f43bdf952bd3c90bbb28d805759984a","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"dea43e8044284df50f8b8772e9b48ba8b109b45c74111ff73619775d57ad8d67","src/frontend.rs":"53e108a04ead6890ee78f674b9ed6862443c66dd85ec214e4c27e0da3f67228e","src/lib.rs":"5197f467d1625ee2b117a168f4b1886b4b69d4250faea6618360a5adc70b4e0c","src/ssa.rs":"650d26025706cfb63935f956bca6f166b0edfa32260cd2a8c27f9b49fcc743c3","src/switch.rs":"73f9058a899d2b19ed7135e028cc6005c6e3016f8530619519eac9627cb1383e","src/variable.rs":"399437bd7d2ac11a7a748bad7dd1f6dac58824d374ec318f36367a9d077cc225"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"efedd48411232c30fe72899fca348ca08a8cc83b373163376ee1780994608d8f","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"dea43e8044284df50f8b8772e9b48ba8b109b45c74111ff73619775d57ad8d67","src/frontend.rs":"53e108a04ead6890ee78f674b9ed6862443c66dd85ec214e4c27e0da3f67228e","src/lib.rs":"e757197479cc26732f5f872ffe40f60fdc376c748e1c16e9b42976fef51a2161","src/ssa.rs":"650d26025706cfb63935f956bca6f166b0edfa32260cd2a8c27f9b49fcc743c3","src/switch.rs":"73f9058a899d2b19ed7135e028cc6005c6e3016f8530619519eac9627cb1383e","src/variable.rs":"399437bd7d2ac11a7a748bad7dd1f6dac58824d374ec318f36367a9d077cc225"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-frontend/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-frontend/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-frontend/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-frontend/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-frontend"
-version = "0.67.0"
+version = "0.68.0"
 description = "Cranelift IR builder helper"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-frontend"
@@ -11,10 +11,10 @@
 edition = "2018"
 
 [dependencies]
-cranelift-codegen = { path = "../codegen", version = "0.67.0", default-features = false }
+cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features = false }
 target-lexicon = "0.11"
 log = { version = "0.4.6", default-features = false }
-hashbrown = { version = "0.7", optional = true }
+hashbrown = { version = "0.9.1", optional = true }
 smallvec = { version = "1.0.0" }
 
 [features]
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-frontend/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-frontend/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-frontend/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-frontend/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -172,9 +172,8 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
-        clippy::print_stdout,
+        clippy::map_unwrap_or,
+        clippy::clippy::print_stdout,
         clippy::unicode_not_nfc,
         clippy::use_self
     )
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cranelift-wasm/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"53367fadfe62cdc349a55a3460992677690300d6e568e38b8d73e2b5c7376c7d","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c82c252fbeeaa101a0eef042b9a925eb1fa3d2b51d19481b9c22e593e6a8d772","src/code_translator.rs":"b25c4a4b002f2fab0364fd890539de76bc163e6f8a817d1a53bec271970ea903","src/environ/dummy.rs":"f780d523b7024d4fed923992bbe95ca4816e3a8770a83ea01de94d4cd1625b6e","src/environ/mod.rs":"692f35d75f125f9c071f7166252f427e4bac29401356f73307c6c36e23c667fb","src/environ/spec.rs":"ed806f95bd13e26ae14684287f547e77bdcc31c10a6a23ee45764f573ff4793f","src/func_translator.rs":"ebc7e7f872d03fc05e9c013e0eb575b0ae2828322b7194c60b8e764f2816d12e","src/lib.rs":"83fbcf3561b7255d346b6b33114f4a051f3a7133f11f1a238c0fe12ddbdd1ba7","src/module_translator.rs":"dc63d45d1917034f9d06008899143e32041e6d3475629d3c6eee3bb0195a0b3e","src/sections_translator.rs":"00012d18f1467f71959c4b68dcb2c059523011cac50f7ac869d3206ce9021475","src/state/func_state.rs":"581a5648b11fa07aef3cff0752597864c7cd44a4d44e27c50fc7349955b3fda3","src/state/mod.rs":"20014cb93615467b4d20321b52f67f66040417efcaa739a4804093bb559eed19","src/state/module_state.rs":"7ca3cb06b4481bc3ae74697fbcd437aea1d851eaa3cfe18cc013a4af43728957","src/translation_utils.rs":"1b9d3d63fc259c9c657747da750d0434f0acbc53381ca32860b04d017754eb55","tests/wasm_testsuite.rs":"5e9f8441acdafe1552b4ae79c8c27603dad2b047791b035d28354d9f29b4d4e7"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"f2978cc72e6013dfc336294b7e97d2b9966848f1c140ae0edfeba513255edcce","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","README.md":"c82c252fbeeaa101a0eef042b9a925eb1fa3d2b51d19481b9c22e593e6a8d772","src/code_translator.rs":"2bfc9607bfd350c130182614c2e05207f15ef8185f98e7d381140a07083c6589","src/environ/dummy.rs":"e22052b6d966744658a189a6d77595d2b92e9d0bc8b6fbc1be2d68f2dbfccb28","src/environ/mod.rs":"692f35d75f125f9c071f7166252f427e4bac29401356f73307c6c36e23c667fb","src/environ/spec.rs":"f38c2f2c69d60ebd665b7991def3d06340fe5593e44b2f441d212adc756ac2d4","src/func_translator.rs":"ebc7e7f872d03fc05e9c013e0eb575b0ae2828322b7194c60b8e764f2816d12e","src/lib.rs":"fbbbe573ec5b4bd0f667c20500b2836a302d378933db56141df445e9aa8fba42","src/module_translator.rs":"9c24c44bcf866ac46ca90e22db5321080c1b507dca40fef73c4cdb0918391be6","src/sections_translator.rs":"8ce41a58daacc706f2a73c1cdb52c8838faa230413bb29a50826cf5a2c550608","src/state/func_state.rs":"0a6bcb31db482bdccf90c9260f9ea05a19e7439a24f81fd46173ed6c810cd1a7","src/state/mod.rs":"20014cb93615467b4d20321b52f67f66040417efcaa739a4804093bb559eed19","src/state/module_state.rs":"7ca3cb06b4481bc3ae74697fbcd437aea1d851eaa3cfe18cc013a4af43728957","src/translation_utils.rs":"4a70e54ce4e9040a05f4d49ca3595da4a213e865f2baa12965bef4236780681a","tests/wasm_testsuite.rs":"5e9f8441acdafe1552b4ae79c8c27603dad2b047791b035d28354d9f29b4d4e7"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/Cargo.toml firefox-85.0+build1/third_party/rust/cranelift-wasm/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-wasm"
-version = "0.67.0"
+version = "0.68.0"
 authors = ["The Cranelift Project Developers"]
 description = "Translator from WebAssembly to Cranelift IR"
 documentation = "https://docs.rs/cranelift-wasm"
@@ -12,21 +12,22 @@
 edition = "2018"
 
 [dependencies]
-wasmparser = { version = "0.63.0", default-features = false }
-cranelift-codegen = { path = "../codegen", version = "0.67.0", default-features = false }
-cranelift-entity = { path = "../entity", version = "0.67.0" }
-cranelift-frontend = { path = "../frontend", version = "0.67.0", default-features = false }
-hashbrown = { version = "0.7", optional = true }
+wasmparser = { git = "https://github.com/mozilla-spidermonkey/wasm-tools", rev = "1b7763faa484e62752538b78e7a69883f4faceee", default-features = false }
+cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features = false }
+cranelift-entity = { path = "../entity", version = "0.68.0" }
+cranelift-frontend = { path = "../frontend", version = "0.68.0", default-features = false }
+hashbrown = { version = "0.9.1", optional = true }
 itertools = "0.9.0"
 log = { version = "0.4.6", default-features = false }
 serde = { version = "1.0.94", features = ["derive"], optional = true }
+smallvec = "1.0.0"
 thiserror = "1.0.4"
 
 [dev-dependencies]
 wat = "1.0.23"
 target-lexicon = "0.11"
 # Enable the riscv feature for cranelift-codegen, as some tests require it
-cranelift-codegen = { path = "../codegen", version = "0.67.0", default-features = false, features = ["riscv"] }
+cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features = false, features = ["riscv"] }
 
 [features]
 default = ["std"]
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/code_translator.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/code_translator.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/code_translator.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/code_translator.rs	2021-01-18 19:58:25.000000000 +0000
@@ -22,13 +22,62 @@
 //!
 //! That is why `translate_function_body` takes an object having the `WasmRuntime` trait as
 //! argument.
+//!
+//! There is extra complexity associated with translation of 128-bit SIMD instructions.
+//! Wasm only considers there to be a single 128-bit vector type.  But CLIF's type system
+//! distinguishes different lane configurations, so considers 8X16, 16X8, 32X4 and 64X2 to be
+//! different types.  The result is that, in wasm, it's perfectly OK to take the output of (eg)
+//! an `add.16x8` and use that as an operand of a `sub.32x4`, without using any cast.  But when
+//! translated into CLIF, that will cause a verifier error due to the apparent type mismatch.
+//!
+//! This file works around that problem by liberally inserting `bitcast` instructions in many
+//! places -- mostly, before the use of vector values, either as arguments to CLIF instructions
+//! or as block actual parameters.  These are no-op casts which nevertheless have different
+//! input and output types, and are used (mostly) to "convert" 16X8, 32X4 and 64X2-typed vectors
+//! to the "canonical" type, 8X16.  Hence the functions `optionally_bitcast_vector`,
+//! `bitcast_arguments`, `pop*_with_bitcast`, `canonicalise_then_jump`,
+//! `canonicalise_then_br{z,nz}`, `is_non_canonical_v128` and `canonicalise_v128_values`.
+//! Note that the `bitcast*` functions are occasionally used to convert to some type other than
+//! 8X16, but the `canonicalise*` functions always convert to type 8X16.
+//!
+//! Be careful when adding support for new vector instructions.  And when adding new jumps, even
+//! if they are apparently don't have any connection to vectors.  Never generate any kind of
+//! (inter-block) jump directly.  Instead use `canonicalise_then_jump` and
+//! `canonicalise_then_br{z,nz}`.
+//!
+//! The use of bitcasts is ugly and inefficient, but currently unavoidable:
+//!
+//! * they make the logic in this file fragile: miss out a bitcast for any reason, and there is
+//!   the risk of the system failing in the verifier.  At least for debug builds.
+//!
+//! * in the new backends, they potentially interfere with pattern matching on CLIF -- the
+//!   patterns need to take into account the presence of bitcast nodes.
+//!
+//! * in the new backends, they get translated into machine-level vector-register-copy
+//!   instructions, none of which are actually necessary.  We then depend on the register
+//!   allocator to coalesce them all out.
+//!
+//! * they increase the total number of CLIF nodes that have to be processed, hence slowing down
+//!   the compilation pipeline.  Also, the extra coalescing work generates a slowdown.
+//!
+//! A better solution which would avoid all four problems would be to remove the 8X16, 16X8,
+//! 32X4 and 64X2 types from CLIF and instead have a single V128 type.
+//!
+//! For further background see also:
+//!   https://github.com/bytecodealliance/wasmtime/issues/1147
+//!     ("Too many raw_bitcasts in SIMD code")
+//!   https://github.com/bytecodealliance/cranelift/pull/1251
+//!     ("Add X128 type to represent WebAssembly's V128 type")
+//!   https://github.com/bytecodealliance/cranelift/pull/1236
+//!     ("Relax verification to allow I8X16 to act as a default vector type")
+
 use super::{hash_map, HashMap};
 use crate::environ::{FuncEnvironment, GlobalVariable, ReturnMode, WasmResult};
 use crate::state::{ControlStackFrame, ElseData, FuncTranslationState};
 use crate::translation_utils::{
     block_with_params, blocktype_params_results, f32_translation, f64_translation,
 };
-use crate::translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
+use crate::translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, TableIndex, TypeIndex};
 use crate::wasm_unsupported;
 use core::convert::TryInto;
 use core::{i32, u32};
@@ -40,6 +89,7 @@
 };
 use cranelift_codegen::packed_option::ReservedValue;
 use cranelift_frontend::{FunctionBuilder, Variable};
+use smallvec::SmallVec;
 use std::cmp;
 use std::convert::TryFrom;
 use std::vec::Vec;
@@ -188,7 +238,7 @@
             let (params, results) = blocktype_params_results(validator, *ty)?;
             let loop_body = block_with_params(builder, params.clone(), environ)?;
             let next = block_with_params(builder, results.clone(), environ)?;
-            builder.ins().jump(loop_body, state.peekn(params.len()));
+            canonicalise_then_jump(builder, loop_body, state.peekn(params.len()));
             state.push_loop(loop_body, next, params.len(), results.len());
 
             // Pop the initial `Block` actuals and replace them with the `Block`'s
@@ -213,24 +263,21 @@
                 // up discovering an `else`, then we will allocate a block for it
                 // and go back and patch the jump.
                 let destination = block_with_params(builder, results.clone(), environ)?;
-                let branch_inst = builder
-                    .ins()
-                    .brz(val, destination, state.peekn(params.len()));
+                let branch_inst =
+                    canonicalise_then_brz(builder, val, destination, state.peekn(params.len()));
                 (destination, ElseData::NoElse { branch_inst })
             } else {
                 // The `if` type signature is not valid without an `else` block,
                 // so we eagerly allocate the `else` block here.
                 let destination = block_with_params(builder, results.clone(), environ)?;
                 let else_block = block_with_params(builder, params.clone(), environ)?;
-                builder
-                    .ins()
-                    .brz(val, else_block, state.peekn(params.len()));
+                canonicalise_then_brz(builder, val, else_block, state.peekn(params.len()));
                 builder.seal_block(else_block);
                 (destination, ElseData::WithElse { else_block })
             };
 
             let next_block = builder.create_block();
-            builder.ins().jump(next_block, &[]);
+            canonicalise_then_jump(builder, next_block, &[]);
             builder.seal_block(next_block); // Only predecessor is the current block.
             builder.switch_to_block(next_block);
 
@@ -272,7 +319,11 @@
                                 debug_assert_eq!(params.len(), num_return_values);
                                 let else_block =
                                     block_with_params(builder, params.clone(), environ)?;
-                                builder.ins().jump(destination, state.peekn(params.len()));
+                                canonicalise_then_jump(
+                                    builder,
+                                    destination,
+                                    state.peekn(params.len()),
+                                );
                                 state.popn(params.len());
 
                                 builder.change_jump_destination(branch_inst, else_block);
@@ -280,9 +331,11 @@
                                 else_block
                             }
                             ElseData::WithElse { else_block } => {
-                                builder
-                                    .ins()
-                                    .jump(destination, state.peekn(num_return_values));
+                                canonicalise_then_jump(
+                                    builder,
+                                    destination,
+                                    state.peekn(num_return_values),
+                                );
                                 state.popn(num_return_values);
                                 else_block
                             }
@@ -314,9 +367,7 @@
             if !builder.is_unreachable() || !builder.is_pristine() {
                 let return_count = frame.num_return_values();
                 let return_args = state.peekn_mut(return_count);
-                let next_block_types = builder.func.dfg.block_param_types(next_block);
-                bitcast_arguments(return_args, &next_block_types, builder);
-                builder.ins().jump(frame.following_code(), return_args);
+                canonicalise_then_jump(builder, frame.following_code(), return_args);
                 // You might expect that if we just finished an `if` block that
                 // didn't have a corresponding `else` block, then we would clean
                 // up our duplicate set of parameters that we pushed earlier
@@ -372,17 +423,8 @@
                 };
                 (return_count, frame.br_destination())
             };
-
-            // Bitcast any vector arguments to their default type, I8X16, before jumping.
             let destination_args = state.peekn_mut(return_count);
-            let destination_types = builder.func.dfg.block_param_types(br_destination);
-            bitcast_arguments(
-                destination_args,
-                &destination_types[..return_count],
-                builder,
-            );
-
-            builder.ins().jump(br_destination, destination_args);
+            canonicalise_then_jump(builder, br_destination, destination_args);
             state.popn(return_count);
             state.reachable = false;
         }
@@ -462,17 +504,8 @@
                         frame.set_branched_to_exit();
                         frame.br_destination()
                     };
-
-                    // Bitcast any vector arguments to their default type, I8X16, before jumping.
                     let destination_args = state.peekn_mut(return_count);
-                    let destination_types = builder.func.dfg.block_param_types(real_dest_block);
-                    bitcast_arguments(
-                        destination_args,
-                        &destination_types[..return_count],
-                        builder,
-                    );
-
-                    builder.ins().jump(real_dest_block, destination_args);
+                    canonicalise_then_jump(builder, real_dest_block, destination_args);
                 }
                 state.popn(return_count);
             }
@@ -481,7 +514,9 @@
         Operator::Return => {
             let (return_count, br_destination) = {
                 let frame = &mut state.control_stack[0];
-                frame.set_branched_to_exit();
+                if environ.return_mode() == ReturnMode::FallthroughReturn {
+                    frame.set_branched_to_exit();
+                }
                 let return_count = frame.num_return_values();
                 (return_count, frame.br_destination())
             };
@@ -494,7 +529,7 @@
                 match environ.return_mode() {
                     ReturnMode::NormalReturns => builder.ins().return_(return_args),
                     ReturnMode::FallthroughReturn => {
-                        builder.ins().jump(br_destination, return_args)
+                        canonicalise_then_jump(builder, br_destination, return_args)
                     }
                 };
             }
@@ -554,7 +589,7 @@
                 builder.cursor(),
                 TableIndex::from_u32(*table_index),
                 table,
-                SignatureIndex::from_u32(*index),
+                TypeIndex::from_u32(*index),
                 sigref,
                 callee,
                 state.peekn(num_args),
@@ -992,7 +1027,7 @@
             let index = FuncIndex::from_u32(*function_index);
             state.push1(environ.translate_ref_func(builder.cursor(), index)?);
         }
-        Operator::MemoryAtomicWait32 { .. } | Operator::MemoryAtomicWait64 { .. } => {
+        Operator::MemoryAtomicWait32 { memarg } | Operator::MemoryAtomicWait64 { memarg } => {
             // The WebAssembly MVP only supports one linear memory and
             // wasmparser will ensure that the memory indices specified are
             // zero.
@@ -1001,8 +1036,8 @@
                 Operator::MemoryAtomicWait32 { .. } => I32,
                 _ => unreachable!(),
             };
-            let heap_index = MemoryIndex::from_u32(0);
-            let heap = state.get_heap(builder.func, 0, environ)?;
+            let heap_index = MemoryIndex::from_u32(memarg.memory);
+            let heap = state.get_heap(builder.func, memarg.memory, environ)?;
             let timeout = state.pop1(); // 64 (fixed)
             let expected = state.pop1(); // 32 or 64 (per the `Ixx` in `IxxAtomicWait`)
             let addr = state.pop1(); // 32 (fixed)
@@ -1019,12 +1054,9 @@
             )?;
             state.push1(res);
         }
-        Operator::MemoryAtomicNotify { .. } => {
-            // The WebAssembly MVP only supports one linear memory and
-            // wasmparser will ensure that the memory indices specified are
-            // zero.
-            let heap_index = MemoryIndex::from_u32(0);
-            let heap = state.get_heap(builder.func, 0, environ)?;
+        Operator::MemoryAtomicNotify { memarg } => {
+            let heap_index = MemoryIndex::from_u32(memarg.memory);
+            let heap = state.get_heap(builder.func, memarg.memory, environ)?;
             let count = state.pop1(); // 32 (fixed)
             let addr = state.pop1(); // 32 (fixed)
             let res =
@@ -1233,16 +1265,23 @@
             builder.ins().fence();
         }
         Operator::MemoryCopy { src, dst } => {
-            // The WebAssembly MVP only supports one linear memory and
-            // wasmparser will ensure that the memory indices specified are
-            // zero.
-            assert_eq!(src, dst, "unimplemented between-memories copy");
-            let heap_index = MemoryIndex::from_u32(*src);
-            let heap = state.get_heap(builder.func, *src, environ)?;
+            let src_index = MemoryIndex::from_u32(*src);
+            let dst_index = MemoryIndex::from_u32(*dst);
+            let src_heap = state.get_heap(builder.func, *src, environ)?;
+            let dst_heap = state.get_heap(builder.func, *dst, environ)?;
             let len = state.pop1();
-            let src = state.pop1();
-            let dest = state.pop1();
-            environ.translate_memory_copy(builder.cursor(), heap_index, heap, dest, src, len)?;
+            let src_pos = state.pop1();
+            let dst_pos = state.pop1();
+            environ.translate_memory_copy(
+                builder.cursor(),
+                src_index,
+                src_heap,
+                dst_index,
+                dst_heap,
+                dst_pos,
+                src_pos,
+                len,
+            )?;
         }
         Operator::MemoryFill { mem } => {
             let heap_index = MemoryIndex::from_u32(*mem);
@@ -1357,7 +1396,8 @@
             let data = value.bytes().to_vec().into();
             let handle = builder.func.dfg.constants.insert(data);
             let value = builder.ins().vconst(I8X16, handle);
-            // the v128.const is typed in CLIF as a I8x16 but raw_bitcast to a different type before use
+            // the v128.const is typed in CLIF as a I8x16 but raw_bitcast to a different type
+            // before use
             state.push1(value)
         }
         Operator::I8x16Splat | Operator::I16x8Splat => {
@@ -1376,9 +1416,19 @@
         | Operator::V128Load16Splat { memarg }
         | Operator::V128Load32Splat { memarg }
         | Operator::V128Load64Splat { memarg } => {
-            // TODO: For spec compliance, this is initially implemented as a combination of `load +
-            // splat` but could be implemented eventually as a single instruction (`load_splat`).
-            // See https://github.com/bytecodealliance/wasmtime/issues/1175.
+            let opcode = ir::Opcode::LoadSplat;
+            let result_ty = type_of(op);
+            let (flags, base, offset) = prepare_load(
+                memarg,
+                mem_op_size(opcode, result_ty.lane_type()),
+                builder,
+                state,
+                environ,
+            )?;
+            let (load, dfg) = builder.ins().Load(opcode, result_ty, flags, offset, base);
+            state.push1(dfg.first_result(load))
+        }
+        Operator::V128Load32Zero { memarg } | Operator::V128Load64Zero { memarg } => {
             translate_load(
                 memarg,
                 ir::Opcode::Load,
@@ -1387,8 +1437,8 @@
                 state,
                 environ,
             )?;
-            let splatted = builder.ins().splat(type_of(op), state.pop1());
-            state.push1(splatted)
+            let as_vector = builder.ins().scalar_to_vector(type_of(op), state.pop1());
+            state.push1(as_vector)
         }
         Operator::I8x16ExtractLaneS { lane } | Operator::I16x8ExtractLaneS { lane } => {
             let vector = pop1_with_bitcast(state, type_of(op), builder);
@@ -1562,6 +1612,10 @@
             let bool_result = builder.ins().vall_true(a);
             state.push1(builder.ins().bint(I32, bool_result))
         }
+        Operator::I8x16Bitmask | Operator::I16x8Bitmask | Operator::I32x4Bitmask => {
+            let a = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().vhigh_bits(I32, a));
+        }
         Operator::I8x16Eq | Operator::I16x8Eq | Operator::I32x4Eq => {
             translate_vector_icmp(IntCC::Equal, type_of(op), builder, state)
         }
@@ -1637,6 +1691,14 @@
             let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().fmin(a, b))
         }
+        Operator::F32x4PMax | Operator::F64x2PMax => {
+            let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().fmax_pseudo(a, b))
+        }
+        Operator::F32x4PMin | Operator::F64x2PMin => {
+            let (a, b) = pop2_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().fmin_pseudo(a, b))
+        }
         Operator::F32x4Sqrt | Operator::F64x2Sqrt => {
             let a = pop1_with_bitcast(state, type_of(op), builder);
             state.push1(builder.ins().sqrt(a))
@@ -1714,22 +1776,29 @@
             state.push1(builder.ins().uwiden_high(a))
         }
 
-        Operator::F32x4Ceil
-        | Operator::F32x4Floor
-        | Operator::F32x4Trunc
-        | Operator::F32x4Nearest
-        | Operator::F32x4PMin
-        | Operator::F32x4PMax
-        | Operator::F64x2Ceil
-        | Operator::F64x2Floor
-        | Operator::F64x2Trunc
-        | Operator::F64x2PMin
-        | Operator::F64x2PMax
-        | Operator::F64x2Nearest
-        | Operator::I8x16Bitmask
-        | Operator::I16x8Bitmask
-        | Operator::I32x4Bitmask => {
-            return Err(wasm_unsupported!("proposed SIMD operator {:?}", op));
+        Operator::F32x4Ceil | Operator::F64x2Ceil => {
+            // This is something of a misuse of `type_of`, because that produces the return type
+            // of `op`.  In this case we want the arg type, but we know it's the same as the
+            // return type.  Same for the 3 cases below.
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().ceil(arg));
+        }
+        Operator::F32x4Floor | Operator::F64x2Floor => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().floor(arg));
+        }
+        Operator::F32x4Trunc | Operator::F64x2Trunc => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().trunc(arg));
+        }
+        Operator::F32x4Nearest | Operator::F64x2Nearest => {
+            let arg = pop1_with_bitcast(state, type_of(op), builder);
+            state.push1(builder.ins().nearest(arg));
+        }
+
+        Operator::I32x4DotI16x8S => {
+            let (a, b) = pop2_with_bitcast(state, I16X8, builder);
+            state.push1(builder.ins().widening_pairwise_dot_product_s(a, b));
         }
 
         Operator::ReturnCall { .. } | Operator::ReturnCallIndirect { .. } => {
@@ -2036,7 +2105,7 @@
         ir::Opcode::Istore8 | ir::Opcode::Sload8 | ir::Opcode::Uload8 => 1,
         ir::Opcode::Istore16 | ir::Opcode::Sload16 | ir::Opcode::Uload16 => 2,
         ir::Opcode::Istore32 | ir::Opcode::Sload32 | ir::Opcode::Uload32 => 4,
-        ir::Opcode::Store | ir::Opcode::Load => ty.bytes(),
+        ir::Opcode::Store | ir::Opcode::Load | ir::Opcode::LoadSplat => ty.bytes(),
         _ => panic!("unknown size of mem op for {:?}", opcode),
     }
 }
@@ -2313,15 +2382,10 @@
 ) {
     let val = state.pop1();
     let (br_destination, inputs) = translate_br_if_args(relative_depth, state);
-
-    // Bitcast any vector arguments to their default type, I8X16, before jumping.
-    let destination_types = builder.func.dfg.block_param_types(br_destination);
-    bitcast_arguments(inputs, &destination_types[..inputs.len()], builder);
-
-    builder.ins().brnz(val, br_destination, inputs);
+    canonicalise_then_brnz(builder, val, br_destination, inputs);
 
     let next_block = builder.create_block();
-    builder.ins().jump(next_block, &[]);
+    canonicalise_then_jump(builder, next_block, &[]);
     builder.seal_block(next_block); // The only predecessor is the current block.
     builder.switch_to_block(next_block);
 }
@@ -2462,7 +2526,8 @@
         | Operator::I32x4MaxU
         | Operator::F32x4ConvertI32x4S
         | Operator::F32x4ConvertI32x4U
-        | Operator::I32x4Bitmask => I32X4,
+        | Operator::I32x4Bitmask
+        | Operator::V128Load32Zero { .. } => I32X4,
 
         Operator::I64x2Splat
         | Operator::V128Load64Splat { .. }
@@ -2474,7 +2539,8 @@
         | Operator::I64x2ShrU
         | Operator::I64x2Add
         | Operator::I64x2Sub
-        | Operator::I64x2Mul => I64X2,
+        | Operator::I64x2Mul
+        | Operator::V128Load64Zero { .. } => I64X2,
 
         Operator::F32x4Splat
         | Operator::F32x4ExtractLane { .. }
@@ -2494,8 +2560,14 @@
         | Operator::F32x4Div
         | Operator::F32x4Min
         | Operator::F32x4Max
+        | Operator::F32x4PMin
+        | Operator::F32x4PMax
         | Operator::I32x4TruncSatF32x4S
-        | Operator::I32x4TruncSatF32x4U => F32X4,
+        | Operator::I32x4TruncSatF32x4U
+        | Operator::F32x4Ceil
+        | Operator::F32x4Floor
+        | Operator::F32x4Trunc
+        | Operator::F32x4Nearest => F32X4,
 
         Operator::F64x2Splat
         | Operator::F64x2ExtractLane { .. }
@@ -2514,7 +2586,13 @@
         | Operator::F64x2Mul
         | Operator::F64x2Div
         | Operator::F64x2Min
-        | Operator::F64x2Max => F64X2,
+        | Operator::F64x2Max
+        | Operator::F64x2PMin
+        | Operator::F64x2PMax
+        | Operator::F64x2Ceil
+        | Operator::F64x2Floor
+        | Operator::F64x2Trunc
+        | Operator::F64x2Nearest => F64X2,
 
         _ => unimplemented!(
             "Currently only SIMD instructions are mapped to their return type; the \
@@ -2526,7 +2604,7 @@
 
 /// Some SIMD operations only operate on I8X16 in CLIF; this will convert them to that type by
 /// adding a raw_bitcast if necessary.
-pub fn optionally_bitcast_vector(
+fn optionally_bitcast_vector(
     value: Value,
     needed_type: Type,
     builder: &mut FunctionBuilder,
@@ -2538,6 +2616,80 @@
     }
 }
 
+#[inline(always)]
+fn is_non_canonical_v128(ty: ir::Type) -> bool {
+    match ty {
+        B8X16 | B16X8 | B32X4 | B64X2 | I64X2 | I32X4 | I16X8 | F32X4 | F64X2 => true,
+        _ => false,
+    }
+}
+
+/// Cast to I8X16, any vector values in `values` that are of "non-canonical" type (meaning, not
+/// I8X16), and return them in a slice.  A pre-scan is made to determine whether any casts are
+/// actually necessary, and if not, the original slice is returned.  Otherwise the cast values
+/// are returned in a slice that belongs to the caller-supplied `SmallVec`.
+fn canonicalise_v128_values<'a>(
+    tmp_canonicalised: &'a mut SmallVec<[ir::Value; 16]>,
+    builder: &mut FunctionBuilder,
+    values: &'a [ir::Value],
+) -> &'a [ir::Value] {
+    debug_assert!(tmp_canonicalised.is_empty());
+    // First figure out if any of the parameters need to be cast.  Mostly they don't need to be.
+    let any_non_canonical = values
+        .iter()
+        .any(|v| is_non_canonical_v128(builder.func.dfg.value_type(*v)));
+    // Hopefully we take this exit most of the time, hence doing no heap allocation.
+    if !any_non_canonical {
+        return values;
+    }
+    // Otherwise we'll have to cast, and push the resulting `Value`s into `canonicalised`.
+    for v in values {
+        tmp_canonicalised.push(if is_non_canonical_v128(builder.func.dfg.value_type(*v)) {
+            builder.ins().raw_bitcast(I8X16, *v)
+        } else {
+            *v
+        });
+    }
+    tmp_canonicalised.as_slice()
+}
+
+/// Generate a `jump` instruction, but first cast all 128-bit vector values to I8X16 if they
+/// don't have that type.  This is done in somewhat roundabout way so as to ensure that we
+/// almost never have to do any heap allocation.
+fn canonicalise_then_jump(
+    builder: &mut FunctionBuilder,
+    destination: ir::Block,
+    params: &[ir::Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().jump(destination, canonicalised)
+}
+
+/// The same but for a `brz` instruction.
+fn canonicalise_then_brz(
+    builder: &mut FunctionBuilder,
+    cond: ir::Value,
+    destination: ir::Block,
+    params: &[Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().brz(cond, destination, canonicalised)
+}
+
+/// The same but for a `brnz` instruction.
+fn canonicalise_then_brnz(
+    builder: &mut FunctionBuilder,
+    cond: ir::Value,
+    destination: ir::Block,
+    params: &[Value],
+) -> ir::Inst {
+    let mut tmp_canonicalised = SmallVec::<[ir::Value; 16]>::new();
+    let canonicalised = canonicalise_v128_values(&mut tmp_canonicalised, builder, params);
+    builder.ins().brnz(cond, destination, canonicalised)
+}
+
 /// A helper for popping and bitcasting a single value; since SIMD values can lose their type by
 /// using v128 (i.e. CLIF's I8x16) we must re-type the values using a bitcast to avoid CLIF
 /// typing issues.
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/environ/dummy.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/environ/dummy.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/environ/dummy.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/environ/dummy.rs	2021-01-18 19:58:25.000000000 +0000
@@ -12,7 +12,7 @@
 use crate::func_translator::FuncTranslator;
 use crate::translation_utils::{
     DataIndex, DefinedFuncIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex,
-    SignatureIndex, Table, TableIndex,
+    Table, TableIndex, TypeIndex,
 };
 use core::convert::TryFrom;
 use cranelift_codegen::cursor::FuncCursor;
@@ -58,7 +58,7 @@
     config: TargetFrontendConfig,
 
     /// Signatures as provided by `declare_signature`.
-    pub signatures: PrimaryMap<SignatureIndex, ir::Signature>,
+    pub signatures: PrimaryMap<TypeIndex, ir::Signature>,
 
     /// Module and field names of imported functions as provided by `declare_func_import`.
     pub imported_funcs: Vec<(String, String)>,
@@ -73,7 +73,7 @@
     pub imported_memories: Vec<(String, String)>,
 
     /// Functions, imported and local.
-    pub functions: PrimaryMap<FuncIndex, Exportable<SignatureIndex>>,
+    pub functions: PrimaryMap<FuncIndex, Exportable<TypeIndex>>,
 
     /// Function bodies.
     pub function_bodies: PrimaryMap<DefinedFuncIndex, ir::Function>,
@@ -157,7 +157,7 @@
         DummyFuncEnvironment::new(&self.info, self.return_mode)
     }
 
-    fn get_func_type(&self, func_index: FuncIndex) -> SignatureIndex {
+    fn get_func_type(&self, func_index: FuncIndex) -> TypeIndex {
         self.info.functions[func_index].entity
     }
 
@@ -190,7 +190,7 @@
 
     // Create a signature for `sigidx` amended with a `vmctx` argument after the standard wasm
     // arguments.
-    fn vmctx_sig(&self, sigidx: SignatureIndex) -> ir::Signature {
+    fn vmctx_sig(&self, sigidx: TypeIndex) -> ir::Signature {
         let mut sig = self.mod_info.signatures[sigidx].clone();
         sig.params.push(ir::AbiParam::special(
             self.pointer_type(),
@@ -283,7 +283,7 @@
     fn make_indirect_sig(
         &mut self,
         func: &mut ir::Function,
-        index: SignatureIndex,
+        index: TypeIndex,
     ) -> WasmResult<ir::SigRef> {
         // A real implementation would probably change the calling convention and add `vmctx` and
         // signature index arguments.
@@ -312,7 +312,7 @@
         mut pos: FuncCursor,
         _table_index: TableIndex,
         _table: ir::Table,
-        _sig_index: SignatureIndex,
+        _sig_index: TypeIndex,
         sig_ref: ir::SigRef,
         callee: ir::Value,
         call_args: &[ir::Value],
@@ -393,8 +393,10 @@
     fn translate_memory_copy(
         &mut self,
         _pos: FuncCursor,
-        _index: MemoryIndex,
-        _heap: ir::Heap,
+        _src_index: MemoryIndex,
+        _src_heap: ir::Heap,
+        _dst_index: MemoryIndex,
+        _dst_heap: ir::Heap,
         _dst: ir::Value,
         _src: ir::Value,
         _len: ir::Value,
@@ -570,14 +572,14 @@
 }
 
 impl<'data> ModuleEnvironment<'data> for DummyEnvironment {
-    fn declare_signature(&mut self, _wasm: WasmFuncType, sig: ir::Signature) -> WasmResult<()> {
+    fn declare_type_func(&mut self, _wasm: WasmFuncType, sig: ir::Signature) -> WasmResult<()> {
         self.info.signatures.push(sig);
         Ok(())
     }
 
     fn declare_func_import(
         &mut self,
-        sig_index: SignatureIndex,
+        index: TypeIndex,
         module: &'data str,
         field: &'data str,
     ) -> WasmResult<()> {
@@ -586,15 +588,15 @@
             self.info.imported_funcs.len(),
             "Imported functions must be declared first"
         );
-        self.info.functions.push(Exportable::new(sig_index));
+        self.info.functions.push(Exportable::new(index));
         self.info
             .imported_funcs
             .push((String::from(module), String::from(field)));
         Ok(())
     }
 
-    fn declare_func_type(&mut self, sig_index: SignatureIndex) -> WasmResult<()> {
-        self.info.functions.push(Exportable::new(sig_index));
+    fn declare_func_type(&mut self, index: TypeIndex) -> WasmResult<()> {
+        self.info.functions.push(Exportable::new(index));
         Ok(())
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/environ/spec.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/environ/spec.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/environ/spec.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/environ/spec.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,8 +8,8 @@
 
 use crate::state::FuncTranslationState;
 use crate::translation_utils::{
-    DataIndex, ElemIndex, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, SignatureIndex,
-    Table, TableIndex,
+    DataIndex, ElemIndex, EntityType, FuncIndex, Global, GlobalIndex, Memory, MemoryIndex, Table,
+    TableIndex, TypeIndex,
 };
 use core::convert::From;
 use core::convert::TryFrom;
@@ -293,7 +293,7 @@
     fn make_indirect_sig(
         &mut self,
         func: &mut ir::Function,
-        index: SignatureIndex,
+        index: TypeIndex,
     ) -> WasmResult<ir::SigRef>;
 
     /// Set up an external function definition in the preamble of `func` that can be used to
@@ -328,7 +328,7 @@
         pos: FuncCursor,
         table_index: TableIndex,
         table: ir::Table,
-        sig_index: SignatureIndex,
+        sig_index: TypeIndex,
         sig_ref: ir::SigRef,
         callee: ir::Value,
         call_args: &[ir::Value],
@@ -387,8 +387,10 @@
     fn translate_memory_copy(
         &mut self,
         pos: FuncCursor,
-        index: MemoryIndex,
-        heap: ir::Heap,
+        src_index: MemoryIndex,
+        src_heap: ir::Heap,
+        dst_index: MemoryIndex,
+        dst_heap: ir::Heap,
         dst: ir::Value,
         src: ir::Value,
         len: ir::Value,
@@ -628,19 +630,35 @@
 /// [`translate_module`](fn.translate_module.html) function. These methods should not be called
 /// by the user, they are only for `cranelift-wasm` internal use.
 pub trait ModuleEnvironment<'data>: TargetEnvironment {
-    /// Provides the number of signatures up front. By default this does nothing, but
+    /// Provides the number of types up front. By default this does nothing, but
     /// implementations can use this to preallocate memory if desired.
-    fn reserve_signatures(&mut self, _num: u32) -> WasmResult<()> {
+    fn reserve_types(&mut self, _num: u32) -> WasmResult<()> {
         Ok(())
     }
 
     /// Declares a function signature to the environment.
-    fn declare_signature(
+    fn declare_type_func(
         &mut self,
         wasm_func_type: WasmFuncType,
         sig: ir::Signature,
     ) -> WasmResult<()>;
 
+    /// Declares a module type signature to the environment.
+    fn declare_type_module(
+        &mut self,
+        imports: &[(&'data str, Option<&'data str>, EntityType)],
+        exports: &[(&'data str, EntityType)],
+    ) -> WasmResult<()> {
+        drop((imports, exports));
+        Err(WasmError::Unsupported("module linking".to_string()))
+    }
+
+    /// Declares an instance type signature to the environment.
+    fn declare_type_instance(&mut self, exports: &[(&'data str, EntityType)]) -> WasmResult<()> {
+        drop(exports);
+        Err(WasmError::Unsupported("module linking".to_string()))
+    }
+
     /// Provides the number of imports up front. By default this does nothing, but
     /// implementations can use this to preallocate memory if desired.
     fn reserve_imports(&mut self, _num: u32) -> WasmResult<()> {
@@ -650,7 +668,7 @@
     /// Declares a function import to the environment.
     fn declare_func_import(
         &mut self,
-        sig_index: SignatureIndex,
+        index: TypeIndex,
         module: &'data str,
         field: &'data str,
     ) -> WasmResult<()>;
@@ -679,6 +697,28 @@
         field: &'data str,
     ) -> WasmResult<()>;
 
+    /// Declares a module import to the environment.
+    fn declare_module_import(
+        &mut self,
+        ty_index: TypeIndex,
+        module: &'data str,
+        field: &'data str,
+    ) -> WasmResult<()> {
+        drop((ty_index, module, field));
+        Err(WasmError::Unsupported("module linking".to_string()))
+    }
+
+    /// Declares an instance import to the environment.
+    fn declare_instance_import(
+        &mut self,
+        ty_index: TypeIndex,
+        module: &'data str,
+        field: &'data str,
+    ) -> WasmResult<()> {
+        drop((ty_index, module, field));
+        Err(WasmError::Unsupported("module linking".to_string()))
+    }
+
     /// Notifies the implementation that all imports have been declared.
     fn finish_imports(&mut self) -> WasmResult<()> {
         Ok(())
@@ -691,7 +731,7 @@
     }
 
     /// Declares the type (signature) of a local function in the module.
-    fn declare_func_type(&mut self, sig_index: SignatureIndex) -> WasmResult<()>;
+    fn declare_func_type(&mut self, index: TypeIndex) -> WasmResult<()>;
 
     /// Provides the number of defined tables up front. By default this does nothing, but
     /// implementations can use this to preallocate memory if desired.
@@ -845,4 +885,31 @@
     fn wasm_features(&self) -> WasmFeatures {
         WasmFeatures::default()
     }
+
+    /// Indicates that this module will have `amount` submodules.
+    ///
+    /// Note that this is just child modules of this module, and each child
+    /// module may have yet more submodules.
+    fn reserve_modules(&mut self, amount: u32) {
+        drop(amount);
+    }
+
+    /// Called at the beginning of translating a module.
+    ///
+    /// The `index` argument is a monotonically increasing index which
+    /// corresponds to the nth module that's being translated. This is not the
+    /// 32-bit index in the current module's index space. For example the first
+    /// call to `module_start` will have index 0.
+    ///
+    /// Note that for nested modules this may be called multiple times.
+    fn module_start(&mut self, index: usize) {
+        drop(index);
+    }
+
+    /// Called at the end of translating a module.
+    ///
+    /// Note that for nested modules this may be called multiple times.
+    fn module_end(&mut self, index: usize) {
+        drop(index);
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/lib.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -20,9 +20,8 @@
         clippy::float_arithmetic,
         clippy::mut_mut,
         clippy::nonminimal_bool,
-        clippy::option_map_unwrap_or,
-        clippy::option_map_unwrap_or_else,
-        clippy::print_stdout,
+        clippy::map_unwrap_or,
+        clippy::clippy::print_stdout,
         clippy::unicode_not_nfc,
         clippy::use_self
     )
@@ -65,11 +64,7 @@
 pub use crate::module_translator::translate_module;
 pub use crate::state::func_state::FuncTranslationState;
 pub use crate::state::module_state::ModuleTranslationState;
-pub use crate::translation_utils::{
-    get_vmctx_value_label, DataIndex, DefinedFuncIndex, DefinedGlobalIndex, DefinedMemoryIndex,
-    DefinedTableIndex, ElemIndex, FuncIndex, Global, GlobalIndex, GlobalInit, Memory, MemoryIndex,
-    SignatureIndex, Table, TableElementType, TableIndex,
-};
+pub use crate::translation_utils::*;
 pub use cranelift_frontend::FunctionBuilder;
 
 // Convenience reexport of the wasmparser crate that we're linking against,
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/module_translator.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/module_translator.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/module_translator.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/module_translator.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,6 +8,7 @@
 };
 use crate::state::ModuleTranslationState;
 use cranelift_codegen::timing;
+use std::prelude::v1::*;
 use wasmparser::{NameSectionReader, Parser, Payload, Validator};
 
 /// Translate a sequence of bytes forming a valid Wasm binary into a list of valid Cranelift IR
@@ -20,14 +21,23 @@
     let mut module_translation_state = ModuleTranslationState::new();
     let mut validator = Validator::new();
     validator.wasm_features(environ.wasm_features());
+    let mut stack = Vec::new();
+    let mut modules = 1;
+    let mut cur_module = 0;
 
     for payload in Parser::new(0).parse_all(data) {
         match payload? {
             Payload::Version { num, range } => {
                 validator.version(num, &range)?;
+                environ.module_start(cur_module);
             }
             Payload::End => {
                 validator.end()?;
+                environ.module_end(cur_module);
+                if let Some((other, other_index)) = stack.pop() {
+                    validator = other;
+                    cur_module = other_index;
+                }
             }
 
             Payload::TypeSection(types) => {
@@ -97,7 +107,7 @@
 
             Payload::ModuleSection(s) => {
                 validator.module_section(&s)?;
-                unimplemented!("module linking not implemented yet")
+                environ.reserve_modules(s.get_count());
             }
             Payload::InstanceSection(s) => {
                 validator.instance_section(&s)?;
@@ -113,11 +123,14 @@
                 size: _,
             } => {
                 validator.module_code_section_start(count, &range)?;
-                unimplemented!("module linking not implemented yet")
             }
 
             Payload::ModuleCodeSectionEntry { .. } => {
-                unimplemented!("module linking not implemented yet")
+                let subvalidator = validator.module_code_section_entry();
+                stack.push((validator, cur_module));
+                validator = subvalidator;
+                cur_module = modules;
+                modules += 1;
             }
 
             Payload::CustomSection {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/sections_translator.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/sections_translator.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/sections_translator.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/sections_translator.rs	2021-01-18 19:58:25.000000000 +0000
@@ -10,8 +10,8 @@
 use crate::environ::{ModuleEnvironment, WasmError, WasmResult};
 use crate::state::ModuleTranslationState;
 use crate::translation_utils::{
-    tabletype_to_type, type_to_type, DataIndex, ElemIndex, FuncIndex, Global, GlobalIndex,
-    GlobalInit, Memory, MemoryIndex, SignatureIndex, Table, TableElementType, TableIndex,
+    tabletype_to_type, type_to_type, DataIndex, ElemIndex, EntityType, FuncIndex, Global,
+    GlobalIndex, GlobalInit, Memory, MemoryIndex, Table, TableElementType, TableIndex, TypeIndex,
 };
 use crate::wasm_unsupported;
 use core::convert::TryFrom;
@@ -27,39 +27,113 @@
     ElementSectionReader, Export, ExportSectionReader, ExternalKind, FunctionSectionReader,
     GlobalSectionReader, GlobalType, ImportSectionEntryType, ImportSectionReader,
     MemorySectionReader, MemoryType, NameSectionReader, Naming, Operator, TableSectionReader,
-    TypeDef, TypeSectionReader,
+    TableType, TypeDef, TypeSectionReader,
 };
 
+fn entity_type(
+    ty: ImportSectionEntryType,
+    environ: &mut dyn ModuleEnvironment<'_>,
+) -> WasmResult<EntityType> {
+    Ok(match ty {
+        ImportSectionEntryType::Function(sig) => EntityType::Function(TypeIndex::from_u32(sig)),
+        ImportSectionEntryType::Module(sig) => EntityType::Module(TypeIndex::from_u32(sig)),
+        ImportSectionEntryType::Instance(sig) => EntityType::Instance(TypeIndex::from_u32(sig)),
+        ImportSectionEntryType::Memory(ty) => EntityType::Memory(memory(ty)),
+        ImportSectionEntryType::Global(ty) => {
+            EntityType::Global(global(ty, environ, GlobalInit::Import)?)
+        }
+        ImportSectionEntryType::Table(ty) => EntityType::Table(table(ty, environ)?),
+    })
+}
+
+fn memory(ty: MemoryType) -> Memory {
+    match ty {
+        MemoryType::M32 { limits, shared } => Memory {
+            minimum: limits.initial,
+            maximum: limits.maximum,
+            shared: shared,
+        },
+        // FIXME(#2361)
+        MemoryType::M64 { .. } => unimplemented!(),
+    }
+}
+
+fn table(ty: TableType, environ: &mut dyn ModuleEnvironment<'_>) -> WasmResult<Table> {
+    Ok(Table {
+        wasm_ty: ty.element_type.try_into()?,
+        ty: match tabletype_to_type(ty.element_type, environ)? {
+            Some(t) => TableElementType::Val(t),
+            None => TableElementType::Func,
+        },
+        minimum: ty.limits.initial,
+        maximum: ty.limits.maximum,
+    })
+}
+
+fn global(
+    ty: GlobalType,
+    environ: &mut dyn ModuleEnvironment<'_>,
+    initializer: GlobalInit,
+) -> WasmResult<Global> {
+    Ok(Global {
+        wasm_ty: ty.content_type.try_into()?,
+        ty: type_to_type(ty.content_type, environ).unwrap(),
+        mutability: ty.mutable,
+        initializer,
+    })
+}
+
 /// Parses the Type section of the wasm module.
-pub fn parse_type_section(
-    types: TypeSectionReader,
+pub fn parse_type_section<'a>(
+    types: TypeSectionReader<'a>,
     module_translation_state: &mut ModuleTranslationState,
-    environ: &mut dyn ModuleEnvironment,
+    environ: &mut dyn ModuleEnvironment<'a>,
 ) -> WasmResult<()> {
     let count = types.get_count();
     module_translation_state.wasm_types.reserve(count as usize);
-    environ.reserve_signatures(count)?;
+    environ.reserve_types(count)?;
 
     for entry in types {
-        if let Ok(TypeDef::Func(wasm_func_ty)) = entry {
-            let mut sig =
-                Signature::new(ModuleEnvironment::target_config(environ).default_call_conv);
-            sig.params.extend(wasm_func_ty.params.iter().map(|ty| {
-                let cret_arg: ir::Type = type_to_type(*ty, environ)
-                    .expect("only numeric types are supported in function signatures");
-                AbiParam::new(cret_arg)
-            }));
-            sig.returns.extend(wasm_func_ty.returns.iter().map(|ty| {
-                let cret_arg: ir::Type = type_to_type(*ty, environ)
-                    .expect("only numeric types are supported in function signatures");
-                AbiParam::new(cret_arg)
-            }));
-            environ.declare_signature(wasm_func_ty.clone().try_into()?, sig)?;
-            module_translation_state
-                .wasm_types
-                .push((wasm_func_ty.params, wasm_func_ty.returns));
-        } else {
-            unimplemented!("module linking not implemented yet")
+        match entry? {
+            TypeDef::Func(wasm_func_ty) => {
+                let mut sig =
+                    Signature::new(ModuleEnvironment::target_config(environ).default_call_conv);
+                sig.params.extend(wasm_func_ty.params.iter().map(|ty| {
+                    let cret_arg: ir::Type = type_to_type(*ty, environ)
+                        .expect("only numeric types are supported in function signatures");
+                    AbiParam::new(cret_arg)
+                }));
+                sig.returns.extend(wasm_func_ty.returns.iter().map(|ty| {
+                    let cret_arg: ir::Type = type_to_type(*ty, environ)
+                        .expect("only numeric types are supported in function signatures");
+                    AbiParam::new(cret_arg)
+                }));
+                environ.declare_type_func(wasm_func_ty.clone().try_into()?, sig)?;
+                module_translation_state
+                    .wasm_types
+                    .push((wasm_func_ty.params, wasm_func_ty.returns));
+            }
+            TypeDef::Module(t) => {
+                let imports = t
+                    .imports
+                    .iter()
+                    .map(|i| Ok((i.module, i.field, entity_type(i.ty, environ)?)))
+                    .collect::<WasmResult<Vec<_>>>()?;
+                let exports = t
+                    .exports
+                    .iter()
+                    .map(|e| Ok((e.name, entity_type(e.ty, environ)?)))
+                    .collect::<WasmResult<Vec<_>>>()?;
+                environ.declare_type_module(&imports, &exports)?;
+            }
+            TypeDef::Instance(t) => {
+                let exports = t
+                    .exports
+                    .iter()
+                    .map(|e| Ok((e.name, entity_type(e.ty, environ)?)))
+                    .collect::<WasmResult<Vec<_>>>()?;
+                environ.declare_type_instance(&exports)?;
+            }
         }
     }
     Ok(())
@@ -76,61 +150,24 @@
         let import = entry?;
         let module_name = import.module;
         let field_name = import.field.unwrap(); // TODO Handle error when module linking is implemented.
-
-        match import.ty {
-            ImportSectionEntryType::Function(sig) => {
-                environ.declare_func_import(
-                    SignatureIndex::from_u32(sig),
-                    module_name,
-                    field_name,
-                )?;
-            }
-            ImportSectionEntryType::Module(_sig) | ImportSectionEntryType::Instance(_sig) => {
-                unimplemented!("module linking not implemented yet")
-            }
-            ImportSectionEntryType::Memory(MemoryType::M32 {
-                limits: ref memlimits,
-                shared,
-            }) => {
-                environ.declare_memory_import(
-                    Memory {
-                        minimum: memlimits.initial,
-                        maximum: memlimits.maximum,
-                        shared,
-                    },
-                    module_name,
-                    field_name,
-                )?;
-            }
-            ImportSectionEntryType::Memory(MemoryType::M64 { .. }) => {
-                unimplemented!();
-            }
-            ImportSectionEntryType::Global(ref ty) => {
-                environ.declare_global_import(
-                    Global {
-                        wasm_ty: ty.content_type.try_into()?,
-                        ty: type_to_type(ty.content_type, environ).unwrap(),
-                        mutability: ty.mutable,
-                        initializer: GlobalInit::Import,
-                    },
-                    module_name,
-                    field_name,
-                )?;
-            }
-            ImportSectionEntryType::Table(ref tab) => {
-                environ.declare_table_import(
-                    Table {
-                        wasm_ty: tab.element_type.try_into()?,
-                        ty: match tabletype_to_type(tab.element_type, environ)? {
-                            Some(t) => TableElementType::Val(t),
-                            None => TableElementType::Func,
-                        },
-                        minimum: tab.limits.initial,
-                        maximum: tab.limits.maximum,
-                    },
-                    module_name,
-                    field_name,
-                )?;
+        match entity_type(import.ty, environ)? {
+            EntityType::Function(idx) => {
+                environ.declare_func_import(idx, module_name, field_name)?;
+            }
+            EntityType::Module(idx) => {
+                environ.declare_module_import(idx, module_name, field_name)?;
+            }
+            EntityType::Instance(idx) => {
+                environ.declare_instance_import(idx, module_name, field_name)?;
+            }
+            EntityType::Memory(ty) => {
+                environ.declare_memory_import(ty, module_name, field_name)?;
+            }
+            EntityType::Global(ty) => {
+                environ.declare_global_import(ty, module_name, field_name)?;
+            }
+            EntityType::Table(ty) => {
+                environ.declare_table_import(ty, module_name, field_name)?;
             }
         }
     }
@@ -154,7 +191,7 @@
 
     for entry in functions {
         let sigindex = entry?;
-        environ.declare_func_type(SignatureIndex::from_u32(sigindex))?;
+        environ.declare_func_type(TypeIndex::from_u32(sigindex))?;
     }
 
     Ok(())
@@ -168,16 +205,8 @@
     environ.reserve_tables(tables.get_count())?;
 
     for entry in tables {
-        let table = entry?;
-        environ.declare_table(Table {
-            wasm_ty: table.element_type.try_into()?,
-            ty: match tabletype_to_type(table.element_type, environ)? {
-                Some(t) => TableElementType::Val(t),
-                None => TableElementType::Func,
-            },
-            minimum: table.limits.initial,
-            maximum: table.limits.maximum,
-        })?;
+        let ty = table(entry?, environ)?;
+        environ.declare_table(ty)?;
     }
 
     Ok(())
@@ -191,17 +220,8 @@
     environ.reserve_memories(memories.get_count())?;
 
     for entry in memories {
-        let memory = entry?;
-        match memory {
-            MemoryType::M32 { limits, shared } => {
-                environ.declare_memory(Memory {
-                    minimum: limits.initial,
-                    maximum: limits.maximum,
-                    shared: shared,
-                })?;
-            }
-            MemoryType::M64 { .. } => unimplemented!(),
-        }
+        let memory = memory(entry?);
+        environ.declare_memory(memory)?;
     }
 
     Ok(())
@@ -215,13 +235,7 @@
     environ.reserve_globals(globals.get_count())?;
 
     for entry in globals {
-        let wasmparser::Global {
-            ty: GlobalType {
-                content_type,
-                mutable,
-            },
-            init_expr,
-        } = entry?;
+        let wasmparser::Global { ty, init_expr } = entry?;
         let mut init_expr_reader = init_expr.get_binary_reader();
         let initializer = match init_expr_reader.read_operator()? {
             Operator::I32Const { value } => GlobalInit::I32Const(value),
@@ -245,13 +259,8 @@
                 ));
             }
         };
-        let global = Global {
-            wasm_ty: content_type.try_into()?,
-            ty: type_to_type(content_type, environ).unwrap(),
-            mutability: mutable,
-            initializer,
-        };
-        environ.declare_global(global)?;
+        let ty = global(ty, environ, initializer)?;
+        environ.declare_global(ty)?;
     }
 
     Ok(())
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/state/func_state.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/state/func_state.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/state/func_state.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/state/func_state.rs	2021-01-18 19:58:25.000000000 +0000
@@ -7,7 +7,7 @@
 //! value and control stacks during the translation of a single function.
 
 use crate::environ::{FuncEnvironment, GlobalVariable, WasmResult};
-use crate::translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, SignatureIndex, TableIndex};
+use crate::translation_utils::{FuncIndex, GlobalIndex, MemoryIndex, TableIndex, TypeIndex};
 use crate::{HashMap, Occupied, Vacant};
 use cranelift_codegen::ir::{self, Block, Inst, Value};
 use std::vec::Vec;
@@ -236,7 +236,7 @@
     // Map of indirect call signatures that have been created by
     // `FuncEnvironment::make_indirect_sig()`.
     // Stores both the signature reference and the number of WebAssembly arguments
-    signatures: HashMap<SignatureIndex, (ir::SigRef, usize)>,
+    signatures: HashMap<TypeIndex, (ir::SigRef, usize)>,
 
     // Imported and local functions that have been created by
     // `FuncEnvironment::make_direct_func()`.
@@ -498,7 +498,7 @@
         index: u32,
         environ: &mut FE,
     ) -> WasmResult<(ir::SigRef, usize)> {
-        let index = SignatureIndex::from_u32(index);
+        let index = TypeIndex::from_u32(index);
         match self.signatures.entry(index) {
             Occupied(entry) => Ok(*entry.get()),
             Vacant(entry) => {
diff -Nru firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/translation_utils.rs firefox-85.0+build1/third_party/rust/cranelift-wasm/src/translation_utils.rs
--- firefox-84.0.2+build1/third_party/rust/cranelift-wasm/src/translation_utils.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cranelift-wasm/src/translation_utils.rs	2021-01-18 19:58:25.000000000 +0000
@@ -73,6 +73,65 @@
 pub struct ElemIndex(u32);
 entity_impl!(ElemIndex);
 
+/// Index type of a type inside the WebAssembly module.
+#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+pub struct TypeIndex(u32);
+entity_impl!(TypeIndex);
+
+/// Index type of a module inside the WebAssembly module.
+#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+pub struct ModuleIndex(u32);
+entity_impl!(ModuleIndex);
+
+/// Index type of an instance inside the WebAssembly module.
+#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+pub struct InstanceIndex(u32);
+entity_impl!(InstanceIndex);
+
+/// An index of an entity.
+#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
+#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+pub enum EntityIndex {
+    /// Function index.
+    Function(FuncIndex),
+    /// Table index.
+    Table(TableIndex),
+    /// Memory index.
+    Memory(MemoryIndex),
+    /// Global index.
+    Global(GlobalIndex),
+    /// Module index.
+    Module(ModuleIndex),
+    /// Instance index.
+    Instance(InstanceIndex),
+}
+
+/// A type of an item in a wasm module where an item is typically something that
+/// can be exported.
+#[allow(missing_docs)]
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
+pub enum EntityType {
+    /// A global variable with the specified content type
+    Global(Global),
+    /// A linear memory with the specified limits
+    Memory(Memory),
+    /// A table with the specified element type and limits
+    Table(Table),
+    /// A function type where the index points to the type section and records a
+    /// function signature.
+    Function(TypeIndex),
+    /// An instance where the index points to the type section and records a
+    /// instance's exports.
+    Instance(TypeIndex),
+    /// A module where the index points to the type section and records a
+    /// module's imports and exports.
+    Module(TypeIndex),
+}
+
 /// A WebAssembly global.
 ///
 /// Note that we record both the original Wasm type and the Cranelift IR type
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cstr/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cstr/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6906aff00530782954ae2e4ef4a64cf7fc0b6ddbe4557464815921bd4b966d17","LICENSE":"2c6fc9268c3b765da5bf34fe4909425437f61be05674c2516c7f8cf1251c20aa","src/lib.rs":"01e21fd1789ccbaab8d4d46cfcfc4b1997ffae3598cb83db0852f613b93f17b1"},"package":"b6557bdb1dc9647eae1cf7f5601b14cd45fc3c7ccf2df618387416fe542da6ea"}
\ No newline at end of file
+{"files":{"Cargo.toml":"a9eadcc48a51c9399980e7d0860b668a1277940899a5da781fcbfbc0a9db2660","LICENSE":"5a9bf0e7661617253ca7c12313f51a96aa62dec0bcd15a59c533c88b8093d124","README.md":"555193ce26ab91766d36d9d824ebae66cf18259e8dc37633d98cfa0cec7ce869","src/lib.rs":"2e8f10e1a260a1121cd87190dc67d5ff204258dd1740d64d891524d52424af05","src/parse.rs":"8eb3a7975a2ca73ca16fd3552d3874d04fea0c59a0c45f88194df486b5b2443f","tests/clippy_lints.rs":"4398124cd5bc3a7f295f6203d543fc7d99abfd945eb7418ccfa60535586d7e37","tests/compile_fail/empty.rs":"52dc3c0d4d6ee0bd6d89a34d1caf38d159830401f24ba30f5655f9de92697903","tests/compile_fail/empty.stderr":"c839ce87d482a1e65a668e5267067dd1bd310f60256a795fa8f080888a5c249b","tests/compile_fail/interior-nul.rs":"ecc09440020287377ca18e4b8308d1d516620a87612a5381bafc01fe48734d34","tests/compile_fail/interior-nul.stderr":"8bd003a7dfff248411403bdf666f8a0631307f468d589cf01e475b062db4b101","tests/compile_fail/non-str.rs":"e08be18a524a4482fb7f34cbc6e8448a878b41cf2c26dea99268aaabab6c3f3f","tests/compile_fail/non-str.stderr":"8dff245264d9c69dc151f742542a72400d7422f2a0f2b133a9f4d4fc96a4016a","tests/compile_fail/trash-after.rs":"7dff7a301c9087984c5acda183e34492f3d0f2ebec14b8dc0d2b11aab972a111","tests/compile_fail/trash-after.stderr":"487b5d6b687c52b80f9d9cba691a8654067a88f7d03d2d952d7e97d610ab70f3","tests/compile_test.rs":"13e3e0d22ec0dffa4d0be0c4db6381a03feff50cc25aa65c4950cc7e865d122d","tests/pass/byte_str_lit.rs":"9085e1f1e67dae193d33ff59c253cac23c9e23e9d8c7f92f0aba99097ade132e","tests/pass/const.rs":"777aeb93c3030349529a41ac62b3577b36badc4bada4ec46e45b5055d3676dbd","tests/pass/ident.rs":"5116ee71578d479d899345e039e5955b5dee442234dc504e1a9bfb9260cf8f15","tests/pass/macro.rs":"9596c936ed4d963fb40459ecd98b60610d3d90e41918f350ff45b6129b1aa0b7","tests/pass/str_lit.rs":"955fb887ebc01538bafe10fa810381eb53aebaafb8b36053e8712c081862fe7a"},"package":"c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/Cargo.toml firefox-85.0+build1/third_party/rust/cstr/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cstr/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,15 +11,25 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "cstr"
-version = "0.1.3"
+version = "0.2.8"
 authors = ["Xidorn Quan <me@upsuper.org>"]
 description = "Macro for building static CStr reference"
+readme = "README.md"
 keywords = ["macro", "cstr"]
 license = "MIT"
 repository = "https://github.com/upsuper/cstr"
-[dependencies.cstr-macros]
-version = "0.1.2"
 
-[dependencies.procedural-masquerade]
-version = "0.1"
+[lib]
+proc-macro = true
+[dependencies.proc-macro2]
+version = "1"
+
+[dependencies.quote]
+version = "1"
+[dev-dependencies.trybuild]
+version = "1.0.30"
+[badges.travis-ci]
+branch = "master"
+repository = "upsuper/cstr"
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/LICENSE firefox-85.0+build1/third_party/rust/cstr/LICENSE
--- firefox-84.0.2+build1/third_party/rust/cstr/LICENSE	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/LICENSE	2021-01-18 19:58:25.000000000 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2018 Xidorn Quan
+Copyright (c) 2018-2020 Xidorn Quan
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/README.md firefox-85.0+build1/third_party/rust/cstr/README.md
--- firefox-84.0.2+build1/third_party/rust/cstr/README.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/README.md	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,30 @@
+# cstr
+
+[![CI](https://github.com/upsuper/cstr/workflows/CI/badge.svg)](https://github.com/upsuper/cstr/actions)
+[![Crates.io](https://img.shields.io/crates/v/cstr.svg)](https://crates.io/crates/cstr)
+[![Docs](https://docs.rs/cstr/badge.svg)](https://docs.rs/cstr)
+
+<!-- cargo-sync-readme start -->
+
+A macro for getting `&'static CStr` from literal or identifier.
+
+This macro checks whether the given literal is valid for `CStr`
+at compile time, and returns a static reference of `CStr`.
+
+This macro can be used to to initialize constants on Rust 1.46 and above.
+
+## Example
+
+```rust
+use cstr::cstr;
+use std::ffi::CStr;
+
+let test = cstr!(b"hello\xff");
+assert_eq!(test, CStr::from_bytes_with_nul(b"hello\xff\0").unwrap());
+let test = cstr!("hello");
+assert_eq!(test, CStr::from_bytes_with_nul(b"hello\0").unwrap());
+let test = cstr!(hello);
+assert_eq!(test, CStr::from_bytes_with_nul(b"hello\0").unwrap());
+```
+
+<!-- cargo-sync-readme end -->
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/src/lib.rs firefox-85.0+build1/third_party/rust/cstr/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,48 +1,65 @@
-//! A macro for getting `&'static CStr` from literal.
+//! A macro for getting `&'static CStr` from literal or identifier.
 //!
 //! This macro checks whether the given literal is valid for `CStr`
 //! at compile time, and returns a static reference of `CStr`.
 //!
-//! Note that it currently cannot be used to initialize constants due
-//! to restriction of Rust.
+//! This macro can be used to to initialize constants on Rust 1.46 and above.
 //!
-//! Also, it currently only supports a UTF-8 string as input because
-//! Rust's tokenizer only accepts that without the `b` prefix. This
-//! may be expanded in the future if necessary.
-//!
-//! # Example
+//! ## Example
 //!
 //! ```
-//! #[macro_use] extern crate cstr;
+//! use cstr::cstr;
 //! use std::ffi::CStr;
 //!
-//! # fn main() {
+//! let test = cstr!(b"hello\xff");
+//! assert_eq!(test, CStr::from_bytes_with_nul(b"hello\xff\0").unwrap());
 //! let test = cstr!("hello");
 //! assert_eq!(test, CStr::from_bytes_with_nul(b"hello\0").unwrap());
-//! # }
+//! let test = cstr!(hello);
+//! assert_eq!(test, CStr::from_bytes_with_nul(b"hello\0").unwrap());
 //! ```
 
-#[allow(unused_imports)]
-#[macro_use]
-extern crate cstr_macros;
-#[macro_use]
-extern crate procedural_masquerade;
-
-#[doc(hidden)]
-pub use cstr_macros::*;
-
-define_invoke_proc_macro!(cstr__invoke_build_bytes);
-
-#[macro_export]
-macro_rules! cstr {
-    ($t: tt) => {
-        {
-            cstr__invoke_build_bytes! {
-                cstr_internal__build_bytes!($t)
-            }
-            unsafe {
-                ::std::ffi::CStr::from_bytes_with_nul_unchecked(BYTES)
-            }
+// While this isn't necessary when using Cargo >= 1.42, omitting it actually requires path-less
+// `--extern proc_macro` to be passed to `rustc` when building this crate. Some tools may not do
+// this correctly. So it's added as a precaution.
+extern crate proc_macro;
+
+use crate::parse::parse_input;
+use proc_macro::TokenStream as RawTokenStream;
+use proc_macro2::{Literal, Span, TokenStream};
+use quote::{quote, quote_spanned};
+use std::ffi::CString;
+
+mod parse;
+
+struct Error(Span, &'static str);
+
+#[proc_macro]
+pub fn cstr(input: RawTokenStream) -> RawTokenStream {
+    let tokens = match build_byte_str(input.into()) {
+        // We can't use `&*ptr` to convert the raw pointer to reference, because as of Rust 1.46,
+        // dereferencing raw pointer in constants is unstable.
+        // This is being tracked in https://github.com/rust-lang/rust/issues/51911
+        // So we explicitly disable the clippy lint for this expression.
+        Ok(s) => quote!(unsafe {
+            #[allow(clippy::transmute_ptr_to_ref)]
+            ::std::mem::transmute::<_, &::std::ffi::CStr>(
+                #s as *const [u8] as *const ::std::ffi::CStr
+            )
+        }),
+        Err(Error(span, msg)) => quote_spanned!(span => compile_error!(#msg)),
+    };
+    tokens.into()
+}
+
+fn build_byte_str(input: TokenStream) -> Result<Literal, Error> {
+    let (bytes, span) = parse_input(input)?;
+    match CString::new(bytes) {
+        Ok(s) => {
+            let mut lit = Literal::byte_string(s.as_bytes_with_nul());
+            lit.set_span(span);
+            Ok(lit)
         }
+        Err(_) => Err(Error(span, "nul byte found in the literal")),
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/src/parse.rs firefox-85.0+build1/third_party/rust/cstr/src/parse.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/src/parse.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/src/parse.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,225 @@
+use crate::Error;
+use proc_macro2::{Delimiter, Ident, Literal, Span, TokenStream, TokenTree};
+use std::char;
+
+macro_rules! unexpected_content {
+    () => {
+        "expected one of: byte string literal, string literal, identifier"
+    };
+}
+
+pub(crate) fn parse_input(mut input: TokenStream) -> Result<(Vec<u8>, Span), Error> {
+    loop {
+        let mut tokens = input.into_iter();
+        let token = match tokens.next() {
+            Some(token) => token,
+            None => {
+                return Err(Error(
+                    Span::call_site(),
+                    concat!("unexpected end of input, ", unexpected_content!()),
+                ))
+            }
+        };
+        let span = token.span();
+        let result = match token {
+            // Unwrap any empty group which may be created from macro expansion.
+            TokenTree::Group(group) if group.delimiter() == Delimiter::None => Err(group),
+            TokenTree::Literal(literal) => match parse_literal(literal) {
+                Ok(result) => Ok(result),
+                Err(msg) => return Err(Error(span, msg)),
+            },
+            TokenTree::Ident(ident) => Ok(parse_ident(ident)),
+            _ => return Err(Error(span, unexpected_content!())),
+        };
+        if let Some(token) = tokens.next() {
+            return Err(Error(token.span(), "unexpected token"));
+        }
+        match result {
+            Ok(result) => return Ok((result, span)),
+            Err(group) => input = group.stream(),
+        }
+    }
+}
+
+fn parse_literal(literal: Literal) -> Result<Vec<u8>, &'static str> {
+    let s = literal.to_string();
+    let s = s.as_bytes();
+    match s[0] {
+        b'"' => Ok(parse_cooked_content(&s)),
+        b'r' => Ok(parse_raw_content(&s[1..])),
+        b'b' => match s[1] {
+            b'"' => Ok(parse_cooked_content(&s[1..])),
+            b'r' => Ok(parse_raw_content(&s[2..])),
+            _ => Err(unexpected_content!()),
+        },
+        _ => Err(unexpected_content!()),
+    }
+}
+
+fn all_pounds(bytes: &[u8]) -> bool {
+    bytes.iter().all(|b| *b == b'#')
+}
+
+/// Parses raw string / bytes content after `r` prefix.
+fn parse_raw_content(s: &[u8]) -> Vec<u8> {
+    let q_start = s.iter().position(|b| *b == b'"').unwrap();
+    let q_end = s.iter().rposition(|b| *b == b'"').unwrap();
+    assert!(all_pounds(&s[0..q_start]));
+    assert!(all_pounds(&s[q_end + 1..q_end + q_start + 1]));
+    Vec::from(&s[q_start + 1..q_end])
+}
+
+/// Parses the cooked string / bytes content within quotes.
+fn parse_cooked_content(mut s: &[u8]) -> Vec<u8> {
+    s = &s[1..s.iter().rposition(|b| *b == b'"').unwrap()];
+    let mut result = Vec::new();
+    while !s.is_empty() {
+        match s[0] {
+            b'\\' => {}
+            b'\r' => {
+                assert_eq!(s[1], b'\n');
+                result.push(b'\n');
+                s = &s[2..];
+                continue;
+            }
+            b => {
+                result.push(b);
+                s = &s[1..];
+                continue;
+            }
+        }
+        let b = s[1];
+        s = &s[2..];
+        match b {
+            b'x' => {
+                let (b, rest) = backslash_x(&s);
+                result.push(b);
+                s = rest;
+            }
+            b'u' => {
+                let (c, rest) = backslash_u(&s);
+                result.extend_from_slice(c.encode_utf8(&mut [0; 4]).as_bytes());
+                s = rest;
+            }
+            b'n' => result.push(b'\n'),
+            b'r' => result.push(b'\r'),
+            b't' => result.push(b'\t'),
+            b'\\' => result.push(b'\\'),
+            b'0' => result.push(b'\0'),
+            b'\'' => result.push(b'\''),
+            b'"' => result.push(b'"'),
+            b'\r' | b'\n' => {
+                let next = s.iter().position(|b| {
+                    let ch = char::from_u32(u32::from(*b)).unwrap();
+                    !ch.is_whitespace()
+                });
+                match next {
+                    Some(pos) => s = &s[pos..],
+                    None => s = b"",
+                }
+            }
+            b => panic!("unexpected byte {:?} after \\", b),
+        }
+    }
+    result
+}
+
+fn backslash_x(s: &[u8]) -> (u8, &[u8]) {
+    let ch = hex_to_u8(s[0]) * 0x10 + hex_to_u8(s[1]);
+    (ch, &s[2..])
+}
+
+fn hex_to_u8(b: u8) -> u8 {
+    match b {
+        b'0'..=b'9' => b - b'0',
+        b'a'..=b'f' => b - b'a' + 10,
+        b'A'..=b'F' => b - b'A' + 10,
+        _ => unreachable!("unexpected non-hex character {:?} after \\x", b),
+    }
+}
+
+fn backslash_u(s: &[u8]) -> (char, &[u8]) {
+    assert_eq!(s[0], b'{');
+    let end = s[1..].iter().position(|b| *b == b'}').unwrap();
+    let mut ch = 0;
+    for b in &s[1..=end] {
+        ch *= 0x10;
+        ch += u32::from(hex_to_u8(*b));
+    }
+    (char::from_u32(ch).unwrap(), &s[end + 2..])
+}
+
+fn parse_ident(ident: Ident) -> Vec<u8> {
+    ident.to_string().into_bytes()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+
+    // Tests below were modified from
+    // https://github.com/dtolnay/syn/blob/cd5fdc0f530f822446fccaf831669cd0cf4a0fc9/tests/test_lit.rs
+
+    fn lit(s: &str) -> Vec<u8> {
+        match TokenStream::from_str(s)
+            .unwrap()
+            .into_iter()
+            .next()
+            .unwrap()
+        {
+            TokenTree::Literal(lit) => parse_literal(lit).unwrap(),
+            _ => panic!(),
+        }
+    }
+
+    #[test]
+    fn strings() {
+        #[track_caller]
+        fn test_string(s: &str, value: &[u8]) {
+            assert_eq!(lit(s), value);
+        }
+
+        test_string("\"a\"", b"a");
+        test_string("\"\\n\"", b"\n");
+        test_string("\"\\r\"", b"\r");
+        test_string("\"\\t\"", b"\t");
+        test_string("\"�\"", b"\xf0\x9f\x90\x95"); // NOTE: This is an emoji
+        test_string("\"\\\"\"", b"\"");
+        test_string("\"'\"", b"'");
+        test_string("\"\"", b"");
+        test_string("\"\\u{1F415}\"", b"\xf0\x9f\x90\x95");
+        test_string(
+            "\"contains\nnewlines\\\nescaped newlines\"",
+            b"contains\nnewlinesescaped newlines",
+        );
+        test_string("r\"raw\nstring\\\nhere\"", b"raw\nstring\\\nhere");
+        test_string("\"...\"q", b"...");
+        test_string("r\"...\"q", b"...");
+        test_string("r##\"...\"##q", b"...");
+    }
+
+    #[test]
+    fn byte_strings() {
+        #[track_caller]
+        fn test_byte_string(s: &str, value: &[u8]) {
+            assert_eq!(lit(s), value);
+        }
+
+        test_byte_string("b\"a\"", b"a");
+        test_byte_string("b\"\\n\"", b"\n");
+        test_byte_string("b\"\\r\"", b"\r");
+        test_byte_string("b\"\\t\"", b"\t");
+        test_byte_string("b\"\\\"\"", b"\"");
+        test_byte_string("b\"'\"", b"'");
+        test_byte_string("b\"\"", b"");
+        test_byte_string(
+            "b\"contains\nnewlines\\\nescaped newlines\"",
+            b"contains\nnewlinesescaped newlines",
+        );
+        test_byte_string("br\"raw\nstring\\\nhere\"", b"raw\nstring\\\nhere");
+        test_byte_string("b\"...\"q", b"...");
+        test_byte_string("br\"...\"q", b"...");
+        test_byte_string("br##\"...\"##q", b"...");
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/clippy_lints.rs firefox-85.0+build1/third_party/rust/cstr/tests/clippy_lints.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/clippy_lints.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/clippy_lints.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,10 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+#[test]
+#[deny(clippy::transmute_ptr_to_ref)]
+fn deny_transmute_ptr_to_ref() {
+    let s: &'static CStr = cstr!("foo\u{4e00}bar");
+    let expected = b"foo\xe4\xb8\x80bar\0";
+    assert_eq!(s, CStr::from_bytes_with_nul(expected).unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/empty.rs firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/empty.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/empty.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/empty.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,5 @@
+use cstr::cstr;
+
+fn main() {
+    let _foo = cstr!();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/empty.stderr firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/empty.stderr
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/empty.stderr	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/empty.stderr	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,7 @@
+error: unexpected end of input, expected one of: byte string literal, string literal, identifier
+ --> $DIR/empty.rs:4:16
+  |
+4 |     let _foo = cstr!();
+  |                ^^^^^^^
+  |
+  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.rs firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,5 @@
+use cstr::cstr;
+
+fn main() {
+    let _foo = cstr!("foo\0bar");
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.stderr firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.stderr
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.stderr	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/interior-nul.stderr	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,5 @@
+error: nul byte found in the literal
+ --> $DIR/interior-nul.rs:4:22
+  |
+4 |     let _foo = cstr!("foo\0bar");
+  |                      ^^^^^^^^^^
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/non-str.rs firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/non-str.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/non-str.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/non-str.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,7 @@
+use cstr::cstr;
+
+fn main() {
+    let _foo = cstr!(1);
+    let _foo = cstr!(("a"));
+    let _foo = cstr!(&1);
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/non-str.stderr firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/non-str.stderr
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/non-str.stderr	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/non-str.stderr	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,17 @@
+error: expected one of: byte string literal, string literal, identifier
+ --> $DIR/non-str.rs:4:22
+  |
+4 |     let _foo = cstr!(1);
+  |                      ^
+
+error: expected one of: byte string literal, string literal, identifier
+ --> $DIR/non-str.rs:5:22
+  |
+5 |     let _foo = cstr!(("a"));
+  |                      ^^^^^
+
+error: expected one of: byte string literal, string literal, identifier
+ --> $DIR/non-str.rs:6:22
+  |
+6 |     let _foo = cstr!(&1);
+  |                      ^
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/trash-after.rs firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/trash-after.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/trash-after.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/trash-after.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,5 @@
+use cstr::cstr;
+
+fn main() {
+    let _foo = cstr!("foo" + "bar");
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/trash-after.stderr firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/trash-after.stderr
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_fail/trash-after.stderr	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_fail/trash-after.stderr	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,5 @@
+error: unexpected token
+ --> $DIR/trash-after.rs:4:28
+  |
+4 |     let _foo = cstr!("foo" + "bar");
+  |                            ^
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_test.rs firefox-85.0+build1/third_party/rust/cstr/tests/compile_test.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/compile_test.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/compile_test.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,6 @@
+#[test]
+fn compile_test() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/pass/*.rs");
+    t.compile_fail("tests/compile_fail/*.rs");
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/byte_str_lit.rs firefox-85.0+build1/third_party/rust/cstr/tests/pass/byte_str_lit.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/byte_str_lit.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/pass/byte_str_lit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,7 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+fn main() {
+    let foo: &'static CStr = cstr!(b"foo\xffbar");
+    assert_eq!(foo, CStr::from_bytes_with_nul(b"foo\xffbar\0").unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/const.rs firefox-85.0+build1/third_party/rust/cstr/tests/pass/const.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/const.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/pass/const.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,10 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+const FOO: &CStr = cstr!(b"foo\xffbar");
+static BAR: &CStr = cstr!("bar");
+
+fn main() {
+    assert_eq!(FOO, CStr::from_bytes_with_nul(b"foo\xffbar\0").unwrap());
+    assert_eq!(BAR, CStr::from_bytes_with_nul(b"bar\0").unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/ident.rs firefox-85.0+build1/third_party/rust/cstr/tests/pass/ident.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/ident.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/pass/ident.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,9 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+fn main() {
+    let foo: &'static CStr = cstr!(foobar);
+    assert_eq!(foo, CStr::from_bytes_with_nul(b"foobar\0").unwrap());
+    let foo: &'static CStr = cstr!(r#foobar);
+    assert_eq!(foo, CStr::from_bytes_with_nul(b"r#foobar\0").unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/macro.rs firefox-85.0+build1/third_party/rust/cstr/tests/pass/macro.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/pass/macro.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,21 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+macro_rules! cstr_expr {
+    ($s:expr) => {
+        cstr!($s)
+    };
+}
+
+macro_rules! cstr_literal {
+    ($s:literal) => {
+        cstr!($s)
+    };
+}
+
+fn main() {
+    let foo: &'static CStr = cstr_expr!("foo");
+    assert_eq!(foo, CStr::from_bytes_with_nul(b"foo\0").unwrap());
+    let bar: &'static CStr = cstr_literal!("bar");
+    assert_eq!(bar, CStr::from_bytes_with_nul(b"bar\0").unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/str_lit.rs firefox-85.0+build1/third_party/rust/cstr/tests/pass/str_lit.rs
--- firefox-84.0.2+build1/third_party/rust/cstr/tests/pass/str_lit.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr/tests/pass/str_lit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,8 @@
+use cstr::cstr;
+use std::ffi::CStr;
+
+fn main() {
+    let foo: &'static CStr = cstr!("foo\u{4e00}bar");
+    let expected = b"foo\xe4\xb8\x80bar\0";
+    assert_eq!(foo, CStr::from_bytes_with_nul(expected).unwrap());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr-macros/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cstr-macros/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cstr-macros/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr-macros/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"5637fc23a942454c72de3d59d855a2bbc72d1ea1e837cbc3bf67044e3c391fc5","LICENSE":"2c6fc9268c3b765da5bf34fe4909425437f61be05674c2516c7f8cf1251c20aa","src/lib.rs":"b1de1d679338b008dd22e4aea5384f89d7a9424d65102b4fa536d8d9eaa56e22"},"package":"cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr-macros/Cargo.toml firefox-85.0+build1/third_party/rust/cstr-macros/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/cstr-macros/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr-macros/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "cstr-macros"
-version = "0.1.6"
-authors = ["Xidorn Quan <me@upsuper.org>"]
-description = "Procedural macros for cstr"
-license = "MIT"
-repository = "https://github.com/upsuper/cstr"
-
-[lib]
-proc-macro = true
-[dependencies.procedural-masquerade]
-version = "0.1"
-
-[dependencies.syn]
-version = "1"
-features = ["derive", "parsing"]
-default-features = false
-[dev-dependencies.quote]
-version = "1"
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr-macros/LICENSE firefox-85.0+build1/third_party/rust/cstr-macros/LICENSE
--- firefox-84.0.2+build1/third_party/rust/cstr-macros/LICENSE	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr-macros/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2018 Xidorn Quan
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/rust/cstr-macros/src/lib.rs firefox-85.0+build1/third_party/rust/cstr-macros/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/cstr-macros/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cstr-macros/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#[macro_use]
-extern crate procedural_masquerade;
-extern crate proc_macro;
-#[cfg(test)]
-#[macro_use]
-extern crate quote;
-extern crate syn;
-
-use std::ascii::escape_default;
-use std::ffi::CString;
-
-define_proc_macros! {
-    #[allow(non_snake_case)]
-    pub fn cstr_internal__build_bytes(input: &str) -> String {
-        let bytes = build_bytes(input);
-        format!("const BYTES: &'static [u8] = {};", bytes)
-    }
-}
-
-fn input_to_string(input: &str) -> String {
-    if let Ok(s) = syn::parse_str::<syn::LitStr>(input) {
-        return s.value();
-    }
-    if let Ok(i) = syn::parse_str::<syn::Ident>(input) {
-        return i.to_string();
-    }
-    panic!("expected a string literal or an identifier, got {}", input)
-}
-
-fn build_bytes(input: &str) -> String {
-    let s = input_to_string(input);
-    let cstr = match CString::new(s.as_bytes()) {
-        Ok(s) => s,
-        _ => panic!("literal must not contain NUL byte")
-    };
-    let mut bytes = Vec::new();
-    bytes.extend(br#"b""#);
-    bytes.extend(cstr.as_bytes().iter().flat_map(|&b| escape_default(b)));
-    bytes.extend(br#"\0""#);
-    String::from_utf8(bytes).unwrap()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::build_bytes;
-
-    macro_rules! build_bytes {
-        ($($t:tt)*) => {
-            build_bytes(&quote!($($t)*).to_string())
-        }
-    }
-    macro_rules! result {
-        ($($t:tt)*) => {
-            quote!($($t)*).to_string()
-        }
-    }
-
-    #[test]
-    fn test_build_bytes() {
-        assert_eq!(build_bytes!("aaa"), result!(b"aaa\0"));
-        assert_eq!(build_bytes!("\t\n\r\"\\'"), result!(b"\t\n\r\"\\\'\0"));
-        assert_eq!(build_bytes!("\x01\x02 \x7f"), result!(b"\x01\x02 \x7f\0"));
-        assert_eq!(build_bytes!("你好"), result!(b"\xe4\xbd\xa0\xe5\xa5\xbd\0"));
-        assert_eq!(build_bytes!(foobar), result!(b"foobar\0"));
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_build_bytes_nul_inside() {
-        build_bytes!("a\x00a");
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/.cargo-checksum.json firefox-85.0+build1/third_party/rust/cubeb-coreaudio/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cubeb-coreaudio/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{".editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba",".githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1",".travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","Cargo.toml":"9f97e1566873abf7f452f954665cf238078db5ab2f4a4254e10a6964574f3378","LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","README.md":"22c786b3e8706d075031b508780896e1fa29a932628c731679b3865ef7e41a19","build-audiounit-rust-in-cubeb.sh":"2b724ade9c0b17e0ef4a87d38ef6eb0e5f613033fc1dbbe5dc0f71251278787f","install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","run_device_tests.sh":"4b7d65eb638c1a278ffc8ecb6d30d47b3b8405392e976cae38c6f744e2bed532","run_sanitizers.sh":"2f0934ba01cbcd74485f19d50147f6b604cf9730bbd3a3d3f3d958e40d0f799f","run_tests.sh":"916a7ae4a406d2274417d6eca939a878db5adcb6144e5680d9d148bf90178f1c","src/backend/aggregate_device.rs":"9607aa0a09cb5d64fa04fd048e5875516e840180e68d4ce8a33166747a621676","src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","src/backend/buffer_manager.rs":"9c10a261792e32e75833b5f976b18547c338ca6beb2330eeab1ad203cc8c32bf","src/backend/device_property.rs":"d43642ea6e5f40e29c2a59ec7d81b42c154134685e417585045785359aa31686","src/backend/mixer.rs":"949c34927ba72b3365bc733a63b2f7950aef707ee08363f97242a4de6b7d4818","src/backend/mod.rs":"5d1504c8dd631ef1a8590a12598ae1bf47bf030abb760b3a8595188d6b2a9aba","src/backend/resampler.rs":"fd1281d28a4db1659d2f75e43b8457651745e1b6eb5a53a77f04d752135f6dc7","src/backend/tests/aggregate_device.rs":"107f5c637844cd5ae43d2b42cec4ef3369bb702751586078c0a9d50f039161cd","src/backend/tests/api.rs":"9ce44a867519d7b7a2b43c7f833327c35be38af7ba6fcc3d277ed1d7d8e7c8c2","src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","src/backend/tests/device_change.rs":"8261f561f69dabd374ac47d69aa484812b65070a9e9581dfb2605e8404eaad6d","src/backend/tests/device_property.rs":"373f76d3bee83b263db3f02be3b94b408bdf852d84e4b5153273fda34b11a374","src/backend/tests/interfaces.rs":"14943e84a79976a7ef52882edeb9330350705d5190db6647f98b4ffa851a8396","src/backend/tests/manual.rs":"87210af9527feece99ad2b7b85651fbc8f02ec306ba8082da0c0705070e882af","src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","src/backend/tests/parallel.rs":"f9e1883660d6146b6e5075806561f5f689810e25c5e7764dfd28c9b939821a49","src/backend/tests/tone.rs":"fadf78543950249cccd64d6d42ca41cd58c68d4a4c2dc656d474da6a44eb550e","src/backend/tests/utils.rs":"1bb99ef71d3c18545bca49767e7b6bfffbe11896246994f41be7ed372772fd48","src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","src/lib.rs":"5e586d45cd6b3722f0a6736d9252593299269817a153eef1930a5fb9bfbb56f5","todo.md":"b1700be0fd28f8f226ddcbff59f844ca57e1d225f21ca1d6aa613d6269da6f2c"},"package":null}
\ No newline at end of file
+{"files":{".editorconfig":"4e53b182bcc78b83d7e1b5c03efa14d22d4955c4ed2514d1ba4e99c1eb1a50ba",".githooks/pre-push":"8b8b26544cd56f54c0c33812551f786bb25cb08c86dbfeb6bf3daad881c826a1",".travis.yml":"dc07bac53f70f16c9bdf52264bdc58500ae6018c1b4c567bc7642f6b4ca3cc35","Cargo.toml":"9f97e1566873abf7f452f954665cf238078db5ab2f4a4254e10a6964574f3378","LICENSE":"6e6f56aff5bbf3cbc60747e152fb1a719bd0716aaf6d711c554f57d92e96297c","README.md":"22c786b3e8706d075031b508780896e1fa29a932628c731679b3865ef7e41a19","build-audiounit-rust-in-cubeb.sh":"2b724ade9c0b17e0ef4a87d38ef6eb0e5f613033fc1dbbe5dc0f71251278787f","install_git_hook.sh":"d38c8e51e636f6b90b489621ac34ccd1d1b1f40dccce3d178ed1da1c5068f16d","install_rustfmt_clippy.sh":"4ae90d8dcb9757cb3ae4ae142ef80e5377c0dde61c63f4a3c32418646e80ca7b","run_device_tests.sh":"4b7d65eb638c1a278ffc8ecb6d30d47b3b8405392e976cae38c6f744e2bed532","run_sanitizers.sh":"2f0934ba01cbcd74485f19d50147f6b604cf9730bbd3a3d3f3d958e40d0f799f","run_tests.sh":"916a7ae4a406d2274417d6eca939a878db5adcb6144e5680d9d148bf90178f1c","src/backend/aggregate_device.rs":"e153a39c4c4884951e3fe70566b891f1bf96fe0d3d7567b33b4027043c54148c","src/backend/auto_release.rs":"050fdcee74cf46b9a8a85a877e166d72a853d33220f59cf734cbb6ea09daa441","src/backend/buffer_manager.rs":"9c10a261792e32e75833b5f976b18547c338ca6beb2330eeab1ad203cc8c32bf","src/backend/device_property.rs":"d43642ea6e5f40e29c2a59ec7d81b42c154134685e417585045785359aa31686","src/backend/mixer.rs":"949c34927ba72b3365bc733a63b2f7950aef707ee08363f97242a4de6b7d4818","src/backend/mod.rs":"515aa69a723c8f073b09dcac4bd30da3df4ae178fcb4f0ed854bc3ce164d7e74","src/backend/resampler.rs":"fd1281d28a4db1659d2f75e43b8457651745e1b6eb5a53a77f04d752135f6dc7","src/backend/tests/aggregate_device.rs":"107f5c637844cd5ae43d2b42cec4ef3369bb702751586078c0a9d50f039161cd","src/backend/tests/api.rs":"9ce44a867519d7b7a2b43c7f833327c35be38af7ba6fcc3d277ed1d7d8e7c8c2","src/backend/tests/backlog.rs":"3b189a7e036543c467cc242af0ed3332721179ee2b1c8847a6db563546f1ac52","src/backend/tests/device_change.rs":"8261f561f69dabd374ac47d69aa484812b65070a9e9581dfb2605e8404eaad6d","src/backend/tests/device_property.rs":"373f76d3bee83b263db3f02be3b94b408bdf852d84e4b5153273fda34b11a374","src/backend/tests/interfaces.rs":"14943e84a79976a7ef52882edeb9330350705d5190db6647f98b4ffa851a8396","src/backend/tests/manual.rs":"87210af9527feece99ad2b7b85651fbc8f02ec306ba8082da0c0705070e882af","src/backend/tests/mod.rs":"8dba770023d7f9c4228f0e11915347f0e07da5fd818e3ee4478c4b197af9aa2a","src/backend/tests/parallel.rs":"f9e1883660d6146b6e5075806561f5f689810e25c5e7764dfd28c9b939821a49","src/backend/tests/tone.rs":"fadf78543950249cccd64d6d42ca41cd58c68d4a4c2dc656d474da6a44eb550e","src/backend/tests/utils.rs":"1bb99ef71d3c18545bca49767e7b6bfffbe11896246994f41be7ed372772fd48","src/backend/utils.rs":"6c3ffbcd602e6cc9f56deb9ecb07b2eef2e6f074ef924178e466f380aae5c595","src/capi.rs":"21b66b70545bf04ec719928004d1d9adb45b24ced51288f5b2993d79aaf78f5f","src/lib.rs":"5e586d45cd6b3722f0a6736d9252593299269817a153eef1930a5fb9bfbb56f5","todo.md":"3a537412b5f27cbaad0b37c35d0f460ef6084030804a2910a3c67d37908a44fc"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/src/backend/aggregate_device.rs firefox-85.0+build1/third_party/rust/cubeb-coreaudio/src/backend/aggregate_device.rs
--- firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/src/backend/aggregate_device.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cubeb-coreaudio/src/backend/aggregate_device.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,7 +1,6 @@
 use super::*;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-const APPLE_EVENT_TIMEOUT: OSStatus = -1712;
 pub const DRIFT_COMPENSATION: u32 = 1;
 
 #[derive(Debug)]
@@ -12,6 +11,41 @@
     output_id: AudioObjectID,
 }
 
+#[derive(Debug)]
+pub enum Error {
+    OS(OSStatus),
+    Timeout(std::time::Duration),
+    LessThan2Devices(usize),
+}
+
+impl From<OSStatus> for Error {
+    fn from(status: OSStatus) -> Self {
+        Error::OS(status)
+    }
+}
+
+impl From<std::time::Duration> for Error {
+    fn from(duration: std::time::Duration) -> Self {
+        Error::Timeout(duration)
+    }
+}
+
+impl From<usize> for Error {
+    fn from(number: usize) -> Self {
+        Error::LessThan2Devices(number)
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::OS(status) => write!(f, "OSStatus({})", status),
+            Error::Timeout(duration) => write!(f, "Timeout({:?})", duration),
+            Error::LessThan2Devices(number) => write!(f, "LessThan2Devices({} only)", number),
+        }
+    }
+}
+
 impl AggregateDevice {
     // Aggregate Device is a virtual audio interface which utilizes inputs and outputs
     // of one or more physical audio interfaces. It is possible to use the clock of
@@ -33,7 +67,7 @@
     pub fn new(
         input_id: AudioObjectID,
         output_id: AudioObjectID,
-    ) -> std::result::Result<Self, OSStatus> {
+    ) -> std::result::Result<Self, Error> {
         let plugin_id = Self::get_system_plugin_id()?;
         let device_id = Self::create_blank_device_sync(plugin_id)?;
 
@@ -68,7 +102,7 @@
     }
 
     // The following APIs are set to `pub` for testing purpose.
-    pub fn get_system_plugin_id() -> std::result::Result<AudioObjectID, OSStatus> {
+    pub fn get_system_plugin_id() -> std::result::Result<AudioObjectID, Error> {
         let address = AudioObjectPropertyAddress {
             mSelector: kAudioHardwarePropertyPlugInForBundleID,
             mScope: kAudioObjectPropertyScopeGlobal,
@@ -79,7 +113,7 @@
         let status =
             audio_object_get_property_data_size(kAudioObjectSystemObject, &address, &mut size);
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
         assert_ne!(size, 0);
 
@@ -106,13 +140,13 @@
             assert_ne!(plugin_id, kAudioObjectUnknown);
             Ok(plugin_id)
         } else {
-            Err(status)
+            Err(Error::from(status))
         }
     }
 
     pub fn create_blank_device_sync(
         plugin_id: AudioObjectID,
-    ) -> std::result::Result<AudioObjectID, OSStatus> {
+    ) -> std::result::Result<AudioObjectID, Error> {
         let waiting_time = Duration::new(5, 0);
 
         let condvar_pair = Arc::new((Mutex::new(Vec::<AudioObjectID>::new()), Condvar::new()));
@@ -124,22 +158,22 @@
             DeviceType::INPUT | DeviceType::OUTPUT,
         );
 
-        let r = audio_object_add_property_listener(
+        let status = audio_object_add_property_listener(
             kAudioObjectSystemObject,
             &address,
             devices_changed_callback,
             data_ptr as *mut c_void,
         );
-        assert_eq!(r, NO_ERR);
+        assert_eq!(status, NO_ERR);
 
         let _teardown = finally(|| {
-            let r = audio_object_remove_property_listener(
+            let status = audio_object_remove_property_listener(
                 kAudioObjectSystemObject,
                 &address,
                 devices_changed_callback,
                 data_ptr as *mut c_void,
             );
-            assert_eq!(r, NO_ERR);
+            assert_eq!(status, NO_ERR);
         });
 
         let device = Self::create_blank_device(plugin_id)?;
@@ -156,7 +190,7 @@
                 );
             }
             if !devs.contains(&device) {
-                return Err(APPLE_EVENT_TIMEOUT);
+                return Err(Error::from(waiting_time));
             }
         }
 
@@ -180,7 +214,7 @@
 
     pub fn create_blank_device(
         plugin_id: AudioObjectID,
-    ) -> std::result::Result<AudioObjectID, OSStatus> {
+    ) -> std::result::Result<AudioObjectID, Error> {
         assert_ne!(plugin_id, kAudioObjectUnknown);
 
         let address = AudioObjectPropertyAddress {
@@ -192,7 +226,7 @@
         let mut size: usize = 0;
         let status = audio_object_get_property_data_size(plugin_id, &address, &mut size);
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
         assert_ne!(size, 0);
 
@@ -261,7 +295,7 @@
             assert_ne!(device_id, kAudioObjectUnknown);
             Ok(device_id)
         } else {
-            Err(status)
+            Err(Error::from(status))
         }
     }
 
@@ -269,7 +303,7 @@
         device_id: AudioDeviceID,
         input_id: AudioDeviceID,
         output_id: AudioDeviceID,
-    ) -> std::result::Result<(), OSStatus> {
+    ) -> std::result::Result<(), Error> {
         let address = AudioObjectPropertyAddress {
             mSelector: kAudioAggregateDevicePropertyFullSubDeviceList,
             mScope: kAudioObjectPropertyScopeGlobal,
@@ -289,7 +323,7 @@
             data_ptr as *mut c_void,
         );
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
 
         let remove_listener = || -> OSStatus {
@@ -317,14 +351,14 @@
                 );
             }
             if *dev != device_id {
-                let r = remove_listener();
+                let status = remove_listener();
                 // If the error is kAudioHardwareBadObjectError, it implies `device_id` is somehow
                 // dead, so its listener should receive nothing. It's ok to leave here.
-                assert!(r == NO_ERR || r == (kAudioHardwareBadObjectError as OSStatus));
+                assert!(status == NO_ERR || status == (kAudioHardwareBadObjectError as OSStatus));
                 // TODO: Destroy the aggregate device immediately if error is not
                 // kAudioHardwareBadObjectError. Otherwise the `devices_changed_callback` is able
                 // to touch the `cloned_condvar_pair` after it's freed.
-                return Err(APPLE_EVENT_TIMEOUT);
+                return Err(Error::from(waiting_time));
             }
         }
 
@@ -342,8 +376,8 @@
             NO_ERR
         }
 
-        let r = remove_listener();
-        assert_eq!(r, NO_ERR);
+        let status = remove_listener();
+        assert_eq!(status, NO_ERR);
         Ok(())
     }
 
@@ -351,7 +385,7 @@
         device_id: AudioDeviceID,
         input_id: AudioDeviceID,
         output_id: AudioDeviceID,
-    ) -> std::result::Result<(), OSStatus> {
+    ) -> std::result::Result<(), Error> {
         assert_ne!(device_id, kAudioObjectUnknown);
         assert_ne!(input_id, kAudioObjectUnknown);
         assert_ne!(output_id, kAudioObjectUnknown);
@@ -386,14 +420,14 @@
             if status == NO_ERR {
                 Ok(())
             } else {
-                Err(status)
+                Err(Error::from(status))
             }
         }
     }
 
     pub fn get_sub_devices(
         device_id: AudioDeviceID,
-    ) -> std::result::Result<Vec<AudioObjectID>, OSStatus> {
+    ) -> std::result::Result<Vec<AudioObjectID>, Error> {
         assert_ne!(device_id, kAudioObjectUnknown);
 
         let mut sub_devices = Vec::new();
@@ -403,35 +437,35 @@
             mElement: kAudioObjectPropertyElementMaster,
         };
         let mut size: usize = 0;
-        let rv = audio_object_get_property_data_size(device_id, &address, &mut size);
+        let status = audio_object_get_property_data_size(device_id, &address, &mut size);
 
-        if rv == kAudioHardwareUnknownPropertyError as OSStatus {
+        if status == kAudioHardwareUnknownPropertyError as OSStatus {
             // Return a vector containing the device itself if the device has no sub devices.
             sub_devices.push(device_id);
             return Ok(sub_devices);
-        } else if rv != NO_ERR {
-            return Err(rv);
+        } else if status != NO_ERR {
+            return Err(Error::from(status));
         }
 
         assert_ne!(size, 0);
 
         let count = size / mem::size_of::<AudioObjectID>();
         sub_devices = allocate_array(count);
-        let rv = audio_object_get_property_data(
+        let status = audio_object_get_property_data(
             device_id,
             &address,
             &mut size,
             sub_devices.as_mut_ptr(),
         );
 
-        if rv == NO_ERR {
+        if status == NO_ERR {
             Ok(sub_devices)
         } else {
-            Err(rv)
+            Err(Error::from(status))
         }
     }
 
-    pub fn set_master_device(device_id: AudioDeviceID) -> std::result::Result<(), OSStatus> {
+    pub fn set_master_device(device_id: AudioDeviceID) -> std::result::Result<(), Error> {
         assert_ne!(device_id, kAudioObjectUnknown);
         let address = AudioObjectPropertyAddress {
             mSelector: kAudioAggregateDevicePropertyMasterSubDevice,
@@ -451,13 +485,13 @@
         if status == NO_ERR {
             Ok(())
         } else {
-            Err(status)
+            Err(Error::from(status))
         }
     }
 
     pub fn activate_clock_drift_compensation(
         device_id: AudioObjectID,
-    ) -> std::result::Result<(), OSStatus> {
+    ) -> std::result::Result<(), Error> {
         assert_ne!(device_id, kAudioObjectUnknown);
         let address = AudioObjectPropertyAddress {
             mSelector: kAudioObjectPropertyOwnedObjects,
@@ -478,14 +512,19 @@
             &mut size,
         );
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
         assert!(size > 0);
         let subdevices_num = size / mem::size_of::<AudioObjectID>();
-        assert!(
-            subdevices_num >= 2,
-            "We should have at least one input and one output device."
-        );
+        if subdevices_num < 2 {
+            cubeb_log!(
+                "Aggregate-device {} contains {} sub-devices only.\
+                We should have at least one input and one output device.",
+                device_id,
+                subdevices_num
+            );
+            return Err(Error::LessThan2Devices(subdevices_num));
+        }
         let mut sub_devices: Vec<AudioObjectID> = allocate_array(subdevices_num);
         let status = audio_object_get_property_data_with_qualifier(
             device_id,
@@ -496,7 +535,7 @@
             sub_devices.as_mut_ptr(),
         );
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
 
         let address = AudioObjectPropertyAddress {
@@ -527,7 +566,7 @@
     pub fn destroy_device(
         plugin_id: AudioObjectID,
         mut device_id: AudioDeviceID,
-    ) -> std::result::Result<(), OSStatus> {
+    ) -> std::result::Result<(), Error> {
         assert_ne!(plugin_id, kAudioObjectUnknown);
         assert_ne!(device_id, kAudioObjectUnknown);
 
@@ -540,7 +579,7 @@
         let mut size: usize = 0;
         let status = audio_object_get_property_data_size(plugin_id, &address, &mut size);
         if status != NO_ERR {
-            return Err(status);
+            return Err(Error::from(status));
         }
         assert!(size > 0);
 
@@ -548,7 +587,7 @@
         if status == NO_ERR {
             Ok(())
         } else {
-            Err(status)
+            Err(Error::from(status))
         }
     }
 
@@ -556,7 +595,7 @@
         device_id: AudioDeviceID,
         input_id: AudioDeviceID,
         output_id: AudioDeviceID,
-    ) -> std::result::Result<(), OSStatus> {
+    ) -> std::result::Result<(), Error> {
         assert_ne!(device_id, kAudioObjectUnknown);
         assert_ne!(input_id, kAudioObjectUnknown);
         assert_ne!(output_id, kAudioObjectUnknown);
@@ -601,7 +640,7 @@
                 &input_rate,
             );
             if status != NO_ERR {
-                return Err(status);
+                return Err(Error::from(status));
             }
         }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/src/backend/mod.rs firefox-85.0+build1/third_party/rust/cubeb-coreaudio/src/backend/mod.rs
--- firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/src/backend/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cubeb-coreaudio/src/backend/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2474,12 +2474,12 @@
                         self.aggregate_device.get_device_id()
                     );
                 }
-                Err(status) => {
+                Err(e) => {
                     cubeb_log!(
                         "({:p}) Create aggregate devices failed. Error: {}.\
                          Use assigned devices directly instead.",
                         self.stm_ptr,
-                        status
+                        e
                     );
                 }
             }
diff -Nru firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/todo.md firefox-85.0+build1/third_party/rust/cubeb-coreaudio/todo.md
--- firefox-84.0.2+build1/third_party/rust/cubeb-coreaudio/todo.md	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/cubeb-coreaudio/todo.md	2021-01-18 19:58:25.000000000 +0000
@@ -2,6 +2,7 @@
 
 ## General
 
+- Resolve the [issues](https://github.com/ChunMinChang/cubeb-coreaudio-rs/issues)
 - Some of bugs are found when adding tests. Search *FIXIT* to find them.
 - Remove `#[allow(non_camel_case_types)]`, `#![allow(unused_assignments)]`, `#![allow(unused_must_use)]`
 - Use `ErrorChain`
diff -Nru firefox-84.0.2+build1/third_party/rust/dtoa-short/.cargo-checksum.json firefox-85.0+build1/third_party/rust/dtoa-short/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/dtoa-short/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/dtoa-short/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"72a50a7572b499bcb5fe019d7eb60741e7ab5ade14c61bad1a4342a9792720a1","src/lib.rs":"efac1b36819fe8414df20b3fca2ebd1590d320075d0796996c63c8a87cdbee90"},"package":"068d4026697c1a18f0b0bb8cfcad1b0c151b90d8edb9bf4c235ad68128920d1d"}
\ No newline at end of file
+{"files":{"Cargo.toml":"77739c7541e1db4a011846d4bcaf39709cbe1e118dd269c9718e5cc0c7320548","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","src/lib.rs":"5c0c6cdc9ff4716f2ec9807f12bcf3c155e70a5d916eb0829bd0bab80eb65529"},"package":"bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/dtoa-short/Cargo.toml firefox-85.0+build1/third_party/rust/dtoa-short/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/dtoa-short/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/dtoa-short/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,9 +12,9 @@
 
 [package]
 name = "dtoa-short"
-version = "0.3.1"
+version = "0.3.3"
 authors = ["Xidorn Quan <me@upsuper.org>"]
-include = ["src/*.rs", "Cargo.toml"]
+include = ["src/*.rs", "Cargo.toml", "LICENSE"]
 description = "Serialize float number and truncate to certain precision"
 keywords = ["float"]
 categories = ["value-formatting"]
@@ -23,7 +23,7 @@
 [dependencies.dtoa]
 version = "0.4.1"
 [dev-dependencies.float-cmp]
-version = "0.2.3"
+version = "0.4"
 [badges.codecov]
 repository = "upsuper/dtoa-short"
 
diff -Nru firefox-84.0.2+build1/third_party/rust/dtoa-short/LICENSE firefox-85.0+build1/third_party/rust/dtoa-short/LICENSE
--- firefox-84.0.2+build1/third_party/rust/dtoa-short/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/dtoa-short/LICENSE	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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 it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff -Nru firefox-84.0.2+build1/third_party/rust/dtoa-short/src/lib.rs firefox-85.0+build1/third_party/rust/dtoa-short/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/dtoa-short/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/dtoa-short/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -62,7 +62,12 @@
     let mut buf = [b'\0'; BUFFER_SIZE + 8];
     let len = dtoa::write(&mut buf[1..], value).map_err(|_| fmt::Error)?;
     let (result, notation) = restrict_prec(&mut buf[0..len + 1], prec);
-    dest.write_str(str::from_utf8(result).unwrap())?;
+    dest.write_str(if cfg!(debug_assertions) {
+        str::from_utf8(result).unwrap()
+    } else {
+        // safety: dtoa only generates ascii.
+        unsafe { str::from_utf8_unchecked(result) }
+    })?;
     Ok(notation)
 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/.cargo-checksum.json firefox-85.0+build1/third_party/rust/env_logger/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/env_logger/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"7c044d74477515ab39287a4caff27eb96daebaed8b9f9b6a1d1c081a7b42d4a7","Cargo.lock":"b1394b6c58241027832cc714a0754902d82aa1f6923ab478c318739462e565ca","Cargo.toml":"2961879155d753ba90ecd98c17875c82007a6973c95867e86bc1ec5bd4f5db41","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"0bf17650e07b88f1486f033643c1e82517caa69410e6faeaa352782d9231d63e","examples/custom_default_format.rs":"ae18cd0e765cf1f16568f9879925861d6f004481f955b58af5ed8fd04b0fca99","examples/custom_format.rs":"b0f41b7a3e6fe7582871281f4244c62c66b0d724bfc678907f67185a784e82b4","examples/custom_logger.rs":"6eeef506681a46925117e8f89395cdf4fea60a0d1f6a420e51768e790272dcde","examples/default.rs":"7ed1c6a8a8fe457a86676bd3a75c07d4ec7fb54147cf2825c9d299a5878a24cd","examples/direct_logger.rs":"ee20c25379c396e5e74e963290a4d8773a86f3fe10193f61fb1efd1c7271faf4","examples/filters_from_code.rs":"7f007b0dfa5a3964f839134824dc3684bf2f3c3d7b4c36c580cd029df5f9308b","src/filter/mod.rs":"5da7e51e7b77efdd4d2b5445e5d0264be2c897909d0f86eb553e16611307aed2","src/filter/regex.rs":"bdf875bac25e089e1e462f5dd01a88678067c24118ecd6268561c6a6af39747d","src/filter/string.rs":"fac54d51189fc0b5d2bff334b7a7e465177b431e3428299e345e1f90062d832e","src/fmt/humantime/extern_impl.rs":"f3087b29eedb8b4d5573621ad206e48a2eac72a77277be3b0e631d7dc9fb7a2e","src/fmt/humantime/mod.rs":"f4111c26cf2ffb85c1d639bd7674d55af7e1736e7e98c52f7be3070046a3253f","src/fmt/humantime/shim_impl.rs":"cce9a252abd5952fa109a72b1dfb85a593d237e22606b2b608a32c69184560e9","src/fmt/mod.rs":"4ab11971a73eb5fe9b40f0bca6dfc404321dd9e2ffcf87d911408e7183dc8362","src/fmt/writer/atty.rs":"69d9dd26c430000cd2d40f9c68b2e77cd492fec22921dd2c16864301252583e0","src/fmt/writer/mod.rs":"1e0feb4dee3ee86c4c24f49566673e99ec85765869105a07a2fc7436d7640cfe","src/fmt/writer/termcolor/extern_impl.rs":"89e9f2e66b914ddc960ad9a4355265a5db5d7be410b139cf2b54ca99207374a7","src/fmt/writer/termcolor/mod.rs":"a790f9391a50cd52be6823e3e55942de13a8d12e23d63765342ae9e8dd6d091c","src/fmt/writer/termcolor/shim_impl.rs":"d93786671d6a89fc2912f77f04b8cb0b82d67277d255d15ac31bfc1bc4464e30","src/lib.rs":"3cbc4f4d3fe51c43fc45a2f435c141f0de5b40b65ba0d2c7d16bb58c04d10898","tests/init-twice-retains-filter.rs":"be5cd2132342d89ede1f5c4266173bb3c4d51cc22a1847f133d299a1c5430ccb","tests/log-in-log.rs":"29fecc65c1e0d1c22d79c97e7ca843ad44a91f27934148d7a05c48899a3f39d8","tests/log_tls_dtors.rs":"7320667d774a9b05037f7bf273fb2574dec0705707692a9cd2f46f4cd5bc68dd","tests/regexp_filter.rs":"a84263c995b534b6479a1d0abadf63f4f0264958ff86d9173d6b2139b82c4dc5"},"package":"44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"34c3abc5bfaeb865e9b901c245f7e41f02a96b6be50beef5302458bff548ef3c","Cargo.lock":"d71d249c813d01822d617294c433ed958c33389e339ca5c860b9ad81b6c509a6","Cargo.toml":"43aac950cc279366126613c1adb7ddfb4e126c7359d4ccf049fa13808e7ffc17","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"d8f5429aea4c3503ea036548ef0eaa30329f5bcc948c002af3d943df3cd87ef6","examples/custom_default_format.rs":"a6fe2b9255248a19e2cac58033ac80ff1fbf78af9786a7331efcbafe469815a2","examples/custom_format.rs":"58ab6ea92b857abe0743757d94c2d21ea4717c03e096fdd9aa0b54c59a8f4875","examples/custom_logger.rs":"723b145a50d6a88efd9d345f0d041a2d326794d19539f9a507f63bd25a2e03a2","examples/default.rs":"7ed1c6a8a8fe457a86676bd3a75c07d4ec7fb54147cf2825c9d299a5878a24cd","examples/direct_logger.rs":"5ae565fab0583c06de4cc3554fb4c8dc64cee8e2e1337b9aafff44e1bfb94e43","examples/filters_from_code.rs":"57edd53e811873c67b3069b4ea8fac619a0d5a507f6462ea4d0682bdf5d84a56","examples/in_tests.rs":"0b714146ab6f38d23394bfa5a5383fca2262a184a7628b8182d57b267e0917e7","examples/syslog_friendly_format.rs":"4269a86f549253bad54c7e8aae03d5ab09959a5c9d798d3fc6c4745cd5d96cd9","rust-toolchain":"d2ec7870533c64024a4f44f3315711f9f809230c2ae70d4a16100b14664d9fe1","src/filter/mod.rs":"80f29ae9395982a488682770fbeb545f8d6a23d1c8e6cdfb1113cab5c15bc2d2","src/filter/regex.rs":"bdf875bac25e089e1e462f5dd01a88678067c24118ecd6268561c6a6af39747d","src/filter/string.rs":"fac54d51189fc0b5d2bff334b7a7e465177b431e3428299e345e1f90062d832e","src/fmt/humantime/extern_impl.rs":"f3087b29eedb8b4d5573621ad206e48a2eac72a77277be3b0e631d7dc9fb7a2e","src/fmt/humantime/mod.rs":"f4111c26cf2ffb85c1d639bd7674d55af7e1736e7e98c52f7be3070046a3253f","src/fmt/humantime/shim_impl.rs":"cce9a252abd5952fa109a72b1dfb85a593d237e22606b2b608a32c69184560e9","src/fmt/mod.rs":"dff0e4613985f7a392182d9b1c1a68d148367d8b9622e37051b5367b5d6f9d04","src/fmt/writer/atty.rs":"09d14097dee61492828daaabdbde9f43251e2cb32e79d66c1c0e63f317761704","src/fmt/writer/mod.rs":"1e0feb4dee3ee86c4c24f49566673e99ec85765869105a07a2fc7436d7640cfe","src/fmt/writer/termcolor/extern_impl.rs":"e743201e9c428cda2df12a50611ccb33407a14f9726f6635a577937bafd5d108","src/fmt/writer/termcolor/mod.rs":"a790f9391a50cd52be6823e3e55942de13a8d12e23d63765342ae9e8dd6d091c","src/fmt/writer/termcolor/shim_impl.rs":"d93786671d6a89fc2912f77f04b8cb0b82d67277d255d15ac31bfc1bc4464e30","src/lib.rs":"1bd27a89c54366b3e35ad49845e81bbea36cf883382fcf902fbeb6f68c6a7a24","tests/init-twice-retains-filter.rs":"be5cd2132342d89ede1f5c4266173bb3c4d51cc22a1847f133d299a1c5430ccb","tests/log-in-log.rs":"29fecc65c1e0d1c22d79c97e7ca843ad44a91f27934148d7a05c48899a3f39d8","tests/log_tls_dtors.rs":"7320667d774a9b05037f7bf273fb2574dec0705707692a9cd2f46f4cd5bc68dd","tests/regexp_filter.rs":"a84263c995b534b6479a1d0abadf63f4f0264958ff86d9173d6b2139b82c4dc5"},"package":"f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/Cargo.lock firefox-85.0+build1/third_party/rust/env_logger/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/env_logger/Cargo.lock	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/Cargo.lock	2021-01-18 19:58:25.000000000 +0000
@@ -2,211 +2,146 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.6.9"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr",
 ]
 
 [[package]]
 name = "atty"
-version = "0.2.8"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.6"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
 [[package]]
 name = "env_logger"
-version = "0.7.1"
+version = "0.8.2"
 dependencies = [
- "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
 ]
 
 [[package]]
-name = "humantime"
-version = "1.3.0"
+name = "hermit-abi"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
 dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc",
 ]
 
 [[package]]
+name = "humantime"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"
+
+[[package]]
 name = "lazy_static"
-version = "1.0.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.40"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.2"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "regex"
-version = "1.1.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
- "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.5"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
 
 [[package]]
 name = "termcolor"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termion"
-version = "1.5.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 dependencies = [
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static",
 ]
 
 [[package]]
-name = "ucd-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "utf8-ranges"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
 name = "winapi"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi",
 ]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wincolor"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
-"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
-"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
-"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
-"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
-"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/Cargo.toml firefox-85.0+build1/third_party/rust/env_logger/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/env_logger/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "env_logger"
-version = "0.7.1"
+version = "0.8.2"
 authors = ["The Rust Project Developers"]
 description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"
 documentation = "https://docs.rs/env_logger"
@@ -21,7 +21,7 @@
 keywords = ["logging", "log", "logger"]
 categories = ["development-tools::debugging"]
 license = "MIT/Apache-2.0"
-repository = "https://github.com/sebasmagri/env_logger/"
+repository = "https://github.com/env-logger-rs/env_logger/"
 
 [[test]]
 name = "regexp_filter"
@@ -43,7 +43,7 @@
 optional = true
 
 [dependencies.humantime]
-version = "1.3"
+version = "2.0.0"
 optional = true
 
 [dependencies.log]
@@ -52,7 +52,9 @@
 
 [dependencies.regex]
 version = "1.0.3"
+features = ["std", "perf"]
 optional = true
+default-features = false
 
 [dependencies.termcolor]
 version = "1.0.2"
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/CHANGELOG.md firefox-85.0+build1/third_party/rust/env_logger/CHANGELOG.md
--- firefox-84.0.2+build1/third_party/rust/env_logger/CHANGELOG.md	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/CHANGELOG.md	2021-01-18 19:58:25.000000000 +0000
@@ -1,3 +1,3 @@
 Changes to this crate are tracked via [GitHub Releases][releases].
 
-[releases]: https://github.com/sebasmagri/env_logger/releases
+[releases]: https://github.com/env-logger-rs/env_logger/releases
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_default_format.rs firefox-85.0+build1/third_party/rust/env_logger/examples/custom_default_format.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_default_format.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/custom_default_format.rs	2021-01-18 19:58:25.000000000 +0000
@@ -27,11 +27,10 @@
         .filter("MY_LOG_LEVEL")
         .write_style("MY_LOG_STYLE");
 
-    let mut builder = Builder::from_env(env);
-
-    builder.format_level(false).format_timestamp_nanos();
-
-    builder.init();
+    Builder::from_env(env)
+        .format_level(false)
+        .format_timestamp_nanos()
+        .init();
 }
 
 fn main() {
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_format.rs firefox-85.0+build1/third_party/rust/env_logger/examples/custom_format.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_format.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/custom_format.rs	2021-01-18 19:58:25.000000000 +0000
@@ -19,7 +19,8 @@
 
 #[cfg(all(feature = "termcolor", feature = "humantime"))]
 fn main() {
-    use env_logger::{fmt, Builder, Env};
+    use env_logger::{fmt::Color, Builder, Env};
+
     use std::io::Write;
 
     fn init_logger() {
@@ -30,7 +31,7 @@
         Builder::from_env(env)
             .format(|buf, record| {
                 let mut style = buf.style();
-                style.set_bg(fmt::Color::Yellow).set_bold(true);
+                style.set_bg(Color::Yellow).set_bold(true);
 
                 let timestamp = buf.timestamp();
 
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_logger.rs firefox-85.0+build1/third_party/rust/env_logger/examples/custom_logger.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/custom_logger.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/custom_logger.rs	2021-01-18 19:58:25.000000000 +0000
@@ -13,17 +13,19 @@
 #[macro_use]
 extern crate log;
 
-use env_logger::filter::Filter;
+use env_logger::filter::{Builder, Filter};
+
 use log::{Log, Metadata, Record, SetLoggerError};
 
+const FILTER_ENV: &'static str = "MY_LOG_LEVEL";
+
 struct MyLogger {
     inner: Filter,
 }
 
 impl MyLogger {
     fn new() -> MyLogger {
-        use env_logger::filter::Builder;
-        let mut builder = Builder::from_env("MY_LOG_LEVEL");
+        let mut builder = Builder::from_env(FILTER_ENV);
 
         MyLogger {
             inner: builder.build(),
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/direct_logger.rs firefox-85.0+build1/third_party/rust/env_logger/examples/direct_logger.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/direct_logger.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/direct_logger.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,13 +4,17 @@
 This example doesn't rely on environment variables, or having a static logger installed.
 */
 
-fn record() -> log::Record<'static> {
-    let error_metadata = log::MetadataBuilder::new()
+use env_logger::{Builder, WriteStyle};
+
+use log::{Level, LevelFilter, Log, MetadataBuilder, Record};
+
+fn record() -> Record<'static> {
+    let error_metadata = MetadataBuilder::new()
         .target("myApp")
-        .level(log::Level::Error)
+        .level(Level::Error)
         .build();
 
-    log::Record::builder()
+    Record::builder()
         .metadata(error_metadata)
         .args(format_args!("Error!"))
         .line(Some(433))
@@ -20,16 +24,14 @@
 }
 
 fn main() {
-    use log::Log;
-
-    let stylish_logger = env_logger::Builder::new()
-        .filter(None, log::LevelFilter::Error)
-        .write_style(env_logger::WriteStyle::Always)
+    let stylish_logger = Builder::new()
+        .filter(None, LevelFilter::Error)
+        .write_style(WriteStyle::Always)
         .build();
 
-    let unstylish_logger = env_logger::Builder::new()
-        .filter(None, log::LevelFilter::Error)
-        .write_style(env_logger::WriteStyle::Never)
+    let unstylish_logger = Builder::new()
+        .filter(None, LevelFilter::Error)
+        .write_style(WriteStyle::Never)
         .build();
 
     stylish_logger.log(&record());
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/filters_from_code.rs firefox-85.0+build1/third_party/rust/env_logger/examples/filters_from_code.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/filters_from_code.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/filters_from_code.rs	2021-01-18 19:58:25.000000000 +0000
@@ -5,10 +5,12 @@
 #[macro_use]
 extern crate log;
 
+use env_logger::Builder;
+
+use log::LevelFilter;
+
 fn main() {
-    env_logger::builder()
-        .filter_level(log::LevelFilter::Trace)
-        .init();
+    Builder::new().filter_level(LevelFilter::max()).init();
 
     trace!("some trace log");
     debug!("some debug log");
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/in_tests.rs firefox-85.0+build1/third_party/rust/env_logger/examples/in_tests.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/in_tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/in_tests.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,54 @@
+/*!
+Using `env_logger` in tests.
+
+Log events will be captured by `cargo` and only printed if the test fails.
+You can run this example by calling:
+
+```text
+cargo test --example in_tests
+```
+
+You should see the `it_does_not_work` test fail and include its log output.
+*/
+
+#[cfg_attr(test, macro_use)]
+extern crate log;
+
+fn main() {}
+
+#[cfg(test)]
+mod tests {
+    fn init_logger() {
+        let _ = env_logger::builder()
+            // Include all events in tests
+            .filter_level(log::LevelFilter::max())
+            // Ensure events are captured by `cargo test`
+            .is_test(true)
+            // Ignore errors initializing the logger if tests race to configure it
+            .try_init();
+    }
+
+    #[test]
+    fn it_works() {
+        init_logger();
+
+        let a = 1;
+        let b = 2;
+
+        debug!("checking whether {} + {} = 3", a, b);
+
+        assert_eq!(3, a + b);
+    }
+
+    #[test]
+    fn it_does_not_work() {
+        init_logger();
+
+        let a = 1;
+        let b = 2;
+
+        debug!("checking whether {} + {} = 6", a, b);
+
+        assert_eq!(6, a + b);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/examples/syslog_friendly_format.rs firefox-85.0+build1/third_party/rust/env_logger/examples/syslog_friendly_format.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/examples/syslog_friendly_format.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/examples/syslog_friendly_format.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,24 @@
+use std::io::Write;
+
+fn main() {
+    match std::env::var("RUST_LOG_STYLE") {
+        Ok(s) if s == "SYSTEMD" => env_logger::builder()
+            .format(|buf, record| {
+                writeln!(
+                    buf,
+                    "<{}>{}: {}",
+                    match record.level() {
+                        log::Level::Error => 3,
+                        log::Level::Warn => 4,
+                        log::Level::Info => 6,
+                        log::Level::Debug => 7,
+                        log::Level::Trace => 7,
+                    },
+                    record.target(),
+                    record.args()
+                )
+            })
+            .init(),
+        _ => env_logger::init(),
+    };
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/README.md firefox-85.0+build1/third_party/rust/env_logger/README.md
--- firefox-84.0.2+build1/third_party/rust/env_logger/README.md	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/README.md	2021-01-18 19:58:25.000000000 +0000
@@ -1,4 +1,10 @@
-env_logger [![Build Status](https://travis-ci.org/sebasmagri/env_logger.svg?branch=master)](https://travis-ci.org/sebasmagri/env_logger) [![Maintenance](https://img.shields.io/badge/maintenance-actively%20maintained-brightgreen.svg)](https://github.com/sebasmagri/env_logger) [![crates.io](https://img.shields.io/crates/v/env_logger.svg)](https://crates.io/crates/env_logger) [![Documentation](https://img.shields.io/badge/docs-current-blue.svg)](https://docs.rs/env_logger)
+# env_logger
+
+[![Build Status](https://travis-ci.org/env-logger-rs/env_logger.svg?branch=master)](https://travis-ci.org/env-logger-rs/env_logger)
+[![Maintenance](https://img.shields.io/badge/maintenance-actively%20maintained-brightgreen.svg)](https://github.com/env-logger-rs/env_logger)
+[![crates.io](https://img.shields.io/crates/v/env_logger.svg)](https://crates.io/crates/env_logger)
+[![Documentation](https://docs.rs/env_logger/badge.svg)](https://docs.rs/env_logger)
+[![Documentation](https://img.shields.io/badge/docs-master-blue.svg)](https://env-logger-rs.github.io/env_logger/env_logger/index.html)
 ==========
 
 Implements a logger that can be configured via environment variables.
@@ -16,7 +22,7 @@
 ```toml
 [dependencies]
 log = "0.4.0"
-env_logger = "0.7.1"
+env_logger = "0.8.2"
 ```
 
 `env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
@@ -42,7 +48,7 @@
 [2018-11-03T06:09:06Z INFO  default] starting up
 ```
 
-`env_logger` can be configured in other ways besides an environment variable. See [the examples](https://github.com/sebasmagri/env_logger/tree/master/examples) for more approaches.
+`env_logger` can be configured in other ways besides an environment variable. See [the examples](https://github.com/env-logger-rs/env_logger/tree/master/examples) for more approaches.
 
 ### In tests
 
@@ -53,7 +59,7 @@
 log = "0.4.0"
 
 [dev-dependencies]
-env_logger = "0.7.1"
+env_logger = "0.8.2"
 ```
 
 ```rust
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/rust-toolchain firefox-85.0+build1/third_party/rust/env_logger/rust-toolchain
--- firefox-84.0.2+build1/third_party/rust/env_logger/rust-toolchain	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/rust-toolchain	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1 @@
+1.41.0
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/src/filter/mod.rs firefox-85.0+build1/third_party/rust/env_logger/src/filter/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/src/filter/mod.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/src/filter/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -52,7 +52,6 @@
 //!
 //!     fn flush(&self) {}
 //! }
-//! # fn main() {}
 //! ```
 //!
 //! [Enabling Logging]: ../index.html#enabling-logging
@@ -92,24 +91,18 @@
 /// ## Example
 ///
 /// ```
-/// #[macro_use]
-/// extern crate log;
-/// extern crate env_logger;
-///
-/// use std::env;
-/// use std::io;
+/// # #[macro_use] extern crate log;
+/// # use std::env;
 /// use env_logger::filter::Builder;
 ///
-/// fn main() {
-///     let mut builder = Builder::new();
-///
-///     // Parse a logging filter from an environment variable.
-///     if let Ok(rust_log) = env::var("RUST_LOG") {
-///        builder.parse(&rust_log);
-///     }
+/// let mut builder = Builder::new();
 ///
-///     let filter = builder.build();
+/// // Parse a logging filter from an environment variable.
+/// if let Ok(rust_log) = env::var("RUST_LOG") {
+///     builder.parse(&rust_log);
 /// }
+///
+/// let filter = builder.build();
 /// ```
 ///
 /// [`Filter`]: struct.Filter.html
@@ -132,20 +125,15 @@
     /// # Example
     ///
     /// ```rust
-    /// extern crate log;
-    /// extern crate env_logger;
-    ///
     /// use log::LevelFilter;
     /// use env_logger::filter::Builder;
     ///
-    /// fn main() {
-    ///     let mut builder = Builder::new();
-    ///     builder.filter(Some("module1"), LevelFilter::Info);
-    ///     builder.filter(Some("module2"), LevelFilter::Error);
+    /// let mut builder = Builder::new();
+    /// builder.filter(Some("module1"), LevelFilter::Info);
+    /// builder.filter(Some("module2"), LevelFilter::Error);
     ///
-    ///     let filter = builder.build();
-    ///     assert_eq!(filter.filter(), LevelFilter::Info);
-    /// }
+    /// let filter = builder.build();
+    /// assert_eq!(filter.filter(), LevelFilter::Info);
     /// ```
     pub fn filter(&self) -> LevelFilter {
         self.directives
@@ -310,9 +298,9 @@
         );
         return (dirs, None);
     }
-    mods.map(|m| {
+    if let Some(m) = mods {
         for s in m.split(',') {
-            if s.len() == 0 {
+            if s.is_empty() {
                 continue;
             }
             let mut parts = s.split('=');
@@ -352,9 +340,9 @@
                 level: log_level,
             });
         }
-    });
+    }
 
-    let filter = filter.map_or(None, |filter| match inner::Filter::new(filter) {
+    let filter = filter.and_then(|filter| match inner::Filter::new(filter) {
         Ok(re) => Some(re),
         Err(e) => {
             eprintln!("warning: invalid regex filter - {}", e);
@@ -362,7 +350,7 @@
         }
     });
 
-    return (dirs, filter);
+    (dirs, filter)
 }
 
 // Check whether a level and target are enabled by the set of directives.
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/mod.rs firefox-85.0+build1/third_party/rust/env_logger/src/fmt/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/src/fmt/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -136,13 +136,14 @@
     }
 }
 
+pub(crate) type FormatFn = Box<dyn Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>;
+
 pub(crate) struct Builder {
     pub format_timestamp: Option<TimestampPrecision>,
     pub format_module_path: bool,
     pub format_level: bool,
     pub format_indent: Option<usize>,
-    #[allow(unknown_lints, bare_trait_objects)]
-    pub custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
+    pub custom_format: Option<FormatFn>,
     built: bool,
 }
 
@@ -165,8 +166,7 @@
     /// If the `custom_format` is `Some`, then any `default_format` switches are ignored.
     /// If the `custom_format` is `None`, then a default format is returned.
     /// Any `default_format` switches set to `false` won't be written by the format.
-    #[allow(unknown_lints, bare_trait_objects)]
-    pub fn build(&mut self) -> Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send> {
+    pub fn build(&mut self) -> FormatFn {
         assert!(!self.built, "attempt to re-use consumed builder");
 
         let built = mem::replace(
@@ -230,6 +230,7 @@
                 .style()
                 .set_color(Color::Black)
                 .set_intense(true)
+                .clone()
                 .into_value(text)
         }
         #[cfg(not(feature = "termcolor"))]
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/writer/atty.rs firefox-85.0+build1/third_party/rust/env_logger/src/fmt/writer/atty.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/writer/atty.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/src/fmt/writer/atty.rs	2021-01-18 19:58:25.000000000 +0000
@@ -9,8 +9,6 @@
 
 #[cfg(feature = "atty")]
 mod imp {
-    use atty;
-
     pub(in crate::fmt) fn is_stdout() -> bool {
         atty::is(atty::Stream::Stdout)
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/writer/termcolor/extern_impl.rs firefox-85.0+build1/third_party/rust/env_logger/src/fmt/writer/termcolor/extern_impl.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/src/fmt/writer/termcolor/extern_impl.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/src/fmt/writer/termcolor/extern_impl.rs	2021-01-18 19:58:25.000000000 +0000
@@ -51,8 +51,8 @@
     pub fn default_level_style(&self, level: Level) -> Style {
         let mut level_style = self.style();
         match level {
-            Level::Trace => level_style.set_color(Color::Black).set_intense(true),
-            Level::Debug => level_style.set_color(Color::White),
+            Level::Trace => level_style.set_color(Color::Cyan),
+            Level::Debug => level_style.set_color(Color::Blue),
             Level::Info => level_style.set_color(Color::Green),
             Level::Warn => level_style.set_color(Color::Yellow),
             Level::Error => level_style.set_color(Color::Red).set_bold(true),
@@ -370,9 +370,9 @@
     }
 
     /// Wrap a value in the style by taking ownership of it.
-    pub(crate) fn into_value<T>(&mut self, value: T) -> StyledValue<'static, T> {
+    pub(crate) fn into_value<T>(self, value: T) -> StyledValue<'static, T> {
         StyledValue {
-            style: Cow::Owned(self.clone()),
+            style: Cow::Owned(self),
             value,
         }
     }
@@ -451,6 +451,7 @@
 ///
 /// Hexadecimal numbers are written with a `0x` prefix.
 #[allow(missing_docs)]
+#[non_exhaustive]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Color {
     Black,
@@ -463,8 +464,6 @@
     White,
     Ansi256(u8),
     Rgb(u8, u8, u8),
-    #[doc(hidden)]
-    __Nonexhaustive,
 }
 
 impl Color {
@@ -480,7 +479,6 @@
             Color::White => Some(termcolor::Color::White),
             Color::Ansi256(value) => Some(termcolor::Color::Ansi256(value)),
             Color::Rgb(r, g, b) => Some(termcolor::Color::Rgb(r, g, b)),
-            _ => None,
         }
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger/src/lib.rs firefox-85.0+build1/third_party/rust/env_logger/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -15,20 +15,16 @@
 //! ## Example
 //!
 //! ```
-//! #[macro_use] extern crate log;
+//! use log::{debug, error, log_enabled, info, Level};
 //!
-//! use log::Level;
+//! env_logger::init();
 //!
-//! fn main() {
-//!     env_logger::init();
+//! debug!("this is a debug {}", "message");
+//! error!("this is printed by default");
 //!
-//!     debug!("this is a debug {}", "message");
-//!     error!("this is printed by default");
-//!
-//!     if log_enabled!(Level::Info) {
-//!         let x = 3 * 4; // expensive computation
-//!         info!("the answer was: {}", x);
-//!     }
+//! if log_enabled!(Level::Info) {
+//!     let x = 3 * 4; // expensive computation
+//!     info!("the answer was: {}", x);
 //! }
 //! ```
 //!
@@ -146,7 +142,6 @@
 //!
 //! ```
 //! # #[macro_use] extern crate log;
-//! # fn main() {}
 //! #[cfg(test)]
 //! mod tests {
 //!     fn init() {
@@ -225,7 +220,7 @@
 //! ```
 //! use env_logger::Env;
 //!
-//! env_logger::from_env(Env::default().default_filter_or("warn")).init();
+//! env_logger::Builder::from_env(Env::default().default_filter_or("warn")).init();
 //! ```
 //!
 //! [log-crate-url]: https://docs.rs/log/
@@ -237,7 +232,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/static/images/favicon.ico",
-    html_root_url = "https://docs.rs/env_logger/0.7.1"
+    html_root_url = "https://docs.rs/env_logger/0.8.2"
 )]
 #![cfg_attr(test, deny(warnings))]
 // When compiled for the rustc compiler itself we want to make sure that this is
@@ -257,13 +252,13 @@
 
 use self::filter::Filter;
 use self::fmt::writer::{self, Writer};
-use self::fmt::Formatter;
+use self::fmt::{FormatFn, Formatter};
 
 /// The default name for the environment variable to read filters from.
-pub const DEFAULT_FILTER_ENV: &'static str = "RUST_LOG";
+pub const DEFAULT_FILTER_ENV: &str = "RUST_LOG";
 
 /// The default name for the environment variable to read style preferences from.
-pub const DEFAULT_WRITE_STYLE_ENV: &'static str = "RUST_LOG_STYLE";
+pub const DEFAULT_WRITE_STYLE_ENV: &str = "RUST_LOG_STYLE";
 
 /// Set of environment variables to configure from.
 ///
@@ -309,8 +304,7 @@
 pub struct Logger {
     writer: Writer,
     filter: Filter,
-    #[allow(unknown_lints, bare_trait_objects)]
-    format: Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>,
+    format: FormatFn,
 }
 
 /// `Builder` acts as builder for initializing a `Logger`.
@@ -321,23 +315,20 @@
 /// # Examples
 ///
 /// ```
-/// #[macro_use] extern crate log;
-///
-/// use std::env;
-/// use std::io::Write;
-/// use log::LevelFilter;
+/// # #[macro_use] extern crate log;
+/// # use std::io::Write;
 /// use env_logger::Builder;
+/// use log::LevelFilter;
+///
+/// let mut builder = Builder::from_default_env();
 ///
-/// fn main() {
-///     let mut builder = Builder::from_default_env();
+/// builder
+///     .format(|buf, record| writeln!(buf, "{} - {}", record.level(), record.args()))
+///     .filter(None, LevelFilter::Info)
+///     .init();
 ///
-///     builder.format(|buf, record| writeln!(buf, "{} - {}", record.level(), record.args()))
-///            .filter(None, LevelFilter::Info)
-///            .init();
-///
-///     error!("error message");
-///     info!("info message");
-/// }
+/// error!("error message");
+/// info!("info message");
 /// ```
 #[derive(Default)]
 pub struct Builder {
@@ -359,16 +350,15 @@
     /// Create a new builder and configure filters and style:
     ///
     /// ```
-    /// # fn main() {
     /// use log::LevelFilter;
     /// use env_logger::{Builder, WriteStyle};
     ///
     /// let mut builder = Builder::new();
     ///
-    /// builder.filter(None, LevelFilter::Info)
-    ///        .write_style(WriteStyle::Always)
-    ///        .init();
-    /// # }
+    /// builder
+    ///     .filter(None, LevelFilter::Info)
+    ///     .write_style(WriteStyle::Always)
+    ///     .init();
     /// ```
     ///
     /// [`filter`]: #method.filter
@@ -412,17 +402,61 @@
         E: Into<Env<'a>>,
     {
         let mut builder = Builder::new();
+        builder.parse_env(env);
+        builder
+    }
+
+    /// Applies the configuration from the environment.
+    ///
+    /// This function allows a builder to be configured with default parameters,
+    /// to be then overridden by the environment.
+    ///
+    /// # Examples
+    ///
+    /// Initialise a logger with filter level `Off`, then override the log
+    /// filter from an environment variable called `MY_LOG`:
+    ///
+    /// ```
+    /// use log::LevelFilter;
+    /// use env_logger::Builder;
+    ///
+    /// let mut builder = Builder::new();
+    ///
+    /// builder.filter_level(LevelFilter::Off);
+    /// builder.parse_env("MY_LOG");
+    /// builder.init();
+    /// ```
+    ///
+    /// Initialise a logger with filter level `Off`, then use the `MY_LOG`
+    /// variable to override filtering and `MY_LOG_STYLE` to override  whether
+    /// or not to write styles:
+    ///
+    /// ```
+    /// use log::LevelFilter;
+    /// use env_logger::{Builder, Env};
+    ///
+    /// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
+    ///
+    /// let mut builder = Builder::new();
+    /// builder.filter_level(LevelFilter::Off);
+    /// builder.parse_env(env);
+    /// builder.init();
+    /// ```
+    pub fn parse_env<'a, E>(&mut self, env: E) -> &mut Self
+    where
+        E: Into<Env<'a>>,
+    {
         let env = env.into();
 
         if let Some(s) = env.get_filter() {
-            builder.parse_filters(&s);
+            self.parse_filters(&s);
         }
 
         if let Some(s) = env.get_write_style() {
-            builder.parse_write_style(&s);
+            self.parse_write_style(&s);
         }
 
-        builder
+        self
     }
 
     /// Initializes the log builder from the environment using default variable names.
@@ -447,6 +481,32 @@
         Self::from_env(Env::default())
     }
 
+    /// Applies the configuration from the environment using default variable names.
+    ///
+    /// This method is a convenient way to call `parse_env(Env::default())` without
+    /// having to use the `Env` type explicitly. The builder will use the
+    /// [default environment variables].
+    ///
+    /// # Examples
+    ///
+    /// Initialise a logger with filter level `Off`, then configure it using the
+    /// default environment variables:
+    ///
+    /// ```
+    /// use log::LevelFilter;
+    /// use env_logger::Builder;
+    ///
+    /// let mut builder = Builder::new();
+    /// builder.filter_level(LevelFilter::Off);
+    /// builder.parse_default_env();
+    /// builder.init();
+    /// ```
+    ///
+    /// [default environment variables]: struct.Env.html#default-environment-variables
+    pub fn parse_default_env(&mut self) -> &mut Self {
+        self.parse_env(Env::default())
+    }
+
     /// Sets the format function for formatting the log output.
     ///
     /// This function is called on each record logged and should format the
@@ -538,17 +598,15 @@
     ///
     /// # Examples
     ///
-    /// Only include messages for warning and above for logs in `path::to::module`:
+    /// Only include messages for info and above for logs in `path::to::module`:
     ///
     /// ```
-    /// # fn main() {
-    /// use log::LevelFilter;
     /// use env_logger::Builder;
+    /// use log::LevelFilter;
     ///
     /// let mut builder = Builder::new();
     ///
     /// builder.filter_module("path::to::module", LevelFilter::Info);
-    /// # }
     /// ```
     pub fn filter_module(&mut self, module: &str, level: LevelFilter) -> &mut Self {
         self.filter.filter_module(module, level);
@@ -559,17 +617,15 @@
     ///
     /// # Examples
     ///
-    /// Only include messages for warning and above for logs in `path::to::module`:
+    /// Only include messages for info and above for logs in `path::to::module`:
     ///
     /// ```
-    /// # fn main() {
-    /// use log::LevelFilter;
     /// use env_logger::Builder;
+    /// use log::LevelFilter;
     ///
     /// let mut builder = Builder::new();
     ///
     /// builder.filter_level(LevelFilter::Info);
-    /// # }
     /// ```
     pub fn filter_level(&mut self, level: LevelFilter) -> &mut Self {
         self.filter.filter_level(level);
@@ -583,17 +639,15 @@
     ///
     /// # Examples
     ///
-    /// Only include messages for warning and above for logs in `path::to::module`:
+    /// Only include messages for info and above for logs in `path::to::module`:
     ///
     /// ```
-    /// # fn main() {
-    /// use log::LevelFilter;
     /// use env_logger::Builder;
+    /// use log::LevelFilter;
     ///
     /// let mut builder = Builder::new();
     ///
     /// builder.filter(Some("path::to::module"), LevelFilter::Info);
-    /// # }
     /// ```
     pub fn filter(&mut self, module: Option<&str>, level: LevelFilter) -> &mut Self {
         self.filter.filter(module, level);
@@ -1054,7 +1108,6 @@
 /// and `MY_LOG_STYLE` for writing colors:
 ///
 /// ```
-/// # extern crate env_logger;
 /// use env_logger::{Builder, Env};
 ///
 /// # fn run() -> Result<(), Box<::std::error::Error>> {
@@ -1064,7 +1117,7 @@
 ///
 /// Ok(())
 /// # }
-/// # fn main() { run().unwrap(); }
+/// # run().unwrap();
 /// ```
 ///
 /// # Errors
@@ -1114,6 +1167,9 @@
 /// Create a new builder with the default environment variables.
 ///
 /// The builder can be configured before being initialized.
+/// This is a convenient way of calling [`Builder::from_default_env`].
+///
+/// [`Builder::from_default_env`]: struct.Builder.html#method.from_default_env
 pub fn builder() -> Builder {
     Builder::from_default_env()
 }
@@ -1121,6 +1177,10 @@
 /// Create a builder from the given environment variables.
 ///
 /// The builder can be configured before being initialized.
+#[deprecated(
+    since = "0.8.0",
+    note = "Prefer `env_logger::Builder::from_env()` instead."
+)]
 pub fn from_env<'a, E>(env: E) -> Builder
 where
     E: Into<Env<'a>>,
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/.cargo-checksum.json firefox-85.0+build1/third_party/rust/env_logger-0.6.2/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"7c044d74477515ab39287a4caff27eb96daebaed8b9f9b6a1d1c081a7b42d4a7","Cargo.lock":"132c1f881b80a79314567a6993141c6204495fec144cdcec1729f2a3e0fec18b","Cargo.toml":"b60137f1fd54001ca4d8be1d0bbec154225a44c8f4fa3576078bdad55216d357","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"0e231c1c4ad51ff0239062297bdaa69aeb34a8692e3f814188ce1e0ade8583d5","examples/custom_default_format.rs":"799c439f61cb711078f8aa584db537a5758c25b90d44767849dae2ad3822885c","examples/custom_format.rs":"ac8323e2febf8b8ff7238bd254fbbbfb3183da5af84f7f3a261fd9ad892c9ab6","examples/custom_logger.rs":"99fb3c9761ad4c5fe73f4ec2a2bd44b4acf6d1f7b7cfaa16bf0373665d3e2a4b","examples/default.rs":"ac96427611784d310704f738c7a29ebddd7930c8a70ad3c464c4d3eae4cf74a3","examples/direct_logger.rs":"549f6a10e0903d06aca2cc7ba82415b07a23392676101c9bc7aa72b4a9b0b9e2","examples/filters_from_code.rs":"84bd82803683d19ae96f85edcf4ee38cda028c2dbde923dddecc8563453b18e2","src/filter/mod.rs":"de471579c5db400c5ed11b9d7c9fc62686068b42798c58f7165806319ab7ec09","src/filter/regex.rs":"5fff47d1d4d0aa3f2bab90636127d3e72aebf800c3b78faba99637220ffdf865","src/filter/string.rs":"52bbd047c31a1afdb3cd1c11629b956f21b3f47bf22e06421baf3d693a045e59","src/fmt/humantime/extern_impl.rs":"cd2538e7a03fd3ad6c843af3c3d4016ca96cadaefee32cf9b37329c4787e6552","src/fmt/humantime/mod.rs":"408496eb21344c654b9e06da2a2df86de56e427147bb7f7b47851e0da976c003","src/fmt/humantime/shim_impl.rs":"7c2fdf4031f5568b716df14842b0d32bc03ff398763f4849960df7f9632a5bb2","src/fmt/mod.rs":"5104dad2fd14bc18ab6ab46e7c2bc5752b509d9fc934fb99f0ebc126728f8f04","src/fmt/writer/atty.rs":"3e9fd61d291d0919f7aa7119a26dd15d920df8783b4ae57bcf2c3cb6f3ff06b5","src/fmt/writer/mod.rs":"583f6616e0cf21955a530baa332fb7a99bf4fcd418a2367bbd1e733a06a22318","src/fmt/writer/termcolor/extern_impl.rs":"15e048be128568abcdd0ce99dafffe296df26131d4aa05921585761d31c11db5","src/fmt/writer/termcolor/mod.rs":"a3cf956aec030e0f940e4eaefe58d7703857eb900022286e328e05e5f61de183","src/fmt/writer/termcolor/shim_impl.rs":"bdd479c4e933b14ba02a3c1a9fe30eb51bcdf600e23cebd044d68683fdaad037","src/lib.rs":"2c5ab92ee141022f3e657b0f81e84e5ee4e7fad9fb648204e00ed4fb03d4166f","tests/init-twice-retains-filter.rs":"00524ce0f6779981b695bad1fdd244f87b76c126aeccd8b4ff77ef9e6325478b","tests/log-in-log.rs":"41126910998adfbac771c2a1237fecbc5437344f8e4dfc2f93235bab764a087e","tests/regexp_filter.rs":"44aa6c39de894be090e37083601e501cfffb15e3c0cd36209c48abdf3e2cb120"},"package":"aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/Cargo.lock firefox-85.0+build1/third_party/rust/env_logger-0.6.2/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/Cargo.lock	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "aho-corasick"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "env_logger"
-version = "0.6.2"
-dependencies = [
- "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "humantime"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "libc"
-version = "0.2.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "memchr"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_termios"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "termion"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ucd-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "utf8-ranges"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wincolor"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[metadata]
-"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
-"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
-"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
-"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
-"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
-"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
-"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/Cargo.toml firefox-85.0+build1/third_party/rust/env_logger-0.6.2/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "env_logger"
-version = "0.6.2"
-authors = ["The Rust Project Developers"]
-description = "A logging implementation for `log` which is configured via an environment\nvariable.\n"
-documentation = "https://docs.rs/env_logger"
-readme = "README.md"
-keywords = ["logging", "log", "logger"]
-categories = ["development-tools::debugging"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/sebasmagri/env_logger/"
-
-[[test]]
-name = "regexp_filter"
-harness = false
-
-[[test]]
-name = "log-in-log"
-harness = false
-
-[[test]]
-name = "init-twice-retains-filter"
-harness = false
-[dependencies.atty]
-version = "0.2.5"
-optional = true
-
-[dependencies.humantime]
-version = "1.1"
-optional = true
-
-[dependencies.log]
-version = "0.4"
-features = ["std"]
-
-[dependencies.regex]
-version = "1.0.3"
-optional = true
-
-[dependencies.termcolor]
-version = "1.0.2"
-optional = true
-
-[features]
-default = ["termcolor", "atty", "humantime", "regex"]
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/CHANGELOG.md firefox-85.0+build1/third_party/rust/env_logger-0.6.2/CHANGELOG.md
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/CHANGELOG.md	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/CHANGELOG.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-Changes to this crate are tracked via [GitHub Releases][releases].
-
-[releases]: https://github.com/sebasmagri/env_logger/releases
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_default_format.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_default_format.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_default_format.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_default_format.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*!
-Disabling parts of the default format.
-
-Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
-
-```no_run,shell
-$ export MY_LOG_LEVEL='info'
-```
-
-Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
-or `auto` to enable them:
-
-```no_run,shell
-$ export MY_LOG_STYLE=never
-```
-
-If you want to control the logging output completely, see the `custom_logger` example.
-*/
-
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-use env_logger::{Env, Builder};
-
-fn init_logger() {
-    let env = Env::default()
-        .filter("MY_LOG_LEVEL")
-        .write_style("MY_LOG_STYLE");
-
-    let mut builder = Builder::from_env(env);
-
-    builder
-        .default_format_level(false)
-        .default_format_timestamp_nanos(true);
-
-    builder.init();
-}
-
-fn main() {
-    init_logger();
-
-    info!("a log from `MyLogger`");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_format.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_format.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_format.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_format.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*!
-Changing the default logging format.
-
-Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
-
-```no_run,shell
-$ export MY_LOG_LEVEL='info'
-```
-
-Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
-or `auto` to enable them:
-
-```no_run,shell
-$ export MY_LOG_STYLE=never
-```
-
-If you want to control the logging output completely, see the `custom_logger` example.
-*/
-
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-use std::io::Write;
-
-use env_logger::{Env, Builder, fmt};
-
-fn init_logger() {
-    let env = Env::default()
-        .filter("MY_LOG_LEVEL")
-        .write_style("MY_LOG_STYLE");
-
-    let mut builder = Builder::from_env(env);
-
-    // Use a different format for writing log records
-    // The colors are only available when the `termcolor` dependency is (which it is by default)
-    #[cfg(feature = "termcolor")]
-    builder.format(|buf, record| {
-        let mut style = buf.style();
-        style.set_bg(fmt::Color::Yellow).set_bold(true);
-
-        let timestamp = buf.timestamp();
-
-        writeln!(buf, "My formatted log ({}): {}", timestamp, style.value(record.args()))
-    });
-
-    builder.init();
-}
-
-fn main() {
-    init_logger();
-
-    info!("a log from `MyLogger`");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_logger.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_logger.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/custom_logger.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/custom_logger.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*!
-Using `env_logger` to drive a custom logger.
-
-Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
-
-```no_run,shell
-$ export MY_LOG_LEVEL='info'
-```
-
-If you only want to change the way logs are formatted, look at the `custom_format` example.
-*/
-
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-use env_logger::filter::Filter;
-use log::{Log, Metadata, Record, SetLoggerError};
-
-struct MyLogger {
-    inner: Filter
-}
-
-impl MyLogger {
-    fn new() -> MyLogger {
-        use env_logger::filter::Builder;
-        let mut builder = Builder::from_env("MY_LOG_LEVEL");
-
-        MyLogger {
-            inner: builder.build()
-        }
-    }
-
-    fn init() -> Result<(), SetLoggerError> {
-        let logger = Self::new();
-
-        log::set_max_level(logger.inner.filter());
-        log::set_boxed_logger(Box::new(logger))
-    }
-}
-
-impl Log for MyLogger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        self.inner.enabled(metadata)
-    }
-
-    fn log(&self, record: &Record) {
-        // Check if the record is matched by the logger before logging
-        if self.inner.matches(record) {
-            println!("{} - {}", record.level(), record.args());
-        }
-    }
-
-    fn flush(&self) { }
-}
-
-fn main() {
-    MyLogger::init().unwrap();
-
-    info!("a log from `MyLogger`");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/default.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/default.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/default.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/default.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*!
-Using `env_logger`.
-
-Before running this example, try setting the `MY_LOG_LEVEL` environment variable to `info`:
-
-```no_run,shell
-$ export MY_LOG_LEVEL='info'
-```
-
-Also try setting the `MY_LOG_STYLE` environment variable to `never` to disable colors
-or `auto` to enable them:
-
-```no_run,shell
-$ export MY_LOG_STYLE=never
-```
-*/
-
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-use env_logger::Env;
-
-fn main() {
-    // The `Env` lets us tweak what the environment
-    // variables to read are and what the default
-    // value is if they're missing
-    let env = Env::default()
-        .filter_or("MY_LOG_LEVEL", "trace")
-        .write_style_or("MY_LOG_STYLE", "always");
-
-    env_logger::init_from_env(env);
-
-    trace!("some trace log");
-    debug!("some debug log");
-    info!("some information log");
-    warn!("some warning log");
-    error!("some error log");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/direct_logger.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/direct_logger.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/direct_logger.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/direct_logger.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*!
-Using `env_logger::Logger` and the `log::Log` trait directly.
-
-This example doesn't rely on environment variables, or having a static logger installed.
-*/
-
-extern crate log;
-extern crate env_logger;
-
-fn record() -> log::Record<'static> {
-    let error_metadata = log::MetadataBuilder::new()
-        .target("myApp")
-        .level(log::Level::Error)
-        .build();
-
-    log::Record::builder()
-        .metadata(error_metadata)
-        .args(format_args!("Error!"))
-        .line(Some(433))
-        .file(Some("app.rs"))
-        .module_path(Some("server"))
-        .build()
-}
-
-fn main() {
-    use log::Log;
-
-    let stylish_logger = env_logger::Builder::new()
-        .filter(None, log::LevelFilter::Error)
-        .write_style(env_logger::WriteStyle::Always)
-        .build();
-
-    let unstylish_logger = env_logger::Builder::new()
-        .filter(None, log::LevelFilter::Error)
-        .write_style(env_logger::WriteStyle::Never)
-        .build();
-    
-    stylish_logger.log(&record());
-    unstylish_logger.log(&record());
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/filters_from_code.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/filters_from_code.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/examples/filters_from_code.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/examples/filters_from_code.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/*!
-Specify logging filters in code instead of using an environment variable.
-*/
-
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-fn main() {
-    env_logger::builder()
-        .filter_level(log::LevelFilter::Trace)
-        .init();
-
-    trace!("some trace log");
-    debug!("some debug log");
-    info!("some information log");
-    warn!("some warning log");
-    error!("some error log");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/LICENSE-APACHE firefox-85.0+build1/third_party/rust/env_logger-0.6.2/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/LICENSE-APACHE	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/LICENSE-MIT firefox-85.0+build1/third_party/rust/env_logger-0.6.2/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/LICENSE-MIT	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2014 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/README.md firefox-85.0+build1/third_party/rust/env_logger-0.6.2/README.md
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/README.md	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-env_logger [![Build Status](https://travis-ci.org/sebasmagri/env_logger.svg?branch=master)](https://travis-ci.org/sebasmagri/env_logger) [![Maintenance](https://img.shields.io/badge/maintenance-actively%20maintained-brightgreen.svg)](https://github.com/sebasmagri/env_logger) [![crates.io](https://img.shields.io/crates/v/env_logger.svg)](https://crates.io/crates/env_logger) [![Documentation](https://img.shields.io/badge/docs-current-blue.svg)](https://docs.rs/env_logger)
-==========
-
-Implements a logger that can be configured via environment variables.
-
-## Usage
-
-### In libraries
-
-`env_logger` makes sense when used in executables (binary projects). Libraries should use the [`log`](https://doc.rust-lang.org/log) crate instead.
-
-### In executables
-
-It must be added along with `log` to the project dependencies:
-
-```toml
-[dependencies]
-log = "0.4.0"
-env_logger = "0.6.2"
-```
-
-`env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
-
-```rust
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-fn main() {
-    env_logger::init();
-
-    info!("starting up");
-
-    // ...
-}
-```
-
-Then when running the executable, specify a value for the `RUST_LOG`
-environment variable that corresponds with the log messages you want to show.
-
-```bash
-$ RUST_LOG=info ./main
-[2018-11-03T06:09:06Z INFO  default] starting up
-```
-
-`env_logger` can be configured in other ways besides an environment variable. See [the examples](https://github.com/sebasmagri/env_logger/tree/master/examples) for more approaches.
-
-### In tests
-
-Tests can use the `env_logger` crate to see log messages generated during that test:
-
-```toml
-[dependencies]
-log = "0.4.0"
-
-[dev-dependencies]
-env_logger = "0.6.2"
-```
-
-```rust
-#[macro_use]
-extern crate log;
-
-fn add_one(num: i32) -> i32 {
-    info!("add_one called with {}", num);
-    num + 1
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    extern crate env_logger;
-
-    fn init() {
-        let _ = env_logger::builder().is_test(true).try_init();
-    }
-
-    #[test]
-    fn it_adds_one() {
-        init();
-
-        info!("can log from the test too");
-        assert_eq!(3, add_one(2));
-    }
-
-    #[test]
-    fn it_handles_negative_numbers() {
-        init();
-
-        info!("logging from another test");
-        assert_eq!(-7, add_one(-8));
-    }
-}
-```
-
-Assuming the module under test is called `my_lib`, running the tests with the
-`RUST_LOG` filtering to info messages from this module looks like:
-
-```bash
-$ RUST_LOG=my_lib=info cargo test
-     Running target/debug/my_lib-...
-
-running 2 tests
-[INFO my_lib::tests] logging from another test
-[INFO my_lib] add_one called with -8
-test tests::it_handles_negative_numbers ... ok
-[INFO my_lib::tests] can log from the test too
-[INFO my_lib] add_one called with 2
-test tests::it_adds_one ... ok
-
-test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured
-```
-
-Note that `env_logger::try_init()` needs to be called in each test in which you
-want to enable logging. Additionally, the default behavior of tests to
-run in parallel means that logging output may be interleaved with test output.
-Either run tests in a single thread by specifying `RUST_TEST_THREADS=1` or by
-running one test by specifying its name as an argument to the test binaries as
-directed by the `cargo test` help docs:
-
-```bash
-$ RUST_LOG=my_lib=info cargo test it_adds_one
-     Running target/debug/my_lib-...
-
-running 1 test
-[INFO my_lib::tests] can log from the test too
-[INFO my_lib] add_one called with 2
-test tests::it_adds_one ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
-```
-
-## Configuring log target
-
-By default, `env_logger` logs to stderr. If you want to log to stdout instead,
-you can use the `Builder` to change the log target:
-
-```rust
-use std::env;
-use env_logger::{Builder, Target};
-
-let mut builder = Builder::from_default_env();
-builder.target(Target::Stdout);
-
-builder.init();
-```
-
-## Stability of the default format
-
-The default format won't optimise for long-term stability, and explicitly makes no guarantees about the stability of its output across major, minor or patch version bumps during `0.x`.
-
-If you want to capture or interpret the output of `env_logger` programmatically then you should use a custom format.
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/mod.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,579 +0,0 @@
-//! Filtering for log records.
-//! 
-//! This module contains the log filtering used by `env_logger` to match records.
-//! You can use the `Filter` type in your own logger implementation to use the same 
-//! filter parsing and matching as `env_logger`. For more details about the format 
-//! for directive strings see [Enabling Logging].
-//! 
-//! ## Using `env_logger` in your own logger
-//!
-//! You can use `env_logger`'s filtering functionality with your own logger.
-//! Call [`Builder::parse`] to parse directives from a string when constructing 
-//! your logger. Call [`Filter::matches`] to check whether a record should be 
-//! logged based on the parsed filters when log records are received.
-//!
-//! ```
-//! extern crate log;
-//! extern crate env_logger;
-//! use env_logger::filter::Filter;
-//! use log::{Log, Metadata, Record};
-//!
-//! struct MyLogger {
-//!     filter: Filter
-//! }
-//!
-//! impl MyLogger {
-//!     fn new() -> MyLogger {
-//!         use env_logger::filter::Builder;
-//!         let mut builder = Builder::new();
-//!
-//!         // Parse a directives string from an environment variable
-//!         if let Ok(ref filter) = std::env::var("MY_LOG_LEVEL") {
-//!            builder.parse(filter);
-//!         }
-//!
-//!         MyLogger {
-//!             filter: builder.build()
-//!         }
-//!     }
-//! }
-//!
-//! impl Log for MyLogger {
-//!     fn enabled(&self, metadata: &Metadata) -> bool {
-//!         self.filter.enabled(metadata)
-//!     }
-//!
-//!     fn log(&self, record: &Record) {
-//!         // Check if the record is matched by the filter
-//!         if self.filter.matches(record) {
-//!             println!("{:?}", record);
-//!         }
-//!     }
-//!
-//!     fn flush(&self) {}
-//! }
-//! # fn main() {}
-//! ```
-//! 
-//! [Enabling Logging]: ../index.html#enabling-logging
-//! [`Builder::parse`]: struct.Builder.html#method.parse
-//! [`Filter::matches`]: struct.Filter.html#method.matches
-
-use std::env;
-use std::mem;
-use std::fmt;
-use log::{Level, LevelFilter, Record, Metadata};
-
-#[cfg(feature = "regex")]
-#[path = "regex.rs"]
-mod inner;
-
-#[cfg(not(feature = "regex"))]
-#[path = "string.rs"]
-mod inner;
-
-/// A log filter.
-/// 
-/// This struct can be used to determine whether or not a log record
-/// should be written to the output.
-/// Use the [`Builder`] type to parse and construct a `Filter`.
-/// 
-/// [`Builder`]: struct.Builder.html
-pub struct Filter {
-    directives: Vec<Directive>,
-    filter: Option<inner::Filter>,
-}
-
-/// A builder for a log filter.
-/// 
-/// It can be used to parse a set of directives from a string before building
-/// a [`Filter`] instance.
-/// 
-/// ## Example
-///
-/// ```
-/// #[macro_use]
-/// extern crate log;
-/// extern crate env_logger;
-///
-/// use std::env;
-/// use std::io;
-/// use env_logger::filter::Builder;
-///
-/// fn main() {
-///     let mut builder = Builder::new();
-///
-///     // Parse a logging filter from an environment variable.
-///     if let Ok(rust_log) = env::var("RUST_LOG") {
-///        builder.parse(&rust_log);
-///     }
-///
-///     let filter = builder.build();
-/// }
-/// ```
-/// 
-/// [`Filter`]: struct.Filter.html
-pub struct Builder {
-    directives: Vec<Directive>,
-    filter: Option<inner::Filter>,
-    built: bool,
-}
-
-#[derive(Debug)]
-struct Directive {
-    name: Option<String>,
-    level: LevelFilter,
-}
-
-impl Filter {
-    /// Returns the maximum `LevelFilter` that this filter instance is
-    /// configured to output.
-    ///
-    /// # Example
-    ///
-    /// ```rust
-    /// extern crate log;
-    /// extern crate env_logger;
-    ///
-    /// use log::LevelFilter;
-    /// use env_logger::filter::Builder;
-    ///
-    /// fn main() {
-    ///     let mut builder = Builder::new();
-    ///     builder.filter(Some("module1"), LevelFilter::Info);
-    ///     builder.filter(Some("module2"), LevelFilter::Error);
-    ///
-    ///     let filter = builder.build();
-    ///     assert_eq!(filter.filter(), LevelFilter::Info);
-    /// }
-    /// ```
-    pub fn filter(&self) -> LevelFilter {
-        self.directives.iter()
-            .map(|d| d.level)
-            .max()
-            .unwrap_or(LevelFilter::Off)
-    }
-
-    /// Checks if this record matches the configured filter.
-    pub fn matches(&self, record: &Record) -> bool {
-        if !self.enabled(record.metadata()) {
-            return false;
-        }
-
-        if let Some(filter) = self.filter.as_ref() {
-            if !filter.is_match(&*record.args().to_string()) {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    /// Determines if a log message with the specified metadata would be logged.
-    pub fn enabled(&self, metadata: &Metadata) -> bool {
-        let level = metadata.level();
-        let target = metadata.target();
-
-        enabled(&self.directives, level, target)
-    }
-}
-
-impl Builder {
-    /// Initializes the filter builder with defaults.
-    pub fn new() -> Builder {
-        Builder {
-            directives: Vec::new(),
-            filter: None,
-            built: false,
-        }
-    }
-
-    /// Initializes the filter builder from an environment.
-    pub fn from_env(env: &str) -> Builder {
-        let mut builder = Builder::new();
-
-        if let Ok(s) = env::var(env) {
-            builder.parse(&s);
-        }
-
-        builder
-    }
-
-    /// Adds a directive to the filter for a specific module.
-    pub fn filter_module(&mut self, module: &str, level: LevelFilter) -> &mut Self {
-        self.filter(Some(module), level)
-    }
-
-    /// Adds a directive to the filter for all modules.
-    pub fn filter_level(&mut self, level: LevelFilter) -> &mut Self {
-        self.filter(None, level)
-    }
-
-    /// Adds a directive to the filter.
-    ///
-    /// The given module (if any) will log at most the specified level provided.
-    /// If no module is provided then the filter will apply to all log messages.
-    pub fn filter(&mut self,
-                  module: Option<&str>,
-                  level: LevelFilter) -> &mut Self {
-        self.directives.push(Directive {
-            name: module.map(|s| s.to_string()),
-            level,
-        });
-        self
-    }
-
-    /// Parses the directives string.
-    ///
-    /// See the [Enabling Logging] section for more details.
-    /// 
-    /// [Enabling Logging]: ../index.html#enabling-logging
-    pub fn parse(&mut self, filters: &str) -> &mut Self {
-        let (directives, filter) = parse_spec(filters);
-
-        self.filter = filter;
-
-        for directive in directives {
-            self.directives.push(directive);
-        }
-        self
-    }
-
-    /// Build a log filter.
-    pub fn build(&mut self) -> Filter {
-        assert!(!self.built, "attempt to re-use consumed builder");
-        self.built = true;
-
-        if self.directives.is_empty() {
-            // Adds the default filter if none exist
-            self.directives.push(Directive {
-                name: None,
-                level: LevelFilter::Error,
-            });
-        } else {
-            // Sort the directives by length of their name, this allows a
-            // little more efficient lookup at runtime.
-            self.directives.sort_by(|a, b| {
-                let alen = a.name.as_ref().map(|a| a.len()).unwrap_or(0);
-                let blen = b.name.as_ref().map(|b| b.len()).unwrap_or(0);
-                alen.cmp(&blen)
-            });
-        }
-
-        Filter {
-            directives: mem::replace(&mut self.directives, Vec::new()),
-            filter: mem::replace(&mut self.filter, None),
-        }
-    }
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Builder::new()
-    }
-}
-
-impl fmt::Debug for Filter {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Filter")
-            .field("filter", &self.filter)
-            .field("directives", &self.directives)
-            .finish()
-    }
-}
-
-impl fmt::Debug for Builder {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        if self.built {
-            f.debug_struct("Filter")
-            .field("built", &true)
-            .finish()
-        } else {
-            f.debug_struct("Filter")
-            .field("filter", &self.filter)
-            .field("directives", &self.directives)
-            .finish()
-        }
-    }
-}
-
-/// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=error/foo")
-/// and return a vector with log directives.
-fn parse_spec(spec: &str) -> (Vec<Directive>, Option<inner::Filter>) {
-    let mut dirs = Vec::new();
-
-    let mut parts = spec.split('/');
-    let mods = parts.next();
-    let filter = parts.next();
-    if parts.next().is_some() {
-        eprintln!("warning: invalid logging spec '{}', \
-                  ignoring it (too many '/'s)", spec);
-        return (dirs, None);
-    }
-    mods.map(|m| { for s in m.split(',') {
-        if s.len() == 0 { continue }
-        let mut parts = s.split('=');
-        let (log_level, name) = match (parts.next(), parts.next().map(|s| s.trim()), parts.next()) {
-            (Some(part0), None, None) => {
-                // if the single argument is a log-level string or number,
-                // treat that as a global fallback
-                match part0.parse() {
-                    Ok(num) => (num, None),
-                    Err(_) => (LevelFilter::max(), Some(part0)),
-                }
-            }
-            (Some(part0), Some(""), None) => (LevelFilter::max(), Some(part0)),
-            (Some(part0), Some(part1), None) => {
-                match part1.parse() {
-                    Ok(num) => (num, Some(part0)),
-                    _ => {
-                        eprintln!("warning: invalid logging spec '{}', \
-                                  ignoring it", part1);
-                        continue
-                    }
-                }
-            },
-            _ => {
-                eprintln!("warning: invalid logging spec '{}', \
-                          ignoring it", s);
-                continue
-            }
-        };
-        dirs.push(Directive {
-            name: name.map(|s| s.to_string()),
-            level: log_level,
-        });
-    }});
-
-    let filter = filter.map_or(None, |filter| {
-        match inner::Filter::new(filter) {
-            Ok(re) => Some(re),
-            Err(e) => {
-                eprintln!("warning: invalid regex filter - {}", e);
-                None
-            }
-        }
-    });
-
-    return (dirs, filter);
-}
-
-
-// Check whether a level and target are enabled by the set of directives.
-fn enabled(directives: &[Directive], level: Level, target: &str) -> bool {
-    // Search for the longest match, the vector is assumed to be pre-sorted.
-    for directive in directives.iter().rev() {
-        match directive.name {
-            Some(ref name) if !target.starts_with(&**name) => {},
-            Some(..) | None => {
-                return level <= directive.level
-            }
-        }
-    }
-    false
-}
-
-#[cfg(test)]
-mod tests {
-    use log::{Level, LevelFilter};
-
-    use super::{Builder, Filter, Directive, parse_spec, enabled};
-
-    fn make_logger_filter(dirs: Vec<Directive>) -> Filter {
-        let mut logger = Builder::new().build();
-        logger.directives = dirs;
-        logger
-    }
-
-    #[test]
-    fn filter_info() {
-        let logger = Builder::new().filter(None, LevelFilter::Info).build();
-        assert!(enabled(&logger.directives, Level::Info, "crate1"));
-        assert!(!enabled(&logger.directives, Level::Debug, "crate1"));
-    }
-
-    #[test]
-    fn filter_beginning_longest_match() {
-        let logger = Builder::new()
-                        .filter(Some("crate2"), LevelFilter::Info)
-                        .filter(Some("crate2::mod"), LevelFilter::Debug)
-                        .filter(Some("crate1::mod1"), LevelFilter::Warn)
-                        .build();
-        assert!(enabled(&logger.directives, Level::Debug, "crate2::mod1"));
-        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
-    }
-
-    #[test]
-    fn parse_default() {
-        let logger = Builder::new().parse("info,crate1::mod1=warn").build();
-        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
-        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
-    }
-
-    #[test]
-    fn match_full_path() {
-        let logger = make_logger_filter(vec![
-            Directive {
-                name: Some("crate2".to_string()),
-                level: LevelFilter::Info
-            },
-            Directive {
-                name: Some("crate1::mod1".to_string()),
-                level: LevelFilter::Warn
-            }
-        ]);
-        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
-        assert!(!enabled(&logger.directives, Level::Info, "crate1::mod1"));
-        assert!(enabled(&logger.directives, Level::Info, "crate2"));
-        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
-    }
-
-    #[test]
-    fn no_match() {
-        let logger = make_logger_filter(vec![
-            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
-            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
-        ]);
-        assert!(!enabled(&logger.directives, Level::Warn, "crate3"));
-    }
-
-    #[test]
-    fn match_beginning() {
-        let logger = make_logger_filter(vec![
-            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
-            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
-        ]);
-        assert!(enabled(&logger.directives, Level::Info, "crate2::mod1"));
-    }
-
-    #[test]
-    fn match_beginning_longest_match() {
-        let logger = make_logger_filter(vec![
-            Directive { name: Some("crate2".to_string()), level: LevelFilter::Info },
-            Directive { name: Some("crate2::mod".to_string()), level: LevelFilter::Debug },
-            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
-        ]);
-        assert!(enabled(&logger.directives, Level::Debug, "crate2::mod1"));
-        assert!(!enabled(&logger.directives, Level::Debug, "crate2"));
-    }
-
-    #[test]
-    fn match_default() {
-        let logger = make_logger_filter(vec![
-            Directive { name: None, level: LevelFilter::Info },
-            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Warn }
-        ]);
-        assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
-        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
-    }
-
-    #[test]
-    fn zero_level() {
-        let logger = make_logger_filter(vec![
-            Directive { name: None, level: LevelFilter::Info },
-            Directive { name: Some("crate1::mod1".to_string()), level: LevelFilter::Off }
-        ]);
-        assert!(!enabled(&logger.directives, Level::Error, "crate1::mod1"));
-        assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
-    }
-
-    #[test]
-    fn parse_spec_valid() {
-        let (dirs, filter) = parse_spec("crate1::mod1=error,crate1::mod2,crate2=debug");
-        assert_eq!(dirs.len(), 3);
-        assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Error);
-
-        assert_eq!(dirs[1].name, Some("crate1::mod2".to_string()));
-        assert_eq!(dirs[1].level, LevelFilter::max());
-
-        assert_eq!(dirs[2].name, Some("crate2".to_string()));
-        assert_eq!(dirs[2].level, LevelFilter::Debug);
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_invalid_crate() {
-        // test parse_spec with multiple = in specification
-        let (dirs, filter) = parse_spec("crate1::mod1=warn=info,crate2=debug");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate2".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Debug);
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_invalid_level() {
-        // test parse_spec with 'noNumber' as log level
-        let (dirs, filter) = parse_spec("crate1::mod1=noNumber,crate2=debug");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate2".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Debug);
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_string_level() {
-        // test parse_spec with 'warn' as log level
-        let (dirs, filter) = parse_spec("crate1::mod1=wrong,crate2=warn");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate2".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Warn);
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_empty_level() {
-        // test parse_spec with '' as log level
-        let (dirs, filter) = parse_spec("crate1::mod1=wrong,crate2=");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate2".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::max());
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_global() {
-        // test parse_spec with no crate
-        let (dirs, filter) = parse_spec("warn,crate2=debug");
-        assert_eq!(dirs.len(), 2);
-        assert_eq!(dirs[0].name, None);
-        assert_eq!(dirs[0].level, LevelFilter::Warn);
-        assert_eq!(dirs[1].name, Some("crate2".to_string()));
-        assert_eq!(dirs[1].level, LevelFilter::Debug);
-        assert!(filter.is_none());
-    }
-
-    #[test]
-    fn parse_spec_valid_filter() {
-        let (dirs, filter) = parse_spec("crate1::mod1=error,crate1::mod2,crate2=debug/abc");
-        assert_eq!(dirs.len(), 3);
-        assert_eq!(dirs[0].name, Some("crate1::mod1".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Error);
-
-        assert_eq!(dirs[1].name, Some("crate1::mod2".to_string()));
-        assert_eq!(dirs[1].level, LevelFilter::max());
-
-        assert_eq!(dirs[2].name, Some("crate2".to_string()));
-        assert_eq!(dirs[2].level, LevelFilter::Debug);
-        assert!(filter.is_some() && filter.unwrap().to_string() == "abc");
-    }
-
-    #[test]
-    fn parse_spec_invalid_crate_filter() {
-        let (dirs, filter) = parse_spec("crate1::mod1=error=warn,crate2=debug/a.c");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate2".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::Debug);
-        assert!(filter.is_some() && filter.unwrap().to_string() == "a.c");
-    }
-
-    #[test]
-    fn parse_spec_empty_with_filter() {
-        let (dirs, filter) = parse_spec("crate1/a*c");
-        assert_eq!(dirs.len(), 1);
-        assert_eq!(dirs[0].name, Some("crate1".to_string()));
-        assert_eq!(dirs[0].level, LevelFilter::max());
-        assert!(filter.is_some() && filter.unwrap().to_string() == "a*c");
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/regex.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/regex.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/regex.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/regex.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-extern crate regex;
-
-use std::fmt;
-
-use self::regex::Regex;
-
-#[derive(Debug)]
-pub struct Filter {
-    inner: Regex,
-}
-
-impl Filter {
-    pub fn new(spec: &str) -> Result<Filter, String> {
-        match Regex::new(spec){
-            Ok(r) => Ok(Filter { inner: r }),
-            Err(e) => Err(e.to_string()),
-        }
-    }
-
-    pub fn is_match(&self, s: &str) -> bool {
-        self.inner.is_match(s)
-    }
-}
-
-impl fmt::Display for Filter {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/string.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/string.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/filter/string.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/filter/string.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-use std::fmt;
-
-#[derive(Debug)]
-pub struct Filter {
-    inner: String,
-}
-
-impl Filter {
-    pub fn new(spec: &str) -> Result<Filter, String> {
-        Ok(Filter { inner: spec.to_string() })
-    }
-
-    pub fn is_match(&self, s: &str) -> bool {
-        s.contains(&self.inner)
-    }
-}
-
-impl fmt::Display for Filter {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.inner.fmt(f)
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/extern_impl.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/extern_impl.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/extern_impl.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/extern_impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-use std::fmt;
-use std::time::SystemTime;
-
-use humantime::{format_rfc3339_nanos, format_rfc3339_seconds};
-
-use ::fmt::Formatter;
-
-pub(in ::fmt) mod glob {
-    pub use super::*;
-}
-
-impl Formatter {
-    /// Get a [`Timestamp`] for the current date and time in UTC.
-    ///
-    /// # Examples
-    ///
-    /// Include the current timestamp with the log record:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let ts = buf.timestamp();
-    ///
-    ///     writeln!(buf, "{}: {}: {}", ts, record.level(), record.args())
-    /// });
-    /// ```
-    ///
-    /// [`Timestamp`]: struct.Timestamp.html
-    pub fn timestamp(&self) -> Timestamp {
-        Timestamp(SystemTime::now())
-    }
-
-    /// Get a [`PreciseTimestamp`] for the current date and time in UTC with nanos.
-    pub fn precise_timestamp(&self) -> PreciseTimestamp {
-        PreciseTimestamp(SystemTime::now())
-    }
-}
-
-/// An [RFC3339] formatted timestamp.
-///
-/// The timestamp implements [`Display`] and can be written to a [`Formatter`].
-///
-/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
-/// [`Display`]: https://doc.rust-lang.org/stable/std/fmt/trait.Display.html
-/// [`Formatter`]: struct.Formatter.html
-pub struct Timestamp(SystemTime);
-
-/// An [RFC3339] formatted timestamp with nanos.
-///
-/// [RFC3339]: https://www.ietf.org/rfc/rfc3339.txt
-#[derive(Debug)]
-pub struct PreciseTimestamp(SystemTime);
-
-impl fmt::Debug for Timestamp {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        /// A `Debug` wrapper for `Timestamp` that uses the `Display` implementation.
-        struct TimestampValue<'a>(&'a Timestamp);
-
-        impl<'a> fmt::Debug for TimestampValue<'a> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                fmt::Display::fmt(&self.0, f)
-            }
-        }
-
-        f.debug_tuple("Timestamp")
-        .field(&TimestampValue(&self))
-        .finish()
-    }
-}
-
-impl fmt::Display for Timestamp {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        format_rfc3339_seconds(self.0).fmt(f)
-    }
-}
-
-impl fmt::Display for PreciseTimestamp {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        format_rfc3339_nanos(self.0).fmt(f)
-    }
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/mod.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-/*
-This internal module contains the timestamp implementation.
-
-Its public API is available when the `humantime` crate is available.
-*/
-
-#[cfg_attr(feature = "humantime", path = "extern_impl.rs")]
-#[cfg_attr(not(feature = "humantime"), path = "shim_impl.rs")]
-mod imp;
-
-pub(in ::fmt) use self::imp::*;
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/shim_impl.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/shim_impl.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/shim_impl.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/humantime/shim_impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-/*
-Timestamps aren't available when we don't have a `humantime` dependency.
-*/
-
-pub(in ::fmt) mod glob {
-    
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/mod.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,358 +0,0 @@
-//! Formatting for log records.
-//!
-//! This module contains a [`Formatter`] that can be used to format log records
-//! into without needing temporary allocations. Usually you won't need to worry
-//! about the contents of this module and can use the `Formatter` like an ordinary
-//! [`Write`].
-//!
-//! # Formatting log records
-//!
-//! The format used to print log records can be customised using the [`Builder::format`]
-//! method.
-//! Custom formats can apply different color and weight to printed values using
-//! [`Style`] builders.
-//!
-//! ```
-//! use std::io::Write;
-//!
-//! let mut builder = env_logger::Builder::new();
-//!
-//! builder.format(|buf, record| {
-//!     writeln!(buf, "{}: {}",
-//!         record.level(),
-//!         record.args())
-//! });
-//! ```
-//!
-//! [`Formatter`]: struct.Formatter.html
-//! [`Style`]: struct.Style.html
-//! [`Builder::format`]: ../struct.Builder.html#method.format
-//! [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
-
-use std::io::prelude::*;
-use std::{io, fmt, mem};
-use std::rc::Rc;
-use std::cell::RefCell;
-use std::fmt::Display;
-
-use log::Record;
-
-pub(crate) mod writer;
-mod humantime;
-
-pub use self::humantime::glob::*;
-pub use self::writer::glob::*;
-
-use self::writer::{Writer, Buffer};
-
-pub(crate) mod glob {
-    pub use super::{Target, WriteStyle};
-}
-
-/// A formatter to write logs into.
-///
-/// `Formatter` implements the standard [`Write`] trait for writing log records.
-/// It also supports terminal colors, through the [`style`] method.
-///
-/// # Examples
-///
-/// Use the [`writeln`] macro to format a log record.
-/// An instance of a `Formatter` is passed to an `env_logger` format as `buf`:
-///
-/// ```
-/// use std::io::Write;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args()));
-/// ```
-///
-/// [`Write`]: https://doc.rust-lang.org/stable/std/io/trait.Write.html
-/// [`writeln`]: https://doc.rust-lang.org/stable/std/macro.writeln.html
-/// [`style`]: #method.style
-pub struct Formatter {
-    buf: Rc<RefCell<Buffer>>,
-    write_style: WriteStyle,
-}
-
-impl Formatter {
-    pub(crate) fn new(writer: &Writer) -> Self {
-        Formatter {
-            buf: Rc::new(RefCell::new(writer.buffer())),
-            write_style: writer.write_style(),
-        }
-    }
-
-    pub(crate) fn write_style(&self) -> WriteStyle {
-        self.write_style
-    }
-
-    pub(crate) fn print(&self, writer: &Writer) -> io::Result<()> {
-        writer.print(&self.buf.borrow())
-    }
-
-    pub(crate) fn clear(&mut self) {
-        self.buf.borrow_mut().clear()
-    }
-}
-
-impl Write for Formatter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.buf.borrow_mut().write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.buf.borrow_mut().flush()
-    }
-}
-
-impl fmt::Debug for Formatter {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Formatter").finish()
-    }
-}
-
-pub(crate) struct Builder {
-    pub default_format_timestamp: bool,
-    pub default_format_timestamp_nanos: bool,
-    pub default_format_module_path: bool,
-    pub default_format_level: bool,
-    #[allow(unknown_lints, bare_trait_objects)]
-    pub custom_format: Option<Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>>,
-    built: bool,
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Builder {
-            default_format_timestamp: true,
-            default_format_timestamp_nanos: false,
-            default_format_module_path: true,
-            default_format_level: true,
-            custom_format: None,
-            built: false,
-        }
-    }
-}
-
-impl Builder {
-    /// Convert the format into a callable function.
-    /// 
-    /// If the `custom_format` is `Some`, then any `default_format` switches are ignored.
-    /// If the `custom_format` is `None`, then a default format is returned.
-    /// Any `default_format` switches set to `false` won't be written by the format.
-    #[allow(unknown_lints, bare_trait_objects)]
-    pub fn build(&mut self) -> Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send> {
-        assert!(!self.built, "attempt to re-use consumed builder");
-
-        let built = mem::replace(self, Builder {
-            built: true,
-            ..Default::default()
-        });
-
-        if let Some(fmt) = built.custom_format {
-            fmt
-        }
-        else {
-            Box::new(move |buf, record| {
-                let fmt = DefaultFormat {
-                    timestamp: built.default_format_timestamp,
-                    timestamp_nanos: built.default_format_timestamp_nanos,
-                    module_path: built.default_format_module_path,
-                    level: built.default_format_level,
-                    written_header_value: false,
-                    buf,
-                };
-
-                fmt.write(record)
-            })
-        }
-    }
-}
-
-#[cfg(feature = "termcolor")]
-type SubtleStyle = StyledValue<'static, &'static str>;
-#[cfg(not(feature = "termcolor"))]
-type SubtleStyle = &'static str;
-
-/// The default format.
-/// 
-/// This format needs to work with any combination of crate features.
-struct DefaultFormat<'a> {
-    timestamp: bool,
-    module_path: bool,
-    level: bool,
-    timestamp_nanos: bool,
-    written_header_value: bool,
-    buf: &'a mut Formatter,
-}
-
-impl<'a> DefaultFormat<'a> {
-    fn write(mut self, record: &Record) -> io::Result<()> {
-        self.write_timestamp()?;
-        self.write_level(record)?;
-        self.write_module_path(record)?;
-        self.finish_header()?;
-
-        self.write_args(record)
-    }
-
-    fn subtle_style(&self, text: &'static str) -> SubtleStyle {
-        #[cfg(feature = "termcolor")]
-        {
-            self.buf.style()
-                .set_color(Color::Black)
-                .set_intense(true)
-                .into_value(text)
-        }
-        #[cfg(not(feature = "termcolor"))]
-        {
-            text
-        }
-    }
-
-    fn write_header_value<T>(&mut self, value: T) -> io::Result<()>
-    where
-        T: Display,
-    {
-        if !self.written_header_value {
-            self.written_header_value = true;
-
-            let open_brace = self.subtle_style("[");
-            write!(self.buf, "{}{}", open_brace, value)
-        } else {
-            write!(self.buf, " {}", value)
-        }
-    }
-
-    fn write_level(&mut self, record: &Record) -> io::Result<()> {
-        if !self.level {
-            return Ok(())
-        }
-
-        let level = {
-            #[cfg(feature = "termcolor")]
-            {
-                self.buf.default_styled_level(record.level())
-            }
-            #[cfg(not(feature = "termcolor"))]
-            {
-                record.level()
-            }
-        };
-
-        self.write_header_value(format_args!("{:<5}", level))
-    }
-
-    fn write_timestamp(&mut self) -> io::Result<()> {
-        #[cfg(feature = "humantime")]
-        {
-            if !self.timestamp {
-                return Ok(())
-            }
-
-            if self.timestamp_nanos {
-                let ts_nanos = self.buf.precise_timestamp();
-                self.write_header_value(ts_nanos)
-            } else {
-                let ts = self.buf.timestamp();
-                self.write_header_value(ts)
-            }
-        }
-        #[cfg(not(feature = "humantime"))]
-        {
-            let _ = self.timestamp;
-            let _ = self.timestamp_nanos;
-            Ok(())
-        }
-    }
-
-    fn write_module_path(&mut self, record: &Record) -> io::Result<()> {
-        if !self.module_path {
-            return Ok(())
-        }
-
-        if let Some(module_path) = record.module_path() {
-            self.write_header_value(module_path)
-        } else {
-            Ok(())
-        }
-    }
-
-    fn finish_header(&mut self) -> io::Result<()> {
-        if self.written_header_value {
-            let close_brace = self.subtle_style("]");
-            write!(self.buf, "{} ", close_brace)
-        } else {
-            Ok(())
-        }
-    }
-
-    fn write_args(&mut self, record: &Record) -> io::Result<()> {
-        writeln!(self.buf, "{}", record.args())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use log::{Level, Record};
-
-    fn write(fmt: DefaultFormat) -> String {
-        let buf = fmt.buf.buf.clone();
-
-        let record = Record::builder()
-            .args(format_args!("log message"))
-            .level(Level::Info)
-            .file(Some("test.rs"))
-            .line(Some(144))
-            .module_path(Some("test::path"))
-            .build();
-
-        fmt.write(&record).expect("failed to write record");
-
-        let buf = buf.borrow();
-        String::from_utf8(buf.bytes().to_vec()).expect("failed to read record")
-    }
-
-    #[test]
-    fn default_format_with_header() {
-        let writer = writer::Builder::new()
-            .write_style(WriteStyle::Never)
-            .build();
-
-        let mut f = Formatter::new(&writer);
-
-        let written = write(DefaultFormat {
-            timestamp: false,
-            timestamp_nanos: false,
-            module_path: true,
-            level: true,
-            written_header_value: false,
-            buf: &mut f,
-        });
-
-        assert_eq!("[INFO  test::path] log message\n", written);
-    }
-
-    #[test]
-    fn default_format_no_header() {
-        let writer = writer::Builder::new()
-            .write_style(WriteStyle::Never)
-            .build();
-
-        let mut f = Formatter::new(&writer);
-
-        let written = write(DefaultFormat {
-            timestamp: false,
-            timestamp_nanos: false,
-            module_path: false,
-            level: false,
-            written_header_value: false,
-            buf: &mut f,
-        });
-
-        assert_eq!("log message\n", written);
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/atty.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/atty.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/atty.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/atty.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
-This internal module contains the terminal detection implementation.
-
-If the `atty` crate is available then we use it to detect whether we're
-attached to a particular TTY. If the `atty` crate is not available we
-assume we're not attached to anything. This effectively prevents styles
-from being printed.
-*/
-
-#[cfg(feature = "atty")]
-mod imp {
-    use atty;
-
-    pub(in ::fmt) fn is_stdout() -> bool {
-        atty::is(atty::Stream::Stdout)
-    }
-
-    pub(in ::fmt) fn is_stderr() -> bool {
-        atty::is(atty::Stream::Stderr)
-    }
-}
-
-#[cfg(not(feature = "atty"))]
-mod imp {
-    pub(in ::fmt) fn is_stdout() -> bool {
-        false
-    }
-
-    pub(in ::fmt) fn is_stderr() -> bool {
-        false
-    }
-}
-
-pub(in ::fmt) use self::imp::*;
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/mod.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-mod termcolor;
-mod atty;
-
-use std::{fmt, io};
-use self::termcolor::BufferWriter;
-use self::atty::{is_stdout, is_stderr};
-
-pub(in ::fmt) mod glob {
-    pub use super::termcolor::glob::*;
-    pub use super::*;
-}
-
-pub(in ::fmt) use self::termcolor::Buffer;
-
-/// Log target, either `stdout` or `stderr`.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum Target {
-    /// Logs will be sent to standard output.
-    Stdout,
-    /// Logs will be sent to standard error.
-    Stderr,
-}
-
-impl Default for Target {
-    fn default() -> Self {
-        Target::Stderr
-    }
-}
-
-/// Whether or not to print styles to the target.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub enum WriteStyle {
-    /// Try to print styles, but don't force the issue.
-    Auto,
-    /// Try very hard to print styles.
-    Always,
-    /// Never print styles.
-    Never,
-}
-
-impl Default for WriteStyle {
-    fn default() -> Self {
-        WriteStyle::Auto
-    }
-}
-
-/// A terminal target with color awareness.
-pub(crate) struct Writer {
-    inner: BufferWriter,
-    write_style: WriteStyle,
-}
-
-impl Writer {
-    pub fn write_style(&self) -> WriteStyle {
-        self.write_style
-    }
-
-    pub(in ::fmt) fn buffer(&self) -> Buffer {
-        self.inner.buffer()
-    }
-
-    pub(in ::fmt) fn print(&self, buf: &Buffer) -> io::Result<()> {
-        self.inner.print(buf)
-    }
-}
-
-/// A builder for a terminal writer.
-///
-/// The target and style choice can be configured before building.
-pub(crate) struct Builder {
-    target: Target,
-    write_style: WriteStyle,
-    is_test: bool,
-    built: bool,
-}
-
-impl Builder {
-    /// Initialize the writer builder with defaults.
-    pub(crate) fn new() -> Self {
-        Builder {
-            target: Default::default(),
-            write_style: Default::default(),
-            is_test: false,
-            built: false,
-        }
-    }
-
-    /// Set the target to write to.
-    pub(crate) fn target(&mut self, target: Target) -> &mut Self {
-        self.target = target;
-        self
-    }
-
-    /// Parses a style choice string.
-    ///
-    /// See the [Disabling colors] section for more details.
-    ///
-    /// [Disabling colors]: ../index.html#disabling-colors
-    pub(crate) fn parse_write_style(&mut self, write_style: &str) -> &mut Self {
-        self.write_style(parse_write_style(write_style))
-    }
-
-    /// Whether or not to print style characters when writing.
-    pub(crate) fn write_style(&mut self, write_style: WriteStyle) -> &mut Self {
-        self.write_style = write_style;
-        self
-    }
-
-    /// Whether or not to capture logs for `cargo test`.
-    pub(crate) fn is_test(&mut self, is_test: bool) -> &mut Self {
-        self.is_test = is_test;
-        self
-    }
-
-    /// Build a terminal writer.
-    pub(crate) fn build(&mut self) -> Writer {
-        assert!(!self.built, "attempt to re-use consumed builder");
-        self.built = true;
-
-        let color_choice = match self.write_style {
-            WriteStyle::Auto => {
-                if match self.target {
-                    Target::Stderr => is_stderr(),
-                    Target::Stdout => is_stdout(),
-                } {
-                    WriteStyle::Auto
-                } else {
-                    WriteStyle::Never
-                }
-            },
-            color_choice => color_choice,
-        };
-
-        let writer = match self.target {
-            Target::Stderr => BufferWriter::stderr(self.is_test, color_choice),
-            Target::Stdout => BufferWriter::stdout(self.is_test, color_choice),
-        };
-
-        Writer {
-            inner: writer,
-            write_style: self.write_style,
-        }
-    }
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Builder::new()
-    }
-}
-
-impl fmt::Debug for Builder {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Logger")
-        .field("target", &self.target)
-        .field("write_style", &self.write_style)
-        .finish()
-    }
-}
-
-impl fmt::Debug for Writer {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Writer").finish()
-    }
-}
-
-fn parse_write_style(spec: &str) -> WriteStyle {
-    match spec {
-        "auto" => WriteStyle::Auto,
-        "always" => WriteStyle::Always,
-        "never" => WriteStyle::Never,
-        _ => Default::default(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parse_write_style_valid() {
-        let inputs = vec![
-            ("auto", WriteStyle::Auto),
-            ("always", WriteStyle::Always),
-            ("never", WriteStyle::Never),
-        ];
-
-        for (input, expected) in inputs {
-            assert_eq!(expected, parse_write_style(input));
-        }
-    }
-
-    #[test]
-    fn parse_write_style_invalid() {
-        let inputs = vec![
-            "",
-            "true",
-            "false",
-            "NEVER!!"
-        ];
-
-        for input in inputs {
-            assert_eq!(WriteStyle::Auto, parse_write_style(input));
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/extern_impl.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/extern_impl.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/extern_impl.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/extern_impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,490 +0,0 @@
-use std::borrow::Cow;
-use std::fmt;
-use std::io::{self, Write};
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use log::Level;
-use termcolor::{self, ColorChoice, ColorSpec, WriteColor};
-
-use ::WriteStyle;
-use ::fmt::{Formatter, Target};
-
-pub(in ::fmt::writer) mod glob {
-    pub use super::*;
-}
-
-impl Formatter {
-    /// Begin a new [`Style`].
-    ///
-    /// # Examples
-    ///
-    /// Create a bold, red colored style and use it to print the log level:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut level_style = buf.style();
-    ///
-    ///     level_style.set_color(Color::Red).set_bold(true);
-    ///
-    ///     writeln!(buf, "{}: {}",
-    ///         level_style.value(record.level()),
-    ///         record.args())
-    /// });
-    /// ```
-    ///
-    /// [`Style`]: struct.Style.html
-    pub fn style(&self) -> Style {
-        Style {
-            buf: self.buf.clone(),
-            spec: ColorSpec::new(),
-        }
-    }
-
-    /// Get the default [`Style`] for the given level.
-    /// 
-    /// The style can be used to print other values besides the level.
-    pub fn default_level_style(&self, level: Level) -> Style {
-        let mut level_style = self.style();
-        match level {
-            Level::Trace => level_style.set_color(Color::Black).set_intense(true),
-            Level::Debug => level_style.set_color(Color::White),
-            Level::Info => level_style.set_color(Color::Green),
-            Level::Warn => level_style.set_color(Color::Yellow),
-            Level::Error => level_style.set_color(Color::Red).set_bold(true),
-        };
-        level_style
-    }
-
-    /// Get a printable [`Style`] for the given level.
-    /// 
-    /// The style can only be used to print the level.
-    pub fn default_styled_level(&self, level: Level) -> StyledValue<'static, Level> {
-        self.default_level_style(level).into_value(level)
-    }
-}
-
-pub(in ::fmt::writer) struct BufferWriter {
-    inner: termcolor::BufferWriter,
-    test_target: Option<Target>,
-}
-
-pub(in ::fmt) struct Buffer {
-    inner: termcolor::Buffer,
-    test_target: Option<Target>,
-}
-
-impl BufferWriter {
-    pub(in ::fmt::writer) fn stderr(is_test: bool, write_style: WriteStyle) -> Self {
-        BufferWriter {
-            inner: termcolor::BufferWriter::stderr(write_style.into_color_choice()),
-            test_target: if is_test {
-                Some(Target::Stderr)
-            } else {
-                None
-            },
-        }
-    }
-
-    pub(in ::fmt::writer) fn stdout(is_test: bool, write_style: WriteStyle) -> Self {
-        BufferWriter {
-            inner: termcolor::BufferWriter::stdout(write_style.into_color_choice()),
-            test_target: if is_test {
-                Some(Target::Stdout)
-            } else {
-                None
-            },
-        }
-    }
-
-    pub(in ::fmt::writer) fn buffer(&self) -> Buffer {
-        Buffer {
-            inner: self.inner.buffer(),
-            test_target: self.test_target,
-        }
-    }
-
-    pub(in ::fmt::writer) fn print(&self, buf: &Buffer) -> io::Result<()> {
-        if let Some(target) = self.test_target {
-            // This impl uses the `eprint` and `print` macros
-            // instead of `termcolor`'s buffer.
-            // This is so their output can be captured by `cargo test`
-            let log = String::from_utf8_lossy(buf.bytes());
-
-            match target {
-                Target::Stderr => eprint!("{}", log),
-                Target::Stdout => print!("{}", log),
-            }
-
-            Ok(())
-        } else {
-            self.inner.print(&buf.inner)
-        }
-    }
-}
-
-impl Buffer {
-    pub(in ::fmt) fn clear(&mut self) {
-        self.inner.clear()
-    }
-
-    pub(in ::fmt) fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.inner.write(buf)
-    }
-
-    pub(in ::fmt) fn flush(&mut self) -> io::Result<()> {
-        self.inner.flush()
-    }
-
-    pub(in ::fmt) fn bytes(&self) -> &[u8] {
-        self.inner.as_slice()
-    }
-
-    fn set_color(&mut self, spec: &ColorSpec) -> io::Result<()> {
-        // Ignore styles for test captured logs because they can't be printed
-        if self.test_target.is_none() {
-            self.inner.set_color(spec)
-        } else {
-            Ok(())
-        }
-    }
-
-    fn reset(&mut self) -> io::Result<()> {
-        // Ignore styles for test captured logs because they can't be printed
-        if self.test_target.is_none() {
-            self.inner.reset()
-        } else {
-            Ok(())
-        }
-    }
-}
-
-impl WriteStyle {
-    fn into_color_choice(self) -> ColorChoice {
-        match self {
-            WriteStyle::Always => ColorChoice::Always,
-            WriteStyle::Auto => ColorChoice::Auto,
-            WriteStyle::Never => ColorChoice::Never,
-        }
-    }
-}
-
-/// A set of styles to apply to the terminal output.
-///
-/// Call [`Formatter::style`] to get a `Style` and use the builder methods to
-/// set styling properties, like [color] and [weight].
-/// To print a value using the style, wrap it in a call to [`value`] when the log
-/// record is formatted.
-///
-/// # Examples
-///
-/// Create a bold, red colored style and use it to print the log level:
-///
-/// ```
-/// use std::io::Write;
-/// use env_logger::fmt::Color;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| {
-///     let mut level_style = buf.style();
-///
-///     level_style.set_color(Color::Red).set_bold(true);
-///
-///     writeln!(buf, "{}: {}",
-///         level_style.value(record.level()),
-///         record.args())
-/// });
-/// ```
-///
-/// Styles can be re-used to output multiple values:
-///
-/// ```
-/// use std::io::Write;
-/// use env_logger::fmt::Color;
-///
-/// let mut builder = env_logger::Builder::new();
-///
-/// builder.format(|buf, record| {
-///     let mut bold = buf.style();
-///
-///     bold.set_bold(true);
-///
-///     writeln!(buf, "{}: {} {}",
-///         bold.value(record.level()),
-///         bold.value("some bold text"),
-///         record.args())
-/// });
-/// ```
-///
-/// [`Formatter::style`]: struct.Formatter.html#method.style
-/// [color]: #method.set_color
-/// [weight]: #method.set_bold
-/// [`value`]: #method.value
-#[derive(Clone)]
-pub struct Style {
-    buf: Rc<RefCell<Buffer>>,
-    spec: ColorSpec,
-}
-
-/// A value that can be printed using the given styles.
-///
-/// It is the result of calling [`Style::value`].
-///
-/// [`Style::value`]: struct.Style.html#method.value
-pub struct StyledValue<'a, T> {
-    style: Cow<'a, Style>,
-    value: T,
-}
-
-impl Style {
-    /// Set the text color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with red text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_color(Color::Red);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_color(&mut self, color: Color) -> &mut Style {
-        self.spec.set_fg(color.into_termcolor());
-        self
-    }
-
-    /// Set the text weight.
-    ///
-    /// If `yes` is true then text will be written in bold.
-    /// If `yes` is false then text will be written in the default weight.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with bold text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_bold(true);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_bold(&mut self, yes: bool) -> &mut Style {
-        self.spec.set_bold(yes);
-        self
-    }
-
-    /// Set the text intensity.
-    ///
-    /// If `yes` is true then text will be written in a brighter color.
-    /// If `yes` is false then text will be written in the default color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with intense text:
-    ///
-    /// ```
-    /// use std::io::Write;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_intense(true);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_intense(&mut self, yes: bool) -> &mut Style {
-        self.spec.set_intense(yes);
-        self
-    }
-
-    /// Set the background color.
-    ///
-    /// # Examples
-    ///
-    /// Create a style with a yellow background:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_bg(Color::Yellow);
-    ///
-    ///     writeln!(buf, "{}", style.value(record.args()))
-    /// });
-    /// ```
-    pub fn set_bg(&mut self, color: Color) -> &mut Style {
-        self.spec.set_bg(color.into_termcolor());
-        self
-    }
-
-    /// Wrap a value in the style.
-    ///
-    /// The same `Style` can be used to print multiple different values.
-    ///
-    /// # Examples
-    ///
-    /// Create a bold, red colored style and use it to print the log level:
-    ///
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::fmt::Color;
-    ///
-    /// let mut builder = env_logger::Builder::new();
-    ///
-    /// builder.format(|buf, record| {
-    ///     let mut style = buf.style();
-    ///
-    ///     style.set_color(Color::Red).set_bold(true);
-    ///
-    ///     writeln!(buf, "{}: {}",
-    ///         style.value(record.level()),
-    ///         record.args())
-    /// });
-    /// ```
-    pub fn value<T>(&self, value: T) -> StyledValue<T> {
-        StyledValue {
-            style: Cow::Borrowed(self),
-            value
-        }
-    }
-
-    /// Wrap a value in the style by taking ownership of it.
-    pub(crate) fn into_value<T>(&mut self, value: T) -> StyledValue<'static, T> {
-        StyledValue {
-            style: Cow::Owned(self.clone()),
-            value
-        }
-    }
-}
-
-impl<'a, T> StyledValue<'a, T> {
-    fn write_fmt<F>(&self, f: F) -> fmt::Result
-    where
-        F: FnOnce() -> fmt::Result,
-    {
-        self.style.buf.borrow_mut().set_color(&self.style.spec).map_err(|_| fmt::Error)?;
-
-        // Always try to reset the terminal style, even if writing failed
-        let write = f();
-        let reset = self.style.buf.borrow_mut().reset().map_err(|_| fmt::Error);
-
-        write.and(reset)
-    }
-}
-
-impl fmt::Debug for Style {
-    fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-        f.debug_struct("Style").field("spec", &self.spec).finish()
-    }
-}
-
-macro_rules! impl_styled_value_fmt {
-    ($($fmt_trait:path),*) => {
-        $(
-            impl<'a, T: $fmt_trait> $fmt_trait for StyledValue<'a, T> {
-                fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-                    self.write_fmt(|| T::fmt(&self.value, f))
-                }
-            }
-        )*
-    };
-}
-
-impl_styled_value_fmt!(
-    fmt::Debug,
-    fmt::Display,
-    fmt::Pointer,
-    fmt::Octal,
-    fmt::Binary,
-    fmt::UpperHex,
-    fmt::LowerHex,
-    fmt::UpperExp,
-    fmt::LowerExp);
-
-// The `Color` type is copied from https://github.com/BurntSushi/ripgrep/tree/master/termcolor
-
-/// The set of available colors for the terminal foreground/background.
-///
-/// The `Ansi256` and `Rgb` colors will only output the correct codes when
-/// paired with the `Ansi` `WriteColor` implementation.
-///
-/// The `Ansi256` and `Rgb` color types are not supported when writing colors
-/// on Windows using the console. If they are used on Windows, then they are
-/// silently ignored and no colors will be emitted.
-///
-/// This set may expand over time.
-///
-/// This type has a `FromStr` impl that can parse colors from their human
-/// readable form. The format is as follows:
-///
-/// 1. Any of the explicitly listed colors in English. They are matched
-///    case insensitively.
-/// 2. A single 8-bit integer, in either decimal or hexadecimal format.
-/// 3. A triple of 8-bit integers separated by a comma, where each integer is
-///    in decimal or hexadecimal format.
-///
-/// Hexadecimal numbers are written with a `0x` prefix.
-#[allow(missing_docs)]
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum Color {
-    Black,
-    Blue,
-    Green,
-    Red,
-    Cyan,
-    Magenta,
-    Yellow,
-    White,
-    Ansi256(u8),
-    Rgb(u8, u8, u8),
-    #[doc(hidden)]
-    __Nonexhaustive,
-}
-
-impl Color {
-    fn into_termcolor(self) -> Option<termcolor::Color> {
-        match self {
-            Color::Black => Some(termcolor::Color::Black),
-            Color::Blue => Some(termcolor::Color::Blue),
-            Color::Green => Some(termcolor::Color::Green),
-            Color::Red => Some(termcolor::Color::Red),
-            Color::Cyan => Some(termcolor::Color::Cyan),
-            Color::Magenta => Some(termcolor::Color::Magenta),
-            Color::Yellow => Some(termcolor::Color::Yellow),
-            Color::White => Some(termcolor::Color::White),
-            Color::Ansi256(value) => Some(termcolor::Color::Ansi256(value)),
-            Color::Rgb(r, g, b) => Some(termcolor::Color::Rgb(r, g, b)),
-            _ => None,
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/mod.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/mod.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/mod.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-/*
-This internal module contains the style and terminal writing implementation.
-
-Its public API is available when the `termcolor` crate is available.
-The terminal printing is shimmed when the `termcolor` crate is not available.
-*/
-
-#[cfg_attr(feature = "termcolor", path = "extern_impl.rs")]
-#[cfg_attr(not(feature = "termcolor"), path = "shim_impl.rs")]
-mod imp;
-
-pub(in ::fmt) use self::imp::*;
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/shim_impl.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/shim_impl.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/shim_impl.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/fmt/writer/termcolor/shim_impl.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-use std::io;
-
-use fmt::{WriteStyle, Target};
-
-pub(in ::fmt::writer) mod glob {
-    
-}
-
-pub(in ::fmt::writer) struct BufferWriter {
-    target: Target,
-}
-
-pub(in ::fmt) struct Buffer(Vec<u8>);
-
-impl BufferWriter {
-    pub(in ::fmt::writer) fn stderr(_is_test: bool, _write_style: WriteStyle) -> Self {
-        BufferWriter {
-            target: Target::Stderr,
-        }
-    }
-
-    pub(in ::fmt::writer) fn stdout(_is_test: bool, _write_style: WriteStyle) -> Self {
-        BufferWriter {
-            target: Target::Stdout,
-        }
-    }
-
-    pub(in ::fmt::writer) fn buffer(&self) -> Buffer {
-        Buffer(Vec::new())
-    }
-
-    pub(in ::fmt::writer) fn print(&self, buf: &Buffer) -> io::Result<()> {
-        // This impl uses the `eprint` and `print` macros
-        // instead of using the streams directly.
-        // This is so their output can be captured by `cargo test`
-        let log = String::from_utf8_lossy(&buf.0);
-
-        match self.target {
-            Target::Stderr => eprint!("{}", log),
-            Target::Stdout => print!("{}", log),
-        }
-
-        Ok(())
-    }
-}
-
-impl Buffer {
-    pub(in ::fmt) fn clear(&mut self) {
-        self.0.clear();
-    }
-
-    pub(in ::fmt) fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.0.extend(buf);
-        Ok(buf.len())
-    }
-
-    pub(in ::fmt) fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-
-    #[cfg(test)]
-    pub(in ::fmt) fn bytes(&self) -> &[u8] {
-        &self.0
-    }
-}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/lib.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1173 +0,0 @@
-// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! A simple logger configured via environment variables which writes
-//! to stdout or stderr, for use with the logging facade exposed by the
-//! [`log` crate][log-crate-url].
-//!
-//! ## Example
-//!
-//! ```
-//! #[macro_use] extern crate log;
-//! extern crate env_logger;
-//!
-//! use log::Level;
-//!
-//! fn main() {
-//!     env_logger::init();
-//!
-//!     debug!("this is a debug {}", "message");
-//!     error!("this is printed by default");
-//!
-//!     if log_enabled!(Level::Info) {
-//!         let x = 3 * 4; // expensive computation
-//!         info!("the answer was: {}", x);
-//!     }
-//! }
-//! ```
-//!
-//! Assumes the binary is `main`:
-//!
-//! ```{.bash}
-//! $ RUST_LOG=error ./main
-//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
-//! ```
-//!
-//! ```{.bash}
-//! $ RUST_LOG=info ./main
-//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
-//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
-//! ```
-//!
-//! ```{.bash}
-//! $ RUST_LOG=debug ./main
-//! [2017-11-09T02:12:24Z DEBUG main] this is a debug message
-//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
-//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
-//! ```
-//!
-//! You can also set the log level on a per module basis:
-//!
-//! ```{.bash}
-//! $ RUST_LOG=main=info ./main
-//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
-//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
-//! ```
-//!
-//! And enable all logging:
-//!
-//! ```{.bash}
-//! $ RUST_LOG=main ./main
-//! [2017-11-09T02:12:24Z DEBUG main] this is a debug message
-//! [2017-11-09T02:12:24Z ERROR main] this is printed by default
-//! [2017-11-09T02:12:24Z INFO main] the answer was: 12
-//! ```
-//!
-//! If the binary name contains hyphens, you will need to replace
-//! them with underscores:
-//!
-//! ```{.bash}
-//! $ RUST_LOG=my_app ./my-app
-//! [2017-11-09T02:12:24Z DEBUG my_app] this is a debug message
-//! [2017-11-09T02:12:24Z ERROR my_app] this is printed by default
-//! [2017-11-09T02:12:24Z INFO my_app] the answer was: 12
-//! ```
-//!
-//! This is because Rust modules and crates cannot contain hyphens
-//! in their name, although `cargo` continues to accept them.
-//!
-//! See the documentation for the [`log` crate][log-crate-url] for more
-//! information about its API.
-//!
-//! ## Enabling logging
-//!
-//! Log levels are controlled on a per-module basis, and by default all logging
-//! is disabled except for `error!`. Logging is controlled via the `RUST_LOG`
-//! environment variable. The value of this environment variable is a
-//! comma-separated list of logging directives. A logging directive is of the
-//! form:
-//!
-//! ```text
-//! path::to::module=level
-//! ```
-//!
-//! The path to the module is rooted in the name of the crate it was compiled
-//! for, so if your program is contained in a file `hello.rs`, for example, to
-//! turn on logging for this file you would use a value of `RUST_LOG=hello`.
-//! Furthermore, this path is a prefix-search, so all modules nested in the
-//! specified module will also have logging enabled.
-//!
-//! The actual `level` is optional to specify. If omitted, all logging will
-//! be enabled. If specified, it must be one of the strings `debug`, `error`,
-//! `info`, `warn`, or `trace`.
-//!
-//! As the log level for a module is optional, the module to enable logging for
-//! is also optional. If only a `level` is provided, then the global log
-//! level for all modules is set to this value.
-//!
-//! Some examples of valid values of `RUST_LOG` are:
-//!
-//! * `hello` turns on all logging for the 'hello' module
-//! * `info` turns on all info logging
-//! * `hello=debug` turns on debug logging for 'hello'
-//! * `hello,std::option` turns on hello, and std's option logging
-//! * `error,hello=warn` turn on global error logging and also warn for hello
-//!
-//! ## Filtering results
-//!
-//! A `RUST_LOG` directive may include a regex filter. The syntax is to append `/`
-//! followed by a regex. Each message is checked against the regex, and is only
-//! logged if it matches. Note that the matching is done after formatting the
-//! log string but before adding any logging meta-data. There is a single filter
-//! for all modules.
-//!
-//! Some examples:
-//!
-//! * `hello/foo` turns on all logging for the 'hello' module where the log
-//!   message includes 'foo'.
-//! * `info/f.o` turns on all info logging where the log message includes 'foo',
-//!   'f1o', 'fao', etc.
-//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the log
-//!   message includes 'foofoo' or 'fofoo' or 'fooooooofoo', etc.
-//! * `error,hello=warn/[0-9]scopes` turn on global error logging and also
-//!   warn for hello. In both cases the log message must include a single digit
-//!   number followed by 'scopes'.
-//! 
-//! ## Capturing logs in tests
-//! 
-//! Records logged during `cargo test` will not be captured by the test harness by default.
-//! The [`Builder::is_test`] method can be used in unit tests to ensure logs will be captured:
-//! 
-//! ```
-//! # #[macro_use] extern crate log;
-//! # extern crate env_logger;
-//! # fn main() {}
-//! #[cfg(test)]
-//! mod tests {
-//!     fn init() {
-//!         let _ = env_logger::builder().is_test(true).try_init();
-//!     }
-//! 
-//!     #[test]
-//!     fn it_works() {
-//!         init();
-//! 
-//!         info!("This record will be captured by `cargo test`");
-//! 
-//!         assert_eq!(2, 1 + 1);
-//!     }
-//! }
-//! ```
-//! 
-//! Enabling test capturing comes at the expense of color and other style support
-//! and may have performance implications.
-//!
-//! ## Disabling colors
-//!
-//! Colors and other styles can be configured with the `RUST_LOG_STYLE`
-//! environment variable. It accepts the following values:
-//!
-//! * `auto` (default) will attempt to print style characters, but don't force the issue.
-//! If the console isn't available on Windows, or if TERM=dumb, for example, then don't print colors.
-//! * `always` will always print style characters even if they aren't supported by the terminal.
-//! This includes emitting ANSI colors on Windows if the console API is unavailable.
-//! * `never` will never print style characters.
-//! 
-//! ## Tweaking the default format
-//! 
-//! Parts of the default format can be excluded from the log output using the [`Builder`].
-//! The following example excludes the timestamp from the log output:
-//! 
-//! ```
-//! env_logger::builder()
-//!     .default_format_timestamp(false)
-//!     .init();
-//! ```
-//! 
-//! ### Stability of the default format
-//! 
-//! The default format won't optimise for long-term stability, and explicitly makes no 
-//! guarantees about the stability of its output across major, minor or patch version 
-//! bumps during `0.x`.
-//! 
-//! If you want to capture or interpret the output of `env_logger` programmatically 
-//! then you should use a custom format.
-//! 
-//! ### Using a custom format
-//! 
-//! Custom formats can be provided as closures to the [`Builder`].
-//! These closures take a [`Formatter`] and `log::Record` as arguments:
-//! 
-//! ```
-//! use std::io::Write;
-//!
-//! env_logger::builder()
-//!     .format(|buf, record| {
-//!         writeln!(buf, "{}: {}", record.level(), record.args())
-//!     })
-//!     .init();
-//! ```
-//! 
-//! See the [`fmt`] module for more details about custom formats.
-//! 
-//! ## Specifying defaults for environment variables
-//! 
-//! `env_logger` can read configuration from environment variables.
-//! If these variables aren't present, the default value to use can be tweaked with the [`Env`] type.
-//! The following example defaults to log `warn` and above if the `RUST_LOG` environment variable
-//! isn't set:
-//! 
-//! ```
-//! use env_logger::Env;
-//!
-//! env_logger::from_env(Env::default().default_filter_or("warn")).init();
-//! ```
-//! 
-//! [log-crate-url]: https://docs.rs/log/
-//! [`Builder`]: struct.Builder.html
-//! [`Builder::is_test`]: struct.Builder.html#method.is_test
-//! [`Env`]: struct.Env.html
-//! [`fmt`]: fmt/index.html
-
-#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
-       html_favicon_url = "https://www.rust-lang.org/static/images/favicon.ico",
-       html_root_url = "https://docs.rs/env_logger/0.6.2")]
-#![cfg_attr(test, deny(warnings))]
-
-// When compiled for the rustc compiler itself we want to make sure that this is
-// an unstable crate
-#![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
-#![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
-
-#![deny(missing_debug_implementations, missing_docs, warnings)]
-
-extern crate log;
-
-#[cfg(feature = "termcolor")]
-extern crate termcolor;
-#[cfg(feature = "humantime")]
-extern crate humantime;
-#[cfg(feature = "atty")]
-extern crate atty;
-
-use std::{env, io};
-use std::borrow::Cow;
-use std::cell::RefCell;
-
-use log::{Log, LevelFilter, Record, SetLoggerError, Metadata};
-
-pub mod filter;
-pub mod fmt;
-
-pub use self::fmt::glob::*;
-
-use self::filter::Filter;
-use self::fmt::Formatter;
-use self::fmt::writer::{self, Writer};
-
-/// The default name for the environment variable to read filters from.
-pub const DEFAULT_FILTER_ENV: &'static str = "RUST_LOG";
-
-/// The default name for the environment variable to read style preferences from.
-pub const DEFAULT_WRITE_STYLE_ENV: &'static str = "RUST_LOG_STYLE";
-
-/// Set of environment variables to configure from.
-///
-/// # Default environment variables
-///
-/// By default, the `Env` will read the following environment variables:
-///
-/// - `RUST_LOG`: the level filter
-/// - `RUST_LOG_STYLE`: whether or not to print styles with records.
-///
-/// These sources can be configured using the builder methods on `Env`.
-#[derive(Debug)]
-pub struct Env<'a> {
-    filter: Var<'a>,
-    write_style: Var<'a>,
-}
-
-#[derive(Debug)]
-struct Var<'a> {
-    name: Cow<'a, str>,
-    default: Option<Cow<'a, str>>,
-}
-
-/// The env logger.
-///
-/// This struct implements the `Log` trait from the [`log` crate][log-crate-url],
-/// which allows it to act as a logger.
-///
-/// The [`init()`], [`try_init()`], [`Builder::init()`] and [`Builder::try_init()`]
-/// methods will each construct a `Logger` and immediately initialize it as the
-/// default global logger.
-///
-/// If you'd instead need access to the constructed `Logger`, you can use
-/// the associated [`Builder`] and install it with the
-/// [`log` crate][log-crate-url] directly.
-///
-/// [log-crate-url]: https://docs.rs/log/
-/// [`init()`]: fn.init.html
-/// [`try_init()`]: fn.try_init.html
-/// [`Builder::init()`]: struct.Builder.html#method.init
-/// [`Builder::try_init()`]: struct.Builder.html#method.try_init
-/// [`Builder`]: struct.Builder.html
-pub struct Logger {
-    writer: Writer,
-    filter: Filter,
-    #[allow(unknown_lints, bare_trait_objects)]
-    format: Box<Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send>,
-}
-
-/// `Builder` acts as builder for initializing a `Logger`.
-///
-/// It can be used to customize the log format, change the environment variable used
-/// to provide the logging directives and also set the default log level filter.
-///
-/// # Examples
-///
-/// ```
-/// #[macro_use]
-/// extern crate log;
-/// extern crate env_logger;
-///
-/// use std::env;
-/// use std::io::Write;
-/// use log::LevelFilter;
-/// use env_logger::Builder;
-///
-/// fn main() {
-///     let mut builder = Builder::from_default_env();
-///
-///     builder.format(|buf, record| writeln!(buf, "{} - {}", record.level(), record.args()))
-///            .filter(None, LevelFilter::Info)
-///            .init();
-///
-///     error!("error message");
-///     info!("info message");
-/// }
-/// ```
-#[derive(Default)]
-pub struct Builder {
-    filter: filter::Builder,
-    writer: writer::Builder,
-    format: fmt::Builder,
-    built: bool,
-}
-
-impl Builder {
-    /// Initializes the log builder with defaults.
-    /// 
-    /// **NOTE:** This method won't read from any environment variables.
-    /// Use the [`filter`] and [`write_style`] methods to configure the builder
-    /// or use [`from_env`] or [`from_default_env`] instead.
-    /// 
-    /// # Examples
-    /// 
-    /// Create a new builder and configure filters and style:
-    /// 
-    /// ```
-    /// # extern crate log;
-    /// # extern crate env_logger;
-    /// # fn main() {
-    /// use log::LevelFilter;
-    /// use env_logger::{Builder, WriteStyle};
-    /// 
-    /// let mut builder = Builder::new();
-    /// 
-    /// builder.filter(None, LevelFilter::Info)
-    ///        .write_style(WriteStyle::Always)
-    ///        .init();
-    /// # }
-    /// ```
-    /// 
-    /// [`filter`]: #method.filter
-    /// [`write_style`]: #method.write_style
-    /// [`from_env`]: #method.from_env
-    /// [`from_default_env`]: #method.from_default_env
-    pub fn new() -> Builder {
-        Default::default()
-    }
-
-    /// Initializes the log builder from the environment.
-    ///
-    /// The variables used to read configuration from can be tweaked before
-    /// passing in.
-    ///
-    /// # Examples
-    /// 
-    /// Initialise a logger reading the log filter from an environment variable
-    /// called `MY_LOG`:
-    /// 
-    /// ```
-    /// use env_logger::Builder;
-    /// 
-    /// let mut builder = Builder::from_env("MY_LOG");
-    /// builder.init();
-    /// ```
-    ///
-    /// Initialise a logger using the `MY_LOG` variable for filtering and
-    /// `MY_LOG_STYLE` for whether or not to write styles:
-    ///
-    /// ```
-    /// use env_logger::{Builder, Env};
-    ///
-    /// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
-    ///
-    /// let mut builder = Builder::from_env(env);
-    /// builder.init();
-    /// ```
-    pub fn from_env<'a, E>(env: E) -> Self
-    where
-        E: Into<Env<'a>>
-    {
-        let mut builder = Builder::new();
-        let env = env.into();
-
-        if let Some(s) = env.get_filter() {
-            builder.parse_filters(&s);
-        }
-
-        if let Some(s) = env.get_write_style() {
-            builder.parse_write_style(&s);
-        }
-
-        builder
-    }
-
-    /// Initializes the log builder from the environment using default variable names.
-    /// 
-    /// This method is a convenient way to call `from_env(Env::default())` without
-    /// having to use the `Env` type explicitly. The builder will use the
-    /// [default environment variables].
-    /// 
-    /// # Examples
-    /// 
-    /// Initialise a logger using the default environment variables:
-    /// 
-    /// ```
-    /// use env_logger::Builder;
-    /// 
-    /// let mut builder = Builder::from_default_env();
-    /// builder.init();
-    /// ```
-    ///
-    /// [default environment variables]: struct.Env.html#default-environment-variables
-    pub fn from_default_env() -> Self {
-        Self::from_env(Env::default())
-    }
-
-    /// Sets the format function for formatting the log output.
-    ///
-    /// This function is called on each record logged and should format the
-    /// log record and output it to the given [`Formatter`].
-    ///
-    /// The format function is expected to output the string directly to the
-    /// `Formatter` so that implementations can use the [`std::fmt`] macros
-    /// to format and output without intermediate heap allocations. The default
-    /// `env_logger` formatter takes advantage of this.
-    /// 
-    /// # Examples
-    /// 
-    /// Use a custom format to write only the log message:
-    /// 
-    /// ```
-    /// use std::io::Write;
-    /// use env_logger::Builder;
-    /// 
-    /// let mut builder = Builder::new();
-    /// 
-    /// builder.format(|buf, record| writeln!(buf, "{}", record.args()));
-    /// ```
-    ///
-    /// [`Formatter`]: fmt/struct.Formatter.html
-    /// [`String`]: https://doc.rust-lang.org/stable/std/string/struct.String.html
-    /// [`std::fmt`]: https://doc.rust-lang.org/std/fmt/index.html
-    pub fn format<F: 'static>(&mut self, format: F) -> &mut Self
-        where F: Fn(&mut Formatter, &Record) -> io::Result<()> + Sync + Send
-    {
-        self.format.custom_format = Some(Box::new(format));
-        self
-    }
-
-    /// Use the default format.
-    /// 
-    /// This method will clear any custom format set on the builder.
-    pub fn default_format(&mut self) -> &mut Self {
-        self.format.custom_format = None;
-        self
-    }
-
-    /// Whether or not to write the level in the default format.
-    pub fn default_format_level(&mut self, write: bool) -> &mut Self {
-        self.format.default_format_level = write;
-        self
-    }
-
-    /// Whether or not to write the module path in the default format.
-    pub fn default_format_module_path(&mut self, write: bool) -> &mut Self {
-        self.format.default_format_module_path = write;
-        self
-    }
-
-    /// Whether or not to write the timestamp in the default format.
-    pub fn default_format_timestamp(&mut self, write: bool) -> &mut Self {
-        self.format.default_format_timestamp = write;
-        self
-    }
-
-    /// Whether or not to write the timestamp with nanos.
-    pub fn default_format_timestamp_nanos(&mut self, write: bool) -> &mut Self {
-        self.format.default_format_timestamp_nanos = write;
-        self
-    }
-
-    /// Adds a directive to the filter for a specific module.
-    ///
-    /// # Examples
-    ///
-    /// Only include messages for warning and above for logs in `path::to::module`:
-    ///
-    /// ```
-    /// # extern crate log;
-    /// # extern crate env_logger;
-    /// # fn main() {
-    /// use log::LevelFilter;
-    /// use env_logger::Builder;
-    ///
-    /// let mut builder = Builder::new();
-    ///
-    /// builder.filter_module("path::to::module", LevelFilter::Info);
-    /// # }
-    /// ```
-    pub fn filter_module(&mut self, module: &str, level: LevelFilter) -> &mut Self {
-        self.filter.filter_module(module, level);
-        self
-    }
-
-    /// Adds a directive to the filter for all modules.
-    ///
-    /// # Examples
-    ///
-    /// Only include messages for warning and above for logs in `path::to::module`:
-    ///
-    /// ```
-    /// # extern crate log;
-    /// # extern crate env_logger;
-    /// # fn main() {
-    /// use log::LevelFilter;
-    /// use env_logger::Builder;
-    ///
-    /// let mut builder = Builder::new();
-    ///
-    /// builder.filter_level(LevelFilter::Info);
-    /// # }
-    /// ```
-    pub fn filter_level(&mut self, level: LevelFilter) -> &mut Self {
-        self.filter.filter_level(level);
-        self
-    }
-
-    /// Adds filters to the logger.
-    ///
-    /// The given module (if any) will log at most the specified level provided.
-    /// If no module is provided then the filter will apply to all log messages.
-    /// 
-    /// # Examples
-    /// 
-    /// Only include messages for warning and above for logs in `path::to::module`:
-    /// 
-    /// ```
-    /// # extern crate log;
-    /// # extern crate env_logger;
-    /// # fn main() {
-    /// use log::LevelFilter;
-    /// use env_logger::Builder;
-    /// 
-    /// let mut builder = Builder::new();
-    /// 
-    /// builder.filter(Some("path::to::module"), LevelFilter::Info);
-    /// # }
-    /// ```
-    pub fn filter(&mut self,
-                  module: Option<&str>,
-                  level: LevelFilter) -> &mut Self {
-        self.filter.filter(module, level);
-        self
-    }
-
-    /// Parses the directives string in the same form as the `RUST_LOG`
-    /// environment variable.
-    ///
-    /// See the module documentation for more details.
-    #[deprecated(since = "0.6.1", note = "use `parse_filters` instead.")]
-    pub fn parse(&mut self, filters: &str) -> &mut Self {
-        self.parse_filters(filters)
-    }
-
-    /// Parses the directives string in the same form as the `RUST_LOG`
-    /// environment variable.
-    ///
-    /// See the module documentation for more details.
-    pub fn parse_filters(&mut self, filters: &str) -> &mut Self {
-        self.filter.parse(filters);
-        self
-    }
-
-    /// Sets the target for the log output.
-    ///
-    /// Env logger can log to either stdout or stderr. The default is stderr.
-    /// 
-    /// # Examples
-    /// 
-    /// Write log message to `stdout`:
-    /// 
-    /// ```
-    /// use env_logger::{Builder, Target};
-    /// 
-    /// let mut builder = Builder::new();
-    /// 
-    /// builder.target(Target::Stdout);
-    /// ```
-    pub fn target(&mut self, target: fmt::Target) -> &mut Self {
-        self.writer.target(target);
-        self
-    }
-
-    /// Sets whether or not styles will be written.
-    ///
-    /// This can be useful in environments that don't support control characters
-    /// for setting colors.
-    /// 
-    /// # Examples
-    /// 
-    /// Never attempt to write styles:
-    /// 
-    /// ```
-    /// use env_logger::{Builder, WriteStyle};
-    /// 
-    /// let mut builder = Builder::new();
-    /// 
-    /// builder.write_style(WriteStyle::Never);
-    /// ```
-    pub fn write_style(&mut self, write_style: fmt::WriteStyle) -> &mut Self {
-        self.writer.write_style(write_style);
-        self
-    }
-
-    /// Parses whether or not to write styles in the same form as the `RUST_LOG_STYLE`
-    /// environment variable.
-    ///
-    /// See the module documentation for more details.
-    pub fn parse_write_style(&mut self, write_style: &str) -> &mut Self {
-        self.writer.parse_write_style(write_style);
-        self
-    }
-
-    /// Sets whether or not the logger will be used in unit tests.
-    /// 
-    /// If `is_test` is `true` then the logger will allow the testing framework to
-    /// capture log records rather than printing them to the terminal directly.
-    pub fn is_test(&mut self, is_test: bool) -> &mut Self {
-        self.writer.is_test(is_test);
-        self
-    }
-
-    /// Initializes the global logger with the built env logger.
-    ///
-    /// This should be called early in the execution of a Rust program. Any log
-    /// events that occur before initialization will be ignored.
-    ///
-    /// # Errors
-    ///
-    /// This function will fail if it is called more than once, or if another
-    /// library has already initialized a global logger.
-    pub fn try_init(&mut self) -> Result<(), SetLoggerError> {
-        let logger = self.build();
-
-        let max_level = logger.filter();
-        let r = log::set_boxed_logger(Box::new(logger));
-
-        if r.is_ok() {
-            log::set_max_level(max_level);
-        }
-
-        r
-    }
-
-    /// Initializes the global logger with the built env logger.
-    ///
-    /// This should be called early in the execution of a Rust program. Any log
-    /// events that occur before initialization will be ignored.
-    ///
-    /// # Panics
-    ///
-    /// This function will panic if it is called more than once, or if another
-    /// library has already initialized a global logger.
-    pub fn init(&mut self) {
-        self.try_init().expect("Builder::init should not be called after logger initialized");
-    }
-
-    /// Build an env logger.
-    ///
-    /// The returned logger implements the `Log` trait and can be installed manually
-    /// or nested within another logger.
-    pub fn build(&mut self) -> Logger {
-        assert!(!self.built, "attempt to re-use consumed builder");
-        self.built = true;
-
-        Logger {
-            writer: self.writer.build(),
-            filter: self.filter.build(),
-            format: self.format.build(),
-        }
-    }
-}
-
-impl Logger {
-    /// Creates the logger from the environment.
-    ///
-    /// The variables used to read configuration from can be tweaked before
-    /// passing in.
-    ///
-    /// # Examples
-    ///
-    /// Create a logger reading the log filter from an environment variable
-    /// called `MY_LOG`:
-    ///
-    /// ```
-    /// use env_logger::Logger;
-    ///
-    /// let logger = Logger::from_env("MY_LOG");
-    /// ```
-    ///
-    /// Create a logger using the `MY_LOG` variable for filtering and
-    /// `MY_LOG_STYLE` for whether or not to write styles:
-    ///
-    /// ```
-    /// use env_logger::{Logger, Env};
-    ///
-    /// let env = Env::new().filter_or("MY_LOG", "info").write_style_or("MY_LOG_STYLE", "always");
-    ///
-    /// let logger = Logger::from_env(env);
-    /// ```
-    pub fn from_env<'a, E>(env: E) -> Self
-        where
-            E: Into<Env<'a>>
-    {
-        Builder::from_env(env).build()
-    }
-
-    /// Creates the logger from the environment using default variable names.
-    ///
-    /// This method is a convenient way to call `from_env(Env::default())` without
-    /// having to use the `Env` type explicitly. The logger will use the
-    /// [default environment variables].
-    ///
-    /// # Examples
-    ///
-    /// Creates a logger using the default environment variables:
-    ///
-    /// ```
-    /// use env_logger::Logger;
-    ///
-    /// let logger = Logger::from_default_env();
-    /// ```
-    ///
-    /// [default environment variables]: struct.Env.html#default-environment-variables
-    pub fn from_default_env() -> Self {
-        Builder::from_default_env().build()
-    }
-
-    /// Returns the maximum `LevelFilter` that this env logger instance is
-    /// configured to output.
-    pub fn filter(&self) -> LevelFilter {
-        self.filter.filter()
-    }
-
-    /// Checks if this record matches the configured filter.
-    pub fn matches(&self, record: &Record) -> bool {
-        self.filter.matches(record)
-    }
-}
-
-impl Log for Logger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        self.filter.enabled(metadata)
-    }
-
-    fn log(&self, record: &Record) {
-        if self.matches(record) {
-            // Log records are written to a thread-local buffer before being printed
-            // to the terminal. We clear these buffers afterwards, but they aren't shrinked
-            // so will always at least have capacity for the largest log record formatted
-            // on that thread.
-            //
-            // If multiple `Logger`s are used by the same threads then the thread-local
-            // formatter might have different color support. If this is the case the
-            // formatter and its buffer are discarded and recreated.
-
-            thread_local! {
-                static FORMATTER: RefCell<Option<Formatter>> = RefCell::new(None);
-            }
-
-            FORMATTER.with(|tl_buf| {
-                // It's possible for implementations to sometimes
-                // log-while-logging (e.g. a `std::fmt` implementation logs
-                // internally) but it's super rare. If this happens make sure we
-                // at least don't panic and ship some output to the screen.
-                let mut a;
-                let mut b = None;
-                let tl_buf = match tl_buf.try_borrow_mut() {
-                    Ok(f) => {
-                        a = f;
-                        &mut *a
-                    }
-                    Err(_) => &mut b,
-                };
-
-                // Check the buffer style. If it's different from the logger's
-                // style then drop the buffer and recreate it.
-                match *tl_buf {
-                    Some(ref mut formatter) => {
-                        if formatter.write_style() != self.writer.write_style() {
-                            *formatter = Formatter::new(&self.writer)
-                        }
-                    },
-                    ref mut tl_buf => *tl_buf = Some(Formatter::new(&self.writer))
-                }
-
-                // The format is guaranteed to be `Some` by this point
-                let mut formatter = tl_buf.as_mut().unwrap();
-
-                let _ = (self.format)(&mut formatter, record).and_then(|_| formatter.print(&self.writer));
-
-                // Always clear the buffer afterwards
-                formatter.clear();
-            });
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-impl<'a> Env<'a> {
-    /// Get a default set of environment variables.
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Specify an environment variable to read the filter from.
-    pub fn filter<E>(mut self, filter_env: E) -> Self
-    where
-        E: Into<Cow<'a, str>>
-    {
-        self.filter = Var::new(filter_env);
-
-        self
-    }
-
-    /// Specify an environment variable to read the filter from.
-    ///
-    /// If the variable is not set, the default value will be used.
-    pub fn filter_or<E, V>(mut self, filter_env: E, default: V) -> Self
-    where
-        E: Into<Cow<'a, str>>,
-        V: Into<Cow<'a, str>>,
-    {
-        self.filter = Var::new_with_default(filter_env, default);
-
-        self
-    }
-
-    /// Use the default environment variable to read the filter from.
-    /// 
-    /// If the variable is not set, the default value will be used.
-    pub fn default_filter_or<V>(mut self, default: V) -> Self
-    where
-        V: Into<Cow<'a, str>>,
-    {
-        self.filter = Var::new_with_default(DEFAULT_FILTER_ENV, default);
-
-        self
-    }
-
-    fn get_filter(&self) -> Option<String> {
-        self.filter.get()
-    }
-
-    /// Specify an environment variable to read the style from.
-    pub fn write_style<E>(mut self, write_style_env: E) -> Self
-    where
-        E: Into<Cow<'a, str>>
-    {
-        self.write_style = Var::new(write_style_env);
-
-        self
-    }
-
-    /// Specify an environment variable to read the style from.
-    ///
-    /// If the variable is not set, the default value will be used.
-    pub fn write_style_or<E, V>(mut self, write_style_env: E, default: V) -> Self
-        where
-            E: Into<Cow<'a, str>>,
-            V: Into<Cow<'a, str>>,
-    {
-        self.write_style = Var::new_with_default(write_style_env, default);
-
-        self
-    }
-
-    /// Use the default environment variable to read the style from.
-    ///
-    /// If the variable is not set, the default value will be used.
-    pub fn default_write_style_or<V>(mut self, default: V) -> Self
-        where
-            V: Into<Cow<'a, str>>,
-    {
-        self.write_style = Var::new_with_default(DEFAULT_WRITE_STYLE_ENV, default);
-
-        self
-    }
-
-    fn get_write_style(&self) -> Option<String> {
-        self.write_style.get()
-    }
-}
-
-impl<'a> Var<'a> {
-    fn new<E>(name: E) -> Self
-        where
-            E: Into<Cow<'a, str>>,
-    {
-        Var {
-            name: name.into(),
-            default: None,
-        }
-    }
-
-    fn new_with_default<E, V>(name: E, default: V) -> Self
-    where
-        E: Into<Cow<'a, str>>,
-        V: Into<Cow<'a, str>>,
-    {
-        Var {
-            name: name.into(),
-            default: Some(default.into()),
-        }
-    }
-
-    fn get(&self) -> Option<String> {
-        env::var(&*self.name)
-            .ok()
-            .or_else(|| self.default
-                .to_owned()
-                .map(|v| v.into_owned()))
-    }
-}
-
-impl<'a, T> From<T> for Env<'a>
-where
-    T: Into<Cow<'a, str>>
-{
-    fn from(filter_env: T) -> Self {
-        Env::default().filter(filter_env.into())
-    }
-}
-
-impl<'a> Default for Env<'a> {
-    fn default() -> Self {
-        Env {
-            filter: Var::new(DEFAULT_FILTER_ENV),
-            write_style: Var::new(DEFAULT_WRITE_STYLE_ENV),
-        }
-    }
-}
-
-mod std_fmt_impls {
-    use std::fmt;
-    use super::*;
-
-    impl fmt::Debug for Logger{
-        fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-            f.debug_struct("Logger")
-                .field("filter", &self.filter)
-                .finish()
-        }
-    }
-
-    impl fmt::Debug for Builder{
-        fn fmt(&self, f: &mut fmt::Formatter)->fmt::Result {
-            if self.built {
-                f.debug_struct("Logger")
-                .field("built", &true)
-                .finish()
-            } else {
-                f.debug_struct("Logger")
-                .field("filter", &self.filter)
-                .field("writer", &self.writer)
-                .finish()
-            }
-        }
-    }
-}
-
-/// Attempts to initialize the global logger with an env logger.
-///
-/// This should be called early in the execution of a Rust program. Any log
-/// events that occur before initialization will be ignored.
-///
-/// # Errors
-///
-/// This function will fail if it is called more than once, or if another
-/// library has already initialized a global logger.
-pub fn try_init() -> Result<(), SetLoggerError> {
-    try_init_from_env(Env::default())
-}
-
-/// Initializes the global logger with an env logger.
-///
-/// This should be called early in the execution of a Rust program. Any log
-/// events that occur before initialization will be ignored.
-///
-/// # Panics
-///
-/// This function will panic if it is called more than once, or if another
-/// library has already initialized a global logger.
-pub fn init() {
-    try_init().expect("env_logger::init should not be called after logger initialized");
-}
-
-/// Attempts to initialize the global logger with an env logger from the given
-/// environment variables.
-///
-/// This should be called early in the execution of a Rust program. Any log
-/// events that occur before initialization will be ignored.
-///
-/// # Examples
-///
-/// Initialise a logger using the `MY_LOG` environment variable for filters
-/// and `MY_LOG_STYLE` for writing colors:
-///
-/// ```
-/// # extern crate env_logger;
-/// use env_logger::{Builder, Env};
-///
-/// # fn run() -> Result<(), Box<::std::error::Error>> {
-/// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
-///
-/// env_logger::try_init_from_env(env)?;
-///
-/// Ok(())
-/// # }
-/// # fn main() { run().unwrap(); }
-/// ```
-///
-/// # Errors
-///
-/// This function will fail if it is called more than once, or if another
-/// library has already initialized a global logger.
-pub fn try_init_from_env<'a, E>(env: E) -> Result<(), SetLoggerError>
-where
-    E: Into<Env<'a>>
-{
-    let mut builder = Builder::from_env(env);
-
-    builder.try_init()
-}
-
-/// Initializes the global logger with an env logger from the given environment
-/// variables.
-///
-/// This should be called early in the execution of a Rust program. Any log
-/// events that occur before initialization will be ignored.
-///
-/// # Examples
-///
-/// Initialise a logger using the `MY_LOG` environment variable for filters
-/// and `MY_LOG_STYLE` for writing colors:
-///
-/// ```
-/// use env_logger::{Builder, Env};
-///
-/// let env = Env::new().filter("MY_LOG").write_style("MY_LOG_STYLE");
-///
-/// env_logger::init_from_env(env);
-/// ```
-///
-/// # Panics
-///
-/// This function will panic if it is called more than once, or if another
-/// library has already initialized a global logger.
-pub fn init_from_env<'a, E>(env: E)
-where
-    E: Into<Env<'a>>
-{
-    try_init_from_env(env).expect("env_logger::init_from_env should not be called after logger initialized");
-}
-
-/// Create a new builder with the default environment variables.
-/// 
-/// The builder can be configured before being initialized.
-pub fn builder() -> Builder {
-    Builder::from_default_env()
-}
-
-/// Create a builder from the given environment variables.
-/// 
-/// The builder can be configured before being initialized.
-pub fn from_env<'a, E>(env: E) -> Builder
-where
-    E: Into<Env<'a>>
-{
-    Builder::from_env(env)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn env_get_filter_reads_from_var_if_set() {
-        env::set_var("env_get_filter_reads_from_var_if_set", "from var");
-
-        let env = Env::new().filter_or("env_get_filter_reads_from_var_if_set", "from default");
-
-        assert_eq!(Some("from var".to_owned()), env.get_filter());
-    }
-
-    #[test]
-    fn env_get_filter_reads_from_default_if_var_not_set() {
-        env::remove_var("env_get_filter_reads_from_default_if_var_not_set");
-
-        let env = Env::new().filter_or("env_get_filter_reads_from_default_if_var_not_set", "from default");
-
-        assert_eq!(Some("from default".to_owned()), env.get_filter());
-    }
-
-    #[test]
-    fn env_get_write_style_reads_from_var_if_set() {
-        env::set_var("env_get_write_style_reads_from_var_if_set", "from var");
-
-        let env = Env::new().write_style_or("env_get_write_style_reads_from_var_if_set", "from default");
-
-        assert_eq!(Some("from var".to_owned()), env.get_write_style());
-    }
-
-    #[test]
-    fn env_get_write_style_reads_from_default_if_var_not_set() {
-        env::remove_var("env_get_write_style_reads_from_default_if_var_not_set");
-
-        let env = Env::new().write_style_or("env_get_write_style_reads_from_default_if_var_not_set", "from default");
-
-        assert_eq!(Some("from default".to_owned()), env.get_write_style());
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/init-twice-retains-filter.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/init-twice-retains-filter.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/init-twice-retains-filter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/init-twice-retains-filter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-extern crate log;
-extern crate env_logger;
-
-use std::process;
-use std::env;
-use std::str;
-
-fn main() {
-    if env::var("YOU_ARE_TESTING_NOW").is_ok() {
-        // Init from the env (which should set the max level to `Debug`)
-        env_logger::init();
-
-        assert_eq!(log::LevelFilter::Debug, log::max_level());
-
-        // Init again using a different max level
-        // This shouldn't clobber the level that was previously set
-        env_logger::Builder::new()
-            .parse_filters("info")
-            .try_init()
-            .unwrap_err();
-
-        assert_eq!(log::LevelFilter::Debug, log::max_level());
-        return
-    }
-
-    let exe = env::current_exe().unwrap();
-    let out = process::Command::new(exe)
-        .env("YOU_ARE_TESTING_NOW", "1")
-        .env("RUST_LOG", "debug")
-        .output()
-        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
-    if out.status.success() {
-        return
-    }
-
-    println!("test failed: {}", out.status);
-    println!("--- stdout\n{}", str::from_utf8(&out.stdout).unwrap());
-    println!("--- stderr\n{}", str::from_utf8(&out.stderr).unwrap());
-    process::exit(1);
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/log-in-log.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/log-in-log.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/log-in-log.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/log-in-log.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-#[macro_use] extern crate log;
-extern crate env_logger;
-
-use std::process;
-use std::fmt;
-use std::env;
-use std::str;
-
-struct Foo;
-
-impl fmt::Display for Foo {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        info!("test");
-        f.write_str("bar")
-    }
-}
-
-fn main() {
-    env_logger::init();
-    if env::var("YOU_ARE_TESTING_NOW").is_ok() {
-        return info!("{}", Foo);
-    }
-
-    let exe = env::current_exe().unwrap();
-    let out = process::Command::new(exe)
-        .env("YOU_ARE_TESTING_NOW", "1")
-        .env("RUST_LOG", "debug")
-        .output()
-        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
-    if out.status.success() {
-        return
-    }
-
-    println!("test failed: {}", out.status);
-    println!("--- stdout\n{}", str::from_utf8(&out.stdout).unwrap());
-    println!("--- stderr\n{}", str::from_utf8(&out.stderr).unwrap());
-    process::exit(1);
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/regexp_filter.rs firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/regexp_filter.rs
--- firefox-84.0.2+build1/third_party/rust/env_logger-0.6.2/tests/regexp_filter.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/env_logger-0.6.2/tests/regexp_filter.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-#[macro_use] extern crate log;
-extern crate env_logger;
-
-use std::process;
-use std::env;
-use std::str;
-
-fn main() {
-    if env::var("LOG_REGEXP_TEST").ok() == Some(String::from("1")) {
-        child_main();
-    } else {
-        parent_main()
-    }
-}
-
-fn child_main() {
-    env_logger::init();
-    info!("XYZ Message");
-}
-
-fn run_child(rust_log: String) -> bool {
-    let exe = env::current_exe().unwrap();
-    let out = process::Command::new(exe)
-        .env("LOG_REGEXP_TEST", "1")
-        .env("RUST_LOG", rust_log)
-        .output()
-        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
-    str::from_utf8(out.stderr.as_ref()).unwrap().contains("XYZ Message")
-}
-
-fn assert_message_printed(rust_log: &str) {
-    if !run_child(rust_log.to_string()) {
-        panic!("RUST_LOG={} should allow the test log message", rust_log)
-    }
-}
-
-fn assert_message_not_printed(rust_log: &str) {
-    if run_child(rust_log.to_string()) {
-        panic!("RUST_LOG={} should not allow the test log message", rust_log)
-    }
-}
-
-fn parent_main() {
-    // test normal log severity levels
-    assert_message_printed("info");
-    assert_message_not_printed("warn");
-
-    // test of regular expression filters
-    assert_message_printed("info/XYZ");
-    assert_message_not_printed("info/XXX");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/.cargo-checksum.json firefox-85.0+build1/third_party/rust/glean/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/glean/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0cf7769b2e228dbe53b2062492e86c2fe0d49f57f3b55a955708ccfbcf87686f","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"fd9e0ca6907917ea6bec5de05e15dd21d20fae1cb7f3250467bb20231a8e1065","src/configuration.rs":"b8747397761a9cf6dc64150855b75fd8e48dfe9951ce69e25d646b3a6f46456f","src/core_metrics.rs":"e20697e04f707c34c3c7a0cc4e2ed93e638d3028f03eb75a93f53ae722243986","src/dispatcher/global.rs":"7a2cd33616cbb5d86df617c5dcce50a0149c250e4acbfffb6037618cc722065b","src/dispatcher/mod.rs":"202a1de03bbaff76d1c41b8859f0ac409b0b40f426e22c8b4c0d642a07c2ebf5","src/glean_metrics.rs":"a5e1ea9c4dccb81aec4aa584bd76cf47e916c66af4aff4a0ef5aa297ee2d9aa3","src/lib.rs":"e13ee2939efe7e10f8fc2e921ee91f63e541fa322b3bb690f995c86011815a0d","src/net/http_uploader.rs":"9e8c1837ca0d3f6ea165ec936ab054173c4fe95a958710176c33b4d4d1d98beb","src/net/mod.rs":"ae1f5fcba401b0ebc31a078c96624ad03a39fb359aa0d8182beae32733375554","src/pings.rs":"2dfccd84848e1933aa4f6a7a707c58ec794c8f73ef2d93ea4d4df71d4e6abc31","src/private/boolean.rs":"2ead8da55eca0c8738f3c07445b46b1efa706b3e8a1e60428347e9fcb1d1fd3f","src/private/counter.rs":"b7e9f943d25dfb0cb5df797556dec5193606e3ab126e35fc8b6053530618fd0f","src/private/mod.rs":"d084cf3e1a69a6f1c8602ec86338d7161935b3390580875d57f36040a23a066d","src/private/ping.rs":"a837bc63436fb56ca0fac41c9139c72b8580941d7e8014004be353873a28ac77","src/private/recorded_experiment_data.rs":"3450e6abb48fc1ca9c11d42ef209e4d9b87ccbca0baf8893381ce7c62681f833","src/private/string.rs":"585cd5276bd1ea2570153ee72d53191def198b2618fda3aae3f8332af5651fa8","src/system.rs":"ba7b3eac040abe4691d9d287562ddca6d7e92a6d6109c3f0c443b707a100d75a","src/test.rs":"942f36b3ea18c33000f77e2fdd8194212d7685d5449728707bd36b6f2d5e35fd","tests/schema.rs":"b5acf42de034626f2b7e61fec9709a00370ce80ae3b2bab4db9fc79a20ea5f31"},"package":"8f52254ae2baf857eec45b424a0d2dfe6ac63f353b594cfa4bee033f8386b25c"}
\ No newline at end of file
+{"files":{"Cargo.toml":"55bb33b222226dc75b46dde412db46ac1b62aa87054406241828cf634017d8a2","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"fd9e0ca6907917ea6bec5de05e15dd21d20fae1cb7f3250467bb20231a8e1065","src/common_test.rs":"a7c7bfb1215b784ed41a4aebac476b7aeb23631ea5646e642b5673e9067ecd95","src/configuration.rs":"b8747397761a9cf6dc64150855b75fd8e48dfe9951ce69e25d646b3a6f46456f","src/core_metrics.rs":"e20697e04f707c34c3c7a0cc4e2ed93e638d3028f03eb75a93f53ae722243986","src/dispatcher/global.rs":"58591cc7ccf55196fd4d8b8a6a73ed7ac35b5e80534e00e02a012367f3f6d296","src/dispatcher/mod.rs":"e86a10f575364575604b00962755f86a1bcb43b280e00b9505f0e8e14995343d","src/glean_metrics.rs":"a5e1ea9c4dccb81aec4aa584bd76cf47e916c66af4aff4a0ef5aa297ee2d9aa3","src/lib.rs":"d5ad8f4b404a78b685adf8364f352db88d4fe96fd0f0b1a127bec9ff572edcbc","src/net/http_uploader.rs":"9e8c1837ca0d3f6ea165ec936ab054173c4fe95a958710176c33b4d4d1d98beb","src/net/mod.rs":"59db2f4dcfd0a2d77feb63f40cae2252da59fa8a87e10877fcb305eb91aa0645","src/pings.rs":"2dfccd84848e1933aa4f6a7a707c58ec794c8f73ef2d93ea4d4df71d4e6abc31","src/private/boolean.rs":"c6fc72573b5d19748418bcccc42d5f706d820d1e31e35a1aad1202cfc73e16a0","src/private/counter.rs":"104bc1a332306edf3597c627d94bc3024a4239e492e045200b5de0fcb2c0bafa","src/private/custom_distribution.rs":"7c9a56e1beac4bbd80d8acb0463daa240d6e80a424dd2de7c005c6ab355cab91","src/private/datetime.rs":"41ff623d1062ef5a85a8d19fae3d48c88ed8f9b59cf8881524e0f5898324a310","src/private/event.rs":"dfdc5a2aa33d7249fdf1bab162d34b1fd5df6ebe1ea77f617229ba35b393743f","src/private/labeled.rs":"ddc93655ac94e47ccc06a0e96ff8918a9d801c1345b817d5305d319d2da10eb2","src/private/memory_distribution.rs":"fe3c828294c3029af01247230c7aa717aa926db507649707113385ec8923eb23","src/private/mod.rs":"9a9031401285468b98bbafb3a71175bf9950c114aa229ae7634484eac7eb2b12","src/private/ping.rs":"45a78f437543a2c922fd94507446cad8b2ab9955356a87046c2db047d7ae4ae9","src/private/quantity.rs":"db922490b1be80c993bda6e604da8004831ecf20da160847aea49b927aca5bd5","src/private/recorded_experiment_data.rs":"66b2601902a2dc2b7a283717c21ce754de94fcca30d12e0398195c8ad49c90af","src/private/string.rs":"fede1ea64c346e8741af1e3fd8c9259b01bb3726f06bcd24d8b2b0b737dd6706","src/private/string_list.rs":"b4f339bc97a00c505ce56bca706f3d439728a3e349b20f952bddb243155e6d82","src/private/timespan.rs":"c4632c19bf4f357587ed4c1b6cf6d93e695c2f424f0afc4e2b33762b3d3dbbeb","src/private/timing_distribution.rs":"666ecff65d0cc61d21f5d043d982954b1bc284a359ea5cc9f6094d852f43b8e3","src/private/uuid.rs":"5997bb9da63384230e5422bb19e61e954901f44d79e39d6eca0c26444e05c2ca","src/system.rs":"ba7b3eac040abe4691d9d287562ddca6d7e92a6d6109c3f0c443b707a100d75a","src/test.rs":"9441d62ff4e45906908d7b6937c3744212e3cd1cbf214e0f84c14c4e836e830a","tests/common/mod.rs":"4837df2e771929cc077e6fb9a9239645e8e0f7bc6c9f409b71c4d147edf334fc","tests/init_fails.rs":"32614f46e49ec91cd33bc381246b44c22caa19f3eca5c2708589619cd1a99471","tests/never_init.rs":"1f33b8ce7ca3514b57b48cc16d98408974c85cf8aa7d13257ffc2ad878ebb295","tests/no_time_to_init.rs":"af55667ce9a7331d48e6a01815f8f184ae252dfc1aefcd8aeb478100a3726972","tests/schema.rs":"b5acf42de034626f2b7e61fec9709a00370ce80ae3b2bab4db9fc79a20ea5f31","tests/simple.rs":"1c1ec8babd3803a4e117d59c62215acf4bb73b1d9d34278c8882216a2686dbca"},"package":"120a2f092bcf0b8fa0ec864e1a063426638f7084671eddfd138b5571e1e2c6fd"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/Cargo.toml firefox-85.0+build1/third_party/rust/glean/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/glean/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "glean"
-version = "33.4.0"
+version = "33.9.1"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 include = ["/README.md", "/LICENSE", "/src", "/tests", "/Cargo.toml"]
 description = "Glean SDK Rust language bindings"
@@ -21,11 +21,15 @@
 keywords = ["telemetry", "glean"]
 license = "MPL-2.0"
 repository = "https://github.com/mozilla/glean"
+[dependencies.chrono]
+version = "0.4.10"
+features = ["serde"]
+
 [dependencies.crossbeam-channel]
 version = "0.4.3"
 
 [dependencies.glean-core]
-version = "33.4.0"
+version = "33.9.1"
 
 [dependencies.inherent]
 version = "0.1.4"
@@ -45,6 +49,13 @@
 
 [dependencies.thiserror]
 version = "1.0.4"
+
+[dependencies.time]
+version = "0.1.40"
+
+[dependencies.uuid]
+version = "0.8.1"
+features = ["v4"]
 [dev-dependencies.env_logger]
 version = "0.7.1"
 features = ["termcolor", "atty", "humantime"]
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/common_test.rs firefox-85.0+build1/third_party/rust/glean/src/common_test.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/common_test.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/common_test.rs	2021-01-18 19:58:25.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 https://mozilla.org/MPL/2.0/.
+
+use crate::ClientInfoMetrics;
+use crate::Configuration;
+use std::sync::{Mutex, MutexGuard};
+
+use once_cell::sync::Lazy;
+
+pub(crate) const GLOBAL_APPLICATION_ID: &str = "org.mozilla.rlb.test";
+
+// Because Glean uses a global-singleton, we need to run the tests one-by-one to
+// avoid different tests stomping over each other.
+// This is only an issue because we're resetting Glean, this cannot happen in normal
+// use of the RLB.
+//
+// We use a global lock to force synchronization of all tests, even if run multi-threaded.
+// This allows us to run without `--test-threads 1`.`
+pub(crate) fn lock_test() -> MutexGuard<'static, ()> {
+    static GLOBAL_LOCK: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
+
+    // This is going to be called from all the tests: make sure
+    // to enable logging.
+    env_logger::try_init().ok();
+
+    let lock = GLOBAL_LOCK.lock().unwrap();
+
+    lock
+}
+
+// Create a new instance of Glean with a temporary directory.
+// We need to keep the `TempDir` alive, so that it's not deleted before we stop using it.
+pub(crate) fn new_glean(
+    configuration: Option<Configuration>,
+    clear_stores: bool,
+) -> tempfile::TempDir {
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = match configuration {
+        Some(c) => c,
+        None => Configuration {
+            data_path: tmpname,
+            application_id: GLOBAL_APPLICATION_ID.into(),
+            upload_enabled: true,
+            max_events: None,
+            delay_ping_lifetime_io: false,
+            channel: Some("testing".into()),
+            server_endpoint: Some("invalid-test-host".into()),
+            uploader: None,
+        },
+    };
+
+    crate::test_reset_glean(cfg, ClientInfoMetrics::unknown(), clear_stores);
+    dir
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/dispatcher/global.rs firefox-85.0+build1/third_party/rust/glean/src/dispatcher/global.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/dispatcher/global.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/dispatcher/global.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,7 +3,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use once_cell::sync::Lazy;
-use std::{mem, sync::RwLock};
+use std::sync::RwLock;
 
 use super::{DispatchError, DispatchGuard, Dispatcher};
 
@@ -59,13 +59,36 @@
     guard().flush_init()
 }
 
+fn join_dispatcher_thread() -> Result<(), DispatchError> {
+    // After we issue the shutdown command, make sure to wait for the
+    // worker thread to join.
+    let mut lock = GLOBAL_DISPATCHER.write().unwrap();
+    let dispatcher = lock.as_mut().expect("Global dispatcher has gone missing");
+
+    if let Some(worker) = dispatcher.worker.take() {
+        return worker.join().map_err(|_| DispatchError::WorkerPanic);
+    }
+
+    Ok(())
+}
+
+/// Kill the blocked dispatcher without processing the queue.
+///
+/// This will immediately shutdown the worker thread
+/// and no other tasks will be processed.
+/// This only has an effect when the queue is still blocked.
+pub fn kill() -> Result<(), DispatchError> {
+    guard().kill()?;
+    join_dispatcher_thread()
+}
+
 /// Shuts down the dispatch queue.
 ///
 /// This will initiate a shutdown of the worker thread
 /// and no new tasks will be processed after this.
-/// It will not block on the worker thread.
-pub fn try_shutdown() -> Result<(), DispatchError> {
-    guard().shutdown()
+pub fn shutdown() -> Result<(), DispatchError> {
+    guard().shutdown()?;
+    join_dispatcher_thread()
 }
 
 /// TEST ONLY FUNCTION.
@@ -73,18 +96,16 @@
 pub(crate) fn reset_dispatcher() {
     // We don't care about shutdown errors, since they will
     // definitely happen if this
-    let _ = try_shutdown();
+    let _ = shutdown();
 
     // Now that the dispatcher is shut down, replace it.
     // For that we
     // 1. Create a new
     // 2. Replace the global one
-    // 3. Wait for the old one to fully finish
-    // 4. Only then return (and thus release the lock)
+    // 3. Only then return (and thus release the lock)
     let mut lock = GLOBAL_DISPATCHER.write().unwrap();
     let new_dispatcher = Some(Dispatcher::new(GLOBAL_DISPATCHER_LIMIT));
-    let old_dispatcher = mem::replace(&mut *lock, new_dispatcher);
-    old_dispatcher.map(|d| d.join());
+    *lock = new_dispatcher;
 }
 
 #[cfg(test)]
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/dispatcher/mod.rs firefox-85.0+build1/third_party/rust/glean/src/dispatcher/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/dispatcher/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/dispatcher/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -42,6 +42,14 @@
 
 mod global;
 
+/// Command received while blocked from further work.
+enum Blocked {
+    /// Shutdown immediately without processing the queue.
+    Shutdown,
+    /// Unblock and continue with work as normal.
+    Continue,
+}
+
 /// The command a worker should execute.
 enum Command {
     /// A task is a user-defined function to run.
@@ -100,7 +108,7 @@
     queue_preinit: Arc<AtomicBool>,
 
     /// Used to unblock the worker thread initially.
-    block_sender: Sender<()>,
+    block_sender: Sender<Blocked>,
 
     /// Sender for the preinit queue.
     preinit_sender: Sender<Command>,
@@ -146,6 +154,18 @@
             .expect("Failed to receive message on single-use channel");
     }
 
+    fn kill(&mut self) -> Result<(), DispatchError> {
+        // We immediately stop queueing in the pre-init buffer.
+        let old_val = self.queue_preinit.swap(false, Ordering::SeqCst);
+        if !old_val {
+            return Err(DispatchError::AlreadyFlushed);
+        }
+
+        // Unblock the worker thread exactly once.
+        self.block_sender.send(Blocked::Shutdown)?;
+        Ok(())
+    }
+
     fn flush_init(&mut self) -> Result<(), DispatchError> {
         // We immediately stop queueing in the pre-init buffer.
         let old_val = self.queue_preinit.swap(false, Ordering::SeqCst);
@@ -154,7 +174,7 @@
         }
 
         // Unblock the worker thread exactly once.
-        self.block_sender.send(())?;
+        self.block_sender.send(Blocked::Continue)?;
 
         // Single-use channel to communicate with the worker thread.
         let (swap_sender, swap_receiver) = bounded(0);
@@ -193,58 +213,72 @@
     ///
     /// [`flush_init`]: #method.flush_init
     pub fn new(max_queue_size: usize) -> Self {
-        let (block_sender, block_receiver) = bounded(0);
+        let (block_sender, block_receiver) = bounded(1);
         let (preinit_sender, preinit_receiver) = bounded(max_queue_size);
         let (sender, mut unbounded_receiver) = unbounded();
 
         let queue_preinit = Arc::new(AtomicBool::new(true));
 
-        let worker = thread::spawn(move || {
-            if block_receiver.recv().is_err() {
-                // The other side was disconnected.
-                // There's nothing the worker thread can do.
-                log::error!("The task producer was disconnected. Worker thread will exit.");
-                return;
-            }
-
-            let mut receiver = preinit_receiver;
-            loop {
-                use Command::*;
-
-                match receiver.recv() {
-                    Ok(Shutdown) => {
-                        break;
+        let worker = thread::Builder::new()
+            .name("glean.dispatcher".into())
+            .spawn(move || {
+                match block_receiver.recv() {
+                    Err(_) => {
+                        // The other side was disconnected.
+                        // There's nothing the worker thread can do.
+                        log::error!("The task producer was disconnected. Worker thread will exit.");
+                        return;
                     }
-
-                    Ok(Task(f)) => {
-                        (f)();
+                    Ok(Blocked::Shutdown) => {
+                        // The other side wants us to stop immediately
+                        return;
                     }
-
-                    Ok(Swap(swap_done)) => {
-                        // A swap should only occur exactly once.
-                        // This is upheld by `flush_init`, which errors out if the preinit buffer
-                        // was already flushed.
-
-                        // We swap the channels we listen on for new tasks.
-                        // The next iteration will continue with the unbounded queue.
-                        mem::swap(&mut receiver, &mut unbounded_receiver);
-
-                        // The swap command MUST be the last one received on the preinit buffer,
-                        // so by the time we run this we know all preinit tasks were processed.
-                        // We can notify the other side.
-                        swap_done
-                            .send(())
-                            .expect("The caller of `flush_init` has gone missing");
+                    Ok(Blocked::Continue) => {
+                        // Queue is unblocked, processing continues as normal.
                     }
+                }
 
-                    // Other side was disconnected.
-                    Err(_) => {
-                        log::error!("The task producer was disconnected. Worker thread will exit.");
-                        return;
+                let mut receiver = preinit_receiver;
+                loop {
+                    use Command::*;
+
+                    match receiver.recv() {
+                        Ok(Shutdown) => {
+                            break;
+                        }
+
+                        Ok(Task(f)) => {
+                            (f)();
+                        }
+
+                        Ok(Swap(swap_done)) => {
+                            // A swap should only occur exactly once.
+                            // This is upheld by `flush_init`, which errors out if the preinit buffer
+                            // was already flushed.
+
+                            // We swap the channels we listen on for new tasks.
+                            // The next iteration will continue with the unbounded queue.
+                            mem::swap(&mut receiver, &mut unbounded_receiver);
+
+                            // The swap command MUST be the last one received on the preinit buffer,
+                            // so by the time we run this we know all preinit tasks were processed.
+                            // We can notify the other side.
+                            swap_done
+                                .send(())
+                                .expect("The caller of `flush_init` has gone missing");
+                        }
+
+                        // Other side was disconnected.
+                        Err(_) => {
+                            log::error!(
+                                "The task producer was disconnected. Worker thread will exit."
+                            );
+                            return;
+                        }
                     }
                 }
-            }
-        });
+            })
+            .expect("Failed to spawn Glean's dispatcher thread");
 
         let guard = DispatchGuard {
             queue_preinit,
@@ -269,7 +303,7 @@
 
     /// Waits for the worker thread to finish and finishes the dispatch queue.
     ///
-    /// You need to call `try_shutdown` to initiate a shutdown of the queue.
+    /// You need to call `shutdown` to initiate a shutdown of the queue.
     fn join(mut self) -> Result<(), DispatchError> {
         if let Some(worker) = self.worker.take() {
             worker.join().map_err(|_| DispatchError::WorkerPanic)?;
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/lib.rs firefox-85.0+build1/third_party/rust/glean/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,6 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![deny(broken_intra_doc_links)]
 #![deny(missing_docs)]
 
 //! Glean is a modern approach for recording and sending Telemetry data.
@@ -45,7 +46,11 @@
 pub use configuration::Configuration;
 use configuration::DEFAULT_GLEAN_ENDPOINT;
 pub use core_metrics::ClientInfoMetrics;
-pub use glean_core::{global_glean, setup_glean, CommonMetricData, Error, Glean, Lifetime, Result};
+pub use glean_core::{
+    global_glean,
+    metrics::{DistributionData, MemoryUnit, RecordedEvent, TimeUnit},
+    setup_glean, CommonMetricData, Error, ErrorType, Glean, HistogramType, Lifetime, Result,
+};
 use private::RecordedExperimentData;
 
 mod configuration;
@@ -56,6 +61,9 @@
 pub mod private;
 mod system;
 
+#[cfg(test)]
+mod common_test;
+
 const LANGUAGE_BINDING_NAME: &str = "Rust";
 
 /// State to keep track for the Rust Language bindings.
@@ -69,6 +77,9 @@
 
     /// Client info metrics set by the application.
     client_info: ClientInfoMetrics,
+
+    /// An instance of the upload manager
+    upload_manager: net::UploadManager,
 }
 
 /// Set when `glean::initialize()` returns.
@@ -76,6 +87,14 @@
 /// Note: The initialization might still be in progress, as it runs in a separate thread.
 static INITIALIZE_CALLED: AtomicBool = AtomicBool::new(false);
 
+/// Keep track of the debug features before Glean is initialized.
+static PRE_INIT_DEBUG_VIEW_TAG: OnceCell<Mutex<String>> = OnceCell::new();
+static PRE_INIT_LOG_PINGS: AtomicBool = AtomicBool::new(false);
+static PRE_INIT_SOURCE_TAGS: OnceCell<Mutex<Vec<String>>> = OnceCell::new();
+
+/// Keep track of pings registered before Glean is initialized.
+static PRE_INIT_PING_REGISTRATION: OnceCell<Mutex<Vec<private::PingType>>> = OnceCell::new();
+
 /// A global singleton storing additional state for Glean.
 ///
 /// Requires a Mutex, because in tests we can actual reset this.
@@ -114,32 +133,6 @@
     }
 }
 
-/// An instance of the upload manager.
-///
-/// Requires a Mutex, because in tests we can actual reset this.
-static UPLOAD_MANAGER: OnceCell<Mutex<net::UploadManager>> = OnceCell::new();
-
-/// Get a reference to the global upload manager.
-///
-/// Panics if no global state object was set.
-fn get_upload_manager() -> &'static Mutex<net::UploadManager> {
-    UPLOAD_MANAGER.get().unwrap()
-}
-
-/// Set or replace the global upload object.
-fn setup_upload_manager(upload_manager: net::UploadManager) {
-    if UPLOAD_MANAGER.get().is_none() {
-        if UPLOAD_MANAGER.set(Mutex::new(upload_manager)).is_err() {
-            log::error!(
-                "Global upload state object is initialized already. This probably happened concurrently."
-            );
-        }
-    } else {
-        let mut lock = UPLOAD_MANAGER.get().unwrap().lock().unwrap();
-        *lock = upload_manager;
-    }
-}
-
 fn with_glean<F, R>(f: F) -> R
 where
     F: FnOnce(&Glean) -> R,
@@ -160,12 +153,12 @@
 
 /// Creates and initializes a new Glean object.
 ///
-/// See `glean_core::Glean::new` for more information.
+/// See [`glean_core::Glean::new`] for more information.
 ///
 /// # Arguments
 ///
-/// * `cfg` - the `Configuration` options to initialize with.
-/// * `client_info` - the `ClientInfoMetrics` values used to set Glean
+/// * `cfg` - the [`Configuration`] options to initialize with.
+/// * `client_info` - the [`ClientInfoMetrics`] values used to set Glean
 ///   core metrics.
 pub fn initialize(cfg: Configuration, client_info: ClientInfoMetrics) {
     if was_initialize_called() {
@@ -173,123 +166,187 @@
         return;
     }
 
-    std::thread::spawn(move || {
-        let core_cfg = glean_core::Configuration {
-            upload_enabled: cfg.upload_enabled,
-            data_path: cfg.data_path.clone(),
-            application_id: cfg.application_id.clone(),
-            language_binding_name: LANGUAGE_BINDING_NAME.into(),
-            max_events: cfg.max_events,
-            delay_ping_lifetime_io: cfg.delay_ping_lifetime_io,
-        };
-
-        let glean = match Glean::new(core_cfg) {
-            Ok(glean) => glean,
-            Err(err) => {
-                log::error!("Failed to initialize Glean: {}", err);
+    std::thread::Builder::new()
+        .name("glean.init".into())
+        .spawn(move || {
+            let core_cfg = glean_core::Configuration {
+                upload_enabled: cfg.upload_enabled,
+                data_path: cfg.data_path.clone(),
+                application_id: cfg.application_id.clone(),
+                language_binding_name: LANGUAGE_BINDING_NAME.into(),
+                max_events: cfg.max_events,
+                delay_ping_lifetime_io: cfg.delay_ping_lifetime_io,
+            };
+
+            let glean = match Glean::new(core_cfg) {
+                Ok(glean) => glean,
+                Err(err) => {
+                    log::error!("Failed to initialize Glean: {}", err);
+                    return;
+                }
+            };
+
+            // glean-core already takes care of logging errors: other bindings
+            // simply do early returns, as we're doing.
+            if glean_core::setup_glean(glean).is_err() {
                 return;
             }
-        };
 
-        // glean-core already takes care of logging errors: other bindings
-        // simply do early returns, as we're doing.
-        if glean_core::setup_glean(glean).is_err() {
-            return;
-        }
+            log::info!("Glean initialized");
 
-        log::info!("Glean initialized");
+            // Initialize the ping uploader.
+            let upload_manager = net::UploadManager::new(
+                cfg.server_endpoint
+                    .unwrap_or_else(|| DEFAULT_GLEAN_ENDPOINT.to_string()),
+                cfg.uploader
+                    .unwrap_or_else(|| Box::new(net::HttpUploader) as Box<dyn net::PingUploader>),
+            );
 
-        // Now make this the global object available to others.
-        setup_state(RustBindingsState {
-            channel: cfg.channel,
-            client_info,
-        });
+            // Now make this the global object available to others.
+            setup_state(RustBindingsState {
+                channel: cfg.channel,
+                client_info,
+                upload_manager,
+            });
 
-        // Initialize the ping uploader.
-        setup_upload_manager(net::UploadManager::new(
-            cfg.server_endpoint
-                .unwrap_or_else(|| DEFAULT_GLEAN_ENDPOINT.to_string()),
-            cfg.uploader
-                .unwrap_or_else(|| Box::new(net::HttpUploader) as Box<dyn net::PingUploader>),
-        ));
+            let upload_enabled = cfg.upload_enabled;
 
-        let upload_enabled = cfg.upload_enabled;
+            with_glean_mut(|glean| {
+                let state = global_state().lock().unwrap();
 
-        with_glean_mut(|glean| {
-            let state = global_state().lock().unwrap();
+                // The debug view tag might have been set before initialize,
+                // get the cached value and set it.
+                if let Some(tag) = PRE_INIT_DEBUG_VIEW_TAG.get() {
+                    let lock = tag.try_lock();
+                    if let Ok(ref debug_tag) = lock {
+                        glean.set_debug_view_tag(debug_tag);
+                    }
+                }
+                // The log pings debug option might have been set before initialize,
+                // get the cached value and set it.
+                let log_pigs = PRE_INIT_LOG_PINGS.load(Ordering::SeqCst);
+                if log_pigs {
+                    glean.set_log_pings(log_pigs);
+                }
+                // The source tags might have been set before initialize,
+                // get the cached value and set them.
+                if let Some(tags) = PRE_INIT_SOURCE_TAGS.get() {
+                    let lock = tags.try_lock();
+                    if let Ok(ref source_tags) = lock {
+                        glean.set_source_tags(source_tags.to_vec());
+                    }
+                }
 
-            // Get the current value of the dirty flag so we know whether to
-            // send a dirty startup baseline ping below.  Immediately set it to
-            // `false` so that dirty startup pings won't be sent if Glean
-            // initialization does not complete successfully.
-            // TODO Bug 1672956 will decide where to set this flag again.
-            let dirty_flag = glean.is_dirty_flag_set();
-            glean.set_dirty_flag(false);
-
-            // Register builtin pings.
-            // Unfortunately we need to manually list them here to guarantee
-            // they are registered synchronously before we need them.
-            // We don't need to handle the deletion-request ping. It's never touched
-            // from the language implementation.
-            glean.register_ping_type(&glean_metrics::pings::baseline.ping_type);
-            glean.register_ping_type(&glean_metrics::pings::metrics.ping_type);
-            glean.register_ping_type(&glean_metrics::pings::events.ping_type);
-
-            // TODO: perform registration of pings that were attempted to be
-            // registered before init. See bug 1673850.
-
-            // If this is the first time ever the Glean SDK runs, make sure to set
-            // some initial core metrics in case we need to generate early pings.
-            // The next times we start, we would have them around already.
-            let is_first_run = glean.is_first_run();
-            if is_first_run {
-                initialize_core_metrics(&glean, &state.client_info, state.channel.clone());
-            }
+                // Get the current value of the dirty flag so we know whether to
+                // send a dirty startup baseline ping below.  Immediately set it to
+                // `false` so that dirty startup pings won't be sent if Glean
+                // initialization does not complete successfully.
+                // TODO Bug 1672956 will decide where to set this flag again.
+                let dirty_flag = glean.is_dirty_flag_set();
+                glean.set_dirty_flag(false);
+
+                // Register builtin pings.
+                // Unfortunately we need to manually list them here to guarantee
+                // they are registered synchronously before we need them.
+                // We don't need to handle the deletion-request ping. It's never touched
+                // from the language implementation.
+                glean.register_ping_type(&glean_metrics::pings::baseline.ping_type);
+                glean.register_ping_type(&glean_metrics::pings::metrics.ping_type);
+                glean.register_ping_type(&glean_metrics::pings::events.ping_type);
+
+                // Perform registration of pings that were attempted to be
+                // registered before init.
+                if let Some(tags) = PRE_INIT_PING_REGISTRATION.get() {
+                    let lock = tags.try_lock();
+                    if let Ok(pings) = lock {
+                        for ping in &*pings {
+                            glean.register_ping_type(&ping.ping_type);
+                        }
+                    }
+                }
 
-            // Deal with any pending events so we can start recording new ones
-            let pings_submitted = glean.on_ready_to_submit_pings();
+                // If this is the first time ever the Glean SDK runs, make sure to set
+                // some initial core metrics in case we need to generate early pings.
+                // The next times we start, we would have them around already.
+                let is_first_run = glean.is_first_run();
+                if is_first_run {
+                    initialize_core_metrics(&glean, &state.client_info, state.channel.clone());
+                }
 
-            // We need to kick off upload in these cases:
-            // 1. Pings were submitted through Glean and it is ready to upload those pings;
-            // 2. Upload is disabled, to upload a possible deletion-request ping.
-            if pings_submitted || !upload_enabled {
-                let uploader = get_upload_manager().lock().unwrap();
-                uploader.trigger_upload();
-            }
+                // Deal with any pending events so we can start recording new ones
+                let pings_submitted = glean.on_ready_to_submit_pings();
 
-            // Set up information and scheduling for Glean owned pings. Ideally, the "metrics"
-            // ping startup check should be performed before any other ping, since it relies
-            // on being dispatched to the API context before any other metric.
-            // TODO: start the metrics ping scheduler, will happen in bug 1672951.
-
-            // Check if the "dirty flag" is set. That means the product was probably
-            // force-closed. If that's the case, submit a 'baseline' ping with the
-            // reason "dirty_startup". We only do that from the second run.
-            if !is_first_run && dirty_flag {
-                // TODO: bug 1672956 - submit_ping_by_name_sync("baseline", "dirty_startup");
-            }
+                // We need to kick off upload in these cases:
+                // 1. Pings were submitted through Glean and it is ready to upload those pings;
+                // 2. Upload is disabled, to upload a possible deletion-request ping.
+                if pings_submitted || !upload_enabled {
+                    state.upload_manager.trigger_upload();
+                }
 
-            // From the second time we run, after all startup pings are generated,
-            // make sure to clear `lifetime: application` metrics and set them again.
-            // Any new value will be sent in newly generated pings after startup.
-            if !is_first_run {
-                glean.clear_application_lifetime_metrics();
-                initialize_core_metrics(&glean, &state.client_info, state.channel.clone());
-            }
-        });
+                // Set up information and scheduling for Glean owned pings. Ideally, the "metrics"
+                // ping startup check should be performed before any other ping, since it relies
+                // on being dispatched to the API context before any other metric.
+                // TODO: start the metrics ping scheduler, will happen in bug 1672951.
+
+                // Check if the "dirty flag" is set. That means the product was probably
+                // force-closed. If that's the case, submit a 'baseline' ping with the
+                // reason "dirty_startup". We only do that from the second run.
+                if !is_first_run && dirty_flag {
+                    // TODO: bug 1672956 - submit_ping_by_name_sync("baseline", "dirty_startup");
+                }
 
-        // Signal Dispatcher that init is complete
-        if let Err(err) = dispatcher::flush_init() {
-            log::error!("Unable to flush the preinit queue: {}", err);
-        }
-    });
+                // From the second time we run, after all startup pings are generated,
+                // make sure to clear `lifetime: application` metrics and set them again.
+                // Any new value will be sent in newly generated pings after startup.
+                if !is_first_run {
+                    glean.clear_application_lifetime_metrics();
+                    initialize_core_metrics(&glean, &state.client_info, state.channel.clone());
+                }
+            });
+
+            // Signal Dispatcher that init is complete
+            if let Err(err) = dispatcher::flush_init() {
+                log::error!("Unable to flush the preinit queue: {}", err);
+            }
+        })
+        .expect("Failed to spawn Glean's init thread");
 
     // Mark the initialization as called: this needs to happen outside of the
     // dispatched block!
     INITIALIZE_CALLED.store(true, Ordering::SeqCst);
 }
 
-/// Checks if `glean::initialize` was ever called.
+/// Shuts down Glean.
+///
+/// This currently only attempts to shut down the
+/// internal dispatcher.
+pub fn shutdown() {
+    if global_glean().is_none() {
+        log::warn!("Shutdown called before Glean is initialized");
+        if let Err(e) = dispatcher::kill() {
+            log::error!("Can't kill dispatcher thread: {:?}", e);
+        }
+
+        return;
+    }
+
+    if let Err(e) = dispatcher::shutdown() {
+        log::error!("Can't shutdown dispatcher thread: {:?}", e);
+    }
+}
+
+/// Block on the dispatcher emptying.
+///
+/// This will panic if called before Glean is initialized.
+fn block_on_dispatcher() {
+    assert!(
+        was_initialize_called(),
+        "initialize was never called. Can't block on the dispatcher queue."
+    );
+    dispatcher::block_on_queue()
+}
+
+/// Checks if [`initialize`] was ever called.
 ///
 /// # Returns
 ///
@@ -326,7 +383,7 @@
 
 /// Sets whether upload is enabled or not.
 ///
-/// See `glean_core::Glean.set_upload_enabled`.
+/// See [`glean_core::Glean::set_upload_enabled`].
 pub fn set_upload_enabled(enabled: bool) {
     if !was_initialize_called() {
         let msg =
@@ -361,14 +418,13 @@
             if old_enabled && !enabled {
                 // If uploading is disabled, we need to send the deletion-request ping:
                 // note that glean-core takes care of generating it.
-                let uploader = get_upload_manager().lock().unwrap();
-                uploader.trigger_upload();
+                state.upload_manager.trigger_upload();
             }
         });
     });
 }
 
-/// Register a new [`PingType`](metrics/struct.PingType.html).
+/// Register a new [`PingType`](private::PingType).
 pub fn register_ping_type(ping: &private::PingType) {
     // If this happens after Glean.initialize is called (and returns),
     // we dispatch ping registration on the thread pool.
@@ -381,19 +437,30 @@
                 glean.register_ping_type(&ping.ping_type);
             })
         })
+    } else {
+        // We need to keep track of pings, so they get re-registered after a reset or
+        // if ping registration is attempted before Glean initializes.
+        // This state is kept across Glean resets, which should only ever happen in test mode.
+        // It's a set and keeping them around forever should not have much of an impact.
+        let m = PRE_INIT_PING_REGISTRATION.get_or_init(Default::default);
+        let mut lock = m.lock().unwrap();
+        lock.push(ping.clone());
     }
 }
 
 /// Collects and submits a ping for eventual uploading.
 ///
-/// See `glean_core::Glean.submit_ping`.
-pub fn submit_ping(ping: &private::PingType, reason: Option<&str>) {
+/// See [`glean_core::Glean.submit_ping`].
+pub(crate) fn submit_ping(ping: &private::PingType, reason: Option<&str>) {
     submit_ping_by_name(&ping.name, reason)
 }
 
 /// Collects and submits a ping for eventual uploading by name.
 ///
-/// See `glean_core::Glean.submit_ping_by_name`.
+/// Note that this needs to be public in order for RLB consumers to
+/// use Glean debugging facilities.
+///
+/// See [`glean_core::Glean.submit_ping_by_name`].
 pub fn submit_ping_by_name(ping: &str, reason: Option<&str>) {
     let ping = ping.to_string();
     let reason = reason.map(|s| s.to_string());
@@ -404,7 +471,7 @@
 
 /// Collect and submit a ping (by its name) for eventual upload, synchronously.
 ///
-/// The ping will be looked up in the known instances of `private::PingType`. If the
+/// The ping will be looked up in the known instances of [`private::PingType`]. If the
 /// ping isn't known, an error is logged and the ping isn't queued for uploading.
 ///
 /// The ping content is assembled as soon as possible, but upload is not
@@ -415,7 +482,7 @@
 /// queued for sending, unless explicitly specified otherwise in the registry
 /// file.
 ///
-/// ## Arguments
+/// # Arguments
 ///
 /// * `ping_name` - the name of the ping to submit.
 /// * `reason` - the reason the ping is being submitted.
@@ -438,8 +505,8 @@
     });
 
     if let Some(true) = submitted_ping {
-        let uploader = get_upload_manager().lock().unwrap();
-        uploader.trigger_upload();
+        let state = global_state().lock().unwrap();
+        state.upload_manager.trigger_upload();
     }
 }
 
@@ -477,16 +544,16 @@
 /// Checks if an experiment is currently active.
 #[allow(dead_code)]
 pub(crate) fn test_is_experiment_active(experiment_id: String) -> bool {
-    dispatcher::block_on_queue();
+    block_on_dispatcher();
     with_glean(|glean| glean.test_is_experiment_active(experiment_id.to_owned()))
 }
 
 /// TEST ONLY FUNCTION.
-/// Returns the `RecordedExperimentData` for the given `experiment_id` or panics if
+/// Returns the [`RecordedExperimentData`] for the given `experiment_id` or panics if
 /// the id isn't found.
 #[allow(dead_code)]
 pub(crate) fn test_get_experiment_data(experiment_id: String) -> RecordedExperimentData {
-    dispatcher::block_on_queue();
+    block_on_dispatcher();
     with_glean(|glean| {
         let json_data = glean
             .test_get_experiment_data_as_json(experiment_id.to_owned())
@@ -496,7 +563,6 @@
 }
 
 /// Destroy the global Glean state.
-#[cfg(test)]
 pub(crate) fn destroy_glean(clear_stores: bool) {
     // Destroy the existing glean instance from glean-core.
     if was_initialize_called() {
@@ -519,10 +585,9 @@
     }
 }
 
+/// TEST ONLY FUNCTION.
 /// Resets the Glean state and triggers init again.
-#[cfg(test)]
-#[allow(dead_code)]
-pub(crate) fn reset_glean(cfg: Configuration, client_info: ClientInfoMetrics, clear_stores: bool) {
+pub fn test_reset_glean(cfg: Configuration, client_info: ClientInfoMetrics, clear_stores: bool) {
     destroy_glean(clear_stores);
 
     // Always log pings for tests
@@ -530,5 +595,76 @@
     initialize(cfg, client_info);
 }
 
+/// Sets a debug view tag.
+///
+/// When the debug view tag is set, pings are sent with a `X-Debug-ID` header with the
+/// value of the tag and are sent to the ["Ping Debug Viewer"](https://mozilla.github.io/glean/book/dev/core/internal/debug-pings.html).
+///
+/// # Arguments
+///
+/// * `tag` - A valid HTTP header value. Must match the regex: "[a-zA-Z0-9-]{1,20}".
+///
+/// # Returns
+///
+/// This will return `false` in case `tag` is not a valid tag and `true` otherwise.
+/// If called before Glean is initialized it will always return `true`.
+pub fn set_debug_view_tag(tag: &str) -> bool {
+    if was_initialize_called() {
+        with_glean_mut(|glean| glean.set_debug_view_tag(tag))
+    } else {
+        // Glean has not been initialized yet. Cache the provided tag value.
+        let m = PRE_INIT_DEBUG_VIEW_TAG.get_or_init(Default::default);
+        let mut lock = m.lock().unwrap();
+        *lock = tag.to_string();
+        // When setting the debug view tag before initialization,
+        // we don't validate the tag, thus this function always returns true.
+        true
+    }
+}
+
+/// Sets the log pings debug option.
+///
+/// When the log pings debug option is `true`,
+/// we log the payload of all succesfully assembled pings.
+///
+/// # Arguments
+///
+/// * `value` - The value of the log pings option
+pub fn set_log_pings(value: bool) {
+    if was_initialize_called() {
+        with_glean_mut(|glean| glean.set_log_pings(value));
+    } else {
+        PRE_INIT_LOG_PINGS.store(value, Ordering::SeqCst);
+    }
+}
+
+/// Sets source tags.
+///
+/// Overrides any existing source tags.
+/// Source tags will show in the destination datasets, after ingestion.
+///
+/// # Arguments
+///
+/// * `tags` - A vector of at most 5 valid HTTP header values. Individual
+///   tags must match the regex: "[a-zA-Z0-9-]{1,20}".
+///
+/// # Returns
+///
+/// This will return `false` in case `value` contains invalid tags and `true`
+/// otherwise or if the tag is set before Glean is initialized.
+pub fn set_source_tags(tags: Vec<String>) -> bool {
+    if was_initialize_called() {
+        with_glean_mut(|glean| glean.set_source_tags(tags))
+    } else {
+        // Glean has not been initialized yet. Cache the provided source tags.
+        let m = PRE_INIT_SOURCE_TAGS.get_or_init(Default::default);
+        let mut lock = m.lock().unwrap();
+        *lock = tags;
+        // When setting the source tags before initialization,
+        // we don't validate the tags, thus this function always returns true.
+        true
+    }
+}
+
 #[cfg(test)]
 mod test;
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/net/mod.rs firefox-85.0+build1/third_party/rust/glean/src/net/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/net/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/net/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -22,9 +22,6 @@
 
 mod http_uploader;
 
-/// The duration the uploader thread should sleep, when told to by glean-core.
-const THROTTLE_BACKOFF_TIME: Duration = Duration::from_secs(60);
-
 /// A description of a component used to upload pings.
 pub trait PingUploader: std::fmt::Debug + Send + Sync {
     /// Uploads a ping to a server.
@@ -39,11 +36,13 @@
 }
 
 /// The logic for uploading pings: this leaves the actual upload mechanism as
-/// a detail of the user-provided object implementing `PingUploader`.
+/// a detail of the user-provided object implementing [`PingUploader`].
+#[derive(Debug)]
 pub(crate) struct UploadManager {
     inner: Arc<Inner>,
 }
 
+#[derive(Debug)]
 struct Inner {
     server_endpoint: String,
     uploader: Box<dyn PingUploader + 'static>,
@@ -79,33 +78,37 @@
 
         let inner = Arc::clone(&self.inner);
 
-        thread::spawn(move || {
-            // Mark the uploader as running.
-            inner.thread_running.store(true, Ordering::SeqCst);
-
-            loop {
-                let incoming_task = with_glean(|glean| glean.get_upload_task());
-
-                match incoming_task {
-                    PingUploadTask::Upload(request) => {
-                        let doc_id = request.document_id.clone();
-                        let upload_url = format!("{}{}", inner.server_endpoint, request.path);
-                        let headers: Vec<(String, String)> = request.headers.into_iter().collect();
-                        let result = inner.uploader.upload(upload_url, request.body, headers);
-                        // Process the upload response.
-                        with_glean(|glean| glean.process_ping_upload_response(&doc_id, result));
-                    }
-                    PingUploadTask::Wait => {
-                        thread::sleep(THROTTLE_BACKOFF_TIME);
-                    }
-                    PingUploadTask::Done => {
-                        // Nothing to do here, break out of the loop and clear the
-                        // running flag.
-                        inner.thread_running.store(false, Ordering::SeqCst);
-                        return;
+        thread::Builder::new()
+            .name("glean.upload".into())
+            .spawn(move || {
+                // Mark the uploader as running.
+                inner.thread_running.store(true, Ordering::SeqCst);
+
+                loop {
+                    let incoming_task = with_glean(|glean| glean.get_upload_task());
+
+                    match incoming_task {
+                        PingUploadTask::Upload(request) => {
+                            let doc_id = request.document_id.clone();
+                            let upload_url = format!("{}{}", inner.server_endpoint, request.path);
+                            let headers: Vec<(String, String)> =
+                                request.headers.into_iter().collect();
+                            let result = inner.uploader.upload(upload_url, request.body, headers);
+                            // Process the upload response.
+                            with_glean(|glean| glean.process_ping_upload_response(&doc_id, result));
+                        }
+                        PingUploadTask::Wait(time) => {
+                            thread::sleep(Duration::from_millis(time));
+                        }
+                        PingUploadTask::Done => {
+                            // Nothing to do here, break out of the loop and clear the
+                            // running flag.
+                            inner.thread_running.store(false, Ordering::SeqCst);
+                            return;
+                        }
                     }
                 }
-            }
-        });
+            })
+            .expect("Failed to spawn Glean's uploader thread");
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/boolean.rs firefox-85.0+build1/third_party/rust/glean/src/private/boolean.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/boolean.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/boolean.rs	2021-01-18 19:58:25.000000000 +0000
@@ -31,28 +31,13 @@
 
 #[inherent(pub)]
 impl glean_core::traits::Boolean for BooleanMetric {
-    /// Sets to the specified boolean value.
-    ///
-    /// # Arguments
-    ///
-    /// * `value` - the value to set.
     fn set(&self, value: bool) {
         let metric = Arc::clone(&self.0);
         dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, value)));
     }
 
-    /// **Exported for test purposes.**
-    ///
-    /// Gets the currently stored value as a boolean.
-    ///
-    /// This doesn't clear the stored value.
-    ///
-    /// # Arguments
-    ///
-    /// * `ping_name` - represents the optional name of the ping to retrieve the
-    ///   metric for. Defaults to the first value in `send_in_pings`.
     fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<bool> {
-        dispatcher::block_on_queue();
+        crate::block_on_dispatcher();
 
         let queried_ping_name = match ping_name.into() {
             Some(name) => name,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/counter.rs firefox-85.0+build1/third_party/rust/glean/src/private/counter.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/counter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/counter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -32,32 +32,13 @@
 
 #[inherent(pub)]
 impl glean_core::traits::Counter for CounterMetric {
-    /// Increases the counter by `amount`.
-    ///
-    /// # Arguments
-    ///
-    /// * `amount` - The amount to increase by. Should be positive.
-    ///
-    /// ## Notes
-    ///
-    /// Logs an error if the `amount` is 0 or negative.
     fn add(&self, amount: i32) {
         let metric = Arc::clone(&self.0);
         dispatcher::launch(move || crate::with_glean(|glean| metric.add(glean, amount)));
     }
 
-    /// **Exported for test purposes.**
-    ///
-    /// Gets the currently stored value as an integer.
-    ///
-    /// This doesn't clear the stored value.
-    ///
-    /// # Arguments
-    ///
-    /// * `ping_name` - represents the optional name of the ping to retrieve the
-    ///   metric for. Defaults to the first value in `send_in_pings`.
     fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<i32> {
-        dispatcher::block_on_queue();
+        crate::block_on_dispatcher();
 
         let queried_ping_name = ping_name
             .into()
@@ -66,24 +47,13 @@
         crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
     }
 
-    /// **Exported for test purposes.**
-    ///
-    /// Gets the number of recorded errors for the given metric and error type.
-    ///
-    /// # Arguments
-    ///
-    /// * `error` - The type of error
-    /// * `ping_name` - represents the optional name of the ping to retrieve the
-    ///   metric for. Defaults to the first value in `send_in_pings`.
-    ///
-    /// # Returns
-    ///
-    /// The number of errors reported.
     fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
         error: ErrorType,
         ping_name: S,
     ) -> i32 {
+        crate::block_on_dispatcher();
+
         crate::with_glean_mut(|glean| {
             glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
                 .unwrap_or(0)
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/custom_distribution.rs firefox-85.0+build1/third_party/rust/glean/src/private/custom_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/custom_distribution.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/custom_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,81 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::{DistributionData, MetricType};
+use glean_core::{CommonMetricData, ErrorType, HistogramType};
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer-facing API for recording custom distribution metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct CustomDistributionMetric(pub(crate) Arc<glean_core::metrics::CustomDistributionMetric>);
+
+impl CustomDistributionMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(
+        meta: CommonMetricData,
+        range_min: u64,
+        range_max: u64,
+        bucket_count: u64,
+        histogram_type: HistogramType,
+    ) -> Self {
+        Self(Arc::new(
+            glean_core::metrics::CustomDistributionMetric::new(
+                meta,
+                range_min,
+                range_max,
+                bucket_count,
+                histogram_type,
+            ),
+        ))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::CustomDistribution for CustomDistributionMetric {
+    fn accumulate_samples_signed(&self, samples: Vec<i64>) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || {
+            crate::with_glean(|glean| metric.accumulate_samples_signed(glean, samples))
+        });
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<DistributionData> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/datetime.rs firefox-85.0+build1/third_party/rust/glean/src/private/datetime.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/datetime.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/datetime.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,103 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::MetricType;
+pub use glean_core::metrics::{Datetime, TimeUnit};
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer facing API for recording Datetime metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct DatetimeMetric(pub(crate) Arc<glean_core::metrics::DatetimeMetric>);
+
+impl DatetimeMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData, time_unit: TimeUnit) -> Self {
+        Self(Arc::new(glean_core::metrics::DatetimeMetric::new(
+            meta, time_unit,
+        )))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::Datetime for DatetimeMetric {
+    fn set(&self, value: Option<Datetime>) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, value)));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<Datetime> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::common_test::{lock_test, new_glean};
+    use crate::CommonMetricData;
+    use chrono::prelude::*;
+
+    #[test]
+    fn datetime_convenient_api() {
+        let _lock = lock_test();
+        let _t = new_glean(None, true);
+
+        let metric: DatetimeMetric = DatetimeMetric::new(
+            CommonMetricData {
+                name: "datetime".into(),
+                category: "test".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            TimeUnit::Day,
+        );
+
+        // Record a date: it will get truncated to Day resolution.
+        let sample_date = FixedOffset::east(0).ymd(2018, 2, 25).and_hms(11, 5, 0);
+        metric.set(Some(sample_date));
+
+        // Check that the value has the correct resolution.
+        let date = metric.test_get_value(None).unwrap();
+        assert_eq!(date, FixedOffset::east(0).ymd(2018, 2, 25).and_hms(0, 0, 0));
+
+        // Ensure no error was recorded.
+        assert_eq!(
+            metric.test_get_num_recorded_errors(ErrorType::InvalidValue, None),
+            0
+        )
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/event.rs firefox-85.0+build1/third_party/rust/glean/src/private/event.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/event.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/event.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,173 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::{collections::HashMap, marker::PhantomData, sync::Arc};
+
+use glean_core::metrics::MetricType;
+use glean_core::traits;
+
+use crate::{dispatcher, ErrorType, RecordedEvent};
+
+pub use glean_core::traits::NoExtraKeys;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer facing API for recording event metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct EventMetric<K> {
+    pub(crate) inner: Arc<glean_core::metrics::EventMetric>,
+    extra_keys: PhantomData<K>,
+}
+
+impl<K: traits::ExtraKeys> EventMetric<K> {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData) -> Self {
+        let allowed_extra_keys = K::ALLOWED_KEYS.iter().map(|s| s.to_string()).collect();
+        let inner = Arc::new(glean_core::metrics::EventMetric::new(
+            meta,
+            allowed_extra_keys,
+        ));
+        Self {
+            inner,
+            extra_keys: PhantomData,
+        }
+    }
+}
+
+#[inherent(pub)]
+impl<K: traits::ExtraKeys> traits::Event for EventMetric<K> {
+    type Extra = K;
+
+    fn record<M: Into<Option<HashMap<<Self as traits::Event>::Extra, String>>>>(&self, extra: M) {
+        const NANOS_PER_MILLI: u64 = 1_000_000;
+        let now = time::precise_time_ns() / NANOS_PER_MILLI;
+
+        // Translate from [ExtraKey -> String] to a [Int -> String] map
+        let extra = extra
+            .into()
+            .map(|h| h.into_iter().map(|(k, v)| (k.index(), v)).collect());
+        let metric = Arc::clone(&self.inner);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.record(glean, now, extra)));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<Vec<RecordedEvent>> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.inner.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.inner.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(
+                &glean,
+                self.inner.meta(),
+                error,
+                ping_name.into(),
+            )
+            .unwrap_or(0)
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::common_test::{lock_test, new_glean};
+    use crate::CommonMetricData;
+
+    #[test]
+    fn no_extra_keys() {
+        let _lock = lock_test();
+        let _t = new_glean(None, true);
+
+        let metric: EventMetric<NoExtraKeys> = EventMetric::new(CommonMetricData {
+            name: "event".into(),
+            category: "test".into(),
+            send_in_pings: vec!["test1".into()],
+            ..Default::default()
+        });
+
+        metric.record(None);
+        metric.record(None);
+
+        let data = metric.test_get_value(None).expect("no event recorded");
+        assert_eq!(2, data.len());
+        assert!(data[0].timestamp <= data[1].timestamp);
+    }
+
+    #[test]
+    fn with_extra_keys() {
+        let _lock = lock_test();
+        let _t = new_glean(None, true);
+
+        #[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
+        enum SomeExtra {
+            Key1,
+            Key2,
+        }
+
+        impl glean_core::traits::ExtraKeys for SomeExtra {
+            const ALLOWED_KEYS: &'static [&'static str] = &["key1", "key2"];
+
+            fn index(self) -> i32 {
+                self as i32
+            }
+        }
+
+        let metric: EventMetric<SomeExtra> = EventMetric::new(CommonMetricData {
+            name: "event".into(),
+            category: "test".into(),
+            send_in_pings: vec!["test1".into()],
+            ..Default::default()
+        });
+
+        let mut map1 = HashMap::new();
+        map1.insert(SomeExtra::Key1, "1".into());
+        metric.record(map1);
+
+        let mut map2 = HashMap::new();
+        map2.insert(SomeExtra::Key1, "1".into());
+        map2.insert(SomeExtra::Key2, "2".into());
+        metric.record(map2);
+
+        metric.record(None);
+
+        let data = metric.test_get_value(None).expect("no event recorded");
+        assert_eq!(3, data.len());
+        assert!(data[0].timestamp <= data[1].timestamp);
+        assert!(data[1].timestamp <= data[2].timestamp);
+
+        let mut map = HashMap::new();
+        map.insert("key1".into(), "1".into());
+        assert_eq!(Some(map), data[0].extra);
+
+        let mut map = HashMap::new();
+        map.insert("key1".into(), "1".into());
+        map.insert("key2".into(), "2".into());
+        assert_eq!(Some(map), data[1].extra);
+
+        assert_eq!(None, data[2].extra);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/labeled.rs firefox-85.0+build1/third_party/rust/glean/src/private/labeled.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/labeled.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/labeled.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,355 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::MetricType;
+use glean_core::ErrorType;
+
+/// Sealed traits protect against downstream implementations.
+///
+/// We wrap it in a private module that is inaccessible outside of this module.
+mod private {
+    use crate::{
+        private::BooleanMetric, private::CounterMetric, private::StringMetric, CommonMetricData,
+    };
+    use std::sync::Arc;
+
+    /// The sealed labeled trait.
+    ///
+    /// This also allows us to hide methods, that are only used internally
+    /// and should not be visible to users of the object implementing the
+    /// `Labeled<T>` trait.
+    pub trait Sealed {
+        /// The `glean_core` metric type representing the labeled metric.
+        type Inner: glean_core::metrics::MetricType + Clone;
+
+        /// Create a new metric object implementing this trait from the inner type.
+        fn from_inner(metric: Self::Inner) -> Self;
+
+        /// Create a new `glean_core` metric from the metadata.
+        fn new_inner(meta: crate::CommonMetricData) -> Self::Inner;
+    }
+
+    // `LabeledMetric<BooleanMetric>` is possible.
+    //
+    // See [Labeled Booleans](https://mozilla.github.io/glean/book/user/metrics/labeled_booleans.html).
+    impl Sealed for BooleanMetric {
+        type Inner = glean_core::metrics::BooleanMetric;
+
+        fn from_inner(metric: Self::Inner) -> Self {
+            BooleanMetric(Arc::new(metric))
+        }
+
+        fn new_inner(meta: CommonMetricData) -> Self::Inner {
+            glean_core::metrics::BooleanMetric::new(meta)
+        }
+    }
+
+    // `LabeledMetric<StringMetric>` is possible.
+    //
+    // See [Labeled Strings](https://mozilla.github.io/glean/book/user/metrics/labeled_strings.html).
+    impl Sealed for StringMetric {
+        type Inner = glean_core::metrics::StringMetric;
+
+        fn from_inner(metric: Self::Inner) -> Self {
+            StringMetric(Arc::new(metric))
+        }
+
+        fn new_inner(meta: CommonMetricData) -> Self::Inner {
+            glean_core::metrics::StringMetric::new(meta)
+        }
+    }
+
+    // `LabeledMetric<CounterMetric>` is possible.
+    //
+    // See [Labeled Counters](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html).
+    impl Sealed for CounterMetric {
+        type Inner = glean_core::metrics::CounterMetric;
+
+        fn from_inner(metric: Self::Inner) -> Self {
+            CounterMetric(Arc::new(metric))
+        }
+
+        fn new_inner(meta: CommonMetricData) -> Self::Inner {
+            glean_core::metrics::CounterMetric::new(meta)
+        }
+    }
+}
+
+/// Marker trait for metrics that can be nested inside a labeled metric.
+///
+/// This trait is sealed and cannot be implemented for types outside this crate.
+pub trait AllowLabeled: private::Sealed {}
+
+// Implement the trait for everything we marked as allowed.
+impl<T> AllowLabeled for T where T: private::Sealed {}
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the specific facing API for recording labeled metrics.
+///
+/// Instances of this type are automatically generated by the parser
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+/// Unlike most metric types, [`LabeledMetric`] does not have its own corresponding
+/// storage, but records metrics for the underlying metric type `T` in the storage
+/// for that type.
+#[derive(Clone)]
+pub struct LabeledMetric<T: AllowLabeled>(
+    pub(crate) Arc<glean_core::metrics::LabeledMetric<T::Inner>>,
+);
+
+impl<T> LabeledMetric<T>
+where
+    T: AllowLabeled,
+{
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData, labels: Option<Vec<String>>) -> Self {
+        let submetric = T::new_inner(meta);
+        let core = glean_core::metrics::LabeledMetric::new(submetric, labels);
+        Self(Arc::new(core))
+    }
+}
+
+#[inherent(pub)]
+impl<T> glean_core::traits::Labeled<T> for LabeledMetric<T>
+where
+    T: AllowLabeled + Clone,
+{
+    fn get(&self, label: &str) -> T {
+        let inner = self.0.get(label);
+        T::from_inner(inner)
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(
+                &glean,
+                self.0.get_submetric().meta(),
+                error,
+                ping_name.into(),
+            )
+            .unwrap_or(0)
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::ErrorType;
+    use crate::common_test::{lock_test, new_glean};
+    use crate::destroy_glean;
+    use crate::private::{BooleanMetric, CounterMetric, LabeledMetric, StringMetric};
+    use crate::CommonMetricData;
+
+    #[test]
+    fn test_labeled_counter_type() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<CounterMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_counter".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        metric.get("label1").add(1);
+        metric.get("label2").add(2);
+        assert_eq!(1, metric.get("label1").test_get_value("test1").unwrap());
+        assert_eq!(2, metric.get("label2").test_get_value("test1").unwrap());
+    }
+
+    #[test]
+    fn test_other_label_with_predefined_labels() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<CounterMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_counter".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            Some(vec!["foo".into(), "bar".into(), "baz".into()]),
+        );
+
+        metric.get("foo").add(1);
+        metric.get("foo").add(2);
+        metric.get("bar").add(1);
+        metric.get("not_there").add(1);
+        metric.get("also_not_there").add(1);
+        metric.get("not_me").add(1);
+
+        assert_eq!(3, metric.get("foo").test_get_value(None).unwrap());
+        assert_eq!(1, metric.get("bar").test_get_value(None).unwrap());
+        assert!(metric.get("baz").test_get_value(None).is_none());
+        // The rest all lands in the __other__ bucket.
+        assert_eq!(3, metric.get("__other__").test_get_value(None).unwrap());
+    }
+
+    #[test]
+    fn test_other_label_without_predefined_labels() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<CounterMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_counter".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        // Record in 20 labels: it will go over the maximum number of supported
+        // dynamic labels.
+        for i in 0..=20 {
+            metric.get(format!("label_{}", i).as_str()).add(1);
+        }
+        // Record in a label once again.
+        metric.get("label_0").add(1);
+
+        assert_eq!(2, metric.get("label_0").test_get_value(None).unwrap());
+        for i in 1..15 {
+            assert_eq!(
+                1,
+                metric
+                    .get(format!("label_{}", i).as_str())
+                    .test_get_value(None)
+                    .unwrap()
+            );
+        }
+        assert_eq!(5, metric.get("__other__").test_get_value(None).unwrap());
+    }
+
+    #[test]
+    fn test_other_label_without_predefined_labels_before_glean_init() {
+        let _lock = lock_test();
+
+        // We explicitly want Glean to not be initialized.
+        destroy_glean(true);
+
+        let metric: LabeledMetric<CounterMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_counter".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        // Record in 20 labels: it will go over the maximum number of supported
+        // dynamic labels.
+        for i in 0..=20 {
+            metric.get(format!("label_{}", i).as_str()).add(1);
+        }
+        // Record in a label once again.
+        metric.get("label_0").add(1);
+
+        // Initialize Glean.
+        let _t = new_glean(None, false);
+
+        assert_eq!(2, metric.get("label_0").test_get_value(None).unwrap());
+        for i in 1..15 {
+            assert_eq!(
+                1,
+                metric
+                    .get(format!("label_{}", i).as_str())
+                    .test_get_value(None)
+                    .unwrap()
+            );
+        }
+        assert_eq!(5, metric.get("__other__").test_get_value(None).unwrap());
+    }
+
+    #[test]
+    fn test_labeled_string_type() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<StringMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_string".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        metric.get("label1").set("foo");
+        metric.get("label2").set("bar");
+        assert_eq!("foo", metric.get("label1").test_get_value("test1").unwrap());
+        assert_eq!("bar", metric.get("label2").test_get_value("test1").unwrap());
+    }
+
+    #[test]
+    fn test_labeled_boolean_type() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<BooleanMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_boolean".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        metric.get("label1").set(false);
+        metric.get("label2").set(true);
+        assert!(!metric.get("label1").test_get_value("test1").unwrap());
+        assert!(metric.get("label2").test_get_value("test1").unwrap());
+    }
+
+    #[test]
+    fn test_invalid_labels_record_errors() {
+        let _lock = lock_test();
+
+        let _t = new_glean(None, true);
+
+        let metric: LabeledMetric<BooleanMetric> = LabeledMetric::new(
+            CommonMetricData {
+                name: "labeled_boolean".into(),
+                category: "labeled".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            None,
+        );
+
+        let invalid_label = "!#I'm invalid#--_";
+        metric.get(invalid_label).set(true);
+        assert_eq!(true, metric.get("__other__").test_get_value(None).unwrap());
+        assert_eq!(
+            1,
+            metric.test_get_num_recorded_errors(ErrorType::InvalidLabel, None)
+        );
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/memory_distribution.rs firefox-85.0+build1/third_party/rust/glean/src/private/memory_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/memory_distribution.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/memory_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,67 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::{DistributionData, MemoryUnit, MetricType};
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer-facing API for recording memory distribution metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct MemoryDistributionMetric(pub(crate) Arc<glean_core::metrics::MemoryDistributionMetric>);
+
+impl MemoryDistributionMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData, memory_unit: MemoryUnit) -> Self {
+        Self(Arc::new(
+            glean_core::metrics::MemoryDistributionMetric::new(meta, memory_unit),
+        ))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::MemoryDistribution for MemoryDistributionMetric {
+    fn accumulate(&self, sample: u64) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.accumulate(glean, sample)));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<DistributionData> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/mod.rs firefox-85.0+build1/third_party/rust/glean/src/private/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -6,12 +6,32 @@
 
 mod boolean;
 mod counter;
+mod custom_distribution;
+mod datetime;
+mod event;
+mod labeled;
+mod memory_distribution;
 mod ping;
+mod quantity;
 mod recorded_experiment_data;
 mod string;
+mod string_list;
+mod timespan;
+mod timing_distribution;
+mod uuid;
 
+pub use self::uuid::UuidMetric;
 pub use boolean::BooleanMetric;
 pub use counter::CounterMetric;
+pub use custom_distribution::CustomDistributionMetric;
+pub use datetime::{Datetime, DatetimeMetric};
+pub use event::EventMetric;
+pub use labeled::{AllowLabeled, LabeledMetric};
+pub use memory_distribution::MemoryDistributionMetric;
 pub use ping::PingType;
+pub use quantity::QuantityMetric;
 pub use recorded_experiment_data::RecordedExperimentData;
 pub use string::StringMetric;
+pub use string_list::StringListMetric;
+pub use timespan::TimespanMetric;
+pub use timing_distribution::TimingDistributionMetric;
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/ping.rs firefox-85.0+build1/third_party/rust/glean/src/private/ping.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/ping.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/ping.rs	2021-01-18 19:58:25.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 https://mozilla.org/MPL/2.0/.
 
+use inherent::inherent;
+
 /// A Glean ping.
 #[derive(Clone, Debug)]
 pub struct PingType {
@@ -36,27 +38,11 @@
         crate::register_ping_type(&me);
         me
     }
+}
 
-    /// Collect and submit the ping for eventual upload.
-    ///
-    /// This will collect all stored data to be included in the ping.
-    /// Data with lifetime `ping` will then be reset.
-    ///
-    /// If the ping is configured with `send_if_empty = false`
-    /// and the ping currently contains no content,
-    /// it will not be queued for upload.
-    /// If the ping is configured with `send_if_empty = true`
-    /// it will be queued for upload even if otherwise empty.
-    ///
-    /// Pings always contain the `ping_info` and `client_info` sections.
-    /// See [ping sections](https://mozilla.github.io/glean/book/user/pings/index.html#ping-sections)
-    /// for details.
-    ///
-    /// # Arguments
-    ///
-    /// * `reason` - The reason the ping is being submitted.
-    ///              Must be one of the configured `reason_codes`.
-    pub fn submit(&self, reason: Option<&str>) {
+#[inherent(pub)]
+impl glean_core::traits::Ping for PingType {
+    fn submit(&self, reason: Option<&str>) {
         crate::submit_ping(self, reason)
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/quantity.rs firefox-85.0+build1/third_party/rust/glean/src/private/quantity.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/quantity.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/quantity.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,63 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::MetricType;
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type, otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer facing API for recording Quantity metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct QuantityMetric(pub(crate) Arc<glean_core::metrics::QuantityMetric>);
+
+impl QuantityMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData) -> Self {
+        Self(Arc::new(glean_core::metrics::QuantityMetric::new(meta)))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::Quantity for QuantityMetric {
+    fn set(&self, value: i64) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, value)));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<i64> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    #[allow(dead_code)] // Remove after mozilla/glean#1328
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/recorded_experiment_data.rs firefox-85.0+build1/third_party/rust/glean/src/private/recorded_experiment_data.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/recorded_experiment_data.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/recorded_experiment_data.rs	2021-01-18 19:58:25.000000000 +0000
@@ -8,8 +8,8 @@
 /// Deserialized experiment data.
 #[derive(Clone, Deserialize, Debug)]
 pub struct RecordedExperimentData {
-    /// The experiment's branch as set through `set_experiment_active`.
+    /// The experiment's branch as set through [`set_experiment_active`](crate::set_experiment_active).
     pub branch: String,
-    /// Any extra data associated with this experiment through `set_experiment_active`.
+    /// Any extra data associated with this experiment through [`set_experiment_active`](crate::set_experiment_active).
     pub extra: Option<HashMap<String, String>>,
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/string_list.rs firefox-85.0+build1/third_party/rust/glean/src/private/string_list.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/string_list.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/string_list.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,108 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::MetricType;
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer-facing API for recording string list metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct StringListMetric(pub(crate) Arc<glean_core::metrics::StringListMetric>);
+
+impl StringListMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData) -> Self {
+        Self(Arc::new(glean_core::metrics::StringListMetric::new(meta)))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::StringList for StringListMetric {
+    fn add<S: Into<String>>(&self, value: S) {
+        let metric = Arc::clone(&self.0);
+        let new_value = value.into();
+        dispatcher::launch(move || crate::with_glean(|glean| metric.add(glean, new_value)));
+    }
+
+    fn set(&self, value: Vec<String>) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, value)));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<Vec<String>> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::common_test::{lock_test, new_glean};
+    use crate::{CommonMetricData, ErrorType};
+
+    #[test]
+    fn string_list_metric_docs() {
+        let _lock = lock_test();
+        let _t = new_glean(None, true);
+
+        let engine_metric: StringListMetric = StringListMetric::new(CommonMetricData {
+            name: "event".into(),
+            category: "test".into(),
+            send_in_pings: vec!["test1".into()],
+            ..Default::default()
+        });
+
+        let engines: Vec<String> = vec!["Google".to_string(), "DuckDuckGo".to_string()];
+
+        // Add them one at a time
+        engines.iter().for_each(|x| engine_metric.add(x));
+
+        // Set them in one go
+        engine_metric.set(engines);
+
+        assert!(engine_metric.test_get_value(None).is_some());
+
+        assert_eq!(
+            vec!["Google".to_string(), "DuckDuckGo".to_string()],
+            engine_metric.test_get_value(None).unwrap()
+        );
+
+        assert_eq!(
+            0,
+            engine_metric.test_get_num_recorded_errors(ErrorType::InvalidValue, None)
+        );
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/string.rs firefox-85.0+build1/third_party/rust/glean/src/private/string.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/string.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/string.rs	2021-01-18 19:58:25.000000000 +0000
@@ -32,36 +32,17 @@
 
 #[inherent(pub)]
 impl glean_core::traits::String for StringMetric {
-    /// Sets to the specified value.
-    ///
-    /// # Arguments
-    ///
-    /// * `value` - The string to set the metric to.
-    ///
-    /// ## Notes
-    ///
-    /// Truncates the value if it is longer than `MAX_STRING_LENGTH` bytes and logs an error.
     fn set<S: Into<std::string::String>>(&self, value: S) {
         let metric = Arc::clone(&self.0);
         let new_value = value.into();
         dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, new_value)));
     }
 
-    /// **Exported for test purposes.**
-    ///
-    /// Gets the currently stored value as a string.
-    ///
-    /// This doesn't clear the stored value.
-    ///
-    /// # Arguments
-    ///
-    /// * `ping_name` - represents the optional name of the ping to retrieve the
-    ///   metric for. Defaults to the first value in `send_in_pings`.
     fn test_get_value<'a, S: Into<Option<&'a str>>>(
         &self,
         ping_name: S,
     ) -> Option<std::string::String> {
-        dispatcher::block_on_queue();
+        crate::block_on_dispatcher();
 
         let queried_ping_name = ping_name
             .into()
@@ -70,24 +51,13 @@
         crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
     }
 
-    /// **Exported for test purposes.**
-    ///
-    /// Gets the number of recorded errors for the given metric and error type.
-    ///
-    /// # Arguments
-    ///
-    /// * `error` - The type of error
-    /// * `ping_name` - represents the optional name of the ping to retrieve the
-    ///   metric for. Defaults to the first value in `send_in_pings`.
-    ///
-    /// # Returns
-    ///
-    /// The number of errors reported.
     fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
         error: ErrorType,
         ping_name: S,
     ) -> i32 {
+        crate::block_on_dispatcher();
+
         crate::with_glean_mut(|glean| {
             glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
                 .unwrap_or(0)
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/timespan.rs firefox-85.0+build1/third_party/rust/glean/src/private/timespan.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/timespan.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/timespan.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,163 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use std::sync::{Arc, RwLock};
+
+use inherent::inherent;
+
+use glean_core::metrics::{MetricType, TimeUnit};
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer facing API for recording timespan metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct TimespanMetric(pub(crate) Arc<RwLock<glean_core::metrics::TimespanMetric>>);
+
+impl TimespanMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData, time_unit: TimeUnit) -> Self {
+        let timespan = glean_core::metrics::TimespanMetric::new(meta, time_unit);
+        Self(Arc::new(RwLock::new(timespan)))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::Timespan for TimespanMetric {
+    fn start(&self) {
+        let start_time = time::precise_time_ns();
+
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || {
+            crate::with_glean(|glean| {
+                let mut lock = metric
+                    .write()
+                    .expect("Lock poisoned for timespan metric on start.");
+                lock.set_start(glean, start_time)
+            })
+        });
+    }
+
+    fn stop(&self) {
+        let stop_time = time::precise_time_ns();
+
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || {
+            crate::with_glean(|glean| {
+                let mut lock = metric
+                    .write()
+                    .expect("Lock poisoned for timespan metric on stop.");
+                lock.set_stop(glean, stop_time)
+            })
+        });
+    }
+
+    fn cancel(&self) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || {
+            let mut lock = metric
+                .write()
+                .expect("Lock poisoned for timespan metric on cancel.");
+            lock.cancel()
+        });
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<u64> {
+        crate::block_on_dispatcher();
+
+        crate::with_glean(|glean| {
+            // Note: The order of operations is important here to avoid potential deadlocks because
+            // of `lock-order-inversion`.
+            // `with_glean` takes a lock on the global Glean object,
+            // then we take a lock on the metric itself here.
+            //
+            // Other parts do it in the same order, see for example `start`.
+            let metric = self
+                .0
+                .read()
+                .expect("Lock poisoned for timespan metric on test_get_value.");
+
+            let queried_ping_name = ping_name
+                .into()
+                .unwrap_or_else(|| &metric.meta().send_in_pings[0]);
+            metric.test_get_value(glean, queried_ping_name)
+        })
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        let metric = self
+            .0
+            .read()
+            .expect("Lock poisoned for timespan metric on test_get_value.");
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, metric.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::{thread, time::Duration};
+
+    use super::*;
+    use crate::common_test::{lock_test, new_glean};
+    use crate::CommonMetricData;
+
+    #[test]
+    fn timespan_convenient_api() {
+        let _lock = lock_test();
+        let _t = new_glean(None, true);
+
+        let metric: TimespanMetric = TimespanMetric::new(
+            CommonMetricData {
+                name: "timespan".into(),
+                category: "test".into(),
+                send_in_pings: vec!["test1".into()],
+                ..Default::default()
+            },
+            TimeUnit::Millisecond,
+        );
+
+        // Canceling doesn't store data.
+        metric.start();
+        metric.cancel();
+        assert!(metric.test_get_value(None).is_none());
+
+        // Starting and stopping measures time.
+        metric.start();
+        thread::sleep(Duration::from_millis(10));
+        metric.stop();
+        assert!(10 <= metric.test_get_value(None).unwrap());
+
+        // No errors
+        assert_eq!(
+            metric.test_get_num_recorded_errors(ErrorType::InvalidState, None),
+            0
+        );
+
+        // Stopping without starting is an error
+        metric.stop();
+        assert_eq!(
+            metric.test_get_num_recorded_errors(ErrorType::InvalidState, None),
+            1
+        )
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/timing_distribution.rs firefox-85.0+build1/third_party/rust/glean/src/private/timing_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/timing_distribution.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/timing_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,93 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::{Arc, RwLock};
+
+use glean_core::metrics::{DistributionData, MetricType, TimeUnit, TimerId};
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type: otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer-facing API for recording timing distribution metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct TimingDistributionMetric(
+    pub(crate) Arc<RwLock<glean_core::metrics::TimingDistributionMetric>>,
+);
+
+impl TimingDistributionMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData, time_unit: TimeUnit) -> Self {
+        Self(Arc::new(RwLock::new(
+            glean_core::metrics::TimingDistributionMetric::new(meta, time_unit),
+        )))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::TimingDistribution for TimingDistributionMetric {
+    fn start(&mut self) -> TimerId {
+        let start_time = time::precise_time_ns();
+        self.0.write().unwrap().set_start(start_time)
+    }
+
+    fn stop_and_accumulate(&mut self, id: TimerId) {
+        let stop_time = time::precise_time_ns();
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || {
+            crate::with_glean(|glean| {
+                metric
+                    .write()
+                    .unwrap()
+                    .set_stop_and_accumulate(glean, id, stop_time)
+            })
+        });
+    }
+
+    fn cancel(&mut self, id: TimerId) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || metric.write().unwrap().cancel(id));
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<DistributionData> {
+        crate::block_on_dispatcher();
+
+        let inner = self.0.read().unwrap();
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &inner.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| inner.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(
+                &glean,
+                self.0.read().unwrap().meta(),
+                error,
+                ping_name.into(),
+            )
+            .unwrap_or(0)
+        })
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/private/uuid.rs firefox-85.0+build1/third_party/rust/glean/src/private/uuid.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/private/uuid.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/private/uuid.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,69 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use inherent::inherent;
+use std::sync::Arc;
+
+use glean_core::metrics::MetricType;
+use glean_core::ErrorType;
+
+use crate::dispatcher;
+
+// We need to wrap the glean-core type, otherwise if we try to implement
+// the trait for the metric in `glean_core::metrics` we hit error[E0117]:
+// only traits defined in the current crate can be implemented for arbitrary
+// types.
+
+/// This implements the developer facing API for recording UUID metrics.
+///
+/// Instances of this class type are automatically generated by the parsers
+/// at build time, allowing developers to record values that were previously
+/// registered in the metrics.yaml file.
+#[derive(Clone)]
+pub struct UuidMetric(pub(crate) Arc<glean_core::metrics::UuidMetric>);
+
+impl UuidMetric {
+    /// The public constructor used by automatically generated metrics.
+    pub fn new(meta: glean_core::CommonMetricData) -> Self {
+        Self(Arc::new(glean_core::metrics::UuidMetric::new(meta)))
+    }
+}
+
+#[inherent(pub)]
+impl glean_core::traits::Uuid for UuidMetric {
+    fn set(&self, value: uuid::Uuid) {
+        let metric = Arc::clone(&self.0);
+        dispatcher::launch(move || crate::with_glean(|glean| metric.set(glean, value)));
+    }
+
+    fn generate_and_set(&self) -> uuid::Uuid {
+        // TODO: We can use glean-core's generate_and_set after bug 1673017.
+        let uuid = uuid::Uuid::new_v4();
+        self.set(uuid);
+        uuid
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<uuid::Uuid> {
+        crate::block_on_dispatcher();
+
+        let queried_ping_name = ping_name
+            .into()
+            .unwrap_or_else(|| &self.0.meta().send_in_pings[0]);
+
+        crate::with_glean(|glean| self.0.test_get_value(glean, queried_ping_name))
+    }
+
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        crate::block_on_dispatcher();
+
+        crate::with_glean_mut(|glean| {
+            glean_core::test_get_num_recorded_errors(&glean, self.0.meta(), error, ping_name.into())
+                .unwrap_or(0)
+        })
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/src/test.rs firefox-85.0+build1/third_party/rust/glean/src/test.rs
--- firefox-84.0.2+build1/third_party/rust/glean/src/test.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/src/test.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,50 +2,16 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use crate::private::PingType;
 use crate::private::{BooleanMetric, CounterMetric};
-use once_cell::sync::Lazy;
 use std::path::PathBuf;
-use std::sync::Mutex;
 
 use super::*;
-
-// Because glean_preview is a global-singleton, we need to run the tests one-by-one to avoid different tests stomping over each other.
-// This is only an issue because we're resetting Glean, this cannot happen in normal use of the
-// RLB.
-//
-// We use a global lock to force synchronization of all tests, even if run multi-threaded.
-// This allows us to run without `--test-threads 1`.`
-static GLOBAL_LOCK: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
-const GLOBAL_APPLICATION_ID: &str = "org.mozilla.rlb.test";
-
-// Create a new instance of Glean with a temporary directory.
-// We need to keep the `TempDir` alive, so that it's not deleted before we stop using it.
-fn new_glean(configuration: Option<Configuration>, clear_stores: bool) -> tempfile::TempDir {
-    let dir = tempfile::tempdir().unwrap();
-    let tmpname = dir.path().display().to_string();
-
-    let cfg = match configuration {
-        Some(c) => c,
-        None => Configuration {
-            data_path: tmpname,
-            application_id: GLOBAL_APPLICATION_ID.into(),
-            upload_enabled: true,
-            max_events: None,
-            delay_ping_lifetime_io: false,
-            channel: Some("testing".into()),
-            server_endpoint: Some("invalid-test-host".into()),
-            uploader: None,
-        },
-    };
-
-    crate::reset_glean(cfg, ClientInfoMetrics::unknown(), clear_stores);
-    dir
-}
+use crate::common_test::{lock_test, new_glean, GLOBAL_APPLICATION_ID};
 
 #[test]
 fn send_a_ping() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     let (s, r) = crossbeam_channel::bounded::<String>(1);
 
@@ -83,7 +49,7 @@
     };
 
     let _t = new_glean(Some(cfg), true);
-    crate::dispatcher::block_on_queue();
+    crate::block_on_dispatcher();
 
     // Define a new ping and submit it.
     const PING_NAME: &str = "test-ping";
@@ -97,11 +63,10 @@
 
 #[test]
 fn disabling_upload_disables_metrics_recording() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     let _t = new_glean(None, true);
-    crate::dispatcher::block_on_queue();
+    crate::block_on_dispatcher();
 
     let metric = BooleanMetric::new(CommonMetricData {
         name: "bool_metric".into(),
@@ -119,9 +84,7 @@
 
 #[test]
 fn test_experiments_recording() {
-    // setup glean for the test
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     let _t = new_glean(None, true);
 
@@ -145,8 +108,7 @@
 
 #[test]
 fn test_experiments_recording_before_glean_inits() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     // Destroy the existing glean instance from glean-core so that we
     // can test the pre-init queueing of the experiment api commands.
@@ -184,7 +146,7 @@
     let dir = tempfile::tempdir().unwrap();
     let tmpname = dir.path().display().to_string();
 
-    reset_glean(
+    test_reset_glean(
         Configuration {
             data_path: tmpname,
             application_id: GLOBAL_APPLICATION_ID.into(),
@@ -198,7 +160,7 @@
         ClientInfoMetrics::unknown(),
         false,
     );
-    crate::dispatcher::block_on_queue();
+    crate::block_on_dispatcher();
 
     assert!(test_is_experiment_active(
         "experiment_set_preinit".to_string()
@@ -222,8 +184,7 @@
 
 #[test]
 fn initialize_must_not_crash_if_data_dir_is_messed_up() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     let dir = tempfile::tempdir().unwrap();
     let tmpdirname = dir.path().display().to_string();
@@ -243,7 +204,7 @@
         uploader: None,
     };
 
-    reset_glean(cfg, ClientInfoMetrics::unknown(), false);
+    test_reset_glean(cfg, ClientInfoMetrics::unknown(), false);
     // TODO(bug 1675215): ensure initialize runs through dispatcher.
     // Glean init is async and, for this test, it bails out early due to
     // an caused by not being able to create the data dir: we can do nothing
@@ -256,8 +217,7 @@
 
 #[test]
 fn queued_recorded_metrics_correctly_record_during_init() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     destroy_glean(true);
 
@@ -281,7 +241,7 @@
 
     // Calling `new_glean` here will cause Glean to be initialized and should cause the queued
     // tasks recording metrics to execute
-    let _ = new_glean(None, false);
+    let _t = new_glean(None, false);
 
     // Verify that the callback was executed by testing for the correct value
     assert!(metric.test_get_value(None).is_some(), "Value must exist");
@@ -290,13 +250,12 @@
 
 #[test]
 fn initializing_twice_is_a_noop() {
-    let _lock = GLOBAL_LOCK.lock().unwrap();
-    env_logger::try_init().ok();
+    let _lock = lock_test();
 
     let dir = tempfile::tempdir().unwrap();
     let tmpname = dir.path().display().to_string();
 
-    reset_glean(
+    test_reset_glean(
         Configuration {
             data_path: tmpname.clone(),
             application_id: GLOBAL_APPLICATION_ID.into(),
@@ -311,9 +270,9 @@
         true,
     );
 
-    dispatcher::block_on_queue();
+    crate::block_on_dispatcher();
 
-    reset_glean(
+    test_reset_glean(
         Configuration {
             data_path: tmpname,
             application_id: GLOBAL_APPLICATION_ID.into(),
@@ -397,7 +356,185 @@
 }
 
 #[test]
+fn setting_debug_view_tag_before_initialization_should_not_crash() {
+    let _lock = lock_test();
+
+    destroy_glean(true);
+    assert!(!was_initialize_called());
+
+    // Define a fake uploader that reports back the submission headers
+    // using a crossbeam channel.
+    let (s, r) = crossbeam_channel::bounded::<Vec<(String, String)>>(1);
+
+    #[derive(Debug)]
+    pub struct FakeUploader {
+        sender: crossbeam_channel::Sender<Vec<(String, String)>>,
+    };
+    impl net::PingUploader for FakeUploader {
+        fn upload(
+            &self,
+            _url: String,
+            _body: Vec<u8>,
+            headers: Vec<(String, String)>,
+        ) -> net::UploadResult {
+            self.sender.send(headers).unwrap();
+            net::UploadResult::HttpStatus(200)
+        }
+    }
+
+    // Attempt to set a debug view tag before Glean is initialized.
+    set_debug_view_tag("valid-tag");
+
+    // Create a custom configuration to use a fake uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: GLOBAL_APPLICATION_ID.into(),
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: Some(Box::new(FakeUploader { sender: s })),
+    };
+
+    let _t = new_glean(Some(cfg), true);
+    crate::block_on_dispatcher();
+
+    // Submit a baseline ping.
+    submit_ping_by_name("baseline", Some("background"));
+
+    // Wait for the ping to arrive.
+    let headers = r.recv().unwrap();
+    assert_eq!(
+        "valid-tag",
+        headers.iter().find(|&kv| kv.0 == "X-Debug-ID").unwrap().1
+    );
+}
+
+#[test]
+fn setting_source_tags_before_initialization_should_not_crash() {
+    let _lock = lock_test();
+
+    destroy_glean(true);
+    assert!(!was_initialize_called());
+
+    // Define a fake uploader that reports back the submission headers
+    // using a crossbeam channel.
+    let (s, r) = crossbeam_channel::bounded::<Vec<(String, String)>>(1);
+
+    #[derive(Debug)]
+    pub struct FakeUploader {
+        sender: crossbeam_channel::Sender<Vec<(String, String)>>,
+    };
+    impl net::PingUploader for FakeUploader {
+        fn upload(
+            &self,
+            _url: String,
+            _body: Vec<u8>,
+            headers: Vec<(String, String)>,
+        ) -> net::UploadResult {
+            self.sender.send(headers).unwrap();
+            net::UploadResult::HttpStatus(200)
+        }
+    }
+
+    // Attempt to set source tags before Glean is initialized.
+    set_source_tags(vec!["valid-tag1".to_string(), "valid-tag2".to_string()]);
+
+    // Create a custom configuration to use a fake uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: GLOBAL_APPLICATION_ID.into(),
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: Some(Box::new(FakeUploader { sender: s })),
+    };
+
+    let _t = new_glean(Some(cfg), true);
+    crate::block_on_dispatcher();
+
+    // Submit a baseline ping.
+    submit_ping_by_name("baseline", Some("background"));
+
+    // Wait for the ping to arrive.
+    let headers = r.recv().unwrap();
+    assert_eq!(
+        "valid-tag1,valid-tag2",
+        headers
+            .iter()
+            .find(|&kv| kv.0 == "X-Source-Tags")
+            .unwrap()
+            .1
+    );
+}
+
+#[test]
 #[ignore] // TODO: To be done in bug 1673672.
 fn flipping_upload_enabled_respects_order_of_events() {
     todo!()
 }
+
+#[test]
+fn registering_pings_before_init_must_work() {
+    let _lock = lock_test();
+
+    destroy_glean(true);
+    assert!(!was_initialize_called());
+
+    // Define a fake uploader that reports back the submission headers
+    // using a crossbeam channel.
+    let (s, r) = crossbeam_channel::bounded::<String>(1);
+
+    #[derive(Debug)]
+    pub struct FakeUploader {
+        sender: crossbeam_channel::Sender<String>,
+    };
+    impl net::PingUploader for FakeUploader {
+        fn upload(
+            &self,
+            url: String,
+            _body: Vec<u8>,
+            _headers: Vec<(String, String)>,
+        ) -> net::UploadResult {
+            self.sender.send(url).unwrap();
+            net::UploadResult::HttpStatus(200)
+        }
+    }
+
+    // Create a custom ping and attempt its registration.
+    let sample_ping = PingType::new("pre-register", true, true, vec![]);
+
+    // Create a custom configuration to use a fake uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: GLOBAL_APPLICATION_ID.into(),
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: Some(Box::new(FakeUploader { sender: s })),
+    };
+
+    let _t = new_glean(Some(cfg), true);
+    crate::block_on_dispatcher();
+
+    // Submit a baseline ping.
+    sample_ping.submit(None);
+
+    // Wait for the ping to arrive.
+    let url = r.recv().unwrap();
+    assert!(url.contains("pre-register"));
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/tests/common/mod.rs firefox-85.0+build1/third_party/rust/glean/tests/common/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean/tests/common/mod.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/tests/common/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,50 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+// #[allow(dead_code)] is required on this module as a workaround for
+// https://github.com/rust-lang/rust/issues/46379
+#![allow(dead_code)]
+
+use std::{panic, process};
+
+use glean::{ClientInfoMetrics, Configuration};
+
+/// Initialize the env logger for a test environment.
+///
+/// When testing we want all logs to go to stdout/stderr by default.
+pub fn enable_test_logging() {
+    let _ = env_logger::builder().is_test(true).try_init();
+}
+
+/// Install a panic handler that exits the whole process when a panic occurs.
+///
+/// This causes the process to exit even if a thread panics.
+/// This is similar to the `panic=abort` configuration, but works in the default configuration
+/// (as used by `cargo test`).
+fn install_panic_handler() {
+    let orig_hook = panic::take_hook();
+    panic::set_hook(Box::new(move |panic_info| {
+        // invoke the default handler and exit the process
+        orig_hook(panic_info);
+        process::exit(1);
+    }));
+}
+
+/// Create a new instance of Glean.
+pub fn initialize(cfg: Configuration) {
+    // Ensure panics in threads, such as the init thread or the dispatcher, cause the process to
+    // exit.
+    //
+    // Otherwise in case of a panic in a thread the integration test will just hang.
+    // CI will terminate it after a timeout, but why stick around if we know nothing is happening?
+    install_panic_handler();
+
+    // Use some default values to make our life easier a bit.
+    let client_info = ClientInfoMetrics {
+        app_build: "1.0.0".to_string(),
+        app_display_version: "1.0.0".to_string(),
+    };
+
+    glean::initialize(cfg, client_info);
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/tests/init_fails.rs firefox-85.0+build1/third_party/rust/glean/tests/init_fails.rs
--- firefox-84.0.2+build1/third_party/rust/glean/tests/init_fails.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/tests/init_fails.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,84 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+//! This integration test should model how the RLB is used when embedded in another Rust application
+//! (e.g. FOG/Firefox Desktop).
+//!
+//! We write a single test scenario per file to avoid any state keeping across runs
+//! (different files run as different processes).
+
+mod common;
+
+use std::{thread, time::Duration};
+
+use glean::Configuration;
+
+/// Some user metrics.
+mod metrics {
+    use glean::private::*;
+    use glean::{Lifetime, TimeUnit};
+    use glean_core::CommonMetricData;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static initialization: Lazy<TimespanMetric> = Lazy::new(|| {
+        TimespanMetric::new(
+            CommonMetricData {
+                name: "initialization".into(),
+                category: "sample".into(),
+                send_in_pings: vec!["validation".into()],
+                lifetime: Lifetime::Ping,
+                disabled: false,
+                ..Default::default()
+            },
+            TimeUnit::Nanosecond,
+        )
+    });
+}
+
+mod pings {
+    use glean::private::PingType;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static validation: Lazy<PingType> =
+        Lazy::new(|| glean::private::PingType::new("validation", true, true, vec![]));
+}
+
+/// Test scenario: Glean initialization fails.
+///
+/// App tries to initialize Glean, but that somehow fails.
+#[test]
+fn init_fails() {
+    common::enable_test_logging();
+
+    metrics::initialization.start();
+
+    // Create a custom configuration to use a validating uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: "".into(), // An empty application ID is invalid.
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: None,
+    };
+    common::initialize(cfg);
+
+    metrics::initialization.stop();
+
+    pings::validation.submit(None);
+
+    // We don't test for data here, as that would block on the dispatcher.
+
+    // Give it a short amount of time to actually finish initialization.
+    thread::sleep(Duration::from_millis(500));
+
+    glean::shutdown();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/tests/never_init.rs firefox-85.0+build1/third_party/rust/glean/tests/never_init.rs
--- firefox-84.0.2+build1/third_party/rust/glean/tests/never_init.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/tests/never_init.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,66 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+//! This integration test should model how the RLB is used when embedded in another Rust application
+//! (e.g. FOG/Firefox Desktop).
+//!
+//! We write a single test scenario per file to avoid any state keeping across runs
+//! (different files run as different processes).
+
+mod common;
+
+/// Some user metrics.
+mod metrics {
+    use glean::private::*;
+    use glean::{Lifetime, TimeUnit};
+    use glean_core::CommonMetricData;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static initialization: Lazy<TimespanMetric> = Lazy::new(|| {
+        TimespanMetric::new(
+            CommonMetricData {
+                name: "initialization".into(),
+                category: "sample".into(),
+                send_in_pings: vec!["validation".into()],
+                lifetime: Lifetime::Ping,
+                disabled: false,
+                ..Default::default()
+            },
+            TimeUnit::Nanosecond,
+        )
+    });
+}
+
+mod pings {
+    use glean::private::PingType;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static validation: Lazy<PingType> =
+        Lazy::new(|| glean::private::PingType::new("validation", true, true, vec![]));
+}
+
+/// Test scenario: Glean is never initialized.
+///
+/// Glean is never initialized.
+/// Some data is recorded early on.
+/// And later the whole process is shutdown.
+#[test]
+fn never_initialize() {
+    common::enable_test_logging();
+
+    metrics::initialization.start();
+
+    // NOT calling `initialize` here.
+    // In apps this might happen for several reasons:
+    // 1. Process doesn't run long enough for Glean to be initialized.
+    // 2. Getting some early data used for initialize fails
+
+    pings::validation.submit(None);
+
+    // We can't test for data either, as that would panic because init was never called.
+
+    glean::shutdown();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/tests/no_time_to_init.rs firefox-85.0+build1/third_party/rust/glean/tests/no_time_to_init.rs
--- firefox-84.0.2+build1/third_party/rust/glean/tests/no_time_to_init.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/tests/no_time_to_init.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,81 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+//! This integration test should model how the RLB is used when embedded in another Rust application
+//! (e.g. FOG/Firefox Desktop).
+//!
+//! We write a single test scenario per file to avoid any state keeping across runs
+//! (different files run as different processes).
+
+mod common;
+
+use glean::Configuration;
+
+/// Some user metrics.
+mod metrics {
+    use glean::private::*;
+    use glean::{Lifetime, TimeUnit};
+    use glean_core::CommonMetricData;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static initialization: Lazy<TimespanMetric> = Lazy::new(|| {
+        TimespanMetric::new(
+            CommonMetricData {
+                name: "initialization".into(),
+                category: "sample".into(),
+                send_in_pings: vec!["validation".into()],
+                lifetime: Lifetime::Ping,
+                disabled: false,
+                ..Default::default()
+            },
+            TimeUnit::Nanosecond,
+        )
+    });
+}
+
+mod pings {
+    use glean::private::PingType;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static validation: Lazy<PingType> =
+        Lazy::new(|| glean::private::PingType::new("validation", true, true, vec![]));
+}
+
+/// Test scenario: Glean initialization fails.
+///
+/// The app tries to initializate Glean, but that somehow fails.
+#[test]
+fn init_fails() {
+    common::enable_test_logging();
+
+    metrics::initialization.start();
+
+    // Create a custom configuration to use a validating uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: "firefox-desktop".into(), // An empty application ID is invalid.
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: None,
+    };
+    common::initialize(cfg);
+
+    metrics::initialization.stop();
+
+    pings::validation.submit(None);
+
+    // We don't test for data here, as that would block on the dispatcher.
+
+    // Shut it down immediately; this might not be enough time to initialize.
+
+    glean::shutdown();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean/tests/simple.rs firefox-85.0+build1/third_party/rust/glean/tests/simple.rs
--- firefox-84.0.2+build1/third_party/rust/glean/tests/simple.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean/tests/simple.rs	2021-01-18 19:58:25.000000000 +0000
@@ -0,0 +1,84 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+//! This integration test should model how the RLB is used when embedded in another Rust application
+//! (e.g. FOG/Firefox Desktop).
+//!
+//! We write a single test scenario per file to avoid any state keeping across runs
+//! (different files run as different processes).
+
+mod common;
+
+use glean::Configuration;
+
+/// Some user metrics.
+mod metrics {
+    use glean::private::*;
+    use glean::{Lifetime, TimeUnit};
+    use glean_core::CommonMetricData;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static initialization: Lazy<TimespanMetric> = Lazy::new(|| {
+        TimespanMetric::new(
+            CommonMetricData {
+                name: "initialization".into(),
+                category: "sample".into(),
+                send_in_pings: vec!["validation".into()],
+                lifetime: Lifetime::Ping,
+                disabled: false,
+                ..Default::default()
+            },
+            TimeUnit::Nanosecond,
+        )
+    });
+}
+
+mod pings {
+    use glean::private::PingType;
+    use once_cell::sync::Lazy;
+
+    #[allow(non_upper_case_globals)]
+    pub static validation: Lazy<PingType> =
+        Lazy::new(|| glean::private::PingType::new("validation", true, true, vec![]));
+}
+
+/// Test scenario: A clean run
+///
+/// The app is initialized, in turn Glean gets initialized without problems.
+/// Some data is recorded (before and after initialization).
+/// And later the whole process is shutdown.
+#[test]
+fn simple_lifecycle() {
+    common::enable_test_logging();
+
+    metrics::initialization.start();
+
+    // Create a custom configuration to use a validating uploader.
+    let dir = tempfile::tempdir().unwrap();
+    let tmpname = dir.path().display().to_string();
+
+    let cfg = Configuration {
+        data_path: tmpname,
+        application_id: "firefox-desktop".into(),
+        upload_enabled: true,
+        max_events: None,
+        delay_ping_lifetime_io: false,
+        channel: Some("testing".into()),
+        server_endpoint: Some("invalid-test-host".into()),
+        uploader: None,
+    };
+    common::initialize(cfg);
+
+    metrics::initialization.stop();
+
+    // This would never be called outside of tests,
+    // but it's the only way we can really test it's working right now.
+    assert!(metrics::initialization.test_get_value(None).is_some());
+
+    pings::validation.submit(None);
+    assert!(metrics::initialization.test_get_value(None).is_none());
+
+    glean::shutdown();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/.cargo-checksum.json firefox-85.0+build1/third_party/rust/glean-core/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/glean-core/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"b38b817b3098783ee8b9fe9d2c41cfae3c3e120dd056f2e280fe9bbf00579dba","Cargo.toml":"e735478488f802ebda924dee0d9a529dc263abca81d38c17f5b62f29fb92d5ac","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","examples/sample.rs":"ea5b72b702cb6bfb4ad38041a006c40960f40664865a73a904a2d033c7f9f7f0","src/common_metric_data.rs":"3a8072d5939d3abade3fb4ab49156cde38902c40a96b215f01442f2bcfd1733b","src/database/mod.rs":"016c5505ac945a826f95519e985e7a2080865423d7525371475edff3746b4a83","src/debug.rs":"2a88e4236124935c9b284ae9090a0f064d299d7b986a5d487a64b220044eb7d8","src/error.rs":"e8f72051be943bc2e8e49b597499c841f2b895101378520cf690f31cfeb5a9da","src/error_recording.rs":"76e0abe16e375716c50c047ebf419a5bc26127470812eb7d984a9c1885407059","src/event_database/mod.rs":"34390ce4b3ee3c6961bf58630d4e059a021ba3f12ac05fab9954056c7b9a1f12","src/histogram/exponential.rs":"389d48bab03f7229445ee4d4c8a4c49f6b43303f658dc954da75142f3c040dc6","src/histogram/functional.rs":"1a63a305b48bcef7bc38136b40d916df4bb8f098dc602514ada54a9b091f6951","src/histogram/linear.rs":"5642c8983c3c1ce9b69c6ac99133c8ed5e67abe2398c5dbcf67e69d66880f4ca","src/histogram/mod.rs":"11e5d3b6440a33a3e5544d0e03ffd69fa2fdcabe603ad75e0327f3ed548e8ce3","src/internal_metrics.rs":"0da1bb710346f7ba995d773f9d18fb2ddc8fddb45da84dce3e320d00bbee3e43","src/internal_pings.rs":"f9f589f30510b207845a3b80e219b976e719db1266f7cffd8a589bfdc75b096e","src/lib.rs":"37c2acb80c3cba51aed986fe9bfc2892eab3424c92387da9bd55d20c41ac09bc","src/lib_unit_tests.rs":"ee5d8b332afea9169a14dd8584cef717f1901a5a15883d144b08c54b514c1168","src/macros.rs":"3f3fc8c36dd05b7528b66b27e95b6494505a7a1f48abd013218de23ada6b5a43","src/metrics/boolean.rs":"0b1b96a65da89aaa511a3c14fabe1ca41f5bff5479bbaa1394bd809a91ddc40f","src/metrics/counter.rs":"0fbd8bd3c3a57540d5b1d00701d841a7d03d99a0b1c9c99bf48320af0efc4ca8","src/metrics/custom_distribution.rs":"1a3cab15651d84bb8da30c9ce3e75acd11b67d3c57fa3fa07c8a6152c13c3c2d","src/metrics/datetime.rs":"043804f2b3f3f1eef40cd0cd7f68d6261dff07be5db2cf8351c1434f8b6c72c1","src/metrics/event.rs":"22f6bf3b8b544f9a3121d8c727ef83bf7103dc83adef8aedbddf89e7061757c1","src/metrics/experiment.rs":"6a1277186f4b2a4bdb20c19e7880232f009f2c72e7997ce8ac195d75f7b20c4d","src/metrics/jwe.rs":"562103bb34591f5d3da5932c6e5315df3a9d96ce3db50cc15ac905fb4dd52818","src/metrics/labeled.rs":"240955b03655ccb21df50b456b437bc888a26e773da8b370d45c182661e54e60","src/metrics/memory_distribution.rs":"b3e70b68938cef56d4fd7103a3583e6e679335928bb70c007904d880e774878d","src/metrics/memory_unit.rs":"c022ee797c3aae99e8c5f358ac9bbad3eaa5c924702e58d39711301ae75fb3a1","src/metrics/mod.rs":"8ae2ae5420f97f043a85ae890eadf222b2f301c05392e4fdec4e582b524e41e0","src/metrics/ping.rs":"314431e58e5bb57dca0fab48d2ffbe3cc8a232c834187ad86d279bb1a8ef84c4","src/metrics/quantity.rs":"96fa43f0739f831c9953cb418d51f480152ebe0fc7e42afe1af9120ed1afcf60","src/metrics/string.rs":"93f33e37bb883c7f553b7592d7984f61f07ec87e0c950e3298602861ca403caa","src/metrics/string_list.rs":"0903d5be42210d0f30371a3014cd36daa4636ff0793c9322ea84da94268b1184","src/metrics/time_unit.rs":"9bb3f6c03b1d385008b254f36ed35daf22f9a6fa2d18e007c9b70aac767cde50","src/metrics/timespan.rs":"03a2aeaedb8b4db7c2d5d5ebe2549961b153501449b98122395f9f198c004f05","src/metrics/timing_distribution.rs":"c5482b5bc1e999e938893e56dbd3bb2c10ebc1937209cccaeb68521b76c4fa95","src/metrics/uuid.rs":"89c9be40b2b87eb902922f4b7042ad344964721c24432b3f9e98f45e9cf9c448","src/ping/mod.rs":"fe44f78948b795b1cb8024c54adac1d41ef14e7249daf757bb5d2ba02d6addb5","src/storage/mod.rs":"511e863f430771bf488e0dc42b1f042575464cb03561f9e5333262a4e6f6c10d","src/system.rs":"cb33444d393bf4960ebe716a01de3465f2d5a28969ca1034d9cd1a5b31ed2a7f","src/traits/boolean.rs":"b2dd5aab4f7ccf082f8b6544f7c30da48f44e6be266a5f8e35cac4e01b583251","src/traits/counter.rs":"8187a36cf1f113c4d74db6d6d1b098ce12772bdaf035eeb8993d38ed5092fa24","src/traits/custom_distribution.rs":"5345ad30677a99c84c23a65a88c6583e204a494a4c22e40b5d344f44b7c9a365","src/traits/datetime.rs":"f8e710b391c6794dcb06d0da72384672704b166dfc49eacb469ebec6e851b8d8","src/traits/event.rs":"4fbeb2db3056254cd104c7686eb78b30578f164f2536431b54f4cb9d122c41be","src/traits/jwe.rs":"46afc39dfed61dec1c5ef5a46bb580d9813f8f5e7d841bff988e2c8af64c52e8","src/traits/labeled.rs":"ea2a8fdada07de456ec3fbd0945f694147e33051d79b287b6a62989e9972c3fa","src/traits/memory_distribution.rs":"f3fa94072c1a98da4ca355ce0dc191fa527881fe0a5e822b0a52a87894c071c5","src/traits/mod.rs":"80acb7ebe787219649c33cb759add781bbcdfffedebbd4ff38690ec25ced73e8","src/traits/ping.rs":"f920224255ed147bf1dd8904341c63b01721f44f6d45076778f9a2671a06bd5c","src/traits/quantity.rs":"efadd4bf188a3d6a70fbc68ac4e9662ca10e8de83f13c8ed2f4c4551d7a4a282","src/traits/string.rs":"32e9730039bdd86d2c609caf3643b87d9fff02ac31fba64e62f38d426b8b0dd9","src/traits/string_list.rs":"9f6013665f86b0061cccf0d69e6e223530002c4205ea1ebffda9bafb8747b059","src/traits/timespan.rs":"9ddfcb7bc82761349da31edf0374bbcd02db5fb46d9c4097eef6616cfb1c4e6b","src/traits/timing_distribution.rs":"be9bfc69467291fa9ce26758a4d5b058f453556b481152650fecfa4d97df1e46","src/traits/uuid.rs":"8f118bd888c10aeb7581faff998d036f846488bd0b75d381f0aa99959e20d915","src/upload/directory.rs":"f544576e72f1bd0747b5279e52bca78208044efb855018d3de0e2b287367297a","src/upload/mod.rs":"a7ea8744435d1f4801cf28b0400fc7d5fba3a07f38a5b035e713a1fc28ecec78","src/upload/policy.rs":"c250957a37783e74af8002cd80ba06ef9780a389fb0f61b8b665b79688f0a360","src/upload/request.rs":"37539bd7d5c4feaa26dd3667f949d395ae7837cf4a2d8173d2a7ddecc08c0632","src/upload/result.rs":"d73454e81f185e4e28c887f7b496bffad7baac74c8f1b719885f940f909a530d","src/util.rs":"c92d0d7b23e14fac46d8a003e3e2d81a58c6ff1b598bdbf5f116da9eb99d4d2f","tests/boolean.rs":"9f4830f3b5f5ab6768060917deb1f546324a4744b8ed893197e31a0aed092947","tests/common/mod.rs":"f4856ee4fdf0b29cfea7b251ad7048ec34e5d3d24b75befc649ac13a91cea2df","tests/counter.rs":"39a2cd40335c164b3e7407f5505bbf571d7e4a71f032d476a7939f7dd1af90d0","tests/custom_distribution.rs":"596575504ad4eab2765b5b88245dcc92dc68e83d04c93deb4b27692c142c0b94","tests/datetime.rs":"230698c7101176730483289e90c320ef559197111a814cf2b8db185ab68f82fb","tests/event.rs":"cb78dfc0a2315253da8ef6663b81979dd5b0638bb6c31456f16ce4e9bb50c67a","tests/jwe.rs":"dc8a73d1e1925ac49061e8bb5c8de01230aa364942a22470e37aa88965b0eaba","tests/labeled.rs":"4ac1a36223b5218232c6d83c5a2bfebbf547abe78db4b0fa3609abacc70c39bc","tests/memory_distribution.rs":"0c03d0a491150f508dc12ecac7e5db70043f3a7de2f90cc6b3509aba90549821","tests/metrics.rs":"0560e0645321628015610bbf1a90c0adbb12ad42e5a068399073572120377cbb","tests/ping.rs":"8b80e7d1cdffd6afc513780e9704e83de338697db8a459f0d34830f87aaa5be8","tests/ping_maker.rs":"f65ba2797c0d3acacd8a8b8cc6326d2d60a86284c48b15e707457644ecc680a6","tests/quantity.rs":"2543f0f57085d27b0bc0c25c24c17a7e376ac673cf9265a3a9dec202920679c5","tests/storage.rs":"d8d50aba92e17a3053fd80788f5fbbcc8f82293c11c19b58e2de6c4ee45f71ff","tests/string.rs":"9c3e21bfa3ad0b75373f8f5addb8ac023ac5336ac9f969e92b89ea6fda675fdd","tests/string_list.rs":"2b83710b949bea4bd0f6b2029069887f3ea87312b00091e5aa3c7bda0fb9073c","tests/timespan.rs":"5d5d582483c779196c7d622dab208645df45a6856a5ae2c263274fba52181b80","tests/timing_distribution.rs":"577f5ff0059509f6005014604097f31c7d01536d7f05571c76564af4b88edcbd","tests/uuid.rs":"21f79bc0d456caefc1e7e7931f803da6144eb6af6e1d41aa687a6c9c32175f80"},"package":"82e3c82289c1ce270c1accc086f9cac083c15ddc01d167e9c6e0b8ed32a4b47c"}
\ No newline at end of file
+{"files":{"Cargo.lock":"7419f2843b1306aee651c73aeb4e9e5f322cc4d30402f720e2c8f917875839c7","Cargo.toml":"13edaf7a891809b443eaa7c12922da3c8db20b8117d2f10db57b39255894a883","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","examples/sample.rs":"ea5b72b702cb6bfb4ad38041a006c40960f40664865a73a904a2d033c7f9f7f0","src/common_metric_data.rs":"d95d20dc9637e9b39255cd6b1d2d13072735d63b69324579662d8613f28c7124","src/database/mod.rs":"9dd5abe7e0a70c0c9c0f2d6c79415967c1f76ad0185d1c5c1eeb2b218571fb82","src/debug.rs":"b5d8117ef1ad043637093cc9d12a6557aa9b85ce90ecde8d88a161d48cedc625","src/error.rs":"97172a791efdf8b791a04ae7961085fbef4391b313ff3ffb24e9381f2901fccc","src/error_recording.rs":"c1bf82011a149277b78b3d6a5f6293520ef3b38571649560b8adfe8fc19174e9","src/event_database/mod.rs":"1add194e555b17a0dd33c09e607e991fb86668f028c87197e036b0deebf345d2","src/histogram/exponential.rs":"389d48bab03f7229445ee4d4c8a4c49f6b43303f658dc954da75142f3c040dc6","src/histogram/functional.rs":"1a63a305b48bcef7bc38136b40d916df4bb8f098dc602514ada54a9b091f6951","src/histogram/linear.rs":"5642c8983c3c1ce9b69c6ac99133c8ed5e67abe2398c5dbcf67e69d66880f4ca","src/histogram/mod.rs":"11e5d3b6440a33a3e5544d0e03ffd69fa2fdcabe603ad75e0327f3ed548e8ce3","src/internal_metrics.rs":"0da1bb710346f7ba995d773f9d18fb2ddc8fddb45da84dce3e320d00bbee3e43","src/internal_pings.rs":"f9f589f30510b207845a3b80e219b976e719db1266f7cffd8a589bfdc75b096e","src/lib.rs":"b95479cdf4241ccb054511613c8762e3652d624cf954c6565b0868c37e155890","src/lib_unit_tests.rs":"ee5d8b332afea9169a14dd8584cef717f1901a5a15883d144b08c54b514c1168","src/macros.rs":"3f3fc8c36dd05b7528b66b27e95b6494505a7a1f48abd013218de23ada6b5a43","src/metrics/boolean.rs":"6c2495ce63539fad2c2dfab4a4a2c80179f2a0144436a3bceb4995c93ebe5d73","src/metrics/counter.rs":"c23dd9d9df51f16426c6f97fdf46cc7c03ea4b2a083e408aee4b524ef94d57c3","src/metrics/custom_distribution.rs":"05bffc95cb3290c6f9288c22fd8e3611e4c35eed5cfd5fc2cbb6e8645f002c8a","src/metrics/datetime.rs":"5fdfa7fe44f2c0d43cc5cc0149a4da2322b40423469fcdc0c05298d000565c02","src/metrics/event.rs":"d6e4a52dbde7fbd44c21df567508c35acf046e08c6ea593bbb65fa25223a2b40","src/metrics/experiment.rs":"ec903e983a092c3f862e11d417db7f357a85c0ea24e75bf7c4e31658a76f7e73","src/metrics/jwe.rs":"27c12bfddf955039bee3b46a37226dc58b1e5e9001221ef18be50fd23f27dfb6","src/metrics/labeled.rs":"b731e306b64ee0d0b554e5af04e0098664572e5b054448c488f9823366b183e8","src/metrics/memory_distribution.rs":"8966a6db71428e2152738ac3edeaaf3929cd7f27ecd84ca880b1dc30a73e35bf","src/metrics/memory_unit.rs":"d7a678e5242febd021283b30c0099a9e62729944816a3f17d2d91e2808bc0570","src/metrics/mod.rs":"76bb599cdb0fba77181eb8f02aa990d608232c3c049fe86d08db2882ef58ee50","src/metrics/ping.rs":"dcabf0f8fd8b38911d32348f6d518273c7b3dfafa43502bf2fc3e7fc27e2d0a2","src/metrics/quantity.rs":"ac94c57851c76d49ed6fffd7428bb8966fbfb4f8ea5476cce34233fa6d5cee6b","src/metrics/string.rs":"0bc48c24f933806e77d7e951935dac7d7505a85b8174ab28dcb83fcd9f57e678","src/metrics/string_list.rs":"615d0cb26abcbd0b4dbae501cdb0a0ff2ba006447db0e3fa3ce0e76676f28d80","src/metrics/time_unit.rs":"9bb3f6c03b1d385008b254f36ed35daf22f9a6fa2d18e007c9b70aac767cde50","src/metrics/timespan.rs":"0ddb48ca9087bddf151110694390bea429317cb2f4a998640201aced3c6380c5","src/metrics/timing_distribution.rs":"eefdeaef0659f132a2c46057ee83165797b33812143a6174db1b0fad8db75234","src/metrics/uuid.rs":"e908d89860b90d2880f003ab5829184a8a3a546b51c14ed49456a730ca970669","src/ping/mod.rs":"87de8f88d1a4eb9a37b7891c2efdcb22843437d32a0920f7ded1590c3cd147a1","src/storage/mod.rs":"2f0a1be2801649be65c61aa17ce55f20e96b0bf5be0113b68e5d9472a7fc24b8","src/system.rs":"cb33444d393bf4960ebe716a01de3465f2d5a28969ca1034d9cd1a5b31ed2a7f","src/traits/boolean.rs":"f17f16f379b777e435e38e810e25336a919f4aeeefb1b4e7cf7749c0ef173fd9","src/traits/counter.rs":"631208036059d498a4485c74c2a80c24a5f13bffeb1053bdf5cce06af0e9d361","src/traits/custom_distribution.rs":"1b3ffda6e857bfa8ad5be412e88f3d9706ededf5a86407364ae19a81f06ef798","src/traits/datetime.rs":"2f4b9e64161c15c912b6a915045dd9840f76229d144a4d1542c54eb4f3b3406b","src/traits/event.rs":"c91901e589232f981c5cf4457eaa09cedff4af5cc050fd13db610146811000e9","src/traits/jwe.rs":"80cdc61e6d99d7c05139c9d05288290c731b1be61afcbd4a4c415973665ea194","src/traits/labeled.rs":"7f3281fc0a1a745238e7e260463f397dfa61717408fe9d260dc9767d9c659e52","src/traits/memory_distribution.rs":"0b72ffde68eb97f01a57afbc5c6109565ec9435561984d34696622bf5a57d559","src/traits/mod.rs":"e50dd9e2fa3abe93bfb943e046cb00240be770372c03c915dda63f79ab7f0346","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"087d7a4b58f0eb7c766a0202dcf38a52d172ce4edf626211ffe5d94ed02ae754","src/traits/string.rs":"3ed7751ac92fec4546b5f4ccf47394d87b49ef57efeae3aa44e228148faf9cae","src/traits/string_list.rs":"5d5773d5a130323dd82ca95f4ecdccdd6b237afe2eadf8655363bd6b7e8508c1","src/traits/timespan.rs":"f53281a668ec62b4a68af8fb3413ace6ffe14bcceb65831df6e7c0c5f77830ed","src/traits/timing_distribution.rs":"30735e41ed53c4e80598c390e1c999907e8e4fa74853119280780dc29d3877cc","src/traits/uuid.rs":"bd78515611ba406d8b1bda35a9fe30c317512a9afcea7c5dece8fced7d410a92","src/upload/directory.rs":"939106ec37bf66064b70d11d0c99968bbe445cdd979e39214b4952843ef6444f","src/upload/mod.rs":"e92194a7f8bc91d16904d18d276ff4493f1ceb6c3b7822453f7a5a02ee33cc23","src/upload/policy.rs":"c250957a37783e74af8002cd80ba06ef9780a389fb0f61b8b665b79688f0a360","src/upload/request.rs":"7939e77bde4b55263446c3660b6831bafa27308bc983a51e1679321e962f372f","src/upload/result.rs":"d73454e81f185e4e28c887f7b496bffad7baac74c8f1b719885f940f909a530d","src/util.rs":"4fb47b56b3ddb5c368e6b8a290b05fdb77ddf90bd745c326276c403eee7c77c3","tests/boolean.rs":"9f4830f3b5f5ab6768060917deb1f546324a4744b8ed893197e31a0aed092947","tests/common/mod.rs":"f4856ee4fdf0b29cfea7b251ad7048ec34e5d3d24b75befc649ac13a91cea2df","tests/counter.rs":"39a2cd40335c164b3e7407f5505bbf571d7e4a71f032d476a7939f7dd1af90d0","tests/custom_distribution.rs":"596575504ad4eab2765b5b88245dcc92dc68e83d04c93deb4b27692c142c0b94","tests/datetime.rs":"230698c7101176730483289e90c320ef559197111a814cf2b8db185ab68f82fb","tests/event.rs":"cb78dfc0a2315253da8ef6663b81979dd5b0638bb6c31456f16ce4e9bb50c67a","tests/jwe.rs":"dc8a73d1e1925ac49061e8bb5c8de01230aa364942a22470e37aa88965b0eaba","tests/labeled.rs":"4ac1a36223b5218232c6d83c5a2bfebbf547abe78db4b0fa3609abacc70c39bc","tests/memory_distribution.rs":"0c03d0a491150f508dc12ecac7e5db70043f3a7de2f90cc6b3509aba90549821","tests/metrics.rs":"0560e0645321628015610bbf1a90c0adbb12ad42e5a068399073572120377cbb","tests/ping.rs":"8b80e7d1cdffd6afc513780e9704e83de338697db8a459f0d34830f87aaa5be8","tests/ping_maker.rs":"f65ba2797c0d3acacd8a8b8cc6326d2d60a86284c48b15e707457644ecc680a6","tests/quantity.rs":"2543f0f57085d27b0bc0c25c24c17a7e376ac673cf9265a3a9dec202920679c5","tests/storage.rs":"d8d50aba92e17a3053fd80788f5fbbcc8f82293c11c19b58e2de6c4ee45f71ff","tests/string.rs":"9c3e21bfa3ad0b75373f8f5addb8ac023ac5336ac9f969e92b89ea6fda675fdd","tests/string_list.rs":"2b83710b949bea4bd0f6b2029069887f3ea87312b00091e5aa3c7bda0fb9073c","tests/timespan.rs":"bb61e4cfb843b3f387378409ee1a88ef4b8f32b2181af686baacee262b8bca2b","tests/timing_distribution.rs":"577f5ff0059509f6005014604097f31c7d01536d7f05571c76564af4b88edcbd","tests/uuid.rs":"21f79bc0d456caefc1e7e7931f803da6144eb6af6e1d41aa687a6c9c32175f80"},"package":"b2c8e087b69c8392fca868214b4675230e36832f231cc6045d08caed0d33e3c1"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/Cargo.lock firefox-85.0+build1/third_party/rust/glean-core/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/glean-core/Cargo.lock	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/Cargo.lock	2021-01-18 19:58:25.000000000 +0000
@@ -53,9 +53,9 @@
 
 [[package]]
 name = "cc"
-version = "1.0.62"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
 
 [[package]]
 name = "cfg-if"
@@ -180,7 +180,7 @@
 
 [[package]]
 name = "glean-core"
-version = "33.4.0"
+version = "33.9.1"
 dependencies = [
  "bincode",
  "chrono",
@@ -256,9 +256,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
 
 [[package]]
 name = "lmdb-rkv"
@@ -351,9 +351,9 @@
 
 [[package]]
 name = "ordered-float"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579"
+checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
 dependencies = [
  "num-traits",
 ]
@@ -483,9 +483,9 @@
 
 [[package]]
 name = "rkv"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97d1b6321740ce36d77d67d22ff84ac8a996cf69dbd0727b8bcae52f1c98aaa"
+checksum = "917d7a01f8c1ae46226e9d8dd24314279be7b04dfd0b24340d420e6927c2e687"
 dependencies = [
  "arrayref",
  "bincode",
@@ -512,18 +512,18 @@
 
 [[package]]
 name = "serde"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -532,9 +532,9 @@
 
 [[package]]
 name = "serde_json"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
+checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
 dependencies = [
  "itoa",
  "ryu",
@@ -543,9 +543,9 @@
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -580,9 +580,9 @@
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
  "winapi-util",
 ]
@@ -600,9 +600,9 @@
 
 [[package]]
 name = "tinyvec"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575"
+checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -624,9 +624,9 @@
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6"
+checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
 dependencies = [
  "tinyvec",
 ]
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/Cargo.toml firefox-85.0+build1/third_party/rust/glean-core/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/glean-core/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "glean-core"
-version = "33.4.0"
+version = "33.9.1"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 include = ["/README.md", "/LICENSE", "/src", "/examples", "/tests", "/Cargo.toml"]
 description = "A modern Telemetry library"
@@ -43,7 +43,7 @@
 version = "1.4.1"
 
 [dependencies.rkv]
-version = "0.15.0"
+version = "0.16.0"
 default-features = false
 
 [dependencies.serde]
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/common_metric_data.rs firefox-85.0+build1/third_party/rust/glean-core/src/common_metric_data.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/common_metric_data.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/common_metric_data.rs	2021-01-18 19:58:25.000000000 +0000
@@ -5,7 +5,8 @@
 use std::convert::TryFrom;
 
 use crate::error::{Error, ErrorKind};
-use crate::metrics::dynamic_label;
+#[allow(unused_imports)]
+use crate::metrics::{dynamic_label, LabeledMetric};
 use crate::Glean;
 
 /// The supported metrics' lifetimes.
@@ -68,9 +69,11 @@
     /// Disabled metrics are never recorded.
     pub disabled: bool,
     /// Dynamic label.
-    /// When a LabeledMetric<T> factory creates the specific metric to be
-    /// recorded to, dynamic labels are stored in the specific label so that we
-    /// can validate them when the Glean singleton is available.
+    ///
+    /// When a [`LabeledMetric<T>`](LabeledMetric) factory creates the specific
+    /// metric to be recorded to, dynamic labels are stored in the specific
+    /// label so that we can validate them when the Glean singleton is
+    /// available.
     pub dynamic_label: Option<String>,
 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/database/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/database/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/database/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/database/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -48,7 +48,21 @@
     pub type Writer<'t> = rkv::Writer<rkv::backend::SafeModeRwTransaction<'t>>;
 
     pub fn rkv_new(path: &Path) -> Result<Rkv, rkv::StoreError> {
-        Rkv::new::<rkv::backend::SafeMode>(path)
+        match Rkv::new::<rkv::backend::SafeMode>(path) {
+            // An invalid file can mean:
+            // 1. An empty file.
+            // 2. A corrupted file.
+            //
+            // In both instances there's not much we can do.
+            // Drop the data by removing the file, and start over.
+            Err(rkv::StoreError::FileInvalid) => {
+                let safebin = path.join("data.safe.bin");
+                fs::remove_file(safebin).map_err(|_| rkv::StoreError::FileInvalid)?;
+                // Now try again, we only handle that error once.
+                Rkv::new::<rkv::backend::SafeMode>(path)
+            }
+            other => other,
+        }
     }
 
     fn delete_and_log(path: &Path, msg: &str) {
@@ -98,6 +112,7 @@
                 // Source environment is corrupted.
                 // We start fresh with the new database.
                 Err(MigrateError::StoreError(StoreError::FileInvalid)) => true,
+                Err(MigrateError::StoreError(StoreError::DatabaseCorrupted)) => true,
                 // Path not accessible.
                 // Somehow our directory vanished between us creating it and reading from it.
                 // Nothing we can do really.
@@ -120,6 +135,10 @@
                 // An internal lock was poisoned.
                 // This would only happen if multiple things run concurrently and one crashes.
                 Err(MigrateError::ManagerPoisonError) => false,
+                // Couldn't close source environment and delete files on disk (e.g. other stores still open).
+                // This could only happen if multiple instances are running,
+                // we leave files in place.
+                Err(MigrateError::CloseError(_)) => false,
                 // Other store errors are never returned from the migrator.
                 // We need to handle them to please rustc.
                 Err(MigrateError::StoreError(_)) => false,
@@ -631,7 +650,7 @@
             let mut res = Ok(());
             for to_delete in metrics {
                 if let Err(e) = store.delete(&mut writer, to_delete) {
-                    log::error!("Can't delete from store: {:?}", e);
+                    log::warn!("Can't delete from store: {:?}", e);
                     res = Err(e);
                 }
             }
@@ -706,7 +725,7 @@
             Ok(())
         });
         if let Err(e) = res {
-            log::error!("Could not clear store for lifetime {:?}: {:?}", lifetime, e);
+            log::warn!("Could not clear store for lifetime {:?}: {:?}", lifetime, e);
         }
     }
 
@@ -1303,12 +1322,72 @@
         );
     }
 
+    /// LDMB ignores an empty database file just fine.
+    #[cfg(not(feature = "rkv-safe-mode"))]
+    #[test]
+    fn empty_data_file() {
+        let dir = tempdir().unwrap();
+        let str_dir = dir.path().display().to_string();
+
+        // Create database directory structure.
+        let database_dir = dir.path().join("db");
+        fs::create_dir_all(&database_dir).expect("create database dir");
+
+        // Create empty database file.
+        let datamdb = database_dir.join("data.mdb");
+        let f = fs::File::create(datamdb).expect("create database file");
+        drop(f);
+
+        Database::new(&str_dir, false).unwrap();
+
+        assert!(dir.path().exists());
+    }
+
     #[cfg(feature = "rkv-safe-mode")]
-    mod safe_mode_migration {
+    mod safe_mode {
+        use std::fs::File;
+
         use super::*;
         use rkv::Value;
 
         #[test]
+        fn empty_data_file() {
+            let dir = tempdir().unwrap();
+            let str_dir = dir.path().display().to_string();
+
+            // Create database directory structure.
+            let database_dir = dir.path().join("db");
+            fs::create_dir_all(&database_dir).expect("create database dir");
+
+            // Create empty database file.
+            let safebin = database_dir.join("data.safe.bin");
+            let f = File::create(safebin).expect("create database file");
+            drop(f);
+
+            Database::new(&str_dir, false).unwrap();
+
+            assert!(dir.path().exists());
+        }
+
+        #[test]
+        fn corrupted_data_file() {
+            let dir = tempdir().unwrap();
+            let str_dir = dir.path().display().to_string();
+
+            // Create database directory structure.
+            let database_dir = dir.path().join("db");
+            fs::create_dir_all(&database_dir).expect("create database dir");
+
+            // Create empty database file.
+            let safebin = database_dir.join("data.safe.bin");
+            fs::write(safebin, "<broken>").expect("write to database file");
+
+            Database::new(&str_dir, false).unwrap();
+
+            assert!(dir.path().exists());
+        }
+
+        #[test]
         fn migration_works_on_startup() {
             let dir = tempdir().unwrap();
             let str_dir = dir.path().display().to_string();
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/debug.rs firefox-85.0+build1/third_party/rust/glean-core/src/debug.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/debug.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/debug.rs	2021-01-18 19:58:25.000000000 +0000
@@ -151,7 +151,7 @@
             self.value = Some(value);
             return true;
         }
-        log::info!("Invalid value for debug option {}.", self.env);
+        log::error!("Invalid value for debug option {}.", self.env);
         false
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/error_recording.rs firefox-85.0+build1/third_party/rust/glean-core/src/error_recording.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/error_recording.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/error_recording.rs	2021-01-18 19:58:25.000000000 +0000
@@ -24,7 +24,7 @@
 
 /// The possible error types for metric recording.
 /// Note: the cases in this enum must be kept in sync with the ones
-/// in the platform-specific code (e.g. ErrorType.kt) and with the
+/// in the platform-specific code (e.g. `ErrorType.kt`) and with the
 /// metrics in the registry files.
 #[derive(Debug, PartialEq)]
 pub enum ErrorType {
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/error.rs firefox-85.0+build1/third_party/rust/glean-core/src/error.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/error.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/error.rs	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 
 /// A specialized [`Result`] type for this crate's operations.
 ///
-/// This is generally used to avoid writing out [Error] directly and
+/// This is generally used to avoid writing out [`Error`] directly and
 /// is otherwise a direct mapping to [`Result`].
 ///
 /// [`Result`]: https://doc.rust-lang.org/stable/std/result/enum.Result.html
@@ -53,7 +53,7 @@
     /// HistogramType conversion failed
     HistogramType(i32),
 
-    /// OsString conversion failed
+    /// [`OsString`] conversion failed
     OsString(OsString),
 
     /// Unknown error
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/event_database/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/event_database/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/event_database/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/event_database/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -121,15 +121,20 @@
         match self.load_events_from_disk() {
             Ok(_) => self.send_all_events(glean),
             Err(err) => {
-                log::error!("Error loading events from disk: {}", err);
+                log::warn!("Error loading events from disk: {}", err);
                 false
             }
         }
     }
 
     fn load_events_from_disk(&self) -> Result<()> {
-        let _lock = self.file_lock.read().unwrap(); // safe unwrap, only error case is poisoning
+        // NOTE: The order of locks here is important.
+        // In other code parts we might acquire the `file_lock` when we already have acquired
+        // a lock on `event_stores`.
+        // This is a potential lock-order-inversion.
         let mut db = self.event_stores.write().unwrap(); // safe unwrap, only error case is poisoning
+        let _lock = self.file_lock.read().unwrap(); // safe unwrap, only error case is poisoning
+
         for entry in fs::read_dir(&self.path)? {
             let entry = entry?;
             if entry.file_type()?.is_file() {
@@ -156,7 +161,7 @@
         let mut ping_sent = false;
         for store_name in store_names {
             if let Err(err) = glean.submit_ping_by_name(&store_name, Some("startup")) {
-                log::error!(
+                log::warn!(
                     "Error flushing existing events to the '{}' ping: {}",
                     store_name,
                     err
@@ -220,7 +225,7 @@
         // containing those events immediately.
         for store_name in stores_to_submit {
             if let Err(err) = glean.submit_ping_by_name(store_name, Some("max_capacity")) {
-                log::error!(
+                log::warn!(
                     "Got more than {} events, but could not send {} ping: {}",
                     glean.get_max_events(),
                     store_name,
@@ -244,7 +249,7 @@
             .open(self.path.join(store_name))
             .and_then(|mut file| writeln!(file, "{}", event_json))
         {
-            log::error!("IO error writing event to store '{}': {}", store_name, err);
+            log::warn!("IO error writing event to store '{}': {}", store_name, err);
         }
     }
 
@@ -275,7 +280,7 @@
                         store.iter().map(|e| e.serialize_relative(first_timestamp)),
                     ))
                 } else {
-                    log::error!("Unexpectly got empty event store for '{}'", store_name);
+                    log::warn!("Unexpectly got empty event store for '{}'", store_name);
                     None
                 }
             })
@@ -293,7 +298,7 @@
                     std::io::ErrorKind::NotFound => {
                         // silently drop this error, the file was already non-existing
                     }
-                    _ => log::error!("Error removing events queue file '{}': {}", store_name, err),
+                    _ => log::warn!("Error removing events queue file '{}': {}", store_name, err),
                 }
             }
         }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/lib.rs firefox-85.0+build1/third_party/rust/glean-core/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,6 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![deny(broken_intra_doc_links)]
 #![deny(missing_docs)]
 
 //! Glean is a modern approach for recording and sending Telemetry data.
@@ -48,6 +49,7 @@
 pub use crate::error::{Error, ErrorKind, Result};
 pub use crate::error_recording::{test_get_num_recorded_errors, ErrorType};
 use crate::event_database::EventDatabase;
+pub use crate::histogram::HistogramType;
 use crate::internal_metrics::{CoreMetrics, DatabaseMetrics};
 use crate::internal_pings::InternalPings;
 use crate::metrics::{Metric, MetricType, PingType};
@@ -95,7 +97,7 @@
     // initialized.
     if GLEAN.get().is_none() {
         if GLEAN.set(Mutex::new(glean)).is_err() {
-            log::error!(
+            log::warn!(
                 "Global Glean object is initialized already. This probably happened concurrently."
             )
         }
@@ -233,8 +235,9 @@
 
     /// Creates and initializes a new Glean object.
     ///
-    /// This will create the necessary directories and files in `data_path`.
-    /// This will also initialize the core metrics.
+    /// This will create the necessary directories and files in
+    /// [`cfg.data_path`](Configuration::data_path). This will also initialize
+    /// the core metrics.
     pub fn new(cfg: Configuration) -> Result<Self> {
         let mut glean = Self::new_for_subprocess(&cfg, false)?;
 
@@ -411,7 +414,7 @@
     ///
     /// Should only be called when the state actually changes.
     ///
-    /// The upload_enabled flag is set to true and the core Glean metrics are
+    /// The `upload_enabled` flag is set to true and the core Glean metrics are
     /// recreated.
     fn on_upload_enabled(&mut self) {
         self.upload_enabled = true;
@@ -453,7 +456,7 @@
         // Clear any pending pings.
         let ping_maker = PingMaker::new();
         if let Err(err) = ping_maker.clear_pending_pings(self.get_data_path()) {
-            log::error!("Error clearing pending pings: {}", err);
+            log::warn!("Error clearing pending pings: {}", err);
         }
 
         // Delete all stored metrics.
@@ -463,7 +466,7 @@
             data.clear_all()
         }
         if let Err(err) = self.event_data_store.clear_all() {
-            log::error!("Error clearing pending events: {}", err);
+            log::warn!("Error clearing pending events: {}", err);
         }
 
         // This does not clear the experiments store (which isn't managed by the
@@ -525,13 +528,16 @@
     ///
     /// This can be one of:
     ///
-    /// * `Wait` - which means the requester should ask again later;
-    /// * `Upload(PingRequest)` - which means there is a ping to upload. This wraps the actual request object;
-    /// * `Done` - which means requester should stop asking for now.
+    /// * [`Wait`](PingUploadTask::Wait) - which means the requester should ask
+    ///   again later;
+    /// * [`Upload(PingRequest)`](PingUploadTask::Upload) - which means there is
+    ///   a ping to upload. This wraps the actual request object;
+    /// * [`Done`](PingUploadTask::Done) - which means requester should stop
+    ///   asking for now.
     ///
     /// # Returns
     ///
-    /// A [`PingUploadTask`](upload/enum.PingUploadTask.html) representing the next task.
+    /// A [`PingUploadTask`] representing the next task.
     pub fn get_upload_task(&self) -> PingUploadTask {
         self.upload_manager.get_upload_task(self, self.log_pings())
     }
@@ -668,9 +674,8 @@
     ///
     /// # Returns
     ///
-    /// The [`PingType`] of a ping if the given name was registered before, `None` otherwise.
-    ///
-    /// [`PingType`]: metrics/struct.PingType.html
+    /// The [`PingType`] of a ping if the given name was registered before, [`None`]
+    /// otherwise.
     pub fn get_ping_by_name(&self, ping_name: &str) -> Option<&PingType> {
         self.ping_registry.get(ping_name)
     }
@@ -719,9 +724,9 @@
         metric.set_inactive(&self);
     }
 
-    /// Persists Lifetime::Ping data that might be in memory
-    /// in case `delay_ping_lifetime_io` is set or was set
-    /// at a previous time.
+    /// Persists [`Lifetime::Ping`] data that might be in memory in case
+    /// [`delay_ping_lifetime_io`](Configuration::delay_ping_lifetime_io) is set
+    /// or was set at a previous time.
     ///
     /// If there is no data to persist, this function does nothing.
     pub fn persist_ping_lifetime_data(&self) -> Result<()> {
@@ -737,11 +742,11 @@
         self.core_metrics.os.set(self, system::OS);
     }
 
-    /// ** This is not meant to be used directly.**
+    /// **This is not meant to be used directly.**
     ///
-    /// Clears all the metrics that have `Lifetime::Application`.
+    /// Clears all the metrics that have [`Lifetime::Application`].
     pub fn clear_application_lifetime_metrics(&self) {
-        log::debug!("Clearing Lifetime::Application metrics");
+        log::trace!("Clearing Lifetime::Application metrics");
         if let Some(data) = self.data_store.as_ref() {
             data.clear_lifetime(Lifetime::Application);
         }
@@ -769,10 +774,10 @@
         self.debug.debug_view_tag.set(value.into())
     }
 
-    /// Return the value for the debug view tag or `None` if it hasn't been set.
+    /// Return the value for the debug view tag or [`None`] if it hasn't been set.
     ///
-    /// The debug_view_tag may be set from an environment variable (GLEAN_DEBUG_VIEW_TAG)
-    /// or through the `set_debug_view_tag` function.
+    /// The `debug_view_tag` may be set from an environment variable
+    /// (`GLEAN_DEBUG_VIEW_TAG`) or through the [`set_debug_view_tag`] function.
     pub(crate) fn debug_view_tag(&self) -> Option<&String> {
         self.debug.debug_view_tag.get()
     }
@@ -790,10 +795,10 @@
         self.debug.source_tags.set(value)
     }
 
-    /// Return the value for the source tags or `None` if it hasn't been set.
+    /// Return the value for the source tags or [`None`] if it hasn't been set.
     ///
-    /// The source_tags may be set from an environment variable (GLEAN_SOURCE_TAGS)
-    /// or through the `set_source_tags` function.
+    /// The `source_tags` may be set from an environment variable (`GLEAN_SOURCE_TAGS`)
+    /// or through the [`set_source_tags`] function.
     pub(crate) fn source_tags(&self) -> Option<&Vec<String>> {
         self.debug.source_tags.get()
     }
@@ -812,10 +817,10 @@
         self.debug.log_pings.set(value)
     }
 
-    /// Return the value for the log pings debug option or `None` if it hasn't been set.
+    /// Return the value for the log pings debug option or [`None`] if it hasn't been set.
     ///
-    /// The log_pings option may be set from an environment variable (GLEAN_LOG_PINGS)
-    /// or through the `set_log_pings` function.
+    /// The `log_pings` option may be set from an environment variable (`GLEAN_LOG_PINGS`)
+    /// or through the [`set_log_pings`] function.
     pub(crate) fn log_pings(&self) -> bool {
         self.debug.log_pings.get().copied().unwrap_or(false)
     }
@@ -831,7 +836,7 @@
         })
     }
 
-    /// ** This is not meant to be used directly.**
+    /// **This is not meant to be used directly.**
     ///
     /// Sets the value of a "dirty flag" in the permanent storage.
     ///
@@ -850,7 +855,7 @@
         self.get_dirty_bit_metric().set(self, new_value);
     }
 
-    /// ** This is not meant to be used directly.**
+    /// **This is not meant to be used directly.**
     ///
     /// Checks the stored value of the "dirty flag".
     pub fn is_dirty_flag_set(&self) -> bool {
@@ -859,6 +864,7 @@
             self.storage(),
             INTERNAL_STORAGE,
             &dirty_bit_metric.meta().identifier(self),
+            dirty_bit_metric.meta().lifetime,
         ) {
             Some(Metric::Boolean(b)) => b,
             _ => false,
@@ -892,7 +898,9 @@
     /// # Returns
     ///
     /// A JSON string with the following format:
-    /// { 'branch': 'the-branch-name', 'extra': {'key': 'value', ...}}
+    ///
+    ///   `{ 'branch': 'the-branch-name', 'extra': {'key': 'value', ...}}`
+    ///
     /// if the requested experiment is active, `None` otherwise.
     pub fn test_get_experiment_data_as_json(&self, experiment_id: String) -> Option<String> {
         let metric = metrics::ExperimentMetric::new(&self, experiment_id);
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/boolean.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/boolean.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/boolean.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/boolean.rs	2021-01-18 19:58:25.000000000 +0000
@@ -61,6 +61,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Boolean(b)) => Some(b),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/counter.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/counter.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/counter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/counter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -84,6 +84,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Counter(i)) => Some(i),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/custom_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/custom_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/custom_distribution.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/custom_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -76,7 +76,7 @@
     ///
     /// ## Notes
     ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
+    /// Discards any negative value in `samples` and report an [`ErrorType::InvalidValue`]
     /// for each of them.
     pub fn accumulate_samples_signed(&self, glean: &Glean, samples: Vec<i64>) {
         if !self.should_record(glean) {
@@ -162,6 +162,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             // Boxing the value, in order to return either of the possible buckets
             Some(Metric::CustomDistributionExponential(hist)) => Some(snapshot(&hist)),
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/datetime.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/datetime.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/datetime.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/datetime.rs	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 use crate::CommonMetricData;
 use crate::Glean;
 
-use chrono::{DateTime, FixedOffset, TimeZone};
+use chrono::{DateTime, FixedOffset, TimeZone, Timelike};
 
 /// A datetime type.
 ///
@@ -110,7 +110,7 @@
     /// # Arguments
     ///
     /// * `glean` - the Glean instance this metric belongs to.
-    /// * `value` - Some date/time value, with offset, to set the metric to.
+    /// * `value` - Some [`DateTime`] value, with offset, to set the metric to.
     ///             If none, the current local time is used.
     pub fn set(&self, glean: &Glean, value: Option<Datetime>) {
         if !self.should_record(glean) {
@@ -136,7 +136,8 @@
         match StorageManager.snapshot_metric(
             glean.storage(),
             storage_name,
-            &self.meta().identifier(glean),
+            &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Datetime(dt, _)) => Some(dt),
             _ => None,
@@ -145,6 +146,65 @@
 
     /// **Test-only API (exported for FFI purposes).**
     ///
+    /// Gets the stored datetime value.
+    ///
+    /// The precision of this value is truncated to the `time_unit` precision.
+    ///
+    /// # Arguments
+    ///
+    /// * `glean` - the Glean instance this metric belongs to.
+    /// * `storage_name` - the storage name to look into.
+    ///
+    /// # Returns
+    ///
+    /// The stored value or `None` if nothing stored.
+    pub fn test_get_value(&self, glean: &Glean, storage_name: &str) -> Option<Datetime> {
+        match StorageManager.snapshot_metric(
+            glean.storage(),
+            storage_name,
+            &self.meta.identifier(glean),
+            self.meta.lifetime,
+        ) {
+            Some(Metric::Datetime(d, tu)) => {
+                // The string version of the test function truncates using string
+                // parsing. Unfortunately `parse_from_str` errors with `NotEnough` if we
+                // try to truncate with `get_iso_time_string` and then parse it back
+                // in a `Datetime`. So we need to truncate manually.
+                let time = d.time();
+                match tu {
+                    TimeUnit::Nanosecond => d.date().and_hms_nano_opt(
+                        time.hour(),
+                        time.minute(),
+                        time.second(),
+                        time.nanosecond(),
+                    ),
+                    TimeUnit::Microsecond => d.date().and_hms_nano_opt(
+                        time.hour(),
+                        time.minute(),
+                        time.second(),
+                        time.nanosecond() / 1000,
+                    ),
+                    TimeUnit::Millisecond => d.date().and_hms_nano_opt(
+                        time.hour(),
+                        time.minute(),
+                        time.second(),
+                        time.nanosecond() / 1000000,
+                    ),
+                    TimeUnit::Second => {
+                        d.date()
+                            .and_hms_nano_opt(time.hour(), time.minute(), time.second(), 0)
+                    }
+                    TimeUnit::Minute => d.date().and_hms_nano_opt(time.hour(), time.minute(), 0, 0),
+                    TimeUnit::Hour => d.date().and_hms_nano_opt(time.hour(), 0, 0, 0),
+                    TimeUnit::Day => d.date().and_hms_nano_opt(0, 0, 0, 0),
+                }
+            }
+            _ => None,
+        }
+    }
+
+    /// **Test-only API (exported for FFI purposes).**
+    ///
     /// Gets the currently stored value as a String.
     ///
     /// The precision of this value is truncated to the `time_unit` precision.
@@ -155,6 +215,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Datetime(d, tu)) => Some(get_iso_time_string(d, tu)),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/event.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/event.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/event.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/event.rs	2021-01-18 19:58:25.000000000 +0000
@@ -57,7 +57,7 @@
     /// * `timestamp` - A monotonically increasing timestamp, in milliseconds.
     ///   This must be provided since the actual recording of the event may
     ///   happen some time later than the moment the event occurred.
-    /// * `extra` - A HashMap of (key, value) pairs. The key is an index into
+    /// * `extra` - A [`HashMap`] of (key, value) pairs. The key is an index into
     ///   the metric's `allowed_extra_keys` vector where the key's string is
     ///   looked up. If any key index is out of range, an error is reported and
     ///   no event is recorded.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/experiment.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/experiment.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/experiment.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/experiment.rs	2021-01-18 19:58:25.000000000 +0000
@@ -225,6 +225,7 @@
             glean.storage(),
             INTERNAL_STORAGE,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Experiment(e)) => Some(json!(e).to_string()),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/jwe.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/jwe.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/jwe.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/jwe.rs	2021-01-18 19:58:25.000000000 +0000
@@ -294,6 +294,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Jwe(b)) => Some(b),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/labeled.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/labeled.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/labeled.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/labeled.rs	2021-01-18 19:58:25.000000000 +0000
@@ -89,7 +89,7 @@
 {
     /// Creates a new labeled metric from the given metric instance and optional list of labels.
     ///
-    /// See [`get`](#method.get) for information on how static or dynamic labels are handled.
+    /// See [`get`](LabeledMetric::get) for information on how static or dynamic labels are handled.
     pub fn new(submetric: T, labels: Option<Vec<String>>) -> LabeledMetric<T> {
         LabeledMetric { labels, submetric }
     }
@@ -187,7 +187,7 @@
     identifier.splitn(2, '/').next().unwrap()
 }
 
-/// Validates a dynamic label, changing it to OTHER_LABEL if it's invalid.
+/// Validates a dynamic label, changing it to `OTHER_LABEL` if it's invalid.
 ///
 /// Checks the requested label against limitations, such as the label length and allowed
 /// characters.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/memory_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/memory_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/memory_distribution.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/memory_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -71,7 +71,7 @@
     /// ## Notes
     ///
     /// Values bigger than 1 Terabyte (2<sup>40</sup> bytes) are truncated
-    /// and an `ErrorType::InvalidValue` error is recorded.
+    /// and an [`ErrorType::InvalidValue`] error is recorded.
     pub fn accumulate(&self, glean: &Glean, sample: u64) {
         if !self.should_record(glean) {
             return;
@@ -107,11 +107,10 @@
     /// will take care of filtering and reporting errors for any provided negative
     /// sample.
     ///
-    /// Please note that this assumes that the provided samples are already in the
-    /// "unit" declared by the instance of the implementing metric type (e.g. if the
-    /// implementing class is a [MemoryDistributionMetricType] and the instance this
-    /// method was called on is using [MemoryUnit.Kilobyte], then `samples` are assumed
-    /// to be in that unit).
+    /// Please note that this assumes that the provided samples are already in
+    /// the "unit" declared by the instance of the metric type (e.g. if the the
+    /// instance this method was called on is using [`MemoryUnit::Kilobyte`], then
+    /// `samples` are assumed to be in that unit).
     ///
     /// # Arguments
     ///
@@ -119,10 +118,11 @@
     ///
     /// ## Notes
     ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
+    /// Discards any negative value in `samples` and report an [`ErrorType::InvalidValue`]
     /// for each of them.
+    ///
     /// Values bigger than 1 Terabyte (2<sup>40</sup> bytes) are truncated
-    /// and an `ErrorType::InvalidValue` error is recorded.
+    /// and an [`ErrorType::InvalidValue`] error is recorded.
     pub fn accumulate_samples_signed(&self, glean: &Glean, samples: Vec<i64>) {
         if !self.should_record(glean) {
             return;
@@ -190,6 +190,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::MemoryDistribution(hist)) => Some(snapshot(&hist)),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/memory_unit.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/memory_unit.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/memory_unit.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/memory_unit.rs	2021-01-18 19:58:25.000000000 +0000
@@ -46,7 +46,7 @@
 }
 
 /// Trait implementation for converting an integer value
-/// to a MemoryUnit. This is used in the FFI code. Please
+/// to a [`MemoryUnit`]. This is used in the FFI code. Please
 /// note that values should match the ordering of the platform
 /// specific side of things (e.g. Kotlin implementation).
 impl TryFrom<i32> for MemoryUnit {
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -87,39 +87,39 @@
 /// **Any new metric must be added at the end.**
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
 pub enum Metric {
-    /// A boolean metric. See [`BooleanMetric`](struct.BooleanMetric.html) for more information.
+    /// A boolean metric. See [`BooleanMetric`] for more information.
     Boolean(bool),
-    /// A counter metric. See [`CounterMetric`](struct.CounterMetric.html) for more information.
+    /// A counter metric. See [`CounterMetric`] for more information.
     Counter(i32),
     /// A custom distribution with precomputed exponential bucketing.
-    /// See [`CustomDistributionMetric`](struct.CustomDistributionMetric.html) for more information.
+    /// See [`CustomDistributionMetric`] for more information.
     CustomDistributionExponential(Histogram<PrecomputedExponential>),
     /// A custom distribution with precomputed linear bucketing.
-    /// See [`CustomDistributionMetric`](struct.CustomDistributionMetric.html) for more information.
+    /// See [`CustomDistributionMetric`] for more information.
     CustomDistributionLinear(Histogram<PrecomputedLinear>),
-    /// A datetime metric. See [`DatetimeMetric`](struct.DatetimeMetric.html) for more information.
+    /// A datetime metric. See [`DatetimeMetric`] for more information.
     Datetime(DateTime<FixedOffset>, TimeUnit),
-    /// An experiment metric. See [`ExperimentMetric`](struct.ExperimentMetric.html) for more information.
+    /// An experiment metric. See `ExperimentMetric` for more information.
     Experiment(experiment::RecordedExperimentData),
-    /// A quantity metric. See [`QuantityMetric`](struct.QuantityMetric.html) for more information.
+    /// A quantity metric. See [`QuantityMetric`] for more information.
     Quantity(i64),
-    /// A string metric. See [`StringMetric`](struct.StringMetric.html) for more information.
+    /// A string metric. See [`StringMetric`] for more information.
     String(String),
-    /// A string list metric. See [`StringListMetric`](struct.StringListMetric.html) for more information.
+    /// A string list metric. See [`StringListMetric`] for more information.
     StringList(Vec<String>),
-    /// A UUID metric. See [`UuidMetric`](struct.UuidMetric.html) for more information.
+    /// A UUID metric. See [`UuidMetric`] for more information.
     Uuid(String),
-    /// A timespan metric. See [`TimespanMetric`](struct.TimespanMetric.html) for more information.
+    /// A timespan metric. See [`TimespanMetric`] for more information.
     Timespan(std::time::Duration, TimeUnit),
-    /// A timing distribution. See [`TimingDistributionMetric`](struct.TimingDistributionMetric.html) for more information.
+    /// A timing distribution. See [`TimingDistributionMetric`] for more information.
     TimingDistribution(Histogram<Functional>),
-    /// A memory distribution. See [`MemoryDistributionMetric`](struct.MemoryDistributionMetric.html) for more information.
+    /// A memory distribution. See [`MemoryDistributionMetric`] for more information.
     MemoryDistribution(Histogram<Functional>),
-    /// A JWE metric. See [`JweMetric`](struct.JweMetric.html) for more information.
+    /// A JWE metric. See [`JweMetric`] for more information.
     Jwe(String),
 }
 
-/// A `MetricType` describes common behavior across all metrics.
+/// A [`MetricType`] describes common behavior across all metrics.
 pub trait MetricType {
     /// Access the stored metadata
     fn meta(&self) -> &CommonMetricData;
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/ping.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/ping.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/ping.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/ping.rs	2021-01-18 19:58:25.000000000 +0000
@@ -59,7 +59,7 @@
     ///
     /// # Returns
     ///
-    /// See [`Glean#submit_ping`](../struct.Glean.html#method.submit_ping) for details.
+    /// See [`Glean::submit_ping`](crate::Glean::submit_ping) for details.
     pub fn submit(&self, glean: &Glean, reason: Option<&str>) -> Result<bool> {
         let corrected_reason = match reason {
             Some(reason) => {
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/quantity.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/quantity.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/quantity.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/quantity.rs	2021-01-18 19:58:25.000000000 +0000
@@ -78,6 +78,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Quantity(i)) => Some(i),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/string_list.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/string_list.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/string_list.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/string_list.rs	2021-01-18 19:58:25.000000000 +0000
@@ -95,7 +95,9 @@
     /// ## Notes
     ///
     /// If passed an empty list, records an error and returns.
+    ///
     /// Truncates the list if it is longer than `MAX_LIST_LENGTH` and logs an error.
+    ///
     /// Truncates any value in the list if it is longer than `MAX_STRING_LENGTH` and logs an error.
     pub fn set(&self, glean: &Glean, value: Vec<String>) {
         if !self.should_record(glean) {
@@ -135,6 +137,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::StringList(values)) => Some(values),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/string.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/string.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/string.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/string.rs	2021-01-18 19:58:25.000000000 +0000
@@ -71,6 +71,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::String(s)) => Some(s),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/timespan.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/timespan.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/timespan.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/timespan.rs	2021-01-18 19:58:25.000000000 +0000
@@ -48,9 +48,10 @@
 
     /// Starts tracking time for the provided metric.
     ///
-    /// This records an error if it's already tracking time (i.e. start was already
-    /// called with no corresponding `stop`): in that case the original
-    /// start time will be preserved.
+    /// This records an error if it's already tracking time (i.e. start was
+    /// already called with no corresponding
+    /// [`set_stop`](TimespanMetric::set_stop)): in that case the original start
+    /// time will be preserved.
     pub fn set_start(&mut self, glean: &Glean, start_time: u64) {
         if !self.should_record(glean) {
             return;
@@ -72,7 +73,7 @@
 
     /// Stops tracking time for the provided metric. Sets the metric to the elapsed time.
     ///
-    /// This will record an error if no `start` was called.
+    /// This will record an error if no [`set_start`](TimespanMetric::set_start) was called.
     pub fn set_stop(&mut self, glean: &Glean, stop_time: u64) {
         if !self.should_record(glean) {
             // Reset timer when disabled, so that we don't record timespans across
@@ -92,30 +93,46 @@
             return;
         }
 
-        let duration = stop_time - self.start_time.take().unwrap();
+        let start_time = self.start_time.take().unwrap();
+        let duration = match stop_time.checked_sub(start_time) {
+            Some(duration) => duration,
+            None => {
+                record_error(
+                    glean,
+                    &self.meta,
+                    ErrorType::InvalidValue,
+                    "Timespan was negative",
+                    None,
+                );
+                return;
+            }
+        };
         let duration = Duration::from_nanos(duration);
-        self.set_raw(glean, duration, false);
+        self.set_raw(glean, duration);
     }
 
-    /// Aborts a previous `start` call. No error is recorded if no `start` was called.
+    /// Aborts a previous [`set_start`](TimespanMetric::set_start) call. No
+    /// error is recorded if no [`set_start`](TimespanMetric::set_start) was
+    /// called.
     pub fn cancel(&mut self) {
         self.start_time = None;
     }
 
     /// Explicitly sets the timespan value.
     ///
-    /// This API should only be used if your library or application requires recording
-    /// times in a way that can not make use of `start`/`stop`/`cancel`.
-    ///
-    /// Care should be taken using this if the ping lifetime might contain more than one
-    /// timespan measurement. To be safe, `set_raw` should generally be followed by
+    /// This API should only be used if your library or application requires
+    /// recording times in a way that can not make use of
+    /// [`set_start`](TimespanMetric::set_start)/[`set_stop`](TimespanMetric::set_stop)/[`cancel`](TimespanMetric::cancel).
+    ///
+    /// Care should be taken using this if the ping lifetime might contain more
+    /// than one timespan measurement. To be safe,
+    /// [`set_raw`](TimespanMetric::set_raw) should generally be followed by
     /// sending a custom ping containing the timespan.
     ///
     /// # Arguments
     ///
     /// * `elapsed` - The elapsed time to record.
-    /// * `overwrite` - Whether or not to overwrite existing data.
-    pub fn set_raw(&self, glean: &Glean, elapsed: Duration, overwrite: bool) {
+    pub fn set_raw(&self, glean: &Glean, elapsed: Duration) {
         if !self.should_record(glean) {
             return;
         }
@@ -133,19 +150,15 @@
 
         let mut report_value_exists: bool = false;
         glean.storage().record_with(glean, &self.meta, |old_value| {
-            if overwrite {
-                Metric::Timespan(elapsed, self.time_unit)
-            } else {
-                match old_value {
-                    Some(old @ Metric::Timespan(..)) => {
-                        // If some value already exists, report an error.
-                        // We do this out of the storage since recording an
-                        // error accesses the storage as well.
-                        report_value_exists = true;
-                        old
-                    }
-                    _ => Metric::Timespan(elapsed, self.time_unit),
+            match old_value {
+                Some(old @ Metric::Timespan(..)) => {
+                    // If some value already exists, report an error.
+                    // We do this out of the storage since recording an
+                    // error accesses the storage as well.
+                    report_value_exists = true;
+                    old
                 }
+                _ => Metric::Timespan(elapsed, self.time_unit),
             }
         });
 
@@ -170,6 +183,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Timespan(time, time_unit)) => Some(time_unit.duration_convert(time)),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/timing_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/timing_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/timing_distribution.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/timing_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -48,7 +48,7 @@
 
     /// Start a new timer and set it to the `start_time`.
     ///
-    /// Returns a new `TimerId` identifying the timer.
+    /// Returns a new [`TimerId`] identifying the timer.
     fn set_start(&mut self, start_time: u64) -> TimerId {
         let id = self.next_id;
         self.next_id += 1;
@@ -138,9 +138,10 @@
 
     /// Starts tracking time for the provided metric.
     ///
-    /// This records an error if it’s already tracking time (i.e. start was already
-    /// called with no corresponding [stop]): in that case the original
-    /// start time will be preserved.
+    /// This records an error if it’s already tracking time (i.e.
+    /// [`set_start`](TimingDistributionMetric::set_start) was already called with no
+    /// corresponding [`set_stop_and_accumulate`](TimingDistributionMetric::set_stop_and_accumulate)): in
+    /// that case the original start time will be preserved.
     ///
     /// # Arguments
     ///
@@ -148,7 +149,7 @@
     ///
     /// # Returns
     ///
-    /// A unique `TimerId` for the new timer.
+    /// A unique [`TimerId`] for the new timer.
     pub fn set_start(&mut self, start_time: u64) -> TimerId {
         self.timings.set_start(start_time)
     }
@@ -156,11 +157,12 @@
     /// Stops tracking time for the provided metric and associated timer id.
     ///
     /// Adds a count to the corresponding bucket in the timing distribution.
-    /// This will record an error if no `start` was called.
+    /// This will record an error if no
+    /// [`set_start`](TimingDistributionMetric::set_start) was called.
     ///
     /// # Arguments
     ///
-    /// * `id` - The `TimerId` to associate with this timing. This allows
+    /// * `id` - The [`TimerId`] to associate with this timing. This allows
     ///   for concurrent timing of events associated with different ids to the
     ///   same timespan metric.
     /// * `stop_time` - Timestamp in nanoseconds.
@@ -211,12 +213,13 @@
             });
     }
 
-    /// Aborts a previous `set_start` call. No error is recorded if no `set_start`
-    /// was called.
+    /// Aborts a previous [`set_start`](TimingDistributionMetric::set_start)
+    /// call. No error is recorded if no
+    /// [`set_start`](TimingDistributionMetric.set_start) was called.
     ///
     /// # Arguments
     ///
-    /// * `id` - The `TimerId` to associate with this timing. This allows
+    /// * `id` - The [`TimerId`] to associate with this timing. This allows
     ///   for concurrent timing of events associated with different ids to the
     ///   same timing distribution metric.
     pub fn cancel(&mut self, id: TimerId) {
@@ -230,11 +233,10 @@
     /// will take care of filtering and reporting errors for any provided negative
     /// sample.
     ///
-    /// Please note that this assumes that the provided samples are already in the
-    /// "unit" declared by the instance of the implementing metric type (e.g. if the
-    /// implementing class is a [TimingDistributionMetricType] and the instance this
-    /// method was called on is using [TimeUnit.Second], then `samples` are assumed
-    /// to be in that unit).
+    /// Please note that this assumes that the provided samples are already in
+    /// the "unit" declared by the instance of the metric type (e.g. if the
+    /// instance this method was called on is using [`TimeUnit::Second`], then
+    /// `samples` are assumed to be in that unit).
     ///
     /// # Arguments
     ///
@@ -242,8 +244,8 @@
     ///
     /// ## Notes
     ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
-    /// for each of them. Reports an `ErrorType::InvalidOverflow` error for samples that
+    /// Discards any negative value in `samples` and report an [`ErrorType::InvalidValue`]
+    /// for each of them. Reports an [`ErrorType::InvalidOverflow`] error for samples that
     /// are longer than `MAX_SAMPLE_TIME`.
     pub fn accumulate_samples_signed(&mut self, glean: &Glean, samples: Vec<i64>) {
         if !self.should_record(glean) {
@@ -321,6 +323,7 @@
             glean.storage(),
             storage_name,
             &self.meta.identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::TimingDistribution(hist)) => Some(snapshot(&hist)),
             _ => None,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/uuid.rs firefox-85.0+build1/third_party/rust/glean-core/src/metrics/uuid.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/metrics/uuid.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/metrics/uuid.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,6 +4,7 @@
 
 use uuid::Uuid;
 
+use crate::error_recording::{record_error, ErrorType};
 use crate::metrics::Metric;
 use crate::metrics::MetricType;
 use crate::storage::StorageManager;
@@ -43,7 +44,7 @@
     /// # Arguments
     ///
     /// * `glean` - The Glean instance this metric belongs to.
-    /// * `value` - The UUID to set the metric to.
+    /// * `value` - The [`Uuid`] to set the metric to.
     pub fn set(&self, glean: &Glean, value: Uuid) {
         if !self.should_record(glean) {
             return;
@@ -54,7 +55,29 @@
         glean.storage().record(glean, &self.meta, &value)
     }
 
-    /// Generates a new random UUID and set the metric to it.
+    /// Sets to the specified value, from a string.
+    ///
+    /// This should only be used from FFI. When calling directly from Rust, it
+    /// is better to use [`set`](UuidMetric::set).
+    ///
+    /// # Arguments
+    ///
+    /// * `glean` - The Glean instance this metric belongs to.
+    /// * `value` - The [`Uuid`] to set the metric to.
+    pub fn set_from_str(&self, glean: &Glean, value: &str) {
+        if !self.should_record(glean) {
+            return;
+        }
+
+        if let Ok(uuid) = uuid::Uuid::parse_str(&value) {
+            self.set(glean, uuid);
+        } else {
+            let msg = format!("Unexpected UUID value '{}'", value);
+            record_error(glean, &self.meta, ErrorType::InvalidValue, msg, None);
+        }
+    }
+
+    /// Generates a new random [`Uuid`'] and sets the metric to it.
     ///
     /// # Arguments
     ///
@@ -80,6 +103,7 @@
             glean.storage(),
             storage_name,
             &self.meta().identifier(glean),
+            self.meta.lifetime,
         ) {
             Some(Metric::Uuid(uuid)) => Uuid::parse_str(&uuid).ok(),
             _ => None,
@@ -91,14 +115,7 @@
     /// Gets the currently stored value as a string.
     ///
     /// This doesn't clear the stored value.
-    pub fn test_get_value(&self, glean: &Glean, storage_name: &str) -> Option<String> {
-        match StorageManager.snapshot_metric(
-            glean.storage(),
-            storage_name,
-            &self.meta.identifier(glean),
-        ) {
-            Some(Metric::Uuid(s)) => Some(s),
-            _ => None,
-        }
+    pub fn test_get_value(&self, glean: &Glean, storage_name: &str) -> Option<Uuid> {
+        self.get_value(glean, storage_name)
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/ping/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/ping/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/ping/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/ping/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -42,7 +42,7 @@
 }
 
 impl PingMaker {
-    /// Creates a new PingMaker.
+    /// Creates a new [`PingMaker`].
     pub fn new() -> Self {
         Self
     }
@@ -65,6 +65,7 @@
             glean.storage(),
             INTERNAL_STORAGE,
             &seq.meta().identifier(glean),
+            seq.meta().lifetime,
         ) {
             Some(Metric::Counter(i)) => i,
             _ => 0,
@@ -165,7 +166,7 @@
     ///
     /// # Arguments
     ///
-    /// * `glean` - the Glean instance to collect metadata from.
+    /// * `glean` - the [`Glean`] instance to collect metadata from.
     ///
     /// # Returns
     ///
@@ -217,7 +218,7 @@
     ///
     /// # Arguments
     ///
-    /// * `glean` - the Glean instance to collect data from.
+    /// * `glean` - the [`Glean`] instance to collect data from.
     /// * `ping` - the ping to collect for.
     /// * `reason` - an optional reason code to include in the ping.
     ///
@@ -266,7 +267,7 @@
     ///
     /// # Arguments
     ///
-    /// * `glean` - the Glean instance to collect data from.
+    /// * `glean` - the [`Glean`] instance to collect data from.
     /// * `ping` - the ping to collect for.
     /// * `reason` - an optional reason code to include in the ping.
     ///
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/storage/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/storage/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/storage/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/storage/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -100,7 +100,7 @@
 
         if clear_store {
             if let Err(e) = storage.clear_ping_lifetime_storage(store_name) {
-                log::error!("Failed to clear lifetime storage: {:?}", e);
+                log::warn!("Failed to clear lifetime storage: {:?}", e);
             }
         }
 
@@ -129,6 +129,7 @@
         storage: &Database,
         store_name: &str,
         metric_id: &str,
+        metric_lifetime: Lifetime,
     ) -> Option<Metric> {
         let mut snapshot: Option<Metric> = None;
 
@@ -139,9 +140,7 @@
             }
         };
 
-        storage.iter_store_from(Lifetime::Ping, &store_name, None, &mut snapshotter);
-        storage.iter_store_from(Lifetime::Application, &store_name, None, &mut snapshotter);
-        storage.iter_store_from(Lifetime::User, &store_name, None, &mut snapshotter);
+        storage.iter_store_from(metric_lifetime, &store_name, None, &mut snapshotter);
 
         snapshot
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/boolean.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/boolean.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/boolean.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/boolean.rs	2021-01-18 19:58:25.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 https://mozilla.org/MPL/2.0/.
 
-/// A description for the `BooleanMetric` type.
+/// A description for the [`BooleanMetric`](crate::metrics::BooleanMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/counter.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/counter.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/counter.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/counter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,7 +4,7 @@
 
 use crate::ErrorType;
 
-/// A description for the `CounterMetric` type.
+/// A description for the [`CounterMetric`](crate::metrics::CounterMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/custom_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/custom_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/custom_distribution.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/custom_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,10 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-/// A description for the `CustomDistributionMetric` type.
+use crate::ErrorType;
+
+/// A description for the
+/// [`CustomDistributionMetric`](crate::metrics::CustomDistributionMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -20,8 +23,9 @@
     ///
     /// ## Notes
     ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
-    /// for each of them.
+    /// Discards any negative value in `samples` and report an
+    /// [`ErrorType::InvalidValue`](crate::ErrorType::InvalidValue) for each of
+    /// them.
     fn accumulate_samples_signed(&self, samples: Vec<i64>);
 
     /// **Exported for test purposes.**
@@ -41,16 +45,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently stored histogram as a JSON String of the serialized value.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_json_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors recorded.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/datetime.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/datetime.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/datetime.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/datetime.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,42 +4,20 @@
 
 #![allow(clippy::too_many_arguments)]
 
-/// A description for the `DatetimeMetric` type.
+use crate::ErrorType;
+
+/// A description for the [`DatetimeMetric`](crate::metrics::DatetimeMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
 pub trait Datetime {
-    /// Sets the metric to a date/time including the timezone offset.
-    ///
-    /// # Arguments
-    ///
-    /// * `year` - the year to set the metric to.
-    /// * `month` - the month to set the metric to (1-12).
-    /// * `day` - the day to set the metric to (1-based).
-    /// * `hour` - the hour to set the metric to.
-    /// * `minute` - the minute to set the metric to.
-    /// * `second` - the second to set the metric to.
-    /// * `nano` - the nanosecond fraction to the last whole second.
-    /// * `offset_seconds` - the timezone difference, in seconds, for the Eastern
-    ///   Hemisphere. Negative seconds mean Western Hemisphere.
-    fn set_with_details(
-        &self,
-        year: i32,
-        month: u32,
-        day: u32,
-        hour: u32,
-        minute: u32,
-        second: u32,
-        nano: u32,
-        offset_seconds: i32,
-    );
-
     /// Sets the metric to a date/time which including the timezone offset.
     ///
     /// # Arguments
     ///
-    /// * `value` - Some date/time value, with offset, to set the metric to.
-    ///             If none, the current local time is used.
+    /// * `value` - Some [`Datetime`](crate::metrics::Datetime), with offset, to
+    ///             set the metric to. If [`None`], the current local time is
+    ///             used.
     fn set(&self, value: Option<crate::metrics::Datetime>);
 
     /// **Exported for test purposes.**
@@ -61,18 +39,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently stored value as a String.
-    ///
-    /// The precision of this value is truncated to the `time_unit` precision.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given metric and error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/event.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/event.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/event.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/event.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,23 +3,95 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use std::collections::HashMap;
+use std::convert::TryFrom;
+use std::hash::Hash;
 
 use crate::event_database::RecordedEvent;
+use crate::ErrorType;
 
-/// A description for the `EventMetric` type.
+/// Extra keys for events.
+///
+/// Extra keys need to be pre-defined and map to a string representation.
+///
+/// For user-defined `EventMetric`s these will be defined as `enums`.
+/// Each variant will correspond to an entry in the `ALLOWED_KEYS` list.
+/// The Glean SDK requires the keys as strings for submission in pings,
+/// whereas in code we want to provide users a type to work with
+/// (e.g. to avoid typos or misuse of the API).
+pub trait ExtraKeys: Hash + Eq + PartialEq + Copy {
+    /// List of allowed extra keys as strings.
+    const ALLOWED_KEYS: &'static [&'static str];
+
+    /// The index of the extra key.
+    ///
+    /// It corresponds to its position in the associated `ALLOWED_KEYS` list.
+    ///
+    /// *Note*: An index of `-1` indicates an invalid / non-existing extra key.
+    /// Invalid / non-existing extra keys will be recorded as an error.
+    /// This cannot happen for generated code.
+    fn index(self) -> i32;
+}
+
+/// Default of no extra keys for events.
+///
+/// An enum with no values for convenient use as the default set of extra keys
+/// that an [`EventMetric`](crate::metrics::EventMetric) can accept.
+///
+/// *Note*: There exist no values for this enum, it can never exist.
+/// It its equivalent to the [`never / !` type](https://doc.rust-lang.org/std/primitive.never.html).
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
+pub enum NoExtraKeys {}
+
+impl ExtraKeys for NoExtraKeys {
+    const ALLOWED_KEYS: &'static [&'static str] = &[];
+
+    fn index(self) -> i32 {
+        // This index will never be used.
+        -1
+    }
+}
+
+/// The possible errors when parsing to an extra key.
+pub enum EventRecordingError {
+    /// The id doesn't correspond to a valid extra key
+    InvalidId,
+    /// The value doesn't correspond to a valid extra key
+    InvalidExtraKey,
+}
+
+impl TryFrom<i32> for NoExtraKeys {
+    type Error = EventRecordingError;
+
+    fn try_from(_value: i32) -> Result<Self, Self::Error> {
+        Err(EventRecordingError::InvalidExtraKey)
+    }
+}
+
+impl TryFrom<&str> for NoExtraKeys {
+    type Error = EventRecordingError;
+
+    fn try_from(_value: &str) -> Result<Self, Self::Error> {
+        Err(EventRecordingError::InvalidExtraKey)
+    }
+}
+
+/// A description for the [`EventMetric`](crate::metrics::EventMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
 pub trait Event {
+    /// The type of the allowed extra keys for this event.
+    type Extra: ExtraKeys;
+
     /// Records an event.
     ///
     /// # Arguments
     ///
-    /// * `extra` - A HashMap of (key, value) pairs. The key is an index into
-    ///   the metric's `allowed_extra_keys` vector where the key's string is
-    ///   looked up. If any key index is out of range, an error is reported and
-    ///   no event is recorded.
-    fn record<M: Into<Option<HashMap<i32, String>>>>(&self, extra: M);
+    /// * `extra` - A [`HashMap`] of (key, value) pairs. The key is one of the allowed extra keys as
+    ///             set in the metric defintion.
+    ///             If a wrong key is used or a value is larger than allowed, an error is reported
+    ///             and no event is recorded.
+    fn record<M: Into<Option<HashMap<Self::Extra, String>>>>(&self, extra: M);
 
     /// **Exported for test purposes.**
     ///
@@ -38,16 +110,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently stored events for this event metric as a JSON-encoded string.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given metric and error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_json_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/jwe.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/jwe.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/jwe.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/jwe.rs	2021-01-18 19:58:25.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 https://mozilla.org/MPL/2.0/.
 
-/// A description for the `JweMetric` type.
+/// A description for the [`JweMetric`](crate::metrics::JweMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/labeled.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/labeled.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/labeled.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/labeled.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,15 +2,15 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use crate::metrics::MetricType;
+use crate::ErrorType;
 
-/// A description for the `LabeledMetric` type.
+/// A description for the [`LabeledMetric`](crate::metrics::LabeledMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
 pub trait Labeled<T>
 where
-    T: MetricType + Clone,
+    T: Clone,
 {
     /// Gets a specific metric for a given label.
     ///
@@ -25,9 +25,22 @@
     /// If an invalid label is used, the metric will be recorded in the special `OTHER_LABEL` label.
     fn get(&self, label: &str) -> T;
 
-    /// Gets the template submetric.
+    /// **Exported for test purposes.**
     ///
-    /// The template submetric is the actual metric that is cloned and modified
-    /// to record for a specific label.
-    fn get_submetric(&self) -> &T;
+    /// Gets the number of recorded errors for the given metric and error type.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/memory_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/memory_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/memory_distribution.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/memory_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,8 +3,10 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use crate::metrics::DistributionData;
+use crate::ErrorType;
 
-/// A description for the `MemoryDistributionMetric` type.
+/// A description for the
+/// [`MemoryDistributionMetric`](crate::metrics::MemoryDistributionMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -22,34 +24,9 @@
     /// and an `ErrorType::InvalidValue` error is recorded.
     fn accumulate(&self, sample: u64);
 
-    /// Accumulates the provided signed samples in the metric.
-    ///
-    /// This is required so that the platform-specific code can provide us with
-    /// 64 bit signed integers if no `u64` comparable type is available. This
-    /// will take care of filtering and reporting errors for any provided negative
-    /// sample.
-    ///
-    /// Please note that this assumes that the provided samples are already in the
-    /// "unit" declared by the instance of the implementing metric type (e.g. if the
-    /// implementing class is a [MemoryDistributionMetricType] and the instance this
-    /// method was called on is using [MemoryUnit.Kilobyte], then `samples` are assumed
-    /// to be in that unit).
-    ///
-    /// # Arguments
-    ///
-    /// * `samples` - The vector holding the samples to be recorded by the metric.
-    ///
-    /// ## Notes
-    ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
-    /// for each of them.
-    /// Values bigger than 1 Terabyte (2<sup>40</sup> bytes) are truncated
-    /// and an `ErrorType::InvalidValue` error is recorded.
-    fn accumulate_samples_signed(&self, samples: Vec<i64>);
-
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently stored value as an integer.
+    /// Gets the currently stored value as a DistributionData of the serialized value.
     ///
     /// This doesn't clear the stored value.
     ///
@@ -64,16 +41,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently-stored histogram as a JSON String of the serialized value.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_json_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors recorded.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -22,13 +22,14 @@
 mod timing_distribution;
 mod uuid;
 
-pub use crate::event_database::RecordedEvent;
-
 pub use self::boolean::Boolean;
 pub use self::counter::Counter;
 pub use self::custom_distribution::CustomDistribution;
 pub use self::datetime::Datetime;
 pub use self::event::Event;
+pub use self::event::EventRecordingError;
+pub use self::event::ExtraKeys;
+pub use self::event::NoExtraKeys;
 pub use self::jwe::Jwe;
 pub use self::labeled::Labeled;
 pub use self::memory_distribution::MemoryDistribution;
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/ping.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/ping.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/ping.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/ping.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,9 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use crate::error::Result;
-
-/// A description for the `PingType` type.
+/// A description for the [`PingType`](crate::metrics::PingType) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -15,9 +13,5 @@
     ///
     /// * `reason` - the reason the ping was triggered. Included in the
     ///   `ping_info.reason` part of the payload.
-    ///
-    /// # Returns
-    ///
-    /// See [`Glean#submit_ping`](../struct.Glean.html#method.submit_ping) for details.
-    fn submit(&self, reason: Option<&str>) -> Result<bool>;
+    fn submit(&self, reason: Option<&str>);
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/quantity.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/quantity.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/quantity.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/quantity.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-/// A description for the `QuantityMetric` type.
+use crate::ErrorType;
+
+/// A description for the [`QuantityMetric`](crate::metrics::QuantityMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -29,4 +31,23 @@
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
     fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<i64>;
+
+    /// **Exported for test purposes.**
+    ///
+    /// Gets the number of recorded errors for the given metric and error type.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/string_list.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/string_list.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/string_list.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/string_list.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-/// A description for the `StringListMetric` type.
+use crate::ErrorType;
+
+/// A description for the [`StringListMetric`](crate::metrics::StringListMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -45,17 +47,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently-stored values as a JSON String of the format
-    /// ["string1", "string2", ...]
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_json_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors recorded.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/string.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/string.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/string.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/string.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,7 +4,7 @@
 
 use crate::ErrorType;
 
-/// A description for the `StringMetric` type.
+/// A description for the [`StringMetric`](crate::metrics::StringMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/timespan.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/timespan.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/timespan.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/timespan.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,52 +2,60 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::time::Duration;
+use crate::ErrorType;
 
-/// A description for the `TimespanMetric` type.
+/// A description for the [`TimespanMetric`](crate::metrics::TimespanMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
 pub trait Timespan {
     /// Starts tracking time for the provided metric.
     ///
-    /// This records an error if it's already tracking time (i.e. start was already
-    /// called with no corresponding `stop`): in that case the original
-    /// start time will be preserved.
-    fn set_start(&mut self, start_time: u64);
+    /// This uses an internal monotonic timer.
+    ///
+    /// This records an error if it's already tracking time (i.e.
+    /// [`start`](Timespan::start) was already called with no corresponding
+    /// [`stop`](Timespan::stop)): in that case the original start time will be
+    /// preserved.
+    fn start(&self);
 
     /// Stops tracking time for the provided metric. Sets the metric to the elapsed time.
     ///
-    /// This will record an error if no `start` was called.
-    fn set_stop(&mut self, stop_time: u64);
+    /// This will record an error if no [`start`](Timespan::start) was called.
+    fn stop(&self);
 
-    /// Aborts a previous `start` call. No error is recorded if no `start` was called.
-    fn cancel(&mut self);
+    /// Aborts a previous [`start`](Timespan::start) call. No error is recorded
+    /// if no [`start`](Timespan::start) was called.
+    fn cancel(&self);
 
-    /// Explicitly sets the timespan value.
+    /// **Exported for test purposes.**
     ///
-    /// This API should only be used if your library or application requires recording
-    /// times in a way that can not make use of `start`/`stop`/`cancel`.
+    /// Gets the currently stored value as an integer.
     ///
-    /// Care should be taken using this if the ping lifetime might contain more than one
-    /// timespan measurement. To be safe, `set_raw` should generally be followed by
-    /// sending a custom ping containing the timespan.
+    /// This doesn't clear the stored value.
     ///
     /// # Arguments
     ///
-    /// * `elapsed` - The elapsed time to record.
-    /// * `overwrite` - Whether or not to overwrite existing data.
-    fn set_raw(&self, elapsed: Duration, overwrite: bool);
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<u64>;
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently stored value as an integer.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given metric and error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<u64>;
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/timing_distribution.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/timing_distribution.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/timing_distribution.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/timing_distribution.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,74 +4,49 @@
 
 use crate::metrics::DistributionData;
 use crate::metrics::TimerId;
+use crate::ErrorType;
 
-/// A description for the `TimingDistributionMetric` type.
+/// A description for the [`TimingDistributionMetric`](crate::metrics::TimingDistributionMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
 pub trait TimingDistribution {
     /// Starts tracking time for the provided metric.
     ///
-    /// This records an error if it’s already tracking time (i.e. start was already
-    /// called with no corresponding [stop]): in that case the original
-    /// start time will be preserved.
-    ///
-    /// # Arguments
-    ///
-    /// * `start_time` - Timestamp in nanoseconds.
+    /// This records an error if it’s already tracking time (i.e.
+    /// [`start`](TimingDistribution::start) was already called with no corresponding
+    /// [`stop_and_accumulate`](TimingDistribution::stop_and_accumulate)): in that case the
+    /// original start time will be preserved.
     ///
     /// # Returns
     ///
-    /// A unique `TimerId` for the new timer.
-    fn set_start(&mut self, start_time: u64);
+    /// A unique [`TimerId`] for the new timer.
+    fn start(&mut self) -> TimerId;
 
     /// Stops tracking time for the provided metric and associated timer id.
     ///
     /// Adds a count to the corresponding bucket in the timing distribution.
-    /// This will record an error if no `start` was called.
+    /// This will record an error if no [`start`](TimingDistribution::start) was
+    /// called.
     ///
     /// # Arguments
     ///
-    /// * `id` - The `TimerId` to associate with this timing. This allows
+    /// * `id` - The [`TimerId`] to associate with this timing. This allows
     ///   for concurrent timing of events associated with different ids to the
     ///   same timespan metric.
-    /// * `stop_time` - Timestamp in nanoseconds.
-    fn set_stop_and_accumulate(&mut self, id: TimerId, stop_time: u64);
+    fn stop_and_accumulate(&mut self, id: TimerId);
 
-    /// Aborts a previous `set_start` call. No error is recorded if no `set_start`
-    /// was called.
+    /// Aborts a previous [`start`](TimingDistribution::start) call. No
+    /// error is recorded if no [`start`](TimingDistribution::start) was
+    /// called.
     ///
     /// # Arguments
     ///
-    /// * `id` - The `TimerId` to associate with this timing. This allows
+    /// * `id` - The [`TimerId`] to associate with this timing. This allows
     ///   for concurrent timing of events associated with different ids to the
     ///   same timing distribution metric.
     fn cancel(&mut self, id: TimerId);
 
-    /// Accumulates the provided signed samples in the metric.
-    ///
-    /// This is required so that the platform-specific code can provide us with
-    /// 64 bit signed integers if no `u64` comparable type is available. This
-    /// will take care of filtering and reporting errors for any provided negative
-    /// sample.
-    ///
-    /// Please note that this assumes that the provided samples are already in the
-    /// "unit" declared by the instance of the implementing metric type (e.g. if the
-    /// implementing class is a [TimingDistributionMetricType] and the instance this
-    /// method was called on is using [TimeUnit.Second], then `samples` are assumed
-    /// to be in that unit).
-    ///
-    /// # Arguments
-    ///
-    /// * `samples` - The vector holding the samples to be recorded by the metric.
-    ///
-    /// ## Notes
-    ///
-    /// Discards any negative value in `samples` and report an `ErrorType::InvalidValue`
-    /// for each of them. Reports an `ErrorType::InvalidOverflow` error for samples that
-    /// are longer than `MAX_SAMPLE_TIME`.
-    fn accumulate_samples_signed(&mut self, samples: Vec<i64>);
-
     /// **Exported for test purposes.**
     ///
     /// Gets the currently stored value as an integer.
@@ -89,16 +64,20 @@
 
     /// **Exported for test purposes.**
     ///
-    /// Gets the currently-stored histogram as a JSON String of the serialized value.
-    ///
-    /// This doesn't clear the stored value.
+    /// Gets the number of recorded errors for the given error type.
     ///
     /// # Arguments
     ///
+    /// * `error` - The type of error
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value_as_json_string<'a, S: Into<Option<&'a str>>>(
+    ///
+    /// # Returns
+    ///
+    /// The number of errors recorded.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
+        error: ErrorType,
         ping_name: S,
-    ) -> Option<String>;
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/uuid.rs firefox-85.0+build1/third_party/rust/glean-core/src/traits/uuid.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/traits/uuid.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/traits/uuid.rs	2021-01-18 19:58:25.000000000 +0000
@@ -2,7 +2,9 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-/// A description for the `UuidMetric` type.
+use crate::ErrorType;
+
+/// A description for the [`UuidMetric`](crate::metrics::UuidMetric) type.
 ///
 /// When changing this trait, make sure all the operations are
 /// implemented in the related type in `../metrics/`.
@@ -11,10 +13,10 @@
     ///
     /// # Arguments
     ///
-    /// * `value` - The UUID to set the metric to.
+    /// * `value` - The [`Uuid`](uuid::Uuid) to set the metric to.
     fn set(&self, value: uuid::Uuid);
 
-    /// Generates a new random UUID and set the metric to it.
+    /// Generates a new random [`Uuid`](uuid::Uuid) and set the metric to it.
     fn generate_and_set(&self) -> uuid::Uuid;
 
     /// **Exported for test purposes.**
@@ -27,5 +29,24 @@
     ///
     /// * `ping_name` - represents the optional name of the ping to retrieve the
     ///   metric for. Defaults to the first value in `send_in_pings`.
-    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<String>;
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<uuid::Uuid>;
+
+    /// **Exported for test purposes.**
+    ///
+    /// Gets the number of recorded errors for the given metric and error type.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/directory.rs firefox-85.0+build1/third_party/rust/glean-core/src/upload/directory.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/directory.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/upload/directory.rs	2021-01-18 19:58:25.000000000 +0000
@@ -122,14 +122,14 @@
         let path = match self.get_file_path(uuid) {
             Some(path) => path,
             None => {
-                log::error!("Cannot find ping file to delete {}", uuid);
+                log::warn!("Cannot find ping file to delete {}", uuid);
                 return false;
             }
         };
 
         match fs::remove_file(&path) {
             Err(e) => {
-                log::error!("Error deleting file {}. {}", path.display(), e);
+                log::warn!("Error deleting file {}. {}", path.display(), e);
                 return false;
             }
             _ => log::info!("File was deleted {}", path.display()),
@@ -149,14 +149,14 @@
         let path = match self.get_file_path(document_id) {
             Some(path) => path,
             None => {
-                log::error!("Cannot find ping file to process {}", document_id);
+                log::warn!("Cannot find ping file to process {}", document_id);
                 return None;
             }
         };
         let file = match File::open(&path) {
             Ok(file) => file,
             Err(e) => {
-                log::error!("Error reading ping file {}. {}", path.display(), e);
+                log::warn!("Error reading ping file {}. {}", path.display(), e);
                 return None;
             }
         };
@@ -202,7 +202,7 @@
     ///
     /// A vector of tuples with the file size and payload of each ping file in the directory.
     fn process_dir(&self, dir: &Path) -> Vec<(u64, PingPayload)> {
-        log::info!("Processing persisted pings.");
+        log::trace!("Processing persisted pings.");
 
         let entries = match dir.read_dir() {
             Ok(entries) => entries,
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/mod.rs firefox-85.0+build1/third_party/rust/glean-core/src/upload/mod.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/mod.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/upload/mod.rs	2021-01-18 19:58:25.000000000 +0000
@@ -5,9 +5,12 @@
 //! Manages the pending pings queue and directory.
 //!
 //! * Keeps track of pending pings, loading any unsent ping from disk on startup;
-//! * Exposes `get_upload_task` API for the platform layer to request next upload task;
-//! * Exposes `process_ping_upload_response` API to check the HTTP response from the ping upload
-//!   and either delete the corresponding ping from disk or re-enqueue it for sending.
+//! * Exposes [`get_upload_task`](PingUploadManager::get_upload_task) API for
+//!   the platform layer to request next upload task;
+//! * Exposes
+//!   [`process_ping_upload_response`](PingUploadManager::process_ping_upload_response)
+//!   API to check the HTTP response from the ping upload and either delete the
+//!   corresponding ping from disk or re-enqueue it for sending.
 
 use std::collections::VecDeque;
 use std::convert::TryInto;
@@ -29,6 +32,8 @@
 mod request;
 mod result;
 
+const WAIT_TIME_FOR_PING_PROCESSING: u64 = 1000; // in milliseconds
+
 #[derive(Debug)]
 struct RateLimiter {
     /// The instant the current interval has started.
@@ -47,7 +52,10 @@
     /// The RateLimiter has not reached the maximum count and is still incrementing.
     Incrementing,
     /// The RateLimiter has reached the maximum count for the  current interval.
-    Throttled,
+    ///
+    /// This variant contains the remaining time (in milliseconds)
+    /// until the rate limiter is not throttled anymore.
+    Throttled(u64),
 }
 
 impl RateLimiter {
@@ -65,6 +73,10 @@
         self.count = 0;
     }
 
+    fn elapsed(&self) -> Duration {
+        self.started.unwrap().elapsed()
+    }
+
     // The counter should reset if
     //
     // 1. It has never started;
@@ -76,8 +88,7 @@
         }
 
         // Safe unwrap, we already stated that `self.started` is not `None` above.
-        let elapsed = self.started.unwrap().elapsed();
-        if elapsed > self.interval {
+        if self.elapsed() > self.interval {
             return true;
         }
 
@@ -95,7 +106,14 @@
         }
 
         if self.count == self.max_count {
-            return RateLimiterState::Throttled;
+            // Note that `remining` can't be a negative number because we just called `reset`,
+            // which will check if it is and reset if so.
+            let remaining = self.interval.as_millis() - self.elapsed().as_millis();
+            return RateLimiterState::Throttled(
+                remaining
+                    .try_into()
+                    .unwrap_or(self.interval.as_secs() * 1000),
+            );
         }
 
         self.count += 1;
@@ -116,21 +134,37 @@
     Upload(PingRequest),
     /// A flag signaling that the pending pings directories are not done being processed,
     /// thus the requester should wait and come back later.
-    Wait,
+    ///
+    /// Contains the amount of time in milliseconds
+    /// the requester should wait before requesting a new task.
+    Wait(u64),
     /// A flag signaling that requester doesn't need to request any more upload tasks at this moment.
     ///
     /// There are three possibilities for this scenario:
     /// * Pending pings queue is empty, no more pings to request;
     /// * Requester has gotten more than MAX_WAIT_ATTEMPTS (3, by default) `PingUploadTask::Wait` responses in a row;
     /// * Requester has reported more than MAX_RECOVERABLE_FAILURES_PER_UPLOADING_WINDOW
-    ///   recoverable upload failures on the same uploading window[1]
+    ///   recoverable upload failures on the same uploading window (see below)
     ///   and should stop requesting at this moment.
     ///
-    /// [1]: An "uploading window" starts when a requester gets a new `PingUploadTask::Upload(PingRequest)`
-    ///      response and finishes when they finally get a `PingUploadTask::Done` or `PingUploadTask::Wait` response.
+    /// An "uploading window" starts when a requester gets a new
+    /// `PingUploadTask::Upload(PingRequest)` response and finishes when they
+    /// finally get a `PingUploadTask::Done` or `PingUploadTask::Wait` response.
     Done,
 }
 
+impl PingUploadTask {
+    /// Whether the current task is an upload task.
+    pub fn is_upload(&self) -> bool {
+        matches!(self, PingUploadTask::Upload(_))
+    }
+
+    /// Whether the current task is wait task.
+    pub fn is_wait(&self) -> bool {
+        matches!(self, PingUploadTask::Wait(_))
+    }
+}
+
 /// Manages the pending pings queue and directory.
 #[derive(Debug)]
 pub struct PingUploadManager {
@@ -271,7 +305,7 @@
         match request.build() {
             Ok(request) => Some(request),
             Err(e) => {
-                log::error!("Error trying to build ping request: {}", e);
+                log::warn!("Error trying to build ping request: {}", e);
                 self.directory_manager.delete_file(&document_id);
 
                 // Record the error.
@@ -305,7 +339,7 @@
             .iter()
             .any(|request| request.document_id == document_id)
         {
-            log::trace!(
+            log::warn!(
                 "Attempted to enqueue a duplicate ping {} at {}.",
                 document_id,
                 path
@@ -470,12 +504,12 @@
         //
         // We want to limit the amount of PingUploadTask::Wait returned in a row,
         // in case we reach MAX_WAIT_ATTEMPTS we want to actually return PingUploadTask::Done.
-        let wait_or_done = || {
+        let wait_or_done = |time: u64| {
             self.wait_attempt_count.fetch_add(1, Ordering::SeqCst);
             if self.wait_attempt_count() > self.policy.max_wait_attempts() {
                 PingUploadTask::Done
             } else {
-                PingUploadTask::Wait
+                PingUploadTask::Wait(time)
             }
         };
 
@@ -483,7 +517,7 @@
             log::info!(
                 "Tried getting an upload task, but processing is ongoing. Will come back later."
             );
-            return wait_or_done();
+            return wait_or_done(WAIT_TIME_FOR_PING_PROCESSING);
         }
 
         // This is a no-op in case there are no cached pings.
@@ -506,11 +540,11 @@
                     let mut rate_limiter = rate_limiter
                         .write()
                         .expect("Can't write to the rate limiter.");
-                    if rate_limiter.get_state() == RateLimiterState::Throttled {
+                    if let RateLimiterState::Throttled(remaining) = rate_limiter.get_state() {
                         log::info!(
                             "Tried getting an upload task, but we are throttled at the moment."
                         );
-                        return wait_or_done();
+                        return wait_or_done(remaining);
                     }
                 }
 
@@ -550,13 +584,11 @@
     pub fn get_upload_task(&self, glean: &Glean, log_ping: bool) -> PingUploadTask {
         let task = self.get_upload_task_internal(glean, log_ping);
 
-        if task != PingUploadTask::Wait && self.wait_attempt_count() > 0 {
+        if !task.is_wait() && self.wait_attempt_count() > 0 {
             self.wait_attempt_count.store(0, Ordering::SeqCst);
         }
 
-        if (task == PingUploadTask::Wait || task == PingUploadTask::Done)
-            && self.recoverable_failure_count() > 0
-        {
+        if !task.is_upload() && self.recoverable_failure_count() > 0 {
             self.recoverable_failure_count.store(0, Ordering::SeqCst);
         }
 
@@ -621,7 +653,7 @@
             }
 
             UnrecoverableFailure | HttpStatus(400..=499) => {
-                log::error!(
+                log::warn!(
                     "Unrecoverable upload failure while attempting to send ping {}. Error was {:?}",
                     document_id,
                     status
@@ -630,7 +662,7 @@
             }
 
             RecoverableFailure | HttpStatus(_) => {
-                log::info!(
+                log::warn!(
                     "Recoverable upload failure while attempting to send ping {}, will retry. Error was {:?}",
                     document_id,
                     status
@@ -743,10 +775,8 @@
 
         // Try and get the next request.
         // Verify request was returned
-        match upload_manager.get_upload_task(&glean, false) {
-            PingUploadTask::Upload(_) => {}
-            _ => panic!("Expected upload manager to return the next request!"),
-        }
+        let task = upload_manager.get_upload_task(&glean, false);
+        assert!(task.is_upload());
     }
 
     #[test]
@@ -763,10 +793,8 @@
 
         // Verify a request is returned for each submitted ping
         for _ in 0..n {
-            match upload_manager.get_upload_task(&glean, false) {
-                PingUploadTask::Upload(_) => {}
-                _ => panic!("Expected upload manager to return the next request!"),
-            }
+            let task = upload_manager.get_upload_task(&glean, false);
+            assert!(task.is_upload());
         }
 
         // Verify that after all requests are returned, none are left
@@ -783,9 +811,8 @@
         let mut upload_manager = PingUploadManager::no_policy(dir.path());
 
         // Add a rate limiter to the upload mangager with max of 10 pings every 3 seconds.
-        let secs_per_interval = 3;
         let max_pings_per_interval = 10;
-        upload_manager.set_rate_limiter(secs_per_interval, 10);
+        upload_manager.set_rate_limiter(3, 10);
 
         // Enqueue the max number of pings allowed per uploading window
         for _ in 0..max_pings_per_interval {
@@ -794,28 +821,24 @@
 
         // Verify a request is returned for each submitted ping
         for _ in 0..max_pings_per_interval {
-            match upload_manager.get_upload_task(&glean, false) {
-                PingUploadTask::Upload(_) => {}
-                _ => panic!("Expected upload manager to return the next request!"),
-            }
+            let task = upload_manager.get_upload_task(&glean, false);
+            assert!(task.is_upload());
         }
 
         // Enqueue just one more ping
         upload_manager.enqueue_ping(&glean, &Uuid::new_v4().to_string(), PATH, "", None);
 
         // Verify that we are indeed told to wait because we are at capacity
-        assert_eq!(
-            PingUploadTask::Wait,
-            upload_manager.get_upload_task(&glean, false)
-        );
-
-        // Wait for the uploading window to reset
-        thread::sleep(Duration::from_secs(secs_per_interval));
-
         match upload_manager.get_upload_task(&glean, false) {
-            PingUploadTask::Upload(_) => {}
-            _ => panic!("Expected upload manager to return the next request!"),
-        }
+            PingUploadTask::Wait(time) => {
+                // Wait for the uploading window to reset
+                thread::sleep(Duration::from_millis(time));
+            }
+            _ => panic!("Expected upload manager to return a wait task!"),
+        };
+
+        let task = upload_manager.get_upload_task(&glean, false);
+        assert!(task.is_upload());
     }
 
     #[test]
@@ -891,10 +914,8 @@
 
         // Verify the requests were properly enqueued
         for _ in 0..n {
-            match upload_manager.get_upload_task(&glean, false) {
-                PingUploadTask::Upload(_) => {}
-                _ => panic!("Expected upload manager to return the next request!"),
-            }
+            let task = upload_manager.get_upload_task(&glean, false);
+            assert!(task.is_upload());
         }
 
         // Verify that after all requests are returned, none are left
@@ -1109,10 +1130,8 @@
         upload_manager.enqueue_ping(&glean, &doc_id, &path, "", None);
 
         // Get a task once
-        match upload_manager.get_upload_task(&glean, false) {
-            PingUploadTask::Upload(_) => {}
-            _ => panic!("Expected upload manager to return the next request!"),
-        }
+        let task = upload_manager.get_upload_task(&glean, false);
+        assert!(task.is_upload());
 
         // There should be no more queued tasks
         assert_eq!(
@@ -1164,10 +1183,8 @@
 
         // Verify all requests are returned when we try again.
         for _ in 0..n {
-            match upload_manager.get_upload_task(&glean, false) {
-                PingUploadTask::Upload(_) => {}
-                _ => panic!("Expected upload manager to return the next request!"),
-            }
+            let task = upload_manager.get_upload_task(&glean, false);
+            assert!(task.is_upload());
         }
     }
 
@@ -1494,10 +1511,8 @@
         // we should be throttled and thus get a PingUploadTask::Wait.
         // Check that we are indeed allowed to get this response as many times as expected.
         for _ in 0..max_wait_attempts {
-            assert_eq!(
-                upload_manager.get_upload_task(&glean, false),
-                PingUploadTask::Wait
-            );
+            let task = upload_manager.get_upload_task(&glean, false);
+            assert!(task.is_wait());
         }
 
         // Check that after we get PingUploadTask::Wait the allowed number of times,
@@ -1511,10 +1526,8 @@
         thread::sleep(Duration::from_secs(secs_per_interval));
 
         // Check that we are allowed again to get pings.
-        match upload_manager.get_upload_task(&glean, false) {
-            PingUploadTask::Upload(_) => {}
-            _ => panic!("Expected upload manager to return the next request!"),
-        }
+        let task = upload_manager.get_upload_task(&glean, false);
+        assert!(task.is_upload());
 
         // And once we are done we don't need to wait anymore.
         assert_eq!(
@@ -1522,4 +1535,16 @@
             PingUploadTask::Done
         );
     }
+
+    #[test]
+    fn wait_task_contains_expected_wait_time_when_pending_pings_dir_not_processed_yet() {
+        let (glean, dir) = new_glean(None);
+        let upload_manager = PingUploadManager::new(dir.path(), "test");
+        match upload_manager.get_upload_task(&glean, false) {
+            PingUploadTask::Wait(time) => {
+                assert_eq!(time, WAIT_TIME_FOR_PING_PROCESSING);
+            }
+            _ => panic!("Expected upload manager to return a wait task!"),
+        };
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/request.rs firefox-85.0+build1/third_party/rust/glean-core/src/upload/request.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/upload/request.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/upload/request.rs	2021-01-18 19:58:25.000000000 +0000
@@ -49,7 +49,7 @@
 
     // Attempt to add the content to the gzipper.
     if let Err(e) = gzipper.write_all(content) {
-        log::error!("Failed to write to the gzipper: {} - {:?}", path, e);
+        log::warn!("Failed to write to the gzipper: {} - {:?}", path, e);
         return None;
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/src/util.rs firefox-85.0+build1/third_party/rust/glean-core/src/util.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/src/util.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/src/util.rs	2021-01-18 19:58:25.000000000 +0000
@@ -30,11 +30,11 @@
 }
 
 /// Generates an ISO8601 compliant date/time string for the given time,
-/// truncating it to the provided TimeUnit.
+/// truncating it to the provided [`TimeUnit`].
 ///
 /// # Arguments
 ///
-/// * `datetime` - the `DateTime` object that holds the date, time and timezone information.
+/// * `datetime` - the [`DateTime`] object that holds the date, time and timezone information.
 /// * `truncate_to` - the desired resolution to use for the output string.
 ///
 /// # Returns
@@ -56,7 +56,7 @@
 ///
 /// # Arguments
 ///
-/// * `value` - The `String` to truncate.
+/// * `value` - The string to truncate.
 /// * `length` - The length, in bytes, to truncate to.  The resulting string will
 ///   be at most this many bytes, but may be shorter to prevent ending in the middle
 ///   of a codepoint.
@@ -87,7 +87,7 @@
 ///
 /// * `glean` - The Glean instance the metric doing the truncation belongs to.
 /// * `meta` - The metadata for the metric. Used for recording the error.
-/// * `value` - The `String` to truncate.
+/// * `value` - The String to truncate.
 /// * `length` - The length, in bytes, to truncate to.  The resulting string will
 ///   be at most this many bytes, but may be shorter to prevent ending in the middle
 ///   of a codepoint.
diff -Nru firefox-84.0.2+build1/third_party/rust/glean-core/tests/timespan.rs firefox-85.0+build1/third_party/rust/glean-core/tests/timespan.rs
--- firefox-84.0.2+build1/third_party/rust/glean-core/tests/timespan.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/glean-core/tests/timespan.rs	2021-01-18 19:58:25.000000000 +0000
@@ -247,7 +247,7 @@
     );
 
     let time = Duration::from_secs(1);
-    metric.set_raw(&glean, time, false);
+    metric.set_raw(&glean, time);
 
     let time_in_ns = time.as_nanos() as u64;
     assert_eq!(Some(time_in_ns), metric.test_get_value(&glean, "store1"));
@@ -272,7 +272,7 @@
     let time = Duration::from_secs(42);
 
     metric.set_start(&glean, 0);
-    metric.set_raw(&glean, time, false);
+    metric.set_raw(&glean, time);
     metric.set_stop(&glean, 60);
 
     // We expect the start/stop value, not the raw value.
@@ -327,3 +327,27 @@
         test_get_num_recorded_errors(&glean, metric.meta(), ErrorType::InvalidState, None)
     );
 }
+
+#[test]
+fn time_cannot_go_backwards() {
+    let (glean, _t) = new_glean(None);
+
+    let mut metric: TimespanMetric = TimespanMetric::new(
+        CommonMetricData {
+            name: "raw_timespan".into(),
+            category: "test".into(),
+            send_in_pings: vec!["test1".into()],
+            ..Default::default()
+        },
+        TimeUnit::Millisecond,
+    );
+
+    // Time cannot go backwards.
+    metric.set_start(&glean, 10);
+    metric.set_stop(&glean, 0);
+    assert!(metric.test_get_value(&glean, "test1").is_none());
+    assert_eq!(
+        Ok(1),
+        test_get_num_recorded_errors(&glean, metric.meta(), ErrorType::InvalidValue, None),
+    );
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/benches/datetime_format.rs firefox-85.0+build1/third_party/rust/humantime/benches/datetime_format.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/benches/datetime_format.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/benches/datetime_format.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,16 +1,14 @@
 #![feature(test)]
-extern crate chrono;
-extern crate humantime;
 extern crate test;
 
 use std::io::Write;
 use std::time::{Duration, UNIX_EPOCH};
-use humantime::format_rfc3339;
 
+use humantime::format_rfc3339;
 
 #[bench]
 fn rfc3339_humantime_seconds(b: &mut test::Bencher) {
-    let time = UNIX_EPOCH + Duration::new(1483228799, 0);
+    let time = UNIX_EPOCH + Duration::new(1_483_228_799, 0);
     let mut buf = Vec::with_capacity(100);
     b.iter(|| {
         buf.truncate(0);
@@ -28,11 +26,11 @@
     use chrono::format::Pad::*;
 
     let time = DateTime::<Utc>::from_utc(
-        NaiveDateTime::from_timestamp(1483228799, 0), Utc);
+        NaiveDateTime::from_timestamp(1_483_228_799, 0), Utc);
     let mut buf = Vec::with_capacity(100);
 
     // formatting code from env_logger
-    const ITEMS: &'static [Item<'static>] = {
+    const ITEMS: &[Item<'static>] = {
         &[
             Numeric(Year, Zero),
             Literal("-"),
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/benches/datetime_parse.rs firefox-85.0+build1/third_party/rust/humantime/benches/datetime_parse.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/benches/datetime_parse.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/benches/datetime_parse.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,12 +1,9 @@
 #![feature(test)]
-extern crate chrono;
-extern crate humantime;
 extern crate test;
 
 use chrono::{DateTime};
 use humantime::parse_rfc3339;
 
-
 #[bench]
 fn rfc3339_humantime_seconds(b: &mut test::Bencher) {
     b.iter(|| {
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/.cargo-checksum.json firefox-85.0+build1/third_party/rust/humantime/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/humantime/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ae7f884d13f5d849afd58b5db15510396832df7f648b0095e43bfdfa600b2ba3","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"f6deca8261a8f4a3403dc74c725c46051157fd36c27cd4b100277eb1f303ad11","README.md":"e4bb65f28ddffb11d7eb337e9585947651f2fc11a5e4290f0ca126e21c582c1e","benches/datetime_format.rs":"a44c7ffb3c9515e92828564df8f91a86470343a2fa7e1a08bc2bc7397ba2591c","benches/datetime_parse.rs":"336a241755ccfa546d1840e56a40218c4f98f22d7d274829c5102ec280f2d963","bulk.yaml":"17c2548388e0cd3a63473021a2f1e4ddedee082d79d9167cb31ad06a1890d3fc","src/date.rs":"ea9924869a2484e333df2a845009593dd0062bb3b3e1a5ef9cefc05ec0a41196","src/duration.rs":"a5d4756451f495a3d5df0c872caa6304dd81ae075f0e204c8145c11c7c8f698b","src/lib.rs":"59dcc8a1ed89ecde199d59a7f71e550b461f87858b4becffb0a183994bafdd7c","src/wrapper.rs":"5bbdaf43256b445a8ca3a6b3eded9dd4fa8fb4dadf3683a5bac9648d91117396","vagga.yaml":"59761e5138a3015ef5654fec095ac8f1587cd23529b37822dd540b866fe4cd5b"},"package":"df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"}
\ No newline at end of file
+{"files":{"Cargo.toml":"74afb84b99fa5ba0f58b483df1ef0749821d4c2b5c5a9df299cb1cc0002c236f","LICENSE-APACHE":"c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08","LICENSE-MIT":"f6deca8261a8f4a3403dc74c725c46051157fd36c27cd4b100277eb1f303ad11","README.md":"e4bb65f28ddffb11d7eb337e9585947651f2fc11a5e4290f0ca126e21c582c1e","benches/datetime_format.rs":"ffe2e459e9b48e8fdbfb3686f6297257d66b29369ecd6750ae9fbba527ccc681","benches/datetime_parse.rs":"8039c4bd5f1795dbb54e1e39da5988f1d2df6c86c42d8fd378094fc78074d31e","bulk.yaml":"17c2548388e0cd3a63473021a2f1e4ddedee082d79d9167cb31ad06a1890d3fc","src/date.rs":"3f21e426f449e434e5973db9bd06a09d3f0cd6aa77708dbf0e3230bce7e48f44","src/duration.rs":"5a91e6e94c9ca2078ede527a4c159ddfc1cd67ade0d75a1c1db5474b40d2916f","src/lib.rs":"ad4dbed28080d9a64ef0100c96b20ff4988d9dde908f56e28ece7252f5932990","src/wrapper.rs":"badc640e77379a42b2fcb728337d60a764b7f00a1b5b1d50c7372ddc20941967","vagga.yaml":"8396fe1510117c1c7bc3e896b62290dcf2dd300346071297018b0077ad9e45ce"},"package":"3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/Cargo.toml firefox-85.0+build1/third_party/rust/humantime/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/humantime/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "humantime"
-version = "1.3.0"
+version = "2.0.1"
 authors = ["Paul Colomiets <paul@colomiets.name>"]
 description = "    A parser and formatter for std::time::{Duration, SystemTime}\n"
 homepage = "https://github.com/tailhook/humantime"
@@ -21,17 +22,16 @@
 keywords = ["time", "human", "human-friendly", "parser", "duration"]
 categories = ["date-and-time"]
 license = "MIT/Apache-2.0"
+repository = "https://github.com/tailhook/humantime"
 
 [lib]
 name = "humantime"
 path = "src/lib.rs"
-[dependencies.quick-error]
-version = "1.0.0"
 [dev-dependencies.chrono]
-version = "0.4.0"
+version = "0.4"
 
 [dev-dependencies.rand]
-version = "0.4.2"
+version = "0.6"
 
 [dev-dependencies.time]
-version = "0.1.39"
+version = "0.1"
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/src/date.rs firefox-85.0+build1/third_party/rust/humantime/src/date.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/src/date.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/src/date.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,3 +1,4 @@
+use std::error::Error as StdError;
 use std::fmt;
 use std::str;
 use std::time::{SystemTime, Duration, UNIX_EPOCH};
@@ -26,26 +27,30 @@
     all(target_arch="wasm32", not(target_os="emscripten")),
 ))]
 mod max {
-    pub const SECONDS: u64 = 253402300800-1;  // last second of year 9999
+    pub const SECONDS: u64 = 253_402_300_800-1;  // last second of year 9999
     #[allow(unused)]
-    pub const TIMESTAMP: &'static str = "9999-12-31T23:59:59Z";
+    pub const TIMESTAMP: &str = "9999-12-31T23:59:59Z";
 }
 
-quick_error! {
-    /// Error parsing datetime (timestamp)
-    #[derive(Debug, PartialEq, Clone, Copy)]
-    pub enum Error {
-        /// Numeric component is out of range
-        OutOfRange {
-            display("numeric component is out of range")
-        }
-        /// Bad character where digit is expected
-        InvalidDigit {
-            display("bad character where digit is expected")
-        }
-        /// Other formatting errors
-        InvalidFormat {
-            display("timestamp format is invalid")
+/// Error parsing datetime (timestamp)
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub enum Error {
+    /// Numeric component is out of range
+    OutOfRange,
+    /// Bad character where digit is expected
+    InvalidDigit,
+    /// Other formatting errors
+    InvalidFormat,
+}
+
+impl StdError for Error {}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::OutOfRange => write!(f, "numeric component is out of range"),
+            Error::InvalidDigit => write!(f, "bad character where digit is expected"),
+            Error::InvalidFormat => write!(f, "timestamp format is invalid"),
         }
     }
 }
@@ -85,7 +90,7 @@
     if b[10] != b'T' || b[b.len()-1] != b'Z' {
         return Err(Error::InvalidFormat);
     }
-    return parse_rfc3339_weak(s);
+    parse_rfc3339_weak(s)
 }
 
 /// Parse RFC3339-like timestamp `2018-02-14 00:28:07`
@@ -172,10 +177,8 @@
             nanos += mult * (b[idx] - b'0') as u32;
             mult /= 10;
         }
-    } else {
-        if b.len() != 19 && (b.len() > 20 || b[19] != b'Z') {
-            return Err(Error::InvalidFormat);
-        }
+    } else if b.len() != 19 && (b.len() > 20 || b[19] != b'Z') {
+        return Err(Error::InvalidFormat);
     }
 
     let total_seconds = time + days * 86400;
@@ -183,11 +186,11 @@
         return Err(Error::OutOfRange);
     }
 
-    return Ok(UNIX_EPOCH + Duration::new(total_seconds, nanos));
+    Ok(UNIX_EPOCH + Duration::new(total_seconds, nanos))
 }
 
 fn is_leap_year(y: u64) -> bool {
-    y % 4 == 0 && (!(y % 100 == 0) || y % 400 == 0)
+    y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)
 }
 
 /// Format an RFC3339 timestamp `2018-02-14T00:28:07Z`
@@ -198,7 +201,7 @@
 ///
 /// The value is always UTC and ignores system timezone.
 pub fn format_rfc3339(system_time: SystemTime) -> Rfc3339Timestamp {
-    return Rfc3339Timestamp(system_time, Precision::Smart);
+    Rfc3339Timestamp(system_time, Precision::Smart)
 }
 
 /// Format an RFC3339 timestamp `2018-02-14T00:28:07Z`
@@ -207,7 +210,7 @@
 ///
 /// The value is always UTC and ignores system timezone.
 pub fn format_rfc3339_seconds(system_time: SystemTime) -> Rfc3339Timestamp {
-    return Rfc3339Timestamp(system_time, Precision::Seconds);
+    Rfc3339Timestamp(system_time, Precision::Seconds)
 }
 
 /// Format an RFC3339 timestamp `2018-02-14T00:28:07.000Z`
@@ -216,7 +219,7 @@
 ///
 /// The value is always UTC and ignores system timezone.
 pub fn format_rfc3339_millis(system_time: SystemTime) -> Rfc3339Timestamp {
-    return Rfc3339Timestamp(system_time, Precision::Millis);
+    Rfc3339Timestamp(system_time, Precision::Millis)
 }
 
 /// Format an RFC3339 timestamp `2018-02-14T00:28:07.000000Z`
@@ -225,7 +228,7 @@
 ///
 /// The value is always UTC and ignores system timezone.
 pub fn format_rfc3339_micros(system_time: SystemTime) -> Rfc3339Timestamp {
-    return Rfc3339Timestamp(system_time, Precision::Micros);
+    Rfc3339Timestamp(system_time, Precision::Micros)
 }
 
 /// Format an RFC3339 timestamp `2018-02-14T00:28:07.000000000Z`
@@ -234,7 +237,7 @@
 ///
 /// The value is always UTC and ignores system timezone.
 pub fn format_rfc3339_nanos(system_time: SystemTime) -> Rfc3339Timestamp {
-    return Rfc3339Timestamp(system_time, Precision::Nanos);
+    Rfc3339Timestamp(system_time, Precision::Nanos)
 }
 
 impl fmt::Display for Rfc3339Timestamp {
@@ -246,7 +249,7 @@
         let secs_since_epoch = dur.as_secs();
         let nanos = dur.subsec_nanos();
 
-        if secs_since_epoch >= 253402300800 { // year 9999
+        if secs_since_epoch >= 253_402_300_800 { // year 9999
             return Err(fmt::Error);
         }
 
@@ -353,18 +356,17 @@
         };
 
         // we know our chars are all ascii
-        f.write_str(unsafe { str::from_utf8_unchecked(&buf[..offset+1]) })
+        f.write_str(str::from_utf8(&buf[..=offset]).expect("Conversion to utf8 failed"))
     }
 }
 
 #[cfg(test)]
 mod test {
-    extern crate time;
-    extern crate rand;
-
     use std::str::from_utf8;
-    use self::rand::Rng;
     use std::time::{UNIX_EPOCH, SystemTime, Duration};
+
+    use rand::Rng;
+
     use super::{parse_rfc3339, parse_rfc3339_weak, format_rfc3339};
     use super::{format_rfc3339_millis, format_rfc3339_micros};
     use super::{format_rfc3339_nanos};
@@ -374,7 +376,7 @@
         let s = time::at_utc(time::Timespec { sec: sec as i64, nsec: 0 })
                   .rfc3339().to_string();
         let time = UNIX_EPOCH + Duration::new(sec, 0);
-        return (s, time)
+        (s, time)
     }
 
     #[test]
@@ -394,9 +396,9 @@
         assert_eq!(parse_rfc3339("1970-01-01T00:00:01Z").unwrap(),
                    UNIX_EPOCH + Duration::new(1, 0));
         assert_eq!(parse_rfc3339("2018-02-13T23:08:32Z").unwrap(),
-                   UNIX_EPOCH + Duration::new(1518563312, 0));
+                   UNIX_EPOCH + Duration::new(1_518_563_312, 0));
         assert_eq!(parse_rfc3339("2012-01-01T00:00:00Z").unwrap(),
-                   UNIX_EPOCH + Duration::new(1325376000, 0));
+                   UNIX_EPOCH + Duration::new(1_325_376_000, 0));
     }
 
     #[test]
@@ -408,10 +410,10 @@
             format_rfc3339(UNIX_EPOCH + Duration::new(1, 0)).to_string(),
             "1970-01-01T00:00:01Z");
         assert_eq!(
-            format_rfc3339(UNIX_EPOCH + Duration::new(1518563312, 0)).to_string(),
+            format_rfc3339(UNIX_EPOCH + Duration::new(1_518_563_312, 0)).to_string(),
             "2018-02-13T23:08:32Z");
         assert_eq!(
-            format_rfc3339(UNIX_EPOCH + Duration::new(1325376000, 0)).to_string(),
+            format_rfc3339(UNIX_EPOCH + Duration::new(1_325_376_000, 0)).to_string(),
             "2012-01-01T00:00:00Z");
     }
 
@@ -423,7 +425,7 @@
             "1970-01-01T00:00:00.000Z");
         assert_eq!(
             format_rfc3339_millis(UNIX_EPOCH +
-                Duration::new(1518563312, 123_000_000)).to_string(),
+                Duration::new(1_518_563_312, 123_000_000)).to_string(),
             "2018-02-13T23:08:32.123Z");
     }
 
@@ -435,11 +437,11 @@
             "1970-01-01T00:00:00.000000Z");
         assert_eq!(
             format_rfc3339_micros(UNIX_EPOCH +
-                Duration::new(1518563312, 123_000_000)).to_string(),
+                Duration::new(1_518_563_312, 123_000_000)).to_string(),
             "2018-02-13T23:08:32.123000Z");
         assert_eq!(
             format_rfc3339_micros(UNIX_EPOCH +
-                Duration::new(1518563312, 456_123_000)).to_string(),
+                Duration::new(1_518_563_312, 456_123_000)).to_string(),
             "2018-02-13T23:08:32.456123Z");
     }
 
@@ -451,11 +453,11 @@
             "1970-01-01T00:00:00.000000000Z");
         assert_eq!(
             format_rfc3339_nanos(UNIX_EPOCH +
-                Duration::new(1518563312, 123_000_000)).to_string(),
+                Duration::new(1_518_563_312, 123_000_000)).to_string(),
             "2018-02-13T23:08:32.123000000Z");
         assert_eq!(
             format_rfc3339_nanos(UNIX_EPOCH +
-                Duration::new(1518563312, 789_456_123)).to_string(),
+                Duration::new(1_518_563_312, 789_456_123)).to_string(),
             "2018-02-13T23:08:32.789456123Z");
     }
 
@@ -469,13 +471,13 @@
     #[test]
     fn leap_second() {
         assert_eq!(parse_rfc3339("2016-12-31T23:59:60Z").unwrap(),
-                   UNIX_EPOCH + Duration::new(1483228799, 0));
+                   UNIX_EPOCH + Duration::new(1_483_228_799, 0));
     }
 
     #[test]
     fn first_731_days() {
         let year_start = 0;  // 1970
-        for day in 0.. (365 * 2 + 1) {  // scan leap year and non-leap year
+        for day in 0..= 365 * 2 {  // scan leap year and non-leap year
             let (s, time) = from_sec(year_start + day * 86400);
             assert_eq!(parse_rfc3339(&s).unwrap(), time);
             assert_eq!(format_rfc3339(time).to_string(), s);
@@ -484,8 +486,8 @@
 
     #[test]
     fn the_731_consecutive_days() {
-        let year_start = 1325376000;  // 2012
-        for day in 0.. (365 * 2 + 1) {  // scan leap year and non-leap year
+        let year_start = 1_325_376_000;  // 2012
+        for day in 0..= 365 * 2 {  // scan leap year and non-leap year
             let (s, time) = from_sec(year_start + day * 86400);
             assert_eq!(parse_rfc3339(&s).unwrap(), time);
             assert_eq!(format_rfc3339(time).to_string(), s);
@@ -494,7 +496,7 @@
 
     #[test]
     fn all_86400_seconds() {
-        let day_start = 1325376000;
+        let day_start = 1_325_376_000;
         for second in 0..86400 {  // scan leap year and non-leap year
             let (s, time) = from_sec(day_start + second);
             assert_eq!(parse_rfc3339(&s).unwrap(), time);
@@ -516,7 +518,7 @@
 
     #[test]
     fn random_wide_range() {
-        for _ in 0..100000 {
+        for _ in 0..100_000 {
             let sec = rand::thread_rng().gen_range(0, max::SECONDS);
             let (s, time) = from_sec(sec);
             assert_eq!(parse_rfc3339(&s).unwrap(), time);
@@ -527,8 +529,8 @@
     #[test]
     fn milliseconds() {
         assert_eq!(parse_rfc3339("1970-01-01T00:00:00.123Z").unwrap(),
-                   UNIX_EPOCH + Duration::new(0, 123000000));
-        assert_eq!(format_rfc3339(UNIX_EPOCH + Duration::new(0, 123000000))
+                   UNIX_EPOCH + Duration::new(0, 123_000_000));
+        assert_eq!(format_rfc3339(UNIX_EPOCH + Duration::new(0, 123_000_000))
             .to_string(), "1970-01-01T00:00:00.123000000Z");
     }
 
@@ -596,15 +598,15 @@
         parse_rfc3339("1970-01-01 00:00:00").unwrap_err();
 
         assert_eq!(parse_rfc3339_weak("1970-01-01 00:00:00.000123").unwrap(),
-                   UNIX_EPOCH + Duration::new(0, 123000));
+                   UNIX_EPOCH + Duration::new(0, 123_000));
         parse_rfc3339("1970-01-01 00:00:00.000123").unwrap_err();
 
         assert_eq!(parse_rfc3339_weak("1970-01-01T00:00:00.000123").unwrap(),
-                   UNIX_EPOCH + Duration::new(0, 123000));
+                   UNIX_EPOCH + Duration::new(0, 123_000));
         parse_rfc3339("1970-01-01T00:00:00.000123").unwrap_err();
 
         assert_eq!(parse_rfc3339_weak("1970-01-01 00:00:00.000123Z").unwrap(),
-                   UNIX_EPOCH + Duration::new(0, 123000));
+                   UNIX_EPOCH + Duration::new(0, 123_000));
         parse_rfc3339("1970-01-01 00:00:00.000123Z").unwrap_err();
 
         assert_eq!(parse_rfc3339_weak("1970-01-01 00:00:00Z").unwrap(),
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/src/duration.rs firefox-85.0+build1/third_party/rust/humantime/src/duration.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/src/duration.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/src/duration.rs	2021-01-18 19:58:25.000000000 +0000
@@ -1,60 +1,79 @@
+use std::error::Error as StdError;
 use std::fmt;
 use std::str::Chars;
 use std::time::Duration;
-use std::error::Error as StdError;
 
-quick_error! {
-    /// Error parsing human-friendly duration
-    #[derive(Debug, PartialEq, Clone, Copy)]
-    pub enum Error {
-        /// Invalid character during parsing
-        ///
-        /// More specifically anything that is not alphanumeric is prohibited
-        ///
-        /// The field is an byte offset of the character in the string.
-        InvalidCharacter(offset: usize) {
-            display("invalid character at {}", offset)
-            description("invalid character")
-        }
-        /// Non-numeric value where number is expected
-        ///
-        /// This usually means that either time unit is broken into words,
-        /// e.g. `m sec` instead of `msec`, or just number is omitted,
-        /// for example `2 hours min` instead of `2 hours 1 min`
-        ///
-        /// The field is an byte offset of the errorneous character
-        /// in the string.
-        NumberExpected(offset: usize) {
-            display("expected number at {}", offset)
-            description("expected number")
-        }
-        /// Unit in the number is not one of allowed units
-        ///
-        /// See documentation of `parse_duration` for the list of supported
-        /// time units.
-        ///
-        /// The two fields are start and end (exclusive) of the slice from
-        /// the original string, containing errorneous value
-        UnknownUnit(start: usize, end: usize) {
-            display("unknown unit at {}-{}", start, end)
-            description("unknown unit")
-        }
-        /// The numeric value is too large
-        ///
-        /// Usually this means value is too large to be useful. If user writes
-        /// data in subsecond units, then the maximum is about 3k years. When
-        /// using seconds, or larger units, the limit is even larger.
-        NumberOverflow {
-            display(self_) -> ("{}", self_.description())
-            description("number is too large")
-        }
-        /// The value was an empty string (or consists only whitespace)
-        Empty {
-            display(self_) -> ("{}", self_.description())
-            description("value was empty")
+/// Error parsing human-friendly duration
+#[derive(Debug, PartialEq, Clone)]
+pub enum Error {
+    /// Invalid character during parsing
+    ///
+    /// More specifically anything that is not alphanumeric is prohibited
+    ///
+    /// The field is an byte offset of the character in the string.
+    InvalidCharacter(usize),
+    /// Non-numeric value where number is expected
+    ///
+    /// This usually means that either time unit is broken into words,
+    /// e.g. `m sec` instead of `msec`, or just number is omitted,
+    /// for example `2 hours min` instead of `2 hours 1 min`
+    ///
+    /// The field is an byte offset of the errorneous character
+    /// in the string.
+    NumberExpected(usize),
+    /// Unit in the number is not one of allowed units
+    ///
+    /// See documentation of `parse_duration` for the list of supported
+    /// time units.
+    ///
+    /// The two fields are start and end (exclusive) of the slice from
+    /// the original string, containing errorneous value
+    UnknownUnit {
+        /// Start of the invalid unit inside the original string
+        start: usize,
+        /// End of the invalid unit inside the original string
+        end: usize,
+        /// The unit verbatim
+        unit: String,
+        /// A number associated with the unit
+        value: u64,
+    },
+    /// The numeric value is too large
+    ///
+    /// Usually this means value is too large to be useful. If user writes
+    /// data in subsecond units, then the maximum is about 3k years. When
+    /// using seconds, or larger units, the limit is even larger.
+    NumberOverflow,
+    /// The value was an empty string (or consists only whitespace)
+    Empty,
+}
+
+impl StdError for Error {}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::InvalidCharacter(offset) => write!(f, "invalid character at {}", offset),
+            Error::NumberExpected(offset) => write!(f, "expected number at {}", offset),
+            Error::UnknownUnit { unit, value, .. } if &unit == &"" => {
+                write!(f,
+                    "time unit needed, for example {0}sec or {0}ms",
+                    value,
+                )
+            }
+            Error::UnknownUnit { unit, .. } => {
+                write!(
+                    f,
+                    "unknown time unit {:?}, \
+                    supported units: ns, us, ms, sec, min, hours, days, \
+                    weeks, months, years (and few variations)",
+                    unit
+                )
+            }
+            Error::NumberOverflow => write!(f, "number is too large"),
+            Error::Empty => write!(f, "value was empty"),
         }
     }
-
 }
 
 /// A wrapper type that allows you to Display a Duration
@@ -90,7 +109,7 @@
         let off = self.off();
         for c in self.iter.by_ref() {
             match c {
-                '0'...'9' => {
+                '0'..='9' => {
                     return Ok(Some(c as u64 - '0' as u64));
                 }
                 c if c.is_whitespace() => continue,
@@ -99,48 +118,54 @@
                 }
             }
         }
-        return Ok(None);
+        Ok(None)
     }
     fn parse_unit(&mut self, n: u64, start: usize, end: usize)
         -> Result<(), Error>
     {
         let (mut sec, nsec) = match &self.src[start..end] {
             "nanos" | "nsec" | "ns" => (0u64, n),
-            "usec" | "us" => (0u64, try!(n.mul(1000))),
-            "millis" | "msec" | "ms" => (0u64, try!(n.mul(1000_000))),
+            "usec" | "us" => (0u64, n.mul(1000)?),
+            "millis" | "msec" | "ms" => (0u64, n.mul(1_000_000)?),
             "seconds" | "second" | "secs" | "sec" | "s" => (n, 0),
             "minutes" | "minute" | "min" | "mins" | "m"
-            => (try!(n.mul(60)), 0),
-            "hours" | "hour" | "hr" | "hrs" | "h" => (try!(n.mul(3600)), 0),
-            "days" | "day" | "d" => (try!(n.mul(86400)), 0),
-            "weeks" | "week" | "w" => (try!(n.mul(86400*7)), 0),
-            "months" | "month" | "M" => (try!(n.mul(2630016)), 0), // 30.44d
-            "years" | "year" | "y" => (try!(n.mul(31557600)), 0), // 365.25d
-            _ => return Err(Error::UnknownUnit(start, end)),
+            => (n.mul(60)?, 0),
+            "hours" | "hour" | "hr" | "hrs" | "h" => (n.mul(3600)?, 0),
+            "days" | "day" | "d" => (n.mul(86400)?, 0),
+            "weeks" | "week" | "w" => (n.mul(86400*7)?, 0),
+            "months" | "month" | "M" => (n.mul(2_630_016)?, 0), // 30.44d
+            "years" | "year" | "y" => (n.mul(31_557_600)?, 0), // 365.25d
+            _ => {
+                return Err(Error::UnknownUnit {
+                    start, end,
+                    unit: self.src[start..end].to_string(),
+                    value: n,
+                });
+            }
         };
-        let mut nsec = try!(self.current.1.add(nsec));
-        if nsec > 1000_000_000 {
-            sec = try!(sec.add(nsec / 1000_000_000));
-            nsec %= 1000_000_000;
+        let mut nsec = self.current.1.add(nsec)?;
+        if nsec > 1_000_000_000 {
+            sec = sec.add(nsec / 1_000_000_000)?;
+            nsec %= 1_000_000_000;
         }
-        sec = try!(self.current.0.add(sec));
+        sec = self.current.0.add(sec)?;
         self.current = (sec, nsec);
         Ok(())
     }
 
     fn parse(mut self) -> Result<Duration, Error> {
-        let mut n = try!(try!(self.parse_first_char()).ok_or(Error::Empty));
+        let mut n = self.parse_first_char()?.ok_or(Error::Empty)?;
         'outer: loop {
             let mut off = self.off();
             while let Some(c) = self.iter.next() {
                 match c {
-                    '0'...'9' => {
-                        n = try!(n.checked_mul(10)
+                    '0'..='9' => {
+                        n = n.checked_mul(10)
                             .and_then(|x| x.checked_add(c as u64 - '0' as u64))
-                            .ok_or(Error::NumberOverflow));
+                            .ok_or(Error::NumberOverflow)?;
                     }
                     c if c.is_whitespace() => {}
-                    'a'...'z' | 'A'...'Z' => {
+                    'a'..='z' | 'A'..='Z' => {
                         break;
                     }
                     _ => {
@@ -153,21 +178,21 @@
             let mut off = self.off();
             while let Some(c) = self.iter.next() {
                 match c {
-                    '0'...'9' => {
-                        try!(self.parse_unit(n, start, off));
+                    '0'..='9' => {
+                        self.parse_unit(n, start, off)?;
                         n = c as u64 - '0' as u64;
                         continue 'outer;
                     }
                     c if c.is_whitespace() => break,
-                    'a'...'z' | 'A'...'Z' => {}
+                    'a'..='z' | 'A'..='Z' => {}
                     _ => {
                         return Err(Error::InvalidCharacter(off));
                     }
                 }
                 off = self.off();
             }
-            try!(self.parse_unit(n, start, off));
-            n = match try!(self.parse_first_char()) {
+            self.parse_unit(n, start, off)?;
+            n = match self.parse_first_char()? {
                 Some(n) => n,
                 None => return Ok(
                     Duration::new(self.current.0, self.current.1 as u32)),
@@ -182,7 +207,7 @@
 /// The duration object is a concatenation of time spans. Where each time
 /// span is an integer number and a suffix. Supported suffixes:
 ///
-/// * `nsec`, `ns` -- microseconds
+/// * `nsec`, `ns` -- nanoseconds
 /// * `usec`, `us` -- microseconds
 /// * `msec`, `ms` -- milliseconds
 /// * `seconds`, `second`, `sec`, `s`
@@ -270,10 +295,10 @@
             return Ok(());
         }
 
-        let years = secs / 31557600;  // 365.25d
-        let ydays = secs % 31557600;
-        let months = ydays / 2630016;  // 30.44d
-        let mdays = ydays % 2630016;
+        let years = secs / 31_557_600;  // 365.25d
+        let ydays = secs % 31_557_600;
+        let months = ydays / 2_630_016;  // 30.44d
+        let mdays = ydays % 2_630_016;
         let days = mdays / 86400;
         let day_secs = mdays % 86400;
         let hours = day_secs / 3600;
@@ -300,23 +325,24 @@
 
 #[cfg(test)]
 mod test {
-    extern crate rand;
-
     use std::time::Duration;
-    use self::rand::Rng;
+
+    use rand::Rng;
+
     use super::{parse_duration, format_duration};
     use super::Error;
 
     #[test]
+    #[allow(clippy::cognitive_complexity)]
     fn test_units() {
         assert_eq!(parse_duration("17nsec"), Ok(Duration::new(0, 17)));
         assert_eq!(parse_duration("17nanos"), Ok(Duration::new(0, 17)));
         assert_eq!(parse_duration("33ns"), Ok(Duration::new(0, 33)));
         assert_eq!(parse_duration("3usec"), Ok(Duration::new(0, 3000)));
         assert_eq!(parse_duration("78us"), Ok(Duration::new(0, 78000)));
-        assert_eq!(parse_duration("31msec"), Ok(Duration::new(0, 31000000)));
-        assert_eq!(parse_duration("31millis"), Ok(Duration::new(0, 31000000)));
-        assert_eq!(parse_duration("6ms"), Ok(Duration::new(0, 6000000)));
+        assert_eq!(parse_duration("31msec"), Ok(Duration::new(0, 31_000_000)));
+        assert_eq!(parse_duration("31millis"), Ok(Duration::new(0, 31_000_000)));
+        assert_eq!(parse_duration("6ms"), Ok(Duration::new(0, 6_000_000)));
         assert_eq!(parse_duration("3000s"), Ok(Duration::new(3000, 0)));
         assert_eq!(parse_duration("300sec"), Ok(Duration::new(300, 0)));
         assert_eq!(parse_duration("300secs"), Ok(Duration::new(300, 0)));
@@ -333,17 +359,17 @@
         assert_eq!(parse_duration("1hour"), Ok(Duration::new(3600, 0)));
         assert_eq!(parse_duration("24hours"), Ok(Duration::new(86400, 0)));
         assert_eq!(parse_duration("1day"), Ok(Duration::new(86400, 0)));
-        assert_eq!(parse_duration("2days"), Ok(Duration::new(172800, 0)));
-        assert_eq!(parse_duration("365d"), Ok(Duration::new(31536000, 0)));
-        assert_eq!(parse_duration("1week"), Ok(Duration::new(604800, 0)));
-        assert_eq!(parse_duration("7weeks"), Ok(Duration::new(4233600, 0)));
-        assert_eq!(parse_duration("52w"), Ok(Duration::new(31449600, 0)));
-        assert_eq!(parse_duration("1month"), Ok(Duration::new(2630016, 0)));
-        assert_eq!(parse_duration("3months"), Ok(Duration::new(3*2630016, 0)));
-        assert_eq!(parse_duration("12M"), Ok(Duration::new(31560192, 0)));
-        assert_eq!(parse_duration("1year"), Ok(Duration::new(31557600, 0)));
-        assert_eq!(parse_duration("7years"), Ok(Duration::new(7*31557600, 0)));
-        assert_eq!(parse_duration("17y"), Ok(Duration::new(536479200, 0)));
+        assert_eq!(parse_duration("2days"), Ok(Duration::new(172_800, 0)));
+        assert_eq!(parse_duration("365d"), Ok(Duration::new(31_536_000, 0)));
+        assert_eq!(parse_duration("1week"), Ok(Duration::new(604_800, 0)));
+        assert_eq!(parse_duration("7weeks"), Ok(Duration::new(4_233_600, 0)));
+        assert_eq!(parse_duration("52w"), Ok(Duration::new(31_449_600, 0)));
+        assert_eq!(parse_duration("1month"), Ok(Duration::new(2_630_016, 0)));
+        assert_eq!(parse_duration("3months"), Ok(Duration::new(3*2_630_016, 0)));
+        assert_eq!(parse_duration("12M"), Ok(Duration::new(31_560_192, 0)));
+        assert_eq!(parse_duration("1year"), Ok(Duration::new(31_557_600, 0)));
+        assert_eq!(parse_duration("7years"), Ok(Duration::new(7*31_557_600, 0)));
+        assert_eq!(parse_duration("17y"), Ok(Duration::new(536_479_200, 0)));
     }
 
     #[test]
@@ -364,7 +390,7 @@
     #[test]
     fn random_second() {
         for _ in 0..10000 {
-            let sec = rand::thread_rng().gen_range(0, 253370764800);
+            let sec = rand::thread_rng().gen_range(0, 253_370_764_800);
             let d = Duration::new(sec, 0);
             assert_eq!(d,
                 parse_duration(&format_duration(d).to_string()).unwrap());
@@ -374,7 +400,7 @@
     #[test]
     fn random_any() {
         for _ in 0..10000 {
-            let sec = rand::thread_rng().gen_range(0, 253370764800);
+            let sec = rand::thread_rng().gen_range(0, 253_370_764_800);
             let nanos = rand::thread_rng().gen_range(0, 1_000_000_000);
             let d = Duration::new(sec, nanos);
             assert_eq!(d,
@@ -408,4 +434,16 @@
         assert_eq!(parse_duration("10000000000000y"),
             Err(Error::NumberOverflow));
     }
+
+    #[test]
+    fn test_nice_error_message() {
+        assert_eq!(parse_duration("123").unwrap_err().to_string(),
+            "time unit needed, for example 123sec or 123ms");
+        assert_eq!(parse_duration("10 months 1").unwrap_err().to_string(),
+            "time unit needed, for example 1sec or 1ms");
+        assert_eq!(parse_duration("10nights").unwrap_err().to_string(),
+            "unknown time unit \"nights\", supported units: \
+            ns, us, ms, sec, min, hours, days, weeks, months, \
+            years (and few variations)");
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/src/lib.rs firefox-85.0+build1/third_party/rust/humantime/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/src/lib.rs	2021-01-18 19:58:25.000000000 +0000
@@ -10,24 +10,25 @@
 //! Timestamp parsing/formatting is super-fast because format is basically
 //! fixed.
 //!
-//! See [serde-humantime] for serde integration.
+//! See [humantime-serde] for serde integration (previous crate [serde-humantime] looks unmaintained).
 //!
 //! [serde-humantime]: https://docs.rs/serde-humantime/0.1.1/serde_humantime/
+//! [humantime-serde]: https://docs.rs/humantime-serde
+
+#![forbid(unsafe_code)]
 #![warn(missing_debug_implementations)]
 #![warn(missing_docs)]
 
-#[macro_use] extern crate quick_error;
-
 mod duration;
 mod wrapper;
 mod date;
 
-pub use duration::{parse_duration, Error as DurationError};
-pub use duration::{format_duration, FormattedDuration};
-pub use wrapper::{Duration, Timestamp};
-pub use date::{parse_rfc3339, parse_rfc3339_weak, Error as TimestampError};
-pub use date::{
+pub use self::duration::{parse_duration, Error as DurationError};
+pub use self::duration::{format_duration, FormattedDuration};
+pub use self::wrapper::{Duration, Timestamp};
+pub use self::date::{parse_rfc3339, parse_rfc3339_weak, Error as TimestampError};
+pub use self::date::{
     format_rfc3339, format_rfc3339_micros, format_rfc3339_millis, format_rfc3339_nanos,
     format_rfc3339_seconds,
 };
-pub use date::{Rfc3339Timestamp};
+pub use self::date::{Rfc3339Timestamp};
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/src/wrapper.rs firefox-85.0+build1/third_party/rust/humantime/src/wrapper.rs
--- firefox-84.0.2+build1/third_party/rust/humantime/src/wrapper.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/src/wrapper.rs	2021-01-18 19:58:25.000000000 +0000
@@ -3,8 +3,8 @@
 use std::fmt;
 use std::time::{Duration as StdDuration, SystemTime};
 
-use duration::{self, parse_duration, format_duration};
-use date::{self, parse_rfc3339_weak, format_rfc3339};
+use crate::duration::{self, parse_duration, format_duration};
+use crate::date::{self, parse_rfc3339_weak, format_rfc3339};
 
 /// A wrapper for duration that has `FromStr` implementation
 ///
diff -Nru firefox-84.0.2+build1/third_party/rust/humantime/vagga.yaml firefox-85.0+build1/third_party/rust/humantime/vagga.yaml
--- firefox-84.0.2+build1/third_party/rust/humantime/vagga.yaml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/humantime/vagga.yaml	2021-01-18 19:58:25.000000000 +0000
@@ -49,7 +49,7 @@
     - !Install [ca-certificates, build-essential, vim]
 
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-1.31.0-x86_64-unknown-linux-gnu.tar.gz"
       script: "./install.sh --prefix=/usr \
                --components=rustc,rust-std-x86_64-unknown-linux-gnu,cargo"
     - &bulk !Tar
@@ -70,7 +70,7 @@
     - !Install [ca-certificates, build-essential, vim]
 
     - !TarInstall
-      url: "https://static.rust-lang.org/dist/rust-1.24.0-i686-unknown-linux-gnu.tar.gz"
+      url: "https://static.rust-lang.org/dist/rust-1.31.0-i686-unknown-linux-gnu.tar.gz"
       script: "./install.sh --prefix=/usr \
                --components=rustc,rust-std-i686-unknown-linux-gnu,cargo"
 
diff -Nru firefox-84.0.2+build1/third_party/rust/inherent/.cargo-checksum.json firefox-85.0+build1/third_party/rust/inherent/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/inherent/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/inherent/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"0ce5ab889ad4a341e85972527435c959bc54d2f3732fa67b7b13d7627e6fba21","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"74bd3fad47365c6947c8026d71c4447503eadc4e59cab5b99008758764ca8163","src/default_methods.rs":"71d2d0e6a54f30b5958ecaa48b49fd21560620f98e468a99142bea1d954b36a4","src/expand.rs":"eace0ba684a4b002a995906565882e2b7753be6642bbe01c6ada30767730a624","src/lib.rs":"6e844f4e0104c942945e8071b346788f01f5e63e15d378b501b966d10d49f8ed","src/parse.rs":"5478cff1e20ac6dc2c95772eaecfa8b8ec557effe689b536d865287c0b0b89ce","src/visibility.rs":"d5334b8db4953bd7aa9277e75717f2bdaf4ceb01e98db101d040687238f22e20","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"5ba0edc93c0edf63744d45cd293ed8c522ee3a7cb9da3df4d7dacaa6ed004478","tests/ui/default-with-body.rs":"d7a6ad44e8327f298b88e93b43adb019d4278ccd2f56f0ca98c819d08bf8906a","tests/ui/default-with-body.stderr":"e3669c86597c7146dba36f3dfa6a200fd66e315b9e5518171c1ec45c883e1e2d","tests/ui/nonsense-in-default.rs":"694f0e75e213ad78ad30124f00bb45517331f2eceb8f44f4f49d5f5d917ba018","tests/ui/nonsense-in-default.stderr":"96d47e0b3b00197e6f959759a8c57a77d7af68ebfa8d0ed1d4df3f6fe0995717","tests/ui/not-trait-impl.rs":"e99aba255dc75c498d43098c496a2b349631de74ca51b6fdcd90fc744a4fcc94","tests/ui/not-trait-impl.stderr":"12e936203b335bccc3a180c66523c0d434fac6038521d1a6712ee5d37a7eec4d","tests/ui/not-visible.rs":"ee9c08bf412b0ce2b077ab53a2ad4c98ada104c48721b484bfe79ebb2bc36230","tests/ui/not-visible.stderr":"c8bf2a1efbe851a7b1eb1490ea621826f37670bf80d17090b0437140cc396995"},"package":"c2db418475edf9eb55fec92b7527be6d9a7b880bff6651cb0c0345af57f1cadf"}
\ No newline at end of file
+{"files":{"Cargo.toml":"bd0547397529da2c04320940fecc8ffff6aaaf6b4e1e1ee33153d873b895ad6b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"74bd3fad47365c6947c8026d71c4447503eadc4e59cab5b99008758764ca8163","src/default_methods.rs":"71d2d0e6a54f30b5958ecaa48b49fd21560620f98e468a99142bea1d954b36a4","src/expand.rs":"163ad57ac8e5cb2294d96a2ba8db23815c44137e23f8177bfd59f87a4cd3d694","src/lib.rs":"6e844f4e0104c942945e8071b346788f01f5e63e15d378b501b966d10d49f8ed","src/parse.rs":"5478cff1e20ac6dc2c95772eaecfa8b8ec557effe689b536d865287c0b0b89ce","src/visibility.rs":"d5334b8db4953bd7aa9277e75717f2bdaf4ceb01e98db101d040687238f22e20","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"5ba0edc93c0edf63744d45cd293ed8c522ee3a7cb9da3df4d7dacaa6ed004478","tests/ui/default-with-body.rs":"d7a6ad44e8327f298b88e93b43adb019d4278ccd2f56f0ca98c819d08bf8906a","tests/ui/default-with-body.stderr":"e3669c86597c7146dba36f3dfa6a200fd66e315b9e5518171c1ec45c883e1e2d","tests/ui/nonsense-in-default.rs":"694f0e75e213ad78ad30124f00bb45517331f2eceb8f44f4f49d5f5d917ba018","tests/ui/nonsense-in-default.stderr":"96d47e0b3b00197e6f959759a8c57a77d7af68ebfa8d0ed1d4df3f6fe0995717","tests/ui/not-trait-impl.rs":"e99aba255dc75c498d43098c496a2b349631de74ca51b6fdcd90fc744a4fcc94","tests/ui/not-trait-impl.stderr":"12e936203b335bccc3a180c66523c0d434fac6038521d1a6712ee5d37a7eec4d","tests/ui/not-visible.rs":"ee9c08bf412b0ce2b077ab53a2ad4c98ada104c48721b484bfe79ebb2bc36230","tests/ui/not-visible.stderr":"c8bf2a1efbe851a7b1eb1490ea621826f37670bf80d17090b0437140cc396995"},"package":"f3a1325a022293a53274277a7c5c3c5bc73405cb443bb96cc2ce20ff4121e995"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/inherent/Cargo.toml firefox-85.0+build1/third_party/rust/inherent/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/inherent/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/inherent/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "inherent"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Make trait methods callable without the trait in scope"
 documentation = "https://docs.rs/inherent"
diff -Nru firefox-84.0.2+build1/third_party/rust/inherent/src/expand.rs firefox-85.0+build1/third_party/rust/inherent/src/expand.rs
--- firefox-84.0.2+build1/third_party/rust/inherent/src/expand.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/inherent/src/expand.rs	2021-01-18 19:58:25.000000000 +0000
@@ -47,7 +47,7 @@
         let default_doc = if has_doc {
             None
         } else {
-            let msg = format!("See [{}::{}]", quote!(#trait_), ident);
+            let msg = format!("See [`{}::{}`]", quote!(#trait_), ident);
             Some(quote!(#[doc = #msg]))
         };
 
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/.cargo-checksum.json firefox-85.0+build1/third_party/rust/jsparagus-emitter/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"00c740f44b5681e3277e519d2e143e6edfbff186ca31a07ddce2eb46b803ddd7","src/array_emitter.rs":"bbc6528321f1d11d7c86c4f2bfdcfc9dced8f0b8b1c30c9f0a5355f300d196b6","src/ast_emitter.rs":"8326432205a0c05aa0c2def31a621c70a0365c05278d2392510ad48e782abfe6","src/block_emitter.rs":"78965260d87a66c5324d6f3bdfea0f1938f8037f70adde148dbb2db599d1b2c0","src/compilation_info.rs":"b0d91b0f8d6940cb7087b474c3c814b758c8ce8d9027c415b76ad4af78be6140","src/control_structures.rs":"bdb186e98c14fa4e769b23b3dee4376683e6c6530af0856d55c055aff4398b84","src/dis.rs":"4a335d813fa965482ca0f20a7b9295a55ce7625b577d42bd8b33b156b81c6306","src/emitter.rs":"1b3e272a30c1e2ddba72db69205c3562afaa21dfa8979251942b6e1b47856556","src/emitter_scope.rs":"ba924ef541742a5c7be39d1b683bf3107241cf3ff5b8ff7f93987abc9f52e9d2","src/expression_emitter.rs":"f8e02785dffb179bbe9fe58e45bbfccc08adc3ad0a071a0073bed0feedc8ed9a","src/function_declaration_emitter.rs":"145e4476b387a067736fdf5aac2ca567694b2b0b952d0862bc56bd8e9af4a743","src/lib.rs":"e256eceee1eb7ea66fe855fcc3fa2fff187977f9adca2754872d13e9bb788536","src/object_emitter.rs":"998423b3d6ef8797fadef6763803627df72fde292b1b34d6a41b2e66a331a181","src/reference_op_emitter.rs":"87c7e05934718921d72977746b93513850eab69465d33e190003cb86241f62b4","src/script_emitter.rs":"44a6be5ecdcde3c32d78d100a205d38be2591c7c2cc109967579af7393e09fe8"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"00c740f44b5681e3277e519d2e143e6edfbff186ca31a07ddce2eb46b803ddd7","src/array_emitter.rs":"bbc6528321f1d11d7c86c4f2bfdcfc9dced8f0b8b1c30c9f0a5355f300d196b6","src/ast_emitter.rs":"deb40c78866eb094eda7e748ec8255ae6e4eda8b40cdcfe19b52389611d4e44c","src/block_emitter.rs":"78965260d87a66c5324d6f3bdfea0f1938f8037f70adde148dbb2db599d1b2c0","src/compilation_info.rs":"b0d91b0f8d6940cb7087b474c3c814b758c8ce8d9027c415b76ad4af78be6140","src/control_structures.rs":"bdb186e98c14fa4e769b23b3dee4376683e6c6530af0856d55c055aff4398b84","src/dis.rs":"4a335d813fa965482ca0f20a7b9295a55ce7625b577d42bd8b33b156b81c6306","src/emitter.rs":"07adf54bf9cb6e6ff045e7069ece650e212ba0b12b706e47ac2f833f7533fc9d","src/emitter_scope.rs":"93c2b2a324ccb46b74adb2a28f56360a32652088e59c03641b4f1b608549dc78","src/expression_emitter.rs":"f8e02785dffb179bbe9fe58e45bbfccc08adc3ad0a071a0073bed0feedc8ed9a","src/function_declaration_emitter.rs":"0e6ae706ced215882f3a45b6e13f022ec1effa8edf1026b7ba7988810646982b","src/lib.rs":"e256eceee1eb7ea66fe855fcc3fa2fff187977f9adca2754872d13e9bb788536","src/object_emitter.rs":"998423b3d6ef8797fadef6763803627df72fde292b1b34d6a41b2e66a331a181","src/reference_op_emitter.rs":"c0c0ddde1613ab843dd3ee82744513bdd4f574432a06d5a88978e7ff1ce08273","src/script_emitter.rs":"150a3d6330f40099ad1df8c52cd1831e3ef0fd4eecf44a20e3fff7acef2dd640"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/ast_emitter.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/ast_emitter.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/ast_emitter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/ast_emitter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -10,7 +10,6 @@
 use crate::expression_emitter::*;
 use crate::function_declaration_emitter::{
     AnnexBFunctionDeclarationEmitter, LazyFunctionEmitter, LexicalFunctionDeclarationEmitter,
-    TopLevelFunctionDeclarationEmitter,
 };
 use crate::object_emitter::*;
 use crate::reference_op_emitter::{
@@ -134,9 +133,10 @@
             .function_stencil_indices
             .get(fun)
             .expect("ScriptStencil should be created");
-        let fun_index = LazyFunctionEmitter { stencil_index }.emit(self);
 
-        TopLevelFunctionDeclarationEmitter { fun_index }.emit(self);
+        // NOTE: GCIndex for the function is implicitly handled by
+        //       global_or_eval_decl_instantiation.
+        LazyFunctionEmitter { stencil_index }.emit(self);
 
         Ok(())
     }
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/emitter.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/emitter.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/emitter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/emitter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -147,9 +147,6 @@
 
     /// Number of JOF_IC instructions emitted so far.
     num_ic_entries: usize,
-
-    /// Number of instructions in this script that have JOF_TYPESET.
-    num_type_sets: usize,
 }
 
 #[derive(Debug)]
@@ -194,7 +191,6 @@
             maximum_stack_depth: 0,
             body_scope_index: None,
             num_ic_entries: 0,
-            num_type_sets: 0,
         }
     }
 
@@ -302,10 +298,6 @@
         }
 
         self.bytecode.push(opcode.to_byte());
-
-        if opcode.has_typeset() {
-            self.num_type_sets += 1;
-        }
     }
 
     fn set_last_jump_target_offset(&mut self, target: BytecodeOffset) {
@@ -530,11 +522,6 @@
         self.write_g_c_thing_index(baseobj_index);
     }
 
-    pub fn new_object_with_group(&mut self, baseobj_index: GCThingIndex) {
-        self.emit_op(Opcode::NewObjectWithGroup);
-        self.write_g_c_thing_index(baseobj_index);
-    }
-
     pub fn object(&mut self, object_index: GCThingIndex) {
         self.emit_op(Opcode::Object);
         self.write_g_c_thing_index(object_index);
@@ -612,24 +599,10 @@
         self.write_g_c_thing_index(name_index);
     }
 
-    pub fn call_prop(&mut self, name_index: GCThingIndex) {
-        self.emit_op(Opcode::CallProp);
-        self.write_g_c_thing_index(name_index);
-    }
-
     pub fn get_elem(&mut self) {
         self.emit_op(Opcode::GetElem);
     }
 
-    pub fn call_elem(&mut self) {
-        self.emit_op(Opcode::CallElem);
-    }
-
-    pub fn length(&mut self, name_index: GCThingIndex) {
-        self.emit_op(Opcode::Length);
-        self.write_g_c_thing_index(name_index);
-    }
-
     pub fn set_prop(&mut self, name_index: GCThingIndex) {
         self.emit_op(Opcode::SetProp);
         self.write_g_c_thing_index(name_index);
@@ -719,10 +692,6 @@
         self.emit_op(Opcode::IsNoIter);
     }
 
-    pub fn iter_next(&mut self) {
-        self.emit_op(Opcode::IterNext);
-    }
-
     pub fn end_iter(&mut self) {
         self.emit_op(Opcode::EndIter);
     }
@@ -762,11 +731,6 @@
         self.emit_op(Opcode::Hole);
     }
 
-    pub fn new_array_copy_on_write(&mut self, object_index: GCThingIndex) {
-        self.emit_op(Opcode::NewArrayCopyOnWrite);
-        self.write_g_c_thing_index(object_index);
-    }
-
     pub fn reg_exp(&mut self, regexp_index: GCThingIndex) {
         self.emit_op(Opcode::RegExp);
         self.write_g_c_thing_index(regexp_index);
@@ -1263,27 +1227,9 @@
         self.emit_op(Opcode::BindVar);
     }
 
-    pub fn def_var(&mut self, name_index: GCThingIndex) {
-        self.emit_op(Opcode::DefVar);
-        self.write_g_c_thing_index(name_index);
-    }
-
-    pub fn def_fun(&mut self) {
-        self.emit_op(Opcode::DefFun);
-    }
-
-    pub fn def_let(&mut self, name_index: GCThingIndex) {
-        self.emit_op(Opcode::DefLet);
-        self.write_g_c_thing_index(name_index);
-    }
-
-    pub fn def_const(&mut self, name_index: GCThingIndex) {
-        self.emit_op(Opcode::DefConst);
-        self.write_g_c_thing_index(name_index);
-    }
-
-    pub fn check_global_or_eval_decl(&mut self) {
-        self.emit_op(Opcode::CheckGlobalOrEvalDecl);
+    pub fn global_or_eval_decl_instantiation(&mut self, last_fun: u32) {
+        self.emit_op(Opcode::GlobalOrEvalDeclInstantiation);
+        self.write_u32(last_fun);
     }
 
     pub fn del_name(&mut self, name_index: GCThingIndex) {
@@ -1503,7 +1449,6 @@
                 .map_err(|_| EmitError::NotImplemented("Throwing allocation overflow"))?,
             num_ic_entries: self.num_ic_entries.try_into().unwrap(),
             fun_length: 0,
-            num_bytecode_type_sets: self.num_type_sets.try_into().unwrap(),
 
             bytecode: self.bytecode,
             scope_notes: self.scope_notes.into(),
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/emitter_scope.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/emitter_scope.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/emitter_scope.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/emitter_scope.rs	2021-01-18 19:58:25.000000000 +0000
@@ -234,7 +234,12 @@
     ///
     /// [1]: https://tc39.es/ecma262/#sec-runtime-semantics-scriptevaluation
     /// [2]: https://tc39.es/ecma262/#sec-globaldeclarationinstantiation
-    pub fn enter_global(&mut self, emit: &mut InstructionWriter, scope_data_map: &ScopeDataMap) {
+    pub fn enter_global(
+        &mut self,
+        emit: &mut InstructionWriter,
+        scope_data_map: &ScopeDataMap,
+        top_level_function_count: u32,
+    ) {
         let scope_index = scope_data_map.get_global_index();
         let scope_data = scope_data_map.get_global_at(scope_index);
 
@@ -243,25 +248,7 @@
         emit.enter_global_scope(scope_index);
 
         if scope_data.base.bindings.len() > 0 {
-            emit.check_global_or_eval_decl();
-        }
-
-        for item in scope_data.iter() {
-            let name_index = emit.get_atom_gcthing_index(item.name());
-
-            match item.kind() {
-                BindingKind::Var => {
-                    if !item.is_top_level_function() {
-                        emit.def_var(name_index);
-                    }
-                }
-                BindingKind::Let => {
-                    emit.def_let(name_index);
-                }
-                BindingKind::Const => {
-                    emit.def_const(name_index);
-                }
-            }
+            emit.global_or_eval_decl_instantiation(top_level_function_count);
         }
 
         emit.switch_to_main();
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/function_declaration_emitter.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/function_declaration_emitter.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/function_declaration_emitter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/function_declaration_emitter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -22,17 +22,6 @@
     }
 }
 
-pub struct TopLevelFunctionDeclarationEmitter {
-    pub fun_index: GCThingIndex,
-}
-
-impl TopLevelFunctionDeclarationEmitter {
-    pub fn emit(self, emitter: &mut AstEmitter) {
-        emitter.emit.lambda(self.fun_index);
-        emitter.emit.def_fun();
-    }
-}
-
 pub struct LexicalFunctionDeclarationEmitter {
     pub name: SourceAtomSetIndex,
     pub fun_index: GCThingIndex,
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/reference_op_emitter.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/reference_op_emitter.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/reference_op_emitter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/reference_op_emitter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -500,7 +500,7 @@
         //              [stack] THIS THIS
 
         // FIXME: Support super.
-        emitter.emit.call_prop(key_index);
+        emitter.emit.get_prop(key_index);
         //              [stack] THIS CALLEE
 
         emitter.emit.swap();
@@ -560,7 +560,7 @@
         //              [stack] THIS THIS KEY
 
         // FIXME: Support super.
-        emitter.emit.call_elem();
+        emitter.emit.get_elem();
         //              [stack] THIS CALLEE
 
         emitter.emit.swap();
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/script_emitter.rs firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/script_emitter.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-emitter/src/script_emitter.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-emitter/src/script_emitter.rs	2021-01-18 19:58:25.000000000 +0000
@@ -20,9 +20,11 @@
     pub fn emit(self, emitter: &mut AstEmitter) -> Result<(), EmitError> {
         let scope_data_map = &emitter.compilation_info.scope_data_map;
 
-        emitter
-            .scope_stack
-            .enter_global(&mut emitter.emit, scope_data_map);
+        emitter.scope_stack.enter_global(
+            &mut emitter.emit,
+            scope_data_map,
+            self.top_level_functions.len() as u32,
+        );
 
         for fun in self.top_level_functions {
             (self.top_level_function)(emitter, fun)?;
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-generated-parser/.cargo-checksum.json firefox-85.0+build1/third_party/rust/jsparagus-generated-parser/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/jsparagus-generated-parser/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-generated-parser/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"553be3c198fe555913bbeb7473b24e0e1fff12e48890a2e399b311df8a97c814","src/ast_builder.rs":"15eebf519763b94e7c11791a1a90b1f73ec00d447857e230232e1d45599e30e5","src/context_stack.rs":"29331d03cd4c8ee9283cb426ebe893b7ba6ad6d8a69016399c4d92a81cb1363b","src/declaration_kind.rs":"fdfda2fe408cce1c637d17fee0813160619450472c6de9befc36ebeed892cc3c","src/early_error_checker.rs":"89da86f7f78392cb60a909c240e430779eed0fc250b3b3c8466665eeaf2fbc25","src/early_errors.rs":"8674454af7ac5efe51eb6a8e2abe088aad5560e0a0bd88a3eae66c90f1527149","src/error.rs":"507e4dd9c66720f3da2db135c3024392d8aaac5ccdb90c7f7463ccb2eff7efa8","src/lib.rs":"b74105a84c4a141b880439f9ec724f7dc08224342be08a73490ac2c01410af08","src/parser_tables_generated.rs":"84e6f1cffea759c8f3b55cd1b6c9f9350a93abda47b2ddb13342b820309e8a3f","src/stack_value_generated.rs":"ce8567634ff2bb818593f56c0589b4ba2d508704db943eb0778d79dfd19cce36","src/token.rs":"479f4cb97d2e6bc654a70634f3809817cc73eaf749c845643beb3556b9ead383","src/traits/mod.rs":"ba74c71f7218027f8188247bc64df243117613fbc9893d40799402ef1e6dbf59"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"553be3c198fe555913bbeb7473b24e0e1fff12e48890a2e399b311df8a97c814","src/ast_builder.rs":"15eebf519763b94e7c11791a1a90b1f73ec00d447857e230232e1d45599e30e5","src/context_stack.rs":"29331d03cd4c8ee9283cb426ebe893b7ba6ad6d8a69016399c4d92a81cb1363b","src/declaration_kind.rs":"fdfda2fe408cce1c637d17fee0813160619450472c6de9befc36ebeed892cc3c","src/early_error_checker.rs":"89da86f7f78392cb60a909c240e430779eed0fc250b3b3c8466665eeaf2fbc25","src/early_errors.rs":"8674454af7ac5efe51eb6a8e2abe088aad5560e0a0bd88a3eae66c90f1527149","src/error.rs":"507e4dd9c66720f3da2db135c3024392d8aaac5ccdb90c7f7463ccb2eff7efa8","src/lib.rs":"b74105a84c4a141b880439f9ec724f7dc08224342be08a73490ac2c01410af08","src/parser_tables_generated.rs":"763ffa17952f8bd1aef6656ec21bdae4c3e179ec3af79bb43a731f89a287aeef","src/stack_value_generated.rs":"ce8567634ff2bb818593f56c0589b4ba2d508704db943eb0778d79dfd19cce36","src/token.rs":"479f4cb97d2e6bc654a70634f3809817cc73eaf749c845643beb3556b9ead383","src/traits/mod.rs":"ba74c71f7218027f8188247bc64df243117613fbc9893d40799402ef1e6dbf59"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-generated-parser/src/parser_tables_generated.rs firefox-85.0+build1/third_party/rust/jsparagus-generated-parser/src/parser_tables_generated.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-generated-parser/src/parser_tables_generated.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-generated-parser/src/parser_tables_generated.rs	2021-01-18 19:58:26.000000000 +0000
@@ -10,17 +10,17 @@
 #[derive(Copy, Clone, Debug, PartialEq)]
 #[repr(u32)]
 pub enum TerminalId {
-    PrivateIdentifier = 0, // 'PrivateIdentifier'
+    StringLiteral = 0, // 'StringLiteral'
     NoSubstitutionTemplate = 1, // 'NoSubstitutionTemplate'
-    TemplateTail = 2, // 'TemplateTail'
+    PrivateIdentifier = 2, // 'PrivateIdentifier'
     NullLiteral = 3, // 'NullLiteral'
-    BigIntLiteral = 4, // 'BigIntLiteral'
-    StringLiteral = 5, // 'StringLiteral'
-    Name = 6, // 'Name'
-    NumericLiteral = 7, // 'NumericLiteral'
-    BooleanLiteral = 8, // 'BooleanLiteral'
-    TemplateMiddle = 9, // 'TemplateMiddle'
-    RegularExpressionLiteral = 10, // 'RegularExpressionLiteral'
+    RegularExpressionLiteral = 4, // 'RegularExpressionLiteral'
+    Name = 5, // 'Name'
+    TemplateMiddle = 6, // 'TemplateMiddle'
+    BooleanLiteral = 7, // 'BooleanLiteral'
+    TemplateTail = 8, // 'TemplateTail'
+    BigIntLiteral = 9, // 'BigIntLiteral'
+    NumericLiteral = 10, // 'NumericLiteral'
     TemplateHead = 11, // 'TemplateHead'
     End = 12, // End()
     Import = 13, // 'import'
@@ -375,17 +375,17 @@
 impl From<Term> for &'static str {
     fn from(term: Term) -> Self {
         match term.0 {
-            0 => &"'PrivateIdentifier'",
+            0 => &"'StringLiteral'",
             1 => &"'NoSubstitutionTemplate'",
-            2 => &"'TemplateTail'",
+            2 => &"'PrivateIdentifier'",
             3 => &"'NullLiteral'",
-            4 => &"'BigIntLiteral'",
-            5 => &"'StringLiteral'",
-            6 => &"'Name'",
-            7 => &"'NumericLiteral'",
-            8 => &"'BooleanLiteral'",
-            9 => &"'TemplateMiddle'",
-            10 => &"'RegularExpressionLiteral'",
+            4 => &"'RegularExpressionLiteral'",
+            5 => &"'Name'",
+            6 => &"'TemplateMiddle'",
+            7 => &"'BooleanLiteral'",
+            8 => &"'TemplateTail'",
+            9 => &"'BigIntLiteral'",
+            10 => &"'NumericLiteral'",
             11 => &"'TemplateHead'",
             12 => &"End()",
             13 => &"'import'",
@@ -707,910 +707,910 @@
 #[rustfmt::skip]
 static SHIFT: [i64; 210276] = [
     // 0.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, 1051, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, 1051, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     649, ERROR, 650, ERROR, 2, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, 413, ERROR,
     // 1.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, 1052, 230, 653, 305, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, 1052, 230, 653, 305, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, 663, ERROR, 664, ERROR, 5, 666, 665, 659, 659, 666, 666, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, 414,
     // 2.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, 1053, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, 1053, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 3.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 668, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 668, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 6, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 4.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 420, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 5.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, 1103, 230, 653, 305, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, 1103, 230, 653, 305, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, ERROR, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 666, 703, 659, 659, 666, 666, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 6.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 713, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 713, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 7.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 782, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 782, 654, 654, 411, 781, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 8.
-    ERROR, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, 304, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, ERROR, ERROR, 1361, 1361, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR,
+    1361, 1361, ERROR, 1361, 1361, 1361, ERROR, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, 304, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, ERROR, ERROR, 1361, 1361, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, 869, 1361, 1361, 1361, 1361, ERROR, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, ERROR, ERROR, ERROR, ERROR, ERROR, 1361, ERROR, ERROR, 1361, ERROR, 1361, ERROR, 1361, 1361, ERROR, 1361, 1361, 1361, ERROR, ERROR,
     // 9.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 14, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 15, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 10.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 918, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 11.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 926, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 12.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 544, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 13.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 545, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 14.
-    ERROR, 1783, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 19, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, ERROR, ERROR, 1783, 1783, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR,
+    1783, 1783, ERROR, 1783, 1783, 1783, ERROR, 1783, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 19, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, ERROR, ERROR, 1783, 1783, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, ERROR, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, ERROR, ERROR, ERROR, ERROR, ERROR, 1783, ERROR, ERROR, 1783, ERROR, 1783, ERROR, 1783, 1783, ERROR, 1783, 1783, 1783, ERROR, ERROR,
     // 15.
-    ERROR, 1784, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 20, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, ERROR, ERROR, 1784, 1784, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR,
+    1784, 1784, ERROR, 1784, 1784, 1784, ERROR, 1784, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 20, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, ERROR, ERROR, 1784, 1784, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, ERROR, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, ERROR, ERROR, ERROR, ERROR, ERROR, 1784, ERROR, ERROR, 1784, ERROR, 1784, ERROR, 1784, 1784, ERROR, 1784, 1784, 1784, ERROR, ERROR,
     // 16.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 963, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 17.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 587, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 18.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1793, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1793, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 19.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 974, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 975, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 20.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, 181, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 976, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 977, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 21.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 979, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 22.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 984, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 23.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 985, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 24.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 986, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 25.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 987, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 26.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 598, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 27.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 609, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 28.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 610, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 29.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 611, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 30.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 612, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 31.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 994, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 32.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 995, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 33.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 996, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 34.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 998, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 35.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 614, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 36.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 615, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 37.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1001, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 38.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1002, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 39.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1003, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 40.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1004, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 41.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1005, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 42.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1006, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 43.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1982, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1981, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1982, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1981, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 60, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1980, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1979, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 44.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1009, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1009, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 62, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 45.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 618, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 46.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 619, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 47.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 624, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 48.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 627, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 49.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 628, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 50.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 629, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 51.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1015, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 52.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1016, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 53.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1017, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 54.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1021, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 55.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1022, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 56.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1023, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 57.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1024, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 58.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1025, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 59.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, 1985, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1985, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1985, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, 1985, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1985, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1985, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 70, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1985, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1985, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 60.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1989, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1988, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1989, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1988, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1987, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1986, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 61.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 630, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 62.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1027, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1027, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 63.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 631, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 64.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 632, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 65.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 636, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 66.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 637, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 67.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 638, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 68.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1035, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 69.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, ERROR, ERROR, 657, 3, ERROR, ERROR, ERROR, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 672, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1036, ERROR, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, ERROR, 654, 654, 411, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 70.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, 1991, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1991, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1991, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, 1991, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1991, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, 1991, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 667, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1991, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1991, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 71.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 639, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 72.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 993, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, 640, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 73.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 641, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 74.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 643, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 75.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 644, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 76.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 954, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, 645, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 77.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 646, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 78.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 653, ERROR, ERROR, ERROR, 162, 406, 83, ERROR, ERROR, 286, 287, 80, 410, ERROR, 81, 302, 412, 164, ERROR, 657, 3, 1992, ERROR, 163, 4, 407, 408, ERROR, 656, 279, 409, ERROR, ERROR, 288, 114, 159, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, 18, ERROR, 651, ERROR, 659, 659, ERROR, ERROR, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 661, 661, 661, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, 652, ERROR, 416, 660, 654, 654, 411, ERROR, ERROR, ERROR, 660, 660, 660, 695, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, 1031, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 301, ERROR, ERROR, ERROR, ERROR, 647, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, 955, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 79.
-    ERROR, 2088, ERROR, 2081, 2084, 2085, 2080, 2083, 2082, ERROR, 2087, 2089, ERROR, 2093, 2062, ERROR, ERROR, ERROR, 2061, 2063, 2090, ERROR, ERROR, 2068, 2069, 2070, 2071, ERROR, 2074, 2075, 2076, ERROR, ERROR, 2080, 2060, ERROR, ERROR, 2077, 2064, 2065, 2066, ERROR, 2079, 2103, 2067, ERROR, ERROR, 2073, 2104, 2072, ERROR, 2080, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, ERROR, 2092, 2086, ERROR, ERROR, ERROR, 2096, ERROR, ERROR, 2091, 2078, 2098, 2097, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2099, 2100, ERROR, ERROR, ERROR, 2101, 2102, 2094, 2095, ERROR,
+    2085, 2088, ERROR, 2081, 2087, 2080, ERROR, 2082, ERROR, 2084, 2083, 2089, ERROR, 2093, 2062, ERROR, ERROR, ERROR, 2061, 2063, 2090, ERROR, ERROR, 2068, 2069, 2070, 2071, ERROR, 2074, 2075, 2076, ERROR, ERROR, 2080, 2060, ERROR, ERROR, 2077, 2064, 2065, 2066, ERROR, 2079, 2103, 2067, ERROR, ERROR, 2073, 2104, 2072, ERROR, 2080, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, 2080, ERROR, 2092, 2086, ERROR, ERROR, ERROR, 2096, ERROR, ERROR, 2091, 2078, 2098, 2097, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2099, 2100, ERROR, ERROR, ERROR, 2101, 2102, 2094, 2095, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2022, ERROR, ERROR, ERROR, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, 2021, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2024, 2018, ERROR, 2023, 2022, 2019, 2019, 2020, 2017, ERROR, ERROR, ERROR, ERROR, ERROR, 2058, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2059, 2059, 2059, 2059, 2039, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2043, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2025, 2057, ERROR, ERROR, ERROR, 2051, 2040, 2050, 2053, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2026, 2055, 2047, 2041, ERROR, 2052, 2052, 2045, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2027, 2056, 2028, 2048, 2048, 2048, ERROR, 2046, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2029, 2042, 2044, 2044, 2044, 2044, 2044, 2044, 2044, 2044, 2049, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2030, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2031, ERROR, ERROR, ERROR, ERROR, ERROR, 2032, ERROR, ERROR, 2033, ERROR, 2034, ERROR, 2035, 2036, ERROR, 2037, 2038, 2054, ERROR, ERROR,
     // 80.
-    ERROR, 1074, ERROR, 1084, 1081, 1080, 1057, 1082, 1083, ERROR, 1075, 1073, ERROR, 1069, 699, ERROR, ERROR, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, ERROR, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, 699,
+    1080, 1074, ERROR, 1084, 1075, 1057, ERROR, 1083, ERROR, 1081, 1082, 1073, ERROR, 1069, 699, ERROR, ERROR, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, ERROR, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, 699,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 448, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 81.
-    ERROR, 1074, ERROR, 1084, 1081, 1080, 1057, 1082, 1083, ERROR, 1075, 1073, ERROR, 1069, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, ERROR, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, ERROR,
+    1080, 1074, ERROR, 1084, 1075, 1057, ERROR, 1083, ERROR, 1081, 1082, 1073, ERROR, 1069, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, ERROR, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 450, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 82.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 326, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 83.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 764, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 178, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 764, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 178, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 438, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 84.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 441, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 85.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 443, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 86.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 445, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 87.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 449, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 88.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 463, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 89.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 477, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 90.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 478, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 91.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 97, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 97, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 495, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 92.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 504, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 93.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 505, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 94.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 515, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 95.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 516, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 96.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 100, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 100, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 97.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 16, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 16, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 519, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 98.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 520, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 99.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 541, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 100.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 21, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 21, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 547, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 101.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 106, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 106, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 548, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 102.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 107, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 107, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 568, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 103.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 569, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 104.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 23, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 23, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 571, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 105.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 32, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 32, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 589, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 106.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 33, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 33, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 590, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 107.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 37, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 37, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 591, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 108.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 592, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 109.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 595, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 110.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 53, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 53, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 613, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 111.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 55, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 55, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 616, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 112.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 676, ERROR, ERROR, 565, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 113.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 727, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 752, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 727, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 752, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 753, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, 124, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, 432, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, 754, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 114.
-    ERROR, 1074, 1298, 1084, 1081, 1080, 1057, 1082, 1083, 1298, 1075, 1073, ERROR, 1069, 1298, ERROR, 1297, ERROR, ERROR, ERROR, 1072, 1298, ERROR, ERROR, ERROR, ERROR, ERROR, 1298, ERROR, ERROR, ERROR, 1076, 1298, 1057, 1078, 1298, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, 1762, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, 1298, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, 1298,
+    1080, 1074, ERROR, 1084, 1075, 1057, 1298, 1083, 1298, 1081, 1082, 1073, ERROR, 1069, 1298, ERROR, 1297, ERROR, ERROR, ERROR, 1072, 1298, ERROR, ERROR, ERROR, ERROR, ERROR, 1298, ERROR, ERROR, ERROR, 1076, 1298, 1057, 1078, 1298, ERROR, 1077, ERROR, ERROR, ERROR, ERROR, 1054, 1059, ERROR, ERROR, ERROR, 1085, 1058, 1056, ERROR, 1057, ERROR, 1762, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, 1298, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, 1298,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 859, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, 1298, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, 1298, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 115.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 187, ERROR, 657, 284, ERROR, ERROR, 186, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 459, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 187, ERROR, 657, 284, ERROR, ERROR, 186, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 459, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 798, 800, 501, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 799, 799, 799, 799, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 116.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 802, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 117.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 118.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 815, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 119.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 462, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 120.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 820, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 121.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 821, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 122.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 821, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 123.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 824, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 824, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 825, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, 464, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 124.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 808, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 832, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 808, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 832, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 833, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, 834, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 125.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 836, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 126.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 840, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 127.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 128.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 892, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 129.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 727, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 897, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 727, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 897, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 895, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, 138, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, 896, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 130.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 900, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 131.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 909, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 211, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 909, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 211, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 815, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 132.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 12, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 12, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 953, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, 914, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 133.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 916, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 134.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 13, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 13, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 956, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, 917, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 135.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 521, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 136.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 940, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 137.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 942, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 143, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, 942, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 143, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 941, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 138.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 808, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 947, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, 808, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, 947, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, 125, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 945, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, 946, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 139.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 549, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 140.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 570, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 141.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 572, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 142.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 573, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 143.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 968, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 144.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 12, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 12, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 953, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, 969, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 145.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 593, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 146.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 160, 114, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 594, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 696, 696, 696, 696, 307, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 315, 419, ERROR, ERROR, ERROR, 293, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 316, 325, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 317, 418, 318, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 147.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, 96, ERROR, ERROR, ERROR, 179, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 711, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, 96, ERROR, ERROR, ERROR, 179, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 711, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, 180, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 309, ERROR, ERROR, ERROR, ERROR, ERROR, 480, ERROR, 91, ERROR, ERROR, 444, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 860, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 148.
-    ERROR, 1074, ERROR, 1084, 1081, 1080, 1057, 1082, 1083, ERROR, 1075, 1073, ERROR, 1069, 1766, ERROR, 1763, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, 1766, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, 1766, 1054, 1059, ERROR, ERROR, ERROR, 1765, 1764, 1056, ERROR, 1057, ERROR, 1762, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, ERROR,
+    1080, 1074, ERROR, 1084, 1075, 1057, ERROR, 1083, ERROR, 1081, 1082, 1073, ERROR, 1069, 1766, ERROR, 1763, ERROR, ERROR, ERROR, 1072, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1076, 1766, 1057, 1078, ERROR, ERROR, 1077, ERROR, ERROR, ERROR, 1766, 1054, 1059, ERROR, ERROR, ERROR, 1765, 1764, 1056, ERROR, 1057, ERROR, 1762, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, 1070, 1079, ERROR, ERROR, ERROR, 1066, ERROR, ERROR, 1071, 1086, 1064, 1065, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1063, 1062, ERROR, ERROR, ERROR, 1061, 1060, 1068, 1067, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 960, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 149.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 957, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 150.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 958, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 151.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 959, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 152.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 959, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 153.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 962, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 154.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 35, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 35, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 999, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, 980, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 155.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 981, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 156.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 36, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 36, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 1000, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, 982, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 157.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 997, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 158.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 35, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 35, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 279, ERROR, ERROR, ERROR, 161, 148, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 695, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 308, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 290, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 492, ERROR, ERROR, ERROR, 300, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, 999, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 291, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, 861, 861, 861, 861, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, 481, ERROR, 1018, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, 482, 490, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 483, 491, 484, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 159.
-    ERROR, 1102, ERROR, ERROR, ERROR, ERROR, 1099, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1100, ERROR, ERROR, ERROR, ERROR, 1760, 1099, 1093, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1096, 1094, ERROR, ERROR, ERROR, 1097, 1095, 1098, ERROR, 1099, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, ERROR, ERROR, 231, ERROR, 1102, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1102, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
+    ERROR, 1102, ERROR, ERROR, ERROR, 1099, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1100, ERROR, ERROR, ERROR, ERROR, 1760, 1099, 1093, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1096, 1094, ERROR, ERROR, ERROR, 1097, 1095, 1098, ERROR, 1099, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, 1099, ERROR, ERROR, 231, ERROR, 1102, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1102, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1090, ERROR, ERROR, 1092, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1089, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1091, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1088, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, 1102, 1102, 1087, 1087, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 160.
-    ERROR, 1760, 1760, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1057, 1760, 1760, 1760, 1229, ERROR, ERROR, ERROR, 1760, 648, 1227, ERROR, ERROR, ERROR, 1055, 1228, 1056, ERROR, 1057, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, 1760, 1760, 1760, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
+    ERROR, 1760, ERROR, ERROR, ERROR, 1057, 1760, ERROR, 1760, ERROR, ERROR, 1760, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1057, 1760, 1760, 1760, 1229, ERROR, ERROR, ERROR, 1760, 648, 1227, ERROR, ERROR, ERROR, 1055, 1228, 1056, ERROR, 1057, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, 1760, 1760, 1760, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 831, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 465, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 161.
-    ERROR, 1760, 1760, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1057, 1760, 1760, 1760, 1229, ERROR, ERROR, ERROR, 1760, 648, 1227, ERROR, ERROR, ERROR, 1055, 1228, 1056, ERROR, 1057, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, 1760, 1760, 1760, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
+    ERROR, 1760, ERROR, ERROR, ERROR, 1057, 1760, ERROR, 1760, ERROR, ERROR, 1760, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1057, 1760, 1760, 1760, 1229, ERROR, ERROR, ERROR, 1760, 648, 1227, ERROR, ERROR, ERROR, 1055, 1228, 1056, ERROR, 1057, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, 1760, 1760, 1760, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 831, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 566, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 162.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 415, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 669, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 367, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 163.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 170, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 170, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 422, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 164.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 165.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 368, ERROR, ERROR, 423, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 701, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 166.
-    ERROR, ERROR, ERROR, 721, 724, 722, 372, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 717, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 173, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, ERROR, 721, ERROR, 372, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 717, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 173, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 427, 428, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 718, ERROR, 719, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 429, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 167.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 727, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 726, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 727, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 726, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 430, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 174, 431, 729, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 728, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 168.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 177, ERROR, ERROR, ERROR, 176, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 177, ERROR, ERROR, ERROR, 176, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 436, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 169.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 354, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 281, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 354, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 281, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 394, 763, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, 437, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 170.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 451, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 171.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 372, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 788, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 372, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 788, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 705, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 790, 453, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 789, 454, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 172.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 801, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 367, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 173.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 804, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 174.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 808, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 807, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 808, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 807, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 461, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 809, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 175.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 811, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 812, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 176.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1358, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1358, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 469, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 177.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 194, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 194, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 471, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 178.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 475, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 476, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 179.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 385, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 493, ERROR, 494, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 386, ERROR, ERROR, ERROR, ERROR, 862, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 180.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 864, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 388, ERROR, ERROR, ERROR, ERROR, ERROR, 496, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 863, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 181.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 422, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 182.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 197, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 197, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 183.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1362, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1362, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 499, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 184.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 368, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 872, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 185.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 705, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 877, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 186.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 203, ERROR, ERROR, ERROR, 202, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 203, ERROR, ERROR, ERROR, 202, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 500, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 187.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 354, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 281, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 354, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 281, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 395, 882, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, 437, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 188.
-    ERROR, ERROR, ERROR, 721, 724, 722, 372, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 884, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 173, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, ERROR, 721, ERROR, 372, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 884, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 173, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 502, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 883, ERROR, 719, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 429, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 189.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 885, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 190.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 727, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 889, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 727, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 889, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 503, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 204, ERROR, 729, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 888, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 191.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 206, ERROR, ERROR, ERROR, 205, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 206, ERROR, ERROR, ERROR, 205, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 506, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 192.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 901, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, 509, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 193.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1686, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1686, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 511, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 194.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1687, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1687, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 512, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 195.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 923, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 523, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 924, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 196.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 923, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 864, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 924, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 197.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 524, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 198.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 927, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, 525, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 928, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 199.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1776, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1776, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 527, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 200.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 372, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 930, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 372, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 930, ERROR, 721, 721, 721, 721, 721, 372, 374, 721, 721, 721, 371, 373, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 371, 371, 372, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 705, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 790, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 929, 454, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 201.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 705, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 931, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 202.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1777, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1777, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 528, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 203.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 216, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 216, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 529, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 204.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 808, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 938, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 808, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, 938, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 530, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 809, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 205.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1778, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1778, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 531, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 206.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 219, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 219, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 532, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 207.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, 948, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 535, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 208.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 901, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, 537, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 209.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1779, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1779, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 950, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 949, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 210.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1780, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1780, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 540, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 211.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 542, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 543, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 212.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 389, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 390, ERROR, ERROR, ERROR, ERROR, 961, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 213.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 391, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 392, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 964, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 214.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1786, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1786, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 575, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 215.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1787, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1787, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 577, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 216.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1788, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1788, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 579, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 217.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 224, ERROR, ERROR, ERROR, 223, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 224, ERROR, ERROR, ERROR, 223, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 580, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 218.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1789, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1789, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 582, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 219.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1790, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1790, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 583, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 220.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 901, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, 584, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 221.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1974, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1974, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 597, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 222.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1975, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1975, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 600, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 223.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1976, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1976, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 602, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 224.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 228, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 228, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 603, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 225.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1977, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1977, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 606, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 226.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1978, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 901, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, 608, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 227.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1983, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1983, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 621, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 228.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1984, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1984, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 623, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 229.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1990, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1990, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 166, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, 167, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 175, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 370, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 634, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 375, 841, 470, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 675, 675, 842, 843, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 844, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 730, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 230.
-    ERROR, ERROR, ERROR, ERROR, ERROR, 708, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 424, ERROR, ERROR, ERROR, 127, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 171, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    708, ERROR, ERROR, ERROR, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 424, ERROR, ERROR, ERROR, 127, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 171, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 656, 674, ERROR, ERROR, ERROR, 672, 673, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 396, ERROR, 425, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 705, ERROR, ERROR, ERROR, 397, 706, 707, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 670, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 704, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 231.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2011, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2013, 2011, 2005, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2008, 2006, ERROR, ERROR, ERROR, 2009, 2007, 2010, ERROR, 2011, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, ERROR, ERROR, 2004, 2014, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2012, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 2011, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2013, 2011, 2005, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2008, 2006, ERROR, ERROR, ERROR, 2009, 2007, 2010, ERROR, 2011, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, 2011, ERROR, ERROR, 2004, 2014, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2012, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1997, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1996, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1995, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1994, 1994, 2002, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2003, 2001, 1999, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 2000, 1998, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 232.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 327, ERROR, 328, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 233.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 329, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 234.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 346, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 319, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 235.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 330, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 320, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 236.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 331, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 321, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 237.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 332, ERROR, ERROR, ERROR, ERROR, ERROR, 322, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 238.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 333, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 239.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 334, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 240.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 335, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 241.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 336, ERROR, ERROR, 323, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 242.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 337, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 243.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 338, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 244.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 339, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 245.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 340, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 246.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 341, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 247.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 342, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 248.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 550, ERROR, 551, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 249.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 552, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 250.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 553, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 251.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 554, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 252.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 489, 555, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 253.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 489, ERROR, 324, 556, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 254.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 489, ERROR, 324, 557, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 255.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 489, ERROR, 324, 558, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 256.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 489, ERROR, 324, 559, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 257.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 560, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 258.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 561, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 259.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 562, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 260.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 563, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 261.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 564, ERROR, 324, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 262.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 567, ERROR, ERROR, ERROR, ERROR, ERROR, 485, ERROR, ERROR, 486, 489, 487, 324, 488, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 263.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 343, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 264.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 344, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 265.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 345, ERROR, 310, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 266.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 313, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 267.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 314, 677, ERROR, 678, 311, 694, ERROR, ERROR,
     // 268.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 816, ERROR, 678, 311, 694, ERROR, ERROR,
     // 269.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 817, ERROR, 678, 311, 694, ERROR, ERROR,
     // 270.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 772, 770, 694, ERROR, ERROR,
     // 271.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 772, 770, 694, ERROR, ERROR,
     // 272.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 773, 770, 694, ERROR, ERROR,
     // 273.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 774, 770, 694, ERROR, ERROR,
     // 274.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 775, 770, 694, ERROR, ERROR,
     // 275.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 776, 770, 694, ERROR, ERROR,
     // 276.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 777, 770, 694, ERROR, ERROR,
     // 277.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 778, 770, 694, ERROR, ERROR,
     // 278.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 779, 770, 694, ERROR, ERROR,
     // 279.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, 1296, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, 1296, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 780, 770, 694, ERROR, ERROR,
     // 280.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, 280, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, 272, ERROR, ERROR, 378, 680, 274, 273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 275, 276, ERROR, ERROR, ERROR, 277, 278, 270, 271, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 312, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 780, 770, 694, ERROR, ERROR,
     // 281.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 378, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 378, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 849, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 282.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, 195, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 711, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 378, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, 417, ERROR, ERROR, ERROR, ERROR, 195, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 711, 662, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 378, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 196, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 522, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 497, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 771, 679, 292, 306, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 289, ERROR, 771, 771, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 283.
-    ERROR, 690, ERROR, 682, 685, 686, 657, 684, 683, ERROR, 688, 82, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, 439, ERROR, ERROR, ERROR, ERROR, 440, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    686, 690, ERROR, 682, 688, 657, ERROR, 683, ERROR, 685, 684, 82, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 83, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 169, ERROR, 657, 284, ERROR, ERROR, 168, ERROR, ERROR, ERROR, ERROR, 656, ERROR, ERROR, ERROR, ERROR, 297, ERROR, 671, ERROR, 657, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, ERROR, 283, 113, ERROR, 439, ERROR, ERROR, ERROR, ERROR, 440, 680, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 767, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 766, 296, ERROR, ERROR, ERROR, 689, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 692, 692, 692, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 681, 687, 687, 687, 687, 687, 687, 687, 687, 693, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 284.
-    761, ERROR, ERROR, 721, 724, 722, 372, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 755, ERROR, 721, 721, 721, 721, 721, 372, 759, 721, 721, 721, 352, 759, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 348, 349, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 372, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 755, ERROR, 721, 721, 721, 721, 721, 372, 759, 721, 721, 721, 352, 759, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 348, 349, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 760, ERROR, ERROR, 376, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 435, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, 433, ERROR, 434, ERROR, ERROR, ERROR, ERROR, ERROR, 756, 725, 725, ERROR, ERROR, 758, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 285.
-    761, ERROR, ERROR, 721, 724, 722, 372, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 899, ERROR, 721, 721, 721, 721, 721, 372, 759, 721, 721, 721, 352, 759, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 348, 349, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 372, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 372, ERROR, 899, ERROR, 721, 721, 721, 721, 721, 372, 759, 721, 721, 721, 352, 759, 372, 721, 372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 372, 372, 372, 372, 372, 372, 372, 372, 348, 349, 372, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, 126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 757, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 760, ERROR, ERROR, 376, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 435, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, ERROR, ERROR, 434, ERROR, ERROR, ERROR, ERROR, ERROR, 898, 725, 725, ERROR, ERROR, 758, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 286.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 697, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1054, ERROR, ERROR, ERROR, ERROR, 1055, ERROR, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 697,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 697, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1054, ERROR, ERROR, ERROR, ERROR, 1055, ERROR, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 697,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 446, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 655, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 287.
-    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 698, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1054, ERROR, ERROR, ERROR, ERROR, 1055, ERROR, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 698,
+    ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 698, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1054, ERROR, ERROR, ERROR, ERROR, 1055, ERROR, 1056, ERROR, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, 1057, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 698,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 655, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 288.
     ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, 1760, ERROR, 1760, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1100, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, 1760, 1101, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, 1230, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, 1102, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, 1102, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, 1760, ERROR, ERROR, 1760, 1760, 1760,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, 1760, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, 1102, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1760, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 289.
-    ERROR, 690, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 82, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, ERROR, 123, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 88, 1225, 360, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, 295, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, 82, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, ERROR, 123, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 88, 1225, 360, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, 295, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 751, ERROR, ERROR, 750, 294, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 290.
-    ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1993, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, 1226, 1226, 1226,
+    ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, 1226, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1993, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, 1226, 1226, 1226,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 291.
-    ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, 1232, ERROR, ERROR, 1232, ERROR, 1232, ERROR, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, 1232, 1232, 1232, ERROR, ERROR, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, 1231, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, 1232, 1232, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, 1232, 1232, ERROR, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, ERROR, ERROR, 1232, 1232, 1232,
+    ERROR, 1232, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, 1232, ERROR, ERROR, 1232, ERROR, ERROR, 1232, ERROR, 1232, ERROR, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, 1232, 1232, 1232, ERROR, ERROR, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, 1231, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, 1232, 1232, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, 1232, 1232, ERROR, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, 1232, ERROR, ERROR, 1232, 1232, 1232,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, 1232, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1232, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 292.
-    ERROR, 690, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 82, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, ERROR, 123, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1258, 1252, 1235, ERROR, ERROR, ERROR, ERROR, 1251, 1257, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 90, 1252, 362, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, 1252, ERROR, 295, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1253, 1252, 1254, 1252, 1252, ERROR, ERROR, 1255, 1256, 1252,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, 82, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, ERROR, 123, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1258, 1252, 1235, ERROR, ERROR, ERROR, ERROR, 1251, 1257, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 90, 1252, 362, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, 1252, ERROR, 295, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1253, 1252, 1254, 1252, 1252, ERROR, ERROR, 1255, 1256, 1252,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1233, 1234, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 768, ERROR, ERROR, 769, 298, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 293.
-    ERROR, 1269, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1270, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, ERROR, 1266, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1272, 1279, 1295, ERROR, ERROR, ERROR, ERROR, 1278, 1273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, 1259, 1294, 1293, 1292, 1291, 1290, 1289, 1288, 1287, 1286, 1285, 1284, 1283, 1282, 1281, 1280, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1267, 1279, 1268, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, 1279, ERROR, 1271, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1277, 1279, 1276, 1279, 1279, ERROR, ERROR, 1275, 1274, 1279,
+    ERROR, 1269, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, 1270, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, ERROR, 1266, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1272, 1279, 1295, ERROR, ERROR, ERROR, ERROR, 1278, 1273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, 1259, 1294, 1293, 1292, 1291, 1290, 1289, 1288, 1287, 1286, 1285, 1284, 1283, 1282, 1281, 1280, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1267, 1279, 1268, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, 1279, ERROR, 1271, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1277, 1279, 1276, 1279, 1279, ERROR, ERROR, 1275, 1274, 1279,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1265, 1264, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1260, ERROR, ERROR, 1261, 1263, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1262, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 294.
-    ERROR, 690, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1320, 1319, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 826, ERROR, ERROR, 830, 1318, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 295.
-    828, 690, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, 82, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 123, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 93, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, 690, 828, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, 82, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 123, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 93, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 827, ERROR, ERROR, ERROR, ERROR, 829, ERROR, ERROR, 830, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 296.
-    ERROR, 690, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 82, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, ERROR, 123, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 88, 1225, 360, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, 82, ERROR, ERROR, 1225, ERROR, 1225, ERROR, ERROR, ERROR, 123, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 88, 1225, 360, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, 1225, ERROR, ERROR, 1225, 1225, 1225,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 856, ERROR, ERROR, 750, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1225, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 297.
-    ERROR, 1102, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1102, ERROR, ERROR, 1359, ERROR, 1359, ERROR, ERROR, ERROR, 1102, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1359, 1359, 1359, 1229, ERROR, ERROR, ERROR, 1359, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, 1359, 1102, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, 1359, 1359, ERROR, 1102, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, ERROR, ERROR, 1359, 1359, 1359,
+    ERROR, 1102, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1359, ERROR, ERROR, 1102, ERROR, ERROR, 1359, ERROR, 1359, ERROR, ERROR, ERROR, 1102, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1359, 1359, 1359, 1229, ERROR, ERROR, ERROR, 1359, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, 1359, 1102, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, 1359, 1359, ERROR, 1102, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, 1359, ERROR, ERROR, 1359, 1359, 1359,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, 1102, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1102, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 298.
-    ERROR, 690, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1320, 1319, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 826, ERROR, ERROR, 830, 1318, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 299.
-    ERROR, 690, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
+    ERROR, 690, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, 82, ERROR, ERROR, 1329, ERROR, 1329, ERROR, ERROR, ERROR, 123, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1322, 1329, 1345, ERROR, ERROR, ERROR, ERROR, 1328, 1323, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336, 1335, 1334, 1333, 1332, 1331, 1330, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 92, 1329, 363, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, 1329, 1329, ERROR, 1321, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1329, 1327, 1329, 1326, 1329, 1329, ERROR, ERROR, 1325, 1324, 1329,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1320, 1319, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 826, ERROR, ERROR, 830, 1318, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1329, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 300.
-    ERROR, 1269, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1270, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, ERROR, 1266, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1272, 1279, 1295, ERROR, ERROR, ERROR, ERROR, 1278, 1273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, 1761, 1294, 1293, 1292, 1291, 1290, 1289, 1288, 1287, 1286, 1285, 1284, 1283, 1282, 1281, 1280, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1267, 1279, 1268, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, 1279, ERROR, 1271, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1277, 1279, 1276, 1279, 1279, ERROR, ERROR, 1275, 1274, 1279,
+    ERROR, 1269, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, 1270, ERROR, ERROR, 1279, ERROR, 1279, ERROR, ERROR, ERROR, 1266, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, 1272, 1279, 1295, ERROR, ERROR, ERROR, ERROR, 1278, 1273, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, 1761, 1294, 1293, 1292, 1291, 1290, 1289, 1288, 1287, 1286, 1285, 1284, 1283, 1282, 1281, 1280, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1267, 1279, 1268, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, 1279, 1279, ERROR, 1271, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1279, 1277, 1279, 1276, 1279, 1279, ERROR, ERROR, 1275, 1274, 1279,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1265, 1264, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1260, ERROR, ERROR, 1261, 1263, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1262, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1279, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 301.
-    ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, 79, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1993, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, 1226, 1226, 1226,
+    ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, 1226, ERROR, ERROR, 1226, ERROR, 1226, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, 79, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1993, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, 1226, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, 1226, ERROR, ERROR, 1226, 1226, 1226,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, 1226, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1226, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 302.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 3, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
@@ -1625,184 +1625,184 @@
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 398, 115, 162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 164, ERROR, ERROR, 359, ERROR, ERROR, 163, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 426, ERROR, 711, 662, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 710, ERROR, ERROR, ERROR, 709, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 661, 661, 661, ERROR, ERROR, ERROR, 399, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 660, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 660, 660, 660, ERROR, ERROR, 165, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 306.
-    ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1258, 1252, 1235, ERROR, ERROR, ERROR, ERROR, 1251, 1257, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, 1252, ERROR, 295, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1253, 1252, 1254, 1252, 1252, ERROR, ERROR, 1255, 1256, 1252,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1258, 1252, 1235, ERROR, ERROR, ERROR, ERROR, 1251, 1257, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, 1252, 1252, ERROR, 295, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1252, 1253, 1252, 1254, 1252, 1252, ERROR, ERROR, 1255, 1256, 1252,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1233, 1234, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 299, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1252, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 307.
-    ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 120, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 120, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 121, 122, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 308.
-    ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 150, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 150, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 151, 152, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 309.
-    ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 150, ERROR, ERROR, ERROR, ERROR, 112, 141, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, 1224, 150, ERROR, ERROR, ERROR, ERROR, 112, 141, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, 1224, 1224, ERROR, ERROR, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1224, 1223, 1224, 1224, ERROR, ERROR, 1222, 1221, 1224,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 151, 152, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1224, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 310.
-    ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, 1206, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, 1206, ERROR, ERROR, 1208, ERROR, ERROR, ERROR, ERROR, ERROR, 1202, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1209, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, 1201, ERROR, ERROR, ERROR, ERROR, 1205, 1211, ERROR, ERROR, 1210, 1204, 1212, 1203, 1216, 1215, 1214, 1213, 1197, 1198, 1199, 1200, 1219, 1218, 1217, 1195, 1196, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1207,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, 1206, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, 1206, ERROR, ERROR, 1208, ERROR, ERROR, ERROR, ERROR, ERROR, 1202, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1209, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, 1201, ERROR, ERROR, ERROR, ERROR, 1205, 1211, ERROR, ERROR, 1210, 1204, 1212, 1203, 1216, 1215, 1214, 1213, 1197, 1198, 1199, 1200, 1219, 1218, 1217, 1195, 1196, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1207,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1207, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 268, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 311.
-    ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, 1220, ERROR, ERROR, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 269, 1220, 1220, ERROR, ERROR, ERROR, ERROR, 1220,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, 1220, 1220, ERROR, ERROR, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 269, 1220, 1220, ERROR, ERROR, ERROR, ERROR, 1220,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1220, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 312.
-    ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, 1360, ERROR, ERROR, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1223, 1360, 1360, ERROR, ERROR, 1222, 1221, 1360,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, 1360, 1360, ERROR, ERROR, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1360, 1223, 1360, 1360, ERROR, ERROR, 1222, 1221, 1360,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1360, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 313.
-    ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, 1645, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, 1645, ERROR, ERROR, 1647, ERROR, ERROR, ERROR, ERROR, ERROR, 1641, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1648, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, 1640, ERROR, ERROR, ERROR, ERROR, 1644, 1650, ERROR, ERROR, 1649, 1643, 1651, 1642, 1655, 1654, 1653, 1652, 1636, 1637, 1638, 1639, 1658, 1657, 1656, 1634, 1635, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1646,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, 1645, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, 1645, ERROR, ERROR, 1647, ERROR, ERROR, ERROR, ERROR, ERROR, 1641, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1648, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, 1640, ERROR, ERROR, ERROR, ERROR, 1644, 1650, ERROR, ERROR, 1649, 1643, 1651, 1642, 1655, 1654, 1653, 1652, 1636, 1637, 1638, 1639, 1658, 1657, 1656, 1634, 1635, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1646,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1646, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 268, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 314.
-    ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, 1670, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, 1670, ERROR, ERROR, 1672, ERROR, ERROR, ERROR, ERROR, ERROR, 1666, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1673, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, 1665, ERROR, ERROR, ERROR, ERROR, 1669, 1675, ERROR, ERROR, 1674, 1668, 1676, 1667, 1680, 1679, 1678, 1677, 1661, 1662, 1663, 1664, 1683, 1682, 1681, 1659, 1660, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1671,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, 1670, ERROR, 732, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, 1670, ERROR, ERROR, 1672, ERROR, ERROR, ERROR, ERROR, ERROR, 1666, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1673, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, 1665, ERROR, ERROR, ERROR, ERROR, 1669, 1675, ERROR, ERROR, 1674, 1668, 1676, 1667, 1680, 1679, 1678, 1677, 1661, 1662, 1663, 1664, 1683, 1682, 1681, 1659, 1660, ERROR, 733, 734, ERROR, ERROR, ERROR, ERROR, 1671,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1671, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 268, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 315.
-    ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 119, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 119, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1105, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 316.
-    ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1106, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1106, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 232, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 317.
-    ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1110, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1108, ERROR, ERROR, ERROR, 233, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1110, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1108, ERROR, ERROR, ERROR, 233, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1109, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 318.
-    ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1115, 1111, ERROR, ERROR, 1112, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1113, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1115, 1111, ERROR, ERROR, 1112, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1114, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 319.
-    ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, 1119, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1120, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1117, 1122, ERROR, ERROR, 1121, 1116, 236, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, 1119, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1120, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1117, 1122, ERROR, ERROR, 1121, 1116, 236, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 320.
-    ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, 1127, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1129, 1124, ERROR, ERROR, 1125, 1130, 1123, 237, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, 1127, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1126, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1129, 1124, ERROR, ERROR, 1125, 1130, 1123, 237, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1128, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 321.
-    ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, 1135, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1136, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1133, 1138, ERROR, ERROR, 1137, 1132, 1139, 1131, 238, 239, 240, 241, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, 1135, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1136, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1133, 1138, ERROR, ERROR, 1137, 1132, 1139, 1131, 238, 239, 240, 241, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1134, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 322.
-    ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, 1148, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1147, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1150, 1145, ERROR, ERROR, 1146, 1151, 1144, 1152, 1140, 1141, 1142, 1143, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, 1148, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1147, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1150, 1145, ERROR, ERROR, 1146, 1151, 1144, 1152, 1140, 1141, 1142, 1143, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1149, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 323.
-    ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, 1163, ERROR, ERROR, ERROR, ERROR, ERROR, 1158, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1164, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, 1157, ERROR, ERROR, ERROR, ERROR, 1161, 1166, ERROR, ERROR, 1165, 1160, 1167, 1159, 1171, 1170, 1169, 1168, 1153, 1154, 1155, 1156, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, 1163, ERROR, ERROR, ERROR, ERROR, ERROR, 1158, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1164, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, 1157, ERROR, ERROR, ERROR, ERROR, 1161, 1166, ERROR, ERROR, 1165, 1160, 1167, 1159, 1171, 1170, 1169, 1168, 1153, 1154, 1155, 1156, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1162, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 324.
-    ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, 1185, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, 1185, ERROR, ERROR, 1183, ERROR, ERROR, ERROR, ERROR, ERROR, 1189, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1182, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, 1190, ERROR, ERROR, ERROR, ERROR, 1186, 1180, ERROR, ERROR, 1181, 1187, 1179, 1188, 1175, 1176, 1177, 1178, 1194, 1193, 1192, 1191, 1172, 1173, 1174, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, 1185, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, 1185, ERROR, ERROR, 1183, ERROR, ERROR, ERROR, ERROR, ERROR, 1189, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1182, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, 1190, ERROR, ERROR, ERROR, ERROR, 1186, 1180, ERROR, ERROR, 1181, 1187, 1179, 1188, 1175, 1176, 1177, 1178, 1194, 1193, 1192, 1191, 1172, 1173, 1174, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1184, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 325.
-    ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1106, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1111, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1106, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1111, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1107, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 326.
-    ERROR, ERROR, 852, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 94, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 94, ERROR, 852, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 851, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 474, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 327.
-    ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1367, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1365, ERROR, ERROR, ERROR, 233, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1367, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1365, ERROR, ERROR, ERROR, 233, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1366, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 328.
-    ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1368, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1370, ERROR, ERROR, ERROR, 1112, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1368, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1370, ERROR, ERROR, ERROR, 1112, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1369, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 329.
-    ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1374, ERROR, ERROR, ERROR, 1371, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1372, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1374, ERROR, ERROR, ERROR, 1371, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1373, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 330.
-    ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, 1378, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1379, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1376, 1381, ERROR, ERROR, 1380, 1375, 236, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, 1378, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1379, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1376, 1381, ERROR, ERROR, 1380, 1375, 236, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1377, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 331.
-    ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, 1386, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1385, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1388, 1383, ERROR, ERROR, 1384, 1389, 1382, 237, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, 1386, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1385, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1388, 1383, ERROR, ERROR, 1384, 1389, 1382, 237, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1387, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 332.
-    ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, 1394, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1395, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1392, 1397, ERROR, ERROR, 1396, 1391, 1398, 1390, 238, 239, 240, 241, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, 1394, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1395, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1392, 1397, ERROR, ERROR, 1396, 1391, 1398, 1390, 238, 239, 240, 241, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1393, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 333.
-    ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, 1407, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1406, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1409, 1404, ERROR, ERROR, 1405, 1410, 1403, 1411, 1399, 1400, 1401, 1402, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, 1407, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1406, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1409, 1404, ERROR, ERROR, 1405, 1410, 1403, 1411, 1399, 1400, 1401, 1402, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1408, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 334.
-    ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, 1420, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1419, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1422, 1417, ERROR, ERROR, 1418, 1423, 1416, 1424, 1412, 1413, 1414, 1415, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, 1420, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1419, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1422, 1417, ERROR, ERROR, 1418, 1423, 1416, 1424, 1412, 1413, 1414, 1415, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1421, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 335.
-    ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, 1433, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1432, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1435, 1430, ERROR, ERROR, 1431, 1436, 1429, 1437, 1425, 1426, 1427, 1428, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, 1433, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1432, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1435, 1430, ERROR, ERROR, 1431, 1436, 1429, 1437, 1425, 1426, 1427, 1428, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1434, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 336.
-    ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, 1446, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1445, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1448, 1443, ERROR, ERROR, 1444, 1449, 1442, 1450, 1438, 1439, 1440, 1441, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, 1446, ERROR, ERROR, ERROR, ERROR, ERROR, 247, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1445, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, 246, ERROR, ERROR, ERROR, ERROR, 1448, 1443, ERROR, ERROR, 1444, 1449, 1442, 1450, 1438, 1439, 1440, 1441, 242, 243, 244, 245, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1447, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 337.
-    ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, 1461, ERROR, ERROR, ERROR, ERROR, ERROR, 1456, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1462, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, 1455, ERROR, ERROR, ERROR, ERROR, 1459, 1464, ERROR, ERROR, 1463, 1458, 1465, 1457, 1469, 1468, 1467, 1466, 1451, 1452, 1453, 1454, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, 1461, ERROR, ERROR, ERROR, ERROR, ERROR, 1456, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1462, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, 1455, ERROR, ERROR, ERROR, ERROR, 1459, 1464, ERROR, ERROR, 1463, 1458, 1465, 1457, 1469, 1468, 1467, 1466, 1451, 1452, 1453, 1454, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1460, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 338.
-    ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, 1480, ERROR, ERROR, ERROR, ERROR, ERROR, 1475, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1481, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, 1474, ERROR, ERROR, ERROR, ERROR, 1478, 1483, ERROR, ERROR, 1482, 1477, 1484, 1476, 1488, 1487, 1486, 1485, 1470, 1471, 1472, 1473, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, 1480, ERROR, ERROR, ERROR, ERROR, ERROR, 1475, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1481, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, 1474, ERROR, ERROR, ERROR, ERROR, 1478, 1483, ERROR, ERROR, 1482, 1477, 1484, 1476, 1488, 1487, 1486, 1485, 1470, 1471, 1472, 1473, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1479, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 339.
-    ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, 1499, ERROR, ERROR, ERROR, ERROR, ERROR, 1494, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1500, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, 1493, ERROR, ERROR, ERROR, ERROR, 1497, 1502, ERROR, ERROR, 1501, 1496, 1503, 1495, 1507, 1506, 1505, 1504, 1489, 1490, 1491, 1492, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, 1499, ERROR, ERROR, ERROR, ERROR, ERROR, 1494, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1500, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, 1493, ERROR, ERROR, ERROR, ERROR, 1497, 1502, ERROR, ERROR, 1501, 1496, 1503, 1495, 1507, 1506, 1505, 1504, 1489, 1490, 1491, 1492, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1498, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 340.
-    ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, 1518, ERROR, ERROR, ERROR, ERROR, ERROR, 1513, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1519, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, 1512, ERROR, ERROR, ERROR, ERROR, 1516, 1521, ERROR, ERROR, 1520, 1515, 1522, 1514, 1526, 1525, 1524, 1523, 1508, 1509, 1510, 1511, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, 1518, ERROR, ERROR, ERROR, ERROR, ERROR, 1513, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1519, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, 1512, ERROR, ERROR, ERROR, ERROR, 1516, 1521, ERROR, ERROR, 1520, 1515, 1522, 1514, 1526, 1525, 1524, 1523, 1508, 1509, 1510, 1511, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1517, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 341.
-    ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, 1537, ERROR, ERROR, ERROR, ERROR, ERROR, 1532, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1538, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, 1531, ERROR, ERROR, ERROR, ERROR, 1535, 1540, ERROR, ERROR, 1539, 1534, 1541, 1533, 1545, 1544, 1543, 1542, 1527, 1528, 1529, 1530, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, 1537, ERROR, ERROR, ERROR, ERROR, ERROR, 1532, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1538, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, 1531, ERROR, ERROR, ERROR, ERROR, 1535, 1540, ERROR, ERROR, 1539, 1534, 1541, 1533, 1545, 1544, 1543, 1542, 1527, 1528, 1529, 1530, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1536, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 342.
-    ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, 1556, ERROR, ERROR, ERROR, ERROR, ERROR, 1551, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1557, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, 1550, ERROR, ERROR, ERROR, ERROR, 1554, 1559, ERROR, ERROR, 1558, 1553, 1560, 1552, 1564, 1563, 1562, 1561, 1546, 1547, 1548, 1549, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, 1556, ERROR, ERROR, ERROR, ERROR, ERROR, 1551, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1557, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, 1550, ERROR, ERROR, ERROR, ERROR, 1554, 1559, ERROR, ERROR, 1558, 1553, 1560, 1552, 1564, 1563, 1562, 1561, 1546, 1547, 1548, 1549, 263, 264, 265, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1555, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 343.
-    ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, 1578, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, 1578, ERROR, ERROR, 1576, ERROR, ERROR, ERROR, ERROR, ERROR, 1582, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1575, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, 1583, ERROR, ERROR, ERROR, ERROR, 1579, 1573, ERROR, ERROR, 1574, 1580, 1572, 1581, 1568, 1569, 1570, 1571, 1587, 1586, 1585, 1584, 1565, 1566, 1567, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, 1578, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, 1578, ERROR, ERROR, 1576, ERROR, ERROR, ERROR, ERROR, ERROR, 1582, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1575, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, 1583, ERROR, ERROR, ERROR, ERROR, 1579, 1573, ERROR, ERROR, 1574, 1580, 1572, 1581, 1568, 1569, 1570, 1571, 1587, 1586, 1585, 1584, 1565, 1566, 1567, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1577, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 344.
-    ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, 1601, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, 1601, ERROR, ERROR, 1599, ERROR, ERROR, ERROR, ERROR, ERROR, 1605, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1598, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, 1606, ERROR, ERROR, ERROR, ERROR, 1602, 1596, ERROR, ERROR, 1597, 1603, 1595, 1604, 1591, 1592, 1593, 1594, 1610, 1609, 1608, 1607, 1588, 1589, 1590, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, 1601, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, 1601, ERROR, ERROR, 1599, ERROR, ERROR, ERROR, ERROR, ERROR, 1605, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1598, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, 1606, ERROR, ERROR, ERROR, ERROR, 1602, 1596, ERROR, ERROR, 1597, 1603, 1595, 1604, 1591, 1592, 1593, 1594, 1610, 1609, 1608, 1607, 1588, 1589, 1590, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1600, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 345.
-    ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, 1624, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, 1624, ERROR, ERROR, 1622, ERROR, ERROR, ERROR, ERROR, ERROR, 1628, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1621, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, 1629, ERROR, ERROR, ERROR, ERROR, 1625, 1619, ERROR, ERROR, 1620, 1626, 1618, 1627, 1614, 1615, 1616, 1617, 1633, 1632, 1631, 1630, 1611, 1612, 1613, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, 1624, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, 1624, ERROR, ERROR, 1622, ERROR, ERROR, ERROR, ERROR, ERROR, 1628, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1621, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, 1629, ERROR, ERROR, ERROR, ERROR, 1625, 1619, ERROR, ERROR, 1620, 1626, 1618, 1627, 1614, 1615, 1616, 1617, 1633, 1632, 1631, 1630, 1611, 1612, 1613, 266, 267, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1623, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 346.
-    ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1692, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1693, ERROR, ERROR, ERROR, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1692, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1693, ERROR, ERROR, ERROR, 235, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1691, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 347.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 1690, 721, 357, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 1690, 721, 357, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 905, 513, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 377, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 348.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, 1690, 721, 721, 721, 721, 1359, 797, ERROR, 1359, 1307, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, 1690, 721, 721, 721, 721, 1359, 797, ERROR, 1359, 1307, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 466, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 349.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, 1690, 721, 721, 721, 721, 1359, 797, ERROR, 1359, 1307, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, 1690, 721, 721, 721, 721, 1359, 797, ERROR, 1359, 1307, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 467, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 350.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 1690, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 1690, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 466, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 351.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 1690, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 1690, 721, ERROR, 721, 721, 721, 1305, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, 1690, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 467, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 352.
-    ERROR, ERROR, ERROR, 1355, 1349, 1351, 1356, 1350, 1355, ERROR, ERROR, ERROR, ERROR, 1355, ERROR, 1355, 1347, 1355, 1355, 1355, 1305, ERROR, 1355, 1355, 1355, 1355, 1355, 1690, 1355, 1355, 1355, 1355, 1359, 1356, ERROR, 1359, 1307, 1355, 1355, 1355, 1355, 1355, 1356, 1354, 1355, 1355, 1355, 1352, 1354, 1356, 1355, 1356, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1356, 1353, 1356, 1356, 1356, 1356, 1356, 1356, 1352, 1352, 1356, 1355, 1355, 1348, ERROR, ERROR, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    1351, ERROR, ERROR, 1355, ERROR, 1356, ERROR, 1355, ERROR, 1349, 1350, ERROR, ERROR, 1355, ERROR, 1355, 1347, 1355, 1355, 1355, 1305, ERROR, 1355, 1355, 1355, 1355, 1355, 1690, 1355, 1355, 1355, 1355, 1359, 1356, ERROR, 1359, 1307, 1355, 1355, 1355, 1355, 1355, 1356, 1354, 1355, 1355, 1355, 1352, 1354, 1356, 1355, 1356, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1356, 1353, 1356, 1356, 1356, 1356, 1356, 1356, 1352, 1352, 1356, 1355, 1355, 1348, ERROR, ERROR, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1359, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 507, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 353.
-    ERROR, ERROR, ERROR, 1355, 1349, 1351, 1356, 1350, 1355, ERROR, ERROR, ERROR, ERROR, 1355, 1690, 1355, 1347, 1355, 1355, 1355, 1305, ERROR, 1355, 1355, 1355, 1355, 1355, ERROR, 1355, 1355, 1355, 1355, ERROR, 1356, ERROR, ERROR, 1690, 1355, 1355, 1355, 1355, 1355, 1356, 1354, 1355, 1355, 1355, 1352, 1354, 1356, 1355, 1356, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1356, 1353, 1356, 1356, 1356, 1356, 1356, 1356, 1352, 1352, 1356, 1355, 1355, 1348, ERROR, ERROR, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
+    1351, ERROR, ERROR, 1355, ERROR, 1356, ERROR, 1355, ERROR, 1349, 1350, ERROR, ERROR, 1355, 1690, 1355, 1347, 1355, 1355, 1355, 1305, ERROR, 1355, 1355, 1355, 1355, 1355, ERROR, 1355, 1355, 1355, 1355, ERROR, 1356, ERROR, ERROR, 1690, 1355, 1355, 1355, 1355, 1355, 1356, 1354, 1355, 1355, 1355, 1352, 1354, 1356, 1355, 1356, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1356, 1353, 1356, 1356, 1356, 1356, 1356, 1356, 1352, 1352, 1356, 1355, 1355, 1348, ERROR, ERROR, 1355, 1355, 1355, 1355, 1355, 1355, 1355, 1355, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1690, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 507, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 354.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 845, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 845, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 472, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 355, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 846, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 847, 473, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 377, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 355.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 1688, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 1688, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 903, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 847, 473, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 377, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 356.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 907, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, 848, 721, 357, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 907, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 353, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 347, 797, 797, 797, 797, 797, 797, 350, 351, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 514, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 355, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 846, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 847, 473, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 377, ERROR, 762, 762, 762, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 357.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 468, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 358.
-    761, ERROR, ERROR, 721, 724, 722, 797, 723, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    722, ERROR, 761, 721, ERROR, 797, ERROR, 721, ERROR, 724, 723, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, 117, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 720, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 533, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 839, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 725, 725, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 359.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 793, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 793, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 457, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 794, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 458, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 360.
-    823, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, 823, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 822, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 361.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 854, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 362.
-    858, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, 858, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 857, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 363.
-    894, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, 894, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 893, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 364.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 933, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, 933, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 932, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 458, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 365.
-    ERROR, ERROR, ERROR, 721, ERROR, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, 721, ERROR, 797, ERROR, 721, ERROR, ERROR, ERROR, ERROR, ERROR, 721, ERROR, 721, ERROR, 721, 721, 721, ERROR, ERROR, 721, 721, 721, 721, 721, ERROR, 721, 721, 721, 721, ERROR, 797, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 797, 759, 721, 721, 721, 796, 759, 797, 721, 797, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 797, 795, 797, 797, 797, 797, 797, 797, 796, 796, 797, 721, 721, ERROR, ERROR, ERROR, 721, 721, 721, 721, 721, 721, 721, 721, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 934, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 366.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1104, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1104, ERROR, ERROR, ERROR, 116, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1104,
@@ -1910,7 +1910,7 @@
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 303, 304, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 8, 783, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 401.
-    ERROR, ERROR, ERROR, ERROR, ERROR, 708, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    708, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 874, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 402.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 424, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 171, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
@@ -2129,7 +2129,7 @@
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 906, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 906,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 474.
-    ERROR, ERROR, 908, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 99, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 99, ERROR, 908, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 475.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 910, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
@@ -2252,7 +2252,7 @@
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 952, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 515.
-    ERROR, ERROR, 1782, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1781, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1781, ERROR, 1782, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 516.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 546, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
@@ -2330,7 +2330,7 @@
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 588, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 541.
-    ERROR, ERROR, 1792, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1791, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
+    ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 1791, ERROR, 1792, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 118, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
     // 542.
     ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, 970, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR, ERROR,
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/.cargo-checksum.json firefox-85.0+build1/third_party/rust/jsparagus-stencil/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/.cargo-checksum.json	2021-01-18 19:58:25.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f5439990185662ab31de12c07ef0c842438e3207bdfecc4fa6a9e4d4bea8a0d3","src/bytecode_offset.rs":"2aa7ba8c3cfbbd832092e65b599ab1c5a28d784ccc65d9e351bba656421b9a69","src/copy/AsyncFunctionResolveKind.h":"3851ecbb4728257595dd6e900749d1d8e02558574c00424a7ff0e3ca007fa6ec","src/copy/BytecodeFormatFlags.h":"a805958bfb8c97c87122722eb6343eacdf7bd5558ad8c79b324c7d55c1bda60e","src/copy/CheckIsObjectKind.h":"8f0e112396d966c9221a743d353f62671e04cdace7dd49a59898d94ba0f621b7","src/copy/FunctionFlags.h":"3858687164806f03ba68570f7e0727f227f88b47675421ad0ca803095c8d3769","src/copy/FunctionPrefixKind.h":"f540a5c646a519b2d61aa27e4be865e08a31438def00ad5ba4ba2982ad1f2275","src/copy/GeneratorAndAsyncKind.h":"301668ce705970a51abfa94f89fd5db29ef5f129525110860e9e9bf7586ef187","src/copy/GeneratorResumeKind.h":"9e3cd9dc9c7f50937c6c45d73ec092dbfd92c4b56818ae6d1504bcd77078d0a6","src/copy/Opcodes.h":"64edf77a148cf3ed6d547d410b25b780d24711b3d4defa33518acee6d68d17cd","src/copy/SourceNotes.h":"1e467f4e63d6f40a428e257fecd210bd14664516adf75a45cb17ab02ccd65fd8","src/copy/StencilEnums.h":"e5a1db4af868fd65591ed97594f7aa9a4cde79194da0cabd62b34e950b3b10b4","src/copy/Symbol.h":"c478d44bcd17a013e9e03c56f7fb47e5268b9df76559373777355025e82d8b7d","src/copy/ThrowMsgKind.h":"5a06fa6cda81638b325af201a21396cfb460d993001a7725c858202b60237d04","src/env_coord.rs":"0be36a1bd307f5586affe0f3046d8b2ab2f5382b41b7b7bfb364b97d16a7c410","src/frame_slot.rs":"b20c81d67c572f20d06d493b211cd3eaa0432a8294541583643b82df3af2f813","src/function.rs":"b841ba6f7ecee3a38a136ef9902fd1d4a3f6b0aa96d1e8d8340e7f26dead75d9","src/gcthings.rs":"baadc7284c01961a4aa44d464a6f5a0d0be427b6d099c949d4411846738d9a45","src/lib.rs":"b003e085344277d2987ef492dc513048e8ec83217850a22ba7ca06ac01bc9b5c","src/opcode.rs":"842fbacb00b35779bd5922b61accde22973870f9b2a5f5f5b29d1b2117fedd3f","src/opcode_info.rs":"a27c6d5602f5ecdcc882a0167614bc7a7754d958124941b4c1c0cdc2b0a894f1","src/regexp.rs":"7436cf545b990bec7dcc51ff28d67deaca9d4ce894468fdad0dd44b25c571cf2","src/result.rs":"62d3a851b8a497eecc350eed3ba6155b01a4d0e8e5bcfdf8dab776333d19825c","src/scope.rs":"3d2269a06d3e55d24f697338fedde95d9c653faec02d4694d0b63c79979e7c5a","src/scope_notes.rs":"9947ba5aba3097321c76adcb5648a478e4a67e088fdc1e01511e51c4ad41a9f3","src/script.rs":"213df7170dcaa26ecb15b2318469f2e2c7fc37e2bfe049b849aa5ea124287868"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"f5439990185662ab31de12c07ef0c842438e3207bdfecc4fa6a9e4d4bea8a0d3","src/bytecode_offset.rs":"2aa7ba8c3cfbbd832092e65b599ab1c5a28d784ccc65d9e351bba656421b9a69","src/copy/AsyncFunctionResolveKind.h":"3851ecbb4728257595dd6e900749d1d8e02558574c00424a7ff0e3ca007fa6ec","src/copy/BytecodeFormatFlags.h":"aa18cc3691e0d4252d4243b972ef210b4e4e0a5babba24b2efba710ee0f189bd","src/copy/CheckIsObjectKind.h":"8f0e112396d966c9221a743d353f62671e04cdace7dd49a59898d94ba0f621b7","src/copy/FunctionFlags.h":"fa4e966e98360a37158b0da25acdcc6f822ed6fa8af545dd5d0aa368258424e4","src/copy/FunctionPrefixKind.h":"f540a5c646a519b2d61aa27e4be865e08a31438def00ad5ba4ba2982ad1f2275","src/copy/GeneratorAndAsyncKind.h":"301668ce705970a51abfa94f89fd5db29ef5f129525110860e9e9bf7586ef187","src/copy/GeneratorResumeKind.h":"9e3cd9dc9c7f50937c6c45d73ec092dbfd92c4b56818ae6d1504bcd77078d0a6","src/copy/Opcodes.h":"b77d5b0cf2509fd2c5dca439a87c24e74ba466df8c691faa9c8efacbe3ca3989","src/copy/SourceNotes.h":"46fdf5ee41a309bf12eccf2bad3cc4736bcb8f43c3471a2ef506b9f3624ec91c","src/copy/StencilEnums.h":"7cb216be1079d4f66dea13a239d09cd1c083afcf1c0c63ae3ab1b3eefbc67508","src/copy/Symbol.h":"98a827d5bf68567a75686ee0b72b9fb960bde77e96771bbf03fc0a33b601be41","src/copy/ThrowMsgKind.h":"d636116b0152760b841e8ce4380333d6551639b41a075b48683d41ce6486a52b","src/env_coord.rs":"0be36a1bd307f5586affe0f3046d8b2ab2f5382b41b7b7bfb364b97d16a7c410","src/frame_slot.rs":"b20c81d67c572f20d06d493b211cd3eaa0432a8294541583643b82df3af2f813","src/function.rs":"37655675ba171dbbb055839f0fc31379d8b20184f28f98626347a9e9e8a6762d","src/gcthings.rs":"baadc7284c01961a4aa44d464a6f5a0d0be427b6d099c949d4411846738d9a45","src/lib.rs":"b003e085344277d2987ef492dc513048e8ec83217850a22ba7ca06ac01bc9b5c","src/opcode.rs":"f18f4f6b3b1ffcd37eba476b62847f680d91f694f5443c6f6210b9cc9361d4ef","src/opcode_info.rs":"a27c6d5602f5ecdcc882a0167614bc7a7754d958124941b4c1c0cdc2b0a894f1","src/regexp.rs":"7436cf545b990bec7dcc51ff28d67deaca9d4ce894468fdad0dd44b25c571cf2","src/result.rs":"62d3a851b8a497eecc350eed3ba6155b01a4d0e8e5bcfdf8dab776333d19825c","src/scope.rs":"3d2269a06d3e55d24f697338fedde95d9c653faec02d4694d0b63c79979e7c5a","src/scope_notes.rs":"9947ba5aba3097321c76adcb5648a478e4a67e088fdc1e01511e51c4ad41a9f3","src/script.rs":"11ab3300c3fdec63e32e98e069ab98a38311b514221fa44938ecf434622404e5"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/BytecodeFormatFlags.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/BytecodeFormatFlags.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/BytecodeFormatFlags.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/BytecodeFormatFlags.h	2021-01-18 19:58:25.000000000 +0000
@@ -25,34 +25,33 @@
   JOF_QARG = 11,        /* function argument index */
   JOF_LOCAL = 12,       /* var or block-local variable */
   JOF_RESUMEINDEX = 13, /* yield, await, or gosub resume index */
-  JOF_ATOM = 14,        /* uint32_t constant index */
-  JOF_OBJECT = 15,      /* uint32_t object index */
-  JOF_REGEXP = 16,      /* uint32_t regexp index */
-  JOF_DOUBLE = 17,      /* inline DoubleValue */
-  JOF_SCOPE = 18,       /* uint32_t scope index */
-  JOF_ICINDEX = 19,     /* uint32_t IC index */
-  JOF_LOOPHEAD = 20,    /* JSOp::LoopHead, combines JOF_ICINDEX and JOF_UINT8 */
-  JOF_BIGINT = 21,      /* uint32_t index for BigInt value */
-  JOF_CLASS_CTOR = 22,  /* uint32_t atom index, sourceStart, sourceEnd */
-  JOF_TWO_UINT8 = 23,   /* A pair of unspecified uint8_t arguments */
-  JOF_TYPEMASK = 0x001f, /* mask for above immediate types */
+  JOF_DOUBLE = 14,      /* inline DoubleValue */
+  JOF_GCTHING = 15,     /* uint32_t generic gc-thing index */
+  JOF_ATOM = 16,        /* uint32_t constant index */
+  JOF_OBJECT = 17,      /* uint32_t object index */
+  JOF_REGEXP = 18,      /* uint32_t regexp index */
+  JOF_SCOPE = 19,       /* uint32_t scope index */
+  JOF_BIGINT = 20,      /* uint32_t index for BigInt value */
+  JOF_ICINDEX = 21,     /* uint32_t IC index */
+  JOF_LOOPHEAD = 22,    /* JSOp::LoopHead, combines JOF_ICINDEX and JOF_UINT8 */
+  JOF_CLASS_CTOR = 23,  /* uint32_t atom index, sourceStart, sourceEnd */
+  JOF_TWO_UINT8 = 24,   /* A pair of unspecified uint8_t arguments */
+  JOF_TYPEMASK = 0xFF,  /* mask for above immediate types */
 
-  JOF_NAME = 1 << 5,     /* name operation */
-  JOF_PROP = 2 << 5,     /* obj.prop operation */
-  JOF_ELEM = 3 << 5,     /* obj[index] operation */
-  JOF_MODEMASK = 3 << 5, /* mask for above addressing modes */
+  JOF_NAME = 1 << 8,        /* name operation */
+  JOF_PROP = 2 << 8,        /* obj.prop operation */
+  JOF_ELEM = 3 << 8,        /* obj[index] operation */
+  JOF_MODEMASK = 0xFF << 8, /* mask for above addressing modes */
 
-  JOF_PROPSET = 1 << 7,  /* property/element/name set operation */
-  JOF_PROPINIT = 1 << 8, /* property/element/name init operation */
-  // (1 << 9) is unused.
-  JOF_CHECKSLOPPY = 1 << 10, /* op can only be generated in sloppy mode */
-  JOF_CHECKSTRICT = 1 << 11, /* op can only be generated in strict mode */
-  JOF_INVOKE = 1 << 12,      /* any call, construct, or eval instruction */
-  JOF_CONSTRUCT = 1 << 13,   /* invoke instruction using [[Construct]] entry */
-  JOF_SPREAD = 1 << 14,      /* invoke instruction using spread argument */
-  JOF_GNAME = 1 << 15,       /* predicted global name */
-  JOF_TYPESET = 1 << 16,     /* has an entry in a script's type sets */
-  JOF_IC = 1 << 17,          /* baseline may use an IC for this op */
+  JOF_PROPSET = 1 << 16,     /* property/element/name set operation */
+  JOF_PROPINIT = 1 << 17,    /* property/element/name init operation */
+  JOF_CHECKSLOPPY = 1 << 18, /* op can only be generated in sloppy mode */
+  JOF_CHECKSTRICT = 1 << 19, /* op can only be generated in strict mode */
+  JOF_INVOKE = 1 << 20,      /* any call, construct, or eval instruction */
+  JOF_CONSTRUCT = 1 << 21,   /* invoke instruction using [[Construct]] entry */
+  JOF_SPREAD = 1 << 22,      /* invoke instruction using spread argument */
+  JOF_GNAME = 1 << 23,       /* predicted global name */
+  JOF_IC = 1 << 24,          /* baseline may use an IC for this op */
 };
 
 #endif /* vm_BytecodeFormatFlags_h */
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/FunctionFlags.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/FunctionFlags.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/FunctionFlags.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/FunctionFlags.h	2021-01-18 19:58:25.000000000 +0000
@@ -85,9 +85,7 @@
     RESOLVED_NAME = 1 << 13,
     RESOLVED_LENGTH = 1 << 14,
 
-    // For a function used as an interpreted constructor, whether a 'new' type
-    // had constructor information cleared.
-    NEW_SCRIPT_CLEARED = 1 << 15,
+    // (1 << 15 is unused)
 
     // Shifted form of FunctionKinds.
     NORMAL_KIND = NormalFunction << FUNCTION_KIND_SHIFT,
@@ -116,7 +114,7 @@
     INTERPRETED_METHOD = BASESCRIPT | METHOD_KIND,
 
     // Flags that XDR ignores. See also: js::BaseScript::MutableFlags.
-    MUTABLE_FLAGS = RESOLVED_NAME | RESOLVED_LENGTH | NEW_SCRIPT_CLEARED,
+    MUTABLE_FLAGS = RESOLVED_NAME | RESOLVED_LENGTH,
 
     // Flags preserved when cloning a function. (Exception:
     // js::MakeDefaultConstructor produces default constructors for ECMAScript
@@ -174,8 +172,8 @@
   bool isConstructor() const { return hasFlags(CONSTRUCTOR); }
 
   bool isNonBuiltinConstructor() const {
-    // Note: keep this in sync with emitGuardFunctionIsNonBuiltinCtor in
-    // {CacheIRCompiler, WarpCacheIRTranspiler}.cpp.
+    // Note: keep this in sync with branchIfNotFunctionIsNonBuiltinCtor in
+    // MacroAssembler.cpp.
     return hasFlags(BASESCRIPT) && hasFlags(CONSTRUCTOR) &&
            !hasFlags(SELF_HOSTED);
   }
@@ -298,12 +296,7 @@
   void setResolvedLength() { setFlags(RESOLVED_LENGTH); }
   void setResolvedName() { setFlags(RESOLVED_NAME); }
 
-  // Mark a function as having its 'new' script information cleared.
-  bool wasNewScriptCleared() const { return hasFlags(NEW_SCRIPT_CLEARED); }
-  void setNewScriptCleared() { setFlags(NEW_SCRIPT_CLEARED); }
-
   void setInferredName() { setFlags(HAS_INFERRED_NAME); }
-  void clearInferredName() { clearFlags(HAS_INFERRED_NAME); }
 
   void setGuessedAtom() { setFlags(HAS_GUESSED_ATOM); }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/Opcodes.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/Opcodes.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/Opcodes.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/Opcodes.h	2021-01-18 19:58:25.000000000 +0000
@@ -819,18 +819,12 @@
      * must fill in all slots of the new object before it is used in any other
      * way.
      *
-     * For `JSOp::NewObject`, the new object has a group based on the allocation
-     * site (or a new group if the template's group is a singleton). For
-     * `JSOp::NewObjectWithGroup`, the new object has the same group as the
-     * template object.
-     *
      *   Category: Objects
      *   Type: Creating objects
      *   Operands: uint32_t baseobjIndex
      *   Stack: => obj
      */ \
     MACRO(NewObject, new_object, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC) \
-    MACRO(NewObjectWithGroup, new_object_with_group, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC) \
     /*
      * Push a preconstructed object.
      *
@@ -1010,9 +1004,6 @@
      * Get the value of the property `obj.name`. This can call getters and
      * proxy traps.
      *
-     * `JSOp::CallProp` is exactly like `JSOp::GetProp` but hints to the VM that we're
-     * getting a method in order to call it.
-     *
      * Implements: [GetV][1], [GetValue][2] step 5.
      *
      * [1]: https://tc39.es/ecma262/#sec-getv
@@ -1023,14 +1014,10 @@
      *   Operands: uint32_t nameIndex
      *   Stack: obj => obj[name]
      */ \
-    MACRO(GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
-    MACRO(CallProp, call_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_IC) \
     /*
      * Get the value of the property `obj[key]`.
      *
-     * `JSOp::CallElem` is exactly like `JSOp::GetElem` but hints to the VM that
-     * we're getting a method in order to call it.
-     *
      * Implements: [GetV][1], [GetValue][2] step 5.
      *
      * [1]: https://tc39.es/ecma262/#sec-getv
@@ -1041,20 +1028,7 @@
      *   Operands:
      *   Stack: obj, key => obj[key]
      */ \
-    MACRO(GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
-    MACRO(CallElem, call_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
-    /*
-     * Push the value of `obj.length`.
-     *
-     * `nameIndex` must be the index of the atom `"length"`. This then behaves
-     * exactly like `JSOp::GetProp`.
-     *
-     *   Category: Objects
-     *   Type: Accessing properties
-     *   Operands: uint32_t nameIndex
-     *   Stack: obj => obj.length
-     */ \
-    MACRO(Length, length, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_IC) \
     /*
      * Non-strict assignment to a property, `obj.name = val`.
      *
@@ -1229,7 +1203,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: receiver, obj => super.name
      */ \
-    MACRO(GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC) \
+    MACRO(GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_IC) \
     /*
      * Get the value of `receiver[key]`, starting the property search at `obj`.
      * In spec terms, `obj.[[Get]](key, receiver)`.
@@ -1247,7 +1221,7 @@
      *   Operands:
      *   Stack: receiver, key, obj => super[key]
      */ \
-    MACRO(GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC) \
+    MACRO(GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_IC) \
     /*
      * Assign `val` to `receiver.name`, starting the search for an existing
      * property at `obj`. In spec terms, `obj.[[Set]](name, val, receiver)`.
@@ -1366,16 +1340,6 @@
      */ \
     MACRO(IsNoIter, is_no_iter, NULL, 1, 1, 2, JOF_BYTE) \
     /*
-     * No-op instruction to hint to IonBuilder that the value on top of the
-     * stack is the string key in a for-in loop.
-     *
-     *   Category: Objects
-     *   Type: Enumeration
-     *   Operands:
-     *   Stack: val => val
-     */ \
-    MACRO(IterNext, iter_next, NULL, 1, 1, 1, JOF_BYTE) \
-    /*
      * Exit a for-in loop, closing the iterator.
      *
      * `iter` must be a `PropertyIteratorObject` pushed by `JSOp::Iter`.
@@ -1531,23 +1495,6 @@
      */ \
     MACRO(Hole, hole, NULL, 1, 0, 1, JOF_BYTE) \
     /*
-     * Create and push a new array that shares the elements of a template
-     * object.
-     *
-     * `script->getObject(objectIndex)` must be a copy-on-write array whose
-     * elements are all primitive values.
-     *
-     * This is an optimization. This single instruction implements an entire
-     * array literal, saving run time, code, and memory compared to
-     * `JSOp::NewArray` and a series of `JSOp::InitElem` instructions.
-     *
-     *   Category: Objects
-     *   Type: Array literals
-     *   Operands: uint32_t objectIndex
-     *   Stack: => array
-     */ \
-    MACRO(NewArrayCopyOnWrite, new_array_copy_on_write, NULL, 5, 0, 1, JOF_OBJECT) \
-    /*
      * Clone and push a new RegExp object.
      *
      * Implements: [Evaluation for *RegularExpressionLiteral*][1].
@@ -1561,11 +1508,9 @@
      */ \
     MACRO(RegExp, reg_exp, NULL, 5, 0, 1, JOF_REGEXP) \
     /*
-     * Push a function object.
+     * Push a new function object.
      *
-     * This clones the function unless it's a singleton; see
-     * `CanReuseFunctionForClone`. The new function inherits the current
-     * environment chain.
+     * The new function inherits the current environment chain.
      *
      * Used to create most JS functions. Notable exceptions are arrow functions
      * and derived or default class constructors.
@@ -1744,11 +1689,11 @@
      *   Operands: uint16_t argc
      *   Stack: callee, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
-    MACRO(CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC) \
+    MACRO(Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
+    MACRO(CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC) \
     /*
      * Like `JSOp::Call`, but the arguments are provided in an array rather than
      * a span of stack slots. Used to implement spread-call syntax:
@@ -1764,7 +1709,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
+    MACRO(SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_IC) \
     /*
      * Push true if `arr` is an array object that can be passed directly as the
      * `args` argument to `JSOp::SpreadCall`.
@@ -1810,7 +1755,7 @@
      *   Operands: uint16_t argc
      *   Stack: callee, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC) \
+    MACRO(Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSLOPPY|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::Eval`.
      *
@@ -1821,7 +1766,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC) \
+    MACRO(SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSLOPPY|JOF_IC) \
     /*
      * Like `JSOp::Eval`, but for strict mode code.
      *
@@ -1830,7 +1775,7 @@
      *   Operands: uint16_t argc
      *   Stack: evalFn, this, args[0], ..., args[argc-1] => rval
      */ \
-    MACRO(StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC) \
+    MACRO(StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSTRICT|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::StrictEval`.
      *
@@ -1841,7 +1786,7 @@
      *   Operands:
      *   Stack: callee, this, args => rval
      */ \
-    MACRO(StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC) \
+    MACRO(StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSTRICT|JOF_IC) \
     /*
      * Push the implicit `this` value for an unqualified function call, like
      * `foo()`. `nameIndex` gives the name of the function we're calling.
@@ -1938,8 +1883,8 @@
      *   Operands: uint16_t argc
      *   Stack: callee, isConstructing, args[0], ..., args[argc-1], newTarget => rval
      */ \
-    MACRO(New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC) \
-    MACRO(SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC) \
+    MACRO(New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC) \
+    MACRO(SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC) \
     /*
      * Spread-call variant of `JSOp::New`.
      *
@@ -1957,8 +1902,8 @@
      *   Operands:
      *   Stack: callee, isConstructing, args, newTarget => rval
      */ \
-    MACRO(SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
-    MACRO(SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC) \
+    MACRO(SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC) \
+    MACRO(SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC) \
     /*
      * Push the prototype of `callee` in preparation for calling `super()`.
      *
@@ -2748,8 +2693,8 @@
     /*
      * Initialize a global lexical binding.
      *
-     * The binding must already have been created by `DefLet` or `DefConst` and
-     * must be uninitialized.
+     * The binding must already have been created by
+     * `GlobalOrEvalDeclInstantiation` and must be uninitialized.
      *
      * Like `JSOp::InitLexical` but for global lexicals. Unlike `InitLexical`
      * this can't be used to mark a binding as uninitialized.
@@ -2870,7 +2815,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Find a global binding and push its value.
      *
@@ -2894,7 +2839,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_GNAME|JOF_IC) \
+    MACRO(GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_GNAME|JOF_IC) \
     /*
      * Push the value of an argument that is stored in the stack frame
      * or in an `ArgumentsObject`.
@@ -2941,7 +2886,7 @@
      *   Operands: uint8_t hops, uint24_t slot
      *   Stack: => aliasedVar
      */ \
-    MACRO(GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME) \
     /*
      * Get the value of a module import by name and pushes it onto the stack.
      *
@@ -2950,7 +2895,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => val
      */ \
-    MACRO(GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME) \
     /*
      * Get the value of a binding from the environment `env`. If the name is
      * not bound in `env`, throw a ReferenceError.
@@ -2975,7 +2920,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: env => v
      */ \
-    MACRO(GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Push the value of an intrinsic onto the stack.
      *
@@ -2988,7 +2933,7 @@
      *   Operands: uint32_t nameIndex
      *   Stack: => intrinsic[name]
      */ \
-    MACRO(GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC) \
+    MACRO(GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC) \
     /*
      * Pushes the currently executing function onto the stack.
      *
@@ -3327,87 +3272,27 @@
      */ \
     MACRO(BindVar, bind_var, NULL, 1, 0, 1, JOF_BYTE) \
     /*
-     * Create a new binding on the current VariableEnvironment (the environment
-     * on the environment chain designated to receive new variables).
-     *
-     * `JSOp::Def{Var,Let,Const,Fun}` instructions must appear in the script
-     * before anything else that might add bindings to the environment, and
-     * only once per binding. There must be a correct entry for the new binding
-     * in `script->bodyScope()`. (All this ensures that at run time, there is
-     * no existing conflicting binding. This is checked by the
-     * `JSOp::CheckGlobalOrEvalDecl` bytecode instruction that must appear
-     * before `JSOp::Def{Var,Let,Const,Fun}`.)
-     *
-     * Throw a SyntaxError if the current VariableEnvironment is the global
-     * environment and a binding with the same name exists on the global
-     * lexical environment.
-     *
-     * This is used for global scripts and also in some cases for function
-     * scripts where use of dynamic scoping inhibits optimization.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefVar, def_var, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Create a new binding for the given function on the current scope.
-     *
-     * `fun` must be a function object with an explicit name. The new
-     * variable's name is `fun->explicitName()`, and its value is `fun`. In
-     * global scope, this creates a new property on the global object.
-     *
-     * Implements: The body of the loop in [GlobalDeclarationInstantiation][1]
-     * step 17 ("For each Parse Node *f* in *functionsToInitialize*...") and
-     * the corresponding loop in [EvalDeclarationInstantiation][2].
+     * Check for conflicting bindings and then initialize them in global or
+     * sloppy eval scripts. This is required for global scripts with any
+     * top-level bindings, or any sloppy-eval scripts with any non-lexical
+     * top-level bindings.
+     *
+     * Implements: [GlobalDeclarationInstantiation][1] and
+     *             [EvalDeclarationInstantiation][2] (except step 12).
+     *
+     * The `lastFun` argument is a GCThingIndex of the last hoisted top-level
+     * function that is part of top-level script initialization. The gcthings
+     * from index `0` thru `lastFun` contain only scopes and hoisted functions.
      *
      * [1]: https://tc39.es/ecma262/#sec-globaldeclarationinstantiation
      * [2]: https://tc39.es/ecma262/#sec-evaldeclarationinstantiation
      *
      *   Category: Variables and scopes
      *   Type: Creating and deleting bindings
-     *   Operands:
-     *   Stack: fun =>
-     */ \
-    MACRO(DefFun, def_fun, NULL, 1, 1, 0, JOF_BYTE) \
-    /*
-     * Create a new uninitialized mutable binding in the global lexical
-     * environment. Throw a SyntaxError if a binding with the same name already
-     * exists on that environment, or if a var binding with the same name
-     * exists on the global.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefLet, def_let, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Like `DefLet`, but create an uninitialized constant binding.
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands: uint32_t nameIndex
-     *   Stack: =>
-     */ \
-    MACRO(DefConst, def_const, NULL, 5, 0, 0, JOF_ATOM) \
-    /*
-     * Check for conflicting bindings before `JSOp::Def{Var,Let,Const,Fun}` in
-     * global or sloppy eval scripts.
-     *
-     * Implements: [GlobalDeclarationInstantiation][1] steps 5, 6, 10 and 12,
-     * and [EvalDeclarationInstantiation][2] steps 5 and 8.
-     *
-     * [1]: https://tc39.es/ecma262/#sec-globaldeclarationinstantiation
-     * [2]: https://tc39.es/ecma262/#sec-evaldeclarationinstantiation
-     *
-     *   Category: Variables and scopes
-     *   Type: Creating and deleting bindings
-     *   Operands:
+     *   Operands: uint32_t lastFun
      *   Stack: =>
      */ \
-    MACRO(CheckGlobalOrEvalDecl, check_global_or_eval_decl, NULL, 1, 0, 0, JOF_BYTE) \
+    MACRO(GlobalOrEvalDeclInstantiation, global_or_eval_decl_instantiation, NULL, 5, 0, 0, JOF_GCTHING) \
     /*
      * Look up a variable on the environment chain and delete it. Push `true`
      * on success (if a binding was deleted, or if no such binding existed in
@@ -3482,7 +3367,7 @@
      *   Operands:
      *   Stack: => rest
      */ \
-    MACRO(Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_TYPESET|JOF_IC) \
+    MACRO(Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_IC) \
     /*
      * Determines the `this` value for current function frame and pushes it
      * onto the stack.
@@ -3679,6 +3564,16 @@
  * a power of two.  Use this macro to do so.
  */
 #define FOR_EACH_TRAILING_UNUSED_OPCODE(MACRO) \
+  MACRO(229)                                   \
+  MACRO(230)                                   \
+  MACRO(231)                                   \
+  MACRO(232)                                   \
+  MACRO(233)                                   \
+  MACRO(234)                                   \
+  MACRO(235)                                   \
+  MACRO(236)                                   \
+  MACRO(237)                                   \
+  MACRO(238)                                   \
   MACRO(239)                                   \
   MACRO(240)                                   \
   MACRO(241)                                   \
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/SourceNotes.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/SourceNotes.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/SourceNotes.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/SourceNotes.h	2021-01-18 19:58:25.000000000 +0000
@@ -209,8 +209,6 @@
      * (fromOperand).
      */
     static constexpr ptrdiff_t ColSpanSignBit = 1 << (OperandBits - 1);
-    static constexpr ptrdiff_t MinColSpan = -ColSpanSignBit;
-    static constexpr ptrdiff_t MaxColSpan = ColSpanSignBit - 1;
 
     static inline ptrdiff_t fromOperand(ptrdiff_t operand) {
       // There should be no bits set outside the field we're going to
@@ -222,9 +220,8 @@
     }
 
    public:
-    static inline bool isRepresentable(ptrdiff_t colspan) {
-      return MinColSpan <= colspan && colspan <= MaxColSpan;
-    }
+    static constexpr ptrdiff_t MinColSpan = -ColSpanSignBit;
+    static constexpr ptrdiff_t MaxColSpan = ColSpanSignBit - 1;
 
     static inline ptrdiff_t toOperand(ptrdiff_t colspan) {
       // Truncate the two's complement colspan, for storage as an operand.
@@ -252,13 +249,20 @@
     }
 
    public:
-    static inline unsigned lengthFor(unsigned line) {
-      return 1 /* SetLine */ + (line > SrcNote::FourBytesOperandMask ? 4 : 1);
+    static inline unsigned lengthFor(unsigned line, size_t initialLine) {
+      unsigned operandSize = toOperand(line, initialLine) >
+                                     ptrdiff_t(SrcNote::FourBytesOperandMask)
+                                 ? 4
+                                 : 1;
+      return 1 /* SetLine */ + operandSize;
     }
 
-    static inline ptrdiff_t toOperand(size_t line) { return ptrdiff_t(line); }
+    static inline ptrdiff_t toOperand(size_t line, size_t initialLine) {
+      MOZ_ASSERT(line >= initialLine);
+      return ptrdiff_t(line - initialLine);
+    }
 
-    static inline size_t getLine(const SrcNote* sn);
+    static inline size_t getLine(const SrcNote* sn, size_t initialLine);
   };
 
   friend class SrcNoteWriter;
@@ -366,8 +370,9 @@
 }
 
 /* static */
-inline size_t SrcNote::SetLine::getLine(const SrcNote* sn) {
-  return fromOperand(SrcNoteReader::getOperand(sn, unsigned(Operands::Line)));
+inline size_t SrcNote::SetLine::getLine(const SrcNote* sn, size_t initialLine) {
+  return initialLine +
+         fromOperand(SrcNoteReader::getOperand(sn, unsigned(Operands::Line)));
 }
 
 // Iterate over SrcNote array, until it hits terminator.
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/StencilEnums.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/StencilEnums.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/StencilEnums.h	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/StencilEnums.h	2021-01-18 19:58:25.000000000 +0000
@@ -105,17 +105,6 @@
   // On top-level global/eval/module scripts, this is set when the embedding
   // ensures this script will not be re-used. In this case, parser literals may
   // be exposed directly instead of being cloned.
-  //
-  // For non-lazy functions, this is set when the function is almost-certain to
-  // be run once (and its parents transitively the same). In this case, the
-  // function may be marked as a singleton to improve typeset precision. Note
-  // that under edge cases with fun.caller the function may still run multiple
-  // times.
-  //
-  // For lazy functions, the situation is more complex. If enclosing script is
-  // not yet compiled, this flag is undefined and should not be used. As the
-  // enclosing script is compiled, this flag is updated to the same definition
-  // the eventual non-lazy function will use.
   TreatAsRunOnce = 1 << 7,
   // ----
 
@@ -254,10 +243,6 @@
   // is set independently of whether we actually use an `arguments` binding. The
   // conditions are specified in the ECMAScript spec.
   HasMappedArgsObj = 1 << 27,
-
-  // All of 'this', 'arguments' and f.apply() are used. This is likely to be a
-  // wrapper. This is a heuristic that affects Type Inference.
-  IsLikelyConstructorWrapper = 1 << 28,
 };
 
 enum class MutableScriptFlagsEnum : uint32_t {
@@ -307,8 +292,8 @@
   // Script has had hoisted shape guard fail.
   FailedShapeGuard = 1 << 19,
 
-  // Script experienced frequent bailouts.
-  HadFrequentBailouts = 1 << 20,
+  // Script has had instruction hoisted by LICM fail.
+  HadLICMInvalidation = 1 << 20,
 
   // An overflow happened where Range Analysis hoped it would not. The next
   // compile should be more conservative.
@@ -323,6 +308,9 @@
 
   // Lexical check did fail and bail out.
   FailedLexicalCheck = 1 << 24,
+
+  // A guard inserted by phi specialization failed.
+  HadSpeculativePhiBailout = 1 << 25,
 };
 
 }  // namespace js
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/Symbol.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/Symbol.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/Symbol.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/Symbol.h	2021-01-18 19:58:25.000000000 +0000
@@ -15,10 +15,7 @@
 
 #include "jstypes.h"  // JS_PUBLIC_API
 
-#include "js/RootingAPI.h"  // JS::Handle
-
-struct JS_PUBLIC_API JSContext;
-class JS_PUBLIC_API JSString;
+#include "js/TypeDecls.h"
 
 namespace JS {
 
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/ThrowMsgKind.h firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/ThrowMsgKind.h
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/copy/ThrowMsgKind.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/copy/ThrowMsgKind.h	2021-01-18 19:58:25.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include <stdint.h>  // uint8_t
 
-#include "jsfriendapi.h"  // JSErrNum
+#include "js/friend/ErrorMessages.h"  // JSErrNum
 
 namespace js {
 
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/function.rs firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/function.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/function.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/function.rs	2021-01-18 19:58:25.000000000 +0000
@@ -54,8 +54,6 @@
 #[allow(dead_code)]
 const RESOLVED_LENGTH: u16 = 1 << 14;
 #[allow(dead_code)]
-const NEW_SCRIPT_CLEARED: u16 = 1 << 15;
-#[allow(dead_code)]
 const NORMAL_KIND: u16 = (FunctionKind::NormalFunction as u16) << FUNCTION_KIND_SHIFT;
 #[allow(dead_code)]
 const ASMJS_KIND: u16 = (FunctionKind::AsmJS as u16) << FUNCTION_KIND_SHIFT;
@@ -100,7 +98,7 @@
 #[allow(dead_code)]
 const INTERPRETED_METHOD: u16 = BASESCRIPT | METHOD_KIND;
 #[allow(dead_code)]
-const MUTABLE_FLAGS: u16 = RESOLVED_NAME | RESOLVED_LENGTH | NEW_SCRIPT_CLEARED;
+const MUTABLE_FLAGS: u16 = RESOLVED_NAME | RESOLVED_LENGTH;
 #[allow(dead_code)]
 const STABLE_ACROSS_CLONES: u16 = CONSTRUCTOR | LAMBDA | SELF_HOSTED | FUNCTION_KIND_MASK;
 // @@@@ END TYPES @@@@
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/opcode.rs firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/opcode.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/opcode.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/opcode.rs	2021-01-18 19:58:26.000000000 +0000
@@ -63,7 +63,6 @@
                 (ImportMeta, import_meta, NULL, 1, 0, 1, JOF_BYTE),
                 (NewInit, new_init, NULL, 1, 0, 1, JOF_BYTE|JOF_IC),
                 (NewObject, new_object, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC),
-                (NewObjectWithGroup, new_object_with_group, NULL, 5, 0, 1, JOF_OBJECT|JOF_IC),
                 (Object, object, NULL, 5, 0, 1, JOF_OBJECT),
                 (ObjWithProto, obj_with_proto, NULL, 1, 1, 1, JOF_BYTE),
                 (InitProp, init_prop, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_PROPINIT|JOF_IC),
@@ -80,11 +79,8 @@
                 (InitHiddenPropSetter, init_hidden_prop_setter, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_PROPINIT),
                 (InitElemSetter, init_elem_setter, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_PROPINIT),
                 (InitHiddenElemSetter, init_hidden_elem_setter, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_PROPINIT),
-                (GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC),
-                (CallProp, call_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC),
-                (GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC),
-                (CallElem, call_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC),
-                (Length, length, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC),
+                (GetProp, get_prop, NULL, 5, 1, 1, JOF_ATOM|JOF_PROP|JOF_IC),
+                (GetElem, get_elem, NULL, 1, 2, 1, JOF_BYTE|JOF_ELEM|JOF_IC),
                 (SetProp, set_prop, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_PROPSET|JOF_CHECKSLOPPY|JOF_IC),
                 (StrictSetProp, strict_set_prop, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_PROPSET|JOF_CHECKSTRICT|JOF_IC),
                 (SetElem, set_elem, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_PROPSET|JOF_CHECKSLOPPY|JOF_IC),
@@ -96,8 +92,8 @@
                 (HasOwn, has_own, NULL, 1, 2, 1, JOF_BYTE|JOF_IC),
                 (CheckPrivateField, check_private_field, NULL, 3, 2, 3, JOF_TWO_UINT8|JOF_CHECKSTRICT|JOF_IC),
                 (SuperBase, super_base, NULL, 1, 1, 1, JOF_BYTE),
-                (GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_TYPESET|JOF_IC),
-                (GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_TYPESET|JOF_IC),
+                (GetPropSuper, get_prop_super, NULL, 5, 2, 1, JOF_ATOM|JOF_PROP|JOF_IC),
+                (GetElemSuper, get_elem_super, NULL, 1, 3, 1, JOF_BYTE|JOF_ELEM|JOF_IC),
                 (SetPropSuper, set_prop_super, NULL, 5, 3, 1, JOF_ATOM|JOF_PROP|JOF_PROPSET|JOF_CHECKSLOPPY),
                 (StrictSetPropSuper, strict_set_prop_super, NULL, 5, 3, 1, JOF_ATOM|JOF_PROP|JOF_PROPSET|JOF_CHECKSTRICT),
                 (SetElemSuper, set_elem_super, NULL, 1, 4, 1, JOF_BYTE|JOF_ELEM|JOF_PROPSET|JOF_CHECKSLOPPY),
@@ -105,7 +101,6 @@
                 (Iter, iter, NULL, 1, 1, 1, JOF_BYTE|JOF_IC),
                 (MoreIter, more_iter, NULL, 1, 1, 2, JOF_BYTE),
                 (IsNoIter, is_no_iter, NULL, 1, 1, 2, JOF_BYTE),
-                (IterNext, iter_next, NULL, 1, 1, 1, JOF_BYTE),
                 (EndIter, end_iter, NULL, 1, 2, 0, JOF_BYTE),
                 (CheckIsObj, check_is_obj, NULL, 2, 1, 1, JOF_UINT8),
                 (CheckObjCoercible, check_obj_coercible, NULL, 1, 1, 1, JOF_BYTE),
@@ -115,7 +110,6 @@
                 (InitElemArray, init_elem_array, NULL, 5, 2, 1, JOF_UINT32|JOF_ELEM|JOF_PROPINIT|JOF_IC),
                 (InitElemInc, init_elem_inc, NULL, 1, 3, 2, JOF_BYTE|JOF_ELEM|JOF_PROPINIT|JOF_IC),
                 (Hole, hole, NULL, 1, 0, 1, JOF_BYTE),
-                (NewArrayCopyOnWrite, new_array_copy_on_write, NULL, 5, 0, 1, JOF_OBJECT),
                 (RegExp, reg_exp, NULL, 5, 0, 1, JOF_REGEXP),
                 (Lambda, lambda, NULL, 5, 0, 1, JOF_OBJECT),
                 (LambdaArrow, lambda_arrow, NULL, 5, 1, 1, JOF_OBJECT),
@@ -126,25 +120,25 @@
                 (ClassConstructor, class_constructor, NULL, 13, 0, 1, JOF_CLASS_CTOR),
                 (DerivedConstructor, derived_constructor, NULL, 13, 1, 1, JOF_CLASS_CTOR),
                 (BuiltinObject, builtin_object, NULL, 2, 0, 1, JOF_UINT8),
-                (Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC),
-                (CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC),
-                (FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC),
-                (FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC),
-                (CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_IC),
-                (SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_IC),
+                (Call, call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC),
+                (CallIter, call_iter, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC),
+                (FunApply, fun_apply, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC),
+                (FunCall, fun_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC),
+                (CallIgnoresRv, call_ignores_rv, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_IC),
+                (SpreadCall, spread_call, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_IC),
                 (OptimizeSpreadCall, optimize_spread_call, NULL, 1, 1, 2, JOF_BYTE|JOF_IC),
-                (Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC),
-                (SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSLOPPY|JOF_IC),
-                (StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC),
-                (StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_TYPESET|JOF_CHECKSTRICT|JOF_IC),
+                (Eval, eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSLOPPY|JOF_IC),
+                (SpreadEval, spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSLOPPY|JOF_IC),
+                (StrictEval, strict_eval, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CHECKSTRICT|JOF_IC),
+                (StrictSpreadEval, strict_spread_eval, NULL, 1, 3, 1, JOF_BYTE|JOF_INVOKE|JOF_SPREAD|JOF_CHECKSTRICT|JOF_IC),
                 (ImplicitThis, implicit_this, "", 5, 0, 1, JOF_ATOM),
                 (GImplicitThis, g_implicit_this, "", 5, 0, 1, JOF_ATOM),
                 (CallSiteObj, call_site_obj, NULL, 5, 0, 1, JOF_OBJECT),
                 (IsConstructing, is_constructing, NULL, 1, 0, 1, JOF_BYTE),
-                (New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC),
-                (SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_TYPESET|JOF_IC),
-                (SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC),
-                (SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_TYPESET|JOF_IC),
+                (New, new_, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC),
+                (SuperCall, super_call, NULL, 3, -1, 1, JOF_ARGC|JOF_INVOKE|JOF_CONSTRUCT|JOF_IC),
+                (SpreadNew, spread_new, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC),
+                (SpreadSuperCall, spread_super_call, NULL, 1, 4, 1, JOF_BYTE|JOF_INVOKE|JOF_CONSTRUCT|JOF_SPREAD|JOF_IC),
                 (SuperFun, super_fun, NULL, 1, 1, 1, JOF_BYTE),
                 (CheckThisReinit, check_this_reinit, NULL, 1, 1, 1, JOF_BYTE),
                 (Generator, generator, NULL, 1, 0, 1, JOF_BYTE),
@@ -195,14 +189,14 @@
                 (CheckThis, check_this, NULL, 1, 1, 1, JOF_BYTE),
                 (BindGName, bind_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_GNAME|JOF_IC),
                 (BindName, bind_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC),
-                (GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC),
-                (GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_GNAME|JOF_IC),
+                (GetName, get_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC),
+                (GetGName, get_g_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_GNAME|JOF_IC),
                 (GetArg, get_arg, NULL, 3, 0, 1, JOF_QARG|JOF_NAME),
                 (GetLocal, get_local, NULL, 4, 0, 1, JOF_LOCAL|JOF_NAME),
-                (GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME|JOF_TYPESET|JOF_IC),
-                (GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC),
-                (GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC),
-                (GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_TYPESET|JOF_IC),
+                (GetAliasedVar, get_aliased_var, NULL, 5, 0, 1, JOF_ENVCOORD|JOF_NAME),
+                (GetImport, get_import, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME),
+                (GetBoundName, get_bound_name, NULL, 5, 1, 1, JOF_ATOM|JOF_NAME|JOF_IC),
+                (GetIntrinsic, get_intrinsic, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_IC),
                 (Callee, callee, NULL, 1, 0, 1, JOF_BYTE),
                 (EnvCallee, env_callee, NULL, 2, 0, 1, JOF_UINT8),
                 (SetName, set_name, NULL, 5, 2, 1, JOF_ATOM|JOF_NAME|JOF_PROPSET|JOF_CHECKSLOPPY|JOF_IC),
@@ -222,14 +216,10 @@
                 (EnterWith, enter_with, NULL, 5, 1, 0, JOF_SCOPE),
                 (LeaveWith, leave_with, NULL, 1, 0, 0, JOF_BYTE),
                 (BindVar, bind_var, NULL, 1, 0, 1, JOF_BYTE),
-                (DefVar, def_var, NULL, 5, 0, 0, JOF_ATOM),
-                (DefFun, def_fun, NULL, 1, 1, 0, JOF_BYTE),
-                (DefLet, def_let, NULL, 5, 0, 0, JOF_ATOM),
-                (DefConst, def_const, NULL, 5, 0, 0, JOF_ATOM),
-                (CheckGlobalOrEvalDecl, check_global_or_eval_decl, NULL, 1, 0, 0, JOF_BYTE),
+                (GlobalOrEvalDeclInstantiation, global_or_eval_decl_instantiation, NULL, 5, 0, 0, JOF_GCTHING),
                 (DelName, del_name, NULL, 5, 0, 1, JOF_ATOM|JOF_NAME|JOF_CHECKSLOPPY),
                 (Arguments, arguments, NULL, 1, 0, 1, JOF_BYTE),
-                (Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_TYPESET|JOF_IC),
+                (Rest, rest, NULL, 1, 0, 1, JOF_BYTE|JOF_IC),
                 (FunctionThis, function_this, NULL, 1, 0, 1, JOF_BYTE),
                 (Pop, pop, NULL, 1, 1, 0, JOF_BYTE),
                 (PopN, pop_n, NULL, 3, -1, 0, JOF_UINT16),
@@ -325,77 +315,77 @@
 /// yield, await, or gosub resume index
 const JOF_RESUMEINDEX: u32 = 13;
 
+/// inline DoubleValue
+const JOF_DOUBLE: u32 = 14;
+
+/// uint32_t generic gc-thing index
+const JOF_GCTHING: u32 = 15;
+
 /// uint32_t constant index
-const JOF_ATOM: u32 = 14;
+const JOF_ATOM: u32 = 16;
 
 /// uint32_t object index
-const JOF_OBJECT: u32 = 15;
+const JOF_OBJECT: u32 = 17;
 
 /// uint32_t regexp index
-const JOF_REGEXP: u32 = 16;
-
-/// inline DoubleValue
-const JOF_DOUBLE: u32 = 17;
+const JOF_REGEXP: u32 = 18;
 
 /// uint32_t scope index
-const JOF_SCOPE: u32 = 18;
+const JOF_SCOPE: u32 = 19;
+
+/// uint32_t index for BigInt value
+const JOF_BIGINT: u32 = 20;
 
 /// uint32_t IC index
-const JOF_ICINDEX: u32 = 19;
+const JOF_ICINDEX: u32 = 21;
 
 /// JSOp::LoopHead, combines JOF_ICINDEX and JOF_UINT8
-const JOF_LOOPHEAD: u32 = 20;
-
-/// uint32_t index for BigInt value
-const JOF_BIGINT: u32 = 21;
+const JOF_LOOPHEAD: u32 = 22;
 
 /// uint32_t atom index, sourceStart, sourceEnd
-const JOF_CLASS_CTOR: u32 = 22;
+const JOF_CLASS_CTOR: u32 = 23;
 
 /// A pair of unspecified uint8_t arguments
-const JOF_TWO_UINT8: u32 = 23;
+const JOF_TWO_UINT8: u32 = 24;
 
 /// mask for above immediate types
-const JOF_TYPEMASK: u32 = 0x001f;
+const JOF_TYPEMASK: u32 = 0xFF;
 
 /// name operation
-const JOF_NAME: u32 = 1 << 5;
+const JOF_NAME: u32 = 1 << 8;
 
 /// obj.prop operation
-const JOF_PROP: u32 = 2 << 5;
+const JOF_PROP: u32 = 2 << 8;
 
 /// obj[index] operation
-const JOF_ELEM: u32 = 3 << 5;
+const JOF_ELEM: u32 = 3 << 8;
 
 /// property/element/name set operation
-const JOF_PROPSET: u32 = 1 << 7;
+const JOF_PROPSET: u32 = 1 << 16;
 
 /// property/element/name init operation
-const JOF_PROPINIT: u32 = 1 << 8;
+const JOF_PROPINIT: u32 = 1 << 17;
 
 /// op can only be generated in sloppy mode
-const JOF_CHECKSLOPPY: u32 = 1 << 10;
+const JOF_CHECKSLOPPY: u32 = 1 << 18;
 
 /// op can only be generated in strict mode
-const JOF_CHECKSTRICT: u32 = 1 << 11;
+const JOF_CHECKSTRICT: u32 = 1 << 19;
 
 /// any call, construct, or eval instruction
-const JOF_INVOKE: u32 = 1 << 12;
+const JOF_INVOKE: u32 = 1 << 20;
 
 /// invoke instruction using [[Construct]] entry
-const JOF_CONSTRUCT: u32 = 1 << 13;
+const JOF_CONSTRUCT: u32 = 1 << 21;
 
 /// invoke instruction using spread argument
-const JOF_SPREAD: u32 = 1 << 14;
+const JOF_SPREAD: u32 = 1 << 22;
 
 /// predicted global name
-const JOF_GNAME: u32 = 1 << 15;
-
-/// has an entry in a script's type sets
-const JOF_TYPESET: u32 = 1 << 16;
+const JOF_GNAME: u32 = 1 << 23;
 
 /// baseline may use an IC for this op
-const JOF_IC: u32 = 1 << 17;
+const JOF_IC: u32 = 1 << 24;
 
 // @@@@ END FLAGS @@@@
 
@@ -577,10 +567,6 @@
     pub fn has_argc(self) -> bool {
         self.format_bits() & JOF_TYPEMASK == JOF_ARGC
     }
-
-    pub fn has_typeset(self) -> bool {
-        self.format_bits() & JOF_TYPESET != 0
-    }
 }
 
 #[cfg(test)]
diff -Nru firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/script.rs firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/script.rs
--- firefox-84.0.2+build1/third_party/rust/jsparagus-stencil/src/script.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/jsparagus-stencil/src/script.rs	2021-01-18 19:58:25.000000000 +0000
@@ -70,8 +70,6 @@
     AlwaysNeedsArgsObj = 1 << 26,
     #[allow(dead_code)]
     HasMappedArgsObj = 1 << 27,
-    #[allow(dead_code)]
-    IsLikelyConstructorWrapper = 1 << 28,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -101,7 +99,7 @@
     #[allow(dead_code)]
     FailedShapeGuard = 1 << 19,
     #[allow(dead_code)]
-    HadFrequentBailouts = 1 << 20,
+    HadLICMInvalidation = 1 << 20,
     #[allow(dead_code)]
     HadOverflowBailout = 1 << 21,
     #[allow(dead_code)]
@@ -110,6 +108,8 @@
     InvalidatedIdempotentCache = 1 << 23,
     #[allow(dead_code)]
     FailedLexicalCheck = 1 << 24,
+    #[allow(dead_code)]
+    HadSpeculativePhiBailout = 1 << 25,
 }
 
 // @@@@ END TYPES @@@@
@@ -156,7 +156,6 @@
     pub body_scope_index: u32,
     pub num_ic_entries: u32,
     pub fun_length: u16,
-    pub num_bytecode_type_sets: u32,
     pub bytecode: Vec<u8>,
     pub scope_notes: Vec<ScopeNote>,
     // TODO: Add resume_offsets and try_notes.
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/.cargo-checksum.json firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/.cargo-checksum.json	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6f7c26dba788329c4d904bf2dce313de7626f18fc99088984068901ce87936d2","build.rs":"ae539feaad828d15cbe4924e8de5ae38c7d0086200a5c4d494edf8e8e28c074e","src/alloc/mod.rs":"6aac9fa3fd238de17d6270fab6e9677ade40dbbff9d700494f9a78084da1ccd3","src/alloc/tests.rs":"3aada1196dae1b03106e63f6892b9fc019cf9627b99b278765668c56df82bc79","src/c_api.rs":"cb42793d891597ac903636d4726d64a94507a583d44bd350571ce104db4fcc0a","src/context/context_asm.S":"6b0fe86e5e7f3699482d94819f67ead933aaf91da89f79da0d8a75fa71ba4380","src/context/mod.rs":"98452bfad053d4cd4143afed620233538688cf2bac857b0c4569f42ee8d6d844","src/context/tests/c_child.c":"a9ad91367ac37e7406a587f971858aa7758913f634ea7ae88fccc7f487a3c4fc","src/context/tests/c_child.rs":"33c0472401795d61af2a706cc69d62b69225159a10cfc55e4b0c6e15321f0964","src/context/tests/mod.rs":"5d1bc979aaea2870a8c3a3db66cde21d16d9aab20b898da2c67d6aa1f1f5c292","src/context/tests/rust_child.rs":"ed69940a0b426eef5f9524f06ca215d0952cf4b00d8ebcf8837077849502d075","src/embed_ctx.rs":"57ae60c1a50cf84af23dc529a154db21cbb58c52c8067b9f87069dd600b99473","src/error.rs":"fd09389d5112b04ea76ffed0a7b2a8180c524cded90e33e36399a690c5714e2e","src/hostcall_macros.rs":"b4a2fdd876eee50bec4188f7d9f7c708d71600974cc2b52ff38c7daaa63cb225","src/instance.rs":"04bf1dddd9a980579b3baef77b83f19e8187a085aee6276a0fd4e60af7918e7a","src/instance/siginfo_ext.c":"8ee3a54ef2b93041ca07ecce70ebeb8d421c8ad1257122d9e8ef064d2d45a4a4","src/instance/siginfo_ext.rs":"529b4cc7ce6eea140c17a97477cc862f9d224e40cc24687223a478696d27b971","src/instance/signals.rs":"37d7cff815169fdab680d2931f6236d4e912c34621b9c99192b0147450bb6bc1","src/instance/state.rs":"490278c7222fc22248c8f545364a5d522da721c35f5b5e814658dc90e8ed77bd","src/lib.rs":"0c97e40191f17826feccff762898a0f4cafd1ed45cc3e81c07f9f446e263a422","src/module.rs":"29b54cc59cf308d712d9ecf4d595ef10645213e8ea62ec7f3a12adb27089fb47","src/module/dl.rs":"828838d35596e9c4399a5cfc857d680484b953f6ebed17b5dfd8ddf3e77adf82","src/module/mock.rs":"bf397a32bc1f567a5597f92d017a04f5c480e1b07f21b8843b49b49f6dde111a","src/module/sparse_page_data.rs":"84ef79aa4707e5c84d72a38c5ead18156b16ab29c617540e652e851c744449dc","src/region/mmap.rs":"fd41806035e26320136eb770960d514770eab8a4c933b8f17b4c605d02cf421f","src/region/mod.rs":"d2bf8b8c769542299bae9e5ed5d334ca7b431dfd52619ae1487d1494653dfc82","src/sysdeps/linux.rs":"124cc2f0fb0856e23274facdab8ca4631f04cdf8e494d9a4531979efe4ba4ad9","src/sysdeps/macos.rs":"8dc632a9aab98993140a6faefb7c2e313d80e6b9db2e45f54e8d6604cd752a6f","src/sysdeps/mod.rs":"9caed471a08f5f7d39c836a649d0f61d7a84095cee7589cdfc1eafe10eaa866c","src/test_helpers.rs":"72d1aeb9ca9c512aadcecac7ad0869c883c13134fced9f625075dc5e2741c55d","src/val.rs":"503891cd17892349b931d49ed3cdc0c9fc572da47d4c8f8f94fee30f5f4543a6","src/vmctx.rs":"b401df03b483c827d694f5f9024cf54b40987cff025dd8f292137e8396f56e6e"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"6f7c26dba788329c4d904bf2dce313de7626f18fc99088984068901ce87936d2","build.rs":"ae539feaad828d15cbe4924e8de5ae38c7d0086200a5c4d494edf8e8e28c074e","src/alloc/mod.rs":"6aac9fa3fd238de17d6270fab6e9677ade40dbbff9d700494f9a78084da1ccd3","src/alloc/tests.rs":"3aada1196dae1b03106e63f6892b9fc019cf9627b99b278765668c56df82bc79","src/c_api.rs":"cb42793d891597ac903636d4726d64a94507a583d44bd350571ce104db4fcc0a","src/context/context_asm.S":"6b0fe86e5e7f3699482d94819f67ead933aaf91da89f79da0d8a75fa71ba4380","src/context/mod.rs":"98452bfad053d4cd4143afed620233538688cf2bac857b0c4569f42ee8d6d844","src/context/tests/c_child.c":"a9ad91367ac37e7406a587f971858aa7758913f634ea7ae88fccc7f487a3c4fc","src/context/tests/c_child.rs":"33c0472401795d61af2a706cc69d62b69225159a10cfc55e4b0c6e15321f0964","src/context/tests/mod.rs":"5d1bc979aaea2870a8c3a3db66cde21d16d9aab20b898da2c67d6aa1f1f5c292","src/context/tests/rust_child.rs":"ed69940a0b426eef5f9524f06ca215d0952cf4b00d8ebcf8837077849502d075","src/embed_ctx.rs":"57ae60c1a50cf84af23dc529a154db21cbb58c52c8067b9f87069dd600b99473","src/error.rs":"fd09389d5112b04ea76ffed0a7b2a8180c524cded90e33e36399a690c5714e2e","src/hostcall_macros.rs":"b4a2fdd876eee50bec4188f7d9f7c708d71600974cc2b52ff38c7daaa63cb225","src/instance.rs":"04bf1dddd9a980579b3baef77b83f19e8187a085aee6276a0fd4e60af7918e7a","src/instance/siginfo_ext.c":"8ee3a54ef2b93041ca07ecce70ebeb8d421c8ad1257122d9e8ef064d2d45a4a4","src/instance/siginfo_ext.rs":"529b4cc7ce6eea140c17a97477cc862f9d224e40cc24687223a478696d27b971","src/instance/signals.rs":"37d7cff815169fdab680d2931f6236d4e912c34621b9c99192b0147450bb6bc1","src/instance/state.rs":"490278c7222fc22248c8f545364a5d522da721c35f5b5e814658dc90e8ed77bd","src/lib.rs":"0c97e40191f17826feccff762898a0f4cafd1ed45cc3e81c07f9f446e263a422","src/module.rs":"29b54cc59cf308d712d9ecf4d595ef10645213e8ea62ec7f3a12adb27089fb47","src/module/dl.rs":"cb0a3f4b42ee57783fe37124879069946561ceecc0948eb00659d029f86f3d6c","src/module/mock.rs":"bf397a32bc1f567a5597f92d017a04f5c480e1b07f21b8843b49b49f6dde111a","src/module/sparse_page_data.rs":"84ef79aa4707e5c84d72a38c5ead18156b16ab29c617540e652e851c744449dc","src/region/mmap.rs":"62457218db8a18f7db81861670cf9e0d24dedb06484e5ea42a1bec3bf9ea57a7","src/region/mod.rs":"d2bf8b8c769542299bae9e5ed5d334ca7b431dfd52619ae1487d1494653dfc82","src/sysdeps/linux.rs":"124cc2f0fb0856e23274facdab8ca4631f04cdf8e494d9a4531979efe4ba4ad9","src/sysdeps/macos.rs":"8dc632a9aab98993140a6faefb7c2e313d80e6b9db2e45f54e8d6604cd752a6f","src/sysdeps/mod.rs":"9caed471a08f5f7d39c836a649d0f61d7a84095cee7589cdfc1eafe10eaa866c","src/test_helpers.rs":"72d1aeb9ca9c512aadcecac7ad0869c883c13134fced9f625075dc5e2741c55d","src/val.rs":"503891cd17892349b931d49ed3cdc0c9fc572da47d4c8f8f94fee30f5f4543a6","src/vmctx.rs":"b401df03b483c827d694f5f9024cf54b40987cff025dd8f292137e8396f56e6e"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/module/dl.rs firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/module/dl.rs
--- firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/module/dl.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/module/dl.rs	2021-01-18 19:58:25.000000000 +0000
@@ -4,7 +4,7 @@
 use libloading::Library;
 use lucet_module::{
     FunctionHandle, FunctionIndex, FunctionPointer, FunctionSpec, ModuleData, ModuleFeatures,
-    ModuleSignature, SerializedModule, Signature, LUCET_MODULE_SYM,
+    SerializedModule, Signature, LUCET_MODULE_SYM,
 };
 #[cfg(feature = "signature_checking")]
 use lucet_module::{ModuleSignature, PublicKey};
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/region/mmap.rs firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/region/mmap.rs
--- firefox-84.0.2+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/region/mmap.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-runtime-internals-wasmsbx/src/region/mmap.rs	2021-01-18 19:58:26.000000000 +0000
@@ -89,7 +89,7 @@
             // make the sigstack read/writable
             (slot.sigstack, limits.signal_stack_size),
         ]
-        .into_iter()
+        .iter()
         {
             // eprintln!("setting r/w {:p}[{:x}]", *ptr, len);
             unsafe { mprotect(*ptr, *len, ProtFlags::PROT_READ | ProtFlags::PROT_WRITE)? };
@@ -138,7 +138,7 @@
             (slot.globals, slot.limits.globals_size),
             (slot.sigstack, slot.limits.signal_stack_size),
         ]
-        .into_iter()
+        .iter()
         {
             // eprintln!("setting none {:p}[{:x}]", *ptr, len);
             unsafe {
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/.cargo-checksum.json firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/.cargo-checksum.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"5b15219ca238492bc5c6d3a7333ddd6697c40a929254aec62252b8a1ab50b630","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE.cloudabi-utils":"86a34251f0aab76b7dc3daf8d252afbdf481ea94aa5b46d020205178b7e2eac1","LICENSE.wasmtime":"a6c48161a09acc75a0e25503bab66a731eb5fba5392ed4bb4743e4ba5085327a","bindings.json":"08df8aaa3e5610f1e2f2d2c0a6399d80a7c0842ae871367e932a2b3ec741a289","build.rs":"593173ad03963afcbef43f1843be6f04cde1df3eae0298ca20bf881019dd350a","examples/.gitignore":"44575cf5b28512d75644bf54a517dcef304ff809fd511747621b4d64f19aac66","examples/Makefile":"d2d2ceeb1bc4435189ea9a2710b6f5f5331ce6aa73ae8a4f4edcca215058a9b4","examples/README.md":"f2a5be6cc88d511c9f4d3bfefdd42dcb2ace813bc23f6a4430b6b543f7373341","examples/hello.c":"9cbc0d3173e02309e15372835fa849d196b2a202d81806fea60378e1878d0c53","examples/pseudoquine.c":"8fd696f8e1b8fb86188564a05f4776875ead31d785a12e3aa4af9d9c1b46d5b5","include/lucet_wasi.h":"497f712c64f753ebdf73ab05b0b340d50094f9c59bb8637ccbf99d895cd20966","src/bindings.rs":"edbeb51d1a93fd31039ee1f1dc7c1b6c0bded2cf5dad10039e8b7da81a4d4a12","src/c_api.rs":"a9c73070a88a461882a28e3e2adfd773f569b964c7ffabde39a3cef907782f71","src/ctx.rs":"578f87c35cce12eaebec95d03e31954c3e6cd0afa214a0fec068f03814eb0cc7","src/fdentry.rs":"94a8480fa587e5586327dfd6b66d8a6a3ef1f8091ba8deb335bf45642f4f98e6","src/host.rs":"6f05f8fea2afed827abfc3c008a5854a8023d91d066580ecfb49e5c8036ef3a3","src/hostcalls/fs.rs":"4726e6f695f7d1d4e371ec52c57f4e36b0ba0d2302fc008b21a301f5fd7a5c97","src/hostcalls/fs_helpers.rs":"474bce0a1f15fa23b0b0b8aa83143d993dd2cbd7cdfc38c118d452d04e80caea","src/hostcalls/misc.rs":"83d087891d92af08cfa2d2e0c5f41cc47cb8219460f6dbcc8666b418dfef206e","src/hostcalls/mod.rs":"4c5d3f65c69503e11e647770879026c37c0e5e01a99b7116c8fb9411b4797187","src/hostcalls/timers.rs":"e65d6a491256b5d6051b6816f6c5049ba3cdc6142651bac81f34d659c1c2a104","src/lib.rs":"5554e1a3f0cd3756173ece6435a0d01b2f520b3401cd5fc33180a04fb9f69bbe","src/memory.rs":"0a09026b15d27f99d74e560cd94795f645cba414a8491bc961987fab9d9da69b","src/wasi_host.rs":"cacbdac28304a837b11e5ad400ae9de3ee79c0284be335e64606ecdfe426ad6e","src/wasm32.rs":"13a5dc6e59784662f1e55eccb457cbbae241a96f70cfa72c41d55858ca05b980","tests/guests/cant_dotdot.c":"609b8cece9443e375a0b38a7e43651b179f66ee9c686edba6696fe1bcd45b111","tests/guests/clock_getres.c":"f5e41c0a2b05a8d7cdb5b4da6c8b6778b858004c1e9d115503c45a1d976be33b","tests/guests/duplicate_import.wat":"4bd8d7a5c1d1597dbe7648300e94e3fab84d7ab068d56cfb656aa1a208026cee","tests/guests/exitcode.c":"b7c5cec3ead0ed82326c568287a1f3398e71ae7e447ce49a3c4c7114c82495af","tests/guests/follow_symlink.c":"de3143ad2bbbfe834c0c32b54c9fcf144ca4eba5cdcf7588929e5f47225ab616","tests/guests/fs.c":"0dca5232ff5da1b7745e3b44bca39333c01a20ba4eae1a6a0a1c492c71ca1efa","tests/guests/getentropy.c":"5d80bcc68dcf3ba91576969055099d61635ae713c057b3cb36afb122a5f26347","tests/guests/getrusage.c":"8114c103b85eb564d9ab43684958bc1939de3794d314b7c121762f3a2f0434a6","tests/guests/gettimeofday.c":"4a57f376b06f4228017b82695448a0bd213fb91455f5301d689cd87fcff01f06","tests/guests/notdir.c":"bd8f8b24360b7cf8d5dced9d9ba4c15843fcbbae89fecc13e3a457c33a275e28","tests/guests/poll.c":"aefaa9b58ce9906dc379e0bd25fa68dfbf8cdffb48cd5ecde1d67708b83b366d","tests/guests/preopen_populates.c":"f186e4eb4aab6a1d9ec7bc5c49eaea6d9d162e0159dfe8f953bb48ade9b58d43","tests/guests/read_file.c":"1aab9393f005f05b69592826d7c4d384a115d5bca42c66f10a901811b4b1dcac","tests/guests/read_file_twice.c":"04a3dad7a43b93e36efd4e2c822c11b3f129429ec799af304d82b358686c578a","tests/guests/stat.c":"02756933ea7d4337b4fa04344b32968851b02f9d0bd5ea1cb0e2f022e8c65ab0","tests/guests/stdin.c":"66efc4b54f68d1138046f1afefae15f7d4555b2904b4a988818e61e67fe8fefb","tests/guests/symlink_escape.c":"686e047b5c986e29c854bcd93996d027dcdc8721219fa9fa532efc98d2798f5c","tests/guests/symlink_loop.c":"2bbddf3a5edfc6e5f3c0fa82cee4ac92b18804810509e263abd17f5240cd37e5","tests/guests/write_file.c":"9e9b14552c2445cfa6d0aa26b334081a59e6e3428dbb17ceca005a9ba59d3220","tests/test_helpers/mod.rs":"bc18194317611fe1be5c439a7a9e0de75399555c3b6de4275af149fb180456c8","tests/tests.rs":"173a7e0f086f6ed46474686cc3413ee68bbd2ff67004f7790e963a1392c7c46e"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"42e73da184367cdd609f7fb5574de225ee53ae58c0a88fec1f1d091b1e0e72b8","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","LICENSE.cloudabi-utils":"86a34251f0aab76b7dc3daf8d252afbdf481ea94aa5b46d020205178b7e2eac1","LICENSE.wasmtime":"a6c48161a09acc75a0e25503bab66a731eb5fba5392ed4bb4743e4ba5085327a","bindings.json":"08df8aaa3e5610f1e2f2d2c0a6399d80a7c0842ae871367e932a2b3ec741a289","build.rs":"593173ad03963afcbef43f1843be6f04cde1df3eae0298ca20bf881019dd350a","examples/.gitignore":"44575cf5b28512d75644bf54a517dcef304ff809fd511747621b4d64f19aac66","examples/Makefile":"d2d2ceeb1bc4435189ea9a2710b6f5f5331ce6aa73ae8a4f4edcca215058a9b4","examples/README.md":"f2a5be6cc88d511c9f4d3bfefdd42dcb2ace813bc23f6a4430b6b543f7373341","examples/hello.c":"9cbc0d3173e02309e15372835fa849d196b2a202d81806fea60378e1878d0c53","examples/pseudoquine.c":"8fd696f8e1b8fb86188564a05f4776875ead31d785a12e3aa4af9d9c1b46d5b5","include/lucet_wasi.h":"497f712c64f753ebdf73ab05b0b340d50094f9c59bb8637ccbf99d895cd20966","src/bindings.rs":"edbeb51d1a93fd31039ee1f1dc7c1b6c0bded2cf5dad10039e8b7da81a4d4a12","src/c_api.rs":"a9c73070a88a461882a28e3e2adfd773f569b964c7ffabde39a3cef907782f71","src/ctx.rs":"1c40b0c2dd8afa61090470a11c09ace24f25bca448b95bb1275e37cf8061f109","src/fdentry.rs":"94a8480fa587e5586327dfd6b66d8a6a3ef1f8091ba8deb335bf45642f4f98e6","src/host.rs":"6f05f8fea2afed827abfc3c008a5854a8023d91d066580ecfb49e5c8036ef3a3","src/hostcalls/fs.rs":"4726e6f695f7d1d4e371ec52c57f4e36b0ba0d2302fc008b21a301f5fd7a5c97","src/hostcalls/fs_helpers.rs":"474bce0a1f15fa23b0b0b8aa83143d993dd2cbd7cdfc38c118d452d04e80caea","src/hostcalls/misc.rs":"83d087891d92af08cfa2d2e0c5f41cc47cb8219460f6dbcc8666b418dfef206e","src/hostcalls/mod.rs":"4c5d3f65c69503e11e647770879026c37c0e5e01a99b7116c8fb9411b4797187","src/hostcalls/timers.rs":"e65d6a491256b5d6051b6816f6c5049ba3cdc6142651bac81f34d659c1c2a104","src/lib.rs":"1e8f0e325385d53393ff2495da0ece4e6b1f955290a8cfdbea368d4a3350fbf2","src/memory.rs":"0a09026b15d27f99d74e560cd94795f645cba414a8491bc961987fab9d9da69b","src/wasi_host.rs":"cacbdac28304a837b11e5ad400ae9de3ee79c0284be335e64606ecdfe426ad6e","src/wasm32.rs":"13a5dc6e59784662f1e55eccb457cbbae241a96f70cfa72c41d55858ca05b980","tests/guests/cant_dotdot.c":"609b8cece9443e375a0b38a7e43651b179f66ee9c686edba6696fe1bcd45b111","tests/guests/clock_getres.c":"f5e41c0a2b05a8d7cdb5b4da6c8b6778b858004c1e9d115503c45a1d976be33b","tests/guests/duplicate_import.wat":"4bd8d7a5c1d1597dbe7648300e94e3fab84d7ab068d56cfb656aa1a208026cee","tests/guests/exitcode.c":"b7c5cec3ead0ed82326c568287a1f3398e71ae7e447ce49a3c4c7114c82495af","tests/guests/follow_symlink.c":"de3143ad2bbbfe834c0c32b54c9fcf144ca4eba5cdcf7588929e5f47225ab616","tests/guests/fs.c":"0dca5232ff5da1b7745e3b44bca39333c01a20ba4eae1a6a0a1c492c71ca1efa","tests/guests/getentropy.c":"5d80bcc68dcf3ba91576969055099d61635ae713c057b3cb36afb122a5f26347","tests/guests/getrusage.c":"8114c103b85eb564d9ab43684958bc1939de3794d314b7c121762f3a2f0434a6","tests/guests/gettimeofday.c":"4a57f376b06f4228017b82695448a0bd213fb91455f5301d689cd87fcff01f06","tests/guests/notdir.c":"bd8f8b24360b7cf8d5dced9d9ba4c15843fcbbae89fecc13e3a457c33a275e28","tests/guests/poll.c":"aefaa9b58ce9906dc379e0bd25fa68dfbf8cdffb48cd5ecde1d67708b83b366d","tests/guests/preopen_populates.c":"f186e4eb4aab6a1d9ec7bc5c49eaea6d9d162e0159dfe8f953bb48ade9b58d43","tests/guests/read_file.c":"1aab9393f005f05b69592826d7c4d384a115d5bca42c66f10a901811b4b1dcac","tests/guests/read_file_twice.c":"04a3dad7a43b93e36efd4e2c822c11b3f129429ec799af304d82b358686c578a","tests/guests/stat.c":"02756933ea7d4337b4fa04344b32968851b02f9d0bd5ea1cb0e2f022e8c65ab0","tests/guests/stdin.c":"66efc4b54f68d1138046f1afefae15f7d4555b2904b4a988818e61e67fe8fefb","tests/guests/symlink_escape.c":"686e047b5c986e29c854bcd93996d027dcdc8721219fa9fa532efc98d2798f5c","tests/guests/symlink_loop.c":"2bbddf3a5edfc6e5f3c0fa82cee4ac92b18804810509e263abd17f5240cd37e5","tests/guests/write_file.c":"9e9b14552c2445cfa6d0aa26b334081a59e6e3428dbb17ceca005a9ba59d3220","tests/test_helpers/mod.rs":"bc18194317611fe1be5c439a7a9e0de75399555c3b6de4275af149fb180456c8","tests/tests.rs":"173a7e0f086f6ed46474686cc3413ee68bbd2ff67004f7790e963a1392c7c46e"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/Cargo.toml firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/Cargo.toml	2021-01-18 19:58:25.000000000 +0000
@@ -32,6 +32,7 @@
 lucet-module = { path = "../lucet-module", version = "0.1.1", package="lucet-module-wasmsbx" }
 nix = "0.13"
 rand = "0.7"
+lazy_static = ">=1.4.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 mach = "0.3.2"
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/src/ctx.rs firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/src/ctx.rs
--- firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/src/ctx.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/src/ctx.rs	2021-01-18 19:58:26.000000000 +0000
@@ -16,19 +16,19 @@
     env: HashMap<CString, CString>,
 }
 
+lazy_static! {
+    static ref DEV_NULL_FILE: File = dev_null();
+}
+
 impl WasiCtxBuilder {
     /// Builder for a new `WasiCtx`.
     pub fn new() -> Self {
-        let null = dev_null();
         WasiCtxBuilder {
             fds: HashMap::new(),
             preopens: HashMap::new(),
             args: vec![],
             env: HashMap::new(),
         }
-        .fd_dup_for_io_desc(0, &null, false /* writeable */)
-        .fd_dup_for_io_desc(1, &null, true  /* writeable */)
-        .fd_dup_for_io_desc(2, &null, true  /* writeable */)
     }
 
     pub fn args(mut self, args: &[&str]) -> Self {
diff -Nru firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/src/lib.rs firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/lucet-wasi-wasmsbx/src/lib.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/lucet-wasi-wasmsbx/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -11,3 +11,6 @@
 
 pub use bindings::bindings;
 pub use ctx::{WasiCtx, WasiCtxBuilder};
+
+#[macro_use]
+extern crate lazy_static;
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-common/.cargo-checksum.json firefox-85.0+build1/third_party/rust/neqo-common/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/neqo-common/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-common/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d15a2b810befe53f405c44d7f1aa179fc4f1047c3e42ae565230de5b3cd1ffd2","src/codec.rs":"232db2f1f6a5952a58710f5ec442f768dff71846dd108f71374b3ad7d6aea3ff","src/datagram.rs":"569f8d9e34d7ee17144bf63d34136ecd9778da0d337e513f338738c50284615e","src/event.rs":"f60fee9f4b09ef47ff5e4bfa21c07e45ffd5873c292f2605f24d834070127d62","src/incrdecoder.rs":"b97a40f89da6832ad92bd652cb6ceac82a0a5cc68a9b3d0c96f89d02e1ee9902","src/lib.rs":"5af4f0e7284b49d1b03b5eee78f2b814e5fa6eb9424507291e25b1955aebe007","src/log.rs":"b8da388073f72a21128d52b0d0c963e07a3d3cf3368438ae3a50be34b8add3a4","src/qlog.rs":"a8aa4f1f0110076b401f6e5a7057ec154c7ad3677374a21ceca1209469b9c07d","src/timer.rs":"66886b3697e1b4232d9d9892a12d93afd3381812a8ff901bceac4bb48b264607","tests/log.rs":"480b165b7907ec642c508b303d63005eee1427115d6973a349eaf6b2242ed18d"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"17f14e7501177f5533aef710203eb15913ebb7e709d4552265c73c6723896599","src/codec.rs":"4e2e2ef9b960ca099054c1058d3eb7716070ec1c333c91a8814433500e89d1b0","src/datagram.rs":"569f8d9e34d7ee17144bf63d34136ecd9778da0d337e513f338738c50284615e","src/event.rs":"f60fee9f4b09ef47ff5e4bfa21c07e45ffd5873c292f2605f24d834070127d62","src/incrdecoder.rs":"b97a40f89da6832ad92bd652cb6ceac82a0a5cc68a9b3d0c96f89d02e1ee9902","src/lib.rs":"5af4f0e7284b49d1b03b5eee78f2b814e5fa6eb9424507291e25b1955aebe007","src/log.rs":"b69e492af85e65866cb6588138e8a337dd897d3ce399cb4e9fb8cc04ac042b7f","src/qlog.rs":"a8aa4f1f0110076b401f6e5a7057ec154c7ad3677374a21ceca1209469b9c07d","src/timer.rs":"66886b3697e1b4232d9d9892a12d93afd3381812a8ff901bceac4bb48b264607","tests/log.rs":"480b165b7907ec642c508b303d63005eee1427115d6973a349eaf6b2242ed18d"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-common/Cargo.toml firefox-85.0+build1/third_party/rust/neqo-common/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/neqo-common/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-common/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,13 +1,13 @@
 [package]
 name = "neqo-common"
-version = "0.4.14"
+version = "0.4.16"
 authors = ["Bobby Holley <bobbyholley@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
 
 [dependencies]
 log = {version = "0.4.0", default-features = false}
-env_logger = "0.7.1"
+env_logger = {version = "0.8", default-features = false}
 lazy_static = "1.3.0"
 qlog = "0.3.0"
 chrono = "0.4.10"
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-common/src/codec.rs firefox-85.0+build1/third_party/rust/neqo-common/src/codec.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-common/src/codec.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-common/src/codec.rs	2021-01-18 19:58:26.000000000 +0000
@@ -368,6 +368,13 @@
     pub fn truncate(&mut self, len: usize) {
         self.buf.truncate(len);
     }
+
+    /// Pad the buffer to `len` with bytes set to `v`.
+    pub fn pad_to(&mut self, len: usize, v: u8) {
+        if len > self.buf.len() {
+            self.buf.resize(len, v);
+        }
+    }
 }
 
 impl Debug for Encoder {
@@ -777,4 +784,15 @@
         enc[0] = 0xff;
         assert_eq!(enc, Encoder::from_hex("ff0234"));
     }
+
+    #[test]
+    fn pad() {
+        let mut enc = Encoder::from_hex("010234");
+        enc.pad_to(5, 0);
+        assert_eq!(enc, Encoder::from_hex("0102340000"));
+        enc.pad_to(4, 0);
+        assert_eq!(enc, Encoder::from_hex("0102340000"));
+        enc.pad_to(7, 0xc2);
+        assert_eq!(enc, Encoder::from_hex("0102340000c2c2"));
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-common/src/log.rs firefox-85.0+build1/third_party/rust/neqo-common/src/log.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-common/src/log.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-common/src/log.rs	2021-01-18 19:58:26.000000000 +0000
@@ -52,7 +52,7 @@
                 "{}s{:3}ms {} {}",
                 elapsed.as_secs(),
                 elapsed.as_millis() % 1000,
-                buf.default_styled_level(record.level()),
+                record.level(),
                 record.args()
             )
         });
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-crypto/build.rs firefox-85.0+build1/third_party/rust/neqo-crypto/build.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-crypto/build.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-crypto/build.rs	2021-01-18 19:58:26.000000000 +0000
@@ -133,7 +133,7 @@
     // another instance of bash that might be sitting around (like WSL).
     match env::var("MOZILLABUILD") {
         Ok(d) => PathBuf::from(d).join("msys").join("bin").join("bash.exe"),
-        _ => PathBuf::from("bash"),
+        Err(_) => PathBuf::from("bash"),
     }
 }
 
@@ -339,7 +339,7 @@
             "cargo:rustc-link-search=native={}",
             path.join("dist").join("bin").to_str().unwrap()
         );
-        let nsslib_path = path.clone().join("security").join("nss").join("lib");
+        let nsslib_path = path.join("security").join("nss").join("lib");
         println!(
             "cargo:rustc-link-search=native={}",
             nsslib_path.join("nss").join("nss_nss3").to_str().unwrap()
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-crypto/.cargo-checksum.json firefox-85.0+build1/third_party/rust/neqo-crypto/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/neqo-crypto/.cargo-checksum.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-crypto/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"e4720002b381baa9ef4a2029a79155095d3126465b61e7b49b48618f0e645781","TODO":"ac0f1c2ebcca03f5b3c0cc56c5aedbb030a4b511e438bc07a57361c789f91e9f","bindings/bindings.toml":"a896b4accf5fbaf146a45a060142974bfa2f59d6a5ab18c5080753078ae39474","bindings/mozpkix.hpp":"77072c8bb0f6eb6bfe8cbadc111dcd92e0c79936d13f2e501aae1e5d289a6675","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nspr_io.h":"085b289849ef0e77f88512a27b4d9bdc28252bd4d39c6a17303204e46ef45f72","bindings/nspr_time.h":"2e637fd338a5cf0fd3fb0070a47f474a34c2a7f4447f31b6875f5a9928d0a261","bindings/nss_ciphers.h":"95ec6344a607558b3c5ba8510f463b6295f3a2fb3f538a01410531045a5f62d1","bindings/nss_init.h":"ef49045063782fb612aff459172cc6a89340f15005808608ade5320ca9974310","bindings/nss_p11.h":"0b81e64fe6db49b2ecff94edd850be111ef99ec11220e88ceb1c67be90143a78","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","bindings/nss_ssl.h":"af222fb957b989e392e762fa2125c82608a0053aff4fb97e556691646c88c335","bindings/nss_sslerr.h":"24b97f092183d8486f774cdaef5030d0249221c78343570d83a4ee5b594210ae","bindings/nss_sslopt.h":"b7807eb7abdad14db6ad7bc51048a46b065a0ea65a4508c95a12ce90e59d1eea","build.rs":"0be611e6b25a18d5ed724071a3a471c2c5b584649b5fe36de28a56ed8caaf800","src/aead.rs":"e26ad34f7168f42aa87eb3a6455af3191a0e8555782b1d70032fe1d248922f98","src/agent.rs":"9dae2fa87a5a7b65dfc7fdd1b2ab1be0f75f1d9ee6704b44edd9bd406252b10a","src/agentio.rs":"cc562d09a09719b90b4e1d147fd579e3e89b683448709e920033bceaea108a61","src/auth.rs":"71ac7e297a5f872d26cf67b6bbd96e4548ea38374bdd84c1094f76a5de4ed1cb","src/cert.rs":"fd3fd2bbb38754bdcee3898549feae412943c9f719032531c1ad6e61783b5394","src/constants.rs":"c39ee506a10d685fda77c1d2ddf691b595b067b4e1044ac7a21e360119d6002b","src/err.rs":"04f38831ca62d29d8aadfe9daf95fd29e68ece184e6d3e00bfb9ee1d12744033","src/exp.rs":"61586662407359c1ecb8ed4987bc3c702f26ba2e203a091a51b6d6363cbd510f","src/ext.rs":"97cba23247e5f9656f27587214f7d7370a69174bae5960a012ce3e6fc99f9116","src/hkdf.rs":"40e44f4280497ef525c2b4c465f14f06d241150851668b264ee958f74321cfbe","src/hp.rs":"7fce64e0cc3a6a7e744bc797886bcfaa39679f0a81853b2e55ea0f54fb6bf700","src/lib.rs":"3b22108a069c8c9f1b78e94d48c8759b17e0941b28e2def3fa343d6acace4b6d","src/once.rs":"b9850384899a1a016e839743d3489c0d4d916e1973746ef8c89872105d7d9736","src/p11.rs":"0b62ee5938aefb82e8faee5aa14e990a00442cc9744e8ba22eda80b32030c42c","src/prio.rs":"bc4e97049563b136cb7b39f5171e7909d56a77ed46690aaacb781eeb4a4743e0","src/replay.rs":"40924865994396441a68e6009ecbdf352d6a02fdf539aa65604124e26bffb4d3","src/result.rs":"cef34dfcb907723e195b56501132e4560e250b327783cb5e41201da5b63e9b5c","src/secrets.rs":"acb5befa74e06281c6f80d7298efc58f568bb4e6d949b4225c335e3f392be741","src/selfencrypt.rs":"429cb889a4e9e2345888cc033115c0aa306d2ff90bdfe22b3067700eb1426c37","src/ssl.rs":"3e3a4f539f3c4d18bd6e774dc34fca611db0c75bba00badcd2078c975db055bf","src/time.rs":"5b2ab4028b04b6245c666f33f1c1449816d3d1eb8141f723f5773f21f8fe4388","tests/aead.rs":"a1d8eb69f5672e064f84dce3d214b347a396718e3de56d57ccc108ee87f1cbc1","tests/agent.rs":"d43e5b05dcc845394d3c7312974faae0fdcbc325c07c970aeb7ef30c3ade652e","tests/ext.rs":"eba9f03accdd598e38292ac88263a81b367d60d5a736a43117a3663de105ec48","tests/handshake.rs":"93c478fcd07d29691007abd6dcfcd2014c10c23b0206ba2d97d01594e4d64397","tests/hkdf.rs":"539235e9dcf2a56b72961a9a04f0080409adf6bf465bfad7c30026421b2d4326","tests/hp.rs":"e52a7d2f4387f2dfe8bfe1da5867e8e0d3eb51e171c6904e18b18c4343536af8","tests/init.rs":"20aad800ac793aaf83059cf860593750509fdedeeff0c08a648e7a5cb398dae0","tests/selfencrypt.rs":"46e9a1a09c2ae577eb106d23a5cdacf762575c0dea1948aedab06ef7389ce713"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"399a28fb6b9832f2c437cdae37ce4e04fed3392e48f0ff9e469d937bc22ad8e0","TODO":"ac0f1c2ebcca03f5b3c0cc56c5aedbb030a4b511e438bc07a57361c789f91e9f","bindings/bindings.toml":"a896b4accf5fbaf146a45a060142974bfa2f59d6a5ab18c5080753078ae39474","bindings/mozpkix.hpp":"77072c8bb0f6eb6bfe8cbadc111dcd92e0c79936d13f2e501aae1e5d289a6675","bindings/nspr_err.h":"2d5205d017b536c2d838bcf9bc4ec79f96dd50e7bb9b73892328781f1ee6629d","bindings/nspr_error.h":"e41c03c77b8c22046f8618832c9569fbcc7b26d8b9bbc35eea7168f35e346889","bindings/nspr_io.h":"085b289849ef0e77f88512a27b4d9bdc28252bd4d39c6a17303204e46ef45f72","bindings/nspr_time.h":"2e637fd338a5cf0fd3fb0070a47f474a34c2a7f4447f31b6875f5a9928d0a261","bindings/nss_ciphers.h":"95ec6344a607558b3c5ba8510f463b6295f3a2fb3f538a01410531045a5f62d1","bindings/nss_init.h":"ef49045063782fb612aff459172cc6a89340f15005808608ade5320ca9974310","bindings/nss_p11.h":"0b81e64fe6db49b2ecff94edd850be111ef99ec11220e88ceb1c67be90143a78","bindings/nss_secerr.h":"713e8368bdae5159af7893cfa517dabfe5103cede051dee9c9557c850a2defc6","bindings/nss_ssl.h":"af222fb957b989e392e762fa2125c82608a0053aff4fb97e556691646c88c335","bindings/nss_sslerr.h":"24b97f092183d8486f774cdaef5030d0249221c78343570d83a4ee5b594210ae","bindings/nss_sslopt.h":"b7807eb7abdad14db6ad7bc51048a46b065a0ea65a4508c95a12ce90e59d1eea","build.rs":"5e7fa86d565707908611b37f9ec679d29afa33cdc4d0c589e398d4240e236f68","src/aead.rs":"e26ad34f7168f42aa87eb3a6455af3191a0e8555782b1d70032fe1d248922f98","src/agent.rs":"9dae2fa87a5a7b65dfc7fdd1b2ab1be0f75f1d9ee6704b44edd9bd406252b10a","src/agentio.rs":"cc562d09a09719b90b4e1d147fd579e3e89b683448709e920033bceaea108a61","src/auth.rs":"71ac7e297a5f872d26cf67b6bbd96e4548ea38374bdd84c1094f76a5de4ed1cb","src/cert.rs":"fd3fd2bbb38754bdcee3898549feae412943c9f719032531c1ad6e61783b5394","src/constants.rs":"c39ee506a10d685fda77c1d2ddf691b595b067b4e1044ac7a21e360119d6002b","src/err.rs":"04f38831ca62d29d8aadfe9daf95fd29e68ece184e6d3e00bfb9ee1d12744033","src/exp.rs":"61586662407359c1ecb8ed4987bc3c702f26ba2e203a091a51b6d6363cbd510f","src/ext.rs":"97cba23247e5f9656f27587214f7d7370a69174bae5960a012ce3e6fc99f9116","src/hkdf.rs":"40e44f4280497ef525c2b4c465f14f06d241150851668b264ee958f74321cfbe","src/hp.rs":"974844d885d23c480d5256621053d590b331067b43ee4061e519e58487f5852b","src/lib.rs":"3b22108a069c8c9f1b78e94d48c8759b17e0941b28e2def3fa343d6acace4b6d","src/once.rs":"b9850384899a1a016e839743d3489c0d4d916e1973746ef8c89872105d7d9736","src/p11.rs":"0b62ee5938aefb82e8faee5aa14e990a00442cc9744e8ba22eda80b32030c42c","src/prio.rs":"bc4e97049563b136cb7b39f5171e7909d56a77ed46690aaacb781eeb4a4743e0","src/replay.rs":"40924865994396441a68e6009ecbdf352d6a02fdf539aa65604124e26bffb4d3","src/result.rs":"cef34dfcb907723e195b56501132e4560e250b327783cb5e41201da5b63e9b5c","src/secrets.rs":"acb5befa74e06281c6f80d7298efc58f568bb4e6d949b4225c335e3f392be741","src/selfencrypt.rs":"429cb889a4e9e2345888cc033115c0aa306d2ff90bdfe22b3067700eb1426c37","src/ssl.rs":"3e3a4f539f3c4d18bd6e774dc34fca611db0c75bba00badcd2078c975db055bf","src/time.rs":"5b2ab4028b04b6245c666f33f1c1449816d3d1eb8141f723f5773f21f8fe4388","tests/aead.rs":"a1d8eb69f5672e064f84dce3d214b347a396718e3de56d57ccc108ee87f1cbc1","tests/agent.rs":"d43e5b05dcc845394d3c7312974faae0fdcbc325c07c970aeb7ef30c3ade652e","tests/ext.rs":"eba9f03accdd598e38292ac88263a81b367d60d5a736a43117a3663de105ec48","tests/handshake.rs":"93c478fcd07d29691007abd6dcfcd2014c10c23b0206ba2d97d01594e4d64397","tests/hkdf.rs":"539235e9dcf2a56b72961a9a04f0080409adf6bf465bfad7c30026421b2d4326","tests/hp.rs":"e52a7d2f4387f2dfe8bfe1da5867e8e0d3eb51e171c6904e18b18c4343536af8","tests/init.rs":"20aad800ac793aaf83059cf860593750509fdedeeff0c08a648e7a5cb398dae0","tests/selfencrypt.rs":"46e9a1a09c2ae577eb106d23a5cdacf762575c0dea1948aedab06ef7389ce713"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-crypto/Cargo.toml firefox-85.0+build1/third_party/rust/neqo-crypto/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/neqo-crypto/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-crypto/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "neqo-crypto"
-version = "0.4.14"
+version = "0.4.16"
 authors = ["Martin Thomson <mt@lowentropy.net>"]
 edition = "2018"
 build = "build.rs"
@@ -11,7 +11,7 @@
 log = {version = "0.4.0", default-features = false}
 
 [build-dependencies]
-bindgen = {version = "0.53.2", features= ["runtime"]}
+bindgen = {version = "0.53.2", default-features = false, features= ["runtime"]}
 serde = "1.0"
 serde_derive = "1.0"
 toml = "0.4"
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-crypto/src/hp.rs firefox-85.0+build1/third_party/rust/neqo-crypto/src/hp.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-crypto/src/hp.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-crypto/src/hp.rs	2021-01-18 19:58:26.000000000 +0000
@@ -78,17 +78,25 @@
         }
     }
 
+    /// Get the sample size, which is also the output size.
+    #[allow(clippy::cast_sign_loss)]
+    #[must_use]
+    pub fn sample_size(&self) -> usize {
+        let k: *mut PK11SymKey = *self.0;
+        let mech = unsafe { PK11_GetMechanism(k) };
+        // Cast is safe because block size is always greater than or equal to 0
+        (unsafe { PK11_GetBlockSize(mech, null_mut()) }) as usize
+    }
+
     /// Generate a header protection mask for QUIC.
     ///
     /// # Errors
     /// An error is returned if the NSS functions fail; a sample of the
     /// wrong size is the obvious cause.
-    #[allow(clippy::cast_sign_loss)]
     pub fn mask(&self, sample: &[u8]) -> Res<Vec<u8>> {
         let k: *mut PK11SymKey = *self.0;
         let mech = unsafe { PK11_GetMechanism(k) };
-        // Cast is safe because block size is always greater than or equal to 0
-        let block_size = unsafe { PK11_GetBlockSize(mech, null_mut()) } as usize;
+        let block_size = self.sample_size();
 
         let mut output = vec![0_u8; block_size];
         let output_slice = &mut output[..];
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/.cargo-checksum.json firefox-85.0+build1/third_party/rust/neqo-http3/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b1729ba7146f0586ec16c7faa3584f5f644d71bb908a08a692577d02e28466ef","src/client_events.rs":"87e7c323ec2ceb759da7d6f2bf24e774f6f2e3833f63454d09cc09f47fccfa8e","src/connection.rs":"ee7c9c2cd68b11dd8c75c406d9e651b16c4722879da22c4b2606ec0391af9faf","src/connection_client.rs":"7f3e5f167581d232c814ca1f0dc3f774d7688957c1c055a23f5142bf6bb93dd9","src/connection_server.rs":"b3f4d42a984f7093fca737c64bb49c569f8f95d1586a6c02d4dba58f290ce92e","src/control_stream_local.rs":"03d6259599543da2154388d5e48efbc06271e079429d3d946278c4c58c0521c7","src/control_stream_remote.rs":"1dfac4956a7d6971e2cef2c83963d838e73aa3bf3286b7bde97099978c41d527","src/hframe.rs":"3620c6d114e6d5b98447a2dd2a7cb6872562ebda2cc6de828177b745c8dcbf4d","src/lib.rs":"772c71a6edef7a8d7dbdd6c0a30f560f35fa731eefc3e469f0c78e8680871a61","src/push_controller.rs":"3a44843f3d56246198bcc7378914941a337ddac2c2d4c389e8d0628448452aa7","src/push_stream.rs":"5f3a5c6d72c0a8e4d1c1c5041125f7aff9a65950fa60c77f42cd4b35c768f585","src/qlog.rs":"29c0e3c4c9571eb7fe905967edeb1c4bc236b1e35a0e0f11a4a847f1d246681d","src/recv_message.rs":"bc428969b69619ab5d153d455370e6a57ce03b40773ef5db4f66b760242e94fd","src/send_message.rs":"7e3f5280eca9b007b3b189134ce6832d3996f10405d396790acbced06a72af81","src/server.rs":"f369e5cae36598bb0bfa06aa5da310a55ce3c785bcb16cfb27acf4b5e98d068b","src/server_connection_events.rs":"762ddb87f700abe91ae1ae78ebbb87a88da0c0a341748b0751b01099870e9985","src/server_events.rs":"e780daa0d19d9a5594eee73f7ff27d56151a5a2ea969f2b4dcc64253e9570dab","src/settings.rs":"127a51fa7857b870718baa14340b0461d86a67e59bf1a8cb42d7bae0240c0ef1","src/stream_type_reader.rs":"aacb2e865f79b3ac55a887fd670f2286d8ffef94f7d8b3ecfa7e0cccbfa9ec04","tests/httpconn.rs":"1a97a80f7abe11c6ba0bd9b41003be6b293049164daa21e907365d93b00a782f"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"1a9556a8bd2c22ca1d8bb6312c59a60dcdf18dee50b2e3ec878f5363f956f4ec","src/client_events.rs":"87e7c323ec2ceb759da7d6f2bf24e774f6f2e3833f63454d09cc09f47fccfa8e","src/connection.rs":"a5edd447cc1005e2024690488ae700bd4ed8f3b76d1efc25560c99ff17b2bb06","src/connection_client.rs":"2882115aa375cc6182fe427d6792846222912f1a499db6ddd25dc7ec1d224d14","src/connection_server.rs":"b3f4d42a984f7093fca737c64bb49c569f8f95d1586a6c02d4dba58f290ce92e","src/control_stream_local.rs":"2e9483d79dc00a3e5ef51ea2b0f28fda2b67348996c47729947c70a8be3007ed","src/control_stream_remote.rs":"1dfac4956a7d6971e2cef2c83963d838e73aa3bf3286b7bde97099978c41d527","src/hframe.rs":"3620c6d114e6d5b98447a2dd2a7cb6872562ebda2cc6de828177b745c8dcbf4d","src/lib.rs":"faddc55396ced80d9808bdac98d4db4548651fe60b567b152067e0387825b94c","src/push_controller.rs":"3a44843f3d56246198bcc7378914941a337ddac2c2d4c389e8d0628448452aa7","src/push_stream.rs":"5f3a5c6d72c0a8e4d1c1c5041125f7aff9a65950fa60c77f42cd4b35c768f585","src/qlog.rs":"29c0e3c4c9571eb7fe905967edeb1c4bc236b1e35a0e0f11a4a847f1d246681d","src/recv_message.rs":"566c99bfd9abd948738ad26c3ec08ddd37c8caf7577fcf2ced3ccca5bcefac69","src/send_message.rs":"7e3f5280eca9b007b3b189134ce6832d3996f10405d396790acbced06a72af81","src/server.rs":"f369e5cae36598bb0bfa06aa5da310a55ce3c785bcb16cfb27acf4b5e98d068b","src/server_connection_events.rs":"762ddb87f700abe91ae1ae78ebbb87a88da0c0a341748b0751b01099870e9985","src/server_events.rs":"e780daa0d19d9a5594eee73f7ff27d56151a5a2ea969f2b4dcc64253e9570dab","src/settings.rs":"127a51fa7857b870718baa14340b0461d86a67e59bf1a8cb42d7bae0240c0ef1","src/stream_type_reader.rs":"aacb2e865f79b3ac55a887fd670f2286d8ffef94f7d8b3ecfa7e0cccbfa9ec04","tests/httpconn.rs":"1a97a80f7abe11c6ba0bd9b41003be6b293049164daa21e907365d93b00a782f"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/Cargo.toml firefox-85.0+build1/third_party/rust/neqo-http3/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "neqo-http3"
-version = "0.4.14"
+version = "0.4.16"
 authors = ["Dragana Damjanovic <dragana.damjano@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/src/connection_client.rs firefox-85.0+build1/third_party/rust/neqo-http3/src/connection_client.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/src/connection_client.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/src/connection_client.rs	2021-01-18 19:58:26.000000000 +0000
@@ -18,10 +18,11 @@
     Datagram, Decoder, Encoder, Role,
 };
 use neqo_crypto::{agent::CertificateInfo, AuthenticationStatus, ResumptionToken, SecretAgentInfo};
-use neqo_qpack::{stats::Stats, QpackSettings};
+use neqo_qpack::{QpackSettings, Stats as QpackStats};
 use neqo_transport::{
     AppError, CongestionControlAlgorithm, Connection, ConnectionEvent, ConnectionId,
-    ConnectionIdManager, Output, QuicVersion, StreamId, StreamType, ZeroRttState,
+    ConnectionIdManager, Output, QuicVersion, Stats as TransportStats, StreamId, StreamType,
+    ZeroRttState,
 };
 use std::cell::RefCell;
 use std::fmt::Display;
@@ -62,6 +63,8 @@
         QuicVersion::Draft28 => "h3-28",
         QuicVersion::Draft29 => "h3-29",
         QuicVersion::Draft30 => "h3-30",
+        QuicVersion::Draft31 => "h3-31",
+        QuicVersion::Draft32 => "h3-32",
     }
 }
 
@@ -687,15 +690,20 @@
     }
 
     #[must_use]
-    pub fn qpack_decoder_stats(&self) -> &Stats {
+    pub fn qpack_decoder_stats(&self) -> QpackStats {
         self.base_handler.qpack_decoder.stats()
     }
 
     #[must_use]
-    pub fn qpack_encoder_stats(&self) -> &Stats {
+    pub fn qpack_encoder_stats(&self) -> QpackStats {
         self.base_handler.qpack_encoder.stats()
     }
 
+    #[must_use]
+    pub fn transport_stats(&self) -> TransportStats {
+        self.conn.stats()
+    }
+
     fn reset_stream_on_error(&mut self, stream_id: u64, app_error: AppError) {
         let _ = self.conn.stream_stop_sending(stream_id, app_error);
         if let Some(rs) = self.base_handler.recv_streams.remove(&stream_id) {
@@ -732,16 +740,21 @@
     };
     use crate::hframe::{HFrame, H3_FRAME_TYPE_SETTINGS, H3_RESERVED_FRAME_TYPES};
     use crate::settings::{HSetting, HSettingType, H3_RESERVED_SETTINGS};
+    use crate::Http3Server;
     use neqo_common::{event::Provider, Datagram, Decoder, Encoder};
     use neqo_crypto::{AllowZeroRtt, AntiReplay, ResumptionToken};
     use neqo_qpack::encoder::QPackEncoder;
+    use neqo_transport::tparams::{self, TransportParameter};
     use neqo_transport::{
-        CloseError, CongestionControlAlgorithm, ConnectionEvent, FixedConnectionIdManager,
+        CloseError, CongestionControlAlgorithm, ConnectionEvent, FixedConnectionIdManager, Output,
         QuicVersion, State, RECV_BUFFER_SIZE, SEND_BUFFER_SIZE,
     };
     use std::convert::TryFrom;
     use std::time::Duration;
-    use test_fixture::{default_server_h3, fixture_init, loopback, now, DEFAULT_SERVER_NAME};
+    use test_fixture::{
+        anti_replay, default_server_h3, fixture_init, loopback, now, DEFAULT_ALPN_H3, DEFAULT_KEYS,
+        DEFAULT_SERVER_NAME,
+    };
 
     fn assert_closed(client: &Http3Client, expected: &Error) {
         match client.state() {
@@ -754,6 +767,10 @@
 
     /// Create a http3 client with default configuration.
     pub fn default_http3_client() -> Http3Client {
+        default_http3_client_param(100)
+    }
+
+    pub fn default_http3_client_param(max_table_size: u64) -> Http3Client {
         fixture_init();
         Http3Client::new(
             DEFAULT_SERVER_NAME,
@@ -764,8 +781,8 @@
             QuicVersion::default(),
             &Http3Parameters {
                 qpack_settings: QpackSettings {
-                    max_table_size_encoder: 100,
-                    max_table_size_decoder: 100,
+                    max_table_size_encoder: max_table_size,
+                    max_table_size_decoder: max_table_size,
                     max_blocked_streams: 100,
                 },
                 max_concurrent_push_streams: 5,
@@ -1036,10 +1053,18 @@
             };
             hframe.encode(encoder);
         }
+
+        pub fn set_max_uni_stream(&mut self, max_stream: u64) {
+            self.conn
+                .set_local_tparam(
+                    tparams::INITIAL_MAX_STREAMS_UNI,
+                    TransportParameter::Integer(max_stream),
+                )
+                .unwrap();
+        }
     }
 
-    // Perform only Quic transport handshake.
-    fn connect_only_transport_with(client: &mut Http3Client, server: &mut TestServer) {
+    fn handshake_only(client: &mut Http3Client, server: &mut TestServer) -> Output {
         assert_eq!(client.state(), Http3State::Initializing);
         let out = client.process(None, now());
         assert_eq!(client.state(), Http3State::Initializing);
@@ -1055,6 +1080,12 @@
         let authentication_needed = |e| matches!(e, Http3ClientEvent::AuthenticationNeeded);
         assert!(client.events().any(authentication_needed));
         client.authenticated(AuthenticationStatus::Ok, now());
+        out
+    }
+
+    // Perform only Quic transport handshake.
+    fn connect_only_transport_with(client: &mut Http3Client, server: &mut TestServer) {
+        let out = handshake_only(client, server);
 
         let out = client.process(out.dgram(), now());
         let connected = |e| matches!(e, Http3ClientEvent::StateChange(Http3State::Connected));
@@ -5778,7 +5809,7 @@
             e,
             Http3ClientEvent::Reset {
                 stream_id: request_stream_id,
-                error: Error::HttpGeneralProtocolStream.code(),
+                error: Error::InvalidHeader.code(),
                 local: true,
             }
         );
@@ -5791,7 +5822,7 @@
             matches!(e, ConnectionEvent::SendStreamStopSending {
             stream_id,
             app_error
-        } if stream_id == request_stream_id && app_error == Error::HttpGeneralProtocolStream.code())
+        } if stream_id == request_stream_id && app_error == Error::InvalidHeader.code())
         };
         assert!(server.conn.events().any(stop_sending_event));
 
@@ -5911,7 +5942,7 @@
             matches!(e, Http3ClientEvent::PushReset {
             push_id,
             error,
-        } if push_id == FIRST_PUSH_ID && error == Error::HttpGeneralProtocol.code())
+        } if push_id == FIRST_PUSH_ID && error == Error::InvalidHeader.code())
         };
 
         assert!(client.events().any(push_reset_event));
@@ -5924,8 +5955,216 @@
             matches!(e, ConnectionEvent::SendStreamStopSending {
             stream_id,
             app_error
-        } if stream_id == push_stream_id && app_error == Error::HttpGeneralProtocolStream.code())
+        } if stream_id == push_stream_id && app_error == Error::InvalidHeader.code())
         };
         assert!(server.conn.events().any(stop_sending_event));
     }
+
+    fn handshake_client_error(client: &mut Http3Client, server: &mut TestServer, error: &Error) {
+        let out = handshake_only(client, server);
+        client.process(out.dgram(), now());
+        assert_closed(&client, error);
+    }
+
+    /// Client fails to create a control stream, since server does not allow it.
+    #[test]
+    fn client_control_stream_create_failed() {
+        let mut client = default_http3_client();
+        let mut server = TestServer::new();
+        server.set_max_uni_stream(0);
+        handshake_client_error(&mut client, &mut server, &Error::StreamLimitError);
+    }
+
+    /// 2 streams isn't enough for control and QPACK streams.
+    #[test]
+    fn client_qpack_stream_create_failed() {
+        let mut client = default_http3_client();
+        let mut server = TestServer::new();
+        server.set_max_uni_stream(2);
+        handshake_client_error(&mut client, &mut server, &Error::StreamLimitError);
+    }
+
+    fn do_malformed_response_test(headers: &[Header]) {
+        let (mut client, mut server, request_stream_id) = connect_and_send_request(true);
+
+        setup_server_side_encoder(&mut client, &mut server);
+
+        let mut d = Encoder::default();
+        server.encode_headers(request_stream_id, &headers, &mut d);
+
+        // Send response
+        server_send_response_and_exchange_packet(
+            &mut client,
+            &mut server,
+            request_stream_id,
+            &d,
+            false,
+        );
+
+        // Stream has been reset because of the malformed headers.
+        let e = client.events().next().unwrap();
+        assert_eq!(
+            e,
+            Http3ClientEvent::Reset {
+                stream_id: request_stream_id,
+                error: Error::InvalidHeader.code(),
+                local: true,
+            }
+        );
+    }
+
+    #[test]
+    fn malformed_response_pseudo_header_after_regular_header() {
+        do_malformed_response_test(&[
+            (String::from("content-type"), String::from("text/plain")),
+            (String::from(":status"), String::from("100")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_undefined_pseudo_header() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from(":cheese"), String::from("200")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_duplicate_pseudo_header() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from(":status"), String::from("100")),
+            (String::from("content-type"), String::from("text/plain")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_uppercase_header() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from("content-Type"), String::from("text/plain")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_excluded_header() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from("content-type"), String::from("text/plain")),
+            (String::from("connection"), String::from("close")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_excluded_byte_in_header() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from("content:type"), String::from("text/plain")),
+        ]);
+    }
+
+    #[test]
+    fn malformed_response_request_header_in_response() {
+        do_malformed_response_test(&[
+            (String::from(":status"), String::from("200")),
+            (String::from(":method"), String::from("GET")),
+            (String::from("content-type"), String::from("text/plain")),
+        ]);
+    }
+
+    fn maybe_authenticate(conn: &mut Http3Client) {
+        let authentication_needed = |e| matches!(e, Http3ClientEvent::AuthenticationNeeded);
+        if conn.events().any(authentication_needed) {
+            conn.authenticated(AuthenticationStatus::Ok, now());
+        }
+    }
+
+    const MAX_TABLE_SIZE: u64 = 65536;
+    const MAX_BLOCKED_STREAMS: u16 = 5;
+
+    fn get_resumption_token(server: &mut Http3Server) -> ResumptionToken {
+        let mut client = default_http3_client_param(MAX_TABLE_SIZE);
+
+        let mut datagram = None;
+        let is_done = |c: &Http3Client| matches!(c.state(), Http3State::Connected);
+        while !is_done(&mut client) {
+            maybe_authenticate(&mut client);
+            datagram = client.process(datagram, now()).dgram();
+            datagram = server.process(datagram, now()).dgram();
+        }
+
+        // exchange qpack settings, server will send a token as well.
+        datagram = client.process(datagram, now()).dgram();
+        datagram = server.process(datagram, now()).dgram();
+        let _ = client.process(datagram, now()).dgram();
+
+        client
+            .events()
+            .find_map(|e| {
+                if let Http3ClientEvent::ResumptionToken(token) = e {
+                    Some(token)
+                } else {
+                    None
+                }
+            })
+            .unwrap()
+    }
+
+    // Test that decoder stream type is always sent before any other instruction also
+    // in case when 0RTT is used.
+    // A client will send a request that uses the dynamic table. This will trigger a header-ack
+    // from a server. We will use stats to check that a header-ack has been received.
+    #[test]
+    fn zerortt_request_use_dynamic_table() {
+        let mut server = Http3Server::new(
+            now(),
+            DEFAULT_KEYS,
+            DEFAULT_ALPN_H3,
+            anti_replay(),
+            Rc::new(RefCell::new(FixedConnectionIdManager::new(5))),
+            QpackSettings {
+                max_table_size_encoder: MAX_TABLE_SIZE,
+                max_table_size_decoder: MAX_TABLE_SIZE,
+                max_blocked_streams: MAX_BLOCKED_STREAMS,
+            },
+        )
+        .unwrap();
+
+        let token = get_resumption_token(&mut server);
+        // Make a new connection.
+        let mut client = default_http3_client_param(MAX_TABLE_SIZE);
+        assert_eq!(client.state(), Http3State::Initializing);
+        client
+            .enable_resumption(now(), &token)
+            .expect("Set resumption token.");
+
+        assert_eq!(client.state(), Http3State::ZeroRtt);
+        let zerortt_event = |e| matches!(e, Http3ClientEvent::StateChange(Http3State::ZeroRtt));
+        assert!(client.events().any(zerortt_event));
+
+        // Make a request that uses the dynamic table.
+        let _ = make_request(
+            &mut client,
+            true,
+            &[(String::from("myheaders"), String::from("myvalue"))],
+        );
+        // Assert that the request has used dynamic table. That will trigger a header_ack.
+        assert_eq!(client.qpack_encoder_stats().dynamic_table_references, 1);
+
+        // Exchange packets until header-ack is received.
+        // These many packet exchange is needed, to get a header-ack.
+        // TODO this may be optimize at Http3Server.
+        let out = client.process(None, now()).dgram();
+        let out = server.process(out, now()).dgram();
+        let out = client.process(out, now()).dgram();
+        let out = server.process(out, now()).dgram();
+        let out = client.process(out, now()).dgram();
+        let out = server.process(out, now()).dgram();
+        let out = client.process(out, now()).dgram();
+        let out = server.process(out, now()).dgram();
+        let _ = client.process(out, now());
+
+        // The header ack for the first request has been received.
+        assert_eq!(client.qpack_encoder_stats().header_acks_recv, 1);
+    }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/src/connection.rs firefox-85.0+build1/third_party/rust/neqo-http3/src/connection.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/src/connection.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/src/connection.rs	2021-01-18 19:58:26.000000000 +0000
@@ -90,7 +90,7 @@
         Self {
             state: Http3State::Initializing,
             local_qpack_settings,
-            control_stream_local: ControlStreamLocal::default(),
+            control_stream_local: ControlStreamLocal::new(),
             control_stream_remote: ControlStreamRemote::new(),
             new_streams: HashMap::new(),
             qpack_encoder: QPackEncoder::new(local_qpack_settings, true),
@@ -421,7 +421,7 @@
     pub fn handle_zero_rtt_rejected(&mut self) -> Res<()> {
         if self.state == Http3State::ZeroRtt {
             self.state = Http3State::Initializing;
-            self.control_stream_local = ControlStreamLocal::default();
+            self.control_stream_local = ControlStreamLocal::new();
             self.control_stream_remote = ControlStreamRemote::new();
             self.new_streams.clear();
             self.qpack_encoder = QPackEncoder::new(self.local_qpack_settings, true);
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/src/control_stream_local.rs firefox-85.0+build1/third_party/rust/neqo-http3/src/control_stream_local.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/src/control_stream_local.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/src/control_stream_local.rs	2021-01-18 19:58:26.000000000 +0000
@@ -8,11 +8,12 @@
 use crate::Res;
 use neqo_common::{qtrace, Encoder};
 use neqo_transport::{Connection, StreamType};
+use std::convert::TryFrom;
 
 pub const HTTP3_UNI_STREAM_TYPE_CONTROL: u64 = 0x0;
 
 // The local control stream, responsible for encoding frames and sending them
-#[derive(Default, Debug)]
+#[derive(Debug)]
 pub(crate) struct ControlStreamLocal {
     stream_id: Option<u64>,
     buf: Vec<u8>,
@@ -25,6 +26,13 @@
 }
 
 impl ControlStreamLocal {
+    pub fn new() -> Self {
+        Self {
+            stream_id: None,
+            buf: vec![u8::try_from(HTTP3_UNI_STREAM_TYPE_CONTROL).unwrap()],
+        }
+    }
+
     /// Add a new frame that needs to be send.
     pub fn queue_frame(&mut self, f: &HFrame) {
         let mut enc = Encoder::default();
@@ -53,9 +61,6 @@
     pub fn create(&mut self, conn: &mut Connection) -> Res<()> {
         qtrace!([self], "Create a control stream.");
         self.stream_id = Some(conn.stream_create(StreamType::UniDi)?);
-        let mut enc = Encoder::default();
-        enc.encode_varint(HTTP3_UNI_STREAM_TYPE_CONTROL);
-        self.buf.append(&mut enc.into());
         Ok(())
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/src/lib.rs firefox-85.0+build1/third_party/rust/neqo-http3/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -82,6 +82,7 @@
     TransportStreamDoesNotExist,
     InvalidInput,
     FatalError,
+    InvalidHeader,
 }
 
 impl Error {
@@ -89,7 +90,9 @@
     pub fn code(&self) -> AppError {
         match self {
             Self::HttpNoError => 0x100,
-            Self::HttpGeneralProtocol | Self::HttpGeneralProtocolStream => 0x101,
+            Self::HttpGeneralProtocol | Self::HttpGeneralProtocolStream | Self::InvalidHeader => {
+                0x101
+            }
             Self::HttpInternal => 0x102,
             Self::HttpStreamCreation => 0x103,
             Self::HttpClosedCriticalStream => 0x104,
@@ -131,7 +134,7 @@
 
     #[must_use]
     pub fn stream_reset_error(&self) -> bool {
-        matches!(self, Self::HttpGeneralProtocolStream)
+        matches!(self, Self::HttpGeneralProtocolStream | Self::InvalidHeader)
     }
 
     #[must_use]
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-http3/src/recv_message.rs firefox-85.0+build1/third_party/rust/neqo-http3/src/recv_message.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-http3/src/recv_message.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-http3/src/recv_message.rs	2021-01-18 19:58:26.000000000 +0000
@@ -20,6 +20,13 @@
 use std::fmt::Debug;
 use std::rc::Rc;
 
+const PSEUDO_HEADER_STATUS: u8 = 0x1;
+const PSEUDO_HEADER_METHOD: u8 = 0x2;
+const PSEUDO_HEADER_SCHEME: u8 = 0x4;
+const PSEUDO_HEADER_AUTHORITY: u8 = 0x8;
+const PSEUDO_HEADER_PATH: u8 = 0x10;
+const REGULAR_HEADER: u8 = 0x80;
+
 #[derive(Debug)]
 pub enum MessageType {
     Request,
@@ -142,7 +149,7 @@
         decoder: &mut QPackDecoder,
     ) -> Res<()> {
         let interim = self.is_interim(&headers)?;
-
+        let _valid = self.headers_valid(&headers)?;
         if fin && interim {
             return Err(Error::HttpGeneralProtocolStream);
         }
@@ -325,17 +332,96 @@
             MessageType::Response => {
                 let status = headers.iter().find(|(name, _value)| name == ":status");
                 if let Some((_name, value)) = status {
-                    let status_code = value
-                        .parse::<i32>()
-                        .map_err(|_| Error::HttpGeneralProtocolStream)?;
+                    let status_code = value.parse::<i32>().map_err(|_| Error::InvalidHeader)?;
                     Ok(status_code >= 100 && status_code < 200)
                 } else {
-                    Err(Error::HttpGeneralProtocolStream)
+                    Err(Error::InvalidHeader)
                 }
             }
             MessageType::Request => Ok(false),
         }
     }
+
+    fn track_pseudo(name: &str, state: &mut u8, message_type: &MessageType) -> Res<bool> {
+        let (pseudo, bit) = if name.starts_with(':') {
+            if *state & REGULAR_HEADER != 0 {
+                return Err(Error::InvalidHeader);
+            }
+            let bit = match message_type {
+                MessageType::Response => match name {
+                    ":status" => PSEUDO_HEADER_STATUS,
+                    _ => return Err(Error::InvalidHeader),
+                },
+                MessageType::Request => match name {
+                    ":method" => PSEUDO_HEADER_METHOD,
+                    ":scheme" => PSEUDO_HEADER_SCHEME,
+                    ":authority" => PSEUDO_HEADER_AUTHORITY,
+                    ":path" => PSEUDO_HEADER_PATH,
+                    _ => return Err(Error::InvalidHeader),
+                },
+            };
+            (true, bit)
+        } else {
+            (false, REGULAR_HEADER)
+        };
+
+        if *state & bit == 0 || !pseudo {
+            *state |= bit;
+            Ok(pseudo)
+        } else {
+            Err(Error::InvalidHeader)
+        }
+    }
+
+    fn headers_valid(&self, headers: &[Header]) -> Res<bool> {
+        let mut method_value: Option<&String> = None;
+        let mut pseudo_state = 0;
+        for header in headers {
+            let is_pseudo = Self::track_pseudo(&header.0, &mut pseudo_state, &self.message_type)?;
+
+            let mut bytes = header.0.bytes();
+            if is_pseudo {
+                if header.0 == ":method" {
+                    method_value = Some(&header.1);
+                }
+                let _ = bytes.next();
+            }
+
+            if bytes.any(|b| matches!(b, 0 | 0x10 | 0x13 | 0x3a | 0x41..=0x5a)) {
+                return Err(Error::InvalidHeader); // illegal characters.
+            }
+
+            if matches!(
+                header.0.as_str(),
+                "connection"
+                    | "host"
+                    | "keep-alive"
+                    | "proxy-connection"
+                    | "te"
+                    | "transfer-encoding"
+                    | "upgrade"
+            ) {
+                return Err(Error::InvalidHeader);
+            }
+        }
+        // Clear the regular header bit, since we only check pseudo headers below.
+        pseudo_state &= !REGULAR_HEADER;
+        let pseudo_header_mask = match self.message_type {
+            MessageType::Response => PSEUDO_HEADER_STATUS,
+            MessageType::Request => {
+                if method_value == Some(&"CONNECT".to_string()) {
+                    PSEUDO_HEADER_METHOD | PSEUDO_HEADER_AUTHORITY
+                } else {
+                    PSEUDO_HEADER_METHOD | PSEUDO_HEADER_SCHEME | PSEUDO_HEADER_PATH
+                }
+            }
+        };
+        if pseudo_state & pseudo_header_mask != pseudo_header_mask {
+            return Err(Error::InvalidHeader);
+        }
+
+        Ok(true)
+    }
 }
 
 impl RecvStream for RecvMessage {
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/.cargo-checksum.json firefox-85.0+build1/third_party/rust/neqo-qpack/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"fa417a52bf7190cd40dc13f921b40ade2ee3b7d95d00586938f3a4386fc1eaf4","src/decoder.rs":"e57f30c5e3a4e4f8b52b44c6bdf5f34ab8780cc4a18f89328af03c456eeef4f4","src/decoder_instructions.rs":"a8e04dff5fc4c658322a10daadab947dc2e41932c00c3f8d387671a86d0516af","src/encoder.rs":"0daf6111bb00dd93d724a664697f87bd3c92a0d154cfbd882016110995677466","src/encoder_instructions.rs":"1d4424bf21c0ac26b7c8fee6450b943346c5493ab86dd7ec2edc5f566454721e","src/header_block.rs":"f935872919154f678947732270d688be4790309f9e390a0c8eb6c9484a41a8dd","src/huffman.rs":"68fa0bada0c35d20f793980596accdcc548970214841f71789290fc334e51fc1","src/huffman_decode_helper.rs":"2970c57f052878b727c2f764490c54184f5c2608e1d6aa961c3b01509e290122","src/huffman_table.rs":"06fea766a6276ac56c7ee0326faed800a742c15fda1f33bf2513e6cc6a5e6d27","src/lib.rs":"b4270c5fc95e814d3fe2177be56f7d6a791b0ec25edefdce9c4dd4f92035bf6e","src/prefix.rs":"72c587c40aef4ed38cf13b2de91091d671611679be2a9da6f0b24abafaf50dc5","src/qlog.rs":"7618085e27bb3fb1f4d1c73ba501b9a293723293c4020b7cc4129676eb278131","src/qpack_send_buf.rs":"5170b93afaf0c1609463e6c5ae4dccb1a2ce4e4407296db1bcaf06c6b5bb97ab","src/reader.rs":"4bcea0de1d7dc09ec0cdff364d8f62da54bbbe1f6db55a495f943f31369b4074","src/static_table.rs":"fda9d5c6f38f94b0bf92d3afdf8432dce6e27e189736596e16727090c77b78ec","src/stats.rs":"bc82c8f86b54981be234948e285af3d778ba9d23ddaaf2fbedf9c03121eaada7","src/table.rs":"f7091bdd9ad1f8fe3b2298a7dbfd3d285c212d69569cda54f9bcf251cb758a21"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"2629bfcfe7d51690ba7cac0db84944bbf6adf51e0de62b8a165472d512d88be7","src/decoder.rs":"31fc99c0772d241949eddd4572a8b1911525bd9caecf27f9073e6dc381df41b7","src/decoder_instructions.rs":"a8e04dff5fc4c658322a10daadab947dc2e41932c00c3f8d387671a86d0516af","src/encoder.rs":"396f004d3aa2ce221392fd521f77d7ec8967b0fb405b8ffd7bfcc31f30cb0e60","src/encoder_instructions.rs":"1d4424bf21c0ac26b7c8fee6450b943346c5493ab86dd7ec2edc5f566454721e","src/header_block.rs":"f935872919154f678947732270d688be4790309f9e390a0c8eb6c9484a41a8dd","src/huffman.rs":"68fa0bada0c35d20f793980596accdcc548970214841f71789290fc334e51fc1","src/huffman_decode_helper.rs":"2970c57f052878b727c2f764490c54184f5c2608e1d6aa961c3b01509e290122","src/huffman_table.rs":"06fea766a6276ac56c7ee0326faed800a742c15fda1f33bf2513e6cc6a5e6d27","src/lib.rs":"88fba397ddf2a8f0d6b55b9a8852c715fe884e7e2808729f69df11dcc03b0356","src/prefix.rs":"72c587c40aef4ed38cf13b2de91091d671611679be2a9da6f0b24abafaf50dc5","src/qlog.rs":"7618085e27bb3fb1f4d1c73ba501b9a293723293c4020b7cc4129676eb278131","src/qpack_send_buf.rs":"5170b93afaf0c1609463e6c5ae4dccb1a2ce4e4407296db1bcaf06c6b5bb97ab","src/reader.rs":"4bcea0de1d7dc09ec0cdff364d8f62da54bbbe1f6db55a495f943f31369b4074","src/static_table.rs":"fda9d5c6f38f94b0bf92d3afdf8432dce6e27e189736596e16727090c77b78ec","src/stats.rs":"624dfa3b40858c304097bb0ce5b1be1bb4d7916b1abfc222f1aa705907009730","src/table.rs":"f7091bdd9ad1f8fe3b2298a7dbfd3d285c212d69569cda54f9bcf251cb758a21"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/Cargo.toml firefox-85.0+build1/third_party/rust/neqo-qpack/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "neqo-qpack"
-version = "0.4.14"
+version = "0.4.16"
 authors = ["Dragana Damjanovic <dragana.damjano@gmail.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/decoder.rs firefox-85.0+build1/third_party/rust/neqo-qpack/src/decoder.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/decoder.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/src/decoder.rs	2021-01-18 19:58:26.000000000 +0000
@@ -37,12 +37,14 @@
     #[must_use]
     pub fn new(qpack_settings: QpackSettings) -> Self {
         qdebug!("Decoder: creating a new qpack decoder.");
+        let mut send_buf = QPData::default();
+        send_buf.encode_varint(QPACK_UNI_STREAM_TYPE_DECODER);
         Self {
             instruction_reader: EncoderInstructionReader::new(),
             table: HeaderTable::new(false),
             acked_inserts: 0,
             max_entries: qpack_settings.max_table_size_decoder >> 5,
-            send_buf: QPData::default(),
+            send_buf,
             local_stream_id: None,
             remote_stream_id: None,
             max_table_size: qpack_settings.max_table_size_decoder,
@@ -233,7 +235,6 @@
             panic!("Adding multiple local streams");
         }
         self.local_stream_id = Some(stream_id);
-        self.send_buf.encode_varint(QPACK_UNI_STREAM_TYPE_DECODER);
     }
 
     /// # Errors
@@ -258,8 +259,8 @@
     }
 
     #[must_use]
-    pub fn stats(&self) -> &Stats {
-        &self.stats
+    pub fn stats(&self) -> Stats {
+        self.stats.clone()
     }
 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/encoder.rs firefox-85.0+build1/third_party/rust/neqo-qpack/src/encoder.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/encoder.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/src/encoder.rs	2021-01-18 19:58:26.000000000 +0000
@@ -164,6 +164,7 @@
     }
 
     fn header_ack(&mut self, stream_id: u64) -> Res<()> {
+        self.stats.header_acks_recv += 1;
         let mut new_acked = self.table.get_acked_inserts_cnt();
         if let Some(hb_list) = self.unacked_header_blocks.get_mut(&stream_id) {
             if let Some(ref_list) = hb_list.pop_back() {
@@ -188,6 +189,7 @@
     }
 
     fn stream_cancellation(&mut self, stream_id: u64) -> Res<()> {
+        self.stats.stream_cancelled_recv += 1;
         let mut was_blocker = false;
         if let Some(hb_list) = self.unacked_header_blocks.get_mut(&stream_id) {
             debug_assert!(!hb_list.is_empty());
@@ -223,7 +225,6 @@
             }
             DecoderInstruction::HeaderAck { stream_id } => self.header_ack(stream_id),
             DecoderInstruction::StreamCancellation { stream_id } => {
-                self.stats.stream_cancelled_recv += 1;
                 self.stream_cancellation(stream_id)
             }
             _ => Ok(()),
@@ -477,8 +478,8 @@
     }
 
     #[must_use]
-    pub fn stats(&self) -> &Stats {
-        &self.stats
+    pub fn stats(&self) -> Stats {
+        self.stats.clone()
     }
 
     #[must_use]
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/lib.rs firefox-85.0+build1/third_party/rust/neqo-qpack/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -24,11 +24,12 @@
 mod qpack_send_buf;
 pub mod reader;
 mod static_table;
-pub mod stats;
+mod stats;
 mod table;
 
 pub use decoder::QPackDecoder;
 pub use encoder::QPackEncoder;
+pub use stats::Stats;
 
 pub type Header = (String, String);
 type Res<T> = Result<T, Error>;
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/stats.rs firefox-85.0+build1/third_party/rust/neqo-qpack/src/stats.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-qpack/src/stats.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-qpack/src/stats.rs	2021-01-18 19:58:26.000000000 +0000
@@ -6,11 +6,12 @@
 
 // Tracking of some useful statistics.
 
-#[derive(Default, Debug)]
+#[derive(Default, Debug, Clone)]
 /// `QPack` statistics
 pub struct Stats {
     pub dynamic_table_inserts: usize,
     // This is the munber of header blockes that reference the dynamic table.
     pub dynamic_table_references: usize,
     pub stream_cancelled_recv: usize,
+    pub header_acks_recv: usize,
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/.cargo-checksum.json firefox-85.0+build1/third_party/rust/neqo-transport/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"9e69f568d271290db9bf33d044c5bf41f1274c185226fe5711187ad29bedc8f1","TODO":"d759cb804b32fa9d96ea8d3574a3c4073da9fe6a0b02b708a0e22cce5a5b4a0f","src/addr_valid.rs":"1b3bef8edf87d29dc630bda7a8fdb6287093612cd8da4756f1a0e2473bb01b0f","src/cc/classic_cc.rs":"d0c55a2645d9b0ec59d8227f4340e26e8922376d68402fabcacbd13fd6b10293","src/cc/mod.rs":"36e9018f70507a80404764e646467f769f9ad0d87d5ff806450ae242dcfd18a5","src/cc/new_reno.rs":"4734a85122dae88a087952ce1f9ef006aea8405a2bc1d4a0565c5bfd238e4ef4","src/cid.rs":"e231286df599b9ee7cbae8cab274908e0197baf2b2e88bea9d8f40dbeb02c57d","src/connection/idle.rs":"e3c902858737de89e2e8955796c6e60dcfbcffaf58b3a1c4473fed04c7eae55c","src/connection/mod.rs":"d1869a2fff3e5edd96bd123ec0a5f4bd48a8d88133f4dad64ef445886fd1d6ce","src/connection/saved.rs":"94f9823182e91de5919b5dfb3978a2e0655eb5748594bf24d324877039c78372","src/connection/state.rs":"52b8def3097cb949888796cb07cea5cf0bb3e045fc2b22a4ca7b181e87db3640","src/connection/tests/cc.rs":"57c47c8ef7a13df2dee330951d79746fe7e995e39fc9c2d009b99f800cb8ff31","src/connection/tests/close.rs":"ddab204ae0c88bac55aed02c5eff3c793a53113dd07b489bdb7a07867df4aeac","src/connection/tests/handshake.rs":"ab244675df5add3bd4ed58f3511cd2c9c8db75e02f2b99ab92cb902e9e8940c4","src/connection/tests/idle.rs":"7c73be2a1079d2ee66960d403076b059356736b35bba657f278348493068a6a5","src/connection/tests/keys.rs":"029e0cb2a043828059f006d0e17eb36b7d978c48d16340a80711e144a709245e","src/connection/tests/mod.rs":"5ee29828f06cc92cca582206fdf5ad2254d74a93b3467222b3f3d846edb33158","src/connection/tests/recovery.rs":"f6dbdeeaec18510c0f9345ee25947c0ed988b14fddf30e124dfe6d1b9a160a71","src/connection/tests/resumption.rs":"538c0ecb7eed22ea9c22882e934bf91cc87c064c6d4286e5cc7fbbaecbc650fc","src/connection/tests/stream.rs":"37e91c34851e85763684afceca9a8498101602d629e161d99e10248f3b908a81","src/connection/tests/vn.rs":"ffb1c34be57b2cae704b387a2599cedeb1a8775d5a5e48eb0d0113d767c4e6a6","src/connection/tests/zerortt.rs":"8c5e874b36e34306f640ba7fc760d38847292b399f6eec97b565de12b77cbd76","src/crypto.rs":"d254c11595311b24f81ace1d6b5f4ec8f275c409b392361ef9b6d3ea1ea362bc","src/dump.rs":"d69ccb0e3b240823b886a791186afbac9f2e26d1f1f67a55dbf86f8cd3e6203e","src/events.rs":"6d1e168eb8c425018281e82ba3ff05ea0321035eb677f1d1bdd19fe32c1e62ce","src/flow_mgr.rs":"4f667a5b8574c248e7422aaac3492d89f4a2e7e202a19083b9f84cf129e49037","src/frame.rs":"d2d175fb058c4157c8717595784c2ab26df8ae9b5e2ba2e99d579203314991c0","src/lib.rs":"580c2065f035c5759d3ee9f735ade6dbf86a5351000a4e86f61fa40001e00c27","src/pace.rs":"eb9094cfcae54162022f70f230b6a9811add0063b878100f147a9365473f6612","src/packet/mod.rs":"ab37449f8bff0c86a3affe66fdc22a34b077b815e0fedb3658cfca411fdb6d07","src/packet/retry.rs":"0473f4b93f506a9a6c6a72ea20c0d0811b98e42d1f92a412821180cf3b6916fa","src/path.rs":"92b2701d1e486250f472b2cdc487b1e9e9c8753c9c40b626c2d6d1ccd6e70c38","src/qlog.rs":"b2853fdc7acfb86c8b802a39f32b0462dd82bf86f5c427ffdb523be933268532","src/recovery.rs":"e2a1c81e7f34209d7463d5587bfae7d5e4de565586d52565ac32d80fb3f14c70","src/recv_stream.rs":"71143d3ce2670d55dbc5cf7ecd9d3b5826a3060029162f335fffd197bedf149f","src/send_stream.rs":"4c019d99cdb1ad76bc5434fbde009371a49ef61138e84609595686af8e2ca651","src/sender.rs":"fdb16a6c44473dbd2dce3f0982f467e4cc8af579b9bd2abf2f3444845d2c07d0","src/server.rs":"cdb0eb1e194110a39335e75018b861e34fab855adf76fb218c7b982bd10f7833","src/stats.rs":"2f99e4e545e7df0b69aec5e1153cb5b0d2e274a9ead1e8d1cccbf4217109c7a9","src/stream_id.rs":"98f656157e0eeb7f32802cf2b3dbd68ef8d7a89578a097a88db7157d4a712202","src/tparams.rs":"d4a69bff044f51acab5dcbe56531bfd5eee79b99908c79074409d38ead8d3467","src/tracking.rs":"7dfe2f6702609361348eeddfc0ea61b9a58c31d88884adfe5c550d94cdbc2268","tests/conn_vectors.rs":"d5bd7ba17dfd3f7c6fe421ebd346ba7df8ddc08756fa7a747ecba52bcca6a7f0","tests/connection.rs":"fe9b7069b34fea7f5154e9b1ea3bffb290a4aa9a7c97c30992c51fa7a6ad6673","tests/network.rs":"a986c22da7132ec843a44c4bcb5a7d2726132aa27a47a8ea91634cd88e1b763b","tests/server.rs":"142eaf443650e0d2a6cb75e439c65fa35313d574946ac6d604861bf8866190de","tests/sim/connection.rs":"5e65e7247f69ad9d992cffc9daac6a8af360c6c312e6588da07478337a12819f","tests/sim/delay.rs":"9efa722adb89e37262369e9f3c67405f0acc8c24997271811e48df9e856e5a8d","tests/sim/drop.rs":"bd89e5c71cdd1b27cd755faaedd87d5feadf2f424df721a7df41a51bcebcbb58","tests/sim/mod.rs":"9a930682cf92e7279bccdd2145f19ff17f5aa950994e7b3e25749651511c2753","tests/sim/net.rs":"597f4d37bc26c3d82eeeaa6d14dd03bc2be3930686df2b293748b43c07c497d7","tests/sim/rng.rs":"2c90b0bbaf0c952ebee232deb3594f7a86af387737b15474de3e97ee6b623d90","tests/sim/taildrop.rs":"5c505d150f0071e8cc2d540b3a817a6942fdf13df32f1fbc6822952f2e146176"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"6ddd785466d6e5d5076c6ea258565257f373eb20d4aa2d98d9ee23a67e3d2fa5","TODO":"d759cb804b32fa9d96ea8d3574a3c4073da9fe6a0b02b708a0e22cce5a5b4a0f","src/addr_valid.rs":"1b3bef8edf87d29dc630bda7a8fdb6287093612cd8da4756f1a0e2473bb01b0f","src/cc/classic_cc.rs":"d0c55a2645d9b0ec59d8227f4340e26e8922376d68402fabcacbd13fd6b10293","src/cc/mod.rs":"36e9018f70507a80404764e646467f769f9ad0d87d5ff806450ae242dcfd18a5","src/cc/new_reno.rs":"4734a85122dae88a087952ce1f9ef006aea8405a2bc1d4a0565c5bfd238e4ef4","src/cid.rs":"e231286df599b9ee7cbae8cab274908e0197baf2b2e88bea9d8f40dbeb02c57d","src/connection/idle.rs":"e3c902858737de89e2e8955796c6e60dcfbcffaf58b3a1c4473fed04c7eae55c","src/connection/mod.rs":"2514c70e05e66c3dc5ca7c3f07feed29332f23cc1a78327bc06fafabdde28103","src/connection/saved.rs":"b70f81635e210102208790ef308a0dea4b7e87900e6083ca6b299d4c1d5b9058","src/connection/state.rs":"52b8def3097cb949888796cb07cea5cf0bb3e045fc2b22a4ca7b181e87db3640","src/connection/tests/cc.rs":"57c47c8ef7a13df2dee330951d79746fe7e995e39fc9c2d009b99f800cb8ff31","src/connection/tests/close.rs":"ddab204ae0c88bac55aed02c5eff3c793a53113dd07b489bdb7a07867df4aeac","src/connection/tests/handshake.rs":"0b1025a5e21ade6382e9b9ae5a8bf13fcd5f62b80874fa6defc54327bca2a575","src/connection/tests/idle.rs":"7c73be2a1079d2ee66960d403076b059356736b35bba657f278348493068a6a5","src/connection/tests/keys.rs":"029e0cb2a043828059f006d0e17eb36b7d978c48d16340a80711e144a709245e","src/connection/tests/mod.rs":"5ee29828f06cc92cca582206fdf5ad2254d74a93b3467222b3f3d846edb33158","src/connection/tests/recovery.rs":"f6dbdeeaec18510c0f9345ee25947c0ed988b14fddf30e124dfe6d1b9a160a71","src/connection/tests/resumption.rs":"538c0ecb7eed22ea9c22882e934bf91cc87c064c6d4286e5cc7fbbaecbc650fc","src/connection/tests/stream.rs":"37e91c34851e85763684afceca9a8498101602d629e161d99e10248f3b908a81","src/connection/tests/vn.rs":"ffb1c34be57b2cae704b387a2599cedeb1a8775d5a5e48eb0d0113d767c4e6a6","src/connection/tests/zerortt.rs":"8c5e874b36e34306f640ba7fc760d38847292b399f6eec97b565de12b77cbd76","src/crypto.rs":"ed07cd03f9bcbbcba770f42062e72b2957bf1fb098c77d23e7a03c4ddc6fe213","src/dump.rs":"d69ccb0e3b240823b886a791186afbac9f2e26d1f1f67a55dbf86f8cd3e6203e","src/events.rs":"6d1e168eb8c425018281e82ba3ff05ea0321035eb677f1d1bdd19fe32c1e62ce","src/flow_mgr.rs":"4f667a5b8574c248e7422aaac3492d89f4a2e7e202a19083b9f84cf129e49037","src/frame.rs":"d2d175fb058c4157c8717595784c2ab26df8ae9b5e2ba2e99d579203314991c0","src/lib.rs":"580c2065f035c5759d3ee9f735ade6dbf86a5351000a4e86f61fa40001e00c27","src/pace.rs":"eb9094cfcae54162022f70f230b6a9811add0063b878100f147a9365473f6612","src/packet/mod.rs":"928e67a595bcbc2512c45374e6b84332832e87a1e4309f72d3f7604c24a76817","src/packet/retry.rs":"670b2d3363121a7a98fb6efe186c3818786093502b53b7d9d104368de3376555","src/path.rs":"92b2701d1e486250f472b2cdc487b1e9e9c8753c9c40b626c2d6d1ccd6e70c38","src/qlog.rs":"b2853fdc7acfb86c8b802a39f32b0462dd82bf86f5c427ffdb523be933268532","src/recovery.rs":"c65092d01e75d640bfb465c36ce9b6285e080da1608a4fe0c83ace64c639254a","src/recv_stream.rs":"71143d3ce2670d55dbc5cf7ecd9d3b5826a3060029162f335fffd197bedf149f","src/send_stream.rs":"4c019d99cdb1ad76bc5434fbde009371a49ef61138e84609595686af8e2ca651","src/sender.rs":"fdb16a6c44473dbd2dce3f0982f467e4cc8af579b9bd2abf2f3444845d2c07d0","src/server.rs":"cdb0eb1e194110a39335e75018b861e34fab855adf76fb218c7b982bd10f7833","src/stats.rs":"4a3b5560dbb6a32414b80cc82c062c9a64e5f7aba75416f0208a2477f355e6f0","src/stream_id.rs":"98f656157e0eeb7f32802cf2b3dbd68ef8d7a89578a097a88db7157d4a712202","src/tparams.rs":"d4a69bff044f51acab5dcbe56531bfd5eee79b99908c79074409d38ead8d3467","src/tracking.rs":"7dfe2f6702609361348eeddfc0ea61b9a58c31d88884adfe5c550d94cdbc2268","tests/conn_vectors.rs":"d5bd7ba17dfd3f7c6fe421ebd346ba7df8ddc08756fa7a747ecba52bcca6a7f0","tests/connection.rs":"fe9b7069b34fea7f5154e9b1ea3bffb290a4aa9a7c97c30992c51fa7a6ad6673","tests/network.rs":"a986c22da7132ec843a44c4bcb5a7d2726132aa27a47a8ea91634cd88e1b763b","tests/server.rs":"9eda88cbf7840b829ae62dcbe2eec381b42a3a00c915cfb371047c60d4677664","tests/sim/connection.rs":"5e65e7247f69ad9d992cffc9daac6a8af360c6c312e6588da07478337a12819f","tests/sim/delay.rs":"9efa722adb89e37262369e9f3c67405f0acc8c24997271811e48df9e856e5a8d","tests/sim/drop.rs":"bd89e5c71cdd1b27cd755faaedd87d5feadf2f424df721a7df41a51bcebcbb58","tests/sim/mod.rs":"9a930682cf92e7279bccdd2145f19ff17f5aa950994e7b3e25749651511c2753","tests/sim/net.rs":"597f4d37bc26c3d82eeeaa6d14dd03bc2be3930686df2b293748b43c07c497d7","tests/sim/rng.rs":"2c90b0bbaf0c952ebee232deb3594f7a86af387737b15474de3e97ee6b623d90","tests/sim/taildrop.rs":"5c505d150f0071e8cc2d540b3a817a6942fdf13df32f1fbc6822952f2e146176"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/Cargo.toml firefox-85.0+build1/third_party/rust/neqo-transport/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/Cargo.toml	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,6 +1,6 @@
 [package]
 name = "neqo-transport"
-version = "0.4.14"
+version = "0.4.16"
 authors = ["EKR <ekr@rtfm.com>", "Andy Grover <agrover@mozilla.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/mod.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/mod.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -716,12 +716,18 @@
         self.crypto.tls.peer_certificate()
     }
 
-    /// Call by application when the peer cert has been verified
+    /// Call by application when the peer cert has been verified.
+    ///
+    /// This panics if there is no active peer.  It's OK to call this
+    /// when authentication isn't needed, that will likely only cause
+    /// the connection to fail.  However, if no packets have been
+    /// exchanged, it's not OK.
     pub fn authenticated(&mut self, status: AuthenticationStatus, now: Instant) {
         qinfo!([self], "Authenticated {:?}", status);
         self.crypto.tls.authenticated(status);
         let res = self.handshake(now, PNSpace::Handshake, None);
         self.absorb_error(now, res);
+        self.process_saved(now);
     }
 
     /// Get the role of the connection.
@@ -831,11 +837,11 @@
         }
     }
 
-    /// Call in to process activity on the connection. Either new packets have
-    /// arrived or a timeout has expired (or both).
+    /// Process new input datagrams on the connection.
     pub fn process_input(&mut self, d: Datagram, now: Instant) {
         let res = self.input(d, now);
         self.absorb_error(now, res);
+        self.process_saved(now);
         self.cleanup_streams();
     }
 
@@ -928,6 +934,7 @@
         if let Some(d) = dgram {
             let res = self.input(d, now);
             self.absorb_error(now, res);
+            self.process_saved(now);
         }
         self.process_output(now)
     }
@@ -1033,12 +1040,15 @@
         }
     }
 
-    /// Process any saved packets if the appropriate keys are available.
-    fn process_saved(&mut self, cspace: CryptoSpace) {
-        if self.crypto.states.rx_hp(cspace).is_some() {
-            for saved in self.saved_datagrams.take_saved(cspace) {
-                qtrace!([self], "process saved @{:?}: {:?}", saved.t, saved.d);
-                self.process_input(saved.d, saved.t);
+    /// Process any saved datagrams that might be available for processing.
+    fn process_saved(&mut self, now: Instant) {
+        while let Some(cspace) = self.saved_datagrams.available() {
+            qdebug!([self], "process saved for space {:?}", cspace);
+            debug_assert!(self.crypto.states.rx_hp(cspace).is_some());
+            for saved in self.saved_datagrams.take_saved() {
+                qtrace!([self], "input saved @{:?}: {:?}", saved.t, saved.d);
+                let res = self.input(saved.d, saved.t);
+                self.absorb_error(now, res);
             }
         }
     }
@@ -1342,10 +1352,11 @@
     }
 
     fn start_handshake(&mut self, packet: &PublicPacket, d: &Datagram) -> Res<()> {
+        qtrace!([self], "starting handshake");
+        debug_assert_eq!(packet.packet_type(), PacketType::Initial);
         self.remote_initial_source_cid = Some(ConnectionId::from(packet.scid()));
-        if self.role == Role::Server {
-            assert_eq!(packet.packet_type(), PacketType::Initial);
 
+        if self.role == Role::Server {
             // A server needs to accept the client's selected CID during the handshake.
             self.valid_cids.push(ConnectionId::from(packet.dcid()));
             self.original_destination_cid = Some(ConnectionId::from(packet.dcid()));
@@ -1368,6 +1379,7 @@
                 .expect("should have a path for sending Initial");
             p.set_remote_cid(packet.scid());
         }
+
         self.set_state(State::Handshaking);
         Ok(())
     }
@@ -1415,7 +1427,7 @@
         address_validation: &AddressValidationInfo,
         quic_version: QuicVersion,
         grease_quic_bit: bool,
-    ) -> (PacketType, PacketNumber, PacketBuilder) {
+    ) -> (PacketType, PacketBuilder) {
         let pt = PacketType::from(cspace);
         let mut builder = if pt == PacketType::Short {
             qdebug!("Building Short dcid {}", path.remote_cid());
@@ -1440,10 +1452,30 @@
         if pt == PacketType::Initial {
             builder.initial_token(address_validation.token());
         }
-        // TODO(mt) work out packet number length based on `4*path CWND/path MTU`.
+
+        (pt, builder)
+    }
+
+    fn add_packet_number(
+        builder: &mut PacketBuilder,
+        tx: &CryptoDxState,
+        largest_acknowledged: Option<PacketNumber>,
+    ) -> PacketNumber {
+        // Get the packet number and work out how long it is.
         let pn = tx.next_pn();
-        builder.pn(pn, 3);
-        (pt, pn, builder)
+        let unacked_range = if let Some(la) = largest_acknowledged {
+            // Double the range from this to the last acknowledged in this space.
+            (pn - la) << 1
+        } else {
+            pn + 1
+        };
+        // Count how many bytes in this range are non-zero.
+        let pn_len = mem::size_of::<PacketNumber>()
+            - usize::try_from(unacked_range.leading_zeros() / 8).unwrap();
+        // pn_len can't be zero (unacked_range is > 0)
+        // TODO(mt) also use `4*path CWND/path MTU` to set a minimum length.
+        builder.pn(pn, pn_len);
+        pn
     }
 
     fn can_grease_quic_bit(&self) -> bool {
@@ -1467,7 +1499,7 @@
                 continue;
             };
 
-            let (_, _, mut builder) = Self::build_packet_header(
+            let (_, mut builder) = Self::build_packet_header(
                 path,
                 cspace,
                 encoder,
@@ -1476,6 +1508,11 @@
                 self.quic_version,
                 grease_quic_bit,
             );
+            let _ = Self::add_packet_number(
+                &mut builder,
+                tx,
+                self.loss_recovery.largest_acknowledged_pn(*space),
+            );
 
             // ConnectionError::Application is only allowed at 1RTT.
             let sanitized = if *space == PNSpace::ApplicationData {
@@ -1506,14 +1543,16 @@
     }
 
     /// Write frames to the provided builder.  Returns a list of tokens used for
-    /// tracking loss or acknowledgment and whether any frame was ACK eliciting.
+    /// tracking loss or acknowledgment, whether any frame was ACK eliciting, and
+    /// whether the packet was padded.
     fn write_frames(
         &mut self,
         space: PNSpace,
         profile: &SendProfile,
         builder: &mut PacketBuilder,
+        mut pad: bool,
         now: Instant,
-    ) -> (Vec<RecoveryToken>, bool) {
+    ) -> (Vec<RecoveryToken>, bool, bool) {
         let mut tokens = Vec::new();
         let stats = &mut self.stats.borrow_mut().frame_tx;
 
@@ -1524,7 +1563,7 @@
             if let Some(t) = ack_token {
                 tokens.push(t);
             }
-            return (tokens, false);
+            return (tokens, false, false);
         }
 
         if space == PNSpace::ApplicationData && self.role == Role::Server {
@@ -1561,11 +1600,21 @@
                 false
             };
 
+        // Add padding.  Only pad 1-RTT packets so that we don't prevent coalescing.
+        // And avoid padding packets that otherwise only contain ACK because adding PADDING
+        // causes those packets to consume congestion window, which is not tracked (yet).
+        pad &= ack_eliciting && space == PNSpace::ApplicationData;
+        if pad {
+            builder.pad();
+            stats.padding += 1;
+            stats.all += 1;
+        }
+
         if let Some(t) = ack_token {
             tokens.push(t);
         }
         stats.all += tokens.len();
-        (tokens, ack_eliciting)
+        (tokens, ack_eliciting, pad)
     }
 
     /// Build a datagram, possibly from multiple packets (for different PN
@@ -1591,7 +1640,7 @@
             };
 
             let header_start = encoder.len();
-            let (pt, pn, mut builder) = Self::build_packet_header(
+            let (pt, mut builder) = Self::build_packet_header(
                 path,
                 cspace,
                 encoder,
@@ -1600,6 +1649,11 @@
                 self.quic_version,
                 grease_quic_bit,
             );
+            let pn = Self::add_packet_number(
+                &mut builder,
+                tx,
+                self.loss_recovery.largest_acknowledged_pn(*space),
+            );
             let payload_start = builder.len();
 
             // Work out if we have space left.
@@ -1613,7 +1667,8 @@
             // Add frames to the packet.
             let limit = profile.limit() - aead_expansion;
             builder.set_limit(limit);
-            let (tokens, ack_eliciting) = self.write_frames(*space, &profile, &mut builder, now);
+            let (tokens, ack_eliciting, padded) =
+                self.write_frames(*space, &profile, &mut builder, needs_padding, now);
             if builder.packet_empty() {
                 // Nothing to include in this packet.
                 encoder = builder.abort();
@@ -1645,13 +1700,16 @@
                 Rc::new(tokens),
                 encoder.len() - header_start,
             );
-            if pt == PacketType::Initial && (self.role == Role::Client || ack_eliciting) {
+            if padded {
+                needs_padding = false;
+                self.loss_recovery.on_packet_sent(sent);
+            } else if pt == PacketType::Initial && (self.role == Role::Client || ack_eliciting) {
                 // Packets containing Initial packets might need padding, and we want to
                 // track that padding along with the Initial packet.  So defer tracking.
                 initial_sent = Some(sent);
                 needs_padding = true;
             } else {
-                if pt != PacketType::ZeroRtt && self.role == Role::Client {
+                if pt == PacketType::Handshake && self.role == Role::Client {
                     needs_padding = false;
                 }
                 self.loss_recovery.on_packet_sent(sent);
@@ -1671,7 +1729,7 @@
         if encoder.is_empty() {
             Ok(SendOption::No(profile.paced()))
         } else {
-            // Pad Initial packets sent by the client to mtu bytes.
+            // Perform additional padding for Initial packets as necessary.
             let mut packets: Vec<u8> = encoder.into();
             if let Some(mut initial) = initial_sent.take() {
                 if needs_padding {
@@ -1890,7 +1948,7 @@
                 self.set_initial_limits();
             }
             if self.crypto.install_keys(self.role)? {
-                self.process_saved(CryptoSpace::Handshake);
+                self.saved_datagrams.make_available(CryptoSpace::Handshake);
             }
         }
 
@@ -1917,7 +1975,7 @@
 
     fn input_frame(&mut self, ptype: PacketType, frame: Frame, now: Instant) -> Res<()> {
         if !frame.is_allowed(ptype) {
-            qerror!("frame not allowed: {:?} {:?}", frame, ptype);
+            qinfo!("frame not allowed: {:?} {:?}", frame, ptype);
             return Err(Error::ProtocolViolation);
         }
         self.stats.borrow_mut().frame_rx.all += 1;
@@ -2286,7 +2344,8 @@
         self.process_tps()?;
         self.set_state(State::Connected);
         self.create_resumption_token(now);
-        self.process_saved(CryptoSpace::ApplicationData);
+        self.saved_datagrams
+            .make_available(CryptoSpace::ApplicationData);
         self.stats.borrow_mut().resumed = self.crypto.tls.info().unwrap().resumed();
         if self.role == Role::Server {
             self.state_signaling.handshake_done();
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/saved.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/saved.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/saved.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/saved.rs	2021-01-18 19:58:26.000000000 +0000
@@ -29,6 +29,7 @@
 pub struct SavedDatagrams {
     handshake: Vec<SavedDatagram>,
     application_data: Vec<SavedDatagram>,
+    available: Option<CryptoSpace>,
 }
 
 impl SavedDatagrams {
@@ -51,7 +52,21 @@
         }
     }
 
-    pub fn take_saved(&mut self, cspace: CryptoSpace) -> Vec<SavedDatagram> {
-        mem::take(self.store(cspace))
+    pub fn make_available(&mut self, cspace: CryptoSpace) {
+        debug_assert_ne!(cspace, CryptoSpace::ZeroRtt);
+        debug_assert_ne!(cspace, CryptoSpace::Initial);
+        if !self.store(cspace).is_empty() {
+            self.available = Some(cspace);
+        }
+    }
+
+    pub fn available(&self) -> Option<CryptoSpace> {
+        self.available
+    }
+
+    pub fn take_saved(&mut self) -> Vec<SavedDatagram> {
+        self.available
+            .take()
+            .map_or_else(Vec::new, |cspace| mem::take(self.store(cspace)))
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/tests/handshake.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/tests/handshake.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/connection/tests/handshake.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/connection/tests/handshake.rs	2021-01-18 19:58:26.000000000 +0000
@@ -253,6 +253,7 @@
     let c1 = client.process(None, now()).dgram();
     assert!(c1.is_some());
     let s1 = server.process(c1, now()).dgram().unwrap();
+    assert_eq!(s1.len(), PATH_MTU_V6);
 
     // The server should accept writes at this point.
     let s2 = send_something(&mut server, now());
@@ -418,7 +419,9 @@
     assert!(c2.is_some());
     now += RTT / 2;
     let s2 = server.process(c2, now).dgram();
-    assert!(s2.is_some());
+    // Even though there is a 1-RTT packet at the end of the datagram, the
+    // flight should be padded to full size.
+    assert_eq!(s2.as_ref().unwrap().len(), PATH_MTU_V6);
 
     // The client should process the datagram.  It can't process the 1-RTT
     // packet until authentication completes though.  So it saves it.
@@ -434,9 +437,10 @@
     maybe_authenticate(&mut client);
     let c3 = client.process(None, now).dgram();
     assert!(c3.is_some());
-    assert_eq!(client.stats().dropped_rx, 1); // Just Initial padding.
+    assert_eq!(client.stats().dropped_rx, 0); // No Initial padding.
     assert_eq!(client.stats().packets_rx, 4);
     assert_eq!(client.stats().saved_datagrams, 1);
+    assert_eq!(client.stats().frame_rx.padding, 1); // Padding uses frames.
 
     // Allow the handshake to complete.
     now += RTT / 2;
@@ -447,7 +451,7 @@
     let _ = client.process(s3, now).dgram();
     assert_eq!(*client.state(), State::Confirmed);
 
-    assert_eq!(client.stats().dropped_rx, 1); // Just Initial padding.
+    assert_eq!(client.stats().dropped_rx, 0); // No dropped packets.
 }
 
 #[test]
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/crypto.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/crypto.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/crypto.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/crypto.rs	2021-01-18 19:58:26.000000000 +0000
@@ -363,13 +363,16 @@
             0xc3, 0xee, 0xf7, 0x12, 0xc7, 0x2e, 0xbb, 0x5a, 0x11, 0xa7, 0xd2, 0x43, 0x2b, 0xb4,
             0x63, 0x65, 0xbe, 0xf9, 0xf5, 0x02,
         ];
-        const INITIAL_SALT_29_30: &[u8] = &[
+        const INITIAL_SALT_29_32: &[u8] = &[
             0xaf, 0xbf, 0xec, 0x28, 0x99, 0x93, 0xd2, 0x4c, 0x9e, 0x97, 0x86, 0xf1, 0x9c, 0x61,
             0x11, 0xe0, 0x43, 0x90, 0xa8, 0x99,
         ];
         let salt = match quic_version {
             QuicVersion::Draft27 | QuicVersion::Draft28 => INITIAL_SALT_27,
-            QuicVersion::Draft29 | QuicVersion::Draft30 => INITIAL_SALT_29_30,
+            QuicVersion::Draft29
+            | QuicVersion::Draft30
+            | QuicVersion::Draft31
+            | QuicVersion::Draft32 => INITIAL_SALT_29_32,
         };
         let cipher = TLS_AES_128_GCM_SHA256;
         let initial_secret = hkdf::extract(
@@ -591,6 +594,15 @@
             CLIENT_CID,
         )
     }
+
+    /// Get the amount of extra padding packets protected with this profile need.
+    /// This is the difference between the size of the header protection sample
+    /// and the AEAD expansion.
+    pub fn extra_padding(&self) -> usize {
+        self.hpkey
+            .sample_size()
+            .saturating_sub(self.aead.expansion())
+    }
 }
 
 impl std::fmt::Display for CryptoDxState {
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/packet/mod.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/packet/mod.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/packet/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/packet/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
 use neqo_common::{hex, hex_with_len, qtrace, Decoder, Encoder};
 use neqo_crypto::random;
 
+use std::cmp::min;
 use std::convert::TryFrom;
 use std::fmt;
 use std::iter::ExactSizeIterator;
@@ -34,6 +35,7 @@
 
 const SAMPLE_SIZE: usize = 16;
 const SAMPLE_OFFSET: usize = 4;
+const MAX_PACKET_NUMBER_LEN: usize = 4;
 
 mod retry;
 
@@ -93,6 +95,8 @@
     Draft28,
     Draft29,
     Draft30,
+    Draft31,
+    Draft32,
 }
 
 impl QuicVersion {
@@ -102,6 +106,8 @@
             Self::Draft28 => 0xff00_0000 + 28,
             Self::Draft29 => 0xff00_0000 + 29,
             Self::Draft30 => 0xff00_0000 + 30,
+            Self::Draft31 => 0xff00_0000 + 31,
+            Self::Draft32 => 0xff00_0000 + 32,
         }
     }
 }
@@ -124,6 +130,10 @@
             Ok(Self::Draft29)
         } else if ver == 0xff00_0000 + 30 {
             Ok(Self::Draft30)
+        } else if ver == 0xff00_0000 + 31 {
+            Ok(Self::Draft31)
+        } else if ver == 0xff00_0000 + 32 {
+            Ok(Self::Draft32)
         } else {
             Err(Error::VersionNegotiation)
         }
@@ -227,6 +237,11 @@
         self.limit - self.encoder.len()
     }
 
+    /// Pad with "PADDING" frames.
+    pub fn pad(&mut self) {
+        self.encoder.pad_to(self.limit, 0);
+    }
+
     /// Add unpredictable values for unprotected parts of the packet.
     pub fn scramble(&mut self, quic_bit: bool) {
         let mask = if quic_bit { PACKET_BIT_FIXED_QUIC } else { 0 }
@@ -254,14 +269,17 @@
             self.offsets.len = self.encoder.len();
             self.encoder.encode(&[0; 2]);
         }
+
+        // This allows the input to be >4, which is absurd, but we can eat that.
+        let pn_len = min(MAX_PACKET_NUMBER_LEN, pn_len);
+        debug_assert_ne!(pn_len, 0);
         // Encode the packet number and save its offset.
-        debug_assert!(pn_len <= 4 && pn_len > 0);
         let pn_offset = self.encoder.len();
         self.encoder.encode_uint(pn_len, pn);
         self.offsets.pn = pn_offset..self.encoder.len();
 
         // Now encode the packet number length and save the header length.
-        self.encoder[self.header.start] |= (pn_len - 1) as u8;
+        self.encoder[self.header.start] |= u8::try_from(pn_len - 1).unwrap();
         self.header.end = self.encoder.len();
         self.pn = pn;
     }
@@ -272,11 +290,25 @@
         self.encoder[self.offsets.len + 1] = (len & 0xff) as u8;
     }
 
+    fn pad_for_crypto(&mut self, crypto: &mut CryptoDxState) {
+        // Make sure that there is enough data in the packet.
+        // The length of the packet number plus the payload length needs to
+        // be at least 4 (MAX_PACKET_NUMBER_LEN) plus any amount by which
+        // the header protection sample exceeds the AEAD expansion.
+        let crypto_pad = crypto.extra_padding();
+        self.encoder.pad_to(
+            self.offsets.pn.start + MAX_PACKET_NUMBER_LEN + crypto_pad,
+            0,
+        );
+    }
+
     /// Build the packet and return the encoder.
     pub fn build(mut self, crypto: &mut CryptoDxState) -> Res<Encoder> {
+        self.pad_for_crypto(crypto);
         if self.offsets.len > 0 {
             self.write_len(crypto.expansion());
         }
+
         let hdr = &self.encoder[self.header.clone()];
         let body = &self.encoder[self.header.end..];
         qtrace!(
@@ -366,6 +398,8 @@
         encoder.encode_uint(4, QuicVersion::Draft28.as_u32());
         encoder.encode_uint(4, QuicVersion::Draft29.as_u32());
         encoder.encode_uint(4, QuicVersion::Draft30.as_u32());
+        encoder.encode_uint(4, QuicVersion::Draft31.as_u32());
+        encoder.encode_uint(4, QuicVersion::Draft32.as_u32());
         // Add a greased version, using the randomness already generated.
         for g in &mut grease[..4] {
             *g = *g & 0xf0 | 0x0a;
@@ -651,7 +685,7 @@
 
         // Unmask the PN.
         let mut pn_encoded: u64 = 0;
-        for i in 0..4 {
+        for i in 0..MAX_PACKET_NUMBER_LEN {
             hdrbytes[self.header_len + i] ^= mask[1 + i];
             pn_encoded <<= 8;
             pn_encoded += u64::from(hdrbytes[self.header_len + i]);
@@ -660,7 +694,7 @@
         // Now decode the packet number length and apply it, hopefully in constant time.
         let pn_len = usize::from((first_byte & 0x3) + 1);
         hdrbytes.truncate(self.header_len + pn_len);
-        pn_encoded >>= 8 * (4 - pn_len);
+        pn_encoded >>= 8 * (MAX_PACKET_NUMBER_LEN - pn_len);
 
         qtrace!("unmasked hdr={}", hex(&hdrbytes));
 
@@ -1054,6 +1088,18 @@
         0x37, 0x10, 0x8c, 0xe0, 0x0a, 0x61,
     ];
 
+    const SAMPLE_RETRY_31: &[u8] = &[
+        0xff, 0xff, 0x00, 0x00, 0x1f, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5,
+        0x74, 0x6f, 0x6b, 0x65, 0x6e, 0xc7, 0x0c, 0xe5, 0xde, 0x43, 0x0b, 0x4b, 0xdb, 0x7d, 0xf1,
+        0xa3, 0x83, 0x3a, 0x75, 0xf9, 0x86,
+    ];
+
+    const SAMPLE_RETRY_32: &[u8] = &[
+        0xff, 0xff, 0x00, 0x00, 0x20, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5,
+        0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x59, 0x75, 0x65, 0x19, 0xdd, 0x6c, 0xc8, 0x5b, 0xd9, 0x0e,
+        0x33, 0xa9, 0x34, 0xd2, 0xff, 0x85,
+    ];
+
     const RETRY_TOKEN: &[u8] = b"token";
 
     fn build_retry_single(quic_version: QuicVersion, sample_retry: &[u8]) {
@@ -1098,6 +1144,16 @@
     }
 
     #[test]
+    fn build_retry_31() {
+        build_retry_single(QuicVersion::Draft31, SAMPLE_RETRY_31);
+    }
+
+    #[test]
+    fn build_retry_32() {
+        build_retry_single(QuicVersion::Draft32, SAMPLE_RETRY_32);
+    }
+
+    #[test]
     fn build_retry_multiple() {
         // Run the build_retry test a few times.
         // Odds are approximately 1 in 8 that the full comparison doesn't happen
@@ -1142,6 +1198,16 @@
         decode_retry(QuicVersion::Draft30, SAMPLE_RETRY_30);
     }
 
+    #[test]
+    fn decode_retry_31() {
+        decode_retry(QuicVersion::Draft31, SAMPLE_RETRY_31);
+    }
+
+    #[test]
+    fn decode_retry_32() {
+        decode_retry(QuicVersion::Draft32, SAMPLE_RETRY_32);
+    }
+
     /// Check some packets that are clearly not valid Retry packets.
     #[test]
     fn invalid_retry() {
@@ -1178,7 +1244,8 @@
     const SAMPLE_VN: &[u8] = &[
         0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, 0x08,
         0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08, 0xff, 0x00, 0x00, 0x1b, 0xff, 0x00, 0x00,
-        0x1c, 0xff, 0x00, 0x00, 0x1d, 0xff, 0x00, 0x00, 0x1e, 0x0a, 0x0a, 0x0a, 0x0a,
+        0x1c, 0xff, 0x00, 0x00, 0x1d, 0xff, 0x00, 0x00, 0x1e, 0xff, 0x00, 0x00, 0x1f, 0xff, 0x00,
+        0x00, 0x20, 0x0a, 0x0a, 0x0a, 0x0a,
     ];
 
     #[test]
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/packet/retry.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/packet/retry.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/packet/retry.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/packet/retry.rs	2021-01-18 19:58:26.000000000 +0000
@@ -41,7 +41,10 @@
 {
     match quic_version {
         QuicVersion::Draft27 | QuicVersion::Draft28 => &RETRY_AEAD_27,
-        QuicVersion::Draft29 | QuicVersion::Draft30 => &RETRY_AEAD_29,
+        QuicVersion::Draft29
+        | QuicVersion::Draft30
+        | QuicVersion::Draft31
+        | QuicVersion::Draft32 => &RETRY_AEAD_29,
     }
     .try_with(|aead| f(&aead.borrow()))
     .map_err(|e| {
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/recovery.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/recovery.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/recovery.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/recovery.rs	2021-01-18 19:58:26.000000000 +0000
@@ -22,6 +22,7 @@
 use crate::connection::LOCAL_IDLE_TIMEOUT;
 use crate::crypto::CryptoRecoveryToken;
 use crate::flow_mgr::FlowControlRecoveryToken;
+use crate::packet::PacketNumber;
 use crate::qlog::{self, QlogMetric};
 use crate::send_stream::StreamRecoveryToken;
 use crate::stats::{Stats, StatsCell};
@@ -225,7 +226,7 @@
 #[derive(Debug)]
 pub(crate) struct LossRecoverySpace {
     space: PNSpace,
-    largest_acked: Option<u64>,
+    largest_acked: Option<PacketNumber>,
     largest_acked_sent_time: Option<Instant>,
     /// The time used to calculate the PTO timer for this space.
     /// This is the time that the last ACK-eliciting packet in this space
@@ -637,7 +638,7 @@
         self.packet_sender.cwnd_avail()
     }
 
-    pub fn largest_acknowledged_pn(&self, pn_space: PNSpace) -> Option<u64> {
+    pub fn largest_acknowledged_pn(&self, pn_space: PNSpace) -> Option<PacketNumber> {
         self.spaces.get(pn_space).and_then(|sp| sp.largest_acked)
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/src/stats.rs firefox-85.0+build1/third_party/rust/neqo-transport/src/stats.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/src/stats.rs	2021-01-06 11:23:22.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/src/stats.rs	2021-01-18 19:58:26.000000000 +0000
@@ -49,6 +49,44 @@
     pub new_token: usize,
 }
 
+impl Debug for FrameStats {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(
+            f,
+            "    crypto {} done {} token {} close {}",
+            self.crypto, self.handshake_done, self.new_token, self.connection_close,
+        )?;
+        writeln!(
+            f,
+            "    ack {} (max {}) ping {} padding {}",
+            self.ack, self.largest_acknowledged, self.ping, self.padding
+        )?;
+        writeln!(
+            f,
+            "    stream {} reset {} stop {}",
+            self.stream, self.reset_stream, self.stop_sending,
+        )?;
+        writeln!(
+            f,
+            "    max: stream {} data {} stream_data {}",
+            self.max_streams, self.max_data, self.max_stream_data,
+        )?;
+        writeln!(
+            f,
+            "    blocked: stream {} data {} stream_data {}",
+            self.streams_blocked, self.data_blocked, self.stream_data_blocked,
+        )?;
+        writeln!(
+            f,
+            "    ncid {} rcid {} pchallenge {} presponse {}",
+            self.new_connection_id,
+            self.retire_connection_id,
+            self.path_challenge,
+            self.path_response,
+        )
+    }
+}
+
 /// Connection statistics
 #[derive(Default, Clone)]
 #[allow(clippy::module_name_repetitions)]
@@ -129,7 +167,11 @@
             "  tx: {} lost {} lateack {} ptoack {}",
             self.packets_tx, self.lost, self.late_ack, self.pto_ack
         )?;
-        write!(f, "  resumed: {} ", self.resumed)
+        writeln!(f, "  resumed: {} ", self.resumed)?;
+        writeln!(f, "  frames rx:")?;
+        self.frame_rx.fmt(f)?;
+        writeln!(f, "  frames tx:")?;
+        self.frame_tx.fmt(f)
     }
 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/neqo-transport/tests/server.rs firefox-85.0+build1/third_party/rust/neqo-transport/tests/server.rs
--- firefox-84.0.2+build1/third_party/rust/neqo-transport/tests/server.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/neqo-transport/tests/server.rs	2021-01-18 19:58:26.000000000 +0000
@@ -851,7 +851,15 @@
     // The server should reject this.
     let response = server.process(Some(bad_dgram), now());
     let close_dgram = response.dgram().unwrap();
-    assert!(close_dgram.len() < 200); // Too small for anything real.
+    // The resulting datagram might contain multiple packets, but each is small.
+    let (initial_close, rest) = split_datagram(&close_dgram);
+    // Allow for large connection IDs and a 32 byte CONNECTION_CLOSE.
+    assert!(initial_close.len() <= 100);
+    let (handshake_close, short_close) = split_datagram(&rest.unwrap());
+    // The Handshake packet containing the close is the same size as the Initial,
+    // plus 1 byte for the Token field in the Initial.
+    assert_eq!(initial_close.len(), handshake_close.len() + 1);
+    assert!(short_close.unwrap().len() <= 73);
 
     // The client should accept this new and stop trying to connect.
     // It will generate a CONNECTION_CLOSE first though.
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/.cargo-checksum.json firefox-85.0+build1/third_party/rust/parking_lot/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/parking_lot/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"b592fd02036eecaf417c3b26d9ea02f9b45b1a8612596953e829fca23bd2c86b","Cargo.toml":"b0518e5a38b60715c7115fba8a7ed1ea7d7e8266859fcb1b862c7389b02976fe","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"93e21ceae3fe1b6cf9f6c2ebcbf09211a08b446f849048900d8d7efe52751614","bors.toml":"938b40da0516dd1e18f6ab893d43a3c6a011836124696157568380f3ce784958","src/condvar.rs":"fbe7dd3160a119aa58c7816c2cbd38a643b34f0aad54148f9ca18b33512058d2","src/deadlock.rs":"7d3ebb5b4f63658435df277bb983e352e4bc651a92c4fd48ae68bf103e452d0d","src/elision.rs":"9aceb0b27fd3cdaf4ef76bda63435a96ec2fdef24be098b9e4edbc39db000765","src/fair_mutex.rs":"d0a032e8207919da04b85f1422dfb14aa2af7aad78843c708d2fe3e0478e401a","src/lib.rs":"d83b9e6c70d2c6167d55dc2c4cf2b02abf4b11bfa092949750bc0cdafd38a45c","src/mutex.rs":"9fff878238ef798bfe2f48b410ca3074914826005a12df4f9b96619b2d3e6409","src/once.rs":"a1c38a5d87077e3d112d57e065ee126a24ab19f04fba9cb1f2cb43bc82caf33c","src/raw_fair_mutex.rs":"316f954d9673ac5b8d6bf4c19f2444800f63daf801c224d986e2d6dac810643c","src/raw_mutex.rs":"a24262800d61b8486ef0cfb1b72ead748c544ca2a551ec48346036ebb4fc385b","src/raw_rwlock.rs":"b71987e1da3efb9281d58db80c735933431aa3f5d1470425410edbeee158d1fe","src/remutex.rs":"7a0de55161cd57497bb52d3aecca69a89eff2e71cdb2d762df53579e0607b489","src/rwlock.rs":"7f6004c3a9e7bbd932be52be8b3479251d88be3dcddb929d90c5e0fb250ae82b","src/util.rs":"26325483bcd23ab8ceb16bf47541152c5eb0bc394f247795c14698fa7b586692","tests/issue_203.rs":"5fbdf6ec63f391d86457df949678c203a1e81e8aa32d4e10037fa76e768702c0"},"package":"a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"f9559e40e966a870d64367a75e41b233ee1bc1746f6f242501b9462e69b4db12","Cargo.toml":"a7cce7f9fbc2cb0a5c388384073f9b2e820d6b47f314ef0dcccb5613741b8202","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"93e21ceae3fe1b6cf9f6c2ebcbf09211a08b446f849048900d8d7efe52751614","bors.toml":"938b40da0516dd1e18f6ab893d43a3c6a011836124696157568380f3ce784958","src/condvar.rs":"bace2ee6e97eab088833a22a511029fb188e5f6bc9289bfcd5d41e3915de921d","src/deadlock.rs":"7d3ebb5b4f63658435df277bb983e352e4bc651a92c4fd48ae68bf103e452d0d","src/elision.rs":"9aceb0b27fd3cdaf4ef76bda63435a96ec2fdef24be098b9e4edbc39db000765","src/fair_mutex.rs":"d0a032e8207919da04b85f1422dfb14aa2af7aad78843c708d2fe3e0478e401a","src/lib.rs":"d83b9e6c70d2c6167d55dc2c4cf2b02abf4b11bfa092949750bc0cdafd38a45c","src/mutex.rs":"9fff878238ef798bfe2f48b410ca3074914826005a12df4f9b96619b2d3e6409","src/once.rs":"a1c38a5d87077e3d112d57e065ee126a24ab19f04fba9cb1f2cb43bc82caf33c","src/raw_fair_mutex.rs":"316f954d9673ac5b8d6bf4c19f2444800f63daf801c224d986e2d6dac810643c","src/raw_mutex.rs":"a24262800d61b8486ef0cfb1b72ead748c544ca2a551ec48346036ebb4fc385b","src/raw_rwlock.rs":"d0d93b096e68da3213da49d51849baf4ec241552eaa9b791f38314eb36c4e1a9","src/remutex.rs":"7a0de55161cd57497bb52d3aecca69a89eff2e71cdb2d762df53579e0607b489","src/rwlock.rs":"68584dffeb4368839774c0ee987481affc0547c38977a17970514f072a582d61","src/util.rs":"26325483bcd23ab8ceb16bf47541152c5eb0bc394f247795c14698fa7b586692","tests/issue_203.rs":"5fbdf6ec63f391d86457df949678c203a1e81e8aa32d4e10037fa76e768702c0"},"package":"6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/Cargo.toml firefox-85.0+build1/third_party/rust/parking_lot/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/parking_lot/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "parking_lot"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "More compact and efficient implementations of the standard synchronization primitives."
 readme = "README.md"
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/CHANGELOG.md firefox-85.0+build1/third_party/rust/parking_lot/CHANGELOG.md
--- firefox-84.0.2+build1/third_party/rust/parking_lot/CHANGELOG.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/CHANGELOG.md	2021-01-18 19:58:26.000000000 +0000
@@ -1,3 +1,13 @@
+## parking_lot 0.11.1, lock_api 0.4.2 (2020-11-18)
+
+- Fix bounds on Send and Sync impls for lock guards. (#262)
+- Fix incorrect memory ordering in `RwLock`. (#260)
+
+## lock_api 0.4.1 (2020-07-06)
+
+- Add `data_ptr` method to lock types to allow unsafely accessing the inner data
+  without a guard. (#247)
+
 ## parking_lot 0.11.0, parking_lot_core 0.8.0, lock_api 0.4.0 (2020-06-23)
 
 - Add `is_locked` method to mutex types. (#235)
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/src/condvar.rs firefox-85.0+build1/third_party/rust/parking_lot/src/condvar.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot/src/condvar.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/src/condvar.rs	2021-01-18 19:58:26.000000000 +0000
@@ -663,6 +663,9 @@
         while !c.notify_one() {
             // Wait for the thread to get into wait()
             MutexGuard::bump(&mut g);
+            // Yield, so the other thread gets a chance to do something.
+            // (At least Miri needs this, because it doesn't preempt threads.)
+            thread::yield_now();
         }
         // The thread should have been requeued to the mutex, which we wake up now.
         drop(g);
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/src/raw_rwlock.rs firefox-85.0+build1/third_party/rust/parking_lot/src/raw_rwlock.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot/src/raw_rwlock.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/src/raw_rwlock.rs	2021-01-18 19:58:26.000000000 +0000
@@ -970,11 +970,11 @@
         // At this point WRITER_BIT is already set, we just need to wait for the
         // remaining readers to exit the lock.
         let mut spinwait = SpinWait::new();
-        let mut state = self.state.load(Ordering::Relaxed);
+        let mut state = self.state.load(Ordering::Acquire);
         while state & READERS_MASK != 0 {
             // Spin a few times to wait for readers to exit
             if spinwait.spin() {
-                state = self.state.load(Ordering::Relaxed);
+                state = self.state.load(Ordering::Acquire);
                 continue;
             }
 
@@ -1019,7 +1019,7 @@
                 // since a previous writer timing-out could have allowed
                 // another reader to sneak in before we parked.
                 ParkResult::Unparked(_) | ParkResult::Invalid => {
-                    state = self.state.load(Ordering::Relaxed);
+                    state = self.state.load(Ordering::Acquire);
                     continue;
                 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot/src/rwlock.rs firefox-85.0+build1/third_party/rust/parking_lot/src/rwlock.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot/src/rwlock.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot/src/rwlock.rs	2021-01-18 19:58:26.000000000 +0000
@@ -539,8 +539,8 @@
     fn test_rwlock_recursive() {
         let arc = Arc::new(RwLock::new(1));
         let arc2 = arc.clone();
-        let _lock1 = arc.read();
-        thread::spawn(move || {
+        let lock1 = arc.read();
+        let t = thread::spawn(move || {
             let _lock = arc2.write();
         });
 
@@ -554,7 +554,12 @@
         }
 
         // A normal read would block here since there is a pending writer
-        let _lock2 = arc.read_recursive();
+        let lock2 = arc.read_recursive();
+
+        // Unblock the thread and join it.
+        drop(lock1);
+        drop(lock2);
+        t.join().unwrap();
     }
 
     #[test]
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/.cargo-checksum.json firefox-85.0+build1/third_party/rust/parking_lot_core/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"f1e6b94b0b13664976a1ebeef3163f4560077e17b9254593f7c566c653fbcc93","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"058dddad16d91c8d0160fa2a78bb5f7c2f801f2fd9770fc387c5843395bf0379","src/parking_lot.rs":"586fa7ff7ee77c19dcea83310135709f0beda3a3395c4b305217b67e83e6b410","src/spinwait.rs":"d568d8a81f9144ec4c4a139dc934d7d04ee1656a4a221eb548742fe7aba09ab1","src/thread_parker/cloudabi.rs":"dba5efaf7538c3d8731e9ef9aa41bb48aaa1721c61acb64eb224b38edf12b663","src/thread_parker/generic.rs":"574aecb3c325012b683eca4135441ec73f44c33cc9955aa05db24d7e4c991cd7","src/thread_parker/linux.rs":"4a2c76b3dc09301ceb73d904460f49d91bc1a2492cc123ee26ca22ece3faae79","src/thread_parker/mod.rs":"347fe878b616ec69eeffc188475920b47b3d802756565d32e004fc342eea771f","src/thread_parker/redox.rs":"91ca107c4edffa57e87294cadec3b6010b584fb272c044e2557c925dbcb90f6a","src/thread_parker/sgx.rs":"898ced116fb7b0ac077b5977b5bcac610f1d55beffb613ec73e083b1ef09cc28","src/thread_parker/unix.rs":"8ff84ab0a629e8891b663226c8867ae4bb0fc63f0b3504e85b4583e7bf73a589","src/thread_parker/wasm.rs":"903b7eec240cdbe8a23467f6b41d042d93b35755bd1763be02f9cc55756c4aec","src/thread_parker/wasm_atomic.rs":"85f2d7e9982ef64f077fc6ee2e10f81027d556b08c5618e86913c137571e377e","src/thread_parker/windows/keyed_event.rs":"fc1cf4e592d814c4c949217d91317ec2afb6048430abebb3cea2e8487b369734","src/thread_parker/windows/mod.rs":"c99a3871e69800452a56928a9e870530b7f48a563a4d3efe6184103147899f0c","src/thread_parker/windows/waitaddress.rs":"8e037df2a5692905e2bc2d4ea955295ab92bcc7e26eea0bb7a4eaac9ce657321","src/util.rs":"285e6133150645525f2ca1ece41f6d35bad4e7c5e08b42b20c99d2a97e04a974","src/word_lock.rs":"2c030aedb340ae8ca564365206452c298fe29986d005d6a40e808c9760f91c95"},"package":"c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"}
\ No newline at end of file
+{"files":{"Cargo.toml":"5c6baed932139022eb9544cb9b2ea8434bd1dc4add567257bbc0245f52efaa85","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","src/lib.rs":"7baf09034aafc28f7dbb1550cdde89221e4eb5dfda51b55aeb652ee8710c715d","src/parking_lot.rs":"58125667bd78399e8753b6bd8acef84f180f369f0bc174c573887176bab9f9d3","src/spinwait.rs":"d568d8a81f9144ec4c4a139dc934d7d04ee1656a4a221eb548742fe7aba09ab1","src/thread_parker/generic.rs":"574aecb3c325012b683eca4135441ec73f44c33cc9955aa05db24d7e4c991cd7","src/thread_parker/linux.rs":"4a2c76b3dc09301ceb73d904460f49d91bc1a2492cc123ee26ca22ece3faae79","src/thread_parker/mod.rs":"9c675b7690bbde62e88d946fad218623d423edccff4e01e8e52b116d815c695c","src/thread_parker/redox.rs":"91ca107c4edffa57e87294cadec3b6010b584fb272c044e2557c925dbcb90f6a","src/thread_parker/sgx.rs":"898ced116fb7b0ac077b5977b5bcac610f1d55beffb613ec73e083b1ef09cc28","src/thread_parker/unix.rs":"8ff84ab0a629e8891b663226c8867ae4bb0fc63f0b3504e85b4583e7bf73a589","src/thread_parker/wasm.rs":"903b7eec240cdbe8a23467f6b41d042d93b35755bd1763be02f9cc55756c4aec","src/thread_parker/wasm_atomic.rs":"cf761157803256b18205e747bc99e30b18d5410c27121fa9595e12cb51bb6bef","src/thread_parker/windows/keyed_event.rs":"fc1cf4e592d814c4c949217d91317ec2afb6048430abebb3cea2e8487b369734","src/thread_parker/windows/mod.rs":"c99a3871e69800452a56928a9e870530b7f48a563a4d3efe6184103147899f0c","src/thread_parker/windows/waitaddress.rs":"8e037df2a5692905e2bc2d4ea955295ab92bcc7e26eea0bb7a4eaac9ce657321","src/util.rs":"285e6133150645525f2ca1ece41f6d35bad4e7c5e08b42b20c99d2a97e04a974","src/word_lock.rs":"2c030aedb340ae8ca564365206452c298fe29986d005d6a40e808c9760f91c95"},"package":"d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/Cargo.toml firefox-85.0+build1/third_party/rust/parking_lot_core/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "parking_lot_core"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "An advanced API for creating custom synchronization primitives."
 keywords = ["mutex", "condvar", "rwlock", "once", "thread"]
@@ -25,7 +25,7 @@
 optional = true
 
 [dependencies.cfg-if]
-version = "0.1.10"
+version = "1.0.0"
 
 [dependencies.instant]
 version = "0.1.4"
@@ -35,7 +35,7 @@
 optional = true
 
 [dependencies.smallvec]
-version = "1.4.0"
+version = "1.0"
 
 [dependencies.thread-id]
 version = "3.3.0"
@@ -44,8 +44,6 @@
 [features]
 deadlock_detection = ["petgraph", "thread-id", "backtrace"]
 nightly = []
-[target."cfg(target_os = \"cloudabi\")".dependencies.cloudabi]
-version = "0.1.0"
 [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
 version = "0.1.56"
 [target."cfg(unix)".dependencies.libc]
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/lib.rs firefox-85.0+build1/third_party/rust/parking_lot_core/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -51,10 +51,6 @@
     ),
     feature(stdsimd)
 )]
-#![cfg_attr(
-    all(feature = "nightly", target_os = "cloudabi",),
-    feature(thread_local)
-)]
 
 mod parking_lot;
 mod spinwait;
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/parking_lot.rs firefox-85.0+build1/third_party/rust/parking_lot_core/src/parking_lot.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/parking_lot.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/src/parking_lot.rs	2021-01-18 19:58:26.000000000 +0000
@@ -7,7 +7,6 @@
 use crate::thread_parker::{ThreadParker, ThreadParkerT, UnparkHandleT};
 use crate::util::UncheckedOptionExt;
 use crate::word_lock::WordLock;
-use cfg_if::cfg_if;
 use core::{
     cell::{Cell, UnsafeCell},
     ptr,
@@ -17,46 +16,6 @@
 use smallvec::SmallVec;
 use std::time::Duration;
 
-cfg_if! {
-    if #[cfg(all(
-        target_arch = "wasm32",
-        target_os = "unknown",
-        target_vendor = "unknown"
-    ))] {
-        use core::ops::Add;
-
-        #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-        struct DummyInstant(Duration);
-
-        impl DummyInstant {
-            pub fn now() -> DummyInstant {
-                DummyInstant::zero()
-            }
-
-            const fn zero() -> DummyInstant {
-                DummyInstant(Duration::from_secs(0))
-            }
-        }
-
-        impl Add<Duration> for DummyInstant {
-            type Output = DummyInstant;
-
-            fn add(self, _rhs: Duration) -> DummyInstant {
-                DummyInstant::zero()
-            }
-        }
-
-        // Use dummy implementation for `Instant` on `wasm32`. The reason for this is
-        // that `Instant::now()` will always panic because time is currently not implemented
-        // on wasm32-unknown-unknown.
-        // See https://github.com/rust-lang/rust/blob/master/src/libstd/sys/wasm/time.rs
-        type InstantType = DummyInstant;
-    } else {
-        // Otherwise use `instant::Instant`
-        type InstantType = Instant;
-    }
-}
-
 static NUM_THREADS: AtomicUsize = AtomicUsize::new(0);
 
 /// Holds the pointer to the currently active `HashTable`.
@@ -88,7 +47,7 @@
         let new_size = (num_threads * LOAD_FACTOR).next_power_of_two();
         let hash_bits = 0usize.leading_zeros() - new_size.leading_zeros() - 1;
 
-        let now = InstantType::now();
+        let now = Instant::now();
         let mut entries = Vec::with_capacity(new_size);
         for i in 0..new_size {
             // We must ensure the seed is not zero
@@ -118,7 +77,7 @@
 
 impl Bucket {
     #[inline]
-    pub fn new(timeout: InstantType, seed: u32) -> Self {
+    pub fn new(timeout: Instant, seed: u32) -> Self {
         Self {
             mutex: WordLock::new(),
             queue_head: Cell::new(ptr::null()),
@@ -130,7 +89,7 @@
 
 struct FairTimeout {
     // Next time at which point be_fair should be set
-    timeout: InstantType,
+    timeout: Instant,
 
     // the PRNG state for calculating the next timeout
     seed: u32,
@@ -138,14 +97,14 @@
 
 impl FairTimeout {
     #[inline]
-    fn new(timeout: InstantType, seed: u32) -> FairTimeout {
+    fn new(timeout: Instant, seed: u32) -> FairTimeout {
         FairTimeout { timeout, seed }
     }
 
     // Determine whether we should force a fair unlock, and update the timeout
     #[inline]
     fn should_timeout(&mut self) -> bool {
-        let now = InstantType::now();
+        let now = Instant::now();
         if now > self.timeout {
             // Time between 0 and 1ms.
             let nanos = self.gen_u32() % 1_000_000;
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/cloudabi.rs firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/cloudabi.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/cloudabi.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/cloudabi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-// Copyright 2016 Amanieu d'Antras
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-use cloudabi as abi;
-use core::{
-    cell::Cell,
-    mem::{self, MaybeUninit},
-    sync::atomic::{AtomicU32, Ordering},
-};
-use instant::Instant;
-use std::{convert::TryFrom, thread};
-
-extern "C" {
-    #[thread_local]
-    static __pthread_thread_id: abi::tid;
-}
-
-struct Lock {
-    lock: AtomicU32,
-}
-
-impl Lock {
-    pub fn new() -> Self {
-        Lock {
-            lock: AtomicU32::new(abi::LOCK_UNLOCKED.0),
-        }
-    }
-
-    /// # Safety
-    ///
-    /// See `Lock::lock`.
-    unsafe fn try_lock(&self) -> Option<LockGuard> {
-        // Attempt to acquire the lock.
-        if let Err(old) = self.lock.compare_exchange(
-            abi::LOCK_UNLOCKED.0,
-            __pthread_thread_id.0 | abi::LOCK_WRLOCKED.0,
-            Ordering::Acquire,
-            Ordering::Relaxed,
-        ) {
-            // Failure. Crash upon recursive acquisition.
-            debug_assert_ne!(
-                old & !abi::LOCK_KERNEL_MANAGED.0,
-                __pthread_thread_id.0 | abi::LOCK_WRLOCKED.0,
-                "Attempted to recursive write-lock a lock",
-            );
-            None
-        } else {
-            Some(LockGuard { lock: &self.lock })
-        }
-    }
-
-    /// # Safety
-    ///
-    /// This method is unsafe because the `LockGuard` has a raw pointer into this `Lock`
-    /// that it will access on drop to unlock the lock. So make sure the `LockGuard` goes
-    /// out of scope before the `Lock` it came from moves or goes out of scope.
-    pub unsafe fn lock(&self) -> LockGuard {
-        self.try_lock().unwrap_or_else(|| {
-            // Call into the kernel to acquire a write lock.
-            let subscription = abi::subscription {
-                r#type: abi::eventtype::LOCK_WRLOCK,
-                union: abi::subscription_union {
-                    lock: abi::subscription_lock {
-                        lock: self.ptr(),
-                        lock_scope: abi::scope::PRIVATE,
-                    },
-                },
-                ..mem::zeroed()
-            };
-            let mut event = MaybeUninit::<abi::event>::uninit();
-            let mut nevents: usize = 0;
-            let ret = abi::poll(&subscription, event.as_mut_ptr(), 1, &mut nevents);
-            debug_assert_eq!(ret, abi::errno::SUCCESS);
-            debug_assert_eq!(event.assume_init().error, abi::errno::SUCCESS);
-
-            LockGuard { lock: &self.lock }
-        })
-    }
-
-    fn ptr(&self) -> *mut abi::lock {
-        &self.lock as *const AtomicU32 as *mut abi::lock
-    }
-}
-
-struct LockGuard {
-    lock: *const AtomicU32,
-}
-
-impl LockGuard {
-    fn ptr(&self) -> *mut abi::lock {
-        self.lock as *mut abi::lock
-    }
-}
-
-impl Drop for LockGuard {
-    fn drop(&mut self) {
-        let lock = unsafe { &*self.lock };
-        debug_assert_eq!(
-            lock.load(Ordering::Relaxed) & !abi::LOCK_KERNEL_MANAGED.0,
-            unsafe { __pthread_thread_id.0 } | abi::LOCK_WRLOCKED.0,
-            "This lock is not write-locked by this thread"
-        );
-
-        if !lock
-            .compare_exchange(
-                unsafe { __pthread_thread_id.0 } | abi::LOCK_WRLOCKED.0,
-                abi::LOCK_UNLOCKED.0,
-                Ordering::Release,
-                Ordering::Relaxed,
-            )
-            .is_ok()
-        {
-            // Lock is managed by kernelspace. Call into the kernel
-            // to unblock waiting threads.
-            let ret = unsafe { abi::lock_unlock(self.lock as *mut abi::lock, abi::scope::PRIVATE) };
-            debug_assert_eq!(ret, abi::errno::SUCCESS);
-        }
-    }
-}
-
-struct Condvar {
-    condvar: AtomicU32,
-}
-
-impl Condvar {
-    pub fn new() -> Self {
-        Condvar {
-            condvar: AtomicU32::new(abi::CONDVAR_HAS_NO_WAITERS.0),
-        }
-    }
-
-    pub fn wait(&self, lock: &LockGuard) {
-        unsafe {
-            let subscription = abi::subscription {
-                r#type: abi::eventtype::CONDVAR,
-                union: abi::subscription_union {
-                    condvar: abi::subscription_condvar {
-                        condvar: self.ptr(),
-                        condvar_scope: abi::scope::PRIVATE,
-                        lock: lock.ptr(),
-                        lock_scope: abi::scope::PRIVATE,
-                    },
-                },
-                ..mem::zeroed()
-            };
-            let mut event = MaybeUninit::<abi::event>::uninit();
-            let mut nevents: usize = 0;
-
-            let ret = abi::poll(&subscription, event.as_mut_ptr(), 1, &mut nevents);
-            debug_assert_eq!(ret, abi::errno::SUCCESS);
-            debug_assert_eq!(event.assume_init().error, abi::errno::SUCCESS);
-        }
-    }
-
-    /// Waits for a signal on the condvar.
-    /// Returns false if it times out before anyone notified us.
-    pub fn wait_timeout(&self, lock: &LockGuard, timeout: abi::timestamp) -> bool {
-        unsafe {
-            let subscriptions = [
-                abi::subscription {
-                    r#type: abi::eventtype::CONDVAR,
-                    union: abi::subscription_union {
-                        condvar: abi::subscription_condvar {
-                            condvar: self.ptr(),
-                            condvar_scope: abi::scope::PRIVATE,
-                            lock: lock.ptr(),
-                            lock_scope: abi::scope::PRIVATE,
-                        },
-                    },
-                    ..mem::zeroed()
-                },
-                abi::subscription {
-                    r#type: abi::eventtype::CLOCK,
-                    union: abi::subscription_union {
-                        clock: abi::subscription_clock {
-                            clock_id: abi::clockid::MONOTONIC,
-                            timeout,
-                            ..mem::zeroed()
-                        },
-                    },
-                    ..mem::zeroed()
-                },
-            ];
-            let mut events = MaybeUninit::<[abi::event; 2]>::uninit();
-            let mut nevents: usize = 0;
-
-            let ret = abi::poll(
-                subscriptions.as_ptr(),
-                events.as_mut_ptr() as *mut _,
-                2,
-                &mut nevents,
-            );
-            debug_assert_eq!(ret, abi::errno::SUCCESS);
-            let events = events.assume_init();
-            for i in 0..nevents {
-                debug_assert_eq!(events[i].error, abi::errno::SUCCESS);
-                if events[i].r#type == abi::eventtype::CONDVAR {
-                    return true;
-                }
-            }
-        }
-        false
-    }
-
-    pub fn notify(&self) {
-        let ret = unsafe { abi::condvar_signal(self.ptr(), abi::scope::PRIVATE, 1) };
-        debug_assert_eq!(ret, abi::errno::SUCCESS);
-    }
-
-    fn ptr(&self) -> *mut abi::condvar {
-        &self.condvar as *const AtomicU32 as *mut abi::condvar
-    }
-}
-
-// Helper type for putting a thread to sleep until some other thread wakes it up
-pub struct ThreadParker {
-    should_park: Cell<bool>,
-    lock: Lock,
-    condvar: Condvar,
-}
-
-impl super::ThreadParkerT for ThreadParker {
-    type UnparkHandle = UnparkHandle;
-
-    const IS_CHEAP_TO_CONSTRUCT: bool = true;
-
-    fn new() -> ThreadParker {
-        ThreadParker {
-            should_park: Cell::new(false),
-            lock: Lock::new(),
-            condvar: Condvar::new(),
-        }
-    }
-
-    unsafe fn prepare_park(&self) {
-        self.should_park.set(true);
-    }
-
-    unsafe fn timed_out(&self) -> bool {
-        // We need to grab the lock here because another thread may be
-        // concurrently executing UnparkHandle::unpark, which is done without
-        // holding the queue lock.
-        let _guard = self.lock.lock();
-        self.should_park.get()
-    }
-
-    unsafe fn park(&self) {
-        let guard = self.lock.lock();
-        while self.should_park.get() {
-            self.condvar.wait(&guard);
-        }
-    }
-
-    unsafe fn park_until(&self, timeout: Instant) -> bool {
-        let guard = self.lock.lock();
-        while self.should_park.get() {
-            if let Some(duration_left) = timeout.checked_duration_since(Instant::now()) {
-                if let Ok(nanos_left) = abi::timestamp::try_from(duration_left.as_nanos()) {
-                    self.condvar.wait_timeout(&guard, nanos_left);
-                } else {
-                    // remaining timeout overflows an abi::timestamp. Sleep indefinitely
-                    self.condvar.wait(&guard);
-                }
-            } else {
-                // We timed out
-                return false;
-            }
-        }
-        true
-    }
-
-    unsafe fn unpark_lock(&self) -> UnparkHandle {
-        let _lock_guard = self.lock.lock();
-
-        UnparkHandle {
-            thread_parker: self,
-            _lock_guard,
-        }
-    }
-}
-
-pub struct UnparkHandle {
-    thread_parker: *const ThreadParker,
-    _lock_guard: LockGuard,
-}
-
-impl super::UnparkHandleT for UnparkHandle {
-    unsafe fn unpark(self) {
-        (*self.thread_parker).should_park.set(false);
-
-        // We notify while holding the lock here to avoid races with the target
-        // thread. In particular, the thread could exit after we unlock the
-        // mutex, which would make the condvar access invalid memory.
-        (*self.thread_parker).condvar.notify();
-    }
-}
-
-#[inline]
-pub fn thread_yield() {
-    thread::yield_now();
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/mod.rs firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/mod.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -76,9 +76,6 @@
     } else if #[cfg(target_arch = "wasm32")] {
         #[path = "wasm.rs"]
         mod imp;
-    } else if #[cfg(all(feature = "nightly", target_os = "cloudabi"))] {
-        #[path = "cloudabi.rs"]
-        mod imp;
     } else {
         #[path = "generic.rs"]
         mod imp;
diff -Nru firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/wasm_atomic.rs firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/wasm_atomic.rs
--- firefox-84.0.2+build1/third_party/rust/parking_lot_core/src/thread_parker/wasm_atomic.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/parking_lot_core/src/thread_parker/wasm_atomic.rs	2021-01-18 19:58:26.000000000 +0000
@@ -5,13 +5,41 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
+use cfg_if::cfg_if;
 use core::{
     arch::wasm32,
     sync::atomic::{AtomicI32, Ordering},
 };
 use instant::Instant;
+use std::time::Duration;
 use std::{convert::TryFrom, thread};
 
+cfg_if! {
+    if #[cfg(all(
+        target_arch = "wasm32",
+        target_os = "unknown",
+        target_vendor = "unknown"
+    ))] {
+        // This function serves as a polyfill for `Instant::checked_duration_since`, which is
+        // currently not implemented for wasm32-unknown-unknown.
+        // TODO: Remove this shim once it
+        fn checked_duration_since_now(other: Instant) -> Option<Duration> {
+            let now = Instant::now();
+
+            if other < now {
+                None
+            } else {
+                Some(other.duration_since(now))
+            }
+        }
+    } else {
+        // If we are not targeting wasm32, we can use the native `checked_duration_since`.
+        fn checked_duration_since_now(timeout: Instant) -> Option<Duration> {
+            timeout.checked_duration_since(Instant::now())
+        }
+    }
+}
+
 // Helper type for putting a thread to sleep until some other thread wakes it up
 pub struct ThreadParker {
     parked: AtomicI32,
@@ -45,7 +73,7 @@
     #[inline]
     unsafe fn park(&self) {
         while self.parked.load(Ordering::Acquire) == PARKED {
-            let r = unsafe { wasm32::i32_atomic_wait(self.ptr(), PARKED, -1) };
+            let r = wasm32::memory_atomic_wait32(self.ptr(), PARKED, -1);
             // we should have either woken up (0) or got a not-equal due to a
             // race (1). We should never time out (2)
             debug_assert!(r == 0 || r == 1);
@@ -55,9 +83,9 @@
     #[inline]
     unsafe fn park_until(&self, timeout: Instant) -> bool {
         while self.parked.load(Ordering::Acquire) == PARKED {
-            if let Some(left) = timeout.checked_duration_since(Instant::now()) {
+            if let Some(left) = checked_duration_since_now(timeout) {
                 let nanos_left = i64::try_from(left.as_nanos()).unwrap_or(i64::max_value());
-                let r = unsafe { wasm32::i32_atomic_wait(self.ptr(), PARKED, nanos_left) };
+                let r = wasm32::memory_atomic_wait32(self.ptr(), PARKED, nanos_left);
                 debug_assert!(r == 0 || r == 1 || r == 2);
             } else {
                 return false;
@@ -86,7 +114,7 @@
 impl super::UnparkHandleT for UnparkHandle {
     #[inline]
     unsafe fn unpark(self) {
-        let num_notified = unsafe { wasm32::atomic_notify(self.0 as *mut i32, 1) };
+        let num_notified = wasm32::memory_atomic_notify(self.0 as *mut i32, 1);
         debug_assert!(num_notified == 0 || num_notified == 1);
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/benches/split.rs firefox-85.0+build1/third_party/rust/plane-split/benches/split.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/benches/split.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/benches/split.rs	2021-01-18 19:58:26.000000000 +0000
@@ -4,9 +4,9 @@
 extern crate plane_split;
 extern crate test;
 
-use std::sync::Arc;
 use euclid::vec3;
-use plane_split::{BspSplitter, Splitter, make_grid};
+use plane_split::{make_grid, BspSplitter, Splitter};
+use std::sync::Arc;
 
 #[bench]
 fn bench_bsp(b: &mut test::Bencher) {
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/.cargo-checksum.json firefox-85.0+build1/third_party/rust/plane-split/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/plane-split/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"bbf7428797ff113d822633c126ccf5e0e7584fe15c825048952623fdd99ab677","LICENSE":"b946744aeda89b467929585fe8eeb5461847695220c1b168fb375d8abd4ea3d0","README.md":"558d046c8c9ad79f23adef1e4b26c28c4599dcba56dadd60e2e7dc3a03ec2806","benches/split.rs":"632a011dfc6d8235dea853785061b7bbfe0362eb85b91b3b01fbf77a7f1c7f26","src/bsp.rs":"34c92cff76488fea23bee209fed62eee2db8c9687991c6413605961782e1317e","src/clip.rs":"e9ac9102f85709336088f3887b53273958aa9b2505d7ab06ba9a3e1e720aa540","src/lib.rs":"62613b64dacbfcd4727c5ce57e09bd9289db5a678f86dfe8544f1efc0f3f62b0","src/polygon.rs":"b8458d3c01dc06918b8410f363b19f15542522f1037cdd731f08b65e92a822bd","tests/clip.rs":"1a17f850cd770dbfb08c61779bf11f36f39e4315a00d3101c459e882b7982269","tests/main.rs":"5ebe911ddbb0e5449aacf060b977083c2bc43e3d8e5d5a3279d7e4950529f4a7","tests/split.rs":"fac076a403b87de1bdd0d11a54d36d0b02753868fc9cde5e5c5c1e03297da4ff"},"package":"2211e7ccc9b6260779dd9bad59f7b10889d6361974623b9e405afd7e7e764654"}
\ No newline at end of file
+{"files":{"Cargo.toml":"36e50e6fbc0d7e1b9587eacee54d75076503acf6d385e769ed606262dc4ff79b","LICENSE":"b946744aeda89b467929585fe8eeb5461847695220c1b168fb375d8abd4ea3d0","README.md":"558d046c8c9ad79f23adef1e4b26c28c4599dcba56dadd60e2e7dc3a03ec2806","benches/split.rs":"47dee7456a887b260af1a42590074ea2f4959c41344c636163434925d20ee903","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/bsp.rs":"5c4f9685348b04cd716050a74f4fcabde8c64cca1e7f7c50734e26301f467f64","src/clip.rs":"df110afc471a350a70241e6f2b2fcf1d967ad012745ae82ddec43a8934982fda","src/lib.rs":"c56c64dc8d405a5a2875efd9579a55cf6f1820eddaa466f6c2c120114d8736c2","src/polygon.rs":"02ed361aca6b44c22121718f874a98e346f310cdcccbe23fd8a5ec1211a46371","tests/clip.rs":"f49b3ae961c4a69714f1eccc575304b8d8d823f018d51a0841fa70214ce7c309","tests/main.rs":"2f4999f199e456cba234b60d252329fcc0c081158168484468002a184d65cc07","tests/split.rs":"84ff0f87e4d37710ee952397f78c95450945baddd7b8f57b0b0422fff50ecc64"},"package":"f3f7075ec146b897b6e0faca47adeb7ed3d4f6eaa8145bf19db17311081b3f63"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/Cargo.toml firefox-85.0+build1/third_party/rust/plane-split/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/plane-split/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "plane-split"
-version = "0.17.0"
+version = "0.17.1"
 authors = ["Dzmitry Malyshau <kvark@mozilla.com>"]
 description = "Plane splitting"
 documentation = "https://docs.rs/plane-split"
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/src/bsp.rs firefox-85.0+build1/third_party/rust/plane-split/src/bsp.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/src/bsp.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/src/bsp.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,31 +1,34 @@
-use {Intersection, Plane, Polygon, Splitter};
-use is_zero;
+use crate::{is_zero, Intersection, Plane, Polygon, Splitter};
 
 use binary_space_partition::{BspNode, Plane as BspPlane, PlaneCut};
-use euclid::{Point3D, Vector3D};
-use euclid::approxeq::ApproxEq;
+use euclid::{approxeq::ApproxEq, Point3D, Vector3D};
 use num_traits::{Float, One, Zero};
 
 use std::{fmt, iter, ops};
 
-
-impl<T, U, A> BspPlane for Polygon<T, U, A> where
-    T: Copy + fmt::Debug + ApproxEq<T> +
-        ops::Sub<T, Output=T> + ops::Add<T, Output=T> +
-        ops::Mul<T, Output=T> + ops::Div<T, Output=T> +
-        Zero + Float,
+impl<T, U, A> BspPlane for Polygon<T, U, A>
+where
+    T: Copy
+        + fmt::Debug
+        + ApproxEq<T>
+        + ops::Sub<T, Output = T>
+        + ops::Add<T, Output = T>
+        + ops::Mul<T, Output = T>
+        + ops::Div<T, Output = T>
+        + Zero
+        + Float,
     U: fmt::Debug,
     A: Copy + fmt::Debug,
 {
     fn cut(&self, mut poly: Self) -> PlaneCut<Self> {
-        debug!("\tCutting anchor {:?} by {:?}", poly.anchor, self.anchor);
-        trace!("\t\tbase {:?}", self.plane);
+        log::debug!("\tCutting anchor {:?} by {:?}", poly.anchor, self.anchor);
+        log::trace!("\t\tbase {:?}", self.plane);
 
         //Note: we treat `self` as a plane, and `poly` as a concrete polygon here
         let (intersection, dist) = match self.plane.intersect(&poly.plane) {
             None => {
                 let ndot = self.plane.normal.dot(poly.plane.normal);
-                debug!("\t\tNormals are aligned with {:?}", ndot);
+                log::debug!("\t\tNormals are aligned with {:?}", ndot);
                 let dist = self.plane.offset - ndot * poly.plane.offset;
                 (Intersection::Coplanar, dist)
             }
@@ -45,11 +48,11 @@
             // This is done to avoid mistakenly ordering items that should be on the same
             // plane but end up slightly different due to the floating point precision.
             Intersection::Coplanar if is_zero(dist) => {
-                debug!("\t\tCoplanar at {:?}", dist);
+                log::debug!("\t\tCoplanar at {:?}", dist);
                 PlaneCut::Sibling(poly)
             }
             Intersection::Coplanar | Intersection::Outside => {
-                debug!("\t\tOutside at {:?}", dist);
+                log::debug!("\t\tOutside at {:?}", dist);
                 if dist > T::zero() {
                     PlaneCut::Cut {
                         front: vec![poly],
@@ -63,7 +66,7 @@
                 }
             }
             Intersection::Inside(line) => {
-                debug!("\t\tCut across {:?}", line);
+                log::debug!("\t\tCut across {:?}", line);
                 let (res_add1, res_add2) = poly.split_with_normal(&line, &self.plane.normal);
                 let mut front = Vec::new();
                 let mut back = Vec::new();
@@ -75,19 +78,16 @@
                 {
                     let dist = self.plane.signed_distance_sum_to(&sub);
                     if dist > T::zero() {
-                        trace!("\t\t\tdist {:?} -> front: {:?}", dist, sub);
+                        log::trace!("\t\t\tdist {:?} -> front: {:?}", dist, sub);
                         front.push(sub)
                     } else {
-                        trace!("\t\t\tdist {:?} -> back: {:?}", dist, sub);
+                        log::trace!("\t\t\tdist {:?} -> back: {:?}", dist, sub);
                         back.push(sub)
                     }
                 }
 
-                PlaneCut::Cut {
-                    front,
-                    back,
-                }
-            },
+                PlaneCut::Cut { front, back }
+            }
         }
     }
 
@@ -96,7 +96,6 @@
     }
 }
 
-
 /// Binary Space Partitioning splitter, uses a BSP tree.
 pub struct BspSplitter<T, U, A> {
     tree: BspNode<Polygon<T, U, A>>,
@@ -113,11 +112,18 @@
     }
 }
 
-impl<T, U, A> Splitter<T, U, A> for BspSplitter<T, U, A> where
-    T: Copy + fmt::Debug + ApproxEq<T> +
-        ops::Sub<T, Output=T> + ops::Add<T, Output=T> +
-        ops::Mul<T, Output=T> + ops::Div<T, Output=T> +
-        Zero + One + Float,
+impl<T, U, A> Splitter<T, U, A> for BspSplitter<T, U, A>
+where
+    T: Copy
+        + fmt::Debug
+        + ApproxEq<T>
+        + ops::Sub<T, Output = T>
+        + ops::Add<T, Output = T>
+        + ops::Mul<T, Output = T>
+        + ops::Div<T, Output = T>
+        + Zero
+        + One
+        + Float,
     U: fmt::Debug,
     A: Copy + fmt::Debug + Default,
 {
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/src/clip.rs firefox-85.0+build1/third_party/rust/plane-split/src/clip.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/src/clip.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/src/clip.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,12 +1,10 @@
-use {Intersection, NegativeHemisphereError, Plane, Polygon};
+use crate::{Intersection, NegativeHemisphereError, Plane, Polygon};
 
-use euclid::{Trig, Rect, Scale, Transform3D, Vector3D};
-use euclid::approxeq::ApproxEq;
+use euclid::{approxeq::ApproxEq, Rect, Scale, Transform3D, Trig, Vector3D};
 use num_traits::{Float, One, Zero};
 
 use std::{fmt, iter, mem, ops};
 
-
 /// A helper object to clip polygons by a number of planes.
 #[derive(Debug)]
 pub struct Clipper<T, U, A> {
@@ -16,13 +14,20 @@
 }
 
 impl<
-    T: Copy + fmt::Debug + ApproxEq<T> +
-        ops::Sub<T, Output=T> + ops::Add<T, Output=T> +
-        ops::Mul<T, Output=T> + ops::Div<T, Output=T> +
-        Zero + One + Float,
-    U: fmt::Debug,
-    A: Copy + fmt::Debug,
-> Clipper<T, U, A> {
+        T: Copy
+            + fmt::Debug
+            + ApproxEq<T>
+            + ops::Sub<T, Output = T>
+            + ops::Add<T, Output = T>
+            + ops::Mul<T, Output = T>
+            + ops::Div<T, Output = T>
+            + Zero
+            + One
+            + Float,
+        U: fmt::Debug,
+        A: Copy + fmt::Debug,
+    > Clipper<T, U, A>
+{
     /// Create a new clipper object.
     pub fn new() -> Self {
         Clipper {
@@ -49,33 +54,26 @@
             Some(bounds) => {
                 let mx = Vector3D::new(t.m11, t.m21, t.m31);
                 let left = bounds.origin.x;
-                let plane_left = Plane::from_unnormalized(
-                    mx - mw * Scale::new(left),
-                    t.m41 - t.m44 * left,
-                )?;
+                let plane_left =
+                    Plane::from_unnormalized(mx - mw * Scale::new(left), t.m41 - t.m44 * left)?;
                 let right = bounds.origin.x + bounds.size.width;
-                let plane_right = Plane::from_unnormalized(
-                    mw * Scale::new(right) - mx,
-                    t.m44 * right - t.m41,
-                )?;
+                let plane_right =
+                    Plane::from_unnormalized(mw * Scale::new(right) - mx, t.m44 * right - t.m41)?;
 
                 let my = Vector3D::new(t.m12, t.m22, t.m32);
                 let top = bounds.origin.y;
-                let plane_top = Plane::from_unnormalized(
-                    my - mw * Scale::new(top),
-                    t.m42 - t.m44 * top,
-                )?;
+                let plane_top =
+                    Plane::from_unnormalized(my - mw * Scale::new(top), t.m42 - t.m44 * top)?;
                 let bottom = bounds.origin.y + bounds.size.height;
-                let plane_bottom = Plane::from_unnormalized(
-                    mw * Scale::new(bottom) - my,
-                    t.m44 * bottom - t.m42,
-                )?;
-
-                Some(plane_left
-                    .into_iter()
-                    .chain(plane_right)
-                    .chain(plane_top)
-                    .chain(plane_bottom)
+                let plane_bottom =
+                    Plane::from_unnormalized(mw * Scale::new(bottom) - my, t.m44 * bottom - t.m42)?;
+
+                Some(
+                    plane_left
+                        .into_iter()
+                        .chain(plane_right)
+                        .chain(plane_top)
+                        .chain(plane_bottom),
                 )
             }
             None => None,
@@ -84,8 +82,7 @@
         Ok(bounds_iter_maybe
             .into_iter()
             .flat_map(|pi| pi)
-            .chain(plane_positive)
-        )
+            .chain(plane_positive))
     }
 
     /// Add a clipping plane to the list. The plane will clip everything behind it,
@@ -96,7 +93,7 @@
 
     /// Clip specified polygon by the contained planes, return the fragmented polygons.
     pub fn clip(&mut self, polygon: Polygon<T, U, A>) -> &[Polygon<T, U, A>] {
-        debug!("\tClipping {:?}", polygon);
+        log::debug!("\tClipping {:?}", polygon);
         self.results.clear();
         self.results.push(polygon);
 
@@ -112,17 +109,15 @@
                             iter::once(poly)
                                 .chain(res1)
                                 .chain(res2)
-                                .filter(|p| clip.signed_distance_sum_to(p) > T::zero())
+                                .filter(|p| clip.signed_distance_sum_to(p) > T::zero()),
                         );
-                        continue
+                        continue;
                     }
                     Intersection::Coplanar => {
                         let ndot = poly.plane.normal.dot(clip.normal);
                         clip.offset - ndot * poly.plane.offset
                     }
-                    Intersection::Outside => {
-                        clip.signed_distance_sum_to(&poly)
-                    }
+                    Intersection::Outside => clip.signed_distance_sum_to(&poly),
                 };
 
                 if dist > T::zero() {
@@ -157,7 +152,8 @@
             self.clips.pop();
         }
 
-        let polys = self.results
+        let polys = self
+            .results
             .drain(..)
             .flat_map(move |poly| poly.transform(transform));
         Ok(polys)
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/src/lib.rs firefox-85.0+build1/third_party/rust/plane-split/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -10,18 +10,11 @@
 */
 #![warn(missing_docs)]
 
-extern crate binary_space_partition;
-extern crate euclid;
-#[macro_use]
-extern crate log;
-extern crate num_traits;
-
 mod bsp;
 mod clip;
 mod polygon;
 
-use euclid::{Point3D, Scale, Vector3D};
-use euclid::approxeq::ApproxEq;
+use euclid::{approxeq::ApproxEq, Point3D, Scale, Vector3D};
 use num_traits::{Float, One, Zero};
 
 use std::ops;
@@ -30,20 +23,26 @@
 pub use self::clip::Clipper;
 pub use self::polygon::{Intersection, LineProjection, Polygon};
 
-
-fn is_zero<T>(value: T) -> bool where
-    T: Copy + Zero + ApproxEq<T> + ops::Mul<T, Output=T> {
+fn is_zero<T>(value: T) -> bool
+where
+    T: Copy + Zero + ApproxEq<T> + ops::Mul<T, Output = T>,
+{
     //HACK: this is rough, but the original Epsilon is too strict
     (value * value).approx_eq(&T::zero())
 }
 
-fn is_zero_vec<T, U>(vec: Vector3D<T, U>) -> bool where
-   T: Copy + Zero + ApproxEq<T> +
-      ops::Add<T, Output=T> + ops::Sub<T, Output=T> + ops::Mul<T, Output=T> {
+fn is_zero_vec<T, U>(vec: Vector3D<T, U>) -> bool
+where
+    T: Copy
+        + Zero
+        + ApproxEq<T>
+        + ops::Add<T, Output = T>
+        + ops::Sub<T, Output = T>
+        + ops::Mul<T, Output = T>,
+{
     vec.dot(vec).approx_eq(&T::zero())
 }
 
-
 /// A generic line.
 #[derive(Debug)]
 pub struct Line<T, U> {
@@ -53,9 +52,15 @@
     pub dir: Vector3D<T, U>,
 }
 
-impl<T, U> Line<T, U> where
-    T: Copy + One + Zero + ApproxEq<T> +
-       ops::Add<T, Output=T> + ops::Sub<T, Output=T> + ops::Mul<T, Output=T>
+impl<T, U> Line<T, U>
+where
+    T: Copy
+        + One
+        + Zero
+        + ApproxEq<T>
+        + ops::Add<T, Output = T>
+        + ops::Sub<T, Output = T>
+        + ops::Mul<T, Output = T>,
 {
     /// Check if the line has consistent parameters.
     pub fn is_valid(&self) -> bool {
@@ -64,17 +69,14 @@
     /// Check if two lines match each other.
     pub fn matches(&self, other: &Self) -> bool {
         let diff = self.origin - other.origin;
-        is_zero_vec(self.dir.cross(other.dir)) &&
-        is_zero_vec(self.dir.cross(diff))
+        is_zero_vec(self.dir.cross(other.dir)) && is_zero_vec(self.dir.cross(diff))
     }
 
     /// Intersect an edge given by the end points.
     /// Returns the fraction of the edge where the intersection occurs.
-    fn intersect_edge(
-        &self,
-        edge: ops::Range<Point3D<T, U>>,
-    ) -> Option<T>
-    where T: ops::Div<T, Output=T>
+    fn intersect_edge(&self, edge: ops::Range<Point3D<T, U>>) -> Option<T>
+    where
+        T: ops::Div<T, Output = T>,
     {
         let edge_vec = edge.end - edge.start;
         let origin_vec = self.origin - edge.start;
@@ -93,7 +95,6 @@
     }
 }
 
-
 /// An infinite plane in 3D space, defined by equation:
 /// dot(v, normal) + offset = 0
 /// When used for plane splitting, it's defining a hemisphere
@@ -122,14 +123,22 @@
 pub struct NegativeHemisphereError;
 
 impl<
-    T: Copy + Zero + One + Float + ApproxEq<T> +
-        ops::Sub<T, Output=T> + ops::Add<T, Output=T> +
-        ops::Mul<T, Output=T> + ops::Div<T, Output=T>,
-    U,
-> Plane<T, U> {
+        T: Copy
+            + Zero
+            + One
+            + Float
+            + ApproxEq<T>
+            + ops::Sub<T, Output = T>
+            + ops::Add<T, Output = T>
+            + ops::Mul<T, Output = T>
+            + ops::Div<T, Output = T>,
+        U,
+    > Plane<T, U>
+{
     /// Construct a new plane from unnormalized equation.
     pub fn from_unnormalized(
-        normal: Vector3D<T, U>, offset: T
+        normal: Vector3D<T, U>,
+        offset: T,
     ) -> Result<Option<Self>, NegativeHemisphereError> {
         let square_len = normal.square_length();
         if square_len < T::approx_epsilon() * T::approx_epsilon() {
@@ -163,7 +172,9 @@
     /// Compute the distance across the line to the plane plane,
     /// starting from the line origin.
     pub fn distance_to_line(&self, line: &Line<T, U>) -> T
-    where T: ops::Neg<Output=T> {
+    where
+        T: ops::Neg<Output = T>,
+    {
         self.signed_distance_to(&line.origin) / -self.normal.dot(line.dir)
     }
 
@@ -197,11 +208,10 @@
         let w = self.normal.dot(other.normal);
         let divisor = T::one() - w * w;
         if divisor < T::approx_epsilon() * T::approx_epsilon() {
-            return None
+            return None;
         }
-        let origin = Point3D::origin() +
-            self.normal * ((other.offset * w - self.offset) / divisor) -
-            other.normal* ((other.offset - self.offset * w) / divisor);
+        let origin = Point3D::origin() + self.normal * ((other.offset * w - self.offset) / divisor)
+            - other.normal * ((other.offset - self.offset * w) / divisor);
 
         let cross_dir = self.normal.cross(other.normal);
         // note: the cross product isn't too close to zero
@@ -214,8 +224,6 @@
     }
 }
 
-
-
 /// Generic plane splitter interface
 pub trait Splitter<T, U, A> {
     /// Reset the splitter results.
@@ -230,11 +238,7 @@
     fn sort(&mut self, view: Vector3D<T, U>) -> &[Polygon<T, U, A>];
 
     /// Process a set of polygons at once.
-    fn solve(
-        &mut self,
-        input: &[Polygon<T, U, A>],
-        view: Vector3D<T, U>,
-    ) -> &[Polygon<T, U, A>]
+    fn solve(&mut self, input: &[Polygon<T, U, A>], view: Vector3D<T, U>) -> &[Polygon<T, U, A>]
     where
         T: Clone,
         U: Clone,
@@ -248,14 +252,13 @@
     }
 }
 
-
 /// Helper method used for benchmarks and tests.
 /// Constructs a 3D grid of polygons.
 #[doc(hidden)]
 pub fn make_grid(count: usize) -> Vec<Polygon<f32, (), usize>> {
-    let mut polys: Vec<Polygon<f32, (), usize>> = Vec::with_capacity(count*3);
+    let mut polys: Vec<Polygon<f32, (), usize>> = Vec::with_capacity(count * 3);
     let len = count as f32;
-    polys.extend((0 .. count).map(|i| Polygon {
+    polys.extend((0..count).map(|i| Polygon {
         points: [
             Point3D::new(0.0, i as f32, 0.0),
             Point3D::new(len, i as f32, 0.0),
@@ -268,7 +271,7 @@
         },
         anchor: 0,
     }));
-    polys.extend((0 .. count).map(|i| Polygon {
+    polys.extend((0..count).map(|i| Polygon {
         points: [
             Point3D::new(i as f32, 0.0, 0.0),
             Point3D::new(i as f32, len, 0.0),
@@ -281,7 +284,7 @@
         },
         anchor: 0,
     }));
-    polys.extend((0 .. count).map(|i| Polygon {
+    polys.extend((0..count).map(|i| Polygon {
         points: [
             Point3D::new(0.0, 0.0, i as f32),
             Point3D::new(len, 0.0, i as f32),
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/src/polygon.rs firefox-85.0+build1/third_party/rust/plane-split/src/polygon.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/src/polygon.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/src/polygon.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,26 +1,28 @@
-use {Line, Plane, is_zero};
+use crate::{is_zero, Line, Plane};
 
-use euclid::default::Point2D;
-use euclid::{Transform3D, Point3D, Vector3D, Rect};
-use euclid::approxeq::ApproxEq;
-use euclid::Trig;
+use euclid::{approxeq::ApproxEq, default::Point2D, Point3D, Rect, Transform3D, Trig, Vector3D};
 use num_traits::{Float, One, Zero};
 
 use std::{fmt, iter, mem, ops};
 
-
 /// The projection of a `Polygon` on a line.
 pub struct LineProjection<T> {
     /// Projected value of each point in the polygon.
     pub markers: [T; 4],
 }
 
-impl<T> LineProjection<T> where
-    T : Copy + PartialOrd + ops::Sub<T, Output=T> + ops::Add<T, Output=T>
+impl<T> LineProjection<T>
+where
+    T: Copy + PartialOrd + ops::Sub<T, Output = T> + ops::Add<T, Output = T>,
 {
     /// Get the min/max of the line projection markers.
     pub fn get_bounds(&self) -> (T, T) {
-        let (mut a, mut b, mut c, mut d) = (self.markers[0], self.markers[1], self.markers[2], self.markers[3]);
+        let (mut a, mut b, mut c, mut d) = (
+            self.markers[0],
+            self.markers[1],
+            self.markers[2],
+            self.markers[3],
+        );
         // bitonic sort of 4 elements
         // we could not just use `min/max` since they require `Ord` bound
         //TODO: make it nicer
@@ -49,14 +51,21 @@
         let span = self.get_bounds();
         let other_span = other.get_bounds();
         // compute the total footprint
-        let left = if span.0 < other_span.0 { span.0 } else { other_span.0 };
-        let right = if span.1 > other_span.1 { span.1 } else { other_span.1 };
+        let left = if span.0 < other_span.0 {
+            span.0
+        } else {
+            other_span.0
+        };
+        let right = if span.1 > other_span.1 {
+            span.1
+        } else {
+            other_span.1
+        };
         // they intersect if the footprint is smaller than the sum
         right - left < span.1 - span.0 + other_span.1 - other_span.0
     }
 }
 
-
 /// Polygon intersection results.
 pub enum Intersection<T> {
     /// Polygons are coplanar, including the case of being on the same plane.
@@ -84,7 +93,6 @@
     }
 }
 
-
 /// A convex polygon with 4 points lying on a plane.
 #[derive(Debug, PartialEq)]
 pub struct Polygon<T, U, A> {
@@ -102,9 +110,9 @@
         Polygon {
             points: [
                 self.points[0].clone(),
-                 self.points[1].clone(),
-                 self.points[2].clone(),
-                 self.points[3].clone(),
+                self.points[1].clone(),
+                self.points[2].clone(),
+                self.points[3].clone(),
             ],
             plane: self.plane.clone(),
             anchor: self.anchor,
@@ -112,27 +120,31 @@
     }
 }
 
-impl<T, U, A> Polygon<T, U, A> where
-    T: Copy + fmt::Debug + ApproxEq<T> +
-        ops::Sub<T, Output=T> + ops::Add<T, Output=T> +
-        ops::Mul<T, Output=T> + ops::Div<T, Output=T> +
-        Zero + One + Float,
+impl<T, U, A> Polygon<T, U, A>
+where
+    T: Copy
+        + fmt::Debug
+        + ApproxEq<T>
+        + ops::Sub<T, Output = T>
+        + ops::Add<T, Output = T>
+        + ops::Mul<T, Output = T>
+        + ops::Div<T, Output = T>
+        + Zero
+        + One
+        + Float,
     U: fmt::Debug,
     A: Copy,
 {
     /// Construct a polygon from points that are already transformed.
     /// Return None if the polygon doesn't contain any space.
-    pub fn from_points(
-        points: [Point3D<T, U>; 4],
-        anchor: A,
-    ) -> Option<Self> {
+    pub fn from_points(points: [Point3D<T, U>; 4], anchor: A) -> Option<Self> {
         let edge1 = points[1] - points[0];
         let edge2 = points[2] - points[0];
         let edge3 = points[3] - points[0];
         let edge4 = points[3] - points[1];
 
         if edge2.square_length() < T::epsilon() || edge4.square_length() < T::epsilon() {
-            return None
+            return None;
         }
 
         // one of them can be zero for redundant polygons produced by plane splitting
@@ -148,15 +160,11 @@
             normal_rough2 / square_length2.sqrt()
         };
 
-        let offset = -points[0].to_vector()
-            .dot(normal);
+        let offset = -points[0].to_vector().dot(normal);
 
         Some(Polygon {
             points,
-            plane: Plane {
-                normal,
-                offset,
-            },
+            plane: Plane { normal, offset },
             anchor,
         })
     }
@@ -188,7 +196,7 @@
         anchor: A,
     ) -> Option<Self>
     where
-        T: Trig + ops::Neg<Output=T>,
+        T: Trig + ops::Neg<Output = T>,
     {
         let min = rect.min();
         let max = rect.max();
@@ -210,7 +218,7 @@
         anchor: A,
     ) -> Option<Self>
     where
-        T: Trig + ops::Neg<Output=T>,
+        T: Trig + ops::Neg<Output = T>,
     {
         let min = rect.min();
         let max = rect.max();
@@ -230,15 +238,12 @@
             None
         } else {
             let normal = normal_raw / normal_sql.sqrt();
-            let offset = -Vector3D::new(transform.m41, transform.m42, transform.m43)
-                .dot(normal) / transform.m44;
+            let offset = -Vector3D::new(transform.m41, transform.m42, transform.m43).dot(normal)
+                / transform.m44;
 
             Some(Polygon {
                 points,
-                plane: Plane {
-                    normal,
-                    offset,
-                },
+                plane: Plane { normal, offset },
                 anchor,
             })
         }
@@ -266,9 +271,7 @@
     }
 
     /// Transform a polygon by an affine transform (preserving straight lines).
-    pub fn transform<V>(
-        &self, transform: &Transform3D<T, U, V>
-    ) -> Option<Polygon<T, V, A>>
+    pub fn transform<V>(&self, transform: &Transform3D<T, U, V>) -> Option<Polygon<T, V, A>>
     where
         T: Trig,
         V: fmt::Debug,
@@ -289,7 +292,8 @@
     /// Check if all the points are indeed placed on the plane defined by
     /// the normal and offset, and the winding order is consistent.
     pub fn is_valid(&self) -> bool {
-        let is_planar = self.points
+        let is_planar = self
+            .points
             .iter()
             .all(|p| is_zero(self.plane.signed_distance_to(p)));
         let edges = [
@@ -309,8 +313,8 @@
     /// Check if the polygon doesn't contain any space. This may happen
     /// after a sequence of splits, and such polygons should be discarded.
     pub fn is_empty(&self) -> bool {
-        (self.points[0] - self.points[2]).square_length() < T::epsilon() ||
-        (self.points[1] - self.points[3]).square_length() < T::epsilon()
+        (self.points[0] - self.points[2]).square_length() < T::epsilon()
+            || (self.points[1] - self.points[3]).square_length() < T::epsilon()
     }
 
     /// Check if this polygon contains another one.
@@ -335,13 +339,13 @@
     /// Compute the line of intersection with an infinite plane.
     pub fn intersect_plane(&self, other: &Plane<T, U>) -> Intersection<Line<T, U>> {
         if other.are_outside(&self.points) {
-            debug!("\t\tOutside of the plane");
-            return Intersection::Outside
+            log::debug!("\t\tOutside of the plane");
+            return Intersection::Outside;
         }
         match self.plane.intersect(&other) {
             Some(line) => Intersection::Inside(line),
             None => {
-                debug!("\t\tCoplanar");
+                log::debug!("\t\tCoplanar");
                 Intersection::Coplanar
             }
         }
@@ -350,8 +354,8 @@
     /// Compute the line of intersection with another polygon.
     pub fn intersect(&self, other: &Self) -> Intersection<Line<T, U>> {
         if self.plane.are_outside(&other.points) || other.plane.are_outside(&self.points) {
-            debug!("\t\tOne is completely outside of the other");
-            return Intersection::Outside
+            log::debug!("\t\tOne is completely outside of the other");
+            return Intersection::Outside;
         }
         match self.plane.intersect(&other.plane) {
             Some(line) => {
@@ -361,12 +365,12 @@
                     Intersection::Inside(line)
                 } else {
                     // projections on the line don't intersect
-                    debug!("\t\tProjection is outside");
+                    log::debug!("\t\tProjection is outside");
                     Intersection::Outside
                 }
             }
             None => {
-                debug!("\t\tCoplanar");
+                log::debug!("\t\tCoplanar");
                 Intersection::Coplanar
             }
         }
@@ -379,7 +383,7 @@
     ) -> (Option<Self>, Option<Self>) {
         //TODO: can be optimized for when the polygon has a redundant 4th vertex
         //TODO: can be simplified greatly if only working with triangles
-        debug!("\t\tReached complex case [{}, {}]", first.0, second.0);
+        log::debug!("\t\tReached complex case [{}, {}]", first.0, second.0);
         let base = first.0;
         assert!(base < self.points.len());
         match second.0 - first.0 {
@@ -392,7 +396,7 @@
                         self.points[(base + 2) & 3],
                         self.points[base],
                     ],
-                    .. self.clone()
+                    ..self.clone()
                 };
                 // triangle on the near side of the diagonal
                 let other2 = Polygon {
@@ -402,15 +406,10 @@
                         self.points[base],
                         self.points[base],
                     ],
-                    .. self.clone()
+                    ..self.clone()
                 };
                 // triangle being cut out
-                self.points = [
-                    first.1,
-                    self.points[(base + 1) & 3],
-                    second.1,
-                    second.1,
-                ];
+                self.points = [first.1, self.points[(base + 1) & 3], second.1, second.1];
                 (Some(other1), Some(other2))
             }
             2 => {
@@ -422,7 +421,7 @@
                         self.points[(base + 2) & 3],
                         second.1,
                     ],
-                    .. self.clone()
+                    ..self.clone()
                 };
                 // rect on the near side
                 self.points = [
@@ -442,7 +441,7 @@
                         self.points[(base + 3) & 3],
                         second.1,
                     ],
-                    .. self.clone()
+                    ..self.clone()
                 };
                 // triangle on the far side of the diagonal
                 let other2 = Polygon {
@@ -452,15 +451,10 @@
                         self.points[(base + 3) & 3],
                         self.points[(base + 3) & 3],
                     ],
-                    .. self.clone()
+                    ..self.clone()
                 };
                 // triangle being cut out
-                self.points = [
-                    first.1,
-                    second.1,
-                    self.points[base],
-                    self.points[base],
-                ];
+                self.points = [first.1, second.1, self.points[base], self.points[base]];
                 (Some(other1), Some(other2))
             }
             _ => panic!("Unexpected indices {} {}", first.0, second.0),
@@ -471,24 +465,29 @@
     /// Will do nothing if the line doesn't belong to the polygon plane.
     #[deprecated(note = "Use split_with_normal instead")]
     pub fn split(&mut self, line: &Line<T, U>) -> (Option<Self>, Option<Self>) {
-        debug!("\tSplitting");
+        log::debug!("\tSplitting");
         // check if the cut is within the polygon plane first
-        if !is_zero(self.plane.normal.dot(line.dir)) ||
-           !is_zero(self.plane.signed_distance_to(&line.origin)) {
-            debug!("\t\tDoes not belong to the plane, normal dot={:?}, origin distance={:?}",
-                self.plane.normal.dot(line.dir), self.plane.signed_distance_to(&line.origin));
-            return (None, None)
+        if !is_zero(self.plane.normal.dot(line.dir))
+            || !is_zero(self.plane.signed_distance_to(&line.origin))
+        {
+            log::debug!(
+                "\t\tDoes not belong to the plane, normal dot={:?}, origin distance={:?}",
+                self.plane.normal.dot(line.dir),
+                self.plane.signed_distance_to(&line.origin)
+            );
+            return (None, None);
         }
         // compute the intersection points for each edge
         let mut cuts = [None; 4];
-        for ((&b, &a), cut) in self.points
+        for ((&b, &a), cut) in self
+            .points
             .iter()
             .cycle()
             .skip(1)
             .zip(self.points.iter())
             .zip(cuts.iter_mut())
         {
-            if let Some(t) = line.intersect_edge(a .. b) {
+            if let Some(t) = line.intersect_edge(a..b) {
                 if t >= T::zero() && t < T::one() {
                     *cut = Some(a + (b - a) * t);
                 }
@@ -499,7 +498,7 @@
             Some(pos) => pos,
             None => return (None, None),
         };
-        let second = match cuts[first+1 ..].iter().position(|c| c.is_some()) {
+        let second = match cuts[first + 1..].iter().position(|c| c.is_some()) {
             Some(pos) => first + 1 + pos,
             None => return (None, None),
         };
@@ -514,9 +513,11 @@
     /// forms the side direction here, and figuring out the actual line of split isn't needed.
     /// Will do nothing if the line doesn't belong to the polygon plane.
     pub fn split_with_normal(
-        &mut self, line: &Line<T, U>, normal: &Vector3D<T, U>,
+        &mut self,
+        line: &Line<T, U>,
+        normal: &Vector3D<T, U>,
     ) -> (Option<Self>, Option<Self>) {
-        debug!("\tSplitting with normal");
+        log::debug!("\tSplitting with normal");
         // figure out which side of the split does each point belong to
         let mut sides = [T::zero(); 4];
         let (mut cut_positive, mut cut_negative) = (None, None);
@@ -548,8 +549,15 @@
             // Given that we are intersecting two straight lines, the triangles on both
             // sides of intersection are alike, so distances along the [point0, point1] line
             // are proportional to the side vector lengths we just computed: (side0, side1).
-            let point = (*point0 * side1.abs() + point1.to_vector() * side0.abs()) / (side0 - side1).abs();
-            debug_assert_eq!(*cut, None);
+            let point =
+                (*point0 * side1.abs() + point1.to_vector() * side0.abs()) / (side0 - side1).abs();
+            if cut.is_some() {
+                // We don't expect that the direction changes more than once, unless
+                // the polygon is close to redundant, and we hit precision issues when
+                // computing the sides.
+                log::warn!("Splitting failed due to precision issues: {:?}", sides);
+                break;
+            }
             *cut = Some((i, point));
         }
         // form new polygons
@@ -563,3 +571,27 @@
         }
     }
 }
+
+#[test]
+fn test_split_precision() {
+    // regression test for https://bugzilla.mozilla.org/show_bug.cgi?id=1678454
+    let mut polygon = Polygon::<_, (), ()> {
+        points: [
+            Point3D::new(300.0102, 150.00958, 0.0),
+            Point3D::new(606.0, 306.0, 0.0),
+            Point3D::new(300.21954, 150.11946, 0.0),
+            Point3D::new(300.08844, 150.05064, 0.0),
+        ],
+        plane: Plane {
+            normal: Vector3D::zero(),
+            offset: 0.0,
+        },
+        anchor: (),
+    };
+    let line = Line {
+        origin: Point3D::new(3.0690663, -5.8472385, 0.0),
+        dir: Vector3D::new(0.8854436, 0.46474677, -0.0),
+    };
+    let normal = Vector3D::new(0.46474662, -0.8854434, -0.0006389789);
+    polygon.split_with_normal(&line, &normal);
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/tests/clip.rs firefox-85.0+build1/third_party/rust/plane-split/tests/clip.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/tests/clip.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/tests/clip.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,16 +1,13 @@
-extern crate euclid;
-extern crate plane_split;
-
-use euclid::{point3, rect, vec3};
-use euclid::{Angle, Rect, Transform3D};
+use euclid::{point3, rect, vec3, Angle, Rect, Transform3D};
 use plane_split::{Clipper, Plane, Polygon};
 
 use std::f32::consts::FRAC_PI_4;
 
-
 #[test]
 fn clip_in() {
-    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), 20.0).unwrap().unwrap();
+    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), 20.0)
+        .unwrap()
+        .unwrap();
     let mut clipper = Clipper::new();
     clipper.add(plane);
 
@@ -22,7 +19,8 @@
             point3(-10.0, 10.0, 0.0),
         ],
         0,
-    ).unwrap();
+    )
+    .unwrap();
 
     let results = clipper.clip(poly.clone());
     assert_eq!(results[0], poly);
@@ -31,7 +29,9 @@
 
 #[test]
 fn clip_out() {
-    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), -20.0).unwrap().unwrap();
+    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), -20.0)
+        .unwrap()
+        .unwrap();
     let mut clipper = Clipper::new();
     clipper.add(plane);
 
@@ -43,7 +43,8 @@
             point3(-10.0, 10.0, 0.0),
         ],
         0,
-    ).unwrap();
+    )
+    .unwrap();
 
     let results = clipper.clip(poly);
     assert!(results.is_empty());
@@ -66,7 +67,8 @@
             point3(-10.0, 10.0, 0.0),
         ],
         0,
-    ).unwrap();
+    )
+    .unwrap();
 
     let results = clipper.clip(poly);
     assert!(results.is_empty());
@@ -74,7 +76,9 @@
 
 #[test]
 fn clip_repeat() {
-    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), 0.0).unwrap().unwrap();
+    let plane: Plane<f32, ()> = Plane::from_unnormalized(vec3(1.0, 0.0, 1.0), 0.0)
+        .unwrap()
+        .unwrap();
     let mut clipper = Clipper::new();
     clipper.add(plane.clone());
     clipper.add(plane.clone());
@@ -87,7 +91,8 @@
             point3(-10.0, 10.0, 0.0),
         ],
         0,
-    ).unwrap();
+    )
+    .unwrap();
 
     let results = clipper.clip(poly);
     assert_eq!(results.len(), 1);
@@ -98,8 +103,7 @@
 fn clip_transformed() {
     let t_rot: Transform3D<f32, (), ()> =
         Transform3D::rotation(0.0, 1.0, 0.0, Angle::radians(-FRAC_PI_4));
-    let t_div: Transform3D<f32, (), ()> =
-        Transform3D::perspective(5.0);
+    let t_div: Transform3D<f32, (), ()> = Transform3D::perspective(5.0);
     let transform = t_rot.then(&t_div);
 
     let polygon = Polygon::from_rect(rect(-10.0, -10.0, 20.0, 20.0), 0);
@@ -126,10 +130,7 @@
 #[test]
 fn clip_near_coplanar() {
     let tx = Transform3D::<f32, (), ()>::new(
-        1.0, 0.0, 0.0, 0.0,
-        0.0, 1.0, 0.0, 0.0,
-        -960.0, -625.0, 1.0, -1.0,
-        100.0, -2852.0, 0.0, 1.0,
+        1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, -960.0, -625.0, 1.0, -1.0, 100.0, -2852.0, 0.0, 1.0,
     );
     let mut clipper = Clipper::new();
     let polygon = Polygon::from_rect(rect(0.0, 0.0, 1703.0, 4020.0), 0);
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/tests/main.rs firefox-85.0+build1/third_party/rust/plane-split/tests/main.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/tests/main.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/tests/main.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,15 +1,22 @@
-extern crate euclid;
-extern crate plane_split;
-
-use euclid::{Angle, Rect, Size2D, Transform3D, point2, point3, vec3};
-use euclid::approxeq::ApproxEq;
+use euclid::{approxeq::ApproxEq, point2, point3, vec3, Angle, Rect, Size2D, Transform3D};
 use plane_split::{Intersection, Line, LineProjection, NegativeHemisphereError, Plane, Polygon};
 
-
 #[test]
 fn line_proj_bounds() {
-    assert_eq!((-5i8, 4), LineProjection { markers: [-5i8, 1, 4, 2] }.get_bounds());
-    assert_eq!((1f32, 4.0), LineProjection { markers: [4f32, 3.0, 2.0, 1.0] }.get_bounds());
+    assert_eq!(
+        (-5i8, 4),
+        LineProjection {
+            markers: [-5i8, 1, 4, 2]
+        }
+        .get_bounds()
+    );
+    assert_eq!(
+        (1f32, 4.0),
+        LineProjection {
+            markers: [4f32, 3.0, 2.0, 1.0]
+        }
+        .get_bounds()
+    );
 }
 
 #[test]
@@ -77,7 +84,8 @@
     assert!(poly.is_valid());
 
     let inv_transform = transform.inverse().unwrap();
-    let poly2 = Polygon::from_transformed_rect_with_inverse(rect, &transform, &inv_transform, 0).unwrap();
+    let poly2 =
+        Polygon::from_transformed_rect_with_inverse(rect, &transform, &inv_transform, 0).unwrap();
     assert_eq!(poly.points, poly2.points);
     assert!(poly.plane.offset.approx_eq(&poly2.plane.offset));
     assert!(poly.plane.normal.dot(poly2.plane.normal).approx_eq(&1.0));
@@ -86,8 +94,7 @@
 #[test]
 fn from_transformed_rect() {
     let rect = Rect::new(point2(10.0, 10.0), Size2D::new(20.0, 30.0));
-    let transform =
-        Transform3D::rotation(0.5f32.sqrt(), 0.0, 0.5f32.sqrt(), Angle::radians(5.0))
+    let transform = Transform3D::rotation(0.5f32.sqrt(), 0.0, 0.5f32.sqrt(), Angle::radians(5.0))
         .pre_translate(vec3(0.0, 0.0, 10.0));
     test_transformed(rect, transform);
 }
@@ -95,9 +102,7 @@
 #[test]
 fn from_transformed_rect_perspective() {
     let rect = Rect::new(point2(-10.0, -5.0), Size2D::new(20.0, 30.0));
-    let mut transform =
-        Transform3D::perspective(400.0)
-        .pre_translate(vec3(0.0, 0.0, 100.0));
+    let mut transform = Transform3D::perspective(400.0).pre_translate(vec3(0.0, 0.0, 100.0));
     transform.m44 = 0.7; //for fun
     test_transformed(rect, transform);
 }
@@ -129,17 +134,9 @@
         normal: vec3(0.0, 0.0, 1.0),
         offset: -1.0,
     };
-    assert!(plane.are_outside(&[
-        point3(0.0, 0.0, 1.1),
-        point3(1.0, 1.0, 2.0),
-    ]));
-    assert!(plane.are_outside(&[
-        point3(0.5, 0.5, 1.0),
-    ]));
-    assert!(!plane.are_outside(&[
-        point3(0.0, 0.0, 1.0),
-        point3(0.0, 0.0, -1.0),
-    ]));
+    assert!(plane.are_outside(&[point3(0.0, 0.0, 1.1), point3(1.0, 1.0, 2.0),]));
+    assert!(plane.are_outside(&[point3(0.5, 0.5, 1.0),]));
+    assert!(!plane.are_outside(&[point3(0.0, 0.0, 1.0), point3(0.0, 0.0, -1.0),]));
 }
 
 #[test]
@@ -179,8 +176,14 @@
     };
     assert!(intersection.is_valid());
     // confirm the origin is on both planes
-    assert!(poly_a.plane.signed_distance_to(&intersection.origin).approx_eq(&0.0));
-    assert!(poly_b.plane.signed_distance_to(&intersection.origin).approx_eq(&0.0));
+    assert!(poly_a
+        .plane
+        .signed_distance_to(&intersection.origin)
+        .approx_eq(&0.0));
+    assert!(poly_b
+        .plane
+        .signed_distance_to(&intersection.origin)
+        .approx_eq(&0.0));
     // confirm the direction is coplanar to both planes
     assert!(poly_a.plane.normal.dot(intersection.dir).approx_eq(&0.0));
     assert!(poly_b.plane.normal.dot(intersection.dir).approx_eq(&0.0));
@@ -218,11 +221,7 @@
     assert!(poly_a.intersect(&poly_d).is_outside());
 }
 
-fn test_cut(
-    poly_base: &Polygon<f32, (), usize>,
-    extra_count: u8,
-    line: Line<f32, ()>,
-) {
+fn test_cut(poly_base: &Polygon<f32, (), usize>, extra_count: u8, line: Line<f32, ()>) {
     assert!(line.is_valid());
 
     let normal = poly_base.plane.normal.cross(line.dir).normalize();
@@ -256,40 +255,64 @@
     };
 
     // non-intersecting line
-    test_cut(&poly, 0, Line {
-        origin: point3(0.0, 1.0, 0.5),
-        dir: vec3(0.0, 1.0, 0.0),
-    });
+    test_cut(
+        &poly,
+        0,
+        Line {
+            origin: point3(0.0, 1.0, 0.5),
+            dir: vec3(0.0, 1.0, 0.0),
+        },
+    );
 
     // simple cut (diff=2)
-    test_cut(&poly, 1, Line {
-        origin: point3(0.0, 1.0, 0.5),
-        dir: vec3(1.0, 0.0, 0.0),
-    });
+    test_cut(
+        &poly,
+        1,
+        Line {
+            origin: point3(0.0, 1.0, 0.5),
+            dir: vec3(1.0, 0.0, 0.0),
+        },
+    );
 
     // complex cut (diff=1, wrapped)
-    test_cut(&poly, 2, Line {
-        origin: point3(0.0, 1.0, 0.5),
-        dir: vec3(0.5f32.sqrt(), 0.0, -0.5f32.sqrt()),
-    });
+    test_cut(
+        &poly,
+        2,
+        Line {
+            origin: point3(0.0, 1.0, 0.5),
+            dir: vec3(0.5f32.sqrt(), 0.0, -0.5f32.sqrt()),
+        },
+    );
 
     // complex cut (diff=1, non-wrapped)
-    test_cut(&poly, 2, Line {
-        origin: point3(0.5, 1.0, 0.0),
-        dir: vec3(0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
-    });
+    test_cut(
+        &poly,
+        2,
+        Line {
+            origin: point3(0.5, 1.0, 0.0),
+            dir: vec3(0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
+        },
+    );
 
     // complex cut (diff=3)
-    test_cut(&poly, 2, Line {
-        origin: point3(0.5, 1.0, 0.0),
-        dir: vec3(-0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
-    });
+    test_cut(
+        &poly,
+        2,
+        Line {
+            origin: point3(0.5, 1.0, 0.0),
+            dir: vec3(-0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
+        },
+    );
 
     // perfect diagonal
-    test_cut(&poly, 1, Line {
-        origin: point3(0.0, 1.0, 0.0),
-        dir: vec3(0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
-    });
+    test_cut(
+        &poly,
+        1,
+        Line {
+            origin: point3(0.0, 1.0, 0.0),
+            dir: vec3(0.5f32.sqrt(), 0.0, 0.5f32.sqrt()),
+        },
+    );
 }
 
 #[test]
@@ -303,8 +326,11 @@
     assert_eq!(plane, Err(NegativeHemisphereError));
 
     plane = Plane::from_unnormalized(vec3(-3.0, 4.0, 0.0), 2.0);
-    assert_eq!(plane, Ok(Some(Plane {
-        normal: vec3(-3.0/5.0, 4.0/5.0, 0.0),
-        offset: 2.0/5.0,
-    })));
+    assert_eq!(
+        plane,
+        Ok(Some(Plane {
+            normal: vec3(-3.0 / 5.0, 4.0 / 5.0, 0.0),
+            offset: 2.0 / 5.0,
+        }))
+    );
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/plane-split/tests/split.rs firefox-85.0+build1/third_party/rust/plane-split/tests/split.rs
--- firefox-84.0.2+build1/third_party/rust/plane-split/tests/split.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plane-split/tests/split.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,17 +1,12 @@
-extern crate binary_space_partition;
-extern crate euclid;
-extern crate plane_split;
-
-use std::f32::consts::FRAC_PI_4;
 use binary_space_partition::{Plane as Plane_, PlaneCut};
-use euclid::{Angle, Transform3D, Rect, rect, vec3};
-use plane_split::{BspSplitter, Polygon, Splitter, make_grid};
-
+use euclid::{rect, vec3, Angle, Rect, Transform3D};
+use plane_split::{make_grid, BspSplitter, Polygon, Splitter};
+use std::f32::consts::FRAC_PI_4;
 
 fn grid_impl(count: usize, splitter: &mut dyn Splitter<f32, (), usize>) {
     let polys = make_grid(count);
     let result = splitter.solve(&polys, vec3(0.0, 0.0, 1.0));
-    assert_eq!(result.len(), count + count*count + count*count*count);
+    assert_eq!(result.len(), count + count * count + count * count * count);
 }
 
 #[test]
@@ -19,7 +14,6 @@
     grid_impl(2, &mut BspSplitter::new());
 }
 
-
 fn sort_rotation(splitter: &mut dyn Splitter<f32, (), usize>) {
     let transform0: Transform3D<f32, (), ()> =
         Transform3D::rotation(0.0, 1.0, 0.0, Angle::radians(-FRAC_PI_4));
@@ -32,9 +26,12 @@
     let p1 = Polygon::from_transformed_rect(rect, transform0, 0);
     let p2 = Polygon::from_transformed_rect(rect, transform1, 1);
     let p3 = Polygon::from_transformed_rect(rect, transform2, 2);
-    assert!(p1.is_some() && p2.is_some() && p3.is_some(), "Cannot construct transformed polygons");
+    assert!(
+        p1.is_some() && p2.is_some() && p3.is_some(),
+        "Cannot construct transformed polygons"
+    );
 
-    let polys = [ p1.unwrap(), p2.unwrap(), p3.unwrap() ];
+    let polys = [p1.unwrap(), p2.unwrap(), p3.unwrap()];
     let result = splitter.solve(&polys, vec3(0.0, 0.0, -1.0));
     let ids: Vec<_> = result.iter().map(|poly| poly.anchor).collect();
     assert_eq!(&ids, &[2, 1, 0, 1, 2]);
@@ -45,16 +42,19 @@
     sort_rotation(&mut BspSplitter::new());
 }
 
-
 fn sort_trivial(splitter: &mut dyn Splitter<f32, (), usize>) {
-    let anchors: Vec<_> = (0usize .. 10).collect();
+    let anchors: Vec<_> = (0usize..10).collect();
     let rect: Rect<f32, ()> = rect(-10.0, -10.0, 20.0, 20.0);
-    let polys: Vec<_> = anchors.iter().map(|&anchor| {
-        let transform: Transform3D<f32, (), ()> = Transform3D::translation(0.0, 0.0, anchor as f32);
-        let poly = Polygon::from_transformed_rect(rect, transform, anchor);
-        assert!(poly.is_some(), "Cannot construct transformed polygons");
-        poly.unwrap()
-    }).collect();
+    let polys: Vec<_> = anchors
+        .iter()
+        .map(|&anchor| {
+            let transform: Transform3D<f32, (), ()> =
+                Transform3D::translation(0.0, 0.0, anchor as f32);
+            let poly = Polygon::from_transformed_rect(rect, transform, anchor);
+            assert!(poly.is_some(), "Cannot construct transformed polygons");
+            poly.unwrap()
+        })
+        .collect();
 
     let result = splitter.solve(&polys, vec3(0.0, 0.0, -1.0));
     let anchors1: Vec<_> = result.iter().map(|p| p.anchor).collect();
@@ -68,7 +68,8 @@
     let rect0: Rect<f32, ()> = rect(-10.0, -10.0, 20.0, 20.0);
     let poly0 = Polygon::from_rect(rect0, 0);
     let poly1 = {
-        let transform0: Transform3D<f32, (), ()> = Transform3D::rotation(1.0, 0.0, 0.0, Angle::radians(2.0 * FRAC_PI_4));
+        let transform0: Transform3D<f32, (), ()> =
+            Transform3D::rotation(1.0, 0.0, 0.0, Angle::radians(2.0 * FRAC_PI_4));
         let transform1: Transform3D<f32, (), ()> = Transform3D::translation(0.0, 100.0, 0.0);
         Polygon::from_transformed_rect(rect0, transform0.then(&transform1), 1).unwrap()
     };
@@ -119,13 +120,19 @@
     // test grouping front
     poly2.plane.offset += 0.1;
     match poly.cut(poly2.clone()) {
-        PlaneCut::Cut { ref front, ref back } => assert_eq!((front.len(), back.len()), (1, 0)),
+        PlaneCut::Cut {
+            ref front,
+            ref back,
+        } => assert_eq!((front.len(), back.len()), (1, 0)),
         PlaneCut::Sibling(_) => panic!("wrong sibling!"),
     }
     // test grouping back
     poly2.plane.normal *= -1.0;
     match poly.cut(poly2.clone()) {
-        PlaneCut::Cut { ref front, ref back } => assert_eq!((front.len(), back.len()), (0, 1)),
+        PlaneCut::Cut {
+            ref front,
+            ref back,
+        } => assert_eq!((front.len(), back.len()), (0, 1)),
         PlaneCut::Sibling(_) => panic!("wrong sibling!"),
     }
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/.cargo-checksum.json firefox-85.0+build1/third_party/rust/plist/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/plist/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b86768e41158d58321bde57049f0907d2066df8815e65329d8cfbed99955c18c","LICENCE":"5b0ae40d1a35f7ae6591a28e44771240e6a88cb03a66c9189a45b9681639b466","README.md":"98860ec5d46ac8f1d3a3f33600629b942f774a35a511ddedffc9a227a3822e2c","rustfmt.toml":"9bbb759b3914c49c8060bcdeeb7786f4aec083d30bcfe236bbd48d8388d06103","src/date.rs":"6378f0919e01cd41c2862fbc4d4029915a7d48324ede584daea0b5b1324cbb51","src/de.rs":"ecdd87f5fe788b5155e68b2490cb7e97adcd0bc83fe3edf75a132fba59b772ae","src/dictionary.rs":"9b8194d3e339a300de5d0fb39529d976a5f86947f3997086594d2be2f795859b","src/error.rs":"2ed8ce5c33071847abb00b27472be352d5bceb92a6ad0b8724f630570e956430","src/integer.rs":"131f528878adc5c0f33c8ad1563c06b397cb2ae5148c2bb9318203a2477d70e0","src/lib.rs":"7535b82d51ebfccf52539ac75d3fab71832e12d776a4342ce7d6786bfc9f1b30","src/ser.rs":"ea4ed049abef09c7230b94296a3d050ade3228cfededea2c17383028b594fe10","src/serde_tests.rs":"98fc0063223ded619054caa4a1c95fbb37d8a9613e2a5bdf4f15ccf3ed3c9e8a","src/stream/binary_reader.rs":"b05968d750a9de6b5d5a26c4815164318df771532b9ec42c3dce49f5e00beaaf","src/stream/binary_writer.rs":"a8eca464ac2fd722eaae45bfdc4b7c6b3a618613ca6c14670c4da46252a32332","src/stream/mod.rs":"2482d63cd50cceaf4b4fc46ddb11119b1a7c55bf3350e69ce2546317ff3f89e2","src/stream/xml_reader.rs":"865c5e398798af85a55c79fbdb78f3061a56b7df4827c112a58ba3e444860354","src/stream/xml_writer.rs":"882040ad363e7601b94414923b03079da9b6a88fa2618aea1a6b0b8f168f0cb3","src/uid.rs":"adb51121ee251941f173d83417631cd2fdfbc7104998205c538d93e4b3c3e676","src/value.rs":"6fc16f6c5219c2c9974d25beb0a487f4b014e514c2b9e825b84784cae5825a60","tests/data/binary.plist":"6088c4e105e21920c2033c868157f3d80bae55db6f783c92a3978743b81d46b4","tests/data/binary_NSKeyedArchiver.plist":"54dc8b87acd364de6b2160ff805514bc04bf0577e4f57d08d7f3578d218362f0","tests/data/binary_circular_array.plist":"825aed6ce83a8abdbe15d4686ce35157f4eb861bd792f0ce790115fb4ec48805","tests/data/binary_zero_offset_size.plist":"020953c8211989d01b5edf42e025560f46ece3b604ceda03708819bd2587a1a1","tests/data/book.plist":"3b18050f073cab956f38f1775e89dedc88d1e56dd388bc99e277efb19e50dffd","tests/data/utf16_bplist.plist":"c0b7d33001021df98d8631c604c8471e74e4b4599bac51a8bed149ca82adbcd5","tests/data/xml.plist":"0cb818c43467adf035160b135353fcac25a2abe5eccfcf45ef03223fa6ee3235","tests/data/xml_error.plist":"3718f7dd2c716a4a6c36d1f7055b78d86c982c812c19964f85a6f62eff1589ea","tests/fuzzer.rs":"ea9e7812c936e4c1e42ce234513fa8c839277222c0746c069d62e7b77870b858"},"package":"31850d149352e2b75f0e4b206045ee3775076c422892328343beca48a2b5cf17"}
\ No newline at end of file
+{"files":{"Cargo.toml":"5e4640942c85072981f5fe3b3777d088b7360c8e0b51207defbd52315046d3e7","LICENCE":"5b0ae40d1a35f7ae6591a28e44771240e6a88cb03a66c9189a45b9681639b466","README.md":"98860ec5d46ac8f1d3a3f33600629b942f774a35a511ddedffc9a227a3822e2c","rustfmt.toml":"9bbb759b3914c49c8060bcdeeb7786f4aec083d30bcfe236bbd48d8388d06103","src/date.rs":"6378f0919e01cd41c2862fbc4d4029915a7d48324ede584daea0b5b1324cbb51","src/de.rs":"dad0b0409227223deb2778a3f63c7d355c1b642f406fc448e59224de61882770","src/dictionary.rs":"9b8194d3e339a300de5d0fb39529d976a5f86947f3997086594d2be2f795859b","src/error.rs":"2ed8ce5c33071847abb00b27472be352d5bceb92a6ad0b8724f630570e956430","src/integer.rs":"131f528878adc5c0f33c8ad1563c06b397cb2ae5148c2bb9318203a2477d70e0","src/lib.rs":"1fa5d06242ec2731f16d244e070710476caf165eb1707a1d688357928eae2310","src/ser.rs":"ea4ed049abef09c7230b94296a3d050ade3228cfededea2c17383028b594fe10","src/serde_tests.rs":"98fc0063223ded619054caa4a1c95fbb37d8a9613e2a5bdf4f15ccf3ed3c9e8a","src/stream/binary_reader.rs":"f5a38d624d3af99f57b78837d253b72ddb8d7a08e6c117648fae4654005beef6","src/stream/binary_writer.rs":"1b10bbf287ad48be3a82c36cebbc32f7232fff42995142e09f98d2a2eb1fb628","src/stream/mod.rs":"2482d63cd50cceaf4b4fc46ddb11119b1a7c55bf3350e69ce2546317ff3f89e2","src/stream/xml_reader.rs":"629cc6b975c7c88c75fe1f0e8e39b65b41fb5442f487ce8b19f99dfa90c02cf5","src/stream/xml_writer.rs":"076a2eeb3daae3737efb514ab647673dcee00b81ce0849c968c6245f36f95d53","src/uid.rs":"adb51121ee251941f173d83417631cd2fdfbc7104998205c538d93e4b3c3e676","src/value.rs":"8fca3d563723a55be3fc6f71cd17fe7e6ad33240d83d20e6420e718033c066cd","tests/data/binary.plist":"728985bb53486a92fdcc901a3c08a904835f0225efab7b85be2734e2dcd4af83","tests/data/binary_NSKeyedArchiver.plist":"54dc8b87acd364de6b2160ff805514bc04bf0577e4f57d08d7f3578d218362f0","tests/data/binary_circular_array.plist":"825aed6ce83a8abdbe15d4686ce35157f4eb861bd792f0ce790115fb4ec48805","tests/data/binary_zero_offset_size.plist":"020953c8211989d01b5edf42e025560f46ece3b604ceda03708819bd2587a1a1","tests/data/book.plist":"3b18050f073cab956f38f1775e89dedc88d1e56dd388bc99e277efb19e50dffd","tests/data/utf16_bplist.plist":"c0b7d33001021df98d8631c604c8471e74e4b4599bac51a8bed149ca82adbcd5","tests/data/xml.plist":"9669e8ad25a661ca052d30d8d74b7495e859a0a7faf01f2aeade7fcebb2aa5b7","tests/data/xml_error.plist":"3718f7dd2c716a4a6c36d1f7055b78d86c982c812c19964f85a6f62eff1589ea","tests/fuzzer.rs":"ea9e7812c936e4c1e42ce234513fa8c839277222c0746c069d62e7b77870b858"},"package":"50ce7c785e06e3a9e6f546c1a30d3d59111a31a21bc294fb1496241a572c9a00"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/Cargo.toml firefox-85.0+build1/third_party/rust/plist/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/plist/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -13,10 +13,10 @@
 [package]
 edition = "2018"
 name = "plist"
-version = "0.5.1"
+version = "0.5.4"
 authors = ["Ed Barnard <eabarnard@gmail.com>"]
 description = "A rusty plist parser. Supports Serde serialization."
-documentation = "https://docs.rs/plist/0.5.1/plist/"
+documentation = "https://docs.rs/plist/0.5.4/plist/"
 keywords = ["plist", "parser"]
 categories = ["config", "encoding", "parser-implementations"]
 license = "MIT"
@@ -25,7 +25,7 @@
 version = "0.10.1"
 
 [dependencies.humantime]
-version = "1.1.1"
+version = "2.0.0"
 
 [dependencies.indexmap]
 version = "1.0.2"
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/de.rs firefox-85.0+build1/third_party/rust/plist/src/de.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/de.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/de.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,7 +2,7 @@
 use std::{
     fmt::Display,
     fs::File,
-    io::{BufReader, Read, Seek},
+    io::{BufReader, Cursor, Read, Seek},
     iter::Peekable,
     mem,
     path::Path,
@@ -362,6 +362,12 @@
     }
 }
 
+/// Deserializes an instance of type `T` from a byte slice.
+pub fn from_bytes<T: de::DeserializeOwned>(bytes: &[u8]) -> Result<T, Error> {
+    let cursor = Cursor::new(bytes);
+    from_reader(cursor)
+}
+
 /// Deserializes an instance of type `T` from a plist file of any encoding.
 pub fn from_file<P: AsRef<Path>, T: de::DeserializeOwned>(path: P) -> Result<T, Error> {
     let file = File::open(path).map_err(error::from_io_without_position)?;
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/lib.rs firefox-85.0+build1/third_party/rust/plist/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -110,7 +110,7 @@
 pub use self::{de::Deserializer, ser::Serializer};
 #[cfg(feature = "serde")]
 pub use self::{
-    de::{from_file, from_reader, from_reader_xml},
+    de::{from_bytes, from_file, from_reader, from_reader_xml},
     ser::{to_file_binary, to_file_xml, to_writer_binary, to_writer_xml},
 };
 
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/stream/binary_reader.rs firefox-85.0+build1/third_party/rust/plist/src/stream/binary_reader.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/stream/binary_reader.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/stream/binary_reader.rs	2021-01-18 19:58:26.000000000 +0000
@@ -424,22 +424,23 @@
         let events: Vec<Event> = streaming_parser.map(|e| e.unwrap()).collect();
 
         let comparison = &[
-            StartDictionary(Some(11)),
+            StartDictionary(Some(13)),
             String("Author".into()),
             String("William Shakespeare".into()),
-            String("Height".into()),
-            Real(1.6),
-            String("Data".into()),
-            Data(vec![0, 0, 0, 190, 0, 0, 0, 3, 0, 0, 0, 30, 0, 0, 0]),
             String("Birthdate".into()),
             Date(parse_rfc3339_weak("1981-05-16 11:32:06").unwrap().into()),
-            String("BiggestNumber".into()),
-            Integer(18446744073709551615u64.into()),
-            String("SmallestNumber".into()),
-            Integer((-9223372036854775808i64).into()),
             String("EmptyArray".into()),
             StartArray(Some(0)),
             EndCollection,
+            String("IsNotFalse".into()),
+            Boolean(false),
+            String("SmallestNumber".into()),
+            Integer((-9223372036854775808i64).into()),
+            String("EmptyDictionary".into()),
+            StartDictionary(Some(0)),
+            EndCollection,
+            String("Height".into()),
+            Real(1.6),
             String("Lines".into()),
             StartArray(Some(2)),
             String("It is a tale told by an idiot,".into()),
@@ -447,15 +448,18 @@
             EndCollection,
             String("Death".into()),
             Integer(1564.into()),
-            String("EmptyDictionary".into()),
-            StartDictionary(Some(0)),
-            EndCollection,
             String("Blank".into()),
             String("".into()),
+            String("BiggestNumber".into()),
+            Integer(18446744073709551615u64.into()),
+            String("IsTrue".into()),
+            Boolean(true),
+            String("Data".into()),
+            Data(vec![0, 0, 0, 190, 0, 0, 0, 3, 0, 0, 0, 30, 0, 0, 0]),
             EndCollection,
         ];
 
-        assert_eq!(events, comparison);
+        assert_eq!(events, &comparison[..]);
     }
 
     #[test]
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/stream/binary_writer.rs firefox-85.0+build1/third_party/rust/plist/src/stream/binary_writer.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/stream/binary_writer.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/stream/binary_writer.rs	2021-01-18 19:58:26.000000000 +0000
@@ -335,7 +335,7 @@
         trailer[6] = offset_size;
         trailer[7] = ref_size;
         trailer[8..16].copy_from_slice(&(self.num_objects as u64).to_be_bytes());
-        trailer[24..32].copy_from_slice(&offset_table_offset.to_be_bytes());
+        trailer[24..32].copy_from_slice(&(offset_table_offset as u64).to_be_bytes());
         self.writer.write_exact(&trailer)?;
 
         self.writer
@@ -454,10 +454,10 @@
 
         match value {
             Value::Boolean(true) => {
-                self.writer.write_exact(&[0x08])?;
+                self.writer.write_exact(&[0x09])?;
             }
             Value::Boolean(false) => {
-                self.writer.write_exact(&[0x09])?;
+                self.writer.write_exact(&[0x08])?;
             }
             Value::Data(v) => {
                 write_plist_value_ty_and_size(&mut self.writer, 0x40, v.len())?;
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/stream/xml_reader.rs firefox-85.0+build1/third_party/rust/plist/src/stream/xml_reader.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/stream/xml_reader.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/stream/xml_reader.rs	2021-01-18 19:58:26.000000000 +0000
@@ -255,6 +255,10 @@
             Integer((-9223372036854775808i64).into()),
             String("HexademicalNumber".to_owned()),
             Integer(0xdead_beef_u64.into()),
+            String("IsTrue".into()),
+            Boolean(true),
+            String("IsNotFalse".into()),
+            Boolean(false),
             EndCollection,
         ];
 
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/stream/xml_writer.rs firefox-85.0+build1/third_party/rust/plist/src/stream/xml_writer.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/stream/xml_writer.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/stream/xml_writer.rs	2021-01-18 19:58:26.000000000 +0000
@@ -323,6 +323,10 @@
             Event::Integer(18446744073709551615u64.into()),
             Event::String("SmallestNumber".to_owned()),
             Event::Integer((-9223372036854775808i64).into()),
+            Event::String("IsTrue".into()),
+            Event::Boolean(true),
+            Event::String("IsNotFalse".into()),
+            Event::Boolean(false),
             Event::EndCollection,
         ];
 
@@ -368,6 +372,10 @@
 \t<integer>18446744073709551615</integer>
 \t<key>SmallestNumber</key>
 \t<integer>-9223372036854775808</integer>
+\t<key>IsTrue</key>
+\t<true />
+\t<key>IsNotFalse</key>
+\t<false />
 </dict>
 </plist>";
 
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/src/value.rs firefox-85.0+build1/third_party/rust/plist/src/value.rs
--- firefox-84.0.2+build1/third_party/rust/plist/src/value.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/src/value.rs	2021-01-18 19:58:26.000000000 +0000
@@ -113,6 +113,19 @@
         IntoEvents::new(self)
     }
 
+    /// If the `Value` is a Array, returns the underlying `Vec`.
+    ///
+    /// Returns `None` otherwise.
+    ///
+    /// This method consumes the `Value`. To get a reference instead, use
+    /// `as_array`.
+    pub fn into_array(self) -> Option<Vec<Value>> {
+        match self {
+            Value::Array(dict) => Some(dict),
+            _ => None,
+        }
+    }
+
     /// If the `Value` is an Array, returns the associated `Vec`.
     ///
     /// Returns `None` otherwise.
@@ -132,6 +145,19 @@
             _ => None,
         }
     }
+
+    /// If the `Value` is a Dictionary, returns the associated `BTreeMap`.
+    ///
+    /// Returns `None` otherwise.
+    ///
+    /// This method consumes the `Value`. To get a reference instead, use
+    /// `as_dictionary`.
+    pub fn into_dictionary(self) -> Option<Dictionary> {
+        match self {
+            Value::Dictionary(dict) => Some(dict),
+            _ => None,
+        }
+    }
 
     /// If the `Value` is a Dictionary, returns the associated `BTreeMap`.
     ///
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/third_party/rust/plist/tests/data/binary.plist and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/third_party/rust/plist/tests/data/binary.plist differ
diff -Nru firefox-84.0.2+build1/third_party/rust/plist/tests/data/xml.plist firefox-85.0+build1/third_party/rust/plist/tests/data/xml.plist
--- firefox-84.0.2+build1/third_party/rust/plist/tests/data/xml.plist	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/plist/tests/data/xml.plist	2021-01-18 19:58:26.000000000 +0000
@@ -28,5 +28,9 @@
     <integer>-9223372036854775808</integer>
     <key>HexademicalNumber</key>
     <integer>0xDEADBEEF</integer>
+    <key>IsTrue</key>
+    <true/>
+    <key>IsNotFalse</key>
+    <false/>
 </dict>
 </plist>
diff -Nru firefox-84.0.2+build1/third_party/rust/procedural-masquerade/.cargo-checksum.json firefox-85.0+build1/third_party/rust/procedural-masquerade/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/procedural-masquerade/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/procedural-masquerade/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"3aad5ce464f7224e4b86fc0a70d89c354635ed624bf4bb12cf4ca597c45879b7","lib.rs":"f0f2793a21bc85ae3ee3e040ef703da87b558a1ce524873ef872bf44de795931"},"package":"9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/procedural-masquerade/Cargo.toml firefox-85.0+build1/third_party/rust/procedural-masquerade/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/procedural-masquerade/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/procedural-masquerade/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-[package]
-name = "procedural-masquerade"
-version = "0.1.1"
-authors = ["Simon Sapin <simon.sapin@exyr.org>"]
-description = "macro_rules for making proc_macro_derive pretending to be proc_macro"
-documentation = "https://docs.rs/procedural-masquerade/"
-repository = "https://github.com/servo/rust-cssparser"
-license = "MIT/Apache-2.0"
-
-[lib]
-path = "lib.rs"
-doctest = false
diff -Nru firefox-84.0.2+build1/third_party/rust/procedural-masquerade/lib.rs firefox-85.0+build1/third_party/rust/procedural-masquerade/lib.rs
--- firefox-84.0.2+build1/third_party/rust/procedural-masquerade/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/procedural-masquerade/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,250 +0,0 @@
-//! # Custom `derive` pretending to be functional procedural macros on Rust 1.15
-//!
-//! This crate enables creating function-like macros (invoked as `foo!(...)`)
-//! with a procedural component,
-//! based on both custom `derive` (a.k.a. *Macros 1.1*) and `macro_rules!`.
-//!
-//! This convoluted mechanism enables such macros to run on stable Rust 1.15,
-//! even though functional procedural macros (a.k.a. *Macros 2.0*) are not available yet.
-//!
-//! A library defining such a macro needs two crates: a “normal� one, and a `proc-macro` one.
-//! In the example below we’ll call them `libfoo` and `libfoo-macros`, respectively.
-//!
-//! # Credits
-//!
-//! The trick that makes this crate work
-//! is based on an idea from [David Tolnay](https://github.com/dtolnay).
-//! Many thanks!
-//!
-//! # Example
-//!
-//! As a simple example, we’re going to re-implement the `stringify!` macro.
-//! This is useless since `stringify!` already exists in the standard library,
-//! and a bit absurd since this crate uses `stringify!` internally.
-//!
-//! Nevertheless, it serves as a simple example to demonstrate the use of this crate.
-//!
-//! ## The `proc-macro` crate
-//!
-//! The minimal `Cargo.toml` file is typical for Macros 1.1:
-//!
-//! ```toml
-//! [package]
-//! name = "libfoo-macros"
-//! version = "1.0.0"
-//!
-//! [lib]
-//! proc-macro = true
-//! ```
-//!
-//! In the code, we define the procedural part of our macro in a function.
-//! This function will not be used directly by end users,
-//! but it still needs to be re-exported to them
-//! (because of limitations in `macro_rules!`).
-//!
-//! To avoid name collisions, we and a long and explicit prefix in the function’s name.
-//!
-//! The function takes a string containing arbitrary Rust tokens,
-//! and returns a string that is parsed as *items*.
-//! The returned string can contain constants, statics, functions, `impl`s, etc.,
-//! but not expressions directly.
-//!
-//! ```rust
-//! #[macro_use] extern crate procedural_masquerade;
-//! extern crate proc_macro;
-//!
-//! define_proc_macros! {
-//!     #[allow(non_snake_case)]
-//!     pub fn foo_internal__stringify_const(input: &str) -> String {
-//!         format!("const STRINGIFIED: &'static str = {:?};", input)
-//!     }
-//! }
-//! ```
-//!
-//! A less trivial macro would probably use
-//! the [`syn`](https://github.com/dtolnay/syn/) crate to parse its input
-//! and the [`quote`](https://github.com/dtolnay/quote) crate to generate its output.
-//!
-//! ## The library crate
-//!
-//! ```toml
-//! [package]
-//! name = "libfoo"
-//! version = "1.0.0"
-//!
-//! [dependencies]
-//! cssparser-macros = {path = "./macros", version = "1.0"}
-//! ```
-//!
-//! ```rust
-//! #[macro_use] extern crate libfoo_macros;  // (1)
-//!
-//! pub use libfoo_macros::*;  // (2)
-//!
-//! define_invoke_proc_macro!(libfoo__invoke_proc_macro);  // (3)
-//!
-//! #[macro_export]
-//! macro_rules! foo_stringify {  // (4)
-//!     ( $( $tts: tt ) ) => {
-//!         {  // (5)
-//!             libfoo__invoke_proc_macro! {  // (6)
-//!                 foo_internal__stringify_const!( $( $tts ) )  // (7)
-//!             }
-//!             STRINGIFIED  // (8)
-//!         }
-//!     }
-//! }
-//! ```
-//!
-//! Let’s go trough the numbered lines one by one:
-//!
-//! 1. `libfoo` depends on the other `libfoo-macros`, and imports its macros.
-//! 2. Everything exported by `libfoo-macros` (which is one custom `derive`)
-//!    is re-exported to users of `libfoo`.
-//!    They’re not expected to use it directly,
-//!    but expansion of the `foo_stringify` macro needs it.
-//! 3. This macro invocation defines yet another macro, called `libfoo__invoke_proc_macro`,
-//!    which is also exported.
-//!    This indirection is necessary
-//!    because re-exporting `macro_rules!` macros doesn’t work currently,
-//!    and once again it is used by the expansion of `foo_stringify`.
-//!    Again, we use a long prefix to avoid name collisions.
-//! 4. Finally, we define the macro that we really want.
-//!    This one has a name that users will use.
-//! 5. The expansion of this macro will define some items,
-//!    whose names are not hygienic in `macro_rules`.
-//!    So we wrap everything in an extra `{…}` block to prevent these names for leaking.
-//! 6. Here we use the macro defined in (3),
-//!    which allows us to write something that look like invoking a functional procedural macro,
-//!    but really uses a custom `derive`.
-//!    This will define a type called `ProceduralMasqueradeDummyType`,
-//!    as a placeholder to use `derive`.
-//!    If `libfoo__invoke_proc_macro!` is to be used more than once,
-//!    each use needs to be nested in another block
-//!    so that the names of multiple dummy types don’t collide.
-//! 7. In addition to the dummy type,
-//!    the items returned by our procedural component are inserted here.
-//!    (In this case the `STRINGIFIED` constant.)
-//! 8. Finally, we write the expression that we want the macro to evaluate to.
-//!    This expression can use parts of `foo_stringify`’s input,
-//!    it can contain control-flow statements like `return` or `continue`,
-//!    and of course refer to procedurally-defined items.
-//!
-//! This macro can be used in an expression context.
-//! It expands to a block-expression that contains some items (as an implementation detail)
-//! and ends with another expression.
-//!
-//! ## For users
-//!
-//! Users of `libfoo` don’t need to worry about any of these implementation details.
-//! They can use the `foo_stringify` macro as if it were a simle `macro_rules` macro:
-//!
-//! ```rust
-//! #[macro_use] extern crate libfoo;
-//!
-//! fn main() {
-//!     do_something(foo_stringify!(1 + 2));
-//! }
-//!
-//! fn do_something(_: &str) { /* ... */ }
-//! ```
-//!
-//! # More
-//!
-//! To see a more complex example, look at
-//! [`cssparser`’s `src/macros.rs](https://github.com/servo/rust-cssparser/blob/master/src/macros.rs)
-//! and
-//! [`cssparser-macros`’s `macros/lib.rs](https://github.com/servo/rust-cssparser/blob/master/macros/lib.rs).
-
-/// This macro wraps `&str -> String` functions
-/// in custom `derive` implementations with `#[proc_macro_derive]`.
-///
-/// See crate documentation for details.
-#[macro_export]
-macro_rules! define_proc_macros {
-    (
-        $(
-            $( #[$attr:meta] )*
-            pub fn $proc_macro_name: ident ($input: ident : &str) -> String
-            $body: block
-        )+
-    ) => {
-        $(
-            $( #[$attr] )*
-            #[proc_macro_derive($proc_macro_name)]
-            pub fn $proc_macro_name(derive_input: ::proc_macro::TokenStream)
-                                    -> ::proc_macro::TokenStream {
-                let $input = derive_input.to_string();
-                let $input = $crate::_extract_input(&$input);
-                $body.parse().unwrap()
-            }
-        )+
-    }
-}
-
-/// Implementation detail of `define_proc_macros!`.
-///
-/// **This function is not part of the public API. It can change or be removed between any versions.**
-#[doc(hidden)]
-pub fn _extract_input(derive_input: &str) -> &str {
-    let mut input = derive_input;
-
-    for expected in &["#[allow(unused)]", "enum", "ProceduralMasqueradeDummyType", "{",
-                     "Input", "=", "(0,", "stringify!", "("] {
-        input = input.trim_left();
-        assert!(input.starts_with(expected),
-                "expected prefix {:?} not found in {:?}", expected, derive_input);
-        input = &input[expected.len()..];
-    }
-
-    for expected in [")", ").0,", "}"].iter().rev() {
-        input = input.trim_right();
-        assert!(input.ends_with(expected),
-                "expected suffix {:?} not found in {:?}", expected, derive_input);
-        let end = input.len() - expected.len();
-        input = &input[..end];
-    }
-
-    input
-}
-
-/// This macro expands to the definition of another macro (whose name is given as a parameter).
-///
-/// See crate documentation for details.
-#[macro_export]
-macro_rules! define_invoke_proc_macro {
-    ($macro_name: ident) => {
-        /// Implementation detail of other macros in this crate.
-        #[doc(hidden)]
-        #[macro_export]
-        macro_rules! $macro_name {
-            ($proc_macro_name: ident ! $paren: tt) => {
-                #[derive($proc_macro_name)]
-                #[allow(unused)]
-                enum ProceduralMasqueradeDummyType {
-                    // The magic happens here.
-                    //
-                    // We use an `enum` with an explicit discriminant
-                    // because that is the only case where a type definition
-                    // can contain a (const) expression.
-                    //
-                    // `(0, "foo").0` evalutes to 0, with the `"foo"` part ignored.
-                    //
-                    // By the time the `#[proc_macro_derive]` function
-                    // implementing `#[derive($proc_macro_name)]` is called,
-                    // `$paren` has already been replaced with the input of this inner macro,
-                    // but `stringify!` has not been expanded yet.
-                    //
-                    // This how arbitrary tokens can be inserted
-                    // in the input to the `#[proc_macro_derive]` function.
-                    //
-                    // Later, `stringify!(...)` is expanded into a string literal
-                    // which is then ignored.
-                    // Using `stringify!` enables passing arbitrary tokens
-                    // rather than only what can be parsed as a const expression.
-                    Input = (0, stringify! $paren ).0
-                }
-            }
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/.cargo-checksum.json firefox-85.0+build1/third_party/rust/regalloc/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/regalloc/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"71ed793f6957ed5fce7a18d86f5b77ad881fc5ba74fce18f23e8a62121fdeb80","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","src/analysis_control_flow.rs":"599a720f00e31391216bc2ede8dd414f6acdf953b392c0e58ed733e9e9d4173a","src/analysis_data_flow.rs":"abb8a9d0038a992f17facb61787e0708516954843d991accd404662d23146293","src/analysis_main.rs":"d634ab87144a23eda45ffe7e48f1ad5e13da3a209b6257d5812046425bad77e3","src/analysis_reftypes.rs":"d3440d6674079db8c62e69759ed2193627e33d7b7845fd2700cef279ee9e1e0a","src/avl_tree.rs":"df8646916f68da0e322d0ea3944d2d7b2acbb29d93f383f32f7126079b713dfd","src/bt_coalescing_analysis.rs":"142680acac8965fa01cd104a84d0b871352f323580eb04ab178127d602cdd02c","src/bt_commitment_map.rs":"2dabf2896b7b2c96d9cf9bf26cdd397765b468772bf44fbb0337eff85433d0f7","src/bt_main.rs":"61a7b94f4b9d4c58d0189c151543b2a488ca385614666ca91734120d5d3bf471","src/bt_spillslot_allocator.rs":"3534171c6e156c3d5a948036430a80a2ca7ba728a3e4b33e598479740cffe0e3","src/bt_vlr_priority_queue.rs":"082d9ede8c1e7ec3129356450b42056e090f1dae77688589f71be7055eff5333","src/checker.rs":"fa20229ea7ce12c7cf2f11c0dce062f793eaf4f77e9227603a2ce5dcf9991368","src/data_structures.rs":"b828d429c02cf5b76355b21ba1b7e14183392ac38ec60d7459fe7b531137eb9e","src/inst_stream.rs":"f40f660dcabfeb1a1aa04ed781a5504eb30e26134776490f38ae71a9c86cff8d","src/lib.rs":"aa07a5e33bb2b5d6599bca5a3f10a964bb3b62d0a8d52db46b6b4f3ae75f148a","src/linear_scan/analysis.rs":"d23114c90ba74ad39dbee6b648730aafd2cffe667a9a435502bfbe35366e7a16","src/linear_scan/assign_registers.rs":"c4e75bc01f447ee8abeb7420172550d114c83813f8b4e81fce1d10c423955088","src/linear_scan/mod.rs":"e579abc91cb590f0d2d2d52f4d73f71c87a0f64b6500937be1e2eced9355beb4","src/linear_scan/resolve_moves.rs":"2c51e4d6a096454db79090b078780ee9938eae4dd1fe0d32103bdc4e56e4e3c8","src/reg_maps.rs":"87ede67e8e550fd8e3aa4d880989b2bdf6f21b5668c5fb657039627aa8c1c3d3","src/snapshot.rs":"62ff934004a93697d48049e0dae1b99717c56ca35154d3a12d6ba22e47fe0d16","src/sparse_set.rs":"0474e23c90f2b4bfe8bcfdae5e12462002b7a5278989926213ecacc34a38b39f","src/union_find.rs":"78f5863cd61ad8c6a21b1b1ccc0996d9c19b469ff8ebd101a1e9f0a3e10f1b7c"},"package":"2041c2d34f6ff346d6f428974f03d8bf12679b0c816bb640dc5eb1d48848d8d1"}
\ No newline at end of file
+{"files":{"Cargo.toml":"2c96b508f40ecbc5c5ed258c7002fa81b866dc160a9f474f6097a672f1ac87dd","LICENSE":"268872b9816f90fd8e85db5a28d33f8150ebb8dd016653fb39ef1f94f2686bc5","src/analysis_control_flow.rs":"599a720f00e31391216bc2ede8dd414f6acdf953b392c0e58ed733e9e9d4173a","src/analysis_data_flow.rs":"2f273a8b31665e5e3126fdba3e716523e07175517f71aa63f575a2202d831842","src/analysis_main.rs":"d634ab87144a23eda45ffe7e48f1ad5e13da3a209b6257d5812046425bad77e3","src/analysis_reftypes.rs":"d3440d6674079db8c62e69759ed2193627e33d7b7845fd2700cef279ee9e1e0a","src/avl_tree.rs":"df8646916f68da0e322d0ea3944d2d7b2acbb29d93f383f32f7126079b713dfd","src/bt_coalescing_analysis.rs":"142680acac8965fa01cd104a84d0b871352f323580eb04ab178127d602cdd02c","src/bt_commitment_map.rs":"2dabf2896b7b2c96d9cf9bf26cdd397765b468772bf44fbb0337eff85433d0f7","src/bt_main.rs":"b866200405cc8102665b871a7dec0ab057fe27fcddd1707052f4ea67673f2a6c","src/bt_spillslot_allocator.rs":"3534171c6e156c3d5a948036430a80a2ca7ba728a3e4b33e598479740cffe0e3","src/bt_vlr_priority_queue.rs":"082d9ede8c1e7ec3129356450b42056e090f1dae77688589f71be7055eff5333","src/checker.rs":"fa20229ea7ce12c7cf2f11c0dce062f793eaf4f77e9227603a2ce5dcf9991368","src/data_structures.rs":"029b6e35611c9de6f7d9b02588e5b89b577d9ff3c0bc040434f57d644b9a768d","src/inst_stream.rs":"f40f660dcabfeb1a1aa04ed781a5504eb30e26134776490f38ae71a9c86cff8d","src/lib.rs":"ee96849593f57d0413bfeb8fe38a4c12c536f9cfb35f1a3ee8d50c812c6be14c","src/linear_scan/analysis.rs":"d23114c90ba74ad39dbee6b648730aafd2cffe667a9a435502bfbe35366e7a16","src/linear_scan/assign_registers.rs":"c4e75bc01f447ee8abeb7420172550d114c83813f8b4e81fce1d10c423955088","src/linear_scan/mod.rs":"4a74263d0ef9ad8fbd4d0f2f08e3db49c22a0a1ec4c21676b2fbc70d49174d8c","src/linear_scan/resolve_moves.rs":"2c51e4d6a096454db79090b078780ee9938eae4dd1fe0d32103bdc4e56e4e3c8","src/pretty_print.rs":"702aba67634ddc76feb7384a766341cb59f8d902ca06340088f6fa522bed286d","src/reg_maps.rs":"87ede67e8e550fd8e3aa4d880989b2bdf6f21b5668c5fb657039627aa8c1c3d3","src/snapshot.rs":"62ff934004a93697d48049e0dae1b99717c56ca35154d3a12d6ba22e47fe0d16","src/sparse_set.rs":"0474e23c90f2b4bfe8bcfdae5e12462002b7a5278989926213ecacc34a38b39f","src/union_find.rs":"78f5863cd61ad8c6a21b1b1ccc0996d9c19b469ff8ebd101a1e9f0a3e10f1b7c"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/Cargo.toml firefox-85.0+build1/third_party/rust/regalloc/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/regalloc/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,39 +1,21 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
 [package]
-edition = "2018"
 name = "regalloc"
-version = "0.0.30"
+version = "0.0.31"
 authors = ["The Regalloc.rs Developers"]
-description = "Modular register allocation algorithms"
+edition = "2018"
 license = "Apache-2.0 WITH LLVM-exception"
+description = "Modular register allocation algorithms"
 repository = "https://github.com/bytecodealliance/regalloc.rs"
-[dependencies.log]
-version = "0.4.8"
-default-features = false
 
-[dependencies.rustc-hash]
-version = "1.0.1"
-
-[dependencies.serde]
-version = "1.0.94"
-features = ["derive"]
-optional = true
-
-[dependencies.smallvec]
-version = "1.0.0"
+[dependencies]
+rustc-hash = "1.0.1"
+log = { version = "0.4.8", default-features = false }
+smallvec = "1.0.0"
+serde = { version = "1.0.94", features = ["derive"], optional = true }
 
 [features]
 default = []
-enable-serde = ["serde"]
 fuzzing = []
+
+# For dependent crates that want to serialize some parts of regalloc.
+enable-serde = ["serde"]
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/analysis_data_flow.rs firefox-85.0+build1/third_party/rust/regalloc/src/analysis_data_flow.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/analysis_data_flow.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/analysis_data_flow.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1004,8 +1004,11 @@
                 // not listed in `livein`, since otherwise `state` would have an entry for it.
                 None => panic!("get_range_frags_for_block: fail #2"),
                 Some(ref mut pf) => {
-                    // This the first or subsequent modify after a write.
-                    pf.num_mentions = plus1(pf.num_mentions);
+                    // This the first or subsequent modify after a write.  Add two to the
+                    // mentions count, as that reflects the implied spill cost increment more
+                    // accurately than just adding one: if we spill the live range in which this
+                    // ends up, we'll generate both a reload and a spill instruction.
+                    pf.num_mentions = plus1(plus1(pf.num_mentions));
                     let new_last = InstPoint::new_def(iix);
                     debug_assert!(pf.last <= new_last);
                     pf.last = new_last;
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/bt_main.rs firefox-85.0+build1/third_party/rust/regalloc/src/bt_main.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/bt_main.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/bt_main.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1792,7 +1792,9 @@
     let mut reg_vecs = RegVecs::new(/*sanitized=*/ false);
     let mut dummy_bounds = RegVecBounds::new();
     for insn in &final_insns {
-        add_raw_reg_vecs_for_insn::<F>(insn, &mut reg_vecs, &mut dummy_bounds);
+        if func.is_included_in_clobbers(insn) {
+            add_raw_reg_vecs_for_insn::<F>(insn, &mut reg_vecs, &mut dummy_bounds);
+        }
     }
     for reg in reg_vecs.defs.iter().chain(reg_vecs.mods.iter()) {
         assert!(reg.is_real());
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/data_structures.rs firefox-85.0+build1/third_party/rust/regalloc/src/data_structures.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/data_structures.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/data_structures.rs	2021-01-18 19:58:26.000000000 +0000
@@ -902,9 +902,9 @@
 /// create a distinction, at the Rust type level, between a plain "register"
 /// and a "writable register".
 ///
-/// There is nothing that ensures that Writable<..> is only wrapped around Reg
-/// and its variants (`RealReg`, `VirtualReg`).  That however is its intended
-/// and currently its only use.
+/// Only structs that implement the `WritableBase` trait can be wrapped with
+/// `Writable`. These are the Reg, RealReg and VirtualReg data structures only,
+/// since `WritableBase` is not exposed to end users.
 ///
 /// Writable<..> can be used by the client to ensure that, internally, it only
 /// generates instructions that write to registers that should be written. The
@@ -918,11 +918,21 @@
 /// error.
 #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
 #[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
-pub struct Writable<R: Copy + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + fmt::Debug> {
+pub struct Writable<R: WritableBase> {
     reg: R,
 }
 
-impl<R: Copy + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + fmt::Debug> Writable<R> {
+/// Set of requirements for types that can be wrapped in Writable.
+pub trait WritableBase:
+    Copy + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + fmt::Debug
+{
+}
+
+impl WritableBase for Reg {}
+impl WritableBase for RealReg {}
+impl WritableBase for VirtualReg {}
+
+impl<R: WritableBase> Writable<R> {
     /// Create a Writable<R> from an R. The client should carefully audit where
     /// it calls this constructor to ensure correctness (see `Writable<..>`
     /// struct documentation).
@@ -939,26 +949,23 @@
     pub fn map<F, U>(&self, f: F) -> Writable<U>
     where
         F: Fn(R) -> U,
-        U: Copy + Clone + PartialEq + Eq + Hash + PartialOrd + Ord + fmt::Debug,
+        U: WritableBase,
     {
         Writable { reg: f(self.reg) }
     }
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub enum SpillSlot {
-    SpillSlot(u32),
-}
+pub struct SpillSlot(u32);
+
 impl SpillSlot {
     #[inline(always)]
     pub fn new(n: u32) -> Self {
-        SpillSlot::SpillSlot(n)
+        Self(n)
     }
     #[inline(always)]
     pub fn get(self) -> u32 {
-        match self {
-            SpillSlot::SpillSlot(n) => n,
-        }
+        self.0
     }
     #[inline(always)]
     pub fn get_usize(self) -> usize {
@@ -972,6 +979,7 @@
         SpillSlot::new(self.get() + num_slots)
     }
 }
+
 impl fmt::Debug for SpillSlot {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         write!(fmt, "S{}", self.get())
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/lib.rs firefox-85.0+build1/third_party/rust/regalloc/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -26,6 +26,7 @@
 mod data_structures;
 mod inst_stream;
 mod linear_scan;
+mod pretty_print;
 mod reg_maps;
 mod snapshot;
 mod sparse_set;
@@ -37,6 +38,9 @@
 
 // Stuff that is defined by the library
 
+// Pretty-printing utilities.
+pub use crate::pretty_print::*;
+
 // Sets and maps of things.  We can refine these later; but for now the
 // interface needs some way to speak about them, so let's use the
 // library-provided versions.
@@ -220,6 +224,25 @@
     /// Determine whether an instruction is a return instruction.
     fn is_ret(&self, insn: InstIx) -> bool;
 
+    /// Determine whether an instruction should be considered while computing
+    /// the set of registers that need to be saved/restored in the function's
+    /// prologue/epilogue, that is, the registers returned in
+    /// `clobbered_registers` in `RegAllocResult`.  computation. Only
+    /// instructions for which this function returns `true` will be used to
+    /// compute that set.
+    ///
+    /// One reason that a client might *not* want an instruction to be included
+    /// would be if it can handle the clobbers some other way: for example,
+    /// ABI-support code might exclude call instructions' defs and mods from the
+    /// clobber set, because (given the callee has same ABI as the caller) the
+    /// registers possibly written by the callee are all registers that the
+    /// caller is also allowed to clobber (not save/restore in
+    /// prologue/epilogue).
+    fn is_included_in_clobbers(&self, _insn: &Self::Inst) -> bool {
+        // Default impl includes all instructions.
+        true
+    }
+
     // --------------------------
     // Instruction register slots
     // --------------------------
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/linear_scan/mod.rs firefox-85.0+build1/third_party/rust/regalloc/src/linear_scan/mod.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/linear_scan/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/linear_scan/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -724,6 +724,7 @@
             mapper.set_use(vreg, rreg);
         }
 
+        let included_in_clobbers = func.is_included_in_clobbers(func.get_insn(iix));
         if mention_set.is_mod() {
             if let Some(prev_rreg) = mapper.lookup_use(vreg) {
                 debug_assert_eq!(prev_rreg, rreg, "different use allocs for {:?}", vreg);
@@ -734,7 +735,9 @@
 
             mapper.set_use(vreg, rreg);
             mapper.set_def(vreg, rreg);
-            clobbered_registers.insert(rreg);
+            if included_in_clobbers {
+                clobbered_registers.insert(rreg);
+            }
         }
 
         if mention_set.is_def() {
@@ -743,7 +746,9 @@
             }
 
             mapper.set_def(vreg, rreg);
-            clobbered_registers.insert(rreg);
+            if included_in_clobbers {
+                clobbered_registers.insert(rreg);
+            }
         }
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/regalloc/src/pretty_print.rs firefox-85.0+build1/third_party/rust/regalloc/src/pretty_print.rs
--- firefox-84.0.2+build1/third_party/rust/regalloc/src/pretty_print.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/regalloc/src/pretty_print.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,56 @@
+//! Pretty-printing for the main data structures.
+
+use crate::data_structures::WritableBase;
+use crate::{RealRegUniverse, Reg, Writable};
+
+/// A trait for printing instruction bits and pieces, with the the ability to take a
+/// contextualising `RealRegUniverse` that is used to give proper names to registers.
+pub trait PrettyPrint {
+    /// Return a string that shows the implementing object in context of the given
+    /// `RealRegUniverse`, if provided.
+    fn show_rru(&self, maybe_reg_universe: Option<&RealRegUniverse>) -> String;
+}
+
+/// Same as `PrettyPrint`, but can also take a size hint into account to specialize the displayed
+/// string.
+pub trait PrettyPrintSized: PrettyPrint {
+    /// The same as |show_rru|, but with an optional hint giving a size in bytes. Its
+    /// interpretation is object-dependent, and it is intended to pass around enough information to
+    /// facilitate printing sub-parts of real registers correctly. Objects may ignore size hints
+    /// that are irrelevant to them.
+    ///
+    /// The default implementation ignores the size hint.
+    fn show_rru_sized(&self, maybe_reg_universe: Option<&RealRegUniverse>, _size: u8) -> String {
+        self.show_rru(maybe_reg_universe)
+    }
+}
+
+impl PrettyPrint for Reg {
+    fn show_rru(&self, maybe_reg_universe: Option<&RealRegUniverse>) -> String {
+        if self.is_real() {
+            if let Some(rru) = maybe_reg_universe {
+                let reg_ix = self.get_index();
+                assert!(
+                    reg_ix < rru.regs.len(),
+                    "unknown real register with index {:?}",
+                    reg_ix
+                );
+                return rru.regs[reg_ix].1.to_string();
+            }
+        }
+        // The reg is virtual, or we have no universe. Be generic.
+        format!("%{:?}", self)
+    }
+}
+
+impl<R: PrettyPrint + WritableBase> PrettyPrint for Writable<R> {
+    fn show_rru(&self, maybe_reg_universe: Option<&RealRegUniverse>) -> String {
+        self.to_reg().show_rru(maybe_reg_universe)
+    }
+}
+
+impl<R: PrettyPrintSized + WritableBase> PrettyPrintSized for Writable<R> {
+    fn show_rru_sized(&self, maybe_reg_universe: Option<&RealRegUniverse>, size: u8) -> String {
+        self.to_reg().show_rru_sized(maybe_reg_universe, size)
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/.cargo-checksum.json firefox-85.0+build1/third_party/rust/rkv/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/rkv/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"617a73cbb78075706f477ab985ca9dd6cbd21514b4cbb6373b2a3fa81192350c","Cargo.toml":"353177937a7ba9d301966b2c13ac6e31d1135986df4aeff88b14fe98e88f7ca8","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"f80ce3b29b0cf54927d2bb4457e0b5691a2e6b56a5fc140c551c3cee68f242ae","examples/README.md":"143767fc145bf167ce269a65138cb3f7086cb715b8bc4f73626da82966e646f4","examples/iterator.rs":"844acdb7b81b95547502dddead0095dd98c4d6be63a7a765c97c354c02ee38d1","examples/simple-store.rs":"56c403307cd8a7644baa7831e7a400df0b2d2df25a854b2f3441abff78a54227","run-all-examples.sh":"7f9d11d01017f77e1c9d26e3e82dfca8c6930deaec85e864458e33a7fa267de0","src/backend.rs":"091d6c8aed4782f7e19079aaf2a25db0db02c969edc8058f882dde47137cc983","src/backend/common.rs":"3dd1b7fbe0c62b0731904358b11f82054c918044de6271c502fb0d38b813b67d","src/backend/impl_lmdb.rs":"2ad9749017613defe11d854480d6d7b3db04ec5d2f43f099be30d01da2c59a16","src/backend/impl_lmdb/arch_migrator.rs":"eeaafcb328f7b9e6deb24d5f8ac7c27d114a8e08bdfcc3f2df588178ee234f83","src/backend/impl_lmdb/arch_migrator_error.rs":"ee15d7bee9e12a037e6b7423acf05040672913e0d86ff632d826eaaa3188eecb","src/backend/impl_lmdb/cursor.rs":"77a7611f8638c5358f74f79cccde18581d3f6078f72c3a8419abde144791bfdf","src/backend/impl_lmdb/database.rs":"c52ab76a4389c525a998eef0302e709d57a22f2627a967b2246e98ae15f4a999","src/backend/impl_lmdb/environment.rs":"cb2e60561c2e18b897286a5a0639aeda7bfbf9b7d2cca7160ad793f61a936898","src/backend/impl_lmdb/error.rs":"856782cb1ffda0c0cdd0f0c783762412db35b8b6b6a0aefaf36974fe169ec5a2","src/backend/impl_lmdb/flags.rs":"861144973a397372cc572999ba8f87a538f48d3b9d4f8233ad78ce76cd2d40b1","src/backend/impl_lmdb/info.rs":"e44d9100c0acc179263f41c70d2d139faa1b19efe6948c951958986c5fc90dbf","src/backend/impl_lmdb/iter.rs":"ba4fd8b287b785e2567dd819d52ce58cf5bd73096ac59675ac11b21a06885d8a","src/backend/impl_lmdb/stat.rs":"ec3100fee914cfe4805a7c588344c707c027bad7b37b43b7455baa0772cb64f9","src/backend/impl_lmdb/transaction.rs":"5ecf5c86148e7c2cc62f89abb1e571f6f355989d6bb48af44a3435e5222260e7","src/backend/impl_safe.rs":"df796cd3b43bd973f213f7616c396ac4f006759bef3be8fd5f1792a82e26baeb","src/backend/impl_safe/cursor.rs":"7fb0d39ee8b2ea69f9ac8b733c1a8f487dfa814486821bc6a8bb1b656539942c","src/backend/impl_safe/database.rs":"7b03bbe7ec8183af06f2376028049ad638e8e778b9686364e13f06a63f7102c4","src/backend/impl_safe/environment.rs":"5c88f15d926e5c0fbbc3ea4b6a0bd1b5d7c0bc221828228b0e3f921898e5861c","src/backend/impl_safe/error.rs":"5a41b7b8cc059abd485c8f740593e35d2d3a4e90466995e954711113f79da200","src/backend/impl_safe/flags.rs":"8775cfab62a78466184310bffb7c0f16c51c4b6d941571348a1ac5ece76a6de0","src/backend/impl_safe/info.rs":"c9dc67d989394dd7a25e99681e4a25f19b4ca3992eb18b719fb89742fae635b2","src/backend/impl_safe/iter.rs":"b98b54b51b474cb1e31f90136b64871baff6c31261d60bd4f79faa329768f2e8","src/backend/impl_safe/snapshot.rs":"de83b5feffcb2603e64c4f53314c4b033fbc3289c88076be85cc33eec88b1d43","src/backend/impl_safe/stat.rs":"77ea9937c2ff839cba4ed5597b4804550915d5c50fce0fc86133bf23cff49d95","src/backend/impl_safe/transaction.rs":"316174d204bab807ac317cf031c1b9e431dc216f231e705acd80ecc060a04616","src/backend/traits.rs":"e1991586760ca12fe34fa6dedb3e936ad26260dce3b3b173da9712b28d12462c","src/bin/dump.rs":"78929424ec2e9d9f155e4eab9b118a6f478caae422db734302fa254a816e5be1","src/bin/rand.rs":"e3a2da9bb449aa9b54e8930c2a54c8a509300283a612360802f9182ae9db5ce4","src/env.rs":"ce4efb94152e47443f1e01789289cdb16a7d92c16e44296d380bd94b0154c744","src/error.rs":"4c519b489057626fe6ce48453cd4fe4b5e14a6c6af2ffb6a764767a438157aab","src/helpers.rs":"2565e271d6edac3e2551d9fdede00a4348c98ddd2df6d95ef08112ced4397f28","src/lib.rs":"f9dbcc6eb3ea169685c30cb6cf34600c5a69e68006cdab51c56e5c7f2f1a60dd","src/manager.rs":"8f6db0298168c57c0dc08b8bd942399181e144719bd93ad9ae385ee0fdc5fae2","src/migrator.rs":"60322b5e331d11e368f2f3e15103045fc514bb0c3d5e19e22d9294dee87e63ed","src/readwrite.rs":"d4296a27458119c47275b230e0d94740c249e05921b8ac7ecbae4c91c92bca0a","src/store.rs":"f6758b4ee9c61ec98468b778cc19bd91b66945819ce5bba11e7b3a8ffe85090e","src/store/integer.rs":"d72ffc052bc3f3d91987ae4afaae4fca819f0ffa7155c83c64b78eb6081055a3","src/store/integermulti.rs":"b807b896582dca59d341a99cd5c7539ea8cebbffadc85072c81dde1f15d0ee43","src/store/keys.rs":"584bf897df7a0a10dd2841cf31cb693124748757902374d215b4d7caf79baae5","src/store/keys/encodables.rs":"d8b5dd6f49cab4a44b6f638c473ad372f589669e7ef9bd6935aa960840b95063","src/store/keys/primitives.rs":"f714e54dd6507e048cf867deecd15a5a452298b8255575aa9eb1c67317fff5dd","src/store/multi.rs":"6337401b68ac61022e4f1668764cd7d4fa00357653db488f61eb7d3ed5424145","src/store/single.rs":"3dc8cab214af5169cb1e34072621e55e40043da0ef6609138a9df1d3f1415a3b","src/value.rs":"4ccf8de44934b8c1baaff29b7993e6c442ecfa2380e73ee37d2eca5aad310a60","tests/env-all.rs":"3ad08161ae79e793241180b0f716f2e9981504cf24a9f348de958944b9e54653","tests/env-lmdb.rs":"8f48bd097f1b18fc9e61518d82086246853ff9cd965241ccf765371e7e668273","tests/env-migration.rs":"a71525fec63a37e1d2db098ba13fbc42e631fc653deabaee47f5856da45477a8","tests/env-safe.rs":"4b768a29f68f6d832204e0130bcd058bf1d9f684641238e5f713c3fc7e908ddf","tests/integer-store.rs":"2deaeee18ea945f54ef5ba7d85917e13e56e46b7af5de03f678f1c4a99d67292","tests/manager.rs":"2e825363cbb322e91ecfa9ff2e6ea2f2ead1603ea0d2b956bbe328a50fa5c846","tests/multi-integer-store.rs":"e53f4753fa3fd8891404048aa533fafe3c1d58230adf1a1a23d31d3c421c82b2","tests/test_txn.rs":"4ff987baab7c29db32d472e47279c06832663aa10c67268b23639e96f76a4dcd"},"package":"e97d1b6321740ce36d77d67d22ff84ac8a996cf69dbd0727b8bcae52f1c98aaa"}
\ No newline at end of file
+{"files":{"CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"9fadf20d1ee1a5bf5c567ce34e74be644f0a798bbe1e2e3845fca1f9aa9e6b98","Cargo.toml":"9e1d053b76252691624ea2f4e43f2bcebfe1ee7f0bfd34f44e28dfe21d5dc27c","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"f80ce3b29b0cf54927d2bb4457e0b5691a2e6b56a5fc140c551c3cee68f242ae","examples/README.md":"143767fc145bf167ce269a65138cb3f7086cb715b8bc4f73626da82966e646f4","examples/iterator.rs":"844acdb7b81b95547502dddead0095dd98c4d6be63a7a765c97c354c02ee38d1","examples/simple-store.rs":"56c403307cd8a7644baa7831e7a400df0b2d2df25a854b2f3441abff78a54227","run-all-examples.sh":"7f9d11d01017f77e1c9d26e3e82dfca8c6930deaec85e864458e33a7fa267de0","src/backend.rs":"091d6c8aed4782f7e19079aaf2a25db0db02c969edc8058f882dde47137cc983","src/backend/common.rs":"3dd1b7fbe0c62b0731904358b11f82054c918044de6271c502fb0d38b813b67d","src/backend/impl_lmdb.rs":"2ad9749017613defe11d854480d6d7b3db04ec5d2f43f099be30d01da2c59a16","src/backend/impl_lmdb/arch_migrator.rs":"eeaafcb328f7b9e6deb24d5f8ac7c27d114a8e08bdfcc3f2df588178ee234f83","src/backend/impl_lmdb/arch_migrator_error.rs":"ee15d7bee9e12a037e6b7423acf05040672913e0d86ff632d826eaaa3188eecb","src/backend/impl_lmdb/cursor.rs":"77a7611f8638c5358f74f79cccde18581d3f6078f72c3a8419abde144791bfdf","src/backend/impl_lmdb/database.rs":"c52ab76a4389c525a998eef0302e709d57a22f2627a967b2246e98ae15f4a999","src/backend/impl_lmdb/environment.rs":"dac99f2341e2ca581bed013385b6a33f76df30497e15d78cb890e916000f547b","src/backend/impl_lmdb/error.rs":"856782cb1ffda0c0cdd0f0c783762412db35b8b6b6a0aefaf36974fe169ec5a2","src/backend/impl_lmdb/flags.rs":"861144973a397372cc572999ba8f87a538f48d3b9d4f8233ad78ce76cd2d40b1","src/backend/impl_lmdb/info.rs":"e44d9100c0acc179263f41c70d2d139faa1b19efe6948c951958986c5fc90dbf","src/backend/impl_lmdb/iter.rs":"ba4fd8b287b785e2567dd819d52ce58cf5bd73096ac59675ac11b21a06885d8a","src/backend/impl_lmdb/stat.rs":"ec3100fee914cfe4805a7c588344c707c027bad7b37b43b7455baa0772cb64f9","src/backend/impl_lmdb/transaction.rs":"5ecf5c86148e7c2cc62f89abb1e571f6f355989d6bb48af44a3435e5222260e7","src/backend/impl_safe.rs":"df796cd3b43bd973f213f7616c396ac4f006759bef3be8fd5f1792a82e26baeb","src/backend/impl_safe/cursor.rs":"7fb0d39ee8b2ea69f9ac8b733c1a8f487dfa814486821bc6a8bb1b656539942c","src/backend/impl_safe/database.rs":"7b03bbe7ec8183af06f2376028049ad638e8e778b9686364e13f06a63f7102c4","src/backend/impl_safe/environment.rs":"64893437feff6e96b9e54d307ed5b676ed47c46fc4433db5f405806523bfb92a","src/backend/impl_safe/error.rs":"5a41b7b8cc059abd485c8f740593e35d2d3a4e90466995e954711113f79da200","src/backend/impl_safe/flags.rs":"8775cfab62a78466184310bffb7c0f16c51c4b6d941571348a1ac5ece76a6de0","src/backend/impl_safe/info.rs":"c9dc67d989394dd7a25e99681e4a25f19b4ca3992eb18b719fb89742fae635b2","src/backend/impl_safe/iter.rs":"b98b54b51b474cb1e31f90136b64871baff6c31261d60bd4f79faa329768f2e8","src/backend/impl_safe/snapshot.rs":"de83b5feffcb2603e64c4f53314c4b033fbc3289c88076be85cc33eec88b1d43","src/backend/impl_safe/stat.rs":"77ea9937c2ff839cba4ed5597b4804550915d5c50fce0fc86133bf23cff49d95","src/backend/impl_safe/transaction.rs":"32fbda2c7aeacb0c485cc91766558708c038181f3e8bc613c4b6ba1a55c0c8d1","src/backend/traits.rs":"da7e4440e6e59575a15899df6a4d6930f9107b180b95f24fe727b8e62dcefd65","src/bin/dump.rs":"78929424ec2e9d9f155e4eab9b118a6f478caae422db734302fa254a816e5be1","src/bin/rand.rs":"e3a2da9bb449aa9b54e8930c2a54c8a509300283a612360802f9182ae9db5ce4","src/env.rs":"80c5f175a2e7c6a278d59618d083010f0ef523b00b312ac1208db879ada5181b","src/error.rs":"53e81718c9295f6cc9417af69bf8c33d67e2761e1ddcc249a06f8b36e4c4e541","src/helpers.rs":"2565e271d6edac3e2551d9fdede00a4348c98ddd2df6d95ef08112ced4397f28","src/lib.rs":"7490eaecffed4145eaa82d996de450521a7877babf91e28f7d4687bd7e4c6f41","src/manager.rs":"aca3092979841805c6b54c5a3b41b98e3708c5f8e5d0a4f35f6e488703ae83f4","src/migrator.rs":"f1b63a6e3172f3c939693ae3d2bcef993bce6468ae58f73ea8691c79647917ba","src/readwrite.rs":"d4296a27458119c47275b230e0d94740c249e05921b8ac7ecbae4c91c92bca0a","src/store.rs":"607eff19464b0deed5d2f61d989f4370f30fd0b16e20a454eeffa51cf2175868","src/store/integer.rs":"d72ffc052bc3f3d91987ae4afaae4fca819f0ffa7155c83c64b78eb6081055a3","src/store/integermulti.rs":"b807b896582dca59d341a99cd5c7539ea8cebbffadc85072c81dde1f15d0ee43","src/store/keys.rs":"584bf897df7a0a10dd2841cf31cb693124748757902374d215b4d7caf79baae5","src/store/keys/encodables.rs":"d8b5dd6f49cab4a44b6f638c473ad372f589669e7ef9bd6935aa960840b95063","src/store/keys/primitives.rs":"f714e54dd6507e048cf867deecd15a5a452298b8255575aa9eb1c67317fff5dd","src/store/multi.rs":"6337401b68ac61022e4f1668764cd7d4fa00357653db488f61eb7d3ed5424145","src/store/single.rs":"3dc8cab214af5169cb1e34072621e55e40043da0ef6609138a9df1d3f1415a3b","src/value.rs":"4ccf8de44934b8c1baaff29b7993e6c442ecfa2380e73ee37d2eca5aad310a60","tests/env-all.rs":"3ad08161ae79e793241180b0f716f2e9981504cf24a9f348de958944b9e54653","tests/env-lmdb.rs":"8f48bd097f1b18fc9e61518d82086246853ff9cd965241ccf765371e7e668273","tests/env-migration.rs":"55eb74d11f7e718d9ec3a39746e76156cd966d2fb5092a4edec14f486cbd14dc","tests/env-safe.rs":"4b768a29f68f6d832204e0130bcd058bf1d9f684641238e5f713c3fc7e908ddf","tests/integer-store.rs":"2deaeee18ea945f54ef5ba7d85917e13e56e46b7af5de03f678f1c4a99d67292","tests/manager.rs":"029bad15cf0f7f323eaa2a529c9c54c27e4738e6fead0bdd0c48899b7422e361","tests/multi-integer-store.rs":"e53f4753fa3fd8891404048aa533fafe3c1d58230adf1a1a23d31d3c421c82b2","tests/test_txn.rs":"4ff987baab7c29db32d472e47279c06832663aa10c67268b23639e96f76a4dcd"},"package":"917d7a01f8c1ae46226e9d8dd24314279be7b04dfd0b24340d420e6927c2e687"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/Cargo.lock firefox-85.0+build1/third_party/rust/rkv/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/rkv/Cargo.lock	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/Cargo.lock	2021-01-18 19:58:26.000000000 +0000
@@ -333,7 +333,7 @@
 
 [[package]]
 name = "rkv"
-version = "0.15.0"
+version = "0.16.1"
 dependencies = [
  "arrayref",
  "bincode",
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/Cargo.toml firefox-85.0+build1/third_party/rust/rkv/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/rkv/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "rkv"
-version = "0.15.0"
+version = "0.16.1"
 authors = ["Richard Newman <rnewman@twinql.com>", "Nan Jiang <najiang@mozilla.com>", "Myk Melez <myk@mykzilla.org>", "Victor Porof <vporof@mozilla.com>"]
 exclude = ["/tests/envs/*"]
 description = "A simple, humane, typed key-value storage solution"
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_lmdb/environment.rs firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_lmdb/environment.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_lmdb/environment.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_lmdb/environment.rs	2021-01-18 19:58:26.000000000 +0000
@@ -44,7 +44,7 @@
     env_path_type: EnvironmentPathType,
     env_lock_type: EnvironmentLockType,
     env_db_type: EnvironmentDefaultDbType,
-    make_dir: bool,
+    make_dir_if_needed: bool,
 }
 
 impl<'b> BackendEnvironmentBuilder<'b> for EnvironmentBuilderImpl {
@@ -58,7 +58,7 @@
             env_path_type: EnvironmentPathType::SubDir,
             env_lock_type: EnvironmentLockType::Lockfile,
             env_db_type: EnvironmentDefaultDbType::SingleDatabase,
-            make_dir: false,
+            make_dir_if_needed: false,
         }
     }
 
@@ -95,11 +95,17 @@
         self
     }
 
-    fn set_make_dir_if_needed(&mut self, make_dir: bool) -> &mut Self {
-        self.make_dir = make_dir;
+    fn set_make_dir_if_needed(&mut self, make_dir_if_needed: bool) -> &mut Self {
+        self.make_dir_if_needed = make_dir_if_needed;
         self
     }
 
+    fn set_discard_if_corrupted(&mut self, _discard_if_corrupted: bool) -> &mut Self {
+        // Unfortunately, when opening a database, LMDB doesn't handle all the ways it could have
+        // been corrupted. Prefer using the `SafeMode` backend if this is important.
+        unimplemented!();
+    }
+
     fn open(&self, path: &Path) -> Result<Self::Environment, Self::Error> {
         match self.env_path_type {
             EnvironmentPathType::NoSubDir => {
@@ -109,7 +115,7 @@
             },
             EnvironmentPathType::SubDir => {
                 if !path.is_dir() {
-                    if !self.make_dir {
+                    if !self.make_dir_if_needed {
                         return Err(ErrorImpl::UnsuitableEnvironmentPath(path.into()));
                     }
                     fs::create_dir_all(path)?;
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_safe/environment.rs firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_safe/environment.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_safe/environment.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_safe/environment.rs	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
     borrow::Cow,
     collections::HashMap,
     fs,
+    ops::DerefMut,
     path::{
         Path,
         PathBuf,
@@ -54,7 +55,8 @@
     max_readers: Option<usize>,
     max_dbs: Option<usize>,
     map_size: Option<usize>,
-    make_dir: bool,
+    make_dir_if_needed: bool,
+    discard_if_corrupted: bool,
 }
 
 impl<'b> BackendEnvironmentBuilder<'b> for EnvironmentBuilderImpl {
@@ -68,7 +70,8 @@
             max_readers: None,
             max_dbs: None,
             map_size: None,
-            make_dir: false,
+            make_dir_if_needed: false,
+            discard_if_corrupted: false,
         }
     }
 
@@ -95,8 +98,13 @@
         self
     }
 
-    fn set_make_dir_if_needed(&mut self, make_dir: bool) -> &mut Self {
-        self.make_dir = make_dir;
+    fn set_make_dir_if_needed(&mut self, make_dir_if_needed: bool) -> &mut Self {
+        self.make_dir_if_needed = make_dir_if_needed;
+        self
+    }
+
+    fn set_discard_if_corrupted(&mut self, discard_if_corrupted: bool) -> &mut Self {
+        self.discard_if_corrupted = discard_if_corrupted;
         self
     }
 
@@ -104,43 +112,65 @@
         // Technically NO_SUB_DIR should change these checks here, but they're both currently
         // unimplemented with this storage backend.
         if !path.is_dir() {
-            if !self.make_dir {
+            if !self.make_dir_if_needed {
                 return Err(ErrorImpl::UnsuitableEnvironmentPath(path.into()));
             }
             fs::create_dir_all(path)?;
         }
         let mut env = EnvironmentImpl::new(path, self.flags, self.max_readers, self.max_dbs, self.map_size)?;
-        env.read_from_disk()?;
+        env.read_from_disk(self.discard_if_corrupted)?;
         Ok(env)
     }
 }
 
 #[derive(Debug)]
+pub(crate) struct EnvironmentDbs {
+    pub(crate) arena: DatabaseArena,
+    pub(crate) name_map: DatabaseNameMap,
+}
+
+#[derive(Debug)]
+pub(crate) struct EnvironmentDbsRefMut<'a> {
+    pub(crate) arena: &'a mut DatabaseArena,
+    pub(crate) name_map: &'a mut DatabaseNameMap,
+}
+
+impl<'a> From<&'a mut EnvironmentDbs> for EnvironmentDbsRefMut<'a> {
+    fn from(dbs: &mut EnvironmentDbs) -> EnvironmentDbsRefMut {
+        EnvironmentDbsRefMut {
+            arena: &mut dbs.arena,
+            name_map: &mut dbs.name_map,
+        }
+    }
+}
+
+#[derive(Debug)]
 pub struct EnvironmentImpl {
     path: PathBuf,
     max_dbs: usize,
-    arena: RwLock<DatabaseArena>,
-    dbs: RwLock<DatabaseNameMap>,
+    dbs: RwLock<EnvironmentDbs>,
     ro_txns: Arc<()>,
     rw_txns: Arc<()>,
 }
 
 impl EnvironmentImpl {
     fn serialize(&self) -> Result<Vec<u8>, ErrorImpl> {
-        let arena = self.arena.read().map_err(|_| ErrorImpl::EnvPoisonError)?;
         let dbs = self.dbs.read().map_err(|_| ErrorImpl::EnvPoisonError)?;
-        let data: HashMap<_, _> = dbs.iter().map(|(name, id)| (name, &arena[id.0])).collect();
+        let data: HashMap<_, _> = dbs.name_map.iter().map(|(name, id)| (name, &dbs.arena[id.0])).collect();
         Ok(bincode::serialize(&data)?)
     }
 
-    fn deserialize(bytes: &[u8]) -> Result<(DatabaseArena, DatabaseNameMap), ErrorImpl> {
+    fn deserialize(bytes: &[u8], discard_if_corrupted: bool) -> Result<(DatabaseArena, DatabaseNameMap), ErrorImpl> {
         let mut arena = DatabaseArena::new();
-        let mut dbs = HashMap::new();
-        let data: HashMap<_, _> = bincode::deserialize(&bytes)?;
+        let mut name_map = HashMap::new();
+        let data: HashMap<_, _> = match bincode::deserialize(&bytes) {
+            Err(_) if discard_if_corrupted => Ok(HashMap::new()),
+            result => result,
+        }?;
         for (name, db) in data {
-            dbs.insert(name, DatabaseImpl(arena.alloc(db)));
+            name_map.insert(name, DatabaseImpl(arena.alloc(db)));
         }
-        Ok((arena, dbs))
+        Ok((arena, name_map))
     }
 }
 
@@ -165,14 +195,16 @@
         Ok(EnvironmentImpl {
             path: path.to_path_buf(),
             max_dbs: max_dbs.unwrap_or(std::usize::MAX),
-            arena: RwLock::new(DatabaseArena::new()),
-            dbs: RwLock::new(HashMap::new()),
+            dbs: RwLock::new(EnvironmentDbs {
+                arena: DatabaseArena::new(),
+                name_map: HashMap::new(),
+            }),
             ro_txns: Arc::new(()),
             rw_txns: Arc::new(()),
         })
     }
 
-    pub(crate) fn read_from_disk(&mut self) -> Result<(), ErrorImpl> {
+    pub(crate) fn read_from_disk(&mut self, discard_if_corrupted: bool) -> Result<(), ErrorImpl> {
         let mut path = Cow::from(&self.path);
         if fs::metadata(&path)?.is_dir() {
             path.to_mut().push(DEFAULT_DB_FILENAME);
@@ -180,9 +212,11 @@
         if fs::metadata(&path).is_err() {
             return Ok(());
         };
-        let (arena, dbs) = Self::deserialize(&fs::read(&path)?)?;
-        self.arena = RwLock::new(arena);
-        self.dbs = RwLock::new(dbs);
+        let (arena, name_map) = Self::deserialize(&fs::read(&path)?, discard_if_corrupted)?;
+        self.dbs = RwLock::new(EnvironmentDbs {
+            arena,
+            name_map,
+        });
         Ok(())
     }
 
@@ -195,12 +229,12 @@
         Ok(())
     }
 
-    pub(crate) fn dbs(&self) -> Result<RwLockReadGuard<DatabaseArena>, ErrorImpl> {
-        self.arena.read().map_err(|_| ErrorImpl::EnvPoisonError)
+    pub(crate) fn dbs(&self) -> Result<RwLockReadGuard<EnvironmentDbs>, ErrorImpl> {
+        self.dbs.read().map_err(|_| ErrorImpl::EnvPoisonError)
     }
 
-    pub(crate) fn dbs_mut(&self) -> Result<RwLockWriteGuard<DatabaseArena>, ErrorImpl> {
-        self.arena.write().map_err(|_| ErrorImpl::EnvPoisonError)
+    pub(crate) fn dbs_mut(&self) -> Result<RwLockWriteGuard<EnvironmentDbs>, ErrorImpl> {
+        self.dbs.write().map_err(|_| ErrorImpl::EnvPoisonError)
     }
 }
 
@@ -215,7 +249,7 @@
 
     fn get_dbs(&self) -> Result<Vec<Option<String>>, Self::Error> {
         let dbs = self.dbs.read().map_err(|_| ErrorImpl::EnvPoisonError)?;
-        Ok(dbs.keys().map(|key| key.to_owned()).collect())
+        Ok(dbs.name_map.keys().map(|key| key.to_owned()).collect())
     }
 
     fn open_db(&self, name: Option<&str>) -> Result<Self::Database, Self::Error> {
@@ -225,8 +259,8 @@
         // TOOD: don't reallocate `name`.
         let key = name.map(String::from);
         let dbs = self.dbs.read().map_err(|_| ErrorImpl::EnvPoisonError)?;
-        let id = dbs.get(&key).ok_or(ErrorImpl::DbNotFoundError)?;
-        Ok(*id)
+        let db = dbs.name_map.get(&key).ok_or(ErrorImpl::DbNotFoundError)?;
+        Ok(*db)
     }
 
     fn create_db(&self, name: Option<&str>, flags: Self::Flags) -> Result<Self::Database, Self::Error> {
@@ -236,11 +270,13 @@
         // TOOD: don't reallocate `name`.
         let key = name.map(String::from);
         let mut dbs = self.dbs.write().map_err(|_| ErrorImpl::EnvPoisonError)?;
-        let mut arena = self.arena.write().map_err(|_| ErrorImpl::EnvPoisonError)?;
-        if dbs.keys().filter_map(|k| k.as_ref()).count() >= self.max_dbs && name != None {
+        if dbs.name_map.keys().filter_map(|k| k.as_ref()).count() >= self.max_dbs && name != None {
             return Err(ErrorImpl::DbsFull);
         }
-        let id = dbs.entry(key).or_insert_with(|| DatabaseImpl(arena.alloc(Database::new(Some(flags), None))));
+        let parts = EnvironmentDbsRefMut::from(dbs.deref_mut());
+        let arena = parts.arena;
+        let name_map = parts.name_map;
+        let id = name_map.entry(key).or_insert_with(|| DatabaseImpl(arena.alloc(Database::new(Some(flags), None))));
         Ok(*id)
     }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_safe/transaction.rs firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_safe/transaction.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/backend/impl_safe/transaction.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/backend/impl_safe/transaction.rs	2021-01-18 19:58:26.000000000 +0000
@@ -37,7 +37,7 @@
 
 impl<'t> RoTransactionImpl<'t> {
     pub(crate) fn new(env: &'t EnvironmentImpl, idx: Arc<()>) -> Result<RoTransactionImpl<'t>, ErrorImpl> {
-        let snapshots = env.dbs()?.iter().map(|(id, db)| (DatabaseImpl(id), db.snapshot())).collect();
+        let snapshots = env.dbs()?.arena.iter().map(|(id, db)| (DatabaseImpl(id), db.snapshot())).collect();
         Ok(RoTransactionImpl {
             env,
             snapshots,
@@ -78,7 +78,7 @@
 
 impl<'t> RwTransactionImpl<'t> {
     pub(crate) fn new(env: &'t EnvironmentImpl, idx: Arc<()>) -> Result<RwTransactionImpl<'t>, ErrorImpl> {
-        let snapshots = env.dbs()?.iter().map(|(id, db)| (DatabaseImpl(id), db.snapshot())).collect();
+        let snapshots = env.dbs()?.arena.iter().map(|(id, db)| (DatabaseImpl(id), db.snapshot())).collect();
         Ok(RwTransactionImpl {
             env,
             snapshots,
@@ -144,7 +144,7 @@
         let mut dbs = self.env.dbs_mut()?;
 
         for (id, snapshot) in self.snapshots {
-            let db = dbs.get_mut(id.0).ok_or_else(|| ErrorImpl::DbIsForeignError)?;
+            let db = dbs.arena.get_mut(id.0).ok_or_else(|| ErrorImpl::DbIsForeignError)?;
             db.replace(snapshot);
         }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/backend/traits.rs firefox-85.0+build1/third_party/rust/rkv/src/backend/traits.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/backend/traits.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/backend/traits.rs	2021-01-18 19:58:26.000000000 +0000
@@ -91,7 +91,9 @@
 
     fn set_map_size(&mut self, size: usize) -> &mut Self;
 
-    fn set_make_dir_if_needed(&mut self, make_dir: bool) -> &mut Self;
+    fn set_make_dir_if_needed(&mut self, make_dir_if_needed: bool) -> &mut Self;
+
+    fn set_discard_if_corrupted(&mut self, discard_if_corrupted: bool) -> &mut Self;
 
     fn open(&self, path: &Path) -> Result<Self::Environment, Self::Error>;
 }
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/env.rs firefox-85.0+build1/third_party/rust/rkv/src/env.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/env.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/env.rs	2021-01-18 19:58:26.000000000 +0000
@@ -30,13 +30,17 @@
         BackendRwCursorTransaction,
         SafeModeError,
     },
-    error::StoreError,
+    error::{
+        CloseError,
+        StoreError,
+    },
     readwrite::{
         Reader,
         Writer,
     },
     store::{
         single::SingleStore,
+        CloseOptions,
         Options as StoreOptions,
     },
 };
@@ -310,15 +314,16 @@
         self.env.set_map_size(size).map_err(Into::into)
     }
 
-    /// Closes this environment and deletes all its files from disk. Doesn't delete the
-    /// folder used when opening the environment.
-    pub fn close_and_delete(self) -> Result<(), StoreError> {
+    /// Closes this environment and optionally deletes all its files from disk. Doesn't
+    /// delete the folder used when opening the environment.
+    pub fn close(self, options: CloseOptions) -> Result<(), CloseError> {
         let files = self.env.get_files_on_disk();
-        self.sync(true)?;
         drop(self);
 
-        for file in files {
-            fs::remove_file(file)?;
+        if options.delete {
+            for file in files {
+                fs::remove_file(file)?;
+            }
         }
 
         Ok(())
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/error.rs firefox-85.0+build1/third_party/rust/rkv/src/error.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/error.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/error.rs	2021-01-18 19:58:26.000000000 +0000
@@ -132,10 +132,40 @@
 }
 
 #[derive(Debug, Fail)]
+pub enum CloseError {
+    #[fail(display = "manager poisoned")]
+    ManagerPoisonError,
+
+    #[fail(display = "close attempted while manager has an environment still open")]
+    EnvironmentStillOpen,
+
+    #[fail(display = "close attempted while an environment not known to the manager is still open")]
+    UnknownEnvironmentStillOpen,
+
+    #[fail(display = "I/O error: {:?}", _0)]
+    IoError(io::Error),
+}
+
+impl<T> From<sync::PoisonError<T>> for CloseError {
+    fn from(_: sync::PoisonError<T>) -> CloseError {
+        CloseError::ManagerPoisonError
+    }
+}
+
+impl From<io::Error> for CloseError {
+    fn from(e: io::Error) -> CloseError {
+        CloseError::IoError(e)
+    }
+}
+
+#[derive(Debug, Fail)]
 pub enum MigrateError {
     #[fail(display = "store error: {}", _0)]
     StoreError(StoreError),
 
+    #[fail(display = "close error: {}", _0)]
+    CloseError(CloseError),
+
     #[fail(display = "manager poisoned")]
     ManagerPoisonError,
 
@@ -152,6 +182,12 @@
     }
 }
 
+impl From<CloseError> for MigrateError {
+    fn from(e: CloseError) -> MigrateError {
+        MigrateError::CloseError(e)
+    }
+}
+
 impl<T> From<sync::PoisonError<T>> for MigrateError {
     fn from(_: sync::PoisonError<T>) -> MigrateError {
         MigrateError::ManagerPoisonError
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/lib.rs firefox-85.0+build1/third_party/rust/rkv/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -234,6 +234,7 @@
 pub use store::{
     keys::EncodableKey,
     single::SingleStore,
+    CloseOptions,
     Options as StoreOptions,
 };
 pub use value::{
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/manager.rs firefox-85.0+build1/third_party/rust/rkv/src/manager.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/manager.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/manager.rs	2021-01-18 19:58:26.000000000 +0000
@@ -34,12 +34,17 @@
         LmdbEnvironment,
         SafeModeEnvironment,
     },
-    error::StoreError,
+    error::{
+        CloseError,
+        StoreError,
+    },
     helpers::canonicalize_path,
+    store::CloseOptions,
     Rkv,
 };
 
 type Result<T> = result::Result<T, StoreError>;
+type CloseResult<T> = result::Result<T, CloseError>;
 type SharedRkv<E> = Arc<RwLock<Rkv<E>>>;
 
 lazy_static! {
@@ -146,10 +151,9 @@
         })
     }
 
-    /// Tries to close the specified environment and delete all its files from disk.
-    /// Doesn't delete the folder used when opening the environment.
-    /// This will only work if there's no other users of this environment.
-    pub fn try_close_and_delete<'p, P>(&mut self, path: P) -> Result<()>
+    /// Tries to close the specified environment.
+    /// Returns an error when other users of this environment still exist.
+    pub fn try_close<'p, P>(&mut self, path: P, options: CloseOptions) -> CloseResult<()>
     where
         P: Into<&'p Path>,
     {
@@ -159,16 +163,14 @@
             canonicalize_path(path)?
         };
         match self.environments.entry(canonical) {
-            Entry::Vacant(_) => {}, // noop
+            Entry::Vacant(_) => Ok(()),
+            Entry::Occupied(e) if Arc::strong_count(e.get()) > 1 => Err(CloseError::EnvironmentStillOpen),
             Entry::Occupied(e) => {
-                if Arc::strong_count(e.get()) == 1 {
-                    if let Ok(env) = Arc::try_unwrap(e.remove()) {
-                        env.into_inner()?.close_and_delete()?;
-                    }
-                }
+                let env = Arc::try_unwrap(e.remove()).map_err(|_| CloseError::UnknownEnvironmentStillOpen)?;
+                env.into_inner()?.close(options)?;
+                Ok(())
             },
         }
-        Ok(())
     }
 }
 
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/migrator.rs firefox-85.0+build1/third_party/rust/rkv/src/migrator.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/migrator.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/migrator.rs	2021-01-18 19:58:26.000000000 +0000
@@ -28,8 +28,8 @@
 //!   handling all errors.
 //! * `easy_migrate_<src>_to_<dst>` which is similar to the above, but ignores the
 //!   migration and doesn't delete any files if the source environment is invalid
-//!   (corrupted), unavailable (path not found or incompatible with configuration), or
-//!   empty (database has no records).
+//!   (corrupted), unavailable (path not accessible or incompatible with configuration),
+//!   or empty (database has no records).
 //!
 //! The tool currently has these limitations:
 //!
@@ -100,15 +100,18 @@
     };
 
     (open $migrate:tt, $name:tt, $builder:tt, $src_env:ty, $dst_env:ty) => {
-        /// Same as the non `open_*` migration method, but automatically attempts to open the
-        /// source environment. Finally, deletes all of its supporting files if there's no other
-        /// environment open at that path.
+        /// Same as the the `migrate_x_to_y` migration method above, but automatically attempts
+        /// to open the source environment. Finally, deletes all of its supporting files if
+        /// there's no other environment open at that path and the migration succeeded.
         pub fn $name<F, D>(path: &std::path::Path, build: F, dst_env: D) -> Result<(), MigrateError>
         where
             F: FnOnce(crate::backend::$builder) -> crate::backend::$builder,
             D: std::ops::Deref<Target = Rkv<$dst_env>>,
         {
-            use crate::backend::*;
+            use crate::{
+                backend::*,
+                CloseOptions,
+            };
 
             let mut manager = crate::Manager::<$src_env>::singleton().write()?;
             let mut builder = Rkv::<$src_env>::environment_builder::<$builder>();
@@ -119,24 +122,38 @@
             Migrator::$migrate(src_env.read()?, dst_env)?;
 
             drop(src_env);
-            manager.try_close_and_delete(path)?;
+            manager.try_close(path, CloseOptions::delete_files_on_disk())?;
 
             Ok(())
         }
     };
 
     (easy $migrate:tt, $name:tt, $src_env:ty, $dst_env:ty) => {
-        /// Same as the `open_*` migration method, but ignores the migration and doesn't delete
-        /// any files if the source environment is invalid (corrupted), unavailable, or empty.
+        /// Same as the `open_and_migrate_x_to_y` migration method above, but ignores the
+        /// migration and doesn't delete any files if the following conditions apply:
+        /// - Source environment is invalid/corrupted, unavailable, or empty.
+        /// - Destination environment is not empty.
+        /// Use this instead of the other migration methods if:
+        /// - You're not concerned by throwing away old data and starting fresh with a new store.
+        /// - You'll never want to overwrite data in the new store from the old store.
         pub fn $name<D>(path: &std::path::Path, dst_env: D) -> Result<(), MigrateError>
         where
             D: std::ops::Deref<Target = Rkv<$dst_env>>,
         {
             match Migrator::$migrate(path, |builder| builder, dst_env) {
+                // Source environment is an invalid file or corrupted database.
                 Err(crate::MigrateError::StoreError(crate::StoreError::FileInvalid)) => Ok(()),
+                Err(crate::MigrateError::StoreError(crate::StoreError::DatabaseCorrupted)) => Ok(()),
+                // Path not accessible.
                 Err(crate::MigrateError::StoreError(crate::StoreError::IoError(_))) => Ok(()),
+                // Path accessible but incompatible for configuration.
                 Err(crate::MigrateError::StoreError(crate::StoreError::UnsuitableEnvironmentPath(_))) => Ok(()),
+                // Couldn't close source environment and delete files on disk (e.g. other stores still open).
+                Err(crate::MigrateError::CloseError(_)) => Ok(()),
+                // Nothing to migrate.
                 Err(crate::MigrateError::SourceEmpty) => Ok(()),
+                // Migrating would overwrite.
+                Err(crate::MigrateError::DestinationNotEmpty) => Ok(()),
                 result => result,
             }?;
 
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/src/store.rs firefox-85.0+build1/third_party/rust/rkv/src/store.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/src/store.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/src/store.rs	2021-01-18 19:58:26.000000000 +0000
@@ -39,3 +39,16 @@
         }
     }
 }
+
+#[derive(Default, Debug, Copy, Clone)]
+pub struct CloseOptions {
+    pub delete: bool,
+}
+
+impl CloseOptions {
+    pub fn delete_files_on_disk() -> CloseOptions {
+        CloseOptions {
+            delete: true,
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/tests/env-migration.rs firefox-85.0+build1/third_party/rust/rkv/tests/env-migration.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/tests/env-migration.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/tests/env-migration.rs	2021-01-18 19:58:26.000000000 +0000
@@ -18,8 +18,11 @@
 use rkv::{
     backend::{
         Lmdb,
+        LmdbEnvironment,
         SafeMode,
+        SafeModeEnvironment,
     },
+    Manager,
     Migrator,
     Rkv,
     StoreOptions,
@@ -38,8 +41,8 @@
 }
 
 #[test]
-fn test_simple_migrator_lmdb_to_safe() {
-    let root = Builder::new().prefix("test_simple_migrator_lmdb_to_safe").tempdir().expect("tempdir");
+fn test_open_migrator_lmdb_to_safe() {
+    let root = Builder::new().prefix("test_open_migrator_lmdb_to_safe").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     // Populate source environment and persist to disk.
@@ -92,8 +95,8 @@
 }
 
 #[test]
-fn test_simple_migrator_safe_to_lmdb() {
-    let root = Builder::new().prefix("test_simple_migrator_safe_to_lmdb").tempdir().expect("tempdir");
+fn test_open_migrator_safe_to_lmdb() {
+    let root = Builder::new().prefix("test_open_migrator_safe_to_lmdb").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     // Populate source environment and persist to disk.
@@ -140,8 +143,8 @@
 }
 
 #[test]
-fn test_migrator_round_trip() {
-    let root = Builder::new().prefix("test_simple_migrator_lmdb_to_safe").tempdir().expect("tempdir");
+fn test_open_migrator_round_trip() {
+    let root = Builder::new().prefix("test_open_migrator_lmdb_to_safe").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     // Populate source environment and persist to disk.
@@ -184,8 +187,8 @@
 }
 
 #[test]
-fn test_migrator_no_dir_1() {
-    let root = Builder::new().prefix("test_migrator_no_dir").tempdir().expect("tempdir");
+fn test_easy_migrator_no_dir_1() {
+    let root = Builder::new().prefix("test_easy_migrator_no_dir").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     // This won't fail with IoError even though the path is a bogus path, because this
@@ -205,8 +208,8 @@
 }
 
 #[test]
-fn test_migrator_no_dir_2() {
-    let root = Builder::new().prefix("test_migrator_no_dir").tempdir().expect("tempdir");
+fn test_easy_migrator_no_dir_2() {
+    let root = Builder::new().prefix("test_easy_migrator_no_dir").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     // This won't fail with IoError even though the path is a bogus path, because this
@@ -226,8 +229,8 @@
 }
 
 #[test]
-fn test_migrator_invalid_1() {
-    let root = Builder::new().prefix("test_migrator_invalid").tempdir().expect("tempdir");
+fn test_easy_migrator_invalid_1() {
+    let root = Builder::new().prefix("test_easy_migrator_invalid").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     let dbfile = root.path().join("data.mdb");
@@ -250,8 +253,8 @@
 }
 
 #[test]
-fn test_migrator_invalid_2() {
-    let root = Builder::new().prefix("test_migrator_invalid").tempdir().expect("tempdir");
+fn test_easy_migrator_invalid_2() {
+    let root = Builder::new().prefix("test_easy_migrator_invalid").tempdir().expect("tempdir");
     fs::create_dir_all(root.path()).expect("dir created");
 
     let dbfile = root.path().join("data.safe.bin");
@@ -354,3 +357,115 @@
     assert_eq!(store.get(&reader, "bar").expect("read"), Some(Value::Bool(true)));
     assert_eq!(store.get(&reader, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
 }
+
+#[test]
+fn test_easy_migrator_failed_migration_1() {
+    let root = Builder::new().prefix("test_easy_migrator_failed_migration_1").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    let dbfile = root.path().join("data.mdb");
+    fs::write(&dbfile, "bogus").expect("bogus dbfile created");
+
+    // This won't fail with FileInvalid even though the database is a bogus file, because this
+    // is the "easy mode" migration which automatically handles (ignores) this error.
+    let dst_env = Rkv::new::<SafeMode>(root.path()).expect("new succeeded");
+    Migrator::easy_migrate_lmdb_to_safe_mode(root.path(), &dst_env).expect("migrated");
+
+    // Populate destination environment and persist to disk.
+    populate_store!(&dst_env);
+    dst_env.sync(true).expect("synced");
+
+    // Delete bogus file and create a valid source environment in its place.
+    fs::remove_file(&dbfile).expect("bogus dbfile removed");
+    let src_env = Rkv::new::<Lmdb>(root.path()).expect("new succeeded");
+    populate_store!(&src_env);
+    src_env.sync(true).expect("synced");
+
+    // Attempt to migrate again. This should *NOT* fail with DestinationNotEmpty.
+    Migrator::easy_migrate_lmdb_to_safe_mode(root.path(), &dst_env).expect("migrated");
+}
+
+#[test]
+fn test_easy_migrator_failed_migration_2() {
+    let root = Builder::new().prefix("test_easy_migrator_failed_migration_2").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    let dbfile = root.path().join("data.safe.bin");
+    fs::write(&dbfile, "bogus").expect("bogus dbfile created");
+
+    // This won't fail with FileInvalid even though the database is a bogus file, because this
+    // is the "easy mode" migration which automatically handles (ignores) this error.
+    let dst_env = Rkv::new::<Lmdb>(root.path()).expect("new succeeded");
+    Migrator::easy_migrate_safe_mode_to_lmdb(root.path(), &dst_env).expect("migrated");
+
+    // Populate destination environment and persist to disk.
+    populate_store!(&dst_env);
+    dst_env.sync(true).expect("synced");
+
+    // Delete bogus file and create a valid source environment in its place.
+    fs::remove_file(&dbfile).expect("bogus dbfile removed");
+    let src_env = Rkv::new::<SafeMode>(root.path()).expect("new succeeded");
+    populate_store!(&src_env);
+    src_env.sync(true).expect("synced");
+
+    // Attempt to migrate again. This should *NOT* fail with DestinationNotEmpty.
+    Migrator::easy_migrate_safe_mode_to_lmdb(root.path(), &dst_env).expect("migrated");
+}
+
+fn test_easy_migrator_from_manager_failed_migration_1() {
+    let root = Builder::new().prefix("test_easy_migrator_from_manager_failed_migration_1").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    {
+        let mut src_manager = Manager::<LmdbEnvironment>::singleton().write().unwrap();
+        let created_src_arc = src_manager.get_or_create(root.path(), Rkv::new::<Lmdb>).unwrap();
+        let src_env = created_src_arc.read().unwrap();
+        populate_store!(&src_env);
+        src_env.sync(true).expect("synced");
+    }
+    {
+        let mut dst_manager = Manager::<SafeModeEnvironment>::singleton().write().unwrap();
+        let created_dst_arc_1 = dst_manager.get_or_create(root.path(), Rkv::new::<SafeMode>).unwrap();
+        let dst_env_1 = created_dst_arc_1.read().unwrap();
+        populate_store!(&dst_env_1);
+        dst_env_1.sync(true).expect("synced");
+    }
+
+    // Attempt to migrate again in a new env. This should *NOT* fail with DestinationNotEmpty.
+    let dst_manager = Manager::<SafeModeEnvironment>::singleton().read().unwrap();
+    let created_dst_arc_2 = dst_manager.get(root.path()).unwrap().unwrap();
+    let dst_env_2 = created_dst_arc_2.read().unwrap();
+    Migrator::easy_migrate_lmdb_to_safe_mode(root.path(), dst_env_2).expect("migrated");
+}
+
+fn test_easy_migrator_from_manager_failed_migration_2() {
+    let root = Builder::new().prefix("test_easy_migrator_from_manager_failed_migration_2").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    {
+        let mut src_manager = Manager::<SafeModeEnvironment>::singleton().write().unwrap();
+        let created_src_arc = src_manager.get_or_create(root.path(), Rkv::new::<SafeMode>).unwrap();
+        let src_env = created_src_arc.read().unwrap();
+        populate_store!(&src_env);
+        src_env.sync(true).expect("synced");
+    }
+    {
+        let mut dst_manager = Manager::<LmdbEnvironment>::singleton().write().unwrap();
+        let created_dst_arc_1 = dst_manager.get_or_create(root.path(), Rkv::new::<Lmdb>).unwrap();
+        let dst_env_1 = created_dst_arc_1.read().unwrap();
+        populate_store!(&dst_env_1);
+        dst_env_1.sync(true).expect("synced");
+    }
+
+    // Attempt to migrate again in a new env. This should *NOT* fail with DestinationNotEmpty.
+    let dst_manager = Manager::<LmdbEnvironment>::singleton().read().unwrap();
+    let created_dst_arc_2 = dst_manager.get(root.path()).unwrap().unwrap();
+    let dst_env_2 = created_dst_arc_2.read().unwrap();
+    Migrator::easy_migrate_safe_mode_to_lmdb(root.path(), dst_env_2).expect("migrated");
+}
+
+#[test]
+fn test_easy_migrator_from_manager_failed_migration() {
+    test_easy_migrator_from_manager_failed_migration_1();
+    test_easy_migrator_from_manager_failed_migration_2();
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv/tests/manager.rs firefox-85.0+build1/third_party/rust/rkv/tests/manager.rs
--- firefox-84.0.2+build1/third_party/rust/rkv/tests/manager.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv/tests/manager.rs	2021-01-18 19:58:26.000000000 +0000
@@ -17,12 +17,16 @@
 
 use rkv::{
     backend::{
+        BackendEnvironmentBuilder,
         Lmdb,
         LmdbEnvironment,
         SafeMode,
         SafeModeEnvironment,
     },
+    CloseOptions,
     Rkv,
+    StoreOptions,
+    Value,
 };
 
 /// Test that a manager can be created with simple type inference.
@@ -134,3 +138,120 @@
     let fetched_arc = manager.get(p).expect("success").expect("existed");
     assert!(Arc::ptr_eq(&created_arc, &fetched_arc));
 }
+
+/// Some storage drivers are able to discard when the database is corrupted at runtime.
+/// Test how these managers can discard corrupted databases and re-open.
+#[test]
+fn test_safe_mode_corrupt_while_open_1() {
+    type Manager = rkv::Manager<SafeModeEnvironment>;
+
+    let root = Builder::new().prefix("test_safe_mode_corrupt_while_open_1").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    // Create environment.
+    let mut manager = Manager::singleton().write().unwrap();
+    let shared_env = manager.get_or_create(root.path(), Rkv::new::<SafeMode>).expect("created");
+    let env = shared_env.read().unwrap();
+
+    // Write some data.
+    let store = env.open_single("store", StoreOptions::create()).expect("opened");
+    let mut writer = env.write().expect("writer");
+    store.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
+    store.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
+    store.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
+    writer.commit().expect("committed");
+    env.sync(true).expect("synced");
+
+    // Verify it was flushed to disk.
+    let mut safebin = root.path().to_path_buf();
+    safebin.push("data.safe.bin");
+    assert!(safebin.exists());
+
+    // Oops, corruption.
+    fs::write(&safebin, "bogus").expect("dbfile corrupted");
+
+    // Close everything.
+    drop(env);
+    drop(shared_env);
+    manager.try_close(root.path(), CloseOptions::default()).expect("closed without deleting");
+    assert!(manager.get(root.path()).expect("success").is_none());
+
+    // Recreating environment fails.
+    manager.get_or_create(root.path(), Rkv::new::<SafeMode>).expect_err("not created");
+    assert!(manager.get(root.path()).expect("success").is_none());
+
+    // But we can use a builder and pass `discard_if_corrupted` to deal with it.
+    let mut builder = Rkv::environment_builder::<SafeMode>();
+    builder.set_discard_if_corrupted(true);
+    manager.get_or_create_from_builder(root.path(), builder, Rkv::from_builder::<SafeMode>).expect("created");
+    assert!(manager.get(root.path()).expect("success").is_some());
+}
+
+/// Some storage drivers are able to recover when the database is corrupted at runtime.
+/// Test how these managers can recover corrupted databases while open.
+#[test]
+fn test_safe_mode_corrupt_while_open_2() {
+    type Manager = rkv::Manager<SafeModeEnvironment>;
+
+    let root = Builder::new().prefix("test_safe_mode_corrupt_while_open_2").tempdir().expect("tempdir");
+    fs::create_dir_all(root.path()).expect("dir created");
+
+    // Create environment.
+    let mut manager = Manager::singleton().write().unwrap();
+    let shared_env = manager.get_or_create(root.path(), Rkv::new::<SafeMode>).expect("created");
+    let env = shared_env.read().unwrap();
+
+    // Write some data.
+    let store = env.open_single("store", StoreOptions::create()).expect("opened");
+    let mut writer = env.write().expect("writer");
+    store.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
+    store.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
+    store.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
+    writer.commit().expect("committed");
+    env.sync(true).expect("synced");
+
+    // Verify it was flushed to disk.
+    let mut safebin = root.path().to_path_buf();
+    safebin.push("data.safe.bin");
+    assert!(safebin.exists());
+
+    // Oops, corruption.
+    fs::write(&safebin, "bogus").expect("dbfile corrupted");
+
+    // Reading still works. Magic.
+    let store = env.open_single("store", StoreOptions::default()).expect("opened");
+    let reader = env.read().expect("reader");
+    assert_eq!(store.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
+    assert_eq!(store.get(&reader, "bar").expect("read"), Some(Value::Bool(true)));
+    assert_eq!(store.get(&reader, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
+    reader.abort();
+
+    // Writing still works, dbfile will be un-corrupted.
+    let store = env.open_single("store", StoreOptions::default()).expect("opened");
+    let mut writer = env.write().expect("writer");
+    store.put(&mut writer, "foo2", &Value::I64(5678)).expect("wrote");
+    store.put(&mut writer, "bar2", &Value::Bool(false)).expect("wrote");
+    store.put(&mut writer, "baz2", &Value::Str("byé, yöu")).expect("wrote");
+    writer.commit().expect("committed");
+    env.sync(true).expect("synced");
+
+    // Close everything.
+    drop(env);
+    drop(shared_env);
+    manager.try_close(root.path(), CloseOptions::default()).expect("closed without deleting");
+    assert!(manager.get(root.path()).expect("success").is_none());
+
+    // Recreate environment.
+    let shared_env = manager.get_or_create(root.path(), Rkv::new::<SafeMode>).expect("created");
+    let env = shared_env.read().unwrap();
+
+    // Verify that the dbfile is not corrupted.
+    let store = env.open_single("store", StoreOptions::default()).expect("opened");
+    let reader = env.read().expect("reader");
+    assert_eq!(store.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
+    assert_eq!(store.get(&reader, "bar").expect("read"), Some(Value::Bool(true)));
+    assert_eq!(store.get(&reader, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
+    assert_eq!(store.get(&reader, "foo2").expect("read"), Some(Value::I64(5678)));
+    assert_eq!(store.get(&reader, "bar2").expect("read"), Some(Value::Bool(false)));
+    assert_eq!(store.get(&reader, "baz2").expect("read"), Some(Value::Str("byé, yöu")));
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/.cargo-checksum.json firefox-85.0+build1/third_party/rust/rkv-0.10.4/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"CODE_OF_CONDUCT.md":"902d5357af363426631d907e641e220b3ec89039164743f8442b3f120479b7cf","Cargo.lock":"a53a3ee5e3aa691db3a5580e6d623cd0762dba8d081eb6de893211a7791669f9","Cargo.toml":"0bb154d5139e53f095919e033abd41a72ea22db685a7a052c96087a09819d479","LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","README.md":"c75566740e7f581fe4cbd44ad82cabad5f2665bd72a4519c17a7f98fc69a5703","examples/README.md":"143767fc145bf167ce269a65138cb3f7086cb715b8bc4f73626da82966e646f4","examples/iterator.rs":"ddc3997e394a30ad82d78d2675a48c4617353f88b89bb9a3df5a3804d59b8ef9","examples/simple-store.rs":"cae63e39f2f98ee6ac2f387dcb02d6b929828a74f32f7d18d69c7fc9c3cce765","run-all-examples.sh":"7f9d11d01017f77e1c9d26e3e82dfca8c6930deaec85e864458e33a7fa267de0","src/bin/dump.rs":"da8543848e57893902751f4c4745e835b9c86263da2344af18d5717014f645f5","src/bin/rand.rs":"3da924fa0f1a118f606e2b94aee3a0553d9ebdbd17ee0152b85148adbf521bba","src/env.rs":"5deac6b35e49da1d47d7c852ed2e30ef96b6d15998fe7a79479cec64697626fc","src/error.rs":"f2cbab99691f36c98c24d297de3a303de258ddd3a06e2f54cb5efce20eb3740b","src/lib.rs":"4fe4e7d6a912a850b709ed23e372acd4f214890066322b4720376f7772bb776e","src/manager.rs":"ff2d76056e3a7200035b2e75c5bc2159f337e59c076dddd2476e3094b6ae3741","src/migrate.rs":"674cee0d027fc2eed3b09cebe686c837a97725099c967d8c2f49d19e793e6bfd","src/readwrite.rs":"fde695333e4845f4f53d63da6281f585919e2a3ac5cfe00d173cc139bc822763","src/store.rs":"409d13b1ea0d1254dae947ecbce50e741fb71c3ca118a78803b734336dce6a8f","src/store/integer.rs":"f386474c971f671c9b316a16ebff5b586be6837c886f443753ae13277a7e0070","src/store/integermulti.rs":"1a0912f97619297da31cc8c146e38941b88539d2857df81191a49c8dbd18625d","src/store/multi.rs":"2dec01c2202a2c9069cced4e1e42906b01d0b85df25d17e0ea810c05fa8395d0","src/store/single.rs":"c55c3600714f5ed9e820b16c2335ae00a0071174e0a32b9df89a34182a4b908c","src/value.rs":"7fae77a8291b951591e557ec694bfdadc9eb78557dad36a970cfcdcfb83fd238","tests/integer-store.rs":"f7e06c71b0dead2323c7c61fc8bcbffbdd3a4796eebf6138db9cce3dbba716a3","tests/manager.rs":"97ec61145dc227f4f5fbcb6449c096bbe5b9a09db4e61ff4491c0443fe9adf26","tests/multi-integer-store.rs":"83295b0135c502321304aa06b05d5a9eeab41b1438ed7ddf2cb1a3613dfef4d9","tests/test_txn.rs":"f486d8bd485398e49ae64eac59ca3b44dfa7f8340aab17483cd3e9864fadd88b"},"package":"30a3dbc1f4971372545ed4175f23ef206c81e5874cd574d153646e7ee78f6793"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/Cargo.lock firefox-85.0+build1/third_party/rust/rkv-0.10.4/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/Cargo.lock	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,418 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-
-[[package]]
-name = "backtrace"
-version = "0.3.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad235dabf00f36301792cfe82499880ba54c6486be094d1047b02bacb67c14e8"
-dependencies = [
- "backtrace-sys",
- "cfg-if",
- "libc",
- "rustc-demangle",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17b52e737c40a7d75abca20b29a19a0eb7ba9fc72c5a72dd282a0a3c2c0dc35"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "bincode"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
-dependencies = [
- "byteorder",
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "cc"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "failure"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8529c2421efa3066a5cbd8063d2244603824daccb6936b079010bb2aa89464b"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
-
-[[package]]
-name = "lmdb-rkv"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447a296f7aca299cfbb50f4e4f3d49451549af655fb7215d7f8c0c3d64bad42b"
-dependencies = [
- "bitflags",
- "byteorder",
- "libc",
- "lmdb-rkv-sys",
-]
-
-[[package]]
-name = "lmdb-rkv-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b27470ac25167b3afdfb6af8fcd3bc1be67de50ffbdaf4073378cfded6ae24a5"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-
-[[package]]
-name = "num-traits"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "rkv"
-version = "0.10.4"
-dependencies = [
- "arrayref",
- "bincode",
- "bitflags",
- "byteorder",
- "failure",
- "lazy_static",
- "lmdb-rkv",
- "ordered-float",
- "serde",
- "serde_derive",
- "tempfile",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-
-[[package]]
-name = "serde"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
-
-[[package]]
-name = "syn"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-
-[[package]]
-name = "url"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-dependencies = [
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "uuid"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "winapi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/Cargo.toml firefox-85.0+build1/third_party/rust/rkv-0.10.4/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "rkv"
-version = "0.10.4"
-authors = ["Richard Newman <rnewman@twinql.com>", "Nan Jiang <najiang@mozilla.com>", "Myk Melez <myk@mykzilla.org>", "Victor Porof <vporof@mozilla.com>"]
-exclude = ["/tests/envs/*"]
-description = "a simple, humane, typed Rust interface to LMDB"
-homepage = "https://github.com/mozilla/rkv"
-documentation = "https://docs.rs/rkv"
-readme = "README.md"
-keywords = ["lmdb", "database", "storage"]
-categories = ["database"]
-license = "Apache-2.0"
-repository = "https://github.com/mozilla/rkv"
-[dependencies.arrayref]
-version = "0.3"
-
-[dependencies.bincode]
-version = "1.0"
-
-[dependencies.bitflags]
-version = "1"
-
-[dependencies.byteorder]
-version = "1"
-
-[dependencies.failure]
-version = "0.1"
-features = ["derive"]
-default_features = false
-
-[dependencies.lazy_static]
-version = "1.0"
-
-[dependencies.lmdb-rkv]
-version = "0.14"
-
-[dependencies.ordered-float]
-version = "1.0"
-
-[dependencies.serde]
-version = "1.0"
-
-[dependencies.serde_derive]
-version = "1.0"
-
-[dependencies.url]
-version = "2.0"
-
-[dependencies.uuid]
-version = "0.8"
-[dev-dependencies.byteorder]
-version = "1"
-
-[dev-dependencies.tempfile]
-version = "3"
-
-[features]
-backtrace = ["failure/backtrace", "failure/std"]
-default = []
-with-asan = ["lmdb-rkv/with-asan"]
-with-fuzzer = ["lmdb-rkv/with-fuzzer"]
-with-fuzzer-no-link = ["lmdb-rkv/with-fuzzer-no-link"]
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/CODE_OF_CONDUCT.md firefox-85.0+build1/third_party/rust/rkv-0.10.4/CODE_OF_CONDUCT.md
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/CODE_OF_CONDUCT.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/CODE_OF_CONDUCT.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-# Community Participation Guidelines
-
-This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
-For more details, please read the
-[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
-
-## How to Report
-For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
-
-<!--
-## Project Specific Etiquette
-
-In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
-Please update for your project.
--->
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/iterator.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/iterator.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/iterator.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/iterator.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/publicdomain/zero/1.0/
-
-//! A demo that showcases the basic usage of iterators in rkv.
-//!
-//! You can test this out by running:
-//!
-//!     cargo run --example iterator
-
-use rkv::{
-    Manager,
-    Rkv,
-    SingleStore,
-    StoreError,
-    StoreOptions,
-    Value,
-};
-use tempfile::Builder;
-
-use std::fs;
-use std::str;
-
-fn main() {
-    let root = Builder::new().prefix("iterator").tempdir().unwrap();
-    fs::create_dir_all(root.path()).unwrap();
-    let p = root.path();
-
-    let created_arc = Manager::singleton().write().unwrap().get_or_create(p, Rkv::new).unwrap();
-    let k = created_arc.read().unwrap();
-    let store = k.open_single("store", StoreOptions::create()).unwrap();
-
-    populate_store(&k, store).unwrap();
-
-    let reader = k.read().unwrap();
-
-    println!("Iterating from the beginning...");
-    // Reader::iter_start() iterates from the first item in the store, and
-    // returns the (key, value) tuples in order.
-    let mut iter = store.iter_start(&reader).unwrap();
-    while let Some(Ok((country, city))) = iter.next() {
-        println!("{}, {:?}", str::from_utf8(country).unwrap(), city);
-    }
-
-    println!();
-    println!("Iterating from the given key...");
-    // Reader::iter_from() iterates from the first key equal to or greater
-    // than the given key.
-    let mut iter = store.iter_from(&reader, "Japan").unwrap();
-    while let Some(Ok((country, city))) = iter.next() {
-        println!("{}, {:?}", str::from_utf8(country).unwrap(), city);
-    }
-
-    println!();
-    println!("Iterating from the given prefix...");
-    let mut iter = store.iter_from(&reader, "Un").unwrap();
-    while let Some(Ok((country, city))) = iter.next() {
-        println!("{}, {:?}", str::from_utf8(country).unwrap(), city);
-    }
-}
-
-fn populate_store(k: &Rkv, store: SingleStore) -> Result<(), StoreError> {
-    let mut writer = k.write()?;
-    for (country, city) in vec![
-        ("Canada", Value::Str("Ottawa")),
-        ("United States of America", Value::Str("Washington")),
-        ("Germany", Value::Str("Berlin")),
-        ("France", Value::Str("Paris")),
-        ("Italy", Value::Str("Rome")),
-        ("United Kingdom", Value::Str("London")),
-        ("Japan", Value::Str("Tokyo")),
-    ] {
-        store.put(&mut writer, country, &city)?;
-    }
-    writer.commit()
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/README.md firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/README.md
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/README.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-## Examples of how to use rkv
-
-All examples can be executed with:
-
-```
-cargo run --example $name
-```
-
-* [`simple-store`](simple-store.rs) - a simple key/value store that showcases the basic usage of rkv.
-
-* [`iterator`](iterator.rs) - a demo that showcases the basic usage of iterators in rkv.
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/simple-store.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/simple-store.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/examples/simple-store.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/examples/simple-store.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-// Any copyright is dedicated to the Public Domain.
-// http://creativecommons.org/publicdomain/zero/1.0/
-
-//! A simple rkv demo that showcases the basic usage (put/get/delete) of rkv.
-//!
-//! You can test this out by running:
-//!
-//!     cargo run --example simple-store
-
-use rkv::{
-    Manager,
-    MultiStore,
-    Rkv,
-    StoreOptions,
-    Value,
-    Writer,
-};
-use tempfile::Builder;
-
-use std::fs;
-
-fn getput<'env, 's>(store: MultiStore, writer: &'env mut Writer, ids: &'s mut Vec<String>) {
-    let keys = vec!["str1", "str2", "str3"];
-    // we convert the writer into a cursor so that we can safely read
-    for k in keys.iter() {
-        // this is a multi-valued database, so get returns an iterator
-        let mut iter = store.get(writer, k).unwrap();
-        while let Some(Ok((_key, val))) = iter.next() {
-            if let Value::Str(s) = val.unwrap() {
-                ids.push(s.to_owned());
-            } else {
-                panic!("didn't get a string back!");
-            }
-        }
-    }
-    for id in ids {
-        store.put(writer, &id, &Value::Blob(b"weeeeeee")).unwrap();
-    }
-}
-
-fn delete(store: MultiStore, writer: &mut Writer) {
-    let keys = vec!["str1", "str2", "str3"];
-    let vals = vec!["string uno", "string quatro", "string siete"];
-    // we convert the writer into a cursor so that we can safely read
-    for i in 0..keys.len() {
-        store.delete(writer, &keys[i], &Value::Str(vals[i])).unwrap();
-    }
-}
-
-fn main() {
-    let root = Builder::new().prefix("simple-db").tempdir().unwrap();
-    fs::create_dir_all(root.path()).unwrap();
-    let p = root.path();
-
-    // The manager enforces that each process opens the same lmdb environment at most once
-    let created_arc = Manager::singleton().write().unwrap().get_or_create(p, Rkv::new).unwrap();
-    let k = created_arc.read().unwrap();
-
-    // Creates a store called "store"
-    let store = k.open_single("store", StoreOptions::create()).unwrap();
-
-    let multistore = k.open_multi("multistore", StoreOptions::create()).unwrap();
-
-    println!("Inserting data...");
-    {
-        // Use a writer to mutate the store
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "int", &Value::I64(1234)).unwrap();
-        store.put(&mut writer, "uint", &Value::U64(1234_u64)).unwrap();
-        store.put(&mut writer, "float", &Value::F64(1234.0.into())).unwrap();
-        store.put(&mut writer, "instant", &Value::Instant(1_528_318_073_700)).unwrap();
-        store.put(&mut writer, "boolean", &Value::Bool(true)).unwrap();
-        store.put(&mut writer, "string", &Value::Str("héllo, yöu")).unwrap();
-        store.put(&mut writer, "json", &Value::Json(r#"{"foo":"bar", "number": 1}"#)).unwrap();
-        store.put(&mut writer, "blob", &Value::Blob(b"blob")).unwrap();
-        writer.commit().unwrap();
-    }
-
-    println!("Testing getput");
-    {
-        let mut ids = Vec::new();
-        let mut writer = k.write().unwrap();
-        multistore.put(&mut writer, "str1", &Value::Str("string uno")).unwrap();
-        multistore.put(&mut writer, "str1", &Value::Str("string dos")).unwrap();
-        multistore.put(&mut writer, "str1", &Value::Str("string tres")).unwrap();
-        multistore.put(&mut writer, "str2", &Value::Str("string quatro")).unwrap();
-        multistore.put(&mut writer, "str2", &Value::Str("string cinco")).unwrap();
-        multistore.put(&mut writer, "str2", &Value::Str("string seis")).unwrap();
-        multistore.put(&mut writer, "str3", &Value::Str("string siete")).unwrap();
-        multistore.put(&mut writer, "str3", &Value::Str("string ocho")).unwrap();
-        multistore.put(&mut writer, "str3", &Value::Str("string nueve")).unwrap();
-        getput(multistore, &mut writer, &mut ids);
-        writer.commit().unwrap();
-        let mut writer = k.write().unwrap();
-        delete(multistore, &mut writer);
-        writer.commit().unwrap();
-    }
-    println!("Looking up keys...");
-    {
-        // Use a reader to query the store
-        let reader = k.read().unwrap();
-        println!("Get int {:?}", store.get(&reader, "int").unwrap());
-        println!("Get uint {:?}", store.get(&reader, "uint").unwrap());
-        println!("Get float {:?}", store.get(&reader, "float").unwrap());
-        println!("Get instant {:?}", store.get(&reader, "instant").unwrap());
-        println!("Get boolean {:?}", store.get(&reader, "boolean").unwrap());
-        println!("Get string {:?}", store.get(&reader, "string").unwrap());
-        println!("Get json {:?}", store.get(&reader, "json").unwrap());
-        println!("Get blob {:?}", store.get(&reader, "blob").unwrap());
-        println!("Get non-existent {:?}", store.get(&reader, "non-existent").unwrap());
-    }
-
-    println!("Looking up keys via Writer.get()...");
-    {
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-        store.put(&mut writer, "bar", &Value::Str("baz")).unwrap();
-        store.delete(&mut writer, "foo").unwrap();
-        println!("It should be None! ({:?})", store.get(&writer, "foo").unwrap());
-        println!("Get bar ({:?})", store.get(&writer, "bar").unwrap());
-        writer.commit().unwrap();
-        let reader = k.read().expect("reader");
-        println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-        println!("Get bar {:?}", store.get(&reader, "bar").unwrap());
-    }
-
-    println!("Aborting transaction...");
-    {
-        // Aborting a write transaction rollbacks the change(s)
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-        writer.abort();
-
-        let reader = k.read().expect("reader");
-        println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-        // Explicitly aborting a transaction is not required unless an early
-        // abort is desired, since both read and write transactions will
-        // implicitly be aborted once they go out of scope.
-    }
-
-    println!("Deleting keys...");
-    {
-        // Deleting a key/value also requires a write transaction
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-        store.delete(&mut writer, "foo").unwrap();
-        println!("It should be None! ({:?})", store.get(&writer, "foo").unwrap());
-        writer.commit().unwrap();
-
-        // Committing a transaction consumes the writer, preventing you
-        // from reusing it by failing and reporting a compile-time error.
-        // This line would report error[E0382]: use of moved value: `writer`.
-        // store.put(&mut writer, "baz", &Value::Str("buz")).unwrap();
-    }
-
-    println!("Clearing store...");
-    {
-        // Clearing a store deletes all the entries in that store
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-        store.put(&mut writer, "bar", &Value::Str("baz")).unwrap();
-        store.clear(&mut writer).unwrap();
-        writer.commit().unwrap();
-
-        let reader = k.read().expect("reader");
-        println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-        println!("It should be None! ({:?})", store.get(&reader, "bar").unwrap());
-    }
-
-    println!("Write and read on multiple stores...");
-    {
-        let another_store = k.open_single("another_store", StoreOptions::create()).unwrap();
-        let mut writer = k.write().unwrap();
-        store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-        another_store.put(&mut writer, "foo", &Value::Str("baz")).unwrap();
-        writer.commit().unwrap();
-
-        let reader = k.read().unwrap();
-        println!("Get from store value: {:?}", store.get(&reader, "foo").unwrap());
-        println!("Get from another store value: {:?}", another_store.get(&reader, "foo").unwrap());
-    }
-    println!("Environment statistics: btree depth = {}", k.stat().unwrap().depth());
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/LICENSE firefox-85.0+build1/third_party/rust/rkv-0.10.4/LICENSE
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/LICENSE	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/README.md firefox-85.0+build1/third_party/rust/rkv-0.10.4/README.md
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/README.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-# rkv
-
-[![Travis CI Build Status](https://travis-ci.org/mozilla/rkv.svg?branch=master)](https://travis-ci.org/mozilla/rkv)
-[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/lk936u5y5bi6qafb/branch/master?svg=true)](https://ci.appveyor.com/project/mykmelez/rkv/branch/master)
-[![Documentation](https://docs.rs/rkv/badge.svg)](https://docs.rs/rkv/)
-[![Crate](https://img.shields.io/crates/v/rkv.svg)](https://crates.io/crates/rkv)
-
-The [rkv Rust crate](https://crates.io/crates/rkv) is a simple, humane, typed key-value storage solution. It supports multiple backend engines with varying guarantees, such as [LMDB](http://www.lmdb.tech/doc/) for performance, or "SafeMode" for reliability.
-
-This master branch only supports the LMDB backend. We're looking into supporting multiple backends, starting with "SafeMode" in the [feature branch](https://github.com/mozilla/rkv/tree/safe-mode).
-
-## ⚠� Warning ⚠�
-
-The LMDB backend is currently unstable and crash-prone. We're attempting to fix these crashes in bugs [1538539](https://bugzilla.mozilla.org/show_bug.cgi?id=1538539), [1538541](https://bugzilla.mozilla.org/show_bug.cgi?id=1538541) and [1550174](https://bugzilla.mozilla.org/show_bug.cgi?id=1550174).
-
-To use rkv in production/release environments at Mozilla, you may do so with the "SafeMode" backend, for example:
-
-```toml
-rkv = { git = "https://github.com/mozilla/rkv", branch="safe-mode", default-features = false }
-```
-
-```rust
-use rkv::{Manager, Rkv};
-use rkv::backend::{SafeMode, SafeModeEnvironment};
-
-let mut manager = Manager::<SafeModeEnvironment>::singleton().write().unwrap();
-let shared_rkv = manager.get_or_create(path, Rkv::new::<SafeMode>).unwrap();
-
-...
-```
-
-Instead of a branch, we suggest using a specific `rev` instead. For example, `4a1cc23906865626fa715fd99d98620169d3fd7b` is the latest stable version for "safe-mode".
-
-The "SafeMode` backend performs well, with two caveats: the entire database is stored in memory, and write transactions are synchronously written to disk on commit.
-
-In the future, it will be advisable to switch to a different backend with better performance guarantees. We're working on either fixing the LMDB crashes, or offering more choices of backend engines (e.g. SQLite).
-
-## Use
-
-Comprehensive information about using rkv is available in its [online documentation](https://docs.rs/rkv/), which can also be generated for local consumption:
-
-```sh
-cargo doc --open
-```
-
-## Build
-
-Build this project as you would build other Rust crates:
-
-```sh
-cargo build
-```
-
-### Features
-
-There are several features that you can opt-in and out of when using rkv:
-
-By default, `db-dup-sort` and `db-int-key` features offer high level database APIs which allow multiple values per key, and optimizations around integer-based keys respectively. Opt out of these default features when specifying the rkv dependency in your Cargo.toml file to disable them; doing so avoids a certain amount of overhead required to support them.
-
-If you specify the `backtrace` feature, backtraces will be enabled in "failure"
-errors. This feature is disabled by default.
-
-To aid fuzzing efforts, `with-asan`, `with-fuzzer`, and `with-fuzzer-no-link` configure the build scripts responsible with compiling the underlying backing engines (e.g. LMDB) to build with these LLMV features enabled. Please refer to the official LLVM/Clang documentation on them for more informatiuon. These features are also disabled by default.
-
-## Test
-
-Test this project as you would test other Rust crates:
-
-```sh
-cargo test
-```
-
-The project includes unit and doc tests embedded in the `src/` files, integration tests in the `tests/` subdirectory, and usage examples in the `examples/` subdirectory. To ensure your changes don't break examples, also run them via the run-all-examples.sh shell script:
-
-```sh
-./run-all-examples.sh
-```
-
-Note: the test fixtures in the `tests/envs/` subdirectory aren't included in the package published to crates.io, so you must clone this repository in order to run the tests that depend on those fixtures or use the `rand` and `dump` executables to recreate them.
-
-## Contribute
-
-Of the various open source archetypes described in [A Framework for Purposeful Open Source](https://medium.com/mozilla-open-innovation/whats-your-open-source-strategy-here-are-10-answers-383221b3f9d3), the rkv project most closely resembles the Specialty Library, and we welcome contributions. Please report problems or ask questions using this repo's GitHub [issue tracker](https://github.com/mozilla/rkv/issues) and submit [pull requests](https://github.com/mozilla/rkv/pulls) for code and documentation changes.
-
-rkv relies on the latest [rustfmt](https://github.com/rust-lang-nursery/rustfmt) for code formatting, so please make sure your pull request passes the rustfmt before submitting it for review. See rustfmt's [quick start](https://github.com/rust-lang-nursery/rustfmt#quick-start) for installation details.
-
-We follow Mozilla's [Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) while contributing to this project.
-
-## License
-
-The rkv source code is licensed under the Apache License, Version 2.0, as described in the [LICENSE](https://github.com/mozilla/rkv/blob/master/LICENSE) file.
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/run-all-examples.sh firefox-85.0+build1/third_party/rust/rkv-0.10.4/run-all-examples.sh
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/run-all-examples.sh	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/run-all-examples.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cargo build --examples
-
-for file in examples/*; do
-    filename=$(basename ${file})
-    extension=${filename##*.}
-    example_name=${filename%.*}
-    if [[ "${extension}" = "rs" ]]; then
-        cargo run --example ${example_name}
-    fi
-done
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/bin/dump.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/bin/dump.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/bin/dump.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/bin/dump.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-extern crate rkv;
-
-use rkv::{
-    error::MigrateError,
-    migrate::Migrator,
-};
-use std::{
-    env::args,
-    io,
-    path::Path,
-};
-
-fn main() -> Result<(), MigrateError> {
-    let mut cli_args = args();
-    let mut db_name = None;
-    let mut env_path = None;
-
-    // The first arg is the name of the program, which we can ignore.
-    cli_args.next();
-
-    while let Some(arg) = cli_args.next() {
-        if &arg[0..1] == "-" {
-            match &arg[1..] {
-                "s" => {
-                    db_name = match cli_args.next() {
-                        None => return Err("-s must be followed by database name".into()),
-                        Some(str) => Some(str),
-                    };
-                },
-                str => return Err(format!("arg -{} not recognized", str).into()),
-            }
-        } else {
-            if env_path.is_some() {
-                return Err("must provide only one path to the LMDB environment".into());
-            }
-            env_path = Some(arg);
-        }
-    }
-
-    let env_path = env_path.ok_or("must provide a path to the LMDB environment")?;
-    let mut migrator: Migrator = Migrator::new(Path::new(&env_path))?;
-    migrator.dump(db_name.as_ref().map(String::as_str), io::stdout()).unwrap();
-
-    Ok(())
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/bin/rand.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/bin/rand.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/bin/rand.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/bin/rand.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-//! A command-line utility to create an LMDB environment containing random data.
-//! It requires one flag, `-s path/to/environment`, which specifies the location
-//! where the tool should create the environment.  Optionally, you may specify
-//! the number of key/value pairs to create via the `-n <number>` flag
-//! (for which the default value is 50).
-
-extern crate rkv;
-
-use rkv::{
-    Rkv,
-    SingleStore,
-    StoreOptions,
-    Value,
-};
-use std::{
-    env::args,
-    fs::{
-        create_dir_all,
-        File,
-    },
-    io::Read,
-    path::Path,
-};
-
-fn main() {
-    let mut args = args();
-    let mut database = None;
-    let mut path = None;
-    let mut num_pairs = 50;
-
-    // The first arg is the name of the program, which we can ignore.
-    args.next();
-
-    while let Some(arg) = args.next() {
-        if &arg[0..1] == "-" {
-            match &arg[1..] {
-                "s" => {
-                    database = match args.next() {
-                        None => panic!("-s must be followed by database arg"),
-                        Some(str) => Some(str),
-                    };
-                },
-                "n" => {
-                    num_pairs = match args.next() {
-                        None => panic!("-s must be followed by number of pairs"),
-                        Some(str) => str.parse().expect("number"),
-                    };
-                },
-                str => panic!("arg -{} not recognized", str),
-            }
-        } else {
-            if path.is_some() {
-                panic!("must provide only one path to the LMDB environment");
-            }
-            path = Some(arg);
-        }
-    }
-
-    if path.is_none() {
-        panic!("must provide a path to the LMDB environment");
-    }
-    let path = path.unwrap();
-
-    create_dir_all(&path).expect("dir created");
-
-    let mut builder = Rkv::environment_builder();
-    builder.set_max_dbs(2);
-    // Allocate enough map to accommodate the largest random collection.
-    // We currently do this by allocating twice the maximum possible size
-    // of the pairs (assuming maximum key and value sizes).
-    builder.set_map_size((511 + 65535) * num_pairs * 2);
-    let rkv = Rkv::from_env(Path::new(&path), builder).expect("Rkv");
-    let store: SingleStore =
-        rkv.open_single(database.as_ref().map(|x| x.as_str()), StoreOptions::create()).expect("opened");
-    let mut writer = rkv.write().expect("writer");
-
-    // Generate random values for the number of keys and key/value lengths.
-    // On Linux, "Just use /dev/urandom!" <https://www.2uo.de/myths-about-urandom/>.
-    // On macOS it doesn't matter (/dev/random and /dev/urandom are identical).
-    let mut random = File::open("/dev/urandom").unwrap();
-    let mut nums = [0u8; 4];
-    random.read_exact(&mut nums).unwrap();
-
-    // Generate 0–255 pairs.
-    for _ in 0..num_pairs {
-        // Generate key and value lengths.  The key must be 1–511 bytes long.
-        // The value length can be 0 and is essentially unbounded; we generate
-        // value lengths of 0–0xffff (65535).
-        // NB: the modulus method for generating a random number within a range
-        // introduces distribution skew, but we don't need it to be perfect.
-        let key_len = ((u16::from(nums[0]) + (u16::from(nums[1]) << 8)) % 511 + 1) as usize;
-        let value_len = (u16::from(nums[2]) + (u16::from(nums[3]) << 8)) as usize;
-
-        let mut key: Vec<u8> = vec![0; key_len];
-        random.read_exact(&mut key[0..key_len]).unwrap();
-
-        let mut value: Vec<u8> = vec![0; value_len];
-        random.read_exact(&mut value[0..value_len]).unwrap();
-
-        store.put(&mut writer, key, &Value::Blob(&value)).expect("wrote");
-    }
-
-    writer.commit().expect("committed");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/env.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/env.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/env.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/env.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1336 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use std::os::raw::c_uint;
-
-use std::path::{
-    Path,
-    PathBuf,
-};
-
-use lmdb;
-
-use lmdb::{
-    Database,
-    DatabaseFlags,
-    Environment,
-    EnvironmentBuilder,
-    Error,
-    Info,
-    Stat,
-};
-
-use crate::error::StoreError;
-use crate::readwrite::{
-    Reader,
-    Writer,
-};
-use crate::store::integer::{
-    IntegerStore,
-    PrimitiveInt,
-};
-
-use crate::store::integermulti::MultiIntegerStore;
-use crate::store::multi::MultiStore;
-use crate::store::single::SingleStore;
-use crate::store::Options as StoreOptions;
-
-pub static DEFAULT_MAX_DBS: c_uint = 5;
-
-/// Wrapper around an `lmdb::Environment`.
-#[derive(Debug)]
-pub struct Rkv {
-    path: PathBuf,
-    env: Environment,
-}
-
-/// Static methods.
-impl Rkv {
-    pub fn environment_builder() -> EnvironmentBuilder {
-        Environment::new()
-    }
-
-    /// Return a new Rkv environment that supports up to `DEFAULT_MAX_DBS` open databases.
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(path: &Path) -> Result<Rkv, StoreError> {
-        Rkv::with_capacity(path, DEFAULT_MAX_DBS)
-    }
-
-    /// Return a new Rkv environment from the provided builder.
-    pub fn from_env(path: &Path, env: EnvironmentBuilder) -> Result<Rkv, StoreError> {
-        if !path.is_dir() {
-            return Err(StoreError::DirectoryDoesNotExistError(path.into()));
-        }
-
-        Ok(Rkv {
-            path: path.into(),
-            env: env.open(path).map_err(|e| match e {
-                lmdb::Error::Other(2) => StoreError::DirectoryDoesNotExistError(path.into()),
-                e => StoreError::LmdbError(e),
-            })?,
-        })
-    }
-
-    /// Return a new Rkv environment that supports the specified number of open databases.
-    pub fn with_capacity(path: &Path, max_dbs: c_uint) -> Result<Rkv, StoreError> {
-        if !path.is_dir() {
-            return Err(StoreError::DirectoryDoesNotExistError(path.into()));
-        }
-
-        let mut builder = Rkv::environment_builder();
-        builder.set_max_dbs(max_dbs);
-
-        // Future: set flags, maximum size, etc. here if necessary.
-        Rkv::from_env(path, builder)
-    }
-}
-
-/// Store creation methods.
-impl Rkv {
-    /// Create or Open an existing database in (&[u8] -> Single Value) mode.
-    /// Note: that create=true cannot be called concurrently with other operations
-    /// so if you are sure that the database exists, call this with create=false.
-    pub fn open_single<'s, T>(&self, name: T, opts: StoreOptions) -> Result<SingleStore, StoreError>
-    where
-        T: Into<Option<&'s str>>,
-    {
-        self.open(name, opts).map(SingleStore::new)
-    }
-
-    /// Create or Open an existing database in (Integer -> Single Value) mode.
-    /// Note: that create=true cannot be called concurrently with other operations
-    /// so if you are sure that the database exists, call this with create=false.
-    pub fn open_integer<'s, T, K: PrimitiveInt>(
-        &self,
-        name: T,
-        mut opts: StoreOptions,
-    ) -> Result<IntegerStore<K>, StoreError>
-    where
-        T: Into<Option<&'s str>>,
-    {
-        opts.flags.set(DatabaseFlags::INTEGER_KEY, true);
-        self.open(name, opts).map(IntegerStore::new)
-    }
-
-    /// Create or Open an existing database in (&[u8] -> Multiple Values) mode.
-    /// Note: that create=true cannot be called concurrently with other operations
-    /// so if you are sure that the database exists, call this with create=false.
-    pub fn open_multi<'s, T>(&self, name: T, mut opts: StoreOptions) -> Result<MultiStore, StoreError>
-    where
-        T: Into<Option<&'s str>>,
-    {
-        opts.flags.set(DatabaseFlags::DUP_SORT, true);
-        self.open(name, opts).map(MultiStore::new)
-    }
-
-    /// Create or Open an existing database in (Integer -> Multiple Values) mode.
-    /// Note: that create=true cannot be called concurrently with other operations
-    /// so if you are sure that the database exists, call this with create=false.
-    pub fn open_multi_integer<'s, T, K: PrimitiveInt>(
-        &self,
-        name: T,
-        mut opts: StoreOptions,
-    ) -> Result<MultiIntegerStore<K>, StoreError>
-    where
-        T: Into<Option<&'s str>>,
-    {
-        opts.flags.set(DatabaseFlags::INTEGER_KEY, true);
-        opts.flags.set(DatabaseFlags::DUP_SORT, true);
-        self.open(name, opts).map(MultiIntegerStore::new)
-    }
-
-    fn open<'s, T>(&self, name: T, opts: StoreOptions) -> Result<Database, StoreError>
-    where
-        T: Into<Option<&'s str>>,
-    {
-        if opts.create {
-            self.env.create_db(name.into(), opts.flags).map_err(|e| match e {
-                lmdb::Error::BadRslot => StoreError::open_during_transaction(),
-                _ => e.into(),
-            })
-        } else {
-            self.env.open_db(name.into()).map_err(|e| match e {
-                lmdb::Error::BadRslot => StoreError::open_during_transaction(),
-                _ => e.into(),
-            })
-        }
-    }
-}
-
-/// Read and write accessors.
-impl Rkv {
-    /// Create a read transaction.  There can be multiple concurrent readers
-    /// for an environment, up to the maximum specified by LMDB (default 126),
-    /// and you can open readers while a write transaction is active.
-    pub fn read(&self) -> Result<Reader, StoreError> {
-        Ok(Reader::new(self.env.begin_ro_txn().map_err(StoreError::from)?))
-    }
-
-    /// Create a write transaction.  There can be only one write transaction
-    /// active at any given time, so trying to create a second one will block
-    /// until the first is committed or aborted.
-    pub fn write(&self) -> Result<Writer, StoreError> {
-        Ok(Writer::new(self.env.begin_rw_txn().map_err(StoreError::from)?))
-    }
-}
-
-/// Other environment methods.
-impl Rkv {
-    /// Flush the data buffers to disk. This call is only useful, when the environment
-    /// was open with either `NO_SYNC`, `NO_META_SYNC` or `MAP_ASYNC` (see below).
-    /// The call is not valid if the environment was opened with `READ_ONLY`.
-    ///
-    /// Data is always written to disk when `transaction.commit()` is called,
-    /// but the operating system may keep it buffered.
-    /// LMDB always flushes the OS buffers upon commit as well,
-    /// unless the environment was opened with `NO_SYNC` or in part `NO_META_SYNC`.
-    ///
-    /// `force`: if true, force a synchronous flush.
-    /// Otherwise if the environment has the `NO_SYNC` flag set the flushes will be omitted,
-    /// and with `MAP_ASYNC` they will be asynchronous.
-    pub fn sync(&self, force: bool) -> Result<(), StoreError> {
-        self.env.sync(force).map_err(Into::into)
-    }
-
-    /// Retrieve statistics about this environment.
-    ///
-    /// It includes:
-    ///   * Page size in bytes
-    ///   * B-tree depth
-    ///   * Number of internal (non-leaf) pages
-    ///   * Number of leaf pages
-    ///   * Number of overflow pages
-    ///   * Number of data entries
-    pub fn stat(&self) -> Result<Stat, StoreError> {
-        self.env.stat().map_err(Into::into)
-    }
-
-    /// Retrieve information about this environment.
-    ///
-    /// It includes:
-    ///   * Map size in bytes
-    ///   * The last used page number
-    ///   * The last transaction ID
-    ///   * Max number of readers allowed
-    ///   * Number of readers in use
-    pub fn info(&self) -> Result<Info, StoreError> {
-        self.env.info().map_err(Into::into)
-    }
-
-    /// Retrieve the load ratio (# of used pages / total pages) about this environment.
-    ///
-    /// With the formular: (last_page_no - freelist_pages) / total_pages
-    pub fn load_ratio(&self) -> Result<f32, StoreError> {
-        let stat = self.stat()?;
-        let info = self.info()?;
-        let freelist = self.env.freelist()?;
-
-        let last_pgno = info.last_pgno() + 1; // pgno is 0 based.
-        let total_pgs = info.map_size() / stat.page_size() as usize;
-        if freelist > last_pgno {
-            return Err(StoreError::LmdbError(Error::Corrupted));
-        }
-        let used_pgs = last_pgno - freelist;
-        Ok(used_pgs as f32 / total_pgs as f32)
-    }
-
-    /// Sets the size of the memory map to use for the environment.
-    ///
-    /// This can be used to resize the map when the environment is already open.
-    /// You can also use `Rkv::environment_builder()` to set the map size during
-    /// the `Rkv` initialization.
-    ///
-    /// Note:
-    ///
-    /// * No active transactions allowed when performing resizing in this process.
-    ///   It's up to the consumer to enforce that.
-    ///
-    /// * The size should be a multiple of the OS page size. Any attempt to set
-    ///   a size smaller than the space already consumed by the environment will
-    ///   be silently changed to the current size of the used space.
-    ///
-    /// * In the multi-process case, once a process resizes the map, other
-    ///   processes need to either re-open the environment, or call set_map_size
-    ///   with size 0 to update the environment. Otherwise, new transaction creation
-    ///   will fail with `LmdbError::MapResized`.
-    pub fn set_map_size(&self, size: usize) -> Result<(), StoreError> {
-        self.env.set_map_size(size).map_err(Into::into)
-    }
-}
-
-// TODO: change this back to `clippy::cognitive_complexity` when Clippy stable
-// deprecates `clippy::cyclomatic_complexity`.
-#[allow(clippy::complexity)]
-#[cfg(test)]
-mod tests {
-    use byteorder::{
-        ByteOrder,
-        LittleEndian,
-    };
-    use std::{
-        fs,
-        str,
-        sync::{
-            Arc,
-            RwLock,
-        },
-        thread,
-    };
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::*;
-
-    // The default size is 1MB.
-    const DEFAULT_SIZE: usize = 1024 * 1024;
-
-    /// We can't open a directory that doesn't exist.
-    #[test]
-    fn test_open_fails() {
-        let root = Builder::new().prefix("test_open_fails").tempdir().expect("tempdir");
-        assert!(root.path().exists());
-
-        let nope = root.path().join("nope/");
-        assert!(!nope.exists());
-
-        let pb = nope.to_path_buf();
-        match Rkv::new(nope.as_path()).err() {
-            Some(StoreError::DirectoryDoesNotExistError(p)) => {
-                assert_eq!(pb, p);
-            },
-            _ => panic!("expected error"),
-        };
-    }
-
-    fn check_rkv(k: &Rkv) {
-        let _ = k.open_single("default", StoreOptions::create()).expect("created default");
-
-        let yyy = k.open_single("yyy", StoreOptions::create()).expect("opened");
-        let reader = k.read().expect("reader");
-
-        let result = yyy.get(&reader, "foo");
-        assert_eq!(None, result.expect("success but no value"));
-    }
-
-    #[test]
-    fn test_open() {
-        let root = Builder::new().prefix("test_open").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        check_rkv(&k);
-    }
-
-    #[test]
-    fn test_open_from_env() {
-        let root = Builder::new().prefix("test_open_from_env").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let mut builder = Rkv::environment_builder();
-        builder.set_max_dbs(2);
-        let k = Rkv::from_env(root.path(), builder).expect("rkv");
-
-        check_rkv(&k);
-    }
-
-    #[test]
-    #[should_panic(expected = "opened: LmdbError(DbsFull)")]
-    fn test_open_with_capacity() {
-        let root = Builder::new().prefix("test_open_with_capacity").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let k = Rkv::with_capacity(root.path(), 1).expect("rkv");
-
-        check_rkv(&k);
-
-        // This panics with "opened: LmdbError(DbsFull)" because we specified
-        // a capacity of one (database), and check_rkv already opened one
-        // (plus the default database, which doesn't count against the limit).
-        // This should really return an error rather than panicking, per
-        // <https://github.com/mozilla/lmdb-rs/issues/6>.
-        let _zzz = k.open_single("zzz", StoreOptions::create()).expect("opened");
-    }
-
-    fn get_larger_than_default_map_size_value() -> usize {
-        // The LMDB C library and lmdb Rust crate docs for setting the map size
-        // <http://www.lmdb.tech/doc/group__mdb.html#gaa2506ec8dab3d969b0e609cd82e619e5>
-        // <https://docs.rs/lmdb/0.8.0/lmdb/struct.EnvironmentBuilder.html#method.set_map_size>
-        // both say that the default map size is 10,485,760 bytes, i.e. 10MiB.
-        //
-        // But the DEFAULT_MAPSIZE define in the LMDB code
-        // https://github.com/LMDB/lmdb/blob/26c7df88e44e31623d0802a564f24781acdefde3/libraries/liblmdb/mdb.c#L729
-        // sets the default map size to 1,048,576 bytes, i.e. 1MiB.
-        //
-        DEFAULT_SIZE + 1 /* 1,048,576 + 1 bytes, i.e. 1MiB + 1 byte */
-    }
-
-    #[test]
-    #[should_panic(expected = "wrote: LmdbError(MapFull)")]
-    fn test_exceed_map_size() {
-        let root = Builder::new().prefix("test_exceed_map_size").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("test", StoreOptions::create()).expect("opened");
-
-        // Writing a large enough value should cause LMDB to fail on MapFull.
-        // We write a string that is larger than the default map size.
-        let val = "x".repeat(get_larger_than_default_map_size_value());
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::Str(&val)).expect("wrote");
-    }
-
-    #[test]
-    #[should_panic(expected = "wrote: LmdbError(BadValSize)")]
-    fn test_exceed_key_size_limit() {
-        let root = Builder::new().prefix("test_exceed_key_size_limit").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("test", StoreOptions::create()).expect("opened");
-
-        let key = "k".repeat(512);
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, key, &Value::Str("val")).expect("wrote");
-    }
-
-    #[test]
-    fn test_increase_map_size() {
-        let root = Builder::new().prefix("test_open_with_map_size").tempdir().expect("tempdir");
-        println!("Root path: {:?}", root.path());
-        fs::create_dir_all(root.path()).expect("dir created");
-        assert!(root.path().is_dir());
-
-        let mut builder = Rkv::environment_builder();
-        // Set the map size to the size of the value we'll store in it + 100KiB,
-        // which ensures that there's enough space for the value and metadata.
-        builder.set_map_size(get_larger_than_default_map_size_value() + 100 * 1024 /* 100KiB */);
-        builder.set_max_dbs(2);
-        let k = Rkv::from_env(root.path(), builder).unwrap();
-        let sk: SingleStore = k.open_single("test", StoreOptions::create()).expect("opened");
-        let val = "x".repeat(get_larger_than_default_map_size_value());
-
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::Str(&val)).expect("wrote");
-        writer.commit().expect("committed");
-
-        let reader = k.read().unwrap();
-        assert_eq!(sk.get(&reader, "foo").expect("read"), Some(Value::Str(&val)));
-    }
-
-    #[test]
-    fn test_round_trip_and_transactions() {
-        let root = Builder::new().prefix("test_round_trip_and_transactions").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-            sk.put(&mut writer, "noo", &Value::F64(1234.0.into())).expect("wrote");
-            sk.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-            sk.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-            assert_eq!(sk.get(&writer, "foo").expect("read"), Some(Value::I64(1234)));
-            assert_eq!(sk.get(&writer, "noo").expect("read"), Some(Value::F64(1234.0.into())));
-            assert_eq!(sk.get(&writer, "bar").expect("read"), Some(Value::Bool(true)));
-            assert_eq!(sk.get(&writer, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
-
-            // Isolation. Reads won't return values.
-            let r = &k.read().unwrap();
-            assert_eq!(sk.get(r, "foo").expect("read"), None);
-            assert_eq!(sk.get(r, "bar").expect("read"), None);
-            assert_eq!(sk.get(r, "baz").expect("read"), None);
-        }
-
-        // Dropped: tx rollback. Reads will still return nothing.
-
-        {
-            let r = &k.read().unwrap();
-            assert_eq!(sk.get(r, "foo").expect("read"), None);
-            assert_eq!(sk.get(r, "bar").expect("read"), None);
-            assert_eq!(sk.get(r, "baz").expect("read"), None);
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-            sk.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-            sk.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-            assert_eq!(sk.get(&writer, "foo").expect("read"), Some(Value::I64(1234)));
-            assert_eq!(sk.get(&writer, "bar").expect("read"), Some(Value::Bool(true)));
-            assert_eq!(sk.get(&writer, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
-
-            writer.commit().expect("committed");
-        }
-
-        // Committed. Reads will succeed.
-        {
-            let r = k.read().unwrap();
-            assert_eq!(sk.get(&r, "foo").expect("read"), Some(Value::I64(1234)));
-            assert_eq!(sk.get(&r, "bar").expect("read"), Some(Value::Bool(true)));
-            assert_eq!(sk.get(&r, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.delete(&mut writer, "foo").expect("deleted");
-            sk.delete(&mut writer, "bar").expect("deleted");
-            sk.delete(&mut writer, "baz").expect("deleted");
-            assert_eq!(sk.get(&writer, "foo").expect("read"), None);
-            assert_eq!(sk.get(&writer, "bar").expect("read"), None);
-            assert_eq!(sk.get(&writer, "baz").expect("read"), None);
-
-            // Isolation. Reads still return values.
-            let r = k.read().unwrap();
-            assert_eq!(sk.get(&r, "foo").expect("read"), Some(Value::I64(1234)));
-            assert_eq!(sk.get(&r, "bar").expect("read"), Some(Value::Bool(true)));
-            assert_eq!(sk.get(&r, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
-        }
-
-        // Dropped: tx rollback. Reads will still return values.
-
-        {
-            let r = k.read().unwrap();
-            assert_eq!(sk.get(&r, "foo").expect("read"), Some(Value::I64(1234)));
-            assert_eq!(sk.get(&r, "bar").expect("read"), Some(Value::Bool(true)));
-            assert_eq!(sk.get(&r, "baz").expect("read"), Some(Value::Str("héllo, yöu")));
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.delete(&mut writer, "foo").expect("deleted");
-            sk.delete(&mut writer, "bar").expect("deleted");
-            sk.delete(&mut writer, "baz").expect("deleted");
-            assert_eq!(sk.get(&writer, "foo").expect("read"), None);
-            assert_eq!(sk.get(&writer, "bar").expect("read"), None);
-            assert_eq!(sk.get(&writer, "baz").expect("read"), None);
-
-            writer.commit().expect("committed");
-        }
-
-        // Committed. Reads will succeed but return None to indicate a missing value.
-        {
-            let r = k.read().unwrap();
-            assert_eq!(sk.get(&r, "foo").expect("read"), None);
-            assert_eq!(sk.get(&r, "bar").expect("read"), None);
-            assert_eq!(sk.get(&r, "baz").expect("read"), None);
-        }
-    }
-
-    #[test]
-    fn test_single_store_clear() {
-        let root = Builder::new().prefix("test_single_store_clear").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-            sk.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-            sk.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            sk.clear(&mut writer).expect("cleared");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let r = k.read().unwrap();
-            let iter = sk.iter_start(&r).expect("iter");
-            assert_eq!(iter.count(), 0);
-        }
-    }
-
-    #[test]
-    fn test_multi_put_get_del() {
-        let root = Builder::new().prefix("test_multi_put_get_del").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let multistore = k.open_multi("multistore", StoreOptions::create()).unwrap();
-        let mut writer = k.write().unwrap();
-        multistore.put(&mut writer, "str1", &Value::Str("str1 foo")).unwrap();
-        multistore.put(&mut writer, "str1", &Value::Str("str1 bar")).unwrap();
-        multistore.put(&mut writer, "str2", &Value::Str("str2 foo")).unwrap();
-        multistore.put(&mut writer, "str2", &Value::Str("str2 bar")).unwrap();
-        multistore.put(&mut writer, "str3", &Value::Str("str3 foo")).unwrap();
-        multistore.put(&mut writer, "str3", &Value::Str("str3 bar")).unwrap();
-        writer.commit().unwrap();
-        let writer = k.write().unwrap();
-        {
-            let mut iter = multistore.get(&writer, "str1").unwrap();
-            let (id, val) = iter.next().unwrap().unwrap();
-            assert_eq!((id, val), (&b"str1"[..], Some(Value::Str("str1 bar"))));
-            let (id, val) = iter.next().unwrap().unwrap();
-            assert_eq!((id, val), (&b"str1"[..], Some(Value::Str("str1 foo"))));
-        }
-        writer.commit().unwrap();
-        let mut writer = k.write().unwrap();
-
-        multistore.delete(&mut writer, "str1", &Value::Str("str1 foo")).unwrap();
-        assert_eq!(multistore.get_first(&writer, "str1").unwrap(), Some(Value::Str("str1 bar")));
-
-        multistore.delete(&mut writer, "str2", &Value::Str("str2 bar")).unwrap();
-        assert_eq!(multistore.get_first(&writer, "str2").unwrap(), Some(Value::Str("str2 foo")));
-
-        multistore.delete_all(&mut writer, "str3").unwrap();
-        assert_eq!(multistore.get_first(&writer, "str3").unwrap(), None);
-        writer.commit().unwrap();
-    }
-
-    #[test]
-    fn test_multiple_store_clear() {
-        let root = Builder::new().prefix("test_multiple_store_clear").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        let multistore = k.open_multi("multistore", StoreOptions::create()).expect("opened");
-
-        {
-            let mut writer = k.write().expect("writer");
-            multistore.put(&mut writer, "str1", &Value::Str("str1 foo")).unwrap();
-            multistore.put(&mut writer, "str1", &Value::Str("str1 bar")).unwrap();
-            multistore.put(&mut writer, "str2", &Value::Str("str2 foo")).unwrap();
-            multistore.put(&mut writer, "str2", &Value::Str("str2 bar")).unwrap();
-            multistore.put(&mut writer, "str3", &Value::Str("str3 foo")).unwrap();
-            multistore.put(&mut writer, "str3", &Value::Str("str3 bar")).unwrap();
-            writer.commit().expect("committed");
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            multistore.clear(&mut writer).expect("cleared");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let r = k.read().unwrap();
-            assert_eq!(multistore.get_first(&r, "str1").expect("read"), None);
-            assert_eq!(multistore.get_first(&r, "str2").expect("read"), None);
-            assert_eq!(multistore.get_first(&r, "str3").expect("read"), None);
-        }
-    }
-
-    #[test]
-    fn test_open_store_for_read() {
-        let root = Builder::new().prefix("test_open_store_for_read").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        // First create the store, and start a write transaction on it.
-        let sk = k.open_single("sk", StoreOptions::create()).expect("opened");
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::Str("bar")).expect("write");
-
-        // Open the same store for read, note that the write transaction is still in progress,
-        // it should not block the reader though.
-        let sk_readonly = k.open_single("sk", StoreOptions::default()).expect("opened");
-        writer.commit().expect("commit");
-        // Now the write transaction is committed, any followed reads should see its change.
-        let reader = k.read().expect("reader");
-        assert_eq!(sk_readonly.get(&reader, "foo").expect("read"), Some(Value::Str("bar")));
-    }
-
-    #[test]
-    #[should_panic(expected = "open a missing store")]
-    fn test_open_a_missing_store() {
-        let root = Builder::new().prefix("test_open_a_missing_store").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let _sk = k.open("sk", StoreOptions::default()).expect("open a missing store");
-    }
-
-    #[test]
-    fn test_open_fail_with_badrslot() {
-        let root = Builder::new().prefix("test_open_fail_with_badrslot").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        // First create the store
-        let _sk = k.open_single("sk", StoreOptions::create()).expect("opened");
-        // Open a reader on this store
-        let _reader = k.read().expect("reader");
-        // Open the same store for read while the reader is in progress will panic
-        let store: Result<SingleStore, StoreError> = k.open_single("sk", StoreOptions::default());
-        match store {
-            Err(StoreError::OpenAttemptedDuringTransaction(_thread_id)) => (),
-            _ => panic!("should panic"),
-        }
-    }
-
-    #[test]
-    fn test_read_before_write_num() {
-        let root = Builder::new().prefix("test_read_before_write_num").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        // Test reading a number, modifying it, and then writing it back.
-        // We have to be done with the Value::I64 before calling Writer::put,
-        // as the Value::I64 borrows an immutable reference to the Writer.
-        // So we extract and copy its primitive value.
-
-        fn get_existing_foo(writer: &Writer, store: SingleStore) -> Option<i64> {
-            match store.get(writer, "foo").expect("read") {
-                Some(Value::I64(val)) => Some(val),
-                _ => None,
-            }
-        }
-
-        let mut writer = k.write().expect("writer");
-        let mut existing = get_existing_foo(&writer, sk).unwrap_or(99);
-        existing += 1;
-        sk.put(&mut writer, "foo", &Value::I64(existing)).expect("success");
-
-        let updated = get_existing_foo(&writer, sk).unwrap_or(99);
-        assert_eq!(updated, 100);
-        writer.commit().expect("commit");
-    }
-
-    #[test]
-    fn test_read_before_write_str() {
-        let root = Builder::new().prefix("test_read_before_write_str").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        // Test reading a string, modifying it, and then writing it back.
-        // We have to be done with the Value::Str before calling Writer::put,
-        // as the Value::Str (and its underlying &str) borrows an immutable
-        // reference to the Writer.  So we copy it to a String.
-
-        let mut writer = k.write().expect("writer");
-        let mut existing = match sk.get(&writer, "foo").expect("read") {
-            Some(Value::Str(val)) => val,
-            _ => "",
-        }
-        .to_string();
-        existing.push('…');
-        sk.put(&mut writer, "foo", &Value::Str(&existing)).expect("write");
-        writer.commit().expect("commit");
-    }
-
-    #[test]
-    fn test_concurrent_read_transactions_prohibited() {
-        let root = Builder::new().prefix("test_concurrent_reads_prohibited").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        let _first = k.read().expect("reader");
-        let second = k.read();
-
-        match second {
-            Err(StoreError::ReadTransactionAlreadyExists(t)) => {
-                println!("Thread was {:?}", t);
-            },
-            _ => {
-                panic!("Expected error.");
-            },
-        }
-    }
-
-    #[test]
-    fn test_isolation() {
-        let root = Builder::new().prefix("test_isolation").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s: SingleStore = k.open_single("s", StoreOptions::create()).expect("opened");
-
-        // Add one field.
-        {
-            let mut writer = k.write().expect("writer");
-            s.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let reader = k.read().unwrap();
-            assert_eq!(s.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
-        }
-
-        // Establish a long-lived reader that outlasts a writer.
-        let reader = k.read().expect("reader");
-        assert_eq!(s.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
-
-        // Start a write transaction.
-        let mut writer = k.write().expect("writer");
-        s.put(&mut writer, "foo", &Value::I64(999)).expect("wrote");
-
-        // The reader and writer are isolated.
-        assert_eq!(s.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
-        assert_eq!(s.get(&writer, "foo").expect("read"), Some(Value::I64(999)));
-
-        // If we commit the writer, we still have isolation.
-        writer.commit().expect("committed");
-        assert_eq!(s.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
-
-        // A new reader sees the committed value. Note that LMDB doesn't allow two
-        // read transactions to exist in the same thread, so we abort the previous one.
-        reader.abort();
-        let reader = k.read().expect("reader");
-        assert_eq!(s.get(&reader, "foo").expect("read"), Some(Value::I64(999)));
-    }
-
-    #[test]
-    fn test_blob() {
-        let root = Builder::new().prefix("test_round_trip_blob").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-        let mut writer = k.write().expect("writer");
-
-        assert_eq!(sk.get(&writer, "foo").expect("read"), None);
-        sk.put(&mut writer, "foo", &Value::Blob(&[1, 2, 3, 4])).expect("wrote");
-        assert_eq!(sk.get(&writer, "foo").expect("read"), Some(Value::Blob(&[1, 2, 3, 4])));
-
-        fn u16_to_u8(src: &[u16]) -> Vec<u8> {
-            let mut dst = vec![0; 2 * src.len()];
-            LittleEndian::write_u16_into(src, &mut dst);
-            dst
-        }
-
-        fn u8_to_u16(src: &[u8]) -> Vec<u16> {
-            let mut dst = vec![0; src.len() / 2];
-            LittleEndian::read_u16_into(src, &mut dst);
-            dst
-        }
-
-        // When storing UTF-16 strings as blobs, we'll need to convert
-        // their [u16] backing storage to [u8].  Test that converting, writing,
-        // reading, and converting back works as expected.
-        let u16_array = [1000, 10000, 54321, 65535];
-        assert_eq!(sk.get(&writer, "bar").expect("read"), None);
-        sk.put(&mut writer, "bar", &Value::Blob(&u16_to_u8(&u16_array))).expect("wrote");
-        let u8_array = match sk.get(&writer, "bar").expect("read") {
-            Some(Value::Blob(val)) => val,
-            _ => &[],
-        };
-        assert_eq!(u8_to_u16(u8_array), u16_array);
-    }
-
-    #[test]
-    fn test_sync() {
-        let root = Builder::new().prefix("test_sync").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let mut builder = Rkv::environment_builder();
-        builder.set_max_dbs(1);
-        builder.set_flags(EnvironmentFlags::NO_SYNC);
-        {
-            let k = Rkv::from_env(root.path(), builder).expect("new succeeded");
-            let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-            {
-                let mut writer = k.write().expect("writer");
-                sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-                writer.commit().expect("committed");
-                k.sync(true).expect("synced");
-            }
-        }
-        let k = Rkv::from_env(root.path(), builder).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::default()).expect("opened");
-        let reader = k.read().expect("reader");
-        assert_eq!(sk.get(&reader, "foo").expect("read"), Some(Value::I64(1234)));
-    }
-
-    #[test]
-    fn test_stat() {
-        let root = Builder::new().prefix("test_stat").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        for i in 0..5 {
-            let sk: IntegerStore<u32> =
-                k.open_integer(&format!("sk{}", i)[..], StoreOptions::create()).expect("opened");
-            {
-                let mut writer = k.write().expect("writer");
-                sk.put(&mut writer, i, &Value::I64(i64::from(i))).expect("wrote");
-                writer.commit().expect("committed");
-            }
-        }
-        assert_eq!(k.stat().expect("stat").depth(), 1);
-        assert_eq!(k.stat().expect("stat").entries(), 5);
-        assert_eq!(k.stat().expect("stat").branch_pages(), 0);
-        assert_eq!(k.stat().expect("stat").leaf_pages(), 1);
-    }
-
-    #[test]
-    fn test_info() {
-        let root = Builder::new().prefix("test_info").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-        let mut writer = k.write().expect("writer");
-
-        sk.put(&mut writer, "foo", &Value::Str("bar")).expect("wrote");
-        writer.commit().expect("commited");
-
-        let info = k.info().expect("info");
-
-        // The default size is 1MB.
-        assert_eq!(info.map_size(), DEFAULT_SIZE);
-        // Should greater than 0 after the write txn.
-        assert!(info.last_pgno() > 0);
-        // A txn to open_single + a txn to write.
-        assert_eq!(info.last_txnid(), 2);
-        // The default max readers is 126.
-        assert_eq!(info.max_readers(), 126);
-        assert_eq!(info.num_readers(), 0);
-
-        // A new reader should increment the reader counter.
-        let _reader = k.read().expect("reader");
-        let info = k.info().expect("info");
-
-        assert_eq!(info.num_readers(), 1);
-    }
-
-    #[test]
-    fn test_load_ratio() {
-        let root = Builder::new().prefix("test_load_ratio").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::Str("bar")).expect("wrote");
-        writer.commit().expect("commited");
-
-        let ratio = k.load_ratio().expect("ratio");
-        assert!(ratio > 0.0_f32 && ratio < 1.0_f32);
-
-        // Put data to database should increase the load ratio.
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "bar", &Value::Str(&"more-than-4KB".repeat(1000))).expect("wrote");
-        writer.commit().expect("commited");
-        let new_ratio = k.load_ratio().expect("ratio");
-        assert!(new_ratio > ratio);
-
-        // Clear the database so that all the used pages should go to freelist, hence the ratio
-        // should decrease.
-        let mut writer = k.write().expect("writer");
-        sk.clear(&mut writer).expect("clear");
-        writer.commit().expect("commited");
-        let after_clear_ratio = k.load_ratio().expect("ratio");
-        assert!(after_clear_ratio < new_ratio);
-    }
-
-    #[test]
-    fn test_set_map_size() {
-        let root = Builder::new().prefix("test_size_map_size").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        assert_eq!(k.info().expect("info").map_size(), DEFAULT_SIZE);
-
-        k.set_map_size(2 * DEFAULT_SIZE).expect("resized");
-
-        // Should be able to write.
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::Str("bar")).expect("wrote");
-        writer.commit().expect("commited");
-
-        assert_eq!(k.info().expect("info").map_size(), 2 * DEFAULT_SIZE);
-    }
-
-    #[test]
-    fn test_iter() {
-        let root = Builder::new().prefix("test_iter").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        // An iterator over an empty store returns no values.
-        {
-            let reader = k.read().unwrap();
-            let mut iter = sk.iter_start(&reader).unwrap();
-            assert!(iter.next().is_none());
-        }
-
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-        sk.put(&mut writer, "noo", &Value::F64(1234.0.into())).expect("wrote");
-        sk.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-        sk.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-        sk.put(&mut writer, "héllò, töűrîst", &Value::Str("Emil.RuleZ!")).expect("wrote");
-        sk.put(&mut writer, "你好，�客", &Value::Str("米克�則")).expect("wrote");
-        writer.commit().expect("committed");
-
-        let reader = k.read().unwrap();
-
-        // Reader.iter() returns (key, value) tuples ordered by key.
-        let mut iter = sk.iter_start(&reader).unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "bar");
-        assert_eq!(val, Some(Value::Bool(true)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "baz");
-        assert_eq!(val, Some(Value::Str("héllo, yöu")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "foo");
-        assert_eq!(val, Some(Value::I64(1234)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "héllò, töűrîst");
-        assert_eq!(val, Some(Value::Str("Emil.RuleZ!")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterators don't loop.  Once one returns None, additional calls
-        // to its next() method will always return None.
-        assert!(iter.next().is_none());
-
-        // Reader.iter_from() begins iteration at the first key equal to
-        // or greater than the given key.
-        let mut iter = sk.iter_from(&reader, "moo").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Reader.iter_from() works as expected when the given key is a prefix
-        // of a key in the store.
-        let mut iter = sk.iter_from(&reader, "no").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-    }
-
-    #[test]
-    fn test_iter_from_key_greater_than_existing() {
-        let root = Builder::new().prefix("test_iter_from_key_greater_than_existing").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let sk: SingleStore = k.open_single("sk", StoreOptions::create()).expect("opened");
-
-        let mut writer = k.write().expect("writer");
-        sk.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-        sk.put(&mut writer, "noo", &Value::F64(1234.0.into())).expect("wrote");
-        sk.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-        sk.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-        writer.commit().expect("committed");
-
-        let reader = k.read().unwrap();
-        let mut iter = sk.iter_from(&reader, "nuu").unwrap();
-        assert!(iter.next().is_none());
-    }
-
-    #[test]
-    fn test_multiple_store_read_write() {
-        let root = Builder::new().prefix("test_multiple_store_read_write").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-
-        let s1: SingleStore = k.open_single("store_1", StoreOptions::create()).expect("opened");
-        let s2: SingleStore = k.open_single("store_2", StoreOptions::create()).expect("opened");
-        let s3: SingleStore = k.open_single("store_3", StoreOptions::create()).expect("opened");
-
-        let mut writer = k.write().expect("writer");
-        s1.put(&mut writer, "foo", &Value::Str("bar")).expect("wrote");
-        s2.put(&mut writer, "foo", &Value::I64(123)).expect("wrote");
-        s3.put(&mut writer, "foo", &Value::Bool(true)).expect("wrote");
-
-        assert_eq!(s1.get(&writer, "foo").expect("read"), Some(Value::Str("bar")));
-        assert_eq!(s2.get(&writer, "foo").expect("read"), Some(Value::I64(123)));
-        assert_eq!(s3.get(&writer, "foo").expect("read"), Some(Value::Bool(true)));
-
-        writer.commit().expect("committed");
-
-        let reader = k.read().expect("unbound_reader");
-        assert_eq!(s1.get(&reader, "foo").expect("read"), Some(Value::Str("bar")));
-        assert_eq!(s2.get(&reader, "foo").expect("read"), Some(Value::I64(123)));
-        assert_eq!(s3.get(&reader, "foo").expect("read"), Some(Value::Bool(true)));
-        reader.abort();
-
-        // test delete across multiple stores
-        let mut writer = k.write().expect("writer");
-        s1.delete(&mut writer, "foo").expect("deleted");
-        s2.delete(&mut writer, "foo").expect("deleted");
-        s3.delete(&mut writer, "foo").expect("deleted");
-        writer.commit().expect("committed");
-
-        let reader = k.read().expect("reader");
-        assert_eq!(s1.get(&reader, "key").expect("value"), None);
-        assert_eq!(s2.get(&reader, "key").expect("value"), None);
-        assert_eq!(s3.get(&reader, "key").expect("value"), None);
-    }
-
-    #[test]
-    fn test_multiple_store_iter() {
-        let root = Builder::new().prefix("test_multiple_store_iter").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s1: SingleStore = k.open_single("store_1", StoreOptions::create()).expect("opened");
-        let s2: SingleStore = k.open_single("store_2", StoreOptions::create()).expect("opened");
-
-        let mut writer = k.write().expect("writer");
-        // Write to "s1"
-        s1.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-        s1.put(&mut writer, "noo", &Value::F64(1234.0.into())).expect("wrote");
-        s1.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-        s1.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-        s1.put(&mut writer, "héllò, töűrîst", &Value::Str("Emil.RuleZ!")).expect("wrote");
-        s1.put(&mut writer, "你好，�客", &Value::Str("米克�則")).expect("wrote");
-        // &mut writer to "s2"
-        s2.put(&mut writer, "foo", &Value::I64(1234)).expect("wrote");
-        s2.put(&mut writer, "noo", &Value::F64(1234.0.into())).expect("wrote");
-        s2.put(&mut writer, "bar", &Value::Bool(true)).expect("wrote");
-        s2.put(&mut writer, "baz", &Value::Str("héllo, yöu")).expect("wrote");
-        s2.put(&mut writer, "héllò, töűrîst", &Value::Str("Emil.RuleZ!")).expect("wrote");
-        s2.put(&mut writer, "你好，�客", &Value::Str("米克�則")).expect("wrote");
-        writer.commit().expect("committed");
-
-        let reader = k.read().unwrap();
-
-        // Iterate through the whole store in "s1"
-        let mut iter = s1.iter_start(&reader).unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "bar");
-        assert_eq!(val, Some(Value::Bool(true)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "baz");
-        assert_eq!(val, Some(Value::Str("héllo, yöu")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "foo");
-        assert_eq!(val, Some(Value::I64(1234)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "héllò, töűrîst");
-        assert_eq!(val, Some(Value::Str("Emil.RuleZ!")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterate through the whole store in "s2"
-        let mut iter = s2.iter_start(&reader).unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "bar");
-        assert_eq!(val, Some(Value::Bool(true)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "baz");
-        assert_eq!(val, Some(Value::Str("héllo, yöu")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "foo");
-        assert_eq!(val, Some(Value::I64(1234)));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "héllò, töűrîst");
-        assert_eq!(val, Some(Value::Str("Emil.RuleZ!")));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterate from a given key in "s1"
-        let mut iter = s1.iter_from(&reader, "moo").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterate from a given key in "s2"
-        let mut iter = s2.iter_from(&reader, "moo").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterate from a given prefix in "s1"
-        let mut iter = s1.iter_from(&reader, "no").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-
-        // Iterate from a given prefix in "s2"
-        let mut iter = s2.iter_from(&reader, "no").unwrap();
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "noo");
-        assert_eq!(val, Some(Value::F64(1234.0.into())));
-        let (key, val) = iter.next().unwrap().unwrap();
-        assert_eq!(str::from_utf8(key).expect("key"), "你好，�客");
-        assert_eq!(val, Some(Value::Str("米克�則")));
-        assert!(iter.next().is_none());
-    }
-
-    #[test]
-    fn test_store_multiple_thread() {
-        let root = Builder::new().prefix("test_multiple_thread").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let rkv_arc = Arc::new(RwLock::new(Rkv::new(root.path()).expect("new succeeded")));
-        let store = rkv_arc.read().unwrap().open_single("test", StoreOptions::create()).expect("opened");
-
-        let num_threads = 10;
-        let mut write_handles = Vec::with_capacity(num_threads as usize);
-        let mut read_handles = Vec::with_capacity(num_threads as usize);
-
-        // Note that this isn't intended to demonstrate a good use of threads.
-        // For this shape of data, it would be more performant to write/read
-        // all values using one transaction in a single thread. The point here
-        // is just to confirm that a store can be shared by multiple threads.
-
-        // For each KV pair, spawn a thread that writes it to the store.
-        for i in 0..num_threads {
-            let rkv_arc = rkv_arc.clone();
-            write_handles.push(thread::spawn(move || {
-                let rkv = rkv_arc.write().expect("rkv");
-                let mut writer = rkv.write().expect("writer");
-                store.put(&mut writer, i.to_string(), &Value::U64(i)).expect("written");
-                writer.commit().unwrap();
-            }));
-        }
-        for handle in write_handles {
-            handle.join().expect("joined");
-        }
-
-        // For each KV pair, spawn a thread that reads it from the store
-        // and returns its value.
-        for i in 0..num_threads {
-            let rkv_arc = rkv_arc.clone();
-            read_handles.push(thread::spawn(move || {
-                let rkv = rkv_arc.read().expect("rkv");
-                let reader = rkv.read().expect("reader");
-                let value = match store.get(&reader, i.to_string()) {
-                    Ok(Some(Value::U64(value))) => value,
-                    Ok(Some(_)) => panic!("value type unexpected"),
-                    Ok(None) => panic!("value not found"),
-                    Err(err) => panic!(err),
-                };
-                assert_eq!(value, i);
-                value
-            }));
-        }
-
-        // Sum the values returned from the threads and confirm that they're
-        // equal to the sum of values written to the threads.
-        let thread_sum: u64 = read_handles.into_iter().map(|handle| handle.join().expect("value")).sum();
-        assert_eq!(thread_sum, (0..num_threads).sum());
-    }
-
-    #[test]
-    fn test_use_value_as_key() {
-        let root = Builder::new().prefix("test_use_value_as_key").tempdir().expect("tempdir");
-        let rkv = Rkv::new(root.path()).expect("new succeeded");
-        let store = rkv.open_single("store", StoreOptions::create()).expect("opened");
-
-        {
-            let mut writer = rkv.write().expect("writer");
-            store.put(&mut writer, "foo", &Value::Str("bar")).expect("wrote");
-            store.put(&mut writer, "bar", &Value::Str("baz")).expect("wrote");
-            writer.commit().expect("committed");
-        }
-
-        // It's possible to retrieve a value with a Reader and then use it
-        // as a key with a Writer.
-        {
-            let reader = &rkv.read().unwrap();
-            if let Some(Value::Str(key)) = store.get(reader, "foo").expect("read") {
-                let mut writer = rkv.write().expect("writer");
-                store.delete(&mut writer, key).expect("deleted");
-                writer.commit().expect("committed");
-            }
-        }
-
-        {
-            let mut writer = rkv.write().expect("writer");
-            store.put(&mut writer, "bar", &Value::Str("baz")).expect("wrote");
-            writer.commit().expect("committed");
-        }
-
-        // You can also retrieve a Value with a Writer and then use it as a key
-        // with the same Writer if you copy the value to an owned type
-        // so the Writer isn't still being borrowed by the retrieved value
-        // when you try to borrow the Writer again to modify that value.
-        {
-            let mut writer = rkv.write().expect("writer");
-            if let Some(Value::Str(value)) = store.get(&writer, "foo").expect("read") {
-                let key = value.to_owned();
-                store.delete(&mut writer, key).expect("deleted");
-                writer.commit().expect("committed");
-            }
-        }
-
-        {
-            let name1 = rkv.open_single("name1", StoreOptions::create()).expect("opened");
-            let name2 = rkv.open_single("name2", StoreOptions::create()).expect("opened");
-            let mut writer = rkv.write().expect("writer");
-            name1.put(&mut writer, "key1", &Value::Str("bar")).expect("wrote");
-            name1.put(&mut writer, "bar", &Value::Str("baz")).expect("wrote");
-            name2.put(&mut writer, "key2", &Value::Str("bar")).expect("wrote");
-            name2.put(&mut writer, "bar", &Value::Str("baz")).expect("wrote");
-            writer.commit().expect("committed");
-        }
-
-        // You can also iterate (store, key) pairs to retrieve foreign keys,
-        // then iterate those foreign keys to modify/delete them.
-        //
-        // You need to open the stores in advance, since opening a store
-        // uses a write transaction internally, so opening them while a writer
-        // is extant will hang.
-        //
-        // And you need to copy the values to an owned type so the Writer isn't
-        // still being borrowed by a retrieved value when you try to borrow
-        // the Writer again to modify another value.
-        let fields = vec![
-            (rkv.open_single("name1", StoreOptions::create()).expect("opened"), "key1"),
-            (rkv.open_single("name2", StoreOptions::create()).expect("opened"), "key2"),
-        ];
-        {
-            let mut foreignkeys = Vec::new();
-            let mut writer = rkv.write().expect("writer");
-            for (store, key) in fields.iter() {
-                if let Some(Value::Str(value)) = store.get(&writer, key).expect("read") {
-                    foreignkeys.push((store, value.to_owned()));
-                }
-            }
-            for (store, key) in foreignkeys.iter() {
-                store.delete(&mut writer, key).expect("deleted");
-            }
-            writer.commit().expect("committed");
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/error.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/error.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/error.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,190 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use std::path::PathBuf;
-
-use bincode;
-use failure::Fail;
-use lmdb;
-
-use crate::value::Type;
-
-#[derive(Debug, Fail)]
-pub enum DataError {
-    #[fail(display = "unknown type tag: {}", _0)]
-    UnknownType(u8),
-
-    #[fail(display = "unexpected type tag: expected {}, got {}", expected, actual)]
-    UnexpectedType {
-        expected: Type,
-        actual: Type,
-    },
-
-    #[fail(display = "empty data; expected tag")]
-    Empty,
-
-    #[fail(display = "invalid value for type {}: {}", value_type, err)]
-    DecodingError {
-        value_type: Type,
-        err: Box<bincode::ErrorKind>,
-    },
-
-    #[fail(display = "couldn't encode value: {}", _0)]
-    EncodingError(Box<bincode::ErrorKind>),
-
-    #[fail(display = "invalid uuid bytes")]
-    InvalidUuid,
-}
-
-impl From<Box<bincode::ErrorKind>> for DataError {
-    fn from(e: Box<bincode::ErrorKind>) -> DataError {
-        DataError::EncodingError(e)
-    }
-}
-
-#[derive(Debug, Fail)]
-pub enum StoreError {
-    #[fail(display = "I/O error: {:?}", _0)]
-    IoError(::std::io::Error),
-
-    #[fail(display = "directory does not exist or not a directory: {:?}", _0)]
-    DirectoryDoesNotExistError(PathBuf),
-
-    #[fail(display = "data error: {:?}", _0)]
-    DataError(DataError),
-
-    #[fail(display = "lmdb error: {}", _0)]
-    LmdbError(lmdb::Error),
-
-    #[fail(display = "read transaction already exists in thread {:?}", _0)]
-    ReadTransactionAlreadyExists(::std::thread::ThreadId),
-
-    #[fail(display = "attempted to open DB during transaction in thread {:?}", _0)]
-    OpenAttemptedDuringTransaction(::std::thread::ThreadId),
-}
-
-impl StoreError {
-    pub fn open_during_transaction() -> StoreError {
-        StoreError::OpenAttemptedDuringTransaction(::std::thread::current().id())
-    }
-}
-
-impl From<lmdb::Error> for StoreError {
-    fn from(e: lmdb::Error) -> StoreError {
-        match e {
-            lmdb::Error::BadRslot => StoreError::ReadTransactionAlreadyExists(::std::thread::current().id()),
-            e => StoreError::LmdbError(e),
-        }
-    }
-}
-
-impl From<DataError> for StoreError {
-    fn from(e: DataError) -> StoreError {
-        StoreError::DataError(e)
-    }
-}
-
-impl From<::std::io::Error> for StoreError {
-    fn from(e: ::std::io::Error) -> StoreError {
-        StoreError::IoError(e)
-    }
-}
-
-#[derive(Debug, Fail)]
-pub enum MigrateError {
-    #[fail(display = "database not found: {:?}", _0)]
-    DatabaseNotFound(String),
-
-    #[fail(display = "{}", _0)]
-    FromString(String),
-
-    #[fail(display = "couldn't determine bit depth")]
-    IndeterminateBitDepth,
-
-    #[fail(display = "I/O error: {:?}", _0)]
-    IoError(::std::io::Error),
-
-    #[fail(display = "invalid DatabaseFlags bits")]
-    InvalidDatabaseBits,
-
-    #[fail(display = "invalid data version")]
-    InvalidDataVersion,
-
-    #[fail(display = "invalid magic number")]
-    InvalidMagicNum,
-
-    #[fail(display = "invalid NodeFlags bits")]
-    InvalidNodeBits,
-
-    #[fail(display = "invalid PageFlags bits")]
-    InvalidPageBits,
-
-    #[fail(display = "invalid page number")]
-    InvalidPageNum,
-
-    #[fail(display = "lmdb error: {}", _0)]
-    LmdbError(lmdb::Error),
-
-    #[fail(display = "string conversion error")]
-    StringConversionError,
-
-    #[fail(display = "TryFromInt error: {:?}", _0)]
-    TryFromIntError(::std::num::TryFromIntError),
-
-    #[fail(display = "unexpected Page variant")]
-    UnexpectedPageVariant,
-
-    #[fail(display = "unexpected PageHeader variant")]
-    UnexpectedPageHeaderVariant,
-
-    #[fail(display = "unsupported PageHeader variant")]
-    UnsupportedPageHeaderVariant,
-
-    #[fail(display = "UTF8 error: {:?}", _0)]
-    Utf8Error(::std::str::Utf8Error),
-}
-
-impl From<::std::io::Error> for MigrateError {
-    fn from(e: ::std::io::Error) -> MigrateError {
-        MigrateError::IoError(e)
-    }
-}
-
-impl From<::std::str::Utf8Error> for MigrateError {
-    fn from(e: ::std::str::Utf8Error) -> MigrateError {
-        MigrateError::Utf8Error(e)
-    }
-}
-
-impl From<::std::num::TryFromIntError> for MigrateError {
-    fn from(e: ::std::num::TryFromIntError) -> MigrateError {
-        MigrateError::TryFromIntError(e)
-    }
-}
-
-impl From<&str> for MigrateError {
-    fn from(e: &str) -> MigrateError {
-        MigrateError::FromString(e.to_string())
-    }
-}
-
-impl From<String> for MigrateError {
-    fn from(e: String) -> MigrateError {
-        MigrateError::FromString(e)
-    }
-}
-
-impl From<lmdb::Error> for MigrateError {
-    fn from(e: lmdb::Error) -> MigrateError {
-        match e {
-            e => MigrateError::LmdbError(e),
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/lib.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-//! a simple, humane, typed Rust interface to [LMDB](http://www.lmdb.tech/doc/)
-//!
-//! It aims to achieve the following:
-//!
-//! - Avoid LMDB's sharp edges (e.g., obscure error codes for common situations).
-//! - Report errors via [failure](https://docs.rs/failure/).
-//! - Correctly restrict access to one handle per process via a [Manager](struct.Manager.html).
-//! - Use Rust's type system to make single-typed key stores (including LMDB's own integer-keyed stores)
-//!   safe and ergonomic.
-//! - Encode and decode values via [bincode](https://docs.rs/bincode/)/[serde](https://docs.rs/serde/)
-//!   and type tags, achieving platform-independent storage and input/output flexibility.
-//!
-//! It exposes these primary abstractions:
-//!
-//! - [Manager](struct.Manager.html): a singleton that controls access to LMDB environments
-//! - [Rkv](struct.Rkv.html): an LMDB environment that contains a set of key/value databases
-//! - [SingleStore](store/single/struct.SingleStore.html): an LMDB database that contains a set of key/value pairs
-//!
-//! Keys can be anything that implements `AsRef<[u8]>` or integers
-//! (when accessing an [IntegerStore](store/integer/struct.IntegerStore.html)).
-//! Values can be any of the types defined by the [Value](value/enum.Value.html) enum, including:
-//!
-//! - booleans (`Value::Bool`)
-//! - integers (`Value::I64`, `Value::U64`)
-//! - floats (`Value::F64`)
-//! - strings (`Value::Str`)
-//! - blobs (`Value::Blob`)
-//!
-//! See [Value](value/enum.Value.html) for the complete list of supported types.
-//!
-//! ## Basic Usage
-//! ```
-//! use rkv::{Manager, Rkv, SingleStore, Value, StoreOptions};
-//! use std::fs;
-//! use tempfile::Builder;
-//!
-//! // First determine the path to the environment, which is represented
-//! // on disk as a directory containing two files:
-//! //
-//! //   * a data file containing the key/value stores
-//! //   * a lock file containing metadata about current transactions
-//! //
-//! // In this example, we use the `tempfile` crate to create the directory.
-//! //
-//! let root = Builder::new().prefix("simple-db").tempdir().unwrap();
-//! fs::create_dir_all(root.path()).unwrap();
-//! let path = root.path();
-//!
-//! // The Manager enforces that each process opens the same environment
-//! // at most once by caching a handle to each environment that it opens.
-//! // Use it to retrieve the handle to an opened environment—or create one
-//! // if it hasn't already been opened:
-//! let created_arc = Manager::singleton().write().unwrap().get_or_create(path, Rkv::new).unwrap();
-//! let env = created_arc.read().unwrap();
-//!
-//! // Then you can use the environment handle to get a handle to a datastore:
-//! let store: SingleStore = env.open_single("mydb", StoreOptions::create()).unwrap();
-//!
-//! {
-//!     // Use a write transaction to mutate the store via a `Writer`.
-//!     // There can be only one writer for a given environment, so opening
-//!     // a second one will block until the first completes.
-//!     let mut writer = env.write().unwrap();
-//!
-//!     // Keys are `AsRef<[u8]>`, while values are `Value` enum instances.
-//!     // Use the `Blob` variant to store arbitrary collections of bytes.
-//!     // Putting data returns a `Result<(), StoreError>`, where StoreError
-//!     // is an enum identifying the reason for a failure.
-//!     store.put(&mut writer, "int", &Value::I64(1234)).unwrap();
-//!     store.put(&mut writer, "uint", &Value::U64(1234_u64)).unwrap();
-//!     store.put(&mut writer, "float", &Value::F64(1234.0.into())).unwrap();
-//!     store.put(&mut writer, "instant", &Value::Instant(1528318073700)).unwrap();
-//!     store.put(&mut writer, "boolean", &Value::Bool(true)).unwrap();
-//!     store.put(&mut writer, "string", &Value::Str("Héllo, wörld!")).unwrap();
-//!     store.put(&mut writer, "json", &Value::Json(r#"{"foo":"bar", "number": 1}"#)).unwrap();
-//!     store.put(&mut writer, "blob", &Value::Blob(b"blob")).unwrap();
-//!
-//!     // You must commit a write transaction before the writer goes out
-//!     // of scope, or the transaction will abort and the data won't persist.
-//!     writer.commit().unwrap();
-//! }
-//!
-//! {
-//!     // Use a read transaction to query the store via a `Reader`.
-//!     // There can be multiple concurrent readers for a store, and readers
-//!     // never block on a writer nor other readers.
-//!     let reader = env.read().expect("reader");
-//!
-//!     // Keys are `AsRef<u8>`, and the return value is `Result<Option<Value>, StoreError>`.
-//!     println!("Get int {:?}", store.get(&reader, "int").unwrap());
-//!     println!("Get uint {:?}", store.get(&reader, "uint").unwrap());
-//!     println!("Get float {:?}", store.get(&reader, "float").unwrap());
-//!     println!("Get instant {:?}", store.get(&reader, "instant").unwrap());
-//!     println!("Get boolean {:?}", store.get(&reader, "boolean").unwrap());
-//!     println!("Get string {:?}", store.get(&reader, "string").unwrap());
-//!     println!("Get json {:?}", store.get(&reader, "json").unwrap());
-//!     println!("Get blob {:?}", store.get(&reader, "blob").unwrap());
-//!
-//!     // Retrieving a non-existent value returns `Ok(None)`.
-//!     println!("Get non-existent value {:?}", store.get(&reader, "non-existent").unwrap());
-//!
-//!     // A read transaction will automatically close once the reader
-//!     // goes out of scope, so isn't necessary to close it explicitly,
-//!     // although you can do so by calling `Reader.abort()`.
-//! }
-//!
-//! {
-//!     // Aborting a write transaction rolls back the change(s).
-//!     let mut writer = env.write().unwrap();
-//!     store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-//!     writer.abort();
-//!     let reader = env.read().expect("reader");
-//!     println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-//! }
-//!
-//! {
-//!     // Explicitly aborting a transaction is not required unless an early
-//!     // abort is desired, since both read and write transactions will
-//!     // implicitly be aborted once they go out of scope.
-//!     {
-//!         let mut writer = env.write().unwrap();
-//!         store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-//!     }
-//!     let reader = env.read().expect("reader");
-//!     println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-//! }
-//!
-//! {
-//!     // Deleting a key/value pair also requires a write transaction.
-//!     let mut writer = env.write().unwrap();
-//!     store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-//!     store.put(&mut writer, "bar", &Value::Str("baz")).unwrap();
-//!     store.delete(&mut writer, "foo").unwrap();
-//!
-//!     // A write transaction also supports reading, and the version of the
-//!     // store that it reads includes the changes it has made regardless of
-//!     // the commit state of that transaction.
-
-//!     // In the code above, "foo" and "bar" were put into the store,
-//!     // then "foo" was deleted so only "bar" will return a result when the
-//!     // database is queried via the writer.
-//!     println!("It should be None! ({:?})", store.get(&writer, "foo").unwrap());
-//!     println!("Get bar ({:?})", store.get(&writer, "bar").unwrap());
-//!
-//!     // But a reader won't see that change until the write transaction
-//!     // is committed.
-//!     {
-//!         let reader = env.read().expect("reader");
-//!         println!("Get foo {:?}", store.get(&reader, "foo").unwrap());
-//!         println!("Get bar {:?}", store.get(&reader, "bar").unwrap());
-//!     }
-//!     writer.commit().unwrap();
-//!     {
-//!         let reader = env.read().expect("reader");
-//!         println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-//!         println!("Get bar {:?}", store.get(&reader, "bar").unwrap());
-//!     }
-//!
-//!     // Committing a transaction consumes the writer, preventing you
-//!     // from reusing it by failing at compile time with an error.
-//!     // This line would report error[E0382]: borrow of moved value: `writer`.
-//!     // store.put(&mut writer, "baz", &Value::Str("buz")).unwrap();
-//! }
-//!
-//! {
-//!     // Clearing all the entries in the store with a write transaction.
-//!     {
-//!         let mut writer = env.write().unwrap();
-//!         store.put(&mut writer, "foo", &Value::Str("bar")).unwrap();
-//!         store.put(&mut writer, "bar", &Value::Str("baz")).unwrap();
-//!         writer.commit().unwrap();
-//!     }
-//!
-//!     {
-//!         let mut writer = env.write().unwrap();
-//!         store.clear(&mut writer).unwrap();
-//!         writer.commit().unwrap();
-//!     }
-//!
-//!     {
-//!         let reader = env.read().expect("reader");
-//!         println!("It should be None! ({:?})", store.get(&reader, "foo").unwrap());
-//!         println!("It should be None! ({:?})", store.get(&reader, "bar").unwrap());
-//!     }
-//!
-//! }
-//!
-//! ```
-
-#![allow(dead_code)]
-
-pub use lmdb::{
-    DatabaseFlags,
-    EnvironmentBuilder,
-    EnvironmentFlags,
-    WriteFlags,
-};
-
-mod env;
-pub mod error;
-mod manager;
-pub mod migrate;
-mod readwrite;
-pub mod store;
-pub mod value;
-
-pub use lmdb::{
-    Cursor,
-    Database,
-    Info,
-    Iter as LmdbIter,
-    RoCursor,
-    Stat,
-};
-
-pub use self::readwrite::{
-    Readable,
-    Reader,
-    Writer,
-};
-pub use self::store::integer::{
-    IntegerStore,
-    PrimitiveInt,
-};
-pub use self::store::integermulti::MultiIntegerStore;
-pub use self::store::multi::MultiStore;
-pub use self::store::single::SingleStore;
-pub use self::store::Options as StoreOptions;
-
-pub use self::env::Rkv;
-
-pub use self::error::{
-    DataError,
-    StoreError,
-};
-
-pub use self::manager::Manager;
-
-pub use self::value::{
-    OwnedValue,
-    Value,
-};
-
-fn read_transform(val: Result<&[u8], lmdb::Error>) -> Result<Option<Value>, StoreError> {
-    match val {
-        Ok(bytes) => Value::from_tagged_slice(bytes).map(Some).map_err(StoreError::DataError),
-        Err(lmdb::Error::NotFound) => Ok(None),
-        Err(e) => Err(StoreError::LmdbError(e)),
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/manager.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/manager.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/manager.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/manager.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,196 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use lazy_static::lazy_static;
-use std::collections::BTreeMap;
-
-use std::io::{
-    self,
-    Error,
-    ErrorKind,
-};
-
-use std::collections::btree_map::Entry;
-
-use std::os::raw::c_uint;
-
-use std::path::{
-    Path,
-    PathBuf,
-};
-
-use std::sync::{
-    Arc,
-    RwLock,
-};
-
-use url::Url;
-
-use crate::error::StoreError;
-
-use crate::Rkv;
-
-lazy_static! {
-    /// A process is only permitted to have one open handle to each Rkv environment.
-    /// This manager exists to enforce that constraint: don't open environments directly.
-    static ref MANAGER: RwLock<Manager> = RwLock::new(Manager::new());
-}
-
-// Workaround the UNC path on Windows, see https://github.com/rust-lang/rust/issues/42869.
-// Otherwise, `Env::from_env()` will panic with error_no(123).
-fn canonicalize_path<'p, P>(path: P) -> io::Result<PathBuf>
-where
-    P: Into<&'p Path>,
-{
-    let canonical = path.into().canonicalize()?;
-    if cfg!(target_os = "windows") {
-        let url = Url::from_file_path(&canonical).map_err(|_e| Error::new(ErrorKind::Other, "URL passing error"))?;
-        return url.to_file_path().map_err(|_e| Error::new(ErrorKind::Other, "path canonicalization error"));
-    }
-    Ok(canonical)
-}
-
-/// A process is only permitted to have one open handle to each Rkv environment.
-/// This manager exists to enforce that constraint: don't open environments directly.
-pub struct Manager {
-    environments: BTreeMap<PathBuf, Arc<RwLock<Rkv>>>,
-}
-
-impl Manager {
-    fn new() -> Manager {
-        Manager {
-            environments: Default::default(),
-        }
-    }
-
-    pub fn singleton() -> &'static RwLock<Manager> {
-        &*MANAGER
-    }
-
-    /// Return the open env at `path`, returning `None` if it has not already been opened.
-    pub fn get<'p, P>(&self, path: P) -> Result<Option<Arc<RwLock<Rkv>>>, ::std::io::Error>
-    where
-        P: Into<&'p Path>,
-    {
-        let canonical = canonicalize_path(path)?;
-        Ok(self.environments.get(&canonical).cloned())
-    }
-
-    /// Return the open env at `path`, or create it by calling `f`.
-    pub fn get_or_create<'p, F, P>(&mut self, path: P, f: F) -> Result<Arc<RwLock<Rkv>>, StoreError>
-    where
-        F: FnOnce(&Path) -> Result<Rkv, StoreError>,
-        P: Into<&'p Path>,
-    {
-        let canonical = canonicalize_path(path)?;
-        Ok(match self.environments.entry(canonical) {
-            Entry::Occupied(e) => e.get().clone(),
-            Entry::Vacant(e) => {
-                let k = Arc::new(RwLock::new(f(e.key().as_path())?));
-                e.insert(k).clone()
-            },
-        })
-    }
-
-    /// Return the open env at `path` with capacity `capacity`,
-    /// or create it by calling `f`.
-    pub fn get_or_create_with_capacity<'p, F, P>(
-        &mut self,
-        path: P,
-        capacity: c_uint,
-        f: F,
-    ) -> Result<Arc<RwLock<Rkv>>, StoreError>
-    where
-        F: FnOnce(&Path, c_uint) -> Result<Rkv, StoreError>,
-        P: Into<&'p Path>,
-    {
-        let canonical = canonicalize_path(path)?;
-        Ok(match self.environments.entry(canonical) {
-            Entry::Occupied(e) => e.get().clone(),
-            Entry::Vacant(e) => {
-                let k = Arc::new(RwLock::new(f(e.key().as_path(), capacity)?));
-                e.insert(k).clone()
-            },
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs;
-    use tempfile::Builder;
-
-    use super::*;
-
-    /// Test that the manager will return the same Rkv instance each time for each path.
-    #[test]
-    fn test_same() {
-        let root = Builder::new().prefix("test_same").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-
-        let mut manager = Manager::new();
-
-        let p = root.path();
-        assert!(manager.get(p).expect("success").is_none());
-
-        let created_arc = manager.get_or_create(p, Rkv::new).expect("created");
-        let fetched_arc = manager.get(p).expect("success").expect("existed");
-        assert!(Arc::ptr_eq(&created_arc, &fetched_arc));
-    }
-
-    /// Test that one can mutate managed Rkv instances in surprising ways.
-    #[test]
-    fn test_mutate_managed_rkv() {
-        let mut manager = Manager::new();
-
-        let root1 = Builder::new().prefix("test_mutate_managed_rkv_1").tempdir().expect("tempdir");
-        fs::create_dir_all(root1.path()).expect("dir created");
-        let path1 = root1.path();
-        let arc = manager.get_or_create(path1, Rkv::new).expect("created");
-
-        // Arc<RwLock<>> has interior mutability, so we can replace arc's Rkv
-        // instance with a new instance that has a different path.
-        let root2 = Builder::new().prefix("test_mutate_managed_rkv_2").tempdir().expect("tempdir");
-        fs::create_dir_all(root2.path()).expect("dir created");
-        let path2 = root2.path();
-        {
-            let mut rkv = arc.write().expect("guard");
-            let rkv2 = Rkv::new(path2).expect("Rkv");
-            *rkv = rkv2;
-        }
-
-        // arc now has a different internal Rkv with path2, but it's still
-        // mapped to path1 in manager, so its pointer is equal to a new Arc
-        // for path1.
-        let path1_arc = manager.get(path1).expect("success").expect("existed");
-        assert!(Arc::ptr_eq(&path1_arc, &arc));
-
-        // Meanwhile, a new Arc for path2 has a different pointer, even though
-        // its Rkv's path is the same as arc's current path.
-        let path2_arc = manager.get_or_create(path2, Rkv::new).expect("success");
-        assert!(!Arc::ptr_eq(&path2_arc, &arc));
-    }
-
-    /// Test that the manager will return the same Rkv instance each time for each path.
-    #[test]
-    fn test_same_with_capacity() {
-        let root = Builder::new().prefix("test_same").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-
-        let mut manager = Manager::new();
-
-        let p = root.path();
-        assert!(manager.get(p).expect("success").is_none());
-
-        let created_arc = manager.get_or_create_with_capacity(p, 10, Rkv::with_capacity).expect("created");
-        let fetched_arc = manager.get(p).expect("success").expect("existed");
-        assert!(Arc::ptr_eq(&created_arc, &fetched_arc));
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/migrate.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/migrate.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/migrate.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/migrate.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1028 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-//! A utility for migrating data from one LMDB environment to another.
-//! Notably, this tool can migrate data from an enviroment created with
-//! a different bit-depth than the current rkv consumer, which enables
-//! the consumer to retrieve data from an environment that can't be read
-//! directly using the rkv APIs.
-//!
-//! The utility supports both 32-bit and 64-bit LMDB source environments,
-//! and it automatically migrates data in both the default database
-//! and any named (sub) databases.  It also migrates the source environment's
-//! "map size" and "max DBs" configuration options to the destination
-//! environment.
-//!
-//! The destination environment must be at the rkv consumer's bit depth
-//! and should be empty of data.  It can be an empty directory, in which case
-//! the utility will create a new LMDB environment within the directory.
-//!
-//! The tool currently has these limitations:
-//!
-//! 1. It doesn't support migration from environments created with
-//!    `EnvironmentFlags::NO_SUB_DIR`.  To migrate such an environment,
-//!    create a temporary directory, copy the environment's data file
-//!    to a file called data.mdb in the temporary directory, then migrate
-//!    the temporary directory as the source environment.
-//! 2. It doesn't support migration from databases created with
-//!    `DatabaseFlags::DUP_SORT` (with or without `DatabaseFlags::DUP_FIXED`).
-//! 3. It doesn't account for existing data in the destination environment,
-//!    which means that it can overwrite data (causing data loss) or fail
-//!    to migrate data if the destination environment contains existing data.
-//!
-//! ## Basic Usage
-//!
-//! Call `Migrator::new()` with the path to the source environment to create
-//! a `Migrator` instance; then call the instance's `migrate()` method
-//! with the path to the destination environment to migrate data from the source
-//! to the destination environment.  For example, this snippet migrates data
-//! from the tests/envs/ref_env_32 environment to a new environment
-//! in a temporary directory:
-//!
-//! ```
-//! use rkv::migrate::Migrator;
-//! use std::path::Path;
-//! use tempfile::tempdir;
-//! let mut migrator = Migrator::new(Path::new("tests/envs/ref_env_32")).unwrap();
-//! migrator.migrate(&tempdir().unwrap().path()).unwrap();
-//! ```
-//!
-//! Both `Migrator::new()` and `migrate()` return a `MigrateResult` that is
-//! either an `Ok()` result or an `Err<MigrateError>`, where `MigrateError`
-//! is an enum whose variants identify specific kinds of migration failures.
-
-pub use crate::error::MigrateError;
-use bitflags::bitflags;
-use byteorder::{
-    LittleEndian,
-    ReadBytesExt,
-};
-use lmdb::{
-    DatabaseFlags,
-    Environment,
-    Transaction,
-    WriteFlags,
-};
-use std::{
-    collections::{
-        BTreeMap,
-        HashMap,
-    },
-    convert::TryFrom,
-    fs::File,
-    io::{
-        Cursor,
-        Read,
-        Seek,
-        SeekFrom,
-        Write,
-    },
-    path::{
-        Path,
-        PathBuf,
-    },
-    rc::Rc,
-    str,
-};
-
-const PAGESIZE: u16 = 4096;
-
-// The magic number is 0xBEEFC0DE, which is 0xDEC0EFBE in little-endian.
-// It appears at offset 12 on 32-bit systems and 16 on 64-bit systems.
-// We don't support big-endian migration, but presumably we could do so
-// by detecting the order of the bytes.
-const MAGIC: [u8; 4] = [0xDE, 0xC0, 0xEF, 0xBE];
-
-pub type MigrateResult<T> = Result<T, MigrateError>;
-
-bitflags! {
-    #[derive(Default)]
-    struct PageFlags: u16 {
-        const BRANCH = 0x01;
-        const LEAF = 0x02;
-        const OVERFLOW = 0x04;
-        const META = 0x08;
-        const DIRTY = 0x10;
-        const LEAF2 = 0x20;
-        const SUBP = 0x40;
-        const LOOSE = 0x4000;
-        const KEEP = 0x8000;
-    }
-}
-
-bitflags! {
-    #[derive(Default)]
-    struct NodeFlags: u16 {
-        const BIGDATA = 0x01;
-        const SUBDATA = 0x02;
-        const DUPDATA = 0x04;
-    }
-}
-
-// The bit depth of the executable that created an LMDB environment.
-// The Migrator determines this automatically based on the location of
-// the magic number in the data.mdb file.
-#[derive(Clone, Copy, PartialEq)]
-enum Bits {
-    U32,
-    U64,
-}
-
-impl Bits {
-    // The size of usize for the bit-depth represented by the enum variant.
-    fn size(self) -> usize {
-        match self {
-            Bits::U32 => 4,
-            Bits::U64 => 8,
-        }
-    }
-}
-
-// The equivalent of PAGEHDRSZ in LMDB, except that this one varies by bits.
-fn page_header_size(bits: Bits) -> u64 {
-    match bits {
-        Bits::U32 => 12,
-        Bits::U64 => 16,
-    }
-}
-
-// The equivalent of P_INVALID in LMDB, except that this one varies by bits.
-fn validate_page_num(page_num: u64, bits: Bits) -> MigrateResult<()> {
-    let invalid_page_num = match bits {
-        Bits::U32 => u64::from(!0u32),
-        Bits::U64 => !0u64,
-    };
-
-    if page_num == invalid_page_num {
-        return Err(MigrateError::InvalidPageNum);
-    }
-
-    Ok(())
-}
-
-#[derive(Clone, Debug, Default)]
-struct Database {
-    md_pad: u32,
-    md_flags: DatabaseFlags,
-    md_depth: u16,
-    md_branch_pages: u64,
-    md_leaf_pages: u64,
-    md_overflow_pages: u64,
-    md_entries: u64,
-    md_root: u64,
-}
-
-impl Database {
-    fn new(cursor: &mut Cursor<&[u8]>, bits: Bits) -> MigrateResult<Database> {
-        Ok(Database {
-            md_pad: cursor.read_u32::<LittleEndian>()?,
-            md_flags: DatabaseFlags::from_bits(cursor.read_u16::<LittleEndian>()?.into())
-                .ok_or(MigrateError::InvalidDatabaseBits)?,
-            md_depth: cursor.read_u16::<LittleEndian>()?,
-            md_branch_pages: cursor.read_uint::<LittleEndian>(bits.size())?,
-            md_leaf_pages: cursor.read_uint::<LittleEndian>(bits.size())?,
-            md_overflow_pages: cursor.read_uint::<LittleEndian>(bits.size())?,
-            md_entries: cursor.read_uint::<LittleEndian>(bits.size())?,
-            md_root: cursor.read_uint::<LittleEndian>(bits.size())?,
-        })
-    }
-}
-
-#[derive(Debug, Default)]
-struct Databases {
-    free: Database,
-    main: Database,
-}
-
-#[derive(Debug, Default)]
-struct MetaData {
-    mm_magic: u32,
-    mm_version: u32,
-    mm_address: u64,
-    mm_mapsize: u64,
-    mm_dbs: Databases,
-    mm_last_pg: u64,
-    mm_txnid: u64,
-}
-
-#[derive(Debug)]
-enum LeafNode {
-    Regular {
-        mn_lo: u16,
-        mn_hi: u16,
-        mn_flags: NodeFlags,
-        mn_ksize: u16,
-        mv_size: u32,
-        key: Vec<u8>,
-        value: Vec<u8>,
-    },
-    BigData {
-        mn_lo: u16,
-        mn_hi: u16,
-        mn_flags: NodeFlags,
-        mn_ksize: u16,
-        mv_size: u32,
-        key: Vec<u8>,
-        overflow_pgno: u64,
-    },
-    SubData {
-        mn_lo: u16,
-        mn_hi: u16,
-        mn_flags: NodeFlags,
-        mn_ksize: u16,
-        mv_size: u32,
-        key: Vec<u8>,
-        value: Vec<u8>,
-        db: Database,
-    },
-}
-
-#[derive(Debug, Default)]
-struct BranchNode {
-    mp_pgno: u64,
-    mn_ksize: u16,
-    mn_data: Vec<u8>,
-}
-
-#[derive(Debug)]
-enum PageHeader {
-    Regular {
-        mp_pgno: u64,
-        mp_flags: PageFlags,
-        pb_lower: u16,
-        pb_upper: u16,
-    },
-    Overflow {
-        mp_pgno: u64,
-        mp_flags: PageFlags,
-        pb_pages: u32,
-    },
-}
-
-#[derive(Debug)]
-enum Page {
-    META(MetaData),
-    LEAF(Vec<LeafNode>),
-    BRANCH(Vec<BranchNode>),
-}
-
-impl Page {
-    fn new(buf: Vec<u8>, bits: Bits) -> MigrateResult<Page> {
-        let mut cursor = std::io::Cursor::new(&buf[..]);
-
-        match Self::parse_page_header(&mut cursor, bits)? {
-            PageHeader::Regular {
-                mp_flags,
-                pb_lower,
-                ..
-            } => {
-                if mp_flags.contains(PageFlags::LEAF2) || mp_flags.contains(PageFlags::SUBP) {
-                    // We don't yet support DUPFIXED and DUPSORT databases.
-                    return Err(MigrateError::UnsupportedPageHeaderVariant);
-                }
-
-                if mp_flags.contains(PageFlags::META) {
-                    let meta_data = Self::parse_meta_data(&mut cursor, bits)?;
-                    Ok(Page::META(meta_data))
-                } else if mp_flags.contains(PageFlags::LEAF) {
-                    let nodes = Self::parse_leaf_nodes(&mut cursor, pb_lower, bits)?;
-                    Ok(Page::LEAF(nodes))
-                } else if mp_flags.contains(PageFlags::BRANCH) {
-                    let nodes = Self::parse_branch_nodes(&mut cursor, pb_lower, bits)?;
-                    Ok(Page::BRANCH(nodes))
-                } else {
-                    Err(MigrateError::UnexpectedPageHeaderVariant)
-                }
-            },
-            PageHeader::Overflow {
-                ..
-            } => {
-                // There isn't anything to do, nor should we try to instantiate
-                // a page of this type, as we only access them when reading
-                // a value that is too large to fit into a leaf node.
-                Err(MigrateError::UnexpectedPageHeaderVariant)
-            },
-        }
-    }
-
-    fn parse_page_header(cursor: &mut Cursor<&[u8]>, bits: Bits) -> MigrateResult<PageHeader> {
-        let mp_pgno = cursor.read_uint::<LittleEndian>(bits.size())?;
-        let _mp_pad = cursor.read_u16::<LittleEndian>()?;
-        let mp_flags = PageFlags::from_bits(cursor.read_u16::<LittleEndian>()?).ok_or(MigrateError::InvalidPageBits)?;
-
-        if mp_flags.contains(PageFlags::OVERFLOW) {
-            let pb_pages = cursor.read_u32::<LittleEndian>()?;
-            Ok(PageHeader::Overflow {
-                mp_pgno,
-                mp_flags,
-                pb_pages,
-            })
-        } else {
-            let pb_lower = cursor.read_u16::<LittleEndian>()?;
-            let pb_upper = cursor.read_u16::<LittleEndian>()?;
-            Ok(PageHeader::Regular {
-                mp_pgno,
-                mp_flags,
-                pb_lower,
-                pb_upper,
-            })
-        }
-    }
-
-    fn parse_meta_data(mut cursor: &mut Cursor<&[u8]>, bits: Bits) -> MigrateResult<MetaData> {
-        cursor.seek(SeekFrom::Start(page_header_size(bits)))?;
-
-        Ok(MetaData {
-            mm_magic: cursor.read_u32::<LittleEndian>()?,
-            mm_version: cursor.read_u32::<LittleEndian>()?,
-            mm_address: cursor.read_uint::<LittleEndian>(bits.size())?,
-            mm_mapsize: cursor.read_uint::<LittleEndian>(bits.size())?,
-            mm_dbs: Databases {
-                free: Database::new(&mut cursor, bits)?,
-                main: Database::new(&mut cursor, bits)?,
-            },
-            mm_last_pg: cursor.read_uint::<LittleEndian>(bits.size())?,
-            mm_txnid: cursor.read_uint::<LittleEndian>(bits.size())?,
-        })
-    }
-
-    fn parse_leaf_nodes(cursor: &mut Cursor<&[u8]>, pb_lower: u16, bits: Bits) -> MigrateResult<Vec<LeafNode>> {
-        cursor.set_position(page_header_size(bits));
-        let num_keys = Self::num_keys(pb_lower, bits);
-        let mp_ptrs = Self::parse_mp_ptrs(cursor, num_keys)?;
-
-        let mut leaf_nodes = Vec::with_capacity(num_keys as usize);
-
-        for mp_ptr in mp_ptrs {
-            cursor.set_position(u64::from(mp_ptr));
-            leaf_nodes.push(Self::parse_leaf_node(cursor, bits)?);
-        }
-
-        Ok(leaf_nodes)
-    }
-
-    fn parse_leaf_node(cursor: &mut Cursor<&[u8]>, bits: Bits) -> MigrateResult<LeafNode> {
-        // The order of the mn_lo and mn_hi fields is endian-dependent and would
-        // be reversed in an LMDB environment created on a big-endian system.
-        let mn_lo = cursor.read_u16::<LittleEndian>()?;
-        let mn_hi = cursor.read_u16::<LittleEndian>()?;
-
-        let mn_flags = NodeFlags::from_bits(cursor.read_u16::<LittleEndian>()?).ok_or(MigrateError::InvalidNodeBits)?;
-        let mn_ksize = cursor.read_u16::<LittleEndian>()?;
-
-        let start = usize::try_from(cursor.position())?;
-        let end = usize::try_from(cursor.position() + u64::from(mn_ksize))?;
-        let key = cursor.get_ref()[start..end].to_vec();
-        cursor.set_position(end as u64);
-
-        let mv_size = Self::leaf_node_size(mn_lo, mn_hi);
-        if mn_flags.contains(NodeFlags::BIGDATA) {
-            let overflow_pgno = cursor.read_uint::<LittleEndian>(bits.size())?;
-
-            Ok(LeafNode::BigData {
-                mn_lo,
-                mn_hi,
-                mn_flags,
-                mn_ksize,
-                mv_size,
-                key,
-                overflow_pgno,
-            })
-        } else if mn_flags.contains(NodeFlags::SUBDATA) {
-            let start = usize::try_from(cursor.position())?;
-            let end = usize::try_from(cursor.position() + u64::from(mv_size))?;
-            let value = cursor.get_ref()[start..end].to_vec();
-            let mut cursor = std::io::Cursor::new(&value[..]);
-            let db = Database::new(&mut cursor, bits)?;
-            validate_page_num(db.md_root, bits)?;
-
-            Ok(LeafNode::SubData {
-                mn_lo,
-                mn_hi,
-                mn_flags,
-                mn_ksize,
-                mv_size,
-                key,
-                value,
-                db,
-            })
-        } else {
-            let start = usize::try_from(cursor.position())?;
-            let end = usize::try_from(cursor.position() + u64::from(mv_size))?;
-            let value = cursor.get_ref()[start..end].to_vec();
-
-            Ok(LeafNode::Regular {
-                mn_lo,
-                mn_hi,
-                mn_flags,
-                mn_ksize,
-                mv_size,
-                key,
-                value,
-            })
-        }
-    }
-
-    fn leaf_node_size(mn_lo: u16, mn_hi: u16) -> u32 {
-        u32::from(mn_lo) + ((u32::from(mn_hi)) << 16)
-    }
-
-    fn parse_branch_nodes(cursor: &mut Cursor<&[u8]>, pb_lower: u16, bits: Bits) -> MigrateResult<Vec<BranchNode>> {
-        let num_keys = Self::num_keys(pb_lower, bits);
-        let mp_ptrs = Self::parse_mp_ptrs(cursor, num_keys)?;
-
-        let mut branch_nodes = Vec::with_capacity(num_keys as usize);
-
-        for mp_ptr in mp_ptrs {
-            cursor.set_position(u64::from(mp_ptr));
-            branch_nodes.push(Self::parse_branch_node(cursor, bits)?)
-        }
-
-        Ok(branch_nodes)
-    }
-
-    fn parse_branch_node(cursor: &mut Cursor<&[u8]>, bits: Bits) -> MigrateResult<BranchNode> {
-        // The order of the mn_lo and mn_hi fields is endian-dependent and would
-        // be reversed in an LMDB environment created on a big-endian system.
-        let mn_lo = cursor.read_u16::<LittleEndian>()?;
-        let mn_hi = cursor.read_u16::<LittleEndian>()?;
-
-        let mn_flags = cursor.read_u16::<LittleEndian>()?;
-
-        // Branch nodes overload the mn_lo, mn_hi, and mn_flags fields
-        // to store the page number, so we derive the number from those fields.
-        let mp_pgno = Self::branch_node_page_num(mn_lo, mn_hi, mn_flags, bits);
-
-        let mn_ksize = cursor.read_u16::<LittleEndian>()?;
-
-        let position = cursor.position();
-        let start = usize::try_from(position)?;
-        let end = usize::try_from(position + u64::from(mn_ksize))?;
-        let mn_data = cursor.get_ref()[start..end].to_vec();
-        cursor.set_position(end as u64);
-
-        Ok(BranchNode {
-            mp_pgno,
-            mn_ksize,
-            mn_data,
-        })
-    }
-
-    fn branch_node_page_num(mn_lo: u16, mn_hi: u16, mn_flags: u16, bits: Bits) -> u64 {
-        let mut page_num = u64::from(u32::from(mn_lo) + (u32::from(mn_hi) << 16));
-        if bits == Bits::U64 {
-            page_num += u64::from(mn_flags) << 32;
-        }
-        page_num
-    }
-
-    fn parse_mp_ptrs(cursor: &mut Cursor<&[u8]>, num_keys: u64) -> MigrateResult<Vec<u16>> {
-        let mut mp_ptrs = Vec::with_capacity(num_keys as usize);
-        for _ in 0..num_keys {
-            mp_ptrs.push(cursor.read_u16::<LittleEndian>()?);
-        }
-        Ok(mp_ptrs)
-    }
-
-    fn num_keys(pb_lower: u16, bits: Bits) -> u64 {
-        (u64::from(pb_lower) - page_header_size(bits)) >> 1
-    }
-}
-
-pub struct Migrator {
-    file: File,
-    bits: Bits,
-}
-
-impl Migrator {
-    /// Create a new Migrator for the LMDB environment at the given path.
-    /// This tries to open the data.mdb file in the environment and determine
-    /// the bit depth of the executable that created it, so it can fail
-    /// and return an Err if the file can't be opened or the depth determined.
-    pub fn new(path: &Path) -> MigrateResult<Migrator> {
-        let mut path = PathBuf::from(path);
-        path.push("data.mdb");
-        let mut file = File::open(&path)?;
-
-        file.seek(SeekFrom::Start(page_header_size(Bits::U32)))?;
-        let mut buf = [0; 4];
-        file.read_exact(&mut buf)?;
-
-        let bits = if buf == MAGIC {
-            Bits::U32
-        } else {
-            file.seek(SeekFrom::Start(page_header_size(Bits::U64)))?;
-            file.read_exact(&mut buf)?;
-            if buf == MAGIC {
-                Bits::U64
-            } else {
-                return Err(MigrateError::IndeterminateBitDepth);
-            }
-        };
-
-        Ok(Migrator {
-            file,
-            bits,
-        })
-    }
-
-    /// Dump the data in one of the databases in the LMDB environment.
-    /// If the `database` paremeter is None, then we dump the data in the main
-    /// database.  If it's the name of a subdatabase, then we dump the data
-    /// in that subdatabase.
-    ///
-    /// Note that the output isn't identical to that of the mdb_dump utility,
-    /// since mdb_dump includes subdatabase key/value pairs when dumping
-    /// the main database, and those values are architecture-dependent, since
-    /// they contain pointer-sized data.
-    ///
-    /// If we wanted to support identical output, we could parameterize
-    /// inclusion of subdatabase pairs in get_pairs() and include them
-    /// when dumping data, while continuing to exclude them when migrating
-    /// data.
-    pub fn dump<T: Write>(&mut self, database: Option<&str>, mut out: T) -> MigrateResult<()> {
-        let meta_data = self.get_meta_data()?;
-        let root_page_num = meta_data.mm_dbs.main.md_root;
-        let root_page = Rc::new(self.get_page(root_page_num)?);
-
-        let pairs;
-        if let Some(database) = database {
-            let subdbs = self.get_subdbs(root_page)?;
-            let database =
-                subdbs.get(database.as_bytes()).ok_or_else(|| MigrateError::DatabaseNotFound(database.to_string()))?;
-            let root_page_num = database.md_root;
-            let root_page = Rc::new(self.get_page(root_page_num)?);
-            pairs = self.get_pairs(root_page)?;
-        } else {
-            pairs = self.get_pairs(root_page)?;
-        }
-
-        out.write_all(b"VERSION=3\n")?;
-        out.write_all(b"format=bytevalue\n")?;
-        if let Some(database) = database {
-            writeln!(out, "database={}", database)?;
-        }
-        out.write_all(b"type=btree\n")?;
-        writeln!(out, "mapsize={}", meta_data.mm_mapsize)?;
-        out.write_all(b"maxreaders=126\n")?;
-        out.write_all(b"db_pagesize=4096\n")?;
-        out.write_all(b"HEADER=END\n")?;
-
-        for (key, value) in pairs {
-            out.write_all(b" ")?;
-            for byte in key {
-                write!(out, "{:02x}", byte)?;
-            }
-            out.write_all(b"\n")?;
-            out.write_all(b" ")?;
-            for byte in value {
-                write!(out, "{:02x}", byte)?;
-            }
-            out.write_all(b"\n")?;
-        }
-
-        out.write_all(b"DATA=END\n")?;
-
-        Ok(())
-    }
-
-    /// Migrate all data in all of databases in the existing LMDB environment
-    /// to a new environment.  This includes all key/value pairs in the main
-    /// database that aren't metadata about subdatabases and all key/value pairs
-    /// in all subdatabases.
-    ///
-    /// We also set the map size and maximum databases of the new environment
-    /// to their values for the existing environment.  But we don't set
-    /// other metadata, and we don't check that the new environment is empty
-    /// before migrating data.
-    ///
-    /// Thus it's possible for this to overwrite existing data or fail
-    /// to migrate data if the new environment isn't empty.  It's the consumer's
-    /// responsibility to ensure that data can be safely migrated to the new
-    /// environment.  In general, this means that environment should be empty.
-    pub fn migrate(&mut self, dest: &Path) -> MigrateResult<()> {
-        let meta_data = self.get_meta_data()?;
-        let root_page_num = meta_data.mm_dbs.main.md_root;
-        validate_page_num(root_page_num, self.bits)?;
-        let root_page = Rc::new(self.get_page(root_page_num)?);
-        let subdbs = self.get_subdbs(Rc::clone(&root_page))?;
-
-        let env = Environment::new()
-            .set_map_size(meta_data.mm_mapsize as usize)
-            .set_max_dbs(subdbs.len() as u32)
-            .open(dest)?;
-
-        // Create the databases before we open a read-write transaction,
-        // since database creation requires its own read-write transaction,
-        // which would hang while awaiting completion of an existing one.
-        env.create_db(None, meta_data.mm_dbs.main.md_flags)?;
-        for (subdb_name, subdb_info) in &subdbs {
-            env.create_db(Some(str::from_utf8(&subdb_name)?), subdb_info.md_flags)?;
-        }
-
-        // Now open the read-write transaction that we'll use to migrate
-        // all the data.
-        let mut txn = env.begin_rw_txn()?;
-
-        // Migrate the main database.
-        let pairs = self.get_pairs(root_page)?;
-        let db = env.open_db(None)?;
-        for (key, value) in pairs {
-            // If we knew that the target database was empty, we could
-            // specify WriteFlags::APPEND to speed up the migration.
-            txn.put(db, &key, &value, WriteFlags::empty())?;
-        }
-
-        // Migrate subdatabases.
-        for (subdb_name, subdb_info) in &subdbs {
-            let root_page = Rc::new(self.get_page(subdb_info.md_root)?);
-            let pairs = self.get_pairs(root_page)?;
-            let db = env.open_db(Some(str::from_utf8(&subdb_name)?))?;
-            for (key, value) in pairs {
-                // If we knew that the target database was empty, we could
-                // specify WriteFlags::APPEND to speed up the migration.
-                txn.put(db, &key, &value, WriteFlags::empty())?;
-            }
-        }
-
-        txn.commit()?;
-
-        Ok(())
-    }
-
-    fn get_subdbs(&mut self, root_page: Rc<Page>) -> MigrateResult<HashMap<Vec<u8>, Database>> {
-        let mut subdbs = HashMap::new();
-        let mut pages = vec![root_page];
-
-        while let Some(page) = pages.pop() {
-            match &*page {
-                Page::BRANCH(nodes) => {
-                    for branch in nodes {
-                        pages.push(Rc::new(self.get_page(branch.mp_pgno)?));
-                    }
-                },
-                Page::LEAF(nodes) => {
-                    for leaf in nodes {
-                        if let LeafNode::SubData {
-                            key,
-                            db,
-                            ..
-                        } = leaf
-                        {
-                            subdbs.insert(key.to_vec(), db.clone());
-                        };
-                    }
-                },
-                _ => {
-                    return Err(MigrateError::UnexpectedPageVariant);
-                },
-            }
-        }
-
-        Ok(subdbs)
-    }
-
-    fn get_pairs(&mut self, root_page: Rc<Page>) -> MigrateResult<BTreeMap<Vec<u8>, Vec<u8>>> {
-        let mut pairs = BTreeMap::new();
-        let mut pages = vec![root_page];
-
-        while let Some(page) = pages.pop() {
-            match &*page {
-                Page::BRANCH(nodes) => {
-                    for branch in nodes {
-                        pages.push(Rc::new(self.get_page(branch.mp_pgno)?));
-                    }
-                },
-                Page::LEAF(nodes) => {
-                    for leaf in nodes {
-                        match leaf {
-                            LeafNode::Regular {
-                                key,
-                                value,
-                                ..
-                            } => {
-                                pairs.insert(key.to_vec(), value.to_vec());
-                            },
-                            LeafNode::BigData {
-                                mv_size,
-                                key,
-                                overflow_pgno,
-                                ..
-                            } => {
-                                // XXX perhaps we could reduce memory consumption
-                                // during a migration by waiting to read big data
-                                // until it's time to write it to the new database.
-                                let value = self.read_data(
-                                    *overflow_pgno * u64::from(PAGESIZE) + page_header_size(self.bits),
-                                    *mv_size as usize,
-                                )?;
-                                pairs.insert(key.to_vec(), value);
-                            },
-                            LeafNode::SubData {
-                                ..
-                            } => {
-                                // We don't include subdatabase leaves in pairs,
-                                // since there's no architecture-neutral
-                                // representation of them, and in any case they're
-                                // meta-data that should get recreated when we
-                                // migrate the subdatabases themselves.
-                                //
-                                // If we wanted to create identical dumps to those
-                                // produced by mdb_dump, however, we could allow
-                                // consumers to specify that they'd like to include
-                                // these records.
-                            },
-                        };
-                    }
-                },
-                _ => {
-                    return Err(MigrateError::UnexpectedPageVariant);
-                },
-            }
-        }
-
-        Ok(pairs)
-    }
-
-    fn read_data(&mut self, offset: u64, size: usize) -> MigrateResult<Vec<u8>> {
-        self.file.seek(SeekFrom::Start(offset))?;
-        let mut buf: Vec<u8> = vec![0; size];
-        self.file.read_exact(&mut buf[0..size])?;
-        Ok(buf.to_vec())
-    }
-
-    fn get_page(&mut self, page_no: u64) -> MigrateResult<Page> {
-        Page::new(self.read_data(page_no * u64::from(PAGESIZE), usize::from(PAGESIZE))?, self.bits)
-    }
-
-    fn get_meta_data(&mut self) -> MigrateResult<MetaData> {
-        let (page0, page1) = (self.get_page(0)?, self.get_page(1)?);
-
-        match (page0, page1) {
-            (Page::META(meta0), Page::META(meta1)) => {
-                let meta = if meta1.mm_txnid > meta0.mm_txnid {
-                    meta1
-                } else {
-                    meta0
-                };
-                if meta.mm_magic != 0xBE_EF_C0_DE {
-                    return Err(MigrateError::InvalidMagicNum);
-                }
-                if meta.mm_version != 1 && meta.mm_version != 999 {
-                    return Err(MigrateError::InvalidDataVersion);
-                }
-                Ok(meta)
-            },
-            _ => Err(MigrateError::UnexpectedPageVariant),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::MigrateResult;
-    use super::Migrator;
-    use crate::error::MigrateError;
-    use lmdb::{
-        Environment,
-        Error as LmdbError,
-    };
-    use std::{
-        env,
-        fs::{
-            self,
-            File,
-        },
-        io::{
-            Read,
-            Seek,
-            SeekFrom,
-        },
-        mem::size_of,
-        path::PathBuf,
-    };
-    use tempfile::{
-        tempdir,
-        tempfile,
-    };
-
-    fn compare_files(ref_file: &mut File, new_file: &mut File) -> MigrateResult<()> {
-        ref_file.seek(SeekFrom::Start(0))?;
-        new_file.seek(SeekFrom::Start(0))?;
-
-        let ref_buf = &mut [0; 1024];
-        let new_buf = &mut [0; 1024];
-
-        loop {
-            match ref_file.read(ref_buf) {
-                Err(err) => panic!(err),
-                Ok(ref_len) => match new_file.read(new_buf) {
-                    Err(err) => panic!(err),
-                    Ok(new_len) => {
-                        assert_eq!(ref_len, new_len);
-                        if ref_len == 0 {
-                            break;
-                        };
-                        assert_eq!(ref_buf[0..ref_len], new_buf[0..new_len]);
-                    },
-                },
-            }
-        }
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_dump_32() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_32"].iter().collect();
-
-        // Dump data from the test env to a new dump file.
-        let mut migrator = Migrator::new(&test_env_path)?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(None, &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_dump_32_subdb() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_32"].iter().collect();
-
-        // Dump data from the test env to a new dump file.
-        let mut migrator = Migrator::new(&test_env_path)?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(Some("subdb"), &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump_subdb.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_dump_64() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_64"].iter().collect();
-
-        // Dump data from the test env to a new dump file.
-        let mut migrator = Migrator::new(&test_env_path)?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(None, &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_dump_64_subdb() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_64"].iter().collect();
-
-        // Dump data from the test env to a new dump file.
-        let mut migrator = Migrator::new(&test_env_path)?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(Some("subdb"), &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump_subdb.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_migrate_64() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_64"].iter().collect();
-
-        // Migrate data from the old env to a new one.
-        let new_env = tempdir()?;
-        let mut migrator = Migrator::new(&test_env_path)?;
-        migrator.migrate(new_env.path())?;
-
-        // Dump data from the new env to a new dump file.
-        let mut migrator = Migrator::new(&new_env.path())?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(Some("subdb"), &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump_subdb.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_migrate_32() -> MigrateResult<()> {
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", "ref_env_32"].iter().collect();
-
-        // Migrate data from the old env to a new one.
-        let new_env = tempdir()?;
-        let mut migrator = Migrator::new(&test_env_path)?;
-        migrator.migrate(new_env.path())?;
-
-        // Dump data from the new env to a new dump file.
-        let mut migrator = Migrator::new(&new_env.path())?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(Some("subdb"), &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump_subdb.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_migrate_and_replace() -> MigrateResult<()> {
-        let test_env_name = match size_of::<usize>() {
-            4 => "ref_env_64",
-            8 => "ref_env_32",
-            _ => panic!("only 32- and 64-bit depths are supported"),
-        };
-
-        let cwd = env::current_dir()?;
-        let cwd = cwd.to_str().ok_or(MigrateError::StringConversionError)?;
-        let test_env_path: PathBuf = [cwd, "tests", "envs", test_env_name].iter().collect();
-
-        let old_env = tempdir()?;
-        fs::copy(test_env_path.join("data.mdb"), old_env.path().join("data.mdb"))?;
-        fs::copy(test_env_path.join("lock.mdb"), old_env.path().join("lock.mdb"))?;
-
-        // Confirm that it isn't possible to open the old environment with LMDB.
-        assert_eq!(
-            match Environment::new().open(&old_env.path()) {
-                Err(err) => err,
-                _ => panic!("opening the environment should have failed"),
-            },
-            LmdbError::Invalid
-        );
-
-        // Migrate data from the old env to a new one.
-        let new_env = tempdir()?;
-        let mut migrator = Migrator::new(&old_env.path())?;
-        migrator.migrate(new_env.path())?;
-
-        // Dump data from the new env to a new dump file.
-        let mut migrator = Migrator::new(&new_env.path())?;
-        let mut new_dump_file = tempfile()?;
-        migrator.dump(Some("subdb"), &new_dump_file)?;
-
-        // Open the reference dump file.
-        let ref_dump_file_path: PathBuf = [cwd, "tests", "envs", "ref_dump_subdb.txt"].iter().collect();
-        let mut ref_dump_file = File::open(ref_dump_file_path)?;
-
-        // Compare the new dump file to the reference dump file.
-        compare_files(&mut ref_dump_file, &mut new_dump_file)?;
-
-        // Overwrite the old env's files with the new env's files and confirm
-        // that it's now possible to open the old env with LMDB.
-        fs::copy(new_env.path().join("data.mdb"), old_env.path().join("data.mdb"))?;
-        fs::copy(new_env.path().join("lock.mdb"), old_env.path().join("lock.mdb"))?;
-        assert!(Environment::new().open(&old_env.path()).is_ok());
-
-        Ok(())
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/readwrite.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/readwrite.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/readwrite.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/readwrite.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use lmdb::{
-    Database,
-    RoCursor,
-    RoTransaction,
-    RwTransaction,
-    Transaction,
-    WriteFlags,
-};
-
-use crate::error::StoreError;
-use crate::read_transform;
-use crate::value::Value;
-
-pub struct Reader<'env>(pub RoTransaction<'env>);
-pub struct Writer<'env>(pub RwTransaction<'env>);
-
-pub trait Readable {
-    fn get<K: AsRef<[u8]>>(&self, db: Database, k: &K) -> Result<Option<Value>, StoreError>;
-    fn open_ro_cursor(&self, db: Database) -> Result<RoCursor, StoreError>;
-}
-
-impl<'env> Readable for Reader<'env> {
-    fn get<K: AsRef<[u8]>>(&self, db: Database, k: &K) -> Result<Option<Value>, StoreError> {
-        let bytes = self.0.get(db, &k);
-        read_transform(bytes)
-    }
-
-    fn open_ro_cursor(&self, db: Database) -> Result<RoCursor, StoreError> {
-        self.0.open_ro_cursor(db).map_err(StoreError::LmdbError)
-    }
-}
-
-impl<'env> Reader<'env> {
-    pub(crate) fn new(txn: RoTransaction) -> Reader {
-        Reader(txn)
-    }
-
-    pub fn abort(self) {
-        self.0.abort();
-    }
-}
-
-impl<'env> Readable for Writer<'env> {
-    fn get<K: AsRef<[u8]>>(&self, db: Database, k: &K) -> Result<Option<Value>, StoreError> {
-        let bytes = self.0.get(db, &k);
-        read_transform(bytes)
-    }
-
-    fn open_ro_cursor(&self, db: Database) -> Result<RoCursor, StoreError> {
-        self.0.open_ro_cursor(db).map_err(StoreError::LmdbError)
-    }
-}
-
-impl<'env> Writer<'env> {
-    pub(crate) fn new(txn: RwTransaction) -> Writer {
-        Writer(txn)
-    }
-
-    pub fn commit(self) -> Result<(), StoreError> {
-        self.0.commit().map_err(StoreError::LmdbError)
-    }
-
-    pub fn abort(self) {
-        self.0.abort();
-    }
-
-    pub(crate) fn put<K: AsRef<[u8]>>(
-        &mut self,
-        db: Database,
-        k: &K,
-        v: &Value,
-        flags: WriteFlags,
-    ) -> Result<(), StoreError> {
-        // TODO: don't allocate twice.
-        self.0.put(db, &k, &v.to_bytes()?, flags).map_err(StoreError::LmdbError)
-    }
-
-    pub(crate) fn delete<K: AsRef<[u8]>>(&mut self, db: Database, k: &K, v: Option<&[u8]>) -> Result<(), StoreError> {
-        self.0.del(db, &k, v).map_err(StoreError::LmdbError)
-    }
-
-    pub(crate) fn clear(&mut self, db: Database) -> Result<(), StoreError> {
-        self.0.clear_db(db).map_err(StoreError::LmdbError)
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/integermulti.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/integermulti.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/integermulti.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/integermulti.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-// Copyright 2018 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use lmdb::{
-    Database,
-    WriteFlags,
-};
-
-use std::marker::PhantomData;
-
-use crate::error::StoreError;
-
-use crate::readwrite::{
-    Readable,
-    Writer,
-};
-
-use crate::value::Value;
-
-use crate::store::multi::{
-    Iter,
-    MultiStore,
-};
-
-use crate::store::integer::{
-    Key,
-    PrimitiveInt,
-};
-
-pub struct MultiIntegerStore<K>
-where
-    K: PrimitiveInt,
-{
-    inner: MultiStore,
-    phantom: PhantomData<K>,
-}
-
-impl<K> MultiIntegerStore<K>
-where
-    K: PrimitiveInt,
-{
-    pub(crate) fn new(db: Database) -> MultiIntegerStore<K> {
-        MultiIntegerStore {
-            inner: MultiStore::new(db),
-            phantom: PhantomData,
-        }
-    }
-
-    pub fn get<'env, T: Readable>(&self, reader: &'env T, k: K) -> Result<Iter<'env>, StoreError> {
-        self.inner.get(reader, Key::new(&k)?)
-    }
-
-    pub fn get_first<'env, T: Readable>(&self, reader: &'env T, k: K) -> Result<Option<Value<'env>>, StoreError> {
-        self.inner.get_first(reader, Key::new(&k)?)
-    }
-
-    pub fn put(&self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        self.inner.put(writer, Key::new(&k)?, v)
-    }
-
-    pub fn put_with_flags(&self, writer: &mut Writer, k: K, v: &Value, flags: WriteFlags) -> Result<(), StoreError> {
-        self.inner.put_with_flags(writer, Key::new(&k)?, v, flags)
-    }
-
-    pub fn delete_all(&self, writer: &mut Writer, k: K) -> Result<(), StoreError> {
-        self.inner.delete_all(writer, Key::new(&k)?)
-    }
-
-    pub fn delete(&self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        self.inner.delete(writer, Key::new(&k)?, v)
-    }
-
-    pub fn clear(&self, writer: &mut Writer) -> Result<(), StoreError> {
-        self.inner.clear(writer)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    extern crate tempfile;
-
-    use self::tempfile::Builder;
-    use std::fs;
-
-    use super::*;
-    use crate::*;
-
-    #[test]
-    fn test_integer_keys() {
-        let root = Builder::new().prefix("test_integer_keys").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-        macro_rules! test_integer_keys {
-            ($type:ty, $key:expr) => {{
-                let mut writer = k.write().expect("writer");
-
-                s.put(&mut writer, $key, &Value::Str("hello!")).expect("write");
-                assert_eq!(s.get_first(&writer, $key).expect("read"), Some(Value::Str("hello!")));
-                writer.commit().expect("committed");
-
-                let reader = k.read().expect("reader");
-                assert_eq!(s.get_first(&reader, $key).expect("read"), Some(Value::Str("hello!")));
-            }};
-        }
-
-        test_integer_keys!(u32, std::u32::MIN);
-        test_integer_keys!(u32, std::u32::MAX);
-    }
-
-    #[test]
-    fn test_clear() {
-        let root = Builder::new().prefix("test_multi_integer_clear").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-        {
-            let mut writer = k.write().expect("writer");
-            s.put(&mut writer, 1, &Value::Str("hello!")).expect("write");
-            s.put(&mut writer, 1, &Value::Str("hello1!")).expect("write");
-            s.put(&mut writer, 2, &Value::Str("hello!")).expect("write");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            s.clear(&mut writer).expect("cleared");
-            writer.commit().expect("committed");
-
-            let reader = k.read().expect("reader");
-            assert_eq!(s.get_first(&reader, 1).expect("read"), None);
-            assert_eq!(s.get_first(&reader, 2).expect("read"), None);
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/integer.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/integer.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/integer.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/integer.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use std::marker::PhantomData;
-
-use bincode::serialize;
-
-use serde::Serialize;
-
-use lmdb::Database;
-
-use crate::error::{
-    DataError,
-    StoreError,
-};
-
-use crate::readwrite::{
-    Readable,
-    Writer,
-};
-
-use crate::value::Value;
-
-use crate::store::single::SingleStore;
-
-pub trait EncodableKey {
-    fn to_bytes(&self) -> Result<Vec<u8>, DataError>;
-}
-
-pub trait PrimitiveInt: EncodableKey {}
-
-impl PrimitiveInt for u32 {}
-
-impl<T> EncodableKey for T
-where
-    T: Serialize,
-{
-    fn to_bytes(&self) -> Result<Vec<u8>, DataError> {
-        serialize(self) // TODO: limited key length.
-            .map_err(Into::into)
-    }
-}
-
-pub(crate) struct Key<K> {
-    bytes: Vec<u8>,
-    phantom: PhantomData<K>,
-}
-
-impl<K> AsRef<[u8]> for Key<K>
-where
-    K: EncodableKey,
-{
-    fn as_ref(&self) -> &[u8] {
-        self.bytes.as_ref()
-    }
-}
-
-impl<K> Key<K>
-where
-    K: EncodableKey,
-{
-    #[allow(clippy::new_ret_no_self)]
-    pub(crate) fn new(k: &K) -> Result<Key<K>, DataError> {
-        Ok(Key {
-            bytes: k.to_bytes()?,
-            phantom: PhantomData,
-        })
-    }
-}
-
-pub struct IntegerStore<K>
-where
-    K: PrimitiveInt,
-{
-    inner: SingleStore,
-    phantom: PhantomData<K>,
-}
-
-impl<K> IntegerStore<K>
-where
-    K: PrimitiveInt,
-{
-    pub(crate) fn new(db: Database) -> IntegerStore<K> {
-        IntegerStore {
-            inner: SingleStore::new(db),
-            phantom: PhantomData,
-        }
-    }
-
-    pub fn get<'env, T: Readable>(&self, reader: &'env T, k: K) -> Result<Option<Value<'env>>, StoreError> {
-        self.inner.get(reader, Key::new(&k)?)
-    }
-
-    pub fn put(&self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        self.inner.put(writer, Key::new(&k)?, v)
-    }
-
-    pub fn delete(&self, writer: &mut Writer, k: K) -> Result<(), StoreError> {
-        self.inner.delete(writer, Key::new(&k)?)
-    }
-
-    pub fn clear(&self, writer: &mut Writer) -> Result<(), StoreError> {
-        self.inner.clear(writer)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::fs;
-    use tempfile::Builder;
-
-    use super::*;
-    use crate::*;
-
-    #[test]
-    fn test_integer_keys() {
-        let root = Builder::new().prefix("test_integer_keys").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s = k.open_integer("s", StoreOptions::create()).expect("open");
-
-        macro_rules! test_integer_keys {
-            ($type:ty, $key:expr) => {{
-                let mut writer = k.write().expect("writer");
-
-                s.put(&mut writer, $key, &Value::Str("hello!")).expect("write");
-                assert_eq!(s.get(&writer, $key).expect("read"), Some(Value::Str("hello!")));
-                writer.commit().expect("committed");
-
-                let reader = k.read().expect("reader");
-                assert_eq!(s.get(&reader, $key).expect("read"), Some(Value::Str("hello!")));
-            }};
-        }
-
-        test_integer_keys!(u32, std::u32::MIN);
-        test_integer_keys!(u32, std::u32::MAX);
-    }
-
-    #[test]
-    fn test_clear() {
-        let root = Builder::new().prefix("test_integer_clear").tempdir().expect("tempdir");
-        fs::create_dir_all(root.path()).expect("dir created");
-        let k = Rkv::new(root.path()).expect("new succeeded");
-        let s = k.open_integer("s", StoreOptions::create()).expect("open");
-
-        {
-            let mut writer = k.write().expect("writer");
-            s.put(&mut writer, 1, &Value::Str("hello!")).expect("write");
-            s.put(&mut writer, 2, &Value::Str("hello!")).expect("write");
-            s.put(&mut writer, 3, &Value::Str("hello!")).expect("write");
-            writer.commit().expect("committed");
-        }
-
-        {
-            let mut writer = k.write().expect("writer");
-            s.clear(&mut writer).expect("cleared");
-            writer.commit().expect("committed");
-
-            let reader = k.read().expect("reader");
-            assert_eq!(s.get(&reader, 1).expect("read"), None);
-            assert_eq!(s.get(&reader, 2).expect("read"), None);
-            assert_eq!(s.get(&reader, 3).expect("read"), None);
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/multi.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/multi.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/multi.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/multi.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-// Copyright 2018 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use crate::{
-    error::StoreError,
-    read_transform,
-    readwrite::{
-        Readable,
-        Writer,
-    },
-    value::Value,
-};
-use lmdb::{
-    Cursor,
-    Database,
-    Iter as LmdbIter,
-    //    IterDup as LmdbIterDup,
-    RoCursor,
-    WriteFlags,
-};
-
-#[derive(Copy, Clone)]
-pub struct MultiStore {
-    db: Database,
-}
-
-pub struct Iter<'env> {
-    iter: LmdbIter<'env>,
-    cursor: RoCursor<'env>,
-}
-
-impl MultiStore {
-    pub(crate) fn new(db: Database) -> MultiStore {
-        MultiStore {
-            db,
-        }
-    }
-
-    /// Provides a cursor to all of the values for the duplicate entries that match this key
-    pub fn get<T: Readable, K: AsRef<[u8]>>(self, reader: &T, k: K) -> Result<Iter, StoreError> {
-        let mut cursor = reader.open_ro_cursor(self.db)?;
-        let iter = cursor.iter_dup_of(k);
-        Ok(Iter {
-            iter,
-            cursor,
-        })
-    }
-
-    /// Provides the first value that matches this key
-    pub fn get_first<T: Readable, K: AsRef<[u8]>>(self, reader: &T, k: K) -> Result<Option<Value>, StoreError> {
-        reader.get(self.db, &k)
-    }
-
-    /// Insert a value at the specified key.
-    /// This put will allow duplicate entries.  If you wish to have duplicate entries
-    /// rejected, use the `put_with_flags` function and specify NO_DUP_DATA
-    pub fn put<K: AsRef<[u8]>>(self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        writer.put(self.db, &k, v, WriteFlags::empty())
-    }
-
-    pub fn put_with_flags<K: AsRef<[u8]>>(
-        self,
-        writer: &mut Writer,
-        k: K,
-        v: &Value,
-        flags: WriteFlags,
-    ) -> Result<(), StoreError> {
-        writer.put(self.db, &k, v, flags)
-    }
-
-    pub fn delete_all<K: AsRef<[u8]>>(self, writer: &mut Writer, k: K) -> Result<(), StoreError> {
-        writer.delete(self.db, &k, None)
-    }
-
-    pub fn delete<K: AsRef<[u8]>>(self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        writer.delete(self.db, &k, Some(&v.to_bytes()?))
-    }
-
-    /* TODO - Figure out how to solve the need to have the cursor stick around when
-     *        we are producing iterators from MultiIter
-    /// Provides an iterator starting at the lexographically smallest value in the store
-    pub fn iter_start(&self, store: MultiStore) -> Result<MultiIter, StoreError> {
-        let mut cursor = self.tx.open_ro_cursor(store.0).map_err(StoreError::LmdbError)?;
-
-        // We call Cursor.iter() instead of Cursor.iter_start() because
-        // the latter panics at "called `Result::unwrap()` on an `Err` value:
-        // NotFound" when there are no items in the store, whereas the former
-        // returns an iterator that yields no items.
-        //
-        // And since we create the Cursor and don't change its position, we can
-        // be sure that a call to Cursor.iter() will start at the beginning.
-        //
-        let iter = cursor.iter_dup();
-
-        Ok(MultiIter {
-            iter,
-            cursor,
-        })
-    }
-    */
-
-    pub fn clear(self, writer: &mut Writer) -> Result<(), StoreError> {
-        writer.clear(self.db)
-    }
-}
-
-/*
-fn read_transform_owned(val: Result<&[u8], lmdb::Error>) -> Result<Option<OwnedValue>, StoreError> {
-    match val {
-        Ok(bytes) => Value::from_tagged_slice(bytes).map(|v| Some(OwnedValue::from(&v))).map_err(StoreError::DataError),
-        Err(lmdb::Error::NotFound) => Ok(None),
-        Err(e) => Err(StoreError::LmdbError(e)),
-    }
-}
-
-impl<'env> Iterator for MultiIter<'env> {
-    type Item = Iter<'env>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.iter.next() {
-            None => None,
-            Some(iter) => Some(Iter {
-                iter,
-                cursor,
-            }),
-        }
-    }
-}
-*/
-
-impl<'env> Iterator for Iter<'env> {
-    type Item = Result<(&'env [u8], Option<Value<'env>>), StoreError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.iter.next() {
-            None => None,
-            Some(Ok((key, bytes))) => match read_transform(Ok(bytes)) {
-                Ok(val) => Some(Ok((key, val))),
-                Err(err) => Some(Err(err)),
-            },
-            Some(Err(err)) => Some(Err(StoreError::LmdbError(err))),
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/single.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/single.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store/single.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store/single.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-// Copyright 2018 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use crate::{
-    error::StoreError,
-    read_transform,
-    readwrite::{
-        Readable,
-        Writer,
-    },
-    value::Value,
-};
-use lmdb::{
-    Cursor,
-    Database,
-    Iter as LmdbIter,
-    RoCursor,
-    WriteFlags,
-};
-
-#[derive(Copy, Clone)]
-pub struct SingleStore {
-    db: Database,
-}
-
-pub struct Iter<'env> {
-    iter: LmdbIter<'env>,
-    cursor: RoCursor<'env>,
-}
-
-impl SingleStore {
-    pub(crate) fn new(db: Database) -> SingleStore {
-        SingleStore {
-            db,
-        }
-    }
-
-    pub fn get<T: Readable, K: AsRef<[u8]>>(self, reader: &T, k: K) -> Result<Option<Value>, StoreError> {
-        reader.get(self.db, &k)
-    }
-
-    // TODO: flags
-    pub fn put<K: AsRef<[u8]>>(self, writer: &mut Writer, k: K, v: &Value) -> Result<(), StoreError> {
-        writer.put(self.db, &k, v, WriteFlags::empty())
-    }
-
-    pub fn delete<K: AsRef<[u8]>>(self, writer: &mut Writer, k: K) -> Result<(), StoreError> {
-        writer.delete(self.db, &k, None)
-    }
-
-    pub fn iter_start<T: Readable>(self, reader: &T) -> Result<Iter, StoreError> {
-        let mut cursor = reader.open_ro_cursor(self.db)?;
-
-        // We call Cursor.iter() instead of Cursor.iter_start() because
-        // the latter panics at "called `Result::unwrap()` on an `Err` value:
-        // NotFound" when there are no items in the store, whereas the former
-        // returns an iterator that yields no items.
-        //
-        // And since we create the Cursor and don't change its position, we can
-        // be sure that a call to Cursor.iter() will start at the beginning.
-        //
-        let iter = cursor.iter();
-
-        Ok(Iter {
-            iter,
-            cursor,
-        })
-    }
-
-    pub fn iter_from<T: Readable, K: AsRef<[u8]>>(self, reader: &T, k: K) -> Result<Iter, StoreError> {
-        let mut cursor = reader.open_ro_cursor(self.db)?;
-        let iter = cursor.iter_from(k);
-        Ok(Iter {
-            iter,
-            cursor,
-        })
-    }
-
-    pub fn clear(self, writer: &mut Writer) -> Result<(), StoreError> {
-        writer.clear(self.db)
-    }
-}
-
-impl<'env> Iterator for Iter<'env> {
-    type Item = Result<(&'env [u8], Option<Value<'env>>), StoreError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.iter.next() {
-            None => None,
-            Some(Ok((key, bytes))) => match read_transform(Ok(bytes)) {
-                Ok(val) => Some(Ok((key, val))),
-                Err(err) => Some(Err(err)),
-            },
-            Some(Err(err)) => Some(Err(StoreError::LmdbError(err))),
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/store.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/store.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-pub mod integer;
-pub mod integermulti;
-pub mod multi;
-pub mod single;
-
-use lmdb::DatabaseFlags;
-
-#[derive(Default, Debug, Copy, Clone)]
-pub struct Options {
-    pub create: bool,
-    pub flags: DatabaseFlags,
-}
-
-impl Options {
-    pub fn create() -> Options {
-        Options {
-            create: true,
-            flags: DatabaseFlags::empty(),
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/value.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/value.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/src/value.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/src/value.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,265 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use arrayref::array_ref;
-use bincode::{
-    deserialize,
-    serialize,
-    serialized_size,
-};
-use ordered_float::OrderedFloat;
-
-use uuid::{
-    Bytes,
-    Uuid,
-};
-
-use crate::error::DataError;
-
-/// We define a set of types, associated with simple integers, to annotate values
-/// stored in LMDB. This is to avoid an accidental 'cast' from a value of one type
-/// to another. For this reason we don't simply use `deserialize` from the `bincode`
-/// crate.
-#[repr(u8)]
-#[derive(Debug, PartialEq, Eq)]
-pub enum Type {
-    Bool = 1,
-    U64 = 2,
-    I64 = 3,
-    F64 = 4,
-    Instant = 5, // Millisecond-precision timestamp.
-    Uuid = 6,
-    Str = 7,
-    Json = 8,
-    Blob = 9,
-}
-
-/// We use manual tagging, because <https://github.com/serde-rs/serde/issues/610>.
-impl Type {
-    pub fn from_tag(tag: u8) -> Result<Type, DataError> {
-        Type::from_primitive(tag).ok_or_else(|| DataError::UnknownType(tag))
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn to_tag(self) -> u8 {
-        self as u8
-    }
-
-    fn from_primitive(p: u8) -> Option<Type> {
-        match p {
-            1 => Some(Type::Bool),
-            2 => Some(Type::U64),
-            3 => Some(Type::I64),
-            4 => Some(Type::F64),
-            5 => Some(Type::Instant),
-            6 => Some(Type::Uuid),
-            7 => Some(Type::Str),
-            8 => Some(Type::Json),
-            9 => Some(Type::Blob),
-            _ => None,
-        }
-    }
-}
-
-impl ::std::fmt::Display for Type {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error> {
-        f.write_str(match *self {
-            Type::Bool => "bool",
-            Type::U64 => "u64",
-            Type::I64 => "i64",
-            Type::F64 => "f64",
-            Type::Instant => "instant",
-            Type::Uuid => "uuid",
-            Type::Str => "str",
-            Type::Json => "json",
-            Type::Blob => "blob",
-        })
-    }
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum Value<'s> {
-    Bool(bool),
-    U64(u64),
-    I64(i64),
-    F64(OrderedFloat<f64>),
-    Instant(i64), // Millisecond-precision timestamp.
-    Uuid(&'s Bytes),
-    Str(&'s str),
-    Json(&'s str),
-    Blob(&'s [u8]),
-}
-
-#[derive(Clone, Debug, PartialEq)]
-pub enum OwnedValue {
-    Bool(bool),
-    U64(u64),
-    I64(i64),
-    F64(f64),
-    Instant(i64), // Millisecond-precision timestamp.
-    Uuid(Uuid),
-    Str(String),
-    Json(String), // TODO
-    Blob(Vec<u8>),
-}
-
-fn uuid(bytes: &[u8]) -> Result<Value, DataError> {
-    if bytes.len() == 16 {
-        Ok(Value::Uuid(array_ref![bytes, 0, 16]))
-    } else {
-        Err(DataError::InvalidUuid)
-    }
-}
-
-impl<'s> Value<'s> {
-    fn expected_from_tagged_slice(expected: Type, slice: &'s [u8]) -> Result<Value<'s>, DataError> {
-        let (tag, data) = slice.split_first().ok_or(DataError::Empty)?;
-        let t = Type::from_tag(*tag)?;
-        if t == expected {
-            return Err(DataError::UnexpectedType {
-                expected,
-                actual: t,
-            });
-        }
-        Value::from_type_and_data(t, data)
-    }
-
-    pub fn from_tagged_slice(slice: &'s [u8]) -> Result<Value<'s>, DataError> {
-        let (tag, data) = slice.split_first().ok_or(DataError::Empty)?;
-        let t = Type::from_tag(*tag)?;
-        Value::from_type_and_data(t, data)
-    }
-
-    fn from_type_and_data(t: Type, data: &'s [u8]) -> Result<Value<'s>, DataError> {
-        if t == Type::Uuid {
-            return deserialize(data)
-                .map_err(|e| DataError::DecodingError {
-                    value_type: t,
-                    err: e,
-                })
-                .map(uuid)?;
-        }
-
-        match t {
-            Type::Bool => deserialize(data).map(Value::Bool),
-            Type::U64 => deserialize(data).map(Value::U64),
-            Type::I64 => deserialize(data).map(Value::I64),
-            Type::F64 => deserialize(data).map(OrderedFloat).map(Value::F64),
-            Type::Instant => deserialize(data).map(Value::Instant),
-            Type::Str => deserialize(data).map(Value::Str),
-            Type::Json => deserialize(data).map(Value::Json),
-            Type::Blob => deserialize(data).map(Value::Blob),
-            Type::Uuid => {
-                // Processed above to avoid verbose duplication of error transforms.
-                unreachable!()
-            },
-        }
-        .map_err(|e| DataError::DecodingError {
-            value_type: t,
-            err: e,
-        })
-    }
-
-    pub fn to_bytes(&self) -> Result<Vec<u8>, DataError> {
-        match self {
-            Value::Bool(v) => serialize(&(Type::Bool.to_tag(), *v)),
-            Value::U64(v) => serialize(&(Type::U64.to_tag(), *v)),
-            Value::I64(v) => serialize(&(Type::I64.to_tag(), *v)),
-            Value::F64(v) => serialize(&(Type::F64.to_tag(), v.0)),
-            Value::Instant(v) => serialize(&(Type::Instant.to_tag(), *v)),
-            Value::Str(v) => serialize(&(Type::Str.to_tag(), v)),
-            Value::Json(v) => serialize(&(Type::Json.to_tag(), v)),
-            Value::Blob(v) => serialize(&(Type::Blob.to_tag(), v)),
-            Value::Uuid(v) => serialize(&(Type::Uuid.to_tag(), v)),
-        }
-        .map_err(DataError::EncodingError)
-    }
-
-    pub fn serialized_size(&self) -> Result<u64, DataError> {
-        match self {
-            Value::Bool(v) => serialized_size(&(Type::Bool.to_tag(), *v)),
-            Value::U64(v) => serialized_size(&(Type::U64.to_tag(), *v)),
-            Value::I64(v) => serialized_size(&(Type::I64.to_tag(), *v)),
-            Value::F64(v) => serialized_size(&(Type::F64.to_tag(), v.0)),
-            Value::Instant(v) => serialized_size(&(Type::Instant.to_tag(), *v)),
-            Value::Str(v) => serialized_size(&(Type::Str.to_tag(), v)),
-            Value::Json(v) => serialized_size(&(Type::Json.to_tag(), v)),
-            Value::Blob(v) => serialized_size(&(Type::Blob.to_tag(), v)),
-            Value::Uuid(v) => serialized_size(&(Type::Uuid.to_tag(), v)),
-        }
-        .map_err(DataError::EncodingError)
-    }
-}
-
-impl<'s> From<&'s Value<'s>> for OwnedValue {
-    fn from(value: &Value) -> OwnedValue {
-        match value {
-            Value::Bool(v) => OwnedValue::Bool(*v),
-            Value::U64(v) => OwnedValue::U64(*v),
-            Value::I64(v) => OwnedValue::I64(*v),
-            Value::F64(v) => OwnedValue::F64(**v),
-            Value::Instant(v) => OwnedValue::Instant(*v),
-            Value::Uuid(v) => OwnedValue::Uuid(Uuid::from_bytes(**v)),
-            Value::Str(v) => OwnedValue::Str(v.to_string()),
-            Value::Json(v) => OwnedValue::Json(v.to_string()),
-            Value::Blob(v) => OwnedValue::Blob(v.to_vec()),
-        }
-    }
-}
-
-impl<'s> From<&'s OwnedValue> for Value<'s> {
-    fn from(value: &OwnedValue) -> Value {
-        match value {
-            OwnedValue::Bool(v) => Value::Bool(*v),
-            OwnedValue::U64(v) => Value::U64(*v),
-            OwnedValue::I64(v) => Value::I64(*v),
-            OwnedValue::F64(v) => Value::F64(OrderedFloat::from(*v)),
-            OwnedValue::Instant(v) => Value::Instant(*v),
-            OwnedValue::Uuid(v) => Value::Uuid(v.as_bytes()),
-            OwnedValue::Str(v) => Value::Str(v),
-            OwnedValue::Json(v) => Value::Json(v),
-            OwnedValue::Blob(v) => Value::Blob(v),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use ordered_float::OrderedFloat;
-
-    #[test]
-    fn test_value_serialized_size() {
-        // | Value enum    | tag: 1 byte   |     value_payload        |
-        // |----------------------------------------------------------|
-        // |   I64         |     1         |       8                  |
-        // |   U64         |     1         |       8                  |
-        // |   Bool        |     1         |       1                  |
-        // |   Instant     |     1         |       8                  |
-        // |   F64         |     1         |       8                  |
-        // |   Uuid        |     1         |       16                 |
-        // | Str/Blob/Json |     1         |(8: len + sizeof(payload))|
-        assert_eq!(Value::I64(-1000).serialized_size().unwrap(), 9);
-        assert_eq!(Value::U64(1000u64).serialized_size().unwrap(), 9);
-        assert_eq!(Value::Bool(true).serialized_size().unwrap(), 2);
-        assert_eq!(Value::Instant(1_558_020_865_224).serialized_size().unwrap(), 9);
-        assert_eq!(Value::F64(OrderedFloat(10000.1)).serialized_size().unwrap(), 9);
-        assert_eq!(Value::Str("hello!").serialized_size().unwrap(), 15);
-        assert_eq!(Value::Str("¡Hola").serialized_size().unwrap(), 15);
-        assert_eq!(Value::Blob(b"hello!").serialized_size().unwrap(), 15);
-        assert_eq!(
-            uuid(b"\x9f\xe2\xc4\xe9\x3f\x65\x4f\xdb\xb2\x4c\x02\xb1\x52\x59\x71\x6c")
-                .unwrap()
-                .serialized_size()
-                .unwrap(),
-            17
-        );
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/integer-store.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/integer-store.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/integer-store.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/integer-store.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use rkv::{
-    PrimitiveInt,
-    Rkv,
-    StoreOptions,
-    Value,
-};
-use serde_derive::Serialize;
-use std::fs;
-use tempfile::Builder;
-
-#[test]
-fn test_integer_keys() {
-    let root = Builder::new().prefix("test_integer_keys").tempdir().expect("tempdir");
-    fs::create_dir_all(root.path()).expect("dir created");
-    let k = Rkv::new(root.path()).expect("new succeeded");
-    let s = k.open_integer("s", StoreOptions::create()).expect("open");
-
-    macro_rules! test_integer_keys {
-        ($store:expr, $key:expr) => {{
-            let mut writer = k.write().expect("writer");
-
-            $store.put(&mut writer, $key, &Value::Str("hello!")).expect("write");
-            assert_eq!($store.get(&writer, $key).expect("read"), Some(Value::Str("hello!")));
-            writer.commit().expect("committed");
-
-            let reader = k.read().expect("reader");
-            assert_eq!($store.get(&reader, $key).expect("read"), Some(Value::Str("hello!")));
-        }};
-    }
-
-    // The integer module provides only the u32 integer key variant
-    // of IntegerStore, so we can use it without further ado.
-    test_integer_keys!(s, std::u32::MIN);
-    test_integer_keys!(s, std::u32::MAX);
-
-    // If you want to use another integer key variant, you need to implement
-    // a newtype, implement PrimitiveInt, and implement or derive Serialize
-    // for it.  Here we do so for the i32 type.
-
-    // DANGER!  Doing this enables you to open a store with multiple,
-    // different integer key types, which may result in unexpected behavior.
-    // Make sure you know what you're doing!
-
-    let t = k.open_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct I32(i32);
-    impl PrimitiveInt for I32 {}
-    test_integer_keys!(t, I32(std::i32::MIN));
-    test_integer_keys!(t, I32(std::i32::MAX));
-
-    let u = k.open_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct U16(u16);
-    impl PrimitiveInt for U16 {}
-    test_integer_keys!(u, U16(std::u16::MIN));
-    test_integer_keys!(u, U16(std::u16::MAX));
-
-    let v = k.open_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct U64(u64);
-    impl PrimitiveInt for U64 {}
-    test_integer_keys!(v, U64(std::u64::MIN));
-    test_integer_keys!(v, U64(std::u64::MAX));
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/manager.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/manager.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/manager.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/manager.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// Copyright 2018-2019 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use rkv::{
-    Manager,
-    Rkv,
-};
-use std::{
-    fs,
-    sync::Arc,
-};
-use tempfile::Builder;
-
-#[test]
-// Identical to the same-named unit test, but this one confirms that it works
-// via the public MANAGER singleton.
-fn test_same() {
-    let root = Builder::new().prefix("test_same_singleton").tempdir().expect("tempdir");
-    fs::create_dir_all(root.path()).expect("dir created");
-
-    let p = root.path();
-    assert!(Manager::singleton().read().unwrap().get(p).expect("success").is_none());
-
-    let created_arc = Manager::singleton().write().unwrap().get_or_create(p, Rkv::new).expect("created");
-    let fetched_arc = Manager::singleton().read().unwrap().get(p).expect("success").expect("existed");
-    assert!(Arc::ptr_eq(&created_arc, &fetched_arc));
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/multi-integer-store.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/multi-integer-store.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/multi-integer-store.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/multi-integer-store.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-// Copyright 2018 Mozilla
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-// this file except in compliance with the License. You may obtain a copy of the
-// License at http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-use rkv::{
-    PrimitiveInt,
-    Rkv,
-    StoreOptions,
-    Value,
-};
-use serde_derive::Serialize;
-use std::fs;
-use tempfile::Builder;
-
-#[test]
-fn test_multi_integer_keys() {
-    let root = Builder::new().prefix("test_integer_keys").tempdir().expect("tempdir");
-    fs::create_dir_all(root.path()).expect("dir created");
-    let k = Rkv::new(root.path()).expect("new succeeded");
-    let s = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-    macro_rules! test_integer_keys {
-        ($store:expr, $key:expr) => {{
-            let mut writer = k.write().expect("writer");
-
-            $store.put(&mut writer, $key, &Value::Str("hello1")).expect("write");
-            $store.put(&mut writer, $key, &Value::Str("hello2")).expect("write");
-            $store.put(&mut writer, $key, &Value::Str("hello3")).expect("write");
-            let vals = $store
-                .get(&writer, $key)
-                .expect("read")
-                .map(|result| result.expect("ok"))
-                .map(|(_, v)| v.expect("multi read"))
-                .collect::<Vec<Value>>();
-            assert_eq!(vals, vec![Value::Str("hello1"), Value::Str("hello2"), Value::Str("hello3")]);
-            writer.commit().expect("committed");
-
-            let reader = k.read().expect("reader");
-            let vals = $store
-                .get(&reader, $key)
-                .expect("read")
-                .map(|result| result.expect("ok"))
-                .map(|(_, v)| v.expect("multi read"))
-                .collect::<Vec<Value>>();
-            assert_eq!(vals, vec![Value::Str("hello1"), Value::Str("hello2"), Value::Str("hello3")]);
-        }};
-    }
-
-    // The integer module provides only the u32 integer key variant
-    // of IntegerStore, so we can use it without further ado.
-    test_integer_keys!(s, std::u32::MIN);
-    test_integer_keys!(s, std::u32::MAX);
-
-    // If you want to use another integer key variant, you need to implement
-    // a newtype, implement PrimitiveInt, and implement or derive Serialize
-    // for it.  Here we do so for the i32 type.
-
-    // DANGER!  Doing this enables you to open a store with multiple,
-    // different integer key types, which may result in unexpected behavior.
-    // Make sure you know what you're doing!
-
-    let t = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct I32(i32);
-    impl PrimitiveInt for I32 {}
-    test_integer_keys!(t, I32(std::i32::MIN));
-    test_integer_keys!(t, I32(std::i32::MAX));
-
-    let u = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct U16(u16);
-    impl PrimitiveInt for U16 {}
-    test_integer_keys!(u, U16(std::u16::MIN));
-    test_integer_keys!(u, U16(std::u16::MAX));
-
-    let v = k.open_multi_integer("s", StoreOptions::create()).expect("open");
-
-    #[derive(Serialize)]
-    struct U64(u64);
-    impl PrimitiveInt for U64 {}
-    test_integer_keys!(v, U64(std::u64::MIN));
-    test_integer_keys!(v, U64(std::u64::MAX));
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/test_txn.rs firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/test_txn.rs
--- firefox-84.0.2+build1/third_party/rust/rkv-0.10.4/tests/test_txn.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rkv-0.10.4/tests/test_txn.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/// consider a struct like this
-/// struct Sample {
-///     id: u64,
-///     value: String,
-///     date: String,
-/// }
-/// We would like to index all of the fields so that we can search for the struct not only by ID
-/// but also by value and date.  When we index the fields individually in their own tables, it
-/// is important that we run all operations within a single transaction to ensure coherence of
-/// the indices
-/// This test features helper functions for reading and writing the parts of the struct.
-/// Note that the reader functions take `Readable` because they might run within a Read
-/// Transaction or a Write Transaction.  The test demonstrates fetching values via both.
-use rkv::{
-    MultiStore,
-    Readable,
-    Rkv,
-    SingleStore,
-    StoreOptions,
-    Value,
-    Writer,
-};
-
-use tempfile::Builder;
-
-use std::fs;
-
-#[test]
-fn read_many() {
-    let root = Builder::new().prefix("test_txns").tempdir().expect("tempdir");
-    fs::create_dir_all(root.path()).expect("dir created");
-    let k = Rkv::new(root.path()).expect("new succeeded");
-    let samplestore = k.open_single("s", StoreOptions::create()).expect("open");
-    let datestore = k.open_multi("m", StoreOptions::create()).expect("open");
-    let valuestore = k.open_multi("m", StoreOptions::create()).expect("open");
-
-    {
-        let mut writer = k.write().expect("env write lock");
-
-        for id in 0..30_u64 {
-            let value = format!("value{}", id);
-            let date = format!("2019-06-{}", id);
-            put_id_field(&mut writer, datestore, &date, id);
-            put_id_field(&mut writer, valuestore, &value, id);
-            put_sample(&mut writer, samplestore, id, &value);
-        }
-
-        // now we read in the same transaction
-        for id in 0..30_u64 {
-            let value = format!("value{}", id);
-            let date = format!("2019-06-{}", id);
-            let ids = get_ids_by_field(&writer, datestore, &date);
-            let ids2 = get_ids_by_field(&writer, valuestore, &value);
-            let samples = get_samples(&writer, samplestore, &ids);
-            let samples2 = get_samples(&writer, samplestore, &ids2);
-            println!("{:?}, {:?}", samples, samples2);
-        }
-    }
-
-    {
-        let reader = k.read().expect("env read lock");
-        for id in 0..30_u64 {
-            let value = format!("value{}", id);
-            let date = format!("2019-06-{}", id);
-            let ids = get_ids_by_field(&reader, datestore, &date);
-            let ids2 = get_ids_by_field(&reader, valuestore, &value);
-            let samples = get_samples(&reader, samplestore, &ids);
-            let samples2 = get_samples(&reader, samplestore, &ids2);
-            println!("{:?}, {:?}", samples, samples2);
-        }
-    }
-}
-
-fn get_ids_by_field<Txn: Readable>(txn: &Txn, store: MultiStore, field: &str) -> Vec<u64> {
-    store
-        .get(txn, field)
-        .expect("get iterator")
-        .map(|id| match id.expect("field") {
-            (_, Some(Value::U64(id))) => id,
-            _ => panic!("getting value in iter"),
-        })
-        .collect::<Vec<u64>>()
-}
-
-fn get_samples<Txn: Readable>(txn: &Txn, samplestore: SingleStore, ids: &[u64]) -> Vec<String> {
-    ids.iter()
-        .map(|id| {
-            let bytes = id.to_be_bytes();
-            match samplestore.get(txn, &bytes).expect("fetch sample") {
-                Some(Value::Str(sample)) => String::from(sample),
-                Some(_) => panic!("wrong type"),
-                None => panic!("no sample for this id!"),
-            }
-        })
-        .collect::<Vec<String>>()
-}
-
-fn put_sample(txn: &mut Writer, samplestore: SingleStore, id: u64, value: &str) {
-    let idbytes = id.to_be_bytes();
-    samplestore.put(txn, &idbytes, &Value::Str(value)).expect("put id");
-}
-
-fn put_id_field(txn: &mut Writer, store: MultiStore, field: &str, id: u64) {
-    store.put(txn, field, &Value::U64(id)).expect("put id");
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/.cargo-checksum.json firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{".clang-format":"ff4e345608f7674dd1ee1f37b24d4030b260d82516a747093af141b3076a4164",".clang-tidy":"861bc5b367dc85f5fa103f2de9460e158de97f48c59c51a26784b7c2c481e3b7",".travis.yml":"a49b61a394520c39bb20c420b587e92ea9c8008764fef0368c4747b71b8f1561","CMakeLists.txt":"161ff8596a347890a6448cfe5881e298a76b01da1e1080ec383368de0e1f280a","Cargo.toml":"4620f1ade93dfa5fb6066987cff9b3a6a13a98bb667ae5338ad2082d5df634a3","LICENSE":"891d419ba95ab39090775820f4178421dbdcd241c080003aa44f62445a48615a","README.md":"4134bf685210fea56eb502124013f9b51121635f5269e7f3dbc4450322aaf8c1","c_src/CMakeLists.txt":"7208135bf7f2ca1443fec1ca0a3f992932f5b0635e6eb7da07b126b8520e5ef5","c_src/lucet_sandbox_wrapper.c":"08b2ab265127aca42b02c8a36e5450284d6794d86867a5808f854588183ab9d9","include/lucet_sandbox.h":"8d24bd5fbd4f717f0bb90b238a7b7fbdd212207297ddf1a723cc98ee13180c5b","include/rlbox_lucet_sandbox.hpp":"b8a4b86460e9b666ec92bf23db37578639a368005ccf4aa722032aaca8ae59db","src/callback.rs":"c40f92e017bc8f2f3136304c1f2d3ca683fe80a1bb505c0fa750cc372305020d","src/create.rs":"5d620a050c1990e7215346fe144a7be7c0e4bb396068ac81ae8b21fb1fdb3dca","src/invoke.rs":"d47b167c6048a3221f5e66a4acb5154bc5306bd1053acee56bfb87bb66c78879","src/lib.rs":"677f45b275101c116ea7acf2dafa77f9f1c5e3f379d4da3a9512c71a71878595","src/memory.rs":"8b27396ec4ddba18ac760052e9d11564fdc8c4e68271b817dfd13cefc97cf1a3","src/types.rs":"85907840c233aae0e234bcb5c1e107e76231b6518cc70a1c18be73edc2720742","test/test_lucet_sandbox_glue.cpp":"ea4eb3ace8e9a87550db44f61d065b45f31f1f5b774b4a3e0383e62962c0abf2","test/test_lucet_sandbox_glue_embedder_vars.cpp":"be6abfae367719b12edc5fd8f1de840abed9bb4a2efdebb19ed59e8796fb47b8","test/test_lucet_sandbox_glue_main.cpp":"fde2081cd8b0df3fd73fee1e36dfa5eccfb5bc825072c55a57fcf3048858dbd9","test/test_lucet_sandbox_glue_preload.cpp":"c986ac617327305fcc3ea33114667d4c833ee685c740e482ffde97de4f203e35"},"package":null}
\ No newline at end of file
+{"files":{".clang-format":"ff4e345608f7674dd1ee1f37b24d4030b260d82516a747093af141b3076a4164",".clang-tidy":"861bc5b367dc85f5fa103f2de9460e158de97f48c59c51a26784b7c2c481e3b7",".travis.yml":"a49b61a394520c39bb20c420b587e92ea9c8008764fef0368c4747b71b8f1561","CMakeLists.txt":"161ff8596a347890a6448cfe5881e298a76b01da1e1080ec383368de0e1f280a","Cargo.toml":"66ff60962b9b5cfb6b3bf0967d62d12cbdb70214ad310ba3f7201ae6b99f2955","LICENSE":"891d419ba95ab39090775820f4178421dbdcd241c080003aa44f62445a48615a","README.md":"d64cc632f6dc9178efe63cb717a9af3728e5536cc49d977dd2ddb126b6fe28e5","c_src/CMakeLists.txt":"7208135bf7f2ca1443fec1ca0a3f992932f5b0635e6eb7da07b126b8520e5ef5","c_src/lucet_sandbox_wrapper.c":"08b2ab265127aca42b02c8a36e5450284d6794d86867a5808f854588183ab9d9","include/lucet_sandbox.h":"8d24bd5fbd4f717f0bb90b238a7b7fbdd212207297ddf1a723cc98ee13180c5b","include/rlbox_lucet_sandbox.hpp":"b58ffed66d8b3e516c9847ef8da512dd4249b3d6f5ac01b062080b1564c9cddc","src/callback.rs":"c40f92e017bc8f2f3136304c1f2d3ca683fe80a1bb505c0fa750cc372305020d","src/create.rs":"5d620a050c1990e7215346fe144a7be7c0e4bb396068ac81ae8b21fb1fdb3dca","src/invoke.rs":"d47b167c6048a3221f5e66a4acb5154bc5306bd1053acee56bfb87bb66c78879","src/lib.rs":"677f45b275101c116ea7acf2dafa77f9f1c5e3f379d4da3a9512c71a71878595","src/memory.rs":"8b27396ec4ddba18ac760052e9d11564fdc8c4e68271b817dfd13cefc97cf1a3","src/types.rs":"85907840c233aae0e234bcb5c1e107e76231b6518cc70a1c18be73edc2720742","test/test_lucet_sandbox_glue.cpp":"ea4eb3ace8e9a87550db44f61d065b45f31f1f5b774b4a3e0383e62962c0abf2","test/test_lucet_sandbox_glue_embedder_vars.cpp":"be6abfae367719b12edc5fd8f1de840abed9bb4a2efdebb19ed59e8796fb47b8","test/test_lucet_sandbox_glue_main.cpp":"fde2081cd8b0df3fd73fee1e36dfa5eccfb5bc825072c55a57fcf3048858dbd9","test/test_lucet_sandbox_glue_preload.cpp":"c986ac617327305fcc3ea33114667d4c833ee685c740e482ffde97de4f203e35"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/Cargo.toml firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -8,10 +8,10 @@
 [dependencies]
 failure = ">=0.1.3"                    # Experimental error handling abstraction.
 goblin = ">=0.0.17"                    # An impish, cross-platform, ELF, Mach-o, and PE binary parsing and loading crate
-lucet-wasi = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="477d8fc53a64705a9d3fbcce9de92f4988558525", package = "lucet-wasi-wasmsbx" }
-lucet-runtime = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="477d8fc53a64705a9d3fbcce9de92f4988558525", package = "lucet-runtime-wasmsbx" }
-lucet-runtime-internals = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="477d8fc53a64705a9d3fbcce9de92f4988558525", package = "lucet-runtime-internals-wasmsbx" }
-lucet-module = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="477d8fc53a64705a9d3fbcce9de92f4988558525", package = "lucet-module-wasmsbx" }
+lucet-wasi = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="cd07861d1c92147b35b538e6f94fde7d1986f9ad", package = "lucet-wasi-wasmsbx" }
+lucet-runtime = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="cd07861d1c92147b35b538e6f94fde7d1986f9ad", package = "lucet-runtime-wasmsbx" }
+lucet-runtime-internals = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="cd07861d1c92147b35b538e6f94fde7d1986f9ad", package = "lucet-runtime-internals-wasmsbx" }
+lucet-module = { git = "https://github.com/PLSysSec/lucet_sandbox_compiler", rev="cd07861d1c92147b35b538e6f94fde7d1986f9ad", package = "lucet-module-wasmsbx" }
 # lucet-wasi = { path = "../lucet_sandbox_compiler/lucet-wasi", package = "lucet-wasi-wasmsbx" }
 # lucet-runtime = { path = "../lucet_sandbox_compiler/lucet-runtime", package = "lucet-runtime-wasmsbx" }
 # lucet-runtime-internals = { path = "../lucet_sandbox_compiler/lucet-runtime/lucet-runtime-internals", package = "lucet-runtime-internals-wasmsbx" }
diff -Nru firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp
--- firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp	2021-01-18 19:58:26.000000000 +0000
@@ -510,7 +510,12 @@
     impl_create_sandbox(lucet_module_path, external_loads_exist, allow_stdio);
   }
 
-  inline void impl_destroy_sandbox() { lucet_drop_module(sandbox); }
+  inline void impl_destroy_sandbox() {
+    if (return_slot_size) {
+      impl_free_in_sandbox(return_slot);
+    }
+    lucet_drop_module(sandbox);
+  }
 
   template<typename T>
   inline void* impl_get_unsandboxed_pointer(T_PointerType p) const
@@ -713,9 +718,9 @@
         auto ptr =
           reinterpret_cast<T_Arg*>(impl_get_unsandboxed_pointer<T_Arg*>(slot));
         *ptr = arg;
-        allocations[0] = arg;
+        allocations[0] = slot;
         allocations++;
-        return ptr;
+        return slot;
       } else {
         return arg;
       }
diff -Nru firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/README.md firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/README.md
--- firefox-84.0.2+build1/third_party/rust/rlbox_lucet_sandbox/README.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rlbox_lucet_sandbox/README.md	2021-01-18 19:58:26.000000000 +0000
@@ -88,10 +88,10 @@
 }
 ```
 
-- To compile the above example, you must include the rlbox header files in `build/_deps/rlbox-src/code/include`, the integration header files in `include/` and the lucet_sandbox library in `build/cargo/{debug or release}/librlbox_lucet_sandbox.a` (make sure to use the whole archive linker option). For instance, you can compile the above with
+- To compile the above example, you must include the rlbox header files in `build/_deps/rlbox-src/code/include`, the integration header files in `include/` and the lucet_sandbox library in `build/cargo/{debug or release}/librlbox_lucet_sandbox.a` (make sure to use the whole archive and the rdynamic linker options). For instance, you can compile the above with
 
 ```bash
-g++ -std=c++17 example.cpp -o example -I build/_deps/rlbox-src/code/include -I include -Wl,--whole-archive -l:build/cargo/debug/librlbox_lucet_sandbox.a -Wl,--no-whole-archive
+g++ -std=c++17 example.cpp -o example -I build/_deps/rlbox-src/code/include -I include -Wl,--whole-archive -l:build/cargo/debug/librlbox_lucet_sandbox.a -Wl,--no-whole-archive -Wl,-rdynamic
 ```
 
 ## Contributing Code
diff -Nru firefox-84.0.2+build1/third_party/rust/rusqlite/.cargo-checksum.json firefox-85.0+build1/third_party/rust/rusqlite/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/rusqlite/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rusqlite/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"56285617b69a9e2ea1d922620fb2ba960cb487fcececd016ef41dcb9c850f53a","Changelog.md":"34c6aa9cde3eb6b2803ec1072368ae412eac2da7c8a770ab2bd643a3fa1f9c5d","LICENSE":"6e93da4b8f1e937ae6addcac29c06bac66358611488c17fd1f46c6fa485f519c","README.md":"1730524868f2391f2501f3e8f1516e4cc63dc5e93b4d7dfb211ad8f3de460dac","appveyor.yml":"0bcc97462ce19ea2d7018b5a0f322d4d0ffc085a31cd18abe540ede05c770ff2","benches/cache.rs":"30459d8d7f65dd684909a53590f9be32e2e545a0775cd93ee0ce85dd08410955","benches/exec.rs":"cb7feb1738d4565c8265538a95a869a99ca360ed20c68bb69e84bd31ecbce094","clippy.toml":"98f90bbe52849b3078daeccfbe87aec1c08d02b94a453a15149a1fcccb7cafd0","codecov.yml":"17e6a8fa616f9a9f46ce420761ad15ddf0d8b5fb64c75c04365e5f269ab60ee5","publish-ghp-docs.sh":"3e2c59e09ce377c46a62511aa17389e6bf824c17d2fc5a818409ede40ba64c23","src/backup.rs":"00ee47c6b3d96393e68a3c9467e61f4082613bdd7e06607ef8b9238b62122de2","src/blob/mod.rs":"a8ea454a6bb31becd8b83e10c32c2e19a5a2fbb91cdfbd9fb0ec8525a162b2a7","src/blob/pos_io.rs":"6a41d298789ba7b2efa339f7cfcefef4162d39daf0400ca4fd3849f2f9534c45","src/busy.rs":"1308fbb2a09940207e59e6730d84165e262d95409ee11d434e4e846bb327caac","src/cache.rs":"024aac5c2a955fe60e54871a5ffd0d4fe56410398d2f2202c53f13c425533820","src/collation.rs":"1871a5d1973aedeaf8db52ab635702d77cc7a958d604f307cb498b5060db0d8e","src/column.rs":"7e7c7d5532202eaed6d453cb4cc3f46e3901f0528c5f1c83bfa08a0fd3d87264","src/config.rs":"70620f037d79bbb59ce4fff406b4aff4333cc14901dab8a6deeb4715d30ebc63","src/context.rs":"7550b77ccc1362ebbefa85e51ad70bf3d4e7d4f7817fcaac8cf34300962b7c33","src/error.rs":"dd7ab850c864aabd7bed4988955e652bff00546c20c16e3fe9ed471a655fb684","src/functions.rs":"ed50aacc01f1087ba7af347c0d46ee443360932dbdc539583cbf8b59a221bfdb","src/hooks.rs":"3ca1bcc9ba80f41c003331d779f1116c5c83daaf2bc5740fd0feb56710babce1","src/inner_connection.rs":"844a609bde6131ca13dd1a496181b405ae4f6a79766721adec01c3cf75e82c2a","src/lib.rs":"cd4c916eb8e1fbcc8eff2435b136e7f3723e7d62a691758018ee6e2bbf4678c5","src/limits.rs":"75d339cf1f21c744f42f339dcfccf44e149bd2d1294ad0fe412b0792d9c809ab","src/load_extension_guard.rs":"cd349613067410fa4be811d7522fc50004fbc48feb050c19f80a097ab919f9fb","src/pragma.rs":"f6820bcccd50ef804be09f348069208a2bc227de6959c0e3d9ac42b9c4c3e454","src/raw_statement.rs":"40864c284d9b29842831e92ca92eecf6ac77e5f166b43fc55043e62405e9e190","src/row.rs":"5f0e20ec6bbe9e6c5bce80e34bb76ba06b3abf54ef42755394f144ed1ad2e0c9","src/session.rs":"a4730dd21a0dd880d6cff46236fd3c7ad5ad5de4f607203c13062011162f3029","src/statement.rs":"32e3df655ff71ae0415539c6d79197f8e21315a583bfcad39906e0f8da4abc38","src/trace.rs":"686f46f9b27c9d446aaeff2eae0e8346177cedc48859c1fdac7453386797fe6e","src/transaction.rs":"41c5b8b0355401cace43996d311065a8e05846cb40a15d043f51bdd9e0606ffb","src/types/chrono.rs":"1d6aebb7b8efc6038ec30c95d91cee7a16c826bf5a78aca1bc75c86349e17c83","src/types/from_sql.rs":"3508835cf9a7eba0628dbd0bbbe06783f6fe57e5e8469ca51b288f139cd73436","src/types/mod.rs":"77ef2a40101d7864a651fa601e84ecda0ad441723e6c16dedd5329f4cbe8de84","src/types/serde_json.rs":"a3f11fd63cf5f3ffc9e89134dd3d139ac275aff1948d315b1eb1673d81e8fe95","src/types/time.rs":"f4ce83e8368274cf67677a5b67133adfaf0adef5c600574dd34e2e68da102754","src/types/to_sql.rs":"8544f6c9c6a0676bd75375ddba234d051d9dcf28829f49e3dbb39534142b7981","src/types/url.rs":"b476ca2386a4cc4e8ac500f870993c0445abe91754d4e004bfd19a1b95b53816","src/types/value.rs":"1bc28c99b215bf74821feef60544d5bfbedfcde99590f229d8336e0fc75354f8","src/types/value_ref.rs":"6fb2f5bfb268a90794bfc4aeda41182c7cead0292c84ff56d5141a4825ff1bae","src/unlock_notify.rs":"cf2a91e6484454fc3174be546a7f80934fd40f5be51d174db6a5674e93c9ec4a","src/util/mod.rs":"330b1822393003003e4c890df183eb88e3cfe9d566c8325fb421426811a54193","src/util/param_cache.rs":"efb480749cd74c09aeca28be074050e3a9aed7c8ed1371ca562342cba9c408dd","src/util/small_cstr.rs":"5ec10de6708837c09a67d12a7c503fc2856e933b318f8776ee2b4a6b2ce6cd83","src/util/sqlite_string.rs":"b35a4fac5962d47e0efa1b488d3447997de138aca8e99be8f5073fcbf2081664","src/version.rs":"6df3d88ff62b1f4c46692b515a16d1f02ff27732a3e371788566e6a75d5c1d4d","src/vtab/array.rs":"485d2b441b01d26a8f6a59130c85970afd627e1b953b52434964835f8b6a2aef","src/vtab/csvtab.rs":"1a4b70bdb3cb1eaeee80caded133278280f760bda2eac7ca9185448e121f32ca","src/vtab/mod.rs":"24119ac8328b8aaaf8d75c59e60820055af87dc56db153dabcb3b14113a5e50a","src/vtab/series.rs":"6b6f1c13c3d453ae726721fd09bb51c90a4252d4e662c503d7b0398812e772b7","test.csv":"3f5649d7b9f80468999b80d4d0e747c6f4f1bba80ade792689eeb4359dc1834a","tests/config_log.rs":"e786bb1a0ca1b560788b24a2091e7d294753a7bee8a39f0e6037b435809267df","tests/deny_single_threaded_sqlite_config.rs":"586ee163d42d886d88ae319cb2184c021bdf9f6da9a8325d799ba10ddeadcbe0","tests/vtab.rs":"0bb466e5ad5f96443ed5ef7f7252656dc5d3c6c3cc44d179195f654190065c04"},"package":"7e3d4791ab5517217f51216a84a688b53c1ebf7988736469c538d02f46ddba68"}
\ No newline at end of file
+{"files":{"Cargo.toml":"a68dc0863956a747f6526f566355c2f176dc1f0e522742ee1b4fe83f56dce905","Changelog.md":"34c6aa9cde3eb6b2803ec1072368ae412eac2da7c8a770ab2bd643a3fa1f9c5d","LICENSE":"6e93da4b8f1e937ae6addcac29c06bac66358611488c17fd1f46c6fa485f519c","README.md":"2265be99f12cc6805897266a26fb27227e4bb226293f3952de6edc4e2e47b8ef","appveyor.yml":"0bcc97462ce19ea2d7018b5a0f322d4d0ffc085a31cd18abe540ede05c770ff2","benches/cache.rs":"30459d8d7f65dd684909a53590f9be32e2e545a0775cd93ee0ce85dd08410955","benches/exec.rs":"cb7feb1738d4565c8265538a95a869a99ca360ed20c68bb69e84bd31ecbce094","clippy.toml":"98f90bbe52849b3078daeccfbe87aec1c08d02b94a453a15149a1fcccb7cafd0","codecov.yml":"17e6a8fa616f9a9f46ce420761ad15ddf0d8b5fb64c75c04365e5f269ab60ee5","publish-ghp-docs.sh":"3e2c59e09ce377c46a62511aa17389e6bf824c17d2fc5a818409ede40ba64c23","src/backup.rs":"00ee47c6b3d96393e68a3c9467e61f4082613bdd7e06607ef8b9238b62122de2","src/blob/mod.rs":"a8ea454a6bb31becd8b83e10c32c2e19a5a2fbb91cdfbd9fb0ec8525a162b2a7","src/blob/pos_io.rs":"6a41d298789ba7b2efa339f7cfcefef4162d39daf0400ca4fd3849f2f9534c45","src/busy.rs":"1308fbb2a09940207e59e6730d84165e262d95409ee11d434e4e846bb327caac","src/cache.rs":"024aac5c2a955fe60e54871a5ffd0d4fe56410398d2f2202c53f13c425533820","src/collation.rs":"1871a5d1973aedeaf8db52ab635702d77cc7a958d604f307cb498b5060db0d8e","src/column.rs":"7e7c7d5532202eaed6d453cb4cc3f46e3901f0528c5f1c83bfa08a0fd3d87264","src/config.rs":"70620f037d79bbb59ce4fff406b4aff4333cc14901dab8a6deeb4715d30ebc63","src/context.rs":"7550b77ccc1362ebbefa85e51ad70bf3d4e7d4f7817fcaac8cf34300962b7c33","src/error.rs":"dd7ab850c864aabd7bed4988955e652bff00546c20c16e3fe9ed471a655fb684","src/functions.rs":"ed50aacc01f1087ba7af347c0d46ee443360932dbdc539583cbf8b59a221bfdb","src/hooks.rs":"3ca1bcc9ba80f41c003331d779f1116c5c83daaf2bc5740fd0feb56710babce1","src/inner_connection.rs":"844a609bde6131ca13dd1a496181b405ae4f6a79766721adec01c3cf75e82c2a","src/lib.rs":"cd4c916eb8e1fbcc8eff2435b136e7f3723e7d62a691758018ee6e2bbf4678c5","src/limits.rs":"75d339cf1f21c744f42f339dcfccf44e149bd2d1294ad0fe412b0792d9c809ab","src/load_extension_guard.rs":"cd349613067410fa4be811d7522fc50004fbc48feb050c19f80a097ab919f9fb","src/pragma.rs":"f6820bcccd50ef804be09f348069208a2bc227de6959c0e3d9ac42b9c4c3e454","src/raw_statement.rs":"40864c284d9b29842831e92ca92eecf6ac77e5f166b43fc55043e62405e9e190","src/row.rs":"5f0e20ec6bbe9e6c5bce80e34bb76ba06b3abf54ef42755394f144ed1ad2e0c9","src/session.rs":"a4730dd21a0dd880d6cff46236fd3c7ad5ad5de4f607203c13062011162f3029","src/statement.rs":"32e3df655ff71ae0415539c6d79197f8e21315a583bfcad39906e0f8da4abc38","src/trace.rs":"686f46f9b27c9d446aaeff2eae0e8346177cedc48859c1fdac7453386797fe6e","src/transaction.rs":"41c5b8b0355401cace43996d311065a8e05846cb40a15d043f51bdd9e0606ffb","src/types/chrono.rs":"1d6aebb7b8efc6038ec30c95d91cee7a16c826bf5a78aca1bc75c86349e17c83","src/types/from_sql.rs":"3508835cf9a7eba0628dbd0bbbe06783f6fe57e5e8469ca51b288f139cd73436","src/types/mod.rs":"77ef2a40101d7864a651fa601e84ecda0ad441723e6c16dedd5329f4cbe8de84","src/types/serde_json.rs":"a3f11fd63cf5f3ffc9e89134dd3d139ac275aff1948d315b1eb1673d81e8fe95","src/types/time.rs":"f4ce83e8368274cf67677a5b67133adfaf0adef5c600574dd34e2e68da102754","src/types/to_sql.rs":"8544f6c9c6a0676bd75375ddba234d051d9dcf28829f49e3dbb39534142b7981","src/types/url.rs":"b476ca2386a4cc4e8ac500f870993c0445abe91754d4e004bfd19a1b95b53816","src/types/value.rs":"1bc28c99b215bf74821feef60544d5bfbedfcde99590f229d8336e0fc75354f8","src/types/value_ref.rs":"6fb2f5bfb268a90794bfc4aeda41182c7cead0292c84ff56d5141a4825ff1bae","src/unlock_notify.rs":"cf2a91e6484454fc3174be546a7f80934fd40f5be51d174db6a5674e93c9ec4a","src/util/mod.rs":"330b1822393003003e4c890df183eb88e3cfe9d566c8325fb421426811a54193","src/util/param_cache.rs":"efb480749cd74c09aeca28be074050e3a9aed7c8ed1371ca562342cba9c408dd","src/util/small_cstr.rs":"5ec10de6708837c09a67d12a7c503fc2856e933b318f8776ee2b4a6b2ce6cd83","src/util/sqlite_string.rs":"b35a4fac5962d47e0efa1b488d3447997de138aca8e99be8f5073fcbf2081664","src/version.rs":"6df3d88ff62b1f4c46692b515a16d1f02ff27732a3e371788566e6a75d5c1d4d","src/vtab/array.rs":"485d2b441b01d26a8f6a59130c85970afd627e1b953b52434964835f8b6a2aef","src/vtab/csvtab.rs":"1a4b70bdb3cb1eaeee80caded133278280f760bda2eac7ca9185448e121f32ca","src/vtab/mod.rs":"24119ac8328b8aaaf8d75c59e60820055af87dc56db153dabcb3b14113a5e50a","src/vtab/series.rs":"6b6f1c13c3d453ae726721fd09bb51c90a4252d4e662c503d7b0398812e772b7","test.csv":"3f5649d7b9f80468999b80d4d0e747c6f4f1bba80ade792689eeb4359dc1834a","tests/config_log.rs":"e786bb1a0ca1b560788b24a2091e7d294753a7bee8a39f0e6037b435809267df","tests/deny_single_threaded_sqlite_config.rs":"586ee163d42d886d88ae319cb2184c021bdf9f6da9a8325d799ba10ddeadcbe0","tests/vtab.rs":"0bb466e5ad5f96443ed5ef7f7252656dc5d3c6c3cc44d179195f654190065c04"},"package":"d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/rusqlite/Cargo.toml firefox-85.0+build1/third_party/rust/rusqlite/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/rusqlite/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rusqlite/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "rusqlite"
-version = "0.24.1"
+version = "0.24.2"
 authors = ["The rusqlite developers"]
 description = "Ergonomic wrapper for SQLite"
 documentation = "http://docs.rs/rusqlite/"
@@ -92,7 +92,7 @@
 optional = true
 
 [dependencies.smallvec]
-version = "1.4"
+version = "1.0"
 
 [dependencies.time]
 version = "0.2"
diff -Nru firefox-84.0.2+build1/third_party/rust/rusqlite/README.md firefox-85.0+build1/third_party/rust/rusqlite/README.md
--- firefox-84.0.2+build1/third_party/rust/rusqlite/README.md	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/rusqlite/README.md	2021-01-18 19:58:26.000000000 +0000
@@ -123,7 +123,7 @@
   0.20.0).  This is probably the simplest solution to any build problems. You can enable this by adding the following in your `Cargo.toml` file:
   ```toml
   [dependencies.rusqlite]
-  version = "0.24.1"
+  version = "0.24.2"
   features = ["bundled"]
   ```
 * You can set the `SQLITE3_LIB_DIR` to point to directory containing the SQLite
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/benches/bench.rs firefox-85.0+build1/third_party/rust/smallvec/benches/bench.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/benches/bench.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/benches/bench.rs	2021-01-18 19:58:26.000000000 +0000
@@ -1,4 +1,5 @@
 #![feature(test)]
+#![allow(deprecated)]
 
 #[macro_use]
 extern crate smallvec;
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/.cargo-checksum.json firefox-85.0+build1/third_party/rust/smallvec/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/smallvec/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{".travis.yml":"00cfbf366d13ce6b91c2b1366f822470b1f67f4f40c343820782df3753ac757c","Cargo.toml":"f7177abe268105441009e540a19560d330e5fa4388d64c4202f9f38c1da190e6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b28172679e0009b655da42797c03fd163a3379d5cfa67ba1f1655e974a2a1a9","README.md":"a01127c37308457e8d396b176fb790846be0978c173be3f13260b62efcef011b","benches/bench.rs":"9dca7122a3dcb2c099e49807e4d3b8f01d9220e2b3db0a54e9901ee74392866f","lib.rs":"45aa4cd721dd8e649b79c443b9d12b8ff0f9e4dd4188e604b2d6b36b8ceb1c71","scripts/run_miri.sh":"2e83d153efc16cbc3c41589e306faa0624c8b9a0feecea3baae6e34f4563ac42","specialization.rs":"46433586203399251cba496d67b88d34e1be3c2b591986b77463513da1c66471"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"b4ebf6d0390e423f1469cbce0a7307439550dd2d3f1bb8b0eff49641b421c94c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0b28172679e0009b655da42797c03fd163a3379d5cfa67ba1f1655e974a2a1a9","README.md":"a01127c37308457e8d396b176fb790846be0978c173be3f13260b62efcef011b","benches/bench.rs":"7425b60d83d01a0bcedb5855ec8652fb1089194da5b5d8f7d7d9072c8ea9d133","scripts/run_miri.sh":"0d0b8c54c73fa9da1217d29ed0984f8328dd9fb61bb5a02db44458c360cdc3c4","src/lib.rs":"70df33b1507de61218d477d3fea90347db66986a7c6815aa6fb5c3408a5539ba","src/specialization.rs":"46433586203399251cba496d67b88d34e1be3c2b591986b77463513da1c66471","src/tests.rs":"1c4763444139813d335d33f9eda8b8b719da60a2b13ddcb44e1a6cc278c319cc","tests/macro.rs":"22ad4f6f104a599fdcba19cad8834105b8656b212fb6c7573a427d447f5db14f"},"package":"ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/Cargo.toml firefox-85.0+build1/third_party/rust/smallvec/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/smallvec/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,29 +1,37 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
 [package]
-name = "smallvec"
-version = "1.5.0"
 edition = "2018"
-authors = ["Simon Sapin <simon.sapin@exyr.org>"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/servo/rust-smallvec"
+name = "smallvec"
+version = "1.5.1"
+authors = ["The Servo Project Developers"]
 description = "'Small vector' optimization: store up to a small number of items on the stack"
+documentation = "https://docs.rs/smallvec/"
+readme = "README.md"
 keywords = ["small", "vec", "vector", "stack", "no_std"]
 categories = ["data-structures"]
-readme = "README.md"
-documentation = "https://docs.rs/smallvec/"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/servo/rust-smallvec"
+[dependencies.serde]
+version = "1"
+optional = true
+default-features = false
+[dev-dependencies.bincode]
+version = "1.0.1"
 
 [features]
 const_generics = []
-write = []
-union = []
-specialization = []
 may_dangle = []
-
-[lib]
-name = "smallvec"
-path = "lib.rs"
-
-[dependencies]
-serde = { version = "1", optional = true }
-
-[dev_dependencies]
-bincode = "1.0.1"
+specialization = []
+union = []
+write = []
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/lib.rs firefox-85.0+build1/third_party/rust/smallvec/lib.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2590 +0,0 @@
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Small vectors in various sizes. These store a certain number of elements inline, and fall back
-//! to the heap for larger allocations.  This can be a useful optimization for improving cache
-//! locality and reducing allocator traffic for workloads that fit within the inline buffer.
-//!
-//! ## `no_std` support
-//!
-//! By default, `smallvec` does not depend on `std`.  However, the optional
-//! `write` feature implements the `std::io::Write` trait for vectors of `u8`.
-//! When this feature is enabled, `smallvec` depends on `std`.
-//!
-//! ## Optional features
-//!
-//! ### `write`
-//!
-//! When this feature is enabled, `SmallVec<[u8; _]>` implements the `std::io::Write` trait.
-//! This feature is not compatible with `#![no_std]` programs.
-//!
-//! ### `union`
-//!
-//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
-//!
-//! When the `union` feature is enabled `smallvec` will track its state (inline or spilled)
-//! without the use of an enum tag, reducing the size of the `smallvec` by one machine word.
-//! This means that there is potentially no space overhead compared to `Vec`.
-//! Note that `smallvec` can still be larger than `Vec` if the inline buffer is larger than two
-//! machine words.
-//!
-//! To use this feature add `features = ["union"]` in the `smallvec` section of Cargo.toml.
-//! Note that this feature requires a nightly compiler (for now).
-//!
-//! ### `const_generics`
-//!
-//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
-//!
-//! When this feature is enabled, `SmallVec` works with any arrays of any size, not just a fixed
-//! list of sizes.
-//! 
-//! ### `specialization`
-//!
-//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
-//!
-//! When this feature is enabled, `SmallVec::from(slice)` has improved performance for slices
-//! of `Copy` types.  (Without this feature, you can use `SmallVec::from_slice` to get optimal
-//! performance for `Copy` types.)
-//!
-//! ### `may_dangle`
-//!
-//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
-//!
-//! This feature makes the Rust compiler less strict about use of vectors that contain borrowed
-//! references. For details, see the
-//! [Rustonomicon](https://doc.rust-lang.org/1.42.0/nomicon/dropck.html#an-escape-hatch).
-
-#![no_std]
-#![cfg_attr(feature = "union", feature(untagged_unions))]
-#![cfg_attr(feature = "specialization", feature(specialization))]
-#![cfg_attr(feature = "may_dangle", feature(dropck_eyepatch))]
-#![cfg_attr(feature = "const_generics", allow(incomplete_features))]
-#![cfg_attr(feature = "const_generics", feature(const_generics))]
-#![deny(missing_docs)]
-
-#[doc(hidden)]
-pub extern crate alloc;
-
-#[cfg(any(test, feature = "write"))]
-extern crate std;
-
-use alloc::boxed::Box;
-use alloc::{vec, vec::Vec};
-use core::borrow::{Borrow, BorrowMut};
-use core::cmp;
-use core::fmt;
-use core::hash::{Hash, Hasher};
-use core::hint::unreachable_unchecked;
-use core::iter::{repeat, FromIterator, FusedIterator, IntoIterator};
-use core::mem;
-use core::mem::MaybeUninit;
-use core::ops::{self, RangeBounds};
-use core::ptr::{self, NonNull};
-use core::slice::{self, SliceIndex};
-
-#[cfg(feature = "serde")]
-use serde::{
-    de::{Deserialize, Deserializer, SeqAccess, Visitor},
-    ser::{Serialize, SerializeSeq, Serializer},
-};
-
-#[cfg(feature = "serde")]
-use core::marker::PhantomData;
-
-#[cfg(feature = "write")]
-use std::io;
-
-/// Creates a [`SmallVec`] containing the arguments.
-///
-/// `smallvec!` allows `SmallVec`s to be defined with the same syntax as array expressions.
-/// There are two forms of this macro:
-///
-/// - Create a [`SmallVec`] containing a given list of elements:
-///
-/// ```
-/// # #[macro_use] extern crate smallvec;
-/// # use smallvec::SmallVec;
-/// # fn main() {
-/// let v: SmallVec<[_; 128]> = smallvec![1, 2, 3];
-/// assert_eq!(v[0], 1);
-/// assert_eq!(v[1], 2);
-/// assert_eq!(v[2], 3);
-/// # }
-/// ```
-///
-/// - Create a [`SmallVec`] from a given element and size:
-///
-/// ```
-/// # #[macro_use] extern crate smallvec;
-/// # use smallvec::SmallVec;
-/// # fn main() {
-/// let v: SmallVec<[_; 0x8000]> = smallvec![1; 3];
-/// assert_eq!(v, SmallVec::from_buf([1, 1, 1]));
-/// # }
-/// ```
-///
-/// Note that unlike array expressions this syntax supports all elements
-/// which implement [`Clone`] and the number of elements doesn't have to be
-/// a constant.
-///
-/// This will use `clone` to duplicate an expression, so one should be careful
-/// using this with types having a nonstandard `Clone` implementation. For
-/// example, `smallvec![Rc::new(1); 5]` will create a vector of five references
-/// to the same boxed integer value, not five references pointing to independently
-/// boxed integers.
-
-#[macro_export]
-macro_rules! smallvec {
-    // count helper: transform any expression into 1
-    (@one $x:expr) => (1usize);
-    ($elem:expr; $n:expr) => ({
-        $crate::SmallVec::from_elem($elem, $n)
-    });
-    ($($x:expr),*$(,)*) => ({
-        let count = 0usize $(+ smallvec!(@one $x))*;
-        let mut vec = $crate::SmallVec::new();
-        if count <= vec.inline_size() {
-            $(vec.push($x);)*
-            vec
-        } else {
-            $crate::SmallVec::from_vec($crate::alloc::vec![$($x,)*])
-        }
-    });
-}
-
-/// `panic!()` in debug builds, optimization hint in release.
-#[cfg(not(feature = "union"))]
-macro_rules! debug_unreachable {
-    () => {
-        debug_unreachable!("entered unreachable code")
-    };
-    ($e:expr) => {
-        if cfg!(not(debug_assertions)) {
-            unreachable_unchecked();
-        } else {
-            panic!($e);
-        }
-    };
-}
-
-/// Trait to be implemented by a collection that can be extended from a slice
-///
-/// ## Example
-///
-/// ```rust
-/// use smallvec::{ExtendFromSlice, SmallVec};
-///
-/// fn initialize<V: ExtendFromSlice<u8>>(v: &mut V) {
-///     v.extend_from_slice(b"Test!");
-/// }
-///
-/// let mut vec = Vec::new();
-/// initialize(&mut vec);
-/// assert_eq!(&vec, b"Test!");
-///
-/// let mut small_vec = SmallVec::<[u8; 8]>::new();
-/// initialize(&mut small_vec);
-/// assert_eq!(&small_vec as &[_], b"Test!");
-/// ```
-pub trait ExtendFromSlice<T> {
-    /// Extends a collection from a slice of its element type
-    fn extend_from_slice(&mut self, other: &[T]);
-}
-
-impl<T: Clone> ExtendFromSlice<T> for Vec<T> {
-    fn extend_from_slice(&mut self, other: &[T]) {
-        Vec::extend_from_slice(self, other)
-    }
-}
-
-unsafe fn deallocate<T>(ptr: *mut T, capacity: usize) {
-    let _vec: Vec<T> = Vec::from_raw_parts(ptr, 0, capacity);
-    // Let it drop.
-}
-
-/// An iterator that removes the items from a `SmallVec` and yields them by value.
-///
-/// Returned from [`SmallVec::drain`][1].
-///
-/// [1]: struct.SmallVec.html#method.drain
-pub struct Drain<'a, T: 'a + Array> {
-    tail_start: usize,
-    tail_len: usize,
-    iter: slice::Iter<'a, T::Item>,
-    vec: NonNull<SmallVec<T>>,
-}
-
-impl<'a, T: 'a + Array> fmt::Debug for Drain<'a, T>
-where
-    T::Item: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("Drain").field(&self.iter.as_slice()).finish()
-    }
-}
-
-unsafe impl<'a, T: Sync + Array> Sync for Drain<'a, T> {}
-unsafe impl<'a, T: Send + Array> Send for Drain<'a, T> {}
-
-impl<'a, T: 'a + Array> Iterator for Drain<'a, T> {
-    type Item = T::Item;
-
-    #[inline]
-    fn next(&mut self) -> Option<T::Item> {
-        self.iter
-            .next()
-            .map(|reference| unsafe { ptr::read(reference) })
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl<'a, T: 'a + Array> DoubleEndedIterator for Drain<'a, T> {
-    #[inline]
-    fn next_back(&mut self) -> Option<T::Item> {
-        self.iter
-            .next_back()
-            .map(|reference| unsafe { ptr::read(reference) })
-    }
-}
-
-impl<'a, T: Array> ExactSizeIterator for Drain<'a, T> {
-    #[inline]
-    fn len(&self) -> usize {
-        self.iter.len()
-    }
-}
-
-impl<'a, T: Array> FusedIterator for Drain<'a, T> {}
-
-impl<'a, T: 'a + Array> Drop for Drain<'a, T> {
-    fn drop(&mut self) {
-        self.for_each(drop);
-
-        if self.tail_len > 0 {
-            unsafe {
-                let source_vec = self.vec.as_mut();
-
-                // memmove back untouched tail, update to new length
-                let start = source_vec.len();
-                let tail = self.tail_start;
-                if tail != start {
-                    let src = source_vec.as_ptr().add(tail);
-                    let dst = source_vec.as_mut_ptr().add(start);
-                    ptr::copy(src, dst, self.tail_len);
-                }
-                source_vec.set_len(start + self.tail_len);
-            }
-        }
-    }
-}
-
-#[cfg(feature = "union")]
-union SmallVecData<A: Array> {
-    inline: MaybeUninit<A>,
-    heap: (*mut A::Item, usize),
-}
-
-#[cfg(feature = "union")]
-impl<A: Array> SmallVecData<A> {
-    #[inline]
-    unsafe fn inline(&self) -> *const A::Item {
-        self.inline.as_ptr() as *const A::Item
-    }
-    #[inline]
-    unsafe fn inline_mut(&mut self) -> *mut A::Item {
-        self.inline.as_mut_ptr() as *mut A::Item
-    }
-    #[inline]
-    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
-        SmallVecData { inline }
-    }
-    #[inline]
-    unsafe fn into_inline(self) -> MaybeUninit<A> {
-        self.inline
-    }
-    #[inline]
-    unsafe fn heap(&self) -> (*mut A::Item, usize) {
-        self.heap
-    }
-    #[inline]
-    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
-        &mut self.heap
-    }
-    #[inline]
-    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
-        SmallVecData { heap: (ptr, len) }
-    }
-}
-
-#[cfg(not(feature = "union"))]
-enum SmallVecData<A: Array> {
-    Inline(MaybeUninit<A>),
-    Heap((*mut A::Item, usize)),
-}
-
-#[cfg(not(feature = "union"))]
-impl<A: Array> SmallVecData<A> {
-    #[inline]
-    unsafe fn inline(&self) -> *const A::Item {
-        match self {
-            SmallVecData::Inline(a) => a.as_ptr() as *const A::Item,
-            _ => debug_unreachable!(),
-        }
-    }
-    #[inline]
-    unsafe fn inline_mut(&mut self) -> *mut A::Item {
-        match self {
-            SmallVecData::Inline(a) => a.as_mut_ptr() as *mut A::Item,
-            _ => debug_unreachable!(),
-        }
-    }
-    #[inline]
-    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
-        SmallVecData::Inline(inline)
-    }
-    #[inline]
-    unsafe fn into_inline(self) -> MaybeUninit<A> {
-        match self {
-            SmallVecData::Inline(a) => a,
-            _ => debug_unreachable!(),
-        }
-    }
-    #[inline]
-    unsafe fn heap(&self) -> (*mut A::Item, usize) {
-        match self {
-            SmallVecData::Heap(data) => *data,
-            _ => debug_unreachable!(),
-        }
-    }
-    #[inline]
-    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
-        match self {
-            SmallVecData::Heap(data) => data,
-            _ => debug_unreachable!(),
-        }
-    }
-    #[inline]
-    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
-        SmallVecData::Heap((ptr, len))
-    }
-}
-
-unsafe impl<A: Array + Send> Send for SmallVecData<A> {}
-unsafe impl<A: Array + Sync> Sync for SmallVecData<A> {}
-
-/// A `Vec`-like container that can store a small number of elements inline.
-///
-/// `SmallVec` acts like a vector, but can store a limited amount of data inline within the
-/// `SmallVec` struct rather than in a separate allocation.  If the data exceeds this limit, the
-/// `SmallVec` will "spill" its data onto the heap, allocating a new buffer to hold it.
-///
-/// The amount of data that a `SmallVec` can store inline depends on its backing store. The backing
-/// store can be any type that implements the `Array` trait; usually it is a small fixed-sized
-/// array.  For example a `SmallVec<[u64; 8]>` can hold up to eight 64-bit integers inline.
-///
-/// ## Example
-///
-/// ```rust
-/// use smallvec::SmallVec;
-/// let mut v = SmallVec::<[u8; 4]>::new(); // initialize an empty vector
-///
-/// // The vector can hold up to 4 items without spilling onto the heap.
-/// v.extend(0..4);
-/// assert_eq!(v.len(), 4);
-/// assert!(!v.spilled());
-///
-/// // Pushing another element will force the buffer to spill:
-/// v.push(4);
-/// assert_eq!(v.len(), 5);
-/// assert!(v.spilled());
-/// ```
-pub struct SmallVec<A: Array> {
-    // The capacity field is used to determine which of the storage variants is active:
-    // If capacity <= A::size() then the inline variant is used and capacity holds the current length of the vector (number of elements actually in use).
-    // If capacity > A::size() then the heap variant is used and capacity holds the size of the memory allocation.
-    capacity: usize,
-    data: SmallVecData<A>,
-}
-
-impl<A: Array> SmallVec<A> {
-    /// Construct an empty vector
-    #[inline]
-    pub fn new() -> SmallVec<A> {
-        // Try to detect invalid custom implementations of `Array`. Hopefuly,
-        // this check should be optimized away entirely for valid ones.
-        assert!(
-            mem::size_of::<A>() == A::size() * mem::size_of::<A::Item>()
-                && mem::align_of::<A>() >= mem::align_of::<A::Item>()
-        );
-        SmallVec {
-            capacity: 0,
-            data: SmallVecData::from_inline(MaybeUninit::uninit()),
-        }
-    }
-
-    /// Construct an empty vector with enough capacity pre-allocated to store at least `n`
-    /// elements.
-    ///
-    /// Will create a heap allocation only if `n` is larger than the inline capacity.
-    ///
-    /// ```
-    /// # use smallvec::SmallVec;
-    ///
-    /// let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(100);
-    ///
-    /// assert!(v.is_empty());
-    /// assert!(v.capacity() >= 100);
-    /// ```
-    #[inline]
-    pub fn with_capacity(n: usize) -> Self {
-        let mut v = SmallVec::new();
-        v.reserve_exact(n);
-        v
-    }
-
-    /// Construct a new `SmallVec` from a `Vec<A::Item>`.
-    ///
-    /// Elements will be copied to the inline buffer if vec.capacity() <= A::size().
-    ///
-    /// ```rust
-    /// use smallvec::SmallVec;
-    ///
-    /// let vec = vec![1, 2, 3, 4, 5];
-    /// let small_vec: SmallVec<[_; 3]> = SmallVec::from_vec(vec);
-    ///
-    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-    /// ```
-    #[inline]
-    pub fn from_vec(mut vec: Vec<A::Item>) -> SmallVec<A> {
-        if vec.capacity() <= A::size() {
-            unsafe {
-                let mut data = SmallVecData::<A>::from_inline(MaybeUninit::uninit());
-                let len = vec.len();
-                vec.set_len(0);
-                ptr::copy_nonoverlapping(vec.as_ptr(), data.inline_mut(), len);
-
-                SmallVec {
-                    capacity: len,
-                    data,
-                }
-            }
-        } else {
-            let (ptr, cap, len) = (vec.as_mut_ptr(), vec.capacity(), vec.len());
-            mem::forget(vec);
-
-            SmallVec {
-                capacity: cap,
-                data: SmallVecData::from_heap(ptr, len),
-            }
-        }
-    }
-
-    /// Constructs a new `SmallVec` on the stack from an `A` without
-    /// copying elements.
-    ///
-    /// ```rust
-    /// use smallvec::SmallVec;
-    ///
-    /// let buf = [1, 2, 3, 4, 5];
-    /// let small_vec: SmallVec<_> = SmallVec::from_buf(buf);
-    ///
-    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-    /// ```
-    #[inline]
-    pub fn from_buf(buf: A) -> SmallVec<A> {
-        SmallVec {
-            capacity: A::size(),
-            data: SmallVecData::from_inline(MaybeUninit::new(buf)),
-        }
-    }
-
-    /// Constructs a new `SmallVec` on the stack from an `A` without
-    /// copying elements. Also sets the length, which must be less or
-    /// equal to the size of `buf`.
-    ///
-    /// ```rust
-    /// use smallvec::SmallVec;
-    ///
-    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
-    /// let small_vec: SmallVec<_> = SmallVec::from_buf_and_len(buf, 5);
-    ///
-    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-    /// ```
-    #[inline]
-    pub fn from_buf_and_len(buf: A, len: usize) -> SmallVec<A> {
-        assert!(len <= A::size());
-        unsafe { SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), len) }
-    }
-
-    /// Constructs a new `SmallVec` on the stack from an `A` without
-    /// copying elements. Also sets the length. The user is responsible
-    /// for ensuring that `len <= A::size()`.
-    ///
-    /// ```rust
-    /// use smallvec::SmallVec;
-    /// use std::mem::MaybeUninit;
-    ///
-    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
-    /// let small_vec: SmallVec<_> = unsafe {
-    ///     SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), 5)
-    /// };
-    ///
-    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-    /// ```
-    #[inline]
-    pub unsafe fn from_buf_and_len_unchecked(buf: MaybeUninit<A>, len: usize) -> SmallVec<A> {
-        SmallVec {
-            capacity: len,
-            data: SmallVecData::from_inline(buf),
-        }
-    }
-
-    /// Sets the length of a vector.
-    ///
-    /// This will explicitly set the size of the vector, without actually
-    /// modifying its buffers, so it is up to the caller to ensure that the
-    /// vector is actually the specified size.
-    pub unsafe fn set_len(&mut self, new_len: usize) {
-        let (_, len_ptr, _) = self.triple_mut();
-        *len_ptr = new_len;
-    }
-
-    /// The maximum number of elements this vector can hold inline
-    #[inline]
-    pub fn inline_size(&self) -> usize {
-        A::size()
-    }
-
-    /// The number of elements stored in the vector
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.triple().1
-    }
-
-    /// Returns `true` if the vector is empty
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// The number of items the vector can hold without reallocating
-    #[inline]
-    pub fn capacity(&self) -> usize {
-        self.triple().2
-    }
-
-    /// Returns a tuple with (data ptr, len, capacity)
-    /// Useful to get all SmallVec properties with a single check of the current storage variant.
-    #[inline]
-    fn triple(&self) -> (*const A::Item, usize, usize) {
-        unsafe {
-            if self.spilled() {
-                let (ptr, len) = self.data.heap();
-                (ptr, len, self.capacity)
-            } else {
-                (self.data.inline(), self.capacity, A::size())
-            }
-        }
-    }
-
-    /// Returns a tuple with (data ptr, len ptr, capacity)
-    #[inline]
-    fn triple_mut(&mut self) -> (*mut A::Item, &mut usize, usize) {
-        unsafe {
-            if self.spilled() {
-                let &mut (ptr, ref mut len_ptr) = self.data.heap_mut();
-                (ptr, len_ptr, self.capacity)
-            } else {
-                (self.data.inline_mut(), &mut self.capacity, A::size())
-            }
-        }
-    }
-
-    /// Returns `true` if the data has spilled into a separate heap-allocated buffer.
-    #[inline]
-    pub fn spilled(&self) -> bool {
-        self.capacity > A::size()
-    }
-
-    /// Creates a draining iterator that removes the specified range in the vector
-    /// and yields the removed items.
-    ///
-    /// Note 1: The element range is removed even if the iterator is only
-    /// partially consumed or not consumed at all.
-    ///
-    /// Note 2: It is unspecified how many elements are removed from the vector
-    /// if the `Drain` value is leaked.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the starting point is greater than the end point or if
-    /// the end point is greater than the length of the vector.
-    pub fn drain<R>(&mut self, range: R) -> Drain<'_, A>
-    where
-        R: RangeBounds<usize>,
-    {
-        use core::ops::Bound::*;
-
-        let len = self.len();
-        let start = match range.start_bound() {
-            Included(&n) => n,
-            Excluded(&n) => n + 1,
-            Unbounded => 0,
-        };
-        let end = match range.end_bound() {
-            Included(&n) => n + 1,
-            Excluded(&n) => n,
-            Unbounded => len,
-        };
-
-        assert!(start <= end);
-        assert!(end <= len);
-
-        unsafe {
-            self.set_len(start);
-
-            let range_slice = slice::from_raw_parts_mut(self.as_mut_ptr().add(start), end - start);
-
-            Drain {
-                tail_start: end,
-                tail_len: len - end,
-                iter: range_slice.iter(),
-                vec: NonNull::from(self),
-            }
-        }
-    }
-
-    /// Append an item to the vector.
-    #[inline]
-    pub fn push(&mut self, value: A::Item) {
-        unsafe {
-            let (_, &mut len, cap) = self.triple_mut();
-            if len == cap {
-                self.reserve(1);
-            }
-            let (ptr, len_ptr, _) = self.triple_mut();
-            *len_ptr = len + 1;
-            ptr::write(ptr.add(len), value);
-        }
-    }
-
-    /// Remove an item from the end of the vector and return it, or None if empty.
-    #[inline]
-    pub fn pop(&mut self) -> Option<A::Item> {
-        unsafe {
-            let (ptr, len_ptr, _) = self.triple_mut();
-            if *len_ptr == 0 {
-                return None;
-            }
-            let last_index = *len_ptr - 1;
-            *len_ptr = last_index;
-            Some(ptr::read(ptr.add(last_index)))
-        }
-    }
-
-    /// Re-allocate to set the capacity to `max(new_cap, inline_size())`.
-    ///
-    /// Panics if `new_cap` is less than the vector's length.
-    pub fn grow(&mut self, new_cap: usize) {
-        unsafe {
-            let (ptr, &mut len, cap) = self.triple_mut();
-            let unspilled = !self.spilled();
-            assert!(new_cap >= len);
-            if new_cap <= self.inline_size() {
-                if unspilled {
-                    return;
-                }
-                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
-                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
-                self.capacity = len;
-            } else if new_cap != cap {
-                let mut vec = Vec::with_capacity(new_cap);
-                let new_alloc = vec.as_mut_ptr();
-                mem::forget(vec);
-                ptr::copy_nonoverlapping(ptr, new_alloc, len);
-                self.data = SmallVecData::from_heap(new_alloc, len);
-                self.capacity = new_cap;
-                if unspilled {
-                    return;
-                }
-            } else {
-                return;
-            }
-            deallocate(ptr, cap);
-        }
-    }
-
-    /// Reserve capacity for `additional` more elements to be inserted.
-    ///
-    /// May reserve more space to avoid frequent reallocations.
-    ///
-    /// If the new capacity would overflow `usize` then it will be set to `usize::max_value()`
-    /// instead. (This means that inserting `additional` new elements is not guaranteed to be
-    /// possible after calling this function.)
-    #[inline]
-    pub fn reserve(&mut self, additional: usize) {
-        // prefer triple_mut() even if triple() would work
-        // so that the optimizer removes duplicated calls to it
-        // from callers like insert()
-        let (_, &mut len, cap) = self.triple_mut();
-        if cap - len < additional {
-            let new_cap = len
-                .checked_add(additional)
-                .and_then(usize::checked_next_power_of_two)
-                .unwrap_or(usize::max_value());
-            self.grow(new_cap);
-        }
-    }
-
-    /// Reserve the minimum capacity for `additional` more elements to be inserted.
-    ///
-    /// Panics if the new capacity overflows `usize`.
-    pub fn reserve_exact(&mut self, additional: usize) {
-        let (_, &mut len, cap) = self.triple_mut();
-        if cap - len < additional {
-            match len.checked_add(additional) {
-                Some(cap) => self.grow(cap),
-                None => panic!("reserve_exact overflow"),
-            }
-        }
-    }
-
-    /// Shrink the capacity of the vector as much as possible.
-    ///
-    /// When possible, this will move data from an external heap buffer to the vector's inline
-    /// storage.
-    pub fn shrink_to_fit(&mut self) {
-        if !self.spilled() {
-            return;
-        }
-        let len = self.len();
-        if self.inline_size() >= len {
-            unsafe {
-                let (ptr, len) = self.data.heap();
-                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
-                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
-                deallocate(ptr, self.capacity);
-                self.capacity = len;
-            }
-        } else if self.capacity() > len {
-            self.grow(len);
-        }
-    }
-
-    /// Shorten the vector, keeping the first `len` elements and dropping the rest.
-    ///
-    /// If `len` is greater than or equal to the vector's current length, this has no
-    /// effect.
-    ///
-    /// This does not re-allocate.  If you want the vector's capacity to shrink, call
-    /// `shrink_to_fit` after truncating.
-    pub fn truncate(&mut self, len: usize) {
-        unsafe {
-            let (ptr, len_ptr, _) = self.triple_mut();
-            while len < *len_ptr {
-                let last_index = *len_ptr - 1;
-                *len_ptr = last_index;
-                ptr::drop_in_place(ptr.add(last_index));
-            }
-        }
-    }
-
-    /// Extracts a slice containing the entire vector.
-    ///
-    /// Equivalent to `&s[..]`.
-    pub fn as_slice(&self) -> &[A::Item] {
-        self
-    }
-
-    /// Extracts a mutable slice of the entire vector.
-    ///
-    /// Equivalent to `&mut s[..]`.
-    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
-        self
-    }
-
-    /// Remove the element at position `index`, replacing it with the last element.
-    ///
-    /// This does not preserve ordering, but is O(1).
-    ///
-    /// Panics if `index` is out of bounds.
-    #[inline]
-    pub fn swap_remove(&mut self, index: usize) -> A::Item {
-        let len = self.len();
-        self.swap(len - 1, index);
-        self.pop()
-            .unwrap_or_else(|| unsafe { unreachable_unchecked() })
-    }
-
-    /// Remove all elements from the vector.
-    #[inline]
-    pub fn clear(&mut self) {
-        self.truncate(0);
-    }
-
-    /// Remove and return the element at position `index`, shifting all elements after it to the
-    /// left.
-    ///
-    /// Panics if `index` is out of bounds.
-    pub fn remove(&mut self, index: usize) -> A::Item {
-        unsafe {
-            let (mut ptr, len_ptr, _) = self.triple_mut();
-            let len = *len_ptr;
-            assert!(index < len);
-            *len_ptr = len - 1;
-            ptr = ptr.add(index);
-            let item = ptr::read(ptr);
-            ptr::copy(ptr.add(1), ptr, len - index - 1);
-            item
-        }
-    }
-
-    /// Insert an element at position `index`, shifting all elements after it to the right.
-    ///
-    /// Panics if `index` is out of bounds.
-    pub fn insert(&mut self, index: usize, element: A::Item) {
-        self.reserve(1);
-
-        unsafe {
-            let (mut ptr, len_ptr, _) = self.triple_mut();
-            let len = *len_ptr;
-            assert!(index <= len);
-            *len_ptr = len + 1;
-            ptr = ptr.add(index);
-            ptr::copy(ptr, ptr.add(1), len - index);
-            ptr::write(ptr, element);
-        }
-    }
-
-    /// Insert multiple elements at position `index`, shifting all following elements toward the
-    /// back.
-    pub fn insert_many<I: IntoIterator<Item = A::Item>>(&mut self, index: usize, iterable: I) {
-        let iter = iterable.into_iter();
-        if index == self.len() {
-            return self.extend(iter);
-        }
-
-        let (lower_size_bound, _) = iter.size_hint();
-        assert!(lower_size_bound <= core::isize::MAX as usize); // Ensure offset is indexable
-        assert!(index + lower_size_bound >= index); // Protect against overflow
-        self.reserve(lower_size_bound);
-
-        unsafe {
-            let old_len = self.len();
-            assert!(index <= old_len);
-            let mut ptr = self.as_mut_ptr().add(index);
-
-            // Move the trailing elements.
-            ptr::copy(ptr, ptr.add(lower_size_bound), old_len - index);
-
-            // In case the iterator panics, don't double-drop the items we just copied above.
-            self.set_len(index);
-
-            let mut num_added = 0;
-            for element in iter {
-                let mut cur = ptr.add(num_added);
-                if num_added >= lower_size_bound {
-                    // Iterator provided more elements than the hint.  Move trailing items again.
-                    self.reserve(1);
-                    ptr = self.as_mut_ptr().add(index);
-                    cur = ptr.add(num_added);
-                    ptr::copy(cur, cur.add(1), old_len - index);
-                }
-                ptr::write(cur, element);
-                num_added += 1;
-            }
-            if num_added < lower_size_bound {
-                // Iterator provided fewer elements than the hint
-                ptr::copy(
-                    ptr.add(lower_size_bound),
-                    ptr.add(num_added),
-                    old_len - index,
-                );
-            }
-
-            self.set_len(old_len + num_added);
-        }
-    }
-
-    /// Convert a SmallVec to a Vec, without reallocating if the SmallVec has already spilled onto
-    /// the heap.
-    pub fn into_vec(self) -> Vec<A::Item> {
-        if self.spilled() {
-            unsafe {
-                let (ptr, len) = self.data.heap();
-                let v = Vec::from_raw_parts(ptr, len, self.capacity);
-                mem::forget(self);
-                v
-            }
-        } else {
-            self.into_iter().collect()
-        }
-    }
-
-    /// Converts a `SmallVec` into a `Box<[T]>` without reallocating if the `SmallVec` has already spilled
-    /// onto the heap.
-    ///
-    /// Note that this will drop any excess capacity.
-    pub fn into_boxed_slice(self) -> Box<[A::Item]> {
-        self.into_vec().into_boxed_slice()
-    }
-
-    /// Convert the SmallVec into an `A` if possible. Otherwise return `Err(Self)`.
-    ///
-    /// This method returns `Err(Self)` if the SmallVec is too short (and the `A` contains uninitialized elements),
-    /// or if the SmallVec is too long (and all the elements were spilled to the heap).
-    pub fn into_inner(self) -> Result<A, Self> {
-        if self.spilled() || self.len() != A::size() {
-            Err(self)
-        } else {
-            unsafe {
-                let data = ptr::read(&self.data);
-                mem::forget(self);
-                Ok(data.into_inline().assume_init())
-            }
-        }
-    }
-
-    /// Retains only the elements specified by the predicate.
-    ///
-    /// In other words, remove all elements `e` such that `f(&e)` returns `false`.
-    /// This method operates in place and preserves the order of the retained
-    /// elements.
-    pub fn retain<F: FnMut(&mut A::Item) -> bool>(&mut self, mut f: F) {
-        let mut del = 0;
-        let len = self.len();
-        for i in 0..len {
-            if !f(&mut self[i]) {
-                del += 1;
-            } else if del > 0 {
-                self.swap(i - del, i);
-            }
-        }
-        self.truncate(len - del);
-    }
-
-    /// Removes consecutive duplicate elements.
-    pub fn dedup(&mut self)
-    where
-        A::Item: PartialEq<A::Item>,
-    {
-        self.dedup_by(|a, b| a == b);
-    }
-
-    /// Removes consecutive duplicate elements using the given equality relation.
-    pub fn dedup_by<F>(&mut self, mut same_bucket: F)
-    where
-        F: FnMut(&mut A::Item, &mut A::Item) -> bool,
-    {
-        // See the implementation of Vec::dedup_by in the
-        // standard library for an explanation of this algorithm.
-        let len = self.len();
-        if len <= 1 {
-            return;
-        }
-
-        let ptr = self.as_mut_ptr();
-        let mut w: usize = 1;
-
-        unsafe {
-            for r in 1..len {
-                let p_r = ptr.add(r);
-                let p_wm1 = ptr.add(w - 1);
-                if !same_bucket(&mut *p_r, &mut *p_wm1) {
-                    if r != w {
-                        let p_w = p_wm1.add(1);
-                        mem::swap(&mut *p_r, &mut *p_w);
-                    }
-                    w += 1;
-                }
-            }
-        }
-
-        self.truncate(w);
-    }
-
-    /// Removes consecutive elements that map to the same key.
-    pub fn dedup_by_key<F, K>(&mut self, mut key: F)
-    where
-        F: FnMut(&mut A::Item) -> K,
-        K: PartialEq<K>,
-    {
-        self.dedup_by(|a, b| key(a) == key(b));
-    }
-
-    /// Creates a `SmallVec` directly from the raw components of another
-    /// `SmallVec`.
-    ///
-    /// # Safety
-    ///
-    /// This is highly unsafe, due to the number of invariants that aren't
-    /// checked:
-    ///
-    /// * `ptr` needs to have been previously allocated via `SmallVec` for its
-    ///   spilled storage (at least, it's highly likely to be incorrect if it
-    ///   wasn't).
-    /// * `ptr`'s `A::Item` type needs to be the same size and alignment that
-    ///   it was allocated with
-    /// * `length` needs to be less than or equal to `capacity`.
-    /// * `capacity` needs to be the capacity that the pointer was allocated
-    ///   with.
-    ///
-    /// Violating these may cause problems like corrupting the allocator's
-    /// internal data structures.
-    ///
-    /// Additionally, `capacity` must be greater than the amount of inline
-    /// storage `A` has; that is, the new `SmallVec` must need to spill over
-    /// into heap allocated storage. This condition is asserted against.
-    ///
-    /// The ownership of `ptr` is effectively transferred to the
-    /// `SmallVec` which may then deallocate, reallocate or change the
-    /// contents of memory pointed to by the pointer at will. Ensure
-    /// that nothing else uses the pointer after calling this
-    /// function.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # #[macro_use] extern crate smallvec;
-    /// # use smallvec::SmallVec;
-    /// use std::mem;
-    /// use std::ptr;
-    ///
-    /// fn main() {
-    ///     let mut v: SmallVec<[_; 1]> = smallvec![1, 2, 3];
-    ///
-    ///     // Pull out the important parts of `v`.
-    ///     let p = v.as_mut_ptr();
-    ///     let len = v.len();
-    ///     let cap = v.capacity();
-    ///     let spilled = v.spilled();
-    ///
-    ///     unsafe {
-    ///         // Forget all about `v`. The heap allocation that stored the
-    ///         // three values won't be deallocated.
-    ///         mem::forget(v);
-    ///
-    ///         // Overwrite memory with [4, 5, 6].
-    ///         //
-    ///         // This is only safe if `spilled` is true! Otherwise, we are
-    ///         // writing into the old `SmallVec`'s inline storage on the
-    ///         // stack.
-    ///         assert!(spilled);
-    ///         for i in 0..len {
-    ///             ptr::write(p.add(i), 4 + i);
-    ///         }
-    ///
-    ///         // Put everything back together into a SmallVec with a different
-    ///         // amount of inline storage, but which is still less than `cap`.
-    ///         let rebuilt = SmallVec::<[_; 2]>::from_raw_parts(p, len, cap);
-    ///         assert_eq!(&*rebuilt, &[4, 5, 6]);
-    ///     }
-    /// }
-    #[inline]
-    pub unsafe fn from_raw_parts(ptr: *mut A::Item, length: usize, capacity: usize) -> SmallVec<A> {
-        assert!(capacity > A::size());
-        SmallVec {
-            capacity,
-            data: SmallVecData::from_heap(ptr, length),
-        }
-    }
-}
-
-impl<A: Array> SmallVec<A>
-where
-    A::Item: Copy,
-{
-    /// Copy the elements from a slice into a new `SmallVec`.
-    ///
-    /// For slices of `Copy` types, this is more efficient than `SmallVec::from(slice)`.
-    pub fn from_slice(slice: &[A::Item]) -> Self {
-        let len = slice.len();
-        if len <= A::size() {
-            SmallVec {
-                capacity: len,
-                data: SmallVecData::from_inline(unsafe {
-                    let mut data: MaybeUninit<A> = MaybeUninit::uninit();
-                    ptr::copy_nonoverlapping(
-                        slice.as_ptr(),
-                        data.as_mut_ptr() as *mut A::Item,
-                        len,
-                    );
-                    data
-                }),
-            }
-        } else {
-            let mut b = slice.to_vec();
-            let (ptr, cap) = (b.as_mut_ptr(), b.capacity());
-            mem::forget(b);
-            SmallVec {
-                capacity: cap,
-                data: SmallVecData::from_heap(ptr, len),
-            }
-        }
-    }
-
-    /// Copy elements from a slice into the vector at position `index`, shifting any following
-    /// elements toward the back.
-    ///
-    /// For slices of `Copy` types, this is more efficient than `insert`.
-    pub fn insert_from_slice(&mut self, index: usize, slice: &[A::Item]) {
-        self.reserve(slice.len());
-
-        let len = self.len();
-        assert!(index <= len);
-
-        unsafe {
-            let slice_ptr = slice.as_ptr();
-            let ptr = self.as_mut_ptr().add(index);
-            ptr::copy(ptr, ptr.add(slice.len()), len - index);
-            ptr::copy_nonoverlapping(slice_ptr, ptr, slice.len());
-            self.set_len(len + slice.len());
-        }
-    }
-
-    /// Copy elements from a slice and append them to the vector.
-    ///
-    /// For slices of `Copy` types, this is more efficient than `extend`.
-    #[inline]
-    pub fn extend_from_slice(&mut self, slice: &[A::Item]) {
-        let len = self.len();
-        self.insert_from_slice(len, slice);
-    }
-}
-
-impl<A: Array> SmallVec<A>
-where
-    A::Item: Clone,
-{
-    /// Resizes the vector so that its length is equal to `len`.
-    ///
-    /// If `len` is less than the current length, the vector simply truncated.
-    ///
-    /// If `len` is greater than the current length, `value` is appended to the
-    /// vector until its length equals `len`.
-    pub fn resize(&mut self, len: usize, value: A::Item) {
-        let old_len = self.len();
-
-        if len > old_len {
-            self.extend(repeat(value).take(len - old_len));
-        } else {
-            self.truncate(len);
-        }
-    }
-
-    /// Creates a `SmallVec` with `n` copies of `elem`.
-    /// ```
-    /// use smallvec::SmallVec;
-    ///
-    /// let v = SmallVec::<[char; 128]>::from_elem('d', 2);
-    /// assert_eq!(v, SmallVec::from_buf(['d', 'd']));
-    /// ```
-    pub fn from_elem(elem: A::Item, n: usize) -> Self {
-        if n > A::size() {
-            vec![elem; n].into()
-        } else {
-            let mut v = SmallVec::<A>::new();
-            unsafe {
-                let (ptr, len_ptr, _) = v.triple_mut();
-                let mut local_len = SetLenOnDrop::new(len_ptr);
-
-                for i in 0..n {
-                    ::core::ptr::write(ptr.add(i), elem.clone());
-                    local_len.increment_len(1);
-                }
-            }
-            v
-        }
-    }
-}
-
-impl<A: Array> ops::Deref for SmallVec<A> {
-    type Target = [A::Item];
-    #[inline]
-    fn deref(&self) -> &[A::Item] {
-        unsafe {
-            let (ptr, len, _) = self.triple();
-            slice::from_raw_parts(ptr, len)
-        }
-    }
-}
-
-impl<A: Array> ops::DerefMut for SmallVec<A> {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut [A::Item] {
-        unsafe {
-            let (ptr, &mut len, _) = self.triple_mut();
-            slice::from_raw_parts_mut(ptr, len)
-        }
-    }
-}
-
-impl<A: Array> AsRef<[A::Item]> for SmallVec<A> {
-    #[inline]
-    fn as_ref(&self) -> &[A::Item] {
-        self
-    }
-}
-
-impl<A: Array> AsMut<[A::Item]> for SmallVec<A> {
-    #[inline]
-    fn as_mut(&mut self) -> &mut [A::Item] {
-        self
-    }
-}
-
-impl<A: Array> Borrow<[A::Item]> for SmallVec<A> {
-    #[inline]
-    fn borrow(&self) -> &[A::Item] {
-        self
-    }
-}
-
-impl<A: Array> BorrowMut<[A::Item]> for SmallVec<A> {
-    #[inline]
-    fn borrow_mut(&mut self) -> &mut [A::Item] {
-        self
-    }
-}
-
-#[cfg(feature = "write")]
-impl<A: Array<Item = u8>> io::Write for SmallVec<A> {
-    #[inline]
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.extend_from_slice(buf);
-        Ok(buf.len())
-    }
-
-    #[inline]
-    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
-        self.extend_from_slice(buf);
-        Ok(())
-    }
-
-    #[inline]
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-#[cfg(feature = "serde")]
-impl<A: Array> Serialize for SmallVec<A>
-where
-    A::Item: Serialize,
-{
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut state = serializer.serialize_seq(Some(self.len()))?;
-        for item in self {
-            state.serialize_element(&item)?;
-        }
-        state.end()
-    }
-}
-
-#[cfg(feature = "serde")]
-impl<'de, A: Array> Deserialize<'de> for SmallVec<A>
-where
-    A::Item: Deserialize<'de>,
-{
-    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        deserializer.deserialize_seq(SmallVecVisitor {
-            phantom: PhantomData,
-        })
-    }
-}
-
-#[cfg(feature = "serde")]
-struct SmallVecVisitor<A> {
-    phantom: PhantomData<A>,
-}
-
-#[cfg(feature = "serde")]
-impl<'de, A: Array> Visitor<'de> for SmallVecVisitor<A>
-where
-    A::Item: Deserialize<'de>,
-{
-    type Value = SmallVec<A>;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter.write_str("a sequence")
-    }
-
-    fn visit_seq<B>(self, mut seq: B) -> Result<Self::Value, B::Error>
-    where
-        B: SeqAccess<'de>,
-    {
-        let len = seq.size_hint().unwrap_or(0);
-        let mut values = SmallVec::with_capacity(len);
-
-        while let Some(value) = seq.next_element()? {
-            values.push(value);
-        }
-
-        Ok(values)
-    }
-}
-
-#[cfg(feature = "specialization")]
-trait SpecFrom<A: Array, S> {
-    fn spec_from(slice: S) -> SmallVec<A>;
-}
-
-#[cfg(feature = "specialization")]
-mod specialization;
-
-#[cfg(feature = "specialization")]
-impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
-where
-    A::Item: Copy,
-{
-    #[inline]
-    fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
-        SmallVec::from_slice(slice)
-    }
-}
-
-impl<'a, A: Array> From<&'a [A::Item]> for SmallVec<A>
-where
-    A::Item: Clone,
-{
-    #[cfg(not(feature = "specialization"))]
-    #[inline]
-    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
-        slice.iter().cloned().collect()
-    }
-
-    #[cfg(feature = "specialization")]
-    #[inline]
-    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
-        SmallVec::spec_from(slice)
-    }
-}
-
-impl<A: Array> From<Vec<A::Item>> for SmallVec<A> {
-    #[inline]
-    fn from(vec: Vec<A::Item>) -> SmallVec<A> {
-        SmallVec::from_vec(vec)
-    }
-}
-
-impl<A: Array> From<A> for SmallVec<A> {
-    #[inline]
-    fn from(array: A) -> SmallVec<A> {
-        SmallVec::from_buf(array)
-    }
-}
-
-impl<A: Array, I: SliceIndex<[A::Item]>> ops::Index<I> for SmallVec<A> {
-    type Output = I::Output;
-
-    fn index(&self, index: I) -> &I::Output {
-        &(**self)[index]
-    }
-}
-
-impl<A: Array, I: SliceIndex<[A::Item]>> ops::IndexMut<I> for SmallVec<A> {
-    fn index_mut(&mut self, index: I) -> &mut I::Output {
-        &mut (&mut **self)[index]
-    }
-}
-
-impl<A: Array> ExtendFromSlice<A::Item> for SmallVec<A>
-where
-    A::Item: Copy,
-{
-    fn extend_from_slice(&mut self, other: &[A::Item]) {
-        SmallVec::extend_from_slice(self, other)
-    }
-}
-
-impl<A: Array> FromIterator<A::Item> for SmallVec<A> {
-    #[inline]
-    fn from_iter<I: IntoIterator<Item = A::Item>>(iterable: I) -> SmallVec<A> {
-        let mut v = SmallVec::new();
-        v.extend(iterable);
-        v
-    }
-}
-
-impl<A: Array> Extend<A::Item> for SmallVec<A> {
-    fn extend<I: IntoIterator<Item = A::Item>>(&mut self, iterable: I) {
-        let mut iter = iterable.into_iter();
-        let (lower_size_bound, _) = iter.size_hint();
-        self.reserve(lower_size_bound);
-
-        unsafe {
-            let (ptr, len_ptr, cap) = self.triple_mut();
-            let mut len = SetLenOnDrop::new(len_ptr);
-            while len.get() < cap {
-                if let Some(out) = iter.next() {
-                    ptr::write(ptr.add(len.get()), out);
-                    len.increment_len(1);
-                } else {
-                    return;
-                }
-            }
-        }
-
-        for elem in iter {
-            self.push(elem);
-        }
-    }
-}
-
-impl<A: Array> fmt::Debug for SmallVec<A>
-where
-    A::Item: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_list().entries(self.iter()).finish()
-    }
-}
-
-impl<A: Array> Default for SmallVec<A> {
-    #[inline]
-    fn default() -> SmallVec<A> {
-        SmallVec::new()
-    }
-}
-
-#[cfg(feature = "may_dangle")]
-unsafe impl<#[may_dangle] A: Array> Drop for SmallVec<A> {
-    fn drop(&mut self) {
-        unsafe {
-            if self.spilled() {
-                let (ptr, len) = self.data.heap();
-                Vec::from_raw_parts(ptr, len, self.capacity);
-            } else {
-                ptr::drop_in_place(&mut self[..]);
-            }
-        }
-    }
-}
-
-#[cfg(not(feature = "may_dangle"))]
-impl<A: Array> Drop for SmallVec<A> {
-    fn drop(&mut self) {
-        unsafe {
-            if self.spilled() {
-                let (ptr, len) = self.data.heap();
-                Vec::from_raw_parts(ptr, len, self.capacity);
-            } else {
-                ptr::drop_in_place(&mut self[..]);
-            }
-        }
-    }
-}
-
-impl<A: Array> Clone for SmallVec<A>
-where
-    A::Item: Clone,
-{
-    #[inline]
-    fn clone(&self) -> SmallVec<A> {
-        let mut new_vector = SmallVec::with_capacity(self.len());
-        for element in self.iter() {
-            new_vector.push((*element).clone())
-        }
-        new_vector
-    }
-}
-
-impl<A: Array, B: Array> PartialEq<SmallVec<B>> for SmallVec<A>
-where
-    A::Item: PartialEq<B::Item>,
-{
-    #[inline]
-    fn eq(&self, other: &SmallVec<B>) -> bool {
-        self[..] == other[..]
-    }
-}
-
-impl<A: Array> Eq for SmallVec<A> where A::Item: Eq {}
-
-impl<A: Array> PartialOrd for SmallVec<A>
-where
-    A::Item: PartialOrd,
-{
-    #[inline]
-    fn partial_cmp(&self, other: &SmallVec<A>) -> Option<cmp::Ordering> {
-        PartialOrd::partial_cmp(&**self, &**other)
-    }
-}
-
-impl<A: Array> Ord for SmallVec<A>
-where
-    A::Item: Ord,
-{
-    #[inline]
-    fn cmp(&self, other: &SmallVec<A>) -> cmp::Ordering {
-        Ord::cmp(&**self, &**other)
-    }
-}
-
-impl<A: Array> Hash for SmallVec<A>
-where
-    A::Item: Hash,
-{
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        (**self).hash(state)
-    }
-}
-
-unsafe impl<A: Array> Send for SmallVec<A> where A::Item: Send {}
-
-/// An iterator that consumes a `SmallVec` and yields its items by value.
-///
-/// Returned from [`SmallVec::into_iter`][1].
-///
-/// [1]: struct.SmallVec.html#method.into_iter
-pub struct IntoIter<A: Array> {
-    data: SmallVec<A>,
-    current: usize,
-    end: usize,
-}
-
-impl<A: Array> fmt::Debug for IntoIter<A>
-where
-    A::Item: fmt::Debug,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("IntoIter").field(&self.as_slice()).finish()
-    }
-}
-
-impl<A: Array + Clone> Clone for IntoIter<A>
-where
-    A::Item: Clone,
-{
-    fn clone(&self) -> IntoIter<A> {
-        SmallVec::from(self.as_slice()).into_iter()
-    }
-}
-
-impl<A: Array> Drop for IntoIter<A> {
-    fn drop(&mut self) {
-        for _ in self {}
-    }
-}
-
-impl<A: Array> Iterator for IntoIter<A> {
-    type Item = A::Item;
-
-    #[inline]
-    fn next(&mut self) -> Option<A::Item> {
-        if self.current == self.end {
-            None
-        } else {
-            unsafe {
-                let current = self.current;
-                self.current += 1;
-                Some(ptr::read(self.data.as_ptr().add(current)))
-            }
-        }
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let size = self.end - self.current;
-        (size, Some(size))
-    }
-}
-
-impl<A: Array> DoubleEndedIterator for IntoIter<A> {
-    #[inline]
-    fn next_back(&mut self) -> Option<A::Item> {
-        if self.current == self.end {
-            None
-        } else {
-            unsafe {
-                self.end -= 1;
-                Some(ptr::read(self.data.as_ptr().add(self.end)))
-            }
-        }
-    }
-}
-
-impl<A: Array> ExactSizeIterator for IntoIter<A> {}
-impl<A: Array> FusedIterator for IntoIter<A> {}
-
-impl<A: Array> IntoIter<A> {
-    /// Returns the remaining items of this iterator as a slice.
-    pub fn as_slice(&self) -> &[A::Item] {
-        let len = self.end - self.current;
-        unsafe { core::slice::from_raw_parts(self.data.as_ptr().add(self.current), len) }
-    }
-
-    /// Returns the remaining items of this iterator as a mutable slice.
-    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
-        let len = self.end - self.current;
-        unsafe { core::slice::from_raw_parts_mut(self.data.as_mut_ptr().add(self.current), len) }
-    }
-}
-
-impl<A: Array> IntoIterator for SmallVec<A> {
-    type IntoIter = IntoIter<A>;
-    type Item = A::Item;
-    fn into_iter(mut self) -> Self::IntoIter {
-        unsafe {
-            // Set SmallVec len to zero as `IntoIter` drop handles dropping of the elements
-            let len = self.len();
-            self.set_len(0);
-            IntoIter {
-                data: self,
-                current: 0,
-                end: len,
-            }
-        }
-    }
-}
-
-impl<'a, A: Array> IntoIterator for &'a SmallVec<A> {
-    type IntoIter = slice::Iter<'a, A::Item>;
-    type Item = &'a A::Item;
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-impl<'a, A: Array> IntoIterator for &'a mut SmallVec<A> {
-    type IntoIter = slice::IterMut<'a, A::Item>;
-    type Item = &'a mut A::Item;
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter_mut()
-    }
-}
-
-/// Types that can be used as the backing store for a SmallVec
-pub unsafe trait Array {
-    /// The type of the array's elements.
-    type Item;
-    /// Returns the number of items the array can hold.
-    fn size() -> usize;
-}
-
-/// Set the length of the vec when the `SetLenOnDrop` value goes out of scope.
-///
-/// Copied from https://github.com/rust-lang/rust/pull/36355
-struct SetLenOnDrop<'a> {
-    len: &'a mut usize,
-    local_len: usize,
-}
-
-impl<'a> SetLenOnDrop<'a> {
-    #[inline]
-    fn new(len: &'a mut usize) -> Self {
-        SetLenOnDrop {
-            local_len: *len,
-            len,
-        }
-    }
-
-    #[inline]
-    fn get(&self) -> usize {
-        self.local_len
-    }
-
-    #[inline]
-    fn increment_len(&mut self, increment: usize) {
-        self.local_len += increment;
-    }
-}
-
-impl<'a> Drop for SetLenOnDrop<'a> {
-    #[inline]
-    fn drop(&mut self) {
-        *self.len = self.local_len;
-    }
-}
-
-#[cfg(feature = "const_generics")]
-unsafe impl<T, const N: usize> Array for [T; N] {
-    type Item = T;
-    fn size() -> usize { N }
-}
-
-#[cfg(not(feature = "const_generics"))]
-macro_rules! impl_array(
-    ($($size:expr),+) => {
-        $(
-            unsafe impl<T> Array for [T; $size] {
-                type Item = T;
-                fn size() -> usize { $size }
-            }
-        )+
-    }
-);
-
-#[cfg(not(feature = "const_generics"))]
-impl_array!(
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 24, 32, 36, 0x40, 0x60, 0x80,
-    0x100, 0x200, 0x400, 0x600, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x8000, 0x10000, 0x20000,
-    0x40000, 0x60000, 0x80000, 0x10_0000
-);
-
-/// Convenience trait for constructing a `SmallVec`
-pub trait ToSmallVec<A:Array> {
-    /// Construct a new `SmallVec` from a slice.
-    fn to_smallvec(&self) -> SmallVec<A>;
-}
-
-impl<A:Array> ToSmallVec<A> for [A::Item]
-    where A::Item: Copy {
-    #[inline]
-    fn to_smallvec(&self) -> SmallVec<A> {
-        SmallVec::from_slice(self)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::SmallVec;
-
-    use std::iter::FromIterator;
-
-    use alloc::borrow::ToOwned;
-    use alloc::boxed::Box;
-    use alloc::rc::Rc;
-    use alloc::{vec, vec::Vec};
-
-    #[test]
-    pub fn test_zero() {
-        let mut v = SmallVec::<[_; 0]>::new();
-        assert!(!v.spilled());
-        v.push(0usize);
-        assert!(v.spilled());
-        assert_eq!(&*v, &[0]);
-    }
-
-    // We heap allocate all these strings so that double frees will show up under valgrind.
-
-    #[test]
-    pub fn test_inline() {
-        let mut v = SmallVec::<[_; 16]>::new();
-        v.push("hello".to_owned());
-        v.push("there".to_owned());
-        assert_eq!(&*v, &["hello".to_owned(), "there".to_owned(),][..]);
-    }
-
-    #[test]
-    pub fn test_spill() {
-        let mut v = SmallVec::<[_; 2]>::new();
-        v.push("hello".to_owned());
-        assert_eq!(v[0], "hello");
-        v.push("there".to_owned());
-        v.push("burma".to_owned());
-        assert_eq!(v[0], "hello");
-        v.push("shave".to_owned());
-        assert_eq!(
-            &*v,
-            &[
-                "hello".to_owned(),
-                "there".to_owned(),
-                "burma".to_owned(),
-                "shave".to_owned(),
-            ][..]
-        );
-    }
-
-    #[test]
-    pub fn test_double_spill() {
-        let mut v = SmallVec::<[_; 2]>::new();
-        v.push("hello".to_owned());
-        v.push("there".to_owned());
-        v.push("burma".to_owned());
-        v.push("shave".to_owned());
-        v.push("hello".to_owned());
-        v.push("there".to_owned());
-        v.push("burma".to_owned());
-        v.push("shave".to_owned());
-        assert_eq!(
-            &*v,
-            &[
-                "hello".to_owned(),
-                "there".to_owned(),
-                "burma".to_owned(),
-                "shave".to_owned(),
-                "hello".to_owned(),
-                "there".to_owned(),
-                "burma".to_owned(),
-                "shave".to_owned(),
-            ][..]
-        );
-    }
-
-    /// https://github.com/servo/rust-smallvec/issues/4
-    #[test]
-    fn issue_4() {
-        SmallVec::<[Box<u32>; 2]>::new();
-    }
-
-    /// https://github.com/servo/rust-smallvec/issues/5
-    #[test]
-    fn issue_5() {
-        assert!(Some(SmallVec::<[&u32; 2]>::new()).is_some());
-    }
-
-    #[test]
-    fn test_with_capacity() {
-        let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(1);
-        assert!(v.is_empty());
-        assert!(!v.spilled());
-        assert_eq!(v.capacity(), 3);
-
-        let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(10);
-        assert!(v.is_empty());
-        assert!(v.spilled());
-        assert_eq!(v.capacity(), 10);
-    }
-
-    #[test]
-    fn drain() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        assert_eq!(v.drain(..).collect::<Vec<_>>(), &[3]);
-
-        // spilling the vec
-        v.push(3);
-        v.push(4);
-        v.push(5);
-        let old_capacity = v.capacity();
-        assert_eq!(v.drain(1..).collect::<Vec<_>>(), &[4, 5]);
-        // drain should not change the capacity
-        assert_eq!(v.capacity(), old_capacity);
-    }
-
-    #[test]
-    fn drain_rev() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[3]);
-
-        // spilling the vec
-        v.push(3);
-        v.push(4);
-        v.push(5);
-        assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[5, 4, 3]);
-    }
-
-    #[test]
-    fn drain_forget() {
-        let mut v: SmallVec<[u8; 1]> = smallvec![0, 1, 2, 3, 4, 5, 6, 7];
-        std::mem::forget(v.drain(2..5));
-        assert_eq!(v.len(), 2);
-    }
-
-    #[test]
-    fn into_iter() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3]);
-
-        // spilling the vec
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        v.push(4);
-        v.push(5);
-        assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3, 4, 5]);
-    }
-
-    #[test]
-    fn into_iter_rev() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[3]);
-
-        // spilling the vec
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(3);
-        v.push(4);
-        v.push(5);
-        assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[5, 4, 3]);
-    }
-
-    #[test]
-    fn into_iter_drop() {
-        use std::cell::Cell;
-
-        struct DropCounter<'a>(&'a Cell<i32>);
-
-        impl<'a> Drop for DropCounter<'a> {
-            fn drop(&mut self) {
-                self.0.set(self.0.get() + 1);
-            }
-        }
-
-        {
-            let cell = Cell::new(0);
-            let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
-            v.push(DropCounter(&cell));
-            v.into_iter();
-            assert_eq!(cell.get(), 1);
-        }
-
-        {
-            let cell = Cell::new(0);
-            let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
-            v.push(DropCounter(&cell));
-            v.push(DropCounter(&cell));
-            assert!(v.into_iter().next().is_some());
-            assert_eq!(cell.get(), 2);
-        }
-
-        {
-            let cell = Cell::new(0);
-            let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
-            v.push(DropCounter(&cell));
-            v.push(DropCounter(&cell));
-            v.push(DropCounter(&cell));
-            assert!(v.into_iter().next().is_some());
-            assert_eq!(cell.get(), 3);
-        }
-        {
-            let cell = Cell::new(0);
-            let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
-            v.push(DropCounter(&cell));
-            v.push(DropCounter(&cell));
-            v.push(DropCounter(&cell));
-            {
-                let mut it = v.into_iter();
-                assert!(it.next().is_some());
-                assert!(it.next_back().is_some());
-            }
-            assert_eq!(cell.get(), 3);
-        }
-    }
-
-    #[test]
-    fn test_capacity() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.reserve(1);
-        assert_eq!(v.capacity(), 2);
-        assert!(!v.spilled());
-
-        v.reserve_exact(0x100);
-        assert!(v.capacity() >= 0x100);
-
-        v.push(0);
-        v.push(1);
-        v.push(2);
-        v.push(3);
-
-        v.shrink_to_fit();
-        assert!(v.capacity() < 0x100);
-    }
-
-    #[test]
-    fn test_truncate() {
-        let mut v: SmallVec<[Box<u8>; 8]> = SmallVec::new();
-
-        for x in 0..8 {
-            v.push(Box::new(x));
-        }
-        v.truncate(4);
-
-        assert_eq!(v.len(), 4);
-        assert!(!v.spilled());
-
-        assert_eq!(*v.swap_remove(1), 1);
-        assert_eq!(*v.remove(1), 3);
-        v.insert(1, Box::new(3));
-
-        assert_eq!(&v.iter().map(|v| **v).collect::<Vec<_>>(), &[0, 3, 2]);
-    }
-
-    #[test]
-    fn test_insert_many() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        for x in 0..4 {
-            v.push(x);
-        }
-        assert_eq!(v.len(), 4);
-        v.insert_many(1, [5, 6].iter().cloned());
-        assert_eq!(
-            &v.iter().map(|v| *v).collect::<Vec<_>>(),
-            &[0, 5, 6, 1, 2, 3]
-        );
-    }
-
-    struct MockHintIter<T: Iterator> {
-        x: T,
-        hint: usize,
-    }
-    impl<T: Iterator> Iterator for MockHintIter<T> {
-        type Item = T::Item;
-        fn next(&mut self) -> Option<Self::Item> {
-            self.x.next()
-        }
-        fn size_hint(&self) -> (usize, Option<usize>) {
-            (self.hint, None)
-        }
-    }
-
-    #[test]
-    fn test_insert_many_short_hint() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        for x in 0..4 {
-            v.push(x);
-        }
-        assert_eq!(v.len(), 4);
-        v.insert_many(
-            1,
-            MockHintIter {
-                x: [5, 6].iter().cloned(),
-                hint: 5,
-            },
-        );
-        assert_eq!(
-            &v.iter().map(|v| *v).collect::<Vec<_>>(),
-            &[0, 5, 6, 1, 2, 3]
-        );
-    }
-
-    #[test]
-    fn test_insert_many_long_hint() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        for x in 0..4 {
-            v.push(x);
-        }
-        assert_eq!(v.len(), 4);
-        v.insert_many(
-            1,
-            MockHintIter {
-                x: [5, 6].iter().cloned(),
-                hint: 1,
-            },
-        );
-        assert_eq!(
-            &v.iter().map(|v| *v).collect::<Vec<_>>(),
-            &[0, 5, 6, 1, 2, 3]
-        );
-    }
-
-    #[test]
-    // https://github.com/servo/rust-smallvec/issues/96
-    fn test_insert_many_panic() {
-        struct PanicOnDoubleDrop {
-            dropped: Box<bool>,
-        }
-
-        impl Drop for PanicOnDoubleDrop {
-            fn drop(&mut self) {
-                assert!(!*self.dropped, "already dropped");
-                *self.dropped = true;
-            }
-        }
-
-        struct BadIter;
-        impl Iterator for BadIter {
-            type Item = PanicOnDoubleDrop;
-            fn size_hint(&self) -> (usize, Option<usize>) {
-                (1, None)
-            }
-            fn next(&mut self) -> Option<Self::Item> {
-                panic!()
-            }
-        }
-
-        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> = vec![
-            PanicOnDoubleDrop {
-                dropped: Box::new(false),
-            },
-            PanicOnDoubleDrop {
-                dropped: Box::new(false),
-            },
-        ]
-        .into();
-        let result = ::std::panic::catch_unwind(move || {
-            vec.insert_many(0, BadIter);
-        });
-        assert!(result.is_err());
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_invalid_grow() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        v.extend(0..8);
-        v.grow(5);
-    }
-
-    #[test]
-    fn test_insert_from_slice() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        for x in 0..4 {
-            v.push(x);
-        }
-        assert_eq!(v.len(), 4);
-        v.insert_from_slice(1, &[5, 6]);
-        assert_eq!(
-            &v.iter().map(|v| *v).collect::<Vec<_>>(),
-            &[0, 5, 6, 1, 2, 3]
-        );
-    }
-
-    #[test]
-    fn test_extend_from_slice() {
-        let mut v: SmallVec<[u8; 8]> = SmallVec::new();
-        for x in 0..4 {
-            v.push(x);
-        }
-        assert_eq!(v.len(), 4);
-        v.extend_from_slice(&[5, 6]);
-        assert_eq!(
-            &v.iter().map(|v| *v).collect::<Vec<_>>(),
-            &[0, 1, 2, 3, 5, 6]
-        );
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_drop_panic_smallvec() {
-        // This test should only panic once, and not double panic,
-        // which would mean a double drop
-        struct DropPanic;
-
-        impl Drop for DropPanic {
-            fn drop(&mut self) {
-                panic!("drop");
-            }
-        }
-
-        let mut v = SmallVec::<[_; 1]>::new();
-        v.push(DropPanic);
-    }
-
-    #[test]
-    fn test_eq() {
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        let mut b: SmallVec<[u32; 2]> = SmallVec::new();
-        let mut c: SmallVec<[u32; 2]> = SmallVec::new();
-        // a = [1, 2]
-        a.push(1);
-        a.push(2);
-        // b = [1, 2]
-        b.push(1);
-        b.push(2);
-        // c = [3, 4]
-        c.push(3);
-        c.push(4);
-
-        assert!(a == b);
-        assert!(a != c);
-    }
-
-    #[test]
-    fn test_ord() {
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        let mut b: SmallVec<[u32; 2]> = SmallVec::new();
-        let mut c: SmallVec<[u32; 2]> = SmallVec::new();
-        // a = [1]
-        a.push(1);
-        // b = [1, 1]
-        b.push(1);
-        b.push(1);
-        // c = [1, 2]
-        c.push(1);
-        c.push(2);
-
-        assert!(a < b);
-        assert!(b > a);
-        assert!(b < c);
-        assert!(c > b);
-    }
-
-    #[test]
-    fn test_hash() {
-        use std::collections::hash_map::DefaultHasher;
-        use std::hash::Hash;
-
-        {
-            let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-            let b = [1, 2];
-            a.extend(b.iter().cloned());
-            let mut hasher = DefaultHasher::new();
-            assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
-        }
-        {
-            let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-            let b = [1, 2, 11, 12];
-            a.extend(b.iter().cloned());
-            let mut hasher = DefaultHasher::new();
-            assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
-        }
-    }
-
-    #[test]
-    fn test_as_ref() {
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        a.push(1);
-        assert_eq!(a.as_ref(), [1]);
-        a.push(2);
-        assert_eq!(a.as_ref(), [1, 2]);
-        a.push(3);
-        assert_eq!(a.as_ref(), [1, 2, 3]);
-    }
-
-    #[test]
-    fn test_as_mut() {
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        a.push(1);
-        assert_eq!(a.as_mut(), [1]);
-        a.push(2);
-        assert_eq!(a.as_mut(), [1, 2]);
-        a.push(3);
-        assert_eq!(a.as_mut(), [1, 2, 3]);
-        a.as_mut()[1] = 4;
-        assert_eq!(a.as_mut(), [1, 4, 3]);
-    }
-
-    #[test]
-    fn test_borrow() {
-        use std::borrow::Borrow;
-
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        a.push(1);
-        assert_eq!(a.borrow(), [1]);
-        a.push(2);
-        assert_eq!(a.borrow(), [1, 2]);
-        a.push(3);
-        assert_eq!(a.borrow(), [1, 2, 3]);
-    }
-
-    #[test]
-    fn test_borrow_mut() {
-        use std::borrow::BorrowMut;
-
-        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
-        a.push(1);
-        assert_eq!(a.borrow_mut(), [1]);
-        a.push(2);
-        assert_eq!(a.borrow_mut(), [1, 2]);
-        a.push(3);
-        assert_eq!(a.borrow_mut(), [1, 2, 3]);
-        BorrowMut::<[u32]>::borrow_mut(&mut a)[1] = 4;
-        assert_eq!(a.borrow_mut(), [1, 4, 3]);
-    }
-
-    #[test]
-    fn test_from() {
-        assert_eq!(&SmallVec::<[u32; 2]>::from(&[1][..])[..], [1]);
-        assert_eq!(&SmallVec::<[u32; 2]>::from(&[1, 2, 3][..])[..], [1, 2, 3]);
-
-        let vec = vec![];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
-        assert_eq!(&*small_vec, &[]);
-        drop(small_vec);
-
-        let vec = vec![1, 2, 3, 4, 5];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
-        assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-        drop(small_vec);
-
-        let vec = vec![1, 2, 3, 4, 5];
-        let small_vec: SmallVec<[u8; 1]> = SmallVec::from(vec);
-        assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-        drop(small_vec);
-
-        let array = [1];
-        let small_vec: SmallVec<[u8; 1]> = SmallVec::from(array);
-        assert_eq!(&*small_vec, &[1]);
-        drop(small_vec);
-
-        let array = [99; 128];
-        let small_vec: SmallVec<[u8; 128]> = SmallVec::from(array);
-        assert_eq!(&*small_vec, vec![99u8; 128].as_slice());
-        drop(small_vec);
-    }
-
-    #[test]
-    fn test_from_slice() {
-        assert_eq!(&SmallVec::<[u32; 2]>::from_slice(&[1][..])[..], [1]);
-        assert_eq!(
-            &SmallVec::<[u32; 2]>::from_slice(&[1, 2, 3][..])[..],
-            [1, 2, 3]
-        );
-    }
-
-    #[test]
-    fn test_exact_size_iterator() {
-        let mut vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
-        assert_eq!(vec.clone().into_iter().len(), 3);
-        assert_eq!(vec.drain(..2).len(), 2);
-        assert_eq!(vec.into_iter().len(), 1);
-    }
-
-    #[test]
-    fn test_into_iter_as_slice() {
-        let vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
-        let mut iter = vec.clone().into_iter();
-        assert_eq!(iter.as_slice(), &[1, 2, 3]);
-        assert_eq!(iter.as_mut_slice(), &[1, 2, 3]);
-        iter.next();
-        assert_eq!(iter.as_slice(), &[2, 3]);
-        assert_eq!(iter.as_mut_slice(), &[2, 3]);
-        iter.next_back();
-        assert_eq!(iter.as_slice(), &[2]);
-        assert_eq!(iter.as_mut_slice(), &[2]);
-    }
-
-    #[test]
-    fn test_into_iter_clone() {
-        // Test that the cloned iterator yields identical elements and that it owns its own copy
-        // (i.e. no use after move errors).
-        let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter();
-        let mut clone_iter = iter.clone();
-        while let Some(x) = iter.next() {
-            assert_eq!(x, clone_iter.next().unwrap());
-        }
-        assert_eq!(clone_iter.next(), None);
-    }
-
-    #[test]
-    fn test_into_iter_clone_partially_consumed_iterator() {
-        // Test that the cloned iterator only contains the remaining elements of the original iterator.
-        let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter().skip(1);
-        let mut clone_iter = iter.clone();
-        while let Some(x) = iter.next() {
-            assert_eq!(x, clone_iter.next().unwrap());
-        }
-        assert_eq!(clone_iter.next(), None);
-    }
-
-    #[test]
-    fn test_into_iter_clone_empty_smallvec() {
-        let mut iter = SmallVec::<[u8; 2]>::new().into_iter();
-        let mut clone_iter = iter.clone();
-        assert_eq!(iter.next(), None);
-        assert_eq!(clone_iter.next(), None);
-    }
-
-    #[test]
-    fn shrink_to_fit_unspill() {
-        let mut vec = SmallVec::<[u8; 2]>::from_iter(0..3);
-        vec.pop();
-        assert!(vec.spilled());
-        vec.shrink_to_fit();
-        assert!(!vec.spilled(), "shrink_to_fit will un-spill if possible");
-    }
-
-    #[test]
-    fn test_into_vec() {
-        let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
-        assert_eq!(vec.into_vec(), vec![0, 1]);
-
-        let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
-        assert_eq!(vec.into_vec(), vec![0, 1, 2]);
-    }
-
-    #[test]
-    fn test_into_inner() {
-        let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
-        assert_eq!(vec.into_inner(), Ok([0, 1]));
-
-        let vec = SmallVec::<[u8; 2]>::from_iter(0..1);
-        assert_eq!(vec.clone().into_inner(), Err(vec));
-
-        let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
-        assert_eq!(vec.clone().into_inner(), Err(vec));
-    }
-
-    #[test]
-    fn test_from_vec() {
-        let vec = vec![];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[]);
-        drop(small_vec);
-
-        let vec = vec![];
-        let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[]);
-        drop(small_vec);
-
-        let vec = vec![1];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[1]);
-        drop(small_vec);
-
-        let vec = vec![1, 2, 3];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[1, 2, 3]);
-        drop(small_vec);
-
-        let vec = vec![1, 2, 3, 4, 5];
-        let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-        drop(small_vec);
-
-        let vec = vec![1, 2, 3, 4, 5];
-        let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
-        assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
-        drop(small_vec);
-    }
-
-    #[test]
-    fn test_retain() {
-        // Test inline data storate
-        let mut sv: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
-        sv.retain(|&mut i| i != 3);
-        assert_eq!(sv.pop(), Some(4));
-        assert_eq!(sv.pop(), Some(2));
-        assert_eq!(sv.pop(), Some(1));
-        assert_eq!(sv.pop(), None);
-
-        // Test spilled data storage
-        let mut sv: SmallVec<[i32; 3]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
-        sv.retain(|&mut i| i != 3);
-        assert_eq!(sv.pop(), Some(4));
-        assert_eq!(sv.pop(), Some(2));
-        assert_eq!(sv.pop(), Some(1));
-        assert_eq!(sv.pop(), None);
-
-        // Test that drop implementations are called for inline.
-        let one = Rc::new(1);
-        let mut sv: SmallVec<[Rc<i32>; 3]> = SmallVec::new();
-        sv.push(Rc::clone(&one));
-        assert_eq!(Rc::strong_count(&one), 2);
-        sv.retain(|_| false);
-        assert_eq!(Rc::strong_count(&one), 1);
-
-        // Test that drop implementations are called for spilled data.
-        let mut sv: SmallVec<[Rc<i32>; 1]> = SmallVec::new();
-        sv.push(Rc::clone(&one));
-        sv.push(Rc::new(2));
-        assert_eq!(Rc::strong_count(&one), 2);
-        sv.retain(|_| false);
-        assert_eq!(Rc::strong_count(&one), 1);
-    }
-
-    #[test]
-    fn test_dedup() {
-        let mut dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 2, 3, 3]);
-        dupes.dedup();
-        assert_eq!(&*dupes, &[1, 2, 3]);
-
-        let mut empty: SmallVec<[i32; 5]> = SmallVec::new();
-        empty.dedup();
-        assert!(empty.is_empty());
-
-        let mut all_ones: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 1, 1, 1]);
-        all_ones.dedup();
-        assert_eq!(all_ones.len(), 1);
-
-        let mut no_dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 4, 5]);
-        no_dupes.dedup();
-        assert_eq!(no_dupes.len(), 5);
-    }
-
-    #[test]
-    fn test_resize() {
-        let mut v: SmallVec<[i32; 8]> = SmallVec::new();
-        v.push(1);
-        v.resize(5, 0);
-        assert_eq!(v[..], [1, 0, 0, 0, 0][..]);
-
-        v.resize(2, -1);
-        assert_eq!(v[..], [1, 0][..]);
-    }
-
-    #[cfg(feature = "write")]
-    #[test]
-    fn test_write() {
-        use std::io::Write;
-
-        let data = [1, 2, 3, 4, 5];
-
-        let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
-        let len = small_vec.write(&data[..]).unwrap();
-        assert_eq!(len, 5);
-        assert_eq!(small_vec.as_ref(), data.as_ref());
-
-        let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
-        small_vec.write_all(&data[..]).unwrap();
-        assert_eq!(small_vec.as_ref(), data.as_ref());
-    }
-
-    #[cfg(feature = "serde")]
-    extern crate bincode;
-
-    #[cfg(feature = "serde")]
-    #[test]
-    fn test_serde() {
-        use self::bincode::{config, deserialize};
-        let mut small_vec: SmallVec<[i32; 2]> = SmallVec::new();
-        small_vec.push(1);
-        let encoded = config().limit(100).serialize(&small_vec).unwrap();
-        let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
-        assert_eq!(small_vec, decoded);
-        small_vec.push(2);
-        // Spill the vec
-        small_vec.push(3);
-        small_vec.push(4);
-        // Check again after spilling.
-        let encoded = config().limit(100).serialize(&small_vec).unwrap();
-        let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
-        assert_eq!(small_vec, decoded);
-    }
-
-    #[test]
-    fn grow_to_shrink() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(1);
-        v.push(2);
-        v.push(3);
-        assert!(v.spilled());
-        v.clear();
-        // Shrink to inline.
-        v.grow(2);
-        assert!(!v.spilled());
-        assert_eq!(v.capacity(), 2);
-        assert_eq!(v.len(), 0);
-        v.push(4);
-        assert_eq!(v[..], [4]);
-    }
-
-    #[test]
-    fn resumable_extend() {
-        let s = "a b c";
-        // This iterator yields: (Some('a'), None, Some('b'), None, Some('c')), None
-        let it = s
-            .chars()
-            .scan(0, |_, ch| if ch.is_whitespace() { None } else { Some(ch) });
-        let mut v: SmallVec<[char; 4]> = SmallVec::new();
-        v.extend(it);
-        assert_eq!(v[..], ['a']);
-    }
-
-    // #139
-    #[test]
-    fn uninhabited() {
-        enum Void {}
-        let _sv = SmallVec::<[Void; 8]>::new();
-    }
-
-    #[test]
-    fn grow_spilled_same_size() {
-        let mut v: SmallVec<[u8; 2]> = SmallVec::new();
-        v.push(0);
-        v.push(1);
-        v.push(2);
-        assert!(v.spilled());
-        assert_eq!(v.capacity(), 4);
-        // grow with the same capacity
-        v.grow(4);
-        assert_eq!(v.capacity(), 4);
-        assert_eq!(v[..], [0, 1, 2]);
-    }
-
-    #[cfg(feature = "const_generics")]
-    #[test]
-    fn const_generics() {
-        let _v = SmallVec::<[i32; 987]>::default();
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/scripts/run_miri.sh firefox-85.0+build1/third_party/rust/smallvec/scripts/run_miri.sh
--- firefox-84.0.2+build1/third_party/rust/smallvec/scripts/run_miri.sh	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/scripts/run_miri.sh	2021-01-18 19:58:26.000000000 +0000
@@ -16,6 +16,6 @@
 rustup component add miri
 cargo miri setup
 
-cargo miri test --verbose -- -Zmiri-ignore-leaks
-cargo miri test --verbose --features union -- -Zmiri-ignore-leaks
-cargo miri test --verbose --all-features -- -Zmiri-ignore-leaks
+cargo miri test --verbose
+cargo miri test --verbose --features union
+cargo miri test --verbose --all-features
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/specialization.rs firefox-85.0+build1/third_party/rust/smallvec/specialization.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/specialization.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/specialization.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Implementations that require `default fn`.
-
-use super::{Array, SmallVec, SpecFrom};
-
-impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
-where
-    A::Item: Clone,
-{
-    #[inline]
-    default fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
-        slice.into_iter().cloned().collect()
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/src/lib.rs firefox-85.0+build1/third_party/rust/smallvec/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,1979 @@
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Small vectors in various sizes. These store a certain number of elements inline, and fall back
+//! to the heap for larger allocations.  This can be a useful optimization for improving cache
+//! locality and reducing allocator traffic for workloads that fit within the inline buffer.
+//!
+//! ## `no_std` support
+//!
+//! By default, `smallvec` does not depend on `std`.  However, the optional
+//! `write` feature implements the `std::io::Write` trait for vectors of `u8`.
+//! When this feature is enabled, `smallvec` depends on `std`.
+//!
+//! ## Optional features
+//!
+//! ### `serde`
+//!
+//! When this optional dependency is enabled, `SmallVec` implements the `serde::Serialize` and
+//! `serde::Deserialize` traits.
+//!
+//! ### `write`
+//!
+//! When this feature is enabled, `SmallVec<[u8; _]>` implements the `std::io::Write` trait.
+//! This feature is not compatible with `#![no_std]` programs.
+//!
+//! ### `union`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When the `union` feature is enabled `smallvec` will track its state (inline or spilled)
+//! without the use of an enum tag, reducing the size of the `smallvec` by one machine word.
+//! This means that there is potentially no space overhead compared to `Vec`.
+//! Note that `smallvec` can still be larger than `Vec` if the inline buffer is larger than two
+//! machine words.
+//!
+//! To use this feature add `features = ["union"]` in the `smallvec` section of Cargo.toml.
+//! Note that this feature requires a nightly compiler (for now).
+//!
+//! Tracking issue: [rust-lang/rust#55149](https://github.com/rust-lang/rust/issues/55149)
+//!
+//! ### `const_generics`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When this feature is enabled, `SmallVec` works with any arrays of any size, not just a fixed
+//! list of sizes.
+//!
+//! Tracking issue: [rust-lang/rust#44580](https://github.com/rust-lang/rust/issues/44580)
+//!
+//! ### `specialization`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! When this feature is enabled, `SmallVec::from(slice)` has improved performance for slices
+//! of `Copy` types.  (Without this feature, you can use `SmallVec::from_slice` to get optimal
+//! performance for `Copy` types.)
+//!
+//! Tracking issue: [rust-lang/rust#31844](https://github.com/rust-lang/rust/issues/31844)
+//!
+//! ### `may_dangle`
+//!
+//! **This feature is unstable and requires a nightly build of the Rust toolchain.**
+//!
+//! This feature makes the Rust compiler less strict about use of vectors that contain borrowed
+//! references. For details, see the
+//! [Rustonomicon](https://doc.rust-lang.org/1.42.0/nomicon/dropck.html#an-escape-hatch).
+//!
+//! Tracking issue: [rust-lang/rust#34761](https://github.com/rust-lang/rust/issues/34761)
+
+#![no_std]
+#![cfg_attr(feature = "union", feature(untagged_unions))]
+#![cfg_attr(feature = "specialization", allow(incomplete_features))]
+#![cfg_attr(feature = "specialization", feature(specialization))]
+#![cfg_attr(feature = "may_dangle", feature(dropck_eyepatch))]
+#![cfg_attr(feature = "const_generics", feature(min_const_generics))]
+#![deny(missing_docs)]
+
+#[doc(hidden)]
+pub extern crate alloc;
+
+#[cfg(any(test, feature = "write"))]
+extern crate std;
+
+#[cfg(test)]
+mod tests;
+
+use alloc::alloc::{Layout, LayoutErr};
+use alloc::boxed::Box;
+use alloc::{vec, vec::Vec};
+use core::borrow::{Borrow, BorrowMut};
+use core::cmp;
+use core::fmt;
+use core::hash::{Hash, Hasher};
+use core::hint::unreachable_unchecked;
+use core::iter::{repeat, FromIterator, FusedIterator, IntoIterator};
+use core::mem;
+use core::mem::MaybeUninit;
+use core::ops::{self, Range, RangeBounds};
+use core::ptr::{self, NonNull};
+use core::slice::{self, SliceIndex};
+
+#[cfg(feature = "serde")]
+use serde::{
+    de::{Deserialize, Deserializer, SeqAccess, Visitor},
+    ser::{Serialize, SerializeSeq, Serializer},
+};
+
+#[cfg(feature = "serde")]
+use core::marker::PhantomData;
+
+#[cfg(feature = "write")]
+use std::io;
+
+/// Creates a [`SmallVec`] containing the arguments.
+///
+/// `smallvec!` allows `SmallVec`s to be defined with the same syntax as array expressions.
+/// There are two forms of this macro:
+///
+/// - Create a [`SmallVec`] containing a given list of elements:
+///
+/// ```
+/// # #[macro_use] extern crate smallvec;
+/// # use smallvec::SmallVec;
+/// # fn main() {
+/// let v: SmallVec<[_; 128]> = smallvec![1, 2, 3];
+/// assert_eq!(v[0], 1);
+/// assert_eq!(v[1], 2);
+/// assert_eq!(v[2], 3);
+/// # }
+/// ```
+///
+/// - Create a [`SmallVec`] from a given element and size:
+///
+/// ```
+/// # #[macro_use] extern crate smallvec;
+/// # use smallvec::SmallVec;
+/// # fn main() {
+/// let v: SmallVec<[_; 0x8000]> = smallvec![1; 3];
+/// assert_eq!(v, SmallVec::from_buf([1, 1, 1]));
+/// # }
+/// ```
+///
+/// Note that unlike array expressions this syntax supports all elements
+/// which implement [`Clone`] and the number of elements doesn't have to be
+/// a constant.
+///
+/// This will use `clone` to duplicate an expression, so one should be careful
+/// using this with types having a nonstandard `Clone` implementation. For
+/// example, `smallvec![Rc::new(1); 5]` will create a vector of five references
+/// to the same boxed integer value, not five references pointing to independently
+/// boxed integers.
+
+#[macro_export]
+macro_rules! smallvec {
+    // count helper: transform any expression into 1
+    (@one $x:expr) => (1usize);
+    ($elem:expr; $n:expr) => ({
+        $crate::SmallVec::from_elem($elem, $n)
+    });
+    ($($x:expr),*$(,)*) => ({
+        let count = 0usize $(+ $crate::smallvec!(@one $x))*;
+        #[allow(unused_mut)]
+        let mut vec = $crate::SmallVec::new();
+        if count <= vec.inline_size() {
+            $(vec.push($x);)*
+            vec
+        } else {
+            $crate::SmallVec::from_vec($crate::alloc::vec![$($x,)*])
+        }
+    });
+}
+
+/// `panic!()` in debug builds, optimization hint in release.
+#[cfg(not(feature = "union"))]
+macro_rules! debug_unreachable {
+    () => {
+        debug_unreachable!("entered unreachable code")
+    };
+    ($e:expr) => {
+        if cfg!(not(debug_assertions)) {
+            unreachable_unchecked();
+        } else {
+            panic!($e);
+        }
+    };
+}
+
+/// Trait to be implemented by a collection that can be extended from a slice
+///
+/// ## Example
+///
+/// ```rust
+/// use smallvec::{ExtendFromSlice, SmallVec};
+///
+/// fn initialize<V: ExtendFromSlice<u8>>(v: &mut V) {
+///     v.extend_from_slice(b"Test!");
+/// }
+///
+/// let mut vec = Vec::new();
+/// initialize(&mut vec);
+/// assert_eq!(&vec, b"Test!");
+///
+/// let mut small_vec = SmallVec::<[u8; 8]>::new();
+/// initialize(&mut small_vec);
+/// assert_eq!(&small_vec as &[_], b"Test!");
+/// ```
+#[doc(hidden)]
+#[deprecated]
+pub trait ExtendFromSlice<T> {
+    /// Extends a collection from a slice of its element type
+    fn extend_from_slice(&mut self, other: &[T]);
+}
+
+#[allow(deprecated)]
+impl<T: Clone> ExtendFromSlice<T> for Vec<T> {
+    fn extend_from_slice(&mut self, other: &[T]) {
+        Vec::extend_from_slice(self, other)
+    }
+}
+
+/// Error type for APIs with fallible heap allocation
+#[derive(Debug)]
+pub enum CollectionAllocErr {
+    /// Overflow `usize::MAX` or other error during size computation
+    CapacityOverflow,
+    /// The allocator return an error
+    AllocErr {
+        /// The layout that was passed to the allocator
+        layout: Layout,
+    },
+}
+
+impl fmt::Display for CollectionAllocErr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Allocation error: {:?}", self)
+    }
+}
+
+impl From<LayoutErr> for CollectionAllocErr {
+    fn from(_: LayoutErr) -> Self {
+        CollectionAllocErr::CapacityOverflow
+    }
+}
+
+fn infallible<T>(result: Result<T, CollectionAllocErr>) -> T {
+    match result {
+        Ok(x) => x,
+        Err(CollectionAllocErr::CapacityOverflow) => panic!("capacity overflow"),
+        Err(CollectionAllocErr::AllocErr { layout }) => alloc::alloc::handle_alloc_error(layout),
+    }
+}
+
+/// FIXME: use `Layout::array` when we require a Rust version where it’s stable
+/// https://github.com/rust-lang/rust/issues/55724
+fn layout_array<T>(n: usize) -> Result<Layout, CollectionAllocErr> {
+    let size = mem::size_of::<T>()
+        .checked_mul(n)
+        .ok_or(CollectionAllocErr::CapacityOverflow)?;
+    let align = mem::align_of::<T>();
+    Layout::from_size_align(size, align).map_err(|_| CollectionAllocErr::CapacityOverflow)
+}
+
+unsafe fn deallocate<T>(ptr: *mut T, capacity: usize) {
+    // This unwrap should succeed since the same did when allocating.
+    let layout = layout_array::<T>(capacity).unwrap();
+    alloc::alloc::dealloc(ptr as *mut u8, layout)
+}
+
+/// An iterator that removes the items from a `SmallVec` and yields them by value.
+///
+/// Returned from [`SmallVec::drain`][1].
+///
+/// [1]: struct.SmallVec.html#method.drain
+pub struct Drain<'a, T: 'a + Array> {
+    tail_start: usize,
+    tail_len: usize,
+    iter: slice::Iter<'a, T::Item>,
+    vec: NonNull<SmallVec<T>>,
+}
+
+impl<'a, T: 'a + Array> fmt::Debug for Drain<'a, T>
+where
+    T::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("Drain").field(&self.iter.as_slice()).finish()
+    }
+}
+
+unsafe impl<'a, T: Sync + Array> Sync for Drain<'a, T> {}
+unsafe impl<'a, T: Send + Array> Send for Drain<'a, T> {}
+
+impl<'a, T: 'a + Array> Iterator for Drain<'a, T> {
+    type Item = T::Item;
+
+    #[inline]
+    fn next(&mut self) -> Option<T::Item> {
+        self.iter
+            .next()
+            .map(|reference| unsafe { ptr::read(reference) })
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, T: 'a + Array> DoubleEndedIterator for Drain<'a, T> {
+    #[inline]
+    fn next_back(&mut self) -> Option<T::Item> {
+        self.iter
+            .next_back()
+            .map(|reference| unsafe { ptr::read(reference) })
+    }
+}
+
+impl<'a, T: Array> ExactSizeIterator for Drain<'a, T> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.iter.len()
+    }
+}
+
+impl<'a, T: Array> FusedIterator for Drain<'a, T> {}
+
+impl<'a, T: 'a + Array> Drop for Drain<'a, T> {
+    fn drop(&mut self) {
+        self.for_each(drop);
+
+        if self.tail_len > 0 {
+            unsafe {
+                let source_vec = self.vec.as_mut();
+
+                // memmove back untouched tail, update to new length
+                let start = source_vec.len();
+                let tail = self.tail_start;
+                if tail != start {
+                    let src = source_vec.as_ptr().add(tail);
+                    let dst = source_vec.as_mut_ptr().add(start);
+                    ptr::copy(src, dst, self.tail_len);
+                }
+                source_vec.set_len(start + self.tail_len);
+            }
+        }
+    }
+}
+
+#[cfg(feature = "union")]
+union SmallVecData<A: Array> {
+    inline: MaybeUninit<A>,
+    heap: (*mut A::Item, usize),
+}
+
+#[cfg(feature = "union")]
+impl<A: Array> SmallVecData<A> {
+    #[inline]
+    unsafe fn inline(&self) -> *const A::Item {
+        self.inline.as_ptr() as *const A::Item
+    }
+    #[inline]
+    unsafe fn inline_mut(&mut self) -> *mut A::Item {
+        self.inline.as_mut_ptr() as *mut A::Item
+    }
+    #[inline]
+    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
+        SmallVecData { inline }
+    }
+    #[inline]
+    unsafe fn into_inline(self) -> MaybeUninit<A> {
+        self.inline
+    }
+    #[inline]
+    unsafe fn heap(&self) -> (*mut A::Item, usize) {
+        self.heap
+    }
+    #[inline]
+    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
+        &mut self.heap
+    }
+    #[inline]
+    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
+        SmallVecData { heap: (ptr, len) }
+    }
+}
+
+#[cfg(not(feature = "union"))]
+enum SmallVecData<A: Array> {
+    Inline(MaybeUninit<A>),
+    Heap((*mut A::Item, usize)),
+}
+
+#[cfg(not(feature = "union"))]
+impl<A: Array> SmallVecData<A> {
+    #[inline]
+    unsafe fn inline(&self) -> *const A::Item {
+        match self {
+            SmallVecData::Inline(a) => a.as_ptr() as *const A::Item,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn inline_mut(&mut self) -> *mut A::Item {
+        match self {
+            SmallVecData::Inline(a) => a.as_mut_ptr() as *mut A::Item,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    fn from_inline(inline: MaybeUninit<A>) -> SmallVecData<A> {
+        SmallVecData::Inline(inline)
+    }
+    #[inline]
+    unsafe fn into_inline(self) -> MaybeUninit<A> {
+        match self {
+            SmallVecData::Inline(a) => a,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn heap(&self) -> (*mut A::Item, usize) {
+        match self {
+            SmallVecData::Heap(data) => *data,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    unsafe fn heap_mut(&mut self) -> &mut (*mut A::Item, usize) {
+        match self {
+            SmallVecData::Heap(data) => data,
+            _ => debug_unreachable!(),
+        }
+    }
+    #[inline]
+    fn from_heap(ptr: *mut A::Item, len: usize) -> SmallVecData<A> {
+        SmallVecData::Heap((ptr, len))
+    }
+}
+
+unsafe impl<A: Array + Send> Send for SmallVecData<A> {}
+unsafe impl<A: Array + Sync> Sync for SmallVecData<A> {}
+
+/// A `Vec`-like container that can store a small number of elements inline.
+///
+/// `SmallVec` acts like a vector, but can store a limited amount of data inline within the
+/// `SmallVec` struct rather than in a separate allocation.  If the data exceeds this limit, the
+/// `SmallVec` will "spill" its data onto the heap, allocating a new buffer to hold it.
+///
+/// The amount of data that a `SmallVec` can store inline depends on its backing store. The backing
+/// store can be any type that implements the `Array` trait; usually it is a small fixed-sized
+/// array.  For example a `SmallVec<[u64; 8]>` can hold up to eight 64-bit integers inline.
+///
+/// ## Example
+///
+/// ```rust
+/// use smallvec::SmallVec;
+/// let mut v = SmallVec::<[u8; 4]>::new(); // initialize an empty vector
+///
+/// // The vector can hold up to 4 items without spilling onto the heap.
+/// v.extend(0..4);
+/// assert_eq!(v.len(), 4);
+/// assert!(!v.spilled());
+///
+/// // Pushing another element will force the buffer to spill:
+/// v.push(4);
+/// assert_eq!(v.len(), 5);
+/// assert!(v.spilled());
+/// ```
+pub struct SmallVec<A: Array> {
+    // The capacity field is used to determine which of the storage variants is active:
+    // If capacity <= Self::inline_capacity() then the inline variant is used and capacity holds the current length of the vector (number of elements actually in use).
+    // If capacity > Self::inline_capacity() then the heap variant is used and capacity holds the size of the memory allocation.
+    capacity: usize,
+    data: SmallVecData<A>,
+}
+
+impl<A: Array> SmallVec<A> {
+    /// Construct an empty vector
+    #[inline]
+    pub fn new() -> SmallVec<A> {
+        // Try to detect invalid custom implementations of `Array`. Hopefuly,
+        // this check should be optimized away entirely for valid ones.
+        assert!(
+            mem::size_of::<A>() == A::size() * mem::size_of::<A::Item>()
+                && mem::align_of::<A>() >= mem::align_of::<A::Item>()
+        );
+        SmallVec {
+            capacity: 0,
+            data: SmallVecData::from_inline(MaybeUninit::uninit()),
+        }
+    }
+
+    /// Construct an empty vector with enough capacity pre-allocated to store at least `n`
+    /// elements.
+    ///
+    /// Will create a heap allocation only if `n` is larger than the inline capacity.
+    ///
+    /// ```
+    /// # use smallvec::SmallVec;
+    ///
+    /// let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(100);
+    ///
+    /// assert!(v.is_empty());
+    /// assert!(v.capacity() >= 100);
+    /// ```
+    #[inline]
+    pub fn with_capacity(n: usize) -> Self {
+        let mut v = SmallVec::new();
+        v.reserve_exact(n);
+        v
+    }
+
+    /// Construct a new `SmallVec` from a `Vec<A::Item>`.
+    ///
+    /// Elements will be copied to the inline buffer if vec.capacity() <= Self::inline_capacity().
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let vec = vec![1, 2, 3, 4, 5];
+    /// let small_vec: SmallVec<[_; 3]> = SmallVec::from_vec(vec);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_vec(mut vec: Vec<A::Item>) -> SmallVec<A> {
+        if vec.capacity() <= Self::inline_capacity() {
+            unsafe {
+                let mut data = SmallVecData::<A>::from_inline(MaybeUninit::uninit());
+                let len = vec.len();
+                vec.set_len(0);
+                ptr::copy_nonoverlapping(vec.as_ptr(), data.inline_mut(), len);
+
+                SmallVec {
+                    capacity: len,
+                    data,
+                }
+            }
+        } else {
+            let (ptr, cap, len) = (vec.as_mut_ptr(), vec.capacity(), vec.len());
+            mem::forget(vec);
+
+            SmallVec {
+                capacity: cap,
+                data: SmallVecData::from_heap(ptr, len),
+            }
+        }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let buf = [1, 2, 3, 4, 5];
+    /// let small_vec: SmallVec<_> = SmallVec::from_buf(buf);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_buf(buf: A) -> SmallVec<A> {
+        SmallVec {
+            capacity: A::size(),
+            data: SmallVecData::from_inline(MaybeUninit::new(buf)),
+        }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements. Also sets the length, which must be less or
+    /// equal to the size of `buf`.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    ///
+    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
+    /// let small_vec: SmallVec<_> = SmallVec::from_buf_and_len(buf, 5);
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub fn from_buf_and_len(buf: A, len: usize) -> SmallVec<A> {
+        assert!(len <= A::size());
+        unsafe { SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), len) }
+    }
+
+    /// Constructs a new `SmallVec` on the stack from an `A` without
+    /// copying elements. Also sets the length. The user is responsible
+    /// for ensuring that `len <= A::size()`.
+    ///
+    /// ```rust
+    /// use smallvec::SmallVec;
+    /// use std::mem::MaybeUninit;
+    ///
+    /// let buf = [1, 2, 3, 4, 5, 0, 0, 0];
+    /// let small_vec: SmallVec<_> = unsafe {
+    ///     SmallVec::from_buf_and_len_unchecked(MaybeUninit::new(buf), 5)
+    /// };
+    ///
+    /// assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    /// ```
+    #[inline]
+    pub unsafe fn from_buf_and_len_unchecked(buf: MaybeUninit<A>, len: usize) -> SmallVec<A> {
+        SmallVec {
+            capacity: len,
+            data: SmallVecData::from_inline(buf),
+        }
+    }
+
+    /// Sets the length of a vector.
+    ///
+    /// This will explicitly set the size of the vector, without actually
+    /// modifying its buffers, so it is up to the caller to ensure that the
+    /// vector is actually the specified size.
+    pub unsafe fn set_len(&mut self, new_len: usize) {
+        let (_, len_ptr, _) = self.triple_mut();
+        *len_ptr = new_len;
+    }
+
+    /// The maximum number of elements this vector can hold inline
+    #[inline]
+    fn inline_capacity() -> usize {
+        if mem::size_of::<A::Item>() > 0 {
+            A::size()
+        } else {
+            // For zero-size items code like `ptr.add(offset)` always returns the same pointer.
+            // Therefore all items are at the same address,
+            // and any array size has capacity for infinitely many items.
+            // The capacity is limited by the bit width of the length field.
+            //
+            // `Vec` also does this:
+            // https://github.com/rust-lang/rust/blob/1.44.0/src/liballoc/raw_vec.rs#L186
+            //
+            // In our case, this also ensures that a smallvec of zero-size items never spills,
+            // and we never try to allocate zero bytes which `std::alloc::alloc` disallows.
+            core::usize::MAX
+        }
+    }
+
+    /// The maximum number of elements this vector can hold inline
+    #[inline]
+    pub fn inline_size(&self) -> usize {
+        Self::inline_capacity()
+    }
+
+    /// The number of elements stored in the vector
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.triple().1
+    }
+
+    /// Returns `true` if the vector is empty
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    /// The number of items the vector can hold without reallocating
+    #[inline]
+    pub fn capacity(&self) -> usize {
+        self.triple().2
+    }
+
+    /// Returns a tuple with (data ptr, len, capacity)
+    /// Useful to get all SmallVec properties with a single check of the current storage variant.
+    #[inline]
+    fn triple(&self) -> (*const A::Item, usize, usize) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                (ptr, len, self.capacity)
+            } else {
+                (self.data.inline(), self.capacity, Self::inline_capacity())
+            }
+        }
+    }
+
+    /// Returns a tuple with (data ptr, len ptr, capacity)
+    #[inline]
+    fn triple_mut(&mut self) -> (*mut A::Item, &mut usize, usize) {
+        unsafe {
+            if self.spilled() {
+                let &mut (ptr, ref mut len_ptr) = self.data.heap_mut();
+                (ptr, len_ptr, self.capacity)
+            } else {
+                (
+                    self.data.inline_mut(),
+                    &mut self.capacity,
+                    Self::inline_capacity(),
+                )
+            }
+        }
+    }
+
+    /// Returns `true` if the data has spilled into a separate heap-allocated buffer.
+    #[inline]
+    pub fn spilled(&self) -> bool {
+        self.capacity > Self::inline_capacity()
+    }
+
+    /// Creates a draining iterator that removes the specified range in the vector
+    /// and yields the removed items.
+    ///
+    /// Note 1: The element range is removed even if the iterator is only
+    /// partially consumed or not consumed at all.
+    ///
+    /// Note 2: It is unspecified how many elements are removed from the vector
+    /// if the `Drain` value is leaked.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the starting point is greater than the end point or if
+    /// the end point is greater than the length of the vector.
+    pub fn drain<R>(&mut self, range: R) -> Drain<'_, A>
+    where
+        R: RangeBounds<usize>,
+    {
+        use core::ops::Bound::*;
+
+        let len = self.len();
+        let start = match range.start_bound() {
+            Included(&n) => n,
+            Excluded(&n) => n + 1,
+            Unbounded => 0,
+        };
+        let end = match range.end_bound() {
+            Included(&n) => n + 1,
+            Excluded(&n) => n,
+            Unbounded => len,
+        };
+
+        assert!(start <= end);
+        assert!(end <= len);
+
+        unsafe {
+            self.set_len(start);
+
+            let range_slice = slice::from_raw_parts_mut(self.as_mut_ptr().add(start), end - start);
+
+            Drain {
+                tail_start: end,
+                tail_len: len - end,
+                iter: range_slice.iter(),
+                vec: NonNull::from(self),
+            }
+        }
+    }
+
+    /// Append an item to the vector.
+    #[inline]
+    pub fn push(&mut self, value: A::Item) {
+        unsafe {
+            let (mut ptr, mut len, cap) = self.triple_mut();
+            if *len == cap {
+                self.reserve(1);
+                let &mut (heap_ptr, ref mut heap_len) = self.data.heap_mut();
+                ptr = heap_ptr;
+                len = heap_len;
+            }
+            ptr::write(ptr.add(*len), value);
+            *len += 1;
+        }
+    }
+
+    /// Remove an item from the end of the vector and return it, or None if empty.
+    #[inline]
+    pub fn pop(&mut self) -> Option<A::Item> {
+        unsafe {
+            let (ptr, len_ptr, _) = self.triple_mut();
+            if *len_ptr == 0 {
+                return None;
+            }
+            let last_index = *len_ptr - 1;
+            *len_ptr = last_index;
+            Some(ptr::read(ptr.add(last_index)))
+        }
+    }
+
+    /// Moves all the elements of `other` into `self`, leaving `other` empty.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use smallvec::{SmallVec, smallvec};
+    /// let mut v0: SmallVec<[u8; 16]> = smallvec![1, 2, 3];
+    /// let mut v1: SmallVec<[u8; 32]> = smallvec![4, 5, 6];
+    /// v0.append(&mut v1);
+    /// assert_eq!(*v0, [1, 2, 3, 4, 5, 6]);
+    /// assert_eq!(*v1, []);
+    /// ```
+    pub fn append<B>(&mut self, other: &mut SmallVec<B>)
+    where B: Array<Item = A::Item>
+    {
+        self.extend(other.drain(..))
+    }
+
+    /// Re-allocate to set the capacity to `max(new_cap, inline_size())`.
+    ///
+    /// Panics if `new_cap` is less than the vector's length
+    /// or if the capacity computation overflows `usize`.
+    pub fn grow(&mut self, new_cap: usize) {
+        infallible(self.try_grow(new_cap))
+    }
+
+    /// Re-allocate to set the capacity to `max(new_cap, inline_size())`.
+    ///
+    /// Panics if `new_cap` is less than the vector's length
+    pub fn try_grow(&mut self, new_cap: usize) -> Result<(), CollectionAllocErr> {
+        unsafe {
+            let (ptr, &mut len, cap) = self.triple_mut();
+            let unspilled = !self.spilled();
+            assert!(new_cap >= len);
+            if new_cap <= self.inline_size() {
+                if unspilled {
+                    return Ok(());
+                }
+                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
+                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
+                self.capacity = len;
+                deallocate(ptr, cap);
+            } else if new_cap != cap {
+                let layout = layout_array::<A::Item>(new_cap)?;
+                debug_assert!(layout.size() > 0);
+                let new_alloc;
+                if unspilled {
+                    new_alloc = NonNull::new(alloc::alloc::alloc(layout))
+                        .ok_or(CollectionAllocErr::AllocErr { layout })?
+                        .cast()
+                        .as_ptr();
+                    ptr::copy_nonoverlapping(ptr, new_alloc, len);
+                } else {
+                    // This should never fail since the same succeeded
+                    // when previously allocating `ptr`.
+                    let old_layout = layout_array::<A::Item>(cap)?;
+
+                    let new_ptr = alloc::alloc::realloc(ptr as *mut u8, old_layout, layout.size());
+                    new_alloc = NonNull::new(new_ptr)
+                        .ok_or(CollectionAllocErr::AllocErr { layout })?
+                        .cast()
+                        .as_ptr();
+                }
+                self.data = SmallVecData::from_heap(new_alloc, len);
+                self.capacity = new_cap;
+            }
+            Ok(())
+        }
+    }
+
+    /// Reserve capacity for `additional` more elements to be inserted.
+    ///
+    /// May reserve more space to avoid frequent reallocations.
+    ///
+    /// Panics if the capacity computation overflows `usize`.
+    #[inline]
+    pub fn reserve(&mut self, additional: usize) {
+        infallible(self.try_reserve(additional))
+    }
+
+    /// Reserve capacity for `additional` more elements to be inserted.
+    ///
+    /// May reserve more space to avoid frequent reallocations.
+    pub fn try_reserve(&mut self, additional: usize) -> Result<(), CollectionAllocErr> {
+        // prefer triple_mut() even if triple() would work
+        // so that the optimizer removes duplicated calls to it
+        // from callers like insert()
+        let (_, &mut len, cap) = self.triple_mut();
+        if cap - len >= additional {
+            return Ok(());
+        }
+        let new_cap = len
+            .checked_add(additional)
+            .and_then(usize::checked_next_power_of_two)
+            .ok_or(CollectionAllocErr::CapacityOverflow)?;
+        self.try_grow(new_cap)
+    }
+
+    /// Reserve the minimum capacity for `additional` more elements to be inserted.
+    ///
+    /// Panics if the new capacity overflows `usize`.
+    pub fn reserve_exact(&mut self, additional: usize) {
+        infallible(self.try_reserve_exact(additional))
+    }
+
+    /// Reserve the minimum capacity for `additional` more elements to be inserted.
+    pub fn try_reserve_exact(&mut self, additional: usize) -> Result<(), CollectionAllocErr> {
+        let (_, &mut len, cap) = self.triple_mut();
+        if cap - len >= additional {
+            return Ok(());
+        }
+        let new_cap = len
+            .checked_add(additional)
+            .ok_or(CollectionAllocErr::CapacityOverflow)?;
+        self.try_grow(new_cap)
+    }
+
+    /// Shrink the capacity of the vector as much as possible.
+    ///
+    /// When possible, this will move data from an external heap buffer to the vector's inline
+    /// storage.
+    pub fn shrink_to_fit(&mut self) {
+        if !self.spilled() {
+            return;
+        }
+        let len = self.len();
+        if self.inline_size() >= len {
+            unsafe {
+                let (ptr, len) = self.data.heap();
+                self.data = SmallVecData::from_inline(MaybeUninit::uninit());
+                ptr::copy_nonoverlapping(ptr, self.data.inline_mut(), len);
+                deallocate(ptr, self.capacity);
+                self.capacity = len;
+            }
+        } else if self.capacity() > len {
+            self.grow(len);
+        }
+    }
+
+    /// Shorten the vector, keeping the first `len` elements and dropping the rest.
+    ///
+    /// If `len` is greater than or equal to the vector's current length, this has no
+    /// effect.
+    ///
+    /// This does not re-allocate.  If you want the vector's capacity to shrink, call
+    /// `shrink_to_fit` after truncating.
+    pub fn truncate(&mut self, len: usize) {
+        unsafe {
+            let (ptr, len_ptr, _) = self.triple_mut();
+            while len < *len_ptr {
+                let last_index = *len_ptr - 1;
+                *len_ptr = last_index;
+                ptr::drop_in_place(ptr.add(last_index));
+            }
+        }
+    }
+
+    /// Extracts a slice containing the entire vector.
+    ///
+    /// Equivalent to `&s[..]`.
+    pub fn as_slice(&self) -> &[A::Item] {
+        self
+    }
+
+    /// Extracts a mutable slice of the entire vector.
+    ///
+    /// Equivalent to `&mut s[..]`.
+    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        self
+    }
+
+    /// Remove the element at position `index`, replacing it with the last element.
+    ///
+    /// This does not preserve ordering, but is O(1).
+    ///
+    /// Panics if `index` is out of bounds.
+    #[inline]
+    pub fn swap_remove(&mut self, index: usize) -> A::Item {
+        let len = self.len();
+        self.swap(len - 1, index);
+        self.pop()
+            .unwrap_or_else(|| unsafe { unreachable_unchecked() })
+    }
+
+    /// Remove all elements from the vector.
+    #[inline]
+    pub fn clear(&mut self) {
+        self.truncate(0);
+    }
+
+    /// Remove and return the element at position `index`, shifting all elements after it to the
+    /// left.
+    ///
+    /// Panics if `index` is out of bounds.
+    pub fn remove(&mut self, index: usize) -> A::Item {
+        unsafe {
+            let (mut ptr, len_ptr, _) = self.triple_mut();
+            let len = *len_ptr;
+            assert!(index < len);
+            *len_ptr = len - 1;
+            ptr = ptr.add(index);
+            let item = ptr::read(ptr);
+            ptr::copy(ptr.add(1), ptr, len - index - 1);
+            item
+        }
+    }
+
+    /// Insert an element at position `index`, shifting all elements after it to the right.
+    ///
+    /// Panics if `index` is out of bounds.
+    pub fn insert(&mut self, index: usize, element: A::Item) {
+        self.reserve(1);
+
+        unsafe {
+            let (mut ptr, len_ptr, _) = self.triple_mut();
+            let len = *len_ptr;
+            assert!(index <= len);
+            *len_ptr = len + 1;
+            ptr = ptr.add(index);
+            ptr::copy(ptr, ptr.add(1), len - index);
+            ptr::write(ptr, element);
+        }
+    }
+
+    /// Insert multiple elements at position `index`, shifting all following elements toward the
+    /// back.
+    pub fn insert_many<I: IntoIterator<Item = A::Item>>(&mut self, index: usize, iterable: I) {
+        let iter = iterable.into_iter();
+        if index == self.len() {
+            return self.extend(iter);
+        }
+
+        let (lower_size_bound, _) = iter.size_hint();
+        assert!(lower_size_bound <= core::isize::MAX as usize); // Ensure offset is indexable
+        assert!(index + lower_size_bound >= index); // Protect against overflow
+        self.reserve(lower_size_bound);
+
+        unsafe {
+            let old_len = self.len();
+            assert!(index <= old_len);
+            let start = self.as_mut_ptr();
+            let mut ptr = start.add(index);
+
+            // Move the trailing elements.
+            ptr::copy(ptr, ptr.add(lower_size_bound), old_len - index);
+
+            // In case the iterator panics, don't double-drop the items we just copied above.
+            self.set_len(0);
+            let mut guard = DropOnPanic {
+                start,
+                skip: index..(index + lower_size_bound),
+                len: old_len + lower_size_bound,
+            };
+
+            let mut num_added = 0;
+            for element in iter {
+                let mut cur = ptr.add(num_added);
+                if num_added >= lower_size_bound {
+                    // Iterator provided more elements than the hint.  Move trailing items again.
+                    self.reserve(1);
+                    let start = self.as_mut_ptr();
+                    ptr = start.add(index);
+                    cur = ptr.add(num_added);
+                    ptr::copy(cur, cur.add(1), old_len - index);
+
+                    guard.start = start;
+                    guard.len += 1;
+                    guard.skip.end += 1;
+                }
+                ptr::write(cur, element);
+                guard.skip.start += 1;
+                num_added += 1;
+            }
+            mem::forget(guard);
+
+            if num_added < lower_size_bound {
+                // Iterator provided fewer elements than the hint
+                ptr::copy(
+                    ptr.add(lower_size_bound),
+                    ptr.add(num_added),
+                    old_len - index,
+                );
+            }
+
+            self.set_len(old_len + num_added);
+        }
+
+        struct DropOnPanic<T> {
+            start: *mut T,
+            skip: Range<usize>,
+            len: usize,
+        }
+
+        impl<T> Drop for DropOnPanic<T> {
+            fn drop(&mut self) {
+                for i in 0..self.len {
+                    if !self.skip.contains(&i) {
+                        unsafe {
+                            ptr::drop_in_place(self.start.add(i));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// Convert a SmallVec to a Vec, without reallocating if the SmallVec has already spilled onto
+    /// the heap.
+    pub fn into_vec(self) -> Vec<A::Item> {
+        if self.spilled() {
+            unsafe {
+                let (ptr, len) = self.data.heap();
+                let v = Vec::from_raw_parts(ptr, len, self.capacity);
+                mem::forget(self);
+                v
+            }
+        } else {
+            self.into_iter().collect()
+        }
+    }
+
+    /// Converts a `SmallVec` into a `Box<[T]>` without reallocating if the `SmallVec` has already spilled
+    /// onto the heap.
+    ///
+    /// Note that this will drop any excess capacity.
+    pub fn into_boxed_slice(self) -> Box<[A::Item]> {
+        self.into_vec().into_boxed_slice()
+    }
+
+    /// Convert the SmallVec into an `A` if possible. Otherwise return `Err(Self)`.
+    ///
+    /// This method returns `Err(Self)` if the SmallVec is too short (and the `A` contains uninitialized elements),
+    /// or if the SmallVec is too long (and all the elements were spilled to the heap).
+    pub fn into_inner(self) -> Result<A, Self> {
+        if self.spilled() || self.len() != A::size() {
+            // Note: A::size, not Self::inline_capacity
+            Err(self)
+        } else {
+            unsafe {
+                let data = ptr::read(&self.data);
+                mem::forget(self);
+                Ok(data.into_inline().assume_init())
+            }
+        }
+    }
+
+    /// Retains only the elements specified by the predicate.
+    ///
+    /// In other words, remove all elements `e` such that `f(&e)` returns `false`.
+    /// This method operates in place and preserves the order of the retained
+    /// elements.
+    pub fn retain<F: FnMut(&mut A::Item) -> bool>(&mut self, mut f: F) {
+        let mut del = 0;
+        let len = self.len();
+        for i in 0..len {
+            if !f(&mut self[i]) {
+                del += 1;
+            } else if del > 0 {
+                self.swap(i - del, i);
+            }
+        }
+        self.truncate(len - del);
+    }
+
+    /// Removes consecutive duplicate elements.
+    pub fn dedup(&mut self)
+    where
+        A::Item: PartialEq<A::Item>,
+    {
+        self.dedup_by(|a, b| a == b);
+    }
+
+    /// Removes consecutive duplicate elements using the given equality relation.
+    pub fn dedup_by<F>(&mut self, mut same_bucket: F)
+    where
+        F: FnMut(&mut A::Item, &mut A::Item) -> bool,
+    {
+        // See the implementation of Vec::dedup_by in the
+        // standard library for an explanation of this algorithm.
+        let len = self.len();
+        if len <= 1 {
+            return;
+        }
+
+        let ptr = self.as_mut_ptr();
+        let mut w: usize = 1;
+
+        unsafe {
+            for r in 1..len {
+                let p_r = ptr.add(r);
+                let p_wm1 = ptr.add(w - 1);
+                if !same_bucket(&mut *p_r, &mut *p_wm1) {
+                    if r != w {
+                        let p_w = p_wm1.add(1);
+                        mem::swap(&mut *p_r, &mut *p_w);
+                    }
+                    w += 1;
+                }
+            }
+        }
+
+        self.truncate(w);
+    }
+
+    /// Removes consecutive elements that map to the same key.
+    pub fn dedup_by_key<F, K>(&mut self, mut key: F)
+    where
+        F: FnMut(&mut A::Item) -> K,
+        K: PartialEq<K>,
+    {
+        self.dedup_by(|a, b| key(a) == key(b));
+    }
+
+    /// Resizes the `SmallVec` in-place so that `len` is equal to `new_len`.
+    ///
+    /// If `new_len` is greater than `len`, the `SmallVec` is extended by the difference, with each
+    /// additional slot filled with the result of calling the closure `f`. The return values from `f`
+    //// will end up in the `SmallVec` in the order they have been generated.
+    ///
+    /// If `new_len` is less than `len`, the `SmallVec` is simply truncated.
+    ///
+    /// This method uses a closure to create new values on every push. If you'd rather `Clone` a given
+    /// value, use `resize`. If you want to use the `Default` trait to generate values, you can pass
+    /// `Default::default()` as the second argument.
+    ///
+    /// Added for std::vec::Vec compatibility (added in Rust 1.33.0)
+    ///
+    /// ```
+    /// # use smallvec::{smallvec, SmallVec};
+    /// let mut vec : SmallVec<[_; 4]> = smallvec![1, 2, 3];
+    /// vec.resize_with(5, Default::default);
+    /// assert_eq!(&*vec, &[1, 2, 3, 0, 0]);
+    ///
+    /// let mut vec : SmallVec<[_; 4]> = smallvec![];
+    /// let mut p = 1;
+    /// vec.resize_with(4, || { p *= 2; p });
+    /// assert_eq!(&*vec, &[2, 4, 8, 16]);
+    /// ```
+    pub fn resize_with<F>(&mut self, new_len: usize, f: F)
+    where
+        F: FnMut() -> A::Item,
+    {
+        let old_len = self.len();
+        if old_len < new_len {
+            let mut f = f;
+            let additional = new_len - old_len;
+            self.reserve(additional);
+            for _ in 0..additional {
+                self.push(f());
+            }
+        } else if old_len > new_len {
+            self.truncate(new_len);
+        }
+    }
+
+    /// Creates a `SmallVec` directly from the raw components of another
+    /// `SmallVec`.
+    ///
+    /// # Safety
+    ///
+    /// This is highly unsafe, due to the number of invariants that aren't
+    /// checked:
+    ///
+    /// * `ptr` needs to have been previously allocated via `SmallVec` for its
+    ///   spilled storage (at least, it's highly likely to be incorrect if it
+    ///   wasn't).
+    /// * `ptr`'s `A::Item` type needs to be the same size and alignment that
+    ///   it was allocated with
+    /// * `length` needs to be less than or equal to `capacity`.
+    /// * `capacity` needs to be the capacity that the pointer was allocated
+    ///   with.
+    ///
+    /// Violating these may cause problems like corrupting the allocator's
+    /// internal data structures.
+    ///
+    /// Additionally, `capacity` must be greater than the amount of inline
+    /// storage `A` has; that is, the new `SmallVec` must need to spill over
+    /// into heap allocated storage. This condition is asserted against.
+    ///
+    /// The ownership of `ptr` is effectively transferred to the
+    /// `SmallVec` which may then deallocate, reallocate or change the
+    /// contents of memory pointed to by the pointer at will. Ensure
+    /// that nothing else uses the pointer after calling this
+    /// function.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # #[macro_use] extern crate smallvec;
+    /// # use smallvec::SmallVec;
+    /// use std::mem;
+    /// use std::ptr;
+    ///
+    /// fn main() {
+    ///     let mut v: SmallVec<[_; 1]> = smallvec![1, 2, 3];
+    ///
+    ///     // Pull out the important parts of `v`.
+    ///     let p = v.as_mut_ptr();
+    ///     let len = v.len();
+    ///     let cap = v.capacity();
+    ///     let spilled = v.spilled();
+    ///
+    ///     unsafe {
+    ///         // Forget all about `v`. The heap allocation that stored the
+    ///         // three values won't be deallocated.
+    ///         mem::forget(v);
+    ///
+    ///         // Overwrite memory with [4, 5, 6].
+    ///         //
+    ///         // This is only safe if `spilled` is true! Otherwise, we are
+    ///         // writing into the old `SmallVec`'s inline storage on the
+    ///         // stack.
+    ///         assert!(spilled);
+    ///         for i in 0..len {
+    ///             ptr::write(p.add(i), 4 + i);
+    ///         }
+    ///
+    ///         // Put everything back together into a SmallVec with a different
+    ///         // amount of inline storage, but which is still less than `cap`.
+    ///         let rebuilt = SmallVec::<[_; 2]>::from_raw_parts(p, len, cap);
+    ///         assert_eq!(&*rebuilt, &[4, 5, 6]);
+    ///     }
+    /// }
+    #[inline]
+    pub unsafe fn from_raw_parts(ptr: *mut A::Item, length: usize, capacity: usize) -> SmallVec<A> {
+        assert!(capacity > Self::inline_capacity());
+        SmallVec {
+            capacity,
+            data: SmallVecData::from_heap(ptr, length),
+        }
+    }
+
+    /// Returns a raw pointer to the vector's buffer.
+    pub fn as_ptr(&self) -> *const A::Item {
+        // We shadow the slice method of the same name to avoid going through
+        // `deref`, which creates an intermediate reference that may place
+        // additional safety constraints on the contents of the slice.
+        self.triple().0
+    }
+
+    /// Returns a raw mutable pointer to the vector's buffer.
+    pub fn as_mut_ptr(&mut self) -> *mut A::Item {
+        // We shadow the slice method of the same name to avoid going through
+        // `deref_mut`, which creates an intermediate reference that may place
+        // additional safety constraints on the contents of the slice.
+        self.triple_mut().0
+    }
+}
+
+impl<A: Array> SmallVec<A>
+where
+    A::Item: Copy,
+{
+    /// Copy the elements from a slice into a new `SmallVec`.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `SmallVec::from(slice)`.
+    pub fn from_slice(slice: &[A::Item]) -> Self {
+        let len = slice.len();
+        if len <= Self::inline_capacity() {
+            SmallVec {
+                capacity: len,
+                data: SmallVecData::from_inline(unsafe {
+                    let mut data: MaybeUninit<A> = MaybeUninit::uninit();
+                    ptr::copy_nonoverlapping(
+                        slice.as_ptr(),
+                        data.as_mut_ptr() as *mut A::Item,
+                        len,
+                    );
+                    data
+                }),
+            }
+        } else {
+            let mut b = slice.to_vec();
+            let (ptr, cap) = (b.as_mut_ptr(), b.capacity());
+            mem::forget(b);
+            SmallVec {
+                capacity: cap,
+                data: SmallVecData::from_heap(ptr, len),
+            }
+        }
+    }
+
+    /// Copy elements from a slice into the vector at position `index`, shifting any following
+    /// elements toward the back.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `insert`.
+    pub fn insert_from_slice(&mut self, index: usize, slice: &[A::Item]) {
+        self.reserve(slice.len());
+
+        let len = self.len();
+        assert!(index <= len);
+
+        unsafe {
+            let slice_ptr = slice.as_ptr();
+            let ptr = self.as_mut_ptr().add(index);
+            ptr::copy(ptr, ptr.add(slice.len()), len - index);
+            ptr::copy_nonoverlapping(slice_ptr, ptr, slice.len());
+            self.set_len(len + slice.len());
+        }
+    }
+
+    /// Copy elements from a slice and append them to the vector.
+    ///
+    /// For slices of `Copy` types, this is more efficient than `extend`.
+    #[inline]
+    pub fn extend_from_slice(&mut self, slice: &[A::Item]) {
+        let len = self.len();
+        self.insert_from_slice(len, slice);
+    }
+}
+
+impl<A: Array> SmallVec<A>
+where
+    A::Item: Clone,
+{
+    /// Resizes the vector so that its length is equal to `len`.
+    ///
+    /// If `len` is less than the current length, the vector simply truncated.
+    ///
+    /// If `len` is greater than the current length, `value` is appended to the
+    /// vector until its length equals `len`.
+    pub fn resize(&mut self, len: usize, value: A::Item) {
+        let old_len = self.len();
+
+        if len > old_len {
+            self.extend(repeat(value).take(len - old_len));
+        } else {
+            self.truncate(len);
+        }
+    }
+
+    /// Creates a `SmallVec` with `n` copies of `elem`.
+    /// ```
+    /// use smallvec::SmallVec;
+    ///
+    /// let v = SmallVec::<[char; 128]>::from_elem('d', 2);
+    /// assert_eq!(v, SmallVec::from_buf(['d', 'd']));
+    /// ```
+    pub fn from_elem(elem: A::Item, n: usize) -> Self {
+        if n > Self::inline_capacity() {
+            vec![elem; n].into()
+        } else {
+            let mut v = SmallVec::<A>::new();
+            unsafe {
+                let (ptr, len_ptr, _) = v.triple_mut();
+                let mut local_len = SetLenOnDrop::new(len_ptr);
+
+                for i in 0..n {
+                    ::core::ptr::write(ptr.add(i), elem.clone());
+                    local_len.increment_len(1);
+                }
+            }
+            v
+        }
+    }
+}
+
+impl<A: Array> ops::Deref for SmallVec<A> {
+    type Target = [A::Item];
+    #[inline]
+    fn deref(&self) -> &[A::Item] {
+        unsafe {
+            let (ptr, len, _) = self.triple();
+            slice::from_raw_parts(ptr, len)
+        }
+    }
+}
+
+impl<A: Array> ops::DerefMut for SmallVec<A> {
+    #[inline]
+    fn deref_mut(&mut self) -> &mut [A::Item] {
+        unsafe {
+            let (ptr, &mut len, _) = self.triple_mut();
+            slice::from_raw_parts_mut(ptr, len)
+        }
+    }
+}
+
+impl<A: Array> AsRef<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn as_ref(&self) -> &[A::Item] {
+        self
+    }
+}
+
+impl<A: Array> AsMut<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn as_mut(&mut self) -> &mut [A::Item] {
+        self
+    }
+}
+
+impl<A: Array> Borrow<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn borrow(&self) -> &[A::Item] {
+        self
+    }
+}
+
+impl<A: Array> BorrowMut<[A::Item]> for SmallVec<A> {
+    #[inline]
+    fn borrow_mut(&mut self) -> &mut [A::Item] {
+        self
+    }
+}
+
+#[cfg(feature = "write")]
+impl<A: Array<Item = u8>> io::Write for SmallVec<A> {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.extend_from_slice(buf);
+        Ok(buf.len())
+    }
+
+    #[inline]
+    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
+        self.extend_from_slice(buf);
+        Ok(())
+    }
+
+    #[inline]
+    fn flush(&mut self) -> io::Result<()> {
+        Ok(())
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<A: Array> Serialize for SmallVec<A>
+where
+    A::Item: Serialize,
+{
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut state = serializer.serialize_seq(Some(self.len()))?;
+        for item in self {
+            state.serialize_element(&item)?;
+        }
+        state.end()
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, A: Array> Deserialize<'de> for SmallVec<A>
+where
+    A::Item: Deserialize<'de>,
+{
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        deserializer.deserialize_seq(SmallVecVisitor {
+            phantom: PhantomData,
+        })
+    }
+}
+
+#[cfg(feature = "serde")]
+struct SmallVecVisitor<A> {
+    phantom: PhantomData<A>,
+}
+
+#[cfg(feature = "serde")]
+impl<'de, A: Array> Visitor<'de> for SmallVecVisitor<A>
+where
+    A::Item: Deserialize<'de>,
+{
+    type Value = SmallVec<A>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("a sequence")
+    }
+
+    fn visit_seq<B>(self, mut seq: B) -> Result<Self::Value, B::Error>
+    where
+        B: SeqAccess<'de>,
+    {
+        use serde::de::Error;
+        let len = seq.size_hint().unwrap_or(0);
+        let mut values = SmallVec::new();
+        values.try_reserve(len).map_err(B::Error::custom)?;
+
+        while let Some(value) = seq.next_element()? {
+            values.push(value);
+        }
+
+        Ok(values)
+    }
+}
+
+#[cfg(feature = "specialization")]
+trait SpecFrom<A: Array, S> {
+    fn spec_from(slice: S) -> SmallVec<A>;
+}
+
+#[cfg(feature = "specialization")]
+mod specialization;
+
+#[cfg(feature = "specialization")]
+impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Copy,
+{
+    #[inline]
+    fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
+        SmallVec::from_slice(slice)
+    }
+}
+
+impl<'a, A: Array> From<&'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[cfg(not(feature = "specialization"))]
+    #[inline]
+    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
+        slice.iter().cloned().collect()
+    }
+
+    #[cfg(feature = "specialization")]
+    #[inline]
+    fn from(slice: &'a [A::Item]) -> SmallVec<A> {
+        SmallVec::spec_from(slice)
+    }
+}
+
+impl<A: Array> From<Vec<A::Item>> for SmallVec<A> {
+    #[inline]
+    fn from(vec: Vec<A::Item>) -> SmallVec<A> {
+        SmallVec::from_vec(vec)
+    }
+}
+
+impl<A: Array> From<A> for SmallVec<A> {
+    #[inline]
+    fn from(array: A) -> SmallVec<A> {
+        SmallVec::from_buf(array)
+    }
+}
+
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::Index<I> for SmallVec<A> {
+    type Output = I::Output;
+
+    fn index(&self, index: I) -> &I::Output {
+        &(**self)[index]
+    }
+}
+
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::IndexMut<I> for SmallVec<A> {
+    fn index_mut(&mut self, index: I) -> &mut I::Output {
+        &mut (&mut **self)[index]
+    }
+}
+
+#[allow(deprecated)]
+impl<A: Array> ExtendFromSlice<A::Item> for SmallVec<A>
+where
+    A::Item: Copy,
+{
+    fn extend_from_slice(&mut self, other: &[A::Item]) {
+        SmallVec::extend_from_slice(self, other)
+    }
+}
+
+impl<A: Array> FromIterator<A::Item> for SmallVec<A> {
+    #[inline]
+    fn from_iter<I: IntoIterator<Item = A::Item>>(iterable: I) -> SmallVec<A> {
+        let mut v = SmallVec::new();
+        v.extend(iterable);
+        v
+    }
+}
+
+impl<A: Array> Extend<A::Item> for SmallVec<A> {
+    fn extend<I: IntoIterator<Item = A::Item>>(&mut self, iterable: I) {
+        let mut iter = iterable.into_iter();
+        let (lower_size_bound, _) = iter.size_hint();
+        self.reserve(lower_size_bound);
+
+        unsafe {
+            let (ptr, len_ptr, cap) = self.triple_mut();
+            let mut len = SetLenOnDrop::new(len_ptr);
+            while len.get() < cap {
+                if let Some(out) = iter.next() {
+                    ptr::write(ptr.add(len.get()), out);
+                    len.increment_len(1);
+                } else {
+                    return;
+                }
+            }
+        }
+
+        for elem in iter {
+            self.push(elem);
+        }
+    }
+}
+
+impl<A: Array> fmt::Debug for SmallVec<A>
+where
+    A::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_list().entries(self.iter()).finish()
+    }
+}
+
+impl<A: Array> Default for SmallVec<A> {
+    #[inline]
+    fn default() -> SmallVec<A> {
+        SmallVec::new()
+    }
+}
+
+#[cfg(feature = "may_dangle")]
+unsafe impl<#[may_dangle] A: Array> Drop for SmallVec<A> {
+    fn drop(&mut self) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                Vec::from_raw_parts(ptr, len, self.capacity);
+            } else {
+                ptr::drop_in_place(&mut self[..]);
+            }
+        }
+    }
+}
+
+#[cfg(not(feature = "may_dangle"))]
+impl<A: Array> Drop for SmallVec<A> {
+    fn drop(&mut self) {
+        unsafe {
+            if self.spilled() {
+                let (ptr, len) = self.data.heap();
+                Vec::from_raw_parts(ptr, len, self.capacity);
+            } else {
+                ptr::drop_in_place(&mut self[..]);
+            }
+        }
+    }
+}
+
+impl<A: Array> Clone for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[inline]
+    fn clone(&self) -> SmallVec<A> {
+        SmallVec::from(self.as_slice())
+    }
+}
+
+impl<A: Array, B: Array> PartialEq<SmallVec<B>> for SmallVec<A>
+where
+    A::Item: PartialEq<B::Item>,
+{
+    #[inline]
+    fn eq(&self, other: &SmallVec<B>) -> bool {
+        self[..] == other[..]
+    }
+}
+
+impl<A: Array> Eq for SmallVec<A> where A::Item: Eq {}
+
+impl<A: Array> PartialOrd for SmallVec<A>
+where
+    A::Item: PartialOrd,
+{
+    #[inline]
+    fn partial_cmp(&self, other: &SmallVec<A>) -> Option<cmp::Ordering> {
+        PartialOrd::partial_cmp(&**self, &**other)
+    }
+}
+
+impl<A: Array> Ord for SmallVec<A>
+where
+    A::Item: Ord,
+{
+    #[inline]
+    fn cmp(&self, other: &SmallVec<A>) -> cmp::Ordering {
+        Ord::cmp(&**self, &**other)
+    }
+}
+
+impl<A: Array> Hash for SmallVec<A>
+where
+    A::Item: Hash,
+{
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        (**self).hash(state)
+    }
+}
+
+unsafe impl<A: Array> Send for SmallVec<A> where A::Item: Send {}
+
+/// An iterator that consumes a `SmallVec` and yields its items by value.
+///
+/// Returned from [`SmallVec::into_iter`][1].
+///
+/// [1]: struct.SmallVec.html#method.into_iter
+pub struct IntoIter<A: Array> {
+    data: SmallVec<A>,
+    current: usize,
+    end: usize,
+}
+
+impl<A: Array> fmt::Debug for IntoIter<A>
+where
+    A::Item: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("IntoIter").field(&self.as_slice()).finish()
+    }
+}
+
+impl<A: Array + Clone> Clone for IntoIter<A>
+where
+    A::Item: Clone,
+{
+    fn clone(&self) -> IntoIter<A> {
+        SmallVec::from(self.as_slice()).into_iter()
+    }
+}
+
+impl<A: Array> Drop for IntoIter<A> {
+    fn drop(&mut self) {
+        for _ in self {}
+    }
+}
+
+impl<A: Array> Iterator for IntoIter<A> {
+    type Item = A::Item;
+
+    #[inline]
+    fn next(&mut self) -> Option<A::Item> {
+        if self.current == self.end {
+            None
+        } else {
+            unsafe {
+                let current = self.current;
+                self.current += 1;
+                Some(ptr::read(self.data.as_ptr().add(current)))
+            }
+        }
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let size = self.end - self.current;
+        (size, Some(size))
+    }
+}
+
+impl<A: Array> DoubleEndedIterator for IntoIter<A> {
+    #[inline]
+    fn next_back(&mut self) -> Option<A::Item> {
+        if self.current == self.end {
+            None
+        } else {
+            unsafe {
+                self.end -= 1;
+                Some(ptr::read(self.data.as_ptr().add(self.end)))
+            }
+        }
+    }
+}
+
+impl<A: Array> ExactSizeIterator for IntoIter<A> {}
+impl<A: Array> FusedIterator for IntoIter<A> {}
+
+impl<A: Array> IntoIter<A> {
+    /// Returns the remaining items of this iterator as a slice.
+    pub fn as_slice(&self) -> &[A::Item] {
+        let len = self.end - self.current;
+        unsafe { core::slice::from_raw_parts(self.data.as_ptr().add(self.current), len) }
+    }
+
+    /// Returns the remaining items of this iterator as a mutable slice.
+    pub fn as_mut_slice(&mut self) -> &mut [A::Item] {
+        let len = self.end - self.current;
+        unsafe { core::slice::from_raw_parts_mut(self.data.as_mut_ptr().add(self.current), len) }
+    }
+}
+
+impl<A: Array> IntoIterator for SmallVec<A> {
+    type IntoIter = IntoIter<A>;
+    type Item = A::Item;
+    fn into_iter(mut self) -> Self::IntoIter {
+        unsafe {
+            // Set SmallVec len to zero as `IntoIter` drop handles dropping of the elements
+            let len = self.len();
+            self.set_len(0);
+            IntoIter {
+                data: self,
+                current: 0,
+                end: len,
+            }
+        }
+    }
+}
+
+impl<'a, A: Array> IntoIterator for &'a SmallVec<A> {
+    type IntoIter = slice::Iter<'a, A::Item>;
+    type Item = &'a A::Item;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter()
+    }
+}
+
+impl<'a, A: Array> IntoIterator for &'a mut SmallVec<A> {
+    type IntoIter = slice::IterMut<'a, A::Item>;
+    type Item = &'a mut A::Item;
+    fn into_iter(self) -> Self::IntoIter {
+        self.iter_mut()
+    }
+}
+
+/// Types that can be used as the backing store for a SmallVec
+pub unsafe trait Array {
+    /// The type of the array's elements.
+    type Item;
+    /// Returns the number of items the array can hold.
+    fn size() -> usize;
+}
+
+/// Set the length of the vec when the `SetLenOnDrop` value goes out of scope.
+///
+/// Copied from https://github.com/rust-lang/rust/pull/36355
+struct SetLenOnDrop<'a> {
+    len: &'a mut usize,
+    local_len: usize,
+}
+
+impl<'a> SetLenOnDrop<'a> {
+    #[inline]
+    fn new(len: &'a mut usize) -> Self {
+        SetLenOnDrop {
+            local_len: *len,
+            len,
+        }
+    }
+
+    #[inline]
+    fn get(&self) -> usize {
+        self.local_len
+    }
+
+    #[inline]
+    fn increment_len(&mut self, increment: usize) {
+        self.local_len += increment;
+    }
+}
+
+impl<'a> Drop for SetLenOnDrop<'a> {
+    #[inline]
+    fn drop(&mut self) {
+        *self.len = self.local_len;
+    }
+}
+
+#[cfg(feature = "const_generics")]
+unsafe impl<T, const N: usize> Array for [T; N] {
+    type Item = T;
+    fn size() -> usize {
+        N
+    }
+}
+
+#[cfg(not(feature = "const_generics"))]
+macro_rules! impl_array(
+    ($($size:expr),+) => {
+        $(
+            unsafe impl<T> Array for [T; $size] {
+                type Item = T;
+                fn size() -> usize { $size }
+            }
+        )+
+    }
+);
+
+#[cfg(not(feature = "const_generics"))]
+impl_array!(
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 36, 0x40, 0x60, 0x80,
+    0x100, 0x200, 0x400, 0x600, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x8000, 0x10000, 0x20000,
+    0x40000, 0x60000, 0x80000, 0x10_0000
+);
+
+/// Convenience trait for constructing a `SmallVec`
+pub trait ToSmallVec<A: Array> {
+    /// Construct a new `SmallVec` from a slice.
+    fn to_smallvec(&self) -> SmallVec<A>;
+}
+
+impl<A: Array> ToSmallVec<A> for [A::Item]
+where
+    A::Item: Copy,
+{
+    #[inline]
+    fn to_smallvec(&self) -> SmallVec<A> {
+        SmallVec::from_slice(self)
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/src/specialization.rs firefox-85.0+build1/third_party/rust/smallvec/src/specialization.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/src/specialization.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/src/specialization.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,19 @@
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! Implementations that require `default fn`.
+
+use super::{Array, SmallVec, SpecFrom};
+
+impl<'a, A: Array> SpecFrom<A, &'a [A::Item]> for SmallVec<A>
+where
+    A::Item: Clone,
+{
+    #[inline]
+    default fn spec_from(slice: &'a [A::Item]) -> SmallVec<A> {
+        slice.into_iter().cloned().collect()
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/src/tests.rs firefox-85.0+build1/third_party/rust/smallvec/src/tests.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/src/tests.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/src/tests.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,907 @@
+use crate::{smallvec, SmallVec};
+
+use std::iter::FromIterator;
+
+use alloc::borrow::ToOwned;
+use alloc::boxed::Box;
+use alloc::rc::Rc;
+use alloc::{vec, vec::Vec};
+
+#[test]
+pub fn test_zero() {
+    let mut v = SmallVec::<[_; 0]>::new();
+    assert!(!v.spilled());
+    v.push(0usize);
+    assert!(v.spilled());
+    assert_eq!(&*v, &[0]);
+}
+
+// We heap allocate all these strings so that double frees will show up under valgrind.
+
+#[test]
+pub fn test_inline() {
+    let mut v = SmallVec::<[_; 16]>::new();
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    assert_eq!(&*v, &["hello".to_owned(), "there".to_owned(),][..]);
+}
+
+#[test]
+pub fn test_spill() {
+    let mut v = SmallVec::<[_; 2]>::new();
+    v.push("hello".to_owned());
+    assert_eq!(v[0], "hello");
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    assert_eq!(v[0], "hello");
+    v.push("shave".to_owned());
+    assert_eq!(
+        &*v,
+        &[
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+        ][..]
+    );
+}
+
+#[test]
+pub fn test_double_spill() {
+    let mut v = SmallVec::<[_; 2]>::new();
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    v.push("shave".to_owned());
+    v.push("hello".to_owned());
+    v.push("there".to_owned());
+    v.push("burma".to_owned());
+    v.push("shave".to_owned());
+    assert_eq!(
+        &*v,
+        &[
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+            "hello".to_owned(),
+            "there".to_owned(),
+            "burma".to_owned(),
+            "shave".to_owned(),
+        ][..]
+    );
+}
+
+/// https://github.com/servo/rust-smallvec/issues/4
+#[test]
+fn issue_4() {
+    SmallVec::<[Box<u32>; 2]>::new();
+}
+
+/// https://github.com/servo/rust-smallvec/issues/5
+#[test]
+fn issue_5() {
+    assert!(Some(SmallVec::<[&u32; 2]>::new()).is_some());
+}
+
+#[test]
+fn test_with_capacity() {
+    let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(1);
+    assert!(v.is_empty());
+    assert!(!v.spilled());
+    assert_eq!(v.capacity(), 3);
+
+    let v: SmallVec<[u8; 3]> = SmallVec::with_capacity(10);
+    assert!(v.is_empty());
+    assert!(v.spilled());
+    assert_eq!(v.capacity(), 10);
+}
+
+#[test]
+fn drain() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.drain(..).collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    let old_capacity = v.capacity();
+    assert_eq!(v.drain(1..).collect::<Vec<_>>(), &[4, 5]);
+    // drain should not change the capacity
+    assert_eq!(v.capacity(), old_capacity);
+}
+
+#[test]
+fn drain_rev() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.drain(..).rev().collect::<Vec<_>>(), &[5, 4, 3]);
+}
+
+#[test]
+fn drain_forget() {
+    let mut v: SmallVec<[u8; 1]> = smallvec![0, 1, 2, 3, 4, 5, 6, 7];
+    std::mem::forget(v.drain(2..5));
+    assert_eq!(v.len(), 2);
+}
+
+#[test]
+fn into_iter() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.into_iter().collect::<Vec<_>>(), &[3, 4, 5]);
+}
+
+#[test]
+fn into_iter_rev() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[3]);
+
+    // spilling the vec
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(3);
+    v.push(4);
+    v.push(5);
+    assert_eq!(v.into_iter().rev().collect::<Vec<_>>(), &[5, 4, 3]);
+}
+
+#[test]
+fn into_iter_drop() {
+    use std::cell::Cell;
+
+    struct DropCounter<'a>(&'a Cell<i32>);
+
+    impl<'a> Drop for DropCounter<'a> {
+        fn drop(&mut self) {
+            self.0.set(self.0.get() + 1);
+        }
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.into_iter();
+        assert_eq!(cell.get(), 1);
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        assert!(v.into_iter().next().is_some());
+        assert_eq!(cell.get(), 2);
+    }
+
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        assert!(v.into_iter().next().is_some());
+        assert_eq!(cell.get(), 3);
+    }
+    {
+        let cell = Cell::new(0);
+        let mut v: SmallVec<[DropCounter<'_>; 2]> = SmallVec::new();
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        v.push(DropCounter(&cell));
+        {
+            let mut it = v.into_iter();
+            assert!(it.next().is_some());
+            assert!(it.next_back().is_some());
+        }
+        assert_eq!(cell.get(), 3);
+    }
+}
+
+#[test]
+fn test_capacity() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.reserve(1);
+    assert_eq!(v.capacity(), 2);
+    assert!(!v.spilled());
+
+    v.reserve_exact(0x100);
+    assert!(v.capacity() >= 0x100);
+
+    v.push(0);
+    v.push(1);
+    v.push(2);
+    v.push(3);
+
+    v.shrink_to_fit();
+    assert!(v.capacity() < 0x100);
+}
+
+#[test]
+fn test_truncate() {
+    let mut v: SmallVec<[Box<u8>; 8]> = SmallVec::new();
+
+    for x in 0..8 {
+        v.push(Box::new(x));
+    }
+    v.truncate(4);
+
+    assert_eq!(v.len(), 4);
+    assert!(!v.spilled());
+
+    assert_eq!(*v.swap_remove(1), 1);
+    assert_eq!(*v.remove(1), 3);
+    v.insert(1, Box::new(3));
+
+    assert_eq!(&v.iter().map(|v| **v).collect::<Vec<_>>(), &[0, 3, 2]);
+}
+
+#[test]
+fn test_insert_many() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(1, [5, 6].iter().cloned());
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+struct MockHintIter<T: Iterator> {
+    x: T,
+    hint: usize,
+}
+impl<T: Iterator> Iterator for MockHintIter<T> {
+    type Item = T::Item;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.x.next()
+    }
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.hint, None)
+    }
+}
+
+#[test]
+fn test_insert_many_short_hint() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(
+        1,
+        MockHintIter {
+            x: [5, 6].iter().cloned(),
+            hint: 5,
+        },
+    );
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+#[test]
+fn test_insert_many_long_hint() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_many(
+        1,
+        MockHintIter {
+            x: [5, 6].iter().cloned(),
+            hint: 1,
+        },
+    );
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+// https://github.com/servo/rust-smallvec/issues/96
+mod insert_many_panic {
+    use crate::{smallvec, SmallVec};
+    use alloc::boxed::Box;
+
+    struct PanicOnDoubleDrop {
+        dropped: Box<bool>,
+    }
+
+    impl PanicOnDoubleDrop {
+        fn new() -> Self {
+            Self {
+                dropped: Box::new(false),
+            }
+        }
+    }
+
+    impl Drop for PanicOnDoubleDrop {
+        fn drop(&mut self) {
+            assert!(!*self.dropped, "already dropped");
+            *self.dropped = true;
+        }
+    }
+
+    /// Claims to yield `hint` items, but actually yields `count`, then panics.
+    struct BadIter {
+        hint: usize,
+        count: usize,
+    }
+
+    impl Iterator for BadIter {
+        type Item = PanicOnDoubleDrop;
+        fn size_hint(&self) -> (usize, Option<usize>) {
+            (self.hint, None)
+        }
+        fn next(&mut self) -> Option<Self::Item> {
+            if self.count == 0 {
+                panic!()
+            }
+            self.count -= 1;
+            Some(PanicOnDoubleDrop::new())
+        }
+    }
+
+    #[test]
+    fn panic_early_at_start() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(0, BadIter { hint: 1, count: 0 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_early_in_middle() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(1, BadIter { hint: 4, count: 2 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_early_at_end() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(2, BadIter { hint: 3, count: 1 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_late_at_start() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(0, BadIter { hint: 3, count: 5 });
+        });
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn panic_late_at_end() {
+        let mut vec: SmallVec<[PanicOnDoubleDrop; 0]> =
+            smallvec![PanicOnDoubleDrop::new(), PanicOnDoubleDrop::new(),];
+        let result = ::std::panic::catch_unwind(move || {
+            vec.insert_many(2, BadIter { hint: 3, count: 5 });
+        });
+        assert!(result.is_err());
+    }
+}
+
+#[test]
+#[should_panic]
+fn test_invalid_grow() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    v.extend(0..8);
+    v.grow(5);
+}
+
+#[test]
+fn test_insert_from_slice() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.insert_from_slice(1, &[5, 6]);
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 5, 6, 1, 2, 3]
+    );
+}
+
+#[test]
+fn test_extend_from_slice() {
+    let mut v: SmallVec<[u8; 8]> = SmallVec::new();
+    for x in 0..4 {
+        v.push(x);
+    }
+    assert_eq!(v.len(), 4);
+    v.extend_from_slice(&[5, 6]);
+    assert_eq!(
+        &v.iter().map(|v| *v).collect::<Vec<_>>(),
+        &[0, 1, 2, 3, 5, 6]
+    );
+}
+
+#[test]
+#[should_panic]
+fn test_drop_panic_smallvec() {
+    // This test should only panic once, and not double panic,
+    // which would mean a double drop
+    struct DropPanic;
+
+    impl Drop for DropPanic {
+        fn drop(&mut self) {
+            panic!("drop");
+        }
+    }
+
+    let mut v = SmallVec::<[_; 1]>::new();
+    v.push(DropPanic);
+}
+
+#[test]
+fn test_eq() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut b: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut c: SmallVec<[u32; 2]> = SmallVec::new();
+    // a = [1, 2]
+    a.push(1);
+    a.push(2);
+    // b = [1, 2]
+    b.push(1);
+    b.push(2);
+    // c = [3, 4]
+    c.push(3);
+    c.push(4);
+
+    assert!(a == b);
+    assert!(a != c);
+}
+
+#[test]
+fn test_ord() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut b: SmallVec<[u32; 2]> = SmallVec::new();
+    let mut c: SmallVec<[u32; 2]> = SmallVec::new();
+    // a = [1]
+    a.push(1);
+    // b = [1, 1]
+    b.push(1);
+    b.push(1);
+    // c = [1, 2]
+    c.push(1);
+    c.push(2);
+
+    assert!(a < b);
+    assert!(b > a);
+    assert!(b < c);
+    assert!(c > b);
+}
+
+#[test]
+fn test_hash() {
+    use std::collections::hash_map::DefaultHasher;
+    use std::hash::Hash;
+
+    {
+        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+        let b = [1, 2];
+        a.extend(b.iter().cloned());
+        let mut hasher = DefaultHasher::new();
+        assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
+    }
+    {
+        let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+        let b = [1, 2, 11, 12];
+        a.extend(b.iter().cloned());
+        let mut hasher = DefaultHasher::new();
+        assert_eq!(a.hash(&mut hasher), b.hash(&mut hasher));
+    }
+}
+
+#[test]
+fn test_as_ref() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.as_ref(), [1]);
+    a.push(2);
+    assert_eq!(a.as_ref(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.as_ref(), [1, 2, 3]);
+}
+
+#[test]
+fn test_as_mut() {
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.as_mut(), [1]);
+    a.push(2);
+    assert_eq!(a.as_mut(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.as_mut(), [1, 2, 3]);
+    a.as_mut()[1] = 4;
+    assert_eq!(a.as_mut(), [1, 4, 3]);
+}
+
+#[test]
+fn test_borrow() {
+    use std::borrow::Borrow;
+
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.borrow(), [1]);
+    a.push(2);
+    assert_eq!(a.borrow(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.borrow(), [1, 2, 3]);
+}
+
+#[test]
+fn test_borrow_mut() {
+    use std::borrow::BorrowMut;
+
+    let mut a: SmallVec<[u32; 2]> = SmallVec::new();
+    a.push(1);
+    assert_eq!(a.borrow_mut(), [1]);
+    a.push(2);
+    assert_eq!(a.borrow_mut(), [1, 2]);
+    a.push(3);
+    assert_eq!(a.borrow_mut(), [1, 2, 3]);
+    BorrowMut::<[u32]>::borrow_mut(&mut a)[1] = 4;
+    assert_eq!(a.borrow_mut(), [1, 4, 3]);
+}
+
+#[test]
+fn test_from() {
+    assert_eq!(&SmallVec::<[u32; 2]>::from(&[1][..])[..], [1]);
+    assert_eq!(&SmallVec::<[u32; 2]>::from(&[1, 2, 3][..])[..], [1, 2, 3]);
+
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let array = [1];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from(array);
+    assert_eq!(&*small_vec, &[1]);
+    drop(small_vec);
+
+    let array = [99; 128];
+    let small_vec: SmallVec<[u8; 128]> = SmallVec::from(array);
+    assert_eq!(&*small_vec, vec![99u8; 128].as_slice());
+    drop(small_vec);
+}
+
+#[test]
+fn test_from_slice() {
+    assert_eq!(&SmallVec::<[u32; 2]>::from_slice(&[1][..])[..], [1]);
+    assert_eq!(
+        &SmallVec::<[u32; 2]>::from_slice(&[1, 2, 3][..])[..],
+        [1, 2, 3]
+    );
+}
+
+#[test]
+fn test_exact_size_iterator() {
+    let mut vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
+    assert_eq!(vec.clone().into_iter().len(), 3);
+    assert_eq!(vec.drain(..2).len(), 2);
+    assert_eq!(vec.into_iter().len(), 1);
+}
+
+#[test]
+fn test_into_iter_as_slice() {
+    let vec = SmallVec::<[u32; 2]>::from(&[1, 2, 3][..]);
+    let mut iter = vec.clone().into_iter();
+    assert_eq!(iter.as_slice(), &[1, 2, 3]);
+    assert_eq!(iter.as_mut_slice(), &[1, 2, 3]);
+    iter.next();
+    assert_eq!(iter.as_slice(), &[2, 3]);
+    assert_eq!(iter.as_mut_slice(), &[2, 3]);
+    iter.next_back();
+    assert_eq!(iter.as_slice(), &[2]);
+    assert_eq!(iter.as_mut_slice(), &[2]);
+}
+
+#[test]
+fn test_into_iter_clone() {
+    // Test that the cloned iterator yields identical elements and that it owns its own copy
+    // (i.e. no use after move errors).
+    let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter();
+    let mut clone_iter = iter.clone();
+    while let Some(x) = iter.next() {
+        assert_eq!(x, clone_iter.next().unwrap());
+    }
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn test_into_iter_clone_partially_consumed_iterator() {
+    // Test that the cloned iterator only contains the remaining elements of the original iterator.
+    let mut iter = SmallVec::<[u8; 2]>::from_iter(0..3).into_iter().skip(1);
+    let mut clone_iter = iter.clone();
+    while let Some(x) = iter.next() {
+        assert_eq!(x, clone_iter.next().unwrap());
+    }
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn test_into_iter_clone_empty_smallvec() {
+    let mut iter = SmallVec::<[u8; 2]>::new().into_iter();
+    let mut clone_iter = iter.clone();
+    assert_eq!(iter.next(), None);
+    assert_eq!(clone_iter.next(), None);
+}
+
+#[test]
+fn shrink_to_fit_unspill() {
+    let mut vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    vec.pop();
+    assert!(vec.spilled());
+    vec.shrink_to_fit();
+    assert!(!vec.spilled(), "shrink_to_fit will un-spill if possible");
+}
+
+#[test]
+fn test_into_vec() {
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
+    assert_eq!(vec.into_vec(), vec![0, 1]);
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    assert_eq!(vec.into_vec(), vec![0, 1, 2]);
+}
+
+#[test]
+fn test_into_inner() {
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..2);
+    assert_eq!(vec.into_inner(), Ok([0, 1]));
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..1);
+    assert_eq!(vec.clone().into_inner(), Err(vec));
+
+    let vec = SmallVec::<[u8; 2]>::from_iter(0..3);
+    assert_eq!(vec.clone().into_inner(), Err(vec));
+}
+
+#[test]
+fn test_from_vec() {
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[]);
+    drop(small_vec);
+
+    let vec = vec![1];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 3]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+
+    let vec = vec![1, 2, 3, 4, 5];
+    let small_vec: SmallVec<[u8; 1]> = SmallVec::from_vec(vec);
+    assert_eq!(&*small_vec, &[1, 2, 3, 4, 5]);
+    drop(small_vec);
+}
+
+#[test]
+fn test_retain() {
+    // Test inline data storate
+    let mut sv: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
+    sv.retain(|&mut i| i != 3);
+    assert_eq!(sv.pop(), Some(4));
+    assert_eq!(sv.pop(), Some(2));
+    assert_eq!(sv.pop(), Some(1));
+    assert_eq!(sv.pop(), None);
+
+    // Test spilled data storage
+    let mut sv: SmallVec<[i32; 3]> = SmallVec::from_slice(&[1, 2, 3, 3, 4]);
+    sv.retain(|&mut i| i != 3);
+    assert_eq!(sv.pop(), Some(4));
+    assert_eq!(sv.pop(), Some(2));
+    assert_eq!(sv.pop(), Some(1));
+    assert_eq!(sv.pop(), None);
+
+    // Test that drop implementations are called for inline.
+    let one = Rc::new(1);
+    let mut sv: SmallVec<[Rc<i32>; 3]> = SmallVec::new();
+    sv.push(Rc::clone(&one));
+    assert_eq!(Rc::strong_count(&one), 2);
+    sv.retain(|_| false);
+    assert_eq!(Rc::strong_count(&one), 1);
+
+    // Test that drop implementations are called for spilled data.
+    let mut sv: SmallVec<[Rc<i32>; 1]> = SmallVec::new();
+    sv.push(Rc::clone(&one));
+    sv.push(Rc::new(2));
+    assert_eq!(Rc::strong_count(&one), 2);
+    sv.retain(|_| false);
+    assert_eq!(Rc::strong_count(&one), 1);
+}
+
+#[test]
+fn test_dedup() {
+    let mut dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 2, 3, 3]);
+    dupes.dedup();
+    assert_eq!(&*dupes, &[1, 2, 3]);
+
+    let mut empty: SmallVec<[i32; 5]> = SmallVec::new();
+    empty.dedup();
+    assert!(empty.is_empty());
+
+    let mut all_ones: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 1, 1, 1, 1]);
+    all_ones.dedup();
+    assert_eq!(all_ones.len(), 1);
+
+    let mut no_dupes: SmallVec<[i32; 5]> = SmallVec::from_slice(&[1, 2, 3, 4, 5]);
+    no_dupes.dedup();
+    assert_eq!(no_dupes.len(), 5);
+}
+
+#[test]
+fn test_resize() {
+    let mut v: SmallVec<[i32; 8]> = SmallVec::new();
+    v.push(1);
+    v.resize(5, 0);
+    assert_eq!(v[..], [1, 0, 0, 0, 0][..]);
+
+    v.resize(2, -1);
+    assert_eq!(v[..], [1, 0][..]);
+}
+
+#[cfg(feature = "write")]
+#[test]
+fn test_write() {
+    use std::io::Write;
+
+    let data = [1, 2, 3, 4, 5];
+
+    let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
+    let len = small_vec.write(&data[..]).unwrap();
+    assert_eq!(len, 5);
+    assert_eq!(small_vec.as_ref(), data.as_ref());
+
+    let mut small_vec: SmallVec<[u8; 2]> = SmallVec::new();
+    small_vec.write_all(&data[..]).unwrap();
+    assert_eq!(small_vec.as_ref(), data.as_ref());
+}
+
+#[cfg(feature = "serde")]
+extern crate bincode;
+
+#[cfg(feature = "serde")]
+#[test]
+fn test_serde() {
+    use self::bincode::{config, deserialize};
+    let mut small_vec: SmallVec<[i32; 2]> = SmallVec::new();
+    small_vec.push(1);
+    let encoded = config().limit(100).serialize(&small_vec).unwrap();
+    let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
+    assert_eq!(small_vec, decoded);
+    small_vec.push(2);
+    // Spill the vec
+    small_vec.push(3);
+    small_vec.push(4);
+    // Check again after spilling.
+    let encoded = config().limit(100).serialize(&small_vec).unwrap();
+    let decoded: SmallVec<[i32; 2]> = deserialize(&encoded).unwrap();
+    assert_eq!(small_vec, decoded);
+}
+
+#[test]
+fn grow_to_shrink() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(1);
+    v.push(2);
+    v.push(3);
+    assert!(v.spilled());
+    v.clear();
+    // Shrink to inline.
+    v.grow(2);
+    assert!(!v.spilled());
+    assert_eq!(v.capacity(), 2);
+    assert_eq!(v.len(), 0);
+    v.push(4);
+    assert_eq!(v[..], [4]);
+}
+
+#[test]
+fn resumable_extend() {
+    let s = "a b c";
+    // This iterator yields: (Some('a'), None, Some('b'), None, Some('c')), None
+    let it = s
+        .chars()
+        .scan(0, |_, ch| if ch.is_whitespace() { None } else { Some(ch) });
+    let mut v: SmallVec<[char; 4]> = SmallVec::new();
+    v.extend(it);
+    assert_eq!(v[..], ['a']);
+}
+
+// #139
+#[test]
+fn uninhabited() {
+    enum Void {}
+    let _sv = SmallVec::<[Void; 8]>::new();
+}
+
+#[test]
+fn grow_spilled_same_size() {
+    let mut v: SmallVec<[u8; 2]> = SmallVec::new();
+    v.push(0);
+    v.push(1);
+    v.push(2);
+    assert!(v.spilled());
+    assert_eq!(v.capacity(), 4);
+    // grow with the same capacity
+    v.grow(4);
+    assert_eq!(v.capacity(), 4);
+    assert_eq!(v[..], [0, 1, 2]);
+}
+
+#[cfg(feature = "const_generics")]
+#[test]
+fn const_generics() {
+    let _v = SmallVec::<[i32; 987]>::default();
+}
+
+#[test]
+fn empty_macro() {
+    let _v: SmallVec<[u8; 1]> = smallvec![];
+}
+
+#[test]
+fn zero_size_items() {
+    SmallVec::<[(); 0]>::new().push(());
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/tests/macro.rs firefox-85.0+build1/third_party/rust/smallvec/tests/macro.rs
--- firefox-84.0.2+build1/third_party/rust/smallvec/tests/macro.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/tests/macro.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,24 @@
+/// This file tests `smallvec!` without actually having the macro in scope.
+/// This forces any recursion to use a `$crate` prefix to reliably find itself.
+
+#[test]
+fn smallvec() {
+    let mut vec: smallvec::SmallVec<[i32; 2]>;
+
+    macro_rules! check {
+        ($init:tt) => {
+            vec = smallvec::smallvec! $init;
+            assert_eq!(*vec, *vec! $init);
+        }
+    }
+
+    check!([0; 0]);
+    check!([1; 1]);
+    check!([2; 2]);
+    check!([3; 3]);
+
+    check!([]);
+    check!([1]);
+    check!([1, 2]);
+    check!([1, 2, 3]);
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/smallvec/.travis.yml firefox-85.0+build1/third_party/rust/smallvec/.travis.yml
--- firefox-84.0.2+build1/third_party/rust/smallvec/.travis.yml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/smallvec/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-language: rust
-addons:
-  apt:
-    update: true
-    packages:
-      - binutils-dev
-      - libunwind8-dev
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
-      - cmake
-      - gcc
-      - libiberty-dev
-matrix:
-  include:
-    - rust: 1.36.0
-    - rust: nightly
-    - rust: beta
-      env: DO_FUZZ=true
-    - rust: stable
-      env: DO_FUZZ=true
-script: |
-  cargo build --verbose &&
-  cargo test --verbose &&
-  cargo test --verbose --features serde &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench) &&
-  ([ $TRAVIS_RUST_VERSION != nightly ] || bash ./scripts/run_miri.sh) &&
-  if [ "$DO_FUZZ" = true ]
-  then
-  (
-    cd fuzz
-    ./travis-fuzz.sh
-  )
-  fi
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/.cargo-checksum.json firefox-85.0+build1/third_party/rust/vec_map/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/vec_map/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"051324cbce9a044f098c6577f57e054f7122f7134f473bbee65c52ee8014e066","LICENSE-APACHE":"8173d5c29b4f956d532781d2b86e4e30f83e6b7878dce18c919451d6ba707c90","LICENSE-MIT":"7b63ecd5f1902af1b63729947373683c32745c16a10e8e6292e2e2dcd7e90ae0","README.md":"637a32d6be7c7f2ea9fb5d2d51c4788a44a5cb100e653f8bab71a1d33ae429b1","src/lib.rs":"660ae0d68bb09c0281c75c526c0bfb2059821dee065e14f5cb31e695b4c81c2d"},"package":"f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/Cargo.toml firefox-85.0+build1/third_party/rust/vec_map/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/vec_map/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "vec_map"
-version = "0.8.2"
-authors = ["Alex Crichton <alex@alexcrichton.com>", "Jorge Aparicio <japaricious@gmail.com>", "Alexis Beingessner <a.beingessner@gmail.com>", "Brian Anderson <>", "tbu- <>", "Manish Goregaokar <>", "Aaron Turon <aturon@mozilla.com>", "Adolfo Ochagavía <>", "Niko Matsakis <>", "Steven Fackler <>", "Chase Southwood <csouth3@illinois.edu>", "Eduard Burtescu <>", "Florian Wilkens <>", "Félix Raimundo <>", "Tibor Benke <>", "Markus Siemens <markus@m-siemens.de>", "Josh Branchaud <jbranchaud@gmail.com>", "Huon Wilson <dbau.pp@gmail.com>", "Corey Farwell <coref@rwell.org>", "Aaron Liblong <>", "Nick Cameron <nrc@ncameron.org>", "Patrick Walton <pcwalton@mimiga.net>", "Felix S Klock II <>", "Andrew Paseltiner <apaseltiner@gmail.com>", "Sean McArthur <sean.monstar@gmail.com>", "Vadim Petrochenkov <>"]
-exclude = ["/.travis.yml", "/deploy-docs.sh"]
-description = "A simple map based on a vector for small integer keys"
-homepage = "https://github.com/contain-rs/vec-map"
-documentation = "https://contain-rs.github.io/vec-map/vec_map"
-readme = "README.md"
-keywords = ["data-structures", "collections", "vecmap", "vec_map", "contain-rs"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/contain-rs/vec-map"
-[dependencies.serde]
-version = "1.0"
-features = ["derive"]
-optional = true
-
-[features]
-eders = ["serde"]
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/LICENSE-APACHE firefox-85.0+build1/third_party/rust/vec_map/LICENSE-APACHE
--- firefox-84.0.2+build1/third_party/rust/vec_map/LICENSE-APACHE	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/LICENSE-APACHE	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/LICENSE-MIT firefox-85.0+build1/third_party/rust/vec_map/LICENSE-MIT
--- firefox-84.0.2+build1/third_party/rust/vec_map/LICENSE-MIT	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/LICENSE-MIT	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Copyright (c) 2015 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/README.md firefox-85.0+build1/third_party/rust/vec_map/README.md
--- firefox-84.0.2+build1/third_party/rust/vec_map/README.md	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-**WARNING: THIS PROJECT IS IN MAINTENANCE MODE, DUE TO INSUFFICIENT MAINTAINER RESOURCES**
-
-It works fine, but will generally no longer be improved.
-
-We are currently only accepting changes which:
-
-* keep this compiling with the latest versions of Rust or its dependencies.
-* have minimal review requirements, such as documentation changes (so not totally new APIs).
-
-------
-
-
-A simple map based on a vector for small integer keys.
-
-Documentation is available at https://contain-rs.github.io/vec-map/vec_map.
diff -Nru firefox-84.0.2+build1/third_party/rust/vec_map/src/lib.rs firefox-85.0+build1/third_party/rust/vec_map/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/vec_map/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/vec_map/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,1623 +0,0 @@
-// Copyright 2012-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![deny(missing_docs)]
-
-//! A simple map based on a vector for small integer keys. Space requirements
-//! are O(highest integer key).
-
-// optional serde support
-#[cfg(feature = "serde")]
-#[macro_use]
-extern crate serde;
-
-use self::Entry::*;
-
-use std::cmp::{Ordering, max};
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::iter::{Enumerate, FilterMap, FromIterator};
-use std::mem::{replace, swap};
-use std::ops::{Index, IndexMut};
-use std::slice;
-use std::vec;
-
-/// A map optimized for small integer keys.
-///
-/// # Examples
-///
-/// ```
-/// use vec_map::VecMap;
-///
-/// let mut months = VecMap::new();
-/// months.insert(1, "Jan");
-/// months.insert(2, "Feb");
-/// months.insert(3, "Mar");
-///
-/// if !months.contains_key(12) {
-///     println!("The end is near!");
-/// }
-///
-/// assert_eq!(months.get(1), Some(&"Jan"));
-///
-/// if let Some(value) = months.get_mut(3) {
-///     *value = "Venus";
-/// }
-///
-/// assert_eq!(months.get(3), Some(&"Venus"));
-///
-/// // Print out all months
-/// for (key, value) in &months {
-///     println!("month {} is {}", key, value);
-/// }
-///
-/// months.clear();
-/// assert!(months.is_empty());
-/// ```
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub struct VecMap<V> {
-    n: usize,
-    v: Vec<Option<V>>,
-}
-
-/// A view into a single entry in a map, which may either be vacant or occupied.
-pub enum Entry<'a, V: 'a> {
-    /// A vacant Entry
-    Vacant(VacantEntry<'a, V>),
-
-    /// An occupied Entry
-    Occupied(OccupiedEntry<'a, V>),
-}
-
-/// A vacant Entry.
-pub struct VacantEntry<'a, V: 'a> {
-    map: &'a mut VecMap<V>,
-    index: usize,
-}
-
-/// An occupied Entry.
-pub struct OccupiedEntry<'a, V: 'a> {
-    map: &'a mut VecMap<V>,
-    index: usize,
-}
-
-impl<V> Default for VecMap<V> {
-    #[inline]
-    fn default() -> Self { Self::new() }
-}
-
-impl<V: Hash> Hash for VecMap<V> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        // In order to not traverse the `VecMap` twice, count the elements
-        // during iteration.
-        let mut count: usize = 0;
-        for elt in self {
-            elt.hash(state);
-            count += 1;
-        }
-        count.hash(state);
-    }
-}
-
-impl<V> VecMap<V> {
-    /// Creates an empty `VecMap`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let mut map: VecMap<&str> = VecMap::new();
-    /// ```
-    pub fn new() -> Self { VecMap { n: 0, v: vec![] } }
-
-    /// Creates an empty `VecMap` with space for at least `capacity`
-    /// elements before resizing.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let mut map: VecMap<&str> = VecMap::with_capacity(10);
-    /// ```
-    pub fn with_capacity(capacity: usize) -> Self {
-        VecMap { n: 0, v: Vec::with_capacity(capacity) }
-    }
-
-    /// Returns the number of elements the `VecMap` can hold without
-    /// reallocating.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let map: VecMap<String> = VecMap::with_capacity(10);
-    /// assert!(map.capacity() >= 10);
-    /// ```
-    #[inline]
-    pub fn capacity(&self) -> usize {
-        self.v.capacity()
-    }
-
-    /// Reserves capacity for the given `VecMap` to contain `len` distinct keys.
-    /// In the case of `VecMap` this means reallocations will not occur as long
-    /// as all inserted keys are less than `len`.
-    ///
-    /// The collection may reserve more space to avoid frequent reallocations.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let mut map: VecMap<&str> = VecMap::new();
-    /// map.reserve_len(10);
-    /// assert!(map.capacity() >= 10);
-    /// ```
-    pub fn reserve_len(&mut self, len: usize) {
-        let cur_len = self.v.len();
-        if len >= cur_len {
-            self.v.reserve(len - cur_len);
-        }
-    }
-
-    /// Reserves the minimum capacity for the given `VecMap` to contain `len` distinct keys.
-    /// In the case of `VecMap` this means reallocations will not occur as long as all inserted
-    /// keys are less than `len`.
-    ///
-    /// Note that the allocator may give the collection more space than it requests.
-    /// Therefore capacity cannot be relied upon to be precisely minimal.  Prefer
-    /// `reserve_len` if future insertions are expected.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let mut map: VecMap<&str> = VecMap::new();
-    /// map.reserve_len_exact(10);
-    /// assert!(map.capacity() >= 10);
-    /// ```
-    pub fn reserve_len_exact(&mut self, len: usize) {
-        let cur_len = self.v.len();
-        if len >= cur_len {
-            self.v.reserve_exact(len - cur_len);
-        }
-    }
-
-    /// Trims the `VecMap` of any excess capacity.
-    ///
-    /// The collection may reserve more space to avoid frequent reallocations.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    /// let mut map: VecMap<&str> = VecMap::with_capacity(10);
-    /// map.shrink_to_fit();
-    /// assert_eq!(map.capacity(), 0);
-    /// ```
-    pub fn shrink_to_fit(&mut self) {
-        // strip off trailing `None`s
-        if let Some(idx) = self.v.iter().rposition(Option::is_some) {
-            self.v.truncate(idx + 1);
-        } else {
-            self.v.clear();
-        }
-
-        self.v.shrink_to_fit()
-    }
-
-    /// Returns an iterator visiting all keys in ascending order of the keys.
-    /// The iterator's element type is `usize`.
-    pub fn keys(&self) -> Keys<V> {
-        Keys { iter: self.iter() }
-    }
-
-    /// Returns an iterator visiting all values in ascending order of the keys.
-    /// The iterator's element type is `&'r V`.
-    pub fn values(&self) -> Values<V> {
-        Values { iter: self.iter() }
-    }
-
-    /// Returns an iterator visiting all values in ascending order of the keys.
-    /// The iterator's element type is `&'r mut V`.
-    pub fn values_mut(&mut self) -> ValuesMut<V> {
-        ValuesMut { iter_mut: self.iter_mut() }
-    }
-
-    /// Returns an iterator visiting all key-value pairs in ascending order of the keys.
-    /// The iterator's element type is `(usize, &'r V)`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// map.insert(3, "c");
-    /// map.insert(2, "b");
-    ///
-    /// // Print `1: a` then `2: b` then `3: c`
-    /// for (key, value) in map.iter() {
-    ///     println!("{}: {}", key, value);
-    /// }
-    /// ```
-    pub fn iter(&self) -> Iter<V> {
-        Iter {
-            front: 0,
-            back: self.v.len(),
-            n: self.n,
-            yielded: 0,
-            iter: self.v.iter()
-        }
-    }
-
-    /// Returns an iterator visiting all key-value pairs in ascending order of the keys,
-    /// with mutable references to the values.
-    /// The iterator's element type is `(usize, &'r mut V)`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// map.insert(2, "b");
-    /// map.insert(3, "c");
-    ///
-    /// for (key, value) in map.iter_mut() {
-    ///     *value = "x";
-    /// }
-    ///
-    /// for (key, value) in &map {
-    ///     assert_eq!(value, &"x");
-    /// }
-    /// ```
-    pub fn iter_mut(&mut self) -> IterMut<V> {
-        IterMut {
-            front: 0,
-            back: self.v.len(),
-            n: self.n,
-            yielded: 0,
-            iter: self.v.iter_mut()
-        }
-    }
-
-    /// Moves all elements from `other` into the map while overwriting existing keys.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut a = VecMap::new();
-    /// a.insert(1, "a");
-    /// a.insert(2, "b");
-    ///
-    /// let mut b = VecMap::new();
-    /// b.insert(3, "c");
-    /// b.insert(4, "d");
-    ///
-    /// a.append(&mut b);
-    ///
-    /// assert_eq!(a.len(), 4);
-    /// assert_eq!(b.len(), 0);
-    /// assert_eq!(a[1], "a");
-    /// assert_eq!(a[2], "b");
-    /// assert_eq!(a[3], "c");
-    /// assert_eq!(a[4], "d");
-    /// ```
-    pub fn append(&mut self, other: &mut Self) {
-        self.extend(other.drain());
-    }
-
-    /// Splits the collection into two at the given key.
-    ///
-    /// Returns a newly allocated `Self`. `self` contains elements `[0, at)`,
-    /// and the returned `Self` contains elements `[at, max_key)`.
-    ///
-    /// Note that the capacity of `self` does not change.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut a = VecMap::new();
-    /// a.insert(1, "a");
-    /// a.insert(2, "b");
-    /// a.insert(3, "c");
-    /// a.insert(4, "d");
-    ///
-    /// let b = a.split_off(3);
-    ///
-    /// assert_eq!(a[1], "a");
-    /// assert_eq!(a[2], "b");
-    ///
-    /// assert_eq!(b[3], "c");
-    /// assert_eq!(b[4], "d");
-    /// ```
-    pub fn split_off(&mut self, at: usize) -> Self {
-        let mut other = VecMap::new();
-
-        if at == 0 {
-            // Move all elements to other
-            // The swap will also fix .n
-            swap(self, &mut other);
-            return other
-        } else if at >= self.v.len() {
-            // No elements to copy
-            return other;
-        }
-
-        // Look up the index of the first non-None item
-        let first_index = self.v.iter().position(|el| el.is_some());
-        let start_index = match first_index {
-            Some(index) => max(at, index),
-            None => {
-                // self has no elements
-                return other;
-            }
-        };
-
-        // Fill the new VecMap with `None`s until `start_index`
-        other.v.extend((0..start_index).map(|_| None));
-
-        // Move elements beginning with `start_index` from `self` into `other`
-        let mut taken = 0;
-        other.v.extend(self.v[start_index..].iter_mut().map(|el| {
-            let el = el.take();
-            if el.is_some() {
-                taken += 1;
-            }
-            el
-        }));
-        other.n = taken;
-        self.n -= taken;
-
-        other
-    }
-
-    /// Returns an iterator visiting all key-value pairs in ascending order of
-    /// the keys, emptying (but not consuming) the original `VecMap`.
-    /// The iterator's element type is `(usize, &'r V)`. Keeps the allocated memory for reuse.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// map.insert(3, "c");
-    /// map.insert(2, "b");
-    ///
-    /// let vec: Vec<(usize, &str)> = map.drain().collect();
-    ///
-    /// assert_eq!(vec, [(1, "a"), (2, "b"), (3, "c")]);
-    /// ```
-    pub fn drain(&mut self) -> Drain<V> {
-        fn filter<A>((i, v): (usize, Option<A>)) -> Option<(usize, A)> {
-            v.map(|v| (i, v))
-        }
-        let filter: fn((usize, Option<V>)) -> Option<(usize, V)> = filter; // coerce to fn ptr
-
-        self.n = 0;
-        Drain { iter: self.v.drain(..).enumerate().filter_map(filter) }
-    }
-
-    /// Returns the number of elements in the map.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut a = VecMap::new();
-    /// assert_eq!(a.len(), 0);
-    /// a.insert(1, "a");
-    /// assert_eq!(a.len(), 1);
-    /// ```
-    pub fn len(&self) -> usize {
-        self.n
-    }
-
-    /// Returns true if the map contains no elements.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut a = VecMap::new();
-    /// assert!(a.is_empty());
-    /// a.insert(1, "a");
-    /// assert!(!a.is_empty());
-    /// ```
-    pub fn is_empty(&self) -> bool {
-        self.n == 0
-    }
-
-    /// Clears the map, removing all key-value pairs.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut a = VecMap::new();
-    /// a.insert(1, "a");
-    /// a.clear();
-    /// assert!(a.is_empty());
-    /// ```
-    pub fn clear(&mut self) { self.n = 0; self.v.clear() }
-
-    /// Returns a reference to the value corresponding to the key.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// assert_eq!(map.get(1), Some(&"a"));
-    /// assert_eq!(map.get(2), None);
-    /// ```
-    pub fn get(&self, key: usize) -> Option<&V> {
-        if key < self.v.len() {
-            self.v[key].as_ref()
-        } else {
-            None
-        }
-    }
-
-    /// Returns true if the map contains a value for the specified key.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// assert_eq!(map.contains_key(1), true);
-    /// assert_eq!(map.contains_key(2), false);
-    /// ```
-    #[inline]
-    pub fn contains_key(&self, key: usize) -> bool {
-        self.get(key).is_some()
-    }
-
-    /// Returns a mutable reference to the value corresponding to the key.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// if let Some(x) = map.get_mut(1) {
-    ///     *x = "b";
-    /// }
-    /// assert_eq!(map[1], "b");
-    /// ```
-    pub fn get_mut(&mut self, key: usize) -> Option<&mut V> {
-        if key < self.v.len() {
-            self.v[key].as_mut()
-        } else {
-            None
-        }
-    }
-
-    /// Inserts a key-value pair into the map. If the key already had a value
-    /// present in the map, that value is returned. Otherwise, `None` is returned.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// assert_eq!(map.insert(37, "a"), None);
-    /// assert_eq!(map.is_empty(), false);
-    ///
-    /// map.insert(37, "b");
-    /// assert_eq!(map.insert(37, "c"), Some("b"));
-    /// assert_eq!(map[37], "c");
-    /// ```
-    pub fn insert(&mut self, key: usize, value: V) -> Option<V> {
-        let len = self.v.len();
-        if len <= key {
-            self.v.extend((0..key - len + 1).map(|_| None));
-        }
-        let was = replace(&mut self.v[key], Some(value));
-        if was.is_none() {
-            self.n += 1;
-        }
-        was
-    }
-
-    /// Removes a key from the map, returning the value at the key if the key
-    /// was previously in the map.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// assert_eq!(map.remove(1), Some("a"));
-    /// assert_eq!(map.remove(1), None);
-    /// ```
-    pub fn remove(&mut self, key: usize) -> Option<V> {
-        if key >= self.v.len() {
-            return None;
-        }
-        let result = &mut self.v[key];
-        let was = result.take();
-        if was.is_some() {
-            self.n -= 1;
-        }
-        was
-    }
-
-    /// Gets the given key's corresponding entry in the map for in-place manipulation.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut count: VecMap<u32> = VecMap::new();
-    ///
-    /// // count the number of occurrences of numbers in the vec
-    /// for x in vec![1, 2, 1, 2, 3, 4, 1, 2, 4] {
-    ///     *count.entry(x).or_insert(0) += 1;
-    /// }
-    ///
-    /// assert_eq!(count[1], 3);
-    /// ```
-    pub fn entry(&mut self, key: usize) -> Entry<V> {
-        // FIXME(Gankro): this is basically the dumbest implementation of
-        // entry possible, because weird non-lexical borrows issues make it
-        // completely insane to do any other way. That said, Entry is a border-line
-        // useless construct on VecMap, so it's hardly a big loss.
-        if self.contains_key(key) {
-            Occupied(OccupiedEntry {
-                map: self,
-                index: key,
-            })
-        } else {
-            Vacant(VacantEntry {
-                map: self,
-                index: key,
-            })
-        }
-    }
-
-    /// Retains only the elements specified by the predicate.
-    ///
-    /// In other words, remove all pairs `(k, v)` such that `f(&k, &mut v)` returns `false`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map: VecMap<usize> = (0..8).map(|x|(x, x*10)).collect();
-    /// map.retain(|k, _| k % 2 == 0);
-    /// assert_eq!(map.len(), 4);
-    /// ```
-    pub fn retain<F>(&mut self, mut f: F)
-        where F: FnMut(usize, &mut V) -> bool
-    {
-        for (i, e) in self.v.iter_mut().enumerate() {
-            let remove = match *e {
-                Some(ref mut value) => !f(i, value),
-                None => false,
-            };
-            if remove {
-                *e = None;
-                self.n -= 1;
-            }
-        }
-    }
-}
-
-impl<'a, V> Entry<'a, V> {
-    /// Ensures a value is in the entry by inserting the default if empty, and
-    /// returns a mutable reference to the value in the entry.
-    pub fn or_insert(self, default: V) -> &'a mut V {
-        match self {
-            Occupied(entry) => entry.into_mut(),
-            Vacant(entry) => entry.insert(default),
-        }
-    }
-
-    /// Ensures a value is in the entry by inserting the result of the default
-    /// function if empty, and returns a mutable reference to the value in the
-    /// entry.
-    pub fn or_insert_with<F: FnOnce() -> V>(self, default: F) -> &'a mut V {
-        match self {
-            Occupied(entry) => entry.into_mut(),
-            Vacant(entry) => entry.insert(default()),
-        }
-    }
-}
-
-impl<'a, V> VacantEntry<'a, V> {
-    /// Sets the value of the entry with the VacantEntry's key,
-    /// and returns a mutable reference to it.
-    pub fn insert(self, value: V) -> &'a mut V {
-        let index = self.index;
-        self.map.insert(index, value);
-        &mut self.map[index]
-    }
-}
-
-impl<'a, V> OccupiedEntry<'a, V> {
-    /// Gets a reference to the value in the entry.
-    pub fn get(&self) -> &V {
-        let index = self.index;
-        &self.map[index]
-    }
-
-    /// Gets a mutable reference to the value in the entry.
-    pub fn get_mut(&mut self) -> &mut V {
-        let index = self.index;
-        &mut self.map[index]
-    }
-
-    /// Converts the entry into a mutable reference to its value.
-    pub fn into_mut(self) -> &'a mut V {
-        let index = self.index;
-        &mut self.map[index]
-    }
-
-    /// Sets the value of the entry with the OccupiedEntry's key,
-    /// and returns the entry's old value.
-    pub fn insert(&mut self, value: V) -> V {
-        let index = self.index;
-        self.map.insert(index, value).unwrap()
-    }
-
-    /// Takes the value of the entry out of the map, and returns it.
-    pub fn remove(self) -> V {
-        let index = self.index;
-        self.map.remove(index).unwrap()
-    }
-}
-
-impl<V: Clone> Clone for VecMap<V> {
-    #[inline]
-    fn clone(&self) -> Self {
-        VecMap { n: self.n, v: self.v.clone() }
-    }
-
-    #[inline]
-    fn clone_from(&mut self, source: &Self) {
-        self.v.clone_from(&source.v);
-        self.n = source.n;
-    }
-}
-
-impl<V: PartialEq> PartialEq for VecMap<V> {
-    fn eq(&self, other: &Self) -> bool {
-        self.n == other.n && self.iter().eq(other.iter())
-    }
-}
-
-impl<V: Eq> Eq for VecMap<V> {}
-
-impl<V: PartialOrd> PartialOrd for VecMap<V> {
-    #[inline]
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.iter().partial_cmp(other.iter())
-    }
-}
-
-impl<V: Ord> Ord for VecMap<V> {
-    #[inline]
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.iter().cmp(other.iter())
-    }
-}
-
-impl<V: fmt::Debug> fmt::Debug for VecMap<V> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_map().entries(self).finish()
-    }
-}
-
-impl<V> FromIterator<(usize, V)> for VecMap<V> {
-    fn from_iter<I: IntoIterator<Item = (usize, V)>>(iter: I) -> Self {
-        let mut map = Self::new();
-        map.extend(iter);
-        map
-    }
-}
-
-impl<T> IntoIterator for VecMap<T> {
-    type Item = (usize, T);
-    type IntoIter = IntoIter<T>;
-
-    /// Returns an iterator visiting all key-value pairs in ascending order of
-    /// the keys, consuming the original `VecMap`.
-    /// The iterator's element type is `(usize, &'r V)`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use vec_map::VecMap;
-    ///
-    /// let mut map = VecMap::new();
-    /// map.insert(1, "a");
-    /// map.insert(3, "c");
-    /// map.insert(2, "b");
-    ///
-    /// let vec: Vec<(usize, &str)> = map.into_iter().collect();
-    ///
-    /// assert_eq!(vec, [(1, "a"), (2, "b"), (3, "c")]);
-    /// ```
-    fn into_iter(self) -> IntoIter<T> {
-        IntoIter {
-            n: self.n,
-            yielded: 0,
-            iter: self.v.into_iter().enumerate()
-        }
-    }
-}
-
-impl<'a, T> IntoIterator for &'a VecMap<T> {
-    type Item = (usize, &'a T);
-    type IntoIter = Iter<'a, T>;
-
-    fn into_iter(self) -> Iter<'a, T> {
-        self.iter()
-    }
-}
-
-impl<'a, T> IntoIterator for &'a mut VecMap<T> {
-    type Item = (usize, &'a mut T);
-    type IntoIter = IterMut<'a, T>;
-
-    fn into_iter(self) -> IterMut<'a, T> {
-        self.iter_mut()
-    }
-}
-
-impl<V> Extend<(usize, V)> for VecMap<V> {
-    fn extend<I: IntoIterator<Item = (usize, V)>>(&mut self, iter: I) {
-        for (k, v) in iter {
-            self.insert(k, v);
-        }
-    }
-}
-
-impl<'a, V: Copy> Extend<(usize, &'a V)> for VecMap<V> {
-    fn extend<I: IntoIterator<Item = (usize, &'a V)>>(&mut self, iter: I) {
-        self.extend(iter.into_iter().map(|(key, &value)| (key, value)));
-    }
-}
-
-impl<V> Index<usize> for VecMap<V> {
-    type Output = V;
-
-    #[inline]
-    fn index(&self, i: usize) -> &V {
-        self.get(i).expect("key not present")
-    }
-}
-
-impl<'a, V> Index<&'a usize> for VecMap<V> {
-    type Output = V;
-
-    #[inline]
-    fn index(&self, i: &usize) -> &V {
-        self.get(*i).expect("key not present")
-    }
-}
-
-impl<V> IndexMut<usize> for VecMap<V> {
-    #[inline]
-    fn index_mut(&mut self, i: usize) -> &mut V {
-        self.get_mut(i).expect("key not present")
-    }
-}
-
-impl<'a, V> IndexMut<&'a usize> for VecMap<V> {
-    #[inline]
-    fn index_mut(&mut self, i: &usize) -> &mut V {
-        self.get_mut(*i).expect("key not present")
-    }
-}
-
-macro_rules! iterator {
-    (impl $name:ident -> $elem:ty, $($getter:ident),+) => {
-        impl<'a, V> Iterator for $name<'a, V> {
-            type Item = $elem;
-
-            #[inline]
-            fn next(&mut self) -> Option<$elem> {
-                while self.front < self.back {
-                    if let Some(elem) = self.iter.next() {
-                        if let Some(x) = elem$(. $getter ())+ {
-                            let index = self.front;
-                            self.front += 1;
-                            self.yielded += 1;
-                            return Some((index, x));
-                        }
-                    }
-                    self.front += 1;
-                }
-                None
-            }
-
-            #[inline]
-            fn size_hint(&self) -> (usize, Option<usize>) {
-                (self.n - self.yielded, Some(self.n - self.yielded))
-            }
-        }
-    }
-}
-
-macro_rules! double_ended_iterator {
-    (impl $name:ident -> $elem:ty, $($getter:ident),+) => {
-        impl<'a, V> DoubleEndedIterator for $name<'a, V> {
-            #[inline]
-            fn next_back(&mut self) -> Option<$elem> {
-                while self.front < self.back {
-                    if let Some(elem) = self.iter.next_back() {
-                        if let Some(x) = elem$(. $getter ())+ {
-                            self.back -= 1;
-                            return Some((self.back, x));
-                        }
-                    }
-                    self.back -= 1;
-                }
-                None
-            }
-        }
-    }
-}
-
-/// An iterator over the key-value pairs of a map.
-pub struct Iter<'a, V: 'a> {
-    front: usize,
-    back: usize,
-    n: usize,
-    yielded: usize,
-    iter: slice::Iter<'a, Option<V>>
-}
-
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
-impl<'a, V> Clone for Iter<'a, V> {
-    fn clone(&self) -> Iter<'a, V> {
-        Iter {
-            front: self.front,
-            back: self.back,
-            n: self.n,
-            yielded: self.yielded,
-            iter: self.iter.clone()
-        }
-    }
-}
-
-iterator! { impl Iter -> (usize, &'a V), as_ref }
-impl<'a, V> ExactSizeIterator for Iter<'a, V> {}
-double_ended_iterator! { impl Iter -> (usize, &'a V), as_ref }
-
-/// An iterator over the key-value pairs of a map, with the
-/// values being mutable.
-pub struct IterMut<'a, V: 'a> {
-    front: usize,
-    back: usize,
-    n: usize,
-    yielded: usize,
-    iter: slice::IterMut<'a, Option<V>>
-}
-
-iterator! { impl IterMut -> (usize, &'a mut V), as_mut }
-impl<'a, V> ExactSizeIterator for IterMut<'a, V> {}
-double_ended_iterator! { impl IterMut -> (usize, &'a mut V), as_mut }
-
-/// An iterator over the keys of a map.
-pub struct Keys<'a, V: 'a> {
-    iter: Iter<'a, V>,
-}
-
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
-impl<'a, V> Clone for Keys<'a, V> {
-    fn clone(&self) -> Keys<'a, V> {
-        Keys {
-            iter: self.iter.clone()
-        }
-    }
-}
-
-/// An iterator over the values of a map.
-pub struct Values<'a, V: 'a> {
-    iter: Iter<'a, V>,
-}
-
-// FIXME(#19839) Remove in favor of `#[derive(Clone)]`
-impl<'a, V> Clone for Values<'a, V> {
-    fn clone(&self) -> Values<'a, V> {
-        Values {
-            iter: self.iter.clone()
-        }
-    }
-}
-
-/// An iterator over the values of a map.
-pub struct ValuesMut<'a, V: 'a> {
-    iter_mut: IterMut<'a, V>,
-}
-
-/// A consuming iterator over the key-value pairs of a map.
-pub struct IntoIter<V> {
-    n: usize,
-    yielded: usize,
-    iter: Enumerate<vec::IntoIter<Option<V>>>,
-}
-
-/// A draining iterator over the key-value pairs of a map.
-pub struct Drain<'a, V: 'a> {
-    iter: FilterMap<
-    Enumerate<vec::Drain<'a, Option<V>>>,
-    fn((usize, Option<V>)) -> Option<(usize, V)>>
-}
-
-impl<'a, V> Iterator for Drain<'a, V> {
-    type Item = (usize, V);
-
-    fn next(&mut self) -> Option<(usize, V)> { self.iter.next() }
-    fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
-}
-
-impl<'a, V> ExactSizeIterator for Drain<'a, V> {}
-
-impl<'a, V> DoubleEndedIterator for Drain<'a, V> {
-    fn next_back(&mut self) -> Option<(usize, V)> { self.iter.next_back() }
-}
-
-impl<'a, V> Iterator for Keys<'a, V> {
-    type Item = usize;
-
-    fn next(&mut self) -> Option<usize> { self.iter.next().map(|e| e.0) }
-    fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
-}
-
-impl<'a, V> ExactSizeIterator for Keys<'a, V> {}
-
-impl<'a, V> DoubleEndedIterator for Keys<'a, V> {
-    fn next_back(&mut self) -> Option<usize> { self.iter.next_back().map(|e| e.0) }
-}
-
-impl<'a, V> Iterator for Values<'a, V> {
-    type Item = &'a V;
-
-    fn next(&mut self) -> Option<(&'a V)> { self.iter.next().map(|e| e.1) }
-    fn size_hint(&self) -> (usize, Option<usize>) { self.iter.size_hint() }
-}
-
-impl<'a, V> ExactSizeIterator for Values<'a, V> {}
-
-impl<'a, V> DoubleEndedIterator for Values<'a, V> {
-    fn next_back(&mut self) -> Option<(&'a V)> { self.iter.next_back().map(|e| e.1) }
-}
-
-impl<'a, V> Iterator for ValuesMut<'a, V> {
-    type Item = &'a mut V;
-
-    fn next(&mut self) -> Option<(&'a mut V)> { self.iter_mut.next().map(|e| e.1) }
-    fn size_hint(&self) -> (usize, Option<usize>) { self.iter_mut.size_hint() }
-}
-
-impl<'a, V> ExactSizeIterator for ValuesMut<'a, V> {}
-
-impl<'a, V> DoubleEndedIterator for ValuesMut<'a, V> {
-    fn next_back(&mut self) -> Option<&'a mut V> { self.iter_mut.next_back().map(|e| e.1) }
-}
-
-impl<V> Iterator for IntoIter<V> {
-    type Item = (usize, V);
-
-    fn next(&mut self) -> Option<(usize, V)> {
-        loop {
-            match self.iter.next() {
-                None => return None,
-                Some((i, Some(value))) => {
-                    self.yielded += 1;
-                    return Some((i, value))
-                },
-                _ => {}
-            }
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.n - self.yielded, Some(self.n - self.yielded))
-    }
-}
-
-impl<V> ExactSizeIterator for IntoIter<V> {}
-
-impl<V> DoubleEndedIterator for IntoIter<V> {
-    fn next_back(&mut self) -> Option<(usize, V)> {
-        loop {
-            match self.iter.next_back() {
-                None => return None,
-                Some((i, Some(value))) => return Some((i, value)),
-                _ => {}
-            }
-        }
-    }
-}
-
-#[allow(dead_code)]
-fn assert_properties() {
-    fn vec_map_covariant<'a, T>(map: VecMap<&'static T>) -> VecMap<&'a T> { map }
-
-    fn into_iter_covariant<'a, T>(iter: IntoIter<&'static T>) -> IntoIter<&'a T> { iter }
-
-    fn iter_covariant<'i, 'a, T>(iter: Iter<'i, &'static T>) -> Iter<'i, &'a T> { iter }
-
-    fn keys_covariant<'i, 'a, T>(iter: Keys<'i, &'static T>) -> Keys<'i, &'a T> { iter }
-
-    fn values_covariant<'i, 'a, T>(iter: Values<'i, &'static T>) -> Values<'i, &'a T> { iter }
-}
-
-#[cfg(test)]
-mod test {
-    use super::VecMap;
-    use super::Entry::{Occupied, Vacant};
-    use std::hash::{Hash, Hasher};
-    use std::collections::hash_map::DefaultHasher;
-
-    #[test]
-    fn test_get_mut() {
-        let mut m = VecMap::new();
-        assert!(m.insert(1, 12).is_none());
-        assert!(m.insert(2, 8).is_none());
-        assert!(m.insert(5, 14).is_none());
-        let new = 100;
-        match m.get_mut(5) {
-            None => panic!(), Some(x) => *x = new
-        }
-        assert_eq!(m.get(5), Some(&new));
-    }
-
-    #[test]
-    fn test_len() {
-        let mut map = VecMap::new();
-        assert_eq!(map.len(), 0);
-        assert!(map.is_empty());
-        assert!(map.insert(5, 20).is_none());
-        assert_eq!(map.len(), 1);
-        assert!(!map.is_empty());
-        assert!(map.insert(11, 12).is_none());
-        assert_eq!(map.len(), 2);
-        assert!(!map.is_empty());
-        assert!(map.insert(14, 22).is_none());
-        assert_eq!(map.len(), 3);
-        assert!(!map.is_empty());
-    }
-
-    #[test]
-    fn test_clear() {
-        let mut map = VecMap::new();
-        assert!(map.insert(5, 20).is_none());
-        assert!(map.insert(11, 12).is_none());
-        assert!(map.insert(14, 22).is_none());
-        map.clear();
-        assert!(map.is_empty());
-        assert!(map.get(5).is_none());
-        assert!(map.get(11).is_none());
-        assert!(map.get(14).is_none());
-    }
-
-    #[test]
-    fn test_insert() {
-        let mut m = VecMap::new();
-        assert_eq!(m.insert(1, 2), None);
-        assert_eq!(m.insert(1, 3), Some(2));
-        assert_eq!(m.insert(1, 4), Some(3));
-    }
-
-    #[test]
-    fn test_remove() {
-        let mut m = VecMap::new();
-        m.insert(1, 2);
-        assert_eq!(m.remove(1), Some(2));
-        assert_eq!(m.remove(1), None);
-    }
-
-    #[test]
-    fn test_keys() {
-        let mut map = VecMap::new();
-        map.insert(1, 'a');
-        map.insert(2, 'b');
-        map.insert(3, 'c');
-        let keys: Vec<_> = map.keys().collect();
-        assert_eq!(keys.len(), 3);
-        assert!(keys.contains(&1));
-        assert!(keys.contains(&2));
-        assert!(keys.contains(&3));
-    }
-
-    #[test]
-    fn test_values() {
-        let mut map = VecMap::new();
-        map.insert(1, 'a');
-        map.insert(2, 'b');
-        map.insert(3, 'c');
-        let values: Vec<_> = map.values().cloned().collect();
-        assert_eq!(values.len(), 3);
-        assert!(values.contains(&'a'));
-        assert!(values.contains(&'b'));
-        assert!(values.contains(&'c'));
-    }
-
-    #[test]
-    fn test_iterator() {
-        let mut m = VecMap::new();
-
-        assert!(m.insert(0, 1).is_none());
-        assert!(m.insert(1, 2).is_none());
-        assert!(m.insert(3, 5).is_none());
-        assert!(m.insert(6, 10).is_none());
-        assert!(m.insert(10, 11).is_none());
-
-        let mut it = m.iter();
-        assert_eq!(it.size_hint(), (5, Some(5)));
-        assert_eq!(it.next().unwrap(), (0, &1));
-        assert_eq!(it.size_hint(), (4, Some(4)));
-        assert_eq!(it.next().unwrap(), (1, &2));
-        assert_eq!(it.size_hint(), (3, Some(3)));
-        assert_eq!(it.next().unwrap(), (3, &5));
-        assert_eq!(it.size_hint(), (2, Some(2)));
-        assert_eq!(it.next().unwrap(), (6, &10));
-        assert_eq!(it.size_hint(), (1, Some(1)));
-        assert_eq!(it.next().unwrap(), (10, &11));
-        assert_eq!(it.size_hint(), (0, Some(0)));
-        assert!(it.next().is_none());
-    }
-
-    #[test]
-    fn test_iterator_size_hints() {
-        let mut m = VecMap::new();
-
-        assert!(m.insert(0, 1).is_none());
-        assert!(m.insert(1, 2).is_none());
-        assert!(m.insert(3, 5).is_none());
-        assert!(m.insert(6, 10).is_none());
-        assert!(m.insert(10, 11).is_none());
-
-        assert_eq!(m.iter().size_hint(), (5, Some(5)));
-        assert_eq!(m.iter().rev().size_hint(), (5, Some(5)));
-        assert_eq!(m.iter_mut().size_hint(), (5, Some(5)));
-        assert_eq!(m.iter_mut().rev().size_hint(), (5, Some(5)));
-    }
-
-    #[test]
-    fn test_mut_iterator() {
-        let mut m = VecMap::new();
-
-        assert!(m.insert(0, 1).is_none());
-        assert!(m.insert(1, 2).is_none());
-        assert!(m.insert(3, 5).is_none());
-        assert!(m.insert(6, 10).is_none());
-        assert!(m.insert(10, 11).is_none());
-
-        for (k, v) in &mut m {
-            *v += k as isize;
-        }
-
-        let mut it = m.iter();
-        assert_eq!(it.next().unwrap(), (0, &1));
-        assert_eq!(it.next().unwrap(), (1, &3));
-        assert_eq!(it.next().unwrap(), (3, &8));
-        assert_eq!(it.next().unwrap(), (6, &16));
-        assert_eq!(it.next().unwrap(), (10, &21));
-        assert!(it.next().is_none());
-    }
-
-    #[test]
-    fn test_rev_iterator() {
-        let mut m = VecMap::new();
-
-        assert!(m.insert(0, 1).is_none());
-        assert!(m.insert(1, 2).is_none());
-        assert!(m.insert(3, 5).is_none());
-        assert!(m.insert(6, 10).is_none());
-        assert!(m.insert(10, 11).is_none());
-
-        let mut it = m.iter().rev();
-        assert_eq!(it.next().unwrap(), (10, &11));
-        assert_eq!(it.next().unwrap(), (6, &10));
-        assert_eq!(it.next().unwrap(), (3, &5));
-        assert_eq!(it.next().unwrap(), (1, &2));
-        assert_eq!(it.next().unwrap(), (0, &1));
-        assert!(it.next().is_none());
-    }
-
-    #[test]
-    fn test_mut_rev_iterator() {
-        let mut m = VecMap::new();
-
-        assert!(m.insert(0, 1).is_none());
-        assert!(m.insert(1, 2).is_none());
-        assert!(m.insert(3, 5).is_none());
-        assert!(m.insert(6, 10).is_none());
-        assert!(m.insert(10, 11).is_none());
-
-        for (k, v) in m.iter_mut().rev() {
-            *v += k as isize;
-        }
-
-        let mut it = m.iter();
-        assert_eq!(it.next().unwrap(), (0, &1));
-        assert_eq!(it.next().unwrap(), (1, &3));
-        assert_eq!(it.next().unwrap(), (3, &8));
-        assert_eq!(it.next().unwrap(), (6, &16));
-        assert_eq!(it.next().unwrap(), (10, &21));
-        assert!(it.next().is_none());
-    }
-
-    #[test]
-    fn test_move_iter() {
-        let mut m: VecMap<Box<_>> = VecMap::new();
-        m.insert(1, Box::new(2));
-        let mut called = false;
-        for (k, v) in m {
-            assert!(!called);
-            called = true;
-            assert_eq!(k, 1);
-            assert_eq!(v, Box::new(2));
-        }
-        assert!(called);
-    }
-
-    #[test]
-    fn test_drain_iterator() {
-        let mut map = VecMap::new();
-        map.insert(1, "a");
-        map.insert(3, "c");
-        map.insert(2, "b");
-
-        let vec: Vec<_> = map.drain().collect();
-
-        assert_eq!(vec, [(1, "a"), (2, "b"), (3, "c")]);
-        assert_eq!(map.len(), 0);
-    }
-
-    #[test]
-    fn test_append() {
-        let mut a = VecMap::new();
-        a.insert(1, "a");
-        a.insert(2, "b");
-        a.insert(3, "c");
-
-        let mut b = VecMap::new();
-        b.insert(3, "d");  // Overwrite element from a
-        b.insert(4, "e");
-        b.insert(5, "f");
-
-        a.append(&mut b);
-
-        assert_eq!(a.len(), 5);
-        assert_eq!(b.len(), 0);
-        // Capacity shouldn't change for possible reuse
-        assert!(b.capacity() >= 4);
-
-        assert_eq!(a[1], "a");
-        assert_eq!(a[2], "b");
-        assert_eq!(a[3], "d");
-        assert_eq!(a[4], "e");
-        assert_eq!(a[5], "f");
-    }
-
-    #[test]
-    fn test_split_off() {
-        // Split within the key range
-        let mut a = VecMap::new();
-        a.insert(1, "a");
-        a.insert(2, "b");
-        a.insert(3, "c");
-        a.insert(4, "d");
-
-        let b = a.split_off(3);
-
-        assert_eq!(a.len(), 2);
-        assert_eq!(b.len(), 2);
-
-        assert_eq!(a[1], "a");
-        assert_eq!(a[2], "b");
-
-        assert_eq!(b[3], "c");
-        assert_eq!(b[4], "d");
-
-        // Split at 0
-        a.clear();
-        a.insert(1, "a");
-        a.insert(2, "b");
-        a.insert(3, "c");
-        a.insert(4, "d");
-
-        let b = a.split_off(0);
-
-        assert_eq!(a.len(), 0);
-        assert_eq!(b.len(), 4);
-        assert_eq!(b[1], "a");
-        assert_eq!(b[2], "b");
-        assert_eq!(b[3], "c");
-        assert_eq!(b[4], "d");
-
-        // Split behind max_key
-        a.clear();
-        a.insert(1, "a");
-        a.insert(2, "b");
-        a.insert(3, "c");
-        a.insert(4, "d");
-
-        let b = a.split_off(5);
-
-        assert_eq!(a.len(), 4);
-        assert_eq!(b.len(), 0);
-        assert_eq!(a[1], "a");
-        assert_eq!(a[2], "b");
-        assert_eq!(a[3], "c");
-        assert_eq!(a[4], "d");
-    }
-
-    #[test]
-    fn test_show() {
-        let mut map = VecMap::new();
-        let empty = VecMap::<i32>::new();
-
-        map.insert(1, 2);
-        map.insert(3, 4);
-
-        let map_str = format!("{:?}", map);
-        assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}");
-        assert_eq!(format!("{:?}", empty), "{}");
-    }
-
-    #[test]
-    fn test_clone() {
-        let mut a = VecMap::new();
-
-        a.insert(1, 'x');
-        a.insert(4, 'y');
-        a.insert(6, 'z');
-
-        assert_eq!(a.clone().iter().collect::<Vec<_>>(), [(1, &'x'), (4, &'y'), (6, &'z')]);
-    }
-
-    #[test]
-    fn test_eq() {
-        let mut a = VecMap::new();
-        let mut b = VecMap::new();
-
-        assert!(a == b);
-        assert!(a.insert(0, 5).is_none());
-        assert!(a != b);
-        assert!(b.insert(0, 4).is_none());
-        assert!(a != b);
-        assert!(a.insert(5, 19).is_none());
-        assert!(a != b);
-        assert!(!b.insert(0, 5).is_none());
-        assert!(a != b);
-        assert!(b.insert(5, 19).is_none());
-        assert!(a == b);
-
-        a = VecMap::new();
-        b = VecMap::with_capacity(1);
-        assert!(a == b);
-    }
-
-    #[test]
-    fn test_lt() {
-        let mut a = VecMap::new();
-        let mut b = VecMap::new();
-
-        assert!(!(a < b) && !(b < a));
-        assert!(b.insert(2, 5).is_none());
-        assert!(a < b);
-        assert!(a.insert(2, 7).is_none());
-        assert!(!(a < b) && b < a);
-        assert!(b.insert(1, 0).is_none());
-        assert!(b < a);
-        assert!(a.insert(0, 6).is_none());
-        assert!(a < b);
-        assert!(a.insert(6, 2).is_none());
-        assert!(a < b && !(b < a));
-    }
-
-    #[test]
-    fn test_ord() {
-        let mut a = VecMap::new();
-        let mut b = VecMap::new();
-
-        assert!(a <= b && a >= b);
-        assert!(a.insert(1, 1).is_none());
-        assert!(a > b && a >= b);
-        assert!(b < a && b <= a);
-        assert!(b.insert(2, 2).is_none());
-        assert!(b > a && b >= a);
-        assert!(a < b && a <= b);
-    }
-
-    #[test]
-    fn test_hash() {
-        fn hash<T: Hash>(t: &T) -> u64 {
-            let mut s = DefaultHasher::new();
-            t.hash(&mut s);
-            s.finish()
-        }
-
-        let mut x = VecMap::new();
-        let mut y = VecMap::new();
-
-        assert!(hash(&x) == hash(&y));
-        x.insert(1, 'a');
-        x.insert(2, 'b');
-        x.insert(3, 'c');
-
-        y.insert(3, 'c');
-        y.insert(2, 'b');
-        y.insert(1, 'a');
-
-        assert!(hash(&x) == hash(&y));
-
-        x.insert(1000, 'd');
-        x.remove(1000);
-
-        assert!(hash(&x) == hash(&y));
-    }
-
-    #[test]
-    fn test_from_iter() {
-        let xs = [(1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e')];
-
-        let map: VecMap<_> = xs.iter().cloned().collect();
-
-        for &(k, v) in &xs {
-            assert_eq!(map.get(k), Some(&v));
-        }
-    }
-
-    #[test]
-    fn test_index() {
-        let mut map = VecMap::new();
-
-        map.insert(1, 2);
-        map.insert(2, 1);
-        map.insert(3, 4);
-
-        assert_eq!(map[3], 4);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_index_nonexistent() {
-        let mut map = VecMap::new();
-
-        map.insert(1, 2);
-        map.insert(2, 1);
-        map.insert(3, 4);
-
-        map[4];
-    }
-
-    #[test]
-    fn test_entry() {
-        let xs = [(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)];
-
-        let mut map: VecMap<_> = xs.iter().cloned().collect();
-
-        // Existing key (insert)
-        match map.entry(1) {
-            Vacant(_) => unreachable!(),
-            Occupied(mut view) => {
-                assert_eq!(view.get(), &10);
-                assert_eq!(view.insert(100), 10);
-            }
-        }
-
-        assert_eq!(map.get(1).unwrap(), &100);
-        assert_eq!(map.len(), 6);
-
-        // Existing key (update)
-        match map.entry(2) {
-            Vacant(_) => unreachable!(),
-            Occupied(mut view) => {
-                let v = view.get_mut();
-                *v *= 10;
-            }
-        }
-
-        assert_eq!(map.get(2).unwrap(), &200);
-        assert_eq!(map.len(), 6);
-
-        // Existing key (take)
-        match map.entry(3) {
-            Vacant(_) => unreachable!(),
-            Occupied(view) => {
-                assert_eq!(view.remove(), 30);
-            }
-        }
-
-        assert_eq!(map.get(3), None);
-        assert_eq!(map.len(), 5);
-
-        // Inexistent key (insert)
-        match map.entry(10) {
-            Occupied(_) => unreachable!(),
-            Vacant(view) => {
-                assert_eq!(*view.insert(1000), 1000);
-            }
-        }
-
-        assert_eq!(map.get(10).unwrap(), &1000);
-        assert_eq!(map.len(), 6);
-    }
-
-    #[test]
-    fn test_extend_ref() {
-        let mut a = VecMap::new();
-        a.insert(1, "one");
-        let mut b = VecMap::new();
-        b.insert(2, "two");
-        b.insert(3, "three");
-
-        a.extend(&b);
-
-        assert_eq!(a.len(), 3);
-        assert_eq!(a[&1], "one");
-        assert_eq!(a[&2], "two");
-        assert_eq!(a[&3], "three");
-    }
-
-    #[test]
-    #[cfg(feature = "serde")]
-    fn test_serde() {
-        use serde::{Serialize, Deserialize};
-        fn impls_serde_traits<'de, S: Serialize + Deserialize<'de>>() {}
-
-        impls_serde_traits::<VecMap<u32>>();
-    }
-
-    #[test]
-    fn test_retain() {
-        let mut map = VecMap::new();
-        map.insert(1, "one");
-        map.insert(2, "two");
-        map.insert(3, "three");
-        map.retain(|k, v| match k {
-            1 => false,
-            2 => {
-                *v = "two changed";
-                true
-            },
-            3 => false,
-            _ => panic!(),
-        });
-
-        assert_eq!(map.len(), 1);
-        assert_eq!(map.get(1), None);
-        assert_eq!(map[2], "two changed");
-        assert_eq!(map.get(3), None);
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/.cargo-checksum.json firefox-85.0+build1/third_party/rust/wasmparser/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/wasmparser/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/.cargo-checksum.json	2021-01-18 19:58:26.000000000 +0000
@@ -1 +1 @@
-{"files":{"Cargo.lock":"b484e6e75470ba8772cdfdcbbd66e647cfc963654ef7ae56bd3149f554f96dfe","Cargo.toml":"824a3a989355c393ec8aa217408ae4ec64ca083d320ac0ee46c04ca73a8b5e78","README.md":"2e252886759b5ee5137ec39efc0765850be2cb4242c68e6b44452b75d3191db3","benches/benchmark.rs":"2ed1bd83b9df9d91b11b0ab34053a77a228e9d3961a4a161477dd74882e95378","compare-with-main.sh":"2ddfab71ba571055292a29a36c1ede05f64ba094c78495b945d1486bf32ab6d7","examples/simple.rs":"606072a46c5c80df29da3ecd98a989feb1289243550033cd3c3e1df6045ce8ce","src/binary_reader.rs":"3108b99f780aa05a598fd61d3b8b71623b92c97801f6da3d05cb00855cfb5416","src/lib.rs":"372776c7339cc879ba2a1109e4692d09441dd6832955ed48aed1806b135b72a4","src/limits.rs":"dff24bbeea651c6ad06f7c63916c17e024f892e5262e939ed88274021e967d0b","src/module_resources.rs":"8d4bc965c11d3d2adfe2162cc81ceb075ac2a73da8a77ce25f154af3449a79c9","src/operators_validator.rs":"f181e6ccec7144637214d43f4a5ab34f0e2f3c56f09296492efb8c6f951be852","src/parser.rs":"c05a92a04020e990635728101e3f7d6653ccdeb54f2ce3615fc6c058b344cd8e","src/primitives.rs":"72bd331f63ed40758af000064faf7f175988caa2eede064bee77e8cfbac511c3","src/readers/alias_section.rs":"ef6556c3e300549958010aba9f1a0f6852c80ceddc763b4c11463d97234488b3","src/readers/code_section.rs":"d7d8be8f8bf158dac6ba7ee1d6583ea386e440f728a1f6ce1aa2e91352f884f4","src/readers/data_section.rs":"d919a22ebc44c53ca434df6c1d16efc8e126e7b55ed99691d5ae73c10bfadfff","src/readers/element_section.rs":"f168a3cb02439aeaa81621525e2747d3bc4743fac2237dcdf8658b67e010ca08","src/readers/export_section.rs":"3fe296f1789e789009a79115052194a1352d947f2a8830945d6b7d9983bb8579","src/readers/function_section.rs":"5467d7a375c22a4cc225819212e616f275ef01516f185b346eae2ffbb5c53cb3","src/readers/global_section.rs":"359450911ac662503f90288798baec2415df6d3b80990a7b75794683df7894b8","src/readers/import_section.rs":"80906451f78c64d31a76772d97c96d18d208eeabaaaf82372b0567a8991795c1","src/readers/init_expr.rs":"7020c80013dad4518a5f969c3ab4d624b46d778f03e632871cf343964f63441c","src/readers/instance_section.rs":"0f6cc9ed6bb6520493090eff5bbd6a9030ba1432206799b7dfed0b9285bafd73","src/readers/linking_section.rs":"db3091a48827a5b035e2f79f40f7ed9a7ea10acd4db6ab2bbd01e17a65a4265e","src/readers/memory_section.rs":"67d8457d3167b39fc9ae2c04f3c3e28bc10be97bbdaccd681675fb8d3eba2bd3","src/readers/mod.rs":"0fbaa4e1d7e3e68d8857fd8b3ce5c3fba886a1b460cd37398afcbf4802280b4e","src/readers/module_code_section.rs":"806eea527c84570ca6c5b8ca556f95727edae7da29e4f384b067113231b8e5f5","src/readers/module_section.rs":"6e28be8f1f4d2f1a9470ec356c46a76c2f21916143a1f0e245b96d2272d0301e","src/readers/name_section.rs":"60d4aa007cfdc16eedc1b4cb0bee560f6eebd82aaa81e9be9c844e515b16e445","src/readers/operators.rs":"3800f0321a776ddc5e8fb030828e4f2a65ebafa4b7f0808774384559ddfe49ea","src/readers/producers_section.rs":"77f93449e4bdcd61e4c79e47a685742f49cd5dac837ba002bce14120f14c9470","src/readers/reloc_section.rs":"e48e6acaa5145d6fbe1d74eb406ee59c43235faa47fbf0b07288504e60573a5e","src/readers/section_reader.rs":"e99763ce9c48994fd1e92f011a449936c4206a5c91d50fa580d003b6cc824ec5","src/readers/table_section.rs":"5d94185f68c4c7526a8836a2ebdb5b20fe754af58b68d2d0eb8fea62b7e6fe71","src/readers/type_section.rs":"87a54d238bf900aac0d0508e5c644d71b1e591df99367587feb68146a25a5a61","src/validator.rs":"003f1bc3f7fe0db0cf49007d45e4d1d3404c393ee96830625b138f9ed2a8c40b","src/validator/func.rs":"cda4491f7865df340f2c1fe066c7e9162febe0eef06e7d2b8fd9a50e469b3eae"},"package":"57da5d7300428d75d8b3cdfb736e41ee6af8926d69c1de2f201a1a22f234b7b5"}
\ No newline at end of file
+{"files":{"Cargo.toml":"a16cf97fa88a9adb6f61c99df640bd83904854f9a98342bbb575ba47e86b5a7a","README.md":"2e252886759b5ee5137ec39efc0765850be2cb4242c68e6b44452b75d3191db3","benches/benchmark.rs":"2ed1bd83b9df9d91b11b0ab34053a77a228e9d3961a4a161477dd74882e95378","compare-with-main.sh":"2ddfab71ba571055292a29a36c1ede05f64ba094c78495b945d1486bf32ab6d7","examples/simple.rs":"606072a46c5c80df29da3ecd98a989feb1289243550033cd3c3e1df6045ce8ce","src/binary_reader.rs":"62acf2d5f4216735847beb464afcad2afbedc48a90c91d704e352a5de1223c02","src/lib.rs":"372776c7339cc879ba2a1109e4692d09441dd6832955ed48aed1806b135b72a4","src/limits.rs":"dff24bbeea651c6ad06f7c63916c17e024f892e5262e939ed88274021e967d0b","src/module_resources.rs":"8d4bc965c11d3d2adfe2162cc81ceb075ac2a73da8a77ce25f154af3449a79c9","src/operators_validator.rs":"40e5001adf0179233b321c8e3d1e175dca160fb3968ddf0a687e16f4985ad530","src/parser.rs":"c05a92a04020e990635728101e3f7d6653ccdeb54f2ce3615fc6c058b344cd8e","src/primitives.rs":"46edb5cb01925403b6f19d829ee2b2029f49120f10ab0e4640628d80d0142612","src/readers/alias_section.rs":"ef6556c3e300549958010aba9f1a0f6852c80ceddc763b4c11463d97234488b3","src/readers/code_section.rs":"d7d8be8f8bf158dac6ba7ee1d6583ea386e440f728a1f6ce1aa2e91352f884f4","src/readers/data_section.rs":"d919a22ebc44c53ca434df6c1d16efc8e126e7b55ed99691d5ae73c10bfadfff","src/readers/element_section.rs":"f168a3cb02439aeaa81621525e2747d3bc4743fac2237dcdf8658b67e010ca08","src/readers/export_section.rs":"3fe296f1789e789009a79115052194a1352d947f2a8830945d6b7d9983bb8579","src/readers/function_section.rs":"5467d7a375c22a4cc225819212e616f275ef01516f185b346eae2ffbb5c53cb3","src/readers/global_section.rs":"359450911ac662503f90288798baec2415df6d3b80990a7b75794683df7894b8","src/readers/import_section.rs":"80906451f78c64d31a76772d97c96d18d208eeabaaaf82372b0567a8991795c1","src/readers/init_expr.rs":"7020c80013dad4518a5f969c3ab4d624b46d778f03e632871cf343964f63441c","src/readers/instance_section.rs":"0f6cc9ed6bb6520493090eff5bbd6a9030ba1432206799b7dfed0b9285bafd73","src/readers/linking_section.rs":"db3091a48827a5b035e2f79f40f7ed9a7ea10acd4db6ab2bbd01e17a65a4265e","src/readers/memory_section.rs":"67d8457d3167b39fc9ae2c04f3c3e28bc10be97bbdaccd681675fb8d3eba2bd3","src/readers/mod.rs":"0fbaa4e1d7e3e68d8857fd8b3ce5c3fba886a1b460cd37398afcbf4802280b4e","src/readers/module_code_section.rs":"806eea527c84570ca6c5b8ca556f95727edae7da29e4f384b067113231b8e5f5","src/readers/module_section.rs":"6e28be8f1f4d2f1a9470ec356c46a76c2f21916143a1f0e245b96d2272d0301e","src/readers/name_section.rs":"60d4aa007cfdc16eedc1b4cb0bee560f6eebd82aaa81e9be9c844e515b16e445","src/readers/operators.rs":"3800f0321a776ddc5e8fb030828e4f2a65ebafa4b7f0808774384559ddfe49ea","src/readers/producers_section.rs":"77f93449e4bdcd61e4c79e47a685742f49cd5dac837ba002bce14120f14c9470","src/readers/reloc_section.rs":"e48e6acaa5145d6fbe1d74eb406ee59c43235faa47fbf0b07288504e60573a5e","src/readers/section_reader.rs":"e99763ce9c48994fd1e92f011a449936c4206a5c91d50fa580d003b6cc824ec5","src/readers/table_section.rs":"5d94185f68c4c7526a8836a2ebdb5b20fe754af58b68d2d0eb8fea62b7e6fe71","src/readers/type_section.rs":"87a54d238bf900aac0d0508e5c644d71b1e591df99367587feb68146a25a5a61","src/validator.rs":"4843a7343d81b4e656943b0f31a7f7aee6e901657a7ff569cf6779dfe177dfb1","src/validator/func.rs":"ed93410b8572a39449a682f4d9c13530a8806cffc51fa4b904b89a72fa89dfed"},"package":null}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/Cargo.lock firefox-85.0+build1/third_party/rust/wasmparser/Cargo.lock
--- firefox-84.0.2+build1/third_party/rust/wasmparser/Cargo.lock	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/Cargo.lock	1970-01-01 00:00:00.000000000 +0000
@@ -1,626 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "anyhow"
-version = "1.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bstr"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
-
-[[package]]
-name = "byteorder"
-version = "1.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
-
-[[package]]
-name = "cast"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
-dependencies = [
- "rustc_version",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "clap"
-version = "2.33.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "bitflags",
- "textwrap",
- "unicode-width",
-]
-
-[[package]]
-name = "criterion"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
-dependencies = [
- "atty",
- "cast",
- "clap",
- "criterion-plot",
- "csv",
- "itertools",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_cbor",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-dependencies = [
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if",
- "crossbeam-utils",
- "lazy_static",
- "maybe-uninit",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if",
- "lazy_static",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "half"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-
-[[package]]
-name = "js-sys"
-version = "0.3.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa7087f49d294270db4e1928fc110c976cd4b9e5a16348e0a1df09afa99e6c98"
-
-[[package]]
-name = "log"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "oorandom"
-version = "11.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c"
-
-[[package]]
-name = "plotters"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
-dependencies = [
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rayon"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "regex"
-version = "1.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
-dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "tinytemplate"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-
-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
-
-[[package]]
-name = "wasmparser"
-version = "0.63.0"
-dependencies = [
- "anyhow",
- "criterion",
- "getopts",
- "rayon",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/Cargo.toml firefox-85.0+build1/third_party/rust/wasmparser/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/wasmparser/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -1,40 +1,31 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
 [package]
-edition = "2018"
 name = "wasmparser"
-version = "0.63.0"
+version = "0.67.0"
 authors = ["Yury Delendik <ydelendik@mozilla.com>"]
-description = "A simple event-driven library for parsing WebAssembly binary files.\n"
-homepage = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
-keywords = ["parser", "WebAssembly", "wasm"]
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
+homepage = "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser"
+keywords = ["parser", "WebAssembly", "wasm"]
+description = """
+A simple event-driven library for parsing WebAssembly binary files.
+"""
+edition = "2018"
+
+[dev-dependencies]
+anyhow = "1.0"
+criterion = "0.3"
+getopts = "0.2"
+wat = { path = "../wat" }
+wast = { path = "../wast" }
+rayon = "1.3"
+wasmparser-dump = { path = "../dump" }
 
 [[bench]]
 name = "benchmark"
 harness = false
-[dev-dependencies.anyhow]
-version = "1.0"
-
-[dev-dependencies.criterion]
-version = "0.3"
-
-[dev-dependencies.getopts]
-version = "0.2"
-
-[dev-dependencies.rayon]
-version = "1.3"
 
 [features]
+# The "deterministic" feature supports only Wasm code with "deterministic" execution
+# across any hardware. This feature is very critical for many Blockchain infrastructures
+# that rely on deterministic executions of smart contracts across different hardwares.
 deterministic = []
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/src/binary_reader.rs firefox-85.0+build1/third_party/rust/wasmparser/src/binary_reader.rs
--- firefox-84.0.2+build1/third_party/rust/wasmparser/src/binary_reader.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/src/binary_reader.rs	2021-01-18 19:58:26.000000000 +0000
@@ -363,13 +363,8 @@
             Ok(MemoryType::M32 { limits, shared })
         } else {
             let limits = self.read_resizable_limits64((flags & 0x1) != 0)?;
-            if (flags & 0x2) != 0 {
-                return Err(BinaryReaderError::new(
-                    "64-bit memories cannot be shared",
-                    pos,
-                ));
-            }
-            Ok(MemoryType::M64 { limits })
+            let shared = (flags & 0x2) != 0;
+            Ok(MemoryType::M64 { limits, shared })
         }
     }
 
@@ -1687,6 +1682,7 @@
             0xb7 => Operator::I32x4MinU,
             0xb8 => Operator::I32x4MaxS,
             0xb9 => Operator::I32x4MaxU,
+            0xba => Operator::I32x4DotI16x8S,
             0xc1 => Operator::I64x2Neg,
             0xcb => Operator::I64x2Shl,
             0xcc => Operator::I64x2ShrS,
@@ -1728,6 +1724,12 @@
             0xf9 => Operator::I32x4TruncSatF32x4U,
             0xfa => Operator::F32x4ConvertI32x4S,
             0xfb => Operator::F32x4ConvertI32x4U,
+            0xfc => Operator::V128Load32Zero {
+                memarg: self.read_memarg_of_align(2)?,
+            },
+            0xfd => Operator::V128Load64Zero {
+                memarg: self.read_memarg_of_align(3)?,
+            },
             _ => {
                 return Err(BinaryReaderError::new(
                     format!("Unknown 0xfd subopcode: 0x{:x}", code),
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/src/operators_validator.rs firefox-85.0+build1/third_party/rust/wasmparser/src/operators_validator.rs
--- firefox-84.0.2+build1/third_party/rust/wasmparser/src/operators_validator.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/src/operators_validator.rs	2021-01-18 19:58:26.000000000 +0000
@@ -82,7 +82,7 @@
 
     // The `operands` is the current type stack, and the `control` list is the
     // list of blocks that we're currently in.
-    operands: Vec<Option<Type>>,
+    pub(crate) operands: Vec<Option<Type>>,
     control: Vec<Frame>,
 
     // This is a list of flags for wasm features which are used to gate various
@@ -212,20 +212,29 @@
             if control.unreachable {
                 None
             } else {
-                bail_op_err!(
-                    "type mismatch: expected {:?} but nothing on stack",
-                    expected
-                )
+                let desc = match expected {
+                    Some(ty) => ty_to_str(ty),
+                    None => "a type",
+                };
+                bail_op_err!("type mismatch: expected {} but nothing on stack", desc)
             }
         } else {
             self.operands.pop().unwrap()
         };
-        if actual.is_none() {
-            Ok(expected)
-        } else if expected.is_none() {
-            Ok(actual)
-        } else if actual != expected {
-            bail_op_err!("type mismatch: expected {:?}, found {:?}", expected, actual)
+        let actual_ty = match actual {
+            Some(ty) => ty,
+            None => return Ok(expected),
+        };
+        let expected_ty = match expected {
+            Some(ty) => ty,
+            None => return Ok(actual),
+        };
+        if actual_ty != expected_ty {
+            bail_op_err!(
+                "type mismatch: expected {}, found {}",
+                ty_to_str(expected_ty),
+                ty_to_str(actual_ty)
+            )
         } else {
             Ok(actual)
         }
@@ -396,10 +405,10 @@
 
     fn check_shared_memarg_wo_align(
         &self,
-        _: MemoryImmediate,
+        memarg: MemoryImmediate,
         resources: impl WasmModuleResources,
     ) -> OperatorValidatorResult<Type> {
-        self.check_memory_index(0, resources)
+        self.check_memory_index(memarg.memory, resources)
     }
 
     fn check_simd_lane_index(&self, index: SIMDLaneIndex, max: u8) -> OperatorValidatorResult<()> {
@@ -479,10 +488,19 @@
         table_index: u32,
         resources: &impl WasmModuleResources,
     ) -> OperatorValidatorResult<()> {
-        if resources.table_at(table_index).is_none() {
-            return Err(OperatorValidatorError::new(
-                "unknown table: table index out of bounds",
-            ));
+        match resources.table_at(table_index) {
+            None => {
+                return Err(OperatorValidatorError::new(
+                    "unknown table: table index out of bounds",
+                ));
+            }
+            Some(tab) => {
+                if tab.element_type != Type::FuncRef {
+                    return Err(OperatorValidatorError::new(
+                        "indirect calls must go through a table of funcref",
+                    ));
+                }
+            }
         }
         let ty = func_type_at(&resources, index)?;
         self.pop_operand(Some(Type::I32))?;
@@ -646,6 +664,10 @@
                     | ty @ Some(Type::I64)
                     | ty @ Some(Type::F32)
                     | ty @ Some(Type::F64) => self.operands.push(ty),
+                    ty @ Some(Type::V128) => {
+                        self.check_simd_enabled()?;
+                        self.operands.push(ty)
+                    }
                     None => self.operands.push(None),
                     Some(_) => bail_op_err!("type mismatch: select only takes integral types"),
                 }
@@ -1463,6 +1485,7 @@
             | Operator::I32x4MinU
             | Operator::I32x4MaxS
             | Operator::I32x4MaxU
+            | Operator::I32x4DotI16x8S
             | Operator::I64x2Add
             | Operator::I64x2Sub
             | Operator::I64x2Mul
@@ -1584,13 +1607,14 @@
                 self.pop_operand(Some(ty))?;
                 self.push_operand(Type::V128)?;
             }
-            Operator::V128Load32Splat { memarg } => {
+            Operator::V128Load32Splat { memarg } | Operator::V128Load32Zero { memarg } => {
                 self.check_simd_enabled()?;
                 let ty = self.check_memarg(memarg, 2, resources)?;
                 self.pop_operand(Some(ty))?;
                 self.push_operand(Type::V128)?;
             }
             Operator::V128Load64Splat { memarg }
+            | Operator::V128Load64Zero { memarg }
             | Operator::V128Load8x8S { memarg }
             | Operator::V128Load8x8U { memarg }
             | Operator::V128Load16x4S { memarg }
@@ -1817,3 +1841,17 @@
         _ => Either::B(results(ty, resources)?),
     })
 }
+
+fn ty_to_str(ty: Type) -> &'static str {
+    match ty {
+        Type::I32 => "i32",
+        Type::I64 => "i64",
+        Type::F32 => "f32",
+        Type::F64 => "f64",
+        Type::V128 => "v128",
+        Type::FuncRef => "funcref",
+        Type::ExternRef => "externref",
+        Type::Func => "func",
+        Type::EmptyBlockType => "nil",
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/src/primitives.rs firefox-85.0+build1/third_party/rust/wasmparser/src/primitives.rs
--- firefox-84.0.2+build1/third_party/rust/wasmparser/src/primitives.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/src/primitives.rs	2021-01-18 19:58:26.000000000 +0000
@@ -215,6 +215,7 @@
     },
     M64 {
         limits: ResizableLimits64,
+        shared: bool,
     },
 }
 
@@ -735,6 +736,7 @@
     I32x4MinU,
     I32x4MaxS,
     I32x4MaxU,
+    I32x4DotI16x8S,
     I64x2Neg,
     I64x2Shl,
     I64x2ShrS,
@@ -781,7 +783,9 @@
     V128Load8Splat { memarg: MemoryImmediate },
     V128Load16Splat { memarg: MemoryImmediate },
     V128Load32Splat { memarg: MemoryImmediate },
+    V128Load32Zero { memarg: MemoryImmediate },
     V128Load64Splat { memarg: MemoryImmediate },
+    V128Load64Zero { memarg: MemoryImmediate },
     I8x16NarrowI16x8S,
     I8x16NarrowI16x8U,
     I16x8NarrowI32x4S,
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/src/validator/func.rs firefox-85.0+build1/third_party/rust/wasmparser/src/validator/func.rs
--- firefox-84.0.2+build1/third_party/rust/wasmparser/src/validator/func.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/src/validator/func.rs	2021-01-18 19:58:26.000000000 +0000
@@ -36,6 +36,14 @@
         })
     }
 
+    /// Get the current height of the operand stack.
+    ///
+    /// This returns the height of the whole operand stack for this function,
+    /// not just for the current control frame.
+    pub fn operand_stack_height(&self) -> u32 {
+        self.validator.operands.len() as u32
+    }
+
     /// Convenience function to validate an entire function's body.
     ///
     /// You may not end up using this in final implementations because you'll
@@ -105,3 +113,87 @@
         &self.resources
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::WasmFuncType;
+
+    struct EmptyResources;
+
+    impl WasmModuleResources for EmptyResources {
+        type FuncType = EmptyFuncType;
+
+        fn table_at(&self, _at: u32) -> Option<crate::TableType> {
+            todo!()
+        }
+        fn memory_at(&self, _at: u32) -> Option<crate::MemoryType> {
+            todo!()
+        }
+        fn global_at(&self, _at: u32) -> Option<crate::GlobalType> {
+            todo!()
+        }
+        fn func_type_at(&self, _type_idx: u32) -> Option<&Self::FuncType> {
+            Some(&EmptyFuncType)
+        }
+        fn type_of_function(&self, _func_idx: u32) -> Option<&Self::FuncType> {
+            todo!()
+        }
+        fn element_type_at(&self, _at: u32) -> Option<Type> {
+            todo!()
+        }
+        fn element_count(&self) -> u32 {
+            todo!()
+        }
+        fn data_count(&self) -> u32 {
+            todo!()
+        }
+        fn is_function_referenced(&self, _idx: u32) -> bool {
+            todo!()
+        }
+    }
+
+    struct EmptyFuncType;
+
+    impl WasmFuncType for EmptyFuncType {
+        fn len_inputs(&self) -> usize {
+            0
+        }
+        fn len_outputs(&self) -> usize {
+            0
+        }
+        fn input_at(&self, _at: u32) -> Option<Type> {
+            todo!()
+        }
+        fn output_at(&self, _at: u32) -> Option<Type> {
+            todo!()
+        }
+    }
+
+    #[test]
+    fn operand_stack_height() {
+        let mut v = FuncValidator::new(0, 0, &EmptyResources, &Default::default()).unwrap();
+
+        // Initially zero values on the stack.
+        assert_eq!(v.operand_stack_height(), 0);
+
+        // Pushing a constant value makes use have one value on the stack.
+        assert!(v.op(0, &Operator::I32Const { value: 0 }).is_ok());
+        assert_eq!(v.operand_stack_height(), 1);
+
+        // Entering a new control block does not affect the stack height.
+        assert!(v
+            .op(
+                1,
+                &Operator::Block {
+                    ty: crate::TypeOrFuncType::Type(crate::Type::EmptyBlockType)
+                }
+            )
+            .is_ok());
+        assert_eq!(v.operand_stack_height(), 1);
+
+        // Pushing another constant value makes use have two values on the stack.
+        assert!(v.op(2, &Operator::I32Const { value: 99 }).is_ok());
+        assert_eq!(v.operand_stack_height(), 2);
+    }
+}
diff -Nru firefox-84.0.2+build1/third_party/rust/wasmparser/src/validator.rs firefox-85.0+build1/third_party/rust/wasmparser/src/validator.rs
--- firefox-84.0.2+build1/third_party/rust/wasmparser/src/validator.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/wasmparser/src/validator.rs	2021-01-18 19:58:26.000000000 +0000
@@ -676,7 +676,7 @@
                     }
                 }
             }
-            MemoryType::M64 { limits } => {
+            MemoryType::M64 { limits, shared } => {
                 if !self.features.memory64 {
                     return self.create_error("memory64 must be enabled for 64-bit memories");
                 }
@@ -690,6 +690,14 @@
                         return self.create_error("memory initial size too large");
                     }
                 }
+                if *shared {
+                    if !self.features.threads {
+                        return self.create_error("threads must be enabled for shared memories");
+                    }
+                    if limits.maximum.is_none() {
+                        return self.create_error("shared memory must have maximum size");
+                    }
+                }
             }
         }
         Ok(())
@@ -1033,8 +1041,17 @@
                             return Ok(());
                         }
                     }
-                    (MemoryType::M64 { limits: a }, MemoryType::M64 { limits: b }) => {
-                        if limits_match!(a, b) {
+                    (
+                        MemoryType::M64 {
+                            limits: a,
+                            shared: ash,
+                        },
+                        MemoryType::M64 {
+                            limits: b,
+                            shared: bsh,
+                        },
+                    ) => {
+                        if limits_match!(a, b) && ash == bsh {
                             return Ok(());
                         }
                     }
diff -Nru firefox-84.0.2+build1/third_party/rust/which/appveyor.yml firefox-85.0+build1/third_party/rust/which/appveyor.yml
--- firefox-84.0.2+build1/third_party/rust/which/appveyor.yml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-os: Visual Studio 2015
-
-environment:
-  matrix:
-  - channel: stable
-    target: x86_64-pc-windows-msvc
-  - channel: stable
-    target: i686-pc-windows-msvc
-  - channel: stable
-    target: x86_64-pc-windows-gnu
-  - channel: stable
-    target: i686-pc-windows-gnu
-install:
-  # Set PATH for MinGW toolset
-  - if %target% == x86_64-pc-windows-gnu set PATH=%PATH%;C:\msys64\mingw64\bin
-  - if %target% == i686-pc-windows-gnu set PATH=%PATH%;C:\msys64\mingw32\bin
-
-  # Install Rust toolset
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init -yv --default-toolchain %channel% --default-host %target%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
-  - rustc -vV
-  - cargo -vV
-
-build: false
-
-test_script:
-  - cargo test
-  - cargo test --no-default-features
diff -Nru firefox-84.0.2+build1/third_party/rust/which/.cargo-checksum.json firefox-85.0+build1/third_party/rust/which/.cargo-checksum.json
--- firefox-84.0.2+build1/third_party/rust/which/.cargo-checksum.json	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/.cargo-checksum.json	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"9be96b396b493821236993d76ff6eb2cbce0656755c1f5f060760fc096c33abc","LICENSE.txt":"0041560f5d419c30e1594567f3b7ac2bc078ff6a68f437e0348ba85d9cf99112","README.md":"c2a28e930966fd95eda4241ef8eb91a5a8cd8ba1cece67da736b13978503e3e9","appveyor.yml":"833f1ff9263272ab1e51bd8297c9c3fe7a3f104b89c95f5740b186e0b8274210","src/checker.rs":"1bb01f5f143d848f16ba136f44f4f671220120cfb8fb8e14fc69b38e161b82e5","src/error.rs":"e2a05f24be87abc908753f91b3d37dff4fc4a232e9c5bee3dfd33112ea21cc97","src/finder.rs":"7d1460473c3217f788b2a62ab2f5359af78cca6c5f5106b5c6a936b1c7cbd331","src/helper.rs":"1ea08b0c4675ac46ee71ef2225bdef8a6d055a9644d5d42ba94f0c8e9d2d3279","src/lib.rs":"3a305ed0359918dc4b1fac385b5a670cb0629c61707edce2db66e17db3edbd4c","tests/basic.rs":"a0c49fa4348761b24598916dfcaba7064fd838278c1f428101e587931fc1b20a"},"package":"d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"}
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/third_party/rust/which/Cargo.toml firefox-85.0+build1/third_party/rust/which/Cargo.toml
--- firefox-84.0.2+build1/third_party/rust/which/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/Cargo.toml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "which"
-version = "3.1.1"
-authors = ["Harry Fei <tiziyuanfang@gmail.com>"]
-description = "A Rust equivalent of Unix command \"which\". Locate installed executable in cross platforms."
-documentation = "https://docs.rs/which/"
-readme = "README.md"
-keywords = ["which", "which-rs", "unix", "command"]
-categories = ["os", "filesystem"]
-license = "MIT"
-repository = "https://github.com/harryfei/which-rs.git"
-[dependencies.failure]
-version = "0.1.7"
-features = ["std"]
-optional = true
-default-features = false
-
-[dependencies.libc]
-version = "0.2.65"
-[dev-dependencies.tempdir]
-version = "0.3.7"
-
-[features]
-default = ["failure"]
diff -Nru firefox-84.0.2+build1/third_party/rust/which/LICENSE.txt firefox-85.0+build1/third_party/rust/which/LICENSE.txt
--- firefox-84.0.2+build1/third_party/rust/which/LICENSE.txt	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/LICENSE.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Copyright (c) 2015 fangyuanziti
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff -Nru firefox-84.0.2+build1/third_party/rust/which/README.md firefox-85.0+build1/third_party/rust/which/README.md
--- firefox-84.0.2+build1/third_party/rust/which/README.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/README.md	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-[![Travis Build Status](https://travis-ci.org/harryfei/which-rs.svg?branch=master)](https://travis-ci.org/harryfei/which-rs)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/1y40b135iaixs9x6?svg=true)](https://ci.appveyor.com/project/HarryFei/which-rs)
-
-# which
-
-A Rust equivalent of Unix command "which". Locate installed executable in cross platforms.
-
-## Support platforms
-
-* Linux
-* Windows
-* macOS
-
-## Example
-
-To find which rustc exectable binary is using.
-
-``` rust
-use which::which;
-
-let result = which::which("rustc").unwrap();
-assert_eq!(result, PathBuf::from("/usr/bin/rustc"));
-```
-
-## Errors
-
-By default this crate exposes a [`failure`] based error. This is optional, disable the default
-features to get an error type implementing the standard library `Error` trait.
-
-[`failure`]: https://crates.io/crates/failure
-
-## Documentation
-
-The documentation is [available online](https://docs.rs/which/).
diff -Nru firefox-84.0.2+build1/third_party/rust/which/src/checker.rs firefox-85.0+build1/third_party/rust/which/src/checker.rs
--- firefox-84.0.2+build1/third_party/rust/which/src/checker.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/src/checker.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-use finder::Checker;
-#[cfg(unix)]
-use libc;
-#[cfg(unix)]
-use std::ffi::CString;
-use std::fs;
-#[cfg(unix)]
-use std::os::unix::ffi::OsStrExt;
-use std::path::Path;
-
-pub struct ExecutableChecker;
-
-impl ExecutableChecker {
-    pub fn new() -> ExecutableChecker {
-        ExecutableChecker
-    }
-}
-
-impl Checker for ExecutableChecker {
-    #[cfg(unix)]
-    fn is_valid(&self, path: &Path) -> bool {
-        CString::new(path.as_os_str().as_bytes())
-            .and_then(|c| Ok(unsafe { libc::access(c.as_ptr(), libc::X_OK) == 0 }))
-            .unwrap_or(false)
-    }
-
-    #[cfg(windows)]
-    fn is_valid(&self, _path: &Path) -> bool {
-        true
-    }
-}
-
-pub struct ExistedChecker;
-
-impl ExistedChecker {
-    pub fn new() -> ExistedChecker {
-        ExistedChecker
-    }
-}
-
-impl Checker for ExistedChecker {
-    fn is_valid(&self, path: &Path) -> bool {
-        fs::metadata(path)
-            .map(|metadata| metadata.is_file())
-            .unwrap_or(false)
-    }
-}
-
-pub struct CompositeChecker {
-    checkers: Vec<Box<dyn Checker>>,
-}
-
-impl CompositeChecker {
-    pub fn new() -> CompositeChecker {
-        CompositeChecker {
-            checkers: Vec::new(),
-        }
-    }
-
-    pub fn add_checker(mut self, checker: Box<dyn Checker>) -> CompositeChecker {
-        self.checkers.push(checker);
-        self
-    }
-}
-
-impl Checker for CompositeChecker {
-    fn is_valid(&self, path: &Path) -> bool {
-        self.checkers.iter().all(|checker| checker.is_valid(path))
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/which/src/error.rs firefox-85.0+build1/third_party/rust/which/src/error.rs
--- firefox-84.0.2+build1/third_party/rust/which/src/error.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/src/error.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-#[cfg(feature = "failure")]
-use failure::{Backtrace, Context, Fail};
-use std;
-use std::fmt::{self, Display};
-
-#[derive(Debug)]
-pub struct Error {
-    #[cfg(feature = "failure")]
-    inner: Context<ErrorKind>,
-    #[cfg(not(feature = "failure"))]
-    inner: ErrorKind,
-}
-
-// To suppress false positives from cargo-clippy
-#[cfg_attr(feature = "cargo-clippy", allow(empty_line_after_outer_attr))]
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub enum ErrorKind {
-    BadAbsolutePath,
-    BadRelativePath,
-    CannotFindBinaryPath,
-    CannotGetCurrentDir,
-    CannotCanonicalize,
-}
-
-#[cfg(feature = "failure")]
-impl Fail for ErrorKind {}
-
-impl Display for ErrorKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let display = match *self {
-            ErrorKind::BadAbsolutePath => "Bad absolute path",
-            ErrorKind::BadRelativePath => "Bad relative path",
-            ErrorKind::CannotFindBinaryPath => "Cannot find binary path",
-            ErrorKind::CannotGetCurrentDir => "Cannot get current directory",
-            ErrorKind::CannotCanonicalize => "Cannot canonicalize path",
-        };
-        f.write_str(display)
-    }
-}
-
-#[cfg(feature = "failure")]
-impl Fail for Error {
-    fn cause(&self) -> Option<&dyn Fail> {
-        self.inner.cause()
-    }
-
-    fn backtrace(&self) -> Option<&Backtrace> {
-        self.inner.backtrace()
-    }
-}
-
-#[cfg(not(feature = "failure"))]
-impl std::error::Error for Error {}
-
-impl Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        Display::fmt(&self.inner, f)
-    }
-}
-
-impl Error {
-    pub fn kind(&self) -> ErrorKind {
-        #[cfg(feature = "failure")]
-        {
-            *self.inner.get_context()
-        }
-        #[cfg(not(feature = "failure"))]
-        {
-            self.inner
-        }
-    }
-}
-
-impl From<ErrorKind> for Error {
-    fn from(kind: ErrorKind) -> Error {
-        Error {
-            #[cfg(feature = "failure")]
-            inner: Context::new(kind),
-            #[cfg(not(feature = "failure"))]
-            inner: kind,
-        }
-    }
-}
-
-#[cfg(feature = "failure")]
-impl From<Context<ErrorKind>> for Error {
-    fn from(inner: Context<ErrorKind>) -> Error {
-        Error { inner }
-    }
-}
-
-pub type Result<T> = std::result::Result<T, Error>;
diff -Nru firefox-84.0.2+build1/third_party/rust/which/src/finder.rs firefox-85.0+build1/third_party/rust/which/src/finder.rs
--- firefox-84.0.2+build1/third_party/rust/which/src/finder.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/src/finder.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-use error::*;
-#[cfg(windows)]
-use helper::has_executable_extension;
-use std::env;
-use std::ffi::OsStr;
-#[cfg(windows)]
-use std::ffi::OsString;
-use std::iter;
-use std::path::{Path, PathBuf};
-
-pub trait Checker {
-    fn is_valid(&self, path: &Path) -> bool;
-}
-
-trait PathExt {
-    fn has_separator(&self) -> bool;
-
-    fn to_absolute<P>(self, cwd: P) -> PathBuf
-    where
-        P: AsRef<Path>;
-}
-
-impl PathExt for PathBuf {
-    fn has_separator(&self) -> bool {
-        self.components().count() > 1
-    }
-
-    fn to_absolute<P>(self, cwd: P) -> PathBuf
-    where
-        P: AsRef<Path>,
-    {
-        if self.is_absolute() {
-            self
-        } else {
-            let mut new_path = PathBuf::from(cwd.as_ref());
-            new_path.push(self);
-            new_path
-        }
-    }
-}
-
-pub struct Finder;
-
-impl Finder {
-    pub fn new() -> Finder {
-        Finder
-    }
-
-    pub fn find<T, U, V>(
-        &self,
-        binary_name: T,
-        paths: Option<U>,
-        cwd: V,
-        binary_checker: &dyn Checker,
-    ) -> Result<PathBuf>
-    where
-        T: AsRef<OsStr>,
-        U: AsRef<OsStr>,
-        V: AsRef<Path>,
-    {
-        let path = PathBuf::from(&binary_name);
-
-        let binary_path_candidates: Box<dyn Iterator<Item = _>> = if path.has_separator() {
-            // Search binary in cwd if the path have a path separator.
-            let candidates = Self::cwd_search_candidates(path, cwd).into_iter();
-            Box::new(candidates)
-        } else {
-            // Search binary in PATHs(defined in environment variable).
-            let p = paths.ok_or(ErrorKind::CannotFindBinaryPath)?;
-            let paths: Vec<_> = env::split_paths(&p).collect();
-
-            let candidates = Self::path_search_candidates(path, paths).into_iter();
-
-            Box::new(candidates)
-        };
-
-        for p in binary_path_candidates {
-            // find a valid binary
-            if binary_checker.is_valid(&p) {
-                return Ok(p);
-            }
-        }
-
-        // can't find any binary
-        return Err(ErrorKind::CannotFindBinaryPath.into());
-    }
-
-    fn cwd_search_candidates<C>(binary_name: PathBuf, cwd: C) -> impl IntoIterator<Item = PathBuf>
-    where
-        C: AsRef<Path>,
-    {
-        let path = binary_name.to_absolute(cwd);
-
-        Self::append_extension(iter::once(path))
-    }
-
-    fn path_search_candidates<P>(
-        binary_name: PathBuf,
-        paths: P,
-    ) -> impl IntoIterator<Item = PathBuf>
-    where
-        P: IntoIterator<Item = PathBuf>,
-    {
-        let new_paths = paths.into_iter().map(move |p| p.join(binary_name.clone()));
-
-        Self::append_extension(new_paths)
-    }
-
-    #[cfg(unix)]
-    fn append_extension<P>(paths: P) -> impl IntoIterator<Item = PathBuf>
-    where
-        P: IntoIterator<Item = PathBuf>,
-    {
-        paths
-    }
-
-    #[cfg(windows)]
-    fn append_extension<P>(paths: P) -> impl IntoIterator<Item = PathBuf>
-    where
-        P: IntoIterator<Item = PathBuf>,
-    {
-        // Read PATHEXT env variable and split it into vector of String
-        let path_exts =
-            env::var_os("PATHEXT").unwrap_or(OsString::from(env::consts::EXE_EXTENSION));
-
-        let exe_extension_vec = env::split_paths(&path_exts)
-            .filter_map(|e| e.to_str().map(|e| e.to_owned()))
-            .collect::<Vec<_>>();
-
-        paths
-            .into_iter()
-            .flat_map(move |p| -> Box<dyn Iterator<Item = _>> {
-                // Check if path already have executable extension
-                if has_executable_extension(&p, &exe_extension_vec) {
-                    Box::new(iter::once(p))
-                } else {
-                    // Appended paths with windows executable extensions.
-                    // e.g. path `c:/windows/bin` will expend to:
-                    // c:/windows/bin.COM
-                    // c:/windows/bin.EXE
-                    // c:/windows/bin.CMD
-                    // ...
-                    let ps = exe_extension_vec.clone().into_iter().map(move |e| {
-                        // Append the extension.
-                        let mut p = p.clone().to_path_buf().into_os_string();
-                        p.push(e);
-
-                        PathBuf::from(p)
-                    });
-
-                    Box::new(ps)
-                }
-            })
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/which/src/helper.rs firefox-85.0+build1/third_party/rust/which/src/helper.rs
--- firefox-84.0.2+build1/third_party/rust/which/src/helper.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/src/helper.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-use std::path::Path;
-
-/// Check if given path has extension which in the given vector.
-pub fn has_executable_extension<T: AsRef<Path>, S: AsRef<str>>(path: T, exts_vec: &Vec<S>) -> bool {
-    let ext = path.as_ref().extension().and_then(|e| e.to_str());
-    match ext {
-        Some(ext) => exts_vec
-            .iter()
-            .any(|e| ext.eq_ignore_ascii_case(&e.as_ref()[1..])),
-        _ => false,
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use std::path::PathBuf;
-
-    #[test]
-    fn test_extension_in_extension_vector() {
-        // Case insensitive
-        assert!(has_executable_extension(
-            PathBuf::from("foo.exe"),
-            &vec![".COM", ".EXE", ".CMD"]
-        ));
-
-        assert!(has_executable_extension(
-            PathBuf::from("foo.CMD"),
-            &vec![".COM", ".EXE", ".CMD"]
-        ));
-    }
-
-    #[test]
-    fn test_extension_not_in_extension_vector() {
-        assert!(!has_executable_extension(
-            PathBuf::from("foo.bar"),
-            &vec![".COM", ".EXE", ".CMD"]
-        ));
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/which/src/lib.rs firefox-85.0+build1/third_party/rust/which/src/lib.rs
--- firefox-84.0.2+build1/third_party/rust/which/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/src/lib.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,271 +0,0 @@
-//! which
-//!
-//! A Rust equivalent of Unix command `which(1)`.
-//! # Example:
-//!
-//! To find which rustc executable binary is using:
-//!
-//! ``` norun
-//! use which::which;
-//!
-//! let result = which::which("rustc").unwrap();
-//! assert_eq!(result, PathBuf::from("/usr/bin/rustc"));
-//!
-//! ```
-
-#[cfg(feature = "failure")]
-extern crate failure;
-extern crate libc;
-
-#[cfg(feature = "failure")]
-use failure::ResultExt;
-mod checker;
-mod error;
-mod finder;
-#[cfg(windows)]
-mod helper;
-
-use std::env;
-use std::fmt;
-use std::path;
-
-use std::ffi::OsStr;
-
-use checker::CompositeChecker;
-use checker::ExecutableChecker;
-use checker::ExistedChecker;
-pub use error::*;
-use finder::Finder;
-
-/// Find a exectable binary's path by name.
-///
-/// If given an absolute path, returns it if the file exists and is executable.
-///
-/// If given a relative path, returns an absolute path to the file if
-/// it exists and is executable.
-///
-/// If given a string without path separators, looks for a file named
-/// `binary_name` at each directory in `$PATH` and if it finds an executable
-/// file there, returns it.
-///
-/// # Example
-///
-/// ``` norun
-/// use which::which;
-/// use std::path::PathBuf;
-///
-/// let result = which::which("rustc").unwrap();
-/// assert_eq!(result, PathBuf::from("/usr/bin/rustc"));
-///
-/// ```
-pub fn which<T: AsRef<OsStr>>(binary_name: T) -> Result<path::PathBuf> {
-    #[cfg(feature = "failure")]
-    let cwd = env::current_dir().context(ErrorKind::CannotGetCurrentDir)?;
-    #[cfg(not(feature = "failure"))]
-    let cwd = env::current_dir().map_err(|_| ErrorKind::CannotGetCurrentDir)?;
-
-    which_in(binary_name, env::var_os("PATH"), &cwd)
-}
-
-/// Find `binary_name` in the path list `paths`, using `cwd` to resolve relative paths.
-pub fn which_in<T, U, V>(binary_name: T, paths: Option<U>, cwd: V) -> Result<path::PathBuf>
-where
-    T: AsRef<OsStr>,
-    U: AsRef<OsStr>,
-    V: AsRef<path::Path>,
-{
-    let binary_checker = CompositeChecker::new()
-        .add_checker(Box::new(ExistedChecker::new()))
-        .add_checker(Box::new(ExecutableChecker::new()));
-
-    let finder = Finder::new();
-
-    finder.find(binary_name, paths, cwd, &binary_checker)
-}
-
-/// An owned, immutable wrapper around a `PathBuf` containing the path of an executable.
-///
-/// The constructed `PathBuf` is the output of `which` or `which_in`, but `which::Path` has the
-/// advantage of being a type distinct from `std::path::Path` and `std::path::PathBuf`.
-///
-/// It can be beneficial to use `which::Path` instead of `std::path::Path` when you want the type
-/// system to enforce the need for a path that exists and points to a binary that is executable.
-///
-/// Since `which::Path` implements `Deref` for `std::path::Path`, all methods on `&std::path::Path`
-/// are also available to `&which::Path` values.
-#[derive(Clone, PartialEq)]
-pub struct Path {
-    inner: path::PathBuf,
-}
-
-impl Path {
-    /// Returns the path of an executable binary by name.
-    ///
-    /// This calls `which` and maps the result into a `Path`.
-    pub fn new<T: AsRef<OsStr>>(binary_name: T) -> Result<Path> {
-        which(binary_name).map(|inner| Path { inner })
-    }
-
-    /// Returns the path of an executable binary by name in the path list `paths` and using the
-    /// current working directory `cwd` to resolve relative paths.
-    ///
-    /// This calls `which_in` and maps the result into a `Path`.
-    pub fn new_in<T, U, V>(binary_name: T, paths: Option<U>, cwd: V) -> Result<Path>
-    where
-        T: AsRef<OsStr>,
-        U: AsRef<OsStr>,
-        V: AsRef<path::Path>,
-    {
-        which_in(binary_name, paths, cwd).map(|inner| Path { inner })
-    }
-
-    /// Returns a reference to a `std::path::Path`.
-    pub fn as_path(&self) -> &path::Path {
-        self.inner.as_path()
-    }
-
-    /// Consumes the `which::Path`, yielding its underlying `std::path::PathBuf`.
-    pub fn into_path_buf(self) -> path::PathBuf {
-        self.inner
-    }
-}
-
-impl fmt::Debug for Path {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.inner, f)
-    }
-}
-
-impl std::ops::Deref for Path {
-    type Target = path::Path;
-
-    fn deref(&self) -> &path::Path {
-        self.inner.deref()
-    }
-}
-
-impl AsRef<path::Path> for Path {
-    fn as_ref(&self) -> &path::Path {
-        self.as_path()
-    }
-}
-
-impl AsRef<OsStr> for Path {
-    fn as_ref(&self) -> &OsStr {
-        self.as_os_str()
-    }
-}
-
-impl Eq for Path {}
-
-impl PartialEq<path::PathBuf> for Path {
-    fn eq(&self, other: &path::PathBuf) -> bool {
-        self.inner == *other
-    }
-}
-
-impl PartialEq<Path> for path::PathBuf {
-    fn eq(&self, other: &Path) -> bool {
-        *self == other.inner
-    }
-}
-
-/// An owned, immutable wrapper around a `PathBuf` containing the _canonical_ path of an
-/// executable.
-///
-/// The constructed `PathBuf` is the result of `which` or `which_in` followed by
-/// `Path::canonicalize`, but `CanonicalPath` has the advantage of being a type distinct from
-/// `std::path::Path` and `std::path::PathBuf`.
-///
-/// It can be beneficial to use `CanonicalPath` instead of `std::path::Path` when you want the type
-/// system to enforce the need for a path that exists, points to a binary that is executable, is
-/// absolute, has all components normalized, and has all symbolic links resolved
-///
-/// Since `CanonicalPath` implements `Deref` for `std::path::Path`, all methods on
-/// `&std::path::Path` are also available to `&CanonicalPath` values.
-#[derive(Clone, PartialEq)]
-pub struct CanonicalPath {
-    inner: path::PathBuf,
-}
-
-impl CanonicalPath {
-    /// Returns the canonical path of an executable binary by name.
-    ///
-    /// This calls `which` and `Path::canonicalize` and maps the result into a `CanonicalPath`.
-    pub fn new<T: AsRef<OsStr>>(binary_name: T) -> Result<CanonicalPath> {
-        which(binary_name)
-            .and_then(|p| {
-                p.canonicalize()
-                    .map_err(|_| ErrorKind::CannotCanonicalize.into())
-            })
-            .map(|inner| CanonicalPath { inner })
-    }
-
-    /// Returns the canonical path of an executable binary by name in the path list `paths` and
-    /// using the current working directory `cwd` to resolve relative paths.
-    ///
-    /// This calls `which` and `Path::canonicalize` and maps the result into a `CanonicalPath`.
-    pub fn new_in<T, U, V>(binary_name: T, paths: Option<U>, cwd: V) -> Result<CanonicalPath>
-    where
-        T: AsRef<OsStr>,
-        U: AsRef<OsStr>,
-        V: AsRef<path::Path>,
-    {
-        which_in(binary_name, paths, cwd)
-            .and_then(|p| {
-                p.canonicalize()
-                    .map_err(|_| ErrorKind::CannotCanonicalize.into())
-            })
-            .map(|inner| CanonicalPath { inner })
-    }
-
-    /// Returns a reference to a `std::path::Path`.
-    pub fn as_path(&self) -> &path::Path {
-        self.inner.as_path()
-    }
-
-    /// Consumes the `which::CanonicalPath`, yielding its underlying `std::path::PathBuf`.
-    pub fn into_path_buf(self) -> path::PathBuf {
-        self.inner
-    }
-}
-
-impl fmt::Debug for CanonicalPath {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Debug::fmt(&self.inner, f)
-    }
-}
-
-impl std::ops::Deref for CanonicalPath {
-    type Target = path::Path;
-
-    fn deref(&self) -> &path::Path {
-        self.inner.deref()
-    }
-}
-
-impl AsRef<path::Path> for CanonicalPath {
-    fn as_ref(&self) -> &path::Path {
-        self.as_path()
-    }
-}
-
-impl AsRef<OsStr> for CanonicalPath {
-    fn as_ref(&self) -> &OsStr {
-        self.as_os_str()
-    }
-}
-
-impl Eq for CanonicalPath {}
-
-impl PartialEq<path::PathBuf> for CanonicalPath {
-    fn eq(&self, other: &path::PathBuf) -> bool {
-        self.inner == *other
-    }
-}
-
-impl PartialEq<CanonicalPath> for path::PathBuf {
-    fn eq(&self, other: &CanonicalPath) -> bool {
-        *self == other.inner
-    }
-}
diff -Nru firefox-84.0.2+build1/third_party/rust/which/tests/basic.rs firefox-85.0+build1/third_party/rust/which/tests/basic.rs
--- firefox-84.0.2+build1/third_party/rust/which/tests/basic.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/third_party/rust/which/tests/basic.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,307 +0,0 @@
-extern crate tempdir;
-extern crate which;
-
-use std::env;
-use std::ffi::{OsStr, OsString};
-use std::fs;
-use std::io;
-use std::path::{Path, PathBuf};
-use tempdir::TempDir;
-
-struct TestFixture {
-    /// Temp directory.
-    pub tempdir: TempDir,
-    /// $PATH
-    pub paths: OsString,
-    /// Binaries created in $PATH
-    pub bins: Vec<PathBuf>,
-}
-
-const SUBDIRS: &'static [&'static str] = &["a", "b", "c"];
-const BIN_NAME: &'static str = "bin";
-
-#[cfg(unix)]
-fn mk_bin(dir: &Path, path: &str, extension: &str) -> io::Result<PathBuf> {
-    use std::os::unix::fs::OpenOptionsExt;
-    let bin = dir.join(path).with_extension(extension);
-    fs::OpenOptions::new()
-        .write(true)
-        .create(true)
-        .mode(0o666 | (libc::S_IXUSR as u32))
-        .open(&bin)
-        .and_then(|_f| bin.canonicalize())
-}
-
-fn touch(dir: &Path, path: &str, extension: &str) -> io::Result<PathBuf> {
-    let b = dir.join(path).with_extension(extension);
-    fs::File::create(&b).and_then(|_f| b.canonicalize())
-}
-
-#[cfg(windows)]
-fn mk_bin(dir: &Path, path: &str, extension: &str) -> io::Result<PathBuf> {
-    touch(dir, path, extension)
-}
-
-impl TestFixture {
-    // tmp/a/bin
-    // tmp/a/bin.exe
-    // tmp/a/bin.cmd
-    // tmp/b/bin
-    // tmp/b/bin.exe
-    // tmp/b/bin.cmd
-    // tmp/c/bin
-    // tmp/c/bin.exe
-    // tmp/c/bin.cmd
-    pub fn new() -> TestFixture {
-        let tempdir = TempDir::new("which_tests").unwrap();
-        let mut builder = fs::DirBuilder::new();
-        builder.recursive(true);
-        let mut paths = vec![];
-        let mut bins = vec![];
-        for d in SUBDIRS.iter() {
-            let p = tempdir.path().join(d);
-            builder.create(&p).unwrap();
-            bins.push(mk_bin(&p, &BIN_NAME, "").unwrap());
-            bins.push(mk_bin(&p, &BIN_NAME, "exe").unwrap());
-            bins.push(mk_bin(&p, &BIN_NAME, "cmd").unwrap());
-            paths.push(p);
-        }
-        TestFixture {
-            tempdir: tempdir,
-            paths: env::join_paths(paths).unwrap(),
-            bins: bins,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn touch(&self, path: &str, extension: &str) -> io::Result<PathBuf> {
-        touch(self.tempdir.path(), &path, &extension)
-    }
-
-    pub fn mk_bin(&self, path: &str, extension: &str) -> io::Result<PathBuf> {
-        mk_bin(self.tempdir.path(), &path, &extension)
-    }
-}
-
-fn _which<T: AsRef<OsStr>>(f: &TestFixture, path: T) -> which::Result<which::CanonicalPath> {
-    which::CanonicalPath::new_in(path, Some(f.paths.clone()), f.tempdir.path())
-}
-
-#[test]
-#[cfg(unix)]
-fn it_works() {
-    use std::process::Command;
-    let result = which::Path::new("rustc");
-    assert!(result.is_ok());
-
-    let which_result = Command::new("which").arg("rustc").output();
-
-    assert_eq!(
-        String::from(result.unwrap().to_str().unwrap()),
-        String::from_utf8(which_result.unwrap().stdout)
-            .unwrap()
-            .trim()
-    );
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which() {
-    let f = TestFixture::new();
-    assert_eq!(_which(&f, &BIN_NAME).unwrap(), f.bins[0])
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which() {
-    let f = TestFixture::new();
-    assert_eq!(_which(&f, &BIN_NAME).unwrap(), f.bins[1])
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_extension() {
-    let f = TestFixture::new();
-    let b = Path::new(&BIN_NAME).with_extension("");
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[0])
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_extension() {
-    let f = TestFixture::new();
-    let b = Path::new(&BIN_NAME).with_extension("cmd");
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[2])
-}
-
-#[test]
-fn test_which_not_found() {
-    let f = TestFixture::new();
-    assert!(_which(&f, "a").is_err());
-}
-
-#[test]
-fn test_which_second() {
-    let f = TestFixture::new();
-    let b = f.mk_bin("b/another", env::consts::EXE_EXTENSION).unwrap();
-    assert_eq!(_which(&f, "another").unwrap(), b);
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_absolute() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, &f.bins[3]).unwrap(),
-        f.bins[3].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_absolute() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, &f.bins[4]).unwrap(),
-        f.bins[4].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_absolute_path_case() {
-    // Test that an absolute path with an uppercase extension
-    // is accepted.
-    let f = TestFixture::new();
-    let p = &f.bins[4];
-    assert_eq!(_which(&f, &p).unwrap(), f.bins[4].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_absolute_extension() {
-    let f = TestFixture::new();
-    // Don't append EXE_EXTENSION here.
-    let b = f.bins[3].parent().unwrap().join(&BIN_NAME);
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[3].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_absolute_extension() {
-    let f = TestFixture::new();
-    // Don't append EXE_EXTENSION here.
-    let b = f.bins[4].parent().unwrap().join(&BIN_NAME);
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[4].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_relative() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, "b/bin").unwrap(),
-        f.bins[3].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_relative() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, "b/bin").unwrap(),
-        f.bins[4].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_relative_extension() {
-    // test_which_relative tests a relative path without an extension,
-    // so test a relative path with an extension here.
-    let f = TestFixture::new();
-    let b = Path::new("b/bin").with_extension(env::consts::EXE_EXTENSION);
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[3].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_relative_extension() {
-    // test_which_relative tests a relative path without an extension,
-    // so test a relative path with an extension here.
-    let f = TestFixture::new();
-    let b = Path::new("b/bin").with_extension("cmd");
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[5].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_relative_extension_case() {
-    // Test that a relative path with an uppercase extension
-    // is accepted.
-    let f = TestFixture::new();
-    let b = Path::new("b/bin").with_extension("EXE");
-    assert_eq!(_which(&f, &b).unwrap(), f.bins[4].canonicalize().unwrap());
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_relative_leading_dot() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, "./b/bin").unwrap(),
-        f.bins[3].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(windows)]
-fn test_which_relative_leading_dot() {
-    let f = TestFixture::new();
-    assert_eq!(
-        _which(&f, "./b/bin").unwrap(),
-        f.bins[4].canonicalize().unwrap()
-    );
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_non_executable() {
-    // Shouldn't return non-executable files.
-    let f = TestFixture::new();
-    f.touch("b/another", "").unwrap();
-    assert!(_which(&f, "another").is_err());
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_absolute_non_executable() {
-    // Shouldn't return non-executable files, even if given an absolute path.
-    let f = TestFixture::new();
-    let b = f.touch("b/another", "").unwrap();
-    assert!(_which(&f, &b).is_err());
-}
-
-#[test]
-#[cfg(unix)]
-fn test_which_relative_non_executable() {
-    // Shouldn't return non-executable files.
-    let f = TestFixture::new();
-    f.touch("b/another", "").unwrap();
-    assert!(_which(&f, "b/another").is_err());
-}
-
-#[test]
-#[cfg(feature = "failure")]
-fn test_failure() {
-    let f = TestFixture::new();
-
-    let run = || -> std::result::Result<PathBuf, failure::Error> {
-        // Test the conversion to failure
-        let p = _which(&f, "./b/bin")?;
-        Ok(p.into_path_buf())
-    };
-
-    let _ = run();
-}
diff -Nru firefox-84.0.2+build1/third_party/sipcc/sdp_attr.c firefox-85.0+build1/third_party/sipcc/sdp_attr.c
--- firefox-84.0.2+build1/third_party/sipcc/sdp_attr.c	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/third_party/sipcc/sdp_attr.c	2021-01-18 19:58:26.000000000 +0000
@@ -2856,7 +2856,7 @@
     sdp_mca_t    *cap_p;
     sdp_attr_t   *cap_attr_p = NULL;
     sdp_attr_t   *prev_attr_p;
-    char          tmp[SDP_MAX_STRING_LEN];
+    char          tmp[SDP_MAX_STRING_LEN] = {0};
 
     /* Make sure we've processed a valid X-cap/cdsc attr prior to this and
      * if so, get the cap pointer. */
@@ -2913,8 +2913,8 @@
 
     if ((result != SDP_SUCCESS) || (tmp[0] != 'a') || (tmp[1] != '\0')) {
         sdp_parse_error(sdp_p,
-            "%s Warning: Invalid token type (%s) in %s "
-            "attribute, unable to parse", sdp_p->debug_str, tmp,
+            "%s Warning: Invalid token type in %s "
+            "attribute, unable to parse", sdp_p->debug_str,
             sdp_get_attr_name(attr_p->type));
         sdp_p->conf_p->num_invalid_param++;
         return (SDP_INVALID_PARAMETER);
diff -Nru firefox-84.0.2+build1/third_party/WinToast/moz-check-system-shortcut.patch firefox-85.0+build1/third_party/WinToast/moz-check-system-shortcut.patch
--- firefox-84.0.2+build1/third_party/WinToast/moz-check-system-shortcut.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/WinToast/moz-check-system-shortcut.patch	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,81 @@
+diff --git a/src/wintoastlib.cpp b/src/wintoastlib.cpp
+index 0895ff7..ac8d5cf 100644
+--- a/src/wintoastlib.cpp
++++ b/src/wintoastlib.cpp
+@@ -213,8 +213,8 @@ namespace Util {
+     }
+ 
+ 
+-    inline HRESULT defaultShellLinksDirectory(_In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
+-        DWORD written = GetEnvironmentVariableW(L"APPDATA", path, nSize);
++    inline HRESULT commonShellLinksDirectory(_In_ const WCHAR* baseEnv, _In_ WCHAR* path, _In_ DWORD nSize) {
++        DWORD written = GetEnvironmentVariableW(baseEnv, path, nSize);
+         HRESULT hr = written > 0 ? S_OK : E_INVALIDARG;
+         if (SUCCEEDED(hr)) {
+             errno_t result = wcscat_s(path, nSize, DEFAULT_SHELL_LINKS_PATH);
+@@ -224,8 +224,8 @@ namespace Util {
+         return hr;
+     }
+ 
+-    inline HRESULT defaultShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
+-        HRESULT hr = defaultShellLinksDirectory(path, nSize);
++    inline HRESULT commonShellLinkPath(_In_ const WCHAR* baseEnv, const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize) {
++        HRESULT hr = commonShellLinksDirectory(baseEnv, path, nSize);
+         if (SUCCEEDED(hr)) {
+             const std::wstring appLink(appname + DEFAULT_LINK_FORMAT);
+             errno_t result = wcscat_s(path, nSize, appLink.c_str());
+@@ -235,6 +235,13 @@ namespace Util {
+         return hr;
+     }
+ 
++    inline HRESULT defaultUserShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
++      return commonShellLinkPath(L"APPDATA", appname, path, nSize);
++    }
++
++    inline HRESULT defaultSystemShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
++      return commonShellLinkPath(L"PROGRAMDATA", appname, path, nSize);
++    }
+ 
+     inline PCWSTR AsString(ComPtr<IXmlDocument> &xmlDocument) {
+         HSTRING xml;
+@@ -523,12 +530,19 @@ const std::wstring& WinToast::appUserModelId() const {
+ 
+ HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
+ 	WCHAR	path[MAX_PATH] = { L'\0' };
+-    Util::defaultShellLinkPath(_appName, path);
++    Util::defaultUserShellLinkPath(_appName, path);
+     // Check if the file exist
+     DWORD attr = GetFileAttributesW(path);
+     if (attr >= 0xFFFFFFF) {
+-        DEBUG_MSG("Error, shell link not found. Try to create a new one in: " << path);
+-        return E_FAIL;
++        // The shortcut may be in the system Start Menu.
++        WCHAR   systemPath[MAX_PATH] = { L'\0' };
++        Util::defaultSystemShellLinkPath(_appName, systemPath);
++        attr = GetFileAttributesW(systemPath);
++        if (attr >= 0xFFFFFFF) {
++            DEBUG_MSG("Error, shell link not found. Try to create a new one in: " << path);
++            return E_FAIL;
++        }
++        wcscpy(path, systemPath);
+     }
+ 
+     // Let's load the file as shell link to validate.
+@@ -543,7 +557,7 @@ HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
+         ComPtr<IPersistFile> persistFile;
+         hr = shellLink.As(&persistFile);
+         if (SUCCEEDED(hr)) {
+-            hr = persistFile->Load(path, STGM_READWRITE);
++            hr = persistFile->Load(path, STGM_READ);
+             if (SUCCEEDED(hr)) {
+                 ComPtr<IPropertyStore> propertyStore;
+                 hr = shellLink.As(&propertyStore);
+@@ -583,7 +597,7 @@ HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
+ HRESULT	WinToast::createShellLinkHelper() {
+ 	WCHAR   exePath[MAX_PATH]{L'\0'};
+ 	WCHAR	slPath[MAX_PATH]{L'\0'};
+-    Util::defaultShellLinkPath(_appName, slPath);
++    Util::defaultUserShellLinkPath(_appName, slPath);
+     Util::defaultExecutablePath(exePath);
+     ComPtr<IShellLinkW> shellLink;
+     HRESULT hr = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shellLink));
diff -Nru firefox-84.0.2+build1/third_party/WinToast/moz-disable-create-shortcut.patch firefox-85.0+build1/third_party/WinToast/moz-disable-create-shortcut.patch
--- firefox-84.0.2+build1/third_party/WinToast/moz-disable-create-shortcut.patch	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/third_party/WinToast/moz-disable-create-shortcut.patch	2021-01-18 19:58:24.000000000 +0000
@@ -0,0 +1,110 @@
+diff --git a/src/wintoastlib.cpp b/src/wintoastlib.cpp
+index 0895ff7..52de554 100644
+--- a/src/wintoastlib.cpp
++++ b/src/wintoastlib.cpp
+@@ -391,6 +391,10 @@ void WinToast::setAppUserModelId(_In_ const std::wstring& aumi) {
+     DEBUG_MSG(L"Default App User Model Id: " << _aumi.c_str());
+ }
+ 
++void WinToast::setShortcutPolicy(_In_ ShortcutPolicy shortcutPolicy) {
++    _shortcutPolicy = shortcutPolicy;
++}
++
+ bool WinToast::isCompatible() {
+ 	DllImporter::initialize();
+     return !((DllImporter::SetCurrentProcessExplicitAppUserModelID == nullptr)
+@@ -492,10 +496,12 @@ bool WinToast::initialize(_Out_ WinToastError* error) {
+         return false;
+     }
+ 
+-    if (createShortcut() < 0) {
+-        setError(error, WinToastError::ShellLinkNotCreated);
+-        DEBUG_MSG(L"Error while attaching the AUMI to the current proccess =(");
+-        return false;
++    if (_shortcutPolicy != SHORTCUT_POLICY_IGNORE) {
++        if (createShortcut() < 0) {
++            setError(error, WinToastError::ShellLinkNotCreated);
++            DEBUG_MSG(L"Error while attaching the AUMI to the current proccess =(");
++            return false;
++        }
+     }
+ 
+     if (FAILED(DllImporter::SetCurrentProcessExplicitAppUserModelID(_aumi.c_str()))) {
+@@ -555,18 +561,23 @@ HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
+                         hr = DllImporter::PropVariantToString(appIdPropVar, AUMI, MAX_PATH);
+                         wasChanged = false;
+                         if (FAILED(hr) || _aumi != AUMI) {
+-                            // AUMI Changed for the same app, let's update the current value! =)
+-                            wasChanged = true;
+-                            PropVariantClear(&appIdPropVar);
+-                            hr = InitPropVariantFromString(_aumi.c_str(), &appIdPropVar);
+-                            if (SUCCEEDED(hr)) {
+-                                hr = propertyStore->SetValue(PKEY_AppUserModel_ID, appIdPropVar);
++                            if (_shortcutPolicy == SHORTCUT_POLICY_REQUIRE_CREATE) {
++                                // AUMI Changed for the same app, let's update the current value! =)
++                                wasChanged = true;
++                                PropVariantClear(&appIdPropVar);
++                                hr = InitPropVariantFromString(_aumi.c_str(), &appIdPropVar);
+                                 if (SUCCEEDED(hr)) {
+-                                    hr = propertyStore->Commit();
+-                                    if (SUCCEEDED(hr) && SUCCEEDED(persistFile->IsDirty())) {
+-                                        hr = persistFile->Save(path, TRUE);
++                                    hr = propertyStore->SetValue(PKEY_AppUserModel_ID, appIdPropVar);
++                                    if (SUCCEEDED(hr)) {
++                                        hr = propertyStore->Commit();
++                                        if (SUCCEEDED(hr) && SUCCEEDED(persistFile->IsDirty())) {
++                                            hr = persistFile->Save(path, TRUE);
++                                        }
+                                     }
+                                 }
++                            } else {
++                                // Not allowed to touch the shortcut to fix the AUMI
++                                hr = E_FAIL;
+                             }
+                         }
+                         PropVariantClear(&appIdPropVar);
+@@ -581,6 +592,10 @@ HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
+ 
+ 
+ HRESULT	WinToast::createShellLinkHelper() {
++    if (_shortcutPolicy != SHORTCUT_POLICY_REQUIRE_CREATE) {
++      return E_FAIL;
++    }
++
+ 	WCHAR   exePath[MAX_PATH]{L'\0'};
+ 	WCHAR	slPath[MAX_PATH]{L'\0'};
+     Util::defaultShellLinkPath(_appName, slPath);
+diff --git a/src/wintoastlib.h b/src/wintoastlib.h
+index 68b1cb1..dc8d745 100644
+--- a/src/wintoastlib.h
++++ b/src/wintoastlib.h
+@@ -173,6 +173,16 @@ namespace WinToastLib {
+             SHORTCUT_CREATE_FAILED = -4
+         };
+ 
++        enum ShortcutPolicy {
++            /* Don't check, create, or modify a shortcut. */
++            SHORTCUT_POLICY_IGNORE = 0,
++            /* Require a shortcut with matching AUMI, don't create or modify an existing one. */
++            SHORTCUT_POLICY_REQUIRE_NO_CREATE = 1,
++            /* Require a shortcut with matching AUMI, create if missing, modify if not matching.
++             * This is the default. */
++            SHORTCUT_POLICY_REQUIRE_CREATE = 2,
++        };
++
+         WinToast(void);
+         virtual ~WinToast();
+         static WinToast* instance();
+@@ -194,10 +204,12 @@ namespace WinToastLib {
+         const std::wstring& appUserModelId() const;
+         void setAppUserModelId(_In_ const std::wstring& aumi);
+         void setAppName(_In_ const std::wstring& appName);
++        void setShortcutPolicy(_In_ ShortcutPolicy policy);
+ 
+     protected:
+         bool											_isInitialized{false};
+         bool                                            _hasCoInitialized{false};
++        ShortcutPolicy                                  _shortcutPolicy{SHORTCUT_POLICY_REQUIRE_CREATE};
+         std::wstring                                    _appName{};
+         std::wstring                                    _aumi{};
+         std::map<INT64, ComPtr<IToastNotification>>     _buffer{};
diff -Nru firefox-84.0.2+build1/third_party/WinToast/moz.yaml firefox-85.0+build1/third_party/WinToast/moz.yaml
--- firefox-84.0.2+build1/third_party/WinToast/moz.yaml	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/WinToast/moz.yaml	2021-01-18 19:58:24.000000000 +0000
@@ -5,6 +5,8 @@
 # cd third_pary/WinToast
 # wget https://raw.githubusercontent.com/mohabouje/WinToast/master/src/wintoastlib.cpp
 # wget https://raw.githubusercontent.com/mohabouje/WinToast/master/src/wintoastlib.h
+# patch -p2 < moz-check-system-shortcut.patch
+# patch -p2 < moz-disable-create-shortcut.patch
 
 bugzilla:
   # Bugzilla product and component for this directory and subdirectories
diff -Nru firefox-84.0.2+build1/third_party/WinToast/wintoastlib.cpp firefox-85.0+build1/third_party/WinToast/wintoastlib.cpp
--- firefox-84.0.2+build1/third_party/WinToast/wintoastlib.cpp	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/WinToast/wintoastlib.cpp	2021-01-18 19:58:24.000000000 +0000
@@ -213,8 +213,8 @@
     }
 
 
-    inline HRESULT defaultShellLinksDirectory(_In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
-        DWORD written = GetEnvironmentVariableW(L"APPDATA", path, nSize);
+    inline HRESULT commonShellLinksDirectory(_In_ const WCHAR* baseEnv, _In_ WCHAR* path, _In_ DWORD nSize) {
+        DWORD written = GetEnvironmentVariableW(baseEnv, path, nSize);
         HRESULT hr = written > 0 ? S_OK : E_INVALIDARG;
         if (SUCCEEDED(hr)) {
             errno_t result = wcscat_s(path, nSize, DEFAULT_SHELL_LINKS_PATH);
@@ -224,8 +224,8 @@
         return hr;
     }
 
-    inline HRESULT defaultShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
-        HRESULT hr = defaultShellLinksDirectory(path, nSize);
+    inline HRESULT commonShellLinkPath(_In_ const WCHAR* baseEnv, const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize) {
+        HRESULT hr = commonShellLinksDirectory(baseEnv, path, nSize);
         if (SUCCEEDED(hr)) {
             const std::wstring appLink(appname + DEFAULT_LINK_FORMAT);
             errno_t result = wcscat_s(path, nSize, appLink.c_str());
@@ -235,6 +235,13 @@
         return hr;
     }
 
+    inline HRESULT defaultUserShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
+      return commonShellLinkPath(L"APPDATA", appname, path, nSize);
+    }
+
+    inline HRESULT defaultSystemShellLinkPath(const std::wstring& appname, _In_ WCHAR* path, _In_ DWORD nSize = MAX_PATH) {
+      return commonShellLinkPath(L"PROGRAMDATA", appname, path, nSize);
+    }
 
     inline PCWSTR AsString(ComPtr<IXmlDocument> &xmlDocument) {
         HSTRING xml;
@@ -391,6 +398,10 @@
     DEBUG_MSG(L"Default App User Model Id: " << _aumi.c_str());
 }
 
+void WinToast::setShortcutPolicy(_In_ ShortcutPolicy shortcutPolicy) {
+    _shortcutPolicy = shortcutPolicy;
+}
+
 bool WinToast::isCompatible() {
 	DllImporter::initialize();
     return !((DllImporter::SetCurrentProcessExplicitAppUserModelID == nullptr)
@@ -492,10 +503,12 @@
         return false;
     }
 
-    if (createShortcut() < 0) {
-        setError(error, WinToastError::ShellLinkNotCreated);
-        DEBUG_MSG(L"Error while attaching the AUMI to the current proccess =(");
-        return false;
+    if (_shortcutPolicy != SHORTCUT_POLICY_IGNORE) {
+        if (createShortcut() < 0) {
+            setError(error, WinToastError::ShellLinkNotCreated);
+            DEBUG_MSG(L"Error while attaching the AUMI to the current proccess =(");
+            return false;
+        }
     }
 
     if (FAILED(DllImporter::SetCurrentProcessExplicitAppUserModelID(_aumi.c_str()))) {
@@ -523,12 +536,19 @@
 
 HRESULT	WinToast::validateShellLinkHelper(_Out_ bool& wasChanged) {
 	WCHAR	path[MAX_PATH] = { L'\0' };
-    Util::defaultShellLinkPath(_appName, path);
+    Util::defaultUserShellLinkPath(_appName, path);
     // Check if the file exist
     DWORD attr = GetFileAttributesW(path);
     if (attr >= 0xFFFFFFF) {
-        DEBUG_MSG("Error, shell link not found. Try to create a new one in: " << path);
-        return E_FAIL;
+        // The shortcut may be in the system Start Menu.
+        WCHAR   systemPath[MAX_PATH] = { L'\0' };
+        Util::defaultSystemShellLinkPath(_appName, systemPath);
+        attr = GetFileAttributesW(systemPath);
+        if (attr >= 0xFFFFFFF) {
+            DEBUG_MSG("Error, shell link not found. Try to create a new one in: " << path);
+            return E_FAIL;
+        }
+        wcscpy(path, systemPath);
     }
 
     // Let's load the file as shell link to validate.
@@ -543,7 +563,7 @@
         ComPtr<IPersistFile> persistFile;
         hr = shellLink.As(&persistFile);
         if (SUCCEEDED(hr)) {
-            hr = persistFile->Load(path, STGM_READWRITE);
+            hr = persistFile->Load(path, STGM_READ);
             if (SUCCEEDED(hr)) {
                 ComPtr<IPropertyStore> propertyStore;
                 hr = shellLink.As(&propertyStore);
@@ -555,18 +575,23 @@
                         hr = DllImporter::PropVariantToString(appIdPropVar, AUMI, MAX_PATH);
                         wasChanged = false;
                         if (FAILED(hr) || _aumi != AUMI) {
-                            // AUMI Changed for the same app, let's update the current value! =)
-                            wasChanged = true;
-                            PropVariantClear(&appIdPropVar);
-                            hr = InitPropVariantFromString(_aumi.c_str(), &appIdPropVar);
-                            if (SUCCEEDED(hr)) {
-                                hr = propertyStore->SetValue(PKEY_AppUserModel_ID, appIdPropVar);
+                            if (_shortcutPolicy == SHORTCUT_POLICY_REQUIRE_CREATE) {
+                                // AUMI Changed for the same app, let's update the current value! =)
+                                wasChanged = true;
+                                PropVariantClear(&appIdPropVar);
+                                hr = InitPropVariantFromString(_aumi.c_str(), &appIdPropVar);
                                 if (SUCCEEDED(hr)) {
-                                    hr = propertyStore->Commit();
-                                    if (SUCCEEDED(hr) && SUCCEEDED(persistFile->IsDirty())) {
-                                        hr = persistFile->Save(path, TRUE);
+                                    hr = propertyStore->SetValue(PKEY_AppUserModel_ID, appIdPropVar);
+                                    if (SUCCEEDED(hr)) {
+                                        hr = propertyStore->Commit();
+                                        if (SUCCEEDED(hr) && SUCCEEDED(persistFile->IsDirty())) {
+                                            hr = persistFile->Save(path, TRUE);
+                                        }
                                     }
                                 }
+                            } else {
+                                // Not allowed to touch the shortcut to fix the AUMI
+                                hr = E_FAIL;
                             }
                         }
                         PropVariantClear(&appIdPropVar);
@@ -581,9 +606,13 @@
 
 
 HRESULT	WinToast::createShellLinkHelper() {
+    if (_shortcutPolicy != SHORTCUT_POLICY_REQUIRE_CREATE) {
+      return E_FAIL;
+    }
+
 	WCHAR   exePath[MAX_PATH]{L'\0'};
 	WCHAR	slPath[MAX_PATH]{L'\0'};
-    Util::defaultShellLinkPath(_appName, slPath);
+    Util::defaultUserShellLinkPath(_appName, slPath);
     Util::defaultExecutablePath(exePath);
     ComPtr<IShellLinkW> shellLink;
     HRESULT hr = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&shellLink));
diff -Nru firefox-84.0.2+build1/third_party/WinToast/wintoastlib.h firefox-85.0+build1/third_party/WinToast/wintoastlib.h
--- firefox-84.0.2+build1/third_party/WinToast/wintoastlib.h	2021-01-06 11:23:21.000000000 +0000
+++ firefox-85.0+build1/third_party/WinToast/wintoastlib.h	2021-01-18 19:58:24.000000000 +0000
@@ -173,6 +173,16 @@
             SHORTCUT_CREATE_FAILED = -4
         };
 
+        enum ShortcutPolicy {
+            /* Don't check, create, or modify a shortcut. */
+            SHORTCUT_POLICY_IGNORE = 0,
+            /* Require a shortcut with matching AUMI, don't create or modify an existing one. */
+            SHORTCUT_POLICY_REQUIRE_NO_CREATE = 1,
+            /* Require a shortcut with matching AUMI, create if missing, modify if not matching.
+             * This is the default. */
+            SHORTCUT_POLICY_REQUIRE_CREATE = 2,
+        };
+
         WinToast(void);
         virtual ~WinToast();
         static WinToast* instance();
@@ -194,10 +204,12 @@
         const std::wstring& appUserModelId() const;
         void setAppUserModelId(_In_ const std::wstring& aumi);
         void setAppName(_In_ const std::wstring& appName);
+        void setShortcutPolicy(_In_ ShortcutPolicy policy);
 
     protected:
         bool											_isInitialized{false};
         bool                                            _hasCoInitialized{false};
+        ShortcutPolicy                                  _shortcutPolicy{SHORTCUT_POLICY_REQUIRE_CREATE};
         std::wstring                                    _appName{};
         std::wstring                                    _aumi{};
         std::map<INT64, ComPtr<IToastNotification>>     _buffer{};
diff -Nru firefox-84.0.2+build1/toolkit/actors/PictureInPictureChild.jsm firefox-85.0+build1/toolkit/actors/PictureInPictureChild.jsm
--- firefox-84.0.2+build1/toolkit/actors/PictureInPictureChild.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/actors/PictureInPictureChild.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -254,10 +254,11 @@
         // this is false.
         isTrackingVideos: false,
         togglePolicy: TOGGLE_POLICIES.DEFAULT,
-        // The documentURI that has been checked with toggle policies for this
-        // document. Note that the documentURI might change for a document via
-        // the history API, so we remember the last checked documentURI to
-        // determine if we need to check again.
+        toggleVisibilityThreshold: 1.0,
+        // The documentURI that has been checked with toggle policies and
+        // visibility thresholds for this document. Note that the documentURI
+        // might change for a document via the history API, so we remember
+        // the last checked documentURI to determine if we need to check again.
         checkedPolicyDocumentURI: null,
       };
       this.weakDocStates.set(this.document, state);
@@ -638,6 +639,7 @@
       return;
     }
 
+    let state = this.docState;
     let { clientX, clientY } = event;
     let winUtils = this.contentWindow.windowUtils;
     // We use winUtils.nodesFromRect instead of document.elementsFromPoint,
@@ -656,7 +658,8 @@
       1,
       true,
       false,
-      true /* aOnlyVisible */
+      true /* aOnlyVisible */,
+      state.toggleVisibilityThreshold
     );
     if (!Array.from(elements).includes(video)) {
       return;
@@ -664,7 +667,6 @@
 
     let toggle = this.getToggleElement(shadowRoot);
     if (this.isMouseOverToggle(toggle, event)) {
-      let state = this.docState;
       state.isClickingToggle = true;
       state.clickedElement = Cu.getWeakReference(event.originalTarget);
       event.stopImmediatePropagation();
@@ -853,9 +855,13 @@
         : gSiteOverrides;
 
       // Do we have any toggle overrides? If so, try to apply them.
-      for (let [override, { policy }] of siteOverrides) {
-        if (policy && override.matches(this.document.documentURI)) {
-          state.togglePolicy = policy;
+      for (let [override, { policy, visibilityThreshold }] of siteOverrides) {
+        if (
+          (policy || visibilityThreshold) &&
+          override.matches(this.document.documentURI)
+        ) {
+          state.togglePolicy = policy || TOGGLE_POLICIES.DEFAULT;
+          state.toggleVisibilityThreshold = visibilityThreshold || 1.0;
           break;
         }
       }
diff -Nru firefox-84.0.2+build1/toolkit/actors/PrintingChild.jsm firefox-85.0+build1/toolkit/actors/PrintingChild.jsm
--- firefox-84.0.2+build1/toolkit/actors/PrintingChild.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/actors/PrintingChild.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -20,6 +20,12 @@
   "resource://gre/modules/ReaderMode.jsm"
 );
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "DeferredTask",
+  "resource://gre/modules/DeferredTask.jsm"
+);
+
 let gPrintPreviewInitializingInfo = null;
 
 let gPendingPreviewsMap = new Map();
@@ -32,6 +38,12 @@
     if (listener) {
       listener.actor = this;
     }
+    this.contentWindow.addEventListener("scroll", this);
+  }
+
+  didDestroy() {
+    this._scrollTask?.disarm();
+    this.contentWindow?.removeEventListener("scroll", this);
   }
 
   // Bug 1088061: nsPrintJob's DoCommonPrint currently expects the
@@ -87,6 +99,17 @@
         this.updatePageCount();
         break;
       }
+
+      case "scroll":
+        if (!this._scrollTask) {
+          this._scrollTask = new DeferredTask(
+            () => this.updateCurrentPage(),
+            16,
+            16
+          );
+        }
+        this._scrollTask.arm();
+        break;
     }
   }
 
@@ -420,6 +443,14 @@
     });
   }
 
+  updateCurrentPage() {
+    let cv = this.docShell.contentViewer;
+    cv.QueryInterface(Ci.nsIWebBrowserPrint);
+    this.sendAsyncMessage("Printing:Preview:CurrentPage", {
+      currentPage: cv.printPreviewCurrentPageNumber,
+    });
+  }
+
   navigate(navType, pageNum) {
     let cv = this.docShell.contentViewer;
     cv.QueryInterface(Ci.nsIWebBrowserPrint);
diff -Nru firefox-84.0.2+build1/toolkit/actors/PrintingParent.jsm firefox-85.0+build1/toolkit/actors/PrintingParent.jsm
--- firefox-84.0.2+build1/toolkit/actors/PrintingParent.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/actors/PrintingParent.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -33,10 +33,15 @@
       return undefined;
     }
 
-    let listener = PrintUtils._webProgressPP.value;
+    let listener = PrintUtils._webProgressPP?.value;
     let data = message.data;
 
     switch (message.name) {
+      case "Printing:Preview:CurrentPage": {
+        browser.setAttribute("current-page", message.data.currentPage);
+        break;
+      }
+
       case "Printing:Preview:Entered": {
         // This message is sent by the content process once it has completed
         // putting the content into print preview mode. We must wait for that to
diff -Nru firefox-84.0.2+build1/toolkit/actors/TestWindowChild.jsm firefox-85.0+build1/toolkit/actors/TestWindowChild.jsm
--- firefox-84.0.2+build1/toolkit/actors/TestWindowChild.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/actors/TestWindowChild.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -14,6 +14,12 @@
   constructor() {
     super();
     this.sawActorCreated = false;
+
+    try {
+      void this.contentWindow;
+    } catch (e) {
+      this.uninitializedGetterError = e;
+    }
   }
 
   actorCreated() {
diff -Nru firefox-84.0.2+build1/toolkit/components/aboutprocesses/tests/browser/browser.ini firefox-85.0+build1/toolkit/components/aboutprocesses/tests/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/aboutprocesses/tests/browser/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/aboutprocesses/tests/browser/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -1,6 +1,6 @@
 [default]
 head = head.js
-skip-if = asan # With ASAN, we regularly hit internal timeouts.
+skip-if = asan || tsan # With sanitizers, we regularly hit internal timeouts.
 
 [browser_aboutprocesses_default_options.js]
 [browser_aboutprocesses_show_all_frames.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/alerts/nsAlertsService.cpp firefox-85.0+build1/toolkit/components/alerts/nsAlertsService.cpp
--- firefox-84.0.2+build1/toolkit/components/alerts/nsAlertsService.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/alerts/nsAlertsService.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -241,18 +241,17 @@
   return ShowWithBackend(xulBackend, aAlert, aAlertListener, aPersistentData);
 }
 
-NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName,
-                                          nsIPrincipal* aPrincipal) {
+NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName) {
   if (XRE_IsContentProcess()) {
     ContentChild* cpc = ContentChild::GetSingleton();
-    cpc->SendCloseAlert(nsAutoString(aAlertName), IPC::Principal(aPrincipal));
+    cpc->SendCloseAlert(nsAutoString(aAlertName));
     return NS_OK;
   }
 
   nsresult rv;
   // Try the system notification service.
   if (ShouldUseSystemBackend()) {
-    rv = mBackend->CloseAlert(aAlertName, aPrincipal);
+    rv = mBackend->CloseAlert(aAlertName);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       // If the system backend failed to close the alert, fall back to XUL for
       // future alerts.
@@ -261,7 +260,7 @@
   } else {
     nsCOMPtr<nsIAlertsService> xulBackend(nsXULAlerts::GetInstance());
     NS_ENSURE_TRUE(xulBackend, NS_ERROR_FAILURE);
-    rv = xulBackend->CloseAlert(aAlertName, aPrincipal);
+    rv = xulBackend->CloseAlert(aAlertName);
   }
   return rv;
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/alerts/nsIAlertsService.idl firefox-85.0+build1/toolkit/components/alerts/nsIAlertsService.idl
--- firefox-84.0.2+build1/toolkit/components/alerts/nsIAlertsService.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/alerts/nsIAlertsService.idl	2021-01-18 19:58:26.000000000 +0000
@@ -210,8 +210,7 @@
    *                       is provided then only a notification created with
    *                       no name (if any) will be closed.
    */
-  void closeAlert([optional] in AString aName,
-                  [optional] in nsIPrincipal aPrincipal);
+  void closeAlert([optional] in AString aName);
 
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/alerts/nsXULAlerts.cpp firefox-85.0+build1/toolkit/components/alerts/nsXULAlerts.cpp
--- firefox-84.0.2+build1/toolkit/components/alerts/nsXULAlerts.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/alerts/nsXULAlerts.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -392,7 +392,7 @@
 }
 
 NS_IMETHODIMP
-nsXULAlerts::CloseAlert(const nsAString& aAlertName, nsIPrincipal* aPrincipal) {
+nsXULAlerts::CloseAlert(const nsAString& aAlertName) {
   mozIDOMWindowProxy* alert = mNamedWindows.GetWeak(aAlertName);
   if (nsCOMPtr<nsPIDOMWindowOuter> domWindow =
           nsPIDOMWindowOuter::From(alert)) {
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingIPCUtils.h firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingIPCUtils.h
--- firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingIPCUtils.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingIPCUtils.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_antitrackingipcutils_h
 #define mozilla_antitrackingipcutils_h
 
-#include "ipc/IPCMessageUtils.h"
+#include "ipc/EnumSerializer.h"
 
 #include "mozilla/ContentBlockingNotifier.h"
 #include "mozilla/ContentBlocking.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp
--- firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingRedirectHeuristic.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsIChannel.h"
 #include "nsIClassifiedChannel.h"
 #include "nsICookieService.h"
+#include "nsIHttpChannel.h"
 #include "nsIRedirectHistoryEntry.h"
 #include "nsIScriptError.h"
 #include "nsIURI.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingUtils.cpp firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingUtils.cpp
--- firefox-84.0.2+build1/toolkit/components/antitracking/AntiTrackingUtils.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/AntiTrackingUtils.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -7,6 +7,7 @@
 #include "AntiTrackingUtils.h"
 
 #include "AntiTrackingLog.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
 #include "mozilla/net/CookieJarSettings.h"
@@ -18,6 +19,7 @@
 #include "mozIThirdPartyUtil.h"
 #include "nsGlobalWindowInner.h"
 #include "nsIChannel.h"
+#include "nsIHttpChannel.h"
 #include "nsIPermission.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlockingAllowList.cpp firefox-85.0+build1/toolkit/components/antitracking/ContentBlockingAllowList.cpp
--- firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlockingAllowList.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/ContentBlockingAllowList.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/PermissionManager.h"
 #include "mozilla/ScopeExit.h"
 #include "nsContentUtils.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlocking.h firefox-85.0+build1/toolkit/components/antitracking/ContentBlocking.h
--- firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlocking.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/ContentBlocking.h	2021-01-18 19:58:26.000000000 +0000
@@ -122,7 +122,7 @@
   friend class dom::ContentParent;
   // This should be running either in the parent process or in the child
   // processes with an in-process browsing context.
-  static MOZ_MUST_USE RefPtr<StorageAccessPermissionGrantPromise>
+  [[nodiscard]] static RefPtr<StorageAccessPermissionGrantPromise>
   CompleteAllowAccessFor(
       dom::BrowsingContext* aParentContext, uint64_t aTopLevelWindowId,
       nsIPrincipal* aTrackingPrincipal, const nsCString& aTrackingOrigin,
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlockingLog.cpp firefox-85.0+build1/toolkit/components/antitracking/ContentBlockingLog.cpp
--- firefox-84.0.2+build1/toolkit/components/antitracking/ContentBlockingLog.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/ContentBlockingLog.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -8,18 +8,17 @@
 #include "ContentBlockingLog.h"
 
 #include "nsITrackingDBService.h"
-#include "nsStringStream.h"
+#include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/HashFunctions.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/RandomNum.h"
+#include "mozilla/ReverseIterator.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPrefs_telemetry.h"
 #include "mozilla/Telemetry.h"
-#include "mozilla/Unused.h"
 #include "mozilla/XorShift128PlusRNG.h"
-#include "mozilla/ipc/IPCStreamUtils.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/StorageAccess.cpp firefox-85.0+build1/toolkit/components/antitracking/StorageAccess.cpp
--- firefox-84.0.2+build1/toolkit/components/antitracking/StorageAccess.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/StorageAccess.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -4,6 +4,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/. */
 
+#include "StorageAccess.h"
+
 #include "mozilla/dom/Document.h"
 #include "mozilla/net/CookieJarSettings.h"
 #include "mozilla/ContentBlocking.h"
@@ -331,6 +333,16 @@
   return disabled;
 }
 
+bool StorageDisabledByAntiTracking(dom::Document* aDocument, nsIURI* aURI) {
+  uint32_t rejectedReason = 0;
+  // Note that GetChannel() below may return null, but that's OK, since the
+  // callee is able to deal with a null channel argument, and if passed null,
+  // will only fail to notify the UI in case storage gets blocked.
+  return StorageDisabledByAntiTracking(
+      aDocument->GetInnerWindow(), aDocument->GetChannel(),
+      aDocument->NodePrincipal(), aURI, rejectedReason);
+}
+
 bool ShouldPartitionStorage(StorageAccess aAccess) {
   return aAccess == StorageAccess::ePartitionTrackersOrDeny ||
          aAccess == StorageAccess::ePartitionForeignOrDeny;
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/StorageAccess.h firefox-85.0+build1/toolkit/components/antitracking/StorageAccess.h
--- firefox-84.0.2+build1/toolkit/components/antitracking/StorageAccess.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/StorageAccess.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef mozilla_StorageAccess_h
 #define mozilla_StorageAccess_h
 
-#include "mozilla/dom/Document.h"
+#include <cstdint>
 
 class nsIChannel;
 class nsICookieJarSettings;
@@ -16,6 +16,9 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+namespace dom {
+class Document;
+}
 
 // The order of these entries matters, as we use std::min for total ordering
 // of permissions. Private Browsing is considered to be more limiting
@@ -99,16 +102,7 @@
  * Returns true if this document should disable storages because of the
  * anti-tracking feature.
  */
-inline bool StorageDisabledByAntiTracking(dom::Document* aDocument,
-                                          nsIURI* aURI) {
-  uint32_t rejectedReason = 0;
-  // Note that GetChannel() below may return null, but that's OK, since the
-  // callee is able to deal with a null channel argument, and if passed null,
-  // will only fail to notify the UI in case storage gets blocked.
-  return StorageDisabledByAntiTracking(
-      aDocument->GetInnerWindow(), aDocument->GetChannel(),
-      aDocument->NodePrincipal(), aURI, rejectedReason);
-}
+bool StorageDisabledByAntiTracking(dom::Document* aDocument, nsIURI* aURI);
 
 bool ShouldPartitionStorage(StorageAccess aAccess);
 
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/antitracking_head.js firefox-85.0+build1/toolkit/components/antitracking/test/browser/antitracking_head.js
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/antitracking_head.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/antitracking_head.js	2021-01-18 19:58:26.000000000 +0000
@@ -808,7 +808,7 @@
         doAccessRemovalChecks &&
         options.accessRemoval == "navigate-topframe"
       ) {
-        await BrowserTestUtils.loadURI(browser, TEST_4TH_PARTY_PAGE);
+        BrowserTestUtils.loadURI(browser, TEST_4TH_PARTY_PAGE);
         await BrowserTestUtils.browserLoaded(browser);
 
         let pageshow = BrowserTestUtils.waitForContentEvent(
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser_contentBlockingAllowListPrincipal.js firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser_contentBlockingAllowListPrincipal.js
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser_contentBlockingAllowListPrincipal.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser_contentBlockingAllowListPrincipal.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,98 @@
+function checkAllowListPrincipal(
+  browser,
+  type,
+  origin = browser.contentPrincipal.origin
+) {
+  let principal = browser.contentBlockingAllowListPrincipal;
+  ok(principal, "Principal is set");
+
+  if (type == "content") {
+    ok(principal.isContentPrincipal, "Is content principal");
+
+    ok(
+      principal.schemeIs("https"),
+      "allowlist content principal must have https scheme"
+    );
+  } else if (type == "system") {
+    ok(principal.isSystemPrincipal, "Is system principal");
+  } else {
+    throw new Error("Unexpected principal type");
+  }
+
+  is(origin, principal.origin, "Correct origin");
+}
+
+/**
+ * Test that we get the a allow list principal which matches the content
+ * principal for an https site.
+ */
+add_task(async test_contentPrincipalHTTPS => {
+  await BrowserTestUtils.withNewTab("https://example.com", browser => {
+    checkAllowListPrincipal(browser, "content");
+  });
+});
+
+/**
+ * Tests that we the scheme of the allowlist principal is HTTPS, even though the
+ * site is loaded via HTTP.
+ */
+add_task(async test_contentPrincipalHTTP => {
+  await BrowserTestUtils.withNewTab("http://example.net", browser => {
+    ok(
+      browser.contentPrincipal.isContentPrincipal,
+      "Should have content principal"
+    );
+    checkAllowListPrincipal(browser, "content", "https://example.net");
+  });
+});
+
+/**
+ * Tests that the allow list principal is a system principal for the preferences
+ * about site.
+ */
+add_task(async test_systemPrincipal => {
+  await BrowserTestUtils.withNewTab("about:preferences", browser => {
+    ok(
+      browser.contentPrincipal.isSystemPrincipal,
+      "Should have system principal"
+    );
+    checkAllowListPrincipal(browser, "system");
+  });
+});
+
+/**
+ * Open a site in private browsing and test that the allow list principal sets
+ * the same origin attributes as the content principal.
+ */
+add_task(async test_privateBrowsing => {
+  let win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
+  let tab = BrowserTestUtils.addTab(win.gBrowser, "https://example.com");
+  let browser = tab.linkedBrowser;
+
+  await BrowserTestUtils.browserLoaded(browser);
+
+  ok(
+    browser.contentPrincipal.isContentPrincipal,
+    "Should have content principal"
+  );
+  checkAllowListPrincipal(browser, "content");
+
+  await BrowserTestUtils.closeWindow(win);
+});
+
+/**
+ * Tests that we get a valid content principal for top level sandboxed pages,
+ * and not the document principal which is a null principal.
+ */
+add_task(async test_TopLevelSandbox => {
+  await BrowserTestUtils.withNewTab(
+    "https://example.com/browser/toolkit/components/antitracking/test/browser/sandboxed.html",
+    browser => {
+      ok(
+        browser.contentPrincipal.isNullPrincipal,
+        "Top level sandboxed page should have null principal"
+      );
+      checkAllowListPrincipal(browser, "content", "https://example.com");
+    }
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser.ini firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = os == "linux" && asan # bug 1662229 - task exception
+skip-if = os == "linux" && (asan || tsan) # bug 1662229 - task exception
 prefs =
   # Disable the Storage Access API prompts for all of the tests in this directory
   dom.storage_access.prompt.testing=true
@@ -73,6 +73,10 @@
 [browser_blockingMessaging.js]
 skip-if = os == "linux" && debug #bug 1627094
 [browser_blockingNoOpener.js]
+[browser_contentBlockingAllowListPrincipal.js]
+support-files =
+  sandboxed.html
+  sandboxed.html^headers^
 [browser_contentBlockingTelemetry.js]
 [browser_doublyNestedTracker.js]
 [browser_existingCookiesForSubresources.js]
@@ -161,3 +165,5 @@
 support-files =
   file_saveAsImage.sjs
   file_saveAsVideo.sjs
+  file_saveAsPageInfo.html
+  file_video.ogv
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/browser_staticPartition_saveAs.js	2021-01-18 19:58:26.000000000 +0000
@@ -14,6 +14,7 @@
 
 const TEST_IMAGE_URL = TEST_DOMAIN + TEST_PATH + "file_saveAsImage.sjs";
 const TEST_VIDEO_URL = TEST_DOMAIN + TEST_PATH + "file_saveAsVideo.sjs";
+const TEST_PAGEINFO_URL = TEST_DOMAIN + TEST_PATH + "file_saveAsPageInfo.html";
 
 let MockFilePicker = SpecialPowers.MockFilePicker;
 MockFilePicker.init(window);
@@ -370,6 +371,9 @@
 
       // Clean up
       BrowserTestUtils.removeTab(tab);
+
+      // Clean up the cache count on the server side.
+      await fetch(`${TEST_IMAGE_URL}?result`);
       await new Promise(resolve => {
         Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value =>
           resolve()
@@ -378,3 +382,156 @@
     }
   }
 });
+
+add_task(async function testPageInfoMediaSaveAs() {
+  for (let networkIsolation of [true, false]) {
+    for (let partitionPerSite of [true, false]) {
+      await SpecialPowers.pushPrefEnv({
+        set: [
+          ["privacy.partition.network_state", networkIsolation],
+          ["privacy.dynamic_firstparty.use_site", partitionPerSite],
+        ],
+      });
+
+      let partitionKey = partitionPerSite
+        ? "(http,example.net)"
+        : "example.net";
+
+      info(
+        `Open a new tab for testing "Save AS" in the media panel of the page info.`
+      );
+      let tab = await BrowserTestUtils.openNewForegroundTab(
+        gBrowser,
+        TEST_PAGEINFO_URL
+      );
+
+      info("Open the media panel of the pageinfo.");
+      let pageInfo = BrowserPageInfo(
+        gBrowser.selectedBrowser.currentURI.spec,
+        "mediaTab"
+      );
+
+      await BrowserTestUtils.waitForEvent(pageInfo, "page-info-init");
+
+      let imageTree = pageInfo.document.getElementById("imagetree");
+      let imageRowsNum = imageTree.view.rowCount;
+
+      is(imageRowsNum, 2, "There should be two media items here.");
+
+      for (let i = 0; i < imageRowsNum; i++) {
+        imageTree.view.selection.select(i);
+        imageTree.ensureRowIsVisible(i);
+        imageTree.focus();
+
+        // Wait until the preview is loaded.
+        let preview = pageInfo.document.getElementById("thepreviewimage");
+        let mediaType = pageInfo.gImageView.data[i][1]; // COL_IMAGE_TYPE
+        if (mediaType == "Image") {
+          await BrowserTestUtils.waitForEvent(preview, "loadend");
+        } else if (mediaType == "Video") {
+          await BrowserTestUtils.waitForEvent(preview, "canplaythrough");
+        }
+
+        let url = pageInfo.gImageView.data[i][0]; // COL_IMAGE_ADDRESS
+        info(`Start to save the media item with URL: ${url}`);
+
+        let transferCompletePromise = createPromiseForTransferComplete();
+
+        // Observe the channel and check if it has the correct partitionKey.
+        let observerPromise = createPromiseForObservingChannel(
+          url,
+          partitionKey
+        );
+
+        info("Triggering the save process.");
+        let saveElement = pageInfo.document.getElementById("imagesaveasbutton");
+        saveElement.doCommand();
+
+        info("Waiting for the channel.");
+        await observerPromise;
+
+        info("Wait until the save is finished.");
+        await transferCompletePromise;
+      }
+
+      pageInfo.close();
+      BrowserTestUtils.removeTab(tab);
+    }
+  }
+});
+
+add_task(async function testPageInfoMediaMultipleSelectedSaveAs() {
+  for (let networkIsolation of [true, false]) {
+    for (let partitionPerSite of [true, false]) {
+      await SpecialPowers.pushPrefEnv({
+        set: [
+          ["privacy.partition.network_state", networkIsolation],
+          ["privacy.dynamic_firstparty.use_site", partitionPerSite],
+        ],
+      });
+
+      let partitionKey = partitionPerSite
+        ? "(http,example.net)"
+        : "example.net";
+
+      info(
+        `Open a new tab for testing "Save AS" in the media panel of the page info.`
+      );
+      let tab = await BrowserTestUtils.openNewForegroundTab(
+        gBrowser,
+        TEST_PAGEINFO_URL
+      );
+
+      info("Open the media panel of the pageinfo.");
+      let pageInfo = BrowserPageInfo(
+        gBrowser.selectedBrowser.currentURI.spec,
+        "mediaTab"
+      );
+
+      await BrowserTestUtils.waitForEvent(pageInfo, "page-info-init");
+
+      // Make sure the preview image is loaded in order to avoid interfering
+      // following tests.
+      let preview = pageInfo.document.getElementById("thepreviewimage");
+      await BrowserTestUtils.waitForCondition(() => {
+        return preview.complete;
+      });
+
+      let imageTree = pageInfo.document.getElementById("imagetree");
+      let imageRowsNum = imageTree.view.rowCount;
+
+      is(imageRowsNum, 2, "There should be two media items here.");
+
+      imageTree.view.selection.selectAll();
+      imageTree.focus();
+
+      let url = pageInfo.gImageView.data[0][0]; // COL_IMAGE_ADDRESS
+      info(`Start to save the media item with URL: ${url}`);
+
+      let transferCompletePromise = createPromiseForTransferComplete();
+      let observerPromises = [];
+
+      // Observe all channels and check if they have the correct partitionKey.
+      for (let i = 0; i < imageRowsNum; ++i) {
+        let observerPromise = createPromiseForObservingChannel(
+          url,
+          partitionKey
+        );
+        observerPromises.push(observerPromise);
+      }
+
+      info("Triggering the save process.");
+      let saveElement = pageInfo.document.getElementById("imagesaveasbutton");
+      saveElement.doCommand();
+
+      info("Waiting for the all channels.");
+      await Promise.all(observerPromises);
+
+      info("Wait until the save is finished.");
+      await transferCompletePromise;
+
+      pageInfo.close();
+      BrowserTestUtils.removeTab(tab);
+    }
+  }
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html firefox-85.0+build1/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/file_saveAsPageInfo.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,6 @@
+<html>
+<body>
+  <img src="http://example.net/browser/toolkit/components/antitracking/test/browser/raptor.jpg" id="image1">
+  <video src="http://example.net/browser/toolkit/components/antitracking/test/browser/file_video.ogv" id="video1"> </video>
+</body>
+</html>
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/file_video.ogv and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/antitracking/test/browser/file_video.ogv differ
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/sandboxed.html firefox-85.0+build1/toolkit/components/antitracking/test/browser/sandboxed.html
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/sandboxed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/sandboxed.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<!-- 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/. -->
+<html dir="ltr" xml:lang="en-US" lang="en-US">
+  <head>
+    <meta charset="utf8">
+  </head>
+  <body>
+    <p>Hello, World!</p>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/sandboxed.html^headers^ firefox-85.0+build1/toolkit/components/antitracking/test/browser/sandboxed.html^headers^
--- firefox-84.0.2+build1/toolkit/components/antitracking/test/browser/sandboxed.html^headers^	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/antitracking/test/browser/sandboxed.html^headers^	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts;
diff -Nru firefox-84.0.2+build1/toolkit/components/autocomplete/nsAutoCompleteController.cpp firefox-85.0+build1/toolkit/components/autocomplete/nsAutoCompleteController.cpp
--- firefox-84.0.2+build1/toolkit/components/autocomplete/nsAutoCompleteController.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/autocomplete/nsAutoCompleteController.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsUnicharUtils.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIObserverService.h"
+#include "nsServiceManagerUtils.h"
 #include "mozilla/Services.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp firefox-85.0+build1/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp
--- firefox-84.0.2+build1/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/backgroundhangmonitor/BackgroundHangMonitor.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -26,15 +26,12 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "nsXULAppAPI.h"
 #include "prinrval.h"
 #include "prthread.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 #include <algorithm>
 
 // Activate BHR only for one every BHR_BETA_MOD users.
@@ -534,12 +531,26 @@
   // If the profiler is enabled, add a marker.
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_can_accept_markers()) {
-    TimeStamp endTime = TimeStamp::Now();
-    TimeStamp startTime = endTime - aHangTime;
-    AUTO_PROFILER_STATS(add_marker_with_HangMarkerPayload);
-    profiler_add_marker_for_thread(
-        mStackHelper.GetThreadId(), JS::ProfilingCategoryPair::OTHER,
-        "BHR-detected hang", HangMarkerPayload(startTime, endTime));
+    struct HangMarker {
+      static constexpr Span<const char> MarkerTypeName() {
+        return MakeStringSpan("BHR-detected hang");
+      }
+      static void StreamJSONMarkerData(
+          baseprofiler::SpliceableJSONWriter& aWriter) {}
+      static MarkerSchema MarkerTypeDisplay() {
+        using MS = MarkerSchema;
+        MS schema{MS::Location::markerChart, MS::Location::markerTable,
+                  MS::Location::timelineOverview};
+        return schema;
+      }
+    };
+
+    const TimeStamp endTime = TimeStamp::NowUnfuzzed();
+    const TimeStamp startTime = endTime - aHangTime;
+    profiler_add_marker("BHR-detected hang", geckoprofiler::category::OTHER,
+                        {MarkerThreadId(mStackHelper.GetThreadId()),
+                         MarkerTiming::Interval(startTime, endTime)},
+                        HangMarker{});
   }
 #endif
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/backgroundhangmonitor/HangDetails.h firefox-85.0+build1/toolkit/components/backgroundhangmonitor/HangDetails.h
--- firefox-84.0.2+build1/toolkit/components/backgroundhangmonitor/HangDetails.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/backgroundhangmonitor/HangDetails.h	2021-01-18 19:58:26.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/Result.h"
 #include "mozilla/TimeStamp.h"
+#include "nsIFile.h"
 #include "nsIHangDetails.h"
 #include "nsTArray.h"
 
diff -Nru firefox-84.0.2+build1/toolkit/components/browser/nsWebBrowser.cpp firefox-85.0+build1/toolkit/components/browser/nsWebBrowser.cpp
--- firefox-84.0.2+build1/toolkit/components/browser/nsWebBrowser.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/browser/nsWebBrowser.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -28,7 +28,9 @@
 #include "nsFocusManager.h"
 #include "Layers.h"
 #include "nsILoadContext.h"
+#include "nsComponentManagerUtils.h"
 #include "nsDocShell.h"
+#include "nsServiceManagerUtils.h"
 
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/BrowsingContext.h"
@@ -1169,7 +1171,7 @@
   printf("nsWebBrowser::NS_ACTIVATE %p %s\n", (void*)this,
          NS_ConvertUTF16toUTF8(documentURI).get());
 #endif
-  FocusActivate();
+  FocusActivate(nsFocusManager::GenerateFocusActionId());
 }
 
 void nsWebBrowser::WindowDeactivated() {
@@ -1180,7 +1182,7 @@
   printf("nsWebBrowser::NS_DEACTIVATE %p %s\n", (void*)this,
          NS_ConvertUTF16toUTF8(documentURI).get());
 #endif
-  FocusDeactivate();
+  FocusDeactivate(nsFocusManager::GenerateFocusActionId());
 }
 
 bool nsWebBrowser::PaintWindow(nsIWidget* aWidget,
@@ -1200,19 +1202,19 @@
   return true;
 }
 
-void nsWebBrowser::FocusActivate() {
+void nsWebBrowser::FocusActivate(uint64_t aActionId) {
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   nsCOMPtr<nsPIDOMWindowOuter> window = GetWindow();
   if (fm && window) {
-    fm->WindowRaised(window);
+    fm->WindowRaised(window, aActionId);
   }
 }
 
-void nsWebBrowser::FocusDeactivate() {
+void nsWebBrowser::FocusDeactivate(uint64_t aActionId) {
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   nsCOMPtr<nsPIDOMWindowOuter> window = GetWindow();
   if (fm && window) {
-    fm->WindowLowered(window);
+    fm->WindowLowered(window, aActionId);
   }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/browser/nsWebBrowser.h firefox-85.0+build1/toolkit/components/browser/nsWebBrowser.h
--- firefox-84.0.2+build1/toolkit/components/browser/nsWebBrowser.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/browser/nsWebBrowser.h	2021-01-18 19:58:26.000000000 +0000
@@ -53,6 +53,7 @@
   }
 
 class mozIDOMWindowProxy;
+class nsDocShell;
 
 namespace mozilla {
 namespace dom {
@@ -102,8 +103,8 @@
   NS_DECL_NSIWEBPROGRESSLISTENER
 
   void SetAllowDNSPrefetch(bool aAllowPrefetch);
-  void FocusActivate();
-  void FocusDeactivate();
+  void FocusActivate(uint64_t aActionId);
+  void FocusDeactivate(uint64_t aActionId);
   void SetWillChangeProcess();
 
   static already_AddRefed<nsWebBrowser> Create(
diff -Nru firefox-84.0.2+build1/toolkit/components/certviewer/content/certviewer.css firefox-85.0+build1/toolkit/components/certviewer/content/certviewer.css
--- firefox-84.0.2+build1/toolkit/components/certviewer/content/certviewer.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/certviewer/content/certviewer.css	2021-01-18 19:58:26.000000000 +0000
@@ -2,16 +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/. */
 
-:root {
-  background-color: var(--grey-50);
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    background-color: var(--grey-60);
-  }
-}
-
 body {
   max-width: 800px;
   margin: 0 auto;
diff -Nru firefox-84.0.2+build1/toolkit/components/certviewer/content/components/certificate-section.css firefox-85.0+build1/toolkit/components/certviewer/content/components/certificate-section.css
--- firefox-84.0.2+build1/toolkit/components/certviewer/content/components/certificate-section.css	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/certviewer/content/components/certificate-section.css	2021-01-18 19:58:26.000000000 +0000
@@ -5,7 +5,6 @@
 h1 {
   font-size: 1.5em;
   font-weight: lighter;
-  color: white;
   margin: 3em 0 1em;
 }
 
@@ -13,12 +12,14 @@
   display: flex;
   text-align: center;
   border-bottom: 1px solid var(--in-content-border-active);
+  box-shadow: var(--card-shadow);
 }
 
 .info-groups {
   display: none;
   outline: none;
-  background-color: var(--in-content-page-background);
+  background-color: var(--in-content-box-background);
+  box-shadow: var(--card-shadow);
   margin-bottom: 2em;
   border-radius: 0 0 4px 4px;
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/ClearDataService.jsm firefox-85.0+build1/toolkit/components/cleardata/ClearDataService.jsm
--- firefox-84.0.2+build1/toolkit/components/cleardata/ClearDataService.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/ClearDataService.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -730,6 +730,32 @@
 };
 
 const StorageAccessCleaner = {
+  // This is a special function to implement deleteUserInteractionForClearingHistory.
+  deleteExceptPrincipals(aPrincipalsWithStorage, aFrom) {
+    // We compare by base domain in order to simulate the behavior
+    // from purging, Consider a scenario where the user is logged
+    // into sub.example.com but the cookies are on example.com. In this
+    // case, we will remove the user interaction for sub.example.com
+    // because its principal does not match the one with storage.
+    let baseDomainsWithStorage = new Set();
+    for (let principal of aPrincipalsWithStorage) {
+      baseDomainsWithStorage.add(principal.baseDomain);
+    }
+
+    return new Promise(aResolve => {
+      for (let perm of Services.perms.getAllByTypeSince(
+        "storageAccessAPI",
+        aFrom
+      )) {
+        if (!baseDomainsWithStorage.has(perm.principal.baseDomain)) {
+          Services.perms.removePermission(perm);
+        }
+      }
+
+      aResolve();
+    });
+  },
+
   deleteByHost(aHost, aOriginAttributes) {
     return new Promise(aResolve => {
       for (let perm of Services.perms.all) {
@@ -1326,6 +1352,24 @@
     );
   },
 
+  deleteUserInteractionForClearingHistory(
+    aPrincipalsWithStorage,
+    aFrom,
+    aCallback
+  ) {
+    if (!aCallback) {
+      return Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    StorageAccessCleaner.deleteExceptPrincipals(
+      aPrincipalsWithStorage,
+      aFrom
+    ).then(() => {
+      aCallback.onDataDeleted(0);
+    });
+    return Cr.NS_OK;
+  },
+
   // This internal method uses aFlags against FLAGS_MAP in order to retrieve a
   // list of 'Cleaners'. For each of them, the aHelper callback retrieves a
   // promise object. All these promise objects are resolved before calling
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/moz.build firefox-85.0+build1/toolkit/components/cleardata/moz.build
--- firefox-84.0.2+build1/toolkit/components/cleardata/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/moz.build	2021-01-18 19:58:26.000000000 +0000
@@ -16,6 +16,7 @@
 
 EXTRA_JS_MODULES += [
     "ClearDataService.jsm",
+    "PrincipalsCollector.jsm",
     "ServiceWorkerCleanUp.jsm",
 ]
 
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/nsIClearDataService.idl firefox-85.0+build1/toolkit/components/cleardata/nsIClearDataService.idl
--- firefox-84.0.2+build1/toolkit/components/cleardata/nsIClearDataService.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/nsIClearDataService.idl	2021-01-18 19:58:26.000000000 +0000
@@ -105,6 +105,24 @@
   void deleteDataFromOriginAttributesPattern(in jsval aOriginAttributesPattern,
                                              [optional] in nsIClearDataCallback aCallback);
 
+  /**
+   * This is a helper function to clear storageAccessAPI permissions
+   * in a way that will not result in users getting logged out by
+   * cookie purging. To that end we only clear permissions for principals
+   * whose base domain does not have any storage associated with it.
+   *
+   * The principals to be considered will need to be passed by the API consumer.
+   * It is recommended to use PrincipalsCollector.jsm for that.
+   *
+   * @param aPrincipalsWithStorage principals to be excluded from clearing
+   * @param aFrom microseconds from the epoch
+   * @param aCallback the optional callback will be executed when the operation
+   *                  is completed.
+   */
+  void deleteUserInteractionForClearingHistory(in Array<nsIPrincipal> aPrincipalsWithStorage,
+                                               [optional] in PRTime aFrom,
+                                               [optional] in nsIClearDataCallback aCallback);
+
   /**************************************************************************
    * Listed below are the various flags which may be or'd together.
    */
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/PrincipalsCollector.jsm firefox-85.0+build1/toolkit/components/cleardata/PrincipalsCollector.jsm
--- firefox-84.0.2+build1/toolkit/components/cleardata/PrincipalsCollector.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/PrincipalsCollector.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,156 @@
+/* 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 { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "quotaManagerService",
+  "@mozilla.org/dom/quota-manager-service;1",
+  "nsIQuotaManagerService"
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "serviceWorkerManager",
+  "@mozilla.org/serviceworkers/manager;1",
+  "nsIServiceWorkerManager"
+);
+
+/**
+ * A helper module to collect all principals that have any of the following:
+ *  * cookies
+ *  * quota storage (indexedDB, localStorage)
+ *  * service workers
+ *
+ *  Note that in case of cookies, because these are not strictly associated with a
+ *  full origin (including scheme), the https:// scheme will be used as a convention,
+ *  so when the cookie hostname is .example.com the principal will have the origin
+ *  https://example.com. Origin Attributes from cookies are copied to the principal.
+ *
+ *  This class is not a singleton and needs to be instantiated using the constructor
+ *  before usage. The class instance will cache the last list of principals.
+ *
+ *  There is currently no `refresh` method, though you are free to add one.
+ */
+class PrincipalsCollector {
+  /**
+   * Creates a new PrincipalsCollector.
+   */
+  constructor() {
+    this.principals = null;
+  }
+
+  /**
+   * Checks whether the passed in principal has a scheme that is considered by the
+   * PrincipalsCollector. This is used to avoid including principals for non-web
+   * entities such as moz-extension.
+   *
+   * @param {nsIPrincipal} the principal to check
+   * @returns {boolean}
+   */
+  static isSupportedPrincipal(principal) {
+    return ["http", "https", "file"].some(scheme => principal.schemeIs(scheme));
+  }
+
+  /**
+   * Fetches and collects all principals with cookies and/or site data (see module
+   * description). Originally for usage in Sanitizer.jsm to compute principals to be
+   * cleared on shutdown based on user settings.
+   *
+   * This operation might take a while to complete on big profiles.
+   * DO NOT call or await this in a way that makes it block user interaction, or you
+   * risk several painful seconds or possibly even minutes of lag.
+   *
+   * This function will cache its result and return the same list on second call,
+   * even if the actual number of principals with cookies and site data changed.
+   *
+   * @param {Object} [optional] progress A Sanitizer.jsm progress object that will be
+   *   updated to reflect the current step of fetching principals.
+   * @returns {Array<nsIPrincipal>} the list of principals
+   */
+  async getAllPrincipals(progress = {}) {
+    if (this.principals == null) {
+      // Here is the list of principals with site data.
+      this.principals = await this._getAllPrincipalsInternal(progress);
+    }
+
+    return this.principals;
+  }
+
+  async _getAllPrincipalsInternal(progress = {}) {
+    progress.step = "principals-quota-manager";
+    let principals = await new Promise(resolve => {
+      quotaManagerService.listOrigins().callback = request => {
+        progress.step = "principals-quota-manager-listOrigins";
+        if (request.resultCode != Cr.NS_OK) {
+          // We are probably shutting down. We don't want to propagate the
+          // error, rejecting the promise.
+          resolve([]);
+          return;
+        }
+
+        let list = [];
+        for (const origin of request.result) {
+          let principal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+            origin
+          );
+          if (PrincipalsCollector.isSupportedPrincipal(principal)) {
+            list.push(principal);
+          }
+        }
+
+        progress.step = "principals-quota-manager-completed";
+        resolve(list);
+      };
+    }).catch(ex => {
+      Cu.reportError("QuotaManagerService promise failed: " + ex);
+      return [];
+    });
+
+    progress.step = "principals-service-workers";
+    let serviceWorkers = serviceWorkerManager.getAllRegistrations();
+    for (let i = 0; i < serviceWorkers.length; i++) {
+      let sw = serviceWorkers.queryElementAt(
+        i,
+        Ci.nsIServiceWorkerRegistrationInfo
+      );
+      // We don't need to check the scheme. SW are just exposed to http/https URLs.
+      principals.push(sw.principal);
+    }
+
+    // Let's take the list of unique hosts+OA from cookies.
+    progress.step = "principals-cookies";
+    let cookies = Services.cookies.cookies;
+    let hosts = new Set();
+    for (let cookie of cookies) {
+      hosts.add(
+        cookie.rawHost +
+          ChromeUtils.originAttributesToSuffix(cookie.originAttributes)
+      );
+    }
+
+    progress.step = "principals-host-cookie";
+    hosts.forEach(host => {
+      // Cookies and permissions are handled by origin/host. Doesn't matter if we
+      // use http: or https: schema here.
+      principals.push(
+        Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+          "https://" + host
+        )
+      );
+    });
+
+    progress.step = "total-principals:" + principals.length;
+    return principals;
+  }
+}
+
+this.EXPORTED_SYMBOLS = ["PrincipalsCollector"];
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/tests/unit/head.js firefox-85.0+build1/toolkit/components/cleardata/tests/unit/head.js
--- firefox-84.0.2+build1/toolkit/components/cleardata/tests/unit/head.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/tests/unit/head.js	2021-01-18 19:58:26.000000000 +0000
@@ -4,6 +4,9 @@
 const { SiteDataTestUtils } = ChromeUtils.import(
   "resource://testing-common/SiteDataTestUtils.jsm"
 );
+const { PermissionTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PermissionTestUtils.jsm"
+);
 
 function run_test() {
   do_get_profile();
diff -Nru firefox-84.0.2+build1/toolkit/components/cleardata/tests/unit/test_storage_permission.js firefox-85.0+build1/toolkit/components/cleardata/tests/unit/test_storage_permission.js
--- firefox-84.0.2+build1/toolkit/components/cleardata/tests/unit/test_storage_permission.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/cleardata/tests/unit/test_storage_permission.js	2021-01-18 19:58:26.000000000 +0000
@@ -144,3 +144,153 @@
     );
   });
 });
+
+// Tests the deleteUserInteractionForClearingHistory function.
+add_task(async function test_deleteUserInteractionForClearingHistory() {
+  // These should be retained.
+  PermissionTestUtils.add(
+    "https://example.com",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "https://sub.example.com",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "https://sub.example.com^userContextId=3",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  // These should be removed.
+  PermissionTestUtils.add(
+    "https://example.org",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "https://sub.example.org",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+  PermissionTestUtils.add(
+    "https://sub.example.org^userContextId=3",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  let principalWithStorage = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+    "https://sub.example.com"
+  );
+
+  await new Promise(resolve => {
+    return Services.clearData.deleteUserInteractionForClearingHistory(
+      [principalWithStorage],
+      0,
+      resolve
+    );
+  });
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://sub.example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://sub.example.org^userContextId=3",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://sub.example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://sub.example.com^userContextId=3",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+
+  // This permission is set earlier than the timestamp and should be retained.
+  PermissionTestUtils.add(
+    "https://example.net",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  // Add some time in between taking the snapshot of the timestamp
+  // to avoid flakyness.
+  await new Promise(c => do_timeout(100, c));
+  let timestamp = Date.now();
+  await new Promise(c => do_timeout(100, c));
+
+  // This permission is set later than the timestamp and should be removed.
+  PermissionTestUtils.add(
+    "https://example.org",
+    "storageAccessAPI",
+    Services.perms.ALLOW_ACTION
+  );
+
+  await new Promise(resolve => {
+    return Services.clearData.deleteUserInteractionForClearingHistory(
+      [principalWithStorage],
+      timestamp,
+      resolve
+    );
+  });
+
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.org",
+      "storageAccessAPI"
+    ),
+    Services.perms.UNKNOWN_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.net",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+  Assert.equal(
+    PermissionTestUtils.testExactPermission(
+      "https://example.com",
+      "storageAccessAPI"
+    ),
+    Services.perms.ALLOW_ACTION
+  );
+
+  await new Promise(aResolve => {
+    Services.clearData.deleteData(
+      Ci.nsIClearDataService.CLEAR_PERMISSIONS,
+      value => aResolve()
+    );
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/contextualidentity/ContextualIdentityService.jsm firefox-85.0+build1/toolkit/components/contextualidentity/ContextualIdentityService.jsm
--- firefox-84.0.2+build1/toolkit/components/contextualidentity/ContextualIdentityService.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/contextualidentity/ContextualIdentityService.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -34,7 +34,6 @@
   "AsyncShutdown",
   "resource://gre/modules/AsyncShutdown.jsm"
 );
-ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 ChromeUtils.defineModuleGetter(
   this,
   "DeferredTask",
@@ -170,7 +169,7 @@
   },
 
   load() {
-    return OS.File.read(this._path).then(
+    return IOUtils.read(this._path).then(
       bytes => {
         // If synchronous loading happened in the meantime, exit now.
         if (this._dataReady) {
@@ -217,14 +216,7 @@
   },
 
   loadError(error) {
-    if (
-      error != null &&
-      !(error instanceof OS.File.Error && error.becauseNoSuchFile) &&
-      !(
-        error instanceof Components.Exception &&
-        error.result == Cr.NS_ERROR_FILE_NOT_FOUND
-      )
-    ) {
+    if (error != null && error.name != "NotFoundError") {
       // Let's report the error.
       Cu.reportError(error);
     }
@@ -266,7 +258,7 @@
     };
 
     let bytes = gTextEncoder.encode(JSON.stringify(object));
-    return OS.File.writeAtomic(this._path, bytes, {
+    return IOUtils.write(this._path, bytes, {
       tmpPath: this._path + ".tmp",
     });
   },
@@ -653,5 +645,8 @@
   },
 };
 
-let path = OS.Path.join(OS.Constants.Path.profileDir, "containers.json");
+let path = PathUtils.join(
+  Services.dirsvc.get("ProfD", Ci.nsIFile).path,
+  "containers.json"
+);
 var ContextualIdentityService = new _ContextualIdentityService(path);
diff -Nru firefox-84.0.2+build1/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js firefox-85.0+build1/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js
--- firefox-84.0.2+build1/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/contextualidentity/tests/unit/test_corruptedFile.js	2021-01-18 19:58:26.000000000 +0000
@@ -6,9 +6,8 @@
   "resource://gre/modules/ContextualIdentityService.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
-const TEST_STORE_FILE_PATH = OS.Path.join(
+const TEST_STORE_FILE_PATH = PathUtils.join(
   profileDir.path,
   "test-containers.json"
 );
@@ -91,7 +90,7 @@
   );
 
   // Let's create a corrupted file.
-  await OS.File.writeAtomic(TEST_STORE_FILE_PATH, "{ vers", {
+  await IOUtils.writeUTF8(TEST_STORE_FILE_PATH, "{ vers", {
     tmpPath: TEST_STORE_FILE_PATH + ".tmp",
   });
 
@@ -157,9 +156,7 @@
 
   // Verify the version of the newly created containers.json file.
   cis.save();
-  const stateFileText = await OS.File.read(TEST_STORE_FILE_PATH, {
-    encoding: "utf-8",
-  });
+  const stateFileText = await IOUtils.readUTF8(TEST_STORE_FILE_PATH);
   equal(
     JSON.parse(stateFileText).version,
     cis.LAST_CONTAINERS_JSON_VERSION,
diff -Nru firefox-84.0.2+build1/toolkit/components/crashes/CrashManager.jsm firefox-85.0+build1/toolkit/components/crashes/CrashManager.jsm
--- firefox-84.0.2+build1/toolkit/components/crashes/CrashManager.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/crashes/CrashManager.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -7,7 +7,6 @@
 const myScope = this;
 
 ChromeUtils.import("resource://gre/modules/Log.jsm", this);
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
 const { PromiseUtils } = ChromeUtils.import(
   "resource://gre/modules/PromiseUtils.jsm"
 );
@@ -217,7 +216,7 @@
 
   _lazyGetDir(field, path, leaf) {
     delete this[field];
-    let value = OS.Path.join(path, leaf);
+    let value = PathUtils.join(path, leaf);
     Object.defineProperty(this, field, { value });
     return value;
   },
@@ -225,7 +224,7 @@
   get _crDir() {
     return this._lazyGetDir(
       "_crDir",
-      OS.Constants.Path.userApplicationDataDir,
+      Services.dirsvc.get("UAppData", Ci.nsIFile).path,
       "Crash Reports"
     );
   },
@@ -233,7 +232,7 @@
   get _storeDir() {
     return this._lazyGetDir(
       "_storeDir",
-      OS.Constants.Path.profileDir,
+      Services.dirsvc.get("ProfD", Ci.nsIFile).path,
       "crashes"
     );
   },
@@ -249,8 +248,8 @@
   get _eventsDirs() {
     delete this._eventsDirs;
     let value = [
-      OS.Path.join(this._crDir, "events"),
-      OS.Path.join(this._storeDir, "events"),
+      PathUtils.join(this._crDir, "events"),
+      PathUtils.join(this._storeDir, "events"),
     ];
     Object.defineProperty(this, "_eventsDirs", { value });
     return value;
@@ -364,7 +363,7 @@
                 );
             }
           } catch (ex) {
-            if (ex instanceof OS.File.Error) {
+            if (ex instanceof DOMException) {
               this._log.warn("I/O error reading " + entry.path, ex);
             } else {
               // We should never encounter an exception. This likely represents
@@ -389,7 +388,7 @@
 
         for (let path of deletePaths) {
           try {
-            await OS.File.remove(path);
+            await IOUtils.remove(path);
           } catch (ex) {
             this._log.warn("Error removing event file (" + path + ")", ex);
           }
@@ -614,7 +613,7 @@
   // See docs/crash-events.rst for the file format specification.
   _processEventFile(entry) {
     return (async () => {
-      let data = await OS.File.read(entry.path);
+      let data = await IOUtils.read(entry.path);
       let store = await this._getStore();
 
       let decoder = new TextDecoder();
@@ -787,39 +786,25 @@
    */
   _getDirectoryEntries(path, re) {
     return (async function() {
-      try {
-        await OS.File.stat(path);
-      } catch (ex) {
-        if (!(ex instanceof OS.File.Error) || !ex.becauseNoSuchFile) {
-          throw ex;
-        }
-        return [];
-      }
-
-      let it = new OS.File.DirectoryIterator(path);
+      let children = await IOUtils.getChildren(path);
       let entries = [];
 
-      try {
-        await it.forEach((entry, index, it) => {
-          if (entry.isDir) {
-            return undefined;
-          }
-
-          let match = re.exec(entry.name);
-          if (!match) {
-            return undefined;
-          }
+      for (const entry of children) {
+        let stat = await IOUtils.stat(entry);
+        if (stat.type == "directory") {
+          continue;
+        }
 
-          return OS.File.stat(entry.path).then(info => {
-            entries.push({
-              path: entry.path,
-              id: match[1],
-              date: info.lastModificationDate,
-            });
-          });
+        let filename = PathUtils.filename(entry);
+        let match = re.exec(filename);
+        if (!match) {
+          continue;
+        }
+        entries.push({
+          path: entry,
+          id: match[1],
+          date: stat.lastModified,
         });
-      } finally {
-        it.close();
       }
 
       entries.sort((a, b) => {
@@ -838,9 +823,8 @@
     return (this._getStoreTask = (async () => {
       try {
         if (!this._store) {
-          await OS.File.makeDir(this._storeDir, {
-            ignoreExisting: true,
-            unixMode: OS.Constants.libc.S_IRWXU,
+          await IOUtils.makeDirectory(this._storeDir, {
+            permissions: 0o700,
           });
 
           let store = new CrashStore(
@@ -951,7 +935,7 @@
   this._storeDir = storeDir;
   this._telemetrySizeKey = telemetrySizeKey;
 
-  this._storePath = OS.Path.join(storeDir, "store.json.mozlz4");
+  this._storePath = PathUtils.join(storeDir, "store.json.mozlz4");
 
   // Holds the read data from disk.
   this._data = null;
@@ -991,7 +975,7 @@
 
       try {
         let decoder = new TextDecoder();
-        let data = await OS.File.read(this._storePath, { compression: "lz4" });
+        let data = await IOUtils.read(this._storePath, { decompress: true });
         data = JSON.parse(decoder.decode(data));
 
         if (data.corruptDate) {
@@ -1070,7 +1054,7 @@
         }
       } catch (ex) {
         // Missing files (first use) are allowed.
-        if (!(ex instanceof OS.File.Error) || !ex.becauseNoSuchFile) {
+        if (!(ex instanceof DOMException) || ex.name != "NotFoundError") {
           // If we can't load for any reason, mark a corrupt date in the instance
           // and swallow the error.
           //
@@ -1138,9 +1122,9 @@
 
       let encoder = new TextEncoder();
       let data = encoder.encode(JSON.stringify(normalized));
-      let size = await OS.File.writeAtomic(this._storePath, data, {
+      let size = await IOUtils.write(this._storePath, data, {
         tmpPath: this._storePath + ".tmp",
-        compression: "lz4",
+        compress: true,
       });
       if (this._telemetrySizeKey) {
         Services.telemetry.getHistogramById(this._telemetrySizeKey).add(size);
diff -Nru firefox-84.0.2+build1/toolkit/components/crashes/tests/xpcshell/test_crash_store.js firefox-85.0+build1/toolkit/components/crashes/tests/xpcshell/test_crash_store.js
--- firefox-84.0.2+build1/toolkit/components/crashes/tests/xpcshell/test_crash_store.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/crashes/tests/xpcshell/test_crash_store.js	2021-01-18 19:58:26.000000000 +0000
@@ -11,7 +11,6 @@
   "resource://gre/modules/CrashManager.jsm",
   null
 );
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
 
 const DUMMY_DATE = new Date(Date.now() - 10 * 24 * 60 * 60 * 1000);
 DUMMY_DATE.setMilliseconds(0);
@@ -39,9 +38,9 @@
 function getStore() {
   return (async function() {
     let storeDir = do_get_tempdir().path;
-    storeDir = OS.Path.join(storeDir, "store-" + STORE_DIR_COUNT++);
+    storeDir = PathUtils.join(storeDir, "store-" + STORE_DIR_COUNT++);
 
-    await OS.File.makeDir(storeDir, { unixMode: OS.Constants.libc.S_IRWXU });
+    await IOUtils.makeDirectory(storeDir, { permissions: 0o700 });
 
     let s = new CrashStore(storeDir);
     await s.load();
@@ -51,7 +50,7 @@
 }
 
 add_task(async function test_constructor() {
-  let s = new CrashStore("/some/path");
+  let s = new CrashStore(do_get_tempdir().path);
   Assert.ok(s instanceof CrashStore);
 });
 
@@ -120,7 +119,7 @@
   let s = await getStore();
 
   let buffer = new TextEncoder().encode("{bad: json-file");
-  await OS.File.writeAtomic(s._storePath, buffer, { compression: "lz4" });
+  await IOUtils.write(s._storePath, buffer, { compress: true });
 
   await s.load();
   Assert.ok(s.corruptDate, "Corrupt date is defined.");
diff -Nru firefox-84.0.2+build1/toolkit/components/downloads/DownloadHistory.jsm firefox-85.0+build1/toolkit/components/downloads/DownloadHistory.jsm
--- firefox-84.0.2+build1/toolkit/components/downloads/DownloadHistory.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/downloads/DownloadHistory.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -335,7 +335,6 @@
   onTitleChanged() {},
   onFrecencyChanged() {},
   onManyFrecenciesChanged() {},
-  onPageChanged() {},
   onDeleteVisits() {},
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/downloads/DownloadIntegration.jsm firefox-85.0+build1/toolkit/components/downloads/DownloadIntegration.jsm
--- firefox-84.0.2+build1/toolkit/components/downloads/DownloadIntegration.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/downloads/DownloadIntegration.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -1270,7 +1270,6 @@
   onTitleChanged() {},
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
-  onPageChanged() {},
   onDeleteVisits() {},
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/downloads/DownloadStore.jsm firefox-85.0+build1/toolkit/components/downloads/DownloadStore.jsm
--- firefox-84.0.2+build1/toolkit/components/downloads/DownloadStore.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/downloads/DownloadStore.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -168,7 +168,7 @@
       if (atLeastOneDownload) {
         // Create or overwrite the file if there are downloads to save.
         let bytes = gTextEncoder.encode(JSON.stringify(storeData));
-        await IOUtils.writeAtomic(this.path, bytes, {
+        await IOUtils.write(this.path, bytes, {
           tmpPath: this.path + ".tmp",
         });
       } else {
diff -Nru firefox-84.0.2+build1/toolkit/components/downloads/test/unit/test_DownloadStore.js firefox-85.0+build1/toolkit/components/downloads/test/unit/test_DownloadStore.js
--- firefox-84.0.2+build1/toolkit/components/downloads/test/unit/test_DownloadStore.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/downloads/test/unit/test_DownloadStore.js	2021-01-18 19:58:26.000000000 +0000
@@ -122,7 +122,7 @@
 add_task(async function test_save_empty() {
   let [, store] = await promiseNewListAndStore();
 
-  await IOUtils.writeAtomic(store.path, new Uint8Array());
+  await IOUtils.write(store.path, new Uint8Array());
 
   await store.save();
 
@@ -199,7 +199,7 @@
     filePathLiteral +
     "}]}";
 
-  await IOUtils.writeAtomic(store.path, new TextEncoder().encode(string), {
+  await IOUtils.write(store.path, new TextEncoder().encode(string), {
     tmpPath: store.path + ".tmp",
   });
 
@@ -240,7 +240,7 @@
     "}," +
     '"saver":{"type":"copy"}}]}';
 
-  await IOUtils.writeAtomic(store.path, new TextEncoder().encode(string), {
+  await IOUtils.write(store.path, new TextEncoder().encode(string), {
     tmpPath: store.path + ".tmp",
   });
 
@@ -264,7 +264,7 @@
     '{"list":[{"source":null,"target":null},' +
     '{"source":{"url":"about:blank"}}}';
 
-  await IOUtils.writeAtomic(store.path, new TextEncoder().encode(string), {
+  await IOUtils.write(store.path, new TextEncoder().encode(string), {
     tmpPath: store.path + ".tmp",
   });
 
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/child/ext-identity.js firefox-85.0+build1/toolkit/components/extensions/child/ext-identity.js
--- firefox-84.0.2+build1/toolkit/components/extensions/child/ext-identity.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/child/ext-identity.js	2021-01-18 19:58:26.000000000 +0000
@@ -49,6 +49,13 @@
           // Validate the url and retreive redirect_uri if it was provided.
           let url, redirectURI;
           let baseRedirectURL = this.getRedirectURL();
+
+          // Allow using loopback address for native OAuth flows as some
+          //  providers do not accept the URL provided by getRedirectURL.
+          // For more context, see bug 1635344.
+          let loopbackURL = `http://127.0.0.1/mozoauth2/${computeHash(
+            extension.id
+          )}`;
           try {
             url = new URL(details.url);
           } catch (e) {
@@ -58,7 +65,10 @@
             redirectURI = new URL(
               url.searchParams.get("redirect_uri") || baseRedirectURL
             );
-            if (!redirectURI.href.startsWith(baseRedirectURL)) {
+            if (
+              !redirectURI.href.startsWith(baseRedirectURL) &&
+              !redirectURI.href.startsWith(loopbackURL)
+            ) {
               return Promise.reject({ message: "redirect_uri not allowed" });
             }
           } catch (e) {
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/ext-browser-content.js firefox-85.0+build1/toolkit/components/extensions/ext-browser-content.js
--- firefox-84.0.2+build1/toolkit/components/extensions/ext-browser-content.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/ext-browser-content.js	2021-01-18 19:58:26.000000000 +0000
@@ -10,7 +10,6 @@
 XPCOMUtils.defineLazyModuleGetters(this, {
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   clearTimeout: "resource://gre/modules/Timer.jsm",
-  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
 });
@@ -336,9 +335,7 @@
   },
 
   shouldLoadURIInThisProcess(URI) {
-    let remoteSubframes = docShell.QueryInterface(Ci.nsILoadContext)
-      .useRemoteSubframes;
-    return E10SUtils.shouldLoadURIInThisProcess(URI, remoteSubframes);
+    return true;
   },
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/ExtensionCommon.jsm firefox-85.0+build1/toolkit/components/extensions/ExtensionCommon.jsm
--- firefox-84.0.2+build1/toolkit/components/extensions/ExtensionCommon.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/ExtensionCommon.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -2284,7 +2284,9 @@
 
     for (let [module, moduleEntry] of extension.persistentListeners) {
       let api = extension.apiManager.getAPI(module, extension, "addon_parent");
-      if (!api.primeListener) {
+      // If an extension is upgraded and a permission, such as webRequest, is
+      // removed, we will have been called but the API is no longer available.
+      if (!api?.primeListener) {
         // The runtime module no longer implements primed listeners, drop them.
         extension.persistentListeners.delete(module);
         EventManager._writePersistentListeners(extension);
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/Extension.jsm firefox-85.0+build1/toolkit/components/extensions/Extension.jsm
--- firefox-84.0.2+build1/toolkit/components/extensions/Extension.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/Extension.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -618,10 +618,24 @@
     });
   }
 
+  canCheckSignature() {
+    // ExtensionData instances can't check the signature because it is not yet
+    // available when XPIProvider does use it to load the extension manifest.
+    //
+    // This method will return true for the ExtensionData subclasses (like
+    // the Extension class) to enable the additional validation that would require
+    // the signature to be available (e.g. to check if the extension is allowed to
+    // use a privileged permission).
+    return this.constructor != ExtensionData;
+  }
+
   get restrictSchemes() {
-    // ExtensionData can't check the signature (as it is not yet passed to its constructor
-    // as it is for the Extension class, where this getter is overridden to check both the
-    // signature and the permissions).
+    // mozillaAddons permission is only allowed for privileged addons and
+    // filtered out if the extension isn't privileged.
+    // When the manifest is loaded by an explicit ExtensionData class
+    // instance, the signature data isn't available yet and this helper
+    // would always return false, but it will return true when appropriate
+    // (based on the isPrivileged boolean property) for the Extension class.
     return !this.hasPermission("mozillaAddons");
   }
 
@@ -995,6 +1009,18 @@
         } else if (type.api) {
           apiNames.add(type.api);
         } else if (type.invalid) {
+          if (!this.canCheckSignature() && PRIVILEGED_PERMS.has(perm)) {
+            // Do not emit the warning if the invalid permission is a privileged one
+            // and the current instance can't yet check for a valid signature
+            // (see Bug 1675858 and the inline comment inside the canCheckSignature
+            // method for more details).
+            //
+            // This parseManifest method will be called again on the Extension class
+            // instance, which will have the signature available and the invalid
+            // extension permission warnings will be collected and logged if necessary.
+            continue;
+          }
+
           this.manifestWarning(`Invalid extension permission: ${perm}`);
           continue;
         }
@@ -1844,18 +1870,19 @@
   }
 }
 
-class LangpackBootstrapScope {
+class LangpackBootstrapScope extends BootstrapScope {
   install(data, reason) {}
   uninstall(data, reason) {}
+  update(data, reason) {}
 
   startup(data, reason) {
     // eslint-disable-next-line no-use-before-define
     this.langpack = new Langpack(data);
-    return this.langpack.startup();
+    return this.langpack.startup(this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
   }
 
   shutdown(data, reason) {
-    this.langpack.shutdown();
+    this.langpack.shutdown(this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
     this.langpack = null;
   }
 }
@@ -2009,16 +2036,7 @@
     }
   }
 
-  get restrictSchemes() {
-    return !(this.isPrivileged && this.hasPermission("mozillaAddons"));
-  }
-
   // Some helpful properties added elsewhere:
-  /**
-   * An object used to map between extension-visible tab ids and
-   * native Tab object
-   * @property {TabManager} tabManager
-   */
 
   static getBootstrapScope() {
     return new BootstrapScope();
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/ExtensionSettingsStore.jsm firefox-85.0+build1/toolkit/components/extensions/ExtensionSettingsStore.jsm
--- firefox-84.0.2+build1/toolkit/components/extensions/ExtensionSettingsStore.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/ExtensionSettingsStore.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -182,6 +182,36 @@
   return { key, initialValue: keyInfo.initialValue };
 }
 
+/**
+ * Return an array of objects with properties for key, value, id, and enabled
+ * or an empty array if no settings have been stored for that key.
+ *
+ * @param {string} type
+ *        The type of setting to be retrieved.
+ * @param {string} key
+ *        A string that uniquely identifies the setting.
+ *
+ * @returns {array} an array of objects with properties for key, value, id, and enabled
+ */
+function getAllItems(type, key) {
+  ensureType(type);
+
+  let keyInfo = _store.data[type][key];
+  if (!keyInfo) {
+    return [];
+  }
+
+  let items = keyInfo.precedenceList;
+  return items
+    ? items.map(item => ({
+        key,
+        value: item.value,
+        id: item.id,
+        enabled: item.enabled,
+      }))
+    : [];
+}
+
 // Comparator used when sorting the precedence list.
 function precedenceComparator(a, b) {
   if (a.enabled && !b.enabled) {
@@ -536,6 +566,21 @@
   },
 
   /**
+   * Retrieves an array of objects representing extensions attempting to control the specified setting
+   * or an empty array if no settings have been stored for that key.
+   *
+   * @param {string} type
+   *        The type of setting to be retrieved.
+   * @param {string} key
+   *        A string that uniquely identifies the setting.
+   *
+   * @returns {array} an array of objects with properties for key, value, id, and enabled
+   */
+  getAllSettings(type, key) {
+    return getAllItems(type, key);
+  },
+
+  /**
    * Returns whether an extension currently has a stored setting for a given
    * key.
    *
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/jar.mn firefox-85.0+build1/toolkit/components/extensions/jar.mn
--- firefox-84.0.2+build1/toolkit/components/extensions/jar.mn	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/jar.mn	2021-01-18 19:58:26.000000000 +0000
@@ -11,6 +11,7 @@
     content/extensions/parent/ext-alarms.js (parent/ext-alarms.js)
     content/extensions/parent/ext-backgroundPage.js (parent/ext-backgroundPage.js)
     content/extensions/parent/ext-browserSettings.js (parent/ext-browserSettings.js)
+    content/extensions/parent/ext-browsingData.js (parent/ext-browsingData.js)
 #ifndef ANDROID
     content/extensions/parent/ext-captivePortal.js (parent/ext-captivePortal.js)
 #endif
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-browsingData.js firefox-85.0+build1/toolkit/components/extensions/parent/ext-browsingData.js
--- firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-browsingData.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/parent/ext-browsingData.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,416 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  LoginHelper: "resource://gre/modules/LoginHelper.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+  setTimeout: "resource://gre/modules/Timer.jsm",
+  ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
+  // This helper contains the platform-specific bits of browsingData.
+  BrowsingDataDelegate: "resource:///modules/ExtensionBrowsingData.jsm",
+});
+
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "quotaManagerService",
+  "@mozilla.org/dom/quota-manager-service;1",
+  "nsIQuotaManagerService"
+);
+
+/**
+ * A number of iterations after which to yield time back
+ * to the system.
+ */
+const YIELD_PERIOD = 10;
+
+/**
+ * Convert a Date object to a PRTime (microseconds).
+ *
+ * @param {Date} date
+ *        the Date object to convert.
+ * @returns {integer} microseconds from the epoch.
+ */
+const toPRTime = date => {
+  if (typeof date != "number" && date.constructor.name != "Date") {
+    throw new Error("Invalid value passed to toPRTime");
+  }
+  return date * 1000;
+};
+
+const makeRange = options => {
+  return options.since == null
+    ? null
+    : [toPRTime(options.since), toPRTime(Date.now())];
+};
+global.makeRange = makeRange;
+
+// General implementation for clearing data using Services.clearData.
+// Currently Sanitizer.items uses this under the hood.
+async function clearData(options, flags) {
+  if (options.hostnames) {
+    await Promise.all(
+      options.hostnames.map(
+        host =>
+          new Promise(resolve => {
+            // Set aIsUserRequest to true. This means when the ClearDataService
+            // "Cleaner" implementation doesn't support clearing by host
+            // it will delete all data instead.
+            // This is appropriate for cases like |cache|, which doesn't
+            // support clearing by a time range.
+            // In future when we use this for other data types, we have to
+            // evaluate if that behavior is still acceptable.
+            Services.clearData.deleteDataFromHost(host, true, flags, resolve);
+          })
+      )
+    );
+    return;
+  }
+
+  if (options.since) {
+    const range = makeRange(options);
+    await new Promise(resolve => {
+      Services.clearData.deleteDataInTimeRange(...range, true, flags, resolve);
+    });
+    return;
+  }
+
+  // Don't return the promise here and above to prevent leaking the resolved
+  // value.
+  await new Promise(resolve => Services.clearData.deleteData(flags, resolve));
+}
+
+const clearCache = options => {
+  return clearData(options, Ci.nsIClearDataService.CLEAR_ALL_CACHES);
+};
+
+const clearCookies = async function(options) {
+  let cookieMgr = Services.cookies;
+  // This code has been borrowed from Sanitizer.jsm.
+  let yieldCounter = 0;
+
+  if (options.since || options.hostnames || options.cookieStoreId) {
+    // Iterate through the cookies and delete any created after our cutoff.
+    let cookies = cookieMgr.cookies;
+    if (
+      !options.cookieStoreId ||
+      isPrivateCookieStoreId(options.cookieStoreId)
+    ) {
+      // By default nsICookieManager.cookies doesn't contain private cookies.
+      const privateCookies = cookieMgr.getCookiesWithOriginAttributes(
+        JSON.stringify({
+          privateBrowsingId: 1,
+        })
+      );
+      cookies = cookies.concat(privateCookies);
+    }
+    for (const cookie of cookies) {
+      if (
+        (!options.since || cookie.creationTime >= toPRTime(options.since)) &&
+        (!options.hostnames ||
+          options.hostnames.includes(cookie.host.replace(/^\./, ""))) &&
+        (!options.cookieStoreId ||
+          getCookieStoreIdForOriginAttributes(cookie.originAttributes) ===
+            options.cookieStoreId)
+      ) {
+        // This cookie was created after our cutoff, clear it.
+        cookieMgr.remove(
+          cookie.host,
+          cookie.name,
+          cookie.path,
+          cookie.originAttributes
+        );
+
+        if (++yieldCounter % YIELD_PERIOD == 0) {
+          await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long.
+        }
+      }
+    }
+  } else {
+    // Remove everything.
+    cookieMgr.removeAll();
+  }
+};
+
+// Ideally we could reuse the logic in Sanitizer.jsm or nsIClearDataService,
+// but this API exposes an ability to wipe data at a much finger granularity
+// than those APIs. (See also Bug 1531276)
+async function clearQuotaManager(options, dataType) {
+  // Can not clear localStorage/indexedDB in private browsing mode,
+  // just ignore.
+  if (options.cookieStoreId == PRIVATE_STORE) {
+    return;
+  }
+
+  let promises = [];
+  await new Promise((resolve, reject) => {
+    quotaManagerService.getUsage(request => {
+      if (request.resultCode != Cr.NS_OK) {
+        reject({ message: `Clear ${dataType} failed` });
+        return;
+      }
+
+      for (let item of request.result) {
+        let principal = Services.scriptSecurityManager.createContentPrincipalFromOrigin(
+          item.origin
+        );
+
+        // Consistently to removeIndexedDB and the API documentation for
+        // removeLocalStorage, we should only clear the data stored by
+        // regular websites, on the contrary we shouldn't clear data stored
+        // by browser components (like about:newtab) or other extensions.
+        if (!["http", "https", "file"].includes(principal.scheme)) {
+          continue;
+        }
+
+        let host = principal.hostPort;
+        if (
+          (!options.hostnames || options.hostnames.includes(host)) &&
+          (!options.cookieStoreId ||
+            getCookieStoreIdForOriginAttributes(principal.originAttributes) ===
+              options.cookieStoreId)
+        ) {
+          promises.push(
+            new Promise((resolve, reject) => {
+              let clearRequest;
+              if (dataType === "indexedDB") {
+                clearRequest = quotaManagerService.clearStoragesForPrincipal(
+                  principal,
+                  null,
+                  "idb"
+                );
+              } else {
+                clearRequest = quotaManagerService.clearStoragesForPrincipal(
+                  principal,
+                  "default",
+                  "ls"
+                );
+              }
+
+              clearRequest.callback = () => {
+                if (clearRequest.resultCode == Cr.NS_OK) {
+                  resolve();
+                } else {
+                  reject({ message: `Clear ${dataType} failed` });
+                }
+              };
+            })
+          );
+        }
+      }
+
+      resolve();
+    });
+  });
+
+  return Promise.all(promises);
+}
+
+const clearIndexedDB = async function(options) {
+  return clearQuotaManager(options, "indexedDB");
+};
+
+const clearLocalStorage = async function(options) {
+  if (options.since) {
+    return Promise.reject({
+      message: "Firefox does not support clearing localStorage with 'since'.",
+    });
+  }
+
+  // The legacy LocalStorage implementation that will eventually be removed
+  // depends on this observer notification.  Some other subsystems like
+  // Reporting headers depend on this too.
+  // When NextGenLocalStorage is enabled these notifications are ignored.
+  if (options.hostnames) {
+    for (let hostname of options.hostnames) {
+      Services.obs.notifyObservers(
+        null,
+        "extension:purge-localStorage",
+        hostname
+      );
+    }
+  } else {
+    Services.obs.notifyObservers(null, "extension:purge-localStorage");
+  }
+
+  if (Services.domStorageManager.nextGenLocalStorageEnabled) {
+    return clearQuotaManager(options, "localStorage");
+  }
+};
+
+const clearPasswords = async function(options) {
+  let yieldCounter = 0;
+
+  // Iterate through the logins and delete any updated after our cutoff.
+  for (let login of await LoginHelper.getAllUserFacingLogins()) {
+    login.QueryInterface(Ci.nsILoginMetaInfo);
+    if (!options.since || login.timePasswordChanged >= options.since) {
+      Services.logins.removeLogin(login);
+      if (++yieldCounter % YIELD_PERIOD == 0) {
+        await new Promise(resolve => setTimeout(resolve, 0)); // Don't block the main thread too long.
+      }
+    }
+  }
+};
+
+const clearServiceWorkers = options => {
+  if (!options.hostnames) {
+    return ServiceWorkerCleanUp.removeAll();
+  }
+
+  return Promise.all(
+    options.hostnames.map(host => {
+      return ServiceWorkerCleanUp.removeFromHost(host);
+    })
+  );
+};
+
+class BrowsingDataImpl {
+  constructor(extension) {
+    this.extension = extension;
+    // Some APIs cannot implement in a platform-independent way and they are
+    // delegated to a platform-specific delegate.
+    this.platformDelegate = new BrowsingDataDelegate(extension);
+  }
+
+  handleRemoval(dataType, options) {
+    // First, let's see if the platform implements this
+    let result = this.platformDelegate.handleRemoval(dataType, options);
+    if (result !== undefined) {
+      return result;
+    }
+
+    // ... if not, run the default behavior.
+    switch (dataType) {
+      case "cache":
+        return clearCache(options);
+      case "cookies":
+        return clearCookies(options);
+      case "indexedDB":
+        return clearIndexedDB(options);
+      case "localStorage":
+        return clearLocalStorage(options);
+      case "passwords":
+        return clearPasswords(options);
+      case "pluginData":
+        this.extension?.logger.warn(
+          "pluginData has been deprecated (along with Flash plugin support)"
+        );
+        return Promise.resolve();
+      case "serviceWorkers":
+        return clearServiceWorkers(options);
+      default:
+        return undefined;
+    }
+  }
+
+  doRemoval(options, dataToRemove) {
+    if (
+      options.originTypes &&
+      (options.originTypes.protectedWeb || options.originTypes.extension)
+    ) {
+      return Promise.reject({
+        message:
+          "Firefox does not support protectedWeb or extension as originTypes.",
+      });
+    }
+
+    if (options.cookieStoreId) {
+      const SUPPORTED_TYPES = ["cookies", "indexedDB"];
+      if (Services.domStorageManager.nextGenLocalStorageEnabled) {
+        // Only the next-gen storage supports removal by cookieStoreId.
+        SUPPORTED_TYPES.push("localStorage");
+      }
+
+      for (let dataType in dataToRemove) {
+        if (dataToRemove[dataType] && !SUPPORTED_TYPES.includes(dataType)) {
+          return Promise.reject({
+            message: `Firefox does not support clearing ${dataType} with 'cookieStoreId'.`,
+          });
+        }
+      }
+
+      if (
+        !isPrivateCookieStoreId(options.cookieStoreId) &&
+        !isDefaultCookieStoreId(options.cookieStoreId) &&
+        !getContainerForCookieStoreId(options.cookieStoreId)
+      ) {
+        return Promise.reject({
+          message: `Invalid cookieStoreId: ${options.cookieStoreId}`,
+        });
+      }
+    }
+
+    let removalPromises = [];
+    let invalidDataTypes = [];
+    for (let dataType in dataToRemove) {
+      if (dataToRemove[dataType]) {
+        let result = this.handleRemoval(dataType, options);
+        if (result === undefined) {
+          invalidDataTypes.push(dataType);
+        } else {
+          removalPromises.push(result);
+        }
+      }
+    }
+    if (invalidDataTypes.length) {
+      this.extension.logger.warn(
+        `Firefox does not support dataTypes: ${invalidDataTypes.toString()}.`
+      );
+    }
+    return Promise.all(removalPromises);
+  }
+
+  settings() {
+    return this.platformDelegate.settings();
+  }
+}
+
+this.browsingData = class extends ExtensionAPI {
+  getAPI(context) {
+    const impl = new BrowsingDataImpl(context.extension);
+    return {
+      browsingData: {
+        settings() {
+          return impl.settings();
+        },
+        remove(options, dataToRemove) {
+          return impl.doRemoval(options, dataToRemove);
+        },
+        removeCache(options) {
+          return impl.doRemoval(options, { cache: true });
+        },
+        removeCookies(options) {
+          return impl.doRemoval(options, { cookies: true });
+        },
+        removeDownloads(options) {
+          return impl.doRemoval(options, { downloads: true });
+        },
+        removeFormData(options) {
+          return impl.doRemoval(options, { formData: true });
+        },
+        removeHistory(options) {
+          return impl.doRemoval(options, { history: true });
+        },
+        removeIndexedDB(options) {
+          return impl.doRemoval(options, { indexedDB: true });
+        },
+        removeLocalStorage(options) {
+          return impl.doRemoval(options, { localStorage: true });
+        },
+        removePasswords(options) {
+          return impl.doRemoval(options, { passwords: true });
+        },
+        removePluginData(options) {
+          return impl.doRemoval(options, { pluginData: true });
+        },
+      },
+    };
+  }
+};
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-privacy.js firefox-85.0+build1/toolkit/components/extensions/parent/ext-privacy.js
--- firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-privacy.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/parent/ext-privacy.js	2021-01-18 19:58:26.000000000 +0000
@@ -8,18 +8,22 @@
 
 ChromeUtils.defineModuleGetter(
   this,
-  "Preferences",
-  "resource://gre/modules/Preferences.jsm"
+  "Services",
+  "resource://gre/modules/Services.jsm"
 );
 
 var { ExtensionPreferencesManager } = ChromeUtils.import(
   "resource://gre/modules/ExtensionPreferencesManager.jsm"
 );
+
 var { ExtensionError } = ExtensionUtils;
 var { getSettingsAPI } = ExtensionPreferencesManager;
 
 const cookieSvc = Ci.nsICookieService;
 
+const getIntPref = p => Services.prefs.getIntPref(p, undefined);
+const getBoolPref = p => Services.prefs.getBoolPref(p, undefined);
+
 const TLS_MIN_PREF = "security.tls.version.min";
 const TLS_MAX_PREF = "security.tls.version.max";
 
@@ -165,10 +169,10 @@
     // Intentionally use Preferences.get("network.cookie.cookieBehavior") here
     // to read the "real" preference value.
     const needUpdate =
-      cookieBehavior !== Preferences.get("network.cookie.cookieBehavior");
+      cookieBehavior !== getIntPref("network.cookie.cookieBehavior");
     if (
       needUpdate &&
-      Preferences.get("privacy.firstparty.isolate") &&
+      getBoolPref("privacy.firstparty.isolate") &&
       cookieBehavior === cookieSvc.BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN
     ) {
       throw new ExtensionError(
@@ -191,9 +195,9 @@
   setCallback(value) {
     // Intentionally use Preferences.get("network.cookie.cookieBehavior") here
     // to read the "real" preference value.
-    const cookieBehavior = Preferences.get("network.cookie.cookieBehavior");
+    const cookieBehavior = getIntPref("network.cookie.cookieBehavior");
 
-    const needUpdate = value !== Preferences.get("privacy.firstparty.isolate");
+    const needUpdate = value !== getBoolPref("privacy.firstparty.isolate");
     if (
       needUpdate &&
       value &&
@@ -300,8 +304,7 @@
 
     // If minimum has passed and it's greater than the max value.
     if (prefs[TLS_MIN_PREF]) {
-      const max =
-        prefs[TLS_MAX_PREF] || Services.prefs.getIntPref(TLS_MAX_PREF);
+      const max = prefs[TLS_MAX_PREF] || getIntPref(TLS_MAX_PREF);
       if (max < prefs[TLS_MIN_PREF]) {
         throw new ExtensionError(
           `Setting TLS min version grater than the max version is not allowed.`
@@ -311,7 +314,7 @@
 
     // If maximum has passed and it's lower than the min value.
     else if (prefs[TLS_MAX_PREF]) {
-      const min = Services.prefs.getIntPref(TLS_MIN_PREF);
+      const min = getIntPref(TLS_MIN_PREF);
       if (min > prefs[TLS_MAX_PREF]) {
         throw new ExtensionError(
           `Setting TLS max version lower than the min version is not allowed.`
@@ -333,11 +336,10 @@
             name: "network.networkPredictionEnabled",
             callback() {
               return (
-                Preferences.get("network.predictor.enabled") &&
-                Preferences.get("network.prefetch-next") &&
-                Preferences.get("network.http.speculative-parallel-limit") >
-                  0 &&
-                !Preferences.get("network.dns.disablePrefetch")
+                getBoolPref("network.predictor.enabled") &&
+                getBoolPref("network.prefetch-next") &&
+                getIntPref("network.http.speculative-parallel-limit") > 0 &&
+                !getBoolPref("network.dns.disablePrefetch")
               );
             },
           }),
@@ -345,10 +347,10 @@
             context,
             name: "network.httpsOnlyMode",
             callback() {
-              if (Preferences.get("dom.security.https_only_mode")) {
+              if (getBoolPref("dom.security.https_only_mode")) {
                 return "always";
               }
-              if (Preferences.get("dom.security.https_only_mode_pbm")) {
+              if (getBoolPref("dom.security.https_only_mode_pbm")) {
                 return "private_browsing";
               }
               return "never";
@@ -359,27 +361,25 @@
             context,
             name: "network.peerConnectionEnabled",
             callback() {
-              return Preferences.get("media.peerconnection.enabled");
+              return getBoolPref("media.peerconnection.enabled");
             },
           }),
           webRTCIPHandlingPolicy: getSettingsAPI({
             context,
             name: "network.webRTCIPHandlingPolicy",
             callback() {
-              if (Preferences.get("media.peerconnection.ice.proxy_only")) {
+              if (getBoolPref("media.peerconnection.ice.proxy_only")) {
                 return "proxy_only";
               }
 
-              let default_address_only = Preferences.get(
+              let default_address_only = getBoolPref(
                 "media.peerconnection.ice.default_address_only"
               );
               if (default_address_only) {
-                let no_host = Preferences.get(
-                  "media.peerconnection.ice.no_host"
-                );
+                let no_host = getBoolPref("media.peerconnection.ice.no_host");
                 if (no_host) {
                   if (
-                    Preferences.get(
+                    getBoolPref(
                       "media.peerconnection.ice.proxy_only_if_behind_proxy"
                     )
                   ) {
@@ -398,7 +398,7 @@
             name: "network.tlsVersionRestriction",
             callback() {
               function tlsVersionToString(pref) {
-                const value = Services.prefs.getIntPref(pref);
+                const value = getIntPref(pref);
                 const version = TLS_VERSIONS.find(a => a.version === value);
                 if (version) {
                   return version.name;
@@ -426,7 +426,7 @@
             context,
             name: "services.passwordSavingEnabled",
             callback() {
-              return Preferences.get("signon.rememberSignons");
+              return getBoolPref("signon.rememberSignons");
             },
           }),
         },
@@ -436,13 +436,13 @@
             context,
             name: "websites.cookieConfig",
             callback() {
-              let prefValue = Preferences.get("network.cookie.cookieBehavior");
+              let prefValue = getIntPref("network.cookie.cookieBehavior");
               return {
                 behavior: Array.from(cookieBehaviorValues.entries()).find(
                   entry => entry[1] === prefValue
                 )[0],
                 nonPersistentCookies:
-                  Preferences.get("network.cookie.lifetimePolicy") ===
+                  getIntPref("network.cookie.lifetimePolicy") ===
                   cookieSvc.ACCEPT_SESSION,
               };
             },
@@ -451,38 +451,38 @@
             context,
             name: "websites.firstPartyIsolate",
             callback() {
-              return Preferences.get("privacy.firstparty.isolate");
+              return getBoolPref("privacy.firstparty.isolate");
             },
           }),
           hyperlinkAuditingEnabled: getSettingsAPI({
             context,
             name: "websites.hyperlinkAuditingEnabled",
             callback() {
-              return Preferences.get("browser.send_pings");
+              return getBoolPref("browser.send_pings");
             },
           }),
           referrersEnabled: getSettingsAPI({
             context,
             name: "websites.referrersEnabled",
             callback() {
-              return Preferences.get("network.http.sendRefererHeader") !== 0;
+              return getIntPref("network.http.sendRefererHeader") !== 0;
             },
           }),
           resistFingerprinting: getSettingsAPI({
             context,
             name: "websites.resistFingerprinting",
             callback() {
-              return Preferences.get("privacy.resistFingerprinting");
+              return getBoolPref("privacy.resistFingerprinting");
             },
           }),
           trackingProtectionMode: getSettingsAPI({
             context,
             name: "websites.trackingProtectionMode",
             callback() {
-              if (Preferences.get("privacy.trackingprotection.enabled")) {
+              if (getBoolPref("privacy.trackingprotection.enabled")) {
                 return "always";
               } else if (
-                Preferences.get("privacy.trackingprotection.pbmode.enabled")
+                getBoolPref("privacy.trackingprotection.pbmode.enabled")
               ) {
                 return "private_browsing";
               }
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-storage.js firefox-85.0+build1/toolkit/components/extensions/parent/ext-storage.js
--- firefox-84.0.2+build1/toolkit/components/extensions/parent/ext-storage.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/parent/ext-storage.js	2021-01-18 19:58:26.000000000 +0000
@@ -26,7 +26,7 @@
   const EXCEPTION_MESSAGE =
     "The storage API will not work with a temporary addon ID. " +
     "Please add an explicit addon ID to your manifest. " +
-    "For more information see https://bugzil.la/1323228.";
+    "For more information see https://mzl.la/3lPk1aE.";
   if (AddonManagerPrivate.isTemporaryInstallID(extensionId)) {
     throw new ExtensionError(EXCEPTION_MESSAGE);
   }
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/schemas/browsing_data.json firefox-85.0+build1/toolkit/components/extensions/schemas/browsing_data.json
--- firefox-84.0.2+build1/toolkit/components/extensions/schemas/browsing_data.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/schemas/browsing_data.json	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,423 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+[
+  {
+    "namespace": "manifest",
+    "types": [
+      {
+        "$extend": "OptionalPermission",
+        "choices": [{
+          "type": "string",
+          "enum": [
+            "browsingData"
+          ]
+        }]
+      }
+    ]
+  },
+  {
+    "namespace": "browsingData",
+    "description": "Use the <code>chrome.browsingData</code> API to remove browsing data from a user's local profile.",
+    "permissions": ["browsingData"],
+    "types": [
+      {
+        "id": "RemovalOptions",
+        "type": "object",
+        "description": "Options that determine exactly what data will be removed.",
+        "properties": {
+          "since": {
+            "$ref": "extensionTypes.Date",
+            "optional": true,
+            "description": "Remove data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the <code>getTime</code> method of the JavaScript <code>Date</code> object). If absent, defaults to 0 (which would remove all browsing data)."
+          },
+          "hostnames": {
+            "type": "array",
+            "items": {"type": "string", "format": "hostname"},
+            "optional": true,
+            "description": "Only remove data associated with these hostnames (only applies to cookies and localStorage)."
+          },
+          "cookieStoreId": {
+            "type": "string",
+            "description": "Only remove data associated with this specific cookieStoreId.",
+            "optional": true
+          },
+          "originTypes": {
+            "type": "object",
+            "optional": true,
+            "description": "An object whose properties specify which origin types ought to be cleared. If this object isn't specified, it defaults to clearing only \"unprotected\" origins. Please ensure that you <em>really</em> want to remove application data before adding 'protectedWeb' or 'extensions'.",
+            "properties": {
+              "unprotectedWeb": {
+                "type": "boolean",
+                "optional": true,
+                "description": "Normal websites."
+              },
+              "protectedWeb": {
+                "type": "boolean",
+                "optional": true,
+                "description": "Websites that have been installed as hosted applications (be careful!)."
+              },
+              "extension": {
+                "type": "boolean",
+                "optional": true,
+                "description": "Extensions and packaged applications a user has installed (be _really_ careful!)."
+              }
+            }
+          }
+        }
+      },
+      {
+        "id": "DataTypeSet",
+        "type": "object",
+        "description": "A set of data types. Missing data types are interpreted as <code>false</code>.",
+        "properties": {
+          "cache": {
+            "type": "boolean",
+            "optional": true,
+            "description": "The browser's cache. Note: when removing data, this clears the <em>entire</em> cache: it is not limited to the range you specify."
+          },
+          "cookies": {
+            "type": "boolean",
+            "optional": true,
+            "description": "The browser's cookies."
+          },
+          "downloads": {
+            "type": "boolean",
+            "optional": true,
+            "description": "The browser's download list."
+          },
+          "formData": {
+            "type": "boolean",
+            "optional": true,
+            "description": "The browser's stored form data."
+          },
+          "history": {
+            "type": "boolean",
+            "optional": true,
+            "description": "The browser's history."
+          },
+          "indexedDB": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Websites' IndexedDB data."
+          },
+          "localStorage": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Websites' local storage data."
+          },
+          "serverBoundCertificates": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Server-bound certificates."
+          },
+          "passwords": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Stored passwords."
+          },
+          "pluginData": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Plugins' data."
+          },
+          "serviceWorkers": {
+            "type": "boolean",
+            "optional": true,
+            "description": "Service Workers."
+          }
+        }
+      }
+    ],
+    "functions": [
+      {
+        "name": "settings",
+        "description": "Reports which types of data are currently selected in the 'Clear browsing data' settings UI.  Note: some of the data types included in this API are not available in the settings UI, and some UI settings control more than one data type listed here.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "name": "callback",
+            "type": "function",
+            "parameters": [
+              {
+                "name": "result",
+                "type": "object",
+                "properties": {
+                  "options": {
+                    "$ref": "RemovalOptions"
+                  },
+                  "dataToRemove": {
+                    "$ref": "DataTypeSet",
+                    "description": "All of the types will be present in the result, with values of <code>true</code> if they are both selected to be removed and permitted to be removed, otherwise <code>false</code>."
+                  },
+                  "dataRemovalPermitted": {
+                    "$ref": "DataTypeSet",
+                    "description": "All of the types will be present in the result, with values of <code>true</code> if they are permitted to be removed (e.g., by enterprise policy) and <code>false</code> if not."
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "name": "remove",
+        "description": "Clears various types of browsing data stored in a user's profile.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "dataToRemove",
+            "$ref": "DataTypeSet",
+            "description": "The set of data types to remove."
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when deletion has completed.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeAppcache",
+        "description": "Clears websites' appcache data.",
+        "type": "function",
+        "async": "callback",
+        "unsupported": true,
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when websites' appcache data has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeCache",
+        "description": "Clears the browser's cache.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's cache has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeCookies",
+        "description": "Clears the browser's cookies and server-bound certificates modified within a particular timeframe.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's cookies and server-bound certificates have been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeDownloads",
+        "description": "Clears the browser's list of downloaded files (<em>not</em> the downloaded files themselves).",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's list of downloaded files has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeFileSystems",
+        "description": "Clears websites' file system data.",
+        "type": "function",
+        "async": "callback",
+        "unsupported": true,
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when websites' file systems have been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeFormData",
+        "description": "Clears the browser's stored form data (autofill).",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's form data has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeHistory",
+        "description": "Clears the browser's history.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's history has cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeIndexedDB",
+        "description": "Clears websites' IndexedDB data.",
+        "type": "function",
+        "async": "callback",
+        "unsupported": true,
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when websites' IndexedDB data has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeLocalStorage",
+        "description": "Clears websites' local storage data.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when websites' local storage has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removePluginData",
+        "description": "Clears plugins' data.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when plugins' data has been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removePasswords",
+        "description": "Clears the browser's stored passwords.",
+        "type": "function",
+        "async": "callback",
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when the browser's passwords have been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      },
+      {
+        "name": "removeWebSQL",
+        "description": "Clears websites' WebSQL data.",
+        "type": "function",
+        "async": "callback",
+        "unsupported": true,
+        "parameters": [
+          {
+            "$ref": "RemovalOptions",
+            "name": "options"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "description": "Called when websites' WebSQL databases have been cleared.",
+            "optional": true,
+            "parameters": []
+          }
+        ]
+      }
+    ]
+  }
+]
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/schemas/jar.mn firefox-85.0+build1/toolkit/components/extensions/schemas/jar.mn
--- firefox-84.0.2+build1/toolkit/components/extensions/schemas/jar.mn	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/schemas/jar.mn	2021-01-18 19:58:26.000000000 +0000
@@ -8,6 +8,7 @@
     content/extensions/schemas/alarms.json
     content/extensions/schemas/browser_action.json
     content/extensions/schemas/browser_settings.json
+    content/extensions/schemas/browsing_data.json
 #ifndef ANDROID
     content/extensions/schemas/captive_portal.json
 #endif
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml firefox-85.0+build1/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -7,7 +7,7 @@
 
 [dependencies]
 atomic_refcell = "0.1"
-cstr = "0.1"
+cstr = "0.2"
 golden_gate = { path = "../../../../../services/sync/golden_gate" }
 moz_task = { path = "../../../../../xpcom/rust/moz_task" }
 nserror = { path = "../../../../../xpcom/rust/nserror" }
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/file_indexedDB.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/file_indexedDB.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/file_indexedDB.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/file_indexedDB.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script>
+"use strict";
+
+const objectStoreName = "Objects";
+
+let test = {key: 0, value: "test"};
+
+let request = indexedDB.open("WebExtensionTest", 1);
+request.onupgradeneeded = event => {
+  let db = event.target.result;
+  let objectStore = db.createObjectStore(objectStoreName,
+                                         {autoIncrement: 0});
+  request = objectStore.add(test.value, test.key);
+  request.onsuccess = event => {
+    db.close();
+    window.postMessage("indexedDBCreated", "*");
+  };
+};
+    </script>
+  </head>
+  <body>
+    This is a test page.
+  </body>
+<html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/file_serviceWorker.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/file_serviceWorker.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/file_serviceWorker.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/file_serviceWorker.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <script>
+      "use strict";
+
+      navigator.serviceWorker.register("serviceWorker.js").then(() => {
+        window.postMessage("serviceWorkerRegistered", "*");
+      });
+    </script>
+  </head>
+  <body>
+    This is a test page.
+  </body>
+<html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/mochitest-common.ini firefox-85.0+build1/toolkit/components/extensions/test/mochitest/mochitest-common.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/mochitest-common.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/mochitest-common.ini	2021-01-18 19:58:26.000000000 +0000
@@ -15,6 +15,7 @@
   file_image_good.png
   file_image_great.png
   file_image_redirect.png
+  file_indexedDB.html
   file_mixed.html
   file_remote_frame.html
   file_sample.html
@@ -24,6 +25,7 @@
   file_script_good.js
   file_script_redirect.js
   file_script_xhr.js
+  file_serviceWorker.html
   file_simple_sandboxed_frame.html
   file_simple_sandboxed_subframe.html
   file_simple_xhr.html
@@ -56,6 +58,7 @@
   redirect_auto.sjs
   redirection.sjs
   return_headers.sjs
+  serviceWorker.js
   slow_response.sjs
   webrequest_worker.js
   !/dom/tests/mochitest/geolocation/network_geolocation.sjs
@@ -76,6 +79,11 @@
 [test_ext_background_canvas.html]
 [test_ext_background_page.html]
 skip-if = (toolkit == 'android') # android doesn't have devtools
+[test_ext_browsingData_indexedDB.html]
+[test_ext_browsingData_localStorage.html]
+[test_ext_browsingData_pluginData.html]
+[test_ext_browsingData_serviceWorkers.html]
+[test_ext_browsingData_settings.html]
 [test_ext_canvas_resistFingerprinting.html]
 [test_ext_clipboard.html]
 skip-if = os == 'android'
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_indexedDB.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_indexedDB.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_indexedDB.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_indexedDB.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,161 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test browsingData.remove indexedDB</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script src="head.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+add_task(async function testIndexedDB() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["privacy.userContext.enabled", true]],
+  });
+
+  async function background() {
+    const PAGE =
+      "/tests/toolkit/components/extensions/test/mochitest/file_indexedDB.html";
+
+    let tabs = [];
+
+    browser.test.onMessage.addListener(async msg => {
+      if (msg == "cleanup") {
+        await Promise.all(tabs.map(tabId => browser.tabs.remove(tabId)));
+        browser.test.sendMessage("done");
+        return;
+      }
+
+      await browser.browsingData.remove(msg, { indexedDB: true });
+      browser.test.sendMessage("indexedDBRemoved");
+    });
+
+    // Create two tabs.
+    let tab = await browser.tabs.create({ url: `http://mochi.test:8888${PAGE}` });
+    tabs.push(tab.id);
+
+    tab = await browser.tabs.create({ url: `http://example.com${PAGE}` });
+    tabs.push(tab.id);
+
+    // Create tab with cookieStoreId "firefox-container-1"
+    tab = await browser.tabs.create({ url: `http://example.net${PAGE}`, cookieStoreId: 'firefox-container-1' });
+    tabs.push(tab.id);
+  }
+
+  function contentScript() {
+    // eslint-disable-next-line mozilla/balanced-listeners
+    window.addEventListener(
+      "message",
+      msg => {
+        browser.test.sendMessage("indexedDBCreated");
+      },
+      true
+    );
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    background,
+    manifest: {
+      applications: { gecko: { id: "indexedDb@tests.mozilla.org" } },
+      permissions: ["browsingData", "tabs", "cookies"],
+      content_scripts: [
+        {
+          matches: [
+            "http://mochi.test/*/file_indexedDB.html",
+            "http://example.com/*/file_indexedDB.html",
+            "http://example.net/*/file_indexedDB.html",
+          ],
+          js: ["script.js"],
+          run_at: "document_start",
+        },
+      ],
+    },
+    files: {
+      "script.js": contentScript,
+    },
+  });
+
+  await extension.startup();
+
+  await extension.awaitMessage("indexedDBCreated");
+  await extension.awaitMessage("indexedDBCreated");
+  await extension.awaitMessage("indexedDBCreated");
+
+  function getUsage() {
+    return new Promise(resolve => {
+      let qms = SpecialPowers.Services.qms;
+      let cb = SpecialPowers.wrapCallback(request => resolve(request.result));
+      qms.getUsage(cb);
+    });
+  }
+
+  async function getOrigins() {
+    let origins = [];
+    let result = await getUsage();
+    for (let i = 0; i < result.length; ++i) {
+      if (result[i].usage === 0) {
+        continue;
+      }
+      if (
+        result[i].origin.startsWith("http://mochi.test") ||
+        result[i].origin.startsWith("http://example.com") ||
+        result[i].origin.startsWith("http://example.net")
+      ) {
+        origins.push(result[i].origin);
+      }
+    }
+    return origins.sort();
+  }
+
+  let origins = await getOrigins();
+  is(origins.length, 3, "IndexedDB databases have been populated.");
+
+  // Deleting private browsing mode data is silently ignored.
+  extension.sendMessage({ cookieStoreId: "firefox-private" });
+  await extension.awaitMessage("indexedDBRemoved");
+
+  origins = await getOrigins();
+  is(origins.length, 3, "All indexedDB remains after clearing firefox-private");
+
+  // Delete by hostname
+  extension.sendMessage({ hostnames: ["example.com"] });
+  await extension.awaitMessage("indexedDBRemoved");
+
+  origins = await getOrigins();
+  is(origins.length, 2, "IndexedDB data only for only two domains left");
+  ok(origins[0].startsWith("http://example.net"), "example.net not deleted");
+  ok(origins[1].startsWith("http://mochi.test"), "mochi.test not deleted");
+
+  // TODO: Bug 1643740
+  if (AppConstants.platform != "android") {
+    // Delete by cookieStoreId
+    extension.sendMessage({ cookieStoreId: "firefox-container-1" });
+    await extension.awaitMessage("indexedDBRemoved");
+
+    origins = await getOrigins();
+    is(origins.length, 1, "IndexedDB data only for only one domain");
+    ok(origins[0].startsWith("http://mochi.test"), "mochi.test not deleted");
+  }
+
+  // Delete all
+  extension.sendMessage({});
+  await extension.awaitMessage("indexedDBRemoved");
+
+  origins = await getOrigins();
+  is(origins.length, 0, "All IndexedDB data has been removed.");
+
+  await extension.sendMessage("cleanup");
+  await extension.awaitMessage("done");
+
+  await extension.unload();
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_localStorage.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_localStorage.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_localStorage.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_localStorage.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,322 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test browsingData.remove indexedDB</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script src="head.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+add_task(async function setup() {
+  // make sure userContext is enabled.
+  return SpecialPowers.pushPrefEnv({
+    set: [["privacy.userContext.enabled", true]],
+  });
+});
+
+add_task(async function testLocalStorage() {
+  async function background() {
+    function waitForTabs() {
+      return new Promise(resolve => {
+        let tabs = {};
+
+        let listener = async (msg, { tab }) => {
+          if (msg !== "content-script-ready") {
+            return;
+          }
+
+          tabs[tab.url] = tab;
+          if (Object.keys(tabs).length == 3) {
+            browser.runtime.onMessage.removeListener(listener);
+            resolve(tabs);
+          }
+        };
+        browser.runtime.onMessage.addListener(listener);
+      });
+    }
+
+    function sendMessageToTabs(tabs, message) {
+      return Promise.all(
+        Object.values(tabs).map(tab => {
+          return browser.tabs.sendMessage(tab.id, message);
+        })
+      );
+    }
+
+    let tabs = await waitForTabs();
+
+    browser.test.assertRejects(
+      browser.browsingData.removeLocalStorage({ since: Date.now() }),
+      "Firefox does not support clearing localStorage with 'since'.",
+      "Expected error received when using unimplemented parameter 'since'."
+    );
+
+    await sendMessageToTabs(tabs, "resetLocalStorage");
+    await browser.browsingData.removeLocalStorage({
+      hostnames: ["example.com"],
+    });
+    await browser.tabs.sendMessage(tabs["http://example.com/"].id, "checkLocalStorageCleared");
+    await browser.tabs.sendMessage(tabs["http://example.net/"].id, "checkLocalStorageSet");
+
+    if (
+      SpecialPowers.Services.domStorageManager.nextGenLocalStorageEnabled ===
+      false
+    ) {
+      // This assertion fails when localStorage is using the legacy
+      // implementation (See Bug 1595431).
+      browser.test.log("Skipped assertion on nextGenLocalStorageEnabled=false");
+    } else {
+      await browser.tabs.sendMessage(tabs["http://test1.example.com/"].id, "checkLocalStorageSet");
+    }
+
+    await sendMessageToTabs(tabs, "resetLocalStorage");
+    await sendMessageToTabs(tabs, "checkLocalStorageSet");
+    await browser.browsingData.removeLocalStorage({});
+    await sendMessageToTabs(tabs, "checkLocalStorageCleared");
+
+    await sendMessageToTabs(tabs, "resetLocalStorage");
+    await sendMessageToTabs(tabs, "checkLocalStorageSet");
+    await browser.browsingData.remove({}, { localStorage: true });
+    await sendMessageToTabs(tabs, "checkLocalStorageCleared");
+
+    // Can only delete cookieStoreId with LSNG enabled.
+    if (SpecialPowers.Services.domStorageManager.nextGenLocalStorageEnabled) {
+      await sendMessageToTabs(tabs, "resetLocalStorage");
+      await sendMessageToTabs(tabs, "checkLocalStorageSet");
+      await browser.browsingData.removeLocalStorage({
+        cookieStoreId: "firefox-container-1",
+      });
+      await browser.tabs.sendMessage(tabs["http://example.com/"].id, "checkLocalStorageSet");
+      await browser.tabs.sendMessage(tabs["http://example.net/"].id, "checkLocalStorageSet");
+
+      // TODO: containers support is lacking on GeckoView (Bug 1643740)
+      if (!navigator.userAgent.includes("Android")) {
+        await browser.tabs.sendMessage(tabs["http://test1.example.com/"].id, "checkLocalStorageCleared");
+      }
+
+      await sendMessageToTabs(tabs, "resetLocalStorage");
+      await sendMessageToTabs(tabs, "checkLocalStorageSet");
+      // Hostname doesn't match, so nothing cleared.
+      await browser.browsingData.removeLocalStorage({
+        cookieStoreId: "firefox-container-1",
+        hostnames: ["example.net"],
+      });
+      await sendMessageToTabs(tabs, "checkLocalStorageSet");
+
+      await sendMessageToTabs(tabs, "resetLocalStorage");
+      await sendMessageToTabs(tabs, "checkLocalStorageSet");
+      // Deleting private browsing mode data is silently ignored.
+      await browser.browsingData.removeLocalStorage({
+        cookieStoreId: "firefox-private",
+      });
+      await sendMessageToTabs(tabs, "checkLocalStorageSet");
+    } else {
+      await browser.test.assertRejects(
+        browser.browsingData.removeLocalStorage({
+          cookieStoreId: "firefox-container-1",
+        }),
+        "removeLocalStorage with cookieStoreId requires LSNG"
+      );
+    }
+
+    // Cleanup (checkLocalStorageCleared creates empty LS databases).
+    await browser.browsingData.removeLocalStorage({});
+
+    browser.test.notifyPass("done");
+  }
+
+  function contentScript() {
+    browser.runtime.onMessage.addListener(msg => {
+      if (msg === "resetLocalStorage") {
+        localStorage.clear();
+        localStorage.setItem("test", "test");
+      } else if (msg === "checkLocalStorageSet") {
+        browser.test.assertEq(
+          "test",
+          localStorage.getItem("test"),
+          `checkLocalStorageSet: ${location.href}`
+        );
+      } else if (msg === "checkLocalStorageCleared") {
+        browser.test.assertEq(
+          null,
+          localStorage.getItem("test"),
+          `checkLocalStorageCleared: ${location.href}`
+        );
+      }
+    });
+    browser.runtime.sendMessage("content-script-ready");
+  }
+
+  // This extension is responsible for opening tabs with a specified
+  // cookieStoreId, we use a separate extension to make sure that browsingData
+  // works without the cookies permission.
+  let openTabsExtension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      name: "Open tabs",
+      applications: { gecko: { id: "open-tabs@tests.mozilla.org" }, },
+      permissions: ["cookies"],
+    },
+    async background() {
+      const TABS = [
+        { url: "http://example.com" },
+        { url: "http://example.net" },
+        {
+          url: "http://test1.example.com",
+          cookieStoreId: 'firefox-container-1',
+        },
+      ];
+
+      function awaitLoad(tabId) {
+        return new Promise(resolve => {
+          browser.tabs.onUpdated.addListener(function listener(tabId_, changed, tab) {
+            if (tabId == tabId_ && changed.status == "complete") {
+              browser.tabs.onUpdated.removeListener(listener);
+              resolve();
+            }
+          });
+        });
+      }
+
+      let tabs = [];
+      let loaded = [];
+      for (let options of TABS) {
+        let tab = await browser.tabs.create(options);
+        loaded.push(awaitLoad(tab.id));
+        tabs.push(tab);
+      }
+
+      await Promise.all(loaded);
+
+      browser.test.onMessage.addListener(async msg => {
+        if (msg === "cleanup") {
+          const tabIds = tabs.map(tab => tab.id);
+          let removedTabs = 0;
+          browser.tabs.onRemoved.addListener(tabId => {
+            browser.test.log(`Removing tab ${tabId}.`);
+            if (tabIds.includes(tabId)) {
+              removedTabs++;
+              if (removedTabs == tabIds.length) {
+                browser.test.sendMessage("done");
+              }
+            }
+          });
+          await browser.tabs.remove(tabIds);
+        }
+      });
+    }
+  });
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    background,
+    manifest: {
+      name: "Test Extension",
+      applications: { gecko: { id: "localStorage@tests.mozilla.org" } },
+      permissions: ["browsingData", "tabs"],
+      content_scripts: [
+        {
+          matches: [
+            "http://example.com/",
+            "http://example.net/",
+            "http://test1.example.com/",
+          ],
+          js: ["content-script.js"],
+          run_at: "document_end",
+        },
+      ],
+    },
+    files: {
+      "content-script.js": contentScript,
+    },
+  });
+
+  await openTabsExtension.startup();
+
+  await extension.startup();
+  await extension.awaitFinish("done");
+  await extension.unload();
+
+  await openTabsExtension.sendMessage("cleanup");
+  await openTabsExtension.awaitMessage("done");
+  await openTabsExtension.unload();
+});
+
+// Verify that browsingData.removeLocalStorage doesn't break on data stored
+// in about:newtab or file principals.
+add_task(async function test_browserData_on_aboutnewtab_and_file_data() {
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    async background() {
+      await browser.browsingData.removeLocalStorage({}).catch(err => {
+        browser.test.fail(`${err} :: ${err.stack}`);
+      });
+      browser.test.sendMessage("done");
+    },
+    manifest: {
+      applications: { gecko: { id: "indexed-db-file@test.mozilla.org" } },
+      permissions: ["browsingData"],
+    },
+  });
+
+  await new Promise(resolve => {
+    const chromeScript = SpecialPowers.loadChromeScript(async () => {
+      const { SiteDataTestUtils } = ChromeUtils.import(
+        "resource://testing-common/SiteDataTestUtils.jsm"
+      );
+      await SiteDataTestUtils.addToIndexedDB("about:newtab");
+      await SiteDataTestUtils.addToIndexedDB("file:///fake/file");
+      // eslint-disable-next-line no-undef
+      sendAsyncMessage("done");
+    });
+
+    chromeScript.addMessageListener("done", () => {
+      chromeScript.destroy();
+      resolve();
+    });
+  });
+
+  await extension.startup();
+  await extension.awaitMessage("done");
+  await extension.unload();
+});
+
+add_task(async function test_browserData_should_not_remove_extension_data() {
+  if (!SpecialPowers.getBoolPref("dom.storage.next_gen")) {
+    // When LSNG isn't enabled, the browsingData API does still clear
+    // all the extensions localStorage if called without a list of specific
+    // origins to clear.
+    info("Test skipped because LSNG is currently disabled");
+    return;
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    async background() {
+      window.localStorage.setItem("key", "value");
+      await browser.browsingData.removeLocalStorage({}).catch(err => {
+        browser.test.fail(`${err} :: ${err.stack}`);
+      });
+      browser.test.sendMessage("done", window.localStorage.getItem("key"));
+    },
+    manifest: {
+      applications: { gecko: { id: "extension-data@tests.mozilla.org" } },
+      permissions: ["browsingData"],
+    },
+  });
+
+  await extension.startup();
+  const lsValue = await extension.awaitMessage("done");
+  is(lsValue, "value", "Got the expected localStorage data");
+  await extension.unload();
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_pluginData.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_pluginData.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_pluginData.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_pluginData.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,71 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test browsingData.remove indexedDB</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script src="head.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+// NB: Since plugins are disabled, there is never any data to clear.
+// We are really testing that these operations are no-ops.
+
+add_task(async function testPluginData() {
+  async function background() {
+    const REFERENCE_DATE = Date.now();
+    const TEST_CASES = [
+      // Clear plugin data with no since value.
+      {},
+      // Clear pluginData with recent since value.
+      { since: REFERENCE_DATE - 20000 },
+      // Clear pluginData with old since value.
+      { since: REFERENCE_DATE - 1000000 },
+      // Clear pluginData for specific hosts.
+      { hostnames: ["bar.com", "baz.com"] },
+      // Clear pluginData for no hosts.
+      { hostnames: [] },
+    ];
+
+    for (let method of ["removePluginData", "remove"]) {
+      for (let options of TEST_CASES) {
+        browser.test.log(`Testing ${method} with ${JSON.stringify(options)}`);
+        if (method == "removePluginData") {
+          await browser.browsingData.removePluginData(options);
+        } else {
+          await browser.browsingData.remove(options, { pluginData: true });
+        }
+      }
+    }
+
+    browser.test.sendMessage("done");
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    background,
+    manifest: {
+      applications: { gecko: { id: "remove-plugin@tests.mozilla.org" } },
+      permissions: ["tabs", "browsingData"],
+    },
+  });
+
+  await extension.startup();
+  await extension.awaitMessage("done");
+
+  // This test has no assertions because it's only meant to check that we don't
+  // throw when calling removePluginData and remove with pluginData: true.
+  ok(true, "dummy check");
+
+  await extension.unload();
+});
+</script>
+
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_serviceWorkers.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_serviceWorkers.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_serviceWorkers.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_serviceWorkers.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,141 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test browsingData.remove indexedDB</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script src="head.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+const { TestUtils } = SpecialPowers.Cu.import("resource://testing-common/TestUtils.jsm");
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.serviceWorkers.exemptFromPerDomainMax", true],
+      ["dom.serviceWorkers.enabled", true],
+      ["dom.serviceWorkers.testing.enabled", true],
+    ],
+  });
+});
+
+add_task(async function testServiceWorkers() {
+  async function background() {
+    const PAGE =
+      "/tests/toolkit/components/extensions/test/mochitest/file_serviceWorker.html";
+
+    browser.runtime.onMessage.addListener(msg => {
+      browser.test.sendMessage("serviceWorkerRegistered");
+    });
+
+    let tabs = [];
+
+    browser.test.onMessage.addListener(async msg => {
+      if (msg == "cleanup") {
+        await browser.tabs.remove(tabs.map(tab => tab.id));
+        browser.test.sendMessage("done");
+        return;
+      }
+
+      await browser.browsingData.remove(
+        { hostnames: msg.hostnames },
+        { serviceWorkers: true }
+      );
+      browser.test.sendMessage("serviceWorkersRemoved");
+    });
+
+    // Create two serviceWorkers.
+    let tab = await browser.tabs.create({ url: `http://mochi.test:8888${PAGE}` });
+    tabs.push(tab);
+
+    tab = await browser.tabs.create({ url: `http://example.com${PAGE}` });
+    tabs.push(tab);
+  }
+
+  function contentScript() {
+    // eslint-disable-next-line mozilla/balanced-listeners
+    window.addEventListener(
+      "message",
+      msg => {
+        if (msg.data == "serviceWorkerRegistered") {
+          browser.runtime.sendMessage("serviceWorkerRegistered");
+        }
+      },
+      true
+    );
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    background,
+    manifest: {
+      applications: { gecko: { id: "service-workers@tests.mozilla.org" } },
+      permissions: ["browsingData", "tabs"],
+      content_scripts: [
+        {
+          matches: [
+            "http://mochi.test/*/file_serviceWorker.html",
+            "http://example.com/*/file_serviceWorker.html",
+          ],
+          js: ["script.js"],
+          run_at: "document_start",
+        },
+      ],
+    },
+    files: {
+      "script.js": contentScript,
+    },
+  });
+
+  await extension.startup();
+  await extension.awaitMessage("serviceWorkerRegistered");
+  await extension.awaitMessage("serviceWorkerRegistered");
+
+  // Even though we await the registrations by waiting for the messages,
+  // sometimes the serviceWorkers are still not registered at this point.
+  async function getRegistrations(count) {
+    await TestUtils.waitForCondition(
+      async () => (await SpecialPowers.registeredServiceWorkers()).length === count,
+      `Wait for ${count} service workers to be registered`
+    );
+    return SpecialPowers.registeredServiceWorkers();
+  }
+
+  let serviceWorkers = await getRegistrations(2);
+  is(serviceWorkers.length, 2, "ServiceWorkers have been registered.");
+
+  extension.sendMessage({ hostnames: ["example.com"] });
+  await extension.awaitMessage("serviceWorkersRemoved");
+
+  serviceWorkers = await getRegistrations(1);
+  is(
+    serviceWorkers.length,
+    1,
+    "ServiceWorkers for example.com have been removed."
+  );
+
+  let { scriptSpec } = serviceWorkers[0];
+  dump(`Service worker spec: ${scriptSpec}`);
+  ok(scriptSpec.startsWith("http://mochi.test:8888/"),
+     "ServiceWorkers for example.com have been removed.");
+
+  extension.sendMessage({});
+  await extension.awaitMessage("serviceWorkersRemoved");
+
+  serviceWorkers = await getRegistrations(0);
+  is(serviceWorkers.length, 0, "All ServiceWorkers have been removed.");
+
+  extension.sendMessage("cleanup");
+  await extension.awaitMessage("done");
+  await extension.unload();
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_settings.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_settings.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_settings.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_browsingData_settings.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,67 @@
+<!-- Any copyright is dedicated to the Public Domain.
+   - http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test browsingData.settings</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+  <script src="head.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+const SETTINGS_LIST = [
+  "cache",
+  "cookies",
+  "history",
+  "formData",
+  "downloads",
+].sort();
+
+add_task(async function testSettings() {
+  async function background() {
+    browser.browsingData.settings().then(settings => {
+      browser.test.sendMessage("settings", settings);
+    });
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    background,
+    manifest: {
+      applications: { gecko: { id: "browsingData-settings@tests.mozilla.org" } },
+      permissions: ["browsingData"],
+    },
+  });
+
+  await extension.startup();
+  let settings = await extension.awaitMessage("settings");
+
+  // Verify that we get the keys back we expect.
+  isDeeply(
+    Object.entries(settings.dataToRemove)
+      .filter(([key, value]) => value)
+      .map(([key, value]) => key)
+      .sort(),
+    SETTINGS_LIST,
+    "dataToRemove contains expected properties."
+  );
+  isDeeply(
+    Object.entries(settings.dataRemovalPermitted)
+      .filter(([key, value]) => value)
+      .map(([key, value]) => key)
+      .sort(),
+    SETTINGS_LIST,
+    "dataToRemove contains expected properties."
+  );
+  is("since" in settings.options, true, "options contains |since|");
+
+  await extension.unload();
+});
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_identity.html firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_identity.html
--- firefox-84.0.2+build1/toolkit/components/extensions/test/mochitest/test_ext_identity.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/mochitest/test_ext_identity.html	2021-01-18 19:58:26.000000000 +0000
@@ -353,6 +353,37 @@
   await extension.awaitMessage("done");
   await extension.unload();
 });
+
+add_task(async function test_loopbackRedirectURI() {
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      applications: {
+        gecko: {
+          id: "identity@mozilla.org",
+        },
+      },
+      permissions: ["identity"],
+    },
+    async background() {
+      let redirectURL = "http://127.0.0.1/mozoauth2/35b64b676900f491c00e7f618d43f7040e88422e";
+      let actualRedirect = await browser.identity.launchWebAuthFlow({
+        interactive: true,
+        url: `https://example.com/tests/toolkit/components/extensions/test/mochitest/oauth.html?redirect_uri=${encodeURIComponent(redirectURL)}`
+      }).catch(error => {
+        browser.test.fail(error.message)
+      });
+      browser.test.assertTrue(
+        actualRedirect.startsWith(redirectURL),
+        "Expected redirect url to be loopback address"
+      )
+      browser.test.sendMessage("done");
+    },
+  });
+
+  await extension.startup();
+  await extension.awaitMessage("done");
+  await extension.unload();
+});
 </script>
 
 </body>
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/head_storage.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/head_storage.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/head_storage.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/head_storage.js	2021-01-18 19:58:26.000000000 +0000
@@ -688,7 +688,7 @@
       const EXCEPTION_MESSAGE =
         "The storage API is not available with a temporary addon ID. " +
         "Please add an explicit addon ID to your manifest. " +
-        "For more information see https://bugzil.la/1323228.";
+        "For more information see https://mzl.la/3lPk1aE.";
 
       await browser.test.assertRejects(
         browser.storage.sync.set({ foo: "bar" }),
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cache.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,456 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+/* eslint-disable mozilla/no-arbitrary-setTimeout */
+"use strict";
+
+const { SiteDataTestUtils } = ChromeUtils.import(
+  "resource://testing-common/SiteDataTestUtils.jsm"
+);
+
+const COOKIE = {
+  host: "example.com",
+  name: "test_cookie",
+  path: "/",
+};
+const COOKIE_NET = {
+  host: "example.net",
+  name: "test_cookie",
+  path: "/",
+};
+const COOKIE_ORG = {
+  host: "example.org",
+  name: "test_cookie",
+  path: "/",
+};
+let since, oldCookie;
+
+function addCookie(cookie) {
+  Services.cookies.add(
+    cookie.host,
+    cookie.path,
+    cookie.name,
+    "test",
+    false,
+    false,
+    false,
+    Date.now() / 1000 + 10000,
+    {},
+    Ci.nsICookie.SAMESITE_NONE,
+    Ci.nsICookie.SCHEME_HTTPS
+  );
+  ok(
+    Services.cookies.cookieExists(cookie.host, cookie.path, cookie.name, {}),
+    `Cookie ${cookie.name} was created.`
+  );
+}
+
+async function setUpCookies() {
+  Services.cookies.removeAll();
+
+  // Add a cookie which will end up with an older creationTime.
+  oldCookie = Object.assign({}, COOKIE, { name: Date.now() });
+  addCookie(oldCookie);
+  await new Promise(resolve => setTimeout(resolve, 10));
+  since = Date.now();
+  await new Promise(resolve => setTimeout(resolve, 10));
+
+  // Add a cookie which will end up with a more recent creationTime.
+  addCookie(COOKIE);
+
+  // Add cookies for different domains.
+  addCookie(COOKIE_NET);
+  addCookie(COOKIE_ORG);
+}
+
+async function setUpCache() {
+  Services.cache2.clear();
+
+  // Add cache entries for different domains.
+  for (const domain of ["example.net", "example.org", "example.com"]) {
+    await SiteDataTestUtils.addCacheEntry(`http://${domain}/`, "disk");
+    await SiteDataTestUtils.addCacheEntry(`http://${domain}/`, "memory");
+  }
+}
+
+function hasCacheEntry(domain) {
+  const disk = SiteDataTestUtils.hasCacheEntry(`http://${domain}/`, "disk");
+  const memory = SiteDataTestUtils.hasCacheEntry(`http://${domain}/`, "memory");
+
+  equal(
+    disk,
+    memory,
+    `For ${domain} either either both or neither caches need to exists.`
+  );
+  return disk;
+}
+
+add_task(async function testCache() {
+  function background() {
+    browser.test.onMessage.addListener(async msg => {
+      if (msg == "removeCache") {
+        await browser.browsingData.removeCache({});
+      } else {
+        await browser.browsingData.remove({}, { cache: true });
+      }
+      browser.test.sendMessage("cacheRemoved");
+    });
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    background,
+    manifest: {
+      permissions: ["browsingData"],
+    },
+  });
+
+  async function testRemovalMethod(method) {
+    await setUpCache();
+
+    extension.sendMessage(method);
+    await extension.awaitMessage("cacheRemoved");
+
+    ok(!hasCacheEntry("example.net"), "example.net cache was removed");
+    ok(!hasCacheEntry("example.org"), "example.org cache was removed");
+    ok(!hasCacheEntry("example.com"), "example.com cache was removed");
+  }
+
+  await extension.startup();
+
+  await testRemovalMethod("removeCache");
+  await testRemovalMethod("remove");
+
+  await extension.unload();
+});
+
+add_task(async function testCookies() {
+  // Above in setUpCookies we create an 'old' cookies, wait 10ms, then log a timestamp.
+  // Here we ask the browser to delete all cookies after the timestamp, with the intention
+  // that the 'old' cookie is not removed. The issue arises when the timer precision is
+  // low enough such that the timestamp that gets logged is the same as the 'old' cookie.
+  // We hardcode a precision value to ensure that there is time between the 'old' cookie
+  // and the timestamp generation.
+  Services.prefs.setBoolPref("privacy.reduceTimerPrecision", true);
+  Services.prefs.setIntPref(
+    "privacy.resistFingerprinting.reduceTimerPrecision.microseconds",
+    2000
+  );
+
+  registerCleanupFunction(function() {
+    Services.prefs.clearUserPref("privacy.reduceTimerPrecision");
+    Services.prefs.clearUserPref(
+      "privacy.resistFingerprinting.reduceTimerPrecision.microseconds"
+    );
+  });
+
+  function background() {
+    browser.test.onMessage.addListener(async (msg, options) => {
+      if (msg == "removeCookies") {
+        await browser.browsingData.removeCookies(options);
+      } else {
+        await browser.browsingData.remove(options, { cookies: true });
+      }
+      browser.test.sendMessage("cookiesRemoved");
+    });
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    background,
+    manifest: {
+      permissions: ["browsingData"],
+    },
+  });
+
+  async function testRemovalMethod(method) {
+    // Clear cookies with a recent since value.
+    await setUpCookies();
+    extension.sendMessage(method, { since });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(
+      Services.cookies.cookieExists(
+        oldCookie.host,
+        oldCookie.path,
+        oldCookie.name,
+        {}
+      ),
+      "Old cookie was not removed."
+    );
+    ok(
+      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+      "Recent cookie was removed."
+    );
+
+    // Clear cookies with an old since value.
+    await setUpCookies();
+    addCookie(COOKIE);
+    extension.sendMessage(method, { since: since - 100000 });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(
+      !Services.cookies.cookieExists(
+        oldCookie.host,
+        oldCookie.path,
+        oldCookie.name,
+        {}
+      ),
+      "Old cookie was removed."
+    );
+    ok(
+      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+      "Recent cookie was removed."
+    );
+
+    // Clear cookies with no since value and valid originTypes.
+    await setUpCookies();
+    extension.sendMessage(method, {
+      originTypes: { unprotectedWeb: true, protectedWeb: false },
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(
+      !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+      `Cookie ${COOKIE.name}  was removed.`
+    );
+    ok(
+      !Services.cookies.cookieExists(
+        oldCookie.host,
+        oldCookie.path,
+        oldCookie.name,
+        {}
+      ),
+      `Cookie ${oldCookie.name}  was removed.`
+    );
+  }
+
+  await extension.startup();
+
+  await testRemovalMethod("removeCookies");
+  await testRemovalMethod("remove");
+
+  await extension.unload();
+});
+
+add_task(async function testCacheAndCookies() {
+  function background() {
+    browser.test.onMessage.addListener(async options => {
+      await browser.browsingData.remove(options, {
+        cache: true,
+        cookies: true,
+      });
+      browser.test.sendMessage("cacheAndCookiesRemoved");
+    });
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    background,
+    manifest: {
+      permissions: ["browsingData"],
+    },
+  });
+
+  await extension.startup();
+
+  // Clear cache and cookies with a recent since value.
+  await setUpCookies();
+  await setUpCache();
+  extension.sendMessage({ since });
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  ok(
+    Services.cookies.cookieExists(
+      oldCookie.host,
+      oldCookie.path,
+      oldCookie.name,
+      {}
+    ),
+    "Old cookie was not removed."
+  );
+  ok(
+    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    "Recent cookie was removed."
+  );
+
+  // Cache does not support |since| and deletes everything!
+  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
+  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
+  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
+
+  // Clear cache and cookies with an old since value.
+  await setUpCookies();
+  await setUpCache();
+  extension.sendMessage({ since: since - 100000 });
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  // Cache does not support |since| and deletes everything!
+  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
+  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
+  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
+
+  ok(
+    !Services.cookies.cookieExists(
+      oldCookie.host,
+      oldCookie.path,
+      oldCookie.name,
+      {}
+    ),
+    "Old cookie was removed."
+  );
+  ok(
+    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    "Recent cookie was removed."
+  );
+
+  // Clear cache and cookies with hostnames value.
+  await setUpCookies();
+  await setUpCache();
+  extension.sendMessage({
+    hostnames: ["example.net", "example.org", "unknown.com"],
+  });
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  ok(
+    Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    `Cookie ${COOKIE.name}  was not removed.`
+  );
+  ok(
+    !Services.cookies.cookieExists(
+      COOKIE_NET.host,
+      COOKIE_NET.path,
+      COOKIE_NET.name,
+      {}
+    ),
+    `Cookie ${COOKIE_NET.name}  was removed.`
+  );
+  ok(
+    !Services.cookies.cookieExists(
+      COOKIE_ORG.host,
+      COOKIE_ORG.path,
+      COOKIE_ORG.name,
+      {}
+    ),
+    `Cookie ${COOKIE_ORG.name}  was removed.`
+  );
+
+  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
+  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
+  ok(hasCacheEntry("example.com"), "example.com cache was not removed");
+
+  // Clear cache and cookies with (empty) hostnames value.
+  await setUpCookies();
+  await setUpCache();
+  extension.sendMessage({ hostnames: [] });
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  ok(
+    Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    `Cookie ${COOKIE.name}  was not removed.`
+  );
+  ok(
+    Services.cookies.cookieExists(
+      COOKIE_NET.host,
+      COOKIE_NET.path,
+      COOKIE_NET.name,
+      {}
+    ),
+    `Cookie ${COOKIE_NET.name}  was not removed.`
+  );
+  ok(
+    Services.cookies.cookieExists(
+      COOKIE_ORG.host,
+      COOKIE_ORG.path,
+      COOKIE_ORG.name,
+      {}
+    ),
+    `Cookie ${COOKIE_ORG.name}  was not removed.`
+  );
+
+  ok(hasCacheEntry("example.net"), "example.net cache was not removed");
+  ok(hasCacheEntry("example.org"), "example.org cache was not removed");
+  ok(hasCacheEntry("example.com"), "example.com cache was not removed");
+
+  // Clear cache and cookies with both hostnames and since values.
+  await setUpCache();
+  await setUpCookies();
+  extension.sendMessage({ hostnames: ["example.com"], since });
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  ok(
+    Services.cookies.cookieExists(
+      oldCookie.host,
+      oldCookie.path,
+      oldCookie.name,
+      {}
+    ),
+    "Old cookie was not removed."
+  );
+  ok(
+    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    "Recent cookie was removed."
+  );
+  ok(
+    Services.cookies.cookieExists(
+      COOKIE_NET.host,
+      COOKIE_NET.path,
+      COOKIE_NET.name,
+      {}
+    ),
+    "Cookie with different hostname was not removed"
+  );
+  ok(
+    Services.cookies.cookieExists(
+      COOKIE_ORG.host,
+      COOKIE_ORG.path,
+      COOKIE_ORG.name,
+      {}
+    ),
+    "Cookie with different hostname was not removed"
+  );
+
+  ok(hasCacheEntry("example.net"), "example.net cache was not removed");
+  ok(hasCacheEntry("example.org"), "example.org cache was not removed");
+  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
+
+  // Clear cache and cookies with no since or hostnames value.
+  await setUpCache();
+  await setUpCookies();
+  extension.sendMessage({});
+  await extension.awaitMessage("cacheAndCookiesRemoved");
+
+  ok(
+    !Services.cookies.cookieExists(COOKIE.host, COOKIE.path, COOKIE.name, {}),
+    `Cookie ${COOKIE.name}  was removed.`
+  );
+  ok(
+    !Services.cookies.cookieExists(
+      oldCookie.host,
+      oldCookie.path,
+      oldCookie.name,
+      {}
+    ),
+    `Cookie ${oldCookie.name}  was removed.`
+  );
+  ok(
+    !Services.cookies.cookieExists(
+      COOKIE_NET.host,
+      COOKIE_NET.path,
+      COOKIE_NET.name,
+      {}
+    ),
+    `Cookie ${COOKIE_NET.name}  was removed.`
+  );
+  ok(
+    !Services.cookies.cookieExists(
+      COOKIE_ORG.host,
+      COOKIE_ORG.path,
+      COOKIE_ORG.name,
+      {}
+    ),
+    `Cookie ${COOKIE_ORG.name}  was removed.`
+  );
+
+  ok(!hasCacheEntry("example.net"), "example.net cache was removed");
+  ok(!hasCacheEntry("example.org"), "example.org cache was removed");
+  ok(!hasCacheEntry("example.com"), "example.com cache was removed");
+
+  await extension.unload();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData_cookies_cookieStoreId.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,192 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+/* eslint-disable mozilla/no-arbitrary-setTimeout */
+"use strict";
+
+// "Normal" cookie
+const COOKIE_NORMAL = {
+  host: "example.com",
+  name: "test_cookie",
+  path: "/",
+  originAttributes: {},
+};
+// Private browsing cookie
+const COOKIE_PRIVATE = {
+  host: "example.net",
+  name: "test_cookie",
+  path: "/",
+  originAttributes: {
+    privateBrowsingId: 1,
+  },
+};
+// "firefox-container-1" cookie
+const COOKIE_CONTAINER = {
+  host: "example.org",
+  name: "test_cookie",
+  path: "/",
+  originAttributes: {
+    userContextId: 1,
+  },
+};
+
+function cookieExists(cookie) {
+  return Services.cookies.cookieExists(
+    cookie.host,
+    cookie.path,
+    cookie.name,
+    cookie.originAttributes
+  );
+}
+
+function addCookie(cookie) {
+  const THE_FUTURE = Date.now() + 5 * 60;
+
+  Services.cookies.add(
+    cookie.host,
+    cookie.path,
+    cookie.name,
+    "test",
+    false,
+    false,
+    false,
+    THE_FUTURE,
+    cookie.originAttributes,
+    Ci.nsICookie.SAMESITE_NONE,
+    Ci.nsICookie.SCHEME_HTTPS
+  );
+
+  ok(cookieExists(cookie), `Cookie ${cookie.name} was created.`);
+}
+
+async function setUpCookies() {
+  Services.cookies.removeAll();
+
+  addCookie(COOKIE_NORMAL);
+  addCookie(COOKIE_PRIVATE);
+  addCookie(COOKIE_CONTAINER);
+}
+
+add_task(async function testCookies() {
+  Services.prefs.setBoolPref("privacy.userContext.enabled", true);
+
+  function background() {
+    browser.test.onMessage.addListener(async (msg, options) => {
+      if (msg == "removeCookies") {
+        await browser.browsingData.removeCookies(options);
+      } else {
+        await browser.browsingData.remove(options, { cookies: true });
+      }
+      browser.test.sendMessage("cookiesRemoved");
+    });
+  }
+
+  let extension = ExtensionTestUtils.loadExtension({
+    background,
+    manifest: {
+      permissions: ["browsingData"],
+    },
+  });
+
+  async function testRemovalMethod(method) {
+    // Clear only "normal"/default cookies.
+    await setUpCookies();
+
+    extension.sendMessage(method, { cookieStoreId: "firefox-default" });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(!cookieExists(COOKIE_NORMAL), "Normal cookie was removed");
+    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+
+    // Clear container cookie
+    await setUpCookies();
+
+    extension.sendMessage(method, { cookieStoreId: "firefox-container-1" });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
+    ok(!cookieExists(COOKIE_CONTAINER), "Container cookie was removed");
+
+    // Clear private cookie
+    await setUpCookies();
+
+    extension.sendMessage(method, { cookieStoreId: "firefox-private" });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+
+    // Clear container cookie with correct hostname
+    await setUpCookies();
+
+    extension.sendMessage(method, {
+      cookieStoreId: "firefox-container-1",
+      hostnames: ["example.org"],
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
+    ok(!cookieExists(COOKIE_CONTAINER), "Container cookie was removed");
+
+    // Clear container cookie with incorrect hostname; nothing is removed
+    await setUpCookies();
+
+    extension.sendMessage(method, {
+      cookieStoreId: "firefox-container-1",
+      hostnames: ["example.com"],
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+
+    // Clear private cookie with correct hostname
+    await setUpCookies();
+
+    extension.sendMessage(method, {
+      cookieStoreId: "firefox-private",
+      hostnames: ["example.net"],
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+
+    // Clear private cookie with incorrect hostname; nothing is removed
+    await setUpCookies();
+
+    extension.sendMessage(method, {
+      cookieStoreId: "firefox-private",
+      hostnames: ["example.com"],
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(cookieExists(COOKIE_PRIVATE), "Private cookie was not removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+
+    // Clear private cookie by hostname
+    await setUpCookies();
+
+    extension.sendMessage(method, {
+      hostnames: ["example.net"],
+    });
+    await extension.awaitMessage("cookiesRemoved");
+
+    ok(cookieExists(COOKIE_NORMAL), "Normal cookie was not removed");
+    ok(!cookieExists(COOKIE_PRIVATE), "Private cookie was removed");
+    ok(cookieExists(COOKIE_CONTAINER), "Container cookie was not removed");
+  }
+
+  await extension.startup();
+
+  await testRemovalMethod("removeCookies");
+  await testRemovalMethod("remove");
+
+  await extension.unload();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_browsingData.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,48 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+"use strict";
+
+add_task(async function testInvalidArguments() {
+  async function background() {
+    const UNSUPPORTED_DATA_TYPES = ["appcache", "fileSystems", "webSQL"];
+
+    await browser.test.assertRejects(
+      browser.browsingData.remove(
+        { originTypes: { protectedWeb: true } },
+        { cookies: true }
+      ),
+      "Firefox does not support protectedWeb or extension as originTypes.",
+      "Expected error received when using protectedWeb originType."
+    );
+
+    await browser.test.assertRejects(
+      browser.browsingData.removeCookies({ originTypes: { extension: true } }),
+      "Firefox does not support protectedWeb or extension as originTypes.",
+      "Expected error received when using extension originType."
+    );
+
+    for (let dataType of UNSUPPORTED_DATA_TYPES) {
+      let dataTypes = {};
+      dataTypes[dataType] = true;
+      browser.test.assertThrows(
+        () => browser.browsingData.remove({}, dataTypes),
+        /Type error for parameter dataToRemove/,
+        `Expected error received when using ${dataType} dataType.`
+      );
+    }
+
+    browser.test.notifyPass("invalidArguments");
+  }
+
+  let extensionData = {
+    background: background,
+    manifest: {
+      permissions: ["browsingData"],
+    },
+  };
+
+  let extension = ExtensionTestUtils.loadExtension(extensionData);
+  await extension.startup();
+  await extension.awaitFinish("invalidArguments");
+  await extension.unload();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_extensionSettingsStore.js	2021-01-18 19:58:26.000000000 +0000
@@ -1009,3 +1009,81 @@
     "addSetting rejects with a callback that is not a function."
   );
 });
+
+add_task(async function test_get_all_settings() {
+  await promiseStartupManager();
+
+  let testExtensions = [
+    ExtensionTestUtils.loadExtension({
+      useAddonManager: "temporary",
+      manifest: {
+        applications: { gecko: { id: "@first" } },
+      },
+    }),
+    ExtensionTestUtils.loadExtension({
+      useAddonManager: "temporary",
+      manifest: {
+        applications: { gecko: { id: "@second" } },
+      },
+    }),
+  ];
+
+  for (let extension of testExtensions) {
+    await extension.startup();
+  }
+
+  await ExtensionSettingsStore.initialize();
+
+  let items = ExtensionSettingsStore.getAllSettings("foo", "bar");
+  equal(items.length, 0, "There are no addons controlling this setting yet");
+
+  await ExtensionSettingsStore.addSetting(
+    "@first",
+    "foo",
+    "bar",
+    "set",
+    () => "not set"
+  );
+
+  items = ExtensionSettingsStore.getAllSettings("foo", "bar");
+  equal(items.length, 1, "The add-on setting has 1 addon trying to control it");
+
+  await ExtensionSettingsStore.addSetting(
+    "@second",
+    "foo",
+    "bar",
+    "setting",
+    () => "not set"
+  );
+
+  let item = ExtensionSettingsStore.getSetting("foo", "bar");
+  equal(item.id, "@second", "The second add-on is in control");
+  equal(item.value, "setting", "The second value is set");
+
+  items = ExtensionSettingsStore.getAllSettings("foo", "bar");
+  equal(
+    items.length,
+    2,
+    "The add-on setting has 2 addons trying to control it"
+  );
+
+  await ExtensionSettingsStore.removeSetting("@first", "foo", "bar");
+
+  items = ExtensionSettingsStore.getAllSettings("foo", "bar");
+  equal(items.length, 1, "There is only 1 addon controlling this setting");
+
+  await ExtensionSettingsStore.removeSetting("@second", "foo", "bar");
+
+  items = ExtensionSettingsStore.getAllSettings("foo", "bar");
+  equal(
+    items.length,
+    0,
+    "There is no longer any addon controlling this setting"
+  );
+
+  for (let extension of testExtensions) {
+    await extension.unload();
+  }
+
+  await promiseShutdownManager();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_permission_warnings.js	2021-01-18 19:58:26.000000000 +0000
@@ -16,13 +16,22 @@
 }
 const DUMMY_APP_NAME = "Dummy brandName";
 
+const { createAppInfo } = AddonTestUtils;
+
+AddonTestUtils.init(this);
+AddonTestUtils.overrideCertDB();
+AddonTestUtils.usePrivilegedSignatures = id => id.startsWith("privileged");
+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "42");
+
 async function getManifestPermissions(extensionData) {
   let extension = ExtensionTestCommon.generate(extensionData);
   // Some tests contain invalid permissions; ignore the warnings about their invalidity.
   ExtensionTestUtils.failOnSchemaWarnings(false);
   await extension.loadManifest();
   ExtensionTestUtils.failOnSchemaWarnings(true);
-  return extension.manifestPermissions;
+  const { manifestPermissions } = extension;
+  await extension.cleanupGeneratedFile();
+  return manifestPermissions;
 }
 
 function getPermissionWarnings(manifestPermissions, options) {
@@ -570,3 +579,76 @@
     "resource:-scheme is unsupported for unprivileged extensions"
   );
 });
+
+// Tests that invalid permission warning for privileged permissions requested
+// without the privilged signature are emitted by the Extension class instance
+// but not for the ExtensionData instances (on which the signature is not
+// available and the warning would be emitted even for the ones signed correctly).
+add_task(
+  async function test_invalid_permission_warning_on_privileged_permission() {
+    await AddonTestUtils.promiseStartupManager();
+
+    async function testInvalidPermissionWarning({ isPrivileged }) {
+      let id = isPrivileged
+        ? "privileged-addon@mochi.test"
+        : "nonprivileged-addon@mochi.test";
+
+      let expectedWarnings = isPrivileged
+        ? []
+        : ["Reading manifest: Invalid extension permission: mozillaAddons"];
+
+      const ext = ExtensionTestUtils.loadExtension({
+        useAddonManager: "permanent",
+        manifest: {
+          permissions: ["mozillaAddons"],
+          applications: { gecko: { id } },
+        },
+        background() {},
+      });
+
+      await ext.startup();
+      const { warnings } = ext.extension;
+      Assert.deepEqual(
+        warnings,
+        expectedWarnings,
+        `Got the expected warning for ${id}`
+      );
+      await ext.unload();
+    }
+
+    await testInvalidPermissionWarning({ isPrivileged: false });
+    await testInvalidPermissionWarning({ isPrivileged: true });
+
+    info("Test invalid permission warning on ExtensionData instance");
+    // Generate an extension (just to be able to reuse its rootURI for the
+    // ExtensionData instance created below).
+    let generatedExt = ExtensionTestCommon.generate({
+      manifest: {
+        permissions: ["mozillaAddons"],
+        applications: { gecko: { id: "extension-data@mochi.test" } },
+      },
+    });
+
+    // Verify that XPIInstall.jsm will not collect the warning for the
+    // privileged permission as expected.
+    const extData = new ExtensionData(generatedExt.rootURI);
+    await extData.loadManifest();
+    Assert.deepEqual(
+      extData.warnings,
+      [],
+      "No warnings for mozillaAddons permission collected for the ExtensionData instance"
+    );
+
+    // This assertion is just meant to prevent the test to pass if there were no warnings
+    // because some errors prevented the warnings to be collected).
+    Assert.deepEqual(
+      extData.errors,
+      [],
+      "No errors collected by the ExtensionData instance"
+    );
+    // Cleanup the generated xpi file.
+    await generatedExt.cleanupGeneratedFile();
+
+    await AddonTestUtils.promiseShutdownManager();
+  }
+);
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_startup_cache.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_startup_cache.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_startup_cache.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_startup_cache.js	2021-01-18 19:58:26.000000000 +0000
@@ -2,17 +2,24 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
+const { AddonManager } = ChromeUtils.import(
+  "resource://gre/modules/AddonManager.jsm"
+);
 const { Preferences } = ChromeUtils.import(
   "resource://gre/modules/Preferences.jsm"
 );
 
+const { TestUtils } = ChromeUtils.import(
+  "resource://testing-common/TestUtils.jsm"
+);
+
 AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();
 
 AddonTestUtils.createAppInfo(
   "xpcshell@tests.mozilla.org",
   "XPCShell",
-  "1",
+  "42",
   "42"
 );
 
@@ -65,6 +72,41 @@
   Preferences.set("extensions.logging.enabled", false);
   await AddonTestUtils.promiseStartupManager();
 
+  // Install langpacks to get proper locale startup.
+  let langpack = {
+    "manifest.json": {
+      name: "test Language Pack",
+      version: "1.0",
+      manifest_version: 2,
+      applications: {
+        gecko: {
+          id: "@test-langpack",
+          strict_min_version: "42.0",
+          strict_max_version: "42.0",
+        },
+      },
+      langpack_id: "fr",
+      languages: {
+        fr: {
+          chrome_resources: {
+            global: "chrome/fr/locale/fr/global/",
+          },
+          version: "20171001190118",
+        },
+      },
+      sources: {
+        browser: {
+          base_path: "browser/",
+        },
+      },
+    },
+  };
+
+  let [, { addon }] = await Promise.all([
+    TestUtils.topicObserved("webextension-langpack-startup"),
+    AddonTestUtils.promiseInstallXPI(langpack),
+  ]);
+
   let extension = ExtensionTestUtils.loadExtension(
     makeExtension({ version: "1.0" })
   );
@@ -80,7 +122,7 @@
   //
   // In the future, we should provide some way for tests to decouple their
   // language selection from that of Firefox.
-  Services.locale.availableLocales = ["en-US", "fr", "jp"];
+  ok(Services.locale.availableLocales.includes("fr"), "fr locale is avialable");
 
   await extension.startup();
 
@@ -121,5 +163,10 @@
   manifest = await getManifest();
   equal(manifest.name, "en-US 1.1", "Got expected manifest name");
 
+  info("uninstall locale 'fr'");
+  addon = await AddonManager.getAddonByID("@test-langpack");
+  await addon.uninstall();
+  ok(!Services.locale.availableLocales.includes("fr"), "fr locale is removed");
+
   await extension.unload();
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup.js	2021-01-18 19:58:26.000000000 +0000
@@ -1,12 +1,22 @@
 "use strict";
 
+// Delay loading until createAppInfo is called and setup.
+ChromeUtils.defineModuleGetter(
+  this,
+  "AddonManager",
+  "resource://gre/modules/AddonManager.jsm"
+);
+
 AddonTestUtils.init(this);
 AddonTestUtils.overrideCertDB();
+
+// The app and platform version here should be >= of the version set in the extensions.webExtensionsMinPlatformVersion preference,
+// otherwise test_persistent_listener_after_staged_update will fail because no compatible updates will be found.
 AddonTestUtils.createAppInfo(
   "xpcshell@tests.mozilla.org",
   "XPCShell",
-  "1",
-  "43"
+  "42",
+  "42"
 );
 
 let {
@@ -18,6 +28,9 @@
 const server = createHttpServer({ hosts: ["example.com"] });
 server.registerDirectory("/data/", do_get_file("data"));
 
+let scopes = AddonManager.SCOPE_PROFILE | AddonManager.SCOPE_APPLICATION;
+Services.prefs.setIntPref("extensions.enabledScopes", scopes);
+
 Services.prefs.setBoolPref(
   "extensions.webextensions.background-delayed-startup",
   true
@@ -32,6 +45,33 @@
   return events;
 }
 
+async function testPersistentRequestStartup(extension, events, expect) {
+  equal(
+    events.get("background-page-event"),
+    expect.background,
+    "Should have gotten a background page event"
+  );
+  equal(
+    events.get("start-background-page"),
+    false,
+    "Background page should not be started"
+  );
+
+  Services.obs.notifyObservers(null, "browser-delayed-startup-finished");
+  await ExtensionParent.browserPaintedPromise;
+
+  equal(
+    events.get("start-background-page"),
+    expect.delayedStart,
+    "Should have gotten start-background-page event"
+  );
+
+  if (expect.request) {
+    await extension.awaitMessage("got-request");
+    ok(true, "Background page loaded and received webRequest event");
+  }
+}
+
 // Test that a non-blocking listener during startup does not immediately
 // start the background page, but the event is queued until the background
 // page is started.
@@ -47,7 +87,7 @@
     background() {
       browser.webRequest.onBeforeRequest.addListener(
         details => {
-          browser.test.sendMessage("saw-request");
+          browser.test.sendMessage("got-request");
         },
         { urls: ["http://example.com/data/file_sample.html"] }
       );
@@ -66,28 +106,11 @@
     "http://example.com/data/file_sample.html"
   );
 
-  equal(
-    events.get("background-page-event"),
-    true,
-    "Should have gotten a background page event"
-  );
-  equal(
-    events.get("start-background-page"),
-    false,
-    "Background page should not be started"
-  );
-
-  Services.obs.notifyObservers(null, "browser-delayed-startup-finished");
-  await new Promise(executeSoon);
-
-  equal(
-    events.get("start-background-page"),
-    true,
-    "Should have gotten start-background-page event"
-  );
-
-  await extension.awaitMessage("saw-request");
-  ok(true, "Background page loaded and received webRequest event");
+  await testPersistentRequestStartup(extension, events, {
+    background: true,
+    delayedStart: true,
+    request: true,
+  });
 
   await extension.unload();
 
@@ -136,83 +159,444 @@
     "http://example.com/data/file_sample.html"
   );
 
-  equal(
-    events.get("background-page-event"),
-    false,
-    "Should not have gotten a background page event"
+  await testPersistentRequestStartup(extension, events, {
+    background: false,
+    delayedStart: false,
+    request: false,
+  });
+
+  Services.obs.notifyObservers(null, "sessionstore-windows-restored");
+  await extension.awaitMessage("ready");
+
+  await extension.unload();
+  await promiseShutdownManager();
+});
+
+// Tests that moving permission to optional retains permission and that the
+// persistent listeners are used as expected.
+add_task(async function test_persistent_listener_after_sideload_upgrade() {
+  let id = "permission-sideload-upgrade@test";
+  let extensionData = {
+    useAddonManager: "permanent",
+    manifest: {
+      version: "1.0",
+      applications: { gecko: { id } },
+      permissions: ["webRequest", "http://example.com/"],
+    },
+
+    background() {
+      browser.webRequest.onBeforeRequest.addListener(
+        details => {
+          browser.test.sendMessage("got-request");
+        },
+        { urls: ["http://example.com/data/file_sample.html"] }
+      );
+    },
+  };
+  let xpi = AddonTestUtils.createTempWebExtensionFile(extensionData);
+
+  let extension = ExtensionTestUtils.expectExtension(id);
+  await AddonTestUtils.manuallyInstall(xpi);
+  await promiseStartupManager();
+  await extension.awaitStartup();
+
+  await ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
   );
+  await extension.awaitMessage("got-request");
 
-  Services.obs.notifyObservers(null, "browser-delayed-startup-finished");
-  await new Promise(executeSoon);
+  await promiseShutdownManager();
 
-  equal(
-    events.get("start-background-page"),
-    false,
-    "Should not have tried to start background page yet"
+  // Prepare a sideload update for the extension.
+  extensionData.manifest.version = "2.0";
+  extensionData.manifest.permissions = ["http://example.com/"];
+  extensionData.manifest.optional_permissions = ["webRequest"];
+  xpi = AddonTestUtils.createTempWebExtensionFile(extensionData);
+  await AddonTestUtils.manuallyInstall(xpi);
+
+  ExtensionParent._resetStartupPromises();
+  await promiseStartupManager();
+  await extension.awaitStartup();
+  let events = trackEvents(extension);
+
+  // Verify webRequest permission.
+  let policy = WebExtensionPolicy.getByID(id);
+  ok(policy.hasPermission("webRequest"), "addon webRequest permission added");
+
+  await ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
   );
 
-  Services.obs.notifyObservers(null, "sessionstore-windows-restored");
-  await extension.awaitMessage("ready");
+  await testPersistentRequestStartup(extension, events, {
+    background: true,
+    delayedStart: true,
+    request: true,
+  });
 
   await extension.unload();
   await promiseShutdownManager();
 });
 
-// Test that a blocking listener that uses filterResponseData() works
-// properly (i.e., that the delayed call to registerTraceableChannel
-// works properly).
-add_task(async function test_3() {
-  const DATA = `<!DOCTYPE html>
-<html>
-<body>
-  <h1>This is a modified page</h1>
-</body>
-</html>`;
-
-  function background(data) {
-    browser.webRequest.onBeforeRequest.addListener(
-      details => {
-        let filter = browser.webRequest.filterResponseData(details.requestId);
-        filter.onstop = () => {
-          let encoded = new TextEncoder("utf-8").encode(data);
-          filter.write(encoded);
-          filter.close();
-        };
+// Utility to install builtin addon
+async function installBuiltinExtension(extensionData) {
+  let xpi = await AddonTestUtils.createTempWebExtensionFile(extensionData);
+
+  // The built-in location requires a resource: URL that maps to a
+  // jar: or file: URL.  This would typically be something bundled
+  // into omni.ja but for testing we just use a temp file.
+  let base = Services.io.newURI(`jar:file:${xpi.path}!/`);
+  let resProto = Services.io
+    .getProtocolHandler("resource")
+    .QueryInterface(Ci.nsIResProtocolHandler);
+  resProto.setSubstitution("ext-test", base);
+  return AddonManager.installBuiltinAddon("resource://ext-test/");
+}
+
+function promisePostponeInstall(install) {
+  return new Promise((resolve, reject) => {
+    let listener = {
+      onInstallFailed: () => {
+        install.removeListener(listener);
+        reject(new Error("extension installation should not have failed"));
+      },
+      onInstallEnded: () => {
+        install.removeListener(listener);
+        reject(
+          new Error(
+            `extension installation should not have ended for ${install.addon.id}`
+          )
+        );
+      },
+      onInstallPostponed: () => {
+        install.removeListener(listener);
+        resolve();
+      },
+    };
+
+    install.addListener(listener);
+    install.install();
+  });
+}
+
+// Tests that moving permission to optional retains permission and that the
+// persistent listeners are used as expected.
+add_task(
+  async function test_persistent_listener_after_builtin_location_upgrade() {
+    let id = "permission-builtin-upgrade@test";
+    let extensionData = {
+      useAddonManager: "permanent",
+      manifest: {
+        version: "1.0",
+        applications: { gecko: { id } },
+        permissions: ["webRequest", "http://example.com/"],
       },
-      { urls: ["http://example.com/data/file_sample.html"] },
-      ["blocking"]
+
+      async background() {
+        browser.runtime.onUpdateAvailable.addListener(() => {
+          browser.test.sendMessage("postponed");
+        });
+
+        browser.webRequest.onBeforeRequest.addListener(
+          details => {
+            browser.test.sendMessage("got-request");
+          },
+          { urls: ["http://example.com/data/file_sample.html"] }
+        );
+      },
+    };
+    await promiseStartupManager();
+    // If we use an extension wrapper via ExtensionTestUtils.expectExtension
+    // it will continue to handle messages even after the update, resulting
+    // in errors when it receives additional messages without any awaitMessage.
+    let promiseExtension = AddonTestUtils.promiseWebExtensionStartup(id);
+    await installBuiltinExtension(extensionData);
+    let extv1 = await promiseExtension;
+
+    // Prepare an update for the extension.
+    extensionData.manifest.version = "2.0";
+    let xpi = AddonTestUtils.createTempWebExtensionFile(extensionData);
+    let install = await AddonManager.getInstallForFile(xpi);
+
+    // Install the update and wait for the onUpdateAvailable event to complete.
+    let promiseUpdate = new Promise(resolve =>
+      extv1.once("test-message", (kind, msg) => {
+        if (msg == "postponed") {
+          resolve();
+        }
+      })
+    );
+    await Promise.all([promisePostponeInstall(install), promiseUpdate]);
+    await promiseShutdownManager();
+
+    // restarting allows upgrade to proceed
+    ExtensionParent._resetStartupPromises();
+    let extension = ExtensionTestUtils.expectExtension(id);
+    await promiseStartupManager();
+    await extension.awaitStartup();
+    let events = trackEvents(extension);
+
+    await ExtensionTestUtils.fetch(
+      "http://example.com/",
+      "http://example.com/data/file_sample.html"
     );
+
+    await testPersistentRequestStartup(extension, events, {
+      background: true,
+      delayedStart: true,
+      request: true,
+    });
+
+    await extension.unload();
+
+    // remove the builtin addon which will have restarted now.
+    let addon = await AddonManager.getAddonByID(id);
+    await addon.uninstall();
+
+    await promiseShutdownManager();
   }
+);
+
+// Tests that moving permission to optional during a staged upgrade retains permission
+// and that the persistent listeners are used as expected.
+add_task(async function test_persistent_listener_after_staged_upgrade() {
+  AddonManager.checkUpdateSecurity = false;
+  let id = "persistent-staged-upgrade@test";
+
+  // register an update file.
+  AddonTestUtils.registerJSON(server, "/test_update.json", {
+    addons: {
+      "persistent-staged-upgrade@test": {
+        updates: [
+          {
+            version: "2.0",
+            update_link:
+              "http://example.com/addons/test_settings_staged_restart.xpi",
+          },
+        ],
+      },
+    },
+  });
+
+  let extensionData = {
+    useAddonManager: "permanent",
+    manifest: {
+      version: "2.0",
+      applications: {
+        gecko: { id, update_url: `http://example.com/test_update.json` },
+      },
+      permissions: ["http://example.com/"],
+      optional_permissions: ["webRequest"],
+    },
+
+    background() {
+      browser.webRequest.onBeforeRequest.addListener(
+        details => {
+          browser.test.sendMessage("got-request");
+        },
+        { urls: ["http://example.com/data/file_sample.html"] }
+      );
+      // Force a staged updated.
+      browser.runtime.onUpdateAvailable.addListener(async details => {
+        if (details && details.version) {
+          // This should be the version of the pending update.
+          browser.test.assertEq("2.0", details.version, "correct version");
+          browser.test.sendMessage("delay");
+        }
+      });
+    },
+  };
+
+  // Prepare the update first.
+  server.registerFile(
+    `/addons/test_settings_staged_restart.xpi`,
+    AddonTestUtils.createTempWebExtensionFile(extensionData)
+  );
+
+  // Prepare the extension that will be updated.
+  extensionData.manifest.version = "1.0";
+  extensionData.manifest.permissions = ["webRequest", "http://example.com/"];
+  delete extensionData.manifest.optional_permissions;
 
   await promiseStartupManager();
+  let extension = ExtensionTestUtils.loadExtension(extensionData);
+  await extension.startup();
+
+  await ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
+  );
+  await extension.awaitMessage("got-request");
+  ok(true, "Initial version received webRequest event");
 
+  let addon = await AddonManager.getAddonByID(id);
+  Assert.equal(addon.version, "1.0", "1.0 is loaded");
+
+  let update = await AddonTestUtils.promiseFindAddonUpdates(addon);
+  let install = update.updateAvailable;
+  Assert.ok(install, `install is available ${update.error}`);
+
+  await AddonTestUtils.promiseCompleteAllInstalls([install]);
+
+  Assert.equal(
+    install.state,
+    AddonManager.STATE_POSTPONED,
+    "update is staged for install"
+  );
+  await extension.awaitMessage("delay");
+
+  await promiseShutdownManager();
+
+  // restarting allows upgrade to proceed
+  ExtensionParent._resetStartupPromises();
+  await promiseStartupManager();
+  await extension.awaitStartup();
+  let events = trackEvents(extension);
+
+  // Verify webRequest permission.
+  let policy = WebExtensionPolicy.getByID(id);
+  ok(policy.hasPermission("webRequest"), "addon webRequest permission added");
+
+  await ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
+  );
+
+  await testPersistentRequestStartup(extension, events, {
+    background: true,
+    delayedStart: true,
+    request: true,
+  });
+
+  await extension.unload();
+  await promiseShutdownManager();
+  AddonManager.checkUpdateSecurity = true;
+});
+
+// Tests that removing the permission releases the persistent listener.
+add_task(async function test_persistent_listener_after_permission_removal() {
+  let id = "persistent-staged-remove@test";
+
+  // register an update file.
+  AddonTestUtils.registerJSON(server, "/test_remove.json", {
+    addons: {
+      "persistent-staged-remove@test": {
+        updates: [
+          {
+            version: "2.0",
+            update_link:
+              "http://example.com/addons/test_settings_staged_remove.xpi",
+          },
+        ],
+      },
+    },
+  });
+
+  let extensionData = {
+    useAddonManager: "permanent",
+    manifest: {
+      version: "2.0",
+      applications: {
+        gecko: { id, update_url: `http://example.com/test_remove.json` },
+      },
+      permissions: ["tabs", "http://example.com/"],
+    },
+
+    background() {
+      browser.test.sendMessage("loaded");
+    },
+  };
+
+  // Prepare the update first.
+  server.registerFile(
+    `/addons/test_settings_staged_remove.xpi`,
+    AddonTestUtils.createTempWebExtensionFile(extensionData)
+  );
+
+  await promiseStartupManager();
   let extension = ExtensionTestUtils.loadExtension({
     useAddonManager: "permanent",
     manifest: {
-      permissions: ["webRequest", "webRequestBlocking", "http://example.com/"],
+      version: "1.0",
+      applications: {
+        gecko: { id, update_url: `http://example.com/test_remove.json` },
+      },
+      permissions: ["webRequest", "http://example.com/"],
     },
 
-    background: `(${background})(${uneval(DATA)})`,
+    background() {
+      browser.webRequest.onBeforeRequest.addListener(
+        details => {
+          browser.test.sendMessage("got-request");
+        },
+        { urls: ["http://example.com/data/file_sample.html"] }
+      );
+      // Force a staged updated.
+      browser.runtime.onUpdateAvailable.addListener(async details => {
+        if (details && details.version) {
+          // This should be the version of the pending update.
+          browser.test.assertEq("2.0", details.version, "correct version");
+          browser.test.sendMessage("delay");
+        }
+      });
+    },
   });
 
   await extension.startup();
 
-  await promiseRestartManager();
+  await ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
+  );
+  await extension.awaitMessage("got-request");
+  ok(true, "Initial version received webRequest event");
+
+  let addon = await AddonManager.getAddonByID(id);
+  Assert.equal(addon.version, "1.0", "1.0 is loaded");
+
+  let update = await AddonTestUtils.promiseFindAddonUpdates(addon);
+  let install = update.updateAvailable;
+  Assert.ok(install, `install is available ${update.error}`);
+
+  await AddonTestUtils.promiseCompleteAllInstalls([install]);
+
+  Assert.equal(
+    install.state,
+    AddonManager.STATE_POSTPONED,
+    "update is staged for install"
+  );
+  await extension.awaitMessage("delay");
+
+  await promiseShutdownManager();
+
+  // restarting allows upgrade to proceed
+  await promiseStartupManager();
+  let events = trackEvents(extension);
   await extension.awaitStartup();
 
-  let dataPromise = ExtensionTestUtils.fetch(
+  // Verify webRequest permission.
+  let policy = WebExtensionPolicy.getByID(id);
+  ok(
+    !policy.hasPermission("webRequest"),
+    "addon webRequest permission removed"
+  );
+
+  await ExtensionTestUtils.fetch(
     "http://example.com/",
     "http://example.com/data/file_sample.html"
   );
 
-  Services.obs.notifyObservers(null, "browser-delayed-startup-finished");
-  let data = await dataPromise;
+  await testPersistentRequestStartup(extension, events, {
+    background: false,
+    delayedStart: false,
+    request: false,
+  });
 
-  equal(
-    data,
-    DATA,
-    "Stream filter was properly installed for a load during startup"
-  );
+  Services.obs.notifyObservers(null, "sessionstore-windows-restored");
+
+  await extension.awaitMessage("loaded");
+  ok(true, "Background page loaded");
 
   await extension.unload();
   await promiseShutdownManager();
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup_StreamFilter.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup_StreamFilter.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup_StreamFilter.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_startup_StreamFilter.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,84 @@
+"use strict";
+
+AddonTestUtils.init(this);
+AddonTestUtils.overrideCertDB();
+AddonTestUtils.createAppInfo(
+  "xpcshell@tests.mozilla.org",
+  "XPCShell",
+  "1",
+  "43"
+);
+
+let {
+  promiseRestartManager,
+  promiseShutdownManager,
+  promiseStartupManager,
+} = AddonTestUtils;
+
+const server = createHttpServer({ hosts: ["example.com"] });
+server.registerDirectory("/data/", do_get_file("data"));
+
+Services.prefs.setBoolPref(
+  "extensions.webextensions.background-delayed-startup",
+  true
+);
+
+// Test that a blocking listener that uses filterResponseData() works
+// properly (i.e., that the delayed call to registerTraceableChannel
+// works properly).
+add_task(async function test_StreamFilter_at_restart() {
+  const DATA = `<!DOCTYPE html>
+<html>
+<body>
+  <h1>This is a modified page</h1>
+</body>
+</html>`;
+
+  function background(data) {
+    browser.webRequest.onBeforeRequest.addListener(
+      details => {
+        let filter = browser.webRequest.filterResponseData(details.requestId);
+        filter.onstop = () => {
+          let encoded = new TextEncoder("utf-8").encode(data);
+          filter.write(encoded);
+          filter.close();
+        };
+      },
+      { urls: ["http://example.com/data/file_sample.html"] },
+      ["blocking"]
+    );
+  }
+
+  await promiseStartupManager();
+
+  let extension = ExtensionTestUtils.loadExtension({
+    useAddonManager: "permanent",
+    manifest: {
+      permissions: ["webRequest", "webRequestBlocking", "http://example.com/"],
+    },
+
+    background: `(${background})(${uneval(DATA)})`,
+  });
+
+  await extension.startup();
+
+  await promiseRestartManager();
+  await extension.awaitStartup();
+
+  let dataPromise = ExtensionTestUtils.fetch(
+    "http://example.com/",
+    "http://example.com/data/file_sample.html"
+  );
+
+  Services.obs.notifyObservers(null, "browser-delayed-startup-finished");
+  let data = await dataPromise;
+
+  equal(
+    data,
+    DATA,
+    "Stream filter was properly installed for a load during startup"
+  );
+
+  await extension.unload();
+  await promiseShutdownManager();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_viewsource_StreamFilter.js firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_viewsource_StreamFilter.js
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_viewsource_StreamFilter.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_viewsource_StreamFilter.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,96 @@
+"use strict";
+
+const server = createHttpServer();
+const BASE_URL = `http://127.0.0.1:${server.identity.primaryPort}`;
+
+server.registerPathHandler("/dummy", (request, response) => {
+  response.setStatusLine(request.httpVersion, 200, "OK");
+  response.write("ok");
+});
+
+server.registerPathHandler("/redir", (request, response) => {
+  response.setStatusLine(request.httpVersion, 303, "See Other");
+  response.setHeader("Location", `${BASE_URL}/dummy`);
+});
+
+async function testViewSource(viewSourceUrl) {
+  function background(BASE_URL) {
+    browser.webRequest.onBeforeRequest.addListener(
+      details => {
+        browser.test.assertEq(`${BASE_URL}/dummy`, details.url, "expected URL");
+        browser.test.assertEq("main_frame", details.type, "details.type");
+
+        let filter = browser.webRequest.filterResponseData(details.requestId);
+        filter.onstart = () => {
+          filter.write(new TextEncoder().encode("PREFIX_"));
+        };
+        filter.ondata = event => {
+          filter.write(event.data);
+        };
+        filter.onstop = () => {
+          filter.write(new TextEncoder().encode("_SUFFIX"));
+          filter.disconnect();
+          browser.test.sendMessage("filter_end");
+        };
+        filter.onerror = function() {
+          browser.test.fail(`Unexpected error: ${filter.error}`);
+          browser.test.sendMessage("filter_end");
+        };
+      },
+      { urls: ["*://*/dummy"] },
+      ["blocking"]
+    );
+    browser.webRequest.onBeforeRequest.addListener(
+      details => {
+        browser.test.assertEq(`${BASE_URL}/redir`, details.url, "Got redirect");
+
+        let filter = browser.webRequest.filterResponseData(details.requestId);
+        filter.onstop = () => {
+          filter.disconnect();
+          browser.test.fail("Unexpected onstop for redirect");
+          browser.test.sendMessage("redirect_done");
+        };
+        filter.onerror = function() {
+          browser.test.assertEq(
+            "Channel redirected",
+            filter.error,
+            "Expected error in filter.onerror"
+          );
+          browser.test.sendMessage("redirect_done");
+        };
+      },
+      { urls: ["*://*/redir"] },
+      ["blocking"]
+    );
+  }
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["webRequest", "webRequestBlocking", "*://*/*"],
+    },
+    background: `(${background})(${JSON.stringify(BASE_URL)})`,
+  });
+  await extension.startup();
+  let contentPage = await ExtensionTestUtils.loadContentPage(viewSourceUrl);
+  if (viewSourceUrl.includes("/redir")) {
+    info("Awaiting observed completion of redirection request");
+    await extension.awaitMessage("redirect_done");
+  }
+  info("Awaiting completion of StreamFilter on request");
+  await extension.awaitMessage("filter_end");
+  let contentText = await contentPage.spawn(null, () => {
+    return this.content.document.body.textContent;
+  });
+  equal(contentText, "PREFIX_ok_SUFFIX", "view-source response body");
+  await contentPage.close();
+  await extension.unload();
+}
+
+add_task(async function test_StreamFilter_viewsource() {
+  await testViewSource(`view-source:${BASE_URL}/dummy`);
+});
+
+// Skipped because filter.error is incorrect and test non-deterministic, see
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1683189
+// add_task(async function test_StreamFilter_viewsource_redirect_target() {
+//   await testViewSource(`view-source:${BASE_URL}/redir`);
+// });
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common-e10s.ini	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,11 @@
+# Similar to xpcshell-common.ini, except tests here only run
+# when e10s is enabled (with or without out-of-process extensions).
+
+[test_ext_webRequest_filterResponseData.js]
+# tsan failure is for test_filter_301 timing out, bug 1674773
+skip-if = tsan || os == "android" && debug
+[test_ext_webRequest_responseBody.js]
+skip-if = os == "android" && debug
+[test_ext_webRequest_startup_StreamFilter.js]
+skip-if = os == "android" && debug
+[test_ext_webRequest_viewsource_StreamFilter.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-01-18 19:58:26.000000000 +0000
@@ -30,6 +30,9 @@
 [test_ext_browserSettings.js]
 [test_ext_browserSettings_homepage.js]
 skip-if = appname == "thunderbird" || os == "android"
+[test_ext_browsingData.js]
+[test_ext_browsingData_cookies_cache.js]
+[test_ext_browsingData_cookies_cookieStoreId.js]
 [test_ext_captivePortal.js]
 # As with test_captive_portal_service.js, we use the same limits here.
 skip-if = appname == "thunderbird" || os == "android" || (os == "mac" && debug) # CP service is disabled on Android, macosx1014/debug due to 1564534
@@ -41,8 +44,9 @@
 [test_ext_cookieBehaviors.js]
 skip-if = appname == "thunderbird"
 [test_ext_cookies_firstParty.js]
-skip-if = appname == "thunderbird"
+skip-if = appname == "thunderbird" || os == "android" # Android: Bug 1680132
 [test_ext_cookies_samesite.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_content_security_policy.js]
 skip-if = (os == "win" && debug) #Bug 1485567
 [test_ext_contentscript_api_injection.js]
@@ -63,7 +67,7 @@
 skip-if = appname == "thunderbird" || os == "android" # Containers are not exposed to android.
 [test_ext_debugging_utils.js]
 [test_ext_dns.js]
-skip-if = socketprocess_networking
+skip-if = socketprocess_networking || os == "android" # Android: Bug 1680132
 [test_ext_downloads.js]
 [test_ext_downloads_cookies.js]
 skip-if = os == "android" # downloads API needs to be implemented in GeckoView - bug 1538348
@@ -117,7 +121,7 @@
 [test_ext_proxy_authorization_via_proxyinfo.js]
 skip-if = true # Bug 1622433 needs h2 proxy implementation
 [test_ext_proxy_config.js]
-skip-if = appname == "thunderbird"
+skip-if = appname == "thunderbird" || os == "android" # Android: Bug 1680132
 [test_ext_proxy_onauthrequired.js]
 [test_ext_proxy_settings.js]
 skip-if = appname == "thunderbird" || os == "android" # proxy settings are not supported on android
@@ -147,6 +151,7 @@
 [test_ext_same_site_redirects.js]
 [test_ext_sandbox_var.js]
 [test_ext_schema.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_shared_workers.js]
 [test_ext_shutdown_cleanup.js]
 [test_ext_simple.js]
@@ -162,7 +167,7 @@
 [test_ext_storage_content_local.js]
 skip-if = os == "android" && debug
 [test_ext_storage_content_sync.js]
-skip-if = os == "android" && debug
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_storage_content_sync_kinto.js]
 skip-if = os == "android" && debug
 [test_ext_storage_quota_exceeded_errors.js]
@@ -172,8 +177,9 @@
 [test_ext_storage_managed_policy.js]
 skip-if = appname == "thunderbird" || os == "android"
 [test_ext_storage_sanitizer.js]
-skip-if = appname == "thunderbird"
+skip-if = appname == "thunderbird" || os == "android" # Android: Bug 1680132
 [test_ext_storage_sync.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_storage_sync_kinto.js]
 skip-if = appname == "thunderbird" || os == "android"
 [test_ext_storage_sync_kinto_crypto.js]
@@ -194,9 +200,10 @@
 [test_ext_webRequest_auth.js]
 skip-if = os == "android" && debug
 [test_ext_webRequest_cached.js]
-skip-if = os == "android" && processor != "x86_64" # Bug 1573511
+skip-if = os == "android" # Bug 1573511
 [test_ext_webRequest_cancelWithReason.js]
 [test_ext_webRequest_download.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_webRequest_filterTypes.js]
 [test_ext_webRequest_from_extension_page.js]
 [test_ext_webRequest_incognito.js]
@@ -208,11 +215,15 @@
 [test_ext_webRequest_permission.js]
 skip-if = os == "android" && debug
 [test_ext_webRequest_redirect_mozextension.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_webRequest_requestSize.js]
 skip-if = socketprocess_networking
 [test_ext_webRequest_set_cookie.js]
-skip-if = appname == "thunderbird" || (os == "android" && debug)
+skip-if = appname == "thunderbird"
+[test_ext_webRequest_startup.js]
+skip-if = os == "android" # bug 1683159
 [test_ext_webRequest_style_cache.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_webRequest_suspend.js]
 [test_ext_webRequest_userContextId.js]
 [test_ext_webRequest_viewsource.js]
@@ -240,5 +251,6 @@
 [test_webRequest_cookies.js]
 [test_webRequest_filtering.js]
 [test_ext_brokenlinks.js]
+skip-if = os == "android" # Android: Bug 1680132
 [test_ext_performance_counters.js]
 skip-if = appname == "thunderbird" || os == "android"
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini	2021-01-18 19:58:26.000000000 +0000
@@ -10,7 +10,7 @@
 [test_ext_contentscript_canvas_tainting.js]
 [test_ext_contentscript_scriptCreated.js]
 [test_ext_contentscript_triggeringPrincipal.js]
-skip-if = (os == "android" && debug) || (os == "win" && debug) || tsan || socketprocess_networking # Windows: Bug 1438796, tsan: bug 1612707
+skip-if = os == "android" || (os == "win" && debug) || tsan || socketprocess_networking # Windows: Bug 1438796, tsan: bug 1612707, Android: Bug 1680132
 [test_ext_contentscript_xrays.js]
 [test_ext_contentScripts_register.js]
 [test_ext_contexts_gc.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-e10s.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-e10s.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-e10s.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-e10s.ini	2021-01-18 19:58:26.000000000 +0000
@@ -18,15 +18,11 @@
   services.settings.server=http://localhost:7777/remote-settings-dummy/v1
   services.settings.default_bucket=nonexistent-bucket-foo
 
+[include:xpcshell-common-e10s.ini]
 [include:xpcshell-content.ini]
 
-[test_ext_webRequest_filterResponseData.js]
-# tsan failure is for test_filter_301 timing out, bug 1674773
-skip-if = tsan || os == "android" && debug
-# streamFilter is supported with e10s only
-[test_ext_webRequest_responseBody.js]
-skip-if = os == "android" && debug
-# streamFilter is supported with e10s only
-[test_ext_webRequest_startup.js]
-skip-if = os == "android" && debug
-# streamFilter is supported with e10s only
\ No newline at end of file
+# Tests that need to run with e10s only must NOT be placed here,
+# but in xpcshell-common-e10s.ini.
+# A test here will only run on one configuration, e10s + in-process extensions,
+# while the primary target is e10s + out-of-process extensions.
+# xpcshell-common-e10s.ini runs in both configurations.
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini	2021-01-18 19:58:26.000000000 +0000
@@ -25,12 +25,14 @@
 #
 #  - xpcshell-common.ini
 #    For tests which should run in all configurations.
+#  - xpcshell-common-e10s.ini
+#    For tests which should run in all configurations where e10s is enabled.
 #  - xpcshell-remote.ini
 #    For tests which should only run with both remote extensions and remote content.
 #  - xpcshell-content.ini
 #    For tests which rely on content pages, and should run in all configurations.
 #  - xpcshell-e10s.ini
-#    For tests which rely on conetn pages, and should only run with remote content
+#    For tests which rely on content pages, and should only run with remote content
 #    but in-process extensions.
 
 [test_ExtensionStorageSync_migration_kinto.js]
@@ -82,6 +84,6 @@
 skip-if = os == 'android' && processor == 'x86_64'
 
 [include:xpcshell-common.ini]
-run-if = appname == "thunderbird" || (os == 'android' && processor != 'x86_64') # Thunderbird and Android have no e10s
+run-if = (appname == "thunderbird") || os == 'android' # Thunderbird has no e10s, Android has no remote extensions, Bug 1535365
 [include:xpcshell-content.ini]
-run-if = appname == "thunderbird" || (os == 'android' && processor != 'x86_64') # Thunderbird and Android have no e10s
+run-if = appname == "thunderbird" || os == 'android' # Thunderbird has no e10s, Android has no remote extensions, Bug 1535365
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-remote.ini firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-remote.ini
--- firefox-84.0.2+build1/toolkit/components/extensions/test/xpcshell/xpcshell-remote.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/test/xpcshell/xpcshell-remote.ini	2021-01-18 19:58:26.000000000 +0000
@@ -19,6 +19,7 @@
   services.settings.default_bucket=nonexistent-bucket-foo
 
 [include:xpcshell-common.ini]
+[include:xpcshell-common-e10s.ini]
 [include:xpcshell-content.ini]
 
 [test_ext_contentscript_perf_observers.js] # Inexplicably, PerformanceObserver used in the test doesn't fire in non-e10s mode.
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionContentScript.h firefox-85.0+build1/toolkit/components/extensions/WebExtensionContentScript.h
--- firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionContentScript.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/WebExtensionContentScript.h	2021-01-18 19:58:26.000000000 +0000
@@ -19,12 +19,17 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupports.h"
 #include "nsIDocShell.h"
+#include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 class nsILoadInfo;
 class nsPIDOMWindowOuter;
 
 namespace mozilla {
+namespace dom {
+class WindowGlobalChild;
+}
+
 namespace extensions {
 
 using dom::Nullable;
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionPolicy.cpp firefox-85.0+build1/toolkit/components/extensions/WebExtensionPolicy.cpp
--- firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionPolicy.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/WebExtensionPolicy.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -330,6 +330,14 @@
   WebExtensionPolicy_Binding::ClearCachedContentScriptsValue(this);
 }
 
+bool WebExtensionPolicy::CanAccessURI(const URLInfo& aURI, bool aExplicit,
+                                      bool aCheckRestricted,
+                                      bool aAllowFilePermission) const {
+  return (!aCheckRestricted || !IsRestrictedURI(aURI)) && mHostPermissions &&
+         mHostPermissions->Matches(aURI, aExplicit) &&
+         (aURI.Scheme() != nsGkAtoms::file || aAllowFilePermission);
+}
+
 void WebExtensionPolicy::InjectContentScripts(ErrorResult& aRv) {
   nsresult rv = EPS().InjectContentScripts(this);
   if (NS_FAILED(rv)) {
@@ -476,6 +484,11 @@
   aScripts.AppendElements(mContentScripts);
 }
 
+bool WebExtensionPolicy::PrivateBrowsingAllowed() const {
+  return mAllowPrivateBrowsingByDefault ||
+         HasPermission(nsGkAtoms::privateBrowsingAllowedPermission);
+}
+
 bool WebExtensionPolicy::CanAccessContext(nsILoadContext* aContext) const {
   MOZ_ASSERT(aContext);
   return PrivateBrowsingAllowed() || !aContext->UsePrivateBrowsing();
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionPolicy.h firefox-85.0+build1/toolkit/components/extensions/WebExtensionPolicy.h
--- firefox-84.0.2+build1/toolkit/components/extensions/WebExtensionPolicy.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/WebExtensionPolicy.h	2021-01-18 19:58:26.000000000 +0000
@@ -75,11 +75,7 @@
 
   bool CanAccessURI(const URLInfo& aURI, bool aExplicit = false,
                     bool aCheckRestricted = true,
-                    bool aAllowFilePermission = false) const {
-    return (!aCheckRestricted || !IsRestrictedURI(aURI)) && mHostPermissions &&
-           mHostPermissions->Matches(aURI, aExplicit) &&
-           (aURI.Scheme() != nsGkAtoms::file || aAllowFilePermission);
-  }
+                    bool aAllowFilePermission = false) const;
 
   bool IsPathWebAccessible(const nsAString& aPath) const {
     return mWebAccessiblePaths.Matches(aPath);
@@ -129,10 +125,7 @@
   bool Active() const { return mActive; }
   void SetActive(bool aActive, ErrorResult& aRv);
 
-  bool PrivateBrowsingAllowed() const {
-    return mAllowPrivateBrowsingByDefault ||
-           HasPermission(nsGkAtoms::privateBrowsingAllowedPermission);
-  }
+  bool PrivateBrowsingAllowed() const;
 
   bool CanAccessContext(nsILoadContext* aContext) const;
 
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/ChannelWrapper.cpp firefox-85.0+build1/toolkit/components/extensions/webrequest/ChannelWrapper.cpp
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/ChannelWrapper.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/ChannelWrapper.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -22,8 +22,10 @@
 #include "mozilla/Unused.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
+#include "mozilla/dom/EventBinding.h"
 #include "mozilla/dom/BrowserHost.h"
 #include "mozIThirdPartyUtil.h"
+#include "nsContentUtils.h"
 #include "nsIContentPolicy.h"
 #include "nsIClassifiedChannel.h"
 #include "nsIHttpChannelInternal.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterChild.h firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterChild.h
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterChild.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterChild.h	2021-01-18 19:58:26.000000000 +0000
@@ -11,12 +11,13 @@
 #include "mozilla/extensions/PStreamFilterChild.h"
 #include "mozilla/extensions/StreamFilter.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/dom/StreamFilterBinding.h"
 #include "nsISupportsImpl.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace extensions {
 
 using mozilla::dom::StreamFilterStatus;
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilter.cpp firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilter.cpp
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilter.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilter.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/extensions/StreamFilterEvents.h"
 #include "mozilla/extensions/StreamFilterParent.h"
 #include "mozilla/dom/ContentChild.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "nsContentUtils.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsLiteralString.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterEvents.h firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterEvents.h
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterEvents.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterEvents.h	2021-01-18 19:58:26.000000000 +0000
@@ -11,7 +11,8 @@
 #include "mozilla/dom/StreamFilterDataEventBinding.h"
 #include "mozilla/extensions/StreamFilter.h"
 
-#include "jsapi.h"
+#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 
 #include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/Event.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterParent.cpp firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterParent.cpp
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterParent.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterParent.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "StreamFilterParent.h"
 
-#include "mozilla/ScopeExit.h"
 #include "mozilla/Unused.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/net/ChannelEventQueue.h"
@@ -19,6 +18,7 @@
 #include "nsSocketTransportService2.h"
 #include "nsStringStream.h"
 #include "mozilla/net/DocumentChannelChild.h"
+#include "nsIViewSourceChannel.h"
 
 namespace mozilla {
 namespace extensions {
@@ -157,7 +157,19 @@
   mChannel = aChannel;
 
   nsCOMPtr<nsITraceableChannel> traceable = do_QueryInterface(aChannel);
-  MOZ_RELEASE_ASSERT(traceable);
+  if (MOZ_UNLIKELY(!traceable)) {
+    // nsViewSourceChannel is not nsITraceableChannel, but wraps one. Unwrap it.
+    nsCOMPtr<nsIViewSourceChannel> vsc = do_QueryInterface(aChannel);
+    if (vsc) {
+      traceable = do_QueryObject(vsc->GetInnerChannel());
+      // OnStartRequest etc. is passed the unwrapped channel, so update mChannel
+      // to prevent OnStartRequest from mistaking it for a redirect, which would
+      // close the filter.
+      mChannel = do_QueryObject(traceable);
+    }
+    // TODO bug 1683403: Replace assertion; Close StreamFilter instead.
+    MOZ_RELEASE_ASSERT(traceable);
+  }
 
   nsresult rv =
       traceable->SetNewListener(this, /* aMustApplyContentConversion = */ true,
diff -Nru firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterParent.h firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterParent.h
--- firefox-84.0.2+build1/toolkit/components/extensions/webrequest/StreamFilterParent.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/extensions/webrequest/StreamFilterParent.h	2021-01-18 19:58:26.000000000 +0000
@@ -59,7 +59,7 @@
 
   using ChildEndpointPromise = MozPromise<ChildEndpoint, bool, true>;
 
-  static MOZ_MUST_USE RefPtr<ChildEndpointPromise> Create(
+  [[nodiscard]] static RefPtr<ChildEndpointPromise> Create(
       ContentParent* aContentParent, uint64_t aChannelId,
       const nsAString& aAddonId);
 
diff -Nru firefox-84.0.2+build1/toolkit/components/featuregates/Features.toml firefox-85.0+build1/toolkit/components/featuregates/Features.toml
--- firefox-84.0.2+build1/toolkit/components/featuregates/Features.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/featuregates/Features.toml	2021-01-18 19:58:26.000000000 +0000
@@ -177,15 +177,6 @@
 bug-numbers = [1643027]
 is-public = true
 
-[js-warp]
-title = "experimental-features-js-warp"
-description = "experimental-features-js-warp-description"
-restart-required = true
-preference = "javascript.options.warp"
-type = "boolean"
-bug-numbers = [1613592]
-is-public = true
-
 [fission]
 title = "experimental-features-fission"
 description = "experimental-features-fission-description"
diff -Nru firefox-84.0.2+build1/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp firefox-85.0+build1/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp
--- firefox-84.0.2+build1/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,6 +10,7 @@
 #include "js/Object.h"  // JS::GetClass, JS::GetReservedSlot
 #include "js/PropertySpec.h"
 #include "mozJSComponentLoader.h"
+#include "nsIThread.h"
 #include "nsZipArchive.h"
 
 #include "mozilla/Scoped.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/find/nsWebBrowserFind.cpp firefox-85.0+build1/toolkit/components/find/nsWebBrowserFind.cpp
--- firefox-84.0.2+build1/toolkit/components/find/nsWebBrowserFind.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/find/nsWebBrowserFind.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Selection.h"
 #include "nsISimpleEnumerator.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
 
@@ -345,8 +346,7 @@
     selection->AddRangeAndSelectFramesAndNotifyListeners(*aRange,
                                                          IgnoreErrors());
 
-    nsFocusManager* fm = nsFocusManager::GetFocusManager();
-    if (fm) {
+    if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
       if (tcFrame) {
         RefPtr<Element> newFocusedElement = Element::FromNode(content);
         fm->SetFocus(newFocusedElement, nsIFocusManager::FLAG_NOSCROLL);
@@ -748,7 +748,7 @@
     ClearFrameSelection(lastFocusedWindow);
   }
 
-  if (nsFocusManager* fm = nsFocusManager::GetFocusManager()) {
+  if (RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager()) {
     // get the containing frame and focus it. For top-level windows, the right
     // window should already be focused.
     if (RefPtr<Element> frameElement =
diff -Nru firefox-84.0.2+build1/toolkit/components/find/nsWebBrowserFind.h firefox-85.0+build1/toolkit/components/find/nsWebBrowserFind.h
--- firefox-84.0.2+build1/toolkit/components/find/nsWebBrowserFind.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/find/nsWebBrowserFind.h	2021-01-18 19:58:26.000000000 +0000
@@ -59,7 +59,7 @@
       nsPIDOMWindowOuter* aWindow);
   nsresult ClearFrameSelection(nsPIDOMWindowOuter* aWindow);
 
-  nsresult OnFind(nsPIDOMWindowOuter* aFoundWindow);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY nsresult OnFind(nsPIDOMWindowOuter* aFoundWindow);
 
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void SetSelectionAndScroll(
       nsPIDOMWindowOuter* aWindow, nsRange* aRange);
diff -Nru firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.html firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.html
--- firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <title>Plugin Clear Site Data clear by domain test</title>
-
-    <embed id="plugin1" type="application/x-test" width="200" height="200"></embed>
-
-    <script type="application/javascript">
-      function testSteps() {
-        var p = document.getElementById("plugin1");
-
-        p.setSitesWithData(
-          "foo.com:0:0," +
-          "bar.foo.com:0:0," +
-          "baz.foo.com:0:0," +
-          "bar.com:1:0," +
-          "[192.168.1.1]:0:0," +
-          "localhost:0:0"
-        );
-      }
-    </script>
-  </head>
-
-  <body></body>
-
-</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.js firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.js
--- firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-let { ForgetAboutSite } = ChromeUtils.import(
-  "resource://gre/modules/ForgetAboutSite.jsm"
-);
-
-// Test clearing plugin data by domain using ForgetAboutSite.
-const testURL =
-  "http://mochi.test:8888/browser/toolkit/components/forgetaboutsite/test/browser/browser_clearplugindata.html";
-
-const pluginHostIface = Ci.nsIPluginHost;
-var pluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-pluginHost.QueryInterface(pluginHostIface);
-
-var pluginTag;
-
-function stored(needles) {
-  var something = pluginHost.siteHasData(this.pluginTag, null);
-  if (!needles) {
-    return something;
-  }
-
-  if (!something) {
-    return false;
-  }
-
-  for (var i = 0; i < needles.length; ++i) {
-    if (!pluginHost.siteHasData(this.pluginTag, needles[i])) {
-      return false;
-    }
-  }
-  return true;
-}
-
-function setTestPluginEnabledState(newEnabledState, plugin) {
-  var oldEnabledState = plugin.enabledState;
-  plugin.enabledState = newEnabledState;
-  SimpleTest.registerCleanupFunction(function() {
-    plugin.enabledState = oldEnabledState;
-  });
-}
-
-add_task(async function() {
-  var tags = pluginHost.getPluginTags();
-
-  // Find the test plugin
-  for (var i = 0; i < tags.length; i++) {
-    if (tags[i].name == "Test Plug-in") {
-      pluginTag = tags[i];
-    }
-  }
-  if (!pluginTag) {
-    ok(false, "Test Plug-in not available, can't run test");
-    return;
-  }
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, pluginTag);
-  await BrowserTestUtils.openNewForegroundTab(gBrowser, testURL);
-
-  // Set data for the plugin after the page load.
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
-    content.wrappedJSObject.testSteps();
-  });
-
-  ok(
-    stored([
-      "192.168.1.1",
-      "foo.com",
-      "nonexistent.foo.com",
-      "bar.com",
-      "localhost",
-    ]),
-    "Data stored for sites"
-  );
-
-  // Clear data for "foo.com" and its subdomains.
-  await ForgetAboutSite.removeDataFromDomain("foo.com");
-
-  ok(stored(["bar.com", "192.168.1.1", "localhost"]), "Data stored for sites");
-  ok(!stored(["foo.com"]), "Data cleared for foo.com");
-  ok(!stored(["bar.foo.com"]), "Data cleared for subdomains of foo.com");
-
-  // Clear data for "bar.com" using a subdomain.
-  await ForgetAboutSite.removeDataFromDomain("foo.bar.com");
-  ok(!stored(["bar.com"]), "Data cleared for bar.com");
-
-  // Clear data for "192.168.1.1".
-  await ForgetAboutSite.removeDataFromDomain("192.168.1.1");
-  ok(!stored(["192.168.1.1"]), "Data cleared for 192.168.1.1");
-
-  // Clear data for "localhost".
-  await ForgetAboutSite.removeDataFromDomain("localhost");
-  ok(!stored(null), "All data cleared");
-
-  gBrowser.removeCurrentTab();
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser.ini firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/browser/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/forgetaboutsite/test/browser/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -1,7 +1,5 @@
 [DEFAULT]
 prefs =
   plugin.load_flash_only=false
-support-files = browser_clearplugindata.html
 
-[browser_clearplugindata.js]
 [browser_cookieDomain.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js firefox-85.0+build1/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js
--- firefox-84.0.2+build1/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/forgetaboutsite/test/unit/test_removeDataFromDomain.js	2021-01-18 19:58:26.000000000 +0000
@@ -318,7 +318,7 @@
   await ForgetAboutSite.removeDataFromDomain("mozilla.org");
   check_login_exists(TEST_HOST, true);
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   check_login_exists(TEST_HOST, false);
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/Cargo.toml firefox-85.0+build1/toolkit/components/glean/api/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/glean/api/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -8,9 +8,9 @@
 [dependencies]
 bincode = "1.0"
 chrono = "0.4.10"
-ffi-support = "0.4"
-glean = "33.4.0"
-glean-core = { version = "33.4.0", features = ["rkv-safe-mode"] }
+glean = "33.9.1"
+glean-core = { version = "33.9.1", features = ["rkv-safe-mode"] }
+inherent = "0.1.4"
 log = "0.4"
 nsstring = { path = "../../../../xpcom/rust/nsstring", optional = true }
 once_cell = "1.2.0"
@@ -19,6 +19,7 @@
 xpcom = { path = "../../../../xpcom/rust/xpcom", optional = true }
 thiserror = "1.0.4"
 crossbeam-channel = "0.4.3"
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
 
 [dev-dependencies]
 tempfile = "3.1.0"
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/common_test.rs firefox-85.0+build1/toolkit/components/glean/api/src/common_test.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/common_test.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/common_test.rs	2021-01-18 19:58:26.000000000 +0000
@@ -29,20 +29,23 @@
     };
     let tmpname = dir.path().display().to_string();
 
-    let cfg = glean_core::Configuration {
+    let cfg = glean::Configuration {
+        upload_enabled: true,
         data_path: tmpname,
         application_id: GLOBAL_APPLICATION_ID.into(),
-        upload_enabled: true,
         max_events: None,
         delay_ping_lifetime_io: false,
-        language_binding_name: "Rust".into(),
+        channel: None,
+        server_endpoint: None,
+        uploader: None,
+    };
+
+    let client_info = glean::ClientInfoMetrics {
+        app_build: "test-build".into(),
+        app_display_version: "1.2.3".into(),
     };
-    let glean = glean_core::Glean::new(cfg).unwrap();
-    glean_core::setup_glean(glean).expect("can't set up global Glean object");
 
-    // This might have been flushed by other tests already, so we ignore the return value.
-    // The dispatch queue is definitely unblocked after this, no matter what.
-    let _ = super::flush_init();
+    glean::test_reset_glean(cfg, client_info, true);
 
     dir
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/event.rs firefox-85.0+build1/toolkit/components/glean/api/src/ffi/event.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/event.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/ffi/event.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,90 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+#![cfg(feature = "with_gecko")]
+
+use nsstring::{nsACString, nsCString};
+use thin_vec::ThinVec;
+
+use crate::metrics::__glean_metric_maps as metric_maps;
+use crate::private::EventRecordingError;
+
+#[no_mangle]
+pub extern "C" fn fog_event_record(
+    id: u32,
+    extra_keys: &ThinVec<i32>,
+    extra_values: &ThinVec<nsCString>,
+) {
+    // If no extra keys are passed, we can shortcut here.
+    if extra_keys.is_empty() {
+        if metric_maps::event_record_wrapper(id, Default::default()).is_err() {
+            panic!("No event for id {}", id);
+        }
+
+        return;
+    }
+
+    assert_eq!(
+        extra_keys.len(),
+        extra_values.len(),
+        "Extra keys and values differ in length. ID: {}",
+        id
+    );
+
+    // Otherwise we need to decode them and pass them along.
+    let extra = extra_keys
+        .iter()
+        .zip(extra_values.iter())
+        .map(|(&k, v)| (k, v.to_string()))
+        .collect();
+    match metric_maps::event_record_wrapper(id, extra) {
+        Ok(()) => {}
+        Err(EventRecordingError::InvalidId) => panic!("No event for id {}", id),
+        Err(EventRecordingError::InvalidExtraKey) => {
+            panic!("Invalid extra keys in map for id {}", id)
+        }
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn fog_event_record_str(
+    id: u32,
+    extra_keys: &ThinVec<nsCString>,
+    extra_values: &ThinVec<nsCString>,
+) {
+    // If no extra keys are passed, we can shortcut here.
+    if extra_keys.is_empty() {
+        if metric_maps::event_record_wrapper_str(id, Default::default()).is_err() {
+            panic!("No event for id {}", id);
+        }
+
+        return;
+    }
+
+    assert_eq!(
+        extra_keys.len(),
+        extra_values.len(),
+        "Extra keys and values differ in length. ID: {}",
+        id
+    );
+
+    // Otherwise we need to decode them and pass them along.
+    let extra = extra_keys
+        .iter()
+        .zip(extra_values.iter())
+        .map(|(k, v)| (k.to_string(), v.to_string()))
+        .collect();
+    match metric_maps::event_record_wrapper_str(id, extra) {
+        Ok(()) => {}
+        Err(EventRecordingError::InvalidId) => panic!("No event for id {}", id),
+        Err(EventRecordingError::InvalidExtraKey) => {
+            panic!("Invalid extra keys in map for id {}", id)
+        }
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_event_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    metric_maps::event_test_get_value_wrapper(id, &storage_name.to_utf8()).is_some()
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/macros.rs firefox-85.0+build1/toolkit/components/glean/api/src/ffi/macros.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/macros.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/ffi/macros.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,84 +2,54 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// TODO: Allow argument conversions, so that implementations don't need to do the boilerplate
-// themselves.
+//! Helper macros for implementing the FFI API for metric types.
 
-/// Define the global handle map, constructor and destructor functions and any user-defined
-/// functions for a new metric
-///
-/// This allows to define most common functionality and simple operations for a metric type.
-/// More complex operations should be written as plain functions directly.
+/// Get a metric object by ID from the corresponding map.
 ///
 /// # Arguments
 ///
-/// * `$metric_map` - name of the map in `metrics::__glean_metric_maps` to fetch metrics from, should be all uppercase, e.g. `COUNTERS`.
-/// * `$ffi_has_fn` - FFI name of the `test_has_value` function, something like `fog_counter_test_has_value`.
-/// * `$ffi_get_fn` - FFI name of the `test_get_value` function, something like `fog_counter_test_get_value`.
-/// * `get_ret` - Return value of the `test_get_value` function.
-///
-/// Additional simple functions can be defined as a mapping `$op -> $ffi_fn`:
-///
-/// * `$op` - function on the metric type to call.
-/// * `$op_fn` - FFI function name for the operation, followed by its arguments and the return type.
-///              Arguments are passed on as is.
-///              If arguments need a conversion before being passed to the metric implementation
-///              the FFI function needs to be implemented manually.
-macro_rules! define_metric_ffi {
-    ($metric_map:ident {
-        test_has -> $ffi_has_fn:ident,
-        test_get -> $ffi_get_fn:ident: $get_ret:ty,
-
-        $(
-            $op:ident -> $ffi_fn:ident($($op_argname:ident: $op_argtyp:ty),* $(,)*)
-        ),* $(,)*
-    }) => {
-        $(
-        #[no_mangle]
-        pub extern "C" fn $ffi_fn(id: u32, $($op_argname: $op_argtyp),*) {
-            match $crate::metrics::__glean_metric_maps::$metric_map.get(&id.into()) {
-                Some(metric) => metric.$op($($op_argname),*),
-                None => panic!("No metric for id {}", id),
-            }
+/// * `$map` - The name of the hash map within `metrics::__glean_metric_maps`
+///            as generated by glean_parser.
+/// * `$id`  - The ID of the metric to get.
+macro_rules! metric_get {
+    ($map:ident, $id:ident) => {
+        match $crate::metrics::__glean_metric_maps::$map.get(&$id.into()) {
+            Some(metric) => metric,
+            None => panic!("No metric for id {}", $id),
         }
-        )*
+    };
+}
 
-        /// FFI wrapper to test whether a value is stored for the metric.
-        ///
-        /// Returns `1` if a metric value exists, otherwise `0`.
-        ///
-        /// Panics if no metric exists for the given ID.
-        /// This indicates a bug in the calling code, as this method is only called through generated code,
-        /// which will guarantee the use of  valid IDs.
-        #[no_mangle]
-        pub unsafe extern "C" fn $ffi_has_fn(id: u32, storage_name: *const ::std::os::raw::c_char) -> u8 {
-            let storage_name = match ::std::ffi::CStr::from_ptr(storage_name).to_str() {
-                Ok(s) => s,
-                Err(e) => panic!("Invalid string for storage name, metric id {}, error: {:?}", id, e),
-            };
-            match $crate::metrics::__glean_metric_maps::$metric_map.get(&id.into()) {
-                Some(metric) => metric.test_get_value(storage_name).is_some() as u8,
-                None => panic!("No metric for id {}", id)
-            }
-        }
+/// Test whether a value is stored for the metric identified by its ID.
+///
+/// # Arguments
+///
+/// * `$map`     - The name of the hash map within `metrics::__glean_metric_maps`
+///                as generated by glean_parser.
+/// * `$id`      - The ID of the metric to get.
+/// * `$storage` - the storage name to look into.
+macro_rules! test_has {
+    ($map:ident, $id:ident, $storage:ident) => {{
+        let metric = metric_get!($map, $id);
+        let storage = $storage.to_utf8();
+        let storage = Some(&storage[..]);
+        metric.test_get_value(storage).is_some()
+    }};
+}
 
-        /// FFI wrapper to get the currently stored value.
-        ///
-        /// Returns the value of the stored metric.
-        ///
-        /// Panics if no metric exists for the given ID.
-        /// This indicates a bug in the calling code, as this method is only called through generated code,
-        /// which will guarantee the use of  valid IDs.
-        #[no_mangle]
-        pub unsafe extern "C" fn $ffi_get_fn(id: u32, storage_name: *const ::std::os::raw::c_char) -> $get_ret {
-            let storage_name = match ::std::ffi::CStr::from_ptr(storage_name).to_str() {
-                Ok(s) => s,
-                Err(e) => panic!("Invalid string for storage name, metric id {}, error: {:?}", id, e),
-            };
-            match $crate::metrics::__glean_metric_maps::$metric_map.get(&id.into()) {
-                Some(metric) => metric.test_get_value(storage_name).unwrap().into(),
-                None => panic!("No metric for id {}", id)
-            }
-        }
-    }
+/// Get the currently stored value for the metric identified by its ID.
+///
+/// # Arguments
+///
+/// * `$map`     - The name of the hash map within `metrics::__glean_metric_maps`
+///                as generated by glean_parser.
+/// * `$id`      - The ID of the metric to get.
+/// * `$storage` - the storage name to look into.
+macro_rules! test_get {
+    ($map:ident, $id:ident, $storage:ident) => {{
+        let metric = metric_get!($map, $id);
+        let storage = $storage.to_utf8();
+        let storage = Some(&storage[..]);
+        metric.test_get_value(storage).unwrap()
+    }};
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/mod.rs firefox-85.0+build1/toolkit/components/glean/api/src/ffi/mod.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/ffi/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/ffi/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,56 +2,91 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#![cfg(feature = "with_gecko")]
+
+use {nsstring::nsACString, uuid::Uuid};
+
 #[macro_use]
 mod macros;
+mod event;
 
-use ffi_support::FfiStr;
-#[cfg(feature = "with_gecko")]
-use {nsstring::nsACString, uuid::Uuid};
+#[no_mangle]
+pub unsafe extern "C" fn fog_counter_add(id: u32, amount: i32) {
+    let metric = metric_get!(COUNTER_MAP, id);
+    metric.add(amount);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_counter_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(COUNTER_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_counter_test_get_value(id: u32, storage_name: &nsACString) -> i32 {
+    test_get!(COUNTER_MAP, id, storage_name)
+}
 
-define_metric_ffi!(COUNTER_MAP {
-    test_has -> fog_counter_test_has_value,
-    test_get -> fog_counter_test_get_value: i32,
-    add -> fog_counter_add(amount: i32),
-});
-
-define_metric_ffi!(TIMESPAN_MAP {
-    test_has -> fog_timespan_test_has_value,
-    test_get -> fog_timespan_test_get_value: u64,
-    start -> fog_timespan_start(),
-    stop -> fog_timespan_stop(),
-});
+#[no_mangle]
+pub unsafe extern "C" fn fog_timespan_start(id: u32) {
+    let metric = metric_get!(TIMESPAN_MAP, id);
+    metric.start();
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_timespan_stop(id: u32) {
+    let metric = metric_get!(TIMESPAN_MAP, id);
+    metric.stop();
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_timespan_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(TIMESPAN_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_timespan_test_get_value(id: u32, storage_name: &nsACString) -> u64 {
+    test_get!(TIMESPAN_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_boolean_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(BOOLEAN_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn fog_boolean_test_get_value(id: u32, storage_name: &nsACString) -> bool {
+    test_get!(BOOLEAN_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub extern "C" fn fog_boolean_set(id: u32, value: bool) {
+    let metric = metric_get!(BOOLEAN_MAP, id);
+    metric.set(value);
+}
 
 // The String functions are custom because test_get needs to use an outparam.
 // If we can make test_get optional, we can go back to using the macro to
 // generate the rest of the functions, or something.
 
 #[no_mangle]
-pub extern "C" fn fog_string_test_has_value(id: u32, storage_name: FfiStr) -> u8 {
-    match crate::metrics::__glean_metric_maps::STRING_MAP.get(&id.into()) {
-        Some(metric) => metric.test_get_value(storage_name.as_str()).is_some() as u8,
-        None => panic!("No metric for id {}", id),
-    }
+pub extern "C" fn fog_string_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(STRING_MAP, id, storage_name)
 }
 
-#[cfg(feature = "with_gecko")]
 #[no_mangle]
-pub extern "C" fn fog_string_test_get_value(id: u32, storage_name: FfiStr, value: &mut nsACString) {
-    match crate::metrics::__glean_metric_maps::STRING_MAP.get(&id.into()) {
-        Some(metric) => {
-            value.assign(&metric.test_get_value(storage_name.as_str()).unwrap());
-        }
-        None => panic!("No metric for id {}", id),
-    }
+pub extern "C" fn fog_string_test_get_value(
+    id: u32,
+    storage_name: &nsACString,
+    value: &mut nsACString,
+) {
+    let val = test_get!(STRING_MAP, id, storage_name);
+    value.assign(&val);
 }
 
-#[cfg(feature = "with_gecko")]
 #[no_mangle]
 pub extern "C" fn fog_string_set(id: u32, value: &nsACString) {
-    match crate::metrics::__glean_metric_maps::STRING_MAP.get(&id.into()) {
-        Some(metric) => metric.set(value.to_utf8()),
-        None => panic!("No metric for id {}", id),
-    }
+    let metric = metric_get!(STRING_MAP, id);
+    metric.set(value.to_utf8());
 }
 
 // The Uuid functions are custom because test_get needs to use an outparam.
@@ -59,44 +94,61 @@
 // generate the rest of the functions, or something.
 
 #[no_mangle]
-pub extern "C" fn fog_uuid_test_has_value(id: u32, storage_name: FfiStr) -> u8 {
-    match crate::metrics::__glean_metric_maps::UUID_MAP.get(&id.into()) {
-        Some(metric) => metric.test_get_value(storage_name.as_str()).is_some() as u8,
-        None => panic!("No metric for id {}", id),
-    }
+pub extern "C" fn fog_uuid_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(UUID_MAP, id, storage_name)
 }
 
-#[cfg(feature = "with_gecko")]
 #[no_mangle]
-pub extern "C" fn fog_uuid_test_get_value(id: u32, storage_name: FfiStr, value: &mut nsACString) {
-    match crate::metrics::__glean_metric_maps::UUID_MAP.get(&id.into()) {
-        Some(uuid) => {
-            value.assign(
-                &uuid
-                    .test_get_value(storage_name.as_str())
-                    .unwrap()
-                    .to_string(),
-            );
-        }
-        None => panic!("No metric for id {}", id),
-    }
+pub extern "C" fn fog_uuid_test_get_value(
+    id: u32,
+    storage_name: &nsACString,
+    value: &mut nsACString,
+) {
+    let uuid = test_get!(UUID_MAP, id, storage_name).to_string();
+    value.assign(&uuid);
 }
 
-#[cfg(feature = "with_gecko")]
 #[no_mangle]
 pub extern "C" fn fog_uuid_set(id: u32, value: &nsACString) {
     if let Ok(uuid) = Uuid::parse_str(&value.to_utf8()) {
-        match crate::metrics::__glean_metric_maps::UUID_MAP.get(&id.into()) {
-            Some(metric) => metric.set(uuid),
-            None => panic!("No metric for id {}", id),
-        }
+        let metric = metric_get!(UUID_MAP, id);
+        metric.set(uuid);
     }
 }
 
 #[no_mangle]
 pub extern "C" fn fog_uuid_generate_and_set(id: u32) {
-    match crate::metrics::__glean_metric_maps::UUID_MAP.get(&id.into()) {
-        Some(metric) => metric.generate_and_set(),
-        None => panic!("No metric for id {}", id),
-    }
+    let metric = metric_get!(UUID_MAP, id);
+    metric.generate_and_set();
+}
+
+#[no_mangle]
+pub extern "C" fn fog_datetime_test_has_value(id: u32, storage_name: &nsACString) -> bool {
+    test_has!(DATETIME_MAP, id, storage_name)
+}
+
+#[no_mangle]
+pub extern "C" fn fog_datetime_test_get_value(
+    id: u32,
+    storage_name: &nsACString,
+    value: &mut nsACString,
+) {
+    let val = test_get!(DATETIME_MAP, id, storage_name);
+    value.assign(&val);
+}
+
+#[no_mangle]
+pub extern "C" fn fog_datetime_set(
+    id: u32,
+    year: i32,
+    month: u32,
+    day: u32,
+    hour: u32,
+    minute: u32,
+    second: u32,
+    nano: u32,
+    offset_seconds: i32,
+) {
+    let metric = metric_get!(DATETIME_MAP, id);
+    metric.set_with_details(year, month, day, hour, minute, second, nano, offset_seconds);
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/lib.rs firefox-85.0+build1/toolkit/components/glean/api/src/lib.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,13 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! The public Glean SDK API, for Rust consumers.
-//!
-//! ## Example:
-//!
-//! ```rust,ignore
-//! assert!(glean::is_upload_enabled())
-//! ```
+//! The public FOG APIs, for Rust consumers.
 
 // Re-exporting for later use in generated code.
 pub extern crate chrono;
@@ -16,7 +10,6 @@
 pub extern crate uuid;
 
 pub mod metrics;
-pub mod ping_upload;
 pub mod pings;
 pub mod private;
 
@@ -38,20 +31,3 @@
         .unwrap();
     f(&mut lock)
 }
-
-/// Determine whether upload is enabled.
-///
-/// See `glean_core::Glean.is_upload_enabled`.
-pub fn is_upload_enabled() -> bool {
-    with_glean(|glean| glean.is_upload_enabled())
-}
-
-pub fn flush_init() -> Result<(), dispatcher::DispatchError> {
-    dispatcher::flush_init()
-}
-
-pub fn shutdown() {
-    if let Err(e) = dispatcher::try_shutdown() {
-        log::error!("Can't shutdown dispatcher thread: {:?}", e);
-    }
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/metrics.rs firefox-85.0+build1/toolkit/components/glean/api/src/metrics.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/metrics.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/metrics.rs	2021-01-18 19:58:26.000000000 +0000
@@ -44,4 +44,27 @@
 
     pub static STRING_LIST_MAP: Lazy<HashMap<MetricId, &Lazy<StringListMetric>>> =
         Lazy::new(HashMap::new);
+
+    pub static UUID_MAP: Lazy<HashMap<MetricId, &Lazy<UuidMetric>>> = Lazy::new(HashMap::new);
+
+    pub(crate) fn event_record_wrapper(
+        _metric_id: u32,
+        _extra: Option<HashMap<i32, String>>,
+    ) -> Result<(), EventRecordingError> {
+        Err(EventRecordingError::InvalidId)
+    }
+
+    pub(crate) fn event_record_wrapper_str(
+        _metric_id: u32,
+        _extra: Option<HashMap<String, String>>,
+    ) -> Result<(), EventRecordingError> {
+        Err(EventRecordingError::InvalidId)
+    }
+
+    pub(crate) fn event_test_get_value_wrapper(
+        _metric_id: u32,
+        _storage_name: &str,
+    ) -> Option<Vec<RecordedEvent>> {
+        None
+    }
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/ping_upload.rs firefox-85.0+build1/toolkit/components/glean/api/src/ping_upload.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/ping_upload.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/ping_upload.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +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 https://mozilla.org/MPL/2.0/.
-
-//! The Ping Upload Scheduler logic.
-//!
-//! Register your application's PingUploader to upload pings when scheduled.
-//!
-//! ## Example:
-//!
-//! ```rust,ignore
-//! fn during_init() {
-//!     ping_upload::register_uploader(Box::new(|ping_request| do_the_thing(ping_request)));
-//! }
-//! ```
-
-use glean_core::upload::PingUploadTask::*;
-pub use glean_core::upload::{PingRequest, UploadResult};
-
-use once_cell::sync::OnceCell;
-
-use std::sync::Mutex;
-use std::thread;
-
-pub type UploadFn = dyn (FnMut(&PingRequest) -> UploadResult) + Send;
-static UPLOADER: OnceCell<Mutex<Box<UploadFn>>> = OnceCell::new();
-
-/// Threadsafe. Set the uploader to be used for all pings.
-/// Subsequent calls fail.
-pub fn register_uploader(uploader: Box<UploadFn>) -> Result<(), ()> {
-    UPLOADER.set(Mutex::new(uploader)).map_err(|_| ())
-}
-
-/// Called occasionally on any thread to nudge the Scheduler to ask Glean for
-/// ping requests.
-pub fn check_for_uploads() {
-    if UPLOADER.get().is_none() {
-        return;
-    }
-    thread::spawn(move || {
-        while let Some(mutex) = UPLOADER.get() {
-            let uploader = &mut *mutex.lock().unwrap();
-            if let Upload(request) = crate::with_glean(|glean| glean.get_upload_task()) {
-                let response = (*uploader)(&request);
-                crate::with_glean(|glean| {
-                    glean.process_ping_upload_response(&request.document_id, response)
-                });
-            } else {
-                // For now, don't bother distinguishing between Wait and Done.
-                // Either mean there's no task to execute right now.
-                break;
-            }
-        }
-    });
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/boolean.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/boolean.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/boolean.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/boolean.rs	2021-01-18 19:58:27.000000000 +0000
@@ -2,25 +2,24 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::Arc;
+use inherent::inherent;
+
+use glean_core::traits::Boolean;
 
 use super::CommonMetricData;
 
-use crate::dispatcher;
 use crate::ipc::need_ipc;
 use crate::private::MetricId;
 
 /// A boolean metric.
 ///
 /// Records a simple true or false value.
-#[derive(Debug)]
+#[derive(Clone)]
 pub enum BooleanMetric {
-    Parent(Arc<BooleanMetricImpl>),
+    Parent(glean::private::BooleanMetric),
     Child(BooleanMetricIpc),
 }
 #[derive(Clone, Debug)]
-pub struct BooleanMetricImpl(pub(crate) glean_core::metrics::BooleanMetric);
-#[derive(Debug)]
 pub struct BooleanMetricIpc;
 
 impl BooleanMetric {
@@ -29,7 +28,7 @@
         if need_ipc() {
             BooleanMetric::Child(BooleanMetricIpc)
         } else {
-            BooleanMetric::Parent(Arc::new(BooleanMetricImpl::new(meta)))
+            BooleanMetric::Parent(glean::private::BooleanMetric::new(meta))
         }
     }
 
@@ -40,23 +39,22 @@
             BooleanMetric::Child(_) => panic!("Can't get a child metric from a child metric"),
         }
     }
+}
 
+#[inherent(pub)]
+impl Boolean for BooleanMetric {
     /// Set to the specified boolean value.
     ///
     /// ## Arguments
     ///
     /// * `value` - the value to set.
-    pub fn set(&self, value: bool) {
+    fn set(&self, value: bool) {
         match self {
             BooleanMetric::Parent(p) => {
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.set(value));
+                Boolean::set(&*p, value);
             }
             BooleanMetric::Child(_) => {
-                log::error!(
-                    "Unable to set boolean metric {:?} in non-parent process. Ignoring.",
-                    self
-                );
+                log::error!("Unable to set boolean metric in non-parent process. Ignoring.");
                 // TODO: Record an error.
             }
         }
@@ -69,39 +67,21 @@
     ///
     /// ## Arguments
     ///
-    /// * `storage_name` - the storage name to look into.
+    /// * `ping_name` - the storage name to look into.
     ///
     /// ## Return value
     ///
     /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<bool> {
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<bool> {
         match self {
-            BooleanMetric::Parent(p) => {
-                dispatcher::block_on_queue();
-                p.test_get_value(storage_name)
+            BooleanMetric::Parent(p) => p.test_get_value(ping_name),
+            BooleanMetric::Child(_) => {
+                panic!("Cannot get test value for boolean metric in non-parent process!",)
             }
-            BooleanMetric::Child(_) => panic!(
-                "Cannot get test value for {:?} in non-parent process!",
-                self
-            ),
         }
     }
 }
 
-impl BooleanMetricImpl {
-    pub fn new(meta: CommonMetricData) -> Self {
-        Self(glean_core::metrics::BooleanMetric::new(meta))
-    }
-
-    pub fn set(&self, value: bool) {
-        crate::with_glean(move |glean| self.0.set(glean, value))
-    }
-
-    pub fn test_get_value(&self, storage_name: &str) -> Option<bool> {
-        crate::with_glean(move |glean| self.0.test_get_value(glean, storage_name))
-    }
-}
-
 #[cfg(test)]
 mod test {
     use crate::{common_test::*, ipc, metrics};
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/counter.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/counter.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/counter.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/counter.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,11 +2,12 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::Arc;
+use inherent::inherent;
+
+use glean_core::traits::Counter;
 
 use super::CommonMetricData;
 
-use crate::dispatcher;
 use crate::ipc::{need_ipc, with_ipc_payload};
 use crate::private::MetricId;
 
@@ -14,20 +15,18 @@
 ///
 /// Used to count things.
 /// The value can only be incremented, not decremented.
-#[derive(Debug)]
+#[derive(Clone)]
 pub enum CounterMetric {
     Parent {
         /// The metric's ID.
         ///
         /// **TEST-ONLY** - Do not use unless gated with `#[cfg(test)]`.
         id: MetricId,
-        inner: Arc<CounterMetricImpl>,
+        inner: glean::private::CounterMetric,
     },
     Child(CounterMetricIpc),
 }
 #[derive(Clone, Debug)]
-pub struct CounterMetricImpl(pub(crate) glean_core::metrics::CounterMetric);
-#[derive(Debug)]
 pub struct CounterMetricIpc(MetricId);
 
 impl CounterMetric {
@@ -36,7 +35,7 @@
         if need_ipc() {
             CounterMetric::Child(CounterMetricIpc(id))
         } else {
-            let inner = Arc::new(CounterMetricImpl::new(meta));
+            let inner = glean::private::CounterMetric::new(meta);
             CounterMetric::Parent { id, inner }
         }
     }
@@ -56,7 +55,10 @@
             CounterMetric::Child(_) => panic!("Can't get a child metric from a child metric"),
         }
     }
+}
 
+#[inherent(pub)]
+impl Counter for CounterMetric {
     /// Increase the counter by `amount`.
     ///
     /// ## Arguments
@@ -66,11 +68,10 @@
     /// ## Notes
     ///
     /// Logs an error if the `amount` is 0 or negative.
-    pub fn add(&self, amount: i32) {
+    fn add(&self, amount: i32) {
         match self {
             CounterMetric::Parent { inner, .. } => {
-                let metric = Arc::clone(&inner);
-                dispatcher::launch(move || metric.add(amount));
+                Counter::add(&*inner, amount);
             }
             CounterMetric::Child(c) => {
                 with_ipc_payload(move |payload| {
@@ -91,36 +92,47 @@
     ///
     /// ## Arguments
     ///
-    /// * `storage_name` - the storage name to look into.
+    /// * `ping_name` - the storage name to look into.
     ///
     /// ## Return value
     ///
     /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<i32> {
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<i32> {
         match self {
-            CounterMetric::Parent { inner, .. } => {
-                dispatcher::block_on_queue();
-                inner.test_get_value(storage_name)
+            CounterMetric::Parent { inner, .. } => inner.test_get_value(ping_name),
+            CounterMetric::Child(c) => {
+                panic!("Cannot get test value for {:?} in non-parent process!", c.0)
             }
-            CounterMetric::Child(_c) => panic!(
-                "Cannot get test value for {:?} in non-parent process!",
-                self
-            ),
         }
     }
-}
-
-impl CounterMetricImpl {
-    pub fn new(meta: CommonMetricData) -> Self {
-        Self(glean_core::metrics::CounterMetric::new(meta))
-    }
-
-    pub fn add(&self, amount: i32) {
-        crate::with_glean(move |glean| self.0.add(glean, amount))
-    }
 
-    pub fn test_get_value(&self, storage_name: &str) -> Option<i32> {
-        crate::with_glean(move |glean| self.0.test_get_value(glean, storage_name))
+    /// **Test-only API.**
+    ///
+    /// Gets the number of recorded errors for the given metric and error type.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: glean::ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        match self {
+            CounterMetric::Parent { inner, .. } => {
+                inner.test_get_num_recorded_errors(error, ping_name)
+            }
+            CounterMetric::Child(c) => panic!(
+                "Cannot get the number of recorded errors for {:?} in non-parent process!",
+                c.0
+            ),
+        }
     }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/datetime.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/datetime.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/datetime.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/datetime.rs	2021-01-18 19:58:26.000000000 +0000
@@ -65,6 +65,58 @@
         }
     }
 
+    /// Sets the metric to a date/time including the timezone offset.
+    ///
+    /// # Arguments
+    ///
+    /// * `year` - the year to set the metric to.
+    /// * `month` - the month to set the metric to (1-12).
+    /// * `day` - the day to set the metric to (1-based).
+    /// * `hour` - the hour to set the metric to (0-23).
+    /// * `minute` - the minute to set the metric to.
+    /// * `second` - the second to set the metric to.
+    /// * `nano` - the nanosecond fraction to the last whole second.
+    /// * `offset_seconds` - the timezone difference, in seconds, for the Eastern
+    ///   Hemisphere. Negative seconds mean Western Hemisphere.
+    #[cfg_attr(not(feature = "with-gecko"), allow(dead_code))]
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn set_with_details(
+        &self,
+        year: i32,
+        month: u32,
+        day: u32,
+        hour: u32,
+        minute: u32,
+        second: u32,
+        nano: u32,
+        offset_seconds: i32,
+    ) {
+        match self {
+            DatetimeMetric::Parent(p) => {
+                let metric = Arc::clone(&p);
+                dispatcher::launch(move || {
+                    metric.set_with_details(
+                        year,
+                        month,
+                        day,
+                        hour,
+                        minute,
+                        second,
+                        nano,
+                        offset_seconds,
+                    )
+                });
+            }
+            DatetimeMetric::Child(_) => {
+                log::error!(
+                    "Unable to set datetime metric {:?} in non-parent process. Ignoring.",
+                    self
+                );
+                // TODO: Record an error.
+            }
+        }
+    }
+
     /// **Test-only API.**
     ///
     /// Get the currently stored value.
@@ -82,7 +134,7 @@
     /// ## Return value
     ///
     /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<String> {
+    pub fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, storage_name: S) -> Option<String> {
         match self {
             DatetimeMetric::Parent(p) => {
                 dispatcher::block_on_queue();
@@ -105,8 +157,37 @@
         crate::with_glean(move |glean| self.0.set(glean, value))
     }
 
-    pub fn test_get_value(&self, storage_name: &str) -> Option<String> {
-        crate::with_glean(move |glean| self.0.test_get_value_as_string(glean, storage_name))
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn set_with_details(
+        &self,
+        year: i32,
+        month: u32,
+        day: u32,
+        hour: u32,
+        minute: u32,
+        second: u32,
+        nano: u32,
+        offset_seconds: i32,
+    ) {
+        crate::with_glean(move |glean| {
+            self.0.set_with_details(
+                glean,
+                year,
+                month,
+                day,
+                hour,
+                minute,
+                second,
+                nano,
+                offset_seconds,
+            );
+        })
+    }
+
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, storage_name: S) -> Option<String> {
+        // FIXME(bug 1677448): This hack goes away when the type is implemented in RLB.
+        let storage = storage_name.into().expect("storage name required.");
+        crate::with_glean(move |glean| self.0.test_get_value_as_string(glean, storage))
     }
 }
 
@@ -117,6 +198,7 @@
     use crate::{common_test::*, ipc, metrics};
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677448 lands.
     fn sets_datetime_value() {
         let _lock = lock_test();
 
@@ -134,6 +216,22 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677448 lands.
+    fn sets_datetime_value_with_details() {
+        let _lock = lock_test();
+
+        let metric = &metrics::test_only_ipc::a_date;
+
+        metric.set_with_details(2020, 05, 07, 11, 58, 0, 0, 5 * 3600);
+
+        assert_eq!(
+            "2020-05-07T11:58:00+05:00",
+            metric.test_get_value("store1").unwrap()
+        );
+    }
+
+    #[test]
+    #[ignore] // TODO: Enable them back when bug 1677448 lands.
     fn datetime_ipc() {
         // DatetimeMetric doesn't support IPC.
         let _lock = lock_test();
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/event.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/event.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/event.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/event.rs	2021-01-18 19:58:26.000000000 +0000
@@ -3,78 +3,32 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use std::collections::HashMap;
-use std::hash::Hash;
-use std::marker::PhantomData;
-use std::sync::Arc;
+
+use inherent::inherent;
 
 use super::{CommonMetricData, Instant, MetricId, RecordedEvent};
 
-use crate::dispatcher;
 use crate::ipc::{need_ipc, with_ipc_payload};
 
-/// Extra keys for events.
-///
-/// Extra keys need to be pre-defined and map to a string representation.
-///
-/// For user-defined `EventMetric`s these will be defined as `enums`.
-/// Each variant will correspond to an entry in the `ALLOWED_KEYS` list.
-/// The Glean SDK requires the keys as strings for submission in pings,
-/// whereas in code we want to provide users a type to work with
-/// (e.g. to avoid typos or misuse of the API).
-pub trait ExtraKeys: Hash + Eq + PartialEq + Copy {
-    /// List of allowed extra keys as strings.
-    const ALLOWED_KEYS: &'static [&'static str];
-
-    /// The index of the extra key.
-    ///
-    /// It corresponds to its position in the associated `ALLOWED_KEYS` list.
-    ///
-    /// *Note*: An index of `-1` indicates an invalid / non-existing extra key.
-    /// Invalid / non-existing extra keys will be recorded as an error.
-    /// This cannot happen for generated code.
-    fn index(self) -> i32;
-}
-
-/// Default of no extra keys for events.
-///
-/// An enum with no values for convenient use as the default set of extra keys
-/// that an `EventMetric` can accept.
-///
-/// *Note*: There exist no values for this enum, it can never exist.
-/// It its equivalent to the [`never / !` type](https://doc.rust-lang.org/std/primitive.never.html).
-#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
-pub enum NoExtraKeys {}
-
-impl ExtraKeys for NoExtraKeys {
-    const ALLOWED_KEYS: &'static [&'static str] = &[];
-
-    fn index(self) -> i32 {
-        // This index will never be used.
-        -1
-    }
-}
+use glean_core::traits::Event;
+pub use glean_core::traits::{EventRecordingError, ExtraKeys, NoExtraKeys};
 
 /// An event metric.
 ///
 /// Events allow recording of e.g. individual occurences of user actions, say
 /// every time a view was open and from where. Each time you record an event, it
 /// records a timestamp, the event's name and a set of custom values.
-#[derive(Debug)]
 pub enum EventMetric<K> {
     Parent {
         /// The metric's ID.
         ///
         /// **TEST-ONLY** - Do not use unless gated with `#[cfg(test)]`.
         id: MetricId,
-        inner: Arc<EventMetricImpl<K>>,
+        inner: glean::private::EventMetric<K>,
     },
     Child(EventMetricIpc),
 }
-#[derive(Clone, Debug)]
-pub struct EventMetricImpl<K> {
-    inner: glean_core::metrics::EventMetric,
-    extra_keys: PhantomData<K>,
-}
+
 #[derive(Debug)]
 pub struct EventMetricIpc(MetricId);
 
@@ -84,7 +38,7 @@
         if need_ipc() {
             EventMetric::Child(EventMetricIpc(id))
         } else {
-            let inner = Arc::new(EventMetricImpl::new(meta));
+            let inner = glean::private::EventMetric::new(meta);
             EventMetric::Parent { id, inner }
         }
     }
@@ -96,22 +50,16 @@
             EventMetric::Child(_) => panic!("Can't get a child metric from a child metric"),
         }
     }
+}
 
-    /// Record an event.
-    ///
-    /// Records an event under this metric's name and attaches a timestamp.
-    /// If given a map of extra values is added to the event log.
-    ///
-    /// ## Arguments
-    ///
-    /// * `extra` - An (optional) map of (key, value) pairs.
-    pub fn record<M: Into<Option<HashMap<K, String>>> + Send + Sync>(&self, extra: M) {
+#[inherent(pub)]
+impl<K: 'static + ExtraKeys + Send + Sync> Event for EventMetric<K> {
+    type Extra = K;
+
+    fn record<M: Into<Option<HashMap<K, String>>>>(&self, extra: M) {
         match self {
             EventMetric::Parent { inner, .. } => {
-                let metric = Arc::clone(&inner);
-                let extra = extra.into();
-                let now = Instant::now();
-                dispatcher::launch(move || metric.record(now, extra));
+                inner.record(extra);
             }
             EventMetric::Child(c) => {
                 let extra = extra.into().map(|hash_map| {
@@ -134,61 +82,33 @@
         }
     }
 
-    /// **Test-only API.**
-    ///
-    /// Get the currently stored events for this event metric as a JSON-encoded string.
-    /// This doesn't clear the stored value.
-    ///
-    /// ## Note
-    ///
-    /// This currently returns the value as a JSON encoded string.
-    /// `glean_core` doesn't expose the underlying recorded event type.
-    /// This will eventually change to a proper `RecordedEventData` type.
-    /// See [Bug 1635074](https://bugzilla.mozilla.org/show_bug.cgi?id=1635074).
-    ///
-    /// ## Arguments
-    ///
-    /// * `storage_name` - the storage name to look into.
-    ///
-    /// ## Return value
-    ///
-    /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<Vec<RecordedEvent>> {
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<Vec<RecordedEvent>> {
         match self {
-            EventMetric::Parent { inner, .. } => {
-                dispatcher::block_on_queue();
-                inner.test_get_value(storage_name)
-            }
+            EventMetric::Parent { inner, .. } => inner.test_get_value(ping_name),
             EventMetric::Child(_) => {
                 panic!("Cannot get test value for event metric in non-parent process!",)
             }
         }
     }
-}
 
-impl<K: ExtraKeys> EventMetricImpl<K> {
-    pub fn new(meta: CommonMetricData) -> Self {
-        let allowed_extra_keys = K::ALLOWED_KEYS.iter().map(|s| s.to_string()).collect();
-        let inner = glean_core::metrics::EventMetric::new(meta, allowed_extra_keys);
-
-        Self {
-            inner,
-            extra_keys: PhantomData,
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: glean::ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        match self {
+            EventMetric::Parent { inner, .. } => {
+                inner.test_get_num_recorded_errors(error, ping_name)
+            }
+            EventMetric::Child(c) => panic!(
+                "Cannot get the number of recorded errors for {:?} in non-parent process!",
+                c.0
+            ),
         }
     }
-
-    pub fn record<M: Into<Option<HashMap<K, String>>>>(&self, then: Instant, extra: M) {
-        // Translate from [ExtraKey -> String] to a [Int -> String] map
-        let extra = extra
-            .into()
-            .map(|h| h.into_iter().map(|(k, v)| (k.index(), v)).collect());
-
-        crate::with_glean(|glean| self.inner.record(glean, then.as_millis(), extra))
-    }
-
-    pub fn test_get_value(&self, storage_name: &str) -> Option<Vec<RecordedEvent>> {
-        crate::with_glean(|glean| self.inner.test_get_value(glean, storage_name))
-    }
 }
 
 #[cfg(test)]
@@ -197,6 +117,7 @@
     use crate::{common_test::*, ipc, metrics};
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1673668 lands.
     fn smoke_test_event() {
         let _lock = lock_test();
 
@@ -220,6 +141,7 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1673668 lands.
     fn smoke_test_event_with_extra() {
         let _lock = lock_test();
 
@@ -267,6 +189,7 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1673668 lands.
     fn event_ipc() {
         use metrics::test_only_ipc::AnEventKeys;
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/labeled.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/labeled.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/labeled.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/labeled.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,91 +2,44 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::RwLock;
-
-use glean_core::metrics::MetricType;
+use inherent::inherent;
 
 use super::{BooleanMetric, CommonMetricData, CounterMetric, ErrorType, MetricId, StringMetric};
-use crate::dispatcher;
 use crate::ipc::need_ipc;
 
 /// Sealed traits protect against downstream implementations.
 ///
 /// We wrap it in a private module that is inaccessible outside of this module.
 mod private {
-    use super::{BooleanMetric, CommonMetricData, CounterMetric, MetricId, StringMetric};
-    use crate::ipc::need_ipc;
-    use std::sync::Arc;
+    use super::{BooleanMetric, CounterMetric, StringMetric};
 
     /// The sealed trait.
     ///
-    /// This also allows us to hide methods, that are only used internally
-    /// and should not be visible to users.
+    /// This allows us to define which FOG metrics can be used
+    /// as labeled types.
     pub trait Sealed {
-        type Inner: glean_core::metrics::MetricType + Clone;
-
-        /// Create a new metric object from the inner type.
-        fn from_inner(id: MetricId, metric: Self::Inner) -> Self;
-
-        /// Create a new `glean_core `metric of the inner type.
-        fn new_inner(meta: CommonMetricData) -> Self::Inner;
+        type GleanMetric: glean::private::AllowLabeled + Clone;
     }
 
     // `LabeledMetric<BooleanMetric>` is possible.
     //
     // See [Labeled Booleans](https://mozilla.github.io/glean/book/user/metrics/labeled_booleans.html).
     impl Sealed for BooleanMetric {
-        type Inner = glean_core::metrics::BooleanMetric;
-
-        fn from_inner(_id: MetricId, metric: Self::Inner) -> Self {
-            assert!(
-                !need_ipc(),
-                "Labeled Boolean metrics are not supported in non-main processes"
-            );
-            BooleanMetric::Parent(Arc::new(crate::private::boolean::BooleanMetricImpl(metric)))
-        }
-
-        fn new_inner(meta: CommonMetricData) -> Self::Inner {
-            glean_core::metrics::BooleanMetric::new(meta)
-        }
+        type GleanMetric = glean::private::BooleanMetric;
     }
 
     // `LabeledMetric<StringMetric>` is possible.
     //
     // See [Labeled Strings](https://mozilla.github.io/glean/book/user/metrics/labeled_strings.html).
     impl Sealed for StringMetric {
-        type Inner = glean_core::metrics::StringMetric;
-
-        fn from_inner(_id: MetricId, metric: Self::Inner) -> Self {
-            assert!(
-                !need_ipc(),
-                "Labeled String metrics are not supported in non-main processes"
-            );
-            StringMetric::Parent(crate::private::string::StringMetricImpl(metric))
-        }
-
-        fn new_inner(meta: CommonMetricData) -> Self::Inner {
-            glean_core::metrics::StringMetric::new(meta)
-        }
+        type GleanMetric = glean::private::StringMetric;
     }
 
     // `LabeledMetric<CounterMetric>` is possible.
     //
     // See [Labeled Counters](https://mozilla.github.io/glean/book/user/metrics/labeled_counters.html).
     impl Sealed for CounterMetric {
-        type Inner = glean_core::metrics::CounterMetric;
-
-        fn from_inner(id: MetricId, metric: Self::Inner) -> Self {
-            assert!(!need_ipc());
-            CounterMetric::Parent {
-                id,
-                inner: Arc::new(crate::private::counter::CounterMetricImpl(metric)),
-            }
-        }
-
-        fn new_inner(meta: CommonMetricData) -> Self::Inner {
-            glean_core::metrics::CounterMetric::new(meta)
-        }
+        type GleanMetric = glean::private::CounterMetric;
     }
 }
 
@@ -127,17 +80,18 @@
 /// ```rust,ignore
 /// errro::seen_one.get("upload").set(true);
 /// ```
-#[derive(Debug)]
+//#[derive(Debug)]
 pub struct LabeledMetric<T: AllowLabeled> {
+    // TODO: the `_id` is currently not needed, hence the
+    // prefix, but it will be needed when adding IPC support
+    // to this type.
     /// The metric ID of the underlying metric.
-    id: MetricId,
+    _id: MetricId,
 
     /// Wrapping the underlying core metric.
     ///
     /// We delegate all functionality to this and wrap it up again in our own metric type.
-    ///
-    /// *Note*: Needs to be thread-safe mutable, as required by the underlying `glean_core` type.
-    core: RwLock<glean_core::metrics::LabeledMetric<T::Inner>>,
+    core: glean::private::LabeledMetric<T::GleanMetric>,
 }
 
 impl<T> LabeledMetric<T>
@@ -152,72 +106,58 @@
         meta: CommonMetricData,
         labels: Option<Vec<String>>,
     ) -> LabeledMetric<T> {
-        let submetric = T::new_inner(meta);
-        let core = glean_core::metrics::LabeledMetric::new(submetric, labels);
-
-        LabeledMetric {
-            id,
-            core: RwLock::new(core),
-        }
+        let core = glean::private::LabeledMetric::new(meta, labels);
+        LabeledMetric { _id: id, core }
     }
+}
 
-    /// Get a specific metric for a given label.
+#[inherent(pub)]
+impl<U> glean_core::traits::Labeled<U::GleanMetric> for LabeledMetric<U>
+where
+    U: AllowLabeled + Clone,
+{
+    /// Gets a specific metric for a given label.
     ///
     /// If a set of acceptable labels were specified in the `metrics.yaml` file,
-    /// and the given label is not in the set, it will be recorded under the special `__other__` label.
+    /// and the given label is not in the set, it will be recorded under the special `OTHER_LABEL` label.
     ///
     /// If a set of acceptable labels was not specified in the `metrics.yaml` file,
     /// only the first 16 unique labels will be used.
-    /// After that, any additional labels will be recorded under the special `__other__` label.
-    ///
-    /// Labels must conform to the [label formatting regular expression](https://mozilla.github.io/glean/book/user/metrics/index.html#label-format).
-    /// Labels must be made up of dot-separated identifiers with lowercase ASCII alphanumerics, containing underscores and dashes.
+    /// After that, any additional labels will be recorded under the special `OTHER_LABEL` label.
     ///
-    /// If an invalid label is used, the metric will be recorded in the special `__other__` label.
-    pub fn get(&self, label: &str) -> T {
+    /// Labels must be `snake_case` and less than 30 characters.
+    /// If an invalid label is used, the metric will be recorded in the special `OTHER_LABEL` label.
+    fn get(&self, label: &str) -> U::GleanMetric {
         if need_ipc() {
             panic!("Use of labeled metrics in IPC land not yet implemented!");
         } else {
-            let core = self
-                .core
-                .write()
-                .expect("lock of wrapped metric was poisoned");
-            let inner = core.get(label);
-            T::from_inner(self.id, inner)
+            self.core.get(label)
         }
     }
 
-    /// **Test-only API.**
+    /// **Exported for test purposes.**
     ///
-    /// Get the number of recorded errors for this labeled metric and error type.
+    /// Gets the number of recorded errors for the given metric and error type.
     ///
-    /// ## Arguments
+    /// # Arguments
     ///
-    /// * error - The type of error
-    /// * `storage_name` - the storage name to look into.
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
     ///
-    /// ## Return value
+    /// # Returns
     ///
-    /// The number of errors reported if any.
-    /// Otherwise an error.
-    pub fn test_get_num_recorded_errors(
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
         &self,
-        error_type: ErrorType,
-        storage_name: Option<&str>,
-    ) -> Result<i32, String> {
-        dispatcher::block_on_queue();
-        crate::with_glean(move |glean| {
-            let core = self
-                .core
-                .read()
-                .expect("lock of wrapped metric was poisoned");
-            glean_core::test_get_num_recorded_errors(
-                &glean,
-                &core.get_submetric().meta(),
-                error_type,
-                storage_name,
-            )
-        })
+        error: ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        if need_ipc() {
+            panic!("Use of labeled metrics in IPC land not yet implemented!");
+        } else {
+            self.core.test_get_num_recorded_errors(error, ping_name)
+        }
     }
 }
 
@@ -348,7 +288,7 @@
             .set(true);
 
         assert_eq!(
-            Ok(1),
+            1,
             metric.test_get_num_recorded_errors(ErrorType::InvalidLabel, None)
         );
     }
@@ -385,8 +325,9 @@
             metric.get("__other__").test_get_value("store1").unwrap()
         );
 
-        assert!(metric
-            .test_get_num_recorded_errors(ErrorType::InvalidLabel, None)
-            .is_err());
+        assert_eq!(
+            0,
+            metric.test_get_num_recorded_errors(ErrorType::InvalidLabel, None)
+        );
     }
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/memory_distribution.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/memory_distribution.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/memory_distribution.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/memory_distribution.rs	2021-01-18 19:58:26.000000000 +0000
@@ -129,6 +129,7 @@
     use crate::{common_test::*, ipc, metrics};
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677451 lands.
     fn smoke_test_memory_distribution() {
         let _lock = lock_test();
 
@@ -153,6 +154,7 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677451 lands.
     fn memory_distribution_child() {
         let _lock = lock_test();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/mod.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/mod.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/mod.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/mod.rs	2021-01-18 19:58:26.000000000 +0000
@@ -33,7 +33,7 @@
 pub use self::boolean::BooleanMetric;
 pub use self::counter::CounterMetric;
 pub use self::datetime::DatetimeMetric;
-pub use self::event::{EventMetric, ExtraKeys, NoExtraKeys};
+pub use self::event::{EventMetric, EventRecordingError, ExtraKeys, NoExtraKeys};
 pub use self::labeled::LabeledMetric;
 pub use self::memory_distribution::MemoryDistributionMetric;
 pub use self::ping::Ping;
@@ -75,12 +75,6 @@
     fn as_nanos(&self) -> u64 {
         self.0
     }
-
-    /// Get this instant as a timestamp in milliseconds.
-    fn as_millis(&self) -> u64 {
-        const NANOS_PER_MILLI: u64 = 1_000_000;
-        self.0 / NANOS_PER_MILLI
-    }
 }
 
 /// Uniquely identifies a single metric within its metric type.
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/ping.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/ping.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/ping.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/ping.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,20 +2,18 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::Arc;
+use inherent::inherent;
 
-use crate::{dispatcher, ipc::need_ipc};
+use crate::ipc::need_ipc;
 
 /// A Glean ping.
 ///
 /// See [Glean Pings](https://mozilla.github.io/glean/book/user/pings/index.html).
 #[derive(Clone, Debug)]
 pub enum Ping {
-    Parent(Arc<PingImpl>),
+    Parent(glean::private::PingType),
     Child,
 }
-#[derive(Debug)]
-pub struct PingImpl(glean_core::metrics::PingType);
 
 impl Ping {
     /// Create a new ping type for the given name, whether to include the client ID and whether to
@@ -36,39 +34,28 @@
         if need_ipc() {
             Ping::Child
         } else {
-            Ping::Parent(Arc::new(PingImpl::new(
+            Ping::Parent(glean::private::PingType::new(
                 name,
                 include_client_id,
                 send_if_empty,
                 reason_codes,
-            )))
+            ))
         }
     }
+}
 
-    /// Collect and submit the ping for eventual upload.
-    ///
-    /// This will collect all stored data to be included in the ping.
-    /// Data with lifetime `ping` will then be reset.
-    ///
-    /// If the ping is configured with `send_if_empty = false`
-    /// and the ping currently contains no content,
-    /// it will not be queued for upload.
-    /// If the ping is configured with `send_if_empty = true`
-    /// it will be queued for upload even if otherwise empty.
-    ///
-    /// Pings always contain the `ping_info` and `client_info` sections.
-    /// See [ping sections](https://mozilla.github.io/glean/book/user/pings/index.html#ping-sections)
-    /// for details.
-    ///
-    /// ## Parameters
-    /// * `reason` - The reason the ping is being submitted.
-    ///              Must be one of the configured `reason_codes`.
-    pub fn submit(&self, reason: Option<&str>) {
+#[inherent(pub)]
+impl glean_core::traits::Ping for Ping {
+    /// Submits the ping for eventual uploading
+    ///
+    /// # Arguments
+    ///
+    /// * `reason` - the reason the ping was triggered. Included in the
+    ///   `ping_info.reason` part of the payload.
+    fn submit(&self, reason: Option<&str>) {
         match self {
             Ping::Parent(p) => {
-                let ping = Arc::clone(&p);
-                let reason = reason.map(|x| x.to_owned());
-                dispatcher::launch(move || ping.submit(reason.as_deref()));
+                glean_core::traits::Ping::submit(p, reason);
             }
             Ping::Child => {
                 log::error!(
@@ -81,35 +68,6 @@
     }
 }
 
-impl PingImpl {
-    pub fn new<S: Into<String>>(
-        name: S,
-        include_client_id: bool,
-        send_if_empty: bool,
-        reason_codes: Vec<String>,
-    ) -> Self {
-        let ping = glean_core::metrics::PingType::new(
-            name,
-            include_client_id,
-            send_if_empty,
-            reason_codes,
-        );
-
-        crate::with_glean(|glean| {
-            glean.register_ping_type(&ping);
-        });
-
-        Self(ping)
-    }
-
-    pub fn submit(&self, reason: Option<&str>) {
-        let res = crate::with_glean(|glean| self.0.submit(glean, reason).unwrap_or(false));
-        if res {
-            crate::ping_upload::check_for_uploads();
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use once_cell::sync::Lazy;
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/string_list.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/string_list.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/string_list.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/string_list.rs	2021-01-18 19:58:26.000000000 +0000
@@ -156,6 +156,7 @@
     use crate::{common_test::*, ipc, metrics};
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677454 lands.
     fn sets_string_list_value() {
         let _lock = lock_test();
 
@@ -171,6 +172,7 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677454 lands.
     fn string_list_ipc() {
         // StringListMetric supports IPC only for `add`, not `set`.
         let _lock = lock_test();
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/string.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/string.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/string.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/string.rs	2021-01-18 19:58:26.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 https://mozilla.org/MPL/2.0/.
 
+use inherent::inherent;
+
 use super::{CommonMetricData, MetricId};
 
 use crate::ipc::need_ipc;
@@ -35,15 +37,12 @@
 /// ```rust,ignore
 /// browser::search_engine.set("websearch");
 /// ```
-#[derive(Debug)]
+#[derive(Clone)]
 pub enum StringMetric {
-    Parent(StringMetricImpl),
+    Parent(glean::private::StringMetric),
     Child(StringMetricIpc),
 }
-
 #[derive(Clone, Debug)]
-pub struct StringMetricImpl(pub(crate) glean_core::metrics::StringMetric);
-#[derive(Debug)]
 pub struct StringMetricIpc;
 
 impl StringMetric {
@@ -52,7 +51,7 @@
         if need_ipc() {
             StringMetric::Child(StringMetricIpc)
         } else {
-            StringMetric::Parent(StringMetricImpl::new(meta))
+            StringMetric::Parent(glean::private::StringMetric::new(meta))
         }
     }
 
@@ -63,68 +62,80 @@
             StringMetric::Child(_) => panic!("Can't get a child metric from a child metric"),
         }
     }
+}
 
-    /// Set to the specified value.
+#[inherent(pub)]
+impl glean_core::traits::String for StringMetric {
+    /// Sets to the specified value.
     ///
-    /// ## Arguments
+    /// # Arguments
     ///
     /// * `value` - The string to set the metric to.
     ///
     /// ## Notes
     ///
     /// Truncates the value if it is longer than `MAX_STRING_LENGTH` bytes and logs an error.
-    /// See [String metric limits](https://mozilla.github.io/glean/book/user/metrics/string.html#limits).
-    pub fn set<S: Into<String>>(&self, value: S) {
+    fn set<S: Into<std::string::String>>(&self, value: S) {
         match self {
-            StringMetric::Parent(p) => p.set(value),
-            // No truncation here. Hrm.
+            StringMetric::Parent(p) => {
+                glean_core::traits::String::set(&*p, value);
+            }
             StringMetric::Child(_) => {
-                log::error!(
-                    "Unable to set string metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+                log::error!("Unable to set string metric in non-main process. Ignoring.");
                 // TODO: Record an error.
             }
         };
     }
 
-    /// **Test-only API.**
+    /// **Exported for test purposes.**
+    ///
+    /// Gets the currently stored value as a string.
     ///
-    /// Get the currently stored value as a string.
     /// This doesn't clear the stored value.
     ///
-    /// ## Arguments
+    /// # Arguments
     ///
-    /// * `storage_name` - the storage name to look into.
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(
+        &self,
+        ping_name: S,
+    ) -> Option<std::string::String> {
+        match self {
+            StringMetric::Parent(p) => p.test_get_value(ping_name),
+            StringMetric::Child(_) => {
+                panic!("Cannot get test value for string metric in non-parent process!")
+            }
+        }
+    }
+
+    /// **Exported for test purposes.**
     ///
-    /// ## Return value
+    /// Gets the number of recorded errors for the given metric and error type.
     ///
-    /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<String> {
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: glean::ErrorType,
+        ping_name: S,
+    ) -> i32 {
         match self {
-            StringMetric::Parent(p) => p.test_get_value(storage_name),
+            StringMetric::Parent(p) => p.test_get_num_recorded_errors(error, ping_name),
             StringMetric::Child(_) => panic!(
-                "Cannot get test value for {:?} in non-parent process!",
-                self
+                "Cannot get the number of recorded errors for string metric in non-parent process!"
             ),
         }
     }
 }
 
-impl StringMetricImpl {
-    fn new(meta: CommonMetricData) -> Self {
-        Self(glean_core::metrics::StringMetric::new(meta))
-    }
-
-    fn set<S: Into<String>>(&self, value: S) {
-        crate::with_glean(move |glean| self.0.set(glean, value))
-    }
-
-    fn test_get_value(&self, storage_name: &str) -> Option<String> {
-        crate::with_glean(move |glean| self.0.test_get_value(glean, storage_name))
-    }
-}
-
 #[cfg(test)]
 mod test {
     use crate::{common_test::*, ipc, metrics};
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/timespan.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/timespan.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/timespan.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/timespan.rs	2021-01-18 19:58:26.000000000 +0000
@@ -2,155 +2,85 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::{Arc, RwLock};
+use inherent::inherent;
 
-use super::{CommonMetricData, Instant, MetricId, TimeUnit};
+use super::{CommonMetricData, MetricId, TimeUnit};
+
+use glean_core::traits::Timespan;
 
-use crate::dispatcher;
 use crate::ipc::need_ipc;
 
 /// A timespan metric.
 ///
 /// Timespans are used to make a measurement of how much time is spent in a particular task.
-#[derive(Debug)]
 pub enum TimespanMetric {
-    Parent(Arc<TimespanMetricImpl>),
-    Child(TimespanMetricIpc),
-}
-
-#[derive(Debug)]
-pub struct TimespanMetricImpl {
-    inner: RwLock<glean_core::metrics::TimespanMetric>,
+    Parent(glean::private::TimespanMetric),
+    Child,
 }
-#[derive(Debug)]
-pub struct TimespanMetricIpc;
 
 impl TimespanMetric {
     /// Create a new timespan metric.
     pub fn new(_id: MetricId, meta: CommonMetricData, time_unit: TimeUnit) -> Self {
         if need_ipc() {
-            TimespanMetric::Child(TimespanMetricIpc)
+            TimespanMetric::Child
         } else {
-            TimespanMetric::Parent(Arc::new(TimespanMetricImpl::new(meta, time_unit)))
+            TimespanMetric::Parent(glean::private::TimespanMetric::new(meta, time_unit))
         }
     }
+}
 
-    pub fn start(&self) {
+#[inherent(pub)]
+impl Timespan for TimespanMetric {
+    fn start(&self) {
         match self {
-            TimespanMetric::Parent(p) => {
-                let now = Instant::now();
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.start(now));
-            }
-            TimespanMetric::Child(_) => {
-                log::error!(
-                    "Unable to start timespan metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+            TimespanMetric::Parent(p) => Timespan::start(p),
+            TimespanMetric::Child => {
+                log::error!("Unable to start timespan metric in non-main process. Ignoring.");
                 // TODO: Record an error.
             }
         }
     }
 
-    pub fn stop(&self) {
+    fn stop(&self) {
         match self {
-            TimespanMetric::Parent(p) => {
-                let now = Instant::now();
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.stop(now));
-            }
-            TimespanMetric::Child(_) => {
-                log::error!(
-                    "Unable to stop timespan metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+            TimespanMetric::Parent(p) => Timespan::stop(p),
+            TimespanMetric::Child => {
+                log::error!("Unable to stop timespan metric in non-main process. Ignoring.");
                 // TODO: Record an error.
             }
         }
     }
 
-    pub fn cancel(&self) {
+    fn cancel(&self) {
         match self {
-            TimespanMetric::Parent(p) => {
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.cancel());
-            }
-            TimespanMetric::Child(_) => {
-                log::error!(
-                    "Unable to cancel timespan metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+            TimespanMetric::Parent(p) => Timespan::cancel(p),
+            TimespanMetric::Child => {
+                log::error!("Unable to cancel timespan metric in non-main process. Ignoring.");
                 // TODO: Record an error.
             }
         }
     }
 
-    /// **Test-only API (exported for FFI purposes).**
-    ///
-    /// Gets the currently stored value as an integer.
-    /// This doesn't clear the stored value.
-    ///
-    /// * `storage_name` - the storage name to look into.
-    ///
-    /// ## Return value
-    ///
-    /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<u64> {
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, ping_name: S) -> Option<u64> {
         match self {
-            TimespanMetric::Parent(p) => {
-                dispatcher::block_on_queue();
-                p.test_get_value(storage_name)
+            TimespanMetric::Parent(p) => p.test_get_value(ping_name),
+            TimespanMetric::Child => {
+                panic!("Cannot get test value for in non-parent process!");
             }
-            TimespanMetric::Child(_c) => panic!(
-                "Cannot get test value for {:?} in non-parent process!",
-                self
-            ),
         }
     }
-}
 
-impl TimespanMetricImpl {
-    fn new(meta: CommonMetricData, time_unit: TimeUnit) -> Self {
-        let inner = RwLock::new(glean_core::metrics::TimespanMetric::new(meta, time_unit));
-        Self { inner }
-    }
-
-    fn start(&self, now: Instant) {
-        crate::with_glean(move |glean| {
-            let mut inner = self
-                .inner
-                .write()
-                .expect("lock of wrapped metric was poisoned");
-            inner.set_start(glean, now.as_nanos())
-        })
-    }
-
-    fn stop(&self, now: Instant) {
-        crate::with_glean(move |glean| {
-            let mut inner = self
-                .inner
-                .write()
-                .expect("lock of wrapped metric was poisoned");
-            inner.set_stop(glean, now.as_nanos())
-        })
-    }
-
-    fn cancel(&self) {
-        let mut inner = self
-            .inner
-            .write()
-            .expect("lock of wrapped metric was poisoned");
-        inner.cancel()
-    }
-
-    fn test_get_value(&self, storage_name: &str) -> Option<u64> {
-        crate::with_glean(move |glean| {
-            let inner = self
-                .inner
-                .read()
-                .expect("lock of wrapped metric was poisoned");
-            inner.test_get_value(glean, storage_name)
-        })
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: glean::ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        match self {
+            TimespanMetric::Parent(p) => p.test_get_num_recorded_errors(error, ping_name),
+            TimespanMetric::Child => {
+                panic!("Cannot get the number of recorded errors for timespan metric in non-parent process!");
+            }
+        }
     }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/timing_distribution.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/timing_distribution.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/timing_distribution.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/timing_distribution.rs	2021-01-18 19:58:26.000000000 +0000
@@ -291,6 +291,7 @@
     use crate::{common_test::*, ipc, metrics};
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677456 lands.
     fn smoke_test_timing_distribution() {
         let _lock = lock_test();
 
@@ -307,6 +308,7 @@
     }
 
     #[test]
+    #[ignore] // TODO: Enable them back when bug 1677456 lands.
     fn timing_distribution_child() {
         let _lock = lock_test();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/api/src/private/uuid.rs firefox-85.0+build1/toolkit/components/glean/api/src/private/uuid.rs
--- firefox-84.0.2+build1/toolkit/components/glean/api/src/private/uuid.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/api/src/private/uuid.rs	2021-01-18 19:58:27.000000000 +0000
@@ -2,25 +2,22 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::sync::Arc;
+use inherent::inherent;
 
 use uuid::Uuid;
 
 use super::{CommonMetricData, MetricId};
 
-use crate::{dispatcher, ipc::need_ipc};
+use crate::ipc::need_ipc;
 
 /// A UUID metric.
 ///
 /// Stores UUID values.
-#[derive(Debug)]
 pub enum UuidMetric {
-    Parent(Arc<UuidMetricImpl>),
+    Parent(glean::private::UuidMetric),
     Child(UuidMetricIpc),
 }
 
-#[derive(Clone, Debug)]
-pub struct UuidMetricImpl(pub(crate) glean_core::metrics::UuidMetric);
 #[derive(Debug)]
 pub struct UuidMetricIpc;
 
@@ -30,7 +27,7 @@
         if need_ipc() {
             UuidMetric::Child(UuidMetricIpc)
         } else {
-            UuidMetric::Parent(Arc::new(UuidMetricImpl::new(meta)))
+            UuidMetric::Parent(glean::private::UuidMetric::new(meta))
         }
     }
 
@@ -41,43 +38,42 @@
             UuidMetric::Child(_) => panic!("Can't get a child metric from a child metric"),
         }
     }
+}
 
+#[inherent(pub)]
+impl glean_core::traits::Uuid for UuidMetric {
     /// Set to the specified value.
     ///
     /// ## Arguments
     ///
     /// * `value` - The UUID to set the metric to.
-    pub fn set(&self, value: Uuid) {
+    fn set(&self, value: Uuid) {
         match self {
             UuidMetric::Parent(p) => {
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.set(value));
+                glean_core::traits::Uuid::set(&*p, value);
             }
             UuidMetric::Child(_c) => {
-                log::error!(
-                    "Unable to set UUID metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+                log::error!("Unable to set the uuid metric in non-main process. Ignoring.");
                 // TODO: Record an error.
             }
         };
     }
 
     /// Generate a new random UUID and set the metric to it.
-    pub fn generate_and_set(&self) {
+    ///
+    /// ## Return value
+    ///
+    /// Returns the stored UUID value or `Uuid::nil` if called from
+    /// a non-parent process.
+    fn generate_and_set(&self) -> Uuid {
         match self {
-            UuidMetric::Parent(p) => {
-                let metric = Arc::clone(&p);
-                dispatcher::launch(move || metric.generate_and_set());
-            }
+            UuidMetric::Parent(p) => glean_core::traits::Uuid::generate_and_set(&*p),
             UuidMetric::Child(_c) => {
-                log::error!(
-                    "Unable to set UUID metric {:?} in non-main process. Ignoring.",
-                    self
-                );
+                log::error!("Unable to set the uuid metric in non-main process. Ignoring.");
                 // TODO: Record an error.
+                Uuid::nil()
             }
-        };
+        }
     }
 
     /// **Test-only API.**
@@ -92,37 +88,37 @@
     /// ## Return value
     ///
     /// Returns the stored value or `None` if nothing stored.
-    pub fn test_get_value(&self, storage_name: &str) -> Option<Uuid> {
+    fn test_get_value<'a, S: Into<Option<&'a str>>>(&self, storage_name: S) -> Option<Uuid> {
         match self {
-            UuidMetric::Parent(p) => {
-                dispatcher::block_on_queue();
-                p.test_get_value(storage_name).map(|uuid| {
-                    Uuid::parse_str(&uuid).expect("can't parse internally created UUID value")
-                })
-            }
-            UuidMetric::Child(_c) => panic!(
-                "Cannot get test value for {:?} in non-parent process!",
-                self
-            ),
+            UuidMetric::Parent(p) => p.test_get_value(storage_name),
+            UuidMetric::Child(_c) => panic!("Cannot get test value for in non-parent process!"),
         }
     }
-}
-
-impl UuidMetricImpl {
-    fn new(meta: CommonMetricData) -> Self {
-        Self(glean_core::metrics::UuidMetric::new(meta))
-    }
 
-    fn set(&self, value: Uuid) {
-        crate::with_glean(move |glean| self.0.set(glean, value));
-    }
-
-    fn generate_and_set(&self) {
-        crate::with_glean(move |glean| self.0.generate_and_set(glean));
-    }
-
-    fn test_get_value(&self, storage_name: &str) -> Option<String> {
-        crate::with_glean(move |glean| self.0.test_get_value(glean, storage_name))
+    /// **Exported for test purposes.**
+    ///
+    /// Gets the number of recorded errors for the given metric and error type.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - The type of error
+    /// * `ping_name` - represents the optional name of the ping to retrieve the
+    ///   metric for. Defaults to the first value in `send_in_pings`.
+    ///
+    /// # Returns
+    ///
+    /// The number of errors reported.
+    fn test_get_num_recorded_errors<'a, S: Into<Option<&'a str>>>(
+        &self,
+        error: glean::ErrorType,
+        ping_name: S,
+    ) -> i32 {
+        match self {
+            UuidMetric::Parent(p) => p.test_get_num_recorded_errors(error, ping_name),
+            UuidMetric::Child(_c) => {
+                panic!("Cannot get test value for UuidMetric in non-parent process!")
+            }
+        }
     }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/Glean.cpp firefox-85.0+build1/toolkit/components/glean/bindings/Glean.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/Glean.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/Glean.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/glean/Glean.h"
 #include "mozilla/glean/Category.h"
 #include "mozilla/glean/GleanJSMetricsLookup.h"
+#include "MainThreadUtils.h"
 
 namespace mozilla::glean {
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/MetricTypes.h firefox-85.0+build1/toolkit/components/glean/bindings/MetricTypes.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/MetricTypes.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/MetricTypes.h	2021-01-18 19:58:26.000000000 +0000
@@ -5,7 +5,10 @@
 #ifndef mozilla_Glean_MetricTypes_h
 #define mozilla_Glean_MetricTypes_h
 
+#include "mozilla/glean/Boolean.h"
 #include "mozilla/glean/Counter.h"
+#include "mozilla/glean/Datetime.h"
+#include "mozilla/glean/Event.h"
 #include "mozilla/glean/Timespan.h"
 #include "mozilla/glean/String.h"
 #include "mozilla/glean/Uuid.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Boolean.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Boolean.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Boolean.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Boolean.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,38 @@
+/* -*- 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/glean/Boolean.h"
+
+#include "nsString.h"
+#include "mozilla/Components.h"
+#include "nsIClassInfoImpl.h"
+
+namespace mozilla {
+namespace glean {
+
+NS_IMPL_CLASSINFO(GleanBoolean, nullptr, 0, {0})
+NS_IMPL_ISUPPORTS_CI(GleanBoolean, nsIGleanBoolean)
+
+NS_IMETHODIMP
+GleanBoolean::Set(bool aValue) {
+  mBoolean.Set(aValue);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+GleanBoolean::TestGetValue(const nsACString& aStorageName,
+                           JS::MutableHandleValue aResult) {
+  auto result = mBoolean.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    aResult.set(JS::BooleanValue(result.value()));
+  }
+  return NS_OK;
+}
+
+}  // namespace glean
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Boolean.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Boolean.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Boolean.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Boolean.h	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,71 @@
+/* -*- 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_glean_GleanBoolean_h
+#define mozilla_glean_GleanBoolean_h
+
+#include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
+
+namespace mozilla {
+namespace glean {
+
+namespace impl {
+
+class BooleanMetric {
+ public:
+  constexpr explicit BooleanMetric(uint32_t id) : mId(id) {}
+
+  /**
+   * Set to the specified boolean value.
+   *
+   * @param value the value to set.
+   */
+  void Set(bool value) const { fog_boolean_set(mId, int(value)); }
+
+  /**
+   * **Test-only API**
+   *
+   * Gets the currently stored value as a boolean.
+   *
+   * This function will attempt to await the last parent-process task (if any)
+   * writing to the the metric's storage engine before returning a value.
+   * This function will not wait for data from child processes.
+   *
+   * This doesn't clear the stored value.
+   * Parent process only. Panics in child processes.
+   *
+   * @return value of the stored metric.
+   */
+  Maybe<bool> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_boolean_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
+    return Some(fog_boolean_test_get_value(mId, &aStorageName));
+  }
+
+ private:
+  const uint32_t mId;
+};
+}  // namespace impl
+
+class GleanBoolean final : public nsIGleanBoolean {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIGLEANBOOLEAN
+
+  explicit GleanBoolean(uint32_t id) : mBoolean(id){};
+
+ private:
+  virtual ~GleanBoolean() = default;
+
+  const impl::BooleanMetric mBoolean;
+};
+
+}  // namespace glean
+}  // namespace mozilla
+
+#endif /* mozilla_glean_GleanBoolean.h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Common.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Common.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Common.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Common.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,32 @@
+/* -*- 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 "Common.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIConsoleService.h"
+#include "nsServiceManagerUtils.h"
+
+namespace mozilla::glean {
+
+// This is copied from TelemetryCommons.cpp (and modified because consoleservice
+// handles threading), but that one is not exported.
+// There's _at least_ a third instance of `LogToBrowserConsole`,
+// but that one is slightly different.
+void LogToBrowserConsole(uint32_t aLogLevel, const nsAString& aMsg) {
+  nsCOMPtr<nsIConsoleService> console(
+      do_GetService("@mozilla.org/consoleservice;1"));
+  if (!console) {
+    NS_WARNING("Failed to log message to console.");
+    return;
+  }
+
+  nsCOMPtr<nsIScriptError> error(do_CreateInstance(NS_SCRIPTERROR_CONTRACTID));
+  error->Init(aMsg, u""_ns, u""_ns, 0, 0, aLogLevel, "chrome javascript",
+              false /* from private window */, true /* from chrome context */);
+  console->LogMessage(error);
+}
+
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Common.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Common.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Common.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Common.h	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_glean_Common_h
+#define mozilla_glean_Common_h
+
+#include "jsapi.h"
+#include "nsIScriptError.h"
+
+namespace mozilla::glean {
+
+/**
+ * Dumps a log message to the Browser Console using the provided level.
+ *
+ * @param aLogLevel The level to use when displaying the message in the browser
+ * console (e.g. nsIScriptError::warningFlag, ...).
+ * @param aMsg The text message to print to the console.
+ */
+void LogToBrowserConsole(uint32_t aLogLevel, const nsAString& aMsg);
+
+}  // namespace mozilla::glean
+
+#endif /* mozilla_glean_Common_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Counter.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Counter.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Counter.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Counter.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,31 +10,27 @@
 #include "mozilla/Components.h"
 #include "nsIClassInfoImpl.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 NS_IMPL_CLASSINFO(GleanCounter, nullptr, 0, {0})
 NS_IMPL_ISUPPORTS_CI(GleanCounter, nsIGleanCounter)
 
 NS_IMETHODIMP
-GleanCounter::Add(uint32_t amount, JSContext* cx) {
-  this->mCounter.Add(amount);
+GleanCounter::Add(uint32_t aAmount) {
+  mCounter.Add(aAmount);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanCounter::TestHasValue(const nsACString& aStorageName, JSContext* cx,
-                           bool* result) {
-  *result = this->mCounter.TestHasValue(PromiseFlatCString(aStorageName).get());
+GleanCounter::TestGetValue(const nsACString& aStorageName,
+                           JS::MutableHandleValue aResult) {
+  auto result = mCounter.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    aResult.set(JS::Int32Value(result.value()));
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-GleanCounter::TestGetValue(const nsACString& aStorageName, JSContext* cx,
-                           int32_t* result) {
-  *result = this->mCounter.TestGetValue(PromiseFlatCString(aStorageName).get());
-  return NS_OK;
-}
-
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Counter.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Counter.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Counter.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Counter.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,46 +7,24 @@
 #ifndef mozilla_glean_GleanCounter_h
 #define mozilla_glean_GleanCounter_h
 
+#include "mozilla/Maybe.h"
 #include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 namespace impl {
-extern "C" {
-void fog_counter_add(uint32_t id, int32_t amount);
-uint32_t fog_counter_test_has_value(uint32_t id, const char* storageName);
-int32_t fog_counter_test_get_value(uint32_t id, const char* storageName);
-}
 
 class CounterMetric {
  public:
-  constexpr explicit CounterMetric(uint32_t id) : mId(id) {}
+  constexpr explicit CounterMetric(uint32_t aId) : mId(aId) {}
 
   /*
    * Increases the counter by `amount`.
    *
-   * @param amount The amount to increase by. Should be positive.
+   * @param aAmount The amount to increase by. Should be positive.
    */
-  void Add(int32_t amount = 1) const { fog_counter_add(mId, amount); }
-
-  /**
-   * **Test-only API**
-   *
-   * Tests whether a value is stored for the metric.
-   *
-   * This function will attempt to await the last parent-process task (if any)
-   * writing to the the metric's storage engine before returning a value.
-   * This function will not wait for data from child processes.
-   *
-   * Parent process only. Panics in child processes.
-   *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
-   */
-  bool TestHasValue(const char* aStorageName) const {
-    return fog_counter_test_has_value(mId, aStorageName) != 0;
-  }
+  void Add(int32_t aAmount = 1) const { fog_counter_add(mId, aAmount); }
 
   /**
    * **Test-only API**
@@ -60,10 +38,13 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or Nothing() if there is no value.
    */
-  int32_t TestGetValue(const char* aStorageName) const {
-    return fog_counter_test_get_value(mId, aStorageName);
+  Maybe<int32_t> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_counter_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
+    return Some(fog_counter_test_get_value(mId, &aStorageName));
   }
 
  private:
@@ -84,7 +65,6 @@
   const impl::CounterMetric mCounter;
 };
 
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
 
-#endif /* mozilla_glean_GleanCounter.h */
+#endif /* mozilla_glean_GleanCounter_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Datetime.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Datetime.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Datetime.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Datetime.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,46 @@
+/* -*- 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/glean/Datetime.h"
+
+#include "nsString.h"
+#include "mozilla/Components.h"
+#include "nsIClassInfoImpl.h"
+#include "prtime.h"
+
+namespace mozilla::glean {
+
+NS_IMPL_CLASSINFO(GleanDatetime, nullptr, 0, {0})
+NS_IMPL_ISUPPORTS_CI(GleanDatetime, nsIGleanDatetime)
+
+NS_IMETHODIMP
+GleanDatetime::Set(PRTime aValue, uint8_t aOptionalArgc) {
+  if (aOptionalArgc == 0) {
+    mDatetime.Set();
+  } else {
+    PRExplodedTime exploded;
+    PR_ExplodeTime(aValue, PR_LocalTimeParameters, &exploded);
+    mDatetime.Set(&exploded);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+GleanDatetime::TestGetValue(const nsACString& aStorageName, JSContext* aCx,
+                            JS::MutableHandleValue aResult) {
+  auto result = mDatetime.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    const NS_ConvertUTF8toUTF16 str(result.value());
+    aResult.set(
+        JS::StringValue(JS_NewUCStringCopyN(aCx, str.Data(), str.Length())));
+  }
+  return NS_OK;
+}
+
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Datetime.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Datetime.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Datetime.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Datetime.h	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,87 @@
+/* -*- 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_glean_GleanDatetime_h
+#define mozilla_glean_GleanDatetime_h
+
+#include "mozilla/Maybe.h"
+#include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
+#include "nsString.h"
+#include "prtime.h"
+
+namespace mozilla::glean {
+
+namespace impl {
+
+class DatetimeMetric {
+ public:
+  constexpr explicit DatetimeMetric(uint32_t aId) : mId(aId) {}
+
+  /*
+   * Set the datetime to the provided value, or the local now.
+   *
+   * @param amount The date value to set.
+   */
+  void Set(const PRExplodedTime* aValue = nullptr) const {
+    PRExplodedTime exploded;
+    if (!aValue) {
+      PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &exploded);
+    } else {
+      exploded = *aValue;
+    }
+
+    int32_t offset =
+        exploded.tm_params.tp_gmt_offset + exploded.tm_params.tp_dst_offset;
+    fog_datetime_set(mId, exploded.tm_year, exploded.tm_month + 1,
+                     exploded.tm_mday, exploded.tm_hour, exploded.tm_min,
+                     exploded.tm_sec, exploded.tm_usec * 1000, offset);
+  }
+
+  /**
+   * **Test-only API**
+   *
+   * Gets the currently stored value as an integer.
+   *
+   * This function will attempt to await the last parent-process task (if any)
+   * writing to the the metric's storage engine before returning a value.
+   * This function will not wait for data from child processes.
+   *
+   * This doesn't clear the stored value.
+   * Parent process only. Panics in child processes.
+   *
+   * @return value of the stored metric, or Nothing() if there is no value.
+   */
+  Maybe<nsCString> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_datetime_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
+    nsCString ret;
+    fog_datetime_test_get_value(mId, &aStorageName, &ret);
+    return Some(ret);
+  }
+
+ private:
+  const uint32_t mId;
+};
+}  // namespace impl
+
+class GleanDatetime final : public nsIGleanDatetime {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIGLEANDATETIME
+
+  explicit GleanDatetime(uint32_t aId) : mDatetime(aId){};
+
+ private:
+  virtual ~GleanDatetime() = default;
+
+  const impl::DatetimeMetric mDatetime;
+};
+
+}  // namespace mozilla::glean
+
+#endif /* mozilla_glean_GleanDatetime_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Event.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Event.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Event.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Event.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,91 @@
+/* -*- 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/glean/Event.h"
+
+#include "Common.h"
+#include "nsString.h"
+#include "mozilla/Components.h"
+#include "nsIClassInfoImpl.h"
+#include "jsapi.h"
+#include "nsIScriptError.h"
+
+namespace mozilla::glean {
+
+NS_IMPL_CLASSINFO(GleanEvent, nullptr, 0, {0})
+NS_IMPL_ISUPPORTS_CI(GleanEvent, nsIGleanEvent)
+
+NS_IMETHODIMP
+GleanEvent::Record(JS::HandleValue aExtra, JSContext* aCx) {
+  if (aExtra.isNullOrUndefined()) {
+    mEvent.Record();
+    return NS_OK;
+  }
+
+  if (!aExtra.isObject()) {
+    LogToBrowserConsole(nsIScriptError::warningFlag,
+                        u"Extras need to be an object"_ns);
+    return NS_OK;
+  }
+
+  nsTArray<nsCString> extraKeys;
+  nsTArray<nsCString> extraValues;
+
+  JS::RootedObject obj(aCx, &aExtra.toObject());
+  JS::Rooted<JS::IdVector> ids(aCx, JS::IdVector(aCx));
+  if (!JS_Enumerate(aCx, obj, &ids)) {
+    LogToBrowserConsole(nsIScriptError::warningFlag,
+                        u"Failed to enumerate object."_ns);
+    return NS_OK;
+  }
+
+  for (size_t i = 0, n = ids.length(); i < n; i++) {
+    nsAutoJSCString jsKey;
+    if (!jsKey.init(aCx, ids[i])) {
+      LogToBrowserConsole(
+          nsIScriptError::warningFlag,
+          u"Extra dictionary should only contain string keys."_ns);
+      return NS_OK;
+    }
+
+    JS::Rooted<JS::Value> value(aCx);
+    if (!JS_GetPropertyById(aCx, obj, ids[i], &value)) {
+      LogToBrowserConsole(nsIScriptError::warningFlag,
+                          u"Failed to get extra property."_ns);
+      return NS_OK;
+    }
+
+    nsAutoJSCString jsValue;
+    if (!value.isString() || !jsValue.init(aCx, value)) {
+      LogToBrowserConsole(nsIScriptError::warningFlag,
+                          u"Extra properties should have string values."_ns);
+      return NS_OK;
+    }
+
+    extraKeys.AppendElement(jsKey);
+    extraValues.AppendElement(jsValue);
+  }
+
+  // Calling the implementation directly, because we have a `string->string`
+  // map, not a `T->string` map the C++ API expects.
+  impl::fog_event_record_str(mEvent.mId, &extraKeys, &extraValues);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+GleanEvent::TestGetValue(const nsACString& aStorageName, JSContext* aCx,
+                         JS::MutableHandleValue aResult) {
+  auto result = mEvent.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+    return NS_OK;
+  }
+
+  // TODO(bug 1678567): Implement this.
+  return NS_ERROR_FAILURE;
+}
+
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Event.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Event.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Event.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Event.h	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,110 @@
+/* -*- 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_glean_GleanEvent_h
+#define mozilla_glean_GleanEvent_h
+
+#include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
+#include "mozilla/Tuple.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+namespace mozilla::glean {
+
+// forward declaration
+class GleanEvent;
+
+namespace impl {
+
+/**
+ * Represents the recorded data for a single event
+ */
+struct RecordedEvent {
+ public:
+  uint64_t mTimestamp;
+  nsCString mCategory;
+  nsCString mName;
+
+  nsTArray<Tuple<nsCString, nsCString>> mExtra;
+};
+
+template <class T>
+class EventMetric {
+  friend class mozilla::glean::GleanEvent;
+
+ public:
+  constexpr explicit EventMetric(uint32_t id) : mId(id) {}
+
+  /**
+   * Record an event.
+   *
+   * @param aExtras The list of (extra key, value) pairs. Allowed extra keys are
+   *                defined in the metric definition.
+   *                If the wrong keys are used or values are too large
+   *                an error is report and no event is recorded.
+   */
+  void Record(const Span<const Tuple<T, nsCString>>& aExtras = {}) const {
+    static_assert(sizeof(T) <= sizeof(int32_t),
+                  "Extra keys need to fit into 32 bits");
+
+    nsTArray<int32_t> extraKeys;
+    nsTArray<nsCString> extraValues;
+    for (auto& entry : aExtras) {
+      extraKeys.AppendElement(static_cast<int32_t>(mozilla::Get<0>(entry)));
+      extraValues.AppendElement(mozilla::Get<1>(entry));
+    }
+
+    fog_event_record(mId, &extraKeys, &extraValues);
+  }
+
+  /**
+   * **Test-only API**
+   *
+   * Get a list of currently stored events for this event metric.
+   *
+   * This function will attempt to await the last parent-process task (if any)
+   * writing to the the metric's storage engine before returning a value.
+   * This function will not wait for data from child processes.
+   *
+   * This doesn't clear the stored value.
+   * Parent process only. Panics in child processes.
+   *
+   * @return value of the stored metric, or Nothing() if there is no value.
+   */
+  Maybe<nsTArray<RecordedEvent>> TestGetValue(
+      const nsACString& aStorageName) const {
+    if (!fog_event_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
+
+    // TODO(bug 1678567): Implement this.
+    nsTArray<RecordedEvent> empty;
+    return Some(std::move(empty));
+  }
+
+ private:
+  const uint32_t mId;
+};
+
+}  // namespace impl
+
+class GleanEvent final : public nsIGleanEvent {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIGLEANEVENT
+
+  explicit GleanEvent(uint32_t id) : mEvent(id){};
+
+ private:
+  virtual ~GleanEvent() = default;
+
+  const impl::EventMetric<uint32_t> mEvent;
+};
+
+}  // namespace mozilla::glean
+
+#endif /* mozilla_glean_GleanEvent.h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/String.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/String.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/String.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/String.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,32 +10,29 @@
 #include "mozilla/Components.h"
 #include "nsIClassInfoImpl.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 NS_IMPL_CLASSINFO(GleanString, nullptr, 0, {0})
 NS_IMPL_ISUPPORTS_CI(GleanString, nsIGleanString)
 
 NS_IMETHODIMP
-GleanString::Set(const nsACString& value, JSContext* cx) {
-  this->mString.Set(value);
+GleanString::Set(const nsACString& aValue) {
+  mString.Set(aValue);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanString::TestHasValue(const nsACString& aStorageName, JSContext* cx,
-                          bool* result) {
-  *result = this->mString.TestHasValue(PromiseFlatCString(aStorageName).get());
+GleanString::TestGetValue(const nsACString& aStorageName, JSContext* aCx,
+                          JS::MutableHandleValue aResult) {
+  auto result = mString.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    const NS_ConvertUTF8toUTF16 str(result.value());
+    aResult.set(
+        JS::StringValue(JS_NewUCStringCopyN(aCx, str.Data(), str.Length())));
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-GleanString::TestGetValue(const nsACString& aStorageName, JSContext* cx,
-                          nsACString& result) {
-  result.Assign(
-      this->mString.TestGetValue(PromiseFlatCString(aStorageName).get()));
-  return NS_OK;
-}
-
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/String.h firefox-85.0+build1/toolkit/components/glean/bindings/private/String.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/String.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/String.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,23 +7,18 @@
 #ifndef mozilla_glean_GleanString_h
 #define mozilla_glean_GleanString_h
 
+#include "mozilla/Maybe.h"
 #include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
 #include "nsString.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 namespace impl {
-extern "C" {
-void fog_string_set(uint32_t id, const nsACString& value);
-uint32_t fog_string_test_has_value(uint32_t id, const char* storageName);
-void fog_string_test_get_value(uint32_t id, const char* storageName,
-                               nsACString& value);
-}
 
 class StringMetric {
  public:
-  constexpr explicit StringMetric(uint32_t id) : mId(id) {}
+  constexpr explicit StringMetric(uint32_t aId) : mId(aId) {}
 
   /*
    * Set to the specified value.
@@ -31,27 +26,9 @@
    * Truncates the value if it is longer than 100 bytes and logs an error.
    * See https://mozilla.github.io/glean/book/user/metrics/string.html#limits.
    *
-   * @param value The string to set the metric to.
+   * @param aValue The string to set the metric to.
    */
-  void Set(const nsACString& value) const { fog_string_set(mId, value); }
-
-  /**
-   * **Test-only API**
-   *
-   * Tests whether a value is stored for the metric.
-   *
-   * This function will attempt to await the last parent-process task (if any)
-   * writing to the the metric's storage engine before returning a value.
-   * This function will not wait for data from child processes.
-   *
-   * Parent process only. Panics in child processes.
-   *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
-   */
-  bool TestHasValue(const char* aStorageName) const {
-    return fog_string_test_has_value(mId, aStorageName) != 0;
-  }
+  void Set(const nsACString& aValue) const { fog_string_set(mId, &aValue); }
 
   /**
    * **Test-only API**
@@ -65,12 +42,15 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or Nothing() if there is no value.
    */
-  nsCString TestGetValue(const char* aStorageName) const {
+  Maybe<nsCString> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_string_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
     nsCString ret;
-    fog_string_test_get_value(mId, aStorageName, ret);
-    return ret;
+    fog_string_test_get_value(mId, &aStorageName, &ret);
+    return Some(ret);
   }
 
  private:
@@ -83,7 +63,7 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSIGLEANSTRING
 
-  explicit GleanString(uint32_t id) : mString(id){};
+  explicit GleanString(uint32_t aId) : mString(aId){};
 
  private:
   virtual ~GleanString() = default;
@@ -91,7 +71,6 @@
   const impl::StringMetric mString;
 };
 
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
 
-#endif /* mozilla_glean_GleanString.h */
+#endif /* mozilla_glean_GleanString_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Timespan.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Timespan.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Timespan.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Timespan.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,39 +10,33 @@
 #include "mozilla/Components.h"
 #include "nsIClassInfoImpl.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 NS_IMPL_CLASSINFO(GleanTimespan, nullptr, 0, {0})
 NS_IMPL_ISUPPORTS_CI(GleanTimespan, nsIGleanTimespan)
 
 NS_IMETHODIMP
-GleanTimespan::Start(JSContext* cx) {
-  this->mTimespan.Start();
+GleanTimespan::Start() {
+  mTimespan.Start();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanTimespan::Stop(JSContext* cx) {
-  this->mTimespan.Stop();
+GleanTimespan::Stop() {
+  mTimespan.Stop();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanTimespan::TestHasValue(const nsACString& aStorageName, JSContext* cx,
-                            bool* result) {
-  *result =
-      this->mTimespan.TestHasValue(PromiseFlatCString(aStorageName).get());
+GleanTimespan::TestGetValue(const nsACString& aStorageName,
+                            JS::MutableHandleValue aResult) {
+  auto result = mTimespan.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    aResult.set(JS::DoubleValue(result.value()));
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-GleanTimespan::TestGetValue(const nsACString& aStorageName, JSContext* cx,
-                            int64_t* result) {
-  *result =
-      this->mTimespan.TestGetValue(PromiseFlatCString(aStorageName).get());
-  return NS_OK;
-}
-
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Timespan.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Timespan.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Timespan.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Timespan.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,22 +7,17 @@
 #ifndef mozilla_glean_GleanTimespan_h
 #define mozilla_glean_GleanTimespan_h
 
+#include "mozilla/Maybe.h"
 #include "nsIGleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 namespace impl {
-extern "C" {
-void fog_timespan_start(uint32_t id);
-void fog_timespan_stop(uint32_t id);
-uint32_t fog_timespan_test_has_value(uint32_t id, const char* storageName);
-int64_t fog_timespan_test_get_value(uint32_t id, const char* storageName);
-}
 
 class TimespanMetric {
  public:
-  constexpr explicit TimespanMetric(uint32_t id) : mId(id) {}
+  constexpr explicit TimespanMetric(uint32_t aId) : mId(aId) {}
 
   /**
    * Start tracking time for the provided metric.
@@ -46,24 +41,6 @@
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
-   *
-   * This function will attempt to await the last parent-process task (if any)
-   * writing to the the metric's storage engine before returning a value.
-   * This function will not wait for data from child processes.
-   *
-   * Parent process only. Panics in child processes.
-   *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
-   */
-  bool TestHasValue(const char* aStorageName) const {
-    return fog_timespan_test_has_value(mId, aStorageName) != 0;
-  }
-
-  /**
-   * **Test-only API**
-   *
    * Gets the currently stored value as an integer.
    *
    * This function will attempt to await the last parent-process task (if any)
@@ -73,10 +50,13 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or Nothing() if there is no value.
    */
-  int64_t TestGetValue(const char* aStorageName) const {
-    return fog_timespan_test_get_value(mId, aStorageName);
+  Maybe<int64_t> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_timespan_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
+    return Some(fog_timespan_test_get_value(mId, &aStorageName));
   }
 
  private:
@@ -89,7 +69,7 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSIGLEANTIMESPAN
 
-  explicit GleanTimespan(uint32_t id) : mTimespan(id){};
+  explicit GleanTimespan(uint32_t aId) : mTimespan(aId){};
 
  private:
   virtual ~GleanTimespan() = default;
@@ -97,7 +77,6 @@
   const impl::TimespanMetric mTimespan;
 };
 
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
 
-#endif /* mozilla_glean_GleanTimespan.h */
+#endif /* mozilla_glean_GleanTimespan_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Uuid.cpp firefox-85.0+build1/toolkit/components/glean/bindings/private/Uuid.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Uuid.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Uuid.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,38 +10,35 @@
 #include "mozilla/Components.h"
 #include "nsIClassInfoImpl.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 NS_IMPL_CLASSINFO(GleanUuid, nullptr, 0, {0})
 NS_IMPL_ISUPPORTS_CI(GleanUuid, nsIGleanUuid)
 
 NS_IMETHODIMP
-GleanUuid::Set(const nsACString& value, JSContext* cx) {
-  this->mUuid.Set(value);
+GleanUuid::Set(const nsACString& aValue) {
+  mUuid.Set(aValue);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanUuid::GenerateAndSet(JSContext* cx) {
-  this->mUuid.GenerateAndSet();
+GleanUuid::GenerateAndSet() {
+  mUuid.GenerateAndSet();
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GleanUuid::TestHasValue(const nsACString& aStorageName, JSContext* cx,
-                        bool* result) {
-  *result = this->mUuid.TestHasValue(PromiseFlatCString(aStorageName).get());
+GleanUuid::TestGetValue(const nsACString& aStorageName, JSContext* aCx,
+                        JS::MutableHandleValue aResult) {
+  auto result = mUuid.TestGetValue(aStorageName);
+  if (result.isNothing()) {
+    aResult.set(JS::UndefinedValue());
+  } else {
+    const NS_ConvertUTF8toUTF16 str(result.value());
+    aResult.set(
+        JS::StringValue(JS_NewUCStringCopyN(aCx, str.Data(), str.Length())));
+  }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-GleanUuid::TestGetValue(const nsACString& aStorageName, JSContext* cx,
-                        nsACString& result) {
-  result.Assign(
-      this->mUuid.TestGetValue(PromiseFlatCString(aStorageName).get()));
-  return NS_OK;
-}
-
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Uuid.h firefox-85.0+build1/toolkit/components/glean/bindings/private/Uuid.h
--- firefox-84.0.2+build1/toolkit/components/glean/bindings/private/Uuid.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/bindings/private/Uuid.h	2021-01-18 19:58:26.000000000 +0000
@@ -7,31 +7,25 @@
 #ifndef mozilla_glean_GleanUuid_h
 #define mozilla_glean_GleanUuid_h
 
+#include "mozilla/Maybe.h"
 #include "nsIGleanMetrics.h"
 #include "nsString.h"
+#include "mozilla/glean/fog_ffi_generated.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
 
 namespace impl {
-extern "C" {
-void fog_uuid_set(uint32_t id, const nsACString& uuid);
-void fog_uuid_generate_and_set(uint32_t id);
-uint32_t fog_uuid_test_has_value(uint32_t id, const char* storageName);
-void fog_uuid_test_get_value(uint32_t id, const char* storageName,
-                             nsACString& value);
-}
 
 class UuidMetric {
  public:
-  constexpr explicit UuidMetric(uint32_t id) : mId(id) {}
+  constexpr explicit UuidMetric(uint32_t aId) : mId(aId) {}
 
   /*
    * Sets to the specified value.
    *
-   * @param value The UUID to set the metric to.
+   * @param aValue The UUID to set the metric to.
    */
-  void Set(const nsACString& value) const { fog_uuid_set(mId, value); }
+  void Set(const nsACString& aValue) const { fog_uuid_set(mId, &aValue); }
 
   /*
    * Generate a new random UUID and set the metric to it.
@@ -41,24 +35,6 @@
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
-   *
-   * This function will attempt to await the last parent-process task (if any)
-   * writing to the the metric's storage engine before returning a value.
-   * This function will not wait for data from child processes.
-   *
-   * Parent process only. Panics in child processes.
-   *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
-   */
-  bool TestHasValue(const char* aStorageName) const {
-    return fog_uuid_test_has_value(mId, aStorageName) != 0;
-  }
-
-  /**
-   * **Test-only API**
-   *
    * Gets the currently stored value as a hyphenated string.
    *
    * This function will attempt to await the last parent-process task (if any)
@@ -69,12 +45,15 @@
    * Parent process only. Panics in child processes.
    * Panics if there is no value to get.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or Nothing() if there is no value.
    */
-  nsCString TestGetValue(const char* aStorageName) const {
+  Maybe<nsCString> TestGetValue(const nsACString& aStorageName) const {
+    if (!fog_uuid_test_has_value(mId, &aStorageName)) {
+      return Nothing();
+    }
     nsCString ret;
-    fog_uuid_test_get_value(mId, aStorageName, ret);
-    return ret;
+    fog_uuid_test_get_value(mId, &aStorageName, &ret);
+    return Some(ret);
   }
 
  private:
@@ -87,7 +66,7 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSIGLEANUUID
 
-  explicit GleanUuid(uint32_t id) : mUuid(id){};
+  explicit GleanUuid(uint32_t aId) : mUuid(aId){};
 
  private:
   virtual ~GleanUuid() = default;
@@ -95,7 +74,6 @@
   const impl::UuidMetric mUuid;
 };
 
-}  // namespace glean
-}  // namespace mozilla
+}  // namespace mozilla::glean
 
-#endif /* mozilla_glean_GleanUuid.h */
+#endif /* mozilla_glean_GleanUuid_h */
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/cpp.py firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/cpp.py
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/cpp.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/cpp.py	2021-01-18 19:58:26.000000000 +0000
@@ -19,6 +19,15 @@
     Returns the C++ type to use for a given metric object.
     """
 
+    generate_enums = getattr(obj, "_generate_enums", [])  # Extra Keys? Reasons?
+    if len(generate_enums):
+        for name, suffix in generate_enums:
+            if not len(getattr(obj, name)) and suffix == "Keys":
+                return util.Camelize(obj.type) + "Metric<uint32_t>"
+            else:
+                return "{}Metric<{}>".format(
+                    util.Camelize(obj.type), util.Camelize(obj.name) + suffix
+                )
     return util.Camelize(obj.type) + "Metric"
 
 
@@ -42,6 +51,8 @@
             trim_blocks=True,
             lstrip_blocks=True,
         )
+        env.filters["camelize"] = util.camelize
+        env.filters["Camelize"] = util.Camelize
         for filter_name, filter_func in filters:
             env.filters[filter_name] = filter_func
         return env.get_template(template_name)
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/rust.py	2021-01-18 19:58:26.000000000 +0000
@@ -155,6 +155,14 @@
     #   ("COUNTERS", "CounterMetric") -> [(1, "test_only::clicks"), ...]
     objs_by_type = {}
 
+    # Map from a metric ID to the fully qualified path of the event object in Rust.
+    # Required for the special handling of event lookups.
+    #
+    # Example:
+    #
+    #   17 -> "test_only::an_event"
+    events_by_id = {}
+
     if len(objs) == 1 and "pings" in objs:
         template_filename = "rust_pings.jinja2"
     else:
@@ -162,20 +170,22 @@
 
         for category_name, metrics in objs.items():
             for metric in metrics.values():
-                # FIXME: Support events correctly
-                if metric.type == "event":
-                    continue
 
                 # The constant is all uppercase and suffixed by `_MAP`
                 const_name = util.snake_case(metric.type).upper() + "_MAP"
                 typ = type_name(metric)
                 key = (const_name, typ)
-                if key not in objs_by_type:
-                    objs_by_type[key] = []
 
                 metric_name = util.snake_case(metric.name)
                 category_name = util.snake_case(category_name)
                 full_path = f"{category_name}::{metric_name}"
+
+                if metric.type == "event":
+                    events_by_id[get_metric_id(metric)] = full_path
+                    continue
+
+                if key not in objs_by_type:
+                    objs_by_type[key] = []
                 objs_by_type[key].append((get_metric_id(metric), full_path))
 
     # Now for the modules for each category.
@@ -209,6 +219,7 @@
             common_metric_data_args=common_metric_data_args,
             metric_by_type=objs_by_type,
             extra_args=util.extra_args,
+            events_by_id=events_by_id,
         )
     )
     output_fd.write("\n")
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/cpp.jinja2 firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/cpp.jinja2
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/cpp.jinja2	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/cpp.jinja2	2021-01-18 19:58:26.000000000 +0000
@@ -13,8 +13,22 @@
 
 #include "mozilla/glean/MetricTypes.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
+
+enum class NoExtraKeys {};
+
+{% macro generate_extra_keys(obj) %}
+{% for name, suffix in obj["_generate_enums"] %}
+{% if obj|attr(name)|length %}
+    enum class {{ obj.name|Camelize }}{{ suffix }} : int32_t {
+        {% for key in obj|attr(name) %}
+        {{ key | Camelize }},
+        {% endfor %}
+    };
+
+{% endif %}
+{% endfor %}
+{% endmacro %}
 
 {% for category_name, objs in all_objs.items() %}
 namespace {{ category_name|snake_case }} {
@@ -22,7 +36,11 @@
     {% if obj.type|is_implemented_type %}
     /**
      * generated from {{ category_name }}.{{ obj.name }}
-     *
+     */
+    {% if obj|attr("_generate_enums") %}
+{{ generate_extra_keys(obj) }}
+    {%- endif %}
+    /**
      * {{ obj.description|wordwrap() | replace('\n', '\n     * ') }}
      */
     constexpr impl::{{ obj|type_name }} {{obj.name|snake_case }}({{obj|metric_id}});
@@ -32,6 +50,6 @@
 }
 {% endfor %}
 
-} // namespace glean
-} // namespace mozilla
+} // namespace mozilla::glean
+
 #endif // mozilla_Metrics_h
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/js.jinja2 firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/js.jinja2
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/js.jinja2	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/js.jinja2	2021-01-18 19:58:26.000000000 +0000
@@ -43,9 +43,7 @@
     {% if type|is_implemented_type %}
     case {{ type_id }}: /* {{ type|Camelize }} */
     {
-      RefPtr<nsISupports> metric = new {{type | type_name}}(metricId);
-      return metric.forget();
-      break;
+      return MakeAndAddRef<{{type | type_name}}>(metricId);
     }
     {% endif %}
     {% endfor %}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/rust.jinja2 firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/rust.jinja2
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/rust.jinja2	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/templates/rust.jinja2	2021-01-18 19:58:26.000000000 +0000
@@ -26,6 +26,34 @@
         }
     }
 
+    /// Convert from an extra key's index to its variant.
+    impl std::convert::TryFrom<i32> for {{ obj.name|Camelize }}{{ suffix }} {
+        type Error = EventRecordingError;
+
+        fn try_from(value: i32) -> Result<Self, Self::Error> {
+          match value {
+              {% for key in obj|attr(name) %}
+              {{loop.index-1}} => Ok(Self::{{key | Camelize}}),
+              {% endfor %}
+              _ => Err(EventRecordingError::InvalidExtraKey),
+          }
+        }
+    }
+
+    /// Convert from an extra key's string representation to its variant.
+    impl std::convert::TryFrom<&str> for {{ obj.name|Camelize }}{{ suffix }} {
+        type Error = EventRecordingError;
+
+        fn try_from(value: &str) -> Result<Self, Self::Error> {
+          match value {
+              {% for key in obj|attr(name) %}
+              "{{key}}" => Ok(Self::{{key | Camelize}}),
+              {% endfor %}
+              _ => Err(EventRecordingError::InvalidExtraKey),
+          }
+        }
+    }
+
 {% endif %}
 {% endfor %}
 {% endmacro %}
@@ -72,6 +100,7 @@
 #[allow(dead_code)]
 pub(crate) mod __glean_metric_maps {
     use std::collections::HashMap;
+    use std::convert::TryInto;
 
     use crate::private::*;
     use once_cell::sync::Lazy;
@@ -86,5 +115,103 @@
     });
 
 {% endfor %}
+
+    /// Helper to get the number of allowed extra keys for a given event metric.
+    fn extra_keys_len<K: ExtraKeys>(_event: &EventMetric<K>) -> usize {
+        K::ALLOWED_KEYS.len()
+    }
+
+    /// Wrapper to record an event based on its metric ID.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `extra`     - An (optional) map of (extra key id, string) pairs.
+    ///                 The map will be decoded into the appropriate `ExtraKeys` type.
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the event was found and `record` was called with the given `extra`,
+    /// or an `EventRecordingError::InvalidId` if no event by that ID exists
+    /// or an `EventRecordingError::InvalidExtraKey` the `extra` map could not be deserialized.
+    pub(crate) fn event_record_wrapper(metric_id: u32, extra: HashMap<i32, String>) -> Result<(), EventRecordingError> {
+        match metric_id {
+{% for metric_id, event in events_by_id.items() %}
+          {{metric_id}} => {
+              assert!(
+                  extra_keys_len(&super::{{event}}) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra: HashMap<_, _> = extra
+                  .into_iter()
+                  .map(|(k, v)| k.try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::{{event}}.record(Some(extra));
+              Ok(())
+          }
+{% endfor %}
+           _ => Err(EventRecordingError::InvalidId),
+        }
+    }
+
+    /// Wrapper to record an event based on its metric ID.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `extra`     - An (optional) map of (string, string) pairs.
+    ///                 The map will be decoded into the appropriate `ExtraKeys` types.
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the event was found and `record` was called with the given `extra`,
+    /// or an `EventRecordingError::InvalidId` if no event by that ID exists
+    /// or an `EventRecordingError::InvalidExtraKey` the `extra` map could not be deserialized.
+    pub(crate) fn event_record_wrapper_str(metric_id: u32, extra: HashMap<String, String>) -> Result<(), EventRecordingError> {
+        match metric_id {
+{% for metric_id, event in events_by_id.items() %}
+          {{metric_id}} => {
+              assert!(
+                  extra_keys_len(&super::{{event}}) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra = extra
+                  .into_iter()
+                  .map(|(k, v)| (&*k).try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::{{event}}.record(Some(extra));
+              Ok(())
+          }
+{% endfor %}
+           _ => Err(EventRecordingError::InvalidId),
+        }
+    }
+
+    /// Wrapper to get the currently stored events for event metric.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `storage_name` - the storage name to look into.
+    ///
+    /// # Returns
+    ///
+    /// Returns the recorded events or `None` if nothing stored.
+    ///
+    /// # Panics
+    ///
+    /// Panics if no event by the given metric ID could be found.
+    pub(crate) fn event_test_get_value_wrapper(metric_id: u32, storage_name: &str) -> Option<Vec<RecordedEvent>> {
+        match metric_id {
+{% for metric_id, event in events_by_id.items() %}
+           {{metric_id}} => super::{{event}}.test_get_value(storage_name),
+{% endfor %}
+           _ => panic!("No event for metric id {}", metric_id),
+        }
+    }
 }
 {% endif %}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/util.py firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/util.py
--- firefox-84.0.2+build1/toolkit/components/glean/build_scripts/glean_parser_ext/util.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/build_scripts/glean_parser_ext/util.py	2021-01-18 19:58:26.000000000 +0000
@@ -29,7 +29,15 @@
     return lambda metric: metric_id_mapping[(metric.category, metric.name)]
 
 
-IMPLEMENTED_CPP_TYPES = ["counter", "string", "timespan", "uuid"]
+IMPLEMENTED_CPP_TYPES = [
+    "boolean",
+    "counter",
+    "datetime",
+    "event",
+    "string",
+    "timespan",
+    "uuid",
+]
 
 
 def is_implemented_metric_type(typ):
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/Cargo.toml firefox-85.0+build1/toolkit/components/glean/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/glean/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -6,8 +6,8 @@
 license = "MPL-2.0"
 
 [dependencies]
-glean = "33.4.0"
-glean-core = { version = "33.4.0", features = ["rkv-safe-mode"] }
+glean = "33.9.1"
+glean-core = { version = "33.9.1", features = ["rkv-safe-mode"] }
 log = "0.4"
 nserror = { path = "../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
@@ -15,7 +15,7 @@
 xpcom = { path = "../../../xpcom/rust/xpcom" }
 once_cell = "1.2.0"
 fog = { path = "./api" }
-cstr = "0.1"
+cstr = "0.2"
 viaduct = { git = "https://github.com/mozilla/application-services", rev = "8a576fbe79199fa8664f64285524017f74ebcc5f" } # Copied from toolkit/library/rust/shared/Cargo.toml
 url = "2.1" # Copied from viaduct's deps, see https://github.com/mozilla/application-services/issues/3062
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/cbindgen.toml firefox-85.0+build1/toolkit/components/glean/cbindgen.toml
--- firefox-84.0.2+build1/toolkit/components/glean/cbindgen.toml	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/cbindgen.toml	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,19 @@
+header = """/* 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/. */"""
+autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen. */"""
+include_version = true
+braces = "SameLine"
+line_length = 100
+tab_width = 2
+language = "C++"
+namespaces = ["mozilla::glean::impl"]
+includes = ["nsTArray.h", "nsString.h"]
+
+[export.rename]
+"ThinVec" = "nsTArray"
+
+[parse]
+parse_deps = true
+include = ["fog"]
+extra_bindings = ["fog"]
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/docs/api.md firefox-85.0+build1/toolkit/components/glean/docs/api.md
--- firefox-84.0.2+build1/toolkit/components/glean/docs/api.md	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/docs/api.md	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,4 @@
+# API
+
+The Metrics API documentation can be found in the
+[Glean SDK Book](https://mozilla.github.io/glean/book/user/metrics/index.html).
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/docs/new_metric_types.md firefox-85.0+build1/toolkit/components/glean/docs/new_metric_types.md
--- firefox-84.0.2+build1/toolkit/components/glean/docs/new_metric_types.md	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/docs/new_metric_types.md	2021-01-18 19:58:26.000000000 +0000
@@ -81,43 +81,45 @@
 they're both implemented in C++ and share much of their implementation.
 
 Each metric type has six pieces you'll need to cover:
-1. **MLA FFI** - Using our convenient macros,
-   define the Multi-Language Architecture's FFI layer above the Rust API in
-   [`api/src/ffi/mod.rs`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/api/src/ffi/mod.rs).
-2. **C++ Impl** - Implement a type called `XMetric`
-   (e.g. `CounterMetric`) in `mozilla::glean::impl` in
-   [`bindings/private/`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/private/).
-   Its methods should be named the same as the ones in the Rust API,
-   transformed to `CamelCase`. They should all be public.
-3. **IDL** - Duplicate the public API (including its docs) to
-   [`xpcom/nsIGleanMetrics.idl`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/xpcom/nsIGleanMetrics.idl)
-   with the name `nsIGleanX` (e.g. `nsIGleanCounter`).
-   Inherit from `nsISupports`.
-   The naming style for members here is `lowerCamelCase`.
-   You'll need a
-   [GUID](https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Generating_GUIDs)
-   because this is XPCOM,
-   but you'll only need the canonical form since we're only exposing to JS.
-4. **JS Impl** - Add an `nsIGleanX`-deriving, `XMetric`-owning type called `GleanX`
-   (e.g. `GleanCounter`) in the same header and `.cpp` as `XMetric` in
-   [`bindings/private/`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/private/).
-   Don't declare any methods beyond a ctor
-   (takes a `uint32_t` metric id, init-constructs a `impl::XMetric` member)
-   and dtor (`default`): the IDL will do the rest so long as you remember to add
-   `NS_DECL_ISUPPORTS` and `NS_DECL_NSIGLEANX`.
-   In the definition of `GleanX`, member identifiers are back to
-   `CamelCase` and need macros like `NS_IMETHODIMP`.
-   Delegate operations to the owned `XMetric`, returning `NS_OK`
-   no matter what in non-test methods.
-   (Test-only methods can return `NS_ERROR` codes on failures).
-5. **Tests** - Two languages means two test suites.
-   Add a never-expiring test-only metric of your type to
-   [`test_metrics.yaml`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/test_metrics.yaml).
-   Feel free to be clever with the name, but be sure to make clear that it is test-only.
-    * **C++ Tests (GTest)** - Add a small test case to
-      [`gtest/TestFog.cpp`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/gtest/TestFog.cpp).
-      For more details, peruse the [testing docs](testing.md).
-    * **JS Tests (xpcshell)** - Add a small test case to
-      [`xpcshell/test_Glean.js`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/xpcshell/test_Glean.js).
-      For more details, peruse the [testing docs](testing.md).
-6. **API Documentation** - TODO
+
+### 1. MLA FFI
+
+- Using our convenient macros, define the Multi-Language Architecture's FFI layer above the Rust API in [`api/src/ffi/mod.rs`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/api/src/ffi/mod.rs).
+
+### 2. C++ Impl
+
+- Implement a type called `XMetric` (e.g. `CounterMetric`) in `mozilla::glean::impl` in [`bindings/private/`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/private/).
+    - Its methods should be named the same as the ones in the Rust API, transformed to `CamelCase`.
+    - They should all be public.
+    - Multiplex the FFI's `test_have` and `test_get` functions into a single `TestGetValue` function that returns a `mozilla::Maybe` wrapping the C++ type that best fits the metric type.
+- Include the new metric type in [`bindings/MetricTypes.h`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/MetricTypes.h)
+- Include the new files in [`moz.build`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/MetricTypes.h). The header file should be added to `EXPORTS.mozilla.glean` and the `.cpp` file should be added to `UNIFIED_SOURCES`.
+
+### 3. IDL
+
+- Duplicate the public API (including its docs) to [`xpcom/nsIGleanMetrics.idl`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/xpcom/nsIGleanMetrics.idl) with the name `nsIGleanX` (e.g. `nsIGleanCounter`).
+    - Inherit from `nsISupports`.
+    - The naming style for members here is `lowerCamelCase`. You'll need a [GUID](https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Generating_GUIDs) because this is XPCOM, but you'll only need the canonical form since we're only exposing to JS.
+    - The `testGetValue` method will return a `jsval`.
+
+### 4. JS Impl
+
+- Add an `nsIGleanX`-deriving, `XMetric`-owning type called `GleanX` (e.g. `GleanCounter`) in the same header and `.cpp` as `XMetric` in [`bindings/private/`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/bindings/private/).
+    - Don't declare any methods beyond a ctor (takes a `uint32_t` metric id, init-constructs a `impl::XMetric` member) and dtor (`default`): the IDL will do the rest so long as you remember to add `NS_DECL_ISUPPORTS` and `NS_DECL_NSIGLEANX`.
+    - In the definition of `GleanX`, member identifiers are back to `CamelCase` and need macros like `NS_IMETHODIMP`. Delegate operations to the owned `XMetric`, returning `NS_OK` no matter what in non-test methods.
+    - Test-only methods can return `NS_ERROR` codes on failures, but mostly return `NS_OK` and use `undefined` in the `JS::MutableHandleValue` result to signal no value.
+
+### 5. Tests
+
+Two languages means two test suites.
+
+- Add a never-expiring test-only metric of your type to [`test_metrics.yaml`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/test_metrics.yaml).
+    - Feel free to be clever with the name, but be sure to make clear that it is test-only.
+- **C++ Tests (GTest)** - Add a small test case to [`gtest/TestFog.cpp`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/gtest/TestFog.cpp).
+    - For more details, peruse the [testing docs](testing.md).
+- **JS Tests (xpcshell)** - Add a small test case to [`xpcshell/test_Glean.js`](https://hg.mozilla.org/mozilla-central/file/tip/toolkit/components/glean/xpcshell/test_Glean.js).
+    - For more details, peruse the [testing docs](testing.md).
+
+### 6. API Documentation
+
+TODO
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/gtest/TestFog.cpp firefox-85.0+build1/toolkit/components/glean/gtest/TestFog.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/gtest/TestFog.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/gtest/TestFog.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -4,12 +4,18 @@
 
 #include "gtest/gtest.h"
 #include "mozilla/glean/GleanMetrics.h"
+#include "mozilla/glean/fog_ffi_generated.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Tuple.h"
+#include "nsTArray.h"
 
 #include "mozilla/Preferences.h"
 #include "nsString.h"
+#include "prtime.h"
 
 using mozilla::Preferences;
 using namespace mozilla::glean;
+using namespace mozilla::glean::impl;
 
 #define DATA_PREF "datareporting.healthreport.uploadEnabled"
 
@@ -19,9 +25,6 @@
 void GTest_FOG_ExpectFailure(const char* aMessage) {
   EXPECT_STREQ(aMessage, "");
 }
-
-nsresult fog_init();
-nsresult fog_submit_ping(const nsACString* aPingName);
 }
 
 // Initialize FOG exactly once.
@@ -35,9 +38,10 @@
   Preferences::SetBool(DATA_PREF, true);
 }
 
-extern "C" void Rust_MeasureInitializeTime();
-TEST(FOG, TestMeasureInitializeTime)
-{ Rust_MeasureInitializeTime(); }
+// TODO: to be enabled after changes from bug 1677455 are vendored.
+// extern "C" void Rust_MeasureInitializeTime();
+// TEST(FOG, TestMeasureInitializeTime)
+// { Rust_MeasureInitializeTime(); }
 
 TEST(FOG, BuiltinPingsRegistered)
 {
@@ -46,17 +50,17 @@
   nsAutoCString baselinePingName("baseline");
   nsAutoCString eventsPingName("events");
   ASSERT_EQ(NS_OK, fog_submit_ping(&metricsPingName));
-  // This will probably change to NS_OK once "duration" is implemented.
-  ASSERT_EQ(NS_ERROR_NO_CONTENT, fog_submit_ping(&baselinePingName));
-  ASSERT_EQ(NS_ERROR_NO_CONTENT, fog_submit_ping(&eventsPingName));
+  ASSERT_EQ(NS_OK, fog_submit_ping(&baselinePingName));
+  ASSERT_EQ(NS_OK, fog_submit_ping(&eventsPingName));
 }
 
 TEST(FOG, TestCppCounterWorks)
 {
   mozilla::glean::test_only::bad_code.Add(42);
 
-  ASSERT_TRUE(mozilla::glean::test_only::bad_code.TestHasValue("test-ping"));
-  ASSERT_EQ(42, mozilla::glean::test_only::bad_code.TestGetValue("test-ping"));
+  ASSERT_EQ(
+      42,
+      mozilla::glean::test_only::bad_code.TestGetValue("test-ping"_ns).value());
 }
 
 TEST(FOG, TestCppStringWorks)
@@ -64,11 +68,10 @@
   auto kValue = "cheez!"_ns;
   mozilla::glean::test_only::cheesy_string.Set(kValue);
 
-  ASSERT_TRUE(
-      mozilla::glean::test_only::cheesy_string.TestHasValue("test-ping"));
-  ASSERT_STREQ(
-      kValue.get(),
-      mozilla::glean::test_only::cheesy_string.TestGetValue("test-ping").get());
+  ASSERT_STREQ(kValue.get(), mozilla::glean::test_only::cheesy_string
+                                 .TestGetValue("test-ping"_ns)
+                                 .value()
+                                 .get());
 }
 
 TEST(FOG, TestCppTimespanWorks)
@@ -78,22 +81,59 @@
   mozilla::glean::test_only::can_we_time_it.Stop();
 
   ASSERT_TRUE(
-      mozilla::glean::test_only::can_we_time_it.TestHasValue("test-ping"));
-  ASSERT_TRUE(
-      mozilla::glean::test_only::can_we_time_it.TestGetValue("test-ping") > 0);
+      mozilla::glean::test_only::can_we_time_it.TestGetValue("test-ping"_ns)
+          .value() > 0);
 }
 
 TEST(FOG, TestCppUuidWorks)
 {
   nsCString kTestUuid("decafdec-afde-cafd-ecaf-decafdecafde");
   test_only::what_id_it.Set(kTestUuid);
-  ASSERT_TRUE(test_only::what_id_it.TestHasValue("test-ping"));
-  ASSERT_STREQ(kTestUuid.get(),
-               test_only::what_id_it.TestGetValue("test-ping").get());
+  ASSERT_STREQ(
+      kTestUuid.get(),
+      test_only::what_id_it.TestGetValue("test-ping"_ns).value().get());
 
   test_only::what_id_it.GenerateAndSet();
   // Since we generate v4 UUIDs, and the first character of the third group
   // isn't 4, this won't ever collide with kTestUuid.
-  ASSERT_STRNE(kTestUuid.get(),
-               test_only::what_id_it.TestGetValue("test-ping").get());
+  ASSERT_STRNE(
+      kTestUuid.get(),
+      test_only::what_id_it.TestGetValue("test-ping"_ns).value().get());
+}
+
+TEST(FOG, TestCppBooleanWorks)
+{
+  mozilla::glean::test_only::can_we_flag_it.Set(false);
+
+  ASSERT_EQ(false, mozilla::glean::test_only::can_we_flag_it
+                       .TestGetValue("test-ping"_ns)
+                       .value());
+}
+
+// TODO: to be enabled after changes from bug 1677448 are vendored.
+// TEST(FOG, TestCppDatetimeWorks)
+// {
+//   PRExplodedTime date = {0, 35, 10, 12, 6, 10, 2020, 0, 0, {5 * 60 * 60, 0}};
+//   test_only::what_a_date.Set(&date);
+//
+//   auto received = test_only::what_a_date.TestGetValue("test-ping");
+//   ASSERT_STREQ(received.value().get(), "2020-11-06T12:10:35+05:00");
+// }
+
+using mozilla::MakeTuple;
+using mozilla::Tuple;
+using mozilla::glean::test_only_ipc::AnEventKeys;
+
+TEST(FOG, TestCppEventWorks)
+{
+  test_only_ipc::no_extra_event.Record();
+  ASSERT_TRUE(test_only_ipc::no_extra_event.TestGetValue("store1"_ns).isSome());
+
+  // Ugh, this API...
+  nsTArray<Tuple<test_only_ipc::AnEventKeys, nsCString>> extra;
+  nsCString val = "can set extras"_ns;
+  extra.AppendElement(MakeTuple(AnEventKeys::Extra1, val));
+
+  test_only_ipc::an_event.Record(std::move(extra));
+  ASSERT_TRUE(test_only_ipc::an_event.TestGetValue("store1"_ns).isSome());
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/ipc/FOGIPC.cpp firefox-85.0+build1/toolkit/components/glean/ipc/FOGIPC.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/ipc/FOGIPC.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/ipc/FOGIPC.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "FOGIPC.h"
 
+#include "mozilla/glean/fog_ffi_generated.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/MozPromise.h"
@@ -18,12 +19,6 @@
 namespace mozilla {
 namespace glean {
 
-extern "C" {
-uint32_t fog_serialize_ipc_buf();
-uint32_t fog_give_ipc_buf(uint8_t* buf, uint32_t buf_len);
-void fog_use_ipc_buf(uint8_t* buf, uint32_t buf_len);
-}
-
 /**
  * The parent process is asking you to flush your data ASAP.
  *
@@ -32,12 +27,12 @@
  */
 void FlushFOGData(std::function<void(ipc::ByteBuf&&)>&& aResolver) {
   ByteBuf buf;
-  uint32_t ipcBufferSize = fog_serialize_ipc_buf();
+  uint32_t ipcBufferSize = impl::fog_serialize_ipc_buf();
   bool ok = buf.Allocate(ipcBufferSize);
   if (!ok) {
     return;
   }
-  uint32_t writtenLen = fog_give_ipc_buf(buf.mData, buf.mLen);
+  uint32_t writtenLen = impl::fog_give_ipc_buf(buf.mData, buf.mLen);
   if (writtenLen != ipcBufferSize) {
     return;
   }
@@ -84,7 +79,7 @@
  * A child process has sent you this buf as a treat.
  * @param buf - a bincoded serialized payload that the Rust impl understands.
  */
-void FOGData(ipc::ByteBuf&& buf) { fog_use_ipc_buf(buf.mData, buf.mLen); }
+void FOGData(ipc::ByteBuf&& buf) { impl::fog_use_ipc_buf(buf.mData, buf.mLen); }
 
 /**
  * Called by FOG on a child process when it wants to send a buf to the parent.
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/metrics.yaml firefox-85.0+build1/toolkit/components/glean/metrics.yaml
--- firefox-84.0.2+build1/toolkit/components/glean/metrics.yaml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/metrics.yaml	2021-01-18 19:58:26.000000000 +0000
@@ -68,3 +68,23 @@
     expires: "89"
     send_in_pings:
       - fog-validation
+
+  os_version:
+    type: string
+    description:
+      The version of the OS running Firefox, as detected by Gecko.
+      To be sent only in the "fog-validation" ping.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1679835
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1679835#c3
+    data_sensitivity:
+      - technical
+    lifetime: application
+    notification_emails:
+      - aplacitelli@mozilla.com
+      - chutten@mozilla.com
+      - glean-team@mozilla.com
+    expires: "89"
+    send_in_pings:
+      - fog-validation
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/moz.build firefox-85.0+build1/toolkit/components/glean/moz.build
--- firefox-84.0.2+build1/toolkit/components/glean/moz.build	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/moz.build	2021-01-18 19:58:26.000000000 +0000
@@ -28,16 +28,30 @@
         "bindings/Category.h",
         "bindings/Glean.h",
         "bindings/MetricTypes.h",
+        "bindings/private/Boolean.h",
         "bindings/private/Counter.h",
+        "bindings/private/Datetime.h",
+        "bindings/private/Event.h",
         "bindings/private/String.h",
         "bindings/private/Timespan.h",
         "bindings/private/Uuid.h",
     ]
 
+    if CONFIG["COMPILE_ENVIRONMENT"]:
+        EXPORTS.mozilla.glean += [
+            "!fog_ffi_generated.h",
+        ]
+
+        CbindgenHeader("fog_ffi_generated.h", inputs=["/toolkit/components/glean"])
+
     UNIFIED_SOURCES += [
         "bindings/Category.cpp",
         "bindings/Glean.cpp",
+        "bindings/private/Boolean.cpp",
+        "bindings/private/Common.cpp",
         "bindings/private/Counter.cpp",
+        "bindings/private/Datetime.cpp",
+        "bindings/private/Event.cpp",
         "bindings/private/String.cpp",
         "bindings/private/Timespan.cpp",
         "bindings/private/Uuid.cpp",
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output
--- firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output	2021-01-18 19:58:27.000000000 +0000
@@ -288,6 +288,32 @@
         }
     }
 
+    /// Convert from an extra key's index to its variant.
+    impl std::convert::TryFrom<i32> for EventMetricWithExtraKeys {
+        type Error = EventRecordingError;
+
+        fn try_from(value: i32) -> Result<Self, Self::Error> {
+          match value {
+              0 => Ok(Self::AnExtraKey),
+              1 => Ok(Self::AnotherExtraKey),
+              _ => Err(EventRecordingError::InvalidExtraKey),
+          }
+        }
+    }
+
+    /// Convert from an extra key's string representation to its variant.
+    impl std::convert::TryFrom<&str> for EventMetricWithExtraKeys {
+        type Error = EventRecordingError;
+
+        fn try_from(value: &str) -> Result<Self, Self::Error> {
+          match value {
+              "an_extra_key" => Ok(Self::AnExtraKey),
+              "another_extra_key" => Ok(Self::AnotherExtraKey),
+              _ => Err(EventRecordingError::InvalidExtraKey),
+          }
+        }
+    }
+
     #[allow(non_upper_case_globals)]
     /// generated from test.nested.event_metric_with_extra
     ///
@@ -309,6 +335,7 @@
 #[allow(dead_code)]
 pub(crate) mod __glean_metric_maps {
     use std::collections::HashMap;
+    use std::convert::TryInto;
 
     use crate::private::*;
     use once_cell::sync::Lazy;
@@ -388,5 +415,128 @@
         map
     });
 
+
+    /// Helper to get the number of allowed extra keys for a given event metric.
+    fn extra_keys_len<K: ExtraKeys>(_event: &EventMetric<K>) -> usize {
+        K::ALLOWED_KEYS.len()
+    }
+
+    /// Wrapper to record an event based on its metric ID.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `extra`     - An (optional) map of (extra key id, string) pairs.
+    ///                 The map will be decoded into the appropriate `ExtraKeys` type.
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the event was found and `record` was called with the given `extra`,
+    /// or an `EventRecordingError::InvalidId` if no event by that ID exists
+    /// or an `EventRecordingError::InvalidExtraKey` the `extra` map could not be deserialized.
+    pub(crate) fn event_record_wrapper(metric_id: u32, extra: HashMap<i32, String>) -> Result<(), EventRecordingError> {
+        match metric_id {
+          16 => {
+              assert!(
+                  extra_keys_len(&super::test_nested::event_metric) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra: HashMap<_, _> = extra
+                  .into_iter()
+                  .map(|(k, v)| k.try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::test_nested::event_metric.record(Some(extra));
+              Ok(())
+          }
+          17 => {
+              assert!(
+                  extra_keys_len(&super::test_nested::event_metric_with_extra) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra: HashMap<_, _> = extra
+                  .into_iter()
+                  .map(|(k, v)| k.try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::test_nested::event_metric_with_extra.record(Some(extra));
+              Ok(())
+          }
+           _ => Err(EventRecordingError::InvalidId),
+        }
+    }
+
+    /// Wrapper to record an event based on its metric ID.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `extra`     - An (optional) map of (string, string) pairs.
+    ///                 The map will be decoded into the appropriate `ExtraKeys` types.
+    /// # Returns
+    ///
+    /// Returns `Ok(())` if the event was found and `record` was called with the given `extra`,
+    /// or an `EventRecordingError::InvalidId` if no event by that ID exists
+    /// or an `EventRecordingError::InvalidExtraKey` the `extra` map could not be deserialized.
+    pub(crate) fn event_record_wrapper_str(metric_id: u32, extra: HashMap<String, String>) -> Result<(), EventRecordingError> {
+        match metric_id {
+          16 => {
+              assert!(
+                  extra_keys_len(&super::test_nested::event_metric) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra = extra
+                  .into_iter()
+                  .map(|(k, v)| (&*k).try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::test_nested::event_metric.record(Some(extra));
+              Ok(())
+          }
+          17 => {
+              assert!(
+                  extra_keys_len(&super::test_nested::event_metric_with_extra) != 0 || extra.is_empty(),
+                  "No extra keys allowed, but some were passed"
+              );
+
+              // In case of `NoExtraKeys` the whole iterator is impossible, so rustc complains.
+              #[allow(unused_variables)]
+              let extra = extra
+                  .into_iter()
+                  .map(|(k, v)| (&*k).try_into().map(|k| (k, v)))
+                  .collect::<Result<HashMap<_, _>, _>>()?;
+              super::test_nested::event_metric_with_extra.record(Some(extra));
+              Ok(())
+          }
+           _ => Err(EventRecordingError::InvalidId),
+        }
+    }
+
+    /// Wrapper to get the currently stored events for event metric.
+    ///
+    /// # Arguments
+    ///
+    /// * `metric_id` - The metric's ID to look up
+    /// * `storage_name` - the storage name to look into.
+    ///
+    /// # Returns
+    ///
+    /// Returns the recorded events or `None` if nothing stored.
+    ///
+    /// # Panics
+    ///
+    /// Panics if no event by the given metric ID could be found.
+    pub(crate) fn event_test_get_value_wrapper(metric_id: u32, storage_name: &str) -> Option<Vec<RecordedEvent>> {
+        match metric_id {
+           16 => super::test_nested::event_metric.test_get_value(storage_name),
+           17 => super::test_nested::event_metric_with_extra.test_get_value(storage_name),
+           _ => panic!("No event for metric id {}", metric_id),
+        }
+    }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output_cpp firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output_cpp
--- firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output_cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output_cpp	2021-01-18 19:58:26.000000000 +0000
@@ -11,13 +11,25 @@
 
 #include "mozilla/glean/MetricTypes.h"
 
-namespace mozilla {
-namespace glean {
+namespace mozilla::glean {
+
+enum class NoExtraKeys {};
+
 
 namespace test {
     /**
+     * generated from test.boolean_metric
+     */
+    /**
+     * A multi-line
+     * description
+     */
+    constexpr impl::BooleanMetric boolean_metric(1);
+
+    /**
      * generated from test.counter_metric
-     *
+     */
+    /**
      * A multi-line
      * description
      */
@@ -25,7 +37,8 @@
 
     /**
      * generated from test.string_metric
-     *
+     */
+    /**
      * A multi-line
      * description
      */
@@ -33,7 +46,8 @@
 
     /**
      * generated from test.timespan_metric
-     *
+     */
+    /**
      * A multi-line
      * description
      */
@@ -43,14 +57,47 @@
 namespace test_nested {
     /**
      * generated from test.nested.uuid_metric
-     *
+     */
+    /**
      * A multi-line
      * description
      */
     constexpr impl::UuidMetric uuid_metric(14);
 
+    /**
+     * generated from test.nested.datetime_metric
+     */
+    /**
+     * A multi-line
+     * description
+     */
+    constexpr impl::DatetimeMetric datetime_metric(15);
+
+    /**
+     * generated from test.nested.event_metric
+     */
+    /**
+     * A multi-line
+     * description
+     */
+    constexpr impl::EventMetric<uint32_t> event_metric(16);
+
+    /**
+     * generated from test.nested.event_metric_with_extra
+     */
+    enum class EventMetricWithExtraKeys : int32_t {
+        AnExtraKey,
+        AnotherExtraKey,
+    };
+
+    /**
+     * A multi-line
+     * description
+     */
+    constexpr impl::EventMetric<EventMetricWithExtraKeys> event_metric_with_extra(17);
+
 }
 
-} // namespace glean
-} // namespace mozilla
+} // namespace mozilla::glean
+
 #endif // mozilla_Metrics_h
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output_js firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output_js
--- firefox-84.0.2+build1/toolkit/components/glean/pytest/metrics_test_output_js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/pytest/metrics_test_output_js	2021-01-18 19:58:26.000000000 +0000
@@ -37,29 +37,33 @@
   uint32_t metricId = GLEAN_METRIC_ID(id);
 
   switch (typeId) {
+    case 1: /* Boolean */
+    {
+      return MakeAndAddRef<GleanBoolean>(metricId);
+    }
     case 3: /* Counter */
     {
-      RefPtr<nsISupports> metric = new GleanCounter(metricId);
-      return metric.forget();
-      break;
+      return MakeAndAddRef<GleanCounter>(metricId);
     }
     case 5: /* String */
     {
-      RefPtr<nsISupports> metric = new GleanString(metricId);
-      return metric.forget();
-      break;
+      return MakeAndAddRef<GleanString>(metricId);
     }
     case 8: /* Timespan */
     {
-      RefPtr<nsISupports> metric = new GleanTimespan(metricId);
-      return metric.forget();
-      break;
+      return MakeAndAddRef<GleanTimespan>(metricId);
     }
     case 11: /* Uuid */
     {
-      RefPtr<nsISupports> metric = new GleanUuid(metricId);
-      return metric.forget();
-      break;
+      return MakeAndAddRef<GleanUuid>(metricId);
+    }
+    case 12: /* Datetime */
+    {
+      return MakeAndAddRef<GleanDatetime>(metricId);
+    }
+    case 13: /* Event */
+    {
+      return MakeAndAddRef<GleanEvent>(metricId);
     }
     default:
     MOZ_ASSERT_UNREACHABLE("Invalid type ID reached when trying to instantiate a new metric");
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/src/api.rs firefox-85.0+build1/toolkit/components/glean/src/api.rs
--- firefox-84.0.2+build1/toolkit/components/glean/src/api.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/src/api.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +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 https://mozilla.org/MPL/2.0/.
-
-//! The general API to initialize and control Glean.
-//!
-//! ## Example
-//!
-//! ```ignore
-//! let configuration = Configuration { /* ... */ };
-//! let client_info = ClientInfo { /* ... */ };
-//!
-//! // Initialize Glean once and passing in client information.
-//! initialize(configuration, client_info)?;
-//!
-//! // Toggle the upload enabled preference.
-//! set_upload_enabled(false);
-//! ```
-
-// FIXME: Remove when code gets actually used eventually (by initializing Glean).
-#![allow(dead_code)]
-
-use fog::dispatcher;
-use fog::ping_upload::{self, UploadResult};
-use glean_core::{global_glean, setup_glean, Configuration, Glean, Result};
-use once_cell::sync::OnceCell;
-use url::Url;
-use viaduct::Request;
-
-use crate::client_info::ClientInfo;
-use crate::core_metrics::InternalMetrics;
-
-/// Application state to keep track of.
-#[derive(Debug, Clone)]
-pub struct AppState {
-    /// Client info metrics set by the application.
-    client_info: ClientInfo,
-}
-
-/// A global singleton storing additional state for Glean.
-static STATE: OnceCell<AppState> = OnceCell::new();
-
-/// Get a reference to the global state object.
-///
-/// Panics if no global state object was set.
-fn global_state() -> &'static AppState {
-    STATE.get().unwrap()
-}
-
-/// Run a closure with a mutable reference to the locked global Glean object,
-/// or return None if the global Glean isn't available.
-fn with_glean_mut<F, R>(f: F) -> Option<R>
-where
-    F: Fn(&mut Glean) -> R,
-{
-    let mut glean = global_glean()?.lock().unwrap();
-    Some(f(&mut glean))
-}
-
-/// Create and initialize a new Glean object.
-///
-/// See `glean_core::Glean::new`.
-///
-/// ## Thread safety
-///
-/// Many threads may call `initialize` concurrently with different configuration and client info,
-/// but it is guaranteed that only one function will be executed.
-///
-/// Glean will only be initialized exactly once with the configuration and client info obtained
-/// from the first call.
-/// Subsequent calls have no effect.
-pub fn initialize(cfg: Configuration, client_info: ClientInfo) -> Result<()> {
-    STATE
-        .get_or_try_init(|| {
-            let mut glean = Glean::new(cfg)?;
-
-            // First initialize core metrics
-            initialize_core_metrics(&glean, &client_info);
-
-            // Then register builtin pings.
-            // Borrowed from glean-core's internal_pings.rs.
-            let mping = glean_core::metrics::PingType::new(
-                "metrics",
-                true,
-                false,
-                vec![
-                    "overdue".to_string(),
-                    "reschedule".to_string(),
-                    "today".to_string(),
-                    "tomorrow".to_string(),
-                    "upgrade".to_string(),
-                ],
-            );
-            glean.register_ping_type(&mping);
-            let bping = glean_core::metrics::PingType::new("baseline", true, false, vec![]);
-            glean.register_ping_type(&bping);
-            let eping = glean_core::metrics::PingType::new("events", true, false, vec![]);
-            glean.register_ping_type(&eping);
-
-            // Now make this the global object available to others.
-            setup_glean(glean)?;
-
-            // Register the uploader so we can upload pings.
-            register_uploader();
-
-            Ok(AppState { client_info })
-        })
-        .map(|_| ())
-}
-
-/// Set the application's core metrics based on the passed client info.
-fn initialize_core_metrics(glean: &Glean, client_info: &ClientInfo) {
-    let core_metrics = InternalMetrics::new();
-
-    core_metrics
-        .app_build
-        .set(glean, &client_info.app_build[..]);
-    core_metrics
-        .app_display_version
-        .set(glean, &client_info.app_display_version[..]);
-    if let Some(app_channel) = &client_info.channel {
-        core_metrics.app_channel.set(glean, app_channel);
-    }
-    core_metrics
-        .os_version
-        .set(glean, &client_info.os_version[..]);
-    core_metrics
-        .architecture
-        .set(glean, &client_info.architecture);
-}
-
-/// Set whether upload is enabled or not.
-///
-/// See `glean_core::Glean.set_upload_enabled`.
-pub fn set_upload_enabled(enabled: bool) {
-    dispatcher::launch(move || {
-        with_glean_mut(|glean| {
-            let state = global_state();
-            let old_enabled = glean.is_upload_enabled();
-            glean.set_upload_enabled(enabled);
-
-            if !old_enabled && enabled {
-                // If uploading is being re-enabled, we have to restore the
-                // application-lifetime metrics.
-                initialize_core_metrics(&glean, &state.client_info);
-            } else if old_enabled && !enabled {
-                // If upload is being disabled, check for pings to send.
-                ping_upload::check_for_uploads();
-            }
-
-            enabled
-        })
-        .expect("Setting upload enabled failed!");
-    });
-}
-
-fn register_uploader() {
-    let result = ping_upload::register_uploader(Box::new(|ping_request| {
-        log::trace!(
-            "FOG Ping Uploader uploading ping {}",
-            ping_request.document_id
-        );
-        let result: std::result::Result<UploadResult, viaduct::Error> = (move || {
-            const SERVER: &str = "https://incoming.telemetry.mozilla.org";
-            let mut server = String::from(SERVER);
-            let localhost_port = static_prefs::pref!("telemetry.fog.test.localhost_port");
-            if localhost_port > 0 {
-                server = format!("http://localhost:{}", localhost_port);
-            } else if localhost_port < 0 {
-                log::info!("FOG Ping uploader faking success");
-                return Ok(UploadResult::HttpStatus(200));
-            }
-            let url = Url::parse(&server)?.join(&ping_request.path)?;
-            log::info!("FOG Ping uploader uploading to {:?}", url);
-
-            let mut req = Request::post(url).body(ping_request.body.clone());
-            for (header_key, header_value) in &ping_request.headers {
-                req = req.header(header_key.to_owned(), header_value)?;
-            }
-
-            log::trace!(
-                "FOG Ping Uploader sending ping {}",
-                ping_request.document_id
-            );
-            let res = req.send()?;
-            Ok(UploadResult::HttpStatus(res.status.into()))
-        })();
-        log::trace!(
-            "FOG Ping Uploader completed uploading ping {} (Result {:?})",
-            ping_request.document_id,
-            result
-        );
-        match result {
-            Ok(result) => result,
-            _ => UploadResult::UnrecoverableFailure,
-        }
-    }));
-    if result.is_err() {
-        log::warn!(
-            "Couldn't register uploader because one's already in there. {:?}",
-            result
-        );
-    }
-}
-
-pub fn set_debug_view_tag(value: &str) -> bool {
-    with_glean_mut(|glean| glean.set_debug_view_tag(value)).unwrap_or(false)
-}
-
-pub fn submit_ping(ping_name: &str) -> Result<bool> {
-    match with_glean_mut(|glean| glean.submit_ping_by_name(ping_name, None)) {
-        Some(Ok(true)) => {
-            ping_upload::check_for_uploads();
-            Ok(true)
-        }
-        Some(result) => result,
-        None => Ok(false),
-    }
-}
-
-pub fn set_log_pings(value: bool) -> bool {
-    with_glean_mut(|glean| glean.set_log_pings(value)).unwrap_or(false)
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/src/client_info.rs firefox-85.0+build1/toolkit/components/glean/src/client_info.rs
--- firefox-84.0.2+build1/toolkit/components/glean/src/client_info.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/src/client_info.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +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 https://mozilla.org/MPL/2.0/.
-
-/// Metrics included in every ping as `client_info`.
-#[derive(Debug, Clone)]
-pub struct ClientInfo {
-    /// The build identifier generated by the CI system (e.g. "1234/A").
-    pub app_build: String,
-    /// The user visible version string (e.g. "1.0.3").
-    pub app_display_version: String,
-    /// The release channel the application is on, if known.
-    pub channel: Option<String>,
-    /// The user-visible version of the operating system (e.g. "1.2.3").
-    pub os_version: String,
-    /// The architecture of the device, (e.g. "x86-64", "arm").
-    pub architecture: String,
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/src/core_metrics.rs firefox-85.0+build1/toolkit/components/glean/src/core_metrics.rs
--- firefox-84.0.2+build1/toolkit/components/glean/src/core_metrics.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/src/core_metrics.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +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 https://mozilla.org/MPL/2.0/.
-
-//! Internal metrics used to fill in the [client info section][client_info] included in every ping.
-//!
-//! [client_info]: https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section
-
-use glean_core::{metrics::StringMetric, CommonMetricData, Lifetime};
-
-#[derive(Debug)]
-pub struct InternalMetrics {
-    pub app_build: StringMetric,
-    pub app_display_version: StringMetric,
-    pub app_channel: StringMetric,
-    pub os_version: StringMetric,
-    pub architecture: StringMetric,
-}
-
-impl InternalMetrics {
-    pub fn new() -> Self {
-        Self {
-            app_build: StringMetric::new(CommonMetricData {
-                name: "app_build".into(),
-                category: "".into(),
-                send_in_pings: vec!["glean_client_info".into()],
-                lifetime: Lifetime::Application,
-                disabled: false,
-                dynamic_label: None,
-            }),
-            app_display_version: StringMetric::new(CommonMetricData {
-                name: "app_display_version".into(),
-                category: "".into(),
-                send_in_pings: vec!["glean_client_info".into()],
-                lifetime: Lifetime::Application,
-                disabled: false,
-                dynamic_label: None,
-            }),
-            app_channel: StringMetric::new(CommonMetricData {
-                name: "app_channel".into(),
-                category: "".into(),
-                send_in_pings: vec!["glean_client_info".into()],
-                lifetime: Lifetime::Application,
-                disabled: false,
-                dynamic_label: None,
-            }),
-            os_version: StringMetric::new(CommonMetricData {
-                name: "os_version".into(),
-                category: "".into(),
-                send_in_pings: vec!["glean_client_info".into()],
-                lifetime: Lifetime::Application,
-                disabled: false,
-                dynamic_label: None,
-            }),
-            architecture: StringMetric::new(CommonMetricData {
-                name: "architecture".into(),
-                category: "".into(),
-                send_in_pings: vec!["glean_client_info".into()],
-                lifetime: Lifetime::Application,
-                disabled: false,
-                dynamic_label: None,
-            }),
-        }
-    }
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/src/lib.rs firefox-85.0+build1/toolkit/components/glean/src/lib.rs
--- firefox-84.0.2+build1/toolkit/components/glean/src/lib.rs	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/src/lib.rs	2021-01-18 19:58:26.000000000 +0000
@@ -29,19 +29,18 @@
 use std::ffi::CStr;
 use std::os::raw::c_char;
 
-use nserror::{nsresult, NS_ERROR_FAILURE, NS_ERROR_NO_CONTENT, NS_OK};
+use nserror::{nsresult, NS_ERROR_FAILURE, NS_OK};
 use nsstring::{nsACString, nsAString, nsCStr, nsCString, nsStr, nsString};
 use xpcom::interfaces::{
     mozIViaduct, nsIFile, nsIObserver, nsIPrefBranch, nsIPropertyBag2, nsISupports, nsIXULAppInfo,
 };
 use xpcom::{RefPtr, XpCom};
 
-use client_info::ClientInfo;
-use glean_core::Configuration;
+use glean::{ClientInfoMetrics, Configuration};
 
-mod api;
-mod client_info;
-mod core_metrics;
+mod viaduct_uploader;
+
+use crate::viaduct_uploader::ViaductUploader;
 
 /// Project FOG's entry point.
 ///
@@ -63,17 +62,16 @@
         Err(e) => return e,
     };
 
-    let (os_version, architecture) = match get_system_info() {
+    let (os_version, _architecture) = match get_system_info() {
         Ok(si) => si,
         Err(e) => return e,
     };
 
-    let client_info = ClientInfo {
+    fog::metrics::fog_validation::os_version.set(os_version);
+
+    let client_info = ClientInfoMetrics {
         app_build,
         app_display_version,
-        channel: Some(channel),
-        os_version,
-        architecture,
     };
     log::debug!("Client Info: {:#?}", client_info);
 
@@ -86,6 +84,14 @@
         return e;
     }
 
+    const SERVER: &str = "https://incoming.telemetry.mozilla.org";
+    let localhost_port = static_prefs::pref!("telemetry.fog.test.localhost_port");
+    let server = if localhost_port > 0 {
+        format!("http://localhost:{}", localhost_port)
+    } else {
+        String::from(SERVER)
+    };
+
     let upload_enabled = static_prefs::pref!("datareporting.healthreport.uploadEnabled");
     let data_path = data_path.to_string();
     let configuration = Configuration {
@@ -94,7 +100,9 @@
         application_id: "firefox.desktop".to_string(),
         max_events: None,
         delay_ping_lifetime_io: false,
-        language_binding_name: "Rust".into(),
+        channel: Some(channel),
+        server_endpoint: Some(server),
+        uploader: Some(Box::new(crate::ViaductUploader) as Box<dyn glean::net::PingUploader>),
     };
 
     log::debug!("Configuration: {:#?}", configuration);
@@ -113,20 +121,9 @@
     }
 
     if configuration.data_path.len() > 0 {
-        std::thread::spawn(move || {
-            if let Err(e) = api::initialize(configuration, client_info) {
-                log::error!("Failed to init FOG due to {:?}", e);
-                return;
-            }
-
-            if let Err(e) = fog::flush_init() {
-                log::error!("Failed to flush pre-init buffer due to {:?}", e);
-                return;
-            }
-
-            fog::metrics::fog::initialization.stop();
-            schedule_fog_validation_ping();
-        });
+        glean::initialize(configuration, client_info);
+        fog::metrics::fog::initialization.stop();
+        schedule_fog_validation_ping();
     }
 
     NS_OK
@@ -134,7 +131,7 @@
 
 #[no_mangle]
 pub unsafe extern "C" fn fog_shutdown() {
-    fog::shutdown();
+    glean::shutdown();
 }
 
 /// Construct and return the data_path from the profile dir, or return an error.
@@ -275,7 +272,7 @@
         );
 
         let upload_enabled = static_prefs::pref!("datareporting.healthreport.uploadEnabled");
-        api::set_upload_enabled(upload_enabled);
+        glean::set_upload_enabled(upload_enabled);
         NS_OK
     }
 }
@@ -329,7 +326,7 @@
 /// Sets the debug tag for pings assembled in the future.
 /// Returns an error result if the provided value is not a valid tag.
 pub unsafe extern "C" fn fog_set_debug_view_tag(value: &nsACString) -> nsresult {
-    let result = api::set_debug_view_tag(&value.to_string());
+    let result = glean::set_debug_view_tag(&value.to_string());
     if result {
         return NS_OK;
     } else {
@@ -339,26 +336,17 @@
 
 #[no_mangle]
 /// Submits a ping by name.
-/// Returns NS_OK if the ping was successfully submitted, NS_ERROR_NO_CONTENT
-/// if the ping wasn't sent, or NS_ERROR_FAILURE if some part of the ping
-/// submission mechanism failed.
 pub unsafe extern "C" fn fog_submit_ping(ping_name: &nsACString) -> nsresult {
-    match api::submit_ping(&ping_name.to_string()) {
-        Ok(true) => NS_OK,
-        Ok(false) => NS_ERROR_NO_CONTENT,
-        _ => NS_ERROR_FAILURE,
-    }
+    glean::submit_ping_by_name(&ping_name.to_string(), None);
+    NS_OK
 }
 
 #[no_mangle]
 /// Turns ping logging on or off.
 /// Returns an error if the logging failed to be configured.
 pub unsafe extern "C" fn fog_set_log_pings(value: bool) -> nsresult {
-    if api::set_log_pings(value) {
-        return NS_OK;
-    } else {
-        return NS_ERROR_FAILURE;
-    }
+    glean::set_log_pings(value);
+    NS_OK
 }
 
 fn schedule_fog_validation_ping() {
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/src/viaduct_uploader.rs firefox-85.0+build1/toolkit/components/glean/src/viaduct_uploader.rs
--- firefox-84.0.2+build1/toolkit/components/glean/src/viaduct_uploader.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/src/viaduct_uploader.rs	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,54 @@
+// 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 https://mozilla.org/MPL/2.0/.
+
+use glean::net::{PingUploader, UploadResult};
+use url::Url;
+use viaduct::Request;
+
+/// An uploader that uses [Viaduct](https://github.com/mozilla/application-services/tree/main/components/viaduct).
+#[derive(Debug)]
+pub(crate) struct ViaductUploader;
+
+impl PingUploader for ViaductUploader {
+    /// Uploads a ping to a server.
+    ///
+    /// # Arguments
+    ///
+    /// * `url` - the URL path to upload the data to.
+    /// * `body` - the serialized text data to send.
+    /// * `headers` - a vector of tuples containing the headers to send with
+    ///   the request, i.e. (Name, Value).
+    fn upload(&self, url: String, body: Vec<u8>, headers: Vec<(String, String)>) -> UploadResult {
+        log::trace!("FOG Ping Uploader uploading to {}", url);
+        let url_clone = url.clone();
+        let result: std::result::Result<UploadResult, viaduct::Error> = (move || {
+            let localhost_port = static_prefs::pref!("telemetry.fog.test.localhost_port");
+            if localhost_port < 0 {
+                log::info!("FOG Ping uploader faking success");
+                return Ok(UploadResult::HttpStatus(200));
+            }
+            let parsed_url = Url::parse(&url_clone)?;
+
+            log::info!("FOG Ping uploader uploading to {:?}", parsed_url);
+
+            let mut req = Request::post(parsed_url.clone()).body(body.clone());
+            for (header_key, header_value) in &headers {
+                req = req.header(header_key.to_owned(), header_value)?;
+            }
+
+            log::trace!("FOG Ping Uploader sending ping to {}", parsed_url);
+            let res = req.send()?;
+            Ok(UploadResult::HttpStatus(res.status.into()))
+        })();
+        log::trace!(
+            "FOG Ping Uploader completed uploading to {} (Result {:?})",
+            url,
+            result
+        );
+        match result {
+            Ok(result) => result,
+            _ => UploadResult::UnrecoverableFailure,
+        }
+    }
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/test_metrics.yaml firefox-85.0+build1/toolkit/components/glean/test_metrics.yaml
--- firefox-84.0.2+build1/toolkit/components/glean/test_metrics.yaml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/test_metrics.yaml	2021-01-18 19:58:27.000000000 +0000
@@ -64,6 +64,24 @@
     send_in_pings:
       - test-ping
 
+  what_a_date:
+    type: datetime
+    time_unit: second
+    description: >
+      ...To be writing FOG code.
+      This is a test-only metric.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165#c1
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - glean-team@mozilla.com
+    expires: never
+    send_in_pings:
+      - test-ping
+
   what_id_it:  # Using a different metrics yaml style for fun.
     type: uuid
     description: |
@@ -76,6 +94,23 @@
     expires: never
     send_in_pings: ["test-ping"]
 
+  can_we_flag_it:
+    type: boolean
+    description: |
+      Test metric for a boolean.
+      This is a test-only metric.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165#c1
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - glean-team@mozilla.com
+    expires: never
+    send_in_pings:
+      - test-ping
+
 test_only.ipc:
   a_counter:
     type: counter
@@ -210,6 +245,8 @@
     extra_keys:
       extra1:
         description: "Some extra data"
+      extra2:
+        description: "Some extra data again"
     description: |
       This is a test-only metric.
       Just recording some events.
@@ -226,6 +263,22 @@
       - store1
     no_lint:
       - COMMON_PREFIX
+  no_extra_event:
+    type: event
+    description: |
+      This is a test-only metric.
+      Just recording some events without the extra fuss.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1646165#c1
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - glean-team@mozilla.com
+    expires: never
+    send_in_pings:
+      - store1
   a_uuid:
     type: uuid
     description: |
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/xpcom/FOG.cpp firefox-85.0+build1/toolkit/components/glean/xpcom/FOG.cpp
--- firefox-84.0.2+build1/toolkit/components/glean/xpcom/FOG.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/xpcom/FOG.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsIFOG.h"
 #include "mozilla/FOG.h"
+#include "mozilla/glean/fog_ffi_generated.h"
 
 #include "mozilla/ClearOnShutdown.h"
 
@@ -27,32 +28,24 @@
   return do_AddRef(gFOG);
 }
 
-extern "C" {
-nsresult fog_init();
-void fog_shutdown();
-nsresult fog_set_log_pings(bool aEnableLogPings);
-nsresult fog_set_debug_view_tag(const nsACString* aDebugTag);
-nsresult fog_submit_ping(const nsACString* aPingName);
-}
-
-void FOG::Shutdown() { fog_shutdown(); }
+void FOG::Shutdown() { glean::impl::fog_shutdown(); }
 
 NS_IMETHODIMP
-FOG::InitializeFOG() { return fog_init(); }
+FOG::InitializeFOG() { return glean::impl::fog_init(); }
 
 NS_IMETHODIMP
 FOG::SetLogPings(bool aEnableLogPings) {
-  return fog_set_log_pings(aEnableLogPings);
+  return glean::impl::fog_set_log_pings(aEnableLogPings);
 }
 
 NS_IMETHODIMP
 FOG::SetTagPings(const nsACString& aDebugTag) {
-  return fog_set_debug_view_tag(&aDebugTag);
+  return glean::impl::fog_set_debug_view_tag(&aDebugTag);
 }
 
 NS_IMETHODIMP
 FOG::SendPing(const nsACString& aPingName) {
-  return fog_submit_ping(&aPingName);
+  return glean::impl::fog_submit_ping(&aPingName);
 }
 
 NS_IMPL_ISUPPORTS(FOG, nsIFOG)
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/xpcom/nsIGleanMetrics.idl firefox-85.0+build1/toolkit/components/glean/xpcom/nsIGleanMetrics.idl
--- firefox-84.0.2+build1/toolkit/components/glean/xpcom/nsIGleanMetrics.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/xpcom/nsIGleanMetrics.idl	2021-01-18 19:58:26.000000000 +0000
@@ -5,33 +5,43 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(05b89d2a-d57c-11ea-82da-3f63399a6f5a)]
-interface nsIGleanCounter : nsISupports
+[scriptable, uuid(d3180fe0-19fa-11eb-8b6f-0800200c9a66)]
+interface nsIGleanBoolean : nsISupports
 {
-  /*
-  * Increases the counter by `amount`.
-  *
-  * @param amount The amount to increase by. Should be positive.
-  */
-  [implicit_jscontext]
-  void add(in uint32_t amount);
+  /**
+   * Set to the specified boolean value.
+   *
+   * @param value the value to set.
+   */
+  void set(in bool value);
 
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
+   * Gets the currently stored value as a boolean.
    *
    * This function will attempt to await the last parent-process task (if any)
    * writing to the the metric's storage engine before returning a value.
    * This function will not wait for data from child processes.
    *
+   * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
+   * @return value of the stored metric, or undefined if there is no value.
    */
-  [implicit_jscontext]
-  bool testHasValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
+};
+
+[scriptable, uuid(aa15fd20-1e8a-11eb-9bec-0800200c9a66)]
+interface nsIGleanDatetime : nsISupports
+{
+  /**
+   * Set the datetime to the provided value, or the local now.
+   *
+   * @param aValue The time value in milliseconds since epoch. Defaults to local now.
+   */
+  [optional_argc]
+  void set([optional] in PRTime aValue);
 
   /**
    * **Test-only API**
@@ -45,39 +55,48 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or undefined if there is no value.
    */
   [implicit_jscontext]
-  long testGetValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
 };
 
-[scriptable, uuid(d84a3555-46f1-48c1-9122-e8e88b069d2b)]
-interface nsIGleanString : nsISupports
+[scriptable, uuid(05b89d2a-d57c-11ea-82da-3f63399a6f5a)]
+interface nsIGleanCounter : nsISupports
 {
   /*
-  * Set to the specified value.
+  * Increases the counter by `amount`.
   *
-  * @param value The string to set the metric to.
+  * @param amount The amount to increase by. Should be positive.
   */
-  [implicit_jscontext]
-  void set(in ACString value);
+  void add(in uint32_t amount);
 
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
+   * Gets the currently stored value as an integer.
    *
    * This function will attempt to await the last parent-process task (if any)
    * writing to the the metric's storage engine before returning a value.
    * This function will not wait for data from child processes.
    *
+   * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
+   * @return value of the stored metric, or undefined if there is no value.
    */
-  [implicit_jscontext]
-  bool testHasValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
+};
+
+[scriptable, uuid(d84a3555-46f1-48c1-9122-e8e88b069d2b)]
+interface nsIGleanString : nsISupports
+{
+  /*
+  * Set to the specified value.
+  *
+  * @param value The string to set the metric to.
+  */
+  void set(in AUTF8String value);
 
   /**
    * **Test-only API**
@@ -91,10 +110,10 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or undefined if there is no value.
    */
   [implicit_jscontext]
-  ACString testGetValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
 };
 
 [scriptable, uuid(2586530c-030f-11eb-93cb-cbf30d25225a)]
@@ -107,7 +126,6 @@
    * called with no corresponding [stop]): in that case the original
    * start time will be preserved.
    */
-  [implicit_jscontext]
   void start();
 
   /**
@@ -118,29 +136,11 @@
    * This will record an error if no [start] was called or there is an already
    * existing value.
    */
-  [implicit_jscontext]
   void stop();
 
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
-   *
-   * This function will attempt to await the last parent-process task (if any)
-   * writing to the the metric's storage engine before returning a value.
-   * This function will not wait for data from child processes.
-   *
-   * Parent process only. Panics in child processes.
-   *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
-   */
-  [implicit_jscontext]
-  bool testHasValue(in ACString aStorageName);
-
-  /**
-   * **Test-only API**
-   *
    * Gets the currently stored value as an integer.
    *
    * This function will attempt to await the last parent-process task (if any)
@@ -150,10 +150,9 @@
    * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @return value of the stored metric.
+   * @return value of the stored metric, or undefined if there is no value.
    */
-  [implicit_jscontext]
-  long long testGetValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
 };
 
 [scriptable, uuid(395700e7-06f6-46be-adcc-ea58977fda6d)]
@@ -164,36 +163,46 @@
    *
    * @param aValue The UUID to set the metric to.
    */
-  [implicit_jscontext]
-  void set(in ACString aValue);
+  void set(in AUTF8String aValue);
 
   /**
    * Generate a new random UUID and set the metric to it.
    */
-  [implicit_jscontext]
   void generateAndSet();
 
   /**
    * **Test-only API**
    *
-   * Tests whether a value is stored for the metric.
+   * Gets the currently stored value as an integer.
    *
    * This function will attempt to await the last parent-process task (if any)
    * writing to the the metric's storage engine before returning a value.
    * This function will not wait for data from child processes.
    *
+   * This doesn't clear the stored value.
    * Parent process only. Panics in child processes.
    *
-   * @param aStorageName the name of the ping to retrieve the metric for.
-   * @return true if metric value exists, otherwise false
+   * @return value of the stored metric, or undefined if there is no value.
    */
   [implicit_jscontext]
-  bool testHasValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
+};
+
+[scriptable, uuid(1b01424a-1f55-11eb-92a5-0754f6c3f240)]
+interface nsIGleanEvent : nsISupports
+{
+  /*
+   * Record an event.
+   *
+   * @param aExtra An (optional) map of extra values.
+   */
+  [implicit_jscontext]
+  void record([optional] in jsval aExtra);
 
   /**
    * **Test-only API**
    *
-   * Gets the currently stored value as an integer.
+   * Get a list of currently stored events for this event metric.
    *
    * This function will attempt to await the last parent-process task (if any)
    * writing to the the metric's storage engine before returning a value.
@@ -205,5 +214,5 @@
    * @return value of the stored metric.
    */
   [implicit_jscontext]
-  ACString testGetValue(in ACString aStorageName);
+  jsval testGetValue(in AUTF8String aStorageName);
 };
diff -Nru firefox-84.0.2+build1/toolkit/components/glean/xpcshell/test_Glean.js firefox-85.0+build1/toolkit/components/glean/xpcshell/test_Glean.js
--- firefox-84.0.2+build1/toolkit/components/glean/xpcshell/test_Glean.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/glean/xpcshell/test_Glean.js	2021-01-18 19:58:26.000000000 +0000
@@ -10,8 +10,54 @@
 "use strict";
 
 Cu.importGlobalProperties(["Glean"]);
+const { MockRegistrar } = ChromeUtils.import(
+  "resource://testing-common/MockRegistrar.jsm"
+);
 const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
+/**
+ * Mock the SysInfo object used to read System data in Gecko.
+ */
+var SysInfo = {
+  overrides: {},
+
+  /**
+   * Checks if overrides are present and return them.
+   *
+   * @returns the overridden value or undefined if not present.
+   */
+  _getOverridden(name) {
+    if (name in this.overrides) {
+      return this.overrides[name];
+    }
+
+    return undefined;
+  },
+
+  // To support nsIPropertyBag.
+  getProperty(name) {
+    let override = this._getOverridden(name);
+    return override !== undefined
+      ? override
+      : this._genuine.QueryInterface(Ci.nsIPropertyBag).getProperty(name);
+  },
+
+  // To support nsIPropertyBag2.
+  get(name) {
+    let override = this._getOverridden(name);
+    return override !== undefined
+      ? override
+      : this._genuine.QueryInterface(Ci.nsIPropertyBag2).get(name);
+  },
+
+  // To support nsIPropertyBag2.
+  getPropertyAsACString(name) {
+    return this.get(name);
+  },
+
+  QueryInterface: ChromeUtils.generateQI(["nsIPropertyBag2", "nsISystemInfo"]),
+};
+
 function sleep(ms) {
   /* eslint-disable mozilla/no-arbitrary-setTimeout */
   return new Promise(resolve => setTimeout(resolve, ms));
@@ -21,14 +67,27 @@
   // FOG needs a profile directory to put its data in.
   do_get_profile();
 
+  // Mock SysInfo.
+  SysInfo.overrides = {
+    version: "1.2.3",
+    arc: "x64",
+  };
+  MockRegistrar.register("@mozilla.org/system-info;1", SysInfo);
+
   // We need to initialize it once, otherwise operations will be stuck in the pre-init queue.
   let FOG = Cc["@mozilla.org/toolkit/glean;1"].createInstance(Ci.nsIFOG);
   FOG.initializeFOG();
 });
 
+add_task(function test_osversion_is_set() {
+  Assert.equal(
+    "1.2.3",
+    Glean.fog_validation.os_version.testGetValue("fog-validation")
+  );
+});
+
 add_task(function test_fog_counter_works() {
   Glean.test_only.bad_code.add(31);
-  Assert.ok(Glean.test_only.bad_code.testHasValue("test-ping"));
   Assert.equal(31, Glean.test_only.bad_code.testGetValue("test-ping"));
 });
 
@@ -36,7 +95,6 @@
   const value = "a cheesy string!";
   Glean.test_only.cheesy_string.set(value);
 
-  Assert.ok(Glean.test_only.cheesy_string.testHasValue("test-ping"));
   Assert.equal(value, Glean.test_only.cheesy_string.testGetValue("test-ping"));
 });
 
@@ -47,14 +105,12 @@
   await sleep(10);
   Glean.test_only.can_we_time_it.stop();
 
-  Assert.ok(Glean.test_only.can_we_time_it.testHasValue("test-ping"));
   Assert.ok(Glean.test_only.can_we_time_it.testGetValue("test-ping") > 0);
 });
 
 add_task(async function test_fog_uuid_works() {
   const kTestUuid = "decafdec-afde-cafd-ecaf-decafdecafde";
   Glean.test_only.what_id_it.set(kTestUuid);
-  Assert.ok(Glean.test_only.what_id_it.testHasValue("test-ping"));
   Assert.equal(kTestUuid, Glean.test_only.what_id_it.testGetValue("test-ping"));
 
   Glean.test_only.what_id_it.generateAndSet();
@@ -65,3 +121,29 @@
     Glean.test_only.what_id_it.testGetValue("test-ping")
   );
 });
+
+// Enable test after bug 1677448 is fixed.
+add_task({ skip_if: () => true }, function test_fog_datetime_works() {
+  const value = new Date("2020-06-11T12:00:00");
+
+  Glean.test_only.what_a_date.set(value.getTime() * 1000);
+
+  const received = Glean.test_only.what_a_date.testGetValue("test-ping");
+  Assert.ok(received.startsWith("2020-06-11T12:00:00"));
+});
+
+add_task(function test_fog_boolean_works() {
+  Glean.test_only.can_we_flag_it.set(false);
+  Assert.equal(false, Glean.test_only.can_we_flag_it.testGetValue("test-ping"));
+});
+
+add_task(async function test_fog_event_works() {
+  Glean.test_only_ipc.no_extra_event.record();
+  // FIXME(bug 1678567): Check that the value was recorded when we can.
+  // Assert.ok(Glean.test_only_ipc.no_extra_event.testGetValue("store1"));
+
+  let extra = { extra1: "can set extras", extra2: "passing more data" };
+  Glean.test_only_ipc.an_event.record(extra);
+  // FIXME(bug 1678567): Check that the value was recorded when we can.
+  // Assert.ok(Glean.test_only_ipc.an_event.testGetValue("store1"));
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/kvstore/Cargo.toml firefox-85.0+build1/toolkit/components/kvstore/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/kvstore/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/kvstore/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -6,15 +6,14 @@
 [dependencies]
 atomic_refcell = "0.1"
 crossbeam-utils = "0.6.3"
-cstr = "0.1"
+cstr = "0.2"
 lazy_static = "1"
 libc = "0.2"
-lmdb-rkv = "0.14"
 log = "0.4"
 moz_task = { path = "../../../xpcom/rust/moz_task" }
 nserror = { path = "../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
-rkv = { version = "0.15.0", default-features = false, features=["no-canonicalize-path"] }
+rkv = { version = "0.16.1", default-features = false, features=["no-canonicalize-path"] }
 storage_variant = { path = "../../../storage/variant" }
 xpcom = { path = "../../../xpcom/rust/xpcom" }
 tempfile = "3"
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/experiments/ExperimentStore.jsm firefox-85.0+build1/toolkit/components/messaging-system/experiments/ExperimentStore.jsm
--- firefox-84.0.2+build1/toolkit/components/messaging-system/experiments/ExperimentStore.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/experiments/ExperimentStore.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -14,8 +14,34 @@
 const { SharedDataMap } = ChromeUtils.import(
   "resource://messaging-system/lib/SharedDataMap.jsm"
 );
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const SYNC_DATA_PREF = "messaging-system.syncdatastore.data";
+let tryJSONParse = data => {
+  try {
+    return JSON.parse(data);
+  } catch (e) {}
+
+  return {};
+};
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "syncDataStore",
+  SYNC_DATA_PREF,
+  {},
+  // aOnUpdate
+  (data, prev, latest) => tryJSONParse(latest),
+  // aTransform
+  tryJSONParse
+);
 
 const DEFAULT_STORE_ID = "ExperimentStoreData";
+// Experiment feature configs that should be saved to prefs for
+// fast access on startup.
+const SYNC_ACCESS_FEATURES = ["newtab", "aboutwelcome"];
 
 class ExperimentStore extends SharedDataMap {
   constructor(sharedDataKey, options) {
@@ -85,7 +111,7 @@
    */
   getAll() {
     if (!this._data) {
-      return [];
+      return Object.values(syncDataStore);
     }
 
     return Object.values(this._data);
@@ -111,6 +137,26 @@
   }
 
   /**
+   * @param {Enrollment} experiment
+   */
+  _updateSyncStore(experiment) {
+    if (SYNC_ACCESS_FEATURES.includes(experiment.branch.feature.featureId)) {
+      if (!experiment.active) {
+        // Remove experiments on un-enroll, otherwise nothing to do
+        if (syncDataStore[experiment.slug]) {
+          delete syncDataStore[experiment.slug];
+        }
+      } else {
+        syncDataStore[experiment.slug] = experiment;
+      }
+      Services.prefs.setStringPref(
+        SYNC_DATA_PREF,
+        JSON.stringify(syncDataStore)
+      );
+    }
+  }
+
+  /**
    * Add an experiment. Short form for .set(slug, experiment)
    * @param {Enrollment} experiment
    */
@@ -122,6 +168,7 @@
     }
     this.set(experiment.slug, experiment);
     this._emitExperimentUpdates(experiment);
+    this._updateSyncStore(experiment);
   }
 
   /**
@@ -139,5 +186,6 @@
     const updatedExperiment = { ...oldProperties, ...newProperties };
     this.set(slug, updatedExperiment);
     this._emitExperimentUpdates(updatedExperiment);
+    this._updateSyncStore(updatedExperiment);
   }
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/lib/RemoteSettingsExperimentLoader.jsm firefox-85.0+build1/toolkit/components/messaging-system/lib/RemoteSettingsExperimentLoader.jsm
--- firefox-84.0.2+build1/toolkit/components/messaging-system/lib/RemoteSettingsExperimentLoader.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/lib/RemoteSettingsExperimentLoader.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -41,7 +41,8 @@
   "nsIUpdateTimerManager"
 );
 
-const COLLECTION_ID = "nimbus-desktop-experiments";
+const COLLECTION_ID_PREF = "messaging-system.rsexperimentloader.collection_id";
+const COLLECTION_ID_FALLBACK = "nimbus-desktop-experiments";
 const ENABLED_PREF = "messaging-system.rsexperimentloader.enabled";
 const STUDIES_OPT_OUT_PREF = "app.shield.optoutstudies.enabled";
 
@@ -50,6 +51,13 @@
 // Use the same update interval as normandy
 const RUN_INTERVAL_PREF = "app.normandy.run_interval_seconds";
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "COLLECTION_ID",
+  COLLECTION_ID_PREF,
+  COLLECTION_ID_FALLBACK
+);
+
 class _RemoteSettingsExperimentLoader {
   constructor() {
     // Has the timer been set?
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/lib/SharedDataMap.jsm firefox-85.0+build1/toolkit/components/messaging-system/lib/SharedDataMap.jsm
--- firefox-84.0.2+build1/toolkit/components/messaging-system/lib/SharedDataMap.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/lib/SharedDataMap.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -54,13 +54,9 @@
     }
   }
 
-  async init(runSync = false) {
+  async init() {
     if (!this._isReady && this.isParent) {
-      if (runSync) {
-        this._store.ensureDataReady();
-      } else {
-        await this._store.load();
-      }
+      await this._store.load();
       this._data = this._store.data;
       this._syncToChildren({ flush: true });
       this._checkIfReady();
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm firefox-85.0+build1/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm
--- firefox-84.0.2+build1/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/lib/SpecialMessageActions.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -173,6 +173,7 @@
       case "SHOW_MIGRATION_WIZARD":
         MigrationUtils.showMigrationWizard(window, [
           MigrationUtils.MIGRATION_ENTRYPOINT_NEWTAB,
+          action.data?.source,
         ]);
         break;
       case "OPEN_PRIVATE_BROWSER_WINDOW":
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js firefox-85.0+build1/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js
--- firefox-84.0.2+build1/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js	2021-01-18 19:58:27.000000000 +0000
@@ -131,7 +131,7 @@
   let browser = gBrowser.selectedBrowser;
   // Wait for any other navigation events from previous tests
   await BrowserTestUtils.browserLoaded(browser, false, "about:home");
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:config");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:config");
   await BrowserTestUtils.browserLoaded(browser, false, "about:config");
 
   await SMATestUtils.executeAndValidateAction(action);
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js firefox-85.0+build1/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js
--- firefox-84.0.2+build1/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js	2021-01-18 19:58:26.000000000 +0000
@@ -16,7 +16,7 @@
 
 async function openURLInWindow(window, url) {
   const { selectedBrowser } = window.gBrowser;
-  await BrowserTestUtils.loadURI(selectedBrowser, url);
+  BrowserTestUtils.loadURI(selectedBrowser, url);
   await BrowserTestUtils.browserLoaded(selectedBrowser, false, url);
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/reference_aboutwelcome_experiment_content.json firefox-85.0+build1/toolkit/components/messaging-system/test/unit/reference_aboutwelcome_experiment_content.json
--- firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/reference_aboutwelcome_experiment_content.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/test/unit/reference_aboutwelcome_experiment_content.json	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,190 @@
+{
+  "id": "msw-late-setdefault",
+  "template": "multistage",
+  "screens": [
+    {
+      "id": "AW_GET_STARTED",
+      "order": 0,
+      "content": {
+        "zap": true,
+        "title": {
+          "string_id": "onboarding-multistage-welcome-header"
+        },
+        "subtitle": {
+          "string_id": "onboarding-multistage-welcome-subtitle"
+        },
+        "primary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-welcome-primary-button-label"
+          },
+          "action": {
+            "navigate": true
+          }
+        },
+        "secondary_button": {
+          "text": {
+            "string_id": "onboarding-multistage-welcome-secondary-button-text"
+          },
+          "label": {
+            "string_id": "onboarding-multistage-welcome-secondary-button-label"
+          },
+          "position": "top",
+          "action": {
+            "type": "SHOW_FIREFOX_ACCOUNTS",
+            "addFlowParams": true,
+            "data": {
+              "entrypoint": "activity-stream-firstrun"
+            }
+          }
+        }
+      }
+    },
+    {
+      "id": "AW_IMPORT_SETTINGS",
+      "order": 1,
+      "content": {
+        "zap": true,
+        "disclaimer": {
+          "string_id": "onboarding-import-sites-disclaimer"
+        },
+        "title": {
+          "string_id": "onboarding-multistage-import-header"
+        },
+        "subtitle": {
+          "string_id": "onboarding-multistage-import-subtitle"
+        },
+        "tiles": {
+          "type": "topsites",
+          "showTitles": true
+        },
+        "primary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-import-primary-button-label"
+          },
+          "action": {
+            "type": "SHOW_MIGRATION_WIZARD",
+            "navigate": true
+          }
+        },
+        "secondary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-import-secondary-button-label"
+          },
+          "action": {
+            "navigate": true
+          }
+        }
+      }
+    },
+    {
+      "id": "AW_CHOOSE_THEME",
+      "order": 2,
+      "content": {
+        "zap": true,
+        "title": {
+          "string_id": "onboarding-multistage-theme-header"
+        },
+        "subtitle": {
+          "string_id": "onboarding-multistage-theme-subtitle"
+        },
+        "tiles": {
+          "type": "theme",
+          "action": {
+            "theme": "<event>"
+          },
+          "data": [
+            {
+              "theme": "automatic",
+              "label": {
+                "string_id": "onboarding-multistage-theme-label-automatic"
+              },
+              "tooltip": {
+                "string_id": "onboarding-multistage-theme-tooltip-automatic-2"
+              },
+              "description": {
+                "string_id": "onboarding-multistage-theme-description-automatic-2"
+              }
+            },
+            {
+              "theme": "light",
+              "label": {
+                "string_id": "onboarding-multistage-theme-label-light"
+              },
+              "tooltip": {
+                "string_id": "onboarding-multistage-theme-tooltip-light-2"
+              },
+              "description": {
+                "string_id": "onboarding-multistage-theme-description-light"
+              }
+            },
+            {
+              "theme": "dark",
+              "label": {
+                "string_id": "onboarding-multistage-theme-label-dark"
+              },
+              "tooltip": {
+                "string_id": "onboarding-multistage-theme-tooltip-dark-2"
+              },
+              "description": {
+                "string_id": "onboarding-multistage-theme-description-dark"
+              }
+            },
+            {
+              "theme": "alpenglow",
+              "label": {
+                "string_id": "onboarding-multistage-theme-label-alpenglow"
+              },
+              "tooltip": {
+                "string_id": "onboarding-multistage-theme-tooltip-alpenglow-2"
+              },
+              "description": {
+                "string_id": "onboarding-multistage-theme-description-alpenglow"
+              }
+            }
+          ]
+        },
+        "primary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-theme-primary-button-label"
+          },
+          "action": {
+            "navigate": true
+          }
+        },
+        "secondary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-theme-secondary-button-label"
+          },
+          "action": {
+            "theme": "automatic",
+            "navigate": true
+          }
+        }
+      }
+    },
+    {
+      "id": "AW_SET_DEFAULT",
+      "order": 3,
+      "content": {
+        "zap": true,
+        "title": "Make Firefox your default browser",
+        "subtitle": "Speed, safety, and privacy every time you browse.",
+        "primary_button": {
+          "label": "Make Default",
+          "action": {
+            "navigate": true,
+            "type": "SET_DEFAULT_BROWSER"
+          }
+        },
+        "secondary_button": {
+          "label": {
+            "string_id": "onboarding-multistage-import-secondary-button-label"
+          },
+          "action": {
+            "navigate": true
+          }
+        }
+      }
+    }
+  ]
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_ExperimentManager_enroll.js firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_ExperimentManager_enroll.js
--- firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_ExperimentManager_enroll.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_ExperimentManager_enroll.js	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
 const { ClientEnvironment } = ChromeUtils.import(
   "resource://normandy/lib/ClientEnvironment.jsm"
 );
+const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
 /**
  * The normal case: Enrollment of a new experiment
@@ -197,3 +198,36 @@
 
   sandbox.reset();
 });
+
+add_task(async function enroll_in_reference_aw_experiment() {
+  const SYNC_DATA_PREF = "messaging-system.syncdatastore.data";
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let dir = await OS.File.getCurrentDirectory();
+  let src = OS.Path.join(dir, "reference_aboutwelcome_experiment_content.json");
+  let bytes = await OS.File.read(src);
+  const decoder = new TextDecoder();
+  const content = JSON.parse(decoder.decode(bytes));
+  // Create two dummy branches with the content from disk
+  const branches = ["treatment-a", "treatment-b"].map(slug => ({
+    slug,
+    ratio: 1,
+    feature: { value: content, enabled: true, featureId: "aboutwelcome" },
+  }));
+  let recipe = ExperimentFakes.recipe("reference-aw", { branches });
+  // Ensure we get enrolled
+  recipe.bucketConfig.count = recipe.bucketConfig.total;
+
+  const manager = ExperimentFakes.manager();
+  await manager.onStartup();
+  await manager.enroll(recipe);
+
+  Assert.ok(manager.store.get("reference-aw"), "Successful onboarding");
+  let prefValue = Services.prefs.getStringPref(SYNC_DATA_PREF);
+  Assert.ok(
+    prefValue,
+    "aboutwelcome experiment enrollment should be stored to prefs"
+  );
+  // In case some regression causes us to store a significant amount of data
+  // in prefs.
+  Assert.ok(prefValue.length < 3498, "Make sure we don't bloat the prefs");
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_ExperimentStore.js firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_ExperimentStore.js
--- firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_ExperimentStore.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_ExperimentStore.js	2021-01-18 19:58:26.000000000 +0000
@@ -1,5 +1,7 @@
 "use strict";
 
+const SYNC_DATA_PREF = "messaging-system.syncdatastore.data";
+
 const { ExperimentFakes } = ChromeUtils.import(
   "resource://testing-common/MSTestUtils.jsm"
 );
@@ -310,3 +312,127 @@
     "should not update other props"
   );
 });
+
+add_task(async function test_sync_access_before_init() {
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let store = ExperimentFakes.store();
+
+  Assert.equal(store.getAll().length, 0, "Start with an empty store");
+
+  const syncAccessExp = ExperimentFakes.experiment("foo", {
+    feature: { featureId: "newtab", enabled: "true" },
+  });
+  await store.init();
+  store.addExperiment(syncAccessExp);
+
+  let prefValue = JSON.parse(Services.prefs.getStringPref(SYNC_DATA_PREF));
+
+  Assert.ok(Object.keys(prefValue).length === 1, "Parsed stored experiment");
+  Assert.equal(
+    prefValue.foo.slug,
+    syncAccessExp.slug,
+    "Got back the experiment"
+  );
+
+  // New un-initialized store that should read the pref value
+  store = ExperimentFakes.store();
+
+  Assert.equal(store.getAll().length, 1, "Returns experiment from pref");
+});
+
+add_task(async function test_sync_access_update() {
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let store = ExperimentFakes.store();
+  let experiment = ExperimentFakes.experiment("foo", {
+    feature: { featureId: "aboutwelcome", enabled: true },
+  });
+
+  await store.init();
+
+  store.addExperiment(experiment);
+  store.updateExperiment("foo", {
+    branch: {
+      ...experiment.branch,
+      feature: { featureId: "aboutwelcome", enabled: true, value: "bar" },
+    },
+  });
+
+  store = ExperimentFakes.store();
+  let experiments = store.getAll();
+
+  Assert.equal(experiments.length, 1, "Got back 1 experiment");
+  Assert.equal(experiments[0].branch.feature.value, "bar", "Got updated value");
+});
+
+add_task(async function test_sync_features_only() {
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let store = ExperimentFakes.store();
+  let experiment = ExperimentFakes.experiment("foo", {
+    feature: { featureId: "cfr", enabled: true },
+  });
+
+  await store.init();
+
+  store.addExperiment(experiment);
+  store = ExperimentFakes.store();
+
+  Assert.equal(store.getAll().length, 0, "cfr is not a sync access experiment");
+});
+
+add_task(async function test_sync_access_unenroll() {
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let store = ExperimentFakes.store();
+  let experiment = ExperimentFakes.experiment("foo", {
+    feature: { featureId: "aboutwelcome", enabled: true },
+    active: true,
+  });
+
+  await store.init();
+
+  store.addExperiment(experiment);
+  store.updateExperiment("foo", { active: false });
+
+  store = ExperimentFakes.store();
+  let experiments = store.getAll();
+
+  Assert.equal(experiments.length, 0, "Unenrolled experiment is deleted");
+});
+
+add_task(async function test_sync_access_unenroll_2() {
+  Services.prefs.clearUserPref(SYNC_DATA_PREF);
+  let store = ExperimentFakes.store();
+  let experiment1 = ExperimentFakes.experiment("foo", {
+    feature: { featureId: "aboutwelcome", enabled: true },
+  });
+  let experiment2 = ExperimentFakes.experiment("bar", {
+    feature: { featureId: "aboutwelcome", enabled: true },
+  });
+
+  await store.init();
+
+  store.addExperiment(experiment1);
+  store.addExperiment(experiment2);
+
+  Assert.equal(store.getAll().length, 2, "2/2 experiments");
+
+  store.updateExperiment("bar", { active: false });
+  let other_store = ExperimentFakes.store();
+  Assert.equal(
+    other_store.getAll().length,
+    1,
+    "Unenrolled from 1/2 experiments"
+  );
+
+  store.updateExperiment("foo", { active: false });
+  Assert.equal(
+    other_store.getAll().length,
+    0,
+    "Unenrolled from 2/2 experiments"
+  );
+
+  Assert.equal(
+    Services.prefs.getStringPref(SYNC_DATA_PREF),
+    "{}",
+    "Empty store"
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_SharedDataMap.js firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_SharedDataMap.js
--- firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/test_SharedDataMap.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/test/unit/test_SharedDataMap.js	2021-01-18 19:58:26.000000000 +0000
@@ -32,16 +32,8 @@
   add_task(testTask);
 }
 
-with_sharedDataMap(function test_sync({ instance, sandbox }) {
-  instance.init(true);
-
-  instance.set("foo", "bar");
-
-  Assert.equal(instance.get("foo"), "bar", "It should retrieve a string value");
-});
-
-with_sharedDataMap(function test_set_notify({ instance, sandbox }) {
-  instance.init(true);
+with_sharedDataMap(async function test_set_notify({ instance, sandbox }) {
+  await instance.init();
   let updateStub = sandbox.stub();
 
   instance.on("parent-store-update:foo", updateStub);
@@ -52,7 +44,7 @@
 });
 
 with_sharedDataMap(async function test_set_child_notify({ instance, sandbox }) {
-  instance.init(true);
+  await instance.init();
 
   let updateStub = sandbox.stub();
   const childInstance = new SharedDataMap("xpcshell", {
@@ -82,8 +74,8 @@
   Assert.equal(instance.get("foo"), "bar", "It should retrieve a string value");
 });
 
-with_sharedDataMap(function test_saveSoon({ instance, sandbox }) {
-  instance.init(true);
+with_sharedDataMap(async function test_saveSoon({ instance, sandbox }) {
+  await instance.init();
   const stub = sandbox.stub(instance._store, "saveSoon");
 
   instance.set("foo", "bar");
@@ -96,7 +88,7 @@
   const stubA = sandbox.stub(instance._store, "ensureDataReady");
   const stubB = sandbox.stub(instance._store, "load");
 
-  await instance.init(true);
+  await instance.init();
 
   Assert.equal(
     stubA.callCount,
@@ -114,7 +106,7 @@
   instance: parentInstance,
   sandbox,
 }) {
-  parentInstance.init(true);
+  await parentInstance.init();
   parentInstance.set("foo", { bar: 1 });
 
   const childInstance = new SharedDataMap("xpcshell", {
@@ -175,7 +167,7 @@
 
   Assert.equal(childInstance.has("baz"), false, "Should not fail");
 
-  parentInstance.init(true);
+  await parentInstance.init();
   parentInstance.set("baz", { bar: 1 });
 
   await TestUtils.waitForCondition(
diff -Nru firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/xpcshell.ini firefox-85.0+build1/toolkit/components/messaging-system/test/unit/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/messaging-system/test/unit/xpcshell.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/messaging-system/test/unit/xpcshell.ini	2021-01-18 19:58:26.000000000 +0000
@@ -2,6 +2,8 @@
 head = head.js
 tags = messaging-system
 firefox-appdir = browser
+support-files =
+  reference_aboutwelcome_experiment_content.json
 
 [test_ExperimentManager_context.js]
 [test_ExperimentManager_enroll.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/moz.build firefox-85.0+build1/toolkit/components/moz.build
--- firefox-84.0.2+build1/toolkit/components/moz.build	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/moz.build	2021-01-18 19:58:26.000000000 +0000
@@ -110,6 +110,9 @@
 if CONFIG["OS_TARGET"] != "Android":
     DIRS += ["terminator"]
 
+if CONFIG["MOZ_UPDATE_AGENT"]:
+    DIRS += ["taskscheduler"]
+
 DIRS += ["build"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
diff -Nru firefox-84.0.2+build1/toolkit/components/mozintl/mozIMozIntl.idl firefox-85.0+build1/toolkit/components/mozintl/mozIMozIntl.idl
--- firefox-84.0.2+build1/toolkit/components/mozintl/mozIMozIntl.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/mozintl/mozIMozIntl.idl	2021-01-18 19:58:26.000000000 +0000
@@ -78,9 +78,11 @@
    */
   jsval getLocaleDisplayNames(in jsval locales, in jsval localeCodes);
 
+  readonly attribute jsval Collator;
   readonly attribute jsval DateTimeFormat;
+  readonly attribute jsval ListFormat;
+  readonly attribute jsval Locale;
   readonly attribute jsval NumberFormat;
-  readonly attribute jsval Collator;
   readonly attribute jsval PluralRules;
   readonly attribute jsval RelativeTimeFormat;
 };
diff -Nru firefox-84.0.2+build1/toolkit/components/mozintl/mozIntl.jsm firefox-85.0+build1/toolkit/components/mozintl/mozIntl.jsm
--- firefox-84.0.2+build1/toolkit/components/mozintl/mozIntl.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/mozintl/mozIntl.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -12,21 +12,10 @@
 );
 
 /**
- * RegExp used to parse a BCP47 language tag (ex: en-US, sr-Cyrl-RU etc.)
+ * RegExp used to parse variant subtags from a BCP47 language tag.
+ * For example: ca-valencia
  */
-const languageTagMatch = /^([a-z]{2,3}|[a-z]{4}|[a-z]{5,8})(?:[-_]([a-z]{4}))?(?:[-_]([A-Z]{2}|[0-9]{3}))?((?:[-_](?:[a-z0-9]{5,8}|[0-9][a-z0-9]{3}))*)(?:[-_][a-wy-z0-9](?:[-_][a-z0-9]{2,8})+)*(?:[-_]x(?:[-_][a-z0-9]{1,8})+)?$/i;
-
-/**
- * This helper function retrives currently used app locales, allowing
- * all mozIntl APIs to use the current regional prefs locales unless
- * called with explicitly listed locales.
- */
-function getLocales(locales) {
-  if (!locales) {
-    return Services.locale.regionalPrefsLocales;
-  }
-  return locales;
-}
+const variantSubtagsMatch = /(?:-(?:[a-z0-9]{5,8}|[0-9][a-z0-9]{3}))+$/;
 
 function getDateTimePatternStyle(option) {
   switch (option) {
@@ -656,24 +645,6 @@
   ]),
 };
 
-class MozNumberFormat extends Intl.NumberFormat {
-  constructor(locales, options, ...args) {
-    super(getLocales(locales), options, ...args);
-  }
-}
-
-class MozCollator extends Intl.Collator {
-  constructor(locales, options, ...args) {
-    super(getLocales(locales), options, ...args);
-  }
-}
-
-class MozPluralRules extends Intl.PluralRules {
-  constructor(locales, options, ...args) {
-    super(getLocales(locales), options, ...args);
-  }
-}
-
 class MozRelativeTimeFormat extends Intl.RelativeTimeFormat {
   constructor(locales, options = {}, ...args) {
     // If someone is asking for MozRelativeTimeFormat, it's likely they'll want
@@ -681,7 +652,7 @@
     if (options.numeric === undefined) {
       options.numeric = "auto";
     }
-    super(getLocales(locales), options, ...args);
+    super(locales, options, ...args);
   }
 
   formatBestUnit(date, { now = new Date() } = {}) {
@@ -757,9 +728,11 @@
 }
 
 class MozIntl {
-  NumberFormat = MozNumberFormat;
-  Collator = MozCollator;
-  PluralRules = MozPluralRules;
+  Collator = Intl.Collator;
+  ListFormat = Intl.ListFormat;
+  Locale = Intl.Locale;
+  NumberFormat = Intl.NumberFormat;
+  PluralRules = Intl.PluralRules;
   RelativeTimeFormat = MozRelativeTimeFormat;
 
   constructor() {
@@ -777,7 +750,7 @@
       mozIntlHelper.addGetCalendarInfo(this._cache);
     }
 
-    return this._cache.getCalendarInfo(getLocales(locales), ...args);
+    return this._cache.getCalendarInfo(locales, ...args);
   }
 
   getDisplayNames(locales, ...args) {
@@ -785,7 +758,7 @@
       mozIntlHelper.addGetDisplayNames(this._cache);
     }
 
-    return this._cache.getDisplayNames(getLocales(locales), ...args);
+    return this._cache.getDisplayNames(locales, ...args);
   }
 
   getLocaleInfo(locales, ...args) {
@@ -793,7 +766,7 @@
       mozIntlHelper.addGetLocaleInfo(this._cache);
     }
 
-    return this._cache.getLocaleInfo(getLocales(locales), ...args);
+    return this._cache.getLocaleInfo(locales, ...args);
   }
 
   getAvailableLocaleDisplayNames(type) {
@@ -871,21 +844,21 @@
       if (typeof localeCode !== "string") {
         throw new TypeError("All locale codes must be strings.");
       }
-      // Get the display name for this dictionary.
-      // XXX: To be replaced with Intl.Locale once it lands - bug 1433303.
-      const match = localeCode.match(languageTagMatch);
 
-      if (match === null) {
+      let locale;
+      try {
+        locale = new Intl.Locale(localeCode.replaceAll("_", "-"));
+      } catch {
         return localeCode;
       }
 
-      const [
-        ,
-        /* languageTag */ languageSubtag,
-        scriptSubtag,
-        regionSubtag,
-        variantSubtags,
-      ] = match;
+      const {
+        language: languageSubtag,
+        script: scriptSubtag,
+        region: regionSubtag,
+      } = locale;
+
+      const variantSubtags = locale.baseName.match(variantSubtagsMatch);
 
       const displayName = [
         this.getLanguageDisplayNames(locales, [languageSubtag])[0],
@@ -902,7 +875,7 @@
       }
 
       if (variantSubtags) {
-        displayName.push(...variantSubtags.substr(1).split(/[-_]/)); // Collapse multiple variants.
+        displayName.push(...variantSubtags[0].substr(1).split("-")); // Collapse multiple variants.
       }
 
       let modifiers;
@@ -927,9 +900,7 @@
 
       class MozDateTimeFormat extends DateTimeFormat {
         constructor(locales, options, ...args) {
-          let resolvedLocales = DateTimeFormat.supportedLocalesOf(
-            getLocales(locales)
-          );
+          let resolvedLocales = DateTimeFormat.supportedLocalesOf(locales);
           if (options) {
             if (options.dateStyle || options.timeStyle) {
               options.pattern = osPrefs.getDateTimePattern(
diff -Nru firefox-84.0.2+build1/toolkit/components/mozintl/test/test_mozintl.js firefox-85.0+build1/toolkit/components/mozintl/test/test_mozintl.js
--- firefox-84.0.2+build1/toolkit/components/mozintl/test/test_mozintl.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/mozintl/test/test_mozintl.js	2021-01-18 19:58:26.000000000 +0000
@@ -25,16 +25,19 @@
   Services.intl.getDisplayNames("ar");
   Services.intl.getLocaleInfo("de");
   new Services.intl.DateTimeFormat("fr");
+  new Services.intl.ListFormat("fr");
+  new Services.intl.Locale("fr");
   new Services.intl.RelativeTimeFormat("fr");
   ok(true);
 }
 
 function test_constructors() {
   let constructors = [
+    "Collator",
     "DateTimeFormat",
+    "ListFormat",
     "NumberFormat",
     "PluralRules",
-    "Collator",
   ];
 
   constructors.forEach(constructor => {
@@ -42,20 +45,6 @@
     let obj2 = new Services.intl[constructor]();
 
     equal(typeof obj, typeof obj2);
-
-    Assert.throws(() => {
-      // This is an observable difference between Intl and mozIntl.
-      //
-      // Old ECMA402 APIs (edition 1 and 2) allowed for constructors to be called
-      // as functions.
-      // Starting from ed.3 all new constructors are throwing when called without |new|.
-      //
-      // All MozIntl APIs do not implement the legacy behavior and throw
-      // when called without |new|.
-      //
-      // For more information see https://github.com/tc39/ecma402/pull/84 .
-      Services.intl[constructor]();
-    }, /class constructors must be invoked with |new|/);
   });
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/narrate/NarrateControls.jsm firefox-85.0+build1/toolkit/components/narrate/NarrateControls.jsm
--- firefox-84.0.2+build1/toolkit/components/narrate/NarrateControls.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/narrate/NarrateControls.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -308,12 +308,11 @@
 
   _getLanguageName(lang) {
     try {
-      // This may throw if the lang doesn't match.
-      // XXX: Replace with Intl.Locale once bug 1433303 lands.
-      let langCode = lang.match(/^[a-z]{2,3}/)[0];
+      // This may throw if the lang can't be parsed.
+      let langCode = new Services.intl.Locale(lang).language;
 
       return Services.intl.getLanguageDisplayNames(undefined, [langCode]);
-    } catch (e) {
+    } catch {
       return "";
     }
   },
diff -Nru firefox-84.0.2+build1/toolkit/components/normandy/docs/data-collection.rst firefox-85.0+build1/toolkit/components/normandy/docs/data-collection.rst
--- firefox-84.0.2+build1/toolkit/components/normandy/docs/data-collection.rst	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/normandy/docs/data-collection.rst	2021-01-18 19:58:26.000000000 +0000
@@ -204,9 +204,35 @@
            changed in a profile while Firefox was not running.
          * ``"unknown"``: A reason was not specified. This should be
            considered a bug.
+      changedPref
+         For ``user-preference-changed`` and
+         ``user-preference-changed-sideload``, the preference that was
+         detected to change that caused the unenrollment. Note that there may
+         be multiple preferences changed, this only reports the first found.
       enrollmentId
          The ID that was generated at enrollment.
 
+Unenroll Failed
+   methods
+      The string ``"unenrollFailed"``.
+   object
+      The string ``"preference_study"``.
+   value
+      The name of the study (``recipe.arguments.slug``)
+   extra
+      enrollmentId
+         The ID that was generated at enrollment.
+      reason
+         A code describing the reason the unenroll failed. Possible values are:
+
+         * ``"does-not-exist"``: The system attempted to unenroll a study that
+           does not exist. This is a bug.
+         * ``"already-unenrolled"``: The system attempted to unenroll a study
+           that has already been unenrolled. This is likely a bug.
+      changedPref
+         In some cases, the preference that was detected to change that
+         caused the attempted unenrollment.
+
 
 Add-on Studies
 ^^^^^^^^^^^^^^
diff -Nru firefox-84.0.2+build1/toolkit/components/normandy/lib/PreferenceExperiments.jsm firefox-85.0+build1/toolkit/components/normandy/lib/PreferenceExperiments.jsm
--- firefox-84.0.2+build1/toolkit/components/normandy/lib/PreferenceExperiments.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/normandy/lib/PreferenceExperiments.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -269,6 +269,7 @@
           await this.stop(experiment.slug, {
             resetValue: false,
             reason: "user-preference-changed-sideload",
+            changedPref: prefName,
           });
           stopped = true;
           break;
@@ -611,6 +612,7 @@
           PreferenceExperiments.stop(experimentSlug, {
             resetValue: false,
             reason: "user-preference-changed",
+            changedPref: preferenceName,
           }).catch(Cu.reportError);
         }
       },
@@ -702,7 +704,10 @@
    *   If there is no stored experiment with the given slug, or if the
    *   experiment has already expired.
    */
-  async stop(experimentSlug, { resetValue = true, reason = "unknown" } = {}) {
+  async stop(
+    experimentSlug,
+    { resetValue = true, reason = "unknown", changedPref } = {}
+  ) {
     log.debug(
       `PreferenceExperiments.stop(${experimentSlug}, {resetValue: ${resetValue}, reason: ${reason}})`
     );
@@ -716,7 +721,11 @@
         "unenrollFailed",
         "preference_study",
         experimentSlug,
-        { reason: "does-not-exist" }
+        {
+          reason: "does-not-exist",
+
+          ...(changedPref ? { changedPref } : {}),
+        }
       );
       throw new Error(
         `Could not find a preference experiment with the slug "${experimentSlug}"`
@@ -733,6 +742,7 @@
           reason: "already-unenrolled",
           enrollmentId:
             experiment.enrollmentId || TelemetryEvents.NO_ENROLLMENT_ID_MARKER,
+          ...(changedPref ? { changedPref } : {}),
         }
       );
       throw new Error(
@@ -790,6 +800,7 @@
       reason,
       enrollmentId:
         experiment.enrollmentId || TelemetryEvents.NO_ENROLLMENT_ID_MARKER,
+      ...(changedPref ? { changedPref } : {}),
     });
     await this.saveStartupPrefs();
     Services.obs.notifyObservers(
diff -Nru firefox-84.0.2+build1/toolkit/components/normandy/test/browser/browser_PreferenceExperiments.js firefox-85.0+build1/toolkit/components/normandy/test/browser/browser_PreferenceExperiments.js
--- firefox-84.0.2+build1/toolkit/components/normandy/test/browser/browser_PreferenceExperiments.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/normandy/test/browser/browser_PreferenceExperiments.js	2021-01-18 19:58:26.000000000 +0000
@@ -1452,6 +1452,7 @@
         {
           resetValue: false,
           reason: "user-preference-changed-sideload",
+          changedPref: "fake.preference",
         },
       ],
       "Experiment is stopped correctly because value changed"
@@ -1888,6 +1889,7 @@
           reason: "user-preference-changed",
           branch: "fakebranch",
           enrollmentId: mockExperiments[0].enrollmentId,
+          changedPref: "fake.preference",
         },
       ],
     ]);
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginCSVImport.jsm firefox-85.0+build1/toolkit/components/passwordmgr/LoginCSVImport.jsm
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginCSVImport.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/LoginCSVImport.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -30,16 +30,20 @@
   return Cu.waiveXrays(d3Scope.d3);
 });
 
+/**
+ * All the CSV column names will be converted to lower case before lookup
+ * so they must be specified here in lower case.
+ */
 const FIELD_TO_CSV_COLUMNS = {
   origin: ["url", "login_uri"],
   username: ["username", "login_username"],
   password: ["password", "login_password"],
-  httpRealm: ["httpRealm"],
-  formActionOrigin: ["formActionOrigin"],
+  httpRealm: ["httprealm"],
+  formActionOrigin: ["formactionorigin"],
   guid: ["guid"],
-  timeCreated: ["timeCreated"],
-  timeLastUsed: ["timeLastUsed"],
-  timePasswordChanged: ["timePasswordChanged"],
+  timeCreated: ["timecreated"],
+  timeLastUsed: ["timelastused"],
+  timePasswordChanged: ["timepasswordchanged"],
 };
 
 /**
@@ -59,7 +63,7 @@
     let csvColumnToField = new Map();
     for (let [field, columns] of Object.entries(FIELD_TO_CSV_COLUMNS)) {
       for (let column of columns) {
-        csvColumnToField.set(column, field);
+        csvColumnToField.set(column.toLowerCase(), field);
       }
     }
     return csvColumnToField;
@@ -77,7 +81,7 @@
   static _getVanillaLoginFromCSVObject(csvObject, csvColumnToFieldMap) {
     let vanillaLogin = Object.create(null);
     for (let columnName of Object.keys(csvObject)) {
-      let fieldName = csvColumnToFieldMap.get(columnName);
+      let fieldName = csvColumnToFieldMap.get(columnName.toLowerCase());
       if (!fieldName) {
         continue;
       }
@@ -120,7 +124,9 @@
     let csvString = await OS.File.read(filePath, { encoding: "utf-8" });
     let parsedLines = d3.csv.parse(csvString);
     let fieldsInFile = new Set(
-      Object.keys(parsedLines[0] || {}).map(col => csvColumnToFieldMap.get(col))
+      Object.keys(parsedLines[0] || {}).map(col => {
+        return csvColumnToFieldMap.get(col.toLowerCase());
+      })
     );
     if (
       parsedLines[0] &&
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginManager.jsm firefox-85.0+build1/toolkit/components/passwordmgr/LoginManager.jsm
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginManager.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/LoginManager.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -159,7 +159,7 @@
    *        the number of milliseconds since January 1, 1970, 00:00:00 UTC.
    *        This is set to a fake value during unit testing.
    */
-  _gatherTelemetry(referenceTimeMs) {
+  async _gatherTelemetry(referenceTimeMs) {
     function clearAndGetHistogram(histogramId) {
       let histogram = Services.telemetry.getHistogramById(histogramId);
       histogram.clear();
@@ -200,7 +200,7 @@
       return;
     }
 
-    let logins = this.getAllLogins();
+    let logins = await this.getAllLoginsAsync();
 
     let usernamePresentHistogram = clearAndGetHistogram(
       "PWMGR_USERNAME_PRESENT"
@@ -241,6 +241,8 @@
       "weave:telemetry:histogram",
       "PWMGR_NUM_PASSWORDS_PER_HOSTNAME"
     );
+
+    Services.obs.notifyObservers(null, "passwordmgr-gather-telemetry-complete");
   },
 
   /**
@@ -436,10 +438,24 @@
   },
 
   /**
-   * Remove all stored logins.
+   * Remove all user facing stored logins.
+   *
+   * This will not remove the FxA Sync key, which is stored with the rest of a user's logins.
+   */
+  removeAllUserFacingLogins() {
+    log.debug("Removing all user facing logins");
+    this._storage.removeAllUserFacingLogins();
+  },
+
+  /**
+   * Remove all logins from data store, including the FxA Sync key.
+   *
+   * NOTE: You probably want `removeAllUserFacingLogins()` instead of this function.
+   * This function will remove the FxA Sync key, which will break syncing of saved user data
+   * e.g. bookmarks, history, open tabs, logins and passwords, add-ons, and options
    */
   removeAllLogins() {
-    log.debug("Removing all logins");
+    log.debug("Removing all logins from local store, including FxA key");
     this._storage.removeAllLogins();
   },
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginStore.jsm firefox-85.0+build1/toolkit/components/passwordmgr/LoginStore.jsm
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/LoginStore.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/LoginStore.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -108,7 +108,7 @@
 
 /**
  * Delete logins backup file if the last saved login was removed using
- * removeLogin() or if all logins were removed at once using removeAllLogins().
+ * removeLogin() or if all logins were removed at once using removeAllUserFacingLogins().
  * Note that if the user has a fxa key stored as a login, we just update the
  * backup to only store the key when the last saved user facing login is removed.
  */
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/nsILoginManager.idl firefox-85.0+build1/toolkit/components/passwordmgr/nsILoginManager.idl
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/nsILoginManager.idl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/nsILoginManager.idl	2021-01-18 19:58:26.000000000 +0000
@@ -101,11 +101,22 @@
   void recordPasswordUse(in nsILoginInfo aLogin, in boolean aPrivateContextWithoutExplicitConsent, in AString aLoginType, in boolean aFilled);
 
   /**
-   * Remove all logins known to login manager.
+   * Remove all stored user facing logins.
+   *
+   * This will remove all the logins that a user can access through about:logins.
+   * This will not remove the FxA Sync key which is stored with the rest of a user's logins
+   * but is not accessible through about:logins
    *
    * The browser sanitization feature allows the user to clear any stored
    * passwords. This interface allows that to be done without getting each
-   * login first (which might require knowing the master password).
+   * login first.
+   *
+   */
+  void removeAllUserFacingLogins();
+
+  /**
+   * Completely remove all logins, including the user's FxA Sync key.
+   *
    */
   void removeAllLogins();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/nsILoginManagerStorage.idl firefox-85.0+build1/toolkit/components/passwordmgr/nsILoginManagerStorage.idl
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/nsILoginManagerStorage.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/nsILoginManagerStorage.idl	2021-01-18 19:58:26.000000000 +0000
@@ -106,11 +106,22 @@
   void recordPasswordUse(in nsILoginInfo aLogin);
 
   /**
-   * Remove all stored logins.
+   * Remove all stored user facing logins.
+   *
+   * This will remove all the logins that a user can access through about:logins.
+   * This will not remove the FxA Sync key which is stored with the rest of a user's logins
+   * but is not accessible through about:logins
    *
    * The browser sanitization feature allows the user to clear any stored
    * passwords. This interface allows that to be done without getting each
-   * login first (which might require knowing the master password).
+   * login first.
+   *
+   */
+  void removeAllUserFacingLogins();
+
+  /**
+   * Completely remove all logins, including the user's FxA key.
+   *
    */
   void removeAllLogins();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/storage-json.js firefox-85.0+build1/toolkit/components/passwordmgr/storage-json.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/storage-json.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/storage-json.js	2021-01-18 19:58:26.000000000 +0000
@@ -26,7 +26,6 @@
   "LoginStore",
   "resource://gre/modules/LoginStore.jsm"
 );
-ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(
   this,
@@ -35,6 +34,11 @@
   "nsIUUIDGenerator"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  FXA_PWDMGR_HOST: "resource://gre/modules/FxAccountsCommon.js",
+  FXA_PWDMGR_REALM: "resource://gre/modules/FxAccountsCommon.js",
+});
+
 class LoginManagerStorage_json {
   constructor() {
     this.__crypto = null; // nsILoginManagerCrypto service
@@ -87,17 +91,16 @@
       // See bug 717490 comment 17.
       this._crypto;
 
+      let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path;
+
       // Set the reference to LoginStore synchronously.
-      let jsonPath = OS.Path.join(OS.Constants.Path.profileDir, "logins.json");
+      let jsonPath = PathUtils.join(profileDir, "logins.json");
       let backupPath = "";
       let loginsBackupEnabled = Services.prefs.getBoolPref(
         "signon.backup.enabled"
       );
       if (loginsBackupEnabled) {
-        backupPath = OS.Path.join(
-          OS.Constants.Path.profileDir,
-          "logins-backup.json"
-        );
+        backupPath = PathUtils.join(profileDir, "logins-backup.json");
       }
       this._store = new LoginStore(jsonPath, backupPath);
 
@@ -639,19 +642,50 @@
   }
 
   /**
-   * Removes all logins from storage.
+   * Removes all logins from local storage, including FxA Sync key.
+   *
+   * NOTE: You probably want removeAllUserFacingLogins instead of this function.
+   *
    */
   removeAllLogins() {
     this._store.ensureDataReady();
+    this._store.data.logins = [];
+    this._store.data.potentiallyVulnerablePasswords = [];
+    this.__decryptedPotentiallyVulnerablePasswords = null;
+    this._store.data.dismissedBreachAlertsByLoginGUID = {};
+    this._store.saveSoon();
+
+    LoginHelper.notifyStorageChanged("removeAllLogins", []);
+  }
 
+  /**
+   * Removes all user facing logins from storage. e.g. all logins except the FxA Sync key
+   *
+   * If you need to remove the FxA key, use `removeAllLogins` instead
+   */
+  removeAllUserFacingLogins() {
+    this._store.ensureDataReady();
     this.log("Removing all logins");
-    this._store.data.logins = [];
+
+    let [allLogins, ids] = this._searchLogins({});
+
+    let fxaKey = this._store.data.logins.find(
+      login =>
+        login.hostname == FXA_PWDMGR_HOST && login.httpRealm == FXA_PWDMGR_REALM
+    );
+    if (fxaKey) {
+      this._store.data.logins = [fxaKey];
+      allLogins = allLogins.filter(item => item != fxaKey);
+    } else {
+      this._store.data.logins = [];
+    }
+
     this._store.data.potentiallyVulnerablePasswords = [];
     this.__decryptedPotentiallyVulnerablePasswords = null;
     this._store.data.dismissedBreachAlertsByLoginGUID = {};
     this._store.saveSoon();
 
-    LoginHelper.notifyStorageChanged("removeAllLogins", null);
+    LoginHelper.notifyStorageChanged("removeAllLogins", allLogins);
   }
 
   findLogins(origin, formActionOrigin, httpRealm) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_hidden_document.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_hidden_document.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_hidden_document.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_hidden_document.js	2021-01-18 19:58:26.000000000 +0000
@@ -47,7 +47,7 @@
 }
 
 add_task(async function setup() {
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   let login = LoginTestUtils.testData.formLogin({
     origin: "http://example.org",
     formActionOrigin: "http://example.org",
@@ -67,7 +67,7 @@
   is(tab1Visibility, "visible", "The first tab should be foreground");
 
   let formProcessedPromise = listenForTestNotification("FormProcessed");
-  await BrowserTestUtils.loadURI(tab1.linkedBrowser, FORM_URL);
+  BrowserTestUtils.loadURI(tab1.linkedBrowser, FORM_URL);
   await formProcessedPromise;
   gBrowser.removeTab(tab1);
 });
@@ -95,7 +95,7 @@
     listenForTestNotification("FormProcessed").then(() => {
       formFilled = true;
     });
-    await BrowserTestUtils.loadURI(tab1.linkedBrowser, testUrl);
+    BrowserTestUtils.loadURI(tab1.linkedBrowser, testUrl);
 
     await TestUtils.waitForCondition(() => {
       let windowGlobal = tab1.linkedBrowser.browsingContext.currentWindowGlobal;
@@ -192,7 +192,7 @@
   // In this case we will try to autofill while hidden, so look for the passwordmgr-processed-form
   // to be observed
   let formProcessedPromise = listenForTestNotification("FormProcessed");
-  await BrowserTestUtils.loadURI(tab1.linkedBrowser, FORM_URL);
+  BrowserTestUtils.loadURI(tab1.linkedBrowser, FORM_URL);
   await Promise.all([formProcessedPromise, dialogObserved]);
 
   let wasProcessed = await formProcessedPromise;
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_track_filled_logins.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_track_filled_logins.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_track_filled_logins.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_autofill_track_filled_logins.js	2021-01-18 19:58:26.000000000 +0000
@@ -98,6 +98,6 @@
     BrowserTestUtils.removeTab(tab);
 
     // Reset all passwords before next iteration.
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_context_menu_generated_password.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_context_menu_generated_password.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_context_menu_generated_password.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_context_menu_generated_password.js	2021-01-18 19:58:26.000000000 +0000
@@ -412,7 +412,7 @@
     "Generated password shouldn't have changed to match the filled password"
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   LoginTestUtils.resetGeneratedPasswordsCache();
 });
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_deleteLoginsBackup.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_deleteLoginsBackup.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_deleteLoginsBackup.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_deleteLoginsBackup.js	2021-01-18 19:58:26.000000000 +0000
@@ -83,14 +83,50 @@
   });
 }
 
-// 1. Test that logins backup is deleted when Services.logins.removeAllLogins() is called.
-// 2. Test that logins backup is deleted when the last saved login is removed using
-//    Services.logins.removeLogin() when no fxa key is saved.
-// 3. If a fxa key is stored as a login, test that logins backup is updated to only store
-//    the fxa key when the last user facing login is deleted.
-add_task(async function test_deleteLoginsBackup_removeAll() {
+// If a fxa key is stored as a login, test that logins backup is updated to only store
+// the fxa key when the last user facing login is deleted.
+add_task(
+  async function test_deleteLoginsBackup_removeAllUserFacingLogins_fxaKey() {
+    info(
+      "Testing removeAllUserFacingLogins() case when there is a saved fxa key"
+    );
+    info("Adding two logins: fxa key and one user facing login");
+    let storageUpdatePromise = TestUtils.topicObserved(
+      "password-storage-updated"
+    );
+    Services.logins.addLogin(login1);
+    ok(true, "added login1");
+    await loginStoreExists();
+    Services.logins.addLogin(fxaKey);
+    ok(true, "added fxaKey");
+    await loginBackupExists();
+    ok(true, "logins-backup.json now exists");
+    await storageUpdatePromise;
+    info("Writes to storage are complete for addLogin calls");
+
+    storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
+    info("Removing all user facing logins");
+    Services.logins.removeAllUserFacingLogins();
+    await storageUpdatePromise;
+    info("Writes to storage are complete after removeAllUserFacingLogins call");
+    await waitForBackupUpdate();
+    ok(
+      true,
+      "logins-backup.json was updated to only store the fxa key, as expected"
+    );
+
+    // Clean up.
+    // Since there is a fxa key left, we need to call removeAllLogins() or removeLogin(fxaKey)
+    // to remove the fxa key. Otherwise the test will fail in verify mode when trying to add login1
+    Services.logins.removeAllLogins();
+    await OS.File.remove(loginStorePath);
+  }
+);
+
+// Test that logins backup is deleted when Services.logins.removeAllUserFacingLogins() is called.
+add_task(async function test_deleteLoginsBackup_removeAllUserFacingLogins() {
   // Remove logins.json and logins-backup.json before starting.
-  info("Testing the removeAllLogins() case");
+  info("Testing the removeAllUserFacingLogins() case");
 
   await OS.File.remove(loginStorePath, { ignoreAbsent: true });
   await OS.File.remove(loginBackupPath, { ignoreAbsent: true });
@@ -112,19 +148,95 @@
   info("Writes to storage are complete for addLogin calls");
 
   storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
+  info("Removing all user facing logins");
+  Services.logins.removeAllUserFacingLogins();
+
+  await storageUpdatePromise;
+  info(
+    "Writes to storage are complete when removeAllUserFacingLogins() is called"
+  );
+  await loginBackupDeleted();
+  info(
+    "logins-backup.json was deleted as expected when all logins were removed"
+  );
+
+  // Clean up.
+  await OS.File.remove(loginStorePath);
+});
+
+// 1. Test that logins backup is deleted when Services.logins.removeAllLogins() is called
+// 2. If a FxA key is stored as a login, test that logins backup is deleted when
+//   Services.logins.removeAllLogins() is called
+add_task(async function test_deleteLoginsBackup_removeAllLogins() {
+  // Remove logins.json and logins-backup.json before starting.
+  info("Testing the removeAllLogins() case");
+
+  await OS.File.remove(loginStorePath, { ignoreAbsent: true });
+  await OS.File.remove(loginBackupPath, { ignoreAbsent: true });
+
+  let storageUpdatePromise = TestUtils.topicObserved(
+    "password-storage-updated"
+  );
+  info("Add a login to create logins.json");
+  Services.logins.addLogin(login1);
+  ok(true, "added login1");
+  await loginStoreExists();
+  ok(true, "logins.json now exists");
+  Services.logins.addLogin(login2);
+  ok(true, "added login2");
+  await loginBackupExists();
+  info("logins-backup.json now exists");
+
+  await storageUpdatePromise;
+  info("Writes to storage are complete for addLogin calls");
+
+  storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
   info("Removing all logins");
   Services.logins.removeAllLogins();
 
   await storageUpdatePromise;
   info("Writes to storage are complete when removeAllLogins() is called");
+
   await loginBackupDeleted();
   info(
     "logins-backup.json was deleted as expected when all logins were removed"
   );
+  await OS.File.remove(loginStorePath);
+
+  info("Testing the removeAllLogins() case when FxA key is present");
+  storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
+  Services.logins.addLogin(login1);
+  await loginStoreExists();
+  Services.logins.addLogin(fxaKey);
+  await loginBackupExists();
+  info("logins-backup.json now exists");
+  await storageUpdatePromise;
+  info("Write to storage are complete for addLogin calls");
+
+  storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
+  info("Removing all logins, including FxA key");
+  Services.logins.removeAllLogins();
+  await storageUpdatePromise;
+  info("Writes to storage are complete after the last removeAllLogins call");
+  await loginBackupDeleted();
+  info(
+    "logins-backup.json was deleted when the last logins were removed, as expected"
+  );
+
+  // Clean up.
+  await OS.File.remove(loginStorePath);
+});
 
+// 1. Test that logins backup is deleted when the last saved login is removed using
+//    Services.logins.removeLogin() when no fxa key is saved.
+// 2. Test that logins backup is updated when the last saved login is removed using
+//    Services.logins.removeLogin() when a fxa key is present.
+add_task(async function test_deleteLoginsBackup_removeLogin() {
   info("Testing the removeLogin() case when there is no saved fxa key");
   info("Adding two logins");
-  storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
+  let storageUpdatePromise = TestUtils.topicObserved(
+    "password-storage-updated"
+  );
   Services.logins.addLogin(login1);
   await loginStoreExists();
   Services.logins.addLogin(login2);
@@ -150,36 +262,33 @@
   info(
     "logins-backup.json was deleted as expected when the last saved login was removed"
   );
+  await OS.File.remove(loginStorePath);
 
   info("Testing the removeLogin() case when there is a saved fxa key");
-  info("Adding two logins: fxa key and a user facing login");
+  info("Adding two logins: one user facing and the fxa key");
   storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
   Services.logins.addLogin(login1);
   await loginStoreExists();
   Services.logins.addLogin(fxaKey);
   await loginBackupExists();
   info("logins-backup.json now exists");
+
   await storageUpdatePromise;
   info("Writes to storage are complete for addLogin calls");
 
   storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
-  info("Removing the last user facing login");
+  let backupUpdate = waitForBackupUpdate();
   Services.logins.removeLogin(login1);
   await storageUpdatePromise;
   info("Writes to storage are complete after one removeLogin call");
-  await waitForBackupUpdate();
-  info("logins-backup.json was updated to only store the fxa key, as expected");
+  await backupUpdate;
 
-  storageUpdatePromise = TestUtils.topicObserved("password-storage-updated");
-  info("Removing the fxa key");
-  Services.logins.removeLogin(fxaKey);
-  await storageUpdatePromise;
-  info("Writes to storage are complete after the last removeLogin call");
-  await loginBackupDeleted();
-  info(
-    "logins-backup.json was deleted when the last login was removed, as expected"
-  );
+  await loginBackupExists();
+  info("logins-backup.json was updated to contain only the fxa key");
 
   // Clean up.
+  // Since there is a fxa key left, we need to call removeAllLogins() or removeLogin(fxaKey)
+  // to remove the fxa key. Otherwise the test will fail in verify mode when trying to add login1
+  Services.logins.removeAllLogins();
   await OS.File.remove(loginStorePath);
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autocomplete_values.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autocomplete_values.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autocomplete_values.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autocomplete_values.js	2021-01-18 19:58:27.000000000 +0000
@@ -177,7 +177,7 @@
     await LoginTestUtils.clearData();
     await cleanupDoorhanger();
     await cleanupPasswordNotifications();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
 
     // Create the pre-existing logins when needed.
     info("Adding any saved logins");
@@ -269,7 +269,7 @@
         await cleanupDoorhanger();
         await cleanupPasswordNotifications();
         await clearMessageCache(browser);
-        Services.logins.removeAllLogins();
+        Services.logins.removeAllUserFacingLogins();
       }
     );
   }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autofill_then_save_password.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autofill_then_save_password.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autofill_then_save_password.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_autofill_then_save_password.js	2021-01-18 19:58:26.000000000 +0000
@@ -178,5 +178,5 @@
   );
 
   // Clean up the database before the next test case is executed.
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_generated_password.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_generated_password.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_generated_password.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_generated_password.js	2021-01-18 19:58:26.000000000 +0000
@@ -16,7 +16,7 @@
 requestLongerTimeout(2);
 
 async function task_setup() {
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   LoginTestUtils.resetGeneratedPasswordsCache();
   await cleanupPasswordNotifications();
 }
@@ -263,10 +263,12 @@
 async function submitForm(browser) {
   // Submit the form
   info("Now submit the form");
-
+  let correctPathNamePromise = BrowserTestUtils.browserLoaded(browser);
   await SpecialPowers.spawn(browser, [], async function() {
     content.document.querySelector("form").submit();
-
+  });
+  await correctPathNamePromise;
+  await SpecialPowers.spawn(browser, [], async () => {
     let win = content;
     await ContentTaskUtils.waitForCondition(() => {
       return (
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_httpsUpgrade.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_httpsUpgrade.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_httpsUpgrade.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_httpsUpgrade.js	2021-01-18 19:58:26.000000000 +0000
@@ -96,7 +96,7 @@
   is(login.password, "pass2", "Check the password changed");
   is(login.timesUsed, 2, "Check times used increased");
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(
@@ -165,7 +165,7 @@
       "timeLastUsed == timePasswordChanged"
     );
 
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 );
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_promptToChangePassword.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_promptToChangePassword.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_promptToChangePassword.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_promptToChangePassword.js	2021-01-18 19:58:26.000000000 +0000
@@ -78,7 +78,7 @@
 }
 
 async function setupLogins(...logins) {
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   let savedLogins = {};
   let timesCreated = new Set();
   for (let login of logins) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_remembering.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_remembering.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_remembering.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_remembering.js	2021-01-18 19:58:26.000000000 +0000
@@ -886,7 +886,7 @@
   is(login.password, "notifyp1", "Check the password unchanged");
   is(login.timesUsed, 2, "Check times used incremented");
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_saveUsingEnter() {
@@ -925,7 +925,7 @@
     is(login.password, "notifyp1", "Check the password used on the new entry");
     is(login.timesUsed, 1, "Check times used on new entry");
 
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 
   await testWithTextboxSelector("#password-notification-password");
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_save_password.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_save_password.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_save_password.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_save_password.js	2021-01-18 19:58:27.000000000 +0000
@@ -160,5 +160,5 @@
   );
 
   // Clean up the database before the next test case is executed.
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_submit_telemetry.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_submit_telemetry.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_submit_telemetry.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_submit_telemetry.js	2021-01-18 19:58:26.000000000 +0000
@@ -362,5 +362,5 @@
 
   // Clean up the database before the next test case is executed.
   await cleanupDoorhanger(notif);
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_toggles.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_toggles.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_toggles.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_doorhanger_toggles.js	2021-01-18 19:58:26.000000000 +0000
@@ -449,6 +449,7 @@
 
 async function submitForm(browser, action = "") {
   // Submit the form
+  let correctPathNamePromise = BrowserTestUtils.browserLoaded(browser);
   await SpecialPowers.spawn(browser, [action], async function(actionPathname) {
     let form = content.document.querySelector("form");
     if (actionPathname) {
@@ -456,7 +457,10 @@
     }
     info("Submitting form to:" + form.action);
     form.submit();
-
+    info("Submitted the form");
+  });
+  await correctPathNamePromise;
+  await SpecialPowers.spawn(browser, [action], async actionPathname => {
     let win = content;
     await ContentTaskUtils.waitForCondition(() => {
       return (
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser.ini firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -60,7 +60,6 @@
 support-files =
   form_basic_with_confirm_field.html
   form_password_change.html
-skip-if = fission
 [browser_doorhanger_httpsUpgrade.js]
 support-files =
   subtst_notifications_1.html
@@ -84,12 +83,11 @@
   subtst_notifications_change_p.html
 [browser_doorhanger_save_password.js]
 [browser_doorhanger_submit_telemetry.js]
-skip-if = os == "linux" && debug # Bug 1658056
+skip-if = tsan || os == "linux" && debug # Bug 1658056, tsan: bug 1661305
 [browser_doorhanger_target_blank.js]
 support-files =
   subtst_notifications_12_target_blank.html
 [browser_doorhanger_toggles.js]
-skip-if = fission
 [browser_doorhanger_username_edits.js]
 [browser_doorhanger_window_open.js]
 support-files =
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_private_window.js firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_private_window.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/browser/browser_private_window.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/browser/browser_private_window.js	2021-01-18 19:58:26.000000000 +0000
@@ -115,7 +115,7 @@
   authPromptModalType = Services.prefs.getIntPref("prompts.modalType.httpAuth");
   normalWin = await BrowserTestUtils.openNewBrowserWindow({ private: false });
   privateWin = await BrowserTestUtils.openNewBrowserWindow({ private: true });
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_normal_popup_notification_1() {
@@ -169,7 +169,7 @@
   );
 
   // clear existing logins for parity with the previous test
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   await focusWindow(privateWin);
   await BrowserTestUtils.withNewTab(
     {
@@ -243,7 +243,7 @@
   Services.prefs.setBoolPref(PRIVATE_BROWSING_CAPTURE_PREF, false);
 
   // clear existing logins for parity with the previous test
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   await focusWindow(privateWin);
   await BrowserTestUtils.withNewTab(
@@ -289,7 +289,7 @@
       "match existing username/password: no popup notification should appear"
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.logins.addLogin(login);
   let allLogins = Services.logins.getAllLogins();
   // Sanity check the HTTP login exists.
@@ -340,7 +340,7 @@
       " match existing username/password: no popup notification should appear"
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.logins.addLogin(login);
   let allLogins = Services.logins.getAllLogins();
   // Sanity check the HTTP login exists.
@@ -392,7 +392,7 @@
     "test 4: run with a login, outside of private mode," +
       " add a new password: popup notification should appear"
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.logins.addLogin(login);
   let allLogins = Services.logins.getAllLogins();
   // Sanity check the HTTP login exists.
@@ -569,7 +569,7 @@
       // Add the observer before loading the form page
       let formFilled = listenForTestNotification("FormProcessed");
       await SimpleTest.promiseFocus(browser.ownerGlobal);
-      await BrowserTestUtils.loadURI(browser, form1Url);
+      BrowserTestUtils.loadURI(browser, form1Url);
       await formFilled;
 
       // the form should have been autofilled, so submit without updating field values
@@ -684,7 +684,7 @@
   info(
     "test normal/basic-auth: verify that we get a doorhanger after basic-auth login"
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   clearHttpAuths();
 
   await focusWindow(normalWin);
@@ -737,7 +737,7 @@
   info(
     "test private/basic-auth: verify that we don't get a doorhanger after basic-auth login"
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   clearHttpAuths();
 
   const capturePrefValue = Services.prefs.getBoolPref(
@@ -792,7 +792,7 @@
   );
   Services.prefs.setBoolPref(PRIVATE_BROWSING_CAPTURE_PREF, false);
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   clearHttpAuths();
 
   await focusWindow(privateWin);
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/LoginTestUtils.jsm firefox-85.0+build1/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/LoginTestUtils.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/LoginTestUtils.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -50,7 +50,7 @@
    * Erases all the data stored by the Login Manager service.
    */
   clearData() {
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     for (let origin of Services.logins.getAllDisabledHosts()) {
       Services.logins.setLoginSavingEnabled(origin, true);
     }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js	2021-01-18 19:58:26.000000000 +0000
@@ -811,7 +811,7 @@
     );
 
     // Remove all logins and disabled hosts
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
 
     let disabledHosts = Services.logins.getAllDisabledHosts();
     disabledHosts.forEach(host =>
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_generation.html	2021-01-18 19:58:26.000000000 +0000
@@ -16,7 +16,7 @@
 <script>
 function initLogins() {
   const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   const {LoginManagerParent} = ChromeUtils.import("resource://gre/modules/LoginManagerParent.jsm");
   if (LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin()) {
@@ -282,7 +282,7 @@
     await promiseNoUnexpectedPopupShown();
 
     info("Removing all logins to test auto-saving of generated passwords");
-    await LoginManager.removeAllLogins();
+    await LoginManager.removeAllUserFacingLogins();
 
     while (pword.value) {
       synthesizeKey("KEY_Backspace");
@@ -445,7 +445,7 @@
 
 add_task(async function test_deleteAndReselectGeneratedPassword() {
   info("Removing all logins to test auto-saving of generated passwords");
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   // form should not be filled
   checkForm(2, "", "");
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_password_open.html	2021-01-18 19:58:27.000000000 +0000
@@ -62,7 +62,7 @@
 
   checkLoginForm(uname, "", pword, "");
   let removedPromise = promiseStorageChanged(["removeAllLogins"]);
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
   await removedPromise;
 });
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_tab_between_fields.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_tab_between_fields.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_tab_between_fields.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autocomplete_tab_between_fields.html	2021-01-18 19:58:26.000000000 +0000
@@ -32,7 +32,7 @@
 const { TestUtils } = SpecialPowers.Cu.import("resource://testing-common/TestUtils.jsm");
 
 async function prepareLogins(logins = []) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   for (let login of logins) {
     let storageAddPromise = promiseStorageChanged(["addLogin"]);
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_formActionOrigin.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_formActionOrigin.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_formActionOrigin.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_formActionOrigin.html	2021-01-18 19:58:26.000000000 +0000
@@ -33,7 +33,7 @@
 SimpleTest.registerCleanupFunction(() => win.close());
 
 async function prepareLoginsAndProcessForm(url, logins = []) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   let dates = Date.now();
   for (let login of logins) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_subdomain.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_subdomain.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_subdomain.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_different_subdomain.html	2021-01-18 19:58:26.000000000 +0000
@@ -45,7 +45,7 @@
 }
 
 async function prepareLogins(logins = []) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   let dates = Date.now();
   for (let login of logins) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_downgrade.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_downgrade.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_downgrade.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_downgrade.html	2021-01-18 19:58:26.000000000 +0000
@@ -38,7 +38,7 @@
 }
 
 async function checkFormsWithLogin(formUrls, login, expectedUsername, expectedPassword) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
   await LoginManager.addLogin(login);
 
   for (let url of formUrls) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_upgrade.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_upgrade.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_upgrade.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_https_upgrade.html	2021-01-18 19:58:26.000000000 +0000
@@ -31,7 +31,7 @@
 SimpleTest.registerCleanupFunction(() => win.close());
 
 async function prepareLoginsAndProcessForm(url, logins = []) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   let dates = Date.now();
   for (let login of logins) {
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_tab_between_fields.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_tab_between_fields.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_tab_between_fields.html	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_autofill_tab_between_fields.html	2021-01-18 19:58:26.000000000 +0000
@@ -34,7 +34,7 @@
   </form>`;
 
 async function prepareLogins(logins = []) {
-  await LoginManager.removeAllLogins();
+  await LoginManager.removeAllUserFacingLogins();
 
   for (let login of logins) {
     let storageAddPromise = promiseStorageChanged(["addLogin"]);
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_DOMInputPasswordAdded_fired_between_DOMContentLoaded_and_load_events.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_DOMInputPasswordAdded_fired_between_DOMContentLoaded_and_load_events.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_DOMInputPasswordAdded_fired_between_DOMContentLoaded_and_load_events.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_DOMInputPasswordAdded_fired_between_DOMContentLoaded_and_load_events.html	2021-01-18 19:58:26.000000000 +0000
@@ -24,7 +24,7 @@
 // part of a suite
 runInParent(function removeAll() {
   let {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 })
 
 let readyPromise = registerRunTests();
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_munged_values.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_munged_values.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_munged_values.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_munged_values.html	2021-01-18 19:58:27.000000000 +0000
@@ -14,20 +14,20 @@
 
 const DEFAULT_ORIGIN = window.location.origin;
 
-function removeAllLoginsInParent() {
-  runInParent(function removeAllLogins() {
+function removeAllUserFacingLoginsInParent() {
+  runInParent(function removeAllUserFacingLogins() {
     const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
 }
 
 function add2logins() {
-  removeAllLoginsInParent();
+  removeAllUserFacingLoginsInParent();
   addLoginsInParent([DEFAULT_ORIGIN, DEFAULT_ORIGIN, null, "real••••user", "pass1", "", ""], [DEFAULT_ORIGIN, DEFAULT_ORIGIN, null, "user2", "pass2", "", ""]);
 }
 
 function addSingleLogin() {
-  removeAllLoginsInParent();
+  removeAllUserFacingLoginsInParent();
   addLoginsInParent([DEFAULT_ORIGIN, DEFAULT_ORIGIN, null, "real••••user", "pass1", "", ""])
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_submit_without_field_modifications.html firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_submit_without_field_modifications.html
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/mochitest/test_submit_without_field_modifications.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/mochitest/test_submit_without_field_modifications.html	2021-01-18 19:58:26.000000000 +0000
@@ -54,7 +54,7 @@
 function resetSavedLogins() {
   let chromeScript = runInParent(function testTeardown() {
     const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   });
   chromeScript.destroy();
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_context_menu.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_context_menu.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_context_menu.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_context_menu.js	2021-01-18 19:58:26.000000000 +0000
@@ -281,7 +281,7 @@
     "All items correctly cleared."
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 }
 
 /**
@@ -291,10 +291,14 @@
   const CHROME_URL = "chrome://mock-chrome/content/";
 
   // Create a mock document.
-  let document = MockDocument.createTestDocument(CHROME_URL, content);
+  let document = MockDocument.createTestDocument(
+    CHROME_URL,
+    content,
+    undefined,
+    true
+  );
 
   // We also need a simple mock Browser object for this test.
-  document.createXULElement = document.createElement.bind(document);
   let browser = {
     ownerDocument: document,
   };
@@ -328,7 +332,11 @@
         ) +
         ")";
     }
-    Assert.equal(actualElement.label, expectedLabel, `Check label ${i}`);
+    Assert.equal(
+      actualElement.getAttribute("label"),
+      expectedLabel,
+      `Check label ${i}`
+    );
   }
 
   Assert.equal(
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_onPasswordEditedOrGenerated.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_onPasswordEditedOrGenerated.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_onPasswordEditedOrGenerated.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_onPasswordEditedOrGenerated.js	2021-01-18 19:58:26.000000000 +0000
@@ -332,7 +332,7 @@
   LoginManagerParent._browsingContextGlobal.get.restore();
   restorePrompter();
   LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.telemetry.clearEvents();
 });
 
@@ -418,7 +418,7 @@
     LoginManagerParent._browsingContextGlobal.get.restore();
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     Services.telemetry.clearEvents();
   }
 );
@@ -613,7 +613,7 @@
   LoginHelper.getBrowserForPrompt.restore();
   restorePrompter();
   LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.telemetry.clearEvents();
 });
 
@@ -750,7 +750,7 @@
   LoginHelper.getBrowserForPrompt.restore();
   restorePrompter();
   LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Services.telemetry.clearEvents();
 });
 
@@ -785,7 +785,7 @@
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
     Services.logins.setLoginSavingEnabled("https://www.example.com", true);
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 );
 
@@ -873,7 +873,7 @@
     LoginManagerParent._browsingContextGlobal.get.restore();
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     Services.telemetry.clearEvents();
   }
 );
@@ -992,7 +992,7 @@
     LoginManagerParent._browsingContextGlobal.get.restore();
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
     Services.telemetry.clearEvents();
   }
 );
@@ -1057,7 +1057,7 @@
     LoginManagerParent._browsingContextGlobal.get.restore();
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 );
 
@@ -1119,6 +1119,6 @@
     LoginManagerParent._browsingContextGlobal.get.restore();
     restorePrompter();
     LoginManagerParent.getGeneratedPasswordsByPrincipalOrigin().clear();
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 );
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_searchAndDedupeLogins.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_searchAndDedupeLogins.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_searchAndDedupeLogins.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_LoginManagerParent_searchAndDedupeLogins.js	2021-01-18 19:58:26.000000000 +0000
@@ -190,6 +190,6 @@
       Assert.ok(actual[i].equals(login), `Check index ${i}`);
     }
 
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_logins_change.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_logins_change.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_logins_change.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_logins_change.js	2021-01-18 19:58:26.000000000 +0000
@@ -211,15 +211,15 @@
 /**
  * Tests removing all logins at once.
  */
-add_task(function test_removeAllLogins() {
+add_task(function test_removeAllUserFacingLogins() {
   for (let loginInfo of TestData.loginList()) {
     Services.logins.addLogin(loginInfo);
   }
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   LoginTestUtils.checkLogins([]);
 
   // The function should also work when there are no logins to delete.
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 /**
@@ -460,7 +460,7 @@
     !!Services.logins.addLogin(defaultsLogin),
     "Sanity check adding defaults formLogin"
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   // 0 is a valid date in this context - new nsLoginInfo timestamps init to 0
   for (let pname of ["timeCreated", "timeLastUsed", "timePasswordChanged"]) {
@@ -473,7 +473,7 @@
       !!Services.logins.addLogin(loginInfo),
       "Check 0 value for " + pname
     );
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 
   // negative dates get clamped to 0 and are ok
@@ -487,7 +487,7 @@
       !!Services.logins.addLogin(loginInfo),
       "Check -1 value for " + pname
     );
-    Services.logins.removeAllLogins();
+    Services.logins.removeAllUserFacingLogins();
   }
 
   // out-of-range dates will throw
@@ -544,5 +544,5 @@
   let savedLogins = Services.logins.getAllLogins();
   Assert.equal(savedLogins.length, 1);
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_logins_decrypt_failure.js	2021-01-18 19:58:27.000000000 +0000
@@ -84,7 +84,7 @@
   Assert.equal(Services.logins.countLogins("", "", ""), logins.length);
 
   // Removing all logins removes the non-decryptable entries also.
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
   Assert.equal(Services.logins.getAllLogins().length, 0);
   Assert.equal(Services.logins.countLogins("", "", ""), 0);
 });
@@ -151,7 +151,7 @@
   Services.logins.addLogin(login);
   equal(Services.logins.searchLogins(searchProp).length, 1);
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 // Test the "syncID" metadata works as expected on decryption failure.
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_maybeImportLogin.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_maybeImportLogin.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_maybeImportLogin.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_maybeImportLogin.js	2021-01-18 19:58:26.000000000 +0000
@@ -46,7 +46,7 @@
     0,
     `Should have no logins in storage: ${JSON.stringify(savedLogins, null, 2)}`
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_new_logins() {
@@ -97,7 +97,7 @@
     2,
     "There should be 2 logins in total"
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_duplicate_logins() {
@@ -135,7 +135,7 @@
     1,
     `There should still be 1 login for ${HOST1}`
   );
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_different_passwords() {
@@ -208,7 +208,7 @@
     "We should NOT have updated the password for this login."
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_different_usernames_without_guid() {
@@ -247,7 +247,7 @@
     `There should now be 2 logins for ${HOST1}`
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_different_usernames_with_guid() {
@@ -289,7 +289,7 @@
   Assert.equal(storageLogin.username, USER2, "Check username updated");
   Assert.equal(storageLogin.origin, HOST2, "Check origin updated");
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
 
 add_task(async function test_different_targets() {
@@ -355,5 +355,5 @@
     `There should now be 2 logins for ${HOST1}`
   );
 
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_module_LoginCSVImport.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_module_LoginCSVImport.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_module_LoginCSVImport.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_module_LoginCSVImport.js	2021-01-18 19:58:26.000000000 +0000
@@ -37,7 +37,7 @@
   TTU.getAndClearKeyedHistogram("FX_MIGRATION_LOGINS_QUANTITY");
   TTU.getAndClearKeyedHistogram("FX_MIGRATION_LOGINS_IMPORT_MS");
   TTU.getAndClearKeyedHistogram("FX_MIGRATION_LOGINS_JANK_MS");
-  Services.logins.removeAllLogins();
+  Services.logins.removeAllUserFacingLogins();
 
   let tmpFile = await LoginTestUtils.file.setupCsvFileWithLines(csvLines);
   return tmpFile.path;
@@ -434,6 +434,39 @@
     (a, e) =>
       a.equals(e) &&
       checkMetaInfo(a, e, ["timesUsed"]) &&
+      checkLoginNewlyCreated(a)
+  );
+});
+
+/**
+ * Imports login data from a KeepassXC CSV file.
+ * `Title` is ignored until bug 1433770.
+ */
+add_task(async function test_import_from_keepassxc_csv() {
+  let csvFilePath = await setupCsv([
+    `"Group","Title","Username","Password","URL","Notes"`,
+    `"NewDatabase/Internet","Amazing","test@example.com","<password>","https://example.org",""`,
+  ]);
+
+  await LoginCSVImport.importFromCSV(csvFilePath);
+
+  LoginTestUtils.checkLogins(
+    [
+      TestData.formLogin({
+        formActionOrigin: "",
+        httpRealm: null,
+        origin: "https://example.org",
+        password: "<password>",
+        passwordField: "",
+        timesUsed: 1,
+        username: "test@example.com",
+        usernameField: "",
+      }),
+    ],
+    "Check that a new KeepassXC login was added with the correct fields",
+    (a, e) =>
+      a.equals(e) &&
+      checkMetaInfo(a, e, ["timesUsed"]) &&
       checkLoginNewlyCreated(a)
   );
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_notifications.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_notifications.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_notifications.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_notifications.js	2021-01-18 19:58:26.000000000 +0000
@@ -35,7 +35,7 @@
         Assert.ok(expectedData.equals(subject)); // nsILoginInfo.equals()
         break;
       case "removeAllLogins":
-        Assert.equal(subject, null);
+        Assert.ok(subject instanceof Ci.nsIArray);
         break;
       case "hostSavingEnabled":
       case "hostSavingDisabled":
@@ -126,6 +126,10 @@
     testnum++;
     testdesc = "removeAllLogins (again)";
 
+    expectedNotification = "addLogin";
+    expectedData = testuser1;
+    Services.logins.addLogin(testuser1);
+
     expectedNotification = "removeAllLogins";
     expectedData = null;
     Services.logins.removeAllLogins();
diff -Nru firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_telemetry.js firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_telemetry.js
--- firefox-84.0.2+build1/toolkit/components/passwordmgr/test/unit/test_telemetry.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/passwordmgr/test/unit/test_telemetry.js	2021-01-18 19:58:26.000000000 +0000
@@ -9,6 +9,10 @@
 
 // Globals
 
+const { TestUtils } = ChromeUtils.import(
+  "resource://testing-common/TestUtils.jsm"
+);
+
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 
 // To prevent intermittent failures when the test is executed at a time that is
@@ -73,8 +77,9 @@
  * Triggers the collection of those statistics that are not accumulated each
  * time an action is taken, but are a static snapshot of the current state.
  */
-function triggerStatisticsCollection() {
+async function triggerStatisticsCollection() {
   Services.obs.notifyObservers(null, "gather-telemetry", "" + gReferenceTimeMs);
+  await TestUtils.topicObserved("passwordmgr-gather-telemetry-complete");
 }
 
 /**
@@ -129,11 +134,11 @@
 /**
  * Tests the collection of statistics related to login metadata.
  */
-add_task(function test_logins_statistics() {
+add_task(async function test_logins_statistics() {
   // Repeat the operation twice to test that histograms are not accumulated.
   for (let pass of [1, 2]) {
     info(`pass ${pass}`);
-    triggerStatisticsCollection();
+    await triggerStatisticsCollection();
 
     // Should record 1 in the bucket corresponding to the number of passwords.
     testHistogram("PWMGR_NUM_SAVED_PASSWORDS", { 10: 1 });
@@ -162,22 +167,22 @@
  * Tests the collection of statistics related to hosts for which passowrd saving
  * has been explicitly disabled.
  */
-add_task(function test_disabledHosts_statistics() {
+add_task(async function test_disabledHosts_statistics() {
   // Should record 1 in the bucket corresponding to the number of sites for
   // which password saving is disabled.
   Services.logins.setLoginSavingEnabled("http://www.example.com", false);
-  triggerStatisticsCollection();
+  await triggerStatisticsCollection();
   testHistogram("PWMGR_BLOCKLIST_NUM_SITES", { 1: 1 });
 
   Services.logins.setLoginSavingEnabled("http://www.example.com", true);
-  triggerStatisticsCollection();
+  await triggerStatisticsCollection();
   testHistogram("PWMGR_BLOCKLIST_NUM_SITES", { 0: 1 });
 });
 
 /**
  * Tests the collection of statistics related to general settings.
  */
-add_task(function test_settings_statistics() {
+add_task(async function test_settings_statistics() {
   let oldRememberSignons = Services.prefs.getBoolPref("signon.rememberSignons");
   registerCleanupFunction(function() {
     Services.prefs.setBoolPref("signon.rememberSignons", oldRememberSignons);
@@ -188,7 +193,7 @@
     // This change should be observed immediately by the login service.
     Services.prefs.setBoolPref("signon.rememberSignons", remember);
 
-    triggerStatisticsCollection();
+    await triggerStatisticsCollection();
 
     // Should record 1 in either bucket 0 or bucket 1 based on the preference.
     testHistogram("PWMGR_SAVING_ENABLED", remember ? { 1: 1 } : { 0: 1 });
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/content/build/pdf.js firefox-85.0+build1/toolkit/components/pdfjs/content/build/pdf.js
--- firefox-84.0.2+build1/toolkit/components/pdfjs/content/build/pdf.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/content/build/pdf.js	2021-01-18 19:58:26.000000000 +0000
@@ -246,12 +246,12 @@
 
 var _worker_options = __w_pdfjs_require__(12);
 
-var _text_layer = __w_pdfjs_require__(20);
+var _text_layer = __w_pdfjs_require__(21);
 
-var _svg = __w_pdfjs_require__(21);
+var _svg = __w_pdfjs_require__(22);
 
-const pdfjsVersion = '2.7.262';
-const pdfjsBuild = '85de01e34';
+const pdfjsVersion = '2.7.345';
+const pdfjsBuild = 'b194c820b';
 ;
 
 /***/ }),
@@ -1911,7 +1911,7 @@
 
   return worker.messageHandler.sendWithPromise("GetDocRequest", {
     docId,
-    apiVersion: '2.7.262',
+    apiVersion: '2.7.345',
     source: {
       data: source.data,
       url: source.url,
@@ -3108,7 +3108,9 @@
     const terminated = this.messageHandler.sendWithPromise("Terminate", null);
     waitOn.push(terminated);
     Promise.all(waitOn).then(() => {
+      this.commonObjs.clear();
       this.fontLoader.clear();
+      this._hasJSActionsPromise = null;
 
       if (this._networkStream) {
         this._networkStream.cancelAllRequests(new _util.AbortException("Worker was terminated."));
@@ -3515,7 +3517,7 @@
   }
 
   hasJSActions() {
-    return this.messageHandler.sendWithPromise("HasJSActions", null);
+    return this._hasJSActionsPromise || (this._hasJSActionsPromise = this.messageHandler.sendWithPromise("HasJSActions", null));
   }
 
   getCalculationOrderIds() {
@@ -3583,7 +3585,8 @@
       return {
         info: results[0],
         metadata: results[1] ? new _metadata.Metadata(results[1]) : null,
-        contentDispositionFilename: this._fullReader ? this._fullReader.filename : null
+        contentDispositionFilename: this._fullReader?.filename ?? null,
+        contentLength: this._fullReader?.contentLength ?? null
       };
     });
   }
@@ -3612,6 +3615,7 @@
 
       this.commonObjs.clear();
       this.fontLoader.clear();
+      this._hasJSActionsPromise = null;
     });
   }
 
@@ -3866,9 +3870,9 @@
   return InternalRenderTask;
 }();
 
-const version = '2.7.262';
+const version = '2.7.345';
 exports.version = version;
-const build = '85de01e34';
+const build = 'b194c820b';
 exports.build = build;
 
 /***/ }),
@@ -4188,11 +4192,26 @@
   }
 
   setValue(key, value) {
-    if (this._storage.get(key) !== value) {
-      this._setModified();
+    const obj = this._storage.get(key);
+
+    let modified = false;
+
+    if (obj !== undefined) {
+      for (const [entry, val] of Object.entries(value)) {
+        if (obj[entry] !== val) {
+          modified = true;
+          obj[entry] = val;
+        }
+      }
+    } else {
+      this._storage.set(key, value);
+
+      modified = true;
     }
 
-    this._storage.set(key, value);
+    if (modified) {
+      this._setModified();
+    }
   }
 
   getAll() {
@@ -9096,6 +9115,8 @@
 
 var _annotation_storage = __w_pdfjs_require__(8);
 
+var _scripting_utils = __w_pdfjs_require__(20);
+
 class AnnotationElementFactory {
   static create(parameters) {
     const subtype = parameters.data.annotationType;
@@ -9182,7 +9203,11 @@
 }
 
 class AnnotationElement {
-  constructor(parameters, isRenderable = false, ignoreBorder = false) {
+  constructor(parameters, {
+    isRenderable = false,
+    ignoreBorder = false,
+    createQuadrilaterals = false
+  } = {}) {
     this.isRenderable = isRenderable;
     this.data = parameters.data;
     this.layer = parameters.layer;
@@ -9200,6 +9225,10 @@
     if (isRenderable) {
       this.container = this._createContainer(ignoreBorder);
     }
+
+    if (createQuadrilaterals) {
+      this.quadrilaterals = this._createQuadrilaterals(ignoreBorder);
+    }
   }
 
   _createContainer(ignoreBorder = false) {
@@ -9280,13 +9309,8 @@
     const savedRect = this.data.rect;
 
     for (const quadPoint of this.data.quadPoints) {
-      const rect = [quadPoint[2].x, quadPoint[2].y, quadPoint[1].x, quadPoint[1].y];
-      this.data.rect = rect;
-
-      const quad = this._createContainer(ignoreBorder);
-
-      quad.className = "highlightAnnotation";
-      quadrilaterals.push(quad);
+      this.data.rect = [quadPoint[2].x, quadPoint[2].y, quadPoint[1].x, quadPoint[1].y];
+      quadrilaterals.push(this._createContainer(ignoreBorder));
     }
 
     this.data.rect = savedRect;
@@ -9322,6 +9346,13 @@
     container.appendChild(popup);
   }
 
+  _renderQuadrilaterals(className) {
+    this.quadrilaterals.forEach(quadrilateral => {
+      quadrilateral.className = className;
+    });
+    return this.quadrilaterals;
+  }
+
   render() {
     (0, _util.unreachable)("Abstract method `AnnotationElement.render` called");
   }
@@ -9331,11 +9362,13 @@
 class LinkAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.url || parameters.data.dest || parameters.data.action || parameters.data.isTooltipOnly);
-    super(parameters, isRenderable);
+    super(parameters, {
+      isRenderable,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "linkAnnotation";
     const {
       data,
       linkService
@@ -9357,6 +9390,15 @@
       this._bindLink(link, "");
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("linkAnnotation").map((quadrilateral, index) => {
+        const linkElement = index === 0 ? link : link.cloneNode();
+        quadrilateral.appendChild(linkElement);
+        return quadrilateral;
+      });
+    }
+
+    this.container.className = "linkAnnotation";
     this.container.appendChild(link);
     return this.container;
   }
@@ -9393,7 +9435,9 @@
 class TextAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable);
+    super(parameters, {
+      isRenderable
+    });
   }
 
   render() {
@@ -9432,7 +9476,9 @@
 class TextWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
     const isRenderable = parameters.renderInteractiveForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
-    super(parameters, isRenderable);
+    super(parameters, {
+      isRenderable
+    });
   }
 
   render() {
@@ -9443,7 +9489,9 @@
     let element = null;
 
     if (this.renderInteractiveForms) {
-      const textContent = storage.getOrCreateValue(id, this.data.fieldValue);
+      const textContent = storage.getOrCreateValue(id, {
+        value: this.data.fieldValue
+      }).value;
 
       if (this.data.multiLine) {
         element = document.createElement("textarea");
@@ -9454,37 +9502,104 @@
         element.setAttribute("value", textContent);
       }
 
+      element.userValue = textContent;
       element.setAttribute("id", id);
       element.addEventListener("input", function (event) {
-        storage.setValue(id, event.target.value);
+        storage.setValue(id, {
+          value: event.target.value
+        });
       });
       element.addEventListener("blur", function (event) {
         event.target.setSelectionRange(0, 0);
       });
 
       if (this.enableScripting && this.hasJSActions) {
-        element.addEventListener("updateFromSandbox", function (event) {
-          const data = event.detail;
-
-          if ("value" in data) {
-            event.target.value = event.detail.value;
-          } else if ("focus" in data) {
-            event.target.focus({
-              preventScroll: false
-            });
+        element.addEventListener("focus", event => {
+          if (event.target.userValue) {
+            event.target.value = event.target.userValue;
           }
         });
 
-        if (this.data.actions !== null) {
+        if (this.data.actions) {
+          element.addEventListener("updateFromSandbox", function (event) {
+            const detail = event.detail;
+            const actions = {
+              value() {
+                const value = detail.value;
+
+                if (value === undefined || value === null) {
+                  event.target.userValue = "";
+                } else {
+                  event.target.userValue = value;
+                }
+              },
+
+              valueAsString() {
+                const value = detail.valueAsString;
+
+                if (value === undefined || value === null) {
+                  event.target.value = "";
+                } else {
+                  event.target.value = value;
+                }
+
+                storage.setValue(id, event.target.value);
+              },
+
+              focus() {
+                event.target.focus({
+                  preventScroll: false
+                });
+              },
+
+              userName() {
+                const tooltip = detail.userName;
+                event.target.title = tooltip;
+              },
+
+              hidden() {
+                event.target.style.display = detail.hidden ? "none" : "block";
+              },
+
+              editable() {
+                event.target.disabled = !detail.editable;
+              },
+
+              selRange() {
+                const [selStart, selEnd] = detail.selRange;
+
+                if (selStart >= 0 && selEnd < event.target.value.length) {
+                  event.target.setSelectionRange(selStart, selEnd);
+                }
+              },
+
+              strokeColor() {
+                const color = detail.strokeColor;
+                event.target.style.color = _scripting_utils.ColorConverters[`${color[0]}_HTML`](color.slice(1));
+              }
+
+            };
+
+            for (const name of Object.keys(detail)) {
+              if (name in actions) {
+                actions[name]();
+              }
+            }
+          });
+
           for (const eventType of Object.keys(this.data.actions)) {
             switch (eventType) {
               case "Format":
-                element.addEventListener("blur", function (event) {
+                element.addEventListener("change", function (event) {
                   window.dispatchEvent(new CustomEvent("dispatchEventInSandbox", {
                     detail: {
                       id,
-                      name: "Format",
-                      value: event.target.value
+                      name: "Keystroke",
+                      value: event.target.value,
+                      willCommit: true,
+                      commitKey: 1,
+                      selStart: event.target.selectionStart,
+                      selEnd: event.target.selectionEnd
                     }
                   }));
                 });
@@ -9557,14 +9672,18 @@
 
 class CheckboxWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderInteractiveForms
+    });
   }
 
   render() {
     const storage = this.annotationStorage;
     const data = this.data;
     const id = data.id;
-    const value = storage.getOrCreateValue(id, data.fieldValue && data.fieldValue !== "Off");
+    const value = storage.getOrCreateValue(id, {
+      value: data.fieldValue && data.fieldValue !== "Off"
+    }).value;
     this.container.className = "buttonWidgetAnnotation checkBox";
     const element = document.createElement("input");
     element.disabled = data.readOnly;
@@ -9576,7 +9695,9 @@
     }
 
     element.addEventListener("change", function (event) {
-      storage.setValue(id, event.target.checked);
+      storage.setValue(id, {
+        value: event.target.checked
+      });
     });
     this.container.appendChild(element);
     return this.container;
@@ -9586,7 +9707,9 @@
 
 class RadioButtonWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderInteractiveForms
+    });
   }
 
   render() {
@@ -9594,7 +9717,9 @@
     const storage = this.annotationStorage;
     const data = this.data;
     const id = data.id;
-    const value = storage.getOrCreateValue(id, data.fieldValue === data.buttonValue);
+    const value = storage.getOrCreateValue(id, {
+      value: data.fieldValue === data.buttonValue
+    }).value;
     const element = document.createElement("input");
     element.disabled = data.readOnly;
     element.type = "radio";
@@ -9609,11 +9734,15 @@
 
       for (const radio of document.getElementsByName(name)) {
         if (radio !== event.target) {
-          storage.setValue(radio.parentNode.getAttribute("data-annotation-id"), false);
+          storage.setValue(radio.parentNode.getAttribute("data-annotation-id"), {
+            value: false
+          });
         }
       }
 
-      storage.setValue(id, event.target.checked);
+      storage.setValue(id, {
+        value: event.target.checked
+      });
     });
     this.container.appendChild(element);
     return this.container;
@@ -9637,14 +9766,18 @@
 
 class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
   constructor(parameters) {
-    super(parameters, parameters.renderInteractiveForms);
+    super(parameters, {
+      isRenderable: parameters.renderInteractiveForms
+    });
   }
 
   render() {
     this.container.className = "choiceWidgetAnnotation";
     const storage = this.annotationStorage;
     const id = this.data.id;
-    storage.getOrCreateValue(id, this.data.fieldValue.length > 0 ? this.data.fieldValue[0] : undefined);
+    storage.getOrCreateValue(id, {
+      value: this.data.fieldValue.length > 0 ? this.data.fieldValue[0] : undefined
+    });
     const selectElement = document.createElement("select");
     selectElement.disabled = this.data.readOnly;
     selectElement.name = this.data.fieldName;
@@ -9672,7 +9805,9 @@
     selectElement.addEventListener("input", function (event) {
       const options = event.target.options;
       const value = options[options.selectedIndex].value;
-      storage.setValue(id, value);
+      storage.setValue(id, {
+        value
+      });
     });
     this.container.appendChild(selectElement);
     return this.container;
@@ -9683,7 +9818,9 @@
 class PopupAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable);
+    super(parameters, {
+      isRenderable
+    });
   }
 
   render() {
@@ -9839,7 +9976,10 @@
 class FreeTextAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -9857,7 +9997,10 @@
 class LineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -9886,7 +10029,10 @@
 class SquareAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -9917,7 +10063,10 @@
 class CircleAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -9948,7 +10097,10 @@
 class PolylineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
     this.containerClassName = "polylineAnnotation";
     this.svgElementName = "svg:polyline";
   }
@@ -9995,7 +10147,10 @@
 class CaretAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -10013,7 +10168,10 @@
 class InkAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
     this.containerClassName = "inkAnnotation";
     this.svgElementName = "svg:polyline";
   }
@@ -10055,18 +10213,24 @@
 class HighlightAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
-    this.quadrilaterals = this._createQuadrilaterals(true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "highlightAnnotation";
-
     if (!this.data.hasPopup) {
       this._createPopup(null, this.data);
     }
 
-    return this.quadrilaterals || this.container;
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("highlightAnnotation");
+    }
+
+    this.container.className = "highlightAnnotation";
+    return this.container;
   }
 
 }
@@ -10074,16 +10238,23 @@
 class UnderlineAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "underlineAnnotation";
-
     if (!this.data.hasPopup) {
       this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("underlineAnnotation");
+    }
+
+    this.container.className = "underlineAnnotation";
     return this.container;
   }
 
@@ -10092,16 +10263,23 @@
 class SquigglyAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "squigglyAnnotation";
-
     if (!this.data.hasPopup) {
       this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("squigglyAnnotation");
+    }
+
+    this.container.className = "squigglyAnnotation";
     return this.container;
   }
 
@@ -10110,16 +10288,23 @@
 class StrikeOutAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true,
+      createQuadrilaterals: true
+    });
   }
 
   render() {
-    this.container.className = "strikeoutAnnotation";
-
     if (!this.data.hasPopup) {
       this._createPopup(null, this.data);
     }
 
+    if (this.quadrilaterals) {
+      return this._renderQuadrilaterals("strikeoutAnnotation");
+    }
+
+    this.container.className = "strikeoutAnnotation";
     return this.container;
   }
 
@@ -10128,7 +10313,10 @@
 class StampAnnotationElement extends AnnotationElement {
   constructor(parameters) {
     const isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-    super(parameters, isRenderable, true);
+    super(parameters, {
+      isRenderable,
+      ignoreBorder: true
+    });
   }
 
   render() {
@@ -10145,7 +10333,9 @@
 
 class FileAttachmentAnnotationElement extends AnnotationElement {
   constructor(parameters) {
-    super(parameters, true);
+    super(parameters, {
+      isRenderable: true
+    });
     const {
       filename,
       content
@@ -10230,6 +10420,10 @@
       if (element.isRenderable) {
         const rendered = element.render();
 
+        if (data.hidden) {
+          rendered.style.visibility = "hidden";
+        }
+
         if (Array.isArray(rendered)) {
           for (const renderedElement of rendered) {
             parameters.div.appendChild(renderedElement);
@@ -10267,6 +10461,74 @@
 
 /***/ }),
 /* 20 */
+/***/ ((__unused_webpack_module, exports) => {
+
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.ColorConverters = void 0;
+
+function makeColorComp(n) {
+  return Math.floor(Math.max(0, Math.min(1, n)) * 255).toString(16).padStart(2, "0");
+}
+
+class ColorConverters {
+  static CMYK_G([c, y, m, k]) {
+    return ["G", 1 - Math.min(1, 0.3 * c + 0.59 * m + 0.11 * y + k)];
+  }
+
+  static G_CMYK([g]) {
+    return ["CMYK", 0, 0, 0, 1 - g];
+  }
+
+  static G_RGB([g]) {
+    return ["RGB", g, g, g];
+  }
+
+  static G_HTML([g]) {
+    const G = makeColorComp(g);
+    return `#${G}${G}${G}`;
+  }
+
+  static RGB_G([r, g, b]) {
+    return ["G", 0.3 * r + 0.59 * g + 0.11 * b];
+  }
+
+  static RGB_HTML([r, g, b]) {
+    const R = makeColorComp(r);
+    const G = makeColorComp(g);
+    const B = makeColorComp(b);
+    return `#${R}${G}${B}`;
+  }
+
+  static T_HTML() {
+    return "#00000000";
+  }
+
+  static CMYK_RGB([c, y, m, k]) {
+    return ["RGB", 1 - Math.min(1, c + k), 1 - Math.min(1, m + k), 1 - Math.min(1, y + k)];
+  }
+
+  static CMYK_HTML(components) {
+    return this.RGB_HTML(this.CMYK_RGB(components));
+  }
+
+  static RGB_CMYK([r, g, b]) {
+    const c = 1 - r;
+    const m = 1 - g;
+    const y = 1 - b;
+    const k = Math.min(c, m, y);
+    return ["CMYK", c, m, y, k];
+  }
+
+}
+
+exports.ColorConverters = ColorConverters;
+
+/***/ }),
+/* 21 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
@@ -10963,7 +11225,7 @@
 exports.renderTextLayer = renderTextLayer;
 
 /***/ }),
-/* 21 */
+/* 22 */
 /***/ ((__unused_webpack_module, exports, __w_pdfjs_require__) => {
 
 
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/content/build/pdf.worker.js firefox-85.0+build1/toolkit/components/pdfjs/content/build/pdf.worker.js
--- firefox-84.0.2+build1/toolkit/components/pdfjs/content/build/pdf.worker.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/content/build/pdf.worker.js	2021-01-18 19:58:27.000000000 +0000
@@ -50,8 +50,8 @@
 
 var _worker = __w_pdfjs_require__(1);
 
-const pdfjsVersion = '2.7.262';
-const pdfjsBuild = '85de01e34';
+const pdfjsVersion = '2.7.345';
+const pdfjsBuild = 'b194c820b';
 
 /***/ }),
 /* 1 */
@@ -145,7 +145,7 @@
     var WorkerTasks = [];
     const verbosity = (0, _util.getVerbosityLevel)();
     const apiVersion = docParams.apiVersion;
-    const workerVersion = '2.7.262';
+    const workerVersion = '2.7.345';
 
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
@@ -3030,7 +3030,7 @@
   for (let i = 0, ii = str.length; i < ii; i++) {
     const char = str.charCodeAt(i);
 
-    if (char < 0x21 || char > 0x7e || char === 0x23) {
+    if (char < 0x21 || char > 0x7e || char === 0x23 || char === 0x28 || char === 0x29 || char === 0x3c || char === 0x3e || char === 0x5b || char === 0x5d || char === 0x7b || char === 0x7d || char === 0x2f || char === 0x25) {
       if (start < i) {
         buffer.push(str.substring(start, i));
       }
@@ -3332,7 +3332,7 @@
       const opListPromises = [];
 
       for (const annotation of annotations) {
-        if (isAnnotationRenderable(annotation, intent)) {
+        if (isAnnotationRenderable(annotation, intent) && !annotation.isHidden(annotationStorage)) {
           opListPromises.push(annotation.getOperatorList(partialEvaluator, task, renderInteractiveForms, annotationStorage).catch(function (reason) {
             (0, _util.warn)("getOperatorList - ignoring annotation data during " + `"${task.name}" task: "${reason}".`);
             return null;
@@ -5751,16 +5751,14 @@
         }
       }
 
-      var i, ii;
-
-      for (i = 0, ii = xrefStms.length; i < ii; ++i) {
+      for (let i = 0, ii = xrefStms.length; i < ii; ++i) {
         this.startXRefQueue.push(xrefStms[i]);
         this.readXRef(true);
       }
 
       let trailerDict;
 
-      for (i = 0, ii = trailers.length; i < ii; ++i) {
+      for (let i = 0, ii = trailers.length; i < ii; ++i) {
         stream.pos = trailers[i];
         const parser = new _parser.Parser({
           lexer: new _parser.Lexer(stream),
@@ -5780,10 +5778,24 @@
           continue;
         }
 
-        let rootDict;
-
         try {
-          rootDict = dict.get("Root");
+          const rootDict = dict.get("Root");
+
+          if (!(rootDict instanceof _primitives.Dict)) {
+            continue;
+          }
+
+          const pagesDict = rootDict.get("Pages");
+
+          if (!(pagesDict instanceof _primitives.Dict)) {
+            continue;
+          }
+
+          const pagesCount = pagesDict.get("Count");
+
+          if (!Number.isInteger(pagesCount)) {
+            continue;
+          }
         } catch (ex) {
           if (ex instanceof _core_utils.MissingDataException) {
             throw ex;
@@ -5792,10 +5804,6 @@
           continue;
         }
 
-        if (!(0, _primitives.isDict)(rootDict) || !rootDict.has("Pages")) {
-          continue;
-        }
-
         if (dict.has("ID")) {
           return dict;
         }
@@ -19456,7 +19464,22 @@
     }
   }
 
-  return quadPointsLists;
+  return quadPointsLists.map(quadPointsList => {
+    const [minX, maxX, minY, maxY] = quadPointsList.reduce(([mX, MX, mY, MY], quadPoint) => [Math.min(mX, quadPoint.x), Math.max(MX, quadPoint.x), Math.min(mY, quadPoint.y), Math.max(MY, quadPoint.y)], [Number.MAX_VALUE, Number.MIN_VALUE, Number.MAX_VALUE, Number.MIN_VALUE]);
+    return [{
+      x: minX,
+      y: maxY
+    }, {
+      x: maxX,
+      y: maxY
+    }, {
+      x: minX,
+      y: minY
+    }, {
+      x: maxX,
+      y: minY
+    }];
+  });
 }
 
 function getTransformMatrix(rect, bbox, matrix) {
@@ -19506,11 +19529,21 @@
   }
 
   _isViewable(flags) {
-    return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
+    return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
   }
 
   _isPrintable(flags) {
-    return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN);
+    return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE);
+  }
+
+  isHidden(annotationStorage) {
+    const data = annotationStorage && annotationStorage[this.data.id];
+
+    if (data && "hidden" in data) {
+      return data.hidden;
+    }
+
+    return this._hasFlag(this.flags, _util.AnnotationFlag.HIDDEN);
   }
 
   get viewable() {
@@ -19999,7 +20032,7 @@
     }
 
     data.readOnly = this.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
-    data.hidden = this.hasFieldFlag(_util.AnnotationFieldFlag.HIDDEN);
+    data.hidden = this._hasFlag(data.annotationFlags, _util.AnnotationFlag.HIDDEN);
 
     if (data.fieldType === "Sig") {
       data.fieldValue = null;
@@ -20095,7 +20128,7 @@
   }
 
   async save(evaluator, task, annotationStorage) {
-    const value = annotationStorage[this.data.id];
+    const value = annotationStorage[this.data.id] && annotationStorage[this.data.id].value;
 
     if (value === this.data.fieldValue || value === undefined) {
       return null;
@@ -20169,7 +20202,7 @@
       return null;
     }
 
-    const value = annotationStorage[this.data.id];
+    const value = annotationStorage[this.data.id] && annotationStorage[this.data.id].value;
 
     if (value === undefined) {
       return null;
@@ -20580,7 +20613,7 @@
     }
 
     if (annotationStorage) {
-      const value = annotationStorage[this.data.id];
+      const value = annotationStorage[this.data.id] && annotationStorage[this.data.id].value;
 
       if (value === undefined) {
         return super.getOperatorList(evaluator, task, renderForms, annotationStorage);
@@ -20621,7 +20654,7 @@
   }
 
   async _saveCheckbox(evaluator, task, annotationStorage) {
-    const value = annotationStorage[this.data.id];
+    const value = annotationStorage[this.data.id] && annotationStorage[this.data.id].value;
 
     if (value === undefined) {
       return null;
@@ -20667,7 +20700,7 @@
   }
 
   async _saveRadioButton(evaluator, task, annotationStorage) {
-    const value = annotationStorage[this.data.id];
+    const value = annotationStorage[this.data.id] && annotationStorage[this.data.id].value;
 
     if (value === undefined) {
       return null;
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/content/PdfJsNetwork.jsm firefox-85.0+build1/toolkit/components/pdfjs/content/PdfJsNetwork.jsm
--- firefox-84.0.2+build1/toolkit/components/pdfjs/content/PdfJsNetwork.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/content/PdfJsNetwork.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -94,6 +94,7 @@
         var rangeStr = args.begin + "-" + (args.end - 1);
         xhr.setRequestHeader("Range", "bytes=" + rangeStr);
         pendingRequest.expectedStatus = 206;
+        xhr.channel.QueryInterface(Ci.nsIHttpChannel).redirectionLimit = 0;
       } else {
         pendingRequest.expectedStatus = 200;
       }
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/content/web/viewer.css firefox-85.0+build1/toolkit/components/pdfjs/content/web/viewer.css
--- firefox-84.0.2+build1/toolkit/components/pdfjs/content/web/viewer.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/content/web/viewer.css	2021-01-18 19:58:27.000000000 +0000
@@ -398,6 +398,7 @@
   --progressBar-indeterminate-blend-color: rgba(116, 177, 239, 1);
   --scrollbar-color: auto;
   --scrollbar-bg-color: auto;
+  --toolbar-icon-bg-color: rgba(0, 0, 0, 1);
 
   --sidebar-bg-color: rgba(245, 246, 247, 1);
   --toolbar-bg-color: rgba(249, 249, 250, 1);
@@ -469,6 +470,7 @@
     --progressBar-indeterminate-blend-color: rgba(20, 68, 133, 1);
     --scrollbar-color: rgba(121, 121, 123, 1);
     --scrollbar-bg-color: rgba(35, 35, 39, 1);
+    --toolbar-icon-bg-color: rgba(255, 255, 255, 1);
 
     --sidebar-bg-color: rgba(50, 50, 52, 1);
     --toolbar-bg-color: rgba(56, 56, 61, 1);
@@ -493,41 +495,10 @@
     --overlay-button-bg-color: rgba(92, 92, 97, 1);
     --overlay-button-hover-color: rgba(115, 115, 115, 1);
 
+    /* This image is used in <input> elements, which unfortunately means that
+     * the `mask-image` approach used with all of the other images doesn't work
+     * here; hence why we still have two versions of this particular image. */
     --loading-icon: url(images/loading-dark.svg);
-    --treeitem-expanded-icon: url(images/treeitem-expanded-dark.svg);
-    --treeitem-collapsed-icon: url(images/treeitem-collapsed-dark.svg);
-    --toolbarButton-menuArrow-icon: url(images/toolbarButton-menuArrow-dark.svg);
-    --toolbarButton-sidebarToggle-icon: url(images/toolbarButton-sidebarToggle-dark.svg);
-    --toolbarButton-secondaryToolbarToggle-icon: url(images/toolbarButton-secondaryToolbarToggle-dark.svg);
-    --toolbarButton-pageUp-icon: url(images/toolbarButton-pageUp-dark.svg);
-    --toolbarButton-pageDown-icon: url(images/toolbarButton-pageDown-dark.svg);
-    --toolbarButton-zoomOut-icon: url(images/toolbarButton-zoomOut-dark.svg);
-    --toolbarButton-zoomIn-icon: url(images/toolbarButton-zoomIn-dark.svg);
-    --toolbarButton-presentationMode-icon: url(images/toolbarButton-presentationMode-dark.svg);
-    --toolbarButton-print-icon: url(images/toolbarButton-print-dark.svg);
-    --toolbarButton-openFile-icon: url(images/toolbarButton-openFile-dark.svg);
-    --toolbarButton-download-icon: url(images/toolbarButton-download-dark.svg);
-    --toolbarButton-bookmark-icon: url(images/toolbarButton-bookmark-dark.svg);
-    --toolbarButton-viewThumbnail-icon: url(images/toolbarButton-viewThumbnail-dark.svg);
-    --toolbarButton-viewOutline-icon: url(images/toolbarButton-viewOutline-dark.svg);
-    --toolbarButton-viewAttachments-icon: url(images/toolbarButton-viewAttachments-dark.svg);
-    --toolbarButton-viewLayers-icon: url(images/toolbarButton-viewLayers-dark.svg);
-    --toolbarButton-search-icon: url(images/toolbarButton-search-dark.svg);
-    --findbarButton-previous-icon: url(images/findbarButton-previous-dark.svg);
-    --findbarButton-next-icon: url(images/findbarButton-next-dark.svg);
-    --secondaryToolbarButton-firstPage-icon: url(images/secondaryToolbarButton-firstPage-dark.svg);
-    --secondaryToolbarButton-lastPage-icon: url(images/secondaryToolbarButton-lastPage-dark.svg);
-    --secondaryToolbarButton-rotateCcw-icon: url(images/secondaryToolbarButton-rotateCcw-dark.svg);
-    --secondaryToolbarButton-rotateCw-icon: url(images/secondaryToolbarButton-rotateCw-dark.svg);
-    --secondaryToolbarButton-selectTool-icon: url(images/secondaryToolbarButton-selectTool-dark.svg);
-    --secondaryToolbarButton-handTool-icon: url(images/secondaryToolbarButton-handTool-dark.svg);
-    --secondaryToolbarButton-scrollVertical-icon: url(images/secondaryToolbarButton-scrollVertical-dark.svg);
-    --secondaryToolbarButton-scrollHorizontal-icon: url(images/secondaryToolbarButton-scrollHorizontal-dark.svg);
-    --secondaryToolbarButton-scrollWrapped-icon: url(images/secondaryToolbarButton-scrollWrapped-dark.svg);
-    --secondaryToolbarButton-spreadNone-icon: url(images/secondaryToolbarButton-spreadNone-dark.svg);
-    --secondaryToolbarButton-spreadOdd-icon: url(images/secondaryToolbarButton-spreadOdd-dark.svg);
-    --secondaryToolbarButton-spreadEven-icon: url(images/secondaryToolbarButton-spreadEven-dark.svg);
-    --secondaryToolbarButton-documentProperties-icon: url(images/secondaryToolbarButton-documentProperties-dark.svg);
   }
 }
 
@@ -972,6 +943,9 @@
 html[dir="rtl"] #findInput[data-status="pending"] {
   background-position: 3px;
 }
+#findInput[data-status="notFound"] {
+  background-color: rgba(255, 102, 102, 1);
+}
 
 .secondaryToolbar {
   padding: 6px 0 10px 0;
@@ -1071,10 +1045,6 @@
   display: none;
 }
 
-#findInput.notFound {
-  background-color: rgba(255, 102, 102, 1);
-}
-
 #toolbarViewerMiddle {
   position: absolute;
   left: 50%;
@@ -1263,12 +1233,10 @@
   margin-top: 2px !important;
 }
 .dropdownToolbarButton::after {
-  position: absolute;
-  display: inline-block;
   top: 6px;
-  content: var(--toolbarButton-menuArrow-icon);
   pointer-events: none;
-  max-width: 16px;
+
+  mask-image: var(--toolbarButton-menuArrow-icon);
 }
 html[dir="ltr"] .dropdownToolbarButton::after {
   right: 7px;
@@ -1344,13 +1312,23 @@
 }
 
 .toolbarButton::before,
-.secondaryToolbarButton::before {
+.secondaryToolbarButton::before,
+.dropdownToolbarButton::after,
+.treeItemToggler::before {
   /* All matching images have a size of 16x16
    * All relevant containers have a size of 28x28 */
   position: absolute;
   display: inline-block;
+  width: 16px;
+  height: 16px;
+
+  content: "";
+  background-color: var(--toolbar-icon-bg-color);
+  mask-size: cover;
+}
+.toolbarButton::before,
+.secondaryToolbarButton::before {
   left: 6px;
-  max-width: 16px;
 }
 
 html[dir="ltr"] .secondaryToolbarButton::before {
@@ -1361,73 +1339,73 @@
 }
 
 .toolbarButton#sidebarToggle::before {
-  content: var(--toolbarButton-sidebarToggle-icon);
+  mask-image: var(--toolbarButton-sidebarToggle-icon);
 }
 html[dir="rtl"] .toolbarButton#sidebarToggle::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton#secondaryToolbarToggle::before {
-  content: var(--toolbarButton-secondaryToolbarToggle-icon);
+  mask-image: var(--toolbarButton-secondaryToolbarToggle-icon);
 }
 html[dir="rtl"] .toolbarButton#secondaryToolbarToggle::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton.findPrevious::before {
-  content: var(--findbarButton-previous-icon);
+  mask-image: var(--findbarButton-previous-icon);
 }
 html[dir="rtl"] .toolbarButton.findPrevious::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton.findNext::before {
-  content: var(--findbarButton-next-icon);
+  mask-image: var(--findbarButton-next-icon);
 }
 html[dir="rtl"] .toolbarButton.findNext::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton.pageUp::before {
-  content: var(--toolbarButton-pageUp-icon);
+  mask-image: var(--toolbarButton-pageUp-icon);
 }
 html[dir="rtl"] .toolbarButton.pageUp::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton.pageDown::before {
-  content: var(--toolbarButton-pageDown-icon);
+  mask-image: var(--toolbarButton-pageDown-icon);
 }
 html[dir="rtl"] .toolbarButton.pageDown::before {
   transform: scaleX(-1);
 }
 
 .toolbarButton.zoomOut::before {
-  content: var(--toolbarButton-zoomOut-icon);
+  mask-image: var(--toolbarButton-zoomOut-icon);
 }
 
 .toolbarButton.zoomIn::before {
-  content: var(--toolbarButton-zoomIn-icon);
+  mask-image: var(--toolbarButton-zoomIn-icon);
 }
 
 .toolbarButton.presentationMode::before,
 .secondaryToolbarButton.presentationMode::before {
-  content: var(--toolbarButton-presentationMode-icon);
+  mask-image: var(--toolbarButton-presentationMode-icon);
 }
 
 .toolbarButton.print::before,
 .secondaryToolbarButton.print::before {
-  content: var(--toolbarButton-print-icon);
+  mask-image: var(--toolbarButton-print-icon);
 }
 
 .toolbarButton.openFile::before,
 .secondaryToolbarButton.openFile::before {
-  content: var(--toolbarButton-openFile-icon);
+  mask-image: var(--toolbarButton-openFile-icon);
 }
 
 .toolbarButton.download::before,
 .secondaryToolbarButton.download::before {
-  content: var(--toolbarButton-download-icon);
+  mask-image: var(--toolbarButton-download-icon);
 }
 
 .secondaryToolbarButton.bookmark {
@@ -1442,30 +1420,30 @@
 
 .toolbarButton.bookmark::before,
 .secondaryToolbarButton.bookmark::before {
-  content: var(--toolbarButton-bookmark-icon);
+  mask-image: var(--toolbarButton-bookmark-icon);
 }
 
 #viewThumbnail.toolbarButton::before {
-  content: var(--toolbarButton-viewThumbnail-icon);
+  mask-image: var(--toolbarButton-viewThumbnail-icon);
 }
 
 #viewOutline.toolbarButton::before {
-  content: var(--toolbarButton-viewOutline-icon);
+  mask-image: var(--toolbarButton-viewOutline-icon);
 }
 html[dir="rtl"] #viewOutline.toolbarButton::before {
   transform: scaleX(-1);
 }
 
 #viewAttachments.toolbarButton::before {
-  content: var(--toolbarButton-viewAttachments-icon);
+  mask-image: var(--toolbarButton-viewAttachments-icon);
 }
 
 #viewLayers.toolbarButton::before {
-  content: var(--toolbarButton-viewLayers-icon);
+  mask-image: var(--toolbarButton-viewLayers-icon);
 }
 
 #viewFind.toolbarButton::before {
-  content: var(--toolbarButton-search-icon);
+  mask-image: var(--toolbarButton-search-icon);
 }
 
 .toolbarButton.pdfSidebarNotification::after {
@@ -1515,55 +1493,55 @@
 }
 
 .secondaryToolbarButton.firstPage::before {
-  content: var(--secondaryToolbarButton-firstPage-icon);
+  mask-image: var(--secondaryToolbarButton-firstPage-icon);
 }
 
 .secondaryToolbarButton.lastPage::before {
-  content: var(--secondaryToolbarButton-lastPage-icon);
+  mask-image: var(--secondaryToolbarButton-lastPage-icon);
 }
 
 .secondaryToolbarButton.rotateCcw::before {
-  content: var(--secondaryToolbarButton-rotateCcw-icon);
+  mask-image: var(--secondaryToolbarButton-rotateCcw-icon);
 }
 
 .secondaryToolbarButton.rotateCw::before {
-  content: var(--secondaryToolbarButton-rotateCw-icon);
+  mask-image: var(--secondaryToolbarButton-rotateCw-icon);
 }
 
 .secondaryToolbarButton.selectTool::before {
-  content: var(--secondaryToolbarButton-selectTool-icon);
+  mask-image: var(--secondaryToolbarButton-selectTool-icon);
 }
 
 .secondaryToolbarButton.handTool::before {
-  content: var(--secondaryToolbarButton-handTool-icon);
+  mask-image: var(--secondaryToolbarButton-handTool-icon);
 }
 
 .secondaryToolbarButton.scrollVertical::before {
-  content: var(--secondaryToolbarButton-scrollVertical-icon);
+  mask-image: var(--secondaryToolbarButton-scrollVertical-icon);
 }
 
 .secondaryToolbarButton.scrollHorizontal::before {
-  content: var(--secondaryToolbarButton-scrollHorizontal-icon);
+  mask-image: var(--secondaryToolbarButton-scrollHorizontal-icon);
 }
 
 .secondaryToolbarButton.scrollWrapped::before {
-  content: var(--secondaryToolbarButton-scrollWrapped-icon);
+  mask-image: var(--secondaryToolbarButton-scrollWrapped-icon);
 }
 
 .secondaryToolbarButton.spreadNone::before {
-  content: var(--secondaryToolbarButton-spreadNone-icon);
+  mask-image: var(--secondaryToolbarButton-spreadNone-icon);
 }
 
 .secondaryToolbarButton.spreadOdd::before {
-  content: var(--secondaryToolbarButton-spreadOdd-icon);
+  mask-image: var(--secondaryToolbarButton-spreadOdd-icon);
 }
 
 .secondaryToolbarButton.spreadEven::before {
-  content: var(--secondaryToolbarButton-spreadEven-icon);
+  mask-image: var(--secondaryToolbarButton-spreadEven-icon);
 }
 
 .secondaryToolbarButton.documentProperties::before {
-  content: var(--secondaryToolbarButton-documentProperties-icon);
+  mask-image: var(--secondaryToolbarButton-documentProperties-icon);
 }
 
 .verticalToolbarSeparator {
@@ -1791,14 +1769,10 @@
   color: rgba(255, 255, 255, 0.5);
 }
 .treeItemToggler::before {
-  content: var(--treeitem-expanded-icon);
-  display: inline-block;
-  position: absolute;
-  max-width: 16px;
+  mask-image: var(--treeitem-expanded-icon);
 }
 .treeItemToggler.treeItemsHidden::before {
-  content: var(--treeitem-collapsed-icon);
-  max-width: 16px;
+  mask-image: var(--treeitem-collapsed-icon);
 }
 html[dir="rtl"] .treeItemToggler.treeItemsHidden::before {
   transform: scaleX(-1);
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/content/web/viewer.js firefox-85.0+build1/toolkit/components/pdfjs/content/web/viewer.js
--- firefox-84.0.2+build1/toolkit/components/pdfjs/content/web/viewer.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/content/web/viewer.js	2021-01-18 19:58:26.000000000 +0000
@@ -48,8 +48,8 @@
 
 var _app = __webpack_require__(3);
 
-const pdfjsVersion = '2.7.262';
-const pdfjsBuild = '85de01e34';
+const pdfjsVersion = '2.7.345';
+const pdfjsBuild = 'b194c820b';
 window.PDFViewerApplication = _app.PDFViewerApplication;
 window.PDFViewerApplicationOptions = _app_options.AppOptions;
 ;
@@ -317,6 +317,10 @@
     value: false,
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE
   },
+  viewerCssTheme: {
+    value: 0,
+    kind: OptionKind.VIEWER + OptionKind.PREFERENCE
+  },
   viewOnLoad: {
     value: 0,
     kind: OptionKind.VIEWER + OptionKind.PREFERENCE
@@ -437,6 +441,12 @@
     userOptions[name] = value;
   }
 
+  static setAll(options) {
+    for (const name in options) {
+      userOptions[name] = options[name];
+    }
+  }
+
   static remove(name) {
     delete userOptions[name];
   }
@@ -529,6 +539,11 @@
   PREVIOUS: 0,
   INITIAL: 1
 };
+const ViewerCssTheme = {
+  AUTOMATIC: 0,
+  LIGHT: 1,
+  DARK: 2
+};
 const KNOWN_VERSIONS = ["1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "2.0", "2.1", "2.2", "2.3"];
 const KNOWN_GENERATORS = ["acrobat distiller", "acrobat pdfwriter", "adobe livecycle", "adobe pdf library", "adobe photoshop", "ghostscript", "tcpdf", "cairo", "dvipdfm", "dvips", "pdftex", "pdfkit", "itext", "prince", "quarkxpress", "mac os x", "microsoft", "openoffice", "oracle", "luradocument", "pdf-xchange", "antenna house", "aspose.cells", "fpdf"];
 
@@ -620,18 +635,25 @@
   url: "",
   baseUrl: "",
   externalServices: DefaultExternalServices,
-  _boundEvents: {},
-  contentDispositionFilename: null,
+  _boundEvents: Object.create(null),
+  documentInfo: null,
+  metadata: null,
+  _contentDispositionFilename: null,
+  _contentLength: null,
   triggerDelayedFallback: null,
   _saveInProgress: false,
   _wheelUnusedTicks: 0,
   _idleCallbacks: new Set(),
+  _scriptingInstance: null,
 
   async initialize(appConfig) {
     this.preferences = this.externalServices.createPreferences();
     this.appConfig = appConfig;
     await this._readPreferences();
     await this._parseHashParameters();
+
+    this._forceCssTheme();
+
     await this._initializeL10n();
 
     if (this.isViewerEmbedded && _app_options.AppOptions.get("externalLinkTarget") === _pdfjsLib.LinkTarget.NONE) {
@@ -653,13 +675,9 @@
 
   async _readPreferences() {
     try {
-      const prefs = await this.preferences.getAll();
-
-      for (const name in prefs) {
-        _app_options.AppOptions.set(name, prefs[name]);
-      }
+      _app_options.AppOptions.setAll(await this.preferences.getAll());
     } catch (reason) {
-      console.error(`_readPreferences: "${reason.message}".`);
+      console.error(`_readPreferences: "${reason?.message}".`);
     }
   },
 
@@ -734,6 +752,10 @@
       waitOn.push(loadAndEnablePDFBug(enabled));
     }
 
+    if (waitOn.length === 0) {
+      return undefined;
+    }
+
     return Promise.all(waitOn).catch(reason => {
       console.error(`_parseHashParameters: "${reason.message}".`);
     });
@@ -745,6 +767,41 @@
     document.getElementsByTagName("html")[0].dir = dir;
   },
 
+  _forceCssTheme() {
+    const cssTheme = _app_options.AppOptions.get("viewerCssTheme");
+
+    if (cssTheme === ViewerCssTheme.AUTOMATIC || !Object.values(ViewerCssTheme).includes(cssTheme)) {
+      return;
+    }
+
+    try {
+      const styleSheet = document.styleSheets[0];
+      const cssRules = styleSheet?.cssRules || [];
+
+      for (let i = 0, ii = cssRules.length; i < ii; i++) {
+        const rule = cssRules[i];
+
+        if (rule instanceof CSSMediaRule && rule.media?.[0] === "(prefers-color-scheme: dark)") {
+          if (cssTheme === ViewerCssTheme.LIGHT) {
+            styleSheet.deleteRule(i);
+            return;
+          }
+
+          const darkRules = /^@media \(prefers-color-scheme: dark\) {\n\s*([\w\s-.,:;/\\{}()]+)\n}$/.exec(rule.cssText);
+
+          if (darkRules?.[1]) {
+            styleSheet.deleteRule(i);
+            styleSheet.insertRule(darkRules[1], i);
+          }
+
+          return;
+        }
+      }
+    } catch (reason) {
+      console.error(`_forceCssTheme: "${reason?.message}".`);
+    }
+  },
+
   async _initializeViewerComponents() {
     const appConfig = this.appConfig;
     const eventBus = appConfig.eventBus || new _ui_utils.EventBus({
@@ -1041,7 +1098,10 @@
     this.downloadComplete = false;
     this.url = "";
     this.baseUrl = "";
-    this.contentDispositionFilename = null;
+    this.documentInfo = null;
+    this.metadata = null;
+    this._contentDispositionFilename = null;
+    this._contentLength = null;
     this.triggerDelayedFallback = null;
     this._saveInProgress = false;
 
@@ -1051,6 +1111,23 @@
 
     this._idleCallbacks.clear();
 
+    if (this._scriptingInstance) {
+      const {
+        scripting,
+        events
+      } = this._scriptingInstance;
+
+      try {
+        scripting.destroySandbox();
+      } catch (ex) {}
+
+      for (const [name, listener] of events) {
+        window.removeEventListener(name, listener);
+      }
+
+      this._scriptingInstance = null;
+    }
+
     this.pdfSidebar.reset();
     this.pdfOutlineViewer.reset();
     this.pdfAttachmentViewer.reset();
@@ -1111,13 +1188,7 @@
 
     if (args) {
       for (const key in args) {
-        const value = args[key];
-
-        if (key === "length") {
-          this.pdfDocumentProperties.setFileSize(value);
-        }
-
-        parameters[key] = value;
+        parameters[key] = args[key];
       }
     }
 
@@ -1175,7 +1246,7 @@
     }
 
     const url = this.baseUrl;
-    const filename = this.contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
+    const filename = this._contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
     const downloadManager = this.downloadManager;
 
     downloadManager.onerror = err => {
@@ -1203,7 +1274,7 @@
     }
 
     const url = this.baseUrl;
-    const filename = this.contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
+    const filename = this._contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
     const downloadManager = this.downloadManager;
 
     downloadManager.onerror = err => {
@@ -1512,30 +1583,54 @@
   },
 
   async _initializeJavaScript(pdfDocument) {
-    const objects = await pdfDocument.getFieldObjects();
-
-    if (pdfDocument !== this.pdfDocument) {
+    if (!_app_options.AppOptions.get("enableScripting")) {
       return;
     }
 
-    if (!objects || !_app_options.AppOptions.get("enableScripting")) {
+    const [objects, calculationOrder] = await Promise.all([pdfDocument.getFieldObjects(), pdfDocument.getCalculationOrderIds()]);
+
+    if (!objects || pdfDocument !== this.pdfDocument) {
       return;
     }
 
-    const scripting = this.externalServices.scripting;
     const {
-      info,
-      metadata,
-      contentDispositionFilename
-    } = await pdfDocument.getMetadata();
-    window.addEventListener("updateFromSandbox", event => {
-      const detail = event.detail;
-      const id = detail.id;
+      scripting
+    } = this.externalServices;
+    this._scriptingInstance = {
+      scripting,
+      events: new Map()
+    };
+
+    if (!this.documentInfo) {
+      await new Promise(resolve => {
+        const metadataLoaded = () => {
+          this.eventBus._off("metadataloaded", metadataLoaded);
+
+          resolve();
+        };
+
+        this.eventBus._on("metadataloaded", metadataLoaded);
+      });
+
+      if (pdfDocument !== this.pdfDocument) {
+        return;
+      }
+    }
+
+    const updateFromSandbox = event => {
+      const {
+        detail
+      } = event;
+      const {
+        id,
+        command,
+        value
+      } = detail;
 
       if (!id) {
-        switch (detail.command) {
+        switch (command) {
           case "alert":
-            window.alert(detail.value);
+            window.alert(value);
             break;
 
           case "clear":
@@ -1543,15 +1638,15 @@
             break;
 
           case "error":
-            console.error(detail.value);
+            console.error(value);
             break;
 
           case "layout":
-            this.pdfViewer.spreadMode = apiPageLayoutToSpreadMode(detail.value);
+            this.pdfViewer.spreadMode = apiPageLayoutToSpreadMode(value);
             return;
 
           case "page-num":
-            this.pdfViewer.currentPageNumber = detail.value + 1;
+            this.pdfViewer.currentPageNumber = value + 1;
             return;
 
           case "print":
@@ -1559,14 +1654,14 @@
             return;
 
           case "println":
-            console.log(detail.value);
+            console.log(value);
             break;
 
           case "zoom":
-            if (typeof detail.value === "string") {
-              this.pdfViewer.currentScaleValue = detail.value;
+            if (typeof value === "string") {
+              this.pdfViewer.currentScaleValue = value;
             } else {
-              this.pdfViewer.currentScale = detail.value;
+              this.pdfViewer.currentScale = value;
             }
 
             return;
@@ -1582,31 +1677,52 @@
           detail
         }));
       } else {
-        const value = detail.value;
-
         if (value !== undefined && value !== null) {
-          pdfDocument.annotationStorage.setValue(id, detail.value);
+          pdfDocument.annotationStorage.setValue(id, value);
         }
       }
-    });
-    window.addEventListener("dispatchEventInSandbox", function (event) {
+    };
+
+    window.addEventListener("updateFromSandbox", updateFromSandbox);
+
+    this._scriptingInstance.events.set("updateFromSandbox", updateFromSandbox);
+
+    const dispatchEventInSandbox = event => {
       scripting.dispatchEventInSandbox(event.detail);
-    });
+    };
+
+    window.addEventListener("dispatchEventInSandbox", dispatchEventInSandbox);
+
+    this._scriptingInstance.events.set("dispatchEventInSandbox", dispatchEventInSandbox);
+
     const dispatchEventName = (0, _ui_utils.generateRandomStringForSandbox)(objects);
-    const calculationOrder = [];
-    const {
-      length
-    } = await pdfDocument.getDownloadInfo();
-    const filename = contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
+
+    if (!this._contentLength) {
+      const {
+        length
+      } = await pdfDocument.getDownloadInfo();
+
+      if (pdfDocument !== this.pdfDocument) {
+        return;
+      }
+
+      this._contentLength = length;
+    }
+
+    const filename = this._contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
     scripting.createSandbox({
       objects,
       dispatchEventName,
       calculationOrder,
-      docInfo: { ...info,
+      appInfo: {
+        platform: navigator.platform,
+        language: navigator.language
+      },
+      docInfo: { ...this.documentInfo,
         baseURL: this.baseUrl,
-        filesize: length,
+        filesize: this._contentLength,
         filename,
-        metadata,
+        metadata: this.metadata,
         numPages: pdfDocument.numPages,
         URL: this.url
       }
@@ -1674,7 +1790,8 @@
     const {
       info,
       metadata,
-      contentDispositionFilename
+      contentDispositionFilename,
+      contentLength
     } = await pdfDocument.getMetadata();
 
     if (pdfDocument !== this.pdfDocument) {
@@ -1683,7 +1800,8 @@
 
     this.documentInfo = info;
     this.metadata = metadata;
-    this.contentDispositionFilename = contentDispositionFilename;
+    this._contentDispositionFilename = contentDispositionFilename;
+    this._contentLength = contentLength;
     console.log(`PDF ${pdfDocument.fingerprint} [${info.PDFFormatVersion} ` + `${(info.Producer || "-").trim()} / ${(info.Creator || "-").trim()}] ` + `(PDF.js: ${_pdfjsLib.version || "-"}` + `${this.pdfViewer.enableWebGL ? " [WebGL]" : ""})`);
     let pdfTitle;
     const infoTitle = info && info.Title;
@@ -1750,6 +1868,9 @@
       generator: generatorId,
       formType
     });
+    this.eventBus.dispatch("metadataloaded", {
+      source: this
+    });
   },
 
   async _initializePageLabels(pdfDocument) {
@@ -5348,7 +5469,7 @@
     });
   }
 
-  open() {
+  async open() {
     const freezeFieldData = data => {
       Object.defineProperty(this, "fieldData", {
         value: Object.freeze(data),
@@ -5358,64 +5479,58 @@
       });
     };
 
-    Promise.all([this.overlayManager.open(this.overlayName), this._dataAvailableCapability.promise]).then(() => {
-      const currentPageNumber = this._currentPageNumber;
-      const pagesRotation = this._pagesRotation;
-
-      if (this.fieldData && currentPageNumber === this.fieldData._currentPageNumber && pagesRotation === this.fieldData._pagesRotation) {
-        this._updateUI();
+    await Promise.all([this.overlayManager.open(this.overlayName), this._dataAvailableCapability.promise]);
+    const currentPageNumber = this._currentPageNumber;
+    const pagesRotation = this._pagesRotation;
 
-        return;
-      }
+    if (this.fieldData && currentPageNumber === this.fieldData._currentPageNumber && pagesRotation === this.fieldData._pagesRotation) {
+      this._updateUI();
 
-      this.pdfDocument.getMetadata().then(({
-        info,
-        metadata,
-        contentDispositionFilename
-      }) => {
-        return Promise.all([info, metadata, contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url), this._parseFileSize(this.maybeFileSize), this._parseDate(info.CreationDate), this._parseDate(info.ModDate), this.pdfDocument.getPage(currentPageNumber).then(pdfPage => {
-          return this._parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage), pagesRotation);
-        }), this._parseLinearization(info.IsLinearized)]);
-      }).then(([info, metadata, fileName, fileSize, creationDate, modDate, pageSize, isLinearized]) => {
-        freezeFieldData({
-          fileName,
-          fileSize,
-          title: info.Title,
-          author: info.Author,
-          subject: info.Subject,
-          keywords: info.Keywords,
-          creationDate,
-          modificationDate: modDate,
-          creator: info.Creator,
-          producer: info.Producer,
-          version: info.PDFFormatVersion,
-          pageCount: this.pdfDocument.numPages,
-          pageSize,
-          linearized: isLinearized,
-          _currentPageNumber: currentPageNumber,
-          _pagesRotation: pagesRotation
-        });
+      return;
+    }
 
-        this._updateUI();
+    const {
+      info,
+      contentDispositionFilename,
+      contentLength
+    } = await this.pdfDocument.getMetadata();
+    const [fileName, fileSize, creationDate, modificationDate, pageSize, isLinearized] = await Promise.all([contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url), this._parseFileSize(contentLength), this._parseDate(info.CreationDate), this._parseDate(info.ModDate), this.pdfDocument.getPage(currentPageNumber).then(pdfPage => {
+      return this._parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage), pagesRotation);
+    }), this._parseLinearization(info.IsLinearized)]);
+    freezeFieldData({
+      fileName,
+      fileSize,
+      title: info.Title,
+      author: info.Author,
+      subject: info.Subject,
+      keywords: info.Keywords,
+      creationDate,
+      modificationDate,
+      creator: info.Creator,
+      producer: info.Producer,
+      version: info.PDFFormatVersion,
+      pageCount: this.pdfDocument.numPages,
+      pageSize,
+      linearized: isLinearized,
+      _currentPageNumber: currentPageNumber,
+      _pagesRotation: pagesRotation
+    });
 
-        return this.pdfDocument.getDownloadInfo();
-      }).then(({
-        length
-      }) => {
-        this.maybeFileSize = length;
-        return this._parseFileSize(length);
-      }).then(fileSize => {
-        if (fileSize === this.fieldData.fileSize) {
-          return;
-        }
+    this._updateUI();
 
-        const data = Object.assign(Object.create(null), this.fieldData);
-        data.fileSize = fileSize;
-        freezeFieldData(data);
+    const {
+      length
+    } = await this.pdfDocument.getDownloadInfo();
 
-        this._updateUI();
-      });
-    });
+    if (contentLength === length) {
+      return;
+    }
+
+    const data = Object.assign(Object.create(null), this.fieldData);
+    data.fileSize = await this._parseFileSize(length);
+    freezeFieldData(data);
+
+    this._updateUI();
   }
 
   close() {
@@ -5439,16 +5554,9 @@
     this._dataAvailableCapability.resolve();
   }
 
-  setFileSize(fileSize) {
-    if (Number.isInteger(fileSize) && fileSize > 0) {
-      this.maybeFileSize = fileSize;
-    }
-  }
-
   _reset() {
     this.pdfDocument = null;
     this.url = null;
-    this.maybeFileSize = 0;
     delete this.fieldData;
     this._dataAvailableCapability = (0, _pdfjsLib.createPromiseCapability)();
     this._currentPageNumber = 1;
@@ -5667,7 +5775,6 @@
   }
 
   updateUIState(state, previous, matchesCount) {
-    let notFound = false;
     let findMsg = "";
     let status = "";
 
@@ -5681,7 +5788,7 @@
 
       case _pdf_find_controller.FindState.NOT_FOUND:
         findMsg = this.l10n.get("find_not_found", null, "Phrase not found");
-        notFound = true;
+        status = "notFound";
         break;
 
       case _pdf_find_controller.FindState.WRAPPED:
@@ -5694,7 +5801,6 @@
         break;
     }
 
-    this.findField.classList.toggle("notFound", notFound);
     this.findField.setAttribute("data-status", status);
     Promise.resolve(findMsg).then(msg => {
       this.findMsg.textContent = msg;
@@ -7709,6 +7815,10 @@
     return this.pdfViewer.isPageVisible(pageNumber);
   }
 
+  isPageCached(pageNumber) {
+    return this.pdfViewer.isPageCached(pageNumber);
+  }
+
 }
 
 exports.PDFLinkService = PDFLinkService;
@@ -7829,6 +7939,10 @@
     return true;
   }
 
+  isPageCached(pageNumber) {
+    return true;
+  }
+
 }
 
 exports.SimpleLinkService = SimpleLinkService;
@@ -8554,6 +8668,8 @@
 
 var _pdf_thumbnail_view = __webpack_require__(25);
 
+var _pdf_rendering_queue = __webpack_require__(8);
+
 const THUMBNAIL_SCROLL_MARGIN = -19;
 const THUMBNAIL_SELECTED_CLASS = "selected";
 
@@ -8668,7 +8784,13 @@
   }
 
   cleanup() {
-    _pdf_thumbnail_view.PDFThumbnailView.cleanup();
+    for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
+      if (this._thumbnails[i] && this._thumbnails[i].renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
+        this._thumbnails[i].reset();
+      }
+    }
+
+    _pdf_thumbnail_view.TempImageFactory.destroyCanvas();
   }
 
   _resetView() {
@@ -8823,7 +8945,7 @@
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.PDFThumbnailView = void 0;
+exports.TempImageFactory = exports.PDFThumbnailView = void 0;
 
 var _ui_utils = __webpack_require__(4);
 
@@ -8873,6 +8995,8 @@
   };
 }();
 
+exports.TempImageFactory = TempImageFactory;
+
 class PDFThumbnailView {
   constructor({
     container,
@@ -9004,7 +9128,7 @@
     this.resume = null;
   }
 
-  _getPageDrawContext(noCtxScale = false) {
+  _getPageDrawContext() {
     const canvas = document.createElement("canvas");
     this.canvas = canvas;
     canvas.mozOpaque = true;
@@ -9016,12 +9140,8 @@
     canvas.height = this.canvasHeight * outputScale.sy | 0;
     canvas.style.width = this.canvasWidth + "px";
     canvas.style.height = this.canvasHeight + "px";
-
-    if (!noCtxScale && outputScale.scaled) {
-      ctx.scale(outputScale.sx, outputScale.sy);
-    }
-
-    return ctx;
+    const transform = outputScale.scaled ? [outputScale.sx, 0, 0, outputScale.sy, 0, 0] : null;
+    return [ctx, transform];
   }
 
   _convertCanvasToImage() {
@@ -9100,7 +9220,7 @@
       }
     };
 
-    const ctx = this._getPageDrawContext();
+    const [ctx, transform] = this._getPageDrawContext();
 
     const drawViewport = this.viewport.clone({
       scale: this.scale
@@ -9123,6 +9243,7 @@
 
     const renderContext = {
       canvasContext: ctx,
+      transform,
       viewport: drawViewport,
       optionalContentConfigPromise: this._optionalContentConfigPromise
     };
@@ -9133,6 +9254,15 @@
     }, function (error) {
       finishRenderTask(error);
     });
+    resultPromise.finally(() => {
+      const pageCached = this.linkService.isPageCached(this.id);
+
+      if (pageCached) {
+        return;
+      }
+
+      this.pdfPage?.cleanup();
+    });
     return resultPromise;
   }
 
@@ -9157,7 +9287,7 @@
 
     this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
 
-    const ctx = this._getPageDrawContext(true);
+    const [ctx] = this._getPageDrawContext();
 
     const canvas = ctx.canvas;
 
@@ -9224,10 +9354,6 @@
     });
   }
 
-  static cleanup() {
-    TempImageFactory.destroyCanvas();
-  }
-
 }
 
 exports.PDFThumbnailView = PDFThumbnailView;
@@ -9381,6 +9507,10 @@
       data.shift().destroy();
     }
   };
+
+  this.has = function (view) {
+    return data.includes(view);
+  };
 }
 
 function isSameScale(oldScale, newScale) {
@@ -9401,7 +9531,7 @@
       throw new Error("Cannot initialize BaseViewer.");
     }
 
-    const viewerVersion = '2.7.262';
+    const viewerVersion = '2.7.345';
 
     if (_pdfjsLib.version !== viewerVersion) {
       throw new Error(`The API version "${_pdfjsLib.version}" does not match the Viewer version "${viewerVersion}".`);
@@ -9649,7 +9779,6 @@
 
     const pagesCount = pdfDocument.numPages;
     const firstPagePromise = pdfDocument.getPage(1);
-    const annotationStorage = pdfDocument.annotationStorage;
     const optionalContentConfigPromise = pdfDocument.getOptionalContentConfig();
 
     this._pagesCapability.promise.then(() => {
@@ -9702,7 +9831,6 @@
           id: pageNum,
           scale,
           defaultViewport: viewport.clone(),
-          annotationStorage,
           optionalContentConfigPromise,
           renderingQueue: this.renderingQueue,
           textLayerFactory,
@@ -10232,8 +10360,8 @@
       return false;
     }
 
-    if (pageNumber < 1 || pageNumber > this.pagesCount) {
-      console.error(`${this._name}.isPageVisible: "${pageNumber}" is out of bounds.`);
+    if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
+      console.error(`${this._name}.isPageVisible: "${pageNumber}" is not a valid page.`);
       return false;
     }
 
@@ -10242,6 +10370,25 @@
     });
   }
 
+  isPageCached(pageNumber) {
+    if (!this.pdfDocument || !this._buffer) {
+      return false;
+    }
+
+    if (!(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.pagesCount)) {
+      console.error(`${this._name}.isPageCached: "${pageNumber}" is not a valid page.`);
+      return false;
+    }
+
+    const pageView = this._pages[pageNumber - 1];
+
+    if (!pageView) {
+      return false;
+    }
+
+    return this._buffer.has(pageView);
+  }
+
   cleanup() {
     for (let i = 0, ii = this._pages.length; i < ii; i++) {
       if (this._pages[i] && this._pages[i].renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
@@ -10314,18 +10461,18 @@
     });
   }
 
-  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = false, l10n = _ui_utils.NullL10n, enableScripting = false) {
+  createAnnotationLayerBuilder(pageDiv, pdfPage, annotationStorage = null, imageResourcesPath = "", renderInteractiveForms = false, l10n = _ui_utils.NullL10n, enableScripting = false, hasJSActionsPromise = null) {
     return new _annotation_layer_builder.AnnotationLayerBuilder({
       pageDiv,
       pdfPage,
-      annotationStorage,
+      annotationStorage: annotationStorage || this.pdfDocument?.annotationStorage,
       imageResourcesPath,
       renderInteractiveForms,
       linkService: this.linkService,
       downloadManager: this.downloadManager,
       l10n,
       enableScripting,
-      hasJSActionsPromise: enableScripting ? this.pdfDocument.hasJSActions() : Promise.resolve(false)
+      hasJSActionsPromise: hasJSActionsPromise || this.pdfDocument?.hasJSActions()
     });
   }
 
@@ -10672,7 +10819,6 @@
     this.scale = options.scale || _ui_utils.DEFAULT_SCALE;
     this.viewport = defaultViewport;
     this.pdfPageRotate = defaultViewport.rotation;
-    this._annotationStorage = options.annotationStorage || null;
     this._optionalContentConfigPromise = options.optionalContentConfigPromise || null;
     this.hasRestrictedScaling = false;
     this.textLayerMode = Number.isInteger(options.textLayerMode) ? options.textLayerMode : _ui_utils.TextLayerMode.ENABLE;
@@ -11091,7 +11237,7 @@
 
     if (this.annotationLayerFactory) {
       if (!this.annotationLayer) {
-        this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, this._annotationStorage, this.imageResourcesPath, this.renderInteractiveForms, this.l10n, this.enableScripting);
+        this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, null, this.imageResourcesPath, this.renderInteractiveForms, this.l10n, this.enableScripting, null);
       }
 
       this._renderAnnotationLayer();
@@ -12649,7 +12795,7 @@
     FirefoxCom.requestSync("createSandbox", data);
   }
 
-  static dispatchEventInSandbox(event, sandboxID) {
+  static dispatchEventInSandbox(event) {
     FirefoxCom.requestSync("dispatchEventInSandbox", event);
   }
 
@@ -12919,57 +13065,45 @@
 
 var _app_options = __webpack_require__(1);
 
-let defaultPreferences = null;
-
-function getDefaultPreferences() {
-  if (!defaultPreferences) {
-    defaultPreferences = Promise.resolve({
-      "cursorToolOnLoad": 0,
-      "defaultZoomValue": "",
-      "disablePageLabels": false,
-      "enablePermissions": false,
-      "enablePrintAutoRotate": false,
-      "enableScripting": false,
-      "enableWebGL": false,
-      "externalLinkTarget": 0,
-      "historyUpdateUrl": false,
-      "ignoreDestinationZoom": false,
-      "pdfBugEnabled": false,
-      "renderer": "canvas",
-      "renderInteractiveForms": true,
-      "sidebarViewOnLoad": -1,
-      "scrollModeOnLoad": -1,
-      "spreadModeOnLoad": -1,
-      "textLayerMode": 1,
-      "useOnlyCssZoom": false,
-      "viewOnLoad": 0,
-      "disableAutoFetch": false,
-      "disableFontFace": false,
-      "disableRange": false,
-      "disableStream": false
-    });
-  }
-
-  return defaultPreferences;
-}
-
 class BasePreferences {
   constructor() {
     if (this.constructor === BasePreferences) {
       throw new Error("Cannot initialize BasePreferences.");
     }
 
-    this.prefs = null;
-    this._initializedPromise = getDefaultPreferences().then(defaults => {
-      Object.defineProperty(this, "defaults", {
-        value: Object.freeze(defaults),
-        writable: false,
-        enumerable: true,
-        configurable: false
-      });
-      this.prefs = Object.assign(Object.create(null), defaults);
-      return this._readFromStorage(defaults);
-    }).then(prefs => {
+    Object.defineProperty(this, "defaults", {
+      value: Object.freeze({
+        "cursorToolOnLoad": 0,
+        "defaultZoomValue": "",
+        "disablePageLabels": false,
+        "enablePermissions": false,
+        "enablePrintAutoRotate": false,
+        "enableScripting": false,
+        "enableWebGL": false,
+        "externalLinkTarget": 0,
+        "historyUpdateUrl": false,
+        "ignoreDestinationZoom": false,
+        "pdfBugEnabled": false,
+        "renderer": "canvas",
+        "renderInteractiveForms": true,
+        "sidebarViewOnLoad": -1,
+        "scrollModeOnLoad": -1,
+        "spreadModeOnLoad": -1,
+        "textLayerMode": 1,
+        "useOnlyCssZoom": false,
+        "viewerCssTheme": 0,
+        "viewOnLoad": 0,
+        "disableAutoFetch": false,
+        "disableFontFace": false,
+        "disableRange": false,
+        "disableStream": false
+      }),
+      writable: false,
+      enumerable: true,
+      configurable: false
+    });
+    this.prefs = Object.assign(Object.create(null), this.defaults);
+    this._initializedPromise = this._readFromStorage(this.defaults).then(prefs => {
       if (!prefs) {
         return;
       }
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/moz.yaml firefox-85.0+build1/toolkit/components/pdfjs/moz.yaml
--- firefox-84.0.2+build1/toolkit/components/pdfjs/moz.yaml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/moz.yaml	2021-01-18 19:58:26.000000000 +0000
@@ -20,7 +20,7 @@
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: version 2.7.262
+  release: version 2.7.345
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/README.mozilla firefox-85.0+build1/toolkit/components/pdfjs/README.mozilla
--- firefox-84.0.2+build1/toolkit/components/pdfjs/README.mozilla	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/README.mozilla	2021-01-18 19:58:26.000000000 +0000
@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 2.7.262
+Current extension version is: 2.7.345
 
-Taken from upstream commit: 85de01e34
+Taken from upstream commit: b194c820b
diff -Nru firefox-84.0.2+build1/toolkit/components/pdfjs/test/browser_pdfjs_notification_close_on_navigation.js firefox-85.0+build1/toolkit/components/pdfjs/test/browser_pdfjs_notification_close_on_navigation.js
--- firefox-84.0.2+build1/toolkit/components/pdfjs/test/browser_pdfjs_notification_close_on_navigation.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pdfjs/test/browser_pdfjs_notification_close_on_navigation.js	2021-01-18 19:58:27.000000000 +0000
@@ -32,7 +32,7 @@
         "Notification should be pdfjs-fallback"
       );
 
-      await BrowserTestUtils.loadURI(browser, "https://example.com");
+      BrowserTestUtils.loadURI(browser, "https://example.com");
 
       await TestUtils.waitForCondition(
         () => !notification.parentNode,
diff -Nru firefox-84.0.2+build1/toolkit/components/perfmonitoring/PerformanceUtils.cpp firefox-85.0+build1/toolkit/components/perfmonitoring/PerformanceUtils.cpp
--- firefox-84.0.2+build1/toolkit/components/perfmonitoring/PerformanceUtils.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/perfmonitoring/PerformanceUtils.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -4,21 +4,19 @@
  * 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 "nsThreadUtils.h"
 #include "mozilla/PerformanceUtils.h"
-#include "mozilla/ResultExtensions.h"
+
+#include "mozilla/dom/DOMTypes.h"
 #include "mozilla/dom/DocGroup.h"
-#include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/BrowsingContextGroup.h"
-#include "mozilla/dom/ContentChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/WorkerDebugger.h"
 #include "mozilla/dom/WorkerDebuggerManager.h"
 
 #include "MediaDecoder.h"
-#include "XPCJSMemoryReporter.h"
 #include "jsfriendapi.h"
-#include "js/MemoryMetrics.h"
-#include "nsWindowMemoryReporter.h"
+#include "nsGlobalWindowOuter.h"
+#include "nsWindowSizes.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -84,37 +82,73 @@
   aSizes->mOther += sizes.mOther;
 }
 
-nsresult GetTabSizes(nsGlobalWindowOuter* aWindow, nsTabSizes* aSizes) {
-  // Add the window (and inner window) sizes. Might be cached.
-  AddWindowTabSizes(aWindow, aSizes);
-
-  BrowsingContext* bc = aWindow->GetBrowsingContext();
-  if (!bc) {
+nsresult GetTabSizes(BrowsingContext* aContext, nsTabSizes* aSizes) {
+  if (!aContext) {
     return NS_OK;
   }
 
+  // Add the window (and inner window) sizes. Might be cached.
+  nsGlobalWindowOuter* window =
+      nsGlobalWindowOuter::Cast(aContext->GetDOMWindow());
+  if (window) {
+    AddWindowTabSizes(window, aSizes);
+  }
+
   // Measure this window's descendents.
-  for (const auto& frame : bc->Children()) {
-    if (auto* childWin = nsGlobalWindowOuter::Cast(frame->GetDOMWindow())) {
-      MOZ_TRY(GetTabSizes(childWin, aSizes));
-    }
+  for (const auto& child : aContext->Children()) {
+    MOZ_TRY(GetTabSizes(child, aSizes));
   }
   return NS_OK;
 }
 
 RefPtr<MemoryPromise> CollectMemoryInfo(
-    const nsCOMPtr<nsPIDOMWindowOuter>& aWindow,
+    const RefPtr<DocGroup>& aDocGroup,
+    const RefPtr<AbstractThread>& aEventTarget) {
+  // Getting Dom sizes. -- XXX should we reimplement GetTabSizes to async here ?
+  nsTabSizes sizes;
+
+  for (const auto& document : *aDocGroup) {
+    nsGlobalWindowOuter* window =
+        document ? nsGlobalWindowOuter::Cast(document->GetWindow()) : nullptr;
+    if (window) {
+      AddWindowTabSizes(window, &sizes);
+    }
+  }
+
+  BrowsingContextGroup* group = aDocGroup->GetBrowsingContextGroup();
+  // Getting GC Heap Usage
+  uint64_t GCHeapUsage = 0;
+  JSObject* object = group->GetWrapper();
+  if (object != nullptr) {
+    GCHeapUsage = js::GetGCHeapUsageForObjectZone(object);
+  }
+
+  // Getting Media sizes.
+  return GetMediaMemorySizes()->Then(
+      aEventTarget, __func__,
+      [GCHeapUsage, sizes](const MediaMemoryInfo& media) {
+        return MemoryPromise::CreateAndResolve(
+            PerformanceMemoryInfo(media, sizes.mDom, sizes.mStyle, sizes.mOther,
+                                  GCHeapUsage),
+            __func__);
+      },
+      [](const nsresult rv) {
+        return MemoryPromise::CreateAndReject(rv, __func__);
+      });
+}
+
+RefPtr<MemoryPromise> CollectMemoryInfo(
+    const RefPtr<BrowsingContext>& aContext,
     const RefPtr<AbstractThread>& aEventTarget) {
   // Getting Dom sizes. -- XXX should we reimplement GetTabSizes to async here ?
-  nsGlobalWindowOuter* window = nsGlobalWindowOuter::Cast(aWindow);
   nsTabSizes sizes;
-  nsresult rv = GetTabSizes(window, &sizes);
+  nsresult rv = GetTabSizes(aContext, &sizes);
   if (NS_FAILED(rv)) {
     return MemoryPromise::CreateAndReject(rv, __func__);
   }
 
   // Getting GC Heap Usage
-  JSObject* obj = window->GetGlobalJSObject();
+  JSObject* obj = aContext->GetWrapper();
   uint64_t GCHeapUsage = 0;
   if (obj != nullptr) {
     GCHeapUsage = js::GetGCHeapUsageForObjectZone(obj);
diff -Nru firefox-84.0.2+build1/toolkit/components/perfmonitoring/PerformanceUtils.h firefox-85.0+build1/toolkit/components/perfmonitoring/PerformanceUtils.h
--- firefox-84.0.2+build1/toolkit/components/perfmonitoring/PerformanceUtils.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/perfmonitoring/PerformanceUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,7 +11,10 @@
 class nsPIDOMWindowOuter;
 
 namespace mozilla {
-
+namespace dom {
+class BrowsingContext;
+class DocGroup;
+}  // namespace dom
 /**
  * Returns an array of promises to asynchronously collect all performance
  * info in the current process.
@@ -22,7 +25,11 @@
  * Asynchronously collects memory info for a given window
  */
 RefPtr<MemoryPromise> CollectMemoryInfo(
-    const nsCOMPtr<nsPIDOMWindowOuter>& aWindow,
+    const RefPtr<dom::BrowsingContext>& aContext,
+    const RefPtr<AbstractThread>& aEventTarget);
+
+RefPtr<MemoryPromise> CollectMemoryInfo(
+    const RefPtr<dom::DocGroup>& aDocGroup,
     const RefPtr<AbstractThread>& aEventTarget);
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/content/player.js firefox-85.0+build1/toolkit/components/pictureinpicture/content/player.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/content/player.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/content/player.js	2021-01-18 19:58:26.000000000 +0000
@@ -162,16 +162,6 @@
       });
     }, RESIZE_DEBOUNCE_RATE_MS);
 
-    this.lastScreenX = window.screenX;
-    this.lastScreenY = window.screenY;
-
-    this.recordEvent("create", {
-      width: window.outerWidth.toString(),
-      height: window.outerHeight.toString(),
-      screenX: window.screenX.toString(),
-      screenY: window.screenY.toString(),
-    });
-
     this.computeAndSetMinimumSize(window.outerWidth, window.outerHeight);
 
     // alwaysontop windows are not focused by default, so we have to do it
@@ -179,6 +169,17 @@
     // window is visible before it can focus.
     window.requestAnimationFrame(() => {
       window.focus();
+      // wait until the video is focused before recording the telemetry becuase
+      // the window will sometimes give the wrong X and Y before being focused
+      this.recordEvent("create", {
+        width: window.outerWidth.toString(),
+        height: window.outerHeight.toString(),
+        screenX: window.screenX.toString(),
+        screenY: window.screenY.toString(),
+      });
+
+      this.lastScreenX = window.screenX;
+      this.lastScreenY = window.screenY;
     });
   },
 
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/docs/PiP-diagram.svg firefox-85.0+build1/toolkit/components/pictureinpicture/docs/PiP-diagram.svg
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/docs/PiP-diagram.svg	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/docs/PiP-diagram.svg	2021-01-18 19:58:26.000000000 +0000
@@ -1,4 +1,4 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" style="background-color:#fff" xmlns:xlink="http://www.w3.org/1999/xlink" width="1241" height="1190" viewBox="-0.5 -0.5 1241 1190"><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M0 860h390v280H0z"/><path d="M290 1015h270v165h491l-.01-10.94" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M1050.99 1162.31l4.51 9-4.51-2.25-4.49 2.26z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path fill="none" stroke="#000" pointer-events="all" d="M80 950h210v130H80z"/><path d="M0 0h480v340H0z" fill="#ffe6cc" stroke="#d79b00" stroke-miterlimit="10" pointer-events="all"/><circle cx="415" cy="15" fill="transparent" stroke="#d79b00" pointer-events="all" r="10"/><circle cx="440" cy="15" fill="transparent" stroke="#d79b00" pointer-events="all" r="10"/><circle cx="465" cy="15" fill="transparent" stroke="#008cff" pointer-events="all" r="10"/><path d="M0 40h30V15c0-2.76 2.24-5 5-5h135c2.76 0 5 2.24 5 5v25h305M0 110h480M100 60c0-2.76 2.24-5 5-5h360c2.76 0 5 2.24 5 5v25c0 2.76-2.24 5-5 5H105c-2.76 0-5-2.24-5-5z" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M37 17h11l4 4v14H37z" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M48 17v4l4 1" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M107 64h11l4 4v14h-15z" fill="none" stroke="#c4c4c4" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/><path d="M118 64v4l4 1" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M12 74l10-10v6h10v8H22v6zM62 74L52 64v6H42v8h10v6zM87.6 77.3a6 6 0 01-8.22 2.06c-2.84-1.69-3.77-5.36-2.09-8.21 1.69-2.84 5.36-3.79 8.21-2.11l-1.6 1.46 7.9 1.8-1.8-7.5-1.7 1.6a9.816 9.816 0 00-10.91-.53 9.799 9.799 0 00-4.62 9.89c.6 3.93 3.53 7.1 7.39 8.03 3.87.93 7.91-.57 10.24-3.79z" fill="#c4c4c4" stroke="#c4c4c4" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:25px;margin-left:62px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:17px;font-family:Helvetica;color:#666;line-height:1.2;pointer-events:all;white-space:nowrap"><div>Twitch</div></div></div></div></foreignObject><text x="62" y="30" fill="#666" font-family="Helvetica" font-size="17">Twitch</text></switch><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:73px;margin-left:132px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:17px;font-family:Helvetica;color:#666;line-height:1.2;pointer-events:all;white-space:nowrap"><div>https://www.twitch.tv</div></div></div></div></foreignObject><text x="132" y="78" fill="#666" font-family="Helvetica" font-size="17">https://www.twitch.tv</text></switch><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M0 110h480v230H0z"/><path d="M78.08 315c-3.08 0-5.58-2.3-5.58-5.14V140.14c0-2.84 2.5-5.14 5.58-5.14h323.84c3.08 0 5.58 2.3 5.58 5.14v169.72c0 2.84-2.5 5.14-5.58 5.14z" fill="#f66" pointer-events="all"/><path d="M221.65 267.98l44.66-23.6-44.66-23.44zm-39.3 24.5c-4.07 0-7.3-3.53-7.3-6.75v-82.85c0-3.8 3.8-6.79 7.29-6.79h114.89c5.16 0 7.72 3.99 7.72 6.76v82.78c0 3.57-3.4 6.85-7.44 6.85zM75.29 176.14v133.72c0 1.42 1.25 2.57 2.79 2.57h323.84c1.54 0 2.79-1.15 2.79-2.57V176.14z" fill-opacity=".5" fill="#fff" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe center;width:1px;height:1px;padding-top:136px;margin-left:240px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#fff;line-height:1.2;pointer-events:all;white-space:nowrap">Video</div></div></div></foreignObject><text x="240" y="148" fill="#FFF" font-family="Helvetica" font-size="12" text-anchor="middle">Video</text></switch><path fill="#08f" stroke="#000" pointer-events="all" d="M387.5 225h20v20h-20z"/><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M0 420h710v380H0z"/><path fill="none" pointer-events="all" d="M0 420h200v30H0z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:423px;margin-left:2px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>Content process hosting the video</div><div><br/></div></div></div></div></foreignObject><text x="2" y="435" font-family="Helvetica" font-size="12">Content process hosting the video</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M230 450h180v80H230z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:490px;margin-left:231px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">videocontrols.js</div></div></div></foreignObject><text x="320" y="494" font-family="Helvetica" font-size="12" text-anchor="middle">videocontrols.js</text></switch><path d="M407.5 235h10q10 0 10 10v92.5q0 10-10 10H220q-10 0-10 10V480q0 10 10 10h10M175 630v69.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M175 706.65l-4.5-9 4.5 2.25 4.5-2.25z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:670px;margin-left:175px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:11px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">MozTogglePictureInPicture chrome event</div></div></div></foreignObject><text x="175" y="673" font-family="Helvetica" font-size="11" text-anchor="middle">MozTogglePictureInPicture chrome event</text></switch><path d="M50 585H30v245h195v119.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M225 956.65l-4.5-9 4.5 2.25 4.5-2.25z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:831px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">JSWindowActor messaging</div></div></div></foreignObject><text x="91" y="834" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor messaging</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M50 540h250v90H50z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:585px;margin-left:51px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureToggleChild</div></div></div></foreignObject><text x="175" y="589" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureToggleChild</text></switch><path d="M300 750h20v290h-39.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M273.35 1040l9-4.5-2.25 4.5 2.25 4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:833px;margin-left:319px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">JSWindowActor messaging</div></div></div></foreignObject><text x="319" y="836" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor messaging</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M50 710h250v80H50z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:750px;margin-left:51px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal"><div>PictureInPictureChild for originating</div><div>&lt;video&gt;</div></div></div></div></foreignObject><text x="175" y="754" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureChild for originating...</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M430 680h250v80H430z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:720px;margin-left:431px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureChild for player &lt;video&gt;</div></div></div></foreignObject><text x="555" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureChild for player &lt;video&gt;</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M90 960h180v40H90z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:980px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureToggleParent</div></div></div></foreignObject><text x="180" y="984" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureToggleParent</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M90 1020h180v40H90z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:1040px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureParent</div></div></div></foreignObject><text x="180" y="1044" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureParent</text></switch><path fill="none" pointer-events="all" d="M80 930h120v30H80z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:933px;margin-left:82px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>PictureInPicture.jsm</div><div><br/></div></div></div></div></foreignObject><text x="82" y="945" font-family="Helvetica" font-size="12">PictureInPicture.jsm</text></switch><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M830 640h410v520H830z"/><path fill="none" pointer-events="all" d="M0 860h100v20H0z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:863px;margin-left:2px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap">Parent process</div></div></div></foreignObject><text x="2" y="875" font-family="Helvetica" font-size="12">Parent process</text></switch><path fill="none" pointer-events="all" d="M840 650h250v20H840z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:653px;margin-left:842px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap">player.xhtml / player.js - alwaysontop window</div></div></div></foreignObject><text x="842" y="665" font-family="Helvetica" font-size="12">player.xhtml / player.js - alwaysontop wi...</text></switch><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M840 920h390v230H840z"/><path fill="none" pointer-events="all" d="M850 920h340v30H850z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:923px;margin-left:852px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>remote &lt;xul:browser&gt; running in the same content process as</div><div>original video</div></div></div></div></foreignObject><text x="852" y="935" font-family="Helvetica" font-size="12">remote &lt;xul:browser&gt; running in the same content process...</text></switch><path d="M865.58 1125c-1.48 0-2.9-.47-3.94-1.3-1.05-.83-1.64-1.95-1.64-3.13V974.43c0-1.18.59-2.3 1.64-3.13 1.04-.83 2.46-1.3 3.94-1.3h323.84c1.48 0 2.9.47 3.94 1.3 1.05.83 1.64 1.95 1.64 3.13v146.14c0 1.18-.59 2.3-1.64 3.13-1.04.83-2.46 1.3-3.94 1.3z" fill="#f66" pointer-events="all"/><path d="M1009.15 1084.51l44.66-20.32-44.66-20.19zm-39.3 21.1c-4.07 0-7.3-3.04-7.3-5.82v-71.34c0-3.27 3.8-5.84 7.29-5.84h114.89c5.16 0 7.72 3.43 7.72 5.82v71.28c0 3.08-3.4 5.9-7.44 5.9zm-107.06-100.18v115.14c0 .59.3 1.15.82 1.57.52.41 1.23.65 1.97.65h323.84c.74 0 1.45-.24 1.97-.65.52-.42.82-.98.82-1.57v-115.14z" fill-opacity=".5" fill="#fff" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe center;width:1px;height:1px;padding-top:971px;margin-left:1028px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#fff;line-height:1.2;pointer-events:all;white-space:nowrap">Player video</div></div></div></foreignObject><text x="1028" y="983" fill="#FFF" font-family="Helvetica" font-size="12" text-anchor="middle">Player video</text></switch><path d="M915 720H690.1" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M683.35 720l9-4.5-2.25 4.5 2.25 4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:721px;margin-left:771px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap"><div>JSWindowActor</div><div>Messaging<br/></div></div></div></div></foreignObject><text x="771" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor...</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M915 700h180v40H915z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:720px;margin-left:916px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureParent</div></div></div></foreignObject><text x="1005" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureParent</text></switch><path d="M555 760h215v287.5h79.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M856.65 1047.5l-9 4.5 2.25-4.5-2.25-4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch><a transform="translate(0 -5)" xlink:href="https://desk.draw.io/support/solutions/articles/16000042487" target="_blank"><text text-anchor="middle" font-size="10" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" style="background-color:#fff" xmlns:xlink="http://www.w3.org/1999/xlink" width="1241" height="1169" viewBox="-0.5 -0.5 1241 1169"><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M0 860h390v280H0z"/><path d="M290 1070v20h761l-.01 58.86" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M1050.99 1155.61l-4.5-9 4.5 2.25 4.5-2.25z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path fill="none" stroke="#000" pointer-events="all" d="M80 960h210v110H80z"/><path d="M0 0h480v340H0z" fill="#ffe6cc" stroke="#d79b00" stroke-miterlimit="10" pointer-events="all"/><circle cx="415" cy="15" fill="transparent" stroke="#d79b00" pointer-events="all" r="10"/><circle cx="440" cy="15" fill="transparent" stroke="#d79b00" pointer-events="all" r="10"/><circle cx="465" cy="15" fill="transparent" stroke="#008cff" pointer-events="all" r="10"/><path d="M0 40h30V15c0-2.76 2.24-5 5-5h135c2.76 0 5 2.24 5 5v25h305M0 110h480M100 60c0-2.76 2.24-5 5-5h360c2.76 0 5 2.24 5 5v25c0 2.76-2.24 5-5 5H105c-2.76 0-5-2.24-5-5z" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M37 17h11l4 4v14H37z" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M48 17v4l4 1" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M107 64h11l4 4v14h-15z" fill="none" stroke="#c4c4c4" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/><path d="M118 64v4l4 1" fill="none" stroke="#c4c4c4" stroke-miterlimit="10" pointer-events="all"/><path d="M12 74l10-10v6h10v8H22v6zM62 74L52 64v6H42v8h10v6zM87.6 77.3a6 6 0 01-8.22 2.06c-2.84-1.69-3.77-5.36-2.09-8.21 1.69-2.84 5.36-3.79 8.21-2.11l-1.6 1.46 7.9 1.8-1.8-7.5-1.7 1.6a9.816 9.816 0 00-10.91-.53 9.799 9.799 0 00-4.62 9.89c.6 3.93 3.53 7.1 7.39 8.03 3.87.93 7.91-.57 10.24-3.79z" fill="#c4c4c4" stroke="#c4c4c4" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:25px;margin-left:62px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:17px;font-family:Helvetica;color:#666;line-height:1.2;pointer-events:all;white-space:nowrap"><div>Twitch</div></div></div></div></foreignObject><text x="62" y="30" fill="#666" font-family="Helvetica" font-size="17">Twitch</text></switch><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:73px;margin-left:132px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:17px;font-family:Helvetica;color:#666;line-height:1.2;pointer-events:all;white-space:nowrap"><div>https://www.twitch.tv</div></div></div></div></foreignObject><text x="132" y="78" fill="#666" font-family="Helvetica" font-size="17">https://www.twitch.tv</text></switch><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M0 110h480v230H0z"/><path d="M78.08 315c-3.08 0-5.58-2.3-5.58-5.14V140.14c0-2.84 2.5-5.14 5.58-5.14h323.84c3.08 0 5.58 2.3 5.58 5.14v169.72c0 2.84-2.5 5.14-5.58 5.14z" fill="#f66" pointer-events="all"/><path d="M221.65 267.98l44.66-23.6-44.66-23.44zm-39.3 24.5c-4.07 0-7.3-3.53-7.3-6.75v-82.85c0-3.8 3.8-6.79 7.29-6.79h114.89c5.16 0 7.72 3.99 7.72 6.76v82.78c0 3.57-3.4 6.85-7.44 6.85zM75.29 176.14v133.72c0 1.42 1.25 2.57 2.79 2.57h323.84c1.54 0 2.79-1.15 2.79-2.57V176.14z" fill-opacity=".5" fill="#fff" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe center;width:1px;height:1px;padding-top:136px;margin-left:240px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#fff;line-height:1.2;pointer-events:all;white-space:nowrap">Video</div></div></div></foreignObject><text x="240" y="148" fill="#FFF" font-family="Helvetica" font-size="12" text-anchor="middle">Video</text></switch><path fill="#08f" stroke="#000" pointer-events="all" d="M387.5 225h20v20h-20z"/><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M0 420h710v380H0z"/><path fill="none" pointer-events="all" d="M0 420h200v30H0z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:423px;margin-left:2px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>Content process hosting the video</div><div><br/></div></div></div></div></foreignObject><text x="2" y="435" font-family="Helvetica" font-size="12">Content process hosting the video</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M230 450h180v80H230z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:490px;margin-left:231px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">videocontrols.js</div></div></div></foreignObject><text x="320" y="494" font-family="Helvetica" font-size="12" text-anchor="middle">videocontrols.js</text></switch><path d="M407.5 235h10q10 0 10 10v92.5q0 10-10 10H220q-10 0-10 10V480q0 10 10 10h10M175 630v69.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M175 706.65l-4.5-9 4.5 2.25 4.5-2.25z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:670px;margin-left:175px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:11px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">MozTogglePictureInPicture chrome event</div></div></div></foreignObject><text x="175" y="673" font-family="Helvetica" font-size="11" text-anchor="middle">MozTogglePictureInPicture chrome event</text></switch><path d="M50 585H30v245h195v119.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M225 956.65l-4.5-9 4.5 2.25 4.5-2.25z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:831px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">JSWindowActor messaging</div></div></div></foreignObject><text x="91" y="834" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor messaging</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M50 540h250v90H50z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:585px;margin-left:51px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureToggleChild</div></div></div></foreignObject><text x="175" y="589" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureToggleChild</text></switch><path d="M300 750h20v290h-39.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M273.35 1040l9-4.5-2.25 4.5 2.25 4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:833px;margin-left:319px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap">JSWindowActor messaging</div></div></div></foreignObject><text x="319" y="836" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor messaging</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M50 710h250v80H50z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:750px;margin-left:51px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal"><div>PictureInPictureLauncherChild<br/></div></div></div></div></foreignObject><text x="175" y="754" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureLauncherChild</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M430 680h250v80H430z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:248px;height:1px;padding-top:720px;margin-left:431px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureChild for player &lt;video&gt;</div></div></div></foreignObject><text x="555" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureChild for player &lt;video&gt;</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M90 960h180v40H90z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:980px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureToggleParent</div></div></div></foreignObject><text x="180" y="984" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureToggleParent</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M90 1020h180v40H90z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:1040px;margin-left:91px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureLauncherParent</div></div></div></foreignObject><text x="180" y="1044" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureLauncherParent</text></switch><path fill="none" pointer-events="all" d="M80 930h120v30H80z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:933px;margin-left:82px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>PictureInPicture.jsm</div><div><br/></div></div></div></div></foreignObject><text x="82" y="945" font-family="Helvetica" font-size="12">PictureInPicture.jsm</text></switch><path fill="#ffe6cc" stroke="#d79b00" pointer-events="all" d="M830 640h410v520H830z"/><path fill="none" pointer-events="all" d="M0 860h100v20H0z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:863px;margin-left:2px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap">Parent process</div></div></div></foreignObject><text x="2" y="875" font-family="Helvetica" font-size="12">Parent process</text></switch><path fill="none" pointer-events="all" d="M840 650h250v20H840z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:653px;margin-left:842px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap">player.xhtml / player.js - alwaysontop window</div></div></div></foreignObject><text x="842" y="665" font-family="Helvetica" font-size="12">player.xhtml / player.js - alwaysontop wi...</text></switch><path fill="#dae8fc" stroke="#6c8ebf" pointer-events="all" d="M840 920h390v230H840z"/><path fill="none" pointer-events="all" d="M850 920h340v30H850z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe flex-start;width:1px;height:1px;padding-top:923px;margin-left:852px"><div style="box-sizing:border-box;font-size:0;text-align:left"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:nowrap"><div>remote &lt;xul:browser&gt; running in the same content process as</div><div>original video</div></div></div></div></foreignObject><text x="852" y="935" font-family="Helvetica" font-size="12">remote &lt;xul:browser&gt; running in the same content process...</text></switch><path d="M865.58 1125c-1.48 0-2.9-.47-3.94-1.3-1.05-.83-1.64-1.95-1.64-3.13V974.43c0-1.18.59-2.3 1.64-3.13 1.04-.83 2.46-1.3 3.94-1.3h323.84c1.48 0 2.9.47 3.94 1.3 1.05.83 1.64 1.95 1.64 3.13v146.14c0 1.18-.59 2.3-1.64 3.13-1.04.83-2.46 1.3-3.94 1.3z" fill="#f66" pointer-events="all"/><path d="M1009.15 1084.51l44.66-20.32-44.66-20.19zm-39.3 21.1c-4.07 0-7.3-3.04-7.3-5.82v-71.34c0-3.27 3.8-5.84 7.29-5.84h114.89c5.16 0 7.72 3.43 7.72 5.82v71.28c0 3.08-3.4 5.9-7.44 5.9zm-107.06-100.18v115.14c0 .59.3 1.15.82 1.57.52.41 1.23.65 1.97.65h323.84c.74 0 1.45-.24 1.97-.65.52-.42.82-.98.82-1.57v-115.14z" fill-opacity=".5" fill="#fff" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe flex-start;justify-content:unsafe center;width:1px;height:1px;padding-top:971px;margin-left:1028px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#fff;line-height:1.2;pointer-events:all;white-space:nowrap">Player video</div></div></div></foreignObject><text x="1028" y="983" fill="#FFF" font-family="Helvetica" font-size="12" text-anchor="middle">Player video</text></switch><path d="M915 720H690.1" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M683.35 720l9-4.5-2.25 4.5 2.25 4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:1px;height:1px;padding-top:721px;margin-left:771px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;background-color:#fff;white-space:nowrap"><div>JSWindowActor</div><div>Messaging<br/></div></div></div></div></foreignObject><text x="771" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">JSWindowActor...</text></switch><path fill="#fff" stroke="#000" pointer-events="all" d="M915 700h180v40H915z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:178px;height:1px;padding-top:720px;margin-left:916px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">PictureInPictureParent</div></div></div></foreignObject><text x="1005" y="724" font-family="Helvetica" font-size="12" text-anchor="middle">PictureInPictureParent</text></switch><path d="M555 760h215v287.5h79.9" fill="none" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="stroke"/><path d="M856.65 1047.5l-9 4.5 2.25-4.5-2.25-4.5z" stroke="#000" stroke-width="3" stroke-miterlimit="10" pointer-events="all"/><path d="M185 1070h0" fill="none" stroke="#000" stroke-miterlimit="10" pointer-events="stroke"/><path d="M185 1070h0z" stroke="#000" stroke-miterlimit="10" pointer-events="all"/><path fill="none" pointer-events="all" d="M570 1070h40v20h-40z"/><switch transform="translate(-.5 -.5)"><foreignObject style="overflow:visible;text-align:left" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display:flex;align-items:unsafe center;justify-content:unsafe center;width:38px;height:1px;padding-top:1080px;margin-left:571px"><div style="box-sizing:border-box;font-size:0;text-align:center"><div style="display:inline-block;font-size:12px;font-family:Helvetica;color:#000;line-height:1.2;pointer-events:all;white-space:normal;word-wrap:normal">Services.ww.openWindow</div></div></div></foreignObject><text x="590" y="1084" font-family="Helvetica" font-size="12" text-anchor="middle">Servic...</text></switch></svg>
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_closePlayer.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_closePlayer.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_closePlayer.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_closePlayer.js	2021-01-18 19:58:26.000000000 +0000
@@ -16,11 +16,6 @@
         return content.document.getElementById(videoID).play();
       });
     };
-    let isVideoPaused = () => {
-      return SpecialPowers.spawn(browser, [videoID], async videoID => {
-        return content.document.getElementById(videoID).paused;
-      });
-    };
 
     let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PAGE);
     let browser = tab.linkedBrowser;
@@ -29,24 +24,24 @@
     // Try the unpip button.
     let pipWin = await triggerPictureInPicture(browser, videoID);
     ok(pipWin, "Got Picture-in-Picture window.");
-    ok(!(await isVideoPaused()), "The video is not paused");
+    ok(!(await isVideoPaused(browser, videoID)), "The video is not paused");
 
     let pipClosed = BrowserTestUtils.domWindowClosed(pipWin);
     let unpipButton = pipWin.document.getElementById("unpip");
     EventUtils.synthesizeMouseAtCenter(unpipButton, {}, pipWin);
     await pipClosed;
-    ok(!(await isVideoPaused()), "The video is not paused");
+    ok(!(await isVideoPaused(browser, videoID)), "The video is not paused");
 
     // Try the close button.
     pipWin = await triggerPictureInPicture(browser, videoID);
     ok(pipWin, "Got Picture-in-Picture window.");
-    ok(!(await isVideoPaused()), "The video is not paused");
+    ok(!(await isVideoPaused(browser, videoID)), "The video is not paused");
 
     pipClosed = BrowserTestUtils.domWindowClosed(pipWin);
     let closeButton = pipWin.document.getElementById("close");
     EventUtils.synthesizeMouseAtCenter(closeButton, {}, pipWin);
     await pipClosed;
-    ok(await isVideoPaused(), "The video is paused");
+    ok(await isVideoPaused(browser, videoID), "The video is paused");
 
     BrowserTestUtils.removeTab(tab);
   }
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_flipIconWithRTL.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_flipIconWithRTL.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_flipIconWithRTL.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_flipIconWithRTL.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,66 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * The goal of this test is to check that the icon on the PiP button mirrors
+ * and the explainer text that shows up before the first time PiP is used
+ * right aligns when the browser is set to a RtL mode
+ *
+ * The browser will create a tab and open a video using PiP
+ * then the tests check that the components change their appearance accordingly
+ *
+ */
+
+/**
+ * This test ensures that the default ltr is working as intended
+ */
+add_task(async function test_ltr_toggle() {
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: TEST_PAGE,
+    },
+    async browser => {
+      await ensureVideosReady(browser);
+      for (let videoId of ["with-controls", "no-controls"]) {
+        let localeDir = await SpecialPowers.spawn(browser, [videoId], id => {
+          let video = content.document.getElementById(id);
+          let videocontrols = video.openOrClosedShadowRoot.firstChild;
+          return videocontrols.getAttribute("localedir");
+        });
+
+        Assert.equal(localeDir, "ltr", "Got the right localedir");
+      }
+    }
+  );
+});
+
+/**
+ * This test ensures that the components flip correctly when rtl is set
+ */
+add_task(async function test_rtl_toggle() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["intl.l10n.pseudo", "bidi"]],
+  });
+
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: TEST_PAGE,
+    },
+    async browser => {
+      await ensureVideosReady(browser);
+      for (let videoId of ["with-controls", "no-controls"]) {
+        let localeDir = await SpecialPowers.spawn(browser, [videoId], id => {
+          let video = content.document.getElementById(id);
+          let videocontrols = video.openOrClosedShadowRoot.firstChild;
+          return videocontrols.getAttribute("localedir");
+        });
+
+        Assert.equal(localeDir, "rtl", "Got the right localedir");
+      }
+    }
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser.ini firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser.ini
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -36,8 +36,8 @@
 [browser_closePlayer.js]
 [browser_closeTab.js]
 [browser_dblclickFullscreen.js]
+[browser_flipIconWithRTL.js]
 [browser_mediaStreamVideos.js]
-skip-if = os == 'mac' #Bug 1622391
 [browser_durationChange.js]
 [browser_fullscreen.js]
 skip-if = (os == "mac" && debug) || os == "linux" #Bug 1566173, Bug 1664667
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_mediaStreamVideos.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_mediaStreamVideos.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_mediaStreamVideos.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_mediaStreamVideos.js	2021-01-18 19:58:26.000000000 +0000
@@ -17,32 +17,42 @@
     async browser => {
       await SpecialPowers.spawn(browser, [], async () => {
         // Construct a new video element, and capture a stream from it
-        // to redirect to both testing videos
-        let newVideo = content.document.createElement("video");
+        // to redirect to both testing videos. Create the captureStreams after
+        // we have metadata so tracks are immediately available, but wait with
+        // playback until the setup is done.
+
+        function logEvent(element, ev) {
+          element.addEventListener(ev, () =>
+            info(
+              `${element.id} got event ${ev}. currentTime=${element.currentTime}`
+            )
+          );
+        }
+
+        const newVideo = content.document.createElement("video");
+        newVideo.id = "new-video";
         newVideo.src = "test-video.mp4";
+        newVideo.preload = "auto";
+        logEvent(newVideo, "timeupdate");
+        logEvent(newVideo, "ended");
         content.document.body.appendChild(newVideo);
-        newVideo.loop = true;
-      });
-      await ensureVideosReady(browser);
-
-      await SpecialPowers.spawn(browser, [], async () => {
-        let newVideo = content.document.body.lastChild;
-        newVideo.play();
+        await ContentTaskUtils.waitForEvent(newVideo, "loadedmetadata");
 
+        const mediastreamPlayingPromises = [];
         for (let videoID of ["with-controls", "no-controls"]) {
-          let testedVideo = content.document.createElement("video");
+          const testedVideo = content.document.createElement("video");
           testedVideo.id = videoID;
-          testedVideo.srcObject = newVideo.mozCaptureStream().clone();
-          content.document.body.prepend(testedVideo);
-          if (
-            testedVideo.readyState < content.HTMLMediaElement.HAVE_ENOUGH_DATA
-          ) {
-            info(`Waiting for 'canplaythrough' for '${testedVideo.id}'`);
-            await ContentTaskUtils.waitForEvent(testedVideo, "canplaythrough");
-          }
+          testedVideo.srcObject = newVideo.mozCaptureStream();
           testedVideo.play();
-          testedVideo.pause();
+          mediastreamPlayingPromises.push(
+            new Promise(r => (testedVideo.onplaying = r))
+          );
+          content.document.body.prepend(testedVideo);
         }
+
+        await newVideo.play();
+        await Promise.all(mediastreamPlayingPromises);
+        newVideo.pause();
       });
     }
   );
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_playerControls.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_playerControls.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_playerControls.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_playerControls.js	2021-01-18 19:58:26.000000000 +0000
@@ -22,11 +22,6 @@
       gBrowser,
     },
     async browser => {
-      let isVideoPaused = () => {
-        return SpecialPowers.spawn(browser, [videoID], async videoID => {
-          return content.document.getElementById(videoID).paused;
-        });
-      };
       let isVideoMuted = () => {
         return SpecialPowers.spawn(browser, [videoID], async videoID => {
           return content.document.getElementById(videoID).muted;
@@ -44,7 +39,7 @@
       // Open the video in PiP
       let pipWin = await triggerPictureInPicture(browser, videoID);
       ok(pipWin, "Got Picture-in-Picture window.");
-      ok(!(await isVideoPaused()), "The video is not paused.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is not paused.");
 
       let playPause = pipWin.document.getElementById("playpause");
       let audioButton = pipWin.document.getElementById("audio");
@@ -53,13 +48,13 @@
       let pausedPromise = waitForVideoEvent("pause");
       EventUtils.synthesizeMouseAtCenter(playPause, {}, pipWin);
       await pausedPromise;
-      ok(await isVideoPaused(), "The video is paused.");
+      ok(await isVideoPaused(browser, videoID), "The video is paused.");
 
       // Try the play button
       let playPromise = waitForVideoEvent("play");
       EventUtils.synthesizeMouseAtCenter(playPause, {}, pipWin);
       await playPromise;
-      ok(!(await isVideoPaused()), "The video is playing.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is playing.");
 
       // Try the mute button
       let mutedPromise = waitForVideoEvent("volumechange");
@@ -79,18 +74,18 @@
       let unpipButton = pipWin.document.getElementById("unpip");
       EventUtils.synthesizeMouseAtCenter(unpipButton, {}, pipWin);
       await pipClosed;
-      ok(!(await isVideoPaused()), "The video is not paused.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is not paused.");
 
       // Try the close button.
       pipWin = await triggerPictureInPicture(browser, videoID);
       ok(pipWin, "Got Picture-in-Picture window.");
-      ok(!(await isVideoPaused()), "The video is not paused.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is not paused.");
 
       pipClosed = BrowserTestUtils.domWindowClosed(pipWin);
       let closeButton = pipWin.document.getElementById("close");
       EventUtils.synthesizeMouseAtCenter(closeButton, {}, pipWin);
       await pipClosed;
-      ok(await isVideoPaused(), "The video is paused.");
+      ok(await isVideoPaused(browser, videoID), "The video is paused.");
     }
   );
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_saveLastPiPLoc.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_saveLastPiPLoc.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_saveLastPiPLoc.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_saveLastPiPLoc.js	2021-01-18 19:58:26.000000000 +0000
@@ -355,6 +355,8 @@
           "Video is on right edge after video is changed"
         );
       }
+
+      await ensureMessageAndClosePiP(browser, "with-controls", pipWin, true);
     }
   );
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_tabIconOverlayPiP.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_tabIconOverlayPiP.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_tabIconOverlayPiP.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_tabIconOverlayPiP.js	2021-01-18 19:58:27.000000000 +0000
@@ -20,12 +20,6 @@
       gBrowser,
     },
     async browser => {
-      let isVideoPaused = () => {
-        return SpecialPowers.spawn(browser, [videoID], async videoID => {
-          return content.document.getElementById(videoID).paused;
-        });
-      };
-
       await ensureVideosReady(browser);
 
       let audioPromise = BrowserTestUtils.waitForEvent(
@@ -38,7 +32,7 @@
       });
 
       // Check that video is playing
-      ok(!(await isVideoPaused()), "The video is not paused.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is not paused.");
       await audioPromise;
 
       // Need tab to access the tab-icon-overlay element
@@ -58,7 +52,7 @@
       ok(pipWin, "Got Picture-in-Picture window.");
 
       // Check that video is still playing
-      ok(!(await isVideoPaused()), "The video is not paused.");
+      ok(!(await isVideoPaused(browser, videoID)), "The video is not paused.");
 
       // Video is still playing so the tab-icon-overlay should have "soundplaying" as an attribute
       ok(
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js	2021-01-18 19:58:26.000000000 +0000
@@ -3,12 +3,6 @@
 
 "use strict";
 
-const SHARED_DATA_KEY = "PictureInPicture:SiteOverrides";
-
-const { TOGGLE_POLICIES } = ChromeUtils.import(
-  "resource://gre/modules/PictureInPictureControls.jsm"
-);
-
 /**
  * Tests that by setting a Picture-in-Picture toggle position policy
  * in the sharedData structure, that the toggle position can be
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-1.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-1.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-1.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-1.js	2021-01-18 19:58:26.000000000 +0000
@@ -5,7 +5,9 @@
 
 /**
  * Tests that the Picture-in-Picture toggle can appear and be clicked
- * when the video is overlaid with transparent elements.
+ * when the video is overlaid with transparent elements. Also tests the
+ * site-specific toggle visibility threshold to ensure that we can
+ * configure opacities that can't be clicked through.
  */
 add_task(async () => {
   const PAGE = TEST_ROOT + "test-transparent-overlay-1.html";
@@ -13,4 +15,19 @@
     "video-transparent-background": { canToggle: true },
     "video-alpha-background": { canToggle: true },
   });
+
+  // Now set a toggle visibility threshold to 0.4 and ensure that the
+  // partially obscured toggle can't be clicked.
+  Services.ppmm.sharedData.set(SHARED_DATA_KEY, {
+    "*://example.com/*": { visibilityThreshold: 0.4 },
+  });
+  Services.ppmm.sharedData.flush();
+
+  await testToggle(PAGE, {
+    "video-transparent-background": { canToggle: true },
+    "video-alpha-background": { canToggle: false },
+  });
+
+  Services.ppmm.sharedData.set(SHARED_DATA_KEY, {});
+  Services.ppmm.sharedData.flush();
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-2.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-2.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-2.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/browser_toggleTransparentOverlay-2.js	2021-01-18 19:58:26.000000000 +0000
@@ -5,8 +5,9 @@
 
 /**
  * Tests that the Picture-in-Picture toggle can appear and be clicked
- * when the video is overlaid with elements that have zero and
- * partial opacity.
+ * when the video is overlaid with elements that have zero and partial
+ * opacity. Also tests the site-specific toggle visibility threshold to
+ * ensure that we can configure opacities that can't be clicked through.
  */
 add_task(async () => {
   const PAGE = TEST_ROOT + "test-transparent-overlay-2.html";
@@ -14,4 +15,19 @@
     "video-zero-opacity": { canToggle: true },
     "video-partial-opacity": { canToggle: true },
   });
+
+  // Now set a toggle visibility threshold to 0.4 and ensure that the
+  // partially obscured toggle can't be clicked.
+  Services.ppmm.sharedData.set(SHARED_DATA_KEY, {
+    "*://example.com/*": { visibilityThreshold: 0.4 },
+  });
+  Services.ppmm.sharedData.flush();
+
+  await testToggle(PAGE, {
+    "video-zero-opacity": { canToggle: true },
+    "video-partial-opacity": { canToggle: false },
+  });
+
+  Services.ppmm.sharedData.set(SHARED_DATA_KEY, {});
+  Services.ppmm.sharedData.flush();
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/head.js firefox-85.0+build1/toolkit/components/pictureinpicture/tests/head.js
--- firefox-84.0.2+build1/toolkit/components/pictureinpicture/tests/head.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/pictureinpicture/tests/head.js	2021-01-18 19:58:26.000000000 +0000
@@ -3,6 +3,10 @@
 
 "use strict";
 
+const { TOGGLE_POLICIES } = ChromeUtils.import(
+  "resource://gre/modules/PictureInPictureControls.jsm"
+);
+
 const TEST_ROOT = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
   "http://example.com"
@@ -20,6 +24,7 @@
   "media.videocontrols.picture-in-picture.video-toggle.position";
 const HAS_USED_PREF =
   "media.videocontrols.picture-in-picture.video-toggle.has-used";
+const SHARED_DATA_KEY = "PictureInPicture:SiteOverrides";
 
 /**
  * We currently ship with a few different variations of the
@@ -103,9 +108,11 @@
     }, "Video is being cloned visually.");
   });
   let win = await domWindowOpened;
-  await win.promiseDocumentFlushed(() => {});
-  await videoReady;
-  await SimpleTest.promiseFocus(win);
+  await Promise.all([
+    SimpleTest.promiseFocus(win),
+    win.promiseDocumentFlushed(() => {}),
+    videoReady,
+  ]);
   return win;
 }
 
@@ -431,8 +438,8 @@
 }
 
 /**
- * Returns the client rect for the toggle if it's supposed to be visible
- * on hover. Otherwise, returns the client rect for the video with the
+ * Returns client rect info for the toggle if it's supposed to be visible
+ * on hover. Otherwise, returns client rect info for the video with the
  * associated ID.
  *
  * @param {Element} browser The <xul:browser> that has the <video> loaded in it.
@@ -442,9 +449,9 @@
  * @resolves With the following Object structure:
  *   {
  *     top: <Number>,
- *     right: <Number>,
  *     left: <Number>,
- *     bottom: <Number>,
+ *     width: <Number>,
+ *     height: <Number>,
  *   }
  */
 async function getToggleClientRect(
@@ -474,9 +481,9 @@
 
     return {
       top: rect.top,
-      right: rect.right,
       left: rect.left,
-      bottom: rect.bottom,
+      width: rect.width,
+      height: rect.height,
     };
   });
 }
@@ -603,22 +610,20 @@
   );
 
   info("Hovering the toggle rect now.");
-  // The toggle center, because of how it slides out, is actually outside
-  // of the bounds of a click event. For now, we move the mouse in by a
-  // hard-coded 2 pixels along the x and y axis to achieve the hover.
-  let toggleLeft = toggleClientRect.left + 2;
-  let toggleTop = toggleClientRect.top + 2;
+  let toggleCenterX = toggleClientRect.left + toggleClientRect.width / 2;
+  let toggleCenterY = toggleClientRect.top + toggleClientRect.height / 2;
+
   await BrowserTestUtils.synthesizeMouseAtPoint(
-    toggleLeft,
-    toggleTop,
+    toggleCenterX,
+    toggleCenterY,
     {
       type: "mousemove",
     },
     browser
   );
   await BrowserTestUtils.synthesizeMouseAtPoint(
-    toggleLeft,
-    toggleTop,
+    toggleCenterX,
+    toggleCenterY,
     {
       type: "mouseover",
     },
@@ -639,8 +644,8 @@
   info("Right-clicking on toggle.");
 
   await BrowserTestUtils.synthesizeMouseAtPoint(
-    toggleLeft,
-    toggleTop,
+    toggleCenterX,
+    toggleCenterY,
     { button: 2 },
     browser
   );
@@ -673,8 +678,8 @@
     );
     let domWindowOpened = BrowserTestUtils.domWindowOpenedAndLoaded(null);
     await BrowserTestUtils.synthesizeMouseAtPoint(
-      toggleLeft,
-      toggleTop,
+      toggleCenterX,
+      toggleCenterY,
       {},
       browser
     );
@@ -693,8 +698,8 @@
       "Clicking on toggle, and expecting no Picture-in-Picture window opens"
     );
     await BrowserTestUtils.synthesizeMouseAtPoint(
-      toggleLeft,
-      toggleTop,
+      toggleCenterX,
+      toggleCenterY,
       {},
       browser
     );
diff -Nru firefox-84.0.2+build1/toolkit/components/places/bookmark_sync/Cargo.toml firefox-85.0+build1/toolkit/components/places/bookmark_sync/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/places/bookmark_sync/Cargo.toml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/bookmark_sync/Cargo.toml	2021-01-18 19:58:26.000000000 +0000
@@ -9,7 +9,7 @@
 dogear = "0.4.0"
 libc = "0.2"
 log = "0.4"
-cstr = "0.1"
+cstr = "0.2"
 moz_task = { path = "../../../../xpcom/rust/moz_task" }
 nserror = { path = "../../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../../xpcom/rust/nsstring" }
diff -Nru firefox-84.0.2+build1/toolkit/components/places/components.conf firefox-85.0+build1/toolkit/components/places/components.conf
--- firefox-84.0.2+build1/toolkit/components/places/components.conf	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/components.conf	2021-01-18 19:58:26.000000000 +0000
@@ -67,11 +67,11 @@
     },
 
     {
-        'cid': '{803938d5-e26d-4453-bf46-ad4b26e41114}',
-        'contract_ids': ['@mozilla.org/places/categoriesStarter;1'],
-        'jsm': 'resource://gre/modules/PlacesCategoriesStarter.jsm',
-        'constructor': 'PlacesCategoriesStarter',
-        'categories': {'idle-daily': 'PlacesCategoriesStarter'},
+        'cid': '{d38926e0-29c1-11eb-8588-0800200c9a66}',
+        'contract_ids': ['@mozilla.org/places/databaseUtilsIdleMaintenance;1'],
+        'jsm': 'resource://gre/modules/PlacesDBUtils.jsm',
+        'constructor': 'PlacesDBUtilsIdleMaintenance',
+        'categories': {'idle-daily': 'PlacesDBUtilsIdleMaintenance'},
     },
 
     {
diff -Nru firefox-84.0.2+build1/toolkit/components/places/Database.cpp firefox-85.0+build1/toolkit/components/places/Database.cpp
--- firefox-84.0.2+build1/toolkit/components/places/Database.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/Database.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,6 +6,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/ScopeExit.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/JSONWriter.h"
 
 #include "Database.h"
@@ -350,8 +351,6 @@
       mDBPageSize(0),
       mDatabaseStatus(nsINavHistoryService::DATABASE_STATUS_OK),
       mClosed(false),
-      mShouldConvertIconPayloads(false),
-      mShouldVacuumIcons(false),
       mClientsShutdown(new ClientsShutdownBlocker()),
       mConnectionShutdown(new ConnectionShutdownBlocker(this)),
       mMaxUrlLength(0),
@@ -1096,16 +1095,8 @@
   }
 
   auto guard = MakeScopeExit([&]() {
-    // This runs at the end of the migration, out of the transaction,
+    // These run at the end of the migration, out of the transaction,
     // regardless of its success.
-    if (mShouldVacuumIcons) {
-      mShouldVacuumIcons = false;
-      MOZ_ALWAYS_SUCCEEDS(mMainConn->ExecuteSimpleSQL("VACUUM favicons"_ns));
-    }
-    if (mShouldConvertIconPayloads) {
-      mShouldConvertIconPayloads = false;
-      nsFaviconService::ConvertUnsupportedPayloads(mMainConn);
-    }
     MigrateV52OriginFrecencies();
   });
 
@@ -1128,62 +1119,12 @@
     if (currentSchemaVersion < DATABASE_SCHEMA_VERSION) {
       *aDatabaseMigrated = true;
 
-      if (currentSchemaVersion < 35) {
-        // These are versions older than Firefox 52 ESR that are not supported
+      if (currentSchemaVersion < 43) {
+        // These are versions older than Firefox 60 ESR that are not supported
         // anymore.  In this case it's safer to just replace the database.
         return NS_ERROR_FILE_CORRUPTED;
       }
 
-      // Firefox 52 ESR uses schema version 35.
-
-      if (currentSchemaVersion < 36) {
-        rv = MigrateV36Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      if (currentSchemaVersion < 37) {
-        rv = MigrateV37Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Firefox 55 uses schema version 37.
-
-      if (currentSchemaVersion < 38) {
-        rv = MigrateV38Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Firefox 56 uses schema version 38.
-
-      if (currentSchemaVersion < 39) {
-        rv = MigrateV39Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Firefox 57 uses schema version 39. - This is a watershed version.
-
-      if (currentSchemaVersion < 40) {
-        rv = MigrateV40Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      if (currentSchemaVersion < 41) {
-        rv = MigrateV41Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Firefox 58 uses schema version 41.
-
-      if (currentSchemaVersion < 42) {
-        rv = MigrateV42Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      if (currentSchemaVersion < 43) {
-        rv = MigrateV43Up();
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
       // Firefox 60 uses schema version 43. - This is an ESR.
 
       if (currentSchemaVersion < 44) {
@@ -1234,6 +1175,7 @@
       }
 
       // Firefox 62 uses schema version 52.
+      // Firefox 68 uses schema version 52. - This is an ESR.
 
       if (currentSchemaVersion < 53) {
         rv = MigrateV53Up();
@@ -1241,6 +1183,7 @@
       }
 
       // Firefox 69 uses schema version 53
+      // Firefox 78 uses schema version 53 - This is an ESR.
 
       if (currentSchemaVersion < 54) {
         rv = MigrateV54Up();
@@ -1647,230 +1590,6 @@
   return NS_OK;
 }
 
-nsresult Database::MigrateV36Up() {
-  // Add sync status and change counter tracking columns for bookmarks.
-  nsCOMPtr<mozIStorageStatement> syncStatusStmt;
-  nsresult rv =
-      mMainConn->CreateStatement("SELECT syncStatus FROM moz_bookmarks"_ns,
-                                 getter_AddRefs(syncStatusStmt));
-  if (NS_FAILED(rv)) {
-    // We default to SYNC_STATUS_UNKNOWN = 0 for existing bookmarks, matching
-    // the bookmark restore behavior. If Sync is set up, we'll update the status
-    // to SYNC_STATUS_NORMAL = 2 before the first post-migration sync.
-    rv = mMainConn->ExecuteSimpleSQL(
-        nsLiteralCString("ALTER TABLE moz_bookmarks "
-                         "ADD COLUMN syncStatus INTEGER DEFAULT 0 NOT NULL"));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  nsCOMPtr<mozIStorageStatement> syncChangeCounterStmt;
-  rv = mMainConn->CreateStatement(
-      "SELECT syncChangeCounter FROM moz_bookmarks"_ns,
-      getter_AddRefs(syncChangeCounterStmt));
-  if (NS_FAILED(rv)) {
-    // The change counter starts at 1 for all local bookmarks. It's incremented
-    // for each modification that should trigger a sync, and decremented after
-    // the modified bookmark is uploaded to the server.
-    rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-        "ALTER TABLE moz_bookmarks "
-        "ADD COLUMN syncChangeCounter INTEGER DEFAULT 1 NOT NULL"));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  nsCOMPtr<mozIStorageStatement> tombstoneTableStmt;
-  rv = mMainConn->CreateStatement("SELECT 1 FROM moz_bookmarks_deleted"_ns,
-                                  getter_AddRefs(tombstoneTableStmt));
-  if (NS_FAILED(rv)) {
-    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_BOOKMARKS_DELETED);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  return NS_OK;
-}
-
-nsresult Database::MigrateV37Up() {
-  // Move favicons to the new database.
-  // For now we retain the old moz_favicons table, but we empty it.
-  // This allows for a "safer" downgrade, even if icons will be lost in the
-  // process. In a couple versions we shall drop moz_favicons completely.
-
-  // First, check if the old favicons table still exists.
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mMainConn->CreateStatement("SELECT url FROM moz_favicons"_ns,
-                                           getter_AddRefs(stmt));
-  if (NS_FAILED(rv)) {
-    // The table has already been removed, nothing to do.
-    return NS_OK;
-  }
-
-  // The new table accepts only png or svg payloads, so we set a valid width
-  // only for them, the mime-type for the others.  Later we will asynchronously
-  // try to convert the unsupported payloads, or remove them.
-
-  // Add pages.
-  rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-      "INSERT INTO moz_pages_w_icons (page_url, page_url_hash) "
-      "SELECT h.url, hash(h.url) "
-      "FROM moz_places h "
-      "JOIN moz_favicons f ON f.id = h.favicon_id"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Set icons as expired, so we will replace them with proper versions at the
-  // first load.
-  // Note: we use a peculiarity of Sqlite here, where the column affinity
-  // is not enforced, thanks to that we can store a string in an integer column.
-  rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-      "INSERT INTO moz_icons (icon_url, fixed_icon_url_hash, width, data) "
-      "SELECT url, hash(fixup_url(url)), "
-      "(CASE WHEN mime_type = 'image/png' THEN 16 "
-      "WHEN mime_type = 'image/svg+xml' THEN 65535 "
-      "ELSE mime_type END), "
-      "data FROM moz_favicons "
-      "WHERE LENGTH(data) > 0 "));
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Create relations.
-  rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-      "INSERT OR IGNORE INTO moz_icons_to_pages (page_id, icon_id) "
-      "SELECT (SELECT id FROM moz_pages_w_icons "
-      "WHERE page_url_hash = h.url_hash "
-      "AND page_url = h.url), "
-      "(SELECT id FROM moz_icons "
-      "WHERE fixed_icon_url_hash = hash(fixup_url(f.url)) "
-      "AND icon_url = f.url) "
-      "FROM moz_favicons f "
-      "JOIN moz_places h on f.id = h.favicon_id"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Remove old favicons and relations.
-  rv = mMainConn->ExecuteSimpleSQL("DELETE FROM moz_favicons"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv =
-      mMainConn->ExecuteSimpleSQL("UPDATE moz_places SET favicon_id = NULL"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // The async favicons conversion will happen at the end of the normal schema
-  // migration.
-  mShouldConvertIconPayloads = true;
-
-  return NS_OK;
-}
-
-nsresult Database::MigrateV38Up() {
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mMainConn->CreateStatement(
-      "SELECT description, preview_image_url FROM moz_places"_ns,
-      getter_AddRefs(stmt));
-  if (NS_FAILED(rv)) {
-    rv = mMainConn->ExecuteSimpleSQL(
-        "ALTER TABLE moz_places ADD COLUMN description TEXT"_ns);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-        "ALTER TABLE moz_places ADD COLUMN preview_image_url TEXT"));
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  return NS_OK;
-}
-
-nsresult Database::MigrateV39Up() {
-  // Create an index on dateAdded.
-  nsresult rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_BOOKMARKS_DATEADDED);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult Database::MigrateV40Up() {
-  // We are changing the hashing function to crop the hashed text to a maximum
-  // length, thus we must recalculate the hashes.
-  // Due to this, on downgrade some of these may not match, it should be limited
-  // to unicode and very long urls though.
-  nsresult rv = mMainConn->ExecuteSimpleSQL(
-      nsLiteralCString("UPDATE moz_places "
-                       "SET url_hash = hash(url) "
-                       "WHERE url_hash <> hash(url)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-      "UPDATE moz_icons "
-      "SET fixed_icon_url_hash = hash(fixup_url(icon_url)) "
-      "WHERE fixed_icon_url_hash <> hash(fixup_url(icon_url))"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = mMainConn->ExecuteSimpleSQL(
-      nsLiteralCString("UPDATE moz_pages_w_icons "
-                       "SET page_url_hash = hash(page_url) "
-                       "WHERE page_url_hash <> hash(page_url)"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-nsresult Database::MigrateV41Up() {
-  // Remove old favicons entities.
-  nsresult rv = mMainConn->ExecuteSimpleSQL(
-      "DROP INDEX IF EXISTS moz_places_faviconindex"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = mMainConn->ExecuteSimpleSQL("DROP TABLE IF EXISTS moz_favicons"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-nsresult Database::MigrateV42Up() {
-  // auto_vacuum of the favicons database was broken, we may have to set it
-  // again.
-  int32_t vacuum = 0;
-  {
-    nsCOMPtr<mozIStorageStatement> stmt;
-    nsresult rv = mMainConn->CreateStatement("PRAGMA favicons.auto_vacuum"_ns,
-                                             getter_AddRefs(stmt));
-    NS_ENSURE_SUCCESS(rv, rv);
-    bool hasResult = false;
-    if (NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult) {
-      vacuum = stmt->AsInt32(0);
-    }
-  }
-  if (vacuum != 2) {
-    nsresult rv = mMainConn->ExecuteSimpleSQL(
-        "PRAGMA favicons.auto_vacuum = INCREMENTAL"_ns);
-    NS_ENSURE_SUCCESS(rv, rv);
-    // For the change to be effective, we must vacuum the database.
-    mShouldVacuumIcons = true;
-  }
-  return NS_OK;
-}
-
-nsresult Database::MigrateV43Up() {
-  // moz_keywords doesn't properly disallow multiple keyword for the same URI
-  // because for postData NULL != NULL. We should use an empty string instead.
-
-  // To avoid constraint failures, we must first remove duplicate keywords.
-  // This may cause a dataloss, but the only alternative would be to modify the
-  // related url, and that's far more complex.
-  nsresult rv =
-      mMainConn->ExecuteSimpleSQL(nsLiteralCString("DELETE FROM moz_keywords "
-                                                   "WHERE post_data ISNULL "
-                                                   "AND id NOT IN ( "
-                                                   "SELECT MAX(id) "
-                                                   "FROM moz_keywords "
-                                                   "WHERE post_data ISNULL "
-                                                   "GROUP BY place_id "
-                                                   ")"));
-  NS_ENSURE_SUCCESS(rv, rv);
-  // We must recalculate foreign_count for all the touched places.
-  rv = mMainConn->ExecuteSimpleSQL(nsLiteralCString(
-      "UPDATE moz_places "
-      "SET foreign_count = (SELECT count(*) FROM moz_bookmarks WHERE fk = "
-      "moz_places.id) + "
-      "(SELECT count(*) FROM moz_keywords WHERE place_id = moz_places.id) "
-      "WHERE id IN (SELECT DISTINCT place_id FROM moz_keywords) "));
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv =
-      mMainConn->ExecuteSimpleSQL(nsLiteralCString("UPDATE moz_keywords "
-                                                   "SET post_data = '' "
-                                                   "WHERE post_data ISNULL "));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
 nsresult Database::MigrateV44Up() {
   // We need to remove any non-builtin roots and their descendants.
 
@@ -2097,8 +1816,9 @@
   // From this point on, nobody should use moz_hosts again.  Empty it so that we
   // don't leak the user's history, but don't remove it yet so that the user can
   // downgrade.
-  rv = mMainConn->ExecuteSimpleSQL("DELETE FROM moz_hosts; "_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
+  // This can fail, if moz_hosts doesn't exist anymore, that is what happens in
+  // case of downgrade+upgrade.
+  Unused << mMainConn->ExecuteSimpleSQL("DELETE FROM moz_hosts; "_ns);
 
   return NS_OK;
 }
@@ -2760,17 +2480,5 @@
   return NS_OK;
 }
 
-uint32_t Database::MaxUrlLength() {
-  MOZ_ASSERT(NS_IsMainThread());
-  if (!mMaxUrlLength) {
-    mMaxUrlLength = Preferences::GetInt(PREF_HISTORY_MAXURLLEN,
-                                        PREF_HISTORY_MAXURLLEN_DEFAULT);
-    if (mMaxUrlLength < 255 || mMaxUrlLength > INT32_MAX) {
-      mMaxUrlLength = PREF_HISTORY_MAXURLLEN_DEFAULT;
-    }
-  }
-  return mMaxUrlLength;
-}
-
 }  // namespace places
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/places/Database.h firefox-85.0+build1/toolkit/components/places/Database.h
--- firefox-84.0.2+build1/toolkit/components/places/Database.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/Database.h	2021-01-18 19:58:27.000000000 +0000
@@ -203,8 +203,6 @@
   already_AddRefed<mozIStorageAsyncStatement> GetAsyncStatement(
       const nsACString& aQuery);
 
-  uint32_t MaxUrlLength();
-
   int64_t GetRootFolderId() {
     mozilla::Unused << EnsureConnection();
     return mRootId;
@@ -320,14 +318,6 @@
   /**
    * Helpers used by schema upgrades.
    */
-  nsresult MigrateV36Up();
-  nsresult MigrateV37Up();
-  nsresult MigrateV38Up();
-  nsresult MigrateV39Up();
-  nsresult MigrateV40Up();
-  nsresult MigrateV41Up();
-  nsresult MigrateV42Up();
-  nsresult MigrateV43Up();
   nsresult MigrateV44Up();
   nsresult MigrateV45Up();
   nsresult MigrateV46Up();
@@ -368,12 +358,6 @@
   int32_t mDBPageSize;
   uint16_t mDatabaseStatus;
   bool mClosed;
-  // Used to track whether icon payloads should be converted at the end of
-  // schema migration.
-  bool mShouldConvertIconPayloads;
-  // Used to track whether the favicons database should be vacuumed at the end
-  // of the schema migration.
-  bool mShouldVacuumIcons;
 
   /**
    * Phases for shutting down the Database.
diff -Nru firefox-84.0.2+build1/toolkit/components/places/FaviconHelpers.cpp firefox-85.0+build1/toolkit/components/places/FaviconHelpers.cpp
--- firefox-84.0.2+build1/toolkit/components/places/FaviconHelpers.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/FaviconHelpers.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,11 +10,17 @@
 #include "nsICachingChannel.h"
 #include "nsIClassOfService.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIHttpChannel.h"
 #include "nsIPrincipal.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsNavHistory.h"
 #include "nsFaviconService.h"
+
+#include "mozilla/dom/PlacesFavicon.h"
+#include "mozilla/dom/PlacesObservers.h"
 #include "mozilla/storage.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "nsNetUtil.h"
@@ -30,6 +36,7 @@
 #include "ImageOps.h"
 #include "imgIEncoder.h"
 
+using namespace mozilla;
 using namespace mozilla::places;
 using namespace mozilla::storage;
 
@@ -737,29 +744,29 @@
   // type. This allow us to measure common file sizes while also observing each
   // type popularity.
   if (payload.mimeType.EqualsLiteral(PNG_MIME_TYPE)) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_PNG_SIZES,
-                                   payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_PNG_SIZES,
+                          payload.data.Length());
   } else if (payload.mimeType.EqualsLiteral("image/x-icon") ||
              payload.mimeType.EqualsLiteral("image/vnd.microsoft.icon")) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_ICO_SIZES,
-                                   payload.data.Length());
+    Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_ICO_SIZES,
+                          payload.data.Length());
   } else if (payload.mimeType.EqualsLiteral("image/jpeg") ||
              payload.mimeType.EqualsLiteral("image/pjpeg")) {
-    mozilla::Telemetry::Accumulate(
-        mozilla::Telemetry::PLACES_FAVICON_JPEG_SIZES, payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_JPEG_SIZES,
+                          payload.data.Length());
   } else if (payload.mimeType.EqualsLiteral("image/gif")) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_GIF_SIZES,
-                                   payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_GIF_SIZES,
+                          payload.data.Length());
   } else if (payload.mimeType.EqualsLiteral("image/bmp") ||
              payload.mimeType.EqualsLiteral("image/x-windows-bmp")) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_BMP_SIZES,
-                                   payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_BMP_SIZES,
+                          payload.data.Length());
   } else if (payload.mimeType.EqualsLiteral(SVG_MIME_TYPE)) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::PLACES_FAVICON_SVG_SIZES,
-                                   payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_SVG_SIZES,
+                          payload.data.Length());
   } else {
-    mozilla::Telemetry::Accumulate(
-        mozilla::Telemetry::PLACES_FAVICON_OTHER_SIZES, payload.data.Length());
+    Telemetry::Accumulate(Telemetry::PLACES_FAVICON_OTHER_SIZES,
+                          payload.data.Length());
   }
 
   rv = favicons->OptimizeIconSizes(mIcon);
@@ -1092,6 +1099,9 @@
       mIcon(aIcon),
       mPage(aPage) {}
 
+// MOZ_CAN_RUN_SCRIPT_BOUNDARY until Runnable::Run is marked
+// MOZ_CAN_RUN_SCRIPT.  See bug 1535398.
+MOZ_CAN_RUN_SCRIPT_BOUNDARY
 NS_IMETHODIMP
 NotifyIconObservers::Run() {
   MOZ_ASSERT(NS_IsMainThread());
@@ -1106,12 +1116,29 @@
         nsCOMPtr<nsIURI> pageURI;
         MOZ_ALWAYS_SUCCEEDS(NS_NewURI(getter_AddRefs(pageURI), mPage.spec));
         if (pageURI) {
+          // Invalide page-icon image cache, since the icon is about to change.
           nsFaviconService* favicons = nsFaviconService::GetFaviconService();
           MOZ_ASSERT(favicons);
           if (favicons) {
-            (void)favicons->SendFaviconNotifications(pageURI, iconURI,
-                                                     mPage.guid);
+            nsCString pageIconSpec("page-icon:");
+            pageIconSpec.Append(mPage.spec);
+            nsCOMPtr<nsIURI> pageIconURI;
+            if (NS_SUCCEEDED(
+                    NS_NewURI(getter_AddRefs(pageIconURI), pageIconSpec))) {
+              favicons->ClearImageCache(pageIconURI);
+            }
           }
+
+          // Notify about the favicon change.
+          dom::Sequence<OwningNonNull<dom::PlacesEvent>> events;
+          RefPtr<dom::PlacesFavicon> faviconEvent = new dom::PlacesFavicon();
+          AppendUTF8toUTF16(mPage.spec, faviconEvent->mUrl);
+          AppendUTF8toUTF16(mIcon.spec, faviconEvent->mFaviconUrl);
+          faviconEvent->mPageGuid.Assign(mPage.guid);
+          bool success =
+              !!events.AppendElement(faviconEvent.forget(), fallible);
+          MOZ_RELEASE_ASSERT(success);
+          dom::PlacesObservers::NotifyListeners(events);
         }
       }
     }
@@ -1132,218 +1159,6 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//// FetchAndConvertUnsupportedPayloads
-
-FetchAndConvertUnsupportedPayloads::FetchAndConvertUnsupportedPayloads(
-    mozIStorageConnection* aDBConn)
-    : Runnable("places::FetchAndConvertUnsupportedPayloads"), mDB(aDBConn) {}
-
-NS_IMETHODIMP
-FetchAndConvertUnsupportedPayloads::Run() {
-  if (NS_IsMainThread()) {
-    Preferences::ClearUser(PREF_CONVERT_PAYLOADS);
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(!NS_IsMainThread());
-  NS_ENSURE_STATE(mDB);
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mDB->CreateStatement(
-      nsLiteralCString(
-          "SELECT id, width, data FROM moz_icons WHERE typeof(width) = 'text' "
-          "ORDER BY id ASC "
-          "LIMIT 200 "),
-      getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  mozStorageTransaction transaction(
-      mDB, false, mozIStorageConnection::TRANSACTION_IMMEDIATE);
-
-  // We should do the work in chunks, or the wal journal may grow too much.
-  uint8_t count = 0;
-  bool hasResult;
-  while (NS_SUCCEEDED(stmt->ExecuteStep(&hasResult)) && hasResult) {
-    ++count;
-    int64_t id = stmt->AsInt64(0);
-    MOZ_ASSERT(id > 0);
-    nsAutoCString mimeType;
-    rv = stmt->GetUTF8String(1, mimeType);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      continue;
-    }
-    uint8_t* data;
-    uint32_t dataLen = 0;
-    rv = stmt->GetBlob(2, &dataLen, &data);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      continue;
-    }
-    nsCString buf;
-    buf.Adopt(TO_CHARBUFFER(data), dataLen);
-
-    int32_t width = 0;
-    rv = ConvertPayload(id, mimeType, buf, &width);
-    Unused << NS_WARN_IF(NS_FAILED(rv));
-    if (NS_SUCCEEDED(rv)) {
-      rv = StorePayload(id, width, buf);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        continue;
-      }
-    }
-  }
-
-  rv = transaction.Commit();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (count == 200) {
-    // There are more results to handle. Re-dispatch to the same thread for the
-    // next chunk.
-    return NS_DispatchToCurrentThread(this);
-  }
-
-  // We're done. Remove any leftovers.
-  rv = mDB->ExecuteSimpleSQL(
-      "DELETE FROM moz_icons WHERE typeof(width) = 'text'"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-  // Run a one-time VACUUM of places.sqlite, since we removed a lot from it.
-  // It may cause jank, but not doing it could cause dataloss due to expiration.
-  rv = mDB->ExecuteSimpleSQL("VACUUM"_ns);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Re-dispatch to the main-thread to flip the conversion pref.
-  return NS_DispatchToMainThread(this);
-}
-
-nsresult FetchAndConvertUnsupportedPayloads::ConvertPayload(
-    int64_t aId, const nsACString& aMimeType, nsCString& aPayload,
-    int32_t* aWidth) {
-  // TODO (bug 1346139): this should probably be unified with the function that
-  // will handle additions optimization off the main thread.
-  MOZ_ASSERT(!NS_IsMainThread());
-  *aWidth = 0;
-
-  // Exclude invalid mime types.
-  if (aPayload.Length() == 0 || !imgLoader::SupportImageWithMimeType(
-                                    PromiseFlatCString(aMimeType).get(),
-                                    AcceptedMimeTypes::IMAGES_AND_DOCUMENTS)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  // If it's an SVG, there's nothing to optimize or convert.
-  if (aMimeType.EqualsLiteral(SVG_MIME_TYPE)) {
-    *aWidth = UINT16_MAX;
-    return NS_OK;
-  }
-
-  // Convert the payload to an input stream.
-  nsCOMPtr<nsIInputStream> stream;
-  nsresult rv = NS_NewByteInputStream(getter_AddRefs(stream), aPayload,
-                                      NS_ASSIGNMENT_DEPEND);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Decode the input stream to a surface.
-  RefPtr<gfx::SourceSurface> surface = image::ImageOps::DecodeToSurface(
-      stream.forget(), aMimeType, imgIContainer::DECODE_FLAGS_DEFAULT);
-  NS_ENSURE_STATE(surface);
-  RefPtr<gfx::DataSourceSurface> dataSurface = surface->GetDataSurface();
-  NS_ENSURE_STATE(dataSurface);
-
-  // Read the current size and set an appropriate final width.
-  int32_t width = dataSurface->GetSize().width;
-  int32_t height = dataSurface->GetSize().height;
-  // For non-square images, pick the largest side.
-  int32_t originalSize = std::max(width, height);
-  int32_t size = originalSize;
-  for (uint16_t supportedSize : gFaviconSizes) {
-    if (supportedSize <= originalSize) {
-      size = supportedSize;
-      break;
-    }
-  }
-  *aWidth = size;
-
-  // If the original payload is png and the size is the same, no reason to
-  // rescale the image.
-  if (aMimeType.EqualsLiteral(PNG_MIME_TYPE) && size == originalSize) {
-    return NS_OK;
-  }
-
-  // Rescale when needed.
-  RefPtr<gfx::DataSourceSurface> targetDataSurface =
-      gfx::Factory::CreateDataSourceSurface(gfx::IntSize(size, size),
-                                            gfx::SurfaceFormat::B8G8R8A8, true);
-  NS_ENSURE_STATE(targetDataSurface);
-
-  {  // Block scope for map.
-    gfx::DataSourceSurface::MappedSurface map;
-    if (!targetDataSurface->Map(gfx::DataSourceSurface::MapType::WRITE, &map)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    RefPtr<gfx::DrawTarget> dt = gfx::Factory::CreateDrawTargetForData(
-        gfx::BackendType::CAIRO, map.mData, targetDataSurface->GetSize(),
-        map.mStride, gfx::SurfaceFormat::B8G8R8A8);
-    NS_ENSURE_STATE(dt);
-
-    gfx::IntSize frameSize = dataSurface->GetSize();
-    dt->DrawSurface(dataSurface, gfx::Rect(0, 0, size, size),
-                    gfx::Rect(0, 0, frameSize.width, frameSize.height),
-                    gfx::DrawSurfaceOptions(),
-                    gfx::DrawOptions(1.0f, gfx::CompositionOp::OP_SOURCE));
-    targetDataSurface->Unmap();
-  }
-
-  // Finally Encode.
-  nsCOMPtr<imgIEncoder> encoder =
-      do_CreateInstance("@mozilla.org/image/encoder;2?type=image/png");
-  NS_ENSURE_STATE(encoder);
-
-  gfx::DataSourceSurface::MappedSurface map;
-  if (!targetDataSurface->Map(gfx::DataSourceSurface::MapType::READ, &map)) {
-    return NS_ERROR_FAILURE;
-  }
-  rv = encoder->InitFromData(map.mData, map.mStride * size, size, size,
-                             map.mStride, imgIEncoder::INPUT_FORMAT_HOSTARGB,
-                             u""_ns);
-  targetDataSurface->Unmap();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Read the stream into a new buffer.
-  nsCOMPtr<nsIInputStream> iconStream = encoder;
-  NS_ENSURE_STATE(iconStream);
-  rv = NS_ConsumeStream(iconStream, UINT32_MAX, aPayload);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-nsresult FetchAndConvertUnsupportedPayloads::StorePayload(
-    int64_t aId, int32_t aWidth, const nsCString& aPayload) {
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  NS_ENSURE_STATE(mDB);
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mDB->CreateStatement(
-      nsLiteralCString(
-          "UPDATE moz_icons SET data = :data, width = :width WHERE id = :id"),
-      getter_AddRefs(stmt));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = stmt->BindInt64ByName("id"_ns, aId);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->BindInt32ByName("width"_ns, aWidth);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = stmt->BindBlobByName("data"_ns, TO_INTBUFFER(aPayload),
-                            aPayload.Length());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = stmt->Execute();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
 //// AsyncCopyFavicons
 
 AsyncCopyFavicons::AsyncCopyFavicons(PageData& aFromPage, PageData& aToPage,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/FaviconHelpers.h firefox-85.0+build1/toolkit/components/places/FaviconHelpers.h
--- firefox-84.0.2+build1/toolkit/components/places/FaviconHelpers.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/FaviconHelpers.h	2021-01-18 19:58:26.000000000 +0000
@@ -42,9 +42,6 @@
 // is far in the future.
 #define MAX_FAVICON_EXPIRATION ((PRTime)7 * 24 * 60 * 60 * PR_USEC_PER_SEC)
 
-// Whether there are unsupported payloads to convert yet.
-#define PREF_CONVERT_PAYLOADS "places.favicons.convertPayloads"
-
 namespace mozilla {
 namespace places {
 
@@ -299,30 +296,6 @@
 };
 
 /**
- * Fetches and converts unsupported payloads. This is used during the initial
- * migration of icons from the old to the new store.
- */
-class FetchAndConvertUnsupportedPayloads final : public Runnable {
- public:
-  NS_DECL_NSIRUNNABLE
-
-  /**
-   * Constructor.
-   *
-   * @param aDBConn
-   *        The database connection to use.
-   */
-  explicit FetchAndConvertUnsupportedPayloads(mozIStorageConnection* aDBConn);
-
- private:
-  nsresult ConvertPayload(int64_t aId, const nsACString& aMimeType,
-                          nsCString& aPayload, int32_t* aWidth);
-  nsresult StorePayload(int64_t aId, int32_t aWidth, const nsCString& aPayload);
-
-  nsCOMPtr<mozIStorageConnection> mDB;
-};
-
-/**
  * Copies Favicons from one page to another one.
  */
 class AsyncCopyFavicons final : public Runnable {
diff -Nru firefox-84.0.2+build1/toolkit/components/places/History.cpp firefox-85.0+build1/toolkit/components/places/History.cpp
--- firefox-84.0.2+build1/toolkit/components/places/History.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/History.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -55,9 +55,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //// Global Defines
 
-#define URI_VISITED "visited"
-#define URI_NOT_VISITED "not visited"
-#define URI_VISITED_RESOLUTION_TOPIC "visited-status-resolution"
 // Observer event fired after a visit has been registered in the DB.
 #define URI_VISIT_SAVED "uri-visit-saved"
 
@@ -428,16 +425,6 @@
                                : IHistory::VisitedStatus::Unvisited;
       history->NotifyVisited(mURI, status);
     }
-
-    nsCOMPtr<nsIObserverService> observerService =
-        mozilla::services::GetObserverService();
-    if (observerService) {
-      static const char16_t visited[] = u"" URI_VISITED;
-      static const char16_t notVisited[] = u"" URI_NOT_VISITED;
-      const char16_t* status = mIsVisited ? visited : notVisited;
-      (void)observerService->NotifyObservers(mURI, URI_VISITED_RESOLUTION_TOPIC,
-                                             status);
-    }
   }
 
  private:
@@ -1829,10 +1816,7 @@
 
   nsresult rv;
   if (XRE_IsContentProcess()) {
-    bool canAddURI = false;
-    rv = nsNavHistory::CanAddURIToHistory(aURI, &canAddURI);
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!canAddURI) {
+    if (!BaseHistory::CanStore(aURI)) {
       return NS_OK;
     }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/places/History.jsm firefox-85.0+build1/toolkit/components/places/History.jsm
--- firefox-84.0.2+build1/toolkit/components/places/History.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/History.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -73,16 +73,12 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
-  this,
-  "NetUtil",
-  "resource://gre/modules/NetUtil.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "PlacesUtils",
-  "resource://gre/modules/PlacesUtils.jsm"
-);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AppConstants: "resource://gre/modules/AppConstants.jsm",
+  PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
+  Services: "resource://gre/modules/Services.jsm",
+});
 
 XPCOMUtils.defineLazyServiceGetter(
   this,
@@ -119,7 +115,14 @@
   for (let observer of observers) {
     try {
       observer[notification](...args);
-    } catch (ex) {}
+    } catch (ex) {
+      if (
+        ex.result != Cr.NS_ERROR_XPC_JSOBJECT_HAS_NO_FUNCTION_NAMED &&
+        (AppConstants.DEBUG || Cu.isInAutomation)
+      ) {
+        Cu.reportError(ex);
+      }
+    }
   }
 }
 
@@ -1034,11 +1037,12 @@
 var notifyCleanup = async function(db, pages, transition = -1) {
   let notifiedCount = 0;
   let observers = PlacesUtils.history.getObservers();
+  let bookmarkObservers = PlacesUtils.bookmarks.getObservers();
 
   let reason = Ci.nsINavHistoryObserver.REASON_DELETED;
 
   for (let page of pages) {
-    let uri = NetUtil.newURI(page.url.href);
+    let uri = Services.io.newURI(page.url.href);
     let guid = page.guid;
     if (page.hasVisits || page.hasForeign) {
       // We have removed all visits, but the page is still alive, e.g.
@@ -1050,6 +1054,34 @@
         reason,
         transition,
       ]);
+      // Also asynchronously notify bookmarks for this uri if all the visits
+      // have been removed.
+      if (!page.hasVisits) {
+        PlacesUtils.bookmarks
+          .fetch({ url: page.url }, async bookmark => {
+            let itemId = await PlacesUtils.promiseItemId(bookmark.guid);
+            let parentId = await PlacesUtils.promiseItemId(bookmark.parentGuid);
+            notify(
+              bookmarkObservers,
+              "onItemChanged",
+              [
+                itemId,
+                "cleartime",
+                false,
+                "",
+                0,
+                PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                parentId,
+                bookmark.guid,
+                bookmark.parentGuid,
+                "",
+                PlacesUtils.bookmarks.SOURCES.DEFAULT,
+              ],
+              { concurrent: true }
+            );
+          })
+          .catch(Cu.reportError);
+      }
     } else {
       // The page has been entirely removed.
       notify(observers, "onDeleteURI", [uri, guid, reason]);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/moz.build firefox-85.0+build1/toolkit/components/places/moz.build
--- firefox-84.0.2+build1/toolkit/components/places/moz.build	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/moz.build	2021-01-18 19:58:26.000000000 +0000
@@ -62,7 +62,6 @@
         "ExtensionSearchHandler.jsm",
         "History.jsm",
         "PlacesBackups.jsm",
-        "PlacesCategoriesStarter.jsm",
         "PlacesDBUtils.jsm",
         "PlacesExpiration.jsm",
         "PlacesRemoteTabsAutocompleteProvider.jsm",
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsFaviconService.cpp firefox-85.0+build1/toolkit/components/places/nsFaviconService.cpp
--- firefox-84.0.2+build1/toolkit/components/places/nsFaviconService.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsFaviconService.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -155,13 +155,6 @@
   mExpireUnassociatedIconsTimer = NS_NewTimer();
   NS_ENSURE_STATE(mExpireUnassociatedIconsTimer);
 
-  // Check if there are still icon payloads to be converted.
-  bool shouldConvertPayloads =
-      Preferences::GetBool(PREF_CONVERT_PAYLOADS, false);
-  if (shouldConvertPayloads) {
-    ConvertUnsupportedPayloads(mDB->MainConn());
-  }
-
   return NS_OK;
 }
 
@@ -253,36 +246,14 @@
   return NS_OK;
 }
 
-void nsFaviconService::SendFaviconNotifications(nsIURI* aPageURI,
-                                                nsIURI* aFaviconURI,
-                                                const nsACString& aGUID) {
-  nsAutoCString faviconSpec;
-  nsNavHistory* history = nsNavHistory::GetHistoryService();
-  if (history && NS_SUCCEEDED(aFaviconURI->GetSpec(faviconSpec))) {
-    // Invalide page-icon image cache, since the icon is about to change.
-    nsCString spec;
-    nsresult rv = aPageURI->GetSpec(spec);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-    if (NS_SUCCEEDED(rv)) {
-      nsCString pageIconSpec("page-icon:");
-      pageIconSpec.Append(spec);
-      nsCOMPtr<nsIURI> pageIconURI;
-      rv = NS_NewURI(getter_AddRefs(pageIconURI), pageIconSpec);
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
-      if (NS_SUCCEEDED(rv)) {
-        nsCOMPtr<imgICache> imgCache;
-        rv = GetImgTools()->GetImgCacheForDocument(nullptr,
-                                                   getter_AddRefs(imgCache));
-        MOZ_ASSERT(NS_SUCCEEDED(rv));
-        if (NS_SUCCEEDED(rv)) {
-          Unused << imgCache->RemoveEntry(pageIconURI, nullptr);
-        }
-      }
-    }
-
-    history->SendPageChangedNotification(
-        aPageURI, nsINavHistoryObserver::ATTRIBUTE_FAVICON,
-        NS_ConvertUTF8toUTF16(faviconSpec), aGUID);
+void nsFaviconService::ClearImageCache(nsIURI* aImageURI) {
+  MOZ_ASSERT(aImageURI, "Must pass a non-null URI");
+  nsCOMPtr<imgICache> imgCache;
+  nsresult rv =
+      GetImgTools()->GetImgCacheForDocument(nullptr, getter_AddRefs(imgCache));
+  MOZ_ASSERT(NS_SUCCEEDED(rv));
+  if (NS_SUCCEEDED(rv)) {
+    Unused << imgCache->RemoveEntry(aImageURI, nullptr);
   }
 }
 
@@ -793,27 +764,6 @@
   return stmt->ExecuteAsync(aCallback, getter_AddRefs(pendingStatement));
 }
 
-void  // static
-nsFaviconService::ConvertUnsupportedPayloads(mozIStorageConnection* aDBConn) {
-  MOZ_ASSERT(NS_IsMainThread());
-  // Ensure imgTools are initialized, so that the image decoders can be used
-  // off the main thread.
-  nsCOMPtr<imgITools> imgTools =
-      do_CreateInstance("@mozilla.org/image/tools;1");
-
-  Preferences::SetBool(PREF_CONVERT_PAYLOADS, true);
-  MOZ_ASSERT(aDBConn);
-  if (aDBConn) {
-    RefPtr<FetchAndConvertUnsupportedPayloads> event =
-        new FetchAndConvertUnsupportedPayloads(aDBConn);
-    nsCOMPtr<nsIEventTarget> target = do_GetInterface(aDBConn);
-    MOZ_ASSERT(target);
-    if (target) {
-      (void)target->Dispatch(event, NS_DISPATCH_NORMAL);
-    }
-  }
-}
-
 NS_IMETHODIMP
 nsFaviconService::SetDefaultIconURIPreferredSize(uint16_t aDefaultSize) {
   mDefaultIconURIPreferredSize = aDefaultSize > 0 ? aDefaultSize : UINT16_MAX;
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsFaviconService.h firefox-85.0+build1/toolkit/components/places/nsFaviconService.h
--- firefox-84.0.2+build1/toolkit/components/places/nsFaviconService.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsFaviconService.h	2021-01-18 19:58:26.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/storage.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsDataHashtable.h"
 #include "nsIFaviconService.h"
 #include "nsINamed.h"
@@ -74,11 +75,6 @@
     return gFaviconService;
   }
 
-  /**
-   * Fetch and migrate favicons from an unsupported payload to a supported one.
-   */
-  static void ConvertUnsupportedPayloads(mozIStorageConnection* aDBConn);
-
   // addition to API for strings to prevent excessive parsing of URIs
   nsresult GetFaviconLinkForIconString(const nsCString& aIcon,
                                        nsIURI** aOutput);
@@ -99,17 +95,12 @@
                                mozIStorageStatementCallback* aCallback);
 
   /**
-   * Call to send out favicon changed notifications. Should only be called
-   * when there is data loaded for the favicon.
-   * @param aPageURI
-   *        The URI of the page to notify about.
-   * @param aFaviconURI
-   *        The moz-anno:favicon URI of the icon.
-   * @param aGUID
-   *        The unique ID associated with the page.
+   * Clears the image cache for the given image spec.
+   *
+   * @param aImageURI
+   *        The URI of the image to clear cache for.
    */
-  void SendFaviconNotifications(nsIURI* aPageURI, nsIURI* aFaviconURI,
-                                const nsACString& aGUID);
+  void ClearImageCache(nsIURI* aImageURI);
 
   static mozilla::Atomic<int64_t> sLastInsertedIconId;
   static void StoreLastInsertedId(const nsACString& aTable,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsINavBookmarksService.idl firefox-85.0+build1/toolkit/components/places/nsINavBookmarksService.idl
--- firefox-84.0.2+build1/toolkit/components/places/nsINavBookmarksService.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsINavBookmarksService.idl	2021-01-18 19:58:26.000000000 +0000
@@ -72,7 +72,6 @@
    *       guid          | The new bookmark guid.
    *       cleartime     | Empty string (all visits to this item were removed).
    *       title         | The new title.
-   *       favicon       | The "moz-anno" URL of the new favicon.
    *       uri           | new URL.
    *       tags          | Empty string (tags for this item changed)
    *       dateAdded     | PRTime (as string) when the item was first added.
@@ -83,7 +82,6 @@
    *       guid          | The old bookmark guid.
    *       cleartime     | Empty string (currently unused).
    *       title         | Empty string (currently unused).
-   *       favicon       | Empty string (currently unused).
    *       uri           | old URL.
    *       tags          | Empty string (currently unused).
    *       dateAdded     | Empty string (currently unused).
@@ -102,45 +100,6 @@
                      in unsigned short aSource);
 
   /**
-   * Notifies that the item was visited.  Can be invoked only for TYPE_BOOKMARK
-   * items.
-   *
-   * @param aItemId
-   *        The id of the bookmark that was visited.
-   * @param aVisitId
-   *        The id of the visit.
-   * @param aTime
-   *        The time of the visit.
-   * @param aTransitionType
-   *        The transition for the visit.  See nsINavHistoryService::TRANSITION_*
-   *        constants for a list of possible values.
-   * @param aURI
-   *        The nsIURI for this bookmark.
-   * @param aParentId
-   *        The id of the folder containing the item.
-   * @param aGuid
-   *        The unique ID associated with the item.
-   * @param aParentGuid
-   *        The unique ID associated with the item's parent.
-   *
-   * @see onItemChanged with property = "cleartime" for when all visits to an
-   *      item are removed.
-   *
-   * @note The reported time is the time of the visit that was added, which may
-   *       be well in the past since the visit time can be specified.  This
-   *       means that the visit the observer is told about may not be the most
-   *       recent visit for that page.
-   */
-  void onItemVisited(in long long aItemId,
-                     in long long aVisitId,
-                     in PRTime aTime,
-                     in unsigned long aTransitionType,
-                     in nsIURI aURI,
-                     in long long aParentId,
-                     in ACString aGuid,
-                     in ACString aParentGuid);
-
-  /**
    * Notifies that an item has been moved.
    *
    * @param aItemId
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsINavHistoryService.idl firefox-85.0+build1/toolkit/components/places/nsINavHistoryService.idl
--- firefox-84.0.2+build1/toolkit/components/places/nsINavHistoryService.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsINavHistoryService.idl	2021-01-18 19:58:26.000000000 +0000
@@ -309,6 +309,16 @@
 interface nsINavHistoryResultObserver : nsISupports
 {
   /**
+   * Whether the observer is interested into history details changes.
+   * Those include visits additions and removals. If the observer doesn't
+   * provide this attribute, it will default to true.
+   * In practice, the observer won't receive nodeHistoryDetailsChanged.
+   * Note: this is only read when the observer is added, it cannot be changed
+   * dynamically.
+   */
+  readonly attribute boolean observeHistoryDetails;
+
+  /**
    * Called when 'aItem' is inserted into 'aParent' at index 'aNewIndex'.
    * The item previously at index (if any) and everything below it will have
    * been shifted down by one. The item may be a container or a leaf.
@@ -660,29 +670,6 @@
   void onClearHistory();
 
   /**
-   * onPageChanged attribute indicating that favicon has been updated.
-   * aNewValue parameter will be set to the new favicon URI string.
-   */
-  const unsigned long ATTRIBUTE_FAVICON = 3;
-
-  /**
-   * An attribute of this page changed.
-   *
-   * @param aURI
-   *        The URI of the page on which an attribute changed.
-   * @param aChangedAttribute
-   *        The attribute whose value changed.  See ATTRIBUTE_* constants.
-   * @param aNewValue
-   *        The attribute's new value.
-   * @param aGUID
-   *        The unique ID associated with the page.
-   */
-  void onPageChanged(in nsIURI aURI,
-                     in unsigned long aChangedAttribute,
-                     in AString aNewValue,
-                     in ACString aGUID);
-
-  /**
    * Called when some visits of an history entry are expired.
    *
    * @param aURI
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavBookmarks.cpp firefox-85.0+build1/toolkit/components/places/nsNavBookmarks.cpp
--- firefox-84.0.2+build1/toolkit/components/places/nsNavBookmarks.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavBookmarks.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -60,69 +60,6 @@
   return skipTags;
 }
 
-template <typename Method, typename DataType>
-class AsyncGetBookmarksForURI : public AsyncStatementCallback {
- public:
-  AsyncGetBookmarksForURI(nsNavBookmarks* aBookmarksSvc, Method aCallback,
-                          const DataType& aData)
-      : mBookmarksSvc(aBookmarksSvc), mCallback(aCallback), mData(aData) {}
-
-  void Init() {
-    RefPtr<Database> DB = Database::GetDatabase();
-    if (DB) {
-      nsCOMPtr<mozIStorageAsyncStatement> stmt = DB->GetAsyncStatement(
-          "/* do not warn (bug 1175249) */ "
-          "SELECT b.id, b.guid, b.parent, b.lastModified, t.guid, t.parent "
-          "FROM moz_bookmarks b "
-          "JOIN moz_bookmarks t on t.id = b.parent "
-          "WHERE b.fk = (SELECT id FROM moz_places WHERE url_hash = "
-          "hash(:page_url) AND url = :page_url) "
-          "ORDER BY b.lastModified DESC, b.id DESC ");
-      if (stmt) {
-        (void)URIBinder::Bind(stmt, "page_url"_ns, mData.bookmark.url);
-        nsCOMPtr<mozIStoragePendingStatement> pendingStmt;
-        (void)stmt->ExecuteAsync(this, getter_AddRefs(pendingStmt));
-      }
-    }
-  }
-
-  NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet) override {
-    nsCOMPtr<mozIStorageRow> row;
-    while (NS_SUCCEEDED(aResultSet->GetNextRow(getter_AddRefs(row))) && row) {
-      // Skip tags, for the use-cases of this async getter they are useless.
-      int64_t grandParentId = -1, tagsFolderId = -1;
-      nsresult rv = row->GetInt64(5, &grandParentId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = mBookmarksSvc->GetTagsFolder(&tagsFolderId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (grandParentId == tagsFolderId) {
-        continue;
-      }
-
-      mData.bookmark.grandParentId = grandParentId;
-      rv = row->GetInt64(0, &mData.bookmark.id);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = row->GetUTF8String(1, mData.bookmark.guid);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = row->GetInt64(2, &mData.bookmark.parentId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      // lastModified (3) should not be set for the use-cases of this getter.
-      rv = row->GetUTF8String(4, mData.bookmark.parentGuid);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      if (mCallback) {
-        ((*mBookmarksSvc).*mCallback)(mData);
-      }
-    }
-    return NS_OK;
-  }
-
- private:
-  RefPtr<nsNavBookmarks> mBookmarksSvc;
-  Method mCallback;
-  DataType mData;
-};
-
 // Returns the sync change counter increment for a change source constant.
 inline int64_t DetermineSyncChangeDelta(uint16_t aSource) {
   return aSource == nsINavBookmarksService::SOURCE_SYNC ? 0 : 1;
@@ -159,8 +96,8 @@
   if (gBookmarksService == this) gBookmarksService = nullptr;
 }
 
-NS_IMPL_ISUPPORTS(nsNavBookmarks, nsINavBookmarksService, nsINavHistoryObserver,
-                  nsIObserver, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS(nsNavBookmarks, nsINavBookmarksService, nsIObserver,
+                  nsISupportsWeakReference)
 
 Atomic<int64_t> nsNavBookmarks::sLastInsertedItemId(0);
 
@@ -189,16 +126,6 @@
 
   mCanNotify = true;
 
-  // Allows us to notify on title changes. MUST BE LAST so it is impossible
-  // to fail after this call, or the history service will have a reference to
-  // us and we won't go away.
-  nsNavHistory* history = nsNavHistory::GetHistoryService();
-  NS_ENSURE_STATE(history);
-  history->AddObserver(this, true);
-  AutoTArray<PlacesEventType, 1> events;
-  events.AppendElement(PlacesEventType::Page_visited);
-  PlacesObservers::AddListener(events, this);
-
   // DO NOT PUT STUFF HERE that can fail. See observer comment above.
 
   return NS_OK;
@@ -1774,21 +1701,6 @@
   return NS_OK;
 }
 
-void nsNavBookmarks::NotifyItemVisited(const ItemVisitData& aData) {
-  nsCOMPtr<nsIURI> uri;
-  MOZ_ALWAYS_SUCCEEDS(NS_NewURI(getter_AddRefs(uri), aData.bookmark.url));
-  // Notify the visit only if we have a valid uri, otherwise the observer
-  // couldn't gather enough data from the notification.
-  // This should be false only if there's a bug in the code preceding us.
-  if (uri) {
-    NOTIFY_OBSERVERS(
-        mCanNotify, mObservers, nsINavBookmarkObserver,
-        OnItemVisited(aData.bookmark.id, aData.visitId, aData.time,
-                      aData.transitionType, uri, aData.bookmark.parentId,
-                      aData.bookmark.guid, aData.bookmark.parentGuid));
-  }
-}
-
 void nsNavBookmarks::NotifyItemChanged(const ItemChangeData& aData) {
   // A guid must always be defined.
   MOZ_ASSERT(!aData.bookmark.guid.IsEmpty());
@@ -1827,145 +1739,3 @@
 
   return NS_OK;
 }
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsINavHistoryObserver
-
-NS_IMETHODIMP
-nsNavBookmarks::OnBeginUpdateBatch() {
-  NOTIFY_OBSERVERS(mCanNotify, mObservers, nsINavBookmarkObserver,
-                   OnBeginUpdateBatch());
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnEndUpdateBatch() {
-  NOTIFY_OBSERVERS(mCanNotify, mObservers, nsINavBookmarkObserver,
-                   OnEndUpdateBatch());
-  return NS_OK;
-}
-
-void nsNavBookmarks::HandlePlacesEvent(const PlacesEventSequence& aEvents) {
-  for (const auto& event : aEvents) {
-    if (NS_WARN_IF(event->Type() != PlacesEventType::Page_visited)) {
-      continue;
-    }
-
-    const dom::PlacesVisit* visit = event->AsPlacesVisit();
-    if (NS_WARN_IF(!visit)) {
-      continue;
-    }
-
-    ItemVisitData visitData;
-    visitData.visitId = visit->mVisitId;
-    CopyUTF16toUTF8(visit->mUrl, visitData.bookmark.url);
-    visitData.time = visit->mVisitTime * 1000;
-    visitData.transitionType = visit->mTransitionType;
-    RefPtr<AsyncGetBookmarksForURI<ItemVisitMethod, ItemVisitData>> notifier =
-        new AsyncGetBookmarksForURI<ItemVisitMethod, ItemVisitData>(
-            this, &nsNavBookmarks::NotifyItemVisited, visitData);
-    notifier->Init();
-  }
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnDeleteURI(nsIURI* aURI, const nsACString& aGUID,
-                            uint16_t aReason) {
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnClearHistory() {
-  // TODO(bryner): we should notify on visited-time change for all URIs
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnTitleChanged(nsIURI* aURI, const nsAString& aPageTitle,
-                               const nsACString& aGUID) {
-  // NOOP. We don't consume page titles from moz_places anymore.
-  // Title-change notifications are sent from SetItemTitle.
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnFrecencyChanged(nsIURI* aURI, int32_t aNewFrecency,
-                                  const nsACString& aGUID, bool aHidden,
-                                  PRTime aLastVisitDate) {
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnManyFrecenciesChanged() { return NS_OK; }
-
-NS_IMETHODIMP
-nsNavBookmarks::OnPageChanged(nsIURI* aURI, uint32_t aChangedAttribute,
-                              const nsAString& aNewValue,
-                              const nsACString& aGUID) {
-  NS_ENSURE_ARG(aURI);
-
-  nsresult rv;
-  if (aChangedAttribute == nsINavHistoryObserver::ATTRIBUTE_FAVICON) {
-    ItemChangeData changeData;
-    rv = aURI->GetSpec(changeData.bookmark.url);
-    NS_ENSURE_SUCCESS(rv, rv);
-    changeData.property = "favicon"_ns;
-    changeData.isAnnotation = false;
-    CopyUTF16toUTF8(aNewValue, changeData.newValue);
-    changeData.bookmark.lastModified = 0;
-    changeData.bookmark.type = TYPE_BOOKMARK;
-
-    // Favicons may be set to either pure URIs or to folder URIs
-    if (aURI->SchemeIs("place")) {
-      nsNavHistory* history = nsNavHistory::GetHistoryService();
-      NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-
-      nsCOMPtr<nsINavHistoryQuery> query;
-      nsCOMPtr<nsINavHistoryQueryOptions> options;
-      rv = history->QueryStringToQuery(changeData.bookmark.url,
-                                       getter_AddRefs(query),
-                                       getter_AddRefs(options));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      RefPtr<nsNavHistoryQuery> queryObj = do_QueryObject(query);
-      if (queryObj->Parents().Length() == 1) {
-        // Fetch missing data.
-        rv = FetchItemInfo(queryObj->Parents()[0], changeData.bookmark);
-        NS_ENSURE_SUCCESS(rv, rv);
-        NotifyItemChanged(changeData);
-      }
-    } else {
-      RefPtr<AsyncGetBookmarksForURI<ItemChangeMethod, ItemChangeData>>
-          notifier =
-              new AsyncGetBookmarksForURI<ItemChangeMethod, ItemChangeData>(
-                  this, &nsNavBookmarks::NotifyItemChanged, changeData);
-      notifier->Init();
-    }
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNavBookmarks::OnDeleteVisits(nsIURI* aURI, bool aPartialRemoval,
-                               const nsACString& aGUID, uint16_t aReason,
-                               uint32_t aTransitionType) {
-  NS_ENSURE_ARG(aURI);
-
-  // Notify "cleartime" only if all visits to the page have been removed.
-  if (!aPartialRemoval) {
-    // If the page is bookmarked, notify observers for each associated bookmark.
-    ItemChangeData changeData;
-    nsresult rv = aURI->GetSpec(changeData.bookmark.url);
-    NS_ENSURE_SUCCESS(rv, rv);
-    changeData.property = "cleartime"_ns;
-    changeData.isAnnotation = false;
-    changeData.bookmark.lastModified = 0;
-    changeData.bookmark.type = TYPE_BOOKMARK;
-
-    RefPtr<AsyncGetBookmarksForURI<ItemChangeMethod, ItemChangeData>> notifier =
-        new AsyncGetBookmarksForURI<ItemChangeMethod, ItemChangeData>(
-            this, &nsNavBookmarks::NotifyItemChanged, changeData);
-    notifier->Init();
-  }
-  return NS_OK;
-}
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavBookmarks.h firefox-85.0+build1/toolkit/components/places/nsNavBookmarks.h
--- firefox-84.0.2+build1/toolkit/components/places/nsNavBookmarks.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavBookmarks.h	2021-01-18 19:58:27.000000000 +0000
@@ -71,16 +71,12 @@
 }  // namespace places
 }  // namespace mozilla
 
-class nsNavBookmarks final
-    : public nsINavBookmarksService,
-      public nsINavHistoryObserver,
-      public nsIObserver,
-      public nsSupportsWeakReference,
-      public mozilla::places::INativePlacesEventCallback {
+class nsNavBookmarks final : public nsINavBookmarksService,
+                             public nsIObserver,
+                             public nsSupportsWeakReference {
  public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSINAVBOOKMARKSSERVICE
-  NS_DECL_NSINAVHISTORYOBSERVER
   NS_DECL_NSIOBSERVER
 
   nsNavBookmarks();
@@ -203,15 +199,6 @@
    */
   void NotifyItemChanged(const ItemChangeData& aData);
 
-  /**
-   * Part of INativePlacesEventCallback - handles events from the places
-   * observer system.
-   * @param aCx
-   *        A JSContext for extracting the values from aEvents.
-   * @param aEvents
-   *        An array of weakly typed events detailing what changed.
-   */
-  void HandlePlacesEvent(const PlacesEventSequence& aEvents) override;
   static const int32_t kGetChildrenIndex_Guid;
   static const int32_t kGetChildrenIndex_Position;
   static const int32_t kGetChildrenIndex_Type;
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavHistory.cpp firefox-85.0+build1/toolkit/components/places/nsNavHistory.cpp
--- firefox-84.0.2+build1/toolkit/components/places/nsNavHistory.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavHistory.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -37,6 +37,7 @@
 #include "nsThreadUtils.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsMathUtils.h"
+#include "nsReadableUtils.h"
 #include "mozilla/storage.h"
 #include "mozilla/Preferences.h"
 #include <algorithm>
@@ -878,74 +879,10 @@
   NS_ENSURE_ARG_POINTER(canAdd);
 
   // If history is disabled, don't add any entry.
-  if (IsHistoryDisabled()) {
-    *canAdd = false;
-    return NS_OK;
-  }
-
-  return CanAddURIToHistory(aURI, canAdd);
-}
-
-// nsNavHistory::CanAddURIToHistory
-//
-//    Helper for nsNavHistory::CanAddURI to be callable from a child process
-
-// static
-nsresult nsNavHistory::CanAddURIToHistory(nsIURI* aURI, bool* aCanAdd) {
-  // Default to false.
-  *aCanAdd = false;
-
-  // If the url length is over a threshold, don't add it.
-  nsCString spec;
-  nsresult rv = aURI->GetSpec(spec);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (spec.Length() > MaxURILength()) {
-    return NS_OK;
-  }
-
-  nsAutoCString scheme;
-  rv = aURI->GetScheme(scheme);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // first check the most common cases
-  if (scheme.EqualsLiteral("http") || scheme.EqualsLiteral("https")) {
-    *aCanAdd = true;
-    return NS_OK;
-  }
-
-  // now check for all bad things
-  *aCanAdd =
-      !scheme.EqualsLiteral("about") && !scheme.EqualsLiteral("blob") &&
-      !scheme.EqualsLiteral("chrome") && !scheme.EqualsLiteral("data") &&
-      !scheme.EqualsLiteral("imap") && !scheme.EqualsLiteral("javascript") &&
-      !scheme.EqualsLiteral("mailbox") && !scheme.EqualsLiteral("moz-anno") &&
-      !scheme.EqualsLiteral("news") && !scheme.EqualsLiteral("page-icon") &&
-      !scheme.EqualsLiteral("resource") &&
-      !scheme.EqualsLiteral("view-source") &&
-      !scheme.EqualsLiteral("moz-extension");
-
+  *canAdd = !IsHistoryDisabled() && BaseHistory::CanStore(aURI);
   return NS_OK;
 }
 
-// nsNavHistory::MaxURILength
-
-// static
-uint32_t nsNavHistory::MaxURILength() {
-  // Duplicates Database::MaxUrlLength() for use in
-  // child processes without a database instance.
-  static uint32_t maxSpecLength = 0;
-  if (!maxSpecLength) {
-    maxSpecLength = Preferences::GetInt(PREF_HISTORY_MAXURLLEN,
-                                        PREF_HISTORY_MAXURLLEN_DEFAULT);
-    if (maxSpecLength < 255 || maxSpecLength > INT32_MAX) {
-      maxSpecLength = PREF_HISTORY_MAXURLLEN_DEFAULT;
-    }
-  }
-  return maxSpecLength;
-}
-
-// nsNavHistory::GetNewQuery
-
 NS_IMETHODIMP
 nsNavHistory::GetNewQuery(nsINavHistoryQuery** _retval) {
   NS_ASSERTION(NS_IsMainThread(), "This can only be called on the main thread");
@@ -2848,19 +2785,10 @@
 
   // itemId
   int64_t itemId = aRow->AsInt64(kGetInfoIndex_ItemId);
-  int64_t parentId = -1;
   if (itemId == 0) {
     // This is not a bookmark.  For non-bookmarks we use a -1 itemId value.
     // Notice ids in sqlite tables start from 1, so itemId cannot ever be 0.
     itemId = -1;
-  } else {
-    // This is a bookmark, so it has a parent.
-    int64_t itemParentId = aRow->AsInt64(kGetInfoIndex_ItemParentId);
-    if (itemParentId > 0) {
-      // The Places root has parent == 0, but that item id does not really
-      // exist. We want to set the parent only if it's a real one.
-      parentId = itemParentId;
-    }
   }
 
   if (IsQueryURI(url)) {
@@ -2919,7 +2847,6 @@
 
     if (itemId != -1) {
       resultNode->mItemId = itemId;
-      resultNode->mFolderId = parentId;
       resultNode->mDateAdded = aRow->AsInt64(kGetInfoIndex_ItemDateAdded);
       resultNode->mLastModified = aRow->AsInt64(kGetInfoIndex_ItemLastModified);
 
@@ -3215,15 +3142,6 @@
   return RowToResult(row, aOptions, aResult);
 }
 
-void nsNavHistory::SendPageChangedNotification(nsIURI* aURI,
-                                               uint32_t aChangedAttribute,
-                                               const nsAString& aNewValue,
-                                               const nsACString& aGUID) {
-  MOZ_ASSERT(!aGUID.IsEmpty());
-  NOTIFY_OBSERVERS(mCanNotify, mObservers, nsINavHistoryObserver,
-                   OnPageChanged(aURI, aChangedAttribute, aNewValue, aGUID));
-}
-
 void nsNavHistory::GetAgeInDaysString(int32_t aInt, const char* aName,
                                       nsACString& aResult) {
   nsIStringBundle* bundle = GetBundle();
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavHistory.h firefox-85.0+build1/toolkit/components/places/nsNavHistory.h
--- firefox-84.0.2+build1/toolkit/components/places/nsNavHistory.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavHistory.h	2021-01-18 19:58:26.000000000 +0000
@@ -173,12 +173,6 @@
   static void GetMonthName(const PRExplodedTime& aTime, nsACString& aResult);
   static void GetMonthYear(const PRExplodedTime& aTime, nsACString& aResult);
 
-  // Returns true if the provided URI spec and scheme is allowed in history
-  static nsresult CanAddURIToHistory(nsIURI* aURI, bool* aCanAdd);
-
-  // The max URI spec length allowed for a URI to be added to history
-  static uint32_t MaxURILength();
-
   // Returns whether history is enabled or not.
   bool IsHistoryDisabled() { return !mHistoryEnabled; }
 
@@ -234,12 +228,6 @@
   nsresult URIToResultNode(nsIURI* aURI, nsNavHistoryQueryOptions* aOptions,
                            nsNavHistoryResultNode** aResult);
 
-  // used by other places components to send history notifications (for example,
-  // when the favicon has changed)
-  void SendPageChangedNotification(nsIURI* aURI, uint32_t aChangedAttribute,
-                                   const nsAString& aValue,
-                                   const nsACString& aGUID);
-
   /**
    * Returns current number of days stored in history.
    */
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavHistoryResult.cpp firefox-85.0+build1/toolkit/components/places/nsNavHistoryResult.cpp
--- firefox-84.0.2+build1/toolkit/components/places/nsNavHistoryResult.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavHistoryResult.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -287,7 +287,6 @@
       mTime(aTime),
       mBookmarkIndex(-1),
       mItemId(-1),
-      mFolderId(-1),
       mVisitId(-1),
       mFromVisitId(-1),
       mDateAdded(0),
@@ -576,9 +575,9 @@
 nsNavHistoryContainerResultNode::GetState(uint16_t* _state) {
   NS_ENSURE_ARG_POINTER(_state);
 
-  *_state = mExpanded ? (uint16_t)STATE_OPENED
-                      : mAsyncPendingStmt ? (uint16_t)STATE_LOADING
-                                          : (uint16_t)STATE_CLOSED;
+  *_state = mExpanded           ? (uint16_t)STATE_OPENED
+            : mAsyncPendingStmt ? (uint16_t)STATE_LOADING
+                                : (uint16_t)STATE_CLOSED;
 
   return NS_OK;
 }
@@ -766,7 +765,7 @@
       mParent->mTime = mTime;
     }
 
-    if (shouldNotify) {
+    if (shouldNotify && !result->CanSkipHistoryDetailsNotifications()) {
       NOTIFY_RESULT_OBSERVERS(
           result, NodeHistoryDetailsChanged(TO_ICONTAINER(mParent), oldTime,
                                             oldAccessCount));
@@ -1164,7 +1163,7 @@
  *
  * @note Does not addref the node!
  */
-nsNavHistoryResultNode* nsNavHistoryContainerResultNode::FindChildURI(
+nsNavHistoryResultNode* nsNavHistoryContainerResultNode::FindChildByURI(
     const nsACString& aSpec, uint32_t* aNodeIndex) {
   for (int32_t i = 0; i < mChildren.Count(); ++i) {
     if (mChildren[i]->IsURI()) {
@@ -1178,6 +1177,20 @@
 }
 
 /**
+ * Searches for matches for the given URI.
+ */
+void nsNavHistoryContainerResultNode::FindChildrenByURI(
+    const nsCString& aSpec, nsCOMArray<nsNavHistoryResultNode>* aMatches) {
+  for (int32_t i = 0; i < mChildren.Count(); ++i) {
+    if (mChildren[i]->IsURI()) {
+      if (aSpec.Equals(mChildren[i]->mURI)) {
+        aMatches->AppendObject(mChildren[i]);
+      }
+    }
+  }
+}
+
+/**
  * Searches this folder for a node with the given guid/target-folder-guid.
  *
  * @return the node if found, null otherwise.
@@ -1218,7 +1231,8 @@
 
   mAccessCount += aNode->mAccessCount;
   if (mTime < aNode->mTime) mTime = aNode->mTime;
-  if (!mParent || mParent->AreChildrenVisible()) {
+  if ((!mParent || mParent->AreChildrenVisible()) &&
+      !result->CanSkipHistoryDetailsNotifications()) {
     NOTIFY_RESULT_OBSERVERS(
         result, NodeHistoryDetailsChanged(TO_ICONTAINER(this), oldTime,
                                           oldAccessCount));
@@ -1335,23 +1349,23 @@
  * terminate as soon as it finds a single match.  This would be used when there
  * are URI results so there will only ever be one copy of any URI.
  *
- * When aOnlyOne is false, it will check all elements.  This is for visit
- * style results that may have multiple copies of any given URI.
+ * When aOnlyOne is false, it will check all elements.  This is for non-history
+ * or visit style results that may have multiple copies of any given URI.
  */
 void nsNavHistoryContainerResultNode::RecursiveFindURIs(
     bool aOnlyOne, nsNavHistoryContainerResultNode* aContainer,
     const nsCString& aSpec, nsCOMArray<nsNavHistoryResultNode>* aMatches) {
-  for (int32_t child = 0; child < aContainer->mChildren.Count(); ++child) {
-    uint32_t type;
-    aContainer->mChildren[child]->GetType(&type);
-    if (nsNavHistoryResultNode::IsTypeURI(type)) {
-      // compare URIs
-      nsNavHistoryResultNode* uriNode = aContainer->mChildren[child];
-      if (uriNode->mURI.Equals(aSpec)) {
-        // found
-        aMatches->AppendObject(uriNode);
-        if (aOnlyOne) return;
+  for (int32_t i = 0; i < aContainer->mChildren.Count(); ++i) {
+    auto* node = aContainer->mChildren[i];
+    if (node->IsURI()) {
+      if (node->mURI.Equals(aSpec)) {
+        aMatches->AppendObject(node);
+        if (aOnlyOne) {
+          return;
+        }
       }
+    } else if (node->IsContainer() && node->GetAsContainer()->mExpanded) {
+      RecursiveFindURIs(aOnlyOne, node->GetAsContainer(), aSpec, aMatches);
     }
   }
 }
@@ -1382,7 +1396,7 @@
     RecursiveFindURIs(aOnlyOne, this, aSpec, &matches);
   } else if (aOnlyOne) {
     uint32_t nodeIndex;
-    nsNavHistoryResultNode* node = FindChildURI(aSpec, &nodeIndex);
+    nsNavHistoryResultNode* node = FindChildByURI(aSpec, &nodeIndex);
     if (node) matches.AppendObject(node);
   } else {
     MOZ_ASSERT(
@@ -1418,7 +1432,8 @@
     if (oldAccessCount != node->mAccessCount || oldTime != node->mTime) {
       parent->mAccessCount += node->mAccessCount - oldAccessCount;
       if (node->mTime > parent->mTime) parent->mTime = node->mTime;
-      if (parent->AreChildrenVisible()) {
+      if (parent->AreChildrenVisible() &&
+          !result->CanSkipHistoryDetailsNotifications()) {
         NOTIFY_RESULT_OBSERVERS_RET(
             result,
             NodeHistoryDetailsChanged(TO_ICONTAINER(parent), parentOldTime,
@@ -1823,6 +1838,9 @@
   nsNavHistoryResult* result = GetResult();
   NS_ENSURE_STATE(result);
 
+  // Ensure to add history observer before bookmarks observer, because the
+  // latter wants to know if an history observer was added.
+
   if (mOptions->QueryType() == nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY ||
       mOptions->QueryType() == nsINavHistoryQueryOptions::QUERY_TYPE_UNIFIED) {
     // Date containers that contain site containers have no reason to observe
@@ -2324,28 +2342,6 @@
 }
 
 NS_IMETHODIMP
-nsNavHistoryQueryResultNode::OnPageChanged(nsIURI* aURI,
-                                           uint32_t aChangedAttribute,
-                                           const nsAString& aNewValue,
-                                           const nsACString& aGUID) {
-  nsAutoCString spec;
-  nsresult rv = aURI->GetSpec(spec);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  switch (aChangedAttribute) {
-    case nsINavHistoryObserver::ATTRIBUTE_FAVICON: {
-      bool onlyOneEntry =
-          mOptions->ResultType() == nsINavHistoryQueryOptions::RESULTS_AS_URI;
-      UpdateURIs(true, onlyOneEntry, false, spec, setFaviconCallback, nullptr);
-      break;
-    }
-    default:
-      NS_WARNING("Unknown page changed notification");
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsNavHistoryQueryResultNode::OnDeleteVisits(nsIURI* aURI, bool aPartialRemoval,
                                             const nsACString& aGUID,
                                             uint16_t aReason,
@@ -2505,8 +2501,7 @@
   // Some node could observe both bookmarks and history.  But a node observing
   // only history should never get a bookmark notification.
   NS_WARNING_ASSERTION(
-      mResult && (mResult->mIsAllBookmarksObserver ||
-                  mResult->mIsBookmarkFolderObserver),
+      mResult && mResult->mIsBookmarksObserver,
       "history observers should not get OnItemChanged, but should get the "
       "corresponding history notifications instead");
 
@@ -2526,24 +2521,6 @@
 }
 
 NS_IMETHODIMP
-nsNavHistoryQueryResultNode::OnItemVisited(int64_t aItemId, int64_t aVisitId,
-                                           PRTime aTime,
-                                           uint32_t aTransitionType,
-                                           nsIURI* aURI, int64_t aParentId,
-                                           const nsACString& aGUID,
-                                           const nsACString& aParentGUID) {
-  // for bookmark queries, "all bookmark" observer should get OnItemVisited
-  // but it is ignored.
-  if (mLiveUpdate != QUERYUPDATE_COMPLEX_WITH_BOOKMARKS)
-    NS_WARNING_ASSERTION(mResult && (mResult->mIsAllBookmarksObserver ||
-                                     mResult->mIsBookmarkFolderObserver),
-                         "history observers should not get OnItemVisited, but "
-                         "should get OnVisit "
-                         "instead");
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsNavHistoryQueryResultNode::OnItemMoved(
     int64_t aFolder, int64_t aOldParent, int32_t aOldIndex, int64_t aNewParent,
     int32_t aNewIndex, uint16_t aItemType, const nsACString& aGUID,
@@ -3207,14 +3184,12 @@
     const nsACString& aNewValue, PRTime aLastModified, uint16_t aItemType,
     int64_t aParentId, const nsACString& aGUID, const nsACString& aParentGUID,
     const nsACString& aOldValue, uint16_t aSource) {
-  if (aItemId != mItemId) return NS_OK;
-
-  // Last modified isn't changed for favicon updates and it is notified as `0`,
-  // so don't reset it here.
-  if (!aProperty.EqualsLiteral("favicon")) {
-    mLastModified = aLastModified;
+  if (aItemId != mItemId) {
+    return NS_OK;
   }
 
+  mLastModified = aLastModified;
+
   nsNavHistoryResult* result = GetResult();
   NS_ENSURE_STATE(result);
 
@@ -3232,12 +3207,10 @@
     mURI = aNewValue;
     if (shouldNotify)
       NOTIFY_RESULT_OBSERVERS(result, NodeURIChanged(this, oldURI));
-  } else if (aProperty.EqualsLiteral("favicon")) {
-    if (shouldNotify) NOTIFY_RESULT_OBSERVERS(result, NodeIconChanged(this));
   } else if (aProperty.EqualsLiteral("cleartime")) {
     PRTime oldTime = mTime;
     mTime = 0;
-    if (shouldNotify) {
+    if (shouldNotify && !result->CanSkipHistoryDetailsNotifications()) {
       NOTIFY_RESULT_OBSERVERS(
           result, NodeHistoryDetailsChanged(this, oldTime, mAccessCount));
     }
@@ -3289,13 +3262,9 @@
 /**
  * Updates visit count and last visit time and refreshes.
  */
-NS_IMETHODIMP
-nsNavHistoryFolderResultNode::OnItemVisited(int64_t aItemId, int64_t aVisitId,
-                                            PRTime aTime,
-                                            uint32_t aTransitionType,
-                                            nsIURI* aURI, int64_t aParentId,
-                                            const nsACString& aGUID,
-                                            const nsACString& aParentGUID) {
+nsresult nsNavHistoryFolderResultNode::OnItemVisited(nsIURI* aURI,
+                                                     int64_t aVisitId,
+                                                     PRTime aTime) {
   if (mOptions->ExcludeItems())
     return NS_OK;  // don't update items when we aren't displaying them
 
@@ -3303,58 +3272,67 @@
 
   if (!StartIncrementalUpdate()) return NS_OK;
 
-  uint32_t nodeIndex;
-  nsNavHistoryResultNode* node = FindChildById(aItemId, &nodeIndex);
-  if (!node) return NS_ERROR_FAILURE;
-
-  // Update node.
-  uint32_t nodeOldAccessCount = node->mAccessCount;
-  PRTime nodeOldTime = node->mTime;
-  node->mTime = aTime;
-  ++node->mAccessCount;
+  nsAutoCString spec;
+  nsresult rv = aURI->GetSpec(spec);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMArray<nsNavHistoryResultNode> nodes;
+  FindChildrenByURI(spec, &nodes);
+  if (!nodes.Count()) {
+    return NS_OK;
+  }
 
   // Update us.
   int32_t oldAccessCount = mAccessCount;
   ++mAccessCount;
   if (aTime > mTime) mTime = aTime;
-  nsresult rv = ReverseUpdateStats(mAccessCount - oldAccessCount);
+  rv = ReverseUpdateStats(mAccessCount - oldAccessCount);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Update frecency for proper frecency ordering.
-  // TODO (bug 832617): we may avoid one query here, by providing the new
-  // frecency value in the notification.
-  nsNavHistory* history = nsNavHistory::GetHistoryService();
-  NS_ENSURE_TRUE(history, NS_OK);
-  RefPtr<nsNavHistoryResultNode> visitNode;
-  rv = history->VisitIdToResultNode(aVisitId, mOptions,
-                                    getter_AddRefs(visitNode));
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!visitNode) {
-    // Certain result types manage the nodes by themselves.
-    return NS_OK;
-  }
-  node->mFrecency = visitNode->mFrecency;
+  // Update nodes.
+  for (int32_t i = 0; i < nodes.Count(); ++i) {
+    nsNavHistoryResultNode* node = nodes[i];
+    uint32_t nodeOldAccessCount = node->mAccessCount;
+    PRTime nodeOldTime = node->mTime;
+    node->mTime = aTime;
+    ++node->mAccessCount;
+
+    // Update frecency for proper frecency ordering.
+    // TODO (bug 832617): we may avoid one query here, by providing the new
+    // frecency value in the notification.
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_ENSURE_TRUE(history, NS_OK);
+    RefPtr<nsNavHistoryResultNode> visitNode;
+    rv = history->VisitIdToResultNode(aVisitId, mOptions,
+                                      getter_AddRefs(visitNode));
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (!visitNode) {
+      // Certain result types manage the nodes by themselves.
+      return NS_OK;
+    }
+    node->mFrecency = visitNode->mFrecency;
 
-  if (AreChildrenVisible()) {
-    // Sorting has not changed, just redraw the row if it's visible.
     nsNavHistoryResult* result = GetResult();
-    NOTIFY_RESULT_OBSERVERS(result, NodeHistoryDetailsChanged(
-                                        node, nodeOldTime, nodeOldAccessCount));
-  }
+    if (AreChildrenVisible() && !result->CanSkipHistoryDetailsNotifications()) {
+      // Sorting has not changed, just redraw the row if it's visible.
+      NOTIFY_RESULT_OBSERVERS(
+          result,
+          NodeHistoryDetailsChanged(node, nodeOldTime, nodeOldAccessCount));
+    }
 
-  // Update sorting if necessary.
-  uint32_t sortType = GetSortType();
-  if (sortType == nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_ASCENDING ||
-      sortType == nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_DESCENDING ||
-      sortType == nsINavHistoryQueryOptions::SORT_BY_DATE_ASCENDING ||
-      sortType == nsINavHistoryQueryOptions::SORT_BY_DATE_DESCENDING ||
-      sortType == nsINavHistoryQueryOptions::SORT_BY_FRECENCY_ASCENDING ||
-      sortType == nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING) {
-    int32_t childIndex = FindChild(node);
-    NS_ASSERTION(childIndex >= 0,
-                 "Could not find child we just got a reference to");
-    if (childIndex >= 0) {
-      EnsureItemPosition(childIndex);
+    // Update sorting if necessary.
+    uint32_t sortType = GetSortType();
+    if (sortType == nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_ASCENDING ||
+        sortType == nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_DESCENDING ||
+        sortType == nsINavHistoryQueryOptions::SORT_BY_DATE_ASCENDING ||
+        sortType == nsINavHistoryQueryOptions::SORT_BY_DATE_DESCENDING ||
+        sortType == nsINavHistoryQueryOptions::SORT_BY_FRECENCY_ASCENDING ||
+        sortType == nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING) {
+      int32_t childIndex = FindChild(node);
+      NS_ASSERTION(childIndex >= 0,
+                   "Could not find child we just got a reference to");
+      if (childIndex >= 0) {
+        EnsureItemPosition(childIndex);
+      }
     }
   }
 
@@ -3415,27 +3393,28 @@
     // adjust position
     EnsureItemPosition(index);
     return NS_OK;
-  } else {
-    // moving between two different folders, just do a remove and an add
-    nsCOMPtr<nsIURI> itemURI;
-    if (aItemType == nsINavBookmarksService::TYPE_BOOKMARK) {
-      nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
-      NS_ENSURE_TRUE(bookmarks, NS_ERROR_OUT_OF_MEMORY);
-      nsresult rv = bookmarks->GetBookmarkURI(aItemId, getter_AddRefs(itemURI));
-      NS_ENSURE_SUCCESS(rv, rv);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-    if (aOldParent == mTargetFolderItemId) {
-      OnItemRemoved(aItemId, aOldParent, aOldIndex, aItemType, itemURI, aGUID,
-                    aOldParentGUID, aSource);
-    }
-    if (aNewParent == mTargetFolderItemId) {
-      OnItemAdded(
-          aItemId, aNewParent, aNewIndex, aItemType, itemURI,
-          RoundedPRNow(),  // This is a dummy dateAdded, not the real value.
-          aGUID, aNewParentGUID, aSource);
-    }
   }
+
+  // moving between two different folders, just do a remove and an add
+  nsCOMPtr<nsIURI> itemURI;
+  if (aItemType == nsINavBookmarksService::TYPE_BOOKMARK) {
+    nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
+    NS_ENSURE_TRUE(bookmarks, NS_ERROR_OUT_OF_MEMORY);
+    nsresult rv = bookmarks->GetBookmarkURI(aItemId, getter_AddRefs(itemURI));
+    NS_ENSURE_SUCCESS(rv, rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  if (aOldParent == mTargetFolderItemId) {
+    OnItemRemoved(aItemId, aOldParent, aOldIndex, aItemType, itemURI, aGUID,
+                  aOldParentGUID, aSource);
+  }
+  if (aNewParent == mTargetFolderItemId) {
+    OnItemAdded(
+        aItemId, aNewParent, aNewIndex, aItemType, itemURI,
+        RoundedPRNow(),  // This is a dummy dateAdded, not the real value.
+        aGUID, aNewParentGUID, aSource);
+  }
+
   return NS_OK;
 }
 
@@ -3501,12 +3480,13 @@
       mOptions(aOptions),
       mNeedsToApplySortingMode(false),
       mIsHistoryObserver(false),
-      mIsBookmarkFolderObserver(false),
-      mIsAllBookmarksObserver(false),
+      mIsBookmarksObserver(false),
       mIsMobilePrefObserver(false),
       mBookmarkFolderObservers(64),
       mBatchInProgress(false),
-      mSuppressNotifications(false) {
+      mSuppressNotifications(false),
+      mIsHistoryDetailsObserver(false),
+      mObserversWantHistoryDetails(true) {
   mSortingMode = aOptions->SortingMode();
 
   mRootNode->mResult = this;
@@ -3524,13 +3504,13 @@
 }
 
 void nsNavHistoryResult::StopObserving() {
-  AutoTArray<PlacesEventType, 3> events;
-  if (mIsBookmarkFolderObserver || mIsAllBookmarksObserver) {
+  AutoTArray<PlacesEventType, 4> events;
+  events.AppendElement(PlacesEventType::Favicon_changed);
+  if (mIsBookmarksObserver) {
     nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
     if (bookmarks) {
       bookmarks->RemoveObserver(this);
-      mIsBookmarkFolderObserver = false;
-      mIsAllBookmarksObserver = false;
+      mIsBookmarksObserver = false;
     }
     events.AppendElement(PlacesEventType::Bookmark_added);
     events.AppendElement(PlacesEventType::Bookmark_removed);
@@ -3544,24 +3524,45 @@
     nsNavHistory* history = nsNavHistory::GetHistoryService();
     if (history) {
       history->RemoveObserver(this);
-      events.AppendElement(PlacesEventType::Page_visited);
       mIsHistoryObserver = false;
     }
   }
+  if (mIsHistoryDetailsObserver) {
+    events.AppendElement(PlacesEventType::Page_visited);
+    mIsHistoryDetailsObserver = false;
+  }
 
   PlacesObservers::RemoveListener(events, this);
 }
 
+bool nsNavHistoryResult::CanSkipHistoryDetailsNotifications() const {
+  return !mObserversWantHistoryDetails &&
+         mOptions->QueryType() ==
+             nsINavHistoryQueryOptions::QUERY_TYPE_BOOKMARKS &&
+         mSortingMode != nsINavHistoryQueryOptions::SORT_BY_DATE_ASCENDING &&
+         mSortingMode != nsINavHistoryQueryOptions::SORT_BY_DATE_DESCENDING &&
+         mSortingMode !=
+             nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_ASCENDING &&
+         mSortingMode !=
+             nsINavHistoryQueryOptions::SORT_BY_VISITCOUNT_DESCENDING &&
+         mSortingMode !=
+             nsINavHistoryQueryOptions::SORT_BY_FRECENCY_ASCENDING &&
+         mSortingMode != nsINavHistoryQueryOptions::SORT_BY_FRECENCY_DESCENDING;
+}
+
 void nsNavHistoryResult::AddHistoryObserver(
     nsNavHistoryQueryResultNode* aNode) {
   if (!mIsHistoryObserver) {
     nsNavHistory* history = nsNavHistory::GetHistoryService();
     NS_ASSERTION(history, "Can't create history service");
     history->AddObserver(this, true);
-    AutoTArray<PlacesEventType, 1> events;
-    events.AppendElement(PlacesEventType::Page_visited);
-    PlacesObservers::AddListener(events, this);
     mIsHistoryObserver = true;
+    if (!mIsHistoryDetailsObserver) {
+      AutoTArray<PlacesEventType, 1> events;
+      events.AppendElement(PlacesEventType::Page_visited);
+      PlacesObservers::AddListener(events, this);
+      mIsHistoryDetailsObserver = true;
+    }
   }
   // Don't add duplicate observers.  In some case we don't unregister when
   // children are cleared (see ClearChildren) and the next FillChildren call
@@ -3573,19 +3574,7 @@
 
 void nsNavHistoryResult::AddAllBookmarksObserver(
     nsNavHistoryQueryResultNode* aNode) {
-  if (!mIsAllBookmarksObserver && !mIsBookmarkFolderObserver) {
-    nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
-    if (!bookmarks) {
-      MOZ_ASSERT_UNREACHABLE("Can't create bookmark service");
-      return;
-    }
-    bookmarks->AddObserver(this, true);
-    AutoTArray<PlacesEventType, 2> events;
-    events.AppendElement(PlacesEventType::Bookmark_added);
-    events.AppendElement(PlacesEventType::Bookmark_removed);
-    PlacesObservers::AddListener(events, this);
-    mIsAllBookmarksObserver = true;
-  }
+  EnsureIsObservingBookmarks();
   // Don't add duplicate observers.  In some case we don't unregister when
   // children are cleared (see ClearChildren) and the next FillChildren call
   // will try to add the observer again.
@@ -3611,19 +3600,7 @@
 
 void nsNavHistoryResult::AddBookmarkFolderObserver(
     nsNavHistoryFolderResultNode* aNode, int64_t aFolder) {
-  if (!mIsBookmarkFolderObserver && !mIsAllBookmarksObserver) {
-    nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
-    if (!bookmarks) {
-      MOZ_ASSERT_UNREACHABLE("Can't create bookmark service");
-      return;
-    }
-    bookmarks->AddObserver(this, true);
-    AutoTArray<PlacesEventType, 2> events;
-    events.AppendElement(PlacesEventType::Bookmark_added);
-    events.AppendElement(PlacesEventType::Bookmark_removed);
-    PlacesObservers::AddListener(events, this);
-    mIsBookmarkFolderObserver = true;
-  }
+  EnsureIsObservingBookmarks();
   // Don't add duplicate observers.  In some case we don't unregister when
   // children are cleared (see ClearChildren) and the next FillChildren call
   // will try to add the observer again.
@@ -3633,6 +3610,29 @@
   }
 }
 
+void nsNavHistoryResult::EnsureIsObservingBookmarks() {
+  if (mIsBookmarksObserver) {
+    return;
+  }
+  nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
+  if (!bookmarks) {
+    MOZ_ASSERT_UNREACHABLE("Can't create bookmark service");
+    return;
+  }
+  bookmarks->AddObserver(this, true);
+  AutoTArray<PlacesEventType, 3> events;
+  events.AppendElement(PlacesEventType::Bookmark_added);
+  events.AppendElement(PlacesEventType::Bookmark_removed);
+  // If we're not observing visits yet, also add a page-visited observer to
+  // serve onItemVisited.
+  if (!mIsHistoryObserver && !mIsHistoryDetailsObserver) {
+    events.AppendElement(PlacesEventType::Page_visited);
+    mIsHistoryDetailsObserver = true;
+  }
+  PlacesObservers::AddListener(events, this);
+  mIsBookmarksObserver = true;
+}
+
 void nsNavHistoryResult::RemoveHistoryObserver(
     nsNavHistoryQueryResultNode* aNode) {
   mHistoryObservers.RemoveElement(aNode);
@@ -3686,12 +3686,26 @@
 
   mSortingMode = aSortingMode;
 
+  // If the sorting mode changed to one requiring history details, we must
+  // ensure to start observing.
+  bool addedListener = UpdateHistoryDetailsObservers();
+
   if (!mRootNode->mExpanded) {
     // Need to do this later when node will be expanded.
     mNeedsToApplySortingMode = true;
     return NS_OK;
   }
 
+  if (addedListener) {
+    // We must do a full refresh because the history details may be stale.
+    if (mRootNode->IsQuery()) {
+      return mRootNode->GetAsQuery()->Refresh();
+    }
+    if (mRootNode->IsFolder()) {
+      return mRootNode->GetAsFolder()->Refresh();
+    }
+  }
+
   // Actually do sorting.
   nsNavHistoryContainerResultNode::SortComparator comparator =
       nsNavHistoryContainerResultNode::GetSortingComparator(aSortingMode);
@@ -3713,6 +3727,8 @@
   nsresult rv = mObservers.AppendWeakElementUnlessExists(aObserver, aOwnsWeak);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  UpdateHistoryDetailsObservers();
+
   rv = aObserver->SetResult(this);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -3722,13 +3738,58 @@
     NOTIFY_RESULT_OBSERVERS(this, Batching(true));
   }
 
+  if (!mRootNode->IsQuery() ||
+      mRootNode->GetAsQuery()->mLiveUpdate != QUERYUPDATE_NONE) {
+    // Pretty much all the views show favicons, thus observe changes to them.
+    AutoTArray<PlacesEventType, 1> events;
+    events.AppendElement(PlacesEventType::Favicon_changed);
+    PlacesObservers::AddListener(events, this);
+  }
+
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsNavHistoryResult::RemoveObserver(nsINavHistoryResultObserver* aObserver) {
   NS_ENSURE_ARG(aObserver);
-  return mObservers.RemoveWeakElement(aObserver);
+  nsresult rv = mObservers.RemoveWeakElement(aObserver);
+  NS_ENSURE_SUCCESS(rv, rv);
+  UpdateHistoryDetailsObservers();
+  return NS_OK;
+}
+
+bool nsNavHistoryResult::UpdateHistoryDetailsObservers() {
+  bool observersWantHistoryDetails = false;
+  // One observer set to true is enough to set observersWantHistoryDetails.
+  for (uint32_t i = 0; i < mObservers.Length() && !observersWantHistoryDetails;
+       ++i) {
+    const nsCOMPtr<nsINavHistoryResultObserver>& entry =
+        mObservers.ElementAt(i).GetValue();
+    if (entry) {
+      // If the observer doesn't implement the attribute, we assume true.
+      bool observe;
+      observersWantHistoryDetails =
+          NS_FAILED(entry->GetObserveHistoryDetails(&observe)) || observe;
+    }
+  }
+
+  mObserversWantHistoryDetails = observersWantHistoryDetails;
+  // If one observer wants history details we may have to add the listener.
+  if (!CanSkipHistoryDetailsNotifications()) {
+    if (!mIsHistoryDetailsObserver) {
+      AutoTArray<PlacesEventType, 1> events;
+      events.AppendElement(PlacesEventType::Page_visited);
+      PlacesObservers::AddListener(events, this);
+      mIsHistoryDetailsObserver = true;
+      return true;
+    }
+  } else {
+    AutoTArray<PlacesEventType, 1> events;
+    events.AppendElement(PlacesEventType::Page_visited);
+    PlacesObservers::RemoveListener(events, this);
+    mIsHistoryDetailsObserver = false;
+  }
+  return false;
 }
 
 NS_IMETHODIMP
@@ -3889,26 +3950,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsNavHistoryResult::OnItemVisited(int64_t aItemId, int64_t aVisitId,
-                                  PRTime aVisitTime, uint32_t aTransitionType,
-                                  nsIURI* aURI, int64_t aParentId,
-                                  const nsACString& aGUID,
-                                  const nsACString& aParentGUID) {
-  NS_ENSURE_ARG(aURI);
-
-  ENUMERATE_BOOKMARK_FOLDER_OBSERVERS(
-      aParentId, OnItemVisited(aItemId, aVisitId, aVisitTime, aTransitionType,
-                               aURI, aParentId, aGUID, aParentGUID));
-  ENUMERATE_ALL_BOOKMARKS_OBSERVERS(
-      OnItemVisited(aItemId, aVisitId, aVisitTime, aTransitionType, aURI,
-                    aParentId, aGUID, aParentGUID));
-  // Note: we do NOT call history observers in this case.  This notification is
-  // the same as OnVisit, except that here we know the item is a bookmark.
-  // History observers will handle the history notification instead.
-  return NS_OK;
-}
-
 /**
  * Need to notify both the source and the destination folders (if they are
  * different).
@@ -3996,7 +4037,6 @@
   if (!added || todayIsMissing) {
     // None of registered query observers has accepted our URI.  This means,
     // that a matching query either was not expanded or it does not exist.
-    uint32_t resultType = mRootNode->mOptions->ResultType();
     if (resultType == nsINavHistoryQueryOptions::RESULTS_AS_DATE_QUERY ||
         resultType == nsINavHistoryQueryOptions::RESULTS_AS_DATE_SITE_QUERY) {
       // If the visit falls into the Today bucket and the bucket exists, it was
@@ -4020,14 +4060,65 @@
     // cause changes to the array.
     ENUMERATE_QUERY_OBSERVERS(Refresh(), mHistoryObservers,
                               IsContainersQuery());
+
+    // Also notify onItemVisited to bookmark folder observers, that are not
+    // observing history.
+    if (!mIsHistoryObserver && mRootNode->IsFolder()) {
+      nsAutoCString spec;
+      nsresult rv = aURI->GetSpec(spec);
+      NS_ENSURE_SUCCESS(rv, rv);
+      // Find all the folders containing the visited URI, and notify them.
+      nsCOMArray<nsNavHistoryResultNode> nodes;
+      mRootNode->RecursiveFindURIs(true, mRootNode, spec, &nodes);
+      for (int32_t i = 0; i < nodes.Count(); ++i) {
+        nsNavHistoryResultNode* node = nodes[i];
+        ENUMERATE_BOOKMARK_FOLDER_OBSERVERS(
+            node->mParent->mItemId, OnItemVisited(aURI, aVisitId, aTime));
+      }
+    }
   }
 
   return NS_OK;
 }
 
+void nsNavHistoryResult::OnIconChanged(nsIURI* aURI, nsIURI* aFaviconURI,
+                                       const nsACString& aGUID) {
+  if (!mRootNode->mExpanded) {
+    return;
+  }
+  // Find all nodes for the given URI and update them.
+  nsAutoCString spec;
+  if (NS_SUCCEEDED(aURI->GetSpec(spec))) {
+    bool onlyOneEntry =
+        mOptions->QueryType() ==
+            nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY &&
+        mOptions->ResultType() == nsINavHistoryQueryOptions::RESULTS_AS_URI;
+    mRootNode->UpdateURIs(true, onlyOneEntry, false, spec, setFaviconCallback,
+                          nullptr);
+  }
+}
+
 void nsNavHistoryResult::HandlePlacesEvent(const PlacesEventSequence& aEvents) {
   for (const auto& event : aEvents) {
     switch (event->Type()) {
+      case PlacesEventType::Favicon_changed: {
+        const dom::PlacesFavicon* faviconEvent = event->AsPlacesFavicon();
+        if (NS_WARN_IF(!faviconEvent)) {
+          continue;
+        }
+        nsCOMPtr<nsIURI> uri, faviconUri;
+        MOZ_ALWAYS_SUCCEEDS(NS_NewURI(getter_AddRefs(uri), faviconEvent->mUrl));
+        if (!uri) {
+          continue;
+        }
+        MOZ_ALWAYS_SUCCEEDS(
+            NS_NewURI(getter_AddRefs(faviconUri), faviconEvent->mFaviconUrl));
+        if (!faviconUri) {
+          continue;
+        }
+        OnIconChanged(uri, faviconUri, faviconEvent->mPageGuid);
+        break;
+      }
       case PlacesEventType::Page_visited: {
         const dom::PlacesVisit* visit = event->AsPlacesVisit();
         if (NS_WARN_IF(!visit)) {
@@ -4141,17 +4232,6 @@
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsNavHistoryResult::OnPageChanged(nsIURI* aURI, uint32_t aChangedAttribute,
-                                  const nsAString& aValue,
-                                  const nsACString& aGUID) {
-  NS_ENSURE_ARG(aURI);
-
-  ENUMERATE_HISTORY_OBSERVERS(
-      OnPageChanged(aURI, aChangedAttribute, aValue, aGUID));
-  return NS_OK;
-}
-
 /**
  * Don't do anything when visits expire.
  */
diff -Nru firefox-84.0.2+build1/toolkit/components/places/nsNavHistoryResult.h firefox-85.0+build1/toolkit/components/places/nsNavHistoryResult.h
--- firefox-84.0.2+build1/toolkit/components/places/nsNavHistoryResult.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/nsNavHistoryResult.h	2021-01-18 19:58:26.000000000 +0000
@@ -73,9 +73,6 @@
   NS_IMETHOD OnDeleteURI(nsIURI* aURI, const nsACString& aGUID,        \
                          uint16_t aReason) __VA_ARGS__;                \
   NS_IMETHOD OnClearHistory() __VA_ARGS__;                             \
-  NS_IMETHOD OnPageChanged(nsIURI* aURI, uint32_t aChangedAttribute,   \
-                           const nsAString& aNewValue,                 \
-                           const nsACString& aGUID) __VA_ARGS__;       \
   NS_IMETHOD OnDeleteVisits(nsIURI* aURI, bool aPartialRemoval,        \
                             const nsACString& aGUID, uint16_t aReason, \
                             uint32_t aTransitionType) __VA_ARGS__;
@@ -127,13 +124,16 @@
   void RemoveAllBookmarksObserver(nsNavHistoryQueryResultNode* aNode);
   void RemoveMobilePrefsObserver(nsNavHistoryQueryResultNode* aNode);
   void StopObserving();
+  void EnsureIsObservingBookmarks();
 
   nsresult OnVisit(nsIURI* aURI, int64_t aVisitId, PRTime aTime,
                    uint32_t aTransitionType, const nsACString& aGUID,
                    bool aHidden, uint32_t aVisitCount,
                    const nsAString& aLastKnownTitle);
 
- public:
+  void OnIconChanged(nsIURI* aURI, nsIURI* aFaviconURI,
+                     const nsACString& aGUID);
+
   explicit nsNavHistoryResult(nsNavHistoryContainerResultNode* mRoot,
                               const RefPtr<nsNavHistoryQuery>& aQuery,
                               const RefPtr<nsNavHistoryQueryOptions>& aOptions);
@@ -154,8 +154,7 @@
 
   // node observers
   bool mIsHistoryObserver;
-  bool mIsBookmarkFolderObserver;
-  bool mIsAllBookmarksObserver;
+  bool mIsBookmarksObserver;
   bool mIsMobilePrefObserver;
 
   typedef nsTArray<RefPtr<nsNavHistoryQueryResultNode> > QueryObserverList;
@@ -182,6 +181,19 @@
   nsMaybeWeakPtrArray<nsINavHistoryResultObserver> mObservers;
   bool mSuppressNotifications;
 
+  // Tracks whether observers for history details were added.
+  bool mIsHistoryDetailsObserver;
+  // Tracks whether any result observer is interested in history details
+  // updates.
+  bool mObserversWantHistoryDetails;
+  /**
+   *  Updates mObserversWantHistoryDetails when observers are added/removed.
+   *  @returns Whether we started observing for history changes.
+   */
+  bool UpdateHistoryDetailsObservers();
+  // Whether NodeHistoryDetailsChanged can be skipped.
+  bool CanSkipHistoryDetailsNotifications() const;
+
   ContainerObserverList mRefreshParticipants;
   void requestRefresh(nsNavHistoryContainerResultNode* aContainer);
 
@@ -400,7 +412,6 @@
   int64_t mTime;
   int32_t mBookmarkIndex;
   int64_t mItemId;
-  int64_t mFolderId;
   int64_t mVisitId;
   int64_t mFromVisitId;
   PRTime mDateAdded;
@@ -603,8 +614,10 @@
                                                 void* closure);
 
   // finding children: THESE DO NOT ADDREF
-  nsNavHistoryResultNode* FindChildURI(const nsACString& aSpec,
-                                       uint32_t* aNodeIndex);
+  nsNavHistoryResultNode* FindChildByURI(const nsACString& aSpec,
+                                         uint32_t* aNodeIndex);
+  void FindChildrenByURI(const nsCString& aSpec,
+                         nsCOMArray<nsNavHistoryResultNode>* aMatches);
   // returns the index of the given node, -1 if not found
   int32_t FindChild(nsNavHistoryResultNode* aNode) {
     return mChildren.IndexOf(aNode);
@@ -687,7 +700,6 @@
                        uint16_t aItemType, nsIURI* aURI, PRTime aDateAdded,
                        const nsACString& aGUID, const nsACString& aParentGUID,
                        uint16_t aSource);
-
   nsresult OnItemRemoved(int64_t aItemId, int64_t aParentFolder, int32_t aIndex,
                          uint16_t aItemType, nsIURI* aURI,
                          const nsACString& aGUID, const nsACString& aParentGUID,
@@ -778,6 +790,7 @@
                          uint16_t aItemType, nsIURI* aURI,
                          const nsACString& aGUID, const nsACString& aParentGUID,
                          uint16_t aSource);
+  nsresult OnItemVisited(nsIURI* aURI, int64_t aVisitId, PRTime aTime);
   virtual void OnRemoving() override;
 
   // this indicates whether the folder contents are valid, they don't go away
diff -Nru firefox-84.0.2+build1/toolkit/components/places/PlacesBackups.jsm firefox-85.0+build1/toolkit/components/places/PlacesBackups.jsm
--- firefox-84.0.2+build1/toolkit/components/places/PlacesBackups.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/PlacesBackups.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -14,7 +14,6 @@
 XPCOMUtils.defineLazyModuleGetters(this, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.jsm",
-  OS: "resource://gre/modules/osfile.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(
@@ -33,7 +32,7 @@
     let numberOfBackupsToDelete = backupFiles.length - aMaxBackups;
     while (numberOfBackupsToDelete--) {
       let oldestBackup = backupFiles.pop();
-      await OS.File.remove(oldestBackup);
+      await IOUtils.remove(oldestBackup);
     }
   }
 }
@@ -81,13 +80,13 @@
 /**
  * Given a filename, searches for another backup with the same date.
  *
- * @return OS.File path string or null.
+ * @return path string or null.
  */
 function getBackupFileForSameDate(aFilename) {
   return (async function() {
     let backupFiles = await PlacesBackups.getBackupFiles();
     for (let backupFile of backupFiles) {
-      if (isFilenameWithSameDate(OS.Path.basename(backupFile), aFilename)) {
+      if (isFilenameWithSameDate(PathUtils.filename(backupFile), aFilename)) {
         return backupFile;
       }
     }
@@ -118,12 +117,12 @@
       if (this._backupFolder) {
         return this._backupFolder;
       }
-      let profileDir = OS.Constants.Path.profileDir;
-      let backupsDirPath = OS.Path.join(
+      let profileDir = await PathUtils.getProfileDir();
+      let backupsDirPath = PathUtils.join(
         profileDir,
         this.profileRelativeFolderPath
       );
-      await OS.File.makeDir(backupsDirPath, { ignoreExisting: true });
+      await IOUtils.makeDirectory(backupsDirPath);
       return (this._backupFolder = backupsDirPath);
     })();
   },
@@ -146,27 +145,27 @@
       this._backupFiles = [];
 
       let backupFolderPath = await this.getBackupFolder();
-      let iterator = new OS.File.DirectoryIterator(backupFolderPath);
-      await iterator.forEach(aEntry => {
-        // Since this is a lazy getter and OS.File I/O is serialized, we can
-        // safely remove .tmp files without risking to remove ongoing backups.
-        if (aEntry.name.endsWith(".tmp")) {
-          OS.File.remove(aEntry.path);
-          return undefined;
+      let children = await IOUtils.getChildren(backupFolderPath);
+      let list = [];
+      for (const entry of children) {
+        // Since IOUtils I/O is serialized, we can safely remove .tmp files
+        // without risking to remove ongoing backups.
+        let filename = PathUtils.filename(entry);
+        if (filename.endsWith(".tmp")) {
+          list.push(IOUtils.remove(entry));
+          continue;
         }
 
-        if (filenamesRegex.test(aEntry.name)) {
+        if (filenamesRegex.test(filename)) {
           // Remove bogus backups in future dates.
-          let filePath = aEntry.path;
-          if (this.getDateForFile(filePath) > new Date()) {
-            return OS.File.remove(filePath);
+          if (this.getDateForFile(entry) > new Date()) {
+            list.push(IOUtils.remove(entry));
+            continue;
           }
-          this._backupFiles.push(filePath);
+          this._backupFiles.push(entry);
         }
-
-        return undefined;
-      });
-      iterator.close();
+      }
+      await Promise.all(list);
 
       this._backupFiles.sort((a, b) => {
         let aDate = this.getDateForFile(a);
@@ -228,7 +227,7 @@
    * @return {Date} A Date object for the backup's creation time.
    */
   getDateForFile: function PB_getDateForFile(aBackupFile) {
-    let filename = OS.Path.basename(aBackupFile);
+    let filename = PathUtils.filename(aBackupFile);
     let matches = filename.match(filenamesRegex);
     if (!matches) {
       throw new Error(`Invalid backup file name: ${filename}`);
@@ -247,7 +246,7 @@
       let entries = await this.getBackupFiles();
       for (let entry of entries) {
         let rx = /\.json(lz4)?$/;
-        if (OS.Path.basename(entry).match(rx)) {
+        if (PathUtils.filename(entry).match(rx)) {
           return entry;
         }
       }
@@ -259,7 +258,7 @@
    * Serializes bookmarks using JSON, and writes to the supplied file.
    *
    * @param aFilePath
-   *        OS.File path for the "bookmarks.json" file to be created.
+   *        path for the "bookmarks.json" file to be created.
    * @return {Promise}
    * @resolves the number of serialized uri nodes.
    */
@@ -269,7 +268,8 @@
     );
 
     let backupFolderPath = await this.getBackupFolder();
-    if (OS.Path.dirname(aFilePath) == backupFolderPath) {
+    let profileDir = await PathUtils.getProfileDir();
+    if (profileDir == backupFolderPath) {
       // We are creating a backup in the default backups folder,
       // so just update the internal cache.
       if (!this._backupFiles) {
@@ -294,18 +294,18 @@
       let mostRecentBackupFile = await this.getMostRecentBackup();
       if (
         !mostRecentBackupFile ||
-        hash != getHashFromFilename(OS.Path.basename(mostRecentBackupFile))
+        hash != getHashFromFilename(PathUtils.filename(mostRecentBackupFile))
       ) {
         let name = this.getFilenameForDate(undefined, true);
         let newFilename = appendMetaDataToFilename(name, {
           count: nodeCount,
           hash,
         });
-        let newFilePath = OS.Path.join(backupFolderPath, newFilename);
+        let newFilePath = PathUtils.join(backupFolderPath, newFilename);
         let backupFile = await getBackupFileForSameDate(name);
         if (backupFile) {
           // There is already a backup for today, replace it.
-          await OS.File.remove(backupFile, { ignoreAbsent: true });
+          await IOUtils.remove(backupFile);
           if (!this._backupFiles) {
             await this.getBackupFiles();
           } else {
@@ -319,9 +319,9 @@
           }
           this._backupFiles.unshift(newFilePath);
         }
-        let jsonString = await OS.File.read(aFilePath);
-        await OS.File.writeAtomic(newFilePath, jsonString, {
-          compression: "lz4",
+        let jsonString = await IOUtils.read(aFilePath);
+        await IOUtils.write(newFilePath, jsonString, {
+          compress: true,
         });
         await limitBackups(aMaxBackup, this._backupFiles);
       }
@@ -368,7 +368,7 @@
       if (backupFile) {
         // In case there is a backup for today we should recreate it.
         this._backupFiles.shift();
-        await OS.File.remove(backupFile, { ignoreAbsent: true });
+        await IOUtils.remove(backupFile);
       }
 
       // Now check the hash of the most recent backup, and try to create a new
@@ -376,11 +376,11 @@
       let mostRecentBackupFile = await this.getMostRecentBackup();
       let mostRecentHash =
         mostRecentBackupFile &&
-        getHashFromFilename(OS.Path.basename(mostRecentBackupFile));
+        getHashFromFilename(PathUtils.filename(mostRecentBackupFile));
 
       // Save bookmarks to a backup file.
       let backupFolder = await this.getBackupFolder();
-      let newBackupFile = OS.Path.join(backupFolder, newBackupFilename);
+      let newBackupFile = PathUtils.join(backupFolder, newBackupFilename);
       let newFilenameWithMetaData;
       try {
         let {
@@ -404,7 +404,7 @@
         newBackupFile = mostRecentBackupFile;
         // Ensure we retain the proper extension when renaming
         // the most recent backup file.
-        if (/\.json$/.test(OS.Path.basename(mostRecentBackupFile))) {
+        if (/\.json$/.test(PathUtils.filename(mostRecentBackupFile))) {
           newBackupFilename = this.getFilenameForDate();
         }
         newFilenameWithMetaData = appendMetaDataToFilename(newBackupFilename, {
@@ -414,11 +414,11 @@
       }
 
       // Append metadata to the backup filename.
-      let newBackupFileWithMetadata = OS.Path.join(
+      let newBackupFileWithMetadata = PathUtils.join(
         backupFolder,
         newFilenameWithMetaData
       );
-      await OS.File.move(newBackupFile, newBackupFileWithMetadata);
+      await IOUtils.move(newBackupFile, newBackupFileWithMetadata);
       this._backupFiles.unshift(newBackupFileWithMetadata);
 
       // Limit the number of backups.
@@ -436,7 +436,7 @@
    */
   getBookmarkCountForFile: function PB_getBookmarkCountForFile(aFilePath) {
     let count = null;
-    let filename = OS.Path.basename(aFilePath);
+    let filename = PathUtils.filename(aFilePath);
     let matches = filename.match(filenamesRegex);
     if (matches && matches[2]) {
       count = matches[2];
diff -Nru firefox-84.0.2+build1/toolkit/components/places/PlacesCategoriesStarter.jsm firefox-85.0+build1/toolkit/components/places/PlacesCategoriesStarter.jsm
--- firefox-84.0.2+build1/toolkit/components/places/PlacesCategoriesStarter.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/PlacesCategoriesStarter.jsm	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Fired by BrowserGlue._onFirstWindowLoaded when async telemetry data should
-// be collected.
-const TOPIC_GATHER_TELEMETRY = "gather-places-telemetry";
-
-// Seconds between maintenance runs.
-const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400;
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.defineModuleGetter(
-  this,
-  "PlacesUtils",
-  "resource://gre/modules/PlacesUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "PlacesDBUtils",
-  "resource://gre/modules/PlacesDBUtils.jsm"
-);
-
-/**
- * This component can be used as a starter for modules that have to run when
- * certain categories are invoked.
- */
-function PlacesCategoriesStarter() {
-  Services.obs.addObserver(this, TOPIC_GATHER_TELEMETRY);
-  Services.obs.addObserver(this, PlacesUtils.TOPIC_SHUTDOWN);
-}
-
-PlacesCategoriesStarter.prototype = {
-  observe: function PCS_observe(aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case PlacesUtils.TOPIC_SHUTDOWN:
-        Services.obs.removeObserver(this, PlacesUtils.TOPIC_SHUTDOWN);
-        Services.obs.removeObserver(this, TOPIC_GATHER_TELEMETRY);
-        if (Cu.isModuleLoaded("resource://gre/modules/PlacesDBUtils.jsm")) {
-          PlacesDBUtils.shutdown();
-        }
-        break;
-      case TOPIC_GATHER_TELEMETRY:
-        // Collect Places telemetry on the first idle.
-        Services.tm.idleDispatchToMainThread(() => {
-          PlacesDBUtils.telemetry();
-        });
-        break;
-      case "idle-daily":
-        // Once a week run places.sqlite maintenance tasks.
-        let lastMaintenance = Services.prefs.getIntPref(
-          "places.database.lastMaintenance",
-          0
-        );
-        let nowSeconds = parseInt(Date.now() / 1000);
-        if (lastMaintenance < nowSeconds - MAINTENANCE_INTERVAL_SECONDS) {
-          PlacesDBUtils.maintenanceOnIdle();
-        }
-        break;
-      default:
-        throw new Error("Trying to handle an unknown category.");
-    }
-  },
-
-  classID: Components.ID("803938d5-e26d-4453-bf46-ad4b26e41114"),
-  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
-};
-
-var EXPORTED_SYMBOLS = ["PlacesCategoriesStarter"];
diff -Nru firefox-84.0.2+build1/toolkit/components/places/PlacesDBUtils.jsm firefox-85.0+build1/toolkit/components/places/PlacesDBUtils.jsm
--- firefox-84.0.2+build1/toolkit/components/places/PlacesDBUtils.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/PlacesDBUtils.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -10,23 +10,27 @@
 // Corrupt DBs older than this value are removed.
 const CORRUPT_DB_RETAIN_DAYS = 14;
 
+// Seconds between maintenance runs.
+const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400;
+
+const { ComponentUtils } = ChromeUtils.import(
+  "resource://gre/modules/ComponentUtils.jsm"
+);
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
+
 XPCOMUtils.defineLazyModuleGetters(this, {
-  Services: "resource://gre/modules/Services.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   Sqlite: "resource://gre/modules/Sqlite.jsm",
 });
 
-var EXPORTED_SYMBOLS = ["PlacesDBUtils"];
+var EXPORTED_SYMBOLS = ["PlacesDBUtils", "PlacesDBUtilsIdleMaintenance"];
 
 var PlacesDBUtils = {
   _isShuttingDown: false,
-  shutdown() {
-    PlacesDBUtils._isShuttingDown = true;
-  },
 
   _clearTaskQueue: false,
   clearPendingTasks() {
@@ -100,7 +104,10 @@
    */
   async _refreshUI() {
     // Send batch update notifications to update the UI.
-    let observers = PlacesUtils.history.getObservers();
+    let observers = [
+      ...PlacesUtils.history.getObservers(),
+      ...PlacesUtils.bookmarks.getObservers(),
+    ];
     for (let observer of observers) {
       observer.onBeginUpdateBatch();
       observer.onEndUpdateBatch();
@@ -1028,9 +1035,9 @@
 
     // Get maximum number of unique URIs.
     try {
-      let limitURIs = Services.prefs.getIntPref(
-        "places.history.expiration.transient_current_max_pages"
-      );
+      let limitURIs = await Cc["@mozilla.org/places/expiration;1"]
+        .getService(Ci.nsISupports)
+        .wrappedJSObject.getPagesLimit();
       logs.push(
         "History can store a maximum of " + limitURIs + " unique pages"
       );
@@ -1328,6 +1335,12 @@
    *         - logs: an array of strings containing the messages logged by the task
    */
   async runTasks(tasks) {
+    if (!this._registeredShutdownObserver) {
+      this._registeredShutdownObserver = true;
+      PlacesUtils.registerShutdownFunction(() => {
+        this._isShuttingDown = true;
+      });
+    }
     PlacesDBUtils._clearTaskQueue = false;
     let tasksMap = new Map();
     for (let task of tasks) {
@@ -1400,3 +1413,30 @@
     await db.close();
   }
 }
+
+function PlacesDBUtilsIdleMaintenance() {}
+
+PlacesDBUtilsIdleMaintenance.prototype = {
+  observe(subject, topic, data) {
+    switch (topic) {
+      case "idle-daily":
+        // Once a week run places.sqlite maintenance tasks.
+        let lastMaintenance = Services.prefs.getIntPref(
+          "places.database.lastMaintenance",
+          0
+        );
+        let nowSeconds = parseInt(Date.now() / 1000);
+        if (lastMaintenance < nowSeconds - MAINTENANCE_INTERVAL_SECONDS) {
+          PlacesDBUtils.maintenanceOnIdle();
+        }
+        break;
+      default:
+        throw new Error("Trying to handle an unknown category.");
+    }
+  },
+  _xpcom_factory: ComponentUtils.generateSingletonFactory(
+    PlacesDBUtilsIdleMaintenance
+  ),
+  classID: Components.ID("d38926e0-29c1-11eb-8588-0800200c9a66"),
+  QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
+};
diff -Nru firefox-84.0.2+build1/toolkit/components/places/PlacesExpiration.jsm firefox-85.0+build1/toolkit/components/places/PlacesExpiration.jsm
--- firefox-84.0.2+build1/toolkit/components/places/PlacesExpiration.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/PlacesExpiration.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -5,8 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /**
- * This component handles history and orphans expiration through asynchronous
- * Storage statements.
+ * This component handles history and orphans expiration.
  * Expiration runs:
  * - At idle, but just once, we stop any other kind of expiration during idle
  *   to preserve batteries in portable devices.
@@ -30,39 +29,14 @@
   "resource://gre/modules/PlacesUtils.jsm"
 );
 
-// Constants
-
 // Last expiration step should run before the final sync.
-const TOPIC_PREF_CHANGED = "nsPref:changed";
 const TOPIC_DEBUG_START_EXPIRATION = "places-debug-start-expiration";
-const TOPIC_EXPIRATION_FINISHED = "places-expiration-finished";
 const TOPIC_IDLE_BEGIN = "idle";
 const TOPIC_IDLE_END = "active";
 const TOPIC_IDLE_DAILY = "idle-daily";
 const TOPIC_TESTING_MODE = "testing-mode";
 const TOPIC_TEST_INTERVAL_CHANGED = "test-interval-changed";
 
-// Branch for all expiration preferences.
-const PREF_BRANCH = "places.history.expiration.";
-
-// Max number of unique URIs to retain in history.
-// Notice this is a lazy limit.  This means we will start to expire if we will
-// go over it, but we won't ensure that we will stop exactly when we reach it,
-// instead we will stop after the next expiration step that will bring us
-// below it.
-// If this preference does not exist or has a negative value, we will calculate
-// a limit based on current hardware.
-const PREF_MAX_URIS = "max_pages";
-const PREF_MAX_URIS_NOTSET = -1; // Use our internally calculated limit.
-
-// We save the current unique URIs limit to this pref, to make it available to
-// other components without having to duplicate the full logic.
-const PREF_READONLY_CALCULATED_MAX_URIS = "transient_current_max_pages";
-
-// Seconds between each expiration step.
-const PREF_INTERVAL_SECONDS = "interval_seconds";
-const PREF_INTERVAL_SECONDS_NOTSET = 3 * 60;
-
 // We calculate an optimal database size, based on hardware specs.
 // This percentage of memory size is used to protect against calculating a too
 // large database size on systems with small memory.
@@ -80,7 +54,7 @@
 
 // Max number of entries to expire at each expiration step.
 // This value is globally used for different kind of data we expire, can be
-// tweaked based on data type.  See below in getBoundStatement.
+// tweaked based on data type.  See below in getQuery.
 const EXPIRE_LIMIT_PER_STEP = 6;
 // When we run a large expiration step, the above limit is multiplied by this.
 const EXPIRE_LIMIT_PER_LARGE_STEP_MULTIPLIER = 10;
@@ -136,7 +110,7 @@
 
 // Represents actions on which a query will run.
 const ACTION = {
-  TIMED: 1 << 0, // happens every this._interval
+  TIMED: 1 << 0, // happens every this.intervalSeconds
   TIMED_OVERLIMIT: 1 << 1, // like TIMED but only when history is over limits
   SHUTDOWN_DIRTY: 1 << 2, // happens at shutdown for DIRTY state
   IDLE_DIRTY: 1 << 3, // happens on idle for DIRTY state
@@ -443,32 +417,9 @@
   }
 }
 
-// nsPlacesExpiration definition
-
 function nsPlacesExpiration() {
-  // Smart Getters
-
-  XPCOMUtils.defineLazyGetter(this, "_db", function() {
-    let db = PlacesUtils.history.DBConnection;
-
-    // Create the temporary notifications table.
-    let stmt = db.createAsyncStatement(
-      `CREATE TEMP TABLE expiration_notify (
-         id INTEGER PRIMARY KEY
-       , v_id INTEGER
-       , p_id INTEGER
-       , url TEXT NOT NULL
-       , guid TEXT NOT NULL
-       , visit_date INTEGER
-       , expected_results INTEGER NOT NULL DEFAULT 0
-       , reason TEXT NOT NULL DEFAULT "expired"
-       )`
-    );
-    stmt.executeAsync();
-    stmt.finalize();
-
-    return db;
-  });
+  // Allows other components to easily access getPagesLimit.
+  this.wrappedJSObject = this;
 
   XPCOMUtils.defineLazyServiceGetter(
     this,
@@ -477,19 +428,62 @@
     "nsIUserIdleService"
   );
 
-  this._prefBranch = Services.prefs.getBranch(PREF_BRANCH);
+  // Max number of unique URIs to retain in history.
+  // Notice this is a lazy limit.  This means we will start to expire if we will
+  // go over it, but we won't ensure that we will stop exactly when we reach it,
+  // instead we will stop after the next expiration step that will bring us
+  // below it.
+  // If this preference does not exist or has a negative value, we will
+  // calculate a limit based on current hardware.
+  XPCOMUtils.defineLazyPreferenceGetter(
+    this,
+    "maxPages",
+    "places.history.expiration.max_pages",
+    -1,
+    () => {
+      // Clear the cache.
+      dump("max_pages changing\n");
+      this._pagesLimit = null;
+    }
+  );
 
-  this._loadPrefsPromise = this._loadPrefs().then(() => {
-    // Observe our preferences branch for changes.
-    this._prefBranch.addObserver("", this, true);
-
-    // Create our expiration timer.
-    this._newTimer();
-  }, Cu.reportError);
-
-  // Register topic observers.
-  Services.obs.addObserver(this, TOPIC_DEBUG_START_EXPIRATION, true);
-  Services.obs.addObserver(this, TOPIC_IDLE_DAILY, true);
+  // Seconds between each expiration step.
+  XPCOMUtils.defineLazyPreferenceGetter(
+    this,
+    "intervalSeconds",
+    "places.history.expiration.interval_seconds",
+    3 * 60, // 3 minutes
+    () => {
+      // Renew the timer with the new interval value.
+      this._newTimer();
+    },
+    v => (v > 0 ? v : 3 * 60) // Accept only positive values.
+  );
+
+  this._dbInitializedPromise = PlacesUtils.withConnectionWrapper(
+    "PlacesExpiration.jsm: setup",
+    async db => {
+      await db.execute(
+        `CREATE TEMP TABLE expiration_notify (
+          id INTEGER PRIMARY KEY,
+          v_id INTEGER,
+          p_id INTEGER,
+          url TEXT NOT NULL,
+          guid TEXT NOT NULL,
+          visit_date INTEGER,
+          expected_results INTEGER NOT NULL DEFAULT 0,
+          reason TEXT NOT NULL DEFAULT "expired"
+        )`
+      );
+    }
+  )
+    .then(() => {
+      // Start the expiration timer.
+      this._newTimer();
+      // Expire daily on idle.
+      Services.obs.addObserver(this, TOPIC_IDLE_DAILY, true);
+    })
+    .catch(Cu.reportError);
 
   // Block shutdown.
   let shutdownClient = PlacesUtils.history.connectionShutdownClient.jsclient;
@@ -506,26 +500,18 @@
     // If the database is dirty, we want to expire some entries, to speed up
     // the expiration process.
     if (this.status == STATUS.DIRTY) {
-      this._expireWithActionAndLimit(ACTION.SHUTDOWN_DIRTY, LIMIT.LARGE);
+      this._expire(ACTION.SHUTDOWN_DIRTY, LIMIT.LARGE).catch(Cu.reportError);
     }
-    this._finalizeInternalStatements();
   });
 }
 
 nsPlacesExpiration.prototype = {
-  observe: function PEX_observe(aSubject, aTopic, aData) {
+  observe(aSubject, aTopic, aData) {
     if (this._shuttingDown) {
       return;
     }
 
-    if (aTopic == TOPIC_PREF_CHANGED) {
-      this._loadPrefsPromise = this._loadPrefs().then(() => {
-        if (aData == PREF_INTERVAL_SECONDS) {
-          // Renew the timer with the new interval value.
-          this._newTimer();
-        }
-      }, Cu.reportError);
-    } else if (aTopic == TOPIC_DEBUG_START_EXPIRATION) {
+    if (aTopic == TOPIC_DEBUG_START_EXPIRATION) {
       // The passed-in limit is the maximum number of visits to expire when
       // history is over capacity.  Mind to correctly handle the NaN value.
       let limit = parseInt(aData);
@@ -533,19 +519,19 @@
         // Everything should be expired without any limit.  If history is over
         // capacity then all existing visits will be expired.
         // Should only be used in tests, since may cause dataloss.
-        this._expireWithActionAndLimit(ACTION.DEBUG, LIMIT.UNLIMITED);
+        this._expire(ACTION.DEBUG, LIMIT.UNLIMITED).catch(Cu.reportError);
       } else if (limit > 0) {
         // The number of expired visits is limited by this amount.  It may be
         // used for testing purposes, like checking that limited queries work.
         this._debugLimit = limit;
-        this._expireWithActionAndLimit(ACTION.DEBUG, LIMIT.DEBUG);
+        this._expire(ACTION.DEBUG, LIMIT.DEBUG).catch(Cu.reportError);
       } else {
         // Any other value is intended as a 0 limit, that means no visits
         // will be expired.  Even if this doesn't touch visits, it will remove
         // any orphan pages, icons, annotations and similar from the database,
         // so it may be used for cleanup purposes.
         this._debugLimit = -1;
-        this._expireWithActionAndLimit(ACTION.DEBUG, LIMIT.DEBUG);
+        this._expire(ACTION.DEBUG, LIMIT.DEBUG).catch(Cu.reportError);
       }
     } else if (aTopic == TOPIC_IDLE_BEGIN) {
       // Stop the expiration timer.  We don't want to keep up expiring on idle
@@ -555,7 +541,7 @@
         this._timer = null;
       }
       if (this.expireOnIdle) {
-        this._expireWithActionAndLimit(ACTION.IDLE_DIRTY, LIMIT.LARGE);
+        this._expire(ACTION.IDLE_DIRTY, LIMIT.LARGE).catch(Cu.reportError);
       }
     } else if (aTopic == TOPIC_IDLE_END) {
       // Restart the expiration timer.
@@ -563,7 +549,7 @@
         this._newTimer();
       }
     } else if (aTopic == TOPIC_IDLE_DAILY) {
-      this._expireWithActionAndLimit(ACTION.IDLE_DAILY, LIMIT.LARGE);
+      this._expire(ACTION.IDLE_DAILY, LIMIT.LARGE).catch(Cu.reportError);
     } else if (aTopic == TOPIC_TESTING_MODE) {
       this._testingMode = true;
     } else if (aTopic == PlacesUtils.TOPIC_INIT_COMPLETE) {
@@ -604,152 +590,84 @@
 
   onTitleChanged() {},
   onDeleteURI() {},
-  onPageChanged() {},
   onDeleteVisits() {},
 
   // nsITimerCallback
 
-  notify: function PEX_timerCallback() {
-    // Check if we are over history capacity, if so visits must be expired.
-    this._getPagesStats(aPagesCount => {
-      let overLimitPages = aPagesCount - this._urisLimit;
-      this._overLimit = overLimitPages > 0;
-      let action = this._overLimit ? ACTION.TIMED_OVERLIMIT : ACTION.TIMED;
+  notify() {
+    // Run at the first idle, or after 5 minutes, whatever comes first.
+    Services.tm.idleDispatchToMainThread(async () => {
+      let db = await PlacesUtils.promiseDBConnection();
+      let pagesCount = (
+        await db.executeCached("SELECT count(*) AS count FROM moz_places")
+      )[0].getResultByName("count");
+      let pagesLimit = await this.getPagesLimit();
+      // Check if we are over history capacity, if so visits must be expired.
+      let overLimitPages = pagesCount - pagesLimit;
+      let action = overLimitPages > 0 ? ACTION.TIMED_OVERLIMIT : ACTION.TIMED;
       // Adapt expiration aggressivity to the number of pages over the limit.
       let limit =
         overLimitPages > OVERLIMIT_PAGES_THRESHOLD ? LIMIT.LARGE : LIMIT.SMALL;
-      // Run at the first idle, or after a minute, whatever comes first.
-      Services.tm.idleDispatchToMainThread(() => {
-        this._expireWithActionAndLimit(action, limit);
-      }, 60000);
-    });
+      this._expire(action, limit).catch(Cu.reportError);
+    }, 300000);
   },
 
-  // mozIStorageStatementCallback
-
-  handleResult: function PEX_handleResult(aResultSet) {
+  _onQueryResult(row) {
     // We don't want to notify after shutdown.
     if (this._shuttingDown) {
       return;
     }
 
-    let row;
-    while ((row = aResultSet.getNextRow())) {
-      // expected_results is set to the number of expected visits by
-      // QUERY_FIND_VISITS_TO_EXPIRE.  We decrease that counter for each found
-      // visit and if it reaches zero we mark the database as dirty, since all
-      // the expected visits were expired, so it's likely the next run will
-      // find more.
-      let expectedResults = row.getResultByName("expected_results");
-      if (expectedResults > 0) {
-        if (!("_expectedResultsCount" in this)) {
-          this._expectedResultsCount = expectedResults;
-        }
-        if (this._expectedResultsCount > 0) {
-          this._expectedResultsCount--;
-        }
-      }
-
-      let uri = Services.io.newURI(row.getResultByName("url"));
-      let guid = row.getResultByName("guid");
-      let visitDate = row.getResultByName("visit_date");
-      let wholeEntry = row.getResultByName("whole_entry");
-      let mostRecentExpiredVisit = row.getResultByName(
-        "most_recent_expired_visit"
-      );
-      let reason = Ci.nsINavHistoryObserver.REASON_EXPIRED;
-      let observers = PlacesUtils.history.getObservers();
-
-      if (mostRecentExpiredVisit) {
-        let days = parseInt(
-          (Date.now() - mostRecentExpiredVisit / 1000) / MSECS_PER_DAY
-        );
-        if (!this._mostRecentExpiredVisitDays) {
-          this._mostRecentExpiredVisitDays = days;
-        } else if (days < this._mostRecentExpiredVisitDays) {
-          this._mostRecentExpiredVisitDays = days;
-        }
-      }
-
-      // Dispatch expiration notifications to history.
-      if (wholeEntry) {
-        notify(observers, "onDeleteURI", [uri, guid, reason]);
-      } else {
-        notify(observers, "onDeleteVisits", [
-          uri,
-          visitDate > 0,
-          guid,
-          reason,
-          0,
-        ]);
+    // expected_results is set to the number of expected visits by
+    // QUERY_FIND_VISITS_TO_EXPIRE.  We decrease that counter for each found
+    // visit and if it reaches zero we mark the database as dirty, since all
+    // the expected visits were expired, so it's likely the next run will
+    // find more.
+    let expectedResults = row.getResultByName("expected_results");
+    if (expectedResults > 0) {
+      if (!("_expectedResultsCount" in this)) {
+        this._expectedResultsCount = expectedResults;
+      }
+      if (this._expectedResultsCount > 0) {
+        this._expectedResultsCount--;
       }
     }
-  },
 
-  handleError: function PEX_handleError(aError) {
-    Cu.reportError(
-      "Async statement execution returned with '" +
-        aError.result +
-        "', '" +
-        aError.message +
-        "'"
+    let uri = Services.io.newURI(row.getResultByName("url"));
+    let guid = row.getResultByName("guid");
+    let visitDate = row.getResultByName("visit_date");
+    let wholeEntry = row.getResultByName("whole_entry");
+    let mostRecentExpiredVisit = row.getResultByName(
+      "most_recent_expired_visit"
     );
-  },
+    let reason = Ci.nsINavHistoryObserver.REASON_EXPIRED;
+    let observers = PlacesUtils.history.getObservers();
 
-  // Number of expiration steps needed to reach a CLEAN status.
-  _telemetrySteps: 1,
-  handleCompletion: function PEX_handleCompletion(aReason) {
-    if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
-      if (this._mostRecentExpiredVisitDays) {
-        try {
-          Services.telemetry
-            .getHistogramById("PLACES_MOST_RECENT_EXPIRED_VISIT_DAYS")
-            .add(this._mostRecentExpiredVisitDays);
-        } catch (ex) {
-          Cu.reportError("Unable to report telemetry.");
-        } finally {
-          delete this._mostRecentExpiredVisitDays;
-        }
-      }
-
-      if ("_expectedResultsCount" in this) {
-        // Adapt the aggressivity of steps based on the status of history.
-        // A dirty history will return all the entries we are expecting bringing
-        // our countdown to zero, while a clean one will not.
-        let oldStatus = this.status;
-        this.status =
-          this._expectedResultsCount == 0 ? STATUS.DIRTY : STATUS.CLEAN;
-
-        // Collect or send telemetry data.
-        if (this.status == STATUS.DIRTY) {
-          this._telemetrySteps++;
-        } else {
-          // Avoid reporting the common cases where the database is clean, or
-          // a single step is needed.
-          if (oldStatus == STATUS.DIRTY) {
-            try {
-              Services.telemetry
-                .getHistogramById("PLACES_EXPIRATION_STEPS_TO_CLEAN2")
-                .add(this._telemetrySteps);
-            } catch (ex) {
-              Cu.reportError("Unable to report telemetry.");
-            }
-          }
-          this._telemetrySteps = 1;
-        }
-
-        delete this._expectedResultsCount;
+    if (mostRecentExpiredVisit) {
+      let days = parseInt(
+        (Date.now() - mostRecentExpiredVisit / 1000) / MSECS_PER_DAY
+      );
+      if (!this._mostRecentExpiredVisitDays) {
+        this._mostRecentExpiredVisitDays = days;
+      } else if (days < this._mostRecentExpiredVisitDays) {
+        this._mostRecentExpiredVisitDays = days;
       }
+    }
 
-      // Dispatch a notification that expiration has finished.
-      Services.obs.notifyObservers(null, TOPIC_EXPIRATION_FINISHED);
+    // Dispatch expiration notifications to history.
+    if (wholeEntry) {
+      notify(observers, "onDeleteURI", [uri, guid, reason]);
+    } else {
+      notify(observers, "onDeleteVisits", [
+        uri,
+        visitDate > 0,
+        guid,
+        reason,
+        0,
+      ]);
     }
   },
 
-  // nsPlacesExpiration
-
-  _urisLimit: PREF_MAX_URIS_NOTSET,
-  _interval: PREF_INTERVAL_SECONDS_NOTSET,
   _shuttingDown: false,
 
   _status: STATUS.UNKNOWN,
@@ -767,6 +685,77 @@
     return this._status;
   },
 
+  async getPagesLimit() {
+    if (this._pagesLimit != null) {
+      return this._pagesLimit;
+    }
+    if (this.maxPages >= 0) {
+      return (this._pagesLimit = this.maxPages);
+    }
+
+    // The user didn't specify a custom limit, so we calculate the number of
+    // unique places that may fit an optimal database size on this hardware.
+    // Oldest pages over this threshold will be expired.
+    let memSizeBytes = MEMSIZE_FALLBACK_BYTES;
+    try {
+      // Limit the size on systems with small memory.
+      memSizeBytes = Services.sysinfo.getProperty("memsize");
+    } catch (ex) {}
+    if (memSizeBytes <= 0) {
+      memSizeBytes = MEMSIZE_FALLBACK_BYTES;
+    }
+
+    let diskAvailableBytes = DISKSIZE_FALLBACK_BYTES;
+    try {
+      // Protect against a full disk or tiny quota.
+      diskAvailableBytes = PlacesUtils.history.DBConnection.databaseFile.QueryInterface(
+        Ci.nsIFile
+      ).diskSpaceAvailable;
+    } catch (ex) {}
+    if (diskAvailableBytes <= 0) {
+      diskAvailableBytes = DISKSIZE_FALLBACK_BYTES;
+    }
+
+    let optimalDatabaseSize = Math.min(
+      (memSizeBytes * DATABASE_TO_MEMORY_PERC) / 100,
+      (diskAvailableBytes * DATABASE_TO_DISK_PERC) / 100,
+      DATABASE_MAX_SIZE
+    );
+
+    // Calculate avg size of a URI in the database.
+    let db;
+    try {
+      db = await PlacesUtils.promiseDBConnection();
+      if (db) {
+        let row = (
+          await db.execute(`SELECT * FROM pragma_page_size(),
+                                              pragma_page_count(),
+                                              pragma_freelist_count(),
+                                              (SELECT count(*) FROM moz_places)`)
+        )[0];
+        let pageSize = row.getResultByIndex(0);
+        let pageCount = row.getResultByIndex(1);
+        let freelistCount = row.getResultByIndex(2);
+        let uriCount = row.getResultByIndex(3);
+        let dbSize = (pageCount - freelistCount) * pageSize;
+        let avgURISize = Math.ceil(dbSize / uriCount);
+        // For new profiles this value may be too large, due to the Sqlite header,
+        // or Infinity when there are no pages.  Thus we must limit it.
+        if (avgURISize > URIENTRY_AVG_SIZE * 3) {
+          avgURISize = URIENTRY_AVG_SIZE;
+        }
+        return (this._pagesLimit = Math.ceil(optimalDatabaseSize / avgURISize));
+      }
+    } catch (ex) {
+      // We may have been initialized late in the shutdown process, maybe
+      // by a call to clear history on shutdown.
+      // If we're unable to get a connection clone, we'll just proceed with a
+      // large default value, it should not be critical at this point in the
+      // application life-cycle.
+    }
+    return (this._pagesLimit = 100000);
+  },
+
   _isIdleObserver: false,
   _expireOnIdle: false,
   set expireOnIdle(aExpireOnIdle) {
@@ -793,134 +782,11 @@
     return this._expireOnIdle;
   },
 
-  async _loadPrefs() {
-    // Get the user's limit, if it was set.
-    this._urisLimit = this._prefBranch.getIntPref(
-      PREF_MAX_URIS,
-      PREF_MAX_URIS_NOTSET
-    );
-    if (this._urisLimit < 0) {
-      // Some testing code expects a pref change to be synchronous, so
-      // temporarily set this to a large value, while we asynchronously update
-      // to the correct value.
-      this._urisLimit = 100000;
-
-      // The user didn't specify a custom limit, so we calculate the number of
-      // unique places that may fit an optimal database size on this hardware.
-      // Oldest pages over this threshold will be expired.
-      let memSizeBytes = MEMSIZE_FALLBACK_BYTES;
-      try {
-        // Limit the size on systems with small memory.
-        memSizeBytes = Services.sysinfo.getProperty("memsize");
-      } catch (ex) {}
-      if (memSizeBytes <= 0) {
-        memSizeBytes = MEMSIZE_FALLBACK_BYTES;
-      }
-
-      let diskAvailableBytes = DISKSIZE_FALLBACK_BYTES;
-      try {
-        // Protect against a full disk or tiny quota.
-        let dbFile = this._db.databaseFile;
-        dbFile.QueryInterface(Ci.nsIFile);
-        diskAvailableBytes = dbFile.diskSpaceAvailable;
-      } catch (ex) {}
-      if (diskAvailableBytes <= 0) {
-        diskAvailableBytes = DISKSIZE_FALLBACK_BYTES;
-      }
-
-      let optimalDatabaseSize = Math.min(
-        (memSizeBytes * DATABASE_TO_MEMORY_PERC) / 100,
-        (diskAvailableBytes * DATABASE_TO_DISK_PERC) / 100,
-        DATABASE_MAX_SIZE
-      );
-
-      // Calculate avg size of a URI in the database.
-      let db;
-      try {
-        db = await PlacesUtils.promiseDBConnection();
-        if (db) {
-          let row = (
-            await db.execute(`SELECT * FROM pragma_page_size(),
-                                                pragma_page_count(),
-                                                pragma_freelist_count(),
-                                                (SELECT count(*) FROM moz_places)`)
-          )[0];
-          let pageSize = row.getResultByIndex(0);
-          let pageCount = row.getResultByIndex(1);
-          let freelistCount = row.getResultByIndex(2);
-          let uriCount = row.getResultByIndex(3);
-          let dbSize = (pageCount - freelistCount) * pageSize;
-          let avgURISize = Math.ceil(dbSize / uriCount);
-          // For new profiles this value may be too large, due to the Sqlite header,
-          // or Infinity when there are no pages.  Thus we must limit it.
-          if (avgURISize > URIENTRY_AVG_SIZE * 3) {
-            avgURISize = URIENTRY_AVG_SIZE;
-          }
-          this._urisLimit = Math.ceil(optimalDatabaseSize / avgURISize);
-        }
-      } catch (ex) {
-        // We may have been initialized late in the shutdown process, maybe
-        // by a call to clear history on shutdown.
-        // If we're unable to get a connection clone, we'll just proceed with
-        // the default value, it should not be critical at this point in the
-        // application life-cycle.
-      }
-    }
-
-    // Expose the calculated limit to other components.
-    this._prefBranch.setIntPref(
-      PREF_READONLY_CALCULATED_MAX_URIS,
-      this._urisLimit
-    );
-
-    // Get the expiration interval value.
-    this._interval = this._prefBranch.getIntPref(
-      PREF_INTERVAL_SECONDS,
-      PREF_INTERVAL_SECONDS_NOTSET
-    );
-    if (this._interval <= 0) {
-      this._interval = PREF_INTERVAL_SECONDS_NOTSET;
-    }
-  },
-
-  /**
-   * Evaluates the real number of pages in the database and the value currently
-   * used by the SQLite query planner.
-   *
-   * @param aCallback
-   *        invoked on success, function (aPagesCount).
-   */
-  _getPagesStats: function PEX__getPagesStats(aCallback) {
-    if (!this._cachedStatements.LIMIT_COUNT) {
-      this._cachedStatements.LIMIT_COUNT = this._db.createAsyncStatement(
-        `SELECT COUNT(*) FROM moz_places`
-      );
-    }
-    this._cachedStatements.LIMIT_COUNT.executeAsync({
-      _pagesCount: 0,
-      handleResult(aResults) {
-        let row = aResults.getNextRow();
-        this._pagesCount = row.getResultByIndex(0);
-      },
-      handleCompletion(aReason) {
-        if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
-          aCallback(this._pagesCount);
-        }
-      },
-      handleError(aError) {
-        Cu.reportError(
-          "Async statement execution returned with '" +
-            aError.result +
-            "', '" +
-            aError.message +
-            "'"
-        );
-      },
-    });
-  },
+  // Number of expiration steps needed to reach a CLEAN status.
+  _telemetrySteps: 1,
 
   /**
-   * Execute async statements to expire with the specified queries.
+   * Expires visits and orphans.
    *
    * @param aAction
    *        The ACTION we are expiring for.  See the ACTION const for values.
@@ -928,78 +794,102 @@
    *        Whether to use small, large or no limits when expiring.  See the
    *        LIMIT const for values.
    */
-  _expireWithActionAndLimit: function PEX__expireWithActionAndLimit(
-    aAction,
-    aLimit
-  ) {
-    (async () => {
-      // Ensure that we'll run statements with the most up-to-date pref values.
-      // On shutdown we cannot do this, since we must enqueue the expiration
-      // statements synchronously before the connection goes away.
-      // TODO (Bug 1275878): handle this properly through a shutdown blocker.
-      if (!this._shuttingDown) {
-        await this._loadPrefsPromise;
-      }
+  async _expire(aAction, aLimit) {
+    // Skip expiration during batch mode.
+    if (this._inBatchMode) {
+      return;
+    }
+    // Don't try to further expire after shutdown.
+    if (this._shuttingDown && aAction != ACTION.SHUTDOWN_DIRTY) {
+      return;
+    }
+    await this._dbInitializedPromise;
 
-      // Skip expiration during batch mode.
-      if (this._inBatchMode) {
-        return;
-      }
-      // Don't try to further expire after shutdown.
-      if (this._shuttingDown && aAction != ACTION.SHUTDOWN_DIRTY) {
-        return;
+    try {
+      await PlacesUtils.withConnectionWrapper(
+        "PlacesExpiration.jsm: expire",
+        async db => {
+          await db.executeTransaction(async () => {
+            for (let queryType in EXPIRATION_QUERIES) {
+              let query = EXPIRATION_QUERIES[queryType];
+              if (query.actions & aAction) {
+                let params = await this._getQueryParams(
+                  queryType,
+                  aLimit,
+                  aAction
+                );
+                await db.executeCached(
+                  query.sql,
+                  params,
+                  this._onQueryResult.bind(this)
+                );
+              }
+            }
+          });
+        }
+      );
+    } catch (ex) {
+      Cu.reportError(ex);
+      return;
+    }
+
+    if (this._mostRecentExpiredVisitDays) {
+      try {
+        Services.telemetry
+          .getHistogramById("PLACES_MOST_RECENT_EXPIRED_VISIT_DAYS")
+          .add(this._mostRecentExpiredVisitDays);
+      } catch (ex) {
+        Cu.reportError("Unable to report telemetry.");
+      } finally {
+        delete this._mostRecentExpiredVisitDays;
       }
+    }
 
-      let boundStatements = [];
-      for (let queryType in EXPIRATION_QUERIES) {
-        if (EXPIRATION_QUERIES[queryType].actions & aAction) {
-          boundStatements.push(
-            this._getBoundStatement(queryType, aLimit, aAction)
-          );
+    if ("_expectedResultsCount" in this) {
+      // Adapt the aggressivity of steps based on the status of history.
+      // A dirty history will return all the entries we are expecting bringing
+      // our countdown to zero, while a clean one will not.
+      let oldStatus = this.status;
+      this.status =
+        this._expectedResultsCount == 0 ? STATUS.DIRTY : STATUS.CLEAN;
+
+      // Collect or send telemetry data.
+      if (this.status == STATUS.DIRTY) {
+        this._telemetrySteps++;
+      } else {
+        // Avoid reporting the common cases where the database is clean, or
+        // a single step is needed.
+        if (oldStatus == STATUS.DIRTY) {
+          try {
+            Services.telemetry
+              .getHistogramById("PLACES_EXPIRATION_STEPS_TO_CLEAN2")
+              .add(this._telemetrySteps);
+          } catch (ex) {
+            Cu.reportError("Unable to report telemetry.");
+          }
         }
+        this._telemetrySteps = 1;
       }
 
-      // Execute statements asynchronously in a transaction.
-      this._db.executeAsync(boundStatements, this);
-    })().catch(Cu.reportError);
-  },
-
-  /**
-   * Finalizes all of our mozIStorageStatements so we can properly close the
-   * database.
-   */
-  _finalizeInternalStatements: function PEX__finalizeInternalStatements() {
-    for (let queryType in this._cachedStatements) {
-      let stmt = this._cachedStatements[queryType];
-      stmt.finalize();
+      delete this._expectedResultsCount;
     }
+
+    // Dispatch a notification that expiration has finished.
+    Services.obs.notifyObservers(null, PlacesUtils.TOPIC_EXPIRATION_FINISHED);
   },
 
   /**
-   * Generate the statement used for expiration.
+   * Generate a query used for expiration.
    *
    * @param aQueryType
-   *        Type of the query to build statement for.
+   *        Type of the query.
    * @param aLimit
    *        Whether to use small, large or no limits when expiring.  See the
    *        LIMIT const for values.
    * @param aAction
    *        Current action causing the expiration.  See the ACTION const.
    */
-  _cachedStatements: {},
-  _getBoundStatement: function PEX__getBoundStatement(
-    aQueryType,
-    aLimit,
-    aAction
-  ) {
-    // Statements creation can be expensive, so we want to cache them.
-    let stmt = this._cachedStatements[aQueryType];
-    if (stmt === undefined) {
-      stmt = this._cachedStatements[aQueryType] = this._db.createAsyncStatement(
-        EXPIRATION_QUERIES[aQueryType].sql
-      );
-    }
-
+  async _getQueryParams(aQueryType, aLimit, aAction) {
     let baseLimit;
     switch (aLimit) {
       case LIMIT.UNLIMITED:
@@ -1024,49 +914,53 @@
       baseLimit *= EXPIRE_AGGRESSIVITY_MULTIPLIER;
     }
 
-    // Bind the appropriate parameters.
-    let params = stmt.params;
     switch (aQueryType) {
       case "QUERY_FIND_EXOTIC_VISITS_TO_EXPIRE":
-        // Avoid expiring all visits in case of an unlimited debug expiration,
-        // just remove orphans instead.
-        params.limit_visits =
-          aLimit == LIMIT.DEBUG && baseLimit == -1 ? 0 : baseLimit;
-        break;
+        return {
+          // Avoid expiring all visits in case of an unlimited debug expiration,
+          // just remove orphans instead.
+          limit_visits:
+            aLimit == LIMIT.DEBUG && baseLimit == -1 ? 0 : baseLimit,
+        };
       case "QUERY_FIND_VISITS_TO_EXPIRE":
-        params.max_uris = this._urisLimit;
-        // Avoid expiring all visits in case of an unlimited debug expiration,
-        // just remove orphans instead.
-        params.limit_visits =
-          aLimit == LIMIT.DEBUG && baseLimit == -1 ? 0 : baseLimit;
-        break;
+        return {
+          max_uris: await this.getPagesLimit(),
+          // Avoid expiring all visits in case of an unlimited debug expiration,
+          // just remove orphans instead.
+          limit_visits:
+            aLimit == LIMIT.DEBUG && baseLimit == -1 ? 0 : baseLimit,
+        };
       case "QUERY_FIND_URIS_TO_EXPIRE":
-        params.limit_uris = baseLimit;
-        break;
+        return {
+          limit_uris: baseLimit,
+        };
       case "QUERY_EXPIRE_ANNOS":
-        // Each page may have multiple annos.
-        params.limit_annos = baseLimit * EXPIRE_AGGRESSIVITY_MULTIPLIER;
-        break;
+        return {
+          // Each page may have multiple annos.
+          limit_annos: baseLimit * EXPIRE_AGGRESSIVITY_MULTIPLIER,
+        };
       case "QUERY_EXPIRE_ITEMS_ANNOS":
-        params.limit_annos = baseLimit;
-        break;
+        return {
+          limit_annos: baseLimit,
+        };
       case "QUERY_EXPIRE_ANNO_ATTRIBUTES":
-        params.limit_annos = baseLimit;
-        break;
+        return {
+          limit_annos: baseLimit,
+        };
       case "QUERY_EXPIRE_INPUTHISTORY":
-        params.limit_inputhistory = baseLimit;
-        break;
+        return {
+          limit_inputhistory: baseLimit,
+        };
     }
-
-    return stmt;
+    return undefined;
   },
 
   /**
-   * Creates a new timer based on this._interval.
+   * Creates a new timer based on this.intervalSeconds.
    *
-   * @return a REPEATING_SLACK nsITimer that runs every this._interval.
+   * @return a REPEATING_SLACK nsITimer that runs every this.intervalSeconds.
    */
-  _newTimer: function PEX__newTimer() {
+  _newTimer() {
     if (this._timer) {
       this._timer.cancel();
     }
@@ -1075,8 +969,8 @@
     }
     let interval =
       this.status != STATUS.DIRTY
-        ? this._interval * EXPIRE_AGGRESSIVITY_MULTIPLIER
-        : this._interval;
+        ? this.intervalSeconds * EXPIRE_AGGRESSIVITY_MULTIPLIER
+        : this.intervalSeconds;
 
     let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
     timer.initWithCallback(
@@ -1090,19 +984,14 @@
     return (this._timer = timer);
   },
 
-  // nsISupports
-
   classID: Components.ID("705a423f-2f69-42f3-b9fe-1517e0dee56f"),
 
   QueryInterface: ChromeUtils.generateQI([
     "nsIObserver",
     "nsINavHistoryObserver",
     "nsITimerCallback",
-    "mozIStorageStatementCallback",
     "nsISupportsWeakReference",
   ]),
 };
 
-// Module Registration
-
 var EXPORTED_SYMBOLS = ["nsPlacesExpiration"];
diff -Nru firefox-84.0.2+build1/toolkit/components/places/Shutdown.cpp firefox-85.0+build1/toolkit/components/places/Shutdown.cpp
--- firefox-84.0.2+build1/toolkit/components/places/Shutdown.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/Shutdown.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -4,7 +4,9 @@
 
 #include "Shutdown.h"
 #include "mozilla/Unused.h"
-#include "nsIWritablePropertyBag2.h"
+#include "mozilla/SimpleEnumerator.h"
+#include "nsIProperty.h"
+#include "nsIWritablePropertyBag.h"
 
 namespace mozilla {
 namespace places {
@@ -48,36 +50,37 @@
 PlacesShutdownBlocker::GetState(nsIPropertyBag** _state) {
   NS_ENSURE_ARG_POINTER(_state);
 
-  nsCOMPtr<nsIWritablePropertyBag2> bag =
+  nsCOMPtr<nsIWritablePropertyBag> bag =
       do_CreateInstance("@mozilla.org/hash-property-bag;1");
   NS_ENSURE_TRUE(bag, NS_ERROR_OUT_OF_MEMORY);
-  bag.forget(_state);
 
-  // Put `mState` in field `progress`
   RefPtr<nsVariant> progress = new nsVariant();
-  nsresult rv = progress->SetAsUint8(mState);
-  if (NS_WARN_IF(NS_FAILED(rv))) return rv;
-  rv = static_cast<nsIWritablePropertyBag2*>(*_state)->SetPropertyAsInterface(
-      u"progress"_ns, progress);
-  if (NS_WARN_IF(NS_FAILED(rv))) return rv;
-
-  // Put `mBarrier`'s state in field `barrier`, if possible
-  if (!mBarrier) {
-    return NS_OK;
-  }
-  nsCOMPtr<nsIPropertyBag> barrierState;
-  rv = mBarrier->GetState(getter_AddRefs(barrierState));
-  if (NS_FAILED(rv)) {
-    return NS_OK;
+  Unused << NS_WARN_IF(NS_FAILED(progress->SetAsUint8(mState)));
+  Unused << NS_WARN_IF(
+      NS_FAILED(bag->SetProperty(u"PlacesShutdownProgress"_ns, progress)));
+
+  if (mBarrier) {
+    nsCOMPtr<nsIPropertyBag> barrierState;
+    if (NS_SUCCEEDED(mBarrier->GetState(getter_AddRefs(barrierState))) &&
+        barrierState) {
+      nsCOMPtr<nsISimpleEnumerator> enumerator;
+      if (NS_SUCCEEDED(
+              barrierState->GetEnumerator(getter_AddRefs(enumerator))) &&
+          enumerator) {
+        for (const auto& property : SimpleEnumerator<nsIProperty>(enumerator)) {
+          nsAutoString prefix(u"Barrier: "_ns);
+          nsAutoString name;
+          Unused << NS_WARN_IF(NS_FAILED(property->GetName(name)));
+          prefix.Append(name);
+          nsCOMPtr<nsIVariant> value;
+          Unused << NS_WARN_IF(
+              NS_FAILED(property->GetValue(getter_AddRefs(value))));
+          Unused << NS_WARN_IF(NS_FAILED(bag->SetProperty(prefix, value)));
+        }
+      }
+    }
   }
-
-  RefPtr<nsVariant> barrier = new nsVariant();
-  rv = barrier->SetAsInterface(NS_GET_IID(nsIPropertyBag), barrierState);
-  if (NS_WARN_IF(NS_FAILED(rv))) return rv;
-  rv = static_cast<nsIWritablePropertyBag2*>(*_state)->SetPropertyAsInterface(
-      u"Barrier"_ns, barrier);
-  if (NS_WARN_IF(NS_FAILED(rv))) return rv;
-
+  bag.forget(_state);
   return NS_OK;
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/places/TaggingService.jsm firefox-85.0+build1/toolkit/components/places/TaggingService.jsm
--- firefox-84.0.2+build1/toolkit/components/places/TaggingService.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/TaggingService.jsm	2021-01-18 19:58:26.000000000 +0000
@@ -452,7 +452,6 @@
     }
   },
 
-  onItemVisited() {},
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
 
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/bookmarks/test_async_observers.js firefox-85.0+build1/toolkit/components/places/tests/bookmarks/test_async_observers.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/bookmarks/test_async_observers.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/bookmarks/test_async_observers.js	2021-01-18 19:58:26.000000000 +0000
@@ -28,53 +28,19 @@
   Assert.equal(gBookmarkGuids.length, 2);
 });
 
-add_task(async function test_add_visit() {
-  // Add a visit to the bookmark and wait for the observer.
-  let guids = new Set(gBookmarkGuids);
-  Assert.equal(guids.size, 2);
-  let promiseNotifications = PlacesTestUtils.waitForNotification(
-    "onItemVisited",
-    (id, visitId, time, transition, uri, parentId, guid, parentGuid) => {
-      info(`Got a visit notification for ${guid}.`);
-      Assert.ok(visitId > 0);
-      guids.delete(guid);
-      return guids.size == 0;
-    }
-  );
-
-  await PlacesTestUtils.addVisits({
-    uri: "http://book.ma.rk/",
-    transition: TRANSITION_TYPED,
-    visitDate: NOW,
-  });
-  await promiseNotifications;
-});
-
 add_task(async function test_add_icon() {
   // Add a visit to the bookmark and wait for the observer.
   let guids = new Set(gBookmarkGuids);
   Assert.equal(guids.size, 2);
   let promiseNotifications = PlacesTestUtils.waitForNotification(
-    "onItemChanged",
-    (
-      id,
-      property,
-      isAnno,
-      newValue,
-      lastModified,
-      itemType,
-      parentId,
-      guid
-    ) => {
-      info(`Got a changed notification for ${guid}.`);
-      Assert.equal(property, "favicon");
-      Assert.ok(!isAnno);
-      Assert.equal(newValue, SMALLPNG_DATA_URI.spec);
-      Assert.equal(lastModified, 0);
-      Assert.equal(itemType, PlacesUtils.bookmarks.TYPE_BOOKMARK);
-      guids.delete(guid);
-      return guids.size == 0;
-    }
+    "favicon-changed",
+    events =>
+      events.some(
+        event =>
+          event.url == "http://book.ma.rk/" &&
+          event.faviconUrl.startsWith("data:image/png;base64")
+      ),
+    "places"
   );
 
   PlacesUtils.favicons.setAndFetchFaviconForPage(
@@ -118,31 +84,3 @@
   await PlacesUtils.history.remove("http://book.ma.rk/");
   await promiseNotifications;
 });
-
-add_task(async function shutdown() {
-  // Check that async observers don't try to create async statements after
-  // shutdown.  That would cause assertions, since the async thread is gone
-  // already.  Note that in such a case the notifications are not fired, so we
-  // cannot test for them.
-  // Put an history notification that triggers AsyncGetBookmarksForURI between
-  // asyncClose() and the actual connection closing.  Enqueuing a main-thread
-  // event as a shutdown blocker should ensure it runs before
-  // places-connection-closed.
-  // Notice this code is not using helpers cause it depends on a very specific
-  // order, a change in the helpers code could make this test useless.
-
-  let shutdownClient = PlacesUtils.history.shutdownClient.jsclient;
-  shutdownClient.addBlocker("Places Expiration: shutdown", function() {
-    Services.tm.mainThread.dispatch(() => {
-      // WARNING: this is very bad, never use out of testing code.
-      PlacesUtils.bookmarks
-        .QueryInterface(Ci.nsINavHistoryObserver)
-        .onPageChanged(
-          NetUtil.newURI("http://book.ma.rk/"),
-          Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON,
-          "test",
-          "test"
-        );
-    }, Ci.nsIThread.DISPATCH_NORMAL);
-  });
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js firefox-85.0+build1/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/bookmarks/test_nsINavBookmarkObserver.js	2021-01-18 19:58:26.000000000 +0000
@@ -66,9 +66,6 @@
   onItemChanged() {
     return this.validate("onItemChanged", arguments);
   },
-  onItemVisited() {
-    return this.validate("onItemVisited", arguments);
-  },
   onItemMoved() {
     return this.validate("onItemMoved", arguments);
   },
@@ -121,9 +118,6 @@
   onItemChanged() {
     return this.validate("onItemChanged", arguments);
   },
-  onItemVisited() {
-    return this.validate("onItemVisited", arguments);
-  },
   onItemMoved() {
     return this.validate("onItemMoved", arguments);
   },
@@ -603,43 +597,6 @@
   await promise;
 });
 
-add_task(async function onItemMoved_bookmark() {
-  let bm = await PlacesUtils.bookmarks.fetch({
-    parentGuid: PlacesUtils.bookmarks.unfiledGuid,
-    index: 0,
-  });
-  let uri = Services.io.newURI(bm.url.href);
-  let promise = Promise.all([
-    gBookmarkSkipObserver.setup(["onItemVisited"]),
-    gBookmarksObserver.setup([
-      {
-        name: "onItemVisited",
-        args: [
-          { name: "itemId", check: v => typeof v == "number" && v > 0 },
-          { name: "visitId", check: v => typeof v == "number" && v > 0 },
-          { name: "time", check: v => typeof v == "number" && v > 0 },
-          {
-            name: "transitionType",
-            check: v => v === PlacesUtils.history.TRANSITION_TYPED,
-          },
-          { name: "uri", check: v => v instanceof Ci.nsIURI && v.equals(uri) },
-          { name: "parentId", check: v => v === gUnfiledFolderId },
-          {
-            name: "guid",
-            check: v => typeof v == "string" && PlacesUtils.isValidGuid(v),
-          },
-          {
-            name: "parentGuid",
-            check: v => typeof v == "string" && PlacesUtils.isValidGuid(v),
-          },
-        ],
-      },
-    ]),
-  ]);
-  await PlacesTestUtils.addVisits({ uri, transition: TRANSITION_TYPED });
-  await promise;
-});
-
 add_task(async function bookmarkItemRemoved_bookmark() {
   let bm = await PlacesUtils.bookmarks.fetch({
     parentGuid: PlacesUtils.bookmarks.unfiledGuid,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_bug461710.js firefox-85.0+build1/toolkit/components/places/tests/browser/browser_bug461710.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_bug461710.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/browser/browser_bug461710.js	2021-01-18 19:58:27.000000000 +0000
@@ -18,21 +18,18 @@
     },
     {
       private: false,
-      topic: "visited-status-resolution",
       subtest: "link_page.html",
       color: kRed,
       message: "Visited link coloring should work outside of private mode",
     },
     {
       private: true,
-      topic: "visited-status-resolution",
       subtest: "link_page-2.html",
       color: kBlue,
       message: "Visited link coloring should not work inside of private mode",
     },
     {
       private: false,
-      topic: "visited-status-resolution",
       subtest: "link_page-3.html",
       color: kRed,
       message: "Visited link coloring should work outside of private mode",
@@ -42,16 +39,22 @@
   let uri = Services.io.newURI(prefix + tests[0].subtest);
   for (let test of tests) {
     info(test.subtest);
-    let promise = TestUtils.topicObserved(test.topic, subject =>
-      uri.equals(subject.QueryInterface(Ci.nsIURI))
-    );
+    let promise = null;
+    if (test.topic) {
+      promise = TestUtils.topicObserved(test.topic, subject =>
+        uri.equals(subject.QueryInterface(Ci.nsIURI))
+      );
+    }
     await BrowserTestUtils.withNewTab(
       {
         gBrowser: test.private ? privateWindow.gBrowser : normalWindow.gBrowser,
         url: prefix + test.subtest,
       },
       async function(browser) {
-        await promise;
+        if (promise) {
+          await promise;
+        }
+
         if (test.color) {
           // In e10s waiting for visited-status-resolution is not enough to ensure links
           // have been updated, because it only tells us that messages to update links
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_bug646422.js firefox-85.0+build1/toolkit/components/places/tests/browser/browser_bug646422.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_bug646422.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/browser/browser_bug646422.js	2021-01-18 19:58:26.000000000 +0000
@@ -28,7 +28,6 @@
       onEndUpdateBatch() {},
       onDeleteURI() {},
       onClearHistory() {},
-      onPageChanged() {},
       onDeleteVisits() {},
       QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
     };
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_settitle.js firefox-85.0+build1/toolkit/components/places/tests/browser/browser_settitle.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_settitle.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/browser/browser_settitle.js	2021-01-18 19:58:27.000000000 +0000
@@ -40,7 +40,6 @@
       },
       onDeleteURI() {},
       onClearHistory() {},
-      onPageChanged() {},
       onDeleteVisits() {},
       QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
     };
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js firefox-85.0+build1/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/browser/browser_visituri_privatebrowsing_perwindowpb.js	2021-01-18 19:58:27.000000000 +0000
@@ -58,6 +58,6 @@
   let loadedPromise = BrowserTestUtils.browserLoaded(
     win.gBrowser.selectedBrowser
   );
-  await BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
+  BrowserTestUtils.loadURI(win.gBrowser.selectedBrowser, url);
   await loadedPromise;
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/browser/head.js firefox-85.0+build1/toolkit/components/places/tests/browser/head.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/browser/head.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/browser/head.js	2021-01-18 19:58:26.000000000 +0000
@@ -92,7 +92,6 @@
   onTitleChanged() {},
   onDeleteURI() {},
   onClearHistory() {},
-  onPageChanged() {},
   onDeleteVisits() {},
   QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
 };
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/chrome/test_371798.xhtml firefox-85.0+build1/toolkit/components/places/tests/chrome/test_371798.xhtml
--- firefox-84.0.2+build1/toolkit/components/places/tests/chrome/test_371798.xhtml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/chrome/test_371798.xhtml	2021-01-18 19:58:27.000000000 +0000
@@ -27,7 +27,6 @@
       onBeginUpdateBatch() {},
       onEndUpdateBatch() {},
       onItemRemoved() {},
-      onItemVisited() {},
       onItemMoved() {},
 
       onItemChanged() {
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteURI.js firefox-85.0+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteURI.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteURI.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteURI.js	2021-01-18 19:58:26.000000000 +0000
@@ -88,7 +88,6 @@
         do_check_valid_places_guid(aGUID);
         Assert.equal(aReason, Ci.nsINavHistoryObserver.REASON_EXPIRED);
       },
-      onPageChanged() {},
       onDeleteVisits() {},
     };
     hs.addObserver(historyObserver);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteVisits.js firefox-85.0+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteVisits.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteVisits.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/expiration/test_notifications_onDeleteVisits.js	2021-01-18 19:58:27.000000000 +0000
@@ -122,7 +122,6 @@
         do_check_valid_places_guid(aGUID);
         Assert.equal(aReason, Ci.nsINavHistoryObserver.REASON_EXPIRED);
       },
-      onPageChanged() {},
       onDeleteVisits(aURI, aPartialRemoval, aGUID, aReason) {
         currentTest.receivedNotifications++;
         do_check_guid_for_uri(aURI, aGUID);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/head_favicons.js firefox-85.0+build1/toolkit/components/places/tests/favicons/head_favicons.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/head_favicons.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/head_favicons.js	2021-01-18 19:58:27.000000000 +0000
@@ -24,41 +24,6 @@
 );
 
 /**
- * Waits for the first OnPageChanged notification for ATTRIBUTE_FAVICON, and
- * verifies that it matches the expected page URI and associated favicon URI.
- *
- * This function also double-checks the GUID parameter of the notification.
- *
- * @param aExpectedPageURI
- *        nsIURI object of the page whose favicon should change.
- * @param aExpectedFaviconURI
- *        nsIURI object of the newly associated favicon.
- * @param aCallback
- *        This function is called after the check finished.
- */
-function waitForFaviconChanged(
-  aExpectedPageURI,
-  aExpectedFaviconURI,
-  aCallback
-) {
-  let historyObserver = {
-    __proto__: NavHistoryObserver.prototype,
-    onPageChanged: function WFFC_onPageChanged(aURI, aWhat, aValue, aGUID) {
-      if (aWhat != Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
-        return;
-      }
-      PlacesUtils.history.removeObserver(this);
-
-      Assert.ok(aURI.equals(aExpectedPageURI));
-      Assert.equal(aValue, aExpectedFaviconURI.spec);
-      do_check_guid_for_uri(aURI, aGUID);
-      aCallback();
-    },
-  };
-  PlacesUtils.history.addObserver(historyObserver);
-}
-
-/**
  * Checks that the favicon for the given page matches the provided data.
  *
  * @param aPageURI
@@ -114,7 +79,17 @@
 }
 
 function promiseFaviconChanged(aExpectedPageURI, aExpectedFaviconURI) {
-  return new Promise(resolve =>
-    waitForFaviconChanged(aExpectedPageURI, aExpectedFaviconURI, resolve)
+  return PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events =>
+      events.some(e => {
+        if (e.url == aExpectedPageURI.spec) {
+          Assert.equal(e.faviconUrl, aExpectedFaviconURI.spec);
+          do_check_guid_for_uri(aExpectedPageURI, e.pageGuid);
+          return true;
+        }
+        return false;
+      }),
+    "places"
   );
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_copyFavicons.js firefox-85.0+build1/toolkit/components/places/tests/favicons/test_copyFavicons.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_copyFavicons.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/test_copyFavicons.js	2021-01-18 19:58:26.000000000 +0000
@@ -15,20 +15,12 @@
   });
 }
 
-function promisePageChanged() {
-  return new Promise(resolve => {
-    let observer = new NavHistoryObserver();
-    observer.onPageChanged = (uri, attribute, newValue, guid) => {
-      info("onPageChanged for attribute " + attribute + " and uri " + uri.spec);
-      if (attribute == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
-        PlacesUtils.history.removeObserver(observer);
-        Assert.ok(newValue, "newValue should be a valid value");
-        Assert.ok(guid, "Guid should be a valid value");
-        resolve(uri);
-      }
-    };
-    PlacesUtils.history.addObserver(observer, false);
-  });
+function promisePageChanged(url) {
+  return PlacesTestUtils.waitForNotification(
+    "favicon-changed",
+    events => events.some(e => e.url == url),
+    "places"
+  );
 }
 
 add_task(async function test_copyFavicons_inputcheck() {
@@ -104,17 +96,13 @@
   await setFaviconForPage(TEST_URI1, SMALLPNG_DATA_URI);
   await setFaviconForPage(TEST_URI1, SMALLSVG_DATA_URI);
   await PlacesTestUtils.addVisits(TEST_URI2);
-  let promiseChange = promisePageChanged();
+  let promiseChange = promisePageChanged(TEST_URI2.spec);
   Assert.equal(
     (await copyFavicons(TEST_URI1, TEST_URI2, false)).spec,
     SMALLSVG_DATA_URI.spec,
     "Icon should have been copied"
   );
-  Assert.equal(
-    (await promiseChange).spec,
-    TEST_URI2.spec,
-    "Notification should have fired"
-  );
+  await promiseChange;
   Assert.equal(
     await getFaviconUrlForPage(TEST_URI2, 1),
     SMALLPNG_DATA_URI.spec,
@@ -131,17 +119,13 @@
     url: TEST_URI3,
     parentGuid: PlacesUtils.bookmarks.unfiledGuid,
   });
-  promiseChange = promisePageChanged();
+  promiseChange = promisePageChanged(TEST_URI3.spec);
   Assert.equal(
     (await copyFavicons(TEST_URI1, TEST_URI3, true)).spec,
     SMALLSVG_DATA_URI.spec,
     "Icon should have been copied"
   );
-  Assert.equal(
-    (await promiseChange).spec,
-    TEST_URI3.spec,
-    "Notification should have fired"
-  );
+  await promiseChange;
   Assert.equal(
     await getFaviconUrlForPage(TEST_URI3, 1),
     SMALLPNG_DATA_URI.spec,
@@ -164,17 +148,13 @@
   await setFaviconForPage(TEST_URI1, SMALLSVG_DATA_URI);
   await PlacesTestUtils.addVisits(TEST_URI2);
   await setFaviconForPage(TEST_URI2, SMALLPNG_DATA_URI);
-  let promiseChange = promisePageChanged();
+  let promiseChange = promisePageChanged(TEST_URI2.spec);
   Assert.equal(
     (await copyFavicons(TEST_URI1, TEST_URI2, false)).spec,
     SMALLSVG_DATA_URI.spec,
     "Icon should have been copied"
   );
-  Assert.equal(
-    (await promiseChange).spec,
-    TEST_URI2.spec,
-    "Notification should have fired"
-  );
+  await promiseChange;
   Assert.equal(
     await getFaviconUrlForPage(TEST_URI2, 1),
     SMALLPNG_DATA_URI.spec,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_query_result_favicon_changed_on_child.js firefox-85.0+build1/toolkit/components/places/tests/favicons/test_query_result_favicon_changed_on_child.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_query_result_favicon_changed_on_child.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/test_query_result_favicon_changed_on_child.js	2021-01-18 19:58:26.000000000 +0000
@@ -47,10 +47,12 @@
       }
     },
     nodeIconChanged(aNode) {
-      do_throw(
-        "The icon should be set only for the page," +
-          " not for the containing query."
-      );
+      if (PlacesUtils.nodeIsContainer(aNode)) {
+        do_throw(
+          "The icon should be set only for the page," +
+            " not for the containing query."
+        );
+      }
     },
   };
   result.addObserver(resultObserver);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js	2021-01-18 19:58:26.000000000 +0000
@@ -21,15 +21,12 @@
   // point we can be sure previous calls didn't send a notification.
   let lastPageURI = Services.io.newURI("http://example.com/verification");
   let promiseIconChanged = PlacesTestUtils.waitForNotification(
-    "onPageChanged",
-    (uri, prop, value) => {
-      return (
-        prop == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-        uri.equals(lastPageURI) &&
-        value == SMALLPNG_DATA_URI.spec
-      );
-    },
-    "history"
+    "favicon-changed",
+    events =>
+      events.some(
+        e => e.url == lastPageURI.spec && e.faviconUrl == SMALLPNG_DATA_URI.spec
+      ),
+    "places"
   );
 
   info("Test null page uri");
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js	2021-01-18 19:58:26.000000000 +0000
@@ -72,16 +72,16 @@
 
     let pageGuid;
     let promise = PlacesTestUtils.waitForNotification(
-      "onPageChanged",
-      (uri, prop, value, guid) => {
-        pageGuid = guid;
-        return (
-          prop == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-          uri.equals(pageURI) &&
-          value == faviconURI.spec
-        );
-      },
-      "history"
+      "favicon-changed",
+      events =>
+        events.some(e => {
+          if (e.url == pageURI.spec && e.faviconUrl == faviconURI.spec) {
+            pageGuid = e.pageGuid;
+            return true;
+          }
+          return false;
+        }),
+      "places"
     );
 
     PlacesUtils.favicons.setAndFetchFaviconForPage(
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_redirects.js firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_redirects.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_redirects.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_redirects.js	2021-01-18 19:58:27.000000000 +0000
@@ -28,15 +28,12 @@
   });
 
   let promise = PlacesTestUtils.waitForNotification(
-    "onPageChanged",
-    (uri, prop, value, guid) => {
-      return (
-        prop == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-        uri.spec == srcUrl &&
-        value == SMALLPNG_DATA_URI.spec
-      );
-    },
-    "history"
+    "favicon-changed",
+    events =>
+      events.some(
+        e => e.url == srcUrl && e.faviconUrl == SMALLPNG_DATA_URI.spec
+      ),
+    "places"
   );
 
   PlacesUtils.favicons.setAndFetchFaviconForPage(
@@ -75,15 +72,12 @@
 
   let promise = Promise.race([
     PlacesTestUtils.waitForNotification(
-      "onPageChanged",
-      (uri, prop, value, guid) => {
-        return (
-          prop == Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON &&
-          uri.spec == srcUrl &&
-          value == SMALLPNG_DATA_URI.spec
-        );
-      },
-      "history"
+      "favicon-changed",
+      events =>
+        events.some(
+          e => e.url == srcUrl && e.faviconUrl == SMALLPNG_DATA_URI.spec
+        ),
+      "places"
     ),
     new Promise((resolve, reject) =>
       do_timeout(300, () => reject(new Error("timeout")))
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/gtest/places_test_harness.h firefox-85.0+build1/toolkit/components/places/tests/gtest/places_test_harness.h
--- firefox-84.0.2+build1/toolkit/components/places/tests/gtest/places_test_harness.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/gtest/places_test_harness.h	2021-01-18 19:58:26.000000000 +0000
@@ -13,8 +13,10 @@
 #include "nsServiceManagerUtils.h"
 #include "nsINavHistoryService.h"
 #include "nsIObserverService.h"
+#include "nsIThread.h"
 #include "nsIURI.h"
 #include "mozilla/IHistory.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozIStorageConnection.h"
 #include "mozIStorageStatement.h"
 #include "mozIStorageAsyncStatement.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/gtest/test_IHistory.cpp firefox-85.0+build1/toolkit/components/places/tests/gtest/test_IHistory.cpp
--- firefox-84.0.2+build1/toolkit/components/places/tests/gtest/test_IHistory.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/gtest/test_IHistory.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,8 +6,10 @@
 
 #include "places_test_harness.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "nsNetUtil.h"
 
@@ -265,105 +267,6 @@
   run_next_test();
 }
 
-namespace test_observer_topic_dispatched_helpers {
-#define URI_VISITED u"visited"
-#define URI_NOT_VISITED u"not visited"
-#define URI_VISITED_RESOLUTION_TOPIC "visited-status-resolution"
-class statusObserver final : public nsIObserver {
-  ~statusObserver() = default;
-
- public:
-  NS_DECL_ISUPPORTS
-
-  statusObserver(nsIURI* aURI, const bool aExpectVisit, bool& _notified)
-      : mURI(aURI), mExpectVisit(aExpectVisit), mNotified(_notified) {
-    nsCOMPtr<nsIObserverService> observerService =
-        do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-    do_check_true(observerService);
-    (void)observerService->AddObserver(this, URI_VISITED_RESOLUTION_TOPIC,
-                                       false);
-  }
-
-  NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
-                     const char16_t* aData) override {
-    // Make sure we got notified of the right topic.
-    do_check_false(strcmp(aTopic, URI_VISITED_RESOLUTION_TOPIC));
-
-    // If this isn't for our URI, do not do anything.
-    nsCOMPtr<nsIURI> notifiedURI = do_QueryInterface(aSubject);
-    do_check_true(notifiedURI);
-
-    bool isOurURI;
-    nsresult rv = notifiedURI->Equals(mURI, &isOurURI);
-    do_check_success(rv);
-    if (!isOurURI) {
-      return NS_OK;
-    }
-
-    // Check that we have either the visited or not visited string.
-    bool visited = !!nsLiteralString(URI_VISITED).Equals(aData);
-    bool notVisited = !!nsLiteralString(URI_NOT_VISITED).Equals(aData);
-    do_check_true(visited || notVisited);
-
-    // Check to make sure we got the state we expected.
-    do_check_eq(visited, mExpectVisit);
-
-    // Indicate that we've been notified.
-    mNotified = true;
-
-    // Remove ourselves as an observer.
-    nsCOMPtr<nsIObserverService> observerService =
-        do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-    (void)observerService->RemoveObserver(this, URI_VISITED_RESOLUTION_TOPIC);
-    return NS_OK;
-  }
-
- private:
-  nsCOMPtr<nsIURI> mURI;
-  const bool mExpectVisit;
-  bool& mNotified;
-};
-NS_IMPL_ISUPPORTS(statusObserver, nsIObserver)
-}  // namespace test_observer_topic_dispatched_helpers
-void test_observer_topic_dispatched() {
-  using namespace test_observer_topic_dispatched_helpers;
-
-  // Create two URIs, making sure only one is in history.
-  nsCOMPtr<nsIURI> visitedURI = new_test_uri();
-  nsCOMPtr<nsIURI> notVisitedURI = new_test_uri();
-  bool urisEqual;
-  nsresult rv = visitedURI->Equals(notVisitedURI, &urisEqual);
-  do_check_success(rv);
-  do_check_false(urisEqual);
-  addURI(visitedURI);
-
-  // Need two Link objects as well - one for each URI.
-  RefPtr<Link> visitedLink = new mock_Link(expect_visit, false);
-  RefPtr<Link> notVisitedLink = new mock_Link(expect_no_visit, false);
-  RefPtr<Link> visitedLinkCopy = visitedLink;
-
-  // Add the right observers for the URIs to check results.
-  bool visitedNotified = false;
-  nsCOMPtr<nsIObserver> visitedObs =
-      new statusObserver(visitedURI, true, visitedNotified);
-  bool notVisitedNotified = false;
-  nsCOMPtr<nsIObserver> unvisitedObs =
-      new statusObserver(notVisitedURI, false, notVisitedNotified);
-
-  // Register our Links to be notified.
-  nsCOMPtr<IHistory> history = do_get_IHistory();
-  history->RegisterVisitedCallback(visitedURI, visitedLink);
-  history->RegisterVisitedCallback(notVisitedURI, notVisitedLink);
-
-  // Spin the event loop as long as we have not been properly notified.
-  SpinEventLoopUntil([&]() { return visitedNotified && notVisitedNotified; });
-
-  // Unregister our observer that would not have been released.
-  history->UnregisterVisitedCallback(notVisitedURI, notVisitedLink);
-
-  run_next_test();
-}
-
 void test_visituri_inserts() {
   nsCOMPtr<IHistory> history = do_get_IHistory();
   nsCOMPtr<nsIURI> lastURI = new_test_uri();
@@ -547,7 +450,6 @@
     PTEST(test_unregistered_visited_does_not_notify),  // Order Important!
     PTEST(test_new_visit_notifies_waiting_Link),
     PTEST(test_RegisterVisitedCallback_returns_before_notifying),
-    PTEST(test_observer_topic_dispatched),
     PTEST(test_visituri_inserts),
     PTEST(test_visituri_updates),
     PTEST(test_visituri_preserves_shown_and_typed),
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/head_common.js firefox-85.0+build1/toolkit/components/places/tests/head_common.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/head_common.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/head_common.js	2021-01-18 19:58:27.000000000 +0000
@@ -724,7 +724,6 @@
   onEndUpdateBatch() {},
   onItemRemoved() {},
   onItemChanged() {},
-  onItemVisited() {},
   onItemMoved() {},
   QueryInterface: ChromeUtils.generateQI(["nsINavBookmarkObserver"]),
 };
@@ -741,7 +740,6 @@
   onTitleChanged() {},
   onDeleteURI() {},
   onClearHistory() {},
-  onPageChanged() {},
   onDeleteVisits() {},
   QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
 };
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeByFilter.js firefox-85.0+build1/toolkit/components/places/tests/history/test_removeByFilter.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeByFilter.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/history/test_removeByFilter.js	2021-01-18 19:58:27.000000000 +0000
@@ -455,9 +455,6 @@
       onClearHistory() {
         reject(new Error("Unexpected call to onClearHistory"));
       },
-      onPageChanged(aUri) {
-        reject(new Error("Unexpected call to onPageChanged"));
-      },
       onFrecencyChanged(aURI) {},
       onManyFrecenciesChanged() {},
       onDeleteURI(aURI) {
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/history/test_remove.js firefox-85.0+build1/toolkit/components/places/tests/history/test_remove.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/history/test_remove.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/history/test_remove.js	2021-01-18 19:58:26.000000000 +0000
@@ -50,9 +50,6 @@
         onClearHistory() {
           reject("Unexpected call to onClearHistory");
         },
-        onPageChanged(aUri) {
-          reject(new Error("Unexpected call to onPageChanged " + aUri.spec));
-        },
         onFrecencyChanged(aURI) {
           try {
             Assert.ok(!shouldRemove, "Observing onFrecencyChanged");
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeMany.js firefox-85.0+build1/toolkit/components/places/tests/history/test_removeMany.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeMany.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/history/test_removeMany.js	2021-01-18 19:58:27.000000000 +0000
@@ -90,9 +90,6 @@
     onClearHistory() {
       Assert.ok(false, "Unexpected call to onClearHistory");
     },
-    onPageChanged(aURI) {
-      Assert.ok(false, "Unexpected call to onPageChanged " + aURI.spec);
-    },
     onFrecencyChanged(aURI) {
       let origin = pages.find(x => x.uri.spec == aURI.spec);
       Assert.ok(origin);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeVisitsByFilter.js firefox-85.0+build1/toolkit/components/places/tests/history/test_removeVisitsByFilter.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/history/test_removeVisitsByFilter.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/history/test_removeVisitsByFilter.js	2021-01-18 19:58:26.000000000 +0000
@@ -156,11 +156,6 @@
       onClearHistory() {
         this.deferred.reject("Unexpected call to onClearHistory");
       },
-      onPageChanged(uri) {
-        this.deferred.reject(
-          new Error("Unexpected call to onPageChanged " + uri.spec)
-        );
-      },
       onFrecencyChanged(aURI) {
         info("onFrecencyChanged " + aURI.spec);
         let deferred = frecencyChangePromises.get(aURI.spec);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/legacy/test_bookmarks.js firefox-85.0+build1/toolkit/components/places/tests/legacy/test_bookmarks.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/legacy/test_bookmarks.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/legacy/test_bookmarks.js	2021-01-18 19:58:26.000000000 +0000
@@ -66,11 +66,6 @@
     this._itemChangedValue = value;
     this._itemChangedOldValue = oldValue;
   },
-  onItemVisited(id, visitID, time) {
-    this._itemVisitedId = id;
-    this._itemVisitedVistId = visitID;
-    this._itemVisitedTime = time;
-  },
   onItemMoved(id, oldParent, oldIndex, newParent, newIndex, itemType) {
     this._itemMovedId = id;
     this._itemMovedOldParent = oldParent;
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/maintenance/test_corrupt_places_schema.js firefox-85.0+build1/toolkit/components/places/tests/maintenance/test_corrupt_places_schema.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/maintenance/test_corrupt_places_schema.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/maintenance/test_corrupt_places_schema.js	2021-01-18 19:58:27.000000000 +0000
@@ -4,12 +4,12 @@
 // Tests that history initialization correctly handles a corrupt places schema.
 
 add_task(async function() {
-  let path = await setupPlacesDatabase("../migration/places_v38.sqlite");
+  let path = await setupPlacesDatabase("../migration/places_v43.sqlite");
 
   // Ensure the database will go through a migration that depends on moz_places
   // and break the schema by dropping that table.
   let db = await Sqlite.openConnection({ path });
-  await db.setSchemaVersion(38);
+  await db.setSchemaVersion(43);
   await db.execute("DROP TABLE moz_places");
   await db.close();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/maintenance/test_preventive_maintenance.js firefox-85.0+build1/toolkit/components/places/tests/maintenance/test_preventive_maintenance.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/maintenance/test_preventive_maintenance.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/maintenance/test_preventive_maintenance.js	2021-01-18 19:58:26.000000000 +0000
@@ -2839,3 +2839,20 @@
   Assert.equal(bs.getFolderIdForItem(gUnfiledFolderId), bs.placesRoot);
   Assert.equal(bs.getFolderIdForItem(bs.toolbarFolder), bs.placesRoot);
 });
+
+// ------------------------------------------------------------------------------
+
+add_task(async function test_idle_daily() {
+  const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+  const sandbox = sinon.createSandbox();
+  sandbox.stub(PlacesDBUtils, "maintenanceOnIdle");
+  Services.prefs.clearUserPref("places.database.lastMaintenance");
+  Cc["@mozilla.org/places/databaseUtilsIdleMaintenance;1"]
+    .getService(Ci.nsIObserver)
+    .observe(null, "idle-daily", "");
+  Assert.ok(
+    PlacesDBUtils.maintenanceOnIdle.calledOnce,
+    "maintenanceOnIdle was invoked"
+  );
+  sandbox.restore();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/head_migration.js firefox-85.0+build1/toolkit/components/places/tests/migration/head_migration.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/head_migration.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/head_migration.js	2021-01-18 19:58:26.000000000 +0000
@@ -16,7 +16,7 @@
 // Put any other stuff relative to this test folder below.
 
 const CURRENT_SCHEMA_VERSION = 54;
-const FIRST_UPGRADABLE_SCHEMA_VERSION = 35;
+const FIRST_UPGRADABLE_SCHEMA_VERSION = 43;
 
 async function assertAnnotationsRemoved(db, expectedAnnos) {
   for (let anno of expectedAnnos) {
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/places/tests/migration/places_v35.sqlite and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/places/tests/migration/places_v35.sqlite differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/places/tests/migration/places_v36.sqlite and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/places/tests/migration/places_v36.sqlite differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/places/tests/migration/places_v38.sqlite and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/places/tests/migration/places_v38.sqlite differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/places/tests/migration/places_v42.sqlite and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/places/tests/migration/places_v42.sqlite differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/places/tests/migration/places_v54.sqlite and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/places/tests/migration/places_v54.sqlite differ
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_downgraded.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_downgraded.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_downgraded.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_downgraded.js	2021-01-18 19:58:27.000000000 +0000
@@ -1,20 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+// This test ensures we can pass twice through migration methods without
+// failing, that is what happens in case of a downgrade followed by an upgrade.
+
 add_task(async function setup() {
-  // Find the latest available version, this allows to skip .sqlite files when
-  // the migration was trivial and uninsteresting to test.
-  let version = CURRENT_SCHEMA_VERSION;
-  while (version > 0) {
-    let dbFile = OS.Path.join(do_get_cwd().path, `places_v${version}.sqlite`);
-    if (await OS.File.exists(dbFile)) {
-      info("Using database version " + version);
-      break;
-    }
-    version--;
-  }
-  Assert.greater(version, 0, "Found a valid database version");
-  await setupPlacesDatabase(`places_v${version}.sqlite`);
+  let dbFile = OS.Path.join(
+    do_get_cwd().path,
+    `places_v${CURRENT_SCHEMA_VERSION}.sqlite`
+  );
+  Assert.ok(await OS.File.exists(dbFile));
+  await setupPlacesDatabase(`places_v${CURRENT_SCHEMA_VERSION}.sqlite`);
   // Downgrade the schema version to the first supported one.
   let path = OS.Path.join(OS.Constants.Path.profileDir, DB_FILENAME);
   let db = await Sqlite.openConnection({ path });
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v35.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v35.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v35.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v35.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-add_task(async function setup() {
-  await setupPlacesDatabase("places_v35.sqlite");
-});
-
-add_task(async function database_is_valid() {
-  // Accessing the database for the first time triggers migration.
-  Assert.equal(
-    PlacesUtils.history.databaseStatus,
-    PlacesUtils.history.DATABASE_STATUS_UPGRADED
-  );
-
-  let db = await PlacesUtils.promiseDBConnection();
-  Assert.equal(await db.getSchemaVersion(), CURRENT_SCHEMA_VERSION);
-});
-
-add_task(async function test_sync_fields() {
-  let db = await PlacesUtils.promiseDBConnection();
-  let syncFields = await db.executeCached(`
-    SELECT guid, syncChangeCounter, syncStatus
-    FROM moz_bookmarks`);
-  for (let row of syncFields) {
-    let syncStatus = row.getResultByName("syncStatus");
-    if (syncStatus !== Ci.nsINavBookmarksService.SYNC_STATUS_UNKNOWN) {
-      ok(
-        false,
-        `Wrong sync status for migrated item ${row.getResultByName("guid")}`
-      );
-    }
-    let syncChangeCounter = row.getResultByName("syncChangeCounter");
-    if (syncChangeCounter !== 1) {
-      ok(
-        false,
-        `Wrong change counter for migrated item ${row.getResultByName("guid")}`
-      );
-    }
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v36.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v36.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v36.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v36.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-const MAX_UNSIGNED_SHORT = 65535;
-
-var gTestcases = [];
-add_task(async function setup() {
-  // The database has been pre-populated, since we cannot generate the necessary
-  // hashes from a raw connection.
-  // To add further tests, the data must be copied over to this db from an
-  // existing one.
-  await setupPlacesDatabase("places_v36.sqlite");
-  // Fetch database contents to be migrated.
-  let path = OS.Path.join(OS.Constants.Path.profileDir, DB_FILENAME);
-  let db = await Sqlite.openConnection({ path });
-
-  let rows = await db.execute(`
-    SELECT h.url AS page_url, f.url AS favicon_url, mime_type, expiration, LENGTH(data) AS datalen
-    FROM moz_favicons f
-    LEFT JOIN moz_places h ON h.favicon_id = f.id`);
-  for (let row of rows) {
-    let info = {
-      icon_url: row.getResultByName("favicon_url"),
-      page_url: row.getResultByName("page_url"),
-      mime_type: row.getResultByName("mime_type"),
-      expiration: row.getResultByName("expiration"),
-      has_data:
-        row.getResultByName("mime_type") != "broken" &&
-        row.getResultByName("datalen") > 0,
-    };
-    gTestcases.push(info);
-  }
-  await db.close();
-});
-
-add_task(async function database_is_valid() {
-  Assert.equal(
-    PlacesUtils.history.databaseStatus,
-    PlacesUtils.history.DATABASE_STATUS_UPGRADED
-  );
-
-  let db = await PlacesUtils.promiseDBConnection();
-  Assert.equal(await db.getSchemaVersion(), CURRENT_SCHEMA_VERSION);
-});
-
-add_task(async function test_icons() {
-  let db = await PlacesUtils.promiseDBConnection();
-  await Assert.rejects(
-    db.execute(`SELECT url FROM moz_favicons`),
-    /no such table: moz_favicons/,
-    "The moz_favicons table should not exist"
-  );
-  for (let entry of gTestcases) {
-    info("");
-    info("Checking " + entry.icon_url + " - " + entry.page_url);
-    let rows = await db.execute(
-      `SELECT id, expire_ms, width FROM moz_icons
-                                 WHERE fixed_icon_url_hash = hash(fixup_url(:icon_url))
-                                   AND icon_url = :icon_url
-                                 `,
-      { icon_url: entry.icon_url }
-    );
-    Assert.equal(!!rows.length, entry.has_data, "icon exists");
-    if (!entry.has_data) {
-      // Icon not migrated.
-      continue;
-    }
-    Assert.equal(
-      rows[0].getResultByName("expire_ms"),
-      0,
-      "expiration is correct"
-    );
-
-    let width = rows[0].getResultByName("width");
-    if (entry.mime_type == "image/svg+xml") {
-      Assert.equal(width, MAX_UNSIGNED_SHORT, "width is correct");
-    } else {
-      Assert.ok(
-        width > 0 && (width < 16 || width % 16 == 0),
-        "width is correct"
-      );
-    }
-
-    let icon_id = rows[0].getResultByName("id");
-
-    rows = await db.execute(
-      `SELECT page_id FROM moz_icons_to_pages
-                             WHERE icon_id = :icon_id`,
-      { icon_id }
-    );
-    let has_relation = !!entry.page_url;
-    Assert.equal(!!rows.length, has_relation, "page relations found");
-    if (has_relation) {
-      let page_ids = rows.map(r => r.getResultByName("page_id"));
-
-      rows = await db.execute(`SELECT page_url FROM moz_pages_w_icons
-                               WHERE id IN(${page_ids.join(",")})`);
-      let urls = rows.map(r => r.getResultByName("page_url"));
-      Assert.ok(
-        urls.some(url => url == entry.page_url),
-        "page_url found"
-      );
-    }
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v38.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v38.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v38.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v38.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-add_task(async function setup() {
-  await setupPlacesDatabase("places_v38.sqlite");
-});
-
-add_task(async function database_is_valid() {
-  // Accessing the database for the first time triggers migration.
-  Assert.equal(
-    PlacesUtils.history.databaseStatus,
-    PlacesUtils.history.DATABASE_STATUS_UPGRADED
-  );
-
-  let db = await PlacesUtils.promiseDBConnection();
-  Assert.equal(await db.getSchemaVersion(), CURRENT_SCHEMA_VERSION);
-});
-
-add_task(async function test_select_new_fields() {
-  let db = await PlacesUtils.promiseDBConnection();
-  await db.execute(`SELECT description, preview_image_url FROM moz_places`);
-  Assert.ok(true, "should be able to select description and preview_image_url");
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v41.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v41.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v41.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v41.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-add_task(async function setup() {
-  // Since this migration doesn't affect places.sqlite, we can reuse v38.
-  await setupPlacesDatabase("places_v38.sqlite");
-  await setupPlacesDatabase("favicons_v41.sqlite", "favicons.sqlite");
-});
-
-add_task(async function database_is_valid() {
-  // Accessing the database for the first time triggers migration.
-  Assert.equal(
-    PlacesUtils.history.databaseStatus,
-    PlacesUtils.history.DATABASE_STATUS_UPGRADED
-  );
-
-  let db = await PlacesUtils.promiseDBConnection();
-  Assert.equal(await db.getSchemaVersion(), CURRENT_SCHEMA_VERSION);
-
-  let vacuum = (
-    await db.execute(`PRAGMA favicons.auto_vacuum`)
-  )[0].getResultByIndex(0);
-  Assert.equal(vacuum, 2, "Incremental vacuum is enabled");
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v42.js firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v42.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/test_current_from_v42.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/test_current_from_v42.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-add_task(async function setup() {
-  await setupPlacesDatabase("places_v42.sqlite");
-  let path = OS.Path.join(OS.Constants.Path.profileDir, DB_FILENAME);
-  let db = await Sqlite.openConnection({ path });
-  // Remove pre-existing keywords to avoid conflicts.
-  await db.execute(`DELETE FROM moz_keywords`);
-  await db.execute(`
-    INSERT INTO moz_keywords (id, keyword, place_id, post_data)
-    VALUES (1, "keyword1", 1, NULL),
-           (2, "keyword2", 1, NULL),
-           (3, "keyword3", 1, "post3"),
-           (4, "keyword4", 2, NULL),
-           (5, "keyword5", 3, "post5"),
-           (6, "keyword6", 3, "post6")
-  `);
-  await db.close();
-});
-
-add_task(async function database_is_valid() {
-  // Accessing the database for the first time triggers migration.
-  Assert.equal(
-    PlacesUtils.history.databaseStatus,
-    PlacesUtils.history.DATABASE_STATUS_UPGRADED
-  );
-
-  let db = await PlacesUtils.promiseDBConnection();
-  Assert.equal(await db.getSchemaVersion(), CURRENT_SCHEMA_VERSION);
-});
-
-add_task(async function check_keywords() {
-  let db = await PlacesUtils.promiseDBConnection();
-  let rows = await db.execute(`
-    SELECT k.id, keyword, post_data, foreign_count
-    FROM moz_keywords k
-    JOIN moz_places h ON k.place_id = h.id
-    ORDER BY k.id ASC
-  `);
-  let entries = rows.map(r => ({
-    id: r.getResultByName("id"),
-    keyword: r.getResultByName("keyword"),
-    post_data: r.getResultByName("post_data"),
-    foreign_count: r.getResultByName("foreign_count"),
-  }));
-
-  // Useful for debugging purposes.
-  info(JSON.stringify(entries));
-  Assert.deepEqual(entries, [
-    {
-      id: 2,
-      keyword: "keyword2",
-      post_data: "",
-      foreign_count: 3, // 1 bookmark, 2 keywords
-    },
-    {
-      id: 3,
-      keyword: "keyword3",
-      post_data: "post3",
-      foreign_count: 3, // 1 bookmark, 2 keywords
-    },
-    {
-      id: 4,
-      keyword: "keyword4",
-      post_data: "",
-      foreign_count: 2, // 1 bookmark, 1 keywords
-    },
-    {
-      id: 5,
-      keyword: "keyword5",
-      post_data: "post5",
-      foreign_count: 3, // 1 bookmark, 2 keywords
-    },
-    {
-      id: 6,
-      keyword: "keyword6",
-      post_data: "post6",
-      foreign_count: 3, // 1 bookmark, 2 keywords
-    },
-  ]);
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/migration/xpcshell.ini firefox-85.0+build1/toolkit/components/places/tests/migration/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/places/tests/migration/xpcshell.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/migration/xpcshell.ini	2021-01-18 19:58:26.000000000 +0000
@@ -4,19 +4,11 @@
 support-files =
   favicons_v41.sqlite
   places_outdated.sqlite
-  places_v35.sqlite
-  places_v36.sqlite
-  places_v38.sqlite
-  places_v42.sqlite
   places_v43.sqlite
+  places_v54.sqlite
 
 [test_current_from_downgraded.js]
 [test_current_from_outdated.js]
-[test_current_from_v35.js]
-[test_current_from_v36.js]
-[test_current_from_v38.js]
-[test_current_from_v41.js]
-[test_current_from_v42.js]
 [test_current_from_v43.js]
 [test_current_from_v45.js]
 [test_current_from_v46.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/queries/test_result_observeHistoryDetails.js firefox-85.0+build1/toolkit/components/places/tests/queries/test_result_observeHistoryDetails.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/queries/test_result_observeHistoryDetails.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/queries/test_result_observeHistoryDetails.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,152 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// This test ensures that observeHistoryDetails works as expected.
+
+function accumulateNotifications(result, observeHistoryDetails = true) {
+  let notifications = [];
+  let resultObserver = new Proxy(NavHistoryResultObserver, {
+    get(target, name) {
+      if (name == "check") {
+        result.removeObserver(resultObserver, false);
+        return expectedNotifications =>
+          Assert.deepEqual(notifications, expectedNotifications);
+      }
+      if (name == "observeHistoryDetails") {
+        return observeHistoryDetails;
+      }
+      // ignore a few uninteresting notifications.
+      if (["QueryInterface", "containerStateChanged"].includes(name)) {
+        return () => {};
+      }
+      return () => {
+        notifications.push(name);
+      };
+    },
+  });
+  result.addObserver(resultObserver, false);
+  return resultObserver;
+}
+
+add_task(async function test_history_query_observe() {
+  let query = PlacesUtils.history.getNewQuery();
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let result = PlacesUtils.history.executeQuery(query, options);
+  let notifications = accumulateNotifications(result);
+  let root = PlacesUtils.asContainer(result.root);
+  root.containerOpen = true;
+
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla.org",
+    title: "test",
+  });
+  notifications.check([
+    "nodeHistoryDetailsChanged",
+    "nodeInserted",
+    "nodeTitleChanged",
+  ]);
+
+  root.containerOpen = false;
+  await PlacesUtils.history.clear();
+});
+
+add_task(async function test_history_query_no_observe() {
+  let query = PlacesUtils.history.getNewQuery();
+  let options = PlacesUtils.history.getNewQueryOptions();
+  let result = PlacesUtils.history.executeQuery(query, options);
+  // Even if we opt-out of notifications, this is an history query, thus the
+  // setting is pretty much ignored.
+  let notifications = accumulateNotifications(result, false);
+  let root = PlacesUtils.asContainer(result.root);
+  root.containerOpen = true;
+
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla.org",
+    title: "test",
+  });
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla2.org",
+    title: "test",
+  });
+
+  notifications.check([
+    "nodeHistoryDetailsChanged",
+    "nodeInserted",
+    "nodeTitleChanged",
+    "nodeHistoryDetailsChanged",
+    "nodeInserted",
+    "nodeTitleChanged",
+  ]);
+
+  root.containerOpen = false;
+  await PlacesUtils.history.clear();
+});
+
+add_task(async function test_bookmarks_query_observe() {
+  let query = PlacesUtils.history.getNewQuery();
+  query.setParents([PlacesUtils.bookmarks.toolbarGuid]);
+  let options = PlacesUtils.history.getNewQueryOptions();
+  options.queryType = options.QUERY_TYPE_BOOKMARKS;
+  let result = PlacesUtils.history.executeQuery(query, options);
+  let notifications = accumulateNotifications(result);
+  let root = PlacesUtils.asContainer(result.root);
+  root.containerOpen = true;
+
+  await PlacesUtils.bookmarks.insert({
+    url: "http://mozilla.org",
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    title: "test",
+  });
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla.org",
+    title: "title",
+  });
+
+  notifications.check([
+    "nodeHistoryDetailsChanged",
+    "nodeInserted",
+    "nodeHistoryDetailsChanged",
+  ]);
+
+  root.containerOpen = false;
+  await PlacesUtils.history.clear();
+  await PlacesUtils.bookmarks.eraseEverything();
+});
+
+add_task(async function test_bookmarks_query_no_observe() {
+  let query = PlacesUtils.history.getNewQuery();
+  query.setParents([PlacesUtils.bookmarks.toolbarGuid]);
+  let options = PlacesUtils.history.getNewQueryOptions();
+  options.queryType = options.QUERY_TYPE_BOOKMARKS;
+  let result = PlacesUtils.history.executeQuery(query, options);
+  let notifications = accumulateNotifications(result, false);
+  let root = PlacesUtils.asContainer(result.root);
+  root.containerOpen = true;
+
+  await PlacesUtils.bookmarks.insert({
+    url: "http://mozilla.org",
+    parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+    title: "test",
+  });
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla.org",
+    title: "title",
+  });
+
+  notifications.check(["nodeInserted"]);
+
+  info("Change the sorting mode to one that is based on history");
+  notifications = accumulateNotifications(result, false);
+  result.sortingMode = options.SORT_BY_VISITCOUNT_DESCENDING;
+  notifications.check(["invalidateContainer"]);
+
+  notifications = accumulateNotifications(result, false);
+  await PlacesTestUtils.addVisits({
+    uri: "http://mozilla.org",
+    title: "title",
+  });
+  notifications.check(["nodeHistoryDetailsChanged"]);
+
+  root.containerOpen = false;
+  await PlacesUtils.bookmarks.eraseEverything();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/queries/xpcshell.ini firefox-85.0+build1/toolkit/components/places/tests/queries/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/places/tests/queries/xpcshell.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/queries/xpcshell.ini	2021-01-18 19:58:26.000000000 +0000
@@ -18,6 +18,7 @@
 [test_queryMultipleFolder.js]
 [test_querySerialization.js]
 [test_redirects.js]
+[test_result_observeHistoryDetails.js]
 [test_results-as-left-pane.js]
 [test_results-as-roots.js]
 [test_results-as-tag-query.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/sync/head_sync.js firefox-85.0+build1/toolkit/components/places/tests/sync/head_sync.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/sync/head_sync.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/sync/head_sync.js	2021-01-18 19:58:26.000000000 +0000
@@ -379,7 +379,6 @@
     }
     this.notifications.push({ name: "onItemChanged", params });
   },
-  onItemVisited() {},
   onItemMoved(
     itemId,
     oldParentId,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_async_transactions.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_async_transactions.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_async_transactions.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_async_transactions.js	2021-01-18 19:58:26.000000000 +0000
@@ -101,8 +101,6 @@
     changesForGuid.set(aProperty, change);
   },
 
-  onItemVisited: () => {},
-
   onItemMoved(
     aItemId,
     aOldParent,
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_history_observer.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_history_observer.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_history_observer.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_history_observer.js	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,6 @@
   onTitleChanged() {},
   onDeleteURI() {},
   onClearHistory() {},
-  onPageChanged() {},
   onDeleteVisits() {},
   QueryInterface: ChromeUtils.generateQI(["nsINavHistoryObserver"]),
 };
@@ -206,32 +205,3 @@
   });
   await promiseNotify;
 });
-
-add_task(async function test_onPageChanged() {
-  let promiseNotify = onNotify(function onPageChanged(
-    aURI,
-    aChangedAttribute,
-    aNewValue,
-    aGUID
-  ) {
-    Assert.equal(aChangedAttribute, Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON);
-    Assert.ok(aURI.equals(testuri));
-    Assert.equal(aNewValue, SMALLPNG_DATA_URI.spec);
-    do_check_guid_for_uri(aURI, aGUID);
-  });
-
-  let [testuri] = await task_add_visit();
-
-  // The new favicon for the page must have data associated with it in order to
-  // receive the onPageChanged notification.  To keep this test self-contained,
-  // we use an URI representing the smallest possible PNG file.
-  PlacesUtils.favicons.setAndFetchFaviconForPage(
-    testuri,
-    SMALLPNG_DATA_URI,
-    false,
-    PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
-    null,
-    Services.scriptSecurityManager.getSystemPrincipal()
-  );
-  await promiseNotify;
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_null_interfaces.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_null_interfaces.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_null_interfaces.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_null_interfaces.js	2021-01-18 19:58:26.000000000 +0000
@@ -21,14 +21,8 @@
   ],
   [
     "browser/nav-bookmarks-service;1",
-    ["nsINavBookmarksService", "nsINavHistoryObserver"],
-    [
-      "createFolder",
-      "getObservers",
-      "onFrecencyChanged",
-      "onTitleChanged",
-      "onDeleteURI",
-    ],
+    ["nsINavBookmarksService"],
+    ["createFolder", "getObservers"],
   ],
   ["browser/favicon-service;1", ["nsIFaviconService"], []],
   ["browser/tagging-service;1", ["nsITaggingService"], []],
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_onItemChanged_tags.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_onItemChanged_tags.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_onItemChanged_tags.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_onItemChanged_tags.js	2021-01-18 19:58:26.000000000 +0000
@@ -54,7 +54,6 @@
 
     onBeginUpdateBatch() {},
     onEndUpdateBatch() {},
-    onItemVisited() {},
     onItemMoved() {},
   };
   PlacesUtils.bookmarks.addObserver(bookmarksObserver);
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_result_sort.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_result_sort.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_result_sort.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_result_sort.js	2021-01-18 19:58:27.000000000 +0000
@@ -6,23 +6,6 @@
 
 const NHQO = Ci.nsINavHistoryQueryOptions;
 
-/**
- * Waits for onItemVisited notifications to be received.
- */
-function promiseOnItemVisited() {
-  return new Promise(resolve => {
-    let bookmarksObserver = {
-      __proto__: NavBookmarkObserver.prototype,
-      onItemVisited: function BO_onItemVisited() {
-        PlacesUtils.bookmarks.removeObserver(this);
-        // Enqueue to be sure that all onItemVisited notifications ran.
-        executeSoon(resolve);
-      },
-    };
-    PlacesUtils.bookmarks.addObserver(bookmarksObserver);
-  });
-}
-
 add_task(async function test() {
   const uri1 = "http://foo.tld/a";
   const uri2 = "http://foo.tld/b";
@@ -108,12 +91,7 @@
 
   // Add a visit, then check frecency ordering.
 
-  // When the bookmarks service gets onVisit, it asynchronously fetches all
-  // items for that visit, and then notifies onItemVisited.  Thus we must
-  // explicitly wait for that.
-  let waitForVisited = promiseOnItemVisited();
   await PlacesTestUtils.addVisits({ uri: uri2, transition: TRANSITION_TYPED });
-  await waitForVisited;
 
   info("Sort by frecency desc");
   result.sortingMode = NHQO.SORT_BY_FRECENCY_DESCENDING;
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_telemetry.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_telemetry.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_telemetry.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_telemetry.js	2021-01-18 19:58:26.000000000 +0000
@@ -99,10 +99,7 @@
     annotations: new Map([["test-anno", content]]),
   });
 
-  // Request to gather Places telemetry data.
-  Cc["@mozilla.org/places/categoriesStarter;1"]
-    .getService(Ci.nsIObserver)
-    .observe(null, "gather-places-telemetry", null);
+  await PlacesDBUtils.telemetry();
 
   await PlacesTestUtils.promiseAsyncUpdates();
 
diff -Nru firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_utils_backups_create.js firefox-85.0+build1/toolkit/components/places/tests/unit/test_utils_backups_create.js
--- firefox-84.0.2+build1/toolkit/components/places/tests/unit/test_utils_backups_create.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/places/tests/unit/test_utils_backups_create.js	2021-01-18 19:58:27.000000000 +0000
@@ -116,11 +116,11 @@
 
   Services.prefs.setIntPref("browser.bookmarks.max_backups", 0);
 
-  let filePath = do_get_tempdir().path + "/backup.json";
+  let filePath = PathUtils.join(do_get_tempdir().path, "backup.json");
   await PlacesBackups.saveBookmarksToJSONFile(filePath);
   let files = bookmarksBackupDir.directoryEntries;
   Assert.ok(!files.hasMoreElements(), "Should have no backup files.");
-  await OS.File.remove(filePath);
+  await IOUtils.remove(filePath);
   // We don't need to call cleanupFiles as we are not creating any
   // backups but need to reset the cache.
   delete PlacesBackups._backupFiles;
@@ -132,7 +132,7 @@
 
   Services.prefs.setIntPref("browser.bookmarks.max_backups", NUMBER_OF_BACKUPS);
 
-  let filePath = do_get_tempdir().path + "/backup.json";
+  let filePath = PathUtils.join(do_get_tempdir().path, "backup.json");
   let dateObj = new Date();
   let dates = await createBackups(
     NUMBER_OF_BACKUPS,
@@ -141,8 +141,12 @@
   );
 
   await PlacesBackups.saveBookmarksToJSONFile(filePath);
+
+  let backupPath = await PlacesBackups.getMostRecentBackup();
+  Assert.ok(await IOUtils.read(backupPath, { decompress: true }));
+
   dates.push(dateObj.getTime());
   await checkBackups(dates, bookmarksBackupDir);
-  await OS.File.remove(filePath);
+  await IOUtils.remove(filePath);
   await cleanupFiles(bookmarksBackupDir);
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/print.css firefox-85.0+build1/toolkit/components/printing/content/print.css
--- firefox-84.0.2+build1/toolkit/components/printing/content/print.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/print.css	2021-01-18 19:58:26.000000000 +0000
@@ -123,10 +123,6 @@
   margin-inline-end: 8px;
 }
 
-input[type="checkbox"]:checked {
-  fill: #3485ff !important;
-}
-
 input[type="radio"] {
   appearance: none;
   width: 20px;
@@ -250,25 +246,8 @@
   margin: 0;
 }
 
-.range-group-input {
-  width: 3em;
-  height: max-content;
-  appearance: textfield !important;
-  margin-inline: 5px;
-}
-
-.range-part-label {
-  height: max-content;
-  margin-top: 8px;
-}
-
-.range-group {
-  align-items: center;
-  display: inline-flex;
-}
-
-#range-picker {
-  margin-bottom: 8px;
+#custom-range {
+  margin-top: 4px;
 }
 
 .vertical-margins,
@@ -288,11 +267,6 @@
   margin-top: 2px;
 }
 
-input[type="number"]:invalid {
-  border: 1px solid #D70022;
-  box-shadow: 0 0 0 1px #D70022, 0 0 0 4px rgba(215, 0, 34, 0.3);
-}
-
 .toggle-group #landscape + .toggle-group-label::before {
   content: url("chrome://global/content/landscape.svg");
 }
@@ -301,6 +275,7 @@
 }
 
 select:invalid,
+input[type="text"]:invalid,
 input[type="number"]:invalid {
   border: 1px solid #D70022;
   box-shadow: 0 0 0 1px #D70022, 0 0 0 4px rgba(215, 0, 34, 0.3);
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/print.html firefox-85.0+build1/toolkit/components/printing/content/print.html
--- firefox-84.0.2+build1/toolkit/components/printing/content/print.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/print.html	2021-01-18 19:58:26.000000000 +0000
@@ -22,19 +22,7 @@
         <option value="all" selected data-l10n-id="printui-page-range-all"></option>
         <option value="custom" data-l10n-id="printui-page-range-custom"></option>
       </select>
-      <div class="range-group" hidden>
-        <label data-l10n-id="printui-range-start" class="range-group-separator" for="custom-range-start"></label>
-        <!-- Note that here and elsewhere, we're setting aria-errormessage
-             attributes to a list of all possible errors. The a11y APIs will
-             filter this down to visible items only. -->
-        <input id="custom-range-start" type="number"
-               aria-errormessage="error-invalid-range error-invalid-start-range-overflow"
-               min="1" step="1" class="range-group-input" disabled>
-        <label data-l10n-id="printui-range-end" class="range-group-separator" for="custom-range-end"></label>
-        <input id="custom-range-end" type="number"
-               aria-errormessage="error-invalid-range error-invalid-start-range-overflow"
-               min="1" step="1" class="range-group-input" disabled>
-      </div>
+      <input id="custom-range" type="text" disabled hidden data-l10n-id="printui-page-custom-range-input" aria-errormessage="error-invalid-range error-invalid-start-range-overflow">
       <p id="error-invalid-range" hidden data-l10n-id="printui-error-invalid-range" class="error-message" role="alert" data-l10n-args='{ "numPages": 1 }'></p>
       <p id="error-invalid-start-range-overflow" hidden data-l10n-id="printui-error-invalid-start-overflow" class="error-message" role="alert"></p>
     </template>
@@ -77,31 +65,48 @@
     </template>
 
     <template id="margins-template">
+      <label for="margins-picker" class="block-label" data-l10n-id="printui-margins"></label>
       <select is="margins-select" id="margins-picker" name="margin-type" class="row" data-setting-name="margins">
         <option value="default" data-l10n-id="printui-margins-default"></option>
         <option value="minimum" data-l10n-id="printui-margins-min"></option>
         <option value="none" data-l10n-id="printui-margins-none"></option>
-        <option value="custom" data-l10n-id="printui-margins-custom"></option>
+        <option value="custom" data-l10n-id="printui-margins-custom-inches"></option>
       </select>
-      <div id="custom-margins" class="margin-group" hidden>
+      <div id="custom-margins" class="margin-group" role="group" hidden>
         <div class="vertical-margins">
           <div class="margin-pair">
-            <input id="custom-margin-top" type="number" class="margin-input photon-number" min="0" step="0.01" autocomplete="off" required>
+            <input type="number"
+                   id="custom-margin-top" class="margin-input photon-number"
+                   aria-describedby="margins-custom-margin-top-desc"
+                   min="0" step="0.01" autocomplete="off" required>
             <label for="custom-margin-top" class="margin-descriptor" data-l10n-id="printui-margins-custom-top"></label>
+            <label hidden id="margins-custom-margin-top-desc" data-l10n-id="printui-margins-custom-top-inches"></label>
           </div>
           <div class="margin-pair">
-            <input id="custom-margin-bottom" type="number" class="margin-input photon-number" min="0" step="0.01" autocomplete="off" required>
+            <input type="number"
+                   id="custom-margin-bottom" class="margin-input photon-number"
+                   aria-describedby="margins-custom-margin-bottom-desc"
+                   min="0" step="0.01" autocomplete="off" required>
             <label for="custom-margin-bottom" class="margin-descriptor" data-l10n-id="printui-margins-custom-bottom"></label>
+            <label hidden id="margins-custom-margin-bottom-desc" data-l10n-id="printui-margins-custom-bottom-inches"></label>
           </div>
         </div>
         <div class="horizontal-margins">
           <div class="margin-pair">
-            <input id="custom-margin-left" type="number" class="margin-input photon-number" min="0" step="0.01" autocomplete="off" required>
+            <input type="number"
+                   id="custom-margin-left" class="margin-input photon-number"
+                   aria-describedby="margins-custom-margin-left-desc"
+                   min="0" step="0.01" autocomplete="off" required>
             <label for="custom-margin-left" class="margin-descriptor" data-l10n-id="printui-margins-custom-left"></label>
+            <label hidden id="margins-custom-margin-left-desc" data-l10n-id="printui-margins-custom-left-inches"></label>
           </div>
           <div class="margin-pair">
-            <input id="custom-margin-right" type="number" class="margin-input photon-number" min="0" step="0.01" autocomplete="off" required>
+            <input type="number"
+                   id="custom-margin-right" class="margin-input photon-number"
+                   aria-describedby="margins-custom-margin-right-desc"
+                   min="0" step="0.01" autocomplete="off" required>
             <label for="custom-margin-right" class="margin-descriptor" data-l10n-id="printui-margins-custom-right"></label>
+            <label hidden id="margins-custom-margin-right-desc" data-l10n-id="printui-margins-custom-right-inches"></label>
           </div>
         </div>
         <p id="error-invalid-margin" hidden data-l10n-id="printui-error-invalid-margin" class="error-message" role="alert"></p>
@@ -163,8 +168,17 @@
               <scale-input></scale-input>
             </section>
 
+            <section id="pages-per-sheet" class="section-block" hidden>
+              <label id="pages-per-sheet-label" for="pages-per-sheet-picker" class="block-label" data-l10n-id="printui-pages-per-sheet"></label>
+              <select is="setting-select" id="pages-per-sheet-picker" class="row" data-setting-name="numPagesPerSheet">
+                <option value="1">1</option>
+                <option value="4">4</option>
+                <option value="9">9</option>
+                <option value="16">16</option>
+              </select>
+            </section>
+
             <section id="margins" class="section-block">
-              <label for="margins-select" class="block-label" data-l10n-id="printui-margins"></label>
               <div id="margins-select" is="margins-select" class="margins-select row"></div>
             </section>
 
@@ -178,11 +192,11 @@
 
             <section id="more-settings-options" class="section-block">
               <label class="block-label" data-l10n-id="printui-options"></label>
-              <div class="row cols-2">
+              <div id="headers-footers" class="row cols-2">
                 <input is="setting-checkbox" type="checkbox" id="headers-footers-enabled" data-setting-name="printFootersHeaders">
                 <label for="headers-footers-enabled" data-l10n-id="printui-headers-footers-checkbox"></label>
               </div>
-              <div class="row cols-2">
+              <div id="backgrounds" class="row cols-2">
                 <input is="setting-checkbox" type="checkbox" id="backgrounds-enabled" data-setting-name="printBackgrounds">
                 <label for="backgrounds-enabled" data-l10n-id="printui-backgrounds-checkbox"></label>
               </div>
@@ -199,7 +213,7 @@
       <footer class="footer-container" id="print-footer" role="none">
         <section id="button-container" class="section-block">
           <button id="print-button" class="primary" showfocus name="print" data-l10n-id="printui-primary-button" is="print-button" type="submit"></button>
-          <button name="cancel" data-l10n-id="printui-cancel-button" type="button" is="cancel-button"></button>
+          <button id="cancel-button" name="cancel" data-l10n-id="printui-cancel-button" data-close-l10n-id="printui-close-button" data-cancel-l10n-id="printui-cancel-button" type="button" is="cancel-button"></button>
         </section>
       </footer>
     </form>
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/print.js firefox-85.0+build1/toolkit/components/printing/content/print.js
--- firefox-84.0.2+build1/toolkit/components/printing/content/print.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/print.js	2021-01-18 19:58:26.000000000 +0000
@@ -20,7 +20,8 @@
   "resource://gre/modules/DeferredTask.jsm"
 );
 
-const INPUT_DELAY_MS = 500;
+const PDF_JS_URI = "resource://pdf.js/web/viewer.html";
+const INPUT_DELAY_MS = Cu.isInAutomation ? 100 : 500;
 const MM_PER_POINT = 25.4 / 72;
 const INCHES_PER_POINT = 1 / 72;
 const ourBrowser = window.docShell.chromeEventHandler;
@@ -84,12 +85,6 @@
   deferredTasks = [];
 }
 
-async function finalizeDeferredTasks() {
-  await Promise.all(deferredTasks.map(task => task.finalize()));
-  printPending = true;
-  await PrintEventHandler._updatePrintPreviewTask.finalize();
-}
-
 document.addEventListener(
   "DOMContentLoaded",
   e => {
@@ -118,7 +113,8 @@
   settings: null,
   defaultSettings: null,
   allPaperSizes: {},
-  _nonFlaggedChangedSettings: {},
+  previewIsEmpty: false,
+  _delayedChanges: {},
   _userChangedSettings: {},
   settingFlags: {
     margins: Ci.nsIPrintSettings.kInitSaveMargins,
@@ -148,7 +144,8 @@
 
   // These settings do not have an associated pref value or flag, but
   // changing them requires us to update the print preview.
-  _nonFlaggedUpdatePreviewSettings: new Set(["pageRanges"]),
+  _nonFlaggedUpdatePreviewSettings: new Set(["pageRanges", "numPagesPerSheet"]),
+  _noPreviewUpdateSettings: new Set(["numCopies", "printDuplex"]),
 
   async init() {
     Services.telemetry.scalarAdd("printing.preview_opened_tm", 1);
@@ -175,12 +172,19 @@
       existingBrowser.remove();
     }
 
+    let sourcePrincipal =
+      sourceBrowsingContext.currentWindowGlobal.documentPrincipal;
+    let sourceIsPdf =
+      !sourcePrincipal.isNullPrincipal && sourcePrincipal.spec == PDF_JS_URI;
     this.originalSourceContentTitle =
       sourceBrowsingContext.currentWindowContext.documentTitle;
     this.originalSourceCurrentURI =
       sourceBrowsingContext.currentWindowContext.documentURI.spec;
 
     this.printForm = document.getElementById("print");
+    if (sourceIsPdf) {
+      this.printForm.removeNonPdfSettings();
+    }
 
     // Let the dialog appear before doing any potential main thread work.
     await ourBrowser._dialogReady;
@@ -212,15 +216,33 @@
     logger.debug("defaultSystemPrinter: ", defaultSystemPrinter);
 
     document.addEventListener("print", async () => {
+      let cancelButton = document.getElementById("cancel-button");
+      document.l10n.setAttributes(
+        cancelButton,
+        cancelButton.dataset.closeL10nId
+      );
       let didPrint = await this.print();
       if (!didPrint) {
-        // Re-enable elements of the form if the user cancels saving
+        // Re-enable elements of the form if the user cancels saving or
+        // if a deferred task rendered the page invalid.
         this.printForm.enable();
       }
+      // Reset the cancel button regardless of the outcome.
+      document.l10n.setAttributes(
+        cancelButton,
+        cancelButton.dataset.cancelL10nId
+      );
+    });
+    this._createDelayedSettingsChangeTask();
+    document.addEventListener("update-print-settings", e => {
+      this.handleSettingsChange(e.detail);
+    });
+    document.addEventListener("cancel-print-settings", e => {
+      this._delayedSettingsChangeTask.disarm();
+      for (let setting of Object.keys(e.detail)) {
+        delete this._delayedChanges[setting];
+      }
     });
-    document.addEventListener("update-print-settings", e =>
-      this.onUserSettingsChange(e.detail)
-    );
     document.addEventListener("cancel-print", () => this.cancelPrint());
     document.addEventListener("open-system-dialog", async () => {
       // This file in only used if pref print.always_print_silent is false, so
@@ -281,11 +303,7 @@
 
     // Use a DeferredTask for updating the preview. This will ensure that we
     // only have one update running at a time.
-    this._updatePrintPreviewTask = new DeferredTask(async () => {
-      await initialPreviewDone;
-      await this._updatePrintPreview();
-      document.dispatchEvent(new CustomEvent("preview-updated"));
-    }, 0);
+    this._createUpdatePrintPreviewTask(initialPreviewDone);
 
     document.dispatchEvent(
       new CustomEvent("available-destinations", {
@@ -321,6 +339,24 @@
     // Disable the form when a print is in progress
     this.printForm.disable();
 
+    if (Object.keys(this._delayedChanges).length) {
+      // Make sure any pending changes get saved.
+      let task = this._delayedSettingsChangeTask;
+      this._createDelayedSettingsChangeTask();
+      await task.finalize();
+    }
+
+    if (this.settings.pageRanges.length) {
+      // Finish any running previews to verify the range is still valid.
+      let task = this._updatePrintPreviewTask;
+      this._createUpdatePrintPreviewTask();
+      await task.finalize();
+    }
+
+    if (!this.printForm.checkValidity() || this.previewIsEmpty) {
+      return false;
+    }
+
     let settings = systemDialogSettings || this.settings;
 
     if (settings.printerName == PrintUtils.SAVE_TO_PDF_PRINTER) {
@@ -336,8 +372,6 @@
 
     await window._initialized;
 
-    await finalizeDeferredTasks();
-
     // This seems like it should be handled automatically but it isn't.
     Services.prefs.setStringPref("print_printer", settings.printerName);
 
@@ -361,6 +395,7 @@
   },
 
   async refreshSettings(printerName) {
+    this.currentPrinterName = printerName;
     let currentPrinter;
     try {
       currentPrinter = await PrintSettingsViewProxy.resolvePropertiesForPrinter(
@@ -370,6 +405,12 @@
       this.reportPrintingError("PRINTER_PROPERTIES");
       throw e;
     }
+    if (this.currentPrinterName != printerName) {
+      // Refresh settings could take a while, if the destination has changed
+      // then we don't want to update the settings after all.
+      return {};
+    }
+
     this.settings = currentPrinter.settings;
     this.defaultSettings = currentPrinter.defaultSettings;
 
@@ -455,7 +496,60 @@
     return settingsToUpdate;
   },
 
+  _createDelayedSettingsChangeTask() {
+    this._delayedSettingsChangeTask = createDeferredTask(async () => {
+      if (Object.keys(this._delayedChanges).length) {
+        let changes = this._delayedChanges;
+        this._delayedChanges = {};
+        await this.onUserSettingsChange(changes);
+      }
+    }, INPUT_DELAY_MS);
+  },
+
+  _createUpdatePrintPreviewTask(initialPreviewDone = null) {
+    this._updatePrintPreviewTask = new DeferredTask(async () => {
+      await initialPreviewDone;
+      await this._updatePrintPreview();
+      document.dispatchEvent(new CustomEvent("preview-updated"));
+    }, 0);
+  },
+
+  _scheduleDelayedSettingsChange(changes) {
+    Object.assign(this._delayedChanges, changes);
+    this._delayedSettingsChangeTask.disarm();
+    this._delayedSettingsChangeTask.arm();
+  },
+
+  handleSettingsChange(changedSettings = {}) {
+    let delayedChanges = {};
+    let instantChanges = {};
+    for (let [setting, value] of Object.entries(changedSettings)) {
+      switch (setting) {
+        case "pageRanges":
+        case "scaling":
+          delayedChanges[setting] = value;
+          break;
+        case "customMargins":
+          delete this._delayedChanges.margins;
+          changedSettings.margins == "custom"
+            ? (delayedChanges[setting] = value)
+            : (instantChanges[setting] = value);
+          break;
+        default:
+          instantChanges[setting] = value;
+          break;
+      }
+    }
+    if (Object.keys(delayedChanges).length) {
+      this._scheduleDelayedSettingsChange(delayedChanges);
+    }
+    if (Object.keys(instantChanges).length) {
+      this.onUserSettingsChange(instantChanges);
+    }
+  },
+
   async onUserSettingsChange(changedSettings = {}) {
+    let previewableChange = false;
     for (let [setting, value] of Object.entries(changedSettings)) {
       Services.telemetry.keyedScalarAdd(
         "printing.settings_changed",
@@ -465,23 +559,36 @@
       // Update the list of user-changed settings, which we attempt to maintain
       // across printer changes.
       this._userChangedSettings[setting] = value;
+      if (!this._noPreviewUpdateSettings.has(setting)) {
+        previewableChange = true;
+      }
     }
     if (changedSettings.printerName) {
       logger.debug(
         "onUserSettingsChange, changing to printerName:",
         changedSettings.printerName
       );
+      this.printForm.printerChanging = true;
+      this.printForm.disable(el => el.id != "printer-picker");
+      let { printerName } = changedSettings;
       // Treat a printerName change separately, because it involves a settings
       // object switch and we don't want to set the new name on the old settings.
-      changedSettings = await this.refreshSettings(changedSettings.printerName);
+      changedSettings = await this.refreshSettings(printerName);
+      if (printerName != this.currentPrinterName) {
+        // Don't continue this update if the printer changed again.
+        return;
+      }
+      this.printForm.printerChanging = false;
+      this.printForm.enable();
     } else {
       changedSettings = this.getSettingsToUpdate();
     }
 
-    let shouldPreviewUpdate = await this.updateSettings(
-      changedSettings,
-      !!changedSettings.printerName
-    );
+    let shouldPreviewUpdate =
+      (await this.updateSettings(
+        changedSettings,
+        !!changedSettings.printerName
+      )) && previewableChange;
 
     if (shouldPreviewUpdate && !printPending) {
       // We do not need to arm the preview task if the user has already printed
@@ -562,6 +669,14 @@
         this.viewSettings[setting] != value ||
         (printerChanged && setting == "paperId")
       ) {
+        if (setting == "pageRanges") {
+          // The page range is kept as an array. If the user switches between all
+          // and custom with no specified range input (which is represented as an
+          // empty array), we do not want to send an update.
+          if (!this.viewSettings[setting].length && !value.length) {
+            continue;
+          }
+        }
         this.viewSettings[setting] = value;
 
         if (
@@ -641,19 +756,28 @@
         .add(elapsed);
     }
 
-    let totalPageCount, sheetCount, hasSelection;
+    let totalPageCount, sheetCount, hasSelection, isEmpty;
     try {
       // This resolves with a PrintPreviewSuccessInfo dictionary.
       ({
         totalPageCount,
         sheetCount,
         hasSelection,
+        isEmpty,
       } = await previewBrowser.frameLoader.printPreview(settings, sourceWinId));
     } catch (e) {
       this.reportPrintingError("PRINT_PREVIEW");
       throw e;
     }
 
+    this.previewIsEmpty = isEmpty;
+    // If the preview is empty, we know our range is greater than the number of pages.
+    // We have to send a pageRange update to display a non-empty page.
+    if (this.previewIsEmpty) {
+      this.viewSettings.pageRanges = [];
+      this.updatePrintPreview();
+    }
+
     // Update the settings print options on whether there is a selection.
     settings.isPrintSelectionRBEnabled = hasSelection;
 
@@ -662,6 +786,7 @@
         detail: { sheetCount, totalPages: totalPageCount },
       })
     );
+    this.previewBrowser.setAttribute("sheet-count", sheetCount);
 
     this._hideRenderingIndicator();
 
@@ -1237,6 +1362,10 @@
         break;
       }
 
+      case "printerName":
+        // Can't set printerName, settings objects belong to a specific printer.
+        break;
+
       case "printBackgrounds":
         target.printBGImages = value;
         target.printBGColors = value;
@@ -1313,7 +1442,7 @@
         this.update(settings);
       });
 
-      this.addEventListener("change", this);
+      this.addEventListener("input", this);
     }
 
     render() {}
@@ -1329,6 +1458,15 @@
       );
     }
 
+    cancelSettingsChange(changedSettings) {
+      this.dispatchEvent(
+        new CustomEvent("cancel-print-settings", {
+          bubbles: true,
+          detail: changedSettings,
+        })
+      );
+    }
+
     handleKeypress(e) {
       let char = String.fromCharCode(e.charCode);
       let acceptedChar = e.target.step.includes(".")
@@ -1388,7 +1526,7 @@
   }
 
   handleEvent(e) {
-    if (e.type == "change" && this.settingName) {
+    if (e.type == "input" && this.settingName) {
       this.dispatchSettingsChange({
         [this.settingName]: e.target.value,
       });
@@ -1434,12 +1572,15 @@
   update(settings) {
     this.value = settings[this.settingName] ? "color" : "bw";
     let canSwitch = settings.supportsColor && settings.supportsMonochrome;
-    this.toggleAttribute("disallowed", !canSwitch);
-    this.disabled = !canSwitch;
+    if (this.disablePicker != canSwitch) {
+      this.toggleAttribute("disallowed", !canSwitch);
+      this.disabled = !canSwitch;
+    }
+    this.disablePicker = canSwitch;
   }
 
   handleEvent(e) {
-    if (e.type == "change") {
+    if (e.type == "input") {
       // turn our string value into the expected boolean
       this.dispatchSettingsChange({
         [this.settingName]: this.value == "color",
@@ -1491,7 +1632,6 @@
 class CopiesInput extends PrintUIControlMixin(HTMLInputElement) {
   initialize() {
     super.initialize();
-    this.addEventListener("input", this);
     this.addEventListener("keypress", this);
     this.addEventListener("paste", this);
   }
@@ -1525,10 +1665,8 @@
   initialize() {
     super.initialize();
 
-    this.addEventListener("change", this);
     this.addEventListener("submit", this);
     this.addEventListener("click", this);
-    this.addEventListener("input", this);
     this.addEventListener("revalidate", this);
 
     this._printerDestination = this.querySelector("#destination");
@@ -1538,6 +1676,21 @@
       // Move the Print button to the end if this isn't Windows.
       this.printButton.parentElement.append(this.printButton);
     }
+    this.querySelector("#pages-per-sheet").hidden = !Services.prefs.getBoolPref(
+      "print.pages_per_sheet.enabled",
+      false
+    );
+  }
+
+  removeNonPdfSettings() {
+    let selectors = ["#margins", "#headers-footers", "#backgrounds"];
+    for (let selector of selectors) {
+      this.querySelector(selector).remove();
+    }
+    let moreSettings = this.querySelector("#more-settings-options");
+    if (moreSettings.children.length <= 1) {
+      moreSettings.remove();
+    }
   }
 
   requestPrint() {
@@ -1558,15 +1711,59 @@
   }
 
   enable() {
-    for (let element of this.elements) {
-      if (!element.hasAttribute("disallowed")) {
-        element.disabled = false;
+    let isValid = this.checkValidity();
+    document.body.toggleAttribute("invalid", !isValid);
+    if (isValid) {
+      for (let element of this.elements) {
+        if (!element.hasAttribute("disallowed")) {
+          element.disabled = false;
+        }
+      }
+      // aria-describedby will usually cause the first value to be reported.
+      // Unfortunately, screen readers don't pick up description changes from
+      // dialogs, so we must use a live region. To avoid double reporting of
+      // the first value, we don't set aria-live initially. We only set it for
+      // subsequent updates.
+      // aria-live is set on the parent because sheetCount itself might be
+      // hidden and then shown, and updates are only reported for live
+      // regions that were already visible.
+      document
+        .querySelector("#sheet-count")
+        .parentNode.setAttribute("aria-live", "polite");
+    } else {
+      // Find the invalid element
+      let invalidElement;
+      for (let element of this.elements) {
+        if (!element.checkValidity()) {
+          invalidElement = element;
+          break;
+        }
+      }
+      let section = invalidElement.closest(".section-block");
+      document.body.toggleAttribute("invalid", !isValid);
+      // We're hiding the sheet count and aria-describedby includes the
+      // content of hidden elements, so remove aria-describedby.
+      document.body.removeAttribute("aria-describedby");
+      for (let element of this.elements) {
+        // If we're valid, enable all inputs.
+        // Otherwise, disable the valid inputs other than the cancel button and the elements
+        // in the invalid section.
+        element.disabled =
+          element.hasAttribute("disallowed") ||
+          (!isValid &&
+            element.validity.valid &&
+            element.name != "cancel" &&
+            element.closest(".section-block") != this._printerDestination &&
+            element.closest(".section-block") != section);
       }
     }
   }
 
-  disable() {
+  disable(filterFn) {
     for (let element of this.elements) {
+      if (filterFn && !filterFn(element)) {
+        continue;
+      }
       element.disabled = element.name != "cancel";
     }
   }
@@ -1583,42 +1780,10 @@
         this.dispatchEvent(new Event("print", { bubbles: true }));
       }
     } else if (
-      e.type == "change" ||
-      e.type == "input" ||
-      e.type == "revalidate"
+      (e.type == "input" || e.type == "revalidate") &&
+      !this.printerChanging
     ) {
-      let isValid = this.checkValidity();
-      let section = e.target.closest(".section-block");
-      document.body.toggleAttribute("invalid", !isValid);
-      if (isValid) {
-        // aria-describedby will usually cause the first value to be reported.
-        // Unfortunately, screen readers don't pick up description changes from
-        // dialogs, so we must use a live region. To avoid double reporting of
-        // the first value, we don't set aria-live initially. We only set it for
-        // subsequent updates.
-        // aria-live is set on the parent because sheetCount itself might be
-        // hidden and then shown, and updates are only reported for live
-        // regions that were already visible.
-        document
-          .querySelector("#sheet-count")
-          .parentNode.setAttribute("aria-live", "polite");
-      } else {
-        // We're hiding the sheet count and aria-describedby includes the
-        // content of hidden elements, so remove aria-describedby.
-        document.body.removeAttribute("aria-describedby");
-      }
-      for (let element of this.elements) {
-        // If we're valid, enable all inputs.
-        // Otherwise, disable the valid inputs other than the cancel button and the elements
-        // in the invalid section.
-        element.disabled =
-          element.hasAttribute("disallowed") ||
-          (!isValid &&
-            element.validity.valid &&
-            element.name != "cancel" &&
-            element.closest(".section-block") != this._printerDestination &&
-            element.closest(".section-block") != section);
-      }
+      this.enable();
     }
   }
 }
@@ -1637,15 +1802,8 @@
     this._scaleChoice = this.querySelector("#percent-scale-choice");
     this._scaleError = this.querySelector("#error-invalid-scale");
 
-    this._percentScale.addEventListener("input", this);
     this._percentScale.addEventListener("keypress", this);
     this._percentScale.addEventListener("paste", this);
-    this.addEventListener("input", this);
-
-    this._updateScaleTask = createDeferredTask(
-      () => this.updateScale(),
-      INPUT_DELAY_MS
-    );
   }
 
   updateScale() {
@@ -1658,8 +1816,11 @@
     let { scaling, shrinkToFit, printerName } = settings;
     this._shrinkToFitChoice.checked = shrinkToFit;
     this._scaleChoice.checked = !shrinkToFit;
-    this._percentScale.disabled = shrinkToFit;
-    this._percentScale.toggleAttribute("disallowed", shrinkToFit);
+    if (this.disableScale != shrinkToFit) {
+      this._percentScale.disabled = shrinkToFit;
+      this._percentScale.toggleAttribute("disallowed", shrinkToFit);
+    }
+    this.disableScale = shrinkToFit;
     if (!this.printerName) {
       this.printerName = printerName;
     }
@@ -1683,11 +1844,6 @@
   }
 
   handleEvent(e) {
-    if (e.type == "change") {
-      // We listen to input events, no need for change too.
-      return;
-    }
-
     if (e.type == "keypress") {
       this.handleKeypress(e);
       return;
@@ -1697,8 +1853,6 @@
       this.handlePaste(e);
     }
 
-    this._updateScaleTask.disarm();
-
     if (e.target == this._shrinkToFitChoice || e.target == this._scaleChoice) {
       if (!this._percentScale.checkValidity()) {
         this._percentScale.value = 100;
@@ -1714,7 +1868,7 @@
       this._scaleError.hidden = true;
     } else if (e.type == "input") {
       if (this._percentScale.checkValidity()) {
-        this._updateScaleTask.arm();
+        this.updateScale();
       }
     }
 
@@ -1722,6 +1876,7 @@
     if (this._percentScale.validity.valid) {
       this._scaleError.hidden = true;
     } else {
+      this.cancelSettingsChange({ scaling: true });
       this.showErrorTimeoutId = window.setTimeout(() => {
         this._scaleError.hidden = false;
       }, INPUT_DELAY_MS);
@@ -1734,20 +1889,16 @@
   initialize() {
     super.initialize();
 
-    this._startRange = this.querySelector("#custom-range-start");
-    this._endRange = this.querySelector("#custom-range-end");
+    this._rangeInput = this.querySelector("#custom-range");
+    this._rangeInput.title = "";
     this._rangePicker = this.querySelector("#range-picker");
     this._rangeError = this.querySelector("#error-invalid-range");
     this._startRangeOverflowError = this.querySelector(
       "#error-invalid-start-range-overflow"
     );
 
-    this._updatePageRangeTask = createDeferredTask(
-      () => this.updatePageRange(),
-      INPUT_DELAY_MS
-    );
+    this._pagesSet = new Set();
 
-    this.addEventListener("input", this);
     this.addEventListener("keypress", this);
     this.addEventListener("paste", this);
     document.addEventListener("page-count", this);
@@ -1758,139 +1909,231 @@
   }
 
   updatePageRange() {
-    this.dispatchSettingsChange({
-      pageRanges: this._rangePicker.value
-        ? [this._startRange.value, this._endRange.value]
-        : [],
-    });
-  }
+    let isAll = this._rangePicker.value == "all";
+    if (isAll) {
+      this._pagesSet.clear();
+      for (let i = 1; i <= this._numPages; i++) {
+        this._pagesSet.add(i);
+      }
+      if (!this._rangeInput.checkValidity()) {
+        this._rangeInput.setCustomValidity("");
+        this._rangeInput.value = "";
+      }
+    } else {
+      this.validateRangeInput();
+    }
 
-  update(settings) {
-    this.toggleAttribute("all-pages", !settings.pageRanges.length);
+    this.dispatchEvent(new Event("revalidate", { bubbles: true }));
+
+    document.l10n.setAttributes(
+      this._rangeError,
+      "printui-error-invalid-range",
+      {
+        numPages: this._numPages,
+      }
+    );
+
+    // If it's valid, update the page range and hide the error messages.
+    // Otherwise, set the appropriate error message
+    if (this._rangeInput.validity.valid || isAll) {
+      window.clearTimeout(this.showErrorTimeoutId);
+      this._startRangeOverflowError.hidden = this._rangeError.hidden = true;
+    } else {
+      this._rangeInput.focus();
+    }
   }
 
-  handleEvent(e) {
-    if (e.type == "keypress") {
-      if (e.target == this._startRange || e.target == this._endRange) {
-        this.handleKeypress(e);
+  dispatchPageRange(shouldCancel = true) {
+    window.clearTimeout(this.showErrorTimeoutId);
+    if (this._rangeInput.validity.valid || this._rangePicker.value == "all") {
+      this.dispatchSettingsChange({
+        pageRanges: this.formatPageRange(),
+      });
+    } else {
+      if (shouldCancel) {
+        this.cancelSettingsChange({ pageRanges: true });
       }
-      return;
+      this.showErrorTimeoutId = window.setTimeout(() => {
+        this._rangeError.hidden =
+          this._rangeInput.validationMessage != "invalid";
+        this._startRangeOverflowError.hidden =
+          this._rangeInput.validationMessage != "startRangeOverflow";
+      }, INPUT_DELAY_MS);
     }
+  }
 
+  // The platform expects pageRanges to be an array of
+  // ranges represented by ints.
+  // Ex: Printing pages 1-3 would return [1,3]
+  // Ex: Printing page 1 would return [1,1]
+  // Ex: Printing pages 1-2,4 would return [1,2,4,4]
+  formatPageRange() {
     if (
-      e.type === "paste" &&
-      (e.target == this._startRange || e.target == this._endRange)
+      this._pagesSet.size == 0 ||
+      this._rangeInput.value == "" ||
+      this._rangePicker.value == "all"
     ) {
-      this.handlePaste(e);
+      // Show all pages.
+      return [];
     }
+    let pages = Array.from(this._pagesSet).sort((a, b) => a - b);
 
-    this._updatePageRangeTask.disarm();
+    let formattedRanges = [];
+    let startRange = pages[0];
+    let endRange = pages[0];
+    formattedRanges.push(startRange);
+
+    for (let i = 1; i < pages.length; i++) {
+      let currentPage = pages[i - 1];
+      let nextPage = pages[i];
+      if (nextPage > currentPage + 1) {
+        formattedRanges.push(endRange);
+        startRange = endRange = nextPage;
+        formattedRanges.push(startRange);
+      } else {
+        endRange = nextPage;
+      }
+    }
+    formattedRanges.push(endRange);
 
-    if (e.type == "page-count") {
-      let { totalPages } = e.detail;
-      this._startRange.max = this._endRange.max = this._totalPages = totalPages;
-      this._startRange.disabled = this._endRange.disabled = false;
-      let isChanged = false;
-
-      // Changing certain settings (like orientation, scale or printer) can
-      // change the number of pages. We need to update the start and end rages
-      // if their values are no longer valid.
-      if (!this._startRange.checkValidity()) {
-        this._startRange.value = this._totalPages;
-        isChanged = true;
-      }
-      if (!this._endRange.checkValidity()) {
-        this._endRange.value = this._totalPages;
-        isChanged = true;
+    return formattedRanges;
+  }
+
+  update(settings) {
+    let { pageRanges, printerName } = settings;
+    this.toggleAttribute("all-pages", !pageRanges.length);
+    if (!this.printerName) {
+      this.printerName = printerName;
+    }
+
+    let isValid = this._rangeInput.checkValidity();
+    if (this.printerName != printerName && !isValid) {
+      this.printerName = printerName;
+      this._rangeInput.value = "";
+      this.updatePageRange();
+      this.dispatchPageRange();
+    }
+  }
+
+  handleKeypress(e) {
+    let char = String.fromCharCode(e.charCode);
+    let acceptedChar = char.match(/^[0-9,-]$/);
+    if (!acceptedChar && !char.match("\x00") && !e.ctrlKey && !e.metaKey) {
+      e.preventDefault();
+    }
+  }
+
+  handlePaste(e) {
+    let paste = (e.clipboardData || window.clipboardData)
+      .getData("text")
+      .trim();
+    if (!paste.match(/^[0-9,-]*$/)) {
+      e.preventDefault();
+    }
+  }
+
+  // This method has been abstracted into a helper for testing purposes
+  _validateRangeInput(value, numPages) {
+    this._pagesSet.clear();
+    var ranges = value.split(",");
+
+    for (let range of ranges) {
+      let rangeParts = range.split("-");
+      if (rangeParts.length > 2) {
+        this._rangeInput.setCustomValidity("invalid");
+        this._rangeInput.title = "";
+        this._pagesSet.clear();
+        return;
       }
-      if (isChanged) {
-        window.clearTimeout(this.showErrorTimeoutId);
-        this._startRange.max = Math.min(this._endRange.value, totalPages);
-        this._endRange.min = Math.max(this._startRange.value, 1);
+      let startRange = parseInt(rangeParts[0], 10);
+      let endRange = parseInt(
+        rangeParts.length == 2 ? rangeParts[1] : rangeParts[0],
+        10
+      );
 
-        this.dispatchEvent(new Event("revalidate", { bubbles: true }));
+      if (isNaN(startRange) && isNaN(endRange)) {
+        continue;
+      }
 
-        if (this._startRange.validity.valid && this._endRange.validity.valid) {
-          this.dispatchSettingsChange({
-            pageRanges: [this._startRange.value, this._endRange.value],
-          });
-          this._rangeError.hidden = true;
-          this._startRangeOverflowError.hidden = true;
-        }
+      // If the startRange was not specified, then we infer this
+      // to be 1.
+      if (isNaN(startRange) && rangeParts[0] == "") {
+        startRange = 1;
+      }
+      // If the end range was not specified, then we infer this
+      // to be the total number of pages.
+      if (isNaN(endRange) && rangeParts[1] == "") {
+        endRange = numPages;
+      }
+
+      // Check the range for errors
+      if (endRange < startRange) {
+        this._rangeInput.setCustomValidity("startRangeOverflow");
+        this._pagesSet.clear();
+        return;
+      } else if (
+        startRange > numPages ||
+        endRange > numPages ||
+        startRange == 0
+      ) {
+        this._rangeInput.setCustomValidity("invalid");
+        this._rangeInput.title = "";
+        this._pagesSet.clear();
+        return;
+      }
+
+      for (let i = startRange; i <= endRange; i++) {
+        this._pagesSet.add(i);
       }
-      return;
     }
 
-    if (e.target == this._rangePicker) {
-      let printAll = e.target.value == "all";
-      this._startRange.required = this._endRange.required = !printAll;
-      this.querySelector(".range-group").hidden = printAll;
-      this._startRange.value = 1;
-      this._endRange.value = this._totalPages || 1;
+    this._rangeInput.setCustomValidity("");
+  }
 
-      this.updatePageRange();
+  validateRangeInput() {
+    let value = this._rangePicker.value == "all" ? "" : this._rangeInput.value;
+    this._validateRangeInput(value, this._numPages);
+  }
 
-      window.clearTimeout(this.showErrorTimeoutId);
-      this._rangeError.hidden = true;
-      this._startRangeOverflowError.hidden = true;
+  handleEvent(e) {
+    if (e.type == "keypress") {
+      if (e.target == this._rangeInput) {
+        this.handleKeypress(e);
+      }
       return;
     }
 
-    if (e.target == this._startRange || e.target == this._endRange) {
-      if (this._startRange.checkValidity()) {
-        this._endRange.min = this._startRange.value;
-      }
-      if (this._endRange.checkValidity()) {
-        this._startRange.max = this._endRange.value;
-      }
-      if (this._startRange.checkValidity() && this._endRange.checkValidity()) {
-        if (this._startRange.value && this._endRange.value) {
-          // Update the page range after a short delay so we don't update
-          // multiple times as the user types a multi-digit number or uses
-          // up/down/mouse wheel.
-          this._updatePageRangeTask.arm();
-        }
-      }
+    if (e.type === "paste" && e.target == this._rangeInput) {
+      this.handlePaste(e);
     }
-    document.l10n.setAttributes(
-      this._rangeError,
-      "printui-error-invalid-range",
-      {
-        numPages: this._totalPages,
+
+    if (e.type == "page-count") {
+      let { totalPages } = e.detail;
+      // This means we have already handled the page count event
+      // and do not need to dispatch another event.
+      if (this._numPages == totalPages) {
+        return;
       }
-    );
 
-    window.clearTimeout(this.showErrorTimeoutId);
-    let hasShownOverflowError = false;
-    let startValidity = this._startRange.validity;
-    let endValidity = this._endRange.validity;
-
-    // Display the startRangeOverflowError if the start range exceeds
-    // the end range. This means either the start range is greater than its
-    // max constraint, whiich is determined by the end range, or the end range
-    // is less than its minimum constraint, determined by the start range.
-    if (
-      !(
-        (startValidity.rangeOverflow && endValidity.valid) ||
-        (endValidity.rangeUnderflow && startValidity.valid)
-      )
-    ) {
-      this._startRangeOverflowError.hidden = true;
-    } else {
-      hasShownOverflowError = true;
-      this.showErrorTimeoutId = window.setTimeout(() => {
-        this._startRangeOverflowError.hidden = false;
-      }, INPUT_DELAY_MS);
+      this._numPages = totalPages;
+      this._rangeInput.disabled = false;
+
+      this.updatePageRange();
+      this.dispatchPageRange(false);
+
+      return;
     }
 
-    // Display the generic error if the startRangeOverflowError is not already
-    // showing and a range input is invalid.
-    if (hasShownOverflowError || (startValidity.valid && endValidity.valid)) {
-      this._rangeError.hidden = true;
-    } else {
-      this.showErrorTimeoutId = window.setTimeout(() => {
-        this._rangeError.hidden = false;
-      }, INPUT_DELAY_MS);
+    if (e.target == this._rangePicker) {
+      this._rangeInput.hidden = e.target.value == "all";
+      this.updatePageRange();
+      this.dispatchPageRange();
+    } else if (e.target == this._rangeInput) {
+      this._rangeInput.focus();
+      if (this._numPages) {
+        this.updatePageRange();
+        this.dispatchPageRange();
+      }
     }
   }
 }
@@ -1907,12 +2150,6 @@
     this._customRightMargin = this.querySelector("#custom-margin-right");
     this._marginError = this.querySelector("#error-invalid-margin");
 
-    this._updateCustomMarginsTask = createDeferredTask(
-      () => this.updateCustomMargins(),
-      INPUT_DELAY_MS
-    );
-
-    this.addEventListener("input", this);
     this.addEventListener("keypress", this);
     this.addEventListener("paste", this);
   }
@@ -2002,7 +2239,7 @@
       // The values in custom fields should be initialized to custom margin values
       // and must be overriden if they are no longer valid.
       this.setAllMarginValues(settings);
-
+      this.updateMaxValues();
       this.dispatchEvent(new Event("revalidate", { bubbles: true }));
       this._marginError.hidden = true;
     }
@@ -2018,6 +2255,7 @@
       ) {
         window.clearTimeout(this.showErrorTimeoutId);
         this.setAllMarginValues(settings);
+        this.updateMaxValues();
         this.dispatchEvent(new Event("revalidate", { bubbles: true }));
         this._marginError.hidden = true;
       }
@@ -2027,17 +2265,9 @@
       }
       this._marginPicker.value = settings.margins;
     }
-
-    this.updateMaxValues();
   }
 
   handleEvent(e) {
-    if (e.type == "change") {
-      // We handle input events rather than change events, make sure we only
-      // dispatch one settings change per user change.
-      return;
-    }
-
     if (e.type == "keypress") {
       this.handleKeypress(e);
       return;
@@ -2047,8 +2277,6 @@
       this.handlePaste(e);
     }
 
-    this._updateCustomMarginsTask.disarm();
-
     if (e.target == this._marginPicker) {
       let customMargin = e.target.value == "custom";
       this.querySelector(".margin-group").hidden = !customMargin;
@@ -2080,7 +2308,7 @@
         this._customRightMargin.validity.valid
       ) {
         this.formatMargin(e.target);
-        this._updateCustomMarginsTask.arm();
+        this.updateCustomMargins();
       } else if (e.target.validity.stepMismatch) {
         // If this is the third digit after the decimal point, we should
         // truncate the string.
@@ -2097,6 +2325,7 @@
     ) {
       this._marginError.hidden = true;
     } else {
+      this.cancelSettingsChange({ customMargins: true, margins: true });
       this.showErrorTimeoutId = window.setTimeout(() => {
         this._marginError.hidden = false;
       }, INPUT_DELAY_MS);
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/printPagination.css firefox-85.0+build1/toolkit/components/printing/content/printPagination.css
--- firefox-84.0.2+build1/toolkit/components/printing/content/printPagination.css	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/printPagination.css	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,132 @@
+/* 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/. */
+
+:host {
+  /* in-content/common.css variables */
+  --blue-50: #0a84ff;
+  --grey-90-a10: rgba(12, 12, 13, 0.1);
+  --shadow-30: 0 4px 16px var(--grey-90-a10);
+  --border-active-shadow: var(--blue-50);
+  --border-active-color: ButtonShadow;
+}
+
+:host {
+  display: block;
+  position: absolute;
+  bottom: 24px;
+  inset-inline-start: 50%;
+  translate: -50%;
+}
+:host(:-moz-locale-dir(rtl)) {
+  translate: 50%;
+}
+
+.container {
+  margin-inline: auto;
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  box-shadow: var(--shadow-30);
+  color: var(--toolbar-color);
+  background-color: var(--toolbar-bgcolor);
+  border-radius: 6px;
+  border-style: none;
+}
+
+.toolbarButton,
+.toolbarCenter {
+  align-self: stretch;
+  flex: 0 0 auto;
+  padding: var(--toolbarbutton-outer-padding);
+  border: none;
+  border-inline-end: 1px solid ThreeDShadow;
+  border-block: 1px solid ThreeDShadow;
+  color: inherit;
+  background-color: transparent;
+}
+.startItem {
+  border-inline-start: 1px solid ThreeDShadow;
+  border-start-start-radius: 6px;
+  border-end-start-radius: 6px;
+}
+.endItem {
+  border-start-end-radius: 6px;
+  border-end-end-radius: 6px;
+}
+
+.toolbarButton {
+  min-width: calc(2 * var(--toolbarbutton-inner-padding) + 16px);
+  min-height: calc(2 * var(--toolbarbutton-inner-padding) + 16px);
+}
+
+.toolbarButton::after {
+  content: "";
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-bottom;
+  text-align: center;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-size: 12px;
+  -moz-context-properties: fill, fill-opacity;
+  fill: var(--lwt-toolbarbutton-icon-fill, currentColor);
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity);
+}
+
+.toolbarButton:hover {
+  background-color: var(--toolbarbutton-hover-background);
+}
+.toolbarButton:hover:active {
+  background-color: var(--toolbarbutton-active-background);
+}
+.toolbarButton::-moz-focus-inner {
+  border: none;
+}
+.toolbarButton:focus {
+  z-index: 1;
+}
+
+.toolbarButton:-moz-focusring {
+  outline: 2px solid var(--border-active-shadow);
+}
+.toolbarButton.startItem:-moz-focusring,
+.toolbarButton.endItem:-moz-locale-dir(rtl):-moz-focusring {
+  -moz-outline-radius: 8px;
+  -moz-outline-radius-topright: 0;
+  -moz-outline-radius-bottomright: 0;
+}
+.toolbarButton.endItem:-moz-focusring,
+.toolbarButton.startItem:-moz-locale-dir(rtl):-moz-focusring {
+  -moz-outline-radius: 8px;
+  -moz-outline-radius-topleft: 0;
+  -moz-outline-radius-bottomleft: 0;
+}
+
+.toolbarCenter {
+  flex-shrink: 0;
+  /* 3 chars + (3px border + 1px padding) on both sides */
+  min-width: calc(8px + 3ch);
+  padding: 0 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+#navigateHome::after,
+#navigateEnd::after {
+  background-image: url("chrome://global/skin/icons/chevron.svg");
+}
+
+#navigatePrevious::after,
+#navigateNext::after {
+  background-image: url("chrome://global/skin/icons/arrow-left.svg");
+}
+
+#navigatePrevious:-moz-locale-dir(rtl)::after,
+#navigateEnd:-moz-locale-dir(rtl)::after,
+#navigateHome:-moz-locale-dir(ltr)::after,
+#navigateNext:-moz-locale-dir(ltr)::after {
+  transform: scaleX(-1);
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/printPreviewPagination.js firefox-85.0+build1/toolkit/components/printing/content/printPreviewPagination.js
--- firefox-84.0.2+build1/toolkit/components/printing/content/printPreviewPagination.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/printPreviewPagination.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,178 @@
+// This file is loaded into the browser window scope.
+/* eslint-env mozilla/browser-window */
+
+// -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*-
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+customElements.define(
+  "printpreview-pagination",
+  class PrintPreviewPagination extends HTMLElement {
+    static get markup() {
+      return `
+      <html:link rel="stylesheet" href="chrome://global/content/printPagination.css" />
+      <html:div class="container">
+        <html:button id="navigateHome" class="toolbarButton startItem" data-l10n-id="printpreview-homearrow-button"></html:button>
+        <html:button id="navigatePrevious" class="toolbarButton" data-l10n-id="printpreview-previousarrow-button"></html:button>
+        <html:div class="toolbarCenter"><html:span id="sheetIndicator" data-l10n-id="printpreview-sheet-of-sheets" data-l10n-args='{ "sheetNum": 1, "sheetCount": 1 }'></html:span></html:div>
+        <html:button id="navigateNext" class="toolbarButton" data-l10n-id="printpreview-nextarrow-button"></html:button>
+        <html:button id="navigateEnd" class="toolbarButton endItem" data-l10n-id="printpreview-endarrow-button"></html:button>
+      </html:div>
+      `;
+    }
+
+    static get defaultProperties() {
+      return {
+        currentPage: 1,
+        sheetCount: 1,
+      };
+    }
+
+    get previewBrowser() {
+      // Assuming we're a sibling of our preview browser.
+      return this.parentNode.querySelector(".printPreviewBrowser");
+    }
+
+    connectedCallback() {
+      MozXULElement.insertFTLIfNeeded("toolkit/printing/printPreview.ftl");
+
+      const shadowRoot = this.attachShadow({ mode: "open" });
+      document.l10n.connectRoot(shadowRoot);
+
+      let fragment = MozXULElement.parseXULToFragment(this.constructor.markup);
+      this.shadowRoot.append(fragment);
+
+      this.elements = {
+        sheetIndicator: shadowRoot.querySelector("#sheetIndicator"),
+        homeButton: shadowRoot.querySelector("#navigateHome"),
+        previousButton: shadowRoot.querySelector("#navigatePrevious"),
+        nextButton: shadowRoot.querySelector("#navigateNext"),
+        endButton: shadowRoot.querySelector("#navigateEnd"),
+      };
+
+      this.shadowRoot.addEventListener("click", this);
+
+      let knownAttrs = {
+        "sheet-count": "sheetCount",
+        "current-page": "currentPage",
+      };
+      this.mutationObserver = new MutationObserver(changes => {
+        let opts = {};
+        for (let change of changes) {
+          let { attributeName, target, type } = change;
+          if (type == "attributes" && attributeName in knownAttrs) {
+            opts[knownAttrs[attributeName]] = parseInt(
+              target.getAttribute(attributeName),
+              10
+            );
+          }
+        }
+        if (opts.sheetCount || opts.currentPage) {
+          this.update(opts);
+        }
+      });
+      this.mutationObserver.observe(this.previewBrowser, {
+        attributes: ["current-page", "sheet-count"],
+      });
+      // Initial render with some default values
+      // We'll be updated with real values when available
+      this.update(this.constructor.defaultProperties);
+    }
+
+    disconnectedCallback() {
+      document.l10n.disconnectRoot(this.shadowRoot);
+      this.shadowRoot.textContent = "";
+      this.mutationObserver?.disconnect();
+      delete this.mutationObserver;
+    }
+
+    handleEvent(event) {
+      if (event.type == "click" && event.button != 0) {
+        return;
+      }
+      event.stopPropagation();
+
+      switch (event.target) {
+        case this.elements.homeButton:
+          this.navigate(0, 0, "home");
+          break;
+        case this.elements.previousButton:
+          this.navigate(-1, 0, 0);
+          break;
+        case this.elements.nextButton:
+          this.navigate(1, 0, 0);
+          break;
+        case this.elements.endButton:
+          this.navigate(0, 0, "end");
+          break;
+      }
+    }
+
+    navigate(aDirection, aPageNum, aHomeOrEnd) {
+      const nsIWebBrowserPrint = Ci.nsIWebBrowserPrint;
+      let targetNum;
+      let navType;
+      // we use only one of aHomeOrEnd, aDirection, or aPageNum
+      if (aHomeOrEnd) {
+        // We're going to either the very first page ("home"), or the
+        // very last page ("end").
+        if (aHomeOrEnd == "home") {
+          targetNum = 1;
+          navType = nsIWebBrowserPrint.PRINTPREVIEW_HOME;
+        } else {
+          targetNum = this.sheetCount;
+          navType = nsIWebBrowserPrint.PRINTPREVIEW_END;
+        }
+      } else if (aPageNum) {
+        // We're going to a specific page (aPageNum)
+        targetNum = Math.min(Math.max(1, aPageNum), this.sheetCount);
+        navType = nsIWebBrowserPrint.PRINTPREVIEW_GOTO_PAGENUM;
+      } else {
+        // aDirection is either +1 or -1, and allows us to increment
+        // or decrement our currently viewed page.
+        targetNum = Math.min(
+          Math.max(1, this.currentSheet + aDirection),
+          this.sheetCount
+        );
+        navType = nsIWebBrowserPrint.PRINTPREVIEW_GOTO_PAGENUM;
+      }
+
+      // Preemptively update our own state, rather than waiting for the message from the child process
+      // This allows subsequent clicks of next/back to advance 1 page per click if possible
+      // and keeps the UI feeling more responsive
+      this.update({ currentPage: targetNum });
+
+      this.previewBrowser.sendMessageToActor(
+        "Printing:Preview:Navigate",
+        {
+          navType,
+          pageNum: targetNum,
+        },
+        "Printing"
+      );
+    }
+
+    update(data = {}) {
+      if (data.sheetCount) {
+        if (this.sheetCount !== data.sheetCount && this.currentSheet !== 1) {
+          // when sheet count changes, scroll position will get reset
+          this.currentSheet = 1;
+        }
+        this.sheetCount = data.sheetCount;
+      }
+      if (data.currentPage) {
+        this.currentSheet = data.currentPage;
+      }
+      document.l10n.setAttributes(
+        this.elements.sheetIndicator,
+        this.elements.sheetIndicator.dataset.l10nId,
+        {
+          sheetNum: this.currentSheet,
+          sheetCount: this.sheetCount,
+        }
+      );
+    }
+  }
+);
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/content/printUtils.js firefox-85.0+build1/toolkit/components/printing/content/printUtils.js
--- firefox-84.0.2+build1/toolkit/components/printing/content/printUtils.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/content/printUtils.js	2021-01-18 19:58:26.000000000 +0000
@@ -175,6 +175,13 @@
       true
     ).firstElementChild;
     previewStack.append(browser);
+
+    // show the toolbar after we go into print preview mode so
+    // that we can initialize the toolbar with total num pages
+    let previewPagination = document.createElement("printpreview-pagination");
+    previewPagination.classList.add("printPreviewNavigation");
+    previewStack.append(previewPagination);
+
     aDialogBrowser.parentElement.prepend(previewStack);
     return browser;
   },
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/jar.mn firefox-85.0+build1/toolkit/components/printing/jar.mn
--- firefox-84.0.2+build1/toolkit/components/printing/jar.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/jar.mn	2021-01-18 19:58:26.000000000 +0000
@@ -15,6 +15,7 @@
 #endif
    content/global/landscape.svg                     (content/landscape.svg)
    content/global/portrait.svg                      (content/portrait.svg)
+   content/global/printPreviewPagination.js         (content/printPreviewPagination.js)
    content/global/printPreviewToolbar.js            (content/printPreviewToolbar.js)
    content/global/printUtils.js                     (content/printUtils.js)
    content/global/print.js                          (content/print.js)
@@ -22,3 +23,4 @@
    content/global/print.css                         (content/print.css)
    content/global/toggle-group.css                  (content/toggle-group.css)
    content/global/simplifyMode.css                  (content/simplifyMode.css)
+   content/global/printPagination.css               (content/printPagination.css)
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_cancel_close_print.js firefox-85.0+build1/toolkit/components/printing/tests/browser_cancel_close_print.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_cancel_close_print.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_cancel_close_print.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function testCloseWhilePrinting() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+    await helper.setupMockPrint();
+    helper.mockFilePicker("output.pdf");
+
+    await helper.withClosingFn(async () => {
+      let cancelButton = helper.get("cancel-button");
+      is(
+        helper.doc.l10n.getAttributes(cancelButton).id,
+        "printui-cancel-button",
+        "The cancel button is using the 'cancel' string"
+      );
+      EventUtils.sendKey("return", helper.win);
+      is(
+        helper.doc.l10n.getAttributes(cancelButton).id,
+        "printui-close-button",
+        "The cancel button is using the 'close' string"
+      );
+      helper.resolvePrint();
+    });
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_destination_change.js firefox-85.0+build1/toolkit/components/printing/tests/browser_destination_change.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_destination_change.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_destination_change.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,152 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+let pdfPrinterName = "Mozilla Save to PDF";
+let fastPrinterName = "Fast";
+let slowPrinterName = "Slow";
+
+async function setupPrinters(helper) {
+  helper.addMockPrinter(fastPrinterName);
+
+  let resolvePrinterInfo;
+  helper.addMockPrinter({
+    name: slowPrinterName,
+    printerInfoPromise: new Promise(resolve => {
+      resolvePrinterInfo = resolve;
+    }),
+  });
+
+  await SpecialPowers.pushPrefEnv({
+    set: [["print.printer_Slow.print_orientation", 1]],
+  });
+
+  return resolvePrinterInfo;
+}
+
+async function changeDestination(helper, dir) {
+  let picker = helper.get("printer-picker");
+  let changed = BrowserTestUtils.waitForEvent(picker, "change");
+  picker.focus();
+  EventUtils.sendKey("space", helper.win);
+  EventUtils.sendKey(dir, helper.win);
+  EventUtils.sendKey("return", helper.win);
+  await changed;
+}
+
+function assertFormEnabled(form) {
+  for (let element of form.elements) {
+    if (element.hasAttribute("disallowed")) {
+      ok(element.disabled, `${element.id} is disallowed`);
+    } else {
+      ok(!element.disabled, `${element.id} is enabled`);
+    }
+  }
+}
+
+function assertFormDisabled(form) {
+  for (let element of form.elements) {
+    if (element.id == "printer-picker" || element.id == "cancel-button") {
+      ok(!element.disabled, `${element.id} is enabled`);
+    } else {
+      ok(element.disabled, `${element.id} is disabled`);
+    }
+  }
+}
+
+add_task(async function testSlowDestinationChange() {
+  await PrintHelper.withTestPage(async helper => {
+    let resolvePrinterInfo = await setupPrinters(helper);
+    await helper.startPrint();
+
+    let destinationPicker = helper.get("printer-picker");
+    let printForm = helper.get("print");
+
+    info("Changing to fast printer should change settings");
+    await helper.assertSettingsChanged(
+      { printerName: pdfPrinterName, orientation: 0 },
+      { printerName: fastPrinterName, orientation: 0 },
+      async () => {
+        await changeDestination(helper, "down");
+        is(destinationPicker.value, fastPrinterName, "Fast printer selected");
+        // Wait one frame so the print settings promises resolve.
+        await helper.awaitAnimationFrame();
+        assertFormEnabled(printForm);
+      }
+    );
+
+    info("Changing to slow printer should not change settings yet");
+    await helper.assertSettingsNotChanged(
+      { printerName: fastPrinterName, orientation: 0 },
+      async () => {
+        await changeDestination(helper, "down");
+        is(destinationPicker.value, slowPrinterName, "Slow printer selected");
+        // Wait one frame, since the settings are blocked on resolvePrinterInfo
+        // the settings shouldn't change.
+        await helper.awaitAnimationFrame();
+        assertFormDisabled(printForm);
+      }
+    );
+
+    await helper.assertSettingsChanged(
+      { printerName: fastPrinterName, orientation: 0 },
+      { printerName: slowPrinterName, orientation: 1 },
+      async () => {
+        resolvePrinterInfo();
+        await helper.waitForSettingsEvent();
+        assertFormEnabled(printForm);
+      }
+    );
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testSwitchAwayFromSlowDestination() {
+  await PrintHelper.withTestPage(async helper => {
+    let resolvePrinterInfo = await setupPrinters(helper);
+    await helper.startPrint();
+
+    let destinationPicker = helper.get("printer-picker");
+    let printForm = helper.get("print");
+
+    // Load the fast printer.
+    await helper.waitForSettingsEvent(async () => {
+      await changeDestination(helper, "down");
+    });
+    await helper.awaitAnimationFrame();
+    assertFormEnabled(printForm);
+
+    // "Load" the slow printer.
+    await changeDestination(helper, "down");
+    is(destinationPicker.value, slowPrinterName, "Slow printer selected");
+    // Wait an animation frame, since there's no settings event.
+    await helper.awaitAnimationFrame();
+    assertFormDisabled(printForm);
+
+    // Switch back to the fast printer.
+    await helper.waitForSettingsEvent(async () => {
+      await changeDestination(helper, "up");
+    });
+    helper.assertSettingsMatch({
+      printerName: fastPrinterName,
+      orientation: 0,
+    });
+
+    await helper.awaitAnimationFrame();
+    assertFormEnabled(printForm);
+
+    // Let the slow printer settings resolve, the orientation shouldn't change.
+    resolvePrinterInfo();
+    // Wait so the settings event can trigger, if this case isn't handled.
+    await helper.awaitAnimationFrame();
+    helper.assertSettingsMatch({
+      printerName: fastPrinterName,
+      orientation: 0,
+    });
+    assertFormEnabled(printForm);
+
+    await helper.closeDialog();
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_empty_paper_sizes.js firefox-85.0+build1/toolkit/components/printing/tests/browser_empty_paper_sizes.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_empty_paper_sizes.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_empty_paper_sizes.js	2021-01-18 19:58:27.000000000 +0000
@@ -18,7 +18,7 @@
         height: 1224,
       }),
     ];
-    helper.addMockPrinter(mockPrinterName, paperList);
+    helper.addMockPrinter({ name: mockPrinterName, paperList });
     await helper.startPrint();
     await helper.dispatchSettingsChange({ printerName: mockPrinterName });
     await helper.awaitAnimationFrame();
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser.ini firefox-85.0+build1/toolkit/components/printing/tests/browser.ini
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -3,6 +3,8 @@
   head.js
   simplifyArticleSample.html
 
+[browser_cancel_close_print.js]
+[browser_destination_change.js]
 [browser_empty_paper_sizes.js]
 
 [browser_modal_print.js]
@@ -15,6 +17,9 @@
   file_page_change_print_original_2.html
 skip-if = os == "mac"
 
+[browser_pdf_hidden_settings.js]
+support-files =
+  file_pdf.pdf
 [browser_print_paper_sizes.js]
 [browser_pdf_printer_settings.js]
 [browser_print_bcg_id_overflow.js]
@@ -25,6 +30,7 @@
 [browser_print_page_range.js]
 [browser_print_scaling.js]
 [browser_sheet_count.js]
+[browser_ui_labels.js]
 [browser_window_print.js]
 support-files =
   file_window_print.html
@@ -35,6 +41,10 @@
 support-files =
   file_print.html
 
+[browser_preview_navigation.js]
+support-files =
+  longerArticle.html
+
 [browser_preview_print_simplify_non_article.js]
 support-files =
     simplifyNonArticleSample.html
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_modal_print.js firefox-85.0+build1/toolkit/components/printing/tests/browser_modal_print.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_modal_print.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_modal_print.js	2021-01-18 19:58:27.000000000 +0000
@@ -86,10 +86,26 @@
 
     const previewBrowser = document.querySelector(".printPreviewBrowser");
     ok(previewBrowser, "Got the print preview browser");
-    let focused = BrowserTestUtils.waitForEvent(previewBrowser, "focus");
-    EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
+
+    let focused;
+    let navigationShadowRoot = document.querySelector(".printPreviewNavigation")
+      .shadowRoot;
+    for (let buttonId of [
+      "navigateEnd",
+      "navigateNext",
+      "navigatePrevious",
+      "navigateHome",
+    ]) {
+      let button = navigationShadowRoot.getElementById(buttonId);
+      focused = BrowserTestUtils.waitForEvent(button, "focus");
+      await EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
+      await focused;
+    }
+
+    focused = BrowserTestUtils.waitForEvent(previewBrowser, "focus");
+    await EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
     await focused;
-    ok(true, "Print preview focused after shift+tab");
+    ok(true, "Print preview focused after shift+tab through the paginator");
 
     focused = BrowserTestUtils.waitForEvent(gNavToolbox, "focus", true);
     EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
@@ -101,6 +117,17 @@
     await focused;
     ok(true, "Print preview focused after tab");
 
+    for (let buttonId of [
+      "navigateHome",
+      "navigatePrevious",
+      "navigateNext",
+      "navigateEnd",
+    ]) {
+      let button = navigationShadowRoot.getElementById(buttonId);
+      focused = BrowserTestUtils.waitForEvent(button, "focus");
+      await EventUtils.synthesizeKey("KEY_Tab");
+      await focused;
+    }
     focused = BrowserTestUtils.waitForEvent(printerPicker, "focus");
     EventUtils.synthesizeKey("KEY_Tab");
     await focused;
@@ -183,7 +210,7 @@
   });
   let win = await BrowserTestUtils.openNewBrowserWindow();
   let browser = win.gBrowser.selectedBrowser;
-  await BrowserTestUtils.loadURI(browser, PrintHelper.defaultTestPageUrl);
+  BrowserTestUtils.loadURI(browser, PrintHelper.defaultTestPageUrl);
   await BrowserTestUtils.browserLoaded(
     browser,
     true,
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_pdf_hidden_settings.js firefox-85.0+build1/toolkit/components/printing/tests/browser_pdf_hidden_settings.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_pdf_hidden_settings.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_pdf_hidden_settings.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const hiddenPdfIds = [
+  "margins",
+  "backgrounds",
+  "headers-footers",
+  "more-settings-options",
+];
+
+async function checkElements({ removed, file, testName }) {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    for (let id of hiddenPdfIds) {
+      is(
+        !helper.get(id),
+        removed,
+        `${id} is ${removed ? "" : "not "}removed (${testName})`
+      );
+    }
+
+    await helper.closeDialog();
+  }, file);
+}
+
+add_task(async function testSettingsShownForNonPdf() {
+  await checkElements({ removed: false, testName: "non-pdf" });
+});
+
+add_task(async function testSettingsHiddenForPdf() {
+  await checkElements({
+    removed: true,
+    file: "file_pdf.pdf",
+    testName: "pdf",
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_preview_navigation.js firefox-85.0+build1/toolkit/components/printing/tests/browser_preview_navigation.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_preview_navigation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_preview_navigation.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,319 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function compare10nArgs(elem, expectedValues) {
+  let l10nArgs = elem.ownerDocument.l10n.getAttributes(elem).args;
+  for (let [name, value] of Object.entries(expectedValues)) {
+    if (value !== l10nArgs[name]) {
+      info(
+        `compare10nArgs, expected ${name}: ${value}, actual: ${l10nArgs[name]}`
+      );
+      return false;
+    }
+  }
+  return true;
+}
+
+async function waitForPageStatusUpdate(elem, expected, message) {
+  await TestUtils.waitForCondition(
+    () => compare10nArgs(elem, expected),
+    message
+  );
+}
+
+async function waitUntilVisible(elem, visible = true) {
+  await TestUtils.waitForCondition(
+    () =>
+      BrowserTestUtils.is_visible(elem) &&
+      getComputedStyle(elem).opacity == "1",
+    "Waiting for element to be visible and have opacity:1"
+  );
+}
+
+async function waitUntilTransparent(elem) {
+  // Note that is_visible considers a fully transparent element "visible"
+  await TestUtils.waitForCondition(
+    () => getComputedStyle(elem).opacity == "0",
+    "Waiting for element to be have opacity:0"
+  );
+}
+
+async function mouseMoveAndWait(elem) {
+  let mouseMovePromise = BrowserTestUtils.waitForEvent(elem, "mousemove");
+  EventUtils.synthesizeMouseAtCenter(elem, { type: "mousemove" });
+  await mouseMovePromise;
+  await TestUtils.waitForTick();
+}
+
+add_task(async function testToolbarVisibility() {
+  // move the mouse to a known position
+  await mouseMoveAndWait(gURLBar.textbox);
+
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let paginationElem = document.querySelector(".printPreviewNavigation");
+    let previewStack = document.querySelector(".previewStack");
+
+    // The toolbar has 0 opacity until we hover or focus it
+    is(getComputedStyle(paginationElem).opacity, "0", "Initially transparent");
+
+    let visiblePromise = waitUntilVisible(paginationElem);
+    paginationElem.shadowRoot.querySelector("#navigateEnd").focus();
+    await visiblePromise;
+    is(
+      getComputedStyle(paginationElem).opacity,
+      "1",
+      "Opaque with button focused"
+    );
+
+    await EventUtils.synthesizeKey("KEY_Tab", {});
+    await waitUntilTransparent(paginationElem);
+    is(getComputedStyle(paginationElem).opacity, "0", "Returns to transparent");
+
+    visiblePromise = waitUntilVisible(paginationElem);
+    info("Waiting for mousemove event, and for the toolbar to become opaque");
+    await mouseMoveAndWait(previewStack);
+    await visiblePromise;
+    is(getComputedStyle(paginationElem).opacity, "1", "Opaque toolbar");
+
+    // put the mouse back where it won't interfere with later tests
+    await mouseMoveAndWait(gURLBar.textbox);
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testPreviewSheetCount() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let paginationElem = document.querySelector(".printPreviewNavigation");
+    let paginationSheetIndicator = paginationElem.shadowRoot.querySelector(
+      "#sheetIndicator"
+    );
+
+    // We have to wait for the first _updatePrintPreview to get the sheet count
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Paginator indicates the correct number of sheets"
+    );
+
+    // then switch to page range 1-1 and verify page count changes
+    await helper.dispatchSettingsChange({
+      pageRanges: ["1", "1"],
+    });
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 1 },
+      "Indicates the updated number of sheets"
+    );
+
+    await helper.closeDialog();
+  }, "longerArticle.html");
+});
+
+add_task(async function testPreviewScroll() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let paginationElem = document.querySelector(".printPreviewNavigation");
+    let paginationSheetIndicator = paginationElem.shadowRoot.querySelector(
+      "#sheetIndicator"
+    );
+    // Wait for the first _updatePrintPreview before interacting with the preview
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Paginator indicates the correct number of sheets"
+    );
+    let previewBrowser = PrintUtils.getPreviewBrowser();
+
+    // scroll down the document
+    // and verify the indicator is updated correctly
+    await SpecialPowers.spawn(previewBrowser, [], async function() {
+      const { ContentTaskUtils } = ChromeUtils.import(
+        "resource://testing-common/ContentTaskUtils.jsm"
+      );
+      const EventUtils = ContentTaskUtils.getEventUtils(content);
+      content.focus();
+      EventUtils.synthesizeKey("VK_PAGE_DOWN", {}, content);
+    });
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 2, sheetCount: 3 },
+      "Indicator updates on scroll"
+    );
+
+    // move focus before closing the dialog
+    helper.get("cancel-button").focus();
+    await helper.closeDialog();
+  }, "longerArticle.html");
+});
+
+add_task(async function testPreviewNavigationCommands() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let paginationElem = document.querySelector(".printPreviewNavigation");
+    let paginationSheetIndicator = paginationElem.shadowRoot.querySelector(
+      "#sheetIndicator"
+    );
+    // Wait for the first _updatePrintPreview before interacting with the preview
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Paginator indicates the correct number of sheets"
+    );
+
+    // click the navigation buttons
+    // and verify the indicator is updated correctly
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigateNext"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 2, sheetCount: 3 },
+      "Indicator updates on navigation"
+    );
+
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigatePrevious"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Indicator updates on navigation to previous"
+    );
+
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigateEnd"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 3, sheetCount: 3 },
+      "Indicator updates on navigation to end"
+    );
+
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigateHome"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Indicator updates on navigation to start"
+    );
+
+    // Test rapid clicks on the navigation buttons
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigateNext"),
+      {}
+    );
+    await helper.awaitAnimationFrame();
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigateNext"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 3, sheetCount: 3 },
+      "2 successive 'next' clicks correctly update the sheet indicator"
+    );
+
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigatePrevious"),
+      {}
+    );
+    await helper.awaitAnimationFrame();
+    EventUtils.synthesizeMouseAtCenter(
+      paginationElem.shadowRoot.querySelector("#navigatePrevious"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      paginationSheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "2 successive 'previous' clicks correctly update the sheet indicator"
+    );
+
+    // move focus before closing the dialog
+    helper.get("cancel-button").focus();
+    await helper.awaitAnimationFrame();
+    await helper.closeDialog();
+  }, "longerArticle.html");
+});
+
+add_task(async function testMultiplePreviewNavigation() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+    const tab1 = gBrowser.selectedTab;
+    let sheetIndicator = document
+      .querySelector(".printPreviewNavigation")
+      .shadowRoot.querySelector("#sheetIndicator");
+
+    await waitForPageStatusUpdate(
+      sheetIndicator,
+      { sheetNum: 1, sheetCount: 3 },
+      "Indicator has the correct initial sheetCount"
+    );
+
+    const tab2 = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      PrintHelper.defaultTestPageUrl
+    );
+    let helper2 = new PrintHelper(tab2.linkedBrowser);
+    await helper2.startPrint();
+
+    let [previewBrowser1, previewBrowser2] = document.querySelectorAll(
+      ".printPreviewBrowser"
+    );
+    ok(previewBrowser1 && previewBrowser2, "There are 2 preview browsers");
+
+    let [toolbar1, toolbar2] = document.querySelectorAll(
+      ".printPreviewNavigation"
+    );
+    ok(toolbar1 && toolbar2, "There are 2 preview navigation toolbars");
+    is(
+      toolbar1.previewBrowser,
+      previewBrowser1,
+      "toolbar1 has the correct previewBrowser"
+    );
+    sheetIndicator = toolbar1.shadowRoot.querySelector("#sheetIndicator");
+    ok(
+      compare10nArgs(sheetIndicator, { sheetNum: 1, sheetCount: 3 }),
+      "First toolbar has the correct content"
+    );
+
+    is(
+      toolbar2.previewBrowser,
+      previewBrowser2,
+      "toolbar2 has the correct previewBrowser"
+    );
+    sheetIndicator = toolbar2.shadowRoot.querySelector("#sheetIndicator");
+    ok(
+      compare10nArgs(sheetIndicator, { sheetNum: 1, sheetCount: 1 }),
+      "2nd toolbar has the correct content"
+    );
+
+    // Switch back to the first tab and ensure the correct preview navigation is updated when clicked
+    await BrowserTestUtils.switchTab(gBrowser, tab1);
+    sheetIndicator = toolbar1.shadowRoot.querySelector("#sheetIndicator");
+
+    EventUtils.synthesizeMouseAtCenter(
+      toolbar1.shadowRoot.querySelector("#navigateNext"),
+      {}
+    );
+    await waitForPageStatusUpdate(
+      sheetIndicator,
+      { sheetNum: 2, sheetCount: 3 },
+      "Indicator updates on navigation"
+    );
+
+    gBrowser.removeTab(tab2);
+  }, "longerArticle.html");
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_print_margins.js firefox-85.0+build1/toolkit/components/printing/tests/browser_print_margins.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_print_margins.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_print_margins.js	2021-01-18 19:58:27.000000000 +0000
@@ -33,17 +33,19 @@
 }
 
 function assertPendingMarginsUpdate(helper) {
-  let marginsPicker = helper.get("margins-select");
   ok(
-    marginsPicker._updateCustomMarginsTask.isArmed,
+    Object.keys(helper.win.PrintEventHandler._delayedChanges).length,
+    "At least one delayed task is added"
+  );
+  ok(
+    helper.win.PrintEventHandler._delayedSettingsChangeTask.isArmed,
     "The update task is armed"
   );
 }
 
 function assertNoPendingMarginsUpdate(helper) {
-  let marginsPicker = helper.get("margins-select");
   ok(
-    !marginsPicker._updateCustomMarginsTask.isArmed,
+    !helper.win.PrintEventHandler._delayedSettingsChangeTask.isArmed,
     "The update task isn't armed"
   );
 }
@@ -240,7 +242,6 @@
       "0.50",
       "Left margin placeholder is correct"
     );
-    assertNoPendingMarginsUpdate(helper);
     await BrowserTestUtils.waitForCondition(
       () => marginError.hidden,
       "Wait for margin error to be hidden"
@@ -656,7 +657,7 @@
 
     is(destinationPicker.disabled, false, "Destination picker is enabled");
 
-    await helper.dispatchSettingsChange({ printerName: mockPrinterName });
+    helper.dispatchSettingsChange({ printerName: mockPrinterName });
     await BrowserTestUtils.waitForCondition(
       () => marginError.hidden,
       "Wait for margin error to be hidden"
@@ -742,7 +743,7 @@
       { marginTop: 5, marginRight: 0.5, marginBottom: 5, marginLeft: 0.5 },
       { marginTop: 0.5, marginRight: 0.5, marginBottom: 0.5, marginLeft: 0.5 },
       async () => {
-        await helper.dispatchSettingsChange({ orientation: 1 });
+        helper.dispatchSettingsChange({ orientation: 1 });
         await helper.waitForSettingsEvent();
         ok(marginError.hidden, "Margin error is hidden");
       }
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_print_page_range.js firefox-85.0+build1/toolkit/components/printing/tests/browser_print_page_range.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_print_page_range.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_print_page_range.js	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,15 @@
   EventUtils.sendKey("return", helper.win);
 }
 
+function changeCustomToAll(helper) {
+  let rangeSelect = helper.get("range-picker");
+  rangeSelect.focus();
+  rangeSelect.scrollIntoView({ block: "center" });
+  EventUtils.sendKey("space", helper.win);
+  EventUtils.sendKey("up", helper.win);
+  EventUtils.sendKey("return", helper.win);
+}
+
 add_task(async function testRangeResetAfterScale() {
   const mockPrinterName = "Fake Printer";
   await PrintHelper.withTestPage(async helper => {
@@ -20,7 +29,7 @@
     await helper.setupMockPrint();
 
     helper.mockFilePicker("changeRangeFromScale.pdf");
-    this.changeAllToCustom(helper);
+    changeAllToCustom(helper);
 
     await helper.openMoreSettings();
     let scaleRadio = helper.get("percent-scale-choice");
@@ -28,20 +37,58 @@
     let percentScale = helper.get("percent-scale");
     await helper.waitForPreview(() => helper.text(percentScale, "200"));
 
+    let customRange = helper.get("custom-range");
+    let rangeError = helper.get("error-invalid-range");
     await helper.waitForPreview(() => {
-      helper.text(helper.get("custom-range-start"), "3");
-      helper.text(helper.get("custom-range-end"), "3");
+      helper.text(customRange, "3");
     });
 
-    await helper.withClosingFn(async () => {
-      await helper.text(percentScale, "10");
-      EventUtils.sendKey("return", helper.win);
-      helper.resolvePrint();
-    });
-    helper.assertPrintedWithSettings({
-      pageRanges: [1, 1],
-      scaling: 0.1,
+    ok(rangeError.hidden, "Range error is hidden");
+
+    await helper.text(percentScale, "10");
+    EventUtils.sendKey("return", helper.win);
+
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", rangeError);
+    ok(!rangeError.hidden, "Range error is showing");
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testRangeResetAfterPaperSize() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+    await helper.waitForPreview(() =>
+      helper.dispatchSettingsChange({ paperId: "iso_a5" })
+    );
+    await helper.setupMockPrint();
+
+    await helper.openMoreSettings();
+    let scaleRadio = helper.get("percent-scale-choice");
+    await helper.waitForPreview(() => helper.click(scaleRadio));
+    let percentScale = helper.get("percent-scale");
+    await helper.waitForPreview(() => helper.text(percentScale, "200"));
+
+    let customRange = helper.get("custom-range");
+    changeAllToCustom(helper);
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", customRange);
+
+    let rangeError = helper.get("error-invalid-range");
+    await helper.waitForPreview(() => {
+      helper.text(customRange, "6");
     });
+
+    ok(rangeError.hidden, "Range error is hidden");
+
+    helper.dispatchSettingsChange({ paperId: "iso_a3" });
+    await BrowserTestUtils.waitForCondition(
+      () => helper.get("paper-size-picker").value == "iso_a3",
+      "Wait for paper size select to update"
+    );
+    EventUtils.sendKey("return", helper.win);
+
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", rangeError);
+    ok(!rangeError.hidden, "Range error is showing");
+    await helper.closeDialog();
   });
 });
 
@@ -52,21 +99,16 @@
     await helper.startPrint();
 
     let destinationPicker = helper.get("printer-picker");
-    let startPageRange = helper.get("custom-range-start");
-
-    await helper.assertSettingsChanged(
-      { pageRanges: [] },
-      { pageRanges: [1, 1] },
-      async () => {
-        await helper.waitForPreview(() => changeAllToCustom(helper));
-      }
-    );
+    let customPageRange = helper.get("custom-range");
 
-    let rangeError = helper.get("error-invalid-start-range-overflow");
+    await helper.assertSettingsNotChanged({ pageRanges: [] }, async () => {
+      changeAllToCustom(helper);
+    });
+    let rangeError = helper.get("error-invalid-range");
 
-    await helper.assertSettingsNotChanged({ pageRanges: [1, 1] }, async () => {
+    await helper.assertSettingsNotChanged({ pageRanges: [] }, async () => {
       ok(rangeError.hidden, "Range error is hidden");
-      await helper.text(startPageRange, "9");
+      await helper.text(customPageRange, "9");
       await BrowserTestUtils.waitForAttributeRemoval("hidden", rangeError);
       ok(!rangeError.hidden, "Range error is showing");
     });
@@ -74,13 +116,164 @@
     is(destinationPicker.disabled, false, "Destination picker is enabled");
 
     // Select a new printer
-    await helper.dispatchSettingsChange({ printerName: mockPrinterName });
+    helper.dispatchSettingsChange({ printerName: mockPrinterName });
     await BrowserTestUtils.waitForCondition(
       () => rangeError.hidden,
       "Wait for range error to be hidden"
     );
-    is(startPageRange.value, "1", "Start page range has reset to 1");
+    is(customPageRange.value, "", "Page range has reset");
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testPageRangeSets() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let customRange = helper.get("custom-range");
+    let pageRangeInput = helper.get("page-range-input");
+    let invalidError = helper.get("error-invalid-range");
+    let invalidOverflowError = helper.get("error-invalid-start-range-overflow");
+
+    ok(customRange.hidden, "Custom range input is hidden");
+
+    changeAllToCustom(helper);
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", customRange);
+
+    ok(!customRange.hidden, "Custom range is showing");
+
+    // We need to set the input to something to ensure we do not return early
+    // out of our validation function
+    helper.text(helper.get("custom-range"), ",");
+
+    let validStrings = {
+      "1": [1, 1],
+      "1,": [1, 1],
+      "2": [2, 2],
+      "1-2": [1, 2],
+      "1,2": [1, 2],
+      "1,2,": [1, 2],
+      "2,1": [1, 2],
+      "1,3": [1, 1, 3, 3],
+      "1-1,3": [1, 1, 3, 3],
+      "1,3-3": [1, 1, 3, 3],
+      "10-33": [10, 33],
+      "1-": [1, 50],
+      "-": [],
+      "-20": [1, 20],
+      "-,1": [],
+      "-1,1-": [],
+      "-1,1-2": [1, 2],
+      ",9": [9, 9],
+      ",": [],
+      "1,2,1,20,5": [1, 2, 5, 5, 20, 20],
+      "1-17,4,12-19": [1, 19],
+      "43-46,42,47-": [42, 50],
+    };
+
+    for (let [str, expected] of Object.entries(validStrings)) {
+      pageRangeInput._validateRangeInput(str, 50);
+      let pageRanges = pageRangeInput.formatPageRange();
+
+      is(
+        expected.every((page, index) => page === pageRanges[index]),
+        true,
+        `Expected page range for "${str}" matches "${expected}"`
+      );
+
+      ok(invalidError.hidden, "Generic error message is hidden");
+      ok(invalidOverflowError.hidden, "Start overflow error message is hidden");
+    }
+
+    let invalidStrings = ["51", "1,51", "1-51", "4-1", "--", "0", "-90"];
+
+    for (let str of invalidStrings) {
+      pageRangeInput._validateRangeInput(str, 50);
+      is(pageRangeInput._pagesSet.size, 0, `There are no pages in the set`);
+      ok(!pageRangeInput.validity, "Input is invalid");
+    }
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testRangeError() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    changeAllToCustom(helper);
+
+    let invalidError = helper.get("error-invalid-range");
+    let invalidOverflowError = helper.get("error-invalid-start-range-overflow");
+
+    ok(invalidError.hidden, "Generic error message is hidden");
+    ok(invalidOverflowError.hidden, "Start overflow error message is hidden");
+
+    helper.text(helper.get("custom-range"), "4");
+
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", invalidError);
+
+    ok(!invalidError.hidden, "Generic error message is showing");
+    ok(invalidOverflowError.hidden, "Start overflow error message is hidden");
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testStartOverflowRangeError() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    changeAllToCustom(helper);
+
+    await helper.openMoreSettings();
+    let scaleRadio = helper.get("percent-scale-choice");
+    await helper.waitForPreview(() => helper.click(scaleRadio));
+    let percentScale = helper.get("percent-scale");
+    await helper.waitForPreview(() => helper.text(percentScale, "200"));
+
+    let invalidError = helper.get("error-invalid-range");
+    let invalidOverflowError = helper.get("error-invalid-start-range-overflow");
+
+    ok(invalidError.hidden, "Generic error message is hidden");
+    ok(invalidOverflowError.hidden, "Start overflow error message is hidden");
+
+    helper.text(helper.get("custom-range"), "2-1");
+
+    await BrowserTestUtils.waitForAttributeRemoval(
+      "hidden",
+      invalidOverflowError
+    );
+
+    ok(invalidError.hidden, "Generic error message is hidden");
+    ok(!invalidOverflowError.hidden, "Start overflow error message is showing");
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testErrorClearedAfterSwitchingToAll() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    changeAllToCustom(helper);
+
+    let customRange = helper.get("custom-range");
+    let rangeError = helper.get("error-invalid-range");
+    ok(rangeError.hidden, "Generic error message is hidden");
+
+    helper.text(customRange, "3");
+
+    await BrowserTestUtils.waitForAttributeRemoval("hidden", rangeError);
+    ok(!rangeError.hidden, "Generic error message is showing");
 
+    changeCustomToAll(helper);
+
+    await BrowserTestUtils.waitForCondition(
+      () => rangeError.hidden,
+      "Wait for range error to be hidden"
+    );
+    ok(customRange.hidden, "Custom range is hidden");
     await helper.closeDialog();
   });
 });
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_sheet_count.js firefox-85.0+build1/toolkit/components/printing/tests/browser_sheet_count.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_sheet_count.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_sheet_count.js	2021-01-18 19:58:27.000000000 +0000
@@ -103,6 +103,10 @@
     );
 
     let sheetCount = helper.get("sheet-count");
+    await BrowserTestUtils.waitForCondition(
+      () => getSheetCount(sheetCount) != 1,
+      "Wait for sheet count to update"
+    );
     let sheets = getSheetCount(sheetCount);
     ok(sheets >= 3, "There are at least 3 pages");
 
@@ -117,3 +121,108 @@
     is(sheets, 2, "There are now only 2 pages shown");
   });
 });
+
+add_task(async function testPagesPerSheetCount() {
+  await PrintHelper.withTestPage(async helper => {
+    let mockPrinterName = "A real printer!";
+    helper.addMockPrinter(mockPrinterName);
+
+    await SpecialPowers.pushPrefEnv({
+      set: [
+        ["print.pages_per_sheet.enabled", true],
+        ["print_printer", mockPrinterName],
+      ],
+    });
+
+    await helper.startPrint();
+
+    await helper.waitForPreview(() =>
+      helper.dispatchSettingsChange({
+        shrinkToFit: false,
+        scaling: 2,
+      })
+    );
+
+    let sheetCount = helper.get("sheet-count");
+    await BrowserTestUtils.waitForCondition(
+      () => getSheetCount(sheetCount) != 1,
+      "Wait for sheet count to update"
+    );
+    let sheets = getSheetCount(sheetCount);
+
+    ok(sheets > 1, "There are multiple pages");
+
+    await helper.openMoreSettings();
+    let pagesPerSheet = helper.get("pages-per-sheet-picker");
+    ok(BrowserTestUtils.is_visible(pagesPerSheet), "Pages per sheet is shown");
+    pagesPerSheet.focus();
+    EventUtils.sendKey("space", helper.win);
+    for (let i = 0; i < 5; i++) {
+      EventUtils.sendKey("down", helper.win);
+      if (pagesPerSheet.value == 16) {
+        break;
+      }
+    }
+    await helper.waitForPreview(() => EventUtils.sendKey("return", helper.win));
+
+    sheets = getSheetCount(sheetCount);
+    is(sheets, 1, "There's only one sheet now");
+
+    await helper.waitForSettingsEvent(() =>
+      helper.dispatchSettingsChange({ numCopies: 5 })
+    );
+
+    sheets = getSheetCount(sheetCount);
+    is(sheets, 5, "Copies are handled with pages per sheet correctly");
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testPagesPerSheetPref() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["print.pages_per_sheet.enabled", false]],
+  });
+
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    ok(
+      BrowserTestUtils.is_hidden(helper.get("pages-per-sheet")),
+      "Pages per sheet is hidden"
+    );
+
+    await helper.closeDialog();
+  });
+});
+
+add_task(async function testUpdateCopiesNoPreviewUpdate() {
+  const mockPrinterName = "Fake Printer";
+  await PrintHelper.withTestPage(async helper => {
+    helper.addMockPrinter(mockPrinterName);
+    await helper.startPrint();
+
+    await helper.waitForSettingsEvent(() =>
+      helper.dispatchSettingsChange({ numCopies: 5 })
+    );
+
+    ok(
+      !helper.win.PrintEventHandler._updatePrintPreviewTask.isArmed,
+      "Preview Task is not armed"
+    );
+
+    await helper.waitForPreview(() =>
+      helper.dispatchSettingsChange({ printerName: mockPrinterName })
+    );
+
+    await helper.waitForSettingsEvent(() =>
+      helper.dispatchSettingsChange({ numCopies: 2 })
+    );
+    ok(
+      !helper.win.PrintEventHandler._updatePrintPreviewTask.isArmed,
+      "Preview Task is not armed"
+    );
+
+    await helper.closeDialog();
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/browser_ui_labels.js firefox-85.0+build1/toolkit/components/printing/tests/browser_ui_labels.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/browser_ui_labels.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/browser_ui_labels.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,23 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function test_FormFieldLabels() {
+  await PrintHelper.withTestPage(async helper => {
+    await helper.startPrint();
+
+    let fields = Array.from(helper.get("print").elements);
+    for (let field of fields) {
+      if (field.localName == "button") {
+        continue;
+      }
+      ok(
+        field.labels.length ||
+          field.hasAttribute("aria-label") ||
+          field.hasAttribute("aria-labelledby"),
+        `Field ${field.localName}#${field.id} should be labelled`
+      );
+    }
+  });
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/file_pdf.pdf firefox-85.0+build1/toolkit/components/printing/tests/file_pdf.pdf
--- firefox-84.0.2+build1/toolkit/components/printing/tests/file_pdf.pdf	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/file_pdf.pdf	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,12 @@
+%PDF-1.0
+1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj 2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj 3 0 obj<</Type/Page/MediaBox[0 0 3 3]>>endobj
+xref
+0 4
+0000000000 65535 f
+0000000010 00000 n
+0000000053 00000 n
+0000000102 00000 n
+trailer<</Size 4/Root 1 0 R>>
+startxref
+149
+%EOF
\ No newline at end of file
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/head.js firefox-85.0+build1/toolkit/components/printing/tests/head.js
--- firefox-84.0.2+build1/toolkit/components/printing/tests/head.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/head.js	2021-01-18 19:58:27.000000000 +0000
@@ -4,19 +4,47 @@
 let pickerMocked = false;
 
 class PrintHelper {
-  static async withTestPage(testFn) {
+  static async withTestPage(testFn, pagePathname) {
     await SpecialPowers.pushPrefEnv({
       set: [["print.tab_modal.enabled", true]],
     });
 
+    let pageUrl = pagePathname
+      ? this.getTestPageUrl(pagePathname)
+      : this.defaultTestPageUrl;
+    info("withTestPage: " + pageUrl);
+    let isPdf = pageUrl.endsWith(".pdf");
+
+    if (isPdf) {
+      await SpecialPowers.pushPrefEnv({
+        set: [["pdfjs.eventBusDispatchToDOM", true]],
+      });
+    }
+
     let taskReturn = await BrowserTestUtils.withNewTab(
-      this.defaultTestPageUrl,
+      isPdf ? "about:blank" : pageUrl,
       async function(browser) {
+        if (isPdf) {
+          let loaded = BrowserTestUtils.waitForContentEvent(
+            browser,
+            "documentloaded",
+            false,
+            null,
+            true
+          );
+          await SpecialPowers.spawn(browser, [pageUrl], contentUrl => {
+            content.location = contentUrl;
+          });
+          await loaded;
+        }
         await testFn(new PrintHelper(browser));
       }
     );
 
     await SpecialPowers.popPrefEnv();
+    if (isPdf) {
+      await SpecialPowers.popPrefEnv();
+    }
 
     // Reset all of the other printing prefs to their default.
     for (let name of Services.prefs.getChildList("print.")) {
@@ -27,12 +55,16 @@
     return taskReturn;
   }
 
-  static get defaultTestPageUrl() {
+  static getTestPageUrl(pathName) {
     const testPath = getRootDirectory(gTestPath).replace(
       "chrome://mochitests/content",
       "http://example.com"
     );
-    return testPath + "simplifyArticleSample.html";
+    return testPath + pathName;
+  }
+
+  static get defaultTestPageUrl() {
+    return this.getTestPageUrl("simplifyArticleSample.html");
   }
 
   static createMockPaper(paperProperties = {}) {
@@ -188,7 +220,15 @@
     };
   }
 
-  addMockPrinter(name = "Mock Printer", paperList = []) {
+  addMockPrinter(opts = {}) {
+    if (typeof opts == "string") {
+      opts = { name: opts };
+    }
+    let {
+      name = "Mock Printer",
+      paperList = [],
+      printerInfoPromise = Promise.resolve(),
+    } = opts;
     let PSSVC = Cc["@mozilla.org/gfx/printsettings-service;1"].getService(
       Ci.nsIPrintSettingsService
     );
@@ -203,11 +243,11 @@
       name,
       supportsColor: Promise.resolve(true),
       supportsMonochrome: Promise.resolve(true),
-      printerInfo: Promise.resolve({
+      printerInfo: printerInfoPromise.then(() => ({
         paperList,
         defaultSettings,
         QueryInterface: ChromeUtils.generateQI([Ci.nsIPrinterInfo]),
-      }),
+      })),
       QueryInterface: ChromeUtils.generateQI([Ci.nsIPrinter]),
     };
 
@@ -265,8 +305,14 @@
     await BrowserTestUtils.waitForEvent(this.doc, "preview-updated");
   }
 
-  async waitForSettingsEvent() {
-    await BrowserTestUtils.waitForEvent(this.doc, "print-settings");
+  async waitForSettingsEvent(changeFn) {
+    let changed = BrowserTestUtils.waitForEvent(this.doc, "print-settings");
+    await changeFn?.();
+    await BrowserTestUtils.waitForCondition(
+      () => !this.win.PrintEventHandler._delayedSettingsChangeTask.isArmed,
+      "Wait for all delayed tasks to execute"
+    );
+    await changed;
   }
 
   click(el, { scroll = true } = {}) {
diff -Nru firefox-84.0.2+build1/toolkit/components/printing/tests/longerArticle.html firefox-85.0+build1/toolkit/components/printing/tests/longerArticle.html
--- firefox-84.0.2+build1/toolkit/components/printing/tests/longerArticle.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printing/tests/longerArticle.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <style>
+    @media print {
+      #page-2 {
+        page-break-before: always;
+      }
+      #page-3 {
+        page-break-before: always;
+      }
+    }
+    </style>
+  </head>
+  <body>
+    <h1 id="page-1">Page 1</h1>
+    <h1 id="page-2">Page 2</h1>
+    <h1 id="page-3">Page 3</h1>
+  </body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/printingui/ipc/nsPrintingProxy.cpp firefox-85.0+build1/toolkit/components/printingui/ipc/nsPrintingProxy.cpp
--- firefox-84.0.2+build1/toolkit/components/printingui/ipc/nsPrintingProxy.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printingui/ipc/nsPrintingProxy.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/layout/RemotePrintJobChild.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
 #include "nsIDocShell.h"
 #include "nsIPrintingPromptService.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/printingui/ipc/PPrintingTypes.ipdlh firefox-85.0+build1/toolkit/components/printingui/ipc/PPrintingTypes.ipdlh
--- firefox-84.0.2+build1/toolkit/components/printingui/ipc/PPrintingTypes.ipdlh	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printingui/ipc/PPrintingTypes.ipdlh	2021-01-18 19:58:26.000000000 +0000
@@ -57,6 +57,7 @@
   bool printInColor;
   int32_t orientation;
   int32_t numCopies;
+  int32_t numPagesPerSheet;
   nsString printerName;
   bool printToFile;
   nsString toFileName;
diff -Nru firefox-84.0.2+build1/toolkit/components/printingui/nsPrintingPromptService.cpp firefox-85.0+build1/toolkit/components/printingui/nsPrintingPromptService.cpp
--- firefox-84.0.2+build1/toolkit/components/printingui/nsPrintingPromptService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printingui/nsPrintingPromptService.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsString.h"
 #include "nsIPrintDialogService.h"
 #include "nsPIDOMWindow.h"
+#include "nsServiceManagerUtils.h"
 #include "nsXULAppAPI.h"
 
 // Printing Progress Includes
diff -Nru firefox-84.0.2+build1/toolkit/components/printingui/nsPrintProgress.cpp firefox-85.0+build1/toolkit/components/printingui/nsPrintProgress.cpp
--- firefox-84.0.2+build1/toolkit/components/printingui/nsPrintProgress.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/printingui/nsPrintProgress.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -13,6 +13,7 @@
 #include "nsIPrintSettings.h"
 #include "nsIAppWindow.h"
 #include "nsXPCOM.h"
+#include "nsIObserver.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIComponentManager.h"
 #include "nsPIDOMWindow.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/moz.build firefox-85.0+build1/toolkit/components/processtools/moz.build
--- firefox-84.0.2+build1/toolkit/components/processtools/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,10 @@
     "nsIProcessToolsService.idl",
 ]
 
+EXPORTS.mozilla += [
+    "ProcInfo.h",
+]
+
 EXPORTS += [
     "ProcessToolsService.h",
 ]
@@ -28,3 +32,15 @@
 FINAL_LIBRARY = "xul"
 
 XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"]
+BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.ini"]
+
+# Platform-specific implementations of `ProcInfo`.
+toolkit = CONFIG["MOZ_WIDGET_TOOLKIT"]
+if toolkit == "gtk" or toolkit == "android":
+    UNIFIED_SOURCES += ["ProcInfo_linux.cpp"]
+elif toolkit == "windows":
+    UNIFIED_SOURCES += ["ProcInfo_win.cpp"]
+elif toolkit == "cocoa":
+    UNIFIED_SOURCES += ["ProcInfo.mm"]
+
+include("/ipc/chromium/chromium-config.mozbuild")
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo.h firefox-85.0+build1/toolkit/components/processtools/ProcInfo.h
--- firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/ProcInfo.h	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __mozilla_ProcInfo_h
+#define __mozilla_ProcInfo_h
+
+#include <base/process.h>
+#include <stdint.h>
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/ChromeUtilsBinding.h"
+#include "mozilla/dom/ipc/IdType.h"
+#include "mozilla/HashTable.h"
+#include "mozilla/MozPromise.h"
+
+namespace mozilla {
+
+namespace ipc {
+class GeckoChildProcessHost;
+}
+
+// Process types. When updating this enum, please make sure to update
+// WebIDLProcType, ChromeUtils::RequestProcInfo and ProcTypeToWebIDL to
+// mirror the changes.
+enum class ProcType {
+  // These must match the ones in ContentParent.h, and E10SUtils.jsm
+  Web,
+  WebIsolated,
+  File,
+  Extension,
+  PrivilegedAbout,
+  PrivilegedMozilla,
+  WebLargeAllocation,
+  WebCOOPCOEP,
+  // the rest matches GeckoProcessTypes.h
+  Browser,  // Default is named Browser here
+  Plugin,
+  IPDLUnitTest,
+  GMPlugin,
+  GPU,
+  VR,
+  RDD,
+  Socket,
+  RemoteSandboxBroker,
+#ifdef MOZ_ENABLE_FORKSERVER
+  ForkServer,
+#endif
+  Preallocated,
+  // Unknown type of process
+  Unknown,
+  Max = Unknown,
+};
+
+struct ThreadInfo {
+  // Thread Id.
+  base::ProcessId tid = 0;
+  // Thread name, if any.
+  nsString name;
+  // User time in ns.
+  uint64_t cpuUser = 0;
+  // System time in ns.
+  uint64_t cpuKernel = 0;
+};
+
+// Info on a DOM window.
+struct WindowInfo {
+  explicit WindowInfo()
+      : outerWindowId(0),
+        documentURI(nullptr),
+        documentTitle(u""_ns),
+        isProcessRoot(false),
+        isInProcess(false) {}
+  WindowInfo(uint64_t aOuterWindowId, nsIURI* aDocumentURI,
+             nsAString&& aDocumentTitle, bool aIsProcessRoot, bool aIsInProcess)
+      : outerWindowId(aOuterWindowId),
+        documentURI(aDocumentURI),
+        documentTitle(std::move(aDocumentTitle)),
+        isProcessRoot(aIsProcessRoot),
+        isInProcess(aIsInProcess) {}
+
+  // Internal window id.
+  const uint64_t outerWindowId;
+
+  // URI of the document.
+  const nsCOMPtr<nsIURI> documentURI;
+
+  // Title of the document.
+  const nsString documentTitle;
+
+  // True if this is the toplevel window of the process.
+  // Note that this may be an iframe from another process.
+  const bool isProcessRoot;
+
+  const bool isInProcess;
+};
+
+struct ProcInfo {
+  // Process Id
+  base::ProcessId pid = 0;
+  // Child Id as defined by Firefox when a child process is created.
+  dom::ContentParentId childId;
+  // Process type
+  ProcType type;
+  // Origin, if any
+  nsCString origin;
+  // Process filename (without the path name).
+  nsString filename;
+  // RSS in bytes.
+  int64_t residentSetSize = 0;
+  // Unshared resident size in bytes.
+  int64_t residentUniqueSize = 0;
+  // User time in ns.
+  uint64_t cpuUser = 0;
+  // System time in ns.
+  uint64_t cpuKernel = 0;
+  // Threads owned by this process.
+  CopyableTArray<ThreadInfo> threads;
+  // DOM windows represented by this process.
+  CopyableTArray<WindowInfo> windows;
+};
+
+typedef MozPromise<mozilla::HashMap<base::ProcessId, ProcInfo>, nsresult, true>
+    ProcInfoPromise;
+
+/**
+ * Data we need to request process info (e.g. CPU usage, memory usage)
+ * from the operating system and populate the resulting `ProcInfo`.
+ *
+ * Note that this structure contains a mix of:
+ * - low-level handles that we need to request low-level process info
+ *    (`aChildTask` on macOS, `aPid` on other platforms); and
+ * - high-level data that we already acquired while looking for
+ * `aPid`/`aChildTask` and that we will need further down the road.
+ */
+struct ProcInfoRequest {
+  ProcInfoRequest(base::ProcessId aPid, ProcType aProcessType,
+                  const nsACString& aOrigin, nsTArray<WindowInfo>&& aWindowInfo,
+                  uint32_t aChildId = 0
+#ifdef XP_MACOSX
+                  ,
+                  mach_port_t aChildTask = 0
+#endif  // XP_MACOSX
+                  )
+      : pid(aPid),
+        processType(aProcessType),
+        origin(aOrigin),
+        windowInfo(std::move(aWindowInfo)),
+        childId(aChildId)
+#ifdef XP_MACOSX
+        ,
+        childTask(aChildTask)
+#endif  // XP_MACOSX
+  {
+  }
+  const base::ProcessId pid;
+  const ProcType processType;
+  const nsCString origin;
+  const nsTArray<WindowInfo> windowInfo;
+  // If the process is a child, its child id, otherwise `0`.
+  const int32_t childId;
+#ifdef XP_MACOSX
+  const mach_port_t childTask;
+#endif  // XP_MACOSX
+};
+
+/**
+ * Batch a request for low-level information on Gecko processes.
+ *
+ * # Request
+ *
+ * Argument `aRequests` is a list of processes, along with high-level data
+ * we have already obtained on them and that we need to populate the
+ * resulting array of `ProcInfo`.
+ *
+ * # Result
+ *
+ * This call succeeds (possibly with missing data, see below) unless we
+ * cannot allocate memory.
+ *
+ * # Performance
+ *
+ * - This call is always executed on a background thread.
+ * - This call does NOT wake up children processes.
+ * - This function is sometimes observably slow to resolve, in particular
+ *   under Windows.
+ *
+ * # Error-handling and race conditions
+ *
+ * Requesting low-level information on a process and its threads is inherently
+ * subject to race conditions. Typically, if a process or a thread is killed
+ * while we're preparing to fetch information, we can easily end up with
+ * system/lib calls that return failures.
+ *
+ * For this reason, this API assumes that errors when placing a system/lib call
+ * are likely and normal. When some information cannot be obtained, the API will
+ * simply skip over said information.
+ *
+ * Note that due to different choices by OSes, the exact information we skip may
+ * vary across platforms. For instance, under Unix, failing to access the
+ * threads of a process will cause us to skip all data on the process, while
+ * under Windows, process information will be returned without thread
+ * information.
+ */
+RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests);
+
+/**
+ * Utility function: copy data from a `ProcInfo` and into either a
+ * `ParentProcInfoDictionary` or a `ChildProcInfoDictionary`.
+ */
+template <typename T>
+nsresult CopySysProcInfoToDOM(const ProcInfo& source, T* dest) {
+  // Copy system info.
+  dest->mPid = source.pid;
+  dest->mFilename.Assign(source.filename);
+  dest->mResidentSetSize = source.residentSetSize;
+  dest->mResidentUniqueSize = source.residentUniqueSize;
+  dest->mCpuUser = source.cpuUser;
+  dest->mCpuKernel = source.cpuKernel;
+
+  // Copy thread info.
+  mozilla::dom::Sequence<mozilla::dom::ThreadInfoDictionary> threads;
+  for (const ThreadInfo& entry : source.threads) {
+    mozilla::dom::ThreadInfoDictionary* thread =
+        threads.AppendElement(fallible);
+    if (NS_WARN_IF(!thread)) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    thread->mCpuUser = entry.cpuUser;
+    thread->mCpuKernel = entry.cpuKernel;
+    thread->mTid = entry.tid;
+    thread->mName.Assign(entry.name);
+  }
+  dest->mThreads = std::move(threads);
+  return NS_OK;
+}
+
+}  // namespace mozilla
+#endif  // ProcInfo_h
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo_linux.cpp firefox-85.0+build1/toolkit/components/processtools/ProcInfo_linux.cpp
--- firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo_linux.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/ProcInfo_linux.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,298 @@
+/* -*- 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/ProcInfo.h"
+#include "mozilla/Sprintf.h"
+#include "mozilla/Logging.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
+#include "nsLocalFile.h"
+#include "nsMemoryReporterManager.h"
+#include "nsNetCID.h"
+#include "nsWhitespaceTokenizer.h"
+
+#include <cstdio>
+#include <cstring>
+#include <unistd.h>
+#include <dirent.h>
+
+#define NANOPERSEC 1000000000.
+
+namespace mozilla {
+
+// StatReader can parse and tokenize a POSIX stat file.
+// see http://man7.org/linux/man-pages/man5/proc.5.html
+//
+// Its usage is quite simple:
+//
+// StatReader reader(pid);
+// ProcInfo info;
+// rv = reader.ParseProc(info);
+// if (NS_FAILED(rv)) {
+//     // the reading of the file or its parsing failed.
+// }
+//
+class StatReader {
+ public:
+  explicit StatReader(const base::ProcessId aPid)
+      : mPid(aPid), mMaxIndex(53), mTicksPerSec(sysconf(_SC_CLK_TCK)) {
+    mFilepath.AppendPrintf("/proc/%u/stat", mPid);
+  }
+
+  nsresult ParseProc(ProcInfo& aInfo) {
+    nsAutoString fileContent;
+    nsresult rv = ReadFile(fileContent);
+    NS_ENSURE_SUCCESS(rv, rv);
+    // We first extract the filename
+    int32_t startPos = fileContent.RFindChar('(');
+    if (startPos == -1) {
+      return NS_ERROR_FAILURE;
+    }
+    int32_t endPos = fileContent.RFindChar(')');
+    if (endPos == -1) {
+      return NS_ERROR_FAILURE;
+    }
+    int32_t len = endPos - (startPos + 1);
+    aInfo.filename.Assign(Substring(fileContent, startPos + 1, len));
+
+    // now we can use the tokenizer for the rest of the file
+    nsWhitespaceTokenizer tokenizer(Substring(fileContent, endPos + 2));
+    int32_t index = 2;  // starting at third field
+    while (tokenizer.hasMoreTokens() && index < mMaxIndex) {
+      const nsAString& token = tokenizer.nextToken();
+      rv = UseToken(index, token, aInfo);
+      NS_ENSURE_SUCCESS(rv, rv);
+      index++;
+    }
+    return NS_OK;
+  }
+
+ protected:
+  // Called for each token found in the stat file.
+  nsresult UseToken(int32_t aIndex, const nsAString& aToken, ProcInfo& aInfo) {
+    // We're using a subset of what stat has to offer for now.
+    nsresult rv = NS_OK;
+    // see the proc documentation for fields index references.
+    switch (aIndex) {
+      case 13:
+        // Amount of time that this process has been scheduled
+        // in user mode, measured in clock ticks
+        aInfo.cpuUser = GetCPUTime(aToken, &rv);
+        NS_ENSURE_SUCCESS(rv, rv);
+        break;
+      case 14:
+        // Amount of time that this process has been scheduled
+        // in kernel mode, measured in clock ticks
+        aInfo.cpuKernel = GetCPUTime(aToken, &rv);
+        NS_ENSURE_SUCCESS(rv, rv);
+        break;
+      case 23:
+        // Resident Set Size: number of pages the process has
+        // in real memory.
+        uint64_t pageCount = Get64Value(aToken, &rv);
+        NS_ENSURE_SUCCESS(rv, rv);
+        uint64_t pageSize = sysconf(_SC_PAGESIZE);
+        aInfo.residentSetSize = pageCount * pageSize;
+        break;
+    }
+    return rv;
+  }
+
+  // Converts a token into a int64_t
+  uint64_t Get64Value(const nsAString& aToken, nsresult* aRv) {
+    // We can't use aToken.ToInteger64() since it returns a signed 64.
+    // and that can result into an overflow.
+    nsresult rv = NS_OK;
+    uint64_t out = 0;
+    if (sscanf(NS_ConvertUTF16toUTF8(aToken).get(), "%" PRIu64, &out) == 0) {
+      rv = NS_ERROR_FAILURE;
+    }
+    *aRv = rv;
+    return out;
+  }
+
+  // Converts a token into CPU time in nanoseconds.
+  uint64_t GetCPUTime(const nsAString& aToken, nsresult* aRv) {
+    nsresult rv;
+    uint64_t value = Get64Value(aToken, &rv);
+    *aRv = rv;
+    if (NS_FAILED(rv)) {
+      return 0;
+    }
+    if (value) {
+      value = (value * NANOPERSEC) / mTicksPerSec;
+    }
+    return value;
+  }
+
+  base::ProcessId mPid;
+  int32_t mMaxIndex;
+  nsCString mFilepath;
+  ProcInfo mProcInfo;
+
+ private:
+  // Reads the stat file and puts its content in a nsString.
+  nsresult ReadFile(nsAutoString& aFileContent) {
+    RefPtr<nsLocalFile> file = new nsLocalFile(mFilepath);
+    bool exists;
+    nsresult rv = file->Exists(&exists);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (!exists) {
+      return NS_ERROR_FAILURE;
+    }
+    // /proc is a virtual file system and all files are
+    // of size 0, so GetFileSize() and related functions will
+    // return 0 - so the way to read the file is to fill a buffer
+    // of an arbitrary big size and look for the end of line char.
+    FILE* fstat;
+    if (NS_FAILED(file->OpenANSIFileDesc("r", &fstat)) || !fstat) {
+      return NS_ERROR_FAILURE;
+    }
+    char buffer[2048];
+    char* end;
+    char* start = fgets(buffer, 2048, fstat);
+    fclose(fstat);
+    if (start == nullptr) {
+      return NS_ERROR_FAILURE;
+    }
+    // let's find the end
+    end = strchr(buffer, '\n');
+    if (!end) {
+      return NS_ERROR_FAILURE;
+    }
+    aFileContent.AssignASCII(buffer, size_t(end - start));
+    return NS_OK;
+  }
+
+  int64_t mTicksPerSec;
+};
+
+// Threads have the same stat file. The only difference is its path
+// and we're getting less info in the ThreadInfo structure.
+class ThreadInfoReader final : public StatReader {
+ public:
+  ThreadInfoReader(const base::ProcessId aPid, const base::ProcessId aTid)
+      : StatReader(aPid), mTid(aTid) {
+    // Adding the thread path
+    mFilepath.Truncate();
+    mFilepath.AppendPrintf("/proc/%u/task/%u/stat", aPid, mTid);
+    mMaxIndex = 17;
+  }
+
+  nsresult ParseThread(ThreadInfo& aInfo) {
+    ProcInfo info;
+    nsresult rv = StatReader::ParseProc(info);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    aInfo.tid = mTid;
+    // Copying over the data we got from StatReader::ParseProc()
+    aInfo.cpuKernel = info.cpuKernel;
+    aInfo.cpuUser = info.cpuUser;
+    aInfo.name.Assign(info.filename);
+    return NS_OK;
+  }
+
+ private:
+  base::ProcessId mTid;
+};
+
+RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
+  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
+  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIEventTarget> target =
+      do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to get stream transport service");
+    holder->Reject(rv, __func__);
+    return promise;
+  }
+
+  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
+      __func__,
+      [holder = std::move(holder), requests = std::move(aRequests)]() {
+        HashMap<base::ProcessId, ProcInfo> gathered;
+        if (!gathered.reserve(requests.Length())) {
+          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+          return;
+        }
+        for (const auto& request : requests) {
+          // opening the stat file and reading its content
+          StatReader reader(request.pid);
+          ProcInfo info;
+          nsresult rv = reader.ParseProc(info);
+          if (NS_FAILED(rv)) {
+            // Can't read data for this proc.
+            // Probably either a sandboxing issue or a race condition, e.g.
+            // the process has been just been killed. Regardless, skip process.
+            continue;
+          }
+          // Computing the resident unique size is somewhat tricky,
+          // so we use about:memory's implementation. This implementation
+          // reopens `/proc/[pid]`, so there is the risk of an additional
+          // race condition. In that case, the result is `0`.
+          info.residentUniqueSize =
+              nsMemoryReporterManager::ResidentUnique(request.pid);
+
+          // Extra info
+          info.pid = request.pid;
+          info.childId = request.childId;
+          info.type = request.processType;
+          info.origin = request.origin;
+          info.windows = std::move(request.windowInfo);
+
+          // Let's look at the threads
+          nsCString taskPath;
+          taskPath.AppendPrintf("/proc/%u/task", request.pid);
+          DIR* dirHandle = opendir(taskPath.get());
+          if (!dirHandle) {
+            // For some reason, we have no data on the threads for this process.
+            // Most likely reason is that we have just lost a race condition and
+            // the process is dead.
+            // Let's stop here and ignore the entire process.
+            continue;
+          }
+          auto cleanup = mozilla::MakeScopeExit([&] { closedir(dirHandle); });
+
+          // If we can't read some thread info, we ignore that thread.
+          dirent* entry;
+          while ((entry = readdir(dirHandle)) != nullptr) {
+            if (entry->d_name[0] == '.') {
+              continue;
+            }
+            // Threads have a stat file, like processes.
+            nsAutoCString entryName(entry->d_name);
+            int32_t tid = entryName.ToInteger(&rv);
+            if (NS_FAILED(rv)) {
+              continue;
+            }
+            ThreadInfoReader reader(request.pid, tid);
+            ThreadInfo threadInfo;
+            rv = reader.ParseThread(threadInfo);
+            if (NS_FAILED(rv)) {
+              continue;
+            }
+            info.threads.AppendElement(threadInfo);
+          }
+
+          if (!gathered.put(request.pid, std::move(info))) {
+            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+            return;
+          }
+        }
+
+        // ... and we're done!
+        holder->Resolve(std::move(gathered), __func__);
+      });
+
+  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
+  }
+  return promise;
+}
+
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo.mm firefox-85.0+build1/toolkit/components/processtools/ProcInfo.mm
--- firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo.mm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/ProcInfo.mm	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,164 @@
+/* -*- 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/ProcInfo.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
+
+#include "nsMemoryReporterManager.h"
+#include "nsNetCID.h"
+
+#include <cstdio>
+#include <cstring>
+#include <unistd.h>
+
+#include <libproc.h>
+#include <sys/sysctl.h>
+#include <mach/mach.h>
+
+namespace mozilla {
+
+RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
+  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
+  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to get stream transport service");
+    holder->Reject(rv, __func__);
+    return promise;
+  }
+
+  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
+      __func__, [holder = std::move(holder), requests = std::move(aRequests)]() {
+        HashMap<base::ProcessId, ProcInfo> gathered;
+        if (!gathered.reserve(requests.Length())) {
+          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+          return;
+        }
+        for (const auto& request : requests) {
+          ProcInfo info;
+          info.pid = request.pid;
+          info.childId = request.childId;
+          info.type = request.processType;
+          info.origin = std::move(request.origin);
+          info.windows = std::move(request.windowInfo);
+          struct proc_bsdinfo proc;
+          if ((unsigned long)proc_pidinfo(request.pid, PROC_PIDTBSDINFO, 0, &proc,
+                                          PROC_PIDTBSDINFO_SIZE) < PROC_PIDTBSDINFO_SIZE) {
+            // Can't read data for this proc.
+            // Probably either a sandboxing issue or a race condition, e.g.
+            // the process has been just been killed. Regardless, skip process.
+            continue;
+          }
+
+          struct proc_taskinfo pti;
+          if ((unsigned long)proc_pidinfo(request.pid, PROC_PIDTASKINFO, 0, &pti,
+                                          PROC_PIDTASKINFO_SIZE) < PROC_PIDTASKINFO_SIZE) {
+            continue;
+          }
+
+          // copying all the info to the ProcInfo struct
+          info.filename.AssignASCII(proc.pbi_name);
+          info.residentSetSize = pti.pti_resident_size;
+          info.cpuUser = pti.pti_total_user;
+          info.cpuKernel = pti.pti_total_system;
+
+          mach_port_t selectedTask;
+          // If we did not get a task from a child process, we use mach_task_self()
+          if (request.childTask == MACH_PORT_NULL) {
+            selectedTask = mach_task_self();
+          } else {
+            selectedTask = request.childTask;
+          }
+          // Computing the resident unique size is somewhat tricky,
+          // so we use about:memory's implementation. This implementation
+          // uses the `task` so, in theory, should be no additional
+          // race condition. However, in case of error, the result is `0`.
+          info.residentUniqueSize = nsMemoryReporterManager::ResidentUnique(selectedTask);
+
+          // Now getting threads info
+
+          // task_threads() gives us a snapshot of the process threads
+          // but those threads can go away. All the code below makes
+          // the assumption that thread_info() calls may fail, and
+          // these errors will be ignored.
+          thread_act_port_array_t threadList;
+          mach_msg_type_number_t threadCount;
+          kern_return_t kret = task_threads(selectedTask, &threadList, &threadCount);
+          if (kret != KERN_SUCCESS) {
+            // For some reason, we have no data on the threads for this process.
+            // Most likely reason is that we have just lost a race condition and
+            // the process is dead.
+            // Let's stop here and ignore the entire process.
+            continue;
+          }
+
+          // Deallocate the thread list.
+          // Note that this deallocation is entirely undocumented, so the following code is based
+          // on guesswork and random examples found on the web.
+          auto guardThreadCount = MakeScopeExit([&] {
+            if (threadList == nullptr) {
+              return;
+            }
+            // Free each thread to avoid leaks.
+            for (mach_msg_type_number_t i = 0; i < threadCount; i++) {
+              mach_port_deallocate(mach_task_self(), threadList[i]);
+            }
+            vm_deallocate(mach_task_self(), /* address */ (vm_address_t)threadList,
+                          /* size */ sizeof(thread_t) * threadCount);
+          });
+
+          mach_msg_type_number_t count;
+
+          for (mach_msg_type_number_t i = 0; i < threadCount; i++) {
+            // Basic thread info.
+            thread_extended_info_data_t threadInfoData;
+            count = THREAD_EXTENDED_INFO_COUNT;
+            kret = thread_info(threadList[i], THREAD_EXTENDED_INFO, (thread_info_t)&threadInfoData,
+                               &count);
+            if (kret != KERN_SUCCESS) {
+              continue;
+            }
+
+            // Getting the thread id.
+            thread_identifier_info identifierInfo;
+            count = THREAD_IDENTIFIER_INFO_COUNT;
+            kret = thread_info(threadList[i], THREAD_IDENTIFIER_INFO,
+                               (thread_info_t)&identifierInfo, &count);
+            if (kret != KERN_SUCCESS) {
+              continue;
+            }
+
+            // The two system calls were successful, let's add that thread
+            ThreadInfo* thread = info.threads.AppendElement(fallible);
+            if (!thread) {
+              holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+              return;
+            }
+            thread->cpuUser = threadInfoData.pth_user_time;
+            thread->cpuKernel = threadInfoData.pth_system_time;
+            thread->name.AssignASCII(threadInfoData.pth_name);
+            thread->tid = identifierInfo.thread_id;
+          }
+
+          if (!gathered.put(request.pid, std::move(info))) {
+            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+            return;
+          }
+        }
+        // ... and we're done!
+        holder->Resolve(std::move(gathered), __func__);
+      });
+
+  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
+  }
+  return promise;
+}
+
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo_win.cpp firefox-85.0+build1/toolkit/components/processtools/ProcInfo_win.cpp
--- firefox-84.0.2+build1/toolkit/components/processtools/ProcInfo_win.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/ProcInfo_win.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,193 @@
+/* -*- 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/ProcInfo.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
+#include "nsMemoryReporterManager.h"
+#include "nsNetCID.h"
+#include "nsWindowsHelpers.h"
+#include <windows.h>
+#include <psapi.h>
+#include <tlhelp32.h>
+
+typedef HRESULT(WINAPI* GETTHREADDESCRIPTION)(HANDLE hThread,
+                                              PWSTR* threadDescription);
+
+namespace mozilla {
+
+uint64_t ToNanoSeconds(const FILETIME& aFileTime) {
+  // FILETIME values are 100-nanoseconds units, converting
+  ULARGE_INTEGER usec = {{aFileTime.dwLowDateTime, aFileTime.dwHighDateTime}};
+  return usec.QuadPart * 100;
+}
+
+RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
+  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
+  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
+
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIEventTarget> target =
+      do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to get stream transport service");
+    holder->Reject(rv, __func__);
+    return promise;
+  }
+
+  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
+      __func__,
+      [holder = std::move(holder), requests = std::move(aRequests)]() -> void {
+        HashMap<base::ProcessId, ProcInfo> gathered;
+        if (!gathered.reserve(requests.Length())) {
+          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+          return;
+        }
+
+        // ---- Copying data on processes (minus threads).
+
+        for (const auto& request : requests) {
+          nsAutoHandle handle(OpenProcess(
+              PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, request.pid));
+
+          if (!handle) {
+            // Ignore process, it may have died.
+            continue;
+          }
+
+          wchar_t filename[MAX_PATH];
+          if (GetProcessImageFileNameW(handle.get(), filename, MAX_PATH) == 0) {
+            // Ignore process, it may have died.
+            continue;
+          }
+          FILETIME createTime, exitTime, kernelTime, userTime;
+          if (!GetProcessTimes(handle.get(), &createTime, &exitTime,
+                               &kernelTime, &userTime)) {
+            // Ignore process, it may have died.
+            continue;
+          }
+          PROCESS_MEMORY_COUNTERS memoryCounters;
+          if (!GetProcessMemoryInfo(handle.get(),
+                                    (PPROCESS_MEMORY_COUNTERS)&memoryCounters,
+                                    sizeof(memoryCounters))) {
+            // Ignore process, it may have died.
+            continue;
+          }
+
+          // Assumption: values of `pid` are distinct between processes,
+          // regardless of any race condition we might have stumbled upon. Even
+          // if it somehow could happen, in the worst case scenario, we might
+          // end up overwriting one process info and we might end up with too
+          // many threads attached to a process, as the data is not crucial, we
+          // do not need to defend against that (unlikely) scenario.
+          ProcInfo info;
+          info.pid = request.pid;
+          info.childId = request.childId;
+          info.type = request.processType;
+          info.origin = request.origin;
+          info.windows = std::move(request.windowInfo);
+          info.filename.Assign(filename);
+          info.cpuKernel = ToNanoSeconds(kernelTime);
+          info.cpuUser = ToNanoSeconds(userTime);
+          info.residentSetSize = memoryCounters.WorkingSetSize;
+
+          // Computing the resident unique size is somewhat tricky,
+          // so we use about:memory's implementation. This implementation
+          // uses the `HANDLE` so, in theory, should be no additional
+          // race condition. However, in case of error, the result is `0`.
+          info.residentUniqueSize =
+              nsMemoryReporterManager::ResidentUnique(handle.get());
+
+          if (!gathered.put(request.pid, std::move(info))) {
+            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+            return;
+          }
+        }
+
+        // ---- Add thread data to already-copied processes.
+
+        // First, we need to capture a snapshot of all the threads on this
+        // system.
+        nsAutoHandle hThreadSnap(CreateToolhelp32Snapshot(
+            /* dwFlags */ TH32CS_SNAPTHREAD, /* ignored */ 0));
+        if (!hThreadSnap) {
+          holder->Reject(NS_ERROR_UNEXPECTED, __func__);
+          return;
+        }
+
+        // `GetThreadDescription` is available as of Windows 10.
+        // We attempt to import it dynamically, knowing that it
+        // may be `nullptr`.
+        auto getThreadDescription =
+            reinterpret_cast<GETTHREADDESCRIPTION>(::GetProcAddress(
+                ::GetModuleHandleW(L"Kernel32.dll"), "GetThreadDescription"));
+
+        THREADENTRY32 te32;
+        te32.dwSize = sizeof(THREADENTRY32);
+
+        // Now, walk through the threads.
+        for (auto success = Thread32First(hThreadSnap.get(), &te32); success;
+             success = Thread32Next(hThreadSnap.get(), &te32)) {
+          auto processLookup = gathered.lookup(te32.th32OwnerProcessID);
+          if (!processLookup) {
+            // Not one of the processes we're interested in.
+            continue;
+          }
+          ThreadInfo* threadInfo =
+              processLookup->value().threads.AppendElement(fallible);
+          if (!threadInfo) {
+            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
+            return;
+          }
+
+          nsAutoHandle hThread(
+              OpenThread(/* dwDesiredAccess = */ THREAD_QUERY_INFORMATION,
+                         /* bInheritHandle = */ FALSE,
+                         /* dwThreadId = */ te32.th32ThreadID));
+          if (!hThread) {
+            // Cannot open thread. Not sure why, but let's erase this thread
+            // and attempt to find data on other threads.
+            processLookup->value().threads.RemoveLastElement();
+            continue;
+          }
+
+          threadInfo->tid = te32.th32ThreadID;
+
+          // Attempt to get thread times.
+          // If we fail, continue without this piece of information.
+          FILETIME createTime, exitTime, kernelTime, userTime;
+          if (GetThreadTimes(hThread.get(), &createTime, &exitTime, &kernelTime,
+                             &userTime)) {
+            threadInfo->cpuKernel = ToNanoSeconds(kernelTime);
+            threadInfo->cpuUser = ToNanoSeconds(userTime);
+          }
+
+          // Attempt to get thread name.
+          // If we fail, continue without this piece of information.
+          if (getThreadDescription) {
+            PWSTR threadName = nullptr;
+            if (getThreadDescription(hThread.get(), &threadName) &&
+                threadName) {
+              threadInfo->name = threadName;
+            }
+            if (threadName) {
+              LocalFree(threadName);
+            }
+          }
+        }
+
+        // ----- We're ready to return.
+        holder->Resolve(std::move(gathered), __func__);
+      });
+
+  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
+  if (NS_FAILED(rv)) {
+    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
+  }
+
+  return promise;
+}
+
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/browser.ini firefox-85.0+build1/toolkit/components/processtools/tests/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/browser.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/tests/browser/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,9 @@
+[DEFAULT]
+prefs=
+  media.rdd-process.enabled=true
+
+support-files =
+  dummy.html
+
+[browser_test_procinfo.js]
+skip-if = (ccov && os == "linux") # https://bugzilla.mozilla.org/show_bug.cgi?id=1608080
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/browser_test_procinfo.js firefox-85.0+build1/toolkit/components/processtools/tests/browser/browser_test_procinfo.js
--- firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/browser_test_procinfo.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/tests/browser/browser_test_procinfo.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,173 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+"use strict";
+
+const DUMMY_URL =
+  getRootDirectory(gTestPath).replace(
+    "chrome://mochitests/content",
+    "http://example.com"
+  ) + "/dummy.html";
+
+const { AppConstants } = ChromeUtils.import(
+  "resource://gre/modules/AppConstants.jsm"
+);
+const MAC = AppConstants.platform == "macosx";
+const HAS_THREAD_NAMES =
+  AppConstants.platform != "win" ||
+  AppConstants.isPlatformAndVersionAtLeast("win", 10);
+const isFissionEnabled = SpecialPowers.useRemoteSubframes;
+
+const SAMPLE_SIZE = 10;
+
+add_task(async function test_proc_info() {
+  console.log("YORIC", "Test starts");
+  // Open a few `about:home` tabs, they'll end up in `privilegedabout`.
+  let tabsAboutHome = [];
+  for (let i = 0; i < 5; ++i) {
+    let tab = BrowserTestUtils.addTab(gBrowser, "about:home");
+    tabsAboutHome.push(tab);
+    gBrowser.selectedTab = tab;
+    await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  }
+
+  await BrowserTestUtils.withNewTab(
+    { gBrowser, url: DUMMY_URL },
+    async function(browser) {
+      let cpuThreads = 0;
+      let cpuUser = 0;
+
+      // We test `SAMPLE_SIZE` times to increase a tad the chance of encountering race conditions.
+      for (let z = 0; z < SAMPLE_SIZE; z++) {
+        let parentProc = await ChromeUtils.requestProcInfo();
+        cpuUser += parentProc.cpuUser;
+
+        Assert.equal(
+          parentProc.type,
+          "browser",
+          "Parent proc type should be browser"
+        );
+
+        for (var x = 0; x < parentProc.threads.length; x++) {
+          cpuThreads += parentProc.threads[x].cpuUser;
+        }
+
+        // Under Windows, thread names appeared with Windows 10.
+        if (HAS_THREAD_NAMES) {
+          Assert.ok(
+            parentProc.threads.some(thread => thread.name),
+            "At least one of the threads of the parent process is named"
+          );
+        }
+
+        Assert.ok(
+          parentProc.residentUniqueSize > 0,
+          "Resident-unique-size was set"
+        );
+        Assert.ok(
+          parentProc.residentUniqueSize <= parentProc.residentSetSize,
+          `Resident-unique-size should be bounded by resident-set-size ${parentProc.residentUniqueSize} <= ${parentProc.residentSetSize}`
+        );
+
+        // While it's very unlikely that the parent will disappear while we're running
+        // tests, some children can easily vanish. So we go twice through the list of
+        // children. Once to test stuff that all process data respects the invariants
+        // that don't care whether we have a race condition and once to test that at
+        // least one well-known process that should not be able to vanish during
+        // the test respects all the invariants.
+        for (var i = 0; i < parentProc.children.length; i++) {
+          let childProc = parentProc.children[i];
+          Assert.notEqual(
+            childProc.type,
+            "browser",
+            "Child proc type should not be browser"
+          );
+
+          // We set the `childID` for child processes that have a `ContentParent`/`ContentChild`
+          // actor hierarchy.
+          if (childProc.type.startsWith("web")) {
+            Assert.notEqual(
+              childProc.childID,
+              0,
+              "Child proc should have been set"
+            );
+          }
+          Assert.notEqual(
+            childProc.type,
+            "unknown",
+            "Child proc type should be known"
+          );
+          if (childProc.type == "webIsolated") {
+            Assert.notEqual(
+              childProc.origin || "",
+              "",
+              "Child process should have an origin"
+            );
+          }
+
+          for (var y = 0; y < childProc.threads.length; y++) {
+            cpuThreads += childProc.threads[y].cpuUser;
+          }
+          cpuUser += childProc.cpuUser;
+        }
+
+        // We only check other properties on the `privilegedabout` subprocess, which
+        // as of this writing is always active and available.
+        var hasPrivilegedAbout = false;
+        var numberOfAboutTabs = 0;
+        for (i = 0; i < parentProc.children.length; i++) {
+          let childProc = parentProc.children[i];
+          if (childProc.type != "privilegedabout") {
+            continue;
+          }
+          hasPrivilegedAbout = true;
+          Assert.ok(
+            childProc.residentUniqueSize > 0,
+            "Resident-unique-size was set"
+          );
+          Assert.ok(
+            childProc.residentUniqueSize <= childProc.residentSetSize,
+            `Resident-unique-size should be bounded by resident-set-size ${childProc.residentUniqueSize} <= ${childProc.residentSetSize}`
+          );
+
+          for (var win of childProc.windows) {
+            if (win.documentURI.spec != "about:home") {
+              // We're only interested in about:home for this test.
+              continue;
+            }
+            numberOfAboutTabs++;
+            Assert.ok(
+              win.outerWindowId > 0,
+              `ContentParentID should be > 0 ${win.outerWindowId}`
+            );
+            if (win.documentTitle) {
+              // Unfortunately, we sometimes reach this point before the document is fully loaded, so
+              // `win.documentTitle` may still be empty.
+              Assert.equal(win.documentTitle, "New Tab");
+            }
+          }
+          Assert.ok(
+            numberOfAboutTabs >= tabsAboutHome.length,
+            "We have found at least as many about:home tabs as we opened"
+          );
+
+          // Once we have verified the privileged about process, bailout.
+          break;
+        }
+
+        Assert.ok(
+          hasPrivilegedAbout,
+          "We have found the privileged about process"
+        );
+      }
+      // see https://bugzilla.mozilla.org/show_bug.cgi?id=1529023
+      if (!MAC) {
+        Assert.greater(cpuThreads, 0, "Got some cpu time in the threads");
+      }
+      Assert.greater(cpuUser, 0, "Got some cpu time");
+
+      for (let tab of tabsAboutHome) {
+        BrowserTestUtils.removeTab(tab);
+      }
+    }
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/dummy.html firefox-85.0+build1/toolkit/components/processtools/tests/browser/dummy.html
--- firefox-84.0.2+build1/toolkit/components/processtools/tests/browser/dummy.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/processtools/tests/browser/dummy.html	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<head>
+<title>Dummy test page</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"></meta>
+</head>
+<body>
+<p>Dummy test page</p>
+<div id="holder" class="">Holder</div>
+<script>
+  let text = "";
+  for (let i = 0; i < 1000; i++) {
+    text += "more";
+    // eslint-disable-next-line no-unsanitized/property
+    document.getElementById("holder").innerHTML = text;
+  }
+  document.getElementById("holder").classList.add("loaded");
+</script>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/components/reader/test/browser.ini firefox-85.0+build1/toolkit/components/reader/test/browser.ini
--- firefox-84.0.2+build1/toolkit/components/reader/test/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/reader/test/browser.ini	2021-01-18 19:58:26.000000000 +0000
@@ -5,7 +5,6 @@
   readerModeNonArticle.html
   readerModeArticle.html
   readerModeArticleHiddenNodes.html
-skip-if = fission
 [browser_readerMode_cached.js]
 support-files =
   readerModeRandom.sjs
diff -Nru firefox-84.0.2+build1/toolkit/components/remote/nsDBusRemoteServer.cpp firefox-85.0+build1/toolkit/components/remote/nsDBusRemoteServer.cpp
--- firefox-84.0.2+build1/toolkit/components/remote/nsDBusRemoteServer.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remote/nsDBusRemoteServer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -26,7 +26,7 @@
 static const char* introspect_template =
     "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection "
     "1.0//EN\"\n"
-    "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\";>\n"
+    "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
     "<node>\n"
     " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
     "   <method name=\"Introspect\">\n"
diff -Nru firefox-84.0.2+build1/toolkit/components/remote/nsRemoteService.cpp firefox-85.0+build1/toolkit/components/remote/nsRemoteService.cpp
--- firefox-84.0.2+build1/toolkit/components/remote/nsRemoteService.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remote/nsRemoteService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -32,6 +32,7 @@
 #include "mozilla/ModuleUtils.h"
 #include "SpecialSystemDirectory.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
+#include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
 
 // Time to wait for the remoting service to start
diff -Nru firefox-84.0.2+build1/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm firefox-85.0+build1/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
--- firefox-84.0.2+build1/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -14,6 +14,7 @@
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
 
+// This object implements the JS parts of nsIWebNavigation.
 class RemoteWebNavigation {
   constructor(aBrowser) {
     this._browser = aBrowser;
@@ -22,7 +23,6 @@
     this._canGoBack = false;
     this._canGoForward = false;
     this.referringURI = null;
-    this.wrappedJSObject = this;
   }
 
   swapBrowser(aBrowser) {
@@ -179,8 +179,4 @@
   }
 }
 
-RemoteWebNavigation.prototype.QueryInterface = ChromeUtils.generateQI([
-  "nsIWebNavigation",
-]);
-
 var EXPORTED_SYMBOLS = ["RemoteWebNavigation"];
diff -Nru firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js
--- firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js	2021-01-18 19:58:26.000000000 +0000
@@ -140,21 +140,15 @@
   );
 }
 
-async function loadAndGetProcessID(browser, target, expectedProcessSwitch) {
+async function loadAndGetProcessID(browser, target) {
   info(`Performing GET load: ${target}`);
   await performLoad(
     browser,
     {
       maybeErrorPage: true,
     },
-    async () => {
+    () => {
       BrowserTestUtils.loadURI(browser, target);
-      if (expectedProcessSwitch) {
-        await BrowserTestUtils.waitForEvent(
-          gBrowser.getTabForBrowser(browser),
-          "SSTabRestored"
-        );
-      }
     }
   );
 
@@ -187,11 +181,7 @@
 
       info(`firstProcessID: ${firstProcessID}`);
 
-      let secondProcessID = await loadAndGetProcessID(
-        browser,
-        target,
-        expectedProcessSwitch
-      );
+      let secondProcessID = await loadAndGetProcessID(browser, target);
 
       info(`secondProcessID: ${secondProcessID}`);
       Assert.equal(firstProcessID != secondProcessID, expectedProcessSwitch);
@@ -200,11 +190,7 @@
         return;
       }
 
-      let thirdProcessID = await loadAndGetProcessID(
-        browser,
-        add307(target),
-        expectedProcessSwitch
-      );
+      let thirdProcessID = await loadAndGetProcessID(browser, add307(target));
 
       info(`thirdProcessID: ${thirdProcessID}`);
       Assert.equal(firstProcessID != thirdProcessID, expectedProcessSwitch);
diff -Nru firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser.ini firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -9,9 +9,7 @@
   file_postmsg_parent.html
 
 [browser_RemoteWebNavigation.js]
-skip-if = fission
 [browser_documentChannel.js]
-skip-if = fission
 [browser_httpCrossOriginOpenerPolicy.js]
 [browser_httpToFileHistory.js]
 [browser_oopProcessSwap.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js
--- firefox-84.0.2+build1/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/remotebrowserutils/tests/browser/browser_RemoteWebNavigation.js	2021-01-18 19:58:27.000000000 +0000
@@ -91,7 +91,7 @@
     is(history.count, 2, "Should be two history items");
     is(history.index, 1, "Should be at the right place in history");
     let entry = history.getEntryAtIndex(0);
-    is(entry.URI.spec, DUMMY2, "Should have the right history entry");
+    is(entry.URI.spec, DUMMY1, "Should have the right history entry");
     entry = history.getEntryAtIndex(1);
     is(entry.URI.spec, DUMMY2, "Should have the right history entry");
   }
diff -Nru firefox-84.0.2+build1/toolkit/components/reputationservice/ApplicationReputation.cpp firefox-85.0+build1/toolkit/components/reputationservice/ApplicationReputation.cpp
--- firefox-84.0.2+build1/toolkit/components/reputationservice/ApplicationReputation.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/reputationservice/ApplicationReputation.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIChannel.h"
 #include "nsIHttpChannel.h"
 #include "nsIIOService.h"
+#include "nsIObserverService.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIStreamListener.h"
 #include "nsIStringStream.h"
@@ -31,6 +32,7 @@
 #include "mozilla/ErrorNames.h"
 #include "mozilla/LoadContext.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/reputationservice/LoginReputation.cpp firefox-85.0+build1/toolkit/components/reputationservice/LoginReputation.cpp
--- firefox-84.0.2+build1/toolkit/components/reputationservice/LoginReputation.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/reputationservice/LoginReputation.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -10,6 +10,7 @@
 #include "mozilla/Logging.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_browser.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/ContentChild.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/resistfingerprinting/nsRFPService.cpp firefox-85.0+build1/toolkit/components/resistfingerprinting/nsRFPService.cpp
--- firefox-84.0.2+build1/toolkit/components/resistfingerprinting/nsRFPService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/resistfingerprinting/nsRFPService.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,35 +6,71 @@
 #include "nsRFPService.h"
 
 #include <algorithm>
-#include <memory>
-#include <time.h>
-
+#include <cfloat>
+#include <cinttypes>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <new>
+#include <type_traits>
+#include <utility>
+
+#include "MainThreadUtils.h"
+
+#include "mozilla/ArrayIterator.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Atomics.h"
+#include "mozilla/Casting.h"
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/dom/Element.h"
+#include "mozilla/HashFunctions.h"
+#include "mozilla/HelperMacros.h"
+#include "mozilla/Likely.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MacroForEach.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/Services.h"
-#include "mozilla/StaticPtr.h"
+#include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/fallible.h"
 
+#include "nsBaseHashtable.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsCoord.h"
+#include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsError.h"
+#include "nsHashKeys.h"
+#include "nsJSUtils.h"
+#include "nsLiteralString.h"
+#include "nsPrintfCString.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
-#include "nsXULAppAPI.h"
-#include "nsPrintfCString.h"
+#include "nsStringFlags.h"
+#include "nsTArray.h"
+#include "nsTLiteralString.h"
+#include "nsTPromiseFlatString.h"
+#include "nsTStringRepr.h"
+#include "nsXPCOM.h"
 
 #include "nsICryptoHash.h"
+#include "nsIGlobalObject.h"
 #include "nsIObserverService.h"
 #include "nsIRandomGenerator.h"
 #include "nsIXULAppInfo.h"
-#include "nsJSUtils.h"
 
+#include "nscore.h"
 #include "prenv.h"
-#include "nss.h"
+#include "prtime.h"
+#include "xpcpublic.h"
 
 #include "js/Date.h"
 
@@ -68,6 +104,41 @@
     nsRFPService::sSpoofingKeyboardCodes = nullptr;
 static mozilla::StaticMutex sLock;
 
+KeyboardHashKey::KeyboardHashKey(const KeyboardLangs aLang,
+                                 const KeyboardRegions aRegion,
+                                 const KeyNameIndexType aKeyIdx,
+                                 const nsAString& aKey)
+    : mLang(aLang), mRegion(aRegion), mKeyIdx(aKeyIdx), mKey(aKey) {}
+
+KeyboardHashKey::KeyboardHashKey(KeyTypePointer aOther)
+    : mLang(aOther->mLang),
+      mRegion(aOther->mRegion),
+      mKeyIdx(aOther->mKeyIdx),
+      mKey(aOther->mKey) {}
+
+KeyboardHashKey::KeyboardHashKey(KeyboardHashKey&& aOther)
+    : PLDHashEntryHdr(std::move(aOther)),
+      mLang(std::move(aOther.mLang)),
+      mRegion(std::move(aOther.mRegion)),
+      mKeyIdx(std::move(aOther.mKeyIdx)),
+      mKey(std::move(aOther.mKey)) {}
+
+KeyboardHashKey::~KeyboardHashKey() = default;
+
+bool KeyboardHashKey::KeyEquals(KeyTypePointer aOther) const {
+  return mLang == aOther->mLang && mRegion == aOther->mRegion &&
+         mKeyIdx == aOther->mKeyIdx && mKey == aOther->mKey;
+}
+
+KeyboardHashKey::KeyTypePointer KeyboardHashKey::KeyToPointer(KeyType aKey) {
+  return &aKey;
+}
+
+PLDHashNumber KeyboardHashKey::HashKey(KeyTypePointer aKey) {
+  PLDHashNumber hash = mozilla::HashString(aKey->mKey);
+  return mozilla::AddToHash(hash, aKey->mRegion, aKey->mKeyIdx, aKey->mLang);
+}
+
 /* static */
 nsRFPService* nsRFPService::GetOrCreate() {
   if (!sInitialized) {
diff -Nru firefox-84.0.2+build1/toolkit/components/resistfingerprinting/nsRFPService.h firefox-85.0+build1/toolkit/components/resistfingerprinting/nsRFPService.h
--- firefox-84.0.2+build1/toolkit/components/resistfingerprinting/nsRFPService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/resistfingerprinting/nsRFPService.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,14 +6,13 @@
 #ifndef __nsRFPService_h__
 #define __nsRFPService_h__
 
-#include "mozilla/Atomics.h"
-#include "mozilla/EventForwards.h"
-#include "mozilla/Mutex.h"
-#include "mozilla/dom/Document.h"
+#include <cstdint>
+#include "ErrorList.h"
+#include "PLDHashTable.h"
+#include "mozilla/BasicEvents.h"
 #include "nsIObserver.h"
-
-#include "nsDataHashtable.h"
-#include "nsString.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
 
 // Defines regarding spoofed values of Navigator object. These spoofed values
 // are returned when 'privacy.resistFingerprinting' is true.
@@ -59,10 +58,18 @@
 #  define SPOOFED_HTTP_UA_OS "Windows NT 10.0"
 #endif
 
+struct JSContext;
+template <class KeyClass, class DataType>
+class nsDataHashtable;
+
 // Forward declare LRUCache, defined in nsRFPService.cpp
 class LRUCache;
 
 namespace mozilla {
+class WidgetKeyboardEvent;
+namespace dom {
+class Document;
+}
 
 enum KeyboardLang { EN = 0x01 };
 
@@ -96,35 +103,19 @@
   typedef const KeyboardHashKey* KeyTypePointer;
 
   KeyboardHashKey(const KeyboardLangs aLang, const KeyboardRegions aRegion,
-                  const KeyNameIndexType aKeyIdx, const nsAString& aKey)
-      : mLang(aLang), mRegion(aRegion), mKeyIdx(aKeyIdx), mKey(aKey) {}
+                  const KeyNameIndexType aKeyIdx, const nsAString& aKey);
+
+  explicit KeyboardHashKey(KeyTypePointer aOther);
+
+  KeyboardHashKey(KeyboardHashKey&& aOther);
+
+  ~KeyboardHashKey();
+
+  bool KeyEquals(KeyTypePointer aOther) const;
+
+  static KeyTypePointer KeyToPointer(KeyType aKey);
 
-  explicit KeyboardHashKey(KeyTypePointer aOther)
-      : mLang(aOther->mLang),
-        mRegion(aOther->mRegion),
-        mKeyIdx(aOther->mKeyIdx),
-        mKey(aOther->mKey) {}
-
-  KeyboardHashKey(KeyboardHashKey&& aOther)
-      : PLDHashEntryHdr(std::move(aOther)),
-        mLang(std::move(aOther.mLang)),
-        mRegion(std::move(aOther.mRegion)),
-        mKeyIdx(std::move(aOther.mKeyIdx)),
-        mKey(std::move(aOther.mKey)) {}
-
-  ~KeyboardHashKey() = default;
-
-  bool KeyEquals(KeyTypePointer aOther) const {
-    return mLang == aOther->mLang && mRegion == aOther->mRegion &&
-           mKeyIdx == aOther->mKeyIdx && mKey == aOther->mKey;
-  }
-
-  static KeyTypePointer KeyToPointer(KeyType aKey) { return &aKey; }
-
-  static PLDHashNumber HashKey(KeyTypePointer aKey) {
-    PLDHashNumber hash = mozilla::HashString(aKey->mKey);
-    return mozilla::AddToHash(hash, aKey->mRegion, aKey->mKeyIdx, aKey->mLang);
-  }
+  static PLDHashNumber HashKey(KeyTypePointer aKey);
 
   enum { ALLOW_MEMMOVE = true };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/resistfingerprinting/tests/test_reduceprecision.cpp firefox-85.0+build1/toolkit/components/resistfingerprinting/tests/test_reduceprecision.cpp
--- firefox-84.0.2+build1/toolkit/components/resistfingerprinting/tests/test_reduceprecision.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/resistfingerprinting/tests/test_reduceprecision.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "gtest/gtest.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsRFPService.h"
 
diff -Nru firefox-84.0.2+build1/toolkit/components/satchel/nsFormFillController.cpp firefox-85.0+build1/toolkit/components/satchel/nsFormFillController.cpp
--- firefox-84.0.2+build1/toolkit/components/satchel/nsFormFillController.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/satchel/nsFormFillController.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -41,6 +41,7 @@
 #include "nsFocusManager.h"
 #include "nsQueryActor.h"
 #include "nsQueryObject.h"
+#include "nsServiceManagerUtils.h"
 #include "xpcpublic.h"
 
 using namespace mozilla;
diff -Nru firefox-84.0.2+build1/toolkit/components/satchel/nsFormFillController.h firefox-85.0+build1/toolkit/components/satchel/nsFormFillController.h
--- firefox-84.0.2+build1/toolkit/components/satchel/nsFormFillController.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/satchel/nsFormFillController.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef __nsFormFillController__
 #define __nsFormFillController__
 
+#include "mozilla/TimeStamp.h"
 #include "nsIFormFillController.h"
 #include "nsIAutoCompleteInput.h"
 #include "nsIAutoCompleteSearch.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/search/nsISearchService.idl firefox-85.0+build1/toolkit/components/search/nsISearchService.idl
--- firefox-84.0.2+build1/toolkit/components/search/nsISearchService.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/nsISearchService.idl	2021-01-18 19:58:27.000000000 +0000
@@ -340,7 +340,7 @@
    * @returns The corresponding nsISearchEngine object, or null if it doesn't
    *          exist.
    */
-  nsISearchEngine getEngineByAlias(in AString alias);
+  Promise getEngineByAlias(in AString alias);
 
   /**
    * Returns an engine with the specified name.
diff -Nru firefox-84.0.2+build1/toolkit/components/search/SearchService.jsm firefox-85.0+build1/toolkit/components/search/SearchService.jsm
--- firefox-84.0.2+build1/toolkit/components/search/SearchService.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/SearchService.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -813,6 +813,8 @@
         );
       }
     }
+    let settings = await this._settings.get();
+    this._loadEnginesMetadataFromSettings(settings.engines);
 
     // Now set the sort out the default engines and notify as appropriate.
     this._currentEngine = null;
@@ -1032,6 +1034,27 @@
         continue;
       }
 
+      // Some OpenSearch type engines are now obsolete and no longer supported.
+      // These were application provided engines that used to use the OpenSearch
+      // format before gecko transitioned to WebExtensions.
+      // These will sometimes have been missed in migration due to various
+      // reasons, and due to how the settings saves everything. We therefore
+      // explicitly ignore them here to drop them, and let the rest of the code
+      // fallback to the application/distribution default if necessary.
+      let loadPath = engineJSON._loadPath?.toLowerCase();
+      if (
+        loadPath &&
+        // Replaced by application provided in Firefox 79.
+        (loadPath.startsWith("[distribution]") ||
+          // Langpack engines moved in-app in Firefox 62.
+          // Note: these may be prefixed by jar:,
+          loadPath.includes("[app]/extensions/langpack") ||
+          loadPath.includes("[other]/langpack") ||
+          loadPath.includes("[profile]/extensions/langpack"))
+      ) {
+        continue;
+      }
+
       try {
         let engine = new SearchEngine({
           isAppProvided: false,
@@ -1428,8 +1451,8 @@
     return this._engines.get(engineName) || null;
   },
 
-  getEngineByAlias(alias) {
-    this._ensureInitialized();
+  async getEngineByAlias(alias) {
+    await this.init();
     for (var engine of this._engines.values()) {
       if (engine && engine.aliases.includes(alias)) {
         return engine;
diff -Nru firefox-84.0.2+build1/toolkit/components/search/SearchSettings.jsm firefox-85.0+build1/toolkit/components/search/SearchSettings.jsm
--- firefox-84.0.2+build1/toolkit/components/search/SearchSettings.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/SearchSettings.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -69,6 +69,12 @@
    */
   _searchService = null;
 
+  /*
+   * A copy of the settings so we can persist metadata for engines that
+   * are not currently active.
+   */
+  _currentSettings = null;
+
   addObservers() {
     Services.obs.addObserver(this, SearchUtils.TOPIC_ENGINE_MODIFIED);
     Services.obs.addObserver(this, SearchUtils.TOPIC_SEARCH_SERVICE);
@@ -124,6 +130,7 @@
       Services.prefs.clearUserPref(prefName);
     }
 
+    this._currentSettings = json;
     return json;
   }
 
@@ -190,21 +197,27 @@
     }
 
     let settings = {};
-    let locale = Services.locale.requestedLocale;
-    let buildID = Services.appinfo.platformBuildID;
 
     // Allows us to force a settings refresh should the settings format change.
     settings.version = SearchUtils.SETTINGS_VERSION;
-    // We don't want to incur the costs of stat()ing each plugin on every
-    // startup when the only (supported) time they will change is during
-    // app updates (where the buildID is obviously going to change).
-    // Extension-shipped plugins are the only exception to this, but their
-    // directories are blown away during updates, so we'll detect their changes.
-    settings.buildID = buildID;
-    settings.locale = locale;
     settings.engines = [...this._searchService._engines.values()];
     settings.metaData = this._metaData;
 
+    // Persist metadata for AppProvided engines even if they aren't currently
+    // active, this means if they become active again their settings
+    // will be restored.
+    if (this._currentSettings?.engines) {
+      for (let engine of this._currentSettings.engines) {
+        let included = settings.engines.some(e => e._name == engine._name);
+        if (engine._isAppProvided && !included) {
+          settings.engines.push(engine);
+        }
+      }
+    }
+
+    // Update the local copy.
+    this._currentSettings = settings;
+
     try {
       if (!settings.engines.length) {
         throw new Error("cannot write without any engine.");
diff -Nru firefox-84.0.2+build1/toolkit/components/search/SearchSuggestionController.jsm firefox-85.0+build1/toolkit/components/search/SearchSuggestionController.jsm
--- firefox-84.0.2+build1/toolkit/components/search/SearchSuggestionController.jsm	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/SearchSuggestionController.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -716,6 +716,11 @@
 };
 
 /**
+ * The maximum length of a value to be stored in search history.
+ */
+SearchSuggestionController.SEARCH_HISTORY_MAX_VALUE_LENGTH = 255;
+
+/**
  * The maximum time (ms) to wait before giving up on a remote suggestions.
  */
 XPCOMUtils.defineLazyPreferenceGetter(
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/engine-override.xml firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/engine-override.xml
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/engine-override.xml	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/engine-override.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>basic</ShortName>
-<Description>override</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Url type="text/html" method="GET" template="http://searchtest.local">
-  <Param name="search" value="{searchTerms}"/>
-</Url>
-</SearchPlugin>
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-distribution.json firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-distribution.json
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-distribution.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-distribution.json	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,43 @@
+{
+  "version": 1,
+  "buildID": "20121106",
+  "locale": "en-US",
+  "metaData": {},
+  "engines": [
+    {
+      "_name": "engine1",
+      "_metaData": {
+        "alias": "testAlias"
+      },
+      "_isAppProvided": true
+    },
+    {
+      "_name": "engine2",
+      "_metaData": {
+        "alias": null,
+        "hidden": true
+      },
+      "_isAppProvided": true
+    },
+    {
+      "_name": "Distribution",
+      "_shortName": "distribution",
+      "_loadPath": "[distribution]/searchplugins/common/distribution.xml",
+      "description": "Distribution Search",
+      "__searchForm": null,
+      "_metaData": {},
+      "_urls": [
+        {
+          "template": "https://example.com/search",
+          "rels": [
+            "searchform"
+          ],
+          "resultDomain": "example.com",
+          "params": []
+        }
+      ],
+      "queryCharset": "UTF-8",
+      "_readOnly": false
+    }
+  ]
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-langpack.json firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-langpack.json
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-langpack.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/data/search-obsolete-langpack.json	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,99 @@
+{
+  "version": 1,
+  "buildID": "20121106",
+  "locale": "en-US",
+  "metaData": {},
+  "engines": [
+    {
+      "_name": "engine1",
+      "_metaData": {
+        "alias": "testAlias"
+      },
+      "_isAppProvided": true
+    },
+    {
+      "_name": "engine2",
+      "_metaData": {
+        "alias": null,
+        "hidden": true
+      },
+      "_isAppProvided": true
+    },
+    {
+      "_name": "Langpack",
+      "_shortName": "langpack-ru",
+      "_loadPath": "jar:[app]/extensions/langpack-ru@firefox.mozilla.org.xpi!browser/langpack.xml",
+      "description": "Langpack search",
+      "__searchForm": null,
+      "_metaData": {},
+      "_urls": [
+        {
+          "template": "https://example.com/search",
+          "rels": [
+            "searchform"
+          ],
+          "resultDomain": "example.com",
+          "params": []
+        }
+      ],
+      "queryCharset": "UTF-8"
+    },
+    {
+      "_name": "Langpack1",
+      "_shortName": "langpack1-ru",
+      "_loadPath": "[app]/extensions/langpack-ru@firefox.mozilla.org.xpi!browser/langpack1.xml",
+      "description": "Langpack1 search",
+      "__searchForm": null,
+      "_metaData": {},
+      "_urls": [
+        {
+          "template": "https://example1.com/search",
+          "rels": [
+            "searchform"
+          ],
+          "resultDomain": "example1.com",
+          "params": []
+        }
+      ],
+      "queryCharset": "UTF-8"
+    },
+    {
+      "_name": "Langpack2",
+      "_shortName": "langpack2-ru",
+      "_loadPath": "jar:[profile]/extensions/langpack-ru@firefox.mozilla.org.xpi!browser/langpack2.xml",
+      "description": "Langpack2 search",
+      "__searchForm": null,
+      "_metaData": {},
+      "_urls": [
+        {
+          "template": "https://example2.com/search",
+          "rels": [
+            "searchform"
+          ],
+          "resultDomain": "example2.com",
+          "params": []
+        }
+      ],
+      "queryCharset": "UTF-8"
+    },
+    {
+      "_name": "Langpack3",
+      "_shortName": "langpack3-ru",
+      "_loadPath": "jar:[other]/langpack-ru@firefox.mozilla.org.xpi!browser/langpack3.xml",
+      "description": "Langpack3 search",
+      "__searchForm": null,
+      "_metaData": {},
+      "_urls": [
+        {
+          "template": "https://example3.com/search",
+          "rels": [
+            "searchform"
+          ],
+          "resultDomain": "example3.com",
+          "params": []
+        }
+      ],
+      "queryCharset": "UTF-8"
+    }
+  ]
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js	2021-01-18 19:58:27.000000000 +0000
@@ -486,19 +486,11 @@
 
     let submission = engine.getSubmission("test", URLTYPE_SEARCH_HTML);
 
-    if (this._config.searchUrlBase) {
-      this.assertEqual(
-        submission.uri.prePath + submission.uri.filePath,
-        this._config.searchUrlBase + rules.searchUrlEnd,
-        `Should have the correct domain for type: ${URLTYPE_SEARCH_HTML} ${location}.`
-      );
-    } else {
-      this.assertOk(
-        submission.uri.host.endsWith(rules.domain),
-        `Should have the correct domain for type: ${URLTYPE_SEARCH_HTML} ${location}.
-         Got "${submission.uri.host}", expected to end with "${rules.domain}".`
-      );
-    }
+    this.assertOk(
+      submission.uri.host.endsWith(rules.domain),
+      `Should have the correct domain for type: ${URLTYPE_SEARCH_HTML} ${location}.
+       Got "${submission.uri.host}", expected to end with "${rules.domain}".`
+    );
 
     submission = engine.getSubmission("test", URLTYPE_SUGGEST_JSON);
     if (this._config.noSuggestionsURL || rules.noSuggestionsURL) {
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/searchconfigs/test_ebay.js	2021-01-18 19:58:27.000000000 +0000
@@ -68,7 +68,6 @@
       },
     ],
   },
-  searchUrlBase: "https://rover.ebay.com/rover/1/",
   suggestionUrlBase: "https://autosug.ebay.com/autosug",
   details: [
     {
@@ -85,7 +84,7 @@
           },
         },
       ],
-      searchUrlEnd: "1553-53471-19255-0/1",
+      searchUrlCode: "mkrid=1553-53471-19255-0",
       suggestUrlCode: "sId=23",
     },
     {
@@ -97,7 +96,7 @@
           locales: { matches: ["de", "dsb", "hsb"] },
         },
       ],
-      searchUrlEnd: "5221-53469-19255-0/1",
+      searchUrlCode: "mkrid=5221-53469-19255-0",
       suggestUrlCode: "sId=16",
     },
     {
@@ -126,7 +125,7 @@
           },
         },
       ],
-      searchUrlEnd: "706-53473-19255-0/1",
+      searchUrlCode: "mkrid=706-53473-19255-0",
       suggestUrlCode: "sId=2",
     },
     {
@@ -154,7 +153,7 @@
           },
         },
       ],
-      searchUrlEnd: "5222-53480-19255-0/1",
+      searchUrlCode: "mkrid=5222-53480-19255-0",
       suggestUrlCode: "sId=193",
     },
     {
@@ -166,7 +165,7 @@
         },
       ],
       excluded: [{ regions: ["au", "be", "ca", "ch", "gb", "ie", "nl"] }],
-      searchUrlEnd: "711-53200-19255-0/1",
+      searchUrlCode: "mkrid=711-53200-19255-0",
       suggestUrlCode: "sId=0",
     },
     {
@@ -178,7 +177,7 @@
           locales: { matches: ["cy", "unknown", "en-GB", "en-US", "gd"] },
         },
       ],
-      searchUrlEnd: "705-53470-19255-0/1",
+      searchUrlCode: "mkrid=705-53470-19255-0",
       suggestUrlCode: "sId=15",
     },
     {
@@ -193,7 +192,7 @@
           locales: { matches: ["cy", "unknown", "en-GB", "en-US", "gd"] },
         },
       ],
-      searchUrlEnd: "5282-53468-19255-0/1",
+      searchUrlCode: "mkrid=5282-53468-19255-0",
       suggestUrlCode: "sId=205",
     },
     {
@@ -209,7 +208,7 @@
         },
       ],
       excluded: [{ regions: ["au", "ie"] }],
-      searchUrlEnd: "710-53481-19255-0/1",
+      searchUrlCode: "mkrid=710-53481-19255-0",
       suggestUrlCode: "sId=3",
     },
     {
@@ -221,7 +220,7 @@
         },
       ],
       excluded: [{ regions: ["at", "ch"] }],
-      searchUrlEnd: "707-53477-19255-0/1",
+      searchUrlCode: "mkrid=707-53477-19255-0",
       suggestUrlCode: "sId=77",
     },
     {
@@ -234,7 +233,7 @@
           },
         },
       ],
-      searchUrlEnd: "1185-53479-19255-0/1",
+      searchUrlCode: "mkrid=1185-53479-19255-0",
       suggestUrlCode: "sId=186",
     },
     {
@@ -246,7 +245,7 @@
         },
       ],
       excluded: [{ regions: ["be", "ca", "ch"] }],
-      searchUrlEnd: "709-53476-19255-0/1",
+      searchUrlCode: "mkrid=709-53476-19255-0",
       suggestUrlCode: "sId=71",
     },
     {
@@ -257,7 +256,7 @@
           locales: { matches: DOMAIN_LOCALES["ebay-it"] },
         },
       ],
-      searchUrlEnd: "724-53478-19255-0/1",
+      searchUrlCode: "mkrid=724-53478-19255-0",
       suggestUrlCode: "sId=101",
     },
     {
@@ -273,7 +272,7 @@
         },
       ],
       excluded: [{ regions: ["be"] }],
-      searchUrlEnd: "1346-53482-19255-0/1",
+      searchUrlCode: "mkrid=1346-53482-19255-0",
       suggestUrlCode: "sId=146",
     },
   ],
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_engine_alias.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_engine_alias.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_engine_alias.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_engine_alias.js	2021-01-18 19:58:27.000000000 +0000
@@ -21,7 +21,7 @@
   await extension.awaitStartup();
   await settingsFileWritten;
 
-  let engine = Services.search.getEngineByAlias("testalias");
+  let engine = await Services.search.getEngineByAlias("testalias");
   Assert.equal(engine?.name, NAME, "Engine can be fetched by alias");
 
   // Restart the search service but not the AddonManager, we will
@@ -29,7 +29,7 @@
   Services.search.wrappedJSObject.reset();
   await Services.search.init();
 
-  engine = Services.search.getEngineByAlias("testalias");
+  engine = await Services.search.getEngineByAlias("testalias");
   Assert.equal(engine?.name, NAME, "Engine can be fetched by alias");
 
   await extension.unload();
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_engine_multiple_alias.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_engine_multiple_alias.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_engine_multiple_alias.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_engine_multiple_alias.js	2021-01-18 19:58:27.000000000 +0000
@@ -19,9 +19,9 @@
   await extension.awaitStartup();
   await settingsFileWritten;
 
-  let engine = Services.search.getEngineByAlias("test");
+  let engine = await Services.search.getEngineByAlias("test");
   Assert.equal(engine?.name, NAME, "Can be fetched by either alias");
-  engine = Services.search.getEngineByAlias("alias");
+  engine = await Services.search.getEngineByAlias("alias");
   Assert.equal(engine?.name, NAME, "Can be fetched by either alias");
 
   await extension.unload();
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_reload_engines.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_reload_engines.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_reload_engines.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_reload_engines.js	2021-01-18 19:58:27.000000000 +0000
@@ -143,6 +143,10 @@
   };
 }
 
+async function visibleEngines() {
+  return (await Services.search.getVisibleEngines()).map(e => e.identifier);
+}
+
 add_task(async function setup() {
   Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
   Services.prefs.setBoolPref(
@@ -298,3 +302,39 @@
     "Should not have set the useSavedOrder preference"
   );
 });
+
+add_task(async function test_user_settings_persist() {
+  let reload = SearchTestUtils.promiseSearchNotification("engines-reloaded");
+  Region._setHomeRegion("");
+  await reload;
+
+  Assert.ok(
+    (await visibleEngines()).includes("engine-rel-searchform-purpose"),
+    "Rel Searchform engine should be included by default"
+  );
+
+  let settingsFileWritten = promiseAfterSettings();
+  let engine = await Services.search.getEngineByName(
+    "engine-rel-searchform-purpose"
+  );
+  await Services.search.removeEngine(engine);
+  await settingsFileWritten;
+
+  Assert.ok(
+    !(await visibleEngines()).includes("engine-rel-searchform-purpose"),
+    "Rel Searchform engine has been removed"
+  );
+
+  reload = SearchTestUtils.promiseSearchNotification("engines-reloaded");
+  Region._setHomeRegion("FR");
+  await reload;
+
+  reload = SearchTestUtils.promiseSearchNotification("engines-reloaded");
+  Region._setHomeRegion("");
+  await reload;
+
+  Assert.ok(
+    !(await visibleEngines()).includes("engine-rel-searchform-purpose"),
+    "Rel Searchform removal should be remembered"
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_remove_profile_engine.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_remove_profile_engine.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_remove_profile_engine.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_remove_profile_engine.js	2021-01-18 19:58:27.000000000 +0000
@@ -16,7 +16,7 @@
   if (!dir.exists()) {
     dir.create(dir.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
   }
-  do_get_file("data/engine-override.xml").copyTo(dir, "test-search-engine.xml");
+  do_get_file("data/engine.xml").copyTo(dir, "test-search-engine.xml");
 
   let file = dir.clone();
   file.append("test-search-engine.xml");
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings.js	2021-01-18 19:58:27.000000000 +0000
@@ -30,7 +30,6 @@
 
 async function loadSettingsFile(settingsFile, setVersion) {
   settingsTemplate = await readJSONFile(do_get_file(settingsFile));
-  settingsTemplate.buildID = getAppInfo().platformBuildID;
   if (setVersion) {
     settingsTemplate.version = SearchUtils.SETTINGS_VERSION;
   }
@@ -162,6 +161,10 @@
   info("Check search.json.mozlz4");
   let settingsData = await promiseSettingsData();
 
+  // Remove buildID and locale, as they are no longer used.
+  delete settingsTemplate.buildID;
+  delete settingsTemplate.locale;
+
   for (let engine of settingsTemplate.engines) {
     // Remove _shortName from the settings template, as it is no longer supported,
     // but older settings used to have it, so we keep it in the template as an
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings_obsolete.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings_obsolete.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings_obsolete.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings_obsolete.js	2021-01-18 19:58:26.000000000 +0000
@@ -0,0 +1,83 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * Test removing obsolete engine types on upgrade of settings.
+ */
+
+"use strict";
+
+const { getAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
+
+async function loadSettingsFile(settingsFile, name) {
+  let settings = await readJSONFile(do_get_file(settingsFile));
+
+  settings.metaData.current = name;
+  settings.metaData.hash = SearchUtils.getVerificationHash(name);
+
+  await promiseSaveSettingsData(settings);
+}
+
+/**
+ * Start the search service and confirm the engine properties match the expected values.
+ *
+ * @param {string} settingsFile
+ *   The path to the settings file to use.
+ * @param {string} engineName
+ *   The engine name that should be default and is being removed.
+ */
+async function checkLoadSettingProperties(settingsFile, engineName) {
+  await loadSettingsFile(settingsFile, engineName);
+
+  const settingsFileWritten = promiseAfterSettings();
+  let ss = new SearchService();
+  let result = await ss.init();
+
+  Assert.ok(
+    Components.isSuccessCode(result),
+    "Should have successfully initialized the search service"
+  );
+
+  await settingsFileWritten;
+
+  let engines = await ss.getEngines();
+
+  Assert.deepEqual(
+    engines.map(e => e.name),
+    ["engine1", "engine2"],
+    "Should have only loaded the app-provided engines"
+  );
+
+  Assert.equal(
+    (await Services.search.getDefault()).name,
+    "engine1",
+    "Should have used the configured default engine"
+  );
+
+  removeSettingsFile();
+  ss._removeObservers();
+}
+
+/**
+ * Test reading from search.json.mozlz4
+ */
+add_task(async function setup() {
+  await SearchTestUtils.useTestEngines("data1");
+  await AddonTestUtils.promiseStartupManager();
+});
+
+add_task(async function test_obsolete_distribution_engine() {
+  await checkLoadSettingProperties(
+    "data/search-obsolete-distribution.json",
+    "Distribution"
+  );
+});
+
+add_task(async function test_obsolete_langpack_engine() {
+  await checkLoadSettingProperties(
+    "data/search-obsolete-langpack.json",
+    "Langpack"
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings_persist.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings_persist.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_settings_persist.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_settings_persist.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,89 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+SearchTestUtils.initXPCShellAddonManager(this, "system");
+
+const CONFIG_DEFAULT = [
+  {
+    webExtension: { id: "plainengine@search.mozilla.org" },
+    appliesTo: [{ included: { everywhere: true } }],
+  },
+  {
+    webExtension: { id: "special-engine@search.mozilla.org" },
+    appliesTo: [{ included: { everywhere: true } }],
+  },
+];
+
+const CONFIG_UPDATED = [
+  {
+    webExtension: { id: "plainengine@search.mozilla.org" },
+    appliesTo: [{ included: { everywhere: true } }],
+  },
+];
+
+async function startup() {
+  let settingsFileWritten = promiseAfterSettings();
+  let ss = new SearchService();
+  await AddonTestUtils.promiseRestartManager();
+  await ss.init(false);
+  await settingsFileWritten;
+  return ss;
+}
+
+async function updateConfig(config) {
+  const settings = await RemoteSettings(SearchUtils.SETTINGS_KEY);
+  settings.get.restore();
+  sinon.stub(settings, "get").returns(config);
+}
+
+async function visibleEngines(ss) {
+  return (await ss.getVisibleEngines()).map(e => e._name);
+}
+
+add_task(async function setup() {
+  await SearchTestUtils.useTestEngines("test-extensions", null, CONFIG_DEFAULT);
+  registerCleanupFunction(AddonTestUtils.promiseShutdownManager);
+  await AddonTestUtils.promiseStartupManager();
+  // This is only needed as otherwise events will not be properly notified
+  // due to https://searchfox.org/mozilla-central/source/toolkit/components/search/SearchUtils.jsm#186
+  await Services.search.init(false);
+  Services.search.wrappedJSObject._removeObservers();
+});
+
+add_task(async function() {
+  let ss = await startup();
+  Assert.ok(
+    (await visibleEngines(ss)).includes("Special"),
+    "Should have both engines on first startup"
+  );
+
+  let settingsFileWritten = promiseAfterSettings();
+  let engine = await ss.getEngineByName("Special");
+  await ss.removeEngine(engine);
+  await settingsFileWritten;
+
+  Assert.ok(
+    !(await visibleEngines(ss)).includes("Special"),
+    "Special has been remove, only Plain should remain"
+  );
+
+  ss._removeObservers();
+  updateConfig(CONFIG_UPDATED);
+  ss = await startup();
+
+  Assert.ok(
+    !(await visibleEngines(ss)).includes("Special"),
+    "Updated to new configuration that doesnt have Special"
+  );
+
+  ss._removeObservers();
+  updateConfig(CONFIG_DEFAULT);
+  ss = await startup();
+
+  Assert.ok(
+    !(await visibleEngines(ss)).includes("Special"),
+    "Configuration now includes Special but we should remember its removal"
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_webextensions_upgrade.js firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_webextensions_upgrade.js
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/test_webextensions_upgrade.js	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/test_webextensions_upgrade.js	2021-01-18 19:58:27.000000000 +0000
@@ -44,11 +44,11 @@
   await extension.startup();
   await AddonTestUtils.waitForSearchProviderStartup(extension);
 
-  let engine = Services.search.getEngineByAlias("foo");
+  let engine = await Services.search.getEngineByAlias("foo");
   Assert.ok(engine, "Can fetch engine with alias");
   engine.alias = "testing";
 
-  engine = Services.search.getEngineByAlias("testing");
+  engine = await Services.search.getEngineByAlias("testing");
   Assert.ok(engine, "Can fetch engine by alias");
   let params = engine.getSubmission("test").uri.query.split("&");
   Assert.ok(params.includes("version=1.0"), "Correct version installed");
@@ -62,7 +62,7 @@
   await AddonTestUtils.waitForSearchProviderStartup(extension);
   await promiseChanged;
 
-  engine = Services.search.getEngineByAlias("testing");
+  engine = await Services.search.getEngineByAlias("testing");
   Assert.ok(engine, "Engine still has alias set");
 
   params = engine.getSubmission("test").uri.query.split("&");
diff -Nru firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/xpcshell.ini firefox-85.0+build1/toolkit/components/search/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/search/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/search/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:26.000000000 +0000
@@ -10,7 +10,6 @@
   data/engine/manifest.json
   data/engine2.xml
   data/engine2/manifest.json
-  data/engine-override.xml
   data/engine-app/manifest.json
   data/engine-fr.xml
   data/engine-fr/manifest.json
@@ -33,11 +32,16 @@
   data/engines.json
   data/search.json
   data/search-legacy.json
+  data/search-obsolete-distribution.json
+  data/search-obsolete-langpack.json
   data/searchSuggestions.sjs
   data/geolookup-extensions/multilocale/favicon.ico
   data/geolookup-extensions/multilocale/manifest.json
   data/geolookup-extensions/multilocale/_locales/af/messages.json
   data/geolookup-extensions/multilocale/_locales/an/messages.json
+  data1/engine1/manifest.json
+  data1/engine2/manifest.json
+  data1/engines.json
   simple-engines/engines.json
   simple-engines/basic/manifest.json
   simple-engines/hidden/manifest.json
@@ -87,10 +91,6 @@
 [test_initialization.js]
 [test_list_json_locale.js]
 [test_list_json_no_private_default.js]
-support-files =
-  data1/engine1/manifest.json
-  data1/engine2/manifest.json
-  data1/engines.json
 [test_list_json_searchdefault.js]
 [test_list_json_searchorder.js]
 [test_maybereloadengine_order.js]
@@ -138,11 +138,9 @@
 [test_settings_ignorelist.js]
 support-files = data/search_ignorelist.json
 [test_settings_none.js]
+[test_settings_obsolete.js]
+[test_settings_persist.js]
 [test_settings.js]
-support-files =
-  data1/engine1/manifest.json
-  data1/engine2/manifest.json
-  data1/engines.json
 [test_sort_orders-no-hints.js]
 [test_sort_orders.js]
 [test_validate_engines.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreListener.cpp firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreListener.cpp
--- firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreListener.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreListener.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/dom/SessionStoreUtilsBinding.h"
 #include "mozilla/dom/StorageEvent.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/StaticPrefs_browser.h"
 #include "nsGenericHTMLElement.h"
 #include "nsDocShell.h"
 #include "nsIAppWindow.h"
@@ -16,6 +17,7 @@
 #include "nsIDocShellTreeOwner.h"
 #include "nsImportModule.h"
 #include "nsIPrefBranch.h"
+#include "nsIPrefService.h"
 #include "nsITimer.h"
 #include "nsIWebProgress.h"
 #include "nsIXPConnect.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreUtils.cpp firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreUtils.cpp
--- firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreUtils.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreUtils.cpp	2021-01-18 19:58:26.000000000 +0000
@@ -6,6 +6,7 @@
 #include "js/JSON.h"
 #include "jsapi.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/dom/AutocompleteInfoBinding.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/HTMLInputElement.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreUtils.h firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreUtils.h
--- firefox-84.0.2+build1/toolkit/components/sessionstore/SessionStoreUtils.h	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/sessionstore/SessionStoreUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,7 +8,6 @@
 #define mozilla_dom_SessionStoreUtils_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/SessionStoreUtilsBinding.h"
 #include "SessionStoreData.h"
@@ -17,6 +16,8 @@
 class nsGlobalWindowInner;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class GlobalObject;
diff -Nru firefox-84.0.2+build1/toolkit/components/startup/nsAppStartup.cpp firefox-85.0+build1/toolkit/components/startup/nsAppStartup.cpp
--- firefox-84.0.2+build1/toolkit/components/startup/nsAppStartup.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/startup/nsAppStartup.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -28,6 +28,7 @@
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/Unused.h"
 
+#include "GeckoProfiler.h"
 #include "prprf.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsWidgetsCID.h"
@@ -275,7 +276,7 @@
   // regardless of whether the event loop has spun or not. Note that this call
   // is a no-op if Quit has already been called previously.
   bool userAllowedQuit = true;
-  Quit(eForceQuit, &userAllowedQuit);
+  Quit(eForceQuit, 0, &userAllowedQuit);
 
   nsresult retval = NS_OK;
   if (mozilla::AppShutdown::IsRestarting()) {
@@ -286,7 +287,7 @@
 }
 
 NS_IMETHODIMP
-nsAppStartup::Quit(uint32_t aMode, bool* aUserAllowedQuit) {
+nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
   uint32_t ferocity = (aMode & 0xF);
 
   // If the shutdown was cancelled due to a hidden window or
@@ -371,7 +372,7 @@
     auto shutdownMode = ((aMode & eRestart) != 0)
                             ? mozilla::AppShutdownMode::Restart
                             : mozilla::AppShutdownMode::Normal;
-    mozilla::AppShutdown::Init(shutdownMode);
+    mozilla::AppShutdown::Init(shutdownMode, aExitCode);
 
     if (mozilla::AppShutdown::IsRestarting()) {
       // Mark the next startup as a restart.
@@ -506,7 +507,12 @@
 
   if (mRunning) {
     bool userAllowedQuit = false;
-    Quit(eConsiderQuit, &userAllowedQuit);
+
+    // A previous call to Quit may have told all windows to close and then
+    // bailed out waiting for that to happen. This is how we get back into Quit
+    // after each window closes so the exit process can continue when ready.
+    // Make sure to pass along the exit code that was initially passed to Quit.
+    Quit(eConsiderQuit, mozilla::AppShutdown::GetExitCode(), &userAllowedQuit);
   }
 
   return NS_OK;
@@ -952,7 +958,7 @@
 nsAppStartup::RestartInSafeMode(uint32_t aQuitMode) {
   PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");
   bool userAllowedQuit = false;
-  this->Quit(aQuitMode | nsIAppStartup::eRestart, &userAllowedQuit);
+  this->Quit(aQuitMode | nsIAppStartup::eRestart, 0, &userAllowedQuit);
 
   return NS_OK;
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/startup/public/nsIAppStartup.idl firefox-85.0+build1/toolkit/components/startup/public/nsIAppStartup.idl
--- firefox-84.0.2+build1/toolkit/components/startup/public/nsIAppStartup.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/startup/public/nsIAppStartup.idl	2021-01-18 19:58:26.000000000 +0000
@@ -123,12 +123,17 @@
      * @param aMode
      *        This parameter modifies how the app is shutdown, and it is
      *        constructed from the constants defined above.
+     * @param aExitCode
+     *        The exit code to return from the process. The precise code
+     *        returned by the process may vary depending on the platform. Only
+     *        values 0-255 should generallt be used. If not specified an exit
+     *        code of 0 will be used.
      *
      * @return false if the shutdown was cancelled due to the presence
      *         of a hidden window or if the user disallowed a window
      *         to be closed.
      */
-    bool quit(in uint32_t aMode);
+    bool quit(in uint32_t aMode, [optional] in int32_t aExitCode);
 
     /**
      * True if the application is in the process of shutting down.
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/components.conf firefox-85.0+build1/toolkit/components/taskscheduler/components.conf
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/components.conf	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/components.conf	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,18 @@
+# -*- 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/.
+
+Classes = []
+
+if buildconfig.substs['OS_TARGET'] == 'WINNT':
+    Classes += [
+        {
+            'cid': '{e2113dfc-8efe-43a1-8a20-ad720dd771d6}',
+            'contract_ids': ['@mozilla.org/win-task-scheduler-service;1'],
+            'type': 'nsWinTaskSchedulerService',
+            'headers': ['nsWinTaskScheduler.h'],
+            'processes': ProcessSelector.MAIN_PROCESS_ONLY,
+        },
+    ]
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/moz.build firefox-85.0+build1/toolkit/components/taskscheduler/moz.build
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,26 @@
+# -*- 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 Files("**"):
+    BUG_COMPONENT = ("Toolkit", "Application Update")
+
+XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"]
+
+XPIDL_MODULE = "taskscheduler"
+XPCOM_MANIFESTS += ["components.conf"]
+
+EXTRA_JS_MODULES += ["TaskScheduler.jsm"]
+
+# This whole component is currently Windows-only, but a Mac implementation is planned.
+# Only the Windows C++ interface is an XPCOM component.
+if CONFIG["OS_TARGET"] == "WINNT":
+    EXTRA_JS_MODULES += ["TaskSchedulerWinImpl.jsm"]
+    XPIDL_SOURCES += ["nsIWinTaskSchedulerService.idl"]
+    EXPORTS += ["nsWinTaskScheduler.h"]
+    SOURCES += ["nsWinTaskScheduler.cpp"]
+    OS_LIBS += ["taskschd"]
+
+FINAL_LIBRARY = "xul"
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl firefox-85.0+build1/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISupports.idl"
+
+/**
+ * An interface for Windows Task Scheduler 2.0.
+ * Documentation for the underlying APIs can be found at
+ * https://docs.microsoft.com/en-us/windows/win32/taskschd/task-scheduler-start-page
+ */
+[scriptable, main_process_scriptable_only, uuid(a8d36901-0b6a-46c3-a214-a9e1d5d6047a)]
+interface nsIWinTaskSchedulerService : nsISupports
+{
+  /**
+   * Register (create) a task from an XML definition.
+   * The task will be created so that it only runs as the current user
+   * (TASK_LOGON_INTERACTIVE_TOKEN).
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the folder does not exist.
+   * @throws NS_ERROR_FILE_ALREADY_EXISTS if the task already existed and aUpdateExisting is false.
+   *
+   * @param aFolderName     Full name of the folder in which to create the task, starting with "\".
+   *
+   * @param aTaskName       Name of the task.
+   *
+   * @param aDefinitionXML  XML definition of the task. This is passed directly to Task Scheduler,
+   *                        see the schema at
+   *                        https://docs.microsoft.com/en-us/windows/win32/taskschd/task-scheduler-schema
+   *
+   * @param aUpdateExisting Whether to update an existing task with the same name, default false.
+   */
+  void registerTask(in wstring aFolderName,
+                    in wstring aTaskName,
+                    in wstring aDefinitionXML,
+                    [optional] in boolean aUpdateExisting);
+
+  /**
+   * Validate the XML task definition with Task Scheduler without creating a task, for testing.
+   * Doesn't throw if only the final ITaskFolder::RegisterTask() fails.
+   *
+   * @param aDefinitionXML      Definition to validate.
+   * @return                    HRESULT from ITaskFolder::RegisterTask()
+   *                            Success should be S_OK (0). XML validation failure could be one of
+   *                            SCHED_E_UNEXPECTED_NODE, SCHED_E_NAMESPACE, SCHED_E_INVALIDVALUE,
+   *                            SCHED_E_MISSINGNODE, SCHED_E_MALFORMEDXML, but there may be others.
+   */
+  long validateTaskDefinition(in wstring aDefinitionXML);
+
+  /**
+   * Get the registration information for a task.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the folder or task do not exist.
+   *
+   * @param aFolderName     Full name of the folder containing the task, starting with "\".
+   * @param aTaskName       Name of the task to read.
+   * @return                Registration information for the task, as XML text.
+   */
+  AString getTaskXML(in wstring aFolderName, in wstring aTaskName);
+
+  /**
+   * Delete a task.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the folder or task do not exist.
+   *
+   * @param aFolderName     Full name of the folder containing the task, starting with "\".
+   * @param aTaskName       Name of the task to delete.
+   */
+  void deleteTask(in wstring aFolderName, in wstring aTaskName);
+
+  /**
+   * List the names of all tasks in a task folder.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the folder doesn't exist.
+   *
+   * @param aFolderName     The full name of the task folder to enumerate, starting with "\".
+   *
+   * @return                An array with the names of the tasks found.
+   */
+  Array<AString> getFolderTasks(in wstring aFolderName);
+
+  /**
+   * Create a new task subfolder under a given parent folder.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the parent folder does not exist.
+   * @throws NS_ERROR_FILE_ALREADY_EXISTS if the subfolder already exists.
+   *
+   * @param aParentFolderName       Immediate parent for the new folder, starting with "\".
+   * @param aSubFolderName          Name of the new folder to create.
+   */
+  void createFolder(in wstring aParentFolderName, in wstring aSubFolderName);
+
+  /**
+   * Delete a folder.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the parent folder does not exist.
+   * @throws NS_ERROR_FILE_DIR_NOT_EMPTY if the folder was not empty.
+   *
+   * @param aParentFolderName       Immediate parent of the folder to delete, starting with "\".
+   * @param aSubFolderName          Name of the folder to delete.
+   */
+  void deleteFolder(in wstring aParentFolderName, in wstring aSubFolderName);
+};
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.cpp firefox-85.0+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.cpp
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,308 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsWinTaskScheduler.h"
+
+#include <windows.h>
+#include <comdef.h>
+#include <taskschd.h>
+
+#include "nsString.h"
+
+#include "mozilla/RefPtr.h"
+#include "mozilla/ResultVariant.h"
+
+using namespace mozilla;
+
+struct SysFreeStringDeleter {
+  void operator()(BSTR aPtr) { ::SysFreeString(aPtr); }
+};
+using BStrPtr = mozilla::UniquePtr<OLECHAR, SysFreeStringDeleter>;
+
+static nsresult ToNotFoundOrFailure(HRESULT hr) {
+  if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) {
+    return NS_ERROR_FILE_NOT_FOUND;
+  } else {
+    return NS_ERROR_FAILURE;
+  }
+}
+
+static nsresult ToAlreadyExistsOrFailure(HRESULT hr) {
+  if (hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) {
+    return NS_ERROR_FILE_ALREADY_EXISTS;
+  } else {
+    return NS_ERROR_FAILURE;
+  }
+}
+
+[[nodiscard]] static Result<RefPtr<ITaskFolder>, HRESULT> GetTaskFolder(
+    const char16_t* aFolderName) {
+  HRESULT hr;
+  RefPtr<ITaskService> scheduler = nullptr;
+
+  hr = CoCreateInstance(CLSID_TaskScheduler, nullptr, CLSCTX_INPROC_SERVER,
+                        IID_ITaskService, getter_AddRefs(scheduler));
+  if (FAILED(hr)) {
+    return Err(hr);
+  }
+
+  // Connect to the local Task Scheduler.
+  hr = scheduler->Connect(VARIANT{}, VARIANT{}, VARIANT{}, VARIANT{});
+  if (FAILED(hr)) {
+    return Err(hr);
+  }
+
+  BStrPtr bstrFolderName =
+      BStrPtr(::SysAllocString(reinterpret_cast<const OLECHAR*>(aFolderName)));
+
+  RefPtr<ITaskFolder> folder = nullptr;
+  hr = scheduler->GetFolder(bstrFolderName.get(), getter_AddRefs(folder));
+  if (FAILED(hr)) {
+    return Err(hr);
+  }
+
+  return folder;
+}
+
+[[nodiscard]] static Result<RefPtr<IRegisteredTask>, HRESULT> GetRegisteredTask(
+    const char16_t* aFolderName, const char16_t* aTaskName) {
+  auto folder = GetTaskFolder(aFolderName);
+  if (!folder.isOk()) {
+    return Err(folder.unwrapErr());
+  }
+
+  BStrPtr bstrTaskName =
+      BStrPtr(::SysAllocString(reinterpret_cast<const OLECHAR*>(aTaskName)));
+
+  RefPtr<IRegisteredTask> task = nullptr;
+  HRESULT hr =
+      folder.unwrap()->GetTask(bstrTaskName.get(), getter_AddRefs(task));
+  if (FAILED(hr)) {
+    return Err(hr);
+  }
+
+  return task;
+}
+
+NS_IMPL_ISUPPORTS(nsWinTaskSchedulerService, nsIWinTaskSchedulerService)
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::GetTaskXML(const char16_t* aFolderName,
+                                      const char16_t* aTaskName,
+                                      nsAString& aResult) {
+  if (!aFolderName || !aTaskName) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto task = GetRegisteredTask(aFolderName, aTaskName);
+  if (!task.isOk()) {
+    return ToNotFoundOrFailure(task.unwrapErr());
+  }
+
+  {
+    BSTR bstrXml = nullptr;
+    if (FAILED(task.unwrap()->get_Xml(&bstrXml))) {
+      return NS_ERROR_FAILURE;
+    }
+
+    aResult.Assign(bstrXml, ::SysStringLen(bstrXml));
+    ::SysFreeString(bstrXml);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::RegisterTask(const char16_t* aFolderName,
+                                        const char16_t* aTaskName,
+                                        const char16_t* aDefinitionXML,
+                                        bool aUpdateExisting) {
+  if (!aFolderName || !aTaskName || !aDefinitionXML) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto folder = GetTaskFolder(aFolderName);
+  if (!folder.isOk()) {
+    return ToNotFoundOrFailure(folder.unwrapErr());
+  }
+
+  BStrPtr bstrTaskName =
+      BStrPtr(::SysAllocString(reinterpret_cast<const OLECHAR*>(aTaskName)));
+  BStrPtr bstrXml = BStrPtr(
+      ::SysAllocString(reinterpret_cast<const OLECHAR*>(aDefinitionXML)));
+  LONG flags = aUpdateExisting ? TASK_CREATE_OR_UPDATE : TASK_CREATE;
+  TASK_LOGON_TYPE logonType = TASK_LOGON_INTERACTIVE_TOKEN;
+
+  // The outparam is not needed, but not documented as optional.
+  RefPtr<IRegisteredTask> unusedTaskOutput = nullptr;
+  HRESULT hr = folder.unwrap()->RegisterTask(
+      bstrTaskName.get(), bstrXml.get(), flags, VARIANT{} /* userId */,
+      VARIANT{} /* password */, logonType, VARIANT{} /* sddl */,
+      getter_AddRefs(unusedTaskOutput));
+
+  if (FAILED(hr)) {
+    return ToAlreadyExistsOrFailure(hr);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::ValidateTaskDefinition(
+    const char16_t* aDefinitionXML, int32_t* aResult) {
+  if (!aDefinitionXML) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto folder = GetTaskFolder(reinterpret_cast<const char16_t*>(L"\\"));
+  if (!folder.isOk()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  BStrPtr bstrXml = BStrPtr(
+      ::SysAllocString(reinterpret_cast<const OLECHAR*>(aDefinitionXML)));
+  LONG flags = TASK_VALIDATE_ONLY;
+  TASK_LOGON_TYPE logonType = TASK_LOGON_INTERACTIVE_TOKEN;
+
+  // The outparam is not needed, but not documented as optional.
+  RefPtr<IRegisteredTask> unusedTaskOutput = nullptr;
+  HRESULT hr = folder.unwrap()->RegisterTask(
+      nullptr /* path */, bstrXml.get(), flags, VARIANT{} /* userId */,
+      VARIANT{} /* password */, logonType, VARIANT{} /* sddl */,
+      getter_AddRefs(unusedTaskOutput));
+
+  if (aResult) {
+    *aResult = hr;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::DeleteTask(const char16_t* aFolderName,
+                                      const char16_t* aTaskName) {
+  if (!aFolderName || !aTaskName) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto folder = GetTaskFolder(aFolderName);
+  if (!folder.isOk()) {
+    return ToNotFoundOrFailure(folder.unwrapErr());
+  }
+
+  BStrPtr bstrTaskName =
+      BStrPtr(::SysAllocString(reinterpret_cast<const OLECHAR*>(aTaskName)));
+
+  HRESULT hr = folder.unwrap()->DeleteTask(bstrTaskName.get(), 0 /* flags */);
+  if (FAILED(hr)) {
+    return ToNotFoundOrFailure(hr);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::GetFolderTasks(const char16_t* aFolderName,
+                                          nsTArray<nsString>& aResult) {
+  if (!aFolderName) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto folder = GetTaskFolder(aFolderName);
+  if (!folder.isOk()) {
+    return ToNotFoundOrFailure(folder.unwrapErr());
+  }
+
+  RefPtr<IRegisteredTaskCollection> taskCollection = nullptr;
+  if (FAILED(folder.unwrap()->GetTasks(TASK_ENUM_HIDDEN,
+                                       getter_AddRefs(taskCollection)))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  LONG taskCount = 0;
+  if (FAILED(taskCollection->get_Count(&taskCount))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  aResult.Clear();
+
+  for (LONG i = 0; i < taskCount; ++i) {
+    RefPtr<IRegisteredTask> task = nullptr;
+
+    // nb: Collections are indexed from 1.
+    if (FAILED(taskCollection->get_Item(_variant_t(i + 1),
+                                        getter_AddRefs(task)))) {
+      return NS_ERROR_FAILURE;
+    }
+
+    BStrPtr bstrTaskName;
+    {
+      BSTR tempTaskName = nullptr;
+      if (FAILED(task->get_Name(&tempTaskName))) {
+        return NS_ERROR_FAILURE;
+      }
+      bstrTaskName = BStrPtr(tempTaskName);
+    }
+
+    aResult.AppendElement(nsString(bstrTaskName.get()));
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::CreateFolder(const char16_t* aParentFolderName,
+                                        const char16_t* aSubFolderName) {
+  if (!aParentFolderName || !aSubFolderName) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto parentFolder = GetTaskFolder(aParentFolderName);
+  if (!parentFolder.isOk()) {
+    return ToNotFoundOrFailure(parentFolder.unwrapErr());
+  }
+
+  BStrPtr bstrSubFolderName = BStrPtr(
+      ::SysAllocString(reinterpret_cast<const OLECHAR*>(aSubFolderName)));
+
+  HRESULT hr = parentFolder.unwrap()->CreateFolder(bstrSubFolderName.get(),
+                                                   VARIANT{},  // sddl
+                                                   nullptr);   // ppFolder
+
+  if (FAILED(hr)) {
+    return ToAlreadyExistsOrFailure(hr);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWinTaskSchedulerService::DeleteFolder(const char16_t* aParentFolderName,
+                                        const char16_t* aSubFolderName) {
+  if (!aParentFolderName || !aSubFolderName) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  auto parentFolder = GetTaskFolder(aParentFolderName);
+  if (!parentFolder.isOk()) {
+    return ToNotFoundOrFailure(parentFolder.unwrapErr());
+  }
+
+  BStrPtr bstrSubFolderName = BStrPtr(
+      ::SysAllocString(reinterpret_cast<const OLECHAR*>(aSubFolderName)));
+
+  HRESULT hr = parentFolder.unwrap()->DeleteFolder(bstrSubFolderName.get(),
+                                                   0 /* flags */);
+
+  if (FAILED(hr)) {
+    if (hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY)) {
+      return NS_ERROR_FILE_DIR_NOT_EMPTY;
+    } else {
+      return ToNotFoundOrFailure(hr);
+    }
+  }
+
+  return NS_OK;
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.h firefox-85.0+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.h
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/nsWinTaskScheduler.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WINTASKSCHEDULER_H_
+#define WINTASKSCHEDULER_H_
+
+#include "nsIWinTaskSchedulerService.h"
+
+class nsWinTaskSchedulerService : public nsIWinTaskSchedulerService {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIWINTASKSCHEDULERSERVICE
+
+  nsWinTaskSchedulerService() = default;
+
+ protected:
+  virtual ~nsWinTaskSchedulerService() = default;
+};
+
+#endif /* WINTASKSCHEDULER_H_ */
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/TaskScheduler.jsm firefox-85.0+build1/toolkit/components/taskscheduler/TaskScheduler.jsm
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/TaskScheduler.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/TaskScheduler.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,124 @@
+/* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TaskScheduler"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetter(
+  this,
+  "WinImpl",
+  "resource://gre/modules/TaskSchedulerWinImpl.jsm",
+  "_TaskSchedulerWinImpl"
+);
+
+XPCOMUtils.defineLazyGetter(this, "gImpl", () => {
+  if (AppConstants.platform == "win") {
+    return WinImpl;
+  }
+
+  // Stubs for unsupported platforms
+  return {
+    registerTask() {},
+    deleteTask() {},
+    deleteAllTasks() {},
+  };
+});
+
+const { AppConstants } = ChromeUtils.import(
+  "resource://gre/modules/AppConstants.jsm"
+);
+
+/**
+ * Interface to a system task scheduler, capable of running a command line at an interval
+ * independent of the application.
+ *
+ * Currently only implemented for Windows, on other platforms these calls do nothing.
+ *
+ * The implementation will only interact with tasks from the same install of this application.
+ * - On Windows the native tasks are named like "\<vendor>\<id> <install path hash>",
+ *   e.g. "\Mozilla\Task Identifier 308046B0AF4A39CB"
+ */
+var TaskScheduler = {
+  MIN_INTERVAL_SECONDS: 1800,
+
+  /**
+   * Create a scheduled task that will run a command indepedent of the application.
+   *
+   * It will run every intervalSeconds seconds, starting intervalSeconds seconds from now.
+   *
+   * If the task is unable to run one or more scheduled times (e.g. if the computer is
+   * off, or the owning user is not logged in), then the next time a run is possible the task
+   * will be run once.
+   *
+   * An existing task with the same `id` will be replaced.
+   *
+   * Only one instance of the task will run at once, though this does not affect different
+   * tasks from the same application.
+   *
+   * @param id
+   *        A unique string (including a UUID is recommended) to distinguish the task among
+   *        other tasks from this installation.
+   *        This string will also be visible to system administrators, so it should be a legible
+   *        description, but it does not need to be localized.
+   *
+   * @param command
+   *        Full path to the executable to run.
+   *
+   * @param intervalSeconds
+   *        Interval at which to run the command, in seconds. Minimum 1800 (30 minutes).
+   *
+   * @param options
+   *        Optional, as as all of its properties:
+   *        {
+   *          args
+   *            Array of arguments to pass on the command line. Does not include the command
+   *            itself even if that is considered part of the command line. If missing, no
+   *            argument list is generated.
+   *
+   *          workingDirectory
+   *            Working directory for the command. If missing, no working directory is set.
+   *
+   *          description
+   *            A description string that will be visible to system administrators. This should
+   *            be localized. If missing, no description is set.
+   *
+   *          disabled
+   *            If true the task will be created disabled, so that it will not be run.
+   *            Default false, intended for tests.
+   *        }
+   * }
+   */
+  registerTask(id, command, intervalSeconds, options) {
+    if (!Number.isInteger(intervalSeconds)) {
+      throw new Error("Interval is not an integer");
+    }
+    if (intervalSeconds < this.MIN_INTERVAL_SECONDS) {
+      throw new Error("Interval is too short");
+    }
+
+    return gImpl.registerTask(id, command, intervalSeconds, options);
+  },
+
+  /**
+   * Delete a scheduled task previously created with registerTask.
+   *
+   * @throws NS_ERROR_FILE_NOT_FOUND if the task does not exist.
+   */
+  deleteTask(id) {
+    return gImpl.deleteTask(id);
+  },
+
+  /**
+   * Delete all tasks registered by this application.
+   */
+  deleteAllTasks() {
+    return gImpl.deleteAllTasks();
+  },
+};
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm firefox-85.0+build1/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/TaskSchedulerWinImpl.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,229 @@
+/* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["_TaskSchedulerWinImpl"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+XPCOMUtils.defineLazyServiceGetters(this, {
+  WinTaskSvc: [
+    "@mozilla.org/win-task-scheduler-service;1",
+    "nsIWinTaskSchedulerService",
+  ],
+  XreDirProvider: [
+    "@mozilla.org/xre/directory-provider;1",
+    "nsIXREDirProvider",
+  ],
+});
+
+XPCOMUtils.defineLazyGlobalGetters(this, ["XMLSerializer"]);
+
+/**
+ * Task generation and management for Windows, using Task Scheduler 2.0 (taskschd).
+ *
+ * Implements the API exposed in TaskScheduler.jsm
+ * Not intended for external use, this is in a separate module to ship the code only
+ * on Windows, and to expose for testing.
+ */
+var _TaskSchedulerWinImpl = {
+  registerTask(id, command, intervalSeconds, options) {
+    // The folder might not yet exist.
+    this._createFolderIfNonexistent();
+
+    const xml = this._formatTaskDefinitionXML(
+      command,
+      intervalSeconds,
+      options
+    );
+    const updateExisting = true;
+
+    WinTaskSvc.registerTask(
+      this._taskFolderName(),
+      this._formatTaskName(id),
+      xml,
+      updateExisting
+    );
+  },
+
+  deleteTask(id) {
+    WinTaskSvc.deleteTask(this._taskFolderName(), this._formatTaskName(id));
+  },
+
+  deleteAllTasks() {
+    const taskFolderName = this._taskFolderName();
+
+    let allTasks;
+    try {
+      allTasks = WinTaskSvc.getFolderTasks(taskFolderName);
+    } catch (ex) {
+      if (ex.result == Cr.NS_ERROR_FILE_NOT_FOUND) {
+        // Folder doesn't exist, nothing to delete.
+        return;
+      }
+      throw ex;
+    }
+
+    const tasksToDelete = allTasks.filter(name => this._matchAppTaskName(name));
+
+    for (const taskName of tasksToDelete) {
+      WinTaskSvc.deleteTask(taskFolderName, taskName);
+    }
+
+    if (allTasks.length == tasksToDelete.length) {
+      // Deleted every task, remove the folder.
+      this._deleteFolderIfEmpty();
+    }
+  },
+
+  _formatTaskDefinitionXML(command, intervalSeconds, options) {
+    const startTime = new Date(Date.now() + intervalSeconds * 1000);
+    const xmlns = "http://schemas.microsoft.com/windows/2004/02/mit/task";
+
+    // Fill in the constant parts of the task, and those that don't require escaping.
+    const docBase = `<Task xmlns="${xmlns}">
+  <Triggers>
+    <TimeTrigger>
+      <StartBoundary>${startTime.toISOString()}</StartBoundary>
+      <Repetition>
+        <Interval>PT${intervalSeconds}S</Interval>
+      </Repetition>
+    </TimeTrigger>
+  </Triggers>
+  <Actions>
+    <Exec />
+  </Actions>
+  <Settings>
+    <StartWhenAvailable>true</StartWhenAvailable>
+    <MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>
+  </Settings>
+  <RegistrationInfo>
+     <Author />
+  </RegistrationInfo>
+</Task>`;
+    const doc = new DOMParser().parseFromString(docBase, "text/xml");
+
+    const execAction = doc.querySelector("Actions Exec");
+
+    const commandNode = doc.createElementNS(xmlns, "Command");
+    commandNode.textContent = command;
+    execAction.appendChild(commandNode);
+
+    if (options?.args) {
+      const args = doc.createElementNS(xmlns, "Arguments");
+      args.textContent = options.args.map(this._quoteString).join(" ");
+      execAction.appendChild(args);
+    }
+
+    if (options?.workingDirectory) {
+      const workingDirectory = doc.createElementNS(xmlns, "WorkingDirectory");
+      workingDirectory.textContent = options.workingDirectory;
+      execAction.appendChild(workingDirectory);
+    }
+
+    if (options?.disabled) {
+      const enabled = doc.createElementNS(xmlns, "Enabled");
+      enabled.textContent = "false";
+      doc.querySelector("Settings").appendChild(enabled);
+    }
+
+    // Other settings to consider for the future:
+    // Idle
+    // Battery
+    // Max run time
+
+    doc.querySelector("RegistrationInfo Author").textContent =
+      Services.appinfo.vendor;
+
+    if (options?.description) {
+      const registrationInfo = doc.querySelector("RegistrationInfo");
+      const description = doc.createElementNS(xmlns, "Description");
+      description.textContent = options.description;
+      registrationInfo.appendChild(description);
+    }
+
+    const serializer = new XMLSerializer();
+    return serializer.serializeToString(doc);
+  },
+
+  _createFolderIfNonexistent() {
+    const { parentName, subName } = this._taskFolderNameParts();
+
+    try {
+      WinTaskSvc.createFolder(parentName, subName);
+    } catch (e) {
+      if (e.result != Cr.NS_ERROR_FILE_ALREADY_EXISTS) {
+        throw e;
+      }
+    }
+  },
+
+  _deleteFolderIfEmpty() {
+    const { parentName, subName } = this._taskFolderNameParts();
+
+    try {
+      WinTaskSvc.deleteFolder(parentName, subName);
+    } catch (e) {
+      // Missed one somehow, possibly a subfolder?
+      if (e.result != Cr.NS_ERROR_FILE_DIR_NOT_EMPTY) {
+        throw e;
+      }
+    }
+  },
+
+  /**
+   * Quotes a string for use as a single command argument, using Windows quoting
+   * conventions.
+   *
+   * copied from quoteString() in toolkit/modules/subproces/subprocess_worker_win.js
+   *
+   *
+   * @see https://msdn.microsoft.com/en-us/library/17w5ykft(v=vs.85).aspx
+   *
+   * @param {string} str
+   *        The argument string to quote.
+   * @returns {string}
+   */
+  _quoteString(str) {
+    if (!/[\s"]/.test(str)) {
+      return str;
+    }
+
+    let escaped = str.replace(/(\\*)("|$)/g, (m0, m1, m2) => {
+      if (m2) {
+        m2 = `\\${m2}`;
+      }
+      return `${m1}${m1}${m2}`;
+    });
+
+    return `"${escaped}"`;
+  },
+
+  _taskFolderName() {
+    return `\\${Services.appinfo.vendor}`;
+  },
+
+  _taskFolderNameParts() {
+    return {
+      parentName: "\\",
+      subName: Services.appinfo.vendor,
+    };
+  },
+
+  _formatTaskName(id) {
+    const installHash = XreDirProvider.getInstallHash();
+    return `${id} ${installHash}`;
+  },
+
+  _matchAppTaskName(name) {
+    const installHash = XreDirProvider.getInstallHash();
+    return name.endsWith(` ${installHash}`);
+  },
+};
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskScheduler.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,40 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+"use strict";
+
+// Cross-platform task scheduler tests.
+//
+// There's not much that can be done here without allowing the task to run, so this
+// only touches on the basics of argument checking. On platforms without a task
+// scheduler implementation, these interfaces currently do nothing else.
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
+updateAppInfo();
+
+const { TaskScheduler } = ChromeUtils.import(
+  "resource://gre/modules/TaskScheduler.jsm"
+);
+
+registerCleanupFunction(() => {
+  TaskScheduler.deleteAllTasks();
+});
+
+add_task(async function test_gen() {
+  TaskScheduler.registerTask("FOO", "xyz", TaskScheduler.MIN_INTERVAL_SECONDS, {
+    disabled: true,
+  });
+  TaskScheduler.deleteTask("FOO");
+
+  Assert.throws(
+    () =>
+      TaskScheduler.registerTask("BAR", "123", 1, {
+        disabled: true,
+      }),
+    /Interval is too short/
+  );
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_TaskSchedulerWinImpl.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,205 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+"use strict";
+
+// Unit tests for Windows scheduled task generation.
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
+updateAppInfo();
+
+const { TaskScheduler } = ChromeUtils.import(
+  "resource://gre/modules/TaskScheduler.jsm"
+);
+
+const { _TaskSchedulerWinImpl: WinImpl } = ChromeUtils.import(
+  "resource://gre/modules/TaskSchedulerWinImpl.jsm"
+);
+
+const WinSvc = Cc["@mozilla.org/win-task-scheduler-service;1"].getService(
+  Ci.nsIWinTaskSchedulerService
+);
+
+const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  Ci.nsIUUIDGenerator
+);
+
+function randomName() {
+  return (
+    "moz-taskschd-test-" +
+    uuidGenerator
+      .generateUUID()
+      .toString()
+      .slice(1, -1)
+  );
+}
+
+const gFolderName = randomName();
+
+// Override task folder name, to prevent colliding with other tests.
+WinImpl._taskFolderName = function() {
+  return gFolderName;
+};
+WinImpl._taskFolderNameParts = function() {
+  return {
+    parentName: "\\",
+    subName: gFolderName,
+  };
+};
+
+registerCleanupFunction(() => {
+  TaskScheduler.deleteAllTasks();
+});
+
+add_task(function test_create() {
+  const taskName = "test-task-1";
+  const rawTaskName = WinImpl._formatTaskName(taskName);
+  const folderName = WinImpl._taskFolderName();
+  const exePath = "C:\\Program Files\\XYZ\\123.exe";
+  const workingDir = "C:\\Program Files\\XYZ";
+  const argsIn = [
+    "x.txt",
+    "c:\\x.txt",
+    'C:\\"HELLO WORLD".txt',
+    "only space.txt",
+  ];
+  const expectedArgsOutStr = [
+    "x.txt",
+    "c:\\x.txt",
+    '"C:\\\\\\"HELLO WORLD\\".txt"',
+    '"only space.txt"',
+  ].join(" ");
+  const description = "Entities: < &. Non-ASCII: abc😀def.";
+  const intervalSecsIn = 2 * 60 * 60; // 2 hours
+  const expectedIntervalOutWin10 = "PT2H"; // Windows 10 regroups by hours and minutes
+  const expectedIntervalOutWin7 = `PT${intervalSecsIn}S`; // Windows 7 doesn't regroup
+
+  TaskScheduler.registerTask(taskName, exePath, intervalSecsIn, {
+    disabled: true,
+    args: argsIn,
+    description,
+    workingDirectory: workingDir,
+  });
+
+  // Read back the task
+  const readBackXML = WinSvc.getTaskXML(folderName, rawTaskName);
+  const parser = new DOMParser();
+  const doc = parser.parseFromString(readBackXML, "text/xml");
+  Assert.equal(doc.documentElement.tagName, "Task");
+
+  // Check for the values set above
+  Assert.equal(doc.querySelector("Actions Exec Command").textContent, exePath);
+  Assert.equal(
+    doc.querySelector("Actions Exec WorkingDirectory").textContent,
+    workingDir
+  );
+  Assert.equal(
+    doc.querySelector("Actions Exec Arguments").textContent,
+    expectedArgsOutStr
+  );
+  Assert.equal(
+    doc.querySelector("RegistrationInfo Description").textContent,
+    description
+  );
+  Assert.equal(
+    doc.querySelector("RegistrationInfo Author").textContent,
+    Services.appinfo.vendor
+  );
+
+  Assert.equal(doc.querySelector("Settings Enabled").textContent, "false");
+
+  // Note: It's a little too tricky to check for a specific StartBoundary value reliably here, given
+  // that it gets set relative to Date.now(), so I'm skipping that.
+  const intervalOut = doc.querySelector(
+    "Triggers TimeTrigger Repetition Interval"
+  ).textContent;
+  Assert.ok(
+    intervalOut == expectedIntervalOutWin7 ||
+      intervalOut == expectedIntervalOutWin10
+  );
+
+  // Validate the XML
+  WinSvc.validateTaskDefinition(readBackXML);
+
+  // Update
+  const updatedExePath = "C:\\Program Files (x86)\\ABC\\foo.exe";
+  const updatedIntervalSecsIn = 3 * 60 * 60; // 3 hours
+  const expectedUpdatedIntervalOutWin10 = "PT3H";
+  const expectedUpdatedIntervalOutWin7 = `PT${updatedIntervalSecsIn}S`;
+
+  TaskScheduler.registerTask(taskName, updatedExePath, updatedIntervalSecsIn, {
+    disabled: true,
+    args: argsIn,
+    description,
+    workingDirectory: workingDir,
+  });
+
+  // Read back the updated task
+  const readBackUpdatedXML = WinSvc.getTaskXML(folderName, rawTaskName);
+  const updatedDoc = parser.parseFromString(readBackUpdatedXML, "text/xml");
+  Assert.equal(updatedDoc.documentElement.tagName, "Task");
+
+  // Check for updated values
+  Assert.equal(
+    updatedDoc.querySelector("Actions Exec Command").textContent,
+    updatedExePath
+  );
+
+  Assert.notEqual(
+    doc.querySelector("Triggers TimeTrigger StartBoundary").textContent,
+    updatedDoc.querySelector("Triggers TimeTrigger StartBoundary").textContent
+  );
+  const updatedIntervalOut = updatedDoc.querySelector(
+    "Triggers TimeTrigger Repetition Interval"
+  ).textContent;
+  Assert.ok(
+    updatedIntervalOut == expectedUpdatedIntervalOutWin7 ||
+      updatedIntervalOut == expectedUpdatedIntervalOutWin10
+  );
+
+  // Check that the folder really was there
+  {
+    const { parentName, subName } = WinImpl._taskFolderNameParts();
+    let threw;
+    try {
+      WinSvc.deleteFolder(parentName, subName);
+    } catch (ex) {
+      threw = ex;
+    }
+    Assert.equal(threw.result, Cr.NS_ERROR_FILE_DIR_NOT_EMPTY);
+  }
+
+  // Delete
+  TaskScheduler.deleteAllTasks();
+
+  // Check that the folder is gone
+  {
+    const { parentName, subName } = WinImpl._taskFolderNameParts();
+    let threw;
+    try {
+      WinSvc.deleteFolder(parentName, subName);
+    } catch (ex) {
+      threw = ex;
+    }
+    Assert.equal(threw.result, Cr.NS_ERROR_FILE_NOT_FOUND);
+  }
+
+  // Format and validate the XML with the task not disabled
+  const enabledXML = WinImpl._formatTaskDefinitionXML(exePath, intervalSecsIn, {
+    args: argsIn,
+    description,
+    workingDirectory: workingDir,
+  });
+  Assert.equal(WinSvc.validateTaskDefinition(enabledXML), 0 /* S_OK */);
+
+  // Format and validate with no options
+  const basicXML = WinImpl._formatTaskDefinitionXML(
+    "foo",
+    TaskScheduler.MIN_INTERVAL_SECONDS
+  );
+  Assert.equal(WinSvc.validateTaskDefinition(basicXML), 0 /* S_OK */);
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/test_WinTaskSchedulerService.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,191 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+"use strict";
+
+// Unit tests for access to the Windows Task Scheduler via nsIWinTaskSchedulerService.
+
+const svc = Cc["@mozilla.org/win-task-scheduler-service;1"].getService(
+  Ci.nsIWinTaskSchedulerService
+);
+
+const uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(
+  Ci.nsIUUIDGenerator
+);
+
+function randomName() {
+  return (
+    "moz-taskschd-test-" +
+    uuidGenerator
+      .generateUUID()
+      .toString()
+      .slice(1, -1)
+  );
+}
+
+const gParentFolderName = randomName();
+const gParentFolderPath = `\\${gParentFolderName}`;
+const gSubFolderName = randomName();
+const gSubFolderPath = `\\${gParentFolderName}\\${gSubFolderName}`;
+// This folder will not be created
+const gMissingFolderName = randomName();
+const gMissingFolderPath = `\\${gParentFolderName}\\${gMissingFolderName}`;
+
+const gValidTaskXML = `<Task xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
+  <Triggers />
+  <Settings>
+    <Enabled>false</Enabled>
+  </Settings>
+  <Actions>
+    <Exec>
+      <Command>xyz123.exe</Command>
+    </Exec>
+  </Actions>
+</Task>`;
+
+// Missing actions
+const gInvalidTaskXML = `<Task xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
+  <Triggers />
+  <Settings>
+    <Enabled>false</Enabled>
+  </Settings>
+</Task>`;
+
+function cleanup() {
+  let tasksToDelete = svc.getFolderTasks(gSubFolderPath);
+
+  for (const task of tasksToDelete) {
+    svc.deleteTask(gSubFolderPath, task);
+  }
+
+  svc.deleteFolder(gParentFolderPath, gSubFolderName);
+
+  svc.deleteFolder("\\", gParentFolderPath);
+}
+
+registerCleanupFunction(() => {
+  try {
+    cleanup();
+  } catch (_ex) {
+    // Folders may not exist
+  }
+});
+
+add_task(async function test_svc() {
+  /***** FOLDERS *****/
+
+  // Try creating subfolder before parent folder exists
+  Assert.throws(
+    () => svc.createFolder(gParentFolderPath, gSubFolderName),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  // Create parent folder
+  svc.createFolder("\\", gParentFolderName);
+
+  // Create subfolder
+  svc.createFolder(gParentFolderPath, gSubFolderName);
+
+  // Try creating existing folder
+  Assert.throws(
+    () => svc.createFolder(gParentFolderPath, gSubFolderName),
+    /NS_ERROR_FILE_ALREADY_EXISTS/
+  );
+
+  // Try deleting nonexistent subfolder
+  Assert.throws(
+    () => svc.deleteFolder(gParentFolderPath, gMissingFolderName),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  /***** TASKS *****/
+  const taskNames = [randomName(), randomName(), randomName()];
+
+  // Try enumerating nonexistent subfolder
+  Assert.throws(
+    () => svc.getFolderTasks(gMissingFolderPath),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  // List empty subfolder
+  Assert.deepEqual(svc.getFolderTasks(gSubFolderPath), []);
+
+  // Try to create task in nonexistent subfolder
+  Assert.throws(
+    () => svc.registerTask(gMissingFolderPath, taskNames[0], gValidTaskXML),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  // Create task 0
+
+  svc.registerTask(gSubFolderPath, taskNames[0], gValidTaskXML);
+
+  // Try to recreate task 0
+  Assert.throws(
+    () => svc.registerTask(gSubFolderPath, taskNames[0], gValidTaskXML),
+    /NS_ERROR_FILE_ALREADY_EXISTS/
+  );
+
+  // Update task 0
+  svc.registerTask(
+    gSubFolderPath,
+    taskNames[0],
+    gValidTaskXML,
+    true /* aUpdateExisting */
+  );
+
+  // Read back XML
+  Assert.ok(svc.getTaskXML(gSubFolderPath, taskNames[0]));
+
+  // Create remaining tasks
+  for (const task of taskNames.slice(1)) {
+    svc.registerTask(gSubFolderPath, task, gValidTaskXML);
+  }
+
+  // Try to create with invalid XML
+  Assert.throws(
+    () => svc.registerTask(gSubFolderPath, randomName(), gInvalidTaskXML),
+    /NS_ERROR_FAILURE/
+  );
+
+  // Validate XML
+  Assert.equal(svc.validateTaskDefinition(gValidTaskXML), 0 /* S_OK */);
+
+  // Try to validate invalid XML
+  Assert.notEqual(svc.validateTaskDefinition(gInvalidTaskXML), 0 /* S_OK */);
+
+  // Test enumeration
+  {
+    let foundTasks = svc.getFolderTasks(gSubFolderPath);
+    foundTasks.sort();
+
+    let allTasks = taskNames.slice();
+    allTasks.sort();
+
+    Assert.deepEqual(foundTasks, allTasks);
+  }
+
+  // Try deleting non-empty folder
+  Assert.throws(
+    () => svc.deleteFolder(gParentFolderPath, gSubFolderName),
+    /NS_ERROR_FILE_DIR_NOT_EMPTY/
+  );
+
+  const missingTaskName = randomName();
+
+  // Try deleting non-existent task
+  Assert.throws(
+    () => svc.deleteTask(gSubFolderName, missingTaskName),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  // Try reading non-existent task
+  Assert.throws(
+    () => svc.getTaskXML(gSubFolderPath, missingTaskName),
+    /NS_ERROR_FILE_NOT_FOUND/
+  );
+
+  /***** Cleanup *****/
+  // Explicitly call cleanup() to test that it removes the folder without error.
+  cleanup();
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/xpcshell.ini firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/taskscheduler/tests/xpcshell/xpcshell.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/taskscheduler/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,5 @@
+[test_WinTaskSchedulerService.js]
+run-if = os == "win" # Test of Windows only service
+[test_TaskSchedulerWinImpl.js]
+run-if = os == "win" # Test of Windows backend
+[test_TaskScheduler.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py firefox-85.0+build1/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py
--- firefox-84.0.2+build1/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/build_scripts/gen_histogram_enum.py	2021-01-18 19:58:27.000000000 +0000
@@ -28,6 +28,7 @@
 #ifndef mozilla_TelemetryHistogramEnums_h
 #define mozilla_TelemetryHistogramEnums_h
 
+#include <cstdint>
 #include <type_traits>
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/core/ipc/TelemetryComms.h firefox-85.0+build1/toolkit/components/telemetry/core/ipc/TelemetryComms.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/core/ipc/TelemetryComms.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/core/ipc/TelemetryComms.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,10 +7,11 @@
 #define Telemetry_Comms_h__
 
 #include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/TelemetryProcessEnums.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/Variant.h"
 #include "nsITelemetry.h"
-#include "nsVariant.h"
 
 namespace mozilla {
 namespace Telemetry {
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/core/nsITelemetry.idl firefox-85.0+build1/toolkit/components/telemetry/core/nsITelemetry.idl
--- firefox-84.0.2+build1/toolkit/components/telemetry/core/nsITelemetry.idl	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/core/nsITelemetry.idl	2021-01-18 19:58:27.000000000 +0000
@@ -196,14 +196,55 @@
    */
   readonly attribute uint32_t maximalNumberOfConcurrentThreads;
 
+  /**
+   * Flags for getUntrustedModuleLoadEvents.
+   */
+
+  /**
+   * This flag is set to retrieve all data including instances which have been
+   * retrieved before.  If not set, only new instances since the last call
+   * will be returned.
+   * If this flag is set, KEEP_LOADEVENTS_NEW must not be set unless
+   * EXCLUDE_STACKINFO_FROM_LOADEVENTS is set.
+   * (See also MultiGetUntrustedModulesData::Serialize.)
+   */
+  const unsigned long INCLUDE_OLD_LOADEVENTS = 1 << 0;
+
+  /**
+   * This flag is set to keep the returned instances as if they were not
+   * retrieved, meaning those instances will be returned by a next method
+   * call without INCLUDE_OLD_LOADEVENTS.  If not set, the returned instances
+   * can be re-retrieved only when INCLUDE_OLD_LOADEVENTS is specified.
+   * If this flag is set, INCLUDE_OLD_LOADEVENTS must not be set unless
+   * EXCLUDE_STACKINFO_FROM_LOADEVENTS is set.
+   * (See also MultiGetUntrustedModulesData::Serialize.)
+   */
+  const unsigned long KEEP_LOADEVENTS_NEW = 1 << 1;
+
+  /**
+   * This flag is set to include private fields.
+   * Do not specify this flag to retrieve data to be submitted.
+   */
+  const unsigned long INCLUDE_PRIVATE_FIELDS_IN_LOADEVENTS = 1 << 2;
+
+  /**
+   * This flag is set to exclude the "combinedStacks" field.
+   * Without this flag, the flags INCLUDE_OLD_LOADEVENTS and KEEP_LOADEVENTS_NEW
+   * cannot be set at the same time.
+   */
+  const unsigned long EXCLUDE_STACKINFO_FROM_LOADEVENTS = 1 << 3;
+
   /*
    * An array of untrusted module load events. Each element describes one or
    * more modules that were loaded, contextual information at the time of the
    * event (including stack trace), and flags describing the module's
    * trustworthiness.
+   *
+   * @param aFlags   Combination (bitwise OR) of the flags specified above.
+   *                 Defaults to 0.
    */
   [implicit_jscontext]
-  Promise getUntrustedModuleLoadEvents();
+  Promise getUntrustedModuleLoadEvents([optional] in unsigned long aFlags);
 
   /*
    * Asynchronously get an array of the modules loaded in the process.
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/core/Stopwatch.cpp firefox-85.0+build1/toolkit/components/telemetry/core/Stopwatch.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/core/Stopwatch.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/core/Stopwatch.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/HangAnnotations.h"
+#include "mozilla/DataMutex.h"
 #include "mozilla/TimeStamp.h"
 #include "GeckoProfiler.h"
 #include "nsHashKeys.h"
@@ -23,6 +24,7 @@
 #include "nsString.h"
 #include "xpcpublic.h"
 
+using mozilla::DataMutex;
 using mozilla::dom::AutoJSAPI;
 
 #define USER_INTERACTION_VALUE_MAX_LENGTH 50  // bytes
@@ -57,7 +59,7 @@
 
 namespace mozilla::telemetry {
 
-class Timer final : public mozilla::LinkedListElement<Timer> {
+class Timer final : public mozilla::LinkedListElement<RefPtr<Timer>> {
  public:
   NS_INLINE_DECL_REFCOUNTING(Timer)
 
@@ -79,6 +81,11 @@
 
   bool& InSeconds() { return mInSeconds; }
 
+  /**
+   * Note that these values will want to be read from the
+   * BackgroundHangAnnotator thread. Callers should take a lock
+   * on Timers::mBHRAnnotationTimers before calling this.
+   */
   void SetBHRAnnotation(const nsAString& aBHRAnnotationKey,
                         const nsACString& aBHRAnnotationValue) {
     mBHRAnnotationKey = aBHRAnnotationKey;
@@ -186,6 +193,8 @@
   bool FinishUserInteraction(JSContext* aCx, const nsAString& aUserInteraction,
                              JS::HandleObject aObj,
                              const dom::Optional<nsACString>& aAdditionalText);
+  bool CancelUserInteraction(JSContext* aCx, const nsAString& aUserInteraction,
+                             JS::HandleObject aObj);
 
   void AnnotateHang(BackgroundHangAnnotations& aAnnotations) final;
 
@@ -193,7 +202,7 @@
   ~Timers();
 
   JS::PersistentRooted<JSObject*> mTimers;
-  mozilla::LinkedList<Timer> mBHRAnnotationTimers;
+  DataMutex<mozilla::LinkedList<RefPtr<Timer>>> mBHRAnnotationTimers;
   bool mSuppressErrors = false;
 
   static StaticRefPtr<Timers> sSingleton;
@@ -209,7 +218,8 @@
   return *sSingleton;
 }
 
-Timers::Timers() : mTimers(dom::RootingCx()) {
+Timers::Timers()
+    : mTimers(dom::RootingCx()), mBHRAnnotationTimers("BHRAnnotationTimers") {
   AutoJSAPI jsapi;
   MOZ_ALWAYS_TRUE(jsapi.Init(xpc::PrivilegedJunkScope()));
 
@@ -220,7 +230,12 @@
 }
 
 Timers::~Timers() {
-  mBHRAnnotationTimers.clear();
+  // We use a scope here to prevent a deadlock with the mutex that locks
+  // inside of ::UnregisterAnnotator.
+  {
+    auto annotationTimers = mBHRAnnotationTimers.Lock();
+    annotationTimers->clear();
+  }
   BackgroundHangMonitor::UnregisterAnnotator(*this);
 }
 
@@ -421,6 +436,8 @@
   }
 
   if (RefPtr<Timer> timer = Get(aCx, aUserInteraction, aObj, VoidString())) {
+    auto annotationTimers = mBHRAnnotationTimers.Lock();
+
     if (timer->Started()) {
       if (!mSuppressErrors) {
         LogError(aCx,
@@ -428,6 +445,7 @@
                      "UserInteraction with name \"%s\" was already initialized",
                      NS_ConvertUTF16toUTF8(aUserInteraction).get()));
       }
+      timer->removeFrom(*annotationTimers);
       Delete(aCx, aUserInteraction, aObj, VoidString());
       timer = Get(aCx, aUserInteraction, aObj, VoidString());
 
@@ -438,8 +456,7 @@
       timer->SetBHRAnnotation(aUserInteraction, aValue);
     }
 
-    mBHRAnnotationTimers.insertBack(timer);
-
+    annotationTimers->insertBack(timer);
     timer->Start(false);
     return true;
   }
@@ -473,6 +490,7 @@
     return false;
   }
 
+  auto lock = mBHRAnnotationTimers.Lock();
   if (RefPtr<Timer> timer = Get(aCx, aUserInteraction, aObj, VoidString())) {
     if (!timer->Started()) {
       if (!mSuppressErrors) {
@@ -529,16 +547,60 @@
   }
 #endif
 
-  // The Timer _should_ get automatically get removed from the LinkedList
-  // when it runs its destructor, but let's remove it manually just in
-  // case something happens to be keeping the Timer alive.
-  timer->removeFrom(mBHRAnnotationTimers);
+  // The Timer will be held alive by the RefPtr that's still in the LinkedList,
+  // so the automatic removal from the LinkedList from the LinkedListElement
+  // destructor will not occur. We must remove it manually from the LinkedList
+  // instead.
+  {
+    auto annotationTimers = mBHRAnnotationTimers.Lock();
+    timer->removeFrom(*annotationTimers);
+  }
+
+  return true;
+}
+
+bool Timers::CancelUserInteraction(JSContext* aCx,
+                                   const nsAString& aUserInteraction,
+                                   JS::HandleObject aObj) {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Ensure that this ID maps to a UserInteraction that can be recorded
+  // for this product.
+  if (!TelemetryUserInteraction::CanRecord(aUserInteraction)) {
+    if (!mSuppressErrors) {
+      LogError(aCx, nsPrintfCString(
+                        "UserInteraction with id \"%s\" cannot be recorded.",
+                        NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+    }
+    return false;
+  }
+
+  RefPtr<Timer> timer = GetAndDelete(aCx, aUserInteraction, aObj, VoidString());
+  if (!timer) {
+    if (!mSuppressErrors) {
+      LogError(aCx, nsPrintfCString(
+                        "UserInteraction: cancelling nonexisting stopwatch. "
+                        "name: \"%s\"",
+                        NS_ConvertUTF16toUTF8(aUserInteraction).get()));
+    }
+    return false;
+  }
+
+  // The Timer will be held alive by the RefPtr that's still in the LinkedList,
+  // so the automatic removal from the LinkedList from the LinkedListElement
+  // destructor will not occur. We must remove it manually from the LinkedList
+  // instead.
+  {
+    auto annotationTimers = mBHRAnnotationTimers.Lock();
+    timer->removeFrom(*annotationTimers);
+  }
 
   return true;
 }
 
 void Timers::AnnotateHang(mozilla::BackgroundHangAnnotations& aAnnotations) {
-  for (Timer* bhrAnnotationTimer : mBHRAnnotationTimers) {
+  auto annotationTimers = mBHRAnnotationTimers.Lock();
+  for (Timer* bhrAnnotationTimer : *annotationTimers) {
     aAnnotations.AddAnnotation(bhrAnnotationTimer->GetBHRAnnotationKey(),
                                bhrAnnotationTimer->GetBHRAnnotationValue());
   }
@@ -668,8 +730,8 @@
   if (!NS_IsMainThread()) {
     return false;
   }
-  return Timers::Singleton().Delete(aGlobal.Context(), aUserInteraction, aObj,
-                                    VoidString());
+  return Timers::Singleton().CancelUserInteraction(aGlobal.Context(),
+                                                   aUserInteraction, aObj);
 }
 
 /* static */
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/core/Telemetry.cpp firefox-85.0+build1/toolkit/components/telemetry/core/Telemetry.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/core/Telemetry.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/core/Telemetry.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -665,9 +665,10 @@
 }
 
 NS_IMETHODIMP
-TelemetryImpl::GetUntrustedModuleLoadEvents(JSContext* cx, Promise** aPromise) {
+TelemetryImpl::GetUntrustedModuleLoadEvents(uint32_t aFlags, JSContext* cx,
+                                            Promise** aPromise) {
 #if defined(XP_WIN)
-  return Telemetry::GetUntrustedModuleLoadEvents(cx, aPromise);
+  return Telemetry::GetUntrustedModuleLoadEvents(aFlags, cx, aPromise);
 #else
   return NS_ERROR_NOT_IMPLEMENTED;
 #endif
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/core/Telemetry.h firefox-85.0+build1/toolkit/components/telemetry/core/Telemetry.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/core/Telemetry.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/core/Telemetry.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 #ifndef Telemetry_h__
 #define Telemetry_h__
 
+#include "mozilla/Maybe.h"
 #include "mozilla/TelemetryEventEnums.h"
 #include "mozilla/TelemetryHistogramEnums.h"
 #include "mozilla/TelemetryOriginEnums.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/docs/data/crash-ping.rst firefox-85.0+build1/toolkit/components/telemetry/docs/data/crash-ping.rst
--- firefox-84.0.2+build1/toolkit/components/telemetry/docs/data/crash-ping.rst	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/docs/data/crash-ping.rst	2021-01-18 19:58:27.000000000 +0000
@@ -68,6 +68,7 @@
           MemoryErrorCorrection: <type>, // Windows-only, indicates the type of ECC memory in use, see below
           MozCrashReason: <reason>, // Optional, contains the string passed to MOZ_CRASH()
           OOMAllocationSize: <size>, // Size of the allocation that caused an OOM
+          QuotaManagerShutdownTimeout: <log-string>, // Optional, contains a list of shutdown steps and status of the quota manager clients
           RemoteType: <type>, // Optional, type of content process, see below for a list of types
           SecondsSinceLastCrash: <duration>, // Seconds elapsed since the last crash occurred
           ShutdownProgress: <phase>, // Optional, contains a string describing the shutdown phase in which the crash occurred
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/docs/data/third-party-modules-ping.rst firefox-85.0+build1/toolkit/components/telemetry/docs/data/third-party-modules-ping.rst
--- firefox-84.0.2+build1/toolkit/components/telemetry/docs/data/third-party-modules-ping.rst	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/docs/data/third-party-modules-ping.rst	2021-01-18 19:58:27.000000000 +0000
@@ -30,7 +30,7 @@
           ... Additional modules (maximum 100)
         ],
         "processes": {
-          <string containing pid, formatted as "0x%x">: {
+          <string containing processType and pid, formatted as `${processType}.0x${pid}">`: {
             // Except for Default (which is remapped to "browser"), one of the process string names specified in xpcom/build/GeckoProcessTypes.h.
             "processType": <string>,
             // Elapsed time since process creation that this object was generated, in seconds.
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/Events.yaml firefox-85.0+build1/toolkit/components/telemetry/Events.yaml
--- firefox-84.0.2+build1/toolkit/components/telemetry/Events.yaml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/Events.yaml	2021-01-18 19:58:27.000000000 +0000
@@ -51,6 +51,7 @@
       "OPEN_NEW_WINDOW",
       "OPEN_PRIVATE_WINDOW",
       "PIN",
+      "PREF_CHANGED",
       "PREVIEW_REQUEST",
       "SAVE_TO_POCKET",
       "SEARCH",
@@ -684,6 +685,7 @@
       addonVersion: For addon_study, the version of the addon for which the recipe ended.
       branch: The branch of the experiment that this client was on.
       enrollmentId: A unique ID for this enrollment that will be included in all related Telemetry.
+      changedPref: For preference_study, the preference that was detected to change that caused the unenrollment.
     bug_numbers: [1443560]
     notification_emails: ["normandy-notifications@mozilla.com"]
     products:
@@ -701,6 +703,7 @@
     extra_keys:
       reason: A code describing the reason the unenroll failed.
       enrollmentId: A unique ID for this enrollment that will be included in all related Telemetry.
+      changedPref: For preference_study, the preference that was detected to change that caused the attempted unenrollment.
     bug_numbers: [1443560]
     notification_emails: ["normandy-notifications@mozilla.com"]
     products:
@@ -905,8 +908,8 @@
       updates to the doorhanger may change whether a login is actually saved or updated, but will
       not impact the sent object.
     objects: ["save", "update"]
-    bug_numbers: [1650929, 1650941]
-    expiry_version: "86"
+    bug_numbers: [1650929, 1650941, 1678200]
+    expiry_version: "92"
     release_channel_collection: opt-out
     products: ["firefox"]
     record_in_processes: [main]
@@ -1879,14 +1882,14 @@
       - 1643428
       - 1650468
       - 1661756
+      - 1678201
     description: >
       User arrived on the protection report. This also includes a 'value' attribute which defaults to 'direct' or will be the value that a referring website addds to the url. This also indicates if the vpn banner has been seen.
-    expiry_version: "86"
+    expiry_version: "97"
     record_in_processes: ["content"]
     release_channel_collection: opt-out
     notification_emails:
       - ewright@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     products:
       - firefox
@@ -1901,14 +1904,14 @@
       - 1610897
       - 1612091
       - 1643428
+      - 1678201
     description: >
       User closed on the protection report.
-    expiry_version: "86"
+    expiry_version: "97"
     record_in_processes: ["content"]
     release_channel_collection: opt-out
     notification_emails:
       - ewright@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     products:
       - firefox
@@ -1924,6 +1927,7 @@
       - 1637615
       - 1643428
       - 1661756
+      - 1678201
     description: >
       User interaction by click events on the protection report.
     objects: [
@@ -1942,12 +1946,11 @@
       "vpn_app_link_android",
       "vpn_app_link_ios",
     ]
-    expiry_version: "86"
+    expiry_version: "97"
     record_in_processes: ["content"]
     release_channel_collection: opt-out
     notification_emails:
       - ewright@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     products:
       - firefox
@@ -1960,17 +1963,17 @@
       - 1603545
       - 1616229
       - 1643428
+      - 1678201
     description: >
       Privacy and Security click events on app menu.
     objects: [
       "open_full_report",
     ]
-    expiry_version: "86"
+    expiry_version: "97"
     record_in_processes:
       - main
     release_channel_collection: opt-out
     notification_emails:
-      - chsiang@mozilla.com
       - ewright@mozilla.com
       - seceng-telemetry@mozilla.com
     products:
@@ -1983,14 +1986,14 @@
       - 1560327
       - 1607488
       - 1643428
+      - 1678201
     description: >
       How many times the protections panel was opened.
-    expiry_version: "86"
+    expiry_version: "97"
     notification_emails:
       - ewright@mozilla.com
       - nhnt11@mozilla.com
       - jhofmann@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
@@ -2019,14 +2022,14 @@
       - 1602015
       - 1607488
       - 1643428
+      - 1678201
     description: >
       User interaction by click events in the protections panel.
-    expiry_version: "86"
+    expiry_version: "97"
     notification_emails:
       - ewright@mozilla.com
       - nhnt11@mozilla.com
       - jhofmann@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
@@ -2230,7 +2233,6 @@
       screenY: The screen Y coordinate that the window was created at
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     products:
       - "firefox"
       - "fennec"
@@ -2238,7 +2240,8 @@
       - main
     bug_numbers:
       - 1560590
-    expiry_version: "86"
+      - 1678202
+    expiry_version: "92"
     release_channel_collection: opt-out
   resize:
     objects: ["player"]
@@ -2249,7 +2252,6 @@
       height: The height that the window was resize to
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     products:
       - "firefox"
       - "fennec"
@@ -2257,7 +2259,8 @@
       - main
     bug_numbers:
       - 1560590
-    expiry_version: "86"
+      - 1678202
+    expiry_version: "92"
     release_channel_collection: opt-out
   move:
     objects: ["player"]
@@ -2268,7 +2271,6 @@
       screenY: The screen Y coordinate that the window was moved to
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     products:
       - "firefox"
       - "fennec"
@@ -2276,7 +2278,8 @@
       - main
     bug_numbers:
       - 1560590
-    expiry_version: "86"
+      - 1678202
+    expiry_version: "92"
     release_channel_collection: opt-out
 
 doh:
@@ -2567,3 +2570,32 @@
     extra_keys:
       error_code: Code of the XML Error (See `XML_Error` enum in expat.h for the list of errors where XML_ERROR_NONE is 0).
       location: Location as Row:Column of where the error happened.
+      last_line: The content of the last line that led to the error.
+      last_line_len: The length of the last line that led to the error.
+
+dom.quota.try:
+  error:
+    objects: [
+      "step",
+    ]
+    bug_numbers:
+      - 1665088
+    description: >
+      An event recorded on an error of the quota manager or its clients. Since errors are usually
+      propagated up the call chain, all such propagation steps are recorded for an error. This
+      is only active during specific contexts, in particular during storage initialization.
+      No dynamic data is included in the event beyond the error code which will be added through
+      Bug 1670555.
+    notification_emails:
+      - jvarga@mozilla.com
+      - sgiesecke@mozilla.com
+      - storage-telemetry@mozilla.com
+    products:
+      - firefox
+    expiry_version: "never"
+    record_in_processes: ["main", "content"]
+    extra_keys:
+      context: The context in which the error occurred, e.g. during a storage initialization. Telemetry events are only emitted for selected contexts.
+      module: The module (quota manager or one of its clients) where the error occured.
+      source_file: The name of the source code file where the error occured.
+      source_line: The line within source_file where the error occured.
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/geckoview/gtest/TestGeckoViewStreaming.cpp firefox-85.0+build1/toolkit/components/telemetry/geckoview/gtest/TestGeckoViewStreaming.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/geckoview/gtest/TestGeckoViewStreaming.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/geckoview/gtest/TestGeckoViewStreaming.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,7 +5,10 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
+#include "nsIObserverService.h"
 #include "nsThreadUtils.h"
 #include "TelemetryFixture.h"
 #include "TelemetryTestHelpers.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/geckoview/streaming/GeckoViewStreamingTelemetry.cpp firefox-85.0+build1/toolkit/components/telemetry/geckoview/streaming/GeckoViewStreamingTelemetry.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/geckoview/streaming/GeckoViewStreamingTelemetry.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/geckoview/streaming/GeckoViewStreamingTelemetry.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,9 +9,11 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/StaticPrefs_toolkit.h"
 #include "mozilla/TimeStamp.h"
 #include "nsDataHashtable.h"
+#include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsITimer.h"
 #include "nsTArray.h"
@@ -21,7 +23,6 @@
 using mozilla::StaticMutex;
 using mozilla::StaticMutexAutoLock;
 using mozilla::StaticRefPtr;
-using mozilla::TaskCategory;
 using mozilla::TimeStamp;
 
 // Batches and streams Telemetry samples to a JNI delegate which will
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/histogram-allowlists.json firefox-85.0+build1/toolkit/components/telemetry/histogram-allowlists.json
--- firefox-84.0.2+build1/toolkit/components/telemetry/histogram-allowlists.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/histogram-allowlists.json	2021-01-18 19:58:27.000000000 +0000
@@ -11,8 +11,6 @@
     "BROWSER_SET_DEFAULT_DIALOG_PROMPT_RAWCOUNT",
     "BROWSER_SET_DEFAULT_ERROR",
     "BROWSER_SET_DEFAULT_RESULT",
-    "BR_9_2_1_SUBJECT_ALT_NAMES",
-    "BR_9_2_2_SUBJECT_COMMON_NAME",
     "CACHE_DEVICE_SEARCH_2",
     "CACHE_LM_INCONSISTENT",
     "CACHE_OFFLINE_SEARCH_2",
@@ -374,8 +372,6 @@
     "BROWSER_SET_DEFAULT_DIALOG_PROMPT_RAWCOUNT",
     "BROWSER_SET_DEFAULT_ERROR",
     "BROWSER_SET_DEFAULT_RESULT",
-    "BR_9_2_1_SUBJECT_ALT_NAMES",
-    "BR_9_2_2_SUBJECT_COMMON_NAME",
     "BUCKET_ORDER_ERRORS",
     "CACHE_DEVICE_SEARCH_2",
     "CACHE_LM_INCONSISTENT",
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/Histograms.json firefox-85.0+build1/toolkit/components/telemetry/Histograms.json
--- firefox-84.0.2+build1/toolkit/components/telemetry/Histograms.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/Histograms.json	2021-01-18 19:58:27.000000000 +0000
@@ -2112,6 +2112,32 @@
     "keyed": true,
     "description": "HTTP channel (keys: uses_http3_page, uses_http3_sub, supports_http3_page, supports_http3_sub): Overall load time - network (ms)"
   },
+  "HTTP3_PERF_PAGE_LOAD_TIME_MS": {
+    "record_in_processes": ["content"],
+    "products": ["firefox"],
+    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 50000,
+    "n_buckets": 100,
+    "bug_numbers": [1675503],
+    "keyed": true,
+    "description": "Time in milliseconds from navigationStart to loadEventStart for the foreground http or https root content document. This is collected only on page load where the main document uses or suppports HTTP3"
+  },
+  "HTTP3_PERF_FIRST_CONTENTFUL_PAINT_MS": {
+    "record_in_processes": ["content"],
+    "products": ["firefox"],
+    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
+    "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "kind": "exponential",
+    "high": 50000,
+    "n_buckets": 100,
+    "bug_numbers": [1675503],
+    "keyed": true,
+    "description": "The time between navigationStart and the first contentful paint of a foreground http or https root content document, in milliseconds. The contentful paint timestamp is taken during display list building and does not include rasterization or compositing of that paint. This is collected only on page load where the main document uses or suppports HTTP3"
+  },
   "HTTP_PROXY_TYPE": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec"],
@@ -2611,39 +2637,6 @@
     "bug_numbers": [1296288, 1654309],
     "releaseChannelCollection": "opt-out"
   },
-  "ESNI_KEYS_RECORD_FETCH_DELAYS": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "expires_in_version": "70",
-    "kind": "exponential",
-    "high": 60000,
-    "n_buckets": 100,
-    "description": "Added delays caused the esni keys fetching.(ms)",
-    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
-    "bug_numbers": [1473736],
-    "releaseChannelCollection": "opt-out"
-  },
-  "ESNI_KEYS_RECORDS_FOUND": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "expires_in_version": "70",
-    "kind": "boolean",
-    "description": "ESNI Keys found rate.",
-    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
-    "bug_numbers": [1473736],
-    "releaseChannelCollection": "opt-out"
-  },
-  "ESNI_NOESNI_TLS_SUCCESS_RATE": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "expires_in_version": "70",
-    "kind": "categorical",
-    "labels": ["EsniTLSSucceeded", "EsniTLSFailed", "NoEsniTLSSucceeded", "NoEsniTLSFailed"],
-    "description": "TLS handshake with and without esni success rate.",
-    "alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"],
-    "bug_numbers": [1473736],
-    "releaseChannelCollection": "opt-out"
-  },
   "SSL_HANDSHAKE_VERSION": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec"],
@@ -6951,9 +6944,9 @@
   "FX_TAB_CLOSE_TIME_NO_ANIM_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com"],
+    "alert_emails": ["mconley@mozilla.com", "esmyth@mozilla.com"],
     "bug_numbers": [1340842],
-    "expires_in_version": "86",
+    "expires_in_version": "92",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -6962,9 +6955,9 @@
   "FX_TAB_CLOSE_PERMIT_UNLOAD_TIME_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "alert_emails": ["mconley@mozilla.com", "hkirschner@mozilla.com"],
+    "alert_emails": ["mconley@mozilla.com", "esmyth@mozilla.com"],
     "bug_numbers": [1340842],
-    "expires_in_version": "86",
+    "expires_in_version": "92",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 50,
@@ -7383,9 +7376,9 @@
   "FX_MIGRATION_ENTRY_POINT": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [731025, 1584261, 1643431, 1665442],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [731025, 1584261, 1643431, 1665442, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "enumerated",
     "n_values": 10,
     "releaseChannelCollection": "opt-out",
@@ -7394,9 +7387,9 @@
   "FX_MIGRATION_SOURCE_BROWSER": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [731025, 1523179, 1643431],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [731025, 1523179, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "enumerated",
     "n_values": 15,
     "releaseChannelCollection": "opt-out",
@@ -7405,9 +7398,9 @@
   "FX_MIGRATION_ERRORS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [731025, 1584261, 1643431],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [731025, 1584261, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "enumerated",
     "keyed": true,
     "n_values": 12,
@@ -7417,9 +7410,9 @@
   "FX_MIGRATION_USAGE": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [731025, 1584261, 1643431],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [731025, 1584261, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "enumerated",
     "keyed": true,
     "n_values": 12,
@@ -7429,9 +7422,9 @@
   "FX_MIGRATION_BOOKMARKS_IMPORT_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1289436, 1643431],
-    "alert_emails": ["gijs@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [1289436, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 70,
     "high": 100000,
@@ -7442,9 +7435,9 @@
   "FX_MIGRATION_HISTORY_IMPORT_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1289436, 1643431],
-    "alert_emails": ["gijs@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [1289436, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 70,
     "high": 100000,
@@ -7455,9 +7448,9 @@
   "FX_MIGRATION_LOGINS_IMPORT_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1289436, 1584261, 1643431],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com", "passwords-dev@mozilla.org"],
-    "expires_in_version": "86",
+    "bug_numbers": [1289436, 1584261, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com", "passwords-dev@mozilla.org"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 70,
     "high": 100000,
@@ -7494,9 +7487,9 @@
   "FX_MIGRATION_LOGINS_JANK_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1338522, 1584261, 1643431],
-    "alert_emails": ["dao@mozilla.com", "MattN+telemetry@mozilla.com", "passwords-dev@mozilla.org"],
-    "expires_in_version": "86",
+    "bug_numbers": [1338522, 1584261, 1643431, 1678204],
+    "alert_emails": ["dao@mozilla.com", "passwords-dev@mozilla.org"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 20,
     "high": 60000,
@@ -7519,9 +7512,9 @@
   "FX_MIGRATION_BOOKMARKS_QUANTITY": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1279501, 1643431],
-    "alert_emails": ["gijs@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [1279501, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 20,
     "high": 1000,
@@ -7532,9 +7525,9 @@
   "FX_MIGRATION_HISTORY_QUANTITY": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1279501, 1643431],
-    "alert_emails": ["gijs@mozilla.com"],
-    "expires_in_version": "86",
+    "bug_numbers": [1279501, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 40,
     "high": 10000,
@@ -7545,9 +7538,9 @@
   "FX_MIGRATION_LOGINS_QUANTITY": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "bug_numbers": [1279501, 1584261, 1643431],
-    "alert_emails": ["gijs@mozilla.com", "MattN+telemetry@mozilla.com", "passwords-dev@mozilla.org"],
-    "expires_in_version": "86",
+    "bug_numbers": [1279501, 1584261, 1643431, 1678204],
+    "alert_emails": ["gijs@mozilla.com", "mak@mozilla.com", "passwords-dev@mozilla.org"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "n_buckets": 20,
     "high": 1000,
@@ -9496,10 +9489,10 @@
   "PDF_VIEWER_DOCUMENT_VERSION_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["other", "v1_0", "v1_1", "v1_2", "v1_3", "v1_4", "v1_5", "v1_6", "v1_7", "v1_8", "v1_9", "v2_0", "v2_1", "v2_2", "v2_3"],
     "description": "The PDF document version (1.1, 1.2, etc.)"
@@ -9507,10 +9500,10 @@
   "PDF_VIEWER_DOCUMENT_GENERATOR_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["acrobat_distiller", "acrobat_pdfwriter", "adobe_livecycle", "adobe_pdf_library", "adobe_photoshop", "ghostscript", "tcpdf", "cairo", "dvipdfm", "dvips", "pdftex", "pdfkit", "itext", "prince", "quarkxpress", "mac_os_x", "microsoft", "openoffice", "oracle", "luradocument", "pdf_xchange", "antenna_house", "aspose_cells", "fpdf", "other"],
     "description": "The PDF document generator"
@@ -9518,10 +9511,10 @@
   "PDF_VIEWER_DOCUMENT_SIZE_KB": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "exponential",
     "low": 2,
     "high": 65536,
@@ -9531,10 +9524,10 @@
   "PDF_VIEWER_FONT_TYPES_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["UNKNOWN", "TYPE1", "TYPE1C", "CIDFONTTYPE0", "CIDFONTTYPE0C", "TRUETYPE", "CIDFONTTYPE2", "TYPE3", "OPENTYPE", "TYPE0", "MMTYPE1"],
     "description": "The PDF document font types used"
@@ -9542,10 +9535,10 @@
   "PDF_VIEWER_EMBED_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["object_embed", "iframe"],
     "description": "A PDF document was embedded using OBJECT/EMBED and or an IFRAME"
@@ -9553,10 +9546,10 @@
   "PDF_VIEWER_FORM_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["acroform", "xfa"],
     "description": "If a form was used, its type."
@@ -9564,10 +9557,10 @@
   "PDF_VIEWER_STREAM_TYPES_2": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1566882],
+    "bug_numbers": [1566882, 1666979],
     "kind": "categorical",
     "labels": ["UNKNOWN", "FLATE", "LZW", "DCT", "JPX", "JBIG", "A85", "AHX", "CCF", "RLX"],
     "description": "The PDF document compression stream types used"
@@ -9587,10 +9580,10 @@
   "PDF_VIEWER_FALLBACK_REASON": {
     "record_in_processes": ["content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1630844],
+    "bug_numbers": [1630844, 1666979],
     "kind": "categorical",
     "labels": ["unknown", "forms", "javaScript", "smask", "shadingPattern", "font", "errorTilingPattern", "errorExtGState", "errorXObject", "errorFontLoadType3", "errorFontState", "errorFontMissing", "errorFontTranslate", "errorColorSpace", "errorOperatorList", "errorFontToUnicode", "errorFontLoadNative", "errorFontGetPath"],
     "description": "The reason the fallback bar was shown."
@@ -9598,10 +9591,10 @@
   "PDF_VIEWER_FALLBACK_ERROR": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox"],
-    "expires_in_version": "84",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1643402],
+    "bug_numbers": [1643402, 1666979],
     "kind": "categorical",
     "labels": ["unknown", "forms", "javaScript", "smask", "shadingPattern", "font", "errorTilingPattern", "errorExtGState", "errorXObject", "errorFontLoadType3", "errorFontState", "errorFontMissing", "errorFontTranslate", "errorColorSpace", "errorOperatorList", "errorFontToUnicode", "errorFontLoadNative", "errorFontGetPath"],
     "description": "All errors that could trigger the fallback bar, even after the bar is shown."
@@ -9609,10 +9602,10 @@
   "PDF_VIEWER_TAGGED": {
     "record_in_processes": ["content"],
     "products": ["firefox"],
-    "expires_in_version": "87",
+    "expires_in_version": "88",
     "alert_emails": ["bdahl@mozilla.com"],
     "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1673128],
+    "bug_numbers": [1673128, 1666979],
     "kind": "boolean",
     "description": "If a PDF is tagged."
   },
@@ -12095,37 +12088,13 @@
   "CRLITE_RESULT": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "expires_in_version": "86",
+    "expires_in_version": "92",
     "kind": "categorical",
     "labels": ["FilterNotAvailable", "IssuerNotEnrolled", "CertificateTooNew", "CertificateValid", "CertificateRevoked", "LibraryFailure", "CertRevokedByStash"],
     "description": "The result of looking up revocation information for a TLS server certificate in CRLite.",
-    "bug_numbers": [1586855, 1607765, 1670984],
+    "bug_numbers": [1586855, 1607765, 1670984, 1678206],
     "releaseChannelCollection": "opt-out",
-    "alert_emails": ["dkeeler@mozilla.com", "jcj@mozilla.com", "seceng-telemetry@mozilla.com"]
-  },
-  "CRLITE_FASTER_THAN_OCSP_MS": {
-    "record_in_processes": ["main"],
-    "products": ["firefox"],
-    "expires_in_version": "86",
-    "kind": "exponential",
-    "high": 20000,
-    "n_buckets": 50,
-    "description": "If both a CRLite lookup and OCSP request are made, how many milliseconds faster was CRLite?",
-    "bug_numbers": [1602641, 1607765],
-    "releaseChannelCollection": "opt-out",
-    "alert_emails": ["dkeeler@mozilla.com", "jcj@mozilla.com", "seceng-telemetry@mozilla.com"]
-  },
-  "OCSP_FASTER_THAN_CRLITE_MS": {
-    "record_in_processes": ["main"],
-    "products": ["firefox"],
-    "expires_in_version": "86",
-    "kind": "exponential",
-    "high": 20000,
-    "n_buckets": 50,
-    "description": "If both a CRLite lookup and OCSP request are made, how many milliseconds faster was OCSP?",
-    "bug_numbers": [1602641, 1607765],
-    "releaseChannelCollection": "opt-out",
-    "alert_emails": ["dkeeler@mozilla.com", "jcj@mozilla.com", "seceng-telemetry@mozilla.com"]
+    "alert_emails": ["dkeeler@mozilla.com", "seceng-telemetry@mozilla.com"]
   },
   "WEAVE_START_COUNT": {
     "record_in_processes": ["main", "content"],
@@ -12260,22 +12229,6 @@
     "n_buckets": 10,
     "description": "Duration of shutdown phase profile-before-change, as measured by the shutdown terminator, in seconds of activity"
   },
-  "BR_9_2_1_SUBJECT_ALT_NAMES": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec"],
-    "expires_in_version": "never",
-    "kind": "enumerated",
-    "n_values": 8,
-    "description": "Baseline Requirements section 9.2.1: subject alternative names extension (0: ok, 1 or more: error)"
-  },
-  "BR_9_2_2_SUBJECT_COMMON_NAME": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec"],
-    "expires_in_version": "never",
-    "kind": "enumerated",
-    "n_values": 8,
-    "description": "Baseline Requirements section 9.2.2: subject common name field (0: present, in subject alt. names; 1: not present; 2: not present in subject alt. names)"
-  },
   "TAP_TO_LOAD_ENABLED": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec"],
@@ -14270,8 +14223,8 @@
   "INTERMEDIATE_PRELOADING_ERRORS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "alert_emails": ["seceng-telemetry@mozilla.com", "jjones@mozilla.com", "dkeeler@mozilla.com"],
-    "expires_in_version": "86",
+    "alert_emails": ["seceng-telemetry@mozilla.com", "dkeeler@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "categorical",
     "labels": ["emptyAttachment",
                "failedToDownloadMisc",
@@ -14282,18 +14235,18 @@
                "failedToUpdateDB",
                "unexpectedHash",
                "unexpectedLength"],
-    "bug_numbers": [1519273, 1553550],
+    "bug_numbers": [1519273, 1553550, 1678206],
     "description": "Errors occurred during intermediate certificate preloading."
   },
   "INTERMEDIATE_PRELOADING_UPDATE_TIME_MS": {
     "record_in_processes": ["main"],
     "products": ["firefox"],
-    "alert_emails": ["seceng-telemetry@mozilla.com", "jjones@mozilla.com", "dkeeler@mozilla.com"],
-    "expires_in_version": "86",
+    "alert_emails": ["seceng-telemetry@mozilla.com", "dkeeler@mozilla.com"],
+    "expires_in_version": "92",
     "kind": "exponential",
     "high": 180000,
     "n_buckets": 50,
-    "bug_numbers": [1519273, 1553550],
+    "bug_numbers": [1519273, 1553550, 1678206],
     "description": "Number of milliseconds to update the pre-loaded data, if updated."
   },
   "IPC_SYNC_MESSAGE_MANAGER_LATENCY_MS": {
@@ -15356,20 +15309,6 @@
     "description": "Counts the number of times a user enable or disable the media control feature via UI button, and the total number of times media control feature is enabled and disabled, which allow us to calculate the number of times a user changes setting via modifying the preference directly.",
     "releaseChannelCollection": "opt-out"
   },
-  "MEDIA_CONTROL_PLATFORM_USAGE": {
-    "record_in_processes": ["main"],
-    "products": ["firefox"],
-    "alert_emails": [
-      "alwu@mozilla.com",
-      "cchang@mozilla.com"
-    ],
-    "bug_numbers": [1668139],
-    "expires_in_version": "90",
-    "kind": "categorical",
-    "labels": ["UsedOnWin", "EnabledOnWin", "UsedOnMac", "EnabledOnMac", "UsedOnLinux", "EnabledOnLinux", "UsedOnAndroid", "EnabledOnAndroid"],
-    "description": "Counts the number of times users enable and use media control on different platforms.",
-    "releaseChannelCollection": "opt-out"
-  },
   "MEDIA_CONTROL_HANDLE_PLAY_PAUSE_STOP_ACTIONS": {
     "record_in_processes": ["content"],
     "products": ["firefox"],
@@ -16124,5 +16063,112 @@
     "n_buckets": 50,
     "bug_numbers": [1671886],
     "description": "When echConfig is enabled, number of times a transaction is retried because of other error"
+  },
+  "EXTERNAL_PROTOCOL_HANDLER_DIALOG_CONTEXT_SCHEME": {
+    "record_in_processes": ["main"],
+    "products": ["firefox"],
+    "alert_emails": ["pbz@mozilla.com", "seceng-telemetry@mozilla.com"],
+    "bug_numbers": [1672344],
+    "expires_in_version": "87",
+    "kind": "categorical",
+    "releaseChannelCollection": "opt-out",
+    "description": "Counts how often the external protocol handler dialog is shown. Labelled by protocol scheme. Keyed by the kind of browsing context the navigation was triggered from: TOPLEVEL: Top browser, SUB_SAMEORIGIN: Same origin iframe, SUB_CROSSORIGIN: Cross origin iframe, SUB_SANDBOX_ALLOW: Sandboxed iframe with relevant allow flags, SUB_SANDBOX_NOALLOW: Sandboxed iframe without relevant allow flags",
+    "keyed": true,
+    "keys": ["TOPLEVEL", "SUB_SAMEORIGIN", "SUB_CROSSORIGIN", "SUB_SANDBOX_ALLOW", "SUB_SANDBOX_NOALLOW", "UNKNOWN"],
+    "labels": [
+      "APPLE",
+      "APPLE_FINDMY",
+      "APPLE_LIVESTREAM",
+      "APPLE_MUSIC",
+      "BING",
+      "FACEBOOK",
+      "FACETIME",
+      "GIT",
+      "ICLOUD",
+      "IMESSAGE",
+      "INSTANT_MESSAGE",
+      "IPP",
+      "IRC",
+      "MACAPPSTORE",
+      "MAP",
+      "MESSAGE",
+      "MICROSOFT_APP",
+      "MUSIC",
+      "ONENOTE",
+      "OTHER",
+      "OUTLOOK",
+      "PHOTOS",
+      "PODCAST",
+      "SEARCH",
+      "SIP",
+      "SKYPE",
+      "TELEGRAM",
+      "TELEVISION",
+      "WEBHANDLER",
+      "WINDOWS_PREFIX",
+      "XBOX",
+      "ZOOM",
+      "addressbook",
+      "afp",
+      "aim",
+      "apconfig",
+      "apt",
+      "apupdate",
+      "bitcoin",
+      "calculator",
+      "calendar",
+      "callto",
+      "cap",
+      "cifs",
+      "cloudphoto",
+      "daap",
+      "dav",
+      "dict",
+      "doi",
+      "feed",
+      "ftp",
+      "geo",
+      "grvopen",
+      "gtalk",
+      "help",
+      "ibooks",
+      "ical",
+      "info",
+      "lastfm",
+      "ldap",
+      "magnet",
+      "mailto",
+      "mapi",
+      "messenger",
+      "msnweather",
+      "mumble",
+      "mvn",
+      "nfs",
+      "odopen",
+      "rss",
+      "slack",
+      "smb",
+      "sms",
+      "snap",
+      "spotify",
+      "ssh",
+      "steam",
+      "stocks",
+      "svn",
+      "tbauth",
+      "teamspeak",
+      "tel",
+      "telnet",
+      "twitter",
+      "ventrilo",
+      "videos",
+      "vnc",
+      "vscode",
+      "webcal",
+      "weixin",
+      "whatsapp",
+      "xbls",
+      "xmpp"
+    ]
   }
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/moz.build firefox-85.0+build1/toolkit/components/telemetry/moz.build
--- firefox-84.0.2+build1/toolkit/components/telemetry/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -80,6 +80,8 @@
 if CONFIG["OS_ARCH"] == "WINNT":
     SOURCES += [
         "other/UntrustedModules.cpp",
+        "other/UntrustedModulesBackupService.cpp",
+        "other/UntrustedModulesDataSerializer.cpp",
     ]
 
 XPCOM_MANIFESTS += [
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/CombinedStacks.cpp firefox-85.0+build1/toolkit/components/telemetry/other/CombinedStacks.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/CombinedStacks.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/CombinedStacks.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -27,6 +27,26 @@
   return mModules[aIndex];
 }
 
+void CombinedStacks::AddFrame(
+    size_t aStackIndex, const ProcessedStack::Frame& aFrame,
+    const std::function<const ProcessedStack::Module&(int)>& aModuleGetter) {
+  uint16_t modIndex;
+  if (aFrame.mModIndex == std::numeric_limits<uint16_t>::max()) {
+    modIndex = aFrame.mModIndex;
+  } else {
+    const ProcessedStack::Module& module = aModuleGetter(aFrame.mModIndex);
+    auto modIterator = std::find(mModules.begin(), mModules.end(), module);
+    if (modIterator == mModules.end()) {
+      mModules.push_back(module);
+      modIndex = mModules.size() - 1;
+    } else {
+      modIndex = modIterator - mModules.begin();
+    }
+  }
+  mStacks[aStackIndex].push_back(
+      ProcessedStack::Frame{aFrame.mOffset, modIndex});
+}
+
 size_t CombinedStacks::AddStack(const Telemetry::ProcessedStack& aStack) {
   size_t index = mNextIndex;
   // Advance the indices of the circular queue holding the stacks.
@@ -35,35 +55,45 @@
   if (mStacks.size() < mMaxStacksCount) {
     mStacks.resize(mStacks.size() + 1);
   }
-  // Get a reference to the location holding the new stack.
-  CombinedStacks::Stack& adjustedStack = mStacks[index];
-  // If we're using an old stack to hold aStack, clear it.
-  adjustedStack.clear();
+
+  // Clear the old stack before set.
+  mStacks[index].clear();
 
   size_t stackSize = aStack.GetStackSize();
   for (size_t i = 0; i < stackSize; ++i) {
-    const Telemetry::ProcessedStack::Frame& frame = aStack.GetFrame(i);
-    uint16_t modIndex;
-    if (frame.mModIndex == std::numeric_limits<uint16_t>::max()) {
-      modIndex = frame.mModIndex;
-    } else {
-      const Telemetry::ProcessedStack::Module& module =
-          aStack.GetModule(frame.mModIndex);
-      std::vector<Telemetry::ProcessedStack::Module>::iterator modIterator =
-          std::find(mModules.begin(), mModules.end(), module);
-      if (modIterator == mModules.end()) {
-        mModules.push_back(module);
-        modIndex = mModules.size() - 1;
-      } else {
-        modIndex = modIterator - mModules.begin();
-      }
-    }
-    Telemetry::ProcessedStack::Frame adjustedFrame = {frame.mOffset, modIndex};
-    adjustedStack.push_back(adjustedFrame);
+    // Need to specify a return type in the following lambda,
+    // otherwise it's incorrectly deduced to be a non-reference type.
+    AddFrame(index, aStack.GetFrame(i),
+             [&aStack](int aIdx) -> const ProcessedStack::Module& {
+               return aStack.GetModule(aIdx);
+             });
   }
   return index;
 }
 
+void CombinedStacks::AddStacks(const CombinedStacks& aStacks) {
+  mStacks.resize(
+      std::min(mStacks.size() + aStacks.GetStackCount(), mMaxStacksCount));
+
+  for (const auto& stack : aStacks.mStacks) {
+    size_t index = mNextIndex;
+    // Advance the indices of the circular queue holding the stacks.
+    mNextIndex = (mNextIndex + 1) % mMaxStacksCount;
+
+    // Clear the old stack before set.
+    mStacks[index].clear();
+
+    for (const auto& frame : stack) {
+      // Need to specify a return type in the following lambda,
+      // otherwise it's incorrectly deduced to be a non-reference type.
+      AddFrame(index, frame,
+               [&aStacks](int aIdx) -> const ProcessedStack::Module& {
+                 return aStacks.mModules[aIdx];
+               });
+    }
+  }
+}
+
 const CombinedStacks::Stack& CombinedStacks::GetStack(unsigned aIndex) const {
   return mStacks[aIndex];
 }
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/CombinedStacks.h firefox-85.0+build1/toolkit/components/telemetry/other/CombinedStacks.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/CombinedStacks.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/CombinedStacks.h	2021-01-18 19:58:27.000000000 +0000
@@ -36,6 +36,7 @@
   size_t GetModuleCount() const;
   const Stack& GetStack(unsigned aIndex) const;
   size_t AddStack(const Telemetry::ProcessedStack& aStack);
+  void AddStacks(const CombinedStacks& aStacks);
   size_t GetStackCount() const;
   size_t SizeOfExcludingThis() const;
   void RemoveStack(unsigned aIndex);
@@ -54,6 +55,10 @@
   // The maximum number of stacks to keep in the CombinedStacks object.
   size_t mMaxStacksCount;
 
+  void AddFrame(
+      size_t aStackIndex, const ProcessedStack::Frame& aFrame,
+      const std::function<const ProcessedStack::Module&(int)>& aModuleGetter);
+
   friend struct ::IPC::ParamTraits<CombinedStacks>;
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/ProcessedStack.h firefox-85.0+build1/toolkit/components/telemetry/other/ProcessedStack.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/ProcessedStack.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/ProcessedStack.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,8 @@
 #include <string>
 #include <vector>
 
+#include "ipc/IPCMessageUtils.h"
+#include "ipc/IPCMessageUtilsSpecializations.h"
 #include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/Vector.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp firefox-85.0+build1/toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/TelemetryIOInterposeObserver.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "TelemetryIOInterposeObserver.h"
 #include "core/TelemetryCommon.h"
 #include "js/Array.h"  // JS::NewArrayObject
+#include "nsIFile.h"
 
 namespace mozilla::Telemetry {
 
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.cpp firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,90 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#include "UntrustedModulesBackupService.h"
+
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/HashFunctions.h"
+#include "mozilla/SchedulerGroup.h"
+#include "mozilla/StaticLocalPtr.h"
+
+namespace mozilla {
+
+ProcessHashKey::ProcessHashKey(GeckoProcessType aType, DWORD aPid)
+    : mType(aType), mPid(aPid) {}
+
+bool ProcessHashKey::operator==(const ProcessHashKey& aOther) const {
+  return mPid == aOther.mPid && mType == aOther.mType;
+}
+
+PLDHashNumber ProcessHashKey::Hash() const { return HashGeneric(mPid, mType); }
+
+void UntrustedModulesBackupData::Add(UntrustedModulesData&& aData) {
+  auto p = LookupForAdd(ProcessHashKey(aData.mProcessType, aData.mPid));
+  if (p) {
+    p.Data()->mData.Merge(std::move(aData));
+  } else {
+    auto data = MakeRefPtr<UntrustedModulesDataContainer>(std::move(aData));
+    p.OrInsert([data = std::move(data)]() { return data; });
+  }
+}
+
+/* static */
+UntrustedModulesBackupService* UntrustedModulesBackupService::Get() {
+  if (!XRE_IsParentProcess()) {
+    return nullptr;
+  }
+
+  static StaticLocalRefPtr<UntrustedModulesBackupService> sInstance(
+      []() -> already_AddRefed<UntrustedModulesBackupService> {
+        RefPtr<UntrustedModulesBackupService> instance(
+            new UntrustedModulesBackupService());
+
+        auto setClearOnShutdown = [ptr = &sInstance]() -> void {
+          ClearOnShutdown(ptr);
+        };
+
+        if (NS_IsMainThread()) {
+          setClearOnShutdown();
+          return instance.forget();
+        }
+
+        SchedulerGroup::Dispatch(
+            TaskCategory::Other,
+            NS_NewRunnableFunction(
+                "mozilla::UntrustedModulesBackupService::Get",
+                std::move(setClearOnShutdown)));
+
+        return instance.forget();
+      }());
+
+  return sInstance;
+}
+
+void UntrustedModulesBackupService::Backup(BackupType aType,
+                                           UntrustedModulesData&& aData) {
+  mBackup[static_cast<uint32_t>(aType)].Add(std::move(aData));
+}
+
+void UntrustedModulesBackupService::SettleAllStagingData() {
+  UntrustedModulesBackupData staging;
+  staging.SwapElements(mBackup[static_cast<uint32_t>(BackupType::Staging)]);
+
+  for (auto&& iter = staging.Iter(); !iter.Done(); iter.Next()) {
+    if (!iter.Data()) {
+      continue;
+    }
+    mBackup[static_cast<uint32_t>(BackupType::Settled)].Add(
+        std::move(iter.Data()->mData));
+  }
+}
+
+const UntrustedModulesBackupData& UntrustedModulesBackupService::Ref(
+    BackupType aType) const {
+  return mBackup[static_cast<uint32_t>(aType)];
+}
+
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.h firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesBackupService.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,69 @@
+/* -*- 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 https://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_UntrustedModulesBackupService_h
+#define mozilla_UntrustedModulesBackupService_h
+
+#include "mozilla/UntrustedModulesData.h"
+#include "nsRefPtrHashtable.h"
+
+namespace mozilla {
+
+struct ProcessHashKey {
+  GeckoProcessType mType;
+  DWORD mPid;
+  ProcessHashKey(GeckoProcessType aType, DWORD aPid);
+  bool operator==(const ProcessHashKey& aOther) const;
+  PLDHashNumber Hash() const;
+};
+
+// UntrustedModulesData should not be refcounted as it's exchanged via IPC.
+// Instead, we define this container class owning UntrustedModulesData along
+// with a refcount.
+class MOZ_HEAP_CLASS UntrustedModulesDataContainer final {
+  ~UntrustedModulesDataContainer() = default;
+
+ public:
+  UntrustedModulesData mData;
+
+  explicit UntrustedModulesDataContainer(UntrustedModulesData&& aData)
+      : mData(std::move(aData)) {}
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(UntrustedModulesDataContainer)
+};
+
+class UntrustedModulesBackupData
+    : public nsRefPtrHashtable<nsGenericHashKey<ProcessHashKey>,
+                               UntrustedModulesDataContainer> {
+ public:
+  void Add(UntrustedModulesData&& aData);
+};
+
+class MOZ_HEAP_CLASS UntrustedModulesBackupService final {
+ public:
+  enum class BackupType : uint32_t {
+    Staging = 0,
+    Settled,
+
+    Count
+  };
+
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(UntrustedModulesBackupService)
+
+  static UntrustedModulesBackupService* Get();
+  void Backup(BackupType aType, UntrustedModulesData&& aData);
+  void SettleAllStagingData();
+  const UntrustedModulesBackupData& Ref(BackupType aType) const;
+
+ private:
+  UntrustedModulesBackupData mBackup[static_cast<uint32_t>(BackupType::Count)];
+
+  ~UntrustedModulesBackupService() = default;
+};
+
+}  // namespace mozilla
+
+#endif  // mozilla_UntrustedModulesBackupService_h
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModules.cpp firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModules.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModules.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModules.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,520 +6,46 @@
 
 #include "UntrustedModules.h"
 
-#include "core/TelemetryCommon.h"
-#include "js/Array.h"  // JS::NewArrayObject
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/RDDChild.h"
 #include "mozilla/RDDProcessManager.h"
-#include "mozilla/UntrustedModulesProcessor.h"
 #include "mozilla/WinDllServices.h"
-#include "nsCOMPtr.h"
-#include "nsDataHashtable.h"
 #include "nsISupportsImpl.h"
-#include "nsLocalFile.h"
 #include "nsProxyRelease.h"
-#include "nsUnicharUtils.h"
 #include "nsXULAppAPI.h"
-
-namespace {
-using IndexMap = nsDataHashtable<nsStringHashKey, uint32_t>;
-}  // anonymous namespace
+#include "UntrustedModulesDataSerializer.h"
 
 namespace mozilla {
 namespace Telemetry {
 
-static const uint32_t kThirdPartyModulesPingVersion = 1;
 static const uint32_t kMaxModulesArrayLen = 100;
 
-/**
- * Limits the length of a string by removing the middle of the string, replacing
- * with ellipsis.
- * e.g. LimitStringLength("hello world", 6) would result in "he...d"
- *
- * @param  aStr            [in,out] The string to transform
- * @param  aMaxFieldLength [in] The maximum length of the resulting string.
- */
-static void LimitStringLength(nsAString& aStr, size_t aMaxFieldLength) {
-  if (aStr.Length() <= aMaxFieldLength) {
-    return;
-  }
-
-  constexpr auto kEllipsis = u"..."_ns;
-
-  if (aMaxFieldLength <= (kEllipsis.Length() + 3)) {
-    // An ellipsis is useless in this case, as it would obscure the string to
-    // the point that we cannot even determine the string's contents. We might
-    // as well just truncate.
-    aStr.Truncate(aMaxFieldLength);
-    return;
-  }
-
-  size_t cutPos = (aMaxFieldLength - kEllipsis.Length()) / 2;
-  size_t rightLen = aMaxFieldLength - kEllipsis.Length() - cutPos;
-  size_t cutLen = aStr.Length() - (cutPos + rightLen);
-
-  aStr.Replace(cutPos, cutLen, kEllipsis);
-}
-
-/**
- * Adds a string property to a JS object, that's limited in length using
- * LimitStringLength().
- *
- * @param  cx              [in] The JS context
- * @param  aObj            [in] The object to add the property to
- * @param  aName           [in] The name of the property to add
- * @param  aVal            [in] The JS value of the resulting property.
- * @param  aMaxFieldLength [in] The maximum length of the value
- *                         (see LimitStringLength())
- * @return true upon success
- */
-static bool AddLengthLimitedStringProp(JSContext* cx, JS::HandleObject aObj,
-                                       const char* aName, const nsAString& aVal,
-                                       size_t aMaxFieldLength = MAX_PATH) {
-  JS::RootedValue jsval(cx);
-  nsAutoString shortVal(aVal);
-  LimitStringLength(shortVal, aMaxFieldLength);
-  jsval.setString(Common::ToJSString(cx, shortVal));
-  return JS_DefineProperty(cx, aObj, aName, jsval, JSPROP_ENUMERATE);
-};
-
-static JSString* ModuleVersionToJSString(JSContext* aCx,
-                                         const ModuleVersion& aVersion) {
-  uint16_t major, minor, patch, build;
-
-  Tie(major, minor, patch, build) = aVersion.AsTuple();
-
-  constexpr auto dot = u"."_ns;
-
-  nsAutoString strVer;
-  strVer.AppendInt(major);
-  strVer.Append(dot);
-  strVer.AppendInt(minor);
-  strVer.Append(dot);
-  strVer.AppendInt(patch);
-  strVer.Append(dot);
-  strVer.AppendInt(build);
-
-  return Common::ToJSString(aCx, strVer);
-}
-
-/**
- * Convert the given mozilla::Vector to a JavaScript array.
- *
- * @param  cx                [in] The JS context.
- * @param  aRet              [out] This gets assigned to the newly created
- *                           array object.
- * @param  aContainer        [in] The source array to convert.
- * @param  aElementConverter [in] A callable used to convert each array element
- *                           to a JS element. The form of this function is:
- *                           bool(JSContext *cx,
- *                                JS::MutableHandleValue aRet,
- *                                const ArrayElementT& aElement)
- * @return true if aRet was successfully assigned to the new array object.
- */
-template <typename T, size_t N, typename AllocPolicy, typename Converter,
-          typename... Args>
-static bool VectorToJSArray(JSContext* cx, JS::MutableHandleObject aRet,
-                            const Vector<T, N, AllocPolicy>& aContainer,
-                            Converter&& aElementConverter, Args&&... aArgs) {
-  JS::RootedObject arr(cx, JS::NewArrayObject(cx, 0));
-  if (!arr) {
-    return false;
-  }
-
-  for (size_t i = 0, l = aContainer.length(); i < l; ++i) {
-    JS::RootedValue jsel(cx);
-    if (!aElementConverter(cx, &jsel, aContainer[i],
-                           std::forward<Args>(aArgs)...)) {
-      return false;
-    }
-    if (!JS_DefineElement(cx, arr, i, jsel, JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
-  aRet.set(arr);
-  return true;
-}
-
-static bool SerializeModule(JSContext* aCx, JS::MutableHandleValue aElement,
-                            const RefPtr<ModuleRecord>& aModule) {
-  if (!aModule) {
-    return false;
-  }
-
-  JS::RootedObject obj(aCx, JS_NewPlainObject(aCx));
-  if (!obj) {
-    return false;
-  }
-
-  if (!AddLengthLimitedStringProp(aCx, obj, "resolvedDllName",
-                                  aModule->mSanitizedDllName)) {
-    return false;
-  }
-
-  if (aModule->mVersion.isSome()) {
-    JS::RootedValue jsModuleVersion(aCx);
-    jsModuleVersion.setString(
-        ModuleVersionToJSString(aCx, aModule->mVersion.ref()));
-    if (!JS_DefineProperty(aCx, obj, "fileVersion", jsModuleVersion,
-                           JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
-  if (aModule->mVendorInfo.isSome()) {
-    const char* propName;
-
-    const VendorInfo& vendorInfo = aModule->mVendorInfo.ref();
-    switch (vendorInfo.mSource) {
-      case VendorInfo::Source::Signature:
-        propName = "signedBy";
-        break;
-      case VendorInfo::Source::VersionInfo:
-        propName = "companyName";
-        break;
-      default:
-        MOZ_ASSERT_UNREACHABLE("Unknown VendorInfo Source!");
-        return false;
-    }
-
-    MOZ_ASSERT(!vendorInfo.mVendor.IsEmpty());
-    if (vendorInfo.mVendor.IsEmpty()) {
-      return false;
-    }
-
-    if (!AddLengthLimitedStringProp(aCx, obj, propName, vendorInfo.mVendor)) {
-      return false;
-    }
-  }
-
-  JS::RootedValue jsTrustFlags(aCx);
-  jsTrustFlags.setNumber(static_cast<uint32_t>(aModule->mTrustFlags));
-  if (!JS_DefineProperty(aCx, obj, "trustFlags", jsTrustFlags,
-                         JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  aElement.setObject(*obj);
-  return true;
-}
-
-static bool SerializeEvent(JSContext* aCx, JS::MutableHandleValue aElement,
-                           const ProcessedModuleLoadEvent& aEvent,
-                           const IndexMap& aModuleIndices) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (!aEvent) {
-    return false;
-  }
-
-  JS::RootedObject obj(aCx, JS_NewPlainObject(aCx));
-  if (!obj) {
-    return false;
-  }
-
-  JS::RootedValue jsProcessUptimeMS(aCx);
-  // Javascript doesn't like 64-bit integers; convert to double.
-  jsProcessUptimeMS.setNumber(static_cast<double>(aEvent.mProcessUptimeMS));
-  if (!JS_DefineProperty(aCx, obj, "processUptimeMS", jsProcessUptimeMS,
-                         JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  if (aEvent.mLoadDurationMS) {
-    JS::RootedValue jsLoadDurationMS(aCx);
-    jsLoadDurationMS.setNumber(aEvent.mLoadDurationMS.value());
-    if (!JS_DefineProperty(aCx, obj, "loadDurationMS", jsLoadDurationMS,
-                           JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
-  JS::RootedValue jsThreadId(aCx);
-  jsThreadId.setNumber(static_cast<uint32_t>(aEvent.mThreadId));
-  if (!JS_DefineProperty(aCx, obj, "threadID", jsThreadId, JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  nsDependentCString effectiveThreadName;
-  if (aEvent.mThreadId == ::GetCurrentThreadId()) {
-    effectiveThreadName.Rebind("Main Thread"_ns, 0);
-  } else {
-    effectiveThreadName.Rebind(aEvent.mThreadName, 0);
-  }
-
-  if (!effectiveThreadName.IsEmpty()) {
-    JS::RootedValue jsThreadName(aCx);
-    jsThreadName.setString(Common::ToJSString(aCx, effectiveThreadName));
-    if (!JS_DefineProperty(aCx, obj, "threadName", jsThreadName,
-                           JSPROP_ENUMERATE)) {
-      return false;
-    }
-  }
-
-  // Don't add this property unless mRequestedDllName differs from
-  // the associated module's mSanitizedDllName
-  if (!aEvent.mRequestedDllName.IsEmpty() &&
-      !aEvent.mRequestedDllName.Equals(aEvent.mModule->mSanitizedDllName,
-                                       nsCaseInsensitiveStringComparator)) {
-    if (!AddLengthLimitedStringProp(aCx, obj, "requestedDllName",
-                                    aEvent.mRequestedDllName)) {
-      return false;
-    }
-  }
-
-  nsAutoString strBaseAddress;
-  strBaseAddress.AppendLiteral(u"0x");
-  strBaseAddress.AppendInt(aEvent.mBaseAddress, 16);
-
-  JS::RootedValue jsBaseAddress(aCx);
-  jsBaseAddress.setString(Common::ToJSString(aCx, strBaseAddress));
-  if (!JS_DefineProperty(aCx, obj, "baseAddress", jsBaseAddress,
-                         JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  uint32_t index;
-  if (!aModuleIndices.Get(aEvent.mModule->mResolvedNtName, &index)) {
-    return false;
-  }
-
-  JS::RootedValue jsModuleIndex(aCx);
-  jsModuleIndex.setNumber(index);
-  if (!JS_DefineProperty(aCx, obj, "moduleIndex", jsModuleIndex,
-                         JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  JS::RootedValue jsIsDependent(aCx);
-  jsIsDependent.setBoolean(aEvent.mIsDependent);
-  if (!JS_DefineProperty(aCx, obj, "isDependent", jsIsDependent,
-                         JSPROP_ENUMERATE)) {
-    return false;
-  }
-
-  aElement.setObject(*obj);
-
-  return true;
-}
-
-static nsresult GetPerProcObject(JSContext* aCx, const IndexMap& aModuleIndices,
-                                 const UntrustedModulesData& aData,
-                                 JS::MutableHandleObject aObj) {
-  nsDependentCString strProcType;
-  if (aData.mProcessType == GeckoProcessType_Default) {
-    strProcType.Rebind("browser"_ns, 0);
-  } else {
-    strProcType.Rebind(XRE_GeckoProcessTypeToString(aData.mProcessType));
-  }
-
-  JS::RootedValue jsProcType(aCx);
-  jsProcType.setString(Common::ToJSString(aCx, strProcType));
-  if (!JS_DefineProperty(aCx, aObj, "processType", jsProcType,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedValue jsElapsed(aCx);
-  jsElapsed.setNumber(aData.mElapsed.ToSecondsSigDigits());
-  if (!JS_DefineProperty(aCx, aObj, "elapsed", jsElapsed, JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (aData.mXULLoadDurationMS.isSome()) {
-    JS::RootedValue jsXulLoadDurationMS(aCx);
-    jsXulLoadDurationMS.setNumber(aData.mXULLoadDurationMS.value());
-    if (!JS_DefineProperty(aCx, aObj, "xulLoadDurationMS", jsXulLoadDurationMS,
-                           JSPROP_ENUMERATE)) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  JS::RootedValue jsSanitizationFailures(aCx);
-  jsSanitizationFailures.setNumber(aData.mSanitizationFailures);
-  if (!JS_DefineProperty(aCx, aObj, "sanitizationFailures",
-                         jsSanitizationFailures, JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedValue jsTrustTestFailures(aCx);
-  jsTrustTestFailures.setNumber(aData.mTrustTestFailures);
-  if (!JS_DefineProperty(aCx, aObj, "trustTestFailures", jsTrustTestFailures,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedObject eventsArray(aCx);
-  if (!VectorToJSArray(aCx, &eventsArray, aData.mEvents, &SerializeEvent,
-                       aModuleIndices)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!JS_DefineProperty(aCx, aObj, "events", eventsArray, JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedObject combinedStacksObj(aCx,
-                                     CreateJSStackObject(aCx, aData.mStacks));
-  if (!combinedStacksObj) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (!JS_DefineProperty(aCx, aObj, "combinedStacks", combinedStacksObj,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-/**
- * Converts a UntrustedModulesData to a JS object.
- *
- * @param  aData [in] The source objects to convert.
- * @param  aCx   [in] The JS context.
- * @param  aRet  [out] This gets assigned to the newly created object.
- * @return nsresult
- */
-static nsresult GetUntrustedModuleLoadEventsJSValue(
-    const Vector<UntrustedModulesData>& aData, JSContext* aCx,
-    JS::MutableHandleValue aRet) {
-  if (aData.empty()) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
-  JS::RootedObject mainObj(aCx, JS_NewPlainObject(aCx));
-  if (!mainObj) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedValue jsVersion(aCx);
-  jsVersion.setNumber(kThirdPartyModulesPingVersion);
-  if (!JS_DefineProperty(aCx, mainObj, "structVersion", jsVersion,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  IndexMap indexMap;
-  uint32_t curModulesArrayIdx = 0;
-
-  JS::RootedObject modulesArray(aCx, JS::NewArrayObject(aCx, 0));
-  if (!modulesArray) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedObject perProcObjContainer(aCx, JS_NewPlainObject(aCx));
-  if (!perProcObjContainer) {
-    return NS_ERROR_FAILURE;
-  }
-
-  for (auto&& procData : aData) {
-    // Serialize each entry in the modules hashtable out to the "modules" array
-    // and store the indices in |indexMap|
-    for (auto iter = procData.mModules.ConstIter(); !iter.Done(); iter.Next()) {
-      auto addPtr = indexMap.LookupForAdd(iter.Key());
-      if (!addPtr) {
-        addPtr.OrInsert([curModulesArrayIdx]() { return curModulesArrayIdx; });
-
-        JS::RootedValue jsModule(aCx);
-        if (!SerializeModule(aCx, &jsModule, iter.Data()) ||
-            !JS_DefineElement(aCx, modulesArray, curModulesArrayIdx, jsModule,
-                              JSPROP_ENUMERATE)) {
-          return NS_ERROR_FAILURE;
-        }
-
-        ++curModulesArrayIdx;
-      }
-    }
-
-    if (curModulesArrayIdx >= kMaxModulesArrayLen) {
-      return NS_ERROR_CANNOT_CONVERT_DATA;
-    }
-
-    JS::RootedObject perProcObj(aCx, JS_NewPlainObject(aCx));
-    if (!perProcObj) {
-      return NS_ERROR_FAILURE;
-    }
-
-    nsresult rv = GetPerProcObject(aCx, indexMap, procData, &perProcObj);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-
-    nsAutoCString strPid;
-    strPid.AppendLiteral("0x");
-    strPid.AppendInt(static_cast<uint32_t>(procData.mPid), 16);
-
-    JS::RootedValue jsPerProcObjValue(aCx);
-    jsPerProcObjValue.setObject(*perProcObj);
-    if (!JS_DefineProperty(aCx, perProcObjContainer, strPid.get(),
-                           jsPerProcObjValue, JSPROP_ENUMERATE)) {
-      return NS_ERROR_FAILURE;
-    }
-  }
-
-  JS::RootedValue jsModulesArrayValue(aCx);
-  jsModulesArrayValue.setObject(*modulesArray);
-  if (!JS_DefineProperty(aCx, mainObj, "modules", jsModulesArrayValue,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  JS::RootedValue jsPerProcObjContainerValue(aCx);
-  jsPerProcObjContainerValue.setObject(*perProcObjContainer);
-  if (!JS_DefineProperty(aCx, mainObj, "processes", jsPerProcObjContainerValue,
-                         JSPROP_ENUMERATE)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  aRet.setObject(*mainObj);
-  return NS_OK;
-}
-
-static void Serialize(Vector<UntrustedModulesData>&& aData,
-                      RefPtr<dom::Promise>&& aPromise) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  dom::AutoJSAPI jsapi;
-  if (NS_WARN_IF(!jsapi.Init(aPromise->GetGlobalObject()))) {
-    aPromise->MaybeReject(NS_ERROR_FAILURE);
-    return;
-  }
-
-  if (aData.empty()) {
-    aPromise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
-    return;
-  }
-
-  JSContext* cx = jsapi.cx();
-  JS::RootedValue jsval(cx);
-
-  nsresult rv = GetUntrustedModuleLoadEventsJSValue(aData, cx, &jsval);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    aPromise->MaybeReject(rv);
-    return;
-  }
-
-  aPromise->MaybeResolve(jsval);
-}
-
 using UntrustedModulesIpcPromise =
     MozPromise<Maybe<UntrustedModulesData>, ipc::ResponseRejectReason, true>;
 
 using MultiGetUntrustedModulesPromise =
-    MozPromise<Vector<UntrustedModulesData>, nsresult, true>;
+    MozPromise<bool /*aIgnored*/, nsresult, true>;
 
 class MOZ_HEAP_CLASS MultiGetUntrustedModulesData final {
+  using BackupType = UntrustedModulesBackupService::BackupType;
+
  public:
-  MultiGetUntrustedModulesData()
-      : mPromise(new MultiGetUntrustedModulesPromise::Private(__func__)),
+  /**
+   * @param aFlags [in] Combinations of the flags defined under nsITelemetry.
+   *               (See "Flags for getUntrustedModuleLoadEvents"
+   *                in nsITelemetry.idl)
+   */
+  explicit MultiGetUntrustedModulesData(uint32_t aFlags)
+      : mFlags(aFlags),
+        mBackupSvc(UntrustedModulesBackupService::Get()),
+        mPromise(new MultiGetUntrustedModulesPromise::Private(__func__)),
         mNumPending(0) {}
 
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MultiGetUntrustedModulesData)
 
   RefPtr<MultiGetUntrustedModulesPromise> GetUntrustedModuleLoadEvents();
+  void Serialize(RefPtr<dom::Promise>&& aPromise);
 
   MultiGetUntrustedModulesData(const MultiGetUntrustedModulesData&) = delete;
   MultiGetUntrustedModulesData(MultiGetUntrustedModulesData&&) = delete;
@@ -567,27 +93,26 @@
       return;
     }
 
-    if (mResults.empty()) {
-      mPromise->Reject(NS_ERROR_NOT_AVAILABLE, __func__);
-      return;
-    }
-
-    mPromise->Resolve(std::move(mResults), __func__);
+    mPromise->Resolve(true, __func__);
   }
 
   void OnCompletion(Maybe<UntrustedModulesData>&& aResult) {
     MOZ_ASSERT(NS_IsMainThread());
 
     if (aResult.isSome()) {
-      Unused << mResults.emplaceBack(std::move(aResult.ref()));
+      mBackupSvc->Backup(BackupType::Staging, std::move(aResult.ref()));
     }
 
     OnCompletion();
   }
 
  private:
+  // Combinations of the flags defined under nsITelemetry.
+  // (See "Flags for getUntrustedModuleLoadEvents" in nsITelemetry.idl)
+  uint32_t mFlags;
+
+  RefPtr<UntrustedModulesBackupService> mBackupSvc;
   RefPtr<MultiGetUntrustedModulesPromise::Private> mPromise;
-  Vector<UntrustedModulesData> mResults;
   size_t mNumPending;
 };
 
@@ -612,12 +137,102 @@
     }
   }
 
-  Unused << mResults.reserve(mNumPending);
-
   return mPromise;
 }
 
-nsresult GetUntrustedModuleLoadEvents(JSContext* cx, dom::Promise** aPromise) {
+void MultiGetUntrustedModulesData::Serialize(RefPtr<dom::Promise>&& aPromise) {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  dom::AutoJSAPI jsapi;
+  if (NS_WARN_IF(!jsapi.Init(aPromise->GetGlobalObject()))) {
+    aPromise->MaybeReject(NS_ERROR_FAILURE);
+    return;
+  }
+
+  JSContext* cx = jsapi.cx();
+  UntrustedModulesDataSerializer serializer(cx, kMaxModulesArrayLen, mFlags);
+  if (!serializer) {
+    aPromise->MaybeReject(NS_ERROR_FAILURE);
+    return;
+  }
+
+  nsresult rv;
+  if (mFlags & nsITelemetry::INCLUDE_OLD_LOADEVENTS) {
+    // When INCLUDE_OLD_LOADEVENTS is set, we need to return instances
+    // from both "Staging" and "Settled" backup.
+    if (mFlags & nsITelemetry::KEEP_LOADEVENTS_NEW) {
+      // When INCLUDE_OLD_LOADEVENTS and KEEP_LOADEVENTS_NEW are set, we need to
+      // return a JS object consisting of all instances from both "Staging" and
+      // "Settled" backups, keeping instances in those backups as is.
+      if (mFlags & nsITelemetry::EXCLUDE_STACKINFO_FROM_LOADEVENTS) {
+        // Without the stack info, we can add multiple UntrustedModulesData to
+        // the serializer directly.
+        rv = serializer.Add(mBackupSvc->Ref(BackupType::Staging));
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          aPromise->MaybeReject(rv);
+          return;
+        }
+        rv = serializer.Add(mBackupSvc->Ref(BackupType::Settled));
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          aPromise->MaybeReject(rv);
+          return;
+        }
+      } else {
+        // Currently we don't have a method to merge UntrustedModulesData into
+        // a serialized JS object because merging CombinedStack will be tricky.
+        // Thus we return an error on this flag combination.
+        aPromise->MaybeReject(NS_ERROR_INVALID_ARG);
+        return;
+      }
+    } else {
+      // When KEEP_LOADEVENTS_NEW is not set, we can move data from "Staging"
+      // to "Settled" first, then add "Settled" to the serializer.
+      mBackupSvc->SettleAllStagingData();
+
+      const UntrustedModulesBackupData& settledRef =
+          mBackupSvc->Ref(BackupType::Settled);
+      if (settledRef.IsEmpty()) {
+        aPromise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
+        return;
+      }
+
+      rv = serializer.Add(settledRef);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        aPromise->MaybeReject(rv);
+        return;
+      }
+    }
+  } else {
+    // When INCLUDE_OLD_LOADEVENTS is not set, we serialize only the "Staging"
+    // into a JS object.
+    const UntrustedModulesBackupData& stagingRef =
+        mBackupSvc->Ref(BackupType::Staging);
+
+    if (stagingRef.IsEmpty()) {
+      aPromise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
+      return;
+    }
+
+    rv = serializer.Add(stagingRef);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      aPromise->MaybeReject(rv);
+      return;
+    }
+
+    // When KEEP_LOADEVENTS_NEW is not set, we move all "Staging" instances
+    // to the "Settled".
+    if (!(mFlags & nsITelemetry::KEEP_LOADEVENTS_NEW)) {
+      mBackupSvc->SettleAllStagingData();
+    }
+  }
+
+  JS::RootedValue jsval(cx);
+  serializer.GetObject(&jsval);
+  aPromise->MaybeResolve(jsval);
+}
+
+nsresult GetUntrustedModuleLoadEvents(uint32_t aFlags, JSContext* cx,
+                                      dom::Promise** aPromise) {
   // Create a promise using global context.
   nsIGlobalObject* global = xpc::CurrentNativeGlobal(cx);
   if (NS_WARN_IF(!global)) {
@@ -630,14 +245,10 @@
     return result.StealNSResult();
   }
 
-  RefPtr<MultiGetUntrustedModulesData> multi(
-      new MultiGetUntrustedModulesData());
-
+  auto multi = MakeRefPtr<MultiGetUntrustedModulesData>(aFlags);
   multi->GetUntrustedModuleLoadEvents()->Then(
       GetMainThreadSerialEventTarget(), __func__,
-      [promise](Vector<UntrustedModulesData>&& aData) mutable {
-        Serialize(std::move(aData), std::move(promise));
-      },
+      [promise, multi](bool) mutable { multi->Serialize(std::move(promise)); },
       [promise](nsresult aRv) { promise->MaybeReject(aRv); });
 
   promise.forget(aPromise);
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,541 @@
+/* -*- 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 "UntrustedModulesDataSerializer.h"
+
+#include "core/TelemetryCommon.h"
+#include "js/Array.h"  // JS::NewArrayObject
+#include "jsapi.h"
+#include "mozilla/dom/ToJSValue.h"
+#include "nsITelemetry.h"
+#include "nsUnicharUtils.h"
+#include "nsXULAppAPI.h"
+
+namespace mozilla {
+namespace Telemetry {
+
+static const uint32_t kThirdPartyModulesPingVersion = 1;
+
+/**
+ * Limits the length of a string by removing the middle of the string, replacing
+ * with ellipsis.
+ * e.g. LimitStringLength("hello world", 6) would result in "he...d"
+ *
+ * @param  aStr            [in,out] The string to transform
+ * @param  aMaxFieldLength [in] The maximum length of the resulting string.
+ */
+static void LimitStringLength(nsAString& aStr, size_t aMaxFieldLength) {
+  if (aStr.Length() <= aMaxFieldLength) {
+    return;
+  }
+
+  constexpr auto kEllipsis = u"..."_ns;
+
+  if (aMaxFieldLength <= (kEllipsis.Length() + 3)) {
+    // An ellipsis is useless in this case, as it would obscure the string to
+    // the point that we cannot even determine the string's contents. We might
+    // as well just truncate.
+    aStr.Truncate(aMaxFieldLength);
+    return;
+  }
+
+  size_t cutPos = (aMaxFieldLength - kEllipsis.Length()) / 2;
+  size_t rightLen = aMaxFieldLength - kEllipsis.Length() - cutPos;
+  size_t cutLen = aStr.Length() - (cutPos + rightLen);
+
+  aStr.Replace(cutPos, cutLen, kEllipsis);
+}
+
+/**
+ * Adds a string property to a JS object, that's limited in length using
+ * LimitStringLength().
+ *
+ * @param  cx              [in] The JS context
+ * @param  aObj            [in] The object to add the property to
+ * @param  aName           [in] The name of the property to add
+ * @param  aVal            [in] The JS value of the resulting property.
+ * @param  aMaxFieldLength [in] The maximum length of the value
+ *                         (see LimitStringLength())
+ * @return true upon success
+ */
+static bool AddLengthLimitedStringProp(JSContext* cx, JS::HandleObject aObj,
+                                       const char* aName, const nsAString& aVal,
+                                       size_t aMaxFieldLength = MAX_PATH) {
+  JS::RootedValue jsval(cx);
+  nsAutoString shortVal(aVal);
+  LimitStringLength(shortVal, aMaxFieldLength);
+  jsval.setString(Common::ToJSString(cx, shortVal));
+  return JS_DefineProperty(cx, aObj, aName, jsval, JSPROP_ENUMERATE);
+};
+
+static JSString* ModuleVersionToJSString(JSContext* aCx,
+                                         const ModuleVersion& aVersion) {
+  uint16_t major, minor, patch, build;
+
+  Tie(major, minor, patch, build) = aVersion.AsTuple();
+
+  constexpr auto dot = u"."_ns;
+
+  nsAutoString strVer;
+  strVer.AppendInt(major);
+  strVer.Append(dot);
+  strVer.AppendInt(minor);
+  strVer.Append(dot);
+  strVer.AppendInt(patch);
+  strVer.Append(dot);
+  strVer.AppendInt(build);
+
+  return Common::ToJSString(aCx, strVer);
+}
+
+/**
+ * Convert the given mozilla::Vector to a JavaScript array.
+ *
+ * @param  cx                [in] The JS context.
+ * @param  aRet              [out] This gets assigned to the newly created
+ *                           array object.
+ * @param  aContainer        [in] The source array to convert.
+ * @param  aElementConverter [in] A callable used to convert each array element
+ *                           to a JS element. The form of this function is:
+ *                           bool(JSContext *cx,
+ *                                JS::MutableHandleValue aRet,
+ *                                const ArrayElementT& aElement)
+ * @return true if aRet was successfully assigned to the new array object.
+ */
+template <typename T, size_t N, typename AllocPolicy, typename Converter,
+          typename... Args>
+static bool VectorToJSArray(JSContext* cx, JS::MutableHandleObject aRet,
+                            const Vector<T, N, AllocPolicy>& aContainer,
+                            Converter&& aElementConverter, Args&&... aArgs) {
+  JS::RootedObject arr(cx, JS::NewArrayObject(cx, 0));
+  if (!arr) {
+    return false;
+  }
+
+  for (size_t i = 0, l = aContainer.length(); i < l; ++i) {
+    JS::RootedValue jsel(cx);
+    if (!aElementConverter(cx, &jsel, aContainer[i],
+                           std::forward<Args>(aArgs)...)) {
+      return false;
+    }
+    if (!JS_DefineElement(cx, arr, i, jsel, JSPROP_ENUMERATE)) {
+      return false;
+    }
+  }
+
+  aRet.set(arr);
+  return true;
+}
+
+static bool SerializeModule(JSContext* aCx, JS::MutableHandleValue aElement,
+                            const RefPtr<ModuleRecord>& aModule,
+                            uint32_t aFlags) {
+  if (!aModule) {
+    return false;
+  }
+
+  JS::RootedObject obj(aCx, JS_NewPlainObject(aCx));
+  if (!obj) {
+    return false;
+  }
+
+  if (aFlags & nsITelemetry::INCLUDE_PRIVATE_FIELDS_IN_LOADEVENTS) {
+    JS::RootedValue jsFileObj(aCx);
+    if (!dom::ToJSValue(aCx, aModule->mResolvedDosName, &jsFileObj) ||
+        !JS_DefineProperty(aCx, obj, "dllFile", jsFileObj, JSPROP_ENUMERATE)) {
+      return false;
+    }
+  } else {
+    if (!AddLengthLimitedStringProp(aCx, obj, "resolvedDllName",
+                                    aModule->mSanitizedDllName)) {
+      return false;
+    }
+  }
+
+  if (aModule->mVersion.isSome()) {
+    JS::RootedValue jsModuleVersion(aCx);
+    jsModuleVersion.setString(
+        ModuleVersionToJSString(aCx, aModule->mVersion.ref()));
+    if (!JS_DefineProperty(aCx, obj, "fileVersion", jsModuleVersion,
+                           JSPROP_ENUMERATE)) {
+      return false;
+    }
+  }
+
+  if (aModule->mVendorInfo.isSome()) {
+    const char* propName;
+
+    const VendorInfo& vendorInfo = aModule->mVendorInfo.ref();
+    switch (vendorInfo.mSource) {
+      case VendorInfo::Source::Signature:
+        propName = "signedBy";
+        break;
+      case VendorInfo::Source::VersionInfo:
+        propName = "companyName";
+        break;
+      default:
+        MOZ_ASSERT_UNREACHABLE("Unknown VendorInfo Source!");
+        return false;
+    }
+
+    MOZ_ASSERT(!vendorInfo.mVendor.IsEmpty());
+    if (vendorInfo.mVendor.IsEmpty()) {
+      return false;
+    }
+
+    if (!AddLengthLimitedStringProp(aCx, obj, propName, vendorInfo.mVendor)) {
+      return false;
+    }
+  }
+
+  JS::RootedValue jsTrustFlags(aCx);
+  jsTrustFlags.setNumber(static_cast<uint32_t>(aModule->mTrustFlags));
+  if (!JS_DefineProperty(aCx, obj, "trustFlags", jsTrustFlags,
+                         JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  aElement.setObject(*obj);
+  return true;
+}
+
+/* static */
+bool UntrustedModulesDataSerializer::SerializeEvent(
+    JSContext* aCx, JS::MutableHandleValue aElement,
+    const ProcessedModuleLoadEvent& aEvent, const IndexMap& aModuleIndices) {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  if (!aEvent) {
+    return false;
+  }
+
+  JS::RootedObject obj(aCx, JS_NewPlainObject(aCx));
+  if (!obj) {
+    return false;
+  }
+
+  JS::RootedValue jsProcessUptimeMS(aCx);
+  // Javascript doesn't like 64-bit integers; convert to double.
+  jsProcessUptimeMS.setNumber(static_cast<double>(aEvent.mProcessUptimeMS));
+  if (!JS_DefineProperty(aCx, obj, "processUptimeMS", jsProcessUptimeMS,
+                         JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  if (aEvent.mLoadDurationMS) {
+    JS::RootedValue jsLoadDurationMS(aCx);
+    jsLoadDurationMS.setNumber(aEvent.mLoadDurationMS.value());
+    if (!JS_DefineProperty(aCx, obj, "loadDurationMS", jsLoadDurationMS,
+                           JSPROP_ENUMERATE)) {
+      return false;
+    }
+  }
+
+  JS::RootedValue jsThreadId(aCx);
+  jsThreadId.setNumber(static_cast<uint32_t>(aEvent.mThreadId));
+  if (!JS_DefineProperty(aCx, obj, "threadID", jsThreadId, JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  nsDependentCString effectiveThreadName;
+  if (aEvent.mThreadId == ::GetCurrentThreadId()) {
+    effectiveThreadName.Rebind("Main Thread"_ns, 0);
+  } else {
+    effectiveThreadName.Rebind(aEvent.mThreadName, 0);
+  }
+
+  if (!effectiveThreadName.IsEmpty()) {
+    JS::RootedValue jsThreadName(aCx);
+    jsThreadName.setString(Common::ToJSString(aCx, effectiveThreadName));
+    if (!JS_DefineProperty(aCx, obj, "threadName", jsThreadName,
+                           JSPROP_ENUMERATE)) {
+      return false;
+    }
+  }
+
+  // Don't add this property unless mRequestedDllName differs from
+  // the associated module's mSanitizedDllName
+  if (!aEvent.mRequestedDllName.IsEmpty() &&
+      !aEvent.mRequestedDllName.Equals(aEvent.mModule->mSanitizedDllName,
+                                       nsCaseInsensitiveStringComparator)) {
+    if (!AddLengthLimitedStringProp(aCx, obj, "requestedDllName",
+                                    aEvent.mRequestedDllName)) {
+      return false;
+    }
+  }
+
+  nsAutoString strBaseAddress;
+  strBaseAddress.AppendLiteral(u"0x");
+  strBaseAddress.AppendInt(aEvent.mBaseAddress, 16);
+
+  JS::RootedValue jsBaseAddress(aCx);
+  jsBaseAddress.setString(Common::ToJSString(aCx, strBaseAddress));
+  if (!JS_DefineProperty(aCx, obj, "baseAddress", jsBaseAddress,
+                         JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  uint32_t index;
+  if (!aModuleIndices.Get(aEvent.mModule->mResolvedNtName, &index)) {
+    return false;
+  }
+
+  JS::RootedValue jsModuleIndex(aCx);
+  jsModuleIndex.setNumber(index);
+  if (!JS_DefineProperty(aCx, obj, "moduleIndex", jsModuleIndex,
+                         JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  JS::RootedValue jsIsDependent(aCx);
+  jsIsDependent.setBoolean(aEvent.mIsDependent);
+  if (!JS_DefineProperty(aCx, obj, "isDependent", jsIsDependent,
+                         JSPROP_ENUMERATE)) {
+    return false;
+  }
+
+  aElement.setObject(*obj);
+
+  return true;
+}
+
+static nsDependentCString GetProcessTypeString(GeckoProcessType aType) {
+  nsDependentCString strProcType;
+  if (aType == GeckoProcessType_Default) {
+    strProcType.Rebind("browser"_ns, 0);
+  } else {
+    strProcType.Rebind(XRE_GeckoProcessTypeToString(aType));
+  }
+  return strProcType;
+}
+
+nsresult UntrustedModulesDataSerializer::GetPerProcObject(
+    const UntrustedModulesData& aData, JS::MutableHandleObject aObj) {
+  JS::RootedValue jsProcType(mCx);
+  jsProcType.setString(
+      Common::ToJSString(mCx, GetProcessTypeString(aData.mProcessType)));
+  if (!JS_DefineProperty(mCx, aObj, "processType", jsProcType,
+                         JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  JS::RootedValue jsElapsed(mCx);
+  jsElapsed.setNumber(aData.mElapsed.ToSecondsSigDigits());
+  if (!JS_DefineProperty(mCx, aObj, "elapsed", jsElapsed, JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aData.mXULLoadDurationMS.isSome()) {
+    JS::RootedValue jsXulLoadDurationMS(mCx);
+    jsXulLoadDurationMS.setNumber(aData.mXULLoadDurationMS.value());
+    if (!JS_DefineProperty(mCx, aObj, "xulLoadDurationMS", jsXulLoadDurationMS,
+                           JSPROP_ENUMERATE)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  JS::RootedValue jsSanitizationFailures(mCx);
+  jsSanitizationFailures.setNumber(aData.mSanitizationFailures);
+  if (!JS_DefineProperty(mCx, aObj, "sanitizationFailures",
+                         jsSanitizationFailures, JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  JS::RootedValue jsTrustTestFailures(mCx);
+  jsTrustTestFailures.setNumber(aData.mTrustTestFailures);
+  if (!JS_DefineProperty(mCx, aObj, "trustTestFailures", jsTrustTestFailures,
+                         JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  JS::RootedObject eventsArray(mCx);
+  if (!VectorToJSArray(mCx, &eventsArray, aData.mEvents, &SerializeEvent,
+                       mIndexMap)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!JS_DefineProperty(mCx, aObj, "events", eventsArray, JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!(mFlags & nsITelemetry::EXCLUDE_STACKINFO_FROM_LOADEVENTS)) {
+    JS::RootedObject combinedStacksObj(mCx,
+                                       CreateJSStackObject(mCx, aData.mStacks));
+    if (!combinedStacksObj) {
+      return NS_ERROR_FAILURE;
+    }
+
+    if (!JS_DefineProperty(mCx, aObj, "combinedStacks", combinedStacksObj,
+                           JSPROP_ENUMERATE)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult UntrustedModulesDataSerializer::AddLoadEvents(
+    const Vector<ProcessedModuleLoadEvent>& aEvents,
+    JS::MutableHandleObject aPerProcObj) {
+  JS::RootedValue eventsArrayVal(mCx);
+  if (!JS_GetProperty(mCx, aPerProcObj, "events", &eventsArrayVal) ||
+      !eventsArrayVal.isObject()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  JS::RootedObject eventsArray(mCx, &eventsArrayVal.toObject());
+  bool isArray;
+  if (!JS::IsArrayObject(mCx, eventsArray, &isArray) && !isArray) {
+    return NS_ERROR_FAILURE;
+  }
+
+  uint32_t currentPos;
+  if (!GetArrayLength(mCx, eventsArray, &currentPos)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  for (size_t i = 0, l = aEvents.length(); i < l; ++i) {
+    JS::RootedValue jsel(mCx);
+    if (!SerializeEvent(mCx, &jsel, aEvents[i], mIndexMap) ||
+        !JS_DefineElement(mCx, eventsArray, currentPos + i, jsel,
+                          JSPROP_ENUMERATE)) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  return NS_OK;
+}
+
+nsresult UntrustedModulesDataSerializer::AddSingleData(
+    const UntrustedModulesData& aData) {
+  // Serialize each entry in the modules hashtable out to the "modules" array
+  // and store the indices in |mIndexMap|
+  for (auto iter = aData.mModules.ConstIter(); !iter.Done(); iter.Next()) {
+    auto addPtr = mIndexMap.LookupForAdd(iter.Key());
+    if (!addPtr) {
+      addPtr.OrInsert([idx = mCurModulesArrayIdx]() { return idx; });
+
+      JS::RootedValue jsModule(mCx);
+      if (!SerializeModule(mCx, &jsModule, iter.Data(), mFlags) ||
+          !JS_DefineElement(mCx, mModulesArray, mCurModulesArrayIdx, jsModule,
+                            JSPROP_ENUMERATE)) {
+        return NS_ERROR_FAILURE;
+      }
+
+      ++mCurModulesArrayIdx;
+    }
+  }
+
+  if (mCurModulesArrayIdx >= mMaxModulesArrayLen) {
+    return NS_ERROR_CANNOT_CONVERT_DATA;
+  }
+
+  nsAutoCString strPid;
+  strPid.Append(GetProcessTypeString(aData.mProcessType));
+  strPid.AppendLiteral(".0x");
+  strPid.AppendInt(static_cast<uint32_t>(aData.mPid), 16);
+
+  if (mFlags & nsITelemetry::EXCLUDE_STACKINFO_FROM_LOADEVENTS) {
+    JS::RootedValue perProcVal(mCx);
+    if (JS_GetProperty(mCx, mPerProcObjContainer, strPid.get(), &perProcVal) &&
+        perProcVal.isObject()) {
+      // If a corresponding per-proc object already exists in the dictionary,
+      // and we skip to serialize CombinedStacks, we can add loading events
+      // into the JS object directly.
+      JS::RootedObject perProcObj(mCx, &perProcVal.toObject());
+      return AddLoadEvents(aData.mEvents, &perProcObj);
+    }
+  }
+
+  JS::RootedObject perProcObj(mCx, JS_NewPlainObject(mCx));
+  if (!perProcObj) {
+    return NS_ERROR_FAILURE;
+  }
+
+  nsresult rv = GetPerProcObject(aData, &perProcObj);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  JS::RootedValue jsPerProcObjValue(mCx);
+  jsPerProcObjValue.setObject(*perProcObj);
+  if (!JS_DefineProperty(mCx, mPerProcObjContainer, strPid.get(),
+                         jsPerProcObjValue, JSPROP_ENUMERATE)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return NS_OK;
+}
+
+UntrustedModulesDataSerializer::UntrustedModulesDataSerializer(
+    JSContext* aCx, uint32_t aMaxModulesArrayLen, uint32_t aFlags)
+    : mCtorResult(NS_ERROR_FAILURE),
+      mCx(aCx),
+      mMainObj(mCx, JS_NewPlainObject(mCx)),
+      mModulesArray(mCx, JS::NewArrayObject(mCx, 0)),
+      mPerProcObjContainer(mCx, JS_NewPlainObject(mCx)),
+      mMaxModulesArrayLen(aMaxModulesArrayLen),
+      mCurModulesArrayIdx(0),
+      mFlags(aFlags) {
+  if (!mMainObj || !mModulesArray || !mPerProcObjContainer) {
+    return;
+  }
+
+  JS::RootedValue jsVersion(mCx);
+  jsVersion.setNumber(kThirdPartyModulesPingVersion);
+  if (!JS_DefineProperty(mCx, mMainObj, "structVersion", jsVersion,
+                         JSPROP_ENUMERATE)) {
+    return;
+  }
+
+  JS::RootedValue jsModulesArrayValue(mCx);
+  jsModulesArrayValue.setObject(*mModulesArray);
+  if (!JS_DefineProperty(mCx, mMainObj, "modules", jsModulesArrayValue,
+                         JSPROP_ENUMERATE)) {
+    return;
+  }
+
+  JS::RootedValue jsPerProcObjContainerValue(mCx);
+  jsPerProcObjContainerValue.setObject(*mPerProcObjContainer);
+  if (!JS_DefineProperty(mCx, mMainObj, "processes", jsPerProcObjContainerValue,
+                         JSPROP_ENUMERATE)) {
+    return;
+  }
+
+  mCtorResult = NS_OK;
+}
+
+UntrustedModulesDataSerializer::operator bool() const {
+  return NS_SUCCEEDED(mCtorResult);
+}
+
+void UntrustedModulesDataSerializer::GetObject(JS::MutableHandleValue aRet) {
+  aRet.setObject(*mMainObj);
+}
+
+nsresult UntrustedModulesDataSerializer::Add(
+    const UntrustedModulesBackupData& aData) {
+  if (NS_FAILED(mCtorResult)) {
+    return mCtorResult;
+  }
+
+  for (auto iter = aData.ConstIter(); !iter.Done(); iter.Next()) {
+    const RefPtr<UntrustedModulesDataContainer>& container = iter.Data();
+    if (!container) {
+      continue;
+    }
+
+    nsresult rv = AddSingleData(container->mData);
+    if (NS_FAILED(rv)) {
+      return rv;
+    }
+  }
+
+  return NS_OK;
+}
+
+}  // namespace Telemetry
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModulesDataSerializer.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,78 @@
+/* -*- 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 UntrustedModulesDataSerializer_h__
+#define UntrustedModulesDataSerializer_h__
+
+#include "js/TypeDecls.h"
+#include "mozilla/UntrustedModulesData.h"
+#include "mozilla/Vector.h"
+#include "nsDataHashtable.h"
+#include "UntrustedModulesBackupService.h"
+
+namespace mozilla {
+namespace Telemetry {
+
+// This class owns a JS object and serializes a given UntrustedModulesData
+// into it.  Because this class uses JSAPI, an AutoJSAPI instance must be
+// on the stack before instanciating the class.
+class MOZ_RAII UntrustedModulesDataSerializer final {
+  using IndexMap = nsDataHashtable<nsStringHashKey, uint32_t>;
+
+  nsresult mCtorResult;
+  JSContext* mCx;
+  JS::RootedObject mMainObj;
+  JS::RootedObject mModulesArray;
+  JS::RootedObject mPerProcObjContainer;
+
+  IndexMap mIndexMap;
+  const uint32_t mMaxModulesArrayLen;
+  uint32_t mCurModulesArrayIdx;
+
+  // Combinations of the flags defined under nsITelemetry.
+  // (See "Flags for getUntrustedModuleLoadEvents" in nsITelemetry.idl)
+  const uint32_t mFlags;
+
+  static bool SerializeEvent(JSContext* aCx, JS::MutableHandleValue aElement,
+                             const ProcessedModuleLoadEvent& aEvent,
+                             const IndexMap& aModuleIndices);
+  nsresult GetPerProcObject(const UntrustedModulesData& aData,
+                            JS::MutableHandleObject aObj);
+  nsresult AddLoadEvents(const Vector<ProcessedModuleLoadEvent>& aEvents,
+                         JS::MutableHandleObject aPerProcObj);
+  nsresult AddSingleData(const UntrustedModulesData& aData);
+
+ public:
+  UntrustedModulesDataSerializer(JSContext* aCx, uint32_t aMaxModulesArrayLen,
+                                 uint32_t aFlags = 0);
+  explicit operator bool() const;
+
+  /**
+   * Retrieves the JS object.
+   *
+   * @param  aRet  [out] This gets assigned to the newly created object.
+   */
+  void GetObject(JS::MutableHandleValue aRet);
+
+  /**
+   * Adds data to the JS object.
+   *
+   * When the process of a given UntrustedModulesData collides with a key in
+   * the JS object, the entire UntrustedModulesData instance in the JS object
+   * will be replaced unless EXCLUDE_STACKINFO_FROM_LOADEVENTS is set.
+   * When EXCLUDE_STACKINFO_FROM_LOADEVENTS is set, the given loading events
+   * are appended into the JS object, keeping the existing data as is.
+   *
+   * @param  aData [in] The source objects to add.
+   * @return nsresult
+   */
+  nsresult Add(const UntrustedModulesBackupData& aData);
+};
+
+}  // namespace Telemetry
+}  // namespace mozilla
+
+#endif  // UntrustedModulesDataSerializer_h__
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModules.h firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModules.h
--- firefox-84.0.2+build1/toolkit/components/telemetry/other/UntrustedModules.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/other/UntrustedModules.h	2021-01-18 19:58:27.000000000 +0000
@@ -17,8 +17,13 @@
  * This function returns a promise that asynchronously processes and gathers
  * untrusted module data. The promise is either resolved with the JS object
  * ping payload, or is rejected upon failure.
+ *
+ * @param aFlags [in] Combinations of the flags defined under nsITelemetry.
+ *               (See "Flags for getUntrustedModuleLoadEvents"
+ *                in nsITelemetry.idl)
  */
-nsresult GetUntrustedModuleLoadEvents(JSContext* cx, dom::Promise** aPromise);
+nsresult GetUntrustedModuleLoadEvents(uint32_t aFlags, JSContext* cx,
+                                      dom::Promise** aPromise);
 
 }  // namespace Telemetry
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/Scalars.yaml firefox-85.0+build1/toolkit/components/telemetry/Scalars.yaml
--- firefox-84.0.2+build1/toolkit/components/telemetry/Scalars.yaml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/Scalars.yaml	2021-01-18 19:58:27.000000000 +0000
@@ -161,6 +161,8 @@
     description: >
       The count of maximum number of pinned tabs open during a subsession. This
       includes private windows and the ones opened when starting the browser.
+      Starting Firefox 85 this includes number of restored pinned tabs at
+      startup.
     expires: never
     kind: uint
     notification_emails:
@@ -1178,55 +1180,6 @@
     record_in_processes:
       - main
 
-identity.fxaccounts:
-  missed_commands_fetched:
-    bug_numbers:
-      - 1644598
-    description: >
-      The number of missed FxA commands we have recovered.
-    expires: "85"
-    kind: uint
-    keyed: false
-    notification_emails:
-      - sync-team@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-    record_in_processes:
-      - main
-  push_state_command_target:
-    bug_numbers:
-      - 1644598
-    description: >
-      The push state of the device we are sending a command to.
-    expires: "85"
-    kind: uint
-    keyed: true
-    keys: ["ok", "expiredCallback", "noCallback"]
-    notification_emails:
-      - sync-team@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-    record_in_processes:
-      - main
-  push_state_this_device:
-    bug_numbers:
-      - 1644598
-    description: >
-      The reason why the push state for this device is in a bad shape.
-    expires: "85"
-    kind: uint
-    keyed: true
-    keys: ["expiredCallback", "noCallback"]
-    notification_emails:
-      - sync-team@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-    record_in_processes:
-      - main
-
 security:
   webauthn_used:
     bug_numbers:
@@ -1253,13 +1206,13 @@
     bug_numbers:
       - 1519273
       - 1553550
+      - 1678206
     description: >
       Number of intermediate certificates pre-loaded.
-    expires: "86"
+    expires: "92"
     kind: uint
     notification_emails:
       - seceng-telemetry@mozilla.com
-      - jjones@mozilla.com
       - dkeeler@mozilla.com
     products:
       - 'firefox'
@@ -1269,13 +1222,13 @@
     bug_numbers:
       - 1519273
       - 1553550
+      - 1678206
     description: >
       Number of intermediate certificates pending pre-load.
-    expires: "86"
+    expires: "92"
     kind: uint
     notification_emails:
       - seceng-telemetry@mozilla.com
-      - jjones@mozilla.com
       - dkeeler@mozilla.com
     products:
       - 'firefox'
@@ -1424,13 +1377,13 @@
       - 1577030
       - 1610894
       - 1645088
+      - 1678209
     description: >
       A count of the number of tracking events blocked.
-    expires: "86"
+    expires: never
     kind: uint
     notification_emails:
       - ewright@mozilla.com
-      - chsiang@mozilla.com
       - seceng-telemetry@mozilla.com
     release_channel_collection: opt-out
     products:
@@ -1444,9 +1397,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       This scalar reports the value of the network.cookie.lifetimePolicy pref.
-    expires: "86"
+    expires: never
     kind: uint
     notification_emails:
       - ewright@mozilla.com
@@ -1461,9 +1415,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.sanitize.sanitizeOnShutdown pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1478,9 +1433,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.cookies pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1495,9 +1451,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.history pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1512,9 +1469,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.formdata pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1529,9 +1487,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.downloads pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1546,9 +1505,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.cache pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1563,9 +1523,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.sessions pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1580,9 +1541,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.offlineApps pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1597,9 +1559,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.siteSettings pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1614,9 +1577,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A boolean reporting the value of the privacy.clearOnShutdown.openWindows pref.
-    expires: "86"
+    expires: never
     kind: boolean
     notification_emails:
       - ewright@mozilla.com
@@ -1631,9 +1595,10 @@
       - 1589753
       - 1617241
       - 1645089
+      - 1678210
     description: >
       A count of how many "session" cookie exceptions a user has set.
-    expires: "86"
+    expires: never
     kind: uint
     notification_emails:
       - ewright@mozilla.com
@@ -1889,12 +1854,11 @@
     description: >
       The number of times a Picture-in-Picture window was opened, per trigger
       mechanism (e.g.: the video toggle, the context menu).
-    expires: "87"
+    expires: "92"
     kind: uint
     keyed: true
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     release_channel_collection: opt-out
     products:
       - 'firefox'
@@ -1908,12 +1872,11 @@
       The number of times a Picture-in-Picture window was closed, per trigger
       mechanism (e.g.: the close button, the unpip button, originating tab going away,
       process shutdown, etc).
-    expires: "87"
+    expires: "92"
     kind: uint
     keyed: true
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     release_channel_collection: opt-out
     products:
       - 'firefox'
@@ -1925,11 +1888,10 @@
     description: >
       The number of times a Picture-in-Picture toggle was presented to the user when
       they hovered the video with the mouse pointer.
-    expires: "87"
+    expires: "92"
     kind: uint
     notification_emails:
       - mconley@mozilla.com
-      - astevenson@mozilla.com
     release_channel_collection: opt-out
     products:
       - 'firefox'
@@ -2198,6 +2160,23 @@
     record_in_processes:
       - main
 
+  control_platform_usage:
+    bug_numbers:
+      - 1680856
+    description: >
+      Counts the number of times users enable and use media control on different platforms. 0=EnabledOn, 1=UsedOn.
+    expires: "91"
+    kind: uint
+    keyed: true
+    notification_emails:
+      - alwu@mozilla.com
+      - nohlmeier@mozilla.com
+    release_channel_collection: opt-out
+    products:
+      - 'firefox'
+    record_in_processes:
+      - 'main'
+
 avif:
   dav1d_decode_error:
     bug_numbers:
@@ -3431,15 +3410,20 @@
     bug_numbers:
       - 1386968
       - 1518669
+      - 1673949
+      - 1674950
     description: >
       Ratio (in units of 1/100th of a percent) of how many times OMTP waited
       for a paint for more than 200us, versus the total number of paints.
     keyed: false
     kind: uint
-    expires: "never"
+    expires: "never" # 2021-10-01 this will move back to non-release collection.
     notification_emails:
       - gfx-telemetry-alerts@mozilla.com
       - rhunt@mozilla.com
+      - perf-telemetry-alerts@mozilla.com
+      - barret@mozilla.com
+    release_channel_collection: opt-out
     products:
       - 'firefox'
       - 'fennec'
@@ -4052,9 +4036,10 @@
   fallback_shown:
     bug_numbers:
       - 1566882
+      - 1666979
     description: >
       How many times PDF Viewer fallback bar was shown.
-    expires: "84"
+    expires: "88"
     kind: uint
     notification_emails:
       - bdahl@mozilla.com
@@ -4067,9 +4052,10 @@
   print:
     bug_numbers:
       - 1566882
+      - 1666979
     description: >
       How many times PDF Viewer print functionality was used.
-    expires: "84"
+    expires: "88"
     kind: uint
     notification_emails:
       - bdahl@mozilla.com
@@ -4749,14 +4735,15 @@
     bug_numbers:
       - 1495548
       - 1505411
+      - 1664849
     description: >
-      Records counts of SERP pages with adverts displayed. The key format is ‘<engine-name>’.
+      Records counts of SERP pages with adverts displayed. The key format is ‘<provider>:<sap|organic>’.
     expires: never
     keyed: true
     kind: uint
     notification_emails:
       - fx-search@mozilla.com
-      - adw@mozilla.com
+      - teon@mozilla.com
     release_channel_collection: opt-out
     products:
       - 'firefox'
@@ -4768,14 +4755,15 @@
     bug_numbers:
       - 1495548
       - 1505411
+      - 1664849
     description: >
-      Records clicks of adverts on SERP pages. The key format is ‘<engine-name>’.
+      Records clicks of adverts on SERP pages. The key format is ‘<provider>:<sap|organic>’.
     expires: never
     keyed: true
     kind: uint
     notification_emails:
       - fx-search@mozilla.com
-      - adw@mozilla.com
+      - teon@mozilla.com
     release_channel_collection: opt-out
     products:
       - 'firefox'
@@ -5461,24 +5449,6 @@
     record_in_processes:
       - main
 
-fullscreen:
-    used:
-      bug_numbers:
-        - 1201374
-        - 1645460
-      description: >
-        The number of times that a session enters browser fullscreen (f11-fullscreen).
-      expires: "86"
-      kind: uint
-      notification_emails:
-        - emalysz@mozilla.com
-        - rtestard@mozilla.com
-      release_channel_collection: opt-out
-      products:
-        - 'firefox'
-      record_in_processes:
-        - main
-
 # The following section is for the "deletion-request" ping (bug 1585410). All the
 # extra identifiers other than `client_id` could be added here.
 deletion.request:
@@ -6311,9 +6281,10 @@
   uninstaller_profile_refresh:
     bug_numbers:
       - 1634115
+      - 1672585
     description: >
       Set when a profile refresh is initiated from the uninstaller.
-    expires: "85"
+    expires: "90"
     kind: boolean
     notification_emails:
       - agashlin@mozilla.com
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp firefox-85.0+build1/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/tests/gtest/TestCombinedStacks.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -49,3 +49,110 @@
         << "Stack should be removed";
   }
 }
+
+template <int N>
+ProcessedStack MakeStack(const nsLiteralString (&aModules)[N],
+                         const uintptr_t (&aOffsets)[N]) {
+  ProcessedStack stack;
+  for (int i = 0; i < N; ++i) {
+    ProcessedStack::Frame frame = {aOffsets[i]};
+    if (aModules[i].IsEmpty()) {
+      frame.mModIndex = std::numeric_limits<uint16_t>::max();
+    } else {
+      frame.mModIndex = stack.GetNumModules();
+      stack.AddModule(ProcessedStack::Module{aModules[i]});
+    }
+    stack.AddFrame(frame);
+  }
+  return stack;
+}
+
+TEST(CombinedStacks, Combine)
+{
+  const nsLiteralString moduleSet1[] = {u"mod1"_ns, u"mod2"_ns, u"base"_ns};
+  const nsLiteralString moduleSet2[] = {u"modX"_ns, u""_ns, u"modZ"_ns,
+                                        u"base"_ns};
+  // [0] 00 mod1+100
+  //     01 mod2+200
+  //     02 base+300
+  // [1] 00 mod1+1000
+  //     01 mod2+2000
+  //     02 base+3000
+  // [2] 00 modX+100
+  //     01 <no module>+200
+  //     02 modZ+300
+  //     03 base+400
+  // [3] 00 modX+1000
+  //     01 <no module>+3000
+  //     02 modZ+2000
+  //     03 base+4000
+  const ProcessedStack testStacks[] = {
+      MakeStack(moduleSet1, {100ul, 200ul, 300ul}),
+      MakeStack(moduleSet1, {1000ul, 2000ul, 3000ul}),
+      MakeStack(moduleSet2, {100ul, 200ul, 300ul, 400ul}),
+      MakeStack(moduleSet2, {1000ul, 2000ul, 3000ul, 4000ul}),
+  };
+
+  // combined1 <-- testStacks[0] + testStacks[1]
+  // combined2 <-- testStacks[2] + testStacks[3]
+  CombinedStacks combined1, combined2;
+  combined1.AddStack(testStacks[0]);
+  combined1.AddStack(testStacks[1]);
+  combined2.AddStack(testStacks[2]);
+  combined2.AddStack(testStacks[3]);
+
+  EXPECT_EQ(combined1.GetModuleCount(), mozilla::ArrayLength(moduleSet1));
+  EXPECT_EQ(combined1.GetStackCount(), 2u);
+  EXPECT_EQ(combined2.GetModuleCount(), mozilla::ArrayLength(moduleSet2) - 1);
+  EXPECT_EQ(combined2.GetStackCount(), 2u);
+
+  // combined1 <-- combined1 + combined2
+  combined1.AddStacks(combined2);
+
+  EXPECT_EQ(combined1.GetModuleCount(), 5u);  // {mod1, mod2, modX, modZ, base}
+  EXPECT_EQ(combined1.GetStackCount(), mozilla::ArrayLength(testStacks));
+
+  for (size_t i = 0; i < combined1.GetStackCount(); ++i) {
+    const auto& expectedStack = testStacks[i];
+    const auto& actualStack = combined1.GetStack(i);
+    EXPECT_EQ(actualStack.size(), expectedStack.GetStackSize());
+    if (actualStack.size() != expectedStack.GetStackSize()) {
+      continue;
+    }
+
+    for (size_t j = 0; j < actualStack.size(); ++j) {
+      const auto& expectedFrame = expectedStack.GetFrame(j);
+      const auto& actualFrame = actualStack[j];
+
+      EXPECT_EQ(actualFrame.mOffset, expectedFrame.mOffset);
+
+      if (expectedFrame.mModIndex == std::numeric_limits<uint16_t>::max()) {
+        EXPECT_EQ(actualFrame.mModIndex, std::numeric_limits<uint16_t>::max());
+      } else {
+        EXPECT_EQ(combined1.GetModule(actualFrame.mModIndex),
+                  expectedStack.GetModule(expectedFrame.mModIndex));
+      }
+    }
+  }
+
+  // Only testStacks[3] will be stored into oneStack
+  CombinedStacks oneStack(1);
+  oneStack.AddStacks(combined1);
+
+  EXPECT_EQ(oneStack.GetStackCount(), 1u);
+  EXPECT_EQ(oneStack.GetStack(0).size(), testStacks[3].GetStackSize());
+
+  for (size_t i = 0; i < oneStack.GetStack(0).size(); ++i) {
+    const auto& expectedFrame = testStacks[3].GetFrame(i);
+    const auto& actualFrame = oneStack.GetStack(0)[i];
+
+    EXPECT_EQ(actualFrame.mOffset, expectedFrame.mOffset);
+
+    if (expectedFrame.mModIndex == std::numeric_limits<uint16_t>::max()) {
+      EXPECT_EQ(actualFrame.mModIndex, std::numeric_limits<uint16_t>::max());
+    } else {
+      EXPECT_EQ(oneStack.GetModule(actualFrame.mModIndex),
+                testStacks[3].GetModule(expectedFrame.mModIndex));
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp firefox-85.0+build1/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp
--- firefox-84.0.2+build1/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/tests/gtest/TestOrigins.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 #include "mozilla/ContentBlockingLog.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/telemetry/tests/unit/test_ThirdPartyModulesPing.js firefox-85.0+build1/toolkit/components/telemetry/tests/unit/test_ThirdPartyModulesPing.js
--- firefox-84.0.2+build1/toolkit/components/telemetry/tests/unit/test_ThirdPartyModulesPing.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/telemetry/tests/unit/test_ThirdPartyModulesPing.js	2021-01-18 19:58:27.000000000 +0000
@@ -1,29 +1,37 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// This tests basic end-to-end functionality of the untrusted modules
-// telemetry ping. We force the ping to fire, capture the result, and test for:
-// - Basic payload structure validity.
-// - Expected results for a few specific DLLs
-
 "use strict";
 
 const { Preferences } = ChromeUtils.import(
   "resource://gre/modules/Preferences.jsm"
 );
 const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
+const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 const kDllName = "modules-test.dll";
 
-let gDllHandle;
 let gCurrentPidStr;
 
+async function load_and_free(name) {
+  // Dynamically load a DLL which we have hard-coded as untrusted; this should
+  // appear in the payload.
+  let dllHandle = ctypes.open(do_get_file(name).path);
+  if (dllHandle) {
+    dllHandle.close();
+    dllHandle = null;
+  }
+  // Give the thread some cycles to process a loading event.
+  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
+  await new Promise(resolve => setTimeout(resolve, 50));
+}
+
 add_task(async function setup() {
   do_get_profile();
 
   // Dynamically load a DLL which we have hard-coded as untrusted; this should
   // appear in the payload.
-  gDllHandle = ctypes.open(do_get_file(kDllName).path);
+  await load_and_free(kDllName);
 
   // Force the timer to fire (using a small interval).
   Cc["@mozilla.org/updates/timer-manager;1"]
@@ -33,7 +41,7 @@
   Preferences.set("app.update.url", "http://localhost");
 
   let currentPid = Services.appinfo.processID;
-  gCurrentPidStr = "0x" + currentPid.toString(16);
+  gCurrentPidStr = "browser.0x" + currentPid.toString(16);
 
   // Start the local ping server and setup Telemetry to use it during the tests.
   PingServer.start();
@@ -46,13 +54,13 @@
 });
 
 registerCleanupFunction(function() {
-  if (gDllHandle) {
-    gDllHandle.close();
-    gDllHandle = null;
-  }
   return PingServer.stop();
 });
 
+// This tests basic end-to-end functionality of the untrusted modules
+// telemetry ping. We force the ping to fire, capture the result, and test for:
+// - Basic payload structure validity.
+// - Expected results for a few specific DLLs
 add_task(async function test_send_ping() {
   let expectedModules = [
     // This checks that a DLL loaded during runtime is evaluated properly.
@@ -149,3 +157,110 @@
     );
   }
 });
+
+// This tests the flags INCLUDE_OLD_LOADEVENTS and KEEP_LOADEVENTS_NEW
+// controls the method's return value and the internal storages
+// "Staging" and "Settled" correctly.
+add_task(async function test_new_old_instances() {
+  const kIncludeOld = Telemetry.INCLUDE_OLD_LOADEVENTS;
+  const kKeepNew = Telemetry.KEEP_LOADEVENTS_NEW;
+  const get_events_count = data => data.processes[gCurrentPidStr].events.length;
+
+  // Make sure |baseline| has at least one instance.
+  await load_and_free(kDllName);
+
+  // Make sure all instances are "old"
+  const baseline = await Telemetry.getUntrustedModuleLoadEvents(kIncludeOld);
+  const baseline_count = get_events_count(baseline);
+  print("baseline_count = " + baseline_count);
+  print("baseline = " + JSON.stringify(baseline));
+
+  await Assert.rejects(
+    Telemetry.getUntrustedModuleLoadEvents(),
+    e => e.result == Cr.NS_ERROR_NOT_AVAILABLE,
+    "New instances should not exist!"
+  );
+
+  await load_and_free(kDllName); // A
+
+  // Passing kIncludeOld and kKeepNew is unsupported.  A is kept new.
+  await Assert.rejects(
+    Telemetry.getUntrustedModuleLoadEvents(kIncludeOld | kKeepNew),
+    e => e.result == Cr.NS_ERROR_INVALID_ARG,
+    "Passing unsupported flag combination should throw an exception!"
+  );
+
+  await load_and_free(kDllName); // B
+
+  // After newly loading B, the new instances we have is {A, B}
+  // Both A and B are still kept new.
+  let payload = await Telemetry.getUntrustedModuleLoadEvents(kKeepNew);
+  print("payload = " + JSON.stringify(payload));
+  Assert.equal(get_events_count(payload), 2);
+
+  await load_and_free(kDllName); // C
+
+  // After newly loading C, the new instances we have is {A, B, C}
+  // All of A, B, and C are now marked as old.
+  payload = await Telemetry.getUntrustedModuleLoadEvents();
+  Assert.equal(get_events_count(payload), 3);
+
+  payload = await Telemetry.getUntrustedModuleLoadEvents(kIncludeOld);
+  // payload is {baseline, A, B, C}
+  Assert.equal(get_events_count(payload), baseline_count + 3);
+});
+
+// This tests the flag INCLUDE_PRIVATE_FIELDS_IN_LOADEVENTS returns
+// data including private fields.
+add_task(async function test_private_fields() {
+  await load_and_free(kDllName);
+  const data = await Telemetry.getUntrustedModuleLoadEvents(
+    Telemetry.KEEP_LOADEVENTS_NEW |
+      Telemetry.INCLUDE_PRIVATE_FIELDS_IN_LOADEVENTS
+  );
+
+  for (const module of data.modules) {
+    Assert.ok(!("resolvedDllName" in module));
+    Assert.ok("dllFile" in module);
+    Assert.ok(module.dllFile.QueryInterface);
+    Assert.ok(module.dllFile.QueryInterface(Ci.nsIFile));
+  }
+});
+
+// This tests the flag EXCLUDE_STACKINFO_FROM_LOADEVENTS correctly
+// merges "Staging" and "Settled" on a JS object correctly, and
+// the "combinedStacks" field is really excluded.
+add_task(async function test_exclude_stack() {
+  const baseline = await Telemetry.getUntrustedModuleLoadEvents(
+    Telemetry.EXCLUDE_STACKINFO_FROM_LOADEVENTS |
+      Telemetry.INCLUDE_OLD_LOADEVENTS
+  );
+  Assert.ok(!("combinedStacks" in baseline.processes[gCurrentPidStr]));
+  const baseSet = baseline.processes[gCurrentPidStr].events.map(
+    x => x.processUptimeMS
+  );
+
+  await load_and_free(kDllName);
+  await load_and_free(kDllName);
+  const newLoadsWithStack = await Telemetry.getUntrustedModuleLoadEvents(
+    Telemetry.KEEP_LOADEVENTS_NEW
+  );
+  Assert.ok("combinedStacks" in newLoadsWithStack.processes[gCurrentPidStr]);
+  const newSet = newLoadsWithStack.processes[gCurrentPidStr].events.map(
+    x => x.processUptimeMS
+  );
+
+  const merged = baseSet.concat(newSet);
+
+  const allData = await Telemetry.getUntrustedModuleLoadEvents(
+    Telemetry.KEEP_LOADEVENTS_NEW |
+      Telemetry.EXCLUDE_STACKINFO_FROM_LOADEVENTS |
+      Telemetry.INCLUDE_OLD_LOADEVENTS
+  );
+  Assert.ok(!("combinedStacks" in allData.processes[gCurrentPidStr]));
+  const allSet = allData.processes[gCurrentPidStr].events.map(
+    x => x.processUptimeMS
+  );
+
+  Assert.deepEqual(allSet.sort(), merged.sort());
+});
diff -Nru firefox-84.0.2+build1/toolkit/components/terminator/nsTerminator.cpp firefox-85.0+build1/toolkit/components/terminator/nsTerminator.cpp
--- firefox-84.0.2+build1/toolkit/components/terminator/nsTerminator.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/terminator/nsTerminator.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -85,8 +85,10 @@
 
 static ShutdownStep sShutdownSteps[] = {
     ShutdownStep("quit-application"),
+    ShutdownStep("profile-change-net-teardown"),
     ShutdownStep("profile-change-teardown"),
     ShutdownStep("profile-before-change"),
+    ShutdownStep("profile-before-change-qm"),
     ShutdownStep("xpcom-will-shutdown"),
     ShutdownStep("xpcom-shutdown"),
 };
@@ -205,7 +207,7 @@
         MOZ_CRASH_UNSAFE(strdup(msg.BeginReading()));
       }
 
-      MOZ_CRASH("Shutdown hanging before starting.");
+      MOZ_CRASH("Shutdown hanging before starting any known phase.");
     }
 
     // Maybe some workers are blocking the shutdown.
@@ -215,10 +217,20 @@
       runtimeService->CrashIfHanging();
     }
 
-    // Shutdown is apparently dead. Crash the process.
-    CrashReporter::SetMinidumpAnalysisAllThreads();
+    // If we get here, we know that all shutdown phases have been
+    // finished successfully and no worker is hanging.
+    // Therefore there should be nothing left worth waiting for.
+    // We give us a short extra time in case we have a late race
+    // and are about to have a clean shutdown anyway.
+#if defined(XP_WIN)
+    Sleep(1000 /* ms */);
+#else
+    usleep(1000000 /* usec */);
+#endif
 
-    MOZ_CRASH("Shutdown too long, probably frozen, causing a crash.");
+    // If we are still alive then we just crash.
+    CrashReporter::SetMinidumpAnalysisAllThreads();
+    MOZ_CRASH("Shutdown hanging after all known phases and workers finished.");
   }
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/thumbnails/PageThumbs.jsm firefox-85.0+build1/toolkit/components/thumbnails/PageThumbs.jsm
--- firefox-84.0.2+build1/toolkit/components/thumbnails/PageThumbs.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/thumbnails/PageThumbs.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -874,7 +874,6 @@
   onTitleChanged() {},
   onBeginUpdateBatch() {},
   onEndUpdateBatch() {},
-  onPageChanged() {},
   onDeleteVisits() {},
 
   QueryInterface: ChromeUtils.generateQI([
diff -Nru firefox-84.0.2+build1/toolkit/components/thumbnails/test/head.js firefox-85.0+build1/toolkit/components/thumbnails/test/head.js
--- firefox-84.0.2+build1/toolkit/components/thumbnails/test/head.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/thumbnails/test/head.js	2021-01-18 19:58:27.000000000 +0000
@@ -1,32 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Note: All tests in this directory are expected to have a runTests function
-// which TestRunner will use.
-/* global runTests */
-
-var tmp = {};
-ChromeUtils.import("resource://gre/modules/PageThumbs.jsm", tmp);
-ChromeUtils.import("resource://gre/modules/BackgroundPageThumbs.jsm", tmp);
-ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm", tmp);
-ChromeUtils.import("resource:///modules/sessionstore/SessionStore.jsm", tmp);
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm", tmp);
-ChromeUtils.import("resource://gre/modules/osfile.jsm", tmp);
-var {
-  PageThumbs,
-  BackgroundPageThumbs,
-  NewTabUtils,
-  PageThumbsStorage,
-  SessionStore,
-  FileUtils,
-  OS,
-} = tmp;
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "PlacesTestUtils",
-  "resource://testing-common/PlacesTestUtils.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm",
+  FileUtils: "resource://gre/modules/FileUtils.jsm",
+  NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
+  OS: "resource://gre/modules/osfile.jsm",
+  PageThumbs: "resource://gre/modules/PageThumbs.jsm",
+  PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm",
+  PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
+  SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
+});
 
 XPCOMUtils.defineLazyServiceGetter(
   this,
@@ -233,7 +217,6 @@
 function bgAddPageThumbObserver(url) {
   return new Promise((resolve, reject) => {
     function observe(subject, topic, data) {
-      // jshint ignore:line
       if (data === url) {
         switch (topic) {
           case "page-thumbnail:create":
diff -Nru firefox-84.0.2+build1/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp firefox-85.0+build1/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
--- firefox-84.0.2+build1/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp	2021-01-06 11:23:23.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -499,7 +499,7 @@
       NS_ASSERTION(window, "document has no window");
       if (!window) return NS_ERROR_UNEXPECTED;
 
-      nsFocusManager* fm = nsFocusManager::GetFocusManager();
+      RefPtr<nsFocusManager> fm = nsFocusManager::GetFocusManager();
       if (usesIndependentSelection) {
         /* If a search result is found inside an editable element, we'll focus
          * the element only if focus is in our content window, i.e.
@@ -524,7 +524,7 @@
         // We may be inside an editable element, and therefore the selection
         // may be controlled by a different selection controller.  Walk up the
         // chain of parent nodes to see if we find one.
-        nsCOMPtr<nsINode> node = returnRange->GetStartContainer();
+        nsINode* node = returnRange->GetStartContainer();
         while (node) {
           nsCOMPtr<nsIEditor> editor;
           if (RefPtr<HTMLInputElement> input =
@@ -557,7 +557,8 @@
 
           // Otherwise move focus/caret to editable element
           if (fm) {
-            fm->SetFocus(mFoundEditable, 0);
+            nsCOMPtr<Element> newFocusElement = mFoundEditable;
+            fm->SetFocus(newFocusElement, 0);
           }
           break;
         }
@@ -1173,9 +1174,9 @@
     // Append visible frames to frames array.
     nsLayoutUtils::GetFramesForArea(
         RelativeTo{rootFrame}, r, frames,
-        {FrameForPointOption::IgnorePaintSuppression,
-         FrameForPointOption::IgnoreRootScrollFrame,
-         FrameForPointOption::OnlyVisible});
+        {{FrameForPointOption::IgnorePaintSuppression,
+          FrameForPointOption::IgnoreRootScrollFrame,
+          FrameForPointOption::OnlyVisible}});
 
     // See if any of the frames contain the content. If they do, then the range
     // is visible. We search for the content rather than the original frame,
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp firefox-85.0+build1/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- firefox-84.0.2+build1/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -30,6 +30,7 @@
 #include "mozilla/ErrorNames.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
@@ -39,6 +40,7 @@
 #include "Classifier.h"
 #include "ProtocolParser.h"
 #include "mozilla/Attributes.h"
+#include "nsIHttpChannel.h"
 #include "nsIPrincipal.h"
 #include "nsIUrlListManager.h"
 #include "Classifier.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp firefox-85.0+build1/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
--- firefox-84.0.2+build1/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -270,9 +270,16 @@
   rv = innerURI->GetPathQueryRef(path);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // strip out anchors
+  // Strip fragment and query because canonicalization only applies to path
   int32_t ref = path.FindChar('#');
-  if (ref != kNotFound) path.SetLength(ref);
+  if (ref != kNotFound) {
+    path.SetLength(ref);
+  }
+
+  int32_t query = path.FindChar('?');
+  if (query != kNotFound) {
+    path.SetLength(query);
+  }
 
   nsAutoCString temp;
   rv = CanonicalizePath(path, temp);
@@ -280,6 +287,14 @@
 
   _retval.Append(temp);
 
+  if (query != kNotFound) {
+    nsAutoCString query;
+    rv = innerURI->GetQuery(query);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    _retval.AppendPrintf("?%s", query.get());
+  }
+
   return NS_OK;
 }
 
@@ -1081,7 +1096,7 @@
 }
 
 bool nsUrlClassifierUtils::ShouldURLEscape(const unsigned char c) const {
-  return c <= 32 || c == '%' || c >= 127;
+  return c <= 32 || c == '%' || c == '#' || c >= 127;
 }
 
 // moztest- tables are built-in created in LookupCache, they contain hardcoded
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_always_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_always_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_always_activate.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_always_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: false,
-    flashSetting: classifierTester.ALWAYS_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Ask to Activate, Flashblock off)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      "unknown",
-      classifierTester.ALWAYS_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_ask_to_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_ask_to_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_ask_to_activate.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_ask_to_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: false,
-    flashSetting: classifierTester.ASK_TO_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Ask to Activate, Flashblock off)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      "unknown",
-      classifierTester.ASK_TO_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_never_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_never_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_never_activate.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_off_with_never_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: false,
-    flashSetting: classifierTester.NEVER_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Never Activate, Flashblock off)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      "unknown",
-      classifierTester.NEVER_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_always_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_always_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_always_activate.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_always_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: true,
-    flashSetting: classifierTester.ALWAYS_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Ask to Activate, Flashblock on)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      testCase.expectedFlashClassification,
-      classifierTester.ALWAYS_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_ask_to_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_ask_to_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_ask_to_activate.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_ask_to_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: true,
-    flashSetting: classifierTester.ASK_TO_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Ask to Activate, Flashblock on)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      testCase.expectedFlashClassification,
-      classifierTester.ASK_TO_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_never_activate.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_never_activate.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_never_activate.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser_flashblock_on_with_never_activate.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-"use strict";
-requestLongerTimeout(3);
-
-/* import-globals-from classifierHelper.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierHelper.js",
-  this
-);
-/* import-globals-from classifierTester.js */
-Services.scriptloader.loadSubScript(
-  "chrome://mochitests/content/browser/toolkit/components/url-classifier/tests/browser/classifierTester.js",
-  this
-);
-
-add_task(async function checkFlashBlockLists() {
-  classifierTester.setPrefs({
-    setDBs: true,
-    flashBlockEnable: true,
-    flashSetting: classifierTester.NEVER_ACTIVATE_PREF_VALUE,
-  });
-
-  await classifierHelper.waitForInit();
-  await classifierHelper.addUrlToDB(classifierTester.dbUrls);
-
-  for (let testCase of classifierTester.testCases) {
-    info(`RUNNING TEST: ${testCase.name} (Never Activate, Flashblock on)`);
-    let tab = await classifierTester.buildTestCaseInNewTab(gBrowser, testCase);
-
-    let depth = testCase.domains.length - 1;
-    let pluginInfo = await classifierTester.getPluginInfo(
-      tab.linkedBrowser,
-      depth
-    );
-
-    classifierTester.checkPluginInfo(
-      pluginInfo,
-      testCase.expectedFlashClassification,
-      classifierTester.NEVER_ACTIVATE_PREF_VALUE
-    );
-
-    BrowserTestUtils.removeTab(tab);
-  }
-});
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser.ini firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/browser.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[DEFAULT]
-support-files =
-  flash_block_frame.html
-  classifierHelper.js
-  classifierTester.js
-  simple_blank.swf
-
-[browser_flashblock_on_with_never_activate.js]
-[browser_flashblock_off_with_never_activate.js]
-[browser_flashblock_on_with_ask_to_activate.js]
-[browser_flashblock_off_with_ask_to_activate.js]
-[browser_flashblock_on_with_always_activate.js]
-[browser_flashblock_off_with_always_activate.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/classifierHelper.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/classifierHelper.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/classifierHelper.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/classifierHelper.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +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/. */
-
-// Created from toolkit/components/url-classifier/tests/mochitest/classifierHelper.js
-// Unfortunately, browser tests cannot load that script as it is too reliant on
-// being loaded in the content process.
-
-let dbService = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(
-  Ci.nsIUrlClassifierDBService
-);
-let listmanager = Cc["@mozilla.org/url-classifier/listmanager;1"].getService(
-  Ci.nsIUrlListManager
-);
-
-if (typeof classifierHelper == "undefined") {
-  var classifierHelper = {};
-}
-
-const HASHLEN = 32;
-
-const PREFS = {
-  PROVIDER_LISTS: "browser.safebrowsing.provider.mozilla.lists",
-  DISALLOW_COMPLETIONS: "urlclassifier.disallow_completions",
-  PROVIDER_GETHASHURL: "browser.safebrowsing.provider.mozilla.gethashURL",
-};
-
-classifierHelper._curAddChunkNum = 1;
-
-// Keep urls added to database, those urls should be automatically
-// removed after test complete.
-classifierHelper._updatesToCleanup = [];
-
-// This function returns a Promise resolved when SafeBrowsing.jsm is initialized.
-// SafeBrowsing.jsm is initialized after mozEntries are added. Add observer
-// to receive "finished" event. For the case when this function is called
-// after the event had already been notified, we lookup entries to see if
-// they are already added to database.
-classifierHelper.waitForInit = function() {
-  return new Promise(function(resolve, reject) {
-    function checkForInit() {
-      if (listmanager.isRegistered()) {
-        resolve();
-      } else {
-        setTimeout(() => {
-          checkForInit();
-        }, 1000);
-      }
-    }
-
-    checkForInit();
-  });
-};
-
-// This function is used to allow completion for specific "list",
-// some lists like "test-malware-simple" is default disabled to ask for complete.
-// "list" is the db we would like to allow it
-// "url" is the completion server
-classifierHelper.allowCompletion = function(lists, url) {
-  for (let list of lists) {
-    // Add test db to provider
-    let pref = Services.prefs.getCharPref(PREFS.PROVIDER_LISTS);
-    pref += "," + list;
-    Services.prefs.setCharPref(PREFS.PROVIDER_LISTS, pref);
-
-    // Rename test db so we will not disallow it from completions
-    pref = Services.prefs.getCharPref(PREFS.DISALLOW_COMPLETIONS);
-    pref = pref.replace(list, list + "-backup");
-    Services.prefs.setCharPref(PREFS.DISALLOW_COMPLETIONS, pref);
-  }
-
-  // Set get hash url
-  Services.prefs.setCharPref(PREFS.PROVIDER_GETHASHURL, url);
-};
-
-// Pass { url: ..., db: ... } to add url to database,
-// Returns a Promise.
-classifierHelper.addUrlToDB = function(updateData) {
-  let testUpdate = "";
-  for (let update of updateData) {
-    let LISTNAME = update.db;
-    let CHUNKDATA = update.url;
-    let CHUNKLEN = CHUNKDATA.length;
-    let HASHLEN = update.len ? update.len : 32;
-
-    update.addChunk = classifierHelper._curAddChunkNum;
-    classifierHelper._curAddChunkNum += 1;
-
-    classifierHelper._updatesToCleanup.push(update);
-    testUpdate +=
-      "n:1000\n" +
-      "i:" +
-      LISTNAME +
-      "\n" +
-      "ad:1\n" +
-      "a:" +
-      update.addChunk +
-      ":" +
-      HASHLEN +
-      ":" +
-      CHUNKLEN +
-      "\n" +
-      CHUNKDATA;
-  }
-
-  return classifierHelper._update(testUpdate);
-};
-
-// This API is used to expire all add/sub chunks we have updated
-// by using addUrlToDB.
-// Returns a Promise.
-classifierHelper.resetDatabase = function() {
-  var testUpdate = "";
-  for (var update of classifierHelper._updatesToCleanup) {
-    testUpdate += "n:1000\ni:" + update.db + "\nad:" + update.addChunk + "\n";
-  }
-
-  return classifierHelper._update(testUpdate);
-};
-
-classifierHelper.reloadDatabase = function() {
-  dbService.reloadDatabase();
-};
-
-classifierHelper._update = function(update) {
-  return (async function() {
-    // beginUpdate may fail if there's an existing update in progress
-    // retry until success or testcase timeout.
-    let success = false;
-    while (!success) {
-      try {
-        await new Promise((resolve, reject) => {
-          let listener = {
-            QueryInterface: ChromeUtils.generateQI([
-              "nsIUrlClassifierUpdateObserver",
-            ]),
-            updateUrlRequested(url) {},
-            streamFinished(status) {},
-            updateError(errorCode) {
-              reject(errorCode);
-            },
-            updateSuccess(requestedTimeout) {
-              resolve();
-            },
-          };
-          dbService.beginUpdate(listener, "", "");
-          dbService.beginStream("", "");
-          dbService.updateStream(update);
-          dbService.finishStream();
-          dbService.finishUpdate();
-        });
-        success = true;
-      } catch (e) {
-        // Wait 1 second before trying again.
-        await new Promise(resolve => setTimeout(resolve, 1000));
-      }
-    }
-  })();
-};
-
-classifierHelper._cleanup = function() {
-  // Clean all the preferences that may have been touched by classifierHelper
-  for (var pref in PREFS) {
-    Services.prefs.clearUserPref(pref);
-  }
-
-  if (!classifierHelper._updatesToCleanup) {
-    return Promise.resolve();
-  }
-
-  return classifierHelper.resetDatabase();
-};
-// Cleanup will be called at end of each testcase to remove all the urls added to database.
-registerCleanupFunction(classifierHelper._cleanup);
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/classifierTester.js firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/classifierTester.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/classifierTester.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/classifierTester.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,451 +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/. */
-
-var classifierTester = {
-  URL_PATH:
-    "/browser/toolkit/components/url-classifier/tests/browser/flash_block_frame.html",
-  OBJECT_ID: "testObject",
-  IFRAME_ID: "testFrame",
-  FLASHBLOCK_ENABLE_PREF: "plugins.flashBlock.enabled",
-  FLASH_PLUGIN_USER_SETTING_PREF: "plugin.state.flash",
-  URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF: "urlclassifier.disallow_completions",
-  NEVER_ACTIVATE_PREF_VALUE: 0,
-  ASK_TO_ACTIVATE_PREF_VALUE: 1,
-  ALWAYS_ACTIVATE_PREF_VALUE: 2,
-
-  dbUrls: [
-    {
-      url: "flashallow.example.com/",
-      db: "test-flashallow-simple",
-      pref: "urlclassifier.flashAllowTable",
-    },
-    {
-      url: "exception.flashallow.example.com/",
-      db: "testexcept-flashallow-simple",
-      pref: "urlclassifier.flashAllowExceptTable",
-    },
-    {
-      url: "flashblock.example.com/",
-      db: "test-flash-simple",
-      pref: "urlclassifier.flashTable",
-    },
-    {
-      url: "exception.flashblock.example.com/",
-      db: "testexcept-flash-simple",
-      pref: "urlclassifier.flashExceptTable",
-    },
-    {
-      url: "subdocument.example.com/",
-      db: "test-flashsubdoc-simple",
-      pref: "urlclassifier.flashSubDocTable",
-    },
-    {
-      url: "exception.subdocument.example.com/",
-      db: "testexcept-flashsubdoc-simple",
-      pref: "urlclassifier.flashSubDocExceptTable",
-    },
-  ],
-
-  setPrefs({
-    setDBs = true,
-    flashBlockEnable = true,
-    flashSetting = classifierTester.ALWAYS_ACTIVATE_PREF_VALUE,
-  } = {}) {
-    if (setDBs) {
-      let DBs = [];
-
-      for (let dbData of classifierTester.dbUrls) {
-        Services.prefs.setCharPref(dbData.pref, dbData.db);
-        DBs.push(dbData.db);
-      }
-
-      let completions = Services.prefs.getCharPref(
-        classifierTester.URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF
-      );
-      completions += "," + DBs.join(",");
-      Services.prefs.setCharPref(
-        classifierTester.URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF,
-        completions
-      );
-    }
-
-    Services.prefs.setBoolPref(
-      classifierTester.FLASHBLOCK_ENABLE_PREF,
-      flashBlockEnable
-    );
-    Services.prefs.setIntPref(
-      classifierTester.FLASH_PLUGIN_USER_SETTING_PREF,
-      flashSetting
-    );
-  },
-
-  unsetPrefs() {
-    for (let dbData of classifierTester.dbUrls) {
-      Services.prefs.clearUserPref(dbData.pref);
-    }
-
-    Services.prefs.clearUserPref(
-      classifierTester.URLCLASSIFIER_DISALLOW_COMPLETIONS_PREF
-    );
-    Services.prefs.clearUserPref(classifierTester.FLASHBLOCK_ENABLE_PREF);
-    Services.prefs.clearUserPref(
-      classifierTester.FLASH_PLUGIN_USER_SETTING_PREF
-    );
-  },
-
-  // The |domains| property describes the domains of the nested documents making
-  // up the page. |domains[0]| represents the domain in the URL bar. The last
-  // domain in the list is the domain of the most deeply nested iframe.
-  // Only the plugin in the most deeply nested document will be checked.
-  testCases: [
-    {
-      name: "Unknown domain",
-      domains: ["http://example.com"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Nested unknown domains",
-      domains: ["http://example.com", "http://example.org"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Allowed domain",
-      domains: ["http://flashallow.example.com"],
-      expectedFlashClassification: "allowed",
-    },
-    {
-      name: "Allowed nested domain",
-      domains: ["http://example.com", "http://flashallow.example.com"],
-      expectedFlashClassification: "allowed",
-    },
-    {
-      name: "Subdocument of allowed domain",
-      domains: ["http://flashallow.example.com", "http://example.com"],
-      expectedFlashClassification: "allowed",
-    },
-    {
-      name: "Exception to allowed domain",
-      domains: ["http://exception.flashallow.example.com"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Blocked domain",
-      domains: ["http://flashblock.example.com"],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Nested blocked domain",
-      domains: ["http://example.com", "http://flashblock.example.com"],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Subdocument of blocked subdocument",
-      domains: [
-        "http://example.com",
-        "http://flashblock.example.com",
-        "http://example.com",
-      ],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Blocked subdocument nested among in allowed documents",
-      domains: [
-        "http://flashallow.example.com",
-        "http://flashblock.example.com",
-        "http://flashallow.example.com",
-      ],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Exception to blocked domain",
-      domains: ["http://exception.flashblock.example.com"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Sub-document blocked domain in top-level context",
-      domains: ["http://subdocument.example.com"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Sub-document blocked domain",
-      domains: ["http://example.com", "http://subdocument.example.com"],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Sub-document blocked domain in non-Third-Party context",
-      domains: [
-        "http://subdocument.example.com",
-        "http://subdocument.example.com",
-      ],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Sub-document blocked domain differing only by scheme",
-      domains: [
-        "http://subdocument.example.com",
-        "https://subdocument.example.com",
-      ],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Sub-document blocked subdocument of an allowed domain",
-      domains: [
-        "http://flashallow.example.com",
-        "http://subdocument.example.com",
-      ],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Subdocument of Sub-document blocked domain",
-      domains: [
-        "http://example.com",
-        "http://subdocument.example.com",
-        "http://example.com",
-      ],
-      expectedFlashClassification: "denied",
-    },
-    {
-      name: "Sub-document exception in top-level context",
-      domains: ["http://exception.subdocument.example.com"],
-      expectedFlashClassification: "unknown",
-    },
-    {
-      name: "Sub-document blocked domain exception",
-      domains: [
-        "http://example.com",
-        "http://exception.subdocument.example.com",
-      ],
-      expectedFlashClassification: "unknown",
-    },
-  ],
-
-  // Returns null if this value should not be verified given the combination
-  // of inputs
-  expectedPluginFallbackType(classification, flashSetting) {
-    switch (classification) {
-      case "unknown":
-        if (flashSetting == classifierTester.ALWAYS_ACTIVATE_PREF_VALUE) {
-          return null;
-        } else if (
-          flashSetting == classifierTester.ASK_TO_ACTIVATE_PREF_VALUE
-        ) {
-          return Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY;
-        } else if (flashSetting == classifierTester.NEVER_ACTIVATE_PREF_VALUE) {
-          return Ci.nsIObjectLoadingContent.PLUGIN_DISABLED;
-        }
-        break;
-      case "allowed":
-        if (flashSetting == classifierTester.NEVER_ACTIVATE_PREF_VALUE) {
-          return Ci.nsIObjectLoadingContent.PLUGIN_DISABLED;
-        }
-        return null;
-      case "denied":
-        return Ci.nsIObjectLoadingContent.PLUGIN_DISABLED;
-    }
-    throw new Error("Invalid classification or flash setting");
-  },
-
-  // Returns null if this value should not be verified given the combination
-  // of inputs
-  expectedActivated(classification, flashSetting) {
-    switch (classification) {
-      case "unknown":
-        return flashSetting == classifierTester.ALWAYS_ACTIVATE_PREF_VALUE;
-      case "allowed":
-        return flashSetting != classifierTester.NEVER_ACTIVATE_PREF_VALUE;
-      case "denied":
-        return false;
-    }
-    throw new Error("Invalid classification or flash setting");
-  },
-
-  // Returns null if this value should not be verified given the combination
-  // of inputs
-  expectedHasRunningPlugin(classification, flashSetting) {
-    switch (classification) {
-      case "unknown":
-        return flashSetting == classifierTester.ALWAYS_ACTIVATE_PREF_VALUE;
-      case "allowed":
-        return flashSetting != classifierTester.NEVER_ACTIVATE_PREF_VALUE;
-      case "denied":
-        return false;
-    }
-    throw new Error("Invalid classification or flash setting");
-  },
-
-  // Returns null if this value should not be verified given the combination
-  // of inputs
-  expectedPluginListed(classification, flashSetting) {
-    if (
-      flashSetting == classifierTester.ASK_TO_ACTIVATE_PREF_VALUE &&
-      Services.prefs.getCharPref("plugins.navigator.hidden_ctp_plugin") ==
-        "Shockwave Flash"
-    ) {
-      return false;
-    }
-    switch (classification) {
-      case "unknown":
-      case "allowed":
-        return flashSetting != classifierTester.NEVER_ACTIVATE_PREF_VALUE;
-      case "denied":
-        return false;
-    }
-    throw new Error("Invalid classification or flash setting");
-  },
-
-  buildTestCaseInNewTab(browser, testCase) {
-    return (async function() {
-      let iframeDomains = testCase.domains.slice();
-      let pageDomain = iframeDomains.shift();
-      let tab = await BrowserTestUtils.openNewForegroundTab(
-        browser,
-        pageDomain + classifierTester.URL_PATH
-      );
-
-      let depth = 0;
-      for (let domain of iframeDomains) {
-        // Firefox does not like to load the same page in its own iframe. Put some
-        // bogus query strings in the URL to make it happy.
-        let url =
-          domain +
-          classifierTester.URL_PATH +
-          "?date=" +
-          Date.now() +
-          "rand=" +
-          Math.random();
-        let domainLoaded = BrowserTestUtils.browserLoaded(
-          tab.linkedBrowser,
-          true,
-          url
-        );
-
-        await SpecialPowers.spawn(
-          tab.linkedBrowser,
-          [classifierTester.IFRAME_ID, url, depth],
-          (iframeId, url, depth) => {
-            let doc = content.document;
-            for (let i = 0; i < depth; ++i) {
-              doc = doc.getElementById(iframeId).contentDocument;
-            }
-            doc.getElementById(iframeId).src = url;
-          }
-        );
-
-        await domainLoaded;
-        ++depth;
-      }
-      return tab;
-    })();
-  },
-
-  async getPluginInfo(browser, depth) {
-    async function fn(frame, iframeId, depth) {
-      return SpecialPowers.spawn(
-        frame,
-        [iframeId, depth, fn.toString()],
-        async (iframeId, depth, fnSource) => {
-          // eslint-disable-next-line no-eval
-          let fnGetIframePluginInfo = eval(`(() => (${fnSource}))()`);
-
-          let doc = content.document;
-          let win = content.window;
-          let frame = doc.getElementById(iframeId);
-          if (!frame) {
-            throw new Error("Unable to find iframe!");
-          }
-          if (depth != 0) {
-            return fnGetIframePluginInfo(
-              frame.contentWindow,
-              iframeId,
-              --depth
-            );
-          }
-
-          let pluginObj = doc.getElementById("testObject");
-          if (!(pluginObj instanceof Ci.nsIObjectLoadingContent)) {
-            throw new Error("Unable to find plugin!");
-          }
-
-          return {
-            pluginFallbackType: pluginObj.pluginFallbackType,
-            activated: pluginObj.activated,
-            hasRunningPlugin: pluginObj.hasRunningPlugin,
-            listed: "Shockwave Flash" in win.navigator.plugins,
-            flashClassification: doc.documentFlashClassification,
-          };
-        }
-      );
-    }
-
-    return fn(browser, classifierTester.IFRAME_ID, depth);
-  },
-
-  checkPluginInfo(pluginInfo, expectedClassification, flashSetting) {
-    // Flashblocking is disabled when fission is enabled, so all the classifications
-    // should be "unknown"
-    if (Services.appinfo.fissionAutostart) {
-      expectedClassification = "unknown";
-    }
-
-    // We've stopped allowing flash to be always activated, so check
-    // existing tests that attempt to do so get treated as using ask-to-activate.
-    if (flashSetting == classifierTester.ALWAYS_ACTIVATE_PREF_VALUE) {
-      flashSetting = classifierTester.ASK_TO_ACTIVATE_PREF_VALUE;
-    }
-    is(
-      pluginInfo.flashClassification,
-      expectedClassification,
-      "Page's classification should match expected"
-    );
-
-    let expectedPluginFallbackType = classifierTester.expectedPluginFallbackType(
-      pluginInfo.flashClassification,
-      flashSetting
-    );
-    if (expectedPluginFallbackType != null) {
-      is(
-        pluginInfo.pluginFallbackType,
-        expectedPluginFallbackType,
-        "Plugin should have the correct fallback type"
-      );
-    }
-
-    let expectedActivated = classifierTester.expectedActivated(
-      pluginInfo.flashClassification,
-      flashSetting
-    );
-    if (expectedActivated != null) {
-      is(
-        pluginInfo.activated,
-        expectedActivated,
-        "Plugin should have the correct activation"
-      );
-    }
-
-    let expectedHasRunningPlugin = classifierTester.expectedHasRunningPlugin(
-      pluginInfo.flashClassification,
-      flashSetting
-    );
-    if (expectedHasRunningPlugin != null) {
-      is(
-        pluginInfo.hasRunningPlugin,
-        expectedHasRunningPlugin,
-        "Plugin should have the correct 'plugin running' state"
-      );
-    }
-
-    let expectedPluginListed = classifierTester.expectedPluginListed(
-      pluginInfo.flashClassification,
-      flashSetting
-    );
-    if (expectedPluginListed != null) {
-      is(
-        pluginInfo.listed,
-        expectedPluginListed,
-        "Plugin's existance in navigator.plugins should match expected"
-      );
-    }
-  },
-};
-registerCleanupFunction(classifierTester.unsetPrefs);
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/flash_block_frame.html firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/flash_block_frame.html
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/flash_block_frame.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/flash_block_frame.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test the URI Classifier</title>
-</head>
-<body>
-  <h1>Test page</h1>
-  <object id="testObject" width="100" height="100"
-          type="application/x-shockwave-flash-test"
-          data="simple_blank.swf"></object>
-  <br>
-  <iframe id="testFrame">
-  </iframe>
-</body>
-</html>
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/components/url-classifier/tests/browser/simple_blank.swf and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/components/url-classifier/tests/browser/simple_blank.swf differ
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/gtest/Common.cpp firefox-85.0+build1/toolkit/components/url-classifier/tests/gtest/Common.cpp
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/gtest/Common.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/gtest/Common.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "HashStore.h"
 #include "LookupCacheV4.h"
 #include "mozilla/Components.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIThread.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierUtils.cpp firefox-85.0+build1/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierUtils.cpp
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/gtest/TestUrlClassifierUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,8 @@
 }
 
 static void CheckEquals(nsCString& expected, nsCString& actual) {
-  ASSERT_TRUE((expected).Equals((actual)));
+  ASSERT_TRUE((expected).Equals((actual)))
+  << "Expected:" << expected.get() << ", Actual:" << actual.get();
 }
 
 static void TestUnescapeHelper(const char* in, const char* expected) {
@@ -107,10 +108,10 @@
   // Test empty string
   TestEncodeHelper("", "");
 
-  // Test that all characters we shouldn't encode ([33-36],[38,126]) are not.
+  // Test that all characters we shouldn't encode ([33-34],36,[38,126]) are not.
   nsCString noenc;
   for (int32_t i = 33; i < 127; i++) {
-    if (i != 37) {  // skip %
+    if (i != 35 && i != 37) {  // skip %
       noenc.Append(static_cast<char>(i));
     }
   }
@@ -118,10 +119,10 @@
   nsUrlClassifierUtils::GetInstance()->SpecialEncode(noenc, false, out);
   CheckEquals(noenc, out);
 
-  // Test that all the chars that we should encode [0,32],37,[127,255] are
+  // Test that all the chars that we should encode [0,32],35, 37,[127,255] are
   nsCString yesAsString, yesExpectedString;
   for (int32_t i = 1; i < 256; i++) {
-    if (i < 33 || i == 37 || i > 126) {
+    if (i < 33 || i == 35 || i == 37 || i > 126) {
       yesAsString.Append(static_cast<char>(i));
       yesExpectedString.Append('%');
       yesExpectedString.Append(int_to_hex_digit(i / 16));
@@ -148,7 +149,7 @@
   TestCanonicalizeHelper(
       "%257Ea%2521b%2540c%2523d%2524e%25f%255E00%252611%252A22%252833%252944_"
       "55%252B",
-      "~a!b@c#d$e%25f^00&11*22(33)44_55+");
+      "~a!b@c%23d$e%25f^00&11*22(33)44_55+");
 
   TestCanonicalizeHelper("", "");
   TestCanonicalizeHelper(
@@ -226,7 +227,6 @@
   TestHostnameHelper("..both..", "both");
   TestHostnameHelper("..a.b.c.d..", "a.b.c.d");
   TestHostnameHelper("..127.0.0.1..", "127.0.0.1");
-  TestHostnameHelper("asdf!@#$a", "asdf!@#$a");
   TestHostnameHelper("AB CD 12354", "ab%20cd%2012354");
   TestHostnameHelper("\1\2\3\4\112\177", "%01%02%03%04j%7F");
   TestHostnameHelper("<>.AS/-+", "<>.as/-+");
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_advisory_link.html firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_advisory_link.html
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_advisory_link.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_advisory_link.html	2021-01-18 19:58:27.000000000 +0000
@@ -75,7 +75,7 @@
                                     subject => subject == win);
 
       let browser = win.gBrowser.selectedBrowser;
-      await BrowserTestUtils.loadURI(browser, aTestData.url);
+      BrowserTestUtils.loadURI(browser, aTestData.url);
       await BrowserTestUtils.waitForContentEvent(browser, "DOMContentLoaded");
 
       let doc = win.gBrowser.contentDocument;
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_reporturl.html firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_reporturl.html
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_reporturl.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_reporturl.html	2021-01-18 19:58:27.000000000 +0000
@@ -95,7 +95,7 @@
 
 var createBlockedIframe = function(aWindow, aBrowser, aTopUrl, aUrl) {
   (async function() {
-    await BrowserTestUtils.loadURI(aBrowser, aTopUrl);
+    BrowserTestUtils.loadURI(aBrowser, aTopUrl);
     await BrowserTestUtils.browserLoaded(aBrowser);
 
     await SpecialPowers.spawn(aBrowser, [aUrl], async function(url) {
@@ -119,7 +119,7 @@
 
 var createBlockedPage = function(aWindow, aBrowser, aTopUrl, aUrl) {
   (async function() {
-    await BrowserTestUtils.loadURI(aBrowser, aTopUrl);
+    BrowserTestUtils.loadURI(aBrowser, aTopUrl);
     await BrowserTestUtils.waitForContentEvent(aBrowser, "DOMContentLoaded");
 
     let doc = aWindow.gBrowser.contentDocument;
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/mochitest/test_threathit_report.html	2021-01-18 19:58:27.000000000 +0000
@@ -200,7 +200,7 @@
       };
       win.gBrowser.addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_CONTENT_BLOCKING);
 
-      await BrowserTestUtils.loadURI(browser, aTestData.url);
+      BrowserTestUtils.loadURI(browser, aTestData.url);
       await BrowserTestUtils.browserLoaded(
         browser,
         false,
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/moz.build firefox-85.0+build1/toolkit/components/url-classifier/tests/moz.build
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -7,7 +7,6 @@
 MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"]
 MOCHITEST_CHROME_MANIFESTS += ["mochitest/chrome.ini"]
 XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"]
-BROWSER_CHROME_MANIFESTS += ["browser/browser.ini"]
 
 TESTING_JS_MODULES += [
     "UrlClassifierTestUtils.jsm",
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/unit/test_canonicalization.js firefox-85.0+build1/toolkit/components/url-classifier/tests/unit/test_canonicalization.js
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/unit/test_canonicalization.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/unit/test_canonicalization.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,83 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function canonicalize(url) {
+  let urlUtils = Cc["@mozilla.org/url-classifier/utils;1"].getService(
+    Ci.nsIUrlClassifierUtils
+  );
+
+  let uri = Services.io.newURI(url);
+  return uri.scheme + "://" + urlUtils.getKeyForURI(uri);
+}
+
+function run_test() {
+  // These testcases are from
+  // https://developers.google.com/safe-browsing/v4/urls-hashing
+  equal(canonicalize("http://host/%25%32%35"), "http://host/%25");
+  equal(canonicalize("http://host/%25%32%35%25%32%35"), "http://host/%25%25");
+  equal(canonicalize("http://host/%2525252525252525"), "http://host/%25");
+  equal(canonicalize("http://host/asdf%25%32%35asd"), "http://host/asdf%25asd");
+  equal(
+    canonicalize("http://host/%%%25%32%35asd%%"),
+    "http://host/%25%25%25asd%25%25"
+  );
+  equal(canonicalize("http://www.google.com/"), "http://www.google.com/");
+  equal(
+    canonicalize(
+      "http://%31%36%38%2e%31%38%38%2e%39%39%2e%32%36/%2E%73%65%63%75%72%65/%77%77%77%2E%65%62%61%79%2E%63%6F%6D/"
+    ),
+    "http://168.188.99.26/.secure/www.ebay.com/"
+  );
+  equal(
+    canonicalize(
+      "http://195.127.0.11/uploads/%20%20%20%20/.verify/.eBaysecure=updateuserdataxplimnbqmn-xplmvalidateinfoswqpcmlx=hgplmcx/"
+    ),
+    "http://195.127.0.11/uploads/%20%20%20%20/.verify/.eBaysecure=updateuserdataxplimnbqmn-xplmvalidateinfoswqpcmlx=hgplmcx/"
+  );
+  equal(canonicalize("http://3279880203/blah"), "http://195.127.0.11/blah");
+  equal(
+    canonicalize("http://www.google.com/blah/.."),
+    "http://www.google.com/"
+  );
+  equal(
+    canonicalize("http://www.evil.com/blah#frag"),
+    "http://www.evil.com/blah"
+  );
+  equal(canonicalize("http://www.GOOgle.com/"), "http://www.google.com/");
+  equal(canonicalize("http://www.google.com.../"), "http://www.google.com/");
+  equal(
+    canonicalize("http://www.google.com/foo\tbar\rbaz\n2"),
+    "http://www.google.com/foobarbaz2"
+  );
+  equal(canonicalize("http://www.google.com/q?"), "http://www.google.com/q?");
+  equal(
+    canonicalize("http://www.google.com/q?r?"),
+    "http://www.google.com/q?r?"
+  );
+  equal(
+    canonicalize("http://www.google.com/q?r?s"),
+    "http://www.google.com/q?r?s"
+  );
+  equal(canonicalize("http://evil.com/foo#bar#baz"), "http://evil.com/foo");
+  equal(canonicalize("http://evil.com/foo;"), "http://evil.com/foo;");
+  equal(canonicalize("http://evil.com/foo?bar;"), "http://evil.com/foo?bar;");
+  equal(
+    canonicalize("http://notrailingslash.com"),
+    "http://notrailingslash.com/"
+  );
+  equal(
+    canonicalize("http://www.gotaport.com:1234/"),
+    "http://www.gotaport.com/"
+  );
+  equal(
+    canonicalize("https://www.securesite.com/"),
+    "https://www.securesite.com/"
+  );
+  equal(canonicalize("http://host.com/ab%23cd"), "http://host.com/ab%23cd");
+  equal(
+    canonicalize("http://host.com//twoslashes?more//slashes"),
+    "http://host.com/twoslashes?more//slashes"
+  );
+}
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/tests/unit/xpcshell.ini firefox-85.0+build1/toolkit/components/url-classifier/tests/unit/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/components/url-classifier/tests/unit/xpcshell.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/tests/unit/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 [test_addsub.js]
 [test_bug1274685_unowned_list.js]
 [test_backoff.js]
+[test_canonicalization.js]
 [test_channelClassifierService.js]
 [test_dbservice.js]
 [test_hashcompleter.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp firefox-85.0+build1/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp
--- firefox-84.0.2+build1/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/url-classifier/VariableLengthPrefixSet.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/EndianUtils.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/toolkit/components/viaduct/Viaduct.cpp firefox-85.0+build1/toolkit/components/viaduct/Viaduct.cpp
--- firefox-84.0.2+build1/toolkit/components/viaduct/Viaduct.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/viaduct/Viaduct.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,7 +5,6 @@
 #include "mozilla/Viaduct.h"
 
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/ViaductRequest.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/toolkit/components/viaduct/ViaductRequest.cpp firefox-85.0+build1/toolkit/components/viaduct/ViaductRequest.cpp
--- firefox-84.0.2+build1/toolkit/components/viaduct/ViaductRequest.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/viaduct/ViaductRequest.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsIHttpChannel.h"
@@ -17,8 +18,10 @@
 #include "nsIUploadChannel2.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
+#include "nsPrintfCString.h"
 #include "nsString.h"
 #include "nsStringStream.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/toolkit/components/windowwatcher/nsIPromptCollection.idl firefox-85.0+build1/toolkit/components/windowwatcher/nsIPromptCollection.idl
--- firefox-84.0.2+build1/toolkit/components/windowwatcher/nsIPromptCollection.idl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/windowwatcher/nsIPromptCollection.idl	2021-01-18 19:58:27.000000000 +0000
@@ -33,4 +33,17 @@
    * @return true if the page should be allowed to repost data.
    */
   boolean confirmRepost(in BrowsingContext aBrowsingContext);
+
+  /**
+   * Ask the user for confirmation to upload a selected folder.
+   *
+   * @param aBrowsingContext
+   *        The browsing context the prompt should be opened for.
+   * @param aDirectoryName
+   *        Name of the folder that will be uploaded.
+   *
+   * @return true if the user confirmed the upload, false otherwise.
+   */
+  boolean confirmFolderUpload(in BrowsingContext aBrowsingContext,
+                              in AString aDirectoryName);
 };
diff -Nru firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser.ini firefox-85.0+build1/toolkit/components/windowwatcher/test/browser.ini
--- firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/windowwatcher/test/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -10,5 +10,5 @@
 [browser_new_sized_window.js]
 skip-if = os == 'win' # Bug 1276802 - Opening windows from content on Windows might not get the size right
 [browser_popup_condition.js]
-skip-if = debug # Opening many windows takes long on debug build
+skip-if = tsan || debug # Opening many windows takes long on slow build
 [browser_non_popup_from_popup.js]
diff -Nru firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js firefox-85.0+build1/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js
--- firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/windowwatcher/test/browser_non_popup_from_popup.js	2021-01-18 19:58:27.000000000 +0000
@@ -36,7 +36,7 @@
       const newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser, OPEN_PAGE);
 
       // Open a new tab that opens a popup with NON_POPUP_OPENER.
-      await BrowserTestUtils.loadURI(gBrowser, POPUP_OPENER);
+      BrowserTestUtils.loadURI(gBrowser, POPUP_OPENER);
 
       let win = await newPopupPromise;
       Assert.ok(true, "popup is opened");
diff -Nru firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser_popup_condition.js firefox-85.0+build1/toolkit/components/windowwatcher/test/browser_popup_condition.js
--- firefox-84.0.2+build1/toolkit/components/windowwatcher/test/browser_popup_condition.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/windowwatcher/test/browser_popup_condition.js	2021-01-18 19:58:27.000000000 +0000
@@ -205,7 +205,7 @@
           },
           async function(browser) {
             const newWinPromise = BrowserTestUtils.waitForNewWindow();
-            await BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
+            BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
 
             const win = await newWinPromise;
             const parentChromeFlags = getParentChromeFlags(win);
@@ -242,7 +242,7 @@
               gBrowser,
               OPEN_PAGE
             );
-            await BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
+            BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
 
             let tab = await newTabPromise;
             BrowserTestUtils.removeTab(tab);
@@ -262,7 +262,7 @@
               false,
               OPEN_PAGE
             );
-            await BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
+            BrowserTestUtils.loadURI(gBrowser, SCRIPT_PAGE);
 
             await pagePromise;
           }
diff -Nru firefox-84.0.2+build1/toolkit/components/xulstore/Cargo.toml firefox-85.0+build1/toolkit/components/xulstore/Cargo.toml
--- firefox-84.0.2+build1/toolkit/components/xulstore/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/xulstore/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -6,15 +6,14 @@
 
 [dependencies]
 crossbeam-utils = "0.6.3"
-cstr = "0.1"
+cstr = "0.2"
 libc = "0.2"
-lmdb-rkv = "0.14"
 log = "0.4"
 moz_task = { path = "../../../xpcom/rust/moz_task" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
 nserror = { path = "../../../xpcom/rust/nserror" }
 once_cell = "1"
-rkv = "0.10.2"
+rkv = { version = "0.16.1", default-features = false, features=["no-canonicalize-path"] }
 serde_json = "1"
 tempfile = "3"
 xpcom = { path = "../../../xpcom/rust/xpcom" }
diff -Nru firefox-84.0.2+build1/toolkit/components/xulstore/src/error.rs firefox-85.0+build1/toolkit/components/xulstore/src/error.rs
--- firefox-84.0.2+build1/toolkit/components/xulstore/src/error.rs	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/xulstore/src/error.rs	2021-01-18 19:58:27.000000000 +0000
@@ -5,7 +5,7 @@
 use nserror::{
     nsresult, NS_ERROR_FAILURE, NS_ERROR_ILLEGAL_VALUE, NS_ERROR_NOT_AVAILABLE, NS_ERROR_UNEXPECTED,
 };
-use rkv::{migrate::MigrateError as RkvMigrateError, StoreError as RkvStoreError};
+use rkv::{MigrateError as RkvMigrateError, StoreError as RkvStoreError};
 use serde_json::Error as SerdeJsonError;
 use std::{io::Error as IoError, str::Utf8Error, string::FromUtf16Error, sync::PoisonError};
 
diff -Nru firefox-84.0.2+build1/toolkit/components/xulstore/src/lib.rs firefox-85.0+build1/toolkit/components/xulstore/src/lib.rs
--- firefox-84.0.2+build1/toolkit/components/xulstore/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/xulstore/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -8,7 +8,6 @@
 #[macro_use]
 extern crate failure;
 extern crate libc;
-extern crate lmdb;
 #[macro_use]
 extern crate log;
 extern crate moz_task;
diff -Nru firefox-84.0.2+build1/toolkit/components/xulstore/src/persist.rs firefox-85.0+build1/toolkit/components/xulstore/src/persist.rs
--- firefox-84.0.2+build1/toolkit/components/xulstore/src/persist.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/xulstore/src/persist.rs	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,6 @@
     statics::get_database,
 };
 use crossbeam_utils::atomic::AtomicCell;
-use lmdb::Error as LmdbError;
 use moz_task::{dispatch_background_task_with_options, DispatchOptions, Task, TaskRunnable};
 use nserror::nsresult;
 use once_cell::sync::Lazy;
@@ -60,7 +59,8 @@
     let writes = writes.ok_or(XULStoreError::Unavailable)?;
 
     let db = get_database()?;
-    let mut writer = db.env.write()?;
+    let env = db.rkv.read()?;
+    let mut writer = env.write()?;
 
     for (key, value) in writes.iter() {
         match value {
@@ -73,7 +73,7 @@
                     // to remove a value that doesn't exist in the store,
                     // so we ignore the error (although in this case the key
                     // should exist, since it was in the cache!).
-                    Err(RkvStoreError::LmdbError(LmdbError::NotFound)) => {
+                    Err(RkvStoreError::KeyValuePairNotFound) => {
                         warn!("tried to remove key that isn't in the store");
                     }
 
diff -Nru firefox-84.0.2+build1/toolkit/components/xulstore/src/statics.rs firefox-85.0+build1/toolkit/components/xulstore/src/statics.rs
--- firefox-84.0.2+build1/toolkit/components/xulstore/src/statics.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/components/xulstore/src/statics.rs	2021-01-18 19:58:27.000000000 +0000
@@ -7,31 +7,33 @@
     ffi::ProfileChangeObserver,
     make_key, SEPARATOR,
 };
-use lmdb::Error as LmdbError;
 use moz_task::is_main_thread;
 use nsstring::nsString;
 use once_cell::sync::Lazy;
-use rkv::{migrate::Migrator, Rkv, SingleStore, StoreError, StoreOptions, Value};
+use rkv::backend::{SafeMode, SafeModeDatabase, SafeModeEnvironment};
+use rkv::{Migrator, StoreOptions, Value};
 use std::{
     collections::BTreeMap,
-    fs::{copy, create_dir_all, remove_file, File},
+    fs::{create_dir_all, remove_file, File},
     path::PathBuf,
     str,
-    sync::Mutex,
+    sync::{Arc, Mutex, RwLock},
 };
-use tempfile::tempdir;
 use xpcom::{interfaces::nsIFile, XpCom};
 
+type Manager = rkv::Manager<SafeModeEnvironment>;
+type Rkv = rkv::Rkv<SafeModeEnvironment>;
+type SingleStore = rkv::SingleStore<SafeModeDatabase>;
 type XULStoreCache = BTreeMap<String, BTreeMap<String, BTreeMap<String, String>>>;
 
 pub struct Database {
-    pub env: Rkv,
+    pub rkv: Arc<RwLock<Rkv>>,
     pub store: SingleStore,
 }
 
 impl Database {
-    fn new(env: Rkv, store: SingleStore) -> Database {
-        Database { env, store }
+    fn new(rkv: Arc<RwLock<Rkv>>, store: SingleStore) -> Database {
+        Database { rkv, store }
     }
 }
 
@@ -44,31 +46,13 @@
     Lazy::new(|| Mutex::new(cache_data().ok()));
 
 pub(crate) fn get_database() -> XULStoreResult<Database> {
+    let mut manager = Manager::singleton().write()?;
     let xulstore_dir = get_xulstore_dir()?;
     let xulstore_path = xulstore_dir.as_path();
-
-    let env = match Rkv::new(xulstore_path) {
-        Ok(env) => Ok(env),
-        Err(StoreError::LmdbError(LmdbError::Invalid)) => {
-            let temp_env = tempdir()?;
-            let mut migrator = Migrator::new(&xulstore_path)?;
-            migrator.migrate(temp_env.path())?;
-            copy(
-                temp_env.path().join("data.mdb"),
-                xulstore_path.join("data.mdb"),
-            )?;
-            copy(
-                temp_env.path().join("lock.mdb"),
-                xulstore_path.join("lock.mdb"),
-            )?;
-            Rkv::new(xulstore_path)
-        }
-        Err(err) => Err(err),
-    }?;
-
-    let store = env.open_single("db", StoreOptions::create())?;
-
-    Ok(Database::new(env, store))
+    let rkv = manager.get_or_create(xulstore_path, Rkv::new::<SafeMode>)?;
+    Migrator::easy_migrate_lmdb_to_safe_mode(xulstore_path, rkv.read()?)?;
+    let store = rkv.read()?.open_single("db", StoreOptions::create())?;
+    Ok(Database::new(rkv, store))
 }
 
 pub(crate) fn update_profile_dir() {
@@ -174,26 +158,24 @@
 
 fn cache_data() -> XULStoreResult<XULStoreCache> {
     let db = get_database()?;
-    maybe_migrate_data(&db.env, db.store);
+    maybe_migrate_data(&db, db.store);
 
     let mut all = XULStoreCache::default();
     if in_safe_mode()? {
         return Ok(all);
     }
 
-    let reader = db.env.read()?;
+    let env = db.rkv.read()?;
+    let reader = env.read()?;
     let iterator = db.store.iter_start(&reader)?;
 
     for result in iterator {
         let (key, value): (&str, String) = match result {
-            Ok((key, value)) => {
-                assert!(value.is_some(), "iterated key has value");
-                match (str::from_utf8(&key), unwrap_value(&value)) {
-                    (Ok(key), Ok(value)) => (key, value),
-                    (Err(err), _) => return Err(err.into()),
-                    (_, Err(err)) => return Err(err),
-                }
-            }
+            Ok((key, value)) => match (str::from_utf8(&key), unwrap_value(&value)) {
+                (Ok(key), Ok(value)) => (key, value),
+                (Err(err), _) => return Err(err.into()),
+                (_, Err(err)) => return Err(err),
+            },
             Err(err) => return Err(err.into()),
         };
 
@@ -218,7 +200,7 @@
     Ok(all)
 }
 
-fn maybe_migrate_data(env: &Rkv, store: SingleStore) {
+fn maybe_migrate_data(db: &Database, store: SingleStore) {
     // Failure to migrate data isn't fatal, so we don't return a result.
     // But we use a closure returning a result to enable use of the ? operator.
     (|| -> XULStoreResult<()> {
@@ -235,6 +217,7 @@
         let file = File::open(old_datastore.clone())?;
         let json: XULStoreCache = serde_json::from_reader(file)?;
 
+        let env = db.rkv.read()?;
         let mut writer = env.write()?;
 
         for (doc, ids) in json {
@@ -255,17 +238,13 @@
     .unwrap_or_else(|err| error!("error migrating data: {}", err));
 }
 
-fn unwrap_value(value: &Option<Value>) -> XULStoreResult<String> {
+fn unwrap_value(value: &Value) -> XULStoreResult<String> {
     match value {
-        Some(Value::Str(val)) => Ok(val.to_string()),
-
-        // Per the XULStore API, return an empty string if the value
-        // isn't found.
-        None => Ok(String::new()),
+        Value::Str(val) => Ok(val.to_string()),
 
         // This should never happen, but it could happen in theory
         // if someone writes a different kind of value into the store
         // using a more general API (kvstore, rkv, LMDB).
-        Some(_) => Err(XULStoreError::UnexpectedValue),
+        _ => Err(XULStoreError::UnexpectedValue),
     }
 }
diff -Nru firefox-84.0.2+build1/toolkit/content/aboutNetworking.js firefox-85.0+build1/toolkit/content/aboutNetworking.js
--- firefox-84.0.2+build1/toolkit/content/aboutNetworking.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/aboutNetworking.js	2021-01-18 19:58:27.000000000 +0000
@@ -551,8 +551,8 @@
       let alpn = record.alpn ? `alpn="${record.alpn.alpn}" ` : "";
       let noDefaultAlpn = record.noDefaultAlpn ? "noDefaultAlpn " : "";
       let port = record.port ? `port="${record.port.port}" ` : "";
-      let echconfig = record.echconfig
-        ? `echconfig="${record.echconfig.echconfig}" `
+      let echConfig = record.echConfig
+        ? `echConfig="${record.echConfig.echConfig}" `
         : "";
       let ipv4hint = "";
       let ipv6hint = "";
@@ -575,9 +575,9 @@
         ipv6hint = `ipv6hint="${ipv6Str}" `;
       }
 
-      let str = `${record.priority} ${record.name} `;
+      let str = `${record.priority} ${record.targetName} `;
       str += `(${alpn}${noDefaultAlpn}${port}`;
-      str += `${ipv4hint}${echconfig}${ipv6hint})`;
+      str += `${ipv4hint}${echConfig}${ipv6hint})`;
       row.appendChild(col(str));
       new_cont.appendChild(row);
     }
diff -Nru firefox-84.0.2+build1/toolkit/content/aboutSupport.js firefox-85.0+build1/toolkit/content/aboutSupport.js
--- firefox-84.0.2+build1/toolkit/content/aboutSupport.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/aboutSupport.js	2021-01-18 19:58:27.000000000 +0000
@@ -26,6 +26,13 @@
   "resource://gre/modules/PlacesDBUtils.jsm"
 );
 
+function showThirdPartyModules() {
+  return (
+    AppConstants.platform == "win" &&
+    Services.prefs.getBoolPref("browser.enableAboutThirdParty")
+  );
+}
+
 window.addEventListener("load", function onload(event) {
   try {
     window.removeEventListener("load", onload);
@@ -36,6 +43,10 @@
     });
     populateActionBox();
     setupEventListeners();
+    if (showThirdPartyModules()) {
+      $("third-party-modules").hidden = false;
+      $("third-party-modules-table").hidden = false;
+    }
   } catch (e) {
     Cu.reportError(
       "stack of load error for about:support: " + e + ": " + e.stack
@@ -1161,6 +1172,180 @@
       data.osPrefs.regionalPrefsLocales
     );
   },
+
+  thirdPartyModules(aData) {
+    if (!showThirdPartyModules()) {
+      return;
+    }
+
+    if (!aData || !aData.length) {
+      $("third-party-modules-no-data").hidden = false;
+      return;
+    }
+
+    const createElementWithLabel = (tag, label) =>
+      label
+        ? $.new(tag, label)
+        : $.new(tag, "", "", {
+            "data-l10n-id": "support-third-party-modules-no-value",
+          });
+
+    const iconUp = "chrome://global/skin/icons/arrow-up-12.svg";
+    const iconDown = "chrome://global/skin/icons/arrow-dropdown-12.svg";
+    const iconFolder = "chrome://global/skin/icons/findFile.svg";
+    const iconUnsigned =
+      "chrome://global/skin/icons/connection-mixed-active-loaded.svg";
+    const outerTHead = $("third-party-modules-thead");
+    const outerTBody = $("third-party-modules-tbody");
+
+    outerTBody.addEventListener("click", event => {
+      const btnOpenDir = event.target.closest("button");
+      if (!btnOpenDir || !btnOpenDir.fileObj) {
+        return;
+      }
+      btnOpenDir.fileObj.reveal();
+    });
+
+    for (const module of aData) {
+      const btnOpenDir = $.new(
+        "button",
+        [
+          $.new("img", "", "third-party-svg-common", {
+            src: iconFolder,
+            "data-l10n-id": "support-third-party-modules-folder-icon",
+          }),
+        ],
+        "third-party-button third-party-button-open-dir",
+        {
+          "data-l10n-id": "support-third-party-modules-button-open",
+        }
+      );
+      btnOpenDir.fileObj = module.dllFile;
+
+      const innerTBody = $.new("tbody", [], null);
+      for (const event of module.events) {
+        innerTBody.appendChild(
+          $.new("tr", [
+            $.new("td", event.processIdAndType),
+            createElementWithLabel("td", event.threadName),
+            $.new("td", event.baseAddress),
+            $.new("td", event.processUptimeMS),
+            // loadDurationMS can be empty (not zero) when a module is loaded
+            // very early in the process.  processUptimeMS always has a value.
+            createElementWithLabel("td", event.loadDurationMS),
+          ])
+        );
+      }
+
+      const detailRow = $.new(
+        "tr",
+        [
+          $.new(
+            "td",
+            [
+              $.new("table", [
+                $.new("thead", [
+                  $.new("th", "", "", {
+                    "data-l10n-id": "support-third-party-modules-process",
+                  }),
+                  $.new("th", "", "", {
+                    "data-l10n-id": "support-third-party-modules-thread",
+                  }),
+                  $.new("th", "", "", {
+                    "data-l10n-id": "support-third-party-modules-base",
+                  }),
+                  $.new("th", "", "", {
+                    "data-l10n-id": "support-third-party-modules-uptime",
+                  }),
+                  $.new("th", "", "", {
+                    "data-l10n-id": "support-third-party-modules-duration",
+                  }),
+                ]),
+                innerTBody,
+              ]),
+            ],
+            "",
+            { colspan: outerTHead.children.length + 1 }
+          ),
+        ],
+        "",
+        { hidden: true }
+      );
+
+      const imgUpDown = $.new("img", "", "third-party-svg-common", {
+        src: iconDown,
+        "data-l10n-id": "support-third-party-modules-down-icon",
+      });
+      const btnExpandCollapse = $.new(
+        "button",
+        [imgUpDown],
+        "third-party-button",
+        {
+          "data-l10n-id": "support-third-party-modules-expand",
+        }
+      );
+      btnExpandCollapse.addEventListener("click", () => {
+        if (detailRow.hidden) {
+          detailRow.hidden = false;
+          imgUpDown.src = iconUp;
+          document.l10n.setAttributes(
+            imgUpDown,
+            "support-third-party-modules-up-icon"
+          );
+          document.l10n.setAttributes(
+            btnExpandCollapse,
+            "support-third-party-modules-collapse"
+          );
+        } else {
+          detailRow.hidden = true;
+          imgUpDown.src = iconDown;
+          document.l10n.setAttributes(
+            imgUpDown,
+            "support-third-party-modules-down-icon"
+          );
+          document.l10n.setAttributes(
+            btnExpandCollapse,
+            "support-third-party-modules-expand"
+          );
+        }
+      });
+
+      const vendorInfoCell = $.new("td", [
+        createElementWithLabel("span", module.signedBy || module.companyName),
+      ]);
+      if (!module.signedBy) {
+        vendorInfoCell.prepend(
+          $.new(
+            "img",
+            "",
+            "third-party-svg-common third-party-image-unsigned",
+            {
+              src: iconUnsigned,
+              "data-l10n-id": "support-third-party-modules-unsigned-icon",
+            }
+          )
+        );
+      }
+
+      outerTBody.appendChild(
+        $.new("tr", [
+          $.new("td", [
+            document.createTextNode(module.dllFile.leafName),
+            btnOpenDir,
+          ]),
+          createElementWithLabel("td", module.fileVersion),
+          vendorInfoCell,
+          $.new(
+            "td",
+            module.events.length,
+            "third-party-modules-column-occurrence"
+          ),
+          $.new("td", [btnExpandCollapse], "third-party-modules-column-expand"),
+        ])
+      );
+      outerTBody.appendChild(detailRow);
+    }
+  },
 };
 
 var $ = document.getElementById.bind(document);
diff -Nru firefox-84.0.2+build1/toolkit/content/aboutSupport.xhtml firefox-85.0+build1/toolkit/content/aboutSupport.xhtml
--- firefox-84.0.2+build1/toolkit/content/aboutSupport.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/aboutSupport.xhtml	2021-01-18 19:58:27.000000000 +0000
@@ -784,6 +784,25 @@
       </table>
 #endif
 
+#ifdef XP_WIN
+      <h2 id="third-party-modules" class="major-section" hidden="true"
+          data-l10n-id="support-third-party-modules-title"/>
+      <table id="third-party-modules-table" class="prefs-table" hidden="true">
+        <thead id="third-party-modules-thead">
+          <th data-l10n-id="support-third-party-modules-module"/>
+          <th class="third-party-modules-column-version"
+              data-l10n-id="support-third-party-modules-version"/>
+          <th data-l10n-id="support-third-party-modules-vendor"/>
+          <th class="third-party-modules-header-occurrence" colspan="2"
+              data-l10n-id="support-third-party-modules-occurrence"/>
+        </thead>
+        <tbody id="third-party-modules-tbody">
+          <tr><td id="third-party-modules-no-data" colspan="5" hidden="true"
+                  data-l10n-id="support-third-party-modules-empty"></td></tr>
+        </tbody>
+      </table>
+#endif
+
     </div>
 
   </body>
diff -Nru firefox-84.0.2+build1/toolkit/content/aboutTelemetry.css firefox-85.0+build1/toolkit/content/aboutTelemetry.css
--- firefox-84.0.2+build1/toolkit/content/aboutTelemetry.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/aboutTelemetry.css	2021-01-18 19:58:27.000000000 +0000
@@ -4,13 +4,15 @@
 
 @import url("chrome://global/skin/in-content/common.css");
 
-html {
-  height: 100%;
-}
-
 body {
   display: flex;
-  height: 100%;
+}
+
+/* This is needed to make the sidebar not hide the last button but breaks printing by hiding overflowing content */
+@media not print {
+  html, body {
+    height: 100%;
+  }
 }
 
 #categories {
diff -Nru firefox-84.0.2+build1/toolkit/content/contentAreaUtils.js firefox-85.0+build1/toolkit/content/contentAreaUtils.js
--- firefox-84.0.2+build1/toolkit/content/contentAreaUtils.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/contentAreaUtils.js	2021-01-18 19:58:27.000000000 +0000
@@ -1162,16 +1162,6 @@
     return "";
   } // temporary fix for bug 120327
 
-  // For images, rely solely on the mime type if known.
-  // All the extension is going to do is lie to us.
-  if (aContentType?.startsWith("image/")) {
-    let mimeInfo = getMIMEInfoForType(aContentType, "");
-    let exts = Array.from(mimeInfo.getFileExtensions());
-    if (exts.length) {
-      return exts[0];
-    }
-  }
-
   // First try the extension from the filename
   var url = Cc["@mozilla.org/network/standard-url-mutator;1"]
     .createInstance(Ci.nsIURIMutator)
@@ -1185,7 +1175,13 @@
   // This mirrors some code in nsExternalHelperAppService::DoContent
   // Use the filename first and then the URI if that fails
 
-  var mimeInfo = getMIMEInfoForType(aContentType, ext);
+  // For images, rely solely on the mime type if known.
+  // All the extension is going to do is lie to us.
+  var lookupExt = ext;
+  if (aContentType?.startsWith("image/")) {
+    lookupExt = "";
+  }
+  var mimeInfo = getMIMEInfoForType(aContentType, lookupExt);
 
   if (ext && mimeInfo && mimeInfo.extensionExists(ext)) {
     return ext;
@@ -1201,11 +1197,15 @@
   if (urlext && mimeInfo && mimeInfo.extensionExists(urlext)) {
     return urlext;
   }
+
+  // That failed as well. If we could lookup the MIME use the primary
+  // extension for that type.
   try {
     if (mimeInfo) {
       return mimeInfo.primaryExtension;
     }
   } catch (e) {}
+
   // Fall back on the extensions in the filename and URI for lack
   // of anything better.
   return ext || urlext;
diff -Nru firefox-84.0.2+build1/toolkit/content/customElements.js firefox-85.0+build1/toolkit/content/customElements.js
--- firefox-84.0.2+build1/toolkit/content/customElements.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/customElements.js	2021-01-18 19:58:27.000000000 +0000
@@ -849,6 +849,10 @@
         "chrome://global/content/printPreviewToolbar.js",
       ],
       [
+        "printpreview-pagination",
+        "chrome://global/content/printPreviewPagination.js",
+      ],
+      [
         "autocomplete-input",
         "chrome://global/content/elements/autocomplete-input.js",
       ],
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_bug1170531.js firefox-85.0+build1/toolkit/content/tests/browser/browser_bug1170531.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_bug1170531.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_bug1170531.js	2021-01-18 19:58:27.000000000 +0000
@@ -54,10 +54,7 @@
     async function(browser) {
       let menu_cut_disabled, menu_copy_disabled;
 
-      await BrowserTestUtils.loadURI(
-        browser,
-        "data:text/html,<div>hello!</div>"
-      );
+      BrowserTestUtils.loadURI(browser, "data:text/html,<div>hello!</div>");
       await BrowserTestUtils.browserLoaded(browser);
       browser.focus();
       await new Promise(resolve => waitForFocus(resolve, window));
@@ -74,7 +71,7 @@
       is(menu_copy_disabled, false, "menu_copy should be enabled");
       await new Promise(closeMenu);
 
-      await BrowserTestUtils.loadURI(
+      BrowserTestUtils.loadURI(
         browser,
         "data:text/html,<div contentEditable='true'>hello!</div>"
       );
@@ -94,7 +91,7 @@
       is(menu_copy_disabled, false, "menu_copy should be enabled");
       await new Promise(closeMenu);
 
-      await BrowserTestUtils.loadURI(browser, "about:preferences");
+      BrowserTestUtils.loadURI(browser, "about:preferences");
       await BrowserTestUtils.browserLoaded(browser);
       browser.focus();
       await new Promise(resolve => waitForFocus(resolve, window));
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_bug982298.js firefox-85.0+build1/toolkit/content/tests/browser/browser_bug982298.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_bug982298.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_bug982298.js	2021-01-18 19:58:27.000000000 +0000
@@ -34,7 +34,7 @@
       let textarea = content.document.getElementById("textarea1");
       textarea.scrollTop = textarea.scrollHeight;
     });
-    await BrowserTestUtils.loadURI(browser, "about:blank");
+    BrowserTestUtils.loadURI(browser, "about:blank");
     await BrowserTestUtils.browserLoaded(browser);
 
     ok(
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_datetime_datepicker.js firefox-85.0+build1/toolkit/content/tests/browser/browser_datetime_datepicker.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_datetime_datepicker.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_datetime_datepicker.js	2021-01-18 19:58:27.000000000 +0000
@@ -243,6 +243,8 @@
 /**
  * Ensure picker opens and closes with key bindings appropriately.
  */
+/*
+disabled for bug 1676078
 add_task(async function test_datepicker_keyboard_open() {
   const inputValue = "2016-12-15";
   const prevMonth = "2016-11-01";
@@ -284,6 +286,7 @@
 
   await helper.tearDown();
 });
+*/
 
 /**
  * When the prev month button is clicked, calendar should display the dates for
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_delay_autoplay_plugIn.js firefox-85.0+build1/toolkit/content/tests/browser/browser_delay_autoplay_plugIn.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_delay_autoplay_plugIn.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_delay_autoplay_plugIn.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-const PAGE =
-  "https://example.com/browser/toolkit/content/tests/browser/file_plugIn.html";
-
-add_task(async function setup_test_preference() {
-  setTestPluginEnabledState(Ci.nsIPluginTag.STATE_ENABLED, "Test Plug-in");
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["media.useAudioChannelService.testing", true],
-      ["media.block-autoplay-until-in-foreground", true],
-    ],
-  });
-});
-
-add_task(async function block_plug_in() {
-  info("- open new background tab -");
-  let tab = BrowserTestUtils.addTab(window.gBrowser, "about:blank");
-  BrowserTestUtils.loadURI(tab.linkedBrowser, PAGE);
-  await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-
-  info("- tab should be blocked -");
-  await waitForTabBlockEvent(tab, true);
-
-  info("- switch tab -");
-  await BrowserTestUtils.switchTab(window.gBrowser, tab);
-
-  info("- tab should be resumed -");
-  await waitForTabBlockEvent(tab, false);
-
-  info("- tab should be audible -");
-  await waitForTabPlayingEvent(tab, true);
-
-  info("- remove tab -");
-  BrowserTestUtils.removeTab(tab);
-});
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser.ini firefox-85.0+build1/toolkit/content/tests/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,6 @@
   file_multipleAudio.html
   file_multiplePlayingAudio.html
   file_nonAutoplayAudio.html
-  file_plugIn.html
   file_redirect.html
   file_redirect_to.html
   file_silentAudioTrack.html
@@ -42,9 +41,6 @@
 [browser_delay_autoplay_playMediaInMuteTab.js]
 tags = audiochannel
 skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1536573
-[browser_delay_autoplay_plugIn.js]
-tags = audiochannel
-skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1536573
 [browser_delay_autoplay_silentAudioTrack_media.js]
 tags = audiochannel
 skip-if = (os == "win" && processor == "aarch64") || (os == "mac") || (os == "linux" && !debug) # aarch64 due to 1536573 #Bug 1524746
@@ -68,6 +64,7 @@
 [browser_crash_previous_frameloader.js]
 run-if = e10s && crashreporter
 [browser_datetime_datepicker.js]
+skip-if = tsan # Frequently times out on TSan
 [browser_default_image_filename.js]
 [browser_default_image_filename_redirect.js]
 support-files =
@@ -98,6 +95,10 @@
   gizmo.mp4
   gizmo-noaudio.webm
 skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1536573
+[browser_media_wakelock_PIP.js]
+support-files =
+  file_video.html
+  gizmo.mp4
 [browser_media_wakelock_webaudio.js]
 [browser_quickfind_editable.js]
 skip-if = (verify && debug && (os == 'linux'))
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_media_wakelock.js firefox-85.0+build1/toolkit/content/tests/browser/browser_media_wakelock.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_media_wakelock.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_media_wakelock.js	2021-01-18 19:58:27.000000000 +0000
@@ -73,15 +73,6 @@
     lockAudio: true,
     lockVideo: true,
   });
-  await checkWakelockWhenChangeTabVisibility({
-    description: "playing a PIP video",
-    url: "file_video.html",
-    additionalParams: {
-      elementIdForEnteringPIPMode: "v",
-    },
-    lockAudio: true,
-    lockVideo: true,
-  });
 });
 
 /**
@@ -114,14 +105,13 @@
 
   info(`switch media tab to background`);
   await BrowserTestUtils.switchTab(window.gBrowser, originalTab);
-  const isPageConsideredAsForeground = !!additionalParams?.elementIdForEnteringPIPMode;
   await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
     needLock: lockAudio,
-    isForegroundLock: isPageConsideredAsForeground,
+    isForegroundLock: false,
   });
   await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
     needLock: lockVideo,
-    isForegroundLock: isPageConsideredAsForeground,
+    isForegroundLock: false,
   });
 
   info(`switch media tab to foreground again`);
@@ -142,10 +132,7 @@
   BrowserTestUtils.removeTab(mediaTab);
 }
 
-async function waitUntilVideoStarted(
-  tab,
-  { muted, volume, elementIdForEnteringPIPMode } = {}
-) {
+async function waitUntilVideoStarted(tab, { muted, volume } = {}) {
   await SpecialPowers.spawn(
     tab.linkedBrowser,
     [muted, volume],
@@ -170,10 +157,4 @@
       );
     }
   );
-  if (elementIdForEnteringPIPMode) {
-    tab.PIPWindow = await triggerPictureInPicture(
-      tab.linkedBrowser,
-      elementIdForEnteringPIPMode
-    );
-  }
 }
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/browser_media_wakelock_PIP.js firefox-85.0+build1/toolkit/content/tests/browser/browser_media_wakelock_PIP.js
--- firefox-84.0.2+build1/toolkit/content/tests/browser/browser_media_wakelock_PIP.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/browser_media_wakelock_PIP.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,156 @@
+/**
+ * Test the wakelock usage for video being used in the picture-in-picuture (PIP)
+ * mode. When video is playing in PIP window, we would always request a video
+ * wakelock, and request audio wakelock only when video is audible.
+ */
+add_task(async function testCheckWakelockForPIPVideo() {
+  await checkWakelockWhenChangeTabVisibility({
+    description: "playing a PIP video",
+    lockAudio: true,
+    lockVideo: true,
+  });
+  await checkWakelockWhenChangeTabVisibility({
+    description: "playing a muted PIP video",
+    additionalParams: {
+      muted: true,
+    },
+    lockAudio: false,
+    lockVideo: true,
+  });
+  await checkWakelockWhenChangeTabVisibility({
+    description: "playing a volume=0 PIP video",
+    additionalParams: {
+      volume: 0.0,
+    },
+    lockAudio: false,
+    lockVideo: true,
+  });
+});
+
+/**
+ * Following are helper functions and variables.
+ */
+const PAGE_URL =
+  "https://example.com/browser/toolkit/content/tests/browser/file_video.html";
+const AUDIO_WAKELOCK_NAME = "audio-playing";
+const VIDEO_WAKELOCK_NAME = "video-playing";
+const TEST_VIDEO_ID = "v";
+
+// Import this in order to use `triggerPictureInPicture()`.
+/* import-globals-from ../../../../toolkit/components/pictureinpicture/tests/head.js */
+Services.scriptloader.loadSubScript(
+  "chrome://mochitests/content/browser/toolkit/components/pictureinpicture/tests/head.js",
+  this
+);
+
+async function checkWakelockWhenChangeTabVisibility({
+  description,
+  additionalParams,
+  lockAudio,
+  lockVideo,
+}) {
+  const originalTab = gBrowser.selectedTab;
+  info(`start a new tab for '${description}'`);
+  const tab = await BrowserTestUtils.openNewForegroundTab(
+    window.gBrowser,
+    PAGE_URL
+  );
+
+  info(`wait for PIP video starting playing`);
+  await startPIPVideo(tab, additionalParams);
+  await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
+    needLock: lockAudio,
+    isForegroundLock: true,
+  });
+  await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
+    needLock: lockVideo,
+    isForegroundLock: true,
+  });
+
+  info(
+    `switch tab to background and still own foreground locks due to visible PIP video`
+  );
+  await BrowserTestUtils.switchTab(window.gBrowser, originalTab);
+  await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
+    needLock: lockAudio,
+    isForegroundLock: true,
+  });
+  await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
+    needLock: lockVideo,
+    isForegroundLock: true,
+  });
+
+  info(`pausing PIP video should release all locks`);
+  await pausePIPVideo(tab);
+  await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
+    needLock: false,
+  });
+  await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
+    needLock: false,
+  });
+
+  info(`resuming PIP video should request locks again`);
+  await resumePIPVideo(tab);
+  await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
+    needLock: lockAudio,
+    isForegroundLock: true,
+  });
+  await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
+    needLock: lockVideo,
+    isForegroundLock: true,
+  });
+
+  info(`switch tab to foreground again`);
+  await BrowserTestUtils.switchTab(window.gBrowser, tab);
+  await waitForExpectedWakeLockState(AUDIO_WAKELOCK_NAME, {
+    needLock: lockAudio,
+    isForegroundLock: true,
+  });
+  await waitForExpectedWakeLockState(VIDEO_WAKELOCK_NAME, {
+    needLock: lockVideo,
+    isForegroundLock: true,
+  });
+
+  info(`remove tab`);
+  await BrowserTestUtils.closeWindow(tab.PIPWindow);
+  BrowserTestUtils.removeTab(tab);
+}
+
+async function startPIPVideo(tab, { muted, volume } = {}) {
+  tab.PIPWindow = await triggerPictureInPicture(
+    tab.linkedBrowser,
+    TEST_VIDEO_ID
+  );
+  await SpecialPowers.spawn(
+    tab.linkedBrowser,
+    [muted, volume, TEST_VIDEO_ID],
+    async (muted, volume, Id) => {
+      const video = content.document.getElementById(Id);
+      if (muted) {
+        video.muted = muted;
+      }
+      if (volume !== undefined) {
+        video.volume = volume;
+      }
+      ok(
+        await video.play().then(
+          () => true,
+          () => false
+        ),
+        `video started playing.`
+      );
+    }
+  );
+}
+
+function pausePIPVideo(tab) {
+  return SpecialPowers.spawn(tab.linkedBrowser, [TEST_VIDEO_ID], Id => {
+    content.document.getElementById(Id).pause();
+  });
+}
+
+function resumePIPVideo(tab) {
+  return SpecialPowers.spawn(tab.linkedBrowser, [TEST_VIDEO_ID], async Id => {
+    await content.document.getElementById(Id).play();
+  });
+}
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/browser/file_plugIn.html firefox-85.0+build1/toolkit/content/tests/browser/file_plugIn.html
--- firefox-84.0.2+build1/toolkit/content/tests/browser/file_plugIn.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/browser/file_plugIn.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<embed type="application/x-test" width="200" height="200"></embed>
-<script>
-var plugin = document.querySelector("embed");
-onload = function() {
-  plugin.startAudioPlayback();
-};
-
-function start_plugin() {
-  plugin.startAudioPlayback();
-}
-
-function stop_plugin() {
-  plugin.stopAudioPlayback();
-}
-
-</script>
-<button id="start" onclick="start_plugin()">Start</button>
-<button id="stop" onclick="stop_plugin()">Stop</button>
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/content/tests/mochitest/gizmo.mp4 and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/content/tests/mochitest/gizmo.mp4 differ
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/mochitest/mochitest.ini firefox-85.0+build1/toolkit/content/tests/mochitest/mochitest.ini
--- firefox-84.0.2+build1/toolkit/content/tests/mochitest/mochitest.ini	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/mochitest/mochitest.ini	2021-01-18 19:58:27.000000000 +0000
@@ -12,3 +12,7 @@
 skip-if =
     toolkit == "android"
     xorigin  # SecurityError: Permission denied to access property "scrollX" on cross-origin object at runTests@http://mochi.test:8888/tests/toolkit/content/tests/mochitest/test_mousecapture.xhtml:170:17, inconsistent fail/pass
+[test_video_control_no_control_overlay.html]
+support-files =
+  gizmo.mp4
+skip-if = toolkit != "android"
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/mochitest/test_video_control_no_control_overlay.html firefox-85.0+build1/toolkit/content/tests/mochitest/test_video_control_no_control_overlay.html
--- firefox-84.0.2+build1/toolkit/content/tests/mochitest/test_video_control_no_control_overlay.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/mochitest/test_video_control_no_control_overlay.html	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Show 'click-to-play' icon on blocked autoplay media</title>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+/**
+ * This test is used to check whether 'click-to-play' icon would be showed
+ * correctly when autoplay media is blocked.
+ */
+add_task(async function testShowClickToPlayWhenAutoplayMediaGetsBlocked() {
+  info(`setting testing pref`);
+  await SpecialPowers.pushPrefEnv(
+    {"set": [["media.autoplay.default", 1 /* BLOCKED */]]}
+  );
+
+  info(`create video and load resource`);
+  let video = document.createElement('video');
+  video.src = "gizmo.mp4";
+  document.body.appendChild(video);
+
+  info(`blocking autoplay would reject media to play`);
+  ok(await video.play().then(_ => false, _ => true), "Play got rejected");
+
+  info(`'click-to-play' should display when autoplay media is blocked`);
+  const button = SpecialPowers.wrap(video).openOrClosedShadowRoot.querySelector(".clickToPlay");
+  ok(!button.hidden, "Click-to-play button is not hidden");
+});
+
+</script>
+</head>
+<body>
+</body>
+</html>
diff -Nru firefox-84.0.2+build1/toolkit/content/tests/widgets/test_videocontrols.html firefox-85.0+build1/toolkit/content/tests/widgets/test_videocontrols.html
--- firefox-84.0.2+build1/toolkit/content/tests/widgets/test_videocontrols.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/tests/widgets/test_videocontrols.html	2021-01-18 19:58:27.000000000 +0000
@@ -398,10 +398,13 @@
   const controlsSpacer = getElementWithinVideo(video, "controlsSpacer");
   is(controlsSpacer.hasAttribute("hideCursor"), true, "Cursor is hidden");
 
-  // Wiggle the mouse a bit
-  synthesizeMouse(video, playButtonCenterX, playButtonCenterY, { type: "mousemove" });
-
-  await SimpleTest.promiseWaitForCondition(() => !controlsSpacer.hasAttribute("hideCursor"), "Waiting for hideCursor attribute to disappear");
+  let delta = 1;
+  await SimpleTest.promiseWaitForCondition(() => {
+    // Wiggle the mouse a bit
+    synthesizeMouse(video, playButtonCenterX  + delta, playButtonCenterY + delta, { type: "mousemove" });
+    delta = !delta;
+    return !controlsSpacer.hasAttribute("hideCursor");
+  }, "Waiting for hideCursor attribute to disappear");
   is(controlsSpacer.hasAttribute("hideCursor"), false, "Cursor is shown");
 
   // Restore
diff -Nru firefox-84.0.2+build1/toolkit/content/widgets/browser-custom-element.js firefox-85.0+build1/toolkit/content/widgets/browser-custom-element.js
--- firefox-84.0.2+build1/toolkit/content/widgets/browser-custom-element.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/widgets/browser-custom-element.js	2021-01-18 19:58:27.000000000 +0000
@@ -395,32 +395,24 @@
     }
 
     set docShellIsActive(val) {
+      this.browsingContext.isActive = val;
       if (this.isRemoteBrowser) {
-        let { frameLoader } = this;
-        if (frameLoader && frameLoader.remoteTab) {
-          frameLoader.remoteTab.docShellIsActive = val;
+        let remoteTab = this.frameLoader?.remoteTab;
+        if (remoteTab) {
+          remoteTab.renderLayers = val;
         }
-      } else if (this.docShell) {
-        this.docShell.isActive = val;
       }
     }
 
     get docShellIsActive() {
-      if (this.isRemoteBrowser) {
-        let { frameLoader } = this;
-        if (frameLoader && frameLoader.remoteTab) {
-          return frameLoader.remoteTab.docShellIsActive;
-        }
-        return false;
-      }
-      return this.docShell && this.docShell.isActive;
+      return !!this.browsingContext?.isActive;
     }
 
     set renderLayers(val) {
       if (this.isRemoteBrowser) {
-        let { frameLoader } = this;
-        if (frameLoader && frameLoader.remoteTab) {
-          frameLoader.remoteTab.renderLayers = val;
+        let remoteTab = this.frameLoader?.remoteTab;
+        if (remoteTab) {
+          remoteTab.renderLayers = val;
         }
       } else {
         this.docShellIsActive = val;
@@ -429,24 +421,15 @@
 
     get renderLayers() {
       if (this.isRemoteBrowser) {
-        let { frameLoader } = this;
-        if (frameLoader && frameLoader.remoteTab) {
-          return frameLoader.remoteTab.renderLayers;
-        }
-        return false;
+        return !!this.frameLoader?.remoteTab?.renderLayers;
       }
       return this.docShellIsActive;
     }
 
     get hasLayers() {
       if (this.isRemoteBrowser) {
-        let { frameLoader } = this;
-        if (frameLoader && frameLoader.remoteTab) {
-          return frameLoader.remoteTab.hasLayers;
-        }
-        return false;
+        return !!this.frameLoader?.remoteTab?.hasLayers;
       }
-
       return this.docShellIsActive;
     }
 
diff -Nru firefox-84.0.2+build1/toolkit/content/widgets/pluginProblem.js firefox-85.0+build1/toolkit/content/widgets/pluginProblem.js
--- firefox-84.0.2+build1/toolkit/content/widgets/pluginProblem.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/widgets/pluginProblem.js	2021-01-18 19:58:27.000000000 +0000
@@ -6,7 +6,8 @@
 
 // This is a UA Widget. It runs in per-origin UA widget scope,
 // to be loaded by UAWidgetsChild.jsm.
-
+// This widget results in a hidden element that occupies room where the plugin
+// would be if we still supported plugins.
 this.PluginProblemWidget = class {
   constructor(shadowRoot) {
     this.shadowRoot = shadowRoot;
@@ -21,57 +22,14 @@
     let parserDoc = parser.parseFromString(
       `
       <!DOCTYPE bindings [
-        <!ENTITY % pluginproblemDTD SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
         <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
         <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-        %pluginproblemDTD;
         %globalDTD;
         %brandDTD;
       ]>
       <div xmlns="http://www.w3.org/1999/xhtml" class="mainBox" id="main" chromedir="&locale.dir;">
         <link rel="stylesheet" type="text/css" href="chrome://pluginproblem/content/pluginProblemContent.css" />
-        <link rel="stylesheet" type="text/css" href="chrome://global/skin/plugins/pluginProblem.css" />
-        <div class="hoverBox">
-          <label>
-            <button class="icon" id="icon"/>
-            <div class="msg msgVulnerabilityStatus" id="vulnerabilityStatus"><!-- set at runtime --></div>
-            <div class="msg msgTapToPlay">&tapToPlayPlugin;</div>
-            <div class="msg msgClickToPlay" id="clickToPlay">&clickToActivatePlugin;</div>
-          </label>
-
-          <div class="msg msgBlocked">&blockedPlugin.label;</div>
-          <div class="msg msgCrashed">
-            <div class="msgCrashedText" id="crashedText"><!-- set at runtime --></div>
-            <!-- link href set at runtime -->
-            <div class="msgReload">&reloadPlugin.pre;<a class="reloadLink" id="reloadLink" href="">&reloadPlugin.middle;</a>&reloadPlugin.post;</div>
-          </div>
-
-          <div class="msg msgManagePlugins"><a class="action-link" id="managePluginsLink" href="">&managePlugins;</a></div>
-          <div class="submitStatus" id="submitStatus">
-            <div class="msg msgPleaseSubmit" id="pleaseSubmit">
-              <textarea class="submitComment"
-                        id="submitComment"
-                        placeholder="&report.comment;"/>
-              <div class="submitURLOptInBox">
-                <label><input class="submitURLOptIn" id="submitURLOptIn" type="checkbox"/> &report.pageURL;</label>
-              </div>
-              <div class="submitButtonBox">
-                <span class="helpIcon" id="helpIcon" role="link"/>
-                <input class="submitButton" type="button"
-                       id="submitButton"
-                       value="&report.please;"/>
-              </div>
-            </div>
-            <div class="msg msgSubmitting">&report.submitting;<span class="throbber"> </span></div>
-            <div class="msg msgSubmitted">&report.submitted;</div>
-            <div class="msg msgNotSubmitted">&report.disabled;</div>
-            <div class="msg msgSubmitFailed">&report.failed;</div>
-            <div class="msg msgNoCrashReport">&report.unavailable;</div>
-          </div>
-          <div class="msg msgCheckForUpdates"><a class="action-link" id="checkForUpdatesLink" href="">&checkForUpdates;</a></div>
       </div>
-      <button class="closeIcon" id="closeIcon" title="&hidePluginBtn.label;"/>
-    </div>
     `,
       "application/xml"
     );
diff -Nru firefox-84.0.2+build1/toolkit/content/widgets/videocontrols.js firefox-85.0+build1/toolkit/content/widgets/videocontrols.js
--- firefox-84.0.2+build1/toolkit/content/widgets/videocontrols.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/widgets/videocontrols.js	2021-01-18 19:58:27.000000000 +0000
@@ -77,7 +77,14 @@
     }
     if (newImpl) {
       this.impl = new newImpl(this.shadowRoot, this.prefs);
-      this.impl.onsetup();
+
+      this.mDirection = "ltr";
+      let intlUtils = this.window.intlUtils;
+      if (intlUtils) {
+        this.mDirection = intlUtils.isAppLocaleRTL() ? "rtl" : "ltr";
+      }
+
+      this.impl.onsetup(this.mDirection);
     } else {
       this.impl = undefined;
     }
@@ -225,9 +232,11 @@
     this.window = this.document.defaultView;
   }
 
-  onsetup() {
+  onsetup(direction) {
     this.generateContent();
 
+    this.shadowRoot.firstElementChild.setAttribute("localedir", direction);
+
     this.Utils = {
       debug: false,
       video: null,
@@ -2794,11 +2803,14 @@
     this.window = this.document.defaultView;
   }
 
-  onsetup() {
+  onsetup(direction) {
     this.generateContent();
 
+    this.shadowRoot.firstElementChild.setAttribute("localedir", direction);
+
     this.Utils = {
-      videoEvents: ["play", "playing", "MozNoControlsBlockedVideo"],
+      videoEvents: ["play", "playing"],
+      videoControlEvents: ["MozNoControlsBlockedVideo"],
       terminate() {
         for (let event of this.videoEvents) {
           try {
@@ -2809,6 +2821,12 @@
           } catch (ex) {}
         }
 
+        for (let event of this.videoControlEvents) {
+          try {
+            this.videocontrols.removeEventListener(event, this);
+          } catch (ex) {}
+        }
+
         try {
           this.clickToPlay.removeEventListener("click", this, {
             mozSystemGroup: true,
@@ -2894,6 +2912,10 @@
             mozSystemGroup: true,
           });
         }
+
+        for (let event of this.videoControlEvents) {
+          this.videocontrols.addEventListener(event, this);
+        }
       },
     };
     this.Utils.init(this.shadowRoot);
@@ -2955,8 +2977,10 @@
     this.window = this.document.defaultView;
   }
 
-  onsetup() {
+  onsetup(direction) {
     this.generateContent();
+
+    this.shadowRoot.firstElementChild.setAttribute("localedir", direction);
   }
 
   elementStateMatches(element) {
@@ -3010,9 +3034,11 @@
     this.prefs = prefs;
   }
 
-  onsetup() {
+  onsetup(direction) {
     this.generateContent();
 
+    this.shadowRoot.firstElementChild.setAttribute("localedir", direction);
+
     this.Utils = {
       handleEvent(event) {
         switch (event.type) {
diff -Nru firefox-84.0.2+build1/toolkit/content/xul.css firefox-85.0+build1/toolkit/content/xul.css
--- firefox-84.0.2+build1/toolkit/content/xul.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/content/xul.css	2021-01-18 19:58:27.000000000 +0000
@@ -334,27 +334,6 @@
   pointer-events: none;
 }
 
-/******** grid **********/
-
-grid {
-  display: -moz-grid;
-}
-
-rows,
-columns {
-  display: -moz-grid-group;
-}
-
-row,
-column {
-  display: -moz-grid-line;
-}
-
-rows,
-column {
-  -moz-box-orient: vertical;
-}
-
 /******** tree ******/
 
 treecolpicker {
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/breakpad-client/linux/moz.build firefox-85.0+build1/toolkit/crashreporter/breakpad-client/linux/moz.build
--- firefox-84.0.2+build1/toolkit/crashreporter/breakpad-client/linux/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/breakpad-client/linux/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -36,3 +36,6 @@
 
 if CONFIG['MOZ_PHC']:
     DEFINES['MOZ_PHC'] = True
+
+if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+    CXXFLAGS += ['-Wno-error=stack-protector']
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/breakpad-client/moz.build firefox-85.0+build1/toolkit/crashreporter/breakpad-client/moz.build
--- firefox-84.0.2+build1/toolkit/crashreporter/breakpad-client/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/breakpad-client/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -30,4 +30,4 @@
 ]
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-    CXXFLAGS += ['-Wno-shadow']
+    CXXFLAGS += ['-Wno-shadow', '-Wno-error=stack-protector']
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/CrashAnnotations.yaml firefox-85.0+build1/toolkit/crashreporter/CrashAnnotations.yaml
--- firefox-84.0.2+build1/toolkit/crashreporter/CrashAnnotations.yaml	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/CrashAnnotations.yaml	2021-01-18 19:58:27.000000000 +0000
@@ -439,23 +439,6 @@
     the computer's registry. The value is always set to "NoSystemTypeLibOrPS"
   type: string
 
-IndexedDBShutdownTimeout:
-  description: >
-    This annotation is present if IndexedDB shutdown was not finished in time
-    and the browser was crashed instead of waiting for IndexedDB shutdown to
-    finish. The condition that caused the hang is contained in the annotation.
-    The condition is constructed by stringifying status of objects which blocked
-    IndexedDB shutdown. Objects are divided into three groups:
-    FactoryOperations, LiveDatabases and DatabaseMaintenances. Each group is
-    reported separately and contains the number of objects in the group and
-    status of individual objects in the group (duplicit entries are removed):
-    "GroupName: N (objectStatus1, objectStatus2, ...)" where N is the number of
-    objects in the group. Status of individual objects is constructed by taking
-    selected object properties. Properties which contain origin strings are
-    anonymized.
-  type: string
-  ping: true
-
 InstallTime:
   description: >
     The time when Firefox was installed expressed as seconds since the Epoch
@@ -564,6 +547,12 @@
     If true then the Wayland DRM backend was in use.
   type: boolean
 
+JavaException:
+  description: >
+    JSON structured Java stack trace, only present on Firefox for Android if we encounter an
+    uncaught Java exception.
+  type: string
+
 JavaStackTrace:
   description: >
     Java stack trace, only present on Firefox for Android if we encounter an
@@ -605,23 +594,6 @@
     mozilla::LauncherRegistryInfo::EnableState enum
   type: integer
 
-LocalStorageShutdownTimeout:
-  description: >
-    This annotation is present if LocalStorage shutdown was not finished in time
-    and the browser was crashed instead of waiting for LocalStorage shutdown to
-    finish. The condition that caused the hang is contained in the annotation.
-    The condition is constructed by stringifying status of objects which blocked
-    LocalStorage shutdown. Objects are divided into three groups:
-    PrepareDatastoreOperations, Datastores and LiveDatabases. Each group is
-    reported separately and contains the number of objects in the group and
-    status of individual objects in the group (duplicit entries are removed):
-    "GroupName: N (objectStatus1, objectStatus2, ...)" where N is the number of
-    objects in the group. Status of individual objects is constructed by taking
-    selected object properties. Properties which contain origin strings are
-    anonymized.
-  type: string
-  ping: true
-
 LowCommitSpaceEvents:
   description: >
     Number of times the available memory tracker has detected a that
@@ -752,6 +724,37 @@
   type: string
   ping: true
 
+QuotaManagerShutdownTimeout:
+  description: >
+    This annotation is present if the quota manager shutdown (resp. the shutdown
+    of the quota manager clients) was not finished in time and the browser was
+    crashed instead of waiting for the shutdown to finish. The status of objects
+    which were blocking completion of the shutdown when reaching the timeout
+    is contained in the annotation.
+
+    In the case of IndexedDB, objects are divided into three groups:
+    FactoryOperations, LiveDatabases and DatabaseMaintenances.
+
+    In the case of LocalStorage, objects are divided into three groups:
+    PrepareDatastoreOperations, Datastores and LiveDatabases.
+
+    In the case of Cache API, objects are in one group only:
+    Managers.
+
+    Each group is reported separately and contains the number of objects in the
+    group and the status of individual objects in the group (duplicate entries
+    are removed):
+    "GroupName: N (objectStatus1, objectStatus2, ...)" where N is the number of
+    objects in the group.
+
+    The status of individual objects is constructed by taking selected object
+    properties. Properties which contain origin strings are anonymized.
+
+    In addition, intermediate steps are recorded for change events after shutdown
+    started. These include the time difference and the type of object.
+  type: string
+  ping: true
+
 RDDProcessStatus:
   description: >
     Status of the RDD process, can be set to "Running" or "Destroyed"
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build firefox-85.0+build1/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
--- firefox-84.0.2+build1/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -59,4 +59,4 @@
 include('/toolkit/crashreporter/crashreporter.mozbuild')
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
-    CXXFLAGS += ['-Wno-shadow']
+    CXXFLAGS += ['-Wno-shadow', '-Wno-error=stack-protector']
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/moz.build firefox-85.0+build1/toolkit/crashreporter/moz.build
--- firefox-84.0.2+build1/toolkit/crashreporter/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -125,7 +125,7 @@
     include("/toolkit/crashreporter/crashreporter.mozbuild")
 
     if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-        CXXFLAGS += ["-Wno-shadow"]
+        CXXFLAGS += ["-Wno-shadow", "-Wno-error=stack-protector"]
 else:
     UNIFIED_SOURCES += [
         "nsDummyExceptionHandler.cpp",
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/nsExceptionHandler.cpp firefox-85.0+build1/toolkit/crashreporter/nsExceptionHandler.cpp
--- firefox-84.0.2+build1/toolkit/crashreporter/nsExceptionHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/nsExceptionHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -20,11 +20,13 @@
 #include "mozilla/Unused.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Printf.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/SyncRunnable.h"
 #include "mozilla/TimeStamp.h"
 
+#include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
 #include "nsThread.h"
 #include "jsfriendapi.h"
diff -Nru firefox-84.0.2+build1/toolkit/crashreporter/test/unit_ipc/test_content_oom_annotation.js firefox-85.0+build1/toolkit/crashreporter/test/unit_ipc/test_content_oom_annotation.js
--- firefox-84.0.2+build1/toolkit/crashreporter/test/unit_ipc/test_content_oom_annotation.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/crashreporter/test/unit_ipc/test_content_oom_annotation.js	2021-01-18 19:58:27.000000000 +0000
@@ -24,7 +24,7 @@
         Assert.ok("AvailableVirtualMemory" in extra);
         Assert.ok("TotalPageFile" in extra);
         Assert.ok("AvailablePageFile" in extra);
-      } else if (mozinfo.so == "linux") {
+      } else if (mozinfo.os == "linux") {
         Assert.ok("TotalPageFile" in extra);
         Assert.ok("AvailablePageFile" in extra);
       }
diff -Nru firefox-84.0.2+build1/toolkit/library/rust/shared/build.rs firefox-85.0+build1/toolkit/library/rust/shared/build.rs
--- firefox-84.0.2+build1/toolkit/library/rust/shared/build.rs	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/library/rust/shared/build.rs	2021-01-18 19:58:27.000000000 +0000
@@ -9,7 +9,7 @@
 fn main() {
     let ver = version().unwrap();
     let mut bootstrap = false;
-    let max_oom_hook_version = Version::parse("1.50.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.51.0-alpha").unwrap();
 
     if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < max_oom_hook_version {
         println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
diff -Nru firefox-84.0.2+build1/toolkit/library/rust/shared/Cargo.toml firefox-85.0+build1/toolkit/library/rust/shared/Cargo.toml
--- firefox-84.0.2+build1/toolkit/library/rust/shared/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/library/rust/shared/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,7 @@
 profiler_helper = { path = "../../../../tools/profiler/rust-helper", optional = true }
 mozurl = { path = "../../../../netwerk/base/mozurl" }
 webrender_bindings = { path = "../../../../gfx/webrender_bindings", optional = true }
-cubeb-coreaudio = { git = "https://github.com/ChunMinChang/cubeb-coreaudio-rs", rev = "87667052a5ffaf47fbeac4ae67f1ecdefa8d7b09", optional = true }
+cubeb-coreaudio = { git = "https://github.com/ChunMinChang/cubeb-coreaudio-rs", rev = "1e1222d6213e28eabd7f4302d00765ae1153a31e", optional = true }
 cubeb-pulse = { git = "https://github.com/djg/cubeb-pulse-rs", rev="bf31534d08b2c16fb5e4c5834944ae3271efbd63", optional = true, features=["pulse-dlopen"] }
 cubeb-sys = { version = "0.8", optional = true, features=["gecko-in-tree"] }
 encoding_glue = { path = "../../../../intl/encoding_glue" }
diff -Nru firefox-84.0.2+build1/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties firefox-85.0+build1/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
--- firefox-84.0.2+build1/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties	2021-01-18 19:58:27.000000000 +0000
@@ -23,6 +23,12 @@
 shortDays=d;d
 
 downloadErrorAlertTitle=Download Error
+# LOCALIZATION NOTE (downloadErrorBlockedBy): %S is the name of the blocking
+# extension.
+downloadErrorBlockedBy=The download cannot be saved because it is blocked by %S.
+# LOCALIZATION NOTE (downloadErrorExtension): used when the blocking extension
+# name is unavailable.
+downloadErrorExtension=The download cannot be saved because it is blocked by an extension.
 downloadErrorGeneric=The download cannot be saved because an unknown error occurred.\n\nPlease try again.
 
 # LOCALIZATION NOTE: we don't have proper plural support in the CPP code; bug 463102
diff -Nru firefox-84.0.2+build1/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd firefox-85.0+build1/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
--- firefox-84.0.2+build1/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +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/. -->
-
-<!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
-<!ENTITY tapToPlayPlugin                                     "Tap here to activate plugin.">
-<!ENTITY clickToActivatePlugin                               "Activate plugin.">
-<!ENTITY checkForUpdates                                     "Check for updates…">
-<!ENTITY blockedPlugin.label                                 "This plugin has been blocked for your protection.">
-<!ENTITY hidePluginBtn.label                                 "Hide plugin">
-<!ENTITY managePlugins                                       "Manage plugins…">
-
-<!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
-<!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
-<!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
-<!ENTITY reloadPlugin.pre                                    "">
-<!ENTITY reloadPlugin.middle                                 "Reload the page">
-<!ENTITY reloadPlugin.post                                   " to try again.">
-<!-- LOCALIZATION NOTE (report.please): This and the other report.* strings should be as short as possible, ideally 2-3 words. -->
-<!ENTITY report.please                                       "Send crash report">
-<!ENTITY report.submitting                                   "Sending report…">
-<!ENTITY report.submitted                                    "Crash report sent.">
-<!ENTITY report.disabled                                     "Crash reporting disabled.">
-<!ENTITY report.failed                                       "Submission failed.">
-<!ENTITY report.unavailable                                  "No report available.">
-<!ENTITY report.comment                                      "Add a comment (comments are publicly visible)">
-<!ENTITY report.pageURL                                      "Include the page’s URL">
-
-<!ENTITY plugin.file                                         "File">
-<!ENTITY plugin.mimeTypes                                    "MIME Types">
-<!ENTITY plugin.flashProtectedMode.label                     "Enable Adobe Flash protected mode">
-<!ENTITY plugin.enableBlocklists.label                       "Block dangerous and intrusive Flash content">
diff -Nru firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl firefox-85.0+build1/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
--- firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl	2021-01-18 19:58:27.000000000 +0000
@@ -182,6 +182,33 @@
 remote-debugging-url = URL
 ##
 
+support-third-party-modules-title = Third-Party Modules
+support-third-party-modules-module = Module File
+support-third-party-modules-version = File Version
+support-third-party-modules-vendor = Vendor Info
+support-third-party-modules-occurrence = Occurrence
+support-third-party-modules-process = Process Type & ID
+support-third-party-modules-thread = Thread
+support-third-party-modules-base = Imagebase Address
+support-third-party-modules-uptime = Process Uptime (ms)
+support-third-party-modules-duration = Loading Duration (ms)
+support-third-party-modules-empty = No third-party modules were loaded.
+support-third-party-modules-no-value = (No value)
+support-third-party-modules-button-open =
+    .title = Open file location…
+support-third-party-modules-expand =
+    .title = Show detailed information
+support-third-party-modules-collapse =
+    .title = Collapse detailed information
+support-third-party-modules-unsigned-icon =
+    .title = This module is not signed
+support-third-party-modules-folder-icon =
+    .title = Open file location…
+support-third-party-modules-down-icon =
+    .title = Show detailed information
+support-third-party-modules-up-icon =
+    .title = Collapse detailed information
+
 # Variables
 # $days (Integer) - Number of days of crashes to log
 report-crash-for-days =
diff -Nru firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/printing/printPreview.ftl firefox-85.0+build1/toolkit/locales/en-US/toolkit/printing/printPreview.ftl
--- firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/printing/printPreview.ftl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/en-US/toolkit/printing/printPreview.ftl	2021-01-18 19:58:27.000000000 +0000
@@ -39,6 +39,11 @@
     .value = Page:
     .accesskey = a
 
+# Variables
+# $sheetNum (integer) - The current sheet number
+# $sheetCount (integer) - The total number of sheets to print
+printpreview-sheet-of-sheets = { $sheetNum } of { $sheetCount }
+
 ## Variables
 ## $percent (integer) - menuitem percent label
 ## $arrow (String) - UTF-8 arrow character for navigation buttons
@@ -58,3 +63,11 @@
     .label = { $arrow }
     .tooltiptext = Last page
 
+printpreview-homearrow-button =
+    .title = First page
+printpreview-previousarrow-button =
+    .title = Previous page
+printpreview-nextarrow-button =
+    .title = Next page
+printpreview-endarrow-button =
+    .title = Last page
diff -Nru firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/printing/printUI.ftl firefox-85.0+build1/toolkit/locales/en-US/toolkit/printing/printUI.ftl
--- firefox-84.0.2+build1/toolkit/locales/en-US/toolkit/printing/printUI.ftl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/en-US/toolkit/printing/printUI.ftl	2021-01-18 19:58:27.000000000 +0000
@@ -19,14 +19,9 @@
 printui-page-range-label = Pages
 printui-page-range-picker =
   .aria-label = Pick page range
-printui-page-custom-range =
+printui-page-custom-range-input =
   .aria-label = Enter custom page range
-# This label is displayed before the first input field indicating
-# the start of the range to print.
-printui-range-start = From
-# This label is displayed between the input fields indicating
-# the start and end page of the range to print.
-printui-range-end = to
+  .placeholder = e.g. 2-6, 9, 12-16
 
 # Section title for the number of copies to print
 printui-copies-label = Copies
@@ -67,17 +62,22 @@
 printui-margins-default = Default
 printui-margins-min = Minimum
 printui-margins-none = None
-printui-margins-custom = Custom
+printui-margins-custom-inches = Custom (inches)
 printui-margins-custom-top = Top
+printui-margins-custom-top-inches = Top (inches)
 printui-margins-custom-bottom = Bottom
+printui-margins-custom-bottom-inches = Bottom (inches)
 printui-margins-custom-left = Left
+printui-margins-custom-left-inches = Left (inches)
 printui-margins-custom-right = Right
+printui-margins-custom-right-inches = Right (inches)
 
 printui-system-dialog-link = Print using the system dialog…
 
 printui-primary-button = Print
 printui-primary-button-save = Save
 printui-cancel-button = Cancel
+printui-close-button = Close
 
 printui-loading = Preparing Preview
 
@@ -86,6 +86,8 @@
 printui-preview-label =
     .aria-label = Print Preview
 
+printui-pages-per-sheet = Pages per sheet
+
 ## Paper sizes that may be supported by the Save to PDF destination:
 
 printui-paper-a5 = A5
diff -Nru firefox-84.0.2+build1/toolkit/locales/jar.mn firefox-85.0+build1/toolkit/locales/jar.mn
--- firefox-84.0.2+build1/toolkit/locales/jar.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/locales/jar.mn	2021-01-18 19:58:27.000000000 +0000
@@ -64,7 +64,6 @@
   locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (%chrome/mozapps/downloads/unknownContentType.properties)
   locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (%chrome/mozapps/downloads/unknownContentType.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
-  locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
 #ifndef MOZ_FENNEC
   locale/@AB_CD@/mozapps/extensions/extensions.properties         (%chrome/mozapps/extensions/extensions.properties)
 #endif
@@ -72,8 +71,6 @@
 #ifndef MOZ_FENNEC
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
 #endif
-% locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
-  locale/@AB_CD@/pluginproblem/pluginproblem.dtd                  (%chrome/pluginproblem/pluginproblem.dtd)
 % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
   locale/@AB_CD@/alerts/alert.dtd                                (%chrome/alerts/alert.dtd)
   locale/@AB_CD@/alerts/alert.properties                         (%chrome/alerts/alert.properties)
diff -Nru firefox-84.0.2+build1/toolkit/modules/ActorManagerParent.jsm firefox-85.0+build1/toolkit/modules/ActorManagerParent.jsm
--- firefox-84.0.2+build1/toolkit/modules/ActorManagerParent.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/ActorManagerParent.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -291,7 +291,7 @@
     },
 
     allFrames: true,
-    messageManagerGroups: ["browsers", ""],
+    messageManagerGroups: ["browsers", "webext-browsers", ""],
   },
 
   ManifestMessages: {
diff -Nru firefox-84.0.2+build1/toolkit/modules/DateTimePickerPanel.jsm firefox-85.0+build1/toolkit/modules/DateTimePickerPanel.jsm
--- firefox-84.0.2+build1/toolkit/modules/DateTimePickerPanel.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/DateTimePickerPanel.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -108,9 +108,12 @@
   }
 
   initPicker(detail) {
-    // TODO: When bug 1376616 lands, replace this.setGregorian with
-    //       mozIntl.Locale for setting calendar to Gregorian
-    let locale = this.setGregorian(Services.locale.webExposedLocales[0]);
+    let locale = new Services.intl.Locale(
+      Services.locale.webExposedLocales[0],
+      {
+        calendar: "gregory",
+      }
+    ).toString();
 
     // Workaround for bug 1418061, while we wait for resolution of
     // http://bugs.icu-project.org/trac/ticket/13592: drop the PT region code,
@@ -292,13 +295,6 @@
     return keys.map(key => displayNames.values[key]);
   }
 
-  setGregorian(locale) {
-    if (locale.match(/u-ca-/)) {
-      return locale.replace(/u-ca-[^-]+/, "u-ca-gregory");
-    }
-    return locale + "-u-ca-gregory";
-  }
-
   handleEvent(aEvent) {
     switch (aEvent.type) {
       case "load": {
diff -Nru firefox-84.0.2+build1/toolkit/modules/E10SUtils.jsm firefox-85.0+build1/toolkit/modules/E10SUtils.jsm
--- firefox-84.0.2+build1/toolkit/modules/E10SUtils.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/E10SUtils.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -11,12 +11,6 @@
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "PrivateBrowsingUtils",
-  "resource://gre/modules/PrivateBrowsingUtils.jsm"
-);
-
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "useSeparateFileUriProcess",
@@ -122,17 +116,6 @@
   "xmpp",
 ];
 
-const kDocumentChannelDeniedSchemes = ["javascript"];
-const kDocumentChannelDeniedURIs = ["about:crashcontent", "about:printpreview"];
-
-// Changes here should also be made in URIUsesDocChannel in DocumentChannel.cpp.
-function documentChannelPermittedForURI(aURI) {
-  return (
-    !kDocumentChannelDeniedSchemes.includes(aURI.scheme) &&
-    !kDocumentChannelDeniedURIs.includes(aURI.spec)
-  );
-}
-
 // Note that even if the scheme fits the criteria for a web-handled scheme
 // (ie it is compatible with the checks registerProtocolHandler uses), it may
 // not be web-handled - it could still be handled via the OS by another app.
@@ -858,247 +841,6 @@
     return deserialized;
   },
 
-  /**
-   * Returns whether or not a URI is supposed to load in a particular
-   * browser given its current remote type.
-   *
-   * @param browser (<xul:browser>)
-   *   The browser to check.
-   * @param uri (String)
-   *   The URI that will be checked to see if it can load in the
-   *   browser.
-   * @param multiProcess (boolean, optional)
-   *   Whether or not multi-process tabs are enabled. Defaults to true.
-   * @param remoteSubframes (boolean, optional)
-   *   Whether or not multi-process subframes are enabled. Defaults to
-   *   false.
-   * @param flags (Number, optional)
-   *   nsIWebNavigation flags used to clean up the URL in the event that
-   *   it needs fixing ia the URI fixup service. Defaults to
-   *   nsIWebNavigation.LOAD_FLAGS_NONE.
-   *
-   * @return (Object)
-   *   An object with the following properties:
-   *
-   *   uriObject (nsIURI)
-   *     The fixed-up URI that was generated for the check.
-   *
-   *   requiredRemoteType (String)
-   *     The remoteType that was computed for the browser that
-   *     is required to load the URI.
-   *
-   *   mustChangeProcess (boolean)
-   *     Whether or not the front-end will be required to flip
-   *     the process in order to view the URI.
-   *
-   *     NOTE:
-   *       mustChangeProcess might be false even if a process
-   *       flip will occur. In this case, DocumentChannel is taking
-   *       care of the process flip for us rather than the front-end
-   *       code.
-   *
-   *   newFrameloader (boolean)
-   *     Whether or not a new frameloader will need to be created
-   *     in order to browse to this URI. For non-Fission, this is
-   *     important if we're transition from a web content process
-   *     to another web content process, but want to force the
-   *     creation of a _new_ web content process.
-   */
-  shouldLoadURIInBrowser(
-    browser,
-    uri,
-    multiProcess = true,
-    remoteSubframes = false,
-    flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE
-  ) {
-    let currentRemoteType = browser.remoteType;
-    let requiredRemoteType;
-    let uriObject;
-    try {
-      let fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_NONE;
-      if (flags & Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP) {
-        fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
-      }
-      if (flags & Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS) {
-        fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS;
-      }
-      if (PrivateBrowsingUtils.isBrowserPrivate(browser)) {
-        fixupFlags |= Ci.nsIURIFixup.FIXUP_FLAG_PRIVATE_CONTEXT;
-      }
-
-      uriObject = Services.uriFixup.getFixupURIInfo(uri, fixupFlags)
-        .preferredURI;
-      // Note that I had thought that we could set uri = uriObject.spec here, to
-      // save on fixup later on, but that changes behavior and breaks tests.
-      requiredRemoteType = this.getRemoteTypeForURIObject(
-        uriObject,
-        multiProcess,
-        remoteSubframes,
-        currentRemoteType,
-        browser.currentURI
-      );
-    } catch (e) {
-      // createFixupURI throws if it can't create a URI. If that's the case then
-      // we still need to pass down the uri because docshell handles this case.
-      requiredRemoteType = multiProcess ? DEFAULT_REMOTE_TYPE : NOT_REMOTE;
-    }
-
-    let mustChangeProcess = requiredRemoteType != currentRemoteType;
-
-    let newFrameloader = false;
-    if (
-      browser.getAttribute("preloadedState") === "consumed" &&
-      uri != "about:newtab"
-    ) {
-      // Leaving about:newtab from a used to be preloaded browser should run the process
-      // selecting algorithm again.
-      mustChangeProcess = true;
-      newFrameloader = true;
-    }
-
-    // If we already have a content process, and the load will be
-    // handled using DocumentChannel, then we can skip switching
-    // for now, and let DocumentChannel do it during the response.
-    if (uriObject && documentChannelPermittedForURI(uriObject)) {
-      mustChangeProcess = false;
-      newFrameloader = false;
-    }
-
-    return {
-      uriObject,
-      requiredRemoteType,
-      mustChangeProcess,
-      newFrameloader,
-    };
-  },
-
-  shouldLoadURIInThisProcess(aURI, aRemoteSubframes) {
-    let remoteType = Services.appinfo.remoteType;
-    let wantRemoteType = this.getRemoteTypeForURIObject(
-      aURI,
-      /* remote */ true,
-      aRemoteSubframes,
-      remoteType
-    );
-    this.log().info(
-      `shouldLoadURIInThisProcess: have ${remoteType} want ${wantRemoteType}`
-    );
-
-    if (documentChannelPermittedForURI(aURI)) {
-      // We can switch later with documentchannel.
-      return true;
-    }
-
-    return remoteType == wantRemoteType;
-  },
-
-  shouldLoadURI(aDocShell, aURI, aHasPostData) {
-    let { useRemoteSubframes } = aDocShell;
-    this.log().debug(`shouldLoadURI(${this._uriStr(aURI)})`);
-
-    let remoteType = Services.appinfo.remoteType;
-
-    if (aDocShell.browsingContext.parent) {
-      return true;
-    }
-
-    let webNav = aDocShell.QueryInterface(Ci.nsIWebNavigation);
-    let sessionHistory = webNav.sessionHistory;
-    let wantRemoteType = this.getRemoteTypeForURIObject(
-      aURI,
-      true,
-      useRemoteSubframes,
-      remoteType,
-      webNav.currentURI
-    );
-
-    // If we are using DocumentChannel or remote subframes (fission), we
-    // can start the load in the current process, and then perform the
-    // switch later-on using the DocumentLoadListener mechanism.
-    if (documentChannelPermittedForURI(aURI)) {
-      return true;
-    }
-
-    if (
-      !aHasPostData &&
-      remoteType == WEB_REMOTE_TYPE &&
-      sessionHistory.count == 1 &&
-      webNav.currentURI.spec == "about:newtab"
-    ) {
-      // This is possibly a preloaded browser and we're about to navigate away for
-      // the first time. On the child side there is no way to tell for sure if that
-      // is the case, so let's redirect this request to the parent to decide if a new
-      // process is needed. But we don't currently properly handle POST data in
-      // redirects (bug 1457520), so if there is POST data, don't return false here.
-      return false;
-    }
-
-    // Allow history load if loaded in this process before.
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let requestedIndex = sessionHistory.legacySHistory.requestedIndex;
-      if (requestedIndex >= 0) {
-        this.log().debug("Checking history case\n");
-        if (
-          sessionHistory.legacySHistory.getEntryAtIndex(requestedIndex)
-            .loadedInThisProcess
-        ) {
-          this.log().info("History entry loaded in this process");
-          return true;
-        }
-
-        // If not originally loaded in this process allow it if the URI would
-        // normally be allowed to load in this process by default.
-        this.log().debug(
-          `Checking remote type, got: ${remoteType} want: ${wantRemoteType}\n`
-        );
-        return remoteType == wantRemoteType;
-      }
-    }
-
-    // If the URI can be loaded in the current process then continue
-    return remoteType == wantRemoteType;
-  },
-
-  redirectLoad(
-    aDocShell,
-    aURI,
-    aReferrerInfo,
-    aTriggeringPrincipal,
-    aFlags,
-    aCsp
-  ) {
-    const actor = aDocShell.domWindow.windowGlobalChild.getActor("BrowserTab");
-
-    let loadOptions = {
-      uri: aURI.spec,
-      flags: aFlags || Ci.nsIWebNavigation.LOAD_FLAGS_NONE,
-      referrerInfo: this.serializeReferrerInfo(aReferrerInfo),
-      triggeringPrincipal: this.serializePrincipal(
-        aTriggeringPrincipal ||
-          Services.scriptSecurityManager.createNullPrincipal({})
-      ),
-      csp: aCsp ? this.serializeCSP(aCsp) : null,
-    };
-    // Retarget the load to the correct process
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let sessionHistory = aDocShell.QueryInterface(Ci.nsIWebNavigation)
-        .sessionHistory;
-      actor.sendAsyncMessage("Browser:LoadURI", {
-        loadOptions,
-        historyIndex: sessionHistory.legacySHistory.requestedIndex,
-      });
-    } else {
-      // If we can't access legacySHistory, session history in the
-      // parent is enabled. Browser:LoadURI knows about this and will
-      // act accordingly.
-      actor.sendAsyncMessage("Browser:LoadURI", {
-        loadOptions,
-      });
-    }
-
-    return false;
-  },
-
   wrapHandlingUserInput(aWindow, aIsHandling, aCallback) {
     var handlingUserInput;
     try {
diff -Nru firefox-84.0.2+build1/toolkit/modules/moz.build firefox-85.0+build1/toolkit/modules/moz.build
--- firefox-84.0.2+build1/toolkit/modules/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -145,6 +145,7 @@
     "tests/modules/OSKeyStoreTestUtils.jsm",
     "tests/modules/PromiseTestUtils.jsm",
     "tests/modules/Task.jsm",
+    "tests/xpcshell/RegionTestUtils.jsm",
     "tests/xpcshell/TestIntegration.jsm",
 ]
 
diff -Nru firefox-84.0.2+build1/toolkit/modules/Region.jsm firefox-85.0+build1/toolkit/modules/Region.jsm
--- firefox-84.0.2+build1/toolkit/modules/Region.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/Region.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -63,11 +63,32 @@
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
+  "updateDebounce",
+  "browser.region.update.debounce",
+  60 * 60 * 24
+);
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "lastUpdated",
+  "browser.region.update.updated",
+  0
+);
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
   "localGeocodingEnabled",
   "browser.region.local-geocoding",
   false
 );
 
+XPCOMUtils.defineLazyServiceGetter(
+  this,
+  "timerManager",
+  "@mozilla.org/updates/timer-manager;1",
+  "nsIUpdateTimerManager"
+);
+
 const log = console.createInstance({
   prefix: "Region.jsm",
   maxLogLevel: loggingEnabled ? "All" : "Warn",
@@ -75,6 +96,7 @@
 
 const REGION_PREF = "browser.search.region";
 const COLLECTION_ID = "regions";
+const GEOLOCATION_TOPIC = "geolocation-position-events";
 
 // Prefix for all the region updating related preferences.
 const UPDATE_PREFIX = "browser.region.update";
@@ -86,6 +108,16 @@
 
 const MAX_RETRIES = 3;
 
+// If the user never uses geolocation, schedule a periodic
+// update to check the current location (in seconds).
+const UPDATE_CHECK_NAME = "region-update-timer";
+const UPDATE_CHECK_INTERVAL = 60 * 60 * 24 * 7;
+
+// Let child processes read the current home value
+// but dont trigger redundant updates in them.
+let inChildProcess =
+  Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+
 /**
  * This module keeps track of the users current region (country).
  * so the SearchService and other consumers can apply region
@@ -103,6 +135,8 @@
   // Keep track of how many times we have tried to fetch
   // the users region during failure.
   _retryCount = 0;
+  // Let tests wait for init to complete.
+  _initPromise = null;
   // Topic for Observer events fired by Region.jsm.
   REGION_TOPIC = "browser-region";
   // Verb for event fired when we update the region.
@@ -119,16 +153,28 @@
    * Read currently stored region data and if needed trigger background
    * region detection.
    */
-  init() {
+  async init() {
+    if (this._initPromise) {
+      return this._initPromise;
+    }
+    if (cacheBustEnabled && !inChildProcess) {
+      Services.tm.idleDispatchToMainThread(() => {
+        timerManager.registerTimer(
+          UPDATE_CHECK_NAME,
+          () => this._updateTimer(),
+          UPDATE_CHECK_INTERVAL
+        );
+      });
+    }
+    let promises = [];
     this._home = Services.prefs.getCharPref(REGION_PREF, null);
-    if (cacheBustEnabled || !this._home) {
-      Services.tm.idleDispatchToMainThread(this._fetchRegion.bind(this));
+    if (!this._home && !inChildProcess) {
+      promises.push(this._idleDispatch(() => this._fetchRegion()));
     }
-    if (localGeocodingEnabled) {
-      Services.tm.idleDispatchToMainThread(
-        this._setupRemoteSettings.bind(this)
-      );
+    if (localGeocodingEnabled && !inChildProcess) {
+      promises.push(this._idleDispatch(() => this._setupRemoteSettings()));
     }
+    return (this._initPromise = Promise.all(promises));
   }
 
   /**
@@ -272,7 +318,10 @@
     log.info("Setting current region:", region);
     this._current = region;
 
+    let now = Math.round(Date.now() / 1000);
     let prefs = Services.prefs;
+    prefs.setIntPref(`${UPDATE_PREFIX}.updated`, now);
+
     // Interval is in seconds.
     let interval = prefs.getIntPref(
       `${UPDATE_PREFIX}.interval`,
@@ -289,14 +338,11 @@
       // considered home, then keep track of when we first
       // seen the new location.
       prefs.setCharPref(`${UPDATE_PREFIX}.region`, region);
-      prefs.setIntPref(
-        `${UPDATE_PREFIX}.first-seen`,
-        Math.round(Date.now() / 1000)
-      );
+      prefs.setIntPref(`${UPDATE_PREFIX}.first-seen`, now);
     } else if (region != this._home && region == seenRegion) {
       // If we have been in the new region for longer than
       // a specified time period, then set that as the new home.
-      if (Math.round(Date.now() / 1000) >= firstSeen + interval) {
+      if (now >= firstSeen + interval) {
         this._setHomeRegion(region);
       }
     } else {
@@ -386,6 +432,9 @@
     this._rsClient = RemoteSettings(COLLECTION_ID);
     this._rsClient.on("sync", this._onRegionFilesSync.bind(this));
     await this._ensureRegionFilesDownloaded();
+    // Start listening to geolocation events only after
+    // we know the maps are downloded.
+    Services.obs.addObserver(this, GEOLOCATION_TOPIC);
   }
 
   /**
@@ -738,6 +787,60 @@
     });
   }
 
+  /**
+   * If the user is using geolocation then we will see frequent updates
+   * debounce those so we aren't processing them constantly.
+   *
+   * @returns {bool}
+   *   Whether we should continue the update check.
+   */
+  _needsUpdateCheck() {
+    let sinceUpdate = Math.round(Date.now() / 1000) - lastUpdated;
+    let needsUpdate = sinceUpdate >= updateDebounce;
+    if (!needsUpdate) {
+      log.info(`Ignoring update check, last seen ${sinceUpdate} seconds ago`);
+    }
+    return needsUpdate;
+  }
+
+  /**
+   * Dispatch a promise returning function to the main thread and
+   * resolve when it is completed.
+   */
+  _idleDispatch(fun) {
+    return new Promise(resolve => {
+      Services.tm.idleDispatchToMainThread(fun().then(resolve));
+    });
+  }
+
+  /**
+   * timerManager will call this periodically to update the region
+   * in case the user never users geolocation.
+   */
+  async _updateTimer() {
+    if (this._needsUpdateCheck()) {
+      await this._fetchRegion();
+    }
+  }
+
+  /**
+   * Called when we see geolocation updates.
+   * in case the user never users geolocation.
+   *
+   * @param {Object} location
+   *   A location object containing lat + lng coordinates.
+   *
+   */
+  async _seenLocation(location) {
+    log.info(`Got location update: ${location.lat}:${location.lng}`);
+    if (this._needsUpdateCheck()) {
+      let region = await this._geoCode(location);
+      if (region) {
+        this._setCurrentRegion(region);
+      }
+    }
+  }
+
   onChange(accessPoints) {
     log.info("onChange called");
     if (!accessPoints || !this._wifiDataPromise) {
@@ -755,6 +858,27 @@
       this._wifiDataPromise = null;
     }
   }
+
+  observe(aSubject, aTopic, aData) {
+    log.info(`Observed ${aTopic}`);
+    switch (aTopic) {
+      case GEOLOCATION_TOPIC:
+        // aSubject from GeoLocation.cpp will be a GeoPosition
+        // DOM Object, but from tests we will receive a
+        // wrappedJSObject so handle both here.
+        let coords = aSubject.coords || aSubject.wrappedJSObject.coords;
+        this._seenLocation({
+          lat: coords.latitude,
+          lng: coords.longitude,
+        });
+        break;
+    }
+  }
+
+  // For tests to create blank new instances.
+  newInstance() {
+    return new RegionDetector();
+  }
 }
 
 let Region = new RegionDetector();
diff -Nru firefox-84.0.2+build1/toolkit/modules/SubDialog.jsm firefox-85.0+build1/toolkit/modules/SubDialog.jsm
--- firefox-84.0.2+build1/toolkit/modules/SubDialog.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/SubDialog.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -772,7 +772,9 @@
 
   _trapFocus() {
     this.focus();
-    this._box.addEventListener("keydown", this, true);
+    // Attach a system event listener so the dialog can cancel keydown events.
+    // See Bug 1669990.
+    this._box.addEventListener("keydown", this, { mozSystemGroup: true });
     this._closeButton?.addEventListener("keydown", this);
 
     if (!this._window.isChromeWindow) {
@@ -781,7 +783,7 @@
   },
 
   _untrapFocus() {
-    this._box.removeEventListener("keydown", this, true);
+    this._box.removeEventListener("keydown", this, { mozSystemGroup: true });
     this._closeButton?.removeEventListener("keydown", this);
     this._window.removeEventListener("focus", this, true);
   },
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/browser/browser_FinderHighlighter.js firefox-85.0+build1/toolkit/modules/tests/browser/browser_FinderHighlighter.js
--- firefox-84.0.2+build1/toolkit/modules/tests/browser/browser_FinderHighlighter.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/browser/browser_FinderHighlighter.js	2021-01-18 19:58:27.000000000 +0000
@@ -300,7 +300,7 @@
     insertCalls: [0, 0],
     removeCalls: [1, 2],
   });
-  await BrowserTestUtils.loadURI(browser, url);
+  BrowserTestUtils.loadURI(browser, url);
   await promise;
 
   BrowserTestUtils.removeTab(tab);
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/browser/browser_Troubleshoot.js firefox-85.0+build1/toolkit/modules/tests/browser/browser_Troubleshoot.js
--- firefox-84.0.2+build1/toolkit/modules/tests/browser/browser_Troubleshoot.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/browser/browser_Troubleshoot.js	2021-01-18 19:58:27.000000000 +0000
@@ -980,6 +980,12 @@
         },
       },
     },
+    thirdPartyModules: {
+      required:
+        AppConstants.platform == "win" &&
+        Services.prefs.getBoolPref("browser.enableAboutThirdParty"),
+      type: "array",
+    },
   },
 };
 
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/modules/PromiseTestUtils.jsm firefox-85.0+build1/toolkit/modules/tests/modules/PromiseTestUtils.jsm
--- firefox-84.0.2+build1/toolkit/modules/tests/modules/PromiseTestUtils.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/modules/PromiseTestUtils.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -160,7 +160,7 @@
         // Ignore the special promise for ensureDOMPromiseRejectionsProcessed.
         return;
       }
-      message = reason.message || "" + reason;
+      message = reason?.message || "" + reason;
     } catch (ex) {}
 
     // We should convert the rejection stack to a string immediately. This is
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm firefox-85.0+build1/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm
--- firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/xpcshell/RegionTestUtils.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,16 @@
+"use strict";
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const EXPORTED_SYMBOLS = ["RegionTestUtils"];
+
+const RegionTestUtils = Object.freeze({
+  REGION_URL_PREF: "browser.region.network.url",
+
+  setNetworkRegion(region) {
+    Services.prefs.setCharPref(
+      this.REGION_URL_PREF,
+      `data:application/json,{"country_code": "${region}"}`
+    );
+  },
+});
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/test_Region_geocoding.js firefox-85.0+build1/toolkit/modules/tests/xpcshell/test_Region_geocoding.js
--- firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/test_Region_geocoding.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/xpcshell/test_Region_geocoding.js	2021-01-18 19:58:27.000000000 +0000
@@ -3,6 +3,13 @@
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const { Region } = ChromeUtils.import("resource://gre/modules/Region.jsm");
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
+const { TestUtils } = ChromeUtils.import(
+  "resource://testing-common/TestUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  RegionTestUtils: "resource://testing-common/RegionTestUtils.jsm",
+});
 
 async function readFile(file) {
   let decoder = new TextDecoder();
@@ -17,15 +24,20 @@
   );
 }
 
-async function stubMap(path, fun) {
+async function stubMap(obj, path, fun) {
   let map = await readFile(do_get_file(path));
-  sinon.stub(Region, fun).resolves(JSON.parse(map));
+  sinon.stub(obj, fun).resolves(JSON.parse(map));
+}
+
+async function stubMaps(obj) {
+  await stubMap(obj, "regions/world.geojson", "_getPlainMap");
+  await stubMap(obj, "regions/world-buffered.geojson", "_getBufferedMap");
 }
 
 add_task(async function test_setup() {
   Services.prefs.setBoolPref("browser.region.log", true);
-  await stubMap("regions/world.geojson", "_getPlainMap");
-  await stubMap("regions/world-buffered.geojson", "_getBufferedMap");
+  Services.prefs.setBoolPref("browser.region.local-geocoding", true);
+  await stubMaps(Region);
 });
 
 const LOCATIONS = [
@@ -40,25 +52,13 @@
   { lat: 35.4411368, lng: -41.5372973, expectedRegion: null },
 ];
 
-add_task(async function test_mls_results() {
+add_task(async function test_local_basic() {
   setLocation({ lat: -5.066019, lng: 39.1026251 });
   let expectedRegion = "TZ";
   let region = await Region._getRegionLocally();
   Assert.equal(region, expectedRegion);
 });
 
-/*add_task(async function test_basic() {
-  for (const { lat, lng, expectedRegion } of LOCATIONS) {
-    setLocation({ lat, lng });
-    let region = await Region._getRegionLocally();
-    Assert.equal(
-      region,
-      expectedRegion,
-      `Got the expected region at ${lat},${lng}`
-    );
-  }
-});*/
-
 add_task(async function test_mls_results() {
   let data = await readFile(do_get_file("regions/mls-lookup-results.csv"));
   for (const row of data.split("\n")) {
@@ -72,3 +72,31 @@
     );
   }
 });
+
+add_task(async function test_geolocation_update() {
+  RegionTestUtils.setNetworkRegion("AU");
+
+  // Enable immediate region updates.
+  Services.prefs.setBoolPref("browser.region.update.enabled", true);
+  Services.prefs.setIntPref("browser.region.update.interval", 0);
+  Services.prefs.setIntPref("browser.region.update.debounce", 0);
+
+  let region = Region.newInstance();
+  await stubMaps(region);
+  await region.init();
+  Assert.equal(region.home, "AU", "Correct initial region");
+
+  Services.obs.notifyObservers(
+    { coords: { latitude: -5.066019, longitude: 39.1026251 } },
+    "geolocation-position-events"
+  );
+  Assert.equal(region.home, "AU", "First update will mark new region as seen");
+
+  let regionUpdate = TestUtils.topicObserved("browser-region");
+  Services.obs.notifyObservers(
+    { coords: { latitude: -5.066019, longitude: 39.1026251 } },
+    "geolocation-position-events"
+  );
+  await regionUpdate;
+  Assert.equal(region.home, "TZ", "Second update will change location");
+});
diff -Nru firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/test_Region.js firefox-85.0+build1/toolkit/modules/tests/xpcshell/test_Region.js
--- firefox-84.0.2+build1/toolkit/modules/tests/xpcshell/test_Region.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/tests/xpcshell/test_Region.js	2021-01-18 19:58:27.000000000 +0000
@@ -10,7 +10,10 @@
   "resource://testing-common/TestUtils.jsm"
 );
 
-const REGION_PREF = "browser.region.network.url";
+XPCOMUtils.defineLazyModuleGetters(this, {
+  RegionTestUtils: "resource://testing-common/RegionTestUtils.jsm",
+});
+
 const INTERVAL_PREF = "browser.region.update.interval";
 
 const RESPONSE_DELAY = 500;
@@ -20,53 +23,44 @@
   "SEARCH_SERVICE_COUNTRY_FETCH_RESULT"
 );
 
-// Add notification observer, it will return a promise that will resolve once a notification is fired.
-function waitForNotificationSubject(topic) {
-  return new Promise((resolve, reject) => {
-    Services.obs.addObserver(function observe(aSubject, aTopic, aData) {
-      // wrap the subject as a nsISupports
-      let subject = aSubject.QueryInterface(Ci.nsISupportsString);
-      Services.obs.removeObserver(observe, topic);
-      resolve(subject);
-    }, topic);
-  });
-}
-
 // Region.jsm will call init() on startup and sent a background
 // task to fetch the region, ensure we have completed this before
 // running the rest of the tests.
 add_task(async function test_startup() {
-  setNetworkRegion("UK");
+  RegionTestUtils.setNetworkRegion("UK");
   await checkTelemetry(Region.TELEMETRY.SUCCESS);
+  await cleanup();
 });
 
 add_task(async function test_basic() {
-  Region._home = null;
-  let srv = useHttpServer(REGION_PREF);
+  let srv = useHttpServer(RegionTestUtils.REGION_URL_PREF);
   srv.registerPathHandler("/", (req, res) => {
     res.setStatusLine("1.1", 200, "OK");
     send(res, { country_code: "UK" });
   });
   // start to listen the notification
-  let notificationSubjectPromise = waitForNotificationSubject("browser-region");
+  let updateRegion = TestUtils.topicObserved("browser-region");
   await Region._fetchRegion();
-  let notificationSub = await notificationSubjectPromise;
+  let [subject] = await updateRegion;
 
   Assert.ok(true, "Region fetch should succeed");
   Assert.equal(Region.home, "UK", "Region fetch should return correct result");
   Assert.equal(
-    notificationSub,
+    subject,
     Region.home,
     "Notification should be sent with the correct region"
   );
 
-  await new Promise(r => srv.stop(r));
+  await cleanup(srv);
 });
 
 add_task(async function test_invalid_url() {
   histogram.clear();
   Services.prefs.setIntPref("browser.region.retry-timeout", 0);
-  Services.prefs.setCharPref(REGION_PREF, "http://localhost:0");
+  Services.prefs.setCharPref(
+    RegionTestUtils.REGION_URL_PREF,
+    "http://localhost:0"
+  );
   let result = await Region._fetchRegion();
   Assert.ok(!result, "Should return no result");
   await checkTelemetry(Region.TELEMETRY.NO_RESULT);
@@ -75,7 +69,7 @@
 add_task(async function test_invalid_json() {
   histogram.clear();
   Services.prefs.setCharPref(
-    REGION_PREF,
+    RegionTestUtils.REGION_URL_PREF,
     'data:application/json,{"country_code"'
   );
   let result = await Region._fetchRegion();
@@ -87,7 +81,7 @@
   histogram.clear();
   Services.prefs.setIntPref("browser.region.retry-timeout", 0);
   Services.prefs.setIntPref("browser.region.timeout", RESPONSE_TIMEOUT);
-  let srv = useHttpServer(REGION_PREF);
+  let srv = useHttpServer(RegionTestUtils.REGION_URL_PREF);
   srv.registerPathHandler("/", (req, res) => {
     res.processAsync();
     do_timeout(RESPONSE_DELAY, () => {
@@ -100,7 +94,7 @@
   Assert.equal(result, null, "Region fetch should return null");
 
   await checkTelemetry(Region.TELEMETRY.TIMEOUT);
-  await new Promise(r => srv.stop(r));
+  await cleanup(srv);
 });
 
 add_task(async function test_mismatched_probe() {
@@ -113,7 +107,7 @@
   histogram.clear();
   Region._home = null;
 
-  setNetworkRegion("AU");
+  RegionTestUtils.setNetworkRegion("AU");
   await Region._fetchRegion();
   Assert.equal(Region.home, "AU", "Should have correct region");
   await checkTelemetry(Region.TELEMETRY.SUCCESS);
@@ -126,6 +120,8 @@
   }
   let snapshot = probeHistogram.snapshot();
   deepEqual(snapshot.values, probeDetails.expectedResult);
+
+  await cleanup();
 });
 
 add_task(async function test_location() {
@@ -140,15 +136,15 @@
   Assert.ok(true, "Region fetch should succeed");
   Assert.deepEqual(result, location, "Location is returned");
 
-  await new Promise(r => srv.stop(r));
+  await cleanup(srv);
 });
 
 add_task(async function test_update() {
   Region._home = null;
-  setNetworkRegion("FR");
+  RegionTestUtils.setNetworkRegion("FR");
   await Region._fetchRegion();
   Assert.equal(Region.home, "FR", "Should have correct region");
-  setNetworkRegion("DE");
+  RegionTestUtils.setNetworkRegion("DE");
   await Region._fetchRegion();
   Assert.equal(Region.home, "FR", "Shouldnt have changed yet");
   // Thie first fetchRegion will set the prefs to determine when
@@ -161,6 +157,8 @@
   await new Promise(resolve => setTimeout(resolve, 1100));
   await Region._fetchRegion();
   Assert.equal(Region.home, "DE", "Should have updated now");
+
+  await cleanup();
 });
 
 add_task(async function test_max_retry() {
@@ -168,7 +166,7 @@
   let requestsSeen = 0;
   Services.prefs.setIntPref("browser.region.retry-timeout", RESPONSE_TIMEOUT);
   Services.prefs.setIntPref("browser.region.timeout", RESPONSE_TIMEOUT);
-  let srv = useHttpServer(REGION_PREF);
+  let srv = useHttpServer(RegionTestUtils.REGION_URL_PREF);
   srv.registerPathHandler("/", (req, res) => {
     requestsSeen++;
     res.setStatusLine("1.1", 200, "OK");
@@ -185,7 +183,7 @@
   Assert.equal(requestsSeen, 3, "Retried 4 times");
 
   Region._retryCount = 0;
-  await new Promise(r => srv.stop(r));
+  await cleanup(srv);
 });
 
 add_task(async function test_retry() {
@@ -193,7 +191,7 @@
   let requestsSeen = 0;
   Services.prefs.setIntPref("browser.region.retry-timeout", RESPONSE_TIMEOUT);
   Services.prefs.setIntPref("browser.region.timeout", RESPONSE_TIMEOUT);
-  let srv = useHttpServer(REGION_PREF);
+  let srv = useHttpServer(RegionTestUtils.REGION_URL_PREF);
   srv.registerPathHandler("/", (req, res) => {
     res.setStatusLine("1.1", 200, "OK");
     if (++requestsSeen == 2) {
@@ -213,16 +211,35 @@
   Assert.equal(Region.home, "UK", "failed to fetch region");
   Assert.equal(requestsSeen, 2, "Retried 2 times");
 
-  Region._retryCount = 0;
-  await new Promise(r => srv.stop(r));
+  await cleanup(srv);
 });
 
-function setNetworkRegion(region) {
-  Services.prefs.setCharPref(
-    REGION_PREF,
-    `data:application/json,{"country_code": "${region}"}`
-  );
-}
+add_task(async function test_timerManager() {
+  RegionTestUtils.setNetworkRegion("FR");
+
+  // Ensure the home region updates immediately, but the update
+  // check will only happen once per second.
+  Services.prefs.setIntPref("browser.region.update.interval", 0);
+  Services.prefs.setIntPref("browser.region.update.debounce", 1);
+
+  let region = Region.newInstance();
+  await region.init();
+  Assert.equal(region.home, "FR", "Should have correct initial region");
+
+  // Updates are being debounced, these should be ignored.
+  RegionTestUtils.setNetworkRegion("DE");
+  await region._updateTimer();
+  await region._updateTimer();
+  Assert.equal(region.home, "FR", "Ignored updates to region");
+
+  // Set the debounce interval to 0 so these updates are used.
+  Services.prefs.setIntPref("browser.region.update.debounce", 0);
+  RegionTestUtils.setNetworkRegion("AU");
+  await region._updateTimer();
+  await region._updateTimer();
+  Assert.equal(region.home, "AU", "region has been updated");
+  await cleanup();
+});
 
 function useHttpServer(pref) {
   let server = new HttpServer();
@@ -240,6 +257,13 @@
   res.write(JSON.stringify(json));
 }
 
+async function cleanup(srv = null) {
+  Services.prefs.clearUserPref("browser.search.region");
+  if (srv) {
+    await new Promise(r => srv.stop(r));
+  }
+}
+
 async function checkTelemetry(aExpectedValue) {
   // Wait until there is 1 result.
   await TestUtils.waitForCondition(() => {
diff -Nru firefox-84.0.2+build1/toolkit/modules/Troubleshoot.jsm firefox-85.0+build1/toolkit/modules/Troubleshoot.jsm
--- firefox-84.0.2+build1/toolkit/modules/Troubleshoot.jsm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/modules/Troubleshoot.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -830,6 +830,57 @@
       },
     });
   },
+
+  async thirdPartyModules(done) {
+    if (
+      AppConstants.platform != "win" ||
+      !Services.prefs.getBoolPref("browser.enableAboutThirdParty")
+    ) {
+      done();
+      return;
+    }
+
+    let data = null;
+    try {
+      data = await Services.telemetry.getUntrustedModuleLoadEvents(
+        Services.telemetry.INCLUDE_OLD_LOADEVENTS |
+          Services.telemetry.KEEP_LOADEVENTS_NEW |
+          Services.telemetry.INCLUDE_PRIVATE_FIELDS_IN_LOADEVENTS |
+          Services.telemetry.EXCLUDE_STACKINFO_FROM_LOADEVENTS
+      );
+    } catch (e) {
+      // No error report in case of NS_ERROR_NOT_AVAILABLE
+      // because the method throws it when data is empty.
+      if (
+        !(e instanceof Components.Exception) ||
+        e.result != Cr.NS_ERROR_NOT_AVAILABLE
+      ) {
+        Cu.reportError(e);
+      }
+    }
+
+    if (!data || !data.modules || !data.processes) {
+      done();
+      return;
+    }
+
+    // The original telemetry data structure has an array of modules
+    // and an array of loading events referring to the module array's
+    // item via its index.
+    // To easily display data per module, we put loading events into
+    // a corresponding module object and return the module array.
+    for (const [proc, perProc] of Object.entries(data.processes)) {
+      for (const event of perProc.events) {
+        const module = data.modules[event.moduleIndex];
+        if (!("events" in module)) {
+          module.events = [];
+        }
+        event.processIdAndType = proc;
+        module.events.push(event);
+      }
+    }
+    done(data.modules);
+  },
 };
 
 if (AppConstants.MOZ_CRASHREPORTER) {
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/defaultagent/Notification.cpp firefox-85.0+build1/toolkit/mozapps/defaultagent/Notification.cpp
--- firefox-84.0.2+build1/toolkit/mozapps/defaultagent/Notification.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/defaultagent/Notification.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -394,9 +394,11 @@
     return activitiesPerformed;
   }
 
-  WinToast::instance()->setAppName(L"" MOZ_APP_BASENAME);
+  WinToast::instance()->setAppName(L"" MOZ_APP_DISPLAYNAME);
   std::wstring aumiStr = aumi;
   WinToast::instance()->setAppUserModelId(aumiStr);
+  WinToast::instance()->setShortcutPolicy(
+      WinToastLib::WinToast::SHORTCUT_POLICY_REQUIRE_NO_CREATE);
   WinToast::WinToastError error;
   if (!WinToast::instance()->initialize(&error)) {
     LOG_ERROR_MESSAGE(WinToast::strerror(error).c_str());
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/defaultagent/rust/src/lib.rs firefox-85.0+build1/toolkit/mozapps/defaultagent/rust/src/lib.rs
--- firefox-84.0.2+build1/toolkit/mozapps/defaultagent/rust/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/defaultagent/rust/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -108,7 +108,6 @@
 
 // This is an easy way to consume `MOZ_APP_DISPLAYNAME` from Rust code.
 extern "C" {
-    #[no_mangle]
     static gWinEventLogSourceName: *const u16;
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonContentPolicy.cpp firefox-85.0+build1/toolkit/mozapps/extensions/AddonContentPolicy.cpp
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonContentPolicy.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/AddonContentPolicy.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "mozilla/dom/nsCSPContext.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsContentPolicyUtils.h"
 #include "nsContentTypeParser.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonManagerStartup.cpp firefox-85.0+build1/toolkit/mozapps/extensions/AddonManagerStartup.cpp
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonManagerStartup.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/AddonManagerStartup.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -21,7 +21,6 @@
 #include "mozilla/LinkedList.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ResultExtensions.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/URLPreloader.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonManagerStartup.h firefox-85.0+build1/toolkit/mozapps/extensions/AddonManagerStartup.h
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/AddonManagerStartup.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/AddonManagerStartup.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,8 +14,6 @@
 #include "nsIObserver.h"
 #include "nsISupports.h"
 
-#include "jsapi.h"
-
 namespace mozilla {
 
 class Addon;
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/Blocklist.jsm firefox-85.0+build1/toolkit/mozapps/extensions/Blocklist.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/Blocklist.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/Blocklist.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -808,19 +808,6 @@
   },
 
   _showBlockedPluginsPrompt(blockedPlugins) {
-    if ("@mozilla.org/addons/blocklist-prompt;1" in Cc) {
-      try {
-        let blockedPrompter = Cc[
-          "@mozilla.org/addons/blocklist-prompt;1"
-        ].getService().wrappedJSObject;
-        blockedPrompter.prompt(blockedPlugins);
-      } catch (e) {
-        LOG(e);
-      }
-      this._notifyUpdate();
-      return;
-    }
-
     let args = {
       restart: false,
       list: blockedPlugins,
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/aboutaddonsCommon.js firefox-85.0+build1/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/aboutaddonsCommon.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/aboutaddonsCommon.js	2021-01-18 19:58:27.000000000 +0000
@@ -164,8 +164,8 @@
     return false;
   }
 
-  const { origins, permissions } = addon.userPermissions;
-  return !!origins.length || !!permissions.length;
+  let perms = addon.userPermissions;
+  return perms?.origins.length || perms?.permissions.length;
 }
 
 function showPermissionsPrompt(addon) {
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/aboutaddons.js firefox-85.0+build1/toolkit/mozapps/extensions/content/aboutaddons.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/aboutaddons.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/aboutaddons.js	2021-01-18 19:58:27.000000000 +0000
@@ -477,7 +477,7 @@
 
 /**
  * This function is set in initialize() by the parent about:addons window. It
- * is a helper for gViewController.replaceView(gViewDefault). This should be
+ * is a helper for gViewController.replaceView(defaultViewId). This should be
  * used to reset the view if we try to load an invalid view.
  */
 let replaceWithDefaultViewFn;
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/extensions.js firefox-85.0+build1/toolkit/mozapps/extensions/content/extensions.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/extensions.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/extensions.js	2021-01-18 19:58:27.000000000 +0000
@@ -18,8 +18,6 @@
   "resource://gre/modules/AddonManager.jsm"
 );
 
-var gViewDefault = "addons://discover/";
-
 document.addEventListener("load", initialize, true);
 window.addEventListener("unload", shutdown);
 
@@ -31,10 +29,6 @@
 function initialize(event) {
   document.removeEventListener("load", initialize, true);
 
-  if (!isDiscoverEnabled()) {
-    gViewDefault = "addons://list/extension";
-  }
-
   // Support focusing the search bar from the XUL document.
   document.addEventListener("keypress", e => {
     getHtmlBrowser()
@@ -53,8 +47,8 @@
   }
 
   // If there is a history state to restore then use that
-  if (window.history.state) {
-    gViewController.updateState(window.history.state);
+  if (history.state) {
+    gViewController.updateState(history.state);
   }
 }
 
@@ -72,7 +66,6 @@
 }
 
 function shutdown() {
-  gViewController.shutdown();
   Services.obs.removeObserver(sendEMPong, "EM-ping");
 }
 
@@ -94,19 +87,13 @@
     addon = await AddonManager.getAddonByID(id);
   }
 
-  AMTelemetry.recordViewEvent({ view: getCurrentViewName(), addon, type });
-}
-
-function getCurrentViewName() {
-  let view = gViewController.currentViewObj;
-  let entries = Object.entries(gViewController.viewObjects);
-  let viewIndex = entries.findIndex(([name, viewObj]) => {
-    return viewObj == view;
+  let { currentViewId } = gViewController;
+  let viewType = gViewController.parseViewId(currentViewId)?.type;
+  AMTelemetry.recordViewEvent({
+    view: viewType || "other",
+    addon,
+    type,
   });
-  if (viewIndex != -1) {
-    return entries[viewIndex][0];
-  }
-  return "other";
 }
 
 // Used by external callers to load a specific view into the manager
@@ -121,199 +108,32 @@
   }
 }
 
-/**
- * A wrapper around the HTML5 session history service that allows the browser
- * back/forward controls to work within the manager
- */
-var HTML5History = {
-  get index() {
-    return window.docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory
-      .index;
-  },
-
-  get canGoBack() {
-    return window.docShell.QueryInterface(Ci.nsIWebNavigation).canGoBack;
-  },
-
-  get canGoForward() {
-    return window.docShell.QueryInterface(Ci.nsIWebNavigation).canGoForward;
-  },
-
-  back() {
-    window.history.back();
-  },
-
-  forward() {
-    window.history.forward();
-  },
-
-  pushState(aState) {
-    window.history.pushState(aState, document.title);
-  },
-
-  replaceState(aState) {
-    window.history.replaceState(aState, document.title);
-  },
-
-  popState() {
-    function onStatePopped(aEvent) {
-      window.removeEventListener("popstate", onStatePopped, true);
-      // TODO To ensure we can't go forward again we put an additional entry
-      // for the current state into the history. Ideally we would just strip
-      // the history but there doesn't seem to be a way to do that. Bug 590661
-      window.history.pushState(aEvent.state, document.title);
-    }
-    window.addEventListener("popstate", onStatePopped, true);
-    window.history.back();
-  },
-};
-
-/**
- * A wrapper around a fake history service
- */
-var FakeHistory = {
-  pos: 0,
-  states: [null],
-
-  get index() {
-    return this.pos;
-  },
-
-  get canGoBack() {
-    return this.pos > 0;
-  },
-
-  get canGoForward() {
-    return this.pos + 1 < this.states.length;
-  },
-
-  back() {
-    if (this.pos == 0) {
-      throw Components.Exception("Cannot go back from this point");
-    }
-
-    this.pos--;
-    gViewController.updateState(this.states[this.pos]);
-  },
-
-  forward() {
-    if (this.pos + 1 >= this.states.length) {
-      throw Components.Exception("Cannot go forward from this point");
-    }
-
-    this.pos++;
-    gViewController.updateState(this.states[this.pos]);
-  },
-
-  pushState(aState) {
-    this.pos++;
-    this.states.splice(this.pos, this.states.length);
-    this.states.push(aState);
-  },
-
-  replaceState(aState) {
-    this.states[this.pos] = aState;
-  },
-
-  popState() {
-    if (this.pos == 0) {
-      throw Components.Exception("Cannot popState from this view");
-    }
-
-    this.states.splice(this.pos, this.states.length);
-    this.pos--;
-
-    gViewController.updateState(this.states[this.pos]);
-  },
-};
-
-// If the window has a session history then use the HTML5 History wrapper
-// otherwise use our fake history implementation
-if (window.docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory) {
-  var gHistory = HTML5History;
-} else {
-  gHistory = FakeHistory;
-}
-
 var gViewController = {
-  viewPort: null,
+  defaultViewId: "addons://discover/",
   currentViewId: "",
-  currentViewObj: null,
-  currentViewRequest: 0,
+  isLoading: true,
   // 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.
+  // This is used for scroll offsets in aboutaddons.js
   nextHistoryEntryId: Math.floor(Math.random() * 2 ** 32),
-  viewObjects: {},
-  viewChangeCallback: null,
   initialViewSelected: false,
-  lastHistoryIndex: -1,
 
   initialize() {
-    this.viewPort = document.getElementById("view-port");
-    this.headeredViews = document.getElementById("headered-views");
-    this.headeredViewsDeck = document.getElementById("headered-views-content");
-
-    this.viewObjects.shortcuts = htmlView("shortcuts");
-    this.viewObjects.list = htmlView("list");
-    this.viewObjects.detail = htmlView("detail");
-    this.viewObjects.updates = htmlView("updates");
-    this.viewObjects.discover = htmlView("discover");
-
-    for (let type in this.viewObjects) {
-      let view = this.viewObjects[type];
-      view.initialize();
+    if (!isDiscoverEnabled()) {
+      this.defaultViewId = "addons://list/extension";
     }
 
     gCategories.initialize();
 
-    window.controllers.appendController(this);
-
-    window.addEventListener("popstate", function(e) {
-      gViewController.updateState(e.state);
+    window.addEventListener("popstate", e => {
+      this.updateState(e.state);
     });
   },
 
-  shutdown() {
-    if (this.currentViewObj) {
-      this.currentViewObj.hide();
-    }
-    this.currentViewRequest = 0;
-
-    for (let type in this.viewObjects) {
-      let view = this.viewObjects[type];
-      if ("shutdown" in view) {
-        try {
-          view.shutdown();
-        } catch (e) {
-          // this shouldn't be fatal
-          Cu.reportError(e);
-        }
-      }
-    }
-
-    window.controllers.removeController(this);
-  },
-
   updateState(state) {
-    try {
-      this.loadViewInternal(state.view, state.previousView, state);
-      this.lastHistoryIndex = gHistory.index;
-    } catch (e) {
-      // The attempt to load the view failed, try moving further along history
-      if (this.lastHistoryIndex > gHistory.index) {
-        if (gHistory.canGoBack) {
-          gHistory.back();
-        } else {
-          gViewController.replaceView(gViewDefault);
-        }
-      } else if (gHistory.canGoForward) {
-        gHistory.forward();
-      } else {
-        gViewController.replaceView(gViewDefault);
-      }
-    }
+    this.loadViewInternal(state.view, state.previousView, state);
   },
 
   parseViewId(aViewId) {
@@ -322,25 +142,9 @@
     return { type: viewType, param: decodeURIComponent(viewParam) };
   },
 
-  get isLoading() {
-    return (
-      !this.currentViewObj || this.currentViewObj.node.hasAttribute("loading")
-    );
-  },
-
   loadView(aViewId) {
-    var isRefresh = false;
     if (aViewId == this.currentViewId) {
-      if (this.isLoading) {
-        return;
-      }
-      if (!("refresh" in this.currentViewObj)) {
-        return;
-      }
-      if (!this.currentViewObj.canRefresh()) {
-        return;
-      }
-      isRefresh = true;
+      return;
     }
 
     var state = {
@@ -348,10 +152,7 @@
       previousView: this.currentViewId,
       historyEntryId: ++this.nextHistoryEntryId,
     };
-    if (!isRefresh) {
-      gHistory.pushState(state);
-      this.lastHistoryIndex = gHistory.index;
-    }
+    history.pushState(state, "");
     this.loadViewInternal(aViewId, this.currentViewId, state);
   },
 
@@ -367,7 +168,7 @@
       previousView: null,
       historyEntryId: ++this.nextHistoryEntryId,
     };
-    gHistory.replaceState(state);
+    history.replaceState(state, "");
     this.loadViewInternal(aViewId, null, state);
   },
 
@@ -377,97 +178,47 @@
       previousView: null,
       historyEntryId: ++this.nextHistoryEntryId,
     };
-    gHistory.replaceState(state);
+    history.replaceState(state, "");
 
     this.loadViewInternal(aViewId, null, state);
     notifyInitialized();
   },
 
-  get displayedView() {
-    if (this.viewPort.selectedPanel == this.headeredViews) {
-      return this.headeredViewsDeck.selectedPanel;
-    }
-    return this.viewPort.selectedPanel;
-  },
-
-  set displayedView(view) {
-    let node = view.node;
-    if (node.parentNode == this.headeredViewsDeck) {
-      this.headeredViewsDeck.selectedPanel = node;
-      this.viewPort.selectedPanel = this.headeredViews;
-    } else {
-      this.viewPort.selectedPanel = node;
-    }
-  },
-
-  loadViewInternal(aViewId, aPreviousView, aState, aEvent) {
-    var view = this.parseViewId(aViewId);
+  loadViewInternal(aViewId, aPreviousView, aState) {
+    const view = this.parseViewId(aViewId);
+    const viewTypes = ["shortcuts", "list", "detail", "updates", "discover"];
 
-    if (!view.type || !(view.type in this.viewObjects)) {
+    if (!view.type || !viewTypes.includes(view.type)) {
       throw Components.Exception("Invalid view: " + view.type);
     }
 
-    var viewObj = this.viewObjects[view.type];
-    if (!viewObj.node) {
-      throw Components.Exception(
-        "Root node doesn't exist for '" + view.type + "' view"
-      );
-    }
-
-    if (this.currentViewObj && aViewId != aPreviousView) {
-      try {
-        let canHide = this.currentViewObj.hide();
-        if (canHide === false) {
-          return;
-        }
-        this.displayedView.removeAttribute("loading");
-      } catch (e) {
-        // this shouldn't be fatal
-        Cu.reportError(e);
-      }
+    if (aViewId != aPreviousView) {
+      promiseHtmlBrowserLoaded()
+        .then(browser => browser.contentWindow.hide())
+        .catch(err => Cu.reportError(err));
     }
 
     this.currentViewId = aViewId;
-    this.currentViewObj = viewObj;
-
-    this.displayedView = this.currentViewObj;
-    this.currentViewObj.node.setAttribute("loading", "true");
+    this.isLoading = true;
 
     recordViewTelemetry(view.param);
 
-    if (aViewId == aPreviousView) {
-      this.currentViewObj.refresh(
-        view.param,
-        ++this.currentViewRequest,
-        aState
-      );
-    } else {
-      this.currentViewObj.show(view.param, ++this.currentViewRequest, aState);
+    if (aViewId != aPreviousView) {
+      promiseHtmlBrowserLoaded()
+        .then(browser =>
+          browser.contentWindow.show(view.type, view.param, aState)
+        )
+        .then(() => {
+          this.isLoading = false;
+
+          var event = document.createEvent("Events");
+          event.initEvent("ViewChanged", true, true);
+          document.dispatchEvent(event);
+        });
     }
 
     this.initialViewSelected = true;
   },
-
-  // Moves back in the document history and removes the current history entry
-  popState(aCallback) {
-    this.viewChangeCallback = aCallback;
-    gHistory.popState();
-  },
-
-  notifyViewChanged() {
-    this.displayedView.removeAttribute("loading");
-
-    if (this.viewChangeCallback) {
-      this.viewChangeCallback();
-      this.viewChangeCallback = null;
-    }
-
-    var event = document.createEvent("Events");
-    event.initEvent("ViewChanged", true, true);
-    this.currentViewObj.node.dispatchEvent(event);
-  },
-
-  onEvent() {},
 };
 
 var gCategories = {
@@ -491,7 +242,7 @@
     gViewController.loadInitialView(viewId);
   },
   replaceWithDefaultViewFn() {
-    gViewController.replaceView(gViewDefault);
+    gViewController.replaceView(gViewController.defaultViewId);
   },
   get shouldLoadInitialView() {
     // Let the HTML document load the view if `loadView` hasn't been called
@@ -536,33 +287,6 @@
   return browser;
 }
 
-function htmlView(type) {
-  return {
-    _browser: null,
-    node: null,
-
-    initialize() {
-      this._browser = getHtmlBrowser();
-      this.node = this._browser.closest("#html-view");
-    },
-
-    async show(param, request, state) {
-      await promiseHtmlBrowserLoaded();
-      await this._browser.contentWindow.show(type, param, state);
-      gViewController.notifyViewChanged();
-    },
-
-    async hide() {
-      await promiseHtmlBrowserLoaded();
-      return this._browser.contentWindow.hide();
-    },
-
-    getSelectedAddon() {
-      return null;
-    },
-  };
-}
-
 // Helper method exported into the about:addons global, used to open the
 // abuse report panel from outside of the about:addons page
 // (e.g. triggered from the browserAction context menu).
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/extensions.xhtml firefox-85.0+build1/toolkit/mozapps/extensions/content/extensions.xhtml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/extensions.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/extensions.xhtml	2021-01-18 19:58:27.000000000 +0000
@@ -19,21 +19,5 @@
   <script src="chrome://mozapps/content/extensions/aboutaddonsCommon.js"/>
   <script src="chrome://mozapps/content/extensions/extensions.js"/>
 
-  <stack id="main-page-stack" flex="1">
-  <hbox id="main-page-content" flex="1">
-    <vbox flex="1">
-      <!-- view port -->
-      <deck id="view-port" flex="1" selectedIndex="0">
-        <!-- container for views with the search/tools header -->
-        <vbox id="headered-views" flex="1">
-          <deck id="headered-views-content" flex="1" selectedIndex="0">
-            <vbox id="html-view" flex="1">
-              <browser id="html-view-browser" type="content" flex="1" disablehistory="true"/>
-            </vbox>
-          </deck>
-        </vbox>
-      </deck>
-    </vbox>
-  </hbox>
-  </stack>
+  <browser id="html-view-browser" type="content" flex="1" disablehistory="true"/>
 </window>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/pluginPrefs.js firefox-85.0+build1/toolkit/mozapps/extensions/content/pluginPrefs.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/pluginPrefs.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/pluginPrefs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
-const PREFS = {
-  pluginFlashBlockingCheckbox: {
-    pref: "plugins.flashBlock.enabled",
-    invert: false,
-  },
-  pluginEnableProtectedModeCheckbox: {
-    pref: "dom.ipc.plugins.flash.disable-protected-mode",
-    invert: true,
-  },
-};
-
-async function renderPluginMetadata(id) {
-  let plugin = await AddonManager.getAddonByID(id);
-  if (!plugin) {
-    return;
-  }
-
-  let libLabel = document.getElementById("pluginLibraries");
-  libLabel.textContent = plugin.pluginLibraries.join(", ");
-
-  let typeLabel = document.getElementById("pluginMimeTypes"),
-    types = [];
-  for (let type of plugin.pluginMimeTypes) {
-    let extras = [type.description.trim(), type.suffixes]
-      .filter(x => x)
-      .join(": ");
-    types.push(type.type + (extras ? " (" + extras + ")" : ""));
-  }
-  typeLabel.textContent = types.join(",\n");
-  let showProtectedModePref = canDisableFlashProtectedMode(plugin);
-  document.getElementById(
-    "pluginEnableProtectedMode"
-  ).hidden = !showProtectedModePref;
-
-  // Disable flash blocking when Fission is enabled (See Bug 1584931).
-  document.getElementById(
-    "pluginFlashBlocking"
-  ).hidden = canDisableFlashBlocking();
-}
-
-// Protected mode is win32-only, not win64
-function canDisableFlashProtectedMode(aPlugin) {
-  return aPlugin.isFlashPlugin && Services.appinfo.XPCOMABI == "x86-msvc";
-}
-
-function canDisableFlashBlocking() {
-  return Services.appinfo.fissionAutostart;
-}
-
-function init() {
-  let params = new URLSearchParams(location.hash.slice(1));
-  renderPluginMetadata(params.get("id"));
-
-  for (let id of Object.keys(PREFS)) {
-    let checkbox = document.getElementById(id);
-    var prefVal = Services.prefs.getBoolPref(PREFS[id].pref);
-    checkbox.checked = PREFS[id].invert ? !prefVal : prefVal;
-    checkbox.addEventListener("change", () => {
-      Services.prefs.setBoolPref(
-        PREFS[id].pref,
-        PREFS[id].invert ? !checkbox.checked : checkbox.checked
-      );
-    });
-  }
-}
-
-window.addEventListener("load", init, { once: true });
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/content/pluginPrefs.xhtml firefox-85.0+build1/toolkit/mozapps/extensions/content/pluginPrefs.xhtml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/content/pluginPrefs.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/content/pluginPrefs.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +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/.  -->
-
-<!DOCTYPE html [
-<!ENTITY % pluginsDTD SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
-%pluginsDTD;
-<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
-%extensionsDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <link rel="stylesheet" href="chrome://global/skin/global.css"/>
-  <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"/>
-  <style>
-    :root {
-      background-color: var(--in-content-box-background);
-    }
-
-    #detail-grid {
-      display: grid;
-      grid-template-columns: auto auto;
-      column-gap: 1em;
-      min-height: 250px;
-      align-content: start;
-    }
-
-    .detail-row:not([hidden]) {
-      display: grid;
-      grid-column: span 2;
-      grid-template-columns: subgrid;
-      padding-block: 16px;
-      line-height: 20px;
-    }
-
-    .detail-row:not([hidden]) ~ .detail-row {
-      border-top: 1px solid var(--in-content-box-border-color);
-    }
-
-    #pluginFlashBlocking label,
-    #pluginEnableProtectedMode label {
-      display: block;
-    }
-  </style>
-  <script src="chrome://mozapps/content/extensions/pluginPrefs.js"></script>
-</head>
-<body id="detail-grid">
-  <div class="detail-row">
-    <label>&plugin.file;</label>
-    <label class="text-list" id="pluginLibraries"/>
-  </div>
-  <div class="detail-row">
-    <label>&plugin.mimeTypes;</label>
-    <label class="text-list" id="pluginMimeTypes"/>
-  </div>
-  <div id="pluginFlashBlocking" class="detail-row">
-    <div>
-      <label>&plugin.enableBlocklists.label;</label>
-      <a href="https://support.mozilla.org/kb/flash-blocklists" target="_blank">&setting.learnmore;</a>
-    </div>
-    <input type="checkbox" id="pluginFlashBlockingCheckbox"/>
-  </div>
-  <div id="pluginEnableProtectedMode" class="detail-row">
-    <div>
-      <label>&plugin.flashProtectedMode.label;</label>
-      <a href="https://support.mozilla.org/kb/flash-protected-mode-settings" target="_blank">&setting.learnmore;</a>
-    </div>
-    <input type="checkbox" id="pluginEnableProtectedModeCheckbox"/>
-  </div>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/AddonRepository.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/AddonRepository.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/AddonRepository.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/AddonRepository.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -16,7 +16,6 @@
   Services: "resource://gre/modules/Services.jsm",
   ServiceRequest: "resource://gre/modules/ServiceRequest.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
-  OS: "resource://gre/modules/osfile.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
 });
 
@@ -735,7 +734,10 @@
    * A getter to retrieve the path to the DB
    */
   get jsonFile() {
-    return OS.Path.join(OS.Constants.Path.profileDir, FILE_DATABASE);
+    return PathUtils.join(
+      Services.dirsvc.get("ProfD", Ci.nsIFile).path,
+      FILE_DATABASE
+    );
   },
 
   /**
@@ -749,7 +751,7 @@
         let inputDB, schema;
 
         try {
-          let data = await OS.File.read(this.jsonFile, { encoding: "utf-8" });
+          let data = await IOUtils.readUTF8(this.jsonFile);
           inputDB = JSON.parse(data);
 
           if (
@@ -769,7 +771,7 @@
             throw new Error("Invalid schema value.");
           }
         } catch (e) {
-          if (e instanceof OS.File.Error && e.becauseNoSuchFile) {
+          if (e.name == "NotFoundError") {
             logger.debug("No " + FILE_DATABASE + " found.");
           } else {
             logger.error(
@@ -847,7 +849,7 @@
 
     // shutdown(true) never rejects
     this._deleting = this.shutdown(true)
-      .then(() => OS.File.remove(this.jsonFile, {}))
+      .then(() => IOUtils.remove(this.jsonFile))
       .catch(error =>
         logger.error(
           "Unable to delete Addon Repository file " + this.jsonFile,
@@ -866,7 +868,7 @@
       addons: Array.from(this.DB.addons.values()),
     };
 
-    await OS.File.writeAtomic(this.jsonFile, JSON.stringify(json), {
+    await IOUtils.writeUTF8(this.jsonFile, JSON.stringify(json), {
       tmpPath: `${this.jsonFile}.tmp`,
     });
   },
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -31,42 +31,16 @@
 );
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "AMTelemetry",
-  "resource://gre/modules/AddonManager.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ExtensionTestCommon",
-  "resource://testing-common/ExtensionTestCommon.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "Management",
-  "resource://gre/modules/Extension.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ExtensionAddonObserver",
-  "resource://gre/modules/Extension.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "FileTestUtils",
-  "resource://testing-common/FileTestUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "HttpServer",
-  "resource://testing-common/httpd.js"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "MockRegistrar",
-  "resource://testing-common/MockRegistrar.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  AMTelemetry: "resource://gre/modules/AddonManager.jsm",
+  ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.jsm",
+  Management: "resource://gre/modules/Extension.jsm",
+  ExtensionAddonObserver: "resource://gre/modules/Extension.jsm",
+  FileTestUtils: "resource://testing-common/FileTestUtils.jsm",
+  HttpServer: "resource://testing-common/httpd.js",
+  L10nRegistry: "resource://gre/modules/L10nRegistry.jsm",
+  MockRegistrar: "resource://testing-common/MockRegistrar.jsm",
+});
 
 XPCOMUtils.defineLazyServiceGetters(this, {
   aomStartup: [
@@ -1034,6 +1008,9 @@
       null
     );
 
+    // Ensure some startup observers in XPIProvider are released.
+    Services.obs.notifyObservers(null, "test-load-xpi-database");
+
     Services.obs.notifyObservers(null, "quit-application-granted");
     await MockAsyncShutdown.quitApplicationGranted.trigger();
 
@@ -1059,6 +1036,9 @@
       Services.obs.notifyObservers(file, "flush-cache-entry");
     }
 
+    // Clear L10nRegistry entries so restaring the AOM will work correctly with locales.
+    L10nRegistry.clearSources();
+
     // Clear any crash report annotations
     this.appInfo.annotations = {};
 
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/GMPProvider.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -13,7 +13,6 @@
   "resource://gre/modules/AddonManager.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
 // These symbols are, unfortunately, accessed via the module global from
 // tests, and therefore cannot be lexical definitions.
@@ -151,8 +150,8 @@
   },
   get gmpPath() {
     if (!this._gmpPath && this.isInstalled) {
-      this._gmpPath = OS.Path.join(
-        OS.Constants.Path.profileDir,
+      this._gmpPath = PathUtils.join(
+        Services.dirsvc.get("ProfD", Ci.nsIFile).path,
         this._plugin.id,
         GMPPrefs.getString(GMPPrefs.KEY_PLUGIN_VERSION, null, this._plugin.id)
       );
@@ -451,8 +450,8 @@
   },
   get pluginFullpath() {
     if (this.isInstalled) {
-      let path = OS.Path.join(
-        OS.Constants.Path.profileDir,
+      let path = PathUtils.join(
+        Services.dirsvc.get("ProfD", Ci.nsIFile).path,
         this._plugin.id,
         this.version
       );
@@ -587,8 +586,8 @@
     AddonManagerPrivate.callAddonListeners("onInstalling", this, false);
     this._gmpPath = null;
     if (this.isInstalled) {
-      this._gmpPath = OS.Path.join(
-        OS.Constants.Path.profileDir,
+      this._gmpPath = PathUtils.join(
+        Services.dirsvc.get("ProfD", Ci.nsIFile).path,
         this._plugin.id,
         GMPPrefs.getString(GMPPrefs.KEY_PLUGIN_VERSION, null, this._plugin.id)
       );
@@ -656,7 +655,7 @@
   _arePluginFilesOnDisk() {
     let fileExists = function(aGmpPath, aFileName) {
       let f = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-      let path = OS.Path.join(aGmpPath, aFileName);
+      let path = PathUtils.join(aGmpPath, aFileName);
       f.initWithPath(path);
       return f.exists();
     };
@@ -772,9 +771,9 @@
       let greDir = Services.dirsvc.get(NS_GRE_DIR, Ci.nsIFile);
       let path = greDir.path;
       if (GMPUtils._isWindowsOnARM64()) {
-        path = OS.Path.join(path, "i686");
+        path = PathUtils.join(path, "i686");
       }
-      let clearkeyPath = OS.Path.join(
+      let clearkeyPath = PathUtils.join(
         path,
         CLEARKEY_PLUGIN_ID,
         CLEARKEY_VERSION
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/PluginProvider.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/PluginProvider.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/PluginProvider.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/PluginProvider.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -467,47 +467,15 @@
   },
 
   get permissions() {
-    let {
-      tags: [tag],
-    } = pluginFor(this);
-    let permissions = 0;
-    if (tag.isEnabledStateLocked) {
-      return permissions;
-    }
-    if (!this.appDisabled) {
-      if (this.userDisabled !== true) {
-        permissions |= AddonManager.PERM_CAN_DISABLE;
-      }
-
-      if (this.userDisabled !== AddonManager.STATE_ASK_TO_ACTIVATE) {
-        permissions |= AddonManager.PERM_CAN_ASK_TO_ACTIVATE;
-      }
-
-      let blocklistState = this.blocklistState;
-      let isCTPBlocklisted =
-        blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE ||
-        blocklistState ==
-          Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE;
-      if (
-        this.userDisabled !== false &&
-        !isCTPBlocklisted &&
-        !this.isFlashPlugin
-      ) {
-        permissions |= AddonManager.PERM_CAN_ENABLE;
-      }
-    }
-    return permissions;
+    return 0;
   },
 
   get optionsType() {
-    return AddonManager.OPTIONS_TYPE_INLINE_BROWSER;
+    return null;
   },
 
   get optionsURL() {
-    return (
-      "chrome://mozapps/content/extensions/pluginPrefs.xhtml#id=" +
-      encodeURIComponent(this.id)
-    );
+    return null;
   },
 
   get updateDate() {
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIDatabase.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIDatabase.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIDatabase.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -959,10 +959,12 @@
 
   get canBypassThirdParyInstallPrompt() {
     // We only bypass if the extension is signed (to support distributions
-    // that turn off the signing requirement) and has recommendation states.
+    // that turn off the signing requirement) and has recommendation states,
+    // or the extension is signed as privileged.
     return (
-      this.signedState >= AddonManager.SIGNEDSTATE_SIGNED &&
-      this.recommendationStates.length
+      this.signedState == AddonManager.SIGNEDSTATE_PRIVILEGED ||
+      (this.signedState >= AddonManager.SIGNEDSTATE_SIGNED &&
+        this.recommendationStates.length)
     );
   }
 
@@ -2926,9 +2928,8 @@
    *        The new state of the add-on
    * @param {AddonInternal?} [aNewAddon]
    *        The manifest for the new add-on if it has already been loaded
-   * @returns {boolean?}
-   *        A boolean indicating if flushing caches is required to complete
-   *        changing this add-on
+   * @returns {AddonInternal}
+   *        The AddonInternal that was added to the database
    */
   updateMetadata(aLocation, aOldAddon, aAddonState, aNewAddon) {
     logger.debug(`Add-on ${aOldAddon.id} modified in ${aLocation.name}`);
@@ -2972,6 +2973,8 @@
     // Set the additional properties on the new AddonInternal
     aNewAddon.updateDate = aAddonState.mtime;
 
+    XPIProvider.persistStartupData(aNewAddon, aAddonState);
+
     // Update the database
     return XPIDatabase.updateAddonMetadata(
       aOldAddon,
@@ -3436,8 +3439,23 @@
           id
         );
 
+        // Bug 1664144:  If the addon changed on disk we will catch it during
+        // the second scan initiated by getNewSideloads.  The addon may have
+        // already started, if so we need to ensure it restarts during the
+        // update, otherwise we're left in a state where the addon is enabled
+        // but not started.  We use the bootstrap started state to check that.
+        // isActive alone is not sufficient as that changes the characteristics
+        // of other updates and breaks many tests.
+        let restart =
+          isActive && XPIInternal.BootstrapScope.get(currentAddon).started;
+        if (restart) {
+          logger.warn(
+            `Updating and restart addon ${previousAddon.id} that changed on disk after being already started.`
+          );
+        }
         promise = XPIInternal.BootstrapScope.get(previousAddon).update(
-          currentAddon
+          currentAddon,
+          restart
         );
       }
 
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIInstall.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIInstall.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIInstall.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIInstall.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -3574,6 +3574,7 @@
     }
 
     async function postponeAddon(install) {
+      install.ownsTempFile = true;
       let resumeFn;
       if (AddonManagerPrivate.hasUpgradeListener(install.addon.id)) {
         logger.info(
@@ -4073,8 +4074,8 @@
         if (sourceAddon && sourceAddon.version == item.spec.version) {
           // Copying the file to a temporary location has some benefits. If the
           // file is locked and cannot be read then we'll fall back to
-          // downloading a fresh copy. It also means we don't have to remember
-          // whether to delete the temporary copy later.
+          // downloading a fresh copy. We later mark the install object with
+          // ownsTempFile so that we will cleanup later (see installAddonSet).
           try {
             let path = OS.Path.join(OS.Constants.Path.tmpDir, "tmpaddon");
             let unique = await OS.File.openUnique(path);
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIProvider.jsm firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -189,18 +189,6 @@
 // (Requires AddonManager.jsm)
 var logger = Log.repository.getLogger(LOGGER_ID);
 
-XPCOMUtils.defineLazyGetter(this, "gStartupScanScopes", () => {
-  let appBuildID = Services.appinfo.appBuildID;
-  let oldAppBuildID = Services.prefs.getCharPref(PREF_EM_LAST_APP_BUILD_ID, "");
-  Services.prefs.setCharPref(PREF_EM_LAST_APP_BUILD_ID, appBuildID);
-  if (appBuildID !== oldAppBuildID) {
-    // If the build id changed, scan all scopes
-    return AddonManager.SCOPE_ALL;
-  }
-
-  return Services.prefs.getIntPref(PREF_EM_STARTUP_SCAN_SCOPES, 0);
-});
-
 /**
  * Spins the event loop until the given promise resolves, and then eiter returns
  * its success value or throws its rejection value.
@@ -791,6 +779,8 @@
       addon
     );
 
+    XPIProvider.persistStartupData(addon);
+
     let xpiState = this._addState(addon.id, { file: addon._sourceBundle });
     xpiState.syncWithDB(addon, true);
 
@@ -1443,6 +1433,24 @@
     let changed = false;
     let oldLocations = new Set(Object.keys(oldState));
 
+    let startupScanScopes;
+    if (
+      Services.appinfo.appBuildID ==
+      Services.prefs.getCharPref(PREF_EM_LAST_APP_BUILD_ID, "")
+    ) {
+      startupScanScopes = Services.prefs.getIntPref(
+        PREF_EM_STARTUP_SCAN_SCOPES,
+        0
+      );
+    } else {
+      // If the build id has changed, we need to do a full scan on first startup.
+      Services.prefs.setCharPref(
+        PREF_EM_LAST_APP_BUILD_ID,
+        Services.appinfo.appBuildID
+      );
+      startupScanScopes = AddonManager.SCOPE_ALL;
+    }
+
     for (let loc of XPIStates.locations()) {
       oldLocations.delete(loc.name);
 
@@ -1452,7 +1460,7 @@
       changed = changed || loc.changed;
 
       // Don't bother checking scopes where we don't accept side-loads.
-      if (ignoreSideloads && !(loc.scope & gStartupScanScopes)) {
+      if (ignoreSideloads && !(loc.scope & startupScanScopes)) {
         continue;
       }
 
@@ -3103,6 +3111,25 @@
     XPIStates.save();
   },
 
+  /**
+   * Persists some startupData into an addon if it is available in the current
+   * XPIState for the addon id.
+   *
+   * @param {AddonInternal} addon An addon to receive the startup data, typically an update that is occuring.
+   * @param {XPIState} state optional
+   */
+  persistStartupData(addon, state) {
+    if (!addon.startupData) {
+      state = state || XPIStates.findAddon(addon.id);
+      if (state?.enabled) {
+        // Save persistent listener data if available.  It will be
+        // removed later if necessary.
+        let persistentListeners = state.startupData?.persistentListeners;
+        addon.startupData = { persistentListeners };
+      }
+    }
+  },
+
   getAddonIDByInstanceID(aInstanceID) {
     if (!aInstanceID || typeof aInstanceID != "symbol") {
       throw Components.Exception(
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/jar.mn firefox-85.0+build1/toolkit/mozapps/extensions/jar.mn
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/jar.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/jar.mn	2021-01-18 19:58:27.000000000 +0000
@@ -9,8 +9,6 @@
   content/mozapps/extensions/extensions.js                      (content/extensions.js)
   content/mozapps/extensions/blocklist.xhtml                    (content/blocklist.xhtml)
   content/mozapps/extensions/blocklist.js                       (content/blocklist.js)
-  content/mozapps/extensions/pluginPrefs.xhtml                  (content/pluginPrefs.xhtml)
-  content/mozapps/extensions/pluginPrefs.js                     (content/pluginPrefs.js)
   content/mozapps/extensions/OpenH264-license.txt               (content/OpenH264-license.txt)
   content/mozapps/extensions/aboutaddons.html                   (content/aboutaddons.html)
   content/mozapps/extensions/aboutaddons.js                     (content/aboutaddons.js)
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_CTP_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,261 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Test plugin blocking.
-
-const gHttpTestRoot = "http://127.0.0.1:8888/" + RELATIVE_DIR + "/";
-const { AddonTestUtils } = ChromeUtils.import(
-  "resource://testing-common/AddonTestUtils.jsm"
-);
-
-function updateBlocklist(aURL, aCallback) {
-  var observer = function() {
-    Services.obs.removeObserver(observer, "plugin-blocklist-updated");
-    SimpleTest.executeSoon(aCallback);
-  };
-  Services.obs.addObserver(observer, "plugin-blocklist-updated");
-  info("Loading plugin data " + aURL);
-  if (aURL.endsWith("blockNoPlugins")) {
-    AddonTestUtils.loadBlocklistRawData({ plugins: [] });
-  } else if (aURL.endsWith("blockPluginHard")) {
-    AddonTestUtils.loadBlocklistRawData({
-      plugins: [
-        {
-          matchFilename: "libnptest\\.so|nptest\\.dll|Test\\.plugin",
-          versionRange: [{ severity: "2" }],
-          blockID: "p9999",
-        },
-      ],
-    });
-  } else {
-    ok(false, "Should never be asked to update to unknown blocklist data.");
-  }
-}
-
-function setPluginActivateState({ managerWindow, pluginId, activateState }) {
-  let pluginEl = get_addon_element(managerWindow, pluginId);
-  ok(pluginEl, `Got the about:addon entry for "${pluginId}"`);
-
-  // Activate plugin on the HTML about:addons views.
-  let activateAction = pluginEl.querySelector(`[action="${activateState}"]`);
-  ok(activateAction, `Got element for ${activateState} plugin action`);
-  activateAction.click();
-}
-
-async function getTestPluginAddon() {
-  const plugins = await AddonManager.getAddonsByTypes(["plugin"]);
-
-  for (const plugin of plugins) {
-    if (plugin.name == "Test Plug-in") {
-      return plugin;
-    }
-  }
-
-  return undefined;
-}
-
-add_task(async function test_CTP_plugins() {
-  let pluginTag = getTestPluginTag();
-  pluginTag.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  let managerWindow = await open_manager("addons://list/plugin");
-
-  let testPluginAddon = await getTestPluginAddon();
-  isnot(testPluginAddon, null, "part2: Test Plug-in should exist");
-
-  let testPluginId = testPluginAddon.id;
-
-  let pluginEl = get_addon_element(managerWindow, testPluginId);
-  ok(pluginEl, `Got the about:addon entry for "${testPluginId}"`);
-
-  info("part3: test plugin add-on actions status");
-
-  let pluginOptions = pluginEl.querySelector("plugin-options");
-  let pluginCheckedItem = pluginOptions.querySelector("panel-item[checked]");
-  is(
-    pluginCheckedItem.getAttribute("action"),
-    "ask-to-activate",
-    "plugin should have ask-to-activate state selected"
-  );
-
-  let pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gHttpTestRoot + "plugin_test.html"
-  );
-  let pluginBrowser = pluginTab.linkedBrowser;
-
-  let condition = () =>
-    PopupNotifications.getNotification("click-to-play-plugins", pluginBrowser);
-  await BrowserTestUtils.waitForCondition(
-    condition,
-    "part4: should have a click-to-play notification"
-  );
-
-  BrowserTestUtils.removeTab(pluginTab);
-
-  setPluginActivateState({
-    managerWindow,
-    pluginId: testPluginId,
-    activateState: "always-activate",
-  });
-
-  pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gHttpTestRoot + "plugin_test.html"
-  );
-
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let testPlugin = content.document.getElementById("test");
-    ok(testPlugin, "part5: should have a plugin element in the page");
-    let condition = () => testPlugin.activated;
-    await ContentTaskUtils.waitForCondition(
-      condition,
-      "part5: waited too long for plugin to activate"
-    );
-    ok(testPlugin.activated, "part6: plugin should be activated");
-  });
-
-  BrowserTestUtils.removeTab(pluginTab);
-
-  setPluginActivateState({
-    managerWindow,
-    pluginId: testPluginId,
-    activateState: "never-activate",
-  });
-
-  pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gHttpTestRoot + "plugin_test.html"
-  );
-  pluginBrowser = pluginTab.linkedBrowser;
-
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let testPlugin = content.document.getElementById("test");
-    ok(testPlugin, "part7: should have a plugin element in the page");
-    ok(!testPlugin.activated, "part7: plugin should not be activated");
-  });
-
-  BrowserTestUtils.removeTab(pluginTab);
-
-  info("part8: test plugin state is never-activate");
-  pluginEl = get_addon_element(managerWindow, testPluginId);
-
-  pluginOptions = pluginEl.querySelector("plugin-options");
-  const pluginCheckItem = pluginOptions.querySelector("panel-item[checked]");
-  is(
-    pluginCheckItem.getAttribute("action"),
-    "never-activate",
-    "plugin should have never-activate state selected"
-  );
-
-  info("part9: set plugin state to always-activate");
-  setPluginActivateState({
-    managerWindow,
-    pluginId: testPluginId,
-    activateState: "always-activate",
-  });
-
-  pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gHttpTestRoot + "plugin_test.html"
-  );
-  pluginBrowser = pluginTab.linkedBrowser;
-
-  await SpecialPowers.spawn(pluginTab.linkedBrowser, [], async function() {
-    let testPlugin = content.document.getElementById("test");
-    ok(testPlugin, "part9: should have a plugin element in the page");
-    let condition = () => testPlugin.activated;
-    await ContentTaskUtils.waitForCondition(
-      condition,
-      "part9: waited too long for plugin to activate"
-    );
-    ok(testPlugin.activated, "part10: plugin should be activated");
-  });
-
-  BrowserTestUtils.removeTab(pluginTab);
-
-  setPluginActivateState({
-    managerWindow,
-    pluginId: testPluginId,
-    activateState: "ask-to-activate",
-  });
-
-  pluginTab = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    gHttpTestRoot + "plugin_test.html"
-  );
-  pluginBrowser = pluginTab.linkedBrowser;
-
-  condition = () =>
-    PopupNotifications.getNotification("click-to-play-plugins", pluginBrowser);
-  await BrowserTestUtils.waitForCondition(
-    condition,
-    "part11: should have a click-to-play notification"
-  );
-
-  BrowserTestUtils.removeTab(pluginTab);
-  await close_manager(managerWindow);
-});
-
-add_task(async function test_blocklisted_plugin_disabled() {
-  async function ensurePluginEnabled() {
-    let pluginTag = getTestPluginTag();
-    pluginTag.enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-    await new Promise(resolve => {
-      updateBlocklist(gHttpTestRoot + "blockNoPlugins", resolve);
-    });
-  }
-
-  await SpecialPowers.pushPrefEnv({
-    set: [["extensions.blocklist.suppressUI", true]],
-  });
-
-  // Causes appDisabled to be set.
-  await new Promise(resolve => {
-    // Ensure to reset the blocklist if this test exits earlier because
-    // of a failure.
-    registerCleanupFunction(ensurePluginEnabled);
-    updateBlocklist(gHttpTestRoot + "blockPluginHard", resolve);
-  });
-
-  await checkPlugins();
-
-  // Using flushPrefEnv instead of 2x popPrefEnv to work around bug 1557397.
-  await SpecialPowers.flushPrefEnv();
-});
-
-async function checkPlugins() {
-  let testPluginAddon = await getTestPluginAddon();
-  isnot(testPluginAddon, null, "Test Plug-in should exist");
-  let testPluginId = testPluginAddon.id;
-
-  let managerWindow = await open_manager("addons://list/plugin");
-
-  let pluginEl = get_addon_element(managerWindow, testPluginId);
-  ok(pluginEl, `Got about:addons entry for ${testPluginId}`);
-
-  // Open the options menu (needed to check the disabled buttons).
-  const pluginOptions = pluginEl.querySelector("plugin-options");
-  pluginOptions.querySelector("panel-list").open = true;
-
-  // tests all buttons disabled (besides the checked one and the expand action)
-  // are expected to be disabled if locked is true.
-  for (const item of pluginOptions.querySelectorAll(
-    "panel-item:not([hidden])"
-  )) {
-    const actionName = item.getAttribute("action");
-    if (
-      !item.hasAttribute("checked") &&
-      actionName !== "expand" &&
-      actionName !== "preferences"
-    ) {
-      ok(
-        item.shadowRoot.querySelector("button").disabled,
-        `Plugin action "${actionName}" should be disabled`
-      );
-    }
-  }
-  pluginOptions.querySelector("panel-list").open = false;
-
-  await close_manager(managerWindow);
-}
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_extension_sideloading_permission.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/*
- * Test Permission Popup for Sideloaded Extensions.
- */
-const { AddonTestUtils } = ChromeUtils.import(
-  "resource://testing-common/AddonTestUtils.jsm"
-);
-const ADDON_ID = "addon1@test.mozilla.org";
-
-AddonTestUtils.initMochitest(this);
-
-function assertDisabledSideloadedExtensionElement(managerWindow, addonElement) {
-  const doc = addonElement.ownerDocument;
-  const toggleDisabled = addonElement.querySelector(
-    '[action="toggle-disabled"]'
-  );
-  is(
-    doc.l10n.getAttributes(toggleDisabled).id,
-    "extension-enable-addon-button-label",
-    "Addon toggle-disabled action has the enable label"
-  );
-  ok(!toggleDisabled.checked, "toggle-disable isn't checked");
-}
-
-function assertEnabledSideloadedExtensionElement(managerWindow, addonElement) {
-  const doc = addonElement.ownerDocument;
-  const toggleDisabled = addonElement.querySelector(
-    '[action="toggle-disabled"]'
-  );
-  is(
-    doc.l10n.getAttributes(toggleDisabled).id,
-    "extension-enable-addon-button-label",
-    "Addon toggle-disabled action has the enable label"
-  );
-  ok(!toggleDisabled.checked, "toggle-disable isn't checked");
-}
-
-function clickEnableExtension(managerWindow, addonElement) {
-  addonElement.querySelector('[action="toggle-disabled"]').click();
-}
-
-// Loading extension by sideloading method
-add_task(async function test_sideloaded_extension_permissions_prompt() {
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["xpinstall.signatures.required", false],
-      ["extensions.autoDisableScopes", 15],
-      ["extensions.ui.ignoreUnsigned", true],
-    ],
-  });
-
-  let options = {
-    manifest: {
-      applications: { gecko: { id: ADDON_ID } },
-      name: "Test 1",
-      permissions: ["history", "https://*/*"],
-      icons: { "64": "foo-icon.png" },
-    },
-  };
-
-  let xpi = AddonTestUtils.createTempWebExtensionFile(options);
-  await AddonTestUtils.manuallyInstall(xpi);
-
-  let changePromise = new Promise(resolve =>
-    ExtensionsUI.once("change", resolve)
-  );
-  ExtensionsUI._checkForSideloaded();
-  await changePromise;
-
-  // Test click event on permission cancel option.
-  let manager = await open_manager("addons://list/extension");
-  let addon = get_addon_element(manager, ADDON_ID);
-
-  Assert.notEqual(addon, null, "Found sideloaded addon in about:addons");
-
-  assertDisabledSideloadedExtensionElement(manager, addon);
-
-  let popupPromise = promisePopupNotificationShown("addon-webext-permissions");
-  clickEnableExtension(manager, addon);
-  let panel = await popupPromise;
-
-  ok(PopupNotifications.isPanelOpen, "Permission popup should be visible");
-  panel.secondaryButton.click();
-  ok(
-    !PopupNotifications.isPanelOpen,
-    "Permission popup should be closed / closing"
-  );
-
-  addon = await AddonManager.getAddonByID(ADDON_ID);
-  ok(
-    !addon.seen,
-    "Seen flag should remain false after permissions are refused"
-  );
-
-  // Test click event on permission accept option.
-  addon = get_addon_element(manager, ADDON_ID);
-  Assert.notEqual(addon, null, "Found sideloaded addon in about:addons");
-
-  assertEnabledSideloadedExtensionElement(manager, addon);
-
-  popupPromise = promisePopupNotificationShown("addon-webext-permissions");
-  clickEnableExtension(manager, addon);
-  panel = await popupPromise;
-
-  ok(PopupNotifications.isPanelOpen, "Permission popup should be visible");
-
-  let notificationPromise = acceptAppMenuNotificationWhenShown(
-    "addon-installed",
-    ADDON_ID
-  );
-
-  panel.button.click();
-  ok(
-    !PopupNotifications.isPanelOpen,
-    "Permission popup should be closed / closing"
-  );
-  await notificationPromise;
-
-  addon = await AddonManager.getAddonByID(ADDON_ID);
-  ok(addon.seen, "Seen flag should be true after permissions are accepted");
-
-  ok(!PopupNotifications.isPanelOpen, "Permission popup should not be visible");
-
-  await close_manager(manager);
-  await addon.uninstall();
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_history_navigation.js	2021-01-18 19:58:27.000000000 +0000
@@ -75,11 +75,6 @@
     "Should be on the right category"
   );
 
-  is(
-    get_current_view(aManager).id,
-    "html-view",
-    "the current view should be set to the HTML about:addons browser"
-  );
   doc = aManager.getHtmlBrowser().contentDocument;
   ok(
     doc.querySelector("addon-list"),
@@ -99,11 +94,6 @@
     "Should be on the right category"
   );
 
-  is(
-    get_current_view(aManager).id,
-    "html-view",
-    "the current view should be set to the HTML about:addons browser"
-  );
   doc = aManager.getHtmlBrowser().contentDocument;
   is(
     doc.querySelectorAll("addon-card").length,
@@ -115,11 +105,6 @@
 }
 
 function is_in_discovery(aManager, canGoBack, canGoForward) {
-  is(
-    get_current_view(aManager).id,
-    "html-view",
-    "the current view should be set to the HTML about:addons browser"
-  );
   const doc = aManager.getHtmlBrowser().contentDocument;
   ok(
     doc.querySelector("discovery-pane"),
@@ -199,7 +184,7 @@
   ok(!gBrowser.canGoBack, "Should not be able to go back");
   ok(!gBrowser.canGoForward, "Should not be able to go forward");
 
-  await BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:addons");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "about:addons");
   await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
 
   let manager = await wait_for_manager_load(gBrowser.contentWindow);
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_html_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-/* eslint max-len: ["error", 80] */
-
-"use strict";
-
-const TEST_PLUGIN_DESCRIPTION = "Flash plug-in for testing purposes.";
-
-add_task(async function enableHtmlViews() {
-  let gProvider = new MockProvider();
-  gProvider.createAddons([
-    {
-      id: "no-ask-to-activate@mochi.test",
-      name: "No ask to activate",
-      getFullDescription(doc) {
-        let a = doc.createElement("a");
-        a.textContent = "A link";
-        a.href = "http://example.com/no-ask-to-activate";
-        return a;
-      },
-      type: "plugin",
-    },
-  ]);
-
-  Services.telemetry.clearEvents();
-});
-
-add_task(async function testAskToActivate() {
-  function checkItems(items, checked) {
-    for (let item of items) {
-      let action = item.getAttribute("action");
-      ok(!item.disabled, `${action} is enabled`);
-      if (action == checked) {
-        ok(item.checked, `${action} is checked`);
-      } else {
-        ok(!item.checked, `${action} isn't checked`);
-      }
-    }
-  }
-
-  let plugins = await AddonManager.getAddonsByTypes(["plugin"]);
-  let flash = plugins.find(
-    plugin => plugin.description == TEST_PLUGIN_DESCRIPTION
-  );
-  let addonId = flash.id;
-
-  // Reset to default value.
-  flash.userDisabled = AddonManager.STATE_ASK_TO_ACTIVATE;
-
-  let win = await loadInitialView("plugin");
-  let doc = win.document;
-
-  let card = doc.querySelector(`addon-card[addon-id="${flash.id}"]`);
-  let panelItems = card.querySelectorAll("panel-item:not([hidden])");
-  let actions = Array.from(panelItems).map(item => item.getAttribute("action"));
-  Assert.deepEqual(
-    actions,
-    ["ask-to-activate", "never-activate", "preferences", "expand"],
-    "The panel items are for a plugin"
-  );
-
-  checkItems(panelItems, "ask-to-activate");
-
-  is(
-    flash.userDisabled,
-    AddonManager.STATE_ASK_TO_ACTIVATE,
-    "Flash is ask-to-activate"
-  );
-  ok(flash.isActive, "Flash is active");
-
-  // Switch to never activate.
-  let updated = BrowserTestUtils.waitForEvent(card, "update");
-  card.querySelector("panel-item[action*=never]").click();
-  await updated;
-  checkItems(panelItems, "never-activate");
-  ok(flash.userDisabled, `Flash is not userDisabled... for some reason`);
-  ok(!flash.isActive, "Flash isn't active");
-
-  // Switch it back to ask to activate.
-  updated = BrowserTestUtils.waitForEvent(card, "update");
-  card.querySelector("panel-item[action*=ask]").click();
-  await updated;
-  checkItems(panelItems, "ask-to-activate");
-  is(
-    flash.userDisabled,
-    AddonManager.STATE_ASK_TO_ACTIVATE,
-    "Flash is ask-to-activate"
-  );
-  ok(flash.isActive, "Flash is active");
-
-  // Check the detail view, too.
-  let loaded = waitForViewLoad(win);
-  card.querySelector("[action=expand]").click();
-  await loaded;
-
-  card = doc.querySelector("addon-card");
-  panelItems = card.querySelectorAll("panel-item");
-  checkItems(panelItems, "ask-to-activate");
-
-  await closeView(win);
-
-  assertAboutAddonsTelemetryEvents([
-    ["addonsManager", "view", "aboutAddons", "list", { type: "plugin" }],
-    [
-      "addonsManager",
-      "action",
-      "aboutAddons",
-      null,
-      { type: "plugin", addonId, view: "list", action: "disable" },
-    ],
-    // Ask-to-activate doesn't trigger a telemetry event.
-    [
-      "addonsManager",
-      "view",
-      "aboutAddons",
-      "detail",
-      { type: "plugin", addonId },
-    ],
-  ]);
-});
-
-add_task(async function testNoAskToActivate() {
-  function checkItems(menuItems) {
-    for (let item of menuItems) {
-      let action = item.getAttribute("action");
-      if (action === "ask-to-activate") {
-        ok(item.disabled, "ask-to-activate is disabled");
-      } else {
-        ok(!item.disabled, `${action} is enabled`);
-      }
-    }
-  }
-
-  let win = await loadInitialView("plugin");
-  let doc = win.document;
-
-  let id = "no-ask-to-activate@mochi.test";
-  let card = doc.querySelector(`addon-card[addon-id="${id}"]`);
-  ok(card, "The card was found");
-
-  let menuItems = card.querySelectorAll("panel-item:not([hidden])");
-  checkItems(menuItems);
-
-  // There's no preferences option.
-  let actions = Array.from(menuItems).map(item => item.getAttribute("action"));
-  Assert.deepEqual(
-    actions,
-    ["ask-to-activate", "always-activate", "never-activate", "expand"],
-    "The panel items are for a plugin"
-  );
-
-  // Open the details page.
-  let loaded = waitForViewLoad(win);
-  card.querySelector('[action="expand"]').click();
-  await loaded;
-
-  card = doc.querySelector("addon-card");
-  is(card.addon.id, id, "The right plugin page was loaded");
-
-  // Check that getFullDescription() will set the description.
-  let description = card.querySelector(".addon-detail-description");
-  is(description.childElementCount, 1, "The description has one element");
-  let link = description.firstElementChild;
-  is(link.localName, "a", "The element is a link");
-  is(link.href, "http://example.com/no-ask-to-activate", "The href is set");
-  is(link.textContent, "A link", "The text is set");
-
-  menuItems = card.querySelectorAll("panel-item:not([hidden])");
-  checkItems(menuItems);
-
-  // There's no preferences option, and expand is now hidden.
-  actions = Array.from(menuItems).map(item => item.getAttribute("action"));
-  Assert.deepEqual(
-    actions,
-    ["ask-to-activate", "always-activate", "never-activate"],
-    "The panel items are for a detail page plugin"
-  );
-
-  await closeView(win);
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser.ini firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser.ini
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -42,8 +42,6 @@
   addons/browser_theme.xpi
   addons/options_signed.xpi
 
-[browser_CTP_plugins.js]
-tags = blocklist
 [browser_about_debugging_link.js]
 [browser_addon_list_reordering.js]
 [browser_bug523784.js]
@@ -52,7 +50,7 @@
 [browser_checkAddonCompatibility.js]
 [browser_dragdrop.js]
 skip-if = true # Bug 1626824
-[browser_extension_sideloading_permission.js]
+[browser_permission_prompt.js]
 [browser_file_xpi_no_process_switch.js]
 [browser_globalwarnings.js]
 [browser_gmpProvider.js]
@@ -75,8 +73,6 @@
 [browser_html_options_ui.js]
 [browser_html_options_ui_in_tab.js]
 [browser_html_pending_updates.js]
-[browser_html_plugins.js]
-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]
@@ -95,7 +91,6 @@
 [browser_page_options_updates.js]
 [browser_panel_item_accesskey.js]
 [browser_panel_list_accessibility.js]
-[browser_pluginprefs.js]
 [browser_reinstall.js]
 [browser_search_bar_focus.js]
 [browser_shortcuts_duplicate_check.js]
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_permission_prompt.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,178 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * Test Permission Popup for Sideloaded Extensions.
+ */
+const { AddonTestUtils } = ChromeUtils.import(
+  "resource://testing-common/AddonTestUtils.jsm"
+);
+const ADDON_ID = "addon1@test.mozilla.org";
+const CUSTOM_THEME_ID = "theme1@test.mozilla.org";
+const DEFAULT_THEME_ID = "default-theme@mozilla.org";
+
+AddonTestUtils.initMochitest(this);
+
+function assertDisabledSideloadedExtensionElement(managerWindow, addonElement) {
+  const doc = addonElement.ownerDocument;
+  const toggleDisabled = addonElement.querySelector(
+    '[action="toggle-disabled"]'
+  );
+  is(
+    doc.l10n.getAttributes(toggleDisabled).id,
+    "extension-enable-addon-button-label",
+    "Addon toggle-disabled action has the enable label"
+  );
+  ok(!toggleDisabled.checked, "toggle-disable isn't checked");
+}
+
+function assertEnabledSideloadedExtensionElement(managerWindow, addonElement) {
+  const doc = addonElement.ownerDocument;
+  const toggleDisabled = addonElement.querySelector(
+    '[action="toggle-disabled"]'
+  );
+  is(
+    doc.l10n.getAttributes(toggleDisabled).id,
+    "extension-enable-addon-button-label",
+    "Addon toggle-disabled action has the enable label"
+  );
+  ok(!toggleDisabled.checked, "toggle-disable isn't checked");
+}
+
+function clickEnableExtension(managerWindow, addonElement) {
+  addonElement.querySelector('[action="toggle-disabled"]').click();
+}
+
+// Test for bug 1647931
+// Install a theme, enable it and then enable the default theme again
+add_task(async function test_theme_enable() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["xpinstall.signatures.required", false],
+      ["extensions.autoDisableScopes", 15],
+      ["extensions.ui.ignoreUnsigned", true],
+    ],
+  });
+
+  let theme = {
+    manifest: {
+      applications: { gecko: { id: CUSTOM_THEME_ID } },
+      name: "Theme 1",
+      theme: {
+        colors: {
+          frame: "#000000",
+          tab_background_text: "#ffffff",
+        },
+      },
+    },
+  };
+
+  let xpi = AddonTestUtils.createTempWebExtensionFile(theme);
+  await AddonTestUtils.manuallyInstall(xpi);
+
+  let changePromise = new Promise(resolve =>
+    ExtensionsUI.once("change", resolve)
+  );
+  ExtensionsUI._checkForSideloaded();
+  await changePromise;
+
+  // enable fresh installed theme
+  let manager = await open_manager("addons://list/theme");
+  let customTheme = get_addon_element(manager, CUSTOM_THEME_ID);
+  clickEnableExtension(manager, customTheme);
+
+  // enable default theme again
+  let defaultTheme = get_addon_element(manager, DEFAULT_THEME_ID);
+  clickEnableExtension(manager, defaultTheme);
+
+  let addon = await AddonManager.getAddonByID(CUSTOM_THEME_ID);
+  await close_manager(manager);
+  await addon.uninstall();
+});
+
+// Loading extension by sideloading method
+add_task(async function test_sideloaded_extension_permissions_prompt() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["xpinstall.signatures.required", false],
+      ["extensions.autoDisableScopes", 15],
+      ["extensions.ui.ignoreUnsigned", true],
+    ],
+  });
+
+  let options = {
+    manifest: {
+      applications: { gecko: { id: ADDON_ID } },
+      name: "Test 1",
+      permissions: ["history", "https://*/*"],
+      icons: { "64": "foo-icon.png" },
+    },
+  };
+
+  let xpi = AddonTestUtils.createTempWebExtensionFile(options);
+  await AddonTestUtils.manuallyInstall(xpi);
+
+  let changePromise = new Promise(resolve =>
+    ExtensionsUI.once("change", resolve)
+  );
+  ExtensionsUI._checkForSideloaded();
+  await changePromise;
+
+  // Test click event on permission cancel option.
+  let manager = await open_manager("addons://list/extension");
+  let addon = get_addon_element(manager, ADDON_ID);
+
+  Assert.notEqual(addon, null, "Found sideloaded addon in about:addons");
+
+  assertDisabledSideloadedExtensionElement(manager, addon);
+
+  let popupPromise = promisePopupNotificationShown("addon-webext-permissions");
+  clickEnableExtension(manager, addon);
+  let panel = await popupPromise;
+
+  ok(PopupNotifications.isPanelOpen, "Permission popup should be visible");
+  panel.secondaryButton.click();
+  ok(
+    !PopupNotifications.isPanelOpen,
+    "Permission popup should be closed / closing"
+  );
+
+  addon = await AddonManager.getAddonByID(ADDON_ID);
+  ok(
+    !addon.seen,
+    "Seen flag should remain false after permissions are refused"
+  );
+
+  // Test click event on permission accept option.
+  addon = get_addon_element(manager, ADDON_ID);
+  Assert.notEqual(addon, null, "Found sideloaded addon in about:addons");
+
+  assertEnabledSideloadedExtensionElement(manager, addon);
+
+  popupPromise = promisePopupNotificationShown("addon-webext-permissions");
+  clickEnableExtension(manager, addon);
+  panel = await popupPromise;
+
+  ok(PopupNotifications.isPanelOpen, "Permission popup should be visible");
+
+  let notificationPromise = acceptAppMenuNotificationWhenShown(
+    "addon-installed",
+    ADDON_ID
+  );
+
+  panel.button.click();
+  ok(
+    !PopupNotifications.isPanelOpen,
+    "Permission popup should be closed / closing"
+  );
+  await notificationPromise;
+
+  addon = await AddonManager.getAddonByID(ADDON_ID);
+  ok(addon.seen, "Seen flag should be true after permissions are accepted");
+
+  ok(!PopupNotifications.isPanelOpen, "Permission popup should not be visible");
+
+  await close_manager(manager);
+  await addon.uninstall();
+});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_pluginprefs.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests the detail view of plugins
-
-var gManagerWindow;
-
-async function getTestPluginAddon() {
-  const plugins = await AddonManager.getAddonsByTypes(["plugin"]);
-  return plugins.find(plugin => plugin.name === "Test Plug-in");
-}
-
-add_task(async function test_inline_plugin_prefs() {
-  gManagerWindow = await open_manager("addons://list/plugin");
-  let testPlugin = await getTestPluginAddon();
-  ok(testPlugin, "Test Plug-in should exist");
-
-  let pluginEl = get_addon_element(gManagerWindow, testPlugin.id);
-  is(
-    testPlugin.optionsType,
-    AddonManager.OPTIONS_TYPE_INLINE_BROWSER,
-    "Options should be inline type"
-  );
-
-  let optionsBrowserPromise = BrowserTestUtils.waitForEvent(
-    pluginEl.ownerDocument,
-    "load",
-    true,
-    event => {
-      let { target } = event;
-      return (
-        target.currentURI && target.currentURI.spec === testPlugin.optionsURL
-      );
-    }
-  ).then(event => event.target);
-
-  pluginEl.querySelector("panel-item[action='preferences']").click();
-
-  info("Waiting for inline options page to be ready");
-  let doc = (await optionsBrowserPromise).contentDocument;
-
-  await BrowserTestUtils.waitForCondition(() => {
-    // Wait until pluginPrefs.js has initialized the plugin pref view.
-    return doc.getElementById("pluginLibraries").textContent;
-  }, "Waiting for pluginPrefs to finish rendering");
-
-  let pluginLibraries = doc.getElementById("pluginLibraries");
-  ok(pluginLibraries, "Plugin file name row should be displayed");
-  // the file name depends on the platform
-  is(
-    pluginLibraries.textContent,
-    testPlugin.pluginLibraries[0],
-    "Plugin file name should be displayed"
-  );
-
-  let pluginMimeTypes = doc.getElementById("pluginMimeTypes");
-  ok(pluginMimeTypes, "Plugin mime type row should be displayed");
-  is(
-    pluginMimeTypes.textContent,
-    "application/x-test (Test \u2122 mimetype: tst)",
-    "Plugin mime type should be displayed"
-  );
-
-  await close_manager(gManagerWindow);
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_hidden_categories.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_hidden_categories.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_hidden_categories.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_hidden_categories.js	2021-01-18 19:58:27.000000000 +0000
@@ -206,7 +206,7 @@
 
   is(
     categoryUtils.getSelectedViewId(),
-    win.managerWindow.gViewDefault,
+    win.managerWindow.gViewController.defaultViewId,
     "default view is selected"
   );
 
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_restore_category.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_restore_category.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_restore_category.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/browser_sidebar_restore_category.js	2021-01-18 19:58:27.000000000 +0000
@@ -45,12 +45,12 @@
   let categoryUtils = new CategoryUtilities(win.managerWindow);
   is(
     categoryUtils.getSelectedViewId(),
-    win.managerWindow.gViewDefault,
+    win.managerWindow.gViewController.defaultViewId,
     "default view is selected"
   );
   is(
     win.managerWindow.gViewController.currentViewId,
-    win.managerWindow.gViewDefault,
+    win.managerWindow.gViewController.defaultViewId,
     "default view is shown"
   );
 
@@ -63,12 +63,12 @@
   let categoryUtils = new CategoryUtilities(win.managerWindow);
   is(
     categoryUtils.getSelectedViewId(),
-    win.managerWindow.gViewDefault,
+    win.managerWindow.gViewController.defaultViewId,
     "default view is selected"
   );
   is(
     win.managerWindow.gViewController.currentViewId,
-    win.managerWindow.gViewDefault,
+    win.managerWindow.gViewController.defaultViewId,
     "default view is shown"
   );
 
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/head.js firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/head.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/browser/head.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/browser/head.js	2021-01-18 19:58:27.000000000 +0000
@@ -265,20 +265,6 @@
   }
 }
 
-function get_current_view(aManager) {
-  let view = aManager.document.getElementById("view-port").selectedPanel;
-  if (view.id == "headered-views") {
-    view = aManager.document.getElementById("headered-views-content")
-      .selectedPanel;
-  }
-  is(
-    view,
-    aManager.gViewController.displayedView,
-    "view controller is tracking the displayed view correctly"
-  );
-  return view;
-}
-
 function check_all_in_list(aManager, aIds, aIgnoreExtras) {
   var doc = aManager.document;
   var list = doc.getElementById("addon-list");
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-  <gfxItems>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.1</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.0</os>
-      <vendor>0xdcba</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-  </gfxItems>
-</blocklist>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,831 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-  <gfxItems>
-
-    <gfxBlacklistEntry blockID="g1">
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g2">
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="22.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_LAYERS</feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1" maxVersion="22.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_1_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g11">
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="14.0b2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_OPENGL </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL2 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_MSAA </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> STAGEFRIGHT </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_H264 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_ENCODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_DECODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="17.2a2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="13.2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> HARDWARE_VIDEO_DECODING </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="10.5" maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g1">
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g2">
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="22.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_LAYERS</feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1" maxVersion="22.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_1_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g11">
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="14.0b2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_OPENGL </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL2 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_MSAA </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> STAGEFRIGHT </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_H264 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_ENCODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_DECODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="17.2a2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="13.2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> HARDWARE_VIDEO_DECODING </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="10.5" maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g1">
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g2">
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="22.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_LAYERS</feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1" maxVersion="22.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_1_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g11">
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="14.0b2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_OPENGL </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL2 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_MSAA </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> STAGEFRIGHT </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_H264 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_ENCODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_DECODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="17.2a2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="13.2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> HARDWARE_VIDEO_DECODING </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="10.5" maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g1">
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g2">
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="22.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_LAYERS</feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="16.0a1" maxVersion="22.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_10_1_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry blockID="g11">
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="14.0b2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_OPENGL </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL2 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="12.0" maxVersion="16.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_MSAA </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> STAGEFRIGHT </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_H264 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_ENCODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="42.0" maxVersion="13.0b2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_DECODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="17.2a2" maxVersion="15.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="15.0" maxVersion="13.2"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> HARDWARE_VIDEO_DECODING </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <versionRange minVersion="10.5" maxVersion="13.0"/>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-
-  </gfxItems>
-</blocklist>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.json firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.json
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.json	2021-01-18 19:58:27.000000000 +0000
@@ -149,6 +149,42 @@
     "feature": " DIRECT2D ",
     "featureStatus": " BLOCKED_DEVICE "
   },
+  {
+    "os": "WINNT 6.1",
+    "vendor": "0xabcd",
+    "devices": [
+      "0x6666"
+    ],
+    "feature": " WEBRENDER ",
+    "featureStatus": " BLOCKED_DEVICE "
+  },
+  {
+    "os": "Darwin 13",
+    "vendor": "0xabcd",
+    "devices": [
+      "0x6666"
+    ],
+    "feature": " WEBRENDER ",
+    "featureStatus": " BLOCKED_DEVICE "
+  },
+  {
+    "os": "Linux",
+    "vendor": "0xabcd",
+    "devices": [
+      "0x6666"
+    ],
+    "feature": " WEBRENDER ",
+    "featureStatus": " BLOCKED_DEVICE "
+  },
+  {
+    "os": "Android",
+    "vendor": "0xabcd",
+    "devices": [
+      "0x6666"
+    ],
+    "feature": " WEBRENDER ",
+    "featureStatus": " BLOCKED_DEVICE "
+  },
 
   {
     "os": "All",
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-  <gfxItems>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.2</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-  </gfxItems>
-</blocklist>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
-  <gfxItems>
-    <gfxBlacklistEntry blockID="g35">
-      <os>WINNT 6.1</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.0</os>
-      <vendor>0xdcba</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_9_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> LESS_THAN </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry blockID="g36">
-      <os>WINNT 6.1</os>
-      <vendor>0xabab</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.2202 </driverVersion>
-      <driverVersionComparator> GREATER_THAN_OR_EQUAL </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.1</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1111 </driverVersion>
-      <driverVersionComparator> EQUAL </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>abcd</vendor>
-      <devices>
-        <device>wxyz</device>
-        <device>asdf</device>
-        <device>erty</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 5 </driverVersion>
-      <driverVersionComparator> LESS_THAN_OR_EQUAL </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>dcdc</vendor>
-      <devices>
-        <device>uiop</device>
-        <device>vbnm</device>
-        <device>hjkl</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 5 </driverVersion>
-      <driverVersionComparator> EQUAL </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>abab</vendor>
-      <devices>
-        <device>ghjk</device>
-        <device>cvbn</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 7 </driverVersion>
-      <driverVersionComparator> GREATER_THAN_OR_EQUAL </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>WINNT 6.1</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x6666</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DEVICE </featureStatus>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Darwin 13</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x6666</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DEVICE </featureStatus>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Linux</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x6666</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DEVICE </featureStatus>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>Android</os>
-      <vendor>0xabcd</vendor>
-      <devices>
-        <device>0x6666</device>
-      </devices>
-      <feature> DIRECT2D </feature>
-      <featureStatus> BLOCKED_DEVICE </featureStatus>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1112 </driverVersion>
-      <driverVersionMax> 8.52.323.1000 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_EXCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> OPENGL_LAYERS </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.50.322.1000 </driverVersion>
-      <driverVersionMax> 8.52.322.1112 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_EXCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> DIRECT3D_11_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 9.52.322.1000 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_EXCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> HARDWARE_VIDEO_DECODING </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 7.82.322.1000 </driverVersion>
-      <driverVersionMax> 9.25.322.1001 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_H264 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1112 </driverVersion>
-      <driverVersionMax> 9.52.322.1300 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_DECODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 8.52.322.1112 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBRTC_HW_ACCELERATION_ENCODE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1112 </driverVersion>
-      <driverVersionMax> 8.52.322.1200 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator>
-    </gfxBlacklistEntry>
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_MSAA </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 8.52.322.1200 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL_ANGLE </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 8.52.322.1112 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> WEBGL2 </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 8.52.322.1112 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_INCLUSIVE_START </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-    <gfxBlacklistEntry>
-      <os>All</os>
-      <vendor>0xdcdc</vendor>
-      <devices>
-        <device>0x2783</device>
-        <device>0x1234</device>
-        <device>0x2782</device>
-      </devices>
-      <feature> CANVAS2D_ACCELERATION </feature>
-      <featureStatus> BLOCKED_DRIVER_VERSION </featureStatus>
-      <driverVersion> 8.52.322.1000 </driverVersion>
-      <driverVersionMax> 9.52.322.1000 </driverVersionMax>
-      <driverVersionComparator> BETWEEN_EXCLUSIVE </driverVersionComparator>
-    </gfxBlacklistEntry>
-
-  </gfxItems>
-</blocklist>
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/head_addons.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2021-01-18 19:58:27.000000000 +0000
@@ -314,7 +314,7 @@
       equal(
         params.oldVersion,
         lastParams.version,
-        "params.version should match last call"
+        "params.oldVersion should match last call"
       );
     } else {
       equal(
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/head_system_addons.js	2021-01-18 19:58:27.000000000 +0000
@@ -178,6 +178,10 @@
   Services.prefs.clearUserPref(PREF_SYSTEM_ADDON_SET);
 }
 
+registerCleanupFunction(() => {
+  clearSystemAddonUpdatesDir();
+});
+
 /**
  * Installs a known set of add-ons into the system add-on update directory.
  */
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_appversion.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_appversion.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_appversion.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_appversion.js	2021-01-18 19:58:27.000000000 +0000
@@ -9,8 +9,6 @@
 // test_blocklistchange.js.
 Services.prefs.setBoolPref("extensions.blocklist.useMLBF", false);
 
-const Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-
 var ADDONS = [
   {
     id: "test_bug449027_1@tests.mozilla.org",
@@ -214,69 +212,6 @@
   },
 ];
 
-class MockPlugin extends MockPluginTag {
-  constructor(name, version, start, appBlocks, toolkitBlocks) {
-    super({ name, version });
-    this.start = start;
-    this.appBlocks = appBlocks;
-    this.toolkitBlocks = toolkitBlocks;
-  }
-}
-
-var PLUGINS = [
-  new MockPlugin("test_bug449027_1", "5", false, false, false),
-  new MockPlugin("test_bug449027_2", "5", false, true, false),
-  new MockPlugin("test_bug449027_3", "5", false, true, false),
-  new MockPlugin("test_bug449027_4", "5", false, false, false),
-  new MockPlugin("test_bug449027_5", "5", false, false, false),
-  new MockPlugin("test_bug449027_6", "5", false, true, false),
-  new MockPlugin("test_bug449027_7", "5", false, true, false),
-  new MockPlugin("test_bug449027_8", "5", false, true, false),
-  new MockPlugin("test_bug449027_9", "5", false, true, false),
-  new MockPlugin("test_bug449027_10", "5", false, true, false),
-  new MockPlugin("test_bug449027_11", "5", false, true, false),
-  new MockPlugin("test_bug449027_12", "5", false, true, false),
-  new MockPlugin("test_bug449027_13", "5", false, true, false),
-  new MockPlugin("test_bug449027_14", "5", false, false, false),
-  new MockPlugin("test_bug449027_15", "5", false, true, true),
-  new MockPlugin("test_bug449027_16", "5", false, true, true),
-  new MockPlugin("test_bug449027_17", "5", false, false, false),
-  new MockPlugin("test_bug449027_18", "5", false, false, false),
-  new MockPlugin("test_bug449027_19", "5", false, true, true),
-  new MockPlugin("test_bug449027_20", "5", false, true, true),
-  new MockPlugin("test_bug449027_21", "5", false, true, true),
-  new MockPlugin("test_bug449027_22", "5", false, true, true),
-  new MockPlugin("test_bug449027_23", "5", false, true, true),
-  new MockPlugin("test_bug449027_24", "5", false, true, true),
-  new MockPlugin("test_bug449027_25", "5", false, true, true),
-];
-
-var gNewBlocks = [];
-
-mockPluginHost(PLUGINS);
-
-var BlocklistPrompt = {
-  get wrappedJSObject() {
-    return this;
-  },
-
-  prompt(list) {
-    gNewBlocks = list.map(item => `${item.name} ${item.version}`);
-  },
-
-  QueryInterface: ChromeUtils.generateQI([]),
-};
-
-let factory = ComponentUtils.generateSingletonFactory(function() {
-  return BlocklistPrompt;
-});
-Cm.registerFactory(
-  Components.ID("{26d32654-30c7-485d-b983-b4d2568aebba}"),
-  "Blocklist Prompt",
-  "@mozilla.org/addons/blocklist-prompt;1",
-  factory
-);
-
 function createAddon(addon) {
   return promiseInstallWebExtension({
     manifest: {
@@ -315,29 +250,6 @@
       `Blocklist state should match expected for extension ${addon.id}, test ${test}`
     );
   }
-
-  for (let plugin of PLUGINS) {
-    equal(
-      await plugin.isBlocklisted(),
-      plugin[test],
-      `Blocklist state should match expected for plugin ${plugin.name}, test ${test}`
-    );
-  }
-
-  if (lastTest) {
-    var expected = 0;
-    for (let plugin of PLUGINS) {
-      if (plugin[test] && !plugin[lastTest]) {
-        ok(
-          gNewBlocks.includes(`${plugin.name} ${plugin.version}`),
-          `Plugin ${plugin.name} should have been listed in the blocklist notification for test ${test}`
-        );
-        expected++;
-      }
-    }
-
-    Assert.equal(expected, gNewBlocks.length);
-  }
 }
 
 add_task(async function test() {
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_flashonly.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_flashonly.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_flashonly.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_flashonly.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +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/. */
-
-const nsIBLS = Ci.nsIBlocklistService;
-
-// Finds the test nsIPluginTag
-function get_test_plugintag() {
-  var host = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-  var tags = host.getPluginTags();
-  for (let tag of tags) {
-    if (tag.name == "Test Plug-in") {
-      return tag;
-    }
-  }
-  return null;
-}
-
-add_task(async function checkFlashOnlyPluginState() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-
-  Services.prefs.setBoolPref("plugin.load_flash_only", false);
-  // plugin.load_flash_only is only respected if xpc::IsInAutomation is true.
-  // This is not the case by default in xpcshell tests, unless the following
-  // pref is also set. Fixing this generically is bug 1598804
-  Services.prefs.setBoolPref(
-    "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer",
-    true
-  );
-
-  await AddonTestUtils.loadBlocklistRawData({
-    plugins: [
-      {
-        matchName: "Test Plug-in",
-        versionRange: [{ severity: "0" }],
-      },
-    ],
-  });
-
-  var plugin = get_test_plugintag();
-  if (!plugin) {
-    do_throw("Plugin tag not found");
-  }
-
-  // run the code after the blocklist is closed
-  Services.obs.notifyObservers(null, "addon-blocklist-closed");
-  await new Promise(executeSoon);
-  // should be marked as outdated by the blocklist
-  Assert.equal(
-    await Blocklist.getPluginBlocklistState(plugin, "1", "1.9"),
-    nsIBLS.STATE_OUTDATED
-  );
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_outdated.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_outdated.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_outdated.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_outdated.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +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/. */
-
-const Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-
-const nsIBLS = Ci.nsIBlocklistService;
-
-var gBlocklist = null;
-
-var PLUGINS = [
-  {
-    // Tests a plugin whose state goes from not-blocked, to outdated
-    name: "test_bug514327_outdated",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // Used to trigger the blocklist dialog, which indicates the blocklist has updated
-    name: "test_bug514327_1",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // Used to trigger the blocklist dialog, which indicates the blocklist has updated
-    name: "test_bug514327_2",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-].map(opts => new MockPluginTag(opts, opts.enabledState));
-
-mockPluginHost(PLUGINS);
-
-const BLOCKLIST_DATA = {
-  empty: {},
-  outdated_1: {
-    plugins: [
-      {
-        matchName: "test_bug514327_1",
-        versionRange: [],
-      },
-      {
-        matchName: "test_bug514327_outdated",
-        versionRange: [{ severity: "0" }],
-      },
-    ],
-  },
-  outdated_2: {
-    plugins: [
-      {
-        matchName: "test_bug514327_2",
-        versionRange: [],
-      },
-      {
-        matchName: "test_bug514327_outdated",
-        versionRange: [{ severity: "0" }],
-      },
-    ],
-  },
-};
-
-var BlocklistPrompt = {
-  get wrappedJSObject() {
-    return this;
-  },
-
-  prompt(list) {
-    // Should only include one item
-    Assert.equal(list.length, 1);
-    // And that item should be the blocked plugin, not the outdated one
-    var item = list[0];
-    Assert.ok(item.item instanceof Ci.nsIPluginTag);
-    Assert.notEqual(item.name, "test_bug514327_outdated");
-  },
-
-  QueryInterface: ChromeUtils.generateQI([]),
-};
-
-let factory = ComponentUtils.generateSingletonFactory(function() {
-  return BlocklistPrompt;
-});
-Cm.registerFactory(
-  Components.ID("{26d32654-30c7-485d-b983-b4d2568aebba}"),
-  "Blocklist Prompt",
-  "@mozilla.org/addons/blocklist-prompt;1",
-  factory
-);
-
-add_task(async function setup() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-
-  await promiseStartupManager();
-  // initialize the blocklist with no entries
-  await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA.empty);
-
-  gBlocklist = Services.blocklist;
-
-  // The blocklist service defers plugin request until the Blocklist
-  // module loads. Make sure it loads, or we'll wait forever.
-  executeSoon(() => {
-    void Blocklist;
-  });
-
-  // should NOT be marked as outdated by the blocklist
-  Assert.equal(
-    await gBlocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    nsIBLS.STATE_NOT_BLOCKED
-  );
-});
-
-add_task(async function test_part_1() {
-  // update blocklist with data that marks the plugin as outdated
-  await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA.outdated_1);
-
-  // plugin should now be marked as outdated
-  Assert.equal(
-    await gBlocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    nsIBLS.STATE_OUTDATED
-  );
-});
-
-add_task(async function test_part_2() {
-  // update blocklist with data that marks the plugin as outdated
-  await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA.outdated_2);
-
-  // plugin should still be marked as outdated
-  Assert.equal(
-    await gBlocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    nsIBLS.STATE_OUTDATED
-  );
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_regexp.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_regexp.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_regexp.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_regexp.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +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/. */
-
-var PLUGINS = [
-  {
-    // Normal blocklisted plugin, before an invalid regexp
-    name: "test_bug468528_1",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // Normal blocklisted plugin, with an invalid regexp
-    name: "test_bug468528_2",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // Normal blocklisted plugin, after an invalid regexp
-    name: "test_bug468528_3",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // Non-blocklisted plugin
-    name: "test_bug468528_4",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-];
-
-add_task(async function checkBlocklistForRegexes() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-
-  // We cannot force the blocklist to update so just copy our test list to the profile
-  copyBlocklistToProfile(do_get_file("../data/test_bug468528.xml"));
-
-  var { blocklist } = Services;
-
-  // The blocklist service defers plugin request until the Blocklist
-  // module loads. Make sure it loads, or we'll wait forever.
-  executeSoon(() => {
-    void Blocklist;
-  });
-
-  // blocked (sanity check)
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    blocklist.STATE_BLOCKED
-  );
-
-  // not blocked - won't match due to invalid regexp
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9"),
-    blocklist.STATE_NOT_BLOCKED
-  );
-
-  // blocked - the invalid regexp for the previous item shouldn't affect this one
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9"),
-    blocklist.STATE_BLOCKED
-  );
-
-  // not blocked - the previous invalid regexp shouldn't act as a wildcard
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9"),
-    blocklist.STATE_NOT_BLOCKED
-  );
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_severities.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_severities.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_severities.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_plugin_severities.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +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/. */
-
-var PLUGINS = [
-  {
-    // blocklisted - default severity
-    name: "test_bug514327_1",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // outdated - severity of "0"
-    name: "test_bug514327_2",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // outdated - severity of "0"
-    name: "test_bug514327_3",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // not blocklisted, not outdated
-    name: "test_bug514327_4",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-    outdated: false,
-  },
-];
-
-let BLOCKLIST_DATA = {
-  plugins: [
-    {
-      matchName: "^test_bug514327_1",
-      versionRange: [],
-    },
-    {
-      matchName: "^test_bug514327_2",
-      versionRange: [{ severity: "0" }],
-    },
-    {
-      matchName: "^test_bug514327_3",
-      versionRange: [{ severity: "0" }],
-    },
-  ],
-};
-
-add_task(async function checkBlocklistSeverities() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-
-  await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA);
-
-  var { blocklist } = Services;
-
-  // The blocklist service defers plugin request until the Blocklist
-  // module loads. Make sure it loads, or we'll wait forever.
-  executeSoon(() => {
-    void Blocklist;
-  });
-
-  // blocked (sanity check)
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    blocklist.STATE_BLOCKED
-  );
-
-  // outdated
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9"),
-    blocklist.STATE_OUTDATED
-  );
-
-  // outdated
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9"),
-    blocklist.STATE_OUTDATED
-  );
-
-  // not blocked
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9"),
-    blocklist.STATE_NOT_BLOCKED
-  );
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_severities.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_severities.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_severities.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_severities.js	2021-01-18 19:58:27.000000000 +0000
@@ -88,39 +88,6 @@
   },
 ];
 
-var PLUGINS = [
-  // Tests how the blocklist affects a disabled plugin
-  new MockPluginTag(
-    { name: "test_bug455906_1", version: "5" },
-    Ci.nsIPluginTag.STATE_DISABLED
-  ),
-  // Tests how the blocklist affects an enabled plugin
-  new MockPluginTag(
-    { name: "test_bug455906_2", version: "5" },
-    Ci.nsIPluginTag.STATE_ENABLED
-  ),
-  // Tests how the blocklist affects an enabled plugin, to be disabled by the notification
-  new MockPluginTag(
-    { name: "test_bug455906_3", version: "5" },
-    Ci.nsIPluginTag.STATE_ENABLED
-  ),
-  // Tests how the blocklist affects a disabled plugin that was already warned about
-  new MockPluginTag(
-    { name: "test_bug455906_4", version: "5" },
-    Ci.nsIPluginTag.STATE_DISABLED
-  ),
-  // Tests how the blocklist affects an enabled plugin that was already warned about
-  new MockPluginTag(
-    { name: "test_bug455906_5", version: "5" },
-    Ci.nsIPluginTag.STATE_ENABLED
-  ),
-  // Tests how the blocklist affects an already blocked plugin
-  new MockPluginTag(
-    { name: "test_bug455906_6", version: "5" },
-    Ci.nsIPluginTag.STATE_ENABLED
-  ),
-];
-
 var gNotificationCheck = null;
 
 // Don't need the full interface, attempts to call other methods will just
@@ -183,21 +150,6 @@
         versionRange: [],
       },
     ],
-    // Block 4-6:
-    plugins: [
-      {
-        matchName: "^test_bug455906_4$",
-        versionRange: [{ severity: "0" }],
-      },
-      {
-        matchName: "^test_bug455906_5$",
-        versionRange: [{ severity: "1" }],
-      },
-      {
-        matchName: "^test_bug455906_6$",
-        versionRange: [{ severity: "2" }],
-      },
-    ],
   },
   warn: {
     // warn for all test add-ons:
@@ -205,13 +157,6 @@
       guid: a.id,
       versionRange: [{ severity: "-1" }],
     })),
-    // warn for all plugins with a regex:
-    plugins: [
-      {
-        matchName: "^test_bug455906",
-        versionRange: [{ severity: "-1" }],
-      },
-    ],
   },
   block: {
     // block all test add-ons:
@@ -220,14 +165,6 @@
       blockID: a.id,
       versionRange: [],
     })),
-    // block all plugins with a regex:
-    plugins: [
-      {
-        matchName: "^test_bug455906",
-        versionRange: [],
-        blockID: "test_bug455906_plugin",
-      },
-    ],
   },
   empty: {
     // Block a dummy so there's a change:
@@ -237,8 +174,6 @@
         versionRange: [],
       },
     ],
-    // Need an empty list to force clearing things:
-    plugins: [],
   },
 };
 
@@ -248,12 +183,6 @@
   await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA[id]);
 }
 
-async function check_plugin_state(plugin) {
-  let blocklistState = await Blocklist.getPluginBlocklistState(plugin);
-  return `${plugin.disabled},${blocklistState ==
-    Services.blocklist.STATE_BLOCKED}`;
-}
-
 function create_blocklistURL(blockID) {
   let url = Services.urlFormatter.formatURLPref(PREF_BLOCKLIST_ITEM_URL);
   url = url.replace(/%blockID%/g, blockID);
@@ -299,13 +228,6 @@
     softDisabled: false,
     appDisabled: true,
   });
-
-  equal(await check_plugin_state(PLUGINS[0]), "true,false");
-  equal(await check_plugin_state(PLUGINS[1]), "false,false");
-  equal(await check_plugin_state(PLUGINS[2]), "false,false");
-  equal(await check_plugin_state(PLUGINS[3]), "true,false");
-  equal(await check_plugin_state(PLUGINS[4]), "false,false");
-  equal(await check_plugin_state(PLUGINS[5]), "false,true");
 }
 
 function checkAddonState(addon, state) {
@@ -319,10 +241,7 @@
 
   // Load the initial blocklist into the profile to check add-ons start in the
   // right state.
-  // Make sure to do this before we touch the plugin service, since that
-  // will force a blocklist load.
   await AddonTestUtils.loadBlocklistRawData(BLOCKLIST_DATA.start);
-  mockPluginHost(PLUGINS);
 
   for (let addon of ADDONS) {
     await createAddon(addon);
@@ -377,9 +296,6 @@
     appDisabled: true,
   });
 
-  // We've overridden the plugin host so we cannot tell what that would have
-  // initialised the plugins as
-
   // Put the add-ons into the base state
   await addons[0].disable();
   await addons[4].enable();
@@ -389,29 +305,10 @@
 
   await loadBlocklist("warn", args => {
     dump("Checking notification pt 2\n");
-    // Note: in the XML version, this notifies for 4 items - 2 add-ons and 2 plugins.
     // This test is artificial, we don't notify for add-ons anymore, see
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1257565#c111 . Cleaning this up
     // should happen but this patchset is too huge as it is so I'm deferring it.
     equal(args.list.length, 2);
-
-    for (let addon of args.list) {
-      if (addon.item instanceof Ci.nsIPluginTag) {
-        switch (addon.item.name) {
-          case "test_bug455906_2":
-            ok(!addon.blocked);
-            break;
-          case "test_bug455906_3":
-            ok(!addon.blocked);
-            addon.disable = true;
-            break;
-          default:
-            do_throw("Unknown plugin: " + addon.item.name);
-        }
-      } else {
-        do_throw("Everything here should be a plugin, what is this?!");
-      }
-    }
   });
 
   await promiseRestartManager();
@@ -425,7 +322,6 @@
     softDisabled: true,
     appDisabled: false,
   });
-  equal(await check_plugin_state(PLUGINS[2]), "true,false");
 
   info("The blocked add-on should have changed to soft disabled");
   checkAddonState(addons[5], {
@@ -438,7 +334,6 @@
     softDisabled: true,
     appDisabled: true,
   });
-  equal(await check_plugin_state(PLUGINS[5]), "true,false");
 
   info("These should have been unchanged");
   checkAddonState(addons[0], {
@@ -459,16 +354,10 @@
     softDisabled: false,
     appDisabled: false,
   });
-  equal(await check_plugin_state(PLUGINS[0]), "true,false");
-  equal(await check_plugin_state(PLUGINS[1]), "false,false");
-  equal(await check_plugin_state(PLUGINS[3]), "true,false");
-  equal(await check_plugin_state(PLUGINS[4]), "false,false");
 
   // Back to starting state
   await addons[2].enable();
   await addons[5].enable();
-  PLUGINS[2].enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  PLUGINS[5].enabledState = Ci.nsIPluginTag.STATE_ENABLED;
 
   await promiseRestartManager();
   await loadBlocklist("start");
@@ -481,38 +370,6 @@
   await loadBlocklist("block", args => {
     dump("Checking notification pt 3\n");
     equal(args.list.length, 3);
-
-    for (let addon of args.list) {
-      if (addon.item instanceof Ci.nsIPluginTag) {
-        switch (addon.item.name) {
-          case "test_bug455906_2":
-            ok(addon.blocked);
-            break;
-          case "test_bug455906_3":
-            ok(addon.blocked);
-            break;
-          case "test_bug455906_5":
-            ok(addon.blocked);
-            break;
-          default:
-            do_throw("Unknown addon: " + addon.item.name);
-        }
-      } else {
-        switch (addon.item.id) {
-          case "test_bug455906_2@tests.mozilla.org":
-            ok(addon.blocked);
-            break;
-          case "test_bug455906_3@tests.mozilla.org":
-            ok(addon.blocked);
-            break;
-          case "test_bug455906_5@tests.mozilla.org":
-            ok(addon.blocked);
-            break;
-          default:
-            do_throw("Unknown addon: " + addon.item.id);
-        }
-      }
-    }
   });
 
   await promiseRestartManager();
@@ -541,11 +398,6 @@
     softDisabled: false,
     appDisabled: true,
   });
-  equal(await check_plugin_state(PLUGINS[0]), "true,true");
-  equal(await check_plugin_state(PLUGINS[1]), "false,true");
-  equal(await check_plugin_state(PLUGINS[2]), "false,true");
-  equal(await check_plugin_state(PLUGINS[3]), "true,true");
-  equal(await check_plugin_state(PLUGINS[4]), "false,true");
 
   // Should have gained the blocklist state but no longer be soft disabled
   checkAddonState(addons[3], {
@@ -576,28 +428,6 @@
     create_blocklistURL(addons[4].id)
   );
 
-  // All plugins have the same blockID on the test
-  equal(
-    await Blocklist.getPluginBlockURL(PLUGINS[0]),
-    create_blocklistURL("test_bug455906_plugin")
-  );
-  equal(
-    await Blocklist.getPluginBlockURL(PLUGINS[1]),
-    create_blocklistURL("test_bug455906_plugin")
-  );
-  equal(
-    await Blocklist.getPluginBlockURL(PLUGINS[2]),
-    create_blocklistURL("test_bug455906_plugin")
-  );
-  equal(
-    await Blocklist.getPluginBlockURL(PLUGINS[3]),
-    create_blocklistURL("test_bug455906_plugin")
-  );
-  equal(
-    await Blocklist.getPluginBlockURL(PLUGINS[4]),
-    create_blocklistURL("test_bug455906_plugin")
-  );
-
   // Shouldn't be changed
   checkAddonState(addons[5], {
     userDisabled: false,
@@ -609,7 +439,6 @@
     softDisabled: false,
     appDisabled: true,
   });
-  equal(await check_plugin_state(PLUGINS[5]), "false,true");
 
   // Back to starting state
   await loadBlocklist("start");
@@ -618,7 +447,6 @@
 add_task(async function test_pt4() {
   let addon = await AddonManager.getAddonByID(ADDONS[4].id);
   await addon.enable();
-  PLUGINS[4].enabledState = Ci.nsIPluginTag.STATE_ENABLED;
 
   await promiseRestartManager();
   await checkInitialState();
@@ -626,7 +454,7 @@
   await loadBlocklist("empty", args => {
     dump("Checking notification pt 4\n");
     // See note in other callback - we no longer notify for non-blocked add-ons.
-    ok(false, "Should not get a notification as there are no blocked plugins.");
+    ok(false, "Should not get a notification as there are no blocked addons.");
   });
 
   await promiseRestartManager();
@@ -639,7 +467,6 @@
     softDisabled: false,
     appDisabled: false,
   });
-  equal(await check_plugin_state(PLUGINS[5]), "false,false");
 
   // Should get re-enabled
   checkAddonState(addons[3], {
@@ -674,9 +501,4 @@
     softDisabled: false,
     appDisabled: true,
   });
-  equal(await check_plugin_state(PLUGINS[0]), "true,false");
-  equal(await check_plugin_state(PLUGINS[1]), "false,false");
-  equal(await check_plugin_state(PLUGINS[2]), "false,false");
-  equal(await check_plugin_state(PLUGINS[3]), "true,false");
-  equal(await check_plugin_state(PLUGINS[4]), "false,false");
 });
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_No_Comparison.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_No_Comparison.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_No_Comparison.js	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_No_Comparison.js	2021-01-18 19:58:27.000000000 +0000
@@ -48,6 +48,9 @@
       var status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_DIRECT2D);
       Assert.equal(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DEVICE);
 
+      status = gfxInfo.getFeatureStatus(Ci.nsIGfxInfo.FEATURE_WEBRENDER);
+      Assert.equal(status, Ci.nsIGfxInfo.FEATURE_BLOCKED_DEVICE);
+
       // Make sure unrelated features aren't affected
       status = gfxInfo.getFeatureStatus(
         Ci.nsIGfxInfo.FEATURE_DIRECT3D_9_LAYERS
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginBlocklistCtp.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginBlocklistCtp.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginBlocklistCtp.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginBlocklistCtp.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,283 +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/. */
-
-const nsIBLS = Ci.nsIBlocklistService;
-
-var gPluginHost = null;
-
-var PLUGINS = [
-  {
-    // severity=0, vulnerabilitystatus=0 -> outdated
-    name: "test_plugin_0",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // severity=0, vulnerabilitystatus=1 -> update available
-    name: "test_plugin_1",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // severity=0, vulnerabilitystatus=2 -> no update
-    name: "test_plugin_2",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // no severity field -> severity=3 by default -> hardblock
-    name: "test_plugin_3",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // severity=1, vulnerabilitystatus=2 -> softblock
-    name: "test_plugin_4",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-  {
-    // not in the blocklist -> not blocked
-    name: "test_plugin_5",
-    version: "5",
-    disabled: false,
-    blocklisted: false,
-  },
-];
-
-const BLOCKLIST_DATA = {
-  ctp: [
-    {
-      matchName: "^test_plugin_0",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          severity: "0",
-          vulnerabilityStatus: "0",
-        },
-      ],
-    },
-    {
-      matchName: "^test_plugin_1",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          severity: "0",
-          vulnerabilityStatus: "1",
-        },
-      ],
-    },
-    {
-      matchName: "^test_plugin_2",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          severity: "0",
-          vulnerabilityStatus: "2",
-        },
-      ],
-    },
-    {
-      matchName: "^test_plugin_3",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          vulnerabilityStatus: "2",
-        },
-      ],
-    },
-    {
-      matchName: "^test_plugin_4",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          severity: "1",
-          vulnerabilityStatus: "2",
-        },
-      ],
-    },
-  ],
-  ctpUndo: [
-    {
-      matchName: "^Test Plug-in",
-      versionRange: [
-        {
-          maxVersion: "*",
-          minVersion: "0",
-          severity: "0",
-          vulnerabilityStatus: "2",
-        },
-      ],
-    },
-  ],
-};
-
-async function updateBlocklist(file) {
-  let blocklistUpdated = TestUtils.topicObserved("plugin-blocklist-updated");
-  AddonTestUtils.loadBlocklistRawData({ plugins: BLOCKLIST_DATA[file] });
-  return blocklistUpdated;
-}
-
-add_task(async function setup() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9");
-
-  Services.prefs.setBoolPref("plugin.load_flash_only", false);
-  // plugin.load_flash_only is only respected if xpc::IsInAutomation is true.
-  // This is not the case by default in xpcshell tests, unless the following
-  // pref is also set. Fixing this generically is bug 1598804
-  Services.prefs.setBoolPref(
-    "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer",
-    true
-  );
-  gPluginHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost);
-  await promiseStartupManager();
-});
-
-add_task(async function basic() {
-  await updateBlocklist("ctp");
-  var { blocklist } = Services;
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9"),
-    nsIBLS.STATE_OUTDATED
-  );
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9"),
-    nsIBLS.STATE_VULNERABLE_UPDATE_AVAILABLE
-  );
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9"),
-    nsIBLS.STATE_VULNERABLE_NO_UPDATE
-  );
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9"),
-    nsIBLS.STATE_BLOCKED
-  );
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[4], "1", "1.9"),
-    nsIBLS.STATE_SOFTBLOCKED
-  );
-
-  Assert.equal(
-    await blocklist.getPluginBlocklistState(PLUGINS[5], "1", "1.9"),
-    nsIBLS.STATE_NOT_BLOCKED
-  );
-});
-
-function get_test_plugin() {
-  for (var plugin of gPluginHost.getPluginTags()) {
-    if (plugin.name == "Test Plug-in") {
-      return plugin;
-    }
-  }
-  Assert.ok(false, "Should have found the test plugin!");
-  return null;
-}
-
-// At this time, the blocklist does not have an entry for the test plugin,
-// so it shouldn't be click-to-play.
-add_task(async function test_is_not_clicktoplay() {
-  var plugin = get_test_plugin();
-  var blocklistState = await Blocklist.getPluginBlocklistState(
-    plugin,
-    "1",
-    "1.9"
-  );
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE
-  );
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE
-  );
-});
-
-// Here, we've updated the blocklist to have a block for the test plugin,
-// so it should be click-to-play.
-add_task(async function test_is_clicktoplay() {
-  await updateBlocklist("ctpUndo");
-  var plugin = get_test_plugin();
-  var blocklistState = await Blocklist.getPluginBlocklistState(
-    plugin,
-    "1",
-    "1.9"
-  );
-  Assert.equal(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE
-  );
-});
-
-// But now we've removed that entry from the blocklist (really we've gone back
-// to the old one), so the plugin shouldn't be click-to-play any more.
-add_task(async function test_is_not_clicktoplay2() {
-  await updateBlocklist("ctp");
-  var plugin = get_test_plugin();
-  var blocklistState = await Blocklist.getPluginBlocklistState(
-    plugin,
-    "1",
-    "1.9"
-  );
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE
-  );
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE
-  );
-});
-
-// Test that disabling the blocklist when a plugin is ctp-blocklisted will
-// result in the plugin not being click-to-play.
-add_task(async function test_disable_blocklist() {
-  await updateBlocklist("ctpUndo");
-  var plugin = get_test_plugin();
-  var blocklistState = await Blocklist.getPluginBlocklistState(
-    plugin,
-    "1",
-    "1.9"
-  );
-  Assert.equal(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE
-  );
-
-  Services.prefs.setBoolPref("extensions.blocklist.enabled", false);
-  blocklistState = await Blocklist.getPluginBlocklistState(plugin, "1", "1.9");
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE
-  );
-  Assert.notEqual(
-    blocklistState,
-    Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE
-  );
-
-  // it should still be possible to make a plugin click-to-play
-  // by setting that plugin's enabled state to click-to-play
-  let previousEnabledState = plugin.enabledState;
-  plugin.enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-  Assert.equal(
-    gPluginHost.getStateForType("application/x-test"),
-    Ci.nsIPluginTag.STATE_CLICKTOPLAY
-  );
-  // clean up plugin state
-  plugin.enabledState = previousEnabledState;
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginInfoURL.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginInfoURL.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginInfoURL.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_pluginInfoURL.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +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/.
- */
-
-/**
- * MockPlugin mimics the behaviour of a plugin.
- */
-function MockPlugin(name, version, enabledState) {
-  this.name = name;
-  this.version = version;
-  this.enabledState = enabledState;
-}
-
-MockPlugin.prototype = {
-  get disabled() {
-    return this.enabledState == Ci.nsIPluginTag.STATE_DISABLED;
-  },
-};
-
-// The mocked blocked plugin used to test the blocklist.
-const PLUGINS = [
-  new MockPlugin("test_with_infoURL", "5", Ci.nsIPluginTag.STATE_ENABLED),
-  new MockPlugin("test_with_altInfoURL", "5", Ci.nsIPluginTag.STATE_ENABLED),
-  new MockPlugin("test_no_infoURL", "5", Ci.nsIPluginTag.STATE_ENABLED),
-  new MockPlugin("test_newVersion", "1", Ci.nsIPluginTag.STATE_ENABLED),
-  new MockPlugin("test_newVersion", "3", Ci.nsIPluginTag.STATE_ENABLED),
-  new MockPlugin("test_noBlockID", "3", Ci.nsIPluginTag.STATE_ENABLED),
-];
-
-const BLOCKLIST_DATA = [
-  {
-    matchName: "^test_with_infoURL",
-    matchVersion: "^5",
-    versionRange: [
-      {
-        targetApplication: [
-          {
-            guid: "xpcshell@tests.mozilla.org",
-            maxVersion: "*",
-            minVersion: "1",
-          },
-        ],
-      },
-    ],
-    blockID: "test_plugin_wInfoURL",
-    infoURL: "http://test.url.com/",
-  },
-  {
-    matchName: "^test_with_altInfoURL",
-    matchVersion: "^5",
-    versionRange: [
-      {
-        targetApplication: [
-          {
-            guid: "xpcshell@tests.mozilla.org",
-            maxVersion: "*",
-            minVersion: "1",
-          },
-        ],
-      },
-    ],
-    blockID: "test_plugin_wAltInfoURL",
-    infoURL: "http://alt.test.url.com/",
-  },
-  {
-    matchName: "^test_no_infoURL",
-    versionRange: [
-      {
-        targetApplication: [
-          {
-            guid: "xpcshell@tests.mozilla.org",
-            maxVersion: "*",
-            minVersion: "1",
-          },
-        ],
-      },
-    ],
-    blockID: "test_plugin_noInfoURL",
-  },
-  {
-    matchName: "^test_newVersion",
-    versionRange: [
-      {
-        maxVersion: "2",
-        minVersion: "1",
-        targetApplication: [
-          {
-            guid: "xpcshell@tests.mozilla.org",
-            maxVersion: "*",
-            minVersion: "1",
-          },
-        ],
-      },
-    ],
-    blockID: "test_plugin_newVersion",
-    infoURL: "http://test.url2.com/",
-  },
-  {
-    matchName: "^test_noBlockID",
-    versionRange: [
-      {
-        targetApplication: [
-          {
-            guid: "xpcshell@tests.mozilla.org",
-            maxVersion: "*",
-            minVersion: "1",
-          },
-        ],
-      },
-    ],
-    infoURL: "http://test.url.com/",
-  },
-];
-
-/**
- * The entry point of the unit tests, which is also responsible of
- * copying the blocklist file to the profile folder.
- */
-add_task(async function setup() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "3", "8");
-  await promiseStartupManager();
-  await AddonTestUtils.loadBlocklistRawData({ plugins: BLOCKLIST_DATA });
-});
-
-/**
- * Test that the blocklist service correctly loads and returns the infoURL for
- * a plugin that matches the first entry in the blocklist.
- */
-add_task(async function test_infoURL() {
-  // The testInfoURL must match the value within the
-  // infoURL info in the pluginInfoURL_block blocklist data
-  let testInfoURL = "http://test.url.com/";
-
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[0]),
-    testInfoURL,
-    "Should be the provided url when an infoURL tag is available"
-  );
-});
-
-/**
- * Test that the blocklist service correctly loads and returns the infoURL for
- * a plugin that partially matches an earlier entry in the blocklist.
- */
-add_task(async function test_altInfoURL() {
-  let altTestInfoURL = "http://alt.test.url.com/";
-
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[1]),
-    altTestInfoURL,
-    "Should be the alternative infoURL"
-  );
-});
-
-/**
- * Test that the blocklist service correctly returns the fallback value
- * if the infoURL tag is not specified in the blocklist data.
- */
-add_task(async function test_infoURL_missing() {
-  let fallback_URL =
-    Services.prefs.getStringPref("extensions.blocklist.detailsURL") +
-    "test_plugin_noInfoURL.html";
-
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[2]),
-    fallback_URL,
-    "Should be using fallback when no infoURL tag is available."
-  );
-});
-
-add_task(async function test_intoURL_newVersion() {
-  let testInfoURL = "http://test.url2.com/";
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[3]),
-    testInfoURL,
-    "Old plugin should match"
-  );
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[4]),
-    null,
-    "New plugin should not match"
-  );
-});
-
-/**
- * Test that the blocklist service correctly loads and returns the infoURL for
- * a plugin that matches the last entry in the blocklist, despite it not having
- * a blockID property
- */
-add_task(async function test_infoURL() {
-  // The testInfoURL must match the value within the
-  // infoURL info in the pluginInfoURL_block blocklist data
-  let testInfoURL = "http://test.url.com/";
-
-  Assert.strictEqual(
-    await Blocklist.getPluginBlockURL(PLUGINS[5]),
-    testInfoURL,
-    "Should be the provided url when the infoURL is available and blockID isn't"
-  );
-});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/xpcshell.ini firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/xpcshell.ini	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -28,15 +28,6 @@
 [test_blocklist_osabi.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
-[test_blocklist_plugin_flashonly.js]
-# Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
-[test_blocklist_plugin_outdated.js]
-# Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
-[test_blocklist_plugin_severities.js]
-# Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
 [test_blocklist_prefs.js]
 [test_blocklist_regexp_split.js]
 [test_blocklist_severities.js]
@@ -72,8 +63,4 @@
 [test_gfxBlacklist_prefs.js]
 # Bug 1248787 - consistently fails
 skip-if = true
-[test_pluginBlocklistCtp.js]
-# Bug 676992: test consistently fails on Android
-fail-if = os == "android"
-[test_pluginInfoURL.js]
 [test_softblocked.js]
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var TEST_PLUGIN_DESCRIPTION = "Flash plug-in for testing purposes.";
-
-// This verifies that plugins exist and can be enabled and disabled.
-var gID = null;
-
-function setTestPluginState(state) {
-  let tags = Cc["@mozilla.org/plugin/host;1"]
-    .getService(Ci.nsIPluginHost)
-    .getPluginTags();
-  for (let tag of tags) {
-    info("Checking tag: " + tag.description);
-    if (tag.description == TEST_PLUGIN_DESCRIPTION) {
-      tag.enabledState = state;
-      return;
-    }
-  }
-  throw Error("No plugin tag found for the test plugin");
-}
-
-async function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  Services.prefs.setBoolPref("plugin.load_flash_only", false);
-  // plugin.load_flash_only is only respected if xpc::IsInAutomation is true.
-  // This is not the case by default in xpcshell tests, unless the following
-  // pref is also set. Fixing this generically is bug 1598804
-  Services.prefs.setBoolPref(
-    "security.turn_off_all_security_so_that_viruses_can_take_over_this_computer",
-    true
-  );
-
-  setTestPluginState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
-
-  await promiseStartupManager();
-
-  run_test_1();
-}
-
-// Finds the test plugin library
-function get_test_plugin() {
-  for (let dir of Services.dirsvc.get("APluginsDL", Ci.nsISimpleEnumerator)) {
-    let plugin = dir.clone();
-    // OSX plugin
-    plugin.append("npswftest.plugin");
-    if (plugin.exists()) {
-      plugin.normalize();
-      return plugin;
-    }
-    plugin = dir.clone();
-    // *nix plugin
-    plugin.append("libnpswftest.so");
-    if (plugin.exists()) {
-      plugin.normalize();
-      return plugin;
-    }
-    // Windows plugin
-    plugin = dir.clone();
-    plugin.append("npswftest.dll");
-    if (plugin.exists()) {
-      plugin.normalize();
-      return plugin;
-    }
-  }
-  return null;
-}
-
-function getPluginLastModifiedTime(aPluginFile) {
-  // On OS X we use the bundle contents last modified time as using
-  // the package directories modified date may be outdated.
-  // See bug 313700.
-  try {
-    let localFileMac = aPluginFile.QueryInterface(Ci.nsILocalFileMac);
-    if (localFileMac) {
-      return localFileMac.bundleContentsLastModifiedTime;
-    }
-  } catch (e) {}
-
-  return aPluginFile.lastModifiedTime;
-}
-
-// Tests that the test plugin exists
-async function run_test_1() {
-  var testPlugin = get_test_plugin();
-  Assert.notEqual(testPlugin, null);
-
-  let addons = await AddonManager.getAddonsByTypes(["plugin"]);
-  Assert.ok(!!addons.length);
-
-  addons.forEach(function(p) {
-    if (p.description == TEST_PLUGIN_DESCRIPTION) {
-      gID = p.id;
-    }
-  });
-
-  Assert.notEqual(gID, null);
-
-  let p = await AddonManager.getAddonByID(gID);
-  Assert.notEqual(p, null);
-  Assert.equal(p.name, "Shockwave Flash");
-  Assert.equal(p.description, TEST_PLUGIN_DESCRIPTION);
-  Assert.equal(p.creator, null);
-  Assert.equal(p.version, "1.0.0.0");
-  Assert.equal(p.type, "plugin");
-  Assert.equal(p.userDisabled, "askToActivate");
-  Assert.ok(!p.appDisabled);
-  Assert.ok(p.isActive);
-  Assert.ok(p.isCompatible);
-  Assert.ok(p.providesUpdatesSecurely);
-  Assert.equal(p.blocklistState, 0);
-  Assert.equal(p.permissions, AddonManager.PERM_CAN_DISABLE);
-  Assert.equal(p.pendingOperations, 0);
-  Assert.ok(p.updateDate > 0);
-  Assert.ok("isCompatibleWith" in p);
-  Assert.ok("findUpdates" in p);
-
-  let lastModifiedTime = getPluginLastModifiedTime(testPlugin);
-  Assert.equal(p.updateDate.getTime(), lastModifiedTime);
-  Assert.equal(p.installDate.getTime(), lastModifiedTime);
-
-  run_test_2(p);
-}
-
-// Tests that disabling a plugin works
-async function run_test_2(p) {
-  await expectEvents(
-    {
-      addonEvents: {
-        [gID]: [
-          { event: "onDisabling" },
-          { event: "onDisabled" },
-          { event: "onPropertyChanged", properties: ["userDisabled"] },
-        ],
-      },
-    },
-    () => p.disable()
-  );
-
-  Assert.ok(p.userDisabled);
-  Assert.equal(p.permissions, AddonManager.PERM_CAN_ASK_TO_ACTIVATE);
-  Assert.ok(!p.appDisabled);
-  Assert.ok(!p.isActive);
-
-  let p2 = await AddonManager.getAddonByID(gID);
-  Assert.notEqual(p2, null);
-  Assert.ok(p2.userDisabled);
-  Assert.ok(!p2.appDisabled);
-  Assert.ok(!p2.isActive);
-  Assert.equal(p2.name, "Shockwave Flash");
-
-  run_test_3(p2);
-}
-
-// Tests that enabling a plugin works
-async function run_test_3(p) {
-  await expectEvents(
-    {
-      addonEvents: {
-        [gID]: [{ event: "onEnabling" }, { event: "onEnabled" }],
-      },
-    },
-    () => p.enable()
-  );
-
-  Assert.equal(p.userDisabled, "askToActivate");
-  Assert.ok(!p.appDisabled);
-  Assert.ok(p.isActive);
-
-  let p2 = await AddonManager.getAddonByID(gID);
-  Assert.notEqual(p2, null);
-  Assert.equal(p2.userDisabled, "askToActivate");
-  Assert.ok(!p2.appDisabled);
-  Assert.ok(p2.isActive);
-  Assert.equal(p2.name, "Shockwave Flash");
-
-  executeSoon(run_test_4);
-}
-
-// Verify that after a restart the test plugin has the same ID
-async function run_test_4() {
-  await promiseRestartManager();
-
-  let p = await AddonManager.getAddonByID(gID);
-  Assert.notEqual(p, null);
-  Assert.equal(p.name, "Shockwave Flash");
-
-  executeSoon(do_test_finished);
-}
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup.js	2021-01-18 19:58:27.000000000 +0000
@@ -21,6 +21,27 @@
   });
 }
 
+// Bug 1554703: Verify that the extensions.lastAppBuildId pref is updated properly
+// to avoid a full scan on second startup in XPIStates.scanForChanges.
+add_task(async function test_scan_app_build_id_updated() {
+  const PREF_EM_LAST_APP_BUILD_ID = "extensions.lastAppBuildId";
+  Assert.equal(
+    Services.prefs.getCharPref(PREF_EM_LAST_APP_BUILD_ID, ""),
+    "",
+    "fresh version with no saved build ID"
+  );
+  Assert.ok(Services.appinfo.appBuildID, "build ID is set before a startup");
+
+  await promiseStartupManager();
+  Assert.equal(
+    Services.prefs.getCharPref(PREF_EM_LAST_APP_BUILD_ID, ""),
+    Services.appinfo.appBuildID,
+    "build ID is correct after a startup"
+  );
+
+  await promiseShutdownManager();
+});
+
 // Try to install all the items into the profile
 add_task(async function test_scan_profile() {
   await promiseStartupManager();
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup_scan.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup_scan.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup_scan.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_startup_scan.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,125 @@
+"use strict";
+
+// Turn off startup scanning.
+Services.prefs.setIntPref("extensions.startupScanScopes", 0);
+
+createAppInfo("xpcshell@tessts.mozilla.org", "XPCShell", "42", "42");
+// Prevent XPIStates.scanForChanges from seeing this as an update and forcing a
+// full scan.
+Services.prefs.setCharPref(
+  "extensions.lastAppBuildId",
+  Services.appinfo.appBuildID
+);
+
+// A small bootstrap calls monitor targeting a single extension (created to avoid introducing a workaround
+// in BootstrapMonitor to be able to test Bug 1664144 fix).
+let Monitor = {
+  extensionId: undefined,
+  collected: [],
+  init() {
+    const bootstrapCallListener = (_evtName, data) => {
+      if (data.params.id == this.extensionId) {
+        this.collected.push(data);
+      }
+    };
+    AddonTestUtils.on("bootstrap-method", bootstrapCallListener);
+    registerCleanupFunction(() => {
+      AddonTestUtils.off("bootstrap-method", bootstrapCallListener);
+    });
+  },
+  startCollecting(extensionId) {
+    this.extensionId = extensionId;
+  },
+  stopCollecting() {
+    this.extensionId = undefined;
+  },
+  getCollected() {
+    const collected = this.collected;
+    this.collected = [];
+    return collected;
+  },
+};
+
+Monitor.init();
+
+// Bug 1664144: Test that during startup scans, updating an addon
+// that has already started is restarted.
+add_task(async function test_startup_sideload_updated() {
+  const ID = "sideload@tests.mozilla.org";
+
+  await createWebExtension(ID, initialVersion("1"), profileDir);
+  await promiseStartupManager();
+
+  // Ensure the sideload is enabled and running.
+  let addon = await promiseAddonByID(ID);
+
+  Monitor.startCollecting(ID);
+  await addon.enable();
+  Monitor.stopCollecting();
+
+  let events = Monitor.getCollected();
+  ok(events.length, "bootstrap methods called");
+  equal(
+    events[0].reason,
+    BOOTSTRAP_REASONS.ADDON_ENABLE,
+    "Startup reason is ADDON_ENABLE at install"
+  );
+
+  await promiseShutdownManager();
+  // Touch the addon on disk before startup.
+  await createWebExtension(ID, initialVersion("1.1"), profileDir);
+  Monitor.startCollecting(ID);
+  await promiseStartupManager();
+  await AddonManagerPrivate.getNewSideloads();
+  Monitor.stopCollecting();
+
+  events = Monitor.getCollected().map(({ method, reason, params }) => {
+    const { version } = params;
+    return { method, reason, version };
+  });
+
+  const updatedVersion = "1.1.0";
+  const expectedUpgradeParams = {
+    reason: BOOTSTRAP_REASONS.ADDON_UPGRADE,
+    version: updatedVersion,
+  };
+
+  const expectedCalls = [
+    {
+      method: "startup",
+      reason: BOOTSTRAP_REASONS.APP_STARTUP,
+      version: "1.0",
+    },
+    // Shutdown call has version 1.1 because the file was already
+    // updated on disk and got the new version as part of the startup.
+    { method: "shutdown", ...expectedUpgradeParams },
+    { method: "update", ...expectedUpgradeParams },
+    { method: "startup", ...expectedUpgradeParams },
+  ];
+
+  for (let i = 0; i < expectedCalls.length; i++) {
+    Assert.deepEqual(
+      events[i],
+      expectedCalls[i],
+      "Got the expected sequence of bootstrap method calls"
+    );
+  }
+
+  equal(
+    events.length,
+    expectedCalls.length,
+    "Got the expected number of bootstrap method calls"
+  );
+
+  // flush addonStartup.json
+  await AddonTestUtils.loadAddonsList(true);
+  // verify startupData is correct
+  let startupData = aomStartup.readStartupData();
+  Assert.equal(
+    startupData["app-profile"].addons[ID].version,
+    updatedVersion,
+    "startup data is correct in cache"
+  );
+
+  await promiseShutdownManager();
+});
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_system_delay_update.js	2021-01-18 19:58:27.000000000 +0000
@@ -21,6 +21,10 @@
 const distroDir = FileUtils.getDir("ProfD", ["sysfeatures"], true);
 registerDirectory("XREAppFeat", distroDir);
 
+registerCleanupFunction(() => {
+  distroDir.remove(true);
+});
+
 AddonTestUtils.usePrivilegedSignatures = id => "system";
 
 createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "42");
@@ -103,16 +107,26 @@
   });
 }
 
+async function checkAddon(addonID, { version }) {
+  let addon = await promiseAddonByID(addonID);
+  Assert.notEqual(addon, null);
+  Assert.equal(addon.version, version);
+  Assert.ok(addon.isCompatible);
+  Assert.ok(!addon.appDisabled);
+  Assert.ok(addon.isActive);
+  Assert.equal(addon.type, "extension");
+}
+
 // Tests below have webextension background scripts inline.
 /* globals browser */
 
 // add-on registers upgrade listener, and ignores update.
-add_task(async function() {
+add_task(async function test_addon_upgrade_on_restart() {
   // discard system addon updates
   Services.prefs.setCharPref(PREF_SYSTEM_ADDON_SET, "");
 
   let xpi = await getSystemAddonXPI(1, "1.0");
-  xpi.copyTo(distroDir, "system1@tests.mozilla.org.xpi");
+  xpi.copyTo(distroDir, `${NORMAL_ID}.xpi`);
 
   // Version 1.0 of an extension that ignores updates.
   function background() {
@@ -167,52 +181,26 @@
   ]);
 
   // addon upgrade has been delayed.
-  let addon_postponed = await promiseAddonByID(IGNORE_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
-
+  await checkAddon(IGNORE_ID, { version: "1.0" });
   // other addons in the set are delayed as well.
-  addon_postponed = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
+  await checkAddon(NORMAL_ID, { version: "1.0" });
 
   // restarting allows upgrades to proceed
   await Promise.all([promiseRestartManager(), extension.awaitStartup()]);
 
-  let addon_upgraded = await promiseAddonByID(IGNORE_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
-
-  addon_upgraded = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
+  await checkAddon(IGNORE_ID, { version: "2.0" });
+  await checkAddon(NORMAL_ID, { version: "2.0" });
 
   await promiseShutdownManager();
 });
 
 // add-on registers upgrade listener, and allows update.
-add_task(async function() {
+add_task(async function test_addon_upgrade_on_reload() {
   // discard system addon updates
   Services.prefs.setCharPref(PREF_SYSTEM_ADDON_SET, "");
 
   let xpi = await getSystemAddonXPI(1, "1.0");
-  xpi.copyTo(distroDir, "system1@tests.mozilla.org.xpi");
+  xpi.copyTo(distroDir, `${NORMAL_ID}.xpi`);
 
   // Version 1.0 of an extension that listens for and immediately
   // applies updates.
@@ -264,21 +252,8 @@
   ];
 
   // initial state
-  let addon_allowed = await promiseAddonByID(COMPLETE_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "1.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
-
-  addon_allowed = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "1.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
+  await checkAddon(COMPLETE_ID, { version: "1.0" });
+  await checkAddon(NORMAL_ID, { version: "1.0" });
 
   // We should see that the onUpdateListener executed, then see the
   // update resume.
@@ -287,51 +262,28 @@
     promiseInstallResumed(COMPLETE_ID, NORMAL_ID),
     installSystemAddons(buildSystemAddonUpdates(updateList)),
   ]);
+  await extension.awaitStartup();
 
   // addon upgrade has been allowed
-  addon_allowed = await promiseAddonByID(COMPLETE_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
-
+  await checkAddon(COMPLETE_ID, { version: "2.0" });
   // other upgrades in the set are allowed as well
-  addon_allowed = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
+  await checkAddon(NORMAL_ID, { version: "2.0" });
 
   // restarting changes nothing
   await Promise.all([promiseRestartManager(), extension.awaitStartup()]);
 
-  let addon_upgraded = await promiseAddonByID(COMPLETE_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
-
-  addon_upgraded = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
+  await checkAddon(COMPLETE_ID, { version: "2.0" });
+  await checkAddon(NORMAL_ID, { version: "2.0" });
 
   await promiseShutdownManager();
 });
 
 function delayBackground() {
   browser.test.onMessage.addListener(msg => {
+    if (msg !== "reload") {
+      browser.test.fail(`Got unexpected test message: ${msg}`);
+    }
     browser.runtime.reload();
-    browser.test.sendMessage("reloaded");
   });
   browser.runtime.onUpdateAvailable.addListener(async function listener() {
     browser.runtime.onUpdateAvailable.removeListener(listener);
@@ -340,12 +292,12 @@
 }
 
 // Upgrade listener initially defers then proceeds after a pause.
-add_task(async function() {
+add_task(async function test_addon_upgrade_after_pause() {
   // discard system addon updates
   Services.prefs.setCharPref(PREF_SYSTEM_ADDON_SET, "");
 
   let xpi = await getSystemAddonXPI(1, "1.0");
-  xpi.copyTo(distroDir, "system1@tests.mozilla.org.xpi");
+  xpi.copyTo(distroDir, `${NORMAL_ID}.xpi`);
 
   // Version 1.0 of an extension that delays upgrades.
   xpi = await createTempWebExtensionFile({
@@ -393,73 +345,36 @@
   ]);
 
   // upgrade is initially postponed
-  let addon_postponed = await promiseAddonByID(DEFER_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
-
+  await checkAddon(DEFER_ID, { version: "1.0" });
   // other addons in the set are postponed as well.
-  addon_postponed = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
+  await checkAddon(NORMAL_ID, { version: "1.0" });
 
   let deferred = promiseInstallDeferred(DEFER_ID, NORMAL_ID);
 
   // Tell the extension to proceed with the update.
-  extension.sendMessage("go");
+  extension.setRestarting();
+  extension.sendMessage("reload");
 
-  await Promise.all([deferred, extension.awaitMessage("reloaded")]);
+  await Promise.all([deferred, extension.awaitStartup()]);
 
   // addon upgrade has been allowed
-  let addon_allowed = await promiseAddonByID(DEFER_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
-
+  await checkAddon(DEFER_ID, { version: "2.0" });
   // other addons in the set are allowed as well.
-  addon_allowed = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
+  await checkAddon(NORMAL_ID, { version: "2.0" });
 
   // restarting changes nothing
   await promiseRestartManager();
+  await extension.awaitStartup();
 
-  let addon_upgraded = await promiseAddonByID(DEFER_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
-
-  addon_upgraded = await promiseAddonByID(NORMAL_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
+  await checkAddon(DEFER_ID, { version: "2.0" });
+  await checkAddon(NORMAL_ID, { version: "2.0" });
 
   await promiseShutdownManager();
 });
 
 // Multiple add-ons register update listeners, initially defers then
 // each unblock in turn.
-add_task(async function() {
+add_task(async function test_multiple_addon_upgrade_postpone() {
   // discard system addon updates.
   Services.prefs.setCharPref(PREF_SYSTEM_ADDON_SET, "");
 
@@ -528,73 +443,33 @@
   ]);
 
   // upgrade is initially postponed
-  let addon_postponed = await promiseAddonByID(DEFER2_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
-
+  await checkAddon(DEFER2_ID, { version: "1.0" });
   // other addons in the set are postponed as well.
-  addon_postponed = await promiseAddonByID(DEFER_ALSO_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
+  await checkAddon(DEFER_ALSO_ID, { version: "1.0" });
 
   let deferred = promiseInstallDeferred(DEFER2_ID, DEFER_ALSO_ID);
 
   // Let one extension request that the update proceed.
-  extension1.sendMessage("go");
-  await extension1.awaitMessage("reloaded");
+  extension1.setRestarting();
+  extension1.sendMessage("reload");
 
   // Upgrade blockers still present.
-  addon_postponed = await promiseAddonByID(DEFER2_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
-
-  addon_postponed = await promiseAddonByID(DEFER_ALSO_ID);
-  Assert.notEqual(addon_postponed, null);
-  Assert.equal(addon_postponed.version, "1.0");
-  Assert.ok(addon_postponed.isCompatible);
-  Assert.ok(!addon_postponed.appDisabled);
-  Assert.ok(addon_postponed.isActive);
-  Assert.equal(addon_postponed.type, "extension");
+  await checkAddon(DEFER2_ID, { version: "1.0" });
+  await checkAddon(DEFER_ALSO_ID, { version: "1.0" });
 
   // Let the second extension allow the update to proceed.
-  extension2.sendMessage("go");
+  extension2.setRestarting();
+  extension2.sendMessage("reload");
 
   await Promise.all([
-    extension2.awaitMessage("reloaded"),
     deferred,
     extension1.awaitStartup(),
     extension2.awaitStartup(),
   ]);
 
   // addon upgrade has been allowed
-  let addon_allowed = await promiseAddonByID(DEFER2_ID);
-  Assert.notEqual(addon_allowed, null);
-  Assert.equal(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
-
-  // other addons in the set are allowed as well.
-  addon_allowed = await promiseAddonByID(DEFER_ALSO_ID);
-  Assert.notEqual(addon_allowed, null);
-  // do_check_eq(addon_allowed.version, "2.0");
-  Assert.ok(addon_allowed.isCompatible);
-  Assert.ok(!addon_allowed.appDisabled);
-  Assert.ok(addon_allowed.isActive);
-  Assert.equal(addon_allowed.type, "extension");
+  await checkAddon(DEFER2_ID, { version: "2.0" });
+  await checkAddon(DEFER_ALSO_ID, { version: "2.0" });
 
   // restarting changes nothing
   await Promise.all([
@@ -603,21 +478,8 @@
     extension2.awaitStartup(),
   ]);
 
-  let addon_upgraded = await promiseAddonByID(DEFER2_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
-
-  addon_upgraded = await promiseAddonByID(DEFER_ALSO_ID);
-  Assert.notEqual(addon_upgraded, null);
-  Assert.equal(addon_upgraded.version, "2.0");
-  Assert.ok(addon_upgraded.isCompatible);
-  Assert.ok(!addon_upgraded.appDisabled);
-  Assert.ok(addon_upgraded.isActive);
-  Assert.equal(addon_upgraded.type, "extension");
+  await checkAddon(DEFER2_ID, { version: "2.0" });
+  await checkAddon(DEFER_ALSO_ID, { version: "2.0" });
 
   await promiseShutdownManager();
 });
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/test_webextension_langpack.js	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,12 @@
   "resource://gre/modules/ExtensionUtils.jsm"
 );
 
+XPCOMUtils.defineLazyGetter(this, "resourceProtocol", () =>
+  Services.io
+    .getProtocolHandler("resource")
+    .QueryInterface(Ci.nsIResProtocolHandler)
+);
+
 Services.prefs.setBoolPref(PREF_EM_CHECK_UPDATE_SECURITY, false);
 
 const ID = "langpack-und@test.mozilla.org";
@@ -299,10 +305,52 @@
   await promiseShutdownManager();
 });
 
+add_task(async function test_langpack_app_shutdown() {
+  let langpackId = `langpack-und-${AppConstants.MOZ_BUILD_APP.replace(
+    "/",
+    "-"
+  )}`;
+  let check = (yes, msg) => {
+    equal(resourceProtocol.hasSubstitution(langpackId), yes, msg);
+  };
+
+  await promiseStartupManager();
+
+  check(false, "no initial resource substitution");
+
+  await Promise.all([
+    promiseLangpackStartup(),
+    AddonTestUtils.promiseInstallXPI(ADDONS.langpack_1),
+  ]);
+
+  check(true, "langpack resource available after startup");
+
+  await promiseShutdownManager();
+
+  check(true, "langpack resource available after app shutdown");
+
+  await promiseStartupManager();
+
+  let addon = await AddonManager.getAddonByID(ID);
+  await addon.uninstall();
+
+  check(false, "langpack resource removed during shutdown for uninstall");
+
+  await promiseShutdownManager();
+});
+
 add_task(async function test_amazing_disappearing_langpacks() {
   let check = yes => {
-    equal(L10nRegistry.getAvailableLocales().includes("und"), yes);
-    equal(Services.locale.availableLocales.includes("und"), yes);
+    equal(
+      L10nRegistry.getAvailableLocales().includes("und"),
+      yes,
+      "check L10nRegistry"
+    );
+    equal(
+      Services.locale.availableLocales.includes("und"),
+      yes,
+      "check availableLocales"
+    );
   };
 
   await promiseStartupManager();
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -67,9 +67,6 @@
 [test_pluginchange.js]
 run-if = appname == "firefox"
 reason = PluginProvider.jsm is only shipped with desktop Firefox
-[test_plugins.js]
-run-if = appname == "firefox"
-reason = PluginProvider.jsm is only shipped with desktop Firefox
 [test_pref_properties.js]
 [test_provider_markSafe.js]
 [test_provider_shutdown.js]
@@ -112,6 +109,8 @@
 head = head_addons.js head_sideload.js
 skip-if = os == "linux" # Bug 1613268
 [test_startup_enable.js]
+[test_startup_scan.js]
+head = head_addons.js head_sideload.js
 [test_strictcompatibility.js]
 head = head_addons.js head_compat.js
 [test_syncGUID.js]
@@ -119,7 +118,6 @@
 head = head_addons.js head_system_addons.js
 [test_system_delay_update.js]
 head = head_addons.js head_system_addons.js
-skip-if = true # Bug 1495021
 [test_system_profile_location.js]
 [test_system_repository.js]
 head = head_addons.js head_system_addons.js
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js firefox-85.0+build1/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpinstall/browser_doorhanger_installs.js	2021-01-18 19:58:27.000000000 +0000
@@ -131,6 +131,7 @@
     dismiss = false,
     checkIncognito = false,
     incognitoChecked = false,
+    privileged = false,
     global = window,
   } = {}
 ) {
@@ -167,7 +168,7 @@
       let checkbox = document.getElementById("addon-incognito-checkbox");
       is(
         checkbox.hidden,
-        allowPrivate && !checkIncognito,
+        privileged || (allowPrivate && !checkIncognito),
         "checkbox visibility is correct"
       );
       is(checkbox.checked, incognitoChecked, "checkbox is marked as expected");
@@ -533,6 +534,48 @@
     await SpecialPowers.popPrefEnv();
   },
 
+  async function test_priviledgedNo3rdPartyPrompt() {
+    SpecialPowers.pushPrefEnv({
+      set: [["extensions.postDownloadThirdPartyPrompt", true]],
+    });
+    AddonManager.checkUpdateSecurity = false;
+    registerCleanupFunction(() => {
+      AddonManager.checkUpdateSecurity = true;
+    });
+
+    let triggers = encodeURIComponent(
+      JSON.stringify({
+        XPI: "privileged.xpi",
+      })
+    );
+
+    let installDialogPromise = waitForInstallDialog();
+
+    let tab = await BrowserTestUtils.openNewForegroundTab(
+      gBrowser,
+      TESTROOT + "installtrigger.html?" + triggers
+    );
+
+    let notificationPromise = acceptAppMenuNotificationWhenShown(
+      "addon-installed",
+      "test@tests.mozilla.org",
+      { privileged: true }
+    );
+
+    (await installDialogPromise).button.click();
+    await notificationPromise;
+
+    let installs = await AddonManager.getAllInstalls();
+    is(installs.length, 0, "Should be no pending installs");
+
+    let addon = await AddonManager.getAddonByID("test@tests.mozilla.org");
+    await addon.uninstall();
+
+    await BrowserTestUtils.removeTab(tab);
+    await SpecialPowers.popPrefEnv();
+    AddonManager.checkUpdateSecurity = true;
+  },
+
   async function test_permaBlockInstall() {
     let notificationPromise = waitForNotification("addon-install-blocked");
     let triggers = encodeURIComponent(
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpinstall/browser.ini firefox-85.0+build1/toolkit/mozapps/extensions/test/xpinstall/browser.ini
--- firefox-84.0.2+build1/toolkit/mozapps/extensions/test/xpinstall/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/extensions/test/xpinstall/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -22,6 +22,7 @@
   startsoftwareupdate.html
   triggerredirect.html
   unsigned.xpi
+  ../xpcshell/data/signing_checks/privileged.xpi
 
 [browser_amosigned_trigger.js]
 [browser_amosigned_trigger_iframe.js]
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/handling/ContentDispatchChooser.jsm firefox-85.0+build1/toolkit/mozapps/handling/ContentDispatchChooser.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/handling/ContentDispatchChooser.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/handling/ContentDispatchChooser.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -14,11 +14,219 @@
 const DIALOG_URL_PERMISSION =
   "chrome://mozapps/content/handling/permissionDialog.xhtml";
 
-var EXPORTED_SYMBOLS = ["nsContentDispatchChooser"];
+var EXPORTED_SYMBOLS = [
+  "nsContentDispatchChooser",
+  "ContentDispatchChooserTelemetry",
+];
 
 const PROTOCOL_HANDLER_OPEN_PERM_KEY = "open-protocol-handler";
 const PERMISSION_KEY_DELIMITER = "^";
 
+let ContentDispatchChooserTelemetry = {
+  /**
+   * Maps protocol scheme to telemetry label.
+   */
+  SCHEME_TO_LABEL: {
+    bingmaps: "BING",
+    bingweather: "BING",
+    fb: "FACEBOOK",
+    fbmessenger: "FACEBOOK",
+    findmy: "APPLE_FINDMY",
+    findmyfriends: "APPLE_FINDMY",
+    fmf1: "APPLE_FINDMY",
+    fmip1: "APPLE_FINDMY",
+    git: "GIT",
+    "git-client": "GIT",
+    grenada: "APPLE_FINDMY",
+    ichat: "IMESSAGE",
+    im: "INSTANT_MESSAGE",
+    imessage: "IMESSAGE",
+    ipp: "IPP",
+    ipps: "IPP",
+    irc: "IRC",
+    irc6: "IRC",
+    ircs: "IRC",
+    itals: "APPLE_LIVESTREAM",
+    italss: "APPLE_LIVESTREAM",
+    itls: "APPLE_LIVESTREAM",
+    itlss: "APPLE_LIVESTREAM",
+    itms: "APPLE_MUSIC",
+    itmss: "APPLE_MUSIC",
+    itsradio: "APPLE_MUSIC",
+    itunes: "APPLE_MUSIC",
+    itunesradio: "APPLE_MUSIC",
+    itvls: "APPLE_LIVESTREAM",
+    itvlss: "APPLE_LIVESTREAM",
+    macappstore: "MACAPPSTORE",
+    macappstores: "MACAPPSTORE",
+    map: "MAP",
+    mapitem: "MAP",
+    maps: "MAP",
+    message: "MESSAGE",
+    messages: "MESSAGE",
+    microsoftmusic: "MICROSOFT_APP",
+    microsoftvideo: "MICROSOFT_APP",
+    mswindowsmusic: "MICROSOFT_APP",
+    music: "MUSIC",
+    musics: "MUSIC",
+    onenote: "ONENOTE",
+    "onenote-cmd": "ONENOTE",
+    pcast: "PODCAST",
+    podcast: "PODCAST",
+    podcasts: "PODCAST",
+    search: "SEARCH",
+    "search-ms": "SEARCH",
+    sip: "SIP",
+    sips: "SIP",
+    skype: "SKYPE",
+    "skype-meetnow": "SKYPE",
+    skypewin: "SKYPE",
+    tg: "TELEGRAM",
+    tv: "TELEVISION",
+    zoommtg: "ZOOM",
+    zoompbx: "ZOOM",
+    zoomus: "ZOOM",
+    zune: "MICROSOFT_APP",
+  },
+
+  /**
+   * Maps protocol scheme prefix to telemetry label.
+   */
+  SCHEME_PREFIX_TO_LABEL: {
+    apple: "APPLE",
+    "com.microsoft": "MICROSOFT_APP",
+    facetime: "FACETIME",
+    "fb-messenger": "FACEBOOK",
+    icloud: "ICLOUD",
+    "itms-": "APPLE_MUSIC",
+    microsoft: "MICROSOFT_APP",
+    "ms-": "MICROSOFT_APP",
+    outlook: "OUTLOOK",
+    photos: "PHOTOS",
+    "web+": "WEBHANDLER",
+    windows: "WINDOWS_PREFIX",
+    "x-apple": "APPLE",
+    xbox: "XBOX",
+  },
+
+  /**
+   * Sandbox flags for telemetry
+   * Copied from nsSandboxFlags.h
+   */
+  SANDBOXED_AUXILIARY_NAVIGATION: 0x2,
+  SANDBOXED_TOPLEVEL_NAVIGATION: 0x4,
+  SANDBOXED_TOPLEVEL_NAVIGATION_USER_ACTIVATION: 0x20000,
+
+  /**
+   * Lazy getter for labels of the external protocol navigation telemetry probe.
+   * @returns {string[]} - An array of histogram labels.
+   */
+  get _telemetryLabels() {
+    if (!this._telemetryLabelArray) {
+      this._telemetryLabelArray = Services.telemetry.getCategoricalLabels().EXTERNAL_PROTOCOL_HANDLER_DIALOG_CONTEXT_SCHEME;
+    }
+    return this._telemetryLabelArray;
+  },
+
+  /**
+   * Get histogram label by protocol scheme.
+   * @param {string} aScheme - Protocol scheme to map to histogram label.
+   * @returns {string} - Label.
+   */
+  _getTelemetryLabel(aScheme) {
+    if (!aScheme) {
+      throw new Error("Invalid scheme");
+    }
+    let labels = this._telemetryLabels;
+
+    // Custom scheme-to-label mappings
+    let mappedLabel = this.SCHEME_TO_LABEL[aScheme];
+    if (mappedLabel) {
+      return mappedLabel;
+    }
+
+    // Prefix mappings
+    for (let prefix of Object.keys(this.SCHEME_PREFIX_TO_LABEL)) {
+      if (aScheme.startsWith(prefix)) {
+        return this.SCHEME_PREFIX_TO_LABEL[prefix];
+      }
+    }
+
+    // Test if we have a label for the protocol scheme.
+    // If not, we use the "OTHER" label.
+    if (labels.includes(aScheme)) {
+      return aScheme;
+    }
+
+    return "OTHER";
+  },
+
+  /**
+   * Determine if a load was triggered from toplevel or an iframe
+   * (cross origin, same origin, sandboxed).
+   *
+   * @param {BrowsingContext} [aBrowsingContext] - Context of the load.
+   * @param {nsIPrincipal} [aTriggeringPrincipal] - Principal which triggered
+   * the load.
+   * @returns {string} - Histogram key. May return "UNKNOWN".
+   */
+  _getTelemetryKey(aBrowsingContext, aTriggeringPrincipal) {
+    if (!aBrowsingContext) {
+      return "UNKNOWN";
+    }
+    if (aBrowsingContext.top == aBrowsingContext) {
+      return "TOPLEVEL";
+    }
+
+    let { sandboxFlags } = aBrowsingContext;
+    if (sandboxFlags) {
+      // Iframe is sandboxed. Determine whether it sets allow flags relevant
+      // for the external protocol navigation.
+      if (
+        !(sandboxFlags & this.SANDBOXED_TOPLEVEL_NAVIGATION) ||
+        !(sandboxFlags & this.SANDBOXED_TOPLEVEL_NAVIGATION_USER_ACTIVATION) ||
+        !(sandboxFlags & this.SANDBOXED_AUXILIARY_NAVIGATION)
+      ) {
+        return "SUB_SANDBOX_ALLOW";
+      }
+      return "SUB_SANDBOX_NOALLOW";
+    }
+
+    // We're in a frame, check if the frame is cross origin with the top context.
+    if (!aTriggeringPrincipal) {
+      return "UNKNOWN";
+    }
+
+    let topLevelPrincipal =
+      aBrowsingContext.top.embedderElement?.contentPrincipal;
+    if (!topLevelPrincipal) {
+      return "UNKNOWN";
+    }
+
+    if (topLevelPrincipal.isThirdPartyPrincipal(aTriggeringPrincipal)) {
+      return "SUB_CROSSORIGIN";
+    }
+
+    return "SUB_SAMEORIGIN";
+  },
+
+  /**
+   * Record telemetry for the external protocol handler dialog.
+   * @param {string} aScheme - Scheme of the protocol being loaded.
+   * @param {BrowsingContext} [aBrowsingContext] - Context of the load.
+   * @param {nsIPrincipal} [aTriggeringPrincipal] - Principal which triggered
+   * the load.
+   */
+  recordTelemetry(aScheme, aBrowsingContext, aTriggeringPrincipal) {
+    let type = this._getTelemetryKey(aBrowsingContext, aTriggeringPrincipal);
+    let label = this._getTelemetryLabel(aScheme);
+
+    Services.telemetry
+      .getKeyedHistogramById("EXTERNAL_PROTOCOL_HANDLER_DIALOG_CONTEXT_SCHEME")
+      .add(type, label);
+  },
+};
+
 class nsContentDispatchChooser {
   /**
    * Prompt the user to open an external application.
@@ -59,6 +267,17 @@
       }
     }
 
+    // We will show a prompt, record telemetry.
+    try {
+      ContentDispatchChooserTelemetry.recordTelemetry(
+        aHandler.type,
+        aBrowsingContext,
+        aPrincipal
+      );
+    } catch (error) {
+      Cu.reportError(error);
+    }
+
     let shouldOpenHandler = false;
     try {
       shouldOpenHandler = await this._prompt(
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/installer/upload-files.mk firefox-85.0+build1/toolkit/mozapps/installer/upload-files.mk
--- firefox-84.0.2+build1/toolkit/mozapps/installer/upload-files.mk	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/installer/upload-files.mk	2021-01-18 19:58:27.000000000 +0000
@@ -273,6 +273,7 @@
 	pk12util* \
 	BadCertAndPinningServer* \
 	DelegatedCredentialsServer* \
+	EncryptedClientHelloServer* \
 	OCSPStaplingServer* \
 	SanctionsTestServer* \
 	GenerateOCSPResponse* \
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/update/updater/launchchild_osx.mm firefox-85.0+build1/toolkit/mozapps/update/updater/launchchild_osx.mm
--- firefox-84.0.2+build1/toolkit/mozapps/update/updater/launchchild_osx.mm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/update/updater/launchchild_osx.mm	2021-01-18 19:58:27.000000000 +0000
@@ -11,8 +11,16 @@
 #include <stdio.h>
 #include <spawn.h>
 #include <SystemConfiguration/SystemConfiguration.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #include "readstrings.h"
 
+#define ARCH_PATH "/usr/bin/arch"
+#if defined(__x86_64__)
+// Work around the fact that this constant is not available in the macOS SDK
+#  define kCFBundleExecutableArchitectureARM64 0x0100000c
+#endif
+
 class MacAutoreleasePool {
  public:
   MacAutoreleasePool() { mPool = [[NSAutoreleasePool alloc] init]; }
@@ -22,12 +30,122 @@
   NSAutoreleasePool* mPool;
 };
 
+#if defined(__x86_64__)
+/*
+ * Returns true if the process is running under Rosetta translation. Returns
+ * false if running natively or if an error was encountered. We use the
+ * `sysctl.proc_translated` sysctl which is documented by Apple to be used
+ * for this purpose.
+ */
+bool IsProcessRosettaTranslated() {
+  int ret = 0;
+  size_t size = sizeof(ret);
+  if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1) {
+    if (errno != ENOENT) {
+      fprintf(stderr, "Failed to check for translation environment\n");
+    }
+    return false;
+  }
+  return (ret == 1);
+}
+
+// Returns true if the binary at |executablePath| can be executed natively
+// on an arm64 Mac. Returns false otherwise or if an error occurred.
+bool IsBinaryArmExecutable(const char* executablePath) {
+  bool isArmExecutable = false;
+
+  CFURLRef url = ::CFURLCreateFromFileSystemRepresentation(
+      kCFAllocatorDefault, (const UInt8*)executablePath, strlen(executablePath), false);
+  if (!url) {
+    return false;
+  }
+
+  CFArrayRef archs = ::CFBundleCopyExecutableArchitecturesForURL(url);
+  if (!archs) {
+    CFRelease(url);
+    return false;
+  }
+
+  CFIndex archCount = ::CFArrayGetCount(archs);
+  for (CFIndex i = 0; i < archCount; i++) {
+    CFNumberRef currentArch = static_cast<CFNumberRef>(::CFArrayGetValueAtIndex(archs, i));
+    int currentArchInt = 0;
+    if (!::CFNumberGetValue(currentArch, kCFNumberIntType, &currentArchInt)) {
+      continue;
+    }
+    if (currentArchInt == kCFBundleExecutableArchitectureARM64) {
+      isArmExecutable = true;
+      break;
+    }
+  }
+
+  CFRelease(url);
+  CFRelease(archs);
+
+  return isArmExecutable;
+}
+
+// Returns true if the executable provided in |executablePath| should be
+// launched with a preference for arm64. After updating from an x64 version
+// running under Rosetta, if the update is to a universal binary with arm64
+// support we want to switch to arm64 execution mode. Returns true if those
+// conditions are met and the arch(1) utility at |archPath| is executable.
+// It should be safe to always launch with arch and fallback to x64, but we
+// limit its use to the only scenario it is necessary to minimize risk.
+bool ShouldPreferArmLaunch(const char* archPath, const char* executablePath) {
+  // If not running under Rosetta, we are not on arm64 hardware.
+  if (!IsProcessRosettaTranslated()) {
+    return false;
+  }
+
+  // Ensure the arch(1) utility is present and executable.
+  NSFileManager* fileMgr = [NSFileManager defaultManager];
+  NSString* archPathString = [NSString stringWithUTF8String:archPath];
+  if (![fileMgr isExecutableFileAtPath:archPathString]) {
+    return false;
+  }
+
+  // Ensure the binary can be run natively on arm64.
+  return IsBinaryArmExecutable(executablePath);
+}
+#endif  // __x86_64__
+
 void LaunchChild(int argc, const char** argv) {
   MacAutoreleasePool pool;
 
   @try {
-    NSString* launchPath = [NSString stringWithUTF8String:argv[0]];
-    NSMutableArray* arguments = [NSMutableArray arrayWithCapacity:argc - 1];
+    bool preferArmLaunch = false;
+
+#if defined(__x86_64__)
+    // When running under Rosetta, child processes inherit the architecture
+    // preference of their parent and therefore universal binaries launched
+    // by an emulated x64 process will launch in x64 mode. If we are running
+    // under Rosetta, launch the child process with a preference for arm64 so
+    // that we will switch to arm64 execution if we have just updated from
+    // x64 to a universal build. This includes if we were already a universal
+    // build and the user is intentionally running under Rosetta.
+    preferArmLaunch = ShouldPreferArmLaunch(ARCH_PATH, argv[0]);
+#endif  // __x86_64__
+
+    NSString* launchPath;
+    NSMutableArray* arguments;
+
+    if (preferArmLaunch) {
+      launchPath = [NSString stringWithUTF8String:ARCH_PATH];
+
+      // Size the arguments array to include all the arguments
+      // in |argv| plus two arguments to pass to the arch(1) utility.
+      arguments = [NSMutableArray arrayWithCapacity:argc + 2];
+      [arguments addObject:[NSString stringWithUTF8String:"-arm64"]];
+      [arguments addObject:[NSString stringWithUTF8String:"-x86_64"]];
+
+      // Add the first argument from |argv|. The rest are added below.
+      [arguments addObject:[NSString stringWithUTF8String:argv[0]]];
+    } else {
+      launchPath = [NSString stringWithUTF8String:argv[0]];
+      arguments = [NSMutableArray arrayWithCapacity:argc - 1];
+    }
+
     for (int i = 1; i < argc; i++) {
       [arguments addObject:[NSString stringWithUTF8String:argv[i]]];
     }
diff -Nru firefox-84.0.2+build1/toolkit/mozapps/update/UpdateService.jsm firefox-85.0+build1/toolkit/mozapps/update/UpdateService.jsm
--- firefox-84.0.2+build1/toolkit/mozapps/update/UpdateService.jsm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/mozapps/update/UpdateService.jsm	2021-01-18 19:58:27.000000000 +0000
@@ -2325,6 +2325,15 @@
    * notify the user of install success.
    */
   _postUpdateProcessing: function AUS__postUpdateProcessing() {
+    if (this.disabledByPolicy) {
+      // This function is a point when we can potentially enter the update
+      // system, even with update disabled. Make sure that we do not continue
+      // because update code can have side effects that are visible to the user
+      // and give the impression that updates are enabled. For example, if we
+      // can't write to the update directory, we might complain to the user that
+      // update is broken and they should reinstall.
+      return;
+    }
     gUpdateFileWriteInfo = { phase: "startup", failure: false };
     if (!this.canCheckForUpdates) {
       LOG(
@@ -2737,6 +2746,16 @@
   _checkForBackgroundUpdates: function AUS__checkForBackgroundUpdates(
     isNotify
   ) {
+    if (this.disabledByPolicy) {
+      // Return immediately if we are disabled by policy. Otherwise, just the
+      // telemetry we try to collect below can potentially trigger a restart
+      // prompt if the update directory isn't writable. And we shouldn't be
+      // telling the user about update failures if update is disabled.
+      // See Bug 1599590.
+      AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_DISABLED_BY_POLICY);
+      return;
+    }
+
     this._isNotify = isNotify;
 
     // Histogram IDs:
@@ -2887,11 +2906,6 @@
             this._pingSuffix,
             AUSTLMY.CHK_INVALID_DEFAULT_URL
           );
-        } else if (this.disabledByPolicy) {
-          AUSTLMY.pingCheckCode(
-            this._pingSuffix,
-            AUSTLMY.CHK_DISABLED_BY_POLICY
-          );
         } else if (!hasUpdateMutex()) {
           AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_NO_MUTEX);
         } else if (!this.canCheckForUpdates) {
diff -Nru firefox-84.0.2+build1/toolkit/pluginproblem/content/pluginProblemContent.css firefox-85.0+build1/toolkit/pluginproblem/content/pluginProblemContent.css
--- firefox-84.0.2+build1/toolkit/pluginproblem/content/pluginProblemContent.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/pluginproblem/content/pluginProblemContent.css	2021-01-18 19:58:27.000000000 +0000
@@ -14,97 +14,10 @@
   height: 200px;
 }
 
-:host(:-moz-handler-clicktoplay) .mainBox,
-:host(:-moz-handler-vulnerable-updatable) .mainBox,
-:host(:-moz-handler-vulnerable-no-update) .mainBox,
-:host(:-moz-handler-blocked) .mainBox {
-  -moz-user-focus: normal;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox:focus,
-:host(:-moz-handler-vulnerable-updatable) .mainBox:focus,
-:host(:-moz-handler-vulnerable-no-update) .mainBox:focus,
-:host(:-moz-handler-blocked) .mainBox:focus {
-  outline: 1px dotted;
-}
-
 .mainBox {
   width: inherit;
   height: inherit;
   overflow: hidden;
-  direction: ltr;
-  unicode-bidi: embed;
-  /* used to block inherited properties */
-  text-transform: none;
-  text-indent: 0;
-  cursor: initial;
-  white-space: initial;
-  word-spacing: initial;
-  letter-spacing: initial;
-  line-height: initial;
-  visibility: hidden;
-}
-
-.visible {
-  visibility: visible;
-}
-
-/* Initialize the overlay with visibility:hidden to prevent flickering if
-* the plugin is too small to show the overlay */
-.mainBox > .hoverBox,
-.mainBox > .closeIcon {
-  visibility: hidden;
-}
-
-.visible > .hoverBox,
-.visible > .closeIcon {
-  visibility: visible;
-}
-
-.mainBox[chromedir="rtl"] {
-  direction: rtl;
-}
-
-:host(:-moz-handler-clicktoplay) .hoverBox,
-:host(:-moz-handler-vulnerable-updatable) .hoverBox,
-:host(:-moz-handler-vulnerable-no-update) .hoverBox {
-  cursor: pointer;
-}
-
-.hoverBox > label {
   cursor: inherit;
-}
-.icon {
-  cursor: inherit;
-}
-
-.msg {
-  display: none;
-}
-
-:host(:-moz-handler-clicktoplay) .msgClickToPlay,
-:host(:-moz-handler-vulnerable-updatable) .msgVulnerabilityStatus,
-:host(:-moz-handler-vulnerable-updatable) .msgCheckForUpdates,
-:host(:-moz-handler-vulnerable-updatable) .msgClickToPlay,
-:host(:-moz-handler-vulnerable-no-update) .msgVulnerabilityStatus,
-:host(:-moz-handler-vulnerable-no-update) .msgClickToPlay,
-:host(:-moz-handler-blocked) .msgBlocked,
-:host(:-moz-handler-crashed) .msgCrashed {
-  display: block;
-}
-
-.submitStatus[status] {
-  display: -moz-box;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  height: 160px;
-}
-
-.submitStatus[status="noReport"]   .msgNoCrashReport,
-.submitStatus[status="please"]     .msgPleaseSubmit,
-.submitStatus[status="noSubmit"]   .msgNotSubmitted,
-.submitStatus[status="submitting"] .msgSubmitting,
-.submitStatus[status="success"]    .msgSubmitted,
-.submitStatus[status="failed"]     .msgSubmitFailed {
-  display: block;
+  visibility: hidden;
 }
diff -Nru firefox-84.0.2+build1/toolkit/profile/nsToolkitProfileService.cpp firefox-85.0+build1/toolkit/profile/nsToolkitProfileService.cpp
--- firefox-84.0.2+build1/toolkit/profile/nsToolkitProfileService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/profile/nsToolkitProfileService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/UniquePtrExtensions.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1836,7 +1837,14 @@
  * get essentially the same benefits as dedicated profiles provides.
  */
 bool nsToolkitProfileService::IsSnapEnvironment() {
-  return !!PR_GetEnv("SNAP_NAME");
+  // Copied from IsRunningAsASnap() in
+  // browser/components/shell/nsGNOMEShellService.cpp
+  // TODO: factor out this common code in one place.
+  const char* snap_name = PR_GetEnv("SNAP_NAME");
+  if (snap_name == nullptr) {
+    return false;
+  }
+  return (strcmp(snap_name, "firefox") == 0);
 }
 
 /**
diff -Nru firefox-84.0.2+build1/toolkit/profile/nsToolkitProfileService.h firefox-85.0+build1/toolkit/profile/nsToolkitProfileService.h
--- firefox-84.0.2+build1/toolkit/profile/nsToolkitProfileService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/profile/nsToolkitProfileService.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #ifndef nsToolkitProfileService_h
 #define nsToolkitProfileService_h
 
+#include "mozilla/LinkedList.h"
 #include "nsIToolkitProfileService.h"
 #include "nsIToolkitProfile.h"
 #include "nsIFactory.h"
diff -Nru firefox-84.0.2+build1/toolkit/profile/xpcshell/head.js firefox-85.0+build1/toolkit/profile/xpcshell/head.js
--- firefox-84.0.2+build1/toolkit/profile/xpcshell/head.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/profile/xpcshell/head.js	2021-01-18 19:58:27.000000000 +0000
@@ -73,7 +73,7 @@
   let env = Cc["@mozilla.org/process/environment;1"].getService(
     Ci.nsIEnvironment
   );
-  env.set("SNAP_NAME", "foo");
+  env.set("SNAP_NAME", "firefox");
 
   gIsLegacy = true;
 }
diff -Nru firefox-84.0.2+build1/toolkit/system/gnome/nsGIOService.cpp firefox-85.0+build1/toolkit/system/gnome/nsGIOService.cpp
--- firefox-84.0.2+build1/toolkit/system/gnome/nsGIOService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/system/gnome/nsGIOService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -24,18 +24,15 @@
 using namespace mozilla;
 
 // s. a. the code gtk_should_use_portal() uses to detect if in flatpak env
-// https://github.com/GNOME/gtk/blob/e0ce028c88858b96aeda9e41734a39a3a04f705d/gtk/gtkprivate.c#L272
+// https://gitlab.gnome.org/GNOME/gtk/-/blob/4300a5c609306ce77cbc8a3580c19201dccd8d13/gdk/gdk.c#L472
 static bool GetFlatpakPortalEnv() {
   bool shouldUsePortal;
-  char* path;
-  path = g_build_filename(g_get_user_runtime_dir(), "flatpak-info", nullptr);
-  if (g_file_test(path, G_FILE_TEST_EXISTS)) {
+  if (g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS)) {
     shouldUsePortal = true;
   } else {
     const char* portalEnvString = g_getenv("GTK_USE_PORTAL");
     shouldUsePortal = portalEnvString != nullptr && atoi(portalEnvString) != 0;
   }
-  g_free(path);
   return shouldUsePortal;
 }
 
@@ -424,12 +421,11 @@
   *aApp = nullptr;
 
   // Application in flatpak sandbox does not have access to the list
-  // of installed applications on the system. We use generic
-  // nsFlatpakHandlerApp which forwards launch call to the system.
+  // of installed applications on the system. We cannot use generic
+  // nsFlatpakHandlerApp which forwards launch call to the system
+  // because that would make for example address localhost:1234 fail to open
   if (GetShouldUseFlatpakPortal()) {
-    nsFlatpakHandlerApp* mozApp = new nsFlatpakHandlerApp();
-    NS_ADDREF(*aApp = mozApp);
-    return NS_OK;
+    return NS_ERROR_FAILURE;
   }
 
   GAppInfo* app_info = g_app_info_get_default_for_uri_scheme(
diff -Nru firefox-84.0.2+build1/toolkit/system/gnome/nsSystemAlertsService.cpp firefox-85.0+build1/toolkit/system/gnome/nsSystemAlertsService.cpp
--- firefox-84.0.2+build1/toolkit/system/gnome/nsSystemAlertsService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/system/gnome/nsSystemAlertsService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -68,8 +68,7 @@
   return alertListener->InitAlertAsync(aAlert, aAlertListener);
 }
 
-NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName,
-                                                nsIPrincipal* aPrincipal) {
+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName) {
   RefPtr<nsAlertsIconListener> listener = mActiveListeners.Get(aAlertName);
   if (!listener) {
     return NS_OK;
diff -Nru firefox-84.0.2+build1/toolkit/themes/linux/global/button.css firefox-85.0+build1/toolkit/themes/linux/global/button.css
--- firefox-84.0.2+build1/toolkit/themes/linux/global/button.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/linux/global/button.css	2021-01-18 19:58:27.000000000 +0000
@@ -30,7 +30,7 @@
 
 /* .......... hover state .......... */
 
-button:hover:not(:is(:active,[disabled="true"],[open="true"],[checked="true"],[default="true"])) {
+button:hover:not(:active,[disabled="true"],[open="true"],[checked="true"],[default="true"]) {
   color: -moz-buttonhovertext;
 }
 
diff -Nru firefox-84.0.2+build1/toolkit/themes/linux/global/in-content/common.css firefox-85.0+build1/toolkit/themes/linux/global/in-content/common.css
--- firefox-84.0.2+build1/toolkit/themes/linux/global/in-content/common.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/linux/global/in-content/common.css	2021-01-18 19:58:27.000000000 +0000
@@ -43,12 +43,6 @@
   margin-block: 6px;
 }
 
-xul|checkbox[checked] > xul|*.checkbox-check,
-xul|*.radio-check[selected] {
-  background-color: Field;
-  fill: FieldText;
-}
-
 xul|menulist:-moz-focusring::part(label-box) {
   outline: none;
 }
diff -Nru firefox-84.0.2+build1/toolkit/themes/osx/global/jar.mn firefox-85.0+build1/toolkit/themes/osx/global/jar.mn
--- firefox-84.0.2+build1/toolkit/themes/osx/global/jar.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/osx/global/jar.mn	2021-01-18 19:58:27.000000000 +0000
@@ -45,4 +45,3 @@
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
-  skin/classic/global/plugins/pluginHelp-16.png                      (plugins/pluginHelp-16.png)
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/aboutReader.css firefox-85.0+build1/toolkit/themes/shared/aboutReader.css
--- firefox-84.0.2+build1/toolkit/themes/shared/aboutReader.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/aboutReader.css	2021-01-18 19:58:27.000000000 +0000
@@ -344,7 +344,10 @@
   pointer-events: none;
 }
 
-/* Don't show hover styles while dropdowns are open, except in the dropdown. */
+/* Show the hover tooltip on non-dropdown buttons. */
+.button:not(.dropdown-toggle):hover > .hover-label,
+.button:not(.dropdown-toggle):-moz-focusring > .hover-label,
+/* Show the hover tooltip for dropdown buttons unless dropdowns are open. */
 :not(.dropdown-open) > .dropdown > li > .button:hover > .hover-label,
 :not(.dropdown-open) > .dropdown > li > .button:-moz-focusring > .hover-label {
   visibility: visible;
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/aboutSupport.css firefox-85.0+build1/toolkit/themes/shared/aboutSupport.css
--- firefox-84.0.2+build1/toolkit/themes/shared/aboutSupport.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/aboutSupport.css	2021-01-18 19:58:27.000000000 +0000
@@ -96,3 +96,37 @@
 .hidden {
   display: none;
 }
+
+.third-party-svg-common {
+  -moz-context-properties: fill;
+  fill: currentColor;
+  width: 16px;
+}
+
+.third-party-button {
+  min-width: auto;
+}
+
+.third-party-button-open-dir {
+  margin-inline-start: 10px;
+}
+
+.third-party-image-unsigned {
+  margin-inline-end: 10px;
+}
+
+.third-party-modules-header-occurrence {
+  width: 6em;
+}
+
+.third-party-modules-column-version {
+  width: 15em;
+}
+
+.third-party-modules-column-occurrence {
+  border-inline-end-width: 0;
+}
+
+.third-party-modules-column-expand {
+  border-inline-start-width: 0;
+}
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/icons/chevron.svg firefox-85.0+build1/toolkit/themes/shared/icons/chevron.svg
--- firefox-84.0.2+build1/toolkit/themes/shared/icons/chevron.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/icons/chevron.svg	2021-01-18 19:58:27.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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M8.707,7.293l-5-5A1,1,0,0,0,2.293,3.707L6.586,8,2.293,12.293a1,1,0,1,0,1.414,1.414l5-5A1,1,0,0,0,8.707,7.293Zm6,0-5-5A1,1,0,0,0,8.293,3.707L12.586,8,8.293,12.293a1,1,0,1,0,1.414,1.414l5-5A1,1,0,0,0,14.707,7.293Z"/>
+</svg>
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/icons/connection-mixed-active-loaded.svg firefox-85.0+build1/toolkit/themes/shared/icons/connection-mixed-active-loaded.svg
--- firefox-84.0.2+build1/toolkit/themes/shared/icons/connection-mixed-active-loaded.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/icons/connection-mixed-active-loaded.svg	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M12.5 6.984h-.484L4 15h8.5a1.5 1.5 0 0 0 1.5-1.5V8.484a1.5 1.5 0 0 0-1.5-1.5zm-6.5 0V5a2 2 0 0 1 4 0v1l1.892-1.892A4 4 0 0 0 4 5v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5a1.483 1.483 0 0 0 .07.43l6.946-6.946z" fill="context-fill" fill-opacity="context-fill-opacity"/>
+  <path d="M2 15a1 1 0 0 1-.707-1.707l12-12a1 1 0 0 1 1.414 1.414l-12 12A1 1 0 0 1 2 15z" fill="#ff0039"/>
+</svg>
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg firefox-85.0+build1/toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg
--- firefox-84.0.2+build1/toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg	2021-01-18 19:58:27.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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path d="M8 1a4 4 0 0 0-4 4v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5A1.5 1.5 0 0 0 3.5 15h2.535a2.274 2.274 0 0 1 .207-1.318L9.43 7.27a2.266 2.266 0 0 1 .2-.286H6V5a2 2 0 0 1 4 0v1.568A2.255 2.255 0 0 1 11.478 6a2.283 2.283 0 0 1 .522.073V5a4 4 0 0 0-4-4z" fill="context-fill" fill-opacity="context-fill-opacity"/>
+  <path d="M15.818 14.127l-3.189-6.411a1.285 1.285 0 0 0-2.3 0l-3.192 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873z" fill="#ffbf00"/>
+  <path d="M11.478 8a.272.272 0 0 1 .256.161l3.188 6.412a.291.291 0 0 1-.013.291.275.275 0 0 1-.243.137H8.289a.275.275 0 0 1-.243-.137.29.29 0 0 1-.013-.291l3.188-6.412A.272.272 0 0 1 11.478 8m0-1a1.272 1.272 0 0 0-1.152.716l-3.189 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873l-3.189-6.411A1.272 1.272 0 0 0 11.478 7z" fill="#d76e00" opacity=".35"/>
+  <path d="M11.5 12a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-1 0v2a.5.5 0 0 0 .5.5zm0 .809a.691.691 0 1 0 .691.691.691.691 0 0 0-.691-.691z" fill="#fff"/>
+</svg>
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/icons/folder.svg firefox-85.0+build1/toolkit/themes/shared/icons/folder.svg
--- firefox-84.0.2+build1/toolkit/themes/shared/icons/folder.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/icons/folder.svg	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,8 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M17.3,9.4c0,0,1.1,0,3.7,0c1.7,0,2,0,5.6,0c0.6,0,0.6,0,1.1,0V9.2c0-1.5-0.9-2.6-2-2.6h-5.8V6.3c0-0.6-1.5-2-2.8-2h-7.1 H7.6H4.9v2.4v2.4v2.2c2.8,0,8.5,0,8.5,0C16.4,11.3,17.3,9.4,17.3,9.4z M29,13c0-0.6-0.6-1.1-1.5-1.7l0,0c-0.2,0-0.6,0-0.9,0 c-2.8,0-3,0-4.8,0c-1.9,0-3.3,0-3.3,0s-1.5,2.4-3.7,2.4c0,0-6.5,0-9.1,0H5.4C3,13.7,3,15.9,3,15.9l1.1,9.7C4.1,27.1,5,28,6.5,28 h19.1c1.5,0,2.4-0.9,2.4-2.4L29,13.7l0,0l0,0C29,13.7,29,13,29,13z" />
+</svg>
+
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/icons/magnifier.svg firefox-85.0+build1/toolkit/themes/shared/icons/magnifier.svg
--- firefox-84.0.2+build1/toolkit/themes/shared/icons/magnifier.svg	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/icons/magnifier.svg	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,8 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M12.9,2c6,0,11,5,11,11c0,2.2-0.6,4.2-1.8,6l7.2,7c0.8,0.8,0.8,2.4,0,3.2c-0.6,0.6-1.2,0.8-1.6,0.8s-1.2-0.2-1.6-0.6l-7-7 c-1.8,1.2-3.8,1.8-6,1.8c-6,0-11-5-11-11C2.1,7.2,6.9,2,12.9,2z M12.9,20c3.8,0,7-3.2,7-7s-3.2-7-7-7s-7,3.2-7,7S9.1,20,12.9,20z" />
+</svg>
+
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/in-content/common.inc.css firefox-85.0+build1/toolkit/themes/shared/in-content/common.inc.css
--- firefox-84.0.2+build1/toolkit/themes/shared/in-content/common.inc.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/in-content/common.inc.css	2021-01-18 19:58:27.000000000 +0000
@@ -64,7 +64,6 @@
   --grey-20: #ededf0;
   --grey-30: #d7d7db;
   --grey-40: #b1b1b3;
-  --grey-50: #737373;
   --grey-60: #4a4a4f;
   --grey-90: #0c0c0d;
   --grey-90-a10: rgba(12, 12, 13, 0.1);
@@ -260,8 +259,7 @@
 
 button:-moz-focusring,
 html|select:-moz-focusring,
-html|input[type="checkbox"]:-moz-focusring,
-html|input[type="color"]:-moz-focusring,
+html|input:is([type="checkbox"], [type="color"]):-moz-focusring,
 xul|menulist:-moz-focusring {
   outline: 2px solid var(--in-content-border-active);
   /* offset outline to align with 1px border-width set for buttons/menulists above. */
@@ -445,12 +443,7 @@
 
 /* textboxes */
 
-html|input[type="email"],
-html|input[type="tel"],
-html|input[type="text"],
-html|input[type="password"],
-html|input[type="url"],
-html|input[type="number"],
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
 html|textarea,
 xul|search-textbox {
   appearance: none;
@@ -465,12 +458,7 @@
   padding-inline: 8px;
 }
 
-html|input[type="email"],
-html|input[type="tel"],
-html|input[type="text"],
-html|input[type="password"],
-html|input[type="url"],
-html|input[type="number"],
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
 html|textarea {
   font-family: inherit;
   font-size: inherit;
@@ -478,23 +466,13 @@
   margin: 2px 4px;
 }
 
-html|input[type="email"]:enabled:not(:focus):hover,
-html|input[type="tel"]:enabled:not(:focus):hover,
-html|input[type="text"]:enabled:not(:focus):hover,
-html|input[type="password"]:enabled:not(:focus):hover,
-html|input[type="url"]:enabled:not(:focus):hover,
-html|input[type="number"]:enabled:not(:focus):hover,
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):enabled:not(:focus):hover,
 html|textarea:enabled:not(:focus):hover,
 xul|search-textbox:not([disabled="true"]):not([focused]):hover {
   border-color: var(--in-content-border-hover);
 }
 
-html|input[type="email"]:focus,
-html|input[type="tel"]:focus,
-html|input[type="text"]:focus,
-html|input[type="password"]:focus,
-html|input[type="url"]:focus,
-html|input[type="number"]:focus,
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus,
 html|textarea:focus,
 xul|search-textbox[focused] {
   border-color: var(--in-content-border-active);
@@ -503,33 +481,18 @@
   outline: none;
 }
 
-html|input[type="email"]:-moz-ui-invalid,
-html|input[type="tel"]:-moz-ui-invalid,
-html|input[type="text"]:-moz-ui-invalid,
-html|input[type="password"]:-moz-ui-invalid,
-html|input[type="url"]:-moz-ui-invalid,
-html|input[type="number"]:-moz-ui-invalid,
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid,
 html|textarea:-moz-ui-invalid {
   border-color: var(--in-content-border-invalid);
 }
 
 /* Don't show the field error outlines and focus borders at the same time. */
-html|input[type="email"]:-moz-ui-invalid:focus,
-html|input[type="tel"]:-moz-ui-invalid:focus,
-html|input[type="text"]:-moz-ui-invalid:focus,
-html|input[type="password"]:-moz-ui-invalid:focus,
-html|input[type="url"]:-moz-ui-invalid:focus,
-html|input[type="number"]:-moz-ui-invalid:focus,
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid:focus,
 html|textarea:-moz-ui-invalid:focus {
   box-shadow: 0 0 0 3px var(--in-content-border-invalid-shadow);
 }
 
-html|input[type="email"]:disabled,
-html|input[type="tel"]:disabled,
-html|input[type="text"]:disabled,
-html|input[type="password"]:disabled,
-html|input[type="url"]:disabled,
-html|input[type="number"]:disabled,
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
 html|textarea:disabled,
 xul|search-textbox[disabled="true"] {
   opacity: 0.4;
@@ -577,26 +540,35 @@
   border-radius: 2px;
   margin: 0;
   margin-inline-end: 10px;
-  background-color: var(--in-content-box-background);
+  background-color: var(--grey-90-a10);
   background-position: center;
   background-repeat: no-repeat;
 }
 
 xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check,
 html|input[type="checkbox"]:not(:disabled):hover {
-  border-color: var(--in-content-border-focus);
+  background-color: var(--grey-90-a20);
+}
+
+xul|checkbox[checked] > xul|*.checkbox-check,
+html|input[type="checkbox"]:checked {
+  -moz-context-properties: fill;
+  fill: currentColor;
+  color: white;
+  background-color: var(--blue-60);
 }
 
 xul|checkbox[checked] > xul|*.checkbox-check {
   list-style-image: url("chrome://global/skin/icons/check.svg");
-  -moz-context-properties: fill;
-  fill: #2292d0;
 }
 
 html|input[type="checkbox"]:checked {
   background-image: url("chrome://global/skin/icons/check.svg");
-  -moz-context-properties: fill;
-  fill: #2292d0;
+}
+
+xul|checkbox:not([disabled="true"])[checked]:hover > xul|*.checkbox-check,
+html|input[type="checkbox"]:not(:disabled):checked:hover {
+  background-color: var(--blue-70);
 }
 
 xul|checkbox[disabled="true"],
@@ -632,17 +604,23 @@
   border-radius: 50%;
   margin: 0;
   margin-inline-end: 10px;
-  background-color: var(--in-content-box-background);
+  background-color: var(--grey-90-a10);
 }
 
-xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
-  border-color: var(--in-content-border-focus);
+xul|radio:not([disabled="true"]):not([selected="true"]):hover > xul|*.radio-check {
+  background-color: var(--grey-90-a20);
 }
 
 xul|*.radio-check[selected] {
   list-style-image: url("chrome://global/skin/in-content/radio.svg");
   -moz-context-properties: fill;
-  fill: #2292d0;
+  fill: currentColor;
+  color: white;
+  background-color: var(--blue-60);
+}
+
+xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
+  background-color: var(--blue-70);
 }
 
 xul|radio[disabled="true"] {
@@ -666,6 +644,12 @@
   box-shadow: none;
 }
 
+@media print {
+  #categories {
+    display: none;
+  }
+}
+
 html|*#categories {
   box-sizing: border-box;
   padding: 1px;
@@ -1086,6 +1070,7 @@
 .sidebar-footer-link:-moz-focusring,
 .sidebar-footer-button > .text-link:-moz-focusring {
   outline: var(--in-content-category-outline-focus);
+  outline-offset: -1px;
 }
 
 .sidebar-footer-icon {
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/jar.inc.mn firefox-85.0+build1/toolkit/themes/shared/jar.inc.mn
--- firefox-84.0.2+build1/toolkit/themes/shared/jar.inc.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/jar.inc.mn	2021-01-18 19:58:27.000000000 +0000
@@ -35,7 +35,10 @@
   skin/classic/global/icons/autoscroll-vertical.svg        (../../shared/icons/autoscroll-vertical.svg)
   skin/classic/global/icons/check.svg                      (../../shared/icons/check.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
+  skin/classic/global/icons/chevron.svg                    (../../shared/icons/chevron.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
+  skin/classic/global/icons/connection-mixed-active-loaded.svg  (../../shared/icons/connection-mixed-active-loaded.svg)
+  skin/classic/global/icons/connection-mixed-passive-loaded.svg (../../shared/icons/connection-mixed-passive-loaded.svg)
   skin/classic/global/icons/searchfield-cancel.svg         (../../shared/icons/searchfield-cancel.svg)
   skin/classic/global/pictureinpicture/close-pip.svg       (../../shared/pictureinpicture/close-pip.svg)
   skin/classic/global/icons/columnpicker.svg               (../../shared/icons/columnpicker.svg)
@@ -44,6 +47,11 @@
   skin/classic/global/icons/error.svg                      (../../shared/icons/error.svg)
   skin/classic/global/icons/find-previous-arrow.svg        (../../shared/icons/find-previous-arrow.svg)
   skin/classic/global/icons/find-next-arrow.svg            (../../shared/icons/find-next-arrow.svg)
+#ifndef XP_MACOSX
+  skin/classic/global/icons/findFile.svg                   (../../shared/icons/folder.svg)
+#else
+  skin/classic/global/icons/findFile.svg                   (../../shared/icons/magnifier.svg)
+#endif
   skin/classic/global/icons/heart.svg                      (../../shared/icons/heart.svg)
   skin/classic/global/icons/help.svg                       (../../shared/icons/help.svg)
   skin/classic/global/icons/info.svg                       (../../shared/incontent-icons/info.svg)
@@ -119,10 +127,6 @@
 #endif
   skin/classic/global/plugins/plugin.svg                    (../../shared/plugins/plugin.svg)
   skin/classic/global/plugins/plugin-blocked.svg            (../../shared/plugins/plugin-blocked.svg)
-  skin/classic/global/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
-  skin/classic/global/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
-  skin/classic/global/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
-  skin/classic/global/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
   skin/classic/global/pictureinpicture/player.css           (../../shared/pictureinpicture/player.css)
   skin/classic/global/media/pictureinpicture.svg            (../../shared/media/pictureinpicture.svg)
   skin/classic/global/pictureinpicture/audio.svg            (../../shared/pictureinpicture/audio.svg)
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/media/videocontrols.css firefox-85.0+build1/toolkit/themes/shared/media/videocontrols.css
--- firefox-84.0.2+build1/toolkit/themes/shared/media/videocontrols.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/media/videocontrols.css	2021-01-18 19:58:27.000000000 +0000
@@ -511,8 +511,8 @@
   min-width: max-content;
 }
 
-.statusIcon[type="pictureInPicture"]:dir(rtl),
-.pictureInPictureToggleIcon:dir(rtl) {
+.videocontrols[localedir="rtl"] .statusIcon[type="pictureInPicture"],
+.videocontrols[localedir="rtl"] .pictureInPictureToggleIcon {
   transform: scaleX(-1);
 }
 
@@ -678,6 +678,10 @@
   background-position: center, center;
 }
 
+.videocontrols[localedir="rtl"] .pip-icon {
+  transform: scaleX(-1);
+}
+
 .pip-wrapper[position="left"] > .pip-expanded > .pip-icon-label > .pip-label {
   margin-left: var(--pip-icon-width-with-margins);
   margin-right: var(--pip-toggle-margin);
@@ -741,7 +745,7 @@
 }
 
 .pip-wrapper:is([small-video],[has-used]) > .pip-expanded,
-.pip-wrapper[position="right"]:not(:is([small-video],[has-used])) > .pip-icon {
+.pip-wrapper[position="right"]:not([small-video],[has-used]) > .pip-icon {
   display: none;
 }
 
@@ -782,18 +786,18 @@
   pointer-events: none;
 }
 
-.pip-wrapper:not(:is([small-video],[has-used])) > .pip-expanded {
+.pip-wrapper:not([small-video],[has-used]) > .pip-expanded {
   opacity: 1;
   scale: 1;
   pointer-events: auto;
 }
 
-.pip-wrapper:not(:is([small-video],[has-used])).hovering > .pip-expanded {
+.pip-wrapper:not([small-video],[has-used]).hovering > .pip-expanded {
   border-bottom-right-radius: 0px;
   border-bottom-left-radius: 0px;
 }
 
-.pip-wrapper:not(:is([small-video],[has-used])) > .pip-small {
+.pip-wrapper:not([small-video],[has-used]) > .pip-small {
   opacity: 0;
   transition: opacity 200ms;
 }
@@ -821,6 +825,10 @@
   pointer-events: none;
 }
 
+.videocontrols[localedir="rtl"] .pip-explainer {
+  text-align: right;
+}
+
 .pip-wrapper.hovering > .pip-expanded > .pip-explainer {
   pointer-events: auto;
 }
@@ -836,7 +844,7 @@
 @media (prefers-reduced-motion) {
   .pip-wrapper,
   .pip-expanded,
-  .pip-wrapper:not(:is([small-video],[has-used])) > .pip-small,
+  .pip-wrapper:not([small-video],[has-used]) > .pip-small,
   .pip-explainer {
     transition: none;
   }
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/non-mac.jar.inc.mn firefox-85.0+build1/toolkit/themes/shared/non-mac.jar.inc.mn
--- firefox-84.0.2+build1/toolkit/themes/shared/non-mac.jar.inc.mn	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/non-mac.jar.inc.mn	2021-01-18 19:58:27.000000000 +0000
@@ -21,7 +21,6 @@
 * skin/classic/global/dirListing/dirListing.css            (../../windows/global/dirListing/dirListing.css)
   skin/classic/global/icons/question-64.png                (../../windows/global/icons/question-64.png)
   skin/classic/global/icons/search-textbox.svg             (../../windows/global/icons/search-textbox.svg)
-  skin/classic/global/plugins/pluginHelp-16.png            (../../windows/global/plugins/pluginHelp-16.png)
 
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
   skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/extensions/blocklist.css)
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/notification.css firefox-85.0+build1/toolkit/themes/shared/notification.css
--- firefox-84.0.2+build1/toolkit/themes/shared/notification.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/notification.css	2021-01-18 19:58:27.000000000 +0000
@@ -125,6 +125,16 @@
   margin-inline-end: 16px;
 }
 
+.messageCloseButton:-moz-focusring {
+  /* Override the dotted outline from button.css */
+  outline: none;
+}
+
+.messageCloseButton:-moz-focusring > .toolbarbutton-icon {
+  outline: var(--toolbarbutton-focus-outline, 2px solid currentColor);
+  -moz-outline-radius: var(--toolbarbutton-border-radius, 4px);
+}
+
 .notification-button {
   appearance: none;
   border: 1px solid transparent;
@@ -149,12 +159,22 @@
   background-color: var(--notification-button-background-active);
 }
 
+.notification-button:-moz-focusring {
+  outline: var(--toolbarbutton-focus-outline, 2px solid currentColor);
+  -moz-outline-radius: var(--toolbarbutton-border-radius, 4px);
+}
+
 .notification-button.primary {
   background-color: var(--notification-primary-button-background);
   /* Override button.css hover & active styles */
   color: var(--notification-primary-button-text) !important;
 }
 
+.notification-button.primary:-moz-focusring {
+  outline: 4px solid rgba(0, 96, 223, 0.5);
+  outline-offset: -1px;
+}
+
 .notification-button.primary:not([disabled]):hover {
   background-color: var(--notification-primary-button-background-hover);
 }
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/themes/shared/plugins/contentPluginBlocked.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/themes/shared/plugins/contentPluginBlocked.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/themes/shared/plugins/contentPluginCrashed.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/themes/shared/plugins/contentPluginCrashed.png differ
Binary files /tmp/tmpvLSzEt/JvVhOBVudA/firefox-84.0.2+build1/toolkit/themes/shared/plugins/contentPluginStripe.png and /tmp/tmpvLSzEt/HnGImkr7Sq/firefox-85.0+build1/toolkit/themes/shared/plugins/contentPluginStripe.png differ
diff -Nru firefox-84.0.2+build1/toolkit/themes/shared/plugins/pluginProblem.css firefox-85.0+build1/toolkit/themes/shared/plugins/pluginProblem.css
--- firefox-84.0.2+build1/toolkit/themes/shared/plugins/pluginProblem.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/shared/plugins/pluginProblem.css	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +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/. */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-/* These styles affect only the bound element, not other page content. */
-.mainBox {
- --grey-10: #f9f9fa;
- --grey-60: #4a4a4f;
- --grey-70: #38383d;
-}
-
-.mainBox {
-  font: message-box;
-  font-size: 12px;
-  text-align: center;
-  display: table;
-  width: 100%;
-  height: 100%;
-  background-color: rgb(72,72,72);
-  color: white;
-  user-select: none;
-}
-
-.hoverBox {
-  display: table-cell;
-  box-sizing: border-box;
-  padding: 5px;
-  vertical-align: middle;
-  width: 100%;
-  height: 100%;
-}
-
-:host(:-moz-handler-vulnerable-updatable) .hoverBox:active,
-:host(:-moz-handler-vulnerable-no-update) .hoverBox:active {
-  background-color: rgb(65, 65, 65);
-}
-
-:host(:-moz-handler-vulnerable-updatable) .hoverBox:active .msgClickToPlay,
-:host(:-moz-handler-vulnerable-no-update) .hoverBox:active .msgClickToPlay {
-  color: red;
-}
-
-:host(:-moz-handler-vulnerable-updatable) .hoverBox,
-:host(:-moz-handler-vulnerable-no-update) .hoverBox,
-:host(:-moz-handler-blocked) .hoverBox,
-:host(:-moz-handler-crashed) .hoverBox {
-  background-image: url(chrome://global/skin/plugins/contentPluginStripe.png);
-}
-
-html|a {
-  color: white;
-}
-
-.icon {
-  width: 48px;
-  height: 48px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: contain;
-  border: none;
-  background-color: transparent;
-  -moz-user-focus: ignore;
-  margin-bottom: 6px;
-  -moz-context-properties: fill;
-}
-
-:host(:-moz-handler-vulnerable-updatable) .icon,
-:host(:-moz-handler-vulnerable-no-update) .icon {
-  background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
-  -moz-user-focus: normal;
-}
-
-:host(:-moz-handler-blocked) .icon {
-  background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
-}
-
-:host(:-moz-handler-clicktoplay) .icon {
-  background-image: url(chrome://global/skin/plugins/plugin.svg);
-  fill: var(--grey-10);
-  -moz-user-focus: normal;
-}
-
-:host(:-moz-handler-crashed) .icon {
-  background-image: url(chrome://global/skin/plugins/contentPluginCrashed.png);
-}
-
-.throbber {
-  padding-left: 16px; /* width of the background image */
-  background: url(chrome://global/skin/icons/loading.png) no-repeat;
-  margin-left: 5px;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .throbber {
-    background-image: url(chrome://global/skin/icons/loading@2x.png);
-    background-size: 16px;
-  }
-}
-
-/* on desktop, don't ever show the tap-to-play UI: that is for mobile only */
-:host(:-moz-handler-clicktoplay) .msgTapToPlay {
-  display: none;
-}
-
-.submitStatus div {
-  min-height: 19px; /* height of biggest line (with throbber) */
-}
-
-.submitComment {
-  width: 340px;
-  height: 70px;
-  padding: 5px;
-  border: none;
-  border-radius: 5px;
-  resize: none;
-  font-family: inherit;
-  font-size: inherit;
-}
-
-.submitURLOptInBox {
-  text-align: start;
-}
-
-.submitURLOptIn {
-  margin-left: -1px;
-}
-
-.mainBox[chromedir="rtl"] .submitURLOptIn {
-  margin-left: 0;
-  margin-right: -1px;
-}
-
-.submitButtonBox {
-  margin-top: 7px;
-}
-
-.submitButton {
-  float: right;
-}
-
-.mainBox[chromedir="rtl"] .submitButton {
-  float: left;
-}
-
-.helpIcon {
-  display: inline-block;
-  min-width: 16px;
-  min-height: 16px;
-  background: url(chrome://global/skin/plugins/pluginHelp-16.png) no-repeat;
-  cursor: pointer;
-  float: left;
-}
-
-.mainBox[chromedir="rtl"] .helpIcon {
-  float: right;
-}
-
-.closeIcon {
-  display: block;
-  width: 20px;
-  height: 20px;
-  margin-top: 4px;
-  margin-inline: -24px 4px;
-  border: none;
-  border-radius: 2px;
-  background-color: transparent;
-  background-image: url(chrome://global/skin/icons/close.svg);
-  background-repeat: no-repeat;
-  -moz-context-properties: fill, fill-opacity;
-  fill-opacity: 0;
-  fill: var(--grey-10);
-}
-
-.closeIcon:hover {
-  fill-opacity: .1;
-}
-
-.closeIcon:hover:active {
-  fill-opacity: .2;
-}
-
-.action-link {
-  display: inline-block;
-  border-radius: 10px;
-  background-color: rgb(35, 35, 35);
-  padding: 2px 8px;
-  margin-top: 7px;
-  text-decoration: none;
-}
-.action-link:active {
-  background-color: rgb(20, 20, 20);
-}
-
-:host(:-moz-handler-vulnerable-updatable) .action-link {
-  background-color: #a81b0c;
-}
-
-:host(:-moz-handler-vulnerable-updatable) .action-link:active {
-  background-color: #801409;
-}
-
-/* New Photon styling
- *
- * At the moment, these rules are written to only override
- * :-moz-handler-clicktoplay styling. Once we finish the
- * redesign for all cases, we can change the CSS directly
- * above instead of writing these super-specific rules.
- */
-:host(:-moz-handler-clicktoplay) .mainBox {
-  background-color: var(--grey-70);
-}
-
-:host(:-moz-handler-clicktoplay) .msgClickToPlay {
-  /* Triggers overflow event if the container is too small */
-  min-width: 240px;
-  font-size: 13px;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=oversized] {
-  /* Triggers overflow event when there is a layout */
-  width: 101%;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=blank] .hoverBox {
-  visibility: hidden;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=tiny] .icon {
-  width: 16px;
-  height: 16px;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=reduced] .icon {
-  width: 32px;
-  height: 32px;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=blank] .closeIcon,
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=tiny] .closeIcon,
-:host(:-moz-handler-clicktoplay) .mainBox[sizing=reduced] .closeIcon {
-  display: none;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[notext] .msgClickToPlay {
-  display: none;
-}
-
-:host(:-moz-handler-clicktoplay) .mainBox[notext] .icon {
-  /* Override a `margin-bottom: 6px` now that .msgClickToPlay
-   * below the icon is no longer shown, in order to achieve
-   * a perfect vertical centering of the icon.
-   */
-  margin-bottom: 0;
-}
-
-:host(:-moz-handler-clicktoplay) .hoverBox:active {
-  background-color: var(--grey-60);
-}
diff -Nru firefox-84.0.2+build1/toolkit/themes/windows/global/button.css firefox-85.0+build1/toolkit/themes/windows/global/button.css
--- firefox-84.0.2+build1/toolkit/themes/windows/global/button.css	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/themes/windows/global/button.css	2021-01-18 19:58:27.000000000 +0000
@@ -44,7 +44,7 @@
        default, hovered or focused state. However, if these states overlap with
        the active, disabled, open or checked state, the appearance reverts back
        to the default background. */
-    button:is([default="true"],:hover,:focus):not(:is(:active,[disabled="true"],[open="true"],[checked="true"])) {
+    button:is([default="true"],:hover,:focus):not(:active,[disabled="true"],[open="true"],[checked="true"]) {
       color: HighlightText;
     }
   }
diff -Nru firefox-84.0.2+build1/toolkit/xre/Bootstrap.h firefox-85.0+build1/toolkit/xre/Bootstrap.h
--- firefox-84.0.2+build1/toolkit/xre/Bootstrap.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/Bootstrap.h	2021-01-18 19:58:27.000000000 +0000
@@ -19,6 +19,10 @@
 #ifdef MOZ_WIDGET_ANDROID
 #  include "jni.h"
 
+namespace mozilla {
+struct StaticXREAppData;
+}
+
 extern "C" NS_EXPORT void GeckoStart(JNIEnv* aEnv, char** argv, int argc,
                                      const mozilla::StaticXREAppData& aAppData);
 #endif
@@ -31,6 +35,8 @@
 
 namespace mozilla {
 
+struct StaticXREAppData;
+
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
 namespace sandboxing {
 class PermissionsService;
diff -Nru firefox-84.0.2+build1/toolkit/xre/CmdLineAndEnvUtils.cpp firefox-85.0+build1/toolkit/xre/CmdLineAndEnvUtils.cpp
--- firefox-84.0.2+build1/toolkit/xre/CmdLineAndEnvUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/CmdLineAndEnvUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -3,6 +3,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/. */
 
+#include "nsCOMPtr.h"
+#include "nsDependentString.h"
 #include "prenv.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/toolkit/xre/glxtest.cpp firefox-85.0+build1/toolkit/xre/glxtest.cpp
--- firefox-84.0.2+build1/toolkit/xre/glxtest.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/glxtest.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -16,8 +16,8 @@
 // The only non-static function here is fire_glxtest_process(). It creates a
 // pipe, publishes its 'read' end as the mozilla::widget::glxtest_pipe global
 // variable, forks, and runs that GLX probe in the child process, which runs the
-// glxtest() static function. This creates a X connection, a GLX context, calls
-// glGetString, and writes that to the 'write' end of the pipe.
+// childgltest() static function. This creates a X connection, a GLX context,
+// calls glGetString, and writes that to the 'write' end of the pipe.
 
 #include <cstdio>
 #include <cstdlib>
@@ -88,6 +88,8 @@
 #define EGL_CONTEXT_CLIENT_VERSION 0x3098
 #define EGL_NO_CONTEXT nullptr
 
+#define EXIT_FAILURE_BUFFER_TOO_SMALL 2
+
 namespace mozilla {
 namespace widget {
 // the read end of the pipe, which will be used by GfxInfo
@@ -100,6 +102,11 @@
 // the write end of the pipe, which we're going to write to
 static int write_end_of_the_pipe = -1;
 
+// our buffer, size and used length
+static char* glxtest_buf = nullptr;
+static int glxtest_bufsize = 0;
+static int glxtest_length = 0;
+
 // C++ standard collides with C standard in that it doesn't allow casting void*
 // to function pointer types. So the work-around is to convert first to size_t.
 // http://www.trilithium.com/johan/2004/12/problem-with-dlsym/
@@ -108,53 +115,246 @@
   return reinterpret_cast<func_ptr_type>(reinterpret_cast<size_t>(ptr));
 }
 
-static void fatal_error(const char* str) {
-  mozilla::Unused << write(write_end_of_the_pipe, str, strlen(str));
-  mozilla::Unused << write(write_end_of_the_pipe, "\n", 1);
-  _exit(EXIT_FAILURE);
+static void record_value(const char* format, ...) {
+  // Don't add more if the buffer is full.
+  if (glxtest_bufsize <= glxtest_length) {
+    return;
+  }
+
+  // Append the new values to the buffer, not to exceed the remaining space.
+  int remaining = glxtest_bufsize - glxtest_length;
+  va_list args;
+  va_start(args, format);
+  int max_added =
+      vsnprintf(glxtest_buf + glxtest_length, remaining, format, args);
+  va_end(args);
+
+  // snprintf returns how many char it could have added, not how many it added.
+  // It is important to get this right since it will control how many chars we
+  // will attempt to write to the pipe fd.
+  if (max_added > remaining) {
+    glxtest_length += remaining;
+  } else {
+    glxtest_length += max_added;
+  }
+}
+
+static void record_error(const char* str) { record_value("ERROR\n%s\n", str); }
+
+static void record_warning(const char* str) {
+  record_value("WARNING\n%s\n", str);
+}
+
+static void record_flush() {
+  mozilla::Unused << write(write_end_of_the_pipe, glxtest_buf, glxtest_length);
 }
 
 static int x_error_handler(Display*, XErrorEvent* ev) {
-  enum { bufsize = 1024 };
-  char buf[bufsize];
-  int length = snprintf(buf, bufsize,
-                        "X error occurred in GLX probe, error_code=%d, "
-                        "request_code=%d, minor_code=%d\n",
-                        ev->error_code, ev->request_code, ev->minor_code);
-  mozilla::Unused << write(write_end_of_the_pipe, buf, length);
+  record_value(
+      "ERROR\nX error, error_code=%d, "
+      "request_code=%d, minor_code=%d\n",
+      ev->error_code, ev->request_code, ev->minor_code);
+  record_flush();
   _exit(EXIT_FAILURE);
   return 0;
 }
 
-// glxtest is declared inside extern "C" so that the name is not mangled.
+// childgltest is declared inside extern "C" so that the name is not mangled.
 // The name is used in build/valgrind/x86_64-pc-linux-gnu.sup to suppress
 // memory leak errors because we run it inside a short lived fork and we don't
 // care about leaking memory
 extern "C" {
 
+#define PCI_FILL_IDENT 0x0001
+#define PCI_FILL_CLASS 0x0020
+#define PCI_BASE_CLASS_DISPLAY 0x03
+
+static void get_pci_status() {
+  void* libpci = dlopen("libpci.so.3", RTLD_LAZY);
+  if (!libpci) {
+    libpci = dlopen("libpci.so", RTLD_LAZY);
+  }
+  if (!libpci) {
+    record_warning("libpci missing");
+    return;
+  }
+
+  typedef struct pci_dev {
+    struct pci_dev* next;
+    uint16_t domain_16;
+    uint8_t bus, dev, func;
+    unsigned int known_fields;
+    uint16_t vendor_id, device_id;
+    uint16_t device_class;
+  } pci_dev;
+
+  typedef struct pci_access {
+    unsigned int method;
+    int writeable;
+    int buscentric;
+    char* id_file_name;
+    int free_id_name;
+    int numeric_ids;
+    unsigned int id_lookup_mode;
+    int debugging;
+    void* error;
+    void* warning;
+    void* debug;
+    pci_dev* devices;
+  } pci_access;
+
+  typedef pci_access* (*PCIALLOC)(void);
+  PCIALLOC pci_alloc = cast<PCIALLOC>(dlsym(libpci, "pci_alloc"));
+
+  typedef void (*PCIINIT)(pci_access*);
+  PCIINIT pci_init = cast<PCIINIT>(dlsym(libpci, "pci_init"));
+
+  typedef void (*PCICLEANUP)(pci_access*);
+  PCICLEANUP pci_cleanup = cast<PCICLEANUP>(dlsym(libpci, "pci_cleanup"));
+
+  typedef void (*PCISCANBUS)(pci_access*);
+  PCISCANBUS pci_scan_bus = cast<PCISCANBUS>(dlsym(libpci, "pci_scan_bus"));
+
+  typedef void (*PCIFILLINFO)(pci_dev*, int);
+  PCIFILLINFO pci_fill_info = cast<PCIFILLINFO>(dlsym(libpci, "pci_fill_info"));
+
+  if (!pci_alloc || !pci_cleanup || !pci_scan_bus || !pci_fill_info) {
+    dlclose(libpci);
+    record_warning("libpci missing methods");
+    return;
+  }
+
+  pci_access* pacc = pci_alloc();
+  if (!pacc) {
+    dlclose(libpci);
+    record_warning("libpci alloc failed");
+    return;
+  }
+
+  pci_init(pacc);
+  pci_scan_bus(pacc);
+
+  for (pci_dev* dev = pacc->devices; dev; dev = dev->next) {
+    pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_CLASS);
+    if (dev->device_class >> 8 == PCI_BASE_CLASS_DISPLAY && dev->vendor_id &&
+        dev->device_id) {
+      record_value("PCI_VENDOR_ID\n0x%04x\nPCI_DEVICE_ID\n0x%04x\n",
+                   dev->vendor_id, dev->device_id);
+    }
+  }
+
+  pci_cleanup(pacc);
+  dlclose(libpci);
+}
+
 typedef void* EGLNativeDisplayType;
+typedef void* EGLDisplay;
+typedef int EGLBoolean;
+typedef int EGLint;
+typedef void* (*PFNEGLGETPROCADDRESS)(const char*);
+
+static void get_gles_status(EGLDisplay dpy,
+                            PFNEGLGETPROCADDRESS eglGetProcAddress) {
+  typedef void* EGLConfig;
+  typedef void* EGLContext;
+  typedef void* EGLSurface;
+
+  typedef EGLBoolean (*PFNEGLCHOOSECONFIGPROC)(
+      EGLDisplay dpy, EGLint const* attrib_list, EGLConfig* configs,
+      EGLint config_size, EGLint* num_config);
+  PFNEGLCHOOSECONFIGPROC eglChooseConfig =
+      cast<PFNEGLCHOOSECONFIGPROC>(eglGetProcAddress("eglChooseConfig"));
+
+  typedef EGLContext (*PFNEGLCREATECONTEXTPROC)(
+      EGLDisplay dpy, EGLConfig config, EGLContext share_context,
+      EGLint const* attrib_list);
+  PFNEGLCREATECONTEXTPROC eglCreateContext =
+      cast<PFNEGLCREATECONTEXTPROC>(eglGetProcAddress("eglCreateContext"));
+
+  typedef EGLSurface (*PFNEGLCREATEPBUFFERSURFACEPROC)(
+      EGLDisplay dpy, EGLConfig config, EGLint const* attrib_list);
+  PFNEGLCREATEPBUFFERSURFACEPROC eglCreatePbufferSurface =
+      cast<PFNEGLCREATEPBUFFERSURFACEPROC>(
+          eglGetProcAddress("eglCreatePbufferSurface"));
+
+  typedef EGLBoolean (*PFNEGLMAKECURRENTPROC)(
+      EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext context);
+  PFNEGLMAKECURRENTPROC eglMakeCurrent =
+      cast<PFNEGLMAKECURRENTPROC>(eglGetProcAddress("eglMakeCurrent"));
+
+  if (!eglChooseConfig || !eglCreateContext || !eglCreatePbufferSurface ||
+      !eglMakeCurrent) {
+    record_error("libEGL missing methods for GLES test");
+    return;
+  }
+
+  void* libgles = dlopen("libGLESv2.so.2", RTLD_LAZY);
+  if (!libgles) {
+    libgles = dlopen("libGLESv2.so", RTLD_LAZY);
+  }
+  if (!libgles) {
+    record_error("libGLESv2 missing");
+    return;
+  }
 
-static int get_egl_status(char* buf, int bufsize,
-                          EGLNativeDisplayType native_dpy, bool gles_test) {
+  typedef GLubyte* (*PFNGLGETSTRING)(GLenum);
+  PFNGLGETSTRING glGetString =
+      cast<PFNGLGETSTRING>(eglGetProcAddress("glGetString"));
+
+  if (!glGetString) {
+    // Implementations disagree about whether eglGetProcAddress or dlsym
+    // should be used for getting functions from the actual API, see
+    // https://github.com/anholt/libepoxy/commit/14f24485e33816139398d1bd170d617703473738
+    glGetString = cast<PFNGLGETSTRING>(dlsym(libgles, "glGetString"));
+  }
+
+  if (!glGetString) {
+    dlclose(libgles);
+    record_error("libGLESv2 glGetString missing");
+    return;
+  }
+
+  EGLint config_attrs[] = {EGL_RED_SIZE,  8, EGL_GREEN_SIZE, 8,
+                           EGL_BLUE_SIZE, 8, EGL_NONE};
+  EGLConfig config;
+  EGLint num_config;
+  eglChooseConfig(dpy, config_attrs, &config, 1, &num_config);
+  EGLint ctx_attrs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
+  EGLContext ectx = eglCreateContext(dpy, config, EGL_NO_CONTEXT, ctx_attrs);
+  EGLSurface pbuf = eglCreatePbufferSurface(dpy, config, nullptr);
+  eglMakeCurrent(dpy, pbuf, pbuf, ectx);
+
+  const GLubyte* versionString = glGetString(GL_VERSION);
+  const GLubyte* vendorString = glGetString(GL_VENDOR);
+  const GLubyte* rendererString = glGetString(GL_RENDERER);
+
+  if (versionString && vendorString && rendererString) {
+    record_value("VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\nTFP\nTRUE\n",
+                 vendorString, rendererString, versionString);
+  } else {
+    record_error("libGLESv2 glGetString returned null");
+  }
+
+  dlclose(libgles);
+}
+
+static void get_egl_status(EGLNativeDisplayType native_dpy, bool gles_test) {
   void* libegl = dlopen("libEGL.so.1", RTLD_LAZY);
   if (!libegl) {
     libegl = dlopen("libEGL.so", RTLD_LAZY);
   }
   if (!libegl) {
-    return 0;
+    record_warning("libEGL missing");
+    return;
   }
 
-  typedef void* EGLDisplay;
-  typedef int EGLBoolean;
-  typedef int EGLint;
-
-  typedef void* (*PFNEGLGETPROCADDRESS)(const char*);
   PFNEGLGETPROCADDRESS eglGetProcAddress =
       cast<PFNEGLGETPROCADDRESS>(dlsym(libegl, "eglGetProcAddress"));
 
   if (!eglGetProcAddress) {
     dlclose(libegl);
-    return 0;
+    record_error("no eglGetProcAddress");
+    return;
   }
 
   typedef EGLDisplay (*PFNEGLGETDISPLAYPROC)(void* native_display);
@@ -170,155 +370,46 @@
   PFNEGLTERMINATEPROC eglTerminate =
       cast<PFNEGLTERMINATEPROC>(eglGetProcAddress("eglTerminate"));
 
-  typedef const char* (*PFNEGLGETDISPLAYDRIVERNAMEPROC)(EGLDisplay dpy);
-  PFNEGLGETDISPLAYDRIVERNAMEPROC eglGetDisplayDriverName =
-      cast<PFNEGLGETDISPLAYDRIVERNAMEPROC>(
-          eglGetProcAddress("eglGetDisplayDriverName"));
-
-  if (!eglGetDisplay || !eglInitialize || !eglTerminate ||
-      !eglGetDisplayDriverName) {
+  if (!eglGetDisplay || !eglInitialize || !eglTerminate) {
     dlclose(libegl);
-    return 0;
+    record_error("libEGL missing methods");
+    return;
   }
 
   EGLDisplay dpy = eglGetDisplay(native_dpy);
   if (!dpy) {
     dlclose(libegl);
-    return 0;
+    record_warning("libEGL no display");
+    return;
   }
 
   EGLint major, minor;
   if (!eglInitialize(dpy, &major, &minor)) {
     dlclose(libegl);
-    return 0;
+    record_warning("libEGL initialize failed");
+    return;
   }
 
-  int length = 0;
-
   if (gles_test) {
-    typedef void* EGLConfig;
-    typedef void* EGLContext;
-    typedef void* EGLSurface;
-
-    typedef EGLBoolean (*PFNEGLCHOOSECONFIGPROC)(
-        EGLDisplay dpy, EGLint const* attrib_list, EGLConfig* configs,
-        EGLint config_size, EGLint* num_config);
-    PFNEGLCHOOSECONFIGPROC eglChooseConfig =
-        cast<PFNEGLCHOOSECONFIGPROC>(eglGetProcAddress("eglChooseConfig"));
-
-    typedef EGLContext (*PFNEGLCREATECONTEXTPROC)(
-        EGLDisplay dpy, EGLConfig config, EGLContext share_context,
-        EGLint const* attrib_list);
-    PFNEGLCREATECONTEXTPROC eglCreateContext =
-        cast<PFNEGLCREATECONTEXTPROC>(eglGetProcAddress("eglCreateContext"));
-
-    typedef EGLSurface (*PFNEGLCREATEPBUFFERSURFACEPROC)(
-        EGLDisplay dpy, EGLConfig config, EGLint const* attrib_list);
-    PFNEGLCREATEPBUFFERSURFACEPROC eglCreatePbufferSurface =
-        cast<PFNEGLCREATEPBUFFERSURFACEPROC>(
-            eglGetProcAddress("eglCreatePbufferSurface"));
-
-    typedef EGLBoolean (*PFNEGLMAKECURRENTPROC)(
-        EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext context);
-    PFNEGLMAKECURRENTPROC eglMakeCurrent =
-        cast<PFNEGLMAKECURRENTPROC>(eglGetProcAddress("eglMakeCurrent"));
-
-    void* libgles = dlopen("libGLESv2.so.2", RTLD_LAZY);
-    if (!libgles) {
-      libgles = dlopen("libGLESv2.so", RTLD_LAZY);
-    }
-    if (!libgles) {
-      fatal_error("Unable to load libGLESv2");
-    }
-
-    typedef GLubyte* (*PFNGLGETSTRING)(GLenum);
-    PFNGLGETSTRING glGetString =
-        cast<PFNGLGETSTRING>(eglGetProcAddress("glGetString"));
-
-    if (!glGetString) {
-      // Implementations disagree about whether eglGetProcAddress or dlsym
-      // should be used for getting functions from the actual API, see
-      // https://github.com/anholt/libepoxy/commit/14f24485e33816139398d1bd170d617703473738
-      glGetString = cast<PFNGLGETSTRING>(dlsym(libgles, "glGetString"));
-    }
-
-    if (!glGetString) {
-      fatal_error("GLESv2 glGetString not found");
-    }
-
-    EGLint config_attrs[] = {EGL_RED_SIZE,  8, EGL_GREEN_SIZE, 8,
-                             EGL_BLUE_SIZE, 8, EGL_NONE};
-    EGLConfig config;
-    EGLint num_config;
-    eglChooseConfig(dpy, config_attrs, &config, 1, &num_config);
-    EGLint ctx_attrs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
-    EGLContext ectx = eglCreateContext(dpy, config, EGL_NO_CONTEXT, ctx_attrs);
-    EGLSurface pbuf = eglCreatePbufferSurface(dpy, config, nullptr);
-    eglMakeCurrent(dpy, pbuf, pbuf, ectx);
-
-    const GLubyte* versionString = glGetString(GL_VERSION);
-    const GLubyte* vendorString = glGetString(GL_VENDOR);
-    const GLubyte* rendererString = glGetString(GL_RENDERER);
-
-    if (!versionString || !vendorString || !rendererString)
-      fatal_error("glGetString returned null");
-
-    length = snprintf(buf, bufsize,
-                      "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\nTFP\nTRUE\n",
-                      vendorString, rendererString, versionString);
-    if (length >= bufsize) {
-      fatal_error("GL strings length too large for buffer size");
-    }
+    get_gles_status(dpy, eglGetProcAddress);
   }
 
-  const char* driDriver = eglGetDisplayDriverName(dpy);
-  if (driDriver) {
-    length +=
-        snprintf(buf + length, bufsize - length, "DRI_DRIVER\n%s\n", driDriver);
+  typedef const char* (*PFNEGLGETDISPLAYDRIVERNAMEPROC)(EGLDisplay dpy);
+  PFNEGLGETDISPLAYDRIVERNAMEPROC eglGetDisplayDriverName =
+      cast<PFNEGLGETDISPLAYDRIVERNAMEPROC>(
+          eglGetProcAddress("eglGetDisplayDriverName"));
+  if (eglGetDisplayDriverName) {
+    const char* driDriver = eglGetDisplayDriverName(dpy);
+    if (driDriver) {
+      record_value("DRI_DRIVER\n%s\n", driDriver);
+    }
   }
 
   eglTerminate(dpy);
   dlclose(libegl);
-  return length;
-}
-
-static void close_logging() {
-  // we want to redirect to /dev/null stdout, stderr, and while we're at it,
-  // any PR logging file descriptors. To that effect, we redirect all positive
-  // file descriptors up to what open() returns here. In particular, 1 is stdout
-  // and 2 is stderr.
-  int fd = open("/dev/null", O_WRONLY);
-  for (int i = 1; i < fd; i++) dup2(fd, i);
-  close(fd);
-
-  if (getenv("MOZ_AVOID_OPENGL_ALTOGETHER"))
-    fatal_error(
-        "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined");
 }
 
-#ifdef MOZ_WAYLAND
-bool wayland_egltest() {
-  // NOTE: returns false to fall back to X11 when the Wayland socket doesn't
-  // exist but fails with fatal_error if something actually went wrong
-  struct wl_display* dpy = wl_display_connect(nullptr);
-  if (!dpy) return false;
-
-  enum { bufsize = 2048 };
-  char buf[bufsize];
-
-  int length = get_egl_status(buf, bufsize, (EGLNativeDisplayType)dpy, true);
-  if (length >= bufsize) {
-    fatal_error("GL strings length too large for buffer size");
-  }
-
-  ///// Finally write data to the pipe
-  mozilla::Unused << write(write_end_of_the_pipe, buf, length);
-
-  return true;
-}
-#endif
-
-void glxtest() {
+static void get_glx_status(int* gotGlxInfo, int* gotDriDriver) {
   ///// Open libGL and load needed symbols /////
 #if defined(__OpenBSD__) || defined(__NetBSD__)
 #  define LIBGL_FILENAME "libGL.so"
@@ -326,14 +417,19 @@
 #  define LIBGL_FILENAME "libGL.so.1"
 #endif
   void* libgl = dlopen(LIBGL_FILENAME, RTLD_LAZY);
-  if (!libgl) fatal_error("Unable to load " LIBGL_FILENAME);
+  if (!libgl) {
+    record_error(LIBGL_FILENAME " missing");
+    return;
+  }
 
   typedef void* (*PFNGLXGETPROCADDRESS)(const char*);
   PFNGLXGETPROCADDRESS glXGetProcAddress =
       cast<PFNGLXGETPROCADDRESS>(dlsym(libgl, "glXGetProcAddress"));
 
-  if (!glXGetProcAddress)
-    fatal_error("Unable to find glXGetProcAddress in " LIBGL_FILENAME);
+  if (!glXGetProcAddress) {
+    record_error("no glXGetProcAddress");
+    return;
+  }
 
   typedef GLXFBConfig* (*PFNGLXQUERYEXTENSION)(Display*, int*, int*);
   PFNGLXQUERYEXTENSION glXQueryExtension =
@@ -367,15 +463,22 @@
   if (!glXQueryExtension || !glXQueryVersion || !glXChooseVisual ||
       !glXCreateContext || !glXMakeCurrent || !glXDestroyContext ||
       !glGetString) {
-    fatal_error("glXGetProcAddress couldn't find required functions");
+    record_error(LIBGL_FILENAME " missing methods");
+    return;
   }
+
   ///// Open a connection to the X server /////
   Display* dpy = XOpenDisplay(nullptr);
-  if (!dpy) fatal_error("Unable to open a connection to the X server");
+  if (!dpy) {
+    record_error("Unable to open a connection to the X server");
+    return;
+  }
 
   ///// Check that the GLX extension is present /////
-  if (!glXQueryExtension(dpy, nullptr, nullptr))
-    fatal_error("GLX extension missing");
+  if (!glXQueryExtension(dpy, nullptr, nullptr)) {
+    record_error("GLX extension missing");
+    return;
+  }
 
   XSetErrorHandler(x_error_handler);
 
@@ -383,7 +486,10 @@
   int attribs[] = {GLX_RGBA, GLX_RED_SIZE,  1, GLX_GREEN_SIZE,
                    1,        GLX_BLUE_SIZE, 1, None};
   XVisualInfo* vInfo = glXChooseVisual(dpy, DefaultScreen(dpy), attribs);
-  if (!vInfo) fatal_error("No visuals found");
+  if (!vInfo) {
+    record_error("No visuals found");
+    return;
+  }
 
   // using a X11 Window instead of a GLXPixmap does not crash
   // fglrx in indirect rendering. bug 680644
@@ -405,21 +511,18 @@
   void* glXBindTexImageEXT = glXGetProcAddress("glXBindTexImageEXT");
 
   ///// Get GL vendor/renderer/versions strings /////
-  enum { bufsize = 2048 };
-  char buf[bufsize];
   const GLubyte* versionString = glGetString(GL_VERSION);
   const GLubyte* vendorString = glGetString(GL_VENDOR);
   const GLubyte* rendererString = glGetString(GL_RENDERER);
 
-  if (!versionString || !vendorString || !rendererString)
-    fatal_error("glGetString returned null");
-
-  int length =
-      snprintf(buf, bufsize, "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\nTFP\n%s\n",
-               vendorString, rendererString, versionString,
-               glXBindTexImageEXT ? "TRUE" : "FALSE");
-  if (length >= bufsize)
-    fatal_error("GL strings length too large for buffer size");
+  if (versionString && vendorString && rendererString) {
+    record_value("VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\nTFP\n%s\n",
+                 vendorString, rendererString, versionString,
+                 glXBindTexImageEXT ? "TRUE" : "FALSE");
+    *gotGlxInfo = 1;
+  } else {
+    record_error("glGetString returned null");
+  }
 
   // If GLX_MESA_query_renderer is available, populate additional data.
   typedef Bool (*PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC)(
@@ -443,31 +546,23 @@
     vendorId &= 0xFFFF;
     deviceId &= 0xFFFF;
 
-    length += snprintf(buf + length, bufsize - length,
-                       "MESA_VENDOR_ID\n0x%04x\n"
-                       "MESA_DEVICE_ID\n0x%04x\n"
-                       "MESA_ACCELERATED\n%s\n"
-                       "MESA_VRAM\n%dMB\n",
-                       vendorId, deviceId, accelerated ? "TRUE" : "FALSE",
-                       videoMemoryMB);
-
-    if (length >= bufsize)
-      fatal_error("GL strings length too large for buffer size");
+    record_value(
+        "MESA_VENDOR_ID\n0x%04x\n"
+        "MESA_DEVICE_ID\n0x%04x\n"
+        "MESA_ACCELERATED\n%s\n"
+        "MESA_VRAM\n%dMB\n",
+        vendorId, deviceId, accelerated ? "TRUE" : "FALSE", videoMemoryMB);
   }
 
   // From Mesa's GL/internal/dri_interface.h, to be used by DRI clients.
-  int gotDriDriver = 0;
   typedef const char* (*PFNGLXGETSCREENDRIVERPROC)(Display * dpy, int scrNum);
   PFNGLXGETSCREENDRIVERPROC glXGetScreenDriverProc =
       cast<PFNGLXGETSCREENDRIVERPROC>(glXGetProcAddress("glXGetScreenDriver"));
   if (glXGetScreenDriverProc) {
     const char* driDriver = glXGetScreenDriverProc(dpy, DefaultScreen(dpy));
     if (driDriver) {
-      gotDriDriver = 1;
-      length += snprintf(buf + length, bufsize - length, "DRI_DRIVER\n%s\n",
-                         driDriver);
-      if (length >= bufsize)
-        fatal_error("GL strings length too large for buffer size");
+      *gotDriDriver = 1;
+      record_value("DRI_DRIVER\n%s\n", driDriver);
     }
   }
 
@@ -476,20 +571,15 @@
   int screenCount = ScreenCount(dpy);
   int defaultScreen = DefaultScreen(dpy);
   if (screenCount != 0) {
-    length += snprintf(buf + length, bufsize - length, "SCREEN_INFO\n");
-    if (length >= bufsize)
-      fatal_error("Screen Info strings length too large for buffer size");
+    record_value("SCREEN_INFO\n");
     for (int idx = 0; idx < screenCount; idx++) {
       Screen* scrn = ScreenOfDisplay(dpy, idx);
       int current_height = scrn->height;
       int current_width = scrn->width;
 
-      length +=
-          snprintf(buf + length, bufsize - length, "%dx%d:%d%s", current_width,
-                   current_height, idx == defaultScreen ? 1 : 0,
+      record_value("%dx%d:%d%s", current_width, current_height,
+                   idx == defaultScreen ? 1 : 0,
                    idx == screenCount - 1 ? ";\n" : ";");
-      if (length >= bufsize)
-        fatal_error("Screen Info strings length too large for buffer size");
     }
   }
 
@@ -516,21 +606,87 @@
 #endif
 
   dlclose(libgl);
+}
 
-  // If we failed to get the driver name from X, try via EGL_MESA_query_driver.
-  // We are probably using Wayland.
-  if (!gotDriDriver) {
-    length += get_egl_status(buf + length, bufsize - length, nullptr, false);
-    if (length >= bufsize) {
-      fatal_error("GL strings length too large for buffer size");
-    }
+static void close_logging() {
+  // we want to redirect to /dev/null stdout, stderr, and while we're at it,
+  // any PR logging file descriptors. To that effect, we redirect all positive
+  // file descriptors up to what open() returns here. In particular, 1 is stdout
+  // and 2 is stderr.
+  int fd = open("/dev/null", O_WRONLY);
+  for (int i = 1; i < fd; i++) dup2(fd, i);
+  close(fd);
+
+  if (getenv("MOZ_AVOID_OPENGL_ALTOGETHER")) {
+    const char* msg = "ERROR\nMOZ_AVOID_OPENGL_ALTOGETHER envvar set";
+    mozilla::Unused << write(write_end_of_the_pipe, msg, strlen(msg));
+    exit(EXIT_FAILURE);
+  }
+}
+
+#ifdef MOZ_WAYLAND
+static bool wayland_egltest() {
+  // NOTE: returns false to fall back to X11 when the Wayland socket doesn't
+  // exist but fails with record_error if something actually went wrong
+  struct wl_display* dpy = wl_display_connect(nullptr);
+  if (!dpy) {
+    return false;
   }
 
-  ///// Finally write data to the pipe
-  mozilla::Unused << write(write_end_of_the_pipe, buf, length);
+  get_egl_status((EGLNativeDisplayType)dpy, true);
+  return true;
 }
+#endif
+
+static void glxtest() {
+  int gotGlxInfo = 0;
+  int gotDriDriver = 0;
+
+  get_glx_status(&gotGlxInfo, &gotDriDriver);
+  if (!gotGlxInfo) {
+    get_egl_status(nullptr, true);
+  } else if (!gotDriDriver) {
+    // If we failed to get the driver name from X, try via
+    // EGL_MESA_query_driver. We are probably using Wayland.
+    get_egl_status(nullptr, false);
+  }
 }
 
+int childgltest() {
+  enum { bufsize = 2048 };
+  char buf[bufsize];
+
+  // We save it as a global so that the X error handler can flush the buffer
+  // before early exiting.
+  glxtest_buf = buf;
+  glxtest_bufsize = bufsize;
+
+  // Get a list of all GPUs from the PCI bus.
+  get_pci_status();
+
+  // TODO: --display command line argument is not properly handled
+  // NOTE: prefers X for now because eglQueryRendererIntegerMESA does not
+  // exist yet
+#ifdef MOZ_WAYLAND
+  if (IsWaylandDisabled() || getenv("DISPLAY") || !wayland_egltest())
+#endif
+  {
+    glxtest();
+  }
+
+  // Finally write buffered data to the pipe.
+  record_flush();
+
+  // If we completely filled the buffer, we need to tell the parent.
+  if (glxtest_length >= glxtest_bufsize) {
+    return EXIT_FAILURE_BUFFER_TOO_SMALL;
+  }
+
+  return EXIT_SUCCESS;
+}
+
+}  // extern "C"
+
 /** \returns true in the child glxtest process, false in the parent process */
 bool fire_glxtest_process() {
   int pfd[2];
@@ -551,15 +707,9 @@
     close(pfd[0]);
     write_end_of_the_pipe = pfd[1];
     close_logging();
-    // TODO: --display command line argument is not properly handled
-    // NOTE: prefers X for now because eglQueryRendererIntegerMESA does not
-    // exist yet
-#ifdef MOZ_WAYLAND
-    if (IsWaylandDisabled() || getenv("DISPLAY") || !wayland_egltest())
-#endif
-      glxtest();
+    int rv = childgltest();
     close(pfd[1]);
-    _exit(0);
+    _exit(rv);
   }
 
   close(pfd[1]);
diff -Nru firefox-84.0.2+build1/toolkit/xre/MacApplicationDelegate.mm firefox-85.0+build1/toolkit/xre/MacApplicationDelegate.mm
--- firefox-84.0.2+build1/toolkit/xre/MacApplicationDelegate.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/MacApplicationDelegate.mm	2021-01-18 19:58:27.000000000 +0000
@@ -304,7 +304,7 @@
   nsCOMPtr<nsIAppStartup> appService = do_GetService("@mozilla.org/toolkit/app-startup;1");
   if (appService) {
     bool userAllowedQuit = true;
-    appService->Quit(nsIAppStartup::eForceQuit, &userAllowedQuit);
+    appService->Quit(nsIAppStartup::eForceQuit, 0, &userAllowedQuit);
     if (!userAllowedQuit) {
       return NSTerminateCancel;
     }
diff -Nru firefox-84.0.2+build1/toolkit/xre/nsAppRunner.cpp firefox-85.0+build1/toolkit/xre/nsAppRunner.cpp
--- firefox-84.0.2+build1/toolkit/xre/nsAppRunner.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/nsAppRunner.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -274,6 +274,7 @@
 static const char kPrefBrowserStartupBlankWindow[] =
     "browser.startup.blankWindow";
 static const char kPrefPreXulSkeletonUI[] = "browser.startup.preXulSkeletonUI";
+static const char kPrefDrawTabsInTitlebar[] = "browser.tabs.drawInTitlebar";
 #endif  // defined(XP_WIN)
 
 int gArgc;
@@ -1954,7 +1955,8 @@
 
   bool shouldBeEnabled =
       Preferences::GetBool(kPrefPreXulSkeletonUI, false) &&
-      Preferences::GetBool(kPrefBrowserStartupBlankWindow, false);
+      Preferences::GetBool(kPrefBrowserStartupBlankWindow, false) &&
+      Preferences::GetBool(kPrefDrawTabsInTitlebar, false);
   if (shouldBeEnabled && Preferences::HasUserValue(kPrefThemeId)) {
     nsCString themeId;
     Preferences::GetCString(kPrefThemeId, themeId);
@@ -1983,6 +1985,8 @@
   Preferences::RegisterCallback(&ReflectSkeletonUIPrefToRegistry,
                                 kPrefBrowserStartupBlankWindow);
   Preferences::RegisterCallback(&ReflectSkeletonUIPrefToRegistry, kPrefThemeId);
+  Preferences::RegisterCallback(&ReflectSkeletonUIPrefToRegistry,
+                                kPrefDrawTabsInTitlebar);
 }
 
 #  if defined(MOZ_LAUNCHER_PROCESS)
@@ -2207,9 +2211,9 @@
   PRStatus failed = PR_WaitProcess(process, &exitCode);
   if (failed || exitCode) return NS_ERROR_FAILURE;
 #      endif  // XP_UNIX
-#    endif    // WP_WIN
-#  endif      // WP_MACOSX
-#endif        // MOZ_WIDGET_ANDROID
+#    endif  // WP_WIN
+#  endif  // WP_MACOSX
+#endif  // MOZ_WIDGET_ANDROID
 
   return NS_ERROR_LAUNCHED_CHILD_PROCESS;
 }
@@ -4071,18 +4075,22 @@
 
 #if defined(MOZ_WAYLAND)
 bool IsWaylandDisabled() {
-  const char* backendPref = PR_GetEnv("GDK_BACKEND");
-  if (backendPref && strcmp(backendPref, "wayland") == 0) {
-    return false;
+  // MOZ_ENABLE_WAYLAND is our primary Wayland on/off switch.
+  const char* waylandPref = PR_GetEnv("MOZ_ENABLE_WAYLAND");
+  bool enableWayland = (waylandPref && *waylandPref);
+  if (!enableWayland) {
+    const char* backendPref = PR_GetEnv("GDK_BACKEND");
+    enableWayland = (backendPref && strncmp(backendPref, "wayland", 7) == 0);
+    if (enableWayland) {
+      NS_WARNING(
+          "Wayland backend should be enabled by MOZ_ENABLE_WAYLAND=1."
+          "GDK_BACKEND is a Gtk3 debug variable and may cause various issues.");
+    }
   }
-  // Enable Wayland on Gtk+ >= 3.22 where we can expect recent enough
-  // compositor & libwayland interface.
-  bool disableWayland = (gtk_check_version(3, 22, 0) != nullptr);
-  if (!disableWayland) {
-    // Make X11 backend the default one unless MOZ_ENABLE_WAYLAND is set.
-    disableWayland = (PR_GetEnv("MOZ_ENABLE_WAYLAND") == nullptr);
+  if (enableWayland && gtk_check_version(3, 22, 0) != nullptr) {
+    NS_WARNING("Running Wayland backen on Gtk3 < 3.22. Expect issues/glitches");
   }
-  return disableWayland;
+  return !enableWayland;
 }
 #endif
 
@@ -4150,7 +4158,7 @@
     }
   }
 #  endif /* DEBUG */
-#endif   /* FUZZING */
+#endif /* FUZZING */
 
 #if defined(XP_WIN)
   // Enable the HeapEnableTerminationOnCorruption exploit mitigation. We ignore
@@ -4687,7 +4695,7 @@
 #  if defined(MOZ_GECKO_PROFILER)
   mozilla::mscom::InitProfilerMarkers();
 #  endif  // defined(MOZ_GECKO_PROFILER)
-#endif    // defined(XP_WIN)
+#endif  // defined(XP_WIN)
 
   rv = mScopedXPCOM->SetWindowCreator(mNativeApp);
   NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
@@ -5338,7 +5346,10 @@
 
   XRE_DeinitCommandLine();
 
-  return NS_FAILED(rv) ? 1 : 0;
+  if (NS_FAILED(rv)) {
+    return 1;
+  }
+  return mozilla::AppShutdown::GetExitCode();
 }
 
 void XRE_StopLateWriteChecks(void) { mozilla::StopLateWriteChecks(); }
diff -Nru firefox-84.0.2+build1/toolkit/xre/nsAppRunner.h firefox-85.0+build1/toolkit/xre/nsAppRunner.h
--- firefox-84.0.2+build1/toolkit/xre/nsAppRunner.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/nsAppRunner.h	2021-01-18 19:58:27.000000000 +0000
@@ -25,6 +25,7 @@
 #  endif
 #endif
 
+#include "nsCOMPtr.h"
 #include "nsStringFwd.h"
 #include "nsXULAppAPI.h"
 
diff -Nru firefox-84.0.2+build1/toolkit/xre/nsEmbedFunctions.cpp firefox-85.0+build1/toolkit/xre/nsEmbedFunctions.cpp
--- firefox-84.0.2+build1/toolkit/xre/nsEmbedFunctions.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/nsEmbedFunctions.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -4,8 +4,6 @@
 
 #include "mozilla/DebugOnly.h"
 
-#include "base/basictypes.h"
-
 #include "nsXULAppAPI.h"
 
 #include <stdlib.h>
@@ -17,20 +15,17 @@
 
 #include "nsIAppShell.h"
 #include "nsAppStartupNotifier.h"
-#include "nsIFile.h"
 #include "nsIToolkitProfile.h"
 
 #ifdef XP_WIN
 #  include <process.h>
 #  include <shobjidl.h>
 #  include "mozilla/ipc/WindowsMessageLoop.h"
+#  include "mozilla/ScopeExit.h"
 #  include "mozilla/WinDllServices.h"
 #endif
 
-#include "nsAppDirectoryServiceDefs.h"
 #include "nsAppRunner.h"
-#include "nsAutoRef.h"
-#include "nsDirectoryServiceDefs.h"
 #include "nsExceptionHandler.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
@@ -39,6 +34,7 @@
 #include "nsXREDirProvider.h"
 #ifdef MOZ_ASAN_REPORTER
 #  include "CmdLineAndEnvUtils.h"
+#  include "nsIFile.h"
 #endif
 
 #include "mozilla/Omnijar.h"
@@ -46,13 +42,10 @@
 #  include "nsVersionComparator.h"
 #  include "chrome/common/mach_ipc_mac.h"
 #endif
-#include "nsX11ErrorHandler.h"
 #include "nsGDKErrorHandler.h"
 #include "base/at_exit.h"
-#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
-#include "chrome/common/child_process.h"
 #if defined(MOZ_WIDGET_ANDROID)
 #  include "chrome/common/ipc_channel.h"
 #  include "mozilla/jni/Utils.h"
@@ -66,18 +59,14 @@
 #include "mozilla/UniquePtr.h"
 
 #include "mozilla/ipc/BrowserProcessSubThread.h"
-#include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ipc/IOThreadChild.h"
 #include "mozilla/ipc/ProcessChild.h"
-#include "ScopedXREEmbed.h"
 
 #include "mozilla/plugins/PluginProcessChild.h"
 #include "mozilla/dom/ContentProcess.h"
 #include "mozilla/dom/ContentParent.h"
-#include "mozilla/dom/ContentChild.h"
 
 #include "mozilla/ipc/TestShellParent.h"
-#include "mozilla/ipc/XPCShellEnvironment.h"
 #if defined(XP_WIN)
 #  include "mozilla/WindowsConsole.h"
 #  include "mozilla/WindowsDllBlocklist.h"
@@ -97,8 +86,8 @@
 #endif
 
 #if defined(MOZ_SANDBOX)
+#  include "XREChildData.h"
 #  include "mozilla/SandboxSettings.h"
-#  include "mozilla/Preferences.h"
 #endif
 
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
diff -Nru firefox-84.0.2+build1/toolkit/xre/nsNativeAppSupportUnix.cpp firefox-85.0+build1/toolkit/xre/nsNativeAppSupportUnix.cpp
--- firefox-84.0.2+build1/toolkit/xre/nsNativeAppSupportUnix.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/nsNativeAppSupportUnix.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -266,7 +266,7 @@
 
     if (appService) {
       bool userAllowedQuit = true;
-      appService->Quit(nsIAppStartup::eForceQuit, &userAllowedQuit);
+      appService->Quit(nsIAppStartup::eForceQuit, 0, &userAllowedQuit);
     }
   } else {
     if (mClientState != STATE_SHUTDOWN_CANCELLED) {
@@ -355,7 +355,7 @@
 
   if (appService) {
     bool userAllowedQuit = false;
-    appService->Quit(nsIAppStartup::eForceQuit, &userAllowedQuit);
+    appService->Quit(nsIAppStartup::eForceQuit, 0, &userAllowedQuit);
   }
   // Quit causes the shutdown to begin but the shutdown process is asynchronous
   // so we can't DisconnectFromSM() yet
diff -Nru firefox-84.0.2+build1/toolkit/xre/nsXREDirProvider.cpp firefox-85.0+build1/toolkit/xre/nsXREDirProvider.cpp
--- firefox-84.0.2+build1/toolkit/xre/nsXREDirProvider.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/nsXREDirProvider.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -33,6 +33,7 @@
 #include "nsEnumeratorUtils.h"
 #include "nsReadableUtils.h"
 
+#include "GeckoProfiler.h"
 #include "SpecialSystemDirectory.h"
 
 #include "mozilla/dom/ScriptSettings.h"
@@ -43,6 +44,7 @@
 #include "mozilla/Omnijar.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/XREAppData.h"
 #include "nsPrintfCString.h"
 
 #include <stdlib.h>
diff -Nru firefox-84.0.2+build1/toolkit/xre/ProfileReset.cpp firefox-85.0+build1/toolkit/xre/ProfileReset.cpp
--- firefox-84.0.2+build1/toolkit/xre/ProfileReset.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/ProfileReset.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -20,6 +20,7 @@
 #include "mozilla/XREAppData.h"
 
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
 #include "prtime.h"
 
diff -Nru firefox-84.0.2+build1/toolkit/xre/ProfileReset.h firefox-85.0+build1/toolkit/xre/ProfileReset.h
--- firefox-84.0.2+build1/toolkit/xre/ProfileReset.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/ProfileReset.h	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "nsToolkitProfileService.h"
 #include "nsIFile.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 static bool gProfileResetCleanupCompleted = false;
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/moz.build firefox-85.0+build1/toolkit/xre/test/gtest/moz.build
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -10,13 +10,22 @@
     "TestCompatVersionCompare.cpp",
 ]
 
+include("/ipc/chromium/chromium-config.mozbuild")
+
 LOCAL_INCLUDES += [
     "/toolkit/components/remote",
+    "/toolkit/components/telemetry/other",
+    "/toolkit/components/telemetry/tests/gtest",
 ]
 
 if CONFIG["OS_TARGET"] == "WINNT":
     UNIFIED_SOURCES += [
         "TestAssembleCommandLineWin.cpp",
+        "TestUntrustedModules.cpp",
+    ]
+    TEST_DIRS += [
+        "TestUntrustedModules_Dll1",
+        "TestUntrustedModules_Dll2",
     ]
 
 FINAL_LIBRARY = "xul-gtest"
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules.cpp firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules.cpp
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,381 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+#include "gtest/gtest.h"
+
+#include "js/RegExp.h"
+#include "mozilla/SpinEventLoopUntil.h"
+#include "mozilla/UntrustedModulesProcessor.h"
+#include "mozilla/WinDllServices.h"
+#include "nsContentUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "TelemetryFixture.h"
+#include "UntrustedModulesBackupService.h"
+#include "UntrustedModulesDataSerializer.h"
+
+class ModuleLoadCounter final {
+  nsDataHashtable<nsStringCaseInsensitiveHashKey, int> mCounters;
+
+ public:
+  template <int N>
+  ModuleLoadCounter(const nsString (&aNames)[N], const int (&aCounts)[N])
+      : mCounters(N) {
+    for (int i = 0; i < N; ++i) {
+      mCounters.Put(aNames[i], aCounts[i]);
+    }
+  }
+
+  template <int N>
+  bool Remains(const nsString (&aNames)[N], const int (&aCounts)[N]) {
+    EXPECT_EQ(mCounters.Count(), N);
+    if (mCounters.Count() != N) {
+      return false;
+    }
+
+    bool result = true;
+    for (int i = 0; i < N; ++i) {
+      int* entry = mCounters.GetValue(aNames[i]);
+      if (!entry) {
+        wprintf(L"%s is not registered.\n", aNames[i].get());
+        result = false;
+      } else if (*entry != aCounts[i]) {
+        // We can return false, but let's print out all unmet modules
+        // which may be helpful to investigate test failures.
+        wprintf(L"%s:%4d\n", aNames[i].get(), *entry);
+        result = false;
+      }
+    }
+    return result;
+  }
+
+  bool IsDone() const {
+    bool allZero = true;
+    for (auto iter = mCounters.ConstIter(); !iter.Done(); iter.Next()) {
+      if (iter.Data() < 0) {
+        // If any counter is negative, we know the test fails.
+        // No need to continue.
+        return true;
+      }
+      if (iter.Data() > 0) {
+        allZero = false;
+      }
+    }
+    // If all counters are zero, the test finished nicely.  Otherwise, those
+    // counters are expected to be decremented later.  Let's continue.
+    return allZero;
+  }
+
+  void Decrement(const nsString& aName) {
+    if (int* entry = mCounters.GetValue(aName)) {
+      --(*entry);
+    }
+  }
+};
+
+class UntrustedModulesCollector {
+  static constexpr int kMaximumPendingQueries = 200;
+  Vector<UntrustedModulesData> mData;
+
+ public:
+  Vector<UntrustedModulesData>& Data() { return mData; }
+
+  nsresult Collect(ModuleLoadCounter& aChecker) {
+    nsresult rv = NS_OK;
+
+    mData.clear();
+    int pendingQueries = 0;
+
+    EXPECT_TRUE(SpinEventLoopUntil([this, &pendingQueries, &aChecker, &rv]() {
+      // Some of expected loaded modules are still missing
+      // after kMaximumPendingQueries queries were submitted.
+      // Giving up here to avoid an infinite loop.
+      if (pendingQueries >= kMaximumPendingQueries) {
+        rv = NS_ERROR_ABORT;
+        return true;
+      }
+
+      ++pendingQueries;
+
+      RefPtr<DllServices> dllSvc(DllServices::Get());
+      dllSvc->GetUntrustedModulesData()->Then(
+          GetMainThreadSerialEventTarget(), __func__,
+          [this, &pendingQueries,
+           &aChecker](Maybe<UntrustedModulesData>&& aResult) {
+            EXPECT_GT(pendingQueries, 0);
+            --pendingQueries;
+
+            if (aResult.isSome()) {
+              wprintf(L"Received data. (pendingQueries=%d)\n", pendingQueries);
+              for (const auto& evt : aResult.ref().mEvents) {
+                aChecker.Decrement(evt.mRequestedDllName);
+              }
+              EXPECT_TRUE(mData.emplaceBack(std::move(aResult.ref())));
+            }
+          },
+          [&pendingQueries, &rv](nsresult aReason) {
+            EXPECT_GT(pendingQueries, 0);
+            --pendingQueries;
+
+            wprintf(L"GetUntrustedModulesData() failed - %08x\n", aReason);
+            EXPECT_TRUE(false);
+            rv = aReason;
+          });
+
+      // Keep calling GetUntrustedModulesData() until we meet the condition.
+      return aChecker.IsDone();
+    }));
+
+    EXPECT_TRUE(SpinEventLoopUntil(
+        [&pendingQueries]() { return pendingQueries <= 0; }));
+
+    return rv;
+  }
+};
+
+static void ValidateUntrustedModules(const UntrustedModulesData& aData) {
+  EXPECT_EQ(aData.mProcessType, GeckoProcessType_Default);
+  EXPECT_EQ(aData.mPid, ::GetCurrentProcessId());
+
+  nsTHashtable<nsPtrHashKey<void>> moduleSet;
+  for (auto iter = aData.mModules.ConstIter(); !iter.Done(); iter.Next()) {
+    const RefPtr<ModuleRecord>& module = iter.Data();
+    moduleSet.PutEntry(module);
+  }
+
+  for (const auto& evt : aData.mEvents) {
+    EXPECT_EQ(evt.mThreadId, ::GetCurrentThreadId());
+    // Make sure mModule is pointing to an entry of mModules.
+    EXPECT_TRUE(moduleSet.Contains(evt.mModule));
+    EXPECT_FALSE(evt.mIsDependent);
+  }
+
+  // No check for the mXULLoadDurationMS field because the field has a value
+  // in CCov build GTest, but it is empty in non-CCov build (bug 1681936).
+  EXPECT_GT(aData.mEvents.length(), 0);
+  EXPECT_GT(aData.mStacks.GetModuleCount(), 0);
+  EXPECT_EQ(aData.mSanitizationFailures, 0);
+  EXPECT_EQ(aData.mTrustTestFailures, 0);
+}
+
+class UntrustedModulesFixture : public TelemetryTestFixture {
+  static constexpr int kLoadCountBeforeDllServices = 5;
+  static constexpr int kLoadCountAfterDllServices = 5;
+  static constexpr uint32_t kMaxModulesArrayLen = 10;
+
+  // One of the important test scenarios is to load modules before DllServices
+  // is initialized and to make sure those loading events are forwarded when
+  // DllServices is initialized.
+  // However, GTest instantiates a Fixture class every testcase and there is
+  // no way to re-enable DllServices and UntrustedModulesProcessor once it's
+  // disabled, which means no matter how many testcases we have, only the
+  // first testcase exercises that scenario.  That's why we implement that
+  // test scenario in InitialModuleLoadOnce as a static member and runs it
+  // in the first testcase to be executed.
+  static INIT_ONCE sInitLoadOnce;
+  static UntrustedModulesCollector sInitLoadDataCollector;
+
+  static nsString PrependWorkingDir(const nsAString& aLeaf) {
+    nsCOMPtr<nsIFile> file;
+    EXPECT_TRUE(NS_SUCCEEDED(NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR,
+                                                    getter_AddRefs(file))));
+    EXPECT_TRUE(NS_SUCCEEDED(file->Append(aLeaf)));
+    bool exists;
+    EXPECT_TRUE(NS_SUCCEEDED(file->Exists(&exists)) && exists);
+    nsString fullPath;
+    EXPECT_TRUE(NS_SUCCEEDED(file->GetPath(fullPath)));
+    return fullPath;
+  }
+
+  static BOOL CALLBACK InitialModuleLoadOnce(PINIT_ONCE, void*, void**);
+
+ protected:
+  static constexpr int kInitLoadCount =
+      kLoadCountBeforeDllServices + kLoadCountAfterDllServices;
+  static const nsString kTestModules[];
+
+  static void LoadAndFree(const nsAString& aLeaf) {
+    nsModuleHandle dll(::LoadLibraryW(PrependWorkingDir(aLeaf).get()));
+    EXPECT_TRUE(!!dll);
+  }
+
+  virtual void SetUp() override {
+    TelemetryTestFixture::SetUp();
+    ::InitOnceExecuteOnce(&sInitLoadOnce, InitialModuleLoadOnce, nullptr,
+                          nullptr);
+  }
+
+  static const Vector<UntrustedModulesData>& GetInitLoadData() {
+    return sInitLoadDataCollector.Data();
+  }
+
+  // This method is useful if we want a new instance of UntrustedModulesData
+  // which is not copyable.
+  static UntrustedModulesData CollectSingleData() {
+    // If we call LoadAndFree more than once, those loading events are
+    // likely to be merged into an instance of UntrustedModulesData,
+    // meaning the length of the collector's vector is at least one but
+    // the exact number is unknown.
+    LoadAndFree(kTestModules[0]);
+
+    UntrustedModulesCollector collector;
+    ModuleLoadCounter waitForOne({kTestModules[0]}, {1});
+    EXPECT_TRUE(NS_SUCCEEDED(collector.Collect(waitForOne)));
+    EXPECT_TRUE(waitForOne.Remains({kTestModules[0]}, {0}));
+    EXPECT_EQ(collector.Data().length(), 1);
+
+    // Cannot "return collector.Data()[0]" as copy ctor is deleted.
+    return UntrustedModulesData(std::move(collector.Data()[0]));
+  }
+
+  template <typename DataFetcherT>
+  void ValidateJSValue(const char16_t* aPattern, size_t aPatternLength,
+                       DataFetcherT&& aDataFetcher) {
+    AutoJSContextWithGlobal cx(mCleanGlobal);
+    mozilla::Telemetry::UntrustedModulesDataSerializer serializer(
+        cx.GetJSContext(), kMaxModulesArrayLen);
+    EXPECT_TRUE(!!serializer);
+    aDataFetcher(serializer);
+
+    JS::RootedValue jsval(cx.GetJSContext());
+    serializer.GetObject(&jsval);
+
+    nsAutoString json;
+    EXPECT_TRUE(nsContentUtils::StringifyJSON(cx.GetJSContext(), &jsval, json));
+
+    JS::RootedObject re(
+        cx.GetJSContext(),
+        JS::NewUCRegExpObject(cx.GetJSContext(), aPattern, aPatternLength,
+                              JS::RegExpFlag::Global));
+    EXPECT_TRUE(!!re);
+
+    JS::RootedValue matchResult(cx.GetJSContext(), JS::NullValue());
+    size_t idx = 0;
+    EXPECT_TRUE(JS::ExecuteRegExpNoStatics(cx.GetJSContext(), re, json.get(),
+                                           json.Length(), &idx, true,
+                                           &matchResult));
+    // On match, with aOnlyMatch = true, ExecuteRegExpNoStatics returns boolean
+    // true.  If no match, ExecuteRegExpNoStatics returns Null.
+    EXPECT_TRUE(matchResult.isBoolean() && matchResult.toBoolean());
+    if (!matchResult.toBoolean()) {
+      // If match failed, print out the actual JSON kindly.
+      wprintf(L"JSON: %s\n", json.get());
+      wprintf(L"RE: %s\n", aPattern);
+    }
+  }
+};
+
+const nsString UntrustedModulesFixture::kTestModules[] = {
+    u"TestUntrustedModules_Dll1.dll"_ns, u"TestUntrustedModules_Dll2.dll"_ns};
+INIT_ONCE UntrustedModulesFixture::sInitLoadOnce = INIT_ONCE_STATIC_INIT;
+UntrustedModulesCollector UntrustedModulesFixture::sInitLoadDataCollector;
+
+BOOL CALLBACK UntrustedModulesFixture::InitialModuleLoadOnce(PINIT_ONCE, void*,
+                                                             void**) {
+  for (int i = 0; i < kLoadCountBeforeDllServices; ++i) {
+    for (const auto& mod : kTestModules) {
+      LoadAndFree(mod);
+    }
+  }
+
+  RefPtr<DllServices> dllSvc(DllServices::Get());
+  dllSvc->StartUntrustedModulesProcessor();
+
+  for (int i = 0; i < kLoadCountAfterDllServices; ++i) {
+    for (const auto& mod : kTestModules) {
+      LoadAndFree(mod);
+    }
+  }
+
+  ModuleLoadCounter waitForTwo(kTestModules, {kInitLoadCount, kInitLoadCount});
+  EXPECT_EQ(sInitLoadDataCollector.Collect(waitForTwo), NS_OK);
+  EXPECT_TRUE(waitForTwo.Remains(kTestModules, {0, 0}));
+
+  for (const auto& event : GetInitLoadData()) {
+    ValidateUntrustedModules(event);
+  }
+
+  // Data was removed when retrieved.  No data is retrieved again.
+  UntrustedModulesCollector collector;
+  ModuleLoadCounter waitOnceForEach(kTestModules, {1, 1});
+  EXPECT_EQ(collector.Collect(waitOnceForEach), NS_ERROR_ABORT);
+  EXPECT_TRUE(waitOnceForEach.Remains(kTestModules, {1, 1}));
+
+  return TRUE;
+}
+
+#define PROCESS_OBJ(TYPE, PID) \
+  u"\"" TYPE u"\\." PID u"\":{" \
+    u"\"processType\":\"" TYPE u"\",\"elapsed\":\\d+\\.\\d+," \
+    u"\"sanitizationFailures\":0,\"trustTestFailures\":0," \
+    u"\"events\":\\[{" \
+      u"\"processUptimeMS\":\\d+,\"loadDurationMS\":\\d+\\.\\d+," \
+      u"\"threadID\":\\d+,\"threadName\":\"Main Thread\"," \
+      u"\"baseAddress\":\"0x[0-9a-f]+\",\"moduleIndex\":0," \
+      u"\"isDependent\":false}\\]," \
+    u"\"combinedStacks\":{" \
+      u"\"memoryMap\":\\[\\[\"\\w+\\.\\w+\",\"[0-9A-Z]+\"\\]" \
+        u"(,\\[\"\\w+\\.\\w+\",\"[0-9A-Z]+\\\"\\])*\\]," \
+      u"\"stacks\":\\[\\[\\[\\d+,\\d+\\]" \
+        u"(,\\[\\d+,\\d+\\])*\\]\\]}}"
+
+TEST_F(UntrustedModulesFixture, Serialize) {
+  // clang-format off
+  const char16_t kPattern[] = u"{\"structVersion\":1,"
+    u"\"modules\":\\[{"
+      u"\"resolvedDllName\":\"TestUntrustedModules_Dll1\\.dll\","
+      u"\"fileVersion\":\"1\\.2\\.3\\.4\","
+      u"\"companyName\":\"Mozilla Corporation\",\"trustFlags\":0}\\],"
+    u"\"processes\":{"
+      PROCESS_OBJ(u"browser", u"0xabc") u","
+      PROCESS_OBJ(u"browser", u"0x4") u","
+      PROCESS_OBJ(u"rdd", u"0x4")
+  u"}}";
+  // clang-format on
+
+  UntrustedModulesBackupData backup1, backup2;
+  {
+    UntrustedModulesData data1 = CollectSingleData();
+    UntrustedModulesData data2 = CollectSingleData();
+    UntrustedModulesData data3 = CollectSingleData();
+
+    data1.mPid = 0xabc;
+    data2.mPid = 0x4;
+    data2.mProcessType = GeckoProcessType_RDD;
+    data3.mPid = 0x4;
+
+    backup1.Add(std::move(data1));
+    backup2.Add(std::move(data2));
+    backup1.Add(std::move(data3));
+  }
+
+  ValidateJSValue(kPattern, ArrayLength(kPattern) - 1,
+                  [&backup1, &backup2](
+                      Telemetry::UntrustedModulesDataSerializer& aSerializer) {
+                    EXPECT_TRUE(NS_SUCCEEDED(aSerializer.Add(backup1)));
+                    EXPECT_TRUE(NS_SUCCEEDED(aSerializer.Add(backup2)));
+                  });
+}
+
+TEST_F(UntrustedModulesFixture, Backup) {
+  using BackupType = UntrustedModulesBackupService::BackupType;
+
+  RefPtr<UntrustedModulesBackupService> backupSvc(
+      UntrustedModulesBackupService::Get());
+  for (int i = 0; i < 5; ++i) {
+    backupSvc->Backup(BackupType::Staging, CollectSingleData());
+  }
+
+  backupSvc->SettleAllStagingData();
+  EXPECT_TRUE(backupSvc->Ref(BackupType::Staging).IsEmpty());
+
+  for (auto iter = backupSvc->Ref(BackupType::Settled).ConstIter();
+       !iter.Done(); iter.Next()) {
+    const RefPtr<UntrustedModulesDataContainer>& container = iter.Data();
+    EXPECT_TRUE(!!container);
+    const UntrustedModulesData& data = container->mData;
+    EXPECT_EQ(iter.Key(), ProcessHashKey(data.mProcessType, data.mPid));
+    ValidateUntrustedModules(data);
+  }
+}
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/moz.build firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/moz.build
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,17 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+DIST_INSTALL = False
+
+SharedLibrary("TestUntrustedModules_Dll1")
+
+UNIFIED_SOURCES = [
+    "TestUntrustedModules_Dll1.cpp",
+]
+
+RCFILE = "TestUntrustedModules_Dll1.rc"
+
+if CONFIG["COMPILE_ENVIRONMENT"]:
+    TEST_HARNESS_FILES.gtest += ["!TestUntrustedModules_Dll1.dll"]
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.cpp firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.cpp
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,7 @@
+/* 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 <windows.h>
+
+BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID) { return TRUE; }
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.rc firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.rc
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.rc	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll1/TestUntrustedModules_Dll1.rc	2021-01-18 19:58:27.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/. */
+
+#include <winver.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION    1,2,3,4  // This field will be collected
+  PRODUCTVERSION 5,6,7,8
+  FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+  FILEFLAGS 0x1L
+#else
+  FILEFLAGS 0x0L
+#endif
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE 0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904e4"
+    BEGIN
+      VALUE "CompanyName", "Mozilla Corporation"
+      VALUE "OriginalFilename", "TestUntrustedModules_Dll1.dll"
+      VALUE "ProductName", "Test DLL"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/moz.build firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/moz.build
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,15 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+DIST_INSTALL = False
+
+SharedLibrary("TestUntrustedModules_Dll2")
+
+UNIFIED_SOURCES = [
+    "TestUntrustedModules_Dll2.cpp",
+]
+
+if CONFIG["COMPILE_ENVIRONMENT"]:
+    TEST_HARNESS_FILES.gtest += ["!TestUntrustedModules_Dll2.dll"]
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/TestUntrustedModules_Dll2.cpp firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/TestUntrustedModules_Dll2.cpp
--- firefox-84.0.2+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/TestUntrustedModules_Dll2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/gtest/TestUntrustedModules_Dll2/TestUntrustedModules_Dll2.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,7 @@
+/* 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 <windows.h>
+
+BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID) { return TRUE; }
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/marionette/marionette.ini firefox-85.0+build1/toolkit/xre/test/marionette/marionette.ini
--- firefox-84.0.2+build1/toolkit/xre/test/marionette/marionette.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/marionette/marionette.ini	2021-01-18 19:58:27.000000000 +0000
@@ -1 +1,2 @@
 [test_fission_autostart.py]
+[test_exitcode.py]
diff -Nru firefox-84.0.2+build1/toolkit/xre/test/marionette/test_exitcode.py firefox-85.0+build1/toolkit/xre/test/marionette/test_exitcode.py
--- firefox-84.0.2+build1/toolkit/xre/test/marionette/test_exitcode.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/test/marionette/test_exitcode.py	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,33 @@
+from marionette_harness import MarionetteTestCase
+
+
+class TestFissionAutostart(MarionetteTestCase):
+    def test_normal_exit(self):
+        self.marionette.set_context(self.marionette.CONTEXT_CHROME)
+
+        def call_quit():
+            self.marionette.execute_script(
+                """
+                const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+                Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit);
+                """,
+                sandbox="system",
+            )
+
+        self.marionette.quit(in_app=True, callback=call_quit)
+        self.assertEqual(self.marionette.instance.runner.returncode, 0)
+
+    def test_exit_code(self):
+        self.marionette.set_context(self.marionette.CONTEXT_CHROME)
+
+        def call_quit():
+            self.marionette.execute_script(
+                """
+                const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+                Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit, 5);
+                """,
+                sandbox="system",
+            )
+
+        self.marionette.quit(in_app=True, callback=call_quit)
+        self.assertEqual(self.marionette.instance.runner.returncode, 5)
diff -Nru firefox-84.0.2+build1/toolkit/xre/UntrustedModulesData.cpp firefox-85.0+build1/toolkit/xre/UntrustedModulesData.cpp
--- firefox-84.0.2+build1/toolkit/xre/UntrustedModulesData.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/UntrustedModulesData.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -355,6 +355,38 @@
   }
 }
 
+void UntrustedModulesData::Merge(UntrustedModulesData&& aNewData) {
+  // Don't merge loading events of a different process
+  MOZ_ASSERT((mProcessType == aNewData.mProcessType) &&
+             (mPid == aNewData.mPid));
+
+  UntrustedModulesData newData(std::move(aNewData));
+
+  if (mEvents.empty()) {
+    mModules = std::move(newData.mModules);
+    mEvents = std::move(newData.mEvents);
+    mStacks = std::move(newData.mStacks);
+    return;
+  }
+
+  Unused << mEvents.reserve(mEvents.length() + newData.mEvents.length());
+  for (auto&& event : newData.mEvents) {
+    auto addPtr = mModules.LookupForAdd(event.mModule->mResolvedNtName);
+    if (addPtr) {
+      // Even though the path of a ModuleRecord matches, the object of
+      // ModuleRecord can be different.
+      // Make sure the event's mModule points to an object in mModules.
+      event.mModule = addPtr.Data();
+    } else {
+      addPtr.OrInsert([modRef = event.mModule]() { return modRef; });
+    }
+
+    Unused << mEvents.emplaceBack(std::move(event));
+  }
+
+  mStacks.AddStacks(newData.mStacks);
+}
+
 void UntrustedModulesData::Swap(UntrustedModulesData& aOther) {
   GeckoProcessType tmpProcessType = mProcessType;
   mProcessType = aOther.mProcessType;
diff -Nru firefox-84.0.2+build1/toolkit/xre/UntrustedModulesData.h firefox-85.0+build1/toolkit/xre/UntrustedModulesData.h
--- firefox-84.0.2+build1/toolkit/xre/UntrustedModulesData.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/UntrustedModulesData.h	2021-01-18 19:58:27.000000000 +0000
@@ -189,6 +189,7 @@
   void AddNewLoads(const ModulesMap& aModulesMap,
                    Vector<ProcessedModuleLoadEvent>&& aEvents,
                    Vector<Telemetry::ProcessedStack>&& aStacks);
+  void Merge(UntrustedModulesData&& aNewData);
 
   void Swap(UntrustedModulesData& aOther);
 
diff -Nru firefox-84.0.2+build1/toolkit/xre/UntrustedModulesProcessor.cpp firefox-85.0+build1/toolkit/xre/UntrustedModulesProcessor.cpp
--- firefox-84.0.2+build1/toolkit/xre/UntrustedModulesProcessor.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/toolkit/xre/UntrustedModulesProcessor.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/Likely.h"
 #include "mozilla/RDDParent.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
diff -Nru firefox-84.0.2+build1/tools/browsertime/package.json firefox-85.0+build1/tools/browsertime/package.json
--- firefox-84.0.2+build1/tools/browsertime/package.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/browsertime/package.json	2021-01-18 19:58:27.000000000 +0000
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "dependencies": {},
   "devDependencies": {
-    "browsertime": "https://github.com/sitespeedio/browsertime/tarball/8bf45e80ccc65237c622246b11c0739f0409e8e4"
+    "browsertime": "https://github.com/sitespeedio/browsertime/tarball/b494da6ab4f636ae882d8352f52b3a0da0cb2f76"
   },
   "notes(private)": "We don't want to publish to npm, so this is marked as private",
   "private": true
diff -Nru firefox-84.0.2+build1/tools/browsertime/package-lock.json firefox-85.0+build1/tools/browsertime/package-lock.json
--- firefox-84.0.2+build1/tools/browsertime/package-lock.json	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/browsertime/package-lock.json	2021-01-18 19:58:27.000000000 +0000
@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.11.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-      "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -419,23 +419,37 @@
       }
     },
     "@sitespeed.io/chromedriver": {
-      "version": "85.0.4183-83",
-      "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-85.0.4183-83.tgz",
-      "integrity": "sha512-xh7NwX2WBNzGv9Ova90Bldfmks0kyIg1Ecs1RLI59zmLqj1vnE5Dir6UFqsSv/kCnWlCQ8dTdQeHyC8aTO9LCA==",
+      "version": "87.0.4280-20",
+      "resolved": "https://registry.npmjs.org/@sitespeed.io/chromedriver/-/chromedriver-87.0.4280-20.tgz",
+      "integrity": "sha512-BBIyhHx1I5ff9m0xO49ADfI/iDWNoG7STTBMVflMbpgKy8STtcce11A4wDwWyN1+XSteWYuvixl9/ARz0fNdpg==",
       "dev": true,
       "requires": {
-        "node-downloader-helper": "1.0.13",
-        "node-stream-zip": "1.11.2"
+        "node-downloader-helper": "1.0.14",
+        "node-stream-zip": "1.11.3"
       }
     },
     "@sitespeed.io/edgedriver": {
-      "version": "84.0.524-0",
-      "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-84.0.524-0.tgz",
-      "integrity": "sha512-Gw5JPjofq5doXOKV5M5h/XNiFF5XP5/EJDgcxeBJgAFqZQQbQa0mRgVhD8xCT5B0Dxsa254F4/zegndsrkjYBg==",
+      "version": "86.0.622-38",
+      "resolved": "https://registry.npmjs.org/@sitespeed.io/edgedriver/-/edgedriver-86.0.622-38.tgz",
+      "integrity": "sha512-bC8K00gAHKlXYM0TuhJW3OZOEEz5+gHFFxSYc2A+ZwZAG9mVLEheOY8d5ompQF3mu1GjF348ADwbTXWZM51hgw==",
       "dev": true,
       "requires": {
         "node-downloader-helper": "1.0.13",
         "node-stream-zip": "1.11.2"
+      },
+      "dependencies": {
+        "node-downloader-helper": {
+          "version": "1.0.13",
+          "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.13.tgz",
+          "integrity": "sha512-HdwSd8tnC06dIWLFBSTGHlcPKXo308815J4m/1e/NkSd6gmdDaO6KSf9JON5fXt3R5Vdw5bgQvSrgSq4GXjYvg==",
+          "dev": true
+        },
+        "node-stream-zip": {
+          "version": "1.11.2",
+          "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.2.tgz",
+          "integrity": "sha512-cowCX+OyzS3tN2i4BMMFxCr/pE6cQlEMTbVCugmos0TNEJQNtcG04tR41CY8lumO1I7F5GFiLaU4WavomJthaA==",
+          "dev": true
+        }
       }
     },
     "@sitespeed.io/geckodriver": {
@@ -447,819 +461,29 @@
         "node-downloader-helper": "1.0.13",
         "node-stream-zip": "1.11.2",
         "tar": "6.0.2"
+      },
+      "dependencies": {
+        "node-downloader-helper": {
+          "version": "1.0.13",
+          "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.13.tgz",
+          "integrity": "sha512-HdwSd8tnC06dIWLFBSTGHlcPKXo308815J4m/1e/NkSd6gmdDaO6KSf9JON5fXt3R5Vdw5bgQvSrgSq4GXjYvg==",
+          "dev": true
+        },
+        "node-stream-zip": {
+          "version": "1.11.2",
+          "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.2.tgz",
+          "integrity": "sha512-cowCX+OyzS3tN2i4BMMFxCr/pE6cQlEMTbVCugmos0TNEJQNtcG04tR41CY8lumO1I7F5GFiLaU4WavomJthaA==",
+          "dev": true
+        }
       }
     },
     "@sitespeed.io/throttle": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@sitespeed.io/throttle/-/throttle-2.0.1.tgz",
-      "integrity": "sha512-w2xcjhh0cMXVbOXDDjYwiAPdAVye07ruppMeM7+nAXS8nRpqEivtksAy+uq/3/ryXy6DN/2j7/sairSSNK/yhg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@sitespeed.io/throttle/-/throttle-2.0.2.tgz",
+      "integrity": "sha512-6fYzn4DPpLKfvnlUcFGnMzLkdXfCqweLYmp27pth49gAErdAtPAogjD30OmV8XxAyLHqWxJzr9HMBjUrj5uyUw==",
       "dev": true,
       "requires": {
         "minimist": "1.2.5"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
-        },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            }
-          }
-        },
-        "@types/color-name": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-          "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
-        },
-        "acorn": {
-          "version": "7.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
-          "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
-        },
-        "acorn-jsx": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-          "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
-        },
-        "ajv": {
-          "version": "6.12.4",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
-          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ansi-colors": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "argparse": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-          "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-          "requires": {
-            "sprintf-js": "~1.0.2"
-          }
-        },
-        "astral-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.2.1",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-              "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-              "requires": {
-                "@types/color-name": "^1.1.1",
-                "color-convert": "^2.0.1"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "color-name": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-              "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-            },
-            "supports-color": {
-              "version": "7.1.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-              "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-        },
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-is": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-          "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-        },
-        "doctrine": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-          "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "enquirer": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-          "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-          "requires": {
-            "ansi-colors": "^4.1.1"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-        },
-        "eslint": {
-          "version": "7.7.0",
-          "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz",
-          "integrity": "sha512-1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg==",
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "ajv": "^6.10.0",
-            "chalk": "^4.0.0",
-            "cross-spawn": "^7.0.2",
-            "debug": "^4.0.1",
-            "doctrine": "^3.0.0",
-            "enquirer": "^2.3.5",
-            "eslint-scope": "^5.1.0",
-            "eslint-utils": "^2.1.0",
-            "eslint-visitor-keys": "^1.3.0",
-            "espree": "^7.2.0",
-            "esquery": "^1.2.0",
-            "esutils": "^2.0.2",
-            "file-entry-cache": "^5.0.1",
-            "functional-red-black-tree": "^1.0.1",
-            "glob-parent": "^5.0.0",
-            "globals": "^12.1.0",
-            "ignore": "^4.0.6",
-            "import-fresh": "^3.0.0",
-            "imurmurhash": "^0.1.4",
-            "is-glob": "^4.0.0",
-            "js-yaml": "^3.13.1",
-            "json-stable-stringify-without-jsonify": "^1.0.1",
-            "levn": "^0.4.1",
-            "lodash": "^4.17.19",
-            "minimatch": "^3.0.4",
-            "natural-compare": "^1.4.0",
-            "optionator": "^0.9.1",
-            "progress": "^2.0.0",
-            "regexpp": "^3.1.0",
-            "semver": "^7.2.1",
-            "strip-ansi": "^6.0.0",
-            "strip-json-comments": "^3.1.0",
-            "table": "^5.2.3",
-            "text-table": "^0.2.0",
-            "v8-compile-cache": "^2.0.3"
-          }
-        },
-        "eslint-config-prettier": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz",
-          "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==",
-          "requires": {
-            "get-stdin": "^6.0.0"
-          }
-        },
-        "eslint-plugin-prettier": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz",
-          "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==",
-          "requires": {
-            "prettier-linter-helpers": "^1.0.0"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-          "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
-        },
-        "espree": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz",
-          "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==",
-          "requires": {
-            "acorn": "^7.3.1",
-            "acorn-jsx": "^5.2.0",
-            "eslint-visitor-keys": "^1.3.0"
-          }
-        },
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        },
-        "esquery": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-          "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-          "requires": {
-            "estraverse": "^5.1.0"
-          },
-          "dependencies": {
-            "estraverse": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-              "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
-            }
-          }
-        },
-        "esrecurse": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-          "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-          "requires": {
-            "estraverse": "^4.1.0"
-          }
-        },
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-        },
-        "esutils": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-          "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-        },
-        "fast-diff": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-          "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
-        },
-        "fast-json-stable-stringify": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-          "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-        },
-        "fast-levenshtein": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-          "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-        },
-        "file-entry-cache": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-          "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-          "requires": {
-            "flat-cache": "^2.0.1"
-          }
-        },
-        "flat-cache": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-          "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-          "requires": {
-            "flatted": "^2.0.0",
-            "rimraf": "2.6.3",
-            "write": "1.0.3"
-          }
-        },
-        "flatted": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-          "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-        },
-        "functional-red-black-tree": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-          "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-        },
-        "get-stdin": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
-          "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
-        },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "globals": {
-          "version": "12.4.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "ignore": {
-          "version": "4.0.6",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-        },
-        "import-fresh": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-          "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-          "requires": {
-            "parent-module": "^1.0.0",
-            "resolve-from": "^4.0.0"
-          }
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "isexe": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-        },
-        "js-yaml": {
-          "version": "3.14.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-          "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-          "requires": {
-            "argparse": "^1.0.7",
-            "esprima": "^4.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "json-stable-stringify-without-jsonify": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-          "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-        },
-        "levn": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "natural-compare": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-          "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-        },
-        "once": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "optionator": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-          "requires": {
-            "deep-is": "^0.1.3",
-            "fast-levenshtein": "^2.0.6",
-            "levn": "^0.4.1",
-            "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
-          }
-        },
-        "parent-module": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-          "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-          "requires": {
-            "callsites": "^3.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-        },
-        "prelude-ls": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
-        },
-        "prettier": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-          "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="
-        },
-        "prettier-linter-helpers": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-          "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-          "requires": {
-            "fast-diff": "^1.1.2"
-          }
-        },
-        "progress": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-          "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-        },
-        "punycode": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        },
-        "regexpp": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-          "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
-        },
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-        },
-        "slice-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-          "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "astral-regex": "^1.0.0",
-            "is-fullwidth-code-point": "^2.0.0"
-          }
-        },
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "table": {
-          "version": "5.4.6",
-          "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-          "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-          "requires": {
-            "ajv": "^6.10.2",
-            "lodash": "^4.17.14",
-            "slice-ansi": "^2.1.0",
-            "string-width": "^3.0.0"
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-          "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
-        },
-        "type-check": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-          "requires": {
-            "prelude-ls": "^1.2.1"
-          }
-        },
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-        },
-        "uri-js": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-          "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-          "requires": {
-            "punycode": "^2.1.0"
-          }
-        },
-        "v8-compile-cache": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-          "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        },
-        "word-wrap": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-          "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "write": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-          "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-          "requires": {
-            "mkdirp": "^0.5.1"
-          }
-        }
       }
     },
     "@sitespeed.io/tracium": {
@@ -1272,26 +496,20 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         }
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
     "@types/node": {
-      "version": "14.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.10.0.tgz",
-      "integrity": "sha512-SOIyrdADB4cq6eY1F+9iU48iIomFAPltu11LCvA9PKcyEwHadjCFzNVPotAR+oEJA0bCP4Xvvgy+vwu1ZjVh8g==",
+      "version": "14.14.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz",
+      "integrity": "sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ==",
       "dev": true
     },
     "adbkit": {
@@ -1373,9 +591,9 @@
       "dev": true
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true,
       "optional": true
     },
@@ -1403,19 +621,19 @@
       }
     },
     "browsertime": {
-      "version": "https://github.com/sitespeedio/browsertime/tarball/8bf45e80ccc65237c622246b11c0739f0409e8e4",
-      "integrity": "sha512-lvEqRn8bRh0HeRfVC1et3sU/CqWG6jSAwpiRjfHSVXeuNCUYaKLbfgr9VkGcLJXYSq4Mgcy7nXeaZNMLjy8FXA==",
+      "version": "https://github.com/sitespeedio/browsertime/tarball/b494da6ab4f636ae882d8352f52b3a0da0cb2f76",
+      "integrity": "sha512-UKrY403SJpAdi6NumGIUcqdRIFlScAa+6/7s1pcRODmbKXR5KA4p43033NpCgIlwGYJNiz6SJ0KZEzyqEXhw1A==",
       "dev": true,
       "requires": {
         "@cypress/xvfb": "1.2.4",
-        "@sitespeed.io/chromedriver": "85.0.4183-83",
-        "@sitespeed.io/edgedriver": "84.0.524-0",
+        "@sitespeed.io/chromedriver": "87.0.4280-20",
+        "@sitespeed.io/edgedriver": "86.0.622-38",
         "@sitespeed.io/geckodriver": "0.27.0",
-        "@sitespeed.io/throttle": "2.0.1",
+        "@sitespeed.io/throttle": "2.0.2",
         "@sitespeed.io/tracium": "0.3.3",
         "adbkit": "2.11.1",
         "btoa": "1.2.1",
-        "chrome-har": "0.11.11",
+        "chrome-har": "0.11.12",
         "chrome-remote-interface": "0.28.2",
         "dayjs": "1.8.34",
         "execa": "4.0.3",
@@ -1443,14 +661,14 @@
       "dev": true
     },
     "buffer": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
       "optional": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-equal": {
@@ -1486,9 +704,9 @@
       "dev": true
     },
     "chrome-har": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/chrome-har/-/chrome-har-0.11.11.tgz",
-      "integrity": "sha512-VyBscbAb5WSlxNTSxY8OnnRKjZKjUmSJcoYstz/VhPND+WgM5yJZYRMOcn4a3zkRIGOX0MxNH6/n5c+/T3eKIg==",
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/chrome-har/-/chrome-har-0.11.12.tgz",
+      "integrity": "sha512-Fi/YCoUHjQMQC0sPKCdiuGVbApeEwIUNvISrlwZgbuUcxfHJA6MjD4RsIH/YSOAo/Z3ENiF+xaEpsdqqdETIjg==",
       "dev": true,
       "requires": {
         "dayjs": "1.8.31",
@@ -1617,9 +835,9 @@
       "dev": true
     },
     "debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "requires": {
         "ms": "^2.1.1"
@@ -1768,14 +986,14 @@
       }
     },
     "global": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
-      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
+      "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
       "dev": true,
       "optional": true,
       "requires": {
         "min-document": "^2.19.0",
-        "process": "~0.5.1"
+        "process": "^0.11.10"
       }
     },
     "has-ansi": {
@@ -1811,9 +1029,9 @@
       "dev": true
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true,
       "optional": true
     },
@@ -2048,8 +1266,7 @@
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "minipass": {
       "version": "3.1.3",
@@ -2083,9 +1300,9 @@
       "dev": true
     },
     "node-downloader-helper": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.13.tgz",
-      "integrity": "sha512-HdwSd8tnC06dIWLFBSTGHlcPKXo308815J4m/1e/NkSd6gmdDaO6KSf9JON5fXt3R5Vdw5bgQvSrgSq4GXjYvg==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.14.tgz",
+      "integrity": "sha512-JIv11Cer+TwINKzT06Qj4tgpKQSS5cS0BodRz7wTXSRbMyrJA2zmOpwINfuRz+vgDiAgyxIhrih6odrHJN2i4w==",
       "dev": true
     },
     "node-forge": {
@@ -2095,9 +1312,9 @@
       "dev": true
     },
     "node-stream-zip": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.2.tgz",
-      "integrity": "sha512-cowCX+OyzS3tN2i4BMMFxCr/pE6cQlEMTbVCugmos0TNEJQNtcG04tR41CY8lumO1I7F5GFiLaU4WavomJthaA==",
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.11.3.tgz",
+      "integrity": "sha512-GY+9LxkQuIT3O7K8BTdHVGKFcBYBy2vAVcTBtkKpu+OlBef/NSb6VuIWSyLiVDfmLMkggHeRJZN0F3W0GWU/uw==",
       "dev": true
     },
     "npm-run-path": {
@@ -2245,9 +1462,9 @@
       "optional": true
     },
     "process": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
       "dev": true,
       "optional": true
     },
@@ -2496,16 +1713,16 @@
       "dev": true
     },
     "timm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/timm/-/timm-1.7.0.tgz",
-      "integrity": "sha512-oVYHPG5KiUJ3KrbBTmW2kTauIO9E1lDEUM6K92HVuwnPfTt7W8UXZG3vqOo4tVaHRI9AHToVHqhzIUUFkDN6rA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz",
+      "integrity": "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==",
       "dev": true,
       "optional": true
     },
     "tinycolor2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
-      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
+      "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==",
       "dev": true,
       "optional": true
     },
@@ -2596,12 +1813,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -2623,19 +1839,19 @@
       "dev": true
     },
     "ws": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
-      "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz",
+      "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==",
       "dev": true
     },
     "xhr": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz",
-      "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz",
+      "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
       "dev": true,
       "optional": true,
       "requires": {
-        "global": "~4.3.0",
+        "global": "~4.4.0",
         "is-function": "^1.0.1",
         "parse-headers": "^2.0.0",
         "xtend": "^4.0.0"
diff -Nru firefox-84.0.2+build1/tools/clang-tidy/config.yaml firefox-85.0+build1/tools/clang-tidy/config.yaml
--- firefox-84.0.2+build1/tools/clang-tidy/config.yaml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/clang-tidy/config.yaml	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,7 @@
 # Minimum clang-tidy version that is required for all the following checkers
 # to work properly.
 # This is also used by 'mach clang-format'
-package_version: "10.0"
+package_version: "11.0"
 clang_checkers:
   - name: -*
     publish: !!bool no
diff -Nru firefox-84.0.2+build1/tools/code-coverage/CodeCoverageHandler.cpp firefox-85.0+build1/tools/code-coverage/CodeCoverageHandler.cpp
--- firefox-84.0.2+build1/tools/code-coverage/CodeCoverageHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/code-coverage/CodeCoverageHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/DebugOnly.h"
 #include "nsAppRunner.h"
+#include "nsIFile.h"
 #include "nsIOutputStream.h"
 #include "nsNetUtil.h"
 #include "nsPrintfCString.h"
diff -Nru firefox-84.0.2+build1/tools/crashreporter/system-symbols/win/scrape-report.py firefox-85.0+build1/tools/crashreporter/system-symbols/win/scrape-report.py
--- firefox-84.0.2+build1/tools/crashreporter/system-symbols/win/scrape-report.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/crashreporter/system-symbols/win/scrape-report.py	2021-01-18 19:58:27.000000000 +0000
@@ -38,7 +38,7 @@
         else:
             crash_id = file_or_crash
         url = (
-            "https://crash-stats.mozilla.com/api/ProcessedCrash/"
+            "https://crash-stats.mozilla.org/api/ProcessedCrash/"
             "?crash_id={crash_id}&datatype=processed".format(crash_id=crash_id)
         )
         log.info("Fetching missing symbols from crash: %s" % url)
diff -Nru firefox-84.0.2+build1/tools/fuzzing/interface/harness/FuzzerRunner.cpp firefox-85.0+build1/tools/fuzzing/interface/harness/FuzzerRunner.cpp
--- firefox-84.0.2+build1/tools/fuzzing/interface/harness/FuzzerRunner.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/fuzzing/interface/harness/FuzzerRunner.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -50,7 +50,7 @@
   if (!fuzzerEnv) {
     fprintf(stderr,
             "Must specify fuzzing target in FUZZER environment variable\n");
-    return 1;
+    exit(1);
   }
 
   std::string moduleNameStr(fuzzerEnv);
@@ -62,13 +62,13 @@
     int ret = initFunc(argc, argv);
     if (ret) {
       fprintf(stderr, "Fuzzing Interface: Error: Initialize callback failed\n");
-      return ret;
+      exit(1);
     }
   }
 
   if (!testingFunc) {
     fprintf(stderr, "Fuzzing Interface: Error: No testing callback found\n");
-    return 1;
+    exit(1);
   }
 
 #ifdef LIBFUZZER
diff -Nru firefox-84.0.2+build1/tools/fuzzing/rust/Cargo.toml firefox-85.0+build1/tools/fuzzing/rust/Cargo.toml
--- firefox-84.0.2+build1/tools/fuzzing/rust/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/fuzzing/rust/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -7,5 +7,5 @@
 libc = "0.2"
 tempfile = "3"
 lazy_static = "1.4.0"
-rkv = { version = "0.10", features = ["with-fuzzer-no-link"] }
+rkv = { version = "0.16", features = ["with-fuzzer-no-link"] }
 lmdb-rkv = { version = "0.14", features = ["with-fuzzer-no-link"] }
diff -Nru firefox-84.0.2+build1/tools/fuzzing/rust/src/lib.rs firefox-85.0+build1/tools/fuzzing/rust/src/lib.rs
--- firefox-84.0.2+build1/tools/fuzzing/rust/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/fuzzing/rust/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,14 @@
 extern crate rkv;
 extern crate tempfile;
 
+use rkv::backend::{
+    BackendEnvironmentBuilder,
+    SafeMode,
+    SafeModeDatabase,
+    SafeModeEnvironment,
+    SafeModeRoTransaction,
+    SafeModeRwTransaction,
+};
 use std::fs;
 use std::fs::File;
 use std::io::Write;
@@ -18,6 +26,9 @@
 use std::thread;
 use tempfile::Builder;
 
+type Rkv = rkv::Rkv<SafeModeEnvironment>;
+type SingleStore = rkv::SingleStore<SafeModeDatabase>;
+
 fn eat_lmdb_err<T>(value: Result<T, rkv::StoreError>) -> Result<Option<T>, rkv::StoreError> {
     match value {
         Ok(value) => Ok(Some(value)),
@@ -49,8 +60,7 @@
     let mut db_file = File::create("data.mdb").unwrap();
     db_file.write_all(db).unwrap();
 
-    let &mut builder = rkv::Rkv::environment_builder().set_max_dbs(2);
-    let env = rkv::Rkv::from_env(Path::new("."), builder).unwrap();
+    let env = Rkv::with_capacity::<SafeMode>(Path::new("."), 2).unwrap();
     let store = env
         .open_single("test", rkv::StoreOptions::create())
         .unwrap();
@@ -68,7 +78,7 @@
     let root = Builder::new().prefix("fuzz_rkv_db_name").tempdir().unwrap();
     fs::create_dir_all(root.path()).unwrap();
 
-    let env = rkv::Rkv::new(root.path()).unwrap();
+    let env = Rkv::new::<SafeMode>(root.path()).unwrap();
     let name = String::from_utf8_lossy(data);
     println!("Checking string: '{:?}'", name);
     // Some strings are invalid database names, and are handled as store errors.
@@ -93,7 +103,7 @@
         .unwrap();
     fs::create_dir_all(root.path()).unwrap();
 
-    let env = rkv::Rkv::new(root.path()).unwrap();
+    let env = Rkv::new::<SafeMode>(root.path()).unwrap();
     let store = env
         .open_single("test", rkv::StoreOptions::create())
         .unwrap();
@@ -116,7 +126,7 @@
         .unwrap();
     fs::create_dir_all(root.path()).unwrap();
 
-    let env = rkv::Rkv::new(root.path()).unwrap();
+    let env = Rkv::new::<SafeMode>(root.path()).unwrap();
     let store = env
         .open_single("test", rkv::StoreOptions::create())
         .unwrap();
@@ -157,7 +167,7 @@
 
     fn maybe_abort<I: Iterator<Item = u8>>(
         fuzz: &mut I,
-        read: rkv::Reader,
+        read: rkv::Reader<SafeModeRoTransaction>,
     ) -> Result<(), rkv::StoreError> {
         match fuzz.next().map(|byte| byte % 2) {
             Some(0) => Ok(read.abort()),
@@ -167,7 +177,7 @@
 
     fn maybe_commit<I: Iterator<Item = u8>>(
         fuzz: &mut I,
-        write: rkv::Writer,
+        write: rkv::Writer<SafeModeRwTransaction>,
     ) -> Result<(), rkv::StoreError> {
         match fuzz.next().map(|byte| byte % 3) {
             Some(0) => write.commit(),
@@ -207,8 +217,8 @@
 
     fn store_put<I: Iterator<Item = u8> + Clone>(
         fuzz: &mut I,
-        env: &rkv::Rkv,
-        store: &rkv::SingleStore,
+        env: &Rkv,
+        store: &SingleStore,
     ) {
         let key = match get_any_data(fuzz, 1024) {
             Some(key) => key,
@@ -239,8 +249,8 @@
 
     fn store_get<I: Iterator<Item = u8> + Clone>(
         fuzz: &mut I,
-        env: &rkv::Rkv,
-        store: &rkv::SingleStore,
+        env: &Rkv,
+        store: &SingleStore,
     ) {
         let key = match get_any_data(fuzz, 1024) {
             Some(key) => key,
@@ -264,8 +274,8 @@
 
     fn store_delete<I: Iterator<Item = u8> + Clone>(
         fuzz: &mut I,
-        env: &rkv::Rkv,
-        store: &rkv::SingleStore,
+        env: &Rkv,
+        store: &SingleStore,
     ) {
         let key = match get_any_data(fuzz, 1024) {
             Some(key) => key,
@@ -284,7 +294,7 @@
         maybe_commit(fuzz, writer).unwrap();
     }
 
-    fn store_resize<I: Iterator<Item = u8>>(fuzz: &mut I, env: &rkv::Rkv) {
+    fn store_resize<I: Iterator<Item = u8>>(fuzz: &mut I, env: &Rkv) {
         let n = fuzz.next().unwrap_or(1) as usize;
         env.set_map_size(1_048_576 * (n % 100)).unwrap() // 1,048,576 bytes, i.e. 1MiB.
     };
@@ -292,7 +302,7 @@
     let root = Builder::new().prefix("fuzz_rkv_calls").tempdir().unwrap();
     fs::create_dir_all(root.path()).unwrap();
 
-    let mut builder = rkv::Rkv::environment_builder();
+    let mut builder: SafeMode = Rkv::environment_builder();
     builder.set_max_dbs(1); // need at least one db
 
     maybe_do(&mut fuzz, |fuzz| {
@@ -308,7 +318,7 @@
         builder.set_map_size(1_048_576 * (n % 100)); // 1,048,576 bytes, i.e. 1MiB.
     });
 
-    let env = rkv::Rkv::from_env(root.path(), builder).unwrap();
+    let env = Rkv::from_builder(root.path(), builder).unwrap();
     let store = env
         .open_single("test", rkv::StoreOptions::create())
         .unwrap();
diff -Nru firefox-84.0.2+build1/tools/github-sync/converter.py firefox-85.0+build1/tools/github-sync/converter.py
--- firefox-84.0.2+build1/tools/github-sync/converter.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/github-sync/converter.py	2021-01-18 19:58:27.000000000 +0000
@@ -214,6 +214,10 @@
             # prune more parents
             continue
 
+        # Collapse identical parents, because if the parents are identical
+        # we don't need to keep multiple copies of them.
+        hg_commits[rev].parents = list(dict.fromkeys(hg_commits[rev].parents))
+
         # If we get here, all of `rev`s parents are interesting, so we can't
         # prune them. Move up to the parent rev and start processing that, or
         # if we have multiple parents then recurse on those nodes.
diff -Nru firefox-84.0.2+build1/tools/lint/clang-format/__init__.py firefox-85.0+build1/tools/lint/clang-format/__init__.py
--- firefox-84.0.2+build1/tools/lint/clang-format/__init__.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/clang-format/__init__.py	2021-01-18 19:58:27.000000000 +0000
@@ -144,6 +144,11 @@
         return []
 
     cmd_args = [binary]
+
+    base_command = cmd_args + ["--version"]
+    version = run_process(config, base_command)
+    log.debug("Version: {}".format(version))
+
     if fix:
         cmd_args.append("-i")
     else:
diff -Nru firefox-84.0.2+build1/tools/lint/clippy/__init__.py firefox-85.0+build1/tools/lint/clippy/__init__.py
--- firefox-84.0.2+build1/tools/lint/clippy/__init__.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/clippy/__init__.py	2021-01-18 19:58:27.000000000 +0000
@@ -184,12 +184,19 @@
     cmd_args_clean.append("clean")
 
     cmd_args_common = ["--manifest-path"]
-    cmd_args_clippy = [
-        cargo,
+    cmd_args_clippy = [cargo]
+
+    if fix:
+        cmd_args_clippy += ["+nightly"]
+
+    cmd_args_clippy += [
         "clippy",
         "--message-format=json",
     ]
 
+    if fix:
+        cmd_args_clippy += ["--fix", "-Z", "unstable-options"]
+
     lock_files_to_delete = []
     for p in paths:
         lock_file = os.path.join(p, "Cargo.lock")
diff -Nru firefox-84.0.2+build1/tools/lint/file-whitespace.yml firefox-85.0+build1/tools/lint/file-whitespace.yml
--- firefox-84.0.2+build1/tools/lint/file-whitespace.yml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/file-whitespace.yml	2021-01-18 19:58:27.000000000 +0000
@@ -102,7 +102,6 @@
         - layout/tables/test/test_bug337124.html
         - layout/tables/crashtests
         - layout/xul/crashtests
-        - layout/xul/grid/crashtests
         - layout/xul/reftest
         - layout/xul/test
         - layout/xul/tree
diff -Nru firefox-84.0.2+build1/tools/lint/license/__init__.py firefox-85.0+build1/tools/lint/license/__init__.py
--- firefox-84.0.2+build1/tools/lint/license/__init__.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/license/__init__.py	2021-01-18 19:58:27.000000000 +0000
@@ -53,14 +53,19 @@
     return False
 
 
-def add_header(filename, header):
+def add_header(log, filename, header):
     """
     Add the header to the top of the file
     """
     header.append("\n")
     with open(filename, "r+") as f:
         # lines in list format
-        lines = f.readlines()
+        try:
+            lines = f.readlines()
+        except UnicodeDecodeError as e:
+            log.debug("Could not read file '{}'".format(f))
+            log.debug("Error: {}".format(e))
+            return
 
         i = 0
         if lines:
@@ -84,7 +89,9 @@
         # For the unit tests
         return False
     return (
-        "/test" in f
+        "/tests/" in f
+        or "/test/" in f
+        or "/test_" in f
         or "/gtest" in f
         or "/crashtest" in f
         or "/mochitest" in f
@@ -96,7 +103,7 @@
     )
 
 
-def fix_me(filename):
+def fix_me(log, filename):
     """
     Add the copyright notice to the top of the file
     """
@@ -134,13 +141,13 @@
                 end = " */"
             license.append(start + "* " + l.strip() + end + "\n")
 
-        add_header(filename, license)
+        add_header(log, filename, license)
         return
 
     if ext in [".py", ".ftl", ".properties"] or filename.endswith(".inc.xul"):
         for l in license_template:
             license.append("# " + l.strip() + "\n")
-        add_header(filename, license)
+        add_header(log, filename, license)
         return
 
     if ext in [".xml", ".xul", ".html", ".xhtml", ".dtd", ".svg"]:
@@ -158,11 +165,12 @@
                 # When dealing with an svg, we should not have a space between
                 # the license and the content
                 license.append("\n")
-        add_header(filename, license)
+        add_header(log, filename, license)
         return
 
 
 def lint(paths, config, fix=None, **lintargs):
+    log = lintargs["log"]
     files = list(expand_exclusions(paths, config, lintargs["root"]))
 
     licenses = load_valid_license()
@@ -179,5 +187,5 @@
             }
             results.append(result.from_config(config, **res))
             if fix:
-                fix_me(f)
+                fix_me(log, f)
     return results
diff -Nru firefox-84.0.2+build1/tools/lint/license/valid-licenses.txt firefox-85.0+build1/tools/lint/license/valid-licenses.txt
--- firefox-84.0.2+build1/tools/lint/license/valid-licenses.txt	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/license/valid-licenses.txt	2021-01-18 19:58:27.000000000 +0000
@@ -1,7 +1,7 @@
 mozilla.org/MPL/
 Licensed under the Apache License, Version 2.0
 copyright is dedicated to the Public Domain.
-Licensed under the MIT License
+under the MIT
 Redistributions of source code must retain the above copyright
 Use of this source code is governed by a BSD-style license
 The author disclaims copyright to this source code.
@@ -10,9 +10,7 @@
 author grants irrevocable permission to anyone to use, modify,
 THIS FILE IS AUTO-GENERATED
 Permission is hereby granted, free of charge, to any person obtaining
-Permission to use, copy, modify, distribute, and sell this software
-Permission to use, copy, modify, distribute and sell this software
-This file is dual licensed under the MIT
+Permission to use, copy, modify,
 License: Public domain. You are free to use this code however you
 You are granted a license to use, reproduce and create derivative works
 GENERATED FILE, DO NOT EDIT
diff -Nru firefox-84.0.2+build1/tools/lint/license.yml firefox-85.0+build1/tools/lint/license.yml
--- firefox-84.0.2+build1/tools/lint/license.yml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/license.yml	2021-01-18 19:58:27.000000000 +0000
@@ -26,6 +26,8 @@
         - gradle.properties
         # might not work with license
         - gradle/wrapper/gradle-wrapper.properties
+        # tests
+        - js/src/devtools/rootAnalysis/t/
         - mobile/android/components/extensions
         - mobile/android/geckoview/src/main/AndroidManifest.xml
         - mobile/android/geckoview/src/main/res/drawable/ic_generic_file.xml
@@ -48,6 +50,9 @@
         - security/mac/hardenedruntime/production.entitlements.xml
         - servo/components/hashglobe/src/alloc.rs
         - servo/components/hashglobe/src/shim.rs
+        - testing/marionette/harness/marionette_harness/www/
+        # Browsertime can't handle this script when there's a comment at the top
+        - testing/raptor/browsertime/browsertime_benchmark.js
         - toolkit/components/reputationservice/chromium/chrome/common/safe_browsing/csd.pb.cc
         - toolkit/components/reputationservice/chromium/chrome/common/safe_browsing/csd.pb.h
         - toolkit/mozapps/update/updater/crctable.h
diff -Nru firefox-84.0.2+build1/tools/lint/perfdocs/framework_gatherers.py firefox-85.0+build1/tools/lint/perfdocs/framework_gatherers.py
--- firefox-84.0.2+build1/tools/lint/perfdocs/framework_gatherers.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/perfdocs/framework_gatherers.py	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,7 @@
 from manifestparser import TestManifest
 from mozperftest.script import ScriptInfo
 from perfdocs.utils import read_yaml
+from perfdocs.logger import PerfDocLogger
 
 """
 This file is for framework specific gatherers since manifests
@@ -220,13 +221,24 @@
         for path in pathlib.Path(self.workspace_dir).rglob("perftest.ini"):
             suite_name = re.sub(self.workspace_dir, "", os.path.dirname(path))
 
+            # If the workspace dir doesn't end with a forward-slash,
+            # the substitution above won't work completely
+            if suite_name.startswith("/") or suite_name.startswith("\\"):
+                suite_name = suite_name[1:]
+
+            # We have to add new paths to the logger as we search
+            # because mozperftest tests exist in multiple places in-tree
+            PerfDocLogger.PATHS.append(suite_name)
+
             # Get the tests from perftest.ini
             test_manifest = TestManifest([str(path)], strict=False)
             test_list = test_manifest.active_tests(exists=False, disabled=False)
             for test in test_list:
                 si = ScriptInfo(test["path"])
                 self.script_infos[si["name"]] = si
-                self._test_list.setdefault(suite_name, {}).update({si["name"]: ""})
+                self._test_list.setdefault(suite_name, {}).update(
+                    {si["name"]: str(path)}
+                )
 
         return self._test_list
 
diff -Nru firefox-84.0.2+build1/tools/lint/perfdocs/verifier.py firefox-85.0+build1/tools/lint/perfdocs/verifier.py
--- firefox-84.0.2+build1/tools/lint/perfdocs/verifier.py	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/tools/lint/perfdocs/verifier.py	2021-01-18 19:58:27.000000000 +0000
@@ -163,7 +163,10 @@
             for test_name, manifest_path in test_list.items():
                 tb = os.path.basename(manifest_path)
                 tb = re.sub("\..*", "", tb)
-                if stests.get(tb) or stests.get(test_name):
+                if (
+                    stests.get(tb, None) is not None
+                    or stests.get(test_name, None) is not None
+                ):
                     # Test description exists, continue with the next test
                     tests_found += 1
                     continue
diff -Nru firefox-84.0.2+build1/tools/lint/python/flake8_requirements.txt firefox-85.0+build1/tools/lint/python/flake8_requirements.txt
--- firefox-84.0.2+build1/tools/lint/python/flake8_requirements.txt	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/python/flake8_requirements.txt	2021-01-18 19:58:27.000000000 +0000
@@ -1,6 +1,6 @@
-flake8==3.8.3 \
-    --hash=sha256:15e351d19611c887e482fb960eae4d44845013cc142d42896e9862f775d8cf5c \
-    --hash=sha256:f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208
+flake8==3.8.4 \
+    --hash=sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839 \
+    --hash=sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b
 mccabe==0.6.1 \
     --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \
     --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
diff -Nru firefox-84.0.2+build1/tools/lint/python/pylint_requirements.txt firefox-85.0+build1/tools/lint/python/pylint_requirements.txt
--- firefox-84.0.2+build1/tools/lint/python/pylint_requirements.txt	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/python/pylint_requirements.txt	2021-01-18 19:58:27.000000000 +0000
@@ -1,6 +1,6 @@
-pylint==2.5.3 \
-    --hash=sha256:7dd78437f2d8d019717dbf287772d0b2dbdfd13fc016aa7faa08d67bccc46adc \
-    --hash=sha256:d0ece7d223fe422088b0e8f13fa0a1e8eb745ebffcb8ed53d3e95394b6101a1c
+pylint==2.6.0 \
+    --hash=sha256:bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210 \
+    --hash=sha256:bfe68f020f8a0fece830a22dd4d5dddb4ecc6137db04face4c3420a46a52239f
 toml==0.10.1 \
     --hash=sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f \
     --hash=sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88
diff -Nru firefox-84.0.2+build1/tools/lint/rejected-words.yml firefox-85.0+build1/tools/lint/rejected-words.yml
--- firefox-84.0.2+build1/tools/lint/rejected-words.yml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/rejected-words.yml	2021-01-18 19:58:27.000000000 +0000
@@ -242,14 +242,14 @@
         - netwerk/socket/nsSOCKSSocketProvider.cpp
         - netwerk/test/gtest/TestCookie.cpp
         - netwerk/test/unit/head_trr.js
-        - netwerk/test/unit_ipc/test_esni_dns_fetch_wrap.js
+        - netwerk/test/unit_ipc/test_dns_by_type_resolve_wrap.js
         - netwerk/test/unit_ipc/test_trr_httpssvc_wrap.js
         - netwerk/test/unit/test_bug396389.js
         - netwerk/test/unit/test_bug427957.js
         - netwerk/test/unit/test_bug464591.js
         - netwerk/test/unit/test_bug479413.js
         - netwerk/test/unit/test_cookie_blacklist.js
-        - netwerk/test/unit/test_esni_dns_fetch.js
+        - netwerk/test/unit/test_dns_by_type_resolve.js
         - netwerk/test/unit/test_idn_blacklist.js
         - netwerk/test/unit/test_idn_urls.js
         - netwerk/test/unit/test_trr_httpssvc.js
@@ -417,10 +417,6 @@
         - toolkit/mozapps/extensions/internal/XPIInstall.jsm
         - toolkit/mozapps/extensions/internal/XPIProvider.jsm
         - toolkit/mozapps/extensions/test/browser/browser_html_discover_view.js
-        - toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist2.xml
-        - toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_AllOS.xml
-        - toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist_OSVersion.xml
-        - toolkit/mozapps/extensions/test/xpcshell/data/test_gfxBlacklist.xml
         - toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_Device.js
         - toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_DriverNew.js
         - toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_gfxBlacklist_Equal_DriverNew.js
diff -Nru firefox-84.0.2+build1/tools/lint/spell/codespell_requirements.txt firefox-85.0+build1/tools/lint/spell/codespell_requirements.txt
--- firefox-84.0.2+build1/tools/lint/spell/codespell_requirements.txt	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/spell/codespell_requirements.txt	2021-01-18 19:58:27.000000000 +0000
@@ -1,3 +1,4 @@
-codespell==1.17.1 \
-    --hash=sha256:0ba864d8b25c4dc1b2a3fb067377ec11edb84c1a967a33d9e9cac73f386f3a0a
+codespell==2.0.0 \
+    --hash=sha256:a10b8bbb9f678e4edff7877af1f654fdc9e27c205f952c3ddee2981ad02ec5f2 \
+    --hash=sha256:dd9983e096b9f7ba89dd2d2466d1fc37231d060f19066331b9571341363c77b8
 
diff -Nru firefox-84.0.2+build1/tools/lint/spell/__init__.py firefox-85.0+build1/tools/lint/spell/__init__.py
--- firefox-84.0.2+build1/tools/lint/spell/__init__.py	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/tools/lint/spell/__init__.py	2021-01-18 19:58:27.000000000 +0000
@@ -97,6 +97,14 @@
         return 1
 
 
+def get_codespell_version(binary):
+    return subprocess.check_output(
+        [which("python"), binary, "--version"],
+        universal_newlines=True,
+        stderr=subprocess.STDOUT,
+    )
+
+
 def lint(paths, config, fix=None, **lintargs):
     log = lintargs["log"]
     binary = get_codespell_binary()
@@ -131,6 +139,8 @@
         cmd_args.append("--write-changes")
     log.debug("Command: {}".format(" ".join(cmd_args)))
 
+    log.debug("Version: {}".format(get_codespell_version(binary)))
+
     base_command = cmd_args + paths
 
     run_process(config, base_command)
diff -Nru firefox-84.0.2+build1/tools/lint/test/conftest.py firefox-85.0+build1/tools/lint/test/conftest.py
--- firefox-84.0.2+build1/tools/lint/test/conftest.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/test/conftest.py	2021-01-18 19:58:27.000000000 +0000
@@ -193,3 +193,36 @@
 @pytest.fixture
 def structured_logger():
     return StructuredLogger("logger")
+
+
+@pytest.fixture
+def perfdocs_sample():
+    from test_perfdocs import (
+        SAMPLE_TEST,
+        SAMPLE_CONFIG,
+        temp_dir,
+        temp_file,
+    )
+
+    with temp_dir() as tmpdir:
+        suitedir = os.path.join(tmpdir, "suite")
+        perfdocs_dir = os.path.join(tmpdir, "perfdocs")
+        os.mkdir(perfdocs_dir)
+        os.mkdir(suitedir)
+
+        with temp_file(
+            "perftest.ini", tempdir=suitedir, content="[perftest_sample.js]"
+        ) as tmpmanifest, temp_file(
+            "perftest_sample.js", tempdir=suitedir, content=SAMPLE_TEST
+        ) as tmptest, temp_file(
+            "config.yml", tempdir=perfdocs_dir, content=SAMPLE_CONFIG
+        ) as tmpconfig, temp_file(
+            "index.rst", tempdir=perfdocs_dir, content="{documentation}"
+        ) as tmpindex:
+            yield {
+                "top_dir": tmpdir.replace("\\", "\\\\"),
+                "manifest": tmpmanifest,
+                "test": tmptest,
+                "config": tmpconfig,
+                "index": tmpindex,
+            }
diff -Nru firefox-84.0.2+build1/tools/lint/test/test_perfdocs.py firefox-85.0+build1/tools/lint/test/test_perfdocs.py
--- firefox-84.0.2+build1/tools/lint/test/test_perfdocs.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/lint/test/test_perfdocs.py	2021-01-18 19:58:27.000000000 +0000
@@ -16,9 +16,72 @@
     FAILED = True
 
 
+"""
+This is a sample mozperftest test that we use for testing
+the verification process.
+"""
+SAMPLE_TEST = """
+"use strict";
+
+async function setUp(context) {
+  context.log.info("setUp example!");
+}
+
+async function test(context, commands) {
+  context.log.info("Test with setUp/tearDown example!");
+  await commands.measure.start("https://www.sitespeed.io/");
+  await commands.measure.start("https://www.mozilla.org/en-US/");
+}
+
+async function tearDown(context) {
+  context.log.info("tearDown example!");
+}
+
+module.noexport = {};
+
+module.exports = {
+  setUp,
+  tearDown,
+  test,
+  owner: "Performance Testing Team",
+  name: "Example",
+  description: "The description of the example test.",
+  longDescription: `
+  This is a longer description of the test perhaps including information
+  about how it should be run locally or links to relevant information.
+  `
+};
+"""
+
+
+SAMPLE_CONFIG = """
+name: mozperftest
+manifest: None
+static-only: False
+suites:
+    suite:
+        description: "Performance tests from the 'suite' folder."
+        tests:
+            Example: ""
+"""
+
+
+DYNAMIC_SAMPLE_CONFIG = """
+name: {}
+manifest: None
+static-only: False
+suites:
+    suite:
+        description: "Performance tests from the 'suite' folder."
+        tests:
+            Example: ""
+"""
+
+
 @contextlib.contextmanager
-def temp_file(name="temp", content=None):
-    tempdir = tempfile.mkdtemp()
+def temp_file(name="temp", tempdir=None, content=None):
+    if tempdir is None:
+        tempdir = tempfile.mkdtemp()
     path = os.path.join(tempdir, name)
     if content is not None:
         with open(path, "w") as f:
@@ -26,7 +89,38 @@
     try:
         yield path
     finally:
-        shutil.rmtree(tempdir)
+        try:
+            shutil.rmtree(tempdir)
+        except FileNotFoundError:
+            pass
+
+
+@contextlib.contextmanager
+def temp_dir():
+    tempdir = tempfile.mkdtemp()
+    try:
+        yield tempdir
+    finally:
+        try:
+            shutil.rmtree(tempdir)
+        except FileNotFoundError:
+            pass
+
+
+def setup_sample_logger(logger, structured_logger, top_dir):
+    from perfdocs.logger import PerfDocLogger
+
+    PerfDocLogger.LOGGER = structured_logger
+    PerfDocLogger.PATHS = ["perfdocs"]
+    PerfDocLogger.TOP_DIR = top_dir
+
+    import perfdocs.verifier as vf
+    import perfdocs.gatherer as gt
+    import perfdocs.generator as gn
+
+    gt.logger = logger
+    vf.logger = logger
+    gn.logger = logger
 
 
 @mock.patch("perfdocs.generator.Generator")
@@ -35,7 +129,7 @@
 def test_perfdocs_start_and_fail(generator, verifier, structured_logger, config, paths):
     from perfdocs.perfdocs import run_perfdocs
 
-    with temp_file("bad", "foo") as temp:
+    with temp_file("bad", content="foo") as temp:
         run_perfdocs(config, logger=structured_logger, paths=[temp], generate=False)
         assert PerfDocsLoggerMock.LOGGER == structured_logger
         assert PerfDocsLoggerMock.PATHS == [temp]
@@ -52,7 +146,7 @@
     from perfdocs.perfdocs import run_perfdocs
 
     PerfDocsLoggerMock.FAILED = False
-    with temp_file("bad", "foo") as temp:
+    with temp_file("bad", content="foo") as temp:
         run_perfdocs(config, logger=structured_logger, paths=[temp], generate=False)
         assert PerfDocsLoggerMock.LOGGER == structured_logger
         assert PerfDocsLoggerMock.PATHS == [temp]
@@ -70,6 +164,58 @@
         run_perfdocs(config, logger=structured_logger, paths=["bad"], generate=False)
 
 
+@mock.patch("perfdocs.logger.PerfDocLogger")
+def test_perfdocs_verification(logger, structured_logger, perfdocs_sample):
+    top_dir = perfdocs_sample["top_dir"]
+    setup_sample_logger(logger, structured_logger, top_dir)
+
+    from perfdocs.verifier import Verifier
+
+    verifier = Verifier(top_dir)
+    verifier.validate_tree()
+
+    # Make sure that we had no warnings
+    assert logger.warning.call_count == 0
+    assert logger.log.call_count == 1
+    assert len(logger.mock_calls) == 1
+
+
+@mock.patch("perfdocs.logger.PerfDocLogger")
+def test_perfdocs_framework_gatherers(logger, structured_logger, perfdocs_sample):
+    top_dir = perfdocs_sample["top_dir"]
+    setup_sample_logger(logger, structured_logger, top_dir)
+
+    # Check to make sure that every single framework
+    # gatherer that has been implemented produces a test list
+    # in every suite that contains a test with an associated
+    # manifest.
+    from perfdocs.gatherer import frameworks
+
+    for framework, gatherer in frameworks.items():
+        with open(perfdocs_sample["config"], "w") as f:
+            f.write(DYNAMIC_SAMPLE_CONFIG.format(framework))
+
+        fg = gatherer(perfdocs_sample["config"], top_dir)
+        if getattr(fg, "get_test_list", None) is None:
+            # Skip framework gatherers that have not
+            # implemented a method to build a test list.
+            continue
+
+        # Setup some framework-specific things here if needed
+        if framework == "raptor":
+            fg._manifest_path = perfdocs_sample["manifest"]
+            fg._get_subtests_from_ini = mock.Mock()
+            fg._get_subtests_from_ini.return_value = {
+                "Example": perfdocs_sample["manifest"]
+            }
+
+        for suite, suitetests in fg.get_test_list().items():
+            assert suite == "suite"
+            for test, manifest in suitetests.items():
+                assert test == "Example"
+                assert manifest == perfdocs_sample["manifest"]
+
+
 def test_perfdocs_logger_failure(config, paths):
     from perfdocs.logger import PerfDocLogger
 
diff -Nru firefox-84.0.2+build1/tools/moz.build firefox-85.0+build1/tools/moz.build
--- firefox-84.0.2+build1/tools/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -66,6 +66,8 @@
 
 SPHINX_TREES["code-coverage"] = "code-coverage/docs"
 
+SPHINX_TREES["profiler"] = "profiler/docs"
+
 with Files("tryselect/docs/**"):
     SCHEDULES.exclusive = ["docs"]
 
diff -Nru firefox-84.0.2+build1/tools/moztreedocs/requirements.in firefox-85.0+build1/tools/moztreedocs/requirements.in
--- firefox-84.0.2+build1/tools/moztreedocs/requirements.in	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/moztreedocs/requirements.in	2021-01-18 19:58:27.000000000 +0000
@@ -17,7 +17,7 @@
 jmespath==0.10.0
 jsonschema==3.2.0
 livereload==2.6.3
-Markdown==3.2.2
+Markdown==3.3.3
 MarkupSafe==1.1.1
 mock==4.0.2
 packaging==20.4
@@ -40,8 +40,8 @@
 singledispatch==3.4.0.3
 six==1.15.0
 snowballstemmer==2.0.0
-Sphinx==3.2.1
-sphinx-copybutton==0.3.0
+Sphinx==3.3.1
+sphinx-copybutton==0.3.1
 sphinx-js==3.0.1
 sphinx-markdown-tables==0.0.15
 sphinx-rtd-theme==0.5.0
diff -Nru firefox-84.0.2+build1/tools/moztreedocs/requirements.txt firefox-85.0+build1/tools/moztreedocs/requirements.txt
--- firefox-84.0.2+build1/tools/moztreedocs/requirements.txt	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/moztreedocs/requirements.txt	2021-01-18 19:58:27.000000000 +0000
@@ -79,9 +79,9 @@
 livereload==2.6.3 \
     --hash=sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869 \
     # via -r requirements.in
-markdown==3.2.2 \
-    --hash=sha256:1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17 \
-    --hash=sha256:c467cd6233885534bf0fe96e62e3cf46cfc1605112356c4f9981512b8174de59 \
+markdown==3.3.3 \
+    --hash=sha256:5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18 \
+    --hash=sha256:c109c15b7dc20a9ac454c9e6025927d44460b85bd039da028d85e2b6d0bcc328 \
     # via -r requirements.in, sphinx-markdown-tables
 markupsafe==1.1.1 \
     --hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
@@ -222,10 +222,9 @@
     --hash=sha256:209f257d7533fdb3cb73bdbd24f436239ca3b2fa67d56f6ff88e86be08cc5ef0 \
     --hash=sha256:df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52 \
     # via -r requirements.in, sphinx
-sphinx-copybutton==0.3.0 \
-    --hash=sha256:4becad3a1e7c50211f1477e34fd4b6d027680e1612f497cb5b88cf85bccddaaa \
-    --hash=sha256:4cd06afd0588aa43eba968bfc6105e1ec6546c50a51f880af1d89afaebc6fb58 \
-    # via -r requirements.in
+sphinx-copybutton==0.3.1 \
+    --hash=sha256:0e0461df394515284e3907e3f418a0c60ef6ab6c9a27a800c8552772d0a402a2 \
+    --hash=sha256:5125c718e763596e6e52d92e15ee0d6f4800ad3817939be6dee51218870b3e3d
 sphinx-js==3.0.1 \
     --hash=sha256:00d8d8bb4fe0e4c8cf940c7412af257c7fb83eaedc69d79765f9a012d719ce20 \
     --hash=sha256:6dd8e79c5ad09fef389af5021d7a672066f6e12a51130497f6c611544d62734b \
@@ -238,9 +237,9 @@
     --hash=sha256:22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d \
     --hash=sha256:373413d0f82425aaa28fb288009bf0d0964711d347763af2f1b65cafcb028c82 \
     # via -r requirements.in
-sphinx==3.2.1 \
-    --hash=sha256:321d6d9b16fa381a5306e5a0b76cd48ffbc588e6340059a729c6fdd66087e0e8 \
-    --hash=sha256:ce6fd7ff5b215af39e2fcd44d4a321f6694b4530b6f2b2109b64d120773faea0 \
+sphinx==3.3.1 \
+    --hash=sha256:1e8d592225447104d1172be415bc2972bd1357e3e12fdc76edf2261105db4300 \
+    --hash=sha256:d4e59ad4ea55efbb3c05cde3bfc83bfc14f0c95aa95c3d75346fcce186a47960 \
     # via -r requirements.in, recommonmark, sphinx-copybutton, sphinx-js, sphinx-rtd-theme
 sphinxcontrib-applehelp==1.0.2 \
     --hash=sha256:806111e5e962be97c29ec4c1e7fe277bfd19e9652fb1a4392105b43e01af885a \
diff -Nru firefox-84.0.2+build1/tools/moztreedocs/upload.py firefox-85.0+build1/tools/moztreedocs/upload.py
--- firefox-84.0.2+build1/tools/moztreedocs/upload.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/moztreedocs/upload.py	2021-01-18 19:58:27.000000000 +0000
@@ -152,6 +152,8 @@
             content_type, content_encoding = mimetypes.guess_type(path)
             extra_args = {}
             if content_type:
+                if content_type.startswith("text/"):
+                    content_type += '; charset="utf-8"'
                 extra_args["ContentType"] = content_type
             if content_encoding:
                 extra_args["ContentEncoding"] = content_encoding
diff -Nru firefox-84.0.2+build1/tools/profiler/core/memory_hooks.cpp firefox-85.0+build1/tools/profiler/core/memory_hooks.cpp
--- firefox-84.0.2+build1/tools/profiler/core/memory_hooks.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/memory_hooks.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -265,10 +265,6 @@
   // or disabled.
   static mozilla::Atomic<bool, mozilla::Relaxed> sAllocationsFeatureEnabled;
 
-  // The markers will be stored on the main thread. Retain the id to the main
-  // thread of this process here.
-  static mozilla::Atomic<int, mozilla::Relaxed> sMainThreadId;
-
   ThreadIntercept() = default;
 
   // Only allow consumers to access this information if they run
@@ -315,14 +311,9 @@
 
   bool IsBlocked() const { return ThreadIntercept::IsBlocked_(); }
 
-  static void EnableAllocationFeature(int aMainThreadId) {
-    sAllocationsFeatureEnabled = true;
-    sMainThreadId = aMainThreadId;
-  }
+  static void EnableAllocationFeature() { sAllocationsFeatureEnabled = true; }
 
   static void DisableAllocationFeature() { sAllocationsFeatureEnabled = false; }
-
-  static int MainThreadId() { return sMainThreadId; }
 };
 
 PROFILER_THREAD_LOCAL(bool) ThreadIntercept::tlsIsBlocked;
@@ -330,8 +321,6 @@
 mozilla::Atomic<bool, mozilla::Relaxed>
     ThreadIntercept::sAllocationsFeatureEnabled(false);
 
-mozilla::Atomic<int, mozilla::Relaxed> ThreadIntercept::sMainThreadId(0);
-
 // An object of this class must be created (on the stack) before running any
 // code that might allocate.
 class AutoBlockIntercepts {
@@ -389,7 +378,7 @@
       gBernoulli->trial(actualSize) &&
       // Second, attempt to add a marker if the Bernoulli trial passed.
       profiler_add_native_allocation_marker(
-          ThreadIntercept::MainThreadId(), static_cast<int64_t>(actualSize),
+          static_cast<int64_t>(actualSize),
           reinterpret_cast<uintptr_t>(aPtr))) {
     MOZ_ASSERT(gAllocationTracker,
                "gAllocationTracker must be properly installed for the memory "
@@ -432,8 +421,7 @@
       "gAllocationTracker must be properly installed for the memory hooks.");
   if (gAllocationTracker->RemoveMemoryAddressIfFound(aPtr)) {
     // This size here is negative, indicating a deallocation.
-    profiler_add_native_allocation_marker(ThreadIntercept::MainThreadId(),
-                                          signedSize,
+    profiler_add_native_allocation_marker(signedSize,
                                           reinterpret_cast<uintptr_t>(aPtr));
   }
 }
@@ -567,7 +555,7 @@
 // leak these values.
 void remove_memory_hooks() { jemalloc_replace_dynamic(nullptr); }
 
-void enable_native_allocations(int aMainThreadId) {
+void enable_native_allocations() {
   // The bloat log tracks allocations and deallocations. This can conflict
   // with the memory hook machinery, as the bloat log creates its own
   // allocations. This means we can re-enter inside the bloat log machinery. At
@@ -596,7 +584,7 @@
 
   EnsureBernoulliIsInstalled();
   EnsureAllocationTrackerIsInstalled();
-  ThreadIntercept::EnableAllocationFeature(aMainThreadId);
+  ThreadIntercept::EnableAllocationFeature();
 }
 
 // This is safe to call even if native allocations hasn't been enabled.
diff -Nru firefox-84.0.2+build1/tools/profiler/core/memory_hooks.h firefox-85.0+build1/tools/profiler/core/memory_hooks.h
--- firefox-84.0.2+build1/tools/profiler/core/memory_hooks.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/memory_hooks.h	2021-01-18 19:58:27.000000000 +0000
@@ -13,7 +13,7 @@
 
 void install_memory_hooks();
 void remove_memory_hooks();
-void enable_native_allocations(int aMainThreadId);
+void enable_native_allocations();
 void disable_native_allocations();
 
 }  // namespace profiler
diff -Nru firefox-84.0.2+build1/tools/profiler/core/platform.cpp firefox-85.0+build1/tools/profiler/core/platform.cpp
--- firefox-84.0.2+build1/tools/profiler/core/platform.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/platform.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -37,7 +37,6 @@
 #include "ProfilerChild.h"
 #include "ProfilerCodeAddressService.h"
 #include "ProfilerIOInterposeObserver.h"
-#include "ProfilerMarkerPayload.h"
 #include "ProfilerParent.h"
 #include "RegisteredThread.h"
 #include "shared-libraries.h"
@@ -52,6 +51,7 @@
 #include "mozilla/AutoProfilerLabel.h"
 #include "mozilla/ExtensionPolicyService.h"
 #include "mozilla/extensions/WebExtensionPolicy.h"
+#include "mozilla/net/HttpBaseChannel.h"  // for net::TimingStruct
 #include "mozilla/Printf.h"
 #include "mozilla/ProfileBufferChunkManagerSingle.h"
 #include "mozilla/ProfileBufferChunkManagerWithLocalLimit.h"
@@ -1631,44 +1631,6 @@
 // The name of the main thread.
 static const char* const kMainThreadName = "GeckoMain";
 
-// TODO - It is better to have the marker timing created by the original callers
-// of the profiler_add_marker API, rather than deduce it from the payload. This
-// is a bigger code diff for adding MarkerTiming, so do that work in a
-// follow-up.
-MarkerTiming get_marker_timing_from_payload(
-    const ProfilerMarkerPayload& aPayload) {
-  const TimeStamp& start = aPayload.GetStartTime();
-  const TimeStamp& end = aPayload.GetEndTime();
-  if (start.IsNull()) {
-    if (end.IsNull()) {
-      // The payload contains no time information, use the current time.
-      return MarkerTiming::InstantAt(TimeStamp::NowUnfuzzed());
-    }
-    return MarkerTiming::IntervalEnd(end);
-  }
-  if (end.IsNull()) {
-    return MarkerTiming::IntervalStart(start);
-  }
-  if (start == end) {
-    return MarkerTiming::InstantAt(start);
-  }
-  return MarkerTiming::Interval(start, end);
-}
-
-// Add the marker to the given buffer with the given information.
-// This is a unified insertion point for all the markers.
-static void StoreMarker(ProfileChunkedBuffer& aChunkedBuffer, int aThreadId,
-                        const char* aMarkerName,
-                        const MarkerTiming& aMarkerTiming,
-                        JS::ProfilingCategoryPair aCategoryPair,
-                        const ProfilerMarkerPayload* aPayload) {
-  aChunkedBuffer.PutObjects(
-      ProfileBufferEntry::Kind::MarkerData, aThreadId,
-      WrapProfileBufferUnownedCString(aMarkerName),
-      aMarkerTiming.GetStartTime(), aMarkerTiming.GetEndTime(),
-      aMarkerTiming.GetPhase(), static_cast<uint32_t>(aCategoryPair), aPayload);
-}
-
 ////////////////////////////////////////////////////////////////////////
 // BEGIN sampling/unwinding code
 
@@ -2536,7 +2498,7 @@
     const PreRecordedMetaInformation& aPreRecordedMetaInformation) {
   MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
 
-  aWriter.IntProperty("version", 21);
+  aWriter.IntProperty("version", 22);
 
   // The "startTime" field holds the number of milliseconds since midnight
   // January 1, 1970 GMT. This grotty code computes (Now - (Now -
@@ -2723,11 +2685,11 @@
   // if we can customize it
 
   // Pass the samples
-  // FIXME(bug 1618560): We are currently only profiling the Java main thread.
+  // FIXME(bug 1618560): We are currently only profiling the Android UI thread.
   constexpr int threadId = 0;
   int sampleId = 0;
   while (true) {
-    // Gets the data from the java main thread only.
+    // Gets the data from the Android UI thread only.
     double sampleTime = java::GeckoJavaSampler::GetSampleTime(sampleId);
     if (sampleTime == 0.0) {
       break;
@@ -2754,7 +2716,7 @@
 
   // Pass the markers now
   while (true) {
-    // Gets the data from the java main thread only.
+    // Gets the data from the Android UI thread only.
     java::GeckoJavaSampler::Marker::LocalRef marker =
         java::GeckoJavaSampler::PollNextMarker();
     if (!marker) {
@@ -2782,19 +2744,16 @@
 
     if (!text) {
       // This marker doesn't have a text.
-      StoreMarker(aProfileBuffer.UnderlyingChunkedBuffer(), threadId,
-                  markerName.get(), timing,
-                  JS::ProfilingCategoryPair::JAVA_ANDROID, nullptr);
+      AddMarkerToBuffer(aProfileBuffer.UnderlyingChunkedBuffer(), markerName,
+                        geckoprofiler::category::JAVA_ANDROID,
+                        {MarkerThreadId(threadId), std::move(timing)});
     } else {
       // This marker has a text.
-      nsCString textString = text->ToCString();
-      const TextMarkerPayload payload(textString, startTime, endTime, Nothing(),
-                                      nullptr);
-
-      // Put the marker inside the buffer.
-      StoreMarker(aProfileBuffer.UnderlyingChunkedBuffer(), threadId,
-                  markerName.get(), timing,
-                  JS::ProfilingCategoryPair::JAVA_ANDROID, &payload);
+      AddMarkerToBuffer(aProfileBuffer.UnderlyingChunkedBuffer(), markerName,
+                        geckoprofiler::category::JAVA_ANDROID,
+                        {MarkerThreadId(threadId), std::move(timing)},
+                        geckoprofiler::markers::TextMarker{},
+                        text->ToCString());
     }
   }
 }
@@ -2889,10 +2848,16 @@
       ProfileBuffer javaBuffer(bufferManager);
       CollectJavaThreadProfileData(javaBuffer);
 
-      // Thread id of java Main thread is 0, if we support profiling of other
-      // java thread, we have to get thread id and name via JNI.
+      // Set the thread id of the Android UI thread to be 0.
+      // We are profiling the Android UI thread twice: Both from the C++ side
+      // (as a regular C++ profiled thread with the name "AndroidUI"), and from
+      // the Java side. The thread's actual ID is mozilla::jni::GetUIThreadId(),
+      // but since we're using that ID for the C++ side, we need to pick another
+      // tid that doesn't conflict with it for the Java side. So we just use 0.
+      // Once we add support for profiling of other java threads, we'll have to
+      // get their thread id and name via JNI.
       RefPtr<ThreadInfo> threadInfo = new ThreadInfo(
-          "Java Main Thread", 0, false, CorePS::ProcessStartTime());
+          "AndroidUI (JVM)", 0, false, CorePS::ProcessStartTime());
       ProfiledThreadData profiledThreadData(threadInfo, nullptr);
       profiledThreadData.StreamJSON(
           javaBuffer, nullptr, aWriter, CorePS::ProcessName(aLock),
@@ -4594,7 +4559,9 @@
   }
 
   // Set up profiling for each registered thread, if appropriate.
-  Maybe<int> mainThreadId;
+#if defined(MOZ_REPLACE_MALLOC) && defined(MOZ_PROFILER_MEMORY)
+  bool isMainThreadBeingProfiled = false;
+#endif
   int tid = profiler_current_thread_id();
   const Vector<UniquePtr<RegisteredThread>>& registeredThreads =
       CorePS::RegisteredThreads(aLock);
@@ -4620,9 +4587,11 @@
           TriggerPollJSSamplingOnMainThread();
         }
       }
+#if defined(MOZ_REPLACE_MALLOC) && defined(MOZ_PROFILER_MEMORY)
       if (info->IsMainThread()) {
-        mainThreadId = Some(info->ThreadId());
+        isMainThreadBeingProfiled = true;
       }
+#endif
       registeredThread->RacyRegisteredThread().ReinitializeOnResume();
       if (registeredThread->GetJSContext()) {
         profiledThreadData->NotifyReceivedJSContext(0);
@@ -4657,8 +4626,8 @@
 
 #if defined(MOZ_REPLACE_MALLOC) && defined(MOZ_PROFILER_MEMORY)
   if (ActivePS::FeatureNativeAllocations(aLock)) {
-    if (mainThreadId.isSome()) {
-      mozilla::profiler::enable_native_allocations(mainThreadId.value());
+    if (isMainThreadBeingProfiled) {
+      mozilla::profiler::enable_native_allocations();
     } else {
       NS_WARNING(
           "The nativeallocations feature is turned on, but the main thread is "
@@ -5067,11 +5036,6 @@
   CorePS::RemoveCounter(lock, aCounter);
 }
 
-static void maybelocked_profiler_add_marker_for_thread(
-    int aThreadId, JS::ProfilingCategoryPair aCategoryPair,
-    const char* aMarkerName, const ProfilerMarkerPayload& aPayload,
-    const PSAutoLock* aLockOrNull);
-
 ProfilingStack* profiler_register_thread(const char* aName,
                                          void* aGuessStackTop) {
   DEBUG_LOG("profiler_register_thread(%s)", aName);
@@ -5108,10 +5072,8 @@
     text.AppendLiteral("\" attempted to re-register as \"");
     text.AppendASCII(aName);
     text.AppendLiteral("\"");
-    maybelocked_profiler_add_marker_for_thread(
-        profiler_main_thread_id(), JS::ProfilingCategoryPair::OTHER_Profiling,
-        "profiler_register_thread again",
-        TextMarkerPayload(text, TimeStamp::NowUnfuzzed()), &lock);
+    PROFILER_MARKER_TEXT("profiler_register_thread again", OTHER_Profiling,
+                         MarkerThreadId::MainThread(), text);
 
     return &thread->RacyRegisteredThread().ProfilingStack();
   }
@@ -5191,10 +5153,8 @@
         tid != profiler_main_thread_id()) {
       nsCString threadIdString;
       threadIdString.AppendInt(tid);
-      maybelocked_profiler_add_marker_for_thread(
-          profiler_main_thread_id(), JS::ProfilingCategoryPair::OTHER_Profiling,
-          "profiler_unregister_thread again",
-          TextMarkerPayload(threadIdString, TimeStamp::NowUnfuzzed()), &lock);
+      PROFILER_MARKER_TEXT("profiler_unregister_thread again", OTHER_Profiling,
+                           MarkerThreadId::MainThread(), threadIdString);
     }
   }
 }
@@ -5416,40 +5376,6 @@
   delete aBacktrace;
 }
 
-static void racy_profiler_add_marker(const char* aMarkerName,
-                                     JS::ProfilingCategoryPair aCategoryPair,
-                                     const ProfilerMarkerPayload* aPayload) {
-  MOZ_RELEASE_ASSERT(CorePS::Exists());
-
-  // This function is hot enough that we use RacyFeatures, not ActivePS.
-  if (!profiler_can_accept_markers()) {
-    return;
-  }
-
-  // Note that it's possible that the above test would change again before we
-  // actually record the marker. Because of this imprecision it's possible to
-  // miss a marker or record one we shouldn't. Either way is not a big deal.
-
-  RacyRegisteredThread* racyRegisteredThread =
-      TLSRegisteredThread::RacyRegisteredThread();
-  if (!racyRegisteredThread || !racyRegisteredThread->IsBeingProfiled()) {
-    return;
-  }
-
-  const MarkerTiming markerTiming =
-      aPayload ? get_marker_timing_from_payload(*aPayload)
-               : MarkerTiming::InstantNow();
-
-  StoreMarker(CorePS::CoreBuffer(), racyRegisteredThread->ThreadId(),
-              aMarkerName, markerTiming, aCategoryPair, aPayload);
-}
-
-void profiler_add_marker(const char* aMarkerName,
-                         JS::ProfilingCategoryPair aCategoryPair,
-                         const ProfilerMarkerPayload& aPayload) {
-  racy_profiler_add_marker(aMarkerName, aCategoryPair, &aPayload);
-}
-
 // This is a simplified version of profiler_add_marker that can be easily passed
 // into the JS engine.
 void profiler_add_js_marker(const char* aMarkerName, const char* aMarkerText) {
@@ -5462,119 +5388,207 @@
   if (!profiler_can_accept_markers()) {
     return;
   }
-  AUTO_PROFILER_STATS(add_marker_with_JsAllocationMarkerPayload);
+
+  struct JsAllocationMarker {
+    static constexpr mozilla::Span<const char> MarkerTypeName() {
+      return mozilla::MakeStringSpan("JS allocation");
+    }
+    static void StreamJSONMarkerData(
+        mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+        const mozilla::ProfilerString16View& aTypeName,
+        const mozilla::ProfilerString8View& aClassName,
+        const mozilla::ProfilerString16View& aDescriptiveTypeName,
+        const mozilla::ProfilerString8View& aCoarseType, uint64_t aSize,
+        bool aInNursery) {
+      if (aClassName.Length() != 0) {
+        aWriter.StringProperty("className", aClassName);
+      }
+      if (aTypeName.Length() != 0) {
+        aWriter.StringProperty(
+            "typeName",
+            NS_ConvertUTF16toUTF8(aTypeName.Data(), aTypeName.Length()));
+      }
+      if (aDescriptiveTypeName.Length() != 0) {
+        aWriter.StringProperty(
+            "descriptiveTypeName",
+            NS_ConvertUTF16toUTF8(aDescriptiveTypeName.Data(),
+                                  aDescriptiveTypeName.Length()));
+      }
+      aWriter.StringProperty("coarseType", aCoarseType);
+      aWriter.IntProperty("size", aSize);
+      aWriter.BoolProperty("inNursery", aInNursery);
+    }
+    static mozilla::MarkerSchema MarkerTypeDisplay() {
+      return mozilla::MarkerSchema::SpecialFrontendLocation{};
+    }
+  };
+
   profiler_add_marker(
-      "JS allocation", JS::ProfilingCategoryPair::JS,
-      JsAllocationMarkerPayload(TimeStamp::Now(), std::move(info),
-                                profiler_get_backtrace()));
+      "JS allocation", geckoprofiler::category::JS, MarkerStack::Capture(),
+      JsAllocationMarker{},
+      ProfilerString16View::WrapNullTerminatedString(info.typeName),
+      ProfilerString8View::WrapNullTerminatedString(info.className),
+      ProfilerString16View::WrapNullTerminatedString(info.descriptiveTypeName),
+      ProfilerString8View::WrapNullTerminatedString(info.coarseType), info.size,
+      info.inNursery);
 }
 
 bool profiler_is_locked_on_current_thread() {
   // This function is used to help users avoid calling `profiler_...` functions
   // when the profiler may already have a lock in place, which would prevent a
-  // 2nd recursive lock (resulting in a crash or a never-ending wait).
-  // So we must return `true` for any of:
+  // 2nd recursive lock (resulting in a crash or a never-ending wait), or a
+  // deadlock between any two mutexes. So we must return `true` for any of:
   // - The main profiler mutex, used by most functions, and/or
   // - The buffer mutex, used directly in some functions without locking the
   //   main mutex, e.g., marker-related functions.
+  // - The ProfilerParent or ProfilerChild mutex, used to store and process
+  //   buffer chunk updates.
   return gPSMutex.IsLockedOnCurrentThread() ||
-         CorePS::CoreBuffer().IsThreadSafeAndLockedOnCurrentThread();
+         CorePS::CoreBuffer().IsThreadSafeAndLockedOnCurrentThread() ||
+         ProfilerParent::IsLockedOnCurrentThread() ||
+         ProfilerChild::IsLockedOnCurrentThread();
 }
 
+static constexpr net::TimingStruct scEmptyNetTimingStruct;
+
 void profiler_add_network_marker(
     nsIURI* aURI, const nsACString& aRequestMethod, int32_t aPriority,
     uint64_t aChannelId, NetworkLoadType aType, mozilla::TimeStamp aStart,
     mozilla::TimeStamp aEnd, int64_t aCount,
     mozilla::net::CacheDisposition aCacheDisposition, uint64_t aInnerWindowID,
     const mozilla::net::TimingStruct* aTimings, nsIURI* aRedirectURI,
-    UniqueProfilerBacktrace aSource,
+    UniquePtr<ProfileChunkedBuffer> aSource,
     const Maybe<nsDependentCString>& aContentType) {
   if (!profiler_can_accept_markers()) {
     return;
   }
-  // These do allocations/frees/etc; avoid if not active
-  nsAutoCString spec;
-  nsAutoCString redirect_spec;
+
+  nsAutoCStringN<2048> name;
+  name.AppendASCII("Load ");
+  // top 32 bits are process id of the load
+  name.AppendInt(aChannelId & 0xFFFFFFFFu);
+
+  // These can do allocations/frees/etc; avoid if not active
+  nsAutoCStringN<2048> spec;
   if (aURI) {
     aURI->GetAsciiSpec(spec);
+    name.AppendASCII(": ");
+    name.Append(spec);
   }
+
+  nsAutoCString redirect_spec;
   if (aRedirectURI) {
     aRedirectURI->GetAsciiSpec(redirect_spec);
   }
-  // top 32 bits are process id of the load
-  uint32_t id = static_cast<uint32_t>(aChannelId & 0xFFFFFFFF);
-  char name[2048];
-  SprintfLiteral(name, "Load %d: %s", id, PromiseFlatCString(spec).get());
-  AUTO_PROFILER_STATS(add_marker_with_NetworkMarkerPayload);
-  profiler_add_marker(
-      name, JS::ProfilingCategoryPair::NETWORK,
-      NetworkMarkerPayload(static_cast<int64_t>(aChannelId),
-                           PromiseFlatCString(spec).get(), aRequestMethod,
-                           aType, aStart, aEnd, aPriority, aCount,
-                           aCacheDisposition, aInnerWindowID, aTimings,
-                           PromiseFlatCString(redirect_spec).get(),
-                           std::move(aSource), aContentType));
-}
 
-static void maybelocked_profiler_add_marker_for_thread(
-    int aThreadId, JS::ProfilingCategoryPair aCategoryPair,
-    const char* aMarkerName, const ProfilerMarkerPayload& aPayload,
-    const PSAutoLock* aLockOrNull) {
-  MOZ_RELEASE_ASSERT(CorePS::Exists());
+  struct NetworkMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("Network");
+    }
+    static void StreamJSONMarkerData(
+        baseprofiler::SpliceableJSONWriter& aWriter, mozilla::TimeStamp aStart,
+        mozilla::TimeStamp aEnd, int64_t aID, const ProfilerString8View& aURI,
+        const ProfilerString8View& aRequestMethod, NetworkLoadType aType,
+        int32_t aPri, int64_t aCount, net::CacheDisposition aCacheDisposition,
+        const net::TimingStruct& aTimings,
+        const ProfilerString8View& aRedirectURI,
+        const ProfilerString8View& aContentType) {
+      // This payload still streams a startTime and endTime property because it
+      // made the migration to MarkerTiming on the front-end easier.
+      aWriter.TimeProperty("startTime", aStart);
+      aWriter.TimeProperty("endTime", aEnd);
+
+      aWriter.IntProperty("id", aID);
+      aWriter.StringProperty("status", GetNetworkState(aType));
+      if (Span<const char> cacheString = GetCacheState(aCacheDisposition);
+          !cacheString.IsEmpty()) {
+        aWriter.StringProperty("cache", cacheString);
+      }
+      aWriter.IntProperty("pri", aPri);
+      if (aCount > 0) {
+        aWriter.IntProperty("count", aCount);
+      }
+      if (aURI.Length() != 0) {
+        aWriter.StringProperty("URI", aURI);
+      }
+      if (aRedirectURI.Length() != 0) {
+        aWriter.StringProperty("RedirectURI", aRedirectURI);
+      }
+      aWriter.StringProperty("requestMethod", aRequestMethod);
 
-  if (!profiler_can_accept_markers()) {
-    return;
-  }
+      if (aContentType.Length() != 0) {
+        aWriter.StringProperty("contentType", aContentType);
+      } else {
+        aWriter.NullProperty("contentType");
+      }
 
-#ifdef DEBUG
-  auto checkThreadId = [](int aThreadId, const PSAutoLock& aLock) {
-    if (!ActivePS::Exists(aLock)) {
-      return;
+      if (aType != NetworkLoadType::LOAD_START) {
+        aWriter.TimeProperty("domainLookupStart", aTimings.domainLookupStart);
+        aWriter.TimeProperty("domainLookupEnd", aTimings.domainLookupEnd);
+        aWriter.TimeProperty("connectStart", aTimings.connectStart);
+        aWriter.TimeProperty("tcpConnectEnd", aTimings.tcpConnectEnd);
+        aWriter.TimeProperty("secureConnectionStart",
+                             aTimings.secureConnectionStart);
+        aWriter.TimeProperty("connectEnd", aTimings.connectEnd);
+        aWriter.TimeProperty("requestStart", aTimings.requestStart);
+        aWriter.TimeProperty("responseStart", aTimings.responseStart);
+        aWriter.TimeProperty("responseEnd", aTimings.responseEnd);
+      }
+    }
+    static MarkerSchema MarkerTypeDisplay() {
+      return MarkerSchema::SpecialFrontendLocation{};
+    }
+
+   private:
+    static Span<const char> GetNetworkState(NetworkLoadType aType) {
+      switch (aType) {
+        case NetworkLoadType::LOAD_START:
+          return MakeStringSpan("STATUS_START");
+        case NetworkLoadType::LOAD_STOP:
+          return MakeStringSpan("STATUS_STOP");
+        case NetworkLoadType::LOAD_REDIRECT:
+          return MakeStringSpan("STATUS_REDIRECT");
+        default:
+          MOZ_ASSERT(false, "Unexpected NetworkLoadType enum value.");
+          return MakeStringSpan("");
+      }
     }
 
-    // Assert that our thread ID makes sense
-    bool realThread = false;
-    const Vector<UniquePtr<RegisteredThread>>& registeredThreads =
-        CorePS::RegisteredThreads(aLock);
-    for (auto& thread : registeredThreads) {
-      RefPtr<ThreadInfo> info = thread->Info();
-      if (info->ThreadId() == aThreadId) {
-        realThread = true;
-        break;
+    static Span<const char> GetCacheState(
+        net::CacheDisposition aCacheDisposition) {
+      switch (aCacheDisposition) {
+        case net::kCacheUnresolved:
+          return MakeStringSpan("Unresolved");
+        case net::kCacheHit:
+          return MakeStringSpan("Hit");
+        case net::kCacheHitViaReval:
+          return MakeStringSpan("HitViaReval");
+        case net::kCacheMissedViaReval:
+          return MakeStringSpan("MissedViaReval");
+        case net::kCacheMissed:
+          return MakeStringSpan("Missed");
+        case net::kCacheUnknown:
+          return MakeStringSpan("");
+        default:
+          MOZ_ASSERT(false, "Unexpected CacheDisposition enum value.");
+          return MakeStringSpan("");
       }
     }
-    MOZ_ASSERT(realThread, "Invalid thread id");
   };
 
-  if (aLockOrNull) {
-    checkThreadId(aThreadId, *aLockOrNull);
-  } else {
-    PSAutoLock lock(gPSMutex);
-    checkThreadId(aThreadId, lock);
-  }
-#endif
-
-  StoreMarker(CorePS::CoreBuffer(), aThreadId, aMarkerName,
-              get_marker_timing_from_payload(aPayload), aCategoryPair,
-              &aPayload);
-}
-
-void profiler_add_marker_for_thread(int aThreadId,
-                                    JS::ProfilingCategoryPair aCategoryPair,
-                                    const char* aMarkerName,
-                                    const ProfilerMarkerPayload& aPayload) {
-  return maybelocked_profiler_add_marker_for_thread(
-      aThreadId, aCategoryPair, aMarkerName, aPayload, nullptr);
-}
-
-void profiler_add_marker_for_mainthread(JS::ProfilingCategoryPair aCategoryPair,
-                                        const char* aMarkerName,
-                                        const ProfilerMarkerPayload& aPayload) {
-  profiler_add_marker_for_thread(profiler_main_thread_id(), aCategoryPair,
-                                 aMarkerName, aPayload);
+  profiler_add_marker(
+      name, geckoprofiler::category::NETWORK,
+      {MarkerTiming::Interval(aStart, aEnd),
+       MarkerStack::TakeBacktrace(std::move(aSource)),
+       MarkerInnerWindowId(aInnerWindowID)},
+      NetworkMarker{}, aStart, aEnd, static_cast<int64_t>(aChannelId), spec,
+      aRequestMethod, aType, aPriority, aCount, aCacheDisposition,
+      aTimings ? *aTimings : scEmptyNetTimingStruct, redirect_spec,
+      aContentType ? ProfilerString8View(*aContentType)
+                   : ProfilerString8View());
 }
 
-bool profiler_add_native_allocation_marker(int aMainThreadId, int64_t aSize,
+bool profiler_add_native_allocation_marker(int64_t aSize,
                                            uintptr_t aMemoryAddress) {
   if (!profiler_can_accept_markers()) {
     return false;
@@ -5591,67 +5605,28 @@
     return false;
   }
 
-  AUTO_PROFILER_STATS(add_marker_with_NativeAllocationMarkerPayload);
-  maybelocked_profiler_add_marker_for_thread(
-      aMainThreadId, JS::ProfilingCategoryPair::OTHER, "Native allocation",
-      NativeAllocationMarkerPayload(TimeStamp::Now(), aSize, aMemoryAddress,
-                                    profiler_current_thread_id(),
-                                    profiler_get_backtrace()),
-      nullptr);
-  return true;
-}
-
-void profiler_tracing_marker(const char* aCategoryString,
-                             const char* aMarkerName,
-                             JS::ProfilingCategoryPair aCategoryPair,
-                             TracingKind aKind,
-                             const Maybe<uint64_t>& aInnerWindowID) {
-  MOZ_RELEASE_ASSERT(CorePS::Exists());
-
-  VTUNE_TRACING(aMarkerName, aKind);
-
-  // This function is hot enough that we use RacyFeatures, notActivePS.
-  if (!profiler_can_accept_markers()) {
-    return;
-  }
-
-  AUTO_PROFILER_STATS(add_marker_with_TracingMarkerPayload);
-  profiler_add_marker(
-      aMarkerName, aCategoryPair,
-      TracingMarkerPayload(aCategoryString, aKind, TimeStamp::NowUnfuzzed(),
-                           aInnerWindowID));
-}
-
-void profiler_tracing_marker(const char* aCategoryString,
-                             const char* aMarkerName,
-                             JS::ProfilingCategoryPair aCategoryPair,
-                             TracingKind aKind, UniqueProfilerBacktrace aCause,
-                             const Maybe<uint64_t>& aInnerWindowID) {
-  MOZ_RELEASE_ASSERT(CorePS::Exists());
-
-  VTUNE_TRACING(aMarkerName, aKind);
-
-  // This function is hot enough that we use RacyFeatures, notActivePS.
-  if (!profiler_can_accept_markers()) {
-    return;
-  }
-
-  profiler_add_marker(
-      aMarkerName, aCategoryPair,
-      TracingMarkerPayload(aCategoryString, aKind, TimeStamp::NowUnfuzzed(),
-                           aInnerWindowID, std::move(aCause)));
-}
+  struct NativeAllocationMarker {
+    static constexpr mozilla::Span<const char> MarkerTypeName() {
+      return mozilla::MakeStringSpan("Native allocation");
+    }
+    static void StreamJSONMarkerData(
+        mozilla::baseprofiler::SpliceableJSONWriter& aWriter, int64_t aSize,
+        uintptr_t aMemoryAddress, int aThreadId) {
+      aWriter.IntProperty("size", aSize);
+      aWriter.IntProperty("memoryAddress",
+                          static_cast<int64_t>(aMemoryAddress));
+      aWriter.IntProperty("threadId", aThreadId);
+    }
+    static mozilla::MarkerSchema MarkerTypeDisplay() {
+      return mozilla::MarkerSchema::SpecialFrontendLocation{};
+    }
+  };
 
-void profiler_add_text_marker(const char* aMarkerName, const nsACString& aText,
-                              JS::ProfilingCategoryPair aCategoryPair,
-                              const mozilla::TimeStamp& aStartTime,
-                              const mozilla::TimeStamp& aEndTime,
-                              const mozilla::Maybe<uint64_t>& aInnerWindowID,
-                              UniqueProfilerBacktrace aCause) {
-  AUTO_PROFILER_STATS(add_marker_with_TextMarkerPayload);
-  profiler_add_marker(aMarkerName, aCategoryPair,
-                      TextMarkerPayload(aText, aStartTime, aEndTime,
-                                        aInnerWindowID, std::move(aCause)));
+  profiler_add_marker("Native allocation", geckoprofiler::category::OTHER,
+                      {MarkerThreadId::MainThread(), MarkerStack::Capture()},
+                      NativeAllocationMarker{}, aSize, aMemoryAddress,
+                      profiler_current_thread_id());
+  return true;
 }
 
 void profiler_set_js_context(JSContext* aCx) {
diff -Nru firefox-84.0.2+build1/tools/profiler/core/platform.h firefox-85.0+build1/tools/profiler/core/platform.h
--- firefox-84.0.2+build1/tools/profiler/core/platform.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/platform.h	2021-01-18 19:58:27.000000000 +0000
@@ -31,15 +31,16 @@
 
 #include "PlatformMacros.h"
 
-#include "GeckoProfiler.h"
-
 #include "mozilla/Logging.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
 #include "nsString.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
-#include <stdint.h>
+
+class ProfilerCodeAddressService;
 
 namespace mozilla {
 struct SymbolTable;
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfileBuffer.cpp firefox-85.0+build1/tools/profiler/core/ProfileBuffer.cpp
--- firefox-84.0.2+build1/tools/profiler/core/ProfileBuffer.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfileBuffer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -135,26 +135,26 @@
                                          TimeDuration aCounters,
                                          TimeDuration aThreads) {
   double time = aSamplingTime.ToMilliseconds() * 1000.0;
-  if (mFirstSamplingTimeNs == 0.0) {
-    mFirstSamplingTimeNs = time;
+  if (mFirstSamplingTimeUs == 0.0) {
+    mFirstSamplingTimeUs = time;
   } else {
     // Note that we'll have 1 fewer interval than other numbers (because
     // we need both ends of an interval to know its duration). The final
     // difference should be insignificant over the expected many thousands
     // of iterations.
-    mIntervalsNs.Count(time - mLastSamplingTimeNs);
+    mIntervalsUs.Count(time - mLastSamplingTimeUs);
   }
-  mLastSamplingTimeNs = time;
+  mLastSamplingTimeUs = time;
   double locking = aLocking.ToMilliseconds() * 1000.0;
   double cleaning = aCleaning.ToMilliseconds() * 1000.0;
   double counters = aCounters.ToMilliseconds() * 1000.0;
   double threads = aThreads.ToMilliseconds() * 1000.0;
 
-  mOverheadsNs.Count(locking + cleaning + counters + threads);
-  mLockingsNs.Count(locking);
-  mCleaningsNs.Count(cleaning);
-  mCountersNs.Count(counters);
-  mThreadsNs.Count(threads);
+  mOverheadsUs.Count(locking + cleaning + counters + threads);
+  mLockingsUs.Count(locking);
+  mCleaningsUs.Count(cleaning);
+  mCountersUs.Count(counters);
+  mThreadsUs.Count(threads);
 
   AddEntry(ProfileBufferEntry::ProfilerOverheadTime(time));
   AddEntry(ProfileBufferEntry::ProfilerOverheadDuration(locking));
@@ -168,12 +168,12 @@
           BufferRangeEnd(),
           static_cast<uint32_t>(*mEntries.BufferLength() /
                                 8),  // 8 bytes per entry.
-          mIntervalsNs,
-          mOverheadsNs,
-          mLockingsNs,
-          mCleaningsNs,
-          mCountersNs,
-          mThreadsNs};
+          mIntervalsUs,
+          mOverheadsUs,
+          mLockingsUs,
+          mCleaningsUs,
+          mCountersUs,
+          mThreadsUs};
 }
 
 /* ProfileBufferCollector */
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfileBufferEntry.cpp firefox-85.0+build1/tools/profiler/core/ProfileBufferEntry.cpp
--- firefox-84.0.2+build1/tools/profiler/core/ProfileBufferEntry.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfileBufferEntry.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -10,11 +10,12 @@
 #include "platform.h"
 #include "ProfileBuffer.h"
 #include "ProfilerBacktrace.h"
-#include "ProfilerMarkerPayload.h"
 
+#include "js/ProfilingFrameIterator.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "mozilla/Logging.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StackWalk.h"
 #include "nsThreadUtils.h"
@@ -636,7 +637,6 @@
 //           )+
 //         */
 //   )
-//   | MarkerData
 //   | Marker
 //   | ( /* Counters */
 //       CounterId
@@ -1154,78 +1154,23 @@
     MOZ_ASSERT(static_cast<ProfileBufferEntry::KindUnderlyingType>(type) <
                static_cast<ProfileBufferEntry::KindUnderlyingType>(
                    ProfileBufferEntry::Kind::MODERN_LIMIT));
-    // Code should *return* from the switch if the entry was fully read.
-    // Code should *break* from the switch if the entry was not fully read (we
-    // then need to adjust the reader position to the end of the entry, as
-    // expected by the reader code.)
-    switch (type) {
-      case ProfileBufferEntry::Kind::MarkerData:
-        if (aER.ReadObject<int>() != aThreadId) {
-          break;  // Entry not fully read.
-        }
-        aWriter.StartArrayElement();
-        {
-          // Extract the information from the buffer:
-          // Each entry is made up of the following:
-          //
-          // [
-          //   ProfileBufferEntry::Kind::MarkerData, <- already read
-          //   threadId,                             <- already read
-          //   name,                                 <- next location in entries
-          //   startTime,
-          //   endTime,
-          //   phase,
-          //   categoryPair,
-          //   payload
-          // ]
-          auto name = aER.ReadObject<std::string>();
-          auto startTime = aER.ReadObject<double>();
-          auto endTime = aER.ReadObject<double>();
-          auto phase = aER.ReadObject<uint8_t>();
-          const JS::ProfilingCategoryPairInfo& info =
-              GetProfilingCategoryPairInfo(
-                  static_cast<JS::ProfilingCategoryPair>(
-                      aER.ReadObject<uint32_t>()));
-          auto payload = aER.ReadObject<UniquePtr<ProfilerMarkerPayload>>();
-
-          MOZ_ASSERT(aER.RemainingBytes() == 0);
-
-          // Now write this information to JSON with the following schema:
-          // [name, startTime, endTime, phase, category, data]
-          aUniqueStacks.mUniqueStrings->WriteElement(aWriter, name);
-          aWriter.DoubleElement(startTime);
-          aWriter.DoubleElement(endTime);
-          aWriter.IntElement(phase);
-          aWriter.IntElement(unsigned(info.mCategory));
-          if (payload) {
-            aWriter.StartObjectElement(SpliceableJSONWriter::SingleLineStyle);
-            {
-              payload->StreamPayload(aWriter, aProcessStartTime, aUniqueStacks);
-            }
-            aWriter.EndObject();
-          }
-        }
-        aWriter.EndArray();
-        return;  // Entry fully read.
+    bool entryWasFullyRead = false;
 
-      case ProfileBufferEntry::Kind::Marker:
-        if (mozilla::base_profiler_markers_detail::
-                DeserializeAfterKindAndStream(
-                    aER, aWriter, aThreadId,
-                    [&](ProfileChunkedBuffer& aChunkedBuffer) {
-                      ProfilerBacktrace backtrace("", &aChunkedBuffer);
-                      backtrace.StreamJSON(aWriter, aProcessStartTime,
-                                           aUniqueStacks);
-                    })) {
-          return;  // Entry fully read.
-        }
-        break;  // Entry not fully read.
-
-      default:
-        break;  // Entry not fully read.
+    if (type == ProfileBufferEntry::Kind::Marker) {
+      entryWasFullyRead =
+          mozilla::base_profiler_markers_detail::DeserializeAfterKindAndStream(
+              aER, aWriter, aThreadId,
+              [&](ProfileChunkedBuffer& aChunkedBuffer) {
+                ProfilerBacktrace backtrace("", &aChunkedBuffer);
+                backtrace.StreamJSON(aWriter, aProcessStartTime, aUniqueStacks);
+              });
     }
 
-    aER.SetRemainingBytes(0);
+    if (!entryWasFullyRead) {
+      // The entry was not a marker, or it was a marker for another thread.
+      // We probably didn't read the whole entry, so we need to skip to the end.
+      aER.SetRemainingBytes(0);
+    }
   });
 }
 
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfileBufferEntry.h firefox-85.0+build1/tools/profiler/core/ProfileBufferEntry.h
--- firefox-84.0.2+build1/tools/profiler/core/ProfileBufferEntry.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfileBufferEntry.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,9 +7,13 @@
 #ifndef ProfileBufferEntry_h
 #define ProfileBufferEntry_h
 
+#include <cstdint>
+#include <cstdlib>
+#include <functional>
+#include <utility>
 #include "gtest/MozGtestFriend.h"
 #include "js/ProfilingCategory.h"
-#include "js/ProfilingFrameIterator.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/HashTable.h"
 #include "mozilla/Maybe.h"
@@ -21,6 +25,7 @@
 #include "nsString.h"
 
 class ProfilerCodeAddressService;
+struct JSContext;
 
 class ProfileBufferEntry {
  public:
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfileBuffer.h firefox-85.0+build1/tools/profiler/core/ProfileBuffer.h
--- firefox-84.0.2+build1/tools/profiler/core/ProfileBuffer.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfileBuffer.h	2021-01-18 19:58:27.000000000 +0000
@@ -173,14 +173,14 @@
           mozilla::ProfileBufferChunk::SizeofChunkMetadata() +
           WorkerBufferBytes.Value())};
 
-  double mFirstSamplingTimeNs = 0.0;
-  double mLastSamplingTimeNs = 0.0;
-  ProfilerStats mIntervalsNs;
-  ProfilerStats mOverheadsNs;
-  ProfilerStats mLockingsNs;
-  ProfilerStats mCleaningsNs;
-  ProfilerStats mCountersNs;
-  ProfilerStats mThreadsNs;
+  double mFirstSamplingTimeUs = 0.0;
+  double mLastSamplingTimeUs = 0.0;
+  ProfilerStats mIntervalsUs;
+  ProfilerStats mOverheadsUs;
+  ProfilerStats mLockingsUs;
+  ProfilerStats mCleaningsUs;
+  ProfilerStats mCountersUs;
+  ProfilerStats mThreadsUs;
 };
 
 /**
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfiledThreadData.cpp firefox-85.0+build1/tools/profiler/core/ProfiledThreadData.cpp
--- firefox-84.0.2+build1/tools/profiler/core/ProfiledThreadData.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfiledThreadData.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,8 +9,9 @@
 #include "ProfileBuffer.h"
 
 #include "js/TraceLoggerAPI.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/ProfileJSONWriter.h"
+#include "mozilla/Span.h"
+#include "nsXULAppAPI.h"
 
 #if defined(GP_OS_darwin)
 #  include <pthread.h>
@@ -216,9 +217,9 @@
   int processedThreadId = 0;
 
   aWriter.StringProperty("processType",
-                         MakeStringSpan(XRE_GetProcessTypeString()));
+                         mozilla::MakeStringSpan(XRE_GetProcessTypeString()));
 
-  aWriter.StringProperty("name", MakeStringSpan(aName));
+  aWriter.StringProperty("name", mozilla::MakeStringSpan(aName));
 
   // Use given process name (if any), unless we're the parent process.
   if (XRE_IsParentProcess()) {
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfiledThreadData.h firefox-85.0+build1/tools/profiler/core/ProfiledThreadData.h
--- firefox-84.0.2+build1/tools/profiler/core/ProfiledThreadData.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfiledThreadData.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,16 +7,24 @@
 #ifndef ProfiledThreadData_h
 #define ProfiledThreadData_h
 
-#include "platform.h"
-#include "ProfileBufferEntry.h"
 #include "ThreadInfo.h"
 
-#include "js/ProfilingStack.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
-#include "nsIEventTarget.h"
+#include "mozilla/RefPtr.h"
+#include "nsStringFwd.h"
 
 class ProfileBuffer;
+class ProfilerCodeAddressService;
+class UniqueStacks;
+class nsIEventTarget;
+struct JITFrameInfo;
+struct JSContext;
+
+namespace mozilla::baseprofiler {
+class SpliceableJSONWriter;
+}
 
 // This class contains information about a thread that is only relevant while
 // the profiler is running, for any threads (both alive and dead) whose thread
@@ -61,14 +69,15 @@
   mozilla::Maybe<uint64_t>& LastSample() { return mLastSample; }
 
   void StreamJSON(const ProfileBuffer& aBuffer, JSContext* aCx,
-                  SpliceableJSONWriter& aWriter, const nsACString& aProcessName,
-                  const nsACString& aETLDplus1,
+                  mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+                  const nsACString& aProcessName, const nsACString& aETLDplus1,
                   const mozilla::TimeStamp& aProcessStartTime,
                   double aSinceTime, bool aJSTracerEnabled,
                   ProfilerCodeAddressService* aService);
 
-  void StreamTraceLoggerJSON(JSContext* aCx, SpliceableJSONWriter& aWriter,
-                             const mozilla::TimeStamp& aProcessStartTime);
+  void StreamTraceLoggerJSON(
+      JSContext* aCx, mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+      const mozilla::TimeStamp& aProcessStartTime);
 
   const RefPtr<ThreadInfo> Info() const { return mThreadInfo; }
 
@@ -119,14 +128,13 @@
 // Stream all samples and markers from aBuffer with the given aThreadId (or 0
 // for everything, which is assumed to be a single backtrace sample.)
 // Returns the thread id of the output sample(s), or 0 if none was present.
-int StreamSamplesAndMarkers(const char* aName, int aThreadId,
-                            const ProfileBuffer& aBuffer,
-                            SpliceableJSONWriter& aWriter,
-                            const nsACString& aProcessName,
-                            const nsACString& aETLDplus1,
-                            const mozilla::TimeStamp& aProcessStartTime,
-                            const mozilla::TimeStamp& aRegisterTime,
-                            const mozilla::TimeStamp& aUnregisterTime,
-                            double aSinceTime, UniqueStacks& aUniqueStacks);
+int StreamSamplesAndMarkers(
+    const char* aName, int aThreadId, const ProfileBuffer& aBuffer,
+    mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+    const nsACString& aProcessName, const nsACString& aETLDplus1,
+    const mozilla::TimeStamp& aProcessStartTime,
+    const mozilla::TimeStamp& aRegisterTime,
+    const mozilla::TimeStamp& aUnregisterTime, double aSinceTime,
+    UniqueStacks& aUniqueStacks);
 
 #endif  // ProfiledThreadData_h
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfilerMarkerPayload.cpp firefox-85.0+build1/tools/profiler/core/ProfilerMarkerPayload.cpp
--- firefox-84.0.2+build1/tools/profiler/core/ProfilerMarkerPayload.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfilerMarkerPayload.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1126 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "ProfilerMarkerPayload.h"
-
-#include "GeckoProfiler.h"
-#include "ProfileBufferEntry.h"
-#include "ProfilerBacktrace.h"
-
-#include "gfxASurface.h"
-#include "Layers.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/net/HttpBaseChannel.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/ProfileBufferEntrySerializationGeckoExtensions.h"
-#include "mozilla/ProfileJSONWriter.h"
-#include "mozilla/Sprintf.h"
-
-#include <inttypes.h>
-
-using namespace mozilla;
-
-static UniquePtr<ProfilerMarkerPayload> DeserializeNothing(
-    ProfileBufferEntryReader&) {
-  return nullptr;
-}
-
-// Starting at 1 for the initial `DeserializeNothing`.
-// static
-Atomic<ProfilerMarkerPayload::DeserializerTagAtomic, ReleaseAcquire>
-    ProfilerMarkerPayload::sDeserializerCount{1};
-
-// Initialize `sDeserializers` with `DeserializeNothing` at index 0, all others
-// are nullptrs.
-// static
-ProfilerMarkerPayload::Deserializer
-    ProfilerMarkerPayload::sDeserializers[DeserializerMax] = {
-        DeserializeNothing};
-
-// static
-ProfilerMarkerPayload::DeserializerTag
-ProfilerMarkerPayload::TagForDeserializer(
-    ProfilerMarkerPayload::Deserializer aDeserializer) {
-  if (!aDeserializer) {
-    return 0;
-  }
-  // Start first search at index 0.
-  DeserializerTagAtomic start = 0;
-  for (;;) {
-    // Read the current count of deserializers.
-    const DeserializerTagAtomic tagCount = sDeserializerCount;
-    if (tagCount == 0) {
-      // Someone else is currently writing into the array, loop around until we
-      // get a valid count.
-      continue;
-    }
-    for (DeserializerTagAtomic i = start; i < tagCount; ++i) {
-      if (sDeserializers[i] == aDeserializer) {
-        // Deserializer already registered, return its tag.
-        return static_cast<ProfilerMarkerPayload::DeserializerTag>(i);
-      }
-    }
-    // Not found yet, let's register this new deserializer.
-    // Make sure we haven't reached the limit yet.
-    MOZ_RELEASE_ASSERT(tagCount < DeserializerMax);
-    // Reserve `tagCount` as an index, if not already claimed:
-    // If `sDeserializerCount` is still at our previously-read `tagCount`,
-    // replace it with a special 0 value to indicate a write.
-    if (sDeserializerCount.compareExchange(tagCount, 0)) {
-      // Here we own the `tagCount` index, write the deserializer there.
-      sDeserializers[tagCount] = aDeserializer;
-      // And publish by writing the real new count (1 past our index).
-      sDeserializerCount = tagCount + 1;
-      return static_cast<ProfilerMarkerPayload::DeserializerTag>(tagCount);
-    }
-    // Someone else beat us to grab an index, and it could be for the same
-    // deserializer! So let's just try searching starting from our recorded
-    // `tagCount` (and maybe attempting again to register). It should be rare
-    // enough and quick enough that it won't impact performances.
-    start = tagCount;
-  }
-}
-
-// static
-ProfilerMarkerPayload::Deserializer ProfilerMarkerPayload::DeserializerForTag(
-    ProfilerMarkerPayload::DeserializerTag aTag) {
-  MOZ_RELEASE_ASSERT(aTag < DeserializerMax);
-  MOZ_RELEASE_ASSERT(aTag < sDeserializerCount);
-  return sDeserializers[aTag];
-}
-
-static void MOZ_ALWAYS_INLINE WriteTime(SpliceableJSONWriter& aWriter,
-                                        const TimeStamp& aProcessStartTime,
-                                        const TimeStamp& aTime,
-                                        const char* aName) {
-  if (!aTime.IsNull()) {
-    aWriter.DoubleProperty(MakeStringSpan(aName),
-                           (aTime - aProcessStartTime).ToMilliseconds());
-  }
-}
-
-void ProfilerMarkerPayload::StreamType(const char* aMarkerType,
-                                       SpliceableJSONWriter& aWriter) const {
-  MOZ_ASSERT(aMarkerType);
-  aWriter.StringProperty("type", MakeStringSpan(aMarkerType));
-}
-
-ProfileBufferEntryWriter::Length
-ProfilerMarkerPayload::CommonPropsTagAndSerializationBytes() const {
-  return sizeof(DeserializerTag) +
-         ProfileBufferEntryWriter::SumBytes(
-             mCommonProps.mStartTime, mCommonProps.mEndTime,
-             mCommonProps.mStack, mCommonProps.mInnerWindowID);
-}
-
-void ProfilerMarkerPayload::SerializeTagAndCommonProps(
-    DeserializerTag aDeserializerTag,
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  aEntryWriter.WriteObject(aDeserializerTag);
-  aEntryWriter.WriteObject(mCommonProps.mStartTime);
-  aEntryWriter.WriteObject(mCommonProps.mEndTime);
-  aEntryWriter.WriteObject(mCommonProps.mStack);
-  aEntryWriter.WriteObject(mCommonProps.mInnerWindowID);
-}
-
-// static
-ProfilerMarkerPayload::CommonProps
-ProfilerMarkerPayload::DeserializeCommonProps(
-    ProfileBufferEntryReader& aEntryReader) {
-  CommonProps props;
-  aEntryReader.ReadIntoObject(props.mStartTime);
-  aEntryReader.ReadIntoObject(props.mEndTime);
-  aEntryReader.ReadIntoObject(props.mStack);
-  aEntryReader.ReadIntoObject(props.mInnerWindowID);
-  return props;
-}
-
-// Deprecated: This function is providing a way for a few payloads to use the
-// start time and end time in their payloads, which is currently deprecated.
-// The startTime and endTime were removed from most payloads, in favor of
-// the MarkerTiming::Phase idea. However, IPC and Network markers still have
-// them as it was harder to upgrade the front-end without them.
-void ProfilerMarkerPayload::StreamStartEndTime(
-    SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime) const {
-  WriteTime(aWriter, aProcessStartTime, mCommonProps.mStartTime, "startTime");
-  WriteTime(aWriter, aProcessStartTime, mCommonProps.mEndTime, "endTime");
-}
-
-void ProfilerMarkerPayload::StreamCommonProps(
-    const char* aMarkerType, SpliceableJSONWriter& aWriter,
-    const TimeStamp& aProcessStartTime, UniqueStacks& aUniqueStacks) const {
-  StreamType(aMarkerType, aWriter);
-  if (mCommonProps.mInnerWindowID) {
-    // Here, we are converting uint64_t to double. Both Browsing Context and
-    // Inner Window IDs are creating using
-    // `nsContentUtils::GenerateProcessSpecificId`, which is specifically
-    // designed to only use 53 of the 64 bits to be lossless when passed into
-    // and out of JS as a double.
-    aWriter.DoubleProperty("innerWindowID", mCommonProps.mInnerWindowID.ref());
-  }
-  if (mCommonProps.mStack) {
-    aWriter.StartObjectProperty("stack");
-    {
-      mCommonProps.mStack->StreamJSON(aWriter, aProcessStartTime,
-                                      aUniqueStacks);
-    }
-    aWriter.EndObject();
-  }
-}
-
-ProfileBufferEntryWriter::Length
-TracingMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(
-             WrapProfileBufferRawPointer(mCategory), mKind);
-}
-
-void TracingMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndPayload(tag, aEntryWriter);
-}
-
-void TracingMarkerPayload::SerializeTagAndPayload(
-    DeserializerTag aDeserializerTag,
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  SerializeTagAndCommonProps(aDeserializerTag, aEntryWriter);
-  aEntryWriter.WriteObject(WrapProfileBufferRawPointer(mCategory));
-  aEntryWriter.WriteObject(mKind);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> TracingMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  const char* category = aEntryReader.ReadObject<const char*>();
-  TracingKind kind = aEntryReader.ReadObject<TracingKind>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new TracingMarkerPayload(std::move(props), category, kind));
-}
-
-void TracingMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                         const TimeStamp& aProcessStartTime,
-                                         UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("tracing", aWriter, aProcessStartTime, aUniqueStacks);
-
-  if (mCategory) {
-    aWriter.StringProperty("category", MakeStringSpan(mCategory));
-  }
-
-  if (mKind == TRACING_INTERVAL_START) {
-    aWriter.StringProperty("interval", "start");
-  } else if (mKind == TRACING_INTERVAL_END) {
-    aWriter.StringProperty("interval", "end");
-  }
-}
-
-ProfileBufferEntryWriter::Length
-UserTimingMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(
-             WrapProfileBufferRawPointer(mEntryType), mName, mStartMark,
-             mEndMark);
-}
-
-void UserTimingMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(WrapProfileBufferRawPointer(mEntryType));
-  aEntryWriter.WriteObject(mName);
-  aEntryWriter.WriteObject(mStartMark);
-  aEntryWriter.WriteObject(mEndMark);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> UserTimingMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto entryType = aEntryReader.ReadObject<const char*>();
-  auto name = aEntryReader.ReadObject<nsString>();
-  auto startMark = aEntryReader.ReadObject<Maybe<nsString>>();
-  auto endMark = aEntryReader.ReadObject<Maybe<nsString>>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new UserTimingMarkerPayload(std::move(props), entryType, std::move(name),
-                                  std::move(startMark), std::move(endMark)));
-}
-
-void UserTimingMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                            const TimeStamp& aProcessStartTime,
-                                            UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("UserTiming", aWriter, aProcessStartTime, aUniqueStacks);
-  aWriter.StringProperty("name", NS_ConvertUTF16toUTF8(mName));
-  aWriter.StringProperty("entryType", MakeStringSpan(mEntryType));
-
-  if (mStartMark.isSome()) {
-    aWriter.StringProperty("startMark",
-                           NS_ConvertUTF16toUTF8(mStartMark.value()));
-  } else {
-    aWriter.NullProperty("startMark");
-  }
-  if (mEndMark.isSome()) {
-    aWriter.StringProperty("endMark", NS_ConvertUTF16toUTF8(mEndMark.value()));
-  } else {
-    aWriter.NullProperty("endMark");
-  }
-}
-
-ProfileBufferEntryWriter::Length TimingMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes();
-}
-
-void TimingMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> TimingMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  return UniquePtr<ProfilerMarkerPayload>(
-      new TimingMarkerPayload(std::move(props)));
-}
-
-void TimingMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                        const TimeStamp& aProcessStartTime,
-                                        UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Timing", aWriter, aProcessStartTime, aUniqueStacks);
-}
-
-ProfileBufferEntryWriter::Length TextMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mText);
-}
-
-void TextMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mText);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> TextMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto text = aEntryReader.ReadObject<nsCString>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new TextMarkerPayload(std::move(props), std::move(text)));
-}
-
-void TextMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                      const TimeStamp& aProcessStartTime,
-                                      UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Text", aWriter, aProcessStartTime, aUniqueStacks);
-  aWriter.StringProperty("name", mText);
-}
-
-ProfileBufferEntryWriter::Length LogMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mModule, mText);
-}
-
-void LogMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mModule);
-  aEntryWriter.WriteObject(mText);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> LogMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto module = aEntryReader.ReadObject<nsAutoCStringN<32>>();
-  auto text = aEntryReader.ReadObject<nsCString>();
-  return UniquePtr<ProfilerMarkerPayload>(new LogMarkerPayload(
-      std::move(props), std::move(module), std::move(text)));
-}
-
-void LogMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                     const TimeStamp& aProcessStartTime,
-                                     UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Log", aWriter, aProcessStartTime, aUniqueStacks);
-  aWriter.StringProperty("name", mText);
-  aWriter.StringProperty("module", mModule);
-}
-
-MediaSampleMarkerPayload::MediaSampleMarkerPayload(
-    const int64_t aSampleStartTimeUs, const int64_t aSampleEndTimeUs)
-    : mSampleStartTimeUs(aSampleStartTimeUs),
-      mSampleEndTimeUs(aSampleEndTimeUs) {}
-
-MediaSampleMarkerPayload::MediaSampleMarkerPayload(
-    CommonProps&& aCommonProps, const int64_t aSampleStartTimeUs,
-    const int64_t aSampleEndTimeUs)
-    : ProfilerMarkerPayload(std::move(aCommonProps)),
-      mSampleStartTimeUs(aSampleStartTimeUs),
-      mSampleEndTimeUs(aSampleEndTimeUs) {}
-
-ProfileBufferEntryWriter::Length
-MediaSampleMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mSampleStartTimeUs,
-                                            mSampleEndTimeUs);
-}
-
-void MediaSampleMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mSampleStartTimeUs);
-  aEntryWriter.WriteObject(mSampleEndTimeUs);
-}
-
-/* static */
-UniquePtr<ProfilerMarkerPayload> MediaSampleMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto sampleStartTimeUs = aEntryReader.ReadObject<int64_t>();
-  auto sampleEndTimeUs = aEntryReader.ReadObject<int64_t>();
-  return UniquePtr<ProfilerMarkerPayload>(new MediaSampleMarkerPayload(
-      std::move(props), sampleStartTimeUs, sampleEndTimeUs));
-}
-
-void MediaSampleMarkerPayload::StreamPayload(
-    SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime,
-    UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("MediaSample", aWriter, aProcessStartTime, aUniqueStacks);
-  aWriter.IntProperty("sampleStartTimeUs", mSampleStartTimeUs);
-  aWriter.IntProperty("sampleEndTimeUs", mSampleEndTimeUs);
-}
-
-ProfileBufferEntryWriter::Length PrefMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mPrefAccessTime, mPrefName,
-                                            mPrefKind, mPrefType, mPrefValue);
-}
-
-void PrefMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mPrefAccessTime);
-  aEntryWriter.WriteObject(mPrefName);
-  aEntryWriter.WriteObject(mPrefKind);
-  aEntryWriter.WriteObject(mPrefType);
-  aEntryWriter.WriteObject(mPrefValue);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> PrefMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto prefAccessTime = aEntryReader.ReadObject<TimeStamp>();
-  auto prefName = aEntryReader.ReadObject<nsCString>();
-  auto prefKind = aEntryReader.ReadObject<Maybe<PrefValueKind>>();
-  auto prefType = aEntryReader.ReadObject<Maybe<PrefType>>();
-  auto prefValue = aEntryReader.ReadObject<nsCString>();
-  return UniquePtr<ProfilerMarkerPayload>(new PrefMarkerPayload(
-      std::move(props), prefAccessTime, std::move(prefName),
-      std::move(prefKind), std::move(prefType), std::move(prefValue)));
-}
-
-static Span<const char> PrefValueKindToString(
-    const Maybe<PrefValueKind>& aKind) {
-  if (aKind) {
-    return *aKind == PrefValueKind::Default ? MakeStringSpan("Default")
-                                            : MakeStringSpan("User");
-  }
-  return MakeStringSpan("Shared");
-}
-
-static Span<const char> PrefTypeToString(const Maybe<PrefType>& type) {
-  if (type) {
-    switch (*type) {
-      case PrefType::None:
-        return MakeStringSpan("None");
-      case PrefType::Int:
-        return MakeStringSpan("Int");
-      case PrefType::Bool:
-        return MakeStringSpan("Bool");
-      case PrefType::String:
-        return MakeStringSpan("String");
-      default:
-        MOZ_ASSERT_UNREACHABLE("Unknown preference type.");
-    }
-  }
-  return MakeStringSpan("Preference not found");
-}
-
-void PrefMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                      const TimeStamp& aProcessStartTime,
-                                      UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("PreferenceRead", aWriter, aProcessStartTime,
-                    aUniqueStacks);
-  WriteTime(aWriter, aProcessStartTime, mPrefAccessTime, "prefAccessTime");
-  aWriter.StringProperty("prefName", mPrefName);
-  aWriter.StringProperty("prefKind", PrefValueKindToString(mPrefKind));
-  aWriter.StringProperty("prefType", PrefTypeToString(mPrefType));
-  aWriter.StringProperty("prefValue", mPrefValue);
-}
-
-ProfileBufferEntryWriter::Length
-LayerTranslationMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(WrapProfileBufferRawPointer(mLayer),
-                                            mPoint);
-}
-
-void LayerTranslationMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(WrapProfileBufferRawPointer(mLayer));
-  aEntryWriter.WriteObject(mPoint);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> LayerTranslationMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto layer = aEntryReader.ReadObject<layers::Layer*>();
-  auto point = aEntryReader.ReadObject<gfx::Point>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new LayerTranslationMarkerPayload(std::move(props), layer, point));
-}
-
-void LayerTranslationMarkerPayload::StreamPayload(
-    SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime,
-    UniqueStacks& aUniqueStacks) const {
-  StreamType("LayerTranslation", aWriter);
-  const size_t bufferSize = 32;
-  char buffer[bufferSize];
-  const int written = SprintfLiteral(buffer, "%p", mLayer);
-  MOZ_RELEASE_ASSERT(written > 0);
-
-  aWriter.StringProperty("layer", Span<const char>(buffer, size_t(written)));
-  aWriter.IntProperty("x", mPoint.x);
-  aWriter.IntProperty("y", mPoint.y);
-}
-
-ProfileBufferEntryWriter::Length VsyncMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes();
-}
-
-void VsyncMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> VsyncMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  return UniquePtr<ProfilerMarkerPayload>(
-      new VsyncMarkerPayload(std::move(props)));
-}
-
-void VsyncMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                       const TimeStamp& aProcessStartTime,
-                                       UniqueStacks& aUniqueStacks) const {
-  StreamType("VsyncTimestamp", aWriter);
-}
-
-ProfileBufferEntryWriter::Length
-NetworkMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(
-             mID, mURI, mRedirectURI, mRequestMethod, mType, mPri, mCount,
-             mTimings, mCacheDisposition, mContentType);
-}
-
-void NetworkMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mID);
-  aEntryWriter.WriteObject(mURI);
-  aEntryWriter.WriteObject(mRedirectURI);
-  aEntryWriter.WriteObject(mRequestMethod);
-  aEntryWriter.WriteObject(mType);
-  aEntryWriter.WriteObject(mPri);
-  aEntryWriter.WriteObject(mCount);
-  aEntryWriter.WriteObject(mTimings);
-  aEntryWriter.WriteObject(mCacheDisposition);
-  aEntryWriter.WriteObject(mContentType);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> NetworkMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto id = aEntryReader.ReadObject<int64_t>();
-  auto uri = aEntryReader.ReadObject<UniqueFreePtr<char>>();
-  auto redirectURI = aEntryReader.ReadObject<UniqueFreePtr<char>>();
-  auto requestMethod = aEntryReader.ReadObject<nsCString>();
-  auto type = aEntryReader.ReadObject<NetworkLoadType>();
-  auto pri = aEntryReader.ReadObject<int32_t>();
-  auto count = aEntryReader.ReadObject<int64_t>();
-  auto timings = aEntryReader.ReadObject<net::TimingStruct>();
-  auto cacheDisposition = aEntryReader.ReadObject<net::CacheDisposition>();
-  auto contentType = aEntryReader.ReadObject<Maybe<nsAutoCString>>();
-  return UniquePtr<ProfilerMarkerPayload>(new NetworkMarkerPayload(
-      std::move(props), id, std::move(uri), std::move(redirectURI),
-      std::move(requestMethod), type, pri, count, timings, cacheDisposition,
-      std::move(contentType)));
-}
-
-static Span<const char> GetNetworkState(NetworkLoadType aType) {
-  switch (aType) {
-    case NetworkLoadType::LOAD_START:
-      return MakeStringSpan("STATUS_START");
-    case NetworkLoadType::LOAD_STOP:
-      return MakeStringSpan("STATUS_STOP");
-    case NetworkLoadType::LOAD_REDIRECT:
-      return MakeStringSpan("STATUS_REDIRECT");
-  }
-  return MakeStringSpan("");
-}
-
-static Span<const char> GetCacheState(net::CacheDisposition aCacheDisposition) {
-  switch (aCacheDisposition) {
-    case net::kCacheUnresolved:
-      return MakeStringSpan("Unresolved");
-    case net::kCacheHit:
-      return MakeStringSpan("Hit");
-    case net::kCacheHitViaReval:
-      return MakeStringSpan("HitViaReval");
-    case net::kCacheMissedViaReval:
-      return MakeStringSpan("MissedViaReval");
-    case net::kCacheMissed:
-      return MakeStringSpan("Missed");
-    case net::kCacheUnknown:
-    default:
-      return MakeStringSpan("");
-  }
-}
-
-void NetworkMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                         const TimeStamp& aProcessStartTime,
-                                         UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Network", aWriter, aProcessStartTime, aUniqueStacks);
-  // This payload still streams a startTime and endTime property because it made
-  // the migration to MarkerTiming on the front-end easier.
-  StreamStartEndTime(aWriter, aProcessStartTime);
-
-  aWriter.IntProperty("id", mID);
-  // want to use aUniqueStacks.mUniqueStrings->WriteElement(aWriter,
-  // typeString);
-  aWriter.StringProperty("status", GetNetworkState(mType));
-  if (Span<const char> cacheString = GetCacheState(mCacheDisposition);
-      !cacheString.empty()) {
-    aWriter.StringProperty("cache", cacheString);
-  }
-  aWriter.IntProperty("pri", mPri);
-  if (mCount > 0) {
-    aWriter.IntProperty("count", mCount);
-  }
-  if (mURI) {
-    aWriter.StringProperty("URI", MakeStringSpan(mURI.get()));
-  }
-  if (mRedirectURI) {
-    aWriter.StringProperty("RedirectURI", MakeStringSpan(mRedirectURI.get()));
-  }
-  aWriter.StringProperty("requestMethod", mRequestMethod);
-
-  if (mContentType.isSome()) {
-    aWriter.StringProperty("contentType", mContentType.value());
-  } else {
-    aWriter.NullProperty("contentType");
-  }
-
-  if (mType != NetworkLoadType::LOAD_START) {
-    WriteTime(aWriter, aProcessStartTime, mTimings.domainLookupStart,
-              "domainLookupStart");
-    WriteTime(aWriter, aProcessStartTime, mTimings.domainLookupEnd,
-              "domainLookupEnd");
-    WriteTime(aWriter, aProcessStartTime, mTimings.connectStart,
-              "connectStart");
-    WriteTime(aWriter, aProcessStartTime, mTimings.tcpConnectEnd,
-              "tcpConnectEnd");
-    WriteTime(aWriter, aProcessStartTime, mTimings.secureConnectionStart,
-              "secureConnectionStart");
-    WriteTime(aWriter, aProcessStartTime, mTimings.connectEnd, "connectEnd");
-    WriteTime(aWriter, aProcessStartTime, mTimings.requestStart,
-              "requestStart");
-    WriteTime(aWriter, aProcessStartTime, mTimings.responseStart,
-              "responseStart");
-    WriteTime(aWriter, aProcessStartTime, mTimings.responseEnd, "responseEnd");
-  }
-}
-
-ProfileBufferEntryWriter::Length ScreenshotPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mScreenshotDataURL, mWindowSize,
-                                            mWindowIdentifier);
-}
-
-void ScreenshotPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mScreenshotDataURL);
-  aEntryWriter.WriteObject(mWindowSize);
-  aEntryWriter.WriteObject(mWindowIdentifier);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> ScreenshotPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto screenshotDataURL = aEntryReader.ReadObject<nsCString>();
-  auto windowSize = aEntryReader.ReadObject<gfx::IntSize>();
-  auto windowIdentifier = aEntryReader.ReadObject<uintptr_t>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new ScreenshotPayload(std::move(props), std::move(screenshotDataURL),
-                            windowSize, windowIdentifier));
-}
-
-void ScreenshotPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                      const TimeStamp& aProcessStartTime,
-                                      UniqueStacks& aUniqueStacks) const {
-  StreamType("CompositorScreenshot", aWriter);
-  aUniqueStacks.mUniqueStrings->WriteProperty(aWriter, MakeStringSpan("url"),
-                                              mScreenshotDataURL);
-
-  char hexWindowID[32];
-  const int written =
-      SprintfLiteral(hexWindowID, "0x%" PRIXPTR, mWindowIdentifier);
-  MOZ_RELEASE_ASSERT(written > 0);
-  aWriter.StringProperty("windowID",
-                         Span<const char>(hexWindowID, size_t(written)));
-  aWriter.DoubleProperty("windowWidth", mWindowSize.width);
-  aWriter.DoubleProperty("windowHeight", mWindowSize.height);
-}
-
-ProfileBufferEntryWriter::Length
-GCSliceMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mTimingJSON);
-}
-
-void GCSliceMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mTimingJSON);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> GCSliceMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto timingJSON = aEntryReader.ReadObject<JS::UniqueChars>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new GCSliceMarkerPayload(std::move(props), std::move(timingJSON)));
-}
-
-void GCSliceMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                         const TimeStamp& aProcessStartTime,
-                                         UniqueStacks& aUniqueStacks) const {
-  MOZ_ASSERT(mTimingJSON);
-  StreamCommonProps("GCSlice", aWriter, aProcessStartTime, aUniqueStacks);
-  if (mTimingJSON) {
-    aWriter.SplicedJSONProperty(MakeStringSpan("timings"),
-                                MakeStringSpan(mTimingJSON.get()));
-  } else {
-    aWriter.NullProperty("timings");
-  }
-}
-
-ProfileBufferEntryWriter::Length BudgetMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes();
-}
-
-void BudgetMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> BudgetMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  return UniquePtr<ProfilerMarkerPayload>(
-      new BudgetMarkerPayload(std::move(props)));
-}
-
-void BudgetMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                        const TimeStamp& aProcessStartTime,
-                                        UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Budget", aWriter, aProcessStartTime, aUniqueStacks);
-}
-
-ProfileBufferEntryWriter::Length
-GCMajorMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mTimingJSON);
-}
-
-void GCMajorMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mTimingJSON);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> GCMajorMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto timingJSON = aEntryReader.ReadObject<JS::UniqueChars>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new GCMajorMarkerPayload(std::move(props), std::move(timingJSON)));
-}
-
-void GCMajorMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                         const TimeStamp& aProcessStartTime,
-                                         UniqueStacks& aUniqueStacks) const {
-  MOZ_ASSERT(mTimingJSON);
-  StreamCommonProps("GCMajor", aWriter, aProcessStartTime, aUniqueStacks);
-  if (mTimingJSON) {
-    aWriter.SplicedJSONProperty(MakeStringSpan("timings"),
-                                MakeStringSpan(mTimingJSON.get()));
-  } else {
-    aWriter.NullProperty("timings");
-  }
-}
-
-ProfileBufferEntryWriter::Length
-GCMinorMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mTimingData);
-}
-
-void GCMinorMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mTimingData);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> GCMinorMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto timingData = aEntryReader.ReadObject<JS::UniqueChars>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new GCMinorMarkerPayload(std::move(props), std::move(timingData)));
-}
-
-void GCMinorMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                         const TimeStamp& aProcessStartTime,
-                                         UniqueStacks& aUniqueStacks) const {
-  MOZ_ASSERT(mTimingData);
-  StreamCommonProps("GCMinor", aWriter, aProcessStartTime, aUniqueStacks);
-  if (mTimingData) {
-    aWriter.SplicedJSONProperty(MakeStringSpan("nursery"),
-                                MakeStringSpan(mTimingData.get()));
-  } else {
-    aWriter.NullProperty("nursery");
-  }
-}
-
-ProfileBufferEntryWriter::Length HangMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes();
-}
-
-void HangMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> HangMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  return UniquePtr<ProfilerMarkerPayload>(
-      new HangMarkerPayload(std::move(props)));
-}
-
-void HangMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                      const TimeStamp& aProcessStartTime,
-                                      UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("BHR-detected hang", aWriter, aProcessStartTime,
-                    aUniqueStacks);
-}
-
-ProfileBufferEntryWriter::Length StyleMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mStats);
-}
-
-void StyleMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mStats);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> StyleMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto stats = aEntryReader.ReadObject<ServoTraversalStatistics>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new StyleMarkerPayload(std::move(props), stats));
-}
-
-void StyleMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                       const TimeStamp& aProcessStartTime,
-                                       UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Styles", aWriter, aProcessStartTime, aUniqueStacks);
-  aWriter.StringProperty("category", "Paint");
-  aWriter.IntProperty("elementsTraversed", mStats.mElementsTraversed);
-  aWriter.IntProperty("elementsStyled", mStats.mElementsStyled);
-  aWriter.IntProperty("elementsMatched", mStats.mElementsMatched);
-  aWriter.IntProperty("stylesShared", mStats.mStylesShared);
-  aWriter.IntProperty("stylesReused", mStats.mStylesReused);
-}
-
-ProfileBufferEntryWriter::Length
-LongTaskMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes();
-}
-
-void LongTaskMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> LongTaskMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  return UniquePtr<ProfilerMarkerPayload>(
-      new LongTaskMarkerPayload(std::move(props)));
-}
-
-void LongTaskMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                          const TimeStamp& aProcessStartTime,
-                                          UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("MainThreadLongTask", aWriter, aProcessStartTime,
-                    aUniqueStacks);
-  aWriter.StringProperty("category", "LongTask");
-}
-
-ProfileBufferEntryWriter::Length
-JsAllocationMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mTypeName, mClassName,
-                                            mDescriptiveTypeName, mCoarseType,
-                                            mSize, mInNursery);
-}
-
-void JsAllocationMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mTypeName);
-  aEntryWriter.WriteObject(mClassName);
-  aEntryWriter.WriteObject(mDescriptiveTypeName);
-  aEntryWriter.WriteObject(WrapProfileBufferRawPointer(mCoarseType));
-  aEntryWriter.WriteObject(mSize);
-  aEntryWriter.WriteObject(mInNursery);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> JsAllocationMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto typeName = aEntryReader.ReadObject<UniqueFreePtr<const char16_t>>();
-  auto className = aEntryReader.ReadObject<UniqueFreePtr<const char>>();
-  auto descriptiveTypeName =
-      aEntryReader.ReadObject<UniqueFreePtr<const char16_t>>();
-  auto coarseType = aEntryReader.ReadObject<const char*>();
-  auto size = aEntryReader.ReadObject<uint64_t>();
-  auto inNursery = aEntryReader.ReadObject<bool>();
-  return UniquePtr<ProfilerMarkerPayload>(new JsAllocationMarkerPayload(
-      std::move(props), std::move(typeName), std::move(className),
-      std::move(descriptiveTypeName), coarseType, size, inNursery));
-}
-
-void JsAllocationMarkerPayload::StreamPayload(
-    SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime,
-    UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("JS allocation", aWriter, aProcessStartTime, aUniqueStacks);
-
-  if (mClassName) {
-    aWriter.StringProperty("className", MakeStringSpan(mClassName.get()));
-  }
-  if (mTypeName) {
-    aWriter.StringProperty("typeName", NS_ConvertUTF16toUTF8(mTypeName.get()));
-  }
-  if (mDescriptiveTypeName) {
-    aWriter.StringProperty("descriptiveTypeName",
-                           NS_ConvertUTF16toUTF8(mDescriptiveTypeName.get()));
-  }
-  aWriter.StringProperty("coarseType", MakeStringSpan(mCoarseType));
-  aWriter.IntProperty("size", mSize);
-  aWriter.BoolProperty("inNursery", mInNursery);
-}
-
-ProfileBufferEntryWriter::Length
-NativeAllocationMarkerPayload::TagAndSerializationBytes() const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mSize, mThreadId, mMemoryAddress);
-}
-
-void NativeAllocationMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mSize);
-  aEntryWriter.WriteObject(mMemoryAddress);
-  aEntryWriter.WriteObject(mThreadId);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> NativeAllocationMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto size = aEntryReader.ReadObject<int64_t>();
-  auto memoryAddress = aEntryReader.ReadObject<uintptr_t>();
-  auto threadId = aEntryReader.ReadObject<int>();
-  return UniquePtr<ProfilerMarkerPayload>(new NativeAllocationMarkerPayload(
-      std::move(props), size, memoryAddress, threadId));
-}
-
-void NativeAllocationMarkerPayload::StreamPayload(
-    SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime,
-    UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("Native allocation", aWriter, aProcessStartTime,
-                    aUniqueStacks);
-  aWriter.IntProperty("size", mSize);
-  aWriter.IntProperty("memoryAddress", static_cast<int64_t>(mMemoryAddress));
-  aWriter.IntProperty("threadId", mThreadId);
-}
-
-ProfileBufferEntryWriter::Length IPCMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mOtherPid, mMessageSeqno,
-                                            mMessageType, mSide, mDirection,
-                                            mPhase, mSync);
-}
-
-void IPCMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mOtherPid);
-  aEntryWriter.WriteObject(mMessageSeqno);
-  aEntryWriter.WriteObject(mMessageType);
-  aEntryWriter.WriteObject(mSide);
-  aEntryWriter.WriteObject(mDirection);
-  aEntryWriter.WriteObject(mPhase);
-  aEntryWriter.WriteObject(mSync);
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> IPCMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto otherPid = aEntryReader.ReadObject<int32_t>();
-  auto messageSeqno = aEntryReader.ReadObject<int32_t>();
-  auto messageType = aEntryReader.ReadObject<IPC::Message::msgid_t>();
-  auto side = aEntryReader.ReadObject<ipc::Side>();
-  auto direction = aEntryReader.ReadObject<ipc::MessageDirection>();
-  auto phase = aEntryReader.ReadObject<ipc::MessagePhase>();
-  auto sync = aEntryReader.ReadObject<bool>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new IPCMarkerPayload(std::move(props), otherPid, messageSeqno,
-                           messageType, side, direction, phase, sync));
-}
-
-static Span<const char> IPCSideToString(ipc::Side aSide) {
-  switch (aSide) {
-    case ipc::ParentSide:
-      return MakeStringSpan("parent");
-    case ipc::ChildSide:
-      return MakeStringSpan("child");
-    case ipc::UnknownSide:
-      return MakeStringSpan("unknown");
-    default:
-      MOZ_ASSERT_UNREACHABLE("Invalid IPC side");
-      return MakeStringSpan("<invalid IPC side>");
-  }
-}
-
-static Span<const char> IPCPhaseToString(ipc::MessagePhase aPhase) {
-  switch (aPhase) {
-    case ipc::MessagePhase::Endpoint:
-      return MakeStringSpan("endpoint");
-    case ipc::MessagePhase::TransferStart:
-      return MakeStringSpan("transferStart");
-    case ipc::MessagePhase::TransferEnd:
-      return MakeStringSpan("transferEnd");
-    default:
-      MOZ_ASSERT_UNREACHABLE("Invalid IPC phase");
-      return MakeStringSpan("<invalid IPC phase>");
-  }
-}
-
-void IPCMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                     const TimeStamp& aProcessStartTime,
-                                     UniqueStacks& aUniqueStacks) const {
-  using namespace mozilla::ipc;
-  StreamCommonProps("IPC", aWriter, aProcessStartTime, aUniqueStacks);
-
-  // This payload still streams a startTime and endTime property because it made
-  // the migration to MarkerTiming on the front-end easier.
-  StreamStartEndTime(aWriter, aProcessStartTime);
-
-  aWriter.IntProperty("otherPid", mOtherPid);
-  aWriter.IntProperty("messageSeqno", mMessageSeqno);
-  aWriter.StringProperty(
-      "messageType",
-      MakeStringSpan(IPC::StringFromIPCMessageType(mMessageType)));
-  aWriter.StringProperty("side", IPCSideToString(mSide));
-  aWriter.StringProperty("direction", mDirection == MessageDirection::eSending
-                                          ? MakeStringSpan("sending")
-                                          : MakeStringSpan("receiving"));
-  aWriter.StringProperty("phase", IPCPhaseToString(mPhase));
-  aWriter.BoolProperty("sync", mSync);
-}
diff -Nru firefox-84.0.2+build1/tools/profiler/core/ProfilerMarkers.cpp firefox-85.0+build1/tools/profiler/core/ProfilerMarkers.cpp
--- firefox-84.0.2+build1/tools/profiler/core/ProfilerMarkers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/ProfilerMarkers.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,32 @@
+/* -*- 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/ProfilerMarkers.h"
+
+template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer(
+    mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&,
+    const mozilla::MarkerCategory&, mozilla::MarkerOptions&&,
+    mozilla::baseprofiler::markers::NoPayload);
+
+template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer(
+    mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&,
+    const mozilla::MarkerCategory&, mozilla::MarkerOptions&&,
+    mozilla::baseprofiler::markers::TextMarker, const std::string&);
+
+template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker,
+    const std::string&);
+
+template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker,
+    const nsCString&);
+
+template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::Tracing,
+    const mozilla::ProfilerString8View&);
diff -Nru firefox-84.0.2+build1/tools/profiler/core/RegisteredThread.cpp firefox-85.0+build1/tools/profiler/core/RegisteredThread.cpp
--- firefox-84.0.2+build1/tools/profiler/core/RegisteredThread.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/RegisteredThread.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,19 @@
 
 #include "RegisteredThread.h"
 
+#include "js/AllocationRecording.h"
+#include "js/ProfilingStack.h"
+#include "js/TraceLoggerAPI.h"
+
+RacyRegisteredThread::RacyRegisteredThread(int aThreadId)
+    : mProfilingStackOwner(
+          mozilla::MakeNotNull<RefPtr<mozilla::ProfilingStackOwner>>()),
+      mThreadId(aThreadId),
+      mSleep(AWAKE),
+      mIsBeingProfiled(false) {
+  MOZ_COUNT_CTOR(RacyRegisteredThread);
+}
+
 RegisteredThread::RegisteredThread(ThreadInfo* aInfo, nsIThread* aThread,
                                    void* aStackTop)
     : mRacyRegisteredThread(aInfo->ThreadId()),
@@ -37,7 +50,6 @@
   // Measurement of the following members may be added later if DMD finds it
   // is worthwhile:
   // - mPlatformData
-  // - mRacyRegisteredThread.mPendingMarkers
   //
   // The following members are not measured:
   // - mThreadInfo: because it is non-owning
@@ -62,3 +74,56 @@
   aDelay = mozilla::TimeDuration();
   aRunning = mozilla::TimeDuration();
 }
+
+void RegisteredThread::SetJSContext(JSContext* aContext) {
+  // This function runs on-thread.
+
+  MOZ_ASSERT(aContext && !mContext);
+
+  mContext = aContext;
+
+  // We give the JS engine a non-owning reference to the ProfilingStack. It's
+  // important that the JS engine doesn't touch this once the thread dies.
+  js::SetContextProfilingStack(aContext,
+                               &RacyRegisteredThread().ProfilingStack());
+}
+
+void RegisteredThread::PollJSSampling() {
+  // This function runs on-thread.
+
+  // We can't start/stop profiling until we have the thread's JSContext.
+  if (mContext) {
+    // It is possible for mJSSampling to go through the following sequences.
+    //
+    // - INACTIVE, ACTIVE_REQUESTED, INACTIVE_REQUESTED, INACTIVE
+    //
+    // - ACTIVE, INACTIVE_REQUESTED, ACTIVE_REQUESTED, ACTIVE
+    //
+    // Therefore, the if and else branches here aren't always interleaved.
+    // This is ok because the JS engine can handle that.
+    //
+    if (mJSSampling == ACTIVE_REQUESTED) {
+      mJSSampling = ACTIVE;
+      js::EnableContextProfilingStack(mContext, true);
+      if (JSTracerEnabled()) {
+        JS::StartTraceLogger(mContext);
+      }
+      if (JSAllocationsEnabled()) {
+        // TODO - This probability should not be hardcoded. See Bug 1547284.
+        JS::EnableRecordingAllocations(mContext,
+                                       profiler_add_js_allocation_marker, 0.01);
+      }
+      js::RegisterContextProfilingEventMarker(mContext, profiler_add_js_marker);
+
+    } else if (mJSSampling == INACTIVE_REQUESTED) {
+      mJSSampling = INACTIVE;
+      js::EnableContextProfilingStack(mContext, false);
+      if (JSTracerEnabled()) {
+        JS::StopTraceLogger(mContext);
+      }
+      if (JSAllocationsEnabled()) {
+        JS::DisableRecordingAllocations(mContext);
+      }
+    }
+  }
+}
diff -Nru firefox-84.0.2+build1/tools/profiler/core/RegisteredThread.h firefox-85.0+build1/tools/profiler/core/RegisteredThread.h
--- firefox-84.0.2+build1/tools/profiler/core/RegisteredThread.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/RegisteredThread.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,17 +7,18 @@
 #ifndef RegisteredThread_h
 #define RegisteredThread_h
 
-#include "GeckoProfiler.h"
 #include "platform.h"
 #include "ThreadInfo.h"
 
-#include "js/TraceLoggerAPI.h"
-#include "jsapi.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/RefPtr.h"
 #include "nsIEventTarget.h"
 #include "nsIThread.h"
 
+namespace mozilla {
+class ProfilingStackOwner;
+}
+
 // This class contains the state for a single thread that is accessible without
 // protection from gPSMutex in platform.cpp. Because there is no external
 // protection against data races, it must provide internal protection. Hence
@@ -25,14 +26,7 @@
 //
 class RacyRegisteredThread final {
  public:
-  explicit RacyRegisteredThread(int aThreadId)
-      : mProfilingStackOwner(
-            mozilla::MakeNotNull<RefPtr<mozilla::ProfilingStackOwner>>()),
-        mThreadId(aThreadId),
-        mSleep(AWAKE),
-        mIsBeingProfiled(false) {
-    MOZ_COUNT_CTOR(RacyRegisteredThread);
-  }
+  explicit RacyRegisteredThread(int aThreadId);
 
   MOZ_COUNTED_DTOR(RacyRegisteredThread)
 
@@ -177,18 +171,7 @@
 
   // Set the JSContext of the thread to be sampled. Sampling cannot begin until
   // this has been set.
-  void SetJSContext(JSContext* aContext) {
-    // This function runs on-thread.
-
-    MOZ_ASSERT(aContext && !mContext);
-
-    mContext = aContext;
-
-    // We give the JS engine a non-owning reference to the ProfilingStack. It's
-    // important that the JS engine doesn't touch this once the thread dies.
-    js::SetContextProfilingStack(aContext,
-                                 &RacyRegisteredThread().ProfilingStack());
-  }
+  void SetJSContext(JSContext* aContext);
 
   void ClearJSContext() {
     // This function runs on-thread.
@@ -224,46 +207,7 @@
   }
 
   // Poll to see if JS sampling should be started/stopped.
-  void PollJSSampling() {
-    // This function runs on-thread.
-
-    // We can't start/stop profiling until we have the thread's JSContext.
-    if (mContext) {
-      // It is possible for mJSSampling to go through the following sequences.
-      //
-      // - INACTIVE, ACTIVE_REQUESTED, INACTIVE_REQUESTED, INACTIVE
-      //
-      // - ACTIVE, INACTIVE_REQUESTED, ACTIVE_REQUESTED, ACTIVE
-      //
-      // Therefore, the if and else branches here aren't always interleaved.
-      // This is ok because the JS engine can handle that.
-      //
-      if (mJSSampling == ACTIVE_REQUESTED) {
-        mJSSampling = ACTIVE;
-        js::EnableContextProfilingStack(mContext, true);
-        if (JSTracerEnabled()) {
-          JS::StartTraceLogger(mContext);
-        }
-        if (JSAllocationsEnabled()) {
-          // TODO - This probability should not be hardcoded. See Bug 1547284.
-          JS::EnableRecordingAllocations(
-              mContext, profiler_add_js_allocation_marker, 0.01);
-        }
-        js::RegisterContextProfilingEventMarker(mContext,
-                                                profiler_add_js_marker);
-
-      } else if (mJSSampling == INACTIVE_REQUESTED) {
-        mJSSampling = INACTIVE;
-        js::EnableContextProfilingStack(mContext, false);
-        if (JSTracerEnabled()) {
-          JS::StopTraceLogger(mContext);
-        }
-        if (JSAllocationsEnabled()) {
-          JS::DisableRecordingAllocations(mContext);
-        }
-      }
-    }
-  }
+  void PollJSSampling();
 
  private:
   class RacyRegisteredThread mRacyRegisteredThread;
diff -Nru firefox-84.0.2+build1/tools/profiler/core/shared-libraries-linux.cc firefox-85.0+build1/tools/profiler/core/shared-libraries-linux.cc
--- firefox-84.0.2+build1/tools/profiler/core/shared-libraries-linux.cc	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/core/shared-libraries-linux.cc	2021-01-18 19:58:27.000000000 +0000
@@ -16,6 +16,7 @@
 #include <fstream>
 #include "platform.h"
 #include "shared-libraries.h"
+#include "GeckoProfiler.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/Unused.h"
 #include "nsDebug.h"
diff -Nru firefox-84.0.2+build1/tools/profiler/docs/buffer.rst firefox-85.0+build1/tools/profiler/docs/buffer.rst
--- firefox-84.0.2+build1/tools/profiler/docs/buffer.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/docs/buffer.rst	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,70 @@
+Buffers and Memory Management
+=============================
+
+In a post-Fission world, precise memory management across many threads and processes is
+especially important. In order for the profiler to achieve this, it uses a chunked buffer
+strategy.
+
+The `ProfileBuffer`_ is the overall buffer class that controls the memory and storage
+for the profile, it allows allocating objects into it. This can be used freely
+by things like markers and samples to store data as entries, without needing to know
+about the general strategy for how the memory is managed.
+
+The `ProfileBuffer`_ is then backed by the `ProfileChunkedBuffer`_. This specialized
+buffer grows incrementally, by allocating additional `ProfileBufferChunk`_ objects.
+More and more chunks will be allocated until a memory limit is reached, where they will
+be released. After releasing, the chunk will either be recycled or freed.
+
+The limiting of memory usage is coordinated by the `ProfilerParent`_ in the parent
+process. The `ProfilerParent`_ and `ProfilerChild`_ exchange IPC messages with information
+about how much memory is being used.  When the maximum byte threshold is passed,
+the ProfileChunkManager in the parent process removes the oldest chunk, and then the
+`ProfilerParent`_ sends a `DestroyReleasedChunksAtOrBefore`_ message to all of child
+processes so that the oldest chunks in the profile are released. This helps long profiles
+to keep having data in a similar time frame.
+
+Profile Buffer Terminology
+##########################
+
+ProfilerParent
+  The main profiler machinery is installed in the parent process. It uses IPC to
+  communicate to the child processes. The PProfiler is the actor which is used
+  to communicate across processes to coordinate things. See `ProfilerParent.h`_. The
+  ProfilerParent uses the DestroyReleasedChunksAtOrBefore meessage to control the
+  overall chunk limit.
+
+ProfilerChild
+  ProfilerChild is installed in every child process, it will receive requests from
+  DestroyReleasedChunksAtOrBefore.
+
+Entry
+  This is an individual entry in the `ProfileBuffer.h`_,. These entry sizes are not
+  related to the chunks sizes. An individual entry can straddle two different chunks.
+  An entry can contain various pieces of data, like markers, samples, and stacks.
+
+Chunk
+  An arbitrary sized chunk of memory, managed by the `ProfileChunkedBuffer`_, and
+  IPC calls from the ProfilerParent.
+
+Unreleased Chunk
+  This chunk is currently being used to write entries into.
+
+Released chunk
+  This chunk is full of data. When memory limits happen, it can either be recycled
+  or freed.
+
+Recycled chunk
+  This is a chunk that was previously written into, and full. When memory limits occur,
+  rather than freeing the memory, it is re-used as the next chunk.
+
+.. _ProfileChunkedBuffer: https://searchfox.org/mozilla-central/search?q=ProfileChunkedBuffer&path=&case=true&regexp=false
+.. _ProfileChunkManager: https://searchfox.org/mozilla-central/search?q=ProfileBufferChunkManager.h&path=&case=true&regexp=false
+.. _ProfileBufferChunk: https://searchfox.org/mozilla-central/search?q=ProfileBufferChunk&path=&case=true&regexp=false
+.. _ProfileBufferChunkManagerWithLocalLimit: https://searchfox.org/mozilla-central/search?q=ProfileBufferChunkManagerWithLocalLimit&case=true&path=
+.. _ProfilerParent.h: https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerParent.h
+.. _ProfilerChild.h: https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerChild.h
+.. _ProfileBuffer.h: https://searchfox.org/mozilla-central/source/tools/profiler/core/ProfileBuffer.h
+.. _ProfileBuffer: https://searchfox.org/mozilla-central/search?q=ProfileBuffer&path=&case=true&regexp=false
+.. _ProfilerParent: https://searchfox.org/mozilla-central/search?q=ProfilerParent&path=&case=true&regexp=false
+.. _ProfilerChild: https://searchfox.org/mozilla-central/search?q=ProfilerChild&path=&case=true&regexp=false
+.. _DestroyReleasedChunksAtOrBefore: https://searchfox.org/mozilla-central/search?q=DestroyReleasedChunksAtOrBefore&path=&case=true&regexp=false
diff -Nru firefox-84.0.2+build1/tools/profiler/docs/index.rst firefox-85.0+build1/tools/profiler/docs/index.rst
--- firefox-84.0.2+build1/tools/profiler/docs/index.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/docs/index.rst	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,36 @@
+Gecko Profiler
+==============
+
+The Firefox Profiler is the collection of tools used to profile Firefox. This is backed
+by the Gecko Profiler, which is the primarily C++ component that instruments Gecko. It
+is configurable, and supports a variety of data sources and recording modes. Primarily,
+it is used as a stastical profiler, where the execution of threads that have been
+registered with the profile is paused, and a sample is taken. Generally, this includes
+a stackwalk with combined native stack frame, JavaScript stack frames, and custom stack
+frame labels.
+
+In addition to the sampling, the profiler can collect markers, which are collected
+deterministically (as opposed to statistically, like samples). These include some
+kind of text description, and optionally a payload with more information.
+
+This documentation serves to document the Gecko Profiler and Base Profiler components,
+while the profiler.firefox.com interface is documented at `profiler.firefox.com/docs/ <https://profiler.firefox.com/docs/>`_
+
+.. toctree::
+   :maxdepth: 1
+
+   buffer
+   instrumenting-javascript
+   markers-guide
+   memory
+
+The following areas still need documentation:
+
+ * LUL
+ * Instrumenting Java
+ * Instrumenting Rust
+ * Registering Threads
+ * Samples and Stack Walking
+ * Triggering Gecko Profiles in Automation
+ * JS Tracer
+ * Serialization
diff -Nru firefox-84.0.2+build1/tools/profiler/docs/instrumenting-javascript.rst firefox-85.0+build1/tools/profiler/docs/instrumenting-javascript.rst
--- firefox-84.0.2+build1/tools/profiler/docs/instrumenting-javascript.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/docs/instrumenting-javascript.rst	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,55 @@
+Instrumenting JavaScript
+========================
+
+There are multiple ways to use the profiler with JavaScript. There is the "JavaScript"
+profiler feature (via about:profiling), which enables stack walking for JavaScript code.
+This is most likely turned on already for every profiler preset.
+
+In addition, markers can be created to specifically marker an instant in time, or a
+duration. This can be helpful to make sense of a particular piece of the front-end,
+or record events that normally wouldn't show up in samples.
+
+Markers in Browser Chrome
+*************************
+
+If you have access to ChromeUtils, then adding a marker is relatively easily.
+
+.. code-block:: javascript
+
+  // Add an instant marker, representing a single point in time
+  ChromeUtils.addProfilerMarker("MarkerName");
+
+  // Add a duration marker, representing a span of time.
+  const startTime = Cu.now();
+  doWork();
+  ChromeUtils.addProfilerMarker("MarkerName", startTime);
+
+  // Add a duration marker, representing a span of time, with some additional tex
+  const startTime = Cu.now();
+  doWork();
+  ChromeUtils.addProfilerMarker("MarkerName", startTime, "Details about this event");
+
+  // Add an instant marker, with some additional tex
+  const startTime = Cu.now();
+  doWork();
+  ChromeUtils.addProfilerMarker("MarkerName", undefined, "Details about this event");
+
+Markers in Content Code
+***********************
+
+If instrumenting content code, then the `UserTiming`_ API is the best bet.
+:code:`performance.mark` will create an instant marker, and a :code:`performance.measure`
+will create a duration marker. These markers will show up under UserTiming in
+the profiler UI.
+
+.. code-block:: javascript
+
+  // Create an instant marker.
+  performance.mark("InstantMarkerName");
+
+  doWork();
+
+  // Measuring with the performance API will also create duration markers.
+  performance.measure("DurationMarkerName", "InstantMarkerName");
+
+.. _UserTiming: https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
diff -Nru firefox-84.0.2+build1/tools/profiler/docs/markers-guide.rst firefox-85.0+build1/tools/profiler/docs/markers-guide.rst
--- firefox-84.0.2+build1/tools/profiler/docs/markers-guide.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/docs/markers-guide.rst	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,477 @@
+Markers
+=======
+
+Markers are packets of arbitrary data that are added to a profile by the Firefox code, usually to
+indicate something important happening at a point in time, or during an interval of time.
+
+Each marker has a name, a category, some common optional information (timing, backtrace, etc.),
+and an optional payload of a specific type (containing arbitrary data relevant to that type).
+
+
+Example
+-------
+
+Short example, details below.
+
+Note: Most marker-related identifiers are in the ``mozilla`` namespace, to be added where necessary.
+
+.. code-block:: c++
+
+    // Record a simple marker with the category of DOM.
+    PROFILER_MARKER_UNTYPED("Marker Name", DOM);
+
+    // Create a marker with some additional text information. (Be wary of printf!)
+    PROFILER_MARKER_TEXT("Marker Name", JS, MarkerOptions{}, "Additional text information.");
+
+    // Record a custom marker of type `ExampleNumberMarker` (see definition below).
+    PROFILER_MARKER("Number", OTHER, MarkerOptions{}, ExampleNumberMarker, 42);
+
+.. code-block:: c++
+
+    // Marker type definition.
+    struct ExampleNumberMarker {
+      // Unique marker type name.
+      static constexpr Span<const char> MarkerTypeName() { return MakeStringSpan("number"); }
+      // Data specific to this marker type, serialized to JSON for profiler.firefox.com.
+      static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter, int aNumber) {
+        aWriter.IntProperty("number", aNumber);
+      }
+      // Where and how to display the marker and its data.
+      static MarkerSchema MarkerTypeDisplay() {
+        using MS = MarkerSchema;
+        MS schema(MS::Location::markerChart, MS::Location::markerTable);
+        schema.SetChartLabel("Number: {marker.data.number}");
+        schema.AddKeyLabelFormat("number", "Number", MS::Format::number);
+        return schema;
+      }
+    };
+
+
+How to Record Markers
+---------------------
+
+Header to Include
+^^^^^^^^^^^^^^^^^
+
+If the compilation unit only defines and records untyped, text, and/or its own markers, include
+`the main profiler markers header <https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerMarkers.h>`_:
+
+.. code-block:: c++
+
+    #include "mozilla/ProfilerMarkers.h"
+
+If it also records one of the other common markers defined in
+`ProfilerMarkerTypes.h <https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerMarkerTypes.h>`_,
+include that one instead:
+
+.. code-block:: c++
+
+    #include "mozilla/ProfilerMarkerTypes.h"
+
+And if it uses any other profiler functions (e.g., labels), use
+`the main Gecko Profiler header <https://searchfox.org/mozilla-central/source/tools/profiler/public/GeckoProfiler.h>`_
+instead:
+
+.. code-block:: c++
+
+    #include "GeckoProfiler.h"
+
+The above works from source files that end up in libxul, which is true for the majority
+of Firefox source code. But some files live outside of libxul, such as mfbt, in which
+case the advice is the same but the equivalent headers are from the Base Profiler instead:
+
+.. code-block:: c++
+
+    #include "mozilla/BaseProfilerMarkers.h" // Only own/untyped/text markers
+    #include "mozilla/BaseProfilerMarkerTypes.h" // Only common markers
+    #include "BaseProfiler.h" // Markers and other profiler functions
+
+Untyped Markers
+^^^^^^^^^^^^^^^
+
+Untyped markers don't carry any information apart from common marker data:
+Name, category, options.
+
+.. code-block:: c++
+
+    PROFILER_MARKER_UNTYPED(
+        // Name, and category pair.
+        "Marker Name", OTHER,
+        // Marker options, may be omitted if all defaults are acceptable.
+        MarkerOptions(MarkerStack::Capture(), ...));
+
+``PROFILER_MARKER_UNTYPED`` is a macro that simplifies the use of the main
+``profiler_add_marker`` function, by adding the appropriate namespaces, and a surrounding
+``#ifdef MOZ_GECKO_PROFILER`` guard.
+
+1. Marker name
+    The first argument is the name of this marker. This will be displayed in most places
+    the marker is shown. It can be a literal C string, or any dynamic string object.
+2. `Category pair name <https://searchfox.org/mozilla-central/define?q=M_174bb0de187ee7d9>`_
+    Choose a category + subcategory from the `the list of categories <https://searchfox.org/mozilla-central/define?q=M_174bb0de187ee7d9>`_.
+    This is the second parameter of each ``SUBCATEGORY`` line, for instance ``LAYOUT_Reflow``.
+    (Internally, this is really a `MarkerCategory <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerCategory>`_
+    object, in case you need to construct it elsewhere.)
+3. `MarkerOptions <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerOptions>`_
+    See the options below. It can be omitted if there are no other arguments, ``{}``, or
+    ``MarkerOptions()`` (no specified options); only one of the following option types
+    alone; or ``MarkerOptions(...)`` with one or more of the following options types:
+
+    * `MarkerThreadId <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerThreadId>`_
+        Rarely used, as it defaults to the current thread. Otherwise it specifies the target
+        "thread id" (aka "track") where the marker should appear; This may be useful when
+        referring to something that happened on another thread (use ``profiler_current_thread_id()``
+        from the original thread to get its id); or for some important markers, they may be
+        sent to the "main thread", which can be specified with ``MarkerThreadId::MainThread()``.
+    * `MarkerTiming <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerTiming>`_
+        This specifies an instant or interval of time. It defaults to the current instant if
+        left unspecified. Otherwise use ``MarkerTiming::InstantAt(timestamp)`` or
+        ``MarkerTiming::Interval(ts1, ts2)``; timestamps are usually captured with
+        ``TimeStamp::Now()``. It is also possible to record only the start or the end of an
+        interval, pairs of start/end markers will be matched by their name. *Note: The
+        upcoming "marker sets" feature will make this pairing more reliable, and also
+        allow more than two markers to be connected*.
+    * `MarkerStack <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerStack>`_
+        By default, markers do not record a "stack" (or "backtrace"). To record a stack at
+        this point, in the most efficient manner, specify ``MarkerStack::Capture()``. To
+        record a previously captured stack, first store a stack into a
+        ``UniquePtr<ProfileChunkedBuffer>`` with ``profiler_capture_backtrace()``, then pass
+        it to the marker with ``MarkerStack::TakeBacktrace(std::move(stack))``.
+    * `MarkerInnerWindowId <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerInnerWindowId>`_
+        If you have access to an "inner window id", consider specifying it as an option, to
+        help profiler.firefox.com to classify them by tab.
+
+Text Markers
+^^^^^^^^^^^^
+
+Text markers are very common, they carry an extra text as a fourth argument, in addition to
+the marker name. Use the following macro:
+
+.. code-block:: c++
+
+    PROFILER_MARKER_TEXT(
+        // Name, category pair, options.
+        "Marker Name", OTHER, {},
+        // Text string.
+        "Here are some more details."
+    );
+
+As useful as it is, using an expensive ``printf`` operation to generate a complex text
+comes with a variety of issues string. It can leak potentially sensitive information
+such as URLs can be leaked during the profile sharing step. profiler.firefox.com cannot
+access the information programmatically. It won't get the formatting benefits of the
+built-in marker schema. Please consider using a custom marker type to separate and
+better present the data.
+
+Other Typed Markers
+^^^^^^^^^^^^^^^^^^^
+
+From C++ code, a marker of some type ``YourMarker`` (details about type definition follow) can be
+recorded like this:
+
+.. code-block:: c++
+
+    PROFILER_MARKER(
+        "YourMarker name", OTHER,
+        MarkerOptions(MarkerTiming::IntervalUntilNowFrom(someStartTimestamp),
+                      MarkerInnerWindowId(innerWindowId))),
+        YourMarker, "some string", 12345, "http://example.com", someTimeStamp);
+
+After the first three common arguments (like in ``PROFILER_MARKER_UNTYPED``), there are:
+
+4. The marker type, which is the name of the C++ ``struct`` that defines that type.
+5. A variadic list of type-specific argument. They must match the number of, and must
+   be convertible to, ``StreamJSONMarkerData`` parameters as specified in the marker type definition.
+
+"Auto" Scoped Interval Markers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To capture time intervals around some important operations, it is common to store a timestamp, do the work,
+and then record a marker, e.g.:
+
+.. code-block:: c++
+
+    void DoTimedWork() {
+      TimeStamp start = TimeStamp::Now();
+      DoWork();
+      PROFILER_MARKER_TEXT("Timed work", OTHER, MarkerTiming::IntervalUntilNowFrom(start), "Details");
+    }
+
+`RAII <https://en.cppreference.com/w/cpp/language/raii>`_ objects automate this, by recording the time
+when the object is constructed, and later recording the marker when the object is destroyed at the end
+of its C++ scope.
+This is especially useful if there are multiple scope exit points.
+
+``AUTO_PROFILER_MARKER_TEXT`` is `the only one implemented <https://searchfox.org/mozilla-central/define?q=M_ac7b392646edf5a5>`_ at this time.
+
+.. code-block:: c++
+
+    void MaybeDoTimedWork(bool aDoIt) {
+      AUTO_PROFILER_MARKER_TEXT("Timed work", OTHER, "Details");
+      if (!aDoIt) { /* Marker recorded here... */ return; }
+      DoWork();
+      /* ... or here. */
+    }
+
+Note that these RAII objects only record one marker. In some situation, a very long
+operation could be missed if it hasn't completed by the end of the profiling session.
+In this case, consider recording two distinct markers, using
+``MarkerTiming::IntervalStart()`` and ``MarkerTiming::IntervalEnd()``.
+
+Where to Define New Marker Types
+--------------------------------
+
+The first step is to determine the location of the marker type definition:
+
+* If this type is only used in one function, or a component, it can be defined in a
+  local common place relative to its use.
+* For a more common type that could be used from multiple locations:
+
+  * If there is no dependency on XUL, it can be defined in the Base Profiler, which can
+    be used in most locations in the codebase:
+    `mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h <https://searchfox.org/mozilla-central/source/mozglue/baseprofiler/public/BaseProfilerMarkerTypes.h>`__
+
+  * However, if there is a XUL dependency, then it needs to be defined in the Gecko Profiler:
+    `tools/profiler/public/ProfilerMarkerTypes.h <https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerMarkerTypes.h>`__
+
+How to Define New Marker Types
+------------------------------
+
+Each marker type must be defined once and only once.
+The definition is a C++ ``struct``, its identifier is used when recording
+markers of that type in C++.
+By convention, the suffix "Marker" is recommended to better distinguish them
+from non-profiler entities in the source.
+
+.. code-block:: c++
+
+    struct YourMarker {
+
+Marker Type Name
+^^^^^^^^^^^^^^^^
+
+A marker type must have a unique name, it is used to keep track of the type of
+markers in the profiler storage, and to identify them uniquely on profiler.firefox.com.
+(It does not need to be the same as the ``struct``'s name.)
+
+This name is defined in a special static member function ``MarkerTypeName``:
+
+.. code-block:: c++
+
+    // …
+      static constexpr Span<const char> MarkerTypeName() {
+        return MakeStringSpan("YourMarker");
+      }
+
+Marker Type Data
+^^^^^^^^^^^^^^^^
+
+All markers of any type have some common data: A name, a category, options like
+timing, etc. as previously explained.
+
+In addition, a certain marker type may carry zero of more arbitrary pieces of
+information, and they are always the same for all markers of that type.
+
+These are defined in a special static member function ``StreamJSONMarkerData``.
+
+The first function parameters is always ``SpliceableJSONWriter& aWriter``,
+it will be used to stream the data as JSON, to later be read by
+profiler.firefox.com.
+
+.. code-block:: c++
+
+    // …
+      static void StreamJSONMarkerData(SpliceableJSONWriter& aWriter,
+
+The following function parameters is how the data is received as C++ objects
+from the call sites.
+
+* Most C/C++ `POD (Plain Old Data) <https://en.cppreference.com/w/cpp/named_req/PODType>`_
+  and `trivially-copyable <https://en.cppreference.com/w/cpp/named_req/TriviallyCopyable>`_
+  types should work as-is, including ``TimeStamp``.
+* Character strings should be passed using ``const ProfilerString8View&`` (this handles
+  literal strings, and various ``std::string`` and ``nsCString`` types, and spans with or
+  without null terminator). Use ``const ProfilerString16View&`` for 16-bit strings such as
+  ``nsString``.
+* Other types can be used if they define specializations for ``ProfileBufferEntryWriter::Serializer``
+  and ``ProfileBufferEntryReader::Deserializer``. You should rarely need to define new
+  ones, but if needed see how existing specializations are written, or contact the
+  `perf-tools team for help <https://chat.mozilla.org/#/room/#profiler:mozilla.org>`_.
+
+Passing by value or by reference-to-const is recommended, because arguments are serialized
+in binary form (i.e., there are no optimizable ``move`` operations).
+
+For example, here's how to handle a string, a 64-bit number, another string, and
+a timestamp:
+
+.. code-block:: c++
+
+    // …
+                                       const ProfilerString8View& aString,
+                                       const int64_t aBytes,
+                                       const ProfilerString8View& aURL,
+                                       const TimeStamp& aTime) {
+
+Then the body of the function turns these parameters into a JSON stream.
+
+When this function is called, the writer has just started a JSON object, so
+everything that is written should be a named object property. Use
+``SpliceableJSONWriter`` functions, in most cases ``...Property`` functions
+from its parent class ``JSONWriter``: ``NullProperty``, ``BoolProperty``,
+``IntProperty``, ``DoubleProperty``, ``StringProperty``. (Other nested JSON
+types like arrays or objects are not supported by the profiler.)
+
+As a special case, ``TimeStamps`` must be streamed using ``aWriter.TimeProperty(timestamp)``.
+
+The property names will be used to identify where each piece of data is stored and
+how it should be displayed on profiler.firefox.com (see next section).
+
+Here's how the above functions parameters could be streamed:
+
+.. code-block:: c++
+
+    // …
+        aWriter.StringProperty("myString", aString);
+        aWriter.IntProperty("myBytes", aBytes);
+        aWriter.StringProperty("myURL", aURL);
+        aWriter.TimeProperty("myTime", aTime);
+      }
+
+Marker Type Display Schema
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Now that we have defined how to stream type-specific data (from Firefox to
+profiler.firefox.com), we need to describe where and how this data will be
+displayed on profiler.firefox.com.
+
+The static member function ``MarkerTypeDisplay`` returns an opaque ``MarkerSchema``
+object, which will be forwarded to profiler.firefox.com.
+
+.. code-block:: c++
+
+    // …
+      static MarkerSchema MarkerTypeDisplay() {
+
+The ``MarkerSchema`` type will be used repeatedly, so for convenience we can define
+a local type alias:
+
+.. code-block:: c++
+
+    // …
+        using MS = MarkerSchema;
+
+First, we construct the ``MarkerSchema`` object to be returned at the end.
+
+One or more constructor arguments determine where this marker will be displayed in
+the profiler.firefox.com UI. See the `MarkerSchema::Location enumeration for the
+full list <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerSchema%3A%3ALocation>`_.
+
+Here is the most common set of locations, showing markers of that type in both the
+Marker Chart and the Marker Table panels:
+
+.. code-block:: c++
+
+    // …
+        MS schema(MS::Location::markerChart, MS::Location::markerTable);
+
+Some labels can optionally be specified, to display certain information in different
+locations: ``SetChartLabel``, ``SetTooltipLabel``, and ``SetTableLabel``; or
+``SetAllLabels`` to define all of them the same way.
+
+The arguments is a string that may refer to marker data within braces:
+
+* ``{marker.name}``: Marker name.
+* ``{marker.data.X}``: Type-specific data, as streamed with property name "X" from ``StreamJSONMarkerData`` (e.g., ``aWriter.IntProperty("X", aNumber);``
+
+For example, here's how to set the Marker Chart label to show the marker name and the
+``myBytes`` number of bytes:
+
+.. code-block:: c++
+
+    // …
+        schema.SetChartLabel("{marker.name} – {marker.data.myBytes}");
+
+profiler.firefox.com will apply the label with the data in a consistent manner. For
+example, with this label definition, it could display marker information like the
+following in the Firefox Profiler's Marker Chart:
+
+ * "Marker Name – 10B"
+ * "Marker Name – 25.204KB"
+ * "Marker Name – 512.54MB"
+
+For implementation details on this processing, see `src/profiler-logic/marker-schema.js <https://github.com/firefox-devtools/profiler/blob/main/src/profile-logic/marker-schema.js>`_
+in the profiler's front-end.
+
+Next, define the main display of marker data, which will appear in the Marker
+Chart tooltips and the Marker Table sidebar.
+
+Each row may either be:
+
+* A dynamic key-value pair, using one of the ``MarkerSchema::AddKey...`` functions. Each function is given:
+
+  * Key: Element property name as streamed in ``StreamJSONMarkerData``.
+  * Label: Optional prefix. Defaults to the key name.
+  * Format: How to format the data element value, see `MarkerSchema::Format for details <https://searchfox.org/mozilla-central/define?q=T_mozilla%3A%3AMarkerSchema%3A%3AFormat>`_.
+  * Searchable: Optional boolean, indicates if the value is used in searches, defaults to false.
+
+* Or a fixed label and value strings, using ``MarkerSchema::AddStaticLabelValue``.
+
+.. code-block:: c++
+
+    // …
+        schema.AddKeyLabelFormatSearchable(
+            "myString", "My String", MS::Format::string, true);
+        schema.AddKeyLabelFormat(
+            "myBytes", "My Bytes", MS::Format::bytes);
+        schema.AddKeyLabelFormat(
+            "myUrl", "My URL", MS::Format::url);
+        schema.AddKeyLabelFormat(
+            "myTime", "Event time", MS::Format::time);
+
+Finally the ``schema`` object is returned from the function:
+
+.. code-block:: c++
+
+    // …
+        return schema;
+      }
+
+Any other ``struct`` member function is ignored. There could be utility functions used by the above
+compulsory functions, to make the code clearer.
+
+And that is the end of the marker definition ``struct``.
+
+.. code-block:: c++
+
+    // …
+    };
+
+Performance Considerations
+--------------------------
+
+During profiling, it is best to reduce the amount of work spent doing profiler
+operations, as they can influence the performance of the code that you want to profile.
+
+Whenever possible, consider passing simple types to marker functions, such that
+``StreamJSONMarkerData`` will do the minimum amount of work necessary to serialize
+the marker type-specific arguments to its internal buffer representation. POD types
+(numbers) and strings are the easiest and cheapest to serialize. Look at the
+corresponding ``ProfileBufferEntryWriter::Serializer`` specializations if you
+want to better understand the work done.
+
+Avoid doing expensive operations when recording markers. E.g.: ``printf`` of
+different things into a string, or complex computations; instead pass the
+``printf``/computation arguments straight through to the marker function, so that
+``StreamJSONMarkerData`` can do the expensive work at the end of the profiling session.
+
+Marker Architecture Description
+-------------------------------
+
+The above sections should give all the information needed for adding your own marker
+types. However, if you are wanting to work on the marker architecture itself, this
+section will describe how the system works.
+
+TODO:
+ * Briefly describe the buffer and serialization.
+ * Describe the template strategy for generating marker types
+ * Describe the serialization and link to profiler front-end docs on marker processing (if they exist)
diff -Nru firefox-84.0.2+build1/tools/profiler/docs/memory.rst firefox-85.0+build1/tools/profiler/docs/memory.rst
--- firefox-84.0.2+build1/tools/profiler/docs/memory.rst	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/docs/memory.rst	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,46 @@
+Profiling Memory
+================
+
+Sampling stacks from native allocations
+---------------------------------------
+
+The profiler can sample allocations and de-allocations from malloc using the
+"Native Allocations" feature. This can be enabled by going to `about:profiling` and
+enabling the "Native Allocations" checkbox. It is only available in Nightly, as it
+uses a technique of hooking into malloc that could be a little more risky to apply to
+the broader population of Firefox users.
+
+This implementation is located in: `tools/profiler/core/memory_hooks.cpp
+<https://searchfox.org/mozilla-central/source/tools/profiler/core/memory_hooks.cpp>`_
+
+It works by hooking into all of the malloc calls. When the profiler is running, it
+performs a `Bernoulli trial`_, that will pass for a given probability of per-byte
+allocated. What this means is that larger allocations have a higher chance of being
+recorded compared to smaller allocations. Currently, there is no way to configure
+the per-byte probability. This means that sampled allocation sizes will be closer
+to the actual allocated bytes.
+
+This infrastructure is quite similar to DMD, but with the additional motiviations of
+making it easy to turn on and use with the profiler. The overhead is quite high,
+especially on systems with more expensive stack walking, like Linux. Turning off
+thee "Native Stacks" feature can help lower overhead, but will give less information.
+
+For more information on analyzing these profiles, see the `Firefox Profiler docs`_.
+
+Memory counters
+---------------
+
+Similar to the Native Allocations feature, memory counters use the malloc memory hook
+that is only available in Nightly. When it's available, the memory counters are always
+turned on. This is a lightweight way to count in a very granular fashion how much
+memory is being allocated and deallocated during the profiling session.
+
+This information is then visualized in the `Firefox Profiler memory track`_.
+
+This feature uses the `Profiler Counters`_, which can be used to create other types
+of cheap counting instrumentation.
+
+.. _Bernoulli trial: https://en.wikipedia.org/wiki/Bernoulli_trial
+.. _Firefox Profiler docs: https://profiler.firefox.com/docs/#/./memory-allocations
+.. _Firefox Profiler memory track: https://profiler.firefox.com/docs/#/./memory-allocations?id=memory-track
+.. _Profiler Counters: https://searchfox.org/mozilla-central/source/tools/profiler/public/ProfilerCounts.h
diff -Nru firefox-84.0.2+build1/tools/profiler/gecko/ChildProfilerController.cpp firefox-85.0+build1/tools/profiler/gecko/ChildProfilerController.cpp
--- firefox-84.0.2+build1/tools/profiler/gecko/ChildProfilerController.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/gecko/ChildProfilerController.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 
 #include "ProfilerChild.h"
 
+#include "mozilla/ipc/Endpoint.h"
 #include "nsThreadUtils.h"
 
 using namespace mozilla::ipc;
diff -Nru firefox-84.0.2+build1/tools/profiler/gecko/nsProfiler.cpp firefox-85.0+build1/tools/profiler/gecko/nsProfiler.cpp
--- firefox-84.0.2+build1/tools/profiler/gecko/nsProfiler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/gecko/nsProfiler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -21,6 +21,7 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/TypedArray.h"
 #include "mozilla/Preferences.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIFileStreams.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
diff -Nru firefox-84.0.2+build1/tools/profiler/gecko/ProfilerChild.cpp firefox-85.0+build1/tools/profiler/gecko/ProfilerChild.cpp
--- firefox-84.0.2+build1/tools/profiler/gecko/ProfilerChild.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/gecko/ProfilerChild.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,7 +14,8 @@
 
 namespace mozilla {
 
-/* static */ StaticDataMutex<ProfilerChild::ProfilerChildAndUpdate>
+/* static */ DataMutexBase<ProfilerChild::ProfilerChildAndUpdate,
+                           baseprofiler::detail::BaseProfilerMutex>
     ProfilerChild::sPendingChunkManagerUpdate{
         "ProfilerChild::sPendingChunkManagerUpdate"};
 
@@ -101,6 +102,10 @@
       }));
 }
 
+/* static */ bool ProfilerChild::IsLockedOnCurrentThread() {
+  return sPendingChunkManagerUpdate.Mutex().IsLockedOnCurrentThread();
+}
+
 void ProfilerChild::SetupChunkManager() {
   mChunkManager = profiler_get_controlled_chunk_manager();
   if (NS_WARN_IF(!mChunkManager)) {
diff -Nru firefox-84.0.2+build1/tools/profiler/gecko/ProfilerParent.cpp firefox-85.0+build1/tools/profiler/gecko/ProfilerParent.cpp
--- firefox-84.0.2+build1/tools/profiler/gecko/ProfilerParent.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/gecko/ProfilerParent.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,9 +8,11 @@
 
 #include "nsProfiler.h"
 
+#include "mozilla/BaseProfilerDetail.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/DataMutex.h"
 #include "mozilla/IOInterposer.h"
+#include "mozilla/ipc/Endpoint.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/ProfileBufferControlledChunkManager.h"
 #include "mozilla/RefPtr.h"
@@ -39,6 +41,8 @@
       base::ProcessId aProcessId,
       ProfileBufferControlledChunkManager::Update&& aUpdate);
 
+  static bool IsLockedOnCurrentThread();
+
  private:
   void HandleChunkManagerNonFinalUpdate(
       base::ProcessId aProcessId,
@@ -54,9 +58,9 @@
     ProfileBufferControlledChunkManager::Update mPendingUpdate;
   };
 
-  DataMutex<ParentChunkManagerAndPendingUpdate>
-      mParentChunkManagerAndPendingUpdate{
-          "ProfileBufferGlobalController::mParentChunkManagerAndPendingUpdate"};
+  static DataMutexBase<ParentChunkManagerAndPendingUpdate,
+                       baseprofiler::detail::BaseProfilerMutex>
+      sParentChunkManagerAndPendingUpdate;
 
   size_t mUnreleasedTotalBytes = 0;
 
@@ -106,6 +110,12 @@
   TimeStampAndBytesAndPidArray mReleasedChunksByTime;
 };
 
+/* static */
+DataMutexBase<ProfileBufferGlobalController::ParentChunkManagerAndPendingUpdate,
+              baseprofiler::detail::BaseProfilerMutex>
+    ProfileBufferGlobalController::sParentChunkManagerAndPendingUpdate{
+        "ProfileBufferGlobalController::sParentChunkManagerAndPendingUpdate"};
+
 // This singleton class tracks live ProfilerParent's (meaning there's a current
 // connection with a child process).
 // It also knows when the local profiler is running.
@@ -168,7 +178,7 @@
 
   {
     auto lockedParentChunkManagerAndPendingUpdate =
-        mParentChunkManagerAndPendingUpdate.Lock();
+        sParentChunkManagerAndPendingUpdate.Lock();
     lockedParentChunkManagerAndPendingUpdate->mChunkManager =
         parentChunkManager;
   }
@@ -178,7 +188,7 @@
         MOZ_ASSERT(!aUpdate.IsNotUpdate(),
                    "Update callback should never be given a non-update");
         auto lockedParentChunkManagerAndPendingUpdate =
-            mParentChunkManagerAndPendingUpdate.Lock();
+            sParentChunkManagerAndPendingUpdate.Lock();
         if (aUpdate.IsFinal()) {
           // Final update of the parent.
           // We cannot keep the chunk manager, and there's no point handling
@@ -211,9 +221,10 @@
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
   // Extract the parent chunk manager (if still set).
   // This means any update after this will be ignored.
-  ProfileBufferControlledChunkManager* parentChunkManager = [this]() {
+  ProfileBufferControlledChunkManager* parentChunkManager = []() {
     auto lockedParentChunkManagerAndPendingUpdate =
-        mParentChunkManagerAndPendingUpdate.Lock();
+        sParentChunkManagerAndPendingUpdate.Lock();
+    lockedParentChunkManagerAndPendingUpdate->mPendingUpdate.Clear();
     return std::exchange(
         lockedParentChunkManagerAndPendingUpdate->mChunkManager, nullptr);
   }();
@@ -236,7 +247,7 @@
              "HandleChildChunkManagerUpdate should not be given a non-update");
 
   auto lockedParentChunkManagerAndPendingUpdate =
-      mParentChunkManagerAndPendingUpdate.Lock();
+      sParentChunkManagerAndPendingUpdate.Lock();
   if (!lockedParentChunkManagerAndPendingUpdate->mChunkManager) {
     // No chunk manager, ignore updates.
     return;
@@ -289,6 +300,11 @@
       *lockedParentChunkManagerAndPendingUpdate->mChunkManager);
 }
 
+/* static */
+bool ProfileBufferGlobalController::IsLockedOnCurrentThread() {
+  return sParentChunkManagerAndPendingUpdate.Mutex().IsLockedOnCurrentThread();
+}
+
 void ProfileBufferGlobalController::HandleChunkManagerNonFinalUpdate(
     base::ProcessId aProcessId,
     ProfileBufferControlledChunkManager::Update&& aUpdate,
@@ -614,6 +630,11 @@
       nsTArray<ProfileBufferChunkMetadata>{}};
 }
 
+/* static */
+bool ProfilerParent::IsLockedOnCurrentThread() {
+  return ProfileBufferGlobalController::IsLockedOnCurrentThread();
+}
+
 void ProfilerParent::RequestChunkManagerUpdate() {
   if (mDestroyed) {
     return;
diff -Nru firefox-84.0.2+build1/tools/profiler/moz.build firefox-85.0+build1/tools/profiler/moz.build
--- firefox-84.0.2+build1/tools/profiler/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -15,7 +15,6 @@
         "public/GeckoProfilerReporter.h",
         "public/ProfilerChild.h",
         "public/ProfilerCodeAddressService.h",
-        "public/ProfilerMarkerPayload.h",
         "public/ProfilerParent.h",
         "public/shared-libraries.h",
     ]
@@ -27,7 +26,7 @@
         "core/ProfiledThreadData.cpp",
         "core/ProfilerBacktrace.cpp",
         "core/ProfilerCodeAddressService.cpp",
-        "core/ProfilerMarkerPayload.cpp",
+        "core/ProfilerMarkers.cpp",
         "core/RegisteredThread.cpp",
         "gecko/ChildProfilerController.cpp",
         "gecko/nsProfilerStartParams.cpp",
@@ -173,6 +172,7 @@
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += [
         "-Wno-error=shadow",
+        "-Wno-error=stack-protector",
         "-Wno-ignored-qualifiers",  # due to use of breakpad headers
     ]
 
diff -Nru firefox-84.0.2+build1/tools/profiler/public/GeckoProfiler.h firefox-85.0+build1/tools/profiler/public/GeckoProfiler.h
--- firefox-84.0.2+build1/tools/profiler/public/GeckoProfiler.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/GeckoProfiler.h	2021-01-18 19:58:27.000000000 +0000
@@ -62,17 +62,6 @@
 #  define AUTO_PROFILER_LABEL_DYNAMIC_FAST(label, dynamicString, categoryPair, \
                                            ctx, flags)
 
-#  define PROFILER_ADD_MARKER_WITH_PAYLOAD(markerName, categoryPair, \
-                                           PayloadType, payloadArgs)
-
-#  define PROFILER_TRACING_MARKER(categoryString, markerName, categoryPair, \
-                                  kind)
-#  define PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName, \
-                                           categoryPair, kind, docshell)
-#  define AUTO_PROFILER_TRACING_MARKER(categoryString, markerName, categoryPair)
-#  define AUTO_PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName, \
-                                                categoryPair, docShell)
-
 // Function stubs for when MOZ_GECKO_PROFILER is not defined.
 
 // This won't be used, it's just there to allow the empty definition of
@@ -98,11 +87,9 @@
 
 #else  // !MOZ_GECKO_PROFILER
 
-#  include "js/AllocationRecording.h"
-#  include "js/ProfilingFrameIterator.h"
+#  include "js/ProfilingCategory.h"
 #  include "js/ProfilingStack.h"
 #  include "js/RootingAPI.h"
-#  include "js/TypeDecls.h"
 #  include "mozilla/Assertions.h"
 #  include "mozilla/Atomics.h"
 #  include "mozilla/Attributes.h"
@@ -120,7 +107,12 @@
 
 class ProfilerBacktrace;
 class ProfilerCodeAddressService;
-class ProfilerMarkerPayload;
+struct JSContext;
+
+namespace JS {
+struct RecordAllocationInfo;
+}
+
 namespace mozilla {
 class ProfileBufferControlledChunkManager;
 class ProfileChunkedBuffer;
@@ -740,17 +732,17 @@
   // Buffer capacity in number of 8-byte entries.
   uint32_t mEntryCount;
   // Sampling stats: Interval between successive samplings.
-  ProfilerStats mIntervalsNs;
+  ProfilerStats mIntervalsUs;
   // Sampling stats: Total sampling duration. (Split detail below.)
-  ProfilerStats mOverheadsNs;
+  ProfilerStats mOverheadsUs;
   // Sampling stats: Time to acquire the lock before sampling.
-  ProfilerStats mLockingsNs;
+  ProfilerStats mLockingsUs;
   // Sampling stats: Time to discard expired data.
-  ProfilerStats mCleaningsNs;
+  ProfilerStats mCleaningsUs;
   // Sampling stats: Time to collect counter data.
-  ProfilerStats mCountersNs;
+  ProfilerStats mCountersUs;
   // Sampling stats: Time to sample thread stacks.
-  ProfilerStats mThreadsNs;
+  ProfilerStats mThreadsUs;
 };
 
 // Get information about the current buffer status.
@@ -890,49 +882,20 @@
         ctx, label, dynamicString, JS::ProfilingCategoryPair::categoryPair,    \
         flags)
 
-// `PayloadType` is a sub-class of MarkerPayload, `parenthesizedPayloadArgs` is
-// the argument list used to construct that `PayloadType`. E.g.:
-// `PROFILER_ADD_MARKER_WITH_PAYLOAD("Load", DOM, TextMarkerPayload,
-//                                   ("text", start, end, ds, dsh))`
-#  define PROFILER_ADD_MARKER_WITH_PAYLOAD(                            \
-      markerName, categoryPair, PayloadType, parenthesizedPayloadArgs) \
-    do {                                                               \
-      AUTO_PROFILER_STATS(add_marker_with_##PayloadType);              \
-      ::profiler_add_marker(markerName,                                \
-                            ::JS::ProfilingCategoryPair::categoryPair, \
-                            PayloadType parenthesizedPayloadArgs);     \
-    } while (false)
-
-void profiler_add_marker(const char* aMarkerName,
-                         JS::ProfilingCategoryPair aCategoryPair,
-                         const ProfilerMarkerPayload& aPayload);
-
 void profiler_add_js_marker(const char* aMarkerName, const char* aMarkerText);
 void profiler_add_js_allocation_marker(JS::RecordAllocationInfo&& info);
 
 // Returns true or or false depending on whether the marker was actually added
 // or not.
-bool profiler_add_native_allocation_marker(int aMainThreadId, int64_t aSize,
-                                           uintptr_t aMemorySize);
+bool profiler_add_native_allocation_marker(int64_t aSize,
+                                           uintptr_t aMemoryAddress);
 
-// Returns true if the profiler lock is currently held *on the current thread*.
-// This may be used by re-entrant code that may call profiler functions while
-// the profiler already has the lock (which would deadlock).
+// Returns true if any of the profiler mutexes are currently locked *on the
+// current thread*. This may be used by re-entrant code that may call profiler
+// functions while the same of a different profiler mutex is locked, which could
+// deadlock.
 bool profiler_is_locked_on_current_thread();
 
-// Insert a marker in the profile timeline for a specified thread.
-void profiler_add_marker_for_thread(int aThreadId,
-                                    JS::ProfilingCategoryPair aCategoryPair,
-                                    const char* aMarkerName,
-                                    const ProfilerMarkerPayload& aPayload);
-
-// Insert a marker in the profile timeline for the main thread.
-// This may be used to gather some markers from any thread, that should be
-// displayed in the main thread track.
-void profiler_add_marker_for_mainthread(JS::ProfilingCategoryPair aCategoryPair,
-                                        const char* aMarkerName,
-                                        const ProfilerMarkerPayload& aPayload);
-
 enum class NetworkLoadType { LOAD_START, LOAD_STOP, LOAD_REDIRECT };
 
 void profiler_add_network_marker(
@@ -941,7 +904,8 @@
     mozilla::TimeStamp aEnd, int64_t aCount,
     mozilla::net::CacheDisposition aCacheDisposition, uint64_t aInnerWindowID,
     const mozilla::net::TimingStruct* aTimings = nullptr,
-    nsIURI* aRedirectURI = nullptr, UniqueProfilerBacktrace aSource = nullptr,
+    nsIURI* aRedirectURI = nullptr,
+    mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource = nullptr,
     const mozilla::Maybe<nsDependentCString>& aContentType =
         mozilla::Nothing());
 
@@ -969,40 +933,6 @@
   return mozilla::MarkerInnerWindowId(*id);
 }
 
-// Adds a tracing marker to the profile. A no-op if the profiler is inactive.
-
-#  define PROFILER_TRACING_MARKER(categoryString, markerName, categoryPair, \
-                                  kind)                                     \
-    profiler_tracing_marker(categoryString, markerName,                     \
-                            JS::ProfilingCategoryPair::categoryPair, kind)
-#  define PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName,       \
-                                           categoryPair, kind, docShell)     \
-    profiler_tracing_marker(                                                 \
-        categoryString, markerName, JS::ProfilingCategoryPair::categoryPair, \
-        kind, profiler_get_inner_window_id_from_docshell(docShell))
-
-void profiler_tracing_marker(
-    const char* aCategoryString, const char* aMarkerName,
-    JS::ProfilingCategoryPair aCategoryPair, TracingKind aKind,
-    const mozilla::Maybe<uint64_t>& aInnerWindowID = mozilla::Nothing());
-void profiler_tracing_marker(
-    const char* aCategoryString, const char* aMarkerName,
-    JS::ProfilingCategoryPair aCategoryPair, TracingKind aKind,
-    UniqueProfilerBacktrace aCause,
-    const mozilla::Maybe<uint64_t>& aInnerWindowID = mozilla::Nothing());
-
-// Adds a START/END pair of tracing markers.
-#  define AUTO_PROFILER_TRACING_MARKER(categoryString, markerName,           \
-                                       categoryPair)                         \
-    mozilla::AutoProfilerTracing PROFILER_RAII(                              \
-        categoryString, markerName, JS::ProfilingCategoryPair::categoryPair, \
-        mozilla::Nothing())
-#  define AUTO_PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName,  \
-                                                categoryPair, docShell)      \
-    mozilla::AutoProfilerTracing PROFILER_RAII(                              \
-        categoryString, markerName, JS::ProfilingCategoryPair::categoryPair, \
-        profiler_get_inner_window_id_from_docshell(docShell))
-
 //---------------------------------------------------------------------------
 // Output profiles
 //---------------------------------------------------------------------------
@@ -1225,44 +1155,6 @@
   };
 };
 
-class MOZ_RAII AutoProfilerTracing {
- public:
-  AutoProfilerTracing(const char* aCategoryString, const char* aMarkerName,
-                      JS::ProfilingCategoryPair aCategoryPair,
-                      const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : mCategoryString(aCategoryString),
-        mMarkerName(aMarkerName),
-        mCategoryPair(aCategoryPair),
-        mInnerWindowID(aInnerWindowID) {
-    profiler_tracing_marker(mCategoryString, mMarkerName, aCategoryPair,
-                            TRACING_INTERVAL_START, mInnerWindowID);
-  }
-
-  AutoProfilerTracing(const char* aCategoryString, const char* aMarkerName,
-                      JS::ProfilingCategoryPair aCategoryPair,
-                      UniqueProfilerBacktrace aBacktrace,
-                      const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : mCategoryString(aCategoryString),
-        mMarkerName(aMarkerName),
-        mCategoryPair(aCategoryPair),
-        mInnerWindowID(aInnerWindowID) {
-    profiler_tracing_marker(mCategoryString, mMarkerName, aCategoryPair,
-                            TRACING_INTERVAL_START, std::move(aBacktrace),
-                            mInnerWindowID);
-  }
-
-  ~AutoProfilerTracing() {
-    profiler_tracing_marker(mCategoryString, mMarkerName, mCategoryPair,
-                            TRACING_INTERVAL_END, mInnerWindowID);
-  }
-
- protected:
-  const char* mCategoryString;
-  const char* mMarkerName;
-  const JS::ProfilingCategoryPair mCategoryPair;
-  const mozilla::Maybe<uint64_t> mInnerWindowID;
-};
-
 // Get the MOZ_PROFILER_STARTUP* environment variables that should be
 // supplied to a child process that is about to be launched, in order
 // to make that child process start with the same profiler settings as
diff -Nru firefox-84.0.2+build1/tools/profiler/public/ProfilerChild.h firefox-85.0+build1/tools/profiler/public/ProfilerChild.h
--- firefox-84.0.2+build1/tools/profiler/public/ProfilerChild.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/ProfilerChild.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef ProfilerChild_h
 #define ProfilerChild_h
 
+#include "mozilla/BaseProfilerDetail.h"
 #include "mozilla/DataMutex.h"
 #include "mozilla/PProfilerChild.h"
 #include "mozilla/ProfileBufferControlledChunkManager.h"
@@ -37,6 +38,8 @@
   // This should be called regularly from outside of the profiler lock.
   static void ProcessPendingUpdate();
 
+  static bool IsLockedOnCurrentThread();
+
  private:
   virtual ~ProfilerChild();
 
@@ -78,7 +81,9 @@
     RefPtr<ProfilerChild> mProfilerChild;
     ProfileBufferControlledChunkManager::Update mUpdate;
   };
-  static StaticDataMutex<ProfilerChildAndUpdate> sPendingChunkManagerUpdate;
+  static DataMutexBase<ProfilerChildAndUpdate,
+                       baseprofiler::detail::BaseProfilerMutex>
+      sPendingChunkManagerUpdate;
 };
 
 }  // namespace mozilla
diff -Nru firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkerPayload.h firefox-85.0+build1/tools/profiler/public/ProfilerMarkerPayload.h
--- firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkerPayload.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/ProfilerMarkerPayload.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,839 +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 ProfilerMarkerPayload_h
-#define ProfilerMarkerPayload_h
-
-#include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"
-#include "mozilla/ipc/ProtocolUtils.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/net/TimingStruct.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/ProfileBufferEntrySerialization.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/TimeStamp.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/UniquePtrExtensions.h"
-
-#include "nsString.h"
-#include "nsCRTGlue.h"
-#include "GeckoProfiler.h"
-
-#include "js/Utility.h"
-#include "js/AllocationRecording.h"
-#include "js/ProfilingFrameIterator.h"
-#include "gfxASurface.h"
-#include "mozilla/ServoTraversalStatistics.h"
-
-namespace mozilla {
-namespace baseprofiler {
-class SpliceableJSONWriter;
-}  // namespace baseprofiler
-namespace layers {
-class Layer;
-}  // namespace layers
-}  // namespace mozilla
-
-class UniqueStacks;
-
-// This is an abstract class that can be implemented to supply data to be
-// attached with a profiler marker.
-//
-// When subclassing this, note that the destructor can be called on any thread,
-// i.e. not necessarily on the thread that created the object.
-class ProfilerMarkerPayload {
- public:
-  explicit ProfilerMarkerPayload(
-      const mozilla::Maybe<uint64_t>& aInnerWindowID = mozilla::Nothing(),
-      UniqueProfilerBacktrace aStack = nullptr)
-      : mCommonProps{mozilla::TimeStamp{}, mozilla::TimeStamp{},
-                     std::move(aStack), aInnerWindowID} {}
-
-  ProfilerMarkerPayload(
-      const mozilla::TimeStamp& aStartTime, const mozilla::TimeStamp& aEndTime,
-      const mozilla::Maybe<uint64_t>& aInnerWindowID = mozilla::Nothing(),
-      UniqueProfilerBacktrace aStack = nullptr)
-      : mCommonProps{aStartTime, aEndTime, std::move(aStack), aInnerWindowID} {}
-
-  virtual ~ProfilerMarkerPayload() = default;
-
-  // Compute the number of bytes needed to serialize the `DeserializerTag` and
-  // payload, including in the no-payload (nullptr) case.
-  static mozilla::ProfileBufferEntryWriter::Length TagAndSerializationBytes(
-      const ProfilerMarkerPayload* aPayload) {
-    if (!aPayload) {
-      return sizeof(DeserializerTag);
-    }
-    return aPayload->TagAndSerializationBytes();
-  }
-
-  // Serialize the payload into an EntryWriter, including in the no-payload
-  // (nullptr) case. Must be of the exact size given by
-  // `TagAndSerializationBytes(aPayload)`.
-  static void TagAndSerialize(const ProfilerMarkerPayload* aPayload,
-                              mozilla::ProfileBufferEntryWriter& aEntryWriter) {
-    if (!aPayload) {
-      aEntryWriter.WriteObject(DeserializerTag(0));
-      return;
-    }
-    aPayload->SerializeTagAndPayload(aEntryWriter);
-  }
-
-  // Deserialize a payload from an EntryReader, including in the no-payload
-  // (nullptr) case.
-  static mozilla::UniquePtr<ProfilerMarkerPayload> DeserializeTagAndPayload(
-      mozilla::ProfileBufferEntryReader& aER) {
-    const auto tag = aER.ReadObject<DeserializerTag>();
-    Deserializer deserializer = DeserializerForTag(tag);
-    return deserializer(aER);
-  }
-
-  virtual void StreamPayload(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::TimeStamp& aProcessStartTime,
-      UniqueStacks& aUniqueStacks) const = 0;
-
-  const mozilla::TimeStamp& GetStartTime() const {
-    return mCommonProps.mStartTime;
-  }
-  const mozilla::TimeStamp& GetEndTime() const { return mCommonProps.mEndTime; }
-
- protected:
-  // A `Deserializer` is a free function that can read a serialized payload from
-  // an `EntryReader` and return a reconstructed `ProfilerMarkerPayload`
-  // sub-object (may be null if there was no payload).
-  typedef mozilla::UniquePtr<ProfilerMarkerPayload> (*Deserializer)(
-      mozilla::ProfileBufferEntryReader&);
-
-  // A `DeserializerTag` will be added before the payload, to help select the
-  // correct deserializer when reading back the payload.
-  using DeserializerTag = unsigned char;
-
-  // This needs to be big enough to handle all possible sub-types of
-  // ProfilerMarkerPayload.
-  static constexpr DeserializerTag DeserializerMax = 32;
-
-  // We need an atomic type that can hold a `DeserializerTag`. (Atomic doesn't
-  // work with too-small types.)
-  using DeserializerTagAtomic = int;
-
-  // Number of currently-registered deserializers.
-  static mozilla::Atomic<DeserializerTagAtomic, mozilla::ReleaseAcquire>
-      sDeserializerCount;
-
-  // List of currently-registered deserializers.
-  // sDeserializers[0] is a no-payload deserializer.
-  static Deserializer sDeserializers[DeserializerMax];
-
-  // Get the `DeserializerTag` for a `Deserializer` (which gets registered on
-  // the first call.) Tag 0 means no payload; a null `aDeserializer` gives that
-  // 0 tag.
-  static DeserializerTag TagForDeserializer(Deserializer aDeserializer);
-
-  // Get the `Deserializer` for a given `DeserializerTag`.
-  // Tag 0 is reserved as no-payload deserializer (which returns nullptr).
-  static Deserializer DeserializerForTag(DeserializerTag aTag);
-
-  struct CommonProps {
-    mozilla::TimeStamp mStartTime;
-    mozilla::TimeStamp mEndTime;
-    UniqueProfilerBacktrace mStack;
-    mozilla::Maybe<uint64_t> mInnerWindowID;
-  };
-
-  // Deserializers can use this base constructor.
-  explicit ProfilerMarkerPayload(CommonProps&& aCommonProps)
-      : mCommonProps(std::move(aCommonProps)) {}
-
-  // Serialization/deserialization of common props in ProfilerMarkerPayload.
-  mozilla::ProfileBufferEntryWriter::Length
-  CommonPropsTagAndSerializationBytes() const;
-  void SerializeTagAndCommonProps(
-      DeserializerTag aDeserializerTag,
-      mozilla::ProfileBufferEntryWriter& aEntryWriter) const;
-  static CommonProps DeserializeCommonProps(
-      mozilla::ProfileBufferEntryReader& aEntryReader);
-
-  void StreamType(const char* aMarkerType,
-                  mozilla::baseprofiler::SpliceableJSONWriter& aWriter) const;
-
-  void StreamCommonProps(const char* aMarkerType,
-                         mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-                         const mozilla::TimeStamp& aProcessStartTime,
-                         UniqueStacks& aUniqueStacks) const;
-  void StreamStartEndTime(mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-                          const mozilla::TimeStamp& aProcessStartTime) const;
-
- private:
-  // Compute the number of bytes needed to serialize payload in
-  // `SerializeTagAndPayload` below.
-  virtual mozilla::ProfileBufferEntryWriter::Length TagAndSerializationBytes()
-      const = 0;
-
-  // Serialize the payload into an EntryWriter.
-  // Must be of the exact size given by `TagAndSerializationBytes()`.
-  virtual void SerializeTagAndPayload(
-      mozilla::ProfileBufferEntryWriter& aEntryWriter) const = 0;
-
-  CommonProps mCommonProps;
-};
-
-#define DECL_STREAM_PAYLOAD                                                    \
-  void StreamPayload(mozilla::baseprofiler::SpliceableJSONWriter& aWriter,     \
-                     const mozilla::TimeStamp& aProcessStartTime,              \
-                     UniqueStacks& aUniqueStacks) const override;              \
-  static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(                \
-      mozilla::ProfileBufferEntryReader& aEntryReader);                        \
-  mozilla::ProfileBufferEntryWriter::Length TagAndSerializationBytes()         \
-      const override;                                                          \
-  void SerializeTagAndPayload(mozilla::ProfileBufferEntryWriter& aEntryWriter) \
-      const override;
-
-// TODO: Increase the coverage of tracing markers that include InnerWindowID
-// information
-class TracingMarkerPayload : public ProfilerMarkerPayload {
- public:
-  TracingMarkerPayload(
-      const char* aCategory, TracingKind aKind, const mozilla::TimeStamp& aTime,
-      const mozilla::Maybe<uint64_t>& aInnerWindowID = mozilla::Nothing(),
-      UniqueProfilerBacktrace aCause = nullptr)
-      : ProfilerMarkerPayload((aKind != TracingKind::TRACING_INTERVAL_END)
-                                  ? aTime
-                                  : mozilla::TimeStamp{},
-                              (aKind != TracingKind::TRACING_INTERVAL_START)
-                                  ? aTime
-                                  : mozilla::TimeStamp{},
-                              aInnerWindowID, std::move(aCause)),
-        mCategory(aCategory),
-        mKind(aKind) {}
-
-  TracingMarkerPayload(const char* aCategory, const mozilla::TimeStamp& aStart,
-                       const mozilla::TimeStamp& aEnd)
-      : ProfilerMarkerPayload(aStart, aEnd, mozilla::Nothing(), nullptr),
-        mCategory(aCategory),
-        mKind(TRACING_EVENT) {}
-
-  DECL_STREAM_PAYLOAD
-
- protected:
-  TracingMarkerPayload(CommonProps&& aCommonProps, const char* aCategory,
-                       TracingKind aKind)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mCategory(aCategory),
-        mKind(aKind) {}
-
-  // May be used by derived classes.
-  void SerializeTagAndPayload(
-      DeserializerTag aDeserializerTag,
-      mozilla::ProfileBufferEntryWriter& aEntryWriter) const;
-
- private:
-  const char* mCategory;
-  TracingKind mKind;
-};
-
-class BudgetMarkerPayload : public ProfilerMarkerPayload {
- public:
-  BudgetMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                      const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  explicit BudgetMarkerPayload(CommonProps&& aCommonProps)
-      : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-};
-
-class PrefMarkerPayload : public ProfilerMarkerPayload {
- public:
-  PrefMarkerPayload(const char* aPrefName,
-                    const mozilla::Maybe<mozilla::PrefValueKind>& aPrefKind,
-                    const mozilla::Maybe<mozilla::PrefType>& aPrefType,
-                    const nsCString& aPrefValue,
-                    const mozilla::TimeStamp& aPrefAccessTime)
-      : ProfilerMarkerPayload(aPrefAccessTime, aPrefAccessTime),
-        mPrefAccessTime(aPrefAccessTime),
-        mPrefName(aPrefName),
-        mPrefKind(aPrefKind),
-        mPrefType(aPrefType),
-        mPrefValue(aPrefValue) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  PrefMarkerPayload(CommonProps&& aCommonProps,
-                    mozilla::TimeStamp aPrefAccessTime, nsCString&& aPrefName,
-                    mozilla::Maybe<mozilla::PrefValueKind>&& aPrefKind,
-                    mozilla::Maybe<mozilla::PrefType>&& aPrefType,
-                    nsCString&& aPrefValue)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mPrefAccessTime(aPrefAccessTime),
-        mPrefName(aPrefName),
-        mPrefKind(aPrefKind),
-        mPrefType(aPrefType),
-        mPrefValue(aPrefValue) {}
-
-  mozilla::TimeStamp mPrefAccessTime;
-  nsCString mPrefName;
-  // Nothing means this is a shared preference. Something, on the other hand,
-  // holds an actual PrefValueKind indicating either a Default or User
-  // preference.
-  mozilla::Maybe<mozilla::PrefValueKind> mPrefKind;
-  // Nothing means that the mPrefName preference was not found. Something
-  // contains the type of the preference.
-  mozilla::Maybe<mozilla::PrefType> mPrefType;
-  nsCString mPrefValue;
-};
-
-class UserTimingMarkerPayload : public ProfilerMarkerPayload {
- public:
-  UserTimingMarkerPayload(const nsAString& aName,
-                          const mozilla::TimeStamp& aStartTime,
-                          const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : ProfilerMarkerPayload(aStartTime, aStartTime, aInnerWindowID),
-        mEntryType("mark"),
-        mName(aName) {}
-
-  UserTimingMarkerPayload(const nsAString& aName,
-                          const mozilla::Maybe<nsString>& aStartMark,
-                          const mozilla::Maybe<nsString>& aEndMark,
-                          const mozilla::TimeStamp& aStartTime,
-                          const mozilla::TimeStamp& aEndTime,
-                          const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : ProfilerMarkerPayload(aStartTime, aEndTime, aInnerWindowID),
-        mEntryType("measure"),
-        mName(aName),
-        mStartMark(aStartMark),
-        mEndMark(aEndMark) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  UserTimingMarkerPayload(CommonProps&& aCommonProps, const char* aEntryType,
-                          nsString&& aName,
-                          mozilla::Maybe<nsString>&& aStartMark,
-                          mozilla::Maybe<nsString>&& aEndMark)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mEntryType(aEntryType),
-        mName(std::move(aName)),
-        mStartMark(std::move(aStartMark)),
-        mEndMark(std::move(aEndMark)) {}
-
-  // Either "mark" or "measure".
-  const char* mEntryType;
-  nsString mName;
-  mozilla::Maybe<nsString> mStartMark;
-  mozilla::Maybe<nsString> mEndMark;
-};
-
-// Contains the translation applied to a 2d layer so we can track the layer
-// position at each frame.
-class LayerTranslationMarkerPayload : public ProfilerMarkerPayload {
- public:
-  LayerTranslationMarkerPayload(mozilla::layers::Layer* aLayer,
-                                mozilla::gfx::Point aPoint,
-                                mozilla::TimeStamp aStartTime)
-      : ProfilerMarkerPayload(aStartTime, aStartTime),
-        mLayer(aLayer),
-        mPoint(aPoint) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  LayerTranslationMarkerPayload(CommonProps&& aCommonProps,
-                                mozilla::layers::Layer* aLayer,
-                                mozilla::gfx::Point aPoint)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mLayer(aLayer),
-        mPoint(aPoint) {}
-
-  mozilla::layers::Layer* mLayer;
-  mozilla::gfx::Point mPoint;
-};
-
-#include "Units.h"  // For ScreenIntPoint
-
-// Tracks when a vsync occurs according to the HardwareComposer.
-class VsyncMarkerPayload : public ProfilerMarkerPayload {
- public:
-  explicit VsyncMarkerPayload(mozilla::TimeStamp aVsyncTimestamp)
-      : ProfilerMarkerPayload(aVsyncTimestamp, aVsyncTimestamp) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  explicit VsyncMarkerPayload(CommonProps&& aCommonProps)
-      : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-};
-
-class NetworkMarkerPayload : public ProfilerMarkerPayload {
- public:
-  NetworkMarkerPayload(int64_t aID, const char* aURI,
-                       const nsACString& aRequestMethod, NetworkLoadType aType,
-                       const mozilla::TimeStamp& aStartTime,
-                       const mozilla::TimeStamp& aEndTime, int32_t aPri,
-                       int64_t aCount,
-                       mozilla::net::CacheDisposition aCacheDisposition,
-                       uint64_t aInnerWindowID,
-                       const mozilla::net::TimingStruct* aTimings = nullptr,
-                       const char* aRedirectURI = nullptr,
-                       UniqueProfilerBacktrace aSource = nullptr,
-                       const mozilla::Maybe<nsDependentCString>& aContentType =
-                           mozilla::Nothing())
-      : ProfilerMarkerPayload(aStartTime, aEndTime,
-                              mozilla::Some(aInnerWindowID),
-                              std::move(aSource)),
-        mID(aID),
-        mURI(aURI ? strdup(aURI) : nullptr),
-        mRedirectURI(aRedirectURI && (strlen(aRedirectURI) > 0)
-                         ? strdup(aRedirectURI)
-                         : nullptr),
-        mRequestMethod(aRequestMethod),
-        mType(aType),
-        mPri(aPri),
-        mCount(aCount),
-        mCacheDisposition(aCacheDisposition),
-        mContentType(aContentType) {
-    if (aTimings) {
-      mTimings = *aTimings;
-    }
-  }
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  NetworkMarkerPayload(CommonProps&& aCommonProps, int64_t aID,
-                       mozilla::UniqueFreePtr<char>&& aURI,
-                       mozilla::UniqueFreePtr<char>&& aRedirectURI,
-                       nsCString&& aRequestMethod, NetworkLoadType aType,
-                       int32_t aPri, int64_t aCount,
-                       mozilla::net::TimingStruct aTimings,
-                       mozilla::net::CacheDisposition aCacheDisposition,
-                       mozilla::Maybe<nsAutoCString>&& aContentType)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mID(aID),
-        mURI(std::move(aURI)),
-        mRedirectURI(std::move(aRedirectURI)),
-        mRequestMethod(std::move(aRequestMethod)),
-        mType(aType),
-        mPri(aPri),
-        mCount(aCount),
-        mTimings(aTimings),
-        mCacheDisposition(aCacheDisposition),
-        mContentType(std::move(aContentType)) {}
-
-  int64_t mID;
-  mozilla::UniqueFreePtr<char> mURI;
-  mozilla::UniqueFreePtr<char> mRedirectURI;
-  // Request method and content type further down are usually short,
-  // e.g., "GET" and "text/html", so we use nsAutoCString to reduce
-  // heap usage; the bigger object size is acceptable here because
-  // markers are short-lived on-stack objects.
-  nsAutoCString mRequestMethod;
-  NetworkLoadType mType;
-  int32_t mPri;
-  int64_t mCount;
-  mozilla::net::TimingStruct mTimings;
-  mozilla::net::CacheDisposition mCacheDisposition;
-  mozilla::Maybe<nsAutoCString> mContentType;
-};
-
-class ScreenshotPayload : public ProfilerMarkerPayload {
- public:
-  explicit ScreenshotPayload(mozilla::TimeStamp aTimeStamp,
-                             nsCString&& aScreenshotDataURL,
-                             const mozilla::gfx::IntSize& aWindowSize,
-                             uintptr_t aWindowIdentifier)
-      : ProfilerMarkerPayload(aTimeStamp, mozilla::TimeStamp()),
-        mScreenshotDataURL(std::move(aScreenshotDataURL)),
-        mWindowSize(aWindowSize),
-        mWindowIdentifier(aWindowIdentifier) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  ScreenshotPayload(CommonProps&& aCommonProps, nsCString&& aScreenshotDataURL,
-                    mozilla::gfx::IntSize aWindowSize,
-                    uintptr_t aWindowIdentifier)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mScreenshotDataURL(std::move(aScreenshotDataURL)),
-        mWindowSize(aWindowSize),
-        mWindowIdentifier(aWindowIdentifier) {}
-
-  nsCString mScreenshotDataURL;
-  mozilla::gfx::IntSize mWindowSize;
-  uintptr_t mWindowIdentifier;
-};
-
-class GCSliceMarkerPayload : public ProfilerMarkerPayload {
- public:
-  GCSliceMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                       const mozilla::TimeStamp& aEndTime,
-                       JS::UniqueChars&& aTimingJSON)
-      : ProfilerMarkerPayload(aStartTime, aEndTime),
-        mTimingJSON(std::move(aTimingJSON)) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  GCSliceMarkerPayload(CommonProps&& aCommonProps,
-                       JS::UniqueChars&& aTimingJSON)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mTimingJSON(std::move(aTimingJSON)) {}
-
-  JS::UniqueChars mTimingJSON;
-};
-
-class GCMajorMarkerPayload : public ProfilerMarkerPayload {
- public:
-  GCMajorMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                       const mozilla::TimeStamp& aEndTime,
-                       JS::UniqueChars&& aTimingJSON)
-      : ProfilerMarkerPayload(aStartTime, aEndTime),
-        mTimingJSON(std::move(aTimingJSON)) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  GCMajorMarkerPayload(CommonProps&& aCommonProps,
-                       JS::UniqueChars&& aTimingJSON)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mTimingJSON(std::move(aTimingJSON)) {}
-
-  JS::UniqueChars mTimingJSON;
-};
-
-class GCMinorMarkerPayload : public ProfilerMarkerPayload {
- public:
-  GCMinorMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                       const mozilla::TimeStamp& aEndTime,
-                       JS::UniqueChars&& aTimingData)
-      : ProfilerMarkerPayload(aStartTime, aEndTime),
-        mTimingData(std::move(aTimingData)) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  GCMinorMarkerPayload(CommonProps&& aCommonProps,
-                       JS::UniqueChars&& aTimingData)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mTimingData(std::move(aTimingData)) {}
-
-  JS::UniqueChars mTimingData;
-};
-
-class HangMarkerPayload : public ProfilerMarkerPayload {
- public:
-  HangMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                    const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-
-  DECL_STREAM_PAYLOAD
- private:
-  explicit HangMarkerPayload(CommonProps&& aCommonProps)
-      : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-};
-
-class StyleMarkerPayload : public ProfilerMarkerPayload {
- public:
-  StyleMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                     const mozilla::TimeStamp& aEndTime,
-                     UniqueProfilerBacktrace aCause,
-                     const mozilla::ServoTraversalStatistics& aStats,
-                     const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : ProfilerMarkerPayload(aStartTime, aEndTime, aInnerWindowID,
-                              std::move(aCause)),
-        mStats(aStats) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  StyleMarkerPayload(CommonProps&& aCommonProps,
-                     mozilla::ServoTraversalStatistics aStats)
-      : ProfilerMarkerPayload(std::move(aCommonProps)), mStats(aStats) {}
-
-  mozilla::ServoTraversalStatistics mStats;
-};
-
-class LongTaskMarkerPayload : public ProfilerMarkerPayload {
- public:
-  LongTaskMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                        const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  explicit LongTaskMarkerPayload(CommonProps&& aCommonProps)
-      : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-};
-
-class TimingMarkerPayload : public ProfilerMarkerPayload {
- public:
-  TimingMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                      const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  explicit TimingMarkerPayload(CommonProps&& aCommonProps)
-      : ProfilerMarkerPayload(std::move(aCommonProps)) {}
-};
-
-class TextMarkerPayload : public ProfilerMarkerPayload {
- public:
-  TextMarkerPayload(const nsACString& aText,
-                    const mozilla::TimeStamp& aStartTime)
-      : ProfilerMarkerPayload(aStartTime, aStartTime), mText(aText) {}
-
-  TextMarkerPayload(const nsACString& aText,
-                    const mozilla::TimeStamp& aStartTime,
-                    const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime), mText(aText) {}
-
-  TextMarkerPayload(const nsACString& aText,
-                    const mozilla::TimeStamp& aStartTime,
-                    const mozilla::Maybe<uint64_t>& aInnerWindowID)
-      : ProfilerMarkerPayload(aStartTime, aStartTime, aInnerWindowID),
-        mText(aText) {}
-
-  TextMarkerPayload(const nsACString& aText,
-                    const mozilla::TimeStamp& aStartTime,
-                    const mozilla::TimeStamp& aEndTime,
-                    const mozilla::Maybe<uint64_t>& aInnerWindowID,
-                    UniqueProfilerBacktrace aCause = nullptr)
-      : ProfilerMarkerPayload(aStartTime, aEndTime, aInnerWindowID,
-                              std::move(aCause)),
-        mText(aText) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  TextMarkerPayload(CommonProps&& aCommonProps, nsCString&& aText)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mText(std::move(aText)) {}
-
-  nsCString mText;
-};
-
-class LogMarkerPayload : public ProfilerMarkerPayload {
- public:
-  LogMarkerPayload(const char* aModule, const char* aText,
-                   const mozilla::TimeStamp& aStartTime)
-      : ProfilerMarkerPayload(aStartTime, aStartTime),
-        mModule(aModule),
-        mText(aText) {}
-
-  LogMarkerPayload(const char* aModule, const char* aText,
-                   const mozilla::TimeStamp& aStartTime,
-                   const mozilla::TimeStamp& aEndTime)
-      : ProfilerMarkerPayload(aStartTime, aEndTime),
-        mModule(aModule),
-        mText(aText) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  LogMarkerPayload(CommonProps&& aCommonProps, nsAutoCStringN<32>&& aModule,
-                   nsCString&& aText)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mModule(std::move(aModule)),
-        mText(std::move(aText)) {}
-
-  nsAutoCStringN<32> mModule;  // longest known LazyLogModule name is ~24
-  nsCString mText;
-};
-
-class MediaSampleMarkerPayload : public ProfilerMarkerPayload {
- public:
-  MediaSampleMarkerPayload(const int64_t aSampleStartTimeUs,
-                           const int64_t aSampleEndTimeUs);
-  DECL_STREAM_PAYLOAD
-
- private:
-  MediaSampleMarkerPayload(CommonProps&& aCommonProps,
-                           const int64_t aSampleStartTimeUs,
-                           const int64_t aSampleEndTimeUs);
-
-  int64_t mSampleStartTimeUs;
-  int64_t mSampleEndTimeUs;
-};
-
-class JsAllocationMarkerPayload : public ProfilerMarkerPayload {
- public:
-  JsAllocationMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                            JS::RecordAllocationInfo&& aInfo,
-                            UniqueProfilerBacktrace aStack)
-      : ProfilerMarkerPayload(aStartTime, aStartTime, mozilla::Nothing(),
-                              std::move(aStack)),
-        // Copy the strings, and take ownership of them.
-        mTypeName(aInfo.typeName ? NS_xstrdup(aInfo.typeName) : nullptr),
-        mClassName(aInfo.className ? strdup(aInfo.className) : nullptr),
-        mDescriptiveTypeName(aInfo.descriptiveTypeName
-                                 ? NS_xstrdup(aInfo.descriptiveTypeName)
-                                 : nullptr),
-        // The coarseType points to a string literal, so does not need to be
-        // duplicated.
-        mCoarseType(aInfo.coarseType),
-        mSize(aInfo.size),
-        mInNursery(aInfo.inNursery) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  JsAllocationMarkerPayload(
-      CommonProps&& aCommonProps,
-      mozilla::UniqueFreePtr<const char16_t>&& aTypeName,
-      mozilla::UniqueFreePtr<const char>&& aClassName,
-      mozilla::UniqueFreePtr<const char16_t>&& aDescriptiveTypeName,
-      const char* aCoarseType, uint64_t aSize, bool aInNursery)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mTypeName(std::move(aTypeName)),
-        mClassName(std::move(aClassName)),
-        mDescriptiveTypeName(std::move(aDescriptiveTypeName)),
-        mCoarseType(aCoarseType),
-        mSize(aSize),
-        mInNursery(aInNursery) {}
-
-  mozilla::UniqueFreePtr<const char16_t> mTypeName;
-  mozilla::UniqueFreePtr<const char> mClassName;
-  mozilla::UniqueFreePtr<const char16_t> mDescriptiveTypeName;
-  // Points to a string literal, so does not need to be freed.
-  const char* mCoarseType;
-
-  // The size in bytes of the allocation.
-  uint64_t mSize;
-
-  // Whether or not the allocation is in the nursery or not.
-  bool mInNursery;
-};
-
-// This payload is for collecting information about native allocations. There is
-// a memory hook into malloc and other memory functions that can sample a subset
-// of the allocations. This information is then stored in this payload.
-class NativeAllocationMarkerPayload : public ProfilerMarkerPayload {
- public:
-  NativeAllocationMarkerPayload(const mozilla::TimeStamp& aStartTime,
-                                int64_t aSize, uintptr_t aMemoryAddress,
-                                int aThreadId, UniqueProfilerBacktrace aStack)
-      : ProfilerMarkerPayload(aStartTime, aStartTime, mozilla::Nothing(),
-                              std::move(aStack)),
-        mSize(aSize),
-        mMemoryAddress(aMemoryAddress),
-        mThreadId(aThreadId) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  NativeAllocationMarkerPayload(CommonProps&& aCommonProps, int64_t aSize,
-                                uintptr_t aMemoryAddress, int aThreadId)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mSize(aSize),
-        mMemoryAddress(aMemoryAddress),
-        mThreadId(aThreadId) {}
-
-  // The size in bytes of the allocation. If the number is negative then it
-  // represents a de-allocation.
-  int64_t mSize;
-  // The memory address of the allocation or de-allocation.
-  uintptr_t mMemoryAddress;
-
-  int mThreadId;
-};
-
-class IPCMarkerPayload : public ProfilerMarkerPayload {
- public:
-  IPCMarkerPayload(int32_t aOtherPid, int32_t aMessageSeqno,
-                   IPC::Message::msgid_t aMessageType, mozilla::ipc::Side aSide,
-                   mozilla::ipc::MessageDirection aDirection,
-                   mozilla::ipc::MessagePhase aPhase, bool aSync,
-                   const mozilla::TimeStamp& aStartTime)
-      : ProfilerMarkerPayload(aStartTime, aStartTime),
-        mOtherPid(aOtherPid),
-        mMessageSeqno(aMessageSeqno),
-        mMessageType(aMessageType),
-        mSide(aSide),
-        mDirection(aDirection),
-        mPhase(aPhase),
-        mSync(aSync) {}
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  IPCMarkerPayload(CommonProps&& aCommonProps, int32_t aOtherPid,
-                   int32_t aMessageSeqno, IPC::Message::msgid_t aMessageType,
-                   mozilla::ipc::Side aSide,
-                   mozilla::ipc::MessageDirection aDirection,
-                   mozilla::ipc::MessagePhase aPhase, bool aSync)
-      : ProfilerMarkerPayload(std::move(aCommonProps)),
-        mOtherPid(aOtherPid),
-        mMessageSeqno(aMessageSeqno),
-        mMessageType(aMessageType),
-        mSide(aSide),
-        mDirection(aDirection),
-        mPhase(aPhase),
-        mSync(aSync) {}
-
-  int32_t mOtherPid;
-  int32_t mMessageSeqno;
-  IPC::Message::msgid_t mMessageType;
-  mozilla::ipc::Side mSide;
-  mozilla::ipc::MessageDirection mDirection;
-  mozilla::ipc::MessagePhase mPhase;
-  bool mSync;
-};
-
-namespace mozilla {
-
-// Serialize a pointed-at ProfilerMarkerPayload, may be null when there are no
-// payloads.
-template <>
-struct ProfileBufferEntryWriter::Serializer<const ProfilerMarkerPayload*> {
-  static Length Bytes(const ProfilerMarkerPayload* aPayload) {
-    return ProfilerMarkerPayload::TagAndSerializationBytes(aPayload);
-  }
-
-  static void Write(ProfileBufferEntryWriter& aEW,
-                    const ProfilerMarkerPayload* aPayload) {
-    ProfilerMarkerPayload::TagAndSerialize(aPayload, aEW);
-  }
-};
-
-// Serialize a pointed-at ProfilerMarkerPayload, may be null when there are no
-// payloads.
-template <>
-struct ProfileBufferEntryWriter::Serializer<UniquePtr<ProfilerMarkerPayload>> {
-  static Length Bytes(const UniquePtr<ProfilerMarkerPayload>& aPayload) {
-    return ProfilerMarkerPayload::TagAndSerializationBytes(aPayload.get());
-  }
-
-  static void Write(ProfileBufferEntryWriter& aEW,
-                    const UniquePtr<ProfilerMarkerPayload>& aPayload) {
-    ProfilerMarkerPayload::TagAndSerialize(aPayload.get(), aEW);
-  }
-};
-
-// Deserialize a ProfilerMarkerPayload into a UniquePtr, may be null if there
-// are no payloads.
-template <>
-struct ProfileBufferEntryReader::Deserializer<
-    UniquePtr<ProfilerMarkerPayload>> {
-  static void ReadInto(ProfileBufferEntryReader& aER,
-                       UniquePtr<ProfilerMarkerPayload>& aPayload) {
-    aPayload = Read(aER);
-  }
-
-  static UniquePtr<ProfilerMarkerPayload> Read(ProfileBufferEntryReader& aER) {
-    return ProfilerMarkerPayload::DeserializeTagAndPayload(aER);
-  }
-};
-
-}  // namespace mozilla
-
-#endif  // ProfilerMarkerPayload_h
diff -Nru firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkers.h firefox-85.0+build1/tools/profiler/public/ProfilerMarkers.h
--- firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkers.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/ProfilerMarkers.h	2021-01-18 19:58:27.000000000 +0000
@@ -35,18 +35,26 @@
 #include "mozilla/BaseProfilerMarkers.h"
 #include "mozilla/ProfilerMarkersDetail.h"
 
-// TODO: Move common stuff to shared header instead.
-#include "GeckoProfiler.h"
-
 #ifndef MOZ_GECKO_PROFILER
 
 #  define PROFILER_MARKER_UNTYPED(markerName, categoryName, ...)
 #  define PROFILER_MARKER(markerName, categoryName, options, MarkerType, ...)
 #  define PROFILER_MARKER_TEXT(markerName, categoryName, options, text)
 #  define AUTO_PROFILER_MARKER_TEXT(markerName, categoryName, options, text)
+#  define AUTO_PROFILER_TRACING_MARKER(categoryString, markerName, categoryPair)
+#  define AUTO_PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName, \
+                                                categoryPair, docShell)
 
 #else  // ndef MOZ_GECKO_PROFILER
 
+namespace mozilla {
+class ProfileChunkedBuffer;
+}
+
+bool profiler_can_accept_markers();
+bool profiler_capture_backtrace_into(
+    mozilla::ProfileChunkedBuffer& aChunkedBuffer);
+
 // Bring category names from Base Profiler into the geckoprofiler::category
 // namespace, for consistency with other Gecko Profiler identifiers.
 namespace geckoprofiler::category {
@@ -129,8 +137,9 @@
     } while (false)
 
 namespace geckoprofiler::markers {
-// Most common marker type. Others are in ProfilerMarkerTypes.h.
-using Text = ::mozilla::baseprofiler::markers::Text;
+// Most common marker types. Others are in ProfilerMarkerTypes.h.
+using TextMarker = ::mozilla::baseprofiler::markers::TextMarker;
+using Tracing = mozilla::baseprofiler::markers::Tracing;
 }  // namespace geckoprofiler::markers
 
 // Add a text marker. This macro is safe to use even if MOZ_GECKO_PROFILER is
@@ -140,7 +149,7 @@
       AUTO_PROFILER_STATS(PROFILER_MARKER_TEXT);                              \
       ::profiler_add_marker(markerName,                                       \
                             ::geckoprofiler::category::categoryName, options, \
-                            ::geckoprofiler::markers::Text{}, text);          \
+                            ::geckoprofiler::markers::TextMarker{}, text);    \
     } while (false)
 
 // RAII object that adds a PROFILER_MARKER_TEXT when destroyed; the marker's
@@ -168,7 +177,8 @@
     AUTO_PROFILER_STATS(AUTO_PROFILER_MARKER_TEXT);
     profiler_add_marker(
         mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName),
-        mCategory, std::move(mOptions), geckoprofiler::markers::Text{}, mText);
+        mCategory, std::move(mOptions), geckoprofiler::markers::TextMarker{},
+        mText);
   }
 
  protected:
@@ -185,6 +195,100 @@
         markerName, ::mozilla::baseprofiler::category::categoryName, options, \
         text)
 
+class MOZ_RAII AutoProfilerTracing {
+ public:
+  AutoProfilerTracing(const char* aCategoryString, const char* aMarkerName,
+                      mozilla::MarkerCategory aCategoryPair,
+                      const mozilla::Maybe<uint64_t>& aInnerWindowID)
+      : mCategoryString(aCategoryString),
+        mMarkerName(aMarkerName),
+        mCategoryPair(aCategoryPair),
+        mInnerWindowID(aInnerWindowID) {
+    profiler_add_marker(
+        mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName),
+        mCategoryPair,
+        {mozilla::MarkerTiming::IntervalStart(),
+         mozilla::MarkerInnerWindowId(mInnerWindowID)},
+        geckoprofiler::markers::Tracing{},
+        mozilla::ProfilerString8View::WrapNullTerminatedString(
+            mCategoryString));
+  }
+
+  AutoProfilerTracing(
+      const char* aCategoryString, const char* aMarkerName,
+      mozilla::MarkerCategory aCategoryPair,
+      mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aBacktrace,
+      const mozilla::Maybe<uint64_t>& aInnerWindowID)
+      : mCategoryString(aCategoryString),
+        mMarkerName(aMarkerName),
+        mCategoryPair(aCategoryPair),
+        mInnerWindowID(aInnerWindowID) {
+    profiler_add_marker(
+        mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName),
+        mCategoryPair,
+        {mozilla::MarkerTiming::IntervalStart(),
+         mozilla::MarkerInnerWindowId(mInnerWindowID),
+         mozilla::MarkerStack::TakeBacktrace(std::move(aBacktrace))},
+        geckoprofiler::markers::Tracing{},
+        mozilla::ProfilerString8View::WrapNullTerminatedString(
+            mCategoryString));
+  }
+
+  ~AutoProfilerTracing() {
+    profiler_add_marker(
+        mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName),
+        mCategoryPair,
+        {mozilla::MarkerTiming::IntervalEnd(),
+         mozilla::MarkerInnerWindowId(mInnerWindowID)},
+        geckoprofiler::markers::Tracing{},
+        mozilla::ProfilerString8View::WrapNullTerminatedString(
+            mCategoryString));
+  }
+
+ protected:
+  const char* mCategoryString;
+  const char* mMarkerName;
+  const mozilla::MarkerCategory mCategoryPair;
+  const mozilla::Maybe<uint64_t> mInnerWindowID;
+};
+
+// Adds a START/END pair of tracing markers.
+#  define AUTO_PROFILER_TRACING_MARKER(categoryString, markerName,           \
+                                       categoryPair)                         \
+    AutoProfilerTracing PROFILER_RAII(categoryString, markerName,            \
+                                      geckoprofiler::category::categoryPair, \
+                                      mozilla::Nothing())
+#  define AUTO_PROFILER_TRACING_MARKER_DOCSHELL(categoryString, markerName, \
+                                                categoryPair, docShell)     \
+    AutoProfilerTracing PROFILER_RAII(                                      \
+        categoryString, markerName, geckoprofiler::category::categoryPair,  \
+        profiler_get_inner_window_id_from_docshell(docShell))
+
+extern template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer(
+    mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&,
+    const mozilla::MarkerCategory&, mozilla::MarkerOptions&&,
+    mozilla::baseprofiler::markers::NoPayload);
+
+extern template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer(
+    mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&,
+    const mozilla::MarkerCategory&, mozilla::MarkerOptions&&,
+    mozilla::baseprofiler::markers::TextMarker, const std::string&);
+
+extern template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker,
+    const std::string&);
+
+extern template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker,
+    const nsCString&);
+
+extern template mozilla::ProfileBufferBlockIndex profiler_add_marker(
+    const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&,
+    mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::Tracing,
+    const mozilla::ProfilerString8View&);
+
 #endif  // nfed MOZ_GECKO_PROFILER else
 
 #endif  // ProfilerMarkers_h
diff -Nru firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkerTypes.h firefox-85.0+build1/tools/profiler/public/ProfilerMarkerTypes.h
--- firefox-84.0.2+build1/tools/profiler/public/ProfilerMarkerTypes.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/ProfilerMarkerTypes.h	2021-01-18 19:58:27.000000000 +0000
@@ -23,488 +23,16 @@
 
 #ifdef MOZ_GECKO_PROFILER
 
-#  include "gfxASurface.h"
-#  include "js/AllocationRecording.h"
 #  include "js/ProfilingFrameIterator.h"
 #  include "js/Utility.h"
-#  include "Layers.h"
-#  include "mozilla/ipc/ProtocolUtils.h"
-#  include "mozilla/net/HttpBaseChannel.h"
 #  include "mozilla/Preferences.h"
 #  include "mozilla/ServoTraversalStatistics.h"
 
 namespace geckoprofiler::markers {
 
 // Import some common markers from mozilla::baseprofiler::markers.
-using Tracing = mozilla::baseprofiler::markers::Tracing;
-using UserTimingMark = mozilla::baseprofiler::markers::UserTimingMark;
-using UserTimingMeasure = mozilla::baseprofiler::markers::UserTimingMeasure;
-using Hang = mozilla::baseprofiler::markers::Hang;
-using LongTask = mozilla::baseprofiler::markers::LongTask;
-using Log = mozilla::baseprofiler::markers::Log;
-using MediaSample = mozilla::baseprofiler::markers::MediaSample;
-
-struct Budget {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("Budget");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter) {}
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    // Nothing outside the defaults.
-    return schema;
-  }
-};
-
-struct Pref {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("PreferenceRead");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString8View& aPrefName,
-      const mozilla::Maybe<mozilla::PrefValueKind>& aPrefKind,
-      const mozilla::Maybe<mozilla::PrefType>& aPrefType,
-      const mozilla::ProfilerString8View& aPrefValue,
-      const mozilla::TimeStamp& aPrefAccessTime) {
-    // TODO: This looks like it's always `Now()`, so it could probably be
-    // removed; but the frontend may need updating first.
-    mozilla::baseprofiler::WritePropertyTime(aWriter, "prefAccessTime",
-                                             aPrefAccessTime);
-    aWriter.StringProperty("prefName", aPrefName);
-    aWriter.StringProperty("prefKind", PrefValueKindToString(aPrefKind));
-    aWriter.StringProperty("prefType", PrefTypeToString(aPrefType));
-    aWriter.StringProperty("prefValue", aPrefValue);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.AddKeyLabelFormat("prefName", "Name", MS::Format::string);
-    schema.AddKeyLabelFormat("prefKind", "Kind", MS::Format::string);
-    schema.AddKeyLabelFormat("prefType", "Type", MS::Format::string);
-    schema.AddKeyLabelFormat("prefValue", "Value", MS::Format::string);
-    return schema;
-  }
-
- private:
-  static mozilla::Span<const char> PrefValueKindToString(
-      const mozilla::Maybe<mozilla::PrefValueKind>& aKind) {
-    if (aKind) {
-      return *aKind == mozilla::PrefValueKind::Default
-                 ? mozilla::MakeStringSpan("Default")
-                 : mozilla::MakeStringSpan("User");
-    }
-    return "Shared";
-  }
-
-  static mozilla::Span<const char> PrefTypeToString(
-      const mozilla::Maybe<mozilla::PrefType>& type) {
-    if (type) {
-      switch (*type) {
-        case mozilla::PrefType::None:
-          return "None";
-        case mozilla::PrefType::Int:
-          return "Int";
-        case mozilla::PrefType::Bool:
-          return "Bool";
-        case mozilla::PrefType::String:
-          return "String";
-        default:
-          MOZ_ASSERT_UNREACHABLE("Unknown preference type.");
-      }
-    }
-    return "Preference not found";
-  }
-};
-
-// Contains the translation applied to a 2d layer so we can track the layer
-// position at each frame.
-struct LayerTranslation {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("LayerTranslation");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      mozilla::layers::Layer* aLayer, mozilla::gfx::Point aPoint) {
-    const size_t bufferSize = 32;
-    char buffer[bufferSize];
-    SprintfLiteral(buffer, "%p", aLayer);
-
-    aWriter.StringProperty("layer", buffer);
-    aWriter.IntProperty("x", aPoint.x);
-    aWriter.IntProperty("y", aPoint.y);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    schema.AddKeyLabelFormat("layer", "Layer", MS::Format::string);
-    schema.AddKeyLabelFormat("x", "X", MS::Format::integer);
-    schema.AddKeyLabelFormat("y", "Y", MS::Format::integer);
-    return schema;
-  }
-};
-
-// Tracks when a vsync occurs according to the HardwareComposer.
-struct Vsync {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("VsyncTimestamp");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter) {}
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable};
-    // Nothing outside the defaults.
-    return schema;
-  }
-};
-
-struct Network {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("Network");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter, int64_t aID,
-      const mozilla::ProfilerString8View& aURI, NetworkLoadType aType,
-      const mozilla::TimeStamp& aStartTime, const mozilla::TimeStamp& aEndTime,
-      int32_t aPri, int64_t aCount,
-      mozilla::net::CacheDisposition aCacheDisposition, uint64_t aInnerWindowID,
-      const mozilla::net::TimingStruct& aTimings,
-      const mozilla::ProfilerString8View& aRedirectURI,
-      UniqueProfilerBacktrace aSource,
-      const mozilla::ProfilerString8View& aContentType) {
-    // TODO: Remove these Legacy start&end times when frontend is updated.
-    mozilla::baseprofiler::WritePropertyTime(aWriter, "startTime", aStartTime);
-    mozilla::baseprofiler::WritePropertyTime(aWriter, "endTime", aEndTime);
-
-    aWriter.IntProperty("id", aID);
-    mozilla::Span<const char> typeString = GetNetworkState(aType);
-    mozilla::Span<const char> cacheString = GetCacheState(aCacheDisposition);
-    // want to use aUniqueStacks.mUniqueStrings->WriteElement(aWriter,
-    // typeString);
-    aWriter.StringProperty("status", typeString);
-    if (!cacheString.IsEmpty()) {
-      aWriter.StringProperty("cache", cacheString);
-    }
-    aWriter.IntProperty("pri", aPri);
-    if (aCount > 0) {
-      aWriter.IntProperty("count", aCount);
-    }
-    if (aURI.Length() != 0) {
-      aWriter.StringProperty("URI", aURI);
-    }
-    if (aRedirectURI.Length() != 0) {
-      aWriter.StringProperty("RedirectURI", aRedirectURI);
-    }
-
-    if (aContentType.Length() != 0) {
-      aWriter.StringProperty("contentType", aContentType);
-    } else {
-      aWriter.NullProperty("contentType");
-    }
-
-    if (aType != NetworkLoadType::LOAD_START) {
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "domainLookupStart",
-                                               aTimings.domainLookupStart);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "domainLookupEnd",
-                                               aTimings.domainLookupEnd);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "connectStart",
-                                               aTimings.connectStart);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "tcpConnectEnd",
-                                               aTimings.tcpConnectEnd);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "secureConnectionStart",
-                                               aTimings.secureConnectionStart);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "connectEnd",
-                                               aTimings.connectEnd);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "requestStart",
-                                               aTimings.requestStart);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "responseStart",
-                                               aTimings.responseStart);
-      mozilla::baseprofiler::WritePropertyTime(aWriter, "responseEnd",
-                                               aTimings.responseEnd);
-    }
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    return mozilla::MarkerSchema::SpecialFrontendLocation{};
-  }
-
- private:
-  static mozilla::Span<const char> GetNetworkState(NetworkLoadType aType) {
-    switch (aType) {
-      case NetworkLoadType::LOAD_START:
-        return mozilla::MakeStringSpan("STATUS_START");
-      case NetworkLoadType::LOAD_STOP:
-        return mozilla::MakeStringSpan("STATUS_STOP");
-      case NetworkLoadType::LOAD_REDIRECT:
-        return mozilla::MakeStringSpan("STATUS_REDIRECT");
-    }
-    return mozilla::MakeStringSpan("");
-  }
-
-  static mozilla::Span<const char> GetCacheState(
-      mozilla::net::CacheDisposition aCacheDisposition) {
-    switch (aCacheDisposition) {
-      case mozilla::net::kCacheUnresolved:
-        return mozilla::MakeStringSpan("Unresolved");
-      case mozilla::net::kCacheHit:
-        return mozilla::MakeStringSpan("Hit");
-      case mozilla::net::kCacheHitViaReval:
-        return mozilla::MakeStringSpan("HitViaReval");
-      case mozilla::net::kCacheMissedViaReval:
-        return mozilla::MakeStringSpan("MissedViaReval");
-      case mozilla::net::kCacheMissed:
-        return mozilla::MakeStringSpan("Missed");
-      case mozilla::net::kCacheUnknown:
-      default:
-        return mozilla::MakeStringSpan("");
-    }
-  }
-};
-
-struct ScreenshotPayload {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("CompositorScreenshot");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString8View& aScreenshotDataURL,
-      const mozilla::gfx::IntSize& aWindowSize, uintptr_t aWindowIdentifier) {
-    // TODO: Use UniqueStacks&Strings
-    // aUniqueStacks.mUniqueStrings->WriteProperty(aWriter, "url",
-    //                                             mScreenshotDataURL.get());
-    aWriter.StringProperty("url", aScreenshotDataURL);
-
-    char hexWindowID[32];
-    SprintfLiteral(hexWindowID, "0x%" PRIXPTR, aWindowIdentifier);
-    aWriter.StringProperty("windowID", hexWindowID);
-    aWriter.DoubleProperty("windowWidth", aWindowSize.width);
-    aWriter.DoubleProperty("windowHeight", aWindowSize.height);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    return mozilla::MarkerSchema::SpecialFrontendLocation{};
-  }
-};
-
-struct GCSlice {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("GCSlice");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString8View& aTimingJSON) {
-    if (aTimingJSON.Length() != 0) {
-      // TODO: Is SplicedJSONProperty necessary here? (Guessing yes!)
-      // aWriter.SplicedJSONProperty("timings", aTimingJSON);
-      aWriter.StringProperty("timings", aTimingJSON);
-    } else {
-      aWriter.NullProperty("timings");
-    }
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineMemory};
-    // No display instructions here, there is special handling in the front-end.
-    return schema;
-  }
-};
-
-struct GCMajor {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("GCMajor");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString8View& aTimingJSON) {
-    if (aTimingJSON.Length() != 0) {
-      // TODO: Is SplicedJSONProperty necessary here? (Guessing yes!)
-      // aWriter.SplicedJSONProperty("timings", aTimingJSON);
-      aWriter.StringProperty("timings", aTimingJSON);
-    } else {
-      aWriter.NullProperty("timings");
-    }
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineMemory};
-    // No display instructions here, there is special handling in the front-end.
-    return schema;
-  }
-};
-
-struct GCMinor {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("GCMinor");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString8View& aTimingJSON) {
-    if (aTimingJSON.Length() != 0) {
-      // TODO: Is SplicedJSONProperty necessary here? (Guessing yes!)
-      // aWriter.SplicedJSONProperty("nursery", aTimingJSON);
-      aWriter.StringProperty("nursery", aTimingJSON);
-    } else {
-      aWriter.NullProperty("nursery");
-    }
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineMemory};
-    // No display instructions here, there is special handling in the front-end.
-    return schema;
-  }
-};
-
-struct StyleMarkerPayload {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("Styles");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ServoTraversalStatistics& aStats) {
-    aWriter.IntProperty("elementsTraversed", aStats.mElementsTraversed);
-    aWriter.IntProperty("elementsStyled", aStats.mElementsStyled);
-    aWriter.IntProperty("elementsMatched", aStats.mElementsMatched);
-    aWriter.IntProperty("stylesShared", aStats.mStylesShared);
-    aWriter.IntProperty("stylesReused", aStats.mStylesReused);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    using MS = mozilla::MarkerSchema;
-    MS schema{MS::Location::markerChart, MS::Location::markerTable,
-              MS::Location::timelineOverview};
-    schema.AddKeyLabelFormat("elementsTraversed", "Elements traversed",
-                             MS::Format::integer);
-    schema.AddKeyLabelFormat("elementsStyled", "Elements styled",
-                             MS::Format::integer);
-    schema.AddKeyLabelFormat("elementsMatched", "Elements matched",
-                             MS::Format::integer);
-    schema.AddKeyLabelFormat("stylesShared", "Styles shared",
-                             MS::Format::integer);
-    schema.AddKeyLabelFormat("stylesReused", "Styles reused",
-                             MS::Format::integer);
-    return schema;
-  }
-};
-
-class JsAllocationMarkerPayload {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("JS allocation");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
-      const mozilla::ProfilerString16View& aTypeName,
-      const mozilla::ProfilerString8View& aClassName,
-      const mozilla::ProfilerString16View& aDescriptiveTypeName,
-      const mozilla::ProfilerString8View& aCoarseType, uint64_t aSize,
-      bool aInNursery) {
-    if (aClassName.Length() != 0) {
-      aWriter.StringProperty("className", aClassName);
-    }
-    if (aTypeName.Length() != 0) {
-      aWriter.StringProperty(
-          "typeName",
-          NS_ConvertUTF16toUTF8(aTypeName.Data(), aTypeName.Length()));
-    }
-    if (aDescriptiveTypeName.Length() != 0) {
-      aWriter.StringProperty(
-          "descriptiveTypeName",
-          NS_ConvertUTF16toUTF8(aDescriptiveTypeName.Data(),
-                                aDescriptiveTypeName.Length()));
-    }
-    aWriter.StringProperty("coarseType", aCoarseType);
-    aWriter.IntProperty("size", aSize);
-    aWriter.BoolProperty("inNursery", aInNursery);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    return mozilla::MarkerSchema::SpecialFrontendLocation{};
-  }
-};
-
-// This payload is for collecting information about native allocations. There is
-// a memory hook into malloc and other memory functions that can sample a subset
-// of the allocations. This information is then stored in this payload.
-struct NativeAllocationMarkerPayload {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("Native allocation");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter, int64_t aSize,
-      uintptr_t aMemoryAddress, int aThreadId) {
-    aWriter.IntProperty("size", aSize);
-    aWriter.IntProperty("memoryAddress", static_cast<int64_t>(aMemoryAddress));
-    aWriter.IntProperty("threadId", aThreadId);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    return mozilla::MarkerSchema::SpecialFrontendLocation{};
-  }
-};
-
-struct IPCMarkerPayload {
-  static constexpr mozilla::Span<const char> MarkerTypeName() {
-    return mozilla::MakeStringSpan("IPC");
-  }
-  static void StreamJSONMarkerData(
-      mozilla::baseprofiler::SpliceableJSONWriter& aWriter, int32_t aOtherPid,
-      int32_t aMessageSeqno, IPC::Message::msgid_t aMessageType,
-      mozilla::ipc::Side aSide, mozilla::ipc::MessageDirection aDirection,
-      mozilla::ipc::MessagePhase aPhase, bool aSync,
-      const mozilla::TimeStamp& aTime) {
-    // TODO: Remove these Legacy times when frontend is updated.
-    mozilla::baseprofiler::WritePropertyTime(aWriter, "startTime", aTime);
-    mozilla::baseprofiler::WritePropertyTime(aWriter, "endTime", aTime);
-
-    using namespace mozilla::ipc;
-    aWriter.IntProperty("otherPid", aOtherPid);
-    aWriter.IntProperty("messageSeqno", aMessageSeqno);
-    aWriter.StringProperty(
-        "messageType",
-        mozilla::MakeStringSpan(IPC::StringFromIPCMessageType(aMessageType)));
-    aWriter.StringProperty("side", IPCSideToString(aSide));
-    aWriter.StringProperty("direction",
-                           aDirection == MessageDirection::eSending
-                               ? mozilla::MakeStringSpan("sending")
-                               : mozilla::MakeStringSpan("receiving"));
-    aWriter.StringProperty("phase", IPCPhaseToString(aPhase));
-    aWriter.BoolProperty("sync", aSync);
-  }
-  static mozilla::MarkerSchema MarkerTypeDisplay() {
-    return mozilla::MarkerSchema::SpecialFrontendLocation{};
-  }
-
- private:
-  static mozilla::Span<const char> IPCSideToString(mozilla::ipc::Side aSide) {
-    switch (aSide) {
-      case mozilla::ipc::ParentSide:
-        return mozilla::MakeStringSpan("parent");
-      case mozilla::ipc::ChildSide:
-        return mozilla::MakeStringSpan("child");
-      case mozilla::ipc::UnknownSide:
-        return mozilla::MakeStringSpan("unknown");
-      default:
-        MOZ_ASSERT_UNREACHABLE("Invalid IPC side");
-        return mozilla::MakeStringSpan("<invalid IPC side>");
-    }
-  }
-
-  static mozilla::Span<const char> IPCPhaseToString(
-      mozilla::ipc::MessagePhase aPhase) {
-    switch (aPhase) {
-      case mozilla::ipc::MessagePhase::Endpoint:
-        return mozilla::MakeStringSpan("endpoint");
-      case mozilla::ipc::MessagePhase::TransferStart:
-        return mozilla::MakeStringSpan("transferStart");
-      case mozilla::ipc::MessagePhase::TransferEnd:
-        return mozilla::MakeStringSpan("transferEnd");
-      default:
-        MOZ_ASSERT_UNREACHABLE("Invalid IPC phase");
-        return mozilla::MakeStringSpan("<invalid IPC phase>");
-    }
-  }
-};
+using MediaSampleMarker = mozilla::baseprofiler::markers::MediaSampleMarker;
+using ContentBuildMarker = mozilla::baseprofiler::markers::ContentBuildMarker;
 
 }  // namespace geckoprofiler::markers
 
diff -Nru firefox-84.0.2+build1/tools/profiler/public/ProfilerParent.h firefox-85.0+build1/tools/profiler/public/ProfilerParent.h
--- firefox-84.0.2+build1/tools/profiler/public/ProfilerParent.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/public/ProfilerParent.h	2021-01-18 19:58:27.000000000 +0000
@@ -67,6 +67,9 @@
   // Create a "Final" update that the Child can return to its Parent.
   static ProfileBufferChunkManagerUpdate MakeFinalUpdate();
 
+  // True if the ProfilerParent holds a lock on this thread.
+  static bool IsLockedOnCurrentThread();
+
  private:
   friend class ProfileBufferGlobalController;
   friend class ProfilerParentTracker;
diff -Nru firefox-84.0.2+build1/tools/profiler/tests/browser/browser.ini firefox-85.0+build1/tools/profiler/tests/browser/browser.ini
--- firefox-84.0.2+build1/tools/profiler/tests/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/tests/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = tsan # TSan times out on pretty much all of these tests
 support-files =
   ../shared-head.js
   head.js
diff -Nru firefox-84.0.2+build1/tools/profiler/tests/gtest/GeckoProfiler.cpp firefox-85.0+build1/tools/profiler/tests/gtest/GeckoProfiler.cpp
--- firefox-84.0.2+build1/tools/profiler/tests/gtest/GeckoProfiler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/tests/gtest/GeckoProfiler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,7 +14,6 @@
 #include "mozilla/ProfilerMarkers.h"
 #include "platform.h"
 #include "ProfileBuffer.h"
-#include "ProfilerMarkerPayload.h"
 
 #include "js/Initialization.h"
 #include "js/Printf.h"
@@ -84,6 +83,154 @@
   }
 }
 
+// Common JSON checks.
+
+// Does the GETTER return a non-null TYPE? (Non-critical)
+#define EXPECT_HAS_JSON(GETTER, TYPE)                                         \
+  do {                                                                        \
+    if ((GETTER).isNull()) {                                                  \
+      EXPECT_FALSE((GETTER).isNull()) << #GETTER " doesn't exist or is null"; \
+    } else if (!(GETTER).is##TYPE()) {                                        \
+      EXPECT_TRUE((GETTER).is##TYPE())                                        \
+          << #GETTER " didn't return type " #TYPE;                            \
+    }                                                                         \
+  } while (false)
+
+// Does the GETTER return a non-null TYPE? (Critical)
+#define ASSERT_HAS_JSON(GETTER, TYPE) \
+  do {                                \
+    ASSERT_FALSE((GETTER).isNull());  \
+    ASSERT_TRUE((GETTER).is##TYPE()); \
+  } while (false)
+
+// Does the GETTER return a non-null TYPE? (Critical)
+// If yes, store the value into VARIABLE.
+#define GET_JSON(VARIABLE, GETTER, TYPE) \
+  ASSERT_HAS_JSON(GETTER, TYPE);         \
+  const Json::Value& VARIABLE = (GETTER)
+
+// Checks that the GETTER's value is present, is of the expected TYPE, and has
+// the expected VALUE. (Non-critical)
+#define EXPECT_EQ_JSON(GETTER, TYPE, VALUE)                                   \
+  do {                                                                        \
+    if ((GETTER).isNull()) {                                                  \
+      EXPECT_FALSE((GETTER).isNull()) << #GETTER " doesn't exist or is null"; \
+    } else if (!(GETTER).is##TYPE()) {                                        \
+      EXPECT_TRUE((GETTER).is##TYPE())                                        \
+          << #GETTER " didn't return type " #TYPE;                            \
+    } else {                                                                  \
+      EXPECT_EQ((GETTER).as##TYPE(), (VALUE));                                \
+    }                                                                         \
+  } while (false)
+
+// Checks that the GETTER's value is present, and is a valid index into the
+// STRINGTABLE array, pointing at the expected STRING.
+#define EXPECT_EQ_STRINGTABLE(GETTER, STRINGTABLE, STRING)                    \
+  do {                                                                        \
+    if ((GETTER).isNull()) {                                                  \
+      EXPECT_FALSE((GETTER).isNull()) << #GETTER " doesn't exist or is null"; \
+    } else if (!(GETTER).isUInt()) {                                          \
+      EXPECT_TRUE((GETTER).isUInt()) << #GETTER " didn't return an index";    \
+    } else {                                                                  \
+      EXPECT_LT((GETTER).asUInt(), (STRINGTABLE).size());                     \
+      EXPECT_EQ_JSON((STRINGTABLE)[(GETTER).asUInt()], String, (STRING));     \
+    }                                                                         \
+  } while (false)
+
+#define EXPECT_JSON_ARRAY_CONTAINS(GETTER, TYPE, VALUE)                       \
+  do {                                                                        \
+    if ((GETTER).isNull()) {                                                  \
+      EXPECT_FALSE((GETTER).isNull()) << #GETTER " doesn't exist or is null"; \
+    } else if (!(GETTER).isArray()) {                                         \
+      EXPECT_TRUE((GETTER).is##TYPE()) << #GETTER " is not an array";         \
+    } else if (const Json::ArrayIndex size = (GETTER).size(); size == 0u) {   \
+      EXPECT_NE(size, 0u) << #GETTER " is an empty array";                    \
+    } else {                                                                  \
+      bool found = false;                                                     \
+      for (Json::ArrayIndex i = 0; i < size; ++i) {                           \
+        if (!(GETTER)[i].is##TYPE()) {                                        \
+          EXPECT_TRUE((GETTER)[i].is##TYPE())                                 \
+              << #GETTER "[" << i << "] is not " #TYPE;                       \
+          break;                                                              \
+        }                                                                     \
+        if ((GETTER)[i].as##TYPE() == (VALUE)) {                              \
+          found = true;                                                       \
+          break;                                                              \
+        }                                                                     \
+      }                                                                       \
+      EXPECT_TRUE(found) << #GETTER " doesn't contain " #VALUE;               \
+    }                                                                         \
+  } while (false)
+
+// Check that the given process root contains all the expected properties.
+static void JSONRootCheck(const Json::Value& aRoot,
+                          bool aWithMainThread = true) {
+  ASSERT_TRUE(aRoot.isObject());
+
+  EXPECT_HAS_JSON(aRoot["libs"], Array);
+
+  GET_JSON(meta, aRoot["meta"], Object);
+  EXPECT_HAS_JSON(meta["version"], UInt);
+  EXPECT_HAS_JSON(meta["startTime"], Double);
+
+  EXPECT_HAS_JSON(aRoot["pages"], Array);
+
+  EXPECT_HAS_JSON(aRoot["profilerOverhead"], Object);
+
+  GET_JSON(threads, aRoot["threads"], Array);
+  const Json::ArrayIndex threadCount = threads.size();
+  for (Json::ArrayIndex i = 0; i < threadCount; ++i) {
+    GET_JSON(thread, threads[i], Object);
+    EXPECT_HAS_JSON(thread["processType"], String);
+    EXPECT_HAS_JSON(thread["name"], String);
+    EXPECT_HAS_JSON(thread["registerTime"], Double);
+    EXPECT_HAS_JSON(thread["samples"], Object);
+    EXPECT_HAS_JSON(thread["markers"], Object);
+    EXPECT_HAS_JSON(thread["pid"], UInt);
+    EXPECT_HAS_JSON(thread["tid"], UInt);
+    EXPECT_HAS_JSON(thread["stackTable"], Object);
+    EXPECT_HAS_JSON(thread["frameTable"], Object);
+    EXPECT_HAS_JSON(thread["stringTable"], Array);
+  }
+
+  if (aWithMainThread) {
+    ASSERT_GT(threadCount, 0u);
+    GET_JSON(thread0, threads[0], Object);
+    EXPECT_EQ_JSON(thread0["name"], String, "GeckoMain");
+  }
+
+  EXPECT_HAS_JSON(aRoot["pausedRanges"], Array);
+
+  const Json::Value& processes = aRoot["processes"];
+  if (!processes.isNull()) {
+    ASSERT_TRUE(processes.isArray());
+    const Json::ArrayIndex processCount = processes.size();
+    for (Json::ArrayIndex i = 0; i < processCount; ++i) {
+      GET_JSON(process, processes[i], Object);
+      JSONRootCheck(process, aWithMainThread);
+    }
+  }
+}
+
+// Check that various expected top properties are in the JSON, and then call the
+// provided `aJSONCheckFunction` with the JSON root object.
+template <typename JSONCheckFunction>
+void JSONOutputCheck(const char* aOutput,
+                     JSONCheckFunction&& aJSONCheckFunction) {
+  ASSERT_NE(aOutput, nullptr);
+
+  // Extract JSON.
+  Json::Value parsedRoot;
+  Json::CharReaderBuilder builder;
+  const std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
+  ASSERT_TRUE(
+      reader->parse(aOutput, strchr(aOutput, '\0'), &parsedRoot, nullptr));
+
+  JSONRootCheck(parsedRoot);
+
+  std::forward<JSONCheckFunction>(aJSONCheckFunction)(parsedRoot);
+}
+
 typedef Vector<const char*> StrVec;
 
 static void InactiveFeaturesAndParamsCheck() {
@@ -579,75 +726,6 @@
   ASSERT_TRUE(!profiler_can_accept_markers());
 }
 
-// A class that keeps track of how many instances have been created, streamed,
-// and destroyed.
-class GTestMarkerPayload : public ProfilerMarkerPayload {
- public:
-  explicit GTestMarkerPayload(int aN) : mN(aN) { ++sNumCreated; }
-
-  virtual ~GTestMarkerPayload() { ++sNumDestroyed; }
-
-  DECL_STREAM_PAYLOAD
-
- private:
-  GTestMarkerPayload(CommonProps&& aCommonProps, int aN)
-      : ProfilerMarkerPayload(std::move(aCommonProps)), mN(aN) {
-    ++sNumDeserialized;
-  }
-
-  int mN;
-
- public:
-  // The number of GTestMarkerPayload instances that have been created,
-  // streamed, and destroyed.
-  static int sNumCreated;
-  static int sNumSerialized;
-  static int sNumDeserialized;
-  static int sNumStreamed;
-  static int sNumDestroyed;
-};
-
-int GTestMarkerPayload::sNumCreated = 0;
-int GTestMarkerPayload::sNumSerialized = 0;
-int GTestMarkerPayload::sNumDeserialized = 0;
-int GTestMarkerPayload::sNumStreamed = 0;
-int GTestMarkerPayload::sNumDestroyed = 0;
-
-ProfileBufferEntryWriter::Length GTestMarkerPayload::TagAndSerializationBytes()
-    const {
-  return CommonPropsTagAndSerializationBytes() +
-         ProfileBufferEntryWriter::SumBytes(mN);
-}
-
-void GTestMarkerPayload::SerializeTagAndPayload(
-    ProfileBufferEntryWriter& aEntryWriter) const {
-  static const DeserializerTag tag = TagForDeserializer(Deserialize);
-  SerializeTagAndCommonProps(tag, aEntryWriter);
-  aEntryWriter.WriteObject(mN);
-  ++sNumSerialized;
-}
-
-// static
-UniquePtr<ProfilerMarkerPayload> GTestMarkerPayload::Deserialize(
-    ProfileBufferEntryReader& aEntryReader) {
-  ProfilerMarkerPayload::CommonProps props =
-      DeserializeCommonProps(aEntryReader);
-  auto n = aEntryReader.ReadObject<int>();
-  return UniquePtr<ProfilerMarkerPayload>(
-      new GTestMarkerPayload(std::move(props), n));
-}
-
-void GTestMarkerPayload::StreamPayload(SpliceableJSONWriter& aWriter,
-                                       const mozilla::TimeStamp& aStartTime,
-                                       UniqueStacks& aUniqueStacks) const {
-  StreamCommonProps("gtest", aWriter, aStartTime, aUniqueStacks);
-  char buf[64];
-  int written = SprintfLiteral(buf, "gtest-%d", mN);
-  ASSERT_GT(written, 0);
-  aWriter.IntProperty(mozilla::Span<const char>(buf, size_t(written)), mN);
-  ++sNumStreamed;
-}
-
 TEST(GeckoProfiler, Markers)
 {
   uint32_t features = ProfilerFeature::StackWalk;
@@ -656,39 +734,20 @@
   profiler_start(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL, features,
                  filters, MOZ_ARRAY_LENGTH(filters), 0);
 
-  // Used in markers below.
-  TimeStamp ts0 = TimeStamp::NowUnfuzzed();
-
-  profiler_tracing_marker("A", "tracing event",
-                          JS::ProfilingCategoryPair::OTHER, TRACING_EVENT);
-  PROFILER_TRACING_MARKER("A", "tracing start", OTHER, TRACING_INTERVAL_START);
-  PROFILER_TRACING_MARKER("A", "tracing end", OTHER, TRACING_INTERVAL_END);
-
-  UniqueProfilerBacktrace bt = profiler_get_backtrace();
-  profiler_tracing_marker("B", "tracing event with stack",
-                          JS::ProfilingCategoryPair::OTHER, TRACING_EVENT,
-                          std::move(bt));
+  PROFILER_MARKER("tracing event", OTHER, {}, Tracing, "A");
+  PROFILER_MARKER("tracing start", OTHER, MarkerTiming::IntervalStart(),
+                  Tracing, "A");
+  PROFILER_MARKER("tracing end", OTHER, MarkerTiming::IntervalEnd(), Tracing,
+                  "A");
+
+  auto bt = profiler_capture_backtrace();
+  PROFILER_MARKER("tracing event with stack", OTHER,
+                  MarkerStack::TakeBacktrace(std::move(bt)), Tracing, "B");
 
   { AUTO_PROFILER_TRACING_MARKER("C", "auto tracing", OTHER); }
 
   PROFILER_MARKER_UNTYPED("M1", OTHER, {});
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("M2", OTHER, TracingMarkerPayload,
-                                   ("C", TRACING_EVENT, ts0));
   PROFILER_MARKER_UNTYPED("M3", OTHER, {});
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "M4", OTHER, TracingMarkerPayload,
-      ("C", TRACING_EVENT, ts0, mozilla::Nothing(), profiler_get_backtrace()));
-
-  for (int i = 0; i < 10; i++) {
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("M5", OTHER, GTestMarkerPayload, (i));
-  }
-  // The GTestMarkerPayloads should have been created, serialized, and
-  // destroyed.
-  EXPECT_EQ(GTestMarkerPayload::sNumCreated, 10);
-  EXPECT_EQ(GTestMarkerPayload::sNumSerialized, 10);
-  EXPECT_EQ(GTestMarkerPayload::sNumDeserialized, 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumStreamed, 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDestroyed, 10);
 
   // Create three strings: two that are the maximum allowed length, and one that
   // is one char longer.
@@ -756,135 +815,192 @@
 
   // Keep this one first! (It's used to record `ts1` and `ts2`, to compare
   // to serialized numbers in other markers.)
+  MOZ_RELEASE_ASSERT(profiler_add_marker(
+      "FirstMarker", geckoprofiler::category::OTHER,
+      MarkerTiming::Interval(ts1, ts2), geckoprofiler::markers::TextMarker{},
+      "First Marker"));
+
+  // User-defined marker type with different properties, and fake schema.
+  struct GtestMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("markers-gtest");
+    }
+    static void StreamJSONMarkerData(
+        mozilla::baseprofiler::SpliceableJSONWriter& aWriter, int aInt,
+        double aDouble, const mozilla::ProfilerString8View& aText,
+        const mozilla::ProfilerString8View& aUniqueText,
+        const mozilla::TimeStamp& aTime) {
+      aWriter.NullProperty("null");
+      aWriter.BoolProperty("bool-false", false);
+      aWriter.BoolProperty("bool-true", true);
+      aWriter.IntProperty("int", aInt);
+      aWriter.DoubleProperty("double", aDouble);
+      aWriter.StringProperty("text", aText);
+      aWriter.UniqueStringProperty("unique text", aUniqueText);
+      aWriter.UniqueStringProperty("unique text again", aUniqueText);
+      aWriter.TimeProperty("time", aTime);
+    }
+    static mozilla::MarkerSchema MarkerTypeDisplay() {
+      // Note: This is an test function that is not intended to actually output
+      // that correctly matches StreamJSONMarkerData data above! Instead we only
+      // test that it outputs the expected JSON at the end.
+      using MS = mozilla::MarkerSchema;
+      MS schema{MS::Location::markerChart,      MS::Location::markerTable,
+                MS::Location::timelineOverview, MS::Location::timelineMemory,
+                MS::Location::timelineIPC,      MS::Location::timelineFileIO,
+                MS::Location::stackChart};
+      // All label functions.
+      schema.SetChartLabel("chart label");
+      schema.SetTooltipLabel("tooltip label");
+      schema.SetTableLabel("table label");
+      // All data functions, all formats, all "searchable" values.
+      schema.AddKeyFormat("key with url", MS::Format::url);
+      schema.AddKeyLabelFormat("key with label filePath", "label filePath",
+                               MS::Format::filePath);
+      schema.AddKeyFormatSearchable("key with string not-searchable",
+                                    MS::Format::string,
+                                    MS::Searchable::notSearchable);
+      schema.AddKeyLabelFormatSearchable("key with label duration searchable",
+                                         "label duration", MS::Format::duration,
+                                         MS::Searchable::searchable);
+      schema.AddKeyFormat("key with time", MS::Format::time);
+      schema.AddKeyFormat("key with seconds", MS::Format::seconds);
+      schema.AddKeyFormat("key with milliseconds", MS::Format::milliseconds);
+      schema.AddKeyFormat("key with microseconds", MS::Format::microseconds);
+      schema.AddKeyFormat("key with nanoseconds", MS::Format::nanoseconds);
+      schema.AddKeyFormat("key with bytes", MS::Format::bytes);
+      schema.AddKeyFormat("key with percentage", MS::Format::percentage);
+      schema.AddKeyFormat("key with integer", MS::Format::integer);
+      schema.AddKeyFormat("key with decimal", MS::Format::decimal);
+      schema.AddStaticLabelValue("static label", "static value");
+      return schema;
+    }
+  };
   MOZ_RELEASE_ASSERT(
-      profiler_add_marker("FirstMarker", geckoprofiler::category::OTHER,
-                          MarkerTiming::Interval(ts1, ts2),
-                          geckoprofiler::markers::Text{}, "FirstMarker"));
+      profiler_add_marker("Gtest custom marker", geckoprofiler::category::OTHER,
+                          MarkerTiming::Interval(ts1, ts2), GtestMarker{}, 42,
+                          43.0, "gtest text", "gtest unique text", ts1));
+
+  // User-defined marker type with no data, special frontend schema.
+  struct GtestSpecialMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("markers-gtest-special");
+    }
+    static void StreamJSONMarkerData(
+        mozilla::baseprofiler::SpliceableJSONWriter& aWriter) {}
+    static mozilla::MarkerSchema MarkerTypeDisplay() {
+      return mozilla::MarkerSchema::SpecialFrontendLocation{};
+    }
+  };
+  MOZ_RELEASE_ASSERT(profiler_add_marker("Gtest special marker",
+                                         geckoprofiler::category::OTHER, {},
+                                         GtestSpecialMarker{}));
+
+  // User-defined marker type that is never used, so it shouldn't appear in the
+  // output.
+  struct GtestUnusedMarker {
+    static constexpr Span<const char> MarkerTypeName() {
+      return MakeStringSpan("markers-gtest-unused");
+    }
+    static void StreamJSONMarkerData(
+        mozilla::baseprofiler::SpliceableJSONWriter& aWriter) {}
+    static mozilla::MarkerSchema MarkerTypeDisplay() {
+      return mozilla::MarkerSchema::SpecialFrontendLocation{};
+    }
+  };
+
+  // Make sure the compiler doesn't complain about this unused struct.
+  mozilla::Unused << GtestUnusedMarker{};
 
   // Other markers in alphabetical order of payload class names.
 
-  {
-    const char gcMajorJSON[] = "42";
-    const auto len = strlen(gcMajorJSON);
-    char* buffer =
-        static_cast<char*>(js::SystemAllocPolicy{}.pod_malloc<char>(len + 1));
-    strncpy(buffer, gcMajorJSON, len);
-    buffer[len] = '\0';
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("GCMajorMarkerPayload marker", OTHER,
-                                     GCMajorMarkerPayload,
-                                     (ts1, ts2, JS::UniqueChars(buffer)));
-  }
-
-  {
-    const char gcMinorJSON[] = "43";
-    const auto len = strlen(gcMinorJSON);
-    char* buffer =
-        static_cast<char*>(js::SystemAllocPolicy{}.pod_malloc<char>(len + 1));
-    strncpy(buffer, gcMinorJSON, len);
-    buffer[len] = '\0';
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("GCMinorMarkerPayload marker", OTHER,
-                                     GCMinorMarkerPayload,
-                                     (ts1, ts2, JS::UniqueChars(buffer)));
-  }
-
-  {
-    const char gcSliceJSON[] = "44";
-    const auto len = strlen(gcSliceJSON);
-    char* buffer =
-        static_cast<char*>(js::SystemAllocPolicy{}.pod_malloc<char>(len + 1));
-    strncpy(buffer, gcSliceJSON, len);
-    buffer[len] = '\0';
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("GCSliceMarkerPayload marker", OTHER,
-                                     GCSliceMarkerPayload,
-                                     (ts1, ts2, JS::UniqueChars(buffer)));
-  }
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("HangMarkerPayload marker", OTHER,
-                                   HangMarkerPayload, (ts1, ts2));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("LogMarkerPayload marker", OTHER,
-                                   LogMarkerPayload, ("module", "text", ts1));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("LongTaskMarkerPayload marker", OTHER,
-                                   LongTaskMarkerPayload, (ts1, ts2));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("NativeAllocationMarkerPayload marker",
-                                   OTHER, NativeAllocationMarkerPayload,
-                                   (ts1, 9876543210, 1234, 5678, nullptr));
-
-  nsCString requestMethod = "GET"_ns;
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "NetworkMarkerPayload start marker", OTHER, NetworkMarkerPayload,
-      (1, "http://mozilla.org/", requestMethod, NetworkLoadType::LOAD_START,
-       ts1, ts2, 34, 56, net::kCacheHit, 78));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "NetworkMarkerPayload stop marker", OTHER, NetworkMarkerPayload,
-      (12, "http://mozilla.org/", requestMethod, NetworkLoadType::LOAD_STOP,
-       ts1, ts2, 34, 56, net::kCacheUnresolved, 78, nullptr, nullptr, nullptr,
-       Some(nsDependentCString("text/html"))));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "NetworkMarkerPayload redirect marker", OTHER, NetworkMarkerPayload,
-      (123, "http://mozilla.org/", requestMethod,
-       NetworkLoadType::LOAD_REDIRECT, ts1, ts2, 34, 56, net::kCacheUnresolved,
-       78, nullptr, "http://example.com/"));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "PrefMarkerPayload marker", OTHER, PrefMarkerPayload,
-      ("preference name", mozilla::Nothing(), mozilla::Nothing(),
-       "preference value"_ns, ts1));
-
-  nsCString screenshotURL = "url"_ns;
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "ScreenshotPayload marker", OTHER, ScreenshotPayload,
-      (ts1, std::move(screenshotURL), mozilla::gfx::IntSize(12, 34),
-       uintptr_t(0x45678u)));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("TextMarkerPayload marker 1", OTHER,
-                                   TextMarkerPayload, ("text"_ns, ts1));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("TextMarkerPayload marker 2", OTHER,
-                                   TextMarkerPayload, ("text"_ns, ts1, ts2));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("UserTimingMarkerPayload marker mark", OTHER,
-                                   UserTimingMarkerPayload,
-                                   (u"mark name"_ns, ts1, mozilla::Nothing()));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "UserTimingMarkerPayload marker measure", OTHER, UserTimingMarkerPayload,
-      (u"measure name"_ns, Some(u"start mark"_ns), Some(u"end mark"_ns), ts1,
-       ts2, mozilla::Nothing()));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("VsyncMarkerPayload marker", OTHER,
-                                   VsyncMarkerPayload, (ts1));
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD(
-      "IPCMarkerPayload marker", IPC, IPCMarkerPayload,
-      (1111, 1, 3 /* PAPZ::Msg_LayerTransforms */, mozilla::ipc::ParentSide,
-       mozilla::ipc::MessageDirection::eSending,
-       mozilla::ipc::MessagePhase::Endpoint, false, ts1));
+  nsCOMPtr<nsIURI> uri;
+  ASSERT_TRUE(
+      NS_SUCCEEDED(NS_NewURI(getter_AddRefs(uri), "http://mozilla.org/"_ns)));
+  // The marker name will be "Load <aChannelId>: <aURI>".
+  profiler_add_network_marker(
+      /* nsIURI* aURI */ uri,
+      /* const nsACString& aRequestMethod */ "GET"_ns,
+      /* int32_t aPriority */ 34,
+      /* uint64_t aChannelId */ 1,
+      /* NetworkLoadType aType */ NetworkLoadType::LOAD_START,
+      /* mozilla::TimeStamp aStart */ ts1,
+      /* mozilla::TimeStamp aEnd */ ts2,
+      /* int64_t aCount */ 56,
+      /* mozilla::net::CacheDisposition aCacheDisposition */
+      net::kCacheHit,
+      /* uint64_t aInnerWindowID */ 78
+      /* const mozilla::net::TimingStruct* aTimings = nullptr */
+      /* nsIURI* aRedirectURI = nullptr */
+      /* mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource =
+         nullptr */
+      /* const mozilla::Maybe<nsDependentCString>& aContentType =
+         mozilla::Nothing() */);
+
+  profiler_add_network_marker(
+      /* nsIURI* aURI */ uri,
+      /* const nsACString& aRequestMethod */ "GET"_ns,
+      /* int32_t aPriority */ 34,
+      /* uint64_t aChannelId */ 12,
+      /* NetworkLoadType aType */ NetworkLoadType::LOAD_STOP,
+      /* mozilla::TimeStamp aStart */ ts1,
+      /* mozilla::TimeStamp aEnd */ ts2,
+      /* int64_t aCount */ 56,
+      /* mozilla::net::CacheDisposition aCacheDisposition */
+      net::kCacheUnresolved,
+      /* uint64_t aInnerWindowID */ 78,
+      /* const mozilla::net::TimingStruct* aTimings = nullptr */ nullptr,
+      /* nsIURI* aRedirectURI = nullptr */ nullptr,
+      /* mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource =
+         nullptr */
+      nullptr,
+      /* const mozilla::Maybe<nsDependentCString>& aContentType =
+         mozilla::Nothing() */
+      Some(nsDependentCString("text/html")));
+
+  nsCOMPtr<nsIURI> redirectURI;
+  ASSERT_TRUE(NS_SUCCEEDED(
+      NS_NewURI(getter_AddRefs(redirectURI), "http://example.com/"_ns)));
+  profiler_add_network_marker(
+      /* nsIURI* aURI */ uri,
+      /* const nsACString& aRequestMethod */ "GET"_ns,
+      /* int32_t aPriority */ 34,
+      /* uint64_t aChannelId */ 123,
+      /* NetworkLoadType aType */ NetworkLoadType::LOAD_REDIRECT,
+      /* mozilla::TimeStamp aStart */ ts1,
+      /* mozilla::TimeStamp aEnd */ ts2,
+      /* int64_t aCount */ 56,
+      /* mozilla::net::CacheDisposition aCacheDisposition */
+      net::kCacheUnresolved,
+      /* uint64_t aInnerWindowID */ 78,
+      /* const mozilla::net::TimingStruct* aTimings = nullptr */ nullptr,
+      /* nsIURI* aRedirectURI = nullptr */ redirectURI
+      /* mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource =
+         nullptr */
+      /* const mozilla::Maybe<nsDependentCString>& aContentType =
+         mozilla::Nothing() */);
 
   MOZ_RELEASE_ASSERT(profiler_add_marker(
       "Text in main thread with stack", geckoprofiler::category::OTHER,
-      MarkerStack::Capture(), geckoprofiler::markers::Text{}, ""));
+      {MarkerStack::Capture(), MarkerTiming::Interval(ts1, ts2)},
+      geckoprofiler::markers::TextMarker{}, ""));
   MOZ_RELEASE_ASSERT(profiler_add_marker(
       "Text from main thread with stack", geckoprofiler::category::OTHER,
       MarkerOptions(MarkerThreadId::MainThread(), MarkerStack::Capture()),
-      geckoprofiler::markers::Text{}, ""));
+      geckoprofiler::markers::TextMarker{}, ""));
 
   std::thread registeredThread([]() {
     AUTO_PROFILER_REGISTER_THREAD("Marker test sub-thread");
     // Marker in non-profiled thread won't be stored.
     MOZ_RELEASE_ASSERT(profiler_add_marker(
         "Text in registered thread with stack", geckoprofiler::category::OTHER,
-        MarkerStack::Capture(), geckoprofiler::markers::Text{}, ""));
+        MarkerStack::Capture(), geckoprofiler::markers::TextMarker{}, ""));
     // Marker will be stored in main thread, with stack from registered thread.
     MOZ_RELEASE_ASSERT(profiler_add_marker(
         "Text from registered thread with stack",
         geckoprofiler::category::OTHER,
         MarkerOptions(MarkerThreadId::MainThread(), MarkerStack::Capture()),
-        geckoprofiler::markers::Text{}, ""));
+        geckoprofiler::markers::TextMarker{}, ""));
   });
   registeredThread.join();
 
@@ -893,14 +1009,14 @@
     MOZ_RELEASE_ASSERT(profiler_add_marker(
         "Text in unregistered thread with stack",
         geckoprofiler::category::OTHER, MarkerStack::Capture(),
-        geckoprofiler::markers::Text{}, ""));
+        geckoprofiler::markers::TextMarker{}, ""));
     // Marker will be stored in main thread, but stack cannot be captured in an
     // unregistered thread.
     MOZ_RELEASE_ASSERT(profiler_add_marker(
         "Text from unregistered thread with stack",
         geckoprofiler::category::OTHER,
         MarkerOptions(MarkerThreadId::MainThread(), MarkerStack::Capture()),
-        geckoprofiler::markers::Text{}, ""));
+        geckoprofiler::markers::TextMarker{}, ""));
   });
   unregisteredThread.join();
 
@@ -908,52 +1024,19 @@
       profiler_add_marker("Tracing", geckoprofiler::category::OTHER, {},
                           geckoprofiler::markers::Tracing{}, "category"));
 
-  MOZ_RELEASE_ASSERT(profiler_add_marker(
-      "UserTimingMark", geckoprofiler::category::OTHER, {},
-      geckoprofiler::markers::UserTimingMark{}, "mark name"));
-
-  MOZ_RELEASE_ASSERT(profiler_add_marker(
-      "UserTimingMeasure", geckoprofiler::category::OTHER, {},
-      geckoprofiler::markers::UserTimingMeasure{}, "measure name",
-      Some(mozilla::ProfilerString8View("start")),
-      Some(mozilla::ProfilerString8View("end"))));
-
-  MOZ_RELEASE_ASSERT(profiler_add_marker("Hang", geckoprofiler::category::OTHER,
-                                         {}, geckoprofiler::markers::Hang{}));
-
-  MOZ_RELEASE_ASSERT(profiler_add_marker("LongTask",
-                                         geckoprofiler::category::OTHER, {},
-                                         geckoprofiler::markers::LongTask{}));
-
-  MOZ_RELEASE_ASSERT(profiler_add_marker("Text", geckoprofiler::category::OTHER,
-                                         {}, geckoprofiler::markers::Text{},
-                                         "Text text"));
-
-  MOZ_RELEASE_ASSERT(profiler_add_marker("Log", geckoprofiler::category::OTHER,
-                                         {}, geckoprofiler::markers::Log{},
-                                         "module", "log text"));
-
   MOZ_RELEASE_ASSERT(
-      profiler_add_marker("MediaSample", geckoprofiler::category::OTHER, {},
-                          geckoprofiler::markers::MediaSample{}, 123, 456));
+      profiler_add_marker("Text", geckoprofiler::category::OTHER, {},
+                          geckoprofiler::markers::TextMarker{}, "Text text"));
 
-  MOZ_RELEASE_ASSERT(profiler_add_marker("Budget",
-                                         geckoprofiler::category::OTHER, {},
-                                         geckoprofiler::markers::Budget{}));
+  MOZ_RELEASE_ASSERT(profiler_add_marker(
+      "MediaSample", geckoprofiler::category::OTHER, {},
+      geckoprofiler::markers::MediaSampleMarker{}, 123, 456));
 
   SpliceableChunkedJSONWriter w;
   w.Start();
   EXPECT_TRUE(::profiler_stream_json_for_this_process(w));
   w.End();
 
-  // The GTestMarkerPayloads should have been deserialized, streamed, and
-  // destroyed.
-  EXPECT_EQ(GTestMarkerPayload::sNumCreated, 10 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumSerialized, 10 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDeserialized, 0 + 10);
-  EXPECT_EQ(GTestMarkerPayload::sNumStreamed, 0 + 10);
-  EXPECT_EQ(GTestMarkerPayload::sNumDestroyed, 10 + 10);
-
   UniquePtr<char[]> profile = w.ChunkedWriteFunc().CopyData();
   ASSERT_TRUE(!!profile.get());
 
@@ -966,42 +1049,17 @@
     S_tracing_auto_tracing_start,
     S_tracing_auto_tracing_end,
     S_M1,
-    S_tracing_M2_C,
     S_M3,
-    S_tracing_M4_C_stack,
-    S_M5_gtest0,
-    S_M5_gtest1,
-    S_M5_gtest2,
-    S_M5_gtest3,
-    S_M5_gtest4,
-    S_M5_gtest5,
-    S_M5_gtest6,
-    S_M5_gtest7,
-    S_M5_gtest8,
-    S_M5_gtest9,
     S_Markers2DefaultEmptyOptions,
     S_Markers2DefaultWithOptions,
     S_Markers2ExplicitDefaultEmptyOptions,
     S_Markers2ExplicitDefaultWithOptions,
     S_FirstMarker,
-    S_GCMajorMarkerPayload,
-    S_GCMinorMarkerPayload,
-    S_GCSliceMarkerPayload,
-    S_HangMarkerPayload,
-    S_LogMarkerPayload,
-    S_LongTaskMarkerPayload,
-    S_NativeAllocationMarkerPayload,
+    S_CustomMarker,
+    S_SpecialMarker,
     S_NetworkMarkerPayload_start,
     S_NetworkMarkerPayload_stop,
     S_NetworkMarkerPayload_redirect,
-    S_PrefMarkerPayload,
-    S_ScreenshotPayload,
-    S_TextMarkerPayload1,
-    S_TextMarkerPayload2,
-    S_UserTimingMarkerPayload_mark,
-    S_UserTimingMarkerPayload_measure,
-    S_VsyncMarkerPayload,
-    S_IPCMarkerPayload,
     S_TextWithStack,
     S_TextToMTWithStack,
     S_RegThread_TextToMTWithStack,
@@ -1016,138 +1074,90 @@
   double ts1Double = 0.0;
   double ts2Double = 0.0;
 
-  // Extract JSON.
-  Json::Value parsedRoot;
-  Json::CharReaderBuilder builder;
-  const std::unique_ptr<Json::CharReader> reader(builder.newCharReader());
-  ASSERT_TRUE(reader->parse(profile.get(), strchr(profile.get(), '\0'),
-                            &parsedRoot, nullptr));
-
-  // Use const root, we only want to test what's in the profile, not change it.
-  const Json::Value& root = parsedRoot;
-  ASSERT_TRUE(root.isObject());
-
-  // We have a root object.
-
-  // Most common test: Checks that the given value is present, is of the
-  // expected type, and has the expected value.
-#define EXPECT_EQ_JSON(GETTER, TYPE, VALUE)  \
-  if ((GETTER).isNull()) {                   \
-    EXPECT_FALSE((GETTER).isNull());         \
-  } else if (!(GETTER).is##TYPE()) {         \
-    EXPECT_TRUE((GETTER).is##TYPE());        \
-  } else {                                   \
-    EXPECT_EQ((GETTER).as##TYPE(), (VALUE)); \
-  }
-
-  // Checks that the given value is present, and is a valid index into the
-  // stringTable, pointing at the expected string.
-#define EXPECT_EQ_STRINGTABLE(GETTER, STRING)                         \
-  if ((GETTER).isNull()) {                                            \
-    EXPECT_FALSE((GETTER).isNull());                                  \
-  } else if (!(GETTER).isUInt()) {                                    \
-    EXPECT_TRUE((GETTER).isUInt());                                   \
-  } else {                                                            \
-    EXPECT_LT((GETTER).asUInt(), stringTable.size());                 \
-    EXPECT_EQ_JSON(stringTable[(GETTER).asUInt()], String, (STRING)); \
-  }
-
-  {
-    const Json::Value& threads = root["threads"];
-    ASSERT_TRUE(!threads.isNull());
-    ASSERT_TRUE(threads.isArray());
-    ASSERT_EQ(threads.size(), 1u);
-
-    // root.threads is a 1-element array.
-
+  JSONOutputCheck(profile.get(), [&](const Json::Value& root) {
     {
-      const Json::Value& thread0 = threads[0];
-      ASSERT_TRUE(thread0.isObject());
-
-      // root.threads[0] is an object.
-
-      // Keep a reference to the string table in this block, it will be used
-      // below.
-      const Json::Value& stringTable = thread0["stringTable"];
-      ASSERT_TRUE(stringTable.isArray());
-
-      // Test the expected labels in the string table.
-      bool foundEmpty = false;
-      bool foundOkstr1 = false;
-      bool foundOkstr2 = false;
-      const std::string okstr2Label = std::string("okstr2 ") + okstr2.get();
-      bool foundTooLong = false;
-      for (const auto& s : stringTable) {
-        ASSERT_TRUE(s.isString());
-        std::string sString = s.asString();
-        if (sString.empty()) {
-          EXPECT_FALSE(foundEmpty);
-          foundEmpty = true;
-        } else if (sString == okstr1.get()) {
-          EXPECT_FALSE(foundOkstr1);
-          foundOkstr1 = true;
-        } else if (sString == okstr2Label) {
-          EXPECT_FALSE(foundOkstr2);
-          foundOkstr2 = true;
-        } else if (sString == longstrCut.get()) {
-          EXPECT_FALSE(foundTooLong);
-          foundTooLong = true;
-        } else {
-          EXPECT_NE(sString, longstr.get());
-        }
-      }
-      EXPECT_TRUE(foundEmpty);
-      EXPECT_TRUE(foundOkstr1);
-      EXPECT_TRUE(foundOkstr2);
-      EXPECT_TRUE(foundTooLong);
+      GET_JSON(threads, root["threads"], Array);
+      ASSERT_EQ(threads.size(), 1u);
 
       {
-        const Json::Value& markers = thread0["markers"];
-        ASSERT_TRUE(markers.isObject());
+        GET_JSON(thread0, threads[0], Object);
 
-        // root.threads[0].markers is an object.
+        // Keep a reference to the string table in this block, it will be used
+        // below.
+        GET_JSON(stringTable, thread0["stringTable"], Array);
+        ASSERT_TRUE(stringTable.isArray());
+
+        // Test the expected labels in the string table.
+        bool foundEmpty = false;
+        bool foundOkstr1 = false;
+        bool foundOkstr2 = false;
+        const std::string okstr2Label = std::string("okstr2 ") + okstr2.get();
+        bool foundTooLong = false;
+        for (const auto& s : stringTable) {
+          ASSERT_TRUE(s.isString());
+          std::string sString = s.asString();
+          if (sString.empty()) {
+            EXPECT_FALSE(foundEmpty);
+            foundEmpty = true;
+          } else if (sString == okstr1.get()) {
+            EXPECT_FALSE(foundOkstr1);
+            foundOkstr1 = true;
+          } else if (sString == okstr2Label) {
+            EXPECT_FALSE(foundOkstr2);
+            foundOkstr2 = true;
+          } else if (sString == longstrCut.get()) {
+            EXPECT_FALSE(foundTooLong);
+            foundTooLong = true;
+          } else {
+            EXPECT_NE(sString, longstr.get());
+          }
+        }
+        EXPECT_TRUE(foundEmpty);
+        EXPECT_TRUE(foundOkstr1);
+        EXPECT_TRUE(foundOkstr2);
+        EXPECT_TRUE(foundTooLong);
 
         {
-          const Json::Value& data = markers["data"];
-          ASSERT_TRUE(data.isArray());
+          GET_JSON(markers, thread0["markers"], Object);
 
-          // root.threads[0].markers.data is an array.
+          {
+            GET_JSON(data, markers["data"], Array);
 
-          for (const Json::Value& marker : data) {
-            // Name the indexes into the marker tuple:
-            // [name, startTime, endTime, phase, category, payload]
-            const unsigned int NAME = 0u;
-            const unsigned int START_TIME = 1u;
-            const unsigned int END_TIME = 2u;
-            const unsigned int PHASE = 3u;
-            const unsigned int CATEGORY = 4u;
-            const unsigned int PAYLOAD = 5u;
-
-            const unsigned int PHASE_INSTANT = 0;
-            const unsigned int PHASE_INTERVAL = 1;
-            const unsigned int PHASE_START = 2;
-            const unsigned int PHASE_END = 3;
-
-            const unsigned int SIZE_WITHOUT_PAYLOAD = 5u;
-            const unsigned int SIZE_WITH_PAYLOAD = 6u;
-
-            ASSERT_TRUE(marker.isArray());
-            // The payload is optional.
-            ASSERT_GE(marker.size(), SIZE_WITHOUT_PAYLOAD);
-            ASSERT_LE(marker.size(), SIZE_WITH_PAYLOAD);
-
-            // root.threads[0].markers.data[i] is an array with 5 or 6 elements.
-
-            ASSERT_TRUE(marker[NAME].isUInt());  // name id
-            const Json::Value& name = stringTable[marker[NAME].asUInt()];
-            ASSERT_TRUE(name.isString());
-            std::string nameString = name.asString();
-
-            EXPECT_TRUE(marker[START_TIME].isNumeric());
-            EXPECT_TRUE(marker[END_TIME].isNumeric());
-            EXPECT_TRUE(marker[PHASE].isUInt());
-            EXPECT_TRUE(marker[PHASE].asUInt() < 4);
-            EXPECT_TRUE(marker[CATEGORY].isUInt());
+            for (const Json::Value& marker : data) {
+              // Name the indexes into the marker tuple:
+              // [name, startTime, endTime, phase, category, payload]
+              const unsigned int NAME = 0u;
+              const unsigned int START_TIME = 1u;
+              const unsigned int END_TIME = 2u;
+              const unsigned int PHASE = 3u;
+              const unsigned int CATEGORY = 4u;
+              const unsigned int PAYLOAD = 5u;
+
+              const unsigned int PHASE_INSTANT = 0;
+              const unsigned int PHASE_INTERVAL = 1;
+              const unsigned int PHASE_START = 2;
+              const unsigned int PHASE_END = 3;
+
+              const unsigned int SIZE_WITHOUT_PAYLOAD = 5u;
+              const unsigned int SIZE_WITH_PAYLOAD = 6u;
+
+              ASSERT_TRUE(marker.isArray());
+              // The payload is optional.
+              ASSERT_GE(marker.size(), SIZE_WITHOUT_PAYLOAD);
+              ASSERT_LE(marker.size(), SIZE_WITH_PAYLOAD);
+
+              // root.threads[0].markers.data[i] is an array with 5 or 6
+              // elements.
+
+              ASSERT_TRUE(marker[NAME].isUInt());  // name id
+              GET_JSON(name, stringTable[marker[NAME].asUInt()], String);
+              std::string nameString = name.asString();
+
+              EXPECT_TRUE(marker[START_TIME].isNumeric());
+              EXPECT_TRUE(marker[END_TIME].isNumeric());
+              EXPECT_TRUE(marker[PHASE].isUInt());
+              EXPECT_TRUE(marker[PHASE].asUInt() < 4);
+              EXPECT_TRUE(marker[CATEGORY].isUInt());
 
 #define EXPECT_TIMING_INSTANT                  \
   EXPECT_NE(marker[START_TIME].asDouble(), 0); \
@@ -1183,19 +1193,19 @@
   EXPECT_EQ(marker[END_TIME].asDouble(), end); \
   EXPECT_EQ(marker[PHASE].asUInt(), PHASE_END);
 
-            if (marker.size() == SIZE_WITHOUT_PAYLOAD) {
-              // root.threads[0].markers.data[i] is an array with 5 elements,
-              // so there is no payload.
-              if (nameString == "M1") {
-                ASSERT_EQ(state, S_M1);
-                state = State(state + 1);
-              } else if (nameString == "M3") {
-                ASSERT_EQ(state, S_M3);
-                state = State(state + 1);
-              } else if (nameString ==
-                         "default-templated markers 2.0 with empty options") {
-                EXPECT_EQ(state, S_Markers2DefaultEmptyOptions);
-                state = State(S_Markers2DefaultEmptyOptions + 1);
+              if (marker.size() == SIZE_WITHOUT_PAYLOAD) {
+                // root.threads[0].markers.data[i] is an array with 5 elements,
+                // so there is no payload.
+                if (nameString == "M1") {
+                  ASSERT_EQ(state, S_M1);
+                  state = State(state + 1);
+                } else if (nameString == "M3") {
+                  ASSERT_EQ(state, S_M3);
+                  state = State(state + 1);
+                } else if (nameString ==
+                           "default-templated markers 2.0 with empty options") {
+                  EXPECT_EQ(state, S_Markers2DefaultEmptyOptions);
+                  state = State(S_Markers2DefaultEmptyOptions + 1);
 // TODO: Re-enable this when bug 1646714 lands, and check for stack.
 #if 0
               } else if (nameString ==
@@ -1203,594 +1213,465 @@
                 EXPECT_EQ(state, S_Markers2DefaultWithOptions);
                 state = State(S_Markers2DefaultWithOptions + 1);
 #endif
-              } else if (nameString ==
-                         "explicitly-default-templated markers 2.0 with empty "
-                         "options") {
-                EXPECT_EQ(state, S_Markers2ExplicitDefaultEmptyOptions);
-                state = State(S_Markers2ExplicitDefaultEmptyOptions + 1);
-              } else if (nameString ==
-                         "explicitly-default-templated markers 2.0 with "
-                         "option") {
-                EXPECT_EQ(state, S_Markers2ExplicitDefaultWithOptions);
-                state = State(S_Markers2ExplicitDefaultWithOptions + 1);
-              }
-            } else {
-              // root.threads[0].markers.data[i] is an array with 6 elements,
-              // so there is a payload.
-              const Json::Value& payload = marker[PAYLOAD];
-              ASSERT_TRUE(payload.isObject());
-
-              // root.threads[0].markers.data[i][PAYLOAD] is an object
-              // (payload).
-
-              // It should at least have a "type" string.
-              const Json::Value& type = payload["type"];
-              ASSERT_TRUE(type.isString());
-              std::string typeString = type.asString();
-
-              if (nameString == "tracing event") {
-                EXPECT_EQ(state, S_tracing_event);
-                state = State(S_tracing_event + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_INSTANT;
-                EXPECT_EQ_JSON(payload["category"], String, "A");
-                EXPECT_TRUE(payload["interval"].isNull());
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "tracing start") {
-                EXPECT_EQ(state, S_tracing_start);
-                state = State(S_tracing_start + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_START;
-                EXPECT_EQ_JSON(payload["category"], String, "A");
-                EXPECT_EQ_JSON(payload["interval"], String, "start");
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "tracing end") {
-                EXPECT_EQ(state, S_tracing_end);
-                state = State(S_tracing_end + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_END;
-                EXPECT_EQ_JSON(payload["category"], String, "A");
-                EXPECT_EQ_JSON(payload["interval"], String, "end");
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "tracing event with stack") {
-                EXPECT_EQ(state, S_tracing_event_with_stack);
-                state = State(S_tracing_event_with_stack + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_INSTANT;
-                EXPECT_EQ_JSON(payload["category"], String, "B");
-                EXPECT_TRUE(payload["interval"].isNull());
-                EXPECT_TRUE(payload["stack"].isObject());
-
-              } else if (nameString == "auto tracing") {
-                switch (state) {
-                  case S_tracing_auto_tracing_start:
-                    state = State(S_tracing_auto_tracing_start + 1);
-                    EXPECT_EQ(typeString, "tracing");
-                    EXPECT_TIMING_START;
-                    EXPECT_EQ_JSON(payload["category"], String, "C");
-                    EXPECT_EQ_JSON(payload["interval"], String, "start");
-                    EXPECT_TRUE(payload["stack"].isNull());
-                    break;
-                  case S_tracing_auto_tracing_end:
-                    state = State(S_tracing_auto_tracing_end + 1);
-                    EXPECT_EQ(typeString, "tracing");
-                    EXPECT_TIMING_END;
-                    EXPECT_EQ_JSON(payload["category"], String, "C");
-                    EXPECT_EQ_JSON(payload["interval"], String, "end");
-                    ASSERT_TRUE(payload["stack"].isNull());
-                    break;
-                  default:
-                    EXPECT_TRUE(state == S_tracing_auto_tracing_start ||
-                                state == S_tracing_auto_tracing_end);
-                    break;
+                } else if (nameString ==
+                           "explicitly-default-templated markers 2.0 with "
+                           "empty "
+                           "options") {
+                  EXPECT_EQ(state, S_Markers2ExplicitDefaultEmptyOptions);
+                  state = State(S_Markers2ExplicitDefaultEmptyOptions + 1);
+                } else if (nameString ==
+                           "explicitly-default-templated markers 2.0 with "
+                           "option") {
+                  EXPECT_EQ(state, S_Markers2ExplicitDefaultWithOptions);
+                  state = State(S_Markers2ExplicitDefaultWithOptions + 1);
                 }
-
-              } else if (nameString == "M2") {
-                EXPECT_EQ(state, S_tracing_M2_C);
-                state = State(S_tracing_M2_C + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_INSTANT;
-                EXPECT_EQ_JSON(payload["category"], String, "C");
-                EXPECT_TRUE(payload["interval"].isNull());
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "M4") {
-                EXPECT_EQ(state, S_tracing_M4_C_stack);
-                state = State(S_tracing_M4_C_stack + 1);
-                EXPECT_EQ(typeString, "tracing");
-                EXPECT_TIMING_INSTANT;
-                EXPECT_EQ_JSON(payload["category"], String, "C");
-                EXPECT_TRUE(payload["interval"].isNull());
-                EXPECT_TRUE(payload["stack"].isObject());
-
-              } else if (nameString == "M5") {
-                EXPECT_EQ(typeString, "gtest");
-                // It should only have one more element (apart from "type").
-                ASSERT_EQ(payload.size(), 2u);
-                const auto itEnd = payload.end();
-                for (auto it = payload.begin(); it != itEnd; ++it) {
-                  std::string key = it.name();
-                  if (key != "type") {
-                    const Json::Value& value = *it;
-                    ASSERT_TRUE(value.isInt());
-                    int valueInt = value.asInt();
-                    // We expect `"gtest-<i>" : <i>`.
-                    EXPECT_EQ(state, State(S_M5_gtest0 + valueInt));
-                    state = State(state + 1);
-                    EXPECT_EQ(key,
-                              std::string("gtest-") + std::to_string(valueInt));
+              } else {
+                // root.threads[0].markers.data[i] is an array with 6 elements,
+                // so there is a payload.
+                GET_JSON(payload, marker[PAYLOAD], Object);
+
+                // root.threads[0].markers.data[i][PAYLOAD] is an object
+                // (payload).
+
+                // It should at least have a "type" string.
+                GET_JSON(type, payload["type"], String);
+                std::string typeString = type.asString();
+
+                if (nameString == "tracing event") {
+                  EXPECT_EQ(state, S_tracing_event);
+                  state = State(S_tracing_event + 1);
+                  EXPECT_EQ(typeString, "tracing");
+                  EXPECT_TIMING_INSTANT;
+                  EXPECT_EQ_JSON(payload["category"], String, "A");
+                  EXPECT_TRUE(payload["stack"].isNull());
+
+                } else if (nameString == "tracing start") {
+                  EXPECT_EQ(state, S_tracing_start);
+                  state = State(S_tracing_start + 1);
+                  EXPECT_EQ(typeString, "tracing");
+                  EXPECT_TIMING_START;
+                  EXPECT_EQ_JSON(payload["category"], String, "A");
+                  EXPECT_TRUE(payload["stack"].isNull());
+
+                } else if (nameString == "tracing end") {
+                  EXPECT_EQ(state, S_tracing_end);
+                  state = State(S_tracing_end + 1);
+                  EXPECT_EQ(typeString, "tracing");
+                  EXPECT_TIMING_END;
+                  EXPECT_EQ_JSON(payload["category"], String, "A");
+                  EXPECT_TRUE(payload["stack"].isNull());
+
+                } else if (nameString == "tracing event with stack") {
+                  EXPECT_EQ(state, S_tracing_event_with_stack);
+                  state = State(S_tracing_event_with_stack + 1);
+                  EXPECT_EQ(typeString, "tracing");
+                  EXPECT_TIMING_INSTANT;
+                  EXPECT_EQ_JSON(payload["category"], String, "B");
+                  EXPECT_TRUE(payload["stack"].isObject());
+
+                } else if (nameString == "auto tracing") {
+                  switch (state) {
+                    case S_tracing_auto_tracing_start:
+                      state = State(S_tracing_auto_tracing_start + 1);
+                      EXPECT_EQ(typeString, "tracing");
+                      EXPECT_TIMING_START;
+                      EXPECT_EQ_JSON(payload["category"], String, "C");
+                      EXPECT_TRUE(payload["stack"].isNull());
+                      break;
+                    case S_tracing_auto_tracing_end:
+                      state = State(S_tracing_auto_tracing_end + 1);
+                      EXPECT_EQ(typeString, "tracing");
+                      EXPECT_TIMING_END;
+                      EXPECT_EQ_JSON(payload["category"], String, "C");
+                      ASSERT_TRUE(payload["stack"].isNull());
+                      break;
+                    default:
+                      EXPECT_TRUE(state == S_tracing_auto_tracing_start ||
+                                  state == S_tracing_auto_tracing_end);
+                      break;
                   }
-                }
-
-              } else if (nameString ==
-                         "default-templated markers 2.0 with option") {
-                // TODO: Remove this when bug 1646714 lands.
-                EXPECT_EQ(state, S_Markers2DefaultWithOptions);
-                state = State(S_Markers2DefaultWithOptions + 1);
-                EXPECT_EQ(typeString, "NoPayloadUserData");
-                EXPECT_FALSE(payload["stack"].isNull());
-
-              } else if (nameString == "FirstMarker") {
-                // Record start and end times, to compare with timestamps in
-                // following markers.
-                EXPECT_EQ(state, S_FirstMarker);
-                ts1Double = marker[START_TIME].asDouble();
-                ts2Double = marker[END_TIME].asDouble();
-                state = State(S_FirstMarker + 1);
-              } else if (nameString == "GCMajorMarkerPayload marker") {
-                EXPECT_EQ(state, S_GCMajorMarkerPayload);
-                state = State(S_GCMajorMarkerPayload + 1);
-                EXPECT_EQ(typeString, "GCMajor");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["timings"], Int, 42);
-
-              } else if (nameString == "GCMinorMarkerPayload marker") {
-                EXPECT_EQ(state, S_GCMinorMarkerPayload);
-                state = State(S_GCMinorMarkerPayload + 1);
-                EXPECT_EQ(typeString, "GCMinor");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["nursery"], Int, 43);
-
-              } else if (nameString == "GCSliceMarkerPayload marker") {
-                EXPECT_EQ(state, S_GCSliceMarkerPayload);
-                state = State(S_GCSliceMarkerPayload + 1);
-                EXPECT_EQ(typeString, "GCSlice");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["timings"], Int, 44);
-
-              } else if (nameString == "HangMarkerPayload marker") {
-                EXPECT_EQ(state, S_HangMarkerPayload);
-                state = State(S_HangMarkerPayload + 1);
-                EXPECT_EQ(typeString, "BHR-detected hang");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "LogMarkerPayload marker") {
-                EXPECT_EQ(state, S_LogMarkerPayload);
-                state = State(S_LogMarkerPayload + 1);
-                EXPECT_EQ(typeString, "Log");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "text");
-                EXPECT_EQ_JSON(payload["module"], String, "module");
-
-              } else if (nameString == "LongTaskMarkerPayload marker") {
-                EXPECT_EQ(state, S_LongTaskMarkerPayload);
-                state = State(S_LongTaskMarkerPayload + 1);
-                EXPECT_EQ(typeString, "MainThreadLongTask");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["category"], String, "LongTask");
-
-              } else if (nameString == "NativeAllocationMarkerPayload marker") {
-                EXPECT_EQ(state, S_NativeAllocationMarkerPayload);
-                state = State(S_NativeAllocationMarkerPayload + 1);
-                EXPECT_EQ(typeString, "Native allocation");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["size"], Int64, 9876543210);
-                EXPECT_EQ_JSON(payload["memoryAddress"], Int64, 1234);
-                EXPECT_EQ_JSON(payload["threadId"], Int64, 5678);
-
-              } else if (nameString == "NetworkMarkerPayload start marker") {
-                EXPECT_EQ(state, S_NetworkMarkerPayload_start);
-                state = State(S_NetworkMarkerPayload_start + 1);
-                EXPECT_EQ(typeString, "Network");
-                EXPECT_EQ_JSON(payload["id"], Int64, 1);
-                EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
-                EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
-                EXPECT_EQ_JSON(payload["pri"], Int64, 34);
-                EXPECT_EQ_JSON(payload["count"], Int64, 56);
-                EXPECT_EQ_JSON(payload["cache"], String, "Hit");
-                EXPECT_EQ_JSON(payload["RedirectURI"], String, "");
-                EXPECT_TRUE(payload["contentType"].isNull());
-
-              } else if (nameString == "NetworkMarkerPayload stop marker") {
-                EXPECT_EQ(state, S_NetworkMarkerPayload_stop);
-                state = State(S_NetworkMarkerPayload_stop + 1);
-                EXPECT_EQ(typeString, "Network");
-                EXPECT_EQ_JSON(payload["id"], Int64, 12);
-                EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
-                EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
-                EXPECT_EQ_JSON(payload["pri"], Int64, 34);
-                EXPECT_EQ_JSON(payload["count"], Int64, 56);
-                EXPECT_EQ_JSON(payload["cache"], String, "Unresolved");
-                EXPECT_EQ_JSON(payload["RedirectURI"], String, "");
-                EXPECT_EQ_JSON(payload["contentType"], String, "text/html");
-
-              } else if (nameString == "NetworkMarkerPayload redirect marker") {
-                EXPECT_EQ(state, S_NetworkMarkerPayload_redirect);
-                state = State(S_NetworkMarkerPayload_redirect + 1);
-                EXPECT_EQ(typeString, "Network");
-                EXPECT_EQ_JSON(payload["id"], Int64, 123);
-                EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
-                EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
-                EXPECT_EQ_JSON(payload["pri"], Int64, 34);
-                EXPECT_EQ_JSON(payload["count"], Int64, 56);
-                EXPECT_EQ_JSON(payload["cache"], String, "Unresolved");
-                EXPECT_EQ_JSON(payload["RedirectURI"], String,
-                               "http://example.com/");
-                EXPECT_TRUE(payload["contentType"].isNull());
-
-              } else if (nameString == "PrefMarkerPayload marker") {
-                EXPECT_EQ(state, S_PrefMarkerPayload);
-                state = State(S_PrefMarkerPayload + 1);
-                EXPECT_EQ(typeString, "PreferenceRead");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["prefAccessTime"], Double, ts1Double);
-                EXPECT_EQ_JSON(payload["prefName"], String, "preference name");
-                EXPECT_EQ_JSON(payload["prefKind"], String, "Shared");
-                EXPECT_EQ_JSON(payload["prefType"], String,
-                               "Preference not found");
-                EXPECT_EQ_JSON(payload["prefValue"], String,
-                               "preference value");
-
-              } else if (nameString == "ScreenshotPayload marker") {
-                EXPECT_EQ(state, S_ScreenshotPayload);
-                state = State(S_ScreenshotPayload + 1);
-                EXPECT_EQ(typeString, "CompositorScreenshot");
-                EXPECT_EQ_STRINGTABLE(payload["url"], "url");
-                EXPECT_EQ_JSON(payload["windowID"], String, "0x45678");
-                EXPECT_EQ_JSON(payload["windowWidth"], Int, 12);
-                EXPECT_EQ_JSON(payload["windowHeight"], Int, 34);
-
-              } else if (nameString == "TextMarkerPayload marker 1") {
-                EXPECT_EQ(state, S_TextMarkerPayload1);
-                state = State(S_TextMarkerPayload1 + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "text");
-
-              } else if (nameString == "TextMarkerPayload marker 2") {
-                EXPECT_EQ(state, S_TextMarkerPayload2);
-                state = State(S_TextMarkerPayload2 + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "text");
-
-              } else if (nameString == "UserTimingMarkerPayload marker mark") {
-                EXPECT_EQ(state, S_UserTimingMarkerPayload_mark);
-                state = State(S_UserTimingMarkerPayload_mark + 1);
-                EXPECT_EQ(typeString, "UserTiming");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "mark name");
-                EXPECT_EQ_JSON(payload["entryType"], String, "mark");
 
-              } else if (nameString ==
-                         "UserTimingMarkerPayload marker measure") {
-                EXPECT_EQ(state, S_UserTimingMarkerPayload_measure);
-                state = State(S_UserTimingMarkerPayload_measure + 1);
-                EXPECT_EQ(typeString, "UserTiming");
-                EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "measure name");
-                EXPECT_EQ_JSON(payload["entryType"], String, "measure");
-                EXPECT_EQ_JSON(payload["startMark"], String, "start mark");
-                EXPECT_EQ_JSON(payload["endMark"], String, "end mark");
-
-              } else if (nameString == "VsyncMarkerPayload marker") {
-                EXPECT_EQ(state, S_VsyncMarkerPayload);
-                state = State(S_VsyncMarkerPayload + 1);
-                EXPECT_EQ(typeString, "VsyncTimestamp");
-                // Timestamp is stored in marker outside of payload.
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-                EXPECT_TRUE(payload["stack"].isNull());
-
-              } else if (nameString == "IPCMarkerPayload marker") {
-                EXPECT_EQ(state, S_IPCMarkerPayload);
-                state = State(S_IPCMarkerPayload + 1);
-                EXPECT_EQ(typeString, "IPC");
-                EXPECT_TIMING_INSTANT_AT(ts1Double);
-
-                // The startTime and endTime are currently duplicated in the
-                // payload.
-                EXPECT_EQ_JSON(payload["startTime"], Double, ts1Double);
-                EXPECT_EQ_JSON(payload["endTime"], Double, ts1Double);
-
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["otherPid"], Int, 1111);
-                EXPECT_EQ_JSON(payload["messageSeqno"], Int, 1);
-                EXPECT_EQ_JSON(payload["messageType"], String,
-                               "PAPZ::Msg_LayerTransforms");
-                EXPECT_EQ_JSON(payload["side"], String, "parent");
-                EXPECT_EQ_JSON(payload["direction"], String, "sending");
-                EXPECT_EQ_JSON(payload["phase"], String, "endpoint");
-                EXPECT_EQ_JSON(payload["sync"], Bool, false);
-
-              } else if (nameString == "Text in main thread with stack") {
-                EXPECT_EQ(state, S_TextWithStack);
-                state = State(S_TextWithStack + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_FALSE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "");
-
-              } else if (nameString == "Text from main thread with stack") {
-                EXPECT_EQ(state, S_TextToMTWithStack);
-                state = State(S_TextToMTWithStack + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_FALSE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "");
-
-              } else if (nameString == "Text in registered thread with stack") {
-                ADD_FAILURE()
-                    << "Unexpected 'Text in registered thread with stack'";
+                } else if (nameString ==
+                           "default-templated markers 2.0 with option") {
+                  // TODO: Remove this when bug 1646714 lands.
+                  EXPECT_EQ(state, S_Markers2DefaultWithOptions);
+                  state = State(S_Markers2DefaultWithOptions + 1);
+                  EXPECT_EQ(typeString, "NoPayloadUserData");
+                  EXPECT_FALSE(payload["stack"].isNull());
+
+                } else if (nameString == "FirstMarker") {
+                  // Record start and end times, to compare with timestamps in
+                  // following markers.
+                  EXPECT_EQ(state, S_FirstMarker);
+                  ts1Double = marker[START_TIME].asDouble();
+                  ts2Double = marker[END_TIME].asDouble();
+                  state = State(S_FirstMarker + 1);
+                  EXPECT_EQ(typeString, "Text");
+                  EXPECT_EQ_JSON(payload["name"], String, "First Marker");
+
+                } else if (nameString == "Gtest custom marker") {
+                  EXPECT_EQ(state, S_CustomMarker);
+                  state = State(S_CustomMarker + 1);
+                  EXPECT_EQ(typeString, "markers-gtest");
+                  EXPECT_EQ(payload.size(), 1u + 9u);
+                  EXPECT_TRUE(payload["null"].isNull());
+                  EXPECT_EQ_JSON(payload["bool-false"], Bool, false);
+                  EXPECT_EQ_JSON(payload["bool-true"], Bool, true);
+                  EXPECT_EQ_JSON(payload["int"], Int64, 42);
+                  EXPECT_EQ_JSON(payload["double"], Double, 43.0);
+                  EXPECT_EQ_JSON(payload["text"], String, "gtest text");
+                  // Unique strings can be fetched from the string table.
+                  ASSERT_TRUE(payload["unique text"].isUInt());
+                  auto textIndex = payload["unique text"].asUInt();
+                  GET_JSON(uniqueText, stringTable[textIndex], String);
+                  ASSERT_TRUE(uniqueText.isString());
+                  ASSERT_EQ(uniqueText.asString(), "gtest unique text");
+                  // The duplicate unique text should have the exact same index.
+                  EXPECT_EQ_JSON(payload["unique text again"], UInt, textIndex);
+                  EXPECT_EQ_JSON(payload["time"], Double, ts1Double);
+
+                } else if (nameString == "Gtest special marker") {
+                  EXPECT_EQ(state, S_SpecialMarker);
+                  state = State(S_SpecialMarker + 1);
+                  EXPECT_EQ(typeString, "markers-gtest-special");
+                  EXPECT_EQ(payload.size(), 1u) << "Only 'type' in the payload";
+
+                } else if (nameString == "Load 1: http://mozilla.org/") {
+                  EXPECT_EQ(state, S_NetworkMarkerPayload_start);
+                  state = State(S_NetworkMarkerPayload_start + 1);
+                  EXPECT_EQ(typeString, "Network");
+                  EXPECT_EQ_JSON(payload["startTime"], Double, ts1Double);
+                  EXPECT_EQ_JSON(payload["endTime"], Double, ts2Double);
+                  EXPECT_EQ_JSON(payload["id"], Int64, 1);
+                  EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
+                  EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
+                  EXPECT_EQ_JSON(payload["pri"], Int64, 34);
+                  EXPECT_EQ_JSON(payload["count"], Int64, 56);
+                  EXPECT_EQ_JSON(payload["cache"], String, "Hit");
+                  EXPECT_TRUE(payload["RedirectURI"].isNull());
+                  EXPECT_TRUE(payload["contentType"].isNull());
+
+                } else if (nameString == "Load 12: http://mozilla.org/") {
+                  EXPECT_EQ(state, S_NetworkMarkerPayload_stop);
+                  state = State(S_NetworkMarkerPayload_stop + 1);
+                  EXPECT_EQ(typeString, "Network");
+                  EXPECT_EQ_JSON(payload["startTime"], Double, ts1Double);
+                  EXPECT_EQ_JSON(payload["endTime"], Double, ts2Double);
+                  EXPECT_EQ_JSON(payload["id"], Int64, 12);
+                  EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
+                  EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
+                  EXPECT_EQ_JSON(payload["pri"], Int64, 34);
+                  EXPECT_EQ_JSON(payload["count"], Int64, 56);
+                  EXPECT_EQ_JSON(payload["cache"], String, "Unresolved");
+                  EXPECT_TRUE(payload["RedirectURI"].isNull());
+                  EXPECT_EQ_JSON(payload["contentType"], String, "text/html");
+
+                } else if (nameString == "Load 123: http://mozilla.org/") {
+                  EXPECT_EQ(state, S_NetworkMarkerPayload_redirect);
+                  state = State(S_NetworkMarkerPayload_redirect + 1);
+                  EXPECT_EQ(typeString, "Network");
+                  EXPECT_EQ_JSON(payload["startTime"], Double, ts1Double);
+                  EXPECT_EQ_JSON(payload["endTime"], Double, ts2Double);
+                  EXPECT_EQ_JSON(payload["id"], Int64, 123);
+                  EXPECT_EQ_JSON(payload["URI"], String, "http://mozilla.org/");
+                  EXPECT_EQ_JSON(payload["requestMethod"], String, "GET");
+                  EXPECT_EQ_JSON(payload["pri"], Int64, 34);
+                  EXPECT_EQ_JSON(payload["count"], Int64, 56);
+                  EXPECT_EQ_JSON(payload["cache"], String, "Unresolved");
+                  EXPECT_EQ_JSON(payload["RedirectURI"], String,
+                                 "http://example.com/");
+                  EXPECT_TRUE(payload["contentType"].isNull());
+
+                } else if (nameString == "Text in main thread with stack") {
+                  EXPECT_EQ(state, S_TextWithStack);
+                  state = State(S_TextWithStack + 1);
+                  EXPECT_EQ(typeString, "Text");
+                  EXPECT_FALSE(payload["stack"].isNull());
+                  EXPECT_TIMING_INTERVAL_AT(ts1Double, ts2Double);
+                  EXPECT_EQ_JSON(payload["name"], String, "");
+
+                } else if (nameString == "Text from main thread with stack") {
+                  EXPECT_EQ(state, S_TextToMTWithStack);
+                  state = State(S_TextToMTWithStack + 1);
+                  EXPECT_EQ(typeString, "Text");
+                  EXPECT_FALSE(payload["stack"].isNull());
+                  EXPECT_EQ_JSON(payload["name"], String, "");
+
+                } else if (nameString ==
+                           "Text in registered thread with stack") {
+                  ADD_FAILURE()
+                      << "Unexpected 'Text in registered thread with stack'";
+
+                } else if (nameString ==
+                           "Text from registered thread with stack") {
+                  EXPECT_EQ(state, S_RegThread_TextToMTWithStack);
+                  state = State(S_RegThread_TextToMTWithStack + 1);
+                  EXPECT_EQ(typeString, "Text");
+                  EXPECT_FALSE(payload["stack"].isNull());
+                  EXPECT_EQ_JSON(payload["name"], String, "");
+
+                } else if (nameString ==
+                           "Text in unregistered thread with stack") {
+                  ADD_FAILURE()
+                      << "Unexpected 'Text in unregistered thread with stack'";
+
+                } else if (nameString ==
+                           "Text from unregistered thread with stack") {
+                  EXPECT_EQ(state, S_UnregThread_TextToMTWithStack);
+                  state = State(S_UnregThread_TextToMTWithStack + 1);
+                  EXPECT_EQ(typeString, "Text");
+                  EXPECT_TRUE(payload["stack"].isNull());
+                  EXPECT_EQ_JSON(payload["name"], String, "");
+                }
+              }  // marker with payload
+            }    // for (marker : data)
+          }      // markers.data
+        }        // markers
+      }          // thread0
+    }            // threads
+    // We should have read all expected markers.
+    EXPECT_EQ(state, S_LAST);
 
-              } else if (nameString ==
-                         "Text from registered thread with stack") {
-                EXPECT_EQ(state, S_RegThread_TextToMTWithStack);
-                state = State(S_RegThread_TextToMTWithStack + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_FALSE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "");
+    {
+      GET_JSON(meta, root["meta"], Object);
 
-              } else if (nameString ==
-                         "Text in unregistered thread with stack") {
-                ADD_FAILURE()
-                    << "Unexpected 'Text in unregistered thread with stack'";
+      {
+        GET_JSON(markerSchema, meta["markerSchema"], Array);
 
-              } else if (nameString ==
-                         "Text from unregistered thread with stack") {
-                EXPECT_EQ(state, S_UnregThread_TextToMTWithStack);
-                state = State(S_UnregThread_TextToMTWithStack + 1);
-                EXPECT_EQ(typeString, "Text");
-                EXPECT_TRUE(payload["stack"].isNull());
-                EXPECT_EQ_JSON(payload["name"], String, "");
-              }
-            }  // marker with payload
-          }    // for (marker:data)
-        }      // markers.data
-      }        // markers
-    }          // thread0
-  }            // threads
-
-  // We should have read all expected markers.
-  EXPECT_EQ(state, S_LAST);
-
-  {
-    const Json::Value& meta = root["meta"];
-    ASSERT_TRUE(!meta.isNull());
-    ASSERT_TRUE(meta.isObject());
+        std::set<std::string> testedSchemaNames;
 
-    // root.meta is an object.
-    {
-      const Json::Value& markerSchema = meta["markerSchema"];
-      ASSERT_TRUE(!markerSchema.isNull());
-      ASSERT_TRUE(markerSchema.isArray());
-
-      // root.meta.markerSchema is an array.
-
-      std::set<std::string> testedSchemaNames;
-
-      for (const Json::Value& schema : markerSchema) {
-        const Json::Value& name = schema["name"];
-        ASSERT_TRUE(name.isString());
-        const std::string nameString = name.asString();
-
-        const Json::Value& display = schema["display"];
-        ASSERT_TRUE(display.isArray());
-
-        const Json::Value& data = schema["data"];
-        ASSERT_TRUE(data.isArray());
-
-        EXPECT_TRUE(
-            testedSchemaNames
-                .insert(std::string(nameString.data(), nameString.size()))
-                .second)
-            << "Each schema name should be unique (inserted once in the set)";
-
-        if (nameString == "Text") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 1u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["key"], String, "name");
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Details");
-          EXPECT_EQ_JSON(data[0u]["format"], String, "string");
-
-        } else if (nameString == "NoPayloadUserData") {
-          // TODO: Remove this when bug 1646714 lands.
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 0u);
-
-        } else if (nameString == "FileIO") {
-          // These are defined in ProfilerIOInterposeObserver.cpp
-
-        } else if (nameString == "tracing") {
-          EXPECT_EQ(display.size(), 3u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-          EXPECT_EQ(display[2u].asString(), "timeline-overview");
-
-          ASSERT_EQ(data.size(), 1u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["key"], String, "category");
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Type");
-          EXPECT_EQ_JSON(data[0u]["format"], String, "string");
-
-        } else if (nameString == "UserTimingMark") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 4u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Marker");
-          EXPECT_EQ_JSON(data[0u]["value"], String, "UserTiming");
-
-          ASSERT_TRUE(data[1u].isObject());
-          EXPECT_EQ_JSON(data[1u]["key"], String, "entryType");
-          EXPECT_EQ_JSON(data[1u]["label"], String, "Entry Type");
-          EXPECT_EQ_JSON(data[1u]["format"], String, "string");
-
-          ASSERT_TRUE(data[2u].isObject());
-          EXPECT_EQ_JSON(data[2u]["key"], String, "name");
-          EXPECT_EQ_JSON(data[2u]["label"], String, "Name");
-          EXPECT_EQ_JSON(data[2u]["format"], String, "string");
-
-          ASSERT_TRUE(data[3u].isObject());
-          EXPECT_EQ_JSON(data[3u]["label"], String, "Description");
-          EXPECT_EQ_JSON(data[3u]["value"], String,
-                         "UserTimingMark is created using the DOM API "
-                         "performance.mark().");
-
-        } else if (nameString == "UserTimingMeasure") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 6u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Marker");
-          EXPECT_EQ_JSON(data[0u]["value"], String, "UserTiming");
-
-          ASSERT_TRUE(data[1u].isObject());
-          EXPECT_EQ_JSON(data[1u]["key"], String, "entryType");
-          EXPECT_EQ_JSON(data[1u]["label"], String, "Entry Type");
-          EXPECT_EQ_JSON(data[1u]["format"], String, "string");
-
-          ASSERT_TRUE(data[2u].isObject());
-          EXPECT_EQ_JSON(data[2u]["key"], String, "name");
-          EXPECT_EQ_JSON(data[2u]["label"], String, "Name");
-          EXPECT_EQ_JSON(data[2u]["format"], String, "string");
-
-          ASSERT_TRUE(data[3u].isObject());
-          EXPECT_EQ_JSON(data[3u]["key"], String, "startMark");
-          EXPECT_EQ_JSON(data[3u]["label"], String, "Start Mark");
-          EXPECT_EQ_JSON(data[3u]["format"], String, "string");
-
-          ASSERT_TRUE(data[4u].isObject());
-          EXPECT_EQ_JSON(data[4u]["key"], String, "endMark");
-          EXPECT_EQ_JSON(data[4u]["label"], String, "End Mark");
-          EXPECT_EQ_JSON(data[4u]["format"], String, "string");
-
-          ASSERT_TRUE(data[5u].isObject());
-          EXPECT_EQ_JSON(data[5u]["label"], String, "Description");
-          EXPECT_EQ_JSON(data[5u]["value"], String,
-                         "UserTimingMeasure is created using the DOM API "
-                         "performance.measure().");
-
-        } else if (nameString == "BHR-detected hang") {
-          EXPECT_EQ(display.size(), 3u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-          EXPECT_EQ(display[2u].asString(), "timeline-overview");
-
-          ASSERT_EQ(data.size(), 0u);
-
-        } else if (nameString == "MainThreadLongTask") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 1u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["key"], String, "category");
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Type");
-          EXPECT_EQ_JSON(data[0u]["format"], String, "string");
-
-        } else if (nameString == "Log") {
-          EXPECT_EQ(display.size(), 1u);
-          EXPECT_EQ(display[0u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 2u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["key"], String, "module");
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Module");
-          EXPECT_EQ_JSON(data[0u]["format"], String, "string");
-
-          ASSERT_TRUE(data[1u].isObject());
-          EXPECT_EQ_JSON(data[1u]["key"], String, "name");
-          EXPECT_EQ_JSON(data[1u]["label"], String, "Name");
-          EXPECT_EQ_JSON(data[1u]["format"], String, "string");
-
-        } else if (nameString == "MediaSample") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 2u);
-
-          ASSERT_TRUE(data[0u].isObject());
-          EXPECT_EQ_JSON(data[0u]["key"], String, "sampleStartTimeUs");
-          EXPECT_EQ_JSON(data[0u]["label"], String, "Sample start time");
-          EXPECT_EQ_JSON(data[0u]["format"], String, "microseconds");
-
-          ASSERT_TRUE(data[1u].isObject());
-          EXPECT_EQ_JSON(data[1u]["key"], String, "sampleEndTimeUs");
-          EXPECT_EQ_JSON(data[1u]["label"], String, "Sample end time");
-          EXPECT_EQ_JSON(data[1u]["format"], String, "microseconds");
-
-        } else if (nameString == "Budget") {
-          EXPECT_EQ(display.size(), 2u);
-          EXPECT_EQ(display[0u].asString(), "marker-chart");
-          EXPECT_EQ(display[1u].asString(), "marker-table");
-
-          ASSERT_EQ(data.size(), 0u);
-
-        } else {
-          ADD_FAILURE() << "Unknown marker schema '" << nameString.c_str()
-                        << "'";
+        for (const Json::Value& schema : markerSchema) {
+          GET_JSON(name, schema["name"], String);
+          const std::string nameString = name.asString();
+
+          GET_JSON(display, schema["display"], Array);
+
+          GET_JSON(data, schema["data"], Array);
+
+          EXPECT_TRUE(
+              testedSchemaNames
+                  .insert(std::string(nameString.data(), nameString.size()))
+                  .second)
+              << "Each schema name should be unique (inserted once in the set)";
+
+          if (nameString == "Text") {
+            EXPECT_EQ(display.size(), 2u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 1u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "name");
+            EXPECT_EQ_JSON(data[0u]["label"], String, "Details");
+            EXPECT_EQ_JSON(data[0u]["format"], String, "string");
+
+          } else if (nameString == "NoPayloadUserData") {
+            // TODO: Remove this when bug 1646714 lands.
+            EXPECT_EQ(display.size(), 2u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 0u);
+
+          } else if (nameString == "FileIO") {
+            // These are defined in ProfilerIOInterposeObserver.cpp
+
+          } else if (nameString == "tracing") {
+            EXPECT_EQ(display.size(), 3u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+            EXPECT_EQ(display[2u].asString(), "timeline-overview");
+
+            ASSERT_EQ(data.size(), 1u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "category");
+            EXPECT_EQ_JSON(data[0u]["label"], String, "Type");
+            EXPECT_EQ_JSON(data[0u]["format"], String, "string");
+
+          } else if (nameString == "BHR-detected hang") {
+            EXPECT_EQ(display.size(), 3u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+            EXPECT_EQ(display[2u].asString(), "timeline-overview");
+
+            ASSERT_EQ(data.size(), 0u);
+
+          } else if (nameString == "MainThreadLongTask") {
+            EXPECT_EQ(display.size(), 2u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 1u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "category");
+            EXPECT_EQ_JSON(data[0u]["label"], String, "Type");
+            EXPECT_EQ_JSON(data[0u]["format"], String, "string");
+
+          } else if (nameString == "Log") {
+            EXPECT_EQ(display.size(), 1u);
+            EXPECT_EQ(display[0u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 2u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "module");
+            EXPECT_EQ_JSON(data[0u]["label"], String, "Module");
+            EXPECT_EQ_JSON(data[0u]["format"], String, "string");
+
+            ASSERT_TRUE(data[1u].isObject());
+            EXPECT_EQ_JSON(data[1u]["key"], String, "name");
+            EXPECT_EQ_JSON(data[1u]["label"], String, "Name");
+            EXPECT_EQ_JSON(data[1u]["format"], String, "string");
+
+          } else if (nameString == "MediaSample") {
+            EXPECT_EQ(display.size(), 2u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 2u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "sampleStartTimeUs");
+            EXPECT_EQ_JSON(data[0u]["label"], String, "Sample start time");
+            EXPECT_EQ_JSON(data[0u]["format"], String, "microseconds");
+
+            ASSERT_TRUE(data[1u].isObject());
+            EXPECT_EQ_JSON(data[1u]["key"], String, "sampleEndTimeUs");
+            EXPECT_EQ_JSON(data[1u]["label"], String, "Sample end time");
+            EXPECT_EQ_JSON(data[1u]["format"], String, "microseconds");
+
+          } else if (nameString == "Budget") {
+            EXPECT_EQ(display.size(), 2u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+
+            ASSERT_EQ(data.size(), 0u);
+
+          } else if (nameString == "markers-gtest") {
+            EXPECT_EQ(display.size(), 7u);
+            EXPECT_EQ(display[0u].asString(), "marker-chart");
+            EXPECT_EQ(display[1u].asString(), "marker-table");
+            EXPECT_EQ(display[2u].asString(), "timeline-overview");
+            EXPECT_EQ(display[3u].asString(), "timeline-memory");
+            EXPECT_EQ(display[4u].asString(), "timeline-ipc");
+            EXPECT_EQ(display[5u].asString(), "timeline-fileio");
+            EXPECT_EQ(display[6u].asString(), "stack-chart");
+
+            EXPECT_EQ_JSON(schema["chartLabel"], String, "chart label");
+            EXPECT_EQ_JSON(schema["tooltipLabel"], String, "tooltip label");
+            EXPECT_EQ_JSON(schema["tableLabel"], String, "table label");
+
+            ASSERT_EQ(data.size(), 14u);
+
+            ASSERT_TRUE(data[0u].isObject());
+            EXPECT_EQ_JSON(data[0u]["key"], String, "key with url");
+            EXPECT_TRUE(data[0u]["label"].isNull());
+            EXPECT_EQ_JSON(data[0u]["format"], String, "url");
+            EXPECT_TRUE(data[0u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[1u].isObject());
+            EXPECT_EQ_JSON(data[1u]["key"], String, "key with label filePath");
+            EXPECT_EQ_JSON(data[1u]["label"], String, "label filePath");
+            EXPECT_EQ_JSON(data[1u]["format"], String, "file-path");
+            EXPECT_TRUE(data[1u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[2u].isObject());
+            EXPECT_EQ_JSON(data[2u]["key"], String,
+                           "key with string not-searchable");
+            EXPECT_TRUE(data[2u]["label"].isNull());
+            EXPECT_EQ_JSON(data[2u]["format"], String, "string");
+            EXPECT_EQ_JSON(data[2u]["searchable"], Bool, false);
+
+            ASSERT_TRUE(data[3u].isObject());
+            EXPECT_EQ_JSON(data[3u]["key"], String,
+                           "key with label duration searchable");
+            EXPECT_TRUE(data[3u]["label duration"].isNull());
+            EXPECT_EQ_JSON(data[3u]["format"], String, "duration");
+            EXPECT_EQ_JSON(data[3u]["searchable"], Bool, true);
+
+            ASSERT_TRUE(data[4u].isObject());
+            EXPECT_EQ_JSON(data[4u]["key"], String, "key with time");
+            EXPECT_TRUE(data[4u]["label"].isNull());
+            EXPECT_EQ_JSON(data[4u]["format"], String, "time");
+            EXPECT_TRUE(data[4u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[5u].isObject());
+            EXPECT_EQ_JSON(data[5u]["key"], String, "key with seconds");
+            EXPECT_TRUE(data[5u]["label"].isNull());
+            EXPECT_EQ_JSON(data[5u]["format"], String, "seconds");
+            EXPECT_TRUE(data[5u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[6u].isObject());
+            EXPECT_EQ_JSON(data[6u]["key"], String, "key with milliseconds");
+            EXPECT_TRUE(data[6u]["label"].isNull());
+            EXPECT_EQ_JSON(data[6u]["format"], String, "milliseconds");
+            EXPECT_TRUE(data[6u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[7u].isObject());
+            EXPECT_EQ_JSON(data[7u]["key"], String, "key with microseconds");
+            EXPECT_TRUE(data[7u]["label"].isNull());
+            EXPECT_EQ_JSON(data[7u]["format"], String, "microseconds");
+            EXPECT_TRUE(data[7u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[8u].isObject());
+            EXPECT_EQ_JSON(data[8u]["key"], String, "key with nanoseconds");
+            EXPECT_TRUE(data[8u]["label"].isNull());
+            EXPECT_EQ_JSON(data[8u]["format"], String, "nanoseconds");
+            EXPECT_TRUE(data[8u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[9u].isObject());
+            EXPECT_EQ_JSON(data[9u]["key"], String, "key with bytes");
+            EXPECT_TRUE(data[9u]["label"].isNull());
+            EXPECT_EQ_JSON(data[9u]["format"], String, "bytes");
+            EXPECT_TRUE(data[9u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[10u].isObject());
+            EXPECT_EQ_JSON(data[10u]["key"], String, "key with percentage");
+            EXPECT_TRUE(data[10u]["label"].isNull());
+            EXPECT_EQ_JSON(data[10u]["format"], String, "percentage");
+            EXPECT_TRUE(data[10u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[11u].isObject());
+            EXPECT_EQ_JSON(data[11u]["key"], String, "key with integer");
+            EXPECT_TRUE(data[11u]["label"].isNull());
+            EXPECT_EQ_JSON(data[11u]["format"], String, "integer");
+            EXPECT_TRUE(data[11u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[12u].isObject());
+            EXPECT_EQ_JSON(data[12u]["key"], String, "key with decimal");
+            EXPECT_TRUE(data[12u]["label"].isNull());
+            EXPECT_EQ_JSON(data[12u]["format"], String, "decimal");
+            EXPECT_TRUE(data[12u]["searchable"].isNull());
+
+            ASSERT_TRUE(data[13u].isObject());
+            EXPECT_EQ_JSON(data[13u]["label"], String, "static label");
+            EXPECT_EQ_JSON(data[13u]["value"], String, "static value");
+
+          } else if (nameString == "markers-gtest-special") {
+            EXPECT_EQ(display.size(), 0u);
+            ASSERT_EQ(data.size(), 0u);
+
+          } else if (nameString == "markers-gtest-unused") {
+            ADD_FAILURE() << "Schema for GtestUnusedMarker should not be here";
+
+          } else {
+            ADD_FAILURE() << "Unknown marker schema '" << nameString.c_str()
+                          << "'";
+          }
         }
-      }
 
-      // Check that we've got all expected schema.
-      EXPECT_TRUE(testedSchemaNames.find("Text") != testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("tracing") != testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("UserTimingMark") !=
-                  testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("UserTimingMeasure") !=
-                  testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("BHR-detected hang") !=
-                  testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("MainThreadLongTask") !=
-                  testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("Log") != testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("MediaSample") !=
-                  testedSchemaNames.end());
-      EXPECT_TRUE(testedSchemaNames.find("Budget") != testedSchemaNames.end());
-    }  // markerSchema
-  }    // meta
+        // Check that we've got all expected schema.
+        EXPECT_TRUE(testedSchemaNames.find("Text") != testedSchemaNames.end());
+        EXPECT_TRUE(testedSchemaNames.find("tracing") !=
+                    testedSchemaNames.end());
+        EXPECT_TRUE(testedSchemaNames.find("MediaSample") !=
+                    testedSchemaNames.end());
+      }  // markerSchema
+    }    // meta
+  });
 
   Maybe<ProfilerBufferInfo> info = profiler_get_buffer_info();
   MOZ_RELEASE_ASSERT(info.isSome());
@@ -1801,92 +1682,49 @@
          (static_cast<unsigned long long>(info->mRangeEnd) -
           static_cast<unsigned long long>(info->mRangeStart)) *
              9);
-  printf("Stats:         min(ns) .. mean(ns) .. max(ns)  [count]\n");
+  printf("Stats:         min(us) .. mean(us) .. max(us)  [count]\n");
   printf("- Intervals:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mIntervalsNs.min, info->mIntervalsNs.sum / info->mIntervalsNs.n,
-         info->mIntervalsNs.max, info->mIntervalsNs.n);
+         info->mIntervalsUs.min, info->mIntervalsUs.sum / info->mIntervalsUs.n,
+         info->mIntervalsUs.max, info->mIntervalsUs.n);
   printf("- Overheads:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mOverheadsNs.min, info->mOverheadsNs.sum / info->mOverheadsNs.n,
-         info->mOverheadsNs.max, info->mOverheadsNs.n);
+         info->mOverheadsUs.min, info->mOverheadsUs.sum / info->mOverheadsUs.n,
+         info->mOverheadsUs.max, info->mOverheadsUs.n);
   printf("  - Locking:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mLockingsNs.min, info->mLockingsNs.sum / info->mLockingsNs.n,
-         info->mLockingsNs.max, info->mLockingsNs.n);
+         info->mLockingsUs.min, info->mLockingsUs.sum / info->mLockingsUs.n,
+         info->mLockingsUs.max, info->mLockingsUs.n);
   printf("  - Clearning: %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mCleaningsNs.min, info->mCleaningsNs.sum / info->mCleaningsNs.n,
-         info->mCleaningsNs.max, info->mCleaningsNs.n);
+         info->mCleaningsUs.min, info->mCleaningsUs.sum / info->mCleaningsUs.n,
+         info->mCleaningsUs.max, info->mCleaningsUs.n);
   printf("  - Counters:  %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mCountersNs.min, info->mCountersNs.sum / info->mCountersNs.n,
-         info->mCountersNs.max, info->mCountersNs.n);
+         info->mCountersUs.min, info->mCountersUs.sum / info->mCountersUs.n,
+         info->mCountersUs.max, info->mCountersUs.n);
   printf("  - Threads:   %7.1f .. %7.1f  .. %7.1f  [%u]\n",
-         info->mThreadsNs.min, info->mThreadsNs.sum / info->mThreadsNs.n,
-         info->mThreadsNs.max, info->mThreadsNs.n);
+         info->mThreadsUs.min, info->mThreadsUs.sum / info->mThreadsUs.n,
+         info->mThreadsUs.max, info->mThreadsUs.n);
 
   profiler_stop();
 
-  // Nothing more should have happened to the GTestMarkerPayloads.
-  EXPECT_EQ(GTestMarkerPayload::sNumCreated, 10 + 0 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumSerialized, 10 + 0 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDeserialized, 0 + 10 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumStreamed, 0 + 10 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDestroyed, 10 + 10 + 0);
-
   // Try to add markers while the profiler is stopped.
-  for (int i = 0; i < 10; i++) {
-    PROFILER_ADD_MARKER_WITH_PAYLOAD("M5", OTHER, GTestMarkerPayload, (i));
-  }
+  PROFILER_MARKER_UNTYPED("marker after profiler_stop", OTHER);
 
   // Warning: this could be racy
   profiler_start(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL, features,
                  filters, MOZ_ARRAY_LENGTH(filters), 0);
 
-  EXPECT_TRUE(::profiler_stream_json_for_this_process(w));
+  // This last marker shouldn't get streamed.
+  SpliceableChunkedJSONWriter w2;
+  w2.Start();
+  EXPECT_TRUE(::profiler_stream_json_for_this_process(w2));
+  w2.End();
+  UniquePtr<char[]> profile2 = w.ChunkedWriteFunc().CopyData();
+  ASSERT_TRUE(!!profile2.get());
+  EXPECT_TRUE(
+      std::string_view(profile2.get()).find("marker after profiler_stop") ==
+      std::string_view::npos);
 
   profiler_stop();
-
-  // The second set of GTestMarkerPayloads should not have been serialized or
-  // streamed.
-  EXPECT_EQ(GTestMarkerPayload::sNumCreated, 10 + 0 + 0 + 10);
-  EXPECT_EQ(GTestMarkerPayload::sNumSerialized, 10 + 0 + 0 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDeserialized, 0 + 10 + 0 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumStreamed, 0 + 10 + 0 + 0);
-  EXPECT_EQ(GTestMarkerPayload::sNumDestroyed, 10 + 10 + 0 + 10);
 }
 
-// The duration limit will be removed from Firefox, see bug 1632365.
-#if 0
-TEST(GeckoProfiler, DurationLimit)
-{
-  uint32_t features = ProfilerFeature::StackWalk;
-  const char* filters[] = {"GeckoMain"};
-
-  profiler_start(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL, features,
-                 filters, MOZ_ARRAY_LENGTH(filters), 0, Some(1.5));
-
-  // Clear up the counters after the last test.
-  GTestMarkerPayload::sNumCreated = 0;
-  GTestMarkerPayload::sNumSerialized = 0;
-  GTestMarkerPayload::sNumDeserialized = 0;
-  GTestMarkerPayload::sNumStreamed = 0;
-  GTestMarkerPayload::sNumDestroyed = 0;
-
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("M1", OTHER, GTestMarkerPayload, (1));
-  PR_Sleep(PR_MillisecondsToInterval(1100));
-  PROFILER_ADD_MARKER_WITH_PAYLOAD("M2", OTHER, GTestMarkerPayload, (2));
-  PR_Sleep(PR_MillisecondsToInterval(500));
-
-  SpliceableChunkedJSONWriter w;
-  ASSERT_TRUE(profiler_stream_json_for_this_process(w));
-
-  // Both markers created, serialized, destroyed; Only the first marker should
-  // have been deserialized, streamed, and destroyed again.
-  EXPECT_EQ(GTestMarkerPayload::sNumCreated, 2);
-  EXPECT_EQ(GTestMarkerPayload::sNumSerialized, 2);
-  EXPECT_EQ(GTestMarkerPayload::sNumDeserialized, 1);
-  EXPECT_EQ(GTestMarkerPayload::sNumStreamed, 1);
-  EXPECT_EQ(GTestMarkerPayload::sNumDestroyed, 3);
-}
-#endif
-
 #define COUNTER_NAME "TestCounter"
 #define COUNTER_DESCRIPTION "Test of counters in profiles"
 #define COUNTER_NAME2 "Counter2"
@@ -1971,35 +1809,44 @@
   profiler_start(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL, features,
                  filters, MOZ_ARRAY_LENGTH(filters), 0);
 
+  mozilla::Maybe<uint32_t> activeFeatures = profiler_features_if_active();
+  ASSERT_TRUE(activeFeatures.isSome());
+  // Not all platforms support stack-walking.
+  const bool hasStackWalk = ProfilerFeature::HasStackWalk(*activeFeatures);
+  // "threads" may automatically be added when `filters` is not empty.
+  const bool hasThreads = ProfilerFeature::HasThreads(*activeFeatures);
+
   UniquePtr<char[]> profile = profiler_get_profile();
-  ASSERT_TRUE(profile && profile[0] == '{');
+  JSONOutputCheck(profile.get(), [&](const Json::Value& aRoot) {
+    GET_JSON(meta, aRoot["meta"], Object);
+    {
+      GET_JSON(configuration, meta["configuration"], Object);
+      {
+        GET_JSON(features, configuration["features"], Array);
+        {
+          EXPECT_EQ(features.size(),
+                    (hasStackWalk ? 1u : 0u) + (hasThreads ? 1u : 0u));
+          if (hasStackWalk) {
+            EXPECT_JSON_ARRAY_CONTAINS(features, String, "stackwalk");
+          }
+          if (hasThreads) {
+            EXPECT_JSON_ARRAY_CONTAINS(features, String, "threads");
+          }
+        }
+        GET_JSON(threads, configuration["threads"], Array);
+        {
+          EXPECT_EQ(threads.size(), 1u);
+          EXPECT_JSON_ARRAY_CONTAINS(threads, String, "GeckoMain");
+        }
+      }
+    }
+  });
 
   profiler_stop();
 
   ASSERT_TRUE(!profiler_get_profile());
 }
 
-static void JSONOutputCheck(const char* aOutput) {
-  // Check that various expected strings are in the JSON.
-
-  ASSERT_TRUE(aOutput);
-  ASSERT_TRUE(aOutput[0] == '{');
-
-  ASSERT_TRUE(strstr(aOutput, "\"libs\""));
-
-  ASSERT_TRUE(strstr(aOutput, "\"meta\""));
-  ASSERT_TRUE(strstr(aOutput, "\"version\""));
-  ASSERT_TRUE(strstr(aOutput, "\"startTime\""));
-
-  ASSERT_TRUE(strstr(aOutput, "\"threads\""));
-  ASSERT_TRUE(strstr(aOutput, "\"GeckoMain\""));
-  ASSERT_TRUE(strstr(aOutput, "\"samples\""));
-  ASSERT_TRUE(strstr(aOutput, "\"markers\""));
-  ASSERT_TRUE(strstr(aOutput, "\"stackTable\""));
-  ASSERT_TRUE(strstr(aOutput, "\"frameTable\""));
-  ASSERT_TRUE(strstr(aOutput, "\"stringTable\""));
-}
-
 TEST(GeckoProfiler, StreamJSONForThisProcess)
 {
   uint32_t features = ProfilerFeature::StackWalk;
@@ -2017,7 +1864,7 @@
 
   UniquePtr<char[]> profile = w.ChunkedWriteFunc().CopyData();
 
-  JSONOutputCheck(profile.get());
+  JSONOutputCheck(profile.get(), [](const Json::Value&) {});
 
   profiler_stop();
 
@@ -2054,7 +1901,7 @@
 
   UniquePtr<char[]> profile = w.ChunkedWriteFunc().CopyData();
 
-  JSONOutputCheck(profile.get());
+  JSONOutputCheck(profile.get(), [](const Json::Value&) {});
 
   // Stop the profiler and call profiler_stream_json_for_this_process on a
   // background thread.
@@ -2218,9 +2065,16 @@
     ASSERT_EQ(WaitForSamplingState(), SamplingState::SamplingCompleted);
   }
   UniquePtr<char[]> profileCompleted = profiler_get_profile();
-  ASSERT_TRUE(profileCompleted);
-  ASSERT_TRUE(profileCompleted[0] == '{');
-  ASSERT_TRUE(strstr(profileCompleted.get(), "PostSamplingCallback completed"));
+  JSONOutputCheck(profileCompleted.get(), [](const Json::Value& aRoot) {
+    GET_JSON(threads, aRoot["threads"], Array);
+    {
+      GET_JSON(thread0, threads[0], Object);
+      {
+        EXPECT_JSON_ARRAY_CONTAINS(thread0["stringTable"], String,
+                                   "PostSamplingCallback completed");
+      }
+    }
+  });
 
   profiler_pause();
   {
@@ -2229,8 +2083,8 @@
     ASSERT_EQ(WaitForSamplingState(), SamplingState::SamplingPaused);
   }
   UniquePtr<char[]> profilePaused = profiler_get_profile();
-  ASSERT_TRUE(profilePaused);
-  ASSERT_TRUE(profilePaused[0] == '{');
+  JSONOutputCheck(profilePaused.get(), [](const Json::Value& aRoot) {});
+  // This string shouldn't appear *anywhere* in the profile.
   ASSERT_FALSE(strstr(profilePaused.get(), "PostSamplingCallback paused"));
 
   profiler_resume();
@@ -2240,9 +2094,16 @@
     ASSERT_EQ(WaitForSamplingState(), SamplingState::SamplingCompleted);
   }
   UniquePtr<char[]> profileResumed = profiler_get_profile();
-  ASSERT_TRUE(profileResumed);
-  ASSERT_TRUE(profileResumed[0] == '{');
-  ASSERT_TRUE(strstr(profileResumed.get(), "PostSamplingCallback resumed"));
+  JSONOutputCheck(profileResumed.get(), [](const Json::Value& aRoot) {
+    GET_JSON(threads, aRoot["threads"], Array);
+    {
+      GET_JSON(thread0, threads[0], Object);
+      {
+        EXPECT_JSON_ARRAY_CONTAINS(thread0["stringTable"], String,
+                                   "PostSamplingCallback resumed");
+      }
+    }
+  });
 
   profiler_start(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL,
                  ProfilerFeature::StackWalk | ProfilerFeature::NoStackSampling,
@@ -2253,8 +2114,8 @@
     ASSERT_EQ(WaitForSamplingState(), SamplingState::NoStackSamplingCompleted);
   }
   UniquePtr<char[]> profileNoStacks = profiler_get_profile();
-  ASSERT_TRUE(profileNoStacks);
-  ASSERT_TRUE(profileNoStacks[0] == '{');
+  JSONOutputCheck(profileNoStacks.get(), [](const Json::Value& aRoot) {});
+  // This string shouldn't appear *anywhere* in the profile.
   ASSERT_FALSE(strstr(profileNoStacks.get(),
                       "PostSamplingCallback completed (no stacks)"));
 
@@ -2306,10 +2167,23 @@
   // Check that the Gecko Profiler profile contains at least the Base Profiler
   // main thread samples.
   UniquePtr<char[]> profile = profiler_get_profile();
-  ASSERT_TRUE(profile);
-  ASSERT_TRUE(profile[0] == '{');
-  ASSERT_TRUE(strstr(profile.get(), "GeckoMain (pre-xul)"));
-  ASSERT_TRUE(strstr(profile.get(), "Marker from base profiler"));
+  JSONOutputCheck(profile.get(), [](const Json::Value& aRoot) {
+    GET_JSON(threads, aRoot["threads"], Array);
+    {
+      bool found = false;
+      for (const Json::Value& thread : threads) {
+        ASSERT_TRUE(thread.isObject());
+        GET_JSON(name, thread["name"], String);
+        if (name.asString() == "GeckoMain (pre-xul)") {
+          found = true;
+          EXPECT_JSON_ARRAY_CONTAINS(thread["stringTable"], String,
+                                     "Marker from base profiler");
+          break;
+        }
+      }
+      EXPECT_TRUE(found);
+    }
+  });
 
   profiler_stop();
   ASSERT_TRUE(!profiler_is_active());
diff -Nru firefox-84.0.2+build1/tools/profiler/tests/xpcshell/test_addProfilerMarker.js firefox-85.0+build1/tools/profiler/tests/xpcshell/test_addProfilerMarker.js
--- firefox-84.0.2+build1/tools/profiler/tests/xpcshell/test_addProfilerMarker.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/tests/xpcshell/test_addProfilerMarker.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,184 @@
+/* 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/. */
+
+/**
+ * Test that ChromeUtils.addProfilerMarker is working correctly.
+ */
+
+const markerNamePrefix = "test_addProfilerMarker";
+const markerText = "Text payload";
+// The same startTime will be used for all markers with a duration,
+// and we store this value globally so that expectDuration and
+// expectNoDuration can access it. The value isn't set here as we
+// want a start time after the profiler has started
+var startTime;
+
+function expectNoDuration(marker) {
+  Assert.equal(
+    typeof marker.startTime,
+    "number",
+    "startTime should be a number"
+  );
+  Assert.greater(
+    marker.startTime,
+    startTime,
+    "startTime should be after the begining of the test"
+  );
+  Assert.equal(typeof marker.endTime, "number", "endTime should be a number");
+  Assert.equal(marker.endTime, 0, "endTime should be 0");
+}
+
+function expectDuration(marker) {
+  Assert.equal(
+    typeof marker.startTime,
+    "number",
+    "startTime should be a number"
+  );
+  Assert.equal(
+    Math.round(marker.startTime * 10 ** 6) / 10 ** 6,
+    startTime,
+    "startTime should be the expected time"
+  );
+  Assert.equal(typeof marker.endTime, "number", "endTime should be a number");
+  Assert.greater(
+    marker.endTime,
+    startTime,
+    "endTime should be after startTime"
+  );
+}
+
+function expectNoData(marker) {
+  Assert.equal(
+    typeof marker.data,
+    "undefined",
+    "The data property should be undefined"
+  );
+}
+
+function expectText(marker) {
+  Assert.equal(
+    typeof marker.data,
+    "object",
+    "The data property should be an object"
+  );
+  Assert.equal(marker.data.type, "Text", "Should be a Text marker");
+  Assert.equal(
+    marker.data.name,
+    markerText,
+    "The payload should contain the expected text"
+  );
+}
+
+function expectNoStack(marker) {
+  Assert.ok(!marker.data || !marker.data.stack, "There should be no stack");
+}
+
+function expectStack(marker) {
+  Assert.ok(marker.data.stack, "There should be a stack");
+}
+
+add_task(async () => {
+  if (!AppConstants.MOZ_GECKO_PROFILER) {
+    return;
+  }
+
+  startProfiler();
+  startTime = Math.round(Cu.now() * 10 ** 6) / 10 ** 6;
+  info("startTime used for markers with durations: " + startTime);
+
+  /* Each call to testMarker will record a marker with a unique name.
+   * The testFunctions and testCases objects contain respectively test
+   * functions to verify that the marker found in the captured profile
+   * matches expectations, and a string that can be printed to describe
+   * in which way ChromeUtils.addProfilerMarker was called. */
+  let testFunctions = {};
+  let testCases = {};
+  let markerId = 0;
+  function testMarker(args, checks) {
+    let name = markerNamePrefix + markerId++;
+    ChromeUtils.addProfilerMarker(name, ...args);
+    testFunctions[name] = checks;
+    testCases[name] = `ChromeUtils.addProfilerMarker(${[name, ...args]
+      .toSource()
+      .slice(1, -1)})`;
+  }
+
+  info("Record markers without options object.");
+  testMarker([], m => {
+    expectNoDuration(m);
+    expectNoData(m);
+  });
+  testMarker([startTime], m => {
+    expectDuration(m);
+    expectNoData(m);
+  });
+  testMarker([undefined, markerText], m => {
+    expectNoDuration(m);
+    expectText(m);
+  });
+  testMarker([startTime, markerText], m => {
+    expectDuration(m);
+    expectText(m);
+  });
+
+  info("Record markers providing the duration as the startTime property.");
+  testMarker([{ startTime }], m => {
+    expectDuration(m);
+    expectNoData(m);
+  });
+  testMarker([{}, markerText], m => {
+    expectNoDuration(m);
+    expectText(m);
+  });
+  testMarker([{ startTime }, markerText], m => {
+    expectDuration(m);
+    expectText(m);
+  });
+
+  info("Record markers to test the captureStack property.");
+  const captureStack = true;
+  testMarker([], expectNoStack);
+  testMarker([startTime, markerText], expectNoStack);
+  testMarker([{ captureStack: false }], expectNoStack);
+  testMarker([{ captureStack }], expectStack);
+  testMarker([{ startTime, captureStack }], expectStack);
+  testMarker([{ captureStack }, markerText], expectStack);
+  testMarker([{ startTime, captureStack }, markerText], expectStack);
+
+  info("Record markers to test the category property");
+  function testCategory(args, expectedCategory) {
+    testMarker(args, marker => {
+      Assert.equal(marker.category, expectedCategory);
+    });
+  }
+  testCategory([], "JavaScript");
+  testCategory([{ category: "Test" }], "Test");
+  testCategory([{ category: "Test" }, markerText], "Test");
+  testCategory([{ category: "JavaScript" }], "JavaScript");
+  testCategory([{ category: "Other" }], "Other");
+  testCategory([{ category: "DOM" }], "DOM");
+  testCategory([{ category: "does not exist" }], "Other");
+
+  info("Capture the profile");
+  const profile = await stopAndGetProfile();
+  const mainThread = profile.threads.find(({ name }) => name === "GeckoMain");
+  const markers = getInflatedMarkerData(mainThread).filter(m =>
+    m.name.startsWith(markerNamePrefix)
+  );
+  Assert.equal(
+    markers.length,
+    Object.keys(testFunctions).length,
+    `Found ${markers.length} test markers in the captured profile`
+  );
+
+  for (let marker of markers) {
+    marker.category = profile.meta.categories[marker.category].name;
+    info(`${testCases[marker.name]} -> ${marker.toSource()}`);
+
+    testFunctions[marker.name](marker);
+    delete testFunctions[marker.name];
+  }
+
+  Assert.equal(0, Object.keys(testFunctions).length, "all markers were found");
+});
diff -Nru firefox-84.0.2+build1/tools/profiler/tests/xpcshell/test_feature_fileioall.js firefox-85.0+build1/tools/profiler/tests/xpcshell/test_feature_fileioall.js
--- firefox-84.0.2+build1/tools/profiler/tests/xpcshell/test_feature_fileioall.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/tests/xpcshell/test_feature_fileioall.js	2021-01-18 19:58:27.000000000 +0000
@@ -139,7 +139,7 @@
   info("Write to the file, but do so using a background thread.");
 
   // IOUtils handles file operations using a background thread.
-  await IOUtils.writeAtomic(path, new TextEncoder().encode("Test data."));
+  await IOUtils.write(path, new TextEncoder().encode("Test data."));
   const exists = await fileExists(path);
   ok(exists, `Created temporary file at: ${path}`);
 
diff -Nru firefox-84.0.2+build1/tools/profiler/tests/xpcshell/xpcshell.ini firefox-85.0+build1/tools/profiler/tests/xpcshell/xpcshell.ini
--- firefox-84.0.2+build1/tools/profiler/tests/xpcshell/xpcshell.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/profiler/tests/xpcshell/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 skip-if = toolkit == 'android'
 
 [test_active_configuration.js]
+[test_addProfilerMarker.js]
 [test_start.js]
 skip-if = true
 [test_get_features.js]
diff -Nru firefox-84.0.2+build1/tools/sanitizer/docs/asan.rst firefox-85.0+build1/tools/sanitizer/docs/asan.rst
--- firefox-84.0.2+build1/tools/sanitizer/docs/asan.rst	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/sanitizer/docs/asan.rst	2021-01-18 19:58:27.000000000 +0000
@@ -255,7 +255,7 @@
 environment variable ``ASAN_SYMBOLIZER_PATH`` to reflect the location of
 your ``llvm-symbolizer`` binary, before running the process. This
 program is usually included in an LLVM distribution. Stacks without
-symbols can also be post-processed, see bellow.
+symbols can also be post-processed, see below.
 
 .. warning::
 
diff -Nru firefox-84.0.2+build1/tools/update-programs/app.mozbuild firefox-85.0+build1/tools/update-programs/app.mozbuild
--- firefox-84.0.2+build1/tools/update-programs/app.mozbuild	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/tools/update-programs/app.mozbuild	2021-01-18 19:58:27.000000000 +0000
@@ -33,6 +33,7 @@
         '/config/external/sqlite',
         '/config/external/zlib',
         '/memory',
+        '/mfbt',
         '/mozglue',
         '/security',
     ]
diff -Nru firefox-84.0.2+build1/uriloader/base/nsDocLoader.h firefox-85.0+build1/uriloader/base/nsDocLoader.h
--- firefox-84.0.2+build1/uriloader/base/nsDocLoader.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/uriloader/base/nsDocLoader.h	2021-01-18 19:58:27.000000000 +0000
@@ -252,7 +252,7 @@
   // of the completed load, instead of using the load group's status.
   void DocLoaderIsEmpty(
       bool aFlushLayout,
-      const Maybe<nsresult>& aOverrideStatus = mozilla::Nothing());
+      const mozilla::Maybe<nsresult>& aOverrideStatus = mozilla::Nothing());
 
  protected:
   struct nsStatusInfo : public mozilla::LinkedListElement<nsStatusInfo> {
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/HandlerService.js firefox-85.0+build1/uriloader/exthandler/HandlerService.js
--- firefox-84.0.2+build1/uriloader/exthandler/HandlerService.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/HandlerService.js	2021-01-18 19:58:27.000000000 +0000
@@ -5,7 +5,6 @@
 const { ComponentUtils } = ChromeUtils.import(
   "resource://gre/modules/ComponentUtils.jsm"
 );
-const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
@@ -54,7 +53,10 @@
   get _store() {
     if (!this.__store) {
       this.__store = new JSONFile({
-        path: OS.Path.join(OS.Constants.Path.profileDir, "handlers.json"),
+        path: PathUtils.join(
+          Services.dirsvc.get("ProfD", Ci.nsIFile).path,
+          "handlers.json"
+        ),
         dataPostProcessor: this._dataPostProcessor.bind(this),
       });
     }
@@ -312,7 +314,10 @@
   asyncInit() {
     if (!this.__store) {
       this.__store = new JSONFile({
-        path: OS.Path.join(OS.Constants.Path.profileDir, "handlers.json"),
+        path: PathUtils.join(
+          Services.dirsvc.get("ProfD", Ci.nsIFile).path,
+          "handlers.json"
+        ),
         dataPostProcessor: this._dataPostProcessor.bind(this),
       });
       this.__store
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/nsExternalHelperAppService.cpp firefox-85.0+build1/uriloader/exthandler/nsExternalHelperAppService.cpp
--- firefox-84.0.2+build1/uriloader/exthandler/nsExternalHelperAppService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/nsExternalHelperAppService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -604,15 +604,18 @@
     "application/vnd.openxmlformats-officedocument.presentationml.presentation",
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
 
+    // Note: zip and json mimetypes are commonly used with a variety of
+    // extensions; don't add them here. It's a similar story for text/xml,
+    // but slightly worse because we can use it when sniffing for a mimetype
+    // if one hasn't been provided, so don't re-add that here either.
+
     APPLICATION_PDF,
 
     APPLICATION_OGG,
 
-    APPLICATION_ZIP,
-
-    APPLICATION_JSON, APPLICATION_WASM,
+    APPLICATION_WASM,
 
-    TEXT_CALENDAR, TEXT_CSS, TEXT_VCARD, TEXT_XML};
+    TEXT_CALENDAR, TEXT_CSS, TEXT_VCARD};
 
 /**
  * Primary extensions of types whose descriptions should be overwritten.
@@ -1340,7 +1343,8 @@
                   StringBeginsWith(MIMEType, "audio/"_ns) ||
                   StringBeginsWith(MIMEType, "video/"_ns);
 
-  if (!canForce) {
+  if (!canForce &&
+      StaticPrefs::browser_download_sanitize_non_media_extensions()) {
     for (const char* mime : forcedExtensionMimetypes) {
       if (MIMEType.Equals(mime)) {
         canForce = true;
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/nsExternalHelperAppService.h firefox-85.0+build1/uriloader/exthandler/nsExternalHelperAppService.h
--- firefox-84.0.2+build1/uriloader/exthandler/nsExternalHelperAppService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/nsExternalHelperAppService.h	2021-01-18 19:58:27.000000000 +0000
@@ -24,7 +24,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIChannel.h"
 #include "nsIBackgroundFileSaver.h"
-#include "nsIHttpChannel.h"
 
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser_first_prompt_not_blocked_without_user_interaction.js firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser_first_prompt_not_blocked_without_user_interaction.js
--- firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser_first_prompt_not_blocked_without_user_interaction.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser_first_prompt_not_blocked_without_user_interaction.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,70 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const TEST_PATH = getRootDirectory(gTestPath).replace(
+  "chrome://mochitests/content",
+  "https://example.com"
+);
+
+add_task(setupMailHandler);
+
+add_task(async function test_open_without_user_interaction() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.disable_open_during_load", true],
+      ["dom.block_external_protocol_in_iframes", true],
+      ["dom.delay.block_external_protocol_in_iframes.enabled", false],
+    ],
+  });
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+
+  let dialogWindowPromise = waitForProtocolAppChooserDialog(
+    tab.linkedBrowser,
+    true
+  );
+
+  BrowserTestUtils.loadURI(
+    tab.linkedBrowser,
+    TEST_PATH + "file_external_protocol_iframe.html"
+  );
+
+  let dialog = await dialogWindowPromise;
+  ok(dialog, "Should show the dialog even without user interaction");
+
+  let dialogClosedPromise = waitForProtocolAppChooserDialog(
+    tab.linkedBrowser,
+    false
+  );
+
+  // Adding another iframe without user interaction should be blocked.
+  let blockedWarning = new Promise(resolve => {
+    Services.console.registerListener(function onMessage(msg) {
+      let { message, logLevel } = msg;
+      if (logLevel != Ci.nsIConsoleMessage.warn) {
+        return;
+      }
+      if (!message.includes("Iframe with external protocol was blocked")) {
+        return;
+      }
+      Services.console.unregisterListener(onMessage);
+      resolve();
+    });
+  });
+
+  info("Adding another frame without user interaction");
+
+  await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
+    let frame = content.document.createElement("iframe");
+    frame.src = "mailto:foo@baz.com";
+    content.document.body.appendChild(frame);
+  });
+
+  await blockedWarning;
+
+  info("Removing tab to close the dialog.");
+  gBrowser.removeTab(tab);
+  await dialogClosedPromise;
+});
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser.ini firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser.ini
--- firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -42,6 +42,9 @@
 [browser_protocol_ask_dialog.js]
 support-files =
   file_nested_protocol_request.html
+[browser_first_prompt_not_blocked_without_user_interaction.js]
+support-files =
+  file_external_protocol_iframe.html
 [browser_protocol_ask_dialog_permission.js]
 [browser_protocolhandler_loop.js]
 [browser_remember_download_option.js]
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser_protocol_ask_dialog.js firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser_protocol_ask_dialog.js
--- firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/browser_protocol_ask_dialog.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/mochitest/browser_protocol_ask_dialog.js	2021-01-18 19:58:27.000000000 +0000
@@ -3,15 +3,6 @@
 
 "use strict";
 
-ChromeUtils.import(
-  "resource://testing-common/HandlerServiceTestUtils.jsm",
-  this
-);
-
-let gHandlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(
-  Ci.nsIHandlerService
-);
-
 const TEST_PATH = getRootDirectory(gTestPath).replace(
   "chrome://mochitests/content",
   "https://example.com"
@@ -20,56 +11,7 @@
 const CONTENT_HANDLING_URL =
   "chrome://mozapps/content/handling/appChooser.xhtml";
 
-let gOldMailHandlers = [];
-
-add_task(async function setup() {
-  let mailHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("mailto");
-
-  // Remove extant web handlers because they have icons that
-  // we fetch from the web, which isn't allowed in tests.
-  let handlers = mailHandlerInfo.possibleApplicationHandlers;
-  for (let i = handlers.Count() - 1; i >= 0; i--) {
-    try {
-      let handler = handlers.queryElementAt(i, Ci.nsIWebHandlerApp);
-      gOldMailHandlers.push(handler);
-      // If we get here, this is a web handler app. Remove it:
-      handlers.removeElementAt(i);
-    } catch (ex) {}
-  }
-
-  let previousHandling = mailHandlerInfo.alwaysAskBeforeHandling;
-  mailHandlerInfo.alwaysAskBeforeHandling = true;
-
-  // Create a dummy web mail handler so we always know the mailto: protocol.
-  // Without this, the test fails on VMs without a default mailto: handler,
-  // because no dialog is ever shown, as we ignore subframe navigations to
-  // protocols that cannot be handled.
-  let dummy = Cc["@mozilla.org/uriloader/web-handler-app;1"].createInstance(
-    Ci.nsIWebHandlerApp
-  );
-  dummy.name = "Handler 1";
-  dummy.uriTemplate = "https://example.com/first/%s";
-  mailHandlerInfo.possibleApplicationHandlers.appendElement(dummy);
-
-  gHandlerService.store(mailHandlerInfo);
-  registerCleanupFunction(() => {
-    // Re-add the original protocol handlers:
-    let mailHandlers = mailHandlerInfo.possibleApplicationHandlers;
-    for (let i = handlers.Count() - 1; i >= 0; i--) {
-      try {
-        // See if this is a web handler. If it is, it'll throw, otherwise,
-        // we will remove it.
-        mailHandlers.queryElementAt(i, Ci.nsIWebHandlerApp);
-        mailHandlers.removeElementAt(i);
-      } catch (ex) {}
-    }
-    for (let h of gOldMailHandlers) {
-      mailHandlers.appendElement(h);
-    }
-    mailHandlerInfo.alwaysAskBeforeHandling = previousHandling;
-    gHandlerService.store(mailHandlerInfo);
-  });
-});
+add_task(setupMailHandler);
 
 /**
  * Check that if we open the protocol handler dialog from a subframe, we close
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/file_external_protocol_iframe.html firefox-85.0+build1/uriloader/exthandler/tests/mochitest/file_external_protocol_iframe.html
--- firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/file_external_protocol_iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/mochitest/file_external_protocol_iframe.html	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1 @@
+<iframe src="mailto:foo@bar.com"></iframe>
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/head.js firefox-85.0+build1/uriloader/exthandler/tests/mochitest/head.js
--- firefox-84.0.2+build1/uriloader/exthandler/tests/mochitest/head.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/mochitest/head.js	2021-01-18 19:58:27.000000000 +0000
@@ -1,4 +1,7 @@
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { HandlerServiceTestUtils } = ChromeUtils.import(
+  "resource://testing-common/HandlerServiceTestUtils.jsm"
+);
 
 var gMimeSvc = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
 var gHandlerSvc = Cc["@mozilla.org/uriloader/handler-service;1"].getService(
@@ -195,3 +198,53 @@
     });
   });
 }
+
+function setupMailHandler() {
+  let mailHandlerInfo = HandlerServiceTestUtils.getHandlerInfo("mailto");
+  let gOldMailHandlers = [];
+
+  // Remove extant web handlers because they have icons that
+  // we fetch from the web, which isn't allowed in tests.
+  let handlers = mailHandlerInfo.possibleApplicationHandlers;
+  for (let i = handlers.Count() - 1; i >= 0; i--) {
+    try {
+      let handler = handlers.queryElementAt(i, Ci.nsIWebHandlerApp);
+      gOldMailHandlers.push(handler);
+      // If we get here, this is a web handler app. Remove it:
+      handlers.removeElementAt(i);
+    } catch (ex) {}
+  }
+
+  let previousHandling = mailHandlerInfo.alwaysAskBeforeHandling;
+  mailHandlerInfo.alwaysAskBeforeHandling = true;
+
+  // Create a dummy web mail handler so we always know the mailto: protocol.
+  // Without this, the test fails on VMs without a default mailto: handler,
+  // because no dialog is ever shown, as we ignore subframe navigations to
+  // protocols that cannot be handled.
+  let dummy = Cc["@mozilla.org/uriloader/web-handler-app;1"].createInstance(
+    Ci.nsIWebHandlerApp
+  );
+  dummy.name = "Handler 1";
+  dummy.uriTemplate = "https://example.com/first/%s";
+  mailHandlerInfo.possibleApplicationHandlers.appendElement(dummy);
+
+  gHandlerSvc.store(mailHandlerInfo);
+  registerCleanupFunction(() => {
+    // Re-add the original protocol handlers:
+    let mailHandlers = mailHandlerInfo.possibleApplicationHandlers;
+    for (let i = handlers.Count() - 1; i >= 0; i--) {
+      try {
+        // See if this is a web handler. If it is, it'll throw, otherwise,
+        // we will remove it.
+        mailHandlers.queryElementAt(i, Ci.nsIWebHandlerApp);
+        mailHandlers.removeElementAt(i);
+      } catch (ex) {}
+    }
+    for (let h of gOldMailHandlers) {
+      mailHandlers.appendElement(h);
+    }
+    mailHandlerInfo.alwaysAskBeforeHandling = previousHandling;
+    gHandlerSvc.store(mailHandlerInfo);
+  });
+}
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/unit/test_protocol_ask_dialog_telemetry.js firefox-85.0+build1/uriloader/exthandler/tests/unit/test_protocol_ask_dialog_telemetry.js
--- firefox-84.0.2+build1/uriloader/exthandler/tests/unit/test_protocol_ask_dialog_telemetry.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/unit/test_protocol_ask_dialog_telemetry.js	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,117 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { ContentDispatchChooserTelemetry } = ChromeUtils.import(
+  "resource://gre/modules/ContentDispatchChooser.jsm"
+);
+
+let telemetryLabels = Services.telemetry.getCategoricalLabels()
+  .EXTERNAL_PROTOCOL_HANDLER_DIALOG_CONTEXT_SCHEME;
+
+let schemeToLabel = ContentDispatchChooserTelemetry.SCHEME_TO_LABEL;
+let schemePrefixToLabel =
+  ContentDispatchChooserTelemetry.SCHEME_PREFIX_TO_LABEL;
+
+/**
+ * Test for scheme-label mappings of protocol ask dialog telemetry.
+ */
+add_task(async function test_telemetry_label_maps() {
+  let mapValues = Object.values(schemeToLabel).concat(
+    Object.values(schemePrefixToLabel)
+  );
+
+  // Scheme - label maps must have valid label values.
+  mapValues.forEach(label => {
+    // Mapped labels must be valid.
+    Assert.ok(telemetryLabels.includes(label), `Exists label: ${label}`);
+  });
+
+  // Uppercase labels must have a mapping.
+  telemetryLabels.forEach(label => {
+    Assert.equal(
+      label == "OTHER" || mapValues.includes(label),
+      label == label.toUpperCase(),
+      `Exists label: ${label}`
+    );
+  });
+
+  Object.keys(schemeToLabel).forEach(key => {
+    // Schemes which have a mapping must not exist as as label.
+    Assert.ok(!telemetryLabels.includes(key), `Not exists label: ${key}`);
+
+    // There must be no key duplicates across the two maps.
+    Assert.ok(!schemePrefixToLabel[key], `No duplicate key: ${key}`);
+  });
+});
+
+/**
+ * Tests the getTelemetryLabel method.
+ */
+add_task(async function test_telemetry_getTelemetryLabel() {
+  // Method should return the correct mapping.
+  Object.keys(schemeToLabel).forEach(scheme => {
+    Assert.equal(
+      schemeToLabel[scheme],
+      ContentDispatchChooserTelemetry._getTelemetryLabel(scheme)
+    );
+  });
+
+  // Passing null to _getTelemetryLabel should throw.
+  Assert.throws(() => {
+    ContentDispatchChooserTelemetry._getTelemetryLabel(null);
+  }, /Invalid scheme/);
+
+  // Replace maps with test data
+  ContentDispatchChooserTelemetry.SCHEME_TO_LABEL = {
+    foo: "FOOLABEL",
+    bar: "BARLABEL",
+  };
+
+  ContentDispatchChooserTelemetry.SCHEME_PREFIX_TO_LABEL = {
+    fooPrefix: "FOOPREFIXLABEL",
+    barPrefix: "BARPREFIXLABEL",
+    fo: "PREFIXLABEL",
+  };
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("foo"),
+    "FOOLABEL",
+    "Non prefix mapping should have priority"
+  );
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("bar"),
+    "BARLABEL",
+    "Should return the correct label"
+  );
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("fooPrefix"),
+    "FOOPREFIXLABEL",
+    "Should return the correct label"
+  );
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("fooPrefix1"),
+    "FOOPREFIXLABEL",
+    "Should return the correct label"
+  );
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("fooPrefix2"),
+    "FOOPREFIXLABEL",
+    "Should return the correct label"
+  );
+
+  Assert.equal(
+    ContentDispatchChooserTelemetry._getTelemetryLabel("doesnotexist"),
+    "OTHER",
+    "Should return the correct label for unknown scheme"
+  );
+
+  // Restore maps
+  ContentDispatchChooserTelemetry.SCHEME_TO_LABEL = schemeToLabel;
+  ContentDispatchChooserTelemetry.SCHEME_PREFIX_TO_LABEL = schemePrefixToLabel;
+});
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/tests/unit/xpcshell.ini firefox-85.0+build1/uriloader/exthandler/tests/unit/xpcshell.ini
--- firefox-84.0.2+build1/uriloader/exthandler/tests/unit/xpcshell.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/tests/unit/xpcshell.ini	2021-01-18 19:58:27.000000000 +0000
@@ -24,3 +24,5 @@
 fail-if = os == "android"
 support-files = handlers.json
 [test_punycodeURIs.js]
+[test_protocol_ask_dialog_telemetry.js]
+skip-if = os == "android" # Desktop telemetry
diff -Nru firefox-84.0.2+build1/uriloader/exthandler/unix/nsOSHelperAppService.cpp firefox-85.0+build1/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- firefox-84.0.2+build1/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/uriloader/exthandler/unix/nsOSHelperAppService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -26,6 +26,7 @@
 #include "nsCRT.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
+#include "nsXULAppAPI.h"
 #include "ContentHandlerService.h"
 #include "prenv.h"  // for PR_GetEnv()
 #include "mozilla/Preferences.h"
diff -Nru firefox-84.0.2+build1/uriloader/prefetch/nsOfflineCacheUpdate.cpp firefox-85.0+build1/uriloader/prefetch/nsOfflineCacheUpdate.cpp
--- firefox-84.0.2+build1/uriloader/prefetch/nsOfflineCacheUpdate.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/prefetch/nsOfflineCacheUpdate.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsIURL.h"
 #include "nsICryptoHash.h"
 #include "nsICacheEntry.h"
+#include "nsIHttpChannel.h"
 #include "nsIPrincipal.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
diff -Nru firefox-84.0.2+build1/uriloader/prefetch/OfflineCacheUpdateChild.h firefox-85.0+build1/uriloader/prefetch/OfflineCacheUpdateChild.h
--- firefox-84.0.2+build1/uriloader/prefetch/OfflineCacheUpdateChild.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/prefetch/OfflineCacheUpdateChild.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
-#include "mozilla/dom/Document.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIURI.h"
@@ -21,6 +20,10 @@
 class nsPIDOMWindowInner;
 
 namespace mozilla {
+namespace dom {
+class Document;
+}
+
 namespace docshell {
 
 class OfflineCacheUpdateChild : public nsIOfflineCacheUpdate,
diff -Nru firefox-84.0.2+build1/uriloader/preload/FetchPreloader.h firefox-85.0+build1/uriloader/preload/FetchPreloader.h
--- firefox-84.0.2+build1/uriloader/preload/FetchPreloader.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/preload/FetchPreloader.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,9 +7,11 @@
 #define FetchPreloader_h_
 
 #include "mozilla/PreloaderBase.h"
+#include "mozilla/Variant.h"
 #include "nsCOMPtr.h"
 #include "nsIAsyncOutputStream.h"
 #include "nsIAsyncInputStream.h"
+#include "nsIContentPolicy.h"
 #include "nsIStreamListener.h"
 
 class nsIChannel;
@@ -18,6 +20,10 @@
 
 namespace mozilla {
 
+namespace dom {
+enum class ReferrerPolicy : uint8_t;
+}
+
 class FetchPreloader : public PreloaderBase, public nsIStreamListener {
   NS_DECL_ISUPPORTS
   NS_DECL_NSIREQUESTOBSERVER
diff -Nru firefox-84.0.2+build1/uriloader/preload/gtest/TestFetchPreloader.cpp firefox-85.0+build1/uriloader/preload/gtest/TestFetchPreloader.cpp
--- firefox-84.0.2+build1/uriloader/preload/gtest/TestFetchPreloader.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/preload/gtest/TestFetchPreloader.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 #include "mozilla/FetchPreloader.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PreloadHashKey.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsNetUtil.h"
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
diff -Nru firefox-84.0.2+build1/uriloader/preload/PreloaderBase.cpp firefox-85.0+build1/uriloader/preload/PreloaderBase.cpp
--- firefox-84.0.2+build1/uriloader/preload/PreloaderBase.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/preload/PreloaderBase.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,7 @@
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsIRedirectResultListener.h"
 
 // Change this if we want to cancel and remove the associated preload on removal
 // of all <link rel=preload> tags from the tree.
diff -Nru firefox-84.0.2+build1/uriloader/preload/PreloaderBase.h firefox-85.0+build1/uriloader/preload/PreloaderBase.h
--- firefox-84.0.2+build1/uriloader/preload/PreloaderBase.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/uriloader/preload/PreloaderBase.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,14 +8,12 @@
 #include "mozilla/Maybe.h"
 #include "mozilla/PreloadHashKey.h"
 #include "mozilla/WeakPtr.h"
-#include "nsIChannelEventSink.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIRedirectResultListener.h"
+#include "nsCOMPtr.h"
+#include "nsISupports.h"
 #include "nsITimer.h"
 #include "nsIURI.h"
+#include "nsIWeakReferenceUtils.h"
 #include "nsTArray.h"
-#include "nsProxyRelease.h"
-#include "nsWeakReference.h"
 
 class nsIChannel;
 class nsINode;
diff -Nru firefox-84.0.2+build1/widget/android/AndroidAlerts.cpp firefox-85.0+build1/widget/android/AndroidAlerts.cpp
--- firefox-84.0.2+build1/widget/android/AndroidAlerts.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/AndroidAlerts.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -107,8 +107,7 @@
 }
 
 NS_IMETHODIMP
-AndroidAlerts::CloseAlert(const nsAString& aAlertName,
-                          nsIPrincipal* aPrincipal) {
+AndroidAlerts::CloseAlert(const nsAString& aAlertName) {
   java::WebNotification::LocalRef notification =
       mNotificationsMap.Get(aAlertName);
   if (!notification) {
diff -Nru firefox-84.0.2+build1/widget/android/AndroidBridge.h firefox-85.0+build1/widget/android/AndroidBridge.h
--- firefox-84.0.2+build1/widget/android/AndroidBridge.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/android/AndroidBridge.h	2021-01-18 19:58:27.000000000 +0000
@@ -16,6 +16,8 @@
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 
+#include "js/RootingAPI.h"
+#include "js/Value.h"
 #include "mozilla/jni/Refs.h"
 
 #include "nsIMutableArray.h"
diff -Nru firefox-84.0.2+build1/widget/android/AndroidUiThread.cpp firefox-85.0+build1/widget/android/AndroidUiThread.cpp
--- firefox-84.0.2+build1/widget/android/AndroidUiThread.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/AndroidUiThread.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/ThreadEventQueue.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
+#include "GeckoProfiler.h"
 #include "nsThread.h"
 #include "nsThreadManager.h"
 #include "nsThreadUtils.h"
@@ -164,6 +165,7 @@
     sThread = new AndroidUiThread();
     sThread->InitCurrentThread();
     sThread->SetObserver(new ThreadObserver());
+    PROFILER_REGISTER_THREAD("AndroidUI");
     sMessageLoop =
         new MessageLoop(MessageLoop::TYPE_MOZILLA_ANDROID_UI, sThread.get());
     lock.NotifyAll();
@@ -193,6 +195,7 @@
     delete sMessageLoop;
     sMessageLoop = nullptr;
     MOZ_ASSERT(sThread);
+    PROFILER_UNREGISTER_THREAD();
     nsThreadManager::get().UnregisterCurrentThread(*sThread);
     sThread = nullptr;
     mDestroyed = true;
diff -Nru firefox-84.0.2+build1/widget/android/GeckoEditableSupport.cpp firefox-85.0+build1/widget/android/GeckoEditableSupport.cpp
--- firefox-84.0.2+build1/widget/android/GeckoEditableSupport.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/GeckoEditableSupport.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -16,6 +16,7 @@
 #include "mozilla/java/GeckoEditableChildWrappers.h"
 #include "mozilla/java/GeckoServiceChildProcessWrappers.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MiscEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_intl.h"
 #include "mozilla/TextComposition.h"
@@ -461,7 +462,8 @@
   nsCOMPtr<nsIWidget> widget = GetWidget();
   RefPtr<TextEventDispatcher> dispatcher =
       mDispatcher ? mDispatcher.get()
-                  : widget ? widget->GetTextEventDispatcher() : nullptr;
+      : widget    ? widget->GetTextEventDispatcher()
+                  : nullptr;
   NS_ENSURE_TRUE_VOID(dispatcher && widget);
 
   if (!aIsSynthesizedImeKey) {
@@ -693,35 +695,42 @@
       continue;
     }
 
-    WidgetQueryContentEvent event(true, eQueryTextContent, widget);
+    nsString insertedString;
+    WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent,
+                                                  widget);
 
     if (change.mNewEnd != change.mStart) {
-      event.InitForQueryTextContent(change.mStart,
-                                    change.mNewEnd - change.mStart);
-      widget->DispatchEvent(&event, status);
+      queryTextContentEvent.InitForQueryTextContent(
+          change.mStart, change.mNewEnd - change.mStart);
+      widget->DispatchEvent(&queryTextContentEvent, status);
 
-      if (shouldAbort(NS_WARN_IF(!event.mSucceeded))) {
+      if (shouldAbort(NS_WARN_IF(queryTextContentEvent.Failed()))) {
         return;
       }
+
+      insertedString = queryTextContentEvent.mReply->DataRef();
     }
 
-    textTransaction.AppendElement(TextRecord{
-        event.mReply.mString, change.mStart, change.mOldEnd, change.mNewEnd});
+    textTransaction.AppendElement(TextRecord{insertedString, change.mStart,
+                                             change.mOldEnd, change.mNewEnd});
   }
 
   int32_t selStart = -1;
   int32_t selEnd = -1;
 
   if (mIMESelectionChanged) {
-    WidgetQueryContentEvent event(true, eQuerySelectedText, widget);
-    widget->DispatchEvent(&event, status);
+    WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                   widget);
+    widget->DispatchEvent(&querySelectedTextEvent, status);
 
-    if (shouldAbort(NS_WARN_IF(!event.mSucceeded))) {
+    if (shouldAbort(NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection()))) {
       return;
     }
 
-    selStart = int32_t(event.GetSelectionStart());
-    selEnd = int32_t(event.GetSelectionEnd());
+    selStart = static_cast<int32_t>(
+        querySelectedTextEvent.mReply->SelectionStartOffset());
+    selEnd = static_cast<int32_t>(
+        querySelectedTextEvent.mReply->SelectionEndOffset());
 
     if (aFlags == FLUSH_FLAG_RECOVER) {
       // Sometimes we get out-of-bounds selection during recovery.
@@ -814,12 +823,17 @@
 
   nsEventStatus status = nsEventStatus_eIgnore;
   uint32_t offset = composition->NativeOffsetOfStartComposition();
-  WidgetQueryContentEvent textRects(true, eQueryTextRectArray, widget);
-  textRects.InitForQueryTextRectArray(offset, composition->String().Length());
-  widget->DispatchEvent(&textRects, status);
-
-  auto rects = ConvertRectArrayToJavaRectFArray(textRects.mReply.mRectArray,
-                                                widget->GetDefaultScale());
+  WidgetQueryContentEvent queryTextRectsEvent(true, eQueryTextRectArray,
+                                              widget);
+  queryTextRectsEvent.InitForQueryTextRectArray(offset,
+                                                composition->String().Length());
+  widget->DispatchEvent(&queryTextRectsEvent, status);
+
+  auto rects = ConvertRectArrayToJavaRectFArray(
+      queryTextRectsEvent.Succeeded()
+          ? queryTextRectsEvent.mReply->mRectArray
+          : CopyableTArray<mozilla::LayoutDeviceIntRect>(),
+      widget->GetDefaultScale());
 
   mEditable->UpdateCompositionRects(rects);
 }
@@ -892,11 +906,13 @@
 #ifdef NIGHTLY_BUILD
     {
       nsEventStatus status = nsEventStatus_eIgnore;
-      WidgetQueryContentEvent selection(true, eQuerySelectedText, widget);
-      widget->DispatchEvent(&selection, status);
-      if (selection.mSucceeded) {
-        ALOGIME("IME: Current selection: { Offset=%u, Length=%u }",
-                selection.mReply.mOffset, selection.mReply.mString.Length());
+      WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                     widget);
+      widget->DispatchEvent(&querySelectedTextEvent, status);
+      if (querySelectedTextEvent.Succeeded()) {
+        ALOGIME(
+            "IME: Current selection: %s",
+            ToString(querySelectedTextEvent.mReply->mOffsetAndData).c_str());
       }
     }
 #endif
@@ -1110,10 +1126,13 @@
     }
 
     {
-      WidgetQueryContentEvent event(true, eQuerySelectedText, widget);
-      widget->DispatchEvent(&event, status);
-      MOZ_ASSERT(event.mSucceeded);
-      string = event.mReply.mString;
+      WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                     widget);
+      widget->DispatchEvent(&querySelectedTextEvent, status);
+      MOZ_ASSERT(querySelectedTextEvent.Succeeded());
+      if (querySelectedTextEvent.FoundSelection()) {
+        string = querySelectedTextEvent.mReply->DataRef();
+      }
     }
   } else {
     // If the new composition matches the existing composition,
@@ -1156,17 +1175,18 @@
       mLength = UINT32_MAX;
       return;
     }
-    WidgetQueryContentEvent selection(true, eQuerySelectedText, widget);
+    WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                   widget);
     nsEventStatus status = nsEventStatus_eIgnore;
-    widget->DispatchEvent(&selection, status);
-    if (!selection.mSucceeded) {
+    widget->DispatchEvent(&querySelectedTextEvent, status);
+    if (querySelectedTextEvent.DidNotFindSelection()) {
       mOffset = UINT32_MAX;
       mLength = UINT32_MAX;
       return;
     }
 
-    mOffset = selection.mReply.mOffset;
-    mLength = selection.mReply.mString.Length();
+    mOffset = querySelectedTextEvent.mReply->StartOffset();
+    mLength = querySelectedTextEvent.mReply->DataLength();
   }
 
   ~AutoSelectionRestore() {
diff -Nru firefox-84.0.2+build1/widget/android/ImageDecoderSupport.cpp firefox-85.0+build1/widget/android/ImageDecoderSupport.cpp
--- firefox-84.0.2+build1/widget/android/ImageDecoderSupport.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/ImageDecoderSupport.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -12,6 +12,7 @@
 #include "JavaExceptions.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/gfx/Swizzle.h"
+#include "nsNetUtil.h"
 
 namespace mozilla {
 namespace widget {
diff -Nru firefox-84.0.2+build1/widget/android/moz.build firefox-85.0+build1/widget/android/moz.build
--- firefox-84.0.2+build1/widget/android/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -143,7 +143,6 @@
     "nsUserIdleServiceAndroid.cpp",
     "nsWidgetFactory.cpp",
     "nsWindow.cpp",
-    "ProcInfo.cpp",
     "ScreenHelperAndroid.cpp",
     "WebExecutorSupport.cpp",
 ]
diff -Nru firefox-84.0.2+build1/widget/android/nsAppShell.cpp firefox-85.0+build1/widget/android/nsAppShell.cpp
--- firefox-84.0.2+build1/widget/android/nsAppShell.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsAppShell.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -31,6 +31,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Hal.h"
 #include "mozilla/dom/BrowserChild.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/intl/OSPreferences.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/java/GeckoAppShellNatives.h"
@@ -222,7 +223,7 @@
 
     if (appStartup) {
       bool userAllowedQuit = true;
-      appStartup->Quit(nsIAppStartup::eForceQuit, &userAllowedQuit);
+      appStartup->Quit(nsIAppStartup::eForceQuit, 0, &userAllowedQuit);
     }
   }
 
diff -Nru firefox-84.0.2+build1/widget/android/nsAppShell.h firefox-85.0+build1/widget/android/nsAppShell.h
--- firefox-84.0.2+build1/widget/android/nsAppShell.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsAppShell.h	2021-01-18 19:58:27.000000000 +0000
@@ -157,7 +157,7 @@
 
   class NativeCallbackEvent : public Event {
     // Capturing the nsAppShell instance is safe because if the app
-    // shell is detroyed, this lambda will not be called either.
+    // shell is destroyed, this lambda will not be called either.
     nsAppShell* const appShell;
 
    public:
diff -Nru firefox-84.0.2+build1/widget/android/nsLookAndFeel.cpp firefox-85.0+build1/widget/android/nsLookAndFeel.cpp
--- firefox-84.0.2+build1/widget/android/nsLookAndFeel.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsLookAndFeel.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -304,13 +304,19 @@
   return rv;
 }
 
-nsresult nsLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
-  nsresult rv = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(rv)) return rv;
-
-  rv = NS_OK;
+nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
+  nsresult rv = NS_OK;
 
   switch (aID) {
+    case IntID::ScrollButtonLeftMouseButtonAction:
+      aResult = 0;
+      break;
+
+    case IntID::ScrollButtonMiddleMouseButtonAction:
+    case IntID::ScrollButtonRightMouseButtonAction:
+      aResult = 3;
+      break;
+
     case IntID::CaretBlinkTime:
       aResult = 500;
       break;
@@ -423,10 +429,8 @@
   return rv;
 }
 
-nsresult nsLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult rv = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(rv)) return rv;
-  rv = NS_OK;
+nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult rv = NS_OK;
 
   switch (aID) {
     case FloatID::IMEUnderlineRelativeSize:
@@ -446,8 +450,8 @@
 }
 
 /*virtual*/
-bool nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
-                                gfxFontStyle& aFontStyle) {
+bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName,
+                                  gfxFontStyle& aFontStyle) {
   aFontName.AssignLiteral("\"Roboto\"");
   aFontStyle.style = FontSlantStyle::Normal();
   aFontStyle.weight = FontWeight::Normal();
diff -Nru firefox-84.0.2+build1/widget/android/nsLookAndFeel.h firefox-85.0+build1/widget/android/nsLookAndFeel.h
--- firefox-84.0.2+build1/widget/android/nsLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,11 +15,11 @@
 
   void NativeInit() final;
   virtual void RefreshImpl() override;
-  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
-  virtual nsresult GetIntImpl(IntID aID, int32_t& aResult) override;
-  virtual nsresult GetFloatImpl(FloatID aID, float& aResult) override;
-  virtual bool GetFontImpl(FontID aID, nsString& aName,
-                           gfxFontStyle& aStyle) override;
+  nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
+  nsresult NativeGetFloat(FloatID aID, float& aResult) override;
+  nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
+  bool NativeGetFont(FontID aID, nsString& aName,
+                     gfxFontStyle& aStyle) override;
   virtual bool GetEchoPasswordImpl() override;
   virtual uint32_t GetPasswordMaskDelayImpl() override;
   virtual char16_t GetPasswordCharacterImpl() override;
diff -Nru firefox-84.0.2+build1/widget/android/nsNativeThemeAndroid.cpp firefox-85.0+build1/widget/android/nsNativeThemeAndroid.cpp
--- firefox-84.0.2+build1/widget/android/nsNativeThemeAndroid.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsNativeThemeAndroid.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -389,11 +389,12 @@
   int32_t arrowPolygonY[] = {-1, 1, -1};
   const int32_t arrowNumPoints = sizeof(arrowPolygonX) / sizeof(int32_t);
 
-  PaintArrow(
-      aDrawTarget, aRect, arrowPolygonX, arrowPolygonY, arrowNumPoints,
-      arrowSize,
-      isPressed ? sActiveColor : isHovered ? sBorderHoverColor : sBorderColor,
-      aDpi);
+  PaintArrow(aDrawTarget, aRect, arrowPolygonX, arrowPolygonY, arrowNumPoints,
+             arrowSize,
+             isPressed   ? sActiveColor
+             : isHovered ? sBorderHoverColor
+                         : sBorderColor,
+             aDpi);
 }
 
 static void PaintSpinnerButton(DrawTarget* aDrawTarget, const Rect& aRect,
@@ -415,11 +416,12 @@
     }
   }
 
-  PaintArrow(
-      aDrawTarget, aRect, arrowPolygonX, arrowPolygonY, arrowNumPoints,
-      arrowSize,
-      isPressed ? sActiveColor : isHovered ? sBorderHoverColor : sBorderColor,
-      aDpi);
+  PaintArrow(aDrawTarget, aRect, arrowPolygonX, arrowPolygonY, arrowNumPoints,
+             arrowSize,
+             isPressed   ? sActiveColor
+             : isHovered ? sBorderHoverColor
+                         : sBorderColor,
+             aDpi);
 }
 
 static void PaintRangeInputBackground(DrawTarget* aDrawTarget,
@@ -497,8 +499,7 @@
   bool isHovered = aState.HasState(NS_EVENT_STATE_HOVER);
 
   aDrawTarget->FillRect(
-      aRect, ColorPattern(
-                 ToDeviceColor(isActive ? sScrollbarButtonActiveColor
+      aRect, ColorPattern(ToDeviceColor(isActive ? sScrollbarButtonActiveColor
                                         : isHovered ? sScrollbarButtonHoverColor
                                                     : sScrollbarColor)));
 
@@ -536,9 +537,9 @@
 
   PaintArrow(aDrawTarget, aRect, arrowPolygonX, arrowPolygonY, arrowNumPoints,
              arrowSize,
-             isActive
-                 ? sScrollbarArrowColorActive
-                 : isHovered ? sScrollbarArrowColorHover : sScrollbarArrowColor,
+             isActive    ? sScrollbarArrowColorActive
+             : isHovered ? sScrollbarArrowColorHover
+                         : sScrollbarArrowColor,
              aDpi);
 
   RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
diff -Nru firefox-84.0.2+build1/widget/android/nsWindow.cpp firefox-85.0+build1/widget/android/nsWindow.cpp
--- firefox-84.0.2+build1/widget/android/nsWindow.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/nsWindow.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -34,6 +34,7 @@
 #include "mozilla/gfx/DataSurfaceHelpers.h"
 #include "mozilla/gfx/Types.h"
 #include "mozilla/layers/RenderTrace.h"
+#include "mozilla/widget/AndroidVsync.h"
 #include <algorithm>
 
 using mozilla::Unused;
@@ -100,6 +101,7 @@
 #include "mozilla/java/PanZoomControllerNatives.h"
 #include "mozilla/java/SessionAccessibilityWrappers.h"
 #include "ScreenHelperAndroid.h"
+#include "TouchResampler.h"
 
 #include "GeckoProfiler.h"  // For AUTO_PROFILER_LABEL
 #include "nsPrintfCString.h"
@@ -134,6 +136,8 @@
 static const double SWIPE_MAX_PINCH_DELTA_INCHES = 0.4;
 static const double SWIPE_MIN_DISTANCE_INCHES = 0.6;
 
+static const double kTouchResampleVsyncAdjustMs = 5.0;
+
 static const int32_t INPUT_RESULT_UNHANDLED =
     java::PanZoomController::INPUT_RESULT_UNHANDLED;
 static const int32_t INPUT_RESULT_HANDLED =
@@ -178,10 +182,23 @@
  * it separate from GeckoViewSupport.
  */
 class NPZCSupport final
-    : public java::PanZoomController::NativeProvider::Natives<NPZCSupport> {
+    : public java::PanZoomController::NativeProvider::Natives<NPZCSupport>,
+      public AndroidVsync::Observer {
   WindowPtr mWindow;
   java::PanZoomController::NativeProvider::WeakRef mNPZC;
-  int mPreviousButtons;
+
+  // Stores the returnResult of each pending motion event between
+  // HandleMotionEvent and FinishHandlingMotionEvent.
+  std::queue<std::pair<uint64_t, java::GeckoResult::GlobalRef>>
+      mPendingMotionEventReturnResults;
+
+  RefPtr<AndroidVsync> mAndroidVsync;
+  TouchResampler mTouchResampler;
+  int mPreviousButtons = 0;
+  bool mListeningToVsync = false;
+
+  // Only true if mAndroidVsync is non-null and the resampling pref is set.
+  bool mTouchResamplingEnabled = false;
 
   template <typename Lambda>
   class InputEvent final : public nsAppShell::Event {
@@ -244,14 +261,27 @@
 
   NPZCSupport(WindowPtr aWindow,
               const java::PanZoomController::NativeProvider::LocalRef& aNPZC)
-      : mWindow(aWindow), mNPZC(aNPZC), mPreviousButtons(0) {
+      : mWindow(aWindow), mNPZC(aNPZC) {
 #if defined(DEBUG)
     auto win(mWindow.Access());
     MOZ_ASSERT(!!win);
 #endif  // defined(DEBUG)
+
+    // Use vsync for touch resampling on API level 19 and above.
+    // See gfxAndroidPlatform::CreateHardwareVsyncSource() for comparison.
+    if (AndroidBridge::Bridge() &&
+        AndroidBridge::Bridge()->GetAPIVersion() >= 19) {
+      mAndroidVsync = AndroidVsync::GetInstance();
+    }
   }
 
-  ~NPZCSupport() {}
+  ~NPZCSupport() {
+    if (mListeningToVsync) {
+      MOZ_RELEASE_ASSERT(mAndroidVsync);
+      mAndroidVsync->UnregisterObserver(this, AndroidVsync::INPUT);
+      mListeningToVsync = false;
+    }
+  }
 
   using Base::AttachNative;
   using Base::DisposeNative;
@@ -570,23 +600,6 @@
     auto returnResult = java::GeckoResult::Ref::From(aResult);
     auto eventData =
         java::PanZoomController::MotionEventData::Ref::From(aEventData);
-    RefPtr<IAPZCTreeManager> controller;
-
-    if (auto window = mWindow.Access()) {
-      nsWindow* gkWindow = window->GetNsWindow();
-      if (gkWindow) {
-        controller = gkWindow->mAPZC;
-      }
-    }
-
-    if (!controller) {
-      if (returnResult) {
-        returnResult->Complete(
-            java::sdk::Integer::ValueOf(INPUT_RESULT_UNHANDLED));
-      }
-      return;
-    }
-
     nsTArray<int32_t> pointerId(eventData->PointerId()->GetElements());
     size_t pointerCount = pointerId.Length();
     MultiTouchInput::MultiTouchType type;
@@ -703,10 +716,88 @@
       input.mTouches.AppendElement(singleTouchData);
     }
 
-    APZEventResult result = controller->InputBridge()->ReceiveInputEvent(input);
+    if (mAndroidVsync &&
+        eventData->Action() == java::sdk::MotionEvent::ACTION_DOWN) {
+      // Query pref value at the beginning of a touch gesture so that we don't
+      // leave events stuck in the resampler after a pref flip.
+      mTouchResamplingEnabled = StaticPrefs::android_touch_resampling_enabled();
+    }
+
+    if (!mTouchResamplingEnabled) {
+      FinishHandlingMotionEvent(std::move(input),
+                                java::GeckoResult::LocalRef(returnResult));
+      return;
+    }
+
+    uint64_t eventId = mTouchResampler.ProcessEvent(std::move(input));
+    mPendingMotionEventReturnResults.push(
+        {eventId, java::GeckoResult::GlobalRef(returnResult)});
+
+    RegisterOrUnregisterForVsync(mTouchResampler.InTouchingState());
+    ConsumeMotionEventsFromResampler();
+  }
+
+  void RegisterOrUnregisterForVsync(bool aNeedVsync) {
+    MOZ_RELEASE_ASSERT(mAndroidVsync);
+    if (aNeedVsync && !mListeningToVsync) {
+      mAndroidVsync->RegisterObserver(this, AndroidVsync::INPUT);
+    } else if (!aNeedVsync && mListeningToVsync) {
+      mAndroidVsync->UnregisterObserver(this, AndroidVsync::INPUT);
+    }
+    mListeningToVsync = aNeedVsync;
+  }
+
+  void OnVsync(const TimeStamp& aTimeStamp) override {
+    mTouchResampler.NotifyFrame(aTimeStamp - TimeDuration::FromMilliseconds(
+                                                 kTouchResampleVsyncAdjustMs));
+    ConsumeMotionEventsFromResampler();
+  }
+
+  void ConsumeMotionEventsFromResampler() {
+    auto outgoing = mTouchResampler.ConsumeOutgoingEvents();
+    while (!outgoing.empty()) {
+      auto outgoingEvent = std::move(outgoing.front());
+      outgoing.pop();
+      java::GeckoResult::GlobalRef returnResult;
+      if (outgoingEvent.mEventId) {
+        // Look up the GeckoResult for this event.
+        // The outgoing events from the resampler are in the same order as the
+        // original events, and no event IDs are skipped.
+        MOZ_RELEASE_ASSERT(!mPendingMotionEventReturnResults.empty());
+        auto pair = mPendingMotionEventReturnResults.front();
+        mPendingMotionEventReturnResults.pop();
+        MOZ_RELEASE_ASSERT(pair.first == *outgoingEvent.mEventId);
+        returnResult = pair.second;
+      }
+      FinishHandlingMotionEvent(std::move(outgoingEvent.mEvent),
+                                java::GeckoResult::LocalRef(returnResult));
+    }
+  }
+
+  void FinishHandlingMotionEvent(MultiTouchInput&& aInput,
+                                 java::GeckoResult::LocalRef&& aReturnResult) {
+    RefPtr<IAPZCTreeManager> controller;
+
+    if (auto window = mWindow.Access()) {
+      nsWindow* gkWindow = window->GetNsWindow();
+      if (gkWindow) {
+        controller = gkWindow->mAPZC;
+      }
+    }
+
+    if (!controller) {
+      if (aReturnResult) {
+        aReturnResult->Complete(
+            java::sdk::Integer::ValueOf(INPUT_RESULT_UNHANDLED));
+      }
+      return;
+    }
+
+    APZEventResult result =
+        controller->InputBridge()->ReceiveInputEvent(aInput);
     if (result.mStatus == nsEventStatus_eConsumeNoDefault) {
-      if (returnResult) {
-        returnResult->Complete(java::sdk::Integer::ValueOf(
+      if (aReturnResult) {
+        aReturnResult->Complete(java::sdk::Integer::ValueOf(
             (result.mHandledResult == Some(APZHandledResult::HandledByRoot))
                 ? INPUT_RESULT_HANDLED
                 : INPUT_RESULT_HANDLED_CONTENT));
@@ -715,13 +806,13 @@
     }
 
     // Dispatch APZ input event on Gecko thread.
-    PostInputEvent([input, result](nsWindow* window) {
-      WidgetTouchEvent touchEvent = input.ToWidgetTouchEvent(window);
+    PostInputEvent([aInput, result](nsWindow* window) {
+      WidgetTouchEvent touchEvent = aInput.ToWidgetTouchEvent(window);
       window->ProcessUntransformedAPZEvent(&touchEvent, result);
       window->DispatchHitTest(touchEvent);
     });
 
-    if (!returnResult) {
+    if (!aReturnResult) {
       // We don't care how APZ handled the event so we're done here.
       return;
     }
@@ -731,16 +822,16 @@
       // don't need to do any more work.
       switch (result.mStatus) {
         case nsEventStatus_eIgnore:
-          returnResult->Complete(
+          aReturnResult->Complete(
               java::sdk::Integer::ValueOf(INPUT_RESULT_UNHANDLED));
           break;
         case nsEventStatus_eConsumeDoDefault:
-          returnResult->Complete(java::sdk::Integer::ValueOf(
+          aReturnResult->Complete(java::sdk::Integer::ValueOf(
               ConvertAPZHandledResult(result.mHandledResult.value())));
           break;
         default:
           MOZ_ASSERT_UNREACHABLE("Unexpected nsEventStatus");
-          returnResult->Complete(
+          aReturnResult->Complete(
               java::sdk::Integer::ValueOf(INPUT_RESULT_UNHANDLED));
           break;
       }
@@ -750,9 +841,9 @@
     // Wait to see if APZ handled the event or not...
     controller->AddInputBlockCallback(
         result.mInputBlockId,
-        [returnResult = java::GeckoResult::GlobalRef(returnResult)](
+        [aReturnResult = java::GeckoResult::GlobalRef(aReturnResult)](
             uint64_t aInputBlockId, APZHandledResult aHandledResult) {
-          returnResult->Complete(java::sdk::Integer::ValueOf(
+          aReturnResult->Complete(java::sdk::Integer::ValueOf(
               ConvertAPZHandledResult(aHandledResult)));
         });
   }
diff -Nru firefox-84.0.2+build1/widget/android/ProcInfo.cpp firefox-85.0+build1/widget/android/ProcInfo.cpp
--- firefox-84.0.2+build1/widget/android/ProcInfo.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/ProcInfo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +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 "mozilla/ProcInfo.h"
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-
-namespace mozilla {
-
-RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
-  // Not implemented on Android.
-  return ProcInfoPromise::CreateAndReject(NS_ERROR_NOT_IMPLEMENTED, __func__);
-}
-
-}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/widget/android/WebExecutorSupport.cpp firefox-85.0+build1/widget/android/WebExecutorSupport.cpp
--- firefox-84.0.2+build1/widget/android/WebExecutorSupport.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/android/WebExecutorSupport.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,8 @@
 
 #include "WebExecutorSupport.h"
 
+#include "nsIAsyncVerifyRedirectCallback.h"
+#include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"
 #include "nsIHttpHeaderVisitor.h"
 #include "nsINSSErrorsService.h"
diff -Nru firefox-84.0.2+build1/widget/BasicEvents.h firefox-85.0+build1/widget/BasicEvents.h
--- firefox-84.0.2+build1/widget/BasicEvents.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/BasicEvents.h	2021-01-18 19:58:27.000000000 +0000
@@ -24,6 +24,8 @@
 #  include "nsXULAppAPI.h"
 #endif  // #ifdef DEBUG
 
+class nsIPrincipal;
+
 namespace IPC {
 template <typename T>
 struct ParamTraits;
@@ -480,7 +482,8 @@
         break;
       default:
         if (mMessage == eResize || mMessage == eMozVisualResize ||
-            mMessage == eMozVisualScroll || mMessage == eEditorInput) {
+            mMessage == eMozVisualScroll || mMessage == eEditorInput ||
+            mMessage == eFormSelect) {
           mFlags.mCancelable = false;
         } else {
           mFlags.mCancelable = true;
diff -Nru firefox-84.0.2+build1/widget/cocoa/GfxInfo.mm firefox-85.0+build1/widget/cocoa/GfxInfo.mm
--- firefox-84.0.2+build1/widget/cocoa/GfxInfo.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/GfxInfo.mm	2021-01-18 19:58:27.000000000 +0000
@@ -442,6 +442,9 @@
     IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::NvidiaRolloutWebRender,
                                    nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
                                    "FEATURE_ROLLOUT_NVIDIA_MAC");
+    IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::AppleAll,
+                                   nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
+                                   "FEATURE_ROLLOUT_APPLE_SILICON_MAC");
   }
   return *sDriverInfo;
 }
diff -Nru firefox-84.0.2+build1/widget/cocoa/moz.build firefox-85.0+build1/widget/cocoa/moz.build
--- firefox-84.0.2+build1/widget/cocoa/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -73,7 +73,6 @@
     "nsWidgetFactory.mm",
     "nsWindowMap.mm",
     "OSXNotificationCenter.mm",
-    "ProcInfo.mm",
     "ScreenHelperCocoa.mm",
     "SwipeTracker.mm",
     "TextInputHandler.mm",
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsAppShell.mm firefox-85.0+build1/widget/cocoa/nsAppShell.mm
--- firefox-84.0.2+build1/widget/cocoa/nsAppShell.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsAppShell.mm	2021-01-18 19:58:27.000000000 +0000
@@ -23,7 +23,6 @@
 #include "nsThreadUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsObjCExceptions.h"
-#include "nsCocoaFeatures.h"
 #include "nsCocoaUtils.h"
 #include "nsChildView.h"
 #include "nsToolkit.h"
@@ -271,10 +270,6 @@
   }
 }
 
-// An undocumented CoreGraphics framework method, present in the same form
-// since at least OS X 10.5.
-extern "C" CGError CGSSetDebugOptions(int options);
-
 // Init
 //
 // Loads the nib (see bug 316076c21) and sets up the CFRunLoopSource used to
@@ -354,20 +349,6 @@
     gAppShellMethodsSwizzled = true;
   }
 
-  // The bug that this works around was introduced in OS X 10.10.0
-  // and fixed in OS X 10.10.2. Order these version checks so as
-  // few as possible will actually end up running.
-  if (nsCocoaFeatures::macOSVersionMinor() == 10 && nsCocoaFeatures::macOSVersionBugFix() < 2 &&
-      nsCocoaFeatures::macOSVersionMajor() == 10) {
-    // Explicitly turn off CGEvent logging.  This works around bug 1092855.
-    // If there are already CGEvents in the log, turning off logging also
-    // causes those events to be written to disk.  But at this point no
-    // CGEvents have yet been processed.  CGEvents are events (usually
-    // input events) pulled from the WindowServer.  An option of 0x80000008
-    // turns on CGEvent logging.
-    CGSSetDebugOptions(0x80000007);
-  }
-
 #if !defined(RELEASE_OR_BETA) || defined(DEBUG)
   if (Preferences::GetBool("security.sandbox.mac.track.violations", false)) {
     nsSandboxViolationSink::Start();
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsChildView.mm firefox-85.0+build1/widget/cocoa/nsChildView.mm
--- firefox-84.0.2+build1/widget/cocoa/nsChildView.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsChildView.mm	2021-01-18 19:58:27.000000000 +0000
@@ -1616,16 +1616,17 @@
   // the physical direction of the arrow.
   if (aEvent.mKeyCode >= NS_VK_LEFT && aEvent.mKeyCode <= NS_VK_DOWN) {
     // XXX This may be expensive. Should use the cache in TextInputHandler.
-    WidgetQueryContentEvent query(true, eQuerySelectedText, this);
-    DispatchWindowEvent(query);
+    WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText, this);
+    DispatchWindowEvent(querySelectedTextEvent);
 
-    if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) {
+    if (querySelectedTextEvent.FoundSelection() &&
+        querySelectedTextEvent.mReply->mWritingMode.IsVertical()) {
       uint32_t geckoKey = 0;
       uint32_t cocoaKey = 0;
 
       switch (aEvent.mKeyCode) {
         case NS_VK_LEFT:
-          if (query.mReply.mWritingMode.IsVerticalLR()) {
+          if (querySelectedTextEvent.mReply->mWritingMode.IsVerticalLR()) {
             geckoKey = NS_VK_UP;
             cocoaKey = kVK_UpArrow;
           } else {
@@ -1635,7 +1636,7 @@
           break;
 
         case NS_VK_RIGHT:
-          if (query.mReply.mWritingMode.IsVerticalLR()) {
+          if (querySelectedTextEvent.mReply->mWritingMode.IsVerticalLR()) {
             geckoKey = NS_VK_DOWN;
             cocoaKey = kVK_DownArrow;
           } else {
@@ -1677,9 +1678,9 @@
   // need any layout information right now.
   queryContentState.mNeedsToFlushLayout = false;
   DispatchWindowEvent(queryContentState);
-  if (queryContentState.mSucceeded && queryContentState.mReply.mFocusedWidget) {
+  if (queryContentState.Succeeded() && queryContentState.mReply->mFocusedWidget) {
     NSView<mozView>* view = static_cast<NSView<mozView>*>(
-        queryContentState.mReply.mFocusedWidget->GetNativeData(NS_NATIVE_WIDGET));
+        queryContentState.mReply->mFocusedWidget->GetNativeData(NS_NATIVE_WIDGET));
     if (view) editorView = view;
   }
   return editorView;
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsCocoaFeatures.mm firefox-85.0+build1/widget/cocoa/nsCocoaFeatures.mm
--- firefox-84.0.2+build1/widget/cocoa/nsCocoaFeatures.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsCocoaFeatures.mm	2021-01-18 19:58:27.000000000 +0000
@@ -31,6 +31,7 @@
 #include "nsObjCExceptions.h"
 
 #import <Cocoa/Cocoa.h>
+#include <sys/sysctl.h>
 
 /*static*/ int32_t nsCocoaFeatures::mOSVersion = 0;
 
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsCocoaUtils.h firefox-85.0+build1/widget/cocoa/nsCocoaUtils.h
--- firefox-84.0.2+build1/widget/cocoa/nsCocoaUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsCocoaUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -18,6 +18,7 @@
 #include "nsObjCExceptions.h"
 
 #include "mozilla/EventForwards.h"
+#include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPtr.h"
 
 // Declare the backingScaleFactor method that we want to call
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsCocoaUtils.mm firefox-85.0+build1/widget/cocoa/nsCocoaUtils.mm
--- firefox-84.0.2+build1/widget/cocoa/nsCocoaUtils.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsCocoaUtils.mm	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "AppleUtils.h"
 #include "gfx2DGlue.h"
+#include "gfxContext.h"
 #include "gfxPlatform.h"
 #include "gfxUtils.h"
 #include "ImageRegion.h"
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsCocoaWindow.mm firefox-85.0+build1/widget/cocoa/nsCocoaWindow.mm
--- firefox-84.0.2+build1/widget/cocoa/nsCocoaWindow.mm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsCocoaWindow.mm	2021-01-18 19:58:27.000000000 +0000
@@ -2132,11 +2132,11 @@
   if (!presContext) {
     return;
   }
-  nsDocShell* docShell = presContext->GetDocShell();
-  if (!docShell) {
+  BrowsingContext* bc = presContext->Document()->GetBrowsingContext();
+  if (!bc) {
     return;
   }
-  docShell->SetIsActive(false);
+  Unused << bc->SetExplicitActive(ExplicitActiveStatus::Inactive);
 }
 
 void nsCocoaWindow::ResumeCompositor() {
@@ -2165,11 +2165,11 @@
   if (!presContext) {
     return;
   }
-  nsDocShell* docShell = presContext->GetDocShell();
-  if (!docShell) {
+  BrowsingContext* bc = presContext->Document()->GetBrowsingContext();
+  if (!bc) {
     return;
   }
-  docShell->SetIsActive(true);
+  Unused << bc->SetExplicitActive(ExplicitActiveStatus::Active);
 }
 
 void nsCocoaWindow::SetMenuBar(nsMenuBarX* aMenuBar) {
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsLookAndFeel.h firefox-85.0+build1/widget/cocoa/nsLookAndFeel.h
--- firefox-84.0.2+build1/widget/cocoa/nsLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,11 +14,11 @@
 
   void NativeInit() final;
   virtual void RefreshImpl() override;
-  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
-  virtual nsresult GetIntImpl(IntID aID, int32_t& aResult) override;
-  virtual nsresult GetFloatImpl(FloatID aID, float& aResult) override;
-  virtual bool GetFontImpl(FontID aID, nsString& aFontName,
-                           gfxFontStyle& aFontStyle) override;
+  nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
+  nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
+  nsresult NativeGetFloat(FloatID aID, float& aResult) override;
+  bool NativeGetFont(FontID aID, nsString& aFontName,
+                     gfxFontStyle& aFontStyle) override;
 
   virtual char16_t GetPasswordCharacterImpl() override {
     // unicode value for the bullet character, used for password textfields.
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsLookAndFeel.mm firefox-85.0+build1/widget/cocoa/nsLookAndFeel.mm
--- firefox-84.0.2+build1/widget/cocoa/nsLookAndFeel.mm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsLookAndFeel.mm	2021-01-18 19:58:27.000000000 +0000
@@ -419,14 +419,19 @@
   return res;
 }
 
-nsresult nsLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
+nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+  nsresult res = NS_OK;
 
   switch (aID) {
+    case IntID::ScrollButtonLeftMouseButtonAction:
+      aResult = 0;
+      break;
+    case IntID::ScrollButtonMiddleMouseButtonAction:
+    case IntID::ScrollButtonRightMouseButtonAction:
+      aResult = 3;
+      break;
     case IntID::CaretBlinkTime:
       aResult = 567;
       break;
@@ -585,10 +590,8 @@
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
-nsresult nsLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult res = NS_OK;
 
   switch (aID) {
     case FloatID::IMEUnderlineRelativeSize:
@@ -618,7 +621,7 @@
   return !![[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
 }
 
-bool nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName, gfxFontStyle& aFontStyle) {
+bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, gfxFontStyle& aFontStyle) {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   // hack for now
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsMacFinderProgress.mm firefox-85.0+build1/widget/cocoa/nsMacFinderProgress.mm
--- firefox-84.0.2+build1/widget/cocoa/nsMacFinderProgress.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsMacFinderProgress.mm	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "nsMacFinderProgress.h"
+#include "nsProxyRelease.h"
 #include "nsThreadUtils.h"
 #include "nsString.h"
 #include "nsObjCExceptions.h"
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsMenuBarX.mm firefox-85.0+build1/widget/cocoa/nsMenuBarX.mm
--- firefox-84.0.2+build1/widget/cocoa/nsMenuBarX.mm	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsMenuBarX.mm	2021-01-18 19:58:27.000000000 +0000
@@ -917,7 +917,7 @@
       nsCOMPtr<nsIAppStartup> appStartup = mozilla::components::AppStartup::Service();
       if (appStartup) {
         bool userAllowedQuit = true;
-        appStartup->Quit(nsIAppStartup::eAttemptQuit, &userAllowedQuit);
+        appStartup->Quit(nsIAppStartup::eAttemptQuit, 0, &userAllowedQuit);
       }
     }
     return;
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsNativeBasicThemeCocoa.cpp firefox-85.0+build1/widget/cocoa/nsNativeBasicThemeCocoa.cpp
--- firefox-84.0.2+build1/widget/cocoa/nsNativeBasicThemeCocoa.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsNativeBasicThemeCocoa.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,7 @@
 nsNativeBasicThemeCocoa::GetMinimumWidgetSize(
     nsPresContext* aPresContext, nsIFrame* aFrame, StyleAppearance aAppearance,
     mozilla::LayoutDeviceIntSize* aResult, bool* aIsOverridable) {
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
 
   switch (aAppearance) {
     case StyleAppearance::ScrollbarthumbHorizontal:
@@ -34,7 +34,7 @@
     case StyleAppearance::ScrollbarbuttonRight: {
       *aIsOverridable = false;
       *aResult = ScrollbarDrawingMac::GetMinimumWidgetSize(aAppearance, aFrame,
-                                                           dpiRatio);
+                                                           dpiRatio.scale);
       break;
     }
 
@@ -47,62 +47,63 @@
 }
 
 void nsNativeBasicThemeCocoa::PaintScrollbarThumb(
-    DrawTarget* aDrawTarget, const Rect& aRect, bool aHorizontal,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect, bool aHorizontal,
     nsIFrame* aFrame, const ComputedStyle& aStyle,
     const EventStates& aElementState, const EventStates& aDocumentState,
-    uint32_t aDpiRatio) {
+    DPIRatio aDpiRatio) {
   ScrollbarParams params =
       ScrollbarDrawingMac::ComputeScrollbarParams(aFrame, aStyle, aHorizontal);
-  if (aDpiRatio >= 2.0f) {
+  auto rect = aRect.ToUnknownRect();
+  if (aDpiRatio.scale >= 2.0f) {
     mozilla::gfx::AutoRestoreTransform autoRestoreTransform(aDrawTarget);
     aDrawTarget->SetTransform(aDrawTarget->GetTransform().PreScale(2.0f, 2.0f));
-    Rect rect = aRect;
     rect.Scale(1.0f / 2.0f);
     ScrollbarDrawingMac::DrawScrollbarThumb(*aDrawTarget, rect, params);
   } else {
-    ScrollbarDrawingMac::DrawScrollbarThumb(*aDrawTarget, aRect, params);
+    ScrollbarDrawingMac::DrawScrollbarThumb(*aDrawTarget, rect, params);
   }
 }
 
 void nsNativeBasicThemeCocoa::PaintScrollbarTrack(
-    DrawTarget* aDrawTarget, const Rect& aRect, bool aHorizontal,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect, bool aHorizontal,
     nsIFrame* aFrame, const ComputedStyle& aStyle,
-    const EventStates& aDocumentState, uint32_t aDpiRatio, bool aIsRoot) {
+    const EventStates& aDocumentState, DPIRatio aDpiRatio, bool aIsRoot) {
   ScrollbarParams params =
       ScrollbarDrawingMac::ComputeScrollbarParams(aFrame, aStyle, aHorizontal);
-  if (aDpiRatio >= 2.0f) {
+  auto rect = aRect.ToUnknownRect();
+  if (aDpiRatio.scale >= 2.0f) {
     mozilla::gfx::AutoRestoreTransform autoRestoreTransform(aDrawTarget);
     aDrawTarget->SetTransform(aDrawTarget->GetTransform().PreScale(2.0f, 2.0f));
-    Rect rect = aRect;
     rect.Scale(1.0f / 2.0f);
     ScrollbarDrawingMac::DrawScrollbarTrack(*aDrawTarget, rect, params);
   } else {
-    ScrollbarDrawingMac::DrawScrollbarTrack(*aDrawTarget, aRect, params);
+    ScrollbarDrawingMac::DrawScrollbarTrack(*aDrawTarget, rect, params);
   }
 }
 
 void nsNativeBasicThemeCocoa::PaintScrollbar(DrawTarget* aDrawTarget,
-                                             const Rect& aRect,
+                                             const LayoutDeviceRect& aRect,
                                              bool aHorizontal, nsIFrame* aFrame,
                                              const ComputedStyle& aStyle,
                                              const EventStates& aDocumentState,
-                                             uint32_t aDpiRatio, bool aIsRoot) {
+                                             DPIRatio aDpiRatio, bool aIsRoot) {
   // Draw nothing; the scrollbar track is drawn in PaintScrollbarTrack.
 }
 
 void nsNativeBasicThemeCocoa::PaintScrollCorner(
-    DrawTarget* aDrawTarget, const Rect& aRect, nsIFrame* aFrame,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect, nsIFrame* aFrame,
     const ComputedStyle& aStyle, const EventStates& aDocumentState,
-    uint32_t aDpiRatio, bool aIsRoot) {
+    DPIRatio aDpiRatio, bool aIsRoot) {
   ScrollbarParams params =
       ScrollbarDrawingMac::ComputeScrollbarParams(aFrame, aStyle, false);
-  if (aDpiRatio >= 2.0f) {
+  if (aDpiRatio.scale >= 2.0f) {
     mozilla::gfx::AutoRestoreTransform autoRestoreTransform(aDrawTarget);
     aDrawTarget->SetTransform(aDrawTarget->GetTransform().PreScale(2.0f, 2.0f));
-    Rect rect = aRect;
+    auto rect = aRect.ToUnknownRect();
     rect.Scale(1 / 2.0f);
     ScrollbarDrawingMac::DrawScrollCorner(*aDrawTarget, rect, params);
   } else {
-    ScrollbarDrawingMac::DrawScrollCorner(*aDrawTarget, aRect, params);
+    auto rect = aRect.ToUnknownRect();
+    ScrollbarDrawingMac::DrawScrollCorner(*aDrawTarget, rect, params);
   }
 }
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsNativeBasicThemeCocoa.h firefox-85.0+build1/widget/cocoa/nsNativeBasicThemeCocoa.h
--- firefox-84.0.2+build1/widget/cocoa/nsNativeBasicThemeCocoa.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsNativeBasicThemeCocoa.h	2021-01-18 19:58:27.000000000 +0000
@@ -23,25 +23,25 @@
                                   mozilla::LayoutDeviceIntSize* aResult,
                                   bool* aIsOverridable) override;
 
-  void PaintScrollbarThumb(DrawTarget* aDrawTarget, const Rect& aRect,
-                           bool aHorizontal, nsIFrame* aFrame,
-                           const ComputedStyle& aStyle,
+  void PaintScrollbarThumb(DrawTarget* aDrawTarget,
+                           const LayoutDeviceRect& aRect, bool aHorizontal,
+                           nsIFrame* aFrame, const ComputedStyle& aStyle,
                            const EventStates& aElementState,
                            const EventStates& aDocumentState,
-                           uint32_t aDpiRatio) override;
-  void PaintScrollbarTrack(DrawTarget* aDrawTarget, const Rect& aRect,
-                           bool aHorizontal, nsIFrame* aFrame,
-                           const ComputedStyle& aStyle,
+                           DPIRatio aDpiRatio) override;
+  void PaintScrollbarTrack(DrawTarget* aDrawTarget,
+                           const LayoutDeviceRect& aRect, bool aHorizontal,
+                           nsIFrame* aFrame, const ComputedStyle& aStyle,
                            const EventStates& aDocumentState,
-                           uint32_t aDpiRatio, bool aIsRoot) override;
-  void PaintScrollbar(DrawTarget* aDrawTarget, const Rect& aRect,
+                           DPIRatio aDpiRatio, bool aIsRoot) override;
+  void PaintScrollbar(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
                       bool aHorizontal, nsIFrame* aFrame,
                       const ComputedStyle& aStyle,
-                      const EventStates& aDocumentState, uint32_t aDpiRatio,
+                      const EventStates& aDocumentState, DPIRatio aDpiRatio,
                       bool aIsRoot) override;
-  void PaintScrollCorner(DrawTarget* aDrawTarget, const Rect& aRect,
+  void PaintScrollCorner(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
                          nsIFrame* aFrame, const ComputedStyle& aStyle,
-                         const EventStates& aDocumentState, uint32_t aDpiRatio,
+                         const EventStates& aDocumentState, DPIRatio aDpiRatio,
                          bool aIsRoot) override;
 
  protected:
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsNativeThemeCocoa.mm firefox-85.0+build1/widget/cocoa/nsNativeThemeCocoa.mm
--- firefox-84.0.2+build1/widget/cocoa/nsNativeThemeCocoa.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsNativeThemeCocoa.mm	2021-01-18 19:58:27.000000000 +0000
@@ -1085,10 +1085,10 @@
   CGFloat paddingY = std::max(CGFloat(0.0), aRect.size.height - size.height);
   CGFloat paddingStartX = std::min(paddingX, kMenuIconIndent);
   CGFloat paddingEndX = std::max(CGFloat(0.0), paddingX - kMenuIconIndent);
-  CGRect drawRect = CGRectMake(
-      aRect.origin.x + (aParams.centerHorizontally ? ceil(paddingX / 2)
-                                                   : aParams.rtl ? paddingEndX : paddingStartX),
-      aRect.origin.y + ceil(paddingY / 2), size.width, size.height);
+  CGRect drawRect = CGRectMake(aRect.origin.x + (aParams.centerHorizontally ? ceil(paddingX / 2)
+                                                 : aParams.rtl              ? paddingEndX
+                                                                            : paddingStartX),
+                               aRect.origin.y + ceil(paddingY / 2), size.width, size.height);
 
   NSString* state =
       aParams.disabled ? @"disabled" : (aParams.insideActiveMenuItem ? @"pressed" : @"normal");
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBar.h firefox-85.0+build1/widget/cocoa/nsTouchBar.h
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBar.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBar.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,8 @@
 #include "nsTouchBarInput.h"
 #include "nsTouchBarNativeAPIDefines.h"
 
+const NSTouchBarItemIdentifier kTouchBarBaseIdentifier = @"com.mozilla.firefox.touchbar";
+
 /**
  * Our TouchBar is its own delegate. This is adequate for our purposes,
  * since the current implementation only defines Touch Bar buttons for the
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBarInput.h firefox-85.0+build1/widget/cocoa/nsTouchBarInput.h
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBarInput.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBarInput.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "nsITouchBarInput.h"
 #include "nsTouchBarNativeAPIDefines.h"
+#include "nsCOMPtr.h"
 
 using namespace mozilla::dom;
 
@@ -27,36 +28,28 @@
  * NSObject representation of nsITouchBarInput.
  */
 @interface TouchBarInput : NSObject {
-  NSString* mKey;
-  NSString* mTitle;
   nsCOMPtr<nsIURI> mImageURI;
   RefPtr<nsTouchBarInputIcon> mIcon;
-  NSString* mType;
   TouchBarInputBaseType mBaseType;
-  NSColor* mColor;
-  BOOL mDisabled;
+  NSString* mType;
   nsCOMPtr<nsITouchBarInputCallback> mCallback;
   NSMutableArray<TouchBarInput*>* mChildren;
 }
 
-- (NSString*)key;
-- (NSString*)title;
+@property(strong) NSString* key;
+@property(strong) NSString* type;
+@property(strong) NSString* title;
+@property(strong) NSColor* color;
+@property(nonatomic, getter=isDisabled) BOOL disabled;
+
 - (nsCOMPtr<nsIURI>)imageURI;
 - (RefPtr<nsTouchBarInputIcon>)icon;
-- (NSString*)type;
 - (TouchBarInputBaseType)baseType;
-- (NSColor*)color;
-- (BOOL)isDisabled;
 - (NSTouchBarItemIdentifier)nativeIdentifier;
 - (nsCOMPtr<nsITouchBarInputCallback>)callback;
 - (NSMutableArray<TouchBarInput*>*)children;
-- (void)setKey:(NSString*)aKey;
-- (void)setTitle:(NSString*)aTitle;
 - (void)setImageURI:(nsCOMPtr<nsIURI>)aImageURI;
 - (void)setIcon:(RefPtr<nsTouchBarInputIcon>)aIcon;
-- (void)setType:(NSString*)aType;
-- (void)setColor:(NSColor*)aColor;
-- (void)setDisabled:(BOOL)aDisabled;
 - (void)setCallback:(nsCOMPtr<nsITouchBarInputCallback>)aCallback;
 - (void)setChildren:(NSMutableArray<TouchBarInput*>*)aChildren;
 
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBarInputIcon.h firefox-85.0+build1/widget/cocoa/nsTouchBarInputIcon.h
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBarInputIcon.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBarInputIcon.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "mozilla/dom/Document.h"
 #include "nsTouchBarInput.h"
 #include "nsTouchBarNativeAPIDefines.h"
 #include "IconLoaderHelperCocoa.h"
@@ -23,6 +22,10 @@
 class nsIPrincipal;
 class imgRequestProxy;
 
+namespace mozilla::dom {
+class Document;
+}
+
 class nsTouchBarInputIcon : public mozilla::widget::IconLoaderListenerCocoa {
  public:
   explicit nsTouchBarInputIcon(RefPtr<Document> aDocument,
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBarInputIcon.mm firefox-85.0+build1/widget/cocoa/nsTouchBarInputIcon.mm
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBarInputIcon.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBarInputIcon.mm	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "nsTouchBarInputIcon.h"
 
+#include "mozilla/dom/Document.h"
 #include "nsCocoaUtils.h"
 #include "nsComputedDOMStyle.h"
 #include "nsContentUtils.h"
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBarInput.mm firefox-85.0+build1/widget/cocoa/nsTouchBarInput.mm
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBarInput.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBarInput.mm	2021-01-18 19:58:27.000000000 +0000
@@ -5,60 +5,35 @@
 #include "nsTouchBarInput.h"
 
 #include "mozilla/MacStringHelpers.h"
+#include "nsArrayUtils.h"
+#include "nsCocoaUtils.h"
+#include "nsTouchBar.h"
 #include "nsTouchBarInputIcon.h"
 
 @implementation TouchBarInput
-- (NSString*)key {
-  return mKey;
-}
-- (NSString*)title {
-  return mTitle;
-}
+
 - (nsCOMPtr<nsIURI>)imageURI {
   return mImageURI;
 }
+
+- (void)setImageURI:(nsCOMPtr<nsIURI>)aImageURI {
+  mImageURI = aImageURI;
+}
+
 - (RefPtr<nsTouchBarInputIcon>)icon {
   return mIcon;
 }
-- (NSString*)type {
-  return mType;
-}
-- (TouchBarInputBaseType)baseType {
-  return mBaseType;
-}
-- (NSColor*)color {
-  return mColor;
-}
-- (BOOL)isDisabled {
-  return mDisabled;
-}
-- (NSTouchBarItemIdentifier)nativeIdentifier {
-  return [TouchBarInput nativeIdentifierWithType:mType withKey:mKey];
-}
-- (nsCOMPtr<nsITouchBarInputCallback>)callback {
-  return mCallback;
-}
-- (NSMutableArray<TouchBarInput*>*)children {
-  return mChildren;
-}
-- (void)setKey:(NSString*)aKey {
-  [aKey retain];
-  [mKey release];
-  mKey = aKey;
-}
 
-- (void)setTitle:(NSString*)aTitle {
-  [aTitle retain];
-  [mTitle release];
-  mTitle = aTitle;
+- (void)setIcon:(RefPtr<nsTouchBarInputIcon>)aIcon {
+  mIcon = aIcon;
 }
 
-- (void)setImageURI:(nsCOMPtr<nsIURI>)aImageURI {
-  mImageURI = aImageURI;
+- (TouchBarInputBaseType)baseType {
+  return mBaseType;
 }
 
-- (void)setIcon:(RefPtr<nsTouchBarInputIcon>)aIcon {
-  mIcon = aIcon;
+- (NSString*)type {
+  return mType;
 }
 
 - (void)setType:(NSString*)aType {
@@ -80,20 +55,22 @@
   mType = aType;
 }
 
-- (void)setColor:(NSColor*)aColor {
-  [aColor retain];
-  [mColor release];
-  mColor = aColor;
+- (NSTouchBarItemIdentifier)nativeIdentifier {
+  return [TouchBarInput nativeIdentifierWithType:mType withKey:self.key];
 }
 
-- (void)setDisabled:(BOOL)aDisabled {
-  mDisabled = aDisabled;
+- (nsCOMPtr<nsITouchBarInputCallback>)callback {
+  return mCallback;
 }
 
 - (void)setCallback:(nsCOMPtr<nsITouchBarInputCallback>)aCallback {
   mCallback = aCallback;
 }
 
+- (NSMutableArray<TouchBarInput*>*)children {
+  return mChildren;
+}
+
 - (void)setChildren:(NSMutableArray<TouchBarInput*>*)aChildren {
   [aChildren retain];
   for (TouchBarInput* child in mChildren) {
@@ -113,12 +90,14 @@
          disabled:(BOOL)aDisabled
          children:(nsCOMPtr<nsIArray>)aChildren {
   if (self = [super init]) {
-    [self setKey:aKey];
-    [self setTitle:aTitle];
+    mType = nil;
+
+    self.key = aKey;
+    self.title = aTitle;
+    self.type = aType;
+    self.disabled = aDisabled;
     [self setImageURI:aImageURI];
-    [self setType:aType];
     [self setCallback:aCallback];
-    [self setDisabled:aDisabled];
     if (aColor) {
       [self setColor:[NSColor colorWithDisplayP3Red:((aColor >> 16) & 0xFF) / 255.0
                                               green:((aColor >> 8) & 0xFF) / 255.0
@@ -222,10 +201,7 @@
     mIcon->Destroy();
     mIcon = nil;
   }
-  [mKey release];
-  [mTitle release];
   [mType release];
-  [mColor release];
   [mChildren removeAllObjects];
   [mChildren release];
   [super dealloc];
@@ -233,7 +209,7 @@
 
 + (NSTouchBarItemIdentifier)nativeIdentifierWithType:(NSString*)aType withKey:(NSString*)aKey {
   NSTouchBarItemIdentifier identifier;
-  identifier = [BaseIdentifier stringByAppendingPathExtension:aType];
+  identifier = [kTouchBarBaseIdentifier stringByAppendingPathExtension:aType];
   if (aKey) {
     identifier = [identifier stringByAppendingPathExtension:aKey];
   }
diff -Nru firefox-84.0.2+build1/widget/cocoa/nsTouchBar.mm firefox-85.0+build1/widget/cocoa/nsTouchBar.mm
--- firefox-84.0.2+build1/widget/cocoa/nsTouchBar.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/nsTouchBar.mm	2021-01-18 19:58:27.000000000 +0000
@@ -4,16 +4,18 @@
 
 #include "nsTouchBar.h"
 
+#include <objc/runtime.h>
+
 #include "mozilla/MacStringHelpers.h"
 #include "nsArrayUtils.h"
+#include "nsCocoaUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIArray.h"
 #include "nsTouchBarInputIcon.h"
+#include "nsWidgetsCID.h"
 
 @implementation nsTouchBar
 
-static const NSTouchBarItemIdentifier BaseIdentifier = @"com.mozilla.firefox.touchbar";
-
 // Non-JS scrubber implemention for the Share Scrubber,
 // since it is defined by an Apple API.
 static NSTouchBarItemIdentifier ShareScrubberIdentifier =
@@ -59,7 +61,8 @@
     if (!aInputs) {
       // This customization identifier is how users' custom layouts are saved by macOS.
       // If this changes, all users' layouts would be reset to the default layout.
-      self.customizationIdentifier = [BaseIdentifier stringByAppendingPathExtension:@"defaultbar"];
+      self.customizationIdentifier =
+          [kTouchBarBaseIdentifier stringByAppendingPathExtension:@"defaultbar"];
       nsCOMPtr<nsIArray> allItems;
 
       nsresult rv = mTouchBarHelper->GetAllItems(getter_AddRefs(allItems));
diff -Nru firefox-84.0.2+build1/widget/cocoa/OSXNotificationCenter.mm firefox-85.0+build1/widget/cocoa/OSXNotificationCenter.mm
--- firefox-84.0.2+build1/widget/cocoa/OSXNotificationCenter.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/OSXNotificationCenter.mm	2021-01-18 19:58:27.000000000 +0000
@@ -382,7 +382,7 @@
 }
 
 NS_IMETHODIMP
-OSXNotificationCenter::CloseAlert(const nsAString& aAlertName, nsIPrincipal* aPrincipal) {
+OSXNotificationCenter::CloseAlert(const nsAString& aAlertName) {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   NSString* alertName = nsCocoaUtils::ToNSString(aAlertName);
diff -Nru firefox-84.0.2+build1/widget/cocoa/ProcInfo.mm firefox-85.0+build1/widget/cocoa/ProcInfo.mm
--- firefox-84.0.2+build1/widget/cocoa/ProcInfo.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/ProcInfo.mm	1970-01-01 00:00:00.000000000 +0000
@@ -1,164 +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 "mozilla/ProcInfo.h"
-#include "mozilla/ScopeExit.h"
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-
-#include "nsMemoryReporterManager.h"
-#include "nsNetCID.h"
-
-#include <cstdio>
-#include <cstring>
-#include <unistd.h>
-
-#include <libproc.h>
-#include <sys/sysctl.h>
-#include <mach/mach.h>
-
-namespace mozilla {
-
-RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
-  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
-  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIEventTarget> target = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to get stream transport service");
-    holder->Reject(rv, __func__);
-    return promise;
-  }
-
-  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
-      __func__, [holder = std::move(holder), requests = std::move(aRequests)]() {
-        HashMap<base::ProcessId, ProcInfo> gathered;
-        if (!gathered.reserve(requests.Length())) {
-          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-          return;
-        }
-        for (const auto& request : requests) {
-          ProcInfo info;
-          info.pid = request.pid;
-          info.childId = request.childId;
-          info.type = request.processType;
-          info.origin = std::move(request.origin);
-          info.windows = std::move(request.windowInfo);
-          struct proc_bsdinfo proc;
-          if ((unsigned long)proc_pidinfo(request.pid, PROC_PIDTBSDINFO, 0, &proc,
-                                          PROC_PIDTBSDINFO_SIZE) < PROC_PIDTBSDINFO_SIZE) {
-            // Can't read data for this proc.
-            // Probably either a sandboxing issue or a race condition, e.g.
-            // the process has been just been killed. Regardless, skip process.
-            continue;
-          }
-
-          struct proc_taskinfo pti;
-          if ((unsigned long)proc_pidinfo(request.pid, PROC_PIDTASKINFO, 0, &pti,
-                                          PROC_PIDTASKINFO_SIZE) < PROC_PIDTASKINFO_SIZE) {
-            continue;
-          }
-
-          // copying all the info to the ProcInfo struct
-          info.filename.AssignASCII(proc.pbi_name);
-          info.residentSetSize = pti.pti_resident_size;
-          info.cpuUser = pti.pti_total_user;
-          info.cpuKernel = pti.pti_total_system;
-
-          mach_port_t selectedTask;
-          // If we did not get a task from a child process, we use mach_task_self()
-          if (request.childTask == MACH_PORT_NULL) {
-            selectedTask = mach_task_self();
-          } else {
-            selectedTask = request.childTask;
-          }
-          // Computing the resident unique size is somewhat tricky,
-          // so we use about:memory's implementation. This implementation
-          // uses the `task` so, in theory, should be no additional
-          // race condition. However, in case of error, the result is `0`.
-          info.residentUniqueSize = nsMemoryReporterManager::ResidentUnique(selectedTask);
-
-          // Now getting threads info
-
-          // task_threads() gives us a snapshot of the process threads
-          // but those threads can go away. All the code below makes
-          // the assumption that thread_info() calls may fail, and
-          // these errors will be ignored.
-          thread_act_port_array_t threadList;
-          mach_msg_type_number_t threadCount;
-          kern_return_t kret = task_threads(selectedTask, &threadList, &threadCount);
-          if (kret != KERN_SUCCESS) {
-            // For some reason, we have no data on the threads for this process.
-            // Most likely reason is that we have just lost a race condition and
-            // the process is dead.
-            // Let's stop here and ignore the entire process.
-            continue;
-          }
-
-          // Deallocate the thread list.
-          // Note that this deallocation is entirely undocumented, so the following code is based
-          // on guesswork and random examples found on the web.
-          auto guardThreadCount = MakeScopeExit([&] {
-            if (threadList == nullptr) {
-              return;
-            }
-            // Free each thread to avoid leaks.
-            for (mach_msg_type_number_t i = 0; i < threadCount; i++) {
-              mach_port_deallocate(mach_task_self(), threadList[i]);
-            }
-            vm_deallocate(mach_task_self(), /* address */ (vm_address_t)threadList,
-                          /* size */ sizeof(thread_t) * threadCount);
-          });
-
-          mach_msg_type_number_t count;
-
-          for (mach_msg_type_number_t i = 0; i < threadCount; i++) {
-            // Basic thread info.
-            thread_extended_info_data_t threadInfoData;
-            count = THREAD_EXTENDED_INFO_COUNT;
-            kret = thread_info(threadList[i], THREAD_EXTENDED_INFO, (thread_info_t)&threadInfoData,
-                               &count);
-            if (kret != KERN_SUCCESS) {
-              continue;
-            }
-
-            // Getting the thread id.
-            thread_identifier_info identifierInfo;
-            count = THREAD_IDENTIFIER_INFO_COUNT;
-            kret = thread_info(threadList[i], THREAD_IDENTIFIER_INFO,
-                               (thread_info_t)&identifierInfo, &count);
-            if (kret != KERN_SUCCESS) {
-              continue;
-            }
-
-            // The two system calls were successful, let's add that thread
-            ThreadInfo* thread = info.threads.AppendElement(fallible);
-            if (!thread) {
-              holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-              return;
-            }
-            thread->cpuUser = threadInfoData.pth_user_time;
-            thread->cpuKernel = threadInfoData.pth_system_time;
-            thread->name.AssignASCII(threadInfoData.pth_name);
-            thread->tid = identifierInfo.thread_id;
-          }
-
-          if (!gathered.put(request.pid, std::move(info))) {
-            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-            return;
-          }
-        }
-        // ... and we're done!
-        holder->Resolve(std::move(gathered), __func__);
-      });
-
-  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
-  }
-  return promise;
-}
-
-}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/widget/cocoa/TextInputHandler.mm firefox-85.0+build1/widget/cocoa/TextInputHandler.mm
--- firefox-84.0.2+build1/widget/cocoa/TextInputHandler.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/cocoa/TextInputHandler.mm	2021-01-18 19:58:27.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/ToString.h"
 
 #include "nsChildView.h"
 #include "nsCocoaFeatures.h"
@@ -405,6 +406,13 @@
   }
 }
 
+inline NSRange MakeNSRangeFrom(const Maybe<OffsetAndData<uint32_t>>& aOffsetAndData) {
+  if (aOffsetAndData.isNothing()) {
+    return NSMakeRange(NSNotFound, 0);
+  }
+  return NSMakeRange(aOffsetAndData->StartOffset(), aOffsetAndData->Length());
+}
+
 #pragma mark -
 
 /******************************************************************************
@@ -4036,7 +4044,7 @@
   }
 
   nsAutoString str;
-  WidgetQueryContentEvent textContent(true, eQueryTextContent, mWidget);
+  WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent, mWidget);
   WidgetQueryContentEvent::Options options;
   int64_t startOffset = aRange.location;
   if (IsIMEComposing()) {
@@ -4048,28 +4056,26 @@
     options.mRelativeToInsertionPoint = true;
     startOffset -= mIMECompositionStart;
   }
-  textContent.InitForQueryTextContent(startOffset, aRange.length, options);
-  textContent.RequestFontRanges();
-  DispatchEvent(textContent);
+  queryTextContentEvent.InitForQueryTextContent(startOffset, aRange.length, options);
+  queryTextContentEvent.RequestFontRanges();
+  DispatchEvent(queryTextContentEvent);
 
   MOZ_LOG(gLog, LogLevel::Info,
           ("%p IMEInputHandler::GetAttributedSubstringFromRange, "
-           "textContent={ mSucceeded=%s, mReply={ mString=\"%s\", mOffset=%u } }",
-           this, TrueOrFalse(textContent.mSucceeded),
-           NS_ConvertUTF16toUTF8(textContent.mReply.mString).get(), textContent.mReply.mOffset));
+           "queryTextContentEvent={ mReply=%s }",
+           this, ToString(queryTextContentEvent.mReply).c_str()));
 
-  if (!textContent.mSucceeded) {
+  if (queryTextContentEvent.Failed()) {
     return nil;
   }
 
   // We don't set vertical information at this point.  If required,
   // OS will calls drawsVerticallyForCharacterAtIndex.
   NSMutableAttributedString* result = nsCocoaUtils::GetNSMutableAttributedString(
-      textContent.mReply.mString, textContent.mReply.mFontRanges, false,
+      queryTextContentEvent.mReply->DataRef(), queryTextContentEvent.mReply->mFontRanges, false,
       mWidget->BackingScaleFactor());
   if (aActualRange) {
-    aActualRange->location = textContent.mReply.mOffset;
-    aActualRange->length = textContent.mReply.mString.Length();
+    *aActualRange = MakeNSRangeFrom(queryTextContentEvent.mReply->mOffsetAndData);
   }
   return result;
 
@@ -4119,21 +4125,19 @@
 
   RefPtr<IMEInputHandler> kungFuDeathGrip(this);
 
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, mWidget);
-  DispatchEvent(selection);
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText, mWidget);
+  DispatchEvent(querySelectedTextEvent);
 
   MOZ_LOG(gLog, LogLevel::Info,
-          ("%p IMEInputHandler::SelectedRange, selection={ mSucceeded=%s, "
-           "mReply={ mOffset=%u, mString.Length()=%u } }",
-           this, TrueOrFalse(selection.mSucceeded), selection.mReply.mOffset,
-           selection.mReply.mString.Length()));
+          ("%p IMEInputHandler::SelectedRange, querySelectedTextEvent={ mReply=%s }", this,
+           ToString(querySelectedTextEvent.mReply).c_str()));
 
-  if (!selection.mSucceeded) {
+  if (querySelectedTextEvent.Failed()) {
     return mSelectedRange;
   }
 
-  mWritingMode = selection.GetWritingMode();
-  mRangeForWritingMode = NSMakeRange(selection.mReply.mOffset, selection.mReply.mString.Length());
+  mWritingMode = querySelectedTextEvent.mReply->WritingModeRef();
+  mRangeForWritingMode = MakeNSRangeFrom(querySelectedTextEvent.mReply->mOffsetAndData);
 
   if (mIMEHasFocus) {
     mSelectedRange = mRangeForWritingMode;
@@ -4202,7 +4206,7 @@
   LayoutDeviceIntRect r;
   bool useCaretRect = (aRange.length == 0);
   if (!useCaretRect) {
-    WidgetQueryContentEvent charRect(true, eQueryTextRect, mWidget);
+    WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, mWidget);
     WidgetQueryContentEvent::Options options;
     int64_t startOffset = aRange.location;
     if (IsIMEComposing()) {
@@ -4214,13 +4218,12 @@
       options.mRelativeToInsertionPoint = true;
       startOffset -= mIMECompositionStart;
     }
-    charRect.InitForQueryTextRect(startOffset, 1, options);
-    DispatchEvent(charRect);
-    if (charRect.mSucceeded) {
-      r = charRect.mReply.mRect;
-      actualRange.location = charRect.mReply.mOffset;
-      actualRange.length = charRect.mReply.mString.Length();
-      mWritingMode = charRect.GetWritingMode();
+    queryTextRectEvent.InitForQueryTextRect(startOffset, 1, options);
+    DispatchEvent(queryTextRectEvent);
+    if (queryTextRectEvent.Succeeded()) {
+      r = queryTextRectEvent.mReply->mRect;
+      actualRange = MakeNSRangeFrom(queryTextRectEvent.mReply->mOffsetAndData);
+      mWritingMode = queryTextRectEvent.mReply->WritingModeRef();
       mRangeForWritingMode = actualRange;
     } else {
       useCaretRect = true;
@@ -4228,7 +4231,7 @@
   }
 
   if (useCaretRect) {
-    WidgetQueryContentEvent caretRect(true, eQueryCaretRect, mWidget);
+    WidgetQueryContentEvent queryCaretRectEvent(true, eQueryCaretRect, mWidget);
     WidgetQueryContentEvent::Options options;
     int64_t startOffset = aRange.location;
     if (IsIMEComposing()) {
@@ -4240,14 +4243,14 @@
       options.mRelativeToInsertionPoint = true;
       startOffset -= mIMECompositionStart;
     }
-    caretRect.InitForQueryCaretRect(startOffset, options);
-    DispatchEvent(caretRect);
-    if (!caretRect.mSucceeded) {
+    queryCaretRectEvent.InitForQueryCaretRect(startOffset, options);
+    DispatchEvent(queryCaretRectEvent);
+    if (queryCaretRectEvent.Failed()) {
       return rect;
     }
-    r = caretRect.mReply.mRect;
+    r = queryCaretRectEvent.mReply->mRect;
     r.width = 0;
-    actualRange.location = caretRect.mReply.mOffset;
+    actualRange.location = queryCaretRectEvent.mReply->StartOffset();
     actualRange.length = 0;
   }
 
@@ -4290,18 +4293,20 @@
     return NSNotFound;
   }
 
-  WidgetQueryContentEvent charAt(true, eQueryCharacterAtPoint, mWidget);
+  WidgetQueryContentEvent queryCharAtPointEvent(true, eQueryCharacterAtPoint, mWidget);
   NSPoint ptInWindow = nsCocoaUtils::ConvertPointFromScreen(mainWindow, aPoint);
   NSPoint ptInView = [mView convertPoint:ptInWindow fromView:nil];
-  charAt.mRefPoint.x = static_cast<int32_t>(ptInView.x) * mWidget->BackingScaleFactor();
-  charAt.mRefPoint.y = static_cast<int32_t>(ptInView.y) * mWidget->BackingScaleFactor();
-  mWidget->DispatchWindowEvent(charAt);
-  if (!charAt.mSucceeded || charAt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND ||
-      charAt.mReply.mOffset >= static_cast<uint32_t>(NSNotFound)) {
+  queryCharAtPointEvent.mRefPoint.x =
+      static_cast<int32_t>(ptInView.x) * mWidget->BackingScaleFactor();
+  queryCharAtPointEvent.mRefPoint.y =
+      static_cast<int32_t>(ptInView.y) * mWidget->BackingScaleFactor();
+  mWidget->DispatchWindowEvent(queryCharAtPointEvent);
+  if (queryCharAtPointEvent.Failed() || queryCharAtPointEvent.DidNotFindChar() ||
+      queryCharAtPointEvent.mReply->StartOffset() >= static_cast<uint32_t>(NSNotFound)) {
     return NSNotFound;
   }
 
-  return charAt.mReply.mOffset;
+  return queryCharAtPointEvent.mReply->StartOffset();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSNotFound);
 }
diff -Nru firefox-84.0.2+build1/widget/CompositorWidget.h firefox-85.0+build1/widget/CompositorWidget.h
--- firefox-84.0.2+build1/widget/CompositorWidget.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/CompositorWidget.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,10 +8,13 @@
 #include "nsISupports.h"
 #include "mozilla/RefPtr.h"
 #include "Units.h"
-#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Rect.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/layers/LayersTypes.h"
-#include "mozilla/layers/NativeLayer.h"
+
+#ifdef MOZ_IS_GCC
+#  include "mozilla/layers/NativeLayer.h"
+#endif
 
 class nsIWidget;
 class nsBaseWidget;
@@ -25,7 +28,7 @@
 class Compositor;
 class LayerManager;
 class LayerManagerComposite;
-class Compositor;
+class NativeLayerRoot;
 }  // namespace layers
 namespace gfx {
 class DrawTarget;
diff -Nru firefox-84.0.2+build1/widget/ContentCache.cpp firefox-85.0+build1/widget/ContentCache.cpp
--- firefox-84.0.2+build1/widget/ContentCache.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/ContentCache.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -33,87 +33,76 @@
   return ToChar(aNotification->mMessage);
 }
 
-class GetRectText : public nsAutoCString {
- public:
-  explicit GetRectText(const LayoutDeviceIntRect& aRect) {
-    AssignLiteral("{ x=");
-    AppendInt(aRect.X());
-    AppendLiteral(", y=");
-    AppendInt(aRect.Y());
-    AppendLiteral(", width=");
-    AppendInt(aRect.Width());
-    AppendLiteral(", height=");
-    AppendInt(aRect.Height());
-    AppendLiteral(" }");
-  }
-  virtual ~GetRectText() = default;
-};
-
-class GetWritingModeName : public nsAutoCString {
- public:
-  explicit GetWritingModeName(const WritingMode& aWritingMode) {
-    if (!aWritingMode.IsVertical()) {
-      AssignLiteral("Horizontal");
-      return;
-    }
-    if (aWritingMode.IsVerticalLR()) {
-      AssignLiteral("Vertical (LTR)");
-      return;
-    }
-    AssignLiteral("Vertical (RTL)");
-  }
-  virtual ~GetWritingModeName() = default;
-};
-
-class GetEscapedUTF8String final : public NS_ConvertUTF16toUTF8 {
- public:
-  explicit GetEscapedUTF8String(const nsAString& aString)
-      : NS_ConvertUTF16toUTF8(aString) {
-    Escape();
-  }
-  explicit GetEscapedUTF8String(const char16ptr_t aString)
-      : NS_ConvertUTF16toUTF8(aString) {
-    Escape();
-  }
-  GetEscapedUTF8String(const char16ptr_t aString, uint32_t aLength)
-      : NS_ConvertUTF16toUTF8(aString, aLength) {
-    Escape();
-  }
-
- private:
-  void Escape() {
-    ReplaceSubstring("\r", "\\r");
-    ReplaceSubstring("\n", "\\n");
-    ReplaceSubstring("\t", "\\t");
-  }
-};
-
 /*****************************************************************************
  * mozilla::ContentCache
  *****************************************************************************/
 
 LazyLogModule sContentCacheLog("ContentCacheWidgets");
 
-ContentCache::ContentCache() : mCompositionStart(UINT32_MAX) {}
-
 /*****************************************************************************
  * mozilla::ContentCacheInChild
  *****************************************************************************/
 
-ContentCacheInChild::ContentCacheInChild() : ContentCache() {}
-
 void ContentCacheInChild::Clear() {
   MOZ_LOG(sContentCacheLog, LogLevel::Info, ("0x%p Clear()", this));
 
-  mCompositionStart = UINT32_MAX;
+  mCompositionStart.reset();
+  mLastCommit.reset();
   mText.Truncate();
-  mSelection.Clear();
+  mSelection.reset();
   mFirstCharRect.SetEmpty();
-  mCaret.Clear();
-  mTextRectArray.Clear();
+  mCaret.reset();
+  mTextRectArray.reset();
+  mLastCommitStringTextRectArray.reset();
   mEditorRect.SetEmpty();
 }
 
+void ContentCacheInChild::OnCompositionEvent(
+    const WidgetCompositionEvent& aCompositionEvent) {
+  if (aCompositionEvent.CausesDOMCompositionEndEvent()) {
+    RefPtr<TextComposition> composition =
+        IMEStateManager::GetTextCompositionFor(aCompositionEvent.mWidget);
+    if (composition) {
+      nsAutoString lastCommitString;
+      if (aCompositionEvent.mMessage == eCompositionCommitAsIs) {
+        lastCommitString = composition->CommitStringIfCommittedAsIs();
+      } else {
+        lastCommitString = aCompositionEvent.mData;
+      }
+      // We don't need to store canceling information because this is required
+      // by undoing of last commit (Kakutei-Undo of Japanese IME).
+      if (!lastCommitString.IsEmpty()) {
+        mLastCommit = Some(OffsetAndData<uint32_t>(
+            composition->NativeOffsetOfStartComposition(), lastCommitString));
+        MOZ_LOG(
+            sContentCacheLog, LogLevel::Debug,
+            ("0x%p OnCompositionEvent(), stored last composition string data "
+             "(aCompositionEvent={ mMessage=%s, mData=\"%s\"}, mLastCommit=%s)",
+             this, ToChar(aCompositionEvent.mMessage),
+             PrintStringDetail(
+                 aCompositionEvent.mData,
+                 PrintStringDetail::kMaxLengthForCompositionString)
+                 .get(),
+             ToString(mLastCommit).c_str()));
+        return;
+      }
+    }
+  }
+  if (mLastCommit.isSome()) {
+    MOZ_LOG(
+        sContentCacheLog, LogLevel::Debug,
+        ("0x%p OnCompositionEvent(), resetting the last composition string "
+         "data (aCompositionEvent={ mMessage=%s, mData=\"%s\"}, "
+         "mLastCommit=%s)",
+         this, ToChar(aCompositionEvent.mMessage),
+         PrintStringDetail(aCompositionEvent.mData,
+                           PrintStringDetail::kMaxLengthForCompositionString)
+             .get(),
+         ToString(mLastCommit).c_str()));
+    mLastCommit.reset();
+  }
+}
+
 bool ContentCacheInChild::CacheAll(nsIWidget* aWidget,
                                    const IMENotification* aNotification) {
   MOZ_LOG(sContentCacheLog, LogLevel::Info,
@@ -133,29 +122,30 @@
           ("0x%p CacheSelection(aWidget=0x%p, aNotification=%s)", this, aWidget,
            GetNotificationName(aNotification)));
 
-  mCaret.Clear();
-  mSelection.Clear();
+  mCaret.reset();
+  mSelection.reset();
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, aWidget);
-  aWidget->DispatchEvent(&selection, status);
-  if (NS_WARN_IF(!selection.mSucceeded)) {
-    MOZ_LOG(sContentCacheLog, LogLevel::Error,
-            ("0x%p CacheSelection(), FAILED, "
-             "couldn't retrieve the selected text",
-             this));
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 aWidget);
+  aWidget->DispatchEvent(&querySelectedTextEvent, status);
+  if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection())) {
+    MOZ_LOG(
+        sContentCacheLog, LogLevel::Error,
+        ("0x%p CacheSelection(), FAILED, couldn't retrieve the selected text",
+         this));
     return false;
   }
-  if (selection.mReply.mReversed) {
-    mSelection.mAnchor =
-        selection.mReply.mOffset + selection.mReply.mString.Length();
-    mSelection.mFocus = selection.mReply.mOffset;
+  MOZ_ASSERT(querySelectedTextEvent.mReply->mOffsetAndData.isSome());
+  if (querySelectedTextEvent.mReply->mReversed) {
+    mSelection.emplace(querySelectedTextEvent.mReply->EndOffset(),
+                       querySelectedTextEvent.mReply->StartOffset(),
+                       querySelectedTextEvent.mReply->WritingModeRef());
   } else {
-    mSelection.mAnchor = selection.mReply.mOffset;
-    mSelection.mFocus =
-        selection.mReply.mOffset + selection.mReply.mString.Length();
+    mSelection.emplace(querySelectedTextEvent.mReply->StartOffset(),
+                       querySelectedTextEvent.mReply->EndOffset(),
+                       querySelectedTextEvent.mReply->WritingModeRef());
   }
-  mSelection.mWritingMode = selection.GetWritingMode();
 
   return CacheCaret(aWidget, aNotification) &&
          CacheTextRects(aWidget, aNotification);
@@ -167,35 +157,31 @@
           ("0x%p CacheCaret(aWidget=0x%p, aNotification=%s)", this, aWidget,
            GetNotificationName(aNotification)));
 
-  mCaret.Clear();
+  mCaret.reset();
 
-  if (NS_WARN_IF(!mSelection.IsValid())) {
+  if (NS_WARN_IF(mSelection.isNothing())) {
     return false;
   }
 
   // XXX Should be mSelection.mFocus?
-  mCaret.mOffset = mSelection.StartOffset();
+  uint32_t offset = mSelection->StartOffset();
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent caretRect(true, eQueryCaretRect, aWidget);
-  caretRect.InitForQueryCaretRect(mCaret.mOffset);
-  aWidget->DispatchEvent(&caretRect, status);
-  if (NS_WARN_IF(!caretRect.mSucceeded)) {
+  WidgetQueryContentEvent queryCaretRectEvet(true, eQueryCaretRect, aWidget);
+  queryCaretRectEvet.InitForQueryCaretRect(offset);
+  aWidget->DispatchEvent(&queryCaretRectEvet, status);
+  if (NS_WARN_IF(queryCaretRectEvet.Failed())) {
     MOZ_LOG(sContentCacheLog, LogLevel::Error,
-            ("0x%p CacheCaret(), FAILED, "
-             "couldn't retrieve the caret rect at offset=%u",
-             this, mCaret.mOffset));
-    mCaret.Clear();
+            ("0x%p CacheCaret(), FAILED, couldn't retrieve the caret rect at "
+             "offset=%u",
+             this, offset));
     return false;
   }
-  mCaret.mRect = caretRect.mReply.mRect;
+  mCaret.emplace(offset, queryCaretRectEvet.mReply->mRect);
   MOZ_LOG(sContentCacheLog, LogLevel::Info,
           ("0x%p CacheCaret(), Succeeded, "
-           "mSelection={ mAnchor=%u, mFocus=%u, mWritingMode=%s }, "
-           "mCaret={ mOffset=%u, mRect=%s }",
-           this, mSelection.mAnchor, mSelection.mFocus,
-           GetWritingModeName(mSelection.mWritingMode).get(), mCaret.mOffset,
-           GetRectText(mCaret.mRect).get()));
+           "mSelection=%s, mCaret=%s",
+           this, ToString(mSelection).c_str(), ToString(mCaret).c_str()));
   return true;
 }
 
@@ -206,20 +192,20 @@
            aWidget, GetNotificationName(aNotification)));
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent editorRectEvent(true, eQueryEditorRect, aWidget);
-  aWidget->DispatchEvent(&editorRectEvent, status);
-  if (NS_WARN_IF(!editorRectEvent.mSucceeded)) {
+  WidgetQueryContentEvent queryEditorRectEvent(true, eQueryEditorRect, aWidget);
+  aWidget->DispatchEvent(&queryEditorRectEvent, status);
+  if (NS_WARN_IF(queryEditorRectEvent.Failed())) {
     MOZ_LOG(sContentCacheLog, LogLevel::Error,
             ("0x%p CacheEditorRect(), FAILED, "
              "couldn't retrieve the editor rect",
              this));
     return false;
   }
-  mEditorRect = editorRectEvent.mReply.mRect;
+  mEditorRect = queryEditorRectEvent.mReply->mRect;
   MOZ_LOG(sContentCacheLog, LogLevel::Info,
           ("0x%p CacheEditorRect(), Succeeded, "
            "mEditorRect=%s",
-           this, GetRectText(mEditorRect).get()));
+           this, ToString(mEditorRect).c_str()));
   return true;
 }
 
@@ -230,20 +216,38 @@
            GetNotificationName(aNotification)));
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent queryText(true, eQueryTextContent, aWidget);
-  queryText.InitForQueryTextContent(0, UINT32_MAX);
-  aWidget->DispatchEvent(&queryText, status);
-  if (NS_WARN_IF(!queryText.mSucceeded)) {
+  WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent,
+                                                aWidget);
+  queryTextContentEvent.InitForQueryTextContent(0, UINT32_MAX);
+  aWidget->DispatchEvent(&queryTextContentEvent, status);
+  if (NS_WARN_IF(queryTextContentEvent.Failed())) {
     MOZ_LOG(sContentCacheLog, LogLevel::Error,
             ("0x%p CacheText(), FAILED, couldn't retrieve whole text", this));
     mText.Truncate();
     return false;
   }
-  mText = queryText.mReply.mString;
+  mText = queryTextContentEvent.mReply->DataRef();
   MOZ_LOG(
       sContentCacheLog, LogLevel::Info,
       ("0x%p CacheText(), Succeeded, mText.Length()=%u", this, mText.Length()));
 
+  // Forget last commit range if string in the range is different from the
+  // last commit string.
+  if (mLastCommit.isSome() &&
+      nsDependentSubstring(mText, mLastCommit->StartOffset(),
+                           mLastCommit->Length()) != mLastCommit->DataRef()) {
+    MOZ_LOG(sContentCacheLog, LogLevel::Debug,
+            ("0x%p CacheText(), resetting the last composition string data "
+             "(mLastCommit=%s, current string=\"%s\")",
+             this, ToString(mLastCommit).c_str(),
+             PrintStringDetail(
+                 nsDependentSubstring(mText, mLastCommit->StartOffset(),
+                                      mLastCommit->Length()),
+                 PrintStringDetail::kMaxLengthForCompositionString)
+                 .get()));
+    mLastCommit.reset();
+  }
+
   return CacheSelection(aWidget, aNotification);
 }
 
@@ -252,13 +256,13 @@
   aCharRect.SetEmpty();
 
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent textRect(true, eQueryTextRect, aWidget);
-  textRect.InitForQueryTextRect(aOffset, 1);
-  aWidget->DispatchEvent(&textRect, status);
-  if (NS_WARN_IF(!textRect.mSucceeded)) {
+  WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, aWidget);
+  queryTextRectEvent.InitForQueryTextRect(aOffset, 1);
+  aWidget->DispatchEvent(&queryTextRectEvent, status);
+  if (NS_WARN_IF(queryTextRectEvent.Failed())) {
     return false;
   }
-  aCharRect = textRect.mReply.mRect;
+  aCharRect = queryTextRectEvent.mReply->mRect;
 
   // Guarantee the rect is not empty.
   if (NS_WARN_IF(!aCharRect.Height())) {
@@ -274,43 +278,43 @@
                                              uint32_t aOffset, uint32_t aLength,
                                              RectArray& aCharRectArray) const {
   nsEventStatus status = nsEventStatus_eIgnore;
-  WidgetQueryContentEvent textRects(true, eQueryTextRectArray, aWidget);
-  textRects.InitForQueryTextRectArray(aOffset, aLength);
-  aWidget->DispatchEvent(&textRects, status);
-  if (NS_WARN_IF(!textRects.mSucceeded)) {
+  WidgetQueryContentEvent queryTextRectsEvent(true, eQueryTextRectArray,
+                                              aWidget);
+  queryTextRectsEvent.InitForQueryTextRectArray(aOffset, aLength);
+  aWidget->DispatchEvent(&queryTextRectsEvent, status);
+  if (NS_WARN_IF(queryTextRectsEvent.Failed())) {
     aCharRectArray.Clear();
     return false;
   }
-  aCharRectArray = std::move(textRects.mReply.mRectArray);
+  aCharRectArray = std::move(queryTextRectsEvent.mReply->mRectArray);
   return true;
 }
 
 bool ContentCacheInChild::CacheTextRects(nsIWidget* aWidget,
                                          const IMENotification* aNotification) {
-  MOZ_LOG(sContentCacheLog, LogLevel::Info,
-          ("0x%p CacheTextRects(aWidget=0x%p, aNotification=%s), "
-           "mCaret={ mOffset=%u, IsValid()=%s }",
-           this, aWidget, GetNotificationName(aNotification), mCaret.mOffset,
-           GetBoolName(mCaret.IsValid())));
-
-  mCompositionStart = UINT32_MAX;
-  mTextRectArray.Clear();
-  mSelection.ClearAnchorCharRects();
-  mSelection.ClearFocusCharRects();
-  mSelection.mRect.SetEmpty();
+  MOZ_LOG(
+      sContentCacheLog, LogLevel::Info,
+      ("0x%p CacheTextRects(aWidget=0x%p, aNotification=%s), mCaret=%s", this,
+       aWidget, GetNotificationName(aNotification), ToString(mCaret).c_str()));
+
+  mCompositionStart.reset();
+  mTextRectArray.reset();
+  mLastCommitStringTextRectArray.reset();
   mFirstCharRect.SetEmpty();
 
-  if (NS_WARN_IF(!mSelection.IsValid())) {
+  if (NS_WARN_IF(mSelection.isNothing())) {
     return false;
   }
 
+  mSelection->ClearRects();
+
   // Retrieve text rects in composition string if there is.
   RefPtr<TextComposition> textComposition =
       IMEStateManager::GetTextCompositionFor(aWidget);
   if (textComposition) {
     // mCompositionStart may be updated by some composition event handlers.
     // So, let's update it with the latest information.
-    mCompositionStart = textComposition->NativeOffsetOfStartComposition();
+    mCompositionStart = Some(textComposition->NativeOffsetOfStartComposition());
     // Note that TextComposition::String() may not be modified here because
     // it's modified after all edit action listeners are performed but this
     // is called while some of them are performed.
@@ -318,108 +322,112 @@
     //      composition immediately, we should cache next character of current
     //      composition too.
     uint32_t length = textComposition->LastData().Length() + 1;
-    mTextRectArray.mStart = mCompositionStart;
-    if (NS_WARN_IF(!QueryCharRectArray(aWidget, mTextRectArray.mStart, length,
-                                       mTextRectArray.mRects))) {
+    mTextRectArray.emplace(mCompositionStart.value());
+    if (NS_WARN_IF(!QueryCharRectArray(aWidget, mTextRectArray->mStart, length,
+                                       mTextRectArray->mRects))) {
       MOZ_LOG(sContentCacheLog, LogLevel::Error,
               ("0x%p CacheTextRects(), FAILED, "
                "couldn't retrieve text rect array of the composition string",
                this));
+      mTextRectArray.reset();
     }
   }
 
-  if (mTextRectArray.InRange(mSelection.mAnchor) &&
-      (!mSelection.mAnchor || mTextRectArray.InRange(mSelection.mAnchor - 1))) {
-    mSelection.mAnchorCharRects[eNextCharRect] =
-        mTextRectArray.GetRect(mSelection.mAnchor);
-    if (mSelection.mAnchor) {
-      mSelection.mAnchorCharRects[ePrevCharRect] =
-          mTextRectArray.GetRect(mSelection.mAnchor - 1);
+  if (mTextRectArray.isSome() &&
+      mTextRectArray->IsOffsetInRange(mSelection->mAnchor) &&
+      (!mSelection->mAnchor ||
+       mTextRectArray->IsOffsetInRange(mSelection->mAnchor - 1))) {
+    mSelection->mAnchorCharRects[eNextCharRect] =
+        mTextRectArray->GetRect(mSelection->mAnchor);
+    if (mSelection->mAnchor) {
+      mSelection->mAnchorCharRects[ePrevCharRect] =
+          mTextRectArray->GetRect(mSelection->mAnchor - 1);
     }
   } else {
     RectArray rects;
-    uint32_t startOffset = mSelection.mAnchor ? mSelection.mAnchor - 1 : 0;
-    uint32_t length = mSelection.mAnchor ? 2 : 1;
+    uint32_t startOffset = mSelection->mAnchor ? mSelection->mAnchor - 1 : 0;
+    uint32_t length = mSelection->mAnchor ? 2 : 1;
     if (NS_WARN_IF(!QueryCharRectArray(aWidget, startOffset, length, rects))) {
       MOZ_LOG(
           sContentCacheLog, LogLevel::Error,
           ("0x%p CacheTextRects(), FAILED, "
            "couldn't retrieve text rect array around the selection anchor (%u)",
-           this, mSelection.mAnchor));
-      MOZ_ASSERT(mSelection.mAnchorCharRects[ePrevCharRect].IsEmpty());
-      MOZ_ASSERT(mSelection.mAnchorCharRects[eNextCharRect].IsEmpty());
+           this, mSelection->mAnchor));
+      MOZ_ASSERT(mSelection->mAnchorCharRects[ePrevCharRect].IsEmpty());
+      MOZ_ASSERT(mSelection->mAnchorCharRects[eNextCharRect].IsEmpty());
     } else {
       if (rects.Length() > 1) {
-        mSelection.mAnchorCharRects[ePrevCharRect] = rects[0];
-        mSelection.mAnchorCharRects[eNextCharRect] = rects[1];
+        mSelection->mAnchorCharRects[ePrevCharRect] = rects[0];
+        mSelection->mAnchorCharRects[eNextCharRect] = rects[1];
       } else if (rects.Length()) {
-        mSelection.mAnchorCharRects[eNextCharRect] = rects[0];
-        MOZ_ASSERT(mSelection.mAnchorCharRects[ePrevCharRect].IsEmpty());
+        mSelection->mAnchorCharRects[eNextCharRect] = rects[0];
+        MOZ_ASSERT(mSelection->mAnchorCharRects[ePrevCharRect].IsEmpty());
       }
     }
   }
 
-  if (mSelection.Collapsed()) {
-    mSelection.mFocusCharRects[0] = mSelection.mAnchorCharRects[0];
-    mSelection.mFocusCharRects[1] = mSelection.mAnchorCharRects[1];
-  } else if (mTextRectArray.InRange(mSelection.mFocus) &&
-             (!mSelection.mFocus ||
-              mTextRectArray.InRange(mSelection.mFocus - 1))) {
-    mSelection.mFocusCharRects[eNextCharRect] =
-        mTextRectArray.GetRect(mSelection.mFocus);
-    if (mSelection.mFocus) {
-      mSelection.mFocusCharRects[ePrevCharRect] =
-          mTextRectArray.GetRect(mSelection.mFocus - 1);
+  if (mSelection->Collapsed()) {
+    mSelection->mFocusCharRects[0] = mSelection->mAnchorCharRects[0];
+    mSelection->mFocusCharRects[1] = mSelection->mAnchorCharRects[1];
+  } else if (mTextRectArray.isSome() &&
+             mTextRectArray->IsOffsetInRange(mSelection->mFocus) &&
+             (!mSelection->mFocus ||
+              mTextRectArray->IsOffsetInRange(mSelection->mFocus - 1))) {
+    mSelection->mFocusCharRects[eNextCharRect] =
+        mTextRectArray->GetRect(mSelection->mFocus);
+    if (mSelection->mFocus) {
+      mSelection->mFocusCharRects[ePrevCharRect] =
+          mTextRectArray->GetRect(mSelection->mFocus - 1);
     }
   } else {
     RectArray rects;
-    uint32_t startOffset = mSelection.mFocus ? mSelection.mFocus - 1 : 0;
-    uint32_t length = mSelection.mFocus ? 2 : 1;
+    uint32_t startOffset = mSelection->mFocus ? mSelection->mFocus - 1 : 0;
+    uint32_t length = mSelection->mFocus ? 2 : 1;
     if (NS_WARN_IF(!QueryCharRectArray(aWidget, startOffset, length, rects))) {
       MOZ_LOG(
           sContentCacheLog, LogLevel::Error,
           ("0x%p CacheTextRects(), FAILED, "
            "couldn't retrieve text rect array around the selection focus (%u)",
-           this, mSelection.mFocus));
-      MOZ_ASSERT(mSelection.mFocusCharRects[ePrevCharRect].IsEmpty());
-      MOZ_ASSERT(mSelection.mFocusCharRects[eNextCharRect].IsEmpty());
+           this, mSelection->mFocus));
+      MOZ_ASSERT(mSelection->mFocusCharRects[ePrevCharRect].IsEmpty());
+      MOZ_ASSERT(mSelection->mFocusCharRects[eNextCharRect].IsEmpty());
     } else {
       if (rects.Length() > 1) {
-        mSelection.mFocusCharRects[ePrevCharRect] = rects[0];
-        mSelection.mFocusCharRects[eNextCharRect] = rects[1];
+        mSelection->mFocusCharRects[ePrevCharRect] = rects[0];
+        mSelection->mFocusCharRects[eNextCharRect] = rects[1];
       } else if (rects.Length()) {
-        mSelection.mFocusCharRects[eNextCharRect] = rects[0];
-        MOZ_ASSERT(mSelection.mFocusCharRects[ePrevCharRect].IsEmpty());
+        mSelection->mFocusCharRects[eNextCharRect] = rects[0];
+        MOZ_ASSERT(mSelection->mFocusCharRects[ePrevCharRect].IsEmpty());
       }
     }
   }
 
-  if (!mSelection.Collapsed()) {
+  if (!mSelection->Collapsed()) {
     nsEventStatus status = nsEventStatus_eIgnore;
-    WidgetQueryContentEvent textRect(true, eQueryTextRect, aWidget);
-    textRect.InitForQueryTextRect(mSelection.StartOffset(),
-                                  mSelection.Length());
-    aWidget->DispatchEvent(&textRect, status);
-    if (NS_WARN_IF(!textRect.mSucceeded)) {
+    WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, aWidget);
+    queryTextRectEvent.InitForQueryTextRect(mSelection->StartOffset(),
+                                            mSelection->Length());
+    aWidget->DispatchEvent(&queryTextRectEvent, status);
+    if (NS_WARN_IF(queryTextRectEvent.Failed())) {
       MOZ_LOG(sContentCacheLog, LogLevel::Error,
               ("0x%p CacheTextRects(), FAILED, "
                "couldn't retrieve text rect of whole selected text",
                this));
     } else {
-      mSelection.mRect = textRect.mReply.mRect;
+      mSelection->mRect = queryTextRectEvent.mReply->mRect;
     }
   }
 
-  if (!mSelection.mFocus) {
-    mFirstCharRect = mSelection.mFocusCharRects[eNextCharRect];
-  } else if (mSelection.mFocus == 1) {
-    mFirstCharRect = mSelection.mFocusCharRects[ePrevCharRect];
-  } else if (!mSelection.mAnchor) {
-    mFirstCharRect = mSelection.mAnchorCharRects[eNextCharRect];
-  } else if (mSelection.mAnchor == 1) {
-    mFirstCharRect = mSelection.mFocusCharRects[ePrevCharRect];
-  } else if (mTextRectArray.InRange(0)) {
-    mFirstCharRect = mTextRectArray.GetRect(0);
+  if (!mSelection->mFocus) {
+    mFirstCharRect = mSelection->mFocusCharRects[eNextCharRect];
+  } else if (mSelection->mFocus == 1) {
+    mFirstCharRect = mSelection->mFocusCharRects[ePrevCharRect];
+  } else if (!mSelection->mAnchor) {
+    mFirstCharRect = mSelection->mAnchorCharRects[eNextCharRect];
+  } else if (mSelection->mAnchor == 1) {
+    mFirstCharRect = mSelection->mFocusCharRects[ePrevCharRect];
+  } else if (mTextRectArray.isSome() && mTextRectArray->IsOffsetInRange(0)) {
+    mFirstCharRect = mTextRectArray->GetRect(0);
   } else {
     LayoutDeviceIntRect charRect;
     if (NS_WARN_IF(!QueryCharRect(aWidget, 0, charRect))) {
@@ -432,22 +440,35 @@
     }
   }
 
-  MOZ_LOG(
-      sContentCacheLog, LogLevel::Info,
-      ("0x%p CacheTextRects(), Succeeded, "
-       "mText.Length()=%x, mTextRectArray={ mStart=%u, mRects.Length()=%zu"
-       " }, mSelection={ mAnchor=%u, mAnchorCharRects[eNextCharRect]=%s, "
-       "mAnchorCharRects[ePrevCharRect]=%s, mFocus=%u, "
-       "mFocusCharRects[eNextCharRect]=%s, mFocusCharRects[ePrevCharRect]=%s, "
-       "mRect=%s }, mFirstCharRect=%s",
-       this, mText.Length(), mTextRectArray.mStart,
-       mTextRectArray.mRects.Length(), mSelection.mAnchor,
-       GetRectText(mSelection.mAnchorCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mAnchorCharRects[ePrevCharRect]).get(),
-       mSelection.mFocus,
-       GetRectText(mSelection.mFocusCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mFocusCharRects[ePrevCharRect]).get(),
-       GetRectText(mSelection.mRect).get(), GetRectText(mFirstCharRect).get()));
+  if (mLastCommit.isSome()) {
+    mLastCommitStringTextRectArray.emplace(mLastCommit->StartOffset());
+    if (mLastCommit->Length() == 1) {
+      MOZ_ASSERT(mSelection->Collapsed());
+      MOZ_ASSERT(mSelection->mAnchor - 1 == mLastCommit->StartOffset());
+      mLastCommitStringTextRectArray->mRects.AppendElement(
+          mSelection->mAnchorCharRects[ePrevCharRect]);
+    } else if (NS_WARN_IF(!QueryCharRectArray(
+                   aWidget, mLastCommit->StartOffset(), mLastCommit->Length(),
+                   mLastCommitStringTextRectArray->mRects))) {
+      MOZ_LOG(sContentCacheLog, LogLevel::Error,
+              ("0x%p CacheTextRects(), FAILED, "
+               "couldn't retrieve text rect array of the last commit string",
+               this));
+      mLastCommitStringTextRectArray.reset();
+      mLastCommit.reset();
+    }
+    MOZ_ASSERT((mLastCommitStringTextRectArray.isSome()
+                    ? mLastCommitStringTextRectArray->mRects.Length()
+                    : 0) == (mLastCommit.isSome() ? mLastCommit->Length() : 0));
+  }
+
+  MOZ_LOG(sContentCacheLog, LogLevel::Info,
+          ("0x%p CacheTextRects(), Succeeded, "
+           "mText.Length()=%x, mTextRectArray=%s, mSelection=%s, "
+           "mFirstCharRect=%s, mLastCommitStringTextRectArray=%s",
+           this, mText.Length(), ToString(mTextRectArray).c_str(),
+           ToString(mSelection).c_str(), ToString(mFirstCharRect).c_str(),
+           ToString(mLastCommitStringTextRectArray).c_str()));
   return true;
 }
 
@@ -459,16 +480,25 @@
           ("0x%p SetSelection(aStartOffset=%u, "
            "aLength=%u, aReversed=%s, aWritingMode=%s), mText.Length()=%u",
            this, aStartOffset, aLength, GetBoolName(aReversed),
-           GetWritingModeName(aWritingMode).get(), mText.Length()));
+           ToString(aWritingMode).c_str(), mText.Length()));
 
-  if (!aReversed) {
-    mSelection.mAnchor = aStartOffset;
-    mSelection.mFocus = aStartOffset + aLength;
-  } else {
-    mSelection.mAnchor = aStartOffset + aLength;
-    mSelection.mFocus = aStartOffset;
+  mSelection = Some(Selection(
+      !aReversed ? aStartOffset : aStartOffset + aLength,
+      !aReversed ? aStartOffset + aLength : aStartOffset, aWritingMode));
+
+  if (mLastCommit.isSome()) {
+    // Forget last commit string range if selection is not collapsed
+    // at end of the last commit string.
+    if (!mSelection->Collapsed() ||
+        mSelection->mAnchor != mLastCommit->EndOffset()) {
+      MOZ_LOG(
+          sContentCacheLog, LogLevel::Debug,
+          ("0x%p SetSelection(), forgetting last commit composition data "
+           "(mSelection=%s, mLastCommit=%s)",
+           this, ToString(mSelection).c_str(), ToString(mLastCommit).c_str()));
+      mLastCommit.reset();
+    }
   }
-  mSelection.mWritingMode = aWritingMode;
 
   if (NS_WARN_IF(!CacheCaret(aWidget))) {
     return;
@@ -485,7 +515,6 @@
       mBrowserParent(aBrowserParent),
       mCommitStringByRequest(nullptr),
       mPendingEventsNeedingAck(0),
-      mCompositionStartInChild(UINT32_MAX),
       mPendingCommitLength(0),
       mPendingCompositionCount(0),
       mPendingCommitCount(0),
@@ -500,14 +529,17 @@
   mFirstCharRect = aOther.mFirstCharRect;
   mCaret = aOther.mCaret;
   mTextRectArray = aOther.mTextRectArray;
+  mLastCommitStringTextRectArray = aOther.mLastCommitStringTextRectArray;
   mEditorRect = aOther.mEditorRect;
 
   // Only when there is one composition, the TextComposition instance in this
   // process is managing the composition in the remote process.  Therefore,
   // we shouldn't update composition start offset of TextComposition with
   // old composition which is still being handled by the child process.
-  if (mWidgetHasComposition && mPendingCompositionCount == 1) {
-    IMEStateManager::MaybeStartOffsetUpdatedInChild(aWidget, mCompositionStart);
+  if (mWidgetHasComposition && mPendingCompositionCount == 1 &&
+      mCompositionStart.isSome()) {
+    IMEStateManager::MaybeStartOffsetUpdatedInChild(aWidget,
+                                                    mCompositionStart.value());
   }
 
   // When this instance allows to query content relative to composition string,
@@ -516,52 +548,39 @@
   // string.
   mCompositionStartInChild = aOther.mCompositionStart;
   if (mWidgetHasComposition || mPendingCommitCount) {
-    if (aOther.mCompositionStart != UINT32_MAX) {
-      if (mCompositionStart != aOther.mCompositionStart) {
-        mCompositionStart = aOther.mCompositionStart;
+    if (mCompositionStartInChild.isSome()) {
+      if (mCompositionStart.valueOr(UINT32_MAX) !=
+          mCompositionStartInChild.value()) {
+        mCompositionStart = mCompositionStartInChild;
         mPendingCommitLength = 0;
       }
-    } else if (mCompositionStart != mSelection.StartOffset()) {
-      mCompositionStart = mSelection.StartOffset();
+    } else if (mCompositionStart.isSome() && mSelection.isSome() &&
+               mCompositionStart.value() != mSelection->StartOffset()) {
+      mCompositionStart = Some(mSelection->StartOffset());
       mPendingCommitLength = 0;
-      NS_WARNING_ASSERTION(mCompositionStart != UINT32_MAX,
-                           "mCompositionStart shouldn't be invalid offset when "
-                           "the widget has composition");
     }
   }
 
-  MOZ_LOG(
-      sContentCacheLog, LogLevel::Info,
-      ("0x%p AssignContent(aNotification=%s), "
-       "Succeeded, mText.Length()=%u, mSelection={ mAnchor=%u, mFocus=%u, "
-       "mWritingMode=%s, mAnchorCharRects[eNextCharRect]=%s, "
-       "mAnchorCharRects[ePrevCharRect]=%s, mFocusCharRects[eNextCharRect]=%s, "
-       "mFocusCharRects[ePrevCharRect]=%s, mRect=%s }, "
-       "mFirstCharRect=%s, mCaret={ mOffset=%u, mRect=%s }, mTextRectArray={ "
-       "mStart=%u, mRects.Length()=%zu }, mWidgetHasComposition=%s, "
-       "mPendingCompositionCount=%u, mCompositionStart=%u, "
-       "mPendingCommitLength=%u, mEditorRect=%s",
-       this, GetNotificationName(aNotification), mText.Length(),
-       mSelection.mAnchor, mSelection.mFocus,
-       GetWritingModeName(mSelection.mWritingMode).get(),
-       GetRectText(mSelection.mAnchorCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mAnchorCharRects[ePrevCharRect]).get(),
-       GetRectText(mSelection.mFocusCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mFocusCharRects[ePrevCharRect]).get(),
-       GetRectText(mSelection.mRect).get(), GetRectText(mFirstCharRect).get(),
-       mCaret.mOffset, GetRectText(mCaret.mRect).get(), mTextRectArray.mStart,
-       mTextRectArray.mRects.Length(), GetBoolName(mWidgetHasComposition),
-       mPendingCompositionCount, mCompositionStart, mPendingCommitLength,
-       GetRectText(mEditorRect).get()));
+  MOZ_LOG(sContentCacheLog, LogLevel::Info,
+          ("0x%p AssignContent(aNotification=%s), "
+           "Succeeded, mText.Length()=%u, mSelection=%s, mFirstCharRect=%s, "
+           "mCaret=%s, mTextRectArray=%s, mWidgetHasComposition=%s, "
+           "mPendingCompositionCount=%u, mCompositionStart=%s, "
+           "mPendingCommitLength=%u, mEditorRect=%s, "
+           "mLastCommitStringTextRectArray=%s",
+           this, GetNotificationName(aNotification), mText.Length(),
+           ToString(mSelection).c_str(), ToString(mFirstCharRect).c_str(),
+           ToString(mCaret).c_str(), ToString(mTextRectArray).c_str(),
+           GetBoolName(mWidgetHasComposition), mPendingCompositionCount,
+           ToString(mCompositionStart).c_str(), mPendingCommitLength,
+           ToString(mEditorRect).c_str(),
+           ToString(mLastCommitStringTextRectArray).c_str()));
 }
 
 bool ContentCacheInParent::HandleQueryContentEvent(
     WidgetQueryContentEvent& aEvent, nsIWidget* aWidget) const {
   MOZ_ASSERT(aWidget);
 
-  aEvent.mSucceeded = false;
-  aEvent.mReply.mFocusedWidget = aWidget;
-
   // ContentCache doesn't store offset of its start with XP linebreaks.
   // So, we don't support to query contents relative to composition start
   // offset with XP linebreaks.
@@ -590,6 +609,18 @@
 
   bool isRelativeToInsertionPoint = aEvent.mInput.mRelativeToInsertionPoint;
   if (isRelativeToInsertionPoint) {
+    MOZ_LOG(sContentCacheLog, LogLevel::Debug,
+            ("0x%p HandleQueryContentEvent(), "
+             "making offset absolute... aEvent={ mMessage=%s, mInput={ "
+             "mOffset=%" PRId64 ", mLength=%" PRIu32 " } }, "
+             "aWidget={ PluginHasFocus()=%s }, mWidgetHasComposition=%s, "
+             "mPendingCommitCount=%" PRIu8 ", mCompositionStart=%" PRIu32 ", "
+             "mPendingCommitLength=%" PRIu32 ", mSelection=%s",
+             this, ToChar(aEvent.mMessage), aEvent.mInput.mOffset,
+             aEvent.mInput.mLength, GetBoolName(aWidget->PluginHasFocus()),
+             GetBoolName(mWidgetHasComposition), mPendingCommitCount,
+             mCompositionStart.valueOr(UINT32_MAX), mPendingCommitLength,
+             ToString(mSelection).c_str()));
     if (aWidget->PluginHasFocus()) {
       if (NS_WARN_IF(!aEvent.mInput.MakeOffsetAbsolute(0))) {
         MOZ_LOG(sContentCacheLog, LogLevel::Error,
@@ -602,8 +633,9 @@
         return false;
       }
     } else if (mWidgetHasComposition || mPendingCommitCount) {
-      if (NS_WARN_IF(!aEvent.mInput.MakeOffsetAbsolute(mCompositionStart +
-                                                       mPendingCommitLength))) {
+      if (NS_WARN_IF(mCompositionStart.isNothing()) ||
+          NS_WARN_IF(!aEvent.mInput.MakeOffsetAbsolute(
+              mCompositionStart.value() + mPendingCommitLength))) {
         MOZ_LOG(
             sContentCacheLog, LogLevel::Error,
             ("0x%p HandleQueryContentEvent(), FAILED due to "
@@ -612,29 +644,28 @@
              "mCompositionStart=%" PRIu32 ", mPendingCommitLength=%" PRIu32 ", "
              "aEvent={ mMessage=%s, mInput={ mOffset=%" PRId64
              ", mLength=%" PRIu32 " } }",
-             this, mCompositionStart, mPendingCommitLength,
+             this, mCompositionStart.valueOr(UINT32_MAX), mPendingCommitLength,
              ToChar(aEvent.mMessage), aEvent.mInput.mOffset,
              aEvent.mInput.mLength));
         return false;
       }
-    } else if (NS_WARN_IF(!mSelection.IsValid())) {
+    } else if (NS_WARN_IF(mSelection.isNothing())) {
       MOZ_LOG(sContentCacheLog, LogLevel::Error,
               ("0x%p HandleQueryContentEvent(), FAILED due to mSelection is "
-               "invalid",
+               "not set",
                this));
       return false;
     } else if (NS_WARN_IF(!aEvent.mInput.MakeOffsetAbsolute(
-                   mSelection.StartOffset() + mPendingCommitLength))) {
+                   mSelection->StartOffset() + mPendingCommitLength))) {
       MOZ_LOG(sContentCacheLog, LogLevel::Error,
               ("0x%p HandleQueryContentEvent(), FAILED due to "
                "aEvent.mInput.MakeOffsetAbsolute(mSelection.StartOffset() + "
-               "mPendingCommitLength) failure, "
-               "mSelection={ StartOffset()=%d, Length()=%d }, "
+               "mPendingCommitLength) failure, mSelection=%s, "
                "mPendingCommitLength=%" PRIu32 ", aEvent={ mMessage=%s, "
                "mInput={ mOffset=%" PRId64 ", mLength=%" PRIu32 " } }",
-               this, mSelection.StartOffset(), mSelection.Length(),
-               mPendingCommitLength, ToChar(aEvent.mMessage),
-               aEvent.mInput.mOffset, aEvent.mInput.mLength));
+               this, ToString(mSelection).c_str(), mPendingCommitLength,
+               ToChar(aEvent.mMessage), aEvent.mInput.mOffset,
+               aEvent.mInput.mLength));
       return false;
     }
   }
@@ -642,57 +673,53 @@
   switch (aEvent.mMessage) {
     case eQuerySelectedText:
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent("
-               "aEvent={ mMessage=eQuerySelectedText }, aWidget=0x%p)",
+              ("0x%p HandleQueryContentEvent(aEvent={ "
+               "mMessage=eQuerySelectedText }, aWidget=0x%p)",
                this, aWidget));
       if (aWidget->PluginHasFocus()) {
         MOZ_LOG(sContentCacheLog, LogLevel::Info,
-                ("0x%p HandleQueryContentEvent(), "
-                 "return emtpy selection becasue plugin has focus",
+                ("0x%p HandleQueryContentEvent(), return emtpy selection "
+                 "because plugin has focus",
                  this));
-        aEvent.mSucceeded = true;
-        aEvent.mReply.mOffset = 0;
-        aEvent.mReply.mReversed = false;
-        aEvent.mReply.mHasSelection = false;
+        aEvent.EmplaceReply();
+        aEvent.mReply->mFocusedWidget = aWidget;
+        aEvent.mReply->mOffsetAndData.emplace(0, EmptyString(),
+                                              OffsetAndDataFor::SelectedString);
+        aEvent.mReply->mReversed = false;
+        aEvent.mReply->mHasSelection = false;
         return true;
       }
       if (NS_WARN_IF(!IsSelectionValid())) {
         // If content cache hasn't been initialized properly, make the query
         // failed.
         MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                ("0x%p HandleQueryContentEvent(), "
-                 "FAILED because mSelection is not valid",
+                ("0x%p HandleQueryContentEvent(), FAILED because mSelection is "
+                 "not valid",
                  this));
-        return true;
+        return false;
       }
-      aEvent.mReply.mOffset = mSelection.StartOffset();
-      if (mSelection.Collapsed()) {
-        aEvent.mReply.mString.Truncate(0);
-      } else {
-        if (NS_WARN_IF(mSelection.EndOffset() > mText.Length())) {
-          MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                  ("0x%p HandleQueryContentEvent(), "
-                   "FAILED because mSelection.EndOffset()=%u is larger than "
-                   "mText.Length()=%u",
-                   this, mSelection.EndOffset(), mText.Length()));
-          return false;
-        }
-        aEvent.mReply.mString =
-            Substring(mText, aEvent.mReply.mOffset, mSelection.Length());
+      if (!mSelection->Collapsed() &&
+          NS_WARN_IF(mSelection->EndOffset() > mText.Length())) {
+        MOZ_LOG(sContentCacheLog, LogLevel::Error,
+                ("0x%p HandleQueryContentEvent(), FAILED because "
+                 "mSelection->EndOffset()=%u is larger than mText.Length()=%u",
+                 this, mSelection->EndOffset(), mText.Length()));
+        return false;
       }
-      aEvent.mReply.mReversed = mSelection.Reversed();
-      aEvent.mReply.mHasSelection = true;
-      aEvent.mReply.mWritingMode = mSelection.mWritingMode;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      aEvent.mReply->mOffsetAndData.emplace(
+          mSelection->StartOffset(),
+          Substring(mText, mSelection->StartOffset(), mSelection->Length()),
+          OffsetAndDataFor::SelectedString);
+      aEvent.mReply->mReversed = mSelection->Reversed();
+      aEvent.mReply->mHasSelection = true;
+      aEvent.mReply->mWritingMode = mSelection->mWritingMode;
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
               ("0x%p HandleQueryContentEvent(), "
-               "Succeeded, aEvent={ mReply={ mOffset=%u, mString=\"%s\", "
-               "mReversed=%s, mHasSelection=%s, mWritingMode=%s } }",
-               this, aEvent.mReply.mOffset,
-               GetEscapedUTF8String(aEvent.mReply.mString).get(),
-               GetBoolName(aEvent.mReply.mReversed),
-               GetBoolName(aEvent.mReply.mHasSelection),
-               GetWritingModeName(aEvent.mReply.mWritingMode).get()));
-      break;
+               "Succeeded, aEvent={ mMessage=eQuerySelectedText, mReply=%s }",
+               this, ToString(aEvent.mReply).c_str()));
+      return true;
     case eQueryTextContent: {
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
               ("0x%p HandleQueryContentEvent("
@@ -704,24 +731,26 @@
       uint32_t inputEndOffset =
           std::min(aEvent.mInput.EndOffset(), mText.Length());
       if (NS_WARN_IF(inputEndOffset < inputOffset)) {
-        MOZ_LOG(
-            sContentCacheLog, LogLevel::Error,
-            ("0x%p HandleQueryContentEvent(), "
-             "FAILED because inputOffset=%u is larger than inputEndOffset=%u",
-             this, inputOffset, inputEndOffset));
+        MOZ_LOG(sContentCacheLog, LogLevel::Error,
+                ("0x%p HandleQueryContentEvent(), FAILED because "
+                 "inputOffset=%u is larger than inputEndOffset=%u",
+                 this, inputOffset, inputEndOffset));
         return false;
       }
-      aEvent.mReply.mOffset = inputOffset;
-      aEvent.mReply.mString =
-          Substring(mText, inputOffset, inputEndOffset - inputOffset);
-      MOZ_LOG(
-          sContentCacheLog, LogLevel::Info,
-          ("0x%p HandleQueryContentEvent(), "
-           "Succeeded, aEvent={ mReply={ mOffset=%u, mString.Length()=%u } }",
-           this, aEvent.mReply.mOffset, aEvent.mReply.mString.Length()));
-      break;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      aEvent.mReply->mOffsetAndData.emplace(
+          inputOffset,
+          Substring(mText, inputOffset, inputEndOffset - inputOffset),
+          OffsetAndDataFor::EditorString);
+      // TODO: Support font ranges
+      MOZ_LOG(sContentCacheLog, LogLevel::Info,
+              ("0x%p HandleQueryContentEvent(), Succeeded, aEvent={ "
+               "mMessage=eQueryTextContent, mReply=%s }",
+               this, ToString(aEvent.mReply).c_str()));
+      return true;
     }
-    case eQueryTextRect:
+    case eQueryTextRect: {
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
               ("0x%p HandleQueryContentEvent("
                "aEvent={ mMessage=eQueryTextRect, mInput={ mOffset=%" PRId64
@@ -732,174 +761,208 @@
         // If content cache hasn't been initialized properly, make the query
         // failed.
         MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                ("0x%p HandleQueryContentEvent(), "
-                 "FAILED because mSelection is not valid",
+                ("0x%p HandleQueryContentEvent(), FAILED because mSelection is "
+                 "not valid",
                  this));
-        return true;
+        return false;
       }
       // Note that if the query is relative to insertion point, the query was
       // probably requested by native IME.  In such case, we should return
       // non-empty rect since returning failure causes IME showing its window
       // at odd position.
+      LayoutDeviceIntRect textRect;
       if (aEvent.mInput.mLength) {
-        if (NS_WARN_IF(!GetUnionTextRects(
-                aEvent.mInput.mOffset, aEvent.mInput.mLength,
-                isRelativeToInsertionPoint, aEvent.mReply.mRect))) {
+        if (NS_WARN_IF(
+                !GetUnionTextRects(aEvent.mInput.mOffset, aEvent.mInput.mLength,
+                                   isRelativeToInsertionPoint, textRect))) {
           // XXX We don't have cache for this request.
           MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                  ("0x%p HandleQueryContentEvent(), "
-                   "FAILED to get union rect",
+                  ("0x%p HandleQueryContentEvent(), FAILED to get union rect",
                    this));
           return false;
         }
       } else {
         // If the length is 0, we should return caret rect instead.
         if (NS_WARN_IF(!GetCaretRect(aEvent.mInput.mOffset,
-                                     isRelativeToInsertionPoint,
-                                     aEvent.mReply.mRect))) {
+                                     isRelativeToInsertionPoint, textRect))) {
           MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                  ("0x%p HandleQueryContentEvent(), "
-                   "FAILED to get caret rect",
+                  ("0x%p HandleQueryContentEvent(), FAILED to get caret rect",
                    this));
           return false;
         }
       }
-      if (aEvent.mInput.mOffset < mText.Length()) {
-        aEvent.mReply.mString = Substring(
-            mText, aEvent.mInput.mOffset,
-            mText.Length() >= aEvent.mInput.EndOffset() ? aEvent.mInput.mLength
-                                                        : UINT32_MAX);
-      } else {
-        aEvent.mReply.mString.Truncate(0);
-      }
-      aEvent.mReply.mOffset = aEvent.mInput.mOffset;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      aEvent.mReply->mRect = textRect;
+      aEvent.mReply->mOffsetAndData.emplace(
+          aEvent.mInput.mOffset,
+          aEvent.mInput.mOffset < mText.Length()
+              ? static_cast<const nsAString&>(
+                    Substring(mText, aEvent.mInput.mOffset,
+                              mText.Length() >= aEvent.mInput.EndOffset()
+                                  ? aEvent.mInput.mLength
+                                  : UINT32_MAX))
+              : static_cast<const nsAString&>(EmptyString()),
+          OffsetAndDataFor::EditorString);
       // XXX This may be wrong if storing range isn't in the selection range.
-      aEvent.mReply.mWritingMode = mSelection.mWritingMode;
-      MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent(), "
-               "Succeeded, aEvent={ mReply={ mOffset=%u, mString=\"%s\", "
-               "mWritingMode=%s, mRect=%s } }",
-               this, aEvent.mReply.mOffset,
-               GetEscapedUTF8String(aEvent.mReply.mString).get(),
-               GetWritingModeName(aEvent.mReply.mWritingMode).get(),
-               GetRectText(aEvent.mReply.mRect).get()));
-      break;
-    case eQueryCaretRect:
+      aEvent.mReply->mWritingMode = mSelection->mWritingMode;
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent("
-               "aEvent={ mMessage=eQueryCaretRect, mInput={ mOffset=%" PRId64
-               " } }, "
-               "aWidget=0x%p), mText.Length()=%u",
-               this, aEvent.mInput.mOffset, aWidget, mText.Length()));
+              ("0x%p HandleQueryContentEvent(), Succeeded, aEvent={ "
+               "mMessage=eQueryTextRect mReply=%s }",
+               this, ToString(aEvent.mReply).c_str()));
+      return true;
+    }
+    case eQueryCaretRect: {
+      MOZ_LOG(
+          sContentCacheLog, LogLevel::Info,
+          ("0x%p HandleQueryContentEvent(aEvent={ mMessage=eQueryCaretRect, "
+           "mInput={ mOffset=%" PRId64 " } }, aWidget=0x%p), mText.Length()=%u",
+           this, aEvent.mInput.mOffset, aWidget, mText.Length()));
       if (NS_WARN_IF(!IsSelectionValid())) {
         // If content cache hasn't been initialized properly, make the query
         // failed.
         MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                ("0x%p HandleQueryContentEvent(), "
-                 "FAILED because mSelection is not valid",
+                ("0x%p HandleQueryContentEvent(), FAILED because mSelection is "
+                 "not valid",
                  this));
-        return true;
+        return false;
       }
       // Note that if the query is relative to insertion point, the query was
       // probably requested by native IME.  In such case, we should return
       // non-empty rect since returning failure causes IME showing its window
       // at odd position.
+      LayoutDeviceIntRect caretRect;
       if (NS_WARN_IF(!GetCaretRect(aEvent.mInput.mOffset,
-                                   isRelativeToInsertionPoint,
-                                   aEvent.mReply.mRect))) {
-        MOZ_LOG(sContentCacheLog, LogLevel::Error,
-                ("0x%p HandleQueryContentEvent(), "
-                 "FAILED to get caret rect",
-                 this));
+                                   isRelativeToInsertionPoint, caretRect))) {
+        MOZ_LOG(
+            sContentCacheLog, LogLevel::Error,
+            ("0x%p HandleQueryContentEvent(),FAILED to get caret rect", this));
         return false;
       }
-      aEvent.mReply.mOffset = aEvent.mInput.mOffset;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      aEvent.mReply->mRect = caretRect;
+      aEvent.mReply->mOffsetAndData.emplace(aEvent.mInput.mOffset,
+                                            EmptyString(),
+                                            OffsetAndDataFor::SelectedString);
+      // TODO: Set mWritingMode here
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent(), "
-               "Succeeded, aEvent={ mReply={ mOffset=%u, mRect=%s } }",
-               this, aEvent.mReply.mOffset,
-               GetRectText(aEvent.mReply.mRect).get()));
-      break;
+              ("0x%p HandleQueryContentEvent(), Succeeded, aEvent={ "
+               "mMessage=eQueryCaretRect, mReply=%s }",
+               this, ToString(aEvent.mReply).c_str()));
+      return true;
+    }
     case eQueryEditorRect:
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent("
-               "aEvent={ mMessage=eQueryEditorRect }, aWidget=0x%p)",
+              ("0x%p HandleQueryContentEvent(aEvent={ "
+               "mMessage=eQueryEditorRect }, aWidget=0x%p)",
                this, aWidget));
-      aEvent.mReply.mRect = mEditorRect;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      aEvent.mReply->mRect = mEditorRect;
       MOZ_LOG(sContentCacheLog, LogLevel::Info,
-              ("0x%p HandleQueryContentEvent(), "
-               "Succeeded, aEvent={ mReply={ mRect=%s } }",
-               this, GetRectText(aEvent.mReply.mRect).get()));
-      break;
+              ("0x%p HandleQueryContentEvent(), Succeeded, aEvent={ "
+               "mMessage=eQueryEditorRect, mReply=%s }",
+               this, ToString(aEvent.mReply).c_str()));
+      return true;
     default:
-      break;
+      aEvent.EmplaceReply();
+      aEvent.mReply->mFocusedWidget = aWidget;
+      if (NS_WARN_IF(aEvent.Failed())) {
+        MOZ_LOG(
+            sContentCacheLog, LogLevel::Error,
+            ("0x%p HandleQueryContentEvent(), FAILED due to not set enough "
+             "data, aEvent={ mMessage=%s, mReply=%s }",
+             this, ToChar(aEvent.mMessage), ToString(aEvent.mReply).c_str()));
+        return false;
+      }
+      MOZ_LOG(sContentCacheLog, LogLevel::Info,
+              ("0x%p HandleQueryContentEvent(), Succeeded, aEvent={ "
+               "mMessage=%s, mReply=%s }",
+               this, ToChar(aEvent.mMessage), ToString(aEvent.mReply).c_str()));
+      return true;
   }
-  aEvent.mSucceeded = true;
-  return true;
 }
 
 bool ContentCacheInParent::GetTextRect(uint32_t aOffset,
                                        bool aRoundToExistingOffset,
                                        LayoutDeviceIntRect& aTextRect) const {
-  MOZ_LOG(sContentCacheLog, LogLevel::Info,
-          ("0x%p GetTextRect(aOffset=%u, "
-           "aRoundToExistingOffset=%s), "
-           "mTextRectArray={ mStart=%u, mRects.Length()=%zu }, "
-           "mSelection={ mAnchor=%u, mFocus=%u }",
-           this, aOffset, GetBoolName(aRoundToExistingOffset),
-           mTextRectArray.mStart, mTextRectArray.mRects.Length(),
-           mSelection.mAnchor, mSelection.mFocus));
+  MOZ_LOG(
+      sContentCacheLog, LogLevel::Info,
+      ("0x%p GetTextRect(aOffset=%u, aRoundToExistingOffset=%s), "
+       "mTextRectArray=%s, mSelection=%s, mLastCommitStringTextRectArray=%s",
+       this, aOffset, GetBoolName(aRoundToExistingOffset),
+       ToString(mTextRectArray).c_str(), ToString(mSelection).c_str(),
+       ToString(mLastCommitStringTextRectArray).c_str()));
 
   if (!aOffset) {
     NS_WARNING_ASSERTION(!mFirstCharRect.IsEmpty(), "empty rect");
     aTextRect = mFirstCharRect;
     return !aTextRect.IsEmpty();
   }
-  if (aOffset == mSelection.mAnchor) {
-    NS_WARNING_ASSERTION(!mSelection.mAnchorCharRects[eNextCharRect].IsEmpty(),
-                         "empty rect");
-    aTextRect = mSelection.mAnchorCharRects[eNextCharRect];
-    return !aTextRect.IsEmpty();
+  if (mSelection.isSome()) {
+    if (aOffset == mSelection->mAnchor) {
+      NS_WARNING_ASSERTION(
+          !mSelection->mAnchorCharRects[eNextCharRect].IsEmpty(), "empty rect");
+      aTextRect = mSelection->mAnchorCharRects[eNextCharRect];
+      return !aTextRect.IsEmpty();
+    }
+    if (mSelection->mAnchor && aOffset == mSelection->mAnchor - 1) {
+      NS_WARNING_ASSERTION(
+          !mSelection->mAnchorCharRects[ePrevCharRect].IsEmpty(), "empty rect");
+      aTextRect = mSelection->mAnchorCharRects[ePrevCharRect];
+      return !aTextRect.IsEmpty();
+    }
+    if (aOffset == mSelection->mFocus) {
+      NS_WARNING_ASSERTION(
+          !mSelection->mFocusCharRects[eNextCharRect].IsEmpty(), "empty rect");
+      aTextRect = mSelection->mFocusCharRects[eNextCharRect];
+      return !aTextRect.IsEmpty();
+    }
+    if (mSelection->mFocus && aOffset == mSelection->mFocus - 1) {
+      NS_WARNING_ASSERTION(
+          !mSelection->mFocusCharRects[ePrevCharRect].IsEmpty(), "empty rect");
+      aTextRect = mSelection->mFocusCharRects[ePrevCharRect];
+      return !aTextRect.IsEmpty();
+    }
   }
-  if (mSelection.mAnchor && aOffset == mSelection.mAnchor - 1) {
-    NS_WARNING_ASSERTION(!mSelection.mAnchorCharRects[ePrevCharRect].IsEmpty(),
-                         "empty rect");
-    aTextRect = mSelection.mAnchorCharRects[ePrevCharRect];
+
+  if (mTextRectArray.isSome() && mTextRectArray->IsOffsetInRange(aOffset)) {
+    aTextRect = mTextRectArray->GetRect(aOffset);
     return !aTextRect.IsEmpty();
   }
-  if (aOffset == mSelection.mFocus) {
-    NS_WARNING_ASSERTION(!mSelection.mFocusCharRects[eNextCharRect].IsEmpty(),
-                         "empty rect");
-    aTextRect = mSelection.mFocusCharRects[eNextCharRect];
+
+  if (mLastCommitStringTextRectArray.isSome() &&
+      mLastCommitStringTextRectArray->IsOffsetInRange(aOffset)) {
+    aTextRect = mLastCommitStringTextRectArray->GetRect(aOffset);
     return !aTextRect.IsEmpty();
   }
-  if (mSelection.mFocus && aOffset == mSelection.mFocus - 1) {
-    NS_WARNING_ASSERTION(!mSelection.mFocusCharRects[ePrevCharRect].IsEmpty(),
-                         "empty rect");
-    aTextRect = mSelection.mFocusCharRects[ePrevCharRect];
+
+  if (!aRoundToExistingOffset) {
+    aTextRect.SetEmpty();
+    return false;
+  }
+
+  if (mTextRectArray.isNothing() || !mTextRectArray->HasRects()) {
+    // If there are no rects in mTextRectArray, we should refer the start of
+    // the selection because IME must query a char rect around it if there is
+    // no composition.
+    aTextRect = mSelection->StartCharRect();
     return !aTextRect.IsEmpty();
   }
 
+  // Although we may have mLastCommitStringTextRectArray here and it must have
+  // previous character rects at selection.  However, we should stop using it
+  // because it's stored really short time after commiting a composition.
+  // So, multiple query may return different rect and it may cause flickerling
+  // the IME UI.
   uint32_t offset = aOffset;
-  if (!mTextRectArray.InRange(aOffset)) {
-    if (!aRoundToExistingOffset) {
-      aTextRect.SetEmpty();
-      return false;
-    }
-    if (!mTextRectArray.IsValid()) {
-      // If there are no rects in mTextRectArray, we should refer the start of
-      // the selection because IME must query a char rect around it if there is
-      // no composition.
-      aTextRect = mSelection.StartCharRect();
-      return !aTextRect.IsEmpty();
-    }
-    if (offset < mTextRectArray.StartOffset()) {
-      offset = mTextRectArray.StartOffset();
-    } else {
-      offset = mTextRectArray.EndOffset() - 1;
-    }
+  if (offset < mTextRectArray->StartOffset()) {
+    offset = mTextRectArray->StartOffset();
+  } else {
+    offset = mTextRectArray->EndOffset() - 1;
   }
-  aTextRect = mTextRectArray.GetRect(offset);
+  aTextRect = mTextRectArray->GetRect(offset);
   return !aTextRect.IsEmpty();
 }
 
@@ -908,22 +971,21 @@
     LayoutDeviceIntRect& aUnionTextRect) const {
   MOZ_LOG(sContentCacheLog, LogLevel::Info,
           ("0x%p GetUnionTextRects(aOffset=%u, "
-           "aLength=%u, aRoundToExistingOffset=%s), mTextRectArray={ "
-           "mStart=%u, mRects.Length()=%zu }, "
-           "mSelection={ mAnchor=%u, mFocus=%u }",
+           "aLength=%u, aRoundToExistingOffset=%s), mTextRectArray=%s, "
+           "mSelection=%s, mLastCommitStringTextRectArray=%s",
            this, aOffset, aLength, GetBoolName(aRoundToExistingOffset),
-           mTextRectArray.mStart, mTextRectArray.mRects.Length(),
-           mSelection.mAnchor, mSelection.mFocus));
+           ToString(mTextRectArray).c_str(), ToString(mSelection).c_str(),
+           ToString(mLastCommitStringTextRectArray).c_str()));
 
   CheckedInt<uint32_t> endOffset = CheckedInt<uint32_t>(aOffset) + aLength;
   if (!endOffset.isValid()) {
     return false;
   }
 
-  if (!mSelection.Collapsed() && aOffset == mSelection.StartOffset() &&
-      aLength == mSelection.Length()) {
-    NS_WARNING_ASSERTION(!mSelection.mRect.IsEmpty(), "empty rect");
-    aUnionTextRect = mSelection.mRect;
+  if (mSelection.isSome() && !mSelection->Collapsed() &&
+      aOffset == mSelection->StartOffset() && aLength == mSelection->Length()) {
+    NS_WARNING_ASSERTION(!mSelection->mRect.IsEmpty(), "empty rect");
+    aUnionTextRect = mSelection->mRect;
     return !aUnionTextRect.IsEmpty();
   }
 
@@ -933,29 +995,35 @@
       aUnionTextRect = mFirstCharRect;
       return !aUnionTextRect.IsEmpty();
     }
-    if (aOffset == mSelection.mAnchor) {
-      NS_WARNING_ASSERTION(
-          !mSelection.mAnchorCharRects[eNextCharRect].IsEmpty(), "empty rect");
-      aUnionTextRect = mSelection.mAnchorCharRects[eNextCharRect];
-      return !aUnionTextRect.IsEmpty();
-    }
-    if (mSelection.mAnchor && aOffset == mSelection.mAnchor - 1) {
-      NS_WARNING_ASSERTION(
-          !mSelection.mAnchorCharRects[ePrevCharRect].IsEmpty(), "empty rect");
-      aUnionTextRect = mSelection.mAnchorCharRects[ePrevCharRect];
-      return !aUnionTextRect.IsEmpty();
-    }
-    if (aOffset == mSelection.mFocus) {
-      NS_WARNING_ASSERTION(!mSelection.mFocusCharRects[eNextCharRect].IsEmpty(),
-                           "empty rect");
-      aUnionTextRect = mSelection.mFocusCharRects[eNextCharRect];
-      return !aUnionTextRect.IsEmpty();
-    }
-    if (mSelection.mFocus && aOffset == mSelection.mFocus - 1) {
-      NS_WARNING_ASSERTION(!mSelection.mFocusCharRects[ePrevCharRect].IsEmpty(),
-                           "empty rect");
-      aUnionTextRect = mSelection.mFocusCharRects[ePrevCharRect];
-      return !aUnionTextRect.IsEmpty();
+    if (mSelection.isSome()) {
+      if (aOffset == mSelection->mAnchor) {
+        NS_WARNING_ASSERTION(
+            !mSelection->mAnchorCharRects[eNextCharRect].IsEmpty(),
+            "empty rect");
+        aUnionTextRect = mSelection->mAnchorCharRects[eNextCharRect];
+        return !aUnionTextRect.IsEmpty();
+      }
+      if (mSelection->mAnchor && aOffset == mSelection->mAnchor - 1) {
+        NS_WARNING_ASSERTION(
+            !mSelection->mAnchorCharRects[ePrevCharRect].IsEmpty(),
+            "empty rect");
+        aUnionTextRect = mSelection->mAnchorCharRects[ePrevCharRect];
+        return !aUnionTextRect.IsEmpty();
+      }
+      if (aOffset == mSelection->mFocus) {
+        NS_WARNING_ASSERTION(
+            !mSelection->mFocusCharRects[eNextCharRect].IsEmpty(),
+            "empty rect");
+        aUnionTextRect = mSelection->mFocusCharRects[eNextCharRect];
+        return !aUnionTextRect.IsEmpty();
+      }
+      if (mSelection->mFocus && aOffset == mSelection->mFocus - 1) {
+        NS_WARNING_ASSERTION(
+            !mSelection->mFocusCharRects[ePrevCharRect].IsEmpty(),
+            "empty rect");
+        aUnionTextRect = mSelection->mFocusCharRects[ePrevCharRect];
+        return !aUnionTextRect.IsEmpty();
+      }
     }
   }
 
@@ -964,40 +1032,60 @@
   // since the first character rect is important and the others are not so
   // in most cases.
 
-  if (!aOffset && aOffset != mSelection.mAnchor &&
-      aOffset != mSelection.mFocus && !mTextRectArray.InRange(aOffset)) {
+  if (!aOffset && mSelection.isSome() && aOffset != mSelection->mAnchor &&
+      aOffset != mSelection->mFocus &&
+      (mTextRectArray.isNothing() ||
+       !mTextRectArray->IsOffsetInRange(aOffset)) &&
+      (mLastCommitStringTextRectArray.isNothing() ||
+       !mLastCommitStringTextRectArray->IsOffsetInRange(aOffset))) {
     // The first character rect isn't cached.
     return false;
   }
 
-  if ((aRoundToExistingOffset && mTextRectArray.HasRects()) ||
-      mTextRectArray.IsOverlappingWith(aOffset, aLength)) {
-    aUnionTextRect = mTextRectArray.GetUnionRectAsFarAsPossible(
-        aOffset, aLength, aRoundToExistingOffset);
+  // Use mLastCommitStringTextRectArray only when it overlaps with aOffset
+  // even if aROundToExistingOffset is true for avoiding flickerling IME UI.
+  // See the last comment in GetTextRect() for the detail.
+  if (mLastCommitStringTextRectArray.isSome() &&
+      mLastCommitStringTextRectArray->IsOverlappingWith(aOffset, aLength)) {
+    aUnionTextRect =
+        mLastCommitStringTextRectArray->GetUnionRectAsFarAsPossible(
+            aOffset, aLength, aRoundToExistingOffset);
   } else {
     aUnionTextRect.SetEmpty();
   }
 
-  if (!aOffset) {
-    aUnionTextRect = aUnionTextRect.Union(mFirstCharRect);
-  }
-  if (aOffset <= mSelection.mAnchor && mSelection.mAnchor < endOffset.value()) {
-    aUnionTextRect =
-        aUnionTextRect.Union(mSelection.mAnchorCharRects[eNextCharRect]);
-  }
-  if (mSelection.mAnchor && aOffset <= mSelection.mAnchor - 1 &&
-      mSelection.mAnchor - 1 < endOffset.value()) {
+  if (mTextRectArray.isSome() &&
+      ((aRoundToExistingOffset && mTextRectArray->HasRects()) ||
+       mTextRectArray->IsOverlappingWith(aOffset, aLength))) {
     aUnionTextRect =
-        aUnionTextRect.Union(mSelection.mAnchorCharRects[ePrevCharRect]);
+        aUnionTextRect.Union(mTextRectArray->GetUnionRectAsFarAsPossible(
+            aOffset, aLength, aRoundToExistingOffset));
   }
-  if (aOffset <= mSelection.mFocus && mSelection.mFocus < endOffset.value()) {
-    aUnionTextRect =
-        aUnionTextRect.Union(mSelection.mFocusCharRects[eNextCharRect]);
+
+  if (!aOffset) {
+    aUnionTextRect = aUnionTextRect.Union(mFirstCharRect);
   }
-  if (mSelection.mFocus && aOffset <= mSelection.mFocus - 1 &&
-      mSelection.mFocus - 1 < endOffset.value()) {
-    aUnionTextRect =
-        aUnionTextRect.Union(mSelection.mFocusCharRects[ePrevCharRect]);
+  if (mSelection.isSome()) {
+    if (aOffset <= mSelection->mAnchor &&
+        mSelection->mAnchor < endOffset.value()) {
+      aUnionTextRect =
+          aUnionTextRect.Union(mSelection->mAnchorCharRects[eNextCharRect]);
+    }
+    if (mSelection->mAnchor && aOffset <= mSelection->mAnchor - 1 &&
+        mSelection->mAnchor - 1 < endOffset.value()) {
+      aUnionTextRect =
+          aUnionTextRect.Union(mSelection->mAnchorCharRects[ePrevCharRect]);
+    }
+    if (aOffset <= mSelection->mFocus &&
+        mSelection->mFocus < endOffset.value()) {
+      aUnionTextRect =
+          aUnionTextRect.Union(mSelection->mFocusCharRects[eNextCharRect]);
+    }
+    if (mSelection->mFocus && aOffset <= mSelection->mFocus - 1 &&
+        mSelection->mFocus - 1 < endOffset.value()) {
+      aUnionTextRect =
+          aUnionTextRect.Union(mSelection->mFocusCharRects[ePrevCharRect]);
+    }
   }
 
   return !aUnionTextRect.IsEmpty();
@@ -1006,28 +1094,15 @@
 bool ContentCacheInParent::GetCaretRect(uint32_t aOffset,
                                         bool aRoundToExistingOffset,
                                         LayoutDeviceIntRect& aCaretRect) const {
-  MOZ_LOG(
-      sContentCacheLog, LogLevel::Info,
-      ("0x%p GetCaretRect(aOffset=%u, "
-       "aRoundToExistingOffset=%s), "
-       "mCaret={ mOffset=%u, mRect=%s, IsValid()=%s }, mTextRectArray={ "
-       "mStart=%u, mRects.Length()=%zu }, mSelection={ mAnchor=%u, mFocus=%u, "
-       "mWritingMode=%s, mAnchorCharRects[eNextCharRect]=%s, "
-       "mAnchorCharRects[ePrevCharRect]=%s, mFocusCharRects[eNextCharRect]=%s, "
-       "mFocusCharRects[ePrevCharRect]=%s }, mFirstCharRect=%s",
-       this, aOffset, GetBoolName(aRoundToExistingOffset), mCaret.mOffset,
-       GetRectText(mCaret.mRect).get(), GetBoolName(mCaret.IsValid()),
-       mTextRectArray.mStart, mTextRectArray.mRects.Length(),
-       mSelection.mAnchor, mSelection.mFocus,
-       GetWritingModeName(mSelection.mWritingMode).get(),
-       GetRectText(mSelection.mAnchorCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mAnchorCharRects[ePrevCharRect]).get(),
-       GetRectText(mSelection.mFocusCharRects[eNextCharRect]).get(),
-       GetRectText(mSelection.mFocusCharRects[ePrevCharRect]).get(),
-       GetRectText(mFirstCharRect).get()));
+  MOZ_LOG(sContentCacheLog, LogLevel::Info,
+          ("0x%p GetCaretRect(aOffset=%u, aRoundToExistingOffset=%s), "
+           "mCaret=%s, mTextRectArray=%s, mSelection=%s, mFirstCharRect=%s",
+           this, aOffset, GetBoolName(aRoundToExistingOffset),
+           ToString(mCaret).c_str(), ToString(mTextRectArray).c_str(),
+           ToString(mSelection).c_str(), ToString(mFirstCharRect).c_str()));
 
-  if (mCaret.IsValid() && mCaret.mOffset == aOffset) {
-    aCaretRect = mCaret.mRect;
+  if (mCaret.isSome() && mCaret->mOffset == aOffset) {
+    aCaretRect = mCaret->mRect;
     return true;
   }
 
@@ -1041,7 +1116,7 @@
       return false;
     }
 
-    if (mSelection.mWritingMode.IsVertical()) {
+    if (mSelection.isSome() && mSelection->mWritingMode.IsVertical()) {
       aCaretRect.MoveToY(aCaretRect.YMost());
     } else {
       // XXX bidi-unaware.
@@ -1052,10 +1127,10 @@
   // XXX This is not bidi aware because we don't cache each character's
   //     direction.  However, this is usually used by IME, so, assuming the
   //     character is in LRT context must not cause any problem.
-  if (mSelection.mWritingMode.IsVertical()) {
-    aCaretRect.SetHeight(mCaret.IsValid() ? mCaret.mRect.Height() : 1);
+  if (mSelection.isSome() && mSelection->mWritingMode.IsVertical()) {
+    aCaretRect.SetHeight(mCaret.isSome() ? mCaret->mRect.Height() : 1);
   } else {
-    aCaretRect.SetWidth(mCaret.IsValid() ? mCaret.mRect.Width() : 1);
+    aCaretRect.SetWidth(mCaret.isSome() ? mCaret->mRect.Width() : 1);
   }
   return true;
 }
@@ -1069,7 +1144,10 @@
        "mPendingEventsNeedingAck=%u, mWidgetHasComposition=%s, "
        "mPendingCompositionCount=%" PRIu8 ", mPendingCommitCount=%" PRIu8 ", "
        "mIsChildIgnoringCompositionEvents=%s, mCommitStringByRequest=0x%p",
-       this, ToChar(aEvent.mMessage), GetEscapedUTF8String(aEvent.mData).get(),
+       this, ToChar(aEvent.mMessage),
+       PrintStringDetail(aEvent.mData,
+                         PrintStringDetail::kMaxLengthForCompositionString)
+           .get(),
        aEvent.mData.Length(), aEvent.mRanges ? aEvent.mRanges->Length() : 0,
        mPendingEventsNeedingAck, GetBoolName(mWidgetHasComposition),
        mPendingCompositionCount, mPendingCommitCount,
@@ -1084,15 +1162,16 @@
   if (!mWidgetHasComposition) {
     if (aEvent.mWidget && aEvent.mWidget->PluginHasFocus()) {
       // If focus is on plugin, we cannot get selection range
-      mCompositionStart = 0;
-    } else if (mCompositionStartInChild != UINT32_MAX) {
+      mCompositionStart = Some(0);
+    } else if (mCompositionStartInChild.isSome()) {
       // If there is pending composition in the remote process, let's use
       // its start offset temporarily because this stores a lot of information
       // around it and the user must look around there, so, showing some UI
       // around it must make sense.
       mCompositionStart = mCompositionStartInChild;
     } else {
-      mCompositionStart = mSelection.StartOffset();
+      mCompositionStart =
+          Some(mSelection.isSome() ? mSelection->StartOffset() : 0);
     }
     MOZ_ASSERT(aEvent.mMessage == eCompositionStart);
     MOZ_RELEASE_ASSERT(mPendingCompositionCount < UINT8_MAX);
@@ -1272,7 +1351,7 @@
   // now, we can forget composition string informations.
   if (!mWidgetHasComposition && !mPendingCompositionCount &&
       !mPendingCommitCount) {
-    mCompositionStart = UINT32_MAX;
+    mCompositionStart.reset();
   }
 
   if (NS_WARN_IF(!mPendingEventsNeedingAck)) {
@@ -1607,7 +1686,7 @@
 LayoutDeviceIntRect ContentCache::TextRectArray::GetRect(
     uint32_t aOffset) const {
   LayoutDeviceIntRect rect;
-  if (InRange(aOffset)) {
+  if (IsOffsetInRange(aOffset)) {
     rect = mRects[aOffset - mStart];
   }
   return rect;
@@ -1616,7 +1695,7 @@
 LayoutDeviceIntRect ContentCache::TextRectArray::GetUnionRect(
     uint32_t aOffset, uint32_t aLength) const {
   LayoutDeviceIntRect rect;
-  if (!InRange(aOffset, aLength)) {
+  if (!IsRangeCompletelyInRange(aOffset, aLength)) {
     return rect;
   }
   for (uint32_t i = 0; i < aLength; i++) {
diff -Nru firefox-84.0.2+build1/widget/ContentCache.h firefox-85.0+build1/widget/ContentCache.h
--- firefox-84.0.2+build1/widget/ContentCache.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/ContentCache.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,15 +10,19 @@
 
 #include <stdint.h>
 
+#include "mozilla/widget/IMEData.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/ToString.h"
 #include "mozilla/WritingModes.h"
-#include "nsIWidget.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "Units.h"
 
+class nsIWidget;
+
 namespace mozilla {
 
 class ContentCacheInParent;
@@ -38,14 +42,14 @@
   typedef CopyableTArray<LayoutDeviceIntRect> RectArray;
   typedef widget::IMENotification IMENotification;
 
-  ContentCache();
+  ContentCache() = default;
 
  protected:
   // Whole text in the target
   nsString mText;
 
   // Start offset of the composition string.
-  uint32_t mCompositionStart;
+  Maybe<uint32_t> mCompositionStart;
 
   enum { ePrevCharRect = 1, eNextCharRect = 0 };
 
@@ -67,71 +71,89 @@
     // Whole rect of selected text. This is empty if the selection is collapsed.
     LayoutDeviceIntRect mRect;
 
-    Selection() : mAnchor(UINT32_MAX), mFocus(UINT32_MAX) {}
-
-    void Clear() {
-      mAnchor = mFocus = UINT32_MAX;
-      mWritingMode = WritingMode();
-      ClearAnchorCharRects();
-      ClearFocusCharRects();
+    explicit Selection(uint32_t aAnchorOffset, uint32_t aFocusOffset,
+                       const WritingMode& aWritingMode)
+        : mAnchor(aAnchorOffset),
+          mFocus(aFocusOffset),
+          mWritingMode(aWritingMode) {}
+
+    void ClearRects() {
+      for (auto& rect : mAnchorCharRects) {
+        rect.SetEmpty();
+      }
+      for (auto& rect : mFocusCharRects) {
+        rect.SetEmpty();
+      }
       mRect.SetEmpty();
     }
-
-    void ClearAnchorCharRects() {
-      for (size_t i = 0; i < ArrayLength(mAnchorCharRects); i++) {
-        mAnchorCharRects[i].SetEmpty();
+    bool HasRects() const {
+      for (auto& rect : mAnchorCharRects) {
+        if (!rect.IsEmpty()) {
+          return true;
+        }
       }
-    }
-    void ClearFocusCharRects() {
-      for (size_t i = 0; i < ArrayLength(mFocusCharRects); i++) {
-        mFocusCharRects[i].SetEmpty();
+      for (auto& rect : mFocusCharRects) {
+        if (!rect.IsEmpty()) {
+          return true;
+        }
       }
+      return !mRect.IsEmpty();
     }
 
-    bool IsValid() const {
-      return mAnchor != UINT32_MAX && mFocus != UINT32_MAX;
-    }
-    bool Collapsed() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
-      return mFocus == mAnchor;
-    }
-    bool Reversed() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
-      return mFocus < mAnchor;
-    }
-    uint32_t StartOffset() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
-      return Reversed() ? mFocus : mAnchor;
-    }
-    uint32_t EndOffset() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
-      return Reversed() ? mAnchor : mFocus;
-    }
+    bool Collapsed() const { return mFocus == mAnchor; }
+    bool Reversed() const { return mFocus < mAnchor; }
+    uint32_t StartOffset() const { return Reversed() ? mFocus : mAnchor; }
+    uint32_t EndOffset() const { return Reversed() ? mAnchor : mFocus; }
     uint32_t Length() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
       return Reversed() ? mAnchor - mFocus : mFocus - mAnchor;
     }
     LayoutDeviceIntRect StartCharRect() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
       return Reversed() ? mFocusCharRects[eNextCharRect]
                         : mAnchorCharRects[eNextCharRect];
     }
     LayoutDeviceIntRect EndCharRect() const {
-      NS_ASSERTION(IsValid(),
-                   "The caller should check if the selection is valid");
       return Reversed() ? mAnchorCharRects[eNextCharRect]
                         : mFocusCharRects[eNextCharRect];
     }
-  } mSelection;
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Selection& aSelection) {
+      aStream << "{ mAnchor=" << aSelection.mAnchor
+              << ", mFocus=" << aSelection.mFocus
+              << ", mWritingMode=" << ToString(aSelection.mWritingMode).c_str();
+      if (aSelection.HasRects()) {
+        if (aSelection.mAnchor > 0) {
+          aStream << ", mAnchorCharRects[ePrevCharRect]="
+                  << aSelection.mAnchorCharRects[ContentCache::ePrevCharRect];
+        }
+        aStream << ", mAnchorCharRects[eNextCharRect]="
+                << aSelection.mAnchorCharRects[ContentCache::eNextCharRect];
+        if (aSelection.mFocus > 0) {
+          aStream << ", mFocusCharRects[ePrevCharRect]="
+                  << aSelection.mFocusCharRects[ContentCache::ePrevCharRect];
+        }
+        aStream << ", mFocusCharRects[eNextCharRect]="
+                << aSelection.mFocusCharRects[ContentCache::eNextCharRect]
+                << ", mRect=" << aSelection.mRect;
+      }
+      aStream << ", Reversed()=" << (aSelection.Reversed() ? "true" : "false")
+              << ", StartOffset()=" << aSelection.StartOffset()
+              << ", EndOffset()=" << aSelection.EndOffset()
+              << ", Collapsed()=" << (aSelection.Collapsed() ? "true" : "false")
+              << ", Length()=" << aSelection.Length() << " }";
+      return aStream;
+    }
+
+   private:
+    Selection() = default;
+
+    friend struct IPC::ParamTraits<ContentCache::Selection>;
+    friend struct IPC::ParamTraits<Maybe<ContentCache::Selection>>;
+  };
+  Maybe<Selection> mSelection;
 
   bool IsSelectionValid() const {
-    return mSelection.IsValid() && mSelection.EndOffset() <= mText.Length();
+    return mSelection.isSome() && mSelection->EndOffset() <= mText.Length();
   }
 
   // Stores first char rect because Yosemite's Japanese IME sometimes tries
@@ -142,61 +164,52 @@
     uint32_t mOffset;
     LayoutDeviceIntRect mRect;
 
-    Caret() : mOffset(UINT32_MAX) {}
+    explicit Caret(uint32_t aOffset, LayoutDeviceIntRect aCaretRect)
+        : mOffset(aOffset), mRect(aCaretRect) {}
 
-    void Clear() {
-      mOffset = UINT32_MAX;
-      mRect.SetEmpty();
+    uint32_t Offset() const { return mOffset; }
+    bool HasRect() const { return !mRect.IsEmpty(); }
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Caret& aCaret) {
+      aStream << "{ mOffset=" << aCaret.mOffset;
+      if (aCaret.HasRect()) {
+        aStream << ", mRect=" << aCaret.mRect;
+      }
+      return aStream << " }";
     }
 
-    bool IsValid() const { return mOffset != UINT32_MAX; }
+   private:
+    Caret() = default;
 
-    uint32_t Offset() const {
-      NS_ASSERTION(IsValid(), "The caller should check if the caret is valid");
-      return mOffset;
-    }
-  } mCaret;
+    friend struct IPC::ParamTraits<ContentCache::Caret>;
+    friend struct IPC::ParamTraits<Maybe<ContentCache::Caret>>;
+  };
+  Maybe<Caret> mCaret;
 
   struct TextRectArray final {
     uint32_t mStart;
     RectArray mRects;
 
-    TextRectArray() : mStart(UINT32_MAX) {}
-
-    void Clear() {
-      mStart = UINT32_MAX;
-      mRects.Clear();
-    }
+    explicit TextRectArray(uint32_t aStartOffset) : mStart(aStartOffset) {}
 
-    bool IsValid() const {
-      if (mStart == UINT32_MAX) {
-        return false;
-      }
+    bool HasRects() const { return Length() > 0; }
+    uint32_t StartOffset() const { return mStart; }
+    uint32_t EndOffset() const {
       CheckedInt<uint32_t> endOffset =
           CheckedInt<uint32_t>(mStart) + mRects.Length();
-      return endOffset.isValid();
-    }
-    bool HasRects() const { return IsValid() && !mRects.IsEmpty(); }
-    uint32_t StartOffset() const {
-      NS_ASSERTION(IsValid(), "The caller should check if the caret is valid");
-      return mStart;
-    }
-    uint32_t EndOffset() const {
-      NS_ASSERTION(IsValid(), "The caller should check if the caret is valid");
-      if (!IsValid()) {
-        return UINT32_MAX;
-      }
-      return mStart + mRects.Length();
+      return endOffset.isValid() ? endOffset.value() : UINT32_MAX;
     }
-    bool InRange(uint32_t aOffset) const {
-      return IsValid() && StartOffset() <= aOffset && aOffset < EndOffset();
+    uint32_t Length() const { return EndOffset() - mStart; }
+    bool IsOffsetInRange(uint32_t aOffset) const {
+      return StartOffset() <= aOffset && aOffset < EndOffset();
     }
-    bool InRange(uint32_t aOffset, uint32_t aLength) const {
+    bool IsRangeCompletelyInRange(uint32_t aOffset, uint32_t aLength) const {
       CheckedInt<uint32_t> endOffset = CheckedInt<uint32_t>(aOffset) + aLength;
       if (NS_WARN_IF(!endOffset.isValid())) {
         return false;
       }
-      return InRange(aOffset) && aOffset + aLength <= EndOffset();
+      return IsOffsetInRange(aOffset) && aOffset + aLength <= EndOffset();
     }
     bool IsOverlappingWith(uint32_t aOffset, uint32_t aLength) const {
       if (!HasRects() || aOffset == UINT32_MAX || !aLength) {
@@ -212,17 +225,63 @@
     LayoutDeviceIntRect GetUnionRect(uint32_t aOffset, uint32_t aLength) const;
     LayoutDeviceIntRect GetUnionRectAsFarAsPossible(
         uint32_t aOffset, uint32_t aLength, bool aRoundToExistingOffset) const;
-  } mTextRectArray;
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const TextRectArray& aTextRectArray) {
+      aStream << "{ mStart=" << aTextRectArray.mStart
+              << ", mRects={ Length()=" << aTextRectArray.Length();
+      if (aTextRectArray.HasRects()) {
+        aStream << ", Elements()=[ ";
+        static constexpr uint32_t kMaxPrintRects = 4;
+        const uint32_t kFirstHalf = aTextRectArray.Length() <= kMaxPrintRects
+                                        ? UINT32_MAX
+                                        : (kMaxPrintRects + 1) / 2;
+        const uint32_t kSecondHalf =
+            aTextRectArray.Length() <= kMaxPrintRects ? 0 : kMaxPrintRects / 2;
+        for (uint32_t i = 0; i < aTextRectArray.Length(); i++) {
+          if (i > 0) {
+            aStream << ", ";
+          }
+          aStream << ToString(aTextRectArray.mRects[i]).c_str();
+          if (i + 1 == kFirstHalf) {
+            aStream << " ...";
+            i = aTextRectArray.Length() - kSecondHalf - 1;
+          }
+        }
+      }
+      return aStream << " ] } }";
+    }
+
+   private:
+    TextRectArray() = default;
+
+    friend struct IPC::ParamTraits<ContentCache::TextRectArray>;
+    friend struct IPC::ParamTraits<Maybe<ContentCache::TextRectArray>>;
+  };
+  Maybe<TextRectArray> mTextRectArray;
+  Maybe<TextRectArray> mLastCommitStringTextRectArray;
 
   LayoutDeviceIntRect mEditorRect;
 
   friend class ContentCacheInParent;
   friend struct IPC::ParamTraits<ContentCache>;
+  friend struct IPC::ParamTraits<ContentCache::Selection>;
+  friend struct IPC::ParamTraits<ContentCache::Caret>;
+  friend struct IPC::ParamTraits<ContentCache::TextRectArray>;
+  friend std::ostream& operator<<(
+      std::ostream& aStream,
+      const Selection& aSelection);  // For e(Prev|Next)CharRect
 };
 
 class ContentCacheInChild final : public ContentCache {
  public:
-  ContentCacheInChild();
+  ContentCacheInChild() = default;
+
+  /**
+   * Called when composition event will be dispatched in this process from
+   * PuppetWidget.
+   */
+  void OnCompositionEvent(const WidgetCompositionEvent& aCompositionEvent);
 
   /**
    * When IME loses focus, this should be called and making this forget the
@@ -261,6 +320,12 @@
                   const IMENotification* aNotification = nullptr);
   bool CacheTextRects(nsIWidget* aWidget,
                       const IMENotification* aNotification = nullptr);
+
+  // Once composition is committed, all of the commit string may be composed
+  // again by Kakutei-Undo of Japanese IME.  Therefore, we need to keep
+  // storing the last composition start to cache all character rects of the
+  // last commit string.
+  Maybe<OffsetAndData<uint32_t>> mLastCommit;
 };
 
 class ContentCacheInParent final : public ContentCache {
@@ -407,7 +472,7 @@
   uint32_t mPendingEventsNeedingAck;
   // mCompositionStartInChild stores current composition start offset in the
   // remote process.
-  uint32_t mCompositionStartInChild;
+  Maybe<uint32_t> mCompositionStartInChild;
   // mPendingCommitLength is commit string length of the first pending
   // composition.  This is used by relative offset query events when querying
   // new composition start offset.
diff -Nru firefox-84.0.2+build1/widget/EventForwards.h firefox-85.0+build1/widget/EventForwards.h
--- firefox-84.0.2+build1/widget/EventForwards.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/EventForwards.h	2021-01-18 19:58:27.000000000 +0000
@@ -460,6 +460,13 @@
 
 enum class TextRangeType : RawTextRangeType;
 
+// IMEData.h
+
+template <typename IntType>
+class StartAndEndOffsets;
+template <typename IntType>
+class OffsetAndData;
+
 }  // namespace mozilla
 
 #endif  // mozilla_EventForwards_h__
diff -Nru firefox-84.0.2+build1/widget/GfxDriverInfo.cpp firefox-85.0+build1/widget/GfxDriverInfo.cpp
--- firefox-84.0.2+build1/widget/GfxDriverInfo.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/GfxDriverInfo.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -166,6 +166,7 @@
     case DeviceFamily::MicrosoftAll:
     case DeviceFamily::ParallelsAll:
     case DeviceFamily::QualcommAll:
+    case DeviceFamily::AppleAll:
       return nullptr;
     default:
       break;
@@ -645,7 +646,7 @@
       APPEND_DEVICE(0x190a);
       APPEND_DEVICE(0x190e);
 
-      // skylake gt2+
+      // skylake gt2
       APPEND_DEVICE(0x1912);
       APPEND_DEVICE(0x1913);
       APPEND_DEVICE(0x1915);
@@ -656,11 +657,16 @@
       APPEND_DEVICE(0x191d);
       APPEND_DEVICE(0x191e);
       APPEND_DEVICE(0x1921);
+
+      // skylake gt3
       APPEND_DEVICE(0x1923);
       APPEND_DEVICE(0x1926);
       APPEND_DEVICE(0x1927);
       APPEND_DEVICE(0x192b);
+
+      // skylake gt4
       APPEND_DEVICE(0x1932);
+      APPEND_DEVICE(0x193a);
       APPEND_DEVICE(0x193b);
       APPEND_DEVICE(0x193d);
 
@@ -766,7 +772,6 @@
       // Carrizo
       APPEND_RANGE(0x9870, 0x9877);
 
-#ifdef EARLY_BETA_OR_EARLIER
       // Kaveri
       APPEND_RANGE(0x1304, 0x131d);
 
@@ -774,7 +779,6 @@
       APPEND_RANGE(0x9440, 0x949f);
       APPEND_RANGE(0x94a0, 0x94b9);
       APPEND_RANGE(0x9540, 0x955f);
-#endif
 
       break;
     // This should never happen, but we get a warning if we don't handle this.
@@ -786,6 +790,7 @@
     case DeviceFamily::MicrosoftAll:
     case DeviceFamily::ParallelsAll:
     case DeviceFamily::QualcommAll:
+    case DeviceFamily::AppleAll:
       NS_WARNING("Invalid DeviceFamily id");
       break;
   }
@@ -927,6 +932,9 @@
     case DeviceFamily::ParallelsAll:
       vendor = DeviceVendor::Parallels;
       break;
+    case DeviceFamily::AppleAll:
+      vendor = DeviceVendor::Apple;
+      break;
     case DeviceFamily::QualcommAll:
       // Choose an arbitrary Qualcomm PCI VENdor ID for now.
       // TODO: This should be "QCOM" when Windows device ID parsing is reworked.
@@ -964,6 +972,7 @@
     DECLARE_VENDOR_ID(Parallels, "0x1ab8");
     DECLARE_VENDOR_ID(VMWare, "0x15ad");
     DECLARE_VENDOR_ID(VirtualBox, "0x80ee");
+    DECLARE_VENDOR_ID(Apple, "0x106b");
     // Choose an arbitrary Qualcomm PCI VENdor ID for now.
     // TODO: This should be "QCOM" when Windows device ID parsing is reworked.
     DECLARE_VENDOR_ID(Qualcomm, "0x5143");
@@ -1001,6 +1010,8 @@
     DECLARE_DRIVER_VENDOR_ID(MesaUnknown, "mesa/unknown");
     DECLARE_DRIVER_VENDOR_ID(MesaNouveau, "mesa/nouveau");
     DECLARE_DRIVER_VENDOR_ID(NonMesaAll, "non-mesa/all");
+    DECLARE_DRIVER_VENDOR_ID(HardwareMesaAll, "mesa/hw-all");
+    DECLARE_DRIVER_VENDOR_ID(SoftwareMesaAll, "mesa/sw-all");
     case DriverVendor::Max:  // Suppress a warning.
       DECLARE_DRIVER_VENDOR_ID(All, "");
   }
diff -Nru firefox-84.0.2+build1/widget/GfxDriverInfo.h firefox-85.0+build1/widget/GfxDriverInfo.h
--- firefox-84.0.2+build1/widget/GfxDriverInfo.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/GfxDriverInfo.h	2021-01-18 19:58:27.000000000 +0000
@@ -171,6 +171,7 @@
   MicrosoftAll,
   ParallelsAll,
   QualcommAll,
+  AppleAll,
   IntelGMA500,
   IntelGMA900,
   IntelGMA950,
@@ -216,6 +217,7 @@
   Qualcomm,
   MicrosoftBasic,
   MicrosoftHyperV,
+  Apple,
 
   Max
 };
@@ -236,6 +238,10 @@
   MesaUnknown,
   // Wildcard for all non-Mesa drivers.
   NonMesaAll,
+  // Wildcard for all hardware Mesa drivers.
+  HardwareMesaAll,
+  // Wildcard for all software Mesa drivers.
+  SoftwareMesaAll,
 
   Max
 };
diff -Nru firefox-84.0.2+build1/widget/GfxInfoBase.cpp firefox-85.0+build1/widget/GfxInfoBase.cpp
--- firefox-84.0.2+build1/widget/GfxInfoBase.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/GfxInfoBase.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -304,45 +304,48 @@
 }
 
 static OperatingSystem BlocklistOSToOperatingSystem(const nsAString& os) {
-  if (os.EqualsLiteral("WINNT 6.1"))
+  if (os.EqualsLiteral("WINNT 6.1")) {
     return OperatingSystem::Windows7;
-  else if (os.EqualsLiteral("WINNT 6.2"))
+  } else if (os.EqualsLiteral("WINNT 6.2")) {
     return OperatingSystem::Windows8;
-  else if (os.EqualsLiteral("WINNT 6.3"))
+  } else if (os.EqualsLiteral("WINNT 6.3")) {
     return OperatingSystem::Windows8_1;
-  else if (os.EqualsLiteral("WINNT 10.0"))
+  } else if (os.EqualsLiteral("WINNT 10.0")) {
     return OperatingSystem::Windows10;
-  else if (os.EqualsLiteral("Linux"))
+  } else if (os.EqualsLiteral("Linux")) {
     return OperatingSystem::Linux;
-  else if (os.EqualsLiteral("Darwin 9"))
+  } else if (os.EqualsLiteral("Darwin 9")) {
     return OperatingSystem::OSX10_5;
-  else if (os.EqualsLiteral("Darwin 10"))
+  } else if (os.EqualsLiteral("Darwin 10")) {
     return OperatingSystem::OSX10_6;
-  else if (os.EqualsLiteral("Darwin 11"))
+  } else if (os.EqualsLiteral("Darwin 11")) {
     return OperatingSystem::OSX10_7;
-  else if (os.EqualsLiteral("Darwin 12"))
+  } else if (os.EqualsLiteral("Darwin 12")) {
     return OperatingSystem::OSX10_8;
-  else if (os.EqualsLiteral("Darwin 13"))
+  } else if (os.EqualsLiteral("Darwin 13")) {
     return OperatingSystem::OSX10_9;
-  else if (os.EqualsLiteral("Darwin 14"))
+  } else if (os.EqualsLiteral("Darwin 14")) {
     return OperatingSystem::OSX10_10;
-  else if (os.EqualsLiteral("Darwin 15"))
+  } else if (os.EqualsLiteral("Darwin 15")) {
     return OperatingSystem::OSX10_11;
-  else if (os.EqualsLiteral("Darwin 16"))
+  } else if (os.EqualsLiteral("Darwin 16")) {
     return OperatingSystem::OSX10_12;
-  else if (os.EqualsLiteral("Darwin 17"))
+  } else if (os.EqualsLiteral("Darwin 17")) {
     return OperatingSystem::OSX10_13;
-  else if (os.EqualsLiteral("Darwin 18"))
+  } else if (os.EqualsLiteral("Darwin 18")) {
     return OperatingSystem::OSX10_14;
-  else if (os.EqualsLiteral("Darwin 19"))
+  } else if (os.EqualsLiteral("Darwin 19")) {
     return OperatingSystem::OSX10_15;
-  else if (os.EqualsLiteral("Darwin 20"))
+  } else if (os.EqualsLiteral("Darwin 20")) {
     return OperatingSystem::OSX11_0;
-  else if (os.EqualsLiteral("Android"))
+  } else if (os.EqualsLiteral("Android")) {
     return OperatingSystem::Android;
   // For historical reasons, "All" in blocklist means "All Windows"
-  else if (os.EqualsLiteral("All"))
+  } else if (os.EqualsLiteral("All")) {
     return OperatingSystem::Windows;
+  } else if (os.EqualsLiteral("Darwin")) {
+    return OperatingSystem::OSX;
+  }
 
   return OperatingSystem::Unknown;
 }
diff -Nru firefox-84.0.2+build1/widget/GfxInfoX11.cpp firefox-85.0+build1/widget/GfxInfoX11.cpp
--- firefox-84.0.2+build1/widget/GfxInfoX11.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/GfxInfoX11.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,10 +14,12 @@
 #include <cctype>
 #include "nsCRTGlue.h"
 #include "nsExceptionHandler.h"
+#include "nsUnicharUtils.h"
 #include "prenv.h"
 #include "nsPrintfCString.h"
 #include "nsWhitespaceTokenizer.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/gfx/Logging.h"
 
 #include "GfxInfoX11.h"
 
@@ -27,6 +29,7 @@
 #  include "mozilla/widget/DMABufLibWrapper.h"
 #endif
 
+#define EXIT_STATUS_BUFFER_TOO_SMALL 2
 #ifdef DEBUG
 bool fire_glxtest_process();
 #endif
@@ -50,6 +53,8 @@
   mIsWayland = false;
   mIsWaylandDRM = false;
   mIsXWayland = false;
+  mHasMultipleGPUs = false;
+  mGlxTestError = false;
   return GfxInfoBase::Init();
 }
 
@@ -68,6 +73,18 @@
                                      mIsWaylandDRM);
   CrashReporter::AnnotateCrashReport(
       CrashReporter::Annotation::DesktopEnvironment, mDesktopEnvironment);
+
+  if (mHasMultipleGPUs) {
+    nsAutoCString note;
+    note.AppendLiteral("Has dual GPUs.");
+    if (!mSecondaryVendorId.IsEmpty()) {
+      note.AppendLiteral(" GPU #2: AdapterVendorID2: ");
+      note.Append(mSecondaryVendorId);
+      note.AppendLiteral(", AdapterDeviceID2: ");
+      note.Append(mSecondaryDeviceId);
+    }
+    CrashReporter::AppendAppNotesToCrashReport(note);
+  }
 }
 
 void GfxInfo::GetData() {
@@ -79,7 +96,7 @@
   // if glxtest_pipe == -1, that means that we already read the information
   if (glxtest_pipe == -1) return;
 
-  enum { buf_size = 1024 };
+  enum { buf_size = 2048 };
   char buf[buf_size];
   ssize_t bytesread = read(glxtest_pipe, &buf,
                            buf_size - 1);  // -1 because we'll append a zero
@@ -89,7 +106,11 @@
   // bytesread < 0 would mean that the above read() call failed.
   // This should never happen. If it did, the outcome would be to blocklist
   // anyway.
-  if (bytesread < 0) bytesread = 0;
+  if (bytesread < 0) {
+    bytesread = 0;
+  } else if (bytesread == buf_size - 1) {
+    gfxCriticalNote << "glxtest: read from pipe exceeded buffer size";
+  }
 
   // let buf be a zero-terminated string
   buf[bytesread] = 0;
@@ -118,14 +139,19 @@
     }
   }
 
-  bool exited_with_error_code = !waiting_for_glxtest_process_failed &&
-                                WIFEXITED(glxtest_status) &&
-                                WEXITSTATUS(glxtest_status) != EXIT_SUCCESS;
+  int exit_code = EXIT_FAILURE;
+  bool exited_with_error_code = false;
+  if (!waiting_for_glxtest_process_failed && WIFEXITED(glxtest_status)) {
+    exit_code = WEXITSTATUS(glxtest_status);
+    exited_with_error_code = exit_code != EXIT_SUCCESS;
+  }
+
   bool received_signal =
       !waiting_for_glxtest_process_failed && WIFSIGNALED(glxtest_status);
 
   bool error = waiting_for_glxtest_process_failed || exited_with_error_code ||
                received_signal;
+  bool errorLog = false;
 
   nsCString glVendor;
   nsCString glRenderer;
@@ -141,39 +167,60 @@
   nsCString screenInfo;
   nsCString adapterRam;
 
+  AutoTArray<nsCString, 2> pciVendors;
+  AutoTArray<nsCString, 2> pciDevices;
+
   nsCString* stringToFill = nullptr;
+  bool logString = false;
 
   char* bufptr = buf;
-  if (!error) {
-    while (true) {
-      char* line = NS_strtok("\n", &bufptr);
-      if (!line) break;
-      if (stringToFill) {
-        stringToFill->Assign(line);
-        stringToFill = nullptr;
-      } else if (!strcmp(line, "VENDOR"))
-        stringToFill = &glVendor;
-      else if (!strcmp(line, "RENDERER"))
-        stringToFill = &glRenderer;
-      else if (!strcmp(line, "VERSION"))
-        stringToFill = &glVersion;
-      else if (!strcmp(line, "TFP"))
-        stringToFill = &textureFromPixmap;
-      else if (!strcmp(line, "MESA_VENDOR_ID"))
-        stringToFill = &mesaVendor;
-      else if (!strcmp(line, "MESA_DEVICE_ID"))
-        stringToFill = &mesaDevice;
-      else if (!strcmp(line, "MESA_ACCELERATED"))
-        stringToFill = &mesaAccelerated;
-      else if (!strcmp(line, "MESA_VRAM"))
-        stringToFill = &adapterRam;
-      else if (!strcmp(line, "DRI_DRIVER"))
-        stringToFill = &driDriver;
-      else if (!strcmp(line, "SCREEN_INFO"))
-        stringToFill = &screenInfo;
+  while (true) {
+    char* line = NS_strtok("\n", &bufptr);
+    if (!line) break;
+    if (stringToFill) {
+      stringToFill->Assign(line);
+      stringToFill = nullptr;
+    } else if (logString) {
+      gfxCriticalNote << "glxtest: " << line;
+      logString = false;
+    } else if (!strcmp(line, "VENDOR")) {
+      stringToFill = &glVendor;
+    } else if (!strcmp(line, "RENDERER")) {
+      stringToFill = &glRenderer;
+    } else if (!strcmp(line, "VERSION")) {
+      stringToFill = &glVersion;
+    } else if (!strcmp(line, "TFP")) {
+      stringToFill = &textureFromPixmap;
+    } else if (!strcmp(line, "MESA_VENDOR_ID")) {
+      stringToFill = &mesaVendor;
+    } else if (!strcmp(line, "MESA_DEVICE_ID")) {
+      stringToFill = &mesaDevice;
+    } else if (!strcmp(line, "MESA_ACCELERATED")) {
+      stringToFill = &mesaAccelerated;
+    } else if (!strcmp(line, "MESA_VRAM")) {
+      stringToFill = &adapterRam;
+    } else if (!strcmp(line, "DRI_DRIVER")) {
+      stringToFill = &driDriver;
+    } else if (!strcmp(line, "SCREEN_INFO")) {
+      stringToFill = &screenInfo;
+    } else if (!strcmp(line, "PCI_VENDOR_ID")) {
+      stringToFill = pciVendors.AppendElement();
+    } else if (!strcmp(line, "PCI_DEVICE_ID")) {
+      stringToFill = pciDevices.AppendElement();
+    } else if (!strcmp(line, "WARNING")) {
+      logString = true;
+    } else if (!strcmp(line, "ERROR")) {
+      logString = true;
+      errorLog = true;
     }
   }
 
+  MOZ_ASSERT(pciDevices.Length() == pciVendors.Length(),
+             "Missing PCI vendors/devices");
+
+  size_t pciLen = std::min(pciVendors.Length(), pciDevices.Length());
+  mHasMultipleGPUs = pciLen > 1;
+
   if (!strcmp(textureFromPixmap.get(), "TRUE")) mHasTextureFromPixmap = true;
 
   // only useful for Linux kernel version check for FGLRX driver.
@@ -195,29 +242,6 @@
   const char* spoofedOSRelease = PR_GetEnv("MOZ_GFX_SPOOF_OS_RELEASE");
   if (spoofedOSRelease) mOSRelease.Assign(spoofedOSRelease);
 
-  if (error || glVendor.IsEmpty() || glRenderer.IsEmpty() ||
-      glVersion.IsEmpty() || mOS.IsEmpty() || mOSRelease.IsEmpty()) {
-    mAdapterDescription.AppendLiteral("GLXtest process failed");
-    if (waiting_for_glxtest_process_failed)
-      mAdapterDescription.AppendPrintf(
-          " (waitpid failed with errno=%d for pid %d)", waitpid_errno,
-          glxtest_pid);
-    if (exited_with_error_code)
-      mAdapterDescription.AppendPrintf(" (exited with status %d)",
-                                       WEXITSTATUS(glxtest_status));
-    if (received_signal)
-      mAdapterDescription.AppendPrintf(" (received signal %d)",
-                                       WTERMSIG(glxtest_status));
-    if (bytesread) {
-      mAdapterDescription.AppendLiteral(": ");
-      mAdapterDescription.Append(nsDependentCString(buf));
-      mAdapterDescription.Append('\n');
-    }
-
-    CrashReporter::AppendAppNotesToCrashReport(mAdapterDescription);
-    return;
-  }
-
   // Scan the GL_VERSION string for the GL and driver versions.
   nsCWhitespaceTokenizer tokenizer(glVersion);
   while (tokenizer.hasMoreTokens()) {
@@ -239,7 +263,6 @@
 
   if (mGLMajorVersion == 0) {
     NS_WARNING("Failed to parse GL version!");
-    return;
   }
 
   // Mesa always exposes itself in the GL_VERSION string, but not always the
@@ -328,6 +351,102 @@
     mAdapterRAM = (uint32_t)atoi(adapterRam.get());
   }
 
+  // If we have the DRI driver, we can derive the vendor ID from that if needed.
+  if (mVendorId.IsEmpty() && !driDriver.IsEmpty()) {
+    const char* nvidiaDrivers[] = {"nouveau", "tegra", nullptr};
+    for (size_t i = 0; nvidiaDrivers[i]; ++i) {
+      if (driDriver.Equals(nvidiaDrivers[i])) {
+        CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(DeviceVendor::NVIDIA),
+                        mVendorId);
+        break;
+      }
+    }
+
+    if (mVendorId.IsEmpty()) {
+      const char* intelDrivers[] = {"iris", "i915",  "i965",
+                                    "i810", "intel", nullptr};
+      for (size_t i = 0; intelDrivers[i]; ++i) {
+        if (driDriver.Equals(intelDrivers[i])) {
+          CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(DeviceVendor::Intel),
+                          mVendorId);
+          break;
+        }
+      }
+    }
+
+    if (mVendorId.IsEmpty()) {
+      const char* amdDrivers[] = {"r600",   "r200",     "r100",
+                                  "radeon", "radeonsi", nullptr};
+      for (size_t i = 0; amdDrivers[i]; ++i) {
+        if (driDriver.Equals(amdDrivers[i])) {
+          CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(DeviceVendor::ATI),
+                          mVendorId);
+          break;
+        }
+      }
+    }
+
+    if (mVendorId.IsEmpty()) {
+      if (driDriver.EqualsLiteral("freedreno")) {
+        CopyUTF16toUTF8(GfxDriverInfo::GetDeviceVendor(DeviceVendor::Qualcomm),
+                        mVendorId);
+      }
+    }
+  }
+
+  // If we still don't have a vendor ID, we can try the PCI vendor list.
+  if (mVendorId.IsEmpty()) {
+    if (pciVendors.Length() == 1) {
+      mVendorId = pciVendors[0];
+    } else if (pciVendors.IsEmpty()) {
+      gfxCriticalNote << "No GPUs detected via PCI";
+    } else {
+      gfxCriticalNote
+          << "More than 1 GPU detected via PCI, cannot deduce vendor";
+    }
+  }
+
+  // If we know the vendor ID, but didn't get a device ID, we can guess from the
+  // PCI device list.
+  if (mDeviceId.IsEmpty() && !mVendorId.IsEmpty()) {
+    for (size_t i = 0; i < pciLen; ++i) {
+      if (mVendorId.Equals(pciVendors[i])) {
+        if (mDeviceId.IsEmpty()) {
+          mDeviceId = pciDevices[i];
+        } else {
+          gfxCriticalNote << "More than 1 GPU from same vendor detected via "
+                             "PCI, cannot deduce device";
+          mDeviceId.Truncate();
+          break;
+        }
+      }
+    }
+  }
+
+  // Assuming we know the vendor, we should check for a secondary card.
+  if (!mVendorId.IsEmpty()) {
+    if (pciLen > 2) {
+      gfxCriticalNote
+          << "More than 2 GPUs detected via PCI, secondary GPU is arbitrary";
+    }
+    for (size_t i = 0; i < pciLen; ++i) {
+      if (!mVendorId.Equals(pciVendors[i]) ||
+          (!mDeviceId.IsEmpty() && !mDeviceId.Equals(pciDevices[i]))) {
+        mSecondaryVendorId = pciVendors[i];
+        mSecondaryDeviceId = pciDevices[i];
+        break;
+      }
+    }
+  }
+
+  // If we couldn't choose, log them.
+  if (mVendorId.IsEmpty()) {
+    for (size_t i = 0; i < pciLen; ++i) {
+      gfxCriticalNote << "PCI candidate " << pciVendors[i].get() << "/"
+                      << pciDevices[i].get();
+    }
+  }
+
   // Fallback to GL_VENDOR and GL_RENDERER.
   if (mVendorId.IsEmpty()) {
     mVendorId.Assign(glVendor.get());
@@ -463,6 +582,38 @@
     }
   }
 
+  if (error || errorLog) {
+    if (!mAdapterDescription.IsEmpty()) {
+      mAdapterDescription.AppendLiteral(" (See failure log)");
+    } else {
+      mAdapterDescription.AppendLiteral("See failure log");
+    }
+
+    mGlxTestError = true;
+  }
+
+  if (error) {
+    nsAutoCString msg("glxtest: process failed");
+    if (waiting_for_glxtest_process_failed) {
+      msg.AppendPrintf(" (waitpid failed with errno=%d for pid %d)",
+                       waitpid_errno, glxtest_pid);
+    }
+
+    if (exited_with_error_code) {
+      if (exit_code == EXIT_STATUS_BUFFER_TOO_SMALL) {
+        msg.AppendLiteral(" (buffer too small)");
+      } else {
+        msg.AppendPrintf(" (exited with status %d)",
+                         WEXITSTATUS(glxtest_status));
+      }
+    }
+    if (received_signal) {
+      msg.AppendPrintf(" (received signal %d)", WTERMSIG(glxtest_status));
+    }
+
+    gfxCriticalNote << msg.get();
+  }
+
   AddCrashReportAnnotations();
 }
 
@@ -547,12 +698,20 @@
 
     // Intel Mesa baseline, chosen arbitrarily.
     APPEND_TO_DRIVER_BLOCKLIST_EXT(
-        OperatingSystem::Linux, ScreenSizeStatus::SmallAndMedium,
-        BatteryStatus::All, DesktopEnvironment::GNOME, WindowProtocol::X11,
+        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+        DesktopEnvironment::GNOME, WindowProtocol::X11, DriverVendor::MesaAll,
+        DeviceFamily::IntelRolloutWebRender, nsIGfxInfo::FEATURE_WEBRENDER,
+        nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_GREATER_THAN_OR_EQUAL,
+        V(18, 0, 0, 0), "FEATURE_ROLLOUT_INTEL_GNOME_X11_MESA",
+        "Mesa 18.0.0.0");
+
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+        DesktopEnvironment::GNOME, WindowProtocol::Wayland,
         DriverVendor::MesaAll, DeviceFamily::IntelRolloutWebRender,
         nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
         DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0),
-        "FEATURE_ROLLOUT_INTEL_GNOME_X11_MESA", "Mesa 18.0.0.0");
+        "FEATURE_ROLLOUT_INTEL_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0");
 
     // ATI Mesa baseline, chosen arbitrarily.
     APPEND_TO_DRIVER_BLOCKLIST_EXT(
@@ -562,6 +721,14 @@
         nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_GREATER_THAN_OR_EQUAL,
         V(18, 0, 0, 0), "FEATURE_ROLLOUT_ATI_GNOME_X11_MESA", "Mesa 18.0.0.0");
 
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
+        DesktopEnvironment::GNOME, WindowProtocol::Wayland,
+        DriverVendor::MesaAll, DeviceFamily::AtiRolloutWebRender,
+        nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
+        DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0),
+        "FEATURE_ROLLOUT_ATI_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0");
+
 #ifdef EARLY_BETA_OR_EARLIER
     // Intel Mesa baseline, chosen arbitrarily.
     APPEND_TO_DRIVER_BLOCKLIST_EXT(
@@ -608,6 +775,28 @@
 #endif
 
     ////////////////////////////////////
+    // FEATURE_WEBRENDER_SOFTWARE - ALLOWLIST
+#ifdef NIGHTLY_BUILD
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::SmallAndMedium,
+        BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All,
+        DriverVendor::NonMesaAll, DeviceFamily::All,
+        nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
+        nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED,
+        V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_NON_MESA_S_M_SCRN",
+        "");
+
+    APPEND_TO_DRIVER_BLOCKLIST_EXT(
+        OperatingSystem::Linux, ScreenSizeStatus::SmallAndMedium,
+        BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All,
+        DriverVendor::HardwareMesaAll, DeviceFamily::All,
+        nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
+        nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED,
+        V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_HW_MESA_S_M_SCRN",
+        "");
+#endif
+
+    ////////////////////////////////////
 
     APPEND_TO_DRIVER_BLOCKLIST_EXT(
         OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All,
@@ -639,10 +828,24 @@
 
 bool GfxInfo::DoesDriverVendorMatch(const nsAString& aBlocklistVendor,
                                     const nsAString& aDriverVendor) {
-  if (mIsMesa && aBlocklistVendor.Equals(
-                     GfxDriverInfo::GetDriverVendor(DriverVendor::MesaAll),
-                     nsCaseInsensitiveStringComparator)) {
-    return true;
+  if (mIsMesa) {
+    if (aBlocklistVendor.Equals(
+            GfxDriverInfo::GetDriverVendor(DriverVendor::MesaAll),
+            nsCaseInsensitiveStringComparator)) {
+      return true;
+    }
+    if (mIsAccelerated &&
+        aBlocklistVendor.Equals(
+            GfxDriverInfo::GetDriverVendor(DriverVendor::HardwareMesaAll),
+            nsCaseInsensitiveStringComparator)) {
+      return true;
+    }
+    if (!mIsAccelerated &&
+        aBlocklistVendor.Equals(
+            GfxDriverInfo::GetDriverVendor(DriverVendor::SoftwareMesaAll),
+            nsCaseInsensitiveStringComparator)) {
+      return true;
+    }
   }
   if (!mIsMesa && aBlocklistVendor.Equals(
                       GfxDriverInfo::GetDriverVendor(DriverVendor::NonMesaAll),
@@ -670,8 +873,8 @@
 
   GetData();
 
-  if (mGLMajorVersion == 0) {
-    // If we failed to get a GL version, glxtest failed.
+  if (mGlxTestError) {
+    // If glxtest failed, block all features by default.
     *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
     aFailureId = "FEATURE_FAILURE_GLXTEST_FAILED";
     return NS_OK;
@@ -830,7 +1033,9 @@
 
 NS_IMETHODIMP
 GfxInfo::GetAdapterVendorID2(nsAString& aAdapterVendorID) {
-  return NS_ERROR_FAILURE;
+  GetData();
+  CopyUTF8toUTF16(mSecondaryVendorId, aAdapterVendorID);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -842,7 +1047,9 @@
 
 NS_IMETHODIMP
 GfxInfo::GetAdapterDeviceID2(nsAString& aAdapterDeviceID) {
-  return NS_ERROR_FAILURE;
+  GetData();
+  CopyUTF8toUTF16(mSecondaryDeviceId, aAdapterDeviceID);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -886,7 +1093,11 @@
 }
 
 NS_IMETHODIMP
-GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) { return NS_ERROR_FAILURE; }
+GfxInfo::GetIsGPU2Active(bool* aIsGPU2Active) {
+  // This is never the case, as the active GPU should be the primary GPU.
+  *aIsGPU2Active = false;
+  return NS_OK;
+}
 
 #ifdef DEBUG
 
diff -Nru firefox-84.0.2+build1/widget/GfxInfoX11.h firefox-85.0+build1/widget/GfxInfoX11.h
--- firefox-84.0.2+build1/widget/GfxInfoX11.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/GfxInfoX11.h	2021-01-18 19:58:27.000000000 +0000
@@ -89,6 +89,9 @@
   nsCString mOSRelease;
   nsAutoCStringN<16> mDesktopEnvironment;
 
+  nsCString mSecondaryVendorId;
+  nsCString mSecondaryDeviceId;
+
   struct ScreenInfo {
     uint32_t mWidth;
     uint32_t mHeight;
@@ -103,6 +106,8 @@
   bool mIsWayland;
   bool mIsWaylandDRM;
   bool mIsXWayland;
+  bool mHasMultipleGPUs;
+  bool mGlxTestError;
 
   void AddCrashReportAnnotations();
 };
diff -Nru firefox-84.0.2+build1/widget/gtk/DMABufSurface.cpp firefox-85.0+build1/widget/gtk/DMABufSurface.cpp
--- firefox-84.0.2+build1/widget/gtk/DMABufSurface.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/DMABufSurface.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -29,6 +29,7 @@
 #include "ScopedGLHelpers.h"
 
 #include "mozilla/layers/LayersSurfaces.h"
+#include "mozilla/ScopeExit.h"
 
 /*
 TODO:
diff -Nru firefox-84.0.2+build1/widget/gtk/DMABufSurface.h firefox-85.0+build1/widget/gtk/DMABufSurface.h
--- firefox-84.0.2+build1/widget/gtk/DMABufSurface.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/DMABufSurface.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,10 +8,9 @@
 #define DMABufSurface_h__
 
 #include <stdint.h>
-#include "GLContext.h"
-#include "GLContextTypes.h"
 #include "mozilla/widget/nsWaylandDisplay.h"
 #include "mozilla/widget/va_drmcommon.h"
+#include "GLTypes.h"
 
 typedef void* EGLImageKHR;
 typedef void* EGLSyncKHR;
@@ -23,6 +22,9 @@
 class SurfaceDescriptor;
 class SurfaceDescriptorDMABuf;
 }  // namespace layers
+namespace gl {
+class GLContext;
+}
 }  // namespace mozilla
 
 typedef enum {
diff -Nru firefox-84.0.2+build1/widget/gtk/gtk3drawing.cpp firefox-85.0+build1/widget/gtk/gtk3drawing.cpp
--- firefox-84.0.2+build1/widget/gtk/gtk3drawing.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/gtk3drawing.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1203,10 +1203,9 @@
   // has focus, but perhaps this may help identify a focused textarea with
   // some themes as GtkTextView backgrounds do not typically render
   // differently with focus.
-  GtkStateFlags state_flags =
-      state->disabled
-          ? GTK_STATE_FLAG_INSENSITIVE
-          : state->focused ? GTK_STATE_FLAG_FOCUSED : GTK_STATE_FLAG_NORMAL;
+  GtkStateFlags state_flags = state->disabled  ? GTK_STATE_FLAG_INSENSITIVE
+                              : state->focused ? GTK_STATE_FLAG_FOCUSED
+                                               : GTK_STATE_FLAG_NORMAL;
 
   GtkStyleContext* style_frame = GetStyleContext(
       MOZ_GTK_SCROLLED_WINDOW, state->scale, direction, state_flags);
diff -Nru firefox-84.0.2+build1/widget/gtk/IMContextWrapper.cpp firefox-85.0+build1/widget/gtk/IMContextWrapper.cpp
--- firefox-84.0.2+build1/widget/gtk/IMContextWrapper.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/IMContextWrapper.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/ToString.h"
 #include "WritingModes.h"
 
 namespace mozilla {
@@ -2784,25 +2785,27 @@
     return;
   }
 
-  WidgetQueryContentEvent charRect(
+  WidgetQueryContentEvent queryCaretOrTextRectEvent(
       true, useCaret ? eQueryCaretRect : eQueryTextRect, mLastFocusedWindow);
   if (useCaret) {
-    charRect.InitForQueryCaretRect(mSelection.mOffset);
+    queryCaretOrTextRectEvent.InitForQueryCaretRect(mSelection.mOffset);
   } else {
     if (mSelection.mWritingMode.IsVertical()) {
       // For preventing the candidate window to overlap the target
       // clause, we should set fake (typically, very tall) caret rect.
       uint32_t length =
           mCompositionTargetRange.mLength ? mCompositionTargetRange.mLength : 1;
-      charRect.InitForQueryTextRect(mCompositionTargetRange.mOffset, length);
+      queryCaretOrTextRectEvent.InitForQueryTextRect(
+          mCompositionTargetRange.mOffset, length);
     } else {
-      charRect.InitForQueryTextRect(mCompositionTargetRange.mOffset, 1);
+      queryCaretOrTextRectEvent.InitForQueryTextRect(
+          mCompositionTargetRange.mOffset, 1);
     }
   }
-  InitEvent(charRect);
+  InitEvent(queryCaretOrTextRectEvent);
   nsEventStatus status;
-  mLastFocusedWindow->DispatchEvent(&charRect, status);
-  if (!charRect.mSucceeded) {
+  mLastFocusedWindow->DispatchEvent(&queryCaretOrTextRectEvent, status);
+  if (queryCaretOrTextRectEvent.Failed()) {
     MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("0x%p   SetCursorPosition(), FAILED, %s was failed", this,
              useCaret ? "eQueryCaretRect" : "eQueryTextRect"));
@@ -2819,7 +2822,8 @@
   LayoutDeviceIntPoint owner = mOwnerWindow->WidgetToScreenOffset();
 
   // Compute the caret position in the IM owner window.
-  LayoutDeviceIntRect rect = charRect.mReply.mRect + root - owner;
+  LayoutDeviceIntRect rect =
+      queryCaretOrTextRectEvent.mReply->mRect + root - owner;
   rect.width = 0;
   GdkRectangle area = rootWindow->DevicePixelsToGdkRectRoundOut(rect);
 
@@ -2882,20 +2886,22 @@
                                                 mLastFocusedWindow);
   queryTextContentEvent.InitForQueryTextContent(0, UINT32_MAX);
   mLastFocusedWindow->DispatchEvent(&queryTextContentEvent, status);
-  NS_ENSURE_TRUE(queryTextContentEvent.mSucceeded, NS_ERROR_FAILURE);
+  if (NS_WARN_IF(queryTextContentEvent.Failed())) {
+    return NS_ERROR_FAILURE;
+  }
 
-  nsAutoString textContent(queryTextContentEvent.mReply.mString);
-  if (selOffset + selLength > textContent.Length()) {
+  if (selOffset + selLength > queryTextContentEvent.mReply->DataLength()) {
     MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("0x%p   GetCurrentParagraph(), FAILED, The selection is "
-             "invalid, textContent.Length()=%u",
-             this, textContent.Length()));
+             "invalid, queryTextContentEvent={ mReply=%s }",
+             this, ToString(queryTextContentEvent.mReply).c_str()));
     return NS_ERROR_FAILURE;
   }
 
   // Remove composing string and restore the selected string because
   // GtkEntry doesn't remove selected string until committing, however,
   // our editor does it.  We should emulate the behavior for IME.
+  nsAutoString textContent(queryTextContentEvent.mReply->DataRef());
   if (EditorHasCompositionString() &&
       mDispatchedCompositionString != mSelectedStringRemovedByComposition) {
     textContent.Replace(mCompositionStart,
@@ -2976,15 +2982,17 @@
                                                 mLastFocusedWindow);
   queryTextContentEvent.InitForQueryTextContent(0, UINT32_MAX);
   mLastFocusedWindow->DispatchEvent(&queryTextContentEvent, status);
-  NS_ENSURE_TRUE(queryTextContentEvent.mSucceeded, NS_ERROR_FAILURE);
-  if (queryTextContentEvent.mReply.mString.IsEmpty()) {
+  if (NS_WARN_IF(queryTextContentEvent.Failed())) {
+    return NS_ERROR_FAILURE;
+  }
+  if (queryTextContentEvent.mReply->IsDataEmpty()) {
     MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("0x%p   DeleteText(), FAILED, there is no contents", this));
     return NS_ERROR_FAILURE;
   }
 
-  NS_ConvertUTF16toUTF8 utf8Str(
-      nsDependentSubstring(queryTextContentEvent.mReply.mString, 0, selOffset));
+  NS_ConvertUTF16toUTF8 utf8Str(nsDependentSubstring(
+      queryTextContentEvent.mReply->DataRef(), 0, selOffset));
   glong offsetInUTF8Characters =
       g_utf8_strlen(utf8Str.get(), utf8Str.Length()) + aOffset;
   if (offsetInUTF8Characters < 0) {
@@ -2996,7 +3004,7 @@
   }
 
   AppendUTF16toUTF8(
-      nsDependentSubstring(queryTextContentEvent.mReply.mString, selOffset),
+      nsDependentSubstring(queryTextContentEvent.mReply->DataRef(), selOffset),
       utf8Str);
   glong countOfCharactersInUTF8 =
       g_utf8_strlen(utf8Str.get(), utf8Str.Length());
@@ -3116,11 +3124,11 @@
   }
 
   nsEventStatus status;
-  WidgetQueryContentEvent selection(true, eQuerySelectedText,
-                                    mLastFocusedWindow);
-  InitEvent(selection);
-  mLastFocusedWindow->DispatchEvent(&selection, status);
-  if (NS_WARN_IF(!selection.mSucceeded)) {
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 mLastFocusedWindow);
+  InitEvent(querySelectedTextEvent);
+  mLastFocusedWindow->DispatchEvent(&querySelectedTextEvent, status);
+  if (NS_WARN_IF(querySelectedTextEvent.Failed())) {
     MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("0x%p EnsureToCacheSelection(), FAILED, due to "
              "failure of query selection event",
@@ -3128,7 +3136,7 @@
     return false;
   }
 
-  mSelection.Assign(selection);
+  mSelection.Assign(querySelectedTextEvent);
   if (!mSelection.IsValid()) {
     MOZ_LOG(gGtkIMLog, LogLevel::Error,
             ("0x%p EnsureToCacheSelection(), FAILED, due to "
@@ -3138,7 +3146,7 @@
   }
 
   if (!mSelection.Collapsed() && aSelectedString) {
-    aSelectedString->Assign(selection.mReply.mString);
+    aSelectedString->Assign(querySelectedTextEvent.mReply->DataRef());
   }
 
   MOZ_LOG(gGtkIMLog, LogLevel::Debug,
@@ -3164,10 +3172,11 @@
 void IMContextWrapper::Selection::Assign(
     const WidgetQueryContentEvent& aEvent) {
   MOZ_ASSERT(aEvent.mMessage == eQuerySelectedText);
-  MOZ_ASSERT(aEvent.mSucceeded);
-  mString = aEvent.mReply.mString;
-  mOffset = aEvent.mReply.mOffset;
-  mWritingMode = aEvent.GetWritingMode();
+  MOZ_ASSERT(aEvent.Succeeded());
+  MOZ_ASSERT(aEvent.mReply->mOffsetAndData.isSome());
+  mString = aEvent.mReply->DataRef();
+  mOffset = aEvent.mReply->StartOffset();
+  mWritingMode = aEvent.mReply->WritingModeRef();
 }
 
 }  // namespace widget
diff -Nru firefox-84.0.2+build1/widget/gtk/moz.build firefox-85.0+build1/widget/gtk/moz.build
--- firefox-84.0.2+build1/widget/gtk/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -50,7 +50,6 @@
     "nsSound.cpp",
     "nsToolkit.cpp",
     "nsWidgetFactory.cpp",
-    "ProcInfo.cpp",
     "ScreenHelperGTK.cpp",
     "TaskbarProgress.cpp",
     "WakeLockListener.cpp",
diff -Nru firefox-84.0.2+build1/widget/gtk/MPRISServiceHandler.cpp firefox-85.0+build1/widget/gtk/MPRISServiceHandler.cpp
--- firefox-84.0.2+build1/widget/gtk/MPRISServiceHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/MPRISServiceHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/Sprintf.h"
 #include "nsIXULAppInfo.h"
 #include "nsIOutputStream.h"
+#include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 
 // avoid redefined macro in unified build
diff -Nru firefox-84.0.2+build1/widget/gtk/nsDragService.cpp firefox-85.0+build1/widget/gtk/nsDragService.cpp
--- firefox-84.0.2+build1/widget/gtk/nsDragService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsDragService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -29,6 +29,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/ScopeExit.h"
 #include "GRefPtr.h"
 
 #include "gfxXlibSurface.h"
diff -Nru firefox-84.0.2+build1/widget/gtk/nsGtkKeyUtils.cpp firefox-85.0+build1/widget/gtk/nsGtkKeyUtils.cpp
--- firefox-84.0.2+build1/widget/gtk/nsGtkKeyUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsGtkKeyUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -340,7 +340,9 @@
 KeymapWrapper::KeymapWrapper()
     : mInitialized(false),
       mGdkKeymap(gdk_keymap_get_default()),
-      mXKBBaseEventCode(0) {
+      mXKBBaseEventCode(0),
+      mOnKeysChangedSignalHandle(0),
+      mOnDirectionChangedSignalHandle(0) {
   MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
           ("%p Constructor, mGdkKeymap=%p", this, mGdkKeymap));
 
@@ -452,9 +454,14 @@
   MOZ_LOG(gKeymapWrapperLog, LogLevel::Info,
           ("%p InitBySystemSettingsX11, mGdkKeymap=%p", this, mGdkKeymap));
 
-  g_signal_connect(mGdkKeymap, "keys-changed", (GCallback)OnKeysChanged, this);
-  g_signal_connect(mGdkKeymap, "direction-changed",
-                   (GCallback)OnDirectionChanged, this);
+  if (!mOnKeysChangedSignalHandle) {
+    mOnKeysChangedSignalHandle = g_signal_connect(
+        mGdkKeymap, "keys-changed", (GCallback)OnKeysChanged, this);
+  }
+  if (!mOnDirectionChangedSignalHandle) {
+    mOnDirectionChangedSignalHandle = g_signal_connect(
+        mGdkKeymap, "direction-changed", (GCallback)OnDirectionChanged, this);
+  }
 
   Display* display = gdk_x11_display_get_xdisplay(gdk_display_get_default());
 
@@ -772,11 +779,11 @@
 
 KeymapWrapper::~KeymapWrapper() {
   gdk_window_remove_filter(nullptr, FilterEvents, this);
-  if (gfxPlatformGtk::GetPlatform()->IsX11Display()) {
-    g_signal_handlers_disconnect_by_func(mGdkKeymap,
-                                         FuncToGpointer(OnKeysChanged), this);
-    g_signal_handlers_disconnect_by_func(
-        mGdkKeymap, FuncToGpointer(OnDirectionChanged), this);
+  if (mOnKeysChangedSignalHandle) {
+    g_signal_handler_disconnect(mGdkKeymap, mOnKeysChangedSignalHandle);
+  }
+  if (mOnDirectionChangedSignalHandle) {
+    g_signal_handler_disconnect(mGdkKeymap, mOnDirectionChangedSignalHandle);
   }
   g_object_unref(mGdkKeymap);
   MOZ_LOG(gKeymapWrapperLog, LogLevel::Info, ("%p Destructor", this));
diff -Nru firefox-84.0.2+build1/widget/gtk/nsGtkKeyUtils.h firefox-85.0+build1/widget/gtk/nsGtkKeyUtils.h
--- firefox-84.0.2+build1/widget/gtk/nsGtkKeyUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsGtkKeyUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -335,6 +335,9 @@
   static void OnDirectionChanged(GdkKeymap* aGdkKeymap,
                                  KeymapWrapper* aKeymapWrapper);
 
+  gulong mOnKeysChangedSignalHandle;
+  gulong mOnDirectionChangedSignalHandle;
+
   /**
    * GetCharCodeFor() Computes what character is inputted by the key event
    * with aModifierState and aGroup.
diff -Nru firefox-84.0.2+build1/widget/gtk/nsLookAndFeel.cpp firefox-85.0+build1/widget/gtk/nsLookAndFeel.cpp
--- firefox-84.0.2+build1/widget/gtk/nsLookAndFeel.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsLookAndFeel.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -586,34 +586,24 @@
                           mozilla::LookAndFeel::eScrollArrow_StartForward);
 }
 
-nsresult nsLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
+nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
   nsresult res = NS_OK;
 
-  // Set these before they can get overrided in the nsXPLookAndFeel.
+  // We use delayed initialization by EnsureInit() here
+  // to make sure mozilla::Preferences is available (Bug 115807).
+  // IntID::UseAccessibilityTheme is requested before user preferences
+  // are read, and so EnsureInit(), which depends on preference values,
+  // is deliberately delayed until required.
   switch (aID) {
     case IntID::ScrollButtonLeftMouseButtonAction:
       aResult = 0;
-      return NS_OK;
+      break;
     case IntID::ScrollButtonMiddleMouseButtonAction:
       aResult = 1;
-      return NS_OK;
+      break;
     case IntID::ScrollButtonRightMouseButtonAction:
       aResult = 2;
-      return NS_OK;
-    default:
       break;
-  }
-
-  res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
-
-  // We use delayed initialization by EnsureInit() here
-  // to make sure mozilla::Preferences is available (Bug 115807).
-  // IntID::UseAccessibilityTheme is requested before user preferences
-  // are read, and so EnsureInit(), which depends on preference values,
-  // is deliberately delayed until required.
-  switch (aID) {
     case IntID::CaretBlinkTime:
       EnsureInit();
       aResult = mCaretBlinkTime;
@@ -819,12 +809,8 @@
   return res;
 }
 
-nsresult nsLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult res = NS_OK;
-  res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
-
+nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult rv = NS_OK;
   switch (aID) {
     case FloatID::IMEUnderlineRelativeSize:
       aResult = 1.0f;
@@ -838,9 +824,9 @@
       break;
     default:
       aResult = -1.0;
-      res = NS_ERROR_FAILURE;
+      rv = NS_ERROR_FAILURE;
   }
-  return res;
+  return rv;
 }
 
 static void GetSystemFontInfo(GtkStyleContext* aStyle, nsString* aFontName,
@@ -879,8 +865,8 @@
   pango_font_description_free(desc);
 }
 
-bool nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
-                                gfxFontStyle& aFontStyle) {
+bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName,
+                                  gfxFontStyle& aFontStyle) {
   switch (aID) {
     case FontID::Menu:          // css2
     case FontID::PullDownMenu:  // css3
diff -Nru firefox-84.0.2+build1/widget/gtk/nsLookAndFeel.h firefox-85.0+build1/widget/gtk/nsLookAndFeel.h
--- firefox-84.0.2+build1/widget/gtk/nsLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -23,11 +23,11 @@
 
   void NativeInit() final;
   void RefreshImpl() override;
+  nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
+  nsresult NativeGetFloat(FloatID aID, float& aResult) override;
   nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
-  nsresult GetIntImpl(IntID aID, int32_t& aResult) override;
-  nsresult GetFloatImpl(FloatID aID, float& aResult) override;
-  bool GetFontImpl(FontID aID, nsString& aFontName,
-                   gfxFontStyle& aFontStyle) override;
+  bool NativeGetFont(FontID aID, nsString& aFontName,
+                     gfxFontStyle& aFontStyle) override;
 
   char16_t GetPasswordCharacterImpl() override;
   bool GetEchoPasswordImpl() override;
diff -Nru firefox-84.0.2+build1/widget/gtk/nsNativeBasicThemeGTK.cpp firefox-85.0+build1/widget/gtk/nsNativeBasicThemeGTK.cpp
--- firefox-84.0.2+build1/widget/gtk/nsNativeBasicThemeGTK.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsNativeBasicThemeGTK.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,9 +9,9 @@
 
 using namespace mozilla;
 
-static constexpr CSSIntCoord kGtkMinimumScrollbarSize = 12;
-static constexpr CSSIntCoord kGtkMinimumThinScrollbarSize = 6;
-static constexpr CSSIntCoord kGtkMinimumScrollbarThumbSize = 40;
+static constexpr CSSCoord kGtkMinimumScrollbarSize = 12;
+static constexpr CSSCoord kGtkMinimumThinScrollbarSize = 6;
+static constexpr CSSCoord kGtkMinimumScrollbarThumbSize = 40;
 
 already_AddRefed<nsITheme> do_GetBasicNativeThemeDoNotUseDirectly() {
   static mozilla::StaticRefPtr<nsITheme> gInstance;
@@ -41,7 +41,7 @@
                                             StyleAppearance aAppearance,
                                             LayoutDeviceIntSize* aResult,
                                             bool* aIsOverridable) {
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
 
   switch (aAppearance) {
     case StyleAppearance::ScrollbarVertical:
@@ -57,13 +57,11 @@
     case StyleAppearance::Scrollcorner: {
       ComputedStyle* style = nsLayoutUtils::StyleForScrollbar(aFrame);
       if (style->StyleUIReset()->mScrollbarWidth == StyleScrollbarWidth::Thin) {
-        aResult->SizeTo(
-            static_cast<uint32_t>(kGtkMinimumThinScrollbarSize) * dpiRatio,
-            static_cast<uint32_t>(kGtkMinimumThinScrollbarSize) * dpiRatio);
+        aResult->SizeTo(kGtkMinimumThinScrollbarSize * dpiRatio,
+                        kGtkMinimumThinScrollbarSize * dpiRatio);
       } else {
-        aResult->SizeTo(
-            static_cast<uint32_t>(kGtkMinimumScrollbarSize) * dpiRatio,
-            static_cast<uint32_t>(kGtkMinimumScrollbarSize) * dpiRatio);
+        aResult->SizeTo(kGtkMinimumScrollbarSize * dpiRatio,
+                        kGtkMinimumScrollbarSize * dpiRatio);
       }
       break;
     }
@@ -74,12 +72,10 @@
 
   switch (aAppearance) {
     case StyleAppearance::ScrollbarthumbHorizontal:
-      aResult->width =
-          static_cast<uint32_t>(kGtkMinimumScrollbarThumbSize) * dpiRatio;
+      aResult->width = kGtkMinimumScrollbarThumbSize * dpiRatio;
       break;
     case StyleAppearance::ScrollbarthumbVertical:
-      aResult->height =
-          static_cast<uint32_t>(kGtkMinimumScrollbarThumbSize) * dpiRatio;
+      aResult->height = kGtkMinimumScrollbarThumbSize * dpiRatio;
       break;
     default:
       break;
@@ -90,33 +86,36 @@
 }
 
 void nsNativeBasicThemeGTK::PaintScrollbarThumb(
-    DrawTarget* aDrawTarget, const Rect& aRect, bool aHorizontal,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect, bool aHorizontal,
     nsIFrame* aFrame, const ComputedStyle& aStyle,
     const EventStates& aElementState, const EventStates& aDocumentState,
-    uint32_t aDpiRatio) {
+    DPIRatio aDpiRatio) {
   sRGBColor thumbColor =
       ComputeScrollbarthumbColor(aStyle, aElementState, aDocumentState);
-  Rect thumbRect(aRect);
+  LayoutDeviceRect thumbRect(aRect);
   thumbRect.Deflate(floorf((aHorizontal ? aRect.height : aRect.width) / 4.0f));
-  auto radius = (aHorizontal ? thumbRect.height : thumbRect.width) / 2.0f;
+  LayoutDeviceCoord radius =
+      (aHorizontal ? thumbRect.height : thumbRect.width) / 2.0f;
   PaintRoundedRectWithRadius(aDrawTarget, thumbRect, thumbColor, sRGBColor(), 0,
-                             radius, 1);
+                             radius / aDpiRatio, aDpiRatio);
 }
 
 void nsNativeBasicThemeGTK::PaintScrollbar(DrawTarget* aDrawTarget,
-                                           const Rect& aRect, bool aHorizontal,
-                                           nsIFrame* aFrame,
+                                           const LayoutDeviceRect& aRect,
+                                           bool aHorizontal, nsIFrame* aFrame,
                                            const ComputedStyle& aStyle,
                                            const EventStates& aDocumentState,
-                                           uint32_t aDpiRatio, bool aIsRoot) {
+                                           DPIRatio aDpiRatio, bool aIsRoot) {
   sRGBColor trackColor = ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
-  aDrawTarget->FillRect(aRect, gfx::ColorPattern(ToDeviceColor(trackColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        gfx::ColorPattern(ToDeviceColor(trackColor)));
 }
 
 void nsNativeBasicThemeGTK::PaintScrollCorner(
-    DrawTarget* aDrawTarget, const Rect& aRect, nsIFrame* aFrame,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect, nsIFrame* aFrame,
     const ComputedStyle& aStyle, const EventStates& aDocumentState,
-    uint32_t aDpiRatio, bool aIsRoot) {
+    DPIRatio aDpiRatio, bool aIsRoot) {
   sRGBColor trackColor = ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
-  aDrawTarget->FillRect(aRect, gfx::ColorPattern(ToDeviceColor(trackColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        gfx::ColorPattern(ToDeviceColor(trackColor)));
 }
diff -Nru firefox-84.0.2+build1/widget/gtk/nsNativeBasicThemeGTK.h firefox-85.0+build1/widget/gtk/nsNativeBasicThemeGTK.h
--- firefox-84.0.2+build1/widget/gtk/nsNativeBasicThemeGTK.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsNativeBasicThemeGTK.h	2021-01-18 19:58:27.000000000 +0000
@@ -20,20 +20,20 @@
 
   nsITheme::Transparency GetWidgetTransparency(
       nsIFrame* aFrame, StyleAppearance aAppearance) override;
-  void PaintScrollbarThumb(DrawTarget* aDrawTarget, const Rect& aRect,
-                           bool aHorizontal, nsIFrame* aFrame,
-                           const ComputedStyle& aStyle,
+  void PaintScrollbarThumb(DrawTarget* aDrawTarget,
+                           const LayoutDeviceRect& aRect, bool aHorizontal,
+                           nsIFrame* aFrame, const ComputedStyle& aStyle,
                            const EventStates& aElementState,
                            const EventStates& aDocumentState,
-                           uint32_t aDpiRatio) override;
-  void PaintScrollbar(DrawTarget* aDrawTarget, const Rect& aRect,
+                           DPIRatio aDpiRatio) override;
+  void PaintScrollbar(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
                       bool aHorizontal, nsIFrame* aFrame,
                       const ComputedStyle& aStyle,
-                      const EventStates& aDocumentState, uint32_t aDpiRatio,
+                      const EventStates& aDocumentState, DPIRatio aDpiRatio,
                       bool aIsRoot) override;
-  void PaintScrollCorner(DrawTarget* aDrawTarget, const Rect& aRect,
+  void PaintScrollCorner(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
                          nsIFrame* aFrame, const ComputedStyle& aStyle,
-                         const EventStates& aDocumentState, uint32_t aDpiRatio,
+                         const EventStates& aDocumentState, DPIRatio aDpiRatio,
                          bool aIsRoot) override;
   bool ThemeSupportsScrollbarButtons() override { return false; }
 
diff -Nru firefox-84.0.2+build1/widget/gtk/nsPrintDialogGTK.cpp firefox-85.0+build1/widget/gtk/nsPrintDialogGTK.cpp
--- firefox-84.0.2+build1/widget/gtk/nsPrintDialogGTK.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsPrintDialogGTK.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -780,11 +780,8 @@
   g_variant_get(parameters, "(u@a{sv})", &response, &options);
   mResult = GTK_PRINT_OPERATION_RESULT_CANCEL;
   if (response == 0) {
-    GVariant* v;
-
-    char* filename;
-    char* uri;
-    v = g_variant_lookup_value(options, "settings", G_VARIANT_TYPE_VARDICT);
+    GVariant* v =
+        g_variant_lookup_value(options, "settings", G_VARIANT_TYPE_VARDICT);
     static auto s_gtk_print_settings_new_from_gvariant =
         reinterpret_cast<GtkPrintSettings* (*)(GVariant*)>(
             dlsym(RTLD_DEFAULT, "gtk_print_settings_new_from_gvariant"));
@@ -801,14 +798,6 @@
 
     g_variant_lookup(options, "token", "u", &mToken);
 
-    // Force printing to file because only filedescriptor of the file
-    // can be passed to portal
-    int fd = g_file_open_tmp("gtkprintXXXXXX", &filename, NULL);
-    uri = g_filename_to_uri(filename, NULL, NULL);
-    gtk_print_settings_set(printSettings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
-    g_free(uri);
-    close(fd);
-
     // Save native settings in the session object
     mPrintAndPageSettings->SetGtkPrintSettings(printSettings);
     mPrintAndPageSettings->SetGtkPageSetup(pageSetup);
diff -Nru firefox-84.0.2+build1/widget/gtk/nsWaylandDisplay.cpp firefox-85.0+build1/widget/gtk/nsWaylandDisplay.cpp
--- firefox-84.0.2+build1/widget/gtk/nsWaylandDisplay.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsWaylandDisplay.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsWaylandDisplay.h"
+
+#include "base/message_loop.h"  // for MessageLoop
+#include "base/task.h"          // for NewRunnableMethod, etc
+#include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_widget.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/widget/gtk/nsWaylandDisplay.h firefox-85.0+build1/widget/gtk/nsWaylandDisplay.h
--- firefox-84.0.2+build1/widget/gtk/nsWaylandDisplay.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsWaylandDisplay.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,10 +10,6 @@
 
 #include "DMABufLibWrapper.h"
 
-#include "base/message_loop.h"  // for MessageLoop
-#include "base/task.h"          // for NewRunnableMethod, etc
-#include "mozilla/StaticMutex.h"
-
 #include "mozilla/widget/mozwayland.h"
 #include "mozilla/widget/gbm.h"
 #include "mozilla/widget/gtk-primary-selection-client-protocol.h"
diff -Nru firefox-84.0.2+build1/widget/gtk/nsWindow.cpp firefox-85.0+build1/widget/gtk/nsWindow.cpp
--- firefox-84.0.2+build1/widget/gtk/nsWindow.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsWindow.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_ui.h"
 #include "mozilla/TextEvents.h"
@@ -20,6 +21,9 @@
 #include "mozilla/TouchEvents.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/WidgetUtils.h"
+#include "mozilla/X11Util.h"
+#include "mozilla/XREAppData.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/WheelEventBinding.h"
 #include "nsAppRunner.h"
 #include <algorithm>
@@ -504,7 +508,7 @@
   mWindowScaleFactorChanged = true;
   mWindowScaleFactor = 1;
 
-  mIsAccelerated = false;
+  mCompositedScreen = gdk_screen_is_composited(gdk_screen_get_default());
 }
 
 nsWindow::~nsWindow() {
@@ -910,7 +914,18 @@
   }
 }
 
-bool nsWindow::WidgetTypeSupportsAcceleration() { return !IsSmallPopup(); }
+bool nsWindow::WidgetTypeSupportsAcceleration() {
+  if (IsSmallPopup()) {
+    return false;
+  }
+  // Workaround for Bug 1479135
+  // We draw transparent popups on non-compositing screens by SW as we don't
+  // implement X shape masks in WebRender.
+  if (mWindowType == eWindowType_popup) {
+    return mCompositedScreen;
+  }
+  return true;
+}
 
 void nsWindow::ReparentNativeWidget(nsIWidget* aNewParent) {
   MOZ_ASSERT(aNewParent, "null widget");
@@ -1901,13 +1916,17 @@
   if (!property || !req_type) {
     return false;
   }
-  result =
-      XGetWindowProperty(xdisplay, wmWindow, property,
-                         0L,         // offset
-                         INT32_MAX,  // length
-                         false,      // delete
-                         req_type, &actual_type_return, &actual_format_return,
-                         &nitems_return, &bytes_after_return, &prop_return);
+  {
+    // Suppress fatal errors for a missing window.
+    ScopedXErrorHandler handler;
+    result =
+        XGetWindowProperty(xdisplay, wmWindow, property,
+                           0L,         // offset
+                           INT32_MAX,  // length
+                           false,      // delete
+                           req_type, &actual_type_return, &actual_format_return,
+                           &nitems_return, &bytes_after_return, &prop_return);
+  }
 
   if (result != Success || bytes_after_return != 0) {
     return false;
@@ -3670,9 +3689,9 @@
 
   if (IsChromeWindowTitlebar()) {
     // DispatchDeactivateEvent() ultimately results in a call to
-    // nsGlobalWindowOuter::ActivateOrDeactivate(), which resets
-    // the mIsActive flag.  We call UpdateMozWindowActive() to keep
-    // the flag in sync with GDK_WINDOW_STATE_FOCUSED.
+    // BrowsingContext::SetIsActiveBrowserWindow(), which resets
+    // the state.  We call UpdateMozWindowActive() to keep it in
+    // sync with GDK_WINDOW_STATE_FOCUSED.
     UpdateMozWindowActive();
   }
 
@@ -3918,7 +3937,7 @@
     mTitlebarBackdropState =
         !(aEvent->new_window_state & GDK_WINDOW_STATE_FOCUSED);
 
-    // keep mIsActive in sync with GDK_WINDOW_STATE_FOCUSED
+    // keep IsActiveBrowserWindow in sync with GDK_WINDOW_STATE_FOCUSED
     UpdateMozWindowActive();
 
     ForceTitlebarRedraw();
@@ -4034,6 +4053,7 @@
   // Update CSD after the change in alpha visibility. This only affects
   // system metrics, not other theme shenanigans.
   NotifyThemeChanged(ThemeChangeKind::MediaQueriesOnly);
+  mCompositedScreen = gdk_screen_is_composited(gdk_screen_get_default());
 }
 
 void nsWindow::OnScaleChanged(GtkAllocation* aAllocation) {
@@ -4176,12 +4196,14 @@
   return TRUE;
 }
 
-bool nsWindow::IsMainWindowTransparent() {
+// Return true if toplevel window is transparent.
+// It's transparent when we're running on composited screens
+// and we can draw main window without system titlebar.
+bool nsWindow::IsToplevelWindowTransparent() {
   static bool transparencyConfigured = false;
 
   if (!transparencyConfigured) {
-    GdkScreen* screen = gdk_screen_get_default();
-    if (gdk_screen_is_composited(screen)) {
+    if (gdk_screen_is_composited(gdk_screen_get_default())) {
       // Some Gtk+ themes use non-rectangular toplevel windows. To fully
       // support such themes we need to make toplevel window transparent
       // with ARGB visual.
@@ -4192,6 +4214,8 @@
         sTransparentMainWindow =
             Preferences::GetBool("mozilla.widget.use-argb-visuals");
       } else {
+        // Enable transparent toplevel window if we can draw main window
+        // without system titlebar as Gtk+ themes use titlebar round corners.
         sTransparentMainWindow = GetSystemCSDSupportLevel() != CSD_SUPPORT_NONE;
       }
     }
@@ -4219,6 +4243,58 @@
   return window;
 }
 
+// Configure GL visual on X11. We add alpha silently
+// if we use WebRender to workaround NVIDIA specific Bug 1663273.
+bool nsWindow::ConfigureX11GLVisual(bool aUseAlpha) {
+  if (!mIsX11Display) {
+    return false;
+  }
+
+  // If using WebRender on X11, we need to select a visual with a depth
+  // buffer, as well as an alpha channel if transparency is requested. This
+  // must be done before the widget is realized.
+  bool useWebRender = gfx::gfxVars::UseWebRender();
+  auto* screen = gtk_widget_get_screen(mShell);
+  int visualId = 0;
+  bool haveVisual;
+
+  // See https://bugzilla.mozilla.org/show_bug.cgi?id=1663003
+  // We need to use GLX to get visual even on EGL until
+  // EGL can provide compositable visual:
+  // https://gitlab.freedesktop.org/mesa/mesa/-/issues/149
+  if ((true /* !gfx::gfxVars::UseEGL() */)) {
+    auto* display = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(mShell));
+    int screenNumber = GDK_SCREEN_XNUMBER(screen);
+    haveVisual = GLContextGLX::FindVisual(display, screenNumber, useWebRender,
+                                          aUseAlpha || useWebRender, &visualId);
+  } else {
+    haveVisual = GLContextEGL::FindVisual(useWebRender,
+                                          aUseAlpha || useWebRender, &visualId);
+  }
+
+  GdkVisual* gdkVisual = nullptr;
+  if (haveVisual) {
+    // If we're using CSD, rendering will go through mContainer, but
+    // it will inherit this visual as it is a child of mShell.
+    gdkVisual = gdk_x11_screen_lookup_visual(screen, visualId);
+  }
+  if (!gdkVisual) {
+    NS_WARNING("We're missing X11 Visual!");
+    if (aUseAlpha || useWebRender) {
+      // We try to use a fallback alpha visual
+      GdkScreen* screen = gtk_widget_get_screen(mShell);
+      gdkVisual = gdk_screen_get_rgba_visual(screen);
+    }
+  }
+  if (gdkVisual) {
+    // TODO: We use alpha visual even on non-compositing screens (Bug 1479135).
+    gtk_widget_set_visual(mShell, gdkVisual);
+    mHasAlphaVisual = aUseAlpha;
+  }
+
+  return true;
+}
+
 nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
                           const LayoutDeviceIntRect& aRect,
                           nsWidgetInitData* aInitData) {
@@ -4269,8 +4345,8 @@
   ConstrainSize(&mBounds.width, &mBounds.height);
 
   GtkWidget* eventWidget = nullptr;
-  bool needsAlphaVisual = (mWindowType == eWindowType_popup &&
-                           (aInitData && aInitData->mSupportTranslucency));
+  bool popupNeedsAlphaVisual = (mWindowType == eWindowType_popup &&
+                                (aInitData && aInitData->mSupportTranslucency));
 
   // Figure out our parent window - only used for eWindowType_child
   GtkWidget* parentMozContainer = nullptr;
@@ -4340,9 +4416,6 @@
       // gfxVars, used below.
       Unused << gfxPlatform::GetPlatform();
 
-      mIsAccelerated = ComputeShouldAccelerate();
-      bool useWebRender = gfx::gfxVars::UseWebRender() && mIsAccelerated;
-
       if (mWindowType == eWindowType_toplevel ||
           mWindowType == eWindowType_dialog) {
         bool isPopup = mIsPIPWindow || mWindowType == eWindowType_dialog;
@@ -4350,59 +4423,26 @@
       }
 
       // Don't use transparency for PictureInPicture windows.
+      bool toplevelNeedsAlphaVisual = false;
       if (mWindowType == eWindowType_toplevel && !mIsPIPWindow) {
-        needsAlphaVisual = IsMainWindowTransparent();
-        if (!needsAlphaVisual && mCSDSupportLevel != CSD_SUPPORT_NONE) {
-          mTransparencyBitmapForTitlebar = TitlebarCanUseShapeMask();
-        }
+        toplevelNeedsAlphaVisual = IsToplevelWindowTransparent();
       }
 
-      bool isSetVisual = false;
-      // If using WebRender on X11, we need to select a visual with a depth
-      // buffer, as well as an alpha channel if transparency is requested. This
-      // must be done before the widget is realized.
-
-      // Use GL/WebRender compatible visual only when it is necessary, since
-      // the visual consumes more memory.
-      if (mIsX11Display && mIsAccelerated) {
-        if (useWebRender) {
-          // WebRender rquests AlphaVisual for making readback to work
-          // correctly.
-          needsAlphaVisual = true;
-        }
-        auto screen = gtk_widget_get_screen(mShell);
-        int visualId = 0;
-        bool haveVisual;
-
-        // See https://bugzilla.mozilla.org/show_bug.cgi?id=1663003
-        // We need to use GLX to get visual even on EGL until
-        // EGL can provide compositable visual:
-        // https://gitlab.freedesktop.org/mesa/mesa/-/issues/149
-        if ((true /* !gfx::gfxVars::UseEGL() */)) {
-          auto display = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(mShell));
-          int screenNumber = GDK_SCREEN_XNUMBER(screen);
-          haveVisual = GLContextGLX::FindVisual(
-              display, screenNumber, useWebRender, needsAlphaVisual, &visualId);
-        } else {
-          haveVisual = GLContextEGL::FindVisual(useWebRender, needsAlphaVisual,
-                                                &visualId);
-        }
-        if (haveVisual) {
-          // If we're using CSD, rendering will go through mContainer, but
-          // it will inherit this visual as it is a child of mShell.
-          gtk_widget_set_visual(mShell,
-                                gdk_x11_screen_lookup_visual(screen, visualId));
-          mHasAlphaVisual = needsAlphaVisual;
-          isSetVisual = true;
-        } else {
-          NS_WARNING("We're missing X11 Visual!");
-        }
+      bool isGLVisualSet = false;
+      bool isAccelerated = ComputeShouldAccelerate();
+#ifdef MOZ_X11
+      if (isAccelerated) {
+        isGLVisualSet = ConfigureX11GLVisual(popupNeedsAlphaVisual ||
+                                             toplevelNeedsAlphaVisual);
       }
-
-      if (!isSetVisual && needsAlphaVisual) {
-        GdkScreen* screen = gtk_widget_get_screen(mShell);
-        if (gdk_screen_is_composited(screen)) {
-          GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
+#endif
+      if (!isGLVisualSet &&
+          (popupNeedsAlphaVisual || toplevelNeedsAlphaVisual)) {
+        // We're running on composited screen so we can use alpha visual
+        // for both toplevel and popups.
+        if (mCompositedScreen) {
+          GdkVisual* visual =
+              gdk_screen_get_rgba_visual(gtk_widget_get_screen(mShell));
           if (visual) {
             gtk_widget_set_visual(mShell, visual);
             mHasAlphaVisual = true;
@@ -4410,6 +4450,15 @@
         }
       }
 
+      // Use X shape mask to draw round corners of Firefox titlebar.
+      // We don't use shape masks any more as we switched to ARGB visual
+      // by default and non-compositing screens use solid-csd decorations
+      // without round corners.
+      // Leave the shape mask code here as it can be used to draw round
+      // corners on EGL (https://gitlab.freedesktop.org/mesa/mesa/-/issues/149)
+      // or when custom titlebar theme is used.
+      mTransparencyBitmapForTitlebar = TitlebarUseShapeMask();
+
       // We have a toplevel window with transparency.
       // Calls to UpdateTitlebarTransparencyBitmap() from OnExposeEvent()
       // occur before SetTransparencyMode() receives eTransparencyTransparent
@@ -4526,7 +4575,7 @@
       GtkWidget* container = moz_container_new();
       mContainer = MOZ_CONTAINER(container);
 #ifdef MOZ_WAYLAND
-      if (!mIsX11Display && mIsAccelerated) {
+      if (!mIsX11Display && isAccelerated) {
         mCompositorInitiallyPaused = true;
         RefPtr<nsWindow> self(this);
         moz_container_wayland_add_initial_draw_callback(
@@ -4810,7 +4859,7 @@
     GdkVisual* gdkVisual = gdk_window_get_visual(mGdkWindow);
     mXVisual = gdk_x11_visual_get_xvisual(gdkVisual);
     mXDepth = gdk_visual_get_depth(gdkVisual);
-    bool shaped = needsAlphaVisual && !mHasAlphaVisual;
+    bool shaped = popupNeedsAlphaVisual && !mHasAlphaVisual;
 
     mSurfaceProvider.Initialize(mXDisplay, mXWindow, mXVisual, mXDepth, shaped);
 
@@ -5345,6 +5394,10 @@
 }
 
 void nsWindow::UpdateTopLevelOpaqueRegion(void) {
+  if (!mCompositedScreen) {
+    return;
+  }
+
   GdkWindow* window =
       (mDrawToContainer) ? gtk_widget_get_window(mShell) : mGdkWindow;
   if (!window) {
@@ -5354,9 +5407,9 @@
 
   int x = 0;
   int y = 0;
-  if (!mIsX11Display || mDrawInTitlebar) {
-    x = DevicePixelsToGdkCoordRoundDown(mClientOffset.x);
-    y = DevicePixelsToGdkCoordRoundDown(mClientOffset.y);
+
+  if (mDrawToContainer) {
+    gdk_window_get_position(mGdkWindow, &x, &y);
   }
 
   int width = DevicePixelsToGdkCoordRoundDown(mBounds.width);
@@ -5932,8 +5985,7 @@
 
 /* virtual */
 bool nsWindow::PrepareForFullscreenTransition(nsISupports** aData) {
-  GdkScreen* screen = gtk_widget_get_screen(mShell);
-  if (!gdk_screen_is_composited(screen)) {
+  if (!mCompositedScreen) {
     return false;
   }
   *aData = do_AddRef(new FullscreenTransitionWindow(mShell)).take();
@@ -7172,16 +7224,18 @@
     // Check if we're targeting content with vertical writing mode,
     // and if so remap the arrow keys.
     // XXX This may be expensive.
-    WidgetQueryContentEvent query(true, eQuerySelectedText, this);
+    WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                   this);
     nsEventStatus status;
-    DispatchEvent(&query, status);
+    DispatchEvent(&querySelectedTextEvent, status);
 
-    if (query.mSucceeded && query.mReply.mWritingMode.IsVertical()) {
+    if (querySelectedTextEvent.FoundSelection() &&
+        querySelectedTextEvent.mReply->mWritingMode.IsVertical()) {
       uint32_t geckoCode = 0;
       uint32_t gdkCode = 0;
       switch (aEvent.mKeyCode) {
         case NS_VK_LEFT:
-          if (query.mReply.mWritingMode.IsVerticalLR()) {
+          if (querySelectedTextEvent.mReply->mWritingMode.IsVerticalLR()) {
             geckoCode = NS_VK_UP;
             gdkCode = GDK_Up;
           } else {
@@ -7191,7 +7245,7 @@
           break;
 
         case NS_VK_RIGHT:
-          if (query.mReply.mWritingMode.IsVerticalLR()) {
+          if (querySelectedTextEvent.mReply->mWritingMode.IsVerticalLR()) {
             geckoCode = NS_VK_DOWN;
             gdkCode = GDK_Down;
           } else {
@@ -7856,69 +7910,49 @@
   return sCSDSupportLevel;
 }
 
-// Check for Mutter regression on X.org (Bug 1530252). In that case we
-// don't hide system titlebar by default as we can't draw transparent
-// corners reliably.
-bool nsWindow::TitlebarCanUseShapeMask() {
-  static int canUseShapeMask = -1;
-  if (canUseShapeMask != -1) {
-    return canUseShapeMask;
-  }
-  canUseShapeMask = gfxPlatformGtk::GetPlatform()->IsX11Display();
-
-  const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
-  if (!currentDesktop) {
-    return canUseShapeMask;
-  }
+bool nsWindow::TitlebarUseShapeMask() {
+  static int useShapeMask = []() {
+    // Don't use titlebar shape mask on Wayland
+    if (!gfxPlatformGtk::GetPlatform()->IsX11Display()) {
+      return false;
+    }
 
-  if (strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
-      strstr(currentDesktop, "GNOME") != nullptr) {
-    const char* sessionType = getenv("XDG_SESSION_TYPE");
-    canUseShapeMask = (sessionType && strstr(sessionType, "x11") == nullptr);
-  }
+    // We can'y use shape masks on Mutter/X.org as we can't resize Firefox
+    // window there (Bug 1530252).
+    const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+    if (currentDesktop) {
+      if (strstr(currentDesktop, "GNOME") != nullptr) {
+        const char* sessionType = getenv("XDG_SESSION_TYPE");
+        if (sessionType && strstr(sessionType, "x11") != nullptr) {
+          return false;
+        }
+      }
+    }
 
-  return canUseShapeMask;
+    return Preferences::GetBool("widget.titlebar-x11-use-shape-mask", false);
+  }();
+  return useShapeMask;
 }
 
 bool nsWindow::HideTitlebarByDefault() {
-  static int hideTitlebar = -1;
-  if (hideTitlebar != -1) {
-    return hideTitlebar;
-  }
-
-  // When user defined widget.default-hidden-titlebar don't do any
-  // heuristics and just follow it.
-  if (Preferences::HasUserValue("widget.default-hidden-titlebar")) {
-    hideTitlebar =
-        Preferences::GetBool("widget.default-hidden-titlebar", false);
-    return hideTitlebar;
-  }
-
-  // We want to hide the system titlebar by default.
-  hideTitlebar = true;
-
-  // Don't hide titlebar when we can't draw round corners.
-  GdkScreen* screen = gdk_screen_get_default();
-  if (!gdk_screen_is_composited(screen) && !TitlebarCanUseShapeMask()) {
-    hideTitlebar = false;
-    return hideTitlebar;
-  }
-  // Don't hide titlebar when it's disabled on current desktop.
-  const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
-  if (!currentDesktop || GetSystemCSDSupportLevel() == CSD_SUPPORT_NONE) {
-    hideTitlebar = false;
-    return hideTitlebar;
-  }
+  static int hideTitlebar = []() {
+    // When user defined widget.default-hidden-titlebar don't do any
+    // heuristics and just follow it.
+    if (Preferences::HasUserValue("widget.default-hidden-titlebar")) {
+      return Preferences::GetBool("widget.default-hidden-titlebar", false);
+    }
 
-  // We hide system titlebar on Gnome/ElementaryOS without any restriction.
-  if ((strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
-       strstr(currentDesktop, "GNOME") != nullptr ||
-       strstr(currentDesktop, "Pantheon") != nullptr)) {
-    return hideTitlebar;
-  }
+    // Don't hide titlebar when it's disabled on current desktop.
+    const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+    if (!currentDesktop || GetSystemCSDSupportLevel() == CSD_SUPPORT_NONE) {
+      return false;
+    }
 
-  // Don't hide system titlebar by default for other desktops.
-  hideTitlebar = false;
+    // We hide system titlebar on Gnome/ElementaryOS without any restriction.
+    return ((strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr ||
+             strstr(currentDesktop, "GNOME") != nullptr ||
+             strstr(currentDesktop, "Pantheon") != nullptr));
+  }();
   return hideTitlebar;
 }
 
@@ -8140,11 +8174,12 @@
   // Update activation state for the :-moz-window-inactive pseudoclass.
   // Normally, this follows focus; we override it here to follow
   // GDK_WINDOW_STATE_FOCUSED.
-  mozilla::dom::Document* document = GetDocument();
-  if (document) {
-    nsPIDOMWindowOuter* window = document->GetWindow();
-    if (window) {
-      window->SetActive(!mTitlebarBackdropState);
+  if (mozilla::dom::Document* document = GetDocument()) {
+    if (nsPIDOMWindowOuter* window = document->GetWindow()) {
+      if (RefPtr<mozilla::dom::BrowsingContext> bc =
+              window->GetBrowsingContext()) {
+        bc->SetIsActiveBrowserWindow(!mTitlebarBackdropState);
+      }
     }
   }
 }
diff -Nru firefox-84.0.2+build1/widget/gtk/nsWindow.h firefox-85.0+build1/widget/gtk/nsWindow.h
--- firefox-84.0.2+build1/widget/gtk/nsWindow.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/nsWindow.h	2021-01-18 19:58:27.000000000 +0000
@@ -407,7 +407,7 @@
 
   static bool HideTitlebarByDefault();
   static bool GetTopLevelWindowActiveState(nsIFrame* aFrame);
-  static bool TitlebarCanUseShapeMask();
+  static bool TitlebarUseShapeMask();
 #ifdef MOZ_WAYLAND
   virtual nsresult GetScreenRect(LayoutDeviceIntRect* aRect) override;
   virtual nsRect GetPreferredPopupRect() override {
@@ -422,7 +422,7 @@
   static void HideWaylandOpenedPopups();
   void NativeMoveResizeWaylandPopupCB(const GdkRectangle* aFinalSize,
                                       bool aFlippedX, bool aFlippedY);
-  static bool IsMainWindowTransparent();
+  static bool IsToplevelWindowTransparent();
 
  protected:
   virtual ~nsWindow();
@@ -469,7 +469,7 @@
 #endif
   bool mWindowScaleFactorChanged;
   int mWindowScaleFactor;
-  bool mIsAccelerated;
+  bool mCompositedScreen;
 
  private:
   void DestroyChildWindows();
@@ -538,6 +538,8 @@
   Visual* mXVisual;
   int mXDepth;
   mozilla::widget::WindowSurfaceProvider mSurfaceProvider;
+
+  bool ConfigureX11GLVisual(bool aUseAlpha);
 #endif
 #ifdef MOZ_WAYLAND
   RefPtr<mozilla::gfx::VsyncSource> mWaylandVsyncSource;
diff -Nru firefox-84.0.2+build1/widget/gtk/ProcInfo.cpp firefox-85.0+build1/widget/gtk/ProcInfo.cpp
--- firefox-84.0.2+build1/widget/gtk/ProcInfo.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/ProcInfo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +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 "mozilla/ProcInfo.h"
-#include "mozilla/Sprintf.h"
-#include "mozilla/Logging.h"
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-#include "nsLocalFile.h"
-#include "nsMemoryReporterManager.h"
-#include "nsNetCID.h"
-#include "nsWhitespaceTokenizer.h"
-
-#include <cstdio>
-#include <cstring>
-#include <unistd.h>
-#include <dirent.h>
-
-#define NANOPERSEC 1000000000.
-
-namespace mozilla {
-
-// StatReader can parse and tokenize a POSIX stat file.
-// see http://man7.org/linux/man-pages/man5/proc.5.html
-//
-// Its usage is quite simple:
-//
-// StatReader reader(pid);
-// ProcInfo info;
-// rv = reader.ParseProc(info);
-// if (NS_FAILED(rv)) {
-//     // the reading of the file or its parsing failed.
-// }
-//
-class StatReader {
- public:
-  explicit StatReader(const base::ProcessId aPid)
-      : mPid(aPid), mMaxIndex(53), mTicksPerSec(sysconf(_SC_CLK_TCK)) {
-    mFilepath.AppendPrintf("/proc/%u/stat", mPid);
-  }
-
-  nsresult ParseProc(ProcInfo& aInfo) {
-    nsAutoString fileContent;
-    nsresult rv = ReadFile(fileContent);
-    NS_ENSURE_SUCCESS(rv, rv);
-    // We first extract the filename
-    int32_t startPos = fileContent.RFindChar('(');
-    if (startPos == -1) {
-      return NS_ERROR_FAILURE;
-    }
-    int32_t endPos = fileContent.RFindChar(')');
-    if (endPos == -1) {
-      return NS_ERROR_FAILURE;
-    }
-    int32_t len = endPos - (startPos + 1);
-    aInfo.filename.Assign(Substring(fileContent, startPos + 1, len));
-
-    // now we can use the tokenizer for the rest of the file
-    nsWhitespaceTokenizer tokenizer(Substring(fileContent, endPos + 2));
-    int32_t index = 2;  // starting at third field
-    while (tokenizer.hasMoreTokens() && index < mMaxIndex) {
-      const nsAString& token = tokenizer.nextToken();
-      rv = UseToken(index, token, aInfo);
-      NS_ENSURE_SUCCESS(rv, rv);
-      index++;
-    }
-    return NS_OK;
-  }
-
- protected:
-  // Called for each token found in the stat file.
-  nsresult UseToken(int32_t aIndex, const nsAString& aToken, ProcInfo& aInfo) {
-    // We're using a subset of what stat has to offer for now.
-    nsresult rv = NS_OK;
-    // see the proc documentation for fields index references.
-    switch (aIndex) {
-      case 13:
-        // Amount of time that this process has been scheduled
-        // in user mode, measured in clock ticks
-        aInfo.cpuUser = GetCPUTime(aToken, &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-        break;
-      case 14:
-        // Amount of time that this process has been scheduled
-        // in kernel mode, measured in clock ticks
-        aInfo.cpuKernel = GetCPUTime(aToken, &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-        break;
-      case 23:
-        // Resident Set Size: number of pages the process has
-        // in real memory.
-        uint64_t pageCount = Get64Value(aToken, &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-        uint64_t pageSize = sysconf(_SC_PAGESIZE);
-        aInfo.residentSetSize = pageCount * pageSize;
-        break;
-    }
-    return rv;
-  }
-
-  // Converts a token into a int64_t
-  uint64_t Get64Value(const nsAString& aToken, nsresult* aRv) {
-    // We can't use aToken.ToInteger64() since it returns a signed 64.
-    // and that can result into an overflow.
-    nsresult rv = NS_OK;
-    uint64_t out = 0;
-    if (sscanf(NS_ConvertUTF16toUTF8(aToken).get(), "%" PRIu64, &out) == 0) {
-      rv = NS_ERROR_FAILURE;
-    }
-    *aRv = rv;
-    return out;
-  }
-
-  // Converts a token into CPU time in nanoseconds.
-  uint64_t GetCPUTime(const nsAString& aToken, nsresult* aRv) {
-    nsresult rv;
-    uint64_t value = Get64Value(aToken, &rv);
-    *aRv = rv;
-    if (NS_FAILED(rv)) {
-      return 0;
-    }
-    if (value) {
-      value = (value * NANOPERSEC) / mTicksPerSec;
-    }
-    return value;
-  }
-
-  base::ProcessId mPid;
-  int32_t mMaxIndex;
-  nsCString mFilepath;
-  ProcInfo mProcInfo;
-
- private:
-  // Reads the stat file and puts its content in a nsString.
-  nsresult ReadFile(nsAutoString& aFileContent) {
-    RefPtr<nsLocalFile> file = new nsLocalFile(mFilepath);
-    bool exists;
-    nsresult rv = file->Exists(&exists);
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!exists) {
-      return NS_ERROR_FAILURE;
-    }
-    // /proc is a virtual file system and all files are
-    // of size 0, so GetFileSize() and related functions will
-    // return 0 - so the way to read the file is to fill a buffer
-    // of an arbitrary big size and look for the end of line char.
-    FILE* fstat;
-    if (NS_FAILED(file->OpenANSIFileDesc("r", &fstat)) || !fstat) {
-      return NS_ERROR_FAILURE;
-    }
-    char buffer[2048];
-    char* end;
-    char* start = fgets(buffer, 2048, fstat);
-    fclose(fstat);
-    if (start == nullptr) {
-      return NS_ERROR_FAILURE;
-    }
-    // let's find the end
-    end = strchr(buffer, '\n');
-    if (!end) {
-      return NS_ERROR_FAILURE;
-    }
-    aFileContent.AssignASCII(buffer, size_t(end - start));
-    return NS_OK;
-  }
-
-  int64_t mTicksPerSec;
-};
-
-// Threads have the same stat file. The only difference is its path
-// and we're getting less info in the ThreadInfo structure.
-class ThreadInfoReader final : public StatReader {
- public:
-  ThreadInfoReader(const base::ProcessId aPid, const base::ProcessId aTid)
-      : StatReader(aPid), mTid(aTid) {
-    // Adding the thread path
-    mFilepath.Truncate();
-    mFilepath.AppendPrintf("/proc/%u/task/%u/stat", aPid, mTid);
-    mMaxIndex = 17;
-  }
-
-  nsresult ParseThread(ThreadInfo& aInfo) {
-    ProcInfo info;
-    nsresult rv = StatReader::ParseProc(info);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    aInfo.tid = mTid;
-    // Copying over the data we got from StatReader::ParseProc()
-    aInfo.cpuKernel = info.cpuKernel;
-    aInfo.cpuUser = info.cpuUser;
-    aInfo.name.Assign(info.filename);
-    return NS_OK;
-  }
-
- private:
-  base::ProcessId mTid;
-};
-
-RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
-  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
-  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIEventTarget> target =
-      do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to get stream transport service");
-    holder->Reject(rv, __func__);
-    return promise;
-  }
-
-  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
-      __func__,
-      [holder = std::move(holder), requests = std::move(aRequests)]() {
-        HashMap<base::ProcessId, ProcInfo> gathered;
-        if (!gathered.reserve(requests.Length())) {
-          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-          return;
-        }
-        for (const auto& request : requests) {
-          // opening the stat file and reading its content
-          StatReader reader(request.pid);
-          ProcInfo info;
-          nsresult rv = reader.ParseProc(info);
-          if (NS_FAILED(rv)) {
-            // Can't read data for this proc.
-            // Probably either a sandboxing issue or a race condition, e.g.
-            // the process has been just been killed. Regardless, skip process.
-            continue;
-          }
-          // Computing the resident unique size is somewhat tricky,
-          // so we use about:memory's implementation. This implementation
-          // reopens `/proc/[pid]`, so there is the risk of an additional
-          // race condition. In that case, the result is `0`.
-          info.residentUniqueSize =
-              nsMemoryReporterManager::ResidentUnique(request.pid);
-
-          // Extra info
-          info.pid = request.pid;
-          info.childId = request.childId;
-          info.type = request.processType;
-          info.origin = request.origin;
-          info.windows = std::move(request.windowInfo);
-
-          // Let's look at the threads
-          nsCString taskPath;
-          taskPath.AppendPrintf("/proc/%u/task", request.pid);
-          DIR* dirHandle = opendir(taskPath.get());
-          if (!dirHandle) {
-            // For some reason, we have no data on the threads for this process.
-            // Most likely reason is that we have just lost a race condition and
-            // the process is dead.
-            // Let's stop here and ignore the entire process.
-            continue;
-          }
-          auto cleanup = mozilla::MakeScopeExit([&] { closedir(dirHandle); });
-
-          // If we can't read some thread info, we ignore that thread.
-          dirent* entry;
-          while ((entry = readdir(dirHandle)) != nullptr) {
-            if (entry->d_name[0] == '.') {
-              continue;
-            }
-            // Threads have a stat file, like processes.
-            nsAutoCString entryName(entry->d_name);
-            int32_t tid = entryName.ToInteger(&rv);
-            if (NS_FAILED(rv)) {
-              continue;
-            }
-            ThreadInfoReader reader(request.pid, tid);
-            ThreadInfo threadInfo;
-            rv = reader.ParseThread(threadInfo);
-            if (NS_FAILED(rv)) {
-              continue;
-            }
-            info.threads.AppendElement(threadInfo);
-          }
-
-          if (!gathered.put(request.pid, std::move(info))) {
-            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-            return;
-          }
-        }
-
-        // ... and we're done!
-        holder->Resolve(std::move(gathered), __func__);
-      });
-
-  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
-  }
-  return promise;
-}
-
-}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/widget/gtk/ScreenHelperGTK.cpp firefox-85.0+build1/widget/gtk/ScreenHelperGTK.cpp
--- firefox-84.0.2+build1/widget/gtk/ScreenHelperGTK.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/ScreenHelperGTK.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -32,8 +32,7 @@
   self->RefreshScreens();
 }
 
-static void screen_resolution_changed(GdkScreen* aScreen,
-                                      GParamSpec* aPspec,
+static void screen_resolution_changed(GdkScreen* aScreen, GParamSpec* aPspec,
                                       ScreenHelperGTK* self) {
   self->RefreshScreens();
 }
diff -Nru firefox-84.0.2+build1/widget/gtk/WidgetStyleCache.cpp firefox-85.0+build1/widget/gtk/WidgetStyleCache.cpp
--- firefox-84.0.2+build1/widget/gtk/WidgetStyleCache.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/WidgetStyleCache.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -437,25 +437,37 @@
   return widget;
 }
 
-static void CreateHeaderBarWidget(WidgetNodeType aAppearance) {
-  MOZ_ASSERT(sWidgetStorage[aAppearance] == nullptr,
-             "Header bar widget is already created!");
+void GtkWindowSetTitlebar(GtkWindow* aWindow, GtkWidget* aWidget) {
+  static auto sGtkWindowSetTitlebar = (void (*)(GtkWindow*, GtkWidget*))dlsym(
+      RTLD_DEFAULT, "gtk_window_set_titlebar");
+  sGtkWindowSetTitlebar(aWindow, aWidget);
+}
 
+GtkWidget* GtkHeaderBarNew() {
   static auto sGtkHeaderBarNewPtr =
       (GtkWidget * (*)()) dlsym(RTLD_DEFAULT, "gtk_header_bar_new");
+  return sGtkHeaderBarNewPtr();
+}
 
-  GtkWidget* headerbar = sGtkHeaderBarNewPtr();
-  sWidgetStorage[aAppearance] = headerbar;
+bool IsSolidCSDStyleUsed() {
+  static bool isSolidCSDStyleUsed = []() {
+    GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkWindowSetTitlebar(GTK_WINDOW(window), GtkHeaderBarNew());
+    gtk_widget_realize(window);
+    GtkStyleContext* windowStyle = gtk_widget_get_style_context(window);
+    bool ret = gtk_style_context_has_class(windowStyle, "solid-csd");
+    gtk_widget_destroy(window);
+    return ret;
+  }();
+  return isSolidCSDStyleUsed;
+}
 
-  GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  static auto sGtkWindowSetTitlebar = (void (*)(GtkWindow*, GtkWidget*))dlsym(
-      RTLD_DEFAULT, "gtk_window_set_titlebar");
-  MOZ_ASSERT(sGtkWindowSetTitlebar,
-             "Missing gtk_window_set_titlebar(), old Gtk+ library?");
-  sGtkWindowSetTitlebar(GTK_WINDOW(window), headerbar);
-  gtk_widget_realize(window);
+static void CreateHeaderBarWidget(WidgetNodeType aAppearance) {
+  sWidgetStorage[aAppearance] = GtkHeaderBarNew();
 
+  GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   GtkStyleContext* style = gtk_widget_get_style_context(window);
+
   if (aAppearance == MOZ_GTK_HEADER_BAR_MAXIMIZED) {
     gtk_style_context_add_class(style, "maximized");
     MOZ_ASSERT(sWidgetStorage[MOZ_GTK_HEADERBAR_WINDOW_MAXIMIZED] == nullptr,
@@ -467,8 +479,17 @@
     sWidgetStorage[MOZ_GTK_HEADERBAR_WINDOW] = window;
   }
 
+  // Headerbar has to be placed to window with csd or solid-csd style
+  // to properly draw the decorated.
+  gtk_style_context_add_class(style,
+                              IsSolidCSDStyleUsed() ? "solid-csd" : "csd");
+
+  GtkWidget* fixed = gtk_fixed_new();
+  gtk_container_add(GTK_CONTAINER(window), fixed);
+  gtk_container_add(GTK_CONTAINER(fixed), sWidgetStorage[aAppearance]);
+
   // Emulate what create_titlebar() at gtkwindow.c does.
-  style = gtk_widget_get_style_context(headerbar);
+  style = gtk_widget_get_style_context(sWidgetStorage[aAppearance]);
   gtk_style_context_add_class(style, "titlebar");
 
   // TODO: Define default-decoration titlebar style as workaround
diff -Nru firefox-84.0.2+build1/widget/gtk/WidgetStyleCache.h firefox-85.0+build1/widget/gtk/WidgetStyleCache.h
--- firefox-84.0.2+build1/widget/gtk/WidgetStyleCache.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/WidgetStyleCache.h	2021-01-18 19:58:27.000000000 +0000
@@ -52,6 +52,8 @@
 
 void ResetWidgetCache(void);
 
+bool IsSolidCSDStyleUsed();
+
 void StyleContextSetScale(GtkStyleContext* style, gint aScaleFactor);
 
 #endif  // WidgetStyleCache_h
diff -Nru firefox-84.0.2+build1/widget/gtk/WidgetUtilsGtk.cpp firefox-85.0+build1/widget/gtk/WidgetUtilsGtk.cpp
--- firefox-84.0.2+build1/widget/gtk/WidgetUtilsGtk.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/WidgetUtilsGtk.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -43,7 +43,9 @@
   return result;
 }
 
-bool IsMainWindowTransparent() { return nsWindow::IsMainWindowTransparent(); }
+bool IsMainWindowTransparent() {
+  return nsWindow::IsToplevelWindowTransparent();
+}
 
 }  // namespace widget
 
diff -Nru firefox-84.0.2+build1/widget/gtk/WindowSurfaceProvider.cpp firefox-85.0+build1/widget/gtk/WindowSurfaceProvider.cpp
--- firefox-84.0.2+build1/widget/gtk/WindowSurfaceProvider.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/WindowSurfaceProvider.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "WindowSurfaceProvider.h"
 
 #include "gfxPlatformGtk.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "nsWindow.h"
 #include "WindowSurfaceX11Image.h"
diff -Nru firefox-84.0.2+build1/widget/gtk/WindowSurfaceWayland.cpp firefox-85.0+build1/widget/gtk/WindowSurfaceWayland.cpp
--- firefox-84.0.2+build1/widget/gtk/WindowSurfaceWayland.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/gtk/WindowSurfaceWayland.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -16,6 +16,7 @@
 #include "nsTArray.h"
 #include "base/message_loop.h"  // for MessageLoop
 #include "base/task.h"          // for NewRunnableMethod, etc
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_widget.h"
 
 #include <sys/mman.h>
@@ -160,18 +161,12 @@
 #define BUFFER_BPP 4
 gfx::SurfaceFormat WindowBackBuffer::mFormat = gfx::SurfaceFormat::B8G8R8A8;
 
-static mozilla::Mutex* gDelayedCommitLock = nullptr;
+static StaticMutex gDelayedCommitLock;
 static GList* gDelayedCommits = nullptr;
 
-static void DelayedCommitsEnsureMutext() {
-  if (!gDelayedCommitLock) {
-    gDelayedCommitLock = new mozilla::Mutex("DelayedCommit lock");
-  }
-}
-
 static bool DelayedCommitsCheckAndRemoveSurface(
     WindowSurfaceWayland* aSurface) {
-  MutexAutoLock lock(*gDelayedCommitLock);
+  StaticMutexAutoLock lock(gDelayedCommitLock);
   GList* foundCommit = g_list_find(gDelayedCommits, aSurface);
   if (foundCommit) {
     gDelayedCommits = g_list_delete_link(gDelayedCommits, foundCommit);
@@ -180,7 +175,7 @@
 }
 
 static bool DelayedCommitsCheckAndAddSurface(WindowSurfaceWayland* aSurface) {
-  MutexAutoLock lock(*gDelayedCommitLock);
+  StaticMutexAutoLock lock(gDelayedCommitLock);
   GList* foundCommit = g_list_find(gDelayedCommits, aSurface);
   if (!foundCommit) {
     gDelayedCommits = g_list_prepend(gDelayedCommits, aSurface);
@@ -485,7 +480,6 @@
   for (int i = 0; i < BACK_BUFFER_NUM; i++) {
     mShmBackupBuffer[i] = nullptr;
   }
-  DelayedCommitsEnsureMutext();
 }
 
 WindowSurfaceWayland::~WindowSurfaceWayland() {
diff -Nru firefox-84.0.2+build1/widget/headless/HeadlessLookAndFeelGTK.cpp firefox-85.0+build1/widget/headless/HeadlessLookAndFeelGTK.cpp
--- firefox-84.0.2+build1/widget/headless/HeadlessLookAndFeelGTK.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/headless/HeadlessLookAndFeelGTK.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -126,11 +126,8 @@
   return res;
 }
 
-nsresult HeadlessLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
-
+nsresult HeadlessLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
+  nsresult res = NS_OK;
   // These values should be sane defaults for headless mode under GTK.
   switch (aID) {
     case IntID::CaretBlinkTime:
@@ -301,7 +298,7 @@
       break;
     default:
       NS_WARNING(
-          "HeadlessLookAndFeel::GetIntImpl called with an unrecognized aID");
+          "HeadlessLookAndFeel::NativeGetInt called with an unrecognized aID");
       aResult = 0;
       res = NS_ERROR_FAILURE;
       break;
@@ -309,10 +306,8 @@
   return res;
 }
 
-nsresult HeadlessLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsresult HeadlessLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult res = NS_OK;
 
   // Hardcoded values for GTK.
   switch (aID) {
@@ -329,7 +324,8 @@
       break;
     default:
       NS_WARNING(
-          "HeadlessLookAndFeel::GetFloatImpl called with an unrecognized aID");
+          "HeadlessLookAndFeel::NativeGetFloat called with an unrecognized "
+          "aID");
       aResult = -1.0;
       res = NS_ERROR_FAILURE;
       break;
@@ -338,8 +334,8 @@
   return res;
 }
 
-bool HeadlessLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName,
-                                      gfxFontStyle& aFontStyle) {
+bool HeadlessLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName,
+                                        gfxFontStyle& aFontStyle) {
   // Default to san-serif for everything.
   aFontStyle.style = FontSlantStyle::Normal();
   aFontStyle.weight = FontWeight::Normal();
diff -Nru firefox-84.0.2+build1/widget/headless/HeadlessLookAndFeel.h firefox-85.0+build1/widget/headless/HeadlessLookAndFeel.h
--- firefox-84.0.2+build1/widget/headless/HeadlessLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/headless/HeadlessLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -23,12 +23,12 @@
   HeadlessLookAndFeel();
   virtual ~HeadlessLookAndFeel();
 
-  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
   void NativeInit() final{};
-  virtual nsresult GetIntImpl(IntID aID, int32_t& aResult) override;
-  virtual nsresult GetFloatImpl(FloatID aID, float& aResult) override;
-  virtual bool GetFontImpl(FontID aID, nsString& aFontName,
-                           gfxFontStyle& aFontStyle) override;
+  virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
+  virtual nsresult NativeGetFloat(FloatID aID, float& aResult) override;
+  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
+  virtual bool NativeGetFont(FontID aID, nsString& aFontName,
+                             gfxFontStyle& aFontStyle) override;
 
   virtual void RefreshImpl() override;
   virtual char16_t GetPasswordCharacterImpl() override;
diff -Nru firefox-84.0.2+build1/widget/IMEData.cpp firefox-85.0+build1/widget/IMEData.cpp
--- firefox-84.0.2+build1/widget/IMEData.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/IMEData.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,10 +6,162 @@
 #include "IMEData.h"
 #include <sstream>
 
+#include "gfxFontUtils.h"
+
 #include "mozilla/WritingModes.h"
 
+#include "nsPrintfCString.h"
+#include "nsString.h"
+
 namespace mozilla {
 
+PrintStringDetail::PrintStringDetail(const nsAString& aString,
+                                     uint32_t aMaxLength /* = UINT32_MAX */) {
+  Assign("\"");
+  const uint32_t kFirstHalf =
+      aString.Length() <= aMaxLength ? UINT32_MAX : (aMaxLength + 1) / 2;
+  const uint32_t kSecondHalf =
+      aString.Length() <= aMaxLength ? 0 : aMaxLength / 2;
+  for (uint32_t i = 0; i < aString.Length(); i++) {
+    if (i > 0) {
+      Append(" ");
+    }
+    char32_t ch = aString.CharAt(i);
+    if (NS_IS_HIGH_SURROGATE(ch) && i + 1 < aString.Length() &&
+        NS_IS_LOW_SURROGATE(aString.CharAt(i + 1))) {
+      ch = SURROGATE_TO_UCS4(ch, aString.CharAt(i + 1));
+    }
+    Append(PrintCharData(ch));
+    if (i + 1 == kFirstHalf) {
+      Append(" ...");
+      i = aString.Length() - kSecondHalf - 1;
+      if (NS_IS_LOW_SURROGATE(aString.CharAt(i)) &&
+          NS_IS_HIGH_SURROGATE(aString.CharAt(i - 1))) {
+        if (i - 1 <= kFirstHalf) {
+          i++;
+        } else {
+          i--;
+        }
+      }
+    } else if (!IS_IN_BMP(ch)) {
+      i++;
+    }
+  }
+  Append("\"");
+}
+
+// static
+nsCString PrintStringDetail::PrintCharData(char32_t aChar) {
+  switch (aChar) {
+    case 0x0000:
+      return "NULL (0x0000)"_ns;
+    case 0x0008:
+      return "BACKSPACE (0x0008)"_ns;
+    case 0x0009:
+      return "CHARACTER TABULATION (0x0009)"_ns;
+    case 0x000A:
+      return "LINE FEED (0x000A)"_ns;
+    case 0x000B:
+      return "LINE TABULATION (0x000B)"_ns;
+    case 0x000C:
+      return "FORM FEED (0x000C)"_ns;
+    case 0x000D:
+      return "CARRIAGE RETURN (0x000D)"_ns;
+    case 0x0018:
+      return "CANCEL (0x0018)"_ns;
+    case 0x001B:
+      return "ESCAPE (0x001B)"_ns;
+    case 0x0020:
+      return "SPACE (0x0020)"_ns;
+    case 0x007F:
+      return "DELETE (0x007F)"_ns;
+    case 0x00A0:
+      return "NO-BREAK SPACE (0x00A0)"_ns;
+    case 0x00AD:
+      return "SOFT HYPHEN (0x00AD)"_ns;
+    case 0x2000:
+      return "EN QUAD (0x2000)"_ns;
+    case 0x2001:
+      return "EM QUAD (0x2001)"_ns;
+    case 0x2002:
+      return "EN SPACE (0x2002)"_ns;
+    case 0x2003:
+      return "EM SPACE (0x2003)"_ns;
+    case 0x2004:
+      return "THREE-PER-EM SPACE (0x2004)"_ns;
+    case 0x2005:
+      return "FOUR-PER-EM SPACE (0x2005)"_ns;
+    case 0x2006:
+      return "SIX-PER-EM SPACE (0x2006)"_ns;
+    case 0x2007:
+      return "FIGURE SPACE (0x2007)"_ns;
+    case 0x2008:
+      return "PUNCTUATION SPACE (0x2008)"_ns;
+    case 0x2009:
+      return "THIN SPACE (0x2009)"_ns;
+    case 0x200A:
+      return "HAIR SPACE (0x200A)"_ns;
+    case 0x200B:
+      return "ZERO WIDTH SPACE (0x200B)"_ns;
+    case 0x200C:
+      return "ZERO WIDTH NON-JOINER (0x200C)"_ns;
+    case 0x200D:
+      return "ZERO WIDTH JOINER (0x200D)"_ns;
+    case 0x200E:
+      return "LEFT-TO-RIGHT MARK (0x200E)"_ns;
+    case 0x200F:
+      return "RIGHT-TO-LEFT MARK (0x200F)"_ns;
+    case 0x2029:
+      return "PARAGRAPH SEPARATOR (0x2029)"_ns;
+    case 0x202A:
+      return "LEFT-TO-RIGHT EMBEDDING (0x202A)"_ns;
+    case 0x202B:
+      return "RIGHT-TO-LEFT EMBEDDING (0x202B)"_ns;
+    case 0x202D:
+      return "LEFT-TO-RIGHT OVERRIDE (0x202D)"_ns;
+    case 0x202E:
+      return "RIGHT-TO-LEFT OVERRIDE (0x202E)"_ns;
+    case 0x202F:
+      return "NARROW NO-BREAK SPACE (0x202F)"_ns;
+    case 0x205F:
+      return "MEDIUM MATHEMATICAL SPACE (0x205F)"_ns;
+    case 0x2060:
+      return "WORD JOINER (0x2060)"_ns;
+    case 0x2066:
+      return "LEFT-TO-RIGHT ISOLATE (0x2066)"_ns;
+    case 0x2067:
+      return "RIGHT-TO-LEFT ISOLATE (0x2067)"_ns;
+    case 0x3000:
+      return "IDEOGRAPHIC SPACE (0x3000)"_ns;
+    case 0xFEFF:
+      return "ZERO WIDTH NO-BREAK SPACE (0xFEFF)"_ns;
+    default: {
+      if (aChar < ' ' || (aChar >= 0x80 && aChar < 0xA0)) {
+        return nsPrintfCString("Control (0x%04X)", aChar);
+      }
+      if (NS_IS_HIGH_SURROGATE(aChar)) {
+        return nsPrintfCString("High Surrogate (0x%04X)", aChar);
+      }
+      if (NS_IS_LOW_SURROGATE(aChar)) {
+        return nsPrintfCString("Low Surrogate (0x%04X)", aChar);
+      }
+      if (gfxFontUtils::IsVarSelector(aChar)) {
+        return IS_IN_BMP(aChar)
+                   ? nsPrintfCString("Variant Selector (0x%04X)", aChar)
+                   : nsPrintfCString("Variant Selector (0x%08X)", aChar);
+      }
+      nsAutoString utf16Str;
+      AppendUCS4ToUTF16(aChar, utf16Str);
+      return IS_IN_BMP(aChar)
+                 ? nsPrintfCString("'%s' (0x%04X)",
+                                   NS_ConvertUTF16toUTF8(utf16Str).get(), aChar)
+                 : nsPrintfCString("'%s' (0x%08X)",
+                                   NS_ConvertUTF16toUTF8(utf16Str).get(),
+                                   aChar);
+    }
+  }
+}
+
 namespace widget {
 
 std::ostream& operator<<(std::ostream& aStream,
diff -Nru firefox-84.0.2+build1/widget/IMEData.h firefox-85.0+build1/widget/IMEData.h
--- firefox-84.0.2+build1/widget/IMEData.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/IMEData.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,7 +6,9 @@
 #ifndef mozilla_widget_IMEData_h_
 #define mozilla_widget_IMEData_h_
 
+#include "mozilla/CheckedInt.h"
 #include "mozilla/EventForwards.h"
+#include "mozilla/ToString.h"
 
 #include "nsPoint.h"
 #include "nsRect.h"
@@ -20,6 +22,167 @@
 
 class WritingMode;
 
+// Helper class to logging string which may contain various Unicode characters
+// and/or may be too long string for logging.
+class MOZ_STACK_CLASS PrintStringDetail : public nsAutoCString {
+ public:
+  static constexpr uint32_t kMaxLengthForCompositionString = 8;
+  static constexpr uint32_t kMaxLengthForSelectedString = 12;
+  static constexpr uint32_t kMaxLengthForEditor = 20;
+
+  PrintStringDetail() = delete;
+  explicit PrintStringDetail(const nsAString& aString,
+                             uint32_t aMaxLength = UINT32_MAX);
+
+ private:
+  static nsCString PrintCharData(char32_t aChar);
+};
+
+// StartAndEndOffsets represents a range in flat-text.
+template <typename IntType>
+class StartAndEndOffsets {
+ protected:
+  static IntType MaxOffset() { return std::numeric_limits<IntType>::max(); }
+
+ public:
+  StartAndEndOffsets() = delete;
+  explicit StartAndEndOffsets(IntType aStartOffset, IntType aEndOffset)
+      : mStartOffset(aStartOffset),
+        mEndOffset(aStartOffset <= aEndOffset ? aEndOffset : aStartOffset) {
+    MOZ_ASSERT(aStartOffset <= mEndOffset);
+  }
+
+  IntType StartOffset() const { return mStartOffset; }
+  IntType Length() const { return mEndOffset - mStartOffset; }
+  IntType EndOffset() const { return mEndOffset; }
+
+  bool IsOffsetInRange(IntType aOffset) const {
+    return aOffset >= mStartOffset && aOffset < mEndOffset;
+  }
+  bool IsOffsetInRangeOrEndOffset(IntType aOffset) const {
+    return aOffset >= mStartOffset && aOffset <= mEndOffset;
+  }
+
+  void MoveTo(IntType aNewStartOffset) {
+    auto delta = static_cast<int64_t>(mStartOffset) - aNewStartOffset;
+    mStartOffset += delta;
+    mEndOffset += delta;
+  }
+  void SetOffsetAndLength(IntType aNewOffset, IntType aNewLength) {
+    mStartOffset = aNewOffset;
+    CheckedInt<IntType> endOffset(aNewOffset + aNewLength);
+    mEndOffset = endOffset.isValid() ? endOffset.value() : MaxOffset();
+  }
+  void SetEndOffset(IntType aEndOffset) {
+    MOZ_ASSERT(mStartOffset <= aEndOffset);
+    mEndOffset = std::max(aEndOffset, mStartOffset);
+  }
+  void SetStartAndEndOffsets(IntType aStartOffset, IntType aEndOffset) {
+    MOZ_ASSERT(aStartOffset <= aEndOffset);
+    mStartOffset = aStartOffset;
+    mEndOffset = aStartOffset <= aEndOffset ? aEndOffset : aStartOffset;
+  }
+  void SetLength(IntType aNewLength) {
+    CheckedInt<IntType> endOffset(mStartOffset + aNewLength);
+    mEndOffset = endOffset.isValid() ? endOffset.value() : MaxOffset();
+  }
+
+  friend std::ostream& operator<<(
+      std::ostream& aStream,
+      const StartAndEndOffsets<IntType>& aStartAndEndOffsets) {
+    aStream << "{ mStartOffset=" << aStartAndEndOffsets.mStartOffset
+            << ", mEndOffset=" << aStartAndEndOffsets.mEndOffset
+            << ", Length()=" << aStartAndEndOffsets.Length() << " }";
+    return aStream;
+  }
+
+ private:
+  IntType mStartOffset;
+  IntType mEndOffset;
+};
+
+// OffsetAndData class is designed for storing composition string and its
+// start offset.  Length() and EndOffset() return only valid length or
+// offset.  I.e., if the string is too long for inserting at the offset,
+// the length is shrunken.  However, the string itself is not shrunken.
+// Therefore, moving it to where all of the string can be contained,
+// they will return longer/bigger value.
+enum class OffsetAndDataFor {
+  CompositionString,
+  SelectedString,
+  EditorString,
+};
+template <typename IntType>
+class OffsetAndData {
+ protected:
+  static IntType MaxOffset() { return std::numeric_limits<IntType>::max(); }
+
+ public:
+  OffsetAndData() = delete;
+  explicit OffsetAndData(
+      IntType aStartOffset, const nsAString& aData,
+      OffsetAndDataFor aFor = OffsetAndDataFor::CompositionString)
+      : mData(aData), mOffset(aStartOffset), mFor(aFor) {}
+
+  IntType StartOffset() const { return mOffset; }
+  IntType Length() const {
+    CheckedInt<IntType> endOffset(mOffset + mData.Length());
+    return endOffset.isValid() ? mData.Length() : MaxOffset() - mOffset;
+  }
+  IntType EndOffset() const { return mOffset + Length(); }
+  StartAndEndOffsets<IntType> CreateStartAndEndOffsets() const {
+    return StartAndEndOffsets<IntType>(StartOffset(), EndOffset());
+  }
+  const nsString& DataRef() const {
+    // In strictly speaking, we should return substring which may be shrunken
+    // for rounding to the max offset.  However, it's unrealistic edge case,
+    // and creating new string is not so cheap job in a hot path.  Therefore,
+    // this just returns the data as-is.
+    return mData;
+  }
+  bool IsDataEmpty() const { return mData.IsEmpty(); }
+
+  bool IsOffsetInRange(IntType aOffset) const {
+    return aOffset >= mOffset && aOffset < EndOffset();
+  }
+  bool IsOffsetInRangeOrEndOffset(IntType aOffset) const {
+    return aOffset >= mOffset && aOffset <= EndOffset();
+  }
+
+  void MoveTo(IntType aNewOffset) { mOffset = aNewOffset; }
+  void SetOffsetAndData(IntType aStartOffset, const nsAString& aData) {
+    mOffset = aStartOffset;
+    mData = aData;
+  }
+  void SetData(const nsAString& aData) { mData = aData; }
+  void TruncateData(uint32_t aLength = 0) { mData.Truncate(aLength); }
+  void ReplaceData(nsAString::size_type aCutStart,
+                   nsAString::size_type aCutLength,
+                   const nsAString& aNewString) {
+    mData.Replace(aCutStart, aCutLength, aNewString);
+  }
+
+  friend std::ostream& operator<<(
+      std::ostream& aStream, const OffsetAndData<IntType>& aOffsetAndData) {
+    const auto maxDataLength =
+        aOffsetAndData.mFor == OffsetAndDataFor::CompositionString
+            ? PrintStringDetail::kMaxLengthForCompositionString
+            : (aOffsetAndData.mFor == OffsetAndDataFor::SelectedString
+                   ? PrintStringDetail::kMaxLengthForSelectedString
+                   : PrintStringDetail::kMaxLengthForEditor);
+    aStream << "{ mOffset=" << aOffsetAndData.mOffset << ", mData="
+            << PrintStringDetail(aOffsetAndData.mData, maxDataLength).get()
+            << ", Length()=" << aOffsetAndData.Length()
+            << ", EndOffset()=" << aOffsetAndData.EndOffset() << " }";
+    return aStream;
+  }
+
+ private:
+  nsString mData;
+  IntType mOffset;
+  OffsetAndDataFor mFor;
+};
+
 namespace widget {
 
 /**
diff -Nru firefox-84.0.2+build1/widget/InProcessCompositorWidget.cpp firefox-85.0+build1/widget/InProcessCompositorWidget.cpp
--- firefox-84.0.2+build1/widget/InProcessCompositorWidget.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/InProcessCompositorWidget.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -34,7 +34,15 @@
 
 InProcessCompositorWidget::InProcessCompositorWidget(
     const layers::CompositorOptions& aOptions, nsBaseWidget* aWidget)
-    : CompositorWidget(aOptions), mWidget(aWidget) {}
+    : CompositorWidget(aOptions), mWidget(aWidget) {
+  // The only method of construction that is used outside of unit tests is
+  // ::CreateLocal, above. That method of construction asserts that mWidget
+  // is not assigned a NULL value. And yet mWidget is NULL in some crash
+  // reports that involve other class methods. Adding a release assert here
+  // will give us the earliest possible notification that we're headed for
+  // a crash.
+  MOZ_RELEASE_ASSERT(mWidget);
+}
 
 bool InProcessCompositorWidget::PreRender(WidgetRenderingContext* aContext) {
   return mWidget->PreRender(aContext);
diff -Nru firefox-84.0.2+build1/widget/moz.build firefox-85.0+build1/widget/moz.build
--- firefox-84.0.2+build1/widget/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -161,7 +161,6 @@
     "LookAndFeel.h",
     "MiscEvents.h",
     "MouseEvents.h",
-    "ProcInfo.h",
     "TextEventDispatcher.h",
     "TextEventDispatcherListener.h",
     "TextEvents.h",
@@ -220,6 +219,7 @@
     "ScrollbarDrawingMac.cpp",
     "SharedWidgetUtils.cpp",
     "TextEventDispatcher.cpp",
+    "TouchResampler.cpp",
     "VsyncDispatcher.cpp",
     "WidgetEventImpl.cpp",
     "WidgetUtils.cpp",
diff -Nru firefox-84.0.2+build1/widget/nsBaseDragService.cpp firefox-85.0+build1/widget/nsBaseDragService.cpp
--- firefox-84.0.2+build1/widget/nsBaseDragService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsBaseDragService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -46,6 +46,7 @@
 #include "mozilla/gfx/2D.h"
 #include "nsFrameLoader.h"
 #include "BrowserParent.h"
+#include "GeckoProfiler.h"
 #include "nsIMutableArray.h"
 #include "gfxContext.h"
 #include "gfxPlatform.h"
diff -Nru firefox-84.0.2+build1/widget/nsFilePickerProxy.cpp firefox-85.0+build1/widget/nsFilePickerProxy.cpp
--- firefox-84.0.2+build1/widget/nsFilePickerProxy.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsFilePickerProxy.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsIFile.h"
 #include "nsSimpleEnumerator.h"
+#include "mozilla/dom/BlobImpl.h"
 #include "mozilla/dom/Directory.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/BrowserChild.h"
diff -Nru firefox-84.0.2+build1/widget/nsGUIEventIPC.h firefox-85.0+build1/widget/nsGUIEventIPC.h
--- firefox-84.0.2+build1/widget/nsGUIEventIPC.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsGUIEventIPC.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,10 +6,12 @@
 #ifndef nsGUIEventIPC_h__
 #define nsGUIEventIPC_h__
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/ContentCache.h"
 #include "mozilla/GfxMessageUtils.h"
 #include "mozilla/dom/Touch.h"
+#include "mozilla/layers/LayersMessageUtils.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/TextEvents.h"
@@ -627,67 +629,6 @@
 };
 
 template <>
-struct ParamTraits<mozilla::WidgetQueryContentEvent::Input> {
-  typedef mozilla::WidgetQueryContentEvent::Input paramType;
-  typedef mozilla::WidgetQueryContentEvent event;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, aParam.mOffset);
-    WriteParam(aMsg, aParam.mLength);
-    WriteParam(aMsg, mozilla::ToRawSelectionType(aParam.mSelectionType));
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    mozilla::RawSelectionType rawSelectionType = 0;
-    bool ok = ReadParam(aMsg, aIter, &aResult->mOffset) &&
-              ReadParam(aMsg, aIter, &aResult->mLength) &&
-              ReadParam(aMsg, aIter, &rawSelectionType);
-    aResult->mSelectionType = mozilla::ToSelectionType(rawSelectionType);
-    return ok;
-  }
-};
-
-template <>
-struct ParamTraits<mozilla::WidgetQueryContentEvent> {
-  typedef mozilla::WidgetQueryContentEvent paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam) {
-    WriteParam(aMsg, static_cast<const mozilla::WidgetGUIEvent&>(aParam));
-    WriteParam(aMsg, aParam.mSucceeded);
-    WriteParam(aMsg, aParam.mUseNativeLineBreak);
-    WriteParam(aMsg, aParam.mWithFontRanges);
-    WriteParam(aMsg, aParam.mInput);
-    WriteParam(aMsg, aParam.mReply.mOffset);
-    WriteParam(aMsg, aParam.mReply.mTentativeCaretOffset);
-    WriteParam(aMsg, aParam.mReply.mString);
-    WriteParam(aMsg, aParam.mReply.mRect);
-    WriteParam(aMsg, aParam.mReply.mReversed);
-    WriteParam(aMsg, aParam.mReply.mHasSelection);
-    WriteParam(aMsg, aParam.mReply.mWidgetIsHit);
-    WriteParam(aMsg, aParam.mReply.mFontRanges);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter,
-                   paramType* aResult) {
-    return ReadParam(aMsg, aIter,
-                     static_cast<mozilla::WidgetGUIEvent*>(aResult)) &&
-           ReadParam(aMsg, aIter, &aResult->mSucceeded) &&
-           ReadParam(aMsg, aIter, &aResult->mUseNativeLineBreak) &&
-           ReadParam(aMsg, aIter, &aResult->mWithFontRanges) &&
-           ReadParam(aMsg, aIter, &aResult->mInput) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mOffset) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mTentativeCaretOffset) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mString) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mRect) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mReversed) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mHasSelection) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mWidgetIsHit) &&
-           ReadParam(aMsg, aIter, &aResult->mReply.mFontRanges);
-  }
-};
-
-template <>
 struct ParamTraits<mozilla::WidgetSelectionEvent> {
   typedef mozilla::WidgetSelectionEvent paramType;
 
@@ -1031,25 +972,77 @@
 };
 
 template <>
+struct ParamTraits<mozilla::ContentCache::Selection> {
+  typedef mozilla::ContentCache::Selection paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mAnchor);
+    WriteParam(aMsg, aParam.mFocus);
+    WriteParam(aMsg, aParam.mWritingMode);
+    WriteParam(aMsg, aParam.mAnchorCharRects[0]);
+    WriteParam(aMsg, aParam.mAnchorCharRects[1]);
+    WriteParam(aMsg, aParam.mFocusCharRects[0]);
+    WriteParam(aMsg, aParam.mFocusCharRects[1]);
+    WriteParam(aMsg, aParam.mRect);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->mAnchor) &&
+           ReadParam(aMsg, aIter, &aResult->mFocus) &&
+           ReadParam(aMsg, aIter, &aResult->mWritingMode) &&
+           ReadParam(aMsg, aIter, &aResult->mAnchorCharRects[0]) &&
+           ReadParam(aMsg, aIter, &aResult->mAnchorCharRects[1]) &&
+           ReadParam(aMsg, aIter, &aResult->mFocusCharRects[0]) &&
+           ReadParam(aMsg, aIter, &aResult->mFocusCharRects[1]) &&
+           ReadParam(aMsg, aIter, &aResult->mRect);
+  }
+};
+
+template <>
+struct ParamTraits<mozilla::ContentCache::Caret> {
+  typedef mozilla::ContentCache::Caret paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mOffset);
+    WriteParam(aMsg, aParam.mRect);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->mOffset) &&
+           ReadParam(aMsg, aIter, &aResult->mRect);
+  }
+};
+
+template <>
+struct ParamTraits<mozilla::ContentCache::TextRectArray> {
+  typedef mozilla::ContentCache::TextRectArray paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam) {
+    WriteParam(aMsg, aParam.mStart);
+    WriteParam(aMsg, aParam.mRects);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter,
+                   paramType* aResult) {
+    return ReadParam(aMsg, aIter, &aResult->mStart) &&
+           ReadParam(aMsg, aIter, &aResult->mRects);
+  }
+};
+
+template <>
 struct ParamTraits<mozilla::ContentCache> {
   typedef mozilla::ContentCache paramType;
 
   static void Write(Message* aMsg, const paramType& aParam) {
     WriteParam(aMsg, aParam.mCompositionStart);
     WriteParam(aMsg, aParam.mText);
-    WriteParam(aMsg, aParam.mSelection.mAnchor);
-    WriteParam(aMsg, aParam.mSelection.mFocus);
-    WriteParam(aMsg, aParam.mSelection.mWritingMode);
-    WriteParam(aMsg, aParam.mSelection.mAnchorCharRects[0]);
-    WriteParam(aMsg, aParam.mSelection.mAnchorCharRects[1]);
-    WriteParam(aMsg, aParam.mSelection.mFocusCharRects[0]);
-    WriteParam(aMsg, aParam.mSelection.mFocusCharRects[1]);
-    WriteParam(aMsg, aParam.mSelection.mRect);
+    WriteParam(aMsg, aParam.mSelection);
     WriteParam(aMsg, aParam.mFirstCharRect);
-    WriteParam(aMsg, aParam.mCaret.mOffset);
-    WriteParam(aMsg, aParam.mCaret.mRect);
-    WriteParam(aMsg, aParam.mTextRectArray.mStart);
-    WriteParam(aMsg, aParam.mTextRectArray.mRects);
+    WriteParam(aMsg, aParam.mCaret);
+    WriteParam(aMsg, aParam.mTextRectArray);
+    WriteParam(aMsg, aParam.mLastCommitStringTextRectArray);
     WriteParam(aMsg, aParam.mEditorRect);
   }
 
@@ -1057,19 +1050,11 @@
                    paramType* aResult) {
     return ReadParam(aMsg, aIter, &aResult->mCompositionStart) &&
            ReadParam(aMsg, aIter, &aResult->mText) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mAnchor) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mFocus) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mWritingMode) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mAnchorCharRects[0]) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mAnchorCharRects[1]) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mFocusCharRects[0]) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mFocusCharRects[1]) &&
-           ReadParam(aMsg, aIter, &aResult->mSelection.mRect) &&
+           ReadParam(aMsg, aIter, &aResult->mSelection) &&
            ReadParam(aMsg, aIter, &aResult->mFirstCharRect) &&
-           ReadParam(aMsg, aIter, &aResult->mCaret.mOffset) &&
-           ReadParam(aMsg, aIter, &aResult->mCaret.mRect) &&
-           ReadParam(aMsg, aIter, &aResult->mTextRectArray.mStart) &&
-           ReadParam(aMsg, aIter, &aResult->mTextRectArray.mRects) &&
+           ReadParam(aMsg, aIter, &aResult->mCaret) &&
+           ReadParam(aMsg, aIter, &aResult->mTextRectArray) &&
+           ReadParam(aMsg, aIter, &aResult->mLastCommitStringTextRectArray) &&
            ReadParam(aMsg, aIter, &aResult->mEditorRect);
   }
 };
diff -Nru firefox-84.0.2+build1/widget/nsIWidget.h firefox-85.0+build1/widget/nsIWidget.h
--- firefox-84.0.2+build1/widget/nsIWidget.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsIWidget.h	2021-01-18 19:58:27.000000000 +0000
@@ -6,33 +6,45 @@
 #ifndef nsIWidget_h__
 #define nsIWidget_h__
 
-#include "mozilla/UniquePtr.h"
-#include "nsISupports.h"
-#include "nsColor.h"
-#include "nsRect.h"
-#include "nsString.h"
-
-#include "nsCOMPtr.h"
-#include "nsWidgetInitData.h"
-#include "nsTArray.h"
-#include "nsITheme.h"
-#include "nsITimer.h"
-#include "nsRegionFwd.h"
-#include "nsXULAppAPI.h"
-#include "mozilla/Maybe.h"
+#include <cmath>
+#include <cstdint>
+#include "ErrorList.h"
+#include "Units.h"
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
-#include "mozilla/layers/ScrollableLayerGuid.h"
-#include "mozilla/layers/ZoomConstraints.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/gfx/Point.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/gfx/Matrix.h"
+#include "mozilla/gfx/Rect.h"
+#include "mozilla/layers/LayersTypes.h"
+#include "mozilla/layers/ScrollableLayerGuid.h"
+#include "mozilla/layers/ZoomConstraints.h"
 #include "mozilla/widget/IMEData.h"
-#include "VsyncSource.h"
+#include "nsCOMPtr.h"
+#include "nsColor.h"
 #include "nsDataHashtable.h"
+#include "nsDebug.h"
+#include "nsID.h"
 #include "nsIObserver.h"
+#include "nsISupports.h"
+#include "nsITheme.h"
+#include "nsITimer.h"
 #include "nsIWidgetListener.h"
-#include "Units.h"
-#include "mozilla/dom/BindingDeclarations.h"
+#include "nsRect.h"
+#include "nsSize.h"
+#include "nsStringFwd.h"
+#include "nsTArray.h"
+#include "nsWidgetInitData.h"
+#include "nsXULAppAPI.h"
+
+#ifdef MOZ_IS_GCC
+#  include "VsyncSource.h"
+#endif
 
 // forward declarations
 class nsIBidiKeyboard;
@@ -43,8 +55,15 @@
 class nsIScreen;
 class nsIRunnable;
 class nsIKeyEventInPluginCallback;
+class nsUint64HashKey;
 
 namespace mozilla {
+class NativeEventData;
+class WidgetGUIEvent;
+class WidgetInputEvent;
+class WidgetKeyboardEvent;
+class WidgetPluginEvent;
+struct FontRange;
 
 enum class StyleWindowShadow : uint8_t;
 
@@ -70,8 +89,7 @@
 class WebRenderBridgeChild;
 }  // namespace layers
 namespace gfx {
-class DrawTarget;
-class SourceSurface;
+class VsyncSource;
 }  // namespace gfx
 namespace widget {
 class TextEventDispatcher;
diff -Nru firefox-84.0.2+build1/widget/nsNativeBasicTheme.cpp firefox-85.0+build1/widget/nsNativeBasicTheme.cpp
--- firefox-84.0.2+build1/widget/nsNativeBasicTheme.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsNativeBasicTheme.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 #include "nsNativeBasicTheme.h"
 
 #include "gfxBlur.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/Types.h"
 #include "mozilla/gfx/Filters.h"
@@ -21,10 +22,11 @@
 NS_IMPL_ISUPPORTS_INHERITED(nsNativeBasicTheme, nsNativeTheme, nsITheme)
 
 /* static */
-uint32_t nsNativeBasicTheme::GetDPIRatio(nsIFrame* aFrame) {
-  return AppUnitsPerCSSPixel() / aFrame->PresContext()
-                                     ->DeviceContext()
-                                     ->AppUnitsPerDevPixelAtUnitFullZoom();
+auto nsNativeBasicTheme::GetDPIRatio(nsIFrame* aFrame) -> DPIRatio {
+  return DPIRatio(float(AppUnitsPerCSSPixel()) /
+                  aFrame->PresContext()
+                      ->DeviceContext()
+                      ->AppUnitsPerDevPixelAtUnitFullZoom());
 }
 
 /* static */
@@ -57,7 +59,48 @@
 }
 
 /* static */
-std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeCheckColors(
+LayoutDeviceRect nsNativeBasicTheme::FixAspectRatio(
+    const LayoutDeviceRect& aRect) {
+  // Checkbox and radio need to preserve aspect-ratio for compat.
+  LayoutDeviceRect rect(aRect);
+  if (rect.width == rect.height) {
+    return rect;
+  }
+
+  if (rect.width > rect.height) {
+    auto diff = rect.width - rect.height;
+    rect.width = rect.height;
+    rect.x += diff / 2;
+  } else {
+    auto diff = rect.height - rect.width;
+    rect.height = rect.width;
+    rect.y += diff / 2;
+  }
+
+  return rect;
+}
+
+/* static */
+void nsNativeBasicTheme::GetFocusStrokeRect(DrawTarget* aDrawTarget,
+                                            LayoutDeviceRect& aFocusRect,
+                                            LayoutDeviceCoord aOffset,
+                                            const LayoutDeviceCoord aRadius,
+                                            LayoutDeviceCoord aFocusWidth,
+                                            RefPtr<Path>& aOutRect) {
+  RectCornerRadii radii(aRadius, aRadius, aRadius, aRadius);
+  aFocusRect.y -= aOffset;
+  aFocusRect.x -= aOffset;
+  aFocusRect.width += 2.0f * aOffset;
+  aFocusRect.height += 2.0f * aOffset;
+  // Deflate the rect by half the border width, so that the middle of the
+  // stroke fills exactly the area we want to fill and not more.
+  LayoutDeviceRect focusRect(aFocusRect);
+  focusRect.Deflate(aFocusWidth * 0.5f);
+  aOutRect =
+      MakePathForRoundedRect(*aDrawTarget, focusRect.ToUnknownRect(), radii);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeCheckboxColors(
     const EventStates& aState) {
   bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
   bool isPressed = !isDisabled && aState.HasAllStates(NS_EVENT_STATE_HOVER |
@@ -65,178 +108,360 @@
   bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
   bool isChecked = aState.HasState(NS_EVENT_STATE_CHECKED);
 
-  sRGBColor fillColor = sColorWhite;
+  sRGBColor backgroundColor = sColorWhite;
   sRGBColor borderColor = sColorGrey40;
   if (isDisabled) {
     if (isChecked) {
-      fillColor = borderColor = sColorGrey40Alpha50;
+      backgroundColor = borderColor = sColorGrey40Alpha50;
     } else {
-      fillColor = sColorWhiteAlpha50;
+      backgroundColor = sColorWhiteAlpha50;
       borderColor = sColorGrey40Alpha50;
     }
   } else {
     if (isChecked) {
       if (isPressed) {
-        fillColor = borderColor = sColorAccentDarker;
+        backgroundColor = borderColor = sColorAccentDarker;
       } else if (isHovered) {
-        fillColor = borderColor = sColorAccentDark;
+        backgroundColor = borderColor = sColorAccentDark;
       } else {
-        fillColor = borderColor = sColorAccent;
+        backgroundColor = borderColor = sColorAccent;
       }
     } else if (isPressed) {
-      fillColor = sColorGrey20;
+      backgroundColor = sColorGrey20;
       borderColor = sColorGrey60;
     } else if (isHovered) {
-      fillColor = sColorWhite;
+      backgroundColor = sColorWhite;
       borderColor = sColorGrey50;
     } else {
-      fillColor = sColorWhite;
+      backgroundColor = sColorWhite;
       borderColor = sColorGrey40;
     }
   }
 
-  return std::make_pair(fillColor, borderColor);
+  return std::make_pair(backgroundColor, borderColor);
 }
 
-/* static */
-Rect nsNativeBasicTheme::FixAspectRatio(const Rect& aRect) {
-  // Checkbox and radio need to preserve aspect-ratio for compat.
-  Rect rect(aRect);
-  if (rect.width == rect.height) {
-    return rect;
+sRGBColor nsNativeBasicTheme::ComputeCheckmarkColor(const EventStates& aState) {
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  return isDisabled ? sColorWhiteAlpha50 : sColorWhite;
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRadioCheckmarkColors(
+    const EventStates& aState) {
+  auto [unusedColor, checkColor] = ComputeCheckboxColors(aState);
+  (void)unusedColor;
+
+  return std::make_pair(sColorWhite, checkColor);
+}
+
+sRGBColor nsNativeBasicTheme::ComputeBorderColor(const EventStates& aState) {
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isActive =
+      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
+  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
+  bool isFocused = aState.HasState(NS_EVENT_STATE_FOCUSRING);
+  if (isDisabled) {
+    return sColorGrey40Alpha50;
+  }
+  if (isFocused) {
+    return sColorAccent;
   }
+  if (isActive) {
+    return sColorGrey60;
+  }
+  if (isHovered) {
+    return sColorGrey50;
+  }
+  return sColorGrey40;
+}
 
-  if (rect.width > rect.height) {
-    auto diff = rect.width - rect.height;
-    rect.width = rect.height;
-    rect.x += diff / 2;
-  } else {
-    auto diff = rect.height - rect.width;
-    rect.height = rect.width;
-    rect.y += diff / 2;
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeButtonColors(
+    const EventStates& aState, nsIFrame* aFrame) {
+  bool isActive =
+      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
+
+  const sRGBColor& backgroundColor = [&] {
+    if (isDisabled) {
+      return sColorGrey10Alpha50;
+    }
+    if (IsDateTimeResetButton(aFrame)) {
+      return sColorWhite;
+    }
+    if (isActive) {
+      return sColorGrey30;
+    }
+    if (isHovered) {
+      return sColorGrey20;
+    }
+    return sColorGrey10;
+  }();
+
+  const sRGBColor borderColor = ComputeBorderColor(aState);
+  return std::make_pair(backgroundColor, borderColor);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeTextfieldColors(
+    const EventStates& aState) {
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  const sRGBColor& backgroundColor =
+      isDisabled ? sColorWhiteAlpha50 : sColorWhite;
+  const sRGBColor borderColor = ComputeBorderColor(aState);
+
+  return std::make_pair(backgroundColor, borderColor);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeProgressColors(
+    const EventStates& aState) {
+  bool isActive =
+      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
+
+  if (isDisabled) {
+    return std::make_pair(sColorGrey40Alpha50, sColorGrey40Alpha50);
   }
+  if (isActive || isHovered) {
+    return std::make_pair(sColorAccentDark, sColorAccentDarker);
+  }
+  return std::make_pair(sColorAccent, sColorAccentDark);
+}
 
-  return rect;
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeTrackColors(
+    const EventStates& aState) {
+  bool isActive =
+      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
+
+  if (isDisabled) {
+    return std::make_pair(sColorGrey10Alpha50, sColorGrey40Alpha50);
+  }
+  if (isActive || isHovered) {
+    return std::make_pair(sColorGrey20, sColorGrey50);
+  }
+  return std::make_pair(sColorGrey10, sColorGrey40);
 }
 
-/* static */
-void nsNativeBasicTheme::GetFocusStrokeRect(DrawTarget* aDrawTarget,
-                                            Rect& aFocusRect, CSSCoord aOffset,
-                                            const CSSCoord aRadius,
-                                            CSSCoord aFocusWidth,
-                                            RefPtr<Path>& aOutRect) {
-  RectCornerRadii radii(aRadius, aRadius, aRadius, aRadius);
-  aFocusRect.y -= aOffset;
-  aFocusRect.x -= aOffset;
-  aFocusRect.width += 2.0f * aOffset;
-  aFocusRect.height += 2.0f * aOffset;
-  // Deflate the rect by half the border width, so that the middle of the
-  // stroke fills exactly the area we want to fill and not more.
-  Rect focusRect(aFocusRect);
-  focusRect.Deflate(aFocusWidth * 0.5f);
-  aOutRect = MakePathForRoundedRect(*aDrawTarget, focusRect, radii);
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeThumbColors(
+    const EventStates& aState) {
+  bool isActive =
+      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
+
+  const sRGBColor& backgroundColor = [&] {
+    if (isDisabled) {
+      return sColorGrey50Alpha50;
+    }
+    if (isActive) {
+      return sColorAccent;
+    }
+    if (isHovered) {
+      return sColorGrey60;
+    }
+    return sColorGrey50;
+  }();
+
+  const sRGBColor borderColor = sColorWhite;
+
+  return std::make_pair(backgroundColor, borderColor);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeProgressColors() {
+  return std::make_pair(sColorAccent, sColorAccentDark);
+}
+
+std::pair<sRGBColor, sRGBColor>
+nsNativeBasicTheme::ComputeProgressTrackColors() {
+  return std::make_pair(sColorGrey10, sColorGrey40);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeMeterchunkColors(
+    const double aValue, const double aOptimum, const double aLow) {
+  sRGBColor borderColor = sColorMeterGreen20;
+  sRGBColor chunkColor = sColorMeterGreen10;
+
+  if (aValue < aOptimum) {
+    if (aValue < aLow) {
+      borderColor = sColorMeterRed20;
+      chunkColor = sColorMeterRed10;
+    } else {
+      borderColor = sColorMeterYellow20;
+      chunkColor = sColorMeterYellow10;
+    }
+  }
+
+  return std::make_pair(chunkColor, borderColor);
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeMeterTrackColors() {
+  return std::make_pair(sColorGrey10, sColorGrey40);
+}
+
+sRGBColor nsNativeBasicTheme::ComputeMenulistArrowButtonColor(
+    const EventStates& aState) {
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  return isDisabled ? sColorGrey60Alpha50 : sColorGrey60;
+}
+
+std::array<sRGBColor, 3> nsNativeBasicTheme::ComputeFocusRectColors() {
+  std::array<sRGBColor, 3> colors = {sColorAccent, sColorWhiteAlpha80,
+                                     sColorAccentLight};
+  return colors;
+}
+
+sRGBColor nsNativeBasicTheme::ComputeScrollbarColor(
+    const ComputedStyle& aStyle, const EventStates& aDocumentState,
+    bool aIsRoot) {
+  const nsStyleUI* ui = aStyle.StyleUI();
+  nscolor color;
+  if (ui->mScrollbarColor.IsColors()) {
+    color = ui->mScrollbarColor.AsColors().track.CalcColor(aStyle);
+  } else if (aDocumentState.HasAllStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE)) {
+    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarInactive,
+                                  sScrollbarColor.ToABGR());
+  } else {
+    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbar,
+                                  sScrollbarColor.ToABGR());
+  }
+  if (aIsRoot) {
+    // Root scrollbars must be opaque.
+    nscolor bg = LookAndFeel::GetColor(LookAndFeel::ColorID::WindowBackground,
+                                       NS_RGB(0xff, 0xff, 0xff));
+    color = NS_ComposeColors(bg, color);
+  }
+  return gfx::sRGBColor::FromABGR(color);
+}
+
+sRGBColor nsNativeBasicTheme::ComputeScrollbarthumbColor(
+    const ComputedStyle& aStyle, const EventStates& aElementState,
+    const EventStates& aDocumentState) {
+  const nsStyleUI* ui = aStyle.StyleUI();
+  nscolor color;
+  if (ui->mScrollbarColor.IsColors()) {
+    color = ui->mScrollbarColor.AsColors().thumb.CalcColor(aStyle);
+  } else if (aDocumentState.HasAllStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE)) {
+    color = LookAndFeel::GetColor(
+        LookAndFeel::ColorID::ThemedScrollbarThumbInactive,
+        sScrollbarThumbColor.ToABGR());
+  } else if (aElementState.HasAllStates(NS_EVENT_STATE_ACTIVE)) {
+    color =
+        LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumbActive,
+                              sScrollbarThumbColorActive.ToABGR());
+  } else if (aElementState.HasAllStates(NS_EVENT_STATE_HOVER)) {
+    color =
+        LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumbHover,
+                              sScrollbarThumbColorHover.ToABGR());
+  } else {
+    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumb,
+                                  sScrollbarThumbColor.ToABGR());
+  }
+  return gfx::sRGBColor::FromABGR(color);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintRoundedFocusRect(DrawTarget* aDrawTarget,
-                                               const Rect& aRect,
-                                               uint32_t aDpiRatio,
+                                               const LayoutDeviceRect& aRect,
+                                               DPIRatio aDpiRatio,
                                                CSSCoord aRadius,
                                                CSSCoord aOffset) {
-  Rect focusRect(aRect);
+  // NOTE(emilio): If the widths or offsets here change, make sure to tweak the
+  // GetWidgetOverflow path for FocusOutline.
+  auto [innerColor, middleColor, outerColor] = ComputeFocusRectColors();
+  LayoutDeviceRect focusRect(aRect);
   RefPtr<Path> roundedRect;
-  CSSCoord offset = aOffset * aDpiRatio;
-  CSSCoord strokeRadius((aRadius * aDpiRatio) + offset);
-  CSSCoord strokeWidth(2.0f * aDpiRatio);
+  LayoutDeviceCoord offset = aOffset * aDpiRatio;
+  LayoutDeviceCoord strokeRadius((aRadius * aDpiRatio) + offset);
+  LayoutDeviceCoord strokeWidth(CSSCoord(2.0f) * aDpiRatio);
   GetFocusStrokeRect(aDrawTarget, focusRect, offset, strokeRadius, strokeWidth,
                      roundedRect);
-  aDrawTarget->Stroke(roundedRect, ColorPattern(ToDeviceColor(sColorAccent)),
+  aDrawTarget->Stroke(roundedRect, ColorPattern(ToDeviceColor(innerColor)),
                       StrokeOptions(strokeWidth));
 
-  offset = 1.0f * aDpiRatio;
+  offset = CSSCoord(1.0f) * aDpiRatio;
   strokeRadius += offset;
-  strokeWidth = 1.0f * aDpiRatio;
+  strokeWidth = CSSCoord(1.0f) * aDpiRatio;
   GetFocusStrokeRect(aDrawTarget, focusRect, offset, strokeRadius, strokeWidth,
                      roundedRect);
-  aDrawTarget->Stroke(roundedRect,
-                      ColorPattern(ToDeviceColor(sColorWhiteAlpha80)),
+  aDrawTarget->Stroke(roundedRect, ColorPattern(ToDeviceColor(middleColor)),
                       StrokeOptions(strokeWidth));
 
-  offset = 2.0f * aDpiRatio;
+  offset = CSSCoord(2.0f) * aDpiRatio;
   strokeRadius += offset;
-  strokeWidth = 2.0f * aDpiRatio;
+  strokeWidth = CSSCoord(2.0f) * aDpiRatio;
   GetFocusStrokeRect(aDrawTarget, focusRect, offset, strokeRadius, strokeWidth,
                      roundedRect);
-  aDrawTarget->Stroke(roundedRect,
-                      ColorPattern(ToDeviceColor(sColorAccentLight)),
+  aDrawTarget->Stroke(roundedRect, ColorPattern(ToDeviceColor(outerColor)),
                       StrokeOptions(strokeWidth));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintRoundedRect(DrawTarget* aDrawTarget,
-                                          const Rect& aRect,
+                                          const LayoutDeviceRect& aRect,
                                           const sRGBColor& aBackgroundColor,
                                           const sRGBColor& aBorderColor,
                                           CSSCoord aBorderWidth,
                                           RectCornerRadii aDpiAdjustedRadii,
-                                          uint32_t aDpiRatio) {
-  const CSSCoord borderWidth(aBorderWidth * aDpiRatio);
+                                          DPIRatio aDpiRatio) {
+  const LayoutDeviceCoord borderWidth(aBorderWidth * aDpiRatio);
 
-  Rect rect(aRect);
+  LayoutDeviceRect rect(aRect);
   // Deflate the rect by half the border width, so that the middle of the stroke
   // fills exactly the area we want to fill and not more.
   rect.Deflate(borderWidth * 0.5f);
 
-  RefPtr<Path> roundedRect =
-      MakePathForRoundedRect(*aDrawTarget, rect, aDpiAdjustedRadii);
+  RefPtr<Path> roundedRect = MakePathForRoundedRect(
+      *aDrawTarget, rect.ToUnknownRect(), aDpiAdjustedRadii);
 
   aDrawTarget->Fill(roundedRect, ColorPattern(ToDeviceColor(aBackgroundColor)));
   aDrawTarget->Stroke(roundedRect, ColorPattern(ToDeviceColor(aBorderColor)),
                       StrokeOptions(borderWidth));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintRoundedRectWithRadius(
-    DrawTarget* aDrawTarget, const Rect& aRect,
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
     const sRGBColor& aBackgroundColor, const sRGBColor& aBorderColor,
-    CSSCoord aBorderWidth, CSSCoord aRadius, uint32_t aDpiRatio) {
-  const CSSCoord radius(aRadius * aDpiRatio);
+    CSSCoord aBorderWidth, CSSCoord aRadius, DPIRatio aDpiRatio) {
+  const LayoutDeviceCoord radius(aRadius * aDpiRatio);
   RectCornerRadii radii(radius, radius, radius, radius);
   PaintRoundedRect(aDrawTarget, aRect, aBackgroundColor, aBorderColor,
                    aBorderWidth, radii, aDpiRatio);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintCheckboxControl(DrawTarget* aDrawTarget,
-                                              const Rect& aRect,
+                                              const LayoutDeviceRect& aRect,
                                               const EventStates& aState,
-                                              uint32_t aDpiRatio) {
+                                              DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 2.0f;
-  const CSSCoord radius = 3.0f - (borderWidth / 2.0f);
-  auto [backgroundColor, borderColor] = ComputeCheckColors(aState);
+  const CSSCoord radius = 2.0f;
+  auto [backgroundColor, borderColor] = ComputeCheckboxColors(aState);
   PaintRoundedRectWithRadius(aDrawTarget, aRect, backgroundColor, borderColor,
                              borderWidth, radius, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 3.0f);
   }
 }
 
-/* static */
+// Returns the right scale to cover aRect in the smaller dimension, accounting
+// for aDpiRatio.
+static float ScaleToWidgetRect(const LayoutDeviceRect& aRect,
+                               nsNativeBasicTheme::DPIRatio aDpiRatio) {
+  return std::min(aRect.width, aRect.height) / kMinimumWidgetSize;
+}
+
 void nsNativeBasicTheme::PaintCheckMark(DrawTarget* aDrawTarget,
-                                        const Rect& aRect,
+                                        const LayoutDeviceRect& aRect,
                                         const EventStates& aState,
-                                        uint32_t aDpiRatio) {
+                                        DPIRatio aDpiRatio) {
   // Points come from the coordinates on a 14X14 unit box centered at 0,0
   const float checkPolygonX[] = {-4.5f, -1.5f, -0.5f, 5.0f, 4.75f,
                                  3.5f,  -0.5f, -1.5f, -3.5f};
   const float checkPolygonY[] = {0.5f,  4.0f, 4.0f,  -2.5f, -4.0f,
                                  -4.0f, 1.0f, 1.25f, -1.0f};
   const int32_t checkNumPoints = sizeof(checkPolygonX) / sizeof(float);
-  const float scale = aDpiRatio * std::min(aRect.width, aRect.height) /
-                      (kMinimumWidgetSize * (float)aDpiRatio);
-
-  auto center = aRect.Center();
+  const float scale = ScaleToWidgetRect(aRect, aDpiRatio);
+  auto center = aRect.Center().ToUnknownPoint();
 
   RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
   Point p = center + Point(checkPolygonX[0] * scale, checkPolygonY[0] * scale);
@@ -247,45 +472,41 @@
   }
   RefPtr<Path> path = builder->Finish();
 
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  sRGBColor fillColor = isDisabled ? sColorWhiteAlpha50 : sColorWhite;
+  sRGBColor fillColor = ComputeCheckmarkColor(aState);
   aDrawTarget->Fill(path, ColorPattern(ToDeviceColor(fillColor)));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintIndeterminateMark(DrawTarget* aDrawTarget,
-                                                const Rect& aRect,
+                                                const LayoutDeviceRect& aRect,
                                                 const EventStates& aState,
-                                                uint32_t aDpiRatio) {
+                                                DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 2.0f;
-  const float scale = aDpiRatio * std::min(aRect.width, aRect.height) /
-                      (kMinimumWidgetSize * (float)aDpiRatio);
+  const float scale = ScaleToWidgetRect(aRect, aDpiRatio);
 
-  Rect rect(aRect);
+  Rect rect = aRect.ToUnknownRect();
   rect.y += (rect.height / 2) - (borderWidth * scale / 2);
   rect.height = borderWidth * scale;
   rect.x += (borderWidth * scale) + (borderWidth * scale / 8);
   rect.width -= ((borderWidth * scale) + (borderWidth * scale / 8)) * 2;
 
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  sRGBColor fillColor = isDisabled ? sColorWhiteAlpha50 : sColorWhite;
+  sRGBColor fillColor = ComputeCheckmarkColor(aState);
   aDrawTarget->FillRect(rect, ColorPattern(ToDeviceColor(fillColor)));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintStrokedEllipse(DrawTarget* aDrawTarget,
-                                             const Rect& aRect,
+                                             const LayoutDeviceRect& aRect,
                                              const sRGBColor& aBackgroundColor,
                                              const sRGBColor& aBorderColor,
                                              const CSSCoord aBorderWidth,
-                                             uint32_t aDpiRatio) {
-  const CSSCoord borderWidth(aBorderWidth * aDpiRatio);
+                                             DPIRatio aDpiRatio) {
+  const LayoutDeviceCoord borderWidth(aBorderWidth * aDpiRatio);
   RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
 
   // Deflate for the same reason as PaintRoundedRectWithRadius. Note that the
   // size is the diameter, so we just shrink by the border width once.
-  Size size(aRect.Size() - Size(borderWidth, borderWidth));
-  AppendEllipseToPath(builder, aRect.Center(), size);
+  auto size = aRect.Size() - LayoutDeviceSize(borderWidth, borderWidth);
+  AppendEllipseToPath(builder, aRect.Center().ToUnknownPoint(),
+                      size.ToUnknownSize());
   RefPtr<Path> ellipse = builder->Finish();
 
   aDrawTarget->Fill(ellipse, ColorPattern(ToDeviceColor(aBackgroundColor)));
@@ -293,12 +514,14 @@
                       StrokeOptions(borderWidth));
 }
 
-/* static */
-void nsNativeBasicTheme::PaintEllipseShadow(
-    DrawTarget* aDrawTarget, const Rect& aRect, float aShadowAlpha,
-    const Point& aShadowOffset, float aShadowBlurStdDev, uint32_t aDpiRatio) {
+void nsNativeBasicTheme::PaintEllipseShadow(DrawTarget* aDrawTarget,
+                                            const LayoutDeviceRect& aRect,
+                                            float aShadowAlpha,
+                                            const CSSPoint& aShadowOffset,
+                                            CSSCoord aShadowBlurStdDev,
+                                            DPIRatio aDpiRatio) {
   Float stdDev = aShadowBlurStdDev * aDpiRatio;
-  Point offset = aShadowOffset * aDpiRatio;
+  Point offset = (aShadowOffset * aDpiRatio).ToUnknownPoint();
 
   RefPtr<FilterNode> blurFilter =
       aDrawTarget->CreateFilter(FilterType::GAUSSIAN_BLUR);
@@ -310,9 +533,10 @@
 
   IntSize inflation =
       gfxAlphaBoxBlur::CalculateBlurRadius(gfxPoint(stdDev, stdDev));
-  Rect inflatedRect(aRect);
+  Rect inflatedRect = aRect.ToUnknownRect();
   inflatedRect.Inflate(inflation.width, inflation.height);
-  Rect sourceRectInFilterSpace = inflatedRect - aRect.TopLeft();
+  Rect sourceRectInFilterSpace =
+      inflatedRect - aRect.TopLeft().ToUnknownPoint();
   Point destinationPointOfSourceRect = inflatedRect.TopLeft() + offset;
 
   IntSize dtSize = RoundedToInt(aRect.Size().ToUnknownSize());
@@ -324,7 +548,8 @@
   }
 
   RefPtr<Path> ellipse = MakePathForEllipse(
-      *ellipseDT, (aRect - aRect.TopLeft()).Center(), aRect.Size());
+      *ellipseDT, (aRect - aRect.TopLeft()).Center().ToUnknownPoint(),
+      aRect.Size().ToUnknownSize());
   ellipseDT->Fill(ellipse,
                   ColorPattern(DeviceColor(0.0f, 0.0f, 0.0f, aShadowAlpha)));
   RefPtr<SourceSurface> ellipseSurface = ellipseDT->Snapshot();
@@ -334,290 +559,122 @@
                           destinationPointOfSourceRect);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintRadioControl(DrawTarget* aDrawTarget,
-                                           const Rect& aRect,
+                                           const LayoutDeviceRect& aRect,
                                            const EventStates& aState,
-                                           uint32_t aDpiRatio) {
+                                           DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 2.0f;
-  auto [backgroundColor, borderColor] = ComputeCheckColors(aState);
+  auto [backgroundColor, borderColor] = ComputeCheckboxColors(aState);
 
   PaintStrokedEllipse(aDrawTarget, aRect, backgroundColor, borderColor,
                       borderWidth, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, 2.0f, 3.0f);
   }
 }
 
-/* static */
-void nsNativeBasicTheme::PaintRadioCheckMark(DrawTarget* aDrawTarget,
-                                             const Rect& aRect,
+void nsNativeBasicTheme::PaintRadioCheckmark(DrawTarget* aDrawTarget,
+                                             const LayoutDeviceRect& aRect,
                                              const EventStates& aState,
-                                             uint32_t aDpiRatio) {
+                                             DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 2.0f;
-  const float scale = aDpiRatio * std::min(aRect.width, aRect.height) /
-                      (kMinimumWidgetSize * (float)aDpiRatio);
-  auto [unusedColor, checkColor] = ComputeCheckColors(aState);
-  (void)unusedColor;
+  const float scale = ScaleToWidgetRect(aRect, aDpiRatio);
+  auto [backgroundColor, checkColor] = ComputeRadioCheckmarkColors(aState);
 
-  Rect rect(aRect);
+  LayoutDeviceRect rect(aRect);
   rect.y += borderWidth * scale;
   rect.x += borderWidth * scale;
   rect.height -= borderWidth * scale * 2;
   rect.width -= borderWidth * scale * 2;
 
-  PaintStrokedEllipse(aDrawTarget, rect, checkColor, sColorWhite, borderWidth,
-                      aDpiRatio);
-}
-
-/* static */
-sRGBColor nsNativeBasicTheme::ComputeBorderColor(const EventStates& aState) {
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-  bool isFocused = aState.HasState(NS_EVENT_STATE_FOCUS);
-  if (isDisabled) {
-    return sColorGrey40Alpha50;
-  }
-  if (isFocused) {
-    return sColorAccent;
-  }
-  if (isActive) {
-    return sColorGrey60;
-  }
-  if (isHovered) {
-    return sColorGrey50;
-  }
-  return sColorGrey40;
+  PaintStrokedEllipse(aDrawTarget, rect, checkColor, backgroundColor,
+                      borderWidth, aDpiRatio);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintTextField(DrawTarget* aDrawTarget,
-                                        const Rect& aRect,
+                                        const LayoutDeviceRect& aRect,
                                         const EventStates& aState,
-                                        uint32_t aDpiRatio) {
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  const sRGBColor& backgroundColor =
-      isDisabled ? sColorWhiteAlpha50 : sColorWhite;
-  const sRGBColor borderColor = ComputeBorderColor(aState);
+                                        DPIRatio aDpiRatio) {
+  auto [backgroundColor, borderColor] = ComputeTextfieldColors(aState);
 
   const CSSCoord radius = 2.0f;
 
   PaintRoundedRectWithRadius(aDrawTarget, aRect, backgroundColor, borderColor,
                              kTextFieldBorderWidth, radius, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 0.0f);
   }
 }
 
-/* static */
-std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeButtonColors(
-    const EventStates& aState, nsIFrame* aFrame) {
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  const sRGBColor& backgroundColor = [&] {
-    if (isDisabled) {
-      return sColorGrey10Alpha50;
-    }
-    if (IsDateTimeResetButton(aFrame)) {
-      return sColorWhite;
-    }
-    if (isActive) {
-      return sColorGrey30;
-    }
-    if (isHovered) {
-      return sColorGrey20;
-    }
-    return sColorGrey10;
-  }();
-
-  const sRGBColor borderColor = ComputeBorderColor(aState);
-
-  return std::make_pair(backgroundColor, borderColor);
-}
-
-sRGBColor nsNativeBasicTheme::ComputeRangeProgressBorderColor(
-    const EventStates& aState) {
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  if (isDisabled) {
-    return sColorGrey40Alpha50;
-  }
-  if (isActive || isHovered) {
-    return sColorAccentDarker;
-  }
-  return sColorAccentDark;
-}
-
-/* static */
-sRGBColor nsNativeBasicTheme::ComputeRangeTrackBorderColor(
-    const EventStates& aState) {
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  if (isDisabled) {
-    return sColorGrey40Alpha50;
-  }
-  if (isActive || isHovered) {
-    return sColorGrey50;
-  }
-  return sColorGrey40;
-}
-
-/* static */
-std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeProgressColors(
-    const EventStates& aState) {
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  const sRGBColor& backgroundColor = [&] {
-    if (isDisabled) {
-      return sColorGrey40Alpha50;
-    }
-    if (isActive || isHovered) {
-      return sColorAccentDark;
-    }
-    return sColorAccent;
-  }();
-
-  const sRGBColor borderColor = ComputeRangeProgressBorderColor(aState);
-
-  return std::make_pair(backgroundColor, borderColor);
-}
-
-/* static */
-std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeTrackColors(
-    const EventStates& aState) {
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  const sRGBColor& backgroundColor = [&] {
-    if (isDisabled) {
-      return sColorGrey10Alpha50;
-    }
-    if (isActive || isHovered) {
-      return sColorGrey20;
-    }
-    return sColorGrey10;
-  }();
-
-  const sRGBColor borderColor = ComputeRangeTrackBorderColor(aState);
-
-  return std::make_pair(backgroundColor, borderColor);
-}
-
-/* static */
-std::pair<sRGBColor, sRGBColor> nsNativeBasicTheme::ComputeRangeThumbColors(
-    const EventStates& aState) {
-  bool isActive =
-      aState.HasAllStates(NS_EVENT_STATE_HOVER | NS_EVENT_STATE_ACTIVE);
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  bool isHovered = !isDisabled && aState.HasState(NS_EVENT_STATE_HOVER);
-
-  const sRGBColor& backgroundColor = [&] {
-    if (isDisabled) {
-      return sColorGrey50Alpha50;
-    }
-    if (isActive) {
-      return sColorAccent;
-    }
-    if (isHovered) {
-      return sColorGrey60;
-    }
-    return sColorGrey50;
-  }();
-
-  const sRGBColor borderColor = sColorWhite;
-
-  return std::make_pair(backgroundColor, borderColor);
-}
-
-/* static */
 void nsNativeBasicTheme::PaintListbox(DrawTarget* aDrawTarget,
-                                      const Rect& aRect,
+                                      const LayoutDeviceRect& aRect,
                                       const EventStates& aState,
-                                      uint32_t aDpiRatio) {
+                                      DPIRatio aDpiRatio) {
   const CSSCoord radius = 2.0f;
-  auto [unusedColor, borderColor] = ComputeButtonColors(aState);
-  (void)unusedColor;
+  auto [backgroundColor, borderColor] = ComputeTextfieldColors(aState);
 
-  PaintRoundedRectWithRadius(aDrawTarget, aRect, sColorWhite, borderColor,
+  PaintRoundedRectWithRadius(aDrawTarget, aRect, backgroundColor, borderColor,
                              kMenulistBorderWidth, radius, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 0.0f);
   }
 }
 
-/* static */
 void nsNativeBasicTheme::PaintMenulist(DrawTarget* aDrawTarget,
-                                       const Rect& aRect,
+                                       const LayoutDeviceRect& aRect,
                                        const EventStates& aState,
-                                       uint32_t aDpiRatio) {
+                                       DPIRatio aDpiRatio) {
   const CSSCoord radius = 4.0f;
   auto [backgroundColor, borderColor] = ComputeButtonColors(aState);
 
   PaintRoundedRectWithRadius(aDrawTarget, aRect, backgroundColor, borderColor,
                              kMenulistBorderWidth, radius, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 0.0f);
   }
 }
 
-/* static */
 void nsNativeBasicTheme::PaintArrow(
-    DrawTarget* aDrawTarget, const Rect& aRect, const int32_t aArrowPolygonX[],
-    const int32_t aArrowPolygonY[], const int32_t aArrowNumPoints,
-    const int32_t aArrowSize, const sRGBColor aFillColor, uint32_t aDpiRatio) {
+    DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+    const int32_t aArrowPolygonX[], const int32_t aArrowPolygonY[],
+    const int32_t aArrowNumPoints, const int32_t aArrowSize,
+    const sRGBColor aFillColor, DPIRatio aDpiRatio) {
   nscoord paintScale = std::min(aRect.width, aRect.height) / aArrowSize;
   RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
-  Point p = aRect.Center() + Point(aArrowPolygonX[0] * paintScale,
-                                   aArrowPolygonY[0] * paintScale);
+  auto center = aRect.Center().ToUnknownPoint();
+  Point p = center + Point(aArrowPolygonX[0] * paintScale,
+                           aArrowPolygonY[0] * paintScale);
 
   builder->MoveTo(p);
   for (int32_t polyIndex = 1; polyIndex < aArrowNumPoints; polyIndex++) {
-    p = aRect.Center() + Point(aArrowPolygonX[polyIndex] * paintScale,
-                               aArrowPolygonY[polyIndex] * paintScale);
+    p = center + Point(aArrowPolygonX[polyIndex] * paintScale,
+                       aArrowPolygonY[polyIndex] * paintScale);
     builder->LineTo(p);
   }
   RefPtr<Path> path = builder->Finish();
 
   aDrawTarget->Stroke(path, ColorPattern(ToDeviceColor(aFillColor)),
-                      StrokeOptions(2.0f * aDpiRatio));
+                      StrokeOptions(CSSCoord(2.0f) * aDpiRatio));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintMenulistArrowButton(nsIFrame* aFrame,
                                                   DrawTarget* aDrawTarget,
-                                                  const Rect& aRect,
+                                                  const LayoutDeviceRect& aRect,
                                                   const EventStates& aState,
-                                                  uint32_t aDpiRatio) {
+                                                  DPIRatio aDpiRatio) {
   const float arrowPolygonX[] = {-3.5f, -0.5f, 0.5f,  3.5f,  3.5f,
                                  3.0f,  0.5f,  -0.5f, -3.0f, -3.5};
   const float arrowPolygonY[] = {-0.5f, 2.5f, 2.5f, -0.5f, -2.0f,
                                  -2.0f, 1.0f, 1.0f, -2.0f, -2.0f};
 
   const int32_t arrowNumPoints = sizeof(arrowPolygonX) / sizeof(float);
-  const float scale = aDpiRatio * std::min(aRect.width, aRect.height) /
-                      (kMinimumWidgetSize * (float)aDpiRatio);
+  const float scale = ScaleToWidgetRect(aRect, aDpiRatio);
 
-  auto center = aRect.Center();
+  auto center = aRect.Center().ToUnknownPoint();
 
   RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
   Point p = center + Point(arrowPolygonX[0] * scale, arrowPolygonY[0] * scale);
@@ -628,21 +685,19 @@
   }
   RefPtr<Path> path = builder->Finish();
 
-  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
-  sRGBColor fillColor = isDisabled ? sColorGrey60Alpha50 : sColorGrey60;
-  aDrawTarget->Fill(path, ColorPattern(ToDeviceColor(fillColor)));
+  sRGBColor arrowColor = ComputeMenulistArrowButtonColor(aState);
+  aDrawTarget->Fill(path, ColorPattern(ToDeviceColor(arrowColor)));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintSpinnerButton(nsIFrame* aFrame,
                                             DrawTarget* aDrawTarget,
-                                            const Rect& aRect,
+                                            const LayoutDeviceRect& aRect,
                                             const EventStates& aState,
                                             StyleAppearance aAppearance,
-                                            uint32_t aDpiRatio) {
+                                            DPIRatio aDpiRatio) {
   auto [backgroundColor, borderColor] = ComputeButtonColors(aState);
 
-  RefPtr<Path> pathRect = MakePathForRect(*aDrawTarget, aRect);
+  RefPtr<Path> pathRect = MakePathForRect(*aDrawTarget, aRect.ToUnknownRect());
 
   aDrawTarget->Fill(pathRect, ColorPattern(ToDeviceColor(backgroundColor)));
 
@@ -667,8 +722,7 @@
                            -5.0f, -2.0f, -2.0f, -5.0f, -5.0f};
 
   const int32_t arrowNumPoints = sizeof(arrowPolygonX) / sizeof(float);
-  const float scale = aDpiRatio * std::min(aRect.width, aRect.height) /
-                      (kMinimumWidgetSize * (float)aDpiRatio);
+  const float scale = ScaleToWidgetRect(aRect, aDpiRatio);
 
   if (aAppearance == StyleAppearance::SpinnerUpbutton) {
     for (int32_t i = 0; i < arrowNumPoints; i++) {
@@ -676,7 +730,7 @@
     }
   }
 
-  auto center = aRect.Center();
+  auto center = aRect.Center().ToUnknownPoint();
 
   builder = aDrawTarget->CreatePathBuilder();
   p = center + Point(arrowPolygonX[0] * scale, arrowPolygonY[0] * scale);
@@ -689,25 +743,24 @@
   aDrawTarget->Fill(path, ColorPattern(ToDeviceColor(borderColor)));
 }
 
-/* static */
 void nsNativeBasicTheme::PaintRange(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                                    const Rect& aRect,
+                                    const LayoutDeviceRect& aRect,
                                     const EventStates& aState,
-                                    uint32_t aDpiRatio, bool aHorizontal) {
+                                    DPIRatio aDpiRatio, bool aHorizontal) {
   nsRangeFrame* rangeFrame = do_QueryFrame(aFrame);
   if (!rangeFrame) {
     return;
   }
 
   double progress = rangeFrame->GetValueAsFractionOfRange();
-  Rect rect(aRect);
-  Rect thumbRect(0, 0, kMinimumRangeThumbSize.value * aDpiRatio,
-                 kMinimumRangeThumbSize.value * aDpiRatio);
-  Rect overflowRect(aRect);
-  overflowRect.Inflate(6 * aDpiRatio);  // See GetWidgetOverflow
+  auto rect = aRect;
+  LayoutDeviceRect thumbRect(0, 0, kMinimumRangeThumbSize * aDpiRatio,
+                             kMinimumRangeThumbSize * aDpiRatio);
+  Rect overflowRect = aRect.ToUnknownRect();
+  overflowRect.Inflate(CSSCoord(6.0f) * aDpiRatio);  // See GetWidgetOverflow
   Rect progressClipRect(overflowRect);
   Rect trackClipRect(overflowRect);
-  const CSSCoord verticalSize = kRangeHeight * aDpiRatio;
+  const LayoutDeviceCoord verticalSize = kRangeHeight * aDpiRatio;
   if (aHorizontal) {
     rect.height = verticalSize;
     rect.y = aRect.y + (aRect.height - rect.height) / 2;
@@ -739,17 +792,16 @@
   const CSSCoord borderWidth = 1.0f;
   const CSSCoord radius = 2.0f;
 
-  sRGBColor progressColor, progressBorderColor;
-  std::tie(progressColor, progressBorderColor) =
+  auto [progressColor, progressBorderColor] =
       ComputeRangeProgressColors(aState);
-  sRGBColor trackColor, trackBorderColor;
-  std::tie(trackColor, trackBorderColor) = ComputeRangeTrackColors(aState);
+  auto [trackColor, trackBorderColor] = ComputeRangeTrackColors(aState);
 
   // Make a path that clips out the range thumb.
   RefPtr<PathBuilder> builder =
       aDrawTarget->CreatePathBuilder(FillRule::FILL_EVEN_ODD);
   AppendRectToPath(builder, overflowRect);
-  AppendEllipseToPath(builder, thumbRect.Center(), thumbRect.Size());
+  AppendEllipseToPath(builder, thumbRect.Center().ToUnknownPoint(),
+                      thumbRect.Size().ToUnknownSize());
   RefPtr<Path> path = builder->Finish();
 
   // Draw the progress and track pieces with the thumb clipped out, so that
@@ -770,8 +822,8 @@
 
     if (!aState.HasState(NS_EVENT_STATE_DISABLED)) {
       // Thumb shadow
-      PaintEllipseShadow(aDrawTarget, thumbRect, 0.3f, Point(0.0f, 2.0f), 2.0f,
-                         aDpiRatio);
+      PaintEllipseShadow(aDrawTarget, thumbRect, 0.3f, CSSPoint(0.0f, 2.0f),
+                         2.0f, aDpiRatio);
     }
   }
   aDrawTarget->PopClip();
@@ -783,34 +835,34 @@
   PaintStrokedEllipse(aDrawTarget, thumbRect, thumbColor, thumbBorderColor,
                       thumbBorderWidth, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 3.0f);
   }
 }
 
-/* static */
 void nsNativeBasicTheme::PaintProgressBar(DrawTarget* aDrawTarget,
-                                          const Rect& aRect,
+                                          const LayoutDeviceRect& aRect,
                                           const EventStates& aState,
-                                          uint32_t aDpiRatio) {
+                                          DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 1.0f;
   const CSSCoord radius = 2.0f;
 
-  Rect rect(aRect);
-  const CSSCoord height = kProgressbarHeight * aDpiRatio;
+  LayoutDeviceRect rect(aRect);
+  const LayoutDeviceCoord height = kProgressbarHeight * aDpiRatio;
   rect.y += (rect.height - height) / 2;
   rect.height = height;
 
-  PaintRoundedRectWithRadius(aDrawTarget, rect, sColorGrey10, sColorGrey40,
+  auto [trackColor, trackBorderColor] = ComputeProgressTrackColors();
+
+  PaintRoundedRectWithRadius(aDrawTarget, rect, trackColor, trackBorderColor,
                              borderWidth, radius, aDpiRatio);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintProgresschunk(nsIFrame* aFrame,
                                             DrawTarget* aDrawTarget,
-                                            const Rect& aRect,
+                                            const LayoutDeviceRect& aRect,
                                             const EventStates& aState,
-                                            uint32_t aDpiRatio) {
+                                            DPIRatio aDpiRatio) {
   // TODO: vertical?
   // TODO: Address artifacts when position is between 0 and radius + border.
   // TODO: Handle indeterminate case.
@@ -820,16 +872,17 @@
   }
 
   const CSSCoord borderWidth = 1.0f;
-  const CSSCoord radius = 2.0f * aDpiRatio;
-  CSSCoord progressEndRadius = 0.0f;
+  const LayoutDeviceCoord radius = CSSCoord(2.0f) * aDpiRatio;
+  LayoutDeviceCoord progressEndRadius = 0.0f;
 
-  Rect rect(aRect);
-  const CSSCoord height = kProgressbarHeight * aDpiRatio;
+  LayoutDeviceRect rect(aRect);
+  const LayoutDeviceCoord height = kProgressbarHeight * aDpiRatio;
   rect.y += (rect.height - height) / 2;
   rect.height = height;
 
   double position = GetProgressValue(aFrame) / GetProgressMaxValue(aFrame);
-  if (rect.width - (rect.width * position) < (borderWidth + radius)) {
+  if (rect.width - (rect.width * position) <
+      (borderWidth * aDpiRatio + radius)) {
     // Round corners when the progress chunk approaches the maximum value to
     // avoid artifacts.
     progressEndRadius = radius;
@@ -843,32 +896,35 @@
         RectCornerRadii(radius, progressEndRadius, progressEndRadius, radius);
   }
 
-  PaintRoundedRect(aDrawTarget, rect, sColorAccent, sColorAccentDark,
+  auto [progressColor, progressBorderColor] = ComputeProgressColors();
+
+  PaintRoundedRect(aDrawTarget, rect, progressColor, progressBorderColor,
                    borderWidth, radii, aDpiRatio);
 }
 
-/* static */
-void nsNativeBasicTheme::PaintMeter(DrawTarget* aDrawTarget, const Rect& aRect,
+void nsNativeBasicTheme::PaintMeter(DrawTarget* aDrawTarget,
+                                    const LayoutDeviceRect& aRect,
                                     const EventStates& aState,
-                                    uint32_t aDpiRatio) {
+                                    DPIRatio aDpiRatio) {
   const CSSCoord borderWidth = 1.0f;
   const CSSCoord radius = 5.0f;
 
-  Rect rect(aRect);
-  const CSSCoord height = kMeterHeight * aDpiRatio;
+  LayoutDeviceRect rect(aRect);
+  const LayoutDeviceCoord height = kMeterHeight * aDpiRatio;
   rect.y += (rect.height - height) / 2;
   rect.height = height;
 
-  PaintRoundedRectWithRadius(aDrawTarget, rect, sColorGrey10, sColorGrey40,
+  auto [backgroundColor, borderColor] = ComputeMeterTrackColors();
+
+  PaintRoundedRectWithRadius(aDrawTarget, rect, backgroundColor, borderColor,
                              borderWidth, radius, aDpiRatio);
 }
 
-/* static */
 void nsNativeBasicTheme::PaintMeterchunk(nsIFrame* aFrame,
                                          DrawTarget* aDrawTarget,
-                                         const Rect& aRect,
+                                         const LayoutDeviceRect& aRect,
                                          const EventStates& aState,
-                                         uint32_t aDpiRatio) {
+                                         DPIRatio aDpiRatio) {
   // TODO: Address artifacts when position is between 0 and (radius + border).
   nsMeterFrame* meterFrame = do_QueryFrame(aFrame->GetParent());
   if (!meterFrame) {
@@ -876,11 +932,11 @@
   }
 
   const CSSCoord borderWidth = 1.0f;
-  const CSSCoord radius = 5.0f * aDpiRatio;
-  CSSCoord progressEndRadius = 0.0f;
+  const LayoutDeviceCoord radius = CSSCoord(5.0f) * aDpiRatio;
+  LayoutDeviceCoord progressEndRadius = 0.0f;
 
-  Rect rect(aRect);
-  const CSSCoord height = kMeterHeight * aDpiRatio;
+  LayoutDeviceRect rect(aRect);
+  const LayoutDeviceCoord height = kMeterHeight * aDpiRatio;
   rect.y += (rect.height - height) / 2;
   rect.height = height;
 
@@ -889,7 +945,8 @@
   double value = meter->Value();
   double max = meter->Max();
   double position = value / max;
-  if (rect.width - (rect.width * position) < (borderWidth + radius)) {
+  if (rect.width - (rect.width * position) <
+      (borderWidth * aDpiRatio + radius)) {
     // Round corners when the progress chunk approaches the maximum value to
     // avoid artifacts.
     progressEndRadius = radius;
@@ -903,150 +960,97 @@
         RectCornerRadii(radius, progressEndRadius, progressEndRadius, radius);
   }
 
-  sRGBColor borderColor = sColorMeterGreen20;
-  sRGBColor chunkColor = sColorMeterGreen10;
-
-  double optimum = meter->Optimum();
-  if (value < optimum) {
-    double low = meter->Low();
-    if (value < low) {
-      borderColor = sColorMeterRed20;
-      chunkColor = sColorMeterRed10;
-    } else {
-      borderColor = sColorMeterYellow20;
-      chunkColor = sColorMeterYellow10;
-    }
-  }
+  auto [chunkColor, borderColor] =
+      ComputeMeterchunkColors(value, meter->Optimum(), meter->Low());
 
   PaintRoundedRect(aDrawTarget, rect, chunkColor, borderColor, borderWidth,
                    radii, aDpiRatio);
 }
 
 void nsNativeBasicTheme::PaintButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                                     const Rect& aRect,
+                                     const LayoutDeviceRect& aRect,
                                      const EventStates& aState,
-                                     uint32_t aDpiRatio) {
+                                     DPIRatio aDpiRatio) {
   const CSSCoord radius = 4.0f;
   auto [backgroundColor, borderColor] = ComputeButtonColors(aState, aFrame);
 
   PaintRoundedRectWithRadius(aDrawTarget, aRect, backgroundColor, borderColor,
                              kButtonBorderWidth, radius, aDpiRatio);
 
-  if (aState.HasState(NS_EVENT_STATE_FOCUS)) {
+  if (aState.HasState(NS_EVENT_STATE_FOCUSRING)) {
     PaintRoundedFocusRect(aDrawTarget, aRect, aDpiRatio, radius, 0.0f);
   }
 }
 
-sRGBColor nsNativeBasicTheme::ComputeScrollbarthumbColor(
-    const ComputedStyle& aStyle, const EventStates& aElementState,
-    const EventStates& aDocumentState) {
-  const nsStyleUI* ui = aStyle.StyleUI();
-  nscolor color;
-  if (ui->mScrollbarColor.IsColors()) {
-    color = ui->mScrollbarColor.AsColors().thumb.CalcColor(aStyle);
-  } else if (aDocumentState.HasAllStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE)) {
-    color = LookAndFeel::GetColor(
-        LookAndFeel::ColorID::ThemedScrollbarThumbInactive,
-        sScrollbarThumbColor.ToABGR());
-  } else if (aElementState.HasAllStates(NS_EVENT_STATE_ACTIVE)) {
-    color =
-        LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumbActive,
-                              sScrollbarThumbColorActive.ToABGR());
-  } else if (aElementState.HasAllStates(NS_EVENT_STATE_HOVER)) {
-    color =
-        LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumbHover,
-                              sScrollbarThumbColorHover.ToABGR());
-  } else {
-    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarThumb,
-                                  sScrollbarThumbColor.ToABGR());
-  }
-  return gfx::sRGBColor::FromABGR(color);
-}
-
-sRGBColor nsNativeBasicTheme::ComputeScrollbarColor(
-    const ComputedStyle& aStyle, const EventStates& aDocumentState,
-    bool aIsRoot) {
-  const nsStyleUI* ui = aStyle.StyleUI();
-  nscolor color;
-  if (ui->mScrollbarColor.IsColors()) {
-    color = ui->mScrollbarColor.AsColors().track.CalcColor(aStyle);
-  } else if (aDocumentState.HasAllStates(NS_DOCUMENT_STATE_WINDOW_INACTIVE)) {
-    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbarInactive,
-                                  sScrollbarColor.ToABGR());
-  } else {
-    color = LookAndFeel::GetColor(LookAndFeel::ColorID::ThemedScrollbar,
-                                  sScrollbarColor.ToABGR());
-  }
-  if (aIsRoot) {
-    // Root scrollbars must be opaque.
-    nscolor bg = LookAndFeel::GetColor(LookAndFeel::ColorID::WindowBackground,
-                                       NS_RGB(0xff, 0xff, 0xff));
-    color = NS_ComposeColors(bg, color);
-  }
-  return gfx::sRGBColor::FromABGR(color);
-}
-
 void nsNativeBasicTheme::PaintScrollbarThumb(DrawTarget* aDrawTarget,
-                                             const Rect& aRect,
+                                             const LayoutDeviceRect& aRect,
                                              bool aHorizontal, nsIFrame* aFrame,
                                              const ComputedStyle& aStyle,
                                              const EventStates& aElementState,
                                              const EventStates& aDocumentState,
-                                             uint32_t aDpiRatio) {
+                                             DPIRatio aDpiRatio) {
   sRGBColor thumbColor =
       ComputeScrollbarthumbColor(aStyle, aElementState, aDocumentState);
-  aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(thumbColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        ColorPattern(ToDeviceColor(thumbColor)));
 }
 
 void nsNativeBasicTheme::PaintScrollbarTrack(DrawTarget* aDrawTarget,
-                                             const Rect& aRect,
+                                             const LayoutDeviceRect& aRect,
                                              bool aHorizontal, nsIFrame* aFrame,
                                              const ComputedStyle& aStyle,
                                              const EventStates& aDocumentState,
-                                             uint32_t aDpiRatio, bool aIsRoot) {
+                                             DPIRatio aDpiRatio, bool aIsRoot) {
   // Draw nothing by default. Subclasses can override this.
 }
 
 void nsNativeBasicTheme::PaintScrollbar(DrawTarget* aDrawTarget,
-                                        const Rect& aRect, bool aHorizontal,
-                                        nsIFrame* aFrame,
+                                        const LayoutDeviceRect& aRect,
+                                        bool aHorizontal, nsIFrame* aFrame,
                                         const ComputedStyle& aStyle,
                                         const EventStates& aDocumentState,
-                                        uint32_t aDpiRatio, bool aIsRoot) {
+                                        DPIRatio aDpiRatio, bool aIsRoot) {
   sRGBColor scrollbarColor =
       ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
-  aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(scrollbarColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        ColorPattern(ToDeviceColor(scrollbarColor)));
   // FIXME(heycam): We should probably derive the border color when custom
   // scrollbar colors are in use too.  But for now, just skip painting it,
   // to avoid ugliness.
   if (aStyle.StyleUI()->mScrollbarColor.IsAuto()) {
     RefPtr<PathBuilder> builder = aDrawTarget->CreatePathBuilder();
-    Rect strokeRect(aRect);
-    strokeRect.Deflate(0.5f * aDpiRatio);
-    builder->MoveTo(Point(strokeRect.TopLeft()));
+    LayoutDeviceRect strokeRect(aRect);
+    strokeRect.Deflate(CSSCoord(0.5f) * aDpiRatio);
+    builder->MoveTo(strokeRect.TopLeft().ToUnknownPoint());
     builder->LineTo(
-        Point(aHorizontal ? strokeRect.TopRight() : strokeRect.BottomLeft()));
+        (aHorizontal ? strokeRect.TopRight() : strokeRect.BottomLeft())
+            .ToUnknownPoint());
     RefPtr<Path> path = builder->Finish();
     aDrawTarget->Stroke(path,
                         ColorPattern(ToDeviceColor(sScrollbarBorderColor)),
-                        StrokeOptions(1.0f * aDpiRatio));
+                        StrokeOptions(CSSCoord(1.0f) * aDpiRatio));
   }
 }
 
 void nsNativeBasicTheme::PaintScrollCorner(DrawTarget* aDrawTarget,
-                                           const Rect& aRect, nsIFrame* aFrame,
+                                           const LayoutDeviceRect& aRect,
+                                           nsIFrame* aFrame,
                                            const ComputedStyle& aStyle,
                                            const EventStates& aDocumentState,
-                                           uint32_t aDpiRatio, bool aIsRoot) {
+                                           DPIRatio aDpiRatio, bool aIsRoot) {
   sRGBColor scrollbarColor =
       ComputeScrollbarColor(aStyle, aDocumentState, aIsRoot);
-  aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(scrollbarColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        ColorPattern(ToDeviceColor(scrollbarColor)));
 }
 
-void nsNativeBasicTheme::PaintScrollbarbutton(
-    DrawTarget* aDrawTarget, StyleAppearance aAppearance, const Rect& aRect,
-    const ComputedStyle& aStyle, const EventStates& aElementState,
-    const EventStates& aDocumentState, uint32_t aDpiRatio) {
+void nsNativeBasicTheme::PaintScrollbarbutton(DrawTarget* aDrawTarget,
+                                              StyleAppearance aAppearance,
+                                              const LayoutDeviceRect& aRect,
+                                              const ComputedStyle& aStyle,
+                                              const EventStates& aElementState,
+                                              const EventStates& aDocumentState,
+                                              DPIRatio aDpiRatio) {
   bool isActive = aElementState.HasState(NS_EVENT_STATE_ACTIVE);
   bool isHovered = aElementState.HasState(NS_EVENT_STATE_HOVER);
 
@@ -1063,7 +1067,8 @@
   } else {
     buttonColor = sScrollbarColor;
   }
-  aDrawTarget->FillRect(aRect, ColorPattern(ToDeviceColor(buttonColor)));
+  aDrawTarget->FillRect(aRect.ToUnknownRect(),
+                        ColorPattern(ToDeviceColor(buttonColor)));
 
   // Start with Up arrow.
   int32_t arrowPolygonX[] = {3, 0, -3};
@@ -1137,7 +1142,7 @@
     RefPtr<Path> path = builder->Finish();
     aDrawTarget->Stroke(path,
                         ColorPattern(ToDeviceColor(sScrollbarBorderColor)),
-                        StrokeOptions(1.0f * aDpiRatio));
+                        StrokeOptions(CSSCoord(1.0f) * aDpiRatio));
   }
 }
 
@@ -1156,10 +1161,13 @@
                                          const nsRect& aRect,
                                          const nsRect& /* aDirtyRect */) {
   DrawTarget* dt = aContext->GetDrawTarget();
+  // FIXME(emilio): Why does this use AppUnitsPerDevPixel() but GetDPIRatio()
+  // uses AppUnitsPerDevPixelAtUnitFullZoom()?
   const nscoord twipsPerPixel = aFrame->PresContext()->AppUnitsPerDevPixel();
   EventStates eventState = GetContentState(aFrame, aAppearance);
   EventStates docState = aFrame->GetContent()->OwnerDoc()->GetDocumentState();
-  Rect devPxRect = NSRectToSnappedRect(aRect, twipsPerPixel, *dt);
+  auto devPxRect = LayoutDeviceRect::FromUnknownRect(
+      NSRectToSnappedRect(aRect, twipsPerPixel, *dt));
 
   if (aAppearance == StyleAppearance::MozMenulistArrowButton) {
     bool isHTML = IsHTMLContent(aFrame);
@@ -1173,14 +1181,14 @@
     }
   }
 
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
 
   switch (aAppearance) {
     case StyleAppearance::Radio: {
       auto rect = FixAspectRatio(devPxRect);
       PaintRadioControl(dt, rect, eventState, dpiRatio);
       if (IsSelected(aFrame)) {
-        PaintRadioCheckMark(dt, rect, eventState, dpiRatio);
+        PaintRadioCheckmark(dt, rect, eventState, dpiRatio);
       }
       break;
     }
@@ -1275,6 +1283,9 @@
     case StyleAppearance::Button:
       PaintButton(aFrame, dt, devPxRect, eventState, dpiRatio);
       break;
+    case StyleAppearance::FocusOutline:
+      PaintRoundedFocusRect(dt, devPxRect, dpiRatio, 0.0f, 0.0f);
+      break;
     default:
       MOZ_ASSERT_UNREACHABLE(
           "Should not get here with a widget type we don't support.");
@@ -1294,22 +1305,24 @@
 
 LayoutDeviceIntMargin nsNativeBasicTheme::GetWidgetBorder(
     nsDeviceContext* aContext, nsIFrame* aFrame, StyleAppearance aAppearance) {
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
   switch (aAppearance) {
     case StyleAppearance::Textfield:
     case StyleAppearance::Textarea:
     case StyleAppearance::NumberInput: {
-      LayoutDeviceIntCoord w = kTextFieldBorderWidth * dpiRatio;
+      // FIXME: Do we want this margin not to be int-based? The native windows
+      // theme rounds (see ScaleForDPI)...
+      LayoutDeviceIntCoord w = (kTextFieldBorderWidth * dpiRatio).Rounded();
       return LayoutDeviceIntMargin(w, w, w, w);
     }
     case StyleAppearance::Listbox:
     case StyleAppearance::Menulist:
     case StyleAppearance::MenulistButton: {
-      const LayoutDeviceIntCoord w = kMenulistBorderWidth * dpiRatio;
+      LayoutDeviceIntCoord w = (kMenulistBorderWidth * dpiRatio).Rounded();
       return LayoutDeviceIntMargin(w, w, w, w);
     }
     case StyleAppearance::Button: {
-      LayoutDeviceIntCoord w = kButtonBorderWidth * dpiRatio;
+      LayoutDeviceIntCoord w = (kButtonBorderWidth * dpiRatio).Rounded();
       return LayoutDeviceIntMargin(w, w, w, w);
     }
     default:
@@ -1342,17 +1355,16 @@
     return false;
   }
 
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
   switch (aAppearance) {
     case StyleAppearance::Listbox:
     case StyleAppearance::Menulist:
       aResult->SizeTo(0, 0, 0, 0);
       return true;
     case StyleAppearance::NumberInput:
+      *aResult = (CSSMargin(1.0f, 0, 1.0f, 4.0f) * dpiRatio).Rounded();
       if (IsFrameRTL(aFrame)) {
-        aResult->SizeTo(1 * dpiRatio, 4 * dpiRatio, 1 * dpiRatio, 0);
-      } else {
-        aResult->SizeTo(1 * dpiRatio, 0, 1 * dpiRatio, 4 * dpiRatio);
+        std::swap(aResult->left, aResult->right);
       }
       return true;
     case StyleAppearance::Textarea:
@@ -1361,21 +1373,21 @@
     case StyleAppearance::Menuitem:
     case StyleAppearance::MenulistText:
     case StyleAppearance::MenulistButton:
-      aResult->SizeTo(1 * dpiRatio, 4 * dpiRatio, 1 * dpiRatio, 4 * dpiRatio);
+      *aResult = (CSSMargin(1.0f, 4.0f, 1.0f, 4.0f) * dpiRatio).Rounded();
       return true;
     case StyleAppearance::Button:
       if (IsColorPickerButton(aFrame)) {
-        aResult->SizeTo(4 * dpiRatio, 4 * dpiRatio, 4 * dpiRatio, 4 * dpiRatio);
+        *aResult = (CSSMargin(4.0f, 4.0f, 4.0f, 4.0f) * dpiRatio).Rounded();
         return true;
       }
-      aResult->SizeTo(1 * dpiRatio, 4 * dpiRatio, 1 * dpiRatio, 4 * dpiRatio);
+      *aResult = (CSSMargin(1.0f, 4.0f, 1.0f, 4.0f) * dpiRatio).Rounded();
       return true;
     case StyleAppearance::Textfield:
       if (IsDateTimeTextField(aFrame)) {
-        aResult->SizeTo(2 * dpiRatio, 3 * dpiRatio, 0, 3 * dpiRatio);
+        *aResult = (CSSMargin(2.0f, 3.0f, 0.0f, 3.0f) * dpiRatio).Rounded();
         return true;
       }
-      aResult->SizeTo(1 * dpiRatio, 4 * dpiRatio, 1 * dpiRatio, 4 * dpiRatio);
+      *aResult = (CSSMargin(1.0f, 4.0f, 1.0f, 4.0f) * dpiRatio).Rounded();
       return true;
     default:
       return false;
@@ -1386,10 +1398,12 @@
                                            nsIFrame* aFrame,
                                            StyleAppearance aAppearance,
                                            nsRect* aOverflowRect) {
-  // TODO(bug 1620360): This should return non-zero for
-  // StyleAppearance::FocusOutline, if we implement outline-style: auto.
   nsIntMargin overflow;
   switch (aAppearance) {
+    case StyleAppearance::FocusOutline:
+      // 2px * each of the segments + 1 px for the separation between them.
+      overflow.SizeTo(5, 5, 5, 5);
+      break;
     case StyleAppearance::Radio:
     case StyleAppearance::Checkbox:
     case StyleAppearance::Range:
@@ -1426,30 +1440,26 @@
                                          StyleAppearance aAppearance,
                                          LayoutDeviceIntSize* aResult,
                                          bool* aIsOverridable) {
-  uint32_t dpiRatio = GetDPIRatio(aFrame);
+  DPIRatio dpiRatio = GetDPIRatio(aFrame);
 
-  aResult->width = aResult->height =
-      static_cast<uint32_t>(kMinimumWidgetSize) * dpiRatio;
+  aResult->width = aResult->height = (kMinimumWidgetSize * dpiRatio).Rounded();
 
   switch (aAppearance) {
     case StyleAppearance::Button:
       if (IsColorPickerButton(aFrame)) {
-        aResult->height =
-            static_cast<uint32_t>(kMinimumColorPickerHeight) * dpiRatio;
+        aResult->height = (kMinimumColorPickerHeight * dpiRatio).Rounded();
       }
       break;
     case StyleAppearance::RangeThumb:
-      aResult->SizeTo(static_cast<uint32_t>(kMinimumRangeThumbSize) * dpiRatio,
-                      static_cast<uint32_t>(kMinimumRangeThumbSize) * dpiRatio);
+      aResult->SizeTo((kMinimumRangeThumbSize * dpiRatio).Rounded(),
+                      (kMinimumRangeThumbSize * dpiRatio).Rounded());
       break;
     case StyleAppearance::MozMenulistArrowButton:
-      aResult->width =
-          static_cast<uint32_t>(kMinimumDropdownArrowButtonWidth) * dpiRatio;
+      aResult->width = (kMinimumDropdownArrowButtonWidth * dpiRatio).Rounded();
       break;
     case StyleAppearance::SpinnerUpbutton:
     case StyleAppearance::SpinnerDownbutton:
-      aResult->width =
-          static_cast<uint32_t>(kMinimumSpinnerButtonWidth) * dpiRatio;
+      aResult->width = (kMinimumSpinnerButtonWidth * dpiRatio).Rounded();
       break;
     case StyleAppearance::ScrollbarVertical:
     case StyleAppearance::ScrollbarHorizontal:
@@ -1464,13 +1474,11 @@
     case StyleAppearance::Scrollcorner: {
       ComputedStyle* style = nsLayoutUtils::StyleForScrollbar(aFrame);
       if (style->StyleUIReset()->mScrollbarWidth == StyleScrollbarWidth::Thin) {
-        aResult->SizeTo(
-            static_cast<uint32_t>(kMinimumThinScrollbarSize) * dpiRatio,
-            static_cast<uint32_t>(kMinimumThinScrollbarSize) * dpiRatio);
+        aResult->SizeTo((kMinimumThinScrollbarSize * dpiRatio).Rounded(),
+                        (kMinimumThinScrollbarSize * dpiRatio).Rounded());
       } else {
-        aResult->SizeTo(
-            static_cast<uint32_t>(kMinimumScrollbarSize) * dpiRatio,
-            static_cast<uint32_t>(kMinimumScrollbarSize) * dpiRatio);
+        aResult->SizeTo((kMinimumScrollbarSize * dpiRatio).Rounded(),
+                        (kMinimumScrollbarSize * dpiRatio).Rounded());
       }
       break;
     }
@@ -1534,6 +1542,7 @@
   switch (aAppearance) {
     case StyleAppearance::Radio:
     case StyleAppearance::Checkbox:
+    case StyleAppearance::FocusOutline:
     case StyleAppearance::Textarea:
     case StyleAppearance::Textfield:
     case StyleAppearance::Range:
diff -Nru firefox-84.0.2+build1/widget/nsNativeBasicTheme.h firefox-85.0+build1/widget/nsNativeBasicTheme.h
--- firefox-84.0.2+build1/widget/nsNativeBasicTheme.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsNativeBasicTheme.h	2021-01-18 19:58:27.000000000 +0000
@@ -102,13 +102,13 @@
                                                                       0.86f,
                                                                       0.86f));
 
-static const CSSIntCoord kMinimumWidgetSize = 14;
-static const CSSIntCoord kMinimumScrollbarSize = 14;
-static const CSSIntCoord kMinimumThinScrollbarSize = 6;
-static const CSSIntCoord kMinimumColorPickerHeight = 32;
-static const CSSIntCoord kMinimumRangeThumbSize = 20;
-static const CSSIntCoord kMinimumDropdownArrowButtonWidth = 18;
-static const CSSIntCoord kMinimumSpinnerButtonWidth = 31;
+static const CSSCoord kMinimumWidgetSize = 14.0f;
+static const CSSCoord kMinimumScrollbarSize = 14.0f;
+static const CSSCoord kMinimumThinScrollbarSize = 6.0f;
+static const CSSCoord kMinimumColorPickerHeight = 32.0f;
+static const CSSCoord kMinimumRangeThumbSize = 20.0f;
+static const CSSCoord kMinimumDropdownArrowButtonWidth = 18.0f;
+static const CSSCoord kMinimumSpinnerButtonWidth = 31.0f;
 static const CSSCoord kButtonBorderWidth = 1.0f;
 static const CSSCoord kMenulistBorderWidth = 1.0f;
 static const CSSCoord kTextFieldBorderWidth = 1.0f;
@@ -124,6 +124,7 @@
  protected:
   using sRGBColor = mozilla::gfx::sRGBColor;
   using CSSCoord = mozilla::CSSCoord;
+  using CSSPoint = mozilla::CSSPoint;
   using CSSIntCoord = mozilla::CSSIntCoord;
   using ComputedStyle = mozilla::ComputedStyle;
   using EventStates = mozilla::EventStates;
@@ -132,8 +133,12 @@
   using Rect = mozilla::gfx::Rect;
   using Point = mozilla::gfx::Point;
   using RectCornerRadii = mozilla::gfx::RectCornerRadii;
+  using LayoutDeviceCoord = mozilla::LayoutDeviceCoord;
+  using LayoutDeviceRect = mozilla::LayoutDeviceRect;
 
  public:
+  using DPIRatio = mozilla::CSSToLayoutDeviceScale;
+
   NS_DECL_ISUPPORTS_INHERITED
 
   // The nsITheme interface.
@@ -182,14 +187,12 @@
   nsNativeBasicTheme() = default;
   virtual ~nsNativeBasicTheme() = default;
 
-  static uint32_t GetDPIRatio(nsIFrame* aFrame);
+  static DPIRatio GetDPIRatio(nsIFrame* aFrame);
   static bool IsDateTimeResetButton(nsIFrame* aFrame);
   static bool IsDateTimeTextField(nsIFrame* aFrame);
   static bool IsColorPickerButton(nsIFrame* aFrame);
   static bool IsRootScrollbar(nsIFrame* aFrame);
-  static std::pair<sRGBColor, sRGBColor> ComputeCheckColors(
-      const EventStates& aState);
-  static Rect FixAspectRatio(const Rect& aRect);
+  static LayoutDeviceRect FixAspectRatio(const LayoutDeviceRect& aRect);
 
   // This pushes and pops a clip rect to the draw target.
   //
@@ -200,8 +203,8 @@
   //
   // This is a bit sad, overall, but...
   struct MOZ_RAII AutoClipRect {
-    AutoClipRect(DrawTarget& aDt, const Rect& aRect) : mDt(aDt) {
-      mDt.PushClipRect(aRect);
+    AutoClipRect(DrawTarget& aDt, const LayoutDeviceRect& aRect) : mDt(aDt) {
+      mDt.PushClipRect(aRect.ToUnknownRect());
     }
 
     ~AutoClipRect() { mDt.PopClip(); }
@@ -210,124 +213,144 @@
     DrawTarget& mDt;
   };
 
-  static void GetFocusStrokeRect(DrawTarget* aDrawTarget, Rect& aFocusRect,
-                                 CSSCoord aOffset, const CSSCoord aRadius,
-                                 CSSCoord aFocusWidth, RefPtr<Path>& aOutRect);
-  static void PaintRoundedFocusRect(DrawTarget* aDrawTarget, const Rect& aRect,
-                                    uint32_t aDpiRatio, CSSCoord aRadius,
-                                    CSSCoord aOffset);
-  static void PaintRoundedRect(DrawTarget* aDrawTarget, const Rect& aRect,
-                               const sRGBColor& aBackgroundColor,
-                               const sRGBColor& aBorderColor,
-                               CSSCoord aBorderWidth,
-                               RectCornerRadii aDpiAdjustedRadii,
-                               uint32_t aDpiRatio);
-  static void PaintRoundedRectWithRadius(DrawTarget* aDrawTarget,
-                                         const Rect& aRect,
-                                         const sRGBColor& aBackgroundColor,
-                                         const sRGBColor& aBorderColor,
-                                         CSSCoord aBorderWidth,
-                                         CSSCoord aRadius, uint32_t aDpiRatio);
-  static void PaintCheckboxControl(DrawTarget* aDrawTarget, const Rect& aRect,
-                                   const EventStates& aState,
-                                   uint32_t aDpiRatio);
-  static void PaintCheckMark(DrawTarget* aDrawTarget, const Rect& aRect,
-                             const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintIndeterminateMark(DrawTarget* aDrawTarget, const Rect& aRect,
-                                     const EventStates& aState,
-                                     uint32_t aDpiRatio);
-  static void PaintStrokedEllipse(DrawTarget* aDrawTarget, const Rect& aRect,
-                                  const sRGBColor& aBackgroundColor,
-                                  const sRGBColor& aBorderColor,
-                                  const CSSCoord aBorderWidth,
-                                  uint32_t aDpiRatio);
-  static void PaintEllipseShadow(DrawTarget* aDrawTarget, const Rect& aRect,
-                                 float aShadowAlpha, const Point& aShadowOffset,
-                                 float aShadowBlurStdDev, uint32_t aDpiRatio);
-  static void PaintRadioControl(DrawTarget* aDrawTarget, const Rect& aRect,
-                                const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintRadioCheckMark(DrawTarget* aDrawTarget, const Rect& aRect,
-                                  const EventStates& aState,
-                                  uint32_t aDpiRatio);
-  static sRGBColor ComputeBorderColor(const EventStates& aState);
-  static void PaintTextField(DrawTarget* aDrawTarget, const Rect& aRect,
-                             const EventStates& aState, uint32_t aDpiRatio);
-  static std::pair<sRGBColor, sRGBColor> ComputeButtonColors(
+  static void GetFocusStrokeRect(DrawTarget* aDrawTarget,
+                                 LayoutDeviceRect& aFocusRect,
+                                 LayoutDeviceCoord aOffset,
+                                 const LayoutDeviceCoord aRadius,
+                                 LayoutDeviceCoord aFocusWidth,
+                                 RefPtr<Path>& aOutRect);
+
+  virtual std::pair<sRGBColor, sRGBColor> ComputeCheckboxColors(
+      const EventStates& aState);
+  virtual sRGBColor ComputeCheckmarkColor(const EventStates& aState);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeRadioCheckmarkColors(
+      const EventStates& aState);
+  virtual sRGBColor ComputeBorderColor(const EventStates& aState);
+
+  virtual std::pair<sRGBColor, sRGBColor> ComputeButtonColors(
       const EventStates& aState, nsIFrame* aFrame = nullptr);
-  static sRGBColor ComputeRangeProgressBorderColor(const EventStates& aState);
-  static sRGBColor ComputeRangeTrackBorderColor(const EventStates& aState);
-  static std::pair<sRGBColor, sRGBColor> ComputeRangeProgressColors(
-      const EventStates& aState);
-  static std::pair<sRGBColor, sRGBColor> ComputeRangeTrackColors(
-      const EventStates& aState);
-  static std::pair<sRGBColor, sRGBColor> ComputeRangeThumbColors(
-      const EventStates& aState);
-  static sRGBColor ComputeScrollbarColor(const ComputedStyle& aStyle,
-                                         const EventStates& aDocumentState,
-                                         bool aIsRoot);
-  static sRGBColor ComputeScrollbarthumbColor(
-      const ComputedStyle& aStyle, const EventStates& aState,
+  virtual std::pair<sRGBColor, sRGBColor> ComputeTextfieldColors(
+      const EventStates& aState);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeRangeProgressColors(
+      const EventStates& aState);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeRangeTrackColors(
+      const EventStates& aState);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeRangeThumbColors(
+      const EventStates& aState);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeProgressColors();
+  virtual std::pair<sRGBColor, sRGBColor> ComputeProgressTrackColors();
+  virtual std::pair<sRGBColor, sRGBColor> ComputeMeterchunkColors(
+      const double aValue, const double aOptimum, const double aLow);
+  virtual std::pair<sRGBColor, sRGBColor> ComputeMeterTrackColors();
+  virtual sRGBColor ComputeMenulistArrowButtonColor(const EventStates& aState);
+  virtual std::array<sRGBColor, 3> ComputeFocusRectColors();
+  virtual sRGBColor ComputeScrollbarthumbColor(
+      const ComputedStyle& aStyle, const EventStates& aElementState,
       const EventStates& aDocumentState);
-  static void PaintListbox(DrawTarget* aDrawTarget, const Rect& aRect,
-                           const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintMenulist(DrawTarget* aDrawTarget, const Rect& aRect,
-                            const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintArrow(DrawTarget* aDrawTarget, const Rect& aRect,
-                         const int32_t aArrowPolygonX[],
-                         const int32_t aArrowPolygonY[],
-                         const int32_t aArrowNumPoints,
-                         const int32_t aArrowSize, const sRGBColor aFillColor,
-                         uint32_t aDpiRatio);
-  static void PaintMenulistArrowButton(nsIFrame* aFrame,
-                                       DrawTarget* aDrawTarget,
-                                       const Rect& aRect,
-                                       const EventStates& aState,
-                                       uint32_t aDpiRatio);
-  static void PaintSpinnerButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                                 const Rect& aRect, const EventStates& aState,
-                                 StyleAppearance aAppearance,
-                                 uint32_t aDpiRatio);
-  static void PaintRange(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                         const Rect& aRect, const EventStates& aState,
-                         uint32_t aDpiRatio, bool aHorizontal);
-  static void PaintProgressBar(DrawTarget* aDrawTarget, const Rect& aRect,
-                               const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintProgresschunk(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                                 const Rect& aRect, const EventStates& aState,
-                                 uint32_t aDpiRatio);
-  static void PaintMeter(DrawTarget* aDrawTarget, const Rect& aRect,
-                         const EventStates& aState, uint32_t aDpiRatio);
-  static void PaintMeterchunk(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                              const Rect& aRect, const EventStates& aState,
-                              uint32_t aDpiRatio);
-  static void PaintButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
-                          const Rect& aRect, const EventStates& aState,
-                          uint32_t aDpiRatio);
+  virtual sRGBColor ComputeScrollbarColor(const ComputedStyle& aStyle,
+                                          const EventStates& aDocumentState,
+                                          bool aIsRoot);
+
+  void PaintRoundedFocusRect(DrawTarget* aDrawTarget,
+                             const LayoutDeviceRect& aRect, DPIRatio aDpiRatio,
+                             CSSCoord aRadius, CSSCoord aOffset);
+  void PaintRoundedRect(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                        const sRGBColor& aBackgroundColor,
+                        const sRGBColor& aBorderColor, CSSCoord aBorderWidth,
+                        RectCornerRadii aDpiAdjustedRadii, DPIRatio aDpiRatio);
+  void PaintRoundedRectWithRadius(DrawTarget* aDrawTarget,
+                                  const LayoutDeviceRect& aRect,
+                                  const sRGBColor& aBackgroundColor,
+                                  const sRGBColor& aBorderColor,
+                                  CSSCoord aBorderWidth, CSSCoord aRadius,
+                                  DPIRatio aDpiRatio);
+  void PaintCheckboxControl(DrawTarget* aDrawTarget,
+                            const LayoutDeviceRect& aRect,
+                            const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintCheckMark(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                      const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintIndeterminateMark(DrawTarget* aDrawTarget,
+                              const LayoutDeviceRect& aRect,
+                              const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintStrokedEllipse(DrawTarget* aDrawTarget,
+                           const LayoutDeviceRect& aRect,
+                           const sRGBColor& aBackgroundColor,
+                           const sRGBColor& aBorderColor,
+                           const CSSCoord aBorderWidth, DPIRatio aDpiRatio);
+  void PaintEllipseShadow(DrawTarget* aDrawTarget,
+                          const LayoutDeviceRect& aRect, float aShadowAlpha,
+                          const CSSPoint& aShadowOffset,
+                          CSSCoord aShadowBlurStdDev, DPIRatio aDpiRatio);
+  void PaintRadioControl(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                         const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintRadioCheckmark(DrawTarget* aDrawTarget,
+                           const LayoutDeviceRect& aRect,
+                           const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintTextField(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                      const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintListbox(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                    const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintMenulist(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                     const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintArrow(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                  const int32_t aArrowPolygonX[],
+                  const int32_t aArrowPolygonY[], const int32_t aArrowNumPoints,
+                  const int32_t aArrowSize, const sRGBColor aFillColor,
+                  DPIRatio aDpiRatio);
+  void PaintMenulistArrowButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                                const LayoutDeviceRect& aRect,
+                                const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintSpinnerButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                          const LayoutDeviceRect& aRect,
+                          const EventStates& aState,
+                          StyleAppearance aAppearance, DPIRatio aDpiRatio);
+  void PaintRange(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                  const LayoutDeviceRect& aRect, const EventStates& aState,
+                  DPIRatio aDpiRatio, bool aHorizontal);
+  void PaintProgressBar(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                        const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintProgresschunk(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                          const LayoutDeviceRect& aRect,
+                          const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintMeter(DrawTarget* aDrawTarget, const LayoutDeviceRect& aRect,
+                  const EventStates& aState, DPIRatio aDpiRatio);
+  void PaintMeterchunk(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                       const LayoutDeviceRect& aRect, const EventStates& aState,
+                       DPIRatio aDpiRatio);
+  void PaintButton(nsIFrame* aFrame, DrawTarget* aDrawTarget,
+                   const LayoutDeviceRect& aRect, const EventStates& aState,
+                   DPIRatio aDpiRatio);
 
-  virtual void PaintScrollbarThumb(DrawTarget* aDrawTarget, const Rect& aRect,
+  virtual void PaintScrollbarThumb(DrawTarget* aDrawTarget,
+                                   const LayoutDeviceRect& aRect,
                                    bool aHorizontal, nsIFrame* aFrame,
                                    const ComputedStyle& aStyle,
                                    const EventStates& aElementState,
                                    const EventStates& aDocumentState,
-                                   uint32_t aDpiRatio);
-  virtual void PaintScrollbar(DrawTarget* aDrawTarget, const Rect& aRect,
-                              bool aHorizontal, nsIFrame* aFrame,
-                              const ComputedStyle& aStyle,
+                                   DPIRatio aDpiRatio);
+  virtual void PaintScrollbar(DrawTarget* aDrawTarget,
+                              const LayoutDeviceRect& aRect, bool aHorizontal,
+                              nsIFrame* aFrame, const ComputedStyle& aStyle,
                               const EventStates& aDocumentState,
-                              uint32_t aDpiRatio, bool aIsRoot);
-  virtual void PaintScrollbarTrack(DrawTarget* aDrawTarget, const Rect& aRect,
+                              DPIRatio aDpiRatio, bool aIsRoot);
+  virtual void PaintScrollbarTrack(DrawTarget* aDrawTarget,
+                                   const LayoutDeviceRect& aRect,
                                    bool aHorizontal, nsIFrame* aFrame,
                                    const ComputedStyle& aStyle,
                                    const EventStates& aDocumentState,
-                                   uint32_t aDpiRatio, bool aIsRoot);
-  virtual void PaintScrollCorner(DrawTarget* aDrawTarget, const Rect& aRect,
+                                   DPIRatio aDpiRatio, bool aIsRoot);
+  virtual void PaintScrollCorner(DrawTarget* aDrawTarget,
+                                 const LayoutDeviceRect& aRect,
                                  nsIFrame* aFrame, const ComputedStyle& aStyle,
                                  const EventStates& aDocumentState,
-                                 uint32_t aDpiRatio, bool aIsRoot);
-  virtual void PaintScrollbarbutton(
-      DrawTarget* aDrawTarget, StyleAppearance aAppearance, const Rect& aRect,
-      const ComputedStyle& aStyle, const EventStates& aElementState,
-      const EventStates& aDocumentState, uint32_t aDpiRatio);
+                                 DPIRatio aDpiRatio, bool aIsRoot);
+  virtual void PaintScrollbarbutton(DrawTarget* aDrawTarget,
+                                    StyleAppearance aAppearance,
+                                    const LayoutDeviceRect& aRect,
+                                    const ComputedStyle& aStyle,
+                                    const EventStates& aElementState,
+                                    const EventStates& aDocumentState,
+                                    DPIRatio aDpiRatio);
 };
 
 #endif
diff -Nru firefox-84.0.2+build1/widget/nsPaper.h firefox-85.0+build1/widget/nsPaper.h
--- firefox-84.0.2+build1/widget/nsPaper.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/nsPaper.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,7 @@
 #include "mozilla/Maybe.h"
 #include "nsIPaper.h"
 #include "nsISupportsImpl.h"
-#include "js/RootingAPI.h"
+#include "js/TypeDecls.h"
 #include "nsString.h"
 
 struct JSContext;
diff -Nru firefox-84.0.2+build1/widget/nsPrinterCUPS.cpp firefox-85.0+build1/widget/nsPrinterCUPS.cpp
--- firefox-84.0.2+build1/widget/nsPrinterCUPS.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsPrinterCUPS.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -115,8 +115,7 @@
                                              cups_size_t& aMedia) const {
   // The returned string is owned by mPrinterInfo.
   // https://www.cups.org/doc/cupspm.html#cupsLocalizeDestMedia
-  auto printerInfoLock = mPrinterInfoMutex.Lock();
-  TryEnsurePrinterInfo(*printerInfoLock);
+  auto printerInfoLock = TryEnsurePrinterInfo();
   cups_dinfo_t* const printerInfo = printerInfoLock->mPrinterInfo;
   return mShim.cupsLocalizeDestMedia(&aConnection, mPrinter, printerInfo,
                                      CUPS_MEDIA_FLAGS_DEFAULT, &aMedia);
@@ -164,8 +163,7 @@
 }
 
 bool nsPrinterCUPS::Supports(const char* aOption, const char* aValue) const {
-  auto printerInfoLock = mPrinterInfoMutex.Lock();
-  TryEnsurePrinterInfo(*printerInfoLock);
+  auto printerInfoLock = TryEnsurePrinterInfo();
   cups_dinfo_t* const printerInfo = printerInfoLock->mPrinterInfo;
   return mShim.cupsCheckDestSupported(CUPS_HTTP_DEFAULT, mPrinter, printerInfo,
                                       aOption, aValue);
@@ -174,8 +172,7 @@
 bool nsPrinterCUPS::IsCUPSVersionAtLeast(uint64_t aCUPSMajor,
                                          uint64_t aCUPSMinor,
                                          uint64_t aCUPSPatch) const {
-  auto printerInfoLock = mPrinterInfoMutex.Lock();
-  TryEnsurePrinterInfo(*printerInfoLock);
+  auto printerInfoLock = TryEnsurePrinterInfo();
   // Compare major version.
   if (printerInfoLock->mCUPSMajor > aCUPSMajor) {
     return true;
@@ -226,8 +223,7 @@
     Connection& aConnection) const {
   nsString printerName;
   GetPrinterName(printerName);
-  auto printerInfoLock = mPrinterInfoMutex.Lock();
-  TryEnsurePrinterInfo(*printerInfoLock);
+  auto printerInfoLock = TryEnsurePrinterInfo();
   cups_dinfo_t* const printerInfo = printerInfoLock->mPrinterInfo;
 
   cups_size_t media;
@@ -286,8 +282,7 @@
 nsTArray<mozilla::PaperInfo> nsPrinterCUPS::PaperList(
     Connection& aConnection) const {
   http_t* const connection = aConnection.GetConnection(mPrinter);
-  auto printerInfoLock = mPrinterInfoMutex.Lock();
-  TryEnsurePrinterInfo(*printerInfoLock, connection);
+  auto printerInfoLock = TryEnsurePrinterInfo(connection);
   cups_dinfo_t* const printerInfo = printerInfoLock->mPrinterInfo;
 
   if (!printerInfo) {
@@ -326,35 +321,31 @@
   return paperList;
 }
 
-void nsPrinterCUPS::TryEnsurePrinterInfo(CUPSPrinterInfo& aInOutPrinterInfo,
-                                         http_t* const aConnection) const {
-  if (aInOutPrinterInfo.mPrinterInfo) {
-    return;
+nsPrinterCUPS::PrinterInfoLock nsPrinterCUPS::TryEnsurePrinterInfo(
+    http_t* const aConnection) const {
+  PrinterInfoLock lock = mPrinterInfoMutex.Lock();
+  if (lock->mPrinterInfo ||
+      (aConnection == CUPS_HTTP_DEFAULT ? lock->mTriedInitWithDefault
+                                        : lock->mTriedInitWithConnection)) {
+    return lock;
   }
 
   if (aConnection == CUPS_HTTP_DEFAULT) {
-    if (aInOutPrinterInfo.mTriedInitWithDefault) {
-      return;
-    }
-    aInOutPrinterInfo.mTriedInitWithDefault = true;
+    lock->mTriedInitWithDefault = true;
   } else {
-    if (aInOutPrinterInfo.mTriedInitWithConnection) {
-      return;
-    }
-    aInOutPrinterInfo.mTriedInitWithConnection = true;
+    lock->mTriedInitWithConnection = true;
   }
 
   // All CUPS calls that take the printer info do null-checks internally, so we
   // can fetch this info and only worry about the result of the later CUPS
   // functions.
-  aInOutPrinterInfo.mPrinterInfo =
-      mShim.cupsCopyDestInfo(aConnection, mPrinter);
+  lock->mPrinterInfo = mShim.cupsCopyDestInfo(aConnection, mPrinter);
 
   // Even if we failed to fetch printer info, it is still possible we can talk
   // to the print server and get its CUPS version.
-  FetchCUPSVersionForPrinter(mShim, mPrinter, aInOutPrinterInfo.mCUPSMajor,
-                             aInOutPrinterInfo.mCUPSMinor,
-                             aInOutPrinterInfo.mCUPSPatch);
+  FetchCUPSVersionForPrinter(mShim, mPrinter, lock->mCUPSMajor,
+                             lock->mCUPSMinor, lock->mCUPSPatch);
+  return lock;
 }
 
 void nsPrinterCUPS::ForEachExtraMonochromeSetting(
diff -Nru firefox-84.0.2+build1/widget/nsPrinterCUPS.h firefox-85.0+build1/widget/nsPrinterCUPS.h
--- firefox-84.0.2+build1/widget/nsPrinterCUPS.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsPrinterCUPS.h	2021-01-18 19:58:27.000000000 +0000
@@ -67,6 +67,8 @@
   using PrinterInfoMutex =
       mozilla::DataMutexBase<CUPSPrinterInfo, mozilla::RecursiveMutex>;
 
+  using PrinterInfoLock = PrinterInfoMutex::AutoLock;
+
   ~nsPrinterCUPS();
 
   /**
@@ -107,8 +109,7 @@
    * but has been known to require an established connection
    * on older versions of Ubuntu (18 and below).
    */
-  void TryEnsurePrinterInfo(
-      CUPSPrinterInfo& aInOutPrinterInfo,
+  PrinterInfoLock TryEnsurePrinterInfo(
       http_t* const aConnection = CUPS_HTTP_DEFAULT) const;
 
   const nsCUPSShim& mShim;
diff -Nru firefox-84.0.2+build1/widget/nsPrinterListBase.h firefox-85.0+build1/widget/nsPrinterListBase.h
--- firefox-84.0.2+build1/widget/nsPrinterListBase.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsPrinterListBase.h	2021-01-18 19:58:27.000000000 +0000
@@ -46,7 +46,7 @@
   // background thread.
   virtual RefPtr<nsIPrinter> CreatePrinter(PrinterInfo) const = 0;
 
-  Maybe<PrinterInfo> NamedOrDefaultPrinter(nsString aName) const;
+  mozilla::Maybe<PrinterInfo> NamedOrDefaultPrinter(nsString aName) const;
 
   // No copy or move, we're an identity.
   nsPrinterListBase(const nsPrinterListBase&) = delete;
@@ -59,13 +59,14 @@
   // This could be implemented in terms of Printers() and then searching the
   // returned printer info for a printer of the given name, but we expect
   // backends to have more efficient methods of implementing this.
-  virtual Maybe<PrinterInfo> PrinterByName(nsString aName) const = 0;
+  virtual mozilla::Maybe<PrinterInfo> PrinterByName(nsString aName) const = 0;
 
   // Same as NamedPrinter, but uses the system name.
   // Depending on whether or not there is a more efficient way to address the
   // printer for a given backend, this may or may not be equivalent to
   // NamedPrinter.
-  virtual Maybe<PrinterInfo> PrinterBySystemName(nsString aName) const = 0;
+  virtual mozilla::Maybe<PrinterInfo> PrinterBySystemName(
+      nsString aName) const = 0;
 
   // This is implemented separately from the IDL interface version so that it
   // can be made const, which allows it to be used while resolving promises.
diff -Nru firefox-84.0.2+build1/widget/nsPrintSettingsService.cpp firefox-85.0+build1/widget/nsPrintSettingsService.cpp
--- firefox-84.0.2+build1/widget/nsPrintSettingsService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsPrintSettingsService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -19,6 +19,7 @@
 
 #include "nsArray.h"
 #include "nsXPCOM.h"
+#include "nsXULAppAPI.h"
 
 #include "nsIStringEnumerator.h"
 #include "stdlib.h"
@@ -143,6 +144,7 @@
   aSettings->GetOrientation(&data->orientation());
 
   aSettings->GetNumCopies(&data->numCopies());
+  aSettings->GetNumPagesPerSheet(&data->numPagesPerSheet());
 
   aSettings->GetPrinterName(data->printerName());
 
@@ -232,6 +234,7 @@
   settings->SetOrientation(data.orientation());
 
   settings->SetNumCopies(data.numCopies());
+  settings->SetNumPagesPerSheet(data.numPagesPerSheet());
 
   settings->SetPrinterName(data.printerName());
 
diff -Nru firefox-84.0.2+build1/widget/nsXPLookAndFeel.cpp firefox-85.0+build1/widget/nsXPLookAndFeel.cpp
--- firefox-84.0.2+build1/widget/nsXPLookAndFeel.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsXPLookAndFeel.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -784,9 +784,9 @@
 // otherwise we'll return NS_ERROR_NOT_AVAILABLE, in which case, the
 // platform-specific nsLookAndFeel should use its own values instead.
 //
-nsresult nsXPLookAndFeel::GetColorImpl(ColorID aID,
-                                       bool aUseStandinsForNativeColors,
-                                       nscolor& aResult) {
+nsresult nsXPLookAndFeel::GetColorValue(ColorID aID,
+                                        bool aUseStandinsForNativeColors,
+                                        nscolor& aResult) {
   if (!sInitialized) Init();
 
     // define DEBUG_SYSTEM_COLOR_USE if you want to debug system color
@@ -947,29 +947,9 @@
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-nsresult nsXPLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
+nsresult nsXPLookAndFeel::GetIntValue(IntID aID, int32_t& aResult) {
   if (!sInitialized) Init();
 
-  // Set the default values for these prefs. but allow different platforms
-  // to override them in their nsLookAndFeel if desired.
-  switch (aID) {
-    case IntID::ScrollButtonLeftMouseButtonAction:
-      aResult = 0;
-      return NS_OK;
-    case IntID::ScrollButtonMiddleMouseButtonAction:
-      aResult = 3;
-      return NS_OK;
-    case IntID::ScrollButtonRightMouseButtonAction:
-      aResult = 3;
-      return NS_OK;
-    default:
-      /*
-       * The metrics above are hardcoded platform defaults. All the other
-       * metrics are stored in sIntPrefs and can be changed at runtime.
-       */
-      break;
-  }
-
   for (unsigned int i = 0; i < ArrayLength(sIntPrefs); ++i) {
     if (sIntPrefs[i].isSet && (sIntPrefs[i].id == aID)) {
       aResult = sIntPrefs[i].intVar;
@@ -977,10 +957,10 @@
     }
   }
 
-  return NS_ERROR_NOT_AVAILABLE;
+  return NativeGetInt(aID, aResult);
 }
 
-nsresult nsXPLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
+nsresult nsXPLookAndFeel::GetFloatValue(FloatID aID, float& aResult) {
   if (!sInitialized) Init();
 
   for (unsigned int i = 0; i < ArrayLength(sFloatPrefs); ++i) {
@@ -990,7 +970,7 @@
     }
   }
 
-  return NS_ERROR_NOT_AVAILABLE;
+  return NativeGetFloat(aID, aResult);
 }
 
 void nsXPLookAndFeel::RefreshImpl() {
@@ -1029,7 +1009,7 @@
   int32_t i;
   Telemetry::ScalarSet(
       Telemetry::ScalarID::WIDGET_DARK_MODE,
-      NS_SUCCEEDED(GetIntImpl(IntID::SystemUsesDarkTheme, i)) && i != 0);
+      NS_SUCCEEDED(GetIntValue(IntID::SystemUsesDarkTheme, i)) && i != 0);
 
   RecordLookAndFeelSpecificTelemetry();
 }
@@ -1046,28 +1026,28 @@
 
 // static
 nsresult LookAndFeel::GetColor(ColorID aID, nscolor* aResult) {
-  return nsLookAndFeel::GetInstance()->GetColorImpl(aID, false, *aResult);
+  return nsLookAndFeel::GetInstance()->GetColorValue(aID, false, *aResult);
 }
 
 nsresult LookAndFeel::GetColor(ColorID aID, bool aUseStandinsForNativeColors,
                                nscolor* aResult) {
-  return nsLookAndFeel::GetInstance()->GetColorImpl(
+  return nsLookAndFeel::GetInstance()->GetColorValue(
       aID, aUseStandinsForNativeColors, *aResult);
 }
 
 // static
 nsresult LookAndFeel::GetInt(IntID aID, int32_t* aResult) {
-  return nsLookAndFeel::GetInstance()->GetIntImpl(aID, *aResult);
+  return nsLookAndFeel::GetInstance()->GetIntValue(aID, *aResult);
 }
 
 // static
 nsresult LookAndFeel::GetFloat(FloatID aID, float* aResult) {
-  return nsLookAndFeel::GetInstance()->GetFloatImpl(aID, *aResult);
+  return nsLookAndFeel::GetInstance()->GetFloatValue(aID, *aResult);
 }
 
 // static
 bool LookAndFeel::GetFont(FontID aID, nsString& aName, gfxFontStyle& aStyle) {
-  return nsLookAndFeel::GetInstance()->GetFontImpl(aID, aName, aStyle);
+  return nsLookAndFeel::GetInstance()->GetFontValue(aID, aName, aStyle);
 }
 
 // static
diff -Nru firefox-84.0.2+build1/widget/nsXPLookAndFeel.h firefox-85.0+build1/widget/nsXPLookAndFeel.h
--- firefox-84.0.2+build1/widget/nsXPLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/nsXPLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -49,21 +49,27 @@
 
   void Init();
 
+  // These functions will return a value specified by an override pref, if it
+  // exists, and otherwise will call into the NativeGetXxx function to get the
+  // platform-specific value.
   //
-  // All these routines will return NS_OK if they have a value,
-  // in which case the nsLookAndFeel should use that value;
-  // otherwise we'll return NS_ERROR_NOT_AVAILABLE, in which case, the
-  // platform-specific nsLookAndFeel should use its own values instead.
-  //
-  nsresult GetColorImpl(ColorID aID, bool aUseStandinsForNativeColors,
-                        nscolor& aResult);
-  virtual nsresult GetIntImpl(IntID aID, int32_t& aResult);
-  virtual nsresult GetFloatImpl(FloatID aID, float& aResult);
-
-  // This one is different: there are no override prefs (fixme?), so
-  // there is no XP implementation, only per-system impls.
-  virtual bool GetFontImpl(FontID aID, nsString& aName,
-                           gfxFontStyle& aStyle) = 0;
+  // NS_ERROR_NOT_AVAILABLE is returned if there is neither an override pref or
+  // a platform-specific value.
+  nsresult GetColorValue(ColorID aID, bool aUseStandinsForNativeColors,
+                         nscolor& aResult);
+  nsresult GetIntValue(IntID aID, int32_t& aResult);
+  nsresult GetFloatValue(FloatID aID, float& aResult);
+  // Same, but returns false if there is no platform-specific value.
+  // (There are no override prefs for font values.)
+  bool GetFontValue(FontID aID, nsString& aName, gfxFontStyle& aStyle) {
+    return NativeGetFont(aID, aName, aStyle);
+  }
+
+  virtual nsresult NativeGetInt(IntID aID, int32_t& aResult) = 0;
+  virtual nsresult NativeGetFloat(FloatID aID, float& aResult) = 0;
+  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) = 0;
+  virtual bool NativeGetFont(FontID aID, nsString& aName,
+                             gfxFontStyle& aStyle) = 0;
 
   virtual void RefreshImpl();
 
@@ -92,7 +98,6 @@
   void InitFromPref(nsLookAndFeelIntPref* aPref);
   void InitFromPref(nsLookAndFeelFloatPref* aPref);
   void InitColorFromPref(int32_t aIndex);
-  virtual nsresult NativeGetColor(ColorID aID, nscolor& aResult) = 0;
   bool IsSpecialColor(ColorID aID, nscolor& aColor);
   bool ColorIsNotCSSAccessible(ColorID aID);
   nscolor GetStandinForNativeColor(ColorID aID);
diff -Nru firefox-84.0.2+build1/widget/ProcInfo.h firefox-85.0+build1/widget/ProcInfo.h
--- firefox-84.0.2+build1/widget/ProcInfo.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/ProcInfo.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,237 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef __mozilla_ProcInfo_h
-#define __mozilla_ProcInfo_h
-
-#include <base/process.h>
-#include <stdint.h>
-#include "mozilla/dom/ipc/IdType.h"
-#include "mozilla/HashTable.h"
-#include "mozilla/MozPromise.h"
-
-namespace mozilla {
-
-namespace ipc {
-class GeckoChildProcessHost;
-}
-
-// Process types. When updating this enum, please make sure to update
-// WebIDLProcType, ChromeUtils::RequestProcInfo and ProcTypeToWebIDL to
-// mirror the changes.
-enum class ProcType {
-  // These must match the ones in ContentParent.h, and E10SUtils.jsm
-  Web,
-  WebIsolated,
-  File,
-  Extension,
-  PrivilegedAbout,
-  PrivilegedMozilla,
-  WebLargeAllocation,
-  WebCOOPCOEP,
-  // the rest matches GeckoProcessTypes.h
-  Browser,  // Default is named Browser here
-  Plugin,
-  IPDLUnitTest,
-  GMPlugin,
-  GPU,
-  VR,
-  RDD,
-  Socket,
-  RemoteSandboxBroker,
-#ifdef MOZ_ENABLE_FORKSERVER
-  ForkServer,
-#endif
-  Preallocated,
-  // Unknown type of process
-  Unknown,
-  Max = Unknown,
-};
-
-struct ThreadInfo {
-  // Thread Id.
-  base::ProcessId tid = 0;
-  // Thread name, if any.
-  nsString name;
-  // User time in ns.
-  uint64_t cpuUser = 0;
-  // System time in ns.
-  uint64_t cpuKernel = 0;
-};
-
-// Info on a DOM window.
-struct WindowInfo {
-  explicit WindowInfo()
-      : outerWindowId(0),
-        documentURI(nullptr),
-        documentTitle(u""_ns),
-        isProcessRoot(false),
-        isInProcess(false) {}
-  WindowInfo(uint64_t aOuterWindowId, nsIURI* aDocumentURI,
-             nsAString&& aDocumentTitle, bool aIsProcessRoot, bool aIsInProcess)
-      : outerWindowId(aOuterWindowId),
-        documentURI(aDocumentURI),
-        documentTitle(std::move(aDocumentTitle)),
-        isProcessRoot(aIsProcessRoot),
-        isInProcess(aIsInProcess) {}
-
-  // Internal window id.
-  const uint64_t outerWindowId;
-
-  // URI of the document.
-  const nsCOMPtr<nsIURI> documentURI;
-
-  // Title of the document.
-  const nsString documentTitle;
-
-  // True if this is the toplevel window of the process.
-  // Note that this may be an iframe from another process.
-  const bool isProcessRoot;
-
-  const bool isInProcess;
-};
-
-struct ProcInfo {
-  // Process Id
-  base::ProcessId pid = 0;
-  // Child Id as defined by Firefox when a child process is created.
-  dom::ContentParentId childId;
-  // Process type
-  ProcType type;
-  // Origin, if any
-  nsCString origin;
-  // Process filename (without the path name).
-  nsString filename;
-  // RSS in bytes.
-  int64_t residentSetSize = 0;
-  // Unshared resident size in bytes.
-  int64_t residentUniqueSize = 0;
-  // User time in ns.
-  uint64_t cpuUser = 0;
-  // System time in ns.
-  uint64_t cpuKernel = 0;
-  // Threads owned by this process.
-  CopyableTArray<ThreadInfo> threads;
-  // DOM windows represented by this process.
-  CopyableTArray<WindowInfo> windows;
-};
-
-typedef MozPromise<mozilla::HashMap<base::ProcessId, ProcInfo>, nsresult, true>
-    ProcInfoPromise;
-
-/**
- * Data we need to request process info (e.g. CPU usage, memory usage)
- * from the operating system and populate the resulting `ProcInfo`.
- *
- * Note that this structure contains a mix of:
- * - low-level handles that we need to request low-level process info
- *    (`aChildTask` on macOS, `aPid` on other platforms); and
- * - high-level data that we already acquired while looking for
- * `aPid`/`aChildTask` and that we will need further down the road.
- */
-struct ProcInfoRequest {
-  ProcInfoRequest(base::ProcessId aPid, ProcType aProcessType,
-                  const nsACString& aOrigin, nsTArray<WindowInfo>&& aWindowInfo,
-                  uint32_t aChildId = 0
-#ifdef XP_MACOSX
-                  ,
-                  mach_port_t aChildTask = 0
-#endif  // XP_MACOSX
-                  )
-      : pid(aPid),
-        processType(aProcessType),
-        origin(aOrigin),
-        windowInfo(std::move(aWindowInfo)),
-        childId(aChildId)
-#ifdef XP_MACOSX
-        ,
-        childTask(aChildTask)
-#endif  // XP_MACOSX
-  {
-  }
-  const base::ProcessId pid;
-  const ProcType processType;
-  const nsCString origin;
-  const nsTArray<WindowInfo> windowInfo;
-  // If the process is a child, its child id, otherwise `0`.
-  const int32_t childId;
-#ifdef XP_MACOSX
-  const mach_port_t childTask;
-#endif  // XP_MACOSX
-};
-
-/**
- * Batch a request for low-level information on Gecko processes.
- *
- * # Request
- *
- * Argument `aRequests` is a list of processes, along with high-level data
- * we have already obtained on them and that we need to populate the
- * resulting array of `ProcInfo`.
- *
- * # Result
- *
- * This call succeeds (possibly with missing data, see below) unless we
- * cannot allocate memory.
- *
- * # Performance
- *
- * - This call is always executed on a background thread.
- * - This call does NOT wake up children processes.
- * - This function is sometimes observably slow to resolve, in particular
- *   under Windows.
- *
- * # Error-handling and race conditions
- *
- * Requesting low-level information on a process and its threads is inherently
- * subject to race conditions. Typically, if a process or a thread is killed
- * while we're preparing to fetch information, we can easily end up with
- * system/lib calls that return failures.
- *
- * For this reason, this API assumes that errors when placing a system/lib call
- * are likely and normal. When some information cannot be obtained, the API will
- * simply skip over said information.
- *
- * Note that due to different choices by OSes, the exact information we skip may
- * vary across platforms. For instance, under Unix, failing to access the
- * threads of a process will cause us to skip all data on the process, while
- * under Windows, process information will be returned without thread
- * information.
- */
-RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests);
-
-/**
- * Utility function: copy data from a `ProcInfo` and into either a
- * `ParentProcInfoDictionary` or a `ChildProcInfoDictionary`.
- */
-template <typename T>
-nsresult CopySysProcInfoToDOM(const ProcInfo& source, T* dest) {
-  // Copy system info.
-  dest->mPid = source.pid;
-  dest->mFilename.Assign(source.filename);
-  dest->mResidentSetSize = source.residentSetSize;
-  dest->mResidentUniqueSize = source.residentUniqueSize;
-  dest->mCpuUser = source.cpuUser;
-  dest->mCpuKernel = source.cpuKernel;
-
-  // Copy thread info.
-  mozilla::dom::Sequence<mozilla::dom::ThreadInfoDictionary> threads;
-  for (const ThreadInfo& entry : source.threads) {
-    mozilla::dom::ThreadInfoDictionary* thread =
-        threads.AppendElement(fallible);
-    if (NS_WARN_IF(!thread)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    thread->mCpuUser = entry.cpuUser;
-    thread->mCpuKernel = entry.cpuKernel;
-    thread->mTid = entry.tid;
-    thread->mName.Assign(entry.name);
-  }
-  dest->mThreads = std::move(threads);
-  return NS_OK;
-}
-
-}  // namespace mozilla
-#endif  // ProcInfo_h
diff -Nru firefox-84.0.2+build1/widget/PuppetWidget.cpp firefox-85.0+build1/widget/PuppetWidget.cpp
--- firefox-84.0.2+build1/widget/PuppetWidget.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/PuppetWidget.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -342,6 +342,7 @@
     }
 #endif  // #ifdef DEBUG
     mNativeIMEContext = compositionEvent->mNativeIMEContext;
+    mContentCache.OnCompositionEvent(*compositionEvent);
   }
 
   // If the event is a composition event or a keyboard event, it should be
diff -Nru firefox-84.0.2+build1/widget/ScrollbarDrawingMac.h firefox-85.0+build1/widget/ScrollbarDrawingMac.h
--- firefox-84.0.2+build1/widget/ScrollbarDrawingMac.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/ScrollbarDrawingMac.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,6 +12,10 @@
 #include "Units.h"
 
 namespace mozilla {
+namespace gfx {
+class DrawTarget;
+}
+
 namespace widget {
 
 struct ScrollbarParams {
diff -Nru firefox-84.0.2+build1/widget/tests/browser/browser.ini firefox-85.0+build1/widget/tests/browser/browser.ini
--- firefox-84.0.2+build1/widget/tests/browser/browser.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/browser/browser.ini	2021-01-18 19:58:27.000000000 +0000
@@ -1,11 +1,2 @@
-[DEFAULT]
-prefs=
-  media.rdd-process.enabled=true
-
-support-files =
-  dummy.html
-
 [browser_test_clipboardcache.js]
-skip-if = os == 'android' || (os == 'linux' && ccov) # Bug 1613516, the test consistently timeouts on Linux coverage builds.
-[browser_test_procinfo.js]
-skip-if = os == "android" || (ccov && os == "linux") # https://bugzilla.mozilla.org/show_bug.cgi?id=1608080
+skip-if = os == 'android' || (os == 'linux' && ccov) || tsan # Bug 1613516, the test consistently timeouts on Linux coverage builds.
diff -Nru firefox-84.0.2+build1/widget/tests/browser/browser_test_procinfo.js firefox-85.0+build1/widget/tests/browser/browser_test_procinfo.js
--- firefox-84.0.2+build1/widget/tests/browser/browser_test_procinfo.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/browser/browser_test_procinfo.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,169 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-const ROOT_URL = "http://example.com/browser/widget/tests/browser";
-const DUMMY_URL = ROOT_URL + "/dummy.html";
-const { AppConstants } = ChromeUtils.import(
-  "resource://gre/modules/AppConstants.jsm"
-);
-const MAC = AppConstants.platform == "macosx";
-const HAS_THREAD_NAMES =
-  AppConstants.platform != "win" ||
-  AppConstants.isPlatformAndVersionAtLeast("win", 10);
-const isFissionEnabled = SpecialPowers.useRemoteSubframes;
-
-const SAMPLE_SIZE = 10;
-
-add_task(async function test_proc_info() {
-  console.log("YORIC", "Test starts");
-  // Open a few `about:home` tabs, they'll end up in `privilegedabout`.
-  let tabsAboutHome = [];
-  for (let i = 0; i < 5; ++i) {
-    let tab = BrowserTestUtils.addTab(gBrowser, "about:home");
-    tabsAboutHome.push(tab);
-    gBrowser.selectedTab = tab;
-    await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
-  }
-
-  await BrowserTestUtils.withNewTab(
-    { gBrowser, url: DUMMY_URL },
-    async function(browser) {
-      let cpuThreads = 0;
-      let cpuUser = 0;
-
-      // We test `SAMPLE_SIZE` times to increase a tad the chance of encountering race conditions.
-      for (let z = 0; z < SAMPLE_SIZE; z++) {
-        let parentProc = await ChromeUtils.requestProcInfo();
-        cpuUser += parentProc.cpuUser;
-
-        Assert.equal(
-          parentProc.type,
-          "browser",
-          "Parent proc type should be browser"
-        );
-
-        for (var x = 0; x < parentProc.threads.length; x++) {
-          cpuThreads += parentProc.threads[x].cpuUser;
-        }
-
-        // Under Windows, thread names appeared with Windows 10.
-        if (HAS_THREAD_NAMES) {
-          Assert.ok(
-            parentProc.threads.some(thread => thread.name),
-            "At least one of the threads of the parent process is named"
-          );
-        }
-
-        Assert.ok(
-          parentProc.residentUniqueSize > 0,
-          "Resident-unique-size was set"
-        );
-        Assert.ok(
-          parentProc.residentUniqueSize <= parentProc.residentSetSize,
-          `Resident-unique-size should be bounded by resident-set-size ${parentProc.residentUniqueSize} <= ${parentProc.residentSetSize}`
-        );
-
-        // While it's very unlikely that the parent will disappear while we're running
-        // tests, some children can easily vanish. So we go twice through the list of
-        // children. Once to test stuff that all process data respects the invariants
-        // that don't care whether we have a race condition and once to test that at
-        // least one well-known process that should not be able to vanish during
-        // the test respects all the invariants.
-        for (var i = 0; i < parentProc.children.length; i++) {
-          let childProc = parentProc.children[i];
-          Assert.notEqual(
-            childProc.type,
-            "browser",
-            "Child proc type should not be browser"
-          );
-
-          // We set the `childID` for child processes that have a `ContentParent`/`ContentChild`
-          // actor hierarchy.
-          if (childProc.type.startsWith("web")) {
-            Assert.notEqual(
-              childProc.childID,
-              0,
-              "Child proc should have been set"
-            );
-          }
-          Assert.notEqual(
-            childProc.type,
-            "unknown",
-            "Child proc type should be known"
-          );
-          if (childProc.type == "webIsolated") {
-            Assert.notEqual(
-              childProc.origin || "",
-              "",
-              "Child process should have an origin"
-            );
-          }
-
-          for (var y = 0; y < childProc.threads.length; y++) {
-            cpuThreads += childProc.threads[y].cpuUser;
-          }
-          cpuUser += childProc.cpuUser;
-        }
-
-        // We only check other properties on the `privilegedabout` subprocess, which
-        // as of this writing is always active and available.
-        var hasPrivilegedAbout = false;
-        var numberOfAboutTabs = 0;
-        for (i = 0; i < parentProc.children.length; i++) {
-          let childProc = parentProc.children[i];
-          if (childProc.type != "privilegedabout") {
-            continue;
-          }
-          hasPrivilegedAbout = true;
-          Assert.ok(
-            childProc.residentUniqueSize > 0,
-            "Resident-unique-size was set"
-          );
-          Assert.ok(
-            childProc.residentUniqueSize <= childProc.residentSetSize,
-            `Resident-unique-size should be bounded by resident-set-size ${childProc.residentUniqueSize} <= ${childProc.residentSetSize}`
-          );
-
-          for (var win of childProc.windows) {
-            if (win.documentURI.spec != "about:home") {
-              // We're only interested in about:home for this test.
-              continue;
-            }
-            numberOfAboutTabs++;
-            Assert.ok(
-              win.outerWindowId > 0,
-              `ContentParentID should be > 0 ${win.outerWindowId}`
-            );
-            if (win.documentTitle) {
-              // Unfortunately, we sometimes reach this point before the document is fully loaded, so
-              // `win.documentTitle` may still be empty.
-              Assert.equal(win.documentTitle, "New Tab");
-            }
-          }
-          Assert.ok(
-            numberOfAboutTabs >= tabsAboutHome.length,
-            "We have found at least as many about:home tabs as we opened"
-          );
-
-          // Once we have verified the privileged about process, bailout.
-          break;
-        }
-
-        Assert.ok(
-          hasPrivilegedAbout,
-          "We have found the privileged about process"
-        );
-      }
-      // see https://bugzilla.mozilla.org/show_bug.cgi?id=1529023
-      if (!MAC) {
-        Assert.greater(cpuThreads, 0, "Got some cpu time in the threads");
-      }
-      Assert.greater(cpuUser, 0, "Got some cpu time");
-
-      for (let tab of tabsAboutHome) {
-        BrowserTestUtils.removeTab(tab);
-      }
-    }
-  );
-});
diff -Nru firefox-84.0.2+build1/widget/tests/browser/dummy.html firefox-85.0+build1/widget/tests/browser/dummy.html
--- firefox-84.0.2+build1/widget/tests/browser/dummy.html	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/tests/browser/dummy.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<title>Dummy test page</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8"></meta>
-</head>
-<body>
-<p>Dummy test page</p>
-<div id="holder" class="">Holder</div>
-<script>
-  let text = "";
-  for (let i = 0; i < 1000; i++) {
-    text += "more";
-    // eslint-disable-next-line no-unsanitized/property
-    document.getElementById("holder").innerHTML = text;
-  }
-  document.getElementById("holder").classList.add("loaded");
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/widget/tests/chrome_context_menus_win.xhtml firefox-85.0+build1/widget/tests/chrome_context_menus_win.xhtml
--- firefox-84.0.2+build1/widget/tests/chrome_context_menus_win.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/chrome_context_menus_win.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-
-<window id="ChromeContextMenuTest"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        width="300"
-        height="300"
-        title="Chrome Context Menu Test w/Plugin Focus">
-
-<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-
-<popupset>
-  <menupopup id="testmenu" onpopupshown="menuDisplayed()">
-    <menuitem label="One"/>
-    <menuitem label="Two"/>
-    <menuitem label="Three"/>
-  </menupopup>
-</popupset>
-
-<toolbox>
-  <toolbar id="nav-toolbar" style="height:30px" context="testmenu">
-  </toolbar>
-</toolbox>
-
-<script type="application/javascript"><![CDATA[
-
-function ok(condition, message) {
-    window.arguments[0].SimpleTest.ok(condition, message);
-}
-
-function onTestsFinished() {
-    window.close();
-    window.arguments[0].SimpleTest.finish();
-}
-
-function openContextMenuFor(element) {
-
-    var utils = window.windowUtils;
-
-    var tbX = (window.mozInnerScreenX + 10) * utils.screenPixelsPerCSSPixel;
-    var tbY = (window.mozInnerScreenY + 10) * utils.screenPixelsPerCSSPixel;
-
-    // See nsWidnow's SynthesizeNativeMouseEvent & SendInput on msdn
-    var MOUSEEVENTF_RIGHTDOWN = 0x0008;
-    var MOUSEEVENTF_RIGHTUP = 0x0010;
-
-    utils.sendNativeMouseEvent(tbX, tbY,
-                               MOUSEEVENTF_RIGHTDOWN,
-                               0, element);
-    utils.sendNativeMouseEvent(tbX, tbY,
-                               MOUSEEVENTF_RIGHTUP,
-                               0, element);
-}
-
-var tid = 0;
-
-function onFocus() {
-    var _delayedOnLoad = function() {
-        var plugin = document.getElementById("plugin");
-        var toolbar = document.getElementById("nav-toolbar");
-
-        plugin.focus();
-
-        tid = setTimeout(menuTimeout, 5000);
-
-        openContextMenuFor(toolbar);
-    }
-    setTimeout(_delayedOnLoad, 3000);
-}
-
-function menuTimeout() {
-    ok(false, "Right-click chrome menu did not display with focus on a plugin.");
-    onTestsFinished();
-}
-
-function menuDisplayed() {
-    clearTimeout(tid);
-    ok(true, "Right-click chrome menu displayed despite plugin having focus.");
-    onTestsFinished();
-}
-
-window.arguments[0].SimpleTest.waitForFocus(onFocus, window);
-
-
-]]></script>
-
-<body xmlns="http://www.w3.org/1999/xhtml">
-  <br/>
-  <embed id="plugin" type="application/x-test" width="50" height="50"></embed>
-</body>
-
-</window>
diff -Nru firefox-84.0.2+build1/widget/tests/chrome.ini firefox-85.0+build1/widget/tests/chrome.ini
--- firefox-84.0.2+build1/widget/tests/chrome.ini	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/chrome.ini	2021-01-18 19:58:27.000000000 +0000
@@ -28,7 +28,6 @@
 support-files = window_wheeltransaction.xhtml
 [test_imestate.html]
 support-files = window_imestate_iframes.html
-[test_plugin_scroll_consistency.html]
 [test_composition_text_querycontent.xhtml]
 support-files = window_composition_text_querycontent.xhtml
 [test_input_events_on_deactive_window.xhtml]
@@ -95,11 +94,6 @@
 # Windows
 # taskbar_previews.xhtml
 # window_state_windows.xhtml
-[test_chrome_context_menus_win.xhtml]
-skip-if = toolkit != "windows"
-support-files = chrome_context_menus_win.xhtml
-[test_plugin_input_event.html]
-skip-if = toolkit != "windows"
 [test_mouse_scroll.xhtml]
 skip-if = toolkit != "windows"
 support-files =
diff -Nru firefox-84.0.2+build1/widget/tests/gtest/moz.build firefox-85.0+build1/widget/tests/gtest/moz.build
--- firefox-84.0.2+build1/widget/tests/gtest/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/gtest/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 
 UNIFIED_SOURCES = [
     "TestTimeConverter.cpp",
+    "TestTouchResampler.cpp",
 ]
 
 FINAL_LIBRARY = "xul-gtest"
diff -Nru firefox-84.0.2+build1/widget/tests/gtest/TestTouchResampler.cpp firefox-85.0+build1/widget/tests/gtest/TestTouchResampler.cpp
--- firefox-84.0.2+build1/widget/tests/gtest/TestTouchResampler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/widget/tests/gtest/TestTouchResampler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,941 @@
+/* -*- 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 <initializer_list>
+#include "InputData.h"
+#include "Units.h"
+#include "gtest/gtest.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/TimeStamp.h"
+#include "TouchResampler.h"
+
+using namespace mozilla;
+using widget::TouchResampler;
+
+class TouchResamplerTest : public ::testing::Test {
+ protected:
+  virtual void SetUp() { baseTimeStamp = TimeStamp::Now(); }
+
+  TimeStamp Time(double aMilliseconds) {
+    return baseTimeStamp + TimeDuration::FromMilliseconds(aMilliseconds);
+  }
+
+  uint64_t ProcessEvent(
+      MultiTouchInput::MultiTouchType aType,
+      std::initializer_list<std::pair<TimeStamp, ScreenIntPoint>>
+          aHistoricalData,
+      const TimeStamp& aTimeStamp, const ScreenIntPoint& aPosition) {
+    MultiTouchInput input(aType, 0, aTimeStamp, 0);
+    input.mTouches.AppendElement(SingleTouchData(1, aPosition, {}, 0.0f, 0.0f));
+    for (const auto& histData : aHistoricalData) {
+      input.mTouches[0].mHistoricalData.AppendElement(
+          SingleTouchData::HistoricalTouchData{
+              histData.first, histData.second, {}, {}, 0.0f, 0.0f});
+    }
+    return resampler.ProcessEvent(std::move(input));
+  }
+
+  void CheckTime(const TimeStamp& aTimeStamp,
+                 const TimeStamp& aExpectedTimeStamp) {
+    EXPECT_EQ((aTimeStamp - baseTimeStamp).ToMilliseconds(),
+              (aExpectedTimeStamp - baseTimeStamp).ToMilliseconds());
+  }
+
+  void CheckEvent(const MultiTouchInput& aEvent,
+                  MultiTouchInput::MultiTouchType aExpectedType,
+                  std::initializer_list<std::pair<TimeStamp, ScreenIntPoint>>
+                      aExpectedHistoricalData,
+                  const TimeStamp& aExpectedTimeStamp,
+                  const ScreenIntPoint& aExpectedPosition) {
+    EXPECT_EQ(aEvent.mType, aExpectedType);
+    EXPECT_EQ(aEvent.mTouches.Length(), size_t(1));
+    EXPECT_EQ(aEvent.mTouches[0].mHistoricalData.Length(),
+              aExpectedHistoricalData.size());
+    for (size_t i = 0; i < aExpectedHistoricalData.size(); i++) {
+      CheckTime(aEvent.mTouches[0].mHistoricalData[i].mTimeStamp,
+                aExpectedHistoricalData.begin()[i].first);
+      EXPECT_EQ(aEvent.mTouches[0].mHistoricalData[i].mScreenPoint,
+                aExpectedHistoricalData.begin()[i].second);
+    }
+    CheckTime(aEvent.mTimeStamp, aExpectedTimeStamp);
+    EXPECT_EQ(aEvent.mTouches[0].mScreenPoint, aExpectedPosition);
+  }
+
+  struct ExpectedOutgoingEvent {
+    Maybe<uint64_t> mEventId;
+    MultiTouchInput::MultiTouchType mType = MultiTouchInput::MULTITOUCH_START;
+    std::initializer_list<std::pair<TimeStamp, ScreenIntPoint>> mHistoricalData;
+    TimeStamp mTimeStamp;
+    ScreenIntPoint mPosition;
+  };
+
+  void CheckOutgoingEvents(
+      std::initializer_list<ExpectedOutgoingEvent> aExpectedEvents) {
+    auto outgoing = resampler.ConsumeOutgoingEvents();
+    EXPECT_EQ(outgoing.size(), aExpectedEvents.size());
+    for (const auto& expectedEvent : aExpectedEvents) {
+      auto outgoingEvent = std::move(outgoing.front());
+      outgoing.pop();
+
+      EXPECT_EQ(outgoingEvent.mEventId, expectedEvent.mEventId);
+      CheckEvent(outgoingEvent.mEvent, expectedEvent.mType,
+                 expectedEvent.mHistoricalData, expectedEvent.mTimeStamp,
+                 expectedEvent.mPosition);
+    }
+  }
+
+  TimeStamp baseTimeStamp;
+  TouchResampler resampler;
+};
+
+TEST_F(TouchResamplerTest, BasicExtrapolation) {
+  // Execute the following sequence:
+  //
+  // 0----------10-------16-----20---------------32------------
+  // * touchstart at (10, 10)
+  //             * touchmove at (20, 20)
+  //                      * frame
+  //                             * touchend at (20, 20)
+  //                                              * frame
+  //
+  // And expect the following output:
+  //
+  // 0----------10-------16-----20---------------32------------
+  // * touchstart at (10, 10)
+  //                      * touchmove at (26, 26)
+  //                      * touchmove at (20, 20)
+  //                             * touchend at (20, 20)
+  //
+  // The first frame should emit an extrapolated touchmove from the position
+  // data in the touchstart and touchmove events.
+  // The touchend should force a synthesized touchmove that returns back to a
+  // non-resampled position.
+
+  EXPECT_FALSE(resampler.InTouchingState());
+
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(10, 10));
+  EXPECT_TRUE(resampler.InTouchingState());
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(10.0),
+                              ScreenIntPoint(20, 20));
+
+  resampler.NotifyFrame(Time(16.0));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(10, 10)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(20, 20)}},
+       Time(16.0),
+       ScreenIntPoint(26, 26)},
+  });
+
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(20.0),
+                             ScreenIntPoint(20, 20));
+
+  EXPECT_FALSE(resampler.InTouchingState());
+
+  CheckOutgoingEvents({
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(16.0),
+       ScreenIntPoint(20, 20)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(20.0),
+       ScreenIntPoint(20, 20)},
+  });
+
+  // No more events should be produced from here on out.
+  resampler.NotifyFrame(Time(32.0));
+  auto outgoing = resampler.ConsumeOutgoingEvents();
+  EXPECT_TRUE(outgoing.empty());
+}
+
+TEST_F(TouchResamplerTest, BasicInterpolation) {
+  // Same test as BasicExtrapolation, but with a frame time that's 10ms earlier.
+  //
+  // Execute the following sequence:
+  //
+  // 0------6---10-----------20--22------------30-------------
+  // * touchstart at (10, 10)
+  //             * touchmove at (20, 20)
+  //        * frame
+  //                          * touchend at (20, 20)
+  //                              * frame
+  //
+  // And expect the following output:
+  //
+  // 0------6---10-----------20--22------------30-------------
+  // * touchstart at (10, 10)
+  //        * touchmove (16, 16)
+  //             * touchmove (20, 20)
+  //                          * touchend at (20, 20)
+  //
+  // The first frame should emit an interpolated touchmove from the position
+  // data in the touchstart and touchmove events.
+  // The touchend should create a touchmove that returns back to a non-resampled
+  // position.
+
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(10, 10));
+  EXPECT_TRUE(resampler.InTouchingState());
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(10.0),
+                              ScreenIntPoint(20, 20));
+
+  resampler.NotifyFrame(Time(6.0));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(10, 10)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(6.0),
+       ScreenIntPoint(16, 16)},
+  });
+
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(20.0),
+                             ScreenIntPoint(20, 20));
+  EXPECT_FALSE(resampler.InTouchingState());
+
+  CheckOutgoingEvents({
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(10.0),
+       ScreenIntPoint(20, 20)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(20.0),
+       ScreenIntPoint(20, 20)},
+  });
+
+  // No more events should be produced from here on out.
+  resampler.NotifyFrame(Time(22.0));
+  auto outgoing = resampler.ConsumeOutgoingEvents();
+  EXPECT_TRUE(outgoing.empty());
+}
+
+TEST_F(TouchResamplerTest, InterpolationFromHistoricalData) {
+  // Interpolate from the historical data in a touch move event.
+  //
+  // Execute the following sequence:
+  //
+  // 0----------10-------16-----20-----------30--32------------
+  // * touchstart at (10, 10)
+  //             * [hist] at (20, 25) for
+  //             `---------------* touchmove at (30, 30)
+  //                      * frame
+  //                                          * touchend at (30, 30)
+  //                                              * frame
+  //
+  // And expect the following output:
+  //
+  // 0----------10-------16-----20-----------30--32------------
+  // * touchstart at (10, 10)
+  //             * [hist] at (20, 25) for
+  //             `--------* touchmove at (26, 28)
+  //                             * touchmove at (30, 30)
+  //                                          * touchend at (30, 30)
+  //
+  // The first frame should emit an interpolated touchmove from the position
+  // data in the touchmove event, and integrate the historical data point into
+  // the resampled event.
+  // The touchend should force a synthesized touchmove that returns back to a
+  // non-resampled position.
+
+  // This also tests that interpolation works for both x and y, by giving the
+  // historical datapoint different values for x and y.
+  // (26, 28) is 60% of the way from (20, 25) to (30, 30).
+
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(10, 10));
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(10.0), ScreenIntPoint(20, 25)}},
+                              Time(20.0), ScreenIntPoint(30, 30));
+  resampler.NotifyFrame(Time(16.0));
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(30.0),
+                             ScreenIntPoint(30, 30));
+  resampler.NotifyFrame(Time(32.0));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(10, 10)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(20, 25)}},
+       Time(16.0),
+       ScreenIntPoint(26, 28)},
+
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(20.0),
+       ScreenIntPoint(30, 30)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(30.0),
+       ScreenIntPoint(30, 30)},
+  });
+}
+
+TEST_F(TouchResamplerTest, MultipleTouches) {
+  EXPECT_FALSE(resampler.InTouchingState());
+
+  // Touch start
+  MultiTouchInput inputStart0(MultiTouchInput::MULTITOUCH_START, 0, Time(0.0),
+                              0);
+  inputStart0.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(10, 10), {}, 0.0f, 0.0f));
+  auto idStart0 = resampler.ProcessEvent(std::move(inputStart0));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Touch move
+  MultiTouchInput inputMove1(MultiTouchInput::MULTITOUCH_MOVE, 0, Time(20.0),
+                             0);
+  inputMove1.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 30), {}, 0.0f, 0.0f));
+  inputMove1.mTouches[0].mHistoricalData.AppendElement(
+      SingleTouchData::HistoricalTouchData{
+          Time(10.0), ScreenIntPoint(20, 25), {}, {}, 0.0f, 0.0f});
+  auto idMove1 = resampler.ProcessEvent(std::move(inputMove1));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Frame
+  resampler.NotifyFrame(Time(16.0));
+
+  // Touch move
+  MultiTouchInput inputMove2(MultiTouchInput::MULTITOUCH_MOVE, 0, Time(30.0),
+                             0);
+  inputMove2.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 40), {}, 0.0f, 0.0f));
+  auto idMove2 = resampler.ProcessEvent(std::move(inputMove2));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Touch start
+  MultiTouchInput inputStart3(MultiTouchInput::MULTITOUCH_START, 0, Time(30.0),
+                              0);
+  inputStart3.mTouches.AppendElement(
+      SingleTouchData(2, ScreenIntPoint(100, 10), {}, 0.0f, 0.0f));
+  inputStart3.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 40), {}, 0.0f, 0.0f));
+  auto idStart3 = resampler.ProcessEvent(std::move(inputStart3));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Touch move
+  MultiTouchInput inputMove4(MultiTouchInput::MULTITOUCH_MOVE, 0, Time(40.0),
+                             0);
+  inputMove4.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 50), {}, 0.0f, 0.0f));
+  inputMove4.mTouches.AppendElement(
+      SingleTouchData(2, ScreenIntPoint(100, 30), {}, 0.0f, 0.0f));
+  auto idMove4 = resampler.ProcessEvent(std::move(inputMove4));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Frame
+  resampler.NotifyFrame(Time(32.0));
+
+  // Touch move
+  MultiTouchInput inputMove5(MultiTouchInput::MULTITOUCH_MOVE, 0, Time(50.0),
+                             0);
+  inputMove5.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 60), {}, 0.0f, 0.0f));
+  inputMove5.mTouches.AppendElement(
+      SingleTouchData(2, ScreenIntPoint(100, 40), {}, 0.0f, 0.0f));
+  auto idMove5 = resampler.ProcessEvent(std::move(inputMove5));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Touch end
+  MultiTouchInput inputEnd6(MultiTouchInput::MULTITOUCH_END, 0, Time(50.0), 0);
+  // Touch point with identifier 1 is lifted
+  inputEnd6.mTouches.AppendElement(
+      SingleTouchData(1, ScreenIntPoint(30, 60), {}, 0.0f, 0.0f));
+  auto idEnd6 = resampler.ProcessEvent(std::move(inputEnd6));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Frame
+  resampler.NotifyFrame(Time(48.0));
+
+  // Touch move
+  MultiTouchInput inputMove7(MultiTouchInput::MULTITOUCH_MOVE, 0, Time(60.0),
+                             0);
+  inputMove7.mTouches.AppendElement(
+      SingleTouchData(2, ScreenIntPoint(100, 60), {}, 0.0f, 0.0f));
+  auto idMove7 = resampler.ProcessEvent(std::move(inputMove7));
+  EXPECT_TRUE(resampler.InTouchingState());
+
+  // Frame
+  resampler.NotifyFrame(Time(64.0));
+
+  // Touch end
+  MultiTouchInput inputEnd8(MultiTouchInput::MULTITOUCH_END, 0, Time(70.0), 0);
+  // Touch point with identifier 2 is lifted
+  inputEnd8.mTouches.AppendElement(
+      SingleTouchData(2, ScreenIntPoint(100, 60), {}, 0.0f, 0.0f));
+  auto idEnd8 = resampler.ProcessEvent(std::move(inputEnd8));
+  EXPECT_FALSE(resampler.InTouchingState());
+
+  // Check outgoing events
+  auto outgoing = resampler.ConsumeOutgoingEvents();
+  EXPECT_EQ(outgoing.size(), size_t(9));
+
+  auto outgoingStart0 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingStart0.mEventId, Some(idStart0));
+  CheckEvent(outgoingStart0.mEvent, MultiTouchInput::MULTITOUCH_START, {},
+             Time(0.0), ScreenIntPoint(10, 10));
+
+  auto outgoingMove1 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingMove1.mEventId, Some(idMove1));
+  // (26, 28) is 60% of the way from (20, 25) to (30, 30).
+  CheckEvent(outgoingMove1.mEvent, MultiTouchInput::MULTITOUCH_MOVE,
+             {{Time(10.0), ScreenIntPoint(20, 25)}}, Time(16.0),
+             ScreenIntPoint(26, 28));
+
+  auto outgoingMove2 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingMove2.mEventId, Some(idMove2));
+  CheckEvent(outgoingMove2.mEvent, MultiTouchInput::MULTITOUCH_MOVE,
+             {{Time(20.0), ScreenIntPoint(30, 30)}}, Time(30.0),
+             ScreenIntPoint(30, 40));
+
+  auto outgoingStart3 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingStart3.mEventId, Some(idStart3));
+  EXPECT_EQ(outgoingStart3.mEvent.mType, MultiTouchInput::MULTITOUCH_START);
+  CheckTime(outgoingStart3.mEvent.mTimeStamp, Time(30.0));
+  EXPECT_EQ(outgoingStart3.mEvent.mTouches.Length(), size_t(2));
+  // touch order should be taken from the original touch start event
+  EXPECT_EQ(outgoingStart3.mEvent.mTouches[0].mIdentifier, 2);
+  EXPECT_EQ(outgoingStart3.mEvent.mTouches[0].mScreenPoint,
+            ScreenIntPoint(100, 10));
+  EXPECT_EQ(outgoingStart3.mEvent.mTouches[1].mIdentifier, 1);
+  EXPECT_EQ(outgoingStart3.mEvent.mTouches[1].mScreenPoint,
+            ScreenIntPoint(30, 40));
+
+  auto outgoingMove4 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingMove4.mEventId, Some(idMove4));
+  EXPECT_EQ(outgoingMove4.mEvent.mType, MultiTouchInput::MULTITOUCH_MOVE);
+  CheckTime(outgoingMove4.mEvent.mTimeStamp, Time(32.0));
+  EXPECT_EQ(outgoingMove4.mEvent.mTouches.Length(), size_t(2));
+  // Touch order should be taken from the original touch move event.
+  // Both touches should be resampled.
+  EXPECT_EQ(outgoingMove4.mEvent.mTouches[0].mIdentifier, 1);
+  EXPECT_EQ(outgoingMove4.mEvent.mTouches[0].mScreenPoint,
+            ScreenIntPoint(30, 42));
+  EXPECT_EQ(outgoingMove4.mEvent.mTouches[1].mIdentifier, 2);
+  EXPECT_EQ(outgoingMove4.mEvent.mTouches[1].mScreenPoint,
+            ScreenIntPoint(100, 14));
+
+  auto outgoingMove5 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingMove5.mEventId, Some(idMove5));
+  EXPECT_EQ(outgoingMove5.mEvent.mType, MultiTouchInput::MULTITOUCH_MOVE);
+  CheckTime(outgoingMove5.mEvent.mTimeStamp, Time(50.0));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches.Length(), size_t(2));
+  // touch order should be taken from the original touch move event
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[0].mIdentifier, 1);
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[0].mScreenPoint,
+            ScreenIntPoint(30, 60));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[0].mHistoricalData.Length(),
+            size_t(1));
+  CheckTime(outgoingMove5.mEvent.mTouches[0].mHistoricalData[0].mTimeStamp,
+            Time(40.0));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[0].mHistoricalData[0].mScreenPoint,
+            ScreenIntPoint(30, 50));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[1].mIdentifier, 2);
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[1].mScreenPoint,
+            ScreenIntPoint(100, 40));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[1].mHistoricalData.Length(),
+            size_t(1));
+  CheckTime(outgoingMove5.mEvent.mTouches[1].mHistoricalData[0].mTimeStamp,
+            Time(40.0));
+  EXPECT_EQ(outgoingMove5.mEvent.mTouches[1].mHistoricalData[0].mScreenPoint,
+            ScreenIntPoint(100, 30));
+
+  auto outgoingEnd6 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingEnd6.mEventId, Some(idEnd6));
+  CheckEvent(outgoingEnd6.mEvent, MultiTouchInput::MULTITOUCH_END, {},
+             Time(50.0), ScreenIntPoint(30, 60));
+
+  auto outgoingMove7 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingMove7.mEventId, Some(idMove7));
+  // No extrapolation because the frame at 64.0 cleared the data points because
+  // there was no pending touch move event at that point
+  CheckEvent(outgoingMove7.mEvent, MultiTouchInput::MULTITOUCH_MOVE, {},
+             Time(60.0), ScreenIntPoint(100, 60));
+  EXPECT_EQ(outgoingMove7.mEvent.mTouches[0].mIdentifier, 2);
+
+  auto outgoingEnd8 = std::move(outgoing.front());
+  outgoing.pop();
+  EXPECT_EQ(outgoingEnd8.mEventId, Some(idEnd8));
+  CheckEvent(outgoingEnd8.mEvent, MultiTouchInput::MULTITOUCH_END, {},
+             Time(70.0), ScreenIntPoint(100, 60));
+}
+
+TEST_F(TouchResamplerTest, MovingPauses) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(10, 10));
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(10.0),
+                              ScreenIntPoint(20, 20));
+  resampler.NotifyFrame(Time(16.0));
+  auto idMove2 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(30.0),
+                              ScreenIntPoint(40, 40));
+  resampler.NotifyFrame(Time(32.0));
+  auto idMove3 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(40.0),
+                              ScreenIntPoint(50, 40));
+  resampler.NotifyFrame(Time(48.0));
+  resampler.NotifyFrame(Time(64.0));
+  auto idEnd4 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(50, 40));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(10, 10)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(20, 20)}},
+       Time(16.0),
+       ScreenIntPoint(26, 26)},
+
+      {Some(idMove2),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(30.0), ScreenIntPoint(40, 40)}},
+       Time(32.0),
+       ScreenIntPoint(42, 42)},
+
+      {Some(idMove3),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(40.0), ScreenIntPoint(50, 40)}},
+       Time(48.0),
+       ScreenIntPoint(58, 40)},
+
+      // There was no event between two frames here, so we expect a reset event,
+      // so that we pause at a non-resampled position.
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(48.0),
+       ScreenIntPoint(50, 40)},
+
+      {Some(idEnd4),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(50, 40)},
+  });
+}
+
+TEST_F(TouchResamplerTest, MixedInterAndExtrapolation) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(10.0),
+                              ScreenIntPoint(0, 10));
+  resampler.NotifyFrame(Time(11.0));  // 16 - 5
+  auto idMove2 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(20.0), ScreenIntPoint(0, 20)}}, Time(30.0),
+                              ScreenIntPoint(0, 30));
+  resampler.NotifyFrame(Time(27.0));  // 32 - 5
+  auto idMove3 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(40.0),
+                              ScreenIntPoint(0, 40));
+  resampler.NotifyFrame(Time(43.0));  // 48 - 5
+  auto idMove4 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(50.0), ScreenIntPoint(0, 50)}}, Time(60.0),
+                              ScreenIntPoint(0, 60));
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd5 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 60));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(0, 10)}},
+       Time(11.0),
+       ScreenIntPoint(0, 11)},
+
+      {Some(idMove2),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(20.0), ScreenIntPoint(0, 20)}},
+       Time(27.0),
+       ScreenIntPoint(0, 27)},
+
+      {Some(idMove3),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(30.0), ScreenIntPoint(0, 30)},
+        {Time(40.0), ScreenIntPoint(0, 40)}},
+       Time(43.0),
+       ScreenIntPoint(0, 43)},
+
+      {Some(idMove4),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(50.0), ScreenIntPoint(0, 50)}},
+       Time(59.0),
+       ScreenIntPoint(0, 59)},
+
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(60.0),
+       ScreenIntPoint(0, 60)},
+
+      {Some(idEnd5),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 60)},
+  });
+}
+
+TEST_F(TouchResamplerTest, MultipleMoveEvents) {
+  // Test what happens if multiple touch move events appear between two frames.
+  // This scenario shouldn't occur on Android but we should be able to deal with
+  // it anyway. Check that we don't discard any event IDs.
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(10.0),
+                              ScreenIntPoint(0, 10));
+  resampler.NotifyFrame(Time(11.0));  // 16 - 5
+  auto idMove2 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(20.0), ScreenIntPoint(0, 20)}}, Time(30.0),
+                              ScreenIntPoint(0, 30));
+  auto idMove3 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(40.0),
+                              ScreenIntPoint(0, 40));
+  auto idMove4 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(45.0), ScreenIntPoint(0, 45)}}, Time(50.0),
+                              ScreenIntPoint(0, 50));
+  auto idMove5 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE, {}, Time(55.0),
+                              ScreenIntPoint(0, 55));
+  resampler.NotifyFrame(Time(43.0));  // 48 - 5
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd5 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 60));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(0, 10)}},
+       Time(11.0),
+       ScreenIntPoint(0, 11)},
+
+      {Some(idMove2),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(20.0), ScreenIntPoint(0, 20)}},
+       Time(30.0),
+       ScreenIntPoint(0, 30)},
+
+      {Some(idMove3),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(40.0),
+       ScreenIntPoint(0, 40)},
+
+      {Some(idMove4),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(43.0),
+       ScreenIntPoint(0, 43)},
+
+      {Some(idMove5),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(45.0), ScreenIntPoint(0, 45)},
+        {Time(50.0), ScreenIntPoint(0, 50)},
+        {Time(55.0), ScreenIntPoint(0, 55)}},
+       Time(59.0),
+       ScreenIntPoint(0, 59)},
+
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(59.0),
+       ScreenIntPoint(0, 55)},
+
+      {Some(idEnd5),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 60)},
+  });
+}
+
+TEST_F(TouchResamplerTest, LimitFuturePrediction) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  // Fingers move until time 44, then pause. UI thread is occupied until 64.
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(20.0), ScreenIntPoint(0, 20)},
+                               {Time(32.0), ScreenIntPoint(0, 32)}},
+                              Time(44.0), ScreenIntPoint(0, 44));
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 44));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      // kTouchResampleMaxPredictMs == 8
+      // Refuse to predict more than 8ms into the future, the fingers might have
+      // paused. Make an event for time 52 (= 44 + 8) instead of 59.
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(20.0), ScreenIntPoint(0, 20)},
+        {Time(32.0), ScreenIntPoint(0, 32)},
+        {Time(44.0), ScreenIntPoint(0, 44)}},
+       Time(52.0),
+       ScreenIntPoint(0, 52)},
+
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(52.0),
+       ScreenIntPoint(0, 44)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 44)},
+  });
+}
+
+TEST_F(TouchResamplerTest, LimitBacksampling) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  // Fingers move until time 44, then pause. UI thread is occupied until 64.
+  // Then we get a frame callback with a very outdated frametime.
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(20.0), ScreenIntPoint(0, 20)},
+                               {Time(32.0), ScreenIntPoint(0, 32)}},
+                              Time(44.0), ScreenIntPoint(0, 44));
+  resampler.NotifyFrame(Time(11.0));  // 16 - 5
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 44));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      // kTouchResampleMaxBacksampleMs == 20
+      // Refuse to sample further back than 20ms before the last data point.
+      // Make an event for time 24 (= 44 - 20) instead of time 11.
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(20.0), ScreenIntPoint(0, 20)}},
+       Time(24.0),
+       ScreenIntPoint(0, 24)},
+
+      {Nothing(),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(32.0), ScreenIntPoint(0, 32)}},
+       Time(44.0),
+       ScreenIntPoint(0, 44)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 44)},
+  });
+}
+
+TEST_F(TouchResamplerTest, DontExtrapolateFromOldTouch) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  // Fingers move until time 40, then pause. UI thread is occupied until 64.
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(20.0), ScreenIntPoint(0, 20)},
+                               {Time(30.0), ScreenIntPoint(0, 30)}},
+                              Time(40.0), ScreenIntPoint(0, 40));
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 44));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      // kTouchResampleOldTouchThresholdMs == 17
+      // Refuse to extrapolate from a data point that's more than 17ms older
+      // than the frame time.
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(20.0), ScreenIntPoint(0, 20)},
+        {Time(30.0), ScreenIntPoint(0, 30)}},
+       Time(40.0),
+       ScreenIntPoint(0, 40)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 44)},
+  });
+}
+
+TEST_F(TouchResamplerTest, DontExtrapolateIfTooOld) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  // Fingers move until time 10, pause, and move again at 55.
+  // UI thread is occupied until 64.
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(10.0), ScreenIntPoint(0, 10)}}, Time(55.0),
+                              ScreenIntPoint(0, 55));
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 60));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      // kTouchResampleWindowSize == 40
+      // Refuse to resample between two data points that are more than 40ms
+      // apart.
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(0, 10)}},
+       Time(55.0),
+       ScreenIntPoint(0, 55)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 60)},
+  });
+}
+
+TEST_F(TouchResamplerTest, DontInterpolateIfTooOld) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  // Fingers move until time 10, pause, and move again at 60.
+  // UI thread is occupied until 64.
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(10.0), ScreenIntPoint(0, 10)}}, Time(60.0),
+                              ScreenIntPoint(0, 60));
+  resampler.NotifyFrame(Time(59.0));  // 64 - 5
+  auto idEnd2 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(70.0),
+                             ScreenIntPoint(0, 60));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      // kTouchResampleWindowSize == 40
+      // Refuse to resample between two data points that are more than 40ms
+      // apart.
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(0, 10)}},
+       Time(60.0),
+       ScreenIntPoint(0, 60)},
+
+      {Some(idEnd2),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(70.0),
+       ScreenIntPoint(0, 60)},
+  });
+}
+
+TEST_F(TouchResamplerTest, DiscardOutdatedHistoricalData) {
+  auto idStart0 = ProcessEvent(MultiTouchInput::MULTITOUCH_START, {}, Time(0.0),
+                               ScreenIntPoint(0, 0));
+  auto idMove1 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(10.0), ScreenIntPoint(0, 10)}}, Time(16.0),
+                              ScreenIntPoint(0, 16));
+  resampler.NotifyFrame(Time(20.0));
+  auto idMove2 = ProcessEvent(MultiTouchInput::MULTITOUCH_MOVE,
+                              {{Time(18.0), ScreenIntPoint(0, 18)}}, Time(25.0),
+                              ScreenIntPoint(0, 25));
+  auto idEnd3 = ProcessEvent(MultiTouchInput::MULTITOUCH_END, {}, Time(35.0),
+                             ScreenIntPoint(0, 25));
+
+  CheckOutgoingEvents({
+      {Some(idStart0),
+       MultiTouchInput::MULTITOUCH_START,
+       {},
+       Time(0.0),
+       ScreenIntPoint(0, 0)},
+
+      {Some(idMove1),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {{Time(10.0), ScreenIntPoint(0, 10)},
+        {Time(16.0), ScreenIntPoint(0, 16)}},
+       Time(20.0),
+       ScreenIntPoint(0, 20)},
+
+      // Discard the historical data point from time 18, because we've already
+      // sent out an event with time 20 and don't want to go back before that.
+      {Some(idMove2),
+       MultiTouchInput::MULTITOUCH_MOVE,
+       {},
+       Time(25.0),
+       ScreenIntPoint(0, 25)},
+
+      {Some(idEnd3),
+       MultiTouchInput::MULTITOUCH_END,
+       {},
+       Time(35.0),
+       ScreenIntPoint(0, 25)},
+  });
+}
diff -Nru firefox-84.0.2+build1/widget/tests/test_chrome_context_menus_win.xhtml firefox-85.0+build1/widget/tests/test_chrome_context_menus_win.xhtml
--- firefox-84.0.2+build1/widget/tests/test_chrome_context_menus_win.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/test_chrome_context_menus_win.xhtml	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
-<script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-<script type="application/javascript" src="utils.js"></script>
-<script>
-    setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-    SimpleTest.waitForExplicitFinish();
-
-    var w = window.browsingContext.topChromeWindow.openDialog(
-        'chrome_context_menus_win.xhtml', '_blank', 'chrome,resizable=yes,width=600,height=600', window);
-
-    function done()
-    {
-        w.close();
-        SimpleTest.finish();
-    }
-</script>
-<body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;" />
-</window>
diff -Nru firefox-84.0.2+build1/widget/tests/test_imestate.html firefox-85.0+build1/widget/tests/test_imestate.html
--- firefox-84.0.2+build1/widget/tests/test_imestate.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/test_imestate.html	2021-01-18 19:58:27.000000000 +0000
@@ -8,9 +8,6 @@
           href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body onload="setTimeout(runTests, 0);" style="ime-mode: disabled;">
-<script>
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-</script>
 <div id="display" style="ime-mode: disabled;">
   <!-- input elements -->
   <input type="text"     id="text"/><br/>
@@ -674,21 +671,24 @@
 
   var plugin = document.getElementById("plugin");
 
+  // Plugins are not supported and their elements should not accept focus;
+  // therefore, IME should not enable when we play with it.
+
   document.activeElement.blur();
   is(gUtils.IMEStatus, gUtils.IME_STATUS_DISABLED,
      "runPluginTest: unexpected enabled state when no element has focus");
 
   plugin.focus();
-  is(gUtils.IMEStatus, gUtils.IME_STATUS_PLUGIN,
-     "runPluginTest: unexpected enabled state when plugin has focus");
+  is(gUtils.IMEStatus, gUtils.IME_STATUS_DISABLED,
+     "runPluginTest: unexpected enabled state when attempting to give focus to plugin");
 
   plugin.blur();
   is(gUtils.IMEStatus, gUtils.IME_STATUS_DISABLED,
-     "runPluginTest: unexpected enabled state when plugin has focus");
+     "runPluginTest: unexpected enabled state after unfocusing plugin");
 
   plugin.focus();
-  is(gUtils.IMEStatus, gUtils.IME_STATUS_PLUGIN,
-     "runPluginTest: unexpected enabled state when plugin has focus #2");
+  is(gUtils.IMEStatus, gUtils.IME_STATUS_DISABLED,
+     "runPluginTest: unexpected enabled state when attempting to give focus to plugin #2");
 
   var parent = plugin.parentNode;
   parent.removeChild(plugin);
diff -Nru firefox-84.0.2+build1/widget/tests/test_plugin_input_event.html firefox-85.0+build1/widget/tests/test_plugin_input_event.html
--- firefox-84.0.2+build1/widget/tests/test_plugin_input_event.html	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/test_plugin_input_event.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for plugin input event</title>
-  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-  <script src="chrome://mochikit/content/tests/SimpleTest/NativeKeyCodes.js"></script>
-  <script type="text/javascript" src="utils.js"></script>
-  <link rel="stylesheet" type="text/css"
-          href="chrome://mochikit/content/tests/SimpleTest/test.css" />
-</head>
-<body>
-<script type="application/javascript">
-setTestPluginEnabledState(SpecialPowers.Ci.nsIPluginTag.STATE_ENABLED);
-</script>
-
-<p id="display">
-  <embed id="plugin" type="application/x-test" wmode="opaque">
-</p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-
-<script type="application/javascript">
-SimpleTest.waitForExplicitFinish();
-
-var gPlugin = document.getElementById("plugin");
-
-var gUtils = window.windowUtils;
-
-function* doTest() {
-  gPlugin.focus();
-
-  is(gUtils.IMEStatus, gUtils.IME_STATUS_PLUGIN,
-     "Plugin failed to get focus");
-
-  is(gPlugin.getLastKeyText(), "", "Must be empty before first key test");
-
-  yield synthesizeNativeKey(KEYBOARD_LAYOUT_EN_US, WIN_VK_A, {}, "a", "a", continueTest);
-  is(gPlugin.getLastKeyText(), "a", "Invalid character was inputted");
-
-  yield synthesizeNativeKey(KEYBOARD_LAYOUT_GERMAN, WIN_VK_OEM_PLUS, {}, "+", "+", continueTest);
-  is(gPlugin.getLastKeyText(), "+", "Invalid character was inputted");
-
-  yield synthesizeNativeKey(KEYBOARD_LAYOUT_GERMAN, WIN_VK_OEM_PLUS, {altGrKey: 1}, "~", "+", continueTest);
-  is(gPlugin.getLastKeyText(), "~", "Invalid character was inputted");
-}
-
-var gTestContinuation = null;
-
-function continueTest() {
-  if (!gTestContinuation) {
-    gTestContinuation = doTest(continueTest);
-  }
-  var ret = gTestContinuation.next();
-  if (ret.done) {
-    SimpleTest.finish();
-  } else {
-    is(ret.value, true, "Key synthesized successfully");
-  }
-}
-
-SimpleTest.waitForFocus(continueTest);
-
-</script>
-</body>
-</html>
diff -Nru firefox-84.0.2+build1/widget/tests/window_composition_text_querycontent.xhtml firefox-85.0+build1/widget/tests/window_composition_text_querycontent.xhtml
--- firefox-84.0.2+build1/widget/tests/window_composition_text_querycontent.xhtml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/tests/window_composition_text_querycontent.xhtml	2021-01-18 19:58:27.000000000 +0000
@@ -1629,6 +1629,11 @@
     return;
   }
 
+  let textRect3QueriedWithRelativeOffset = synthesizeQueryTextRect(-8, 1, true);
+  let textRect4QueriedWithRelativeOffset = synthesizeQueryTextRect(-8 + 1, 1, true);
+  checkRect(textRect3QueriedWithRelativeOffset, textRect3, "runCompositionTest: textRect #2-1-2");
+  checkRect(textRect4QueriedWithRelativeOffset, textRect4, "runCompositionTest: textRect #2-1-3");
+
   synthesizeCompositionChange(
     { "composition":
       { "string": "\u3058",
@@ -5090,8 +5095,8 @@
   textarea.focus();
   textarea.value = "0123456789";
 
+  // "[]0123456789"
   let startOffset = textarea.selectionStart = textarea.selectionEnd = 0;
-
   if (!checkContentRelativeToSelection(0, 1, 0, "0", "runQueryContentEventRelativeToInsertionPoint[0-0]", "#1") ||
       !checkContentRelativeToSelection(-1, 1, 0, "0", "runQueryContentEventRelativeToInsertionPoint[0-0]", "#2") ||
       !checkContentRelativeToSelection(1, 1, 1, "1", "runQueryContentEventRelativeToInsertionPoint[0-0]", "#3") ||
@@ -5100,20 +5105,18 @@
     return;
   }
 
+  // "[01234]56789"
   textarea.selectionEnd = 5;
-
   if (!checkContentRelativeToSelection(0, 1, 0, "0", "runQueryContentEventRelativeToInsertionPoint[0-5]", "#1") ||
       !checkContentRelativeToSelection(-1, 1, 0, "0", "runQueryContentEventRelativeToInsertionPoint[0-5]", "#2") ||
       !checkContentRelativeToSelection(1, 1, 1, "1", "runQueryContentEventRelativeToInsertionPoint[0-5]", "#3") ||
       !checkContentRelativeToSelection(5, 10, 5, "56789", "runQueryContentEventRelativeToInsertionPoint[0-5]", "#4") ||
-      // This test is broken, see bug 1669724.
-      // eslint-disable-next-line no-sequences
-      !checkContentRelativeToSelection(10, 1, 10, "", "runQueryContentEventRelativeToInsertionPoint[0-5]"), "#5") {
+      !checkContentRelativeToSelection(10, 1, 10, "", "runQueryContentEventRelativeToInsertionPoint[0-5]", "#5")) {
     return;
   }
 
+  // "0123[]456789"
   startOffset = textarea.selectionStart = textarea.selectionEnd = 4;
-
   if (!checkContentRelativeToSelection(0, 1, startOffset + 0, "4", "runQueryContentEventRelativeToInsertionPoint[4-4]", "#1") ||
       !checkContentRelativeToSelection(-1, 1, startOffset - 1, "3", "runQueryContentEventRelativeToInsertionPoint[4-4]", "#2") ||
       !checkContentRelativeToSelection(1, 1, startOffset + 1, "5", "runQueryContentEventRelativeToInsertionPoint[4-4]", "#3") ||
@@ -5132,7 +5135,7 @@
       },
       "caret": { "start": 1, "length": 0 }
     });
-
+  // "0123[a]456789"
   if (!checkContentRelativeToSelection(0, 1, startOffset + 0, "a", "runQueryContentEventRelativeToInsertionPoint[composition at 4]", "#1") ||
       !checkContentRelativeToSelection(-1, 1, startOffset - 1, "3", "runQueryContentEventRelativeToInsertionPoint[composition at 4]", "#2") ||
       !checkContentRelativeToSelection(1, 1, startOffset + 1, "4", "runQueryContentEventRelativeToInsertionPoint[composition at 4]", "#3") ||
@@ -5154,7 +5157,7 @@
 
   synthesizeCompositionChange(
     { "composition":
-      { "string": "a",
+      { "string": "b",
         "clauses":
         [
           { "length": 1, "attr": COMPOSITION_ATTR_RAW_CLAUSE }
@@ -5162,7 +5165,7 @@
       },
       "caret": { "start": 1, "length": 0 }
     });
-
+  // "0123[b]a456789"
   if (!checkContentRelativeToSelection(0, 1, startOffset + 0, "b", "runQueryContentEventRelativeToInsertionPoint[composition at 3]", "#1") ||
       !checkContentRelativeToSelection(-1, 1, startOffset - 1, "3", "runQueryContentEventRelativeToInsertionPoint[composition at 3]", "#2") ||
       !checkContentRelativeToSelection(1, 1, startOffset + 1, "a", "runQueryContentEventRelativeToInsertionPoint[composition at 3]", "#3") ||
@@ -5374,6 +5377,7 @@
     count++;
   }
 
+  input.addEventListener("keydown", handler);
   input.addEventListener("keyup", handler);
 
   synthesizeCompositionChange({
@@ -5392,7 +5396,7 @@
   });
   synthesizeComposition({type: "compositioncommitasis"});
 
-  is(count, 3, "runBug1675313Test: keyup event is fired correctly");
+  is(count, 6, "runBug1675313Test: keydown event and keyup event are fired correctly");
   is(input.value, "b",
      "runBug1675313Test: re-focus element doesn't commit composition if re-focus isn't click by user");
 
@@ -9586,6 +9590,7 @@
   await runBug1584901Test();
 
   runUndoRedoTest();
+  runCompositionTest();
   runCompositionCommitAsIsTest();
   runCompositionCommitTest();
   runCompositionEventTest();
diff -Nru firefox-84.0.2+build1/widget/TextEvents.h firefox-85.0+build1/widget/TextEvents.h
--- firefox-84.0.2+build1/widget/TextEvents.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/TextEvents.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,15 +11,16 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/CheckedInt.h"
-#include "mozilla/dom/DataTransfer.h"
-#include "mozilla/dom/StaticRange.h"
 #include "mozilla/EventForwards.h"  // for KeyNameIndex, temporarily
 #include "mozilla/FontRange.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/OwningNonNull.h"
 #include "mozilla/TextRange.h"
 #include "mozilla/WritingModes.h"
+#include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/dom/StaticRange.h"
+#include "mozilla/widget/IMEData.h"
 #include "nsCOMPtr.h"
 #include "nsISelectionListener.h"
 #include "nsITransferable.h"
@@ -911,8 +912,7 @@
   friend class dom::PBrowserChild;
 
   WidgetQueryContentEvent()
-      : mSucceeded(false),
-        mUseNativeLineBreak(true),
+      : mUseNativeLineBreak(true),
         mWithFontRanges(false),
         mNeedsToFlushLayout(true) {
     MOZ_CRASH("WidgetQueryContentEvent is created without proper arguments");
@@ -926,7 +926,6 @@
   WidgetQueryContentEvent(bool aIsTrusted, EventMessage aMessage,
                           nsIWidget* aWidget)
       : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eQueryContentEventClass),
-        mSucceeded(false),
         mUseNativeLineBreak(true),
         mWithFontRanges(false),
         mNeedsToFlushLayout(true) {}
@@ -936,7 +935,6 @@
       : WidgetGUIEvent(aOtherEvent.IsTrusted(), aMessage,
                        const_cast<nsIWidget*>(aOtherEvent.mWidget.get()),
                        eQueryContentEventClass),
-        mSucceeded(false),
         mUseNativeLineBreak(aOtherEvent.mUseNativeLineBreak),
         mWithFontRanges(false),
         mNeedsToFlushLayout(aOtherEvent.mNeedsToFlushLayout) {}
@@ -1019,28 +1017,59 @@
   bool NeedsToFlushLayout() const { return mNeedsToFlushLayout; }
 
   void RequestFontRanges() {
-    NS_ASSERTION(mMessage == eQueryTextContent, "not querying text content");
+    MOZ_ASSERT(mMessage == eQueryTextContent);
     mWithFontRanges = true;
   }
 
-  uint32_t GetSelectionStart(void) const {
-    NS_ASSERTION(mMessage == eQuerySelectedText, "not querying selection");
-    return mReply.mOffset + (mReply.mReversed ? mReply.mString.Length() : 0);
+  bool Succeeded() const {
+    if (mReply.isNothing()) {
+      return false;
+    }
+    switch (mMessage) {
+      case eQuerySelectedText:
+        return mReply->mOffsetAndData.isSome() ||
+               mInput.mSelectionType != SelectionType::eNormal;
+      case eQueryTextContent:
+      case eQueryTextRect:
+      case eQueryCaretRect:
+        return mReply->mOffsetAndData.isSome();
+      default:
+        return true;
+    }
+  }
+
+  bool Failed() const { return !Succeeded(); }
+
+  bool FoundSelection() const {
+    MOZ_ASSERT(mMessage == eQuerySelectedText);
+    return Succeeded() && mReply->mOffsetAndData.isSome();
+  }
+
+  bool FoundChar() const {
+    MOZ_ASSERT(mMessage == eQueryCharacterAtPoint);
+    return Succeeded() && mReply->mOffsetAndData.isSome();
   }
 
-  uint32_t GetSelectionEnd(void) const {
-    NS_ASSERTION(mMessage == eQuerySelectedText, "not querying selection");
-    return mReply.mOffset + (mReply.mReversed ? 0 : mReply.mString.Length());
+  bool FoundTentativeCaretOffset() const {
+    MOZ_ASSERT(mMessage == eQueryCharacterAtPoint);
+    return Succeeded() && mReply->mTentativeCaretOffset.isSome();
   }
 
-  mozilla::WritingMode GetWritingMode(void) const {
-    NS_ASSERTION(mMessage == eQuerySelectedText ||
-                     mMessage == eQueryCaretRect || mMessage == eQueryTextRect,
-                 "not querying selection or text rect");
-    return mReply.mWritingMode;
+  bool DidNotFindSelection() const {
+    MOZ_ASSERT(mMessage == eQuerySelectedText);
+    return Failed() || mReply->mOffsetAndData.isNothing();
+  }
+
+  bool DidNotFindChar() const {
+    MOZ_ASSERT(mMessage == eQueryCharacterAtPoint);
+    return Failed() || mReply->mOffsetAndData.isNothing();
+  }
+
+  bool DidNotFindTentativeCaretOffset() const {
+    MOZ_ASSERT(mMessage == eQueryCharacterAtPoint);
+    return Failed() || mReply->mTentativeCaretOffset.isNothing();
   }
 
-  bool mSucceeded;
   bool mUseNativeLineBreak;
   bool mWithFontRanges;
   bool mNeedsToFlushLayout;
@@ -1092,8 +1121,7 @@
         return true;
       }
       // Otherwise, we don't allow too large offset.
-      CheckedInt<uint32_t> absOffset =
-          CheckedInt<uint32_t>(mOffset) + aInsertionPointOffset;
+      CheckedInt<uint32_t> absOffset(mOffset + aInsertionPointOffset);
       if (NS_WARN_IF(!absOffset.isValid())) {
         mOffset = UINT32_MAX;
         return false;
@@ -1104,12 +1132,12 @@
   } mInput;
 
   struct Reply final {
+    EventMessage const mEventMessage;
     void* mContentsRoot;
-    uint32_t mOffset;
+    Maybe<OffsetAndData<uint32_t>> mOffsetAndData;
     // mTentativeCaretOffset is used by only eQueryCharacterAtPoint.
     // This is the offset where caret would be if user clicked at the mRefPoint.
-    uint32_t mTentativeCaretOffset;
-    nsString mString;
+    Maybe<uint32_t> mTentativeCaretOffset;
     // mRect is used by eQueryTextRect, eQueryCaretRect, eQueryCharacterAtPoint
     // and eQueryEditorRect. The coordinates is system coordinates relative to
     // the top level widget of mFocusedWidget.  E.g., if a <xul:panel> which
@@ -1133,17 +1161,136 @@
     // true if DOM element under mouse belongs to widget
     bool mWidgetIsHit;
 
-    Reply()
-        : mContentsRoot(nullptr),
-          mOffset(NOT_FOUND),
-          mTentativeCaretOffset(NOT_FOUND),
+    Reply() = delete;
+    explicit Reply(EventMessage aEventMessage)
+        : mEventMessage(aEventMessage),
+          mContentsRoot(nullptr),
           mFocusedWidget(nullptr),
           mReversed(false),
           mHasSelection(false),
           mWidgetIsHit(false) {}
-  } mReply;
 
-  enum { NOT_FOUND = UINT32_MAX };
+    // Don't allow to copy/move because of `mEventMessage`.
+    Reply(const Reply& aOther) = delete;
+    Reply(Reply&& aOther) = delete;
+    Reply& operator=(const Reply& aOther) = delete;
+    Reply& operator=(Reply&& aOther) = delete;
+
+    MOZ_NEVER_INLINE_DEBUG uint32_t StartOffset() const {
+      MOZ_ASSERT(mOffsetAndData.isSome());
+      return mOffsetAndData->StartOffset();
+    }
+    MOZ_NEVER_INLINE_DEBUG uint32_t EndOffset() const {
+      MOZ_ASSERT(mOffsetAndData.isSome());
+      return mOffsetAndData->EndOffset();
+    }
+    MOZ_NEVER_INLINE_DEBUG uint32_t DataLength() const {
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mOffsetAndData.isSome() ? mOffsetAndData->Length() : 0;
+    }
+    MOZ_NEVER_INLINE_DEBUG uint32_t SelectionStartOffset() const {
+      MOZ_ASSERT(mEventMessage == eQuerySelectedText);
+      MOZ_ASSERT(mOffsetAndData.isSome());
+      return StartOffset() + (mReversed ? DataLength() : 0);
+    }
+
+    MOZ_NEVER_INLINE_DEBUG uint32_t SelectionEndOffset() const {
+      MOZ_ASSERT(mEventMessage == eQuerySelectedText);
+      MOZ_ASSERT(mOffsetAndData.isSome());
+      return StartOffset() + (mReversed ? 0 : DataLength());
+    }
+
+    const WritingMode& WritingModeRef() const {
+      MOZ_ASSERT(mEventMessage == eQuerySelectedText ||
+                 mEventMessage == eQueryCaretRect ||
+                 mEventMessage == eQueryTextRect);
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mWritingMode;
+    }
+
+    MOZ_NEVER_INLINE_DEBUG const nsString& DataRef() const {
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mOffsetAndData.isSome() ? mOffsetAndData->DataRef()
+                                     : EmptyString();
+    }
+    MOZ_NEVER_INLINE_DEBUG bool IsDataEmpty() const {
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mOffsetAndData.isSome() ? mOffsetAndData->IsDataEmpty() : true;
+    }
+    MOZ_NEVER_INLINE_DEBUG bool IsOffsetInRange(uint32_t aOffset) const {
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mOffsetAndData.isSome() ? mOffsetAndData->IsOffsetInRange(aOffset)
+                                     : false;
+    }
+    MOZ_NEVER_INLINE_DEBUG bool IsOffsetInRangeOrEndOffset(
+        uint32_t aOffset) const {
+      MOZ_ASSERT(mOffsetAndData.isSome() ||
+                 mEventMessage == eQuerySelectedText);
+      return mOffsetAndData.isSome()
+                 ? mOffsetAndData->IsOffsetInRangeOrEndOffset(aOffset)
+                 : false;
+    }
+    MOZ_NEVER_INLINE_DEBUG void TruncateData(uint32_t aLength = 0) {
+      MOZ_ASSERT(mOffsetAndData.isSome());
+      mOffsetAndData->TruncateData(aLength);
+    }
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Reply& aReply) {
+      aStream << "{ ";
+      if (aReply.mEventMessage == eQuerySelectedText ||
+          aReply.mEventMessage == eQueryTextContent ||
+          aReply.mEventMessage == eQueryTextRect ||
+          aReply.mEventMessage == eQueryCaretRect ||
+          aReply.mEventMessage == eQueryCharacterAtPoint) {
+        aStream << "mOffsetAndData=" << ToString(aReply.mOffsetAndData).c_str()
+                << ", ";
+        if (aReply.mEventMessage == eQueryCharacterAtPoint) {
+          aStream << "mTentativeCaretOffset="
+                  << ToString(aReply.mTentativeCaretOffset).c_str() << ", ";
+        }
+      }
+      aStream << "mHasSelection=" << (aReply.mHasSelection ? "true" : "false");
+      if (aReply.mHasSelection) {
+        if (aReply.mEventMessage == eQuerySelectedText) {
+          aStream << ", mReversed=" << (aReply.mReversed ? "true" : "false");
+        }
+        if (aReply.mEventMessage == eQuerySelectionAsTransferable) {
+          aStream << ", mTransferable=0x" << aReply.mTransferable;
+        }
+      }
+      if (aReply.mEventMessage == eQuerySelectedText ||
+          aReply.mEventMessage == eQueryTextRect ||
+          aReply.mEventMessage == eQueryCaretRect) {
+        aStream << ", mWritingMode=" << ToString(aReply.mWritingMode).c_str();
+      }
+      aStream << ", mContentsRoot=0x" << aReply.mContentsRoot
+              << ", mFocusedWidget=0x" << aReply.mFocusedWidget;
+      if (aReply.mEventMessage == eQueryTextContent) {
+        aStream << ", mFontRanges={ Length()=" << aReply.mFontRanges.Length()
+                << " }";
+      } else if (aReply.mEventMessage == eQueryTextRect ||
+                 aReply.mEventMessage == eQueryCaretRect ||
+                 aReply.mEventMessage == eQueryCharacterAtPoint) {
+        aStream << ", mRect=" << ToString(aReply.mRect).c_str();
+      } else if (aReply.mEventMessage == eQueryTextRectArray) {
+        aStream << ", mRectArray={ Length()=" << aReply.mRectArray.Length()
+                << " }";
+      } else if (aReply.mEventMessage == eQueryDOMWidgetHittest) {
+        aStream << ", mWidgetIsHit="
+                << (aReply.mWidgetIsHit ? "true" : "false");
+      }
+      return aStream << " }";
+    }
+  };
+
+  void EmplaceReply() { mReply.emplace(mMessage); }
+  Maybe<Reply> mReply;
 
   // values of mComputedScrollAction
   enum { SCROLL_ACTION_NONE, SCROLL_ACTION_LINE, SCROLL_ACTION_PAGE };
diff -Nru firefox-84.0.2+build1/widget/TouchResampler.cpp firefox-85.0+build1/widget/TouchResampler.cpp
--- firefox-84.0.2+build1/widget/TouchResampler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/widget/TouchResampler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,381 @@
+/* -*- 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 "TouchResampler.h"
+
+#include "nsAlgorithm.h"
+
+/**
+ * TouchResampler implementation
+ */
+
+namespace mozilla {
+namespace widget {
+
+// The values below have been tested and found to be acceptable on a device
+// with a display refresh rate of 60Hz and touch sampling rate of 100Hz.
+// While their "ideal" values are dependent on the exact rates of each device,
+// the values we've picked below should be somewhat robust across a variation of
+// different rates. They mostly aim to avoid making predictions that are too far
+// away (in terms of distance) from the finger, and to detect pauses in the
+// finger motion without too much delay.
+
+// Maximum time between two consecutive data points to consider resampling
+// between them.
+// Values between 1x and 5x of the touch sampling interval are reasonable.
+static const double kTouchResampleWindowSize = 40.0;
+
+// These next two values constrain the sampling timestamp.
+// Our caller will usually adjust frame timestamps to be slightly in the past,
+// for example by 5ms. This means that, during normal operation, we will
+// maximally need to predict by [touch sampling rate] minus 5ms.
+// So we would like kTouchResampleMaxPredictMs to satisfy the following:
+// kTouchResampleMaxPredictMs + [frame time adjust] > [touch sampling rate]
+static const double kTouchResampleMaxPredictMs = 8.0;
+// This one is a protection against very outdated frame timestamps.
+// Values larger than the touch sampling interval and less than 3x of the vsync
+// interval are reasonable.
+static const double kTouchResampleMaxBacksampleMs = 20.0;
+
+// The maximum age of the most recent data point to consider resampling.
+// Should be between 1x and 3x of the touch sampling interval.
+static const double kTouchResampleOldTouchThresholdMs = 17.0;
+
+uint64_t TouchResampler::ProcessEvent(MultiTouchInput&& aInput) {
+  mCurrentTouches.UpdateFromEvent(aInput);
+
+  uint64_t eventId = mNextEventId;
+  mNextEventId++;
+
+  if (aInput.mType == MultiTouchInput::MULTITOUCH_MOVE) {
+    // Touch move events are deferred until NotifyFrame.
+    mDeferredTouchMoveEvents.push({std::move(aInput), eventId});
+  } else {
+    // Non-move events are transferred to the outgoing queue unmodified.
+    // If there are pending touch move events, flush those out first, so that
+    // events are emitted in the right order.
+    FlushDeferredTouchMoveEventsUnresampled();
+    if (mInResampledState) {
+      // Return to a non-resampled state before emitting a non-move event.
+      ReturnToNonResampledState();
+    }
+    EmitEvent(std::move(aInput), eventId);
+  }
+
+  return eventId;
+}
+
+void TouchResampler::NotifyFrame(const TimeStamp& aTimeStamp) {
+  TimeStamp lastTouchTime = mCurrentTouches.LatestDataPointTime();
+  if (mDeferredTouchMoveEvents.empty() ||
+      (lastTouchTime &&
+       lastTouchTime < aTimeStamp - TimeDuration::FromMilliseconds(
+                                        kTouchResampleOldTouchThresholdMs))) {
+    // We haven't received a touch move event in a while, so the fingers must
+    // have stopped moving. Flush any old touch move events.
+    FlushDeferredTouchMoveEventsUnresampled();
+
+    if (mInResampledState) {
+      // Make sure we pause at the resting position that we actually observed,
+      // and not at a resampled position.
+      ReturnToNonResampledState();
+    }
+
+    // Clear touch location history so that we don't resample across a pause.
+    mCurrentTouches.ClearDataPoints();
+    return;
+  }
+
+  MOZ_RELEASE_ASSERT(lastTouchTime);
+  TimeStamp lowerBound = lastTouchTime - TimeDuration::FromMilliseconds(
+                                             kTouchResampleMaxBacksampleMs);
+  TimeStamp upperBound = lastTouchTime + TimeDuration::FromMilliseconds(
+                                             kTouchResampleMaxPredictMs);
+  TimeStamp sampleTime = clamped(aTimeStamp, lowerBound, upperBound);
+
+  if (mLastEmittedEventTime && sampleTime < mLastEmittedEventTime) {
+    // Keep emitted timestamps in order.
+    sampleTime = mLastEmittedEventTime;
+  }
+
+  // We have at least one pending touch move event. Pick one of the events from
+  // mDeferredTouchMoveEvents as the base event for the resampling adjustment.
+  // We want to produce an event stream whose timestamps are in the right order.
+  // As the base event, use the first event that's at or after sampleTime,
+  // unless there is no such event, in that case use the last one we have. We
+  // will set the timestamp on the resampled event to sampleTime later.
+  // Flush out any older events so that everything remains in the right order.
+  MultiTouchInput input;
+  uint64_t eventId;
+  while (true) {
+    MOZ_RELEASE_ASSERT(!mDeferredTouchMoveEvents.empty());
+
+    std::tie(input, eventId) = std::move(mDeferredTouchMoveEvents.front());
+    mDeferredTouchMoveEvents.pop();
+    if (mDeferredTouchMoveEvents.empty() || input.mTimeStamp >= sampleTime) {
+      break;
+    }
+
+    // Flush this event to the outgoing queue without resampling. What ends up
+    // on the screen will still be smooth because we will proceed to emit a
+    // resampled event before the paint for this frame starts.
+    PrependLeftoverHistoricalData(&input);
+    MOZ_RELEASE_ASSERT(input.mTimeStamp < sampleTime);
+    EmitEvent(std::move(input), eventId);
+  }
+
+  mOriginalOfResampledTouchMove = Nothing();
+
+  // Compute the resampled touch positions.
+  nsTArray<ScreenIntPoint> resampledPositions;
+  bool anyPositionDifferentFromOriginal = false;
+  for (const auto& touch : input.mTouches) {
+    ScreenIntPoint resampledPosition =
+        mCurrentTouches.ResampleTouchPositionAtTime(
+            touch.mIdentifier, touch.mScreenPoint, sampleTime);
+    if (resampledPosition != touch.mScreenPoint) {
+      anyPositionDifferentFromOriginal = true;
+    }
+    resampledPositions.AppendElement(resampledPosition);
+  }
+
+  if (anyPositionDifferentFromOriginal) {
+    // Store a copy of the original event, so that we can return to an
+    // non-resampled position later, if necessary.
+    mOriginalOfResampledTouchMove = Some(input);
+
+    // Add the original observed position to the historical data, as well as any
+    // leftover historical positions from the previous touch move event, and
+    // store the resampled values in the "final" position of the event.
+    PrependLeftoverHistoricalData(&input);
+    for (size_t i = 0; i < input.mTouches.Length(); i++) {
+      auto& touch = input.mTouches[i];
+      touch.mHistoricalData.AppendElement(SingleTouchData::HistoricalTouchData{
+          input.mTimeStamp,
+          touch.mScreenPoint,
+          touch.mLocalScreenPoint,
+          touch.mRadius,
+          touch.mRotationAngle,
+          touch.mForce,
+      });
+
+      // Remove any historical touch data that's in the future, compared to
+      // sampleTime. This data will be included by upcoming touch move
+      // events. This only happens if the frame timestamp can be older than the
+      // event timestamp, i.e. if interpolation occurs (rather than
+      // extrapolation).
+      auto futureDataStart = std::find_if(
+          touch.mHistoricalData.begin(), touch.mHistoricalData.end(),
+          [sampleTime](
+              const SingleTouchData::HistoricalTouchData& aHistoricalData) {
+            return aHistoricalData.mTimeStamp > sampleTime;
+          });
+      if (futureDataStart != touch.mHistoricalData.end()) {
+        nsTArray<SingleTouchData::HistoricalTouchData> futureData(
+            Span<SingleTouchData::HistoricalTouchData>(touch.mHistoricalData)
+                .From(futureDataStart.GetIndex()));
+        touch.mHistoricalData.TruncateLength(futureDataStart.GetIndex());
+        mRemainingTouchData.insert({touch.mIdentifier, std::move(futureData)});
+      }
+
+      touch.mScreenPoint = resampledPositions[i];
+    }
+    input.mTimeStamp = sampleTime;
+  }
+
+  EmitEvent(std::move(input), eventId);
+  mInResampledState = anyPositionDifferentFromOriginal;
+}
+
+void TouchResampler::PrependLeftoverHistoricalData(MultiTouchInput* aInput) {
+  for (auto& touch : aInput->mTouches) {
+    auto leftoverData = mRemainingTouchData.find(touch.mIdentifier);
+    if (leftoverData != mRemainingTouchData.end()) {
+      nsTArray<SingleTouchData::HistoricalTouchData> data =
+          std::move(leftoverData->second);
+      mRemainingTouchData.erase(leftoverData);
+      touch.mHistoricalData.InsertElementsAt(0, data);
+    }
+
+    if (TimeStamp cutoffTime = mLastEmittedEventTime) {
+      // If we received historical touch data that was further in the past than
+      // the last resampled event, discard that data so that the touch data
+      // points are emitted in order.
+      touch.mHistoricalData.RemoveElementsBy(
+          [cutoffTime](const SingleTouchData::HistoricalTouchData& aTouchData) {
+            return aTouchData.mTimeStamp < cutoffTime;
+          });
+    }
+  }
+  mRemainingTouchData.clear();
+}
+
+void TouchResampler::FlushDeferredTouchMoveEventsUnresampled() {
+  while (!mDeferredTouchMoveEvents.empty()) {
+    MultiTouchInput input;
+    uint64_t eventId;
+    std::tie(input, eventId) = std::move(mDeferredTouchMoveEvents.front());
+    mDeferredTouchMoveEvents.pop();
+    PrependLeftoverHistoricalData(&input);
+    EmitEvent(std::move(input), eventId);
+    mInResampledState = false;
+    mOriginalOfResampledTouchMove = Nothing();
+  }
+}
+
+void TouchResampler::ReturnToNonResampledState() {
+  MOZ_RELEASE_ASSERT(mInResampledState);
+  MOZ_RELEASE_ASSERT(mDeferredTouchMoveEvents.empty(),
+                     "Don't call this if there is a deferred touch move event. "
+                     "We can return to the non-resampled state by sending that "
+                     "event, rather than a copy of a previous event.");
+
+  // The last outgoing event was a resampled touch move event.
+  // Return to the non-resampled state, by sending a touch move event to
+  // "overwrite" any resampled positions with the original observed positions.
+  MultiTouchInput input = std::move(*mOriginalOfResampledTouchMove);
+  mOriginalOfResampledTouchMove = Nothing();
+
+  // For the event's timestamp, we want to backdate the correction as far as we
+  // can, while still preserving timestamp ordering. But we also don't want to
+  // backdate it to be older than it was originally.
+  if (mLastEmittedEventTime > input.mTimeStamp) {
+    input.mTimeStamp = mLastEmittedEventTime;
+  }
+
+  // Assemble the correct historical touch data for this event.
+  // We don't want to include data points that we've already sent out with the
+  // resampled event. And from the leftover data points, we only want those that
+  // don't duplicate the final time + position of this event.
+  for (auto& touch : input.mTouches) {
+    touch.mHistoricalData.Clear();
+  }
+  PrependLeftoverHistoricalData(&input);
+  for (auto& touch : input.mTouches) {
+    touch.mHistoricalData.RemoveElementsBy([&](const auto& histData) {
+      return histData.mTimeStamp >= input.mTimeStamp;
+    });
+  }
+
+  EmitExtraEvent(std::move(input));
+  mInResampledState = false;
+}
+
+void TouchResampler::TouchInfo::Update(const SingleTouchData& aTouch,
+                                       const TimeStamp& aEventTime) {
+  for (const auto& historicalData : aTouch.mHistoricalData) {
+    mBaseDataPoint = mLatestDataPoint;
+    mLatestDataPoint =
+        Some(DataPoint{historicalData.mTimeStamp, historicalData.mScreenPoint});
+  }
+  mBaseDataPoint = mLatestDataPoint;
+  mLatestDataPoint = Some(DataPoint{aEventTime, aTouch.mScreenPoint});
+}
+
+ScreenIntPoint TouchResampler::TouchInfo::ResampleAtTime(
+    const ScreenIntPoint& aLastObservedPosition, const TimeStamp& aTimeStamp) {
+  TimeStamp cutoff =
+      aTimeStamp - TimeDuration::FromMilliseconds(kTouchResampleWindowSize);
+  if (!mBaseDataPoint || !mLatestDataPoint ||
+      !(mBaseDataPoint->mTimeStamp < mLatestDataPoint->mTimeStamp) ||
+      mBaseDataPoint->mTimeStamp < cutoff) {
+    return aLastObservedPosition;
+  }
+
+  // For the actual resampling, connect the last two data points with a line and
+  // sample along that line.
+  TimeStamp t1 = mBaseDataPoint->mTimeStamp;
+  TimeStamp t2 = mLatestDataPoint->mTimeStamp;
+  double t = (aTimeStamp - t1) / (t2 - t1);
+
+  double x1 = mBaseDataPoint->mPosition.x;
+  double x2 = mLatestDataPoint->mPosition.x;
+  double y1 = mBaseDataPoint->mPosition.y;
+  double y2 = mLatestDataPoint->mPosition.y;
+
+  int32_t resampledX = round(x1 + t * (x2 - x1));
+  int32_t resampledY = round(y1 + t * (y2 - y1));
+  return ScreenIntPoint(resampledX, resampledY);
+}
+
+void TouchResampler::CurrentTouches::UpdateFromEvent(
+    const MultiTouchInput& aInput) {
+  switch (aInput.mType) {
+    case MultiTouchInput::MULTITOUCH_START: {
+      // A new touch has been added; make sure mTouches reflects the current
+      // touches in the event.
+      nsTArray<TouchInfo> newTouches;
+      for (const auto& touch : aInput.mTouches) {
+        const auto touchInfo = TouchByIdentifier(touch.mIdentifier);
+        if (touchInfo != mTouches.end()) {
+          // This is one of the existing touches.
+          newTouches.AppendElement(std::move(*touchInfo));
+          mTouches.RemoveElementAt(touchInfo);
+        } else {
+          // This is the new touch.
+          newTouches.AppendElement(TouchInfo{
+              touch.mIdentifier, Nothing(),
+              Some(DataPoint{aInput.mTimeStamp, touch.mScreenPoint})});
+        }
+      }
+      MOZ_ASSERT(mTouches.IsEmpty(), "Missing touch end before touch start?");
+      mTouches = std::move(newTouches);
+      break;
+    }
+
+    case MultiTouchInput::MULTITOUCH_MOVE: {
+      // The touches have moved.
+      // Add position information to the history data points.
+      for (const auto& touch : aInput.mTouches) {
+        const auto touchInfo = TouchByIdentifier(touch.mIdentifier);
+        MOZ_ASSERT(touchInfo != mTouches.end());
+        if (touchInfo != mTouches.end()) {
+          touchInfo->Update(touch, aInput.mTimeStamp);
+        }
+      }
+      mLatestDataPointTime = aInput.mTimeStamp;
+      break;
+    }
+
+    case MultiTouchInput::MULTITOUCH_END: {
+      // A touch has been removed.
+      MOZ_RELEASE_ASSERT(aInput.mTouches.Length() == 1);
+      const auto touchInfo = TouchByIdentifier(aInput.mTouches[0].mIdentifier);
+      MOZ_ASSERT(touchInfo != mTouches.end());
+      if (touchInfo != mTouches.end()) {
+        mTouches.RemoveElementAt(touchInfo);
+      }
+      break;
+    }
+
+    case MultiTouchInput::MULTITOUCH_CANCEL:
+      // All touches are canceled.
+      mTouches.Clear();
+      break;
+  }
+}
+
+nsTArray<TouchResampler::TouchInfo>::iterator
+TouchResampler::CurrentTouches::TouchByIdentifier(int32_t aIdentifier) {
+  return std::find_if(mTouches.begin(), mTouches.end(),
+                      [aIdentifier](const TouchInfo& info) {
+                        return info.mIdentifier == aIdentifier;
+                      });
+}
+
+ScreenIntPoint TouchResampler::CurrentTouches::ResampleTouchPositionAtTime(
+    int32_t aIdentifier, const ScreenIntPoint& aLastObservedPosition,
+    const TimeStamp& aTimeStamp) {
+  const auto touchInfo = TouchByIdentifier(aIdentifier);
+  MOZ_ASSERT(touchInfo != mTouches.end());
+  if (touchInfo != mTouches.end()) {
+    return touchInfo->ResampleAtTime(aLastObservedPosition, aTimeStamp);
+  }
+  return aLastObservedPosition;
+}
+
+}  // namespace widget
+}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/widget/TouchResampler.h firefox-85.0+build1/widget/TouchResampler.h
--- firefox-84.0.2+build1/widget/TouchResampler.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/widget/TouchResampler.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,191 @@
+/* -*- 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_widget_TouchResampler_h
+#define mozilla_widget_TouchResampler_h
+
+#include <queue>
+#include <unordered_map>
+
+#include "mozilla/Maybe.h"
+#include "mozilla/TimeStamp.h"
+#include "InputData.h"
+
+namespace mozilla {
+namespace widget {
+
+/**
+ * De-jitters touch motions by resampling (interpolating or extrapolating) touch
+ * positions for the vsync timestamp.
+ *
+ * Touch resampling improves the touch panning experience on devices where touch
+ * positions are sampled at a rate that's not an integer multiple of the display
+ * refresh rate, for example 100Hz touch sampling on a 60Hz display: Without
+ * resampling, we would alternate between taking one touch sample or two touch
+ * samples into account each frame, creating a jittery motion ("small step, big
+ * step, small step, big step").
+ * Intended for use on Android, where both touch events and vsync notifications
+ * arrive on the same thread, the Java UI thread.
+ * This class is not thread safe.
+ *
+ * TouchResampler operates in the following way:
+ *
+ * Original events are fed into ProcessEvent().
+ * Outgoing events (potentially resampled for resampling) are added to a queue
+ * and can be consumed by calling ConsumeOutgoingEvents(). Touch events which
+ * are not touch move events are forwarded instantly and not resampled. Only
+ * touch move events are resampled. Whenever a touch move event is received, it
+ * gets delayed until NotifyFrame() is called, at which point it is resampled
+ * into a resampled version for the given frame timestamp, and added to the
+ * outgoing queue. If no touch move event is received between two consecutive
+ * frames, this is treated as a stop in the touch motion. If the last outgoing
+ * event was an resampled touch move event, we return back to the non-resampled
+ * state by emitting a copy of the last original touch move event, which has
+ * unmodified position data. Touch events which are not touch move events also
+ * force a return to the non-resampled state before they are moved to the
+ * outgoing queue.
+ */
+class TouchResampler final {
+ public:
+  // Feed a touch event into the interpolater. Returns an ID that can be used to
+  // match outgoing events to this incoming event, to track data associated with
+  // this event.
+  uint64_t ProcessEvent(MultiTouchInput&& aInput);
+
+  // Emit events, potentially resampled, for this timestamp. The events are put
+  // into the outgoing queue. May not emit any events if there's no update.
+  void NotifyFrame(const TimeStamp& aTimeStamp);
+
+  // Returns true between the start and the end of a touch gesture. During this
+  // time, the caller should keep itself registered with the system frame
+  // callback mechanism, so that NotifyFrame() can be called on every frame.
+  // (Otherwise, if we only registered the callback after receiving a touch move
+  // event, the frame callback might be delayed by a full frame.)
+  bool InTouchingState() const { return mCurrentTouches.HasTouch(); }
+
+  struct OutgoingEvent {
+    // The event, potentially modified from the original for resampling.
+    MultiTouchInput mEvent;
+
+    // Some(eventId) if this event is a modified version of an original event,
+    // Nothing() if this is an extra event.
+    Maybe<uint64_t> mEventId;
+  };
+
+  // Returns the outgoing events that were produced since the last call.
+  // No event IDs will be skipped. Returns at least one outgoing event for each
+  // incoming event (possibly after a delay), and potential extra events with
+  // no originating event ID.
+  // Outgoing events should be consumed after every call to ProcessEvent() and
+  // after every call to NotifyFrame().
+  std::queue<OutgoingEvent> ConsumeOutgoingEvents() {
+    return std::move(mOutgoingEvents);
+  }
+
+ private:
+  // Add the event to the outgoing queue.
+  void EmitEvent(MultiTouchInput&& aInput, uint64_t aEventId) {
+    mLastEmittedEventTime = aInput.mTimeStamp;
+    mOutgoingEvents.push(OutgoingEvent{std::move(aInput), Some(aEventId)});
+  }
+
+  // Emit an event that does not correspond to an incoming event.
+  void EmitExtraEvent(MultiTouchInput&& aInput) {
+    mLastEmittedEventTime = aInput.mTimeStamp;
+    mOutgoingEvents.push(OutgoingEvent{std::move(aInput), Nothing()});
+  }
+
+  // Move any touch move events that we deferred for resampling to the outgoing
+  // queue unmodified, leaving mDeferredTouchMoveEvents empty.
+  void FlushDeferredTouchMoveEventsUnresampled();
+
+  // Must only be called if mInResampledState is true and
+  // mDeferredTouchMoveEvents is empty. Emits mOriginalOfResampledTouchMove,
+  // with a potentially adjusted timestamp for correct ordering.
+  void ReturnToNonResampledState();
+
+  // Takes historical touch data from mRemainingTouchData and prepends it to the
+  // data in aInput.
+  void PrependLeftoverHistoricalData(MultiTouchInput* aInput);
+
+  struct DataPoint {
+    TimeStamp mTimeStamp;
+    ScreenIntPoint mPosition;
+  };
+
+  struct TouchInfo {
+    void Update(const SingleTouchData& aTouch, const TimeStamp& aEventTime);
+    ScreenIntPoint ResampleAtTime(const ScreenIntPoint& aLastObservedPosition,
+                                  const TimeStamp& aTimeStamp);
+
+    int32_t mIdentifier = 0;
+    Maybe<DataPoint> mBaseDataPoint;
+    Maybe<DataPoint> mLatestDataPoint;
+  };
+
+  struct CurrentTouches {
+    void UpdateFromEvent(const MultiTouchInput& aInput);
+    bool HasTouch() const { return !mTouches.IsEmpty(); }
+    TimeStamp LatestDataPointTime() { return mLatestDataPointTime; }
+
+    ScreenIntPoint ResampleTouchPositionAtTime(
+        int32_t aIdentifier, const ScreenIntPoint& aLastObservedPosition,
+        const TimeStamp& aTimeStamp);
+
+    void ClearDataPoints() {
+      for (auto& touch : mTouches) {
+        touch.mBaseDataPoint = Nothing();
+        touch.mLatestDataPoint = Nothing();
+      }
+    }
+
+   private:
+    nsTArray<TouchInfo>::iterator TouchByIdentifier(int32_t aIdentifier);
+
+    nsTArray<TouchInfo> mTouches;
+    TimeStamp mLatestDataPointTime;
+  };
+
+  // The current touch positions with historical data points. This data only
+  // contains original non-resampled positions from the incoming touch events.
+  CurrentTouches mCurrentTouches;
+
+  // Incoming touch move events are stored here until NotifyFrame is called.
+  std::queue<std::pair<MultiTouchInput, uint64_t>> mDeferredTouchMoveEvents;
+
+  // Stores any touch samples that were not included in the last emitted touch
+  // move event because they were in the future compared to the emitted event's
+  // timestamp. These data points should be prepended to the historical data of
+  // the next emitted touch move evnt.
+  // Can only be non-empty if mInResampledState is true.
+  std::unordered_map<int32_t, nsTArray<SingleTouchData::HistoricalTouchData>>
+      mRemainingTouchData;
+
+  // If we're in an resampled state, because the last outgoing event was a
+  // resampled touch move event, then this contains a copy of the unresampled,
+  // original touch move event.
+  // Some() iff mInResampledState is true.
+  Maybe<MultiTouchInput> mOriginalOfResampledTouchMove;
+
+  // The stream of outgoing events that can be consumed by our caller.
+  std::queue<OutgoingEvent> mOutgoingEvents;
+
+  // The timestamp of the event that was emitted most recently, or the null
+  // timestamp if no event has been emitted yet.
+  TimeStamp mLastEmittedEventTime;
+
+  uint64_t mNextEventId = 0;
+
+  // True if the last outgoing event was a touch move event with an resampled
+  // position. We only want to stay in this state as long as a continuous stream
+  // of touch move events is coming in.
+  bool mInResampledState = false;
+};
+
+}  // namespace widget
+}  // namespace mozilla
+
+#endif  // mozilla_widget_TouchResampler_h
diff -Nru firefox-84.0.2+build1/widget/uikit/nsLookAndFeel.h firefox-85.0+build1/widget/uikit/nsLookAndFeel.h
--- firefox-84.0.2+build1/widget/uikit/nsLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/uikit/nsLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,11 +15,11 @@
 
   void NativeInit() final;
   virtual void RefreshImpl();
-  virtual nsresult NativeGetColor(const ColorID aID, nscolor& aResult);
-  virtual nsresult GetIntImpl(IntID aID, int32_t& aResult);
-  virtual nsresult GetFloatImpl(FloatID aID, float& aResult);
-  bool GetFontImpl(FontID aID, nsString& aFontName,
-                   gfxFontStyle& aFontStyle) override;
+  nsresult NativeGetImpl(IntID aID, int32_t& aResult) override;
+  nsresult NativeGetFloat(FloatID aID, float& aResult) override;
+  nsresult NativeGetColor(const ColorID aID, nscolor& aResult) override;
+  bool NativeGetFont(FontID aID, nsString& aFontName,
+                     gfxFontStyle& aFontStyle) override;
   virtual char16_t GetPasswordCharacterImpl() {
     // unicode value for the bullet character, used for password textfields.
     return 0x2022;
diff -Nru firefox-84.0.2+build1/widget/uikit/nsLookAndFeel.mm firefox-85.0+build1/widget/uikit/nsLookAndFeel.mm
--- firefox-84.0.2+build1/widget/uikit/nsLookAndFeel.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/uikit/nsLookAndFeel.mm	2021-01-18 19:58:27.000000000 +0000
@@ -259,12 +259,17 @@
 }
 
 NS_IMETHODIMP
-nsLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
+  nsresult res = NS_OK;
 
   switch (aID) {
+    case IntID::ScrollButtonLeftMouseButtonAction:
+      aResult = 0;
+      break;
+    case IntID::ScrollButtonMiddleMouseButtonAction:
+    case IntID::ScrollButtonRightMouseButtonAction:
+      aResult = 3;
+      break;
     case IntID::CaretBlinkTime:
       aResult = 567;
       break;
@@ -354,10 +359,8 @@
 }
 
 NS_IMETHODIMP
-nsLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult res = NS_OK;
 
   switch (aID) {
     case FloatID::IMEUnderlineRelativeSize:
@@ -374,7 +377,7 @@
   return res;
 }
 
-bool nsLookAndFeel::GetFontImpl(FontID aID, nsString& aFontName, gfxFontStyle& aFontStyle) {
+bool nsLookAndFeel::NativeGetFont(FontID aID, nsString& aFontName, gfxFontStyle& aFontStyle) {
   // hack for now
   if (aID == FontID::Window || aID == FontID::Document) {
     aFontStyle.style = FontSlantStyle::Normal();
diff -Nru firefox-84.0.2+build1/widget/uikit/nsWindow.h firefox-85.0+build1/widget/uikit/nsWindow.h
--- firefox-84.0.2+build1/widget/uikit/nsWindow.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/uikit/nsWindow.h	2021-01-18 19:58:27.000000000 +0000
@@ -27,9 +27,9 @@
   // nsIWidget
   //
 
-  [[nodiscard]] virtual nsresult
-      Create(nsIWidget* aParent, nsNativeWidget aNativeParent, const LayoutDeviceIntRect& aRect,
-             nsWidgetInitData* aInitData = nullptr) override;
+  [[nodiscard]] virtual nsresult Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
+                                        const LayoutDeviceIntRect& aRect,
+                                        nsWidgetInitData* aInitData = nullptr) override;
   virtual void Destroy() override;
   virtual void Show(bool aState) override;
   virtual void Enable(bool aState) override {}
diff -Nru firefox-84.0.2+build1/widget/WidgetMessageUtils.h firefox-85.0+build1/widget/WidgetMessageUtils.h
--- firefox-84.0.2+build1/widget/WidgetMessageUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/WidgetMessageUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 #ifndef mozilla_WidgetMessageUtils_h
 #define mozilla_WidgetMessageUtils_h
 
+#include "ipc/EnumSerializer.h"
 #include "ipc/IPCMessageUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/widget/ThemeChangeKind.h"
@@ -49,6 +50,11 @@
 struct ParamTraits<nsCursor>
     : ContiguousEnumSerializer<nsCursor, eCursor_standard, eCursorCount> {};
 
+template <>
+struct ParamTraits<nsIWidget::TouchPointerState>
+    : public BitFlagsEnumSerializer<nsIWidget::TouchPointerState,
+                                    nsIWidget::TouchPointerState::ALL_BITS> {};
+
 }  // namespace IPC
 
 #endif  // WidgetMessageUtils_h
diff -Nru firefox-84.0.2+build1/widget/WidgetUtils.h firefox-85.0+build1/widget/WidgetUtils.h
--- firefox-84.0.2+build1/widget/WidgetUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/WidgetUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,12 +8,11 @@
 #ifndef mozilla_WidgetUtils_h
 #define mozilla_WidgetUtils_h
 
-#include "mozilla/EventForwards.h"
+#include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/gfx/Matrix.h"
-#include "nsCOMPtr.h"
-#include "nsIWidget.h"
 #include "nsRect.h"
 
+class nsIWidget;
 class nsPIDOMWindowOuter;
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/widget/windows/CompositorWidgetChild.cpp firefox-85.0+build1/widget/windows/CompositorWidgetChild.cpp
--- firefox-84.0.2+build1/widget/windows/CompositorWidgetChild.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/CompositorWidgetChild.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 
 #include "CompositorWidgetChild.h"
 #include "mozilla/Unused.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/widget/CompositorWidgetVsyncObserver.h"
 #include "mozilla/widget/PlatformWidgetTypes.h"
 #include "nsBaseWidget.h"
diff -Nru firefox-84.0.2+build1/widget/windows/GfxInfo.cpp firefox-85.0+build1/widget/windows/GfxInfo.cpp
--- firefox-84.0.2+build1/widget/windows/GfxInfo.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/GfxInfo.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1761,6 +1761,13 @@
         DRIVER_LESS_THAN, GfxDriverInfo::allDriverVersions,
         "FEATURE_UNQUALIFIED_WEBRENDER_NVIDIA_BLOCKED");
 
+    // Block 8.56.1.15/16
+    APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows, DeviceFamily::AtiAll,
+                                nsIGfxInfo::FEATURE_WEBRENDER,
+                                nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+                                DRIVER_LESS_THAN_OR_EQUAL, V(8, 56, 1, 16),
+                                "CRASHY_DRIVERS_BUG_1678808");
+
     ////////////////////////////////////
     // FEATURE_WEBRENDER - ALLOWLIST
 #ifdef EARLY_BETA_OR_EARLIER
@@ -1817,6 +1824,18 @@
         nsIGfxInfo::FEATURE_WEBRENDER_SCISSORED_CACHE_CLEARS,
         nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
         V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1603515");
+
+    ////////////////////////////////////
+    // FEATURE_WEBRENDER_SOFTWARE - ALLOWLIST
+#ifdef NIGHTLY_BUILD
+    APPEND_TO_DRIVER_BLOCKLIST2_EXT(
+        OperatingSystem::Windows, ScreenSizeStatus::SmallAndMedium,
+        BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All,
+        DriverVendor::All, DeviceFamily::All,
+        nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
+        nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED,
+        V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_S_M_SCRN");
+#endif
   }
   return *sDriverInfo;
 }
diff -Nru firefox-84.0.2+build1/widget/windows/IMMHandler.cpp firefox-85.0+build1/widget/windows/IMMHandler.cpp
--- firefox-84.0.2+build1/widget/windows/IMMHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/IMMHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1554,19 +1554,19 @@
 
   pCharPosition->cLineHeight = r.Height();
 
-  WidgetQueryContentEvent editorRect(true, eQueryEditorRect, aWindow);
-  aWindow->InitEvent(editorRect);
-  DispatchEvent(aWindow, editorRect);
-  if (NS_WARN_IF(!editorRect.mSucceeded)) {
+  WidgetQueryContentEvent queryEditorRectEvent(true, eQueryEditorRect, aWindow);
+  aWindow->InitEvent(queryEditorRectEvent);
+  DispatchEvent(aWindow, queryEditorRectEvent);
+  if (NS_WARN_IF(queryEditorRectEvent.Failed())) {
     MOZ_LOG(gIMMLog, LogLevel::Error,
             ("HandleQueryCharPosition, eQueryEditorRect failed"));
     ::GetWindowRect(aWindow->GetWindowHandle(), &pCharPosition->rcDocument);
   } else {
-    LayoutDeviceIntRect editorRectInWindow = editorRect.mReply.mRect;
-    nsWindow* window =
-        editorRect.mReply.mFocusedWidget
-            ? static_cast<nsWindow*>(editorRect.mReply.mFocusedWidget)
-            : aWindow;
+    LayoutDeviceIntRect editorRectInWindow = queryEditorRectEvent.mReply->mRect;
+    nsWindow* window = !!queryEditorRectEvent.mReply->mFocusedWidget
+                           ? static_cast<nsWindow*>(
+                                 queryEditorRectEvent.mReply->mFocusedWidget)
+                           : aWindow;
     LayoutDeviceIntRect editorRectInScreen;
     ResolveIMECaretPos(window, editorRectInWindow, nullptr, editorRectInScreen);
     ::SetRect(&pCharPosition->rcDocument, editorRectInScreen.X(),
@@ -1623,18 +1623,19 @@
   }
 
   // Get all contents of the focused editor.
-  WidgetQueryContentEvent textContent(true, eQueryTextContent, aWindow);
-  textContent.InitForQueryTextContent(0, UINT32_MAX);
-  aWindow->InitEvent(textContent, &point);
-  DispatchEvent(aWindow, textContent);
-  if (!textContent.mSucceeded) {
+  WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent,
+                                                aWindow);
+  queryTextContentEvent.InitForQueryTextContent(0, UINT32_MAX);
+  aWindow->InitEvent(queryTextContentEvent, &point);
+  DispatchEvent(aWindow, queryTextContentEvent);
+  if (NS_WARN_IF(queryTextContentEvent.Failed())) {
     MOZ_LOG(gIMMLog, LogLevel::Error,
             ("HandleDocumentFeed, FAILED, due to eQueryTextContent failure"));
     return false;
   }
 
-  nsAutoString str(textContent.mReply.mString);
-  if (targetOffset > int32_t(str.Length())) {
+  nsAutoString str(queryTextContentEvent.mReply->DataRef());
+  if (targetOffset > static_cast<int32_t>(str.Length())) {
     MOZ_LOG(gIMMLog, LogLevel::Error,
             ("HandleDocumentFeed, FAILED, due to the caret offset is invalid"));
     return false;
@@ -2037,24 +2038,24 @@
   // If there is a caret and retrieving offset is same as the caret offset,
   // we should use the caret rect.
   if (aOffset != caretOffset) {
-    WidgetQueryContentEvent charRect(true, eQueryTextRect, aWindow);
+    WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, aWindow);
     WidgetQueryContentEvent::Options options;
     options.mRelativeToInsertionPoint = true;
-    charRect.InitForQueryTextRect(aOffset, 1, options);
-    aWindow->InitEvent(charRect, &point);
-    DispatchEvent(aWindow, charRect);
-    if (charRect.mSucceeded) {
-      aCharRect = charRect.mReply.mRect;
+    queryTextRectEvent.InitForQueryTextRect(aOffset, 1, options);
+    aWindow->InitEvent(queryTextRectEvent, &point);
+    DispatchEvent(aWindow, queryTextRectEvent);
+    if (queryTextRectEvent.Succeeded()) {
+      aCharRect = queryTextRectEvent.mReply->mRect;
       if (aWritingMode) {
-        *aWritingMode = charRect.GetWritingMode();
+        *aWritingMode = queryTextRectEvent.mReply->WritingModeRef();
       }
-      MOZ_LOG(gIMMLog, LogLevel::Debug,
-              ("GetCharacterRectOfSelectedTextAt, Succeeded, aOffset=%u, "
-               "aCharRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
-               "charRect.GetWritingMode()=%s",
-               aOffset, aCharRect.X(), aCharRect.Y(), aCharRect.Width(),
-               aCharRect.Height(),
-               GetWritingModeName(charRect.GetWritingMode()).get()));
+      MOZ_LOG(
+          gIMMLog, LogLevel::Debug,
+          ("GetCharacterRectOfSelectedTextAt, Succeeded, aOffset=%u, "
+           "aCharRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
+           "queryTextRectEvent={ mReply=%s }",
+           aOffset, aCharRect.X(), aCharRect.Y(), aCharRect.Width(),
+           aCharRect.Height(), ToString(queryTextRectEvent.mReply).c_str()));
       return true;
     }
   }
@@ -2067,28 +2068,27 @@
                               WritingMode* aWritingMode) {
   LayoutDeviceIntPoint point(0, 0);
 
-  WidgetQueryContentEvent caretRect(true, eQueryCaretRect, aWindow);
+  WidgetQueryContentEvent queryCaretRectEvent(true, eQueryCaretRect, aWindow);
   WidgetQueryContentEvent::Options options;
   options.mRelativeToInsertionPoint = true;
-  caretRect.InitForQueryCaretRect(0, options);
-  aWindow->InitEvent(caretRect, &point);
-  DispatchEvent(aWindow, caretRect);
-  if (!caretRect.mSucceeded) {
+  queryCaretRectEvent.InitForQueryCaretRect(0, options);
+  aWindow->InitEvent(queryCaretRectEvent, &point);
+  DispatchEvent(aWindow, queryCaretRectEvent);
+  if (queryCaretRectEvent.Failed()) {
     MOZ_LOG(gIMMLog, LogLevel::Info,
             ("GetCaretRect, FAILED, due to eQueryCaretRect failure"));
     return false;
   }
-  aCaretRect = caretRect.mReply.mRect;
+  aCaretRect = queryCaretRectEvent.mReply->mRect;
   if (aWritingMode) {
-    *aWritingMode = caretRect.GetWritingMode();
+    *aWritingMode = queryCaretRectEvent.mReply->WritingModeRef();
   }
-  MOZ_LOG(
-      gIMMLog, LogLevel::Info,
-      ("GetCaretRect, SUCCEEDED, "
-       "aCaretRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
-       "caretRect.GetWritingMode()=%s",
-       aCaretRect.X(), aCaretRect.Y(), aCaretRect.Width(), aCaretRect.Height(),
-       GetWritingModeName(caretRect.GetWritingMode()).get()));
+  MOZ_LOG(gIMMLog, LogLevel::Info,
+          ("GetCaretRect, SUCCEEDED, "
+           "aCaretRect={ x: %ld, y: %ld, width: %ld, height: %ld }, "
+           "queryCaretRectEvent={ mReply=%s }",
+           aCaretRect.X(), aCaretRect.Y(), aCaretRect.Width(),
+           aCaretRect.Height(), ToString(queryCaretRectEvent.mReply).c_str()));
   return true;
 }
 
@@ -2239,10 +2239,10 @@
 
 void IMMHandler::SetIMERelatedWindowsPosOnPlugin(nsWindow* aWindow,
                                                  const IMEContext& aContext) {
-  WidgetQueryContentEvent editorRectEvent(true, eQueryEditorRect, aWindow);
-  aWindow->InitEvent(editorRectEvent);
-  DispatchEvent(aWindow, editorRectEvent);
-  if (!editorRectEvent.mSucceeded) {
+  WidgetQueryContentEvent queryEditorRectEvent(true, eQueryEditorRect, aWindow);
+  aWindow->InitEvent(queryEditorRectEvent);
+  DispatchEvent(aWindow, queryEditorRectEvent);
+  if (queryEditorRectEvent.Failed()) {
     MOZ_LOG(gIMMLog, LogLevel::Info,
             ("SetIMERelatedWindowsPosOnPlugin, "
              "FAILED, due to eQueryEditorRect failure"));
@@ -2253,7 +2253,8 @@
   // window needs to be specified the position in the client area.
   nsWindow* toplevelWindow = aWindow->GetTopLevelWindow(false);
   LayoutDeviceIntRect pluginRectInScreen =
-      editorRectEvent.mReply.mRect + toplevelWindow->WidgetToScreenOffset();
+      queryEditorRectEvent.mReply->mRect +
+      toplevelWindow->WidgetToScreenOffset();
   LayoutDeviceIntRect winRectInScreen = aWindow->GetClientBounds();
   // composition window cannot be positioned on the edge of client area.
   winRectInScreen.SizeTo(winRectInScreen.Width() - 1,
@@ -2646,11 +2647,12 @@
 bool IMMHandler::Selection::Init(nsWindow* aWindow) {
   Clear();
 
-  WidgetQueryContentEvent selection(true, eQuerySelectedText, aWindow);
+  WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                 aWindow);
   LayoutDeviceIntPoint point(0, 0);
-  aWindow->InitEvent(selection, &point);
-  DispatchEvent(aWindow, selection);
-  if (NS_WARN_IF(!selection.mSucceeded)) {
+  aWindow->InitEvent(querySelectedTextEvent, &point);
+  DispatchEvent(aWindow, querySelectedTextEvent);
+  if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection())) {
     MOZ_LOG(gIMMLog, LogLevel::Error,
             ("Selection::Init, FAILED, due to eQuerySelectedText failure"));
     return false;
@@ -2663,15 +2665,15 @@
     return false;
   }
 
-  mOffset = selection.mReply.mOffset;
-  mString = selection.mReply.mString;
-  mWritingMode = selection.GetWritingMode();
+  MOZ_ASSERT(querySelectedTextEvent.mReply->mOffsetAndData.isSome());
+  mOffset = querySelectedTextEvent.mReply->StartOffset();
+  mString = querySelectedTextEvent.mReply->DataRef();
+  mWritingMode = querySelectedTextEvent.mReply->WritingModeRef();
   mIsValid = true;
 
   MOZ_LOG(gIMMLog, LogLevel::Info,
-          ("Selection::Init, selection={ mReply={ mOffset=%u, "
-           "mString.Length()=%u, mWritingMode=%s } }",
-           mOffset, mString.Length(), GetWritingModeName(mWritingMode).get()));
+          ("Selection::Init, querySelectedTextEvent={ mReply=%s }",
+           ToString(querySelectedTextEvent.mReply).c_str()));
 
   if (!IsValid()) {
     MOZ_LOG(gIMMLog, LogLevel::Error,
diff -Nru firefox-84.0.2+build1/widget/windows/KeyboardLayout.h firefox-85.0+build1/widget/windows/KeyboardLayout.h
--- firefox-84.0.2+build1/widget/windows/KeyboardLayout.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/KeyboardLayout.h	2021-01-18 19:58:27.000000000 +0000
@@ -382,10 +382,10 @@
     MSG GetCharMsg(HWND aWnd) const {
       MSG msg;
       msg.hwnd = aWnd;
-      msg.message =
-          mIsDeadKey && mIsSysKey
-              ? WM_SYSDEADCHAR
-              : mIsDeadKey ? WM_DEADCHAR : mIsSysKey ? WM_SYSCHAR : WM_CHAR;
+      msg.message = mIsDeadKey && mIsSysKey ? WM_SYSDEADCHAR
+                    : mIsDeadKey            ? WM_DEADCHAR
+                    : mIsSysKey             ? WM_SYSCHAR
+                                            : WM_CHAR;
       msg.wParam = static_cast<WPARAM>(mCharCode);
       msg.lParam = static_cast<LPARAM>(mScanCode << 16);
       msg.time = 0;
diff -Nru firefox-84.0.2+build1/widget/windows/moz.build firefox-85.0+build1/widget/windows/moz.build
--- firefox-84.0.2+build1/widget/windows/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -87,7 +87,6 @@
     "nsWindowDbg.cpp",
     "nsWindowGfx.cpp",
     "nsWinGesture.cpp",
-    "ProcInfo.cpp",
     "RemoteBackbuffer.cpp",
     "ScreenHelperWin.cpp",
     "SystemStatusBar.cpp",
diff -Nru firefox-84.0.2+build1/widget/windows/nsDataObj.cpp firefox-85.0+build1/widget/windows/nsDataObj.cpp
--- firefox-84.0.2+build1/widget/windows/nsDataObj.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsDataObj.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -25,6 +25,7 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/Unused.h"
 #include "nsIOutputStream.h"
 #include "nscore.h"
diff -Nru firefox-84.0.2+build1/widget/windows/nsDeviceContextSpecWin.cpp firefox-85.0+build1/widget/windows/nsDeviceContextSpecWin.cpp
--- firefox-84.0.2+build1/widget/windows/nsDeviceContextSpecWin.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsDeviceContextSpecWin.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -23,6 +23,7 @@
 #include "nsTArray.h"
 #include "nsIPrintSettingsWin.h"
 
+#include "nsComponentManagerUtils.h"
 #include "nsPrinterWin.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/widget/windows/nsDeviceContextSpecWin.h firefox-85.0+build1/widget/windows/nsDeviceContextSpecWin.h
--- firefox-84.0.2+build1/widget/windows/nsDeviceContextSpecWin.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsDeviceContextSpecWin.h	2021-01-18 19:58:27.000000000 +0000
@@ -98,8 +98,9 @@
  protected:
   nsresult SystemDefaultPrinterName(nsAString&) const final;
 
-  Maybe<PrinterInfo> PrinterByName(nsString) const final;
-  Maybe<PrinterInfo> PrinterBySystemName(nsString aPrinterName) const final;
+  mozilla::Maybe<PrinterInfo> PrinterByName(nsString) const final;
+  mozilla::Maybe<PrinterInfo> PrinterBySystemName(
+      nsString aPrinterName) const final;
 
  private:
   ~nsPrinterListWin();
diff -Nru firefox-84.0.2+build1/widget/windows/nsFilePicker.cpp firefox-85.0+build1/widget/windows/nsFilePicker.cpp
--- firefox-84.0.2+build1/widget/windows/nsFilePicker.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsFilePicker.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -29,11 +29,11 @@
 using mozilla::MakeUnique;
 using mozilla::UniquePtr;
 using mozilla::mscom::EnsureMTA;
-using namespace mozilla::widget;
 
-char16_t* nsFilePicker::mLastUsedUnicodeDirectory;
+using namespace mozilla::widget;
 
-static const unsigned long kDialogTimerTimeout = 300;
+UniquePtr<char16_t[], nsFilePicker::FreeDeleter>
+    nsFilePicker::sLastUsedUnicodeDirectory;
 
 #define MAX_EXTENSION_LENGTH 10
 #define FILE_BUFFER_SIZE 4096
@@ -43,29 +43,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Helper classes
 
-// Manages the current working path.
-class AutoRestoreWorkingPath {
- public:
-  AutoRestoreWorkingPath() {
-    DWORD bufferLength = GetCurrentDirectoryW(0, nullptr);
-    mWorkingPath = MakeUnique<wchar_t[]>(bufferLength);
-    if (GetCurrentDirectoryW(bufferLength, mWorkingPath.get()) == 0) {
-      mWorkingPath = nullptr;
-    }
-  }
-
-  ~AutoRestoreWorkingPath() {
-    if (HasWorkingPath()) {
-      ::SetCurrentDirectoryW(mWorkingPath.get());
-    }
-  }
-
-  inline bool HasWorkingPath() const { return mWorkingPath != nullptr; }
-
- private:
-  UniquePtr<wchar_t[]> mWorkingPath;
-};
-
 // Manages NS_NATIVE_TMP_WINDOW child windows. NS_NATIVE_TMP_WINDOWs are
 // temporary child windows of mParentWidget created to address RTL issues
 // in picker dialogs. We are responsible for destroying these.
@@ -105,49 +82,10 @@
   RefPtr<nsWindow> mWindow;
 };
 
-// Manages a simple callback timer
-class AutoTimerCallbackCancel {
- public:
-  AutoTimerCallbackCancel(nsFilePicker* aTarget,
-                          nsTimerCallbackFunc aCallbackFunc,
-                          const char* aName) {
-    Init(aTarget, aCallbackFunc, aName);
-  }
-
-  ~AutoTimerCallbackCancel() {
-    if (mPickerCallbackTimer) {
-      mPickerCallbackTimer->Cancel();
-    }
-  }
-
- private:
-  void Init(nsFilePicker* aTarget, nsTimerCallbackFunc aCallbackFunc,
-            const char* aName) {
-    NS_NewTimerWithFuncCallback(getter_AddRefs(mPickerCallbackTimer),
-                                aCallbackFunc, aTarget, kDialogTimerTimeout,
-                                nsITimer::TYPE_REPEATING_SLACK, aName);
-    if (!mPickerCallbackTimer) {
-      NS_WARNING("do_CreateInstance for timer failed??");
-    }
-  }
-  nsCOMPtr<nsITimer> mPickerCallbackTimer;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 // nsIFilePicker
 
-nsFilePicker::nsFilePicker()
-    : mSelectedType(1), mDlgWnd(nullptr), mFDECookie(0) {
-  CoInitialize(nullptr);
-}
-
-nsFilePicker::~nsFilePicker() {
-  if (mLastUsedUnicodeDirectory) {
-    free(mLastUsedUnicodeDirectory);
-    mLastUsedUnicodeDirectory = nullptr;
-  }
-  CoUninitialize();
-}
+nsFilePicker::nsFilePicker() : mSelectedType(1) {}
 
 NS_IMPL_ISUPPORTS(nsFilePicker, nsIFilePicker)
 
@@ -160,102 +98,6 @@
   return nsBaseFilePicker::Init(aParent, aTitle, aMode);
 }
 
-STDMETHODIMP nsFilePicker::QueryInterface(REFIID refiid, void** ppvResult) {
-  *ppvResult = nullptr;
-  if (IID_IUnknown == refiid || refiid == IID_IFileDialogEvents) {
-    *ppvResult = this;
-  }
-
-  if (nullptr != *ppvResult) {
-    ((LPUNKNOWN)*ppvResult)->AddRef();
-    return S_OK;
-  }
-
-  return E_NOINTERFACE;
-}
-
-/*
- * Vista+ callbacks
- */
-
-HRESULT
-nsFilePicker::OnFileOk(IFileDialog* pfd) { return S_OK; }
-
-HRESULT
-nsFilePicker::OnFolderChanging(IFileDialog* pfd, IShellItem* psiFolder) {
-  return S_OK;
-}
-
-HRESULT
-nsFilePicker::OnFolderChange(IFileDialog* pfd) { return S_OK; }
-
-HRESULT
-nsFilePicker::OnSelectionChange(IFileDialog* pfd) { return S_OK; }
-
-HRESULT
-nsFilePicker::OnShareViolation(IFileDialog* pfd, IShellItem* psi,
-                               FDE_SHAREVIOLATION_RESPONSE* pResponse) {
-  return S_OK;
-}
-
-HRESULT
-nsFilePicker::OnTypeChange(IFileDialog* pfd) {
-  // Failures here result in errors due to security concerns.
-  RefPtr<IOleWindow> win;
-  pfd->QueryInterface(IID_IOleWindow, getter_AddRefs(win));
-  if (!win) {
-    NS_ERROR("Could not retrieve the IOleWindow interface for IFileDialog.");
-    return S_OK;
-  }
-  HWND hwnd = nullptr;
-  win->GetWindow(&hwnd);
-  if (!hwnd) {
-    NS_ERROR("Could not retrieve the HWND for IFileDialog.");
-    return S_OK;
-  }
-
-  SetDialogHandle(hwnd);
-  return S_OK;
-}
-
-HRESULT
-nsFilePicker::OnOverwrite(IFileDialog* pfd, IShellItem* psi,
-                          FDE_OVERWRITE_RESPONSE* pResponse) {
-  return S_OK;
-}
-
-/*
- * Close on parent close logic
- */
-
-bool nsFilePicker::ClosePickerIfNeeded() {
-  if (!mParentWidget || !mDlgWnd) return false;
-
-  nsWindow* win = static_cast<nsWindow*>(mParentWidget.get());
-  if (IsWindow(mDlgWnd) && IsWindowVisible(mDlgWnd) && win->DestroyCalled()) {
-    wchar_t className[64];
-    // Make sure we have the right window
-    if (GetClassNameW(mDlgWnd, className, mozilla::ArrayLength(className)) &&
-        !wcscmp(className, L"#32770") && DestroyWindow(mDlgWnd)) {
-      mDlgWnd = nullptr;
-      return true;
-    }
-  }
-  return false;
-}
-
-void nsFilePicker::PickerCallbackTimerFunc(nsITimer* aTimer, void* aCtx) {
-  nsFilePicker* picker = (nsFilePicker*)aCtx;
-  if (picker->ClosePickerIfNeeded()) {
-    aTimer->Cancel();
-  }
-}
-
-void nsFilePicker::SetDialogHandle(HWND aWnd) {
-  if (!aWnd || mDlgWnd) return;
-  mDlgWnd = aWnd;
-}
-
 /*
  * Folder picker invocation
  */
@@ -278,23 +120,30 @@
   }
 
   RefPtr<IFileOpenDialog> dialog;
-  if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC,
-                              IID_IFileOpenDialog, getter_AddRefs(dialog)))) {
+  if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr,
+                              CLSCTX_INPROC_SERVER, IID_IFileOpenDialog,
+                              getter_AddRefs(dialog)))) {
     return false;
   }
 
-  // hook up event callbacks
-  dialog->Advise(this, &mFDECookie);
-
   // options
   FILEOPENDIALOGOPTIONS fos = FOS_PICKFOLDERS;
-  dialog->SetOptions(fos);
+  HRESULT hr = dialog->SetOptions(fos);
+  if (FAILED(hr)) {
+    return false;
+  }
 
   // initial strings
-  dialog->SetTitle(mTitle.get());
+  hr = dialog->SetTitle(mTitle.get());
+  if (FAILED(hr)) {
+    return false;
+  }
 
   if (!mOkButtonLabel.IsEmpty()) {
-    dialog->SetOkButtonLabel(mOkButtonLabel.get());
+    hr = dialog->SetOkButtonLabel(mOkButtonLabel.get());
+    if (FAILED(hr)) {
+      return false;
+    }
   }
 
   if (!aInitialDir.IsEmpty()) {
@@ -302,7 +151,10 @@
     if (SUCCEEDED(SHCreateItemFromParsingName(aInitialDir.get(), nullptr,
                                               IID_IShellItem,
                                               getter_AddRefs(folder)))) {
-      dialog->SetFolder(folder);
+      hr = dialog->SetFolder(folder);
+      if (FAILED(hr)) {
+        return false;
+      }
     }
   }
 
@@ -315,10 +167,8 @@
   RefPtr<IShellItem> item;
   if (FAILED(dialog->Show(adtw.get())) ||
       FAILED(dialog->GetResult(getter_AddRefs(item))) || !item) {
-    dialog->Unadvise(mFDECookie);
     return false;
   }
-  dialog->Unadvise(mFDECookie);
 
   // results
 
@@ -326,8 +176,11 @@
   // default save folder.
   RefPtr<IShellItem> folderPath;
   RefPtr<IShellLibrary> shellLib;
-  CoCreateInstance(CLSID_ShellLibrary, nullptr, CLSCTX_INPROC,
-                   IID_IShellLibrary, getter_AddRefs(shellLib));
+  if (FAILED(CoCreateInstance(CLSID_ShellLibrary, nullptr, CLSCTX_INPROC_SERVER,
+                              IID_IShellLibrary, getter_AddRefs(shellLib)))) {
+    return false;
+  }
+
   if (shellLib && SUCCEEDED(shellLib->LoadLibraryFromItem(item, STGM_READ)) &&
       SUCCEEDED(shellLib->GetDefaultSaveFolder(DSFT_DETECT, IID_IShellItem,
                                                getter_AddRefs(folderPath)))) {
@@ -363,20 +216,19 @@
 
   RefPtr<IFileDialog> dialog;
   if (mMode != modeSave) {
-    if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr, CLSCTX_INPROC,
-                                IID_IFileOpenDialog, getter_AddRefs(dialog)))) {
+    if (FAILED(CoCreateInstance(CLSID_FileOpenDialog, nullptr,
+                                CLSCTX_INPROC_SERVER, IID_IFileOpenDialog,
+                                getter_AddRefs(dialog)))) {
       return false;
     }
   } else {
-    if (FAILED(CoCreateInstance(CLSID_FileSaveDialog, nullptr, CLSCTX_INPROC,
-                                IID_IFileSaveDialog, getter_AddRefs(dialog)))) {
+    if (FAILED(CoCreateInstance(CLSID_FileSaveDialog, nullptr,
+                                CLSCTX_INPROC_SERVER, IID_IFileSaveDialog,
+                                getter_AddRefs(dialog)))) {
       return false;
     }
   }
 
-  // hook up event callbacks
-  dialog->Advise(this, &mFDECookie);
-
   // options
 
   FILEOPENDIALOGOPTIONS fos = 0;
@@ -387,10 +239,6 @@
     fos |= FOS_DONTADDTORECENT;
   }
 
-  // Msdn claims FOS_NOCHANGEDIR is not needed. We'll add this
-  // just in case.
-  AutoRestoreWorkingPath arw;
-
   // mode specific
   switch (mMode) {
     case modeOpen:
@@ -409,23 +257,38 @@
       break;
   }
 
-  dialog->SetOptions(fos);
+  HRESULT hr = dialog->SetOptions(fos);
+  if (FAILED(hr)) {
+    return false;
+  }
 
   // initial strings
 
   // title
-  dialog->SetTitle(mTitle.get());
+  hr = dialog->SetTitle(mTitle.get());
+  if (FAILED(hr)) {
+    return false;
+  }
 
   // default filename
   if (!mDefaultFilename.IsEmpty()) {
-    dialog->SetFileName(mDefaultFilename.get());
+    hr = dialog->SetFileName(mDefaultFilename.get());
+    if (FAILED(hr)) {
+      return false;
+    }
   }
 
   // default extension to append to new files
   if (!mDefaultExtension.IsEmpty()) {
-    dialog->SetDefaultExtension(mDefaultExtension.get());
+    hr = dialog->SetDefaultExtension(mDefaultExtension.get());
+    if (FAILED(hr)) {
+      return false;
+    }
   } else if (IsDefaultPathHtml()) {
-    dialog->SetDefaultExtension(L"html");
+    hr = dialog->SetDefaultExtension(L"html");
+    if (FAILED(hr)) {
+      return false;
+    }
   }
 
   // initial location
@@ -434,14 +297,24 @@
     if (SUCCEEDED(SHCreateItemFromParsingName(aInitialDir.get(), nullptr,
                                               IID_IShellItem,
                                               getter_AddRefs(folder)))) {
-      dialog->SetFolder(folder);
+      hr = dialog->SetFolder(folder);
+      if (FAILED(hr)) {
+        return false;
+      }
     }
   }
 
   // filter types and the default index
   if (!mComFilterList.IsEmpty()) {
-    dialog->SetFileTypes(mComFilterList.Length(), mComFilterList.get());
-    dialog->SetFileTypeIndex(mSelectedType);
+    hr = dialog->SetFileTypes(mComFilterList.Length(), mComFilterList.get());
+    if (FAILED(hr)) {
+      return false;
+    }
+
+    hr = dialog->SetFileTypeIndex(mSelectedType);
+    if (FAILED(hr)) {
+      return false;
+    }
   }
 
   // display
@@ -450,16 +323,12 @@
     AutoDestroyTmpWindow adtw((HWND)(
         mParentWidget.get() ? mParentWidget->GetNativeData(NS_NATIVE_TMP_WINDOW)
                             : nullptr));
-    AutoTimerCallbackCancel atcc(this, PickerCallbackTimerFunc,
-                                 "nsFilePicker::PickerCallbackTimerFunc");
     AutoWidgetPickerState awps(mParentWidget);
 
     mozilla::BackgroundHangMonitor().NotifyWait();
     if (FAILED(dialog->Show(adtw.get()))) {
-      dialog->Unadvise(mFDECookie);
       return false;
     }
-    dialog->Unadvise(mFDECookie);
   }
 
   // results
@@ -497,9 +366,10 @@
     nsAutoString str;
     if (SUCCEEDED(items->GetItemAt(idx, getter_AddRefs(item)))) {
       if (!WinUtils::GetShellItemPath(item, str)) continue;
-      nsCOMPtr<nsIFile> file = do_CreateInstance("@mozilla.org/file/local;1");
-      if (file && NS_SUCCEEDED(file->InitWithPath(str)))
+      nsCOMPtr<nsIFile> file;
+      if (NS_SUCCEEDED(NS_NewLocalFile(str, false, getter_AddRefs(file)))) {
         mFiles.AppendObject(file);
+      }
     }
   }
   return true;
@@ -519,7 +389,7 @@
   // If no display directory, re-use the last one.
   if (initialDir.IsEmpty()) {
     // Allocate copy of last used dir.
-    initialDir = mLastUsedUnicodeDirectory;
+    initialDir = sLastUsedUnicodeDirectory.get();
   }
 
   // Clear previous file selections
@@ -546,10 +416,11 @@
   if (mMode == modeSave) {
     // Windows does not return resultReplace, we must check if file
     // already exists.
-    nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
+    nsCOMPtr<nsIFile> file;
+    nsresult rv = NS_NewLocalFile(mUnicodeFile, false, getter_AddRefs(file));
+
     bool flag = false;
-    if (file && NS_SUCCEEDED(file->InitWithPath(mUnicodeFile)) &&
-        NS_SUCCEEDED(file->Exists(&flag)) && flag) {
+    if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(file->Exists(&flag)) && flag) {
       retValue = returnReplace;
     }
   }
@@ -567,14 +438,13 @@
 
   if (mUnicodeFile.IsEmpty()) return NS_OK;
 
-  nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
-
-  NS_ENSURE_TRUE(file, NS_ERROR_FAILURE);
-
-  file->InitWithPath(mUnicodeFile);
-
-  NS_ADDREF(*aFile = file);
+  nsCOMPtr<nsIFile> file;
+  nsresult rv = NS_NewLocalFile(mUnicodeFile, false, getter_AddRefs(file));
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
 
+  file.forget(aFile);
   return NS_OK;
 }
 
@@ -673,8 +543,13 @@
 }
 
 void nsFilePicker::RememberLastUsedDirectory() {
-  nsCOMPtr<nsIFile> file(do_CreateInstance("@mozilla.org/file/local;1"));
-  if (!file || NS_FAILED(file->InitWithPath(mUnicodeFile))) {
+  if (IsPrivacyModeEnabled()) {
+    // Don't remember the directory if private browsing was in effect
+    return;
+  }
+
+  nsCOMPtr<nsIFile> file;
+  if (NS_FAILED(NS_NewLocalFile(mUnicodeFile, false, getter_AddRefs(file)))) {
     NS_WARNING("RememberLastUsedDirectory failed to init file path.");
     return;
   }
@@ -688,11 +563,7 @@
     return;
   }
 
-  if (mLastUsedUnicodeDirectory) {
-    free(mLastUsedUnicodeDirectory);
-    mLastUsedUnicodeDirectory = nullptr;
-  }
-  mLastUsedUnicodeDirectory = ToNewUnicode(newDir);
+  sLastUsedUnicodeDirectory.reset(ToNewUnicode(newDir));
 }
 
 bool nsFilePicker::IsPrivacyModeEnabled() {
diff -Nru firefox-84.0.2+build1/widget/windows/nsFilePicker.h firefox-85.0+build1/widget/windows/nsFilePicker.h
--- firefox-84.0.2+build1/widget/windows/nsFilePicker.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsFilePicker.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,7 +10,6 @@
 #include <windows.h>
 
 #include "nsIFile.h"
-#include "nsITimer.h"
 #include "nsISimpleEnumerator.h"
 #include "nsCOMArray.h"
 #include "nsBaseFilePicker.h"
@@ -39,8 +38,8 @@
  * Native Windows FileSelector wrapper
  */
 
-class nsFilePicker : public IFileDialogEvents, public nsBaseWinFilePicker {
-  virtual ~nsFilePicker();
+class nsFilePicker : public nsBaseWinFilePicker {
+  virtual ~nsFilePicker() = default;
 
  public:
   nsFilePicker();
@@ -50,9 +49,6 @@
 
   NS_DECL_ISUPPORTS
 
-  // IUnknown's QueryInterface
-  STDMETHODIMP QueryInterface(REFIID refiid, void** ppvResult);
-
   // nsIFilePicker (less what's in nsBaseFilePicker and nsBaseWinFilePicker)
   NS_IMETHOD GetFilterIndex(int32_t* aFilterIndex) override;
   NS_IMETHOD SetFilterIndex(int32_t aFilterIndex) override;
@@ -62,19 +58,6 @@
   NS_IMETHOD AppendFilter(const nsAString& aTitle,
                           const nsAString& aFilter) override;
 
-  // IFileDialogEvents
-  HRESULT STDMETHODCALLTYPE OnFileOk(IFileDialog* pfd);
-  HRESULT STDMETHODCALLTYPE OnFolderChanging(IFileDialog* pfd,
-                                             IShellItem* psiFolder);
-  HRESULT STDMETHODCALLTYPE OnFolderChange(IFileDialog* pfd);
-  HRESULT STDMETHODCALLTYPE OnSelectionChange(IFileDialog* pfd);
-  HRESULT STDMETHODCALLTYPE
-  OnShareViolation(IFileDialog* pfd, IShellItem* psi,
-                   FDE_SHAREVIOLATION_RESPONSE* pResponse);
-  HRESULT STDMETHODCALLTYPE OnTypeChange(IFileDialog* pfd);
-  HRESULT STDMETHODCALLTYPE OnOverwrite(IFileDialog* pfd, IShellItem* psi,
-                                        FDE_OVERWRITE_RESPONSE* pResponse);
-
  protected:
   /* method from nsBaseFilePicker */
   virtual void InitNative(nsIWidget* aParent, const nsAString& aTitle) override;
@@ -87,9 +70,6 @@
   bool IsPrivacyModeEnabled();
   bool IsDefaultPathLink();
   bool IsDefaultPathHtml();
-  void SetDialogHandle(HWND aWnd);
-  bool ClosePickerIfNeeded();
-  static void PickerCallbackTimerFunc(nsITimer* aTimer, void* aPicker);
 
   nsCOMPtr<nsILoadContext> mLoadContext;
   nsCOMPtr<nsIWidget> mParentWidget;
@@ -99,8 +79,11 @@
   int16_t mSelectedType;
   nsCOMArray<nsIFile> mFiles;
   nsString mUnicodeFile;
-  static char16_t* mLastUsedUnicodeDirectory;
-  HWND mDlgWnd;
+
+  struct FreeDeleter {
+    void operator()(void* aPtr) { ::free(aPtr); }
+  };
+  static mozilla::UniquePtr<char16_t[], FreeDeleter> sLastUsedUnicodeDirectory;
 
   class ComDlgFilterSpec {
    public:
@@ -121,7 +104,6 @@
   };
 
   ComDlgFilterSpec mComFilterList;
-  DWORD mFDECookie;
 };
 
 #endif  // nsFilePicker_h__
diff -Nru firefox-84.0.2+build1/widget/windows/nsLookAndFeel.cpp firefox-85.0+build1/widget/windows/nsLookAndFeel.cpp
--- firefox-84.0.2+build1/widget/windows/nsLookAndFeel.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsLookAndFeel.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -365,12 +365,17 @@
   return res;
 }
 
-nsresult nsLookAndFeel::GetIntImpl(IntID aID, int32_t& aResult) {
-  nsresult res = nsXPLookAndFeel::GetIntImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
+  nsresult res = NS_OK;
 
   switch (aID) {
+    case IntID::ScrollButtonLeftMouseButtonAction:
+      aResult = 0;
+      break;
+    case IntID::ScrollButtonMiddleMouseButtonAction:
+    case IntID::ScrollButtonRightMouseButtonAction:
+      aResult = 3;
+      break;
     case IntID::CaretBlinkTime:
       // IntID::CaretBlinkTime is often called by updating editable text
       // that has focus. So it should be cached to improve performance.
@@ -611,10 +616,8 @@
   return res;
 }
 
-nsresult nsLookAndFeel::GetFloatImpl(FloatID aID, float& aResult) {
-  nsresult res = nsXPLookAndFeel::GetFloatImpl(aID, aResult);
-  if (NS_SUCCEEDED(res)) return res;
-  res = NS_OK;
+nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
+  nsresult res = NS_OK;
 
   switch (aID) {
     case FloatID::IMEUnderlineRelativeSize:
@@ -779,8 +782,8 @@
   return true;
 }
 
-bool nsLookAndFeel::GetFontImpl(FontID anID, nsString& aFontName,
-                                gfxFontStyle& aFontStyle) {
+bool nsLookAndFeel::NativeGetFont(FontID anID, nsString& aFontName,
+                                  gfxFontStyle& aFontStyle) {
   CachedSystemFont& cacheSlot = mSystemFontCache[size_t(anID)];
 
   bool status;
diff -Nru firefox-84.0.2+build1/widget/windows/nsLookAndFeel.h firefox-85.0+build1/widget/windows/nsLookAndFeel.h
--- firefox-84.0.2+build1/widget/windows/nsLookAndFeel.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsLookAndFeel.h	2021-01-18 19:58:27.000000000 +0000
@@ -51,11 +51,11 @@
 
   void NativeInit() final;
   void RefreshImpl() override;
+  nsresult NativeGetInt(IntID aID, int32_t& aResult) override;
+  nsresult NativeGetFloat(FloatID aID, float& aResult) override;
   nsresult NativeGetColor(ColorID aID, nscolor& aResult) override;
-  nsresult GetIntImpl(IntID aID, int32_t& aResult) override;
-  nsresult GetFloatImpl(FloatID aID, float& aResult) override;
-  bool GetFontImpl(FontID aID, nsString& aFontName,
-                   gfxFontStyle& aFontStyle) override;
+  bool NativeGetFont(FontID aID, nsString& aFontName,
+                     gfxFontStyle& aFontStyle) override;
   char16_t GetPasswordCharacterImpl() override;
 
   LookAndFeelCache GetCacheImpl() override;
diff -Nru firefox-84.0.2+build1/widget/windows/nsNativeBasicThemeWin.cpp firefox-85.0+build1/widget/windows/nsNativeBasicThemeWin.cpp
--- firefox-84.0.2+build1/widget/windows/nsNativeBasicThemeWin.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsNativeBasicThemeWin.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,207 @@
 
 #include "nsNativeBasicThemeWin.h"
 
+#include "LookAndFeel.h"
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeCheckboxColors(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeCheckboxColors(aState);
+  }
+
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+  bool isChecked = aState.HasState(NS_EVENT_STATE_CHECKED);
+
+  sRGBColor backgroundColor = sRGBColor::FromABGR(
+      LookAndFeel::GetColor(LookAndFeel::ColorID::TextBackground));
+  sRGBColor borderColor = sRGBColor::FromABGR(
+      LookAndFeel::GetColor(LookAndFeel::ColorID::Buttontext));
+  if (isDisabled && isChecked) {
+    backgroundColor = borderColor = sRGBColor::FromABGR(
+        LookAndFeel::GetColor(LookAndFeel::ColorID::Graytext));
+  } else if (isDisabled) {
+    borderColor = sRGBColor::FromABGR(
+        LookAndFeel::GetColor(LookAndFeel::ColorID::Graytext));
+  } else if (isChecked) {
+    backgroundColor = borderColor = sRGBColor::FromABGR(
+        LookAndFeel::GetColor(LookAndFeel::ColorID::Highlight));
+  }
+
+  return std::make_pair(backgroundColor, borderColor);
+}
+
+sRGBColor nsNativeBasicThemeWin::ComputeCheckmarkColor(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeCheckmarkColor(aState);
+  }
+
+  return sRGBColor::FromABGR(
+      LookAndFeel::GetColor(LookAndFeel::ColorID::TextBackground));
+}
+
+std::pair<sRGBColor, sRGBColor>
+nsNativeBasicThemeWin::ComputeRadioCheckmarkColors(const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeRadioCheckmarkColors(aState);
+  }
+
+  auto [unusedColor, checkColor] = ComputeCheckboxColors(aState);
+  (void)unusedColor;
+  sRGBColor backgroundColor = ComputeCheckmarkColor(aState);
+
+  return std::make_pair(backgroundColor, checkColor);
+}
+
+sRGBColor nsNativeBasicThemeWin::ComputeBorderColor(const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeBorderColor(aState);
+  }
+
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+
+  if (isDisabled) {
+    return sRGBColor::FromABGR(
+        LookAndFeel::GetColor(LookAndFeel::ColorID::Graytext));
+  }
+  return sRGBColor::FromABGR(
+      LookAndFeel::GetColor(LookAndFeel::ColorID::Buttontext));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeButtonColors(
+    const EventStates& aState, nsIFrame* aFrame) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeButtonColors(aState, aFrame);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Buttonface)),
+                        ComputeBorderColor(aState));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeTextfieldColors(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeTextfieldColors(aState);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextBackground)),
+                        ComputeBorderColor(aState));
+}
+
+std::pair<sRGBColor, sRGBColor>
+nsNativeBasicThemeWin::ComputeRangeProgressColors(const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeRangeProgressColors(aState);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Highlight)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Buttontext)));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeRangeTrackColors(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeRangeTrackColors(aState);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextBackground)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Buttontext)));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeRangeThumbColors(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeRangeThumbColors(aState);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Highlight)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Highlight)));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeProgressColors() {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeProgressColors();
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Highlight)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Buttontext)));
+}
+
+std::pair<sRGBColor, sRGBColor>
+nsNativeBasicThemeWin::ComputeProgressTrackColors() {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeProgressTrackColors();
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextBackground)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Buttontext)));
+}
+
+std::pair<sRGBColor, sRGBColor> nsNativeBasicThemeWin::ComputeMeterchunkColors(
+    const double aValue, const double aOptimum, const double aLow) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeMeterchunkColors(aValue, aOptimum, aLow);
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::Highlight)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextForeground)));
+}
+
+std::pair<sRGBColor, sRGBColor>
+nsNativeBasicThemeWin::ComputeMeterTrackColors() {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeMeterTrackColors();
+  }
+
+  return std::make_pair(sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextBackground)),
+                        sRGBColor::FromABGR(LookAndFeel::GetColor(
+                            LookAndFeel::ColorID::TextForeground)));
+}
+
+sRGBColor nsNativeBasicThemeWin::ComputeMenulistArrowButtonColor(
+    const EventStates& aState) {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeMenulistArrowButtonColor(aState);
+  }
+
+  bool isDisabled = aState.HasState(NS_EVENT_STATE_DISABLED);
+
+  if (isDisabled) {
+    return sRGBColor::FromABGR(
+        LookAndFeel::GetColor(LookAndFeel::ColorID::Graytext));
+  }
+  return sRGBColor::FromABGR(
+      LookAndFeel::GetColor(LookAndFeel::ColorID::TextForeground));
+}
+
+std::array<sRGBColor, 3> nsNativeBasicThemeWin::ComputeFocusRectColors() {
+  if (!LookAndFeel::GetInt(LookAndFeel::IntID::UseAccessibilityTheme, 0)) {
+    return nsNativeBasicTheme::ComputeFocusRectColors();
+  }
+
+  return {sRGBColor::FromABGR(
+              LookAndFeel::GetColor(LookAndFeel::ColorID::Highlight)),
+          sRGBColor::FromABGR(
+              LookAndFeel::GetColor(LookAndFeel::ColorID::Buttontext)),
+          sRGBColor::FromABGR(
+              LookAndFeel::GetColor(LookAndFeel::ColorID::TextBackground))};
+}
+
 already_AddRefed<nsITheme> do_GetBasicNativeThemeDoNotUseDirectly() {
   static StaticRefPtr<nsITheme> gInstance;
   if (MOZ_UNLIKELY(!gInstance)) {
diff -Nru firefox-84.0.2+build1/widget/windows/nsNativeBasicThemeWin.h firefox-85.0+build1/widget/windows/nsNativeBasicThemeWin.h
--- firefox-84.0.2+build1/widget/windows/nsNativeBasicThemeWin.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsNativeBasicThemeWin.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,6 +15,30 @@
 
  protected:
   virtual ~nsNativeBasicThemeWin() = default;
+
+  std::pair<sRGBColor, sRGBColor> ComputeCheckboxColors(
+      const EventStates& aState) override;
+  sRGBColor ComputeCheckmarkColor(const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeRadioCheckmarkColors(
+      const EventStates& aState) override;
+  sRGBColor ComputeBorderColor(const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeButtonColors(
+      const EventStates& aState, nsIFrame* aFrame = nullptr) override;
+  std::pair<sRGBColor, sRGBColor> ComputeTextfieldColors(
+      const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeRangeProgressColors(
+      const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeRangeTrackColors(
+      const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeRangeThumbColors(
+      const EventStates& aState) override;
+  std::pair<sRGBColor, sRGBColor> ComputeProgressColors() override;
+  std::pair<sRGBColor, sRGBColor> ComputeProgressTrackColors() override;
+  std::pair<sRGBColor, sRGBColor> ComputeMeterchunkColors(
+      const double aValue, const double aOptimum, const double aLow) override;
+  std::pair<sRGBColor, sRGBColor> ComputeMeterTrackColors() override;
+  sRGBColor ComputeMenulistArrowButtonColor(const EventStates& aState) override;
+  std::array<sRGBColor, 3> ComputeFocusRectColors() override;
 };
 
 #endif
diff -Nru firefox-84.0.2+build1/widget/windows/nsNativeThemeWin.cpp firefox-85.0+build1/widget/windows/nsNativeThemeWin.cpp
--- firefox-84.0.2+build1/widget/windows/nsNativeThemeWin.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsNativeThemeWin.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -2596,7 +2596,7 @@
           ui->mScrollbarColor.AsColors().track.MaybeTransparent()) {
         return eTransparent;
       }
-      // DrawCustomScrollbarPart doesn't draw the track background for
+      // MayDrawCustomScrollbarPart doesn't draw the track background for
       // widgets on it, and these widgets are thinner than the track,
       // so we need to return transparent for them.
       switch (aAppearance) {
@@ -4042,12 +4042,11 @@
 
   gfxContextAutoSaveRestore autoSave(aContext);
   RefPtr<gfxContext> ctx = aContext;
+  DrawTarget* dt = ctx->GetDrawTarget();
   gfxFloat p2a = gfxFloat(aFrame->PresContext()->AppUnitsPerDevPixel());
-  gfxRect clipRect = ThebesRect(
-      LayoutDevicePixel::FromAppUnits(aClipRect, p2a).ToUnknownRect());
+  gfxRect rect = ThebesRect(NSRectToSnappedRect(aRect, p2a, *dt));
+  gfxRect clipRect = ThebesRect(NSRectToSnappedRect(aClipRect, p2a, *dt));
   ctx->Clip(clipRect);
-  gfxRect rect =
-      ThebesRect(LayoutDevicePixel::FromAppUnits(aRect, p2a).ToUnknownRect());
 
   const nsStyleUI* ui = style->StyleUI();
   auto* customColors =
diff -Nru firefox-84.0.2+build1/widget/windows/nsPrintDialogUtil.cpp firefox-85.0+build1/widget/windows/nsPrintDialogUtil.cpp
--- firefox-84.0.2+build1/widget/windows/nsPrintDialogUtil.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsPrintDialogUtil.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -28,6 +28,7 @@
 #include <commdlg.h>
 
 #include "mozilla/BackgroundHangMonitor.h"
+#include "mozilla/ScopeExit.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsIPrintSettings.h"
diff -Nru firefox-84.0.2+build1/widget/windows/nsUXThemeData.h firefox-85.0+build1/widget/windows/nsUXThemeData.h
--- firefox-84.0.2+build1/widget/windows/nsUXThemeData.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsUXThemeData.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "nscore.h"
 #include "mozilla/LookAndFeel.h"
+#include "mozilla/Maybe.h"
 #include "WinUtils.h"
 
 #include "nsWindowDefs.h"
@@ -68,7 +69,7 @@
   // loading attempt has failed because OpenThemeData is a heavy task and
   // it's less likely that the API returns a different result.
   class ThemeHandle final {
-    Maybe<HANDLE> mHandle;
+    mozilla::Maybe<HANDLE> mHandle;
 
    public:
     ThemeHandle() = default;
diff -Nru firefox-84.0.2+build1/widget/windows/nsWindow.cpp firefox-85.0+build1/widget/windows/nsWindow.cpp
--- firefox-84.0.2+build1/widget/windows/nsWindow.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsWindow.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -65,6 +65,7 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/TimeStamp.h"
 
@@ -129,6 +130,7 @@
 #include "WidgetUtils.h"
 #include "WinContentSystemParameters.h"
 #include "nsIWidgetListener.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/Touch.h"
 #include "mozilla/gfx/2D.h"
@@ -147,6 +149,7 @@
 #include "InputDeviceUtils.h"
 #include "ScreenHelperWin.h"
 #include "mozilla/StaticPrefs_apz.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_layout.h"
 
 #include "nsIGfxInfo.h"
@@ -1594,11 +1597,16 @@
  **************************************************************/
 
 void nsWindow::Show(bool bState) {
-  if (bState) {
+  if (bState && mIsShowingPreXULSkeletonUI) {
     // The first time we decide to actually show the window is when we decide
     // that we've taken over the window from the skeleton UI, and we should
     // no longer treat resizes / moves specially.
     mIsShowingPreXULSkeletonUI = false;
+    // Initialize the UI state - this would normally happen below, but since
+    // we're actually already showing, we won't hit it in the normal way.
+    ::SendMessageW(mWnd, WM_CHANGEUISTATE,
+                   MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL),
+                   0);
   }
 
   if (mWindowType == eWindowType_popup) {
diff -Nru firefox-84.0.2+build1/widget/windows/nsWindowGfx.cpp firefox-85.0+build1/widget/windows/nsWindowGfx.cpp
--- firefox-84.0.2+build1/widget/windows/nsWindowGfx.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsWindowGfx.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -150,7 +150,19 @@
 
     gfxWindowsPlatform::GetPlatform()->UpdateRenderMode();
 
-    GPUProcessManager::Get()->OnInProcessDeviceReset();
+    bool guilty;
+    switch (resetReason) {
+      case DeviceResetReason::HUNG:
+      case DeviceResetReason::RESET:
+      case DeviceResetReason::INVALID_CALL:
+        guilty = true;
+        break;
+      default:
+        guilty = false;
+        break;
+    }
+
+    GPUProcessManager::Get()->OnInProcessDeviceReset(guilty);
 
     gfxCriticalNote << "(nsWindow) Finished device reset.";
     return false;
diff -Nru firefox-84.0.2+build1/widget/windows/nsWindow.h firefox-85.0+build1/widget/windows/nsWindow.h
--- firefox-84.0.2+build1/widget/windows/nsWindow.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/nsWindow.h	2021-01-18 19:58:27.000000000 +0000
@@ -453,7 +453,8 @@
   LRESULT ProcessKeyUpMessage(const MSG& aMsg, bool* aEventDispatched);
   LRESULT ProcessKeyDownMessage(const MSG& aMsg, bool* aEventDispatched);
   static bool EventIsInsideWindow(
-      nsWindow* aWindow, Maybe<POINT> aEventPoint = mozilla::Nothing());
+      nsWindow* aWindow,
+      mozilla::Maybe<POINT> aEventPoint = mozilla::Nothing());
   // Convert nsEventStatus value to a windows boolean
   static bool ConvertStatus(nsEventStatus aStatus);
   static void PostSleepWakeNotification(const bool aIsSleepMode);
@@ -462,7 +463,7 @@
   static void UpdateFirstEventTime(DWORD aEventTime);
   void FinishLiveResizing(ResizeState aNewState);
   nsIntPoint GetTouchCoordinates(WPARAM wParam, LPARAM lParam);
-  Maybe<mozilla::PanGestureInput> ConvertTouchToPanGesture(
+  mozilla::Maybe<mozilla::PanGestureInput> ConvertTouchToPanGesture(
       const mozilla::MultiTouchInput& aTouchInput, PTOUCHINPUT aOriginalEvent);
   void DispatchTouchOrPanGestureInput(mozilla::MultiTouchInput& aTouchInput,
                                       PTOUCHINPUT aOSEvent);
@@ -511,9 +512,9 @@
   static void ScheduleHookTimer(HWND aWnd, UINT aMsgId);
   static void RegisterSpecialDropdownHooks();
   static void UnregisterSpecialDropdownHooks();
-  static bool GetPopupsToRollup(nsIRollupListener* aRollupListener,
-                                uint32_t* aPopupsToRollup,
-                                Maybe<POINT> aEventPoint = mozilla::Nothing());
+  static bool GetPopupsToRollup(
+      nsIRollupListener* aRollupListener, uint32_t* aPopupsToRollup,
+      mozilla::Maybe<POINT> aEventPoint = mozilla::Nothing());
   static bool NeedsToHandleNCActivateDelayed(HWND aWnd);
   static bool DealWithPopups(HWND inWnd, UINT inMsg, WPARAM inWParam,
                              LPARAM inLParam, LRESULT* outResult);
diff -Nru firefox-84.0.2+build1/widget/windows/PCompositorWidget.ipdl firefox-85.0+build1/widget/windows/PCompositorWidget.ipdl
--- firefox-84.0.2+build1/widget/windows/PCompositorWidget.ipdl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/PCompositorWidget.ipdl	2021-01-18 19:58:27.000000000 +0000
@@ -6,9 +6,11 @@
 
 include protocol PCompositorBridge;
 
+include "mozilla/widget/WidgetMessageUtils.h";
+
 using mozilla::gfx::IntSize from "mozilla/gfx/Point.h";
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
-using nsTransparencyMode from "mozilla/widget/WidgetMessageUtils.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
+using nsTransparencyMode from "nsIWidget.h";
 
 namespace mozilla {
 namespace widget {
diff -Nru firefox-84.0.2+build1/widget/windows/PlatformWidgetTypes.ipdlh firefox-85.0+build1/widget/windows/PlatformWidgetTypes.ipdlh
--- firefox-84.0.2+build1/widget/windows/PlatformWidgetTypes.ipdlh	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/PlatformWidgetTypes.ipdlh	2021-01-18 19:58:27.000000000 +0000
@@ -5,12 +5,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include "mozilla/dom/TabMessageUtils.h";
+include "mozilla/widget/WidgetMessageUtils.h";
 
 include HeadlessWidgetTypes;
 
-using mozilla::WindowsHandle from "ipc/IPCMessageUtils.h";
+using mozilla::WindowsHandle from "mozilla/ipc/IPCTypes.h";
 using nsSizeMode from "nsIWidgetListener.h";
-using nsTransparencyMode from "mozilla/widget/WidgetMessageUtils.h";
+using nsTransparencyMode from "nsIWidget.h";
 
 namespace mozilla {
 namespace widget {
diff -Nru firefox-84.0.2+build1/widget/windows/ProcInfo.cpp firefox-85.0+build1/widget/windows/ProcInfo.cpp
--- firefox-84.0.2+build1/widget/windows/ProcInfo.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/widget/windows/ProcInfo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,191 +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 "mozilla/ProcInfo.h"
-#include "mozilla/ipc/GeckoChildProcessHost.h"
-#include "nsMemoryReporterManager.h"
-#include <windows.h>
-#include <psapi.h>
-#include <tlhelp32.h>
-
-typedef HRESULT(WINAPI* GETTHREADDESCRIPTION)(HANDLE hThread,
-                                              PWSTR* threadDescription);
-
-namespace mozilla {
-
-uint64_t ToNanoSeconds(const FILETIME& aFileTime) {
-  // FILETIME values are 100-nanoseconds units, converting
-  ULARGE_INTEGER usec = {{aFileTime.dwLowDateTime, aFileTime.dwHighDateTime}};
-  return usec.QuadPart * 100;
-}
-
-RefPtr<ProcInfoPromise> GetProcInfo(nsTArray<ProcInfoRequest>&& aRequests) {
-  auto holder = MakeUnique<MozPromiseHolder<ProcInfoPromise>>();
-  RefPtr<ProcInfoPromise> promise = holder->Ensure(__func__);
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIEventTarget> target =
-      do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID, &rv);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to get stream transport service");
-    holder->Reject(rv, __func__);
-    return promise;
-  }
-
-  RefPtr<nsIRunnable> r = NS_NewRunnableFunction(
-      __func__,
-      [holder = std::move(holder), requests = std::move(aRequests)]() -> void {
-        HashMap<base::ProcessId, ProcInfo> gathered;
-        if (!gathered.reserve(requests.Length())) {
-          holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-          return;
-        }
-
-        // ---- Copying data on processes (minus threads).
-
-        for (const auto& request : requests) {
-          nsAutoHandle handle(OpenProcess(
-              PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, request.pid));
-
-          if (!handle) {
-            // Ignore process, it may have died.
-            continue;
-          }
-
-          wchar_t filename[MAX_PATH];
-          if (GetProcessImageFileNameW(handle.get(), filename, MAX_PATH) == 0) {
-            // Ignore process, it may have died.
-            continue;
-          }
-          FILETIME createTime, exitTime, kernelTime, userTime;
-          if (!GetProcessTimes(handle.get(), &createTime, &exitTime,
-                               &kernelTime, &userTime)) {
-            // Ignore process, it may have died.
-            continue;
-          }
-          PROCESS_MEMORY_COUNTERS memoryCounters;
-          if (!GetProcessMemoryInfo(handle.get(),
-                                    (PPROCESS_MEMORY_COUNTERS)&memoryCounters,
-                                    sizeof(memoryCounters))) {
-            // Ignore process, it may have died.
-            continue;
-          }
-
-          // Assumption: values of `pid` are distinct between processes,
-          // regardless of any race condition we might have stumbled upon. Even
-          // if it somehow could happen, in the worst case scenario, we might
-          // end up overwriting one process info and we might end up with too
-          // many threads attached to a process, as the data is not crucial, we
-          // do not need to defend against that (unlikely) scenario.
-          ProcInfo info;
-          info.pid = request.pid;
-          info.childId = request.childId;
-          info.type = request.processType;
-          info.origin = request.origin;
-          info.windows = std::move(request.windowInfo);
-          info.filename.Assign(filename);
-          info.cpuKernel = ToNanoSeconds(kernelTime);
-          info.cpuUser = ToNanoSeconds(userTime);
-          info.residentSetSize = memoryCounters.WorkingSetSize;
-
-          // Computing the resident unique size is somewhat tricky,
-          // so we use about:memory's implementation. This implementation
-          // uses the `HANDLE` so, in theory, should be no additional
-          // race condition. However, in case of error, the result is `0`.
-          info.residentUniqueSize =
-              nsMemoryReporterManager::ResidentUnique(handle.get());
-
-          if (!gathered.put(request.pid, std::move(info))) {
-            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-            return;
-          }
-        }
-
-        // ---- Add thread data to already-copied processes.
-
-        // First, we need to capture a snapshot of all the threads on this
-        // system.
-        nsAutoHandle hThreadSnap(CreateToolhelp32Snapshot(
-            /* dwFlags */ TH32CS_SNAPTHREAD, /* ignored */ 0));
-        if (!hThreadSnap) {
-          holder->Reject(NS_ERROR_UNEXPECTED, __func__);
-          return;
-        }
-
-        // `GetThreadDescription` is available as of Windows 10.
-        // We attempt to import it dynamically, knowing that it
-        // may be `nullptr`.
-        auto getThreadDescription =
-            reinterpret_cast<GETTHREADDESCRIPTION>(::GetProcAddress(
-                ::GetModuleHandleW(L"Kernel32.dll"), "GetThreadDescription"));
-
-        THREADENTRY32 te32;
-        te32.dwSize = sizeof(THREADENTRY32);
-
-        // Now, walk through the threads.
-        for (auto success = Thread32First(hThreadSnap.get(), &te32); success;
-             success = Thread32Next(hThreadSnap.get(), &te32)) {
-          auto processLookup = gathered.lookup(te32.th32OwnerProcessID);
-          if (!processLookup) {
-            // Not one of the processes we're interested in.
-            continue;
-          }
-          ThreadInfo* threadInfo =
-              processLookup->value().threads.AppendElement(fallible);
-          if (!threadInfo) {
-            holder->Reject(NS_ERROR_OUT_OF_MEMORY, __func__);
-            return;
-          }
-
-          nsAutoHandle hThread(
-              OpenThread(/* dwDesiredAccess = */ THREAD_QUERY_INFORMATION,
-                         /* bInheritHandle = */ FALSE,
-                         /* dwThreadId = */ te32.th32ThreadID));
-          if (!hThread) {
-            // Cannot open thread. Not sure why, but let's erase this thread
-            // and attempt to find data on other threads.
-            processLookup->value().threads.RemoveLastElement();
-            continue;
-          }
-
-          threadInfo->tid = te32.th32ThreadID;
-
-          // Attempt to get thread times.
-          // If we fail, continue without this piece of information.
-          FILETIME createTime, exitTime, kernelTime, userTime;
-          if (GetThreadTimes(hThread.get(), &createTime, &exitTime, &kernelTime,
-                             &userTime)) {
-            threadInfo->cpuKernel = ToNanoSeconds(kernelTime);
-            threadInfo->cpuUser = ToNanoSeconds(userTime);
-          }
-
-          // Attempt to get thread name.
-          // If we fail, continue without this piece of information.
-          if (getThreadDescription) {
-            PWSTR threadName = nullptr;
-            if (getThreadDescription(hThread.get(), &threadName) &&
-                threadName) {
-              threadInfo->name = threadName;
-            }
-            if (threadName) {
-              LocalFree(threadName);
-            }
-          }
-        }
-
-        // ----- We're ready to return.
-        holder->Resolve(std::move(gathered), __func__);
-      });
-
-  rv = target->Dispatch(r.forget(), NS_DISPATCH_NORMAL);
-  if (NS_FAILED(rv)) {
-    NS_WARNING("Failed to dispatch the LoadDataRunnable.");
-  }
-
-  return promise;
-}
-
-}  // namespace mozilla
diff -Nru firefox-84.0.2+build1/widget/windows/ToastNotification.cpp firefox-85.0+build1/widget/windows/ToastNotification.cpp
--- firefox-84.0.2+build1/widget/windows/ToastNotification.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/ToastNotification.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -168,8 +168,7 @@
 }
 
 NS_IMETHODIMP
-ToastNotification::CloseAlert(const nsAString& aAlertName,
-                              nsIPrincipal* aPrincipal) {
+ToastNotification::CloseAlert(const nsAString& aAlertName) {
   RefPtr<ToastNotificationHandler> handler;
   if (NS_WARN_IF(!mActiveHandlers.Get(aAlertName, getter_AddRefs(handler)))) {
     return NS_OK;
diff -Nru firefox-84.0.2+build1/widget/windows/TSFTextStore.cpp firefox-85.0+build1/widget/windows/TSFTextStore.cpp
--- firefox-84.0.2+build1/widget/windows/TSFTextStore.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/TSFTextStore.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -18,6 +18,7 @@
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/StaticPrefs_intl.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextEvents.h"
@@ -97,6 +98,9 @@
   // TIP for Korean.
   eMicrosoftIMEForKorean,
   eMicrosoftOldHangul,
+
+  // Keyman Desktop, which can install various language keyboards.
+  eKeymanDesktop,
 };
 
 static const char* GetBoolName(bool aBool) { return aBool ? "true" : "false"; }
@@ -420,14 +424,6 @@
   return description;
 }
 
-static const char* GetActiveSelEndName(TsActiveSelEnd aSelEnd) {
-  return aSelEnd == TS_AE_NONE
-             ? "TS_AE_NONE"
-             : aSelEnd == TS_AE_START
-                   ? "TS_AE_START"
-                   : aSelEnd == TS_AE_END ? "TS_AE_END" : "Unknown";
-}
-
 static const nsCString GetLockFlagNameStr(DWORD aLockFlags) {
   nsCString description;
   if ((aLockFlags & TS_LF_READWRITE) == TS_LF_READWRITE) {
@@ -1162,12 +1158,32 @@
         break;
       default:
         mActiveTIP = TextInputProcessorID::eUnknown;
+        break;
+    }
+    // Special case for Keyman Desktop, it is available for any languages.
+    // Therefore, we need to check it only if we don't know the active TIP.
+    if (mActiveTIP != TextInputProcessorID::eUnknown) {
+      return;
+    }
+
+    // Note that keyboard layouts for Keyman assign its GUID on install
+    // randomly, but CLSID is constant in any environments.
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1670834#c7
+    // https://github.com/keymanapp/keyman/blob/318c73a9e1d571d942837ff9964590626e5bd5aa/windows/src/engine/kmtip/globals.cpp#L37
+    // {FE0420F1-38D1-4B4C-96BF-E7E20A74CFB7}
+    static constexpr CLSID kKeymanDesktop_CLSID = {
+        0xFE0420F1,
+        0x38D1,
+        0x4B4C,
+        {0x96, 0xBF, 0xE7, 0xE2, 0x0A, 0x74, 0xCF, 0xB7}};
+    if (mActiveTIPCLSID == kKeymanDesktop_CLSID) {
+      mActiveTIP = TextInputProcessorID::eKeymanDesktop;
     }
   }
 
   TextInputProcessorID ComputeActiveTIPAsJapanese() {
     // {A76C93D9-5523-4E90-AAFA-4DB112F9AC76} (Win7, Win8.1, Win10)
-    static const GUID kMicrosoftIMEForJapaneseGUID = {
+    static constexpr GUID kMicrosoftIMEForJapaneseGUID = {
         0xA76C93D9,
         0x5523,
         0x4E90,
@@ -1176,7 +1192,7 @@
       return TextInputProcessorID::eMicrosoftIMEForJapanese;
     }
     // {54EDCC94-1524-4BB1-9FB7-7BABE4F4CA64}
-    static const GUID kMicrosoftOfficeIME2010ForJapaneseGUID = {
+    static constexpr GUID kMicrosoftOfficeIME2010ForJapaneseGUID = {
         0x54EDCC94,
         0x1524,
         0x4BB1,
@@ -1185,7 +1201,7 @@
       return TextInputProcessorID::eMicrosoftOfficeIME2010ForJapanese;
     }
     // {773EB24E-CA1D-4B1B-B420-FA985BB0B80D}
-    static const GUID kGoogleJapaneseInputGUID = {
+    static constexpr GUID kGoogleJapaneseInputGUID = {
         0x773EB24E,
         0xCA1D,
         0x4B1B,
@@ -1203,7 +1219,7 @@
       return TextInputProcessorID::eATOK2011;
     }
     // {1DE01562-F445-401B-B6C3-E5B18DB79461}
-    static const GUID kATOK2012GUID = {
+    static constexpr GUID kATOK2012GUID = {
         0x1DE01562,
         0xF445,
         0x401B,
@@ -1212,7 +1228,7 @@
       return TextInputProcessorID::eATOK2012;
     }
     // {3C4DB511-189A-4168-B6EA-BFD0B4C85615}
-    static const GUID kATOK2013GUID = {
+    static constexpr GUID kATOK2013GUID = {
         0x3C4DB511,
         0x189A,
         0x4168,
@@ -1221,7 +1237,7 @@
       return TextInputProcessorID::eATOK2013;
     }
     // {4EF33B79-6AA9-4271-B4BF-9321C279381B}
-    static const GUID kATOK2014GUID = {
+    static constexpr GUID kATOK2014GUID = {
         0x4EF33B79,
         0x6AA9,
         0x4271,
@@ -1230,7 +1246,7 @@
       return TextInputProcessorID::eATOK2014;
     }
     // {EAB4DC00-CE2E-483D-A86A-E6B99DA9599A}
-    static const GUID kATOK2015GUID = {
+    static constexpr GUID kATOK2015GUID = {
         0xEAB4DC00,
         0xCE2E,
         0x483D,
@@ -1239,7 +1255,7 @@
       return TextInputProcessorID::eATOK2015;
     }
     // {0B557B4C-5740-4110-A60A-1493FA10BF2B}
-    static const GUID kATOK2016GUID = {
+    static constexpr GUID kATOK2016GUID = {
         0x0B557B4C,
         0x5740,
         0x4110,
@@ -1258,7 +1274,7 @@
     }
 
     // {E6D66705-1EDA-4373-8D01-1D0CB2D054C7}
-    static const GUID kJapanist10GUID = {
+    static constexpr GUID kJapanist10GUID = {
         0xE6D66705,
         0x1EDA,
         0x4373,
@@ -1272,7 +1288,7 @@
 
   TextInputProcessorID ComputeActiveTIPAsTraditionalChinese() {
     // {B2F9C502-1742-11D4-9790-0080C882687E} (Win8.1, Win10)
-    static const GUID kMicrosoftBopomofoGUID = {
+    static constexpr GUID kMicrosoftBopomofoGUID = {
         0xB2F9C502,
         0x1742,
         0x11D4,
@@ -1290,7 +1306,7 @@
       return TextInputProcessorID::eMicrosoftChangJie;
     }
     // {761309DE-317A-11D4-9B5D-0080C882687E} (Win7)
-    static const GUID kMicrosoftPhoneticGUID = {
+    static constexpr GUID kMicrosoftPhoneticGUID = {
         0x761309DE,
         0x317A,
         0x11D4,
@@ -1299,7 +1315,7 @@
       return TextInputProcessorID::eMicrosoftPhonetic;
     }
     // {6024B45F-5C54-11D4-B921-0080C882687E} (Win7, Win8.1, Win10)
-    static const GUID kMicrosoftQuickGUID = {
+    static constexpr GUID kMicrosoftQuickGUID = {
         0x6024B45F,
         0x5C54,
         0x11D4,
@@ -1308,7 +1324,7 @@
       return TextInputProcessorID::eMicrosoftQuick;
     }
     // {F3BA907A-6C7E-11D4-97FA-0080C882687E} (Win7)
-    static const GUID kMicrosoftNewChangJieGUID = {
+    static constexpr GUID kMicrosoftNewChangJieGUID = {
         0xF3BA907A,
         0x6C7E,
         0x11D4,
@@ -1317,7 +1333,7 @@
       return TextInputProcessorID::eMicrosoftNewChangJie;
     }
     // {B2F9C502-1742-11D4-9790-0080C882687E} (Win7)
-    static const GUID kMicrosoftNewPhoneticGUID = {
+    static constexpr GUID kMicrosoftNewPhoneticGUID = {
         0xB2F9C502,
         0x1742,
         0x11D4,
@@ -1326,7 +1342,7 @@
       return TextInputProcessorID::eMicrosoftNewPhonetic;
     }
     // {0B883BA0-C1C7-11D4-87F9-0080C882687E} (Win7)
-    static const GUID kMicrosoftNewQuickGUID = {
+    static constexpr GUID kMicrosoftNewQuickGUID = {
         0x0B883BA0,
         0xC1C7,
         0x11D4,
@@ -1358,7 +1374,7 @@
     // FYI: This matches with neither "Microsoft Pinyin ABC Input Style" nor
     //      "Microsoft Pinyin New Experience Input Style" on Win7.
     // {FA550B04-5AD7-411F-A5AC-CA038EC515D7} (Win8.1, Win10)
-    static const GUID kMicrosoftPinyinGUID = {
+    static constexpr GUID kMicrosoftPinyinGUID = {
         0xFA550B04,
         0x5AD7,
         0x411F,
@@ -1368,7 +1384,7 @@
     }
 
     // {F3BA9077-6C7E-11D4-97FA-0080C882687E} (Win7)
-    static const GUID kMicrosoftPinyinNewExperienceInputStyleGUID = {
+    static constexpr GUID kMicrosoftPinyinNewExperienceInputStyleGUID = {
         0xF3BA9077,
         0x6C7E,
         0x11D4,
@@ -1377,7 +1393,7 @@
       return TextInputProcessorID::eMicrosoftPinyinNewExperienceInputStyle;
     }
     // {82590C13-F4DD-44F4-BA1D-8667246FDF8E} (Win8.1, Win10)
-    static const GUID kMicrosoftWubiGUID = {
+    static constexpr GUID kMicrosoftWubiGUID = {
         0x82590C13,
         0xF4DD,
         0x44F4,
@@ -1399,7 +1415,7 @@
 
   TextInputProcessorID ComputeActiveTIPAsKorean() {
     // {B5FE1F02-D5F2-4445-9C03-C568F23C99A1} (Win7, Win8.1, Win10)
-    static const GUID kMicrosoftIMEForKoreanGUID = {
+    static constexpr GUID kMicrosoftIMEForKoreanGUID = {
         0xB5FE1F02,
         0xD5F2,
         0x4445,
@@ -1408,7 +1424,7 @@
       return TextInputProcessorID::eMicrosoftIMEForKorean;
     }
     // {B60AF051-257A-46BC-B9D3-84DAD819BAFB} (Win8.1, Win10)
-    static const GUID kMicrosoftOldHangulGUID = {
+    static constexpr GUID kMicrosoftOldHangulGUID = {
         0xB60AF051,
         0x257A,
         0x46BC,
@@ -1460,8 +1476,9 @@
   // i.e., IMM-IME or just a keyboard layout, this is empty.
   nsString mActiveTIPKeyboardDescription;
 
-  // Active TIP's GUID
+  // Active TIP's GUID and CLSID
   GUID mActiveTIPGUID;
+  CLSID mActiveTIPCLSID;
 
   static StaticRefPtr<TSFStaticSink> sInstance;
 };
@@ -1556,6 +1573,7 @@
     mOnActivatedCalled = true;
     mActiveTIP = TextInputProcessorID::eNotComputed;
     mActiveTIPGUID = guidProfile;
+    mActiveTIPCLSID = rclsid;
     mLangID = langid & 0xFFFF;
     mIsIMM_IME = IsIMM_IME(hkl);
     GetTIPDescription(rclsid, langid, guidProfile,
@@ -1596,9 +1614,9 @@
            this,
            dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR
                ? "TF_PROFILETYPE_INPUTPROCESSOR"
-               : dwProfileType == TF_PROFILETYPE_KEYBOARDLAYOUT
-                     ? "TF_PROFILETYPE_KEYBOARDLAYOUT"
-                     : "Unknown",
+           : dwProfileType == TF_PROFILETYPE_KEYBOARDLAYOUT
+               ? "TF_PROFILETYPE_KEYBOARDLAYOUT"
+               : "Unknown",
            dwProfileType, langid, GetCLSIDNameStr(rclsid).get(),
            GetGUIDNameStr(catid).get(), GetGUIDNameStr(guidProfile).get(), hkl,
            dwFlags, GetBoolName(dwFlags & TF_IPSINK_FLAG_ACTIVE),
@@ -1786,7 +1804,6 @@
       mLock(0),
       mLockQueued(0),
       mHandlingKeyMessage(0),
-      mContentForTSF(mComposition, mSelectionForTSF),
       mRequestedAttrValues(false),
       mIsRecordingActionsWithoutLock(false),
       mHasReturnedNoLayoutError(false),
@@ -1928,9 +1945,9 @@
 
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
           ("0x%p TSFTextStore::Destroy(), mLock=%s, "
-           "mComposition.IsComposing()=%s, mHandlingKeyMessage=%u",
+           "mComposition=%s, mHandlingKeyMessage=%u",
            this, GetLockFlagNameStr(mLock).get(),
-           GetBoolName(mComposition.IsComposing()), mHandlingKeyMessage));
+           ToString(mComposition).c_str(), mHandlingKeyMessage));
 
   mDestroyed = true;
 
@@ -1949,7 +1966,7 @@
 
   // If there is composition, TSF keeps the composition even after the text
   // store destroyed.  So, we should clear the composition here.
-  if (mComposition.IsComposing()) {
+  if (mComposition.isSome()) {
     CommitCompositionInternal(false);
   }
 
@@ -2126,7 +2143,7 @@
     return E_FAIL;
   }
   if (mDestroyed &&
-      (!mContentForTSF.IsInitialized() || mSelectionForTSF.IsDirty())) {
+      (mContentForTSF.isNothing() || mSelectionForTSF.isNothing())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RequestLock() FAILED due to "
              "being destroyed and no information of the contents",
@@ -2311,6 +2328,11 @@
           selectionSet.mOffset = static_cast<uint32_t>(action.mSelectionStart);
           selectionSet.mLength = static_cast<uint32_t>(action.mSelectionLength);
           selectionSet.mReversed = false;
+          selectionSet.mExpandToClusterBoundary =
+              TSFStaticSink::ActiveTIP() !=
+                  TextInputProcessorID::eKeymanDesktop &&
+              StaticPrefs::
+                  intl_tsf_hack_extend_setting_selection_range_to_cluster_boundaries();
           DispatchEvent(selectionSet);
           if (!selectionSet.mSucceeded) {
             MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -2337,11 +2359,11 @@
           MOZ_LOG(sTextStoreLog, LogLevel::Error,
                   ("0x%p   TSFTextStore::FlushPendingActions() "
                    "FAILED to dispatch compositionstart event, "
-                   "IsHandlingComposition()=%s",
-                   this, GetBoolName(IsHandlingComposition())));
+                   "IsHandlingCompositionInContent()=%s",
+                   this, GetBoolName(IsHandlingCompositionInContent())));
           // XXX Is this right? If there is a composition in content,
           //     shouldn't we wait NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED?
-          mDeferClearingContentForTSF = !IsHandlingComposition();
+          mDeferClearingContentForTSF = !IsHandlingCompositionInContent();
         }
         if (!widget || widget->Destroyed()) {
           break;
@@ -2368,11 +2390,11 @@
           MOZ_LOG(sTextStoreLog, LogLevel::Error,
                   ("0x%p   TSFTextStore::FlushPendingActions() "
                    "FAILED to setting pending composition... "
-                   "IsHandlingComposition()=%s",
-                   this, GetBoolName(IsHandlingComposition())));
+                   "IsHandlingCompositionInContent()=%s",
+                   this, GetBoolName(IsHandlingCompositionInContent())));
           // XXX Is this right? If there is a composition in content,
           //     shouldn't we wait NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED?
-          mDeferClearingContentForTSF = !IsHandlingComposition();
+          mDeferClearingContentForTSF = !IsHandlingCompositionInContent();
         } else {
           MOZ_LOG(sTextStoreLog, LogLevel::Debug,
                   ("0x%p   TSFTextStore::FlushPendingActions() "
@@ -2385,11 +2407,11 @@
             MOZ_LOG(sTextStoreLog, LogLevel::Error,
                     ("0x%p   TSFTextStore::FlushPendingActions() "
                      "FAILED to dispatch compositionchange event, "
-                     "IsHandlingComposition()=%s",
-                     this, GetBoolName(IsHandlingComposition())));
+                     "IsHandlingCompositionInContent()=%s",
+                     this, GetBoolName(IsHandlingCompositionInContent())));
             // XXX Is this right? If there is a composition in content,
             //     shouldn't we wait NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED?
-            mDeferClearingContentForTSF = !IsHandlingComposition();
+            mDeferClearingContentForTSF = !IsHandlingCompositionInContent();
           }
           // Be aware, the mWidget might already have been destroyed.
         }
@@ -2421,11 +2443,11 @@
           MOZ_LOG(sTextStoreLog, LogLevel::Error,
                   ("0x%p   TSFTextStore::FlushPendingActions() "
                    "FAILED to dispatch compositioncommit event, "
-                   "IsHandlingComposition()=%s",
-                   this, GetBoolName(IsHandlingComposition())));
+                   "IsHandlingCompositionInContent()=%s",
+                   this, GetBoolName(IsHandlingCompositionInContent())));
           // XXX Is this right? If there is a composition in content,
           //     shouldn't we wait NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED?
-          mDeferClearingContentForTSF = !IsHandlingComposition();
+          mDeferClearingContentForTSF = !IsHandlingCompositionInContent();
         }
         break;
       }
@@ -2451,6 +2473,11 @@
         selectionSet.mOffset = static_cast<uint32_t>(action.mSelectionStart);
         selectionSet.mLength = static_cast<uint32_t>(action.mSelectionLength);
         selectionSet.mReversed = action.mSelectionReversed;
+        selectionSet.mExpandToClusterBoundary =
+            TSFStaticSink::ActiveTIP() !=
+                TextInputProcessorID::eKeymanDesktop &&
+            StaticPrefs::
+                intl_tsf_hack_extend_setting_selection_range_to_cluster_boundaries();
         DispatchEvent(selectionSet);
         if (!selectionSet.mSucceeded) {
           MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -2528,11 +2555,11 @@
     return;
   }
 
-  if (!mDeferClearingContentForTSF && mContentForTSF.IsInitialized()) {
-    mContentForTSF.Clear();
+  if (!mDeferClearingContentForTSF && mContentForTSF.isSome()) {
+    mContentForTSF.reset();
     MOZ_LOG(sTextStoreLog, LogLevel::Debug,
             ("0x%p   TSFTextStore::MaybeFlushPendingNotifications(), "
-             "mContentForTSF is cleared",
+             "mContentForTSF is set to `Nothing`",
              this));
   }
 
@@ -2540,7 +2567,7 @@
   // expecting contents.
   RefPtr<TSFTextStore> kungFuDeathGrip = this;
   Unused << kungFuDeathGrip;
-  if (!mContentForTSF.IsInitialized()) {
+  if (mContentForTSF.isNothing()) {
     if (mPendingTextChangeData.IsValid()) {
       MOZ_LOG(sTextStoreLog, LogLevel::Info,
               ("0x%p   TSFTextStore::MaybeFlushPendingNotifications(), "
@@ -2687,7 +2714,7 @@
 
   // XXX need to adjust to cluster boundary
   // Assume we are given good offsets for now
-  if (IsWin8OrLater() && !mComposition.IsComposing() &&
+  if (IsWin8OrLater() && mComposition.isNothing() &&
       ((TSFPrefs::NeedToHackQueryInsertForMSTraditionalTIP() &&
         TSFStaticSink::IsMSChangJieOrMSQuickActive()) ||
        (TSFPrefs::NeedToHackQueryInsertForMSSimplifiedTIP() &&
@@ -2744,36 +2771,33 @@
     return TS_E_NOSELECTION;
   }
 
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     if (DoNotReturnErrorFromGetSelection()) {
-      AutoSetTemporarySelection temprarySetter(selectionForTSF);
-      *pSelection = selectionForTSF.ACP();
+      TS_SELECTION_ACP acp;
+      acp.acpStart = acp.acpEnd = 0;
+      acp.style.ase = TS_AE_START;
+      acp.style.fInterimChar = FALSE;
+      *pSelection = acp;
       *pcFetched = 1;
       MOZ_LOG(
           sTextStoreLog, LogLevel::Info,
           ("0x%p   TSFTextStore::GetSelection() returns fake selection range "
-           "for avoiding a crash in TSF, "
-           "acpStart=%d, acpEnd=%d (length=%d), reverted=%s",
-           this, selectionForTSF.StartOffset(), selectionForTSF.EndOffset(),
-           selectionForTSF.Length(),
-           GetBoolName(selectionForTSF.IsReversed())));
+           "for avoiding a crash in TSF, *pSelection=%s",
+           this, mozilla::ToString(*pSelection).c_str()));
       return S_OK;
     }
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetSelection() FAILED due to "
-             "SelectionForTSFRef() failure",
+             "SelectionForTSF() failure",
              this));
     return E_FAIL;
   }
-  *pSelection = selectionForTSF.ACP();
+  *pSelection = selectionForTSF->ACPRef();
   *pcFetched = 1;
-  MOZ_LOG(
-      sTextStoreLog, LogLevel::Info,
-      ("0x%p   TSFTextStore::GetSelection() succeeded, "
-       "acpStart=%d, acpEnd=%d (length=%d), reverted=%s",
-       this, selectionForTSF.StartOffset(), selectionForTSF.EndOffset(),
-       selectionForTSF.Length(), GetBoolName(selectionForTSF.IsReversed())));
+  MOZ_LOG(sTextStoreLog, LogLevel::Info,
+          ("0x%p   TSFTextStore::GetSelection() succeeded, *pSelection=%s",
+           this, mozilla::ToString(*pSelection).c_str()));
   return S_OK;
 }
 
@@ -2788,42 +2812,38 @@
   return sTSFMayCrashIfGetSelectionReturnsError;
 }
 
-TSFTextStore::Content& TSFTextStore::ContentForTSFRef() {
+Maybe<TSFTextStore::Content>& TSFTextStore::ContentForTSF() {
   // This should be called when the document is locked or the content hasn't
   // been abandoned yet.
-  if (NS_WARN_IF(!IsReadLocked() && !mContentForTSF.IsInitialized())) {
+  if (NS_WARN_IF(!IsReadLocked() && mContentForTSF.isNothing())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
-            ("0x%p   TSFTextStore::ContentForTSFRef(), FAILED, due to "
-             "called wrong timing, IsReadLocked()=%s, "
-             "mContentForTSF.IsInitialized()=%s",
-             this, GetBoolName(IsReadLocked()),
-             GetBoolName(mContentForTSF.IsInitialized())));
-    mContentForTSF.Clear();
+            ("0x%p   TSFTextStore::ContentForTSF(), FAILED, due to "
+             "called wrong timing, IsReadLocked()=%s, mContentForTSF=Nothing",
+             this, GetBoolName(IsReadLocked())));
     return mContentForTSF;
   }
 
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
-            ("0x%p   TSFTextStore::ContentForTSFRef(), FAILED, due to "
-             "SelectionForTSFRef() failure",
+            ("0x%p   TSFTextStore::ContentForTSF(), FAILED, due to "
+             "SelectionForTSF() failure",
              this));
-    mContentForTSF.Clear();
+    mContentForTSF.reset();
     return mContentForTSF;
   }
 
-  if (!mContentForTSF.IsInitialized()) {
-    nsAutoString text;
+  if (mContentForTSF.isNothing()) {
+    nsString text;  // Don't use auto string for avoiding to copy long string.
     if (NS_WARN_IF(!GetCurrentText(text))) {
       MOZ_LOG(sTextStoreLog, LogLevel::Error,
-              ("0x%p   TSFTextStore::ContentForTSFRef(), FAILED, due to "
+              ("0x%p   TSFTextStore::ContentForTSF(), FAILED, due to "
                "GetCurrentText() failure",
                this));
-      mContentForTSF.Clear();
       return mContentForTSF;
     }
 
-    mContentForTSF.Init(text);
+    mContentForTSF.emplace(*this, text);
     // Basically, the cached content which is expected by TSF/TIP should be
     // cleared after active composition is committed or the document lock is
     // unlocked.  However, in e10s mode, content will be modified
@@ -2833,24 +2853,14 @@
   }
 
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::ContentForTSFRef(): "
-           "mContentForTSF={ mText=\"%s\" (Length()=%u), "
-           "mLastCompositionString=\"%s\" (Length()=%u), "
-           "mMinTextModifiedOffset=%u }",
-           this,
-           mContentForTSF.Text().Length() <= 40
-               ? GetEscapedUTF8String(mContentForTSF.Text()).get()
-               : "<omitted>",
-           mContentForTSF.Text().Length(),
-           GetEscapedUTF8String(mContentForTSF.LastCompositionString()).get(),
-           mContentForTSF.LastCompositionString().Length(),
-           mContentForTSF.MinTextModifiedOffset()));
+          ("0x%p   TSFTextStore::ContentForTSF(): mContentForTSF=%s", this,
+           mozilla::ToString(mContentForTSF).c_str()));
 
   return mContentForTSF;
 }
 
 bool TSFTextStore::CanAccessActualContentDirectly() const {
-  if (!mContentForTSF.IsInitialized() || mSelectionForTSF.IsDirty()) {
+  if (mContentForTSF.isNothing() || mSelectionForTSF.isNothing()) {
     return true;
   }
 
@@ -2867,12 +2877,12 @@
     return true;
   }
 
-  return mSelectionForTSF.EqualsExceptDirection(mPendingSelectionChangeData);
+  return mSelectionForTSF->EqualsExceptDirection(mPendingSelectionChangeData);
 }
 
 bool TSFTextStore::GetCurrentText(nsAString& aTextContent) {
-  if (mContentForTSF.IsInitialized()) {
-    aTextContent = mContentForTSF.Text();
+  if (mContentForTSF.isSome()) {
+    aTextContent = mContentForTSF->TextRef();
     return true;
   }
 
@@ -2884,11 +2894,12 @@
            "retrieving text from the content...",
            this));
 
-  WidgetQueryContentEvent queryText(true, eQueryTextContent, mWidget);
-  queryText.InitForQueryTextContent(0, UINT32_MAX);
-  mWidget->InitEvent(queryText);
-  DispatchEvent(queryText);
-  if (NS_WARN_IF(!queryText.mSucceeded)) {
+  WidgetQueryContentEvent queryTextContentEvent(true, eQueryTextContent,
+                                                mWidget);
+  queryTextContentEvent.InitForQueryTextContent(0, UINT32_MAX);
+  mWidget->InitEvent(queryTextContentEvent);
+  DispatchEvent(queryTextContentEvent);
+  if (NS_WARN_IF(queryTextContentEvent.Failed())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetCurrentText(), FAILED, due to "
              "eQueryTextContent failure",
@@ -2897,37 +2908,38 @@
     return false;
   }
 
-  aTextContent = queryText.mReply.mString;
+  aTextContent = queryTextContentEvent.mReply->DataRef();
   return true;
 }
 
-TSFTextStore::Selection& TSFTextStore::SelectionForTSFRef() {
-  if (mSelectionForTSF.IsDirty()) {
+Maybe<TSFTextStore::Selection>& TSFTextStore::SelectionForTSF() {
+  if (mSelectionForTSF.isNothing()) {
     MOZ_ASSERT(!mDestroyed);
     // If the window has never been available, we should crash since working
     // with broken values may make TIP confused.
     if (!mWidget || mWidget->Destroyed()) {
-      MOZ_CRASH();
+      MOZ_ASSERT_UNREACHABLE("There should be non-destroyed widget");
     }
 
-    WidgetQueryContentEvent querySelection(true, eQuerySelectedText, mWidget);
-    mWidget->InitEvent(querySelection);
-    DispatchEvent(querySelection);
-    if (NS_WARN_IF(!querySelection.mSucceeded)) {
+    WidgetQueryContentEvent querySelectedTextEvent(true, eQuerySelectedText,
+                                                   mWidget);
+    mWidget->InitEvent(querySelectedTextEvent);
+    DispatchEvent(querySelectedTextEvent);
+    if (NS_WARN_IF(querySelectedTextEvent.DidNotFindSelection())) {
       return mSelectionForTSF;
     }
-
-    mSelectionForTSF.SetSelection(
-        querySelection.mReply.mOffset, querySelection.mReply.mString.Length(),
-        querySelection.mReply.mReversed, querySelection.GetWritingMode());
+    MOZ_ASSERT(querySelectedTextEvent.mReply->mOffsetAndData.isSome());
+    mSelectionForTSF =
+        Some(Selection(querySelectedTextEvent.mReply->StartOffset(),
+                       querySelectedTextEvent.mReply->DataLength(),
+                       querySelectedTextEvent.mReply->mReversed,
+                       querySelectedTextEvent.mReply->WritingModeRef()));
   }
 
-  MOZ_LOG(
-      sTextStoreLog, LogLevel::Debug,
-      ("0x%p   TSFTextStore::SelectionForTSFRef(): "
-       "acpStart=%d, acpEnd=%d (length=%d), reverted=%s",
-       this, mSelectionForTSF.StartOffset(), mSelectionForTSF.EndOffset(),
-       mSelectionForTSF.Length(), GetBoolName(mSelectionForTSF.IsReversed())));
+  MOZ_LOG(sTextStoreLog, LogLevel::Debug,
+          ("0x%p   TSFTextStore::SelectionForTSF() succeeded, "
+           "mSelectionForTSF=%s",
+           this, ToString(mSelectionForTSF).c_str()));
 
   return mSelectionForTSF;
 }
@@ -2964,12 +2976,12 @@
   if (MOZ_LOG_TEST(sTextStoreLog, LogLevel::Debug)) {
     LONG start = 0, length = 0;
     hr = GetRangeExtent(aRange, &start, &length);
-    MOZ_LOG(
-        sTextStoreLog, LogLevel::Debug,
-        ("0x%p   TSFTextStore::GetDisplayAttribute(): "
-         "GetDisplayAttribute range=%ld-%ld (hr=%s)",
-         this, start - mComposition.mStart,
-         start - mComposition.mStart + length, GetCommonReturnValueName(hr)));
+    MOZ_LOG(sTextStoreLog, LogLevel::Debug,
+            ("0x%p   TSFTextStore::GetDisplayAttribute(): "
+             "GetDisplayAttribute range=%ld-%ld (hr=%s)",
+             this, start - mComposition->StartOffset(),
+             start - mComposition->StartOffset() + length,
+             GetCommonReturnValueName(hr)));
   }
 
   VARIANT propValue;
@@ -3041,10 +3053,10 @@
 TSFTextStore::RestartCompositionIfNecessary(ITfRange* aRangeNew) {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::RestartCompositionIfNecessary("
-           "aRangeNew=0x%p), mComposition.mView=0x%p",
-           this, aRangeNew, mComposition.mView.get()));
+           "aRangeNew=0x%p), mComposition=%s",
+           this, aRangeNew, ToString(mComposition).c_str()));
 
-  if (!mComposition.IsComposing()) {
+  if (mComposition.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RestartCompositionIfNecessary() FAILED "
              "due to no composition view",
@@ -3053,7 +3065,7 @@
   }
 
   HRESULT hr;
-  RefPtr<ITfCompositionView> pComposition(mComposition.mView);
+  RefPtr<ITfCompositionView> pComposition(mComposition->GetView());
   RefPtr<ITfRange> composingRange(aRangeNew);
   if (!composingRange) {
     hr = pComposition->GetRange(getter_AddRefs(composingRange));
@@ -3077,25 +3089,28 @@
     return hr;
   }
 
+  if (mComposition->StartOffset() == compStart &&
+      mComposition->Length() == compLength) {
+    return S_OK;
+  }
+
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::RestartCompositionIfNecessary(), "
-           "range=%ld-%ld, mComposition={ mStart=%ld, mString.Length()=%lu }",
-           this, compStart, compStart + compLength, mComposition.mStart,
-           mComposition.mString.Length()));
-
-  if (mComposition.mStart != compStart ||
-      mComposition.mString.Length() != (ULONG)compLength) {
-    // If the queried composition length is different from the length
-    // of our composition string, OnUpdateComposition is being called
-    // because a part of the original composition was committed.
-    hr = RestartComposition(pComposition, composingRange);
-    if (FAILED(hr)) {
-      MOZ_LOG(sTextStoreLog, LogLevel::Error,
-              ("0x%p   TSFTextStore::RestartCompositionIfNecessary() "
-               "FAILED due to RestartComposition() failure",
-               this));
-      return hr;
-    }
+           "restaring composition because of compostion range is changed "
+           "(range=%ld-%ld, mComposition=%s)",
+           this, compStart, compStart + compLength,
+           ToString(mComposition).c_str()));
+
+  // If the queried composition length is different from the length
+  // of our composition string, OnUpdateComposition is being called
+  // because a part of the original composition was committed.
+  hr = RestartComposition(*mComposition, pComposition, composingRange);
+  if (FAILED(hr)) {
+    MOZ_LOG(sTextStoreLog, LogLevel::Error,
+            ("0x%p   TSFTextStore::RestartCompositionIfNecessary() "
+             "FAILED due to RestartComposition() failure",
+             this));
+    return hr;
   }
 
   MOZ_LOG(
@@ -3104,29 +3119,19 @@
   return S_OK;
 }
 
-HRESULT
-TSFTextStore::RestartComposition(ITfCompositionView* aCompositionView,
-                                 ITfRange* aNewRange) {
-  Selection& selectionForTSF = SelectionForTSFRef();
+HRESULT TSFTextStore::RestartComposition(Composition& aCurrentComposition,
+                                         ITfCompositionView* aCompositionView,
+                                         ITfRange* aNewRange) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
 
   LONG newStart, newLength;
   HRESULT hr = GetRangeExtent(aNewRange, &newStart, &newLength);
   LONG newEnd = newStart + newLength;
 
-  MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::RestartComposition(aCompositionView=0x%p, "
-           "aNewRange=0x%p { newStart=%d, newLength=%d }), "
-           "mComposition={ mStart=%d, mCompositionString.Length()=%d }, "
-           "selectionForTSF={ IsDirty()=%s, StartOffset()=%d, Length()=%d }",
-           this, aCompositionView, aNewRange, newStart, newLength,
-           mComposition.mStart, mComposition.mString.Length(),
-           GetBoolName(selectionForTSF.IsDirty()),
-           selectionForTSF.StartOffset(), selectionForTSF.Length()));
-
-  if (selectionForTSF.IsDirty()) {
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RestartComposition() FAILED "
-             "due to SelectionForTSFRef() failure",
+             "due to SelectionForTSF() failure",
              this));
     return E_FAIL;
   }
@@ -3142,53 +3147,67 @@
   // If the new range has no overlap with the crrent range, we just commit
   // the composition and restart new composition with the new range but
   // current selection range should be preserved.
-  if (newStart >= mComposition.EndOffset() || newEnd <= mComposition.mStart) {
+  if (newStart >= aCurrentComposition.EndOffset() ||
+      newEnd <= aCurrentComposition.StartOffset()) {
     RecordCompositionEndAction();
     RecordCompositionStartAction(aCompositionView, newStart, newLength, true);
     return S_OK;
   }
 
+  MOZ_LOG(
+      sTextStoreLog, LogLevel::Debug,
+      ("0x%p   TSFTextStore::RestartComposition(aCompositionView=0x%p, "
+       "aNewRange=0x%p { newStart=%d, newLength=%d }), aCurrentComposition=%s, "
+       "selectionForTSF=%s",
+       this, aCompositionView, aNewRange, newStart, newLength,
+       ToString(aCurrentComposition).c_str(),
+       ToString(selectionForTSF).c_str()));
+
   // If the new range has an overlap with the current one, we should not commit
   // the whole current range to avoid creating an odd undo transaction.
   // I.e., the overlapped range which is being composed should not appear in
   // undo transaction.
 
   // Backup current composition data and selection data.
-  Composition oldComposition = mComposition;
-  Selection oldSelection = selectionForTSF;
+  Composition oldComposition = aCurrentComposition;
+  Selection oldSelection = *selectionForTSF;
 
   // Commit only the part of composition.
-  LONG keepComposingStartOffset = std::max(mComposition.mStart, newStart);
-  LONG keepComposingEndOffset = std::min(mComposition.EndOffset(), newEnd);
+  LONG keepComposingStartOffset =
+      std::max(oldComposition.StartOffset(), newStart);
+  LONG keepComposingEndOffset = std::min(oldComposition.EndOffset(), newEnd);
   MOZ_ASSERT(
       keepComposingStartOffset <= keepComposingEndOffset,
       "Why keepComposingEndOffset is smaller than keepComposingStartOffset?");
   LONG keepComposingLength = keepComposingEndOffset - keepComposingStartOffset;
   // Remove the overlapped part from the commit string.
-  nsAutoString commitString(mComposition.mString);
-  commitString.Cut(keepComposingStartOffset - mComposition.mStart,
+  nsAutoString commitString(oldComposition.DataRef());
+  commitString.Cut(keepComposingStartOffset - oldComposition.StartOffset(),
                    keepComposingLength);
   // Update the composition string.
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RestartComposition() FAILED "
-             "due to ContentForTSFRef() failure",
+             "due to ContentForTSF() failure",
              this));
     return E_FAIL;
   }
-  contentForTSF.ReplaceTextWith(mComposition.mStart,
-                                mComposition.mString.Length(), commitString);
+  contentForTSF->ReplaceTextWith(oldComposition.StartOffset(),
+                                 oldComposition.Length(), commitString);
+  MOZ_ASSERT(mComposition.isSome());
   // Record a compositionupdate action for commit the part of composing string.
   PendingAction* action = LastOrNewPendingCompositionUpdate();
-  action->mData = mComposition.mString;
+  if (mComposition.isSome()) {
+    action->mData = mComposition->DataRef();
+  }
   action->mRanges->Clear();
   // Note that we shouldn't append ranges when composition string
   // is empty because it may cause TextComposition confused.
   if (!action->mData.IsEmpty()) {
     TextRange caretRange;
-    caretRange.mStartOffset = caretRange.mEndOffset =
-        uint32_t(oldComposition.mStart + commitString.Length());
+    caretRange.mStartOffset = caretRange.mEndOffset = static_cast<uint32_t>(
+        oldComposition.StartOffset() + commitString.Length());
     caretRange.mRangeType = TextRangeType::eCaret;
     action->mRanges->AppendElement(caretRange);
   }
@@ -3202,18 +3221,17 @@
   RecordCompositionStartAction(aCompositionView, newStart, 0, false);
 
   // Restore the latest text content and selection.
-  contentForTSF.ReplaceSelectedTextWith(nsDependentSubstring(
-      oldComposition.mString, keepComposingStartOffset - oldComposition.mStart,
+  contentForTSF->ReplaceSelectedTextWith(nsDependentSubstring(
+      oldComposition.DataRef(),
+      keepComposingStartOffset - oldComposition.StartOffset(),
       keepComposingLength));
-  selectionForTSF = oldSelection;
+  selectionForTSF = Some(oldSelection);
 
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::RestartComposition() succeeded, "
-           "mComposition={ mStart=%d, mCompositionString.Length()=%d }, "
-           "selectionForTSF={ IsDirty()=%s, StartOffset()=%d, Length()=%d }",
-           this, mComposition.mStart, mComposition.mString.Length(),
-           GetBoolName(selectionForTSF.IsDirty()),
-           selectionForTSF.StartOffset(), selectionForTSF.Length()));
+           "mComposition=%s, selectionForTSF=%s",
+           this, ToString(mComposition).c_str(),
+           ToString(selectionForTSF).c_str()));
 
   return S_OK;
 }
@@ -3261,15 +3279,12 @@
 
 HRESULT
 TSFTextStore::RecordCompositionUpdateAction() {
-  MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::RecordCompositionUpdateAction(), "
-           "mComposition={ mView=0x%p, mStart=%d, mString=\"%s\" "
-           "(Length()=%d) }",
-           this, mComposition.mView.get(), mComposition.mStart,
-           GetEscapedUTF8String(mComposition.mString).get(),
-           mComposition.mString.Length()));
+  MOZ_LOG(
+      sTextStoreLog, LogLevel::Debug,
+      ("0x%p   TSFTextStore::RecordCompositionUpdateAction(), mComposition=%s",
+       this, ToString(mComposition).c_str()));
 
-  if (!mComposition.IsComposing()) {
+  if (mComposition.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionUpdateAction() FAILED "
              "due to no composition view",
@@ -3297,11 +3312,11 @@
   }
 
   RefPtr<ITfRange> composingRange;
-  hr = mComposition.mView->GetRange(getter_AddRefs(composingRange));
+  hr = mComposition->GetView()->GetRange(getter_AddRefs(composingRange));
   if (FAILED(hr)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionUpdateAction() "
-             "FAILED due to mComposition.mView->GetRange() failure",
+             "FAILED due to mComposition->GetView()->GetRange() failure",
              this));
     return hr;
   }
@@ -3318,17 +3333,17 @@
   }
 
   // First, put the log of content and selection here.
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionUpdateAction() FAILED "
-             "due to SelectionForTSFRef() failure",
+             "due to SelectionForTSF() failure",
              this));
     return E_FAIL;
   }
 
   PendingAction* action = LastOrNewPendingCompositionUpdate();
-  action->mData = mComposition.mString;
+  action->mData = mComposition->DataRef();
   // The ranges might already have been initialized, however, if this is
   // called again, that means we need to overwrite the ranges with current
   // information.
@@ -3357,18 +3372,18 @@
       }
       // The range may include out of composition string.  We should ignore
       // outside of the composition string.
-      LONG start = std::min(std::max(rangeStart, mComposition.mStart),
-                            mComposition.EndOffset());
-      LONG end =
-          std::max(std::min(rangeStart + rangeLength, mComposition.EndOffset()),
-                   mComposition.mStart);
+      LONG start = std::min(std::max(rangeStart, mComposition->StartOffset()),
+                            mComposition->EndOffset());
+      LONG end = std::max(
+          std::min(rangeStart + rangeLength, mComposition->EndOffset()),
+          mComposition->StartOffset());
       LONG length = end - start;
       if (length < 0) {
         MOZ_LOG(sTextStoreLog, LogLevel::Error,
                 ("0x%p   TSFTextStore::RecordCompositionUpdateAction() "
                  "ignores invalid range (%d-%d)",
-                 this, rangeStart - mComposition.mStart,
-                 rangeStart - mComposition.mStart + rangeLength));
+                 this, rangeStart - mComposition->StartOffset(),
+                 rangeStart - mComposition->StartOffset() + rangeLength));
         continue;
       }
       if (!length) {
@@ -3376,16 +3391,17 @@
                 ("0x%p   TSFTextStore::RecordCompositionUpdateAction() "
                  "ignores a range due to outside of the composition or empty "
                  "(%d-%d)",
-                 this, rangeStart - mComposition.mStart,
-                 rangeStart - mComposition.mStart + rangeLength));
+                 this, rangeStart - mComposition->StartOffset(),
+                 rangeStart - mComposition->StartOffset() + rangeLength));
         continue;
       }
 
       TextRange newRange;
-      newRange.mStartOffset = uint32_t(start - mComposition.mStart);
+      newRange.mStartOffset =
+          static_cast<uint32_t>(start - mComposition->StartOffset());
       // The end of the last range in the array is
       // always kept at the end of composition
-      newRange.mEndOffset = mComposition.mString.Length();
+      newRange.mEndOffset = mComposition->Length();
 
       TF_DISPLAYATTRIBUTE attr;
       hr = GetDisplayAttribute(attrPropetry, range, &attr);
@@ -3431,12 +3447,12 @@
     // covers the composition string,  however, Gecko doesn't support the wide
     // caret drawing now (Gecko doesn't support XOR drawing), unfortunately.
     // For now, we should change the range style to undefined.
-    if (!selectionForTSF.IsCollapsed() && action->mRanges->Length() == 1) {
+    if (!selectionForTSF->Collapsed() && action->mRanges->Length() == 1) {
       TextRange& range = action->mRanges->ElementAt(0);
-      LONG start = selectionForTSF.MinOffset();
-      LONG end = selectionForTSF.MaxOffset();
-      if ((LONG)range.mStartOffset == start - mComposition.mStart &&
-          (LONG)range.mEndOffset == end - mComposition.mStart &&
+      LONG start = selectionForTSF->MinOffset();
+      LONG end = selectionForTSF->MaxOffset();
+      if (range.mStartOffset == start - mComposition->StartOffset() &&
+          range.mEndOffset == end - mComposition->StartOffset() &&
           range.mRangeStyle.IsNoChangeStyle()) {
         range.mRangeStyle.Clear();
         // The looks of selected type is better than others.
@@ -3445,8 +3461,8 @@
     }
 
     // The caret position has to be collapsed.
-    uint32_t caretPosition = static_cast<uint32_t>(selectionForTSF.MaxOffset() -
-                                                   mComposition.mStart);
+    uint32_t caretPosition = static_cast<uint32_t>(
+        selectionForTSF->MaxOffset() - mComposition->StartOffset());
 
     // If caret is in the target clause and it doesn't have specific style,
     // the target clause will be painted as normal selection range.  Since
@@ -3476,23 +3492,21 @@
 HRESULT
 TSFTextStore::SetSelectionInternal(const TS_SELECTION_ACP* pSelection,
                                    bool aDispatchCompositionChangeEvent) {
-  MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::SetSelectionInternal(pSelection={ "
-           "acpStart=%ld, acpEnd=%ld, style={ ase=%s, fInterimChar=%s} }, "
-           "aDispatchCompositionChangeEvent=%s), mComposition.IsComposing()=%s",
-           this, pSelection->acpStart, pSelection->acpEnd,
-           GetActiveSelEndName(pSelection->style.ase),
-           GetBoolName(pSelection->style.fInterimChar),
-           GetBoolName(aDispatchCompositionChangeEvent),
-           GetBoolName(mComposition.IsComposing())));
+  MOZ_LOG(
+      sTextStoreLog, LogLevel::Debug,
+      ("0x%p   TSFTextStore::SetSelectionInternal(pSelection=%s, "
+       "aDispatchCompositionChangeEvent=%s), mComposition=%s",
+       this, pSelection ? mozilla::ToString(*pSelection).c_str() : "nullptr",
+       GetBoolName(aDispatchCompositionChangeEvent),
+       ToString(mComposition).c_str()));
 
   MOZ_ASSERT(IsReadWriteLocked());
 
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::SetSelectionInternal() FAILED due to "
-             "SelectionForTSFRef() failure",
+             "SelectionForTSF() failure",
              this));
     return E_FAIL;
   }
@@ -3509,16 +3523,16 @@
   // If actually the range is not changing, we should do nothing.
   // Perhaps, we can ignore the difference change because it must not be
   // important for following edit.
-  if (selectionForTSF.EqualsExceptDirection(*pSelection)) {
+  if (selectionForTSF->EqualsExceptDirection(*pSelection)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Warning,
             ("0x%p   TSFTextStore::SetSelectionInternal() Succeeded but "
              "did nothing because the selection range isn't changing",
              this));
-    selectionForTSF.SetSelection(*pSelection);
+    selectionForTSF->SetSelection(*pSelection);
     return S_OK;
   }
 
-  if (mComposition.IsComposing()) {
+  if (mComposition.isSome()) {
     if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RestartCompositionIfNecessary();
       if (FAILED(hr)) {
@@ -3529,8 +3543,8 @@
         return hr;
       }
     }
-    if (pSelection->acpStart < mComposition.mStart ||
-        pSelection->acpEnd > mComposition.EndOffset()) {
+    if (pSelection->acpStart < mComposition->StartOffset() ||
+        pSelection->acpEnd > mComposition->EndOffset()) {
       MOZ_LOG(sTextStoreLog, LogLevel::Error,
               ("0x%p   TSFTextStore::SetSelectionInternal() FAILED due to "
                "the selection being out of the composition string",
@@ -3538,7 +3552,7 @@
       return TS_E_INVALIDPOS;
     }
     // Emulate selection during compositions
-    selectionForTSF.SetSelection(*pSelection);
+    selectionForTSF->SetSelection(*pSelection);
     if (aDispatchCompositionChangeEvent) {
       HRESULT hr = RecordCompositionUpdateAction();
       if (FAILED(hr)) {
@@ -3557,7 +3571,7 @@
   // If mContentForTSF caches old contents which is now different from
   // actual contents, we need some complicated hack here...
   // Note that this hack assumes that this is used for reconversion.
-  if (mContentForTSF.IsInitialized() && mPendingTextChangeData.IsValid() &&
+  if (mContentForTSF.isSome() && mPendingTextChangeData.IsValid() &&
       !mPendingTextChangeData.mCausedOnlyByComposition) {
     uint32_t startOffset = static_cast<uint32_t>(selectionInContent.acpStart);
     uint32_t endOffset = static_cast<uint32_t>(selectionInContent.acpEnd);
@@ -3596,7 +3610,7 @@
   action->mSelectionReversed = (selectionInContent.style.ase == TS_AE_START);
 
   // Use TSF specified selection for updating mSelectionForTSF.
-  selectionForTSF.SetSelection(*pSelection);
+  selectionForTSF->SetSelection(*pSelection);
 
   return S_OK;
 }
@@ -3604,14 +3618,11 @@
 STDMETHODIMP
 TSFTextStore::SetSelection(ULONG ulCount, const TS_SELECTION_ACP* pSelection) {
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
-          ("0x%p TSFTextStore::SetSelection(ulCount=%lu, pSelection=%p { "
-           "acpStart=%ld, acpEnd=%ld, style={ ase=%s, fInterimChar=%s } }), "
-           "mComposition.IsComposing()=%s",
-           this, ulCount, pSelection, pSelection ? pSelection->acpStart : 0,
-           pSelection ? pSelection->acpEnd : 0,
-           pSelection ? GetActiveSelEndName(pSelection->style.ase) : "",
-           pSelection ? GetBoolName(pSelection->style.fInterimChar) : "",
-           GetBoolName(mComposition.IsComposing())));
+          ("0x%p TSFTextStore::SetSelection(ulCount=%lu, pSelection=%s }), "
+           "mComposition=%s",
+           this, ulCount,
+           pSelection ? mozilla::ToString(pSelection).c_str() : "nullptr",
+           ToString(mComposition).c_str()));
 
   if (!IsReadWriteLocked()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -3657,11 +3668,9 @@
       sTextStoreLog, LogLevel::Info,
       ("0x%p TSFTextStore::GetText(acpStart=%ld, acpEnd=%ld, pchPlain=0x%p, "
        "cchPlainReq=%lu, pcchPlainOut=0x%p, prgRunInfo=0x%p, ulRunInfoReq=%lu, "
-       "pulRunInfoOut=0x%p, pacpNext=0x%p), mComposition={ mStart=%ld, "
-       "mString.Length()=%lu, IsComposing()=%s }",
+       "pulRunInfoOut=0x%p, pacpNext=0x%p), mComposition=%s",
        this, acpStart, acpEnd, pchPlain, cchPlainReq, pcchPlainOut, prgRunInfo,
-       ulRunInfoReq, pulRunInfoOut, pacpNext, mComposition.mStart,
-       mComposition.mString.Length(), GetBoolName(mComposition.IsComposing())));
+       ulRunInfoReq, pulRunInfoOut, pacpNext, ToString(mComposition).c_str()));
 
   if (!IsReadLocked()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -3698,15 +3707,15 @@
     prgRunInfo->type = TS_RT_PLAIN;
   }
 
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetText() FAILED due to "
-             "ContentForTSFRef() failure",
+             "ContentForTSF() failure",
              this));
     return E_FAIL;
   }
-  if (contentForTSF.Text().Length() < static_cast<uint32_t>(acpStart)) {
+  if (contentForTSF->TextRef().Length() < static_cast<uint32_t>(acpStart)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetText() FAILED due to "
              "acpStart is larger offset than the actual text length",
@@ -3714,14 +3723,14 @@
     return TS_E_INVALIDPOS;
   }
   if (acpEnd != -1 &&
-      contentForTSF.Text().Length() < static_cast<uint32_t>(acpEnd)) {
+      contentForTSF->TextRef().Length() < static_cast<uint32_t>(acpEnd)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetText() FAILED due to "
              "acpEnd is larger offset than the actual text length",
              this));
     return TS_E_INVALIDPOS;
   }
-  uint32_t length = (acpEnd == -1) ? contentForTSF.Text().Length() -
+  uint32_t length = (acpEnd == -1) ? contentForTSF->TextRef().Length() -
                                          static_cast<uint32_t>(acpStart)
                                    : static_cast<uint32_t>(acpEnd - acpStart);
   if (cchPlainReq && cchPlainReq - 1 < length) {
@@ -3730,7 +3739,7 @@
   if (length) {
     if (pchPlain && cchPlainReq) {
       const char16_t* startChar =
-          contentForTSF.Text().BeginReading() + acpStart;
+          contentForTSF->TextRef().BeginReading() + acpStart;
       memcpy(pchPlain, startChar, length * sizeof(*pchPlain));
       pchPlain[length] = 0;
       *pcchPlainOut = length;
@@ -3758,13 +3767,12 @@
                       const WCHAR* pchText, ULONG cch, TS_TEXTCHANGE* pChange) {
   MOZ_LOG(
       sTextStoreLog, LogLevel::Info,
-      ("0x%p TSFTextStore::SetText(dwFlags=%s, acpStart=%ld, "
-       "acpEnd=%ld, pchText=0x%p \"%s\", cch=%lu, pChange=0x%p), "
-       "mComposition.IsComposing()=%s",
+      ("0x%p TSFTextStore::SetText(dwFlags=%s, acpStart=%ld, acpEnd=%ld, "
+       "pchText=0x%p \"%s\", cch=%lu, pChange=0x%p), mComposition=%s",
        this, dwFlags == TS_ST_CORRECTION ? "TS_ST_CORRECTION" : "not-specified",
        acpStart, acpEnd, pchText,
        pchText && cch ? GetEscapedUTF8String(pchText, cch).get() : "", cch,
-       pChange, GetBoolName(mComposition.IsComposing())));
+       pChange, ToString(mComposition).c_str()));
 
   // Per SDK documentation, and since we don't have better
   // ways to do this, this method acts as a helper to
@@ -4092,21 +4100,21 @@
           break;
         }
         case eTextVerticalWriting: {
-          Selection& selectionForTSF = SelectionForTSFRef();
+          Maybe<Selection>& selectionForTSF = SelectionForTSF();
           paAttrVals[count].varValue.vt = VT_BOOL;
           paAttrVals[count].varValue.boolVal =
-              !selectionForTSF.IsDirty() &&
-                      selectionForTSF.GetWritingMode().IsVertical()
+              selectionForTSF.isSome() &&
+                      selectionForTSF->GetWritingMode().IsVertical()
                   ? VARIANT_TRUE
                   : VARIANT_FALSE;
           break;
         }
         case eTextOrientation: {
-          Selection& selectionForTSF = SelectionForTSFRef();
+          Maybe<Selection>& selectionForTSF = SelectionForTSF();
           paAttrVals[count].varValue.vt = VT_I4;
           paAttrVals[count].varValue.lVal =
-              !selectionForTSF.IsDirty() &&
-                      selectionForTSF.GetWritingMode().IsVertical()
+              selectionForTSF.isSome() &&
+                      selectionForTSF->GetWritingMode().IsVertical()
                   ? 2700
                   : 0;
           break;
@@ -4158,15 +4166,15 @@
     return E_INVALIDARG;
   }
 
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetEndACP() FAILED due to "
-             "ContentForTSFRef() failure",
+             "ContentForTSF() failure",
              this));
     return E_FAIL;
   }
-  *pacp = static_cast<LONG>(contentForTSF.Text().Length());
+  *pacp = static_cast<LONG>(contentForTSF->TextRef().Length());
   return S_OK;
 }
 
@@ -4236,7 +4244,8 @@
 
   mWaitingQueryLayout = false;
 
-  if (mDestroyed || mContentForTSF.IsLayoutChanged()) {
+  if (mDestroyed ||
+      (mContentForTSF.isSome() && mContentForTSF->IsLayoutChanged())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetACPFromPoint() returned "
              "TS_E_NOLAYOUT",
@@ -4252,13 +4261,14 @@
   // NOTE: Don't check if the point is in the widget since the point can be
   //       outside of the widget if focused editor is in a XUL <panel>.
 
-  WidgetQueryContentEvent charAtPt(true, eQueryCharacterAtPoint, mWidget);
-  mWidget->InitEvent(charAtPt, &ourPt);
+  WidgetQueryContentEvent queryCharAtPointEvent(true, eQueryCharacterAtPoint,
+                                                mWidget);
+  mWidget->InitEvent(queryCharAtPointEvent, &ourPt);
 
   // FYI: WidgetQueryContentEvent may cause flushing pending layout and it
   //      may cause focus change or something.
   RefPtr<TSFTextStore> kungFuDeathGrip(this);
-  DispatchEvent(charAtPt);
+  DispatchEvent(queryCharAtPointEvent);
   if (!mWidget || mWidget->Destroyed()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetACPFromPoint() FAILED due to "
@@ -4268,12 +4278,11 @@
   }
 
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::GetACPFromPoint(), charAtPt={ "
-           "mSucceeded=%s, mReply={ mOffset=%u, mTentativeCaretOffset=%u }}",
-           this, GetBoolName(charAtPt.mSucceeded), charAtPt.mReply.mOffset,
-           charAtPt.mReply.mTentativeCaretOffset));
+          ("0x%p   TSFTextStore::GetACPFromPoint(), queryCharAtPointEvent={ "
+           "mReply=%s }",
+           this, ToString(queryCharAtPointEvent.mReply).c_str()));
 
-  if (NS_WARN_IF(!charAtPt.mSucceeded)) {
+  if (NS_WARN_IF(queryCharAtPointEvent.Failed())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetACPFromPoint() FAILED due to "
              "eQueryCharacterAtPoint failure",
@@ -4283,8 +4292,7 @@
 
   // If dwFlags isn't set and the point isn't in any character's bounding box,
   // we should return TS_E_INVALIDPOINT.
-  if (!(dwFlags & GXFPF_NEAREST) &&
-      charAtPt.mReply.mOffset == WidgetQueryContentEvent::NOT_FOUND) {
+  if (!(dwFlags & GXFPF_NEAREST) && queryCharAtPointEvent.DidNotFindChar()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetACPFromPoint() FAILED due to the "
              "point contained by no bounding box",
@@ -4294,21 +4302,19 @@
 
   // Although, we're not sure if mTentativeCaretOffset becomes NOT_FOUND,
   // let's assume that there is no content in such case.
-  if (NS_WARN_IF(charAtPt.mReply.mTentativeCaretOffset ==
-                 WidgetQueryContentEvent::NOT_FOUND)) {
-    charAtPt.mReply.mTentativeCaretOffset = 0;
-  }
+  NS_WARNING_ASSERTION(queryCharAtPointEvent.DidNotFindTentativeCaretOffset(),
+                       "Tentative caret offset was not found");
 
   uint32_t offset;
 
   // If dwFlags includes GXFPF_ROUND_NEAREST, we should return tentative
   // caret offset (MSDN calls it "range position").
   if (dwFlags & GXFPF_ROUND_NEAREST) {
-    offset = charAtPt.mReply.mTentativeCaretOffset;
-  } else if (charAtPt.mReply.mOffset != WidgetQueryContentEvent::NOT_FOUND) {
+    offset = queryCharAtPointEvent.mReply->mTentativeCaretOffset.valueOr(0);
+  } else if (queryCharAtPointEvent.FoundChar()) {
     // Otherwise, we should return character offset whose bounding box contains
     // the point.
-    offset = charAtPt.mReply.mOffset;
+    offset = queryCharAtPointEvent.mReply->StartOffset();
   } else {
     // If the point isn't in any character's bounding box but we need to return
     // the nearest character from the point, we should *guess* the character
@@ -4318,22 +4324,22 @@
     //     However, dispatching 2 eQueryTextRect may be expensive.
 
     // So, use tentative offset for now.
-    offset = charAtPt.mReply.mTentativeCaretOffset;
+    offset = queryCharAtPointEvent.mReply->mTentativeCaretOffset.valueOr(0);
 
     // However, if it's after the last character, we need to decrement the
     // offset.
-    Content& contentForTSF = ContentForTSFRef();
-    if (!contentForTSF.IsInitialized()) {
+    Maybe<Content>& contentForTSF = ContentForTSF();
+    if (contentForTSF.isNothing()) {
       MOZ_LOG(sTextStoreLog, LogLevel::Error,
               ("0x%p   TSFTextStore::GetACPFromPoint() FAILED due to "
-               "ContentForTSFRef() failure",
+               "ContentForTSF() failure",
                this));
       return E_FAIL;
     }
-    if (contentForTSF.Text().Length() <= offset) {
+    if (contentForTSF->TextRef().Length() <= offset) {
       // If the tentative caret is after the last character, let's return
       // the last character's offset.
-      offset = contentForTSF.Text().Length() - 1;
+      offset = contentForTSF->TextRef().Length() - 1;
     }
   }
 
@@ -4355,29 +4361,20 @@
 STDMETHODIMP
 TSFTextStore::GetTextExt(TsViewCookie vcView, LONG acpStart, LONG acpEnd,
                          RECT* prc, BOOL* pfClipped) {
-  MOZ_LOG(
-      sTextStoreLog, LogLevel::Info,
-      ("0x%p TSFTextStore::GetTextExt(vcView=%ld, "
-       "acpStart=%ld, acpEnd=%ld, prc=0x%p, pfClipped=0x%p), "
-       "IsHandlingComposition()=%s, "
-       "mContentForTSF={ MinOffsetOfLayoutChanged()=%u, "
-       "LatestCompositionStartOffset()=%d, LatestCompositionEndOffset()=%d }, "
-       "mComposition= { IsComposing()=%s, mStart=%d, EndOffset()=%d }, "
-       "mDeferNotifyingTSF=%s, mWaitingQueryLayout=%s, "
-       "IMEHandler::IsA11yHandlingNativeCaret()=%s",
-       this, vcView, acpStart, acpEnd, prc, pfClipped,
-       GetBoolName(IsHandlingComposition()),
-       mContentForTSF.MinOffsetOfLayoutChanged(),
-       mContentForTSF.HasOrHadComposition()
-           ? mContentForTSF.LatestCompositionStartOffset()
-           : -1,
-       mContentForTSF.HasOrHadComposition()
-           ? mContentForTSF.LatestCompositionEndOffset()
-           : -1,
-       GetBoolName(mComposition.IsComposing()), mComposition.mStart,
-       mComposition.EndOffset(), GetBoolName(mDeferNotifyingTSF),
-       GetBoolName(mWaitingQueryLayout),
-       GetBoolName(IMEHandler::IsA11yHandlingNativeCaret())));
+  MOZ_LOG(sTextStoreLog, LogLevel::Info,
+          ("0x%p TSFTextStore::GetTextExt(vcView=%ld, "
+           "acpStart=%ld, acpEnd=%ld, prc=0x%p, pfClipped=0x%p), "
+           "IsHandlingCompositionInParent()=%s, "
+           "IsHandlingCompositionInContent()=%s, mContentForTSF=%s, "
+           "mSelectionForTSF=%s, mComposition=%s, mDeferNotifyingTSF=%s, "
+           "mWaitingQueryLayout=%s, IMEHandler::IsA11yHandlingNativeCaret()=%s",
+           this, vcView, acpStart, acpEnd, prc, pfClipped,
+           GetBoolName(IsHandlingCompositionInParent()),
+           GetBoolName(IsHandlingCompositionInContent()),
+           mozilla::ToString(mContentForTSF).c_str(),
+           ToString(mSelectionForTSF).c_str(), ToString(mComposition).c_str(),
+           GetBoolName(mDeferNotifyingTSF), GetBoolName(mWaitingQueryLayout),
+           GetBoolName(IMEHandler::IsA11yHandlingNativeCaret())));
 
   if (!IsReadLocked()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -4423,14 +4420,16 @@
 
   mWaitingQueryLayout = false;
 
-  if (IsHandlingComposition() && mContentForTSF.HasOrHadComposition() &&
-      mContentForTSF.IsLayoutChanged() &&
-      mContentForTSF.MinOffsetOfLayoutChanged() > LONG_MAX) {
+  if (IsHandlingCompositionInContent() && mContentForTSF.isSome() &&
+      mContentForTSF->HasOrHadComposition() &&
+      mContentForTSF->IsLayoutChanged() &&
+      mContentForTSF->MinModifiedOffset().value() >
+          static_cast<uint32_t>(LONG_MAX)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetTextExt(), FAILED due to the text "
              "is too big for TSF (cannot treat modified offset as LONG), "
-             "mContentForTSF.MinOffsetOfLayoutChanged()=%u",
-             this, mContentForTSF.MinOffsetOfLayoutChanged()));
+             "mContentForTSF=%s",
+             this, ToString(mContentForTSF).c_str()));
     return E_FAIL;
   }
 
@@ -4440,7 +4439,7 @@
   // and all TIPs are aware of TS_E_NOLAYOUT result, we need to keep returning
   // S_OK and available rectangle only for them.
   if (!MaybeHackNoErrorLayoutBugs(acpStart, acpEnd) &&
-      mContentForTSF.IsLayoutChangedAt(acpEnd)) {
+      mContentForTSF.isSome() && mContentForTSF->IsLayoutChangedAt(acpEnd)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetTextExt() returned TS_E_NOLAYOUT "
              "(acpEnd=%d)",
@@ -4459,31 +4458,32 @@
   }
 
   // use eQueryTextRect to get rect in system, screen coordinates
-  WidgetQueryContentEvent event(true, eQueryTextRect, mWidget);
-  mWidget->InitEvent(event);
+  WidgetQueryContentEvent queryTextRectEvent(true, eQueryTextRect, mWidget);
+  mWidget->InitEvent(queryTextRectEvent);
 
   WidgetQueryContentEvent::Options options;
   int64_t startOffset = acpStart;
-  if (mComposition.IsComposing()) {
+  if (mComposition.isSome()) {
     // If there is a composition, TSF must want character rects related to
     // the composition.  Therefore, we should use insertion point relative
     // query because the composition might be at different position from
     // the position where TSFTextStore believes it at.
     options.mRelativeToInsertionPoint = true;
-    startOffset -= mComposition.mStart;
-  } else if (IsHandlingComposition() && mContentForTSF.HasOrHadComposition()) {
-    // If there was a composition and it hasn't been committed in the content
+    startOffset -= mComposition->StartOffset();
+  } else if (IsHandlingCompositionInParent() && mContentForTSF.isSome() &&
+             mContentForTSF->HasOrHadComposition()) {
+    // If there was a composition and its commit event hasn't been dispatched
     // yet, ContentCacheInParent is still open for relative offset query from
     // the latest composition.
     options.mRelativeToInsertionPoint = true;
-    startOffset -= mContentForTSF.LatestCompositionStartOffset();
+    startOffset -= mContentForTSF->LatestCompositionRange()->StartOffset();
   } else if (!CanAccessActualContentDirectly()) {
     // If TSF/TIP cannot access actual content directly, there may be pending
     // text and/or selection changes which have not been notified TSF yet.
     // Therefore, we should use relative to insertion point query since
     // TSF/TIP computes the offset from the cached selection.
     options.mRelativeToInsertionPoint = true;
-    startOffset -= mSelectionForTSF.StartOffset();
+    startOffset -= mSelectionForTSF->StartOffset();
   }
   // ContentEventHandler and ContentCache return actual caret rect when
   // the queried range is collapsed and selection is collapsed at the
@@ -4492,10 +4492,10 @@
   // case, users see "dancing" of candidate or suggest window of TIP.
   // For preventing it, we should query text rect with at least 1 length.
   uint32_t length = std::max(static_cast<int32_t>(acpEnd - acpStart), 1);
-  event.InitForQueryTextRect(startOffset, length, options);
+  queryTextRectEvent.InitForQueryTextRect(startOffset, length, options);
 
-  DispatchEvent(event);
-  if (NS_WARN_IF(!event.mSucceeded)) {
+  DispatchEvent(queryTextRectEvent);
+  if (NS_WARN_IF(queryTextRectEvent.Failed())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetTextExt() FAILED due to "
              "eQueryTextRect failure",
@@ -4504,12 +4504,18 @@
   }
 
   // IMEs don't like empty rects, fix here
-  if (event.mReply.mRect.Width() <= 0) event.mReply.mRect.SetWidth(1);
-  if (event.mReply.mRect.Height() <= 0) event.mReply.mRect.SetHeight(1);
+  if (queryTextRectEvent.mReply->mRect.Width() <= 0) {
+    queryTextRectEvent.mReply->mRect.SetWidth(1);
+  }
+  if (queryTextRectEvent.mReply->mRect.Height() <= 0) {
+    queryTextRectEvent.mReply->mRect.SetHeight(1);
+  }
 
   // convert to unclipped screen rect
-  nsWindow* refWindow = static_cast<nsWindow*>(
-      event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWidget);
+  nsWindow* refWindow =
+      static_cast<nsWindow*>(!!queryTextRectEvent.mReply->mFocusedWidget
+                                 ? queryTextRectEvent.mReply->mFocusedWidget
+                                 : static_cast<nsIWidget*>(mWidget.get()));
   // Result rect is in top level widget coordinates
   refWindow = refWindow->GetTopLevelWindow(false);
   if (!refWindow) {
@@ -4520,7 +4526,7 @@
     return E_FAIL;
   }
 
-  event.mReply.mRect.MoveBy(refWindow->WidgetToScreenOffset());
+  queryTextRectEvent.mReply->mRect.MoveBy(refWindow->WidgetToScreenOffset());
 
   // get bounding screen rect to test for clipping
   if (!GetScreenExtInternal(*prc)) {
@@ -4533,8 +4539,10 @@
 
   // clip text rect to bounding rect
   RECT textRect;
-  ::SetRect(&textRect, event.mReply.mRect.X(), event.mReply.mRect.Y(),
-            event.mReply.mRect.XMost(), event.mReply.mRect.YMost());
+  ::SetRect(&textRect, queryTextRectEvent.mReply->mRect.X(),
+            queryTextRectEvent.mReply->mRect.Y(),
+            queryTextRectEvent.mReply->mRect.XMost(),
+            queryTextRectEvent.mReply->mRect.YMost());
   if (!::IntersectRect(prc, prc, &textRect))
     // Text is not visible
     ::SetRectEmpty(prc);
@@ -4554,9 +4562,9 @@
   if (!IMEHandler::IsA11yHandlingNativeCaret() &&
       TSFPrefs::NeedToCreateNativeCaretForLegacyATOK() &&
       TSFStaticSink::IsATOKReferringNativeCaretActive() &&
-      mComposition.IsComposing() && mComposition.mStart <= acpStart &&
-      mComposition.EndOffset() >= acpStart && mComposition.mStart <= acpEnd &&
-      mComposition.EndOffset() >= acpEnd) {
+      mComposition.isSome() &&
+      mComposition->IsOffsetInRangeOrEndOffset(acpStart) &&
+      mComposition->IsOffsetInRangeOrEndOffset(acpEnd)) {
     CreateNativeCaret();
   }
 
@@ -4585,17 +4593,18 @@
   // TS_E_NOLAYOUT correctly in this case. See:
   // https://github.com/google/mozc/blob/6b878e31fb6ac4347dc9dfd8ccc1080fe718479f/src/win32/tip/tip_range_util.cc#L237-L257
 
-  if (!IsHandlingComposition() || !mContentForTSF.HasOrHadComposition() ||
-      !mContentForTSF.IsLayoutChangedAt(aACPEnd)) {
+  if (!IsHandlingCompositionInContent() || mContentForTSF.isNothing() ||
+      !mContentForTSF->HasOrHadComposition() ||
+      !mContentForTSF->IsLayoutChangedAt(aACPEnd)) {
     return false;
   }
 
-  MOZ_ASSERT(!mComposition.IsComposing() ||
-             mComposition.mStart ==
-                 mContentForTSF.LatestCompositionStartOffset());
-  MOZ_ASSERT(!mComposition.IsComposing() ||
-             mComposition.EndOffset() ==
-                 mContentForTSF.LatestCompositionEndOffset());
+  MOZ_ASSERT(mComposition.isNothing() ||
+             mComposition->StartOffset() ==
+                 mContentForTSF->LatestCompositionRange()->StartOffset());
+  MOZ_ASSERT(mComposition.isNothing() ||
+             mComposition->EndOffset() ==
+                 mContentForTSF->LatestCompositionRange()->EndOffset());
 
   // If TSF does not have the bug, we need to hack only with a few TIPs.
   static const bool sAlllowToStopHackingIfFine =
@@ -4605,7 +4614,7 @@
   // We need to compute active TIP now.  This may take a couple of milliseconds,
   // however, it'll be cached, so, must be faster than check active TIP every
   // GetTextExt() calls.
-  const Selection& selectionForTSF = SelectionForTSFRef();
+  const Maybe<Selection>& selectionForTSF = SelectionForTSF();
   switch (TSFStaticSink::ActiveTIP()) {
     // MS IME for Japanese doesn't support asynchronous handling at deciding
     // its suggest list window position.  The feature was implemented
@@ -4633,10 +4642,11 @@
       // before unlocking the document.  In such case, we should return the
       // nearest character rect.
       if (TSFPrefs::DoNotReturnNoLayoutErrorToMSJapaneseIMEAtCaret() &&
-          aACPStart == aACPEnd && selectionForTSF.IsCollapsed() &&
-          selectionForTSF.EndOffset() == aACPEnd) {
+          selectionForTSF.isSome() && aACPStart == aACPEnd &&
+          selectionForTSF->Collapsed() &&
+          selectionForTSF->EndOffset() == aACPEnd) {
         int32_t minOffsetOfLayoutChanged =
-            static_cast<int32_t>(mContentForTSF.MinOffsetOfLayoutChanged());
+            static_cast<int32_t>(mContentForTSF->MinModifiedOffset().value());
         aACPEnd = aACPStart = std::max(minOffsetOfLayoutChanged - 1, 0);
       } else {
         return false;
@@ -4662,10 +4672,11 @@
       // caret rect immediately after modifying the composition string but
       // before unlocking the document.  In such case, we should return the
       // nearest character rect.
-      else if (aACPStart == aACPEnd && selectionForTSF.IsCollapsed() &&
-               selectionForTSF.EndOffset() == aACPEnd) {
+      else if (aACPStart == aACPEnd && selectionForTSF.isSome() &&
+               selectionForTSF->Collapsed() &&
+               selectionForTSF->EndOffset() == aACPEnd) {
         int32_t minOffsetOfLayoutChanged =
-            static_cast<int32_t>(mContentForTSF.MinOffsetOfLayoutChanged());
+            static_cast<int32_t>(mContentForTSF->MinModifiedOffset().value());
         aACPEnd = aACPStart = std::max(minOffsetOfLayoutChanged - 1, 0);
       } else {
         return false;
@@ -4712,10 +4723,10 @@
       }
       // If the range is in the composition string, we should return rectangle
       // in it as far as possible.
-      if (aACPStart < mContentForTSF.LatestCompositionStartOffset() ||
-          aACPStart > mContentForTSF.LatestCompositionEndOffset() ||
-          aACPEnd < mContentForTSF.LatestCompositionStartOffset() ||
-          aACPEnd > mContentForTSF.LatestCompositionEndOffset()) {
+      if (!mContentForTSF->LatestCompositionRange()->IsOffsetInRangeOrEndOffset(
+              aACPStart) ||
+          !mContentForTSF->LatestCompositionRange()->IsOffsetInRangeOrEndOffset(
+              aACPEnd)) {
         return false;
       }
       break;
@@ -4729,10 +4740,10 @@
               DoNotReturnNoLayoutErrorToJapanist10OfCompositionString()) {
         return false;
       }
-      if (aACPStart < mContentForTSF.LatestCompositionStartOffset() ||
-          aACPStart > mContentForTSF.LatestCompositionEndOffset() ||
-          aACPEnd < mContentForTSF.LatestCompositionStartOffset() ||
-          aACPEnd > mContentForTSF.LatestCompositionEndOffset()) {
+      if (!mContentForTSF->LatestCompositionRange()->IsOffsetInRangeOrEndOffset(
+              aACPStart) ||
+          !mContentForTSF->LatestCompositionRange()->IsOffsetInRangeOrEndOffset(
+              aACPEnd)) {
         return false;
       }
       break;
@@ -4746,7 +4757,7 @@
       if (!TSFPrefs::DoNotReturnNoLayoutErrorToFreeChangJie()) {
         return false;
       }
-      aACPEnd = mContentForTSF.LatestCompositionStartOffset();
+      aACPEnd = mContentForTSF->LatestCompositionRange()->StartOffset();
       aACPStart = std::min(aACPStart, aACPEnd);
       break;
     // Some Traditional Chinese TIPs of Microsoft don't show candidate window
@@ -4761,7 +4772,7 @@
           !TSFPrefs::DoNotReturnNoLayoutErrorToMSTraditionalTIP()) {
         return false;
       }
-      aACPEnd = mContentForTSF.LatestCompositionStartOffset();
+      aACPEnd = mContentForTSF->LatestCompositionRange()->StartOffset();
       aACPStart = std::min(aACPStart, aACPEnd);
       break;
     // Some Simplified Chinese TIPs of Microsoft don't show candidate window
@@ -4778,7 +4789,7 @@
           !TSFPrefs::DoNotReturnNoLayoutErrorToMSSimplifiedTIP()) {
         return false;
       }
-      aACPEnd = mContentForTSF.LatestCompositionStartOffset();
+      aACPEnd = mContentForTSF->LatestCompositionRange()->StartOffset();
       aACPStart = std::min(aACPStart, aACPEnd);
       break;
     default:
@@ -4788,27 +4799,28 @@
   // If we hack the queried range for active TIP, that means we should not
   // return TS_E_NOLAYOUT even if hacked offset is still modified.  So, as
   // far as possible, we should adjust the offset.
-  MOZ_ASSERT(mContentForTSF.IsLayoutChanged());
+  MOZ_ASSERT(mContentForTSF->IsLayoutChanged());
   bool collapsed = aACPStart == aACPEnd;
   // Note that even if all characters in the editor or the composition
   // string was modified, 0 or start offset of the composition string is
   // useful because it may return caret rect or old character's rect which
   // the user still see.  That must be useful information for TIP.
   int32_t firstModifiedOffset =
-      static_cast<int32_t>(mContentForTSF.MinOffsetOfLayoutChanged());
+      static_cast<int32_t>(mContentForTSF->MinModifiedOffset().value());
   LONG lastUnmodifiedOffset = std::max(firstModifiedOffset - 1, 0);
-  if (mContentForTSF.IsLayoutChangedAt(aACPStart)) {
-    if (aACPStart >= mContentForTSF.LatestCompositionStartOffset()) {
+  if (mContentForTSF->IsLayoutChangedAt(aACPStart)) {
+    if (aACPStart >= mContentForTSF->LatestCompositionRange()->StartOffset()) {
       // If mContentForTSF has last composition string and current
       // composition string, we can assume that ContentCacheInParent has
       // cached rects of composition string at least length of current
       // composition string.  Otherwise, we can assume that rect for
       // first character of composition string is stored since it was
       // selection start or caret position.
-      LONG maxCachedOffset = mContentForTSF.LatestCompositionEndOffset();
-      if (mContentForTSF.WasLastComposition()) {
+      LONG maxCachedOffset =
+          mContentForTSF->LatestCompositionRange()->EndOffset();
+      if (mContentForTSF->LastComposition().isSome()) {
         maxCachedOffset = std::min(
-            maxCachedOffset, mContentForTSF.LastCompositionStringEndOffset());
+            maxCachedOffset, mContentForTSF->LastComposition()->EndOffset());
       }
       aACPStart = std::min(aACPStart, maxCachedOffset);
     }
@@ -4834,9 +4846,9 @@
   // doesn't retrieve caret rect (i.e., the range isn't collapsed), we
   // should keep using the original aACPEnd.  Otherwise, we should set
   // aACPEnd to larger value of aACPStart and lastUnmodifiedOffset.
-  else if (mContentForTSF.IsLayoutChangedAt(aACPEnd) &&
-           (aACPEnd < mContentForTSF.LatestCompositionStartOffset() ||
-            aACPEnd > mContentForTSF.LatestCompositionEndOffset())) {
+  else if (mContentForTSF->IsLayoutChangedAt(aACPEnd) &&
+           !mContentForTSF->LatestCompositionRange()
+                ->IsOffsetInRangeOrEndOffset(aACPEnd)) {
     aACPEnd = std::max(aACPStart, lastUnmodifiedOffset);
   }
 
@@ -4903,10 +4915,10 @@
   MOZ_ASSERT(!mDestroyed);
 
   // use NS_QUERY_EDITOR_RECT to get rect in system, screen coordinates
-  WidgetQueryContentEvent event(true, eQueryEditorRect, mWidget);
-  mWidget->InitEvent(event);
-  DispatchEvent(event);
-  if (!event.mSucceeded) {
+  WidgetQueryContentEvent queryEditorRectEvent(true, eQueryEditorRect, mWidget);
+  mWidget->InitEvent(queryEditorRectEvent);
+  DispatchEvent(queryEditorRectEvent);
+  if (queryEditorRectEvent.Failed()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::GetScreenExtInternal() FAILED due to "
              "eQueryEditorRect failure",
@@ -4914,8 +4926,10 @@
     return false;
   }
 
-  nsWindow* refWindow = static_cast<nsWindow*>(
-      event.mReply.mFocusedWidget ? event.mReply.mFocusedWidget : mWidget);
+  nsWindow* refWindow =
+      static_cast<nsWindow*>(!!queryEditorRectEvent.mReply->mFocusedWidget
+                                 ? queryEditorRectEvent.mReply->mFocusedWidget
+                                 : static_cast<nsIWidget*>(mWidget.get()));
   // Result rect is in top level widget coordinates
   refWindow = refWindow->GetTopLevelWindow(false);
   if (!refWindow) {
@@ -4930,7 +4944,7 @@
   boundRect.MoveTo(0, 0);
 
   // Clip frame rect to window rect
-  boundRect.IntersectRect(event.mReply.mRect, boundRect);
+  boundRect.IntersectRect(queryEditorRectEvent.mReply->mRect, boundRect);
   if (!boundRect.IsEmpty()) {
     boundRect.MoveBy(refWindow->WidgetToScreenOffset());
     ::SetRect(&aScreenExt, boundRect.X(), boundRect.Y(), boundRect.XMost(),
@@ -4986,16 +5000,14 @@
       sTextStoreLog, LogLevel::Info,
       ("0x%p TSFTextStore::InsertTextAtSelection(dwFlags=%s, "
        "pchText=0x%p \"%s\", cch=%lu, pacpStart=0x%p, pacpEnd=0x%p, "
-       "pChange=0x%p), IsComposing()=%s",
+       "pChange=0x%p), mComposition=%s",
        this,
-       dwFlags == 0
-           ? "0"
-           : dwFlags == TF_IAS_NOQUERY
-                 ? "TF_IAS_NOQUERY"
-                 : dwFlags == TF_IAS_QUERYONLY ? "TF_IAS_QUERYONLY" : "Unknown",
+       dwFlags == 0                  ? "0"
+       : dwFlags == TF_IAS_NOQUERY   ? "TF_IAS_NOQUERY"
+       : dwFlags == TF_IAS_QUERYONLY ? "TF_IAS_QUERYONLY"
+                                     : "Unknown",
        pchText, pchText && cch ? GetEscapedUTF8String(pchText, cch).get() : "",
-       cch, pacpStart, pacpEnd, pChange,
-       GetBoolName(mComposition.IsComposing())));
+       cch, pacpStart, pacpEnd, pChange, ToString(mComposition).c_str()));
 
   if (cch && !pchText) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
@@ -5023,23 +5035,23 @@
     }
 
     // Get selection first
-    Selection& selectionForTSF = SelectionForTSFRef();
-    if (selectionForTSF.IsDirty()) {
+    Maybe<Selection>& selectionForTSF = SelectionForTSF();
+    if (selectionForTSF.isNothing()) {
       MOZ_LOG(sTextStoreLog, LogLevel::Error,
               ("0x%p   TSFTextStore::InsertTextAtSelection() FAILED due to "
-               "SelectionForTSFRef() failure",
+               "SelectionForTSF() failure",
                this));
       return E_FAIL;
     }
 
     // Simulate text insertion
-    *pacpStart = selectionForTSF.StartOffset();
-    *pacpEnd = selectionForTSF.EndOffset();
+    *pacpStart = selectionForTSF->StartOffset();
+    *pacpEnd = selectionForTSF->EndOffset();
     if (pChange) {
-      pChange->acpStart = selectionForTSF.StartOffset();
-      pChange->acpOldEnd = selectionForTSF.EndOffset();
+      pChange->acpStart = selectionForTSF->StartOffset();
+      pChange->acpOldEnd = selectionForTSF->EndOffset();
       pChange->acpNewEnd =
-          selectionForTSF.StartOffset() + static_cast<LONG>(cch);
+          selectionForTSF->StartOffset() + static_cast<LONG>(cch);
     }
   } else {
     if (!IsReadWriteLocked()) {
@@ -5094,15 +5106,15 @@
                                                  TS_TEXTCHANGE* aTextChange) {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::InsertTextAtSelectionInternal("
-           "aInsertStr=\"%s\", aTextChange=0x%p), IsComposing=%s",
+           "aInsertStr=\"%s\", aTextChange=0x%p), mComposition=%s",
            this, GetEscapedUTF8String(aInsertStr).get(), aTextChange,
-           GetBoolName(mComposition.IsComposing())));
+           ToString(mComposition).c_str()));
 
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::InsertTextAtSelectionInternal() failed "
-             "due to ContentForTSFRef() failure()",
+             "due to ContentForTSF() failure()",
              this));
     return false;
   }
@@ -5117,8 +5129,8 @@
     return false;
   }
 
-  TS_SELECTION_ACP oldSelection = contentForTSF.Selection().ACP();
-  if (!mComposition.IsComposing()) {
+  TS_SELECTION_ACP oldSelection = contentForTSF->Selection()->ACPRef();
+  if (mComposition.isNothing()) {
     // Use a temporary composition to contain the text
     PendingAction* compositionStart = mPendingActions.AppendElements(2);
     PendingAction* compositionEnd = compositionStart + 1;
@@ -5145,12 +5157,12 @@
              compositionEnd->mData.Length(), compositionEnd->mSelectionStart));
   }
 
-  contentForTSF.ReplaceSelectedTextWith(aInsertStr);
+  contentForTSF->ReplaceSelectedTextWith(aInsertStr);
 
   if (aTextChange) {
     aTextChange->acpStart = oldSelection.acpStart;
     aTextChange->acpOldEnd = oldSelection.acpEnd;
-    aTextChange->acpNewEnd = contentForTSF.Selection().EndOffset();
+    aTextChange->acpNewEnd = contentForTSF->Selection()->EndOffset();
   }
 
   MOZ_LOG(
@@ -5178,16 +5190,15 @@
   return E_NOTIMPL;
 }
 
-HRESULT
-TSFTextStore::RecordCompositionStartAction(ITfCompositionView* aComposition,
-                                           ITfRange* aRange,
-                                           bool aPreserveSelection) {
+HRESULT TSFTextStore::RecordCompositionStartAction(
+    ITfCompositionView* aCompositionView, ITfRange* aRange,
+    bool aPreserveSelection) {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::RecordCompositionStartAction("
-           "aComposition=0x%p, aRange=0x%p, aPreserveSelection=%s), "
-           "mComposition.mView=0x%p",
-           this, aComposition, aRange, GetBoolName(aPreserveSelection),
-           mComposition.mView.get()));
+           "aCompositionView=0x%p, aRange=0x%p, aPreserveSelection=%s), "
+           "mComposition=%s",
+           this, aCompositionView, aRange, GetBoolName(aPreserveSelection),
+           ToString(mComposition).c_str()));
 
   LONG start = 0, length = 0;
   HRESULT hr = GetRangeExtent(aRange, &start, &length);
@@ -5199,26 +5210,26 @@
     return hr;
   }
 
-  return RecordCompositionStartAction(aComposition, start, length,
+  return RecordCompositionStartAction(aCompositionView, start, length,
                                       aPreserveSelection);
 }
 
-HRESULT
-TSFTextStore::RecordCompositionStartAction(ITfCompositionView* aComposition,
-                                           LONG aStart, LONG aLength,
-                                           bool aPreserveSelection) {
-  MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::RecordCompositionStartAction("
-           "aComposition=0x%p, aStart=%d, aLength=%d, aPreserveSelection=%s), "
-           "mComposition.mView=0x%p",
-           this, aComposition, aStart, aLength, GetBoolName(aPreserveSelection),
-           mComposition.mView.get()));
+HRESULT TSFTextStore::RecordCompositionStartAction(
+    ITfCompositionView* aCompositionView, LONG aStart, LONG aLength,
+    bool aPreserveSelection) {
+  MOZ_LOG(
+      sTextStoreLog, LogLevel::Debug,
+      ("0x%p   TSFTextStore::RecordCompositionStartAction("
+       "aCompositionView=0x%p, aStart=%d, aLength=%d, aPreserveSelection=%s), "
+       "mComposition=%s",
+       this, aCompositionView, aStart, aLength, GetBoolName(aPreserveSelection),
+       ToString(mComposition).c_str()));
 
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionStartAction() FAILED "
-             "due to ContentForTSFRef() failure",
+             "due to ContentForTSF() failure",
              this));
     return E_FAIL;
   }
@@ -5250,19 +5261,15 @@
   if (!aPreserveSelection &&
       IsLastPendingActionCompositionEndAt(aStart, aLength)) {
     const PendingAction& pendingCompositionEnd = mPendingActions.LastElement();
-    contentForTSF.RestoreCommittedComposition(aComposition,
-                                              pendingCompositionEnd);
+    contentForTSF->RestoreCommittedComposition(aCompositionView,
+                                               pendingCompositionEnd);
     mPendingActions.RemoveLastElement();
     MOZ_LOG(sTextStoreLog, LogLevel::Info,
             ("0x%p   TSFTextStore::RecordCompositionStartAction() "
              "succeeded: restoring the committed string as composing string, "
-             "mComposition={ mStart=%ld, mString.Length()=%ld, "
-             "mSelectionForTSF={ acpStart=%ld, acpEnd=%ld, style.ase=%s, "
-             "style.fInterimChar=%s } }",
-             this, mComposition.mStart, mComposition.mString.Length(),
-             mSelectionForTSF.StartOffset(), mSelectionForTSF.EndOffset(),
-             GetActiveSelEndName(mSelectionForTSF.ActiveSelEnd()),
-             GetBoolName(mSelectionForTSF.IsInterimChar())));
+             "mComposition=%s, mSelectionForTSF=%s",
+             this, ToString(mComposition).c_str(),
+             ToString(mSelectionForTSF).c_str()));
     return S_OK;
   }
 
@@ -5271,15 +5278,15 @@
   action->mSelectionStart = aStart;
   action->mSelectionLength = aLength;
 
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionStartAction() FAILED "
-             "due to SelectionForTSFRef() failure",
+             "due to SelectionForTSF() failure",
              this));
     action->mAdjustSelection = true;
-  } else if (selectionForTSF.MinOffset() != aStart ||
-             selectionForTSF.MaxOffset() != aStart + aLength) {
+  } else if (selectionForTSF->MinOffset() != aStart ||
+             selectionForTSF->MaxOffset() != aStart + aLength) {
     // If new composition range is different from current selection range,
     // we need to set selection before dispatching compositionstart event.
     action->mAdjustSelection = true;
@@ -5291,18 +5298,16 @@
     action->mAdjustSelection = false;
   }
 
-  contentForTSF.StartComposition(aComposition, *action, aPreserveSelection);
-  action->mData = mComposition.mString;
+  contentForTSF->StartComposition(aCompositionView, *action,
+                                  aPreserveSelection);
+  MOZ_ASSERT(mComposition.isSome());
+  action->mData = mComposition->DataRef();
 
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
           ("0x%p   TSFTextStore::RecordCompositionStartAction() succeeded: "
-           "mComposition={ mStart=%ld, mString.Length()=%ld, "
-           "mSelectionForTSF={ acpStart=%ld, acpEnd=%ld, style.ase=%s, "
-           "style.fInterimChar=%s } }",
-           this, mComposition.mStart, mComposition.mString.Length(),
-           mSelectionForTSF.StartOffset(), mSelectionForTSF.EndOffset(),
-           GetActiveSelEndName(mSelectionForTSF.ActiveSelEnd()),
-           GetBoolName(mSelectionForTSF.IsInterimChar())));
+           "mComposition=%s, mSelectionForTSF=%s }",
+           this, ToString(mComposition).c_str(),
+           ToString(mSelectionForTSF).c_str()));
   return S_OK;
 }
 
@@ -5310,11 +5315,18 @@
 TSFTextStore::RecordCompositionEndAction() {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::RecordCompositionEndAction(), "
-           "mComposition={ mView=0x%p, mString=\"%s\" }",
-           this, mComposition.mView.get(),
-           GetEscapedUTF8String(mComposition.mString).get()));
+           "mComposition=%s",
+           this, ToString(mComposition).c_str()));
 
-  MOZ_ASSERT(mComposition.IsComposing());
+  MOZ_ASSERT(mComposition.isSome());
+
+  if (mComposition.isNothing()) {
+    MOZ_LOG(sTextStoreLog, LogLevel::Error,
+            ("0x%p   TSFTextStore::RecordCompositionEndAction() FAILED due to "
+             "no composition",
+             this));
+    return false;
+  }
 
   MaybeDispatchKeyboardEventAsProcessedByIME();
   if (mDestroyed) {
@@ -5333,18 +5345,18 @@
   RemoveLastCompositionUpdateActions();
   PendingAction* action = mPendingActions.AppendElement();
   action->mType = PendingAction::Type::eCompositionEnd;
-  action->mData = mComposition.mString;
-  action->mSelectionStart = mComposition.mStart;
+  action->mData = mComposition->DataRef();
+  action->mSelectionStart = mComposition->StartOffset();
 
-  Content& contentForTSF = ContentForTSFRef();
-  if (!contentForTSF.IsInitialized()) {
+  Maybe<Content>& contentForTSF = ContentForTSF();
+  if (contentForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::RecordCompositionEndAction() FAILED due "
-             "to ContentForTSFRef() failure",
+             "to ContentForTSF() failure",
              this));
     return E_FAIL;
   }
-  contentForTSF.EndComposition(*action);
+  contentForTSF->EndComposition(*action);
 
   // If this composition was restart but the composition doesn't modify
   // anything, we should remove the pending composition for preventing to
@@ -5386,15 +5398,15 @@
 TSFTextStore::OnStartComposition(ITfCompositionView* pComposition, BOOL* pfOk) {
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
           ("0x%p TSFTextStore::OnStartComposition(pComposition=0x%p, "
-           "pfOk=0x%p), mComposition.mView=0x%p",
-           this, pComposition, pfOk, mComposition.mView.get()));
+           "pfOk=0x%p), mComposition=%s",
+           this, pComposition, pfOk, ToString(mComposition).c_str()));
 
   AutoPendingActionAndContentFlusher flusher(this);
 
   *pfOk = FALSE;
 
   // Only one composition at a time
-  if (mComposition.IsComposing()) {
+  if (mComposition.isSome()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::OnStartComposition() FAILED due to "
              "there is another composition already (but returns S_OK)",
@@ -5431,8 +5443,8 @@
                                   ITfRange* pRangeNew) {
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
           ("0x%p TSFTextStore::OnUpdateComposition(pComposition=0x%p, "
-           "pRangeNew=0x%p), mComposition.mView=0x%p",
-           this, pComposition, pRangeNew, mComposition.mView.get()));
+           "pRangeNew=0x%p), mComposition=%s",
+           this, pComposition, pRangeNew, ToString(mComposition).c_str()));
 
   AutoPendingActionAndContentFlusher flusher(this);
 
@@ -5443,14 +5455,14 @@
              this));
     return E_UNEXPECTED;
   }
-  if (!mComposition.IsComposing()) {
+  if (mComposition.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::OnUpdateComposition() FAILED due to "
              "no active composition",
              this));
     return E_UNEXPECTED;
   }
-  if (mComposition.mView != pComposition) {
+  if (mComposition->GetView() != pComposition) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::OnUpdateComposition() FAILED due to "
              "different composition view specified",
@@ -5496,22 +5508,19 @@
   }
 
   if (MOZ_LOG_TEST(sTextStoreLog, LogLevel::Info)) {
-    Selection& selectionForTSF = SelectionForTSFRef();
-    if (selectionForTSF.IsDirty()) {
+    Maybe<Selection>& selectionForTSF = SelectionForTSF();
+    if (selectionForTSF.isNothing()) {
       MOZ_LOG(sTextStoreLog, LogLevel::Error,
               ("0x%p   TSFTextStore::OnUpdateComposition() FAILED due to "
-               "SelectionForTSFRef() failure",
+               "SelectionForTSF() failure",
                this));
       return E_FAIL;
     }
     MOZ_LOG(sTextStoreLog, LogLevel::Info,
             ("0x%p   TSFTextStore::OnUpdateComposition() succeeded: "
-             "mComposition={ mStart=%ld, mString=\"%s\" }, "
-             "SelectionForTSFRef()={ acpStart=%ld, acpEnd=%ld, style.ase=%s }",
-             this, mComposition.mStart,
-             GetEscapedUTF8String(mComposition.mString).get(),
-             selectionForTSF.StartOffset(), selectionForTSF.EndOffset(),
-             GetActiveSelEndName(selectionForTSF.ActiveSelEnd())));
+             "mComposition=%s, SelectionForTSF()=%s",
+             this, ToString(mComposition).c_str(),
+             ToString(selectionForTSF).c_str()));
   }
   return S_OK;
 }
@@ -5520,13 +5529,12 @@
 TSFTextStore::OnEndComposition(ITfCompositionView* pComposition) {
   MOZ_LOG(sTextStoreLog, LogLevel::Info,
           ("0x%p TSFTextStore::OnEndComposition(pComposition=0x%p), "
-           "mComposition={ mView=0x%p, mString=\"%s\" }",
-           this, pComposition, mComposition.mView.get(),
-           GetEscapedUTF8String(mComposition.mString).get()));
+           "mComposition=%s",
+           this, pComposition, ToString(mComposition).c_str()));
 
   AutoPendingActionAndContentFlusher flusher(this);
 
-  if (!mComposition.IsComposing()) {
+  if (mComposition.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::OnEndComposition() FAILED due to "
              "no active composition",
@@ -5534,7 +5542,7 @@
     return E_UNEXPECTED;
   }
 
-  if (mComposition.mView != pComposition) {
+  if (mComposition->GetView() != pComposition) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::OnEndComposition() FAILED due to "
              "different composition view specified",
@@ -5895,11 +5903,11 @@
           ("0x%p   TSFTextStore::OnTextChangeInternal(aIMENotification={ "
            "mMessage=0x%08X, mTextChangeData=%s }), "
            "mDestroyed=%s, mSink=0x%p, mSinkMask=%s, "
-           "mComposition.IsComposing()=%s",
+           "mComposition=%s",
            this, aIMENotification.mMessage,
            mozilla::ToString(textChangeData).c_str(), GetBoolName(mDestroyed),
            mSink.get(), GetSinkMaskNameStr(mSinkMask).get(),
-           GetBoolName(mComposition.IsComposing())));
+           ToString(mComposition).c_str()));
 
   if (mDestroyed) {
     // If this instance is already destroyed, we shouldn't notify TSF of any
@@ -5927,7 +5935,7 @@
 void TSFTextStore::NotifyTSFOfTextChange() {
   MOZ_ASSERT(!mDestroyed);
   MOZ_ASSERT(!IsReadLocked());
-  MOZ_ASSERT(!mComposition.IsComposing());
+  MOZ_ASSERT(mComposition.isNothing());
   MOZ_ASSERT(mPendingTextChangeData.IsValid());
 
   // If the text changes are caused only by composition, we don't need to
@@ -5938,7 +5946,7 @@
   }
 
   // First, forget cached selection.
-  mSelectionForTSF.MarkDirty();
+  mSelectionForTSF.reset();
 
   // For making it safer, we should check if there is a valid sink to receive
   // text change notification.
@@ -5987,12 +5995,12 @@
           ("0x%p   TSFTextStore::OnSelectionChangeInternal("
            "aIMENotification={ mSelectionChangeData=%s }), mDestroyed=%s, "
            "mSink=0x%p, mSinkMask=%s, mIsRecordingActionsWithoutLock=%s, "
-           "mComposition.IsComposing()=%s",
+           "mComposition=%s",
            this, mozilla::ToString(selectionChangeData).c_str(),
            GetBoolName(mDestroyed), mSink.get(),
            GetSinkMaskNameStr(mSinkMask).get(),
            GetBoolName(mIsRecordingActionsWithoutLock),
-           GetBoolName(mComposition.IsComposing())));
+           ToString(mComposition).c_str()));
 
   if (mDestroyed) {
     // If this instance is already destroyed, we shouldn't notify TSF of any
@@ -6016,7 +6024,8 @@
   // because we may have some cache to do it.
   // Note that if we have composition, we'll notified composition-updated
   // later so that we don't need to create native caret in such case.
-  if (!IsHandlingComposition() && IMEHandler::NeedsToCreateNativeCaret()) {
+  if (!IsHandlingCompositionInContent() &&
+      IMEHandler::NeedsToCreateNativeCaret()) {
     CreateNativeCaret();
   }
 
@@ -6026,16 +6035,21 @@
 void TSFTextStore::NotifyTSFOfSelectionChange() {
   MOZ_ASSERT(!mDestroyed);
   MOZ_ASSERT(!IsReadLocked());
-  MOZ_ASSERT(!mComposition.IsComposing());
+  MOZ_ASSERT(mComposition.isNothing());
   MOZ_ASSERT(mPendingSelectionChangeData.IsValid());
 
   // If selection range isn't actually changed, we don't need to notify TSF
   // of this selection change.
-  if (!mSelectionForTSF.SetSelection(
-          mPendingSelectionChangeData.mOffset,
-          mPendingSelectionChangeData.Length(),
-          mPendingSelectionChangeData.mReversed,
-          mPendingSelectionChangeData.GetWritingMode())) {
+  if (mSelectionForTSF.isNothing()) {
+    mSelectionForTSF.emplace(mPendingSelectionChangeData.mOffset,
+                             mPendingSelectionChangeData.Length(),
+                             mPendingSelectionChangeData.mReversed,
+                             mPendingSelectionChangeData.GetWritingMode());
+  } else if (!mSelectionForTSF->SetSelection(
+                 mPendingSelectionChangeData.mOffset,
+                 mPendingSelectionChangeData.Length(),
+                 mPendingSelectionChangeData.mReversed,
+                 mPendingSelectionChangeData.GetWritingMode())) {
     mPendingSelectionChangeData.Clear();
     MOZ_LOG(sTextStoreLog, LogLevel::Debug,
             ("0x%p   TSFTextStore::NotifyTSFOfSelectionChange(), "
@@ -6108,8 +6122,8 @@
 
   // Now, layout has been computed.  We should notify mContentForTSF for
   // making GetTextExt() and GetACPFromPoint() not return TS_E_NOLAYOUT.
-  if (mContentForTSF.IsInitialized()) {
-    mContentForTSF.OnLayoutChanged();
+  if (mContentForTSF.isSome()) {
+    mContentForTSF->OnLayoutChanged();
   }
 
   if (IMEHandler::NeedsToCreateNativeCaret()) {
@@ -6254,12 +6268,14 @@
   }
 
   // Update cached data now because all pending events have been handled now.
-  mContentForTSF.OnCompositionEventsHandled();
+  if (mContentForTSF.isSome()) {
+    mContentForTSF->OnCompositionEventsHandled();
+  }
 
   // If composition is completely finished both in TSF/TIP and the focused
   // editor which may be in a remote process, we can clear the cache and don't
   // have it until starting next composition.
-  if (!mComposition.IsComposing() && !IsHandlingComposition()) {
+  if (mComposition.isNothing() && !IsHandlingCompositionInContent()) {
     mDeferClearingContentForTSF = false;
   }
   mDeferNotifyingTSF = false;
@@ -6306,6 +6322,9 @@
                .get()));
 
   uint32_t offset = aIMENotification.mMouseButtonEventData.mOffset;
+  if (offset > static_cast<uint32_t>(LONG_MAX)) {
+    return NS_OK;
+  }
   nsIntRect charRect =
       aIMENotification.mMouseButtonEventData.mCharRect.AsIntRect();
   nsIntPoint cursorPos =
@@ -6341,11 +6360,12 @@
   }
   for (size_t i = 0; i < mMouseTrackers.Length(); i++) {
     MouseTracker& tracker = mMouseTrackers[i];
-    if (!tracker.IsUsing() || !tracker.InRange(offset)) {
+    if (!tracker.IsUsing() || tracker.Range().isNothing() ||
+        !tracker.Range()->IsOffsetInRange(offset)) {
       continue;
     }
-    if (tracker.OnMouseButtonEvent(edge - tracker.RangeStart(), quadrant,
-                                   buttonStatus)) {
+    if (tracker.OnMouseButtonEvent(edge - tracker.Range()->StartOffset(),
+                                   quadrant, buttonStatus)) {
       return NS_SUCCESS_EVENT_CONSUMED;
     }
   }
@@ -6363,44 +6383,43 @@
   }
 
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-          ("0x%p   TSFTextStore::CreateNativeCaret(), "
-           "mComposition.IsComposing()=%s",
-           this, GetBoolName(mComposition.IsComposing())));
+          ("0x%p   TSFTextStore::CreateNativeCaret(), mComposition=%s", this,
+           ToString(mComposition).c_str()));
 
-  Selection& selectionForTSF = SelectionForTSFRef();
-  if (selectionForTSF.IsDirty()) {
+  Maybe<Selection>& selectionForTSF = SelectionForTSF();
+  if (selectionForTSF.isNothing()) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::CreateNativeCaret() FAILED due to "
-             "SelectionForTSFRef() failure",
+             "SelectionForTSF() failure",
              this));
     return;
   }
 
-  WidgetQueryContentEvent queryCaretRect(true, eQueryCaretRect, mWidget);
-  mWidget->InitEvent(queryCaretRect);
+  WidgetQueryContentEvent queryCaretRectEvent(true, eQueryCaretRect, mWidget);
+  mWidget->InitEvent(queryCaretRectEvent);
 
   WidgetQueryContentEvent::Options options;
   // XXX If this is called without composition and the selection isn't
   //     collapsed, is it OK?
-  int64_t caretOffset = selectionForTSF.MaxOffset();
-  if (mComposition.IsComposing()) {
+  int64_t caretOffset = selectionForTSF->MaxOffset();
+  if (mComposition.isSome()) {
     // If there is a composition, use insertion point relative query for
     // deciding caret position because composition might be at different
     // position where TSFTextStore believes it at.
     options.mRelativeToInsertionPoint = true;
-    caretOffset -= mComposition.mStart;
+    caretOffset -= mComposition->StartOffset();
   } else if (!CanAccessActualContentDirectly()) {
     // If TSF/TIP cannot access actual content directly, there may be pending
     // text and/or selection changes which have not been notified TSF yet.
     // Therefore, we should use relative to insertion point query since
     // TSF/TIP computes the offset from the cached selection.
     options.mRelativeToInsertionPoint = true;
-    caretOffset -= mSelectionForTSF.StartOffset();
+    caretOffset -= selectionForTSF->StartOffset();
   }
-  queryCaretRect.InitForQueryCaretRect(caretOffset, options);
+  queryCaretRectEvent.InitForQueryCaretRect(caretOffset, options);
 
-  DispatchEvent(queryCaretRect);
-  if (NS_WARN_IF(!queryCaretRect.mSucceeded)) {
+  DispatchEvent(queryCaretRectEvent);
+  if (NS_WARN_IF(queryCaretRectEvent.Failed())) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::CreateNativeCaret() FAILED due to "
              "eQueryCaretRect failure (offset=%d)",
@@ -6409,7 +6428,7 @@
   }
 
   if (!IMEHandler::CreateNativeCaret(static_cast<nsWindow*>(mWidget.get()),
-                                     queryCaretRect.mReply.mRect)) {
+                                     queryCaretRectEvent.mReply->mRect)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::CreateNativeCaret() FAILED due to "
              "IMEHandler::CreateNativeCaret() failure",
@@ -6421,11 +6440,9 @@
 void TSFTextStore::CommitCompositionInternal(bool aDiscard) {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::CommitCompositionInternal(aDiscard=%s), "
-           "mSink=0x%p, mContext=0x%p, mComposition.mView=0x%p, "
-           "mComposition.mString=\"%s\"",
+           "mSink=0x%p, mContext=0x%p, mComposition=%s",
            this, GetBoolName(aDiscard), mSink.get(), mContext.get(),
-           mComposition.mView.get(),
-           GetEscapedUTF8String(mComposition.mString).get()));
+           ToString(mComposition).c_str()));
 
   // If the document is locked, TSF will fail to commit composition since
   // TSF needs another document lock.  So, let's put off the request.
@@ -6454,15 +6471,15 @@
     return;
   }
 
-  if (mComposition.IsComposing() && aDiscard) {
-    LONG endOffset = mComposition.EndOffset();
-    mComposition.mString.Truncate(0);
+  if (mComposition.isSome() && aDiscard) {
+    LONG endOffset = mComposition->EndOffset();
+    mComposition->SetData(EmptyString());
     // Note that don't notify TSF of text change after this is destroyed.
     if (mSink && !mDestroyed) {
       TS_TEXTCHANGE textChange;
-      textChange.acpStart = mComposition.mStart;
+      textChange.acpStart = mComposition->StartOffset();
       textChange.acpOldEnd = endOffset;
-      textChange.acpNewEnd = mComposition.mStart;
+      textChange.acpNewEnd = mComposition->StartOffset();
       MOZ_LOG(sTextStoreLog, LogLevel::Info,
               ("0x%p   TSFTextStore::CommitCompositionInternal(), calling"
                "mSink->OnTextChange(0, { acpStart=%ld, acpOldEnd=%ld, "
@@ -7046,42 +7063,28 @@
   return TSFStaticSink::IsGoogleJapaneseInputActive();
 }
 
-/******************************************************************/
-/* TSFTextStore::Composition                                       */
-/******************************************************************/
-
-void TSFTextStore::Composition::Start(ITfCompositionView* aCompositionView,
-                                      LONG aCompositionStartOffset,
-                                      const nsAString& aCompositionString) {
-  mView = aCompositionView;
-  mString = aCompositionString;
-  mStart = aCompositionStartOffset;
-}
-
-void TSFTextStore::Composition::End() {
-  mView = nullptr;
-  mString.Truncate();
-}
-
 /******************************************************************************
  *  TSFTextStore::Content
  *****************************************************************************/
 
 const nsDependentSubstring TSFTextStore::Content::GetSelectedText() const {
-  MOZ_ASSERT(mInitialized);
-  return GetSubstring(static_cast<uint32_t>(mSelection.StartOffset()),
-                      static_cast<uint32_t>(mSelection.Length()));
+  if (NS_WARN_IF(mSelection.isNothing())) {
+    return nsDependentSubstring();
+  }
+  return GetSubstring(static_cast<uint32_t>(mSelection->StartOffset()),
+                      static_cast<uint32_t>(mSelection->Length()));
 }
 
 const nsDependentSubstring TSFTextStore::Content::GetSubstring(
     uint32_t aStart, uint32_t aLength) const {
-  MOZ_ASSERT(mInitialized);
   return nsDependentSubstring(mText, aStart, aLength);
 }
 
 void TSFTextStore::Content::ReplaceSelectedTextWith(const nsAString& aString) {
-  MOZ_ASSERT(mInitialized);
-  ReplaceTextWith(mSelection.StartOffset(), mSelection.Length(), aString);
+  if (NS_WARN_IF(mSelection.isNothing())) {
+    return;
+  }
+  ReplaceTextWith(mSelection->StartOffset(), mSelection->Length(), aString);
 }
 
 inline uint32_t FirstDifferentCharOffset(const nsAString& aStr1,
@@ -7097,99 +7100,104 @@
 
 void TSFTextStore::Content::ReplaceTextWith(LONG aStart, LONG aLength,
                                             const nsAString& aReplaceString) {
-  MOZ_ASSERT(mInitialized);
+  MOZ_ASSERT(aStart >= 0);
+  MOZ_ASSERT(aLength >= 0);
   const nsDependentSubstring replacedString = GetSubstring(
       static_cast<uint32_t>(aStart), static_cast<uint32_t>(aLength));
   if (aReplaceString != replacedString) {
-    uint32_t firstDifferentOffset = mMinTextModifiedOffset;
-    if (mComposition.IsComposing()) {
+    uint32_t firstDifferentOffset = mMinModifiedOffset.valueOr(UINT32_MAX);
+    if (mComposition.isSome()) {
       // Emulate text insertion during compositions, because during a
       // composition, editor expects the whole composition string to
       // be sent in eCompositionChange, not just the inserted part.
       // The actual eCompositionChange will be sent in SetSelection
       // or OnUpdateComposition.
-      MOZ_ASSERT(aStart >= mComposition.mStart);
-      MOZ_ASSERT(aStart + aLength <= mComposition.EndOffset());
-      mComposition.mString.Replace(
-          static_cast<uint32_t>(aStart - mComposition.mStart),
+      MOZ_ASSERT(aStart >= mComposition->StartOffset());
+      MOZ_ASSERT(aStart + aLength <= mComposition->EndOffset());
+      mComposition->ReplaceData(
+          static_cast<uint32_t>(aStart - mComposition->StartOffset()),
           static_cast<uint32_t>(aLength), aReplaceString);
       // TIP may set composition string twice or more times during a document
       // lock.  Therefore, we should compute the first difference offset with
-      // mLastCompositionString.
-      if (mComposition.mString != mLastCompositionString) {
-        firstDifferentOffset = mComposition.mStart +
-                               FirstDifferentCharOffset(mComposition.mString,
-                                                        mLastCompositionString);
+      // mLastComposition.
+      if (mLastComposition.isNothing()) {
+        firstDifferentOffset = mComposition->StartOffset();
+      } else if (mComposition->DataRef() != mLastComposition->DataRef()) {
+        firstDifferentOffset =
+            mComposition->StartOffset() +
+            FirstDifferentCharOffset(mComposition->DataRef(),
+                                     mLastComposition->DataRef());
         // The previous change to the composition string is canceled.
-        if (mMinTextModifiedOffset >=
-                static_cast<uint32_t>(mComposition.mStart) &&
-            mMinTextModifiedOffset < firstDifferentOffset) {
-          mMinTextModifiedOffset = firstDifferentOffset;
+        if (mMinModifiedOffset.isSome() &&
+            mMinModifiedOffset.value() >=
+                static_cast<uint32_t>(mComposition->StartOffset()) &&
+            mMinModifiedOffset.value() < firstDifferentOffset) {
+          mMinModifiedOffset = Some(firstDifferentOffset);
         }
-      } else if (mMinTextModifiedOffset >=
-                     static_cast<uint32_t>(mComposition.mStart) &&
-                 mMinTextModifiedOffset <
-                     static_cast<uint32_t>(mComposition.EndOffset())) {
+      } else if (mMinModifiedOffset.isSome() &&
+                 mMinModifiedOffset.value() < static_cast<uint32_t>(LONG_MAX) &&
+                 mComposition->IsOffsetInRange(
+                     static_cast<long>(mMinModifiedOffset.value()))) {
         // The previous change to the composition string is canceled.
-        mMinTextModifiedOffset = firstDifferentOffset =
-            mComposition.EndOffset();
+        firstDifferentOffset = mComposition->EndOffset();
+        mMinModifiedOffset = Some(firstDifferentOffset);
       }
-      mLatestCompositionEndOffset = mComposition.EndOffset();
-      MOZ_LOG(sTextStoreLog, LogLevel::Debug,
-              ("0x%p   TSFTextStore::Content::ReplaceTextWith(aStart=%d, "
-               "aLength=%d, aReplaceString=\"%s\"), mComposition={ mStart=%d, "
-               "mString=\"%s\" }, mLastCompositionString=\"%s\", "
-               "mMinTextModifiedOffset=%u, firstDifferentOffset=%u",
-               this, aStart, aLength,
-               GetEscapedUTF8String(aReplaceString).get(), mComposition.mStart,
-               GetEscapedUTF8String(mComposition.mString).get(),
-               GetEscapedUTF8String(mLastCompositionString).get(),
-               mMinTextModifiedOffset, firstDifferentOffset));
+      mLatestCompositionRange = Some(mComposition->CreateStartAndEndOffsets());
+      MOZ_LOG(
+          sTextStoreLog, LogLevel::Debug,
+          ("0x%p   TSFTextStore::Content::ReplaceTextWith(aStart=%d, "
+           "aLength=%d, aReplaceString=\"%s\"), mComposition=%s, "
+           "mLastComposition=%s, mMinModifiedOffset=%s, "
+           "firstDifferentOffset=%u",
+           this, aStart, aLength, GetEscapedUTF8String(aReplaceString).get(),
+           ToString(mComposition).c_str(), ToString(mLastComposition).c_str(),
+           ToString(mMinModifiedOffset).c_str(), firstDifferentOffset));
     } else {
       firstDifferentOffset =
           static_cast<uint32_t>(aStart) +
           FirstDifferentCharOffset(aReplaceString, replacedString);
     }
-    mMinTextModifiedOffset =
-        std::min(mMinTextModifiedOffset, firstDifferentOffset);
+    mMinModifiedOffset =
+        mMinModifiedOffset.isNothing()
+            ? Some(firstDifferentOffset)
+            : Some(std::min(mMinModifiedOffset.value(), firstDifferentOffset));
     mText.Replace(static_cast<uint32_t>(aStart), static_cast<uint32_t>(aLength),
                   aReplaceString);
   }
   // Selection should be collapsed at the end of the inserted string.
-  mSelection.CollapseAt(static_cast<uint32_t>(aStart) +
-                        aReplaceString.Length());
+  mSelection = Some(TSFTextStore::Selection(static_cast<uint32_t>(aStart) +
+                                            aReplaceString.Length()));
 }
 
 void TSFTextStore::Content::StartComposition(
     ITfCompositionView* aCompositionView, const PendingAction& aCompStart,
     bool aPreserveSelection) {
-  MOZ_ASSERT(mInitialized);
   MOZ_ASSERT(aCompositionView);
-  MOZ_ASSERT(!mComposition.mView);
+  MOZ_ASSERT(mComposition.isNothing());
   MOZ_ASSERT(aCompStart.mType == PendingAction::Type::eCompositionStart);
 
-  mComposition.Start(
+  mComposition.reset();  // Avoid new crash in the beta and nightly channels.
+  mComposition.emplace(
       aCompositionView, aCompStart.mSelectionStart,
       GetSubstring(static_cast<uint32_t>(aCompStart.mSelectionStart),
                    static_cast<uint32_t>(aCompStart.mSelectionLength)));
-  mLatestCompositionStartOffset = mComposition.mStart;
-  mLatestCompositionEndOffset = mComposition.EndOffset();
+  mLatestCompositionRange = Some(mComposition->CreateStartAndEndOffsets());
   if (!aPreserveSelection) {
     // XXX Do we need to set a new writing-mode here when setting a new
     // selection? Currently, we just preserve the existing value.
     WritingMode writingMode =
-        mSelection.IsDirty() ? WritingMode() : mSelection.GetWritingMode();
-    mSelection.SetSelection(mComposition.mStart, mComposition.mString.Length(),
-                            false, writingMode);
+        mSelection.isNothing() ? WritingMode() : mSelection->GetWritingMode();
+    mSelection = Some(TSFTextStore::Selection(mComposition->StartOffset(),
+                                              mComposition->Length(), false,
+                                              writingMode));
   }
 }
 
 void TSFTextStore::Content::RestoreCommittedComposition(
     ITfCompositionView* aCompositionView,
     const PendingAction& aCanceledCompositionEnd) {
-  MOZ_ASSERT(mInitialized);
   MOZ_ASSERT(aCompositionView);
-  MOZ_ASSERT(!mComposition.mView);
+  MOZ_ASSERT(mComposition.isNothing());
   MOZ_ASSERT(aCanceledCompositionEnd.mType ==
              PendingAction::Type::eCompositionEnd);
   MOZ_ASSERT(
@@ -7199,27 +7207,31 @@
       aCanceledCompositionEnd.mData);
 
   // Restore the committed string as composing string.
-  mComposition.Start(aCompositionView, aCanceledCompositionEnd.mSelectionStart,
-                     aCanceledCompositionEnd.mData);
-  mLatestCompositionStartOffset = mComposition.mStart;
-  mLatestCompositionEndOffset = mComposition.EndOffset();
+  mComposition.reset();  // Avoid new crash in the beta and nightly channels.
+  mComposition.emplace(aCompositionView,
+                       aCanceledCompositionEnd.mSelectionStart,
+                       aCanceledCompositionEnd.mData);
+  mLatestCompositionRange = Some(mComposition->CreateStartAndEndOffsets());
 }
 
 void TSFTextStore::Content::EndComposition(const PendingAction& aCompEnd) {
-  MOZ_ASSERT(mInitialized);
-  MOZ_ASSERT(mComposition.mView);
+  MOZ_ASSERT(mComposition.isSome());
   MOZ_ASSERT(aCompEnd.mType == PendingAction::Type::eCompositionEnd);
 
-  mSelection.CollapseAt(mComposition.mStart + aCompEnd.mData.Length());
-  mComposition.End();
+  if (mComposition.isNothing()) {
+    return;  // Avoid new crash in the beta and nightly channels.
+  }
+
+  mSelection = Some(TSFTextStore::Selection(mComposition->StartOffset() +
+                                            aCompEnd.mData.Length()));
+  mComposition.reset();
 }
 
 /******************************************************************************
  *  TSFTextStore::MouseTracker
  *****************************************************************************/
 
-TSFTextStore::MouseTracker::MouseTracker()
-    : mStart(-1), mLength(-1), mCookie(kInvalidCookie) {}
+TSFTextStore::MouseTracker::MouseTracker() : mCookie(kInvalidCookie) {}
 
 HRESULT
 TSFTextStore::MouseTracker::Init(TSFTextStore* aTextStore) {
@@ -7266,7 +7278,10 @@
     return E_FAIL;
   }
 
-  HRESULT hr = aTextRange->GetExtent(&mStart, &mLength);
+  MOZ_ASSERT(mRange.isNothing());
+
+  LONG start = 0, length = 0;
+  HRESULT hr = aTextRange->GetExtent(&start, &length);
   if (FAILED(hr)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::MouseTracker::AdviseMouseSink() FAILED "
@@ -7275,12 +7290,12 @@
     return hr;
   }
 
-  if (mStart < 0 || mLength <= 0) {
+  if (start < 0 || length <= 0 || start + length > LONG_MAX) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::MouseTracker::AdviseMouseSink() FAILED "
              "due to odd result of ITfRangeACP::GetExtent(), "
-             "mStart=%d, mLength=%d",
-             this, mStart, mLength));
+             "start=%d, length=%d",
+             this, start, length));
     return E_INVALIDARG;
   }
 
@@ -7293,32 +7308,34 @@
     return E_FAIL;
   }
 
-  if (textContent.Length() <= static_cast<uint32_t>(mStart) ||
-      textContent.Length() < static_cast<uint32_t>(mStart + mLength)) {
+  if (textContent.Length() <= static_cast<uint32_t>(start) ||
+      textContent.Length() < static_cast<uint32_t>(start + length)) {
     MOZ_LOG(sTextStoreLog, LogLevel::Error,
             ("0x%p   TSFTextStore::MouseTracker::AdviseMouseSink() FAILED "
-             "due to out of range, mStart=%d, mLength=%d, "
+             "due to out of range, start=%d, length=%d, "
              "textContent.Length()=%d",
-             this, mStart, mLength, textContent.Length()));
+             this, start, length, textContent.Length()));
     return E_INVALIDARG;
   }
 
+  mRange.emplace(start, start + length);
+
   mSink = aMouseSink;
 
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::MouseTracker::AdviseMouseSink(), "
-           "succeeded, mStart=%d, mLength=%d, textContent.Length()=%d",
-           this, mStart, mLength, textContent.Length()));
+           "succeeded, mRange=%s, textContent.Length()=%d",
+           this, ToString(mRange).c_str(), textContent.Length()));
   return S_OK;
 }
 
 void TSFTextStore::MouseTracker::UnadviseSink() {
   MOZ_LOG(sTextStoreLog, LogLevel::Debug,
           ("0x%p   TSFTextStore::MouseTracker::UnadviseSink(), "
-           "mCookie=%d, mSink=0x%p, mStart=%d, mLength=%d",
-           this, mCookie, mSink.get(), mStart, mLength));
+           "mCookie=%d, mSink=0x%p, mRange=%s",
+           this, mCookie, mSink.get(), ToString(mRange).c_str()));
   mSink = nullptr;
-  mStart = mLength = -1;
+  mRange.reset();
 }
 
 bool TSFTextStore::MouseTracker::OnMouseButtonEvent(ULONG aEdge,
diff -Nru firefox-84.0.2+build1/widget/windows/TSFTextStore.h firefox-85.0+build1/widget/windows/TSFTextStore.h
--- firefox-84.0.2+build1/widget/windows/TSFTextStore.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/TSFTextStore.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,11 +15,13 @@
 #include "WritingModes.h"
 
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextRange.h"
 #include "mozilla/WindowsVersion.h"
+#include "mozilla/widget/IMEData.h"
 
 #include <msctf.h>
 #include <textstor.h>
@@ -43,6 +45,32 @@
 struct ITfCategoryMgr;
 class nsWindow;
 
+inline std::ostream& operator<<(std::ostream& aStream,
+                                const TS_SELECTIONSTYLE& aSelectionStyle) {
+  const char* ase = "Unknown";
+  switch (aSelectionStyle.ase) {
+    case TS_AE_START:
+      ase = "TS_AE_START";
+      break;
+    case TS_AE_END:
+      ase = "TS_AE_END";
+      break;
+    case TS_AE_NONE:
+      ase = "TS_AE_NONE";
+      break;
+  }
+  aStream << "{ ase=" << ase << ", fInterimChar="
+          << (aSelectionStyle.fInterimChar ? "TRUE" : "FALSE") << " }";
+  return aStream;
+}
+
+inline std::ostream& operator<<(std::ostream& aStream,
+                                const TS_SELECTION_ACP& aACP) {
+  aStream << "{ acpStart=" << aACP.acpStart << ", acpEnd=" << aACP.acpEnd
+          << ", style=" << mozilla::ToString(aACP.style).c_str() << " }";
+  return aStream;
+}
+
 namespace mozilla {
 namespace widget {
 
@@ -211,7 +239,7 @@
   static bool IsInTSFMode() { return sThreadMgr != nullptr; }
 
   static bool IsComposing() {
-    return (sEnabledTextStore && sEnabledTextStore->mComposition.IsComposing());
+    return (sEnabledTextStore && sEnabledTextStore->mComposition.isSome());
   }
 
   static bool IsComposingOn(nsWindowBase* aWidget) {
@@ -298,7 +326,9 @@
   HRESULT GetDisplayAttribute(ITfProperty* aProperty, ITfRange* aRange,
                               TF_DISPLAYATTRIBUTE* aResult);
   HRESULT RestartCompositionIfNecessary(ITfRange* pRangeNew = nullptr);
-  HRESULT RestartComposition(ITfCompositionView* aCompositionView,
+  class Composition;
+  HRESULT RestartComposition(Composition& aCurrentComposition,
+                             ITfCompositionView* aCompositionView,
                              ITfRange* aNewRange);
 
   // Following methods record composing action(s) to mPendingActions.
@@ -306,7 +336,7 @@
   HRESULT RecordCompositionStartAction(ITfCompositionView* aCompositionView,
                                        ITfRange* aRange,
                                        bool aPreserveSelection);
-  HRESULT RecordCompositionStartAction(ITfCompositionView* aComposition,
+  HRESULT RecordCompositionStartAction(ITfCompositionView* aCompositionView,
                                        LONG aStart, LONG aLength,
                                        bool aPreserveSelection);
   HRESULT RecordCompositionUpdateAction();
@@ -453,35 +483,32 @@
    */
   void DispatchKeyboardEventAsProcessedByIME(const MSG& aMsg);
 
-  class Composition final {
+  // Composition class stores a copy of the active composition string.  Only
+  // the data is updated during an InsertTextAtSelection call if we have a
+  // composition.  The data acts as a buffer until OnUpdateComposition is
+  // called and the data is flushed to editor through eCompositionChange.
+  // This allows all changes to be updated in batches to avoid inconsistencies
+  // and artifacts.
+  class Composition final : public OffsetAndData<LONG> {
    public:
-    // nullptr if no composition is active, otherwise the current composition
-    RefPtr<ITfCompositionView> mView;
-
-    // Current copy of the active composition string. Only mString is
-    // changed during a InsertTextAtSelection call if we have a composition.
-    // mString acts as a buffer until OnUpdateComposition is called
-    // and mString is flushed to editor through eCompositionChange.
-    // This way all changes are updated in batches to avoid
-    // inconsistencies/artifacts.
-    nsString mString;
-
-    // The start of the current active composition, in ACP offsets
-    LONG mStart;
-
-    bool IsComposing() const { return (mView != nullptr); }
-
-    LONG EndOffset() const {
-      return mStart + static_cast<LONG>(mString.Length());
+    explicit Composition(ITfCompositionView* aCompositionView,
+                         LONG aCompositionStartOffset,
+                         const nsAString& aCompositionString)
+        : OffsetAndData<LONG>(aCompositionStartOffset, aCompositionString),
+          mView(aCompositionView) {}
+
+    ITfCompositionView* GetView() const { return mView; }
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Composition& aComposition) {
+      aStream << "{ mView=0x" << aComposition.mView.get()
+              << ", OffsetAndData<LONG>="
+              << static_cast<const OffsetAndData<LONG>&>(aComposition) << " }";
+      return aStream;
     }
 
-    // Start() and End() updates the members for emulating the latest state.
-    // Unless flush the pending actions, this data never matches the actual
-    // content.
-    void Start(ITfCompositionView* aCompositionView,
-               LONG aCompositionStartOffset,
-               const nsAString& aCompositionString);
-    void End();
+   private:
+    RefPtr<ITfCompositionView> const mView;
   };
   // While the document is locked, we cannot dispatch any events which cause
   // DOM events since the DOM events' handlers may modify the locked document.
@@ -489,30 +516,46 @@
   // For that, TSFTextStore modifies mComposition even while the document is
   // locked.  With mComposition, query methods can returns the text content
   // information.
-  Composition mComposition;
+  Maybe<Composition> mComposition;
+
+  /**
+   * IsHandlingCompositionInParent() returns true if eCompositionStart is
+   * dispatched, but eCompositionCommit(AsIs) is not dispatched.  This means
+   * that if composition is handled in a content process, this status indicates
+   * whether ContentCacheInParent has composition or not.  On the other hand,
+   * if it's handled in the chrome process, this is exactly same as
+   * IsHandlingCompositionInContent().
+   */
+  bool IsHandlingCompositionInParent() const {
+    return mDispatcher && mDispatcher->IsComposing();
+  }
 
   /**
-   * IsHandlingComposition() returns true if there is a composition in the
-   * focused editor.
+   * IsHandlingCompositionInContent() returns true if there is a composition in
+   * the focused editor which may be in a content process.
    */
-  bool IsHandlingComposition() const {
+  bool IsHandlingCompositionInContent() const {
     return mDispatcher && mDispatcher->IsHandlingComposition();
   }
 
   class Selection {
    public:
-    Selection() : mDirty(true) {}
+    const TS_SELECTION_ACP& ACPRef() const { return mACP; }
+
+    explicit Selection(const TS_SELECTION_ACP& aSelection) {
+      SetSelection(aSelection);
+    }
 
-    bool IsDirty() const { return mDirty; };
-    void MarkDirty() { mDirty = true; }
+    explicit Selection(uint32_t aOffsetToCollapse) {
+      Collapse(aOffsetToCollapse);
+    }
 
-    TS_SELECTION_ACP& ACP() {
-      MOZ_ASSERT(!mDirty);
-      return mACP;
+    explicit Selection(uint32_t aStart, uint32_t aLength, bool aReversed,
+                       const WritingMode& aWritingMode) {
+      SetSelection(aStart, aLength, aReversed, aWritingMode);
     }
 
     void SetSelection(const TS_SELECTION_ACP& aSelection) {
-      mDirty = false;
       mACP = aSelection;
       // Selection end must be active in our editor.
       if (mACP.style.ase != TS_AE_START) {
@@ -524,11 +567,9 @@
     }
 
     bool SetSelection(uint32_t aStart, uint32_t aLength, bool aReversed,
-                      WritingMode aWritingMode) {
-      bool changed = mDirty || mACP.acpStart != static_cast<LONG>(aStart) ||
+                      const WritingMode& aWritingMode) {
+      bool changed = mACP.acpStart != static_cast<LONG>(aStart) ||
                      mACP.acpEnd != static_cast<LONG>(aStart + aLength);
-
-      mDirty = false;
       mACP.acpStart = static_cast<LONG>(aStart);
       mACP.acpEnd = static_cast<LONG>(aStart + aLength);
       mACP.style.ase = aReversed ? TS_AE_START : TS_AE_END;
@@ -538,72 +579,51 @@
       return changed;
     }
 
-    bool IsCollapsed() const {
-      MOZ_ASSERT(!mDirty);
-      return (mACP.acpStart == mACP.acpEnd);
-    }
+    bool Collapsed() const { return mACP.acpStart == mACP.acpEnd; }
 
-    void CollapseAt(uint32_t aOffset) {
+    void Collapse(uint32_t aOffset) {
       // XXX This does not update the selection's mWritingMode.
       // If it is ever used to "collapse" to an entirely new location,
       // we may need to fix that.
-      mDirty = false;
       mACP.acpStart = mACP.acpEnd = static_cast<LONG>(aOffset);
       mACP.style.ase = TS_AE_END;
       mACP.style.fInterimChar = FALSE;
     }
 
     LONG MinOffset() const {
-      MOZ_ASSERT(!mDirty);
       LONG min = std::min(mACP.acpStart, mACP.acpEnd);
       MOZ_ASSERT(min >= 0);
       return min;
     }
 
     LONG MaxOffset() const {
-      MOZ_ASSERT(!mDirty);
       LONG max = std::max(mACP.acpStart, mACP.acpEnd);
       MOZ_ASSERT(max >= 0);
       return max;
     }
 
     LONG StartOffset() const {
-      MOZ_ASSERT(!mDirty);
       MOZ_ASSERT(mACP.acpStart >= 0);
       return mACP.acpStart;
     }
 
     LONG EndOffset() const {
-      MOZ_ASSERT(!mDirty);
       MOZ_ASSERT(mACP.acpEnd >= 0);
       return mACP.acpEnd;
     }
 
     LONG Length() const {
-      MOZ_ASSERT(!mDirty);
       MOZ_ASSERT(mACP.acpEnd >= mACP.acpStart);
       return std::abs(mACP.acpEnd - mACP.acpStart);
     }
 
-    bool IsReversed() const {
-      MOZ_ASSERT(!mDirty);
-      return (mACP.style.ase == TS_AE_START);
-    }
+    bool IsReversed() const { return mACP.style.ase == TS_AE_START; }
 
-    TsActiveSelEnd ActiveSelEnd() const {
-      MOZ_ASSERT(!mDirty);
-      return mACP.style.ase;
-    }
+    TsActiveSelEnd ActiveSelEnd() const { return mACP.style.ase; }
 
-    bool IsInterimChar() const {
-      MOZ_ASSERT(!mDirty);
-      return (mACP.style.fInterimChar != FALSE);
-    }
+    bool IsInterimChar() const { return mACP.style.fInterimChar != FALSE; }
 
-    WritingMode GetWritingMode() const {
-      MOZ_ASSERT(!mDirty);
-      return mWritingMode;
-    }
+    WritingMode GetWritingMode() const { return mWritingMode; }
 
     bool EqualsExceptDirection(const TS_SELECTION_ACP& aACP) const {
       if (mACP.style.ase == aACP.style.ase) {
@@ -614,52 +634,38 @@
 
     bool EqualsExceptDirection(
         const SelectionChangeDataBase& aChangedSelection) const {
-      MOZ_ASSERT(!mDirty);
       MOZ_ASSERT(aChangedSelection.IsValid());
       return aChangedSelection.Length() == static_cast<uint32_t>(Length()) &&
              aChangedSelection.mOffset == static_cast<uint32_t>(StartOffset());
     }
 
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Selection& aSelection) {
+      aStream << "{ mACP=" << ToString(aSelection.mACP).c_str()
+              << ", mWritingMode=" << ToString(aSelection.mWritingMode).c_str()
+              << ",  Collapsed()="
+              << (aSelection.Collapsed() ? "true" : "false")
+              << ", Length=" << aSelection.Length() << " }";
+      return aStream;
+    }
+
    private:
     TS_SELECTION_ACP mACP;
     WritingMode mWritingMode;
-    bool mDirty;
   };
-  // Don't access mSelection directly except at calling MarkDirty().
-  // Use SelectionForTSFRef() instead.  This is modified immediately when
-  // TSF requests to set selection and not updated by selection change in
-  // content until mContentForTSF is cleared.
-  Selection mSelectionForTSF;
+  // Don't access mSelection directly.  Instead, Use SelectionForTSFRef().
+  // This is modified immediately when TSF requests to set selection and not
+  // updated by selection change in content until mContentForTSF is cleared.
+  Maybe<Selection> mSelectionForTSF;
 
   /**
    * Get the selection expected by TSF.  If mSelectionForTSF is already valid,
    * this just return the reference to it.  Otherwise, this initializes it
    * with eQuerySelectedText.  Please check if the result is valid before
    * actually using it.
-   * Note that this is also called by ContentForTSFRef().
+   * Note that this is also called by ContentForTSF().
    */
-  Selection& SelectionForTSFRef();
-
-  class MOZ_STACK_CLASS AutoSetTemporarySelection final {
-   public:
-    explicit AutoSetTemporarySelection(Selection& aSelection)
-        : mSelection(aSelection) {
-      mDirty = mSelection.IsDirty();
-      if (mDirty) {
-        mSelection.CollapseAt(0);
-      }
-    }
-
-    ~AutoSetTemporarySelection() {
-      if (mDirty) {
-        mSelection.MarkDirty();
-      }
-    }
-
-   private:
-    Selection& mSelection;
-    bool mDirty;
-  };
+  Maybe<Selection>& SelectionForTSF();
 
   struct PendingAction final {
     enum class Type : uint8_t {
@@ -785,52 +791,18 @@
 
   class Content final {
    public:
-    Content(TSFTextStore::Composition& aComposition,
-            TSFTextStore::Selection& aSelection)
-        : mComposition(aComposition), mSelection(aSelection) {
-      Clear();
-    }
-
-    void Clear() {
-      mText.Truncate();
-      mLastCompositionString.Truncate();
-      mLastCompositionStart = -1;
-      mInitialized = false;
-    }
-
-    bool IsInitialized() const { return mInitialized; }
-
-    void Init(const nsAString& aText) {
-      mText = aText;
-      if (mComposition.IsComposing()) {
-        mLastCompositionString = mComposition.mString;
-        mLastCompositionStart = mComposition.mStart;
-      } else {
-        mLastCompositionString.Truncate();
-        mLastCompositionStart = -1;
-      }
-      mMinTextModifiedOffset = NOT_MODIFIED;
-      mLatestCompositionStartOffset = mLatestCompositionEndOffset = LONG_MAX;
-      mInitialized = true;
-    }
+    Content(TSFTextStore& aTSFTextStore, const nsAString& aText)
+        : mText(aText),
+          mLastComposition(aTSFTextStore.mComposition),
+          mComposition(aTSFTextStore.mComposition),
+          mSelection(aTSFTextStore.mSelectionForTSF) {}
 
-    void OnLayoutChanged() { mMinTextModifiedOffset = NOT_MODIFIED; }
+    void OnLayoutChanged() { mMinModifiedOffset.reset(); }
 
     // OnCompositionEventsHandled() is called when all pending composition
     // events are handled in the focused content which may be in a remote
     // process.
-    void OnCompositionEventsHandled() {
-      if (!mInitialized) {
-        return;
-      }
-      if (mComposition.IsComposing()) {
-        mLastCompositionString = mComposition.mString;
-        mLastCompositionStart = mComposition.mStart;
-      } else {
-        mLastCompositionString.Truncate();
-        mLastCompositionStart = -1;
-      }
-    }
+    void OnCompositionEventsHandled() { mLastComposition = mComposition; }
 
     const nsDependentSubstring GetSelectedText() const;
     const nsDependentSubstring GetSubstring(uint32_t aStart,
@@ -858,88 +830,66 @@
         const PendingAction& aCanceledCompositionEnd);
     void EndComposition(const PendingAction& aCompEnd);
 
-    const nsString& Text() const {
-      MOZ_ASSERT(mInitialized);
-      return mText;
-    }
-    const nsString& LastCompositionString() const {
-      MOZ_ASSERT(mInitialized);
-      return mLastCompositionString;
-    }
-    LONG LastCompositionStringEndOffset() const {
-      MOZ_ASSERT(mInitialized);
-      MOZ_ASSERT(WasLastComposition());
-      return mLastCompositionStart + mLastCompositionString.Length();
-    }
-    bool WasLastComposition() const {
-      MOZ_ASSERT(mInitialized);
-      return mLastCompositionStart >= 0;
-    }
-    uint32_t MinTextModifiedOffset() const {
-      MOZ_ASSERT(mInitialized);
-      return mMinTextModifiedOffset;
-    }
-    LONG LatestCompositionStartOffset() const {
-      MOZ_ASSERT(mInitialized);
-      MOZ_ASSERT(HasOrHadComposition());
-      return mLatestCompositionStartOffset;
-    }
-    LONG LatestCompositionEndOffset() const {
-      MOZ_ASSERT(mInitialized);
-      MOZ_ASSERT(HasOrHadComposition());
-      return mLatestCompositionEndOffset;
+    const nsString& TextRef() const { return mText; }
+    const Maybe<OffsetAndData<LONG>>& LastComposition() const {
+      return mLastComposition;
+    }
+    const Maybe<uint32_t>& MinModifiedOffset() const {
+      return mMinModifiedOffset;
+    }
+    const Maybe<StartAndEndOffsets<LONG>>& LatestCompositionRange() const {
+      return mLatestCompositionRange;
     }
 
     // Returns true if layout of the character at the aOffset has not been
     // calculated.
     bool IsLayoutChangedAt(uint32_t aOffset) const {
-      return IsLayoutChanged() && (mMinTextModifiedOffset <= aOffset);
+      return IsLayoutChanged() && (mMinModifiedOffset.value() <= aOffset);
     }
     // Returns true if layout of the content has been changed, i.e., the new
     // layout has not been calculated.
-    bool IsLayoutChanged() const {
-      return mInitialized && (mMinTextModifiedOffset != NOT_MODIFIED);
-    }
-    // Returns minimum offset of modified text range.
-    uint32_t MinOffsetOfLayoutChanged() const {
-      return mInitialized ? mMinTextModifiedOffset : NOT_MODIFIED;
-    }
-
+    bool IsLayoutChanged() const { return mMinModifiedOffset.isSome(); }
     bool HasOrHadComposition() const {
-      return mInitialized && mLatestCompositionStartOffset != LONG_MAX &&
-             mLatestCompositionEndOffset != LONG_MAX;
+      return mLatestCompositionRange.isSome();
     }
 
-    TSFTextStore::Composition& Composition() { return mComposition; }
-    TSFTextStore::Selection& Selection() { return mSelection; }
+    Maybe<TSFTextStore::Composition>& Composition() { return mComposition; }
+    Maybe<TSFTextStore::Selection>& Selection() { return mSelection; }
+
+    friend std::ostream& operator<<(std::ostream& aStream,
+                                    const Content& aContent) {
+      aStream << "{ mText="
+              << PrintStringDetail(aContent.mText,
+                                   PrintStringDetail::kMaxLengthForEditor)
+                     .get()
+              << ", mLastComposition=" << aContent.mLastComposition
+              << ", mLatestCompositionRange="
+              << aContent.mLatestCompositionRange
+              << ", mMinModifiedOffset=" << aContent.mMinModifiedOffset << " }";
+      return aStream;
+    }
 
    private:
     nsString mText;
-    // mLastCompositionString stores the composition string when the document
-    // is locked. This is necessary to compute mMinTextModifiedOffset.
-    nsString mLastCompositionString;
-    TSFTextStore::Composition& mComposition;
-    TSFTextStore::Selection& mSelection;
-
-    // mLastCompositionStart stores the start offset of composition when
-    // mLastCompositionString is set.
-    LONG mLastCompositionStart;
-
-    // The latest composition's start and end offset.  If composition hasn't
-    // been started since this instance is initialized, they are LONG_MAX.
-    LONG mLatestCompositionStartOffset;
-    LONG mLatestCompositionEndOffset;
 
-    // The minimum offset of modified part of the text.
-    enum : uint32_t { NOT_MODIFIED = UINT32_MAX };
-    uint32_t mMinTextModifiedOffset;
+    // mLastComposition may store the composition string and its start offset
+    // when the document is locked. This is necessary to compute
+    // mMinTextModifiedOffset.
+    Maybe<OffsetAndData<LONG>> mLastComposition;
+
+    Maybe<TSFTextStore::Composition>& mComposition;
+    Maybe<TSFTextStore::Selection>& mSelection;
+
+    // The latest composition's start and end offset.
+    Maybe<StartAndEndOffsets<LONG>> mLatestCompositionRange;
 
-    bool mInitialized;
+    // The minimum offset of modified part of the text.
+    Maybe<uint32_t> mMinModifiedOffset;
   };
   // mContentForTSF is cache of content.  The information is expected by TSF
   // and TIP.  Therefore, this is useful for answering the query from TSF or
   // TIP.
-  // This is initialized by ContentForTSFRef() automatically (therefore, don't
+  // This is initialized by ContentForTSF() automatically (therefore, don't
   // access this member directly except at calling Clear(), IsInitialized(),
   // IsLayoutChangeAfter() or IsLayoutChanged()).
   // This is cleared when:
@@ -948,9 +898,9 @@
   //    the focused editor which may be in a remote process.
   // So, if two compositions are created very quickly, this cache may not be
   // cleared between eCompositionCommit(AsIs) and eCompositionStart.
-  Content mContentForTSF;
+  Maybe<Content> mContentForTSF;
 
-  Content& ContentForTSFRef();
+  Maybe<Content>& ContentForTSF();
 
   // CanAccessActualContentDirectly() returns true when TSF/TIP can access
   // actual content directly.  In other words, mContentForTSF and/or
@@ -974,21 +924,13 @@
     void UnadviseSink();
 
     bool IsUsing() const { return mSink != nullptr; }
-    bool InRange(uint32_t aOffset) const {
-      if (NS_WARN_IF(mStart < 0) || NS_WARN_IF(mLength <= 0)) {
-        return false;
-      }
-      return aOffset >= static_cast<uint32_t>(mStart) &&
-             aOffset < static_cast<uint32_t>(mStart + mLength);
-    }
     DWORD Cookie() const { return mCookie; }
     bool OnMouseButtonEvent(ULONG aEdge, ULONG aQuadrant, DWORD aButtonStatus);
-    LONG RangeStart() const { return mStart; }
+    const Maybe<StartAndEndOffsets<LONG>> Range() const { return mRange; }
 
    private:
     RefPtr<ITfMouseSink> mSink;
-    LONG mStart;
-    LONG mLength;
+    Maybe<StartAndEndOffsets<LONG>> mRange;
     DWORD mCookie;
   };
   // mMouseTrackers is an array to store each information of installed
diff -Nru firefox-84.0.2+build1/widget/windows/WindowsUIUtils.cpp firefox-85.0+build1/widget/windows/WindowsUIUtils.cpp
--- firefox-84.0.2+build1/widget/windows/WindowsUIUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WindowsUIUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,6 +14,7 @@
 #include "nsIObserverService.h"
 #include "nsIAppShellService.h"
 #include "nsAppShellCID.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Services.h"
 #include "mozilla/WidgetUtils.h"
 #include "mozilla/WindowsVersion.h"
diff -Nru firefox-84.0.2+build1/widget/windows/WinHeaderOnlyUtils.h firefox-85.0+build1/widget/windows/WinHeaderOnlyUtils.h
--- firefox-84.0.2+build1/widget/windows/WinHeaderOnlyUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WinHeaderOnlyUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/DynamicallyLinkedFunctionPtr.h"
 #include "mozilla/Maybe.h"
-#include "mozilla/Result.h"
+#include "mozilla/ResultVariant.h"
 #include "mozilla/Tuple.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
diff -Nru firefox-84.0.2+build1/widget/windows/WinIMEHandler.cpp firefox-85.0+build1/widget/windows/WinIMEHandler.cpp
--- firefox-84.0.2+build1/widget/windows/WinIMEHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WinIMEHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1164,19 +1164,19 @@
     return false;
   }
 
-  WidgetQueryContentEvent queryCaretRect(true, eQueryCaretRect, aWindow);
-  aWindow->InitEvent(queryCaretRect);
+  WidgetQueryContentEvent queryCaretRectEvent(true, eQueryCaretRect, aWindow);
+  aWindow->InitEvent(queryCaretRectEvent);
 
   WidgetQueryContentEvent::Options options;
   options.mRelativeToInsertionPoint = true;
-  queryCaretRect.InitForQueryCaretRect(0, options);
+  queryCaretRectEvent.InitForQueryCaretRect(0, options);
 
-  aWindow->DispatchWindowEvent(&queryCaretRect);
-  if (NS_WARN_IF(!queryCaretRect.mSucceeded)) {
+  aWindow->DispatchWindowEvent(&queryCaretRectEvent);
+  if (NS_WARN_IF(queryCaretRectEvent.Failed())) {
     return false;
   }
 
-  return CreateNativeCaret(aWindow, queryCaretRect.mReply.mRect);
+  return CreateNativeCaret(aWindow, queryCaretRectEvent.mReply->mRect);
 }
 
 bool IMEHandler::CreateNativeCaret(nsWindow* aWindow,
diff -Nru firefox-84.0.2+build1/widget/windows/WinMouseScrollHandler.cpp firefox-85.0+build1/widget/windows/WinMouseScrollHandler.cpp
--- firefox-84.0.2+build1/widget/windows/WinMouseScrollHandler.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WinMouseScrollHandler.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -114,15 +114,13 @@
   if (::GetKeyboardState(keyboardState)) {
     for (size_t i = 0; i < ArrayLength(keyboardState); i++) {
       if (keyboardState[i]) {
-        MOZ_LOG(
-            gMouseScrollLog, LogLevel::Debug,
-            ("    Current key state: keyboardState[0x%02X]=0x%02X (%s)", i,
-             keyboardState[i],
-             ((keyboardState[i] & 0x81) == 0x81)
-                 ? "Pressed and Toggled"
-                 : (keyboardState[i] & 0x80)
-                       ? "Pressed"
-                       : (keyboardState[i] & 0x01) ? "Toggled" : "Unknown"));
+        MOZ_LOG(gMouseScrollLog, LogLevel::Debug,
+                ("    Current key state: keyboardState[0x%02X]=0x%02X (%s)", i,
+                 keyboardState[i],
+                 ((keyboardState[i] & 0x81) == 0x81) ? "Pressed and Toggled"
+                 : (keyboardState[i] & 0x80)         ? "Pressed"
+                 : (keyboardState[i] & 0x01)         ? "Toggled"
+                                                     : "Unknown"));
       }
     }
   } else {
@@ -214,7 +212,8 @@
                "msg=%s(0x%04X), wParam=0x%02X, ::GetMessageTime()=%d",
                aWidget,
                msg == WM_KEYDOWN ? "WM_KEYDOWN"
-                                 : msg == WM_KEYUP ? "WM_KEYUP" : "Unknown",
+               : msg == WM_KEYUP ? "WM_KEYUP"
+                                 : "Unknown",
                msg, wParam, ::GetMessageTime()));
       MaybeLogKeyState();
       if (Device::Elantech::HandleKeyMessage(aWidget, msg, wParam, lParam)) {
@@ -377,11 +376,10 @@
           ("MouseScroll::ProcessNativeMouseWheelMessage: aWidget=%p, "
            "aMessage=%s, wParam=0x%08X, lParam=0x%08X, point: { x=%d, y=%d }",
            aWidget,
-           aMessage == WM_MOUSEWHEEL
-               ? "WM_MOUSEWHEEL"
-               : aMessage == WM_MOUSEHWHEEL
-                     ? "WM_MOUSEHWHEEL"
-                     : aMessage == WM_VSCROLL ? "WM_VSCROLL" : "WM_HSCROLL",
+           aMessage == WM_MOUSEWHEEL    ? "WM_MOUSEWHEEL"
+           : aMessage == WM_MOUSEHWHEEL ? "WM_MOUSEHWHEEL"
+           : aMessage == WM_VSCROLL     ? "WM_VSCROLL"
+                                        : "WM_HSCROLL",
            aWParam, aLParam, point.x, point.y));
   MaybeLogKeyState();
 
diff -Nru firefox-84.0.2+build1/widget/windows/WinUtils.cpp firefox-85.0+build1/widget/windows/WinUtils.cpp
--- firefox-84.0.2+build1/widget/windows/WinUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WinUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -22,6 +22,7 @@
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/DataSurfaceHelpers.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SchedulerGroup.h"
diff -Nru firefox-84.0.2+build1/widget/windows/WinUtils.h firefox-85.0+build1/widget/windows/WinUtils.h
--- firefox-84.0.2+build1/widget/windows/WinUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/widget/windows/WinUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -36,7 +36,9 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/Vector.h"
 #include "mozilla/WindowsDpiAwareness.h"
+#include "mozilla/gfx/2D.h"
 
 /**
  * NS_INLINE_DECL_IUNKNOWN_REFCOUNTING should be used for defining and
diff -Nru firefox-84.0.2+build1/xpcom/base/AppShutdown.cpp firefox-85.0+build1/xpcom/base/AppShutdown.cpp
--- firefox-84.0.2+build1/xpcom/base/AppShutdown.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/AppShutdown.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/PoisonIOInterposer.h"
 #include "mozilla/Printf.h"
 #include "mozilla/scache/StartupCache.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StartupTimeline.h"
 #include "mozilla/StaticPrefs_toolkit.h"
 #include "mozilla/LateWriteChecks.h"
@@ -37,6 +38,7 @@
 static ShutdownPhase sLateWriteChecksPhase = ShutdownPhase::NotInShutdown;
 static AppShutdownMode sShutdownMode = AppShutdownMode::Normal;
 static Atomic<bool, MemoryOrdering::Relaxed> sIsShuttingDown;
+static int sExitCode = 0;
 
 // These environment variable strings are all deliberately copied and leaked
 // due to requirements of PR_SetEnv and similar.
@@ -66,6 +68,8 @@
 
 bool AppShutdown::IsShuttingDown() { return sIsShuttingDown; }
 
+int AppShutdown::GetExitCode() { return sExitCode; }
+
 void AppShutdown::SaveEnvVarsForPotentialRestart() {
   const char* s = PR_GetEnv("XUL_APP_FILE");
   if (s) {
@@ -124,11 +128,13 @@
 }
 #endif
 
-void AppShutdown::Init(AppShutdownMode aMode) {
+void AppShutdown::Init(AppShutdownMode aMode, int aExitCode) {
   if (sShutdownMode == AppShutdownMode::Normal) {
     sShutdownMode = aMode;
   }
 
+  sExitCode = aExitCode;
+
   // Late-write checks needs to find the profile directory, so it has to
   // be initialized before services::Shutdown or (because of
   // xpcshell tests replacing the service) modules being unloaded.
@@ -184,7 +190,7 @@
     profiler_shutdown(IsFastShutdown::Yes);
 #endif
 
-    DoImmediateExit();
+    DoImmediateExit(sExitCode);
   } else if (aPhase == sLateWriteChecksPhase) {
 #ifdef XP_MACOSX
     OnlyReportDirtyWrites();
@@ -221,15 +227,15 @@
   }
 }
 
-void AppShutdown::DoImmediateExit() {
+void AppShutdown::DoImmediateExit(int aExitCode) {
 #ifdef XP_WIN
   HANDLE process = ::GetCurrentProcess();
-  if (::TerminateProcess(process, 0)) {
+  if (::TerminateProcess(process, aExitCode)) {
     ::WaitForSingleObject(process, INFINITE);
   }
   MOZ_CRASH("TerminateProcess failed.");
 #else
-  _exit(0);
+  _exit(aExitCode);
 #endif
 }
 
diff -Nru firefox-84.0.2+build1/xpcom/base/AppShutdown.h firefox-85.0+build1/xpcom/base/AppShutdown.h
--- firefox-84.0.2+build1/xpcom/base/AppShutdown.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/AppShutdown.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,15 +21,20 @@
   static bool IsShuttingDown();
 
   /**
+   * Returns the current exit code that the process will be terminated with.
+   */
+  static int GetExitCode();
+
+  /**
    * Save environment variables that we might need if the app initiates a
    * restart later in its lifecycle.
    */
   static void SaveEnvVarsForPotentialRestart();
 
   /**
-   * Init the shutdown with the requested shutdown mode.
+   * Init the shutdown with the requested shutdown mode and exit code.
    */
-  static void Init(AppShutdownMode aMode);
+  static void Init(AppShutdownMode aMode, int aExitCode);
 
   /**
    * Confirm that we are in fact going to be shutting down.
@@ -54,8 +59,10 @@
    * destructors for xul.dll.
    *
    * This method terminates the current process without those issues.
+   *
+   * Optionally a custom exit code can be supplied.
    */
-  static void DoImmediateExit();
+  static void DoImmediateExit(int aExitCode = 0);
 
   /**
    * True if the application is currently attempting to shut down in order to
diff -Nru firefox-84.0.2+build1/xpcom/base/CodeAddressService.h firefox-85.0+build1/xpcom/base/CodeAddressService.h
--- firefox-84.0.2+build1/xpcom/base/CodeAddressService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CodeAddressService.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,14 +7,15 @@
 #ifndef CodeAddressService_h__
 #define CodeAddressService_h__
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include "mozilla/AllocPolicy.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/HashTable.h"
-#include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StackWalk.h"
-#include "mozilla/Types.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/xpcom/base/CountingAllocatorBase.h firefox-85.0+build1/xpcom/base/CountingAllocatorBase.h
--- firefox-84.0.2+build1/xpcom/base/CountingAllocatorBase.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CountingAllocatorBase.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef CountingAllocatorBase_h
 #define CountingAllocatorBase_h
 
+#include <cstdlib>
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/mozalloc.h"
diff -Nru firefox-84.0.2+build1/xpcom/base/CycleCollectedJSContext.cpp firefox-85.0+build1/xpcom/base/CycleCollectedJSContext.cpp
--- firefox-84.0.2+build1/xpcom/base/CycleCollectedJSContext.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CycleCollectedJSContext.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -504,8 +504,6 @@
       }
       return NS_OK;
     }
-
-    nsresult Cancel() override { return NS_OK; }
   };
 
   if (Runtime()->IsIdleGCTaskNeeded()) {
@@ -749,15 +747,16 @@
   return NS_OK;
 }
 
-class FinalizationRegistryCleanup::CleanupRunnable : public CancelableRunnable {
+class FinalizationRegistryCleanup::CleanupRunnable
+    : public DiscardableRunnable {
  public:
   explicit CleanupRunnable(FinalizationRegistryCleanup* aCleanupWork)
-      : CancelableRunnable("CleanupRunnable"), mCleanupWork(aCleanupWork) {}
+      : DiscardableRunnable("CleanupRunnable"), mCleanupWork(aCleanupWork) {}
 
   // MOZ_CAN_RUN_SCRIPT_BOUNDARY until Runnable::Run is MOZ_CAN_RUN_SCRIPT.  See
   // bug 1535398.
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
-  NS_IMETHODIMP Run() {
+  NS_IMETHOD Run() override {
     mCleanupWork->DoCleanup();
     return NS_OK;
   }
diff -Nru firefox-84.0.2+build1/xpcom/base/CycleCollectedJSContext.h firefox-85.0+build1/xpcom/base/CycleCollectedJSContext.h
--- firefox-84.0.2+build1/xpcom/base/CycleCollectedJSContext.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CycleCollectedJSContext.h	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,7 @@
 #include "js/Promise.h"
 
 #include "nsCOMPtr.h"
+#include "nsRefPtrHashtable.h"
 #include "nsTArray.h"
 
 class nsCycleCollectionNoteRootCallback;
diff -Nru firefox-84.0.2+build1/xpcom/base/CycleCollectedJSRuntime.cpp firefox-85.0+build1/xpcom/base/CycleCollectedJSRuntime.cpp
--- firefox-84.0.2+build1/xpcom/base/CycleCollectedJSRuntime.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CycleCollectedJSRuntime.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -93,10 +93,6 @@
 #include "nsStringBuffer.h"
 #include "nsWrapperCache.h"
 
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
-
 #if defined(XP_MACOSX)
 #  include "nsMacUtilsImpl.h"
 #endif
@@ -121,7 +117,7 @@
   void* data;
 };
 
-class IncrementalFinalizeRunnable : public CancelableRunnable {
+class IncrementalFinalizeRunnable : public DiscardableRunnable {
   typedef AutoTArray<DeferredFinalizeFunctionHolder, 16> DeferredFinalizeArray;
   typedef CycleCollectedJSRuntime::DeferredFinalizerTable
       DeferredFinalizerTable;
@@ -700,6 +696,8 @@
 #ifdef MOZ_JS_DEV_ERROR_INTERCEPTOR
   JS_SetErrorInterceptorCallback(mJSRuntime, &mErrorInterceptor);
 #endif  // MOZ_JS_DEV_ERROR_INTERCEPTOR
+
+  JS_SetDestroyZoneCallback(aCx, OnZoneDestroyed);
 }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
@@ -734,11 +732,14 @@
 #ifdef DEBUG
   mShutdownCalled = true;
 #endif
+
+  JS_SetDestroyZoneCallback(cx, nullptr);
 }
 
 CycleCollectedJSRuntime::~CycleCollectedJSRuntime() {
   MOZ_COUNT_DTOR(CycleCollectedJSRuntime);
   MOZ_ASSERT(!mDeferredFinalizerTable.Count());
+  MOZ_ASSERT(!mFinalizeRunnable);
   MOZ_ASSERT(mShutdownCalled);
 }
 
@@ -992,15 +993,65 @@
 #ifdef MOZ_GECKO_PROFILER
   if (profiler_thread_is_being_profiled()) {
     if (aProgress == JS::GC_CYCLE_END) {
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          "GCMajor", GCCC, GCMajorMarkerPayload,
-          (aDesc.startTime(aContext), aDesc.endTime(aContext),
-           aDesc.formatJSONProfiler(aContext)));
+      struct GCMajorMarker {
+        static constexpr mozilla::Span<const char> MarkerTypeName() {
+          return mozilla::MakeStringSpan("GCMajor");
+        }
+        static void StreamJSONMarkerData(
+            mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+            const mozilla::ProfilerString8View& aTimingJSON) {
+          if (aTimingJSON.Length() != 0) {
+            aWriter.SplicedJSONProperty("timings", aTimingJSON);
+          } else {
+            aWriter.NullProperty("timings");
+          }
+        }
+        static mozilla::MarkerSchema MarkerTypeDisplay() {
+          using MS = mozilla::MarkerSchema;
+          MS schema{MS::Location::markerChart, MS::Location::markerTable,
+                    MS::Location::timelineMemory};
+          // No display instructions here, there is special handling in the
+          // front-end.
+          return schema;
+        }
+      };
+
+      profiler_add_marker("GCMajor", baseprofiler::category::GCCC,
+                          MarkerTiming::Interval(aDesc.startTime(aContext),
+                                                 aDesc.endTime(aContext)),
+                          GCMajorMarker{},
+                          ProfilerString8View::WrapNullTerminatedString(
+                              aDesc.formatJSONProfiler(aContext).get()));
     } else if (aProgress == JS::GC_SLICE_END) {
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          "GCSlice", GCCC, GCSliceMarkerPayload,
-          (aDesc.lastSliceStart(aContext), aDesc.lastSliceEnd(aContext),
-           aDesc.sliceToJSONProfiler(aContext)));
+      struct GCSliceMarker {
+        static constexpr mozilla::Span<const char> MarkerTypeName() {
+          return mozilla::MakeStringSpan("GCSlice");
+        }
+        static void StreamJSONMarkerData(
+            mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+            const mozilla::ProfilerString8View& aTimingJSON) {
+          if (aTimingJSON.Length() != 0) {
+            aWriter.SplicedJSONProperty("timings", aTimingJSON);
+          } else {
+            aWriter.NullProperty("timings");
+          }
+        }
+        static mozilla::MarkerSchema MarkerTypeDisplay() {
+          using MS = mozilla::MarkerSchema;
+          MS schema{MS::Location::markerChart, MS::Location::markerTable,
+                    MS::Location::timelineMemory};
+          // No display instructions here, there is special handling in the
+          // front-end.
+          return schema;
+        }
+      };
+
+      profiler_add_marker("GCSlice", baseprofiler::category::GCCC,
+                          MarkerTiming::Interval(aDesc.lastSliceStart(aContext),
+                                                 aDesc.lastSliceEnd(aContext)),
+                          GCSliceMarker{},
+                          ProfilerString8View::WrapNullTerminatedString(
+                              aDesc.sliceToJSONProfiler(aContext).get()));
     }
   }
 #endif
@@ -1079,10 +1130,35 @@
 #ifdef MOZ_GECKO_PROFILER
   else if (aProgress == JS::GCNurseryProgress::GC_NURSERY_COLLECTION_END &&
            profiler_thread_is_being_profiled()) {
-    PROFILER_ADD_MARKER_WITH_PAYLOAD(
-        "GCMinor", GCCC, GCMinorMarkerPayload,
-        (self->mLatestNurseryCollectionStart, TimeStamp::Now(),
-         JS::MinorGcToJSON(aContext)));
+    struct GCMinorMarker {
+      static constexpr mozilla::Span<const char> MarkerTypeName() {
+        return mozilla::MakeStringSpan("GCMinor");
+      }
+      static void StreamJSONMarkerData(
+          mozilla::baseprofiler::SpliceableJSONWriter& aWriter,
+          const mozilla::ProfilerString8View& aTimingJSON) {
+        if (aTimingJSON.Length() != 0) {
+          aWriter.SplicedJSONProperty("nursery", aTimingJSON);
+        } else {
+          aWriter.NullProperty("nursery");
+        }
+      }
+      static mozilla::MarkerSchema MarkerTypeDisplay() {
+        using MS = mozilla::MarkerSchema;
+        MS schema{MS::Location::markerChart, MS::Location::markerTable,
+                  MS::Location::timelineMemory};
+        // No display instructions here, there is special handling in the
+        // front-end.
+        return schema;
+      }
+    };
+
+    profiler_add_marker(
+        "GCMinor", baseprofiler::category::GCCC,
+        MarkerTiming::IntervalUntilNowFrom(self->mLatestNurseryCollectionStart),
+        GCMinorMarker{},
+        ProfilerString8View::WrapNullTerminatedString(
+            JS::MinorGcToJSON(aContext).get()));
   }
 #endif
 
@@ -1489,7 +1565,7 @@
 
 IncrementalFinalizeRunnable::IncrementalFinalizeRunnable(
     CycleCollectedJSRuntime* aRt, DeferredFinalizerTable& aFinalizers)
-    : CancelableRunnable("IncrementalFinalizeRunnable"),
+    : DiscardableRunnable("IncrementalFinalizeRunnable"),
       mRuntime(aRt),
       mFinalizeFunctionToRun(0),
       mReleasing(false) {
@@ -1504,10 +1580,12 @@
 
     iter.Remove();
   }
+  MOZ_ASSERT(mDeferredFinalizeFunctions.Length());
 }
 
 IncrementalFinalizeRunnable::~IncrementalFinalizeRunnable() {
-  MOZ_ASSERT(this != mRuntime->mFinalizeRunnable);
+  MOZ_ASSERT(!mDeferredFinalizeFunctions.Length());
+  MOZ_ASSERT(!mRuntime);
 }
 
 void IncrementalFinalizeRunnable::ReleaseNow(bool aLimited) {
@@ -1556,8 +1634,10 @@
   if (mFinalizeFunctionToRun == mDeferredFinalizeFunctions.Length()) {
     MOZ_ASSERT(mRuntime->mFinalizeRunnable == this);
     mDeferredFinalizeFunctions.Clear();
+    CycleCollectedJSRuntime* runtime = mRuntime;
+    mRuntime = nullptr;
     // NB: This may delete this!
-    mRuntime->mFinalizeRunnable = nullptr;
+    runtime->mFinalizeRunnable = nullptr;
   }
 }
 
@@ -1565,12 +1645,13 @@
 IncrementalFinalizeRunnable::Run() {
   AUTO_PROFILER_LABEL("IncrementalFinalizeRunnable::Run", GCCC);
 
-  if (mRuntime->mFinalizeRunnable != this) {
+  if (!mDeferredFinalizeFunctions.Length()) {
     /* These items were already processed synchronously in JSGC_END. */
-    MOZ_ASSERT(!mDeferredFinalizeFunctions.Length());
+    MOZ_ASSERT(!mRuntime);
     return NS_OK;
   }
 
+  MOZ_ASSERT(mRuntime->mFinalizeRunnable == this);
   TimeStamp start = TimeStamp::Now();
   ReleaseNow(true);
 
@@ -1579,6 +1660,8 @@
     if (NS_FAILED(rv)) {
       ReleaseNow(false);
     }
+  } else {
+    MOZ_ASSERT(!mRuntime);
   }
 
   uint32_t duration = (uint32_t)((TimeStamp::Now() - start).ToMilliseconds());
@@ -1718,12 +1801,21 @@
     JS::PrepareForFullGC(cx);
   } else {
     for (auto iter = mZonesWaitingForGC.Iter(); !iter.Done(); iter.Next()) {
-      JS::PrepareZoneForGC(iter.Get()->GetKey());
+      JS::PrepareZoneForGC(cx, iter.Get()->GetKey());
     }
     mZonesWaitingForGC.Clear();
   }
 }
 
+/* static */
+void CycleCollectedJSRuntime::OnZoneDestroyed(JSFreeOp* aFop, JS::Zone* aZone) {
+  // Remove the zone from the set of zones waiting for GC, if present. This can
+  // happen if a zone is added to the set during an incremental GC in which it
+  // is later destroyed.
+  CycleCollectedJSRuntime* runtime = Get();
+  runtime->mZonesWaitingForGC.RemoveEntry(aZone);
+}
+
 void CycleCollectedJSRuntime::EnvironmentPreparer::invoke(
     JS::HandleObject global, js::ScriptEnvironmentPreparer::Closure& closure) {
   MOZ_ASSERT(JS_IsGlobalObject(global));
diff -Nru firefox-84.0.2+build1/xpcom/base/CycleCollectedJSRuntime.h firefox-85.0+build1/xpcom/base/CycleCollectedJSRuntime.h
--- firefox-84.0.2+build1/xpcom/base/CycleCollectedJSRuntime.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/CycleCollectedJSRuntime.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,27 +7,25 @@
 #ifndef mozilla_CycleCollectedJSRuntime_h
 #define mozilla_CycleCollectedJSRuntime_h
 
-#include <queue>
-
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/DeferredFinalize.h"
 #include "mozilla/HashTable.h"
-#include "mozilla/LinkedList.h"
-#include "mozilla/mozalloc.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/SegmentedVector.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "js/TraceKind.h"
+#include "js/TypeDecls.h"
 
 #include "nsCycleCollectionParticipant.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
+#include "nsStringFwd.h"
 #include "nsTHashtable.h"
 
 class nsCycleCollectionNoteRootCallback;
 class nsIException;
-class nsIRunnable;
 class nsWrapperCache;
 
 namespace mozilla {
@@ -338,6 +336,8 @@
     mZonesWaitingForGC.PutEntry(aZone);
   }
 
+  static void OnZoneDestroyed(JSFreeOp* aFop, JS::Zone* aZone);
+
   // Prepare any zones for GC that have been passed to AddZoneWaitingForGC()
   // since the last GC or since the last call to PrepareWaitingZonesForGC(),
   // whichever was most recent. If there were no such zones, prepare for a
diff -Nru firefox-84.0.2+build1/xpcom/base/ErrorList.py firefox-85.0+build1/xpcom/base/ErrorList.py
--- firefox-84.0.2+build1/xpcom/base/ErrorList.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/ErrorList.py	2021-01-18 19:58:27.000000000 +0000
@@ -1086,7 +1086,6 @@
 with modules["DOM_FILE"]:
     errors["NS_ERROR_DOM_FILE_NOT_FOUND_ERR"] = FAILURE(0)
     errors["NS_ERROR_DOM_FILE_NOT_READABLE_ERR"] = FAILURE(1)
-    errors["NS_ERROR_DOM_FILE_ABORT_ERR"] = FAILURE(2)
 
 
 # =======================================================================
diff -Nru firefox-84.0.2+build1/xpcom/base/HoldDropJSObjects.h firefox-85.0+build1/xpcom/base/HoldDropJSObjects.h
--- firefox-84.0.2+build1/xpcom/base/HoldDropJSObjects.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/HoldDropJSObjects.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,11 +7,16 @@
 #ifndef mozilla_HoldDropJSObjects_h
 #define mozilla_HoldDropJSObjects_h
 
-#include "nsCycleCollectionParticipant.h"
+#include <type_traits>
+#include "nsCycleCollectionNoteChild.h"
 
 class nsISupports;
 class nsScriptObjectTracer;
 
+namespace JS {
+class Zone;
+}
+
 // Only HoldJSObjects and DropJSObjects should be called directly.
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/xpcom/base/Logging.cpp firefox-85.0+build1/xpcom/base/Logging.cpp
--- firefox-84.0.2+build1/xpcom/base/Logging.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/Logging.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -23,9 +23,6 @@
 #include "nsDebugImpl.h"
 #include "NSPRLogModulesParser.h"
 #include "LogCommandLineHandler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 
 #include "prenv.h"
 #ifdef XP_WIN
@@ -419,15 +416,33 @@
 
 #ifdef MOZ_GECKO_PROFILER
     if (mAddProfilerMarker && profiler_can_accept_markers()) {
-      if (aStart) {
-        PROFILER_ADD_MARKER_WITH_PAYLOAD(
-            "LogMessages", OTHER, LogMarkerPayload,
-            (aName, buffToWrite, *aStart, TimeStamp::Now()));
-      } else {
-        PROFILER_ADD_MARKER_WITH_PAYLOAD(
-            "LogMessages", OTHER, LogMarkerPayload,
-            (aName, buffToWrite, TimeStamp::Now()));
-      }
+      struct LogMarker {
+        static constexpr Span<const char> MarkerTypeName() {
+          return MakeStringSpan("Log");
+        }
+        static void StreamJSONMarkerData(
+            baseprofiler::SpliceableJSONWriter& aWriter,
+            const ProfilerString8View& aModule,
+            const ProfilerString8View& aText) {
+          aWriter.StringProperty("module", aModule);
+          aWriter.StringProperty("name", aText);
+        }
+        static MarkerSchema MarkerTypeDisplay() {
+          using MS = MarkerSchema;
+          MS schema{MS::Location::markerTable};
+          schema.SetTableLabel("({marker.data.module}) {marker.data.name}");
+          schema.AddKeyLabelFormat("module", "Module", MS::Format::string);
+          schema.AddKeyLabelFormat("name", "Name", MS::Format::string);
+          return schema;
+        }
+      };
+
+      profiler_add_marker(
+          "LogMessages", geckoprofiler::category::OTHER,
+          aStart ? MarkerTiming::IntervalUntilNowFrom(*aStart)
+                 : MarkerTiming::InstantNow(),
+          LogMarker{}, ProfilerString8View::WrapNullTerminatedString(aName),
+          ProfilerString8View::WrapNullTerminatedString(buffToWrite));
     }
 #endif
 
diff -Nru firefox-84.0.2+build1/xpcom/base/Logging.h firefox-85.0+build1/xpcom/base/Logging.h
--- firefox-84.0.2+build1/xpcom/base/Logging.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/Logging.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,8 @@
 #ifndef mozilla_logging_h
 #define mozilla_logging_h
 
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -14,7 +16,6 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Likely.h"
-#include "mozilla/TimeStamp.h"
 
 // We normally have logging enabled everywhere, but measurements showed that
 // having logging enabled on Android is quite expensive (hundreds of kilobytes
@@ -40,6 +41,8 @@
 
 namespace mozilla {
 
+class TimeStamp;
+
 // While not a 100% mapping to PR_LOG's numeric values, mozilla::LogLevel does
 // maintain a direct mapping for the Disabled, Debug and Verbose levels.
 //
diff -Nru firefox-84.0.2+build1/xpcom/base/MemoryInfo.h firefox-85.0+build1/xpcom/base/MemoryInfo.h
--- firefox-84.0.2+build1/xpcom/base/MemoryInfo.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/MemoryInfo.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,9 +7,10 @@
 #ifndef mozilla_MemoryInfo_h
 #define mozilla_MemoryInfo_h
 
+#include <cstddef>
+#include <cstdint>
+#include "mozilla/Attributes.h"
 #include "mozilla/EnumSet.h"
-#include "nsTArray.h"
-
 /**
  * MemoryInfo is a helper class which describes the attributes and sizes of a
  * particular region of VM memory on Windows. It roughtly corresponds to the
diff -Nru firefox-84.0.2+build1/xpcom/base/MemoryMapping.h firefox-85.0+build1/xpcom/base/MemoryMapping.h
--- firefox-84.0.2+build1/xpcom/base/MemoryMapping.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/MemoryMapping.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,9 +7,10 @@
 #ifndef mozilla_MemoryMapping_h
 #define mozilla_MemoryMapping_h
 
+#include <cstdint>
 #include "mozilla/EnumSet.h"
-#include "nsString.h"
-#include "nsTArray.h"
+#include "nsStringFwd.h"
+#include "nsTArrayForwardDeclare.h"
 
 /**
  * MemoryMapping is a helper class which describes an entry in the Linux
diff -Nru firefox-84.0.2+build1/xpcom/base/MemoryReportingProcess.h firefox-85.0+build1/xpcom/base/MemoryReportingProcess.h
--- firefox-84.0.2+build1/xpcom/base/MemoryReportingProcess.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/MemoryReportingProcess.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,6 +15,9 @@
 class FileDescriptor;
 }  // namespace ipc
 
+template <class T>
+class Maybe;
+
 // Top-level process actors should implement this to integrate with
 // nsMemoryReportManager.
 class MemoryReportingProcess {
diff -Nru firefox-84.0.2+build1/xpcom/base/MemoryTelemetry.cpp firefox-85.0+build1/xpcom/base/MemoryTelemetry.cpp
--- firefox-84.0.2+build1/xpcom/base/MemoryTelemetry.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/MemoryTelemetry.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -23,6 +23,7 @@
 #include "nsIMemoryReporter.h"
 #include "nsIWindowMediator.h"
 #include "nsImportModule.h"
+#include "nsITelemetry.h"
 #include "nsNetCID.h"
 #include "nsObserverService.h"
 #include "nsReadableUtils.h"
diff -Nru firefox-84.0.2+build1/xpcom/base/MemoryTelemetry.h firefox-85.0+build1/xpcom/base/MemoryTelemetry.h
--- firefox-84.0.2+build1/xpcom/base/MemoryTelemetry.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/MemoryTelemetry.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Result.h"
-#include "nsIEventTarget.h"
 #include "nsIObserver.h"
 #include "nsITimer.h"
 #include "nsTArray.h"
@@ -17,6 +16,8 @@
 
 #include <functional>
 
+class nsIEventTarget;
+
 namespace mozilla {
 
 namespace ipc {
diff -Nru firefox-84.0.2+build1/xpcom/base/nsAlgorithm.h firefox-85.0+build1/xpcom/base/nsAlgorithm.h
--- firefox-84.0.2+build1/xpcom/base/nsAlgorithm.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsAlgorithm.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,7 +7,8 @@
 #ifndef nsAlgorithm_h___
 #define nsAlgorithm_h___
 
-#include "nsCharTraits.h"  // for |nsCharSourceTraits|, |nsCharSinkTraits|
+#include <cstdint>
+#include "mozilla/Assertions.h"
 
 template <class T>
 inline T NS_ROUNDUP(const T& aA, const T& aB) {
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCOMPtr.h firefox-85.0+build1/xpcom/base/nsCOMPtr.h
--- firefox-84.0.2+build1/xpcom/base/nsCOMPtr.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCOMPtr.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,7 +21,6 @@
  */
 
 #include <type_traits>
-#include <utility>
 
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
diff -Nru firefox-84.0.2+build1/xpcom/base/nsConsoleService.cpp firefox-85.0+build1/xpcom/base/nsConsoleService.cpp
--- firefox-84.0.2+build1/xpcom/base/nsConsoleService.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsConsoleService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -11,7 +11,6 @@
 
 /* Threadsafe. */
 
-#include "nsMemory.h"
 #include "nsCOMArray.h"
 #include "nsThreadUtils.h"
 
@@ -28,7 +27,6 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/BrowserParent.h"
 
-#include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/base/nsConsoleService.h firefox-85.0+build1/xpcom/base/nsConsoleService.h
--- firefox-84.0.2+build1/xpcom/base/nsConsoleService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsConsoleService.h	2021-01-18 19:58:27.000000000 +0000
@@ -11,14 +11,26 @@
 #ifndef __nsconsoleservice_h__
 #define __nsconsoleservice_h__
 
-#include "mozilla/Attributes.h"
+#include <cstdint>
+#include <utility>
+
+#include "mozilla/Assertions.h"
+#include "mozilla/LinkedList.h"
 #include "mozilla/Mutex.h"
 
+#include "MainThreadUtils.h"
+#include "nsCOMPtr.h"
 #include "nsInterfaceHashtable.h"
 #include "nsHashKeys.h"
 
+#include "nsIConsoleListener.h"
+#include "nsIConsoleMessage.h"
 #include "nsIConsoleService.h"
 #include "nsIObserver.h"
+#include "nsISupports.h"
+
+template <class T>
+class nsCOMArray;
 
 class nsConsoleService final : public nsIConsoleService, public nsIObserver {
  public:
diff -Nru firefox-84.0.2+build1/xpcom/base/nscore.h firefox-85.0+build1/xpcom/base/nscore.h
--- firefox-84.0.2+build1/xpcom/base/nscore.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nscore.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,7 @@
  * c++ definitions needed by nscore.h
  */
 #ifndef _XPCOM_CONFIG_H_
-#  include "xpcom-config.h"
+#  include "xpcom-config.h"  // IWYU pragma: export
 #endif
 
 /* Definitions of functions and operators that allocate memory. */
@@ -23,10 +23,10 @@
 /**
  * Incorporate the integer data types which XPCOM uses.
  */
-#include <stddef.h>
-#include <stdint.h>
+#include <stddef.h>  // IWYU pragma: export
+#include <stdint.h>  // IWYU pragma: export
 
-#include "mozilla/HelperMacros.h"
+#include "mozilla/HelperMacros.h"  // IWYU pragma: export
 #include "mozilla/RefCountType.h"
 
 /* Core XPCOM declarations. */
@@ -200,7 +200,7 @@
 /**
  * Generic XPCOM result data type
  */
-#include "nsError.h"
+#include "nsError.h"  // IWYU pragma: export
 
 typedef MozRefCountType nsrefcnt;
 
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCycleCollectionNoteRootCallback.h firefox-85.0+build1/xpcom/base/nsCycleCollectionNoteRootCallback.h
--- firefox-84.0.2+build1/xpcom/base/nsCycleCollectionNoteRootCallback.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCycleCollectionNoteRootCallback.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,8 +7,15 @@
 #ifndef nsCycleCollectionNoteRootCallback_h__
 #define nsCycleCollectionNoteRootCallback_h__
 
+#include "nscore.h"
+
 class nsCycleCollectionParticipant;
 class nsISupports;
+class JSObject;
+
+namespace JS {
+class GCCellPtr;
+}
 
 class nsCycleCollectionNoteRootCallback {
  public:
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCycleCollectionParticipant.h firefox-85.0+build1/xpcom/base/nsCycleCollectionParticipant.h
--- firefox-84.0.2+build1/xpcom/base/nsCycleCollectionParticipant.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCycleCollectionParticipant.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,10 +7,14 @@
 #ifndef nsCycleCollectionParticipant_h__
 #define nsCycleCollectionParticipant_h__
 
-#include "mozilla/MacroArgs.h"
+#include <type_traits>
+#include "js/HeapAPI.h"
+#include "js/TypeDecls.h"
 #include "mozilla/MacroForEach.h"
 #include "nsCycleCollectionNoteChild.h"
-#include "js/RootingAPI.h"
+#include "nsDebug.h"
+#include "nsID.h"
+#include "nscore.h"
 
 /**
  * Note: the following two IIDs only differ in one bit in the last byte.  This
@@ -49,11 +53,15 @@
 NS_DEFINE_STATIC_IID_ACCESSOR(nsCycleCollectionISupports,
                               NS_CYCLECOLLECTIONISUPPORTS_IID)
 
+class nsCycleCollectionTraversalCallback;
+class nsISupports;
 class nsWrapperCache;
 
 namespace JS {
 template <class T>
 class Heap;
+template <typename T>
+class TenuredHeap;
 } /* namespace JS */
 
 /*
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCycleCollectionTraversalCallback.h firefox-85.0+build1/xpcom/base/nsCycleCollectionTraversalCallback.h
--- firefox-84.0.2+build1/xpcom/base/nsCycleCollectionTraversalCallback.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCycleCollectionTraversalCallback.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,11 +7,15 @@
 #ifndef nsCycleCollectionTraversalCallback_h__
 #define nsCycleCollectionTraversalCallback_h__
 
-#include "jspubtd.h"
-#include "js/HeapAPI.h"
-#include "nsISupports.h"
+#include <cstdint>
+#include "nscore.h"
 
 class nsCycleCollectionParticipant;
+class nsISupports;
+
+namespace JS {
+class GCCellPtr;
+}
 
 class NS_NO_VTABLE nsCycleCollectionTraversalCallback {
  public:
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCycleCollector.cpp firefox-85.0+build1/xpcom/base/nsCycleCollector.cpp
--- firefox-84.0.2+build1/xpcom/base/nsCycleCollector.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCycleCollector.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -166,6 +166,7 @@
 #include <utility>
 
 #include "GeckoProfiler.h"
+#include "js/SliceBudget.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/AutoGlobalTimelineMarker.h"
 #include "mozilla/Likely.h"
@@ -1333,10 +1334,10 @@
   Type mType;
 };
 
-class LogStringMessageAsync : public CancelableRunnable {
+class LogStringMessageAsync : public DiscardableRunnable {
  public:
   explicit LogStringMessageAsync(const nsAString& aMsg)
-      : mozilla::CancelableRunnable("LogStringMessageAsync"), mMsg(aMsg) {}
+      : mozilla::DiscardableRunnable("LogStringMessageAsync"), mMsg(aMsg) {}
 
   NS_IMETHOD Run() override {
     nsCOMPtr<nsIConsoleService> cs =
diff -Nru firefox-84.0.2+build1/xpcom/base/nsCycleCollector.h firefox-85.0+build1/xpcom/base/nsCycleCollector.h
--- firefox-84.0.2+build1/xpcom/base/nsCycleCollector.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsCycleCollector.h	2021-01-18 19:58:27.000000000 +0000
@@ -13,11 +13,12 @@
 template <class T>
 struct already_AddRefed;
 
-#include "nsError.h"
-#include "nsID.h"
-
+#include <cstdint>
 #include "mozilla/Attributes.h"
-#include "js/SliceBudget.h"
+
+namespace js {
+class SliceBudget;
+}
 
 namespace mozilla {
 class CycleCollectedJSContext;
diff -Nru firefox-84.0.2+build1/xpcom/base/nsError.h firefox-85.0+build1/xpcom/base/nsError.h
--- firefox-84.0.2+build1/xpcom/base/nsError.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsError.h	2021-01-18 19:58:27.000000000 +0000
@@ -19,7 +19,7 @@
 #define NS_ERROR_SEVERITY_SUCCESS 0
 #define NS_ERROR_SEVERITY_ERROR 1
 
-#include "ErrorList.h"
+#include "ErrorList.h"  // IWYU pragma: export
 
 /**
  * @name Standard Error Handling Macros
diff -Nru firefox-84.0.2+build1/xpcom/base/nsGZFileWriter.h firefox-85.0+build1/xpcom/base/nsGZFileWriter.h
--- firefox-84.0.2+build1/xpcom/base/nsGZFileWriter.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsGZFileWriter.h	2021-01-18 19:58:27.000000000 +0000
@@ -24,13 +24,12 @@
   NS_DECL_ISUPPORTS
   NS_DECL_NSIGZFILEWRITER
 
-      /**
-       * nsIGZFileWriter exposes two non-virtual overloads of Write().  We
-       * duplicate them here so that you can call these overloads on a pointer
-       * to the concrete nsGZFileWriter class.
-       */
-      [[nodiscard]] nsresult
-      Write(const char* aStr) {
+  /**
+   * nsIGZFileWriter exposes two non-virtual overloads of Write().  We
+   * duplicate them here so that you can call these overloads on a pointer
+   * to the concrete nsGZFileWriter class.
+   */
+  [[nodiscard]] nsresult Write(const char* aStr) {
     return nsIGZFileWriter::Write(aStr);
   }
 
diff -Nru firefox-84.0.2+build1/xpcom/base/nsMacPreferencesReader.mm firefox-85.0+build1/xpcom/base/nsMacPreferencesReader.mm
--- firefox-84.0.2+build1/xpcom/base/nsMacPreferencesReader.mm	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsMacPreferencesReader.mm	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,8 @@
 #include "nsMacPreferencesReader.h"
 
 #include "js/JSON.h"
+#include "js/RootingAPI.h"
+#include "js/Value.h"
 #include "JSONWriter.h"
 
 NS_IMPL_ISUPPORTS(nsMacPreferencesReader, nsIMacPreferencesReader)
diff -Nru firefox-84.0.2+build1/xpcom/base/nsMacUtilsImpl.cpp firefox-85.0+build1/xpcom/base/nsMacUtilsImpl.cpp
--- firefox-84.0.2+build1/xpcom/base/nsMacUtilsImpl.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsMacUtilsImpl.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/dom/ContentChild.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsCOMPtr.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIFile.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
@@ -566,14 +567,14 @@
   // sandboxing may interfere with translation.
   MOZ_ASSERT(XRE_IsParentProcess());
   if (!XRE_IsParentProcess()) {
-      return -1;
+    return -1;
   }
 
   // Translation can take several seconds and therefore
   // should not be done on the main thread.
   MOZ_ASSERT(!NS_IsMainThread());
   if (NS_IsMainThread()) {
-      return -1;
+    return -1;
   }
 
   // @available() is not available for macOS 11 at this time so use
diff -Nru firefox-84.0.2+build1/xpcom/base/nsMemory.h firefox-85.0+build1/xpcom/base/nsMemory.h
--- firefox-84.0.2+build1/xpcom/base/nsMemory.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsMemory.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef nsMemory_h__
 #define nsMemory_h__
 
-#include "nsXPCOM.h"
+#include "nsError.h"
 
 class nsIMemory;
 
diff -Nru firefox-84.0.2+build1/xpcom/base/nsMemoryReporterManager.cpp firefox-85.0+build1/xpcom/base/nsMemoryReporterManager.cpp
--- firefox-84.0.2+build1/xpcom/base/nsMemoryReporterManager.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsMemoryReporterManager.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -4,13 +4,14 @@
  * 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 "nsMemoryReporterManager.h"
+
 #include "nsAtomTable.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "nsPrintfCString.h"
 #include "nsProxyRelease.h"
 #include "nsServiceManagerUtils.h"
-#include "nsMemoryReporterManager.h"
 #include "nsITimer.h"
 #include "nsThreadUtils.h"
 #include "nsPIDOMWindow.h"
@@ -1132,8 +1133,8 @@
 };
 NS_IMPL_ISUPPORTS(PageFaultsSoftReporter, nsIMemoryReporter)
 
-[[nodiscard]] static nsresult
-    PageFaultsHardDistinguishedAmount(int64_t* aAmount) {
+[[nodiscard]] static nsresult PageFaultsHardDistinguishedAmount(
+    int64_t* aAmount) {
   struct rusage usage;
   int err = getrusage(RUSAGE_SELF, &usage);
   if (err != 0) {
diff -Nru firefox-84.0.2+build1/xpcom/base/nsMemoryReporterManager.h firefox-85.0+build1/xpcom/base/nsMemoryReporterManager.h
--- firefox-84.0.2+build1/xpcom/base/nsMemoryReporterManager.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsMemoryReporterManager.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,11 +10,9 @@
 #include "mozilla/Mutex.h"
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
-#include "nsIEventTarget.h"
 #include "nsIMemoryReporter.h"
-#include "nsITimer.h"
+#include "nsISupports.h"
 #include "nsServiceManagerUtils.h"
-#include "nsDataHashtable.h"
 
 #ifdef XP_WIN
 #  include <windows.h>
@@ -27,6 +25,9 @@
 }  // namespace dom
 }  // namespace mozilla
 
+class mozIDOMWindowProxy;
+class nsIEventTarget;
+class nsIRunnable;
 class nsITimer;
 
 class nsMemoryReporterManager final : public nsIMemoryReporterManager,
@@ -43,10 +44,10 @@
   nsMemoryReporterManager();
 
   // Gets the memory reporter manager service.
-  static nsMemoryReporterManager* GetOrCreate() {
+  static already_AddRefed<nsMemoryReporterManager> GetOrCreate() {
     nsCOMPtr<nsIMemoryReporterManager> imgr =
         do_GetService("@mozilla.org/memory-reporter-manager;1");
-    return static_cast<nsMemoryReporterManager*>(imgr.get());
+    return imgr.forget().downcast<nsMemoryReporterManager>();
   }
 
   typedef nsDataHashtable<nsRefPtrHashKey<nsIMemoryReporter>, bool>
diff -Nru firefox-84.0.2+build1/xpcom/base/nsSystemInfo.h firefox-85.0+build1/xpcom/base/nsSystemInfo.h
--- firefox-84.0.2+build1/xpcom/base/nsSystemInfo.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsSystemInfo.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,12 +10,13 @@
 #include "nsHashPropertyBag.h"
 #include "nsISystemInfo.h"
 #include "mozilla/MozPromise.h"
-#include "mozilla/LazyIdleThread.h"
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "mozilla/dom/PContent.h"
 #endif  // MOZ_WIDGET_ANDROID
 
+class nsISerialEventTarget;
+
 struct FolderDiskInfo {
   nsCString model;
   nsCString revision;
diff -Nru firefox-84.0.2+build1/xpcom/base/nsTraceRefcnt.cpp firefox-85.0+build1/xpcom/base/nsTraceRefcnt.cpp
--- firefox-84.0.2+build1/xpcom/base/nsTraceRefcnt.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/nsTraceRefcnt.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -296,7 +296,7 @@
   nsTraceRefcntStats mStats;
 };
 
-static void CheckAndCreateBloatView() {
+static void EnsureBloatView() {
   if (!gBloatView) {
     gBloatView = new BloatHash(256);
   }
@@ -304,7 +304,7 @@
 
 static BloatEntry* GetBloatEntry(const char* aTypeName,
                                  uint32_t aInstanceSize) {
-  CheckAndCreateBloatView();
+  EnsureBloatView();
   BloatEntry* entry = gBloatView->Get(aTypeName);
   if (!entry && aInstanceSize > 0) {
     entry = new BloatEntry(aTypeName, aInstanceSize);
@@ -574,15 +574,9 @@
         InitLog(ENVVAR("XPCOM_MEM_LEAK_LOG"), "leaks", &gBloatLog, aProcType);
   }
   if (defined || gLogLeaksOnly) {
-    // Use the same bloat view, if there is, to keep it consistent
-    // through the fork server and content processes.
-    CheckAndCreateBloatView();
-
-    if (!gBloatView) {
-      NS_WARNING("out of memory");
-      maybeUnregisterAndCloseFile(gBloatLog);
-      gLogLeaksOnly = false;
-    }
+    // Use the same bloat view, if there is one, to keep it consistent
+    // between the fork server and content processes.
+    EnsureBloatView();
   } else if (gBloatView) {
     nsTraceRefcnt::ResetStatistics();
   }
diff -Nru firefox-84.0.2+build1/xpcom/base/SizeOfState.h firefox-85.0+build1/xpcom/base/SizeOfState.h
--- firefox-84.0.2+build1/xpcom/base/SizeOfState.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/SizeOfState.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,7 +8,6 @@
 #define SizeOfState_h
 
 #include "mozilla/fallible.h"
-#include "mozilla/Maybe.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Unused.h"
 #include "nsTHashtable.h"
diff -Nru firefox-84.0.2+build1/xpcom/base/TupleCycleCollection.h firefox-85.0+build1/xpcom/base/TupleCycleCollection.h
--- firefox-84.0.2+build1/xpcom/base/TupleCycleCollection.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/base/TupleCycleCollection.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,7 +8,9 @@
 #define TupleCycleCollection_h
 
 #include "mozilla/Tuple.h"
-#include "nsCycleCollectionTraversalCallback.h"
+#include "nsCycleCollectionNoteChild.h"
+
+class nsCycleCollectionTraversalCallback;
 
 template <typename... Elements>
 inline void ImplCycleCollectionUnlink(mozilla::Tuple<Elements...>& aField) {
diff -Nru firefox-84.0.2+build1/xpcom/build/BinaryPath.h firefox-85.0+build1/xpcom/build/BinaryPath.h
--- firefox-84.0.2+build1/xpcom/build/BinaryPath.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/build/BinaryPath.h	2021-01-18 19:58:27.000000000 +0000
@@ -160,6 +160,17 @@
       return NS_ERROR_FAILURE;
     }
     aResult[len] = '\0';
+#  if defined(XP_LINUX)
+    // Removing suffix " (deleted)" from the binary path
+    const char suffix[] = " (deleted)";
+    const ssize_t suffix_len = sizeof(suffix);
+    if (len >= suffix_len) {
+      char* result_end = &aResult[len - (suffix_len - 1)];
+      if (memcmp(result_end, suffix, suffix_len) == 0) {
+        *result_end = '\0';
+      }
+    }
+#  endif
     return NS_OK;
   }
 
diff -Nru firefox-84.0.2+build1/xpcom/build/nsXULAppAPI.h firefox-85.0+build1/xpcom/build/nsXULAppAPI.h
--- firefox-84.0.2+build1/xpcom/build/nsXULAppAPI.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/build/nsXULAppAPI.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,25 +7,31 @@
 #ifndef _nsXULAppAPI_h__
 #define _nsXULAppAPI_h__
 
-#include "nsID.h"
-#include "xrecore.h"
-#include "nsXPCOM.h"
-#include "nsISupports.h"
-#include "mozilla/Logging.h"
-#include "mozilla/XREAppData.h"
 #include "js/TypeDecls.h"
-
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/Assertions.h"
-#include "mozilla/Vector.h"
 #include "mozilla/TimeStamp.h"
-#include "XREChildData.h"
-#include "XREShellData.h"
+#include "nscore.h"
+#include "xrecore.h"
 
 #if defined(MOZ_WIDGET_ANDROID)
 #  include <jni.h>
 #endif
 
+class JSString;
+class MessageLoop;
+class nsIDirectoryServiceProvider;
+class nsIFile;
+class nsISupports;
+struct JSContext;
+struct XREChildData;
+struct XREShellData;
+
+namespace mozilla {
+class XREAppData;
+struct BootstrapConfig;
+struct Module;
+}  // namespace mozilla
+
 /**
  * A directory service key which provides the platform-correct "application
  * data" directory as follows, where $name and $vendor are as defined above and
@@ -205,9 +211,6 @@
  * @note           If the binary is linked against the standalone XPCOM glue,
  *                 XPCOMGlueStartup() should be called before this method.
  */
-namespace mozilla {
-struct BootstrapConfig;
-}
 XRE_API(int, XRE_main,
         (int argc, char* argv[], const mozilla::BootstrapConfig& aConfig))
 
@@ -454,8 +457,6 @@
 
 XRE_API(nsresult, XRE_DeinitCommandLine, ())
 
-class MessageLoop;
-
 XRE_API(void, XRE_ShutdownChildProcess, ())
 
 XRE_API(MessageLoop*, XRE_GetIOMessageLoop, ())
diff -Nru firefox-84.0.2+build1/xpcom/components/Module.h firefox-85.0+build1/xpcom/components/Module.h
--- firefox-84.0.2+build1/xpcom/components/Module.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/components/Module.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,7 +21,7 @@
  * via a module loader.
  */
 struct Module {
-  static const unsigned int kVersion = 84;
+  static const unsigned int kVersion = 85;
 
   struct CIDEntry;
 
diff -Nru firefox-84.0.2+build1/xpcom/components/nsComponentManager.cpp firefox-85.0+build1/xpcom/components/nsComponentManager.cpp
--- firefox-84.0.2+build1/xpcom/components/nsComponentManager.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/components/nsComponentManager.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -209,39 +209,6 @@
   Variant<nsFactoryEntry*, const StaticModule*> mEntry;
 };
 
-// GetService and a few other functions need to exit their mutex mid-function
-// without reentering it later in the block. This class supports that
-// style of early-exit that MutexAutoUnlock doesn't.
-
-class MOZ_STACK_CLASS MutexLock {
- public:
-  explicit MutexLock(SafeMutex& aMutex) : mMutex(aMutex), mLocked(false) {
-    Lock();
-  }
-
-  ~MutexLock() {
-    if (mLocked) {
-      Unlock();
-    }
-  }
-
-  void Lock() {
-    NS_ASSERTION(!mLocked, "Re-entering a mutex");
-    mMutex.Lock();
-    mLocked = true;
-  }
-
-  void Unlock() {
-    NS_ASSERTION(mLocked, "Exiting a mutex that isn't held!");
-    mMutex.Unlock();
-    mLocked = false;
-  }
-
- private:
-  SafeMutex& mMutex;
-  bool mLocked;
-};
-
 }  // namespace
 
 // this is safe to call during InitXPCOM
@@ -577,7 +544,7 @@
   {
     // Scope the monitor so that we don't hold it while calling into the
     // category manager.
-    MutexLock lock(mLock);
+    MonitorAutoLock lock(mLock);
 
     KnownModule* m = new KnownModule(aModule);
     mKnownStaticModules.AppendElement(m);
@@ -638,7 +605,7 @@
     } else {
       existing = "<unknown module>";
     }
-    SafeMutexAutoUnlock unlock(mLock);
+    MonitorAutoUnlock unlock(mLock);
     LogMessage(
         "While registering XPCOM module %s, trying to re-register CID '%s' "
         "already registered by %s.",
@@ -677,7 +644,7 @@
   if (!f) {
     NS_WARNING("No CID found when attempting to map contract ID");
 
-    SafeMutexAutoUnlock unlock(mLock);
+    MonitorAutoUnlock unlock(mLock);
     LogMessage(
         "Could not map contract ID '%s' to CID %s because no implementation of "
         "the CID is registered.",
@@ -743,11 +710,11 @@
   nsCString hash;
   fl.GetURIString(hash);
 
-  MutexLock lock(mLock);
-  if (Maybe<EntryWrapper> f = LookupByCID(lock, cid)) {
+  Maybe<MonitorAutoLock> lock(std::in_place, mLock);
+  if (Maybe<EntryWrapper> f = LookupByCID(*lock, cid)) {
     nsCString existing(f->ModuleDescription());
 
-    lock.Unlock();
+    lock.reset();
 
     LogMessageWithContext(
         aCx.mFile, aLineNo,
@@ -788,10 +755,10 @@
     return;
   }
 
-  MutexLock lock(mLock);
+  Maybe<MonitorAutoLock> lock(std::in_place, mLock);
   nsFactoryEntry* f = mFactories.Get(&cid);
   if (!f) {
-    lock.Unlock();
+    lock.reset();
     LogMessageWithContext(aCx.mFile, aLineNo,
                           "Could not map contract ID '%s' to CID %s because no "
                           "implementation of the CID is registered.",
@@ -926,10 +893,10 @@
 }
 
 Maybe<EntryWrapper> nsComponentManagerImpl::LookupByCID(const nsID& aCID) {
-  return LookupByCID(MutexLock(mLock), aCID);
+  return LookupByCID(MonitorAutoLock(mLock), aCID);
 }
 
-Maybe<EntryWrapper> nsComponentManagerImpl::LookupByCID(const MutexLock&,
+Maybe<EntryWrapper> nsComponentManagerImpl::LookupByCID(const MonitorAutoLock&,
                                                         const nsID& aCID) {
   if (const StaticModule* module = StaticComponents::LookupByCID(aCID)) {
     return Some(EntryWrapper(module));
@@ -942,11 +909,11 @@
 
 Maybe<EntryWrapper> nsComponentManagerImpl::LookupByContractID(
     const nsACString& aContractID) {
-  return LookupByContractID(MutexLock(mLock), aContractID);
+  return LookupByContractID(MonitorAutoLock(mLock), aContractID);
 }
 
 Maybe<EntryWrapper> nsComponentManagerImpl::LookupByContractID(
-    const MutexLock&, const nsACString& aContractID) {
+    const MonitorAutoLock&, const nsACString& aContractID) {
   if (const StaticModule* module =
           StaticComponents::LookupByContractID(aContractID)) {
     return Some(EntryWrapper(module));
@@ -1228,12 +1195,14 @@
 }
 
 // This should only ever be called within the monitor!
-void nsComponentManagerImpl::RemovePendingService(const nsCID& aServiceCID) {
+void nsComponentManagerImpl::RemovePendingService(MonitorAutoLock& aLock,
+                                                  const nsCID& aServiceCID) {
   uint32_t pendingCount = mPendingServices.Length();
   for (uint32_t index = 0; index < pendingCount; ++index) {
     const PendingServiceInfo& info = mPendingServices.ElementAt(index);
     if (info.cid->Equals(aServiceCID)) {
       mPendingServices.RemoveElementAt(index);
+      aLock.NotifyAll();
       return;
     }
   }
@@ -1252,21 +1221,23 @@
   return nullptr;
 }
 
-nsresult nsComponentManagerImpl::GetServiceLocked(MutexLock& aLock,
+nsresult nsComponentManagerImpl::GetServiceLocked(Maybe<MonitorAutoLock>& aLock,
                                                   EntryWrapper& aEntry,
                                                   const nsIID& aIID,
                                                   void** aResult) {
+  MOZ_ASSERT(aLock.isSome());
+  if (!aLock.isSome()) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
   if (auto* service = aEntry.ServiceInstance()) {
-    aLock.Unlock();
+    aLock.reset();
     return service->QueryInterface(aIID, aResult);
   }
 
   PRThread* currentPRThread = PR_GetCurrentThread();
   MOZ_ASSERT(currentPRThread, "This should never be null!");
 
-  // Needed to optimize the event loop below.
-  nsIThread* currentThread = nullptr;
-
   PRThread* pendingPRThread;
   while ((pendingPRThread = GetPendingServiceThread(aEntry.CID()))) {
     if (pendingPRThread == currentPRThread) {
@@ -1274,32 +1245,13 @@
       return NS_ERROR_NOT_AVAILABLE;
     }
 
-    SafeMutexAutoUnlock unlockPending(mLock);
-
-    // If the current thread doesn't have an associated nsThread, then it's a
-    // thread that doesn't have an event loop to process, so we'll just try
-    // to yield to another thread in an attempt to make progress.
-    if (!nsThreadManager::get().IsNSThread()) {
-      PR_Sleep(PR_INTERVAL_NO_WAIT);
-      continue;
-    }
-
-    if (!currentThread) {
-      currentThread = NS_GetCurrentThread();
-      MOZ_ASSERT(currentThread, "This should never be null!");
-    }
-
-    // This will process a single event or yield the thread if no event is
-    // pending.
-    if (!NS_ProcessNextEvent(currentThread, false)) {
-      PR_Sleep(PR_INTERVAL_NO_WAIT);
-    }
+    aLock->Wait();
   }
 
   // It's still possible that the other thread failed to create the
   // service so we're not guaranteed to have an entry or service yet.
   if (auto* service = aEntry.ServiceInstance()) {
-    aLock.Unlock();
+    aLock.reset();
     return service->QueryInterface(aIID, aResult);
   }
 
@@ -1314,16 +1266,16 @@
   nsCOMPtr<nsISupports> service;
   auto cleanup = MakeScopeExit([&]() {
     // `service` must be released after the lock is released, so if we fail and
-    // still have a reference, release the lock before relasing it.
+    // still have a reference, release the lock before releasing it.
     if (service) {
-      aLock.Unlock();
+      MOZ_ASSERT(aLock.isSome());
+      aLock.reset();
       service = nullptr;
     }
   });
-
   nsresult rv;
   {
-    SafeMutexAutoUnlock unlock(mLock);
+    MonitorAutoUnlock unlock(mLock);
     AUTO_PROFILER_MARKER_TEXT(
         "GetService", OTHER, MarkerStack::Capture(),
         nsDependentCString(nsIDToCString(aEntry.CID()).get()));
@@ -1339,7 +1291,8 @@
   MOZ_ASSERT(pendingPRThread == currentPRThread,
              "Pending service array has been changed!");
 #endif
-  RemovePendingService(aEntry.CID());
+  MOZ_ASSERT(aLock.isSome());
+  RemovePendingService(*aLock, aEntry.CID());
 
   if (NS_FAILED(rv)) {
     return rv;
@@ -1350,7 +1303,8 @@
 
   aEntry.SetServiceInstance(service.forget());
 
-  aLock.Unlock();
+  aLock.reset();
+
   *aResult = do_AddRef(aEntry.ServiceInstance()).take();
   return NS_OK;
 }
@@ -1372,9 +1326,9 @@
     return NS_ERROR_UNEXPECTED;
   }
 
-  MutexLock lock(mLock);
+  Maybe<MonitorAutoLock> lock(std::in_place, mLock);
 
-  Maybe<EntryWrapper> entry = LookupByCID(lock, aClass);
+  Maybe<EntryWrapper> entry = LookupByCID(*lock, aClass);
   if (!entry) {
     return NS_ERROR_FACTORY_NOT_REGISTERED;
   }
@@ -1400,13 +1354,13 @@
     return NS_ERROR_UNEXPECTED;
   }
 
-  MutexLock lock(mLock);
+  Maybe<MonitorAutoLock> lock(std::in_place, mLock);
 
   Maybe<EntryWrapper> wrapper;
   if (entry.Overridable()) {
     // If we expect this service to be overridden by test code, we need to look
     // it up by contract ID every time.
-    wrapper = LookupByContractID(lock, entry.ContractID());
+    wrapper = LookupByContractID(*lock, entry.ContractID());
     if (!wrapper) {
       return NS_ERROR_FACTORY_NOT_REGISTERED;
     }
@@ -1506,10 +1460,10 @@
 
   AUTO_PROFILER_LABEL_DYNAMIC_CSTR_NONSENSITIVE("GetServiceByContractID", OTHER,
                                                 aContractID);
-  MutexLock lock(mLock);
+  Maybe<MonitorAutoLock> lock(std::in_place, mLock);
 
   Maybe<EntryWrapper> entry =
-      LookupByContractID(lock, nsDependentCString(aContractID));
+      LookupByContractID(*lock, nsDependentCString(aContractID));
   if (!entry) {
     return NS_ERROR_FACTORY_NOT_REGISTERED;
   }
@@ -1530,7 +1484,7 @@
 
     nsDependentCString contractID(aContractID);
 
-    SafeMutexAutoLock lock(mLock);
+    MonitorAutoLock lock(mLock);
     nsFactoryEntry* oldf = mFactories.Get(&aClass);
     if (oldf) {
       StaticComponents::InvalidateContractID(contractID);
@@ -1552,7 +1506,7 @@
 
   auto f = MakeUnique<nsFactoryEntry>(aClass, aFactory);
 
-  SafeMutexAutoLock lock(mLock);
+  MonitorAutoLock lock(mLock);
   if (auto entry = mFactories.LookupForAdd(f->mCIDEntry->cid)) {
     return NS_ERROR_FACTORY_EXISTS;
   } else {
@@ -1582,7 +1536,7 @@
   nsCOMPtr<nsISupports> dyingServiceObject;
 
   {
-    SafeMutexAutoLock lock(mLock);
+    MonitorAutoLock lock(mLock);
     auto entry = mFactories.Lookup(&aClass);
     nsFactoryEntry* f = entry ? entry.Data() : nullptr;
     if (!f || f->mFactory != aFactory) {
@@ -1675,7 +1629,7 @@
 nsComponentManagerImpl::ContractIDToCID(const char* aContractID,
                                         nsCID** aResult) {
   {
-    MutexLock lock(mLock);
+    MonitorAutoLock lock(mLock);
     Maybe<EntryWrapper> entry =
         LookupByContractID(lock, nsDependentCString(aContractID));
     if (entry) {
@@ -1793,7 +1747,7 @@
       return nullptr;
     }
 
-    SafeMutexAutoLock lock(nsComponentManagerImpl::gComponentManager->mLock);
+    MonitorAutoLock lock(nsComponentManagerImpl::gComponentManager->mLock);
     // Threads can race to set mFactory
     if (!mFactory) {
       factory.swap(mFactory);
diff -Nru firefox-84.0.2+build1/xpcom/components/nsComponentManager.h firefox-85.0+build1/xpcom/components/nsComponentManager.h
--- firefox-84.0.2+build1/xpcom/components/nsComponentManager.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/components/nsComponentManager.h	2021-01-18 19:58:27.000000000 +0000
@@ -18,7 +18,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Module.h"
-#include "mozilla/Mutex.h"
+#include "mozilla/Monitor.h"
 #include "mozilla/UniquePtr.h"
 #include "nsXULAppAPI.h"
 #include "nsIFactory.h"
@@ -55,7 +55,6 @@
 
 namespace {
 class EntryWrapper;
-class MutexLock;
 }  // namespace
 
 namespace mozilla {
@@ -67,52 +66,6 @@
 }  // namespace xpcom
 }  // namespace mozilla
 
-/**
- * This is a wrapper around mozilla::Mutex which provides runtime
- * checking for a deadlock where the same thread tries to lock a mutex while
- * it is already locked. This checking is present in both debug and release
- * builds.
- */
-class SafeMutex {
- public:
-  explicit SafeMutex(const char* aName)
-      : mMutex(aName), mOwnerThread(nullptr) {}
-
-  ~SafeMutex() = default;
-
-  void Lock() {
-    AssertNotCurrentThreadOwns();
-    mMutex.Lock();
-    MOZ_ASSERT(mOwnerThread == nullptr);
-    mOwnerThread = PR_GetCurrentThread();
-  }
-
-  void Unlock() {
-    MOZ_ASSERT(mOwnerThread == PR_GetCurrentThread());
-    mOwnerThread = nullptr;
-    mMutex.Unlock();
-  }
-
-  void AssertCurrentThreadOwns() const {
-    // This method is a debug-only check
-    MOZ_ASSERT(mOwnerThread == PR_GetCurrentThread());
-  }
-
-  MOZ_NEVER_INLINE void AssertNotCurrentThreadOwns() const {
-    // This method is a release-mode check
-    if (PR_GetCurrentThread() == mOwnerThread) {
-      MOZ_CRASH();
-    }
-  }
-
- private:
-  mozilla::Mutex mMutex;
-  mozilla::Atomic<PRThread*, mozilla::Relaxed> mOwnerThread;
-};
-
-typedef mozilla::detail::BaseAutoLock<SafeMutex&> SafeMutexAutoLock;
-typedef mozilla::detail::BaseAutoUnlock<SafeMutex&> SafeMutexAutoUnlock;
-
 class nsComponentManagerImpl final : public nsIComponentManager,
                                      public nsIServiceManager,
                                      public nsSupportsWeakReference,
@@ -152,15 +105,16 @@
   nsDataHashtable<nsIDPointerHashKey, nsFactoryEntry*> mFactories;
   nsDataHashtable<nsCStringHashKey, nsFactoryEntry*> mContractIDs;
 
-  SafeMutex mLock;
+  mozilla::Monitor mLock;
 
   mozilla::Maybe<EntryWrapper> LookupByCID(const nsID& aCID);
-  mozilla::Maybe<EntryWrapper> LookupByCID(const MutexLock&, const nsID& aCID);
+  mozilla::Maybe<EntryWrapper> LookupByCID(const mozilla::MonitorAutoLock&,
+                                           const nsID& aCID);
 
   mozilla::Maybe<EntryWrapper> LookupByContractID(
       const nsACString& aContractID);
   mozilla::Maybe<EntryWrapper> LookupByContractID(
-      const MutexLock&, const nsACString& aContractID);
+      const mozilla::MonitorAutoLock&, const nsACString& aContractID);
 
   nsresult GetService(mozilla::xpcom::ModuleID, const nsIID& aIID,
                       void** aResult);
@@ -277,7 +231,8 @@
 
   inline PendingServiceInfo* AddPendingService(const nsCID& aServiceCID,
                                                PRThread* aThread);
-  inline void RemovePendingService(const nsCID& aServiceCID);
+  inline void RemovePendingService(mozilla::MonitorAutoLock& aLock,
+                                   const nsCID& aServiceCID);
   inline PRThread* GetPendingServiceThread(const nsCID& aServiceCID) const;
 
   nsTArray<PendingServiceInfo> mPendingServices;
@@ -289,8 +244,9 @@
  private:
   ~nsComponentManagerImpl();
 
-  nsresult GetServiceLocked(MutexLock& aLock, EntryWrapper& aEntry,
-                            const nsIID& aIID, void** aResult);
+  nsresult GetServiceLocked(mozilla::Maybe<mozilla::MonitorAutoLock>& aLock,
+                            EntryWrapper& aEntry, const nsIID& aIID,
+                            void** aResult);
 };
 
 #define NS_MAX_FILENAME_LEN 1024
diff -Nru firefox-84.0.2+build1/xpcom/ds/ArenaAllocator.h firefox-85.0+build1/xpcom/ds/ArenaAllocator.h
--- firefox-84.0.2+build1/xpcom/ds/ArenaAllocator.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/ArenaAllocator.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,7 +9,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <sstream>
 
 #include "mozilla/Assertions.h"
 #include "mozilla/fallible.h"
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsAtom.h firefox-85.0+build1/xpcom/ds/nsAtom.h
--- firefox-84.0.2+build1/xpcom/ds/nsAtom.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsAtom.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,10 +9,11 @@
 
 #include <type_traits>
 
-#include "nsISupportsImpl.h"
-#include "nsString.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/UniquePtr.h"
+#include "mozilla/Char16.h"
+#include "mozilla/MemoryReporting.h"
+#include "nsISupports.h"
+#include "nsString.h"
 
 namespace mozilla {
 struct AtomsSizes;
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsCharSeparatedTokenizer.h firefox-85.0+build1/xpcom/ds/nsCharSeparatedTokenizer.h
--- firefox-84.0.2+build1/xpcom/ds/nsCharSeparatedTokenizer.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsCharSeparatedTokenizer.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,7 +10,7 @@
 #include "mozilla/RangedPtr.h"
 
 #include "nsDependentSubstring.h"
-#include "nsCRT.h"
+#include "nsCRTGlue.h"
 
 /**
  * This parses a SeparatorChar-separated string into tokens.
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsDeque.h firefox-85.0+build1/xpcom/ds/nsDeque.h
--- firefox-84.0.2+build1/xpcom/ds/nsDeque.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsDeque.h	2021-01-18 19:58:27.000000000 +0000
@@ -28,11 +28,9 @@
 
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/fallible.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/RefPtr.h"
-#include "nscore.h"
 #include "nsDebug.h"
 #include "nsISupports.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsExpirationTracker.h firefox-85.0+build1/xpcom/ds/nsExpirationTracker.h
--- firefox-84.0.2+build1/xpcom/ds/nsExpirationTracker.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsExpirationTracker.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,16 +7,25 @@
 #ifndef NSEXPIRATIONTRACKER_H_
 #define NSEXPIRATIONTRACKER_H_
 
-#include "mozilla/Logging.h"
+#include <cstring>
+#include "MainThreadUtils.h"
+#include "nsAlgorithm.h"
+#include "nsDebug.h"
 #include "nsTArray.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
-#include "nsComponentManagerUtils.h"
 #include "nsIEventTarget.h"
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
+#include "nsISupports.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
-#include "mozilla/Attributes.h"
+#include "nscore.h"
+#include "mozilla/Assertions.h"
+#include "mozilla/Likely.h"
+#include "mozilla/MemoryReporting.h"
+#include "mozilla/RefCountType.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/Services.h"
 
 /**
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsJSThingHashtable.h firefox-85.0+build1/xpcom/ds/nsJSThingHashtable.h
--- firefox-84.0.2+build1/xpcom/ds/nsJSThingHashtable.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsJSThingHashtable.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #ifndef nsJSThingHashtable_h__
 #define nsJSThingHashtable_h__
 
+#include "js/RootingAPI.h"
 #include "nsHashKeys.h"
 #include "nsBaseHashtable.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsObserverList.h firefox-85.0+build1/xpcom/ds/nsObserverList.h
--- firefox-84.0.2+build1/xpcom/ds/nsObserverList.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsObserverList.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,7 +8,6 @@
 #define nsObserverList_h___
 
 #include "nsISupports.h"
-#include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "nsIObserver.h"
 #include "nsHashKeys.h"
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsObserverService.h firefox-85.0+build1/xpcom/ds/nsObserverService.h
--- firefox-84.0.2+build1/xpcom/ds/nsObserverService.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsObserverService.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,8 +21,6 @@
     }                                               \
   }
 
-class nsIMemoryReporter;
-
 class nsObserverService final : public nsIObserverService,
                                 public nsIMemoryReporter {
  public:
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsQuickSort.cpp firefox-85.0+build1/xpcom/ds/nsQuickSort.cpp
--- firefox-84.0.2+build1/xpcom/ds/nsQuickSort.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsQuickSort.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -66,10 +66,10 @@
     } while (--i > 0);                  \
   }
 
-#define SWAPINIT(a, es)                                                \
-  swaptype = ((char*)a - (char*)0) % sizeof(long) || es % sizeof(long) \
-                 ? 2                                                   \
-                 : es == sizeof(long) ? 0 : 1;
+#define SWAPINIT(a, es)                                                    \
+  swaptype = ((char*)a - (char*)0) % sizeof(long) || es % sizeof(long) ? 2 \
+             : es == sizeof(long)                                      ? 0 \
+                                                                       : 1;
 
 static INLINE void swapfunc(char* a, char* b, int n, int swaptype) {
   if (swaptype <= 1) swapcode(long, a, b, n) else swapcode(char, a, b, n)
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTArray.cpp firefox-85.0+build1/xpcom/ds/nsTArray.cpp
--- firefox-84.0.2+build1/xpcom/ds/nsTArray.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTArray.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include <string.h>
 #include "nsTArray.h"
 #include "nsXPCOM.h"
+#include "nsCycleCollectionNoteChild.h"
 #include "nsDebug.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/IntegerPrintfMacros.h"
@@ -28,3 +29,7 @@
       "ElementAt(aIndex = %" PRIu64 ", aLength = %" PRIu64 ")",
       static_cast<uint64_t>(aIndex), static_cast<uint64_t>(aLength));
 }
+
+void ::detail::SetCycleCollectionArrayFlag(uint32_t& aFlags) {
+  aFlags |= CycleCollectionEdgeNameArrayFlag;
+}
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTArray.h firefox-85.0+build1/xpcom/ds/nsTArray.h
--- firefox-84.0.2+build1/xpcom/ds/nsTArray.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTArray.h	2021-01-18 19:58:27.000000000 +0000
@@ -23,29 +23,26 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/BinarySearch.h"
 #include "mozilla/CheckedInt.h"
-#include "mozilla/DbgMacro.h"
 #include "mozilla/FunctionTypeTraits.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/Span.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/fallible.h"
 #include "mozilla/mozalloc.h"
 #include "nsAlgorithm.h"
-#include "nsCycleCollectionNoteChild.h"
 #include "nsDebug.h"
-#include "nsISupportsImpl.h"
+#include "nsISupports.h"
 #include "nsQuickSort.h"
 #include "nsRegionFwd.h"
 #include "nsTArrayForwardDeclare.h"
-#include "nscore.h"
 
 namespace JS {
 template <class T>
 class Heap;
 } /* namespace JS */
 
+class nsCycleCollectionTraversalCallback;
 class nsRegion;
 
 namespace mozilla::a11y {
@@ -105,6 +102,9 @@
 
 class JSStructuredCloneData;
 
+template <class T>
+class RefPtr;
+
 //
 // nsTArray<E> is a resizable array class, like std::vector.
 //
@@ -2662,11 +2662,17 @@
   aField.Clear();
 }
 
+namespace detail {
+// This is defined in the cpp file to avoid including
+// nsCycleCollectionNoteChild.h in this header file.
+void SetCycleCollectionArrayFlag(uint32_t& aFlags);
+}  // namespace detail
+
 template <typename E, typename Alloc>
 inline void ImplCycleCollectionTraverse(
     nsCycleCollectionTraversalCallback& aCallback,
     nsTArray_Impl<E, Alloc>& aField, const char* aName, uint32_t aFlags = 0) {
-  aFlags |= CycleCollectionEdgeNameArrayFlag;
+  ::detail::SetCycleCollectionArrayFlag(aFlags);
   size_t length = aField.Length();
   for (size_t i = 0; i < length; ++i) {
     ImplCycleCollectionTraverse(aCallback, aField[i], aName, aFlags);
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTArray-inl.h firefox-85.0+build1/xpcom/ds/nsTArray-inl.h
--- firefox-84.0.2+build1/xpcom/ds/nsTArray-inl.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTArray-inl.h	2021-01-18 19:58:27.000000000 +0000
@@ -258,29 +258,31 @@
     return;
   }
 
-  size_type size = sizeof(Header) + length * aElemSize;
-  void* ptr;
+  size_type newSize = sizeof(Header) + length * aElemSize;
 
+  Header* newHeader;
   if (!RelocationStrategy::allowRealloc) {
     // Malloc() and copy.
-    ptr = static_cast<Header*>(nsTArrayFallibleAllocator::Malloc(size));
-    if (!ptr) {
+    newHeader =
+        static_cast<Header*>(nsTArrayFallibleAllocator::Malloc(newSize));
+    if (!newHeader) {
       return;
     }
 
     RelocationStrategy::RelocateNonOverlappingRegionWithHeader(
-        ptr, mHdr, Length(), aElemSize);
+        newHeader, mHdr, Length(), aElemSize);
 
     nsTArrayFallibleAllocator::Free(mHdr);
   } else {
     // Realloc() existing data.
-    ptr = nsTArrayFallibleAllocator::Realloc(mHdr, size);
-    if (!ptr) {
+    newHeader =
+        static_cast<Header*>(nsTArrayFallibleAllocator::Realloc(mHdr, newSize));
+    if (!newHeader) {
       return;
     }
   }
 
-  mHdr = static_cast<Header*>(ptr);
+  mHdr = newHeader;
   mHdr->mCapacity = length;
 }
 
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTHashtable.h firefox-85.0+build1/xpcom/ds/nsTHashtable.h
--- firefox-84.0.2+build1/xpcom/ds/nsTHashtable.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTHashtable.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,6 +10,7 @@
 #ifndef nsTHashtable_h__
 #define nsTHashtable_h__
 
+#include <iterator>
 #include <new>
 #include <type_traits>
 #include <utility>
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTObserverArray.h firefox-85.0+build1/xpcom/ds/nsTObserverArray.h
--- firefox-84.0.2+build1/xpcom/ds/nsTObserverArray.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTObserverArray.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,8 +12,6 @@
 #include "nsTArray.h"
 #include "nsCycleCollectionNoteChild.h"
 
-#include <functional>
-
 /**
  * An array of observers. Like a normal array, but supports iterators that are
  * stable even if the array is modified during iteration.
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsTPriorityQueue.h firefox-85.0+build1/xpcom/ds/nsTPriorityQueue.h
--- firefox-84.0.2+build1/xpcom/ds/nsTPriorityQueue.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsTPriorityQueue.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,8 +7,8 @@
 #ifndef NS_TPRIORITY_QUEUE_H_
 #define NS_TPRIORITY_QUEUE_H_
 
+#include "mozilla/Assertions.h"
 #include "nsTArray.h"
-#include "nsDebug.h"
 
 /**
  * A templatized priority queue data structure that uses an nsTArray to serve as
diff -Nru firefox-84.0.2+build1/xpcom/ds/nsWhitespaceTokenizer.h firefox-85.0+build1/xpcom/ds/nsWhitespaceTokenizer.h
--- firefox-84.0.2+build1/xpcom/ds/nsWhitespaceTokenizer.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/nsWhitespaceTokenizer.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,7 +9,7 @@
 
 #include "mozilla/RangedPtr.h"
 #include "nsDependentSubstring.h"
-#include "nsCRT.h"
+#include "nsCRTGlue.h"
 
 template <typename DependentSubstringType, bool IsWhitespace(char16_t)>
 class nsTWhitespaceTokenizer {
diff -Nru firefox-84.0.2+build1/xpcom/ds/PLDHashTable.h firefox-85.0+build1/xpcom/ds/PLDHashTable.h
--- firefox-84.0.2+build1/xpcom/ds/PLDHashTable.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/PLDHashTable.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,12 +12,10 @@
 
 #include <utility>
 
+#include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"  // for MOZ_ALWAYS_INLINE
-#include "mozilla/FunctionTypeTraits.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Types.h"
 #include "mozilla/fallible.h"
 #include "nscore.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/ds/StaticAtoms.py firefox-85.0+build1/xpcom/ds/StaticAtoms.py
--- firefox-84.0.2+build1/xpcom/ds/StaticAtoms.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/StaticAtoms.py	2021-01-18 19:58:27.000000000 +0000
@@ -916,6 +916,7 @@
     Atom("ontransitionend", "ontransitionend"),
     Atom("ontransitionrun", "ontransitionrun"),
     Atom("ontransitionstart", "ontransitionstart"),
+    Atom("onuncapturederror", "onuncapturederror"),
     Atom("onunderflow", "onunderflow"),
     Atom("onunhandledrejection", "onunhandledrejection"),
     Atom("onunload", "onunload"),
@@ -2294,6 +2295,7 @@
     Atom("aria_rowindextext", "aria-rowindextext"),
     Atom("aria_rowspan", "aria-rowspan"),
     Atom("aria_valuetext", "aria-valuetext"),
+    Atom("assertive", "assertive"),
     Atom("auto_generated", "auto-generated"),
     Atom("banner", "banner"),
     Atom("checkable", "checkable"),
diff -Nru firefox-84.0.2+build1/xpcom/ds/Tokenizer.cpp firefox-85.0+build1/xpcom/ds/Tokenizer.cpp
--- firefox-84.0.2+build1/xpcom/ds/Tokenizer.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/ds/Tokenizer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "Tokenizer.h"
 
-#include "mozilla/ScopeExit.h"
 #include "nsUnicharUtils.h"
 #include <algorithm>
 
diff -Nru firefox-84.0.2+build1/xpcom/idl-parser/xpidl/xpidl.py firefox-85.0+build1/xpcom/idl-parser/xpidl/xpidl.py
--- firefox-84.0.2+build1/xpcom/idl-parser/xpidl/xpidl.py	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/idl-parser/xpidl/xpidl.py	2021-01-18 19:58:27.000000000 +0000
@@ -1061,11 +1061,8 @@
         )
 
 
-# An interface cannot be implemented by JS if it has a notxpcom
+# An interface cannot be implemented by JS if it has a notxpcom or nostdcall
 # method or attribute, so it must be marked as builtinclass.
-#
-# XXX(nika): Why does nostdcall not imply builtinclass?
-# It could screw up the shims as well...
 def ensureBuiltinClassIfNeeded(methodOrAttribute):
     iface = methodOrAttribute.iface
     if not iface.attributes.scriptable or iface.attributes.builtinclass:
@@ -1081,6 +1078,15 @@
             % (iface.name, methodOrAttribute.kind, methodOrAttribute.name),
             methodOrAttribute.location,
         )
+    if methodOrAttribute.nostdcall:
+        raise IDLError(
+            (
+                "scriptable interface '%s' must be marked [builtinclass] because it "
+                "contains a [nostdcall] %s '%s'"
+            )
+            % (iface.name, methodOrAttribute.kind, methodOrAttribute.name),
+            methodOrAttribute.location,
+        )
 
 
 class Attribute(object):
@@ -1179,7 +1185,7 @@
     def isScriptable(self):
         if not self.iface.attributes.scriptable:
             return False
-        return not (self.noscript or self.notxpcom)
+        return not (self.noscript or self.notxpcom or self.nostdcall)
 
     def __str__(self):
         return "\t%sattribute %s %s\n" % (
@@ -1289,7 +1295,7 @@
     def isScriptable(self):
         if not self.iface.attributes.scriptable:
             return False
-        return not (self.noscript or self.notxpcom)
+        return not (self.noscript or self.notxpcom or self.nostdcall)
 
     def __str__(self):
         return "\t%s %s(%s)\n" % (
diff -Nru firefox-84.0.2+build1/xpcom/io/Base64.cpp firefox-85.0+build1/xpcom/io/Base64.cpp
--- firefox-84.0.2+build1/xpcom/io/Base64.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/Base64.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,7 +7,6 @@
 #include "Base64.h"
 
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/ScopeExit.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsIInputStream.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/xpcom/io/FileDescriptorFile.cpp firefox-85.0+build1/xpcom/io/FileDescriptorFile.cpp
--- firefox-84.0.2+build1/xpcom/io/FileDescriptorFile.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/FileDescriptorFile.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -312,6 +312,16 @@
 }
 
 NS_IMETHODIMP
+FileDescriptorFile::GetCreationTime(PRTime* aCreationTime) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+FileDescriptorFile::GetCreationTimeOfLink(PRTime* aCreationTime) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
 FileDescriptorFile::GetFileSize(int64_t* aFileSize) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
diff -Nru firefox-84.0.2+build1/xpcom/io/nsIBinaryOutputStream.idl firefox-85.0+build1/xpcom/io/nsIBinaryOutputStream.idl
--- firefox-84.0.2+build1/xpcom/io/nsIBinaryOutputStream.idl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsIBinaryOutputStream.idl	2021-01-18 19:58:27.000000000 +0000
@@ -24,7 +24,7 @@
  * @See nsIBinaryInputStream
  */
 
-[scriptable, uuid(204ee610-8765-11d3-90cf-0040056a906e)]
+[scriptable, builtinclass, uuid(204ee610-8765-11d3-90cf-0040056a906e)]
 interface nsIBinaryOutputStream : nsIOutputStream {
     void setOutputStream(in nsIOutputStream aOutputStream);
 
diff -Nru firefox-84.0.2+build1/xpcom/io/nsIFile.idl firefox-85.0+build1/xpcom/io/nsIFile.idl
--- firefox-84.0.2+build1/xpcom/io/nsIFile.idl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsIFile.idl	2021-01-18 19:58:27.000000000 +0000
@@ -234,6 +234,16 @@
     attribute PRTime lastModifiedTimeOfLink;
 
     /**
+     * The creation time of file in milliseconds from midnight, January 1, 1970
+     * GMT, if available.
+     *
+     * This attribute is only implemented on Windows and macOS. Accessing this
+     * on another platform will this will throw NS_ERROR_NOT_IMPLEMENTED.
+     */
+    readonly attribute PRTime creationTime;
+    readonly attribute PRTime creationTimeOfLink;
+
+    /**
      *  WARNING!  On the Mac, getting/setting the file size with nsIFile
      *  only deals with the size of the data fork.  If you need to
      *  know the size of the combined data and resource forks use the
diff -Nru firefox-84.0.2+build1/xpcom/io/nsLocalFileUnix.cpp firefox-85.0+build1/xpcom/io/nsLocalFileUnix.cpp
--- firefox-84.0.2+build1/xpcom/io/nsLocalFileUnix.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsLocalFileUnix.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -126,6 +126,11 @@
       return NS_ERROR_FILE_ACCESS_DENIED;                 \
   } while (0)
 
+static PRTime TimespecToMillis(const struct timespec& aTimeSpec) {
+  return PRTime(aTimeSpec.tv_sec) * PR_MSEC_PER_SEC +
+         PRTime(aTimeSpec.tv_nsec) / PR_NSEC_PER_MSEC;
+}
+
 /* directory enumerator */
 class nsDirEnumeratorUnix final : public nsSimpleEnumerator,
                                   public nsIDirectoryEnumerator {
@@ -1134,17 +1139,11 @@
     return NSRESULT_FOR_ERRNO();
   }
 
-  int64_t modSec = 0;
-  int64_t modNSec = 0;
 #if (defined(__APPLE__) && defined(__MACH__))
-  modSec = fileStats.st_mtimespec.tv_sec;
-  modNSec = fileStats.st_mtimespec.tv_nsec;
+  *aLastModTime = TimespecToMillis(fileStats.st_mtimespec);
 #else
-  modSec = fileStats.st_mtim.tv_sec;
-  modNSec = fileStats.st_mtim.tv_nsec;
+  *aLastModTime = TimespecToMillis(fileStats.st_mtim);
 #endif
-  *aLastModTime =
-      PRTime(modSec * PR_MSEC_PER_SEC) + PRTime(modNSec / PR_NSEC_PER_MSEC);
 
   return NS_OK;
 }
@@ -1207,6 +1206,39 @@
   return SetLastModifiedTimeImpl(aLastModTimeOfLink, /* follow links? */ false);
 }
 
+NS_IMETHODIMP
+nsLocalFile::GetCreationTime(PRTime* aCreationTime) {
+  return GetCreationTimeImpl(aCreationTime, false);
+}
+
+NS_IMETHODIMP
+nsLocalFile::GetCreationTimeOfLink(PRTime* aCreationTimeOfLink) {
+  return GetCreationTimeImpl(aCreationTimeOfLink, /* aFollowLinks = */ true);
+}
+
+nsresult nsLocalFile::GetCreationTimeImpl(PRTime* aCreationTime,
+                                          bool aFollowLinks) {
+  CHECK_mPath();
+  if (NS_WARN_IF(!aCreationTime)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+#if defined(_DARWIN_FEATURE_64_BIT_INODE)
+  using StatFn = int (*)(const char*, struct STAT*);
+  StatFn statFn = aFollowLinks ? &STAT : &LSTAT;
+
+  struct STAT fileStats {};
+  if (statFn(mPath.get(), &fileStats) < 0) {
+    return NSRESULT_FOR_ERRNO();
+  }
+
+  *aCreationTime = TimespecToMillis(fileStats.st_birthtimespec);
+  return NS_OK;
+#else
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
+}
+
 /*
  * Only send back permissions bits: maybe we want to send back the whole
  * mode_t to permit checks against other file types?
@@ -1600,7 +1632,8 @@
     static const char* const executableExts[] = {
         "air",  // Adobe AIR installer
 #ifdef MOZ_WIDGET_COCOA
-        "fileloc",  // File location files can be used to point to other files.
+        "fileloc",  // File location files can be used to point to other
+                    // files.
 #endif
         "jar"  // java application bundle
     };
@@ -2238,7 +2271,8 @@
 }
 
 static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr) {
-  // first see if the conversion would succeed and find the length of the result
+  // first see if the conversion would succeed and find the length of the
+  // result
   CFIndex usedBufLen, inStrLen = ::CFStringGetLength(aInStrRef);
   CFIndex charsConverted = ::CFStringGetBytes(
       aInStrRef, CFRangeMake(0, inStrLen), kCFStringEncodingUTF8, 0, false,
diff -Nru firefox-84.0.2+build1/xpcom/io/nsLocalFileUnix.h firefox-85.0+build1/xpcom/io/nsLocalFileUnix.h
--- firefox-84.0.2+build1/xpcom/io/nsLocalFileUnix.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsLocalFileUnix.h	2021-01-18 19:58:27.000000000 +0000
@@ -88,6 +88,7 @@
 
   nsresult SetLastModifiedTimeImpl(PRTime aLastModTime, bool aFollowLinks);
   nsresult GetLastModifiedTimeImpl(PRTime* aLastModTime, bool aFollowLinks);
+  nsresult GetCreationTimeImpl(PRTime* aCreationTime, bool aFollowLinks);
 };
 
 #endif /* _nsLocalFileUNIX_H_ */
diff -Nru firefox-84.0.2+build1/xpcom/io/nsLocalFileWin.cpp firefox-85.0+build1/xpcom/io/nsLocalFileWin.cpp
--- firefox-84.0.2+build1/xpcom/io/nsLocalFileWin.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsLocalFileWin.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -2225,6 +2225,39 @@
   return SetLastModifiedTime(aLastModifiedTime);
 }
 
+NS_IMETHODIMP
+nsLocalFile::GetCreationTime(PRTime* aCreationTime) {
+  CHECK_mWorkingPath();
+
+  if (NS_WARN_IF(!aCreationTime)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  nsresult rv = ResolveAndStat();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *aCreationTime = mFileInfo64.creationTime / PR_USEC_PER_MSEC;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsLocalFile::GetCreationTimeOfLink(PRTime* aCreationTime) {
+  CHECK_mWorkingPath();
+
+  if (NS_WARN_IF(!aCreationTime)) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  PRFileInfo64 info;
+  nsresult rv = GetFileInfo(mWorkingPath, &info);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *aCreationTime = info.creationTime / PR_USEC_PER_MSEC;
+
+  return NS_OK;
+}
+
 nsresult nsLocalFile::SetModDate(PRTime aLastModifiedTime,
                                  const wchar_t* aFilePath) {
   // The FILE_FLAG_BACKUP_SEMANTICS is required in order to change the
diff -Nru firefox-84.0.2+build1/xpcom/io/nsMultiplexInputStream.cpp firefox-85.0+build1/xpcom/io/nsMultiplexInputStream.cpp
--- firefox-84.0.2+build1/xpcom/io/nsMultiplexInputStream.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsMultiplexInputStream.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -774,7 +774,7 @@
 
 // This class is used to inform nsMultiplexInputStream that it's time to execute
 // the asyncWait callback.
-class AsyncWaitRunnable final : public CancelableRunnable {
+class AsyncWaitRunnable final : public DiscardableRunnable {
   RefPtr<nsMultiplexInputStream> mStream;
 
  public:
@@ -796,7 +796,7 @@
 
  private:
   explicit AsyncWaitRunnable(nsMultiplexInputStream* aStream)
-      : CancelableRunnable("AsyncWaitRunnable"), mStream(aStream) {
+      : DiscardableRunnable("AsyncWaitRunnable"), mStream(aStream) {
     MOZ_ASSERT(aStream);
   }
 };
diff -Nru firefox-84.0.2+build1/xpcom/io/nsSegmentedBuffer.cpp firefox-85.0+build1/xpcom/io/nsSegmentedBuffer.cpp
--- firefox-84.0.2+build1/xpcom/io/nsSegmentedBuffer.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsSegmentedBuffer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
+#include "mozilla/ScopeExit.h"
 
 nsresult nsSegmentedBuffer::Init(uint32_t aSegmentSize, uint32_t aMaxSize) {
   if (mSegmentArrayCount != 0) {
@@ -100,64 +101,48 @@
 }
 
 void nsSegmentedBuffer::Empty() {
-  if (mSegmentArray) {
-    for (uint32_t i = 0; i < mSegmentArrayCount; i++) {
-      if (mSegmentArray[i]) {
-        FreeOMT(mSegmentArray[i]);
-      }
-    }
-    FreeOMT(mSegmentArray);
+  auto clearMembers = mozilla::MakeScopeExit([&] {
     mSegmentArray = nullptr;
+    mSegmentArrayCount = NS_SEGMENTARRAY_INITIAL_COUNT;
+    mFirstSegmentIndex = mLastSegmentIndex = 0;
+  });
+
+  // If mSegmentArray is null, there's no need to actually free anything
+  if (!mSegmentArray) {
+    return;
   }
-  mSegmentArrayCount = NS_SEGMENTARRAY_INITIAL_COUNT;
-  mFirstSegmentIndex = mLastSegmentIndex = 0;
-}
 
-#if 0
-void
-TestSegmentedBuffer()
-{
-  nsSegmentedBuffer* buf = new nsSegmentedBuffer();
-  NS_ASSERTION(buf, "out of memory");
-  buf->Init(4, 16);
-  char* seg;
-  bool empty;
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  seg = buf->AppendNewSegment();
-  NS_ASSERTION(seg, "AppendNewSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-  empty = buf->DeleteFirstSegment();
-  NS_ASSERTION(empty, "DeleteFirstSegment failed");
-  delete buf;
+  // Dispatch a task that frees up the array. This may run immediately or on
+  // a background thread.
+  FreeOMT([segmentArray = mSegmentArray, arrayCount = mSegmentArrayCount]() {
+    for (uint32_t i = 0; i < arrayCount; i++) {
+      if (segmentArray[i]) {
+        free(segmentArray[i]);
+      }
+    }
+    free(segmentArray);
+  });
 }
-#endif
 
 void nsSegmentedBuffer::FreeOMT(void* aPtr) {
+  FreeOMT([aPtr]() { free(aPtr); });
+}
+
+void nsSegmentedBuffer::FreeOMT(std::function<void()>&& aTask) {
   if (!NS_IsMainThread()) {
-    free(aPtr);
+    aTask();
     return;
   }
 
-  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction("nsSegmentedBuffer::FreeOMT",
-                                                   [aPtr]() { free(aPtr); });
+  if (mFreeOMT) {
+    // There is a runnable pending which will handle this object
+    if (mFreeOMT->AddTask(std::move(aTask)) > 1) {
+      return;
+    }
+  } else {
+    mFreeOMT = MakeRefPtr<FreeOMTPointers>();
+    mFreeOMT->AddTask(std::move(aTask));
+  }
 
   if (!mIOThread) {
     mIOThread = do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
@@ -165,8 +150,25 @@
 
   // During the shutdown we are not able to obtain the IOThread and/or the
   // dispatching of runnable fails.
-  if (!mIOThread || NS_FAILED(mIOThread->Dispatch(r.forget()))) {
-    free(aPtr);
+  if (!mIOThread || NS_FAILED(mIOThread->Dispatch(NS_NewRunnableFunction(
+                        "nsSegmentedBuffer::FreeOMT",
+                        [obj = mFreeOMT]() { obj->FreeAll(); })))) {
+    mFreeOMT->FreeAll();
+  }
+}
+
+void nsSegmentedBuffer::FreeOMTPointers::FreeAll() {
+  // Take all the tasks from the object. If AddTask is called after we release
+  // the lock, then another runnable will be dispatched for that task. This is
+  // necessary to avoid blocking the main thread while memory is being freed.
+  nsTArray<std::function<void()>> tasks = [this]() {
+    auto t = mTasks.Lock();
+    return std::move(*t);
+  }();
+
+  // Finally run all the tasks to free memory.
+  for (auto& task : tasks) {
+    task();
   }
 }
 
diff -Nru firefox-84.0.2+build1/xpcom/io/nsSegmentedBuffer.h firefox-85.0+build1/xpcom/io/nsSegmentedBuffer.h
--- firefox-84.0.2+build1/xpcom/io/nsSegmentedBuffer.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/io/nsSegmentedBuffer.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,6 +12,7 @@
 #include "nsCOMPtr.h"
 #include "nsDebug.h"
 #include "nsError.h"
+#include "mozilla/DataMutex.h"
 
 class nsIEventTarget;
 
@@ -82,9 +83,36 @@
   int32_t mLastSegmentIndex;
 
  private:
+  class FreeOMTPointers {
+    NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FreeOMTPointers)
+
+   public:
+    FreeOMTPointers() : mTasks("nsSegmentedBuffer::FreeOMTPointers") {}
+
+    void FreeAll();
+
+    // Adds a task to the array. Returns the size of the array.
+    size_t AddTask(std::function<void()>&& aTask) {
+      auto tasks = mTasks.Lock();
+      tasks->AppendElement(std::move(aTask));
+      return tasks->Length();
+    }
+
+   private:
+    ~FreeOMTPointers() = default;
+
+    mozilla::DataMutex<nsTArray<std::function<void()>>> mTasks;
+  };
+
   void FreeOMT(void* aPtr);
+  void FreeOMT(std::function<void()>&& aTask);
 
   nsCOMPtr<nsIEventTarget> mIOThread;
+
+  // This object is created the first time we need to dispatch to another thread
+  // to free segments. It is only freed when the nsSegmentedBufer is destroyed
+  // or when the runnable is finally handled and its refcount goes to 0.
+  RefPtr<FreeOMTPointers> mFreeOMT;
 };
 
 // NS_SEGMENTARRAY_INITIAL_SIZE: This number needs to start out as a
diff -Nru firefox-84.0.2+build1/xpcom/rust/gecko_logger/Cargo.toml firefox-85.0+build1/xpcom/rust/gecko_logger/Cargo.toml
--- firefox-84.0.2+build1/xpcom/rust/gecko_logger/Cargo.toml	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/gecko_logger/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -8,5 +8,5 @@
 [dependencies]
 lazy_static = "1"
 log = {version = "0.4", features = ["release_max_level_info"]}
-env_logger = {version = "0.6", default-features = false} # disable `regex` to reduce code size
+env_logger = {version = "0.8", default-features = false} # disable `regex` to reduce code size
 app_services_logger = { path = "../../../services/common/app_services_logger" }
diff -Nru firefox-84.0.2+build1/xpcom/rust/gtest/nsstring/Test.cpp firefox-85.0+build1/xpcom/rust/gtest/nsstring/Test.cpp
--- firefox-84.0.2+build1/xpcom/rust/gtest/nsstring/Test.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/gtest/nsstring/Test.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -160,3 +160,18 @@
   EXPECT_EQ(cStrCapacity, 92U);
   EXPECT_EQ(strCapacity, 92U);
 }
+
+extern "C" void Rust_VoidStringFromRust(nsACString* aCStr, nsAString* aStr);
+TEST(RustNsString, VoidStringFromRust)
+{
+  nsAutoCString cs;
+  nsAutoString s;
+
+  EXPECT_FALSE(cs.IsVoid());
+  EXPECT_FALSE(s.IsVoid());
+
+  Rust_VoidStringFromRust(&cs, &s);
+
+  EXPECT_TRUE(cs.IsVoid());
+  EXPECT_TRUE(s.IsVoid());
+}
diff -Nru firefox-84.0.2+build1/xpcom/rust/gtest/nsstring/test.rs firefox-85.0+build1/xpcom/rust/gtest/nsstring/test.rs
--- firefox-84.0.2+build1/xpcom/rust/gtest/nsstring/test.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/gtest/nsstring/test.rs	2021-01-18 19:58:27.000000000 +0000
@@ -123,3 +123,9 @@
         fallible_s_buf[2] = b'C' as u16;
     }
 }
+
+#[no_mangle]
+pub extern "C" fn Rust_VoidStringFromRust(cs: &mut nsACString, s: &mut nsAString) {
+    cs.set_is_void(true);
+    s.set_is_void(true);
+}
diff -Nru firefox-84.0.2+build1/xpcom/rust/moz_task/Cargo.toml firefox-85.0+build1/xpcom/rust/moz_task/Cargo.toml
--- firefox-84.0.2+build1/xpcom/rust/moz_task/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/moz_task/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -6,7 +6,7 @@
 description = "Rust wrappers around XPCOM threading functions"
 
 [dependencies]
-cstr = "0.1"
+cstr = "0.2"
 libc = "0.2"
 futures-task = { version = "0.3" }
 nserror = { path = "../nserror" }
diff -Nru firefox-84.0.2+build1/xpcom/rust/moz_task/src/lib.rs firefox-85.0+build1/xpcom/rust/moz_task/src/lib.rs
--- firefox-84.0.2+build1/xpcom/rust/moz_task/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/moz_task/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -7,7 +7,6 @@
 //! It also provides the Task trait and TaskRunnable struct,
 //! which make it easier to dispatch tasks to threads.
 
-#[macro_use]
 extern crate cstr;
 extern crate futures_task;
 extern crate libc;
diff -Nru firefox-84.0.2+build1/xpcom/rust/nsstring/src/lib.rs firefox-85.0+build1/xpcom/rust/nsstring/src/lib.rs
--- firefox-84.0.2+build1/xpcom/rust/nsstring/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/nsstring/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -113,6 +113,9 @@
 //! which invoke their member's destructors through C++ code.
 
 #![allow(non_camel_case_types)]
+#![allow(clippy::missing_safety_doc)]
+#![allow(clippy::new_without_default)]
+#![allow(clippy::result_unit_err)]
 
 use bitflags::bitflags;
 use std::borrow;
@@ -277,7 +280,7 @@
             let mut this = self.string.as_repr_mut();
             this.as_mut().length = 1u32;
             *(this.as_mut().data.as_mut()) = 0xFFFDu16;
-            *(this.as_mut().data.as_ptr().offset(1isize)) = 0;
+            *(this.as_mut().data.as_ptr().add(1)) = 0;
         }
     }
 }
@@ -307,13 +310,13 @@
             if self.capacity >= 3 {
                 this.as_mut().length = 3u32;
                 *(this.as_mut().data.as_mut()) = 0xEFu8;
-                *(this.as_mut().data.as_ptr().offset(1isize)) = 0xBFu8;
-                *(this.as_mut().data.as_ptr().offset(2isize)) = 0xBDu8;
-                *(this.as_mut().data.as_ptr().offset(3isize)) = 0;
+                *(this.as_mut().data.as_ptr().add(1)) = 0xBFu8;
+                *(this.as_mut().data.as_ptr().add(2)) = 0xBDu8;
+                *(this.as_mut().data.as_ptr().add(3)) = 0;
             } else {
                 this.as_mut().length = 1u32;
                 *(this.as_mut().data.as_mut()) = 0x1Au8; // U+FFFD doesn't fit
-                *(this.as_mut().data.as_ptr().offset(1isize)) = 0;
+                *(this.as_mut().data.as_ptr().add(1)) = 0;
             }
         }
     }
@@ -378,7 +381,7 @@
             type Target = $AString;
             fn deref(&self) -> &$AString {
                 unsafe {
-                    mem::transmute(self)
+                    &*(self as *const _ as *const $AString)
                 }
             }
         }
@@ -386,7 +389,7 @@
         impl DerefMut for $StringRepr {
             fn deref_mut(&mut self) -> &mut $AString {
                 unsafe {
-                    mem::transmute(self)
+                    &mut *(self as *mut _ as *mut $AString)
                 }
             }
         }
@@ -441,7 +444,7 @@
                 unsafe {
                     let mut this = self.string.as_repr_mut();
                     this.as_mut().length = length as u32;
-                    *(this.as_mut().data.as_ptr().offset(length as isize)) = 0;
+                    *(this.as_mut().data.as_ptr().add(length)) = 0;
                     if cfg!(debug_assertions) {
                         // Overwrite the unused part in debug builds. Note
                         // that capacity doesn't include space for the zero
@@ -450,7 +453,7 @@
                         // not reflected in the capacity number.
                         // write_bytes() takes care of multiplying the length
                         // by the size of T.
-                        ptr::write_bytes(this.as_mut().data.as_ptr().offset((length + 1) as isize),
+                        ptr::write_bytes(this.as_mut().data.as_ptr().add(length + 1),
                                          0xE4u8,
                                          self.capacity - length);
                     }
@@ -543,6 +546,23 @@
                 }
             }
 
+            /// Mark the string's data as void. If `true`, the string will be truncated.
+            ///
+            /// A void string is generally converted to a `null` JS value by bindings code.
+            pub fn set_is_void(&mut self, is_void: bool) {
+                if is_void {
+                    self.truncate();
+                }
+                unsafe {
+                    self.as_repr_mut().as_mut().dataflags.set(DataFlags::VOIDED, is_void);
+                }
+            }
+
+            /// Returns whether the string's data is voided.
+            pub fn is_void(&self) -> bool {
+                self.as_repr().dataflags.contains(DataFlags::VOIDED)
+            }
+
             /// Set the length of the string to the passed-in length, and expand
             /// the backing capacity to match. This method is unsafe as it can
             /// expose uninitialized memory when len is greater than the current
@@ -649,9 +669,9 @@
 
             fn as_repr(&self) -> &$StringRepr {
                 // All $AString values point to a struct prefix which is
-                // identical to $StringRepr, this we can transmute `self`
-                // into $StringRepr to get the reference to the underlying
-                // data.
+                // identical to $StringRepr, thus we can cast `self`
+                // into *const $StringRepr to get the reference to the
+                // underlying data.
                 unsafe {
                     &*(self as *const _ as *const $StringRepr)
                 }
@@ -684,10 +704,10 @@
             fn deref(&self) -> &[$char_t] {
                 unsafe {
                     // All $AString values point to a struct prefix which is
-                    // identical to $StringRepr, this we can transmute `self`
-                    // into $StringRepr to get the reference to the underlying
-                    // data.
-                    let this: &$StringRepr = mem::transmute(self);
+                    // identical to $StringRepr, thus we can cast `self`
+                    // into *const $StringRepr to get the reference to the
+                    // underlying data.
+                    let this = &*(self as *const _ as *const $StringRepr);
                     slice::from_raw_parts(this.data.as_ptr(), this.length as usize)
                 }
             }
@@ -949,7 +969,7 @@
                 $String {
                     hdr: $StringRepr {
                         data: unsafe { ptr::NonNull::new_unchecked(ptr) },
-                        length: length,
+                        length,
                         dataflags: DataFlags::OWNED | DataFlags::TERMINATED,
                         classflags: ClassFlags::NULL_TERMINATED,
                     }
@@ -1254,6 +1274,7 @@
     ///
     /// This is needed because the default ToString implementation goes through
     /// fmt::Display, and thus allocates the string twice.
+    #[allow(clippy::inherent_to_string_shadow_display)]
     pub fn to_string(&self) -> String {
         String::from_utf16_lossy(&self[..])
     }
@@ -1348,26 +1369,22 @@
         ($T:ty, $fname:ident) => {
             #[no_mangle]
             #[allow(non_snake_case)]
-            pub extern "C" fn $fname(size: *mut usize, align: *mut usize) {
-                unsafe {
-                    *size = mem::size_of::<$T>();
-                    *align = mem::align_of::<$T>();
-                }
+            pub unsafe extern "C" fn $fname(size: *mut usize, align: *mut usize) {
+                *size = mem::size_of::<$T>();
+                *align = mem::align_of::<$T>();
             }
         };
         ($T:ty, $U:ty, $V:ty, $fname:ident) => {
             #[no_mangle]
             #[allow(non_snake_case)]
-            pub extern "C" fn $fname(size: *mut usize, align: *mut usize) {
-                unsafe {
-                    *size = mem::size_of::<$T>();
-                    *align = mem::align_of::<$T>();
-
-                    assert_eq!(*size, mem::size_of::<$U>());
-                    assert_eq!(*align, mem::align_of::<$U>());
-                    assert_eq!(*size, mem::size_of::<$V>());
-                    assert_eq!(*align, mem::align_of::<$V>());
-                }
+            pub unsafe extern "C" fn $fname(size: *mut usize, align: *mut usize) {
+                *size = mem::size_of::<$T>();
+                *align = mem::align_of::<$T>();
+
+                assert_eq!(*size, mem::size_of::<$U>());
+                assert_eq!(*align, mem::align_of::<$U>());
+                assert_eq!(*size, mem::size_of::<$V>());
+                assert_eq!(*align, mem::align_of::<$V>());
             }
         };
     }
@@ -1395,38 +1412,40 @@
         ($T:ty, $U:ty, $V:ty, $member:ident, $method:ident) => {
             #[no_mangle]
             #[allow(non_snake_case)]
-            pub extern "C" fn $method(size: *mut usize, align: *mut usize, offset: *mut usize) {
-                unsafe {
-                    // Create a temporary value of type T to get offsets, sizes
-                    // and alignments from.
-                    let tmp: mem::MaybeUninit<$T> = mem::MaybeUninit::uninit();
-                    // FIXME: This should use &raw references when available,
-                    // this is technically UB as it creates a reference to
-                    // uninitialized memory, but there's no better way to do
-                    // this right now.
-                    let tmp = &*tmp.as_ptr();
-                    *size = mem::size_of_val(&tmp.$member);
-                    *align = mem::align_of_val(&tmp.$member);
-                    *offset = (&tmp.$member as *const _ as usize) - (tmp as *const $T as usize);
-
-                    let tmp: mem::MaybeUninit<$U> = mem::MaybeUninit::uninit();
-                    let tmp = &*tmp.as_ptr();
-                    assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
-                    assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
-                    assert_eq!(
-                        *offset,
-                        (&tmp.hdr.$member as *const _ as usize) - (tmp as *const $U as usize)
-                    );
-
-                    let tmp: mem::MaybeUninit<$V> = mem::MaybeUninit::uninit();
-                    let tmp = &*tmp.as_ptr();
-                    assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
-                    assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
-                    assert_eq!(
-                        *offset,
-                        (&tmp.hdr.$member as *const _ as usize) - (tmp as *const $V as usize)
-                    );
-                }
+            pub unsafe extern "C" fn $method(
+                size: *mut usize,
+                align: *mut usize,
+                offset: *mut usize,
+            ) {
+                // Create a temporary value of type T to get offsets, sizes
+                // and alignments from.
+                let tmp: mem::MaybeUninit<$T> = mem::MaybeUninit::uninit();
+                // FIXME: This should use &raw references when available,
+                // this is technically UB as it creates a reference to
+                // uninitialized memory, but there's no better way to do
+                // this right now.
+                let tmp = &*tmp.as_ptr();
+                *size = mem::size_of_val(&tmp.$member);
+                *align = mem::align_of_val(&tmp.$member);
+                *offset = (&tmp.$member as *const _ as usize) - (tmp as *const $T as usize);
+
+                let tmp: mem::MaybeUninit<$U> = mem::MaybeUninit::uninit();
+                let tmp = &*tmp.as_ptr();
+                assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
+                assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
+                assert_eq!(
+                    *offset,
+                    (&tmp.hdr.$member as *const _ as usize) - (tmp as *const $U as usize)
+                );
+
+                let tmp: mem::MaybeUninit<$V> = mem::MaybeUninit::uninit();
+                let tmp = &*tmp.as_ptr();
+                assert_eq!(*size, mem::size_of_val(&tmp.hdr.$member));
+                assert_eq!(*align, mem::align_of_val(&tmp.hdr.$member));
+                assert_eq!(
+                    *offset,
+                    (&tmp.hdr.$member as *const _ as usize) - (tmp as *const $V as usize)
+                );
             }
         };
     }
@@ -1490,7 +1509,7 @@
 
     #[no_mangle]
     #[allow(non_snake_case)]
-    pub extern "C" fn Rust_Test_NsStringFlags(
+    pub unsafe extern "C" fn Rust_Test_NsStringFlags(
         f_terminated: *mut u16,
         f_voided: *mut u16,
         f_refcounted: *mut u16,
@@ -1500,29 +1519,25 @@
         f_class_inline: *mut u16,
         f_class_null_terminated: *mut u16,
     ) {
-        unsafe {
-            *f_terminated = DataFlags::TERMINATED.bits();
-            *f_voided = DataFlags::VOIDED.bits();
-            *f_refcounted = DataFlags::REFCOUNTED.bits();
-            *f_owned = DataFlags::OWNED.bits();
-            *f_inline = DataFlags::INLINE.bits();
-            *f_literal = DataFlags::LITERAL.bits();
-            *f_class_inline = ClassFlags::INLINE.bits();
-            *f_class_null_terminated = ClassFlags::NULL_TERMINATED.bits();
-        }
+        *f_terminated = DataFlags::TERMINATED.bits();
+        *f_voided = DataFlags::VOIDED.bits();
+        *f_refcounted = DataFlags::REFCOUNTED.bits();
+        *f_owned = DataFlags::OWNED.bits();
+        *f_inline = DataFlags::INLINE.bits();
+        *f_literal = DataFlags::LITERAL.bits();
+        *f_class_inline = ClassFlags::INLINE.bits();
+        *f_class_null_terminated = ClassFlags::NULL_TERMINATED.bits();
     }
 
     #[no_mangle]
     #[allow(non_snake_case)]
-    pub extern "C" fn Rust_InlineCapacityFromRust(
+    pub unsafe extern "C" fn Rust_InlineCapacityFromRust(
         cstring: *const nsACString,
         string: *const nsAString,
         cstring_capacity: *mut usize,
         string_capacity: *mut usize,
     ) {
-        unsafe {
-            *cstring_capacity = (*cstring).inline_capacity().unwrap();
-            *string_capacity = (*string).inline_capacity().unwrap();
-        }
+        *cstring_capacity = (*cstring).inline_capacity().unwrap();
+        *string_capacity = (*string).inline_capacity().unwrap();
     }
 }
diff -Nru firefox-84.0.2+build1/xpcom/rust/xpcom/Cargo.toml firefox-85.0+build1/xpcom/rust/xpcom/Cargo.toml
--- firefox-84.0.2+build1/xpcom/rust/xpcom/Cargo.toml	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/xpcom/Cargo.toml	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
 edition = "2018"
 
 [dependencies]
+cstr = "0.2"
 libc = "0.2"
 nsstring = { path = "../nsstring" }
 nserror = { path = "../nserror" }
diff -Nru firefox-84.0.2+build1/xpcom/rust/xpcom/src/lib.rs firefox-85.0+build1/xpcom/rust/xpcom/src/lib.rs
--- firefox-84.0.2+build1/xpcom/rust/xpcom/src/lib.rs	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/xpcom/src/lib.rs	2021-01-18 19:58:27.000000000 +0000
@@ -22,6 +22,10 @@
 mod method;
 pub use method::*;
 
+// dom::Promise resolving.
+mod promise;
+pub use promise::*;
+
 mod refptr;
 pub use refptr::*;
 
diff -Nru firefox-84.0.2+build1/xpcom/rust/xpcom/src/promise.rs firefox-85.0+build1/xpcom/rust/xpcom/src/promise.rs
--- firefox-84.0.2+build1/xpcom/rust/xpcom/src/promise.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/xpcom/rust/xpcom/src/promise.rs	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,62 @@
+/* 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 https://mozilla.org/MPL/2.0/. */
+
+use crate::{
+    create_instance,
+    interfaces::{nsIVariant, nsIWritableVariant},
+    RefCounted,
+};
+
+use cstr::*;
+
+mod ffi {
+    use super::*;
+
+    extern "C" {
+        // These are implemented in dom/promise/Promise.cpp
+        pub fn DomPromise_AddRef(promise: *const Promise);
+        pub fn DomPromise_Release(promise: *const Promise);
+        pub fn DomPromise_RejectWithVariant(promise: *const Promise, variant: *const nsIVariant);
+        pub fn DomPromise_ResolveWithVariant(promise: *const Promise, variant: *const nsIVariant);
+    }
+}
+
+#[repr(C)]
+pub struct Promise {
+    private: [u8; 0],
+
+    /// This field is a phantomdata to ensure that the Promise type and any
+    /// struct containing it is not safe to send across threads, as DOM is
+    /// generally not threadsafe.
+    __nosync: ::std::marker::PhantomData<::std::rc::Rc<u8>>,
+}
+
+impl Promise {
+    pub fn reject_with_undefined(&self) {
+        let variant = create_instance::<nsIWritableVariant>(cstr!("@mozilla.org/variant;1"))
+            .expect("Failed to create writable variant");
+        unsafe {
+            variant.SetAsVoid();
+        }
+        self.reject_with_variant(&variant);
+    }
+
+    pub fn reject_with_variant(&self, variant: &nsIVariant) {
+        unsafe { ffi::DomPromise_RejectWithVariant(self, variant) }
+    }
+
+    pub fn resolve_with_variant(&self, variant: &nsIVariant) {
+        unsafe { ffi::DomPromise_ResolveWithVariant(self, variant) }
+    }
+}
+
+unsafe impl RefCounted for Promise {
+    unsafe fn addref(&self) {
+        ffi::DomPromise_AddRef(self)
+    }
+
+    unsafe fn release(&self) {
+        ffi::DomPromise_Release(self)
+    }
+}
diff -Nru firefox-84.0.2+build1/xpcom/string/nsTStringComparator.cpp firefox-85.0+build1/xpcom/string/nsTStringComparator.cpp
--- firefox-84.0.2+build1/xpcom/string/nsTStringComparator.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/string/nsTStringComparator.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -53,7 +53,8 @@
 int nsTDefaultStringComparator(const T* aLhs, const T* aRhs, uint32_t aLLength,
                                uint32_t aRLength) {
   return aLLength == aRLength ? nsCharTraits<T>::compare(aLhs, aRhs, aLLength)
-                              : (aLLength > aRLength) ? 1 : -1;
+         : (aLLength > aRLength) ? 1
+                                 : -1;
 }
 
 template int nsTDefaultStringComparator(const char*, const char*, uint32_t,
diff -Nru firefox-84.0.2+build1/xpcom/string/nsTSubstring.h firefox-85.0+build1/xpcom/string/nsTSubstring.h
--- firefox-84.0.2+build1/xpcom/string/nsTSubstring.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/string/nsTSubstring.h	2021-01-18 19:58:27.000000000 +0000
@@ -1435,6 +1435,8 @@
   }
 };
 
+#include "nsTDependentSubstring.h"
+
 extern template class nsTSubstringSplitter<char>;
 extern template class nsTSubstringSplitter<char16_t>;
 
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/moz.build firefox-85.0+build1/xpcom/tests/gtest/moz.build
--- firefox-84.0.2+build1/xpcom/tests/gtest/moz.build	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -40,6 +40,7 @@
     "TestRacingServiceManager.cpp",
     "TestRecursiveMutex.cpp",
     "TestRWLock.cpp",
+    "TestSegmentedBuffer.cpp",
     "TestSlicedInputStream.cpp",
     "TestSmallArrayLRUCache.cpp",
     "TestSnappyStreams.cpp",
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestAllocReplacement.cpp firefox-85.0+build1/xpcom/tests/gtest/TestAllocReplacement.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestAllocReplacement.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestAllocReplacement.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,7 +6,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/mozalloc.h"
-#include "mozilla/ScopeExit.h"
 #include "nsCOMPtr.h"
 #include "nsIMemoryReporter.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestAtoms.cpp firefox-85.0+build1/xpcom/tests/gtest/TestAtoms.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestAtoms.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestAtoms.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsAtom.h"
 #include "nsString.h"
 #include "UTFStrings.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 #include "gtest/gtest.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestAutoRefCnt.cpp firefox-85.0+build1/xpcom/tests/gtest/TestAutoRefCnt.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestAutoRefCnt.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestAutoRefCnt.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsISupportsImpl.h"
 
 #include "mozilla/Atomics.h"
+#include "nsIThread.h"
 #include "nsThreadUtils.h"
 
 #include "gtest/gtest.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestEventPriorities.cpp firefox-85.0+build1/xpcom/tests/gtest/TestEventPriorities.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestEventPriorities.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestEventPriorities.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 #include "nsXPCOM.h"
 #include "nsThreadUtils.h"
 #include "gtest/gtest.h"
+#include "mozilla/SpinEventLoopUntil.h"
 
 #include <functional>
 
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestInputStreamLengthHelper.cpp firefox-85.0+build1/xpcom/tests/gtest/TestInputStreamLengthHelper.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestInputStreamLengthHelper.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestInputStreamLengthHelper.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 
 #include "mozilla/InputStreamLengthHelper.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsCOMPtr.h"
 #include "nsIInputStream.h"
 #include "nsStreamUtils.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestMozPromise.cpp firefox-85.0+build1/xpcom/tests/gtest/TestMozPromise.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestMozPromise.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestMozPromise.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -256,6 +256,36 @@
   });
 }
 
+TEST(MozPromise, PromiseAllResolveAsync)
+{
+  AutoTaskQueue atq;
+  RefPtr<TaskQueue> queue = atq.Queue();
+  RunOnTaskQueue(queue, [queue]() -> void {
+    nsTArray<RefPtr<TestPromise>> promises;
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(22, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(32, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(42, __func__);
+    }));
+
+    TestPromise::All(queue, promises)
+        ->Then(
+            queue, __func__,
+            [queue](const CopyableTArray<int>& aResolveValues) -> void {
+              EXPECT_EQ(aResolveValues.Length(), 3UL);
+              EXPECT_EQ(aResolveValues[0], 22);
+              EXPECT_EQ(aResolveValues[1], 32);
+              EXPECT_EQ(aResolveValues[2], 42);
+              queue->BeginShutdown();
+            },
+            []() { EXPECT_TRUE(false); });
+  });
+}
+
 TEST(MozPromise, PromiseAllReject)
 {
   AutoTaskQueue atq;
@@ -278,6 +308,107 @@
   });
 }
 
+TEST(MozPromise, PromiseAllRejectAsync)
+{
+  AutoTaskQueue atq;
+  RefPtr<TaskQueue> queue = atq.Queue();
+  RunOnTaskQueue(queue, [queue]() -> void {
+    nsTArray<RefPtr<TestPromise>> promises;
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(22, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndReject(32.0, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(42, __func__);
+    }));
+    // Ensure that more than one rejection doesn't cause a crash (bug #1207312)
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndReject(52.0, __func__);
+    }));
+
+    TestPromise::All(queue, promises)
+        ->Then(
+            queue, __func__, []() { EXPECT_TRUE(false); },
+            [queue](float aRejectValue) -> void {
+              EXPECT_EQ(aRejectValue, 32.0);
+              queue->BeginShutdown();
+            });
+  });
+}
+
+TEST(MozPromise, PromiseAllSettled)
+{
+  AutoTaskQueue atq;
+  RefPtr<TaskQueue> queue = atq.Queue();
+  RunOnTaskQueue(queue, [queue]() -> void {
+    nsTArray<RefPtr<TestPromise>> promises;
+    promises.AppendElement(TestPromise::CreateAndResolve(22, __func__));
+    promises.AppendElement(TestPromise::CreateAndReject(32.0, __func__));
+    promises.AppendElement(TestPromise::CreateAndResolve(42, __func__));
+    promises.AppendElement(TestPromise::CreateAndReject(52.0, __func__));
+
+    TestPromise::AllSettled(queue, promises)
+        ->Then(
+            queue, __func__,
+            [queue](const TestPromise::AllSettledPromiseType::ResolveValueType&
+                        aResolveValues) -> void {
+              EXPECT_EQ(aResolveValues.Length(), 4UL);
+              EXPECT_TRUE(aResolveValues[0].IsResolve());
+              EXPECT_EQ(aResolveValues[0].ResolveValue(), 22);
+              EXPECT_FALSE(aResolveValues[1].IsResolve());
+              EXPECT_EQ(aResolveValues[1].RejectValue(), 32.0);
+              EXPECT_TRUE(aResolveValues[2].IsResolve());
+              EXPECT_EQ(aResolveValues[2].ResolveValue(), 42);
+              EXPECT_FALSE(aResolveValues[3].IsResolve());
+              EXPECT_EQ(aResolveValues[3].RejectValue(), 52.0);
+              queue->BeginShutdown();
+            },
+            []() { EXPECT_TRUE(false); });
+  });
+}
+
+TEST(MozPromise, PromiseAllSettledAsync)
+{
+  AutoTaskQueue atq;
+  RefPtr<TaskQueue> queue = atq.Queue();
+
+  RunOnTaskQueue(queue, [queue]() -> void {
+    nsTArray<RefPtr<TestPromise>> promises;
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(22, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndReject(32.0, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndResolve(42, __func__);
+    }));
+    promises.AppendElement(InvokeAsync(queue, __func__, []() {
+      return TestPromise::CreateAndReject(52.0, __func__);
+    }));
+
+    TestPromise::AllSettled(queue, promises)
+        ->Then(
+            queue, __func__,
+            [queue](const TestPromise::AllSettledPromiseType::ResolveValueType&
+                        aResolveValues) -> void {
+              EXPECT_EQ(aResolveValues.Length(), 4UL);
+              EXPECT_TRUE(aResolveValues[0].IsResolve());
+              EXPECT_EQ(aResolveValues[0].ResolveValue(), 22);
+              EXPECT_FALSE(aResolveValues[1].IsResolve());
+              EXPECT_EQ(aResolveValues[1].RejectValue(), 32.0);
+              EXPECT_TRUE(aResolveValues[2].IsResolve());
+              EXPECT_EQ(aResolveValues[2].ResolveValue(), 42);
+              EXPECT_FALSE(aResolveValues[3].IsResolve());
+              EXPECT_EQ(aResolveValues[3].RejectValue(), 52.0);
+              queue->BeginShutdown();
+            },
+            []() { EXPECT_TRUE(false); });
+  });
+}
+
 // Test we don't hit the assertions in MozPromise when exercising promise
 // chaining upon task queue shutdown.
 TEST(MozPromise, Chaining)
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestMultiplexInputStream.cpp firefox-85.0+build1/xpcom/tests/gtest/TestMultiplexInputStream.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestMultiplexInputStream.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestMultiplexInputStream.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gtest/gtest.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsIAsyncInputStream.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIInputStream.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp firefox-85.0+build1/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestNonBlockingAsyncInputStream.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 
 #include "mozilla/NonBlockingAsyncInputStream.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsIAsyncInputStream.h"
 #include "nsStreamUtils.h"
 #include "nsString.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestRacingServiceManager.cpp firefox-85.0+build1/xpcom/tests/gtest/TestRacingServiceManager.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestRacingServiceManager.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestRacingServiceManager.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsXULAppAPI.h"
 #include "nsIThread.h"
 
+#include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOMCIDInternal.h"
 #include "pratom.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestRWLock.cpp firefox-85.0+build1/xpcom/tests/gtest/TestRWLock.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestRWLock.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestRWLock.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/RWLock.h"
+#include "nsIThread.h"
 #include "gtest/gtest.h"
 
 using mozilla::RWLock;
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestSegmentedBuffer.cpp firefox-85.0+build1/xpcom/tests/gtest/TestSegmentedBuffer.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestSegmentedBuffer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestSegmentedBuffer.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,40 @@
+/* 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 "gtest/gtest.h"
+#include "../../io/nsSegmentedBuffer.h"
+
+using namespace mozilla;
+
+TEST(SegmentedBuffer, AppendAndDelete)
+{
+  auto buf = MakeUnique<nsSegmentedBuffer>();
+  buf->Init(4, 16);
+  char* seg;
+  bool empty;
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(!empty) << "DeleteFirstSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(!empty) << "DeleteFirstSegment failed";
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  seg = buf->AppendNewSegment();
+  EXPECT_TRUE(seg) << "AppendNewSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(!empty) << "DeleteFirstSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(!empty) << "DeleteFirstSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(!empty) << "DeleteFirstSegment failed";
+  empty = buf->DeleteFirstSegment();
+  EXPECT_TRUE(empty) << "DeleteFirstSegment failed";
+}
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestSlicedInputStream.cpp firefox-85.0+build1/xpcom/tests/gtest/TestSlicedInputStream.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestSlicedInputStream.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestSlicedInputStream.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -1,6 +1,7 @@
 #include "gtest/gtest.h"
 
 #include "mozilla/SlicedInputStream.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsCOMPtr.h"
 #include "nsIInputStream.h"
 #include "nsIPipe.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestThreadManager.cpp firefox-85.0+build1/xpcom/tests/gtest/TestThreadManager.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestThreadManager.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestThreadManager.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "nsIThreadManager.h"
 #include "nsCOMPtr.h"
+#include "nsIThread.h"
 #include "nsXPCOM.h"
 #include "nsThreadUtils.h"
 #include "nsServiceManagerUtils.h"
diff -Nru firefox-84.0.2+build1/xpcom/tests/gtest/TestThreadUtils.cpp firefox-85.0+build1/xpcom/tests/gtest/TestThreadUtils.cpp
--- firefox-84.0.2+build1/xpcom/tests/gtest/TestThreadUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/gtest/TestThreadUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/IdleTaskRunner.h"
 #include "mozilla/RefCounted.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/UniquePtr.h"
 
 #include "gtest/gtest.h"
@@ -510,6 +511,15 @@
     // Read only string. Dereferencing in runnable method to check this works.
     char* message = (char*)"Test message";
 
+    {
+      auto bar = MakeRefPtr<nsBar>();
+
+      NS_DispatchToMainThread(
+          aNamed ? NewRunnableMethod("unused", std::move(bar), &nsBar::DoBar1)
+                 : NewRunnableMethod("nsBar::DoBar1", std::move(bar),
+                                     &nsBar::DoBar1));
+    }
+
     NS_DispatchToMainThread(
         aNamed ? NewRunnableMethod("unused", bar, &nsBar::DoBar1)
                : NewRunnableMethod("nsBar::DoBar1", bar, &nsBar::DoBar1));
diff -Nru firefox-84.0.2+build1/xpcom/tests/unit/test_localfile.js firefox-85.0+build1/xpcom/tests/unit/test_localfile.js
--- firefox-84.0.2+build1/xpcom/tests/unit/test_localfile.js	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/tests/unit/test_localfile.js	2021-01-18 19:58:27.000000000 +0000
@@ -134,3 +134,40 @@
 
   file.remove(true);
 }
+
+function test_file_creation_time() {
+  const file = do_get_profile();
+  file.append("testfile");
+
+  if (file.exists()) {
+    file.remove(true);
+  }
+
+  const now = Date.now();
+
+  file.create(Ci.nsIFile.NORMAL_FILE_TYPE, 0o644);
+  Assert.ok(file.exists());
+
+  let creationTime;
+  try {
+    creationTime = file.creationTime;
+  } catch (e) {
+    if (e.name === "NS_ERROR_NOT_AVAILABLE") {
+      // Creation time is not supported on this platform.
+      file.remove(true);
+      return;
+    }
+  }
+
+  const diff = Math.abs(creationTime - now);
+  Assert.ok(diff < MAX_TIME_DIFFERENCE);
+
+  Assert.ok(creationTime === file.lastModifiedTime);
+
+  file.lastModifiedTime = now + MILLIS_PER_DAY;
+
+  Assert.ok(creationTime !== file.lastModifiedTime);
+  Assert.ok(creationTime === file.creationTime);
+
+  file.remove(true);
+}
diff -Nru firefox-84.0.2+build1/xpcom/threads/AbstractThread.h firefox-85.0+build1/xpcom/threads/AbstractThread.h
--- firefox-84.0.2+build1/xpcom/threads/AbstractThread.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/AbstractThread.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,13 +7,15 @@
 #if !defined(AbstractThread_h_)
 #  define AbstractThread_h_
 
-#  include "mozilla/RefPtr.h"
+#  include "mozilla/AlreadyAddRefed.h"
 #  include "mozilla/ThreadLocal.h"
 #  include "nscore.h"
-#  include "nsIRunnable.h"
 #  include "nsISerialEventTarget.h"
-#  include "nsISupportsImpl.h"
-#  include "nsIThread.h"
+#  include "nsISupports.h"
+
+class nsIEventTarget;
+class nsIRunnable;
+class nsIThread;
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/BlockingResourceBase.h firefox-85.0+build1/xpcom/threads/BlockingResourceBase.h
--- firefox-84.0.2+build1/xpcom/threads/BlockingResourceBase.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/BlockingResourceBase.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,13 +7,13 @@
 #ifndef mozilla_BlockingResourceBase_h
 #define mozilla_BlockingResourceBase_h
 
-#include "mozilla/Logging.h"
+#include "mozilla/MemoryReporting.h"
 #include "mozilla/ThreadLocal.h"
 
 #include "nscore.h"
 #include "nsDebug.h"
-#include "nsError.h"
-#include "nsISupportsImpl.h"
+
+#include "prtypes.h"
 
 #ifdef DEBUG
 
@@ -22,13 +22,11 @@
 
 #  include "prinit.h"
 
-#  include "nsString.h"
-
 #  ifndef MOZ_CALLSTACK_DISABLED
+#    include "mozilla/Maybe.h"
 #    include "nsTArray.h"
 #  endif
 
-#  include "nsXPCOM.h"
 #endif
 
 //
diff -Nru firefox-84.0.2+build1/xpcom/threads/CondVar.h firefox-85.0+build1/xpcom/threads/CondVar.h
--- firefox-84.0.2+build1/xpcom/threads/CondVar.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/CondVar.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,10 +10,11 @@
 #include "mozilla/BlockingResourceBase.h"
 #include "mozilla/PlatformConditionVariable.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/TimeStamp.h"
 
-#ifdef MOZILLA_INTERNAL_API
+#if defined(MOZILLA_INTERNAL_API) && !defined(DEBUG)
 #  include "GeckoProfiler.h"
-#endif  // MOZILLA_INTERNAL_API
+#endif  // defined( MOZILLA_INTERNAL_API) && !defined(DEBUG)
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/CPUUsageWatcher.cpp firefox-85.0+build1/xpcom/threads/CPUUsageWatcher.cpp
--- firefox-84.0.2+build1/xpcom/threads/CPUUsageWatcher.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/CPUUsageWatcher.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -14,6 +14,10 @@
 #  include <mach/mach_host.h>
 #endif
 
+#ifdef CPU_USAGE_WATCHER_ACTIVE
+#  include "mozilla/BackgroundHangMonitor.h"
+#endif
+
 namespace mozilla {
 
 #ifdef CPU_USAGE_WATCHER_ACTIVE
diff -Nru firefox-84.0.2+build1/xpcom/threads/CPUUsageWatcher.h firefox-85.0+build1/xpcom/threads/CPUUsageWatcher.h
--- firefox-84.0.2+build1/xpcom/threads/CPUUsageWatcher.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/CPUUsageWatcher.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,7 +10,7 @@
 #include <stdint.h>
 
 #include "mozilla/HangAnnotations.h"
-#include "mozilla/BackgroundHangMonitor.h"
+#include "mozilla/Result.h"
 
 // We only support OSX and Windows, because on Linux we're forced to read
 // from /proc/stat in order to get global CPU values. We would prefer to not
@@ -21,8 +21,10 @@
 
 namespace mozilla {
 
+// Start error values at 1 to allow using the UnusedZero Result
+// optimization.
 enum CPUUsageWatcherError : uint8_t {
-  ClockGetTimeError,
+  ClockGetTimeError = 1,
   GetNumberOfProcessorsError,
   GetProcessTimesError,
   GetSystemTimesError,
@@ -30,6 +32,14 @@
   ProcStatError,
 };
 
+namespace detail {
+
+template <>
+struct UnusedZero<CPUUsageWatcherError> : UnusedZeroEnum<CPUUsageWatcherError> {
+};
+
+}  // namespace detail
+
 class CPUUsageHangAnnotator : public BackgroundHangAnnotator {
  public:
 };
diff -Nru firefox-84.0.2+build1/xpcom/threads/DataMutex.h firefox-85.0+build1/xpcom/threads/DataMutex.h
--- firefox-84.0.2+build1/xpcom/threads/DataMutex.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/DataMutex.h	2021-01-18 19:58:27.000000000 +0000
@@ -37,7 +37,7 @@
 //
 template <typename T, typename MutexType>
 class DataMutexBase {
- private:
+ public:
   class MOZ_STACK_CLASS AutoLock {
    public:
     T* operator->() const& { return &ref(); }
@@ -84,7 +84,6 @@
     DataMutexBase<T, MutexType>* mOwner;
   };
 
- public:
   explicit DataMutexBase(const char* aName) : mMutex(aName) {}
 
   DataMutexBase(T&& aValue, const char* aName)
@@ -92,6 +91,8 @@
 
   AutoLock Lock() { return AutoLock(this); }
 
+  const MutexType& Mutex() const { return mMutex; }
+
  private:
   MutexType mMutex;
   T mValue;
diff -Nru firefox-84.0.2+build1/xpcom/threads/EventQueue.h firefox-85.0+build1/xpcom/threads/EventQueue.h
--- firefox-84.0.2+build1/xpcom/threads/EventQueue.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/EventQueue.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/Mutex.h"
 #include "mozilla/Queue.h"
+#include "mozilla/TimeStamp.h"
 #include "nsCOMPtr.h"
 
 class nsIRunnable;
diff -Nru firefox-84.0.2+build1/xpcom/threads/IdleTaskRunner.cpp firefox-85.0+build1/xpcom/threads/IdleTaskRunner.cpp
--- firefox-84.0.2+build1/xpcom/threads/IdleTaskRunner.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/IdleTaskRunner.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -11,28 +11,28 @@
 namespace mozilla {
 
 already_AddRefed<IdleTaskRunner> IdleTaskRunner::Create(
-    const CallbackType& aCallback, const char* aRunnableName, uint32_t aDelay,
-    int64_t aBudget, bool aRepeating,
+    const CallbackType& aCallback, const char* aRunnableName,
+    uint32_t aMaxDelay, int64_t aNonIdleBudget, bool aRepeating,
     const MayStopProcessingCallbackType& aMayStopProcessing) {
   if (aMayStopProcessing && aMayStopProcessing()) {
     return nullptr;
   }
 
   RefPtr<IdleTaskRunner> runner =
-      new IdleTaskRunner(aCallback, aRunnableName, aDelay, aBudget, aRepeating,
-                         aMayStopProcessing);
+      new IdleTaskRunner(aCallback, aRunnableName, aMaxDelay, aNonIdleBudget,
+                         aRepeating, aMayStopProcessing);
   runner->Schedule(false);  // Initial scheduling shouldn't use idle dispatch.
   return runner.forget();
 }
 
 IdleTaskRunner::IdleTaskRunner(
-    const CallbackType& aCallback, const char* aRunnableName, uint32_t aDelay,
-    int64_t aBudget, bool aRepeating,
+    const CallbackType& aCallback, const char* aRunnableName,
+    uint32_t aMaxDelay, int64_t aNonIdleBudget, bool aRepeating,
     const MayStopProcessingCallbackType& aMayStopProcessing)
-    : IdleRunnable(aRunnableName),
+    : CancelableIdleRunnable(aRunnableName),
       mCallback(aCallback),
-      mDelay(aDelay),
-      mBudget(TimeDuration::FromMilliseconds(aBudget)),
+      mDelay(aMaxDelay),
+      mBudget(TimeDuration::FromMilliseconds(aNonIdleBudget)),
       mRepeating(aRepeating),
       mTimerActive(false),
       mMayStopProcessing(aMayStopProcessing),
@@ -76,10 +76,15 @@
 
 void IdleTaskRunner::SetDeadline(mozilla::TimeStamp aDeadline) {
   mDeadline = aDeadline;
-};
+}
+
+void IdleTaskRunner::SetBudget(int64_t aBudget) {
+  mBudget = TimeDuration::FromMilliseconds(aBudget);
+}
 
 void IdleTaskRunner::SetTimer(uint32_t aDelay, nsIEventTarget* aTarget) {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(aTarget->IsOnCurrentThread());
   // aTarget is always the main thread event target provided from
   // NS_DispatchToCurrentThreadQueue(). We ignore aTarget here to ensure that
   // CollectorRunner always run specifically the main thread.
@@ -136,8 +141,8 @@
       // We weren't allowed to do idle dispatch immediately, do it after a
       // short timeout.
       mScheduleTimer->InitWithNamedFuncCallback(
-          ScheduleTimedOut, this, 16, nsITimer::TYPE_ONE_SHOT_LOW_PRIORITY,
-          mName);
+          ScheduleTimedOut, this, 16 /* ms */,
+          nsITimer::TYPE_ONE_SHOT_LOW_PRIORITY, mName);
     }
   }
 }
diff -Nru firefox-84.0.2+build1/xpcom/threads/IdleTaskRunner.h firefox-85.0+build1/xpcom/threads/IdleTaskRunner.h
--- firefox-84.0.2+build1/xpcom/threads/IdleTaskRunner.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/IdleTaskRunner.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,12 +14,11 @@
 
 namespace mozilla {
 
-// A general purpose repeating callback runner (it can be configured
-// to a one-time runner, too.) If it is running repeatedly,
-// one has to either explicitly Cancel() the runner or have
-// MayContinueProcessing() callback return false to completely remove
-// the runner.
-class IdleTaskRunner final : public IdleRunnable {
+// A general purpose repeating callback runner (it can be configured to a
+// one-time runner, too.) If it is running repeatedly, one has to either
+// explicitly Cancel() the runner or have MayStopProcessing() callback return
+// true to completely remove the runner.
+class IdleTaskRunner final : public CancelableIdleRunnable {
  public:
   // Return true if some meaningful work was done.
   using CallbackType = std::function<bool(TimeStamp aDeadline)>;
@@ -30,23 +29,34 @@
   using MayStopProcessingCallbackType = std::function<bool()>;
 
  public:
+  // An IdleTaskRunner will attempt to run in idle time, with a budget computed
+  // based on a (capped) estimate for how much idle time is available. If there
+  // is no idle time within `aMaxDelay` ms, it will fall back to running using
+  // a specified `aNonIdleBudget`.
   static already_AddRefed<IdleTaskRunner> Create(
-      const CallbackType& aCallback, const char* aRunnableName, uint32_t aDelay,
-      int64_t aBudget, bool aRepeating,
+      const CallbackType& aCallback, const char* aRunnableName,
+      uint32_t aMaxDelay, int64_t aNonIdleBudget, bool aRepeating,
       const MayStopProcessingCallbackType& aMayStopProcessing);
 
   NS_IMETHOD Run() override;
 
+  // (Used by the task triggering code.) Record the end of the current idle
+  // period, or null if not running during idle time.
   void SetDeadline(mozilla::TimeStamp aDeadline) override;
+
   void SetTimer(uint32_t aDelay, nsIEventTarget* aTarget) override;
 
+  // Update the non-idle time budgeted for this callback. This really only
+  // makes sense for a repeating runner.
+  void SetBudget(int64_t aBudget);
+
   nsresult Cancel() override;
   void Schedule(bool aAllowIdleDispatch);
 
  private:
   explicit IdleTaskRunner(
-      const CallbackType& aCallback, const char* aRunnableName, uint32_t aDelay,
-      int64_t aBudget, bool aRepeating,
+      const CallbackType& aCallback, const char* aRunnableName,
+      uint32_t aMaxDelay, int64_t aNonIdleBudget, bool aRepeating,
       const MayStopProcessingCallbackType& aMayStopProcessing);
   ~IdleTaskRunner();
   void CancelTimer();
@@ -55,9 +65,19 @@
   nsCOMPtr<nsITimer> mTimer;
   nsCOMPtr<nsITimer> mScheduleTimer;
   CallbackType mCallback;
+
+  // Wait this long for idle time before giving up and running a non-idle
+  // callback.
   uint32_t mDelay;
+
+  // If running during idle time, the expected end of the current idle period.
+  // The null timestamp when the run is triggered by aMaxDelay instead of idle.
   TimeStamp mDeadline;
+
+  // The expected amount of time the callback will run for, when not running
+  // during idle time.
   TimeDuration mBudget;
+
   bool mRepeating;
   bool mTimerActive;
   MayStopProcessingCallbackType mMayStopProcessing;
diff -Nru firefox-84.0.2+build1/xpcom/threads/InputEventStatistics.cpp firefox-85.0+build1/xpcom/threads/InputEventStatistics.cpp
--- firefox-84.0.2+build1/xpcom/threads/InputEventStatistics.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/InputEventStatistics.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -6,6 +6,7 @@
 
 #include "InputEventStatistics.h"
 
+#include "mozilla/Preferences.h"
 #include "nsRefreshDriver.h"
 
 namespace mozilla {
@@ -57,10 +58,9 @@
     return TimeStamp::Now() - TimeDuration::FromMilliseconds(1);
   }
   TimeDuration inputCost = mLastInputDurations->GetMean() * aInputCount;
-  inputCost =
-      inputCost > mMaxInputDuration
-          ? mMaxInputDuration
-          : inputCost < mMinInputDuration ? mMinInputDuration : inputCost;
+  inputCost = inputCost > mMaxInputDuration   ? mMaxInputDuration
+              : inputCost < mMinInputDuration ? mMinInputDuration
+                                              : inputCost;
 
   return nextTickHint.value() - inputCost;
 }
diff -Nru firefox-84.0.2+build1/xpcom/threads/InputEventStatistics.h firefox-85.0+build1/xpcom/threads/InputEventStatistics.h
--- firefox-84.0.2+build1/xpcom/threads/InputEventStatistics.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/InputEventStatistics.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,10 +7,8 @@
 #if !defined(InputEventStatistics_h_)
 #  define InputEventStatistics_h_
 
-#  include "mozilla/ClearOnShutdown.h"
-#  include "mozilla/Maybe.h"
-#  include "mozilla/Preferences.h"
 #  include "mozilla/TimeStamp.h"
+#  include "mozilla/UniquePtr.h"
 #  include "nsTArray.h"
 
 namespace mozilla {
diff -Nru firefox-84.0.2+build1/xpcom/threads/InputTaskManager.h firefox-85.0+build1/xpcom/threads/InputTaskManager.h
--- firefox-84.0.2+build1/xpcom/threads/InputTaskManager.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/InputTaskManager.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #define mozilla_InputTaskManager_h
 
 #include "TaskController.h"
+#include "mozilla/StaticPtr.h"
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/LazyIdleThread.h firefox-85.0+build1/xpcom/threads/LazyIdleThread.h
--- firefox-84.0.2+build1/xpcom/threads/LazyIdleThread.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/LazyIdleThread.h	2021-01-18 19:58:27.000000000 +0000
@@ -18,7 +18,7 @@
 
 #include "mozilla/Mutex.h"
 #include "nsCOMPtr.h"
-#include "nsTArray.h"
+#include "nsTArrayForwardDeclare.h"
 #include "nsString.h"
 #include "mozilla/Attributes.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/moz.build firefox-85.0+build1/xpcom/threads/moz.build
--- firefox-84.0.2+build1/xpcom/threads/moz.build	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/moz.build	2021-01-18 19:58:27.000000000 +0000
@@ -30,6 +30,7 @@
 EXPORTS += [
     "MainThreadUtils.h",
     "nsICancelableRunnable.h",
+    "nsIDiscardableRunnable.h",
     "nsIIdleRunnable.h",
     "nsMemoryPressure.h",
     "nsProcess.h",
@@ -64,6 +65,7 @@
     "RWLock.h",
     "SchedulerGroup.h",
     "SharedThreadPool.h",
+    "SpinEventLoopUntil.h",
     "StateMirroring.h",
     "StateWatching.h",
     "SynchronizedEventQueue.h",
diff -Nru firefox-84.0.2+build1/xpcom/threads/MozPromise.h firefox-85.0+build1/xpcom/threads/MozPromise.h
--- firefox-84.0.2+build1/xpcom/threads/MozPromise.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/MozPromise.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,7 +15,6 @@
 #  include "mozilla/Monitor.h"
 #  include "mozilla/Mutex.h"
 #  include "mozilla/RefPtr.h"
-#  include "mozilla/Tuple.h"
 #  include "mozilla/UniquePtr.h"
 #  include "mozilla/Variant.h"
 #  include "nsIDirectTaskDispatcher.h"
@@ -292,6 +291,9 @@
                      IsExclusive>
       AllPromiseType;
 
+  typedef MozPromise<CopyableTArray<ResolveOrRejectValue>, bool, IsExclusive>
+      AllSettledPromiseType;
+
  private:
   class AllPromiseHolder : public MozPromiseRefcountable {
    public:
@@ -341,6 +343,50 @@
     size_t mOutstandingPromises;
   };
 
+  // Trying to pass ResolveOrRejectValue by value fails static analysis checks,
+  // so we need to use either a const& or an rvalue reference, depending on
+  // whether IsExclusive is true or not.
+  typedef std::conditional_t<IsExclusive, ResolveOrRejectValue&&,
+                             const ResolveOrRejectValue&>
+      ResolveOrRejectValueParam;
+
+  class AllSettledPromiseHolder : public MozPromiseRefcountable {
+   public:
+    explicit AllSettledPromiseHolder(size_t aDependentPromises)
+        : mPromise(new typename AllSettledPromiseType::Private(__func__)),
+          mOutstandingPromises(aDependentPromises) {
+      MOZ_ASSERT(aDependentPromises > 0);
+      mValues.SetLength(aDependentPromises);
+    }
+
+    void Settle(size_t aIndex, ResolveOrRejectValueParam aValue) {
+      if (!mPromise) {
+        // Already rejected.
+        return;
+      }
+
+      mValues[aIndex].emplace(MaybeMove(aValue));
+      if (--mOutstandingPromises == 0) {
+        nsTArray<ResolveOrRejectValue> values;
+        values.SetCapacity(mValues.Length());
+        for (auto&& value : mValues) {
+          values.AppendElement(std::move(value.ref()));
+        }
+
+        mPromise->Resolve(std::move(values), __func__);
+        mPromise = nullptr;
+        mValues.Clear();
+      }
+    }
+
+    AllSettledPromiseType* Promise() { return mPromise; }
+
+   private:
+    nsTArray<Maybe<ResolveOrRejectValue>> mValues;
+    RefPtr<typename AllSettledPromiseType::Private> mPromise;
+    size_t mOutstandingPromises;
+  };
+
  public:
   [[nodiscard]] static RefPtr<AllPromiseType> All(
       nsISerialEventTarget* aProcessingTarget,
@@ -365,6 +411,26 @@
     return promise;
   }
 
+  [[nodiscard]] static RefPtr<AllSettledPromiseType> AllSettled(
+      nsISerialEventTarget* aProcessingTarget,
+      nsTArray<RefPtr<MozPromise>>& aPromises) {
+    if (aPromises.Length() == 0) {
+      return AllSettledPromiseType::CreateAndResolve(
+          CopyableTArray<ResolveOrRejectValue>(), __func__);
+    }
+
+    RefPtr<AllSettledPromiseHolder> holder =
+        new AllSettledPromiseHolder(aPromises.Length());
+    RefPtr<AllSettledPromiseType> promise = holder->Promise();
+    for (size_t i = 0; i < aPromises.Length(); ++i) {
+      aPromises[i]->Then(aProcessingTarget, __func__,
+                         [holder, i](ResolveOrRejectValueParam aValue) -> void {
+                           holder->Settle(i, MaybeMove(aValue));
+                         });
+    }
+    return promise;
+  }
+
   class Request : public MozPromiseRefcountable {
    public:
     virtual void Disconnect() = 0;
@@ -459,9 +525,9 @@
           "%s dispatch",
           aPromise->mValue.IsResolve() ? "Resolving" : "Rejecting", mCallSite,
           r.get(), aPromise, this,
-          aPromise->mUseSynchronousTaskDispatch
-              ? "synchronous"
-              : aPromise->mUseDirectTaskDispatch ? "directtask" : "normal");
+          aPromise->mUseSynchronousTaskDispatch ? "synchronous"
+          : aPromise->mUseDirectTaskDispatch    ? "directtask"
+                                                : "normal");
 
       if (aPromise->mUseSynchronousTaskDispatch &&
           mResponseTarget->IsOnCurrentThread()) {
diff -Nru firefox-84.0.2+build1/xpcom/threads/Mutex.h firefox-85.0+build1/xpcom/threads/Mutex.h
--- firefox-84.0.2+build1/xpcom/threads/Mutex.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/Mutex.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,6 +9,7 @@
 
 #include "mozilla/BlockingResourceBase.h"
 #include "mozilla/PlatformMutex.h"
+#include "nsISupports.h"
 
 //
 // Provides:
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsICancelableRunnable.h firefox-85.0+build1/xpcom/threads/nsICancelableRunnable.h
--- firefox-84.0.2+build1/xpcom/threads/nsICancelableRunnable.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsICancelableRunnable.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,8 +21,9 @@
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICANCELABLERUNNABLE_IID)
 
   /*
-   * Cancels a pending task.  If the task has already been executed this will
-   * be a no-op.  Calling this method twice is considered an error.
+   * Cancels a pending task, so that calling run() on the task is a no-op.
+   * Calling cancel after the task execution has begun will be a no-op.
+   * Calling this method twice is considered an error.
    *
    * @throws NS_ERROR_UNEXPECTED
    *   Indicates that the runnable has already been canceled.
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsIDiscardableRunnable.h firefox-85.0+build1/xpcom/threads/nsIDiscardableRunnable.h
--- firefox-84.0.2+build1/xpcom/threads/nsIDiscardableRunnable.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsIDiscardableRunnable.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,41 @@
+/* -*- 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/. */
+
+#ifndef XPCOM_THREADS_NSIDISCARDABLERUNNABLE_H_
+#define XPCOM_THREADS_NSIDISCARDABLERUNNABLE_H_
+
+#include "nsISupports.h"
+
+/**
+ * An interface implemented by nsIRunnable tasks for which nsIRunnable::Run()
+ * might not be called.
+ */
+#define NS_IDISCARDABLERUNNABLE_IID                  \
+  {                                                  \
+    0xde93dc4c, 0x755c, 0x4cdc, {                    \
+      0x96, 0x76, 0x35, 0xc6, 0x48, 0x81, 0x59, 0x78 \
+    }                                                \
+  }
+
+class NS_NO_VTABLE nsIDiscardableRunnable : public nsISupports {
+ public:
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDISCARDABLERUNNABLE_IID)
+
+  /**
+   * Called exactly once on a queued task only if nsIRunnable::Run() is not
+   * called.
+   */
+  virtual void OnDiscard() = 0;
+
+ protected:
+  nsIDiscardableRunnable() = default;
+  virtual ~nsIDiscardableRunnable() = default;
+};
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDiscardableRunnable,
+                              NS_IDISCARDABLERUNNABLE_IID)
+
+#endif  // XPCOM_THREADS_NSIDISCARDABLERUNNABLE_H_
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsProcessCommon.cpp firefox-85.0+build1/xpcom/threads/nsProcessCommon.cpp
--- firefox-84.0.2+build1/xpcom/threads/nsProcessCommon.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsProcessCommon.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -15,6 +15,7 @@
 #include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
+#include "nsIFile.h"
 #include "nsMemory.h"
 #include "nsProcess.h"
 #include "prio.h"
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsProcess.h firefox-85.0+build1/xpcom/threads/nsProcess.h
--- firefox-84.0.2+build1/xpcom/threads/nsProcess.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsProcess.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,8 +14,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
 #include "nsIProcess.h"
-#include "nsIFile.h"
-#include "nsIObserver.h"
 #include "nsIObserver.h"
 #include "nsMaybeWeakPtr.h"
 #include "nsString.h"
@@ -34,6 +32,8 @@
     }                                                \
   }
 
+class nsIFile;
+
 class nsProcess final : public nsIProcess, public nsIObserver {
  public:
   NS_DECL_THREADSAFE_ISUPPORTS
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsProxyRelease.h firefox-85.0+build1/xpcom/threads/nsProxyRelease.h
--- firefox-84.0.2+build1/xpcom/threads/nsProxyRelease.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsProxyRelease.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,6 +14,7 @@
 #include "mozilla/Unused.h"
 #include "nsCOMPtr.h"
 #include "nsIEventTarget.h"
+#include "nsISerialEventTarget.h"
 #include "nsIThread.h"
 #include "nsPrintfCString.h"
 #include "nsThreadUtils.h"
@@ -22,6 +23,8 @@
 #  error NS_ProxyRelease implementation depends on NSPR.
 #endif
 
+class nsIRunnable;
+
 namespace detail {
 
 template <typename T>
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThread.cpp firefox-85.0+build1/xpcom/threads/nsThread.cpp
--- firefox-84.0.2+build1/xpcom/threads/nsThread.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThread.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -31,6 +31,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPrefs_threads.h"
 #include "mozilla/TaskController.h"
 #include "nsXPCOMPrivate.h"
@@ -38,13 +39,11 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Unused.h"
+#include "mozilla/dom/DocGroup.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsThreadSyncDispatch.h"
 #include "nsServiceManagerUtils.h"
 #include "GeckoProfiler.h"
-#ifdef MOZ_GECKO_PROFILER
-#  include "ProfilerMarkerPayload.h"
-#endif
 #include "InputEventStatistics.h"
 #include "ThreadEventQueue.h"
 #include "ThreadEventTarget.h"
@@ -1174,7 +1173,11 @@
 
       LOG(("THRD(%p) running [%p]\n", this, event.get()));
 
-      LogRunnable::Run log(event);
+      Maybe<LogRunnable::Run> log;
+
+      if (!usingTaskController) {
+        log.emplace(event);
+      }
 
       // Delay event processing to encourage whoever dispatched this event
       // to run.
@@ -1524,9 +1527,28 @@
 
 #ifdef MOZ_GECKO_PROFILER
     if (profiler_thread_is_being_profiled()) {
-      PROFILER_ADD_MARKER_WITH_PAYLOAD(
-          mCurrentRunnableIsIdleRunnable ? "LongIdleTask" : "LongTask", OTHER,
-          LongTaskMarkerPayload, (mCurrentTimeSliceStart, aNow));
+      struct LongTaskMarker {
+        static constexpr Span<const char> MarkerTypeName() {
+          return MakeStringSpan("MainThreadLongTask");
+        }
+        static void StreamJSONMarkerData(
+            baseprofiler::SpliceableJSONWriter& aWriter) {
+          aWriter.StringProperty("category", "LongTask");
+        }
+        static MarkerSchema MarkerTypeDisplay() {
+          using MS = MarkerSchema;
+          MS schema{MS::Location::markerChart, MS::Location::markerTable};
+          schema.AddKeyLabelFormat("category", "Type", MS::Format::string);
+          return schema;
+        }
+      };
+
+      profiler_add_marker(mCurrentRunnableIsIdleRunnable
+                              ? ProfilerString8View("LongIdleTask")
+                              : ProfilerString8View("LongTask"),
+                          geckoprofiler::category::OTHER,
+                          MarkerTiming::Interval(mCurrentTimeSliceStart, aNow),
+                          LongTaskMarker{});
     }
 #endif
   }
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThread.h firefox-85.0+build1/xpcom/threads/nsThread.h
--- firefox-84.0.2+build1/xpcom/threads/nsThread.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThread.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,37 +7,41 @@
 #ifndef nsThread_h__
 #define nsThread_h__
 
+#include "MainThreadUtils.h"
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/Array.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/IntegerTypeTraits.h"
+#include "mozilla/EventQueue.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/NotNull.h"
-#include "mozilla/SynchronizedEventQueue.h"
+#include "mozilla/PerformanceCounter.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/TaskDispatcher.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/dom/DocGroup.h"
 #include "nsIDirectTaskDispatcher.h"
+#include "nsIEventTarget.h"
+#include "nsISerialEventTarget.h"
 #include "nsISupportsPriority.h"
+#include "nsIThread.h"
 #include "nsIThreadInternal.h"
-#include "nsString.h"
-#include "nsTObserverArray.h"
-#include "nsThreadUtils.h"
-#include "prenv.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 class CycleCollectedJSContext;
-class EventQueue;
+class SynchronizedEventQueue;
 class ThreadEventQueue;
 class ThreadEventTarget;
+
+template <typename T, size_t Length>
+class Array;
 }  // namespace mozilla
 
 using mozilla::NotNull;
 
+class nsIRunnable;
 class nsLocalExecutionRecord;
 class nsThreadEnumerator;
 
@@ -377,8 +381,6 @@
   bool mIsMainThreadJoining;
 };
 
-class nsLocalExecutionRecord;
-
 // This RAII class controls the duration of the associated nsThread's local
 // execution mode and provides access to the local event target. (See
 // nsThread::EnterLocalExecution() for details.) It is constructed from an
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadManager.cpp firefox-85.0+build1/xpcom/threads/nsThreadManager.cpp
--- firefox-84.0.2+build1/xpcom/threads/nsThreadManager.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadManager.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -17,6 +17,7 @@
 #include "mozilla/InputTaskManager.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/ThreadEventQueue.h"
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadManager.h firefox-85.0+build1/xpcom/threads/nsThreadManager.h
--- firefox-84.0.2+build1/xpcom/threads/nsThreadManager.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadManager.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,12 +7,18 @@
 #ifndef nsThreadManager_h__
 #define nsThreadManager_h__
 
-#include "mozilla/Mutex.h"
-#include "mozilla/TaskController.h"
 #include "nsIThreadManager.h"
 #include "nsThread.h"
 
 class nsIRunnable;
+class nsIEventTarget;
+class nsISerialEventTarget;
+class nsIThread;
+
+namespace mozilla {
+class IdleTaskManager;
+class SynchronizedEventQueue;
+}  // namespace mozilla
 
 class BackgroundEventTarget;
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadPool.cpp firefox-85.0+build1/xpcom/threads/nsThreadPool.cpp
--- firefox-84.0.2+build1/xpcom/threads/nsThreadPool.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadPool.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -13,6 +13,8 @@
 #include "prinrval.h"
 #include "mozilla/Logging.h"
 #include "mozilla/SchedulerGroup.h"
+#include "mozilla/ScopeExit.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "nsThreadSyncDispatch.h"
 
 #include <mutex>
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadPool.h firefox-85.0+build1/xpcom/threads/nsThreadPool.h
--- firefox-84.0.2+build1/xpcom/threads/nsThreadPool.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadPool.h	2021-01-18 19:58:27.000000000 +0000
@@ -8,17 +8,17 @@
 #define nsThreadPool_h__
 
 #include "nsIThreadPool.h"
-#include "nsIThread.h"
 #include "nsIRunnable.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/CondVar.h"
 #include "mozilla/EventQueue.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/Monitor.h"
+
+class nsIThread;
 
 class nsThreadPool final : public mozilla::Runnable, public nsIThreadPool {
  public:
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadUtils.cpp firefox-85.0+build1/xpcom/threads/nsThreadUtils.cpp
--- firefox-84.0.2+build1/xpcom/threads/nsThreadUtils.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadUtils.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -35,7 +35,7 @@
 #  include <sys/prctl.h>
 #endif
 
-static LazyLogModule sEventDispatchAndRunLog("events");
+static mozilla::LazyLogModule sEventDispatchAndRunLog("events");
 #ifdef LOG1
 #  undef LOG1
 #endif
@@ -87,14 +87,22 @@
 }
 #  endif
 
-NS_IMPL_ISUPPORTS_INHERITED(CancelableRunnable, Runnable, nsICancelableRunnable)
+NS_IMPL_ISUPPORTS_INHERITED(DiscardableRunnable, Runnable,
+                            nsIDiscardableRunnable)
 
-nsresult CancelableRunnable::Cancel() {
-  // Do nothing
-  return NS_OK;
+NS_IMPL_ISUPPORTS_INHERITED(CancelableRunnable, DiscardableRunnable,
+                            nsICancelableRunnable)
+
+void CancelableRunnable::OnDiscard() {
+  // Tasks that implement Cancel() can be safely cleaned up if it turns out
+  // that the task will not run.
+  (void)NS_WARN_IF(NS_FAILED(Cancel()));
 }
 
-NS_IMPL_ISUPPORTS_INHERITED(IdleRunnable, CancelableRunnable, nsIIdleRunnable)
+NS_IMPL_ISUPPORTS_INHERITED(IdleRunnable, DiscardableRunnable, nsIIdleRunnable)
+
+NS_IMPL_ISUPPORTS_INHERITED(CancelableIdleRunnable, CancelableRunnable,
+                            nsIIdleRunnable)
 
 NS_IMPL_ISUPPORTS_INHERITED(PrioritizableRunnable, Runnable,
                             nsIRunnablePriority)
@@ -334,20 +342,38 @@
   return rv;
 }
 
-class IdleRunnableWrapper final : public IdleRunnable {
+class IdleRunnableWrapper final : public Runnable,
+                                  public nsIDiscardableRunnable,
+                                  public nsIIdleRunnable {
  public:
   explicit IdleRunnableWrapper(already_AddRefed<nsIRunnable>&& aEvent)
-      : mRunnable(std::move(aEvent)) {}
+      : Runnable("IdleRunnableWrapper"),
+        mRunnable(std::move(aEvent)),
+        mDiscardable(do_QueryInterface(mRunnable)) {}
+
+  NS_DECL_ISUPPORTS_INHERITED
 
   NS_IMETHOD Run() override {
     if (!mRunnable) {
       return NS_OK;
     }
     CancelTimer();
+    // Don't clear mDiscardable because that would cause QueryInterface to
+    // change behavior during the lifetime of an instance.
     nsCOMPtr<nsIRunnable> runnable = std::move(mRunnable);
     return runnable->Run();
   }
 
+  // nsIDiscardableRunnable
+  void OnDiscard() override {
+    if (!mRunnable) {
+      // Run() was already called from TimedOut().
+      return;
+    }
+    mDiscardable->OnDiscard();
+    mRunnable = nullptr;
+  }
+
   static void TimedOut(nsITimer* aTimer, void* aClosure) {
     RefPtr<IdleRunnableWrapper> runnable =
         static_cast<IdleRunnableWrapper*>(aClosure);
@@ -390,8 +416,17 @@
 
   nsCOMPtr<nsITimer> mTimer;
   nsCOMPtr<nsIRunnable> mRunnable;
+  nsCOMPtr<nsIDiscardableRunnable> mDiscardable;
 };
 
+NS_IMPL_ADDREF_INHERITED(IdleRunnableWrapper, Runnable)
+NS_IMPL_RELEASE_INHERITED(IdleRunnableWrapper, Runnable)
+
+NS_INTERFACE_MAP_BEGIN(IdleRunnableWrapper)
+  NS_INTERFACE_MAP_ENTRY(nsIIdleRunnable)
+  NS_INTERFACE_MAP_ENTRY_CONDITIONAL(nsIDiscardableRunnable, mDiscardable)
+NS_INTERFACE_MAP_END_INHERITING(Runnable)
+
 extern nsresult NS_DispatchToThreadQueue(already_AddRefed<nsIRunnable>&& aEvent,
                                          uint32_t aTimeout, nsIThread* aThread,
                                          EventQueuePriority aQueue) {
@@ -675,6 +710,22 @@
 }
 
 template <>
+LogTaskBase<Task>::Run::Run(Task* aTask, bool aWillRunAgain)
+    : mWillRunAgain(aWillRunAgain) {
+  if (!LOG1_ENABLED()) {
+    return;
+  }
+
+  nsAutoCString name;
+  if (!aTask->GetName(name)) {
+    LOG1(("EXEC %p %p", aTask, this));
+    return;
+  }
+
+  LOG1(("EXEC %p %p [%s]", aTask, this, name.BeginReading()));
+}
+
+template <>
 LogTaskBase<IPC::Message>::Run::Run(IPC::Message* aMessage, bool aWillRunAgain)
     : mWillRunAgain(aWillRunAgain) {
   LOG1(("RECV %p %p %d [%s]", aMessage, this, aMessage->seqno(),
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsThreadUtils.h firefox-85.0+build1/xpcom/threads/nsThreadUtils.h
--- firefox-84.0.2+build1/xpcom/threads/nsThreadUtils.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsThreadUtils.h	2021-01-18 19:58:27.000000000 +0000
@@ -21,19 +21,19 @@
 #include "mozilla/Tuple.h"
 #include "nsCOMPtr.h"
 #include "nsICancelableRunnable.h"
+#include "nsIDiscardableRunnable.h"
 #include "nsIIdlePeriod.h"
 #include "nsIIdleRunnable.h"
 #include "nsINamed.h"
 #include "nsIRunnable.h"
-#include "nsIThread.h"
 #include "nsIThreadManager.h"
 #include "nsITimer.h"
 #include "nsString.h"
 #include "prinrval.h"
 #include "prthread.h"
-#include "xpcpublic.h"
 
 class MessageLoop;
+class nsIThread;
 
 //-----------------------------------------------------------------------------
 // These methods are alternatives to the methods on nsIThreadManager, provided
@@ -283,97 +283,6 @@
 extern bool NS_ProcessNextEvent(nsIThread* aThread = nullptr,
                                 bool aMayWait = true);
 
-// A wrapper for nested event loops.
-//
-// This function is intended to make code more obvious (do you remember
-// what NS_ProcessNextEvent(nullptr, true) means?) and slightly more
-// efficient, as people often pass nullptr or NS_GetCurrentThread to
-// NS_ProcessNextEvent, which results in needless querying of the current
-// thread every time through the loop.
-//
-// You should use this function in preference to NS_ProcessNextEvent inside
-// a loop unless one of the following is true:
-//
-// * You need to pass `false` to NS_ProcessNextEvent; or
-// * You need to do unusual things around the call to NS_ProcessNextEvent,
-//   such as unlocking mutexes that you are holding.
-//
-// If you *do* need to call NS_ProcessNextEvent manually, please do call
-// NS_GetCurrentThread() outside of your loop and pass the returned pointer
-// into NS_ProcessNextEvent for a tiny efficiency win.
-namespace mozilla {
-
-// You should normally not need to deal with this template parameter.  If
-// you enjoy esoteric event loop details, read on.
-//
-// If you specify that NS_ProcessNextEvent wait for an event, it is possible
-// for NS_ProcessNextEvent to return false, i.e. to indicate that an event
-// was not processed.  This can only happen when the thread has been shut
-// down by another thread, but is still attempting to process events outside
-// of a nested event loop.
-//
-// This behavior is admittedly strange.  The scenario it deals with is the
-// following:
-//
-// * The current thread has been shut down by some owner thread.
-// * The current thread is spinning an event loop waiting for some condition
-//   to become true.
-// * Said condition is actually being fulfilled by another thread, so there
-//   are timing issues in play.
-//
-// Thus, there is a small window where the current thread's event loop
-// spinning can check the condition, find it false, and call
-// NS_ProcessNextEvent to wait for another event.  But we don't actually
-// want it to wait indefinitely, because there might not be any other events
-// in the event loop, and the current thread can't accept dispatched events
-// because it's being shut down.  Thus, actually blocking would hang the
-// thread, which is bad.  The solution, then, is to detect such a scenario
-// and not actually block inside NS_ProcessNextEvent.
-//
-// But this is a problem, because we want to return the status of
-// NS_ProcessNextEvent to the caller of SpinEventLoopUntil if possible.  In
-// the above scenario, however, we'd stop spinning prematurely and cause
-// all sorts of havoc.  We therefore have this template parameter to
-// control whether errors are ignored or passed out to the caller of
-// SpinEventLoopUntil.  The latter is the default; if you find yourself
-// wanting to use the former, you should think long and hard before doing
-// so, and write a comment like this defending your choice.
-
-enum class ProcessFailureBehavior {
-  IgnoreAndContinue,
-  ReportToCaller,
-};
-
-template <
-    ProcessFailureBehavior Behavior = ProcessFailureBehavior::ReportToCaller,
-    typename Pred>
-bool SpinEventLoopUntil(Pred&& aPredicate, nsIThread* aThread = nullptr) {
-  nsIThread* thread = aThread ? aThread : NS_GetCurrentThread();
-
-  // From a latency perspective, spinning the event loop is like leaving script
-  // and returning to the event loop. Tell the watchdog we stopped running
-  // script (until we return).
-  mozilla::Maybe<xpc::AutoScriptActivity> asa;
-  if (NS_IsMainThread()) {
-    asa.emplace(false);
-  }
-
-  while (!aPredicate()) {
-    bool didSomething = NS_ProcessNextEvent(thread, true);
-
-    if (Behavior == ProcessFailureBehavior::IgnoreAndContinue) {
-      // Don't care what happened, continue on.
-      continue;
-    } else if (!didSomething) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-}  // namespace mozilla
-
 /**
  * Returns true if we're in the compositor thread.
  *
@@ -498,15 +407,44 @@
   Runnable& operator=(const Runnable&&) = delete;
 };
 
+// This is a base class for tasks that might not be run, such as those that may
+// be dispatched to workers.
+// The owner of an event target will call either Run() or OnDiscard()
+// exactly once.
+// Derived classes should override Run().  An OnDiscard() override may
+// provide cleanup when Run() will not be called.
+class DiscardableRunnable : public Runnable, public nsIDiscardableRunnable {
+ public:
+  NS_DECL_ISUPPORTS_INHERITED
+  // nsIDiscardableRunnable
+  void OnDiscard() override {}
+
+  DiscardableRunnable() = delete;
+  explicit DiscardableRunnable(const char* aName) : Runnable(aName) {}
+
+ protected:
+  virtual ~DiscardableRunnable() = default;
+
+ private:
+  DiscardableRunnable(const DiscardableRunnable&) = delete;
+  DiscardableRunnable& operator=(const DiscardableRunnable&) = delete;
+  DiscardableRunnable& operator=(const DiscardableRunnable&&) = delete;
+};
+
 // This class is designed to be subclassed.
-class CancelableRunnable : public Runnable, public nsICancelableRunnable {
+// Derived classes should override Run() and Cancel() to provide that
+// calling Run() after Cancel() is a no-op.
+class CancelableRunnable : public DiscardableRunnable,
+                           public nsICancelableRunnable {
  public:
   NS_DECL_ISUPPORTS_INHERITED
+  // nsIDiscardableRunnable
+  void OnDiscard() override;
   // nsICancelableRunnable
-  virtual nsresult Cancel() override;
+  virtual nsresult Cancel() override = 0;
 
   CancelableRunnable() = delete;
-  explicit CancelableRunnable(const char* aName) : Runnable(aName) {}
+  explicit CancelableRunnable(const char* aName) : DiscardableRunnable(aName) {}
 
  protected:
   virtual ~CancelableRunnable() = default;
@@ -518,12 +456,12 @@
 };
 
 // This class is designed to be subclassed.
-class IdleRunnable : public CancelableRunnable, public nsIIdleRunnable {
+class IdleRunnable : public DiscardableRunnable, public nsIIdleRunnable {
  public:
   NS_DECL_ISUPPORTS_INHERITED
 
-  IdleRunnable() : CancelableRunnable("IdleRunnable") {}
-  explicit IdleRunnable(const char* aName) : CancelableRunnable(aName) {}
+  IdleRunnable() : DiscardableRunnable("IdleRunnable") {}
+  explicit IdleRunnable(const char* aName) : DiscardableRunnable(aName) {}
 
  protected:
   virtual ~IdleRunnable() = default;
@@ -534,6 +472,25 @@
   IdleRunnable& operator=(const IdleRunnable&&) = delete;
 };
 
+// This class is designed to be subclassed.
+class CancelableIdleRunnable : public CancelableRunnable,
+                               public nsIIdleRunnable {
+ public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  CancelableIdleRunnable() : CancelableRunnable("CancelableIdleRunnable") {}
+  explicit CancelableIdleRunnable(const char* aName)
+      : CancelableRunnable(aName) {}
+
+ protected:
+  virtual ~CancelableIdleRunnable() = default;
+
+ private:
+  CancelableIdleRunnable(const CancelableIdleRunnable&) = delete;
+  CancelableIdleRunnable& operator=(const CancelableIdleRunnable&) = delete;
+  CancelableIdleRunnable& operator=(const CancelableIdleRunnable&&) = delete;
+};
+
 // This class is designed to be a wrapper of a real runnable to support event
 // prioritizable.
 class PrioritizableRunnable : public Runnable, public nsIRunnablePriority {
@@ -763,12 +720,13 @@
           Kind == mozilla::RunnableKind::Standard, mozilla::Runnable,
           std::conditional_t<Kind == mozilla::RunnableKind::Cancelable,
                              mozilla::CancelableRunnable,
-                             mozilla::IdleRunnable>>,
+                             mozilla::CancelableIdleRunnable>>,
       protected mozilla::detail::TimerBehaviour<Kind> {
   using BaseType = std::conditional_t<
       Kind == mozilla::RunnableKind::Standard, mozilla::Runnable,
       std::conditional_t<Kind == mozilla::RunnableKind::Cancelable,
-                         mozilla::CancelableRunnable, mozilla::IdleRunnable>>;
+                         mozilla::CancelableRunnable,
+                         mozilla::CancelableIdleRunnable>>;
 
  public:
   nsRunnableMethod(const char* aName) : BaseType(aName) {}
@@ -797,6 +755,8 @@
 struct nsRunnableMethodReceiver {
   RefPtr<ClassType> mObj;
   explicit nsRunnableMethodReceiver(ClassType* aObj) : mObj(aObj) {}
+  explicit nsRunnableMethodReceiver(RefPtr<ClassType>&& aObj)
+      : mObj(std::move(aObj)) {}
   ~nsRunnableMethodReceiver() { Revoke(); }
   ClassType* Get() const { return mObj.get(); }
   void Revoke() { mObj = nullptr; }
@@ -1215,7 +1175,8 @@
   virtual ~RunnableMethodImpl() { Revoke(); };
   static void TimedOut(nsITimer* aTimer, void* aClosure) {
     static_assert(IsIdle(Kind), "Don't use me!");
-    RefPtr<IdleRunnable> r = static_cast<IdleRunnable*>(aClosure);
+    RefPtr<CancelableIdleRunnable> r =
+        static_cast<CancelableIdleRunnable*>(aClosure);
     r->SetDeadline(TimeStamp());
     r->Run();
     r->Cancel();
@@ -1961,6 +1922,8 @@
 template <>
 LogTaskBase<nsIRunnable>::Run::Run(nsIRunnable* aEvent, bool aWillRunAgain);
 template <>
+LogTaskBase<Task>::Run::Run(Task* aTask, bool aWillRunAgain);
+template <>
 void LogTaskBase<IPC::Message>::LogDispatchWithPid(IPC::Message* aEvent,
                                                    int32_t aPid);
 template <>
diff -Nru firefox-84.0.2+build1/xpcom/threads/nsTimerImpl.h firefox-85.0+build1/xpcom/threads/nsTimerImpl.h
--- firefox-84.0.2+build1/xpcom/threads/nsTimerImpl.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/nsTimerImpl.h	2021-01-18 19:58:27.000000000 +0000
@@ -14,7 +14,6 @@
 #include "nsCOMPtr.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/Logging.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Variant.h"
@@ -32,8 +31,13 @@
     }                                                \
   }
 
+class nsIObserver;
 class nsTimerImplHolder;
 
+namespace mozilla {
+class LogModule;
+}
+
 // TimerThread, nsTimerEvent, and nsTimer have references to these. nsTimer has
 // a separate lifecycle so we can Cancel() the underlying timer when the user of
 // the nsTimer has let go of its last reference.
diff -Nru firefox-84.0.2+build1/xpcom/threads/ReentrantMonitor.h firefox-85.0+build1/xpcom/threads/ReentrantMonitor.h
--- firefox-84.0.2+build1/xpcom/threads/ReentrantMonitor.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/ReentrantMonitor.h	2021-01-18 19:58:27.000000000 +0000
@@ -9,11 +9,12 @@
 
 #include "prmon.h"
 
-#ifdef MOZILLA_INTERNAL_API
+#if defined(MOZILLA_INTERNAL_API) && !defined(DEBUG)
 #  include "GeckoProfiler.h"
-#endif  // MOZILLA_INTERNAL_API
+#endif  // defined( MOZILLA_INTERNAL_API) && !defined(DEBUG)
 
 #include "mozilla/BlockingResourceBase.h"
+#include "nsISupports.h"
 
 //
 // Provides:
diff -Nru firefox-84.0.2+build1/xpcom/threads/RWLock.h firefox-85.0+build1/xpcom/threads/RWLock.h
--- firefox-84.0.2+build1/xpcom/threads/RWLock.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/RWLock.h	2021-01-18 19:58:27.000000000 +0000
@@ -10,6 +10,7 @@
 #define mozilla_RWLock_h
 
 #include "mozilla/Assertions.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/BlockingResourceBase.h"
 
 #ifndef XP_WIN
diff -Nru firefox-84.0.2+build1/xpcom/threads/SchedulerGroup.h firefox-85.0+build1/xpcom/threads/SchedulerGroup.h
--- firefox-84.0.2+build1/xpcom/threads/SchedulerGroup.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/SchedulerGroup.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,17 +7,15 @@
 #ifndef mozilla_SchedulerGroup_h
 #define mozilla_SchedulerGroup_h
 
-#include "mozilla/EventQueue.h"
-#include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/LinkedList.h"
-#include "mozilla/Queue.h"
+#include "mozilla/RefPtr.h"
 #include "mozilla/TaskCategory.h"
-#include "mozilla/ThreadLocal.h"
-#include "mozilla/ThrottledEventQueue.h"
-#include "mozilla/TimeStamp.h"
 #include "nsCOMPtr.h"
-#include "nsISupportsImpl.h"
+#include "nsID.h"
+#include "nsIRunnable.h"
+#include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsThreadUtils.h"
+#include "nscore.h"
 
 class nsIEventTarget;
 class nsIRunnable;
diff -Nru firefox-84.0.2+build1/xpcom/threads/SharedThreadPool.cpp firefox-85.0+build1/xpcom/threads/SharedThreadPool.cpp
--- firefox-84.0.2+build1/xpcom/threads/SharedThreadPool.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/SharedThreadPool.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/Monitor.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/StaticPtr.h"
 #include "nsDataHashtable.h"
 #include "nsXPCOMCIDInternal.h"
diff -Nru firefox-84.0.2+build1/xpcom/threads/SharedThreadPool.h firefox-85.0+build1/xpcom/threads/SharedThreadPool.h
--- firefox-84.0.2+build1/xpcom/threads/SharedThreadPool.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/SharedThreadPool.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,13 +7,17 @@
 #ifndef SharedThreadPool_h_
 #define SharedThreadPool_h_
 
-#include <queue>
-#include "mozilla/RefPtr.h"
-#include "nsThreadUtils.h"
-#include "nsIThreadPool.h"
-#include "nsISupports.h"
-#include "nsISupportsImpl.h"
+#include <utility>
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/RefCountType.h"
 #include "nsCOMPtr.h"
+#include "nsID.h"
+#include "nsIEventTarget.h"
+#include "nsIThreadPool.h"
+#include "nsString.h"
+#include "nscore.h"
+
+class nsIRunnable;
 
 namespace mozilla {
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/SpinEventLoopUntil.h firefox-85.0+build1/xpcom/threads/SpinEventLoopUntil.h
--- firefox-84.0.2+build1/xpcom/threads/SpinEventLoopUntil.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/SpinEventLoopUntil.h	2021-01-18 19:58:27.000000000 +0000
@@ -0,0 +1,108 @@
+/* -*- 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 xpcom_threads_SpinEventLoopUntil_h__
+#define xpcom_threads_SpinEventLoopUntil_h__
+
+#include "MainThreadUtils.h"
+#include "mozilla/Maybe.h"
+#include "nsThreadUtils.h"
+#include "xpcpublic.h"
+
+class nsIThread;
+
+// A wrapper for nested event loops.
+//
+// This function is intended to make code more obvious (do you remember
+// what NS_ProcessNextEvent(nullptr, true) means?) and slightly more
+// efficient, as people often pass nullptr or NS_GetCurrentThread to
+// NS_ProcessNextEvent, which results in needless querying of the current
+// thread every time through the loop.
+//
+// You should use this function in preference to NS_ProcessNextEvent inside
+// a loop unless one of the following is true:
+//
+// * You need to pass `false` to NS_ProcessNextEvent; or
+// * You need to do unusual things around the call to NS_ProcessNextEvent,
+//   such as unlocking mutexes that you are holding.
+//
+// If you *do* need to call NS_ProcessNextEvent manually, please do call
+// NS_GetCurrentThread() outside of your loop and pass the returned pointer
+// into NS_ProcessNextEvent for a tiny efficiency win.
+namespace mozilla {
+
+// You should normally not need to deal with this template parameter.  If
+// you enjoy esoteric event loop details, read on.
+//
+// If you specify that NS_ProcessNextEvent wait for an event, it is possible
+// for NS_ProcessNextEvent to return false, i.e. to indicate that an event
+// was not processed.  This can only happen when the thread has been shut
+// down by another thread, but is still attempting to process events outside
+// of a nested event loop.
+//
+// This behavior is admittedly strange.  The scenario it deals with is the
+// following:
+//
+// * The current thread has been shut down by some owner thread.
+// * The current thread is spinning an event loop waiting for some condition
+//   to become true.
+// * Said condition is actually being fulfilled by another thread, so there
+//   are timing issues in play.
+//
+// Thus, there is a small window where the current thread's event loop
+// spinning can check the condition, find it false, and call
+// NS_ProcessNextEvent to wait for another event.  But we don't actually
+// want it to wait indefinitely, because there might not be any other events
+// in the event loop, and the current thread can't accept dispatched events
+// because it's being shut down.  Thus, actually blocking would hang the
+// thread, which is bad.  The solution, then, is to detect such a scenario
+// and not actually block inside NS_ProcessNextEvent.
+//
+// But this is a problem, because we want to return the status of
+// NS_ProcessNextEvent to the caller of SpinEventLoopUntil if possible.  In
+// the above scenario, however, we'd stop spinning prematurely and cause
+// all sorts of havoc.  We therefore have this template parameter to
+// control whether errors are ignored or passed out to the caller of
+// SpinEventLoopUntil.  The latter is the default; if you find yourself
+// wanting to use the former, you should think long and hard before doing
+// so, and write a comment like this defending your choice.
+
+enum class ProcessFailureBehavior {
+  IgnoreAndContinue,
+  ReportToCaller,
+};
+
+template <
+    ProcessFailureBehavior Behavior = ProcessFailureBehavior::ReportToCaller,
+    typename Pred>
+bool SpinEventLoopUntil(Pred&& aPredicate, nsIThread* aThread = nullptr) {
+  nsIThread* thread = aThread ? aThread : NS_GetCurrentThread();
+
+  // From a latency perspective, spinning the event loop is like leaving script
+  // and returning to the event loop. Tell the watchdog we stopped running
+  // script (until we return).
+  mozilla::Maybe<xpc::AutoScriptActivity> asa;
+  if (NS_IsMainThread()) {
+    asa.emplace(false);
+  }
+
+  while (!aPredicate()) {
+    bool didSomething = NS_ProcessNextEvent(thread, true);
+
+    if (Behavior == ProcessFailureBehavior::IgnoreAndContinue) {
+      // Don't care what happened, continue on.
+      continue;
+    } else if (!didSomething) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+}  // namespace mozilla
+
+#endif  // xpcom_threads_SpinEventLoopUntil_h__
diff -Nru firefox-84.0.2+build1/xpcom/threads/StateMirroring.h firefox-85.0+build1/xpcom/threads/StateMirroring.h
--- firefox-84.0.2+build1/xpcom/threads/StateMirroring.h	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/StateMirroring.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,15 +7,19 @@
 #if !defined(StateMirroring_h_)
 #  define StateMirroring_h_
 
+#  include <cstddef>
+#  include "mozilla/AbstractThread.h"
+#  include "mozilla/AlreadyAddRefed.h"
+#  include "mozilla/Assertions.h"
+#  include "mozilla/Logging.h"
 #  include "mozilla/Maybe.h"
-#  include "mozilla/MozPromise.h"
+#  include "mozilla/RefPtr.h"
 #  include "mozilla/StateWatching.h"
-#  include "mozilla/TaskDispatcher.h"
-#  include "mozilla/UniquePtr.h"
-#  include "mozilla/Unused.h"
-
-#  include "mozilla/Logging.h"
-#  include "nsISupportsImpl.h"
+#  include "nsCOMPtr.h"
+#  include "nsIRunnable.h"
+#  include "nsISupports.h"
+#  include "nsTArray.h"
+#  include "nsThreadUtils.h"
 
 /*
  * The state-mirroring machinery allows pieces of interesting state to be
diff -Nru firefox-84.0.2+build1/xpcom/threads/StateWatching.h firefox-85.0+build1/xpcom/threads/StateWatching.h
--- firefox-84.0.2+build1/xpcom/threads/StateWatching.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/StateWatching.h	2021-01-18 19:58:27.000000000 +0000
@@ -7,13 +7,16 @@
 #if !defined(StateWatching_h_)
 #  define StateWatching_h_
 
+#  include <cstddef>
+#  include <new>
+#  include <utility>
 #  include "mozilla/AbstractThread.h"
+#  include "mozilla/Assertions.h"
 #  include "mozilla/Logging.h"
-#  include "mozilla/TaskDispatcher.h"
-#  include "mozilla/UniquePtr.h"
-#  include "mozilla/Unused.h"
-
-#  include "nsISupportsImpl.h"
+#  include "mozilla/RefPtr.h"
+#  include "nsISupports.h"
+#  include "nsTArray.h"
+#  include "nsThreadUtils.h"
 
 /*
  * The state-watching machinery automates the process of responding to changes
diff -Nru firefox-84.0.2+build1/xpcom/threads/TaskController.cpp firefox-85.0+build1/xpcom/threads/TaskController.cpp
--- firefox-84.0.2+build1/xpcom/threads/TaskController.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/TaskController.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -10,6 +10,7 @@
 #include "nsThreadUtils.h"
 #include <algorithm>
 #include <initializer_list>
+#include "GeckoProfiler.h"
 #include "mozilla/EventQueue.h"
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/InputTaskManager.h"
@@ -21,6 +22,7 @@
 #include "nsIThreadInternal.h"
 #include "nsQueryObject.h"
 #include "nsThread.h"
+#include "prenv.h"
 #include "prsystem.h"
 
 #ifdef XP_WIN
@@ -104,9 +106,10 @@
   return sSingleton->InitializeInternal();
 }
 
-void ThreadFuncPoolThread(TaskController* aController, size_t aIndex) {
-  mThreadPoolIndex = aIndex;
-  aController->RunPoolThread();
+void ThreadFuncPoolThread(void* aIndex) {
+  mThreadPoolIndex = *reinterpret_cast<int32_t*>(aIndex);
+  delete reinterpret_cast<int32_t*>(aIndex);
+  TaskController::Get()->RunPoolThread();
 }
 
 #ifdef XP_WIN
@@ -131,6 +134,9 @@
   return true;
 }
 
+// Ample stack size allocated for applications like ImageLib's AV1 decoder.
+const PRUint32 sStackSize = 512u * 1024u;
+
 void TaskController::InitializeThreadPool() {
   mPoolInitializationMutex.AssertCurrentThreadOwns();
   MOZ_ASSERT(!mThreadPoolInitialized);
@@ -138,8 +144,11 @@
 
   int32_t poolSize = GetPoolThreadCount();
   for (int32_t i = 0; i < poolSize; i++) {
+    int32_t* index = new int32_t(i);
     mPoolThreads.push_back(
-        {std::make_unique<std::thread>(ThreadFuncPoolThread, this, i),
+        {PR_CreateThread(PR_USER_THREAD, ThreadFuncPoolThread, index,
+                         PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
+                         PR_JOINABLE_THREAD, 512u * 1024u),
          nullptr});
   }
 }
@@ -168,7 +177,7 @@
     mThreadPoolCV.NotifyAll();
   }
   for (PoolThread& thread : mPoolThreads) {
-    thread.mThread->join();
+    PR_JoinThread(thread.mThread);
   }
 }
 
@@ -463,6 +472,16 @@
     return nsThread::GetPerformanceCounterBase(mRunnable);
   }
 
+  virtual bool GetName(nsACString& aName) override {
+#ifdef MOZ_COLLECTING_RUNNABLE_TELEMETRY
+    nsThread::GetLabeledRunnableName(mRunnable, aName,
+                                     EventQueuePriority(GetPriority()));
+    return true;
+#else
+    return false;
+#endif
+  }
+
  private:
   RefPtr<nsIRunnable> mRunnable;
 };
diff -Nru firefox-84.0.2+build1/xpcom/threads/TaskController.h firefox-85.0+build1/xpcom/threads/TaskController.h
--- firefox-84.0.2+build1/xpcom/threads/TaskController.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/TaskController.h	2021-01-18 19:58:27.000000000 +0000
@@ -18,7 +18,6 @@
 #include "nsIEventTarget.h"
 
 #include <atomic>
-#include <thread>
 #include <memory>
 #include <vector>
 #include <set>
@@ -170,6 +169,9 @@
 
   virtual PerformanceCounter* GetPerformanceCounter() const { return nullptr; }
 
+  // Get a name for this task. This returns false if the task has no name.
+  virtual bool GetName(nsACString& aName) { return false; }
+
  protected:
   Task(bool aMainThreadOnly,
        uint32_t aPriority = static_cast<uint32_t>(kDefaultPriorityValue))
@@ -233,7 +235,7 @@
 };
 
 struct PoolThread {
-  std::unique_ptr<std::thread> mThread;
+  PRThread* mThread;
   RefPtr<Task> mCurrentTask;
   // This may be higher than mCurrentTask's priority due to priority
   // propagation. This is -only- valid when mCurrentTask != nullptr.
@@ -322,7 +324,7 @@
   bool MTTaskRunnableProcessedTask() { return mMTTaskRunnableProcessedTask; }
 
  private:
-  friend void ThreadFuncPoolThread(TaskController* aController, size_t aIndex);
+  friend void ThreadFuncPoolThread(void* aIndex);
 
   bool InitializeInternal();
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/TaskDispatcher.h firefox-85.0+build1/xpcom/threads/TaskDispatcher.h
--- firefox-84.0.2+build1/xpcom/threads/TaskDispatcher.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/TaskDispatcher.h	2021-01-18 19:58:27.000000000 +0000
@@ -12,7 +12,6 @@
 #  include "mozilla/AbstractThread.h"
 #  include "mozilla/Maybe.h"
 #  include "mozilla/UniquePtr.h"
-#  include "mozilla/Unused.h"
 #  include "nsIDirectTaskDispatcher.h"
 #  include "nsISupportsImpl.h"
 #  include "nsTArray.h"
diff -Nru firefox-84.0.2+build1/xpcom/threads/TaskQueue.h firefox-85.0+build1/xpcom/threads/TaskQueue.h
--- firefox-84.0.2+build1/xpcom/threads/TaskQueue.h	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/TaskQueue.h	2021-01-18 19:58:27.000000000 +0000
@@ -15,7 +15,6 @@
 #include "mozilla/MozPromise.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TaskDispatcher.h"
-#include "mozilla/Unused.h"
 #include "nsIDirectTaskDispatcher.h"
 #include "nsThreadUtils.h"
 
diff -Nru firefox-84.0.2+build1/xpcom/threads/ThreadEventQueue.cpp firefox-85.0+build1/xpcom/threads/ThreadEventQueue.cpp
--- firefox-84.0.2+build1/xpcom/threads/ThreadEventQueue.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/ThreadEventQueue.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -7,6 +7,7 @@
 #include "mozilla/ThreadEventQueue.h"
 #include "mozilla/EventQueue.h"
 
+#include "GeckoProfiler.h"
 #include "LeakRefPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIThreadInternal.h"
diff -Nru firefox-84.0.2+build1/xpcom/threads/ThreadEventTarget.cpp firefox-85.0+build1/xpcom/threads/ThreadEventTarget.cpp
--- firefox-84.0.2+build1/xpcom/threads/ThreadEventTarget.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpcom/threads/ThreadEventTarget.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -8,6 +8,7 @@
 #include "mozilla/ThreadEventQueue.h"
 
 #include "LeakRefPtr.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/TimeStamp.h"
 #include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
diff -Nru firefox-84.0.2+build1/xpfe/appshell/AppWindow.cpp firefox-85.0+build1/xpfe/appshell/AppWindow.cpp
--- firefox-84.0.2+build1/xpfe/appshell/AppWindow.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpfe/appshell/AppWindow.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -11,6 +11,7 @@
 #include <algorithm>
 
 // Helper classes
+#include "GeckoProfiler.h"
 #include "nsPrintfCString.h"
 #include "nsString.h"
 #include "nsWidgetsCID.h"
@@ -49,12 +50,16 @@
 #include "nsFocusManager.h"
 #include "nsContentList.h"
 #include "nsIDOMWindowUtils.h"
+#include "nsServiceManagerUtils.h"
 
 #include "prenv.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
 #include "mozilla/Services.h"
+#include "mozilla/SpinEventLoopUntil.h"
 #include "mozilla/dom/BarProps.h"
+#include "mozilla/dom/DOMRect.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/ScriptSettings.h"
@@ -1798,6 +1803,16 @@
     return NS_OK;
   }
 
+  SkeletonUISettings settings;
+
+  settings.screenX = aRect.X();
+  settings.screenY = aRect.Y();
+  settings.width = aRect.Width();
+  settings.height = aRect.Height();
+
+  settings.maximized = mWindow->SizeMode() == nsSizeMode_Maximized;
+  settings.cssToDevPixelScaling = mWindow->GetDefaultScale().scale;
+
   nsCOMPtr<dom::Element> windowElement = GetWindowDOMElement();
   Document* doc = windowElement->GetComposedDoc();
   Element* urlbarEl = doc->GetElementById(u"urlbar"_ns);
@@ -1837,6 +1852,7 @@
   CSSPixelSpan urlbar;
   urlbar.start = urlbarX;
   urlbar.end = urlbar.start + urlbarWidth;
+  settings.urlbarSpan = urlbar;
 
   Element* navbar = doc->GetElementById(u"nav-bar"_ns);
 
@@ -1856,6 +1872,11 @@
     searchbar.start = 0;
     searchbar.end = 0;
   }
+  settings.searchbarSpan = searchbar;
+
+  Element* menubar = doc->GetElementById(u"toolbar-menubar"_ns);
+  menubar->GetAttribute(u"autohide"_ns, attributeValue);
+  settings.menubarShown = attributeValue.EqualsLiteral("false");
 
   ErrorResult err;
   nsCOMPtr<nsIHTMLCollection> toolbarSprings = navbar->GetElementsByTagNameNS(
@@ -1875,15 +1896,12 @@
     CSSPixelSpan spring;
     spring.start = springRect->X();
     spring.end = spring.start + springRect->Width();
-    if (!springs.append(spring)) {
+    if (!settings.springs.append(spring)) {
       return NS_ERROR_FAILURE;
     }
   }
 
-  PersistPreXULSkeletonUIValues(
-      aRect.X(), aRect.Y(), aRect.Width(), aRect.Height(),
-      mWindow->SizeMode() == nsSizeMode_Maximized, urlbar, searchbar, springs,
-      mWindow->GetDefaultScale().scale);
+  PersistPreXULSkeletonUIValues(settings);
 #endif
 
   return NS_OK;
@@ -2931,7 +2949,7 @@
       mDocShell ? mDocShell->GetWindow() : nullptr;
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm && window) {
-    fm->WindowRaised(window);
+    fm->WindowRaised(window, nsFocusManager::GenerateFocusActionId());
   }
 
   if (mChromeLoaded) {
@@ -2947,7 +2965,7 @@
       mDocShell ? mDocShell->GetWindow() : nullptr;
   nsFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm && window && !fm->IsTestMode()) {
-    fm->WindowLowered(window);
+    fm->WindowLowered(window, nsFocusManager::GenerateFocusActionId());
   }
 }
 
diff -Nru firefox-84.0.2+build1/xpfe/appshell/nsAppShellService.cpp firefox-85.0+build1/xpfe/appshell/nsAppShellService.cpp
--- firefox-84.0.2+build1/xpfe/appshell/nsAppShellService.cpp	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpfe/appshell/nsAppShellService.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -136,7 +136,8 @@
   nsCOMPtr<nsIDocShell> docShell;
   newWindow->GetDocShell(getter_AddRefs(docShell));
   if (docShell) {
-    docShell->SetIsActive(false);
+    Unused << docShell->GetBrowsingContext()->SetExplicitActive(
+        dom::ExplicitActiveStatus::Inactive);
   }
 
   mHiddenWindow.swap(newWindow);
diff -Nru firefox-84.0.2+build1/xpfe/appshell/nsContentTreeOwner.cpp firefox-85.0+build1/xpfe/appshell/nsContentTreeOwner.cpp
--- firefox-84.0.2+build1/xpfe/appshell/nsContentTreeOwner.cpp	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpfe/appshell/nsContentTreeOwner.cpp	2021-01-18 19:58:27.000000000 +0000
@@ -386,16 +386,6 @@
     nsIDocShell* aDocShell, nsIURI* aURI, nsIReferrerInfo* aReferrerInfo,
     bool aHasPostData, nsIPrincipal* aTriggeringPrincipal,
     nsIContentSecurityPolicy* aCsp, bool* _retval) {
-  NS_ENSURE_STATE(mAppWindow);
-
-  nsCOMPtr<nsIXULBrowserWindow> xulBrowserWindow;
-  mAppWindow->GetXULBrowserWindow(getter_AddRefs(xulBrowserWindow));
-
-  if (xulBrowserWindow)
-    return xulBrowserWindow->ShouldLoadURI(aDocShell, aURI, aReferrerInfo,
-                                           aHasPostData, aTriggeringPrincipal,
-                                           aCsp, _retval);
-
   *_retval = true;
   return NS_OK;
 }
diff -Nru firefox-84.0.2+build1/xpfe/appshell/nsIWindowlessBrowser.idl firefox-85.0+build1/xpfe/appshell/nsIWindowlessBrowser.idl
--- firefox-84.0.2+build1/xpfe/appshell/nsIWindowlessBrowser.idl	2021-01-06 11:23:25.000000000 +0000
+++ firefox-85.0+build1/xpfe/appshell/nsIWindowlessBrowser.idl	2021-01-18 19:58:27.000000000 +0000
@@ -15,7 +15,7 @@
  * A strong reference to this object must be held until the window is
  * ready to be destroyed.
  */
-[scriptable, uuid(abb46f48-abfc-41bf-aa9a-7feccefcf977)]
+[scriptable, builtinclass, uuid(abb46f48-abfc-41bf-aa9a-7feccefcf977)]
 interface nsIWindowlessBrowser : nsIWebNavigation
 {
   /**
diff -Nru firefox-84.0.2+build1/xpfe/appshell/nsIXULBrowserWindow.idl firefox-85.0+build1/xpfe/appshell/nsIXULBrowserWindow.idl
--- firefox-84.0.2+build1/xpfe/appshell/nsIXULBrowserWindow.idl	2021-01-06 11:23:24.000000000 +0000
+++ firefox-85.0+build1/xpfe/appshell/nsIXULBrowserWindow.idl	2021-01-18 19:58:27.000000000 +0000
@@ -43,31 +43,6 @@
                                 in boolean isAppTab);
 
   /**
-   * Determines whether a load should continue.
-   *
-   * @param aDocShell
-   *        The docshell performing the load.
-   * @param aURI
-   *        The URI being loaded.
-   * @param aReferrerInfo
-   *        The referrerInfo of the load.
-   * @param aHasPostData
-   *        True if the load which is being asked about has associated post data
-   *        which would be discarded if the load was redirected across process
-   *        boundaries.
-   * @param aTriggeringPrincipal
-   *        The principal that initiated the load of aURI.
-   * @param aCsp
-   *        The CSP to be used for that load. That is the CSP that e.g. upgrades
-   *        the load to HTTPS in case upgrade-insecure-requests is set
-   */
-  bool shouldLoadURI(in nsIDocShell              aDocShell,
-                     in nsIURI                   aURI,
-                     in nsIReferrerInfo          aReferrerInfo,
-                     in boolean                  aHasPostData,
-                     in nsIPrincipal             aTriggeringPrincipal,
-                     in nsIContentSecurityPolicy aCsp);
-  /**
    * Show/hide a tooltip (when the user mouses over a link, say).
    */
   void showTooltip(in long x, in long y, in AString tooltip, in AString direction,